diff --git a/.bazelrc b/.bazelrc
new file mode 100644
index 0000000000..1627a59000
--- /dev/null
+++ b/.bazelrc
@@ -0,0 +1,14 @@
+build --experimental_guard_against_concurrent_changes
+
+build --strategy=Genrule=local
+build --apple_platform_type=ios
+build --cxxopt='-std=c++14'
+build --copt='-w'
+build --swiftcopt='-Xcc'
+build --swiftcopt='-w'
+build --spawn_strategy=local
+build --strategy=SwiftCompile=local
+build --features=debug_prefix_map_pwd_is_dot
+build --features=swift.cacheable_swiftmodules
+build --features=swift.debug_prefix_map
+
diff --git a/.gitignore b/.gitignore
index 81a0b5a182..b0487bbc48 100644
--- a/.gitignore
+++ b/.gitignore
@@ -58,5 +58,9 @@ bazel-telegram-ios
 bazel-telegram-ios/*
 bazel-testlogs
 bazel-testlogs/*
+*/*.swp
+*.swp
+build-input/data
 build-input/data/*
+build-input/gen
 build-input/gen/*
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d89926d6ad..33f3b39ca5 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -22,6 +22,10 @@ internal:
     - bash buildbox/deploy-telegram.sh hockeyapp
   environment:
     name: internal
+  artifacts:
+    paths:
+      - build/artifacts/Telegram.DSYMs.zip
+    expire_in: 1 week
 
 beta_testflight:
   tags:
@@ -38,7 +42,7 @@ beta_testflight:
   artifacts:
     paths:
       - build/artifacts
-    expire_in: 1 week
+    expire_in: 3 weeks
 
 deploy_beta_testflight:
   tags:
diff --git a/.gitmodules b/.gitmodules
index c319a7c828..d416d6ad33 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,4 +1,19 @@
 
 [submodule "submodules/rlottie/rlottie"]
 	path = submodules/rlottie/rlottie
-url=../rlottie.git
+	url=../rlottie.git
+[submodule "build-system/bazel-rules/rules_apple"]
+	path = build-system/bazel-rules/rules_apple
+    url=https://github.com/ali-fareed/rules_apple.git
+[submodule "build-system/bazel-rules/rules_swift"]
+	path = build-system/bazel-rules/rules_swift
+	url = https://github.com/bazelbuild/rules_swift.git
+[submodule "build-system/bazel-rules/apple_support"]
+	path = build-system/bazel-rules/apple_support
+	url = https://github.com/bazelbuild/apple_support.git
+[submodule "submodules/TgVoip/libtgvoip"]
+	path = submodules/TgVoip/libtgvoip
+	url = https://github.com/telegramdesktop/libtgvoip.git
+[submodule "build-system/tulsi"]
+	path = build-system/tulsi
+	url = https://github.com/ali-fareed/tulsi.git
diff --git a/Telegram-iOS/ar.lproj/Localizable.strings b/Config/BUILD
similarity index 100%
rename from Telegram-iOS/ar.lproj/Localizable.strings
rename to Config/BUILD
diff --git a/Config/buck_rule_macros.bzl b/Config/buck_rule_macros.bzl
index e597aa6ecd..0c101f023a 100644
--- a/Config/buck_rule_macros.bzl
+++ b/Config/buck_rule_macros.bzl
@@ -309,9 +309,9 @@ def glob_map(glob_results):
         result[file_name] = path
     return result
 
-def glob_sub_map(prefix, glob_specs):
+def glob_sub_map(prefix, glob_specs, exclude = []):
     result = dict()
-    for path in native.glob(glob_specs):
+    for path in native.glob(glob_specs, exclude = exclude):
         if not path.startswith(prefix):
             fail('\"%s\" does not start with \"%s\"' % (path, prefix))
         file_key = path[len(prefix):]
diff --git a/Config/objc_module_provider.bzl b/Config/objc_module_provider.bzl
new file mode 100644
index 0000000000..a09f214a85
--- /dev/null
+++ b/Config/objc_module_provider.bzl
@@ -0,0 +1,31 @@
+
+def _impl(ctx):
+    output_dir = ctx.attr.name + "_ModuleHeaders"
+    dir = ctx.actions.declare_directory(output_dir)
+    files = []
+    files_command = ""
+    for file in ctx.files.headers:
+        outFile = ctx.actions.declare_file(output_dir + "/" + ctx.attr.module_name + "/" + file.basename)
+        files.append(outFile)
+        files_command = files_command + " && cp " + file.path + " " + outFile.path
+    ctx.actions.run_shell(
+        outputs = [dir] + files,
+        inputs = ctx.files.headers,
+        command = "mkdir -p " + dir.path + " " + files_command
+    )
+    return [
+        apple_common.new_objc_provider(
+            include_system = depset([dir.path]),
+            header = depset(files),
+        ),
+    ]
+
+objc_module = rule(
+    implementation = _impl,
+    attrs = {
+        "module_name": attr.string(mandatory = True),
+        "headers": attr.label_list(
+            allow_files = [".h"],
+        ),
+    },
+)
diff --git a/Makefile b/Makefile
index dc4224265b..a78940e107 100644
--- a/Makefile
+++ b/Makefile
@@ -2,8 +2,12 @@
 
 include Utils.makefile
 
+APP_VERSION="5.16"
+CORE_COUNT=$(shell sysctl -n hw.logicalcpu)
+CORE_COUNT_MINUS_ONE=$(shell expr ${CORE_COUNT} \- 1)
+
 BUCK_OPTIONS=\
-	--config custom.appVersion="5.15.2" \
+	--config custom.appVersion="${APP_VERSION}" \
 	--config custom.developmentCodeSignIdentity="${DEVELOPMENT_CODE_SIGN_IDENTITY}" \
 	--config custom.distributionCodeSignIdentity="${DISTRIBUTION_CODE_SIGN_IDENTITY}" \
 	--config custom.developmentTeam="${DEVELOPMENT_TEAM}" \
@@ -39,11 +43,30 @@ BUCK_OPTIONS=\
 	--config custom.developmentProvisioningProfileWatchExtension="${DEVELOPMENT_PROVISIONING_PROFILE_WATCH_EXTENSION}" \
 	--config custom.distributionProvisioningProfileWatchExtension="${DISTRIBUTION_PROVISIONING_PROFILE_WATCH_EXTENSION}"
 
+BAZEL=$(shell which bazel)
+
+ifneq ($(BAZEL_CACHE_DIR),)
+	export BAZEL_CACHE_FLAGS=\
+		--disk_cache="${BAZEL_CACHE_DIR}"
+endif
+
+BAZEL_COMMON_FLAGS=\
+	--announce_rc \
+	--features=swift.use_global_module_cache \
+	
+BAZEL_DEBUG_FLAGS=\
+	--features=swift.enable_batch_mode \
+	--swiftcopt=-j${CORE_COUNT_MINUS_ONE} \
+
+BAZEL_OPT_FLAGS=\
+	--swiftcopt=-whole-module-optimization \
+	--swiftcopt='-num-threads' --swiftcopt='16' \
+
 
 build_arm64: check_env
 	$(BUCK) build \
-	//:AppPackage#iphoneos-arm64 \
-	//:Telegram#dwarf-and-dsym,iphoneos-arm64 \
+	//Telegram:AppPackage#iphoneos-arm64 \
+	//Telegram:Telegram#dwarf-and-dsym,iphoneos-arm64 \
 	//submodules/MtProtoKit:MtProtoKit#dwarf-and-dsym,shared,iphoneos-arm64 \
 	//submodules/MtProtoKit:MtProtoKit#shared,iphoneos-arm64 \
 	//submodules/SSignalKit/SwiftSignalKit:SwiftSignalKit#dwarf-and-dsym,shared,iphoneos-arm64 \
@@ -62,18 +85,18 @@ build_arm64: check_env
 	//submodules/Display:Display#shared,iphoneos-arm64 \
 	//submodules/TelegramUI:TelegramUI#dwarf-and-dsym,shared,iphoneos-arm64 \
 	//submodules/TelegramUI:TelegramUI#shared,iphoneos-arm64 \
-	//:WatchAppExtension#dwarf-and-dsym,watchos-arm64_32,watchos-armv7k \
-	//:ShareExtension#dwarf-and-dsym,iphoneos-arm64 \
-    //:WidgetExtension#dwarf-and-dsym,iphoneos-arm64 \
-    //:NotificationContentExtension#dwarf-and-dsym,iphoneos-arm64 \
-    //:NotificationServiceExtension#dwarf-and-dsym,iphoneos-arm64 \
-    //:IntentsExtension#dwarf-and-dsym,iphoneos-arm64 \
+	//Telegram:WatchAppExtension#dwarf-and-dsym,watchos-arm64_32,watchos-armv7k \
+	//Telegram:ShareExtension#dwarf-and-dsym,iphoneos-arm64 \
+    //Telegram:WidgetExtension#dwarf-and-dsym,iphoneos-arm64 \
+    //Telegram:NotificationContentExtension#dwarf-and-dsym,iphoneos-arm64 \
+    //Telegram:NotificationServiceExtension#dwarf-and-dsym,iphoneos-arm64 \
+    //Telegram:IntentsExtension#dwarf-and-dsym,iphoneos-arm64 \
 	${BUCK_OPTIONS} ${BUCK_RELEASE_OPTIONS} ${BUCK_THREADS_OPTIONS} ${BUCK_CACHE_OPTIONS}
 
 build_debug_arm64: check_env
 	$(BUCK) build \
-	//:AppPackage#iphoneos-arm64 \
-	//:Telegram#dwarf-and-dsym,iphoneos-arm64 \
+	//Telegram:AppPackage#iphoneos-arm64 \
+	//Telegram:Telegram#dwarf-and-dsym,iphoneos-arm64 \
 	//submodules/MtProtoKit:MtProtoKit#dwarf-and-dsym,shared,iphoneos-arm64 \
 	//submodules/MtProtoKit:MtProtoKit#shared,iphoneos-arm64 \
 	//submodules/SSignalKit/SwiftSignalKit:SwiftSignalKit#dwarf-and-dsym,shared,iphoneos-arm64 \
@@ -92,12 +115,12 @@ build_debug_arm64: check_env
 	//submodules/Display:Display#shared,iphoneos-arm64 \
 	//submodules/TelegramUI:TelegramUI#dwarf-and-dsym,shared,iphoneos-arm64 \
 	//submodules/TelegramUI:TelegramUI#shared,iphoneos-arm64 \
-	//:WatchAppExtension#dwarf-and-dsym,watchos-arm64_32,watchos-armv7k \
-	//:ShareExtension#dwarf-and-dsym,iphoneos-arm64 \
-    //:WidgetExtension#dwarf-and-dsym,iphoneos-arm64 \
-    //:NotificationContentExtension#dwarf-and-dsym,iphoneos-arm64 \
-    //:NotificationServiceExtension#dwarf-and-dsym,iphoneos-arm64 \
-    //:IntentsExtension#dwarf-and-dsym,iphoneos-arm64 \
+	//Telegram:WatchAppExtension#dwarf-and-dsym,watchos-arm64_32,watchos-armv7k \
+	//Telegram:ShareExtension#dwarf-and-dsym,iphoneos-arm64 \
+    //Telegram:WidgetExtension#dwarf-and-dsym,iphoneos-arm64 \
+    //Telegram:NotificationContentExtension#dwarf-and-dsym,iphoneos-arm64 \
+    //Telegram:NotificationServiceExtension#dwarf-and-dsym,iphoneos-arm64 \
+    //Telegram:IntentsExtension#dwarf-and-dsym,iphoneos-arm64 \
 	${BUCK_OPTIONS} ${BUCK_DEBUG_OPTIONS} ${BUCK_THREADS_OPTIONS} ${BUCK_CACHE_OPTIONS}
 
 build_wallet_debug_arm64: check_env
@@ -116,8 +139,8 @@ build_wallet_debug_arm64: check_env
 
 build_debug_armv7: check_env
 	$(BUCK) build \
-	//:AppPackage#iphoneos-armv7 \
-	//:Telegram#dwarf-and-dsym,iphoneos-armv7 \
+	//Telegram:AppPackage#iphoneos-armv7 \
+	//Telegram:Telegram#dwarf-and-dsym,iphoneos-armv7 \
 	//submodules/MtProtoKit:MtProtoKit#dwarf-and-dsym,shared,iphoneos-armv7 \
 	//submodules/MtProtoKit:MtProtoKit#shared,iphoneos-armv7 \
 	//submodules/SSignalKit/SwiftSignalKit:SwiftSignalKit#dwarf-and-dsym,shared,iphoneos-armv7 \
@@ -136,18 +159,18 @@ build_debug_armv7: check_env
 	//submodules/Display:Display#shared,iphoneos-armv7 \
 	//submodules/TelegramUI:TelegramUI#dwarf-and-dsym,shared,iphoneos-armv7 \
 	//submodules/TelegramUI:TelegramUI#shared,iphoneos-armv7 \
-	//:WatchAppExtension#dwarf-and-dsym,watchos-armv7_32,watchos-armv7k \
-	//:ShareExtension#dwarf-and-dsym,iphoneos-armv7 \
-    //:WidgetExtension#dwarf-and-dsym,iphoneos-armv7 \
-    //:NotificationContentExtension#dwarf-and-dsym,iphoneos-armv7 \
-    //:NotificationServiceExtension#dwarf-and-dsym,iphoneos-armv7 \
-    //:IntentsExtension#dwarf-and-dsym,iphoneos-armv7 \
+	//Telegram:WatchAppExtension#dwarf-and-dsym,watchos-armv7_32,watchos-armv7k \
+	//Telegram:ShareExtension#dwarf-and-dsym,iphoneos-armv7 \
+    //Telegram:WidgetExtension#dwarf-and-dsym,iphoneos-armv7 \
+    //Telegram:NotificationContentExtension#dwarf-and-dsym,iphoneos-armv7 \
+    //Telegram:NotificationServiceExtension#dwarf-and-dsym,iphoneos-armv7 \
+    //Telegram:IntentsExtension#dwarf-and-dsym,iphoneos-armv7 \
 	${BUCK_OPTIONS} ${BUCK_DEBUG_OPTIONS} ${BUCK_THREADS_OPTIONS} ${BUCK_CACHE_OPTIONS}
 
 build: check_env
 	$(BUCK) build \
-	//:AppPackage#iphoneos-arm64,iphoneos-armv7 \
-	//:Telegram#dwarf-and-dsym,iphoneos-arm64,iphoneos-armv7 \
+	//Telegram:AppPackage#iphoneos-arm64,iphoneos-armv7 \
+	//Telegram:Telegram#dwarf-and-dsym,iphoneos-arm64,iphoneos-armv7 \
 	//submodules/MtProtoKit:MtProtoKit#dwarf-and-dsym,shared,iphoneos-arm64,iphoneos-armv7 \
 	//submodules/MtProtoKit:MtProtoKit#shared,iphoneos-arm64,iphoneos-armv7 \
 	//submodules/SSignalKit/SwiftSignalKit:SwiftSignalKit#dwarf-and-dsym,shared,iphoneos-arm64,iphoneos-armv7 \
@@ -166,29 +189,29 @@ build: check_env
 	//submodules/Display:Display#shared,iphoneos-arm64,iphoneos-armv7 \
 	//submodules/TelegramUI:TelegramUI#dwarf-and-dsym,shared,iphoneos-arm64,iphoneos-armv7 \
 	//submodules/TelegramUI:TelegramUI#shared,iphoneos-arm64,iphoneos-armv7 \
-	//:WatchAppExtension#dwarf-and-dsym,watchos-arm64_32,watchos-armv7k \
-	//:ShareExtension#dwarf-and-dsym,iphoneos-arm64,iphoneos-armv7 \
-    //:WidgetExtension#dwarf-and-dsym,iphoneos-arm64,iphoneos-armv7 \
-    //:NotificationContentExtension#dwarf-and-dsym,iphoneos-arm64,iphoneos-armv7 \
-    //:NotificationServiceExtension#dwarf-and-dsym,iphoneos-arm64,iphoneos-armv7 \
-    //:IntentsExtension#dwarf-and-dsym,iphoneos-arm64,iphoneos-armv7 \
+	//Telegram:WatchAppExtension#dwarf-and-dsym,watchos-arm64_32,watchos-armv7k \
+	//Telegram:ShareExtension#dwarf-and-dsym,iphoneos-arm64,iphoneos-armv7 \
+    //Telegram:WidgetExtension#dwarf-and-dsym,iphoneos-arm64,iphoneos-armv7 \
+    //Telegram:NotificationContentExtension#dwarf-and-dsym,iphoneos-arm64,iphoneos-armv7 \
+    //Telegram:NotificationServiceExtension#dwarf-and-dsym,iphoneos-arm64,iphoneos-armv7 \
+    //Telegram:IntentsExtension#dwarf-and-dsym,iphoneos-arm64,iphoneos-armv7 \
 	${BUCK_OPTIONS} ${BUCK_RELEASE_OPTIONS} ${BUCK_THREADS_OPTIONS} ${BUCK_CACHE_OPTIONS}
 
 package_arm64:
 	PACKAGE_DEVELOPMENT_TEAM="${DEVELOPMENT_TEAM}" \
 	PACKAGE_CODE_SIGN_IDENTITY="${DISTRIBUTION_CODE_SIGN_IDENTITY}" \
 	PACKAGE_PROVISIONING_PROFILE_APP="${DISTRIBUTION_PROVISIONING_PROFILE_APP}" \
-	PACKAGE_ENTITLEMENTS_APP="${ENTITLEMENTS_APP}" \
+	PACKAGE_ENTITLEMENTS_APP="Telegram/${ENTITLEMENTS_APP}" \
 	PACKAGE_PROVISIONING_PROFILE_EXTENSION_Share="${DISTRIBUTION_PROVISIONING_PROFILE_EXTENSION_SHARE}" \
-	PACKAGE_ENTITLEMENTS_EXTENSION_Share="${ENTITLEMENTS_EXTENSION_SHARE}" \
+	PACKAGE_ENTITLEMENTS_EXTENSION_Share="Telegram/${ENTITLEMENTS_EXTENSION_SHARE}" \
 	PACKAGE_PROVISIONING_PROFILE_EXTENSION_Widget="${DISTRIBUTION_PROVISIONING_PROFILE_EXTENSION_WIDGET}" \
-	PACKAGE_ENTITLEMENTS_EXTENSION_Widget="${ENTITLEMENTS_EXTENSION_WIDGET}" \
+	PACKAGE_ENTITLEMENTS_EXTENSION_Widget="Telegram/${ENTITLEMENTS_EXTENSION_WIDGET}" \
 	PACKAGE_PROVISIONING_PROFILE_EXTENSION_NotificationService="${DISTRIBUTION_PROVISIONING_PROFILE_EXTENSION_NOTIFICATIONSERVICE}" \
-	PACKAGE_ENTITLEMENTS_EXTENSION_NotificationService="${ENTITLEMENTS_EXTENSION_NOTIFICATIONSERVICE}" \
+	PACKAGE_ENTITLEMENTS_EXTENSION_NotificationService="Telegram/${ENTITLEMENTS_EXTENSION_NOTIFICATIONSERVICE}" \
 	PACKAGE_PROVISIONING_PROFILE_EXTENSION_NotificationContent="${DISTRIBUTION_PROVISIONING_PROFILE_EXTENSION_NOTIFICATIONCONTENT}" \
-	PACKAGE_ENTITLEMENTS_EXTENSION_NotificationContent="${ENTITLEMENTS_EXTENSION_NOTIFICATIONCONTENT}" \
+	PACKAGE_ENTITLEMENTS_EXTENSION_NotificationContent="Telegram/${ENTITLEMENTS_EXTENSION_NOTIFICATIONCONTENT}" \
 	PACKAGE_PROVISIONING_PROFILE_EXTENSION_Intents="${DISTRIBUTION_PROVISIONING_PROFILE_EXTENSION_INTENTS}" \
-	PACKAGE_ENTITLEMENTS_EXTENSION_Intents="${ENTITLEMENTS_EXTENSION_INTENTS}" \
+	PACKAGE_ENTITLEMENTS_EXTENSION_Intents="Telegram/${ENTITLEMENTS_EXTENSION_INTENTS}" \
 	PACKAGE_PROVISIONING_PROFILE_WATCH_APP="${DISTRIBUTION_PROVISIONING_PROFILE_WATCH_APP}" \
 	PACKAGE_PROVISIONING_PROFILE_WATCH_EXTENSION="${DISTRIBUTION_PROVISIONING_PROFILE_WATCH_EXTENSION}" \
 	PACKAGE_BUNDLE_ID="${BUNDLE_ID}" \
@@ -198,17 +221,17 @@ package_armv7:
 	PACKAGE_DEVELOPMENT_TEAM="${DEVELOPMENT_TEAM}" \
 	PACKAGE_CODE_SIGN_IDENTITY="${DISTRIBUTION_CODE_SIGN_IDENTITY}" \
 	PACKAGE_PROVISIONING_PROFILE_APP="${DISTRIBUTION_PROVISIONING_PROFILE_APP}" \
-	PACKAGE_ENTITLEMENTS_APP="${ENTITLEMENTS_APP}" \
+	PACKAGE_ENTITLEMENTS_APP="Telegram/${ENTITLEMENTS_APP}" \
 	PACKAGE_PROVISIONING_PROFILE_EXTENSION_Share="${DISTRIBUTION_PROVISIONING_PROFILE_EXTENSION_SHARE}" \
-	PACKAGE_ENTITLEMENTS_EXTENSION_Share="${ENTITLEMENTS_EXTENSION_SHARE}" \
+	PACKAGE_ENTITLEMENTS_EXTENSION_Share="Telegram/${ENTITLEMENTS_EXTENSION_SHARE}" \
 	PACKAGE_PROVISIONING_PROFILE_EXTENSION_Widget="${DISTRIBUTION_PROVISIONING_PROFILE_EXTENSION_WIDGET}" \
-	PACKAGE_ENTITLEMENTS_EXTENSION_Widget="${ENTITLEMENTS_EXTENSION_WIDGET}" \
+	PACKAGE_ENTITLEMENTS_EXTENSION_Widget="Telegram/${ENTITLEMENTS_EXTENSION_WIDGET}" \
 	PACKAGE_PROVISIONING_PROFILE_EXTENSION_NotificationService="${DISTRIBUTION_PROVISIONING_PROFILE_EXTENSION_NOTIFICATIONSERVICE}" \
-	PACKAGE_ENTITLEMENTS_EXTENSION_NotificationService="${ENTITLEMENTS_EXTENSION_NOTIFICATIONSERVICE}" \
+	PACKAGE_ENTITLEMENTS_EXTENSION_NotificationService="Telegram/${ENTITLEMENTS_EXTENSION_NOTIFICATIONSERVICE}" \
 	PACKAGE_PROVISIONING_PROFILE_EXTENSION_NotificationContent="${DISTRIBUTION_PROVISIONING_PROFILE_EXTENSION_NOTIFICATIONCONTENT}" \
-	PACKAGE_ENTITLEMENTS_EXTENSION_NotificationContent="${ENTITLEMENTS_EXTENSION_NOTIFICATIONCONTENT}" \
+	PACKAGE_ENTITLEMENTS_EXTENSION_NotificationContent="Telegram/${ENTITLEMENTS_EXTENSION_NOTIFICATIONCONTENT}" \
 	PACKAGE_PROVISIONING_PROFILE_EXTENSION_Intents="${DISTRIBUTION_PROVISIONING_PROFILE_EXTENSION_INTENTS}" \
-	PACKAGE_ENTITLEMENTS_EXTENSION_Intents="${ENTITLEMENTS_EXTENSION_INTENTS}" \
+	PACKAGE_ENTITLEMENTS_EXTENSION_Intents="Telegram/${ENTITLEMENTS_EXTENSION_INTENTS}" \
 	PACKAGE_PROVISIONING_PROFILE_WATCH_APP="${DISTRIBUTION_PROVISIONING_PROFILE_WATCH_APP}" \
 	PACKAGE_PROVISIONING_PROFILE_WATCH_EXTENSION="${DISTRIBUTION_PROVISIONING_PROFILE_WATCH_EXTENSION}" \
 	PACKAGE_BUNDLE_ID="${BUNDLE_ID}" \
@@ -218,17 +241,17 @@ package_debug_arm64:
 	PACKAGE_DEVELOPMENT_TEAM="${DEVELOPMENT_TEAM}" \
 	PACKAGE_CODE_SIGN_IDENTITY="${DEVELOPMENT_CODE_SIGN_IDENTITY}" \
 	PACKAGE_PROVISIONING_PROFILE_APP="${DEVELOPMENT_PROVISIONING_PROFILE_APP}" \
-	PACKAGE_ENTITLEMENTS_APP="${ENTITLEMENTS_APP}" \
+	PACKAGE_ENTITLEMENTS_APP="Telegram/${ENTITLEMENTS_APP}" \
 	PACKAGE_PROVISIONING_PROFILE_EXTENSION_Share="${DEVELOPMENT_PROVISIONING_PROFILE_EXTENSION_SHARE}" \
-	PACKAGE_ENTITLEMENTS_EXTENSION_Share="${ENTITLEMENTS_EXTENSION_SHARE}" \
+	PACKAGE_ENTITLEMENTS_EXTENSION_Share="Telegram/${ENTITLEMENTS_EXTENSION_SHARE}" \
 	PACKAGE_PROVISIONING_PROFILE_EXTENSION_Widget="${DEVELOPMENT_PROVISIONING_PROFILE_EXTENSION_WIDGET}" \
-	PACKAGE_ENTITLEMENTS_EXTENSION_Widget="${ENTITLEMENTS_EXTENSION_WIDGET}" \
+	PACKAGE_ENTITLEMENTS_EXTENSION_Widget="Telegram/${ENTITLEMENTS_EXTENSION_WIDGET}" \
 	PACKAGE_PROVISIONING_PROFILE_EXTENSION_NotificationService="${DEVELOPMENT_PROVISIONING_PROFILE_EXTENSION_NOTIFICATIONSERVICE}" \
-	PACKAGE_ENTITLEMENTS_EXTENSION_NotificationService="${ENTITLEMENTS_EXTENSION_NOTIFICATIONSERVICE}" \
+	PACKAGE_ENTITLEMENTS_EXTENSION_NotificationService="Telegram/${ENTITLEMENTS_EXTENSION_NOTIFICATIONSERVICE}" \
 	PACKAGE_PROVISIONING_PROFILE_EXTENSION_NotificationContent="${DEVELOPMENT_PROVISIONING_PROFILE_EXTENSION_NOTIFICATIONCONTENT}" \
-	PACKAGE_ENTITLEMENTS_EXTENSION_NotificationContent="${ENTITLEMENTS_EXTENSION_NOTIFICATIONCONTENT}" \
+	PACKAGE_ENTITLEMENTS_EXTENSION_NotificationContent="Telegram/${ENTITLEMENTS_EXTENSION_NOTIFICATIONCONTENT}" \
 	PACKAGE_PROVISIONING_PROFILE_EXTENSION_Intents="${DEVELOPMENT_PROVISIONING_PROFILE_EXTENSION_INTENTS}" \
-	PACKAGE_ENTITLEMENTS_EXTENSION_Intents="${ENTITLEMENTS_EXTENSION_INTENTS}" \
+	PACKAGE_ENTITLEMENTS_EXTENSION_Intents="Telegram/${ENTITLEMENTS_EXTENSION_INTENTS}" \
 	PACKAGE_PROVISIONING_PROFILE_WATCH_APP="${DEVELOPMENT_PROVISIONING_PROFILE_WATCH_APP}" \
 	PACKAGE_PROVISIONING_PROFILE_WATCH_EXTENSION="${DEVELOPMENT_PROVISIONING_PROFILE_WATCH_EXTENSION}" \
 	PACKAGE_BUNDLE_ID="${BUNDLE_ID}" \
@@ -240,17 +263,17 @@ package_debug_armv7:
 	PACKAGE_DEVELOPMENT_TEAM="${DEVELOPMENT_TEAM}" \
 	PACKAGE_CODE_SIGN_IDENTITY="${DEVELOPMENT_CODE_SIGN_IDENTITY}" \
 	PACKAGE_PROVISIONING_PROFILE_APP="${DEVELOPMENT_PROVISIONING_PROFILE_APP}" \
-	PACKAGE_ENTITLEMENTS_APP="${ENTITLEMENTS_APP}" \
+	PACKAGE_ENTITLEMENTS_APP="Telegram/${ENTITLEMENTS_APP}" \
 	PACKAGE_PROVISIONING_PROFILE_EXTENSION_Share="${DEVELOPMENT_PROVISIONING_PROFILE_EXTENSION_SHARE}" \
-	PACKAGE_ENTITLEMENTS_EXTENSION_Share="${ENTITLEMENTS_EXTENSION_SHARE}" \
+	PACKAGE_ENTITLEMENTS_EXTENSION_Share="Telegram/${ENTITLEMENTS_EXTENSION_SHARE}" \
 	PACKAGE_PROVISIONING_PROFILE_EXTENSION_Widget="${DEVELOPMENT_PROVISIONING_PROFILE_EXTENSION_WIDGET}" \
-	PACKAGE_ENTITLEMENTS_EXTENSION_Widget="${ENTITLEMENTS_EXTENSION_WIDGET}" \
+	PACKAGE_ENTITLEMENTS_EXTENSION_Widget="Telegram/${ENTITLEMENTS_EXTENSION_WIDGET}" \
 	PACKAGE_PROVISIONING_PROFILE_EXTENSION_NotificationService="${DEVELOPMENT_PROVISIONING_PROFILE_EXTENSION_NOTIFICATIONSERVICE}" \
-	PACKAGE_ENTITLEMENTS_EXTENSION_NotificationService="${ENTITLEMENTS_EXTENSION_NOTIFICATIONSERVICE}" \
+	PACKAGE_ENTITLEMENTS_EXTENSION_NotificationService="Telegram/${ENTITLEMENTS_EXTENSION_NOTIFICATIONSERVICE}" \
 	PACKAGE_PROVISIONING_PROFILE_EXTENSION_NotificationContent="${DEVELOPMENT_PROVISIONING_PROFILE_EXTENSION_NOTIFICATIONCONTENT}" \
-	PACKAGE_ENTITLEMENTS_EXTENSION_NotificationContent="${ENTITLEMENTS_EXTENSION_NOTIFICATIONCONTENT}" \
+	PACKAGE_ENTITLEMENTS_EXTENSION_NotificationContent="Telegram/${ENTITLEMENTS_EXTENSION_NOTIFICATIONCONTENT}" \
 	PACKAGE_PROVISIONING_PROFILE_EXTENSION_Intents="${DEVELOPMENT_PROVISIONING_PROFILE_EXTENSION_INTENTS}" \
-	PACKAGE_ENTITLEMENTS_EXTENSION_Intents="${ENTITLEMENTS_EXTENSION_INTENTS}" \
+	PACKAGE_ENTITLEMENTS_EXTENSION_Intents="Telegram/${ENTITLEMENTS_EXTENSION_INTENTS}" \
 	PACKAGE_PROVISIONING_PROFILE_WATCH_APP="${DEVELOPMENT_PROVISIONING_PROFILE_WATCH_APP}" \
 	PACKAGE_PROVISIONING_PROFILE_WATCH_EXTENSION="${DEVELOPMENT_PROVISIONING_PROFILE_WATCH_EXTENSION}" \
 	PACKAGE_BUNDLE_ID="${BUNDLE_ID}" \
@@ -262,17 +285,17 @@ package:
 	PACKAGE_DEVELOPMENT_TEAM="${DEVELOPMENT_TEAM}" \
 	PACKAGE_CODE_SIGN_IDENTITY="${DISTRIBUTION_CODE_SIGN_IDENTITY}" \
 	PACKAGE_PROVISIONING_PROFILE_APP="${DISTRIBUTION_PROVISIONING_PROFILE_APP}" \
-	PACKAGE_ENTITLEMENTS_APP="${ENTITLEMENTS_APP}" \
+	PACKAGE_ENTITLEMENTS_APP="Telegram/${ENTITLEMENTS_APP}" \
 	PACKAGE_PROVISIONING_PROFILE_EXTENSION_Share="${DISTRIBUTION_PROVISIONING_PROFILE_EXTENSION_SHARE}" \
-	PACKAGE_ENTITLEMENTS_EXTENSION_Share="${ENTITLEMENTS_EXTENSION_SHARE}" \
+	PACKAGE_ENTITLEMENTS_EXTENSION_Share="Telegram/${ENTITLEMENTS_EXTENSION_SHARE}" \
 	PACKAGE_PROVISIONING_PROFILE_EXTENSION_Widget="${DISTRIBUTION_PROVISIONING_PROFILE_EXTENSION_WIDGET}" \
-	PACKAGE_ENTITLEMENTS_EXTENSION_Widget="${ENTITLEMENTS_EXTENSION_WIDGET}" \
+	PACKAGE_ENTITLEMENTS_EXTENSION_Widget="Telegram/${ENTITLEMENTS_EXTENSION_WIDGET}" \
 	PACKAGE_PROVISIONING_PROFILE_EXTENSION_NotificationService="${DISTRIBUTION_PROVISIONING_PROFILE_EXTENSION_NOTIFICATIONSERVICE}" \
-	PACKAGE_ENTITLEMENTS_EXTENSION_NotificationService="${ENTITLEMENTS_EXTENSION_NOTIFICATIONSERVICE}" \
+	PACKAGE_ENTITLEMENTS_EXTENSION_NotificationService="Telegram/${ENTITLEMENTS_EXTENSION_NOTIFICATIONSERVICE}" \
 	PACKAGE_PROVISIONING_PROFILE_EXTENSION_NotificationContent="${DISTRIBUTION_PROVISIONING_PROFILE_EXTENSION_NOTIFICATIONCONTENT}" \
-	PACKAGE_ENTITLEMENTS_EXTENSION_NotificationContent="${ENTITLEMENTS_EXTENSION_NOTIFICATIONCONTENT}" \
+	PACKAGE_ENTITLEMENTS_EXTENSION_NotificationContent="Telegram/${ENTITLEMENTS_EXTENSION_NOTIFICATIONCONTENT}" \
 	PACKAGE_PROVISIONING_PROFILE_EXTENSION_Intents="${DISTRIBUTION_PROVISIONING_PROFILE_EXTENSION_INTENTS}" \
-	PACKAGE_ENTITLEMENTS_EXTENSION_Intents="${ENTITLEMENTS_EXTENSION_INTENTS}" \
+	PACKAGE_ENTITLEMENTS_EXTENSION_Intents="Telegram/${ENTITLEMENTS_EXTENSION_INTENTS}" \
 	PACKAGE_PROVISIONING_PROFILE_WATCH_APP="${DISTRIBUTION_PROVISIONING_PROFILE_WATCH_APP}" \
 	PACKAGE_PROVISIONING_PROFILE_WATCH_EXTENSION="${DISTRIBUTION_PROVISIONING_PROFILE_WATCH_EXTENSION}" \
 	PACKAGE_BUNDLE_ID="${BUNDLE_ID}" \
@@ -290,8 +313,8 @@ app_debug_armv7: build_debug_armv7 package_debug_armv7
 
 build_buckdebug: check_env
 	BUCK_DEBUG_MODE=1 $(BUCK) build \
-	//:AppPackage#iphoneos-arm64 \
-	//:Telegram#dwarf-and-dsym,iphoneos-arm64 \
+	//Telegram:AppPackage#iphoneos-arm64 \
+	//Telegram:Telegram#dwarf-and-dsym,iphoneos-arm64 \
 	//submodules/MtProtoKit:MtProtoKit#dwarf-and-dsym,shared,iphoneos-arm64 \
 	//submodules/MtProtoKit:MtProtoKit#shared,iphoneos-arm64 \
 	//submodules/SSignalKit/SwiftSignalKit:SwiftSignalKit#dwarf-and-dsym,shared,iphoneos-arm64 \
@@ -310,28 +333,18 @@ build_buckdebug: check_env
 	//submodules/Display:Display#shared,iphoneos-arm64 \
 	//submodules/TelegramUI:TelegramUI#dwarf-and-dsym,shared,iphoneos-arm64 \
 	//submodules/TelegramUI:TelegramUI#shared,iphoneos-arm64 \
-	//:WatchAppExtension#dwarf-and-dsym,watchos-arm64_32,watchos-armv7k \
-	//:ShareExtension#dwarf-and-dsym,iphoneos-arm64 \
-    //:WidgetExtension#dwarf-and-dsym,iphoneos-arm64 \
-    //:NotificationContentExtension#dwarf-and-dsym,iphoneos-arm64 \
-    //:NotificationServiceExtension#dwarf-and-dsym,iphoneos-arm64 \
-    //:IntentsExtension#dwarf-and-dsym,iphoneos-arm64 \
+	//Telegram:WatchAppExtension#dwarf-and-dsym,watchos-arm64_32,watchos-armv7k \
+	//Telegram:ShareExtension#dwarf-and-dsym,iphoneos-arm64 \
+    //Telegram:WidgetExtension#dwarf-and-dsym,iphoneos-arm64 \
+    //Telegram:NotificationContentExtension#dwarf-and-dsym,iphoneos-arm64 \
+    //Telegram:NotificationServiceExtension#dwarf-and-dsym,iphoneos-arm64 \
+    //Telegram:IntentsExtension#dwarf-and-dsym,iphoneos-arm64 \
     --verbose 7 ${BUCK_OPTIONS} ${BUCK_DEBUG_OPTIONS}
 
-build_buckdebug_one: check_env
-	BUCK_DEBUG_MODE=1 $(BUCK) build \
-	//submodules/Postbox:Postbox#shared,iphoneos-arm64 \
-	--verbose 7 ${BUCK_OPTIONS} ${BUCK_DEBUG_OPTIONS}
-
-build_verbose_one: check_env
-	$(BUCK) build \
-	//submodules/Postbox:Postbox#shared,iphoneos-arm64 \
-	--verbose 7 ${BUCK_OPTIONS} ${BUCK_DEBUG_OPTIONS}
-
 build_verbose: check_env
 	$(BUCK) build \
-	//:AppPackage#iphoneos-arm64 \
-	//:Telegram#dwarf-and-dsym,iphoneos-arm64 \
+	//Telegram:AppPackage#iphoneos-arm64 \
+	//Telegram:Telegram#dwarf-and-dsym,iphoneos-arm64 \
 	//submodules/MtProtoKit:MtProtoKit#dwarf-and-dsym,shared,iphoneos-arm64 \
 	//submodules/MtProtoKit:MtProtoKit#shared,iphoneos-arm64 \
 	//submodules/SSignalKit/SwiftSignalKit:SwiftSignalKit#dwarf-and-dsym,shared,iphoneos-arm64 \
@@ -350,48 +363,66 @@ build_verbose: check_env
 	//submodules/Display:Display#shared,iphoneos-arm64 \
 	//submodules/TelegramUI:TelegramUI#dwarf-and-dsym,shared,iphoneos-arm64 \
 	//submodules/TelegramUI:TelegramUI#shared,iphoneos-arm64 \
-	//:WatchAppExtension#dwarf-and-dsym,watchos-arm64_32,watchos-armv7k \
-	//:ShareExtension#dwarf-and-dsym,iphoneos-arm64 \
-	//:WidgetExtension#dwarf-and-dsym,iphoneos-arm64 \
-	//:NotificationContentExtension#dwarf-and-dsym,iphoneos-arm64 \
-	//:NotificationServiceExtension#dwarf-and-dsym,iphoneos-arm64 \
-	//:IntentsExtension#dwarf-and-dsym,iphoneos-arm64 \
+	//Telegram:WatchAppExtension#dwarf-and-dsym,watchos-arm64_32,watchos-armv7k \
+	//Telegram:ShareExtension#dwarf-and-dsym,iphoneos-arm64 \
+	//Telegram:WidgetExtension#dwarf-and-dsym,iphoneos-arm64 \
+	//Telegram:NotificationContentExtension#dwarf-and-dsym,iphoneos-arm64 \
+	//Telegram:NotificationServiceExtension#dwarf-and-dsym,iphoneos-arm64 \
+	//Telegram:IntentsExtension#dwarf-and-dsym,iphoneos-arm64 \
 	--verbose 7 ${BUCK_OPTIONS} ${BUCK_THREADS_OPTIONS} ${BUCK_DEBUG_OPTIONS} ${BUCK_CACHE_OPTIONS}
 
 deps: check_env
-	$(BUCK) query "deps(//:AppPackage)" --dot  \
+	$(BUCK) query "deps(//Telegram:AppPackage)" --dot  \
 	${BUCK_OPTIONS} ${BUCK_DEBUG_OPTIONS}
 
-build_openssl: check_env
-	$(BUCK) build \
-	//submodules/openssl:openssl#iphoneos-arm64 \
-	--verbose 7 ${BUCK_OPTIONS} ${BUCK_THREADS_OPTIONS} ${BUCK_DEBUG_OPTIONS}
-
-build_libphonenumber: check_env
-	$(BUCK) build \
-	//submodules/libphonenumber:libphonenumber#iphoneos-arm64 \
-	${BUCK_OPTIONS} ${BUCK_THREADS_OPTIONS} ${BUCK_DEBUG_OPTIONS}
-
-build_ton: check_env
-	$(BUCK) build \
-	//submodules/ton:ton#iphoneos-arm64 \
-	--verbose 7 ${BUCK_OPTIONS} ${BUCK_THREADS_OPTIONS} ${BUCK_DEBUG_OPTIONS}
-
 clean: kill_xcode
 	sh clean.sh
 
 project: check_env kill_xcode
-	$(BUCK) project //:workspace --config custom.mode=project ${BUCK_OPTIONS} ${BUCK_DEBUG_OPTIONS}
-	open Telegram_Buck.xcworkspace
+	$(BUCK) project //Telegram:workspace --config custom.mode=project ${BUCK_OPTIONS} ${BUCK_DEBUG_OPTIONS}
+	open Telegram/Telegram_Buck.xcworkspace
 
-project_opt: check_env kill_xcode
-	$(BUCK) project //:workspace --config custom.mode=project ${BUCK_OPTIONS} ${BUCK_RELEASE_OPTIONS}
-	open Telegram_Buck.xcworkspace
+bazel_app_debug_arm64:
+	APP_VERSION="${APP_VERSION}" \
+	build-system/prepare-build.sh distribution
+	"${BAZEL}" build Telegram/Telegram ${BAZEL_CACHE_FLAGS} ${BAZEL_COMMON_FLAGS} ${BAZEL_DEBUG_FLAGS} \
+	-c dbg \
+	--ios_multi_cpus=arm64 \
+	--watchos_cpus=armv7k,arm64_32 \
+	--verbose_failures
 
-project_buckdebug: check_env kill_xcode
-	BUCK_DEBUG_MODE=1 $(BUCK) project //:workspace --config custom.mode=project ${BUCK_OPTIONS} ${BUCK_DEBUG_OPTIONS}
-	open Telegram_Buck.xcworkspace
+bazel_app_arm64:
+	APP_VERSION="${APP_VERSION}" \
+	BAZEL_CACHE_DIR="${BAZEL_CACHE_DIR}" \
+	build-system/prepare-build.sh distribution
+	"${BAZEL}" build Telegram/Telegram ${BAZEL_CACHE_FLAGS} ${BAZEL_COMMON_FLAGS} ${BAZEL_OPT_FLAGS} \
+	-c opt \
+	--ios_multi_cpus=arm64 \
+	--watchos_cpus=armv7k,arm64_32 \
+	--objc_enable_binary_stripping=true \
+	--features=dead_strip \
+	--apple_generate_dsym \
+	--output_groups=+dsyms \
+	--verbose_failures
+
+bazel_prepare_development_build:
+	APP_VERSION="${APP_VERSION}" \
+	BAZEL_CACHE_DIR="${BAZEL_CACHE_DIR}" \
+	build-system/prepare-build.sh development
+
+bazel_project: kill_xcode bazel_prepare_development_build
+	APP_VERSION="${APP_VERSION}" \
+	BAZEL_CACHE_DIR="${BAZEL_CACHE_DIR}" \
+	build-system/generate-xcode-project.sh
+
+bazel_soft_project: bazel_prepare_development_build
+	APP_VERSION="${APP_VERSION}" \
+	BAZEL_CACHE_DIR="${BAZEL_CACHE_DIR}" \
+	build-system/generate-xcode-project.sh
+
+bazel_opt_project: bazel_prepare_development_build
+	APP_VERSION="${APP_VERSION}" \
+	BAZEL_CACHE_DIR="${BAZEL_CACHE_DIR}" \
+	GENERATE_OPT_PROJECT=1 \
+	build-system/generate-xcode-project.sh
 
-temp_project: check_env kill_xcode
-	$(BUCK) project //Temp:workspace --config custom.mode=project ${BUCK_OPTIONS} ${BUCK_DEBUG_OPTIONS}
-	open Temp/Telegram_Buck.xcworkspace
diff --git a/Telegram-iOS UITests/Images/Bitmap1.png b/Telegram-iOS UITests/Images/Bitmap1.png
deleted file mode 100644
index f0dbe85f17..0000000000
Binary files a/Telegram-iOS UITests/Images/Bitmap1.png and /dev/null differ
diff --git a/Telegram-iOS UITests/Images/Bitmap10.png b/Telegram-iOS UITests/Images/Bitmap10.png
deleted file mode 100644
index ac46a069b7..0000000000
Binary files a/Telegram-iOS UITests/Images/Bitmap10.png and /dev/null differ
diff --git a/Telegram-iOS UITests/Images/Bitmap11.png b/Telegram-iOS UITests/Images/Bitmap11.png
deleted file mode 100644
index d64c41bae2..0000000000
Binary files a/Telegram-iOS UITests/Images/Bitmap11.png and /dev/null differ
diff --git a/Telegram-iOS UITests/Images/Bitmap12.png b/Telegram-iOS UITests/Images/Bitmap12.png
deleted file mode 100644
index 2f450cf3eb..0000000000
Binary files a/Telegram-iOS UITests/Images/Bitmap12.png and /dev/null differ
diff --git a/Telegram-iOS UITests/Images/Bitmap2.png b/Telegram-iOS UITests/Images/Bitmap2.png
deleted file mode 100644
index 149b4d88e5..0000000000
Binary files a/Telegram-iOS UITests/Images/Bitmap2.png and /dev/null differ
diff --git a/Telegram-iOS UITests/Images/Bitmap3.png b/Telegram-iOS UITests/Images/Bitmap3.png
deleted file mode 100644
index 66b3bef10f..0000000000
Binary files a/Telegram-iOS UITests/Images/Bitmap3.png and /dev/null differ
diff --git a/Telegram-iOS UITests/Images/Bitmap5.png b/Telegram-iOS UITests/Images/Bitmap5.png
deleted file mode 100644
index a053de0159..0000000000
Binary files a/Telegram-iOS UITests/Images/Bitmap5.png and /dev/null differ
diff --git a/Telegram-iOS UITests/Images/Bitmap6.png b/Telegram-iOS UITests/Images/Bitmap6.png
deleted file mode 100644
index 7f3854f431..0000000000
Binary files a/Telegram-iOS UITests/Images/Bitmap6.png and /dev/null differ
diff --git a/Telegram-iOS UITests/Images/Bitmap7.png b/Telegram-iOS UITests/Images/Bitmap7.png
deleted file mode 100644
index 346939bbd7..0000000000
Binary files a/Telegram-iOS UITests/Images/Bitmap7.png and /dev/null differ
diff --git a/Telegram-iOS UITests/Images/Bitmap8.png b/Telegram-iOS UITests/Images/Bitmap8.png
deleted file mode 100644
index 7a32f43fdb..0000000000
Binary files a/Telegram-iOS UITests/Images/Bitmap8.png and /dev/null differ
diff --git a/Telegram-iOS UITests/Images/Bitmap9.png b/Telegram-iOS UITests/Images/Bitmap9.png
deleted file mode 100644
index 07fa8d4aa5..0000000000
Binary files a/Telegram-iOS UITests/Images/Bitmap9.png and /dev/null differ
diff --git a/Telegram-iOS UITests/Info.plist b/Telegram-iOS UITests/Info.plist
deleted file mode 100644
index 469d7cc131..0000000000
--- a/Telegram-iOS UITests/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>BNDL</string>
-	<key>CFBundleShortVersionString</key>
-	<string>1.0</string>
-	<key>CFBundleVersion</key>
-	<string>667</string>
-</dict>
-</plist>
diff --git a/Telegram-iOS UITests/SnapshotHelper.swift b/Telegram-iOS UITests/SnapshotHelper.swift
deleted file mode 100644
index 3ba8f8cdfb..0000000000
--- a/Telegram-iOS UITests/SnapshotHelper.swift	
+++ /dev/null
@@ -1,196 +0,0 @@
-//
-//  SnapshotHelper.swift
-//  Example
-//
-//  Created by Felix Krause on 10/8/15.
-//  Copyright © 2015 Felix Krause. All rights reserved.
-//
-
-// -----------------------------------------------------
-// IMPORTANT: When modifying this file, make sure to
-//            increment the version number at the very
-//            bottom of the file to notify users about
-//            the new SnapshotHelper.swift
-// -----------------------------------------------------
-
-import Foundation
-import XCTest
-
-var deviceLanguage = ""
-var locale = ""
-
-@available(*, deprecated, message: "use setupSnapshot: instead")
-func setLanguage(_ app: XCUIApplication) {
-    setupSnapshot(app)
-}
-
-func setupSnapshot(_ app: XCUIApplication) {
-    Snapshot.setupSnapshot(app)
-}
-
-func snapshot(_ name: String, waitForLoadingIndicator: Bool = true) {
-    Snapshot.snapshot(name, waitForLoadingIndicator: waitForLoadingIndicator)
-}
-
-enum SnapshotError: Error, CustomDebugStringConvertible {
-    case cannotDetectUser
-    case cannotFindHomeDirectory
-    case cannotFindSimulatorHomeDirectory
-    case cannotAccessSimulatorHomeDirectory(String)
-    
-    var debugDescription: String {
-        switch self {
-        case .cannotDetectUser:
-            return "Couldn't find Snapshot configuration files - can't detect current user "
-        case .cannotFindHomeDirectory:
-            return "Couldn't find Snapshot configuration files - can't detect `Users` dir"
-        case .cannotFindSimulatorHomeDirectory:
-            return "Couldn't find simulator home location. Please, check SIMULATOR_HOST_HOME env variable."
-        case .cannotAccessSimulatorHomeDirectory(let simulatorHostHome):
-            return "Can't prepare environment. Simulator home location is inaccessible. Does \(simulatorHostHome) exist?"
-        }
-    }
-}
-
-open class Snapshot: NSObject {
-    static var app: XCUIApplication!
-    static var cacheDirectory: URL!
-    static var screenshotsDirectory: URL? {
-        return cacheDirectory.appendingPathComponent("screenshots", isDirectory: true)
-    }
-
-    open class func setupSnapshot(_ app: XCUIApplication) {
-        do {
-            let cacheDir = try pathPrefix()
-            Snapshot.cacheDirectory = cacheDir
-            print("cacheDir \(cacheDir)")
-            Snapshot.app = app
-            setLanguage(app)
-            setLocale(app)
-            setLaunchArguments(app)
-        } catch let error {
-            print(error)
-        }
-    }
-
-    class func setLanguage(_ app: XCUIApplication) {
-        let path = cacheDirectory.appendingPathComponent("language.txt")
-
-        do {
-            let trimCharacterSet = CharacterSet.whitespacesAndNewlines
-            deviceLanguage = try String(contentsOf: path, encoding: .utf8).trimmingCharacters(in: trimCharacterSet)
-            app.launchArguments += ["-AppleLanguages", "(\(deviceLanguage))"]
-        } catch {
-            print("Couldn't detect/set language...")
-        }
-    }
-
-    class func setLocale(_ app: XCUIApplication) {
-        let path = cacheDirectory.appendingPathComponent("locale.txt")
-
-        do {
-            let trimCharacterSet = CharacterSet.whitespacesAndNewlines
-            locale = try String(contentsOf: path, encoding: .utf8).trimmingCharacters(in: trimCharacterSet)
-        } catch {
-            print("Couldn't detect/set locale...")
-        }
-        if locale.isEmpty {
-            locale = Locale(identifier: deviceLanguage).identifier
-        }
-        app.launchArguments += ["-AppleLocale", "\"\(locale)\""]
-    }
-
-    class func setLaunchArguments(_ app: XCUIApplication) {
-        let path = cacheDirectory.appendingPathComponent("snapshot-launch_arguments.txt")
-        app.launchArguments += ["-FASTLANE_SNAPSHOT", "YES", "-ui_testing"]
-
-        do {
-            let launchArguments = try String(contentsOf: path, encoding: String.Encoding.utf8)
-            let regex = try NSRegularExpression(pattern: "(\\\".+?\\\"|\\S+)", options: [])
-            let matches = regex.matches(in: launchArguments, options: [], range: NSRange(location:0, length: launchArguments.count))
-            let results = matches.map { result -> String in
-                (launchArguments as NSString).substring(with: result.range)
-            }
-            app.launchArguments += results
-        } catch {
-            print("Couldn't detect/set launch_arguments...")
-        }
-    }
-
-    open class func snapshot(_ name: String, waitForLoadingIndicator: Bool = true) {
-        if waitForLoadingIndicator {
-            waitForLoadingIndicatorToDisappear()
-        }
-
-        print("snapshot: \(name)") // more information about this, check out https://github.com/fastlane/fastlane/tree/master/snapshot#how-does-it-work
-
-        sleep(1) // Waiting for the animation to be finished (kind of)
-
-        #if os(OSX)
-            XCUIApplication().typeKey(XCUIKeyboardKeySecondaryFn, modifierFlags: [])
-        #else
-            let screenshot = app.windows.firstMatch.screenshot()
-            guard let simulator = ProcessInfo().environment["SIMULATOR_DEVICE_NAME"], let screenshotsDir = screenshotsDirectory else { return }
-            let path = screenshotsDir.appendingPathComponent("\(simulator)-\(name).png")
-            do {
-                try screenshot.pngRepresentation.write(to: path)
-            } catch let error {
-                print("Problem writing screenshot: \(name) to \(path)")
-                print(error)
-            }
-        #endif
-    }
-
-    class func waitForLoadingIndicatorToDisappear() {
-        #if os(tvOS)
-            return
-        #endif
-
-        let query = XCUIApplication().statusBars.children(matching: .other).element(boundBy: 1).children(matching: .other)
-
-        while (0..<query.count).map({ query.element(boundBy: $0) }).contains(where: { $0.isLoadingIndicator }) {
-            sleep(1)
-            print("Waiting for loading indicator to disappear...")
-        }
-    }
-
-    class func pathPrefix() throws -> URL? {
-        let homeDir: URL
-        // on OSX config is stored in /Users/<username>/Library
-        // and on iOS/tvOS/WatchOS it's in simulator's home dir
-        #if os(OSX)
-            guard let user = ProcessInfo().environment["USER"] else {
-                throw SnapshotError.cannotDetectUser
-            }
-
-            guard let usersDir =  FileManager.default.urls(for: .userDirectory, in: .localDomainMask).first else {
-                throw SnapshotError.cannotFindHomeDirectory
-            }
-
-            homeDir = usersDir.appendingPathComponent(user)
-        #else
-            guard let simulatorHostHome = ProcessInfo().environment["SIMULATOR_HOST_HOME"] else {
-                throw SnapshotError.cannotFindSimulatorHomeDirectory
-            }
-            guard let homeDirUrl = URL(string: simulatorHostHome) else {
-                throw SnapshotError.cannotAccessSimulatorHomeDirectory(simulatorHostHome)
-            }
-            homeDir = URL(fileURLWithPath: homeDirUrl.path)
-        #endif
-        return homeDir.appendingPathComponent("Library/Caches/tools.fastlane")
-    }
-}
-
-extension XCUIElement {
-    var isLoadingIndicator: Bool {
-        let whiteListedLoaders = ["GeofenceLocationTrackingOn", "StandardLocationTrackingOn"]
-        if whiteListedLoaders.contains(self.identifier) {
-            return false
-        }
-        return self.frame.size == CGSize(width: 10, height: 20)
-    }
-}
-
-// Please don't remove the lines below
-// They are used to detect outdated configuration files
-// SnapshotHelperVersion [1.5]
diff --git a/Telegram-iOS UITests/Telegram_iOS_UITests.swift b/Telegram-iOS UITests/Telegram_iOS_UITests.swift
deleted file mode 100644
index 77877422c0..0000000000
--- a/Telegram-iOS UITests/Telegram_iOS_UITests.swift	
+++ /dev/null
@@ -1,53 +0,0 @@
-import XCTest
-
-class Telegram_iOS_UITests: XCTestCase {
-    var app: XCUIApplication!
-    
-    override func setUp() {
-        super.setUp()
-        
-        self.continueAfterFailure = false
-        
-        self.app = XCUIApplication()
-        let path = Bundle(for: type(of: self)).bundlePath
-        
-        self.app.launchEnvironment["snapshot-data-path"] = path
-        setupSnapshot(app)
-    }
-    
-    override func tearDown() {
-        super.tearDown()
-    }
-    
-    func testChatList() {
-        self.app.launchArguments = ["snapshot:chat-list"]
-        self.app.launch()
-        XCTAssert(self.app.wait(for: .runningForeground, timeout: 10.0))
-        snapshot("01ChatList")
-        sleep(1)
-    }
-    
-    func testSecretChat() {
-        self.app.launchArguments = ["snapshot:secret-chat"]
-        self.app.launch()
-        XCTAssert(self.app.wait(for: .runningForeground, timeout: 10.0))
-        snapshot("02SecretChat")
-        sleep(1)
-    }
-    
-    func testSettings() {
-        self.app.launchArguments = ["snapshot:settings"]
-        self.app.launch()
-        XCTAssert(self.app.wait(for: .runningForeground, timeout: 10.0))
-        snapshot("04Settings")
-        sleep(1)
-    }
-    
-    func testAppearanceSettings() {
-        self.app.launchArguments = ["snapshot:appearance-settings"]
-        self.app.launch()
-        XCTAssert(self.app.wait(for: .runningForeground, timeout: 10.0))
-        snapshot("05AppearanceSettings")
-        sleep(1)
-    }
-}
diff --git a/Telegram-iOSTests/Info.plist b/Telegram-iOSTests/Info.plist
deleted file mode 100644
index 4e002d9359..0000000000
--- a/Telegram-iOSTests/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>BNDL</string>
-	<key>CFBundleShortVersionString</key>
-	<string>1.0</string>
-	<key>CFBundleSignature</key>
-	<string>????</string>
-	<key>CFBundleVersion</key>
-	<string>667</string>
-</dict>
-</plist>
diff --git a/Telegram-iOSTests/ListViewTests.swift b/Telegram-iOSTests/ListViewTests.swift
deleted file mode 100644
index c5da8cd790..0000000000
--- a/Telegram-iOSTests/ListViewTests.swift
+++ /dev/null
@@ -1,29 +0,0 @@
-import XCTest
-import Display
-
-class ListViewTests: XCTestCase {
-    var listView: ListView!
-    
-    override func setUp() {
-        super.setUp()
-        
-        // Put setup code here. This method is called before the invocation of each test method in the class.
-        
-        // In UI tests it is usually best to stop immediately when a failure occurs.
-        continueAfterFailure = false
-        // UI tests must launch the application that they test. Doing this in setup will make sure it happens for each test method.
-        XCUIApplication().launch()
-
-        // In UI tests it’s important to set the initial state - such as interface orientation - required for your tests before they run. The setUp method is a good place to do this.
-    }
-    
-    override func tearDown() {
-        // Put teardown code here. This method is called after the invocation of each test method in the class.
-        super.tearDown()
-    }
-
-    func testExample() {
-        // Use recording to get started writing UI tests.
-        // Use XCTAssert and related functions to verify your tests produce the correct results.
-    }
-}
diff --git a/Telegram-iOSTests/Telegram_iOSTests.swift b/Telegram-iOSTests/Telegram_iOSTests.swift
deleted file mode 100644
index eb6bb07928..0000000000
--- a/Telegram-iOSTests/Telegram_iOSTests.swift
+++ /dev/null
@@ -1,36 +0,0 @@
-//
-//  Telegram_iOSTests.swift
-//  Telegram-iOSTests
-//
-//  Created by Peter on 10/06/15.
-//  Copyright (c) 2015 Telegram. All rights reserved.
-//
-
-import UIKit
-import XCTest
-
-class Telegram_iOSTests: XCTestCase {
-    
-    override func setUp() {
-        super.setUp()
-        // Put setup code here. This method is called before the invocation of each test method in the class.
-    }
-    
-    override func tearDown() {
-        // Put teardown code here. This method is called after the invocation of each test method in the class.
-        super.tearDown()
-    }
-    
-    func testExample() {
-        // This is an example of a functional test case.
-        XCTAssert(true, "Pass")
-    }
-    
-    func testPerformanceExample() {
-        // This is an example of a performance test case.
-        self.measure {
-            // Put the code you want to measure the time of here.
-        }
-    }
-    
-}
diff --git a/Telegram/BUCK b/Telegram/BUCK
new file mode 100644
index 0000000000..ff2f315899
--- /dev/null
+++ b/Telegram/BUCK
@@ -0,0 +1,551 @@
+load("//Config:utils.bzl",
+    "library_configs",
+)
+
+load("//Config:configs.bzl",
+    "app_binary_configs",
+    "share_extension_configs",
+    "widget_extension_configs",
+    "notification_content_extension_configs",
+    "notification_service_extension_configs",
+    "intents_extension_configs",
+    "watch_extension_binary_configs",
+    "watch_binary_configs",
+    "info_plist_substitutions",
+    "app_info_plist_substitutions",
+    "share_extension_info_plist_substitutions",
+    "widget_extension_info_plist_substitutions",
+    "notification_content_extension_info_plist_substitutions",
+    "notification_service_extension_info_plist_substitutions",
+    "intents_extension_info_plist_substitutions",
+    "watch_extension_info_plist_substitutions",
+    "watch_info_plist_substitutions",
+    "DEVELOPMENT_LANGUAGE",
+)
+
+load("//Config:buck_rule_macros.bzl",
+    "apple_lib",
+    "framework_binary_dependencies",
+    "framework_bundle_dependencies",
+    "glob_map",
+    "glob_sub_map",
+    "merge_maps",
+)
+
+framework_dependencies = [
+    "//submodules/MtProtoKit:MtProtoKit",
+    "//submodules/SSignalKit/SwiftSignalKit:SwiftSignalKit",
+    "//submodules/Postbox:Postbox",
+    "//submodules/TelegramApi:TelegramApi",
+    "//submodules/SyncCore:SyncCore",
+    "//submodules/TelegramCore:TelegramCore",
+    "//submodules/AsyncDisplayKit:AsyncDisplayKit",
+    "//submodules/Display:Display",
+    "//submodules/TelegramUI:TelegramUI",
+]
+
+resource_dependencies = [
+    "//submodules/LegacyComponents:LegacyComponentsResources",
+    "//submodules/TelegramUI:TelegramUIAssets",
+    "//submodules/TelegramUI:TelegramUIResources",
+    #"//submodules/WalletUI:WalletUIAssets",
+    #"//submodules/WalletUI:WalletUIResources",
+    "//submodules/PasswordSetupUI:PasswordSetupUIResources",
+    "//submodules/PasswordSetupUI:PasswordSetupUIAssets",
+    "//submodules/OverlayStatusController:OverlayStatusControllerResources",
+    ":AppResources",
+    ":AppStringResources",
+    ":InfoPlistStringResources",
+    ":AppIntentVocabularyResources",
+    ":Icons",
+    ":AdditionalIcons",
+    ":LaunchScreen",
+]
+
+build_phase_scripts = [
+]
+
+apple_resource(
+    name = "AppResources",
+    files = glob([
+        "Telegram-iOS/Resources/**/*",
+    ], exclude = ["Telegram-iOS/Resources/**/.*"]),
+    visibility = ["PUBLIC"],
+)
+
+apple_resource(
+    name = "AppStringResources",
+    files = [],
+    variants = glob([
+        "Telegram-iOS/*.lproj/Localizable.strings",
+    ]),
+    visibility = ["PUBLIC"],
+)
+
+apple_resource(
+    name = "AppIntentVocabularyResources",
+    files = [],
+    variants = glob([
+        "Telegram-iOS/*.lproj/AppIntentVocabulary.plist",
+    ]),
+    visibility = ["PUBLIC"],
+)
+
+apple_resource(
+    name = "InfoPlistStringResources",
+    files = [],
+    variants = glob([
+        "Telegram-iOS/*.lproj/InfoPlist.strings",
+    ]),
+    visibility = ["PUBLIC"],
+)
+
+apple_asset_catalog(
+  name = "Icons",
+  dirs = [
+    "Telegram-iOS/Icons.xcassets",
+    "Telegram-iOS/AppIcons.xcassets",
+  ],
+  app_icon = "AppIconLLC",
+  visibility = ["PUBLIC"],
+)
+
+apple_resource(
+    name = "AdditionalIcons",
+    files = glob([
+        "Telegram-iOS/*.png",
+    ]),
+    visibility = ["PUBLIC"],
+)
+
+apple_resource(
+    name = "LaunchScreen",
+    files = [
+        "Telegram-iOS/Base.lproj/LaunchScreen.xib",
+    ],
+    visibility = ["PUBLIC"],
+)
+
+apple_library(
+    name = "AppLibrary",
+    visibility = [
+        "//...",
+    ],
+    configs = library_configs(),
+    swift_version = native.read_config("swift", "version"),
+    srcs = [
+        "Telegram-iOS/main.m",
+        "Telegram-iOS/Application.swift"
+    ],
+    deps = [
+    ]
+    + framework_binary_dependencies(framework_dependencies),
+)
+
+apple_binary(
+    name = "AppBinary",
+    visibility = [
+        "//...",
+    ],
+    configs = app_binary_configs(),
+    swift_version = native.read_config("swift", "version"),
+    srcs = [
+        "SupportFiles/Empty.swift",
+    ],
+    deps = [
+        ":AppLibrary",
+    ]
+    + resource_dependencies,
+)
+
+apple_bundle(
+    name = "Telegram",
+    visibility = [
+        "//Telegram:...",
+    ],
+    extension = "app",
+    binary = ":AppBinary",
+    product_name = "Telegram",
+    info_plist = "Telegram-iOS/Info.plist",
+    info_plist_substitutions = app_info_plist_substitutions(),
+    deps = [
+        ":ShareExtension",
+        ":WidgetExtension",
+        ":NotificationContentExtension",
+        ":NotificationServiceExtension",
+        ":IntentsExtension",
+        ":WatchApp#watch",
+    ]
+    + framework_bundle_dependencies(framework_dependencies),
+)
+
+# Share Extension
+
+apple_binary(
+    name = "ShareBinary",
+    srcs = glob([
+        "Share/**/*.swift",
+    ]),
+    configs = share_extension_configs(),
+    linker_flags = [
+        "-e",
+        "_NSExtensionMain",
+        "-Xlinker",
+        "-rpath",
+        "-Xlinker",
+        "/usr/lib/swift",
+        "-Xlinker",
+        "-rpath",
+        "-Xlinker",
+        "@executable_path/../../Frameworks",
+    ],
+    deps = [
+        "//submodules/TelegramUI:TelegramUI#shared",
+    ],
+    frameworks = [
+        "$SDKROOT/System/Library/Frameworks/UIKit.framework",
+        "$SDKROOT/System/Library/Frameworks/Foundation.framework",
+    ],
+)
+
+apple_bundle(
+    name = "ShareExtension",
+    binary = ":ShareBinary",
+    extension = "appex",
+    info_plist = "Share/Info.plist",
+    info_plist_substitutions = share_extension_info_plist_substitutions(),
+    deps = [
+    ],
+    xcode_product_type = "com.apple.product-type.app-extension",
+)
+
+# Widget
+
+apple_binary(
+    name = "WidgetBinary",
+    srcs = glob([
+        "Widget/**/*.swift",
+    ]),
+    configs = widget_extension_configs(),
+    swift_compiler_flags = [
+        "-application-extension",
+    ],
+    linker_flags = [
+        "-e",
+        "_NSExtensionMain",
+        "-Xlinker",
+        "-rpath",
+        "-Xlinker",
+        "/usr/lib/swift",
+        "-Xlinker",
+        "-rpath",
+        "-Xlinker",
+        "@executable_path/../../Frameworks",
+    ],
+    deps = [
+        "//submodules/BuildConfig:BuildConfig",
+        "//submodules/WidgetItems:WidgetItems",
+        "//submodules/AppLockState:AppLockState",
+    ],
+    frameworks = [
+        "$SDKROOT/System/Library/Frameworks/UIKit.framework",
+        "$SDKROOT/System/Library/Frameworks/Foundation.framework",
+        "$SDKROOT/System/Library/Frameworks/NotificationCenter.framework",
+    ],
+)
+
+apple_bundle(
+    name = "WidgetExtension",
+    binary = ":WidgetBinary",
+    extension = "appex",
+    info_plist = "Widget/Info.plist",
+    info_plist_substitutions = widget_extension_info_plist_substitutions(),
+    deps = [
+    ],
+    xcode_product_type = "com.apple.product-type.app-extension",
+)
+
+# Notification Content
+
+apple_binary(
+    name = "NotificationContentBinary",
+    srcs = glob([
+        "NotificationContent/**/*.swift",
+    ]),
+    configs = notification_content_extension_configs(),
+    swift_compiler_flags = [
+        "-application-extension",
+    ],
+    linker_flags = [
+        "-e",
+        "_NSExtensionMain",
+        "-Xlinker",
+        "-rpath",
+        "-Xlinker",
+        "/usr/lib/swift",
+        "-Xlinker",
+        "-rpath",
+        "-Xlinker",
+        "@executable_path/../../Frameworks",
+    ],
+    deps = [
+        "//submodules/TelegramUI:TelegramUI#shared",
+    ],
+    frameworks = [
+        "$SDKROOT/System/Library/Frameworks/UIKit.framework",
+        "$SDKROOT/System/Library/Frameworks/Foundation.framework",
+        "$SDKROOT/System/Library/Frameworks/UserNotificationsUI.framework",
+    ],
+)
+
+apple_bundle(
+    name = "NotificationContentExtension",
+    binary = ":NotificationContentBinary",
+    extension = "appex",
+    info_plist = "NotificationContent/Info.plist",
+    info_plist_substitutions = notification_content_extension_info_plist_substitutions(),
+    deps = [
+    ],
+    xcode_product_type = "com.apple.product-type.app-extension",
+)
+
+#Notification Service
+
+apple_binary(
+    name = "NotificationServiceBinary",
+    srcs = glob([
+        "NotificationService/**/*.m",
+        "NotificationService/**/*.swift",
+    ]),
+    headers = glob([
+       "NotificationService/**/*.h", 
+    ]),
+    bridging_header = "NotificationService/NotificationService-Bridging-Header.h",
+    configs = notification_service_extension_configs(),
+    swift_compiler_flags = [
+        "-application-extension",
+    ],
+    linker_flags = [
+        "-e",
+        "_NSExtensionMain",
+        "-Xlinker",
+        "-rpath",
+        "-Xlinker",
+        "/usr/lib/swift",
+        "-Xlinker",
+        "-rpath",
+        "-Xlinker",
+        "@executable_path/../../Frameworks",
+    ],
+    deps = [
+        "//submodules/BuildConfig:BuildConfig",
+        "//submodules/MtProtoKit:MtProtoKit#shared",
+        "//submodules/SSignalKit/SwiftSignalKit:SwiftSignalKit#shared",
+        "//submodules/EncryptionProvider:EncryptionProvider",
+        "//submodules/Database/ValueBox:ValueBox",
+        "//submodules/Database/PostboxDataTypes:PostboxDataTypes",
+        "//submodules/Database/MessageHistoryReadStateTable:MessageHistoryReadStateTable",
+        "//submodules/Database/MessageHistoryMetadataTable:MessageHistoryMetadataTable",
+        "//submodules/Database/PreferencesTable:PreferencesTable",
+        "//submodules/Database/PeerTable:PeerTable",
+        "//submodules/sqlcipher:sqlcipher",
+        "//submodules/AppLockState:AppLockState",
+        "//submodules/NotificationsPresentationData:NotificationsPresentationData",
+    ],
+    frameworks = [
+        "$SDKROOT/System/Library/Frameworks/Foundation.framework",
+        "$SDKROOT/System/Library/Frameworks/UserNotifications.framework",
+    ],
+)
+
+apple_bundle(
+    name = "NotificationServiceExtension",
+    binary = ":NotificationServiceBinary",
+    extension = "appex",
+    info_plist = "NotificationService/Info.plist",
+    info_plist_substitutions = notification_service_extension_info_plist_substitutions(),
+    deps = [
+    ],
+    xcode_product_type = "com.apple.product-type.app-extension",
+)
+
+# Intents
+
+apple_binary(
+    name = "IntentsBinary",
+    srcs = glob([
+        "SiriIntents/**/*.swift",
+    ]),
+    configs = intents_extension_configs(),
+    swift_compiler_flags = [
+        "-application-extension",
+    ],
+    linker_flags = [
+        "-e",
+        "_NSExtensionMain",
+        "-Xlinker",
+        "-rpath",
+        "-Xlinker",
+        "/usr/lib/swift",
+        "-Xlinker",
+        "-rpath",
+        "-Xlinker",
+        "@executable_path/../../Frameworks",
+    ],
+    deps = [
+        "//submodules/SSignalKit/SwiftSignalKit:SwiftSignalKit#shared",
+        "//submodules/Postbox:Postbox#shared",
+        "//submodules/TelegramApi:TelegramApi#shared",
+        "//submodules/SyncCore:SyncCore#shared",
+        "//submodules/TelegramCore:TelegramCore#shared",
+        "//submodules/BuildConfig:BuildConfig",
+        "//submodules/OpenSSLEncryptionProvider:OpenSSLEncryptionProvider",
+        "//submodules/AppLockState:AppLockState",
+    ],
+    frameworks = [
+        "$SDKROOT/System/Library/Frameworks/Foundation.framework",
+        "$SDKROOT/System/Library/Frameworks/Intents.framework",
+        "$SDKROOT/System/Library/Frameworks/Contacts.framework",
+    ],
+)
+
+apple_bundle(
+    name = "IntentsExtension",
+    binary = ":IntentsBinary",
+    extension = "appex",
+    info_plist = "SiriIntents/Info.plist",
+    info_plist_substitutions = intents_extension_info_plist_substitutions(),
+    deps = [
+    ],
+    xcode_product_type = "com.apple.product-type.app-extension",
+)
+
+# Watch
+
+apple_resource(
+    name = "WatchAppStringResources",
+    files = [],
+    variants = glob([
+        "Telegram-iOS/*.lproj/Localizable.strings",
+    ]),
+    visibility = ["PUBLIC"],
+)
+
+apple_resource(
+    name = "WatchAppExtensionResources",
+    files = glob([
+        "Watch/Extension/Resources/**/*",
+    ], exclude = ["Watch/Extension/Resources/**/.*"]),
+    visibility = ["PUBLIC"],
+)
+
+apple_binary(
+    name = "WatchAppExtensionBinary",
+    srcs = glob([
+        "Watch/Extension/**/*.m",
+        "Watch/SSignalKit/**/*.m",
+        "Watch/Bridge/**/*.m",
+        "Watch/WatchCommonWatch/**/*.m",
+    ]),
+    headers = merge_maps([
+        glob_map(glob([
+            "Watch/Extension/*.h",
+            "Watch/Bridge/*.h",
+        ])),
+        glob_sub_map("Watch/Extension/", glob([
+            "Watch/Extension/SSignalKit/*.h",
+        ])),
+        glob_sub_map("Watch/", glob([
+            "Watch/WatchCommonWatch/*.h",
+        ])),
+    ]),
+    compiler_flags = [
+        "-DTARGET_OS_WATCH=1",
+    ],
+    linker_flags = [
+        "-e",
+        "_WKExtensionMain",
+        "-lWKExtensionMainLegacy",
+    ],
+    configs = watch_extension_binary_configs(),
+    frameworks = [
+        "$SDKROOT/System/Library/Frameworks/UserNotifications.framework",
+        "$SDKROOT/System/Library/Frameworks/CoreLocation.framework",
+        "$SDKROOT/System/Library/Frameworks/CoreGraphics.framework",
+    ],
+    deps = [
+        ":WatchAppStringResources",
+        ":WatchAppExtensionResources",
+    ],
+)
+
+apple_bundle(
+    name = "WatchAppExtension",
+    binary = ":WatchAppExtensionBinary",
+    extension = "appex",
+    info_plist = "Watch/Extension/Info.plist",
+    info_plist_substitutions = watch_extension_info_plist_substitutions(),
+    xcode_product_type = "com.apple.product-type.watchkit2-extension",
+)
+
+apple_resource(
+    name = "WatchAppResources",
+    dirs = [],
+    files = glob(["Watch/Extension/Resources/*.png"])
+)
+
+apple_asset_catalog(
+  name = "WatchAppAssets",
+  dirs = [
+    "Watch/App/Assets.xcassets",
+  ],
+  app_icon = "AppIcon",
+  visibility = ["PUBLIC"],
+)
+
+apple_resource(
+    name = "WatchAppInterface",
+    files = [
+        "Watch/App/Base.lproj/Interface.storyboard",
+    ],
+    visibility = ["PUBLIC"],
+)
+
+apple_binary(
+    name = "WatchAppBinary",
+    configs = watch_binary_configs(),
+    deps = [
+        ":WatchAppResources",
+        ":WatchAppAssets",
+        ":WatchAppInterface",
+        ":WatchAppStringResources",
+    ],
+)
+
+apple_bundle(
+    name = "WatchApp",
+    binary = ":WatchAppBinary",
+    visibility = [
+        "//Telegram:...",
+    ],
+    extension = "app",
+    info_plist = "Watch/App/Info.plist",
+    info_plist_substitutions = watch_info_plist_substitutions(),
+    xcode_product_type = "com.apple.product-type.application.watchapp2",
+    deps = [
+        ":WatchAppExtension",
+    ],
+)
+
+# Package
+
+apple_package(
+    name = "AppPackage",
+    bundle = ":Telegram",
+)
+
+xcode_workspace_config(
+    name = "workspace",
+    workspace_name = "Telegram_Buck",
+    src_target = ":Telegram",
+)
diff --git a/Telegram/BUILD b/Telegram/BUILD
new file mode 100644
index 0000000000..d438aecce4
--- /dev/null
+++ b/Telegram/BUILD
@@ -0,0 +1,822 @@
+load("@build_bazel_rules_apple//apple:ios.bzl",
+    "ios_application",
+    "ios_extension",
+    "ios_framework",
+)
+
+load("@build_bazel_rules_apple//apple:watchos.bzl",
+    "watchos_application",
+    "watchos_extension",
+)
+
+load("@build_bazel_rules_apple//apple:versioning.bzl",
+    "apple_bundle_version",
+)
+
+load("@build_bazel_rules_swift//swift:swift.bzl",
+    "swift_library",
+)
+
+load("//build-system:plist_fragment.bzl",
+    "plist_fragment",
+)
+
+load(
+    "//build-input/data:variables.bzl",
+    "telegram_build_number",
+    "telegram_version",
+    "telegram_bundle_id",
+    "telegram_aps_environment",
+    "telegram_team_id",
+)
+
+config_setting(
+    name = "debug",
+    values = {
+        "compilation_mode": "dbg",
+    },
+)
+
+genrule(
+    name = "empty",
+    outs = ["empty.swift"],
+    cmd = "touch $(OUTS)",
+)
+
+swift_library(
+    name = "_LocalDebugOptions",
+    srcs = [":empty"],
+    copts = [
+        "-Xfrontend",
+        "-serialize-debugging-options",
+    ],
+    deps = [
+        "//submodules/AsyncDisplayKit:AsyncDisplayKit",
+        "//submodules/AppBundle:AppBundle",
+        "//submodules/ObjCRuntimeUtils:ObjCRuntimeUtils",
+        "//submodules/UIKitRuntimeUtils:UIKitRuntimeUtils",
+        "//submodules/Crc32:Crc32",
+        "//submodules/MurMurHash32:MurMurHash32",
+        "//submodules/StringTransliteration:StringTransliteration",
+        "//submodules/sqlcipher:sqlcipher",
+        "//submodules/NumberPluralizationForm:NumberPluralizationForm",
+        "//submodules/EncryptionProvider:EncryptionProvider",
+        "//submodules/MtProtoKit:MtProtoKit",
+    ],
+    module_name = "_LocalDebugOptions",
+    tags = ["no-remote"],
+    visibility = ["//visibility:public"],
+)
+
+debug_deps = select({
+    ":debug": [":_LocalDebugOptions"],
+    "//conditions:default": [],
+})
+
+filegroup(
+    name = "AppResources",
+    srcs = glob([
+        "Telegram-iOS/Resources/**/*",
+    ], exclude = ["Telegram-iOS/Resources/**/.*"]),
+)
+
+filegroup(
+    name = "AppStringResources",
+    srcs = glob([
+        "Telegram-iOS/*.lproj/Localizable.strings",
+    ], exclude = ["Telegram-iOS/*.lproj/**/.*"]),
+)
+
+filegroup(
+    name = "WatchAppStringResources",
+    srcs = glob([
+        "Telegram-iOS/*.lproj/Localizable.strings",
+    ], exclude = ["Telegram-iOS/*.lproj/**/.*"]),
+)
+
+filegroup(
+    name = "AppIntentVocabularyResources",
+    srcs = glob([
+        "Telegram-iOS/*.lproj/AppIntentVocabulary.plist",
+    ], exclude = ["Telegram-iOS/*.lproj/**/.*"]),
+)
+
+filegroup(
+    name = "InfoPlistStringResources",
+    srcs = glob([
+        "Telegram-iOS/*.lproj/InfoPlist.strings",
+    ], exclude = ["Telegram-iOS/*.lproj/**/.*"]),
+)
+
+filegroup(
+    name = "Icons",
+    srcs = glob([
+        "Telegram-iOS/Icons.xcassets/**/*",
+    ], exclude = ["Telegram-iOS/Icons.xcassets/**/.*"]),
+)
+
+filegroup(
+    name = "AppIcons",
+    srcs = glob([
+        "Telegram-iOS/AppIcons.xcassets/**/*",
+    ], exclude = ["Telegram-iOS/AppIcons.xcassets/**/.*"]),
+)
+
+filegroup(
+    name = "DefaultAppIcon",
+    srcs = glob([
+        "Telegram-iOS/DefaultAppIcon.xcassets/**/*",
+    ], exclude = ["Telegram-iOS/DefaultAppIcon.xcassets/**/.*"]),
+)
+
+filegroup(
+    name = "AdditionalIcons",
+    srcs = glob([
+        "Telegram-iOS/*.png",
+    ]),
+)
+
+filegroup(
+    name = "LaunchScreen",
+    srcs = glob([
+        "Telegram-iOS/Base.lproj/LaunchScreen.xib",
+    ]),
+)
+
+objc_library(
+    name = "Main",
+    srcs = [
+        "Telegram-iOS/main.m"
+    ],
+)
+
+swift_library(
+    name = "Lib",
+    srcs = glob([
+        "Telegram-iOS/Application.swift",
+    ]),
+    data = [
+        ":AppResources",
+        ":AppIntentVocabularyResources",
+        ":InfoPlistStringResources",
+        "//submodules/LegacyComponents:LegacyComponentsResources",
+        "//submodules/OverlayStatusController:OverlayStatusControllerResources",
+        "//submodules/PasswordSetupUI:PasswordSetupUIResources",
+        "//submodules/PasswordSetupUI:PasswordSetupUIAssets",
+        "//submodules/TelegramUI:TelegramUIResources",
+        "//submodules/TelegramUI:TelegramUIAssets",
+        "//submodules/WalletUI:WalletUIResources",
+        "//submodules/WalletUI:WalletUIAssets",
+    ],
+    deps = [
+        "//submodules/TelegramUI:TelegramUI",
+    ],
+)
+
+plist_fragment(
+    name = "AdditionalInfoPlist",
+    extension = "plist",
+    template =
+    """
+    <key>CFBundleShortVersionString</key>
+        <string>{telegram_version}</string>
+        <key>CFBundleVersion</key>
+        <string>{telegram_build_number}</string>
+        <key>CFBundleURLTypes</key>
+        <array>
+            <dict>
+                <key>CFBundleTypeRole</key>
+                <string>Viewer</string>
+                <key>CFBundleURLName</key>
+                <string>{telegram_bundle_id}</string>
+                <key>CFBundleURLSchemes</key>
+                <array>
+                    <string>telegram</string>
+                </array>
+            </dict>
+            <dict>
+                <key>CFBundleTypeRole</key>
+                <string>Viewer</string>
+                <key>CFBundleURLName</key>
+                <string>{telegram_bundle_id}.ton</string>
+                <key>CFBundleURLSchemes</key>
+                <array>
+                    <string>ton</string>
+                </array>
+            </dict>
+            <dict>
+                <key>CFBundleTypeRole</key>
+                <string>Viewer</string>
+                <key>CFBundleURLName</key>
+                <string>{telegram_bundle_id}.compatibility</string>
+                <key>CFBundleURLSchemes</key>
+                <array>
+                    <string>tg</string>
+                </array>
+            </dict>
+        </array>
+    """.format(
+        telegram_version = telegram_version,
+        telegram_build_number = telegram_build_number,
+        telegram_bundle_id = telegram_bundle_id,
+    )
+)
+
+official_apple_pay_merchants = [
+    "merchant.ph.telegra.Telegraph",
+    "merchant.yandex.ph.telegra.Telegraph",
+    "merchant.sberbank.ph.telegra.Telegraph",
+    "merchant.sberbank.test.ph.telegra.Telegraph",
+    "merchant.privatbank.test.telergramios",
+    "merchant.privatbank.prod.telergram",
+    "merchant.telegram.tranzzo.test",
+]
+
+official_bundle_ids = [
+    "ph.telegra.Telegraph",
+    "org.telegram.Telegram-iOS",
+]
+
+apple_pay_merchants = official_apple_pay_merchants if telegram_bundle_id == "ph.telegra.Telegraph" else ""
+
+apple_pay_merchants_fragment = "" if apple_pay_merchants == "" else """
+<key>com.apple.developer.in-app-payments</key>
+<array>
+""" + "\n".join([
+"    <string>{}</string>".format(merchant_id) for merchant_id in apple_pay_merchants
+]) + "\n" + """
+</array>
+"""
+
+official_unrestricted_voip_fragment = """
+<key>com.apple.developer.pushkit.unrestricted-voip</key>
+<true/>
+"""
+unrestricted_voip_fragment = official_unrestricted_voip_fragment if telegram_bundle_id in official_bundle_ids else ""
+
+telegram_entitlements_template = """
+    <key>com.apple.developer.icloud-services</key>
+    <array>
+        <string>CloudKit</string>
+        <string>CloudDocuments</string>
+    </array>
+    <key>com.apple.developer.icloud-container-identifiers</key>
+    <array>
+        <string>iCloud.{telegram_bundle_id}</string>
+    </array>
+    <key>aps-environment</key>
+    <string>{telegram_aps_environment}</string>
+    <key>com.apple.developer.associated-domains</key>
+    <array>
+        <string>applinks:telegram.me</string>
+        <string>applinks:t.me</string>
+    </array>
+    <key>com.apple.developer.siri</key>
+    <true/>
+    <key>com.apple.security.application-groups</key>
+    <array>
+        <string>group.{telegram_bundle_id}</string>
+    </array>
+    <key>application-identifier</key>
+    <string>{telegram_team_id}.{telegram_bundle_id}</string>
+""" + apple_pay_merchants_fragment + unrestricted_voip_fragment
+
+plist_fragment(
+    name = "TelegramEntitlements",
+    extension = "entitlements",
+    template = telegram_entitlements_template.format(
+        telegram_bundle_id = telegram_bundle_id,
+        telegram_team_id = telegram_team_id,
+        telegram_aps_environment = telegram_aps_environment,
+    )
+)
+
+filegroup(
+    name = "TelegramWatchExtensionResources",
+    srcs = glob([
+        "Watch/Extension/Resources/**/*",
+    ], exclude = ["Watch/Extension/Resources/**/.*"]),
+)
+
+filegroup(
+    name = "TelegramWatchAppResources",
+    srcs = glob([
+        "Watch/Extension/Resources/**/*.png",
+    ], exclude = ["Watch/Extension/Resources/**/.*"]),
+)
+
+filegroup(
+    name = "TelegramWatchAppAssets",
+    srcs = glob([
+        "Watch/App/Assets.xcassets/**/*",
+    ], exclude = ["Watch/App/Assets.xcassets/**/.*"]),
+)
+
+filegroup(
+    name = "TelegramWatchAppInterface",
+    srcs = glob([
+        "Watch/App/Base.lproj/Interface.storyboard",
+    ]),
+)
+
+objc_library(
+    name = "TelegramWatchLib",
+    srcs = glob([
+        "Watch/Extension/**/*.m",
+        "Watch/SSignalKit/**/*.m",
+        "Watch/Bridge/**/*.m",
+        "Watch/WatchCommonWatch/**/*.m",
+        "Watch/Extension/**/*.h",
+        "Watch/SSignalKit/**/*.h",
+        "Watch/Bridge/**/*.h",
+        "Watch/WatchCommonWatch/**/*.h",
+    ]),
+    copts = [
+        "-DTARGET_OS_WATCH=1",
+        "-ITelegram/Watch",
+        "-ITelegram/Watch/Extension",
+        "-ITelegram/Watch/Bridge",
+    ],
+    sdk_frameworks = [
+        "WatchKit",
+        "WatchConnectivity",
+        "ClockKit",
+        "UserNotifications",
+        "CoreLocation",
+        "CoreGraphics",
+    ],
+)
+
+plist_fragment(
+    name = "VersionInfoPlist",
+    extension = "plist",
+    template =
+    """
+    <key>CFBundleShortVersionString</key>
+    <string>{telegram_version}</string>
+    <key>CFBundleVersion</key>
+    <string>{telegram_build_number}</string>
+    """.format(
+        telegram_version = telegram_version,
+        telegram_build_number = telegram_build_number,
+    )
+)
+
+plist_fragment(
+    name = "AppNameInfoPlist",
+    extension = "plist",
+    template =
+    """
+    <key>CFBundleDisplayName</key>
+    <string>Telegram</string>
+    """
+)
+
+plist_fragment(
+    name = "WatchExtensionNSExtensionInfoPlist",
+    extension = "plist",
+    template =
+    """
+    <key>NSExtension</key>
+    <dict>
+        <key>NSExtensionAttributes</key>
+        <dict>
+            <key>WKAppBundleIdentifier</key>
+            <string>{telegram_bundle_id}.watchkitapp</string>
+        </dict>
+        <key>NSExtensionPointIdentifier</key>
+        <string>com.apple.watchkit</string>
+    </dict>
+    """.format(
+        telegram_bundle_id = telegram_bundle_id,
+    )
+)
+
+plist_fragment(
+    name = "WatchAppCompanionInfoPlist",
+    extension = "plist",
+    template =
+    """
+    <key>WKCompanionAppBundleIdentifier</key>
+    <string>{telegram_bundle_id}</string>
+    """.format(
+        telegram_bundle_id = telegram_bundle_id,
+    )
+)
+
+plist_fragment(
+    name = "WatchExtensionInfoPlist",
+    extension = "plist",
+    template =
+    """
+    <key>CFBundleDevelopmentRegion</key>
+    <string>en</string>
+    <key>CFBundleExecutable</key>
+    <string>$(EXECUTABLE_NAME)</string>
+    <key>CFBundleIdentifier</key>
+    <string>{telegram_bundle_id}.watchkitapp.watchkitextension</string>
+    <key>CFBundleName</key>
+    <string>Telegram</string>
+    <key>CFBundlePackageType</key>
+    <string>XPC!</string>
+    <key>WKExtensionDelegateClassName</key>
+    <string>TGExtensionDelegate</string>
+    """.format(
+        telegram_bundle_id = telegram_bundle_id,
+    )
+)
+
+plist_fragment(
+    name = "WatchAppInfoPlist",
+    extension = "plist",
+    template =
+    """
+    <key>CFBundleDevelopmentRegion</key>
+    <string>en</string>
+    <key>CFBundleIdentifier</key>
+    <string>{telegram_bundle_id}.watchkitapp</string>
+    <key>CFBundleName</key>
+    <string>Telegram</string>
+    <key>UISupportedInterfaceOrientations</key>
+    <array>
+        <string>UIInterfaceOrientationPortrait</string>
+        <string>UIInterfaceOrientationPortraitUpsideDown</string>
+    </array>
+    <key>WKWatchKitApp</key>
+    <true/>
+    """.format(
+        telegram_bundle_id = telegram_bundle_id,
+    )
+)
+
+watchos_extension(
+    name = "TelegramWatchExtension",
+    bundle_id = "{telegram_bundle_id}.watchkitapp.watchkitextension".format(
+        telegram_bundle_id = telegram_bundle_id,
+    ),
+    bundle_name = "TelegramWatchExtension",
+    infoplists = [
+        ":WatchExtensionInfoPlist",
+        ":VersionInfoPlist",
+        ":AppNameInfoPlist",
+        ":WatchExtensionNSExtensionInfoPlist",
+    ],
+    minimum_os_version = "5.0",
+    provisioning_profile = "//build-input/data/provisioning-profiles:WatchExtension.mobileprovision",
+    resources = [
+        ":TelegramWatchExtensionResources",
+    ],
+    strings = [
+        ":WatchAppStringResources",
+    ],
+    deps = [
+        ":TelegramWatchLib",
+    ],
+)
+
+watchos_application(
+    name = "TelegramWatchApp",
+    #app_icons = ,
+    bundle_id = "{telegram_bundle_id}.watchkitapp".format(
+        telegram_bundle_id = telegram_bundle_id,
+    ),
+    bundle_name = "TelegramWatch",
+    extension = ":TelegramWatchExtension",
+    infoplists = [
+        ":WatchAppInfoPlist",
+        ":VersionInfoPlist",
+        ":AppNameInfoPlist",
+        ":WatchAppCompanionInfoPlist",
+    ],
+    minimum_os_version = "5.0",
+    provisioning_profile = "//build-input/data/provisioning-profiles:WatchApp.mobileprovision",
+    resources = [
+        ":TelegramWatchAppResources",
+        ":TelegramWatchAppAssets",
+    ],
+    storyboards = [
+        ":TelegramWatchAppInterface",
+    ],
+    strings = [
+    ],
+)
+
+swift_library(
+    name = "ShareExtensionLib",
+    module_name = "ShareExtensionLib",
+    srcs = glob([
+        "Share/**/*.swift",
+    ]),
+    deps = [
+        "//submodules/TelegramUI:TelegramUI"
+    ],
+)
+
+plist_fragment(
+    name = "TelegramUIInfoPlist",
+    extension = "plist",
+    template =
+    """
+    <key>CFBundleIdentifier</key>
+    <string>{telegram_bundle_id}.TelegramUI</string>
+    <key>CFBundleVersion</key>
+    <string>{telegram_build_number}</string>
+    <key>CFBundleDevelopmentRegion</key>
+    <string>en</string>
+    <key>CFBundleName</key>
+    <string>TelegramUI</string>
+    <key>CFBundleShortVersionString</key>
+    <string>{telegram_version}</string>
+    """.format(
+        telegram_bundle_id = telegram_bundle_id,
+        telegram_version = telegram_version,
+        telegram_build_number = telegram_build_number,
+    )
+)
+
+ios_framework(
+    name = "TelegramUIFramework",
+    bundle_id = "{telegram_bundle_id}.TelegramUI".format(
+        telegram_bundle_id = telegram_bundle_id,
+    ),
+    families = [
+        "iphone",
+        "ipad",
+    ],
+    infoplists = [
+        ":TelegramUIInfoPlist",
+    ],
+    minimum_os_version = "9.0",
+    deps = [
+        "//submodules/TelegramUI:TelegramUI",
+    ] + debug_deps,
+)
+
+plist_fragment(
+    name = "ShareInfoPlist",
+    extension = "plist",
+    template = 
+    """
+    <key>CFBundleDevelopmentRegion</key>
+    <string>en</string>
+    <key>CFBundleIdentifier</key>
+    <string>{telegram_bundle_id}.Share</string>
+    <key>CFBundleName</key>
+    <string>Telegram</string>
+    <key>CFBundlePackageType</key>
+    <string>XPC!</string>
+    <key>NSExtension</key>
+    <dict>
+        <key>NSExtensionAttributes</key>
+        <dict>
+            <key>IntentsSupported</key>
+            <array>
+                <string>INSendMessageIntent</string>
+            </array>
+            <key>NSExtensionActivationRule</key>
+            <string>SUBQUERY (
+    extensionItems,
+    $extensionItem,
+    SUBQUERY (
+        $extensionItem.attachments,
+        $attachment,
+        ANY $attachment.registeredTypeIdentifiers UTI-CONFORMS-TO "public.file-url" ||
+        ANY $attachment.registeredTypeIdentifiers UTI-CONFORMS-TO "public.movie" ||
+        ANY $attachment.registeredTypeIdentifiers UTI-CONFORMS-TO "public.image" ||
+        ANY $attachment.registeredTypeIdentifiers UTI-CONFORMS-TO "public.url" ||
+        ANY $attachment.registeredTypeIdentifiers UTI-CONFORMS-TO "public.text" ||
+        ANY $attachment.registeredTypeIdentifiers UTI-CONFORMS-TO "public.audio" ||
+        ANY $attachment.registeredTypeIdentifiers UTI-CONFORMS-TO "public.data" ||
+        ANY $attachment.registeredTypeIdentifiers UTI-CONFORMS-TO "public.vcard" ||
+        ANY $attachment.registeredTypeIdentifiers UTI-CONFORMS-TO "com.apple.pkpass"
+    ).@count == $extensionItem.attachments.@count
+).@count &gt; 0</string>
+        </dict>
+        <key>NSExtensionPointIdentifier</key>
+        <string>com.apple.share-services</string>
+        <key>NSExtensionPrincipalClass</key>
+        <string>ShareRootController</string>
+    </dict>
+    """.format(
+        telegram_bundle_id = telegram_bundle_id,
+    )
+)
+
+ios_extension(
+    name = "ShareExtension",
+    bundle_id = "{telegram_bundle_id}.Share".format(
+        telegram_bundle_id = telegram_bundle_id,
+    ),
+    families = [
+        "iphone",
+        "ipad",
+    ],
+    infoplists = [
+        ":ShareInfoPlist",
+        ":VersionInfoPlist",
+        ":AppNameInfoPlist",
+    ],
+    minimum_os_version = "9.0",
+    provisioning_profile = "//build-input/data/provisioning-profiles:Share.mobileprovision",
+    deps = [":ShareExtensionLib"],
+    frameworks = [
+        ":TelegramUIFramework"
+    ],
+)
+
+plist_fragment(
+    name = "TelegramInfoPlist",
+    extension = "plist",
+    template = 
+    """
+    <key>BGTaskSchedulerPermittedIdentifiers</key>
+    <array>
+        <string>{telegram_bundle_id}.refresh</string>
+    </array>
+    <key>CFBundleAllowMixedLocalizations</key>
+    <true/>
+    <key>CFBundleDevelopmentRegion</key>
+    <string>en</string>
+    <key>CFBundleDisplayName</key>
+    <string>Telegram</string>
+    <key>CFBundleIdentifier</key>
+    <string>{telegram_bundle_id}</string>
+    <key>CFBundleName</key>
+    <string>Telegram</string>
+    <key>ITSAppUsesNonExemptEncryption</key>
+    <false/>
+    <key>LSApplicationQueriesSchemes</key>
+    <array>
+        <string>instagram</string>
+        <string>comgooglemaps-x-callback</string>
+        <string>foursquare</string>
+        <string>here-location</string>
+        <string>yandexmaps</string>
+        <string>yandexnavi</string>
+        <string>comgooglemaps</string>
+        <string>youtube</string>
+        <string>twitter</string>
+        <string>vk</string>
+        <string>waze</string>
+        <string>googlechrome</string>
+        <string>firefox</string>
+        <string>touch-http</string>
+        <string>yandexbrowser-open-url</string>
+        <string>vimeo</string>
+        <string>vine</string>
+        <string>coub</string>
+        <string>uber</string>
+        <string>citymapper</string>
+        <string>lyft</string>
+        <string>opera-http</string>
+        <string>firefox-focus</string>
+        <string>ddgQuickLink</string>
+        <string>moovit</string>
+        <string>alook</string>
+        <string>dgis</string>
+        <string>microsoft-edge-http</string>
+        <string>brave</string>
+        <string>onionhttp</string>
+        <string>ucbrowser</string>
+        <string>dolphin</string>
+    </array>
+    <key>LSRequiresIPhoneOS</key>
+    <true/>
+    <key>NSAppTransportSecurity</key>
+    <dict>
+        <key>NSAllowsArbitraryLoads</key>
+        <true/>
+    </dict>
+    <key>NSCameraUsageDescription</key>
+    <string>We need this so that you can take and share photos and videos.</string>
+    <key>NSContactsUsageDescription</key>
+    <string>Telegram stores your contacts heavily encrypted in the cloud to let you connect with your friends across all your devices.</string>
+    <key>NSFaceIDUsageDescription</key>
+    <string>You can use Face ID to unlock the app.</string>
+    <key>NSLocationAlwaysUsageDescription</key>
+    <string>When you send your location to your friends, Telegram needs access to show them a map. You also need this to send locations from an Apple Watch.</string>
+    <key>NSLocationWhenInUseUsageDescription</key>
+    <string>When you send your location to your friends, Telegram needs access to show them a map.</string>
+    <key>NSMicrophoneUsageDescription</key>
+    <string>We need this so that you can record and share voice messages and videos with sound.</string>
+    <key>NSMotionUsageDescription</key>
+    <string>When you send your location to your friends, Telegram needs access to show them a map.</string>
+    <key>NSPhotoLibraryAddUsageDescription</key>
+    <string>We need this so that you can share photos and videos from your photo library.</string>
+    <key>NSPhotoLibraryUsageDescription</key>
+    <string>We need this so that you can share photos and videos from your photo library.</string>
+    <key>NSSiriUsageDescription</key>
+    <string>You can use Siri to send messages.</string>
+    <key>NSUserActivityTypes</key>
+    <array>
+        <string>INSendMessageIntent</string>
+        <string>RemindAboutChatIntent</string>
+    </array>
+    <key>UIAppFonts</key>
+    <array>
+        <string>SFCompactRounded-Semibold.otf</string>
+    </array>
+    <key>UIBackgroundModes</key>
+    <array>
+        <string>audio</string>
+        <string>fetch</string>
+        <string>location</string>
+        <string>remote-notification</string>
+        <string>voip</string>
+    </array>
+    <key>UIDeviceFamily</key>
+    <array>
+        <integer>1</integer>
+        <integer>2</integer>
+    </array>
+    <key>UIFileSharingEnabled</key>
+    <false/>
+    <key>UILaunchStoryboardName</key>
+    <string>LaunchScreen</string>
+    <key>UIRequiredDeviceCapabilities</key>
+    <array>
+        <string>armv7</string>
+    </array>
+    <key>UIRequiresPersistentWiFi</key>
+    <true/>
+    <key>UIStatusBarStyle</key>
+    <string>UIStatusBarStyleDefault</string>
+    <key>UISupportedInterfaceOrientations</key>
+    <array>
+        <string>UIInterfaceOrientationPortrait</string>
+        <string>UIInterfaceOrientationLandscapeLeft</string>
+        <string>UIInterfaceOrientationLandscapeRight</string>
+    </array>
+    <key>UISupportedInterfaceOrientations~ipad</key>
+    <array>
+        <string>UIInterfaceOrientationPortrait</string>
+        <string>UIInterfaceOrientationPortraitUpsideDown</string>
+        <string>UIInterfaceOrientationLandscapeLeft</string>
+        <string>UIInterfaceOrientationLandscapeRight</string>
+    </array>
+    <key>UIViewControllerBasedStatusBarAppearance</key>
+    <false/>
+    <key>UIViewEdgeAntialiasing</key>
+    <false/>
+    <key>UIViewGroupOpacity</key>
+    <false/>
+    <key>UTImportedTypeDeclarations</key>
+    <array>
+        <dict>
+            <key>UTTypeConformsTo</key>
+            <array>
+                <string>public.data</string>
+            </array>
+            <key>UTTypeDescription</key>
+            <string>Telegram iOS Color Theme File</string>
+            <key>UTTypeIconFiles</key>
+            <array>
+                <string>BlueIcon@3x.png</string>
+            </array>
+            <key>UTTypeIdentifier</key>
+            <string>org.telegram.Telegram-iOS.theme</string>
+            <key>UTTypeTagSpecification</key>
+            <dict>
+                <key>public.filename-extension</key>
+                <array>
+                    <string>tgios-theme</string>
+                </array>
+            </dict>
+        </dict>
+    </array>
+    """.format(
+        telegram_bundle_id = telegram_bundle_id,
+    )
+)
+
+ios_application(
+    name = "Telegram",
+    bundle_id = "{telegram_bundle_id}".format(
+        telegram_bundle_id = telegram_bundle_id,
+    ),
+    families = ["iphone", "ipad"],
+    minimum_os_version = "9.0",
+    provisioning_profile = "//build-input/data/provisioning-profiles:Telegram.mobileprovision",
+    entitlements = ":TelegramEntitlements.entitlements",
+    infoplists = [
+        ":TelegramInfoPlist",
+        ":AdditionalInfoPlist",
+    ],
+    app_icons = [
+        ":DefaultAppIcon",
+    ],
+    frameworks = [
+        ":TelegramUIFramework",
+    ],
+    strings = [
+        ":AppStringResources",
+    ],
+    extensions = [
+        ":ShareExtension",
+    ],
+    watch_application = ":TelegramWatchApp",
+    deps = [
+        ":Main",
+        ":Lib",
+    ],
+)
diff --git a/NotificationContent/Info.plist b/Telegram/NotificationContent/Info.plist
similarity index 100%
rename from NotificationContent/Info.plist
rename to Telegram/NotificationContent/Info.plist
diff --git a/NotificationContent/NotificationContent-Bridging-Header.h b/Telegram/NotificationContent/NotificationContent-Bridging-Header.h
similarity index 100%
rename from NotificationContent/NotificationContent-Bridging-Header.h
rename to Telegram/NotificationContent/NotificationContent-Bridging-Header.h
diff --git a/NotificationContent/NotificationViewController.swift b/Telegram/NotificationContent/NotificationViewController.swift
similarity index 100%
rename from NotificationContent/NotificationViewController.swift
rename to Telegram/NotificationContent/NotificationViewController.swift
diff --git a/NotificationService/Api.h b/Telegram/NotificationService/Api.h
similarity index 100%
rename from NotificationService/Api.h
rename to Telegram/NotificationService/Api.h
diff --git a/NotificationService/Api.m b/Telegram/NotificationService/Api.m
similarity index 100%
rename from NotificationService/Api.m
rename to Telegram/NotificationService/Api.m
diff --git a/NotificationService/ApplicationSpecificSharedDataKeys.swift b/Telegram/NotificationService/ApplicationSpecificSharedDataKeys.swift
similarity index 100%
rename from NotificationService/ApplicationSpecificSharedDataKeys.swift
rename to Telegram/NotificationService/ApplicationSpecificSharedDataKeys.swift
diff --git a/NotificationService/Attachments.h b/Telegram/NotificationService/Attachments.h
similarity index 100%
rename from NotificationService/Attachments.h
rename to Telegram/NotificationService/Attachments.h
diff --git a/NotificationService/Attachments.m b/Telegram/NotificationService/Attachments.m
similarity index 90%
rename from NotificationService/Attachments.m
rename to Telegram/NotificationService/Attachments.m
index 29d498dc2d..28ae322de9 100644
--- a/NotificationService/Attachments.m
+++ b/Telegram/NotificationService/Attachments.m
@@ -1,10 +1,6 @@
 #import "Attachments.h"
 
-#ifdef BUCK
 #import <MTProtoKit/MTProtoKit.h>
-#else
-#import <MTProtoKitDynamic/MTProtoKitDynamic.h>
-#endif
 
 #import "Api.h"
 
diff --git a/NotificationService/FetchImage.h b/Telegram/NotificationService/FetchImage.h
similarity index 100%
rename from NotificationService/FetchImage.h
rename to Telegram/NotificationService/FetchImage.h
diff --git a/NotificationService/FetchImage.m b/Telegram/NotificationService/FetchImage.m
similarity index 100%
rename from NotificationService/FetchImage.m
rename to Telegram/NotificationService/FetchImage.m
diff --git a/NotificationService/InAppNotificationSettings.swift b/Telegram/NotificationService/InAppNotificationSettings.swift
similarity index 100%
rename from NotificationService/InAppNotificationSettings.swift
rename to Telegram/NotificationService/InAppNotificationSettings.swift
diff --git a/NotificationService/Info.plist b/Telegram/NotificationService/Info.plist
similarity index 100%
rename from NotificationService/Info.plist
rename to Telegram/NotificationService/Info.plist
diff --git a/NotificationService/Namespaces.swift b/Telegram/NotificationService/Namespaces.swift
similarity index 100%
rename from NotificationService/Namespaces.swift
rename to Telegram/NotificationService/Namespaces.swift
diff --git a/NotificationService/NotificationService-Bridging-Header.h b/Telegram/NotificationService/NotificationService-Bridging-Header.h
similarity index 100%
rename from NotificationService/NotificationService-Bridging-Header.h
rename to Telegram/NotificationService/NotificationService-Bridging-Header.h
diff --git a/NotificationService/NotificationService.h b/Telegram/NotificationService/NotificationService.h
similarity index 100%
rename from NotificationService/NotificationService.h
rename to Telegram/NotificationService/NotificationService.h
diff --git a/NotificationService/NotificationService.m b/Telegram/NotificationService/NotificationService.m
similarity index 100%
rename from NotificationService/NotificationService.m
rename to Telegram/NotificationService/NotificationService.m
diff --git a/NotificationService/NotificationService.swift b/Telegram/NotificationService/NotificationService.swift
similarity index 100%
rename from NotificationService/NotificationService.swift
rename to Telegram/NotificationService/NotificationService.swift
diff --git a/NotificationService/Serialization.h b/Telegram/NotificationService/Serialization.h
similarity index 70%
rename from NotificationService/Serialization.h
rename to Telegram/NotificationService/Serialization.h
index d2beb976d6..1089c5a010 100644
--- a/NotificationService/Serialization.h
+++ b/Telegram/NotificationService/Serialization.h
@@ -1,10 +1,6 @@
 #import <Foundation/Foundation.h>
 
-#ifdef BUCK
 #import <MTProtoKit/MTProtoKit.h>
-#else
-#import <MTProtoKitDynamic/MTProtoKitDynamic.h>
-#endif
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/NotificationService/Serialization.m b/Telegram/NotificationService/Serialization.m
similarity index 100%
rename from NotificationService/Serialization.m
rename to Telegram/NotificationService/Serialization.m
diff --git a/NotificationService/StoredAccountInfos.h b/Telegram/NotificationService/StoredAccountInfos.h
similarity index 100%
rename from NotificationService/StoredAccountInfos.h
rename to Telegram/NotificationService/StoredAccountInfos.h
diff --git a/NotificationService/StoredAccountInfos.m b/Telegram/NotificationService/StoredAccountInfos.m
similarity index 99%
rename from NotificationService/StoredAccountInfos.m
rename to Telegram/NotificationService/StoredAccountInfos.m
index 4f60eac49b..424aa3aefc 100644
--- a/NotificationService/StoredAccountInfos.m
+++ b/Telegram/NotificationService/StoredAccountInfos.m
@@ -1,10 +1,6 @@
 #import "StoredAccountInfos.h"
 
-#ifdef BUCK
 #import <MTProtoKit/MTProtoKit.h>
-#else
-#import <MTProtoKitDynamic/MTProtoKitDynamic.h>
-#endif
 
 #import <CommonCrypto/CommonDigest.h>
 
diff --git a/NotificationService/Sync.swift b/Telegram/NotificationService/Sync.swift
similarity index 100%
rename from NotificationService/Sync.swift
rename to Telegram/NotificationService/Sync.swift
diff --git a/NotificationService/TelegramChannel.swift b/Telegram/NotificationService/TelegramChannel.swift
similarity index 100%
rename from NotificationService/TelegramChannel.swift
rename to Telegram/NotificationService/TelegramChannel.swift
diff --git a/Share/Info.plist b/Telegram/Share/Info.plist
similarity index 100%
rename from Share/Info.plist
rename to Telegram/Share/Info.plist
diff --git a/Share/Share-Bridging-Header.h b/Telegram/Share/Share-Bridging-Header.h
similarity index 100%
rename from Share/Share-Bridging-Header.h
rename to Telegram/Share/Share-Bridging-Header.h
diff --git a/Share/ShareRootController.swift b/Telegram/Share/ShareRootController.swift
similarity index 100%
rename from Share/ShareRootController.swift
rename to Telegram/Share/ShareRootController.swift
diff --git a/Share/en.lproj/Localizable.strings b/Telegram/Share/en.lproj/Localizable.strings
similarity index 100%
rename from Share/en.lproj/Localizable.strings
rename to Telegram/Share/en.lproj/Localizable.strings
diff --git a/SiriIntents/Info.plist b/Telegram/SiriIntents/Info.plist
similarity index 100%
rename from SiriIntents/Info.plist
rename to Telegram/SiriIntents/Info.plist
diff --git a/SiriIntents/IntentContacts.swift b/Telegram/SiriIntents/IntentContacts.swift
similarity index 100%
rename from SiriIntents/IntentContacts.swift
rename to Telegram/SiriIntents/IntentContacts.swift
diff --git a/SiriIntents/IntentHandler.swift b/Telegram/SiriIntents/IntentHandler.swift
similarity index 100%
rename from SiriIntents/IntentHandler.swift
rename to Telegram/SiriIntents/IntentHandler.swift
diff --git a/SiriIntents/IntentMessages.swift b/Telegram/SiriIntents/IntentMessages.swift
similarity index 99%
rename from SiriIntents/IntentMessages.swift
rename to Telegram/SiriIntents/IntentMessages.swift
index f8add17d11..4de0ef0384 100644
--- a/SiriIntents/IntentMessages.swift
+++ b/Telegram/SiriIntents/IntentMessages.swift
@@ -37,7 +37,7 @@ func unreadMessages(account: Account) -> Signal<[INMessage], NoError> {
     |> mapToSignal { view -> Signal<[INMessage], NoError> in
         var signals: [Signal<[INMessage], NoError>] = []
         for entry in view.0.entries {
-            if case let .MessageEntry(index, _, readState, notificationSettings, _, _, _, _, _) = entry {
+            if case let .MessageEntry(index, _, readState, notificationSettings, _, _, _, _, _, _) = entry {
                 if index.messageIndex.id.peerId.namespace != Namespaces.Peer.CloudUser {
                     continue
                 }
diff --git a/SiriIntents/SiriIntents-Bridging-Header.h b/Telegram/SiriIntents/SiriIntents-Bridging-Header.h
similarity index 100%
rename from SiriIntents/SiriIntents-Bridging-Header.h
rename to Telegram/SiriIntents/SiriIntents-Bridging-Header.h
diff --git a/SupportFiles/Empty.swift b/Telegram/SupportFiles/Empty.swift
similarity index 100%
rename from SupportFiles/Empty.swift
rename to Telegram/SupportFiles/Empty.swift
diff --git a/Telegram-iOS/AppIcons.xcassets/BlackFilledIcon.appiconset/Contents.json b/Telegram/Telegram-iOS/AppIcons.xcassets/BlackFilledIcon.appiconset/Contents.json
similarity index 100%
rename from Telegram-iOS/AppIcons.xcassets/BlackFilledIcon.appiconset/Contents.json
rename to Telegram/Telegram-iOS/AppIcons.xcassets/BlackFilledIcon.appiconset/Contents.json
diff --git a/Telegram-iOS/AppIcons.xcassets/BlackFilledIcon.appiconset/Icon4@120x120-1.png b/Telegram/Telegram-iOS/AppIcons.xcassets/BlackFilledIcon.appiconset/Icon4@120x120-1.png
similarity index 100%
rename from Telegram-iOS/AppIcons.xcassets/BlackFilledIcon.appiconset/Icon4@120x120-1.png
rename to Telegram/Telegram-iOS/AppIcons.xcassets/BlackFilledIcon.appiconset/Icon4@120x120-1.png
diff --git a/Telegram-iOS/AppIcons.xcassets/BlackFilledIcon.appiconset/Icon4@120x120.png b/Telegram/Telegram-iOS/AppIcons.xcassets/BlackFilledIcon.appiconset/Icon4@120x120.png
similarity index 100%
rename from Telegram-iOS/AppIcons.xcassets/BlackFilledIcon.appiconset/Icon4@120x120.png
rename to Telegram/Telegram-iOS/AppIcons.xcassets/BlackFilledIcon.appiconset/Icon4@120x120.png
diff --git a/Telegram-iOS/AppIcons.xcassets/BlackFilledIcon.appiconset/Icon4@152x152.png b/Telegram/Telegram-iOS/AppIcons.xcassets/BlackFilledIcon.appiconset/Icon4@152x152.png
similarity index 100%
rename from Telegram-iOS/AppIcons.xcassets/BlackFilledIcon.appiconset/Icon4@152x152.png
rename to Telegram/Telegram-iOS/AppIcons.xcassets/BlackFilledIcon.appiconset/Icon4@152x152.png
diff --git a/Telegram-iOS/AppIcons.xcassets/BlackFilledIcon.appiconset/Icon4@167x167.png b/Telegram/Telegram-iOS/AppIcons.xcassets/BlackFilledIcon.appiconset/Icon4@167x167.png
similarity index 100%
rename from Telegram-iOS/AppIcons.xcassets/BlackFilledIcon.appiconset/Icon4@167x167.png
rename to Telegram/Telegram-iOS/AppIcons.xcassets/BlackFilledIcon.appiconset/Icon4@167x167.png
diff --git a/Telegram-iOS/AppIcons.xcassets/BlackFilledIcon.appiconset/Icon4@180x180.png b/Telegram/Telegram-iOS/AppIcons.xcassets/BlackFilledIcon.appiconset/Icon4@180x180.png
similarity index 100%
rename from Telegram-iOS/AppIcons.xcassets/BlackFilledIcon.appiconset/Icon4@180x180.png
rename to Telegram/Telegram-iOS/AppIcons.xcassets/BlackFilledIcon.appiconset/Icon4@180x180.png
diff --git a/Telegram-iOS/AppIcons.xcassets/BlackFilledIcon.appiconset/Icon4@20x20.png b/Telegram/Telegram-iOS/AppIcons.xcassets/BlackFilledIcon.appiconset/Icon4@20x20.png
similarity index 100%
rename from Telegram-iOS/AppIcons.xcassets/BlackFilledIcon.appiconset/Icon4@20x20.png
rename to Telegram/Telegram-iOS/AppIcons.xcassets/BlackFilledIcon.appiconset/Icon4@20x20.png
diff --git a/Telegram-iOS/AppIcons.xcassets/BlackFilledIcon.appiconset/Icon4@29x29.png b/Telegram/Telegram-iOS/AppIcons.xcassets/BlackFilledIcon.appiconset/Icon4@29x29.png
similarity index 100%
rename from Telegram-iOS/AppIcons.xcassets/BlackFilledIcon.appiconset/Icon4@29x29.png
rename to Telegram/Telegram-iOS/AppIcons.xcassets/BlackFilledIcon.appiconset/Icon4@29x29.png
diff --git a/Telegram-iOS/AppIcons.xcassets/BlackFilledIcon.appiconset/Icon4@40x40-1.png b/Telegram/Telegram-iOS/AppIcons.xcassets/BlackFilledIcon.appiconset/Icon4@40x40-1.png
similarity index 100%
rename from Telegram-iOS/AppIcons.xcassets/BlackFilledIcon.appiconset/Icon4@40x40-1.png
rename to Telegram/Telegram-iOS/AppIcons.xcassets/BlackFilledIcon.appiconset/Icon4@40x40-1.png
diff --git a/Telegram-iOS/AppIcons.xcassets/BlackFilledIcon.appiconset/Icon4@40x40-2.png b/Telegram/Telegram-iOS/AppIcons.xcassets/BlackFilledIcon.appiconset/Icon4@40x40-2.png
similarity index 100%
rename from Telegram-iOS/AppIcons.xcassets/BlackFilledIcon.appiconset/Icon4@40x40-2.png
rename to Telegram/Telegram-iOS/AppIcons.xcassets/BlackFilledIcon.appiconset/Icon4@40x40-2.png
diff --git a/Telegram-iOS/AppIcons.xcassets/BlackFilledIcon.appiconset/Icon4@40x40.png b/Telegram/Telegram-iOS/AppIcons.xcassets/BlackFilledIcon.appiconset/Icon4@40x40.png
similarity index 100%
rename from Telegram-iOS/AppIcons.xcassets/BlackFilledIcon.appiconset/Icon4@40x40.png
rename to Telegram/Telegram-iOS/AppIcons.xcassets/BlackFilledIcon.appiconset/Icon4@40x40.png
diff --git a/Telegram-iOS/AppIcons.xcassets/BlackFilledIcon.appiconset/Icon4@58x58-2.png b/Telegram/Telegram-iOS/AppIcons.xcassets/BlackFilledIcon.appiconset/Icon4@58x58-2.png
similarity index 100%
rename from Telegram-iOS/AppIcons.xcassets/BlackFilledIcon.appiconset/Icon4@58x58-2.png
rename to Telegram/Telegram-iOS/AppIcons.xcassets/BlackFilledIcon.appiconset/Icon4@58x58-2.png
diff --git a/Telegram-iOS/AppIcons.xcassets/BlackFilledIcon.appiconset/Icon4@58x58.png b/Telegram/Telegram-iOS/AppIcons.xcassets/BlackFilledIcon.appiconset/Icon4@58x58.png
similarity index 100%
rename from Telegram-iOS/AppIcons.xcassets/BlackFilledIcon.appiconset/Icon4@58x58.png
rename to Telegram/Telegram-iOS/AppIcons.xcassets/BlackFilledIcon.appiconset/Icon4@58x58.png
diff --git a/Telegram-iOS/AppIcons.xcassets/BlackFilledIcon.appiconset/Icon4@60x60.png b/Telegram/Telegram-iOS/AppIcons.xcassets/BlackFilledIcon.appiconset/Icon4@60x60.png
similarity index 100%
rename from Telegram-iOS/AppIcons.xcassets/BlackFilledIcon.appiconset/Icon4@60x60.png
rename to Telegram/Telegram-iOS/AppIcons.xcassets/BlackFilledIcon.appiconset/Icon4@60x60.png
diff --git a/Telegram-iOS/AppIcons.xcassets/BlackFilledIcon.appiconset/Icon4@76x76.png b/Telegram/Telegram-iOS/AppIcons.xcassets/BlackFilledIcon.appiconset/Icon4@76x76.png
similarity index 100%
rename from Telegram-iOS/AppIcons.xcassets/BlackFilledIcon.appiconset/Icon4@76x76.png
rename to Telegram/Telegram-iOS/AppIcons.xcassets/BlackFilledIcon.appiconset/Icon4@76x76.png
diff --git a/Telegram-iOS/AppIcons.xcassets/BlackFilledIcon.appiconset/Icon4@80x80-1.png b/Telegram/Telegram-iOS/AppIcons.xcassets/BlackFilledIcon.appiconset/Icon4@80x80-1.png
similarity index 100%
rename from Telegram-iOS/AppIcons.xcassets/BlackFilledIcon.appiconset/Icon4@80x80-1.png
rename to Telegram/Telegram-iOS/AppIcons.xcassets/BlackFilledIcon.appiconset/Icon4@80x80-1.png
diff --git a/Telegram-iOS/AppIcons.xcassets/BlackFilledIcon.appiconset/Icon4@80x80.png b/Telegram/Telegram-iOS/AppIcons.xcassets/BlackFilledIcon.appiconset/Icon4@80x80.png
similarity index 100%
rename from Telegram-iOS/AppIcons.xcassets/BlackFilledIcon.appiconset/Icon4@80x80.png
rename to Telegram/Telegram-iOS/AppIcons.xcassets/BlackFilledIcon.appiconset/Icon4@80x80.png
diff --git a/Telegram-iOS/AppIcons.xcassets/BlackFilledIcon.appiconset/Icon4@87x87.png b/Telegram/Telegram-iOS/AppIcons.xcassets/BlackFilledIcon.appiconset/Icon4@87x87.png
similarity index 100%
rename from Telegram-iOS/AppIcons.xcassets/BlackFilledIcon.appiconset/Icon4@87x87.png
rename to Telegram/Telegram-iOS/AppIcons.xcassets/BlackFilledIcon.appiconset/Icon4@87x87.png
diff --git a/Telegram-iOS/AppIcons.xcassets/BlackIcon.appiconset/Contents.json b/Telegram/Telegram-iOS/AppIcons.xcassets/BlackIcon.appiconset/Contents.json
similarity index 100%
rename from Telegram-iOS/AppIcons.xcassets/BlackIcon.appiconset/Contents.json
rename to Telegram/Telegram-iOS/AppIcons.xcassets/BlackIcon.appiconset/Contents.json
diff --git a/Telegram-iOS/AppIcons.xcassets/BlackIcon.appiconset/Icon2@120x120-1.png b/Telegram/Telegram-iOS/AppIcons.xcassets/BlackIcon.appiconset/Icon2@120x120-1.png
similarity index 100%
rename from Telegram-iOS/AppIcons.xcassets/BlackIcon.appiconset/Icon2@120x120-1.png
rename to Telegram/Telegram-iOS/AppIcons.xcassets/BlackIcon.appiconset/Icon2@120x120-1.png
diff --git a/Telegram-iOS/AppIcons.xcassets/BlackIcon.appiconset/Icon2@120x120.png b/Telegram/Telegram-iOS/AppIcons.xcassets/BlackIcon.appiconset/Icon2@120x120.png
similarity index 100%
rename from Telegram-iOS/AppIcons.xcassets/BlackIcon.appiconset/Icon2@120x120.png
rename to Telegram/Telegram-iOS/AppIcons.xcassets/BlackIcon.appiconset/Icon2@120x120.png
diff --git a/Telegram-iOS/AppIcons.xcassets/BlackIcon.appiconset/Icon2@152x152.png b/Telegram/Telegram-iOS/AppIcons.xcassets/BlackIcon.appiconset/Icon2@152x152.png
similarity index 100%
rename from Telegram-iOS/AppIcons.xcassets/BlackIcon.appiconset/Icon2@152x152.png
rename to Telegram/Telegram-iOS/AppIcons.xcassets/BlackIcon.appiconset/Icon2@152x152.png
diff --git a/Telegram-iOS/AppIcons.xcassets/BlackIcon.appiconset/Icon2@167x167.png b/Telegram/Telegram-iOS/AppIcons.xcassets/BlackIcon.appiconset/Icon2@167x167.png
similarity index 100%
rename from Telegram-iOS/AppIcons.xcassets/BlackIcon.appiconset/Icon2@167x167.png
rename to Telegram/Telegram-iOS/AppIcons.xcassets/BlackIcon.appiconset/Icon2@167x167.png
diff --git a/Telegram-iOS/AppIcons.xcassets/BlackIcon.appiconset/Icon2@180x180.png b/Telegram/Telegram-iOS/AppIcons.xcassets/BlackIcon.appiconset/Icon2@180x180.png
similarity index 100%
rename from Telegram-iOS/AppIcons.xcassets/BlackIcon.appiconset/Icon2@180x180.png
rename to Telegram/Telegram-iOS/AppIcons.xcassets/BlackIcon.appiconset/Icon2@180x180.png
diff --git a/Telegram-iOS/AppIcons.xcassets/BlackIcon.appiconset/Icon2@20x20.png b/Telegram/Telegram-iOS/AppIcons.xcassets/BlackIcon.appiconset/Icon2@20x20.png
similarity index 100%
rename from Telegram-iOS/AppIcons.xcassets/BlackIcon.appiconset/Icon2@20x20.png
rename to Telegram/Telegram-iOS/AppIcons.xcassets/BlackIcon.appiconset/Icon2@20x20.png
diff --git a/Telegram-iOS/AppIcons.xcassets/BlackIcon.appiconset/Icon2@29x29.png b/Telegram/Telegram-iOS/AppIcons.xcassets/BlackIcon.appiconset/Icon2@29x29.png
similarity index 100%
rename from Telegram-iOS/AppIcons.xcassets/BlackIcon.appiconset/Icon2@29x29.png
rename to Telegram/Telegram-iOS/AppIcons.xcassets/BlackIcon.appiconset/Icon2@29x29.png
diff --git a/Telegram-iOS/AppIcons.xcassets/BlackIcon.appiconset/Icon2@40x40-1.png b/Telegram/Telegram-iOS/AppIcons.xcassets/BlackIcon.appiconset/Icon2@40x40-1.png
similarity index 100%
rename from Telegram-iOS/AppIcons.xcassets/BlackIcon.appiconset/Icon2@40x40-1.png
rename to Telegram/Telegram-iOS/AppIcons.xcassets/BlackIcon.appiconset/Icon2@40x40-1.png
diff --git a/Telegram-iOS/AppIcons.xcassets/BlackIcon.appiconset/Icon2@40x40-2.png b/Telegram/Telegram-iOS/AppIcons.xcassets/BlackIcon.appiconset/Icon2@40x40-2.png
similarity index 100%
rename from Telegram-iOS/AppIcons.xcassets/BlackIcon.appiconset/Icon2@40x40-2.png
rename to Telegram/Telegram-iOS/AppIcons.xcassets/BlackIcon.appiconset/Icon2@40x40-2.png
diff --git a/Telegram-iOS/AppIcons.xcassets/BlackIcon.appiconset/Icon2@40x40.png b/Telegram/Telegram-iOS/AppIcons.xcassets/BlackIcon.appiconset/Icon2@40x40.png
similarity index 100%
rename from Telegram-iOS/AppIcons.xcassets/BlackIcon.appiconset/Icon2@40x40.png
rename to Telegram/Telegram-iOS/AppIcons.xcassets/BlackIcon.appiconset/Icon2@40x40.png
diff --git a/Telegram-iOS/AppIcons.xcassets/BlackIcon.appiconset/Icon2@58x58-1.png b/Telegram/Telegram-iOS/AppIcons.xcassets/BlackIcon.appiconset/Icon2@58x58-1.png
similarity index 100%
rename from Telegram-iOS/AppIcons.xcassets/BlackIcon.appiconset/Icon2@58x58-1.png
rename to Telegram/Telegram-iOS/AppIcons.xcassets/BlackIcon.appiconset/Icon2@58x58-1.png
diff --git a/Telegram-iOS/AppIcons.xcassets/BlackIcon.appiconset/Icon2@58x58.png b/Telegram/Telegram-iOS/AppIcons.xcassets/BlackIcon.appiconset/Icon2@58x58.png
similarity index 100%
rename from Telegram-iOS/AppIcons.xcassets/BlackIcon.appiconset/Icon2@58x58.png
rename to Telegram/Telegram-iOS/AppIcons.xcassets/BlackIcon.appiconset/Icon2@58x58.png
diff --git a/Telegram-iOS/AppIcons.xcassets/BlackIcon.appiconset/Icon2@60x60.png b/Telegram/Telegram-iOS/AppIcons.xcassets/BlackIcon.appiconset/Icon2@60x60.png
similarity index 100%
rename from Telegram-iOS/AppIcons.xcassets/BlackIcon.appiconset/Icon2@60x60.png
rename to Telegram/Telegram-iOS/AppIcons.xcassets/BlackIcon.appiconset/Icon2@60x60.png
diff --git a/Telegram-iOS/AppIcons.xcassets/BlackIcon.appiconset/Icon2@76x76.png b/Telegram/Telegram-iOS/AppIcons.xcassets/BlackIcon.appiconset/Icon2@76x76.png
similarity index 100%
rename from Telegram-iOS/AppIcons.xcassets/BlackIcon.appiconset/Icon2@76x76.png
rename to Telegram/Telegram-iOS/AppIcons.xcassets/BlackIcon.appiconset/Icon2@76x76.png
diff --git a/Telegram-iOS/AppIcons.xcassets/BlackIcon.appiconset/Icon2@80x80-1.png b/Telegram/Telegram-iOS/AppIcons.xcassets/BlackIcon.appiconset/Icon2@80x80-1.png
similarity index 100%
rename from Telegram-iOS/AppIcons.xcassets/BlackIcon.appiconset/Icon2@80x80-1.png
rename to Telegram/Telegram-iOS/AppIcons.xcassets/BlackIcon.appiconset/Icon2@80x80-1.png
diff --git a/Telegram-iOS/AppIcons.xcassets/BlackIcon.appiconset/Icon2@80x80.png b/Telegram/Telegram-iOS/AppIcons.xcassets/BlackIcon.appiconset/Icon2@80x80.png
similarity index 100%
rename from Telegram-iOS/AppIcons.xcassets/BlackIcon.appiconset/Icon2@80x80.png
rename to Telegram/Telegram-iOS/AppIcons.xcassets/BlackIcon.appiconset/Icon2@80x80.png
diff --git a/Telegram-iOS/AppIcons.xcassets/BlackIcon.appiconset/Icon2@87x87.png b/Telegram/Telegram-iOS/AppIcons.xcassets/BlackIcon.appiconset/Icon2@87x87.png
similarity index 100%
rename from Telegram-iOS/AppIcons.xcassets/BlackIcon.appiconset/Icon2@87x87.png
rename to Telegram/Telegram-iOS/AppIcons.xcassets/BlackIcon.appiconset/Icon2@87x87.png
diff --git a/Telegram-iOS/AppIcons.xcassets/BlueFilledIcon.appiconset/Contents.json b/Telegram/Telegram-iOS/AppIcons.xcassets/BlueFilledIcon.appiconset/Contents.json
similarity index 100%
rename from Telegram-iOS/AppIcons.xcassets/BlueFilledIcon.appiconset/Contents.json
rename to Telegram/Telegram-iOS/AppIcons.xcassets/BlueFilledIcon.appiconset/Contents.json
diff --git a/Telegram-iOS/AppIcons.xcassets/BlueFilledIcon.appiconset/Icon3@120x120-1.png b/Telegram/Telegram-iOS/AppIcons.xcassets/BlueFilledIcon.appiconset/Icon3@120x120-1.png
similarity index 100%
rename from Telegram-iOS/AppIcons.xcassets/BlueFilledIcon.appiconset/Icon3@120x120-1.png
rename to Telegram/Telegram-iOS/AppIcons.xcassets/BlueFilledIcon.appiconset/Icon3@120x120-1.png
diff --git a/Telegram-iOS/AppIcons.xcassets/BlueFilledIcon.appiconset/Icon3@120x120.png b/Telegram/Telegram-iOS/AppIcons.xcassets/BlueFilledIcon.appiconset/Icon3@120x120.png
similarity index 100%
rename from Telegram-iOS/AppIcons.xcassets/BlueFilledIcon.appiconset/Icon3@120x120.png
rename to Telegram/Telegram-iOS/AppIcons.xcassets/BlueFilledIcon.appiconset/Icon3@120x120.png
diff --git a/Telegram-iOS/AppIcons.xcassets/BlueFilledIcon.appiconset/Icon3@152x152.png b/Telegram/Telegram-iOS/AppIcons.xcassets/BlueFilledIcon.appiconset/Icon3@152x152.png
similarity index 100%
rename from Telegram-iOS/AppIcons.xcassets/BlueFilledIcon.appiconset/Icon3@152x152.png
rename to Telegram/Telegram-iOS/AppIcons.xcassets/BlueFilledIcon.appiconset/Icon3@152x152.png
diff --git a/Telegram-iOS/AppIcons.xcassets/BlueFilledIcon.appiconset/Icon3@167x167.png b/Telegram/Telegram-iOS/AppIcons.xcassets/BlueFilledIcon.appiconset/Icon3@167x167.png
similarity index 100%
rename from Telegram-iOS/AppIcons.xcassets/BlueFilledIcon.appiconset/Icon3@167x167.png
rename to Telegram/Telegram-iOS/AppIcons.xcassets/BlueFilledIcon.appiconset/Icon3@167x167.png
diff --git a/Telegram-iOS/AppIcons.xcassets/BlueFilledIcon.appiconset/Icon3@180x180.png b/Telegram/Telegram-iOS/AppIcons.xcassets/BlueFilledIcon.appiconset/Icon3@180x180.png
similarity index 100%
rename from Telegram-iOS/AppIcons.xcassets/BlueFilledIcon.appiconset/Icon3@180x180.png
rename to Telegram/Telegram-iOS/AppIcons.xcassets/BlueFilledIcon.appiconset/Icon3@180x180.png
diff --git a/Telegram-iOS/AppIcons.xcassets/BlueFilledIcon.appiconset/Icon3@20x20.png b/Telegram/Telegram-iOS/AppIcons.xcassets/BlueFilledIcon.appiconset/Icon3@20x20.png
similarity index 100%
rename from Telegram-iOS/AppIcons.xcassets/BlueFilledIcon.appiconset/Icon3@20x20.png
rename to Telegram/Telegram-iOS/AppIcons.xcassets/BlueFilledIcon.appiconset/Icon3@20x20.png
diff --git a/Telegram-iOS/AppIcons.xcassets/BlueFilledIcon.appiconset/Icon3@29x29.png b/Telegram/Telegram-iOS/AppIcons.xcassets/BlueFilledIcon.appiconset/Icon3@29x29.png
similarity index 100%
rename from Telegram-iOS/AppIcons.xcassets/BlueFilledIcon.appiconset/Icon3@29x29.png
rename to Telegram/Telegram-iOS/AppIcons.xcassets/BlueFilledIcon.appiconset/Icon3@29x29.png
diff --git a/Telegram-iOS/AppIcons.xcassets/BlueFilledIcon.appiconset/Icon3@40x40-1.png b/Telegram/Telegram-iOS/AppIcons.xcassets/BlueFilledIcon.appiconset/Icon3@40x40-1.png
similarity index 100%
rename from Telegram-iOS/AppIcons.xcassets/BlueFilledIcon.appiconset/Icon3@40x40-1.png
rename to Telegram/Telegram-iOS/AppIcons.xcassets/BlueFilledIcon.appiconset/Icon3@40x40-1.png
diff --git a/Telegram-iOS/AppIcons.xcassets/BlueFilledIcon.appiconset/Icon3@40x40-2.png b/Telegram/Telegram-iOS/AppIcons.xcassets/BlueFilledIcon.appiconset/Icon3@40x40-2.png
similarity index 100%
rename from Telegram-iOS/AppIcons.xcassets/BlueFilledIcon.appiconset/Icon3@40x40-2.png
rename to Telegram/Telegram-iOS/AppIcons.xcassets/BlueFilledIcon.appiconset/Icon3@40x40-2.png
diff --git a/Telegram-iOS/AppIcons.xcassets/BlueFilledIcon.appiconset/Icon3@40x40.png b/Telegram/Telegram-iOS/AppIcons.xcassets/BlueFilledIcon.appiconset/Icon3@40x40.png
similarity index 100%
rename from Telegram-iOS/AppIcons.xcassets/BlueFilledIcon.appiconset/Icon3@40x40.png
rename to Telegram/Telegram-iOS/AppIcons.xcassets/BlueFilledIcon.appiconset/Icon3@40x40.png
diff --git a/Telegram-iOS/AppIcons.xcassets/BlueFilledIcon.appiconset/Icon3@58x58-1.png b/Telegram/Telegram-iOS/AppIcons.xcassets/BlueFilledIcon.appiconset/Icon3@58x58-1.png
similarity index 100%
rename from Telegram-iOS/AppIcons.xcassets/BlueFilledIcon.appiconset/Icon3@58x58-1.png
rename to Telegram/Telegram-iOS/AppIcons.xcassets/BlueFilledIcon.appiconset/Icon3@58x58-1.png
diff --git a/Telegram-iOS/AppIcons.xcassets/BlueFilledIcon.appiconset/Icon3@58x58.png b/Telegram/Telegram-iOS/AppIcons.xcassets/BlueFilledIcon.appiconset/Icon3@58x58.png
similarity index 100%
rename from Telegram-iOS/AppIcons.xcassets/BlueFilledIcon.appiconset/Icon3@58x58.png
rename to Telegram/Telegram-iOS/AppIcons.xcassets/BlueFilledIcon.appiconset/Icon3@58x58.png
diff --git a/Telegram-iOS/AppIcons.xcassets/BlueFilledIcon.appiconset/Icon3@60x60.png b/Telegram/Telegram-iOS/AppIcons.xcassets/BlueFilledIcon.appiconset/Icon3@60x60.png
similarity index 100%
rename from Telegram-iOS/AppIcons.xcassets/BlueFilledIcon.appiconset/Icon3@60x60.png
rename to Telegram/Telegram-iOS/AppIcons.xcassets/BlueFilledIcon.appiconset/Icon3@60x60.png
diff --git a/Telegram-iOS/AppIcons.xcassets/BlueFilledIcon.appiconset/Icon3@76x76.png b/Telegram/Telegram-iOS/AppIcons.xcassets/BlueFilledIcon.appiconset/Icon3@76x76.png
similarity index 100%
rename from Telegram-iOS/AppIcons.xcassets/BlueFilledIcon.appiconset/Icon3@76x76.png
rename to Telegram/Telegram-iOS/AppIcons.xcassets/BlueFilledIcon.appiconset/Icon3@76x76.png
diff --git a/Telegram-iOS/AppIcons.xcassets/BlueFilledIcon.appiconset/Icon3@80x80-1.png b/Telegram/Telegram-iOS/AppIcons.xcassets/BlueFilledIcon.appiconset/Icon3@80x80-1.png
similarity index 100%
rename from Telegram-iOS/AppIcons.xcassets/BlueFilledIcon.appiconset/Icon3@80x80-1.png
rename to Telegram/Telegram-iOS/AppIcons.xcassets/BlueFilledIcon.appiconset/Icon3@80x80-1.png
diff --git a/Telegram-iOS/AppIcons.xcassets/BlueFilledIcon.appiconset/Icon3@80x80.png b/Telegram/Telegram-iOS/AppIcons.xcassets/BlueFilledIcon.appiconset/Icon3@80x80.png
similarity index 100%
rename from Telegram-iOS/AppIcons.xcassets/BlueFilledIcon.appiconset/Icon3@80x80.png
rename to Telegram/Telegram-iOS/AppIcons.xcassets/BlueFilledIcon.appiconset/Icon3@80x80.png
diff --git a/Telegram-iOS/AppIcons.xcassets/BlueFilledIcon.appiconset/Icon3@87x87.png b/Telegram/Telegram-iOS/AppIcons.xcassets/BlueFilledIcon.appiconset/Icon3@87x87.png
similarity index 100%
rename from Telegram-iOS/AppIcons.xcassets/BlueFilledIcon.appiconset/Icon3@87x87.png
rename to Telegram/Telegram-iOS/AppIcons.xcassets/BlueFilledIcon.appiconset/Icon3@87x87.png
diff --git a/Telegram-iOS/AppIcons.xcassets/BlueIcon.appiconset/Contents.json b/Telegram/Telegram-iOS/AppIcons.xcassets/BlueIcon.appiconset/Contents.json
similarity index 100%
rename from Telegram-iOS/AppIcons.xcassets/BlueIcon.appiconset/Contents.json
rename to Telegram/Telegram-iOS/AppIcons.xcassets/BlueIcon.appiconset/Contents.json
diff --git a/Telegram-iOS/AppIcons.xcassets/BlueIcon.appiconset/Icon1@120x120-1.png b/Telegram/Telegram-iOS/AppIcons.xcassets/BlueIcon.appiconset/Icon1@120x120-1.png
similarity index 100%
rename from Telegram-iOS/AppIcons.xcassets/BlueIcon.appiconset/Icon1@120x120-1.png
rename to Telegram/Telegram-iOS/AppIcons.xcassets/BlueIcon.appiconset/Icon1@120x120-1.png
diff --git a/Telegram-iOS/AppIcons.xcassets/BlueIcon.appiconset/Icon1@120x120.png b/Telegram/Telegram-iOS/AppIcons.xcassets/BlueIcon.appiconset/Icon1@120x120.png
similarity index 100%
rename from Telegram-iOS/AppIcons.xcassets/BlueIcon.appiconset/Icon1@120x120.png
rename to Telegram/Telegram-iOS/AppIcons.xcassets/BlueIcon.appiconset/Icon1@120x120.png
diff --git a/Telegram-iOS/AppIcons.xcassets/BlueIcon.appiconset/Icon1@152x152.png b/Telegram/Telegram-iOS/AppIcons.xcassets/BlueIcon.appiconset/Icon1@152x152.png
similarity index 100%
rename from Telegram-iOS/AppIcons.xcassets/BlueIcon.appiconset/Icon1@152x152.png
rename to Telegram/Telegram-iOS/AppIcons.xcassets/BlueIcon.appiconset/Icon1@152x152.png
diff --git a/Telegram-iOS/AppIcons.xcassets/BlueIcon.appiconset/Icon1@167x167.png b/Telegram/Telegram-iOS/AppIcons.xcassets/BlueIcon.appiconset/Icon1@167x167.png
similarity index 100%
rename from Telegram-iOS/AppIcons.xcassets/BlueIcon.appiconset/Icon1@167x167.png
rename to Telegram/Telegram-iOS/AppIcons.xcassets/BlueIcon.appiconset/Icon1@167x167.png
diff --git a/Telegram-iOS/AppIcons.xcassets/BlueIcon.appiconset/Icon1@180x180.png b/Telegram/Telegram-iOS/AppIcons.xcassets/BlueIcon.appiconset/Icon1@180x180.png
similarity index 100%
rename from Telegram-iOS/AppIcons.xcassets/BlueIcon.appiconset/Icon1@180x180.png
rename to Telegram/Telegram-iOS/AppIcons.xcassets/BlueIcon.appiconset/Icon1@180x180.png
diff --git a/Telegram-iOS/AppIcons.xcassets/BlueIcon.appiconset/Icon1@20x20.png b/Telegram/Telegram-iOS/AppIcons.xcassets/BlueIcon.appiconset/Icon1@20x20.png
similarity index 100%
rename from Telegram-iOS/AppIcons.xcassets/BlueIcon.appiconset/Icon1@20x20.png
rename to Telegram/Telegram-iOS/AppIcons.xcassets/BlueIcon.appiconset/Icon1@20x20.png
diff --git a/Telegram-iOS/AppIcons.xcassets/BlueIcon.appiconset/Icon1@29x29.png b/Telegram/Telegram-iOS/AppIcons.xcassets/BlueIcon.appiconset/Icon1@29x29.png
similarity index 100%
rename from Telegram-iOS/AppIcons.xcassets/BlueIcon.appiconset/Icon1@29x29.png
rename to Telegram/Telegram-iOS/AppIcons.xcassets/BlueIcon.appiconset/Icon1@29x29.png
diff --git a/Telegram-iOS/AppIcons.xcassets/BlueIcon.appiconset/Icon1@40x40-1.png b/Telegram/Telegram-iOS/AppIcons.xcassets/BlueIcon.appiconset/Icon1@40x40-1.png
similarity index 100%
rename from Telegram-iOS/AppIcons.xcassets/BlueIcon.appiconset/Icon1@40x40-1.png
rename to Telegram/Telegram-iOS/AppIcons.xcassets/BlueIcon.appiconset/Icon1@40x40-1.png
diff --git a/Telegram-iOS/AppIcons.xcassets/BlueIcon.appiconset/Icon1@40x40-2.png b/Telegram/Telegram-iOS/AppIcons.xcassets/BlueIcon.appiconset/Icon1@40x40-2.png
similarity index 100%
rename from Telegram-iOS/AppIcons.xcassets/BlueIcon.appiconset/Icon1@40x40-2.png
rename to Telegram/Telegram-iOS/AppIcons.xcassets/BlueIcon.appiconset/Icon1@40x40-2.png
diff --git a/Telegram-iOS/AppIcons.xcassets/BlueIcon.appiconset/Icon1@40x40.png b/Telegram/Telegram-iOS/AppIcons.xcassets/BlueIcon.appiconset/Icon1@40x40.png
similarity index 100%
rename from Telegram-iOS/AppIcons.xcassets/BlueIcon.appiconset/Icon1@40x40.png
rename to Telegram/Telegram-iOS/AppIcons.xcassets/BlueIcon.appiconset/Icon1@40x40.png
diff --git a/Telegram-iOS/AppIcons.xcassets/BlueIcon.appiconset/Icon1@58x58-1.png b/Telegram/Telegram-iOS/AppIcons.xcassets/BlueIcon.appiconset/Icon1@58x58-1.png
similarity index 100%
rename from Telegram-iOS/AppIcons.xcassets/BlueIcon.appiconset/Icon1@58x58-1.png
rename to Telegram/Telegram-iOS/AppIcons.xcassets/BlueIcon.appiconset/Icon1@58x58-1.png
diff --git a/Telegram-iOS/AppIcons.xcassets/BlueIcon.appiconset/Icon1@58x58.png b/Telegram/Telegram-iOS/AppIcons.xcassets/BlueIcon.appiconset/Icon1@58x58.png
similarity index 100%
rename from Telegram-iOS/AppIcons.xcassets/BlueIcon.appiconset/Icon1@58x58.png
rename to Telegram/Telegram-iOS/AppIcons.xcassets/BlueIcon.appiconset/Icon1@58x58.png
diff --git a/Telegram-iOS/AppIcons.xcassets/BlueIcon.appiconset/Icon1@60x60.png b/Telegram/Telegram-iOS/AppIcons.xcassets/BlueIcon.appiconset/Icon1@60x60.png
similarity index 100%
rename from Telegram-iOS/AppIcons.xcassets/BlueIcon.appiconset/Icon1@60x60.png
rename to Telegram/Telegram-iOS/AppIcons.xcassets/BlueIcon.appiconset/Icon1@60x60.png
diff --git a/Telegram-iOS/AppIcons.xcassets/BlueIcon.appiconset/Icon1@76x76.png b/Telegram/Telegram-iOS/AppIcons.xcassets/BlueIcon.appiconset/Icon1@76x76.png
similarity index 100%
rename from Telegram-iOS/AppIcons.xcassets/BlueIcon.appiconset/Icon1@76x76.png
rename to Telegram/Telegram-iOS/AppIcons.xcassets/BlueIcon.appiconset/Icon1@76x76.png
diff --git a/Telegram-iOS/AppIcons.xcassets/BlueIcon.appiconset/Icon1@80x80-1.png b/Telegram/Telegram-iOS/AppIcons.xcassets/BlueIcon.appiconset/Icon1@80x80-1.png
similarity index 100%
rename from Telegram-iOS/AppIcons.xcassets/BlueIcon.appiconset/Icon1@80x80-1.png
rename to Telegram/Telegram-iOS/AppIcons.xcassets/BlueIcon.appiconset/Icon1@80x80-1.png
diff --git a/Telegram-iOS/AppIcons.xcassets/BlueIcon.appiconset/Icon1@80x80.png b/Telegram/Telegram-iOS/AppIcons.xcassets/BlueIcon.appiconset/Icon1@80x80.png
similarity index 100%
rename from Telegram-iOS/AppIcons.xcassets/BlueIcon.appiconset/Icon1@80x80.png
rename to Telegram/Telegram-iOS/AppIcons.xcassets/BlueIcon.appiconset/Icon1@80x80.png
diff --git a/Telegram-iOS/AppIcons.xcassets/BlueIcon.appiconset/Icon1@87x87.png b/Telegram/Telegram-iOS/AppIcons.xcassets/BlueIcon.appiconset/Icon1@87x87.png
similarity index 100%
rename from Telegram-iOS/AppIcons.xcassets/BlueIcon.appiconset/Icon1@87x87.png
rename to Telegram/Telegram-iOS/AppIcons.xcassets/BlueIcon.appiconset/Icon1@87x87.png
diff --git a/Telegram-iOS/AppIcons.xcassets/Contents.json b/Telegram/Telegram-iOS/AppIcons.xcassets/Contents.json
similarity index 100%
rename from Telegram-iOS/AppIcons.xcassets/Contents.json
rename to Telegram/Telegram-iOS/AppIcons.xcassets/Contents.json
diff --git a/Telegram-iOS/Application.swift b/Telegram/Telegram-iOS/Application.swift
similarity index 100%
rename from Telegram-iOS/Application.swift
rename to Telegram/Telegram-iOS/Application.swift
diff --git a/Telegram-iOS/Base.lproj/LaunchScreen.xib b/Telegram/Telegram-iOS/Base.lproj/LaunchScreen.xib
similarity index 100%
rename from Telegram-iOS/Base.lproj/LaunchScreen.xib
rename to Telegram/Telegram-iOS/Base.lproj/LaunchScreen.xib
diff --git a/Telegram-iOS/BlackClassicIcon@2x.png b/Telegram/Telegram-iOS/BlackClassicIcon@2x.png
similarity index 100%
rename from Telegram-iOS/BlackClassicIcon@2x.png
rename to Telegram/Telegram-iOS/BlackClassicIcon@2x.png
diff --git a/Telegram-iOS/BlackClassicIcon@3x.png b/Telegram/Telegram-iOS/BlackClassicIcon@3x.png
similarity index 100%
rename from Telegram-iOS/BlackClassicIcon@3x.png
rename to Telegram/Telegram-iOS/BlackClassicIcon@3x.png
diff --git a/Telegram-iOS/BlackClassicIconIpad.png b/Telegram/Telegram-iOS/BlackClassicIconIpad.png
similarity index 100%
rename from Telegram-iOS/BlackClassicIconIpad.png
rename to Telegram/Telegram-iOS/BlackClassicIconIpad.png
diff --git a/Telegram-iOS/BlackClassicIconIpad@2x.png b/Telegram/Telegram-iOS/BlackClassicIconIpad@2x.png
similarity index 100%
rename from Telegram-iOS/BlackClassicIconIpad@2x.png
rename to Telegram/Telegram-iOS/BlackClassicIconIpad@2x.png
diff --git a/Telegram-iOS/BlackClassicIconLargeIpad@2x.png b/Telegram/Telegram-iOS/BlackClassicIconLargeIpad@2x.png
similarity index 100%
rename from Telegram-iOS/BlackClassicIconLargeIpad@2x.png
rename to Telegram/Telegram-iOS/BlackClassicIconLargeIpad@2x.png
diff --git a/Telegram-iOS/BlackClassicNotificationIcon.png b/Telegram/Telegram-iOS/BlackClassicNotificationIcon.png
similarity index 100%
rename from Telegram-iOS/BlackClassicNotificationIcon.png
rename to Telegram/Telegram-iOS/BlackClassicNotificationIcon.png
diff --git a/Telegram-iOS/BlackClassicNotificationIcon@2x.png b/Telegram/Telegram-iOS/BlackClassicNotificationIcon@2x.png
similarity index 100%
rename from Telegram-iOS/BlackClassicNotificationIcon@2x.png
rename to Telegram/Telegram-iOS/BlackClassicNotificationIcon@2x.png
diff --git a/Telegram-iOS/BlackClassicNotificationIcon@3x.png b/Telegram/Telegram-iOS/BlackClassicNotificationIcon@3x.png
similarity index 100%
rename from Telegram-iOS/BlackClassicNotificationIcon@3x.png
rename to Telegram/Telegram-iOS/BlackClassicNotificationIcon@3x.png
diff --git a/Telegram-iOS/BlackFilledIcon@2x.png b/Telegram/Telegram-iOS/BlackFilledIcon@2x.png
similarity index 100%
rename from Telegram-iOS/BlackFilledIcon@2x.png
rename to Telegram/Telegram-iOS/BlackFilledIcon@2x.png
diff --git a/Telegram-iOS/BlackFilledIcon@3x.png b/Telegram/Telegram-iOS/BlackFilledIcon@3x.png
similarity index 100%
rename from Telegram-iOS/BlackFilledIcon@3x.png
rename to Telegram/Telegram-iOS/BlackFilledIcon@3x.png
diff --git a/Telegram-iOS/BlackFilledIconIpad.png b/Telegram/Telegram-iOS/BlackFilledIconIpad.png
similarity index 100%
rename from Telegram-iOS/BlackFilledIconIpad.png
rename to Telegram/Telegram-iOS/BlackFilledIconIpad.png
diff --git a/Telegram-iOS/BlackFilledIconIpad@2x.png b/Telegram/Telegram-iOS/BlackFilledIconIpad@2x.png
similarity index 100%
rename from Telegram-iOS/BlackFilledIconIpad@2x.png
rename to Telegram/Telegram-iOS/BlackFilledIconIpad@2x.png
diff --git a/Telegram-iOS/BlackFilledIconLargeIpad@2x.png b/Telegram/Telegram-iOS/BlackFilledIconLargeIpad@2x.png
similarity index 100%
rename from Telegram-iOS/BlackFilledIconLargeIpad@2x.png
rename to Telegram/Telegram-iOS/BlackFilledIconLargeIpad@2x.png
diff --git a/Telegram-iOS/BlackIcon@2x.png b/Telegram/Telegram-iOS/BlackIcon@2x.png
similarity index 100%
rename from Telegram-iOS/BlackIcon@2x.png
rename to Telegram/Telegram-iOS/BlackIcon@2x.png
diff --git a/Telegram-iOS/BlackIcon@3x.png b/Telegram/Telegram-iOS/BlackIcon@3x.png
similarity index 100%
rename from Telegram-iOS/BlackIcon@3x.png
rename to Telegram/Telegram-iOS/BlackIcon@3x.png
diff --git a/Telegram-iOS/BlackIconIpad.png b/Telegram/Telegram-iOS/BlackIconIpad.png
similarity index 100%
rename from Telegram-iOS/BlackIconIpad.png
rename to Telegram/Telegram-iOS/BlackIconIpad.png
diff --git a/Telegram-iOS/BlackIconIpad@2x.png b/Telegram/Telegram-iOS/BlackIconIpad@2x.png
similarity index 100%
rename from Telegram-iOS/BlackIconIpad@2x.png
rename to Telegram/Telegram-iOS/BlackIconIpad@2x.png
diff --git a/Telegram-iOS/BlackIconLargeIpad@2x.png b/Telegram/Telegram-iOS/BlackIconLargeIpad@2x.png
similarity index 100%
rename from Telegram-iOS/BlackIconLargeIpad@2x.png
rename to Telegram/Telegram-iOS/BlackIconLargeIpad@2x.png
diff --git a/Telegram-iOS/BlackNotificationIcon.png b/Telegram/Telegram-iOS/BlackNotificationIcon.png
similarity index 100%
rename from Telegram-iOS/BlackNotificationIcon.png
rename to Telegram/Telegram-iOS/BlackNotificationIcon.png
diff --git a/Telegram-iOS/BlackNotificationIcon@2x.png b/Telegram/Telegram-iOS/BlackNotificationIcon@2x.png
similarity index 100%
rename from Telegram-iOS/BlackNotificationIcon@2x.png
rename to Telegram/Telegram-iOS/BlackNotificationIcon@2x.png
diff --git a/Telegram-iOS/BlackNotificationIcon@3x.png b/Telegram/Telegram-iOS/BlackNotificationIcon@3x.png
similarity index 100%
rename from Telegram-iOS/BlackNotificationIcon@3x.png
rename to Telegram/Telegram-iOS/BlackNotificationIcon@3x.png
diff --git a/Telegram-iOS/BlueClassicIcon@2x.png b/Telegram/Telegram-iOS/BlueClassicIcon@2x.png
similarity index 100%
rename from Telegram-iOS/BlueClassicIcon@2x.png
rename to Telegram/Telegram-iOS/BlueClassicIcon@2x.png
diff --git a/Telegram-iOS/BlueClassicIcon@3x.png b/Telegram/Telegram-iOS/BlueClassicIcon@3x.png
similarity index 100%
rename from Telegram-iOS/BlueClassicIcon@3x.png
rename to Telegram/Telegram-iOS/BlueClassicIcon@3x.png
diff --git a/Telegram-iOS/BlueClassicIconIpad.png b/Telegram/Telegram-iOS/BlueClassicIconIpad.png
similarity index 100%
rename from Telegram-iOS/BlueClassicIconIpad.png
rename to Telegram/Telegram-iOS/BlueClassicIconIpad.png
diff --git a/Telegram-iOS/BlueClassicIconIpad@2x.png b/Telegram/Telegram-iOS/BlueClassicIconIpad@2x.png
similarity index 100%
rename from Telegram-iOS/BlueClassicIconIpad@2x.png
rename to Telegram/Telegram-iOS/BlueClassicIconIpad@2x.png
diff --git a/Telegram-iOS/BlueClassicIconLargeIpad@2x.png b/Telegram/Telegram-iOS/BlueClassicIconLargeIpad@2x.png
similarity index 100%
rename from Telegram-iOS/BlueClassicIconLargeIpad@2x.png
rename to Telegram/Telegram-iOS/BlueClassicIconLargeIpad@2x.png
diff --git a/Telegram-iOS/BlueClassicNotificationIcon.png b/Telegram/Telegram-iOS/BlueClassicNotificationIcon.png
similarity index 100%
rename from Telegram-iOS/BlueClassicNotificationIcon.png
rename to Telegram/Telegram-iOS/BlueClassicNotificationIcon.png
diff --git a/Telegram-iOS/BlueClassicNotificationIcon@2x.png b/Telegram/Telegram-iOS/BlueClassicNotificationIcon@2x.png
similarity index 100%
rename from Telegram-iOS/BlueClassicNotificationIcon@2x.png
rename to Telegram/Telegram-iOS/BlueClassicNotificationIcon@2x.png
diff --git a/Telegram-iOS/BlueClassicNotificationIcon@3x.png b/Telegram/Telegram-iOS/BlueClassicNotificationIcon@3x.png
similarity index 100%
rename from Telegram-iOS/BlueClassicNotificationIcon@3x.png
rename to Telegram/Telegram-iOS/BlueClassicNotificationIcon@3x.png
diff --git a/Telegram-iOS/BlueFilledIcon@2x.png b/Telegram/Telegram-iOS/BlueFilledIcon@2x.png
similarity index 100%
rename from Telegram-iOS/BlueFilledIcon@2x.png
rename to Telegram/Telegram-iOS/BlueFilledIcon@2x.png
diff --git a/Telegram-iOS/BlueFilledIcon@3x.png b/Telegram/Telegram-iOS/BlueFilledIcon@3x.png
similarity index 100%
rename from Telegram-iOS/BlueFilledIcon@3x.png
rename to Telegram/Telegram-iOS/BlueFilledIcon@3x.png
diff --git a/Telegram-iOS/BlueFilledIconIpad.png b/Telegram/Telegram-iOS/BlueFilledIconIpad.png
similarity index 100%
rename from Telegram-iOS/BlueFilledIconIpad.png
rename to Telegram/Telegram-iOS/BlueFilledIconIpad.png
diff --git a/Telegram-iOS/BlueFilledIconIpad@2x.png b/Telegram/Telegram-iOS/BlueFilledIconIpad@2x.png
similarity index 100%
rename from Telegram-iOS/BlueFilledIconIpad@2x.png
rename to Telegram/Telegram-iOS/BlueFilledIconIpad@2x.png
diff --git a/Telegram-iOS/BlueFilledIconLargeIpad@2x.png b/Telegram/Telegram-iOS/BlueFilledIconLargeIpad@2x.png
similarity index 100%
rename from Telegram-iOS/BlueFilledIconLargeIpad@2x.png
rename to Telegram/Telegram-iOS/BlueFilledIconLargeIpad@2x.png
diff --git a/Telegram-iOS/BlueIcon@2x.png b/Telegram/Telegram-iOS/BlueIcon@2x.png
similarity index 100%
rename from Telegram-iOS/BlueIcon@2x.png
rename to Telegram/Telegram-iOS/BlueIcon@2x.png
diff --git a/Telegram-iOS/BlueIcon@3x.png b/Telegram/Telegram-iOS/BlueIcon@3x.png
similarity index 100%
rename from Telegram-iOS/BlueIcon@3x.png
rename to Telegram/Telegram-iOS/BlueIcon@3x.png
diff --git a/Telegram-iOS/BlueIconIpad.png b/Telegram/Telegram-iOS/BlueIconIpad.png
similarity index 100%
rename from Telegram-iOS/BlueIconIpad.png
rename to Telegram/Telegram-iOS/BlueIconIpad.png
diff --git a/Telegram-iOS/BlueIconIpad@2x.png b/Telegram/Telegram-iOS/BlueIconIpad@2x.png
similarity index 100%
rename from Telegram-iOS/BlueIconIpad@2x.png
rename to Telegram/Telegram-iOS/BlueIconIpad@2x.png
diff --git a/Telegram-iOS/BlueIconLargeIpad@2x.png b/Telegram/Telegram-iOS/BlueIconLargeIpad@2x.png
similarity index 100%
rename from Telegram-iOS/BlueIconLargeIpad@2x.png
rename to Telegram/Telegram-iOS/BlueIconLargeIpad@2x.png
diff --git a/Telegram-iOS/BlueNotificationIcon.png b/Telegram/Telegram-iOS/BlueNotificationIcon.png
similarity index 100%
rename from Telegram-iOS/BlueNotificationIcon.png
rename to Telegram/Telegram-iOS/BlueNotificationIcon.png
diff --git a/Telegram-iOS/BlueNotificationIcon@2x.png b/Telegram/Telegram-iOS/BlueNotificationIcon@2x.png
similarity index 100%
rename from Telegram-iOS/BlueNotificationIcon@2x.png
rename to Telegram/Telegram-iOS/BlueNotificationIcon@2x.png
diff --git a/Telegram-iOS/BlueNotificationIcon@3x.png b/Telegram/Telegram-iOS/BlueNotificationIcon@3x.png
similarity index 100%
rename from Telegram-iOS/BlueNotificationIcon@3x.png
rename to Telegram/Telegram-iOS/BlueNotificationIcon@3x.png
diff --git a/Telegram-iOS/Config-AppStoreLLC.xcconfig b/Telegram/Telegram-iOS/Config-AppStoreLLC.xcconfig
similarity index 100%
rename from Telegram-iOS/Config-AppStoreLLC.xcconfig
rename to Telegram/Telegram-iOS/Config-AppStoreLLC.xcconfig
diff --git a/Telegram-iOS/Config-Fork.xcconfig b/Telegram/Telegram-iOS/Config-Fork.xcconfig
similarity index 100%
rename from Telegram-iOS/Config-Fork.xcconfig
rename to Telegram/Telegram-iOS/Config-Fork.xcconfig
diff --git a/Telegram-iOS/Config-Hockeyapp-Internal.xcconfig b/Telegram/Telegram-iOS/Config-Hockeyapp-Internal.xcconfig
similarity index 100%
rename from Telegram-iOS/Config-Hockeyapp-Internal.xcconfig
rename to Telegram/Telegram-iOS/Config-Hockeyapp-Internal.xcconfig
diff --git a/Telegram-iOS/Icons.xcassets/AppIconLLC.appiconset/BlueIcon@2x-1.png b/Telegram/Telegram-iOS/DefaultAppIcon.xcassets/AppIconLLC.appiconset/BlueIcon@2x-1.png
similarity index 100%
rename from Telegram-iOS/Icons.xcassets/AppIconLLC.appiconset/BlueIcon@2x-1.png
rename to Telegram/Telegram-iOS/DefaultAppIcon.xcassets/AppIconLLC.appiconset/BlueIcon@2x-1.png
diff --git a/Telegram-iOS/Icons.xcassets/AppIconLLC.appiconset/BlueIcon@2x.png b/Telegram/Telegram-iOS/DefaultAppIcon.xcassets/AppIconLLC.appiconset/BlueIcon@2x.png
similarity index 100%
rename from Telegram-iOS/Icons.xcassets/AppIconLLC.appiconset/BlueIcon@2x.png
rename to Telegram/Telegram-iOS/DefaultAppIcon.xcassets/AppIconLLC.appiconset/BlueIcon@2x.png
diff --git a/Telegram-iOS/Icons.xcassets/AppIconLLC.appiconset/BlueIcon@3x.png b/Telegram/Telegram-iOS/DefaultAppIcon.xcassets/AppIconLLC.appiconset/BlueIcon@3x.png
similarity index 100%
rename from Telegram-iOS/Icons.xcassets/AppIconLLC.appiconset/BlueIcon@3x.png
rename to Telegram/Telegram-iOS/DefaultAppIcon.xcassets/AppIconLLC.appiconset/BlueIcon@3x.png
diff --git a/Telegram-iOS/Icons.xcassets/AppIconLLC.appiconset/BlueIconIpad.png b/Telegram/Telegram-iOS/DefaultAppIcon.xcassets/AppIconLLC.appiconset/BlueIconIpad.png
similarity index 100%
rename from Telegram-iOS/Icons.xcassets/AppIconLLC.appiconset/BlueIconIpad.png
rename to Telegram/Telegram-iOS/DefaultAppIcon.xcassets/AppIconLLC.appiconset/BlueIconIpad.png
diff --git a/Telegram-iOS/Icons.xcassets/AppIconLLC.appiconset/BlueIconIpad@2x.png b/Telegram/Telegram-iOS/DefaultAppIcon.xcassets/AppIconLLC.appiconset/BlueIconIpad@2x.png
similarity index 100%
rename from Telegram-iOS/Icons.xcassets/AppIconLLC.appiconset/BlueIconIpad@2x.png
rename to Telegram/Telegram-iOS/DefaultAppIcon.xcassets/AppIconLLC.appiconset/BlueIconIpad@2x.png
diff --git a/Telegram-iOS/Icons.xcassets/AppIconLLC.appiconset/BlueIconLargeIpad@2x.png b/Telegram/Telegram-iOS/DefaultAppIcon.xcassets/AppIconLLC.appiconset/BlueIconLargeIpad@2x.png
similarity index 100%
rename from Telegram-iOS/Icons.xcassets/AppIconLLC.appiconset/BlueIconLargeIpad@2x.png
rename to Telegram/Telegram-iOS/DefaultAppIcon.xcassets/AppIconLLC.appiconset/BlueIconLargeIpad@2x.png
diff --git a/Telegram-iOS/Icons.xcassets/AppIconLLC.appiconset/BlueNotificationIcon.png b/Telegram/Telegram-iOS/DefaultAppIcon.xcassets/AppIconLLC.appiconset/BlueNotificationIcon.png
similarity index 100%
rename from Telegram-iOS/Icons.xcassets/AppIconLLC.appiconset/BlueNotificationIcon.png
rename to Telegram/Telegram-iOS/DefaultAppIcon.xcassets/AppIconLLC.appiconset/BlueNotificationIcon.png
diff --git a/Telegram-iOS/Icons.xcassets/AppIconLLC.appiconset/BlueNotificationIcon@2x-1.png b/Telegram/Telegram-iOS/DefaultAppIcon.xcassets/AppIconLLC.appiconset/BlueNotificationIcon@2x-1.png
similarity index 100%
rename from Telegram-iOS/Icons.xcassets/AppIconLLC.appiconset/BlueNotificationIcon@2x-1.png
rename to Telegram/Telegram-iOS/DefaultAppIcon.xcassets/AppIconLLC.appiconset/BlueNotificationIcon@2x-1.png
diff --git a/Telegram-iOS/Icons.xcassets/AppIconLLC.appiconset/BlueNotificationIcon@2x.png b/Telegram/Telegram-iOS/DefaultAppIcon.xcassets/AppIconLLC.appiconset/BlueNotificationIcon@2x.png
similarity index 100%
rename from Telegram-iOS/Icons.xcassets/AppIconLLC.appiconset/BlueNotificationIcon@2x.png
rename to Telegram/Telegram-iOS/DefaultAppIcon.xcassets/AppIconLLC.appiconset/BlueNotificationIcon@2x.png
diff --git a/Telegram-iOS/Icons.xcassets/AppIconLLC.appiconset/BlueNotificationIcon@3x.png b/Telegram/Telegram-iOS/DefaultAppIcon.xcassets/AppIconLLC.appiconset/BlueNotificationIcon@3x.png
similarity index 100%
rename from Telegram-iOS/Icons.xcassets/AppIconLLC.appiconset/BlueNotificationIcon@3x.png
rename to Telegram/Telegram-iOS/DefaultAppIcon.xcassets/AppIconLLC.appiconset/BlueNotificationIcon@3x.png
diff --git a/Telegram-iOS/Icons.xcassets/AppIconLLC.appiconset/Contents.json b/Telegram/Telegram-iOS/DefaultAppIcon.xcassets/AppIconLLC.appiconset/Contents.json
similarity index 100%
rename from Telegram-iOS/Icons.xcassets/AppIconLLC.appiconset/Contents.json
rename to Telegram/Telegram-iOS/DefaultAppIcon.xcassets/AppIconLLC.appiconset/Contents.json
diff --git a/Telegram-iOS/Icons.xcassets/AppIconLLC.appiconset/Simple-iTunesArtwork.png b/Telegram/Telegram-iOS/DefaultAppIcon.xcassets/AppIconLLC.appiconset/Simple-iTunesArtwork.png
similarity index 100%
rename from Telegram-iOS/Icons.xcassets/AppIconLLC.appiconset/Simple-iTunesArtwork.png
rename to Telegram/Telegram-iOS/DefaultAppIcon.xcassets/AppIconLLC.appiconset/Simple-iTunesArtwork.png
diff --git a/Telegram-iOS/Icons.xcassets/AppIconLLC.appiconset/Simple@29x29.png b/Telegram/Telegram-iOS/DefaultAppIcon.xcassets/AppIconLLC.appiconset/Simple@29x29.png
similarity index 100%
rename from Telegram-iOS/Icons.xcassets/AppIconLLC.appiconset/Simple@29x29.png
rename to Telegram/Telegram-iOS/DefaultAppIcon.xcassets/AppIconLLC.appiconset/Simple@29x29.png
diff --git a/Telegram-iOS/Icons.xcassets/AppIconLLC.appiconset/Simple@40x40-1.png b/Telegram/Telegram-iOS/DefaultAppIcon.xcassets/AppIconLLC.appiconset/Simple@40x40-1.png
similarity index 100%
rename from Telegram-iOS/Icons.xcassets/AppIconLLC.appiconset/Simple@40x40-1.png
rename to Telegram/Telegram-iOS/DefaultAppIcon.xcassets/AppIconLLC.appiconset/Simple@40x40-1.png
diff --git a/Telegram-iOS/Icons.xcassets/AppIconLLC.appiconset/Simple@58x58-1.png b/Telegram/Telegram-iOS/DefaultAppIcon.xcassets/AppIconLLC.appiconset/Simple@58x58-1.png
similarity index 100%
rename from Telegram-iOS/Icons.xcassets/AppIconLLC.appiconset/Simple@58x58-1.png
rename to Telegram/Telegram-iOS/DefaultAppIcon.xcassets/AppIconLLC.appiconset/Simple@58x58-1.png
diff --git a/Telegram-iOS/Icons.xcassets/AppIconLLC.appiconset/Simple@58x58.png b/Telegram/Telegram-iOS/DefaultAppIcon.xcassets/AppIconLLC.appiconset/Simple@58x58.png
similarity index 100%
rename from Telegram-iOS/Icons.xcassets/AppIconLLC.appiconset/Simple@58x58.png
rename to Telegram/Telegram-iOS/DefaultAppIcon.xcassets/AppIconLLC.appiconset/Simple@58x58.png
diff --git a/Telegram-iOS/Icons.xcassets/AppIconLLC.appiconset/Simple@80x80-1.png b/Telegram/Telegram-iOS/DefaultAppIcon.xcassets/AppIconLLC.appiconset/Simple@80x80-1.png
similarity index 100%
rename from Telegram-iOS/Icons.xcassets/AppIconLLC.appiconset/Simple@80x80-1.png
rename to Telegram/Telegram-iOS/DefaultAppIcon.xcassets/AppIconLLC.appiconset/Simple@80x80-1.png
diff --git a/Telegram-iOS/Icons.xcassets/AppIconLLC.appiconset/Simple@80x80.png b/Telegram/Telegram-iOS/DefaultAppIcon.xcassets/AppIconLLC.appiconset/Simple@80x80.png
similarity index 100%
rename from Telegram-iOS/Icons.xcassets/AppIconLLC.appiconset/Simple@80x80.png
rename to Telegram/Telegram-iOS/DefaultAppIcon.xcassets/AppIconLLC.appiconset/Simple@80x80.png
diff --git a/Telegram-iOS/Icons.xcassets/AppIconLLC.appiconset/Simple@87x87.png b/Telegram/Telegram-iOS/DefaultAppIcon.xcassets/AppIconLLC.appiconset/Simple@87x87.png
similarity index 100%
rename from Telegram-iOS/Icons.xcassets/AppIconLLC.appiconset/Simple@87x87.png
rename to Telegram/Telegram-iOS/DefaultAppIcon.xcassets/AppIconLLC.appiconset/Simple@87x87.png
diff --git a/Telegram-iOS/Icons.xcassets/Contents.json b/Telegram/Telegram-iOS/DefaultAppIcon.xcassets/Contents.json
similarity index 100%
rename from Telegram-iOS/Icons.xcassets/Contents.json
rename to Telegram/Telegram-iOS/DefaultAppIcon.xcassets/Contents.json
diff --git a/Telegram-iOS/Icons.xcassets/AppIcon.appiconset/Contents.json b/Telegram/Telegram-iOS/Icons.xcassets/AppIcon.appiconset/Contents.json
similarity index 100%
rename from Telegram-iOS/Icons.xcassets/AppIcon.appiconset/Contents.json
rename to Telegram/Telegram-iOS/Icons.xcassets/AppIcon.appiconset/Contents.json
diff --git a/Telegram-iOS/Icons.xcassets/AppIcon.appiconset/icon@1024px.png b/Telegram/Telegram-iOS/Icons.xcassets/AppIcon.appiconset/icon@1024px.png
similarity index 100%
rename from Telegram-iOS/Icons.xcassets/AppIcon.appiconset/icon@1024px.png
rename to Telegram/Telegram-iOS/Icons.xcassets/AppIcon.appiconset/icon@1024px.png
diff --git a/Telegram-iOS/Icons.xcassets/AppIcon.appiconset/icon@120px.png b/Telegram/Telegram-iOS/Icons.xcassets/AppIcon.appiconset/icon@120px.png
similarity index 100%
rename from Telegram-iOS/Icons.xcassets/AppIcon.appiconset/icon@120px.png
rename to Telegram/Telegram-iOS/Icons.xcassets/AppIcon.appiconset/icon@120px.png
diff --git a/Telegram-iOS/Icons.xcassets/AppIcon.appiconset/icon@152px.png b/Telegram/Telegram-iOS/Icons.xcassets/AppIcon.appiconset/icon@152px.png
similarity index 100%
rename from Telegram-iOS/Icons.xcassets/AppIcon.appiconset/icon@152px.png
rename to Telegram/Telegram-iOS/Icons.xcassets/AppIcon.appiconset/icon@152px.png
diff --git a/Telegram-iOS/Icons.xcassets/AppIcon.appiconset/icon@167px.png b/Telegram/Telegram-iOS/Icons.xcassets/AppIcon.appiconset/icon@167px.png
similarity index 100%
rename from Telegram-iOS/Icons.xcassets/AppIcon.appiconset/icon@167px.png
rename to Telegram/Telegram-iOS/Icons.xcassets/AppIcon.appiconset/icon@167px.png
diff --git a/Telegram-iOS/Icons.xcassets/AppIcon.appiconset/icon@180px.png b/Telegram/Telegram-iOS/Icons.xcassets/AppIcon.appiconset/icon@180px.png
similarity index 100%
rename from Telegram-iOS/Icons.xcassets/AppIcon.appiconset/icon@180px.png
rename to Telegram/Telegram-iOS/Icons.xcassets/AppIcon.appiconset/icon@180px.png
diff --git a/Telegram-iOS/Icons.xcassets/AppIcon.appiconset/icon@76px.png b/Telegram/Telegram-iOS/Icons.xcassets/AppIcon.appiconset/icon@76px.png
similarity index 100%
rename from Telegram-iOS/Icons.xcassets/AppIcon.appiconset/icon@76px.png
rename to Telegram/Telegram-iOS/Icons.xcassets/AppIcon.appiconset/icon@76px.png
diff --git a/Telegram/Telegram-iOS/Icons.xcassets/AppIconLLC.appiconset/BlueIcon@2x-1.png b/Telegram/Telegram-iOS/Icons.xcassets/AppIconLLC.appiconset/BlueIcon@2x-1.png
new file mode 100644
index 0000000000..dd360d8f50
Binary files /dev/null and b/Telegram/Telegram-iOS/Icons.xcassets/AppIconLLC.appiconset/BlueIcon@2x-1.png differ
diff --git a/Telegram/Telegram-iOS/Icons.xcassets/AppIconLLC.appiconset/BlueIcon@2x.png b/Telegram/Telegram-iOS/Icons.xcassets/AppIconLLC.appiconset/BlueIcon@2x.png
new file mode 100644
index 0000000000..2e502e7dab
Binary files /dev/null and b/Telegram/Telegram-iOS/Icons.xcassets/AppIconLLC.appiconset/BlueIcon@2x.png differ
diff --git a/Telegram/Telegram-iOS/Icons.xcassets/AppIconLLC.appiconset/BlueIcon@3x.png b/Telegram/Telegram-iOS/Icons.xcassets/AppIconLLC.appiconset/BlueIcon@3x.png
new file mode 100644
index 0000000000..c47aeed4b1
Binary files /dev/null and b/Telegram/Telegram-iOS/Icons.xcassets/AppIconLLC.appiconset/BlueIcon@3x.png differ
diff --git a/Telegram/Telegram-iOS/Icons.xcassets/AppIconLLC.appiconset/BlueIconIpad.png b/Telegram/Telegram-iOS/Icons.xcassets/AppIconLLC.appiconset/BlueIconIpad.png
new file mode 100644
index 0000000000..5eaf0bab23
Binary files /dev/null and b/Telegram/Telegram-iOS/Icons.xcassets/AppIconLLC.appiconset/BlueIconIpad.png differ
diff --git a/Telegram/Telegram-iOS/Icons.xcassets/AppIconLLC.appiconset/BlueIconIpad@2x.png b/Telegram/Telegram-iOS/Icons.xcassets/AppIconLLC.appiconset/BlueIconIpad@2x.png
new file mode 100644
index 0000000000..6d9e7ab98c
Binary files /dev/null and b/Telegram/Telegram-iOS/Icons.xcassets/AppIconLLC.appiconset/BlueIconIpad@2x.png differ
diff --git a/Telegram/Telegram-iOS/Icons.xcassets/AppIconLLC.appiconset/BlueIconLargeIpad@2x.png b/Telegram/Telegram-iOS/Icons.xcassets/AppIconLLC.appiconset/BlueIconLargeIpad@2x.png
new file mode 100644
index 0000000000..9bf363744d
Binary files /dev/null and b/Telegram/Telegram-iOS/Icons.xcassets/AppIconLLC.appiconset/BlueIconLargeIpad@2x.png differ
diff --git a/Telegram/Telegram-iOS/Icons.xcassets/AppIconLLC.appiconset/BlueNotificationIcon.png b/Telegram/Telegram-iOS/Icons.xcassets/AppIconLLC.appiconset/BlueNotificationIcon.png
new file mode 100644
index 0000000000..dc5916282e
Binary files /dev/null and b/Telegram/Telegram-iOS/Icons.xcassets/AppIconLLC.appiconset/BlueNotificationIcon.png differ
diff --git a/Telegram/Telegram-iOS/Icons.xcassets/AppIconLLC.appiconset/BlueNotificationIcon@2x-1.png b/Telegram/Telegram-iOS/Icons.xcassets/AppIconLLC.appiconset/BlueNotificationIcon@2x-1.png
new file mode 100644
index 0000000000..0898af42d9
Binary files /dev/null and b/Telegram/Telegram-iOS/Icons.xcassets/AppIconLLC.appiconset/BlueNotificationIcon@2x-1.png differ
diff --git a/Telegram/Telegram-iOS/Icons.xcassets/AppIconLLC.appiconset/BlueNotificationIcon@2x.png b/Telegram/Telegram-iOS/Icons.xcassets/AppIconLLC.appiconset/BlueNotificationIcon@2x.png
new file mode 100644
index 0000000000..0898af42d9
Binary files /dev/null and b/Telegram/Telegram-iOS/Icons.xcassets/AppIconLLC.appiconset/BlueNotificationIcon@2x.png differ
diff --git a/Telegram/Telegram-iOS/Icons.xcassets/AppIconLLC.appiconset/BlueNotificationIcon@3x.png b/Telegram/Telegram-iOS/Icons.xcassets/AppIconLLC.appiconset/BlueNotificationIcon@3x.png
new file mode 100644
index 0000000000..f7725e9914
Binary files /dev/null and b/Telegram/Telegram-iOS/Icons.xcassets/AppIconLLC.appiconset/BlueNotificationIcon@3x.png differ
diff --git a/Telegram/Telegram-iOS/Icons.xcassets/AppIconLLC.appiconset/Contents.json b/Telegram/Telegram-iOS/Icons.xcassets/AppIconLLC.appiconset/Contents.json
new file mode 100644
index 0000000000..00dd28927f
--- /dev/null
+++ b/Telegram/Telegram-iOS/Icons.xcassets/AppIconLLC.appiconset/Contents.json
@@ -0,0 +1,119 @@
+{
+  "images" : [
+    {
+      "size" : "20x20",
+      "idiom" : "iphone",
+      "filename" : "BlueNotificationIcon@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "size" : "20x20",
+      "idiom" : "iphone",
+      "filename" : "BlueNotificationIcon@3x.png",
+      "scale" : "3x"
+    },
+    {
+      "size" : "29x29",
+      "idiom" : "iphone",
+      "filename" : "Simple@58x58.png",
+      "scale" : "2x"
+    },
+    {
+      "size" : "29x29",
+      "idiom" : "iphone",
+      "filename" : "Simple@87x87.png",
+      "scale" : "3x"
+    },
+    {
+      "size" : "40x40",
+      "idiom" : "iphone",
+      "filename" : "Simple@80x80.png",
+      "scale" : "2x"
+    },
+    {
+      "size" : "40x40",
+      "idiom" : "iphone",
+      "filename" : "BlueIcon@2x-1.png",
+      "scale" : "3x"
+    },
+    {
+      "size" : "60x60",
+      "idiom" : "iphone",
+      "filename" : "BlueIcon@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "size" : "60x60",
+      "idiom" : "iphone",
+      "filename" : "BlueIcon@3x.png",
+      "scale" : "3x"
+    },
+    {
+      "size" : "20x20",
+      "idiom" : "ipad",
+      "filename" : "BlueNotificationIcon.png",
+      "scale" : "1x"
+    },
+    {
+      "size" : "20x20",
+      "idiom" : "ipad",
+      "filename" : "BlueNotificationIcon@2x-1.png",
+      "scale" : "2x"
+    },
+    {
+      "size" : "29x29",
+      "idiom" : "ipad",
+      "filename" : "Simple@29x29.png",
+      "scale" : "1x"
+    },
+    {
+      "size" : "29x29",
+      "idiom" : "ipad",
+      "filename" : "Simple@58x58-1.png",
+      "scale" : "2x"
+    },
+    {
+      "size" : "40x40",
+      "idiom" : "ipad",
+      "filename" : "Simple@40x40-1.png",
+      "scale" : "1x"
+    },
+    {
+      "size" : "40x40",
+      "idiom" : "ipad",
+      "filename" : "Simple@80x80-1.png",
+      "scale" : "2x"
+    },
+    {
+      "size" : "76x76",
+      "idiom" : "ipad",
+      "filename" : "BlueIconIpad.png",
+      "scale" : "1x"
+    },
+    {
+      "size" : "76x76",
+      "idiom" : "ipad",
+      "filename" : "BlueIconIpad@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "size" : "83.5x83.5",
+      "idiom" : "ipad",
+      "filename" : "BlueIconLargeIpad@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "size" : "1024x1024",
+      "idiom" : "ios-marketing",
+      "filename" : "Simple-iTunesArtwork.png",
+      "scale" : "1x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  },
+  "properties" : {
+    "pre-rendered" : true
+  }
+}
\ No newline at end of file
diff --git a/Telegram/Telegram-iOS/Icons.xcassets/AppIconLLC.appiconset/Simple-iTunesArtwork.png b/Telegram/Telegram-iOS/Icons.xcassets/AppIconLLC.appiconset/Simple-iTunesArtwork.png
new file mode 100644
index 0000000000..f00a2857f0
Binary files /dev/null and b/Telegram/Telegram-iOS/Icons.xcassets/AppIconLLC.appiconset/Simple-iTunesArtwork.png differ
diff --git a/Telegram/Telegram-iOS/Icons.xcassets/AppIconLLC.appiconset/Simple@29x29.png b/Telegram/Telegram-iOS/Icons.xcassets/AppIconLLC.appiconset/Simple@29x29.png
new file mode 100644
index 0000000000..90d7b67bc0
Binary files /dev/null and b/Telegram/Telegram-iOS/Icons.xcassets/AppIconLLC.appiconset/Simple@29x29.png differ
diff --git a/Telegram/Telegram-iOS/Icons.xcassets/AppIconLLC.appiconset/Simple@40x40-1.png b/Telegram/Telegram-iOS/Icons.xcassets/AppIconLLC.appiconset/Simple@40x40-1.png
new file mode 100644
index 0000000000..a79cb5dcdc
Binary files /dev/null and b/Telegram/Telegram-iOS/Icons.xcassets/AppIconLLC.appiconset/Simple@40x40-1.png differ
diff --git a/Telegram/Telegram-iOS/Icons.xcassets/AppIconLLC.appiconset/Simple@58x58-1.png b/Telegram/Telegram-iOS/Icons.xcassets/AppIconLLC.appiconset/Simple@58x58-1.png
new file mode 100644
index 0000000000..aa6a4a442e
Binary files /dev/null and b/Telegram/Telegram-iOS/Icons.xcassets/AppIconLLC.appiconset/Simple@58x58-1.png differ
diff --git a/Telegram/Telegram-iOS/Icons.xcassets/AppIconLLC.appiconset/Simple@58x58.png b/Telegram/Telegram-iOS/Icons.xcassets/AppIconLLC.appiconset/Simple@58x58.png
new file mode 100644
index 0000000000..aa6a4a442e
Binary files /dev/null and b/Telegram/Telegram-iOS/Icons.xcassets/AppIconLLC.appiconset/Simple@58x58.png differ
diff --git a/Telegram/Telegram-iOS/Icons.xcassets/AppIconLLC.appiconset/Simple@80x80-1.png b/Telegram/Telegram-iOS/Icons.xcassets/AppIconLLC.appiconset/Simple@80x80-1.png
new file mode 100644
index 0000000000..385bc474b2
Binary files /dev/null and b/Telegram/Telegram-iOS/Icons.xcassets/AppIconLLC.appiconset/Simple@80x80-1.png differ
diff --git a/Telegram/Telegram-iOS/Icons.xcassets/AppIconLLC.appiconset/Simple@80x80.png b/Telegram/Telegram-iOS/Icons.xcassets/AppIconLLC.appiconset/Simple@80x80.png
new file mode 100644
index 0000000000..385bc474b2
Binary files /dev/null and b/Telegram/Telegram-iOS/Icons.xcassets/AppIconLLC.appiconset/Simple@80x80.png differ
diff --git a/Telegram/Telegram-iOS/Icons.xcassets/AppIconLLC.appiconset/Simple@87x87.png b/Telegram/Telegram-iOS/Icons.xcassets/AppIconLLC.appiconset/Simple@87x87.png
new file mode 100644
index 0000000000..c0a9ce9319
Binary files /dev/null and b/Telegram/Telegram-iOS/Icons.xcassets/AppIconLLC.appiconset/Simple@87x87.png differ
diff --git a/Watch/App/Assets.xcassets/BubbleSpinner/Contents.json b/Telegram/Telegram-iOS/Icons.xcassets/Contents.json
similarity index 100%
rename from Watch/App/Assets.xcassets/BubbleSpinner/Contents.json
rename to Telegram/Telegram-iOS/Icons.xcassets/Contents.json
diff --git a/Telegram-iOS/Icons.xcassets/Shortcuts/Account.imageset/Contents.json b/Telegram/Telegram-iOS/Icons.xcassets/Shortcuts/Account.imageset/Contents.json
similarity index 100%
rename from Telegram-iOS/Icons.xcassets/Shortcuts/Account.imageset/Contents.json
rename to Telegram/Telegram-iOS/Icons.xcassets/Shortcuts/Account.imageset/Contents.json
diff --git a/Telegram-iOS/Icons.xcassets/Shortcuts/Account.imageset/ic_lt_user.pdf b/Telegram/Telegram-iOS/Icons.xcassets/Shortcuts/Account.imageset/ic_lt_user.pdf
similarity index 100%
rename from Telegram-iOS/Icons.xcassets/Shortcuts/Account.imageset/ic_lt_user.pdf
rename to Telegram/Telegram-iOS/Icons.xcassets/Shortcuts/Account.imageset/ic_lt_user.pdf
diff --git a/Telegram-iOS/Icons.xcassets/Shortcuts/Camera.imageset/Contents.json b/Telegram/Telegram-iOS/Icons.xcassets/Shortcuts/Camera.imageset/Contents.json
similarity index 100%
rename from Telegram-iOS/Icons.xcassets/Shortcuts/Camera.imageset/Contents.json
rename to Telegram/Telegram-iOS/Icons.xcassets/Shortcuts/Camera.imageset/Contents.json
diff --git a/Telegram-iOS/Icons.xcassets/Shortcuts/Camera.imageset/ic_camera.pdf b/Telegram/Telegram-iOS/Icons.xcassets/Shortcuts/Camera.imageset/ic_camera.pdf
similarity index 100%
rename from Telegram-iOS/Icons.xcassets/Shortcuts/Camera.imageset/ic_camera.pdf
rename to Telegram/Telegram-iOS/Icons.xcassets/Shortcuts/Camera.imageset/ic_camera.pdf
diff --git a/Telegram-iOS/Icons.xcassets/Shortcuts/Contents.json b/Telegram/Telegram-iOS/Icons.xcassets/Shortcuts/Contents.json
similarity index 100%
rename from Telegram-iOS/Icons.xcassets/Shortcuts/Contents.json
rename to Telegram/Telegram-iOS/Icons.xcassets/Shortcuts/Contents.json
diff --git a/Telegram-iOS/Icons.xcassets/Shortcuts/SavedMessages.imageset/Contents.json b/Telegram/Telegram-iOS/Icons.xcassets/Shortcuts/SavedMessages.imageset/Contents.json
similarity index 100%
rename from Telegram-iOS/Icons.xcassets/Shortcuts/SavedMessages.imageset/Contents.json
rename to Telegram/Telegram-iOS/Icons.xcassets/Shortcuts/SavedMessages.imageset/Contents.json
diff --git a/Telegram-iOS/Icons.xcassets/Shortcuts/SavedMessages.imageset/ic_savedmessages.pdf b/Telegram/Telegram-iOS/Icons.xcassets/Shortcuts/SavedMessages.imageset/ic_savedmessages.pdf
similarity index 100%
rename from Telegram-iOS/Icons.xcassets/Shortcuts/SavedMessages.imageset/ic_savedmessages.pdf
rename to Telegram/Telegram-iOS/Icons.xcassets/Shortcuts/SavedMessages.imageset/ic_savedmessages.pdf
diff --git a/Telegram-iOS/Info.plist b/Telegram/Telegram-iOS/Info.plist
similarity index 100%
rename from Telegram-iOS/Info.plist
rename to Telegram/Telegram-iOS/Info.plist
diff --git a/Telegram/Telegram-iOS/InfoBazel.plist b/Telegram/Telegram-iOS/InfoBazel.plist
new file mode 100644
index 0000000000..e7ca119cd8
--- /dev/null
+++ b/Telegram/Telegram-iOS/InfoBazel.plist
@@ -0,0 +1,207 @@
+<?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>BGTaskSchedulerPermittedIdentifiers</key>
+	<array>
+		<string>$(PRODUCT_BUNDLE_IDENTIFIER).refresh</string>
+	</array>
+	<key>CFBundleAllowMixedLocalizations</key>
+	<true/>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>en</string>
+	<key>CFBundleDisplayName</key>
+	<string>${APP_NAME}</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>APPL</string>
+	<key>CFBundleShortVersionString</key>
+	<string>$(PRODUCT_BUNDLE_SHORT_VERSION)</string>
+	<key>CFBundleSignature</key>
+	<string>????</string>
+	<key>CFBundleURLTypes</key>
+	<array>
+		<dict>
+			<key>CFBundleTypeRole</key>
+			<string>Viewer</string>
+			<key>CFBundleURLName</key>
+			<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
+			<key>CFBundleURLSchemes</key>
+			<array>
+				<string>telegram</string>
+			</array>
+		</dict>
+		<dict>
+			<key>CFBundleTypeRole</key>
+			<string>Viewer</string>
+			<key>CFBundleURLName</key>
+			<string>$(PRODUCT_BUNDLE_IDENTIFIER).compatibility</string>
+			<key>CFBundleURLSchemes</key>
+			<array>
+				<string>tg</string>
+				<string>$(APP_SPECIFIC_URL_SCHEME)</string>
+			</array>
+		</dict>
+		<dict>
+			<key>CFBundleTypeRole</key>
+			<string>Viewer</string>
+			<key>CFBundleURLName</key>
+			<string>$(PRODUCT_BUNDLE_IDENTIFIER).ton</string>
+			<key>CFBundleURLSchemes</key>
+			<array>
+				<string>ton</string>
+			</array>
+		</dict>
+	</array>
+	<key>CFBundleVersion</key>
+	<string>${BUILD_NUMBER}</string>
+	<key>ITSAppUsesNonExemptEncryption</key>
+	<false/>
+	<key>LSApplicationQueriesSchemes</key>
+	<array>
+		<string>instagram</string>
+		<string>comgooglemaps-x-callback</string>
+		<string>foursquare</string>
+		<string>here-location</string>
+		<string>yandexmaps</string>
+		<string>yandexnavi</string>
+		<string>comgooglemaps</string>
+		<string>youtube</string>
+		<string>twitter</string>
+		<string>vk</string>
+		<string>waze</string>
+		<string>googlechrome</string>
+		<string>firefox</string>
+		<string>touch-http</string>
+		<string>yandexbrowser-open-url</string>
+		<string>vimeo</string>
+		<string>vine</string>
+		<string>coub</string>
+		<string>uber</string>
+		<string>citymapper</string>
+		<string>lyft</string>
+		<string>opera-http</string>
+		<string>firefox-focus</string>
+		<string>ddgQuickLink</string>
+		<string>moovit</string>
+		<string>alook</string>
+		<string>dgis</string>
+		<string>microsoft-edge-http</string>
+		<string>brave</string>
+		<string>onionhttp</string>
+		<string>ucbrowser</string>
+		<string>dolphin</string>
+	</array>
+	<key>LSRequiresIPhoneOS</key>
+	<true/>
+	<key>NSAppTransportSecurity</key>
+	<dict>
+		<key>NSAllowsArbitraryLoads</key>
+		<true/>
+	</dict>
+	<key>NSCameraUsageDescription</key>
+	<string>We need this so that you can take and share photos and videos.</string>
+	<key>NSContactsUsageDescription</key>
+	<string>Telegram stores your contacts heavily encrypted in the cloud to let you connect with your friends across all your devices.</string>
+	<key>NSFaceIDUsageDescription</key>
+	<string>You can use Face ID to unlock the app.</string>
+	<key>NSLocationAlwaysUsageDescription</key>
+	<string>When you send your location to your friends, Telegram needs access to show them a map. You also need this to send locations from an Apple Watch.</string>
+	<key>NSLocationWhenInUseUsageDescription</key>
+	<string>When you send your location to your friends, Telegram needs access to show them a map.</string>
+	<key>NSMicrophoneUsageDescription</key>
+	<string>We need this so that you can record and share voice messages and videos with sound.</string>
+	<key>NSMotionUsageDescription</key>
+	<string>When you send your location to your friends, Telegram needs access to show them a map.</string>
+	<key>NSPhotoLibraryAddUsageDescription</key>
+	<string>We need this so that you can share photos and videos from your photo library.</string>
+	<key>NSPhotoLibraryUsageDescription</key>
+	<string>We need this so that you can share photos and videos from your photo library.</string>
+	<key>NSSiriUsageDescription</key>
+	<string>You can use Siri to send messages.</string>
+	<key>NSUserActivityTypes</key>
+	<array>
+		<string>INSendMessageIntent</string>
+		<string>RemindAboutChatIntent</string>
+	</array>
+	<key>UIAppFonts</key>
+	<array>
+		<string>SFCompactRounded-Semibold.otf</string>
+	</array>
+	<key>UIBackgroundModes</key>
+	<array>
+		<string>audio</string>
+		<string>fetch</string>
+		<string>location</string>
+		<string>remote-notification</string>
+		<string>voip</string>
+	</array>
+	<key>UIDeviceFamily</key>
+	<array>
+		<integer>1</integer>
+		<integer>2</integer>
+	</array>
+	<key>UIFileSharingEnabled</key>
+	<false/>
+	<key>UILaunchStoryboardName</key>
+	<string>LaunchScreen</string>
+	<key>UIRequiredDeviceCapabilities</key>
+	<array>
+		<string>armv7</string>
+	</array>
+	<key>UIRequiresPersistentWiFi</key>
+	<true/>
+	<key>UIStatusBarStyle</key>
+	<string>UIStatusBarStyleDefault</string>
+	<key>UISupportedInterfaceOrientations</key>
+	<array>
+		<string>UIInterfaceOrientationPortrait</string>
+		<string>UIInterfaceOrientationLandscapeLeft</string>
+		<string>UIInterfaceOrientationLandscapeRight</string>
+	</array>
+	<key>UISupportedInterfaceOrientations~ipad</key>
+	<array>
+		<string>UIInterfaceOrientationPortrait</string>
+		<string>UIInterfaceOrientationPortraitUpsideDown</string>
+		<string>UIInterfaceOrientationLandscapeLeft</string>
+		<string>UIInterfaceOrientationLandscapeRight</string>
+	</array>
+	<key>UIViewControllerBasedStatusBarAppearance</key>
+	<false/>
+	<key>UIViewEdgeAntialiasing</key>
+	<false/>
+	<key>UIViewGroupOpacity</key>
+	<false/>
+	<key>UTImportedTypeDeclarations</key>
+	<array>
+		<dict>
+			<key>UTTypeConformsTo</key>
+			<array>
+				<string>public.data</string>
+			</array>
+			<key>UTTypeDescription</key>
+			<string>Telegram iOS Color Theme File</string>
+			<key>UTTypeIconFiles</key>
+			<array>
+				<string>BlueIcon@3x.png</string>
+			</array>
+			<key>UTTypeIdentifier</key>
+			<string>org.telegram.Telegram-iOS.theme</string>
+			<key>UTTypeTagSpecification</key>
+			<dict>
+				<key>public.filename-extension</key>
+				<array>
+					<string>tgios-theme</string>
+				</array>
+			</dict>
+		</dict>
+	</array>
+</dict>
+</plist>
diff --git a/Telegram-iOS/Resources/Compass.tgs b/Telegram/Telegram-iOS/Resources/Compass.tgs
similarity index 100%
rename from Telegram-iOS/Resources/Compass.tgs
rename to Telegram/Telegram-iOS/Resources/Compass.tgs
diff --git a/Telegram-iOS/Resources/Dice_Rolling.tgs b/Telegram/Telegram-iOS/Resources/Dice_Rolling.tgs
similarity index 100%
rename from Telegram-iOS/Resources/Dice_Rolling.tgs
rename to Telegram/Telegram-iOS/Resources/Dice_Rolling.tgs
diff --git a/Telegram-iOS/Resources/NavigationBackArrowLight@2x.png b/Telegram/Telegram-iOS/Resources/NavigationBackArrowLight@2x.png
similarity index 100%
rename from Telegram-iOS/Resources/NavigationBackArrowLight@2x.png
rename to Telegram/Telegram-iOS/Resources/NavigationBackArrowLight@2x.png
diff --git a/Telegram-iOS/Resources/NavigationShadow@2x.png b/Telegram/Telegram-iOS/Resources/NavigationShadow@2x.png
similarity index 100%
rename from Telegram-iOS/Resources/NavigationShadow@2x.png
rename to Telegram/Telegram-iOS/Resources/NavigationShadow@2x.png
diff --git a/Telegram-iOS/Resources/PhotoEditor/PhotoEditorCaption@2x.png b/Telegram/Telegram-iOS/Resources/PhotoEditor/PhotoEditorCaption@2x.png
similarity index 100%
rename from Telegram-iOS/Resources/PhotoEditor/PhotoEditorCaption@2x.png
rename to Telegram/Telegram-iOS/Resources/PhotoEditor/PhotoEditorCaption@2x.png
diff --git a/Telegram-iOS/Resources/PhotoEditor/PhotoEditorCaption@3x.png b/Telegram/Telegram-iOS/Resources/PhotoEditor/PhotoEditorCaption@3x.png
similarity index 100%
rename from Telegram-iOS/Resources/PhotoEditor/PhotoEditorCaption@3x.png
rename to Telegram/Telegram-iOS/Resources/PhotoEditor/PhotoEditorCaption@3x.png
diff --git a/Telegram-iOS/Resources/PhotoEditor/PhotoEditorMute@2x.png b/Telegram/Telegram-iOS/Resources/PhotoEditor/PhotoEditorMute@2x.png
similarity index 100%
rename from Telegram-iOS/Resources/PhotoEditor/PhotoEditorMute@2x.png
rename to Telegram/Telegram-iOS/Resources/PhotoEditor/PhotoEditorMute@2x.png
diff --git a/Telegram-iOS/Resources/PhotoEditor/PhotoEditorMuteActive@2x.png b/Telegram/Telegram-iOS/Resources/PhotoEditor/PhotoEditorMuteActive@2x.png
similarity index 100%
rename from Telegram-iOS/Resources/PhotoEditor/PhotoEditorMuteActive@2x.png
rename to Telegram/Telegram-iOS/Resources/PhotoEditor/PhotoEditorMuteActive@2x.png
diff --git a/Telegram-iOS/Resources/begin_record.caf b/Telegram/Telegram-iOS/Resources/begin_record.caf
similarity index 100%
rename from Telegram-iOS/Resources/begin_record.caf
rename to Telegram/Telegram-iOS/Resources/begin_record.caf
diff --git a/Telegram-iOS/Resources/intro/fast_arrow@2x.png b/Telegram/Telegram-iOS/Resources/intro/fast_arrow@2x.png
similarity index 100%
rename from Telegram-iOS/Resources/intro/fast_arrow@2x.png
rename to Telegram/Telegram-iOS/Resources/intro/fast_arrow@2x.png
diff --git a/Telegram-iOS/Resources/intro/fast_arrow_shadow@2x.png b/Telegram/Telegram-iOS/Resources/intro/fast_arrow_shadow@2x.png
similarity index 100%
rename from Telegram-iOS/Resources/intro/fast_arrow_shadow@2x.png
rename to Telegram/Telegram-iOS/Resources/intro/fast_arrow_shadow@2x.png
diff --git a/Telegram-iOS/Resources/intro/fast_body@2x.png b/Telegram/Telegram-iOS/Resources/intro/fast_body@2x.png
similarity index 100%
rename from Telegram-iOS/Resources/intro/fast_body@2x.png
rename to Telegram/Telegram-iOS/Resources/intro/fast_body@2x.png
diff --git a/Telegram-iOS/Resources/intro/fast_spiral@2x.png b/Telegram/Telegram-iOS/Resources/intro/fast_spiral@2x.png
similarity index 100%
rename from Telegram-iOS/Resources/intro/fast_spiral@2x.png
rename to Telegram/Telegram-iOS/Resources/intro/fast_spiral@2x.png
diff --git a/Telegram-iOS/Resources/intro/ic_bubble@2x.png b/Telegram/Telegram-iOS/Resources/intro/ic_bubble@2x.png
similarity index 100%
rename from Telegram-iOS/Resources/intro/ic_bubble@2x.png
rename to Telegram/Telegram-iOS/Resources/intro/ic_bubble@2x.png
diff --git a/Telegram-iOS/Resources/intro/ic_bubble_dot@2x.png b/Telegram/Telegram-iOS/Resources/intro/ic_bubble_dot@2x.png
similarity index 100%
rename from Telegram-iOS/Resources/intro/ic_bubble_dot@2x.png
rename to Telegram/Telegram-iOS/Resources/intro/ic_bubble_dot@2x.png
diff --git a/Telegram-iOS/Resources/intro/ic_cam@2x.png b/Telegram/Telegram-iOS/Resources/intro/ic_cam@2x.png
similarity index 100%
rename from Telegram-iOS/Resources/intro/ic_cam@2x.png
rename to Telegram/Telegram-iOS/Resources/intro/ic_cam@2x.png
diff --git a/Telegram-iOS/Resources/intro/ic_cam_lens@2x.png b/Telegram/Telegram-iOS/Resources/intro/ic_cam_lens@2x.png
similarity index 100%
rename from Telegram-iOS/Resources/intro/ic_cam_lens@2x.png
rename to Telegram/Telegram-iOS/Resources/intro/ic_cam_lens@2x.png
diff --git a/Telegram-iOS/Resources/intro/ic_pencil@2x.png b/Telegram/Telegram-iOS/Resources/intro/ic_pencil@2x.png
similarity index 100%
rename from Telegram-iOS/Resources/intro/ic_pencil@2x.png
rename to Telegram/Telegram-iOS/Resources/intro/ic_pencil@2x.png
diff --git a/Telegram-iOS/Resources/intro/ic_pin@2x.png b/Telegram/Telegram-iOS/Resources/intro/ic_pin@2x.png
similarity index 100%
rename from Telegram-iOS/Resources/intro/ic_pin@2x.png
rename to Telegram/Telegram-iOS/Resources/intro/ic_pin@2x.png
diff --git a/Telegram-iOS/Resources/intro/ic_smile@2x.png b/Telegram/Telegram-iOS/Resources/intro/ic_smile@2x.png
similarity index 100%
rename from Telegram-iOS/Resources/intro/ic_smile@2x.png
rename to Telegram/Telegram-iOS/Resources/intro/ic_smile@2x.png
diff --git a/Telegram-iOS/Resources/intro/ic_smile_eye@2x.png b/Telegram/Telegram-iOS/Resources/intro/ic_smile_eye@2x.png
similarity index 100%
rename from Telegram-iOS/Resources/intro/ic_smile_eye@2x.png
rename to Telegram/Telegram-iOS/Resources/intro/ic_smile_eye@2x.png
diff --git a/Telegram-iOS/Resources/intro/ic_videocam@2x.png b/Telegram/Telegram-iOS/Resources/intro/ic_videocam@2x.png
similarity index 100%
rename from Telegram-iOS/Resources/intro/ic_videocam@2x.png
rename to Telegram/Telegram-iOS/Resources/intro/ic_videocam@2x.png
diff --git a/Telegram-iOS/Resources/intro/knot_down@2x.png b/Telegram/Telegram-iOS/Resources/intro/knot_down@2x.png
similarity index 100%
rename from Telegram-iOS/Resources/intro/knot_down@2x.png
rename to Telegram/Telegram-iOS/Resources/intro/knot_down@2x.png
diff --git a/Telegram-iOS/Resources/intro/knot_up1@2x.png b/Telegram/Telegram-iOS/Resources/intro/knot_up1@2x.png
similarity index 100%
rename from Telegram-iOS/Resources/intro/knot_up1@2x.png
rename to Telegram/Telegram-iOS/Resources/intro/knot_up1@2x.png
diff --git a/Telegram-iOS/Resources/intro/powerful_infinity@2x.png b/Telegram/Telegram-iOS/Resources/intro/powerful_infinity@2x.png
similarity index 100%
rename from Telegram-iOS/Resources/intro/powerful_infinity@2x.png
rename to Telegram/Telegram-iOS/Resources/intro/powerful_infinity@2x.png
diff --git a/Telegram-iOS/Resources/intro/powerful_infinity_white@2x.png b/Telegram/Telegram-iOS/Resources/intro/powerful_infinity_white@2x.png
similarity index 100%
rename from Telegram-iOS/Resources/intro/powerful_infinity_white@2x.png
rename to Telegram/Telegram-iOS/Resources/intro/powerful_infinity_white@2x.png
diff --git a/Telegram-iOS/Resources/intro/powerful_mask@2x.png b/Telegram/Telegram-iOS/Resources/intro/powerful_mask@2x.png
similarity index 100%
rename from Telegram-iOS/Resources/intro/powerful_mask@2x.png
rename to Telegram/Telegram-iOS/Resources/intro/powerful_mask@2x.png
diff --git a/Telegram-iOS/Resources/intro/powerful_star@2x.png b/Telegram/Telegram-iOS/Resources/intro/powerful_star@2x.png
similarity index 100%
rename from Telegram-iOS/Resources/intro/powerful_star@2x.png
rename to Telegram/Telegram-iOS/Resources/intro/powerful_star@2x.png
diff --git a/Telegram-iOS/Resources/intro/private_door@2x.png b/Telegram/Telegram-iOS/Resources/intro/private_door@2x.png
similarity index 100%
rename from Telegram-iOS/Resources/intro/private_door@2x.png
rename to Telegram/Telegram-iOS/Resources/intro/private_door@2x.png
diff --git a/Telegram-iOS/Resources/intro/private_screw@2x.png b/Telegram/Telegram-iOS/Resources/intro/private_screw@2x.png
similarity index 100%
rename from Telegram-iOS/Resources/intro/private_screw@2x.png
rename to Telegram/Telegram-iOS/Resources/intro/private_screw@2x.png
diff --git a/Telegram-iOS/Resources/intro/start_arrow@2x.png b/Telegram/Telegram-iOS/Resources/intro/start_arrow@2x.png
similarity index 100%
rename from Telegram-iOS/Resources/intro/start_arrow@2x.png
rename to Telegram/Telegram-iOS/Resources/intro/start_arrow@2x.png
diff --git a/Telegram-iOS/Resources/intro/start_arrow_ipad.png b/Telegram/Telegram-iOS/Resources/intro/start_arrow_ipad.png
similarity index 100%
rename from Telegram-iOS/Resources/intro/start_arrow_ipad.png
rename to Telegram/Telegram-iOS/Resources/intro/start_arrow_ipad.png
diff --git a/Telegram-iOS/Resources/intro/start_arrow_ipad@2x.png b/Telegram/Telegram-iOS/Resources/intro/start_arrow_ipad@2x.png
similarity index 100%
rename from Telegram-iOS/Resources/intro/start_arrow_ipad@2x.png
rename to Telegram/Telegram-iOS/Resources/intro/start_arrow_ipad@2x.png
diff --git a/Telegram-iOS/Resources/intro/telegram_plane1@2x.png b/Telegram/Telegram-iOS/Resources/intro/telegram_plane1@2x.png
similarity index 100%
rename from Telegram-iOS/Resources/intro/telegram_plane1@2x.png
rename to Telegram/Telegram-iOS/Resources/intro/telegram_plane1@2x.png
diff --git a/Telegram-iOS/Resources/intro/telegram_sphere@2x.png b/Telegram/Telegram-iOS/Resources/intro/telegram_sphere@2x.png
similarity index 100%
rename from Telegram-iOS/Resources/intro/telegram_sphere@2x.png
rename to Telegram/Telegram-iOS/Resources/intro/telegram_sphere@2x.png
diff --git a/Telegram-iOS/Resources/notifications/0.m4a b/Telegram/Telegram-iOS/Resources/notifications/0.m4a
similarity index 100%
rename from Telegram-iOS/Resources/notifications/0.m4a
rename to Telegram/Telegram-iOS/Resources/notifications/0.m4a
diff --git a/Telegram-iOS/Resources/notifications/1.m4a b/Telegram/Telegram-iOS/Resources/notifications/1.m4a
similarity index 100%
rename from Telegram-iOS/Resources/notifications/1.m4a
rename to Telegram/Telegram-iOS/Resources/notifications/1.m4a
diff --git a/Telegram-iOS/Resources/notifications/100.m4a b/Telegram/Telegram-iOS/Resources/notifications/100.m4a
similarity index 100%
rename from Telegram-iOS/Resources/notifications/100.m4a
rename to Telegram/Telegram-iOS/Resources/notifications/100.m4a
diff --git a/Telegram-iOS/Resources/notifications/101.m4a b/Telegram/Telegram-iOS/Resources/notifications/101.m4a
similarity index 100%
rename from Telegram-iOS/Resources/notifications/101.m4a
rename to Telegram/Telegram-iOS/Resources/notifications/101.m4a
diff --git a/Telegram-iOS/Resources/notifications/102.m4a b/Telegram/Telegram-iOS/Resources/notifications/102.m4a
similarity index 100%
rename from Telegram-iOS/Resources/notifications/102.m4a
rename to Telegram/Telegram-iOS/Resources/notifications/102.m4a
diff --git a/Telegram-iOS/Resources/notifications/103.m4a b/Telegram/Telegram-iOS/Resources/notifications/103.m4a
similarity index 100%
rename from Telegram-iOS/Resources/notifications/103.m4a
rename to Telegram/Telegram-iOS/Resources/notifications/103.m4a
diff --git a/Telegram-iOS/Resources/notifications/104.m4a b/Telegram/Telegram-iOS/Resources/notifications/104.m4a
similarity index 100%
rename from Telegram-iOS/Resources/notifications/104.m4a
rename to Telegram/Telegram-iOS/Resources/notifications/104.m4a
diff --git a/Telegram-iOS/Resources/notifications/105.m4a b/Telegram/Telegram-iOS/Resources/notifications/105.m4a
similarity index 100%
rename from Telegram-iOS/Resources/notifications/105.m4a
rename to Telegram/Telegram-iOS/Resources/notifications/105.m4a
diff --git a/Telegram-iOS/Resources/notifications/106.m4a b/Telegram/Telegram-iOS/Resources/notifications/106.m4a
similarity index 100%
rename from Telegram-iOS/Resources/notifications/106.m4a
rename to Telegram/Telegram-iOS/Resources/notifications/106.m4a
diff --git a/Telegram-iOS/Resources/notifications/107.m4a b/Telegram/Telegram-iOS/Resources/notifications/107.m4a
similarity index 100%
rename from Telegram-iOS/Resources/notifications/107.m4a
rename to Telegram/Telegram-iOS/Resources/notifications/107.m4a
diff --git a/Telegram-iOS/Resources/notifications/108.m4a b/Telegram/Telegram-iOS/Resources/notifications/108.m4a
similarity index 100%
rename from Telegram-iOS/Resources/notifications/108.m4a
rename to Telegram/Telegram-iOS/Resources/notifications/108.m4a
diff --git a/Telegram-iOS/Resources/notifications/109.m4a b/Telegram/Telegram-iOS/Resources/notifications/109.m4a
similarity index 100%
rename from Telegram-iOS/Resources/notifications/109.m4a
rename to Telegram/Telegram-iOS/Resources/notifications/109.m4a
diff --git a/Telegram-iOS/Resources/notifications/110.m4a b/Telegram/Telegram-iOS/Resources/notifications/110.m4a
similarity index 100%
rename from Telegram-iOS/Resources/notifications/110.m4a
rename to Telegram/Telegram-iOS/Resources/notifications/110.m4a
diff --git a/Telegram-iOS/Resources/notifications/111.m4a b/Telegram/Telegram-iOS/Resources/notifications/111.m4a
similarity index 100%
rename from Telegram-iOS/Resources/notifications/111.m4a
rename to Telegram/Telegram-iOS/Resources/notifications/111.m4a
diff --git a/Telegram-iOS/Resources/notifications/2.m4a b/Telegram/Telegram-iOS/Resources/notifications/2.m4a
similarity index 100%
rename from Telegram-iOS/Resources/notifications/2.m4a
rename to Telegram/Telegram-iOS/Resources/notifications/2.m4a
diff --git a/Telegram-iOS/Resources/notifications/3.m4a b/Telegram/Telegram-iOS/Resources/notifications/3.m4a
similarity index 100%
rename from Telegram-iOS/Resources/notifications/3.m4a
rename to Telegram/Telegram-iOS/Resources/notifications/3.m4a
diff --git a/Telegram-iOS/Resources/notifications/4.m4a b/Telegram/Telegram-iOS/Resources/notifications/4.m4a
similarity index 100%
rename from Telegram-iOS/Resources/notifications/4.m4a
rename to Telegram/Telegram-iOS/Resources/notifications/4.m4a
diff --git a/Telegram-iOS/Resources/notifications/5.m4a b/Telegram/Telegram-iOS/Resources/notifications/5.m4a
similarity index 100%
rename from Telegram-iOS/Resources/notifications/5.m4a
rename to Telegram/Telegram-iOS/Resources/notifications/5.m4a
diff --git a/Telegram-iOS/Resources/notifications/6.m4a b/Telegram/Telegram-iOS/Resources/notifications/6.m4a
similarity index 100%
rename from Telegram-iOS/Resources/notifications/6.m4a
rename to Telegram/Telegram-iOS/Resources/notifications/6.m4a
diff --git a/Telegram-iOS/Resources/notifications/7.m4a b/Telegram/Telegram-iOS/Resources/notifications/7.m4a
similarity index 100%
rename from Telegram-iOS/Resources/notifications/7.m4a
rename to Telegram/Telegram-iOS/Resources/notifications/7.m4a
diff --git a/Telegram-iOS/Resources/notifications/8.m4a b/Telegram/Telegram-iOS/Resources/notifications/8.m4a
similarity index 100%
rename from Telegram-iOS/Resources/notifications/8.m4a
rename to Telegram/Telegram-iOS/Resources/notifications/8.m4a
diff --git a/Telegram-iOS/Resources/notifications/9.m4a b/Telegram/Telegram-iOS/Resources/notifications/9.m4a
similarity index 100%
rename from Telegram-iOS/Resources/notifications/9.m4a
rename to Telegram/Telegram-iOS/Resources/notifications/9.m4a
diff --git a/Telegram-iOS/Resources/voip_busy.caf b/Telegram/Telegram-iOS/Resources/voip_busy.caf
similarity index 100%
rename from Telegram-iOS/Resources/voip_busy.caf
rename to Telegram/Telegram-iOS/Resources/voip_busy.caf
diff --git a/Telegram-iOS/Resources/voip_connecting.mp3 b/Telegram/Telegram-iOS/Resources/voip_connecting.mp3
similarity index 100%
rename from Telegram-iOS/Resources/voip_connecting.mp3
rename to Telegram/Telegram-iOS/Resources/voip_connecting.mp3
diff --git a/Telegram-iOS/Resources/voip_end.caf b/Telegram/Telegram-iOS/Resources/voip_end.caf
similarity index 100%
rename from Telegram-iOS/Resources/voip_end.caf
rename to Telegram/Telegram-iOS/Resources/voip_end.caf
diff --git a/Telegram-iOS/Resources/voip_fail.caf b/Telegram/Telegram-iOS/Resources/voip_fail.caf
similarity index 100%
rename from Telegram-iOS/Resources/voip_fail.caf
rename to Telegram/Telegram-iOS/Resources/voip_fail.caf
diff --git a/Telegram-iOS/Resources/voip_ringback.caf b/Telegram/Telegram-iOS/Resources/voip_ringback.caf
similarity index 100%
rename from Telegram-iOS/Resources/voip_ringback.caf
rename to Telegram/Telegram-iOS/Resources/voip_ringback.caf
diff --git a/Telegram-iOS/Telegram-Bridging-Header.h b/Telegram/Telegram-iOS/Telegram-Bridging-Header.h
similarity index 100%
rename from Telegram-iOS/Telegram-Bridging-Header.h
rename to Telegram/Telegram-iOS/Telegram-Bridging-Header.h
diff --git a/Telegram-iOS/WhiteFilledIcon@2x.png b/Telegram/Telegram-iOS/WhiteFilledIcon@2x.png
similarity index 100%
rename from Telegram-iOS/WhiteFilledIcon@2x.png
rename to Telegram/Telegram-iOS/WhiteFilledIcon@2x.png
diff --git a/Telegram-iOS/WhiteFilledIcon@3x.png b/Telegram/Telegram-iOS/WhiteFilledIcon@3x.png
similarity index 100%
rename from Telegram-iOS/WhiteFilledIcon@3x.png
rename to Telegram/Telegram-iOS/WhiteFilledIcon@3x.png
diff --git a/Telegram-iOS/ar.lproj/AppIntentVocabulary.plist b/Telegram/Telegram-iOS/ar.lproj/AppIntentVocabulary.plist
similarity index 100%
rename from Telegram-iOS/ar.lproj/AppIntentVocabulary.plist
rename to Telegram/Telegram-iOS/ar.lproj/AppIntentVocabulary.plist
diff --git a/Telegram-iOS/ar.lproj/InfoPlist.strings b/Telegram/Telegram-iOS/ar.lproj/InfoPlist.strings
similarity index 100%
rename from Telegram-iOS/ar.lproj/InfoPlist.strings
rename to Telegram/Telegram-iOS/ar.lproj/InfoPlist.strings
diff --git a/Telegram-iOS/de.lproj/Localizable.strings b/Telegram/Telegram-iOS/ar.lproj/Localizable.strings
similarity index 100%
rename from Telegram-iOS/de.lproj/Localizable.strings
rename to Telegram/Telegram-iOS/ar.lproj/Localizable.strings
diff --git a/Telegram-iOS/ca.lproj/AppIntentVocabulary.plist b/Telegram/Telegram-iOS/ca.lproj/AppIntentVocabulary.plist
similarity index 100%
rename from Telegram-iOS/ca.lproj/AppIntentVocabulary.plist
rename to Telegram/Telegram-iOS/ca.lproj/AppIntentVocabulary.plist
diff --git a/Telegram-iOS/ca.lproj/InfoPlist.strings b/Telegram/Telegram-iOS/ca.lproj/InfoPlist.strings
similarity index 100%
rename from Telegram-iOS/ca.lproj/InfoPlist.strings
rename to Telegram/Telegram-iOS/ca.lproj/InfoPlist.strings
diff --git a/Telegram-iOS/ca.lproj/Localizable.strings b/Telegram/Telegram-iOS/ca.lproj/Localizable.strings
similarity index 100%
rename from Telegram-iOS/ca.lproj/Localizable.strings
rename to Telegram/Telegram-iOS/ca.lproj/Localizable.strings
diff --git a/Telegram-iOS/de.lproj/AppIntentVocabulary.plist b/Telegram/Telegram-iOS/de.lproj/AppIntentVocabulary.plist
similarity index 100%
rename from Telegram-iOS/de.lproj/AppIntentVocabulary.plist
rename to Telegram/Telegram-iOS/de.lproj/AppIntentVocabulary.plist
diff --git a/Telegram-iOS/de.lproj/InfoPlist.strings b/Telegram/Telegram-iOS/de.lproj/InfoPlist.strings
similarity index 100%
rename from Telegram-iOS/de.lproj/InfoPlist.strings
rename to Telegram/Telegram-iOS/de.lproj/InfoPlist.strings
diff --git a/Telegram-iOS/es.lproj/Localizable.strings b/Telegram/Telegram-iOS/de.lproj/Localizable.strings
similarity index 100%
rename from Telegram-iOS/es.lproj/Localizable.strings
rename to Telegram/Telegram-iOS/de.lproj/Localizable.strings
diff --git a/Telegram-iOS/en.lproj/AppIntentVocabulary.plist b/Telegram/Telegram-iOS/en.lproj/AppIntentVocabulary.plist
similarity index 100%
rename from Telegram-iOS/en.lproj/AppIntentVocabulary.plist
rename to Telegram/Telegram-iOS/en.lproj/AppIntentVocabulary.plist
diff --git a/Telegram-iOS/en.lproj/InfoPlist.strings b/Telegram/Telegram-iOS/en.lproj/InfoPlist.strings
similarity index 100%
rename from Telegram-iOS/en.lproj/InfoPlist.strings
rename to Telegram/Telegram-iOS/en.lproj/InfoPlist.strings
diff --git a/Telegram-iOS/en.lproj/Localizable.strings b/Telegram/Telegram-iOS/en.lproj/Localizable.strings
similarity index 99%
rename from Telegram-iOS/en.lproj/Localizable.strings
rename to Telegram/Telegram-iOS/en.lproj/Localizable.strings
index 710bcd7c41..f2c0148559 100644
--- a/Telegram-iOS/en.lproj/Localizable.strings
+++ b/Telegram/Telegram-iOS/en.lproj/Localizable.strings
@@ -4858,6 +4858,7 @@ Any member of this group will be able to see messages in the channel.";
 "Wallet.Send.OwnAddressAlertProceed" = "Proceed";
 "Wallet.Send.TransactionInProgress" = "Please wait until the current transaction is completed.";
 "Wallet.Send.SyncInProgress" = "Please wait while the wallet finishes syncing with the TON Blockchain.";
+"Wallet.Send.EncryptComment" = "Encrypt Text";
 "Wallet.Settings.Title" = "Settings";
 "Wallet.Settings.Configuration" = "Server Settings";
 "Wallet.Settings.ConfigurationInfo" = "Advanced Settings";
@@ -5351,7 +5352,9 @@ Any member of this group will be able to see messages in the channel.";
 "ChatList.EmptyChatFilterList" = "No chats currently\nmatch this filter.";
 
 "ChatList.EmptyChatListNewMessage" = "New Message";
-"ChatList.EmptyChatListEditFilter" = "Edit Filter";
+"ChatList.EmptyChatListEditFilter" = "Edit Folder";
+
+"ChatListFilter.AddChatsTitle" = "Add Chats";
 
 "Stats.Overview" = "OVERVIEW";
 "Stats.Followers" = "Followers";
diff --git a/Telegram-iOS/es.lproj/AppIntentVocabulary.plist b/Telegram/Telegram-iOS/es.lproj/AppIntentVocabulary.plist
similarity index 100%
rename from Telegram-iOS/es.lproj/AppIntentVocabulary.plist
rename to Telegram/Telegram-iOS/es.lproj/AppIntentVocabulary.plist
diff --git a/Telegram-iOS/es.lproj/InfoPlist.strings b/Telegram/Telegram-iOS/es.lproj/InfoPlist.strings
similarity index 100%
rename from Telegram-iOS/es.lproj/InfoPlist.strings
rename to Telegram/Telegram-iOS/es.lproj/InfoPlist.strings
diff --git a/Telegram-iOS/it.lproj/Localizable.strings b/Telegram/Telegram-iOS/es.lproj/Localizable.strings
similarity index 100%
rename from Telegram-iOS/it.lproj/Localizable.strings
rename to Telegram/Telegram-iOS/es.lproj/Localizable.strings
diff --git a/Telegram-iOS/fr.lproj/AppIntentVocabulary.plist b/Telegram/Telegram-iOS/fr.lproj/AppIntentVocabulary.plist
similarity index 100%
rename from Telegram-iOS/fr.lproj/AppIntentVocabulary.plist
rename to Telegram/Telegram-iOS/fr.lproj/AppIntentVocabulary.plist
diff --git a/Telegram-iOS/fr.lproj/InfoPlist.strings b/Telegram/Telegram-iOS/fr.lproj/InfoPlist.strings
similarity index 100%
rename from Telegram-iOS/fr.lproj/InfoPlist.strings
rename to Telegram/Telegram-iOS/fr.lproj/InfoPlist.strings
diff --git a/Telegram-iOS/fr.lproj/Localizable.strings b/Telegram/Telegram-iOS/fr.lproj/Localizable.strings
similarity index 100%
rename from Telegram-iOS/fr.lproj/Localizable.strings
rename to Telegram/Telegram-iOS/fr.lproj/Localizable.strings
diff --git a/Telegram-iOS/id.lproj/AppIntentVocabulary.plist b/Telegram/Telegram-iOS/id.lproj/AppIntentVocabulary.plist
similarity index 100%
rename from Telegram-iOS/id.lproj/AppIntentVocabulary.plist
rename to Telegram/Telegram-iOS/id.lproj/AppIntentVocabulary.plist
diff --git a/Telegram-iOS/id.lproj/InfoPlist.strings b/Telegram/Telegram-iOS/id.lproj/InfoPlist.strings
similarity index 100%
rename from Telegram-iOS/id.lproj/InfoPlist.strings
rename to Telegram/Telegram-iOS/id.lproj/InfoPlist.strings
diff --git a/Telegram-iOS/id.lproj/Localizable.strings b/Telegram/Telegram-iOS/id.lproj/Localizable.strings
similarity index 100%
rename from Telegram-iOS/id.lproj/Localizable.strings
rename to Telegram/Telegram-iOS/id.lproj/Localizable.strings
diff --git a/Telegram-iOS/it.lproj/AppIntentVocabulary.plist b/Telegram/Telegram-iOS/it.lproj/AppIntentVocabulary.plist
similarity index 100%
rename from Telegram-iOS/it.lproj/AppIntentVocabulary.plist
rename to Telegram/Telegram-iOS/it.lproj/AppIntentVocabulary.plist
diff --git a/Telegram-iOS/it.lproj/InfoPlist.strings b/Telegram/Telegram-iOS/it.lproj/InfoPlist.strings
similarity index 100%
rename from Telegram-iOS/it.lproj/InfoPlist.strings
rename to Telegram/Telegram-iOS/it.lproj/InfoPlist.strings
diff --git a/Telegram-iOS/ko.lproj/Localizable.strings b/Telegram/Telegram-iOS/it.lproj/Localizable.strings
similarity index 100%
rename from Telegram-iOS/ko.lproj/Localizable.strings
rename to Telegram/Telegram-iOS/it.lproj/Localizable.strings
diff --git a/Telegram-iOS/ko.lproj/AppIntentVocabulary.plist b/Telegram/Telegram-iOS/ko.lproj/AppIntentVocabulary.plist
similarity index 100%
rename from Telegram-iOS/ko.lproj/AppIntentVocabulary.plist
rename to Telegram/Telegram-iOS/ko.lproj/AppIntentVocabulary.plist
diff --git a/Telegram-iOS/ko.lproj/InfoPlist.strings b/Telegram/Telegram-iOS/ko.lproj/InfoPlist.strings
similarity index 100%
rename from Telegram-iOS/ko.lproj/InfoPlist.strings
rename to Telegram/Telegram-iOS/ko.lproj/InfoPlist.strings
diff --git a/Telegram-iOS/nl.lproj/Localizable.strings b/Telegram/Telegram-iOS/ko.lproj/Localizable.strings
similarity index 100%
rename from Telegram-iOS/nl.lproj/Localizable.strings
rename to Telegram/Telegram-iOS/ko.lproj/Localizable.strings
diff --git a/Telegram-iOS/main.m b/Telegram/Telegram-iOS/main.m
similarity index 100%
rename from Telegram-iOS/main.m
rename to Telegram/Telegram-iOS/main.m
diff --git a/Telegram-iOS/ms.lproj/AppIntentVocabulary.plist b/Telegram/Telegram-iOS/ms.lproj/AppIntentVocabulary.plist
similarity index 100%
rename from Telegram-iOS/ms.lproj/AppIntentVocabulary.plist
rename to Telegram/Telegram-iOS/ms.lproj/AppIntentVocabulary.plist
diff --git a/Telegram-iOS/ms.lproj/InfoPlist.strings b/Telegram/Telegram-iOS/ms.lproj/InfoPlist.strings
similarity index 100%
rename from Telegram-iOS/ms.lproj/InfoPlist.strings
rename to Telegram/Telegram-iOS/ms.lproj/InfoPlist.strings
diff --git a/Telegram-iOS/ms.lproj/Localizable.strings b/Telegram/Telegram-iOS/ms.lproj/Localizable.strings
similarity index 100%
rename from Telegram-iOS/ms.lproj/Localizable.strings
rename to Telegram/Telegram-iOS/ms.lproj/Localizable.strings
diff --git a/Telegram-iOS/nl.lproj/AppIntentVocabulary.plist b/Telegram/Telegram-iOS/nl.lproj/AppIntentVocabulary.plist
similarity index 100%
rename from Telegram-iOS/nl.lproj/AppIntentVocabulary.plist
rename to Telegram/Telegram-iOS/nl.lproj/AppIntentVocabulary.plist
diff --git a/Telegram-iOS/nl.lproj/InfoPlist.strings b/Telegram/Telegram-iOS/nl.lproj/InfoPlist.strings
similarity index 100%
rename from Telegram-iOS/nl.lproj/InfoPlist.strings
rename to Telegram/Telegram-iOS/nl.lproj/InfoPlist.strings
diff --git a/Telegram-iOS/pt.lproj/Localizable.strings b/Telegram/Telegram-iOS/nl.lproj/Localizable.strings
similarity index 100%
rename from Telegram-iOS/pt.lproj/Localizable.strings
rename to Telegram/Telegram-iOS/nl.lproj/Localizable.strings
diff --git a/Telegram-iOS/pt.lproj/AppIntentVocabulary.plist b/Telegram/Telegram-iOS/pt.lproj/AppIntentVocabulary.plist
similarity index 100%
rename from Telegram-iOS/pt.lproj/AppIntentVocabulary.plist
rename to Telegram/Telegram-iOS/pt.lproj/AppIntentVocabulary.plist
diff --git a/Telegram-iOS/pt.lproj/InfoPlist.strings b/Telegram/Telegram-iOS/pt.lproj/InfoPlist.strings
similarity index 100%
rename from Telegram-iOS/pt.lproj/InfoPlist.strings
rename to Telegram/Telegram-iOS/pt.lproj/InfoPlist.strings
diff --git a/Telegram-iOS/ru.lproj/Localizable.strings b/Telegram/Telegram-iOS/pt.lproj/Localizable.strings
similarity index 100%
rename from Telegram-iOS/ru.lproj/Localizable.strings
rename to Telegram/Telegram-iOS/pt.lproj/Localizable.strings
diff --git a/Telegram-iOS/ru.lproj/AppIntentVocabulary.plist b/Telegram/Telegram-iOS/ru.lproj/AppIntentVocabulary.plist
similarity index 100%
rename from Telegram-iOS/ru.lproj/AppIntentVocabulary.plist
rename to Telegram/Telegram-iOS/ru.lproj/AppIntentVocabulary.plist
diff --git a/Telegram-iOS/ru.lproj/InfoPlist.strings b/Telegram/Telegram-iOS/ru.lproj/InfoPlist.strings
similarity index 100%
rename from Telegram-iOS/ru.lproj/InfoPlist.strings
rename to Telegram/Telegram-iOS/ru.lproj/InfoPlist.strings
diff --git a/submodules/Display/Display/UniversalMasterController.swift b/Telegram/Telegram-iOS/ru.lproj/Localizable.strings
similarity index 100%
rename from submodules/Display/Display/UniversalMasterController.swift
rename to Telegram/Telegram-iOS/ru.lproj/Localizable.strings
diff --git a/Telegram-iOS/tr.lproj/AppIntentVocabulary.plist b/Telegram/Telegram-iOS/tr.lproj/AppIntentVocabulary.plist
similarity index 100%
rename from Telegram-iOS/tr.lproj/AppIntentVocabulary.plist
rename to Telegram/Telegram-iOS/tr.lproj/AppIntentVocabulary.plist
diff --git a/Telegram-iOS/tr.lproj/InfoPlist.strings b/Telegram/Telegram-iOS/tr.lproj/InfoPlist.strings
similarity index 100%
rename from Telegram-iOS/tr.lproj/InfoPlist.strings
rename to Telegram/Telegram-iOS/tr.lproj/InfoPlist.strings
diff --git a/Telegram-iOS/tr.lproj/Localizable.strings b/Telegram/Telegram-iOS/tr.lproj/Localizable.strings
similarity index 100%
rename from Telegram-iOS/tr.lproj/Localizable.strings
rename to Telegram/Telegram-iOS/tr.lproj/Localizable.strings
diff --git a/Telegram-iOS/uk.lproj/AppIntentVocabulary.plist b/Telegram/Telegram-iOS/uk.lproj/AppIntentVocabulary.plist
similarity index 100%
rename from Telegram-iOS/uk.lproj/AppIntentVocabulary.plist
rename to Telegram/Telegram-iOS/uk.lproj/AppIntentVocabulary.plist
diff --git a/Telegram-iOS/uk.lproj/InfoPlist.strings b/Telegram/Telegram-iOS/uk.lproj/InfoPlist.strings
similarity index 100%
rename from Telegram-iOS/uk.lproj/InfoPlist.strings
rename to Telegram/Telegram-iOS/uk.lproj/InfoPlist.strings
diff --git a/Telegram-iOS/uk.lproj/Localizable.strings b/Telegram/Telegram-iOS/uk.lproj/Localizable.strings
similarity index 100%
rename from Telegram-iOS/uk.lproj/Localizable.strings
rename to Telegram/Telegram-iOS/uk.lproj/Localizable.strings
diff --git a/Watch/App/Assets.xcassets/AppIcon.appiconset/Contents.json b/Telegram/Watch/App/Assets.xcassets/AppIcon.appiconset/Contents.json
similarity index 100%
rename from Watch/App/Assets.xcassets/AppIcon.appiconset/Contents.json
rename to Telegram/Watch/App/Assets.xcassets/AppIcon.appiconset/Contents.json
diff --git a/Watch/App/Assets.xcassets/AppIcon.appiconset/Simple-iTunesArtwork.png b/Telegram/Watch/App/Assets.xcassets/AppIcon.appiconset/Simple-iTunesArtwork.png
similarity index 100%
rename from Watch/App/Assets.xcassets/AppIcon.appiconset/Simple-iTunesArtwork.png
rename to Telegram/Watch/App/Assets.xcassets/AppIcon.appiconset/Simple-iTunesArtwork.png
diff --git a/Watch/App/Assets.xcassets/AppIcon.appiconset/Simple@58x58.png b/Telegram/Watch/App/Assets.xcassets/AppIcon.appiconset/Simple@58x58.png
similarity index 100%
rename from Watch/App/Assets.xcassets/AppIcon.appiconset/Simple@58x58.png
rename to Telegram/Watch/App/Assets.xcassets/AppIcon.appiconset/Simple@58x58.png
diff --git a/Watch/App/Assets.xcassets/AppIcon.appiconset/Simple@80x80.png b/Telegram/Watch/App/Assets.xcassets/AppIcon.appiconset/Simple@80x80.png
similarity index 100%
rename from Watch/App/Assets.xcassets/AppIcon.appiconset/Simple@80x80.png
rename to Telegram/Watch/App/Assets.xcassets/AppIcon.appiconset/Simple@80x80.png
diff --git a/Watch/App/Assets.xcassets/AppIcon.appiconset/Simple@87x87.png b/Telegram/Watch/App/Assets.xcassets/AppIcon.appiconset/Simple@87x87.png
similarity index 100%
rename from Watch/App/Assets.xcassets/AppIcon.appiconset/Simple@87x87.png
rename to Telegram/Watch/App/Assets.xcassets/AppIcon.appiconset/Simple@87x87.png
diff --git a/Watch/App/Assets.xcassets/AppIcon.appiconset/Watch100@2x.png b/Telegram/Watch/App/Assets.xcassets/AppIcon.appiconset/Watch100@2x.png
similarity index 100%
rename from Watch/App/Assets.xcassets/AppIcon.appiconset/Watch100@2x.png
rename to Telegram/Watch/App/Assets.xcassets/AppIcon.appiconset/Watch100@2x.png
diff --git a/Watch/App/Assets.xcassets/AppIcon.appiconset/Watch172@2x.png b/Telegram/Watch/App/Assets.xcassets/AppIcon.appiconset/Watch172@2x.png
similarity index 100%
rename from Watch/App/Assets.xcassets/AppIcon.appiconset/Watch172@2x.png
rename to Telegram/Watch/App/Assets.xcassets/AppIcon.appiconset/Watch172@2x.png
diff --git a/Watch/App/Assets.xcassets/AppIcon.appiconset/Watch196@2x.png b/Telegram/Watch/App/Assets.xcassets/AppIcon.appiconset/Watch196@2x.png
similarity index 100%
rename from Watch/App/Assets.xcassets/AppIcon.appiconset/Watch196@2x.png
rename to Telegram/Watch/App/Assets.xcassets/AppIcon.appiconset/Watch196@2x.png
diff --git a/Watch/App/Assets.xcassets/AppIcon.appiconset/Watch216@2x.png b/Telegram/Watch/App/Assets.xcassets/AppIcon.appiconset/Watch216@2x.png
similarity index 100%
rename from Watch/App/Assets.xcassets/AppIcon.appiconset/Watch216@2x.png
rename to Telegram/Watch/App/Assets.xcassets/AppIcon.appiconset/Watch216@2x.png
diff --git a/Watch/App/Assets.xcassets/AppIcon.appiconset/Watch48@2x.png b/Telegram/Watch/App/Assets.xcassets/AppIcon.appiconset/Watch48@2x.png
similarity index 100%
rename from Watch/App/Assets.xcassets/AppIcon.appiconset/Watch48@2x.png
rename to Telegram/Watch/App/Assets.xcassets/AppIcon.appiconset/Watch48@2x.png
diff --git a/Watch/App/Assets.xcassets/AppIcon.appiconset/Watch55@2x.png b/Telegram/Watch/App/Assets.xcassets/AppIcon.appiconset/Watch55@2x.png
similarity index 100%
rename from Watch/App/Assets.xcassets/AppIcon.appiconset/Watch55@2x.png
rename to Telegram/Watch/App/Assets.xcassets/AppIcon.appiconset/Watch55@2x.png
diff --git a/Watch/App/Assets.xcassets/AppIcon.appiconset/Watch88@2x.png b/Telegram/Watch/App/Assets.xcassets/AppIcon.appiconset/Watch88@2x.png
similarity index 100%
rename from Watch/App/Assets.xcassets/AppIcon.appiconset/Watch88@2x.png
rename to Telegram/Watch/App/Assets.xcassets/AppIcon.appiconset/Watch88@2x.png
diff --git a/Watch/App/Assets.xcassets/BotCommandIcon.imageset/BotCommandIcon@2x.png b/Telegram/Watch/App/Assets.xcassets/BotCommandIcon.imageset/BotCommandIcon@2x.png
similarity index 100%
rename from Watch/App/Assets.xcassets/BotCommandIcon.imageset/BotCommandIcon@2x.png
rename to Telegram/Watch/App/Assets.xcassets/BotCommandIcon.imageset/BotCommandIcon@2x.png
diff --git a/Watch/App/Assets.xcassets/BotCommandIcon.imageset/Contents.json b/Telegram/Watch/App/Assets.xcassets/BotCommandIcon.imageset/Contents.json
similarity index 100%
rename from Watch/App/Assets.xcassets/BotCommandIcon.imageset/Contents.json
rename to Telegram/Watch/App/Assets.xcassets/BotCommandIcon.imageset/Contents.json
diff --git a/Watch/App/Assets.xcassets/BotKeyboardIcon.imageset/BotKeyboardIcon@2x.png b/Telegram/Watch/App/Assets.xcassets/BotKeyboardIcon.imageset/BotKeyboardIcon@2x.png
similarity index 100%
rename from Watch/App/Assets.xcassets/BotKeyboardIcon.imageset/BotKeyboardIcon@2x.png
rename to Telegram/Watch/App/Assets.xcassets/BotKeyboardIcon.imageset/BotKeyboardIcon@2x.png
diff --git a/Watch/App/Assets.xcassets/BotKeyboardIcon.imageset/Contents.json b/Telegram/Watch/App/Assets.xcassets/BotKeyboardIcon.imageset/Contents.json
similarity index 100%
rename from Watch/App/Assets.xcassets/BotKeyboardIcon.imageset/Contents.json
rename to Telegram/Watch/App/Assets.xcassets/BotKeyboardIcon.imageset/Contents.json
diff --git a/Watch/App/Assets.xcassets/BubbleNotification.imageset/BubbleNotification@2x.png b/Telegram/Watch/App/Assets.xcassets/BubbleNotification.imageset/BubbleNotification@2x.png
similarity index 100%
rename from Watch/App/Assets.xcassets/BubbleNotification.imageset/BubbleNotification@2x.png
rename to Telegram/Watch/App/Assets.xcassets/BubbleNotification.imageset/BubbleNotification@2x.png
diff --git a/Watch/App/Assets.xcassets/BubbleNotification.imageset/Contents.json b/Telegram/Watch/App/Assets.xcassets/BubbleNotification.imageset/Contents.json
similarity index 100%
rename from Watch/App/Assets.xcassets/BubbleNotification.imageset/Contents.json
rename to Telegram/Watch/App/Assets.xcassets/BubbleNotification.imageset/Contents.json
diff --git a/Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner0.imageset/BubbleSpinner0@2x.png b/Telegram/Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner0.imageset/BubbleSpinner0@2x.png
similarity index 100%
rename from Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner0.imageset/BubbleSpinner0@2x.png
rename to Telegram/Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner0.imageset/BubbleSpinner0@2x.png
diff --git a/Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner0.imageset/Contents.json b/Telegram/Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner0.imageset/Contents.json
similarity index 100%
rename from Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner0.imageset/Contents.json
rename to Telegram/Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner0.imageset/Contents.json
diff --git a/Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner1.imageset/BubbleSpinner1@2x.png b/Telegram/Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner1.imageset/BubbleSpinner1@2x.png
similarity index 100%
rename from Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner1.imageset/BubbleSpinner1@2x.png
rename to Telegram/Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner1.imageset/BubbleSpinner1@2x.png
diff --git a/Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner1.imageset/Contents.json b/Telegram/Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner1.imageset/Contents.json
similarity index 100%
rename from Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner1.imageset/Contents.json
rename to Telegram/Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner1.imageset/Contents.json
diff --git a/Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner10.imageset/BubbleSpinner10@2x.png b/Telegram/Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner10.imageset/BubbleSpinner10@2x.png
similarity index 100%
rename from Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner10.imageset/BubbleSpinner10@2x.png
rename to Telegram/Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner10.imageset/BubbleSpinner10@2x.png
diff --git a/Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner10.imageset/Contents.json b/Telegram/Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner10.imageset/Contents.json
similarity index 100%
rename from Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner10.imageset/Contents.json
rename to Telegram/Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner10.imageset/Contents.json
diff --git a/Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner11.imageset/BubbleSpinner11@2x.png b/Telegram/Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner11.imageset/BubbleSpinner11@2x.png
similarity index 100%
rename from Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner11.imageset/BubbleSpinner11@2x.png
rename to Telegram/Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner11.imageset/BubbleSpinner11@2x.png
diff --git a/Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner11.imageset/Contents.json b/Telegram/Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner11.imageset/Contents.json
similarity index 100%
rename from Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner11.imageset/Contents.json
rename to Telegram/Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner11.imageset/Contents.json
diff --git a/Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner12.imageset/BubbleSpinner12@2x.png b/Telegram/Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner12.imageset/BubbleSpinner12@2x.png
similarity index 100%
rename from Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner12.imageset/BubbleSpinner12@2x.png
rename to Telegram/Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner12.imageset/BubbleSpinner12@2x.png
diff --git a/Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner12.imageset/Contents.json b/Telegram/Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner12.imageset/Contents.json
similarity index 100%
rename from Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner12.imageset/Contents.json
rename to Telegram/Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner12.imageset/Contents.json
diff --git a/Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner13.imageset/BubbleSpinner13@2x.png b/Telegram/Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner13.imageset/BubbleSpinner13@2x.png
similarity index 100%
rename from Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner13.imageset/BubbleSpinner13@2x.png
rename to Telegram/Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner13.imageset/BubbleSpinner13@2x.png
diff --git a/Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner13.imageset/Contents.json b/Telegram/Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner13.imageset/Contents.json
similarity index 100%
rename from Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner13.imageset/Contents.json
rename to Telegram/Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner13.imageset/Contents.json
diff --git a/Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner14.imageset/BubbleSpinner14@2x.png b/Telegram/Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner14.imageset/BubbleSpinner14@2x.png
similarity index 100%
rename from Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner14.imageset/BubbleSpinner14@2x.png
rename to Telegram/Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner14.imageset/BubbleSpinner14@2x.png
diff --git a/Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner14.imageset/Contents.json b/Telegram/Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner14.imageset/Contents.json
similarity index 100%
rename from Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner14.imageset/Contents.json
rename to Telegram/Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner14.imageset/Contents.json
diff --git a/Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner15.imageset/BubbleSpinner15@2x.png b/Telegram/Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner15.imageset/BubbleSpinner15@2x.png
similarity index 100%
rename from Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner15.imageset/BubbleSpinner15@2x.png
rename to Telegram/Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner15.imageset/BubbleSpinner15@2x.png
diff --git a/Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner15.imageset/Contents.json b/Telegram/Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner15.imageset/Contents.json
similarity index 100%
rename from Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner15.imageset/Contents.json
rename to Telegram/Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner15.imageset/Contents.json
diff --git a/Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner16.imageset/BubbleSpinner16@2x.png b/Telegram/Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner16.imageset/BubbleSpinner16@2x.png
similarity index 100%
rename from Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner16.imageset/BubbleSpinner16@2x.png
rename to Telegram/Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner16.imageset/BubbleSpinner16@2x.png
diff --git a/Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner16.imageset/Contents.json b/Telegram/Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner16.imageset/Contents.json
similarity index 100%
rename from Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner16.imageset/Contents.json
rename to Telegram/Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner16.imageset/Contents.json
diff --git a/Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner17.imageset/BubbleSpinner17@2x.png b/Telegram/Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner17.imageset/BubbleSpinner17@2x.png
similarity index 100%
rename from Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner17.imageset/BubbleSpinner17@2x.png
rename to Telegram/Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner17.imageset/BubbleSpinner17@2x.png
diff --git a/Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner17.imageset/Contents.json b/Telegram/Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner17.imageset/Contents.json
similarity index 100%
rename from Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner17.imageset/Contents.json
rename to Telegram/Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner17.imageset/Contents.json
diff --git a/Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner18.imageset/BubbleSpinner18@2x.png b/Telegram/Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner18.imageset/BubbleSpinner18@2x.png
similarity index 100%
rename from Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner18.imageset/BubbleSpinner18@2x.png
rename to Telegram/Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner18.imageset/BubbleSpinner18@2x.png
diff --git a/Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner18.imageset/Contents.json b/Telegram/Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner18.imageset/Contents.json
similarity index 100%
rename from Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner18.imageset/Contents.json
rename to Telegram/Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner18.imageset/Contents.json
diff --git a/Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner19.imageset/BubbleSpinner19@2x.png b/Telegram/Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner19.imageset/BubbleSpinner19@2x.png
similarity index 100%
rename from Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner19.imageset/BubbleSpinner19@2x.png
rename to Telegram/Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner19.imageset/BubbleSpinner19@2x.png
diff --git a/Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner19.imageset/Contents.json b/Telegram/Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner19.imageset/Contents.json
similarity index 100%
rename from Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner19.imageset/Contents.json
rename to Telegram/Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner19.imageset/Contents.json
diff --git a/Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner2.imageset/BubbleSpinner2@2x.png b/Telegram/Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner2.imageset/BubbleSpinner2@2x.png
similarity index 100%
rename from Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner2.imageset/BubbleSpinner2@2x.png
rename to Telegram/Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner2.imageset/BubbleSpinner2@2x.png
diff --git a/Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner2.imageset/Contents.json b/Telegram/Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner2.imageset/Contents.json
similarity index 100%
rename from Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner2.imageset/Contents.json
rename to Telegram/Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner2.imageset/Contents.json
diff --git a/Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner20.imageset/BubbleSpinner20@2x.png b/Telegram/Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner20.imageset/BubbleSpinner20@2x.png
similarity index 100%
rename from Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner20.imageset/BubbleSpinner20@2x.png
rename to Telegram/Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner20.imageset/BubbleSpinner20@2x.png
diff --git a/Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner20.imageset/Contents.json b/Telegram/Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner20.imageset/Contents.json
similarity index 100%
rename from Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner20.imageset/Contents.json
rename to Telegram/Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner20.imageset/Contents.json
diff --git a/Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner21.imageset/BubbleSpinner21@2x.png b/Telegram/Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner21.imageset/BubbleSpinner21@2x.png
similarity index 100%
rename from Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner21.imageset/BubbleSpinner21@2x.png
rename to Telegram/Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner21.imageset/BubbleSpinner21@2x.png
diff --git a/Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner21.imageset/Contents.json b/Telegram/Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner21.imageset/Contents.json
similarity index 100%
rename from Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner21.imageset/Contents.json
rename to Telegram/Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner21.imageset/Contents.json
diff --git a/Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner22.imageset/BubbleSpinner22@2x.png b/Telegram/Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner22.imageset/BubbleSpinner22@2x.png
similarity index 100%
rename from Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner22.imageset/BubbleSpinner22@2x.png
rename to Telegram/Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner22.imageset/BubbleSpinner22@2x.png
diff --git a/Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner22.imageset/Contents.json b/Telegram/Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner22.imageset/Contents.json
similarity index 100%
rename from Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner22.imageset/Contents.json
rename to Telegram/Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner22.imageset/Contents.json
diff --git a/Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner23.imageset/BubbleSpinner23@2x.png b/Telegram/Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner23.imageset/BubbleSpinner23@2x.png
similarity index 100%
rename from Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner23.imageset/BubbleSpinner23@2x.png
rename to Telegram/Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner23.imageset/BubbleSpinner23@2x.png
diff --git a/Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner23.imageset/Contents.json b/Telegram/Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner23.imageset/Contents.json
similarity index 100%
rename from Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner23.imageset/Contents.json
rename to Telegram/Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner23.imageset/Contents.json
diff --git a/Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner24.imageset/BubbleSpinner24@2x.png b/Telegram/Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner24.imageset/BubbleSpinner24@2x.png
similarity index 100%
rename from Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner24.imageset/BubbleSpinner24@2x.png
rename to Telegram/Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner24.imageset/BubbleSpinner24@2x.png
diff --git a/Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner24.imageset/Contents.json b/Telegram/Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner24.imageset/Contents.json
similarity index 100%
rename from Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner24.imageset/Contents.json
rename to Telegram/Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner24.imageset/Contents.json
diff --git a/Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner25.imageset/BubbleSpinner25@2x.png b/Telegram/Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner25.imageset/BubbleSpinner25@2x.png
similarity index 100%
rename from Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner25.imageset/BubbleSpinner25@2x.png
rename to Telegram/Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner25.imageset/BubbleSpinner25@2x.png
diff --git a/Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner25.imageset/Contents.json b/Telegram/Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner25.imageset/Contents.json
similarity index 100%
rename from Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner25.imageset/Contents.json
rename to Telegram/Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner25.imageset/Contents.json
diff --git a/Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner26.imageset/BubbleSpinner26@2x.png b/Telegram/Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner26.imageset/BubbleSpinner26@2x.png
similarity index 100%
rename from Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner26.imageset/BubbleSpinner26@2x.png
rename to Telegram/Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner26.imageset/BubbleSpinner26@2x.png
diff --git a/Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner26.imageset/Contents.json b/Telegram/Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner26.imageset/Contents.json
similarity index 100%
rename from Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner26.imageset/Contents.json
rename to Telegram/Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner26.imageset/Contents.json
diff --git a/Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner27.imageset/BubbleSpinner27@2x.png b/Telegram/Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner27.imageset/BubbleSpinner27@2x.png
similarity index 100%
rename from Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner27.imageset/BubbleSpinner27@2x.png
rename to Telegram/Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner27.imageset/BubbleSpinner27@2x.png
diff --git a/Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner27.imageset/Contents.json b/Telegram/Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner27.imageset/Contents.json
similarity index 100%
rename from Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner27.imageset/Contents.json
rename to Telegram/Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner27.imageset/Contents.json
diff --git a/Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner28.imageset/BubbleSpinner28@2x.png b/Telegram/Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner28.imageset/BubbleSpinner28@2x.png
similarity index 100%
rename from Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner28.imageset/BubbleSpinner28@2x.png
rename to Telegram/Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner28.imageset/BubbleSpinner28@2x.png
diff --git a/Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner28.imageset/Contents.json b/Telegram/Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner28.imageset/Contents.json
similarity index 100%
rename from Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner28.imageset/Contents.json
rename to Telegram/Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner28.imageset/Contents.json
diff --git a/Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner29.imageset/BubbleSpinner29@2x.png b/Telegram/Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner29.imageset/BubbleSpinner29@2x.png
similarity index 100%
rename from Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner29.imageset/BubbleSpinner29@2x.png
rename to Telegram/Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner29.imageset/BubbleSpinner29@2x.png
diff --git a/Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner29.imageset/Contents.json b/Telegram/Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner29.imageset/Contents.json
similarity index 100%
rename from Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner29.imageset/Contents.json
rename to Telegram/Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner29.imageset/Contents.json
diff --git a/Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner3.imageset/BubbleSpinner3@2x.png b/Telegram/Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner3.imageset/BubbleSpinner3@2x.png
similarity index 100%
rename from Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner3.imageset/BubbleSpinner3@2x.png
rename to Telegram/Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner3.imageset/BubbleSpinner3@2x.png
diff --git a/Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner3.imageset/Contents.json b/Telegram/Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner3.imageset/Contents.json
similarity index 100%
rename from Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner3.imageset/Contents.json
rename to Telegram/Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner3.imageset/Contents.json
diff --git a/Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner30.imageset/BubbleSpinner30@2x.png b/Telegram/Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner30.imageset/BubbleSpinner30@2x.png
similarity index 100%
rename from Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner30.imageset/BubbleSpinner30@2x.png
rename to Telegram/Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner30.imageset/BubbleSpinner30@2x.png
diff --git a/Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner30.imageset/Contents.json b/Telegram/Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner30.imageset/Contents.json
similarity index 100%
rename from Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner30.imageset/Contents.json
rename to Telegram/Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner30.imageset/Contents.json
diff --git a/Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner31.imageset/BubbleSpinner31@2x.png b/Telegram/Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner31.imageset/BubbleSpinner31@2x.png
similarity index 100%
rename from Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner31.imageset/BubbleSpinner31@2x.png
rename to Telegram/Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner31.imageset/BubbleSpinner31@2x.png
diff --git a/Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner31.imageset/Contents.json b/Telegram/Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner31.imageset/Contents.json
similarity index 100%
rename from Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner31.imageset/Contents.json
rename to Telegram/Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner31.imageset/Contents.json
diff --git a/Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner32.imageset/BubbleSpinner32@2x.png b/Telegram/Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner32.imageset/BubbleSpinner32@2x.png
similarity index 100%
rename from Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner32.imageset/BubbleSpinner32@2x.png
rename to Telegram/Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner32.imageset/BubbleSpinner32@2x.png
diff --git a/Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner32.imageset/Contents.json b/Telegram/Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner32.imageset/Contents.json
similarity index 100%
rename from Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner32.imageset/Contents.json
rename to Telegram/Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner32.imageset/Contents.json
diff --git a/Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner33.imageset/BubbleSpinner33@2x.png b/Telegram/Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner33.imageset/BubbleSpinner33@2x.png
similarity index 100%
rename from Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner33.imageset/BubbleSpinner33@2x.png
rename to Telegram/Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner33.imageset/BubbleSpinner33@2x.png
diff --git a/Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner33.imageset/Contents.json b/Telegram/Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner33.imageset/Contents.json
similarity index 100%
rename from Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner33.imageset/Contents.json
rename to Telegram/Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner33.imageset/Contents.json
diff --git a/Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner34.imageset/BubbleSpinner34@2x.png b/Telegram/Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner34.imageset/BubbleSpinner34@2x.png
similarity index 100%
rename from Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner34.imageset/BubbleSpinner34@2x.png
rename to Telegram/Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner34.imageset/BubbleSpinner34@2x.png
diff --git a/Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner34.imageset/Contents.json b/Telegram/Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner34.imageset/Contents.json
similarity index 100%
rename from Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner34.imageset/Contents.json
rename to Telegram/Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner34.imageset/Contents.json
diff --git a/Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner35.imageset/BubbleSpinner35@2x.png b/Telegram/Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner35.imageset/BubbleSpinner35@2x.png
similarity index 100%
rename from Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner35.imageset/BubbleSpinner35@2x.png
rename to Telegram/Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner35.imageset/BubbleSpinner35@2x.png
diff --git a/Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner35.imageset/Contents.json b/Telegram/Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner35.imageset/Contents.json
similarity index 100%
rename from Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner35.imageset/Contents.json
rename to Telegram/Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner35.imageset/Contents.json
diff --git a/Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner36.imageset/BubbleSpinner36@2x.png b/Telegram/Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner36.imageset/BubbleSpinner36@2x.png
similarity index 100%
rename from Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner36.imageset/BubbleSpinner36@2x.png
rename to Telegram/Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner36.imageset/BubbleSpinner36@2x.png
diff --git a/Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner36.imageset/Contents.json b/Telegram/Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner36.imageset/Contents.json
similarity index 100%
rename from Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner36.imageset/Contents.json
rename to Telegram/Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner36.imageset/Contents.json
diff --git a/Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner37.imageset/BubbleSpinner37@2x.png b/Telegram/Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner37.imageset/BubbleSpinner37@2x.png
similarity index 100%
rename from Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner37.imageset/BubbleSpinner37@2x.png
rename to Telegram/Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner37.imageset/BubbleSpinner37@2x.png
diff --git a/Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner37.imageset/Contents.json b/Telegram/Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner37.imageset/Contents.json
similarity index 100%
rename from Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner37.imageset/Contents.json
rename to Telegram/Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner37.imageset/Contents.json
diff --git a/Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner38.imageset/BubbleSpinner38@2x.png b/Telegram/Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner38.imageset/BubbleSpinner38@2x.png
similarity index 100%
rename from Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner38.imageset/BubbleSpinner38@2x.png
rename to Telegram/Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner38.imageset/BubbleSpinner38@2x.png
diff --git a/Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner38.imageset/Contents.json b/Telegram/Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner38.imageset/Contents.json
similarity index 100%
rename from Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner38.imageset/Contents.json
rename to Telegram/Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner38.imageset/Contents.json
diff --git a/Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner4.imageset/BubbleSpinner4@2x.png b/Telegram/Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner4.imageset/BubbleSpinner4@2x.png
similarity index 100%
rename from Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner4.imageset/BubbleSpinner4@2x.png
rename to Telegram/Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner4.imageset/BubbleSpinner4@2x.png
diff --git a/Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner4.imageset/Contents.json b/Telegram/Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner4.imageset/Contents.json
similarity index 100%
rename from Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner4.imageset/Contents.json
rename to Telegram/Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner4.imageset/Contents.json
diff --git a/Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner5.imageset/BubbleSpinner5@2x.png b/Telegram/Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner5.imageset/BubbleSpinner5@2x.png
similarity index 100%
rename from Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner5.imageset/BubbleSpinner5@2x.png
rename to Telegram/Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner5.imageset/BubbleSpinner5@2x.png
diff --git a/Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner5.imageset/Contents.json b/Telegram/Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner5.imageset/Contents.json
similarity index 100%
rename from Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner5.imageset/Contents.json
rename to Telegram/Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner5.imageset/Contents.json
diff --git a/Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner6.imageset/BubbleSpinner6@2x.png b/Telegram/Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner6.imageset/BubbleSpinner6@2x.png
similarity index 100%
rename from Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner6.imageset/BubbleSpinner6@2x.png
rename to Telegram/Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner6.imageset/BubbleSpinner6@2x.png
diff --git a/Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner6.imageset/Contents.json b/Telegram/Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner6.imageset/Contents.json
similarity index 100%
rename from Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner6.imageset/Contents.json
rename to Telegram/Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner6.imageset/Contents.json
diff --git a/Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner7.imageset/BubbleSpinner7@2x.png b/Telegram/Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner7.imageset/BubbleSpinner7@2x.png
similarity index 100%
rename from Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner7.imageset/BubbleSpinner7@2x.png
rename to Telegram/Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner7.imageset/BubbleSpinner7@2x.png
diff --git a/Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner7.imageset/Contents.json b/Telegram/Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner7.imageset/Contents.json
similarity index 100%
rename from Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner7.imageset/Contents.json
rename to Telegram/Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner7.imageset/Contents.json
diff --git a/Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner8.imageset/BubbleSpinner8@2x.png b/Telegram/Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner8.imageset/BubbleSpinner8@2x.png
similarity index 100%
rename from Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner8.imageset/BubbleSpinner8@2x.png
rename to Telegram/Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner8.imageset/BubbleSpinner8@2x.png
diff --git a/Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner8.imageset/Contents.json b/Telegram/Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner8.imageset/Contents.json
similarity index 100%
rename from Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner8.imageset/Contents.json
rename to Telegram/Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner8.imageset/Contents.json
diff --git a/Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner9.imageset/BubbleSpinner9@2x.png b/Telegram/Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner9.imageset/BubbleSpinner9@2x.png
similarity index 100%
rename from Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner9.imageset/BubbleSpinner9@2x.png
rename to Telegram/Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner9.imageset/BubbleSpinner9@2x.png
diff --git a/Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner9.imageset/Contents.json b/Telegram/Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner9.imageset/Contents.json
similarity index 100%
rename from Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner9.imageset/Contents.json
rename to Telegram/Watch/App/Assets.xcassets/BubbleSpinner/BubbleSpinner9.imageset/Contents.json
diff --git a/Watch/App/Assets.xcassets/BubbleSpinnerIncoming/Contents.json b/Telegram/Watch/App/Assets.xcassets/BubbleSpinner/Contents.json
similarity index 100%
rename from Watch/App/Assets.xcassets/BubbleSpinnerIncoming/Contents.json
rename to Telegram/Watch/App/Assets.xcassets/BubbleSpinner/Contents.json
diff --git a/Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming0.imageset/BubbleSpinnerIncoming0@2x.png b/Telegram/Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming0.imageset/BubbleSpinnerIncoming0@2x.png
similarity index 100%
rename from Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming0.imageset/BubbleSpinnerIncoming0@2x.png
rename to Telegram/Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming0.imageset/BubbleSpinnerIncoming0@2x.png
diff --git a/Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming0.imageset/Contents.json b/Telegram/Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming0.imageset/Contents.json
similarity index 100%
rename from Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming0.imageset/Contents.json
rename to Telegram/Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming0.imageset/Contents.json
diff --git a/Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming1.imageset/BubbleSpinnerIncoming1@2x.png b/Telegram/Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming1.imageset/BubbleSpinnerIncoming1@2x.png
similarity index 100%
rename from Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming1.imageset/BubbleSpinnerIncoming1@2x.png
rename to Telegram/Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming1.imageset/BubbleSpinnerIncoming1@2x.png
diff --git a/Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming1.imageset/Contents.json b/Telegram/Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming1.imageset/Contents.json
similarity index 100%
rename from Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming1.imageset/Contents.json
rename to Telegram/Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming1.imageset/Contents.json
diff --git a/Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming10.imageset/BubbleSpinnerIncoming10@2x.png b/Telegram/Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming10.imageset/BubbleSpinnerIncoming10@2x.png
similarity index 100%
rename from Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming10.imageset/BubbleSpinnerIncoming10@2x.png
rename to Telegram/Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming10.imageset/BubbleSpinnerIncoming10@2x.png
diff --git a/Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming10.imageset/Contents.json b/Telegram/Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming10.imageset/Contents.json
similarity index 100%
rename from Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming10.imageset/Contents.json
rename to Telegram/Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming10.imageset/Contents.json
diff --git a/Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming11.imageset/BubbleSpinnerIncoming11@2x.png b/Telegram/Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming11.imageset/BubbleSpinnerIncoming11@2x.png
similarity index 100%
rename from Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming11.imageset/BubbleSpinnerIncoming11@2x.png
rename to Telegram/Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming11.imageset/BubbleSpinnerIncoming11@2x.png
diff --git a/Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming11.imageset/Contents.json b/Telegram/Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming11.imageset/Contents.json
similarity index 100%
rename from Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming11.imageset/Contents.json
rename to Telegram/Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming11.imageset/Contents.json
diff --git a/Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming12.imageset/BubbleSpinnerIncoming12@2x.png b/Telegram/Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming12.imageset/BubbleSpinnerIncoming12@2x.png
similarity index 100%
rename from Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming12.imageset/BubbleSpinnerIncoming12@2x.png
rename to Telegram/Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming12.imageset/BubbleSpinnerIncoming12@2x.png
diff --git a/Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming12.imageset/Contents.json b/Telegram/Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming12.imageset/Contents.json
similarity index 100%
rename from Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming12.imageset/Contents.json
rename to Telegram/Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming12.imageset/Contents.json
diff --git a/Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming13.imageset/BubbleSpinnerIncoming13@2x.png b/Telegram/Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming13.imageset/BubbleSpinnerIncoming13@2x.png
similarity index 100%
rename from Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming13.imageset/BubbleSpinnerIncoming13@2x.png
rename to Telegram/Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming13.imageset/BubbleSpinnerIncoming13@2x.png
diff --git a/Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming13.imageset/Contents.json b/Telegram/Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming13.imageset/Contents.json
similarity index 100%
rename from Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming13.imageset/Contents.json
rename to Telegram/Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming13.imageset/Contents.json
diff --git a/Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming14.imageset/BubbleSpinnerIncoming14@2x.png b/Telegram/Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming14.imageset/BubbleSpinnerIncoming14@2x.png
similarity index 100%
rename from Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming14.imageset/BubbleSpinnerIncoming14@2x.png
rename to Telegram/Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming14.imageset/BubbleSpinnerIncoming14@2x.png
diff --git a/Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming14.imageset/Contents.json b/Telegram/Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming14.imageset/Contents.json
similarity index 100%
rename from Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming14.imageset/Contents.json
rename to Telegram/Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming14.imageset/Contents.json
diff --git a/Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming15.imageset/BubbleSpinnerIncoming15@2x.png b/Telegram/Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming15.imageset/BubbleSpinnerIncoming15@2x.png
similarity index 100%
rename from Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming15.imageset/BubbleSpinnerIncoming15@2x.png
rename to Telegram/Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming15.imageset/BubbleSpinnerIncoming15@2x.png
diff --git a/Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming15.imageset/Contents.json b/Telegram/Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming15.imageset/Contents.json
similarity index 100%
rename from Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming15.imageset/Contents.json
rename to Telegram/Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming15.imageset/Contents.json
diff --git a/Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming16.imageset/BubbleSpinnerIncoming16@2x.png b/Telegram/Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming16.imageset/BubbleSpinnerIncoming16@2x.png
similarity index 100%
rename from Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming16.imageset/BubbleSpinnerIncoming16@2x.png
rename to Telegram/Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming16.imageset/BubbleSpinnerIncoming16@2x.png
diff --git a/Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming16.imageset/Contents.json b/Telegram/Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming16.imageset/Contents.json
similarity index 100%
rename from Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming16.imageset/Contents.json
rename to Telegram/Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming16.imageset/Contents.json
diff --git a/Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming17.imageset/BubbleSpinnerIncoming17@2x.png b/Telegram/Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming17.imageset/BubbleSpinnerIncoming17@2x.png
similarity index 100%
rename from Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming17.imageset/BubbleSpinnerIncoming17@2x.png
rename to Telegram/Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming17.imageset/BubbleSpinnerIncoming17@2x.png
diff --git a/Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming17.imageset/Contents.json b/Telegram/Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming17.imageset/Contents.json
similarity index 100%
rename from Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming17.imageset/Contents.json
rename to Telegram/Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming17.imageset/Contents.json
diff --git a/Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming18.imageset/BubbleSpinnerIncoming18@2x.png b/Telegram/Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming18.imageset/BubbleSpinnerIncoming18@2x.png
similarity index 100%
rename from Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming18.imageset/BubbleSpinnerIncoming18@2x.png
rename to Telegram/Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming18.imageset/BubbleSpinnerIncoming18@2x.png
diff --git a/Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming18.imageset/Contents.json b/Telegram/Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming18.imageset/Contents.json
similarity index 100%
rename from Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming18.imageset/Contents.json
rename to Telegram/Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming18.imageset/Contents.json
diff --git a/Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming19.imageset/BubbleSpinnerIncoming19@2x.png b/Telegram/Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming19.imageset/BubbleSpinnerIncoming19@2x.png
similarity index 100%
rename from Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming19.imageset/BubbleSpinnerIncoming19@2x.png
rename to Telegram/Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming19.imageset/BubbleSpinnerIncoming19@2x.png
diff --git a/Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming19.imageset/Contents.json b/Telegram/Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming19.imageset/Contents.json
similarity index 100%
rename from Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming19.imageset/Contents.json
rename to Telegram/Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming19.imageset/Contents.json
diff --git a/Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming2.imageset/BubbleSpinnerIncoming2@2x.png b/Telegram/Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming2.imageset/BubbleSpinnerIncoming2@2x.png
similarity index 100%
rename from Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming2.imageset/BubbleSpinnerIncoming2@2x.png
rename to Telegram/Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming2.imageset/BubbleSpinnerIncoming2@2x.png
diff --git a/Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming2.imageset/Contents.json b/Telegram/Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming2.imageset/Contents.json
similarity index 100%
rename from Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming2.imageset/Contents.json
rename to Telegram/Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming2.imageset/Contents.json
diff --git a/Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming20.imageset/BubbleSpinnerIncoming20@2x.png b/Telegram/Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming20.imageset/BubbleSpinnerIncoming20@2x.png
similarity index 100%
rename from Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming20.imageset/BubbleSpinnerIncoming20@2x.png
rename to Telegram/Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming20.imageset/BubbleSpinnerIncoming20@2x.png
diff --git a/Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming20.imageset/Contents.json b/Telegram/Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming20.imageset/Contents.json
similarity index 100%
rename from Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming20.imageset/Contents.json
rename to Telegram/Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming20.imageset/Contents.json
diff --git a/Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming21.imageset/BubbleSpinnerIncoming21@2x.png b/Telegram/Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming21.imageset/BubbleSpinnerIncoming21@2x.png
similarity index 100%
rename from Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming21.imageset/BubbleSpinnerIncoming21@2x.png
rename to Telegram/Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming21.imageset/BubbleSpinnerIncoming21@2x.png
diff --git a/Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming21.imageset/Contents.json b/Telegram/Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming21.imageset/Contents.json
similarity index 100%
rename from Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming21.imageset/Contents.json
rename to Telegram/Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming21.imageset/Contents.json
diff --git a/Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming22.imageset/BubbleSpinnerIncoming22@2x.png b/Telegram/Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming22.imageset/BubbleSpinnerIncoming22@2x.png
similarity index 100%
rename from Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming22.imageset/BubbleSpinnerIncoming22@2x.png
rename to Telegram/Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming22.imageset/BubbleSpinnerIncoming22@2x.png
diff --git a/Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming22.imageset/Contents.json b/Telegram/Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming22.imageset/Contents.json
similarity index 100%
rename from Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming22.imageset/Contents.json
rename to Telegram/Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming22.imageset/Contents.json
diff --git a/Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming23.imageset/BubbleSpinnerIncoming23@2x.png b/Telegram/Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming23.imageset/BubbleSpinnerIncoming23@2x.png
similarity index 100%
rename from Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming23.imageset/BubbleSpinnerIncoming23@2x.png
rename to Telegram/Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming23.imageset/BubbleSpinnerIncoming23@2x.png
diff --git a/Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming23.imageset/Contents.json b/Telegram/Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming23.imageset/Contents.json
similarity index 100%
rename from Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming23.imageset/Contents.json
rename to Telegram/Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming23.imageset/Contents.json
diff --git a/Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming24.imageset/BubbleSpinnerIncoming24@2x.png b/Telegram/Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming24.imageset/BubbleSpinnerIncoming24@2x.png
similarity index 100%
rename from Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming24.imageset/BubbleSpinnerIncoming24@2x.png
rename to Telegram/Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming24.imageset/BubbleSpinnerIncoming24@2x.png
diff --git a/Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming24.imageset/Contents.json b/Telegram/Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming24.imageset/Contents.json
similarity index 100%
rename from Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming24.imageset/Contents.json
rename to Telegram/Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming24.imageset/Contents.json
diff --git a/Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming25.imageset/BubbleSpinnerIncoming25@2x.png b/Telegram/Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming25.imageset/BubbleSpinnerIncoming25@2x.png
similarity index 100%
rename from Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming25.imageset/BubbleSpinnerIncoming25@2x.png
rename to Telegram/Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming25.imageset/BubbleSpinnerIncoming25@2x.png
diff --git a/Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming25.imageset/Contents.json b/Telegram/Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming25.imageset/Contents.json
similarity index 100%
rename from Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming25.imageset/Contents.json
rename to Telegram/Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming25.imageset/Contents.json
diff --git a/Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming26.imageset/BubbleSpinnerIncoming26@2x.png b/Telegram/Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming26.imageset/BubbleSpinnerIncoming26@2x.png
similarity index 100%
rename from Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming26.imageset/BubbleSpinnerIncoming26@2x.png
rename to Telegram/Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming26.imageset/BubbleSpinnerIncoming26@2x.png
diff --git a/Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming26.imageset/Contents.json b/Telegram/Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming26.imageset/Contents.json
similarity index 100%
rename from Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming26.imageset/Contents.json
rename to Telegram/Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming26.imageset/Contents.json
diff --git a/Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming27.imageset/BubbleSpinnerIncoming27@2x.png b/Telegram/Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming27.imageset/BubbleSpinnerIncoming27@2x.png
similarity index 100%
rename from Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming27.imageset/BubbleSpinnerIncoming27@2x.png
rename to Telegram/Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming27.imageset/BubbleSpinnerIncoming27@2x.png
diff --git a/Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming27.imageset/Contents.json b/Telegram/Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming27.imageset/Contents.json
similarity index 100%
rename from Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming27.imageset/Contents.json
rename to Telegram/Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming27.imageset/Contents.json
diff --git a/Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming28.imageset/BubbleSpinnerIncoming28@2x.png b/Telegram/Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming28.imageset/BubbleSpinnerIncoming28@2x.png
similarity index 100%
rename from Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming28.imageset/BubbleSpinnerIncoming28@2x.png
rename to Telegram/Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming28.imageset/BubbleSpinnerIncoming28@2x.png
diff --git a/Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming28.imageset/Contents.json b/Telegram/Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming28.imageset/Contents.json
similarity index 100%
rename from Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming28.imageset/Contents.json
rename to Telegram/Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming28.imageset/Contents.json
diff --git a/Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming29.imageset/BubbleSpinnerIncoming29@2x.png b/Telegram/Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming29.imageset/BubbleSpinnerIncoming29@2x.png
similarity index 100%
rename from Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming29.imageset/BubbleSpinnerIncoming29@2x.png
rename to Telegram/Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming29.imageset/BubbleSpinnerIncoming29@2x.png
diff --git a/Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming29.imageset/Contents.json b/Telegram/Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming29.imageset/Contents.json
similarity index 100%
rename from Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming29.imageset/Contents.json
rename to Telegram/Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming29.imageset/Contents.json
diff --git a/Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming3.imageset/BubbleSpinnerIncoming3@2x.png b/Telegram/Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming3.imageset/BubbleSpinnerIncoming3@2x.png
similarity index 100%
rename from Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming3.imageset/BubbleSpinnerIncoming3@2x.png
rename to Telegram/Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming3.imageset/BubbleSpinnerIncoming3@2x.png
diff --git a/Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming3.imageset/Contents.json b/Telegram/Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming3.imageset/Contents.json
similarity index 100%
rename from Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming3.imageset/Contents.json
rename to Telegram/Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming3.imageset/Contents.json
diff --git a/Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming30.imageset/BubbleSpinnerIncoming30@2x.png b/Telegram/Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming30.imageset/BubbleSpinnerIncoming30@2x.png
similarity index 100%
rename from Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming30.imageset/BubbleSpinnerIncoming30@2x.png
rename to Telegram/Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming30.imageset/BubbleSpinnerIncoming30@2x.png
diff --git a/Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming30.imageset/Contents.json b/Telegram/Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming30.imageset/Contents.json
similarity index 100%
rename from Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming30.imageset/Contents.json
rename to Telegram/Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming30.imageset/Contents.json
diff --git a/Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming31.imageset/BubbleSpinnerIncoming31@2x.png b/Telegram/Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming31.imageset/BubbleSpinnerIncoming31@2x.png
similarity index 100%
rename from Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming31.imageset/BubbleSpinnerIncoming31@2x.png
rename to Telegram/Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming31.imageset/BubbleSpinnerIncoming31@2x.png
diff --git a/Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming31.imageset/Contents.json b/Telegram/Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming31.imageset/Contents.json
similarity index 100%
rename from Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming31.imageset/Contents.json
rename to Telegram/Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming31.imageset/Contents.json
diff --git a/Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming32.imageset/BubbleSpinnerIncoming32@2x.png b/Telegram/Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming32.imageset/BubbleSpinnerIncoming32@2x.png
similarity index 100%
rename from Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming32.imageset/BubbleSpinnerIncoming32@2x.png
rename to Telegram/Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming32.imageset/BubbleSpinnerIncoming32@2x.png
diff --git a/Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming32.imageset/Contents.json b/Telegram/Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming32.imageset/Contents.json
similarity index 100%
rename from Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming32.imageset/Contents.json
rename to Telegram/Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming32.imageset/Contents.json
diff --git a/Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming33.imageset/BubbleSpinnerIncoming33@2x.png b/Telegram/Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming33.imageset/BubbleSpinnerIncoming33@2x.png
similarity index 100%
rename from Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming33.imageset/BubbleSpinnerIncoming33@2x.png
rename to Telegram/Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming33.imageset/BubbleSpinnerIncoming33@2x.png
diff --git a/Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming33.imageset/Contents.json b/Telegram/Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming33.imageset/Contents.json
similarity index 100%
rename from Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming33.imageset/Contents.json
rename to Telegram/Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming33.imageset/Contents.json
diff --git a/Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming34.imageset/BubbleSpinnerIncoming34@2x.png b/Telegram/Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming34.imageset/BubbleSpinnerIncoming34@2x.png
similarity index 100%
rename from Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming34.imageset/BubbleSpinnerIncoming34@2x.png
rename to Telegram/Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming34.imageset/BubbleSpinnerIncoming34@2x.png
diff --git a/Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming34.imageset/Contents.json b/Telegram/Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming34.imageset/Contents.json
similarity index 100%
rename from Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming34.imageset/Contents.json
rename to Telegram/Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming34.imageset/Contents.json
diff --git a/Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming35.imageset/BubbleSpinnerIncoming35@2x.png b/Telegram/Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming35.imageset/BubbleSpinnerIncoming35@2x.png
similarity index 100%
rename from Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming35.imageset/BubbleSpinnerIncoming35@2x.png
rename to Telegram/Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming35.imageset/BubbleSpinnerIncoming35@2x.png
diff --git a/Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming35.imageset/Contents.json b/Telegram/Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming35.imageset/Contents.json
similarity index 100%
rename from Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming35.imageset/Contents.json
rename to Telegram/Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming35.imageset/Contents.json
diff --git a/Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming36.imageset/BubbleSpinnerIncoming36@2x.png b/Telegram/Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming36.imageset/BubbleSpinnerIncoming36@2x.png
similarity index 100%
rename from Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming36.imageset/BubbleSpinnerIncoming36@2x.png
rename to Telegram/Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming36.imageset/BubbleSpinnerIncoming36@2x.png
diff --git a/Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming36.imageset/Contents.json b/Telegram/Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming36.imageset/Contents.json
similarity index 100%
rename from Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming36.imageset/Contents.json
rename to Telegram/Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming36.imageset/Contents.json
diff --git a/Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming37.imageset/BubbleSpinnerIncoming37@2x.png b/Telegram/Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming37.imageset/BubbleSpinnerIncoming37@2x.png
similarity index 100%
rename from Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming37.imageset/BubbleSpinnerIncoming37@2x.png
rename to Telegram/Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming37.imageset/BubbleSpinnerIncoming37@2x.png
diff --git a/Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming37.imageset/Contents.json b/Telegram/Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming37.imageset/Contents.json
similarity index 100%
rename from Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming37.imageset/Contents.json
rename to Telegram/Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming37.imageset/Contents.json
diff --git a/Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming38.imageset/BubbleSpinnerIncoming38@2x.png b/Telegram/Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming38.imageset/BubbleSpinnerIncoming38@2x.png
similarity index 100%
rename from Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming38.imageset/BubbleSpinnerIncoming38@2x.png
rename to Telegram/Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming38.imageset/BubbleSpinnerIncoming38@2x.png
diff --git a/Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming38.imageset/Contents.json b/Telegram/Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming38.imageset/Contents.json
similarity index 100%
rename from Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming38.imageset/Contents.json
rename to Telegram/Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming38.imageset/Contents.json
diff --git a/Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming4.imageset/BubbleSpinnerIncoming4@2x.png b/Telegram/Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming4.imageset/BubbleSpinnerIncoming4@2x.png
similarity index 100%
rename from Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming4.imageset/BubbleSpinnerIncoming4@2x.png
rename to Telegram/Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming4.imageset/BubbleSpinnerIncoming4@2x.png
diff --git a/Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming4.imageset/Contents.json b/Telegram/Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming4.imageset/Contents.json
similarity index 100%
rename from Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming4.imageset/Contents.json
rename to Telegram/Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming4.imageset/Contents.json
diff --git a/Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming5.imageset/BubbleSpinnerIncoming5@2x.png b/Telegram/Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming5.imageset/BubbleSpinnerIncoming5@2x.png
similarity index 100%
rename from Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming5.imageset/BubbleSpinnerIncoming5@2x.png
rename to Telegram/Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming5.imageset/BubbleSpinnerIncoming5@2x.png
diff --git a/Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming5.imageset/Contents.json b/Telegram/Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming5.imageset/Contents.json
similarity index 100%
rename from Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming5.imageset/Contents.json
rename to Telegram/Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming5.imageset/Contents.json
diff --git a/Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming6.imageset/BubbleSpinnerIncoming6@2x.png b/Telegram/Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming6.imageset/BubbleSpinnerIncoming6@2x.png
similarity index 100%
rename from Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming6.imageset/BubbleSpinnerIncoming6@2x.png
rename to Telegram/Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming6.imageset/BubbleSpinnerIncoming6@2x.png
diff --git a/Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming6.imageset/Contents.json b/Telegram/Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming6.imageset/Contents.json
similarity index 100%
rename from Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming6.imageset/Contents.json
rename to Telegram/Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming6.imageset/Contents.json
diff --git a/Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming7.imageset/BubbleSpinnerIncoming7@2x.png b/Telegram/Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming7.imageset/BubbleSpinnerIncoming7@2x.png
similarity index 100%
rename from Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming7.imageset/BubbleSpinnerIncoming7@2x.png
rename to Telegram/Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming7.imageset/BubbleSpinnerIncoming7@2x.png
diff --git a/Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming7.imageset/Contents.json b/Telegram/Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming7.imageset/Contents.json
similarity index 100%
rename from Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming7.imageset/Contents.json
rename to Telegram/Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming7.imageset/Contents.json
diff --git a/Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming8.imageset/BubbleSpinnerIncoming8@2x.png b/Telegram/Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming8.imageset/BubbleSpinnerIncoming8@2x.png
similarity index 100%
rename from Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming8.imageset/BubbleSpinnerIncoming8@2x.png
rename to Telegram/Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming8.imageset/BubbleSpinnerIncoming8@2x.png
diff --git a/Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming8.imageset/Contents.json b/Telegram/Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming8.imageset/Contents.json
similarity index 100%
rename from Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming8.imageset/Contents.json
rename to Telegram/Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming8.imageset/Contents.json
diff --git a/Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming9.imageset/BubbleSpinnerIncoming9@2x.png b/Telegram/Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming9.imageset/BubbleSpinnerIncoming9@2x.png
similarity index 100%
rename from Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming9.imageset/BubbleSpinnerIncoming9@2x.png
rename to Telegram/Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming9.imageset/BubbleSpinnerIncoming9@2x.png
diff --git a/Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming9.imageset/Contents.json b/Telegram/Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming9.imageset/Contents.json
similarity index 100%
rename from Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming9.imageset/Contents.json
rename to Telegram/Watch/App/Assets.xcassets/BubbleSpinnerIncoming/BubbleSpinnerIncoming9.imageset/Contents.json
diff --git a/Watch/App/Assets.xcassets/Contents.json b/Telegram/Watch/App/Assets.xcassets/BubbleSpinnerIncoming/Contents.json
similarity index 100%
rename from Watch/App/Assets.xcassets/Contents.json
rename to Telegram/Watch/App/Assets.xcassets/BubbleSpinnerIncoming/Contents.json
diff --git a/Watch/App/Assets.xcassets/ChatBubbleChannel.imageset/BubbleChannel@2x.png b/Telegram/Watch/App/Assets.xcassets/ChatBubbleChannel.imageset/BubbleChannel@2x.png
similarity index 100%
rename from Watch/App/Assets.xcassets/ChatBubbleChannel.imageset/BubbleChannel@2x.png
rename to Telegram/Watch/App/Assets.xcassets/ChatBubbleChannel.imageset/BubbleChannel@2x.png
diff --git a/Watch/App/Assets.xcassets/ChatBubbleChannel.imageset/Contents.json b/Telegram/Watch/App/Assets.xcassets/ChatBubbleChannel.imageset/Contents.json
similarity index 100%
rename from Watch/App/Assets.xcassets/ChatBubbleChannel.imageset/Contents.json
rename to Telegram/Watch/App/Assets.xcassets/ChatBubbleChannel.imageset/Contents.json
diff --git a/Watch/App/Assets.xcassets/ChatBubbleIncoming.imageset/BubbleIncoming@2x.png b/Telegram/Watch/App/Assets.xcassets/ChatBubbleIncoming.imageset/BubbleIncoming@2x.png
similarity index 100%
rename from Watch/App/Assets.xcassets/ChatBubbleIncoming.imageset/BubbleIncoming@2x.png
rename to Telegram/Watch/App/Assets.xcassets/ChatBubbleIncoming.imageset/BubbleIncoming@2x.png
diff --git a/Watch/App/Assets.xcassets/ChatBubbleIncoming.imageset/Contents.json b/Telegram/Watch/App/Assets.xcassets/ChatBubbleIncoming.imageset/Contents.json
similarity index 100%
rename from Watch/App/Assets.xcassets/ChatBubbleIncoming.imageset/Contents.json
rename to Telegram/Watch/App/Assets.xcassets/ChatBubbleIncoming.imageset/Contents.json
diff --git a/Watch/App/Assets.xcassets/ChatBubbleOutgoing.imageset/BubbleOutgoing@2x.png b/Telegram/Watch/App/Assets.xcassets/ChatBubbleOutgoing.imageset/BubbleOutgoing@2x.png
similarity index 100%
rename from Watch/App/Assets.xcassets/ChatBubbleOutgoing.imageset/BubbleOutgoing@2x.png
rename to Telegram/Watch/App/Assets.xcassets/ChatBubbleOutgoing.imageset/BubbleOutgoing@2x.png
diff --git a/Watch/App/Assets.xcassets/ChatBubbleOutgoing.imageset/Contents.json b/Telegram/Watch/App/Assets.xcassets/ChatBubbleOutgoing.imageset/Contents.json
similarity index 100%
rename from Watch/App/Assets.xcassets/ChatBubbleOutgoing.imageset/Contents.json
rename to Telegram/Watch/App/Assets.xcassets/ChatBubbleOutgoing.imageset/Contents.json
diff --git a/Watch/App/Assets.xcassets/Complication.complicationset/Circular.imageset/Contents.json b/Telegram/Watch/App/Assets.xcassets/Complication.complicationset/Circular.imageset/Contents.json
similarity index 100%
rename from Watch/App/Assets.xcassets/Complication.complicationset/Circular.imageset/Contents.json
rename to Telegram/Watch/App/Assets.xcassets/Complication.complicationset/Circular.imageset/Contents.json
diff --git a/Watch/App/Assets.xcassets/Complication.complicationset/Contents.json b/Telegram/Watch/App/Assets.xcassets/Complication.complicationset/Contents.json
similarity index 100%
rename from Watch/App/Assets.xcassets/Complication.complicationset/Contents.json
rename to Telegram/Watch/App/Assets.xcassets/Complication.complicationset/Contents.json
diff --git a/Watch/App/Assets.xcassets/Complication.complicationset/Extra Large.imageset/Contents.json b/Telegram/Watch/App/Assets.xcassets/Complication.complicationset/Extra Large.imageset/Contents.json
similarity index 100%
rename from Watch/App/Assets.xcassets/Complication.complicationset/Extra Large.imageset/Contents.json
rename to Telegram/Watch/App/Assets.xcassets/Complication.complicationset/Extra Large.imageset/Contents.json
diff --git a/Watch/App/Assets.xcassets/Complication.complicationset/Graphic Bezel.imageset/Contents.json b/Telegram/Watch/App/Assets.xcassets/Complication.complicationset/Graphic Bezel.imageset/Contents.json
similarity index 100%
rename from Watch/App/Assets.xcassets/Complication.complicationset/Graphic Bezel.imageset/Contents.json
rename to Telegram/Watch/App/Assets.xcassets/Complication.complicationset/Graphic Bezel.imageset/Contents.json
diff --git a/Watch/App/Assets.xcassets/Complication.complicationset/Graphic Circular.imageset/Contents.json b/Telegram/Watch/App/Assets.xcassets/Complication.complicationset/Graphic Circular.imageset/Contents.json
similarity index 100%
rename from Watch/App/Assets.xcassets/Complication.complicationset/Graphic Circular.imageset/Contents.json
rename to Telegram/Watch/App/Assets.xcassets/Complication.complicationset/Graphic Circular.imageset/Contents.json
diff --git a/Watch/App/Assets.xcassets/Complication.complicationset/Graphic Corner.imageset/Contents.json b/Telegram/Watch/App/Assets.xcassets/Complication.complicationset/Graphic Corner.imageset/Contents.json
similarity index 100%
rename from Watch/App/Assets.xcassets/Complication.complicationset/Graphic Corner.imageset/Contents.json
rename to Telegram/Watch/App/Assets.xcassets/Complication.complicationset/Graphic Corner.imageset/Contents.json
diff --git a/Watch/App/Assets.xcassets/Complication.complicationset/Graphic Large Rectangular.imageset/Contents.json b/Telegram/Watch/App/Assets.xcassets/Complication.complicationset/Graphic Large Rectangular.imageset/Contents.json
similarity index 100%
rename from Watch/App/Assets.xcassets/Complication.complicationset/Graphic Large Rectangular.imageset/Contents.json
rename to Telegram/Watch/App/Assets.xcassets/Complication.complicationset/Graphic Large Rectangular.imageset/Contents.json
diff --git a/Watch/App/Assets.xcassets/Complication.complicationset/Modular.imageset/Contents.json b/Telegram/Watch/App/Assets.xcassets/Complication.complicationset/Modular.imageset/Contents.json
similarity index 100%
rename from Watch/App/Assets.xcassets/Complication.complicationset/Modular.imageset/Contents.json
rename to Telegram/Watch/App/Assets.xcassets/Complication.complicationset/Modular.imageset/Contents.json
diff --git a/Watch/App/Assets.xcassets/Complication.complicationset/Utilitarian.imageset/Contents.json b/Telegram/Watch/App/Assets.xcassets/Complication.complicationset/Utilitarian.imageset/Contents.json
similarity index 100%
rename from Watch/App/Assets.xcassets/Complication.complicationset/Utilitarian.imageset/Contents.json
rename to Telegram/Watch/App/Assets.xcassets/Complication.complicationset/Utilitarian.imageset/Contents.json
diff --git a/Watch/App/Assets.xcassets/Compose.imageset/Compose@2x.png b/Telegram/Watch/App/Assets.xcassets/Compose.imageset/Compose@2x.png
similarity index 100%
rename from Watch/App/Assets.xcassets/Compose.imageset/Compose@2x.png
rename to Telegram/Watch/App/Assets.xcassets/Compose.imageset/Compose@2x.png
diff --git a/Watch/App/Assets.xcassets/Compose.imageset/Contents.json b/Telegram/Watch/App/Assets.xcassets/Compose.imageset/Contents.json
similarity index 100%
rename from Watch/App/Assets.xcassets/Compose.imageset/Contents.json
rename to Telegram/Watch/App/Assets.xcassets/Compose.imageset/Contents.json
diff --git a/Telegram/Watch/App/Assets.xcassets/Contents.json b/Telegram/Watch/App/Assets.xcassets/Contents.json
new file mode 100644
index 0000000000..da4a164c91
--- /dev/null
+++ b/Telegram/Watch/App/Assets.xcassets/Contents.json
@@ -0,0 +1,6 @@
+{
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
\ No newline at end of file
diff --git a/Watch/App/Assets.xcassets/File.imageset/Contents.json b/Telegram/Watch/App/Assets.xcassets/File.imageset/Contents.json
similarity index 100%
rename from Watch/App/Assets.xcassets/File.imageset/Contents.json
rename to Telegram/Watch/App/Assets.xcassets/File.imageset/Contents.json
diff --git a/Watch/App/Assets.xcassets/File.imageset/File@2x.png b/Telegram/Watch/App/Assets.xcassets/File.imageset/File@2x.png
similarity index 100%
rename from Watch/App/Assets.xcassets/File.imageset/File@2x.png
rename to Telegram/Watch/App/Assets.xcassets/File.imageset/File@2x.png
diff --git a/Watch/App/Assets.xcassets/LocationIcon.imageset/Contents.json b/Telegram/Watch/App/Assets.xcassets/LocationIcon.imageset/Contents.json
similarity index 100%
rename from Watch/App/Assets.xcassets/LocationIcon.imageset/Contents.json
rename to Telegram/Watch/App/Assets.xcassets/LocationIcon.imageset/Contents.json
diff --git a/Watch/App/Assets.xcassets/LocationIcon.imageset/LocationIcon@2x.png b/Telegram/Watch/App/Assets.xcassets/LocationIcon.imageset/LocationIcon@2x.png
similarity index 100%
rename from Watch/App/Assets.xcassets/LocationIcon.imageset/LocationIcon@2x.png
rename to Telegram/Watch/App/Assets.xcassets/LocationIcon.imageset/LocationIcon@2x.png
diff --git a/Watch/App/Assets.xcassets/LoginIcon.imageset/Contents.json b/Telegram/Watch/App/Assets.xcassets/LoginIcon.imageset/Contents.json
similarity index 100%
rename from Watch/App/Assets.xcassets/LoginIcon.imageset/Contents.json
rename to Telegram/Watch/App/Assets.xcassets/LoginIcon.imageset/Contents.json
diff --git a/Watch/App/Assets.xcassets/LoginIcon.imageset/LoginIcon@2x.png b/Telegram/Watch/App/Assets.xcassets/LoginIcon.imageset/LoginIcon@2x.png
similarity index 100%
rename from Watch/App/Assets.xcassets/LoginIcon.imageset/LoginIcon@2x.png
rename to Telegram/Watch/App/Assets.xcassets/LoginIcon.imageset/LoginIcon@2x.png
diff --git a/Watch/App/Assets.xcassets/MediaAudio.imageset/Contents.json b/Telegram/Watch/App/Assets.xcassets/MediaAudio.imageset/Contents.json
similarity index 100%
rename from Watch/App/Assets.xcassets/MediaAudio.imageset/Contents.json
rename to Telegram/Watch/App/Assets.xcassets/MediaAudio.imageset/Contents.json
diff --git a/Watch/App/Assets.xcassets/MediaAudio.imageset/MediaAudio@2x.png b/Telegram/Watch/App/Assets.xcassets/MediaAudio.imageset/MediaAudio@2x.png
similarity index 100%
rename from Watch/App/Assets.xcassets/MediaAudio.imageset/MediaAudio@2x.png
rename to Telegram/Watch/App/Assets.xcassets/MediaAudio.imageset/MediaAudio@2x.png
diff --git a/Watch/App/Assets.xcassets/MediaAudioPlay.imageset/Contents.json b/Telegram/Watch/App/Assets.xcassets/MediaAudioPlay.imageset/Contents.json
similarity index 100%
rename from Watch/App/Assets.xcassets/MediaAudioPlay.imageset/Contents.json
rename to Telegram/Watch/App/Assets.xcassets/MediaAudioPlay.imageset/Contents.json
diff --git a/Watch/App/Assets.xcassets/MediaAudioPlay.imageset/MediaAudioPlay@2x.png b/Telegram/Watch/App/Assets.xcassets/MediaAudioPlay.imageset/MediaAudioPlay@2x.png
similarity index 100%
rename from Watch/App/Assets.xcassets/MediaAudioPlay.imageset/MediaAudioPlay@2x.png
rename to Telegram/Watch/App/Assets.xcassets/MediaAudioPlay.imageset/MediaAudioPlay@2x.png
diff --git a/Watch/App/Assets.xcassets/MediaDocument.imageset/Contents.json b/Telegram/Watch/App/Assets.xcassets/MediaDocument.imageset/Contents.json
similarity index 100%
rename from Watch/App/Assets.xcassets/MediaDocument.imageset/Contents.json
rename to Telegram/Watch/App/Assets.xcassets/MediaDocument.imageset/Contents.json
diff --git a/Watch/App/Assets.xcassets/MediaDocument.imageset/MediaDocument@2x.png b/Telegram/Watch/App/Assets.xcassets/MediaDocument.imageset/MediaDocument@2x.png
similarity index 100%
rename from Watch/App/Assets.xcassets/MediaDocument.imageset/MediaDocument@2x.png
rename to Telegram/Watch/App/Assets.xcassets/MediaDocument.imageset/MediaDocument@2x.png
diff --git a/Watch/App/Assets.xcassets/MediaLocation.imageset/Contents.json b/Telegram/Watch/App/Assets.xcassets/MediaLocation.imageset/Contents.json
similarity index 100%
rename from Watch/App/Assets.xcassets/MediaLocation.imageset/Contents.json
rename to Telegram/Watch/App/Assets.xcassets/MediaLocation.imageset/Contents.json
diff --git a/Watch/App/Assets.xcassets/MediaLocation.imageset/MediaLocation@2x.png b/Telegram/Watch/App/Assets.xcassets/MediaLocation.imageset/MediaLocation@2x.png
similarity index 100%
rename from Watch/App/Assets.xcassets/MediaLocation.imageset/MediaLocation@2x.png
rename to Telegram/Watch/App/Assets.xcassets/MediaLocation.imageset/MediaLocation@2x.png
diff --git a/Watch/App/Assets.xcassets/MediaPhoto.imageset/Contents.json b/Telegram/Watch/App/Assets.xcassets/MediaPhoto.imageset/Contents.json
similarity index 100%
rename from Watch/App/Assets.xcassets/MediaPhoto.imageset/Contents.json
rename to Telegram/Watch/App/Assets.xcassets/MediaPhoto.imageset/Contents.json
diff --git a/Watch/App/Assets.xcassets/MediaPhoto.imageset/MediaPhoto@2x.png b/Telegram/Watch/App/Assets.xcassets/MediaPhoto.imageset/MediaPhoto@2x.png
similarity index 100%
rename from Watch/App/Assets.xcassets/MediaPhoto.imageset/MediaPhoto@2x.png
rename to Telegram/Watch/App/Assets.xcassets/MediaPhoto.imageset/MediaPhoto@2x.png
diff --git a/Watch/App/Assets.xcassets/MediaVideo.imageset/Contents.json b/Telegram/Watch/App/Assets.xcassets/MediaVideo.imageset/Contents.json
similarity index 100%
rename from Watch/App/Assets.xcassets/MediaVideo.imageset/Contents.json
rename to Telegram/Watch/App/Assets.xcassets/MediaVideo.imageset/Contents.json
diff --git a/Watch/App/Assets.xcassets/MediaVideo.imageset/MediaVideo@2x.png b/Telegram/Watch/App/Assets.xcassets/MediaVideo.imageset/MediaVideo@2x.png
similarity index 100%
rename from Watch/App/Assets.xcassets/MediaVideo.imageset/MediaVideo@2x.png
rename to Telegram/Watch/App/Assets.xcassets/MediaVideo.imageset/MediaVideo@2x.png
diff --git a/Watch/App/Assets.xcassets/MessageStatusDot.imageset/Contents.json b/Telegram/Watch/App/Assets.xcassets/MessageStatusDot.imageset/Contents.json
similarity index 100%
rename from Watch/App/Assets.xcassets/MessageStatusDot.imageset/Contents.json
rename to Telegram/Watch/App/Assets.xcassets/MessageStatusDot.imageset/Contents.json
diff --git a/Watch/App/Assets.xcassets/MessageStatusDot.imageset/MessageStatusDot@2x.png b/Telegram/Watch/App/Assets.xcassets/MessageStatusDot.imageset/MessageStatusDot@2x.png
similarity index 100%
rename from Watch/App/Assets.xcassets/MessageStatusDot.imageset/MessageStatusDot@2x.png
rename to Telegram/Watch/App/Assets.xcassets/MessageStatusDot.imageset/MessageStatusDot@2x.png
diff --git a/Watch/App/Assets.xcassets/MicAccessIcon.imageset/Contents.json b/Telegram/Watch/App/Assets.xcassets/MicAccessIcon.imageset/Contents.json
similarity index 100%
rename from Watch/App/Assets.xcassets/MicAccessIcon.imageset/Contents.json
rename to Telegram/Watch/App/Assets.xcassets/MicAccessIcon.imageset/Contents.json
diff --git a/Watch/App/Assets.xcassets/MicAccessIcon.imageset/MicIcon@2x.png b/Telegram/Watch/App/Assets.xcassets/MicAccessIcon.imageset/MicIcon@2x.png
similarity index 100%
rename from Watch/App/Assets.xcassets/MicAccessIcon.imageset/MicIcon@2x.png
rename to Telegram/Watch/App/Assets.xcassets/MicAccessIcon.imageset/MicIcon@2x.png
diff --git a/Watch/App/Assets.xcassets/MicIcon.imageset/Contents.json b/Telegram/Watch/App/Assets.xcassets/MicIcon.imageset/Contents.json
similarity index 100%
rename from Watch/App/Assets.xcassets/MicIcon.imageset/Contents.json
rename to Telegram/Watch/App/Assets.xcassets/MicIcon.imageset/Contents.json
diff --git a/Watch/App/Assets.xcassets/MicIcon.imageset/Mic@2x.png b/Telegram/Watch/App/Assets.xcassets/MicIcon.imageset/Mic@2x.png
similarity index 100%
rename from Watch/App/Assets.xcassets/MicIcon.imageset/Mic@2x.png
rename to Telegram/Watch/App/Assets.xcassets/MicIcon.imageset/Mic@2x.png
diff --git a/Watch/App/Assets.xcassets/PasscodeIcon.imageset/Contents.json b/Telegram/Watch/App/Assets.xcassets/PasscodeIcon.imageset/Contents.json
similarity index 100%
rename from Watch/App/Assets.xcassets/PasscodeIcon.imageset/Contents.json
rename to Telegram/Watch/App/Assets.xcassets/PasscodeIcon.imageset/Contents.json
diff --git a/Watch/App/Assets.xcassets/PasscodeIcon.imageset/Passcode@2x.png b/Telegram/Watch/App/Assets.xcassets/PasscodeIcon.imageset/Passcode@2x.png
similarity index 100%
rename from Watch/App/Assets.xcassets/PasscodeIcon.imageset/Passcode@2x.png
rename to Telegram/Watch/App/Assets.xcassets/PasscodeIcon.imageset/Passcode@2x.png
diff --git a/Watch/App/Assets.xcassets/PickLocation.imageset/Contents.json b/Telegram/Watch/App/Assets.xcassets/PickLocation.imageset/Contents.json
similarity index 100%
rename from Watch/App/Assets.xcassets/PickLocation.imageset/Contents.json
rename to Telegram/Watch/App/Assets.xcassets/PickLocation.imageset/Contents.json
diff --git a/Watch/App/Assets.xcassets/PickLocation.imageset/PickLocation@2x.png b/Telegram/Watch/App/Assets.xcassets/PickLocation.imageset/PickLocation@2x.png
similarity index 100%
rename from Watch/App/Assets.xcassets/PickLocation.imageset/PickLocation@2x.png
rename to Telegram/Watch/App/Assets.xcassets/PickLocation.imageset/PickLocation@2x.png
diff --git a/Watch/App/Assets.xcassets/RemotePhone.imageset/Contents.json b/Telegram/Watch/App/Assets.xcassets/RemotePhone.imageset/Contents.json
similarity index 100%
rename from Watch/App/Assets.xcassets/RemotePhone.imageset/Contents.json
rename to Telegram/Watch/App/Assets.xcassets/RemotePhone.imageset/Contents.json
diff --git a/Watch/App/Assets.xcassets/RemotePhone.imageset/Phone@2x.png b/Telegram/Watch/App/Assets.xcassets/RemotePhone.imageset/Phone@2x.png
similarity index 100%
rename from Watch/App/Assets.xcassets/RemotePhone.imageset/Phone@2x.png
rename to Telegram/Watch/App/Assets.xcassets/RemotePhone.imageset/Phone@2x.png
diff --git a/Watch/App/Assets.xcassets/RemotePlayVideo.imageset/Contents.json b/Telegram/Watch/App/Assets.xcassets/RemotePlayVideo.imageset/Contents.json
similarity index 100%
rename from Watch/App/Assets.xcassets/RemotePlayVideo.imageset/Contents.json
rename to Telegram/Watch/App/Assets.xcassets/RemotePlayVideo.imageset/Contents.json
diff --git a/Watch/App/Assets.xcassets/RemotePlayVideo.imageset/RemotePlayVideo@2x.png b/Telegram/Watch/App/Assets.xcassets/RemotePlayVideo.imageset/RemotePlayVideo@2x.png
similarity index 100%
rename from Watch/App/Assets.xcassets/RemotePlayVideo.imageset/RemotePlayVideo@2x.png
rename to Telegram/Watch/App/Assets.xcassets/RemotePlayVideo.imageset/RemotePlayVideo@2x.png
diff --git a/Watch/App/Assets.xcassets/SavedMessages.imageset/Contents.json b/Telegram/Watch/App/Assets.xcassets/SavedMessages.imageset/Contents.json
similarity index 100%
rename from Watch/App/Assets.xcassets/SavedMessages.imageset/Contents.json
rename to Telegram/Watch/App/Assets.xcassets/SavedMessages.imageset/Contents.json
diff --git a/Watch/App/Assets.xcassets/SavedMessages.imageset/SavedMessages@2x.png b/Telegram/Watch/App/Assets.xcassets/SavedMessages.imageset/SavedMessages@2x.png
similarity index 100%
rename from Watch/App/Assets.xcassets/SavedMessages.imageset/SavedMessages@2x.png
rename to Telegram/Watch/App/Assets.xcassets/SavedMessages.imageset/SavedMessages@2x.png
diff --git a/Watch/App/Assets.xcassets/SavedMessagesAvatar.imageset/Contents.json b/Telegram/Watch/App/Assets.xcassets/SavedMessagesAvatar.imageset/Contents.json
similarity index 100%
rename from Watch/App/Assets.xcassets/SavedMessagesAvatar.imageset/Contents.json
rename to Telegram/Watch/App/Assets.xcassets/SavedMessagesAvatar.imageset/Contents.json
diff --git a/Watch/App/Assets.xcassets/SavedMessagesAvatar.imageset/SavedMessagesAvatar@2x.png b/Telegram/Watch/App/Assets.xcassets/SavedMessagesAvatar.imageset/SavedMessagesAvatar@2x.png
similarity index 100%
rename from Watch/App/Assets.xcassets/SavedMessagesAvatar.imageset/SavedMessagesAvatar@2x.png
rename to Telegram/Watch/App/Assets.xcassets/SavedMessagesAvatar.imageset/SavedMessagesAvatar@2x.png
diff --git a/Watch/App/Assets.xcassets/Spinner/Spinner0.imageset/Contents.json b/Telegram/Watch/App/Assets.xcassets/Spinner/Spinner0.imageset/Contents.json
similarity index 100%
rename from Watch/App/Assets.xcassets/Spinner/Spinner0.imageset/Contents.json
rename to Telegram/Watch/App/Assets.xcassets/Spinner/Spinner0.imageset/Contents.json
diff --git a/Watch/App/Assets.xcassets/Spinner/Spinner0.imageset/Spinner0@2x.png b/Telegram/Watch/App/Assets.xcassets/Spinner/Spinner0.imageset/Spinner0@2x.png
similarity index 100%
rename from Watch/App/Assets.xcassets/Spinner/Spinner0.imageset/Spinner0@2x.png
rename to Telegram/Watch/App/Assets.xcassets/Spinner/Spinner0.imageset/Spinner0@2x.png
diff --git a/Watch/App/Assets.xcassets/Spinner/Spinner1.imageset/Contents.json b/Telegram/Watch/App/Assets.xcassets/Spinner/Spinner1.imageset/Contents.json
similarity index 100%
rename from Watch/App/Assets.xcassets/Spinner/Spinner1.imageset/Contents.json
rename to Telegram/Watch/App/Assets.xcassets/Spinner/Spinner1.imageset/Contents.json
diff --git a/Watch/App/Assets.xcassets/Spinner/Spinner1.imageset/Spinner1@2x.png b/Telegram/Watch/App/Assets.xcassets/Spinner/Spinner1.imageset/Spinner1@2x.png
similarity index 100%
rename from Watch/App/Assets.xcassets/Spinner/Spinner1.imageset/Spinner1@2x.png
rename to Telegram/Watch/App/Assets.xcassets/Spinner/Spinner1.imageset/Spinner1@2x.png
diff --git a/Watch/App/Assets.xcassets/Spinner/Spinner10.imageset/Contents.json b/Telegram/Watch/App/Assets.xcassets/Spinner/Spinner10.imageset/Contents.json
similarity index 100%
rename from Watch/App/Assets.xcassets/Spinner/Spinner10.imageset/Contents.json
rename to Telegram/Watch/App/Assets.xcassets/Spinner/Spinner10.imageset/Contents.json
diff --git a/Watch/App/Assets.xcassets/Spinner/Spinner10.imageset/Spinner10@2x.png b/Telegram/Watch/App/Assets.xcassets/Spinner/Spinner10.imageset/Spinner10@2x.png
similarity index 100%
rename from Watch/App/Assets.xcassets/Spinner/Spinner10.imageset/Spinner10@2x.png
rename to Telegram/Watch/App/Assets.xcassets/Spinner/Spinner10.imageset/Spinner10@2x.png
diff --git a/Watch/App/Assets.xcassets/Spinner/Spinner11.imageset/Contents.json b/Telegram/Watch/App/Assets.xcassets/Spinner/Spinner11.imageset/Contents.json
similarity index 100%
rename from Watch/App/Assets.xcassets/Spinner/Spinner11.imageset/Contents.json
rename to Telegram/Watch/App/Assets.xcassets/Spinner/Spinner11.imageset/Contents.json
diff --git a/Watch/App/Assets.xcassets/Spinner/Spinner11.imageset/Spinner11@2x.png b/Telegram/Watch/App/Assets.xcassets/Spinner/Spinner11.imageset/Spinner11@2x.png
similarity index 100%
rename from Watch/App/Assets.xcassets/Spinner/Spinner11.imageset/Spinner11@2x.png
rename to Telegram/Watch/App/Assets.xcassets/Spinner/Spinner11.imageset/Spinner11@2x.png
diff --git a/Watch/App/Assets.xcassets/Spinner/Spinner12.imageset/Contents.json b/Telegram/Watch/App/Assets.xcassets/Spinner/Spinner12.imageset/Contents.json
similarity index 100%
rename from Watch/App/Assets.xcassets/Spinner/Spinner12.imageset/Contents.json
rename to Telegram/Watch/App/Assets.xcassets/Spinner/Spinner12.imageset/Contents.json
diff --git a/Watch/App/Assets.xcassets/Spinner/Spinner12.imageset/Spinner12@2x.png b/Telegram/Watch/App/Assets.xcassets/Spinner/Spinner12.imageset/Spinner12@2x.png
similarity index 100%
rename from Watch/App/Assets.xcassets/Spinner/Spinner12.imageset/Spinner12@2x.png
rename to Telegram/Watch/App/Assets.xcassets/Spinner/Spinner12.imageset/Spinner12@2x.png
diff --git a/Watch/App/Assets.xcassets/Spinner/Spinner13.imageset/Contents.json b/Telegram/Watch/App/Assets.xcassets/Spinner/Spinner13.imageset/Contents.json
similarity index 100%
rename from Watch/App/Assets.xcassets/Spinner/Spinner13.imageset/Contents.json
rename to Telegram/Watch/App/Assets.xcassets/Spinner/Spinner13.imageset/Contents.json
diff --git a/Watch/App/Assets.xcassets/Spinner/Spinner13.imageset/Spinner13@2x.png b/Telegram/Watch/App/Assets.xcassets/Spinner/Spinner13.imageset/Spinner13@2x.png
similarity index 100%
rename from Watch/App/Assets.xcassets/Spinner/Spinner13.imageset/Spinner13@2x.png
rename to Telegram/Watch/App/Assets.xcassets/Spinner/Spinner13.imageset/Spinner13@2x.png
diff --git a/Watch/App/Assets.xcassets/Spinner/Spinner14.imageset/Contents.json b/Telegram/Watch/App/Assets.xcassets/Spinner/Spinner14.imageset/Contents.json
similarity index 100%
rename from Watch/App/Assets.xcassets/Spinner/Spinner14.imageset/Contents.json
rename to Telegram/Watch/App/Assets.xcassets/Spinner/Spinner14.imageset/Contents.json
diff --git a/Watch/App/Assets.xcassets/Spinner/Spinner14.imageset/Spinner14@2x.png b/Telegram/Watch/App/Assets.xcassets/Spinner/Spinner14.imageset/Spinner14@2x.png
similarity index 100%
rename from Watch/App/Assets.xcassets/Spinner/Spinner14.imageset/Spinner14@2x.png
rename to Telegram/Watch/App/Assets.xcassets/Spinner/Spinner14.imageset/Spinner14@2x.png
diff --git a/Watch/App/Assets.xcassets/Spinner/Spinner15.imageset/Contents.json b/Telegram/Watch/App/Assets.xcassets/Spinner/Spinner15.imageset/Contents.json
similarity index 100%
rename from Watch/App/Assets.xcassets/Spinner/Spinner15.imageset/Contents.json
rename to Telegram/Watch/App/Assets.xcassets/Spinner/Spinner15.imageset/Contents.json
diff --git a/Watch/App/Assets.xcassets/Spinner/Spinner15.imageset/Spinner15@2x.png b/Telegram/Watch/App/Assets.xcassets/Spinner/Spinner15.imageset/Spinner15@2x.png
similarity index 100%
rename from Watch/App/Assets.xcassets/Spinner/Spinner15.imageset/Spinner15@2x.png
rename to Telegram/Watch/App/Assets.xcassets/Spinner/Spinner15.imageset/Spinner15@2x.png
diff --git a/Watch/App/Assets.xcassets/Spinner/Spinner16.imageset/Contents.json b/Telegram/Watch/App/Assets.xcassets/Spinner/Spinner16.imageset/Contents.json
similarity index 100%
rename from Watch/App/Assets.xcassets/Spinner/Spinner16.imageset/Contents.json
rename to Telegram/Watch/App/Assets.xcassets/Spinner/Spinner16.imageset/Contents.json
diff --git a/Watch/App/Assets.xcassets/Spinner/Spinner16.imageset/Spinner16@2x.png b/Telegram/Watch/App/Assets.xcassets/Spinner/Spinner16.imageset/Spinner16@2x.png
similarity index 100%
rename from Watch/App/Assets.xcassets/Spinner/Spinner16.imageset/Spinner16@2x.png
rename to Telegram/Watch/App/Assets.xcassets/Spinner/Spinner16.imageset/Spinner16@2x.png
diff --git a/Watch/App/Assets.xcassets/Spinner/Spinner17.imageset/Contents.json b/Telegram/Watch/App/Assets.xcassets/Spinner/Spinner17.imageset/Contents.json
similarity index 100%
rename from Watch/App/Assets.xcassets/Spinner/Spinner17.imageset/Contents.json
rename to Telegram/Watch/App/Assets.xcassets/Spinner/Spinner17.imageset/Contents.json
diff --git a/Watch/App/Assets.xcassets/Spinner/Spinner17.imageset/Spinner17@2x.png b/Telegram/Watch/App/Assets.xcassets/Spinner/Spinner17.imageset/Spinner17@2x.png
similarity index 100%
rename from Watch/App/Assets.xcassets/Spinner/Spinner17.imageset/Spinner17@2x.png
rename to Telegram/Watch/App/Assets.xcassets/Spinner/Spinner17.imageset/Spinner17@2x.png
diff --git a/Watch/App/Assets.xcassets/Spinner/Spinner18.imageset/Contents.json b/Telegram/Watch/App/Assets.xcassets/Spinner/Spinner18.imageset/Contents.json
similarity index 100%
rename from Watch/App/Assets.xcassets/Spinner/Spinner18.imageset/Contents.json
rename to Telegram/Watch/App/Assets.xcassets/Spinner/Spinner18.imageset/Contents.json
diff --git a/Watch/App/Assets.xcassets/Spinner/Spinner18.imageset/Spinner18@2x.png b/Telegram/Watch/App/Assets.xcassets/Spinner/Spinner18.imageset/Spinner18@2x.png
similarity index 100%
rename from Watch/App/Assets.xcassets/Spinner/Spinner18.imageset/Spinner18@2x.png
rename to Telegram/Watch/App/Assets.xcassets/Spinner/Spinner18.imageset/Spinner18@2x.png
diff --git a/Watch/App/Assets.xcassets/Spinner/Spinner19.imageset/Contents.json b/Telegram/Watch/App/Assets.xcassets/Spinner/Spinner19.imageset/Contents.json
similarity index 100%
rename from Watch/App/Assets.xcassets/Spinner/Spinner19.imageset/Contents.json
rename to Telegram/Watch/App/Assets.xcassets/Spinner/Spinner19.imageset/Contents.json
diff --git a/Watch/App/Assets.xcassets/Spinner/Spinner19.imageset/Spinner19@2x.png b/Telegram/Watch/App/Assets.xcassets/Spinner/Spinner19.imageset/Spinner19@2x.png
similarity index 100%
rename from Watch/App/Assets.xcassets/Spinner/Spinner19.imageset/Spinner19@2x.png
rename to Telegram/Watch/App/Assets.xcassets/Spinner/Spinner19.imageset/Spinner19@2x.png
diff --git a/Watch/App/Assets.xcassets/Spinner/Spinner2.imageset/Contents.json b/Telegram/Watch/App/Assets.xcassets/Spinner/Spinner2.imageset/Contents.json
similarity index 100%
rename from Watch/App/Assets.xcassets/Spinner/Spinner2.imageset/Contents.json
rename to Telegram/Watch/App/Assets.xcassets/Spinner/Spinner2.imageset/Contents.json
diff --git a/Watch/App/Assets.xcassets/Spinner/Spinner2.imageset/Spinner2@2x.png b/Telegram/Watch/App/Assets.xcassets/Spinner/Spinner2.imageset/Spinner2@2x.png
similarity index 100%
rename from Watch/App/Assets.xcassets/Spinner/Spinner2.imageset/Spinner2@2x.png
rename to Telegram/Watch/App/Assets.xcassets/Spinner/Spinner2.imageset/Spinner2@2x.png
diff --git a/Watch/App/Assets.xcassets/Spinner/Spinner20.imageset/Contents.json b/Telegram/Watch/App/Assets.xcassets/Spinner/Spinner20.imageset/Contents.json
similarity index 100%
rename from Watch/App/Assets.xcassets/Spinner/Spinner20.imageset/Contents.json
rename to Telegram/Watch/App/Assets.xcassets/Spinner/Spinner20.imageset/Contents.json
diff --git a/Watch/App/Assets.xcassets/Spinner/Spinner20.imageset/Spinner20@2x.png b/Telegram/Watch/App/Assets.xcassets/Spinner/Spinner20.imageset/Spinner20@2x.png
similarity index 100%
rename from Watch/App/Assets.xcassets/Spinner/Spinner20.imageset/Spinner20@2x.png
rename to Telegram/Watch/App/Assets.xcassets/Spinner/Spinner20.imageset/Spinner20@2x.png
diff --git a/Watch/App/Assets.xcassets/Spinner/Spinner21.imageset/Contents.json b/Telegram/Watch/App/Assets.xcassets/Spinner/Spinner21.imageset/Contents.json
similarity index 100%
rename from Watch/App/Assets.xcassets/Spinner/Spinner21.imageset/Contents.json
rename to Telegram/Watch/App/Assets.xcassets/Spinner/Spinner21.imageset/Contents.json
diff --git a/Watch/App/Assets.xcassets/Spinner/Spinner21.imageset/Spinner21@2x.png b/Telegram/Watch/App/Assets.xcassets/Spinner/Spinner21.imageset/Spinner21@2x.png
similarity index 100%
rename from Watch/App/Assets.xcassets/Spinner/Spinner21.imageset/Spinner21@2x.png
rename to Telegram/Watch/App/Assets.xcassets/Spinner/Spinner21.imageset/Spinner21@2x.png
diff --git a/Watch/App/Assets.xcassets/Spinner/Spinner22.imageset/Contents.json b/Telegram/Watch/App/Assets.xcassets/Spinner/Spinner22.imageset/Contents.json
similarity index 100%
rename from Watch/App/Assets.xcassets/Spinner/Spinner22.imageset/Contents.json
rename to Telegram/Watch/App/Assets.xcassets/Spinner/Spinner22.imageset/Contents.json
diff --git a/Watch/App/Assets.xcassets/Spinner/Spinner22.imageset/Spinner22@2x.png b/Telegram/Watch/App/Assets.xcassets/Spinner/Spinner22.imageset/Spinner22@2x.png
similarity index 100%
rename from Watch/App/Assets.xcassets/Spinner/Spinner22.imageset/Spinner22@2x.png
rename to Telegram/Watch/App/Assets.xcassets/Spinner/Spinner22.imageset/Spinner22@2x.png
diff --git a/Watch/App/Assets.xcassets/Spinner/Spinner23.imageset/Contents.json b/Telegram/Watch/App/Assets.xcassets/Spinner/Spinner23.imageset/Contents.json
similarity index 100%
rename from Watch/App/Assets.xcassets/Spinner/Spinner23.imageset/Contents.json
rename to Telegram/Watch/App/Assets.xcassets/Spinner/Spinner23.imageset/Contents.json
diff --git a/Watch/App/Assets.xcassets/Spinner/Spinner23.imageset/Spinner23@2x.png b/Telegram/Watch/App/Assets.xcassets/Spinner/Spinner23.imageset/Spinner23@2x.png
similarity index 100%
rename from Watch/App/Assets.xcassets/Spinner/Spinner23.imageset/Spinner23@2x.png
rename to Telegram/Watch/App/Assets.xcassets/Spinner/Spinner23.imageset/Spinner23@2x.png
diff --git a/Watch/App/Assets.xcassets/Spinner/Spinner24.imageset/Contents.json b/Telegram/Watch/App/Assets.xcassets/Spinner/Spinner24.imageset/Contents.json
similarity index 100%
rename from Watch/App/Assets.xcassets/Spinner/Spinner24.imageset/Contents.json
rename to Telegram/Watch/App/Assets.xcassets/Spinner/Spinner24.imageset/Contents.json
diff --git a/Watch/App/Assets.xcassets/Spinner/Spinner24.imageset/Spinner24@2x.png b/Telegram/Watch/App/Assets.xcassets/Spinner/Spinner24.imageset/Spinner24@2x.png
similarity index 100%
rename from Watch/App/Assets.xcassets/Spinner/Spinner24.imageset/Spinner24@2x.png
rename to Telegram/Watch/App/Assets.xcassets/Spinner/Spinner24.imageset/Spinner24@2x.png
diff --git a/Watch/App/Assets.xcassets/Spinner/Spinner25.imageset/Contents.json b/Telegram/Watch/App/Assets.xcassets/Spinner/Spinner25.imageset/Contents.json
similarity index 100%
rename from Watch/App/Assets.xcassets/Spinner/Spinner25.imageset/Contents.json
rename to Telegram/Watch/App/Assets.xcassets/Spinner/Spinner25.imageset/Contents.json
diff --git a/Watch/App/Assets.xcassets/Spinner/Spinner25.imageset/Spinner25@2x.png b/Telegram/Watch/App/Assets.xcassets/Spinner/Spinner25.imageset/Spinner25@2x.png
similarity index 100%
rename from Watch/App/Assets.xcassets/Spinner/Spinner25.imageset/Spinner25@2x.png
rename to Telegram/Watch/App/Assets.xcassets/Spinner/Spinner25.imageset/Spinner25@2x.png
diff --git a/Watch/App/Assets.xcassets/Spinner/Spinner26.imageset/Contents.json b/Telegram/Watch/App/Assets.xcassets/Spinner/Spinner26.imageset/Contents.json
similarity index 100%
rename from Watch/App/Assets.xcassets/Spinner/Spinner26.imageset/Contents.json
rename to Telegram/Watch/App/Assets.xcassets/Spinner/Spinner26.imageset/Contents.json
diff --git a/Watch/App/Assets.xcassets/Spinner/Spinner26.imageset/Spinner26@2x.png b/Telegram/Watch/App/Assets.xcassets/Spinner/Spinner26.imageset/Spinner26@2x.png
similarity index 100%
rename from Watch/App/Assets.xcassets/Spinner/Spinner26.imageset/Spinner26@2x.png
rename to Telegram/Watch/App/Assets.xcassets/Spinner/Spinner26.imageset/Spinner26@2x.png
diff --git a/Watch/App/Assets.xcassets/Spinner/Spinner27.imageset/Contents.json b/Telegram/Watch/App/Assets.xcassets/Spinner/Spinner27.imageset/Contents.json
similarity index 100%
rename from Watch/App/Assets.xcassets/Spinner/Spinner27.imageset/Contents.json
rename to Telegram/Watch/App/Assets.xcassets/Spinner/Spinner27.imageset/Contents.json
diff --git a/Watch/App/Assets.xcassets/Spinner/Spinner27.imageset/Spinner27@2x.png b/Telegram/Watch/App/Assets.xcassets/Spinner/Spinner27.imageset/Spinner27@2x.png
similarity index 100%
rename from Watch/App/Assets.xcassets/Spinner/Spinner27.imageset/Spinner27@2x.png
rename to Telegram/Watch/App/Assets.xcassets/Spinner/Spinner27.imageset/Spinner27@2x.png
diff --git a/Watch/App/Assets.xcassets/Spinner/Spinner28.imageset/Contents.json b/Telegram/Watch/App/Assets.xcassets/Spinner/Spinner28.imageset/Contents.json
similarity index 100%
rename from Watch/App/Assets.xcassets/Spinner/Spinner28.imageset/Contents.json
rename to Telegram/Watch/App/Assets.xcassets/Spinner/Spinner28.imageset/Contents.json
diff --git a/Watch/App/Assets.xcassets/Spinner/Spinner28.imageset/Spinner28@2x.png b/Telegram/Watch/App/Assets.xcassets/Spinner/Spinner28.imageset/Spinner28@2x.png
similarity index 100%
rename from Watch/App/Assets.xcassets/Spinner/Spinner28.imageset/Spinner28@2x.png
rename to Telegram/Watch/App/Assets.xcassets/Spinner/Spinner28.imageset/Spinner28@2x.png
diff --git a/Watch/App/Assets.xcassets/Spinner/Spinner29.imageset/Contents.json b/Telegram/Watch/App/Assets.xcassets/Spinner/Spinner29.imageset/Contents.json
similarity index 100%
rename from Watch/App/Assets.xcassets/Spinner/Spinner29.imageset/Contents.json
rename to Telegram/Watch/App/Assets.xcassets/Spinner/Spinner29.imageset/Contents.json
diff --git a/Watch/App/Assets.xcassets/Spinner/Spinner29.imageset/Spinner29@2x.png b/Telegram/Watch/App/Assets.xcassets/Spinner/Spinner29.imageset/Spinner29@2x.png
similarity index 100%
rename from Watch/App/Assets.xcassets/Spinner/Spinner29.imageset/Spinner29@2x.png
rename to Telegram/Watch/App/Assets.xcassets/Spinner/Spinner29.imageset/Spinner29@2x.png
diff --git a/Watch/App/Assets.xcassets/Spinner/Spinner3.imageset/Contents.json b/Telegram/Watch/App/Assets.xcassets/Spinner/Spinner3.imageset/Contents.json
similarity index 100%
rename from Watch/App/Assets.xcassets/Spinner/Spinner3.imageset/Contents.json
rename to Telegram/Watch/App/Assets.xcassets/Spinner/Spinner3.imageset/Contents.json
diff --git a/Watch/App/Assets.xcassets/Spinner/Spinner3.imageset/Spinner3@2x.png b/Telegram/Watch/App/Assets.xcassets/Spinner/Spinner3.imageset/Spinner3@2x.png
similarity index 100%
rename from Watch/App/Assets.xcassets/Spinner/Spinner3.imageset/Spinner3@2x.png
rename to Telegram/Watch/App/Assets.xcassets/Spinner/Spinner3.imageset/Spinner3@2x.png
diff --git a/Watch/App/Assets.xcassets/Spinner/Spinner30.imageset/Contents.json b/Telegram/Watch/App/Assets.xcassets/Spinner/Spinner30.imageset/Contents.json
similarity index 100%
rename from Watch/App/Assets.xcassets/Spinner/Spinner30.imageset/Contents.json
rename to Telegram/Watch/App/Assets.xcassets/Spinner/Spinner30.imageset/Contents.json
diff --git a/Watch/App/Assets.xcassets/Spinner/Spinner30.imageset/Spinner30@2x.png b/Telegram/Watch/App/Assets.xcassets/Spinner/Spinner30.imageset/Spinner30@2x.png
similarity index 100%
rename from Watch/App/Assets.xcassets/Spinner/Spinner30.imageset/Spinner30@2x.png
rename to Telegram/Watch/App/Assets.xcassets/Spinner/Spinner30.imageset/Spinner30@2x.png
diff --git a/Watch/App/Assets.xcassets/Spinner/Spinner31.imageset/Contents.json b/Telegram/Watch/App/Assets.xcassets/Spinner/Spinner31.imageset/Contents.json
similarity index 100%
rename from Watch/App/Assets.xcassets/Spinner/Spinner31.imageset/Contents.json
rename to Telegram/Watch/App/Assets.xcassets/Spinner/Spinner31.imageset/Contents.json
diff --git a/Watch/App/Assets.xcassets/Spinner/Spinner31.imageset/Spinner31@2x.png b/Telegram/Watch/App/Assets.xcassets/Spinner/Spinner31.imageset/Spinner31@2x.png
similarity index 100%
rename from Watch/App/Assets.xcassets/Spinner/Spinner31.imageset/Spinner31@2x.png
rename to Telegram/Watch/App/Assets.xcassets/Spinner/Spinner31.imageset/Spinner31@2x.png
diff --git a/Watch/App/Assets.xcassets/Spinner/Spinner32.imageset/Contents.json b/Telegram/Watch/App/Assets.xcassets/Spinner/Spinner32.imageset/Contents.json
similarity index 100%
rename from Watch/App/Assets.xcassets/Spinner/Spinner32.imageset/Contents.json
rename to Telegram/Watch/App/Assets.xcassets/Spinner/Spinner32.imageset/Contents.json
diff --git a/Watch/App/Assets.xcassets/Spinner/Spinner32.imageset/Spinner32@2x.png b/Telegram/Watch/App/Assets.xcassets/Spinner/Spinner32.imageset/Spinner32@2x.png
similarity index 100%
rename from Watch/App/Assets.xcassets/Spinner/Spinner32.imageset/Spinner32@2x.png
rename to Telegram/Watch/App/Assets.xcassets/Spinner/Spinner32.imageset/Spinner32@2x.png
diff --git a/Watch/App/Assets.xcassets/Spinner/Spinner33.imageset/Contents.json b/Telegram/Watch/App/Assets.xcassets/Spinner/Spinner33.imageset/Contents.json
similarity index 100%
rename from Watch/App/Assets.xcassets/Spinner/Spinner33.imageset/Contents.json
rename to Telegram/Watch/App/Assets.xcassets/Spinner/Spinner33.imageset/Contents.json
diff --git a/Watch/App/Assets.xcassets/Spinner/Spinner33.imageset/Spinner33@2x.png b/Telegram/Watch/App/Assets.xcassets/Spinner/Spinner33.imageset/Spinner33@2x.png
similarity index 100%
rename from Watch/App/Assets.xcassets/Spinner/Spinner33.imageset/Spinner33@2x.png
rename to Telegram/Watch/App/Assets.xcassets/Spinner/Spinner33.imageset/Spinner33@2x.png
diff --git a/Watch/App/Assets.xcassets/Spinner/Spinner34.imageset/Contents.json b/Telegram/Watch/App/Assets.xcassets/Spinner/Spinner34.imageset/Contents.json
similarity index 100%
rename from Watch/App/Assets.xcassets/Spinner/Spinner34.imageset/Contents.json
rename to Telegram/Watch/App/Assets.xcassets/Spinner/Spinner34.imageset/Contents.json
diff --git a/Watch/App/Assets.xcassets/Spinner/Spinner34.imageset/Spinner34@2x.png b/Telegram/Watch/App/Assets.xcassets/Spinner/Spinner34.imageset/Spinner34@2x.png
similarity index 100%
rename from Watch/App/Assets.xcassets/Spinner/Spinner34.imageset/Spinner34@2x.png
rename to Telegram/Watch/App/Assets.xcassets/Spinner/Spinner34.imageset/Spinner34@2x.png
diff --git a/Watch/App/Assets.xcassets/Spinner/Spinner35.imageset/Contents.json b/Telegram/Watch/App/Assets.xcassets/Spinner/Spinner35.imageset/Contents.json
similarity index 100%
rename from Watch/App/Assets.xcassets/Spinner/Spinner35.imageset/Contents.json
rename to Telegram/Watch/App/Assets.xcassets/Spinner/Spinner35.imageset/Contents.json
diff --git a/Watch/App/Assets.xcassets/Spinner/Spinner35.imageset/Spinner35@2x.png b/Telegram/Watch/App/Assets.xcassets/Spinner/Spinner35.imageset/Spinner35@2x.png
similarity index 100%
rename from Watch/App/Assets.xcassets/Spinner/Spinner35.imageset/Spinner35@2x.png
rename to Telegram/Watch/App/Assets.xcassets/Spinner/Spinner35.imageset/Spinner35@2x.png
diff --git a/Watch/App/Assets.xcassets/Spinner/Spinner36.imageset/Contents.json b/Telegram/Watch/App/Assets.xcassets/Spinner/Spinner36.imageset/Contents.json
similarity index 100%
rename from Watch/App/Assets.xcassets/Spinner/Spinner36.imageset/Contents.json
rename to Telegram/Watch/App/Assets.xcassets/Spinner/Spinner36.imageset/Contents.json
diff --git a/Watch/App/Assets.xcassets/Spinner/Spinner36.imageset/Spinner36@2x.png b/Telegram/Watch/App/Assets.xcassets/Spinner/Spinner36.imageset/Spinner36@2x.png
similarity index 100%
rename from Watch/App/Assets.xcassets/Spinner/Spinner36.imageset/Spinner36@2x.png
rename to Telegram/Watch/App/Assets.xcassets/Spinner/Spinner36.imageset/Spinner36@2x.png
diff --git a/Watch/App/Assets.xcassets/Spinner/Spinner37.imageset/Contents.json b/Telegram/Watch/App/Assets.xcassets/Spinner/Spinner37.imageset/Contents.json
similarity index 100%
rename from Watch/App/Assets.xcassets/Spinner/Spinner37.imageset/Contents.json
rename to Telegram/Watch/App/Assets.xcassets/Spinner/Spinner37.imageset/Contents.json
diff --git a/Watch/App/Assets.xcassets/Spinner/Spinner37.imageset/Spinner37@2x.png b/Telegram/Watch/App/Assets.xcassets/Spinner/Spinner37.imageset/Spinner37@2x.png
similarity index 100%
rename from Watch/App/Assets.xcassets/Spinner/Spinner37.imageset/Spinner37@2x.png
rename to Telegram/Watch/App/Assets.xcassets/Spinner/Spinner37.imageset/Spinner37@2x.png
diff --git a/Watch/App/Assets.xcassets/Spinner/Spinner38.imageset/Contents.json b/Telegram/Watch/App/Assets.xcassets/Spinner/Spinner38.imageset/Contents.json
similarity index 100%
rename from Watch/App/Assets.xcassets/Spinner/Spinner38.imageset/Contents.json
rename to Telegram/Watch/App/Assets.xcassets/Spinner/Spinner38.imageset/Contents.json
diff --git a/Watch/App/Assets.xcassets/Spinner/Spinner38.imageset/Spinner38@2x.png b/Telegram/Watch/App/Assets.xcassets/Spinner/Spinner38.imageset/Spinner38@2x.png
similarity index 100%
rename from Watch/App/Assets.xcassets/Spinner/Spinner38.imageset/Spinner38@2x.png
rename to Telegram/Watch/App/Assets.xcassets/Spinner/Spinner38.imageset/Spinner38@2x.png
diff --git a/Watch/App/Assets.xcassets/Spinner/Spinner4.imageset/Contents.json b/Telegram/Watch/App/Assets.xcassets/Spinner/Spinner4.imageset/Contents.json
similarity index 100%
rename from Watch/App/Assets.xcassets/Spinner/Spinner4.imageset/Contents.json
rename to Telegram/Watch/App/Assets.xcassets/Spinner/Spinner4.imageset/Contents.json
diff --git a/Watch/App/Assets.xcassets/Spinner/Spinner4.imageset/Spinner4@2x.png b/Telegram/Watch/App/Assets.xcassets/Spinner/Spinner4.imageset/Spinner4@2x.png
similarity index 100%
rename from Watch/App/Assets.xcassets/Spinner/Spinner4.imageset/Spinner4@2x.png
rename to Telegram/Watch/App/Assets.xcassets/Spinner/Spinner4.imageset/Spinner4@2x.png
diff --git a/Watch/App/Assets.xcassets/Spinner/Spinner5.imageset/Contents.json b/Telegram/Watch/App/Assets.xcassets/Spinner/Spinner5.imageset/Contents.json
similarity index 100%
rename from Watch/App/Assets.xcassets/Spinner/Spinner5.imageset/Contents.json
rename to Telegram/Watch/App/Assets.xcassets/Spinner/Spinner5.imageset/Contents.json
diff --git a/Watch/App/Assets.xcassets/Spinner/Spinner5.imageset/Spinner5@2x.png b/Telegram/Watch/App/Assets.xcassets/Spinner/Spinner5.imageset/Spinner5@2x.png
similarity index 100%
rename from Watch/App/Assets.xcassets/Spinner/Spinner5.imageset/Spinner5@2x.png
rename to Telegram/Watch/App/Assets.xcassets/Spinner/Spinner5.imageset/Spinner5@2x.png
diff --git a/Watch/App/Assets.xcassets/Spinner/Spinner6.imageset/Contents.json b/Telegram/Watch/App/Assets.xcassets/Spinner/Spinner6.imageset/Contents.json
similarity index 100%
rename from Watch/App/Assets.xcassets/Spinner/Spinner6.imageset/Contents.json
rename to Telegram/Watch/App/Assets.xcassets/Spinner/Spinner6.imageset/Contents.json
diff --git a/Watch/App/Assets.xcassets/Spinner/Spinner6.imageset/Spinner6@2x.png b/Telegram/Watch/App/Assets.xcassets/Spinner/Spinner6.imageset/Spinner6@2x.png
similarity index 100%
rename from Watch/App/Assets.xcassets/Spinner/Spinner6.imageset/Spinner6@2x.png
rename to Telegram/Watch/App/Assets.xcassets/Spinner/Spinner6.imageset/Spinner6@2x.png
diff --git a/Watch/App/Assets.xcassets/Spinner/Spinner7.imageset/Contents.json b/Telegram/Watch/App/Assets.xcassets/Spinner/Spinner7.imageset/Contents.json
similarity index 100%
rename from Watch/App/Assets.xcassets/Spinner/Spinner7.imageset/Contents.json
rename to Telegram/Watch/App/Assets.xcassets/Spinner/Spinner7.imageset/Contents.json
diff --git a/Watch/App/Assets.xcassets/Spinner/Spinner7.imageset/Spinner7@2x.png b/Telegram/Watch/App/Assets.xcassets/Spinner/Spinner7.imageset/Spinner7@2x.png
similarity index 100%
rename from Watch/App/Assets.xcassets/Spinner/Spinner7.imageset/Spinner7@2x.png
rename to Telegram/Watch/App/Assets.xcassets/Spinner/Spinner7.imageset/Spinner7@2x.png
diff --git a/Watch/App/Assets.xcassets/Spinner/Spinner8.imageset/Contents.json b/Telegram/Watch/App/Assets.xcassets/Spinner/Spinner8.imageset/Contents.json
similarity index 100%
rename from Watch/App/Assets.xcassets/Spinner/Spinner8.imageset/Contents.json
rename to Telegram/Watch/App/Assets.xcassets/Spinner/Spinner8.imageset/Contents.json
diff --git a/Watch/App/Assets.xcassets/Spinner/Spinner8.imageset/Spinner8@2x.png b/Telegram/Watch/App/Assets.xcassets/Spinner/Spinner8.imageset/Spinner8@2x.png
similarity index 100%
rename from Watch/App/Assets.xcassets/Spinner/Spinner8.imageset/Spinner8@2x.png
rename to Telegram/Watch/App/Assets.xcassets/Spinner/Spinner8.imageset/Spinner8@2x.png
diff --git a/Watch/App/Assets.xcassets/Spinner/Spinner9.imageset/Contents.json b/Telegram/Watch/App/Assets.xcassets/Spinner/Spinner9.imageset/Contents.json
similarity index 100%
rename from Watch/App/Assets.xcassets/Spinner/Spinner9.imageset/Contents.json
rename to Telegram/Watch/App/Assets.xcassets/Spinner/Spinner9.imageset/Contents.json
diff --git a/Watch/App/Assets.xcassets/Spinner/Spinner9.imageset/Spinner9@2x.png b/Telegram/Watch/App/Assets.xcassets/Spinner/Spinner9.imageset/Spinner9@2x.png
similarity index 100%
rename from Watch/App/Assets.xcassets/Spinner/Spinner9.imageset/Spinner9@2x.png
rename to Telegram/Watch/App/Assets.xcassets/Spinner/Spinner9.imageset/Spinner9@2x.png
diff --git a/Watch/App/Assets.xcassets/StatusDot.imageset/Contents.json b/Telegram/Watch/App/Assets.xcassets/StatusDot.imageset/Contents.json
similarity index 100%
rename from Watch/App/Assets.xcassets/StatusDot.imageset/Contents.json
rename to Telegram/Watch/App/Assets.xcassets/StatusDot.imageset/Contents.json
diff --git a/Watch/App/Assets.xcassets/StatusDot.imageset/StatusDot@2x.png b/Telegram/Watch/App/Assets.xcassets/StatusDot.imageset/StatusDot@2x.png
similarity index 100%
rename from Watch/App/Assets.xcassets/StatusDot.imageset/StatusDot@2x.png
rename to Telegram/Watch/App/Assets.xcassets/StatusDot.imageset/StatusDot@2x.png
diff --git a/Watch/App/Assets.xcassets/StickerIcon.imageset/Contents.json b/Telegram/Watch/App/Assets.xcassets/StickerIcon.imageset/Contents.json
similarity index 100%
rename from Watch/App/Assets.xcassets/StickerIcon.imageset/Contents.json
rename to Telegram/Watch/App/Assets.xcassets/StickerIcon.imageset/Contents.json
diff --git a/Watch/App/Assets.xcassets/StickerIcon.imageset/StickerIcon@2x.png b/Telegram/Watch/App/Assets.xcassets/StickerIcon.imageset/StickerIcon@2x.png
similarity index 100%
rename from Watch/App/Assets.xcassets/StickerIcon.imageset/StickerIcon@2x.png
rename to Telegram/Watch/App/Assets.xcassets/StickerIcon.imageset/StickerIcon@2x.png
diff --git a/Watch/App/Assets.xcassets/VerifiedProfile.imageset/Contents.json b/Telegram/Watch/App/Assets.xcassets/VerifiedProfile.imageset/Contents.json
similarity index 100%
rename from Watch/App/Assets.xcassets/VerifiedProfile.imageset/Contents.json
rename to Telegram/Watch/App/Assets.xcassets/VerifiedProfile.imageset/Contents.json
diff --git a/Watch/App/Assets.xcassets/VerifiedProfile.imageset/VerifiedProfile@2x.png b/Telegram/Watch/App/Assets.xcassets/VerifiedProfile.imageset/VerifiedProfile@2x.png
similarity index 100%
rename from Watch/App/Assets.xcassets/VerifiedProfile.imageset/VerifiedProfile@2x.png
rename to Telegram/Watch/App/Assets.xcassets/VerifiedProfile.imageset/VerifiedProfile@2x.png
diff --git a/Watch/App/Base.lproj/Interface.storyboard b/Telegram/Watch/App/Base.lproj/Interface.storyboard
similarity index 100%
rename from Watch/App/Base.lproj/Interface.storyboard
rename to Telegram/Watch/App/Base.lproj/Interface.storyboard
diff --git a/Watch/App/Info.plist b/Telegram/Watch/App/Info.plist
similarity index 100%
rename from Watch/App/Info.plist
rename to Telegram/Watch/App/Info.plist
diff --git a/Watch/Bridge/TGBridgeAudioSignals.h b/Telegram/Watch/Bridge/TGBridgeAudioSignals.h
similarity index 100%
rename from Watch/Bridge/TGBridgeAudioSignals.h
rename to Telegram/Watch/Bridge/TGBridgeAudioSignals.h
diff --git a/Watch/Bridge/TGBridgeAudioSignals.m b/Telegram/Watch/Bridge/TGBridgeAudioSignals.m
similarity index 100%
rename from Watch/Bridge/TGBridgeAudioSignals.m
rename to Telegram/Watch/Bridge/TGBridgeAudioSignals.m
diff --git a/Watch/Bridge/TGBridgeBotReplyMarkup.h b/Telegram/Watch/Bridge/TGBridgeBotReplyMarkup.h
similarity index 100%
rename from Watch/Bridge/TGBridgeBotReplyMarkup.h
rename to Telegram/Watch/Bridge/TGBridgeBotReplyMarkup.h
diff --git a/Watch/Bridge/TGBridgeBotReplyMarkup.m b/Telegram/Watch/Bridge/TGBridgeBotReplyMarkup.m
similarity index 100%
rename from Watch/Bridge/TGBridgeBotReplyMarkup.m
rename to Telegram/Watch/Bridge/TGBridgeBotReplyMarkup.m
diff --git a/Watch/Bridge/TGBridgeBotSignals.h b/Telegram/Watch/Bridge/TGBridgeBotSignals.h
similarity index 100%
rename from Watch/Bridge/TGBridgeBotSignals.h
rename to Telegram/Watch/Bridge/TGBridgeBotSignals.h
diff --git a/Watch/Bridge/TGBridgeBotSignals.m b/Telegram/Watch/Bridge/TGBridgeBotSignals.m
similarity index 100%
rename from Watch/Bridge/TGBridgeBotSignals.m
rename to Telegram/Watch/Bridge/TGBridgeBotSignals.m
diff --git a/Watch/Bridge/TGBridgeChat+TGTableItem.h b/Telegram/Watch/Bridge/TGBridgeChat+TGTableItem.h
similarity index 100%
rename from Watch/Bridge/TGBridgeChat+TGTableItem.h
rename to Telegram/Watch/Bridge/TGBridgeChat+TGTableItem.h
diff --git a/Watch/Bridge/TGBridgeChat+TGTableItem.m b/Telegram/Watch/Bridge/TGBridgeChat+TGTableItem.m
similarity index 100%
rename from Watch/Bridge/TGBridgeChat+TGTableItem.m
rename to Telegram/Watch/Bridge/TGBridgeChat+TGTableItem.m
diff --git a/Watch/Bridge/TGBridgeChatListSignals.h b/Telegram/Watch/Bridge/TGBridgeChatListSignals.h
similarity index 100%
rename from Watch/Bridge/TGBridgeChatListSignals.h
rename to Telegram/Watch/Bridge/TGBridgeChatListSignals.h
diff --git a/Watch/Bridge/TGBridgeChatListSignals.m b/Telegram/Watch/Bridge/TGBridgeChatListSignals.m
similarity index 100%
rename from Watch/Bridge/TGBridgeChatListSignals.m
rename to Telegram/Watch/Bridge/TGBridgeChatListSignals.m
diff --git a/Watch/Bridge/TGBridgeChatMessageListSignals.h b/Telegram/Watch/Bridge/TGBridgeChatMessageListSignals.h
similarity index 100%
rename from Watch/Bridge/TGBridgeChatMessageListSignals.h
rename to Telegram/Watch/Bridge/TGBridgeChatMessageListSignals.h
diff --git a/Watch/Bridge/TGBridgeChatMessageListSignals.m b/Telegram/Watch/Bridge/TGBridgeChatMessageListSignals.m
similarity index 100%
rename from Watch/Bridge/TGBridgeChatMessageListSignals.m
rename to Telegram/Watch/Bridge/TGBridgeChatMessageListSignals.m
diff --git a/Watch/Bridge/TGBridgeClient.h b/Telegram/Watch/Bridge/TGBridgeClient.h
similarity index 100%
rename from Watch/Bridge/TGBridgeClient.h
rename to Telegram/Watch/Bridge/TGBridgeClient.h
diff --git a/Watch/Bridge/TGBridgeClient.m b/Telegram/Watch/Bridge/TGBridgeClient.m
similarity index 100%
rename from Watch/Bridge/TGBridgeClient.m
rename to Telegram/Watch/Bridge/TGBridgeClient.m
diff --git a/Watch/Bridge/TGBridgeContactsSignals.h b/Telegram/Watch/Bridge/TGBridgeContactsSignals.h
similarity index 100%
rename from Watch/Bridge/TGBridgeContactsSignals.h
rename to Telegram/Watch/Bridge/TGBridgeContactsSignals.h
diff --git a/Watch/Bridge/TGBridgeContactsSignals.m b/Telegram/Watch/Bridge/TGBridgeContactsSignals.m
similarity index 100%
rename from Watch/Bridge/TGBridgeContactsSignals.m
rename to Telegram/Watch/Bridge/TGBridgeContactsSignals.m
diff --git a/Watch/Bridge/TGBridgeConversationSignals.h b/Telegram/Watch/Bridge/TGBridgeConversationSignals.h
similarity index 100%
rename from Watch/Bridge/TGBridgeConversationSignals.h
rename to Telegram/Watch/Bridge/TGBridgeConversationSignals.h
diff --git a/Watch/Bridge/TGBridgeConversationSignals.m b/Telegram/Watch/Bridge/TGBridgeConversationSignals.m
similarity index 100%
rename from Watch/Bridge/TGBridgeConversationSignals.m
rename to Telegram/Watch/Bridge/TGBridgeConversationSignals.m
diff --git a/Watch/Bridge/TGBridgeLocationSignals.h b/Telegram/Watch/Bridge/TGBridgeLocationSignals.h
similarity index 100%
rename from Watch/Bridge/TGBridgeLocationSignals.h
rename to Telegram/Watch/Bridge/TGBridgeLocationSignals.h
diff --git a/Watch/Bridge/TGBridgeLocationSignals.m b/Telegram/Watch/Bridge/TGBridgeLocationSignals.m
similarity index 100%
rename from Watch/Bridge/TGBridgeLocationSignals.m
rename to Telegram/Watch/Bridge/TGBridgeLocationSignals.m
diff --git a/Watch/Bridge/TGBridgeLocationVenue+TGTableItem.h b/Telegram/Watch/Bridge/TGBridgeLocationVenue+TGTableItem.h
similarity index 100%
rename from Watch/Bridge/TGBridgeLocationVenue+TGTableItem.h
rename to Telegram/Watch/Bridge/TGBridgeLocationVenue+TGTableItem.h
diff --git a/Watch/Bridge/TGBridgeLocationVenue+TGTableItem.m b/Telegram/Watch/Bridge/TGBridgeLocationVenue+TGTableItem.m
similarity index 100%
rename from Watch/Bridge/TGBridgeLocationVenue+TGTableItem.m
rename to Telegram/Watch/Bridge/TGBridgeLocationVenue+TGTableItem.m
diff --git a/Watch/Bridge/TGBridgeMediaSignals.h b/Telegram/Watch/Bridge/TGBridgeMediaSignals.h
similarity index 100%
rename from Watch/Bridge/TGBridgeMediaSignals.h
rename to Telegram/Watch/Bridge/TGBridgeMediaSignals.h
diff --git a/Watch/Bridge/TGBridgeMediaSignals.m b/Telegram/Watch/Bridge/TGBridgeMediaSignals.m
similarity index 100%
rename from Watch/Bridge/TGBridgeMediaSignals.m
rename to Telegram/Watch/Bridge/TGBridgeMediaSignals.m
diff --git a/Watch/Bridge/TGBridgeMessage+TGTableItem.h b/Telegram/Watch/Bridge/TGBridgeMessage+TGTableItem.h
similarity index 100%
rename from Watch/Bridge/TGBridgeMessage+TGTableItem.h
rename to Telegram/Watch/Bridge/TGBridgeMessage+TGTableItem.h
diff --git a/Watch/Bridge/TGBridgeMessage+TGTableItem.m b/Telegram/Watch/Bridge/TGBridgeMessage+TGTableItem.m
similarity index 100%
rename from Watch/Bridge/TGBridgeMessage+TGTableItem.m
rename to Telegram/Watch/Bridge/TGBridgeMessage+TGTableItem.m
diff --git a/Watch/Bridge/TGBridgePeerSettingsSignals.h b/Telegram/Watch/Bridge/TGBridgePeerSettingsSignals.h
similarity index 100%
rename from Watch/Bridge/TGBridgePeerSettingsSignals.h
rename to Telegram/Watch/Bridge/TGBridgePeerSettingsSignals.h
diff --git a/Watch/Bridge/TGBridgePeerSettingsSignals.m b/Telegram/Watch/Bridge/TGBridgePeerSettingsSignals.m
similarity index 100%
rename from Watch/Bridge/TGBridgePeerSettingsSignals.m
rename to Telegram/Watch/Bridge/TGBridgePeerSettingsSignals.m
diff --git a/Watch/Bridge/TGBridgePresetsSignals.h b/Telegram/Watch/Bridge/TGBridgePresetsSignals.h
similarity index 100%
rename from Watch/Bridge/TGBridgePresetsSignals.h
rename to Telegram/Watch/Bridge/TGBridgePresetsSignals.h
diff --git a/Watch/Bridge/TGBridgePresetsSignals.m b/Telegram/Watch/Bridge/TGBridgePresetsSignals.m
similarity index 100%
rename from Watch/Bridge/TGBridgePresetsSignals.m
rename to Telegram/Watch/Bridge/TGBridgePresetsSignals.m
diff --git a/Watch/Bridge/TGBridgeRemoteSignals.h b/Telegram/Watch/Bridge/TGBridgeRemoteSignals.h
similarity index 100%
rename from Watch/Bridge/TGBridgeRemoteSignals.h
rename to Telegram/Watch/Bridge/TGBridgeRemoteSignals.h
diff --git a/Watch/Bridge/TGBridgeRemoteSignals.m b/Telegram/Watch/Bridge/TGBridgeRemoteSignals.m
similarity index 100%
rename from Watch/Bridge/TGBridgeRemoteSignals.m
rename to Telegram/Watch/Bridge/TGBridgeRemoteSignals.m
diff --git a/Watch/Bridge/TGBridgeSendMessageSignals.h b/Telegram/Watch/Bridge/TGBridgeSendMessageSignals.h
similarity index 100%
rename from Watch/Bridge/TGBridgeSendMessageSignals.h
rename to Telegram/Watch/Bridge/TGBridgeSendMessageSignals.h
diff --git a/Watch/Bridge/TGBridgeSendMessageSignals.m b/Telegram/Watch/Bridge/TGBridgeSendMessageSignals.m
similarity index 100%
rename from Watch/Bridge/TGBridgeSendMessageSignals.m
rename to Telegram/Watch/Bridge/TGBridgeSendMessageSignals.m
diff --git a/Watch/Bridge/TGBridgeStateSignal.h b/Telegram/Watch/Bridge/TGBridgeStateSignal.h
similarity index 100%
rename from Watch/Bridge/TGBridgeStateSignal.h
rename to Telegram/Watch/Bridge/TGBridgeStateSignal.h
diff --git a/Watch/Bridge/TGBridgeStateSignal.m b/Telegram/Watch/Bridge/TGBridgeStateSignal.m
similarity index 100%
rename from Watch/Bridge/TGBridgeStateSignal.m
rename to Telegram/Watch/Bridge/TGBridgeStateSignal.m
diff --git a/Watch/Bridge/TGBridgeStickerPack.h b/Telegram/Watch/Bridge/TGBridgeStickerPack.h
similarity index 100%
rename from Watch/Bridge/TGBridgeStickerPack.h
rename to Telegram/Watch/Bridge/TGBridgeStickerPack.h
diff --git a/Watch/Bridge/TGBridgeStickerPack.m b/Telegram/Watch/Bridge/TGBridgeStickerPack.m
similarity index 100%
rename from Watch/Bridge/TGBridgeStickerPack.m
rename to Telegram/Watch/Bridge/TGBridgeStickerPack.m
diff --git a/Watch/Bridge/TGBridgeStickersSignals.h b/Telegram/Watch/Bridge/TGBridgeStickersSignals.h
similarity index 100%
rename from Watch/Bridge/TGBridgeStickersSignals.h
rename to Telegram/Watch/Bridge/TGBridgeStickersSignals.h
diff --git a/Watch/Bridge/TGBridgeStickersSignals.m b/Telegram/Watch/Bridge/TGBridgeStickersSignals.m
similarity index 100%
rename from Watch/Bridge/TGBridgeStickersSignals.m
rename to Telegram/Watch/Bridge/TGBridgeStickersSignals.m
diff --git a/Watch/Bridge/TGBridgeUser+TGTableItem.h b/Telegram/Watch/Bridge/TGBridgeUser+TGTableItem.h
similarity index 100%
rename from Watch/Bridge/TGBridgeUser+TGTableItem.h
rename to Telegram/Watch/Bridge/TGBridgeUser+TGTableItem.h
diff --git a/Watch/Bridge/TGBridgeUser+TGTableItem.m b/Telegram/Watch/Bridge/TGBridgeUser+TGTableItem.m
similarity index 100%
rename from Watch/Bridge/TGBridgeUser+TGTableItem.m
rename to Telegram/Watch/Bridge/TGBridgeUser+TGTableItem.m
diff --git a/Watch/Bridge/TGBridgeUserInfoSignals.h b/Telegram/Watch/Bridge/TGBridgeUserInfoSignals.h
similarity index 100%
rename from Watch/Bridge/TGBridgeUserInfoSignals.h
rename to Telegram/Watch/Bridge/TGBridgeUserInfoSignals.h
diff --git a/Watch/Bridge/TGBridgeUserInfoSignals.m b/Telegram/Watch/Bridge/TGBridgeUserInfoSignals.m
similarity index 100%
rename from Watch/Bridge/TGBridgeUserInfoSignals.m
rename to Telegram/Watch/Bridge/TGBridgeUserInfoSignals.m
diff --git a/Watch/Extension/Info.plist b/Telegram/Watch/Extension/Info.plist
similarity index 100%
rename from Watch/Extension/Info.plist
rename to Telegram/Watch/Extension/Info.plist
diff --git a/Watch/Extension/Resources/File@2x.png b/Telegram/Watch/Extension/Resources/File@2x.png
similarity index 100%
rename from Watch/Extension/Resources/File@2x.png
rename to Telegram/Watch/Extension/Resources/File@2x.png
diff --git a/Watch/Extension/Resources/Home88@2x.png b/Telegram/Watch/Extension/Resources/Home88@2x.png
similarity index 100%
rename from Watch/Extension/Resources/Home88@2x.png
rename to Telegram/Watch/Extension/Resources/Home88@2x.png
diff --git a/Watch/Extension/Resources/Location@2x.png b/Telegram/Watch/Extension/Resources/Location@2x.png
similarity index 100%
rename from Watch/Extension/Resources/Location@2x.png
rename to Telegram/Watch/Extension/Resources/Location@2x.png
diff --git a/Watch/Extension/Resources/MediaAudio@2x.png b/Telegram/Watch/Extension/Resources/MediaAudio@2x.png
similarity index 100%
rename from Watch/Extension/Resources/MediaAudio@2x.png
rename to Telegram/Watch/Extension/Resources/MediaAudio@2x.png
diff --git a/Watch/Extension/Resources/MediaDocument@2x.png b/Telegram/Watch/Extension/Resources/MediaDocument@2x.png
similarity index 100%
rename from Watch/Extension/Resources/MediaDocument@2x.png
rename to Telegram/Watch/Extension/Resources/MediaDocument@2x.png
diff --git a/Watch/Extension/Resources/MediaLocation@2x.png b/Telegram/Watch/Extension/Resources/MediaLocation@2x.png
similarity index 100%
rename from Watch/Extension/Resources/MediaLocation@2x.png
rename to Telegram/Watch/Extension/Resources/MediaLocation@2x.png
diff --git a/Watch/Extension/Resources/MediaPhoto@2x.png b/Telegram/Watch/Extension/Resources/MediaPhoto@2x.png
similarity index 100%
rename from Watch/Extension/Resources/MediaPhoto@2x.png
rename to Telegram/Watch/Extension/Resources/MediaPhoto@2x.png
diff --git a/Watch/Extension/Resources/MediaVideo@2x.png b/Telegram/Watch/Extension/Resources/MediaVideo@2x.png
similarity index 100%
rename from Watch/Extension/Resources/MediaVideo@2x.png
rename to Telegram/Watch/Extension/Resources/MediaVideo@2x.png
diff --git a/Watch/Extension/Resources/SavedMessagesAvatar@2x.png b/Telegram/Watch/Extension/Resources/SavedMessagesAvatar@2x.png
similarity index 100%
rename from Watch/Extension/Resources/SavedMessagesAvatar@2x.png
rename to Telegram/Watch/Extension/Resources/SavedMessagesAvatar@2x.png
diff --git a/Watch/Extension/Resources/VerifiedList@2x.png b/Telegram/Watch/Extension/Resources/VerifiedList@2x.png
similarity index 100%
rename from Watch/Extension/Resources/VerifiedList@2x.png
rename to Telegram/Watch/Extension/Resources/VerifiedList@2x.png
diff --git a/Watch/Extension/SSignalKit/SAtomic.h b/Telegram/Watch/Extension/SSignalKit/SAtomic.h
similarity index 100%
rename from Watch/Extension/SSignalKit/SAtomic.h
rename to Telegram/Watch/Extension/SSignalKit/SAtomic.h
diff --git a/Watch/Extension/SSignalKit/SAtomic.m b/Telegram/Watch/Extension/SSignalKit/SAtomic.m
similarity index 100%
rename from Watch/Extension/SSignalKit/SAtomic.m
rename to Telegram/Watch/Extension/SSignalKit/SAtomic.m
diff --git a/Watch/Extension/SSignalKit/SBag.h b/Telegram/Watch/Extension/SSignalKit/SBag.h
similarity index 100%
rename from Watch/Extension/SSignalKit/SBag.h
rename to Telegram/Watch/Extension/SSignalKit/SBag.h
diff --git a/Watch/Extension/SSignalKit/SBag.m b/Telegram/Watch/Extension/SSignalKit/SBag.m
similarity index 100%
rename from Watch/Extension/SSignalKit/SBag.m
rename to Telegram/Watch/Extension/SSignalKit/SBag.m
diff --git a/Watch/Extension/SSignalKit/SBlockDisposable.h b/Telegram/Watch/Extension/SSignalKit/SBlockDisposable.h
similarity index 100%
rename from Watch/Extension/SSignalKit/SBlockDisposable.h
rename to Telegram/Watch/Extension/SSignalKit/SBlockDisposable.h
diff --git a/Watch/Extension/SSignalKit/SBlockDisposable.m b/Telegram/Watch/Extension/SSignalKit/SBlockDisposable.m
similarity index 100%
rename from Watch/Extension/SSignalKit/SBlockDisposable.m
rename to Telegram/Watch/Extension/SSignalKit/SBlockDisposable.m
diff --git a/Watch/Extension/SSignalKit/SDisposable.h b/Telegram/Watch/Extension/SSignalKit/SDisposable.h
similarity index 100%
rename from Watch/Extension/SSignalKit/SDisposable.h
rename to Telegram/Watch/Extension/SSignalKit/SDisposable.h
diff --git a/Watch/Extension/SSignalKit/SDisposableSet.h b/Telegram/Watch/Extension/SSignalKit/SDisposableSet.h
similarity index 100%
rename from Watch/Extension/SSignalKit/SDisposableSet.h
rename to Telegram/Watch/Extension/SSignalKit/SDisposableSet.h
diff --git a/Watch/Extension/SSignalKit/SDisposableSet.m b/Telegram/Watch/Extension/SSignalKit/SDisposableSet.m
similarity index 100%
rename from Watch/Extension/SSignalKit/SDisposableSet.m
rename to Telegram/Watch/Extension/SSignalKit/SDisposableSet.m
diff --git a/Watch/Extension/SSignalKit/SMetaDisposable.h b/Telegram/Watch/Extension/SSignalKit/SMetaDisposable.h
similarity index 100%
rename from Watch/Extension/SSignalKit/SMetaDisposable.h
rename to Telegram/Watch/Extension/SSignalKit/SMetaDisposable.h
diff --git a/Watch/Extension/SSignalKit/SMetaDisposable.m b/Telegram/Watch/Extension/SSignalKit/SMetaDisposable.m
similarity index 100%
rename from Watch/Extension/SSignalKit/SMetaDisposable.m
rename to Telegram/Watch/Extension/SSignalKit/SMetaDisposable.m
diff --git a/Watch/Extension/SSignalKit/SMulticastSignalManager.h b/Telegram/Watch/Extension/SSignalKit/SMulticastSignalManager.h
similarity index 100%
rename from Watch/Extension/SSignalKit/SMulticastSignalManager.h
rename to Telegram/Watch/Extension/SSignalKit/SMulticastSignalManager.h
diff --git a/Watch/Extension/SSignalKit/SMulticastSignalManager.m b/Telegram/Watch/Extension/SSignalKit/SMulticastSignalManager.m
similarity index 100%
rename from Watch/Extension/SSignalKit/SMulticastSignalManager.m
rename to Telegram/Watch/Extension/SSignalKit/SMulticastSignalManager.m
diff --git a/Watch/Extension/SSignalKit/SQueue.h b/Telegram/Watch/Extension/SSignalKit/SQueue.h
similarity index 100%
rename from Watch/Extension/SSignalKit/SQueue.h
rename to Telegram/Watch/Extension/SSignalKit/SQueue.h
diff --git a/Watch/Extension/SSignalKit/SQueue.m b/Telegram/Watch/Extension/SSignalKit/SQueue.m
similarity index 100%
rename from Watch/Extension/SSignalKit/SQueue.m
rename to Telegram/Watch/Extension/SSignalKit/SQueue.m
diff --git a/Watch/Extension/SSignalKit/SSignal+Accumulate.h b/Telegram/Watch/Extension/SSignalKit/SSignal+Accumulate.h
similarity index 100%
rename from Watch/Extension/SSignalKit/SSignal+Accumulate.h
rename to Telegram/Watch/Extension/SSignalKit/SSignal+Accumulate.h
diff --git a/Watch/Extension/SSignalKit/SSignal+Accumulate.m b/Telegram/Watch/Extension/SSignalKit/SSignal+Accumulate.m
similarity index 100%
rename from Watch/Extension/SSignalKit/SSignal+Accumulate.m
rename to Telegram/Watch/Extension/SSignalKit/SSignal+Accumulate.m
diff --git a/Watch/Extension/SSignalKit/SSignal+Catch.h b/Telegram/Watch/Extension/SSignalKit/SSignal+Catch.h
similarity index 100%
rename from Watch/Extension/SSignalKit/SSignal+Catch.h
rename to Telegram/Watch/Extension/SSignalKit/SSignal+Catch.h
diff --git a/Watch/Extension/SSignalKit/SSignal+Catch.m b/Telegram/Watch/Extension/SSignalKit/SSignal+Catch.m
similarity index 100%
rename from Watch/Extension/SSignalKit/SSignal+Catch.m
rename to Telegram/Watch/Extension/SSignalKit/SSignal+Catch.m
diff --git a/Watch/Extension/SSignalKit/SSignal+Combine.h b/Telegram/Watch/Extension/SSignalKit/SSignal+Combine.h
similarity index 100%
rename from Watch/Extension/SSignalKit/SSignal+Combine.h
rename to Telegram/Watch/Extension/SSignalKit/SSignal+Combine.h
diff --git a/Watch/Extension/SSignalKit/SSignal+Combine.m b/Telegram/Watch/Extension/SSignalKit/SSignal+Combine.m
similarity index 100%
rename from Watch/Extension/SSignalKit/SSignal+Combine.m
rename to Telegram/Watch/Extension/SSignalKit/SSignal+Combine.m
diff --git a/Watch/Extension/SSignalKit/SSignal+Dispatch.h b/Telegram/Watch/Extension/SSignalKit/SSignal+Dispatch.h
similarity index 100%
rename from Watch/Extension/SSignalKit/SSignal+Dispatch.h
rename to Telegram/Watch/Extension/SSignalKit/SSignal+Dispatch.h
diff --git a/Watch/Extension/SSignalKit/SSignal+Dispatch.m b/Telegram/Watch/Extension/SSignalKit/SSignal+Dispatch.m
similarity index 100%
rename from Watch/Extension/SSignalKit/SSignal+Dispatch.m
rename to Telegram/Watch/Extension/SSignalKit/SSignal+Dispatch.m
diff --git a/Watch/Extension/SSignalKit/SSignal+Mapping.h b/Telegram/Watch/Extension/SSignalKit/SSignal+Mapping.h
similarity index 100%
rename from Watch/Extension/SSignalKit/SSignal+Mapping.h
rename to Telegram/Watch/Extension/SSignalKit/SSignal+Mapping.h
diff --git a/Watch/Extension/SSignalKit/SSignal+Mapping.m b/Telegram/Watch/Extension/SSignalKit/SSignal+Mapping.m
similarity index 100%
rename from Watch/Extension/SSignalKit/SSignal+Mapping.m
rename to Telegram/Watch/Extension/SSignalKit/SSignal+Mapping.m
diff --git a/Watch/Extension/SSignalKit/SSignal+Meta.h b/Telegram/Watch/Extension/SSignalKit/SSignal+Meta.h
similarity index 100%
rename from Watch/Extension/SSignalKit/SSignal+Meta.h
rename to Telegram/Watch/Extension/SSignalKit/SSignal+Meta.h
diff --git a/Watch/Extension/SSignalKit/SSignal+Meta.m b/Telegram/Watch/Extension/SSignalKit/SSignal+Meta.m
similarity index 100%
rename from Watch/Extension/SSignalKit/SSignal+Meta.m
rename to Telegram/Watch/Extension/SSignalKit/SSignal+Meta.m
diff --git a/Watch/Extension/SSignalKit/SSignal+Multicast.h b/Telegram/Watch/Extension/SSignalKit/SSignal+Multicast.h
similarity index 100%
rename from Watch/Extension/SSignalKit/SSignal+Multicast.h
rename to Telegram/Watch/Extension/SSignalKit/SSignal+Multicast.h
diff --git a/Watch/Extension/SSignalKit/SSignal+Multicast.m b/Telegram/Watch/Extension/SSignalKit/SSignal+Multicast.m
similarity index 100%
rename from Watch/Extension/SSignalKit/SSignal+Multicast.m
rename to Telegram/Watch/Extension/SSignalKit/SSignal+Multicast.m
diff --git a/Watch/Extension/SSignalKit/SSignal+Pipe.h b/Telegram/Watch/Extension/SSignalKit/SSignal+Pipe.h
similarity index 100%
rename from Watch/Extension/SSignalKit/SSignal+Pipe.h
rename to Telegram/Watch/Extension/SSignalKit/SSignal+Pipe.h
diff --git a/Watch/Extension/SSignalKit/SSignal+Pipe.m b/Telegram/Watch/Extension/SSignalKit/SSignal+Pipe.m
similarity index 100%
rename from Watch/Extension/SSignalKit/SSignal+Pipe.m
rename to Telegram/Watch/Extension/SSignalKit/SSignal+Pipe.m
diff --git a/Watch/Extension/SSignalKit/SSignal+SideEffects.h b/Telegram/Watch/Extension/SSignalKit/SSignal+SideEffects.h
similarity index 100%
rename from Watch/Extension/SSignalKit/SSignal+SideEffects.h
rename to Telegram/Watch/Extension/SSignalKit/SSignal+SideEffects.h
diff --git a/Watch/Extension/SSignalKit/SSignal+SideEffects.m b/Telegram/Watch/Extension/SSignalKit/SSignal+SideEffects.m
similarity index 100%
rename from Watch/Extension/SSignalKit/SSignal+SideEffects.m
rename to Telegram/Watch/Extension/SSignalKit/SSignal+SideEffects.m
diff --git a/Watch/Extension/SSignalKit/SSignal+Single.h b/Telegram/Watch/Extension/SSignalKit/SSignal+Single.h
similarity index 100%
rename from Watch/Extension/SSignalKit/SSignal+Single.h
rename to Telegram/Watch/Extension/SSignalKit/SSignal+Single.h
diff --git a/Watch/Extension/SSignalKit/SSignal+Single.m b/Telegram/Watch/Extension/SSignalKit/SSignal+Single.m
similarity index 100%
rename from Watch/Extension/SSignalKit/SSignal+Single.m
rename to Telegram/Watch/Extension/SSignalKit/SSignal+Single.m
diff --git a/Watch/Extension/SSignalKit/SSignal+Take.h b/Telegram/Watch/Extension/SSignalKit/SSignal+Take.h
similarity index 100%
rename from Watch/Extension/SSignalKit/SSignal+Take.h
rename to Telegram/Watch/Extension/SSignalKit/SSignal+Take.h
diff --git a/Watch/Extension/SSignalKit/SSignal+Take.m b/Telegram/Watch/Extension/SSignalKit/SSignal+Take.m
similarity index 100%
rename from Watch/Extension/SSignalKit/SSignal+Take.m
rename to Telegram/Watch/Extension/SSignalKit/SSignal+Take.m
diff --git a/Watch/Extension/SSignalKit/SSignal+Timing.h b/Telegram/Watch/Extension/SSignalKit/SSignal+Timing.h
similarity index 100%
rename from Watch/Extension/SSignalKit/SSignal+Timing.h
rename to Telegram/Watch/Extension/SSignalKit/SSignal+Timing.h
diff --git a/Watch/Extension/SSignalKit/SSignal+Timing.m b/Telegram/Watch/Extension/SSignalKit/SSignal+Timing.m
similarity index 100%
rename from Watch/Extension/SSignalKit/SSignal+Timing.m
rename to Telegram/Watch/Extension/SSignalKit/SSignal+Timing.m
diff --git a/Watch/Extension/SSignalKit/SSignal.h b/Telegram/Watch/Extension/SSignalKit/SSignal.h
similarity index 100%
rename from Watch/Extension/SSignalKit/SSignal.h
rename to Telegram/Watch/Extension/SSignalKit/SSignal.h
diff --git a/Watch/Extension/SSignalKit/SSignal.m b/Telegram/Watch/Extension/SSignalKit/SSignal.m
similarity index 100%
rename from Watch/Extension/SSignalKit/SSignal.m
rename to Telegram/Watch/Extension/SSignalKit/SSignal.m
diff --git a/Watch/Extension/SSignalKit/SSignalKit.h b/Telegram/Watch/Extension/SSignalKit/SSignalKit.h
similarity index 100%
rename from Watch/Extension/SSignalKit/SSignalKit.h
rename to Telegram/Watch/Extension/SSignalKit/SSignalKit.h
diff --git a/Watch/Extension/SSignalKit/SSubscriber.h b/Telegram/Watch/Extension/SSignalKit/SSubscriber.h
similarity index 100%
rename from Watch/Extension/SSignalKit/SSubscriber.h
rename to Telegram/Watch/Extension/SSignalKit/SSubscriber.h
diff --git a/Watch/Extension/SSignalKit/SSubscriber.m b/Telegram/Watch/Extension/SSignalKit/SSubscriber.m
similarity index 100%
rename from Watch/Extension/SSignalKit/SSubscriber.m
rename to Telegram/Watch/Extension/SSignalKit/SSubscriber.m
diff --git a/Watch/Extension/SSignalKit/SThreadPool.h b/Telegram/Watch/Extension/SSignalKit/SThreadPool.h
similarity index 100%
rename from Watch/Extension/SSignalKit/SThreadPool.h
rename to Telegram/Watch/Extension/SSignalKit/SThreadPool.h
diff --git a/Watch/Extension/SSignalKit/SThreadPool.m b/Telegram/Watch/Extension/SSignalKit/SThreadPool.m
similarity index 100%
rename from Watch/Extension/SSignalKit/SThreadPool.m
rename to Telegram/Watch/Extension/SSignalKit/SThreadPool.m
diff --git a/Watch/Extension/SSignalKit/SThreadPoolQueue.h b/Telegram/Watch/Extension/SSignalKit/SThreadPoolQueue.h
similarity index 100%
rename from Watch/Extension/SSignalKit/SThreadPoolQueue.h
rename to Telegram/Watch/Extension/SSignalKit/SThreadPoolQueue.h
diff --git a/Watch/Extension/SSignalKit/SThreadPoolQueue.m b/Telegram/Watch/Extension/SSignalKit/SThreadPoolQueue.m
similarity index 100%
rename from Watch/Extension/SSignalKit/SThreadPoolQueue.m
rename to Telegram/Watch/Extension/SSignalKit/SThreadPoolQueue.m
diff --git a/Watch/Extension/SSignalKit/SThreadPoolTask.h b/Telegram/Watch/Extension/SSignalKit/SThreadPoolTask.h
similarity index 100%
rename from Watch/Extension/SSignalKit/SThreadPoolTask.h
rename to Telegram/Watch/Extension/SSignalKit/SThreadPoolTask.h
diff --git a/Watch/Extension/SSignalKit/SThreadPoolTask.m b/Telegram/Watch/Extension/SSignalKit/SThreadPoolTask.m
similarity index 100%
rename from Watch/Extension/SSignalKit/SThreadPoolTask.m
rename to Telegram/Watch/Extension/SSignalKit/SThreadPoolTask.m
diff --git a/Watch/Extension/SSignalKit/STimer.h b/Telegram/Watch/Extension/SSignalKit/STimer.h
similarity index 100%
rename from Watch/Extension/SSignalKit/STimer.h
rename to Telegram/Watch/Extension/SSignalKit/STimer.h
diff --git a/Watch/Extension/SSignalKit/STimer.m b/Telegram/Watch/Extension/SSignalKit/STimer.m
similarity index 100%
rename from Watch/Extension/SSignalKit/STimer.m
rename to Telegram/Watch/Extension/SSignalKit/STimer.m
diff --git a/Watch/Extension/SSignalKit/SVariable.h b/Telegram/Watch/Extension/SSignalKit/SVariable.h
similarity index 100%
rename from Watch/Extension/SSignalKit/SVariable.h
rename to Telegram/Watch/Extension/SSignalKit/SVariable.h
diff --git a/Watch/Extension/SSignalKit/SVariable.m b/Telegram/Watch/Extension/SSignalKit/SVariable.m
similarity index 100%
rename from Watch/Extension/SSignalKit/SVariable.m
rename to Telegram/Watch/Extension/SSignalKit/SVariable.m
diff --git a/Watch/Extension/TGAudioMicAlertController.h b/Telegram/Watch/Extension/TGAudioMicAlertController.h
similarity index 100%
rename from Watch/Extension/TGAudioMicAlertController.h
rename to Telegram/Watch/Extension/TGAudioMicAlertController.h
diff --git a/Watch/Extension/TGAudioMicAlertController.m b/Telegram/Watch/Extension/TGAudioMicAlertController.m
similarity index 100%
rename from Watch/Extension/TGAudioMicAlertController.m
rename to Telegram/Watch/Extension/TGAudioMicAlertController.m
diff --git a/Watch/Extension/TGAvatarViewModel.h b/Telegram/Watch/Extension/TGAvatarViewModel.h
similarity index 100%
rename from Watch/Extension/TGAvatarViewModel.h
rename to Telegram/Watch/Extension/TGAvatarViewModel.h
diff --git a/Watch/Extension/TGAvatarViewModel.m b/Telegram/Watch/Extension/TGAvatarViewModel.m
similarity index 100%
rename from Watch/Extension/TGAvatarViewModel.m
rename to Telegram/Watch/Extension/TGAvatarViewModel.m
diff --git a/Watch/Extension/TGBotCommandController.h b/Telegram/Watch/Extension/TGBotCommandController.h
similarity index 100%
rename from Watch/Extension/TGBotCommandController.h
rename to Telegram/Watch/Extension/TGBotCommandController.h
diff --git a/Watch/Extension/TGBotCommandController.m b/Telegram/Watch/Extension/TGBotCommandController.m
similarity index 100%
rename from Watch/Extension/TGBotCommandController.m
rename to Telegram/Watch/Extension/TGBotCommandController.m
diff --git a/Watch/Extension/TGBotKeyboardButtonController.h b/Telegram/Watch/Extension/TGBotKeyboardButtonController.h
similarity index 100%
rename from Watch/Extension/TGBotKeyboardButtonController.h
rename to Telegram/Watch/Extension/TGBotKeyboardButtonController.h
diff --git a/Watch/Extension/TGBotKeyboardButtonController.m b/Telegram/Watch/Extension/TGBotKeyboardButtonController.m
similarity index 100%
rename from Watch/Extension/TGBotKeyboardButtonController.m
rename to Telegram/Watch/Extension/TGBotKeyboardButtonController.m
diff --git a/Watch/Extension/TGBotKeyboardController.h b/Telegram/Watch/Extension/TGBotKeyboardController.h
similarity index 100%
rename from Watch/Extension/TGBotKeyboardController.h
rename to Telegram/Watch/Extension/TGBotKeyboardController.h
diff --git a/Watch/Extension/TGBotKeyboardController.m b/Telegram/Watch/Extension/TGBotKeyboardController.m
similarity index 100%
rename from Watch/Extension/TGBotKeyboardController.m
rename to Telegram/Watch/Extension/TGBotKeyboardController.m
diff --git a/Watch/Extension/TGBridgeUserCache.h b/Telegram/Watch/Extension/TGBridgeUserCache.h
similarity index 100%
rename from Watch/Extension/TGBridgeUserCache.h
rename to Telegram/Watch/Extension/TGBridgeUserCache.h
diff --git a/Watch/Extension/TGBridgeUserCache.m b/Telegram/Watch/Extension/TGBridgeUserCache.m
similarity index 100%
rename from Watch/Extension/TGBridgeUserCache.m
rename to Telegram/Watch/Extension/TGBridgeUserCache.m
diff --git a/Watch/Extension/TGChatInfo.h b/Telegram/Watch/Extension/TGChatInfo.h
similarity index 100%
rename from Watch/Extension/TGChatInfo.h
rename to Telegram/Watch/Extension/TGChatInfo.h
diff --git a/Watch/Extension/TGChatInfo.m b/Telegram/Watch/Extension/TGChatInfo.m
similarity index 100%
rename from Watch/Extension/TGChatInfo.m
rename to Telegram/Watch/Extension/TGChatInfo.m
diff --git a/Watch/Extension/TGChatTimestamp.h b/Telegram/Watch/Extension/TGChatTimestamp.h
similarity index 100%
rename from Watch/Extension/TGChatTimestamp.h
rename to Telegram/Watch/Extension/TGChatTimestamp.h
diff --git a/Watch/Extension/TGChatTimestamp.m b/Telegram/Watch/Extension/TGChatTimestamp.m
similarity index 100%
rename from Watch/Extension/TGChatTimestamp.m
rename to Telegram/Watch/Extension/TGChatTimestamp.m
diff --git a/Watch/Extension/TGComplicationController.h b/Telegram/Watch/Extension/TGComplicationController.h
similarity index 100%
rename from Watch/Extension/TGComplicationController.h
rename to Telegram/Watch/Extension/TGComplicationController.h
diff --git a/Watch/Extension/TGComplicationController.m b/Telegram/Watch/Extension/TGComplicationController.m
similarity index 100%
rename from Watch/Extension/TGComplicationController.m
rename to Telegram/Watch/Extension/TGComplicationController.m
diff --git a/Watch/Extension/TGComposeController.h b/Telegram/Watch/Extension/TGComposeController.h
similarity index 100%
rename from Watch/Extension/TGComposeController.h
rename to Telegram/Watch/Extension/TGComposeController.h
diff --git a/Watch/Extension/TGComposeController.m b/Telegram/Watch/Extension/TGComposeController.m
similarity index 100%
rename from Watch/Extension/TGComposeController.m
rename to Telegram/Watch/Extension/TGComposeController.m
diff --git a/Watch/Extension/TGContactsController.h b/Telegram/Watch/Extension/TGContactsController.h
similarity index 100%
rename from Watch/Extension/TGContactsController.h
rename to Telegram/Watch/Extension/TGContactsController.h
diff --git a/Watch/Extension/TGContactsController.m b/Telegram/Watch/Extension/TGContactsController.m
similarity index 100%
rename from Watch/Extension/TGContactsController.m
rename to Telegram/Watch/Extension/TGContactsController.m
diff --git a/Watch/Extension/TGConversationFooterController.h b/Telegram/Watch/Extension/TGConversationFooterController.h
similarity index 100%
rename from Watch/Extension/TGConversationFooterController.h
rename to Telegram/Watch/Extension/TGConversationFooterController.h
diff --git a/Watch/Extension/TGConversationFooterController.m b/Telegram/Watch/Extension/TGConversationFooterController.m
similarity index 100%
rename from Watch/Extension/TGConversationFooterController.m
rename to Telegram/Watch/Extension/TGConversationFooterController.m
diff --git a/Watch/Extension/TGDateUtils.h b/Telegram/Watch/Extension/TGDateUtils.h
similarity index 100%
rename from Watch/Extension/TGDateUtils.h
rename to Telegram/Watch/Extension/TGDateUtils.h
diff --git a/Watch/Extension/TGDateUtils.m b/Telegram/Watch/Extension/TGDateUtils.m
similarity index 100%
rename from Watch/Extension/TGDateUtils.m
rename to Telegram/Watch/Extension/TGDateUtils.m
diff --git a/Watch/Extension/TGExtensionDelegate.h b/Telegram/Watch/Extension/TGExtensionDelegate.h
similarity index 100%
rename from Watch/Extension/TGExtensionDelegate.h
rename to Telegram/Watch/Extension/TGExtensionDelegate.h
diff --git a/Watch/Extension/TGExtensionDelegate.m b/Telegram/Watch/Extension/TGExtensionDelegate.m
similarity index 100%
rename from Watch/Extension/TGExtensionDelegate.m
rename to Telegram/Watch/Extension/TGExtensionDelegate.m
diff --git a/Watch/Extension/TGFileCache.h b/Telegram/Watch/Extension/TGFileCache.h
similarity index 100%
rename from Watch/Extension/TGFileCache.h
rename to Telegram/Watch/Extension/TGFileCache.h
diff --git a/Watch/Extension/TGFileCache.m b/Telegram/Watch/Extension/TGFileCache.m
similarity index 100%
rename from Watch/Extension/TGFileCache.m
rename to Telegram/Watch/Extension/TGFileCache.m
diff --git a/Watch/Extension/TGGeometry.h b/Telegram/Watch/Extension/TGGeometry.h
similarity index 100%
rename from Watch/Extension/TGGeometry.h
rename to Telegram/Watch/Extension/TGGeometry.h
diff --git a/Watch/Extension/TGGeometry.m b/Telegram/Watch/Extension/TGGeometry.m
similarity index 100%
rename from Watch/Extension/TGGeometry.m
rename to Telegram/Watch/Extension/TGGeometry.m
diff --git a/Watch/Extension/TGGroupInfoController.h b/Telegram/Watch/Extension/TGGroupInfoController.h
similarity index 100%
rename from Watch/Extension/TGGroupInfoController.h
rename to Telegram/Watch/Extension/TGGroupInfoController.h
diff --git a/Watch/Extension/TGGroupInfoController.m b/Telegram/Watch/Extension/TGGroupInfoController.m
similarity index 100%
rename from Watch/Extension/TGGroupInfoController.m
rename to Telegram/Watch/Extension/TGGroupInfoController.m
diff --git a/Watch/Extension/TGGroupInfoFooterController.h b/Telegram/Watch/Extension/TGGroupInfoFooterController.h
similarity index 100%
rename from Watch/Extension/TGGroupInfoFooterController.h
rename to Telegram/Watch/Extension/TGGroupInfoFooterController.h
diff --git a/Watch/Extension/TGGroupInfoFooterController.m b/Telegram/Watch/Extension/TGGroupInfoFooterController.m
similarity index 100%
rename from Watch/Extension/TGGroupInfoFooterController.m
rename to Telegram/Watch/Extension/TGGroupInfoFooterController.m
diff --git a/Watch/Extension/TGGroupInfoHeaderController.h b/Telegram/Watch/Extension/TGGroupInfoHeaderController.h
similarity index 100%
rename from Watch/Extension/TGGroupInfoHeaderController.h
rename to Telegram/Watch/Extension/TGGroupInfoHeaderController.h
diff --git a/Watch/Extension/TGGroupInfoHeaderController.m b/Telegram/Watch/Extension/TGGroupInfoHeaderController.m
similarity index 100%
rename from Watch/Extension/TGGroupInfoHeaderController.m
rename to Telegram/Watch/Extension/TGGroupInfoHeaderController.m
diff --git a/Watch/Extension/TGIndexPath.h b/Telegram/Watch/Extension/TGIndexPath.h
similarity index 100%
rename from Watch/Extension/TGIndexPath.h
rename to Telegram/Watch/Extension/TGIndexPath.h
diff --git a/Watch/Extension/TGIndexPath.m b/Telegram/Watch/Extension/TGIndexPath.m
similarity index 100%
rename from Watch/Extension/TGIndexPath.m
rename to Telegram/Watch/Extension/TGIndexPath.m
diff --git a/Watch/Extension/TGInputController.h b/Telegram/Watch/Extension/TGInputController.h
similarity index 100%
rename from Watch/Extension/TGInputController.h
rename to Telegram/Watch/Extension/TGInputController.h
diff --git a/Watch/Extension/TGInputController.m b/Telegram/Watch/Extension/TGInputController.m
similarity index 100%
rename from Watch/Extension/TGInputController.m
rename to Telegram/Watch/Extension/TGInputController.m
diff --git a/Watch/Extension/TGInterfaceController.h b/Telegram/Watch/Extension/TGInterfaceController.h
similarity index 100%
rename from Watch/Extension/TGInterfaceController.h
rename to Telegram/Watch/Extension/TGInterfaceController.h
diff --git a/Watch/Extension/TGInterfaceController.m b/Telegram/Watch/Extension/TGInterfaceController.m
similarity index 100%
rename from Watch/Extension/TGInterfaceController.m
rename to Telegram/Watch/Extension/TGInterfaceController.m
diff --git a/Watch/Extension/TGInterfaceMenu.h b/Telegram/Watch/Extension/TGInterfaceMenu.h
similarity index 100%
rename from Watch/Extension/TGInterfaceMenu.h
rename to Telegram/Watch/Extension/TGInterfaceMenu.h
diff --git a/Watch/Extension/TGInterfaceMenu.m b/Telegram/Watch/Extension/TGInterfaceMenu.m
similarity index 100%
rename from Watch/Extension/TGInterfaceMenu.m
rename to Telegram/Watch/Extension/TGInterfaceMenu.m
diff --git a/Watch/Extension/TGLocationController.h b/Telegram/Watch/Extension/TGLocationController.h
similarity index 100%
rename from Watch/Extension/TGLocationController.h
rename to Telegram/Watch/Extension/TGLocationController.h
diff --git a/Watch/Extension/TGLocationController.m b/Telegram/Watch/Extension/TGLocationController.m
similarity index 100%
rename from Watch/Extension/TGLocationController.m
rename to Telegram/Watch/Extension/TGLocationController.m
diff --git a/Watch/Extension/TGLocationMapHeaderController.h b/Telegram/Watch/Extension/TGLocationMapHeaderController.h
similarity index 100%
rename from Watch/Extension/TGLocationMapHeaderController.h
rename to Telegram/Watch/Extension/TGLocationMapHeaderController.h
diff --git a/Watch/Extension/TGLocationMapHeaderController.m b/Telegram/Watch/Extension/TGLocationMapHeaderController.m
similarity index 100%
rename from Watch/Extension/TGLocationMapHeaderController.m
rename to Telegram/Watch/Extension/TGLocationMapHeaderController.m
diff --git a/Watch/Extension/TGLocationUtils.h b/Telegram/Watch/Extension/TGLocationUtils.h
similarity index 100%
rename from Watch/Extension/TGLocationUtils.h
rename to Telegram/Watch/Extension/TGLocationUtils.h
diff --git a/Watch/Extension/TGLocationUtils.m b/Telegram/Watch/Extension/TGLocationUtils.m
similarity index 100%
rename from Watch/Extension/TGLocationUtils.m
rename to Telegram/Watch/Extension/TGLocationUtils.m
diff --git a/Watch/Extension/TGLocationVenueRowController.h b/Telegram/Watch/Extension/TGLocationVenueRowController.h
similarity index 100%
rename from Watch/Extension/TGLocationVenueRowController.h
rename to Telegram/Watch/Extension/TGLocationVenueRowController.h
diff --git a/Watch/Extension/TGLocationVenueRowController.m b/Telegram/Watch/Extension/TGLocationVenueRowController.m
similarity index 100%
rename from Watch/Extension/TGLocationVenueRowController.m
rename to Telegram/Watch/Extension/TGLocationVenueRowController.m
diff --git a/Watch/Extension/TGMessageViewController.h b/Telegram/Watch/Extension/TGMessageViewController.h
similarity index 100%
rename from Watch/Extension/TGMessageViewController.h
rename to Telegram/Watch/Extension/TGMessageViewController.h
diff --git a/Watch/Extension/TGMessageViewController.m b/Telegram/Watch/Extension/TGMessageViewController.m
similarity index 100%
rename from Watch/Extension/TGMessageViewController.m
rename to Telegram/Watch/Extension/TGMessageViewController.m
diff --git a/Watch/Extension/TGMessageViewFooterController.h b/Telegram/Watch/Extension/TGMessageViewFooterController.h
similarity index 100%
rename from Watch/Extension/TGMessageViewFooterController.h
rename to Telegram/Watch/Extension/TGMessageViewFooterController.h
diff --git a/Watch/Extension/TGMessageViewFooterController.m b/Telegram/Watch/Extension/TGMessageViewFooterController.m
similarity index 100%
rename from Watch/Extension/TGMessageViewFooterController.m
rename to Telegram/Watch/Extension/TGMessageViewFooterController.m
diff --git a/Watch/Extension/TGMessageViewMessageRowController.h b/Telegram/Watch/Extension/TGMessageViewMessageRowController.h
similarity index 100%
rename from Watch/Extension/TGMessageViewMessageRowController.h
rename to Telegram/Watch/Extension/TGMessageViewMessageRowController.h
diff --git a/Watch/Extension/TGMessageViewMessageRowController.m b/Telegram/Watch/Extension/TGMessageViewMessageRowController.m
similarity index 100%
rename from Watch/Extension/TGMessageViewMessageRowController.m
rename to Telegram/Watch/Extension/TGMessageViewMessageRowController.m
diff --git a/Watch/Extension/TGMessageViewModel.h b/Telegram/Watch/Extension/TGMessageViewModel.h
similarity index 100%
rename from Watch/Extension/TGMessageViewModel.h
rename to Telegram/Watch/Extension/TGMessageViewModel.h
diff --git a/Watch/Extension/TGMessageViewModel.m b/Telegram/Watch/Extension/TGMessageViewModel.m
similarity index 100%
rename from Watch/Extension/TGMessageViewModel.m
rename to Telegram/Watch/Extension/TGMessageViewModel.m
diff --git a/Watch/Extension/TGMessageViewWebPageRowController.h b/Telegram/Watch/Extension/TGMessageViewWebPageRowController.h
similarity index 100%
rename from Watch/Extension/TGMessageViewWebPageRowController.h
rename to Telegram/Watch/Extension/TGMessageViewWebPageRowController.h
diff --git a/Watch/Extension/TGMessageViewWebPageRowController.m b/Telegram/Watch/Extension/TGMessageViewWebPageRowController.m
similarity index 100%
rename from Watch/Extension/TGMessageViewWebPageRowController.m
rename to Telegram/Watch/Extension/TGMessageViewWebPageRowController.m
diff --git a/Watch/Extension/TGNeoAttachmentViewModel.h b/Telegram/Watch/Extension/TGNeoAttachmentViewModel.h
similarity index 100%
rename from Watch/Extension/TGNeoAttachmentViewModel.h
rename to Telegram/Watch/Extension/TGNeoAttachmentViewModel.h
diff --git a/Watch/Extension/TGNeoAttachmentViewModel.m b/Telegram/Watch/Extension/TGNeoAttachmentViewModel.m
similarity index 100%
rename from Watch/Extension/TGNeoAttachmentViewModel.m
rename to Telegram/Watch/Extension/TGNeoAttachmentViewModel.m
diff --git a/Watch/Extension/TGNeoAudioMessageViewModel.h b/Telegram/Watch/Extension/TGNeoAudioMessageViewModel.h
similarity index 100%
rename from Watch/Extension/TGNeoAudioMessageViewModel.h
rename to Telegram/Watch/Extension/TGNeoAudioMessageViewModel.h
diff --git a/Watch/Extension/TGNeoAudioMessageViewModel.m b/Telegram/Watch/Extension/TGNeoAudioMessageViewModel.m
similarity index 100%
rename from Watch/Extension/TGNeoAudioMessageViewModel.m
rename to Telegram/Watch/Extension/TGNeoAudioMessageViewModel.m
diff --git a/Watch/Extension/TGNeoBackgroundViewModel.h b/Telegram/Watch/Extension/TGNeoBackgroundViewModel.h
similarity index 100%
rename from Watch/Extension/TGNeoBackgroundViewModel.h
rename to Telegram/Watch/Extension/TGNeoBackgroundViewModel.h
diff --git a/Watch/Extension/TGNeoBackgroundViewModel.m b/Telegram/Watch/Extension/TGNeoBackgroundViewModel.m
similarity index 100%
rename from Watch/Extension/TGNeoBackgroundViewModel.m
rename to Telegram/Watch/Extension/TGNeoBackgroundViewModel.m
diff --git a/Watch/Extension/TGNeoBubbleMessageViewModel.h b/Telegram/Watch/Extension/TGNeoBubbleMessageViewModel.h
similarity index 100%
rename from Watch/Extension/TGNeoBubbleMessageViewModel.h
rename to Telegram/Watch/Extension/TGNeoBubbleMessageViewModel.h
diff --git a/Watch/Extension/TGNeoBubbleMessageViewModel.m b/Telegram/Watch/Extension/TGNeoBubbleMessageViewModel.m
similarity index 100%
rename from Watch/Extension/TGNeoBubbleMessageViewModel.m
rename to Telegram/Watch/Extension/TGNeoBubbleMessageViewModel.m
diff --git a/Watch/Extension/TGNeoChatRowController.h b/Telegram/Watch/Extension/TGNeoChatRowController.h
similarity index 100%
rename from Watch/Extension/TGNeoChatRowController.h
rename to Telegram/Watch/Extension/TGNeoChatRowController.h
diff --git a/Watch/Extension/TGNeoChatRowController.m b/Telegram/Watch/Extension/TGNeoChatRowController.m
similarity index 100%
rename from Watch/Extension/TGNeoChatRowController.m
rename to Telegram/Watch/Extension/TGNeoChatRowController.m
diff --git a/Watch/Extension/TGNeoChatViewModel.h b/Telegram/Watch/Extension/TGNeoChatViewModel.h
similarity index 100%
rename from Watch/Extension/TGNeoChatViewModel.h
rename to Telegram/Watch/Extension/TGNeoChatViewModel.h
diff --git a/Watch/Extension/TGNeoChatViewModel.m b/Telegram/Watch/Extension/TGNeoChatViewModel.m
similarity index 100%
rename from Watch/Extension/TGNeoChatViewModel.m
rename to Telegram/Watch/Extension/TGNeoChatViewModel.m
diff --git a/Watch/Extension/TGNeoChatsController.h b/Telegram/Watch/Extension/TGNeoChatsController.h
similarity index 100%
rename from Watch/Extension/TGNeoChatsController.h
rename to Telegram/Watch/Extension/TGNeoChatsController.h
diff --git a/Watch/Extension/TGNeoChatsController.m b/Telegram/Watch/Extension/TGNeoChatsController.m
similarity index 100%
rename from Watch/Extension/TGNeoChatsController.m
rename to Telegram/Watch/Extension/TGNeoChatsController.m
diff --git a/Watch/Extension/TGNeoContactMessageViewModel.h b/Telegram/Watch/Extension/TGNeoContactMessageViewModel.h
similarity index 100%
rename from Watch/Extension/TGNeoContactMessageViewModel.h
rename to Telegram/Watch/Extension/TGNeoContactMessageViewModel.h
diff --git a/Watch/Extension/TGNeoContactMessageViewModel.m b/Telegram/Watch/Extension/TGNeoContactMessageViewModel.m
similarity index 100%
rename from Watch/Extension/TGNeoContactMessageViewModel.m
rename to Telegram/Watch/Extension/TGNeoContactMessageViewModel.m
diff --git a/Watch/Extension/TGNeoConversationController.h b/Telegram/Watch/Extension/TGNeoConversationController.h
similarity index 100%
rename from Watch/Extension/TGNeoConversationController.h
rename to Telegram/Watch/Extension/TGNeoConversationController.h
diff --git a/Watch/Extension/TGNeoConversationController.m b/Telegram/Watch/Extension/TGNeoConversationController.m
similarity index 100%
rename from Watch/Extension/TGNeoConversationController.m
rename to Telegram/Watch/Extension/TGNeoConversationController.m
diff --git a/Watch/Extension/TGNeoConversationMediaRowController.h b/Telegram/Watch/Extension/TGNeoConversationMediaRowController.h
similarity index 100%
rename from Watch/Extension/TGNeoConversationMediaRowController.h
rename to Telegram/Watch/Extension/TGNeoConversationMediaRowController.h
diff --git a/Watch/Extension/TGNeoConversationMediaRowController.m b/Telegram/Watch/Extension/TGNeoConversationMediaRowController.m
similarity index 100%
rename from Watch/Extension/TGNeoConversationMediaRowController.m
rename to Telegram/Watch/Extension/TGNeoConversationMediaRowController.m
diff --git a/Watch/Extension/TGNeoConversationRowController.h b/Telegram/Watch/Extension/TGNeoConversationRowController.h
similarity index 100%
rename from Watch/Extension/TGNeoConversationRowController.h
rename to Telegram/Watch/Extension/TGNeoConversationRowController.h
diff --git a/Watch/Extension/TGNeoConversationRowController.m b/Telegram/Watch/Extension/TGNeoConversationRowController.m
similarity index 100%
rename from Watch/Extension/TGNeoConversationRowController.m
rename to Telegram/Watch/Extension/TGNeoConversationRowController.m
diff --git a/Watch/Extension/TGNeoConversationSimpleRowController.h b/Telegram/Watch/Extension/TGNeoConversationSimpleRowController.h
similarity index 100%
rename from Watch/Extension/TGNeoConversationSimpleRowController.h
rename to Telegram/Watch/Extension/TGNeoConversationSimpleRowController.h
diff --git a/Watch/Extension/TGNeoConversationSimpleRowController.m b/Telegram/Watch/Extension/TGNeoConversationSimpleRowController.m
similarity index 100%
rename from Watch/Extension/TGNeoConversationSimpleRowController.m
rename to Telegram/Watch/Extension/TGNeoConversationSimpleRowController.m
diff --git a/Watch/Extension/TGNeoConversationStaticRowController.h b/Telegram/Watch/Extension/TGNeoConversationStaticRowController.h
similarity index 100%
rename from Watch/Extension/TGNeoConversationStaticRowController.h
rename to Telegram/Watch/Extension/TGNeoConversationStaticRowController.h
diff --git a/Watch/Extension/TGNeoConversationStaticRowController.m b/Telegram/Watch/Extension/TGNeoConversationStaticRowController.m
similarity index 100%
rename from Watch/Extension/TGNeoConversationStaticRowController.m
rename to Telegram/Watch/Extension/TGNeoConversationStaticRowController.m
diff --git a/Watch/Extension/TGNeoConversationTimeRowController.h b/Telegram/Watch/Extension/TGNeoConversationTimeRowController.h
similarity index 100%
rename from Watch/Extension/TGNeoConversationTimeRowController.h
rename to Telegram/Watch/Extension/TGNeoConversationTimeRowController.h
diff --git a/Watch/Extension/TGNeoConversationTimeRowController.m b/Telegram/Watch/Extension/TGNeoConversationTimeRowController.m
similarity index 100%
rename from Watch/Extension/TGNeoConversationTimeRowController.m
rename to Telegram/Watch/Extension/TGNeoConversationTimeRowController.m
diff --git a/Watch/Extension/TGNeoFileMessageViewModel.h b/Telegram/Watch/Extension/TGNeoFileMessageViewModel.h
similarity index 100%
rename from Watch/Extension/TGNeoFileMessageViewModel.h
rename to Telegram/Watch/Extension/TGNeoFileMessageViewModel.h
diff --git a/Watch/Extension/TGNeoFileMessageViewModel.m b/Telegram/Watch/Extension/TGNeoFileMessageViewModel.m
similarity index 100%
rename from Watch/Extension/TGNeoFileMessageViewModel.m
rename to Telegram/Watch/Extension/TGNeoFileMessageViewModel.m
diff --git a/Watch/Extension/TGNeoForwardHeaderViewModel.h b/Telegram/Watch/Extension/TGNeoForwardHeaderViewModel.h
similarity index 100%
rename from Watch/Extension/TGNeoForwardHeaderViewModel.h
rename to Telegram/Watch/Extension/TGNeoForwardHeaderViewModel.h
diff --git a/Watch/Extension/TGNeoForwardHeaderViewModel.m b/Telegram/Watch/Extension/TGNeoForwardHeaderViewModel.m
similarity index 100%
rename from Watch/Extension/TGNeoForwardHeaderViewModel.m
rename to Telegram/Watch/Extension/TGNeoForwardHeaderViewModel.m
diff --git a/Watch/Extension/TGNeoImageViewModel.h b/Telegram/Watch/Extension/TGNeoImageViewModel.h
similarity index 100%
rename from Watch/Extension/TGNeoImageViewModel.h
rename to Telegram/Watch/Extension/TGNeoImageViewModel.h
diff --git a/Watch/Extension/TGNeoImageViewModel.m b/Telegram/Watch/Extension/TGNeoImageViewModel.m
similarity index 100%
rename from Watch/Extension/TGNeoImageViewModel.m
rename to Telegram/Watch/Extension/TGNeoImageViewModel.m
diff --git a/Watch/Extension/TGNeoLabelViewModel.h b/Telegram/Watch/Extension/TGNeoLabelViewModel.h
similarity index 100%
rename from Watch/Extension/TGNeoLabelViewModel.h
rename to Telegram/Watch/Extension/TGNeoLabelViewModel.h
diff --git a/Watch/Extension/TGNeoLabelViewModel.m b/Telegram/Watch/Extension/TGNeoLabelViewModel.m
similarity index 100%
rename from Watch/Extension/TGNeoLabelViewModel.m
rename to Telegram/Watch/Extension/TGNeoLabelViewModel.m
diff --git a/Watch/Extension/TGNeoMediaMessageViewModel.h b/Telegram/Watch/Extension/TGNeoMediaMessageViewModel.h
similarity index 100%
rename from Watch/Extension/TGNeoMediaMessageViewModel.h
rename to Telegram/Watch/Extension/TGNeoMediaMessageViewModel.h
diff --git a/Watch/Extension/TGNeoMediaMessageViewModel.m b/Telegram/Watch/Extension/TGNeoMediaMessageViewModel.m
similarity index 100%
rename from Watch/Extension/TGNeoMediaMessageViewModel.m
rename to Telegram/Watch/Extension/TGNeoMediaMessageViewModel.m
diff --git a/Watch/Extension/TGNeoMessageViewModel.h b/Telegram/Watch/Extension/TGNeoMessageViewModel.h
similarity index 100%
rename from Watch/Extension/TGNeoMessageViewModel.h
rename to Telegram/Watch/Extension/TGNeoMessageViewModel.h
diff --git a/Watch/Extension/TGNeoMessageViewModel.m b/Telegram/Watch/Extension/TGNeoMessageViewModel.m
similarity index 100%
rename from Watch/Extension/TGNeoMessageViewModel.m
rename to Telegram/Watch/Extension/TGNeoMessageViewModel.m
diff --git a/Watch/Extension/TGNeoRenderableViewModel.h b/Telegram/Watch/Extension/TGNeoRenderableViewModel.h
similarity index 100%
rename from Watch/Extension/TGNeoRenderableViewModel.h
rename to Telegram/Watch/Extension/TGNeoRenderableViewModel.h
diff --git a/Watch/Extension/TGNeoRenderableViewModel.m b/Telegram/Watch/Extension/TGNeoRenderableViewModel.m
similarity index 100%
rename from Watch/Extension/TGNeoRenderableViewModel.m
rename to Telegram/Watch/Extension/TGNeoRenderableViewModel.m
diff --git a/Watch/Extension/TGNeoReplyHeaderViewModel.h b/Telegram/Watch/Extension/TGNeoReplyHeaderViewModel.h
similarity index 100%
rename from Watch/Extension/TGNeoReplyHeaderViewModel.h
rename to Telegram/Watch/Extension/TGNeoReplyHeaderViewModel.h
diff --git a/Watch/Extension/TGNeoReplyHeaderViewModel.m b/Telegram/Watch/Extension/TGNeoReplyHeaderViewModel.m
similarity index 100%
rename from Watch/Extension/TGNeoReplyHeaderViewModel.m
rename to Telegram/Watch/Extension/TGNeoReplyHeaderViewModel.m
diff --git a/Watch/Extension/TGNeoRowController.h b/Telegram/Watch/Extension/TGNeoRowController.h
similarity index 100%
rename from Watch/Extension/TGNeoRowController.h
rename to Telegram/Watch/Extension/TGNeoRowController.h
diff --git a/Watch/Extension/TGNeoRowController.m b/Telegram/Watch/Extension/TGNeoRowController.m
similarity index 100%
rename from Watch/Extension/TGNeoRowController.m
rename to Telegram/Watch/Extension/TGNeoRowController.m
diff --git a/Watch/Extension/TGNeoServiceMessageViewModel.h b/Telegram/Watch/Extension/TGNeoServiceMessageViewModel.h
similarity index 100%
rename from Watch/Extension/TGNeoServiceMessageViewModel.h
rename to Telegram/Watch/Extension/TGNeoServiceMessageViewModel.h
diff --git a/Watch/Extension/TGNeoServiceMessageViewModel.m b/Telegram/Watch/Extension/TGNeoServiceMessageViewModel.m
similarity index 100%
rename from Watch/Extension/TGNeoServiceMessageViewModel.m
rename to Telegram/Watch/Extension/TGNeoServiceMessageViewModel.m
diff --git a/Watch/Extension/TGNeoSmiliesMessageViewModel.h b/Telegram/Watch/Extension/TGNeoSmiliesMessageViewModel.h
similarity index 100%
rename from Watch/Extension/TGNeoSmiliesMessageViewModel.h
rename to Telegram/Watch/Extension/TGNeoSmiliesMessageViewModel.h
diff --git a/Watch/Extension/TGNeoSmiliesMessageViewModel.m b/Telegram/Watch/Extension/TGNeoSmiliesMessageViewModel.m
similarity index 100%
rename from Watch/Extension/TGNeoSmiliesMessageViewModel.m
rename to Telegram/Watch/Extension/TGNeoSmiliesMessageViewModel.m
diff --git a/Watch/Extension/TGNeoStickerMessageViewModel.h b/Telegram/Watch/Extension/TGNeoStickerMessageViewModel.h
similarity index 100%
rename from Watch/Extension/TGNeoStickerMessageViewModel.h
rename to Telegram/Watch/Extension/TGNeoStickerMessageViewModel.h
diff --git a/Watch/Extension/TGNeoStickerMessageViewModel.m b/Telegram/Watch/Extension/TGNeoStickerMessageViewModel.m
similarity index 100%
rename from Watch/Extension/TGNeoStickerMessageViewModel.m
rename to Telegram/Watch/Extension/TGNeoStickerMessageViewModel.m
diff --git a/Watch/Extension/TGNeoTextMessageViewModel.h b/Telegram/Watch/Extension/TGNeoTextMessageViewModel.h
similarity index 100%
rename from Watch/Extension/TGNeoTextMessageViewModel.h
rename to Telegram/Watch/Extension/TGNeoTextMessageViewModel.h
diff --git a/Watch/Extension/TGNeoTextMessageViewModel.m b/Telegram/Watch/Extension/TGNeoTextMessageViewModel.m
similarity index 100%
rename from Watch/Extension/TGNeoTextMessageViewModel.m
rename to Telegram/Watch/Extension/TGNeoTextMessageViewModel.m
diff --git a/Watch/Extension/TGNeoUnsupportedMessageViewModel.h b/Telegram/Watch/Extension/TGNeoUnsupportedMessageViewModel.h
similarity index 100%
rename from Watch/Extension/TGNeoUnsupportedMessageViewModel.h
rename to Telegram/Watch/Extension/TGNeoUnsupportedMessageViewModel.h
diff --git a/Watch/Extension/TGNeoUnsupportedMessageViewModel.m b/Telegram/Watch/Extension/TGNeoUnsupportedMessageViewModel.m
similarity index 100%
rename from Watch/Extension/TGNeoUnsupportedMessageViewModel.m
rename to Telegram/Watch/Extension/TGNeoUnsupportedMessageViewModel.m
diff --git a/Watch/Extension/TGNeoVenueMessageViewModel.h b/Telegram/Watch/Extension/TGNeoVenueMessageViewModel.h
similarity index 100%
rename from Watch/Extension/TGNeoVenueMessageViewModel.h
rename to Telegram/Watch/Extension/TGNeoVenueMessageViewModel.h
diff --git a/Watch/Extension/TGNeoVenueMessageViewModel.m b/Telegram/Watch/Extension/TGNeoVenueMessageViewModel.m
similarity index 100%
rename from Watch/Extension/TGNeoVenueMessageViewModel.m
rename to Telegram/Watch/Extension/TGNeoVenueMessageViewModel.m
diff --git a/Watch/Extension/TGNeoViewModel.h b/Telegram/Watch/Extension/TGNeoViewModel.h
similarity index 100%
rename from Watch/Extension/TGNeoViewModel.h
rename to Telegram/Watch/Extension/TGNeoViewModel.h
diff --git a/Watch/Extension/TGNeoViewModel.m b/Telegram/Watch/Extension/TGNeoViewModel.m
similarity index 100%
rename from Watch/Extension/TGNeoViewModel.m
rename to Telegram/Watch/Extension/TGNeoViewModel.m
diff --git a/Watch/Extension/TGNotificationController.h b/Telegram/Watch/Extension/TGNotificationController.h
similarity index 100%
rename from Watch/Extension/TGNotificationController.h
rename to Telegram/Watch/Extension/TGNotificationController.h
diff --git a/Watch/Extension/TGNotificationController.m b/Telegram/Watch/Extension/TGNotificationController.m
similarity index 100%
rename from Watch/Extension/TGNotificationController.m
rename to Telegram/Watch/Extension/TGNotificationController.m
diff --git a/Watch/Extension/TGProfilePhotoController.h b/Telegram/Watch/Extension/TGProfilePhotoController.h
similarity index 100%
rename from Watch/Extension/TGProfilePhotoController.h
rename to Telegram/Watch/Extension/TGProfilePhotoController.h
diff --git a/Watch/Extension/TGProfilePhotoController.m b/Telegram/Watch/Extension/TGProfilePhotoController.m
similarity index 100%
rename from Watch/Extension/TGProfilePhotoController.m
rename to Telegram/Watch/Extension/TGProfilePhotoController.m
diff --git a/Watch/Extension/TGStickerPackRowController.h b/Telegram/Watch/Extension/TGStickerPackRowController.h
similarity index 100%
rename from Watch/Extension/TGStickerPackRowController.h
rename to Telegram/Watch/Extension/TGStickerPackRowController.h
diff --git a/Watch/Extension/TGStickerPackRowController.m b/Telegram/Watch/Extension/TGStickerPackRowController.m
similarity index 100%
rename from Watch/Extension/TGStickerPackRowController.m
rename to Telegram/Watch/Extension/TGStickerPackRowController.m
diff --git a/Watch/Extension/TGStickerPacksController.h b/Telegram/Watch/Extension/TGStickerPacksController.h
similarity index 100%
rename from Watch/Extension/TGStickerPacksController.h
rename to Telegram/Watch/Extension/TGStickerPacksController.h
diff --git a/Watch/Extension/TGStickerPacksController.m b/Telegram/Watch/Extension/TGStickerPacksController.m
similarity index 100%
rename from Watch/Extension/TGStickerPacksController.m
rename to Telegram/Watch/Extension/TGStickerPacksController.m
diff --git a/Watch/Extension/TGStickersController.h b/Telegram/Watch/Extension/TGStickersController.h
similarity index 100%
rename from Watch/Extension/TGStickersController.h
rename to Telegram/Watch/Extension/TGStickersController.h
diff --git a/Watch/Extension/TGStickersController.m b/Telegram/Watch/Extension/TGStickersController.m
similarity index 100%
rename from Watch/Extension/TGStickersController.m
rename to Telegram/Watch/Extension/TGStickersController.m
diff --git a/Watch/Extension/TGStickersHeaderController.h b/Telegram/Watch/Extension/TGStickersHeaderController.h
similarity index 100%
rename from Watch/Extension/TGStickersHeaderController.h
rename to Telegram/Watch/Extension/TGStickersHeaderController.h
diff --git a/Watch/Extension/TGStickersHeaderController.m b/Telegram/Watch/Extension/TGStickersHeaderController.m
similarity index 100%
rename from Watch/Extension/TGStickersHeaderController.m
rename to Telegram/Watch/Extension/TGStickersHeaderController.m
diff --git a/Watch/Extension/TGStickersRowController.h b/Telegram/Watch/Extension/TGStickersRowController.h
similarity index 100%
rename from Watch/Extension/TGStickersRowController.h
rename to Telegram/Watch/Extension/TGStickersRowController.h
diff --git a/Watch/Extension/TGStickersRowController.m b/Telegram/Watch/Extension/TGStickersRowController.m
similarity index 100%
rename from Watch/Extension/TGStickersRowController.m
rename to Telegram/Watch/Extension/TGStickersRowController.m
diff --git a/Watch/Extension/TGStickersSectionHeaderController.h b/Telegram/Watch/Extension/TGStickersSectionHeaderController.h
similarity index 100%
rename from Watch/Extension/TGStickersSectionHeaderController.h
rename to Telegram/Watch/Extension/TGStickersSectionHeaderController.h
diff --git a/Watch/Extension/TGStickersSectionHeaderController.m b/Telegram/Watch/Extension/TGStickersSectionHeaderController.m
similarity index 100%
rename from Watch/Extension/TGStickersSectionHeaderController.m
rename to Telegram/Watch/Extension/TGStickersSectionHeaderController.m
diff --git a/Watch/Extension/TGStringUtils.h b/Telegram/Watch/Extension/TGStringUtils.h
similarity index 100%
rename from Watch/Extension/TGStringUtils.h
rename to Telegram/Watch/Extension/TGStringUtils.h
diff --git a/Watch/Extension/TGStringUtils.m b/Telegram/Watch/Extension/TGStringUtils.m
similarity index 100%
rename from Watch/Extension/TGStringUtils.m
rename to Telegram/Watch/Extension/TGStringUtils.m
diff --git a/Watch/Extension/TGTableDeltaUpdater.h b/Telegram/Watch/Extension/TGTableDeltaUpdater.h
similarity index 100%
rename from Watch/Extension/TGTableDeltaUpdater.h
rename to Telegram/Watch/Extension/TGTableDeltaUpdater.h
diff --git a/Watch/Extension/TGTableDeltaUpdater.m b/Telegram/Watch/Extension/TGTableDeltaUpdater.m
similarity index 100%
rename from Watch/Extension/TGTableDeltaUpdater.m
rename to Telegram/Watch/Extension/TGTableDeltaUpdater.m
diff --git a/Watch/Extension/TGUserHandle.h b/Telegram/Watch/Extension/TGUserHandle.h
similarity index 100%
rename from Watch/Extension/TGUserHandle.h
rename to Telegram/Watch/Extension/TGUserHandle.h
diff --git a/Watch/Extension/TGUserHandle.m b/Telegram/Watch/Extension/TGUserHandle.m
similarity index 100%
rename from Watch/Extension/TGUserHandle.m
rename to Telegram/Watch/Extension/TGUserHandle.m
diff --git a/Watch/Extension/TGUserHandleRowController.h b/Telegram/Watch/Extension/TGUserHandleRowController.h
similarity index 100%
rename from Watch/Extension/TGUserHandleRowController.h
rename to Telegram/Watch/Extension/TGUserHandleRowController.h
diff --git a/Watch/Extension/TGUserHandleRowController.m b/Telegram/Watch/Extension/TGUserHandleRowController.m
similarity index 100%
rename from Watch/Extension/TGUserHandleRowController.m
rename to Telegram/Watch/Extension/TGUserHandleRowController.m
diff --git a/Watch/Extension/TGUserInfoController.h b/Telegram/Watch/Extension/TGUserInfoController.h
similarity index 100%
rename from Watch/Extension/TGUserInfoController.h
rename to Telegram/Watch/Extension/TGUserInfoController.h
diff --git a/Watch/Extension/TGUserInfoController.m b/Telegram/Watch/Extension/TGUserInfoController.m
similarity index 100%
rename from Watch/Extension/TGUserInfoController.m
rename to Telegram/Watch/Extension/TGUserInfoController.m
diff --git a/Watch/Extension/TGUserInfoHeaderController.h b/Telegram/Watch/Extension/TGUserInfoHeaderController.h
similarity index 100%
rename from Watch/Extension/TGUserInfoHeaderController.h
rename to Telegram/Watch/Extension/TGUserInfoHeaderController.h
diff --git a/Watch/Extension/TGUserInfoHeaderController.m b/Telegram/Watch/Extension/TGUserInfoHeaderController.m
similarity index 100%
rename from Watch/Extension/TGUserInfoHeaderController.m
rename to Telegram/Watch/Extension/TGUserInfoHeaderController.m
diff --git a/Watch/Extension/TGUserRowController.h b/Telegram/Watch/Extension/TGUserRowController.h
similarity index 100%
rename from Watch/Extension/TGUserRowController.h
rename to Telegram/Watch/Extension/TGUserRowController.h
diff --git a/Watch/Extension/TGUserRowController.m b/Telegram/Watch/Extension/TGUserRowController.m
similarity index 100%
rename from Watch/Extension/TGUserRowController.m
rename to Telegram/Watch/Extension/TGUserRowController.m
diff --git a/Watch/Extension/TGWatchColor.h b/Telegram/Watch/Extension/TGWatchColor.h
similarity index 100%
rename from Watch/Extension/TGWatchColor.h
rename to Telegram/Watch/Extension/TGWatchColor.h
diff --git a/Watch/Extension/TGWatchColor.m b/Telegram/Watch/Extension/TGWatchColor.m
similarity index 100%
rename from Watch/Extension/TGWatchColor.m
rename to Telegram/Watch/Extension/TGWatchColor.m
diff --git a/Watch/Extension/TGWatchCommon.h b/Telegram/Watch/Extension/TGWatchCommon.h
similarity index 100%
rename from Watch/Extension/TGWatchCommon.h
rename to Telegram/Watch/Extension/TGWatchCommon.h
diff --git a/Watch/Extension/TGWatchCommon.m b/Telegram/Watch/Extension/TGWatchCommon.m
similarity index 100%
rename from Watch/Extension/TGWatchCommon.m
rename to Telegram/Watch/Extension/TGWatchCommon.m
diff --git a/Watch/Extension/WKInterface+TGInterface.h b/Telegram/Watch/Extension/WKInterface+TGInterface.h
similarity index 100%
rename from Watch/Extension/WKInterface+TGInterface.h
rename to Telegram/Watch/Extension/WKInterface+TGInterface.h
diff --git a/Watch/Extension/WKInterface+TGInterface.m b/Telegram/Watch/Extension/WKInterface+TGInterface.m
similarity index 100%
rename from Watch/Extension/WKInterface+TGInterface.m
rename to Telegram/Watch/Extension/WKInterface+TGInterface.m
diff --git a/Watch/Extension/WKInterfaceGroup+Signals.h b/Telegram/Watch/Extension/WKInterfaceGroup+Signals.h
similarity index 100%
rename from Watch/Extension/WKInterfaceGroup+Signals.h
rename to Telegram/Watch/Extension/WKInterfaceGroup+Signals.h
diff --git a/Watch/Extension/WKInterfaceGroup+Signals.m b/Telegram/Watch/Extension/WKInterfaceGroup+Signals.m
similarity index 100%
rename from Watch/Extension/WKInterfaceGroup+Signals.m
rename to Telegram/Watch/Extension/WKInterfaceGroup+Signals.m
diff --git a/Watch/Extension/WKInterfaceImage+Signals.h b/Telegram/Watch/Extension/WKInterfaceImage+Signals.h
similarity index 100%
rename from Watch/Extension/WKInterfaceImage+Signals.h
rename to Telegram/Watch/Extension/WKInterfaceImage+Signals.h
diff --git a/Watch/Extension/WKInterfaceImage+Signals.m b/Telegram/Watch/Extension/WKInterfaceImage+Signals.m
similarity index 100%
rename from Watch/Extension/WKInterfaceImage+Signals.m
rename to Telegram/Watch/Extension/WKInterfaceImage+Signals.m
diff --git a/Watch/Extension/WKInterfaceTable+TGDataDrivenTable.h b/Telegram/Watch/Extension/WKInterfaceTable+TGDataDrivenTable.h
similarity index 100%
rename from Watch/Extension/WKInterfaceTable+TGDataDrivenTable.h
rename to Telegram/Watch/Extension/WKInterfaceTable+TGDataDrivenTable.h
diff --git a/Watch/Extension/WKInterfaceTable+TGDataDrivenTable.m b/Telegram/Watch/Extension/WKInterfaceTable+TGDataDrivenTable.m
similarity index 100%
rename from Watch/Extension/WKInterfaceTable+TGDataDrivenTable.m
rename to Telegram/Watch/Extension/WKInterfaceTable+TGDataDrivenTable.m
diff --git a/Watch/Extension/WatchExtension-Prefix.pch b/Telegram/Watch/Extension/WatchExtension-Prefix.pch
similarity index 100%
rename from Watch/Extension/WatchExtension-Prefix.pch
rename to Telegram/Watch/Extension/WatchExtension-Prefix.pch
diff --git a/Watch/WatchCommonWatch/TGBridgeActionMediaAttachment.h b/Telegram/Watch/WatchCommonWatch/TGBridgeActionMediaAttachment.h
similarity index 100%
rename from Watch/WatchCommonWatch/TGBridgeActionMediaAttachment.h
rename to Telegram/Watch/WatchCommonWatch/TGBridgeActionMediaAttachment.h
diff --git a/Watch/WatchCommonWatch/TGBridgeActionMediaAttachment.m b/Telegram/Watch/WatchCommonWatch/TGBridgeActionMediaAttachment.m
similarity index 100%
rename from Watch/WatchCommonWatch/TGBridgeActionMediaAttachment.m
rename to Telegram/Watch/WatchCommonWatch/TGBridgeActionMediaAttachment.m
diff --git a/Watch/WatchCommonWatch/TGBridgeAudioMediaAttachment.h b/Telegram/Watch/WatchCommonWatch/TGBridgeAudioMediaAttachment.h
similarity index 100%
rename from Watch/WatchCommonWatch/TGBridgeAudioMediaAttachment.h
rename to Telegram/Watch/WatchCommonWatch/TGBridgeAudioMediaAttachment.h
diff --git a/Watch/WatchCommonWatch/TGBridgeAudioMediaAttachment.m b/Telegram/Watch/WatchCommonWatch/TGBridgeAudioMediaAttachment.m
similarity index 100%
rename from Watch/WatchCommonWatch/TGBridgeAudioMediaAttachment.m
rename to Telegram/Watch/WatchCommonWatch/TGBridgeAudioMediaAttachment.m
diff --git a/Watch/WatchCommonWatch/TGBridgeBotCommandInfo.h b/Telegram/Watch/WatchCommonWatch/TGBridgeBotCommandInfo.h
similarity index 100%
rename from Watch/WatchCommonWatch/TGBridgeBotCommandInfo.h
rename to Telegram/Watch/WatchCommonWatch/TGBridgeBotCommandInfo.h
diff --git a/Watch/WatchCommonWatch/TGBridgeBotCommandInfo.m b/Telegram/Watch/WatchCommonWatch/TGBridgeBotCommandInfo.m
similarity index 100%
rename from Watch/WatchCommonWatch/TGBridgeBotCommandInfo.m
rename to Telegram/Watch/WatchCommonWatch/TGBridgeBotCommandInfo.m
diff --git a/Watch/WatchCommonWatch/TGBridgeBotInfo.h b/Telegram/Watch/WatchCommonWatch/TGBridgeBotInfo.h
similarity index 100%
rename from Watch/WatchCommonWatch/TGBridgeBotInfo.h
rename to Telegram/Watch/WatchCommonWatch/TGBridgeBotInfo.h
diff --git a/Watch/WatchCommonWatch/TGBridgeBotInfo.m b/Telegram/Watch/WatchCommonWatch/TGBridgeBotInfo.m
similarity index 100%
rename from Watch/WatchCommonWatch/TGBridgeBotInfo.m
rename to Telegram/Watch/WatchCommonWatch/TGBridgeBotInfo.m
diff --git a/Watch/WatchCommonWatch/TGBridgeChat.h b/Telegram/Watch/WatchCommonWatch/TGBridgeChat.h
similarity index 100%
rename from Watch/WatchCommonWatch/TGBridgeChat.h
rename to Telegram/Watch/WatchCommonWatch/TGBridgeChat.h
diff --git a/Watch/WatchCommonWatch/TGBridgeChat.m b/Telegram/Watch/WatchCommonWatch/TGBridgeChat.m
similarity index 100%
rename from Watch/WatchCommonWatch/TGBridgeChat.m
rename to Telegram/Watch/WatchCommonWatch/TGBridgeChat.m
diff --git a/Watch/WatchCommonWatch/TGBridgeChatMessages.h b/Telegram/Watch/WatchCommonWatch/TGBridgeChatMessages.h
similarity index 100%
rename from Watch/WatchCommonWatch/TGBridgeChatMessages.h
rename to Telegram/Watch/WatchCommonWatch/TGBridgeChatMessages.h
diff --git a/Watch/WatchCommonWatch/TGBridgeChatMessages.m b/Telegram/Watch/WatchCommonWatch/TGBridgeChatMessages.m
similarity index 100%
rename from Watch/WatchCommonWatch/TGBridgeChatMessages.m
rename to Telegram/Watch/WatchCommonWatch/TGBridgeChatMessages.m
diff --git a/Watch/WatchCommonWatch/TGBridgeCommon.h b/Telegram/Watch/WatchCommonWatch/TGBridgeCommon.h
similarity index 100%
rename from Watch/WatchCommonWatch/TGBridgeCommon.h
rename to Telegram/Watch/WatchCommonWatch/TGBridgeCommon.h
diff --git a/Watch/WatchCommonWatch/TGBridgeCommon.m b/Telegram/Watch/WatchCommonWatch/TGBridgeCommon.m
similarity index 100%
rename from Watch/WatchCommonWatch/TGBridgeCommon.m
rename to Telegram/Watch/WatchCommonWatch/TGBridgeCommon.m
diff --git a/Watch/WatchCommonWatch/TGBridgeContactMediaAttachment.h b/Telegram/Watch/WatchCommonWatch/TGBridgeContactMediaAttachment.h
similarity index 100%
rename from Watch/WatchCommonWatch/TGBridgeContactMediaAttachment.h
rename to Telegram/Watch/WatchCommonWatch/TGBridgeContactMediaAttachment.h
diff --git a/Watch/WatchCommonWatch/TGBridgeContactMediaAttachment.m b/Telegram/Watch/WatchCommonWatch/TGBridgeContactMediaAttachment.m
similarity index 100%
rename from Watch/WatchCommonWatch/TGBridgeContactMediaAttachment.m
rename to Telegram/Watch/WatchCommonWatch/TGBridgeContactMediaAttachment.m
diff --git a/Watch/WatchCommonWatch/TGBridgeContext.h b/Telegram/Watch/WatchCommonWatch/TGBridgeContext.h
similarity index 100%
rename from Watch/WatchCommonWatch/TGBridgeContext.h
rename to Telegram/Watch/WatchCommonWatch/TGBridgeContext.h
diff --git a/Watch/WatchCommonWatch/TGBridgeContext.m b/Telegram/Watch/WatchCommonWatch/TGBridgeContext.m
similarity index 100%
rename from Watch/WatchCommonWatch/TGBridgeContext.m
rename to Telegram/Watch/WatchCommonWatch/TGBridgeContext.m
diff --git a/Watch/WatchCommonWatch/TGBridgeDocumentMediaAttachment.h b/Telegram/Watch/WatchCommonWatch/TGBridgeDocumentMediaAttachment.h
similarity index 100%
rename from Watch/WatchCommonWatch/TGBridgeDocumentMediaAttachment.h
rename to Telegram/Watch/WatchCommonWatch/TGBridgeDocumentMediaAttachment.h
diff --git a/Watch/WatchCommonWatch/TGBridgeDocumentMediaAttachment.m b/Telegram/Watch/WatchCommonWatch/TGBridgeDocumentMediaAttachment.m
similarity index 100%
rename from Watch/WatchCommonWatch/TGBridgeDocumentMediaAttachment.m
rename to Telegram/Watch/WatchCommonWatch/TGBridgeDocumentMediaAttachment.m
diff --git a/Watch/WatchCommonWatch/TGBridgeForwardedMessageMediaAttachment.h b/Telegram/Watch/WatchCommonWatch/TGBridgeForwardedMessageMediaAttachment.h
similarity index 100%
rename from Watch/WatchCommonWatch/TGBridgeForwardedMessageMediaAttachment.h
rename to Telegram/Watch/WatchCommonWatch/TGBridgeForwardedMessageMediaAttachment.h
diff --git a/Watch/WatchCommonWatch/TGBridgeForwardedMessageMediaAttachment.m b/Telegram/Watch/WatchCommonWatch/TGBridgeForwardedMessageMediaAttachment.m
similarity index 100%
rename from Watch/WatchCommonWatch/TGBridgeForwardedMessageMediaAttachment.m
rename to Telegram/Watch/WatchCommonWatch/TGBridgeForwardedMessageMediaAttachment.m
diff --git a/Watch/WatchCommonWatch/TGBridgeImageMediaAttachment.h b/Telegram/Watch/WatchCommonWatch/TGBridgeImageMediaAttachment.h
similarity index 100%
rename from Watch/WatchCommonWatch/TGBridgeImageMediaAttachment.h
rename to Telegram/Watch/WatchCommonWatch/TGBridgeImageMediaAttachment.h
diff --git a/Watch/WatchCommonWatch/TGBridgeImageMediaAttachment.m b/Telegram/Watch/WatchCommonWatch/TGBridgeImageMediaAttachment.m
similarity index 100%
rename from Watch/WatchCommonWatch/TGBridgeImageMediaAttachment.m
rename to Telegram/Watch/WatchCommonWatch/TGBridgeImageMediaAttachment.m
diff --git a/Watch/WatchCommonWatch/TGBridgeLocationMediaAttachment.h b/Telegram/Watch/WatchCommonWatch/TGBridgeLocationMediaAttachment.h
similarity index 100%
rename from Watch/WatchCommonWatch/TGBridgeLocationMediaAttachment.h
rename to Telegram/Watch/WatchCommonWatch/TGBridgeLocationMediaAttachment.h
diff --git a/Watch/WatchCommonWatch/TGBridgeLocationMediaAttachment.m b/Telegram/Watch/WatchCommonWatch/TGBridgeLocationMediaAttachment.m
similarity index 100%
rename from Watch/WatchCommonWatch/TGBridgeLocationMediaAttachment.m
rename to Telegram/Watch/WatchCommonWatch/TGBridgeLocationMediaAttachment.m
diff --git a/Watch/WatchCommonWatch/TGBridgeLocationVenue.h b/Telegram/Watch/WatchCommonWatch/TGBridgeLocationVenue.h
similarity index 100%
rename from Watch/WatchCommonWatch/TGBridgeLocationVenue.h
rename to Telegram/Watch/WatchCommonWatch/TGBridgeLocationVenue.h
diff --git a/Watch/WatchCommonWatch/TGBridgeLocationVenue.m b/Telegram/Watch/WatchCommonWatch/TGBridgeLocationVenue.m
similarity index 100%
rename from Watch/WatchCommonWatch/TGBridgeLocationVenue.m
rename to Telegram/Watch/WatchCommonWatch/TGBridgeLocationVenue.m
diff --git a/Watch/WatchCommonWatch/TGBridgeMediaAttachment.h b/Telegram/Watch/WatchCommonWatch/TGBridgeMediaAttachment.h
similarity index 100%
rename from Watch/WatchCommonWatch/TGBridgeMediaAttachment.h
rename to Telegram/Watch/WatchCommonWatch/TGBridgeMediaAttachment.h
diff --git a/Watch/WatchCommonWatch/TGBridgeMediaAttachment.m b/Telegram/Watch/WatchCommonWatch/TGBridgeMediaAttachment.m
similarity index 100%
rename from Watch/WatchCommonWatch/TGBridgeMediaAttachment.m
rename to Telegram/Watch/WatchCommonWatch/TGBridgeMediaAttachment.m
diff --git a/Watch/WatchCommonWatch/TGBridgeMessage.h b/Telegram/Watch/WatchCommonWatch/TGBridgeMessage.h
similarity index 100%
rename from Watch/WatchCommonWatch/TGBridgeMessage.h
rename to Telegram/Watch/WatchCommonWatch/TGBridgeMessage.h
diff --git a/Watch/WatchCommonWatch/TGBridgeMessage.m b/Telegram/Watch/WatchCommonWatch/TGBridgeMessage.m
similarity index 100%
rename from Watch/WatchCommonWatch/TGBridgeMessage.m
rename to Telegram/Watch/WatchCommonWatch/TGBridgeMessage.m
diff --git a/Watch/WatchCommonWatch/TGBridgeMessageEntities.h b/Telegram/Watch/WatchCommonWatch/TGBridgeMessageEntities.h
similarity index 100%
rename from Watch/WatchCommonWatch/TGBridgeMessageEntities.h
rename to Telegram/Watch/WatchCommonWatch/TGBridgeMessageEntities.h
diff --git a/Watch/WatchCommonWatch/TGBridgeMessageEntities.m b/Telegram/Watch/WatchCommonWatch/TGBridgeMessageEntities.m
similarity index 100%
rename from Watch/WatchCommonWatch/TGBridgeMessageEntities.m
rename to Telegram/Watch/WatchCommonWatch/TGBridgeMessageEntities.m
diff --git a/Watch/WatchCommonWatch/TGBridgeMessageEntitiesAttachment.h b/Telegram/Watch/WatchCommonWatch/TGBridgeMessageEntitiesAttachment.h
similarity index 100%
rename from Watch/WatchCommonWatch/TGBridgeMessageEntitiesAttachment.h
rename to Telegram/Watch/WatchCommonWatch/TGBridgeMessageEntitiesAttachment.h
diff --git a/Watch/WatchCommonWatch/TGBridgeMessageEntitiesAttachment.m b/Telegram/Watch/WatchCommonWatch/TGBridgeMessageEntitiesAttachment.m
similarity index 100%
rename from Watch/WatchCommonWatch/TGBridgeMessageEntitiesAttachment.m
rename to Telegram/Watch/WatchCommonWatch/TGBridgeMessageEntitiesAttachment.m
diff --git a/Watch/WatchCommonWatch/TGBridgePeerIdAdapter.h b/Telegram/Watch/WatchCommonWatch/TGBridgePeerIdAdapter.h
similarity index 100%
rename from Watch/WatchCommonWatch/TGBridgePeerIdAdapter.h
rename to Telegram/Watch/WatchCommonWatch/TGBridgePeerIdAdapter.h
diff --git a/Watch/WatchCommonWatch/TGBridgePeerNotificationSettings.h b/Telegram/Watch/WatchCommonWatch/TGBridgePeerNotificationSettings.h
similarity index 100%
rename from Watch/WatchCommonWatch/TGBridgePeerNotificationSettings.h
rename to Telegram/Watch/WatchCommonWatch/TGBridgePeerNotificationSettings.h
diff --git a/Watch/WatchCommonWatch/TGBridgePeerNotificationSettings.m b/Telegram/Watch/WatchCommonWatch/TGBridgePeerNotificationSettings.m
similarity index 100%
rename from Watch/WatchCommonWatch/TGBridgePeerNotificationSettings.m
rename to Telegram/Watch/WatchCommonWatch/TGBridgePeerNotificationSettings.m
diff --git a/Watch/WatchCommonWatch/TGBridgeReplyMarkupMediaAttachment.h b/Telegram/Watch/WatchCommonWatch/TGBridgeReplyMarkupMediaAttachment.h
similarity index 100%
rename from Watch/WatchCommonWatch/TGBridgeReplyMarkupMediaAttachment.h
rename to Telegram/Watch/WatchCommonWatch/TGBridgeReplyMarkupMediaAttachment.h
diff --git a/Watch/WatchCommonWatch/TGBridgeReplyMarkupMediaAttachment.m b/Telegram/Watch/WatchCommonWatch/TGBridgeReplyMarkupMediaAttachment.m
similarity index 100%
rename from Watch/WatchCommonWatch/TGBridgeReplyMarkupMediaAttachment.m
rename to Telegram/Watch/WatchCommonWatch/TGBridgeReplyMarkupMediaAttachment.m
diff --git a/Watch/WatchCommonWatch/TGBridgeReplyMessageMediaAttachment.h b/Telegram/Watch/WatchCommonWatch/TGBridgeReplyMessageMediaAttachment.h
similarity index 100%
rename from Watch/WatchCommonWatch/TGBridgeReplyMessageMediaAttachment.h
rename to Telegram/Watch/WatchCommonWatch/TGBridgeReplyMessageMediaAttachment.h
diff --git a/Watch/WatchCommonWatch/TGBridgeReplyMessageMediaAttachment.m b/Telegram/Watch/WatchCommonWatch/TGBridgeReplyMessageMediaAttachment.m
similarity index 100%
rename from Watch/WatchCommonWatch/TGBridgeReplyMessageMediaAttachment.m
rename to Telegram/Watch/WatchCommonWatch/TGBridgeReplyMessageMediaAttachment.m
diff --git a/Watch/WatchCommonWatch/TGBridgeSubscriptions.h b/Telegram/Watch/WatchCommonWatch/TGBridgeSubscriptions.h
similarity index 100%
rename from Watch/WatchCommonWatch/TGBridgeSubscriptions.h
rename to Telegram/Watch/WatchCommonWatch/TGBridgeSubscriptions.h
diff --git a/Watch/WatchCommonWatch/TGBridgeSubscriptions.m b/Telegram/Watch/WatchCommonWatch/TGBridgeSubscriptions.m
similarity index 100%
rename from Watch/WatchCommonWatch/TGBridgeSubscriptions.m
rename to Telegram/Watch/WatchCommonWatch/TGBridgeSubscriptions.m
diff --git a/Watch/WatchCommonWatch/TGBridgeUnsupportedMediaAttachment.h b/Telegram/Watch/WatchCommonWatch/TGBridgeUnsupportedMediaAttachment.h
similarity index 100%
rename from Watch/WatchCommonWatch/TGBridgeUnsupportedMediaAttachment.h
rename to Telegram/Watch/WatchCommonWatch/TGBridgeUnsupportedMediaAttachment.h
diff --git a/Watch/WatchCommonWatch/TGBridgeUnsupportedMediaAttachment.m b/Telegram/Watch/WatchCommonWatch/TGBridgeUnsupportedMediaAttachment.m
similarity index 100%
rename from Watch/WatchCommonWatch/TGBridgeUnsupportedMediaAttachment.m
rename to Telegram/Watch/WatchCommonWatch/TGBridgeUnsupportedMediaAttachment.m
diff --git a/Watch/WatchCommonWatch/TGBridgeUser.h b/Telegram/Watch/WatchCommonWatch/TGBridgeUser.h
similarity index 100%
rename from Watch/WatchCommonWatch/TGBridgeUser.h
rename to Telegram/Watch/WatchCommonWatch/TGBridgeUser.h
diff --git a/Watch/WatchCommonWatch/TGBridgeUser.m b/Telegram/Watch/WatchCommonWatch/TGBridgeUser.m
similarity index 100%
rename from Watch/WatchCommonWatch/TGBridgeUser.m
rename to Telegram/Watch/WatchCommonWatch/TGBridgeUser.m
diff --git a/Watch/WatchCommonWatch/TGBridgeVideoMediaAttachment.h b/Telegram/Watch/WatchCommonWatch/TGBridgeVideoMediaAttachment.h
similarity index 100%
rename from Watch/WatchCommonWatch/TGBridgeVideoMediaAttachment.h
rename to Telegram/Watch/WatchCommonWatch/TGBridgeVideoMediaAttachment.h
diff --git a/Watch/WatchCommonWatch/TGBridgeVideoMediaAttachment.m b/Telegram/Watch/WatchCommonWatch/TGBridgeVideoMediaAttachment.m
similarity index 100%
rename from Watch/WatchCommonWatch/TGBridgeVideoMediaAttachment.m
rename to Telegram/Watch/WatchCommonWatch/TGBridgeVideoMediaAttachment.m
diff --git a/Watch/WatchCommonWatch/TGBridgeWebPageMediaAttachment.h b/Telegram/Watch/WatchCommonWatch/TGBridgeWebPageMediaAttachment.h
similarity index 100%
rename from Watch/WatchCommonWatch/TGBridgeWebPageMediaAttachment.h
rename to Telegram/Watch/WatchCommonWatch/TGBridgeWebPageMediaAttachment.h
diff --git a/Watch/WatchCommonWatch/TGBridgeWebPageMediaAttachment.m b/Telegram/Watch/WatchCommonWatch/TGBridgeWebPageMediaAttachment.m
similarity index 100%
rename from Watch/WatchCommonWatch/TGBridgeWebPageMediaAttachment.m
rename to Telegram/Watch/WatchCommonWatch/TGBridgeWebPageMediaAttachment.m
diff --git a/Watch/WatchCommonWatch/WatchCommonWatch.h b/Telegram/Watch/WatchCommonWatch/WatchCommonWatch.h
similarity index 100%
rename from Watch/WatchCommonWatch/WatchCommonWatch.h
rename to Telegram/Watch/WatchCommonWatch/WatchCommonWatch.h
diff --git a/Widget/Info.plist b/Telegram/Widget/Info.plist
similarity index 100%
rename from Widget/Info.plist
rename to Telegram/Widget/Info.plist
diff --git a/Widget/PeerNode.swift b/Telegram/Widget/PeerNode.swift
similarity index 100%
rename from Widget/PeerNode.swift
rename to Telegram/Widget/PeerNode.swift
diff --git a/Widget/TodayViewController.swift b/Telegram/Widget/TodayViewController.swift
similarity index 100%
rename from Widget/TodayViewController.swift
rename to Telegram/Widget/TodayViewController.swift
diff --git a/Widget/Widget-Bridging-Header.h b/Telegram/Widget/Widget-Bridging-Header.h
similarity index 100%
rename from Widget/Widget-Bridging-Header.h
rename to Telegram/Widget/Widget-Bridging-Header.h
diff --git a/Widget/ar.lproj/InfoPlist.strings b/Telegram/Widget/ar.lproj/InfoPlist.strings
similarity index 100%
rename from Widget/ar.lproj/InfoPlist.strings
rename to Telegram/Widget/ar.lproj/InfoPlist.strings
diff --git a/Widget/de.lproj/InfoPlist.strings b/Telegram/Widget/de.lproj/InfoPlist.strings
similarity index 100%
rename from Widget/de.lproj/InfoPlist.strings
rename to Telegram/Widget/de.lproj/InfoPlist.strings
diff --git a/Widget/en.lproj/InfoPlist.strings b/Telegram/Widget/en.lproj/InfoPlist.strings
similarity index 100%
rename from Widget/en.lproj/InfoPlist.strings
rename to Telegram/Widget/en.lproj/InfoPlist.strings
diff --git a/Widget/en.lproj/Localizable.strings b/Telegram/Widget/en.lproj/Localizable.strings
similarity index 100%
rename from Widget/en.lproj/Localizable.strings
rename to Telegram/Widget/en.lproj/Localizable.strings
diff --git a/Widget/es.lproj/InfoPlist.strings b/Telegram/Widget/es.lproj/InfoPlist.strings
similarity index 100%
rename from Widget/es.lproj/InfoPlist.strings
rename to Telegram/Widget/es.lproj/InfoPlist.strings
diff --git a/Widget/it.lproj/InfoPlist.strings b/Telegram/Widget/it.lproj/InfoPlist.strings
similarity index 100%
rename from Widget/it.lproj/InfoPlist.strings
rename to Telegram/Widget/it.lproj/InfoPlist.strings
diff --git a/Widget/ko.lproj/InfoPlist.strings b/Telegram/Widget/ko.lproj/InfoPlist.strings
similarity index 100%
rename from Widget/ko.lproj/InfoPlist.strings
rename to Telegram/Widget/ko.lproj/InfoPlist.strings
diff --git a/Widget/nl.lproj/InfoPlist.strings b/Telegram/Widget/nl.lproj/InfoPlist.strings
similarity index 100%
rename from Widget/nl.lproj/InfoPlist.strings
rename to Telegram/Widget/nl.lproj/InfoPlist.strings
diff --git a/Widget/pt.lproj/InfoPlist.strings b/Telegram/Widget/pt.lproj/InfoPlist.strings
similarity index 100%
rename from Widget/pt.lproj/InfoPlist.strings
rename to Telegram/Widget/pt.lproj/InfoPlist.strings
diff --git a/Widget/ru.lproj/InfoPlist.strings b/Telegram/Widget/ru.lproj/InfoPlist.strings
similarity index 100%
rename from Widget/ru.lproj/InfoPlist.strings
rename to Telegram/Widget/ru.lproj/InfoPlist.strings
diff --git a/Telegram/telegram_info_plist.bzl b/Telegram/telegram_info_plist.bzl
new file mode 100644
index 0000000000..6e38968e65
--- /dev/null
+++ b/Telegram/telegram_info_plist.bzl
@@ -0,0 +1,77 @@
+load("//build-system:defines.bzl",
+    "string_value",
+)
+
+def _telegram_info_plist(ctx):
+    output = ctx.outputs.out
+
+    plist_string = """
+    <?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>CFBundleShortVersionString</key>
+        <string>{app_version}</string>
+        <key>CFBundleVersion</key>
+        <string>{build_number}</string>
+        <key>CFBundleURLTypes</key>
+        <array>
+            <dict>
+                <key>CFBundleTypeRole</key>
+                <string>Viewer</string>
+                <key>CFBundleURLName</key>
+                <string>{bundle_id}</string>
+                <key>CFBundleURLSchemes</key>
+                <array>
+                    <string>telegram</string>
+                </array>
+            </dict>
+            <dict>
+                <key>CFBundleTypeRole</key>
+                <string>Viewer</string>
+                <key>CFBundleURLName</key>
+                <string>{bundle_id}.ton</string>
+                <key>CFBundleURLSchemes</key>
+                <array>
+                    <string>ton</string>
+                </array>
+            </dict>
+            <dict>
+                <key>CFBundleTypeRole</key>
+                <string>Viewer</string>
+                <key>CFBundleURLName</key>
+                <string>{app_name}.compatibility</string>
+                <key>CFBundleURLSchemes</key>
+                <array>
+                    <string>{url_scheme}</string>
+                </array>
+            </dict>
+        </array>
+    </dict>
+    </plist>
+    """.format(
+        app_version = string_value(ctx, ctx.attr.app_version_define),
+        build_number = string_value(ctx, ctx.attr.build_number_define),
+        bundle_id = string_value(ctx, ctx.attr.bundle_id_define),
+        app_name = ctx.attr.app_name,
+        url_scheme = ctx.attr.url_scheme,
+    )
+
+    ctx.actions.write(
+        output = output,
+        content = plist_string,
+    )
+
+telegram_info_plist = rule(
+    implementation = _telegram_info_plist,
+    attrs = {
+        "app_name": attr.string(mandatory = True),
+        "url_scheme": attr.string(mandatory = True),
+        "bundle_id_define": attr.string(mandatory = True),
+        "app_version_define": attr.string(mandatory = True),
+        "build_number_define": attr.string(mandatory = True),
+    },
+    outputs = {
+        "out": "%{name}.plist"
+    },
+)
diff --git a/WORKSPACE b/WORKSPACE
new file mode 100644
index 0000000000..069a35c57e
--- /dev/null
+++ b/WORKSPACE
@@ -0,0 +1,52 @@
+load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
+
+http_archive(
+    name = "com_google_protobuf",
+    urls = ["https://github.com/protocolbuffers/protobuf/archive/v3.8.0.zip"],
+    sha256 = "1e622ce4b84b88b6d2cdf1db38d1a634fe2392d74f0b7b74ff98f3a51838ee53",
+    strip_prefix = "protobuf-3.8.0",
+    type = "zip",
+)
+
+load("@com_google_protobuf//:protobuf_deps.bzl", "protobuf_deps")
+protobuf_deps()
+
+local_repository(
+    name = "build_bazel_rules_apple",
+    path = "build-system/bazel-rules/rules_apple",
+)
+
+local_repository(
+    name = "build_bazel_rules_swift",
+    path = "build-system/bazel-rules/rules_swift",
+)
+
+local_repository(
+    name = "build_bazel_apple_support",
+    path = "build-system/bazel-rules/apple_support",
+)
+
+load(
+    "@build_bazel_rules_apple//apple:repositories.bzl",
+    "apple_rules_dependencies",
+)
+
+apple_rules_dependencies()
+
+load(
+    "@build_bazel_rules_swift//swift:repositories.bzl",
+    "swift_rules_dependencies",
+)
+
+swift_rules_dependencies()
+
+load(
+    "@build_bazel_apple_support//lib:repositories.bzl",
+    "apple_support_dependencies",
+)
+
+apple_support_dependencies()
+
+load("@bazel_skylib//:workspace.bzl", "bazel_skylib_workspace")
+
+bazel_skylib_workspace()
diff --git a/Wallet.makefile b/Wallet.makefile
index 20ead97244..90d359969c 100644
--- a/Wallet.makefile
+++ b/Wallet.makefile
@@ -16,7 +16,10 @@ WALLET_BUCK_OPTIONS=\
 	--config custom.isInternalBuild="${IS_INTERNAL_BUILD}" \
 	--config custom.isAppStoreBuild="${IS_APPSTORE_BUILD}" \
 	--config custom.appStoreId="${APPSTORE_ID}" \
-	--config custom.appSpecificUrlScheme="${APP_SPECIFIC_URL_SCHEME}"
+	--config custom.appSpecificUrlScheme="${APP_SPECIFIC_URL_SCHEME}" \
+	--config buildfile.name=BUCK
+
+BAZEL=$(shell which bazel)
 
 wallet_deps: check_env
 	$(BUCK) query "deps(//Wallet:AppPackage)" --output-attribute buck.type \
@@ -48,3 +51,5 @@ wallet_package:
 
 wallet_app: build_wallet wallet_package
 
+tulsi_project:
+	${HOME}/Applications/Tulsi.app/Contents/MacOS/Tulsi -- --genconfig Wallet/Wallet.tulsiproj:Default --bazel "${BAZEL}"
diff --git a/Wallet/BUILD b/Wallet/BUILD
new file mode 100644
index 0000000000..a924e4a93e
--- /dev/null
+++ b/Wallet/BUILD
@@ -0,0 +1,111 @@
+load("@build_bazel_rules_apple//apple:ios.bzl", "ios_application", "ios_framework")
+load("@build_bazel_rules_swift//swift:swift.bzl", "swift_library")
+
+version_info_plist_source = """
+echo \
+'<?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>CFBundleShortVersionString</key>' \
+'    <string>{}</string>' \
+'    <key>CFBundleVersion</key>' \
+'    <string>{}</string>' \
+'</dict>' \
+'</plist>' \
+> "$@"
+""".format("1.0", "30")
+
+genrule(
+    name = "VersionInfoPlist",
+    outs = ["VersionInfo.plist"],
+    cmd = version_info_plist_source,
+)
+
+filegroup(
+    name = "Strings",
+    srcs = glob([
+        "Strings/**/*",
+    ], exclude = ["Strings/**/.*"]),
+)
+
+objc_library(
+    name = "Main",
+    srcs = [
+        "Sources/main.m"
+    ],
+)
+
+ios_framework(
+  name = "AsyncDisplayKitFramework",
+  deps = ["//submodules/AsyncDisplayKit:AsyncDisplayKit"],
+  bundle_id = "org.telegram.Telegram.AsyncDisplayKit",
+  families = ["iphone", "ipad"],
+  minimum_os_version = "9.0",
+  infoplists = [
+    "Info.plist"
+  ],
+)
+
+swift_library(
+    name = "Lib",
+    srcs = glob([
+        "Sources/**/*.swift",
+    ]),
+    data = [
+        ":Strings",
+    ],
+    deps = [
+        "//submodules/GZip:GZip",
+        "//submodules/AsyncDisplayKit:AsyncDisplayKit",
+        "//submodules/SSignalKit/SSignalKit:SSignalKit",
+        "//submodules/SSignalKit/SwiftSignalKit:SwiftSignalKit",
+        "//submodules/ObjCRuntimeUtils:ObjCRuntimeUtils",
+        "//submodules/UIKitRuntimeUtils:UIKitRuntimeUtils",
+        "//submodules/Display:Display",
+        "//submodules/AlertUI:AlertUI",
+        "//submodules/ActivityIndicator:ActivityIndicator",
+        "//submodules/OverlayStatusController:OverlayStatusController",
+        "//submodules/openssl:openssl",
+        "//submodules/OpenSSLEncryptionProvider:OpenSSLEncryptionProvider",
+        "//submodules/WalletCore:WalletCore",
+        "//submodules/BuildConfig:BuildConfig",
+        "//submodules/AppBundle:AppBundle",
+        "//submodules/SolidRoundedButtonNode:SolidRoundedButtonNode",
+        "//submodules/Camera:Camera",
+        "//submodules/QrCode:QrCode",
+        "//submodules/MergeLists:MergeLists",
+        "//submodules/GlassButtonNode:GlassButtonNode",
+        "//submodules/UrlEscaping:UrlEscaping",
+        "//submodules/LocalAuth:LocalAuth",
+        "//submodules/ScreenCaptureDetection:ScreenCaptureDetection",
+        "//submodules/WalletUrl:WalletUrl",
+        "//submodules/ProgressNavigationButtonNode:ProgressNavigationButtonNode",
+        "//submodules/Markdown:Markdown",
+        "//submodules/StringPluralization:StringPluralization",
+        "//submodules/YuvConversion:YuvConversion",
+        "//submodules/rlottie:RLottieBinding",
+        "//submodules/AnimatedStickerNode:AnimatedStickerNode",
+        "//submodules/WalletUI:WalletUI",
+        "//submodules/FFMpegBinding:FFMpegBinding",
+    ],
+)
+
+ios_application(
+    name = "Wallet",
+    bundle_id = "{wallet_bundle_id}",
+    families = ["iphone", "ipad"],
+    minimum_os_version = "9.0",
+    provisioning_profile = "Wallet.mobileprovision",
+    infoplists = [
+        ":Info.plist",
+        ":VersionInfoPlist",
+    ],
+    frameworks = [
+        ":AsyncDisplayKitFramework",
+    ],
+    deps = [
+        ":Main",
+        ":Lib",
+    ],
+)
diff --git a/Wallet/Info.plist b/Wallet/Info.plist
index 7646b3381e..7e6af0fec1 100644
--- a/Wallet/Info.plist
+++ b/Wallet/Info.plist
@@ -7,7 +7,7 @@
 	<key>CFBundleDevelopmentRegion</key>
 	<string>en</string>
 	<key>CFBundleDisplayName</key>
-	<string>${APP_NAME}</string>
+	<string>${PRODUCT_NAME}</string>
 	<key>CFBundleExecutable</key>
 	<string>$(EXECUTABLE_NAME)</string>
 	<key>CFBundleIcons</key>
diff --git a/Wallet/Sources/AppDelegate.swift b/Wallet/Sources/AppDelegate.swift
index cefa741684..6eb23fdcaa 100644
--- a/Wallet/Sources/AppDelegate.swift
+++ b/Wallet/Sources/AppDelegate.swift
@@ -765,7 +765,7 @@ final class AppDelegate: NSObject, UIApplicationDelegate {
                                     beginWithController(infoScreen)
                                 })
                             } else {
-                                let createdScreen = WalletSplashScreen(context: walletContext, mode: .created(record.info, nil), walletCreatedPreloadState: nil)
+                                let createdScreen = WalletSplashScreen(context: walletContext, mode: .created(walletInfo: record.info, words: nil), walletCreatedPreloadState: nil)
                                 beginWithController(createdScreen)
                             }
                         } else {
diff --git a/Wallet/Strings/en.lproj/Localizable.strings b/Wallet/Strings/en.lproj/Localizable.strings
index 83e12f54a4..94b0aa8ad2 100644
--- a/Wallet/Strings/en.lproj/Localizable.strings
+++ b/Wallet/Strings/en.lproj/Localizable.strings
@@ -62,6 +62,7 @@
 "Wallet.Send.OwnAddressAlertProceed" = "Proceed";
 "Wallet.Send.TransactionInProgress" = "Please wait until the current transaction is completed.";
 "Wallet.Send.SyncInProgress" = "Please wait while the wallet finishes syncing with the TON Blockchain.";
+"Wallet.Send.EncryptComment" = "Encrypt Text";
 "Wallet.Settings.Title" = "Settings";
 "Wallet.Settings.Configuration" = "Server Settings";
 "Wallet.Settings.ConfigurationInfo" = "Advanced Settings";
diff --git a/Wallet/SupportFiles/Empty.swift b/Wallet/SupportFiles/Empty.swift
index 8b13789179..e69de29bb2 100644
--- a/Wallet/SupportFiles/Empty.swift
+++ b/Wallet/SupportFiles/Empty.swift
@@ -1 +0,0 @@
-
diff --git a/Wallet/Wallet.mobileprovision b/Wallet/Wallet.mobileprovision
new file mode 100644
index 0000000000..879842ec7b
Binary files /dev/null and b/Wallet/Wallet.mobileprovision differ
diff --git a/submodules/HockeySDK-iOS/Support/HockeySDKTests/Fixtures/live_report_empty.plcrash b/Wallet/configuration.bzl
similarity index 100%
rename from submodules/HockeySDK-iOS/Support/HockeySDKTests/Fixtures/live_report_empty.plcrash
rename to Wallet/configuration.bzl
diff --git a/build-input/BUILD b/build-input/BUILD
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/build-system/BUILD b/build-system/BUILD
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/build-system/bazel-rules/apple_support b/build-system/bazel-rules/apple_support
new file mode 160000
index 0000000000..501b4afb27
--- /dev/null
+++ b/build-system/bazel-rules/apple_support
@@ -0,0 +1 @@
+Subproject commit 501b4afb27745c4813a88ffa28acd901408014e4
diff --git a/build-system/bazel-rules/rules_apple b/build-system/bazel-rules/rules_apple
new file mode 160000
index 0000000000..6e1f592277
--- /dev/null
+++ b/build-system/bazel-rules/rules_apple
@@ -0,0 +1 @@
+Subproject commit 6e1f592277650a2727b6e84705ec1a2dc17764fa
diff --git a/build-system/bazel-rules/rules_swift b/build-system/bazel-rules/rules_swift
new file mode 160000
index 0000000000..bbe187c4b1
--- /dev/null
+++ b/build-system/bazel-rules/rules_swift
@@ -0,0 +1 @@
+Subproject commit bbe187c4b1f55c0974a0da345e5e313eaed37c05
diff --git a/build-system/copy-provisioning-profiles.sh b/build-system/copy-provisioning-profiles.sh
new file mode 100755
index 0000000000..ef676cc5b5
--- /dev/null
+++ b/build-system/copy-provisioning-profiles.sh
@@ -0,0 +1,125 @@
+#!/bin/sh
+
+copy_provisioning_profiles () {	
+	if [ "$CODESIGNING_DATA_PATH" = "" ]; then
+		>&2 echo "CODESIGNING_DATA_PATH not defined"
+		exit 1
+	fi
+
+
+	PROFILES_TYPE="$1"
+	case "$PROFILES_TYPE" in
+		development)
+			EXPECTED_VARIABLES=(\
+				DEVELOPMENT_PROVISIONING_PROFILE_APP \
+				DEVELOPMENT_PROVISIONING_PROFILE_EXTENSION_SHARE \
+				DEVELOPMENT_PROVISIONING_PROFILE_EXTENSION_WIDGET \
+				DEVELOPMENT_PROVISIONING_PROFILE_EXTENSION_NOTIFICATIONSERVICE \
+				DEVELOPMENT_PROVISIONING_PROFILE_EXTENSION_NOTIFICATIONCONTENT \
+				DEVELOPMENT_PROVISIONING_PROFILE_EXTENSION_INTENTS \
+				DEVELOPMENT_PROVISIONING_PROFILE_WATCH_APP \
+				DEVELOPMENT_PROVISIONING_PROFILE_WATCH_EXTENSION \
+			)
+			;;
+		distribution)
+			EXPECTED_VARIABLES=(\
+				DISTRIBUTION_PROVISIONING_PROFILE_APP \
+				DISTRIBUTION_PROVISIONING_PROFILE_EXTENSION_SHARE \
+				DISTRIBUTION_PROVISIONING_PROFILE_EXTENSION_WIDGET \
+				DISTRIBUTION_PROVISIONING_PROFILE_EXTENSION_NOTIFICATIONSERVICE \
+				DISTRIBUTION_PROVISIONING_PROFILE_EXTENSION_NOTIFICATIONCONTENT \
+				DISTRIBUTION_PROVISIONING_PROFILE_EXTENSION_INTENTS \
+				DISTRIBUTION_PROVISIONING_PROFILE_WATCH_APP \
+				DISTRIBUTION_PROVISIONING_PROFILE_WATCH_EXTENSION \
+			)
+		    ;;
+		*)
+		    echo "Unknown build provisioning type: $PROFILES_TYPE"
+		    exit 1
+		    ;;
+	esac
+
+	EXPECTED_VARIABLE_NAMES=(\
+		Telegram \
+		Share \
+		Widget \
+		NotificationService \
+		NotificationContent \
+		Intents \
+		WatchApp \
+		WatchExtension \
+	)
+
+	local SEARCH_NAMES=()
+
+	local MISSING_VARIABLES="0"
+	for VARIABLE_NAME in ${EXPECTED_VARIABLES[@]}; do
+		if [ "${!VARIABLE_NAME}" = "" ]; then
+			echo "$VARIABLE_NAME not defined"
+			MISSING_VARIABLES="1"
+		fi
+	done
+
+	if [ "$MISSING_VARIABLES" == "1" ]; then
+		exit 1
+	fi
+
+	local VARIABLE_COUNT=${#EXPECTED_VARIABLES[@]}
+	for (( i=0; i<$VARIABLE_COUNT; i=i+1 )); do
+		VARIABLE_NAME="${EXPECTED_VARIABLES[$(($i))]}"
+		SEARCH_NAMES=("${SEARCH_NAMES[@]}" "${EXPECTED_VARIABLE_NAMES[$i]}" "${!VARIABLE_NAME}")
+	done
+
+	local DATA_PATH="build-input/data"
+
+	local OUTPUT_DIRECTORY="$DATA_PATH/provisioning-profiles"
+	rm -rf "$OUTPUT_DIRECTORY"
+	mkdir -p "$OUTPUT_DIRECTORY"
+
+	local BUILD_PATH="$OUTPUT_DIRECTORY/BUILD"
+	touch "$BUILD_PATH"
+
+	echo "exports_files([" >> "$BUILD_PATH"
+
+	local ELEMENT_COUNT=${#SEARCH_NAMES[@]}
+	local REMAINDER=$(($ELEMENT_COUNT % 2))
+
+	if [ $REMAINDER != 0 ]; then
+		>&2 echo "Expecting key-value pairs"
+		exit 1
+	fi
+
+	for PROFILE in `find "$CODESIGNING_DATA_PATH" -type f -name "*.mobileprovision"`; do
+		PROFILE_DATA=$(security cms -D -i "$PROFILE")
+		PROFILE_NAME=$(/usr/libexec/PlistBuddy -c "Print :Name" /dev/stdin <<< $(echo $PROFILE_DATA))
+		for (( i=0; i<$ELEMENT_COUNT; i=i+2 )); do
+			ID=${SEARCH_NAMES[$i]}
+			SEARCH_NAME=${SEARCH_NAMES[$(($i + 1))]}
+			if [ "$PROFILE_NAME" = "$SEARCH_NAME" ]; then
+				VARIABLE_NAME="FOUND_PROFILE_$ID"
+				if [ "${!VARIABLE_NAME}" = "" ]; then
+					eval "FOUND_PROFILE_$ID=\"$PROFILE\""
+				else 
+					>&2 echo "Found multiple profiles with name \"$SEARCH_NAME\""
+					exit 1
+				fi
+			fi
+		done
+	done
+
+	for (( i=0; i<$ELEMENT_COUNT; i=i+2 )); do
+		ID=${SEARCH_NAMES[$i]}
+		SEARCH_NAME=${SEARCH_NAMES[$(($i + 1))]}
+		VARIABLE_NAME="FOUND_PROFILE_$ID"
+		FOUND_PROFILE="${!VARIABLE_NAME}"
+		if [ "$FOUND_PROFILE" = "" ]; then
+			>&2 echo "Profile \"$SEARCH_NAME\" not found"
+			exit 1
+		fi
+
+		cp "$FOUND_PROFILE" "$OUTPUT_DIRECTORY/$ID.mobileprovision"
+		echo "    \"$ID.mobileprovision\"," >> $BUILD_PATH
+	done
+
+	echo "])" >> "$BUILD_PATH"
+}
diff --git a/build-system/defines.bzl b/build-system/defines.bzl
new file mode 100644
index 0000000000..d9e5ac9fdd
--- /dev/null
+++ b/build-system/defines.bzl
@@ -0,0 +1,36 @@
+def string_value(ctx, define_name):
+    """Looks up a define on ctx for a string value.
+
+    Will also report an error if the value is not defined.
+
+    Args:
+      ctx: A skylark context.
+      define_name: The name of the define to look up.
+
+    Returns:
+      The value of the define.
+    """
+    value = ctx.var.get(define_name, None)
+    if value != None:
+        return value
+    fail("Expected value for --define={} was not found".format(
+        define_name,
+    ))
+
+def _file_from_define(ctx):
+    output = ctx.outputs.out
+    ctx.actions.write(
+        output = output,
+        content = "profile_data",
+    )
+
+file_from_define = rule(
+    implementation = _file_from_define,
+    attrs = {
+        "define_name": attr.string(mandatory = True),
+        "extension": attr.string(mandatory = True),
+    },
+    outputs = {
+        "out": "%{name}.%{extension}"
+    },
+)
diff --git a/build-system/generate-xcode-project.sh b/build-system/generate-xcode-project.sh
new file mode 100755
index 0000000000..4cc7c0d8b1
--- /dev/null
+++ b/build-system/generate-xcode-project.sh
@@ -0,0 +1,95 @@
+#!/bin/sh
+
+set -e
+
+BAZEL="$(which bazel)"
+if [ "$BAZEL" = "" ]; then
+	echo "bazel not found in PATH"
+	exit 1
+fi
+
+XCODE_VERSION=$(cat "build-system/xcode_version")
+INSTALLED_XCODE_VERSION=$(echo `plutil -p \`xcode-select -p\`/../Info.plist | grep -e CFBundleShortVersionString | sed 's/[^0-9\.]*//g'`)
+
+if [ "$INSTALLED_XCODE_VERSION" != "$XCODE_VERSION" ]; then
+	echo "Xcode $XCODE_VERSION required, $INSTALLED_XCODE_VERSION installed (at $(xcode-select -p))"
+	exit 1
+fi
+
+EXPECTED_VARIABLES=(\
+	BUILD_NUMBER \
+	APP_VERSION \
+	BUNDLE_ID \
+	DEVELOPMENT_TEAM \
+	API_ID \
+	API_HASH \
+	APP_CENTER_ID \
+	IS_INTERNAL_BUILD \
+	IS_APPSTORE_BUILD \
+	APPSTORE_ID \
+	APP_SPECIFIC_URL_SCHEME \
+)
+
+MISSING_VARIABLES="0"
+for VARIABLE_NAME in ${EXPECTED_VARIABLES[@]}; do
+	if [ "${!VARIABLE_NAME}" = "" ]; then
+		echo "$VARIABLE_NAME not defined"
+		MISSING_VARIABLES="1"
+	fi
+done
+if [ "$MISSING_VARIABLES" == "1" ]; then
+	exit 1
+fi
+
+GEN_DIRECTORY="build-input/gen/project"
+rm -rf "$GEN_DIRECTORY"
+mkdir -p "$GEN_DIRECTORY"
+
+pushd "build-system/tulsi"
+"$BAZEL" build //:tulsi --xcode_version="$XCODE_VERSION"
+popd
+
+TULSI_DIRECTORY="build-input/gen/project"
+TULSI_APP="build-input/gen/project/Tulsi.app"
+TULSI="$TULSI_APP/Contents/MacOS/Tulsi"
+mkdir -p "$TULSI_DIRECTORY"
+
+unzip -oq "build-system/tulsi/bazel-bin/tulsi.zip" -d "$TULSI_DIRECTORY"
+
+CORE_COUNT=$(sysctl -n hw.logicalcpu)
+CORE_COUNT_MINUS_ONE=$(expr ${CORE_COUNT} \- 1)
+
+BAZEL_OPTIONS=(\
+	--features=swift.use_global_module_cache \
+	--spawn_strategy=standalone \
+	--strategy=SwiftCompile=standalone \
+	--features=swift.enable_batch_mode \
+	--swiftcopt=-j${CORE_COUNT_MINUS_ONE} \
+)
+
+if [ "$BAZEL_CACHE_DIR" != "" ]; then
+	BAZEL_OPTIONS=("${BAZEL_OPTIONS[@]}" --disk_cache="$(echo $BAZEL_CACHE_DIR | sed -e 's/[\/&]/\\&/g')")
+fi 
+
+"$TULSI" -- \
+	--verbose \
+	--create-tulsiproj Telegram \
+	--workspaceroot ./ \
+	--bazel "$BAZEL" \
+	--outputfolder "$GEN_DIRECTORY" \
+	--target Telegram:Telegram \
+	--target Telegram:Main \
+	--target Telegram:Lib \
+
+PATCH_OPTIONS="BazelBuildOptionsDebug BazelBuildOptionsRelease"
+for NAME in $PATCH_OPTIONS; do
+	sed -i "" -e '1h;2,$H;$!d;g' -e 's/\("'"$NAME"'" : {\n[ ]*"p" : "$(inherited)\)/\1'" ${BAZEL_OPTIONS[*]}"'/' "$GEN_DIRECTORY/Telegram.tulsiproj/Configs/Telegram.tulsigen"
+done
+
+sed -i "" -e '1h;2,$H;$!d;g' -e 's/\("sourceFilters" : \[\n[ ]*\)"\.\/\.\.\."/\1"Telegram\/...", "submodules\/..."/' "$GEN_DIRECTORY/Telegram.tulsiproj/Configs/Telegram.tulsigen"
+
+"$TULSI" -- \
+	--verbose \
+	--genconfig "$GEN_DIRECTORY/Telegram.tulsiproj:Telegram" \
+	--bazel "$BAZEL" \
+	--outputfolder "$GEN_DIRECTORY" \
diff --git a/build-system/manage-developer-portal-app.sh b/build-system/manage-developer-portal-app.sh
new file mode 100644
index 0000000000..60e21c1381
--- /dev/null
+++ b/build-system/manage-developer-portal-app.sh
@@ -0,0 +1,129 @@
+#!/bin/bash
+
+set -e
+
+FASTLANE="$(which fastlane)"
+
+EXPECTED_VARIABLES=(\
+    APPLE_ID \
+    BASE_BUNDLE_ID \
+    APP_NAME \
+    TEAM_ID \
+    PROVISIONING_DIRECTORY \
+)
+
+MISSING_VARIABLES="0"
+for VARIABLE_NAME in ${EXPECTED_VARIABLES[@]}; do
+    if [ "${!VARIABLE_NAME}" = "" ]; then
+        echo "$VARIABLE_NAME not defined"
+        MISSING_VARIABLES="1"
+    fi
+done
+if [ "$MISSING_VARIABLES" == "1" ]; then
+    exit 1
+fi
+
+if [ ! -d "$PROVISIONING_DIRECTORY" ]; then
+    echo "Directory $PROVISIONING_DIRECTORY does not exist"
+    exit 1
+fi
+
+BASE_DIR=$(mktemp -d)
+FASTLANE_DIR="$BASE_DIR/fastlane"
+mkdir "$FASTLANE_DIR"
+FASTFILE="$FASTLANE_DIR/Fastfile"
+
+touch "$FASTFILE"
+
+CREDENTIALS=(\
+    --username "$APPLE_ID" \
+    --team_id "$TEAM_ID" \
+)
+export FASTLANE_SKIP_UPDATE_CHECK=1
+
+APP_EXTENSIONS=(\
+    Share \
+    SiriIntents \
+    NotificationContent \
+    NotificationService \
+    Widget \
+)
+
+echo "lane :manage_app do" >> "$FASTFILE"
+echo "  produce(" >> "$FASTFILE"
+echo "      username: '$APPLE_ID'," >> "$FASTFILE"
+echo "      app_identifier: '${BASE_BUNDLE_ID}'," >> "$FASTFILE"
+echo "      app_name: '$APP_NAME'," >> "$FASTFILE"
+echo "      language: 'English'," >> "$FASTFILE"
+echo "      app_version: '1.0'," >> "$FASTFILE"
+echo "      team_id: '$TEAM_ID'," >> "$FASTFILE"
+echo "      skip_itc: true," >> "$FASTFILE"
+echo "  )" >> "$FASTFILE"
+
+echo "  produce(" >> "$FASTFILE"
+echo "      username: '$APPLE_ID'," >> "$FASTFILE"
+echo "      app_identifier: '${BASE_BUNDLE_ID}.watchkitapp'," >> "$FASTFILE"
+echo "      app_name: '$APP_NAME Watch App'," >> "$FASTFILE"
+echo "      language: 'English'," >> "$FASTFILE"
+echo "      app_version: '1.0'," >> "$FASTFILE"
+echo "      team_id: '$TEAM_ID'," >> "$FASTFILE"
+echo "      skip_itc: true," >> "$FASTFILE"
+echo "  )" >> "$FASTFILE"
+
+echo "  produce(" >> "$FASTFILE"
+echo "      username: '$APPLE_ID'," >> "$FASTFILE"
+echo "      app_identifier: '${BASE_BUNDLE_ID}.watchkitapp.watchkitextension'," >> "$FASTFILE"
+echo "      app_name: '$APP_NAME Watch App Extension'," >> "$FASTFILE"
+echo "      language: 'English'," >> "$FASTFILE"
+echo "      app_version: '1.0'," >> "$FASTFILE"
+echo "      team_id: '$TEAM_ID'," >> "$FASTFILE"
+echo "      skip_itc: true," >> "$FASTFILE"
+echo "  )" >> "$FASTFILE"
+
+for EXTENSION in ${APP_EXTENSIONS[@]}; do
+    echo "  produce(" >> "$FASTFILE"
+    echo "      username: '$APPLE_ID'," >> "$FASTFILE"
+    echo "      app_identifier: '${BASE_BUNDLE_ID}.${EXTENSION}'," >> "$FASTFILE"
+    echo "      app_name: '${APP_NAME} ${EXTENSION}'," >> "$FASTFILE"
+    echo "      language: 'English'," >> "$FASTFILE"
+    echo "      app_version: '1.0'," >> "$FASTFILE"
+    echo "      team_id: '$TEAM_ID'," >> "$FASTFILE"
+    echo "      skip_itc: true," >> "$FASTFILE"
+    echo "  )" >> "$FASTFILE"
+done
+
+echo "end" >> "$FASTFILE"
+
+pushd "$BASE_DIR"
+
+fastlane cert ${CREDENTIALS[@]} --development
+
+fastlane manage_app
+
+fastlane produce group -g "group.$BASE_BUNDLE_ID" -n "$APP_NAME Group" ${CREDENTIALS[@]}
+
+fastlane produce enable_services -a "$BASE_BUNDLE_ID" ${CREDENTIALS[@]} \
+    --app-group \
+    --push-notification \
+    --sirikit
+
+fastlane produce associate_group -a "$BASE_BUNDLE_ID" "group.$BASE_BUNDLE_ID" ${CREDENTIALS[@]}
+for EXTENSION in ${APP_EXTENSIONS[@]}; do
+    fastlane produce enable_services -a "${BASE_BUNDLE_ID}.${EXTENSION}" ${CREDENTIALS[@]} \
+        --app-group
+
+    fastlane produce associate_group -a "${BASE_BUNDLE_ID}.${EXTENSION}" "group.$BASE_BUNDLE_ID" ${CREDENTIALS[@]}
+done
+
+for DEVELOPMENT_FLAG in "--development"; do
+    fastlane sigh -a "$BASE_BUNDLE_ID" ${CREDENTIALS[@]} -o "$PROVISIONING_DIRECTORY" $DEVELOPMENT_FLAG \
+        --skip_install
+    for EXTENSION in ${APP_EXTENSIONS[@]}; do
+        fastlane sigh -a "${BASE_BUNDLE_ID}.${EXTENSION}" ${CREDENTIALS[@]} -o "$PROVISIONING_DIRECTORY" $DEVELOPMENT_FLAG \
+            --skip_install
+    done
+done
+
+popd
+
+rm -rf "$BASE_DIR"
diff --git a/build-system/plist_fragment.bzl b/build-system/plist_fragment.bzl
new file mode 100644
index 0000000000..4b28670773
--- /dev/null
+++ b/build-system/plist_fragment.bzl
@@ -0,0 +1,52 @@
+load("//build-system:defines.bzl",
+    "string_value",
+)
+
+def _plist_fragment(ctx):
+    output = ctx.outputs.out
+
+    found_keys = list()
+    template = ctx.attr.template
+    current_start = 0
+    for i in range(len(template)):
+        start_index = template.find("{", current_start)
+        if start_index == -1:
+            break
+        end_index = template.find("}", start_index + 1)
+        if end_index == -1:
+            fail("Could not find the matching '}' for the '{' at {}".format(start_index))
+        found_keys.append(template[start_index + 1:end_index])
+        current_start = end_index + 1
+
+    resolved_values = dict()
+    for key in found_keys:
+        value = ctx.var.get(key, None)
+        if value == None:
+            fail("Expected value for --define={} was not found".format(key))
+        resolved_values[key] = value
+
+    plist_string = """
+    <?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>
+    """ + template.format(**resolved_values) + """
+    </dict>
+    </plist>
+    """
+
+    ctx.actions.write(
+        output = output,
+        content = plist_string,
+    )
+
+plist_fragment = rule(
+    implementation = _plist_fragment,
+    attrs = {
+        "extension": attr.string(mandatory = True),
+        "template": attr.string(mandatory = True),
+    },
+    outputs = {
+        "out": "%{name}.%{extension}"
+    },
+)
diff --git a/build-system/prepare-build-variables.sh b/build-system/prepare-build-variables.sh
new file mode 100755
index 0000000000..d88042f518
--- /dev/null
+++ b/build-system/prepare-build-variables.sh
@@ -0,0 +1,69 @@
+#!/bin/sh
+
+set -e
+
+prepare_build_variables () {
+	BUILD_TYPE="$1"
+	case "$BUILD_TYPE" in
+		development)
+	    	APS_ENVIRONMENT="development"
+			;;
+		distribution)
+		    APS_ENVIRONMENT="production"
+		    ;;
+		*)
+		    echo "Unknown build provisioning type: $BUILD_TYPE"
+		    exit 1
+		    ;;
+	esac
+
+	local BAZEL="$(which bazel)"
+	if [ "$BAZEL" = "" ]; then
+		echo "bazel not found in PATH"
+		exit 1
+	fi
+
+	local EXPECTED_VARIABLES=(\
+		BUILD_NUMBER \
+		APP_VERSION \
+		BUNDLE_ID \
+		DEVELOPMENT_TEAM \
+		API_ID \
+		API_HASH \
+		APP_CENTER_ID \
+		IS_INTERNAL_BUILD \
+		IS_APPSTORE_BUILD \
+		APPSTORE_ID \
+		APP_SPECIFIC_URL_SCHEME \
+	)
+
+	local MISSING_VARIABLES="0"
+	for VARIABLE_NAME in ${EXPECTED_VARIABLES[@]}; do
+		if [ "${!VARIABLE_NAME}" = "" ]; then
+			echo "$VARIABLE_NAME not defined"
+			MISSING_VARIABLES="1"
+		fi
+	done
+
+	if [ "$MISSING_VARIABLES" == "1" ]; then
+		exit 1
+	fi
+
+	local VARIABLES_DIRECTORY="build-input/data"
+	mkdir -p "$VARIABLES_DIRECTORY"
+	local VARIABLES_PATH="$VARIABLES_DIRECTORY/variables.bzl"
+	rm -f "$VARIABLES_PATH"
+
+	echo "telegram_build_number = \"$BUILD_NUMBER\"" >> "$VARIABLES_PATH"
+	echo "telegram_version = \"$APP_VERSION\"" >> "$VARIABLES_PATH"
+	echo "telegram_bundle_id = \"$BUNDLE_ID\"" >> "$VARIABLES_PATH"	
+	echo "telegram_api_id = \"$API_ID\"" >> "$VARIABLES_PATH"
+	echo "telegram_team_id = \"$DEVELOPMENT_TEAM\"" >> "$VARIABLES_PATH"
+	echo "telegram_api_hash = \"$API_HASH\"" >> "$VARIABLES_PATH"
+	echo "telegram_app_center_id = \"$APP_CENTER_ID\"" >> "$VARIABLES_PATH"
+	echo "telegram_is_internal_build = \"$IS_INTERNAL_BUILD\"" >> "$VARIABLES_PATH"
+	echo "telegram_is_appstore_build = \"$IS_APPSTORE_BUILD\"" >> "$VARIABLES_PATH"
+	echo "telegram_appstore_id = \"$APPSTORE_ID\"" >> "$VARIABLES_PATH"
+	echo "telegram_app_specific_url_scheme = \"$APP_SPECIFIC_URL_SCHEME\"" >> "$VARIABLES_PATH"
+	echo "telegram_aps_environment = \"$APS_ENVIRONMENT\"" >> "$VARIABLES_PATH"
+}
diff --git a/build-system/prepare-build.sh b/build-system/prepare-build.sh
new file mode 100755
index 0000000000..c65df066f1
--- /dev/null
+++ b/build-system/prepare-build.sh
@@ -0,0 +1,33 @@
+#!/bin/sh
+
+set -e
+
+BUILD_TYPE="$1"
+case "$BUILD_TYPE" in
+	development)
+    	PROFILES_TYPE="development"
+		;;
+	distribution)
+	    PROFILES_TYPE="distribution"
+	    ;;
+	*)
+	    echo "Unknown build provisioning type: $BUILD_TYPE"
+	    exit 1
+	    ;;
+esac
+
+BASE_PATH=$(dirname $0)
+
+DATA_DIRECTORY="build-input/data"
+rm -rf "$DATA_DIRECTORY"
+mkdir -p "$DATA_DIRECTORY"
+touch "$DATA_DIRECTORY/BUILD"
+
+source "$BASE_PATH/copy-provisioning-profiles.sh"
+source "$BASE_PATH/prepare-build-variables.sh"
+
+echo "Copying provisioning profiles..."
+copy_provisioning_profiles "$PROFILES_TYPE"
+
+echo "Preparing build variables..."
+prepare_build_variables "$BUILD_TYPE"
diff --git a/build-system/tulsi b/build-system/tulsi
new file mode 160000
index 0000000000..ee185c4c20
--- /dev/null
+++ b/build-system/tulsi
@@ -0,0 +1 @@
+Subproject commit ee185c4c20ea4384bc3cbf8ccd8705c904154abb
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/build-system/verify.sh b/build-system/verify.sh
index d260604e30..89e33bef02 100644
--- a/build-system/verify.sh
+++ b/build-system/verify.sh
@@ -21,22 +21,22 @@ if [ -z "$BUILD_NUMBER" ]; then
 	exit 1
 fi
 
-export ENTITLEMENTS_APP="Telegram/Telegram-iOS/Telegram-iOS-AppStoreLLC.entitlements"
+export ENTITLEMENTS_APP="Telegram-iOS/Telegram-iOS-AppStoreLLC.entitlements"
 export DEVELOPMENT_PROVISIONING_PROFILE_APP="match Development ph.telegra.Telegraph"
 export DISTRIBUTION_PROVISIONING_PROFILE_APP="match AppStore ph.telegra.Telegraph"
-export ENTITLEMENTS_EXTENSION_SHARE="Telegram/Share/Share-AppStoreLLC.entitlements"
+export ENTITLEMENTS_EXTENSION_SHARE="Share/Share-AppStoreLLC.entitlements"
 export DEVELOPMENT_PROVISIONING_PROFILE_EXTENSION_SHARE="match Development ph.telegra.Telegraph.Share"
 export DISTRIBUTION_PROVISIONING_PROFILE_EXTENSION_SHARE="match AppStore ph.telegra.Telegraph.Share"
-export ENTITLEMENTS_EXTENSION_WIDGET="Telegram/Widget/Widget-AppStoreLLC.entitlements"
+export ENTITLEMENTS_EXTENSION_WIDGET="Widget/Widget-AppStoreLLC.entitlements"
 export DEVELOPMENT_PROVISIONING_PROFILE_EXTENSION_WIDGET="match Development ph.telegra.Telegraph.Widget"
 export DISTRIBUTION_PROVISIONING_PROFILE_EXTENSION_WIDGET="match AppStore ph.telegra.Telegraph.Widget"
-export ENTITLEMENTS_EXTENSION_NOTIFICATIONSERVICE="Telegram/NotificationService/NotificationService-AppStoreLLC.entitlements"
+export ENTITLEMENTS_EXTENSION_NOTIFICATIONSERVICE="NotificationService/NotificationService-AppStoreLLC.entitlements"
 export DEVELOPMENT_PROVISIONING_PROFILE_EXTENSION_NOTIFICATIONSERVICE="match Development ph.telegra.Telegraph.NotificationService"
 export DISTRIBUTION_PROVISIONING_PROFILE_EXTENSION_NOTIFICATIONSERVICE="match AppStore ph.telegra.Telegraph.NotificationService"
-export ENTITLEMENTS_EXTENSION_NOTIFICATIONCONTENT="Telegram/NotificationContent/NotificationContent-AppStoreLLC.entitlements"
+export ENTITLEMENTS_EXTENSION_NOTIFICATIONCONTENT="NotificationContent/NotificationContent-AppStoreLLC.entitlements"
 export DEVELOPMENT_PROVISIONING_PROFILE_EXTENSION_NOTIFICATIONCONTENT="match Development ph.telegra.Telegraph.NotificationContent"
 export DISTRIBUTION_PROVISIONING_PROFILE_EXTENSION_NOTIFICATIONCONTENT="match AppStore ph.telegra.Telegraph.NotificationContent"
-export ENTITLEMENTS_EXTENSION_INTENTS="Telegram/SiriIntents/SiriIntents-AppStoreLLC.entitlements"
+export ENTITLEMENTS_EXTENSION_INTENTS="SiriIntents/SiriIntents-AppStoreLLC.entitlements"
 export DEVELOPMENT_PROVISIONING_PROFILE_EXTENSION_INTENTS="match Development ph.telegra.Telegraph.SiriIntents"
 export DISTRIBUTION_PROVISIONING_PROFILE_EXTENSION_INTENTS="match AppStore ph.telegra.Telegraph.SiriIntents"
 export DEVELOPMENT_PROVISIONING_PROFILE_WATCH_APP="match Development ph.telegra.Telegraph.watchkitapp"
diff --git a/build-system/xcode_version b/build-system/xcode_version
new file mode 100644
index 0000000000..f226094f1f
--- /dev/null
+++ b/build-system/xcode_version
@@ -0,0 +1 @@
+11.3.1
\ No newline at end of file
diff --git a/fastlane/Fastfile b/fastlane/Fastfile
deleted file mode 100644
index 9d9c295348..0000000000
--- a/fastlane/Fastfile
+++ /dev/null
@@ -1,65 +0,0 @@
-fastlane_version "1.81.0"
-
-default_platform :ios
-
-base_app_identifier_llc = "ph.telegra.Telegraph"
-app_identifier_llc = [
-  base_app_identifier_llc,
-  base_app_identifier_llc + ".Widget",
-  base_app_identifier_llc + ".NotificationContent",
-  base_app_identifier_llc + ".SiriIntents",
-  base_app_identifier_llc + ".Share",
-  base_app_identifier_llc + ".watchkitapp",
-  base_app_identifier_llc + ".watchkitapp.watchkitextension",
-  base_app_identifier_llc + ".NotificationService"
-]
-signing_identity_llc = "iPhone Distribution: Digital Fortress LLC (C67CF9S4VU)"
-
-lane :do_build_app do |options|
-  puts("Building with build number: " + options[:build_number] + ", commit id: " + options[:commit_id])
-  gym(
-    workspace: "Telegram-iOS.xcworkspace",
-    configuration: options[:configuration],
-    scheme: options[:scheme],
-    silent: false,
-    clean: true,
-    export_method: options[:export_method],
-    output_name: options[:scheme],
-    derived_data_path: "build/" + options[:scheme] + "/DerivedData",
-    xcargs: "BUILD_NUMBER='" + options[:build_number] + "' " + "COMMIT_ID='" + options[:commit_id] + "'",
-    archive_path: "build/" + options[:scheme] + "/Archive",
-    export_options: {
-      compileBitcode: false,
-      iCloudContainerEnvironment: "Production",
-      provisioningProfiles: options[:provisioningProfiles],
-      stripSwiftSymbols: true,
-      uploadBitcode: false,
-      signingCertificate: options[:signingCertificate]
-    }
-  )
-end
-
-lane :build_for_appstore do |options|
-  do_build_app(
-  	configuration: "ReleaseAppStoreLLC",
-    scheme: "Telegram-iOS-AppStoreLLC",
-    export_method: "app-store",
-    build_number: options[:build_number],
-    commit_id: options[:commit_hash],
-    signingCertificate: signing_identity_llc,
-    provisioningProfiles: { 
-      base_app_identifier_llc => "match AppStore " + base_app_identifier_llc,
-      base_app_identifier_llc + ".Share" => "match AppStore " + base_app_identifier_llc + ".Share",
-      base_app_identifier_llc + ".SiriIntents" => "match AppStore " + base_app_identifier_llc + ".SiriIntents",
-      base_app_identifier_llc + ".Widget" => "match AppStore " + base_app_identifier_llc + ".Widget",
-      base_app_identifier_llc + ".NotificationContent" => "match AppStore " + base_app_identifier_llc + ".NotificationContent",
-      base_app_identifier_llc + ".watchkitapp.watchkitextension" => "match AppStore " + base_app_identifier_llc + ".watchkitapp.watchkitextension",
-      base_app_identifier_llc + ".watchkitapp" => "match AppStore " + base_app_identifier_llc + ".watchkitapp",
-      base_app_identifier_llc + ".NotificationService" => "match AppStore " + base_app_identifier_llc + ".NotificationService"
-    }
-  )
-end
-
-if File.exists?("../buildbox/transient-data/telegram-ios-shared/fastlane/Fastfile")
-  import "../buildbox/transient-data/telegram-ios-shared/fastlane/Fastfile"
-end
diff --git a/package_app.sh b/package_app.sh
index cbf6961a69..bd0c12db93 100644
--- a/package_app.sh
+++ b/package_app.sh
@@ -1,6 +1,5 @@
 #!/bin/sh
 
-#set -x
 set -e
 
 if [ -z "$1" ] || [ -z "$2" ] || [ -z "$3" ]; then
@@ -55,7 +54,7 @@ mkdir -p "$TEMP_ENTITLEMENTS_PATH"
 if [ "$APP_TYPE" == "wallet" ]; then
 	cp "buck-out/gen/Wallet/AppPackage#$PLATFORM_FLAVORS.ipa" "$IPA_PATH.original"
 else
-	cp "buck-out/gen/AppPackage#$PLATFORM_FLAVORS.ipa" "$IPA_PATH.original"
+	cp "buck-out/gen/Telegram/AppPackage#$PLATFORM_FLAVORS.ipa" "$IPA_PATH.original"
 fi
 rm -rf "$IPA_PATH.original.unpacked"
 rm -f "$BUILD_PATH/${APP_NAME}_signed.ipa"
@@ -278,7 +277,7 @@ APP_PLIST="$APP_PATH/Info.plist"
 if [ "$APP_TYPE" == "wallet" ]; then
 	APP_BINARY_TARGET="//Wallet:Wallet"
 else
-	APP_BINARY_TARGET="//:Telegram"
+	APP_BINARY_TARGET="//Telegram:Telegram"
 fi
 
 echo "Repacking frameworks..."
@@ -312,7 +311,7 @@ done
 if [ "$APP_TYPE" == "wallet" ]; then
 	APP_BINARY_DSYM_PATH="buck-out/gen/Wallet/Wallet#dwarf-and-dsym,$PLATFORM_FLAVORS,no-include-frameworks/Wallet.app.dSYM"
 else
-	APP_BINARY_DSYM_PATH="buck-out/gen/Telegram#dwarf-and-dsym,$PLATFORM_FLAVORS,no-include-frameworks/Telegram.app.dSYM"
+	APP_BINARY_DSYM_PATH="buck-out/gen/Telegram/Telegram#dwarf-and-dsym,$PLATFORM_FLAVORS,no-include-frameworks/Telegram.app.dSYM"
 fi
 cp -r "$APP_BINARY_DSYM_PATH" "$DSYMS_DIR/"
 
@@ -323,12 +322,12 @@ else
 fi
 
 for EXTENSION in $EXTENSIONS; do
-	EXTENSION_DSYM_PATH="buck-out/gen/${EXTENSION}Extension#dwarf-and-dsym,$PLATFORM_FLAVORS,no-include-frameworks/${EXTENSION}Extension.appex.dSYM"
+	EXTENSION_DSYM_PATH="buck-out/gen/Telegram/${EXTENSION}Extension#dwarf-and-dsym,$PLATFORM_FLAVORS,no-include-frameworks/${EXTENSION}Extension.appex.dSYM"
 	cp -r "$EXTENSION_DSYM_PATH" "$DSYMS_DIR/"
 done
 
 if [ "$APP_TYPE" != "wallet" ]; then
-	WATCH_EXTENSION_DSYM_PATH="buck-out/gen/WatchAppExtension#dwarf-and-dsym,no-include-frameworks,watchos-arm64_32,watchos-armv7k/WatchAppExtension.appex.dSYM"
+	WATCH_EXTENSION_DSYM_PATH="buck-out/gen/Telegram/WatchAppExtension#dwarf-and-dsym,no-include-frameworks,watchos-arm64_32,watchos-armv7k/WatchAppExtension.appex.dSYM"
 	cp -r "$WATCH_EXTENSION_DSYM_PATH" "$DSYMS_DIR/"
 fi
 
diff --git a/submodules/AccountContext/BUCK b/submodules/AccountContext/BUCK
index 6a3a3d431f..120fec2a7e 100644
--- a/submodules/AccountContext/BUCK
+++ b/submodules/AccountContext/BUCK
@@ -16,7 +16,7 @@ static_library(
     	"//submodules/Postbox:Postbox#shared",
     	"//submodules/TelegramCore:TelegramCore#shared",
         "//submodules/SyncCore:SyncCore#shared",
-        #"//submodules/WalletCore:WalletCore",
+        "//submodules/WalletCore:WalletCore",
     ],
     frameworks = [
         "$SDKROOT/System/Library/Frameworks/Foundation.framework",
diff --git a/submodules/AccountContext/BUILD b/submodules/AccountContext/BUILD
new file mode 100644
index 0000000000..fd5976b7f7
--- /dev/null
+++ b/submodules/AccountContext/BUILD
@@ -0,0 +1,25 @@
+load("@build_bazel_rules_swift//swift:swift.bzl", "swift_library")
+
+swift_library(
+    name = "AccountContext",
+    module_name = "AccountContext",
+    srcs = glob([
+        "Sources/**/*.swift",
+    ]),
+    deps = [
+        "//submodules/TelegramAudio:TelegramAudio",
+        "//submodules/AsyncDisplayKit:AsyncDisplayKit",
+        "//submodules/TemporaryCachedPeerDataManager:TemporaryCachedPeerDataManager",
+        "//submodules/DeviceLocationManager:DeviceLocationManager",
+        "//submodules/MediaPlayer:UniversalMediaPlayer",
+        "//submodules/TelegramPresentationData:TelegramPresentationData",
+        "//submodules/SSignalKit/SwiftSignalKit:SwiftSignalKit",
+        "//submodules/Postbox:Postbox",
+        "//submodules/TelegramCore:TelegramCore",
+        "//submodules/SyncCore:SyncCore",
+        "//submodules/WalletCore:WalletCore",
+    ],
+    visibility = [
+        "//visibility:public",
+    ],
+)
diff --git a/submodules/AccountContext/Info.plist b/submodules/AccountContext/Info.plist
deleted file mode 100644
index e1fe4cfb7b..0000000000
--- a/submodules/AccountContext/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/AccountContext/Sources/AccountContext.swift b/submodules/AccountContext/Sources/AccountContext.swift
index cb51c254cc..28b26239f2 100644
--- a/submodules/AccountContext/Sources/AccountContext.swift
+++ b/submodules/AccountContext/Sources/AccountContext.swift
@@ -1,10 +1,12 @@
 import Foundation
+import UIKit
 import Postbox
 import TelegramCore
 import SyncCore
 import TelegramPresentationData
 import TelegramUIPreferences
 import SwiftSignalKit
+import AsyncDisplayKit
 import Display
 import DeviceLocationManager
 import TemporaryCachedPeerDataManager
@@ -262,6 +264,7 @@ public enum PeerInfoControllerMode {
     case generic
     case calls(messages: [Message])
     case nearbyPeer
+    case group(PeerId)
 }
 
 public enum ContactListActionItemInlineIconPosition {
diff --git a/submodules/AccountContext/Sources/ChatController.swift b/submodules/AccountContext/Sources/ChatController.swift
index da9d89bc63..4ecd45faa4 100644
--- a/submodules/AccountContext/Sources/ChatController.swift
+++ b/submodules/AccountContext/Sources/ChatController.swift
@@ -1,8 +1,10 @@
 import Foundation
+import UIKit
 import Postbox
 import TelegramCore
 import SyncCore
 import TextFormat
+import AsyncDisplayKit
 import Display
 import SwiftSignalKit
 import TelegramPresentationData
diff --git a/submodules/AccountContext/Sources/ChatListController.swift b/submodules/AccountContext/Sources/ChatListController.swift
index f0e4304440..ad9ac4ee69 100644
--- a/submodules/AccountContext/Sources/ChatListController.swift
+++ b/submodules/AccountContext/Sources/ChatListController.swift
@@ -1,4 +1,5 @@
 import Foundation
+import UIKit
 import Postbox
 import Display
 
diff --git a/submodules/AccountContext/Sources/ContactMultiselectionController.swift b/submodules/AccountContext/Sources/ContactMultiselectionController.swift
index 0d69cfc183..a0371a2cd3 100644
--- a/submodules/AccountContext/Sources/ContactMultiselectionController.swift
+++ b/submodules/AccountContext/Sources/ContactMultiselectionController.swift
@@ -1,12 +1,36 @@
 import Foundation
+import UIKit
 import Display
 import SwiftSignalKit
 import Postbox
 
+public struct ChatListNodeAdditionalCategory {
+    public var id: Int
+    public var icon: UIImage?
+    public var title: String
+    
+    public init(id: Int, icon: UIImage?, title: String) {
+        self.id = id
+        self.icon = icon
+        self.title = title
+    }
+}
+
+public struct ContactMultiselectionControllerAdditionalCategories {
+    public var categories: [ChatListNodeAdditionalCategory]
+    public var selectedCategories: Set<Int>
+    
+    public init(categories: [ChatListNodeAdditionalCategory], selectedCategories: Set<Int>) {
+        self.categories = categories
+        self.selectedCategories = selectedCategories
+    }
+}
+
 public enum ContactMultiselectionControllerMode {
     case groupCreation
     case peerSelection(searchChatList: Bool, searchGroups: Bool, searchChannels: Bool)
     case channelCreation
+    case chatSelection(selectedChats: Set<PeerId>, additionalCategories: ContactMultiselectionControllerAdditionalCategories?)
 }
 
 public enum ContactListFilter {
@@ -20,17 +44,24 @@ public final class ContactMultiselectionControllerParams {
     public let mode: ContactMultiselectionControllerMode
     public let options: [ContactListAdditionalOption]
     public let filters: [ContactListFilter]
+    public let alwaysEnabled: Bool
 
-    public init(context: AccountContext, mode: ContactMultiselectionControllerMode, options: [ContactListAdditionalOption], filters: [ContactListFilter] = [.excludeSelf]) {
+    public init(context: AccountContext, mode: ContactMultiselectionControllerMode, options: [ContactListAdditionalOption], filters: [ContactListFilter] = [.excludeSelf], alwaysEnabled: Bool = false) {
         self.context = context
         self.mode = mode
         self.options = options
         self.filters = filters
+        self.alwaysEnabled = alwaysEnabled
     }
 }
 
+public enum ContactMultiselectionResult {
+    case none
+    case result(peerIds: [ContactListPeerId], additionalOptionIds: [Int])
+}
+
 public protocol ContactMultiselectionController: ViewController {
-    var result: Signal<[ContactListPeerId], NoError> { get }
+    var result: Signal<ContactMultiselectionResult, NoError> { get }
     var displayProgress: Bool { get set }
     var dismissed: (() -> Void)? { get set }
 }
diff --git a/submodules/AccountContext/Sources/OpenChatMessage.swift b/submodules/AccountContext/Sources/OpenChatMessage.swift
index 4ff4350a6f..39bf422b69 100644
--- a/submodules/AccountContext/Sources/OpenChatMessage.swift
+++ b/submodules/AccountContext/Sources/OpenChatMessage.swift
@@ -5,6 +5,7 @@ import TelegramCore
 import SyncCore
 import SwiftSignalKit
 import Display
+import AsyncDisplayKit
 
 public enum ChatControllerInteractionOpenMessageMode {
     case `default`
diff --git a/submodules/AccountUtils/BUILD b/submodules/AccountUtils/BUILD
new file mode 100644
index 0000000000..4edfde468a
--- /dev/null
+++ b/submodules/AccountUtils/BUILD
@@ -0,0 +1,20 @@
+load("@build_bazel_rules_swift//swift:swift.bzl", "swift_library")
+
+swift_library(
+    name = "AccountUtils",
+    module_name = "AccountUtils",
+    srcs = glob([
+        "Sources/**/*.swift",
+    ]),
+    deps = [
+        "//submodules/SSignalKit/SwiftSignalKit:SwiftSignalKit",
+        "//submodules/Postbox:Postbox",
+        "//submodules/TelegramCore:TelegramCore",
+        "//submodules/SyncCore:SyncCore",
+        "//submodules/AccountContext:AccountContext",
+        "//submodules/TelegramUIPreferences:TelegramUIPreferences",
+    ],
+    visibility = [
+        "//visibility:public",
+    ],
+)
diff --git a/submodules/ActionSheetPeerItem/BUILD b/submodules/ActionSheetPeerItem/BUILD
new file mode 100644
index 0000000000..e2840eb207
--- /dev/null
+++ b/submodules/ActionSheetPeerItem/BUILD
@@ -0,0 +1,22 @@
+load("@build_bazel_rules_swift//swift:swift.bzl", "swift_library")
+
+swift_library(
+    name = "ActionSheetPeerItem",
+    module_name = "ActionSheetPeerItem",
+    srcs = glob([
+        "Sources/**/*.swift",
+    ]),
+    deps = [
+        "//submodules/Postbox:Postbox",
+        "//submodules/TelegramCore:TelegramCore",
+        "//submodules/SyncCore:SyncCore",
+        "//submodules/AsyncDisplayKit:AsyncDisplayKit",
+        "//submodules/Display:Display",
+        "//submodules/AvatarNode:AvatarNode",
+        "//submodules/TelegramPresentationData:TelegramPresentationData",
+        "//submodules/AccountContext:AccountContext",
+    ],
+    visibility = [
+        "//visibility:public",
+    ],
+)
diff --git a/submodules/ActionSheetPeerItem/Info.plist b/submodules/ActionSheetPeerItem/Info.plist
deleted file mode 100644
index e1fe4cfb7b..0000000000
--- a/submodules/ActionSheetPeerItem/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/ActionSheetPeerItem/Sources/ActionSheetPeerItem.h b/submodules/ActionSheetPeerItem/Sources/ActionSheetPeerItem.h
deleted file mode 100644
index 43128d709d..0000000000
--- a/submodules/ActionSheetPeerItem/Sources/ActionSheetPeerItem.h
+++ /dev/null
@@ -1,19 +0,0 @@
-//
-//  ActionSheetPeerItem.h
-//  ActionSheetPeerItem
-//
-//  Created by Peter on 8/5/19.
-//  Copyright © 2019 Telegram Messenger LLP. All rights reserved.
-//
-
-#import <UIKit/UIKit.h>
-
-//! Project version number for ActionSheetPeerItem.
-FOUNDATION_EXPORT double ActionSheetPeerItemVersionNumber;
-
-//! Project version string for ActionSheetPeerItem.
-FOUNDATION_EXPORT const unsigned char ActionSheetPeerItemVersionString[];
-
-// In this header, you should import all the public headers of your framework using statements like #import <ActionSheetPeerItem/PublicHeader.h>
-
-
diff --git a/submodules/ActivityIndicator/BUCK b/submodules/ActivityIndicator/BUCK
index fd29559549..334ac6aecf 100644
--- a/submodules/ActivityIndicator/BUCK
+++ b/submodules/ActivityIndicator/BUCK
@@ -7,7 +7,7 @@ static_library(
     ]),
     deps = [
         "//submodules/AsyncDisplayKit:AsyncDisplayKit#shared",
-	"//submodules/Display:Display#shared",
+        "//submodules/Display:Display#shared",
     ],
     frameworks = [
         "$SDKROOT/System/Library/Frameworks/Foundation.framework",
diff --git a/submodules/ActivityIndicator/BUILD b/submodules/ActivityIndicator/BUILD
new file mode 100644
index 0000000000..08c019b637
--- /dev/null
+++ b/submodules/ActivityIndicator/BUILD
@@ -0,0 +1,16 @@
+load("@build_bazel_rules_swift//swift:swift.bzl", "swift_library")
+
+swift_library(
+    name = "ActivityIndicator",
+    module_name = "ActivityIndicator",
+    srcs = glob([
+        "Sources/**/*.swift",
+    ]),
+    deps = [
+        "//submodules/Display:Display",
+        "//submodules/AsyncDisplayKit:AsyncDisplayKit",
+    ],
+    visibility = [
+        "//visibility:public",
+    ],
+)
diff --git a/submodules/ActivityIndicator/Info.plist b/submodules/ActivityIndicator/Info.plist
deleted file mode 100644
index e1fe4cfb7b..0000000000
--- a/submodules/ActivityIndicator/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/ActivityIndicator/Sources/ActivityIndicator.h b/submodules/ActivityIndicator/Sources/ActivityIndicator.h
deleted file mode 100644
index d1f730c19a..0000000000
--- a/submodules/ActivityIndicator/Sources/ActivityIndicator.h
+++ /dev/null
@@ -1,19 +0,0 @@
-//
-//  ActivityIndicator.h
-//  ActivityIndicator
-//
-//  Created by Peter on 8/1/19.
-//  Copyright © 2019 Telegram Messenger LLP. All rights reserved.
-//
-
-#import <UIKit/UIKit.h>
-
-//! Project version number for ActivityIndicator.
-FOUNDATION_EXPORT double ActivityIndicatorVersionNumber;
-
-//! Project version string for ActivityIndicator.
-FOUNDATION_EXPORT const unsigned char ActivityIndicatorVersionString[];
-
-// In this header, you should import all the public headers of your framework using statements like #import <ActivityIndicator/PublicHeader.h>
-
-
diff --git a/submodules/ActivityIndicator/Sources/ActivityIndicator.swift b/submodules/ActivityIndicator/Sources/ActivityIndicator.swift
index 205ef1c454..0336241068 100644
--- a/submodules/ActivityIndicator/Sources/ActivityIndicator.swift
+++ b/submodules/ActivityIndicator/Sources/ActivityIndicator.swift
@@ -92,7 +92,6 @@ public final class ActivityIndicator: ASDisplayNode {
         
         self.indicatorNode = ASImageNode()
         self.indicatorNode.isLayerBacked = true
-        self.indicatorNode.displayWithoutProcessing = true
         self.indicatorNode.displaysAsynchronously = false
         
         super.init()
diff --git a/submodules/AlertUI/BUILD b/submodules/AlertUI/BUILD
new file mode 100644
index 0000000000..f9b4dacc69
--- /dev/null
+++ b/submodules/AlertUI/BUILD
@@ -0,0 +1,15 @@
+load("@build_bazel_rules_swift//swift:swift.bzl", "swift_library")
+
+swift_library(
+    name = "AlertUI",
+    module_name = "AlertUI",
+    srcs = glob([
+        "Sources/**/*.swift",
+    ]),
+    deps = [
+        "//submodules/Display:Display",
+    ],
+    visibility = [
+        "//visibility:public",
+    ],
+)
diff --git a/submodules/AlertUI/Info.plist b/submodules/AlertUI/Info.plist
deleted file mode 100644
index e1fe4cfb7b..0000000000
--- a/submodules/AlertUI/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/AlertUI/Sources/AlertUI.h b/submodules/AlertUI/Sources/AlertUI.h
deleted file mode 100644
index b188aba6c8..0000000000
--- a/submodules/AlertUI/Sources/AlertUI.h
+++ /dev/null
@@ -1,19 +0,0 @@
-//
-//  AlertUI.h
-//  AlertUI
-//
-//  Created by Peter on 8/10/19.
-//  Copyright © 2019 Telegram Messenger LLP. All rights reserved.
-//
-
-#import <UIKit/UIKit.h>
-
-//! Project version number for AlertUI.
-FOUNDATION_EXPORT double AlertUIVersionNumber;
-
-//! Project version string for AlertUI.
-FOUNDATION_EXPORT const unsigned char AlertUIVersionString[];
-
-// In this header, you should import all the public headers of your framework using statements like #import <AlertUI/PublicHeader.h>
-
-
diff --git a/submodules/AnimatedStickerNode/BUILD b/submodules/AnimatedStickerNode/BUILD
new file mode 100644
index 0000000000..bf1ba42bdd
--- /dev/null
+++ b/submodules/AnimatedStickerNode/BUILD
@@ -0,0 +1,20 @@
+load("@build_bazel_rules_swift//swift:swift.bzl", "swift_library")
+
+swift_library(
+    name = "AnimatedStickerNode",
+    module_name = "AnimatedStickerNode",
+    srcs = glob([
+        "Sources/**/*.swift",
+    ]),
+    deps = [
+        "//submodules/SSignalKit/SwiftSignalKit:SwiftSignalKit",
+        "//submodules/AsyncDisplayKit:AsyncDisplayKit",
+        "//submodules/Display:Display",
+        "//submodules/YuvConversion:YuvConversion",
+        "//submodules/GZip:GZip",
+        "//submodules/rlottie:RLottieBinding",
+    ],
+    visibility = [
+        "//visibility:public",
+    ],
+)
diff --git a/submodules/AnimatedStickerNode/Sources/AnimatedStickerNode.swift b/submodules/AnimatedStickerNode/Sources/AnimatedStickerNode.swift
index 173646c596..cbff90d2f2 100644
--- a/submodules/AnimatedStickerNode/Sources/AnimatedStickerNode.swift
+++ b/submodules/AnimatedStickerNode/Sources/AnimatedStickerNode.swift
@@ -274,9 +274,7 @@ private final class AnimatedStickerDirectFrameSource: AnimatedStickerFrameSource
         self.height = height
         self.bytesPerRow = (4 * Int(width) + 15) & (~15)
         self.currentFrame = 0
-        guard let rawData = TGGUnzipData(data, 8 * 1024 * 1024) else {
-            return nil
-        }
+        let rawData = TGGUnzipData(data, 8 * 1024 * 1024) ?? data
         guard let animation = LottieInstance(data: rawData, cacheKey: "") else {
             return nil
         }
diff --git a/submodules/AnimationUI/BUILD b/submodules/AnimationUI/BUILD
new file mode 100644
index 0000000000..adc0b2a210
--- /dev/null
+++ b/submodules/AnimationUI/BUILD
@@ -0,0 +1,28 @@
+load("@build_bazel_rules_swift//swift:swift.bzl", "swift_library")
+
+swift_library(
+    name = "AnimationUI",
+    module_name = "AnimationUI",
+    srcs = glob([
+        "Sources/**/*.swift",
+    ]),
+    deps = [
+        "//submodules/SSignalKit/SwiftSignalKit:SwiftSignalKit",
+        "//submodules/Postbox:Postbox",
+        "//submodules/TelegramCore:TelegramCore",
+        "//submodules/SyncCore:SyncCore",
+        "//submodules/AsyncDisplayKit:AsyncDisplayKit",
+        "//submodules/Display:Display",
+        "//submodules/YuvConversion:YuvConversion",
+        "//submodules/StickerResources:StickerResources",
+        "//submodules/MediaResources:MediaResources",
+        "//submodules/Tuples:Tuples",
+        "//submodules/GZip:GZip",
+        "//submodules/rlottie:RLottieBinding",
+        "//submodules/lottie-ios:Lottie",
+        "//submodules/AppBundle:AppBundle",
+    ],
+    visibility = [
+        "//visibility:public",
+    ],
+)
diff --git a/submodules/AnimationUI/Info.plist b/submodules/AnimationUI/Info.plist
deleted file mode 100644
index e1fe4cfb7b..0000000000
--- a/submodules/AnimationUI/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/AppBundle/BUCK b/submodules/AppBundle/BUCK
index 7c15ea5d15..34e2293199 100644
--- a/submodules/AppBundle/BUCK
+++ b/submodules/AppBundle/BUCK
@@ -3,14 +3,13 @@ load("//Config:buck_rule_macros.bzl", "static_library")
 static_library(
     name = "AppBundle",
     srcs = glob([
-        "Sources/**/*.swift",
         "Sources/**/*.m",
     ]),
     headers = glob([
         "Sources/**/*.h",
     ]),
     exported_headers = glob([
-        "Sources/**/*.h",
+        "PublicHeaders/**/*.h",
     ]),
     deps = [
     ],
diff --git a/submodules/AppBundle/BUILD b/submodules/AppBundle/BUILD
new file mode 100644
index 0000000000..92d153bd64
--- /dev/null
+++ b/submodules/AppBundle/BUILD
@@ -0,0 +1,23 @@
+
+objc_library(
+    name = "AppBundle",
+    module_name = "AppBundle",
+    enable_modules = True,
+    srcs = glob([
+        "Sources/**/*.m",
+        "Sources/**/*.h",
+    ]),
+    hdrs = glob([
+        "PublicHeaders/**/*.h",
+    ]),
+    includes = [
+       "PublicHeaders", 
+    ],
+    sdk_frameworks = [
+        "Foundation",
+        "UIKit",
+    ],
+    visibility = [
+        "//visibility:public",
+    ],
+)
diff --git a/submodules/AppBundle/Info.plist b/submodules/AppBundle/Info.plist
deleted file mode 100644
index e1fe4cfb7b..0000000000
--- a/submodules/AppBundle/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/AppBundle/Sources/AppBundle.h b/submodules/AppBundle/PublicHeaders/AppBundle/AppBundle.h
similarity index 53%
rename from submodules/AppBundle/Sources/AppBundle.h
rename to submodules/AppBundle/PublicHeaders/AppBundle/AppBundle.h
index b78e84bc8d..d00fe35efa 100644
--- a/submodules/AppBundle/Sources/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/Sources/AppBundle.m b/submodules/AppBundle/Sources/AppBundle/AppBundle.m
similarity index 96%
rename from submodules/AppBundle/Sources/AppBundle.m
rename to submodules/AppBundle/Sources/AppBundle/AppBundle.m
index 8103a03e40..66f5e08fc8 100644
--- a/submodules/AppBundle/Sources/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/AppLock/BUILD b/submodules/AppLock/BUILD
new file mode 100644
index 0000000000..ae89bbf200
--- /dev/null
+++ b/submodules/AppLock/BUILD
@@ -0,0 +1,25 @@
+load("@build_bazel_rules_swift//swift:swift.bzl", "swift_library")
+
+swift_library(
+    name = "AppLock",
+    module_name = "AppLock",
+    srcs = glob([
+        "Sources/**/*.swift",
+    ]),
+    deps = [
+        "//submodules/AsyncDisplayKit:AsyncDisplayKit",
+        "//submodules/Display:Display",
+        "//submodules/SSignalKit/SwiftSignalKit:SwiftSignalKit",
+        "//submodules/Postbox:Postbox",
+        "//submodules/TelegramPresentationData:TelegramPresentationData",
+        "//submodules/MonotonicTime:MonotonicTime",
+        "//submodules/PasscodeUI:PasscodeUI",
+        "//submodules/TelegramUIPreferences:TelegramUIPreferences",
+        "//submodules/ImageBlur:ImageBlur",
+        "//submodules/AccountContext:AccountContext",
+        "//submodules/AppLockState:AppLockState",
+    ],
+    visibility = [
+        "//visibility:public",
+    ],
+)
diff --git a/submodules/AppLock/Sources/AppLock.swift b/submodules/AppLock/Sources/AppLock.swift
index e339ed19ad..112873aac4 100644
--- a/submodules/AppLock/Sources/AppLock.swift
+++ b/submodules/AppLock/Sources/AppLock.swift
@@ -9,6 +9,7 @@ import TelegramPresentationData
 import PasscodeUI
 import TelegramUIPreferences
 import ImageBlur
+import FastBlur
 import AppLockState
 
 private func isLocked(passcodeSettings: PresentationPasscodeSettings, state: LockState, isApplicationActive: Bool) -> Bool {
diff --git a/submodules/AppLockState/BUILD b/submodules/AppLockState/BUILD
new file mode 100644
index 0000000000..d87c6ecb7f
--- /dev/null
+++ b/submodules/AppLockState/BUILD
@@ -0,0 +1,15 @@
+load("@build_bazel_rules_swift//swift:swift.bzl", "swift_library")
+
+swift_library(
+    name = "AppLockState",
+    module_name = "AppLockState",
+    srcs = glob([
+        "Sources/**/*.swift",
+    ]),
+    deps = [
+        "//submodules/MonotonicTime:MonotonicTime",
+    ],
+    visibility = [
+        "//visibility:public",
+    ],
+)
diff --git a/submodules/ArchivedStickerPacksNotice/BUILD b/submodules/ArchivedStickerPacksNotice/BUILD
new file mode 100644
index 0000000000..296ed10c8d
--- /dev/null
+++ b/submodules/ArchivedStickerPacksNotice/BUILD
@@ -0,0 +1,29 @@
+load("@build_bazel_rules_swift//swift:swift.bzl", "swift_library")
+
+swift_library(
+    name = "ArchivedStickerPacksNotice",
+    module_name = "ArchivedStickerPacksNotice",
+    srcs = glob([
+        "Sources/**/*.swift",
+    ]),
+    deps = [
+        "//submodules/SSignalKit/SwiftSignalKit:SwiftSignalKit",
+        "//submodules/AsyncDisplayKit:AsyncDisplayKit",
+        "//submodules/Display:Display",
+        "//submodules/Postbox:Postbox",
+        "//submodules/TelegramCore:TelegramCore",
+        "//submodules/SyncCore:SyncCore",
+        "//submodules/TelegramPresentationData:TelegramPresentationData",
+        "//submodules/AccountContext:AccountContext",
+        "//submodules/TelegramUIPreferences:TelegramUIPreferences",
+        "//submodules/StickerResources:StickerResources",
+        "//submodules/AlertUI:AlertUI",
+        "//submodules/PresentationDataUtils:PresentationDataUtils",
+        "//submodules/MergeLists:MergeLists",
+        "//submodules/ItemListUI:ItemListUI",
+        "//submodules/ItemListStickerPackItem:ItemListStickerPackItem",
+    ],
+    visibility = [
+        "//visibility:public",
+    ],
+)
diff --git a/submodules/AsyncDisplayKit/AsyncDisplayKit.xcworkspace/contents.xcworkspacedata b/submodules/AsyncDisplayKit/AsyncDisplayKit.xcworkspace/contents.xcworkspacedata
deleted file mode 100644
index 574f0ec195..0000000000
--- a/submodules/AsyncDisplayKit/AsyncDisplayKit.xcworkspace/contents.xcworkspacedata
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Workspace
-   version = "1.0">
-   <FileRef
-      location = "group:AsyncDisplayKit.xcodeproj">
-   </FileRef>
-   <FileRef
-      location = "group:Pods/Pods.xcodeproj">
-   </FileRef>
-</Workspace>
diff --git a/submodules/AsyncDisplayKit/AsyncDisplayKit.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/submodules/AsyncDisplayKit/AsyncDisplayKit.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
deleted file mode 100644
index 18d981003d..0000000000
--- a/submodules/AsyncDisplayKit/AsyncDisplayKit.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
+++ /dev/null
@@ -1,8 +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>IDEDidComputeMac32BitWarning</key>
-	<true/>
-</dict>
-</plist>
diff --git a/submodules/AsyncDisplayKit/AsyncDisplayKit.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings b/submodules/AsyncDisplayKit/AsyncDisplayKit.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings
deleted file mode 100644
index 08de0be8d3..0000000000
--- a/submodules/AsyncDisplayKit/AsyncDisplayKit.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings
+++ /dev/null
@@ -1,8 +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>IDEWorkspaceSharedSettings_AutocreateContextsIfNeeded</key>
-	<false/>
-</dict>
-</plist>
diff --git a/submodules/AsyncDisplayKit/AsyncDisplayKit/ASPagerFlowLayout.m b/submodules/AsyncDisplayKit/AsyncDisplayKit/ASPagerFlowLayout.m
deleted file mode 100644
index df8ce69868..0000000000
--- a/submodules/AsyncDisplayKit/AsyncDisplayKit/ASPagerFlowLayout.m
+++ /dev/null
@@ -1,96 +0,0 @@
-//
-//  ASPagerFlowLayout.m
-//  AsyncDisplayKit
-//
-//  Created by Levi McCallum on 2/12/16.
-//
-//  Copyright (c) 2014-present, Facebook, Inc.  All rights reserved.
-//  This source code is licensed under the BSD-style license found in the
-//  LICENSE file in the root directory of this source tree. An additional grant
-//  of patent rights can be found in the PATENTS file in the same directory.
-//
-
-#ifndef MINIMAL_ASDK
-#import <AsyncDisplayKit/ASPagerFlowLayout.h>
-
-@interface ASPagerFlowLayout () {
-  BOOL _didRotate;
-  CGRect _cachedCollectionViewBounds;
-  NSIndexPath *_currentIndexPath;
-}
-
-@end
-
-@implementation ASPagerFlowLayout
-
-- (CGPoint)targetContentOffsetForProposedContentOffset:(CGPoint)proposedContentOffset withScrollingVelocity:(CGPoint)velocity
-{
-  NSInteger currentPage = ceil(proposedContentOffset.x / self.collectionView.bounds.size.width);
-  _currentIndexPath = [NSIndexPath indexPathForItem:currentPage inSection:0];
-  
-  return [super targetContentOffsetForProposedContentOffset:proposedContentOffset withScrollingVelocity:velocity];
-}
-
-
-- (void)prepareForAnimatedBoundsChange:(CGRect)oldBounds
-{
-  // Cache the current page if a rotation did happen. This happens before the rotation animation
-  // is occuring and the bounds changed so we use this as an opportunity to cache the current index path
-  if (_cachedCollectionViewBounds.size.width != self.collectionView.bounds.size.width) {
-      _cachedCollectionViewBounds = self.collectionView.bounds;
-        
-    // Figurring out current page based on the old bounds visible space
-    CGRect visibleRect = oldBounds;
-           
-    CGFloat visibleXCenter = CGRectGetMidX(visibleRect);
-    NSArray<UICollectionViewLayoutAttributes *> *layoutAttributes = [self layoutAttributesForElementsInRect:visibleRect];
-    for (UICollectionViewLayoutAttributes *attributes in layoutAttributes) {
-      if ([attributes representedElementCategory] == UICollectionElementCategoryCell && attributes.center.x == visibleXCenter) {
-        _currentIndexPath = attributes.indexPath;
-        break;
-      }
-    }
-      
-      _didRotate = YES;
-    }
-    
-    [super prepareForAnimatedBoundsChange:oldBounds];
-}
-- (CGPoint)targetContentOffsetForProposedContentOffset:(CGPoint)proposedContentOffset
-{
-    // Don't mess around if the user is interacting with the page node. Although if just a rotation happened we should
-    // try to use the current index path to not end up setting the target content offset to something in between pages
-    if (_didRotate || (!self.collectionView.isDecelerating && !self.collectionView.isTracking)) {
-        _didRotate = NO;
-        if (_currentIndexPath) {
-          return [self _targetContentOffsetForItemAtIndexPath:_currentIndexPath proposedContentOffset:proposedContentOffset];
-        }
-    }
-    
-    return [super targetContentOffsetForProposedContentOffset:proposedContentOffset];
-}
-
-- (CGPoint)_targetContentOffsetForItemAtIndexPath:(NSIndexPath *)indexPath proposedContentOffset:(CGPoint)proposedContentOffset
-{
-  if ([self _dataSourceIsEmpty]) {
-    return proposedContentOffset;
-  }
-  
-  UICollectionViewLayoutAttributes *attributes = [self layoutAttributesForItemAtIndexPath:_currentIndexPath];
-  if (attributes == nil) {
-    return proposedContentOffset;
-  }
-  
-  CGFloat xOffset = (CGRectGetWidth(self.collectionView.bounds) - CGRectGetWidth(attributes.frame)) / 2.0;
-  return CGPointMake(attributes.frame.origin.x - xOffset, proposedContentOffset.y);
-}
-
-- (BOOL)_dataSourceIsEmpty
-{
-    return ([self.collectionView numberOfSections] == 0 ||
-            [self.collectionView numberOfItemsInSection:0] == 0);
-}
-
-@end
-
-#endif
diff --git a/submodules/AsyncDisplayKit/AsyncDisplayKit/Debug/ASLayoutElementInspectorCell.h b/submodules/AsyncDisplayKit/AsyncDisplayKit/Debug/ASLayoutElementInspectorCell.h
deleted file mode 100644
index 8e0602911e..0000000000
--- a/submodules/AsyncDisplayKit/AsyncDisplayKit/Debug/ASLayoutElementInspectorCell.h
+++ /dev/null
@@ -1,31 +0,0 @@
-//
-//  ASLayoutElementInspectorCell.h
-//  AsyncDisplayKit
-//
-//  Created by Hannah Troisi on 3/27/16.
-//  Copyright © 2016 Facebook. All rights reserved.
-//
-
-#ifndef MINIMAL_ASDK
-
-#import <AsyncDisplayKit/ASCellNode.h>
-
-typedef NS_ENUM(NSInteger, ASLayoutElementPropertyType) {
-  ASLayoutElementPropertyFlexGrow = 0,
-  ASLayoutElementPropertyFlexShrink,
-  ASLayoutElementPropertyAlignSelf,
-  ASLayoutElementPropertyFlexBasis,
-  ASLayoutElementPropertySpacingBefore,
-  ASLayoutElementPropertySpacingAfter,
-  ASLayoutElementPropertyAscender,
-  ASLayoutElementPropertyDescender,
-  ASLayoutElementPropertyCount
-};
-
-@interface ASLayoutElementInspectorCell : ASCellNode
-
-- (instancetype)initWithProperty:(ASLayoutElementPropertyType)property layoutElementToEdit:(id<ASLayoutElement>)layoutable NS_DESIGNATED_INITIALIZER;
-
-@end
-
-#endif
diff --git a/submodules/AsyncDisplayKit/AsyncDisplayKit/Debug/ASLayoutElementInspectorCell.m b/submodules/AsyncDisplayKit/AsyncDisplayKit/Debug/ASLayoutElementInspectorCell.m
deleted file mode 100644
index 7e5ca1ad9c..0000000000
--- a/submodules/AsyncDisplayKit/AsyncDisplayKit/Debug/ASLayoutElementInspectorCell.m
+++ /dev/null
@@ -1,570 +0,0 @@
-//
-//  ASLayoutElementInspectorCell.m
-//  AsyncDisplayKit
-//
-//  Created by Hannah Troisi on 3/27/16.
-//  Copyright © 2016 Facebook. All rights reserved.
-//
-#ifndef MINIMAL_ASDK
-#import <AsyncDisplayKit/ASLayoutElementInspectorCell.h>
-#import <AsyncDisplayKit/AsyncDisplayKit.h>
-
-typedef NS_ENUM(NSInteger, CellDataType) {
-  CellDataTypeBool,
-  CellDataTypeFloat,
-};
-
-__weak static ASLayoutElementInspectorCell *__currentlyOpenedCell = nil;
-
-@protocol InspectorCellEditingBubbleProtocol <NSObject>
-- (void)valueChangedToIndex:(NSUInteger)index;
-@end
-
-@interface ASLayoutElementInspectorCellEditingBubble : ASDisplayNode
-@property (nonatomic, strong, readwrite) id<InspectorCellEditingBubbleProtocol> delegate;
-- (instancetype)initWithEnumOptions:(BOOL)yes enumStrings:(NSArray<NSString *> *)options currentOptionIndex:(NSUInteger)currentOption;
-- (instancetype)initWithSliderMinValue:(CGFloat)min maxValue:(CGFloat)max currentValue:(CGFloat)current
-;@end
-
-@interface ASLayoutElementInspectorCell () <InspectorCellEditingBubbleProtocol>
-@end
-
-@implementation ASLayoutElementInspectorCell
-{
-  ASLayoutElementPropertyType   _propertyType;
-  CellDataType                  _dataType;
-  id<ASLayoutElement>           _layoutElementToEdit;
-  
-  ASButtonNode                  *_buttonNode;
-  ASTextNode                    *_textNode;
-  ASTextNode                    *_textNode2;
-  
-  ASLayoutElementInspectorCellEditingBubble *_textBubble;
-}
-
-#pragma mark - Lifecycle
-
-- (instancetype)initWithProperty:(ASLayoutElementPropertyType)property layoutElementToEdit:(id<ASLayoutElement>)layoutElement
-{
-  self = [super init];
-  if (self) {
-    
-    _propertyType = property;
-    _dataType = [ASLayoutElementInspectorCell dataTypeForProperty:property];
-    _layoutElementToEdit = layoutElement;
-    
-    self.automaticallyManagesSubnodes = YES;
-    
-    _buttonNode = [self makeBtnNodeWithTitle:[ASLayoutElementInspectorCell propertyStringForPropertyType:property]];
-    [_buttonNode addTarget:self action:@selector(buttonTapped:) forControlEvents:ASControlNodeEventTouchUpInside];
-    
-    _textNode = [[ASTextNode alloc] init];
-    _textNode.attributedText = [ASLayoutElementInspectorCell propertyValueAttributedStringForProperty:property withLayoutElement:layoutElement];
-    
-    [self updateButtonStateForProperty:property withLayoutElement:layoutElement];
-
-    _textNode2 = [[ASTextNode alloc] init];
-    _textNode2.attributedText = [ASLayoutElementInspectorCell propertyValueDetailAttributedStringForProperty:property withLayoutElement:layoutElement];
-    
-  }
-  return self;
-}
-
-- (void)updateButtonStateForProperty:(ASLayoutElementPropertyType)property withLayoutElement:(id<ASLayoutElement>)layoutElement
-{
-  if (property == ASLayoutElementPropertyFlexGrow) {
-    _buttonNode.selected = layoutElement.style.flexGrow;
-  }
-  else if (property == ASLayoutElementPropertyFlexShrink) {
-    _buttonNode.selected = layoutElement.style.flexShrink;
-  }
-}
-
-- (ASLayoutSpec *)layoutSpecThatFits:(ASSizeRange)constrainedSize
-{
-  ASStackLayoutSpec *horizontalSpec = [ASStackLayoutSpec horizontalStackLayoutSpec];
-  horizontalSpec.children           = @[_buttonNode, _textNode];
-  horizontalSpec.style.flexGrow     = 1.0;
-  horizontalSpec.alignItems         = ASStackLayoutAlignItemsCenter;
-  horizontalSpec.justifyContent     = ASStackLayoutJustifyContentSpaceBetween;
-  
-  ASLayoutSpec *childSpec;
-  if (_textBubble) {
-    ASStackLayoutSpec *verticalSpec = [ASStackLayoutSpec verticalStackLayoutSpec];
-    verticalSpec.children           = @[horizontalSpec, _textBubble];
-    verticalSpec.spacing            = 8;
-    verticalSpec.style.flexGrow     = 1.0;
-    _textBubble.style.flexGrow      = 1.0;
-    childSpec = verticalSpec;
-  } else {
-    childSpec = horizontalSpec;
-  }
-  ASInsetLayoutSpec *insetSpec     = [ASInsetLayoutSpec insetLayoutSpecWithInsets:UIEdgeInsetsMake(2, 4, 2, 4) child:childSpec];
-  insetSpec.style.flexGrow         =1.0;
-  
-  return insetSpec;
-}
-
-+ (NSAttributedString *)propertyValueAttributedStringForProperty:(ASLayoutElementPropertyType)property withLayoutElement:(id<ASLayoutElement>)layoutElement
-{
-  NSString *valueString;
-  
-  switch (property) {
-    case ASLayoutElementPropertyFlexGrow:
-      valueString = layoutElement.style.flexGrow ? @"YES" : @"NO";
-      break;
-    case ASLayoutElementPropertyFlexShrink:
-      valueString = layoutElement.style.flexShrink ? @"YES" : @"NO";
-      break;
-    case ASLayoutElementPropertyAlignSelf:
-      valueString = [ASLayoutElementInspectorCell alignSelfEnumValueString:layoutElement.style.alignSelf];
-      break;
-    case ASLayoutElementPropertyFlexBasis:
-      if (layoutElement.style.flexBasis.unit && layoutElement.style.flexBasis.value) {  // ENUM TYPE
-        valueString = [NSString stringWithFormat:@"%0.0f %@", layoutElement.style.flexBasis.value,
-                       [ASLayoutElementInspectorCell ASRelativeDimensionEnumString:layoutElement.style.alignSelf]];
-      } else {
-        valueString = @"0 pts";
-      }
-      break;
-    case ASLayoutElementPropertySpacingBefore:
-      valueString = [NSString stringWithFormat:@"%0.0f", layoutElement.style.spacingBefore];
-      break;
-    case ASLayoutElementPropertySpacingAfter:
-      valueString = [NSString stringWithFormat:@"%0.0f", layoutElement.style.spacingAfter];
-      break;
-    case ASLayoutElementPropertyAscender:
-      valueString = [NSString stringWithFormat:@"%0.0f", layoutElement.style.ascender];
-      break;
-    case ASLayoutElementPropertyDescender:
-      valueString = [NSString stringWithFormat:@"%0.0f", layoutElement.style.descender];
-      break;
-    default:
-      valueString = @"?";
-      break;
-  }
-  return [ASLayoutElementInspectorCell attributedStringFromString:valueString];
-}
-
-+ (NSAttributedString *)propertyValueDetailAttributedStringForProperty:(ASLayoutElementPropertyType)property withLayoutElement:(id<ASLayoutElement>)layoutElement
-{
-  NSString *valueString;
-  
-  switch (property) {
-    case ASLayoutElementPropertyFlexGrow:
-    case ASLayoutElementPropertyFlexShrink:
-    case ASLayoutElementPropertyAlignSelf:
-    case ASLayoutElementPropertyFlexBasis:
-    case ASLayoutElementPropertySpacingBefore:
-    case ASLayoutElementPropertySpacingAfter:
-    case ASLayoutElementPropertyAscender:
-    case ASLayoutElementPropertyDescender:
-    default:
-      return nil;
-  }
-  return [ASLayoutElementInspectorCell attributedStringFromString:valueString];
-}
-
-- (void)endEditingValue
-{
-  _textBubble = nil;
-  __currentlyOpenedCell = nil;
-  _buttonNode.selected = NO;
-  [self setNeedsLayout];
-}
-
-- (void)beginEditingValue
-{
-  _textBubble.delegate = self;
-  __currentlyOpenedCell = self;
-  [self setNeedsLayout];
-}
-
-- (void)valueChangedToIndex:(NSUInteger)index
-{
-  switch (_propertyType) {
-      
-    case ASLayoutElementPropertyAlignSelf:
-      _layoutElementToEdit.style.alignSelf = (ASStackLayoutAlignSelf)index;
-      _textNode.attributedText = [ASLayoutElementInspectorCell attributedStringFromString:[ASLayoutElementInspectorCell alignSelfEnumValueString:index]];
-      break;
-
-    case ASLayoutElementPropertySpacingBefore:
-      _layoutElementToEdit.style.spacingBefore = (CGFloat)index;
-      _textNode.attributedText = [ASLayoutElementInspectorCell attributedStringFromString:[NSString stringWithFormat:@"%0.0f", _layoutElementToEdit.style.spacingBefore]];
-      break;
-
-    case ASLayoutElementPropertySpacingAfter:
-      _layoutElementToEdit.style.spacingAfter = (CGFloat)index;
-      _textNode.attributedText = [ASLayoutElementInspectorCell attributedStringFromString:[NSString stringWithFormat:@"%0.0f", _layoutElementToEdit.style.spacingAfter]];
-      break;
-
-    case ASLayoutElementPropertyAscender:
-      _layoutElementToEdit.style.ascender = (CGFloat)index;
-      _textNode.attributedText = [ASLayoutElementInspectorCell attributedStringFromString:[NSString stringWithFormat:@"%0.0f", _layoutElementToEdit.style.ascender]];
-      break;
-      
-    case ASLayoutElementPropertyDescender:
-      _layoutElementToEdit.style.descender = (CGFloat)index;
-      _textNode.attributedText = [ASLayoutElementInspectorCell attributedStringFromString:[NSString stringWithFormat:@"%0.0f", _layoutElementToEdit.style.descender]];
-      break;
-      
-    default:
-      break;
-  }
-  
-  [self setNeedsLayout];
-}
-
-#pragma mark - gesture handling
-
-- (void)buttonTapped:(ASButtonNode *)sender
-{
-  BOOL selfIsEditing = (self == __currentlyOpenedCell);
-  [__currentlyOpenedCell endEditingValue];
-  if (selfIsEditing) {
-    sender.selected = NO;
-    return;
-  }
-  
-//  NSUInteger currentAlignSelfValue;
-//  NSUInteger nextAlignSelfValue;
-//  CGFloat    newValue;
-
-  sender.selected = !sender.selected;
-  switch (_propertyType) {
-      
-    case ASLayoutElementPropertyFlexGrow:
-      _layoutElementToEdit.style.flexGrow = sender.isSelected ? 1.0 : 0.0;
-      _textNode.attributedText = [ASLayoutElementInspectorCell attributedStringFromString:sender.selected ? @"YES" : @"NO"];
-      break;
-      
-    case ASLayoutElementPropertyFlexShrink:
-      _layoutElementToEdit.style.flexShrink = sender.isSelected ? 1.0 : 0.0;
-      _textNode.attributedText = [ASLayoutElementInspectorCell attributedStringFromString:sender.selected ? @"YES" : @"NO"];
-      break;
-      
-    case ASLayoutElementPropertyAlignSelf:
-      _textBubble = [[ASLayoutElementInspectorCellEditingBubble alloc] initWithEnumOptions:YES
-                                                                            enumStrings:[ASLayoutElementInspectorCell alignSelfEnumStringArray]
-                                                                     currentOptionIndex:_layoutElementToEdit.style.alignSelf];
-
-      [self beginEditingValue];
-//      if ([self layoutSpec]) {
-//        currentAlignSelfValue = [[self layoutSpec] alignSelf];
-//        nextAlignSelfValue = (currentAlignSelfValue + 1 <= ASStackLayoutAlignSelfStretch) ? currentAlignSelfValue + 1 : 0;
-//        [[self layoutSpec] setAlignSelf:nextAlignSelfValue];
-//    
-//      } else if ([self node]) {
-//        currentAlignSelfValue = [[self node] alignSelf];
-//        nextAlignSelfValue = (currentAlignSelfValue + 1 <= ASStackLayoutAlignSelfStretch) ? currentAlignSelfValue + 1 : 0;
-//        [[self node] setAlignSelf:nextAlignSelfValue];
-//      }
-      break;
-
-    case ASLayoutElementPropertySpacingBefore:
-      _textBubble = [[ASLayoutElementInspectorCellEditingBubble alloc] initWithSliderMinValue:0 maxValue:100 currentValue:_layoutElementToEdit.style.spacingBefore];
-      [self beginEditingValue];
-      _textNode.attributedText = [ASLayoutElementInspectorCell attributedStringFromString:[NSString stringWithFormat:@"%0.0f", _layoutElementToEdit.style.spacingBefore]];
-      break;
-
-    case ASLayoutElementPropertySpacingAfter:
-      _textBubble = [[ASLayoutElementInspectorCellEditingBubble alloc] initWithSliderMinValue:0 maxValue:100 currentValue:_layoutElementToEdit.style.spacingAfter];
-      [self beginEditingValue];
-      _textNode.attributedText = [ASLayoutElementInspectorCell attributedStringFromString:[NSString stringWithFormat:@"%0.0f", _layoutElementToEdit.style.spacingAfter]];
-      break;
-
-
-    case ASLayoutElementPropertyAscender:
-      _textBubble = [[ASLayoutElementInspectorCellEditingBubble alloc] initWithSliderMinValue:0 maxValue:100 currentValue:_layoutElementToEdit.style.ascender];
-      [self beginEditingValue];
-      _textNode.attributedText = [ASLayoutElementInspectorCell attributedStringFromString:[NSString stringWithFormat:@"%0.0f", _layoutElementToEdit.style.ascender]];
-      break;
-
-    case ASLayoutElementPropertyDescender:
-      _textBubble = [[ASLayoutElementInspectorCellEditingBubble alloc] initWithSliderMinValue:0 maxValue:100 currentValue:_layoutElementToEdit.style.descender];
-      [self beginEditingValue];
-      _textNode.attributedText = [ASLayoutElementInspectorCell attributedStringFromString:[NSString stringWithFormat:@"%0.0f", _layoutElementToEdit.style.descender]];
-      break;
-      
-    default:
-      break;
-  }
-  [self setNeedsLayout];
-}
-
-#pragma mark - cast layoutElementToEdit
-
-- (ASDisplayNode *)node
-{
-  if (_layoutElementToEdit.layoutElementType == ASLayoutElementTypeDisplayNode) {
-    return (ASDisplayNode *)_layoutElementToEdit;
-  }
-  return nil;
-}
-
-- (ASLayoutSpec *)layoutSpec
-{
-  if (_layoutElementToEdit.layoutElementType == ASLayoutElementTypeLayoutSpec) {
-    return (ASLayoutSpec *)_layoutElementToEdit;
-  }
-  return nil;
-}
-
-#pragma mark - data / property type helper methods
-
-+ (CellDataType)dataTypeForProperty:(ASLayoutElementPropertyType)property
-{
-  switch (property) {
-      
-    case ASLayoutElementPropertyFlexGrow:
-    case ASLayoutElementPropertyFlexShrink:
-      return CellDataTypeBool;
-      
-    case ASLayoutElementPropertySpacingBefore:
-    case ASLayoutElementPropertySpacingAfter:
-    case ASLayoutElementPropertyAscender:
-    case ASLayoutElementPropertyDescender:
-      return CellDataTypeFloat;
-      
-    default:
-      break;
-  }
-  return CellDataTypeBool;
-}
-
-+ (NSString *)propertyStringForPropertyType:(ASLayoutElementPropertyType)property
-{
-  NSString *string;
-  switch (property) {
-    case ASLayoutElementPropertyFlexGrow:
-      string = @"FlexGrow";
-      break;
-    case ASLayoutElementPropertyFlexShrink:
-      string = @"FlexShrink";
-      break;
-    case ASLayoutElementPropertyAlignSelf:
-      string = @"AlignSelf";
-      break;
-    case ASLayoutElementPropertyFlexBasis:
-      string = @"FlexBasis";
-      break;
-    case ASLayoutElementPropertySpacingBefore:
-      string = @"SpacingBefore";
-      break;
-    case ASLayoutElementPropertySpacingAfter:
-      string = @"SpacingAfter";
-      break;
-    case ASLayoutElementPropertyAscender:
-      string = @"Ascender";
-      break;
-    case ASLayoutElementPropertyDescender:
-      string = @"Descender";
-      break;
-    default:
-      string = @"Unknown";
-      break;
-  }
-  return string;
-}
-
-+ (NSDictionary *)alignSelfTypeNames
-{
-  return @{@(ASStackLayoutAlignSelfAuto) : @"Auto",
-           @(ASStackLayoutAlignSelfStart) : @"Start",
-           @(ASStackLayoutAlignSelfEnd) : @"End",
-           @(ASStackLayoutAlignSelfCenter) : @"Center",
-           @(ASStackLayoutAlignSelfStretch) : @"Stretch"};
-}
-
-+ (NSString *)alignSelfEnumValueString:(NSUInteger)type
-{
-  return [[self class] alignSelfTypeNames][@(type)];
-}
-
-+ (NSArray <NSString *> *)alignSelfEnumStringArray
-{
-  return @[@"ASStackLayoutAlignSelfAuto",
-           @"ASStackLayoutAlignSelfStart",
-           @"ASStackLayoutAlignSelfEnd",
-           @"ASStackLayoutAlignSelfCenter",
-           @"ASStackLayoutAlignSelfStretch"];
-}
-
-+ (NSDictionary *)ASRelativeDimensionTypeNames
-{
-  return @{@(ASDimensionUnitPoints) : @"pts",
-           @(ASDimensionUnitFraction) : @"%"};
-}
-
-+ (NSString *)ASRelativeDimensionEnumString:(NSUInteger)type
-{
-  return [[self class] ASRelativeDimensionTypeNames][@(type)];
-}
-
-#pragma mark - formatting helper methods
-
-+ (NSAttributedString *)attributedStringFromString:(NSString *)string
-{
-  return [ASLayoutElementInspectorCell attributedStringFromString:string withTextColor:[UIColor whiteColor]];
-}
-
-+ (NSAttributedString *)attributedStringFromString:(NSString *)string withTextColor:(nullable UIColor *)color
-{
-  NSDictionary *attributes = @{NSForegroundColorAttributeName : color,
-                               NSFontAttributeName : [UIFont fontWithName:@"Menlo-Regular" size:12]};
-  
-  return [[NSAttributedString alloc] initWithString:string attributes:attributes];
-}
-
-- (ASButtonNode *)makeBtnNodeWithTitle:(NSString *)title
-{
-  UIColor *orangeColor = [UIColor colorWithRed:255/255.0 green:181/255.0 blue:68/255.0 alpha:1];
-  UIImage *orangeStretchBtnImg = [ASLayoutElementInspectorCell imageForButtonWithBackgroundColor:orangeColor
-                                                                                  borderColor:[UIColor whiteColor]
-                                                                                  borderWidth:3];
-  UIImage *greyStretchBtnImg = [ASLayoutElementInspectorCell imageForButtonWithBackgroundColor:[UIColor darkGrayColor]
-                                                                                borderColor:[UIColor lightGrayColor]
-                                                                                borderWidth:3];
-  UIImage *clearStretchBtnImg = [ASLayoutElementInspectorCell imageForButtonWithBackgroundColor:[UIColor clearColor]
-                                                                                 borderColor:[UIColor whiteColor]
-                                                                                 borderWidth:3];
-  ASButtonNode *btn = [[ASButtonNode alloc] init];
-  btn.contentEdgeInsets = UIEdgeInsetsMake(5, 5, 5, 5);
-  [btn setAttributedTitle:[ASLayoutElementInspectorCell attributedStringFromString:title] forState:ASControlStateNormal];
-  [btn setAttributedTitle:[ASLayoutElementInspectorCell attributedStringFromString:title withTextColor:[UIColor lightGrayColor]] forState:ASControlStateDisabled];
-  [btn setBackgroundImage:clearStretchBtnImg forState:ASControlStateNormal];
-  [btn setBackgroundImage:orangeStretchBtnImg forState:ASControlStateSelected];
-  [btn setBackgroundImage:greyStretchBtnImg forState:ASControlStateDisabled];
-  
-  return btn;
-}
-
-#define CORNER_RADIUS 3
-+ (UIImage *)imageForButtonWithBackgroundColor:(UIColor *)backgroundColor borderColor:(UIColor *)borderColor borderWidth:(CGFloat)width
-{
-  CGSize unstretchedSize  = CGSizeMake(2 * CORNER_RADIUS + 1, 2 * CORNER_RADIUS + 1);
-  CGRect rect             = (CGRect) {CGPointZero, unstretchedSize};
-  UIBezierPath *path      = [UIBezierPath bezierPathWithRoundedRect:rect cornerRadius:CORNER_RADIUS];
-  
-  // create a graphics context for the following status button
-  UIGraphicsBeginImageContextWithOptions(unstretchedSize, NO, 0);
-  
-  [path addClip];
-  [backgroundColor setFill];
-  [path fill];
-  
-  path.lineWidth = width;
-  [borderColor setStroke];
-  [path stroke];
-  
-  UIImage *btnImage = UIGraphicsGetImageFromCurrentImageContext();
-  UIGraphicsEndImageContext();
-  
-  return [btnImage stretchableImageWithLeftCapWidth:CORNER_RADIUS topCapHeight:CORNER_RADIUS];
-}
-
-@end
-
-
-
-@implementation ASLayoutElementInspectorCellEditingBubble
-{
-  NSMutableArray<ASButtonNode *> *_textNodes;
-  ASDisplayNode                  *_slider;
-}
-
-- (instancetype)initWithEnumOptions:(BOOL)yes enumStrings:(NSArray<NSString *> *)options currentOptionIndex:(NSUInteger)currentOption
-{
-  self = [super init];
-  if (self) {
-    self.automaticallyManagesSubnodes = YES;
-    self.backgroundColor = [UIColor colorWithRed:255/255.0 green:181/255.0 blue:68/255.0 alpha:1];
-    
-    _textNodes = [[NSMutableArray alloc] init];
-    int index = 0;
-    for (NSString *optionStr in options) {
-      ASButtonNode *btn = [[ASButtonNode alloc] init];
-      [btn setAttributedTitle:[ASLayoutElementInspectorCell attributedStringFromString:optionStr] forState:ASControlStateNormal];
-      [btn setAttributedTitle:[ASLayoutElementInspectorCell attributedStringFromString:optionStr withTextColor:[UIColor redColor]]
-                     forState:ASControlStateSelected];
-      [btn addTarget:self action:@selector(enumOptionSelected:) forControlEvents:ASControlNodeEventTouchUpInside];
-      btn.selected = (index == currentOption) ? YES : NO;
-      [_textNodes addObject:btn];
-      index++;
-    }
-  }
-  return self;
-}
-
-- (instancetype)initWithSliderMinValue:(CGFloat)min maxValue:(CGFloat)max currentValue:(CGFloat)current
-{
-  if (self = [super init]) {
-    self.userInteractionEnabled = YES;
-    self.automaticallyManagesSubnodes = YES;
-    self.backgroundColor = [UIColor colorWithRed:255/255.0 green:181/255.0 blue:68/255.0 alpha:1];
-    
-    __weak id weakSelf = self;
-    _slider = [[ASDisplayNode alloc] initWithViewBlock:^UIView * _Nonnull{
-      UISlider *slider = [[UISlider alloc] init];
-      slider.minimumValue = min;
-      slider.maximumValue = max;
-      slider.value = current;
-      [slider addTarget:weakSelf action:@selector(sliderValueChanged:) forControlEvents:UIControlEventValueChanged];
-      
-      return slider;
-    }];
-    _slider.userInteractionEnabled = YES;
-  }
-  return self;
-}
-
-- (ASLayoutSpec *)layoutSpecThatFits:(ASSizeRange)constrainedSize
-{
-  _slider.style.preferredSize = CGSizeMake(constrainedSize.max.width, 25);
-  
-  NSMutableArray *children = [[NSMutableArray alloc] init];
-  if (_textNodes) {
-    ASStackLayoutSpec *textStack = [ASStackLayoutSpec verticalStackLayoutSpec];
-    textStack.children = _textNodes;
-    textStack.spacing = 2;
-    [children addObject:textStack];
-  }
-  if (_slider) {
-    _slider.style.flexGrow = 1.0;
-    [children addObject:_slider];
-  }
-  
-  ASStackLayoutSpec *verticalStackSpec = [ASStackLayoutSpec verticalStackLayoutSpec];
-  verticalStackSpec.children = children;
-  verticalStackSpec.spacing = 2;
-  verticalStackSpec.style.flexGrow = 1.0;
-  verticalStackSpec.style.alignSelf = ASStackLayoutAlignSelfStretch;
-  
-  ASInsetLayoutSpec *insetSpec = [ASInsetLayoutSpec insetLayoutSpecWithInsets:UIEdgeInsetsMake(8, 8, 8, 8) child:verticalStackSpec];
-  
-  return insetSpec;
-}
-
-#pragma mark - gesture handling
-- (void)enumOptionSelected:(ASButtonNode *)sender
-{
-  sender.selected = !sender.selected;
-  for (ASButtonNode *node in _textNodes) {
-    if (node != sender) {
-      node.selected = NO;
-    }
-  }
-  [self.delegate valueChangedToIndex:[_textNodes indexOfObject:sender]];
-  [self setNeedsLayout];
-}
-
-- (void)sliderValueChanged:(UISlider *)sender
-{
-  [self.delegate valueChangedToIndex:roundf(sender.value)];
-}
-
-@end
-
-
-#endif
diff --git a/submodules/AsyncDisplayKit/AsyncDisplayKit/Debug/ASLayoutElementInspectorNode.m b/submodules/AsyncDisplayKit/AsyncDisplayKit/Debug/ASLayoutElementInspectorNode.m
deleted file mode 100644
index b71c2f7413..0000000000
--- a/submodules/AsyncDisplayKit/AsyncDisplayKit/Debug/ASLayoutElementInspectorNode.m
+++ /dev/null
@@ -1,426 +0,0 @@
-//
-//  ASLayoutElementInspectorNode.m
-//  Sample
-//
-//  Created by Hannah Troisi on 3/19/16.
-//  Copyright © 2016 Facebook. All rights reserved.
-//
-
-#import <AsyncDisplayKit/ASLayoutElementInspectorNode.h>
-#ifndef MINIMAL_ASDK
-#import <AsyncDisplayKit/ASLayoutElementInspectorCell.h>
-#endif
-#import <AsyncDisplayKit/ASDisplayNode+Beta.h>
-#import <AsyncDisplayKit/ASDisplayNode+Subclasses.h>
-#import <AsyncDisplayKit/ASLayoutSpec+Debug.h>
-#import <AsyncDisplayKit/ASTableNode.h>
-#import <AsyncDisplayKit/ASDisplayNode.h>
-
-@interface ASLayoutElementInspectorNode ()
-#ifndef MINIMAL_ASDK
-<ASTableDelegate, ASTableDataSource>
-#endif
-@end
-
-@implementation ASLayoutElementInspectorNode
-{
-#ifndef MINIMAL_ASDK
-  ASTableNode  *_tableNode;
-#endif
-}
-
-#pragma mark - class methods
-+ (instancetype)sharedInstance
-{
-  static ASLayoutElementInspectorNode *__inspector = nil;
-  
-  static dispatch_once_t onceToken;
-  dispatch_once(&onceToken, ^{
-    __inspector = [[ASLayoutElementInspectorNode alloc] init];
-  });
-  
-  return __inspector;
-}
-
-#pragma mark - lifecycle
-- (instancetype)init
-{
-  self = [super init];
-  if (self) {
-    
-#ifndef MINIMAL_ASDK
-    _tableNode                 = [[ASTableNode alloc] init];
-    _tableNode.delegate        = self;
-    _tableNode.dataSource      = self;
-
-    [self addSubnode:_tableNode];  // required because of manual layout
-#endif
-  }
-  return self;
-}
-
-- (void)didLoad
-{
-  [super didLoad];
-#ifndef MINIMAL_ASDK
-  _tableNode.view.backgroundColor = [UIColor colorWithRed:40/255.0 green:43/255.0 blue:53/255.0 alpha:1];
-  _tableNode.view.separatorStyle = UITableViewCellSeparatorStyleNone;
-  _tableNode.view.allowsSelection = NO;
-  _tableNode.view.sectionHeaderHeight = 40;
-#endif
-}
-
-- (void)layout
-{
-  [super layout];
-#ifndef MINIMAL_ASDK
-  _tableNode.frame = self.bounds;
-#endif
-}
-
-#pragma mark - intstance methods
-- (void)setLayoutElementToEdit:(id<ASLayoutElement>)layoutElementToEdit
-{
-  if (_layoutElementToEdit != layoutElementToEdit) {
-    _layoutElementToEdit = layoutElementToEdit;
-  }
-#ifndef MINIMAL_ASDK
-  [_tableNode reloadData];
-#endif
-}
-
-#pragma mark - ASTableDataSource
-
-#ifndef MINIMAL_ASDK
-- (ASCellNode *)tableView:(ASTableView *)tableView nodeForRowAtIndexPath:(NSIndexPath *)indexPath
-{
-  if (indexPath.section == 0) {
-    NSDictionary *attributes = @{NSForegroundColorAttributeName : [UIColor colorWithRed:255/255.0 green:181/255.0 blue:68/255.0 alpha:1],
-                                 NSFontAttributeName : [UIFont fontWithName:@"Menlo-Regular" size:12]};
-    ASTextCellNode *textCell = [[ASTextCellNode alloc] initWithAttributes:attributes insets:UIEdgeInsetsMake(0, 4, 0, 0)];
-    textCell.text = [_layoutElementToEdit description];
-    return textCell;
-  } else {
-    return [[ASLayoutElementInspectorCell alloc] initWithProperty:(ASLayoutElementPropertyType)indexPath.row layoutElementToEdit:_layoutElementToEdit];
-  }
-}
-
-- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section
-{
-  if (section == 0) {
-    return 1;
-  } else {
-    return ASLayoutElementPropertyCount;
-  }
-}
-
-- (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView
-{
-  return 2;
-}
-
-- (nullable UIView *)tableView:(UITableView *)tableView viewForHeaderInSection:(NSInteger)section
-{
-  UILabel *headerTitle = [[UILabel alloc] initWithFrame:CGRectZero];
-  
-  NSString *title;
-  if (section == 0) {
-    title = @"<Layoutable> Item";
-  } else {
-    title = @"<Layoutable> Properties";
-  }
-  
-  NSDictionary *attributes = @{NSForegroundColorAttributeName : [UIColor whiteColor],
-                               NSFontAttributeName : [UIFont fontWithName:@"Menlo-Bold" size:12]};
-  headerTitle.attributedText = [[NSAttributedString alloc] initWithString:title attributes:attributes];
-  
-  return headerTitle;
-}
-
-#endif
-
-//- (ASLayoutSpec *)layoutSpecThatFits:(ASSizeRange)constrainedSize
-//{
-//  // navigate layout hierarchy
-//  
-//  _parentNodeNavBtn.alignSelf = ASStackLayoutAlignSelfCenter;
-//  _childNodeNavBtn.alignSelf = ASStackLayoutAlignSelfCenter;
-//
-//  ASStackLayoutSpec *horizontalStackNav = [ASStackLayoutSpec horizontalStackLayoutSpec];
-//  horizontalStackNav.style.flexGrow = 1.0;
-//  horizontalStackNav.alignSelf = ASStackLayoutAlignSelfCenter;
-//  horizontalStackNav.children = @[_siblingNodeLefttNavBtn, _siblingNodeRightNavBtn];
-//  
-//  ASStackLayoutSpec *horizontalStack = [ASStackLayoutSpec horizontalStackLayoutSpec];
-//  horizontalStack.style.flexGrow = 1.0;
-//  ASLayoutSpec *spacer = [[ASLayoutSpec alloc] init];
-//  
-//  spacer.style.flexGrow = 1.0;
-//  horizontalStack.children = @[_flexGrowBtn, spacer];
-//  _flexGrowValue.alignSelf = ASStackLayoutAlignSelfEnd;      // FIXME: make framework give a warning if you use ASAlignmentBottom!!!!!
-//  
-//  ASStackLayoutSpec *horizontalStack2 = [ASStackLayoutSpec horizontalStackLayoutSpec];
-//  horizontalStack2.style.flexGrow = 1.0;
-//  horizontalStack2.children = @[_flexShrinkBtn, spacer];
-//  _flexShrinkValue.alignSelf = ASStackLayoutAlignSelfEnd;
-//  
-//  ASStackLayoutSpec *horizontalStack3 = [ASStackLayoutSpec horizontalStackLayoutSpec];
-//  horizontalStack3.style.flexGrow = 1.0;
-//  horizontalStack3.children = @[_flexBasisBtn, spacer, _flexBasisValue];
-//  _flexBasisValue.alignSelf = ASStackLayoutAlignSelfEnd;
-//  
-//  ASStackLayoutSpec *itemDescriptionStack = [ASStackLayoutSpec verticalStackLayoutSpec];
-//  itemDescriptionStack.children = @[_itemDescription];
-//  itemDescriptionStack.spacing = 5;
-//  itemDescriptionStack.style.flexGrow = 1.0;
-//  
-//  ASStackLayoutSpec *layoutableStack = [ASStackLayoutSpec verticalStackLayoutSpec];
-//  layoutableStack.children = @[_layoutablePropertiesSectionTitle, horizontalStack, horizontalStack2, horizontalStack3, _alignSelfBtn];
-//  layoutableStack.spacing = 5;
-//  layoutableStack.style.flexGrow = 1.0;
-//  
-//  ASStackLayoutSpec *layoutSpecStack = [ASStackLayoutSpec verticalStackLayoutSpec];
-//  layoutSpecStack.children = @[_layoutSpecPropertiesSectionTitle, _alignItemsBtn];
-//  layoutSpecStack.spacing = 5;
-//  layoutSpecStack.style.flexGrow = 1.0;
-//  
-//  ASStackLayoutSpec *debugHelpStack = [ASStackLayoutSpec verticalStackLayoutSpec];
-//  debugHelpStack.children = @[_debugSectionTitle, _vizNodeInsetSizeBtn, _vizNodeBordersBtn];
-//  debugHelpStack.spacing = 5;
-//  debugHelpStack.style.flexGrow = 1.0;
-//
-//  ASStackLayoutSpec *verticalLayoutableStack = [ASStackLayoutSpec verticalStackLayoutSpec];
-//  verticalLayoutableStack.style.flexGrow = 1.0;
-//  verticalLayoutableStack.spacing = 20;
-//  verticalLayoutableStack.children = @[_parentNodeNavBtn, horizontalStackNav, _childNodeNavBtn, itemDescriptionStack, layoutableStack, layoutSpecStack, debugHelpStack];
-//  verticalLayoutableStack.alignItems = ASStackLayoutAlignItemsStretch;                // stretch headerStack to fill horizontal space
-//
-//  ASLayoutSpec *insetSpec = [ASInsetLayoutSpec insetLayoutSpecWithInsets:UIEdgeInsetsMake(100, 10, 10, 10) child:verticalLayoutableStack];
-//  insetSpec.style.flexGrow = 1.0;
-//  return insetSpec;
-//}
-//
-//#pragma mark - configure Inspector node for layoutable
-//- (void)updateInspectorWithLayoutable
-//{
-//  _itemDescription.attributedText = [self attributedStringFromLayoutable:_layoutElementToEdit];
-//
-//  if ([self node]) {
-//    UIColor *nodeBackgroundColor = [[self node] backgroundColor];
-//    UIImage *colorBtnImg = [ASLayoutElementInspectorNode imageForButtonWithBackgroundColor:nodeBackgroundColor
-//                                                                            borderColor:[UIColor whiteColor]
-//                                                                            borderWidth:3];
-//    [_itemBackgroundColorBtn setBackgroundImage:colorBtnImg forState:ASControlStateNormal];
-//  } else {
-//    _itemBackgroundColorBtn.enabled = NO;
-//  }
-//  
-//  _flexGrowBtn.selected           = [self.layoutElementToEdit flexGrow];
-//  _flexGrowValue.attributedText = [self attributedStringFromString: (_flexGrowBtn.selected) ? @"YES" : @"NO"];
-//  
-//  _flexShrinkBtn.selected           = self.layoutElementToEdit.style.flexShrink;
-//  _flexShrinkValue.attributedText = [self attributedStringFromString: (_flexShrinkBtn.selected) ? @"YES" : @"NO"];
-//  
-//  //  _flexBasisBtn.selected           = self.layoutElementToEdit.style.flexShrink;
-//  //  _flexBasisValue.attributedText = [self attributedStringFromString: (_flexBasisBtn.selected) ? @"YES" : @"NO"];
-//  
-//  
-//  NSUInteger alignSelfValue = [self.layoutElementToEdit alignSelf];
-//  NSString *newTitle = [@"alignSelf:" stringByAppendingString:[self alignSelfName:alignSelfValue]];
-//  [_alignSelfBtn setAttributedTitle:[self attributedStringFromString:newTitle] forState:ASControlStateNormal];
-//  
-//  if ([self layoutSpec]) {
-//    _alignItemsBtn.enabled = YES;
-////    NSUInteger alignItemsValue = [[self layoutSpec] alignItems];
-////    newTitle = [@"alignItems:" stringByAppendingString:[self alignSelfName:alignItemsValue]];
-////    [_alignItemsBtn setAttributedTitle:[self attributedStringFromString:newTitle] forState:ASControlStateNormal];
-//  }
-//
-//  [self setNeedsLayout];
-//}
-
-
-//- (void)enableInspectorNodesForLayoutable
-//{
-//  if ([self layoutSpec]) {
-//  
-//    _itemBackgroundColorBtn.enabled = YES;
-//    _flexGrowBtn.enabled        = YES;
-//    _flexShrinkBtn.enabled      = YES;
-//    _flexBasisBtn.enabled       = YES;
-//    _alignSelfBtn.enabled       = YES;
-//    _spacingBeforeBtn.enabled   = YES;
-//    _spacingAfterBtn.enabled    = YES;
-//    _alignItemsBtn.enabled      = YES;
-//    
-//  } else if ([self node]) {
-//    
-//    _itemBackgroundColorBtn.enabled = YES;
-//    _flexGrowBtn.enabled        = YES;
-//    _flexShrinkBtn.enabled      = YES;
-//    _flexBasisBtn.enabled       = YES;
-//    _alignSelfBtn.enabled       = YES;
-//    _spacingBeforeBtn.enabled   = YES;
-//    _spacingAfterBtn.enabled    = YES;
-//    _alignItemsBtn.enabled      = NO;
-//  
-//  } else {
-//    
-//    _itemBackgroundColorBtn.enabled = NO;
-//    _flexGrowBtn.enabled        = NO;
-//    _flexShrinkBtn.enabled      = NO;
-//    _flexBasisBtn.enabled       = NO;
-//    _alignSelfBtn.enabled       = NO;
-//    _spacingBeforeBtn.enabled   = NO;
-//    _spacingAfterBtn.enabled    = NO;
-//    _alignItemsBtn.enabled      = YES;
-//  }
-//}
-
-//+ (NSDictionary *)alignSelfTypeNames
-//{
-//  return @{@(ASStackLayoutAlignSelfAuto) : @"Auto",
-//           @(ASStackLayoutAlignSelfStart) : @"Start",
-//           @(ASStackLayoutAlignSelfEnd) : @"End",
-//           @(ASStackLayoutAlignSelfCenter) : @"Center",
-//           @(ASStackLayoutAlignSelfStretch) : @"Stretch"};
-//}
-//
-//- (NSString *)alignSelfName:(NSUInteger)type
-//{
-//  return [[self class] alignSelfTypeNames][@(type)];
-//}
-//
-//+ (NSDictionary *)alignItemTypeNames
-//{
-//  return @{@(ASStackLayoutAlignItemsBaselineFirst) : @"BaselineFirst",
-//           @(ASStackLayoutAlignItemsBaselineLast) : @"BaselineLast",
-//           @(ASStackLayoutAlignItemsCenter) : @"Center",
-//           @(ASStackLayoutAlignItemsEnd) : @"End",
-//           @(ASStackLayoutAlignItemsStart) : @"Start",
-//           @(ASStackLayoutAlignItemsStretch) : @"Stretch"};
-//}
-//
-//- (NSString *)alignItemName:(NSUInteger)type
-//{
-//  return [[self class] alignItemTypeNames][@(type)];
-//}
-
-//#pragma mark - gesture handling
-//- (void)changeColor:(ASButtonNode *)sender
-//{
-//  if ([self node]) {
-//    NSArray *colorArray = @[[UIColor orangeColor],
-//                            [UIColor redColor],
-//                            [UIColor greenColor],
-//                            [UIColor purpleColor]];
-//    
-//    UIColor *nodeBackgroundColor = [(ASDisplayNode *)self.layoutElementToEdit backgroundColor];
-//    
-//    NSUInteger colorIndex = [colorArray indexOfObject:nodeBackgroundColor];
-//    colorIndex = (colorIndex + 1 < [colorArray count]) ? colorIndex + 1 : 0;
-//    
-//    [[self node] setBackgroundColor: [colorArray objectAtIndex:colorIndex]];
-//  }
-//  
-//  [self updateInspectorWithLayoutable];
-//}
-//
-//- (void)setFlexGrowValue:(ASButtonNode *)sender
-//{
-//  [sender setSelected:!sender.isSelected];   // FIXME: fix ASControlNode documentation that this is automatic - unlike highlighted, it is up to the application to decide when a button should be selected or not. Selected is a more persistant thing and highlighted is for the moment, like as a user has a finger on it,
-//  
-//  if ([self layoutSpec]) {
-//    [[self layoutSpec] setFlexGrow:sender.isSelected];
-//  } else if ([self node]) {
-//    [[self node] setFlexGrow:sender.isSelected];
-//  }
-//  
-//  [self updateInspectorWithLayoutable];
-//}
-//
-//- (void)setFlexShrinkValue:(ASButtonNode *)sender
-//{
-//  [sender setSelected:!sender.isSelected];   // FIXME: fix ASControlNode documentation that this is automatic - unlike highlighted, it is up to the application to decide when a button should be selected or not. Selected is a more persistant thing and highlighted is for the moment, like as a user has a finger on it,
-//  
-//  if ([self layoutSpec]) {
-//    [[self layoutSpec] setFlexShrink:sender.isSelected];
-//  } else if ([self node]) {
-//    [[self node] setFlexShrink:sender.isSelected];
-//  }
-//  
-//  [self updateInspectorWithLayoutable];
-//}
-//
-//- (void)setAlignSelfValue:(ASButtonNode *)sender
-//{
-//  NSUInteger currentAlignSelfValue;
-//  NSUInteger nextAlignSelfValue;
-//  
-//  if ([self layoutSpec]) {
-//    currentAlignSelfValue = [[self layoutSpec] alignSelf];
-//    nextAlignSelfValue = (currentAlignSelfValue + 1 <= ASStackLayoutAlignSelfStretch) ? currentAlignSelfValue + 1 : 0;
-//    [[self layoutSpec] setAlignSelf:nextAlignSelfValue];
-//    
-//  } else if ([self node]) {
-//    currentAlignSelfValue = [[self node] alignSelf];
-//    nextAlignSelfValue = (currentAlignSelfValue + 1 <= ASStackLayoutAlignSelfStretch) ? currentAlignSelfValue + 1 : 0;
-//    [[self node] setAlignSelf:nextAlignSelfValue];
-//  }
-//  
-//  [self updateInspectorWithLayoutable];
-//}
-//
-//- (void)setAlignItemsValue:(ASButtonNode *)sender
-//{
-//  NSUInteger currentAlignItemsValue;
-//  NSUInteger nextAlignItemsValue;
-//  
-//  if ([self layoutSpec]) {
-//    currentAlignItemsValue = [[self layoutSpec] alignSelf];
-//    nextAlignItemsValue = (currentAlignItemsValue + 1 <= ASStackLayoutAlignSelfStretch) ? currentAlignItemsValue + 1 : 0;
-////    [[self layoutSpec] setAlignItems:nextAlignItemsValue];
-//    
-//  } else if ([self node]) {
-//    currentAlignItemsValue = [[self node] alignSelf];
-//    nextAlignItemsValue = (currentAlignItemsValue + 1 <= ASStackLayoutAlignSelfStretch) ? currentAlignItemsValue + 1 : 0;
-////    [[self node] setAlignItems:nextAlignItemsValue];
-//  }
-//  
-//  [self updateInspectorWithLayoutable];
-//}
-//- (void)setFlexBasisValue:(ASButtonNode *)sender
-//{
-//  [sender setSelected:!sender.isSelected];   // FIXME: fix ASControlNode documentation that this is automatic - unlike highlighted, it is up to the application to decide when a button should be selected or not. Selected is a more persistant thing and highlighted is for the moment, like as a user has a finger on it,
-//   FIXME: finish
-//}
-//
-//- (void)setVizNodeInsets:(ASButtonNode *)sender
-//{
-//  BOOL newState = !sender.selected;
-//  
-//  if (newState == YES) {
-//    self.vizNodeInsetSize = 0;
-//    [self.delegate toggleVisualization:NO];   // FIXME
-//    [self.delegate toggleVisualization:YES];   // FIXME
-//    _vizNodeBordersBtn.selected = YES;
-//    
-//  } else {
-//    self.vizNodeInsetSize = 10;
-//    [self.delegate toggleVisualization:NO];   // FIXME
-//    [self.delegate toggleVisualization:YES];   // FIXME
-//  }
-//  
-//  sender.selected = newState;
-//}
-//
-//- (void)setVizNodeBorders:(ASButtonNode *)sender
-//{
-//  BOOL newState = !sender.selected;
-//  
-//  [self.delegate toggleVisualization:newState];   // FIXME
-//
-//  sender.selected = newState;
-//}
-
-@end
diff --git a/submodules/AsyncDisplayKit/AsyncDisplayKit/Details/ASChangeSetDataController.h b/submodules/AsyncDisplayKit/AsyncDisplayKit/Details/ASChangeSetDataController.h
deleted file mode 100644
index 49df1dc24d..0000000000
--- a/submodules/AsyncDisplayKit/AsyncDisplayKit/Details/ASChangeSetDataController.h
+++ /dev/null
@@ -1,31 +0,0 @@
-//
-//  ASChangeSetDataController.h
-//  AsyncDisplayKit
-//
-//  Created by Huy Nguyen on 19/10/15.
-//
-//  Copyright (c) 2014-present, Facebook, Inc.  All rights reserved.
-//  This source code is licensed under the BSD-style license found in the
-//  LICENSE file in the root directory of this source tree. An additional grant
-//  of patent rights can be found in the PATENTS file in the same directory.
-//
-
-#ifndef MINIMAL_ASDK
-
-#import <AsyncDisplayKit/ASDataController.h>
-
-/**
- * @abstract Subclass of ASDataController that simulates ordering of operations in batch updates defined in UITableView and UICollectionView.
- * 
- * @discussion The ordering is achieved by using _ASHierarchyChangeSet to enqueue and sort operations.
- * More information about the ordering and the index paths used for operations can be found here:
- * https://developer.apple.com/library/ios/documentation/UserExperience/Conceptual/TableView_iPhone/ManageInsertDeleteRow/ManageInsertDeleteRow.html#//apple_ref/doc/uid/TP40007451-CH10-SW17
- *
- * @see ASDataController
- * @see _ASHierarchyChangeSet
- */
-@interface ASChangeSetDataController : ASDataController
-
-@end
-
-#endif
diff --git a/submodules/AsyncDisplayKit/AsyncDisplayKit/Details/ASChangeSetDataController.mm b/submodules/AsyncDisplayKit/AsyncDisplayKit/Details/ASChangeSetDataController.mm
deleted file mode 100644
index c41820dbb0..0000000000
--- a/submodules/AsyncDisplayKit/AsyncDisplayKit/Details/ASChangeSetDataController.mm
+++ /dev/null
@@ -1,212 +0,0 @@
-//
-//  ASChangeSetDataController.m
-//  AsyncDisplayKit
-//
-//  Created by Huy Nguyen on 19/10/15.
-//
-//  Copyright (c) 2014-present, Facebook, Inc.  All rights reserved.
-//  This source code is licensed under the BSD-style license found in the
-//  LICENSE file in the root directory of this source tree. An additional grant
-//  of patent rights can be found in the PATENTS file in the same directory.
-//
-
-#ifndef MINIMAL_ASDK
-
-#import "ASChangeSetDataController.h"
-#import "_ASHierarchyChangeSet.h"
-#import "ASAssert.h"
-#import "ASDataController+Subclasses.h"
-
-@implementation ASChangeSetDataController {
-  NSInteger _changeSetBatchUpdateCounter;
-  _ASHierarchyChangeSet *_changeSet;
-}
-
-- (void)dealloc
-{
-  ASDisplayNodeCAssert(_changeSetBatchUpdateCounter == 0, @"ASChangeSetDataController deallocated in the middle of a batch update.");
-}
-
-#pragma mark - Batching (External API)
-
-- (void)beginUpdates
-{
-  ASDisplayNodeAssertMainThread();
-  if (_changeSetBatchUpdateCounter <= 0) {
-    _changeSetBatchUpdateCounter = 0;
-    _changeSet = [[_ASHierarchyChangeSet alloc] initWithOldData:[self itemCountsFromDataSource]];
-  }
-  _changeSetBatchUpdateCounter++;
-}
-
-- (void)endUpdatesAnimated:(BOOL)animated completion:(void (^)(BOOL))completion
-{
-  ASDisplayNodeAssertMainThread();
-  _changeSetBatchUpdateCounter--;
-  
-  // Prevent calling endUpdatesAnimated:completion: in an unbalanced way
-  NSAssert(_changeSetBatchUpdateCounter >= 0, @"endUpdatesAnimated:completion: called without having a balanced beginUpdates call");
-  
-  [_changeSet addCompletionHandler:completion];
-  if (_changeSetBatchUpdateCounter == 0) {
-    void (^batchCompletion)(BOOL) = _changeSet.completionHandler;
-    
-    /**
-     * If the initial reloadData has not been called, just bail because we don't have
-     * our old data source counts.
-     * See ASUICollectionViewTests.testThatIssuingAnUpdateBeforeInitialReloadIsUnacceptable
-     * For the issue that UICollectionView has that we're choosing to workaround.
-     */
-    if (!self.initialReloadDataHasBeenCalled) {
-      if (batchCompletion != nil) {
-        batchCompletion(YES);
-      }
-      _changeSet = nil;
-      return;
-    }
-
-    [self invalidateDataSourceItemCounts];
-
-    // Attempt to mark the update completed. This is when update validation will occur inside the changeset.
-    // If an invalid update exception is thrown, we catch it and inject our "validationErrorSource" object,
-    // which is the table/collection node's data source, into the exception reason to help debugging.
-    @try {
-      [_changeSet markCompletedWithNewItemCounts:[self itemCountsFromDataSource]];
-    } @catch (NSException *e) {
-      id responsibleDataSource = self.validationErrorSource;
-      if (e.name == ASCollectionInvalidUpdateException && responsibleDataSource != nil) {
-        [NSException raise:ASCollectionInvalidUpdateException format:@"%@: %@", [responsibleDataSource class], e.reason];
-      } else {
-        @throw e;
-      }
-    }
-    
-    ASDataControllerLogEvent(self, @"triggeredUpdate: %@", _changeSet);
-    
-    [super beginUpdates];
-    
-    for (_ASHierarchyItemChange *change in [_changeSet itemChangesOfType:_ASHierarchyChangeTypeDelete]) {
-      [super deleteRowsAtIndexPaths:change.indexPaths withAnimationOptions:change.animationOptions];
-    }
-    
-    for (_ASHierarchySectionChange *change in [_changeSet sectionChangesOfType:_ASHierarchyChangeTypeDelete]) {
-      [super deleteSections:change.indexSet withAnimationOptions:change.animationOptions];
-    }
-    
-    for (_ASHierarchySectionChange *change in [_changeSet sectionChangesOfType:_ASHierarchyChangeTypeInsert]) {
-      [super insertSections:change.indexSet withAnimationOptions:change.animationOptions];
-    }
-    
-    for (_ASHierarchyItemChange *change in [_changeSet itemChangesOfType:_ASHierarchyChangeTypeInsert]) {
-      [super insertRowsAtIndexPaths:change.indexPaths withAnimationOptions:change.animationOptions];
-    }
-
-#if ASEVENTLOG_ENABLE
-    NSString *changeSetDescription = ASObjectDescriptionMakeTiny(_changeSet);
-    batchCompletion = ^(BOOL finished) {
-      if (batchCompletion != nil) {
-        batchCompletion(finished);
-      }
-      ASDataControllerLogEvent(self, @"finishedUpdate: %@", changeSetDescription);
-    };
-#endif
-    
-    [super endUpdatesAnimated:animated completion:batchCompletion];
-    
-    _changeSet = nil;
-  }
-}
-
-- (BOOL)batchUpdating
-{
-  BOOL batchUpdating = (_changeSetBatchUpdateCounter != 0);
-  // _changeSet must be available during batch update
-  ASDisplayNodeAssertTrue(batchUpdating == (_changeSet != nil));
-  return batchUpdating;
-}
-
-- (void)waitUntilAllUpdatesAreCommitted
-{
-  ASDisplayNodeAssertMainThread();
-  if (self.batchUpdating) {
-    // This assertion will be enabled soon.
-//    ASDisplayNodeFailAssert(@"Should not call %@ during batch update", NSStringFromSelector(_cmd));
-    return;
-  }
-
-  [super waitUntilAllUpdatesAreCommitted];
-}
-
-#pragma mark - Section Editing (External API)
-
-- (void)insertSections:(NSIndexSet *)sections withAnimationOptions:(ASDataControllerAnimationOptions)animationOptions
-{
-  ASDisplayNodeAssertMainThread();
-  [self beginUpdates];
-  [_changeSet insertSections:sections animationOptions:animationOptions];
-  [self endUpdates];
-}
-
-- (void)deleteSections:(NSIndexSet *)sections withAnimationOptions:(ASDataControllerAnimationOptions)animationOptions
-{
-  ASDisplayNodeAssertMainThread();
-  [self beginUpdates];
-  [_changeSet deleteSections:sections animationOptions:animationOptions];
-  [self endUpdates];
-}
-
-- (void)reloadSections:(NSIndexSet *)sections withAnimationOptions:(ASDataControllerAnimationOptions)animationOptions
-{
-  ASDisplayNodeAssertMainThread();
-  [self beginUpdates];
-  [_changeSet reloadSections:sections animationOptions:animationOptions];
-  [self endUpdates];
-}
-
-- (void)moveSection:(NSInteger)section toSection:(NSInteger)newSection withAnimationOptions:(ASDataControllerAnimationOptions)animationOptions
-{
-  ASDisplayNodeAssertMainThread();
-  [self beginUpdates];
-  [_changeSet deleteSections:[NSIndexSet indexSetWithIndex:section] animationOptions:animationOptions];
-  [_changeSet insertSections:[NSIndexSet indexSetWithIndex:newSection] animationOptions:animationOptions];
-  [self endUpdates];
-}
-
-#pragma mark - Row Editing (External API)
-
-- (void)insertRowsAtIndexPaths:(NSArray *)indexPaths withAnimationOptions:(ASDataControllerAnimationOptions)animationOptions
-{
-  ASDisplayNodeAssertMainThread();
-  [self beginUpdates];
-  [_changeSet insertItems:indexPaths animationOptions:animationOptions];
-  [self endUpdates];
-}
-
-- (void)deleteRowsAtIndexPaths:(NSArray *)indexPaths withAnimationOptions:(ASDataControllerAnimationOptions)animationOptions
-{
-  ASDisplayNodeAssertMainThread();
-  [self beginUpdates];
-  [_changeSet deleteItems:indexPaths animationOptions:animationOptions];
-  [self endUpdates];
-}
-
-- (void)reloadRowsAtIndexPaths:(NSArray *)indexPaths withAnimationOptions:(ASDataControllerAnimationOptions)animationOptions
-{
-  ASDisplayNodeAssertMainThread();
-  [self beginUpdates];
-  [_changeSet reloadItems:indexPaths animationOptions:animationOptions];
-  [self endUpdates];
-}
-
-- (void)moveRowAtIndexPath:(NSIndexPath *)indexPath toIndexPath:(NSIndexPath *)newIndexPath withAnimationOptions:(ASDataControllerAnimationOptions)animationOptions
-{
-  ASDisplayNodeAssertMainThread();
-  [self beginUpdates];
-  [_changeSet deleteItems:@[indexPath] animationOptions:animationOptions];
-  [_changeSet insertItems:@[newIndexPath] animationOptions:animationOptions];
-  [self endUpdates];
-}
-
-@end
-
-#endif
diff --git a/submodules/AsyncDisplayKit/AsyncDisplayKit/Details/ASCollectionDataController.h b/submodules/AsyncDisplayKit/AsyncDisplayKit/Details/ASCollectionDataController.h
deleted file mode 100644
index adc1d8d957..0000000000
--- a/submodules/AsyncDisplayKit/AsyncDisplayKit/Details/ASCollectionDataController.h
+++ /dev/null
@@ -1,57 +0,0 @@
-//
-//  ASCollectionDataController.h
-//  AsyncDisplayKit
-//
-//  Copyright (c) 2014-present, Facebook, Inc.  All rights reserved.
-//  This source code is licensed under the BSD-style license found in the
-//  LICENSE file in the root directory of this source tree. An additional grant
-//  of patent rights can be found in the PATENTS file in the same directory.
-//
-
-#ifndef MINIMAL_ASDK
-
-#import <UIKit/UIKit.h>
-
-#import <AsyncDisplayKit/ASDataController.h>
-#import <AsyncDisplayKit/ASDimension.h>
-
-@class ASDisplayNode;
-@class ASCollectionDataController;
-@protocol ASSectionContext;
-
-NS_ASSUME_NONNULL_BEGIN
-
-@protocol ASCollectionDataControllerSource <ASDataControllerSource>
-
-/**
- The constrained size range for layout.
- */
-- (ASSizeRange)dataController:(ASCollectionDataController *)dataController constrainedSizeForSupplementaryNodeOfKind:(NSString *)kind atIndexPath:(NSIndexPath *)indexPath;
-
-- (NSArray<NSString *> *)supplementaryNodeKindsInDataController:(ASCollectionDataController *)dataController sections:(NSIndexSet *)sections;
-
-- (NSUInteger)dataController:(ASCollectionDataController *)dataController supplementaryNodesOfKind:(NSString *)kind inSection:(NSUInteger)section;
-
-- (nullable id<ASSectionContext>)dataController:(ASCollectionDataController *)dataController contextForSection:(NSInteger)section;
-
-@optional
-
-- (ASCellNode *)dataController:(ASCollectionDataController *)dataController supplementaryNodeOfKind:(NSString *)kind atIndexPath:(NSIndexPath *)indexPath;
-
-- (ASCellNodeBlock)dataController:(ASCollectionDataController *)dataController supplementaryNodeBlockOfKind:(NSString *)kind atIndexPath:(NSIndexPath *)indexPath;
-
-@end
-
-@interface ASCollectionDataController : ASDataController
-
-- (instancetype)initWithDataSource:(id<ASCollectionDataControllerSource>)dataSource eventLog:(nullable ASEventLog *)eventLog NS_DESIGNATED_INITIALIZER;
-
-- (nullable ASCellNode *)supplementaryNodeOfKind:(NSString *)kind atIndexPath:(NSIndexPath *)indexPath;
-
-- (nullable id<ASSectionContext>)contextForSection:(NSInteger)section;
-
-@end
-
-NS_ASSUME_NONNULL_END
-
-#endif
diff --git a/submodules/AsyncDisplayKit/AsyncDisplayKit/Details/ASCollectionDataController.mm b/submodules/AsyncDisplayKit/AsyncDisplayKit/Details/ASCollectionDataController.mm
deleted file mode 100644
index 2dc4bb203c..0000000000
--- a/submodules/AsyncDisplayKit/AsyncDisplayKit/Details/ASCollectionDataController.mm
+++ /dev/null
@@ -1,320 +0,0 @@
-//
-//  ASCollectionDataController.mm
-//  AsyncDisplayKit
-//
-//  Copyright (c) 2014-present, Facebook, Inc.  All rights reserved.
-//  This source code is licensed under the BSD-style license found in the
-//  LICENSE file in the root directory of this source tree. An additional grant
-//  of patent rights can be found in the PATENTS file in the same directory.
-//
-#ifndef MINIMAL_ASDK
-#import <AsyncDisplayKit/ASCollectionDataController.h>
-
-#import <AsyncDisplayKit/ASAssert.h>
-#import <AsyncDisplayKit/ASMultidimensionalArrayUtils.h>
-#import <AsyncDisplayKit/ASCellNode.h>
-#import <AsyncDisplayKit/ASDataController+Subclasses.h>
-#import <AsyncDisplayKit/ASIndexedNodeContext.h>
-#import <AsyncDisplayKit/ASSection.h>
-#import <AsyncDisplayKit/ASSectionContext.h>
-#import <AsyncDisplayKit/NSIndexSet+ASHelpers.h>
-
-//#define LOG(...) NSLog(__VA_ARGS__)
-#define LOG(...)
-
-@interface ASCollectionDataController () {
-  BOOL _dataSourceImplementsSupplementaryNodeBlockOfKindAtIndexPath;
-  NSInteger _nextSectionID;
-  NSMutableArray<ASSection *> *_sections;
-  NSArray<ASSection *> *_pendingSections;
-
-  /**
-   * supplementaryKinds can only be accessed on the main thread
-   * and so we set this in the -prepare stage, and then read it during the -will
-   * stage of each update operation.
-   */
-  NSArray *_supplementaryKindsForPendingOperation;
-}
-
-- (id<ASCollectionDataControllerSource>)collectionDataSource;
-
-@end
-
-@implementation ASCollectionDataController {
-  NSMutableDictionary<NSString *, NSMutableArray<ASIndexedNodeContext *> *> *_pendingNodeContexts;
-}
-
-- (instancetype)initWithDataSource:(id<ASCollectionDataControllerSource>)dataSource eventLog:(ASEventLog *)eventLog
-{
-  self = [super initWithDataSource:dataSource eventLog:eventLog];
-  if (self != nil) {
-    _pendingNodeContexts = [NSMutableDictionary dictionary];
-    _dataSourceImplementsSupplementaryNodeBlockOfKindAtIndexPath = [dataSource respondsToSelector:@selector(dataController:supplementaryNodeBlockOfKind:atIndexPath:)];
-
-    ASDisplayNodeAssertTrue(_dataSourceImplementsSupplementaryNodeBlockOfKindAtIndexPath || [dataSource respondsToSelector:@selector(dataController:supplementaryNodeOfKind:atIndexPath:)]);
-    
-    _nextSectionID = 0;
-    _sections = [NSMutableArray array];
-  }
-  return self;
-}
-
-- (void)prepareForReloadDataWithSectionCount:(NSInteger)newSectionCount
-{
-  ASDisplayNodeAssertMainThread();
-  NSIndexSet *sections = [NSIndexSet indexSetWithIndexesInRange:NSMakeRange(0, newSectionCount)];
-  
-  [_sections removeAllObjects];
-  [self _populatePendingSectionsFromDataSource:sections];
-  
-  for (NSString *kind in [self supplementaryKindsInSections:sections]) {
-    LOG(@"Populating elements of kind: %@", kind);
-    NSMutableArray<ASIndexedNodeContext *> *contexts = [NSMutableArray array];
-    [self _populateSupplementaryNodesOfKind:kind withSections:sections mutableContexts:contexts];
-    _pendingNodeContexts[kind] = contexts;
-  }
-}
-
-- (void)willReloadDataWithSectionCount:(NSInteger)newSectionCount
-{
-  NSIndexSet *sectionIndexes = [NSIndexSet indexSetWithIndexesInRange:NSMakeRange(0, newSectionCount)];
-  
-  [self applyPendingSections:sectionIndexes];
-  
-  // Assert that ASDataController has already deleted all the old sections for us.
-  ASDisplayNodeAssert([self editingNodesOfKind:ASDataControllerRowNodeKind].count == 0, @"Expected that all old sections were deleted before %@. Sections: %@", NSStringFromSelector(_cmd), [self editingNodesOfKind:ASDataControllerRowNodeKind]);
-
-  [_pendingNodeContexts enumerateKeysAndObjectsUsingBlock:^(NSString * _Nonnull kind, NSMutableArray<ASIndexedNodeContext *> * _Nonnull contexts, __unused BOOL * _Nonnull stop) {
-    // Insert each section
-    NSMutableArray *sections = [NSMutableArray arrayWithCapacity:newSectionCount];
-    for (int i = 0; i < newSectionCount; i++) {
-      [sections addObject:[NSMutableArray array]];
-    }
-    [self insertSections:sections ofKind:kind atIndexSet:sectionIndexes completion:nil];
-    
-    [self batchLayoutNodesFromContexts:contexts batchCompletion:^(NSArray<ASCellNode *> *nodes, NSArray<NSIndexPath *> *indexPaths) {
-      [self insertNodes:nodes ofKind:kind atIndexPaths:indexPaths completion:nil];
-    }];
-  }];
-  [_pendingNodeContexts removeAllObjects];
-}
-
-- (void)prepareForInsertSections:(NSIndexSet *)sections
-{
-  ASDisplayNodeAssertMainThread();
-  [self _populatePendingSectionsFromDataSource:sections];
-  
-  for (NSString *kind in [self supplementaryKindsInSections:sections]) {
-    LOG(@"Populating elements of kind: %@, for sections: %@", kind, sections);
-    NSMutableArray<ASIndexedNodeContext *> *contexts = [NSMutableArray array];
-    [self _populateSupplementaryNodesOfKind:kind withSections:sections mutableContexts:contexts];
-    _pendingNodeContexts[kind] = contexts;
-  }
-}
-
-- (void)willInsertSections:(NSIndexSet *)sections
-{
-  [self applyPendingSections:sections];
-  
-  [_pendingNodeContexts enumerateKeysAndObjectsUsingBlock:^(NSString * _Nonnull kind, NSMutableArray<ASIndexedNodeContext *> * _Nonnull contexts, BOOL * _Nonnull stop) {
-    NSMutableArray *sectionArray = [NSMutableArray arrayWithCapacity:sections.count];
-    for (NSUInteger i = 0; i < sections.count; i++) {
-      [sectionArray addObject:[NSMutableArray array]];
-    }
-    
-    [self insertSections:sectionArray ofKind:kind atIndexSet:sections completion:nil];
-    [self batchLayoutNodesFromContexts:contexts batchCompletion:^(NSArray<ASCellNode *> *nodes, NSArray<NSIndexPath *> *indexPaths) {
-      [self insertNodes:nodes ofKind:kind atIndexPaths:indexPaths completion:nil];
-    }];
-  }];
-  [_pendingNodeContexts removeAllObjects];
-}
-
-- (void)willDeleteSections:(NSIndexSet *)sections
-{
-  [_sections removeObjectsAtIndexes:sections];
-}
-
-- (void)prepareForInsertRowsAtIndexPaths:(NSArray<NSIndexPath *> *)indexPaths
-{
-  ASDisplayNodeAssertMainThread();
-  NSIndexSet *sections = [NSIndexSet as_sectionsFromIndexPaths:indexPaths];
-  for (NSString *kind in [self supplementaryKindsInSections:sections]) {
-    LOG(@"Populating elements of kind: %@, for index paths: %@", kind, indexPaths);
-    NSMutableArray<ASIndexedNodeContext *> *contexts = [NSMutableArray array];
-    [self _populateSupplementaryNodesOfKind:kind atIndexPaths:indexPaths mutableContexts:contexts];
-    _pendingNodeContexts[kind] = contexts;
-  }
-}
-
-- (void)willInsertRowsAtIndexPaths:(NSArray<NSIndexPath *> *)indexPaths
-{
-  [_pendingNodeContexts enumerateKeysAndObjectsUsingBlock:^(NSString * _Nonnull kind, NSMutableArray<ASIndexedNodeContext *> * _Nonnull contexts, BOOL * _Nonnull stop) {
-    [self batchLayoutNodesFromContexts:contexts batchCompletion:^(NSArray<ASCellNode *> *nodes, NSArray<NSIndexPath *> *indexPaths) {
-      [self insertNodes:nodes ofKind:kind atIndexPaths:indexPaths completion:nil];
-    }];
-  }];
-
-  [_pendingNodeContexts removeAllObjects];
-}
-
-- (void)prepareForDeleteRowsAtIndexPaths:(NSArray<NSIndexPath *> *)indexPaths
-{
-  ASDisplayNodeAssertMainThread();
-  NSIndexSet *sections = [NSIndexSet as_sectionsFromIndexPaths:indexPaths];
-  _supplementaryKindsForPendingOperation = [self supplementaryKindsInSections:sections];
-  for (NSString *kind in _supplementaryKindsForPendingOperation) {
-    NSMutableArray<ASIndexedNodeContext *> *contexts = [NSMutableArray array];
-    [self _populateSupplementaryNodesOfKind:kind atIndexPaths:indexPaths mutableContexts:contexts];
-    _pendingNodeContexts[kind] = contexts;
-  }
-}
-
-- (void)willDeleteRowsAtIndexPaths:(NSArray<NSIndexPath *> *)indexPaths
-{
-  for (NSString *kind in _supplementaryKindsForPendingOperation) {
-    NSArray<NSIndexPath *> *deletedIndexPaths = ASIndexPathsInMultidimensionalArrayIntersectingIndexPaths([self editingNodesOfKind:kind], indexPaths);
-
-    [self deleteNodesOfKind:kind atIndexPaths:deletedIndexPaths completion:nil];
-
-    // If any of the contexts remain after the deletion, re-insert them, e.g.
-    // UICollectionElementKindSectionHeader remains even if item 0 is deleted.
-    NSMutableArray<ASIndexedNodeContext *> *reinsertedContexts = [NSMutableArray array];
-    for (ASIndexedNodeContext *context in _pendingNodeContexts[kind]) {
-      if ([deletedIndexPaths containsObject:context.indexPath]) {
-        [reinsertedContexts addObject:context];
-      }
-    }
-    
-    [self batchLayoutNodesFromContexts:reinsertedContexts batchCompletion:^(NSArray<ASCellNode *> *nodes, NSArray<NSIndexPath *> *indexPaths) {
-      [self insertNodes:nodes ofKind:kind atIndexPaths:indexPaths completion:nil];
-    }];
-  }
-  [_pendingNodeContexts removeAllObjects];
-  _supplementaryKindsForPendingOperation = nil;
-}
-
-- (void)_populatePendingSectionsFromDataSource:(NSIndexSet *)sectionIndexes
-{
-  ASDisplayNodeAssertMainThread();
-  
-  NSMutableArray<ASSection *> *sections = [NSMutableArray arrayWithCapacity:sectionIndexes.count];
-  [sectionIndexes enumerateIndexesUsingBlock:^(NSUInteger idx, BOOL * _Nonnull stop) {
-    id<ASSectionContext> context = [self.collectionDataSource dataController:self contextForSection:idx];
-    [sections addObject:[[ASSection alloc] initWithSectionID:_nextSectionID context:context]];
-    _nextSectionID++;
-  }];
-  _pendingSections = sections;
-}
-
-- (void)_populateSupplementaryNodesOfKind:(NSString *)kind withSections:(NSIndexSet *)sections mutableContexts:(NSMutableArray<ASIndexedNodeContext *> *)contexts
-{
-  __weak id<ASTraitEnvironment> environment = [self.environmentDelegate dataControllerEnvironment];
-
-  [sections enumerateRangesUsingBlock:^(NSRange range, BOOL * _Nonnull stop) {
-    for (NSUInteger sec = range.location; sec < NSMaxRange(range); sec++) {
-      NSUInteger itemCount = [self.collectionDataSource dataController:self supplementaryNodesOfKind:kind inSection:sec];
-      for (NSUInteger i = 0; i < itemCount; i++) {
-        NSIndexPath *indexPath = [NSIndexPath indexPathForItem:i inSection:sec];
-        [self _populateSupplementaryNodeOfKind:kind atIndexPath:indexPath mutableContexts:contexts environment:environment];
-      }
-    }
-  }];
-}
-
-- (void)_populateSupplementaryNodesOfKind:(NSString *)kind atIndexPaths:(NSArray<NSIndexPath *> *)indexPaths mutableContexts:(NSMutableArray<ASIndexedNodeContext *> *)contexts
-{
-  __weak id<ASTraitEnvironment> environment = [self.environmentDelegate dataControllerEnvironment];
-
-  NSMutableIndexSet *sections = [NSMutableIndexSet indexSet];
-  for (NSIndexPath *indexPath in indexPaths) {
-    [sections addIndex:indexPath.section];
-  }
-
-  [sections enumerateRangesUsingBlock:^(NSRange range, BOOL * _Nonnull stop) {
-    for (NSUInteger sec = range.location; sec < NSMaxRange(range); sec++) {
-      NSUInteger itemCount = [self.collectionDataSource dataController:self supplementaryNodesOfKind:kind inSection:sec];
-      for (NSUInteger i = 0; i < itemCount; i++) {
-        NSIndexPath *indexPath = [NSIndexPath indexPathForItem:i inSection:sec];
-        [self _populateSupplementaryNodeOfKind:kind atIndexPath:indexPath mutableContexts:contexts environment:environment];
-      }
-    }
-  }];
-}
-
-- (void)_populateSupplementaryNodeOfKind:(NSString *)kind atIndexPath:(NSIndexPath *)indexPath mutableContexts:(NSMutableArray<ASIndexedNodeContext *> *)contexts environment:(id<ASTraitEnvironment>)environment
-{
-  ASCellNodeBlock supplementaryCellBlock;
-  if (_dataSourceImplementsSupplementaryNodeBlockOfKindAtIndexPath) {
-    supplementaryCellBlock = [self.collectionDataSource dataController:self supplementaryNodeBlockOfKind:kind atIndexPath:indexPath];
-  } else {
-    ASCellNode *supplementaryNode = [self.collectionDataSource dataController:self supplementaryNodeOfKind:kind atIndexPath:indexPath];
-    supplementaryCellBlock = ^{ return supplementaryNode; };
-  }
-  
-  ASSizeRange constrainedSize = [self constrainedSizeForNodeOfKind:kind atIndexPath:indexPath];
-  ASIndexedNodeContext *context = [[ASIndexedNodeContext alloc] initWithNodeBlock:supplementaryCellBlock
-                                                                        indexPath:indexPath
-                                                         supplementaryElementKind:kind
-                                                                  constrainedSize:constrainedSize
-                                                                      environment:environment];
-  [contexts addObject:context];
-}
-
-#pragma mark - Sizing query
-
-- (ASSizeRange)constrainedSizeForNodeOfKind:(NSString *)kind atIndexPath:(NSIndexPath *)indexPath
-{
-  if ([kind isEqualToString:ASDataControllerRowNodeKind]) {
-    return [super constrainedSizeForNodeOfKind:kind atIndexPath:indexPath];
-  } else {
-    ASDisplayNodeAssertMainThread();
-    return [self.collectionDataSource dataController:self constrainedSizeForSupplementaryNodeOfKind:kind atIndexPath:indexPath];
-  }
-}
-
-#pragma mark - External supplementary store and section context querying
-
-- (ASCellNode *)supplementaryNodeOfKind:(NSString *)kind atIndexPath:(NSIndexPath *)indexPath
-{
-  ASDisplayNodeAssertMainThread();
-  NSArray *nodesOfKind = [self completedNodesOfKind:kind];
-  NSInteger section = indexPath.section;
-  if (section < nodesOfKind.count) {
-    NSArray *nodesOfKindInSection = nodesOfKind[section];
-    NSInteger itemIndex = indexPath.item;
-    if (itemIndex < nodesOfKindInSection.count) {
-      return nodesOfKindInSection[itemIndex];
-    }
-  }
-  return nil;
-}
-
-- (id<ASSectionContext>)contextForSection:(NSInteger)section
-{
-  ASDisplayNodeAssertMainThread();
-  ASDisplayNodeAssertTrue(section >= 0 && section < _sections.count);
-  return _sections[section].context;
-}
-
-#pragma mark - Private Helpers
-
-- (NSArray *)supplementaryKindsInSections:(NSIndexSet *)sections
-{
-  return [self.collectionDataSource supplementaryNodeKindsInDataController:self sections:sections];
-}
-
-- (id<ASCollectionDataControllerSource>)collectionDataSource
-{
-  return (id<ASCollectionDataControllerSource>)self.dataSource;
-}
-
-- (void)applyPendingSections:(NSIndexSet *)sectionIndexes
-{
-  [_sections insertObjects:_pendingSections atIndexes:sectionIndexes];
-  _pendingSections = nil;
-}
-
-@end
-
-#endif
diff --git a/submodules/AsyncDisplayKit/AsyncDisplayKit/Details/ASDataController.mm b/submodules/AsyncDisplayKit/AsyncDisplayKit/Details/ASDataController.mm
deleted file mode 100644
index 047b59099a..0000000000
--- a/submodules/AsyncDisplayKit/AsyncDisplayKit/Details/ASDataController.mm
+++ /dev/null
@@ -1,1093 +0,0 @@
-//
-//  ASDataController.mm
-//  AsyncDisplayKit
-//
-//  Copyright (c) 2014-present, Facebook, Inc.  All rights reserved.
-//  This source code is licensed under the BSD-style license found in the
-//  LICENSE file in the root directory of this source tree. An additional grant
-//  of patent rights can be found in the PATENTS file in the same directory.
-//
-#ifndef MINIMAL_ASDK
-#import <AsyncDisplayKit/ASDataController.h>
-
-#import <AsyncDisplayKit/_ASHierarchyChangeSet.h>
-#import <AsyncDisplayKit/ASAssert.h>
-#import <AsyncDisplayKit/ASCellNode.h>
-#import <AsyncDisplayKit/ASLayout.h>
-#import <AsyncDisplayKit/ASMainSerialQueue.h>
-#import <AsyncDisplayKit/ASMultidimensionalArrayUtils.h>
-#import <AsyncDisplayKit/ASThread.h>
-#import <AsyncDisplayKit/ASIndexedNodeContext.h>
-#import <AsyncDisplayKit/ASDataController+Subclasses.h>
-#import <AsyncDisplayKit/ASDispatch.h>
-#import <AsyncDisplayKit/ASInternalHelpers.h>
-#import <AsyncDisplayKit/ASCellNode+Internal.h>
-
-//#define LOG(...) NSLog(__VA_ARGS__)
-#define LOG(...)
-
-#define AS_MEASURE_AVOIDED_DATACONTROLLER_WORK 0
-
-#define RETURN_IF_NO_DATASOURCE(val) if (_dataSource == nil) { return val; }
-#define ASSERT_ON_EDITING_QUEUE ASDisplayNodeAssertNotNil(dispatch_get_specific(&kASDataControllerEditingQueueKey), @"%@ must be called on the editing transaction queue.", NSStringFromSelector(_cmd))
-
-const static NSUInteger kASDataControllerSizingCountPerProcessor = 5;
-const static char * kASDataControllerEditingQueueKey = "kASDataControllerEditingQueueKey";
-const static char * kASDataControllerEditingQueueContext = "kASDataControllerEditingQueueContext";
-
-NSString * const ASDataControllerRowNodeKind = @"_ASDataControllerRowNodeKind";
-NSString * const ASCollectionInvalidUpdateException = @"ASCollectionInvalidUpdateException";
-
-#if AS_MEASURE_AVOIDED_DATACONTROLLER_WORK
-@interface ASDataController (AvoidedWorkMeasuring)
-+ (void)_didLayoutNode;
-+ (void)_expectToInsertNodes:(NSUInteger)count;
-@end
-#endif
-
-@interface ASDataController () {
-  NSMutableDictionary *_nodeContexts;       // Main thread only. This is modified immediately during edits i.e. these are in the dataSource's index space.
-  NSMutableArray *_externalCompletedNodes;    // Main thread only.  External data access can immediately query this if available.
-  NSMutableDictionary *_completedNodes;       // Main thread only.  External data access can immediately query this if _externalCompletedNodes is unavailable.
-  NSMutableDictionary *_editingNodes;         // Modified on _editingTransactionQueue only.  Updates propagated to _completedNodes.
-  BOOL _itemCountsFromDataSourceAreValid;     // Main thread only.
-  std::vector<NSInteger> _itemCountsFromDataSource;         // Main thread only.
-  
-  ASMainSerialQueue *_mainSerialQueue;
-
-  dispatch_queue_t _editingTransactionQueue;  // Serial background queue.  Dispatches concurrent layout and manages _editingNodes.
-  dispatch_group_t _editingTransactionGroup;     // Group of all edit transaction blocks. Useful for waiting.
-  
-  BOOL _initialReloadDataHasBeenCalled;
-
-  BOOL _delegateDidInsertNodes;
-  BOOL _delegateDidDeleteNodes;
-  BOOL _delegateDidInsertSections;
-  BOOL _delegateDidDeleteSections;
-}
-
-@end
-
-@implementation ASDataController
-
-#pragma mark - Lifecycle
-
-- (instancetype)initWithDataSource:(id<ASDataControllerSource>)dataSource eventLog:(ASEventLog *)eventLog
-{
-  if (!(self = [super init])) {
-    return nil;
-  }
-  
-  _dataSource = dataSource;
-  
-#if ASEVENTLOG_ENABLE
-  _eventLog = eventLog;
-#endif
-  
-  _nodeContexts = [NSMutableDictionary dictionary];
-  _completedNodes = [NSMutableDictionary dictionary];
-  _editingNodes = [NSMutableDictionary dictionary];
-
-  _nodeContexts[ASDataControllerRowNodeKind] = [NSMutableArray array];
-  _completedNodes[ASDataControllerRowNodeKind] = [NSMutableArray array];
-  _editingNodes[ASDataControllerRowNodeKind] = [NSMutableArray array];
-  
-  _mainSerialQueue = [[ASMainSerialQueue alloc] init];
-  
-  const char *queueName = [[NSString stringWithFormat:@"org.AsyncDisplayKit.ASDataController.editingTransactionQueue:%p", self] cStringUsingEncoding:NSASCIIStringEncoding];
-  _editingTransactionQueue = dispatch_queue_create(queueName, DISPATCH_QUEUE_SERIAL);
-  dispatch_queue_set_specific(_editingTransactionQueue, &kASDataControllerEditingQueueKey, &kASDataControllerEditingQueueContext, NULL);
-  _editingTransactionGroup = dispatch_group_create();
-  
-  return self;
-}
-
-- (instancetype)init
-{
-  ASDisplayNodeFailAssert(@"Failed to call designated initializer.");
-  id<ASDataControllerSource> fakeDataSource = nil;
-  ASEventLog *eventLog = nil;
-  return [self initWithDataSource:fakeDataSource eventLog:eventLog];
-}
-
-- (void)setDelegate:(id<ASDataControllerDelegate>)delegate
-{
-  if (_delegate == delegate) {
-    return;
-  }
-  
-  _delegate = delegate;
-  
-  // Interrogate our delegate to understand its capabilities, optimizing away expensive respondsToSelector: calls later.
-  _delegateDidInsertNodes     = [_delegate respondsToSelector:@selector(dataController:didInsertNodes:atIndexPaths:withAnimationOptions:)];
-  _delegateDidDeleteNodes     = [_delegate respondsToSelector:@selector(dataController:didDeleteNodes:atIndexPaths:withAnimationOptions:)];
-  _delegateDidInsertSections  = [_delegate respondsToSelector:@selector(dataController:didInsertSections:atIndexSet:withAnimationOptions:)];
-  _delegateDidDeleteSections  = [_delegate respondsToSelector:@selector(dataController:didDeleteSectionsAtIndexSet:withAnimationOptions:)];
-}
-
-+ (NSUInteger)parallelProcessorCount
-{
-  static NSUInteger parallelProcessorCount;
-
-  static dispatch_once_t onceToken;
-  dispatch_once(&onceToken, ^{
-    parallelProcessorCount = [[NSProcessInfo processInfo] activeProcessorCount];
-  });
-
-  return parallelProcessorCount;
-}
-
-#pragma mark - Cell Layout
-
-- (void)batchLayoutNodesFromContexts:(NSArray<ASIndexedNodeContext *> *)contexts batchCompletion:(ASDataControllerCompletionBlock)batchCompletionHandler
-{
-  ASSERT_ON_EDITING_QUEUE;
-#if AS_MEASURE_AVOIDED_DATACONTROLLER_WORK
-    [ASDataController _expectToInsertNodes:contexts.count];
-#endif
-  
-  if (contexts.count == 0) {
-    batchCompletionHandler(@[], @[]);
-    return;
-  }
-
-  ASProfilingSignpostStart(2, _dataSource);
-  
-  NSUInteger blockSize = [[ASDataController class] parallelProcessorCount] * kASDataControllerSizingCountPerProcessor;
-  NSUInteger count = contexts.count;
-  
-  // Processing in batches
-  for (NSUInteger i = 0; i < count; i += blockSize) {
-    NSRange batchedRange = NSMakeRange(i, MIN(count - i, blockSize));
-    NSArray<ASIndexedNodeContext *> *batchedContexts = [contexts subarrayWithRange:batchedRange];
-    NSArray *nodes = [self _layoutNodesFromContexts:batchedContexts];
-    NSArray *indexPaths = [ASIndexedNodeContext indexPathsFromContexts:batchedContexts];
-    batchCompletionHandler(nodes, indexPaths);
-  }
-  
-  ASProfilingSignpostEnd(2, _dataSource);
-}
-
-/**
- * Measure and layout the given node with the constrained size range.
- */
-- (void)_layoutNode:(ASCellNode *)node withConstrainedSize:(ASSizeRange)constrainedSize
-{
-  ASDisplayNodeAssert(ASSizeRangeHasSignificantArea(constrainedSize), @"Attempt to layout cell node with invalid size range %@", NSStringFromASSizeRange(constrainedSize));
-
-  CGRect frame = CGRectZero;
-  frame.size = [node layoutThatFits:constrainedSize].size;
-  node.frame = frame;
-}
-
-/**
- * Measures and defines the layout for each node in optimized batches on an editing queue, inserting the results into the backing store.
- */
-- (void)_batchLayoutAndInsertNodesFromContexts:(NSArray<ASIndexedNodeContext *> *)contexts withAnimationOptions:(ASDataControllerAnimationOptions)animationOptions
-{
-  ASSERT_ON_EDITING_QUEUE;
-  
-  [self batchLayoutNodesFromContexts:contexts batchCompletion:^(NSArray<ASCellNode *> *nodes, NSArray<NSIndexPath *> *indexPaths) {
-    // Insert finished nodes into data storage
-    [self _insertNodes:nodes atIndexPaths:indexPaths withAnimationOptions:animationOptions];
-  }];
-}
-
-- (NSArray<ASCellNode *> *)_layoutNodesFromContexts:(NSArray<ASIndexedNodeContext *> *)contexts
-{
-  ASSERT_ON_EDITING_QUEUE;
-  
-  NSUInteger nodeCount = contexts.count;
-  if (!nodeCount || _dataSource == nil) {
-    return nil;
-  }
-
-  __strong ASCellNode **allocatedNodeBuffer = (__strong ASCellNode **)calloc(nodeCount, sizeof(ASCellNode *));
-
-  dispatch_queue_t queue = dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0);
-  ASDispatchApply(nodeCount, queue, 0, ^(size_t i) {
-    RETURN_IF_NO_DATASOURCE();
-
-    // Allocate the node.
-    ASIndexedNodeContext *context = contexts[i];
-    ASCellNode *node = context.node;
-    if (node == nil) {
-      ASDisplayNodeAssertNotNil(node, @"Node block created nil node; %@, %@", self, self.dataSource);
-      node = [[ASCellNode alloc] init]; // Fallback to avoid crash for production apps.
-    }
-    
-    // Layout the node if the size range is valid.
-    ASSizeRange sizeRange = context.constrainedSize;
-    if (ASSizeRangeHasSignificantArea(sizeRange)) {
-      [self _layoutNode:node withConstrainedSize:sizeRange];
-    }
-
-#if AS_MEASURE_AVOIDED_DATACONTROLLER_WORK
-    [ASDataController _didLayoutNode];
-#endif
-    allocatedNodeBuffer[i] = node;
-  });
-
-  BOOL canceled = _dataSource == nil;
-
-  // Create nodes array
-  NSArray *nodes = canceled ? nil : [NSArray arrayWithObjects:allocatedNodeBuffer count:nodeCount];
-  
-  // Nil out buffer indexes to allow arc to free the stored cells.
-  for (int i = 0; i < nodeCount; i++) {
-    allocatedNodeBuffer[i] = nil;
-  }
-  free(allocatedNodeBuffer);
-
-  return nodes;
-}
-
-- (ASSizeRange)constrainedSizeForNodeOfKind:(NSString *)kind atIndexPath:(NSIndexPath *)indexPath
-{
-  return [_dataSource dataController:self constrainedSizeForNodeAtIndexPath:indexPath];
-}
-
-#pragma mark - External Data Querying + Editing
-
-- (void)insertNodes:(NSArray *)nodes ofKind:(NSString *)kind atIndexPaths:(NSArray *)indexPaths completion:(ASDataControllerCompletionBlock)completionBlock
-{
-  ASSERT_ON_EDITING_QUEUE;
-  if (!indexPaths.count || _dataSource == nil) {
-    return;
-  }
-
-  NSMutableArray *editingNodes = _editingNodes[kind];
-  ASInsertElementsIntoMultidimensionalArrayAtIndexPaths(editingNodes, indexPaths, nodes);
-  
-  // Deep copy is critical here, or future edits to the sub-arrays will pollute state between _editing and _complete on different threads.
-  NSMutableArray *completedNodes = ASTwoDimensionalArrayDeepMutableCopy(editingNodes);
-  
-  [_mainSerialQueue performBlockOnMainThread:^{
-    _completedNodes[kind] = completedNodes;
-    if (completionBlock) {
-      completionBlock(nodes, indexPaths);
-    }
-  }];
-}
-
-- (void)deleteNodesOfKind:(NSString *)kind atIndexPaths:(NSArray *)indexPaths completion:(ASDataControllerCompletionBlock)completionBlock
-{
-  ASSERT_ON_EDITING_QUEUE;
-  if (!indexPaths.count || _dataSource == nil) {
-    return;
-  }
-
-  LOG(@"_deleteNodesAtIndexPaths:%@ ofKind:%@, full index paths in _editingNodes = %@", indexPaths, kind, ASIndexPathsForTwoDimensionalArray(_editingNodes[kind]));
-  ASDeleteElementsInMultidimensionalArrayAtIndexPaths(_editingNodes[kind], indexPaths);
-
-  [_mainSerialQueue performBlockOnMainThread:^{
-    NSMutableArray *allNodes = _completedNodes[kind];
-    NSArray *nodes = ASFindElementsInMultidimensionalArrayAtIndexPaths(allNodes, indexPaths);
-    ASDeleteElementsInMultidimensionalArrayAtIndexPaths(allNodes, indexPaths);
-    if (completionBlock) {
-      completionBlock(nodes, indexPaths);
-    }
-  }];
-}
-
-- (void)insertSections:(NSMutableArray *)sections ofKind:(NSString *)kind atIndexSet:(NSIndexSet *)indexSet completion:(void (^)(NSArray *sections, NSIndexSet *indexSet))completionBlock
-{
-  ASSERT_ON_EDITING_QUEUE;
-  if (!indexSet.count|| _dataSource == nil) {
-    return;
-  }
-
-  if (_editingNodes[kind] == nil) {
-    _editingNodes[kind] = [NSMutableArray array];
-  }
-  
-  [_editingNodes[kind] insertObjects:sections atIndexes:indexSet];
-  
-  // Deep copy is critical here, or future edits to the sub-arrays will pollute state between _editing and _complete on different threads.
-  NSArray *sectionsForCompleted = ASTwoDimensionalArrayDeepMutableCopy(sections);
-  
-  [_mainSerialQueue performBlockOnMainThread:^{
-    [_completedNodes[kind] insertObjects:sectionsForCompleted atIndexes:indexSet];
-    if (completionBlock) {
-      completionBlock(sections, indexSet);
-    }
-  }];
-}
-
-- (void)deleteSections:(NSIndexSet *)indexSet completion:(void (^)())completionBlock
-{
-  ASSERT_ON_EDITING_QUEUE;
-  if (!indexSet.count || _dataSource == nil) {
-    return;
-  }
-
-  [_editingNodes enumerateKeysAndObjectsUsingBlock:^(NSString *  _Nonnull kind, NSMutableArray *sections, BOOL * _Nonnull stop) {
-    [sections removeObjectsAtIndexes:indexSet];
-  }];
-  [_mainSerialQueue performBlockOnMainThread:^{
-    [_completedNodes enumerateKeysAndObjectsUsingBlock:^(NSString *  _Nonnull kind, NSMutableArray *sections, BOOL * _Nonnull stop) {
-      [sections removeObjectsAtIndexes:indexSet];
-    }];
-    if (completionBlock) {
-      completionBlock();
-    }
-  }];
-}
-
-#pragma mark - Internal Data Querying + Editing
-
-/**
- * Inserts the specified nodes into the given index paths and notifies the delegate of newly inserted nodes.
- *
- * @discussion Nodes are first inserted into the editing store, then the completed store is replaced by a deep copy
- * of the editing nodes. The delegate is invoked on the main thread.
- */
-- (void)_insertNodes:(NSArray *)nodes atIndexPaths:(NSArray *)indexPaths withAnimationOptions:(ASDataControllerAnimationOptions)animationOptions
-{
-  ASSERT_ON_EDITING_QUEUE;
-  
-  [self insertNodes:nodes ofKind:ASDataControllerRowNodeKind atIndexPaths:indexPaths completion:^(NSArray *nodes, NSArray *indexPaths) {
-    ASDisplayNodeAssertMainThread();
-    
-    if (_delegateDidInsertNodes)
-      [_delegate dataController:self didInsertNodes:nodes atIndexPaths:indexPaths withAnimationOptions:animationOptions];
-  }];
-}
-
-/**
- * Removes the specified nodes at the given index paths and notifies the delegate of the nodes removed.
- *
- * @discussion Nodes are first removed from the editing store then removed from the completed store on the main thread.
- * Once the backing stores are consistent, the delegate is invoked on the main thread.
- */
-- (void)_deleteNodesAtIndexPaths:(NSArray *)indexPaths withAnimationOptions:(ASDataControllerAnimationOptions)animationOptions
-{
-  ASSERT_ON_EDITING_QUEUE;
-  
-  [self deleteNodesOfKind:ASDataControllerRowNodeKind atIndexPaths:indexPaths completion:^(NSArray *nodes, NSArray *indexPaths) {
-    ASDisplayNodeAssertMainThread();
-    
-    if (_delegateDidDeleteNodes)
-      [_delegate dataController:self didDeleteNodes:nodes atIndexPaths:indexPaths withAnimationOptions:animationOptions];
-  }];
-}
-
-/**
- * Inserts sections, represented as arrays, into the backing store at the given indices and notifies the delegate.
- *
- * @discussion The section arrays are inserted into the editing store, then a deep copy of the sections are inserted
- * in the completed store on the main thread. The delegate is invoked on the main thread.
- */
-- (void)_insertSections:(NSMutableArray *)sections atIndexSet:(NSIndexSet *)indexSet withAnimationOptions:(ASDataControllerAnimationOptions)animationOptions
-{
-  ASSERT_ON_EDITING_QUEUE;
-  
-  [self insertSections:sections ofKind:ASDataControllerRowNodeKind atIndexSet:indexSet completion:^(NSArray *sections, NSIndexSet *indexSet) {
-    ASDisplayNodeAssertMainThread();
-    
-    if (_delegateDidInsertSections)
-      [_delegate dataController:self didInsertSections:sections atIndexSet:indexSet withAnimationOptions:animationOptions];
-  }];
-}
-
-/**
- * Removes sections at the given indices from the backing store and notifies the delegate.
- *
- * @discussion Section array are first removed from the editing store, then the associated section in the completed
- * store is removed on the main thread. The delegate is invoked on the main thread.
- */
-- (void)_deleteSectionsAtIndexSet:(NSIndexSet *)indexSet withAnimationOptions:(ASDataControllerAnimationOptions)animationOptions
-{
-  ASSERT_ON_EDITING_QUEUE;
-  
-  [self deleteSections:indexSet completion:^() {
-    ASDisplayNodeAssertMainThread();
-    
-    if (_delegateDidDeleteSections)
-      [_delegate dataController:self didDeleteSectionsAtIndexSet:indexSet withAnimationOptions:animationOptions];
-  }];
-}
-
-#pragma mark - Initial Load & Full Reload (External API)
-
-- (void)reloadDataWithAnimationOptions:(ASDataControllerAnimationOptions)animationOptions completion:(void (^)())completion
-{
-  [self _reloadDataWithAnimationOptions:animationOptions synchronously:NO completion:completion];
-}
-
-- (void)reloadDataImmediatelyWithAnimationOptions:(ASDataControllerAnimationOptions)animationOptions
-{
-  [self _reloadDataWithAnimationOptions:animationOptions synchronously:YES completion:nil];
-}
-
-- (void)_reloadDataWithAnimationOptions:(ASDataControllerAnimationOptions)animationOptions synchronously:(BOOL)synchronously completion:(void (^)())completion
-{
-  ASDisplayNodeAssertMainThread();
-
-  _initialReloadDataHasBeenCalled = YES;
-  dispatch_group_wait(_editingTransactionGroup, DISPATCH_TIME_FOREVER);
-
-  [self invalidateDataSourceItemCounts];
-  NSUInteger sectionCount = [self itemCountsFromDataSource].size();
-  NSIndexSet *sectionIndexes = [NSIndexSet indexSetWithIndexesInRange:NSMakeRange(0, sectionCount)];
-  NSArray<ASIndexedNodeContext *> *newContexts = [self _populateNodeContextsFromDataSourceForSections:sectionIndexes];
-
-  // Update _nodeContexts
-  NSMutableArray *allContexts = _nodeContexts[ASDataControllerRowNodeKind];
-  [allContexts removeAllObjects];
-  NSArray *nodeIndexPaths = [ASIndexedNodeContext indexPathsFromContexts:newContexts];
-  for (int i = 0; i < sectionCount; i++) {
-    [allContexts addObject:[[NSMutableArray alloc] init]];
-  }
-  ASInsertElementsIntoMultidimensionalArrayAtIndexPaths(allContexts, nodeIndexPaths, newContexts);
-
-  // Allow subclasses to perform setup before going into the edit transaction
-  [self prepareForReloadDataWithSectionCount:sectionCount];
-  
-  dispatch_group_async(_editingTransactionGroup, _editingTransactionQueue, ^{
-    LOG(@"Edit Transaction - reloadData");
-    
-    /**
-     * Leave the current data in the collection view until the first batch of nodes are laid out.
-     * Once the first batch is laid out, in one operation, replace all the sections and insert
-     * the first batch of items.
-     *
-     * We previously would replace all the sections immediately, and then start adding items as they
-     * were laid out. This resulted in more traffic to the UICollectionView and it also caused all the
-     * section headers to bunch up until the items come and fill out the sections.
-     */
-    __block BOOL isFirstBatch = YES;
-    [self batchLayoutNodesFromContexts:newContexts batchCompletion:^(NSArray<ASCellNode *> *nodes, NSArray<NSIndexPath *> *indexPaths) {
-      if (isFirstBatch) {
-        // -beginUpdates
-        [_mainSerialQueue performBlockOnMainThread:^{
-          [_delegate dataControllerBeginUpdates:self];
-          [_delegate dataControllerWillDeleteAllData:self];
-        }];
-        
-        // deleteSections:
-        // Remove everything that existed before the reload, now that we're ready to insert replacements
-        NSUInteger oldSectionCount = [_editingNodes[ASDataControllerRowNodeKind] count];
-        if (oldSectionCount) {
-          NSIndexSet *indexSet = [[NSIndexSet alloc] initWithIndexesInRange:NSMakeRange(0, oldSectionCount)];
-          [self _deleteSectionsAtIndexSet:indexSet withAnimationOptions:animationOptions];
-        }
-        
-        [self willReloadDataWithSectionCount:sectionCount];
-        
-        // insertSections:
-        NSMutableArray *sections = [NSMutableArray arrayWithCapacity:sectionCount];
-        for (int i = 0; i < sectionCount; i++) {
-          [sections addObject:[[NSMutableArray alloc] init]];
-        }
-        [self _insertSections:sections atIndexSet:sectionIndexes withAnimationOptions:animationOptions];
-      }
-      
-      // insertItemsAtIndexPaths:
-      [self _insertNodes:nodes atIndexPaths:indexPaths withAnimationOptions:animationOptions];
-      
-      if (isFirstBatch) {
-        // -endUpdates
-        [_mainSerialQueue performBlockOnMainThread:^{
-          [_delegate dataController:self endUpdatesAnimated:NO completion:nil];
-        }];
-        isFirstBatch = NO;
-      }
-    }];
-    
-    if (completion) {
-      [_mainSerialQueue performBlockOnMainThread:completion];
-    }
-  });
-  if (synchronously) {
-    [self waitUntilAllUpdatesAreCommitted];
-  }
-}
-
-- (void)waitUntilAllUpdatesAreCommitted
-{
-  ASDisplayNodeAssertMainThread();
-  
-  dispatch_group_wait(_editingTransactionGroup, DISPATCH_TIME_FOREVER);
-  
-  // Schedule block in main serial queue to wait until all operations are finished that are
-  // where scheduled while waiting for the _editingTransactionQueue to finish
-  [_mainSerialQueue performBlockOnMainThread:^{ }];
-}
-
-#pragma mark - Data Source Access (Calling _dataSource)
-
-/**
- * Fetches row contexts for the provided sections from the data source.
- */
-- (NSArray<ASIndexedNodeContext *> *)_populateNodeContextsFromDataSourceForSections:(NSIndexSet *)sections
-{
-  ASDisplayNodeAssertMainThread();
-  
-  __weak id<ASTraitEnvironment> environment = [self.environmentDelegate dataControllerEnvironment];
-  
-  std::vector<NSInteger> counts = [self itemCountsFromDataSource];
-  NSMutableArray<ASIndexedNodeContext *> *contexts = [NSMutableArray array];
-  [sections enumerateRangesUsingBlock:^(NSRange range, BOOL * _Nonnull stop) {
-    for (NSUInteger sectionIndex = range.location; sectionIndex < NSMaxRange(range); sectionIndex++) {
-      NSUInteger itemCount = counts[sectionIndex];
-      for (NSUInteger i = 0; i < itemCount; i++) {
-        NSIndexPath *indexPath = [NSIndexPath indexPathForItem:i inSection:sectionIndex];
-        ASCellNodeBlock nodeBlock = [_dataSource dataController:self nodeBlockAtIndexPath:indexPath];
-        
-        ASSizeRange constrainedSize = [self constrainedSizeForNodeOfKind:ASDataControllerRowNodeKind atIndexPath:indexPath];
-        [contexts addObject:[[ASIndexedNodeContext alloc] initWithNodeBlock:nodeBlock
-                                                                  indexPath:indexPath
-                                                   supplementaryElementKind:nil
-                                                            constrainedSize:constrainedSize
-                                                                environment:environment]];
-      }
-    }
-  }];
-  return contexts;
-}
-
-- (void)invalidateDataSourceItemCounts
-{
-  ASDisplayNodeAssertMainThread();
-  _itemCountsFromDataSourceAreValid = NO;
-}
-
-- (std::vector<NSInteger>)itemCountsFromDataSource
-{
-  ASDisplayNodeAssertMainThread();
-  if (NO == _itemCountsFromDataSourceAreValid) {
-    id<ASDataControllerSource> source = self.dataSource;
-    NSInteger sectionCount = [source numberOfSectionsInDataController:self];
-    std::vector<NSInteger> newCounts;
-    newCounts.reserve(sectionCount);
-    for (NSInteger i = 0; i < sectionCount; i++) {
-      newCounts.push_back([source dataController:self rowsInSection:i]);
-    }
-    _itemCountsFromDataSource = newCounts;
-    _itemCountsFromDataSourceAreValid = YES;
-  }
-  return _itemCountsFromDataSource;
-}
-
-#pragma mark - Batching (External API)
-
-- (void)beginUpdates
-{
-  ASDisplayNodeAssertMainThread();
-  // TODO: make this -waitUntilAllUpdatesAreCommitted?
-  dispatch_group_wait(_editingTransactionGroup, DISPATCH_TIME_FOREVER);
-
-  dispatch_group_async(_editingTransactionGroup, _editingTransactionQueue, ^{
-    [_mainSerialQueue performBlockOnMainThread:^{
-      // Deep copy _completedNodes to _externalCompletedNodes.
-      // Any external queries from now on will be done on _externalCompletedNodes, to guarantee data consistency with the delegate.
-      _externalCompletedNodes = ASTwoDimensionalArrayDeepMutableCopy(_completedNodes[ASDataControllerRowNodeKind]);
-
-      LOG(@"beginUpdates - begin updates call to delegate");
-      [_delegate dataControllerBeginUpdates:self];
-    }];
-  });
-}
-
-- (void)endUpdatesAnimated:(BOOL)animated completion:(void (^)(BOOL))completion
-{
-  LOG(@"endUpdatesWithCompletion - beginning");
-  ASDisplayNodeAssertMainThread();
-
-  // Running these commands may result in blocking on an _editingTransactionQueue operation that started even before -beginUpdates.
-  // Each subsequent command in the queue will also wait on the full asynchronous completion of the prior command's edit transaction.
-  dispatch_group_async(_editingTransactionGroup, _editingTransactionQueue, ^{
-    [_mainSerialQueue performBlockOnMainThread:^{
-      // Now that the transaction is done, _completedNodes can be accessed externally again.
-      _externalCompletedNodes = nil;
-      
-      LOG(@"endUpdatesWithCompletion - calling delegate end");
-      [_delegate dataController:self endUpdatesAnimated:animated completion:completion];
-    }];
-  });
-}
-
-- (void)updateWithChangeSet:(_ASHierarchyChangeSet *)changeSet animated:(BOOL)animated
-{
-  ASDisplayNodeAssertMainThread();
-  
-  void (^batchCompletion)(BOOL) = changeSet.completionHandler;
-  
-  /**
-   * If the initial reloadData has not been called, just bail because we don't have
-   * our old data source counts.
-   * See ASUICollectionViewTests.testThatIssuingAnUpdateBeforeInitialReloadIsUnacceptable
-   * For the issue that UICollectionView has that we're choosing to workaround.
-   */
-  if (!self.initialReloadDataHasBeenCalled) {
-    if (batchCompletion != nil) {
-      batchCompletion(YES);
-    }
-    return;
-  }
-  
-  [self invalidateDataSourceItemCounts];
-  
-  // Attempt to mark the update completed. This is when update validation will occur inside the changeset.
-  // If an invalid update exception is thrown, we catch it and inject our "validationErrorSource" object,
-  // which is the table/collection node's data source, into the exception reason to help debugging.
-  @try {
-    [changeSet markCompletedWithNewItemCounts:[self itemCountsFromDataSource]];
-  } @catch (NSException *e) {
-    id responsibleDataSource = self.validationErrorSource;
-    if (e.name == ASCollectionInvalidUpdateException && responsibleDataSource != nil) {
-      [NSException raise:ASCollectionInvalidUpdateException format:@"%@: %@", [responsibleDataSource class], e.reason];
-    } else {
-      @throw e;
-    }
-  }
-  
-  ASDataControllerLogEvent(self, @"triggeredUpdate: %@", changeSet);
-  
-  [self beginUpdates];
-  
-  for (_ASHierarchyItemChange *change in [changeSet itemChangesOfType:_ASHierarchyChangeTypeDelete]) {
-    [self deleteRowsAtIndexPaths:change.indexPaths withAnimationOptions:change.animationOptions];
-  }
-  
-  for (_ASHierarchySectionChange *change in [changeSet sectionChangesOfType:_ASHierarchyChangeTypeDelete]) {
-    [self deleteSections:change.indexSet withAnimationOptions:change.animationOptions];
-  }
-  
-  for (_ASHierarchySectionChange *change in [changeSet sectionChangesOfType:_ASHierarchyChangeTypeInsert]) {
-    [self insertSections:change.indexSet withAnimationOptions:change.animationOptions];
-  }
-  
-  for (_ASHierarchyItemChange *change in [changeSet itemChangesOfType:_ASHierarchyChangeTypeInsert]) {
-    [self insertRowsAtIndexPaths:change.indexPaths withAnimationOptions:change.animationOptions];
-  }
-  
-#if ASEVENTLOG_ENABLE
-  NSString *changeSetDescription = ASObjectDescriptionMakeTiny(changeSet);
-  batchCompletion = ^(BOOL finished) {
-    if (batchCompletion != nil) {
-      batchCompletion(finished);
-    }
-    ASDataControllerLogEvent(self, @"finishedUpdate: %@", changeSetDescription);
-  };
-#endif
-  
-  [self endUpdatesAnimated:animated completion:batchCompletion];
-}
-
-#pragma mark - Section Editing (External API)
-
-- (void)insertSections:(NSIndexSet *)sections withAnimationOptions:(ASDataControllerAnimationOptions)animationOptions
-{
-  ASDisplayNodeAssertMainThread();
-  LOG(@"Edit Command - insertSections: %@", sections);
-  if (!_initialReloadDataHasBeenCalled) {
-    return;
-  }
-
-  dispatch_group_wait(_editingTransactionGroup, DISPATCH_TIME_FOREVER);
-  
-  NSArray<ASIndexedNodeContext *> *contexts = [self _populateNodeContextsFromDataSourceForSections:sections];
-
-  // Update _nodeContexts
-  {
-    NSMutableArray *sectionArray = [NSMutableArray arrayWithCapacity:sections.count];
-    for (NSUInteger i = 0; i < sections.count; i++) {
-      [sectionArray addObject:[NSMutableArray array]];
-    }
-    NSMutableArray *allRowContexts = _nodeContexts[ASDataControllerRowNodeKind];
-    [allRowContexts insertObjects:sectionArray atIndexes:sections];
-    ASInsertElementsIntoMultidimensionalArrayAtIndexPaths(allRowContexts, [ASIndexedNodeContext indexPathsFromContexts:contexts], contexts);
-  }
-
-  [self prepareForInsertSections:sections];
-  
-  dispatch_group_async(_editingTransactionGroup, _editingTransactionQueue, ^{
-    [self willInsertSections:sections];
-
-    LOG(@"Edit Transaction - insertSections: %@", sections);
-    NSMutableArray *sectionArray = [NSMutableArray arrayWithCapacity:sections.count];
-    for (NSUInteger i = 0; i < sections.count; i++) {
-      [sectionArray addObject:[NSMutableArray array]];
-    }
-
-    [self _insertSections:sectionArray atIndexSet:sections withAnimationOptions:animationOptions];
-    
-    [self _batchLayoutAndInsertNodesFromContexts:contexts withAnimationOptions:animationOptions];
-  });
-}
-
-- (void)deleteSections:(NSIndexSet *)sections withAnimationOptions:(ASDataControllerAnimationOptions)animationOptions
-{
-  ASDisplayNodeAssertMainThread();
-  LOG(@"Edit Command - deleteSections: %@", sections);
-  if (!_initialReloadDataHasBeenCalled) {
-    return;
-  }
-
-  [_nodeContexts[ASDataControllerRowNodeKind] removeObjectsAtIndexes:sections];
-
-  dispatch_group_wait(_editingTransactionGroup, DISPATCH_TIME_FOREVER);
-
-  [self prepareForDeleteSections:sections];
-  dispatch_group_async(_editingTransactionGroup, _editingTransactionQueue, ^{
-    [self willDeleteSections:sections];
-
-    // remove elements
-    LOG(@"Edit Transaction - deleteSections: %@", sections);
-    [self _deleteSectionsAtIndexSet:sections withAnimationOptions:animationOptions];
-  });
-}
-
-#pragma mark - Backing store manipulation optional hooks (Subclass API)
-
-- (void)prepareForReloadDataWithSectionCount:(NSInteger)newSectionCount
-{
-  // Optional template hook for subclasses (See ASDataController+Subclasses.h)
-}
-
-- (void)willReloadDataWithSectionCount:(NSInteger)newSectionCount
-{
-  // Optional template hook for subclasses (See ASDataController+Subclasses.h)
-}
-
-- (void)prepareForInsertSections:(NSIndexSet *)sections
-{
-  // Optional template hook for subclasses (See ASDataController+Subclasses.h)
-}
-
-- (void)prepareForDeleteSections:(NSIndexSet *)sections
-{
-  // Optional template hook for subclasses (See ASDataController+Subclasses.h)
-}
-
-- (void)willInsertSections:(NSIndexSet *)sections
-{
-  // Optional template hook for subclasses (See ASDataController+Subclasses.h)
-}
-
-- (void)willDeleteSections:(NSIndexSet *)sections
-{
-  // Optional template hook for subclasses (See ASDataController+Subclasses.h)
-}
-
-- (void)willMoveSection:(NSInteger)section toSection:(NSInteger)newSection
-{
-  // Optional template hook for subclasses (See ASDataController+Subclasses.h)
-}
-
-- (void)prepareForInsertRowsAtIndexPaths:(NSArray<NSIndexPath *> *)indexPaths
-{
-  // Optional template hook for subclasses (See ASDataController+Subclasses.h)
-}
-
-- (void)willInsertRowsAtIndexPaths:(NSArray<NSIndexPath *> *)indexPaths
-{
-  // Optional template hook for subclasses (See ASDataController+Subclasses.h)
-}
-
-- (void)prepareForDeleteRowsAtIndexPaths:(NSArray<NSIndexPath *> *)indexPaths
-{
-  // Optional template hook for subclasses (See ASDataController+Subclasses.h)
-}
-
-- (void)willDeleteRowsAtIndexPaths:(NSArray<NSIndexPath *> *)indexPaths
-{
-  // Optional template hook for subclasses (See ASDataController+Subclasses.h)
-}
-
-#pragma mark - Row Editing (External API)
-
-- (void)insertRowsAtIndexPaths:(NSArray *)indexPaths withAnimationOptions:(ASDataControllerAnimationOptions)animationOptions
-{
-  ASDisplayNodeAssertMainThread();
-  if (!_initialReloadDataHasBeenCalled) {
-    return;
-  }
-
-  LOG(@"Edit Command - insertRows: %@", indexPaths);
-  dispatch_group_wait(_editingTransactionGroup, DISPATCH_TIME_FOREVER);
-
-  // Sort indexPath to avoid messing up the index when inserting in several batches
-  NSArray *sortedIndexPaths = [indexPaths sortedArrayUsingSelector:@selector(compare:)];
-  NSMutableArray<ASIndexedNodeContext *> *contexts = [[NSMutableArray alloc] initWithCapacity:indexPaths.count];
-
-  __weak id<ASTraitEnvironment> environment = [self.environmentDelegate dataControllerEnvironment];
-  
-  for (NSIndexPath *indexPath in sortedIndexPaths) {
-    ASCellNodeBlock nodeBlock = [_dataSource dataController:self nodeBlockAtIndexPath:indexPath];
-    ASSizeRange constrainedSize = [self constrainedSizeForNodeOfKind:ASDataControllerRowNodeKind atIndexPath:indexPath];
-    [contexts addObject:[[ASIndexedNodeContext alloc] initWithNodeBlock:nodeBlock
-                                                              indexPath:indexPath
-                                               supplementaryElementKind:nil
-                                                        constrainedSize:constrainedSize
-                                                            environment:environment]];
-  }
-
-  ASInsertElementsIntoMultidimensionalArrayAtIndexPaths(_nodeContexts[ASDataControllerRowNodeKind], sortedIndexPaths, contexts);
-  [self prepareForInsertRowsAtIndexPaths:indexPaths];
-
-  dispatch_group_async(_editingTransactionGroup, _editingTransactionQueue, ^{
-    [self willInsertRowsAtIndexPaths:indexPaths];
-
-    LOG(@"Edit Transaction - insertRows: %@", indexPaths);
-    [self _batchLayoutAndInsertNodesFromContexts:contexts withAnimationOptions:animationOptions];
-  });
-}
-
-- (void)deleteRowsAtIndexPaths:(NSArray *)indexPaths withAnimationOptions:(ASDataControllerAnimationOptions)animationOptions
-{
-  ASDisplayNodeAssertMainThread();
-
-  if (!_initialReloadDataHasBeenCalled) {
-    return;
-  }
-
-  LOG(@"Edit Command - deleteRows: %@", indexPaths);
-
-  dispatch_group_wait(_editingTransactionGroup, DISPATCH_TIME_FOREVER);
-  
-  // Sort indexPath in order to avoid messing up the index when deleting in several batches.
-  // FIXME: Shouldn't deletes be sorted in descending order?
-  NSArray *sortedIndexPaths = [indexPaths sortedArrayUsingSelector:@selector(compare:)];
-
-  ASDeleteElementsInMultidimensionalArrayAtIndexPaths(_nodeContexts[ASDataControllerRowNodeKind], sortedIndexPaths);
-  [self prepareForDeleteRowsAtIndexPaths:sortedIndexPaths];
-
-  dispatch_group_async(_editingTransactionGroup, _editingTransactionQueue, ^{
-    [self willDeleteRowsAtIndexPaths:sortedIndexPaths];
-
-    LOG(@"Edit Transaction - deleteRows: %@", indexPaths);
-    [self _deleteNodesAtIndexPaths:sortedIndexPaths withAnimationOptions:animationOptions];
-  });
-}
-
-- (void)relayoutAllNodes
-{
-  ASDisplayNodeAssertMainThread();
-  if (!_initialReloadDataHasBeenCalled) {
-    return;
-  }
-
-  LOG(@"Edit Command - relayoutRows");
-  dispatch_group_wait(_editingTransactionGroup, DISPATCH_TIME_FOREVER);
-
-  // Can't relayout right away because _completedNodes may not be up-to-date,
-  // i.e there might be some nodes that were measured using the old constrained size but haven't been added to _completedNodes
-  // (see _layoutNodes:atIndexPaths:withAnimationOptions:).
-  dispatch_group_async(_editingTransactionGroup, _editingTransactionQueue, ^{
-    [_mainSerialQueue performBlockOnMainThread:^{
-      for (NSString *kind in _completedNodes) {
-        [self _relayoutNodesOfKind:kind];
-      }
-    }];
-  });
-}
-
-- (void)_relayoutNodesOfKind:(NSString *)kind
-{
-  ASDisplayNodeAssertMainThread();
-  NSArray *nodes = [self completedNodesOfKind:kind];
-  if (!nodes.count) {
-    return;
-  }
-  
-  NSUInteger sectionIndex = 0;
-  for (NSMutableArray *section in nodes) {
-    NSUInteger rowIndex = 0;
-    for (ASCellNode *node in section) {
-      RETURN_IF_NO_DATASOURCE();
-      NSIndexPath *indexPath = [NSIndexPath indexPathForRow:rowIndex inSection:sectionIndex];
-      ASSizeRange constrainedSize = [self constrainedSizeForNodeOfKind:kind atIndexPath:indexPath];
-      if (ASSizeRangeHasSignificantArea(constrainedSize)) {
-        [self _layoutNode:node withConstrainedSize:constrainedSize];
-      }
-      rowIndex += 1;
-    }
-    sectionIndex += 1;
-  }
-}
-
-#pragma mark - Data Querying (Subclass API)
-
-- (NSMutableArray *)editingNodesOfKind:(NSString *)kind
-{
-  return _editingNodes[kind] ? : [NSMutableArray array];
-}
-
-- (NSMutableArray *)completedNodesOfKind:(NSString *)kind
-{
-  return _completedNodes[kind];
-}
-
-#pragma mark - Data Querying (External API)
-
-- (NSUInteger)numberOfSections
-{
-  ASDisplayNodeAssertMainThread();
-  return [_nodeContexts[ASDataControllerRowNodeKind] count];
-}
-
-- (NSUInteger)numberOfRowsInSection:(NSUInteger)section
-{
-  ASDisplayNodeAssertMainThread();
-  NSArray *contextSections = _nodeContexts[ASDataControllerRowNodeKind];
-  return (section < contextSections.count) ? [contextSections[section] count] : 0;
-}
-
-- (NSUInteger)completedNumberOfSections
-{
-  ASDisplayNodeAssertMainThread();
-  return [[self completedNodes] count];
-}
-
-- (NSUInteger)completedNumberOfRowsInSection:(NSUInteger)section
-{
-  ASDisplayNodeAssertMainThread();
-  NSArray *completedNodes = [self completedNodes];
-  return (section < completedNodes.count) ? [completedNodes[section] count] : 0;
-}
-
-- (ASCellNode *)nodeAtIndexPath:(NSIndexPath *)indexPath
-{
-  ASDisplayNodeAssertMainThread();
-  if (indexPath == nil) {
-    return nil;
-  }
-  
-  NSArray *contexts = _nodeContexts[ASDataControllerRowNodeKind];
-  NSInteger section = indexPath.section;
-  NSInteger row = indexPath.row;
-  ASIndexedNodeContext *context = nil;
-
-  if (section >= 0 && row >= 0 && section < contexts.count) {
-    NSArray *completedNodesSection = contexts[section];
-    if (row < completedNodesSection.count) {
-      context = completedNodesSection[row];
-    }
-  }
-  return context.node;
-}
-
-- (ASCellNode *)nodeAtCompletedIndexPath:(NSIndexPath *)indexPath
-{
-  ASDisplayNodeAssertMainThread();
-  if (indexPath == nil) {
-    return nil;
-  }
-
-  NSArray *completedNodes = [self completedNodes];
-  NSInteger section = indexPath.section;
-  NSInteger row = indexPath.row;
-  ASCellNode *node = nil;
-
-  if (section >= 0 && row >= 0 && section < completedNodes.count) {
-    NSArray *completedNodesSection = completedNodes[section];
-    if (row < completedNodesSection.count) {
-      node = completedNodesSection[row];
-    }
-  }
-
-  return node;
-}
-
-- (NSIndexPath *)indexPathForNode:(ASCellNode *)cellNode;
-{
-  ASDisplayNodeAssertMainThread();
-  if (cellNode == nil) {
-    return nil;
-  }
-
-  NSString *kind = cellNode.supplementaryElementKind ?: ASDataControllerRowNodeKind;
-  NSArray *contexts = _nodeContexts[kind];
-
-  // Check if the cached index path is still correct.
-  NSIndexPath *indexPath = cellNode.cachedIndexPath;
-  if (indexPath != nil) {
-    ASIndexedNodeContext *context = ASGetElementInTwoDimensionalArray(contexts, indexPath);
-    if (context.nodeIfAllocated == cellNode) {
-      return indexPath;
-    } else {
-      indexPath = nil;
-    }
-  }
-
-  // Loop through each section to look for the node context
-  NSInteger section = 0;
-  for (NSArray<ASIndexedNodeContext *> *nodeContexts in contexts) {
-    NSUInteger item = [nodeContexts indexOfObjectPassingTest:^BOOL(ASIndexedNodeContext * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) {
-      return obj.nodeIfAllocated == cellNode;
-    }];
-    if (item != NSNotFound) {
-      indexPath = [NSIndexPath indexPathForItem:item inSection:section];
-      break;
-    }
-    section += 1;
-  }
-  cellNode.cachedIndexPath = indexPath;
-  return indexPath;
-}
-
-- (NSIndexPath *)completedIndexPathForNode:(ASCellNode *)cellNode
-{
-  ASDisplayNodeAssertMainThread();
-  if (cellNode == nil) {
-    return nil;
-  }
-
-  NSInteger section = 0;
-  // Loop through each section to look for the cellNode
-  NSString *kind = cellNode.supplementaryElementKind ?: ASDataControllerRowNodeKind;
-  for (NSArray *sectionNodes in [self completedNodesOfKind:kind]) {
-    NSUInteger item = [sectionNodes indexOfObjectIdenticalTo:cellNode];
-    if (item != NSNotFound) {
-      return [NSIndexPath indexPathForItem:item inSection:section];
-    }
-    section += 1;
-  }
-  
-  return nil;
-}
-
-/// Returns nodes that can be queried externally. _externalCompletedNodes is used if available, _completedNodes otherwise.
-- (NSArray *)completedNodes
-{
-  ASDisplayNodeAssertMainThread();
-  return _externalCompletedNodes ? : _completedNodes[ASDataControllerRowNodeKind];
-}
-
-- (void)moveCompletedNodeAtIndexPath:(NSIndexPath *)indexPath toIndexPath:(NSIndexPath *)newIndexPath
-{
-  ASDisplayNodeAssertMainThread();
-  ASMoveElementInTwoDimensionalArray(_externalCompletedNodes, indexPath, newIndexPath);
-  ASMoveElementInTwoDimensionalArray(_completedNodes[ASDataControllerRowNodeKind], indexPath, newIndexPath);
-}
-
-@end
-
-#if AS_MEASURE_AVOIDED_DATACONTROLLER_WORK
-
-static volatile int64_t _totalExpectedItems = 0;
-static volatile int64_t _totalMeasuredNodes = 0;
-
-@implementation ASDataController (WorkMeasuring)
-
-+ (void)_didLayoutNode
-{
-    int64_t measured = OSAtomicIncrement64(&_totalMeasuredNodes);
-    int64_t expected = _totalExpectedItems;
-    if (measured % 20 == 0 || measured == expected) {
-        NSLog(@"Data controller avoided work (underestimated): %lld / %lld", measured, expected);
-    }
-}
-
-+ (void)_expectToInsertNodes:(NSUInteger)count
-{
-    OSAtomicAdd64((int64_t)count, &_totalExpectedItems);
-}
-
-@end
-#endif
-
-#endif
diff --git a/submodules/AsyncDisplayKit/AsyncDisplayKit/Details/ASFlowLayoutController.h b/submodules/AsyncDisplayKit/AsyncDisplayKit/Details/ASFlowLayoutController.h
deleted file mode 100644
index 7eeb4d3533..0000000000
--- a/submodules/AsyncDisplayKit/AsyncDisplayKit/Details/ASFlowLayoutController.h
+++ /dev/null
@@ -1,44 +0,0 @@
-//
-//  ASFlowLayoutController.h
-//  AsyncDisplayKit
-//
-//  Copyright (c) 2014-present, Facebook, Inc.  All rights reserved.
-//  This source code is licensed under the BSD-style license found in the
-//  LICENSE file in the root directory of this source tree. An additional grant
-//  of patent rights can be found in the PATENTS file in the same directory.
-//
-#ifndef MINIMAL_ASDK
-#import <Foundation/Foundation.h>
-#import <AsyncDisplayKit/ASAbstractLayoutController.h>
-
-NS_ASSUME_NONNULL_BEGIN
-
-@class ASCellNode;
-
-typedef NS_ENUM(NSUInteger, ASFlowLayoutDirection) {
-  ASFlowLayoutDirectionVertical,
-  ASFlowLayoutDirectionHorizontal,
-};
-
-@protocol ASFlowLayoutControllerDataSource
-
-- (NSArray<NSArray <ASCellNode *> *> *)completedNodes;  // This provides access to ASDataController's _completedNodes multidimensional array.
-
-@end
-
-/**
- *  An optimized flow layout controller that supports only vertical or horizontal scrolling, not simultaneously two-dimensional scrolling.
- *  It is used for all ASTableViews, and may be used with ASCollectionView.
- */
-@interface ASFlowLayoutController : ASAbstractLayoutController
-
-@property (nonatomic, readonly, assign) ASFlowLayoutDirection layoutDirection;
-@property (nonatomic, readwrite, weak) id <ASFlowLayoutControllerDataSource> dataSource;
-
-- (instancetype)initWithScrollOption:(ASFlowLayoutDirection)layoutDirection;
-
-@end
-
-NS_ASSUME_NONNULL_END
-
-#endif
diff --git a/submodules/AsyncDisplayKit/AsyncDisplayKit/Details/ASFlowLayoutController.mm b/submodules/AsyncDisplayKit/AsyncDisplayKit/Details/ASFlowLayoutController.mm
deleted file mode 100644
index 4a23ec25a6..0000000000
--- a/submodules/AsyncDisplayKit/AsyncDisplayKit/Details/ASFlowLayoutController.mm
+++ /dev/null
@@ -1,203 +0,0 @@
-//
-//  ASFlowLayoutController.mm
-//  AsyncDisplayKit
-//
-//  Copyright (c) 2014-present, Facebook, Inc.  All rights reserved.
-//  This source code is licensed under the BSD-style license found in the
-//  LICENSE file in the root directory of this source tree. An additional grant
-//  of patent rights can be found in the PATENTS file in the same directory.
-//
-#ifndef MINIMAL_ASDK
-#import <AsyncDisplayKit/ASFlowLayoutController.h>
-#import <AsyncDisplayKit/ASAssert.h>
-#import <AsyncDisplayKit/ASDisplayNode.h>
-#import <AsyncDisplayKit/ASIndexPath.h>
-#import <AsyncDisplayKit/CoreGraphics+ASConvenience.h>
-
-#include <map>
-#include <vector>
-
-@interface ASFlowLayoutController()
-{
-  ASIndexPathRange _visibleRange;
-  std::vector<ASIndexPathRange> _rangesByType;  // All ASLayoutRangeTypes besides visible.
-}
-
-@end
-
-@implementation ASFlowLayoutController
-
-- (instancetype)initWithScrollOption:(ASFlowLayoutDirection)layoutDirection
-{
-  if (!(self = [super init])) {
-    return nil;
-  }
-  _layoutDirection = layoutDirection;
-  _rangesByType = std::vector<ASIndexPathRange>(ASLayoutRangeTypeCount);
-  return self;
-}
-
-#pragma mark - Visible Indices
-
-- (void)setVisibleNodeIndexPaths:(NSArray *)indexPaths
-{
-  _visibleRange = [self indexPathRangeForIndexPaths:indexPaths];
-}
-
-/**
- * IndexPath array for the element in the working range.
- */
-
-- (NSSet *)indexPathsForScrolling:(ASScrollDirection)scrollDirection rangeMode:(ASLayoutRangeMode)rangeMode rangeType:(ASLayoutRangeType)rangeType
-{
-  CGSize viewportSize = [self viewportSize];
-
-  CGFloat viewportDirectionalSize = 0.0;
-  ASDirectionalScreenfulBuffer directionalBuffer = { 0, 0 };
-  ASRangeTuningParameters      tuningParameters  = [self tuningParametersForRangeMode:rangeMode rangeType:rangeType];
-
-  if (_layoutDirection == ASFlowLayoutDirectionHorizontal) {
-    viewportDirectionalSize = viewportSize.width;
-    directionalBuffer = ASDirectionalScreenfulBufferHorizontal(scrollDirection, tuningParameters);
-  } else {
-    viewportDirectionalSize = viewportSize.height;
-    directionalBuffer = ASDirectionalScreenfulBufferVertical(scrollDirection, tuningParameters);
-  }
-  
-  ASIndexPath startPath = [self findIndexPathAtDistance:(-directionalBuffer.negativeDirection * viewportDirectionalSize)
-                                          fromIndexPath:_visibleRange.start];
-  
-  ASIndexPath endPath   = [self findIndexPathAtDistance:(directionalBuffer.positiveDirection * viewportDirectionalSize)
-                                          fromIndexPath:_visibleRange.end];
-
-  ASDisplayNodeAssert(startPath.section <= endPath.section, @"startPath should never begin at a further position than endPath");
-  
-  NSMutableSet *indexPathSet = [[NSMutableSet alloc] init];
-
-  NSArray *completedNodes = [_dataSource completedNodes];
-
-  ASIndexPath currPath = startPath;
-  
-  while (!ASIndexPathEqualToIndexPath(currPath, endPath)) {
-    [indexPathSet addObject:[NSIndexPath indexPathWithASIndexPath:currPath]];
-    currPath.row++;
-
-    // Once we reach the end of the section, advance to the next one.  Keep advancing if the next section is zero-sized.
-    while (currPath.row >= [(NSArray *)completedNodes[currPath.section] count] && currPath.section < endPath.section) {
-      currPath.row = 0;
-      currPath.section++;
-    }
-  }
-  ASDisplayNodeAssert(currPath.section <= endPath.section, @"currPath should never reach a further section than endPath");
-
-  [indexPathSet addObject:[NSIndexPath indexPathWithASIndexPath:endPath]];
-  
-  return indexPathSet;
-}
-
-#pragma mark - Utility
-
-- (ASIndexPathRange)indexPathRangeForIndexPaths:(NSArray *)indexPaths
-{
-  // Set up an initial value so the MIN and MAX can work in the enumeration.
-  __block ASIndexPath currentIndexPath = [[indexPaths firstObject] ASIndexPathValue];
-  __block ASIndexPathRange range;
-  range.start = currentIndexPath;
-  range.end = currentIndexPath;
-  
-  for (NSIndexPath *indexPath in indexPaths) {
-    currentIndexPath = [indexPath ASIndexPathValue];
-    range.start = ASIndexPathMinimum(range.start, currentIndexPath);
-    range.end = ASIndexPathMaximum(range.end, currentIndexPath);
-  }
-  return range;
-}
-
-- (ASIndexPath)findIndexPathAtDistance:(CGFloat)distance fromIndexPath:(ASIndexPath)start
-{
-  // "end" is the index path we'll advance until we have gone far enough from "start" to reach "distance"
-  ASIndexPath end = start;
-  // "previous" will store one iteration before "end", in case we go too far and need to reset "end" to be "previous"
-  ASIndexPath previous = start;
-
-  NSArray *completedNodes = [_dataSource completedNodes];
-  NSUInteger numberOfSections = [completedNodes count];
-  NSUInteger numberOfRowsInSection = [(NSArray *)completedNodes[end.section] count];
-  
-  // If "distance" is negative, advance "end" backwards across rows and sections.
-  // Otherwise, advance forward.  In either case, bring "distance" closer to zero by the dimension of each row passed.
-  if (distance < 0.0 && end.section >= 0 && end.section < numberOfSections && end.row >= 0 && end.row < numberOfRowsInSection) {
-    while (distance < 0.0 && end.section >= 0 && end.row >= 0) {
-      previous = end;
-      ASDisplayNode *node = completedNodes[end.section][end.row];
-      CGSize size = node.calculatedSize;
-      distance += (_layoutDirection == ASFlowLayoutDirectionHorizontal ? size.width : size.height);
-      end.row--;
-      // If we've gone to a negative row, set to the last row of the previous section.  While loop is required to handle empty sections.
-      while (end.row < 0 && end.section > 0) {
-        end.section--;
-        numberOfRowsInSection = [(NSArray *)completedNodes[end.section] count];
-        end.row = numberOfRowsInSection - 1;
-      }
-    }
-
-    if (end.row < 0) {
-      end = previous;
-    }
-  } else {
-    while (distance > 0.0 && end.section >= 0 && end.section < numberOfSections && end.row >= 0 && end.row < numberOfRowsInSection) {
-      previous = end;
-      ASDisplayNode *node = completedNodes[end.section][end.row];
-      CGSize size = node.calculatedSize;
-      distance -= _layoutDirection == ASFlowLayoutDirectionHorizontal ? size.width : size.height;
-
-      end.row++;
-      // If we've gone beyond the section, reset to the beginning of the next section.  While loop is required to handle empty sections.
-      while (end.row >= numberOfRowsInSection && end.section < numberOfSections - 1) {
-        end.row = 0;
-        end.section++;
-        numberOfRowsInSection = [(NSArray *)completedNodes[end.section] count];
-      }
-    }
-
-    if (end.row >= numberOfRowsInSection) {
-      end = previous;
-    }
-  }
-
-  return end;
-}
-
-- (NSInteger)flowLayoutDistanceForRange:(ASIndexPathRange)range
-{
-  // This method should only be called with the range in proper order (start comes before end).
-  ASDisplayNodeAssert(ASIndexPathEqualToIndexPath(ASIndexPathMinimum(range.start, range.end), range.start), @"flowLayoutDistanceForRange: called with invalid range");
-  
-  if (ASIndexPathEqualToIndexPath(range.start, range.end)) {
-    return 0;
-  }
-  
-  NSInteger totalRowCount = 0;
-  NSUInteger numberOfRowsInSection = 0;
-  NSArray *completedNodes = [_dataSource completedNodes];
-
-  for (NSInteger section = range.start.section; section <= range.end.section; section++) {
-    numberOfRowsInSection = [(NSArray *)completedNodes[section] count];
-    totalRowCount += numberOfRowsInSection;
-    
-    if (section == range.start.section) {
-      // For the start section, make sure we don't count the rows before the start row.
-      totalRowCount -= range.start.row;
-    } else if (section == range.end.section) {
-      // For the start section, make sure we don't count the rows after the end row.
-      totalRowCount -= (numberOfRowsInSection - (range.end.row + 1));
-    }
-  }
-  
-  ASDisplayNodeAssert(totalRowCount >= 0, @"totalRowCount in flowLayoutDistanceForRange: should not be negative");
-  return totalRowCount;
-}
-
-@end
-
-#endif
diff --git a/submodules/AsyncDisplayKit/AsyncDisplayKit/Private/ASDataController+Subclasses.h b/submodules/AsyncDisplayKit/AsyncDisplayKit/Private/ASDataController+Subclasses.h
deleted file mode 100644
index 8061e25a8d..0000000000
--- a/submodules/AsyncDisplayKit/AsyncDisplayKit/Private/ASDataController+Subclasses.h
+++ /dev/null
@@ -1,181 +0,0 @@
-//
-//  ASDataController+Subclasses.h
-//  AsyncDisplayKit
-//
-//  Copyright (c) 2014-present, Facebook, Inc.  All rights reserved.
-//  This source code is licensed under the BSD-style license found in the
-//  LICENSE file in the root directory of this source tree. An additional grant
-//  of patent rights can be found in the PATENTS file in the same directory.
-//
-
-#ifndef MINIMAL_ASDK
-
-#pragma once
-#import <vector>
-
-@class ASIndexedNodeContext;
-
-typedef void (^ASDataControllerCompletionBlock)(NSArray<ASCellNode *> *nodes, NSArray<NSIndexPath *> *indexPaths);
-
-@interface ASDataController (Subclasses)
-
-#pragma mark - Internal editing & completed store querying
-
-/**
- * Read-only access to the underlying editing nodes of the given kind
- */
-- (NSMutableArray *)editingNodesOfKind:(NSString *)kind;
-
-/**
- * Read only access to the underlying completed nodes of the given kind
- */
-- (NSMutableArray *)completedNodesOfKind:(NSString *)kind;
-
-#pragma mark - Node sizing
-
-/**
- * Measure and layout the given nodes in optimized batches, constraining each to a given size in `constrainedSizeForNodeOfKind:atIndexPath:`.
- *
- * This method runs synchronously.
- * @param batchCompletion A handler to be run after each batch is completed. It is executed synchronously on the calling thread.
- */
-- (void)batchLayoutNodesFromContexts:(NSArray<ASIndexedNodeContext *> *)contexts batchCompletion:(ASDataControllerCompletionBlock)batchCompletionHandler;
-
-/**
- * Provides the size range for a specific node during the layout process.
- */
-- (ASSizeRange)constrainedSizeForNodeOfKind:(NSString *)kind atIndexPath:(NSIndexPath *)indexPath;
-
-#pragma mark - Node & Section Insertion/Deletion API
-
-/**
- * Inserts the given nodes of the specified kind into the backing store, calling completion on the main thread when the write finishes.
- */
-- (void)insertNodes:(NSArray *)nodes ofKind:(NSString *)kind atIndexPaths:(NSArray *)indexPaths completion:(ASDataControllerCompletionBlock)completionBlock;
-
-/**
- * Deletes the given nodes of the specified kind in the backing store, calling completion on the main thread when the deletion finishes.
- */
-- (void)deleteNodesOfKind:(NSString *)kind atIndexPaths:(NSArray *)indexPaths completion:(ASDataControllerCompletionBlock)completionBlock;
-
-/**
- * Inserts the given sections of the specified kind in the backing store, calling completion on the main thread when finished.
- */
-- (void)insertSections:(NSMutableArray *)sections ofKind:(NSString *)kind atIndexSet:(NSIndexSet *)indexSet completion:(void (^)(NSArray *sections, NSIndexSet *indexSet))completionBlock;
-
-/**
- * Deletes the given sections in the backing store, calling completion on the main thread when finished.
- */
-- (void)deleteSections:(NSIndexSet *)indexSet completion:(void (^)())completionBlock;
-
-#pragma mark - Data Manipulation Hooks
-
-/**
- * Notifies the subclass to perform any work needed before the data controller is reloaded entirely
- *
- * @discussion This method will be performed before the data controller enters its editing queue.
- * The data source is locked at this point and accessing it is safe. Use this method to set up any nodes or
- * data stores before entering into editing the backing store on a background thread.
- */
- - (void)prepareForReloadDataWithSectionCount:(NSInteger)newSectionCount;
- 
-/**
- * Notifies the subclass that the data controller is about to reload its data entirely
- *
- * @discussion This method will be performed on the data controller's editing background queue before the parent's
- * concrete implementation. This is a great place to perform new node creation like supplementary views
- * or header/footer nodes.
- */
-- (void)willReloadDataWithSectionCount:(NSInteger)newSectionCount;
-
-/**
- * Notifies the subclass to perform setup before sections are inserted in the data controller
- *
- * @discussion This method will be performed before the data controller enters its editing queue.
- * The data source is locked at this point and accessing it is safe. Use this method to set up any nodes or
- * data stores before entering into editing the backing store on a background thread.
- *
- * @param sections Indices of sections to be inserted
- */
-- (void)prepareForInsertSections:(NSIndexSet *)sections;
-
-/**
- * Notifies the subclass that the data controller will insert new sections at the given position
- *
- * @discussion This method will be performed on the data controller's editing background queue before the parent's
- * concrete implementation. This is a great place to perform any additional transformations like supplementary views
- * or header/footer nodes.
- *
- * @param sections Indices of sections to be inserted
- */
-- (void)willInsertSections:(NSIndexSet *)sections;
-
-/**
- * Notifies the subclass to perform setup before sections are deleted in the data controller
- *
- * @discussion This method will be performed before the data controller enters its editing queue.
- * The data source is locked at this point and accessing it is safe. Use this method to set up any nodes or
- * data stores before entering into editing the backing store on a background thread.
- *
- * @param sections Indices of sections to be inserted
- */
-- (void)prepareForDeleteSections:(NSIndexSet *)sections;
-
-/**
- * Notifies the subclass that the data controller will delete sections at the given positions
- *
- * @discussion This method will be performed on the data controller's editing background queue before the parent's
- * concrete implementation. This is a great place to perform any additional transformations like supplementary views
- * or header/footer nodes.
- *
- * @param sections Indices of sections to be deleted
- */
-- (void)willDeleteSections:(NSIndexSet *)sections;
-
-/**
- * Notifies the subclass to perform setup before rows are inserted in the data controller.
- *
- * @discussion This method will be performed before the data controller enters its editing queue.
- * The data source is locked at this point and accessing it is safe. Use this method to set up any nodes or
- * data stores before entering into editing the backing store on a background thread.
- *
- * @param indexPaths Index paths for the rows to be inserted.
- */
-- (void)prepareForInsertRowsAtIndexPaths:(NSArray<NSIndexPath *> *)indexPaths;
-
-/**
- * Notifies the subclass that the data controller will insert new rows at the given index paths.
- *
- * @discussion This method will be performed on the data controller's editing background queue before the parent's
- * concrete implementation. This is a great place to perform any additional transformations like supplementary views
- * or header/footer nodes.
- *
- * @param indexPaths Index paths for the rows to be inserted.
- */
-- (void)willInsertRowsAtIndexPaths:(NSArray<NSIndexPath *> *)indexPaths;
-
-/**
- * Notifies the subclass to perform setup before rows are deleted in the data controller.
- *
- * @discussion This method will be performed before the data controller enters its editing queue.
- * The data source is locked at this point and accessing it is safe. Use this method to set up any nodes or
- * data stores before entering into editing the backing store on a background thread.
- *
- * @param indexPaths Index paths for the rows to be deleted.
- */
-- (void)prepareForDeleteRowsAtIndexPaths:(NSArray<NSIndexPath *> *)indexPaths;
-
-/**
- * Notifies the subclass that the data controller will delete rows at the given index paths.
- *
- * @discussion This method will be performed before the data controller enters its editing queue.
- * The data source is locked at this point and accessing it is safe. Use this method to set up any nodes or
- * data stores before entering into editing the backing store on a background thread.
- *
- * @param indexPaths Index paths for the rows to be deleted.
- */
-- (void)willDeleteRowsAtIndexPaths:(NSArray<NSIndexPath *> *)indexPaths;
-
-@end
-
-#endif
diff --git a/submodules/AsyncDisplayKit/BUCK b/submodules/AsyncDisplayKit/BUCK
index 50488256ca..e4a512cf8e 100644
--- a/submodules/AsyncDisplayKit/BUCK
+++ b/submodules/AsyncDisplayKit/BUCK
@@ -1,30 +1,21 @@
 load("//Config:buck_rule_macros.bzl", "framework")
 
-ASYNCDISPLAYKIT_EXPORTED_HEADERS = glob([
-  "Source/*.h",
-  "Source/Details/**/*.h",
-  "Source/Layout/*.h",
-  "Source/Base/*.h",
-  "Source/Debug/AsyncDisplayKit+Debug.h",
-  "Source/TextKit/ASTextNodeTypes.h",
-  "Source/TextKit/ASTextKitComponents.h"
+public_headers = glob([
+  "Source/PublicHeaders/AsyncDisplayKit/*.h",
 ])
 
-ASYNCDISPLAYKIT_PRIVATE_HEADERS = glob([
-    "Source/**/*.h"
-  ],
-  exclude = ASYNCDISPLAYKIT_EXPORTED_HEADERS,
-)
+private_headers = glob([
+  "Source/*.h",
+])
 
 framework(
   name = "AsyncDisplayKit",
-  headers = ASYNCDISPLAYKIT_PRIVATE_HEADERS,
-  exported_headers = ASYNCDISPLAYKIT_EXPORTED_HEADERS,
   srcs = glob([
     "Source/**/*.m",
     "Source/**/*.mm",
-    "Source/Base/*.m"
   ]),
+  headers = private_headers,
+  exported_headers = public_headers,
   compiler_flags = [
     "-DMINIMAL_ASDK",
   ],
diff --git a/submodules/AsyncDisplayKit/BUILD b/submodules/AsyncDisplayKit/BUILD
new file mode 100644
index 0000000000..6d054283b8
--- /dev/null
+++ b/submodules/AsyncDisplayKit/BUILD
@@ -0,0 +1,35 @@
+public_headers = glob([
+  "Source/PublicHeaders/AsyncDisplayKit/*.h",
+])
+
+private_headers = glob([
+  "Source/*.h",
+])
+
+objc_library(
+    name = "AsyncDisplayKit",
+    enable_modules = True,
+    module_name = "AsyncDisplayKit",
+    srcs = glob([
+        "Source/**/*.m",
+        "Source/**/*.mm",
+    ]) + private_headers,
+    hdrs = public_headers,
+    defines = [
+        "MINIMAL_ASDK",
+    ],
+    includes = [
+      "Source/PublicHeaders",
+    ],
+    sdk_frameworks = [
+      "Foundation",
+      "UIKit",
+      "QuartzCore",
+      "CoreMedia",
+      "CoreText",
+      "CoreGraphics",
+    ],
+    visibility = [
+        "//visibility:public",
+    ],
+)
diff --git a/submodules/AsyncDisplayKit/CHANGELOG.md b/submodules/AsyncDisplayKit/CHANGELOG.md
deleted file mode 100644
index 0cddbfab45..0000000000
--- a/submodules/AsyncDisplayKit/CHANGELOG.md
+++ /dev/null
@@ -1,685 +0,0 @@
-# Change Log
-
-## [2.8](https://github.com/TextureGroup/Texture/tree/2.8) (2019-02-12)
-[Full Changelog](https://github.com/TextureGroup/Texture/compare/2.7...2.8)
-
-**Merged pull requests:**
-
-- Remove duplicate definition of category "YogaDebugging" [\#1331](https://github.com/TextureGroup/Texture/pull/1331) ([nguyenhuy](https://github.com/nguyenhuy))
-- Add Yoga layout to ASDKGram Texture cells [\#1315](https://github.com/TextureGroup/Texture/pull/1315) ([maicki](https://github.com/maicki))
-- Remove let and var macros now that we're all-C++ [\#1312](https://github.com/TextureGroup/Texture/pull/1312) ([Adlai-Holler](https://github.com/Adlai-Holler))
-- Add experiments to skip waiting for updates of collection and table views [\#1311](https://github.com/TextureGroup/Texture/pull/1311) ([nguyenhuy](https://github.com/nguyenhuy))
-- \[ASCollectionView\] Supplementary nodes should not enter ASHierarchyStateRangeManaged. [\#1310](https://github.com/TextureGroup/Texture/pull/1310) ([appleguy](https://github.com/appleguy))
-- Fix deprecated implementations warning [\#1306](https://github.com/TextureGroup/Texture/pull/1306) ([maicki](https://github.com/maicki))
-- Improve separation of code for layout method types [\#1305](https://github.com/TextureGroup/Texture/pull/1305) ([maicki](https://github.com/maicki))
-- Fix loading items in ASDKGram IGListKit tab [\#1300](https://github.com/TextureGroup/Texture/pull/1300) ([maicki](https://github.com/maicki))
-- performance spell correction [\#1298](https://github.com/TextureGroup/Texture/pull/1298) ([wxyong](https://github.com/wxyong))
-- Add some snapshot tests for ASTextNode2 truncation modes. [\#1296](https://github.com/TextureGroup/Texture/pull/1296) ([wiseoldduck](https://github.com/wiseoldduck))
-- Reduce startup time. [\#1294](https://github.com/TextureGroup/Texture/pull/1294) ([dmaclach](https://github.com/dmaclach))
-- Reduce startup time. [\#1293](https://github.com/TextureGroup/Texture/pull/1293) ([dmaclach](https://github.com/dmaclach))
-- Reduce startup time. [\#1292](https://github.com/TextureGroup/Texture/pull/1292) ([dmaclach](https://github.com/dmaclach))
-- Reduce startup time. [\#1291](https://github.com/TextureGroup/Texture/pull/1291) ([dmaclach](https://github.com/dmaclach))
-- Reduce startup time. [\#1288](https://github.com/TextureGroup/Texture/pull/1288) ([dmaclach](https://github.com/dmaclach))
-- Add a way to opt out of always-clear-data behavior in ASCollectionView and ASTableView [\#1284](https://github.com/TextureGroup/Texture/pull/1284) ([nguyenhuy](https://github.com/nguyenhuy))
-- Copy yogaChildren in accessor method. Avoid using accessor method internally [\#1283](https://github.com/TextureGroup/Texture/pull/1283) ([maicki](https://github.com/maicki))
-- Use cell mode while wrapping supplementary nodes [\#1282](https://github.com/TextureGroup/Texture/pull/1282) ([maicki](https://github.com/maicki))
-- Access thread safe property to avoid assertion  [\#1281](https://github.com/TextureGroup/Texture/pull/1281) ([wiseoldduck](https://github.com/wiseoldduck))
-- Match AS\_USE\_VIDEO usage in tests to definitions [\#1280](https://github.com/TextureGroup/Texture/pull/1280) ([wiseoldduck](https://github.com/wiseoldduck))
-- Update test imports to use framework import [\#1279](https://github.com/TextureGroup/Texture/pull/1279) ([maicki](https://github.com/maicki))
-- Set automaticallyAdjustsContentOffset to ASTableView when view is load [\#1278](https://github.com/TextureGroup/Texture/pull/1278) ([strangeliu](https://github.com/strangeliu))
-- Remove UIKit header import in AsyncTransaction file [\#1275](https://github.com/TextureGroup/Texture/pull/1275) ([zhongwuzw](https://github.com/zhongwuzw))
-- Disable a11y cache [\#1274](https://github.com/TextureGroup/Texture/pull/1274) ([wsdwsd0829](https://github.com/wsdwsd0829))
-- Introduce ASCellLayoutMode [\#1273](https://github.com/TextureGroup/Texture/pull/1273) ([maicki](https://github.com/maicki))
-- During yoga layout, escalate directly to yoga root rather than walking up [\#1269](https://github.com/TextureGroup/Texture/pull/1269) ([Adlai-Holler](https://github.com/Adlai-Holler))
-- Forward hitTest:withEvent and piontInside:withEvent: to node within \_ASCollectionViewCell [\#1268](https://github.com/TextureGroup/Texture/pull/1268) ([maicki](https://github.com/maicki))
-- Wrap supplementary node blocks to enable resizing them. [\#1265](https://github.com/TextureGroup/Texture/pull/1265) ([wiseoldduck](https://github.com/wiseoldduck))
-- Move Bluebird to new row. [\#1264](https://github.com/TextureGroup/Texture/pull/1264) ([ay8s](https://github.com/ay8s))
-- Added Bluebird [\#1263](https://github.com/TextureGroup/Texture/pull/1263) ([ShihabM](https://github.com/ShihabM))
-- Move assertions so they are valid. [\#1261](https://github.com/TextureGroup/Texture/pull/1261) ([wiseoldduck](https://github.com/wiseoldduck))
-- Fix isTruncated logic in ASTextNode2 [\#1259](https://github.com/TextureGroup/Texture/pull/1259) ([maicki](https://github.com/maicki))
-- Documentation typo, "trying" written two times [\#1258](https://github.com/TextureGroup/Texture/pull/1258) ([tataevr](https://github.com/tataevr))
-- \[ASPrimitiveTraitCollection\] Fix ASPrimitiveTraitCollectionMakeDefault and implement containerSize [\#1256](https://github.com/TextureGroup/Texture/pull/1256) ([rcancro](https://github.com/rcancro))
-- Yoga debug info [\#1253](https://github.com/TextureGroup/Texture/pull/1253) ([wsdwsd0829](https://github.com/wsdwsd0829))
-- Avoid using global Mutex variables [\#1252](https://github.com/TextureGroup/Texture/pull/1252) ([nguyenhuy](https://github.com/nguyenhuy))
-- Allow setting build.sh SDK and platform w/ env variables [\#1249](https://github.com/TextureGroup/Texture/pull/1249) ([wiseoldduck](https://github.com/wiseoldduck))
-- add more delegate methods for monitoring network image node progress [\#1247](https://github.com/TextureGroup/Texture/pull/1247) ([ernestmama](https://github.com/ernestmama))
-- Start a thrash test suite for the collection node [\#1246](https://github.com/TextureGroup/Texture/pull/1246) ([mikezucc](https://github.com/mikezucc))
-- Add development docs structure [\#1245](https://github.com/TextureGroup/Texture/pull/1245) ([garrettmoon](https://github.com/garrettmoon))
-- Convert YGUndefined back to CGFLOAT\_MAX for Texture layout [\#1244](https://github.com/TextureGroup/Texture/pull/1244) ([tnorman42](https://github.com/tnorman42))
-- Add way to compile out ASTextNode + TextKit dependencies [\#1242](https://github.com/TextureGroup/Texture/pull/1242) ([maicki](https://github.com/maicki))
-- Add AS\_USE\_VIDEO flag and subspec for Video [\#1240](https://github.com/TextureGroup/Texture/pull/1240) ([maicki](https://github.com/maicki))
-- Releases/p6.78 [\#1236](https://github.com/TextureGroup/Texture/pull/1236) ([ernestmama](https://github.com/ernestmama))
-- \[ASDisplayNode\] Propagate traits before loading a subnode [\#1234](https://github.com/TextureGroup/Texture/pull/1234) ([rcancro](https://github.com/rcancro))
-- Correct some block self references to strongSelf [\#1231](https://github.com/TextureGroup/Texture/pull/1231) ([wiseoldduck](https://github.com/wiseoldduck))
-- Update image-node.md [\#1230](https://github.com/TextureGroup/Texture/pull/1230) ([orkhan-huseynov](https://github.com/orkhan-huseynov))
-- Have node and controller share lock [\#1227](https://github.com/TextureGroup/Texture/pull/1227) ([Adlai-Holler](https://github.com/Adlai-Holler))
-- Initialize mutex assertion variables [\#1226](https://github.com/TextureGroup/Texture/pull/1226) ([Adlai-Holler](https://github.com/Adlai-Holler))
-- Remove CHECK\_LOCKING\_SAFETY check [\#1225](https://github.com/TextureGroup/Texture/pull/1225) ([maicki](https://github.com/maicki))
-- Clean up our mutex, fix try\_lock not hooking into assert mechanism [\#1219](https://github.com/TextureGroup/Texture/pull/1219) ([Adlai-Holler](https://github.com/Adlai-Holler))
-- Fix warning using \_\_builtin\_popcount [\#1218](https://github.com/TextureGroup/Texture/pull/1218) ([maicki](https://github.com/maicki))
-- Fix A11Y for horizontal collection nodes in Texture [\#1217](https://github.com/TextureGroup/Texture/pull/1217) ([maicki](https://github.com/maicki))
-- ASCATransactionQueue interface trashing improvements [\#1216](https://github.com/TextureGroup/Texture/pull/1216) ([maicki](https://github.com/maicki))
-- Fix shouldTruncateForConstrainedSize in ASTextNode2 [\#1214](https://github.com/TextureGroup/Texture/pull/1214) ([maicki](https://github.com/maicki))
-- ASThread: Remove Locker, Unlocker, and SharedMutex [\#1213](https://github.com/TextureGroup/Texture/pull/1213) ([Adlai-Holler](https://github.com/Adlai-Holler))
-- Cleanup Dangerfile [\#1212](https://github.com/TextureGroup/Texture/pull/1212) ([nguyenhuy](https://github.com/nguyenhuy))
-- Rework ASTraitCollection to Fix Warnings and Remove Boilerplate [\#1211](https://github.com/TextureGroup/Texture/pull/1211) ([Adlai-Holler](https://github.com/Adlai-Holler))
-- Add -Wno-implicit-retain-self to podspec + smaller cleanups \#trivial [\#1209](https://github.com/TextureGroup/Texture/pull/1209) ([maicki](https://github.com/maicki))
-- Address compiler warnings \#trivial [\#1207](https://github.com/TextureGroup/Texture/pull/1207) ([Adlai-Holler](https://github.com/Adlai-Holler))
-- Convert the codebase to Objective-C++ [\#1206](https://github.com/TextureGroup/Texture/pull/1206) ([Adlai-Holler](https://github.com/Adlai-Holler))
-- Add tests for accessibility [\#1205](https://github.com/TextureGroup/Texture/pull/1205) ([wiseoldduck](https://github.com/wiseoldduck))
-- Revert \#1023 \#trivial [\#1204](https://github.com/TextureGroup/Texture/pull/1204) ([maicki](https://github.com/maicki))
-- Follow up cleanup \#trivial [\#1203](https://github.com/TextureGroup/Texture/pull/1203) ([maicki](https://github.com/maicki))
-- Add experiment flag to skip layoutIfNeeded in enterPreloadState for ASM nodes \#trivial [\#1201](https://github.com/TextureGroup/Texture/pull/1201) ([maicki](https://github.com/maicki))
-- Fix logic cleaning data if delegate / dataSource changes and bring over logic to ASTableView [\#1200](https://github.com/TextureGroup/Texture/pull/1200) ([maicki](https://github.com/maicki))
-- Tweak a11y label aggregation behavior to enable container label overrides [\#1199](https://github.com/TextureGroup/Texture/pull/1199) ([maicki](https://github.com/maicki))
-- Fix shadowed var warning \(and add clarity\) \#trivial [\#1198](https://github.com/TextureGroup/Texture/pull/1198) ([wiseoldduck](https://github.com/wiseoldduck))
-- Allow configuring imageCache when initializing ASPINRemoteImageDownloader. [\#1197](https://github.com/TextureGroup/Texture/pull/1197) ([wiseoldduck](https://github.com/wiseoldduck))
-- ASTextNode2 to consider both width and height when determining if it is calculating an intrinsic size [\#1196](https://github.com/TextureGroup/Texture/pull/1196) ([ernestmama](https://github.com/ernestmama))
-- Remove extraneous ";" \#trivial [\#1194](https://github.com/TextureGroup/Texture/pull/1194) ([wiseoldduck](https://github.com/wiseoldduck))
-- Newline character support and truncated line sizing improvement. [\#1193](https://github.com/TextureGroup/Texture/pull/1193) ([wiseoldduck](https://github.com/wiseoldduck))
-- Correct linePositionModifier behavior [\#1192](https://github.com/TextureGroup/Texture/pull/1192) ([maicki](https://github.com/maicki))
-- Move AS\_TEXT\_ALERT\_UNIMPLEMENTED\_FEATURE into ASTextNodeCommon \#trivial [\#1191](https://github.com/TextureGroup/Texture/pull/1191) ([maicki](https://github.com/maicki))
-- A11y for scrollnode [\#1188](https://github.com/TextureGroup/Texture/pull/1188) ([wsdwsd0829](https://github.com/wsdwsd0829))
-- Yoga integration improvements [\#1187](https://github.com/TextureGroup/Texture/pull/1187) ([maicki](https://github.com/maicki))
-- Remove unnecessary ASWeakProxy import \#trivial [\#1186](https://github.com/TextureGroup/Texture/pull/1186) ([maicki](https://github.com/maicki))
-- Directly use \_\_instanceLock\_\_ to lock / unlock without having to create and destroy a MutextUnlocker \#trivial [\#1185](https://github.com/TextureGroup/Texture/pull/1185) ([maicki](https://github.com/maicki))
--  Don’t handle touches on additional attributed message if passthrough is enabled [\#1184](https://github.com/TextureGroup/Texture/pull/1184) ([maicki](https://github.com/maicki))
-- Set the default values for showsVerticalScrollIndicator and showsHorizontalScrollIndicator \#trivial [\#1181](https://github.com/TextureGroup/Texture/pull/1181) ([maicki](https://github.com/maicki))
-- Move import of stdatomic to ASRecursiveUnfairLock implementation file \#trivial [\#1180](https://github.com/TextureGroup/Texture/pull/1180) ([maicki](https://github.com/maicki))
-- Add NSLocking conformance to ASNodeController [\#1179](https://github.com/TextureGroup/Texture/pull/1179) ([maicki](https://github.com/maicki))
-- Only initialize framework once, avoid multiple across tests \#trivial [\#1178](https://github.com/TextureGroup/Texture/pull/1178) ([maicki](https://github.com/maicki))
-- Expose a way to determine if a text node will truncate for a given constrained size \#trivial [\#1177](https://github.com/TextureGroup/Texture/pull/1177) ([maicki](https://github.com/maicki))
-- Fix define spaces \#trivial [\#1176](https://github.com/TextureGroup/Texture/pull/1176) ([maicki](https://github.com/maicki))
-- Expose test\_resetWithConfiguration: for testing \#trivial [\#1175](https://github.com/TextureGroup/Texture/pull/1175) ([maicki](https://github.com/maicki))
-- Add way to suppress invalid CollectionUpdateExceptions \#trivial [\#1173](https://github.com/TextureGroup/Texture/pull/1173) ([maicki](https://github.com/maicki))
-- Use interface state to manage image loading \#trivial [\#1172](https://github.com/TextureGroup/Texture/pull/1172) ([maicki](https://github.com/maicki))
-- ASTableNode init method match checks from ASCollectionNode [\#1171](https://github.com/TextureGroup/Texture/pull/1171) ([maicki](https://github.com/maicki))
-- \[ASDisplayNode\] Expose default Texture-set accessibility values as properties [\#1170](https://github.com/TextureGroup/Texture/pull/1170) ([jiawernlim](https://github.com/jiawernlim))
-- Fix mismatch in UIAccessibilityAction selector method [\#1169](https://github.com/TextureGroup/Texture/pull/1169) ([maicki](https://github.com/maicki))
-- Small fix in ASTextKitRenderer \#trivial [\#1167](https://github.com/TextureGroup/Texture/pull/1167) ([nguyenhuy](https://github.com/nguyenhuy))
-- ASTextNode2 to ignore certain text alignments while calculating intrinsic size [\#1166](https://github.com/TextureGroup/Texture/pull/1166) ([nguyenhuy](https://github.com/nguyenhuy))
-- Update Jekyll to 3.6.3 [\#1165](https://github.com/TextureGroup/Texture/pull/1165) ([nguyenhuy](https://github.com/nguyenhuy))
-- Migrate placeholder example project from 1.0 to 2.x [\#1164](https://github.com/TextureGroup/Texture/pull/1164) ([ay8s](https://github.com/ay8s))
-- Update documentation of ASNetworkImageNodeDelegate \#trivial [\#1163](https://github.com/TextureGroup/Texture/pull/1163) ([nguyenhuy](https://github.com/nguyenhuy))
-- Make ASEditableTextNode accessible to VoiceOver [\#1162](https://github.com/TextureGroup/Texture/pull/1162) ([ay8s](https://github.com/ay8s))
-- Mismatch name experimental features [\#1159](https://github.com/TextureGroup/Texture/pull/1159) ([wsdwsd0829](https://github.com/wsdwsd0829))
-- Set default tuning params [\#1158](https://github.com/TextureGroup/Texture/pull/1158) ([wsdwsd0829](https://github.com/wsdwsd0829))
-- Clean up timing of layout tree flattening/ copying of unflattened tree for Weaver [\#1157](https://github.com/TextureGroup/Texture/pull/1157) ([mikezucc](https://github.com/mikezucc))
-- Only clear ASCollectionView's data during deallocation [\#1154](https://github.com/TextureGroup/Texture/pull/1154) ([nguyenhuy](https://github.com/nguyenhuy))
-- \[ASTextNode2\] Add improved support for all line-break modes in experimental text node.  [\#1150](https://github.com/TextureGroup/Texture/pull/1150) ([wiseoldduck](https://github.com/wiseoldduck))
-- \[ASImageNode\] Fix a threading issue which can cause a display completion block to never be executed [\#1148](https://github.com/TextureGroup/Texture/pull/1148) ([nguyenhuy](https://github.com/nguyenhuy))
-- Guard photo library with macro for tests [\#1147](https://github.com/TextureGroup/Texture/pull/1147) ([wsdwsd0829](https://github.com/wsdwsd0829))
-- Rollout ASDeallocQueueV2 \#trivial [\#1143](https://github.com/TextureGroup/Texture/pull/1143) ([ernestmama](https://github.com/ernestmama))
-- Fix crash setting attributed text on multiple threads [\#1141](https://github.com/TextureGroup/Texture/pull/1141) ([maicki](https://github.com/maicki))
-- Add missing NS\_NOESCAPE attributes in overwritten methods \#trivial [\#1139](https://github.com/TextureGroup/Texture/pull/1139) ([ejensen](https://github.com/ejensen))
-- Add missing comma in ASExperimentalFeatures \#trivial [\#1137](https://github.com/TextureGroup/Texture/pull/1137) ([nguyenhuy](https://github.com/nguyenhuy))
-- Add ASExperimentalSkipClearData \#trivial [\#1136](https://github.com/TextureGroup/Texture/pull/1136) ([maicki](https://github.com/maicki))
-- Fix RemoteImageDownloader name mismatch \#trivial [\#1134](https://github.com/TextureGroup/Texture/pull/1134) ([ernestmama](https://github.com/ernestmama))
-- Fix compilation warnings \#trivial [\#1132](https://github.com/TextureGroup/Texture/pull/1132) ([ejensen](https://github.com/ejensen))
-- Remove reliance on shared\_ptr for ASDisplayNodeLayouts [\#1131](https://github.com/TextureGroup/Texture/pull/1131) ([Adlai-Holler](https://github.com/Adlai-Holler))
-- Make yoga & layout specs faster by eliminating some copies [\#1128](https://github.com/TextureGroup/Texture/pull/1128) ([Adlai-Holler](https://github.com/Adlai-Holler))
-- Remove ASRectMap, which is not worth its own weight [\#1127](https://github.com/TextureGroup/Texture/pull/1127) ([Adlai-Holler](https://github.com/Adlai-Holler))
-- \[ASPINRemoteImageDownloader\] Fix +setSharedPreconfiguredRemoteImageManager:'s doc \#trivial [\#1126](https://github.com/TextureGroup/Texture/pull/1126) ([nguyenhuy](https://github.com/nguyenhuy))
-- Add a method for setting preconfigured PINRemoteImageManager [\#1124](https://github.com/TextureGroup/Texture/pull/1124) ([ernestmama](https://github.com/ernestmama))
-- Don't copy onDidLoadBlocks \#trivial [\#1123](https://github.com/TextureGroup/Texture/pull/1123) ([Adlai-Holler](https://github.com/Adlai-Holler))
-- Remove use of NSHashTable for interface state delegates \#trivial [\#1122](https://github.com/TextureGroup/Texture/pull/1122) ([Adlai-Holler](https://github.com/Adlai-Holler))
-- Fix typos and minor code cleanups \#trivial [\#1120](https://github.com/TextureGroup/Texture/pull/1120) ([nguyenhuy](https://github.com/nguyenhuy))
-- Don't setNeedsDisplay on text node 2 measure \#trivial [\#1116](https://github.com/TextureGroup/Texture/pull/1116) ([Adlai-Holler](https://github.com/Adlai-Holler))
-- Don't copy container during ASTextNode2 measure [\#1115](https://github.com/TextureGroup/Texture/pull/1115) ([Adlai-Holler](https://github.com/Adlai-Holler))
-- Make interface state delegate non optional [\#1112](https://github.com/TextureGroup/Texture/pull/1112) ([wsdwsd0829](https://github.com/wsdwsd0829))
-- Interface state not update correctly during layer thrash. [\#1111](https://github.com/TextureGroup/Texture/pull/1111) ([wsdwsd0829](https://github.com/wsdwsd0829))
-- Fix layer backed nodes not update properly [\#1110](https://github.com/TextureGroup/Texture/pull/1110) ([wsdwsd0829](https://github.com/wsdwsd0829))
-- changelog fix: let / var macros did not make it to 2.7 [\#1109](https://github.com/TextureGroup/Texture/pull/1109) ([jozsefmihalicza](https://github.com/jozsefmihalicza))
-- Improve locking around clearContents [\#1107](https://github.com/TextureGroup/Texture/pull/1107) ([maicki](https://github.com/maicki))
-- Add missing argument for calling image download completion block \#trivial [\#1106](https://github.com/TextureGroup/Texture/pull/1106) ([maicki](https://github.com/maicki))
-- Fix URL for blog about Pinterest [\#1105](https://github.com/TextureGroup/Texture/pull/1105) ([muukii](https://github.com/muukii))
-- Remove necessity to use view to access rangeController in ASTableNode, ASCollectionNode [\#1103](https://github.com/TextureGroup/Texture/pull/1103) ([maicki](https://github.com/maicki))
-- Add a -textureDidInitialize delegate callback [\#1100](https://github.com/TextureGroup/Texture/pull/1100) ([Adlai-Holler](https://github.com/Adlai-Holler))
-- Reuse interface state delegates when calling out \#trivial [\#1099](https://github.com/TextureGroup/Texture/pull/1099) ([Adlai-Holler](https://github.com/Adlai-Holler))
-- Add an explicit cast to satisfy strict compilers \#trivial [\#1098](https://github.com/TextureGroup/Texture/pull/1098) ([Adlai-Holler](https://github.com/Adlai-Holler))
-- Fix a couple typos. [\#1092](https://github.com/TextureGroup/Texture/pull/1092) ([jtbthethird](https://github.com/jtbthethird))
-- \#trivial Shouldn't hold the lock while adding subnodes [\#1091](https://github.com/TextureGroup/Texture/pull/1091) ([garrettmoon](https://github.com/garrettmoon))
-- Allow to add interface state delegate in background. [\#1090](https://github.com/TextureGroup/Texture/pull/1090) ([wsdwsd0829](https://github.com/wsdwsd0829))
-- Fix Typo [\#1089](https://github.com/TextureGroup/Texture/pull/1089) ([jtbthethird](https://github.com/jtbthethird))
-- Add subnode should not be called with the lock held. \#trivial [\#1088](https://github.com/TextureGroup/Texture/pull/1088) ([garrettmoon](https://github.com/garrettmoon))
-- Unlock before cleanup and calling out to subclass hooks for animated images. [\#1087](https://github.com/TextureGroup/Texture/pull/1087) ([maicki](https://github.com/maicki))
-- Fix collection editing [\#1081](https://github.com/TextureGroup/Texture/pull/1081) ([wsdwsd0829](https://github.com/wsdwsd0829))
-- Fix compiler error in ASLocking \#trivial [\#1079](https://github.com/TextureGroup/Texture/pull/1079) ([nguyenhuy](https://github.com/nguyenhuy))
-- Update showcase to add Wishpoke [\#1078](https://github.com/TextureGroup/Texture/pull/1078) ([dhatuna](https://github.com/dhatuna))
-- \[License\] Simplify the Texture license to be pure Apache 2 \(removing ASDK-Licenses\). [\#1077](https://github.com/TextureGroup/Texture/pull/1077) ([appleguy](https://github.com/appleguy))
-- Fix multiple documentation issues \#trivial [\#1073](https://github.com/TextureGroup/Texture/pull/1073) ([maicki](https://github.com/maicki))
-- Refactored `accessibleElements` to `accessibilityElements` [\#1069](https://github.com/TextureGroup/Texture/pull/1069) ([jiawernlim](https://github.com/jiawernlim))
-- Readability improvements in ASDataController \#trivial [\#1067](https://github.com/TextureGroup/Texture/pull/1067) ([Adlai-Holler](https://github.com/Adlai-Holler))
-- Remove direct ivar access on non-self object to fix mocking case \#trivial [\#1066](https://github.com/TextureGroup/Texture/pull/1066) ([Adlai-Holler](https://github.com/Adlai-Holler))
-- Reduce copying in ASTextNode2 stack [\#1065](https://github.com/TextureGroup/Texture/pull/1065) ([Adlai-Holler](https://github.com/Adlai-Holler))
-- Add an experimental framesetter cache in ASTextNode2 [\#1063](https://github.com/TextureGroup/Texture/pull/1063) ([Adlai-Holler](https://github.com/Adlai-Holler))
-- Remove extra string/attributed string creation in accessibility props [\#1062](https://github.com/TextureGroup/Texture/pull/1062) ([Adlai-Holler](https://github.com/Adlai-Holler))
-- Remove objc association & weak proxy from node -\> controller pointer [\#1061](https://github.com/TextureGroup/Texture/pull/1061) ([Adlai-Holler](https://github.com/Adlai-Holler))
-- Remove CATransaction signposts [\#1060](https://github.com/TextureGroup/Texture/pull/1060) ([Adlai-Holler](https://github.com/Adlai-Holler))
-- \[ASTextNode2\] Simplify allocWithZone: + initialize implementation \#trivial [\#1059](https://github.com/TextureGroup/Texture/pull/1059) ([Adlai-Holler](https://github.com/Adlai-Holler))
-- \[ASTextNode\] Fixes in ASTextKitFontSizeAdjuster [\#1056](https://github.com/TextureGroup/Texture/pull/1056) ([ejensen](https://github.com/ejensen))
-- Revert "Optimize drawing code + add examples how to round corners \(\#996\) [\#1055](https://github.com/TextureGroup/Texture/pull/1055) ([maicki](https://github.com/maicki))
-- Add NS\_DESIGNATED\_INITIALIZER to ASViewController initWithNode: [\#1054](https://github.com/TextureGroup/Texture/pull/1054) ([maicki](https://github.com/maicki))
-- Fix headers in markdown [\#1053](https://github.com/TextureGroup/Texture/pull/1053) ([Un3qual](https://github.com/Un3qual))
-- Avoid setting frame on a node's backing store while holding its lock [\#1048](https://github.com/TextureGroup/Texture/pull/1048) ([nguyenhuy](https://github.com/nguyenhuy))
-- \#trivial Add a comment about tiling mode and issue \#1046 [\#1047](https://github.com/TextureGroup/Texture/pull/1047) ([wiseoldduck](https://github.com/wiseoldduck))
-- Add documentation for rounding corners within Texture \#trivial [\#1044](https://github.com/TextureGroup/Texture/pull/1044) ([maicki](https://github.com/maicki))
-- Improve locking situation in ASVideoPlayerNode [\#1042](https://github.com/TextureGroup/Texture/pull/1042) ([maicki](https://github.com/maicki))
-- Revert unreleased layout debug method name change from \#1030 \#trivial [\#1039](https://github.com/TextureGroup/Texture/pull/1039) ([Adlai-Holler](https://github.com/Adlai-Holler))
-- Pin OCMock version to 3.4.1 because 3.4.2 has issues [\#1038](https://github.com/TextureGroup/Texture/pull/1038) ([Adlai-Holler](https://github.com/Adlai-Holler))
-- Fix & update ASCollectionNode constrained size doc. \#trivial [\#1037](https://github.com/TextureGroup/Texture/pull/1037) ([ay8s](https://github.com/ay8s))
-- Fix warning for ASLayout method override for the designated initializer of the superclass '-init' not found \#trivial [\#1036](https://github.com/TextureGroup/Texture/pull/1036) ([maicki](https://github.com/maicki))
-- Fix the bug I introduced in \#1030 \#trivial [\#1035](https://github.com/TextureGroup/Texture/pull/1035) ([Adlai-Holler](https://github.com/Adlai-Holler))
-- Turn off exceptions to reduce binary size \(-600KB for arm64\) [\#1033](https://github.com/TextureGroup/Texture/pull/1033) ([Adlai-Holler](https://github.com/Adlai-Holler))
-- Turn lock-checking on only when assertions are enabled \#trivial [\#1032](https://github.com/TextureGroup/Texture/pull/1032) ([Adlai-Holler](https://github.com/Adlai-Holler))
-- Remove NSMutableArray for retaining sublayout elements [\#1030](https://github.com/TextureGroup/Texture/pull/1030) ([Adlai-Holler](https://github.com/Adlai-Holler))
-- Create and set delegate for clip corner layers within ASDisplayNode [\#1029](https://github.com/TextureGroup/Texture/pull/1029) ([maicki](https://github.com/maicki))
-- Split framework dependencies into separate subspecs [\#1028](https://github.com/TextureGroup/Texture/pull/1028) ([Adlai-Holler](https://github.com/Adlai-Holler))
-- Remove misleading comment and add assertion \#trivial [\#1027](https://github.com/TextureGroup/Texture/pull/1027) ([wiseoldduck](https://github.com/wiseoldduck))
-- Address warnings in Xcode \>= 9.3 about using %zd for NSInteger \#trivial [\#1026](https://github.com/TextureGroup/Texture/pull/1026) ([Adlai-Holler](https://github.com/Adlai-Holler))
-- Fix 32-bit simulator build on Xcode \>= 9.3 [\#1025](https://github.com/TextureGroup/Texture/pull/1025) ([Adlai-Holler](https://github.com/Adlai-Holler))
-- Stricter locking assertions [\#1024](https://github.com/TextureGroup/Texture/pull/1024) ([nguyenhuy](https://github.com/nguyenhuy))
-- Make sure -\_completePendingLayoutTransition is called without the node's instance lock \#trivial [\#1023](https://github.com/TextureGroup/Texture/pull/1023) ([nguyenhuy](https://github.com/nguyenhuy))
-- Fix misleading/scary stack trace shown when an assertion occurs during node measurement [\#1022](https://github.com/TextureGroup/Texture/pull/1022) ([nguyenhuy](https://github.com/nguyenhuy))
-- Add an introduction for ASCornerLayoutSpec in layout2-layoutspec-types.md \#trivial [\#1021](https://github.com/TextureGroup/Texture/pull/1021) ([huang-kun](https://github.com/huang-kun))
-- Add showsHorizontal\(Vertical\)ScrollIndicator property applying from pending state \#trivial [\#1016](https://github.com/TextureGroup/Texture/pull/1016) ([maicki](https://github.com/maicki))
-- \[IGListKit\] Adds missing UIScrollViewDelegate method to DataSource proxy [\#1015](https://github.com/TextureGroup/Texture/pull/1015) ([wannabehero](https://github.com/wannabehero))
-- Introduce let / var macros and some further cleanup [\#1012](https://github.com/TextureGroup/Texture/pull/1012) ([maicki](https://github.com/maicki))
-- Properly consider node for responder methods [\#1008](https://github.com/TextureGroup/Texture/pull/1008) ([maicki](https://github.com/maicki))
-- Background image load api [\#1007](https://github.com/TextureGroup/Texture/pull/1007) ([wsdwsd0829](https://github.com/wsdwsd0829))
-- Add move detection and support to ASLayoutTransition [\#1006](https://github.com/TextureGroup/Texture/pull/1006) ([wiseoldduck](https://github.com/wiseoldduck))
-- Fix warnings and a memory leak \#trivial [\#1003](https://github.com/TextureGroup/Texture/pull/1003) ([maicki](https://github.com/maicki))
-- Rewrite Swift Example [\#1002](https://github.com/TextureGroup/Texture/pull/1002) ([maicki](https://github.com/maicki))
-- Remove yoga layout spec, which has been superseded [\#999](https://github.com/TextureGroup/Texture/pull/999) ([Adlai-Holler](https://github.com/Adlai-Holler))
-- Optimize drawing code + add examples how to round corners [\#996](https://github.com/TextureGroup/Texture/pull/996) ([maicki](https://github.com/maicki))
-- Fix typo in containers-asviewcontroller.md [\#989](https://github.com/TextureGroup/Texture/pull/989) ([muukii](https://github.com/muukii))
-- Create transfer-array method and use it [\#987](https://github.com/TextureGroup/Texture/pull/987) ([Adlai-Holler](https://github.com/Adlai-Holler))
-- Add missing instance variables in ASTextNode and warnings cleanup \#trivial [\#984](https://github.com/TextureGroup/Texture/pull/984) ([maicki](https://github.com/maicki))
-- Optimize layout flattening [\#982](https://github.com/TextureGroup/Texture/pull/982) ([Adlai-Holler](https://github.com/Adlai-Holler))
-- Changed lost images to existing one. \#trivial [\#981](https://github.com/TextureGroup/Texture/pull/981) ([tataevr](https://github.com/tataevr))
-- \[texturegroup.org\] Use valid link for Upgrade to 2.0 beta 1 page \#trivial [\#980](https://github.com/TextureGroup/Texture/pull/980) ([mikezucc](https://github.com/mikezucc))
-- Adds support for having multiple interface state delegates. [\#979](https://github.com/TextureGroup/Texture/pull/979) ([garrettmoon](https://github.com/garrettmoon))
-- Create an experiment to remove extra collection teardown step [\#975](https://github.com/TextureGroup/Texture/pull/975) ([Adlai-Holler](https://github.com/Adlai-Holler))
-- Remove unused/unneeded header macros [\#973](https://github.com/TextureGroup/Texture/pull/973) ([Adlai-Holler](https://github.com/Adlai-Holler))
-- Standardize "extern" decls on AS\_EXTERN [\#972](https://github.com/TextureGroup/Texture/pull/972) ([Adlai-Holler](https://github.com/Adlai-Holler))
-- ASConfiguration version check only when have json dict [\#971](https://github.com/TextureGroup/Texture/pull/971) ([wsdwsd0829](https://github.com/wsdwsd0829))
-- Pointer check [\#970](https://github.com/TextureGroup/Texture/pull/970) ([wsdwsd0829](https://github.com/wsdwsd0829))
-- Reduce usage of autorelease pools [\#968](https://github.com/TextureGroup/Texture/pull/968) ([Adlai-Holler](https://github.com/Adlai-Holler))
-- Update showcase to include Apollo for Reddit [\#967](https://github.com/TextureGroup/Texture/pull/967) ([christianselig](https://github.com/christianselig))
-- Fix crash when call needsMainThreadDeallocation on NSProxy instances \#trivial [\#965](https://github.com/TextureGroup/Texture/pull/965) ([nguyenhuy](https://github.com/nguyenhuy))
-- Fix name typo \#trivial [\#963](https://github.com/TextureGroup/Texture/pull/963) ([wsdwsd0829](https://github.com/wsdwsd0829))
-- Generalize the main thread ivar deallocation system [\#959](https://github.com/TextureGroup/Texture/pull/959) ([Adlai-Holler](https://github.com/Adlai-Holler))
-- Add support for acquiring multiple locks at once [\#958](https://github.com/TextureGroup/Texture/pull/958) ([Adlai-Holler](https://github.com/Adlai-Holler))
-- Clean up async transaction system a bit [\#955](https://github.com/TextureGroup/Texture/pull/955) ([Adlai-Holler](https://github.com/Adlai-Holler))
-- Added 'Waplog' to showcase. [\#953](https://github.com/TextureGroup/Texture/pull/953) ([malikkuru](https://github.com/malikkuru))
-- Make ASPerformMainThreadDeallocation visible in C [\#952](https://github.com/TextureGroup/Texture/pull/952) ([Adlai-Holler](https://github.com/Adlai-Holler))
-- Cut 2.7 release [\#949](https://github.com/TextureGroup/Texture/pull/949) ([Adlai-Holler](https://github.com/Adlai-Holler))
-- Fixed removing node from supernode after layout transition [\#937](https://github.com/TextureGroup/Texture/pull/937) ([atitovdev](https://github.com/atitovdev))
-- add ASTextNode2 snapshot test [\#935](https://github.com/TextureGroup/Texture/pull/935) ([wsdwsd0829](https://github.com/wsdwsd0829))
-- \[ASTextNode\] One more check variables before calling delegate method \#trivial [\#922](https://github.com/TextureGroup/Texture/pull/922) ([Flatout73](https://github.com/Flatout73))
-- Assert node did load before did enter visible way 1 [\#886](https://github.com/TextureGroup/Texture/pull/886) ([wsdwsd0829](https://github.com/wsdwsd0829))
-- Renew supplementary node on relayout [\#842](https://github.com/TextureGroup/Texture/pull/842) ([wsdwsd0829](https://github.com/wsdwsd0829))
-
-## [2.7](https://github.com/TextureGroup/Texture/tree/2.7) (2018-05-29)
-[Full Changelog](https://github.com/TextureGroup/Texture/compare/2.6...2.7)
-
-**Merged pull requests:**
-
-- Update AppIcon in showcase [\#946](https://github.com/TextureGroup/Texture/pull/946) ([muukii](https://github.com/muukii))
-- Update tip-1-nodeBlocks.md [\#943](https://github.com/TextureGroup/Texture/pull/943) ([sagarbhosale](https://github.com/sagarbhosale))
-- \[ASTableView\] Generate a new cell layout if existing ones are invalid [\#942](https://github.com/TextureGroup/Texture/pull/942) ([nguyenhuy](https://github.com/nguyenhuy))
-- Update to unsplash [\#938](https://github.com/TextureGroup/Texture/pull/938) ([garrettmoon](https://github.com/garrettmoon))
-- \[ASTextNode2\] Simplify compare-assign check & lock \_pointScaleFactors accessor \#trivial [\#934](https://github.com/TextureGroup/Texture/pull/934) ([appleguy](https://github.com/appleguy))
-- Create a new dealloc queue that is more efficient [\#931](https://github.com/TextureGroup/Texture/pull/931) ([Adlai-Holler](https://github.com/Adlai-Holler))
-- \[ASImageNode+AnimatedImage\] Fix early return when animatedImage is nil in setAnimatedImage \#trivial [\#925](https://github.com/TextureGroup/Texture/pull/925) ([flovouin](https://github.com/flovouin))
-- Remove assert. fix \#878 \#914 [\#924](https://github.com/TextureGroup/Texture/pull/924) ([wsdwsd0829](https://github.com/wsdwsd0829))
-- Always call out to delegate for experiments, whether enabled or not [\#923](https://github.com/TextureGroup/Texture/pull/923) ([Adlai-Holler](https://github.com/Adlai-Holler))
-- \[ASTextNode2\] Upgrade lock safety by protecting all ivars \(including rarely-changed ones\). [\#918](https://github.com/TextureGroup/Texture/pull/918) ([appleguy](https://github.com/appleguy))
-- \[ASCollectionNode/ASTableNode\] Fix a crash occurs while remeasuring cell nodes [\#917](https://github.com/TextureGroup/Texture/pull/917) ([nguyenhuy](https://github.com/nguyenhuy))
-- \[ASDisplayNode\] Improve thread-safety of didExitHierarchy \#trivial [\#916](https://github.com/TextureGroup/Texture/pull/916) ([nguyenhuy](https://github.com/nguyenhuy))
-- Prevent UITextView from updating contentOffset while deallocating [\#915](https://github.com/TextureGroup/Texture/pull/915) ([maicki](https://github.com/maicki))
-- Fix ASDKgram-Swift to avoid 'error parsing JSON within PhotoModel Init' [\#913](https://github.com/TextureGroup/Texture/pull/913) ([kenstir](https://github.com/kenstir))
-- \#trivial Add forgotten experiment into Schemas/configuration.json [\#912](https://github.com/TextureGroup/Texture/pull/912) ([garrettmoon](https://github.com/garrettmoon))
-- \#trivial Fix the C++ assertion [\#911](https://github.com/TextureGroup/Texture/pull/911) ([garrettmoon](https://github.com/garrettmoon))
-- Add 'iDiva - Beauty & Wedding tips' to Showcase [\#909](https://github.com/TextureGroup/Texture/pull/909) ([sudhanshutil](https://github.com/sudhanshutil))
-- Issue ASNetworkImageNode callbacks off main thread [\#908](https://github.com/TextureGroup/Texture/pull/908) ([garrettmoon](https://github.com/garrettmoon))
-- \[ASTextNode\] Fix a deadlock that could occur when enabling experimental ASTextNode2 via ASConfiguration [\#903](https://github.com/TextureGroup/Texture/pull/903) ([appleguy](https://github.com/appleguy))
-- \[Docs\] Add new lightning talk from Buffer \#trivial [\#902](https://github.com/TextureGroup/Texture/pull/902) ([ay8s](https://github.com/ay8s))
-- Request std=c++11 dialect again, and add warning [\#900](https://github.com/TextureGroup/Texture/pull/900) ([Adlai-Holler](https://github.com/Adlai-Holler))
-- \[ASTextNode\] Check variables before calling delegate method \#trivial [\#898](https://github.com/TextureGroup/Texture/pull/898) ([Jauzee](https://github.com/Jauzee))
-- ASDKFastImageNamed UIImage initializer nullability \#trivial [\#897](https://github.com/TextureGroup/Texture/pull/897) ([alexhillc](https://github.com/alexhillc))
-- \#trivial Fixes an issue where playback may not start [\#896](https://github.com/TextureGroup/Texture/pull/896) ([garrettmoon](https://github.com/garrettmoon))
-- Update configuration schema \#trivial [\#893](https://github.com/TextureGroup/Texture/pull/893) ([Adlai-Holler](https://github.com/Adlai-Holler))
-- replace ` with code in containers-overview.md [\#884](https://github.com/TextureGroup/Texture/pull/884) ([everettjf](https://github.com/everettjf))
-- \[Docs\] Fix typos in layout specs section \#trivial [\#883](https://github.com/TextureGroup/Texture/pull/883) ([morozkin](https://github.com/morozkin))
-- Match interfacestate update sequence to uikit [\#882](https://github.com/TextureGroup/Texture/pull/882) ([wsdwsd0829](https://github.com/wsdwsd0829))
-- Add experiment to skip creating UIViews altogether for constants [\#881](https://github.com/TextureGroup/Texture/pull/881) ([Adlai-Holler](https://github.com/Adlai-Holler))
-- Fix ASDISPLAYNODE\_ASSERTIONS\_ENABLED and ASDefaultPlaybackButton warnings \#trivial [\#880](https://github.com/TextureGroup/Texture/pull/880) ([maicki](https://github.com/maicki))
-- Fix macro definition for AS\_KDEBUG\_ENABLE producing warning \#trivial [\#879](https://github.com/TextureGroup/Texture/pull/879) ([andrewrohn](https://github.com/andrewrohn))
-- Fix pager node for interface coalescing [\#877](https://github.com/TextureGroup/Texture/pull/877) ([wsdwsd0829](https://github.com/wsdwsd0829))
-- Standardize Property Declaration Style in Core Classes [\#870](https://github.com/TextureGroup/Texture/pull/870) ([Adlai-Holler](https://github.com/Adlai-Holler))
-- \[NoCopyRendering\] In non-VM case, use calloc to get a zerod buffer \#trivial [\#869](https://github.com/TextureGroup/Texture/pull/869) ([Adlai-Holler](https://github.com/Adlai-Holler))
-- Check in Xcode 9.3 "workspace checks" file [\#868](https://github.com/TextureGroup/Texture/pull/868) ([Adlai-Holler](https://github.com/Adlai-Holler))
-- Remove Redundant Atomic Store from Recursive Unfair Lock in Recursive Case \#trivial [\#867](https://github.com/TextureGroup/Texture/pull/867) ([Adlai-Holler](https://github.com/Adlai-Holler))
-- Update Podspec [\#866](https://github.com/TextureGroup/Texture/pull/866) ([Adlai-Holler](https://github.com/Adlai-Holler))
-- \[Issue 838\] Update ASCeilPixelValue and ASRoundPixelValue [\#864](https://github.com/TextureGroup/Texture/pull/864) ([rcancro](https://github.com/rcancro))
-- Disable interface coalescing [\#862](https://github.com/TextureGroup/Texture/pull/862) ([wsdwsd0829](https://github.com/wsdwsd0829))
-- Introduce ASRecursiveUnfairLock and tests [\#858](https://github.com/TextureGroup/Texture/pull/858) ([Adlai-Holler](https://github.com/Adlai-Holler))
-- Make NSIndexSet+ASHelpers.h reference local \#trivial [\#857](https://github.com/TextureGroup/Texture/pull/857) ([dmaclach](https://github.com/dmaclach))
-- Make ASBatchContext lock-free \#trivial [\#854](https://github.com/TextureGroup/Texture/pull/854) ([Adlai-Holler](https://github.com/Adlai-Holler))
-- \[ASNetworkImageNode\] Replace NSUUID sentinel with integer \#trivial [\#852](https://github.com/TextureGroup/Texture/pull/852) ([Adlai-Holler](https://github.com/Adlai-Holler))
-- Make objects conform to NSLocking [\#851](https://github.com/TextureGroup/Texture/pull/851) ([Adlai-Holler](https://github.com/Adlai-Holler))
-- Make cache support animated image [\#850](https://github.com/TextureGroup/Texture/pull/850) ([wsdwsd0829](https://github.com/wsdwsd0829))
-- \[bugfix\] Align timing of interface coalescing and range update. \#trivial [\#847](https://github.com/TextureGroup/Texture/pull/847) ([wsdwsd0829](https://github.com/wsdwsd0829))
-- Update layout2-layout-element-properties.md [\#844](https://github.com/TextureGroup/Texture/pull/844) ([arielelkin](https://github.com/arielelkin))
-- Use NS\_RETURNS\_RETAINED macro to save time [\#843](https://github.com/TextureGroup/Texture/pull/843) ([Adlai-Holler](https://github.com/Adlai-Holler))
-- Handle nil backgroundColor in ASTextNode2 \#trivial [\#841](https://github.com/TextureGroup/Texture/pull/841) ([maicki](https://github.com/maicki))
-- Put back VM flag in ASCGImageBuffer [\#839](https://github.com/TextureGroup/Texture/pull/839) ([Adlai-Holler](https://github.com/Adlai-Holler))
-- Order items in XCode project navigator by name [\#835](https://github.com/TextureGroup/Texture/pull/835) ([OleksiyA](https://github.com/OleksiyA))
-- \[NoCopyRendering\] Use vm instead of malloc [\#833](https://github.com/TextureGroup/Texture/pull/833) ([Adlai-Holler](https://github.com/Adlai-Holler))
-- \[ASTextNode2\] Fix background color drawing [\#831](https://github.com/TextureGroup/Texture/pull/831) ([Adlai-Holler](https://github.com/Adlai-Holler))
-- Fix Text Node Thread Sanitizer Warning [\#830](https://github.com/TextureGroup/Texture/pull/830) ([Adlai-Holler](https://github.com/Adlai-Holler))
-- access view first before checking canBecome/Resign responder in becomeResponder methods [\#829](https://github.com/TextureGroup/Texture/pull/829) ([wsdwsd0829](https://github.com/wsdwsd0829))
-- \[\#trivial\] fixes rendered image quality on networked image nodes whic… [\#826](https://github.com/TextureGroup/Texture/pull/826) ([garrettmoon](https://github.com/garrettmoon))
-- \[ASTextNode\] Fix locking, add test for issue \#trivial [\#825](https://github.com/TextureGroup/Texture/pull/825) ([Adlai-Holler](https://github.com/Adlai-Holler))
-- \[\#trivial\] I don't think we need this extra locked method. [\#824](https://github.com/TextureGroup/Texture/pull/824) ([garrettmoon](https://github.com/garrettmoon))
-- \#trivial Hopefully made this a bit more readable. [\#823](https://github.com/TextureGroup/Texture/pull/823) ([garrettmoon](https://github.com/garrettmoon))
-- \[ASTextNode\] Avoid acquiring instance lock multiple times \#trivial [\#820](https://github.com/TextureGroup/Texture/pull/820) ([nguyenhuy](https://github.com/nguyenhuy))
-- \[Showcase\] Fix mensXP showcase and attach Vingle-Tech-Talk Medium [\#818](https://github.com/TextureGroup/Texture/pull/818) ([GeekTree0101](https://github.com/GeekTree0101))
-- \[ASDisplayNode\] Add unit tests for layout z-order changes \(with an open issue to fix\). [\#816](https://github.com/TextureGroup/Texture/pull/816) ([appleguy](https://github.com/appleguy))
-- \[ASDKGram Example\] image\_url has been changed from URL string to Array by 5… [\#813](https://github.com/TextureGroup/Texture/pull/813) ([kaar3k](https://github.com/kaar3k))
-- Replace pthread specifics with C11 thread-local variables [\#811](https://github.com/TextureGroup/Texture/pull/811) ([Adlai-Holler](https://github.com/Adlai-Holler))
-- Upgrade dangerfile [\#810](https://github.com/TextureGroup/Texture/pull/810) ([garrettmoon](https://github.com/garrettmoon))
--  \[ASDisplayNode\] Fix an issue that causes a node to sometimes return an outdated calculated size or size range [\#808](https://github.com/TextureGroup/Texture/pull/808) ([nguyenhuy](https://github.com/nguyenhuy))
-- Avoid triggering main thread assertions in collection/table dealloc \#trivial [\#803](https://github.com/TextureGroup/Texture/pull/803) ([Adlai-Holler](https://github.com/Adlai-Holler))
-- Update IGListKit dependency to allow for updated versions [\#802](https://github.com/TextureGroup/Texture/pull/802) ([johntmcintosh](https://github.com/johntmcintosh))
-- \[ASDisplayNode\] Consolidate main thread initialization and allow apps to invoke it manually instead of +load. [\#798](https://github.com/TextureGroup/Texture/pull/798) ([appleguy](https://github.com/appleguy))
-- \[ASWrapperCellNode\] Introduce a new class allowing more control of UIKit passthrough cells. [\#797](https://github.com/TextureGroup/Texture/pull/797) ([appleguy](https://github.com/appleguy))
-- Add missing scrollViewWillEndDragging passthrough delegate [\#796](https://github.com/TextureGroup/Texture/pull/796) ([xezero](https://github.com/xezero))
-- Fix ASTextNode2 is accessing backgroundColor off main while sizing / layout is happening [\#794](https://github.com/TextureGroup/Texture/pull/794) ([maicki](https://github.com/maicki))
-- \[ASTableNode & ASCollectionNode\] Keepalive reference for node if their view is necessarily alive \(has a superview\). [\#793](https://github.com/TextureGroup/Texture/pull/793) ([wsdwsd0829](https://github.com/wsdwsd0829))
-- \[ASDisplayNode layout\] Fix an issue that sometimes causes a node's pending layout to not be applied [\#792](https://github.com/TextureGroup/Texture/pull/792) ([nguyenhuy](https://github.com/nguyenhuy))
-- \[ASRangeController\] Fix stability of "minimum" rangeMode if the app has more than one layout before scrolling. [\#790](https://github.com/TextureGroup/Texture/pull/790) ([appleguy](https://github.com/appleguy))
-- Fix UIResponder handling with view backing ASDisplayNode [\#789](https://github.com/TextureGroup/Texture/pull/789) ([maicki](https://github.com/maicki))
-- New runloop queue to coalesce Interface state update calls. [\#788](https://github.com/TextureGroup/Texture/pull/788) ([wsdwsd0829](https://github.com/wsdwsd0829))
-- \[Graphics contexts\] Retain the reference color space \#trivial [\#784](https://github.com/TextureGroup/Texture/pull/784) ([Adlai-Holler](https://github.com/Adlai-Holler))
-- Get CatDealsCollectionView example running again \#trivial [\#783](https://github.com/TextureGroup/Texture/pull/783) ([maicki](https://github.com/maicki))
-- Improve nullable annotations for \_ASDisplayLayer and \_ASDisplayView \#trivial [\#780](https://github.com/TextureGroup/Texture/pull/780) ([maicki](https://github.com/maicki))
-- \[ASDisplayNode\] Force a layout pass on a visible node as soon as it enters preload state [\#779](https://github.com/TextureGroup/Texture/pull/779) ([nguyenhuy](https://github.com/nguyenhuy))
-- Improve ASNetworkImageNode delegate callout behavior [\#778](https://github.com/TextureGroup/Texture/pull/778) ([Adlai-Holler](https://github.com/Adlai-Holler))
-- Fix capturing self in the block while loading image in ASNetworkImageNode [\#777](https://github.com/TextureGroup/Texture/pull/777) ([morozkin](https://github.com/morozkin))
-- Fix synchronous state of node if +viewClass or +layerClass is overwritten \#trivial [\#776](https://github.com/TextureGroup/Texture/pull/776) ([maicki](https://github.com/maicki))
-- Add support for providing additional info to network image node delegate [\#775](https://github.com/TextureGroup/Texture/pull/775) ([Adlai-Holler](https://github.com/Adlai-Holler))
-- Expose asyncdisplaykit\_node in \_ASDisplayView same as in \_ASDisplayLayer \#trivial [\#773](https://github.com/TextureGroup/Texture/pull/773) ([maicki](https://github.com/maicki))
-- Improve no-copy rendering experiment, remove +load method [\#771](https://github.com/TextureGroup/Texture/pull/771) ([Adlai-Holler](https://github.com/Adlai-Holler))
-- Fix typos in layout2-layoutspec-types.md \#trivial [\#770](https://github.com/TextureGroup/Texture/pull/770) ([morozkin](https://github.com/morozkin))
-- Update PINCache [\#769](https://github.com/TextureGroup/Texture/pull/769) ([justinswart](https://github.com/justinswart))
-- Fix misprint \#trivial [\#768](https://github.com/TextureGroup/Texture/pull/768) ([Flatout73](https://github.com/Flatout73))
-- NoCopyRendering experiment: Fix possible memory leak if image node rendering is canceled \#trivial [\#765](https://github.com/TextureGroup/Texture/pull/765) ([Adlai-Holler](https://github.com/Adlai-Holler))
-- Node tint color [\#764](https://github.com/TextureGroup/Texture/pull/764) ([ShogunPhyched](https://github.com/ShogunPhyched))
-- Revert "Faster collection operations" [\#759](https://github.com/TextureGroup/Texture/pull/759) ([Adlai-Holler](https://github.com/Adlai-Holler))
-- \[ASPrimitiveTraitCollection\] Always treat preferredContentSize as a potential nil \#trivial [\#757](https://github.com/TextureGroup/Texture/pull/757) ([ypogribnyi](https://github.com/ypogribnyi))
-- Update subclassing.md [\#753](https://github.com/TextureGroup/Texture/pull/753) ([janechoi6](https://github.com/janechoi6))
-- \[ASDisplayNode\] Don't force a layout pass on a visible node that enters preload state [\#751](https://github.com/TextureGroup/Texture/pull/751) ([nguyenhuy](https://github.com/nguyenhuy))
-- Fix the dangerfile [\#750](https://github.com/TextureGroup/Texture/pull/750) ([Adlai-Holler](https://github.com/Adlai-Holler))
-- \[ASDisplayNode\] Always return the thread-safe cornerRadius property, even in slow CALayer rounding mode [\#749](https://github.com/TextureGroup/Texture/pull/749) ([nguyenhuy](https://github.com/nguyenhuy))
-- Faster collection operations [\#748](https://github.com/TextureGroup/Texture/pull/748) ([Adlai-Holler](https://github.com/Adlai-Holler))
-- Create a centralized configuration API [\#747](https://github.com/TextureGroup/Texture/pull/747) ([Adlai-Holler](https://github.com/Adlai-Holler))
-- Update dangerfile for 2018 \#trivial [\#746](https://github.com/TextureGroup/Texture/pull/746) ([Adlai-Holler](https://github.com/Adlai-Holler))
-- Raise deployment target to iOS 9 [\#743](https://github.com/TextureGroup/Texture/pull/743) ([Adlai-Holler](https://github.com/Adlai-Holler))
-- Add an experimental "no-copy" renderer [\#741](https://github.com/TextureGroup/Texture/pull/741) ([Adlai-Holler](https://github.com/Adlai-Holler))
-- Fixed: completeBatchFetching is called on a background thread [\#731](https://github.com/TextureGroup/Texture/pull/731) ([aaronr93](https://github.com/aaronr93))
-- \[tvOS\] Fixes errors when building against tvOS SDK [\#728](https://github.com/TextureGroup/Texture/pull/728) ([alexhillc](https://github.com/alexhillc))
-- \[ASCellNode\] focusStyle mapping [\#727](https://github.com/TextureGroup/Texture/pull/727) ([alexhillc](https://github.com/alexhillc))
-- \[ASDisplayNode\] Provide safeAreaInsets and layoutMargins bridge [\#685](https://github.com/TextureGroup/Texture/pull/685) ([ypogribnyi](https://github.com/ypogribnyi))
-- \[ASTraitCollection\] Add missing properties to ASTraitCollection [\#625](https://github.com/TextureGroup/Texture/pull/625) ([ypogribnyi](https://github.com/ypogribnyi))
-
-## [2.6](https://github.com/TextureGroup/Texture/tree/2.6) (2018-01-12)
-[Full Changelog](https://github.com/TextureGroup/Texture/compare/2.5.1...2.6)
-
-**Merged pull requests:**
-
-- Add MensXP to Showcase [\#739](https://github.com/TextureGroup/Texture/pull/739) ([sudhanshutil](https://github.com/sudhanshutil))
-- Enable collection node interactive moves [\#735](https://github.com/TextureGroup/Texture/pull/735) ([Adlai-Holler](https://github.com/Adlai-Holler))
-- Add Blendle to our showcase page [\#721](https://github.com/TextureGroup/Texture/pull/721) ([nguyenhuy](https://github.com/nguyenhuy))
-- \#trivial Fixes image nodes being stuck not being able to download image [\#720](https://github.com/TextureGroup/Texture/pull/720) ([garrettmoon](https://github.com/garrettmoon))
-- Reimplement ASRectTable using unordered\_map to avoid obscure NSMapTable exception. [\#719](https://github.com/TextureGroup/Texture/pull/719) ([appleguy](https://github.com/appleguy))
-- Add missing flags for ASCollectionDelegate [\#718](https://github.com/TextureGroup/Texture/pull/718) ([ilyailya](https://github.com/ilyailya))
-- Add support for toggling logs off and back on at runtime [\#714](https://github.com/TextureGroup/Texture/pull/714) ([johntmcintosh](https://github.com/johntmcintosh))
-- \[Update Showcase\] Update Showcase, add Vingle very community [\#711](https://github.com/TextureGroup/Texture/pull/711) ([GeekTree0101](https://github.com/GeekTree0101))
-- \[ASCollectionElement\] Check for nil elements on ASTableView as well. [\#710](https://github.com/TextureGroup/Texture/pull/710) ([cesteban](https://github.com/cesteban))
-- Ensure an ASM enabled node applies its pending layout when enters preload state [\#706](https://github.com/TextureGroup/Texture/pull/706) ([nguyenhuy](https://github.com/nguyenhuy))
-- The ASDKgram example doesn't compile. [\#700](https://github.com/TextureGroup/Texture/pull/700) ([onato](https://github.com/onato))
-- Revert Adds support for specifying a quality indexed array of URLs [\#699](https://github.com/TextureGroup/Texture/pull/699) ([garrettmoon](https://github.com/garrettmoon))
-- Correct Synchronous Concurrency Talk Link [\#698](https://github.com/TextureGroup/Texture/pull/698) ([ay8s](https://github.com/ay8s))
-- \[ASDisplayNode+Layout\] Ensure a pending layout is applied once [\#695](https://github.com/TextureGroup/Texture/pull/695) ([nguyenhuy](https://github.com/nguyenhuy))
-- Add missing \</div\> tags in Layout API Sizing docs [\#691](https://github.com/TextureGroup/Texture/pull/691) ([richardhenry](https://github.com/richardhenry))
-- Fix bug that breaks ASNodeController docs page [\#690](https://github.com/TextureGroup/Texture/pull/690) ([richardhenry](https://github.com/richardhenry))
-- Add a recent talk by @smeis at CocoaHeadsNL [\#687](https://github.com/TextureGroup/Texture/pull/687) ([nguyenhuy](https://github.com/nguyenhuy))
-- Update subtree-rasterization.md [\#679](https://github.com/TextureGroup/Texture/pull/679) ([WymzeeLabs](https://github.com/WymzeeLabs))
-- Update layer-backing.md [\#678](https://github.com/TextureGroup/Texture/pull/678) ([WymzeeLabs](https://github.com/WymzeeLabs))
-- \[iOS11\] Update project settings and fix errors [\#676](https://github.com/TextureGroup/Texture/pull/676) ([Eke](https://github.com/Eke))
-- Fix swift sample. [\#669](https://github.com/TextureGroup/Texture/pull/669) ([rwinzhang](https://github.com/rwinzhang))
-- Bugfix/fix yoga logging aligning api changes [\#668](https://github.com/TextureGroup/Texture/pull/668) ([wsdwsd0829](https://github.com/wsdwsd0829))
-- Make it possible to map between sections even if they're empty [\#660](https://github.com/TextureGroup/Texture/pull/660) ([Adlai-Holler](https://github.com/Adlai-Holler))
-- \[ASCornerLayoutSpec\] New layout spec class for declarative corner element layout. [\#657](https://github.com/TextureGroup/Texture/pull/657) ([huang-kun](https://github.com/huang-kun))
-- Update layout2-layoutspec-types.md [\#655](https://github.com/TextureGroup/Texture/pull/655) ([TBXark](https://github.com/TBXark))
-- \[Minor Breaking API\] Make deallocation queues more reliable [\#651](https://github.com/TextureGroup/Texture/pull/651) ([Adlai-Holler](https://github.com/Adlai-Holler))
-- Make the framework backwards compatible with Xcode 8 [\#650](https://github.com/TextureGroup/Texture/pull/650) ([Adlai-Holler](https://github.com/Adlai-Holler))
-- Disable this test for now, it's too flakey and no one has time to inv… [\#649](https://github.com/TextureGroup/Texture/pull/649) ([garrettmoon](https://github.com/garrettmoon))
-- \[Documentation\] Update Inversion Docs [\#647](https://github.com/TextureGroup/Texture/pull/647) ([GeekTree0101](https://github.com/GeekTree0101))
-- Have ASNetworkImageNode report whether images were cached or not [\#639](https://github.com/TextureGroup/Texture/pull/639) ([Adlai-Holler](https://github.com/Adlai-Holler))
-- Fix a layout deadlock caused by holding the lock and going up the tree. [\#638](https://github.com/TextureGroup/Texture/pull/638) ([garrettmoon](https://github.com/garrettmoon))
-- \[ASScrollNode\] Fix small bugs and add unit tests [\#637](https://github.com/TextureGroup/Texture/pull/637) ([nguyenhuy](https://github.com/nguyenhuy))
-- A couple performance tweaks for animated images \#trivial [\#634](https://github.com/TextureGroup/Texture/pull/634) ([garrettmoon](https://github.com/garrettmoon))
-- \[Documentation\] Update "Getting Started" page [\#633](https://github.com/TextureGroup/Texture/pull/633) ([nguyenhuy](https://github.com/nguyenhuy))
-- \[Tests\] Add test scrollToPageAtIndex ASPagerNode [\#629](https://github.com/TextureGroup/Texture/pull/629) ([remirobert](https://github.com/remirobert))
-- \[Tests\] Introducing tests for the ASTabBarController [\#628](https://github.com/TextureGroup/Texture/pull/628) ([remirobert](https://github.com/remirobert))
-- \[Tests\] Introducing tests for the ASNavigationController [\#627](https://github.com/TextureGroup/Texture/pull/627) ([remirobert](https://github.com/remirobert))
-- \[ASCollectionView\] Call -invalidateFlowLayoutDelegateMetrics when rotating. \#trivial [\#616](https://github.com/TextureGroup/Texture/pull/616) ([appleguy](https://github.com/appleguy))
-- Add unit tests for the layout engine [\#424](https://github.com/TextureGroup/Texture/pull/424) ([Adlai-Holler](https://github.com/Adlai-Holler))
-
-## [2.5.1](https://github.com/TextureGroup/Texture/tree/2.5.1) (2017-10-24)
-[Full Changelog](https://github.com/TextureGroup/Texture/compare/2.5...2.5.1)
-
-**Merged pull requests:**
-
-- Dispatch batch update to main \#trivial [\#626](https://github.com/TextureGroup/Texture/pull/626) ([garrettmoon](https://github.com/garrettmoon))
-- Check if we need to do a batch update [\#624](https://github.com/TextureGroup/Texture/pull/624) ([garrettmoon](https://github.com/garrettmoon))
-- Fix naming conflict with YYText \#trivial [\#623](https://github.com/TextureGroup/Texture/pull/623) ([maicki](https://github.com/maicki))
-- Fix "This block and function declaration is not a prototype" warning. [\#619](https://github.com/TextureGroup/Texture/pull/619) ([mbesnili](https://github.com/mbesnili))
-- update Pinterest CDN URL in example code [\#613](https://github.com/TextureGroup/Texture/pull/613) ([derekargueta](https://github.com/derekargueta))
-- \[ASTextKitComponents\] Make sure Main Thread Checker isn't triggered during background calculations \#trivial [\#612](https://github.com/TextureGroup/Texture/pull/612) ([nguyenhuy](https://github.com/nguyenhuy))
-- \[ASTextKitComponents\] Temporary components can be deallocated off main \#trivial [\#610](https://github.com/TextureGroup/Texture/pull/610) ([nguyenhuy](https://github.com/nguyenhuy))
-- Update layout2-layoutspec-types.md [\#608](https://github.com/TextureGroup/Texture/pull/608) ([olcayertas](https://github.com/olcayertas))
-- Don't set download results if no longer in preload range. [\#606](https://github.com/TextureGroup/Texture/pull/606) ([garrettmoon](https://github.com/garrettmoon))
-- Animated WebP support [\#605](https://github.com/TextureGroup/Texture/pull/605) ([garrettmoon](https://github.com/garrettmoon))
-- \[ASVideoNode\] Time observer fix [\#604](https://github.com/TextureGroup/Texture/pull/604) ([flovouin](https://github.com/flovouin))
-- Add assertion in dealloc that it is on main in ASTextKitComponents \#trivial [\#603](https://github.com/TextureGroup/Texture/pull/603) ([maicki](https://github.com/maicki))
-- ASTextKitComponents needs to be deallocated on main [\#598](https://github.com/TextureGroup/Texture/pull/598) ([maicki](https://github.com/maicki))
-- update faq toc links to match the generated html id \#trivial [\#597](https://github.com/TextureGroup/Texture/pull/597) ([romankl](https://github.com/romankl))
-- \[PINCache\] Set a default .byteLimit to reduce disk usage & startup time. [\#595](https://github.com/TextureGroup/Texture/pull/595) ([appleguy](https://github.com/appleguy))
-- Move clearing out of ASTextKitComponents property delegates into ASTextKitComponents dealloc \#trivial [\#591](https://github.com/TextureGroup/Texture/pull/591) ([maicki](https://github.com/maicki))
-- Clear ivar after scheduling for main thread deallocation \#trivial [\#590](https://github.com/TextureGroup/Texture/pull/590) ([maicki](https://github.com/maicki))
-- Use Nil for "no class" instead of nil \#trivial [\#589](https://github.com/TextureGroup/Texture/pull/589) ([Adlai-Holler](https://github.com/Adlai-Holler))
-- Update showcase.md [\#587](https://github.com/TextureGroup/Texture/pull/587) ([hannahmbanana](https://github.com/hannahmbanana))
-- Rolling back CI to known version for now [\#585](https://github.com/TextureGroup/Texture/pull/585) ([garrettmoon](https://github.com/garrettmoon))
-- Use node lock instead of separate one to avoid deadlocks. [\#582](https://github.com/TextureGroup/Texture/pull/582) ([garrettmoon](https://github.com/garrettmoon))
-- \[\_ASPendingState\] Make sure accessibility strings are not nil before allocating attributed strings for them \#trivial [\#581](https://github.com/TextureGroup/Texture/pull/581) ([nguyenhuy](https://github.com/nguyenhuy))
-- \[ASTextNode\] Implement an example comparing ASTextNode 1 & 2 behavior. [\#570](https://github.com/TextureGroup/Texture/pull/570) ([wsdwsd0829](https://github.com/wsdwsd0829))
-- \[ASCollectionView\] Fix index space translation of Flow Layout Delegate methods. [\#467](https://github.com/TextureGroup/Texture/pull/467) ([appleguy](https://github.com/appleguy))
-- \[ASCollectionView\] Improve performance and behavior of rotation / bounds changes. [\#431](https://github.com/TextureGroup/Texture/pull/431) ([appleguy](https://github.com/appleguy))
-
-## [2.5](https://github.com/TextureGroup/Texture/tree/2.5) (2017-09-26)
-[Full Changelog](https://github.com/TextureGroup/Texture/compare/v2.5...2.5)
-
-**Merged pull requests:**
-
-- Fix crashes caused by failing to unlock or destroy a static mutex while the app is being terminated [\#577](https://github.com/TextureGroup/Texture/pull/577) ([nguyenhuy](https://github.com/nguyenhuy))
-- Update yoga version [\#569](https://github.com/TextureGroup/Texture/pull/569) ([wsdwsd0829](https://github.com/wsdwsd0829))
-- \[ASDKgram Example\] fix crash on startup [\#566](https://github.com/TextureGroup/Texture/pull/566) ([hannahmbanana](https://github.com/hannahmbanana))
-- Added attributed versions of accessibilityLabel, accessibilityHint, accessibilityValue [\#554](https://github.com/TextureGroup/Texture/pull/554) ([fruitcoder](https://github.com/fruitcoder))
-- \[Yoga\] Add insertYogaNode:atIndex: method. Improve handling of relayouts. [\#469](https://github.com/TextureGroup/Texture/pull/469) ([appleguy](https://github.com/appleguy))
-- \[ASCornerRounding\] Introduce .cornerRoundingType: CALayer, Precomposited, or Clip Corners. [\#465](https://github.com/TextureGroup/Texture/pull/465) ([appleguy](https://github.com/appleguy))
-- \[ASElementMap\] Fix indexPath's section or item is actually negative \#trivial [\#457](https://github.com/TextureGroup/Texture/pull/457) ([Anyewuya](https://github.com/Anyewuya))
-
-## [v2.5](https://github.com/TextureGroup/Texture/tree/v2.5) (2017-09-14)
-[Full Changelog](https://github.com/TextureGroup/Texture/compare/2.4...v2.5)
-
-**Merged pull requests:**
-
-- Fix -\[ASPagerNode view\] triggering pendingState + nodeLoaded assert \#trivial [\#564](https://github.com/TextureGroup/Texture/pull/564) ([samhsiung](https://github.com/samhsiung))
-- \[ASCollectionLayout\] Exclude content inset on scrollable directions from viewport size [\#562](https://github.com/TextureGroup/Texture/pull/562) ([nguyenhuy](https://github.com/nguyenhuy))
-- \[ASImageNode\] Always dealloc images in a background queue [\#561](https://github.com/TextureGroup/Texture/pull/561) ([nguyenhuy](https://github.com/nguyenhuy))
-- \[ASCollectionNode\]\[ASTableNode\] Add content inset bridging property [\#560](https://github.com/TextureGroup/Texture/pull/560) ([nguyenhuy](https://github.com/nguyenhuy))
-- Mark ASRunLoopQueue as drained if it contains only NULLs [\#558](https://github.com/TextureGroup/Texture/pull/558) ([cesteban](https://github.com/cesteban))
-- Adds support for specifying a quality indexed array of URLs [\#557](https://github.com/TextureGroup/Texture/pull/557) ([garrettmoon](https://github.com/garrettmoon))
-- Make ASWeakMapEntry Value Atomic [\#555](https://github.com/TextureGroup/Texture/pull/555) ([Adlai-Holler](https://github.com/Adlai-Holler))
-- \[ASDisplayNode\] Deprecate -displayWillStart in favor of -displayWillStartAsynchronously: [\#536](https://github.com/TextureGroup/Texture/pull/536) ([nguyenhuy](https://github.com/nguyenhuy))
-- SEP-491 prerequisite: add textViewShouldBeginEditing: to ASEditableTextNodeDelegate [\#535](https://github.com/TextureGroup/Texture/pull/535) ([yans](https://github.com/yans))
-- \[Gallery layout\] Include the caller in properties providing methods [\#533](https://github.com/TextureGroup/Texture/pull/533) ([nguyenhuy](https://github.com/nguyenhuy))
-- \[ASDisplayNode\] Notify rasterized subnodes that render pass has completed [\#532](https://github.com/TextureGroup/Texture/pull/532) ([smeis](https://github.com/smeis))
-- \[Cleanup\] Remove deprecated APIs [\#529](https://github.com/TextureGroup/Texture/pull/529) ([nguyenhuy](https://github.com/nguyenhuy))
-- Add a function to disable all logging at runtime [\#528](https://github.com/TextureGroup/Texture/pull/528) ([Adlai-Holler](https://github.com/Adlai-Holler))
-- \[Table and collection views\] Consider content inset when calculating \(default\) element size range [\#525](https://github.com/TextureGroup/Texture/pull/525) ([nguyenhuy](https://github.com/nguyenhuy))
-- \[ASCollectionNode\] Add -isProcessingUpdates and -onDidFinishProcessingUpdates: APIs. [\#522](https://github.com/TextureGroup/Texture/pull/522) ([appleguy](https://github.com/appleguy))
-- ASImageNode+AnimatedImage playbackReadyCallback retain cycle [\#520](https://github.com/TextureGroup/Texture/pull/520) ([plarson](https://github.com/plarson))
-- \[CI\] BuildKite to ignore all markdown files [\#517](https://github.com/TextureGroup/Texture/pull/517) ([nguyenhuy](https://github.com/nguyenhuy))
-- ASCollectionLayout improvements [\#513](https://github.com/TextureGroup/Texture/pull/513) ([nguyenhuy](https://github.com/nguyenhuy))
-- Update changelog and podspec for 2.4 [\#512](https://github.com/TextureGroup/Texture/pull/512) ([Adlai-Holler](https://github.com/Adlai-Holler))
-- ASCollectionLayout to return a zero content size if its state is unavailable [\#509](https://github.com/TextureGroup/Texture/pull/509) ([nguyenhuy](https://github.com/nguyenhuy))
-- Update corner-rounding.md [\#482](https://github.com/TextureGroup/Texture/pull/482) ([oferRounds](https://github.com/oferRounds))
-- \[Accessibility\] Add .isAccessibilityContainer property, allowing automatic aggregation of children's a11y labels. [\#468](https://github.com/TextureGroup/Texture/pull/468) ([appleguy](https://github.com/appleguy))
-- \[ASImageNode\] Enable .clipsToBounds by default \(fix .cornerRadius, GIFs overflow\). [\#466](https://github.com/TextureGroup/Texture/pull/466) ([appleguy](https://github.com/appleguy))
-
-## [2.4](https://github.com/TextureGroup/Texture/tree/2.4) (2017-08-15)
-[Full Changelog](https://github.com/TextureGroup/Texture/compare/2.3.4...2.4)
-
-**Merged pull requests:**
-
-- Avoid re-entrant call to self.view when applying initial pending state [\#510](https://github.com/TextureGroup/Texture/pull/510) ([Adlai-Holler](https://github.com/Adlai-Holler))
-- \[examples/ASCollectionView\] Register supplementary kinds \#trivial [\#508](https://github.com/TextureGroup/Texture/pull/508) ([nguyenhuy](https://github.com/nguyenhuy))
-- Rename the field again to nodeModel [\#504](https://github.com/TextureGroup/Texture/pull/504) ([Adlai-Holler](https://github.com/Adlai-Holler))
-- Rename -\[ASCellNode viewModel\] to -\[ASCellNode nodeViewModel\] to avoid collisions [\#499](https://github.com/TextureGroup/Texture/pull/499) ([Adlai-Holler](https://github.com/Adlai-Holler))
-- Fixed typo `UIKIt` [\#497](https://github.com/TextureGroup/Texture/pull/497) ([nixzhu](https://github.com/nixzhu))
-- Improvements in ASCollectionGalleryLayoutDelegate [\#496](https://github.com/TextureGroup/Texture/pull/496) ([nguyenhuy](https://github.com/nguyenhuy))
-- \[Showcase\] Update showcase - add blog post link to ClassDojo icon \#trivial [\#493](https://github.com/TextureGroup/Texture/pull/493) ([Kaspik](https://github.com/Kaspik))
-- \[ASCoreAnimationExtras\] Update documentation for resizbale images \#trivial [\#492](https://github.com/TextureGroup/Texture/pull/492) ([Kaspik](https://github.com/Kaspik))
-- \[ASStackLayoutSpec\] Fix interitem spacing not being reset on new lines and add snapshot tests  \#trivial [\#491](https://github.com/TextureGroup/Texture/pull/491) ([nguyenhuy](https://github.com/nguyenhuy))
-- \[Layout Transition\] Avoid calling didComplete method if pending layout transition is nil [\#490](https://github.com/TextureGroup/Texture/pull/490) ([nguyenhuy](https://github.com/nguyenhuy))
-- \[LayoutTransition\] Call \_locked\_constrainedSizeForLayoutPass with the lock actually held \#trivial [\#488](https://github.com/TextureGroup/Texture/pull/488) ([nguyenhuy](https://github.com/nguyenhuy))
-- iOS 11 UITableView automatic height estimation fix [\#485](https://github.com/TextureGroup/Texture/pull/485) ([christianselig](https://github.com/christianselig))
-- Update scroll-node.md [\#484](https://github.com/TextureGroup/Texture/pull/484) ([oferRounds](https://github.com/oferRounds))
-- Update adoption-guide-2-0-beta1.md [\#483](https://github.com/TextureGroup/Texture/pull/483) ([oferRounds](https://github.com/oferRounds))
-- Update subclassing.md [\#479](https://github.com/TextureGroup/Texture/pull/479) ([oferRounds](https://github.com/oferRounds))
-- Invalidate layouts more aggressively when transitioning with animation [\#476](https://github.com/TextureGroup/Texture/pull/476) ([Adlai-Holler](https://github.com/Adlai-Holler))
-- Update image-modification-block.md [\#474](https://github.com/TextureGroup/Texture/pull/474) ([oferRounds](https://github.com/oferRounds))
-- \[ASStackLayoutSpec\] Flex wrap fix and lineSpacing property [\#472](https://github.com/TextureGroup/Texture/pull/472) ([flovouin](https://github.com/flovouin))
-- \[ASNodeController\] Add -nodeDidLayout callback. Allow switching retain behavior at runtime. [\#470](https://github.com/TextureGroup/Texture/pull/470) ([appleguy](https://github.com/appleguy))
-- \[Layout transition\] Invalidate calculated layout if transitioning using the same size range [\#464](https://github.com/TextureGroup/Texture/pull/464) ([nguyenhuy](https://github.com/nguyenhuy))
-- \[ASTableNode\]\[ASCollectionNode\] Add content offset bridging property [\#460](https://github.com/TextureGroup/Texture/pull/460) ([nguyenhuy](https://github.com/nguyenhuy))
-- \[ASDisplayNode\] Fix infinite layout loop [\#455](https://github.com/TextureGroup/Texture/pull/455) ([nguyenhuy](https://github.com/nguyenhuy))
-- Add ASPagerNode+Beta to umbrella header \#trivial [\#454](https://github.com/TextureGroup/Texture/pull/454) ([nguyenhuy](https://github.com/nguyenhuy))
-- \[ASPagerNode\] Remove unused flow layout reference \#trivial [\#452](https://github.com/TextureGroup/Texture/pull/452) ([nguyenhuy](https://github.com/nguyenhuy))
-- \[ASCollectionLayout\] Add ASCollectionGalleryLayoutSizeProviding [\#451](https://github.com/TextureGroup/Texture/pull/451) ([nguyenhuy](https://github.com/nguyenhuy))
-- fix SIMULATE\_WEB\_RESPONSE not imported \#449 [\#450](https://github.com/TextureGroup/Texture/pull/450) ([wsdwsd0829](https://github.com/wsdwsd0829))
-- \[ASDataController \] Merge willUpdateWithChangeSet and didUpdateWithChangeSet delegate methods \#trivial [\#445](https://github.com/TextureGroup/Texture/pull/445) ([nguyenhuy](https://github.com/nguyenhuy))
-- \[ASDataController\] Clean up [\#443](https://github.com/TextureGroup/Texture/pull/443) ([nguyenhuy](https://github.com/nguyenhuy))
-- \[ASDataController\] Avoid asking for size ranges of soon-to-be-delete elements during relayouts [\#442](https://github.com/TextureGroup/Texture/pull/442) ([nguyenhuy](https://github.com/nguyenhuy))
-- \[ASCollectionView\] Add delegate bridging and index space translation for missing UICollectionViewLayout properties. [\#440](https://github.com/TextureGroup/Texture/pull/440) ([appleguy](https://github.com/appleguy))
-- \[ASDisplayNode\] Fix some gaps in the bridging of new contents\* properties. [\#435](https://github.com/TextureGroup/Texture/pull/435) ([appleguy](https://github.com/appleguy))
-- \[ASDisplayNode\] Allow setting stretchable contents on nodes; add bridged properties. \#trivial [\#429](https://github.com/TextureGroup/Texture/pull/429) ([appleguy](https://github.com/appleguy))
-- Use a sentinel NSUInteger for node layout data \#trivial [\#428](https://github.com/TextureGroup/Texture/pull/428) ([Adlai-Holler](https://github.com/Adlai-Holler))
-- Workaround clang4.0 \<stdatomic.h\> initialization \#trivial [\#426](https://github.com/TextureGroup/Texture/pull/426) ([bkase](https://github.com/bkase))
-- Add missing import in ASDisplayNode+AsyncDisplay \#trivial [\#423](https://github.com/TextureGroup/Texture/pull/423) ([nguyenhuy](https://github.com/nguyenhuy))
-- \[ASCollectionElement\] Add checks for nil element, prior to other PRs landing. [\#421](https://github.com/TextureGroup/Texture/pull/421) ([appleguy](https://github.com/appleguy))
-- \[ASDataController\] Apply new visible map inside batch updates block [\#420](https://github.com/TextureGroup/Texture/pull/420) ([nguyenhuy](https://github.com/nguyenhuy))
-- \[ASVideoPlayerNode\] Check that the video player's delegate implements the didTapFullScreenButtonNode method before calling it \#trivial [\#418](https://github.com/TextureGroup/Texture/pull/418) ([tnev](https://github.com/tnev))
-- \[ASDataController\] Fix a crash in table view caused by executing an empty change set during layoutSubviews [\#416](https://github.com/TextureGroup/Texture/pull/416) ([nguyenhuy](https://github.com/nguyenhuy))
-- \[ASDisplayNode+Layout\] In layoutThatFits:, check and use \_pending layout if valid. [\#413](https://github.com/TextureGroup/Texture/pull/413) ([appleguy](https://github.com/appleguy))
-- Integrate Weaver into ASDKGram [\#412](https://github.com/TextureGroup/Texture/pull/412) ([nguyenhuy](https://github.com/nguyenhuy))
-- \[ASDisplayNode\] -didEnterPreloadState does not need to call -layoutIfNeeded \#trivial [\#411](https://github.com/TextureGroup/Texture/pull/411) ([appleguy](https://github.com/appleguy))
-- \[ASTextNode2\] Provide compiler flag to enable ASTextNode2 for all usages. [\#410](https://github.com/TextureGroup/Texture/pull/410) ([appleguy](https://github.com/appleguy))
-- \[Yoga\] Refine the handling of measurement functions when Yoga is used. [\#408](https://github.com/TextureGroup/Texture/pull/408) ([appleguy](https://github.com/appleguy))
-- \[ASCollectionView\] Small improvements [\#407](https://github.com/TextureGroup/Texture/pull/407) ([nguyenhuy](https://github.com/nguyenhuy))
-- \[Documentation\] Improve description of synchronous concurrency with screenshot and video link. [\#406](https://github.com/TextureGroup/Texture/pull/406) ([appleguy](https://github.com/appleguy))
-- Introduce ASIntegerMap, improve our changeset handling \#trivial [\#405](https://github.com/TextureGroup/Texture/pull/405) ([Adlai-Holler](https://github.com/Adlai-Holler))
-- Fix issue where supplementary elements don't track section changes [\#404](https://github.com/TextureGroup/Texture/pull/404) ([Adlai-Holler](https://github.com/Adlai-Holler))
-- Overhaul our logging, add activity tracing support. [\#399](https://github.com/TextureGroup/Texture/pull/399) ([Adlai-Holler](https://github.com/Adlai-Holler))
-- \[ASTextNode2\] Add initial implementation for link handling. [\#396](https://github.com/TextureGroup/Texture/pull/396) ([appleguy](https://github.com/appleguy))
-- Introduce ASCollectionGalleryLayoutDelegate [\#76](https://github.com/TextureGroup/Texture/pull/76) ([nguyenhuy](https://github.com/nguyenhuy))
-
-## [2.3.4](https://github.com/TextureGroup/Texture/tree/2.3.4) (2017-06-30)
-[Full Changelog](https://github.com/TextureGroup/Texture/compare/2.3.3...2.3.4)
-
-**Merged pull requests:**
-
-- Update to the latest betas of PINRemoteImage and PINCache [\#403](https://github.com/TextureGroup/Texture/pull/403) ([garrettmoon](https://github.com/garrettmoon))
-- A bit of minor cleanup \#trivial [\#402](https://github.com/TextureGroup/Texture/pull/402) ([Adlai-Holler](https://github.com/Adlai-Holler))
-- \[ASLayout\] Revisit the flattening algorithm [\#395](https://github.com/TextureGroup/Texture/pull/395) ([nguyenhuy](https://github.com/nguyenhuy))
-- \[ASLayout\] If a layout has no sublayouts, don't bother initializing its rect table [\#394](https://github.com/TextureGroup/Texture/pull/394) ([nguyenhuy](https://github.com/nguyenhuy))
-- \[ASLayout\] Fix documentation of retainSublayoutLayoutElements \#trivial [\#393](https://github.com/TextureGroup/Texture/pull/393) ([nguyenhuy](https://github.com/nguyenhuy))
-- Fix compiling ASDimension if Yoga enabled \#trivial [\#389](https://github.com/TextureGroup/Texture/pull/389) ([maicki](https://github.com/maicki))
-- comments to reflect code \#trivial [\#388](https://github.com/TextureGroup/Texture/pull/388) ([benjamin-chang](https://github.com/benjamin-chang))
-- \[ASCellNode\] Remove unnecessary frame setting \#trivial [\#387](https://github.com/TextureGroup/Texture/pull/387) ([nguyenhuy](https://github.com/nguyenhuy))
-- Horrible spelling mistake \#trivial [\#384](https://github.com/TextureGroup/Texture/pull/384) ([nguyenhuy](https://github.com/nguyenhuy))
-- Fix for Video Table Example Building [\#383](https://github.com/TextureGroup/Texture/pull/383) ([ay8s](https://github.com/ay8s))
-- ASDimensionMake to be more lenient \#trivial [\#382](https://github.com/TextureGroup/Texture/pull/382) ([nguyenhuy](https://github.com/nguyenhuy))
-- Gate orphaned node detector behind YOGA flag \#trivial [\#380](https://github.com/TextureGroup/Texture/pull/380) ([nguyenhuy](https://github.com/nguyenhuy))
-- \[Event Log\] Log ASM flag when modify subnodes \#trivial [\#379](https://github.com/TextureGroup/Texture/pull/379) ([nguyenhuy](https://github.com/nguyenhuy))
-- Add new workspaces for tests for different integrations \#trivial [\#377](https://github.com/TextureGroup/Texture/pull/377) ([Adlai-Holler](https://github.com/Adlai-Holler))
-- Fix imageModificationBlock doc \#trivial [\#376](https://github.com/TextureGroup/Texture/pull/376) ([maicki](https://github.com/maicki))
-- Fix double-load issue with ASCollectionNode [\#372](https://github.com/TextureGroup/Texture/pull/372) ([Adlai-Holler](https://github.com/Adlai-Holler))
-- FIXED Typo in Layout Transition Documentation [\#371](https://github.com/TextureGroup/Texture/pull/371) ([martinjkelly](https://github.com/martinjkelly))
-- \[Yoga\] Delete YOGA\_TREE\_CONTIGOUS gating and permanently enable. \#trivial [\#370](https://github.com/TextureGroup/Texture/pull/370) ([appleguy](https://github.com/appleguy))
-- \[Yoga\] Minimize number of nodes that have MeasureFunc set on them. [\#369](https://github.com/TextureGroup/Texture/pull/369) ([appleguy](https://github.com/appleguy))
-- Improve System Trace Implementation \#trivial [\#368](https://github.com/TextureGroup/Texture/pull/368) ([Adlai-Holler](https://github.com/Adlai-Holler))
-- Updates ASDKGram to use IGListKit 3.0.0 [\#367](https://github.com/TextureGroup/Texture/pull/367) ([ay8s](https://github.com/ay8s))
-- Update link to AsyncDisplayKit 2.0 Launch Talk [\#363](https://github.com/TextureGroup/Texture/pull/363) ([appleguy](https://github.com/appleguy))
-- \[ASTableView\] Use ASTableView tableNode property instead of calling ASViewToDisplayNode \#trivial [\#361](https://github.com/TextureGroup/Texture/pull/361) ([maicki](https://github.com/maicki))
-- Add section-object support to new tests, improve test confinement. \#trivial [\#360](https://github.com/TextureGroup/Texture/pull/360) ([Adlai-Holler](https://github.com/Adlai-Holler))
-- \[Docs\] Update 'Corner Rounding' document for Texture 2 [\#359](https://github.com/TextureGroup/Texture/pull/359) ([ArchimboldiMao](https://github.com/ArchimboldiMao))
-- Add support for keeping letting cell nodes update to new view models when reloaded. \#trivial [\#357](https://github.com/TextureGroup/Texture/pull/357) ([Adlai-Holler](https://github.com/Adlai-Holler))
-- Add first-pass view model support to collection node. \#trivial [\#356](https://github.com/TextureGroup/Texture/pull/356) ([Adlai-Holler](https://github.com/Adlai-Holler))
-- \[ASTraitCollection\] Convert ASPrimitiveTraitCollection from lock to atomic. [\#355](https://github.com/TextureGroup/Texture/pull/355) ([appleguy](https://github.com/appleguy))
-- Improve collection node testing, reveal double-load issue. \#trivial [\#352](https://github.com/TextureGroup/Texture/pull/352) ([Adlai-Holler](https://github.com/Adlai-Holler))
-- Fix title in changelog [\#350](https://github.com/TextureGroup/Texture/pull/350) ([levi](https://github.com/levi))
-- Add a Flag to Disable Main Thread Assertions \#trivial [\#348](https://github.com/TextureGroup/Texture/pull/348) ([Adlai-Holler](https://github.com/Adlai-Holler))
-- Migrate to Latest OCMock, Demonstrate Improved Unit Testing [\#347](https://github.com/TextureGroup/Texture/pull/347) ([Adlai-Holler](https://github.com/Adlai-Holler))
-- Upgrade ASLayoutElementContext to an Object \#trivial [\#344](https://github.com/TextureGroup/Texture/pull/344) ([Adlai-Holler](https://github.com/Adlai-Holler))
-- \[Yoga\] Rewrite YOGA\_TREE\_CONTIGUOUS mode with improved behavior and cleaner integration [\#343](https://github.com/TextureGroup/Texture/pull/343) ([appleguy](https://github.com/appleguy))
-- Fix internal Linter warnings \#trivial [\#340](https://github.com/TextureGroup/Texture/pull/340) ([maicki](https://github.com/maicki))
-- Small changes required by the coming layout debugger [\#337](https://github.com/TextureGroup/Texture/pull/337) ([nguyenhuy](https://github.com/nguyenhuy))
-- \[ASDataController\] Add event logging for transaction queue flush duration \#trivial [\#334](https://github.com/TextureGroup/Texture/pull/334) ([hannahmbanana](https://github.com/hannahmbanana))
-- \[ASCollectionView\] synchronous mode [\#332](https://github.com/TextureGroup/Texture/pull/332) ([hannahmbanana](https://github.com/hannahmbanana))
-- \[Performance\] Convert ASLayoutElementSize to atomic \#trivial [\#331](https://github.com/TextureGroup/Texture/pull/331) ([hannahmbanana](https://github.com/hannahmbanana))
-- \[Yoga\] Refer to proper path name and use module import [\#306](https://github.com/TextureGroup/Texture/pull/306) ([weibel](https://github.com/weibel))
-- \[ASImageNode\] Add documentation for image effects \#trivial [\#263](https://github.com/TextureGroup/Texture/pull/263) ([maicki](https://github.com/maicki))
-
-## [2.3.3](https://github.com/TextureGroup/Texture/tree/2.3.3) (2017-06-06)
-[Full Changelog](https://github.com/TextureGroup/Texture/compare/2.3.2...2.3.3)
-
-**Merged pull requests:**
-
-- Updating to 2.3.3 \#trivial [\#338](https://github.com/TextureGroup/Texture/pull/338) ([garrettmoon](https://github.com/garrettmoon))
-- \[ASDisplayNode+Layout\] Add check for orphaned nodes after layout transition to clean up. [\#336](https://github.com/TextureGroup/Texture/pull/336) ([appleguy](https://github.com/appleguy))
-- Update PINRemoteImage [\#328](https://github.com/TextureGroup/Texture/pull/328) ([garrettmoon](https://github.com/garrettmoon))
-- Fix typo \#trivial [\#327](https://github.com/TextureGroup/Texture/pull/327) ([vitalybaev](https://github.com/vitalybaev))
-- Fixes an issue with GIFs that would always be covered by their placeh… [\#326](https://github.com/TextureGroup/Texture/pull/326) ([garrettmoon](https://github.com/garrettmoon))
-- Replace NSMutableSet with NSHashTable when Appropriate \#trivial [\#321](https://github.com/TextureGroup/Texture/pull/321) ([Adlai-Holler](https://github.com/Adlai-Holler))
-- \[Cleanup\] Small fixes to improve conformance for strict compiler settings \#trivial [\#320](https://github.com/TextureGroup/Texture/pull/320) ([appleguy](https://github.com/appleguy))
-- Rejigger Cell Visibility Tracking [\#317](https://github.com/TextureGroup/Texture/pull/317) ([Adlai-Holler](https://github.com/Adlai-Holler))
-- Clean Up ASAsyncTransaction \#trivial [\#316](https://github.com/TextureGroup/Texture/pull/316) ([Adlai-Holler](https://github.com/Adlai-Holler))
-- Clean Up ASDisplayLayer \#trivial [\#315](https://github.com/TextureGroup/Texture/pull/315) ([Adlai-Holler](https://github.com/Adlai-Holler))
-- \[ASDisplayNode\] Revise assertion to log until Issue \#145 is addressed. \#trivial [\#313](https://github.com/TextureGroup/Texture/pull/313) ([appleguy](https://github.com/appleguy))
-- \[Docs\] Fixed typo in carthage project name \#trivial [\#310](https://github.com/TextureGroup/Texture/pull/310) ([george-gw](https://github.com/george-gw))
-- Fix non layout [\#309](https://github.com/TextureGroup/Texture/pull/309) ([garrettmoon](https://github.com/garrettmoon))
-- Catch Invalid Layer Bounds in a Nonfatal Assertion \#trivial [\#308](https://github.com/TextureGroup/Texture/pull/308) ([Adlai-Holler](https://github.com/Adlai-Holler))
-- \[ASCollectionNode\] Fix missing properties and layoutInspector \#trivial [\#305](https://github.com/TextureGroup/Texture/pull/305) ([flovouin](https://github.com/flovouin))
-- \[Examples\] Fixed crash on SocialAppLayout-Inverted + behaviour comments [\#304](https://github.com/TextureGroup/Texture/pull/304) ([dimazen](https://github.com/dimazen))
-- IGListKit related headers need to be in the module all time now \#trivial [\#300](https://github.com/TextureGroup/Texture/pull/300) ([maicki](https://github.com/maicki))
-- \[ASDisplayNode\] Remove assertion in calculateSizeThatFits: and log an event \#trivial [\#299](https://github.com/TextureGroup/Texture/pull/299) ([maicki](https://github.com/maicki))
-- ASBatchFetching to not round scroll velocity \#trivial [\#294](https://github.com/TextureGroup/Texture/pull/294) ([nguyenhuy](https://github.com/nguyenhuy))
-- \[ASVideoNodeDelegate\] fix for \#291 crash  [\#292](https://github.com/TextureGroup/Texture/pull/292) ([SergeyPetrachkov](https://github.com/SergeyPetrachkov))
-- Fix Alignment of Hashed Structs [\#287](https://github.com/TextureGroup/Texture/pull/287) ([Adlai-Holler](https://github.com/Adlai-Holler))
-- \[IGListKit\] Add IGListKit headers to public section of Xcode project [\#286](https://github.com/TextureGroup/Texture/pull/286) ([maicki](https://github.com/maicki))
-- Only call -layout and -layoutDidFinish if the node is already loaded [\#285](https://github.com/TextureGroup/Texture/pull/285) ([nguyenhuy](https://github.com/nguyenhuy))
-- \[Batch Fetching\] Add ASBatchFetchingDelegate [\#281](https://github.com/TextureGroup/Texture/pull/281) ([nguyenhuy](https://github.com/nguyenhuy))
-- Ignore Relayout Requests for Deleted Cell Nodes [\#279](https://github.com/TextureGroup/Texture/pull/279) ([Adlai-Holler](https://github.com/Adlai-Holler))
-- Remove Unused Node Code \#trivial [\#278](https://github.com/TextureGroup/Texture/pull/278) ([Adlai-Holler](https://github.com/Adlai-Holler))
-- Fix Documentation Warnings \#trivial [\#276](https://github.com/TextureGroup/Texture/pull/276) ([Adlai-Holler](https://github.com/Adlai-Holler))
-- \[Examples\] Fix LayoutSpecExamples and LayoutSpecExamples-Swift: image URLs were still pointing to asyncdisplaykit.org [\#275](https://github.com/TextureGroup/Texture/pull/275) ([cesteban](https://github.com/cesteban))
-- \[Layout\] Extract layout implementation code into it's own subcategories [\#272](https://github.com/TextureGroup/Texture/pull/272) ([maicki](https://github.com/maicki))
-- Fix Release Builds \#trivial [\#271](https://github.com/TextureGroup/Texture/pull/271) ([Adlai-Holler](https://github.com/Adlai-Holler))
-- \[Yoga\] Implement ASYogaLayoutSpec, a simplified integration strategy for Yoga. [\#270](https://github.com/TextureGroup/Texture/pull/270) ([appleguy](https://github.com/appleguy))
-- Simplify Layout Transition State \#trivial [\#269](https://github.com/TextureGroup/Texture/pull/269) ([Adlai-Holler](https://github.com/Adlai-Holler))
-- Store ASLayoutElementContext in Thread-Local Storage \#trivial [\#268](https://github.com/TextureGroup/Texture/pull/268) ([Adlai-Holler](https://github.com/Adlai-Holler))
-- \[Examples\] Fix a couple of examples due to API changes recently \#trivial [\#267](https://github.com/TextureGroup/Texture/pull/267) ([maicki](https://github.com/maicki))
-- Fix Collection Item Index Path Conversion [\#262](https://github.com/TextureGroup/Texture/pull/262) ([Adlai-Holler](https://github.com/Adlai-Holler))
-- added error reporting callback to ASVideoNode [\#260](https://github.com/TextureGroup/Texture/pull/260) ([SergeyPetrachkov](https://github.com/SergeyPetrachkov))
-- Add Experimental Text Node Implementation [\#259](https://github.com/TextureGroup/Texture/pull/259) ([Adlai-Holler](https://github.com/Adlai-Holler))
-- Add missing import and define in ASLog \#trivial [\#257](https://github.com/TextureGroup/Texture/pull/257) ([nguyenhuy](https://github.com/nguyenhuy))
-- Simplify Override Checking, Only Do It When Assertions Are Enabled \#trivial [\#253](https://github.com/TextureGroup/Texture/pull/253) ([Adlai-Holler](https://github.com/Adlai-Holler))
-- \[ASTextKitFontSizeAdjuster\] Replace use of boundingRectWithSize:options:context: with boundingRectForGlyphRange: inTextContainer: [\#251](https://github.com/TextureGroup/Texture/pull/251) ([rcancro](https://github.com/rcancro))
-- Improve Ancestry Handling, Avoid Assertion Failure [\#246](https://github.com/TextureGroup/Texture/pull/246) ([Adlai-Holler](https://github.com/Adlai-Holler))
-- \[Yoga\] Increment Yoga version to current, 1.5.0. [\#91](https://github.com/TextureGroup/Texture/pull/91) ([appleguy](https://github.com/appleguy))
-- \[example/CustomCollectionView\] Implement MosaicCollectionLayoutDelegate [\#28](https://github.com/TextureGroup/Texture/pull/28) ([nguyenhuy](https://github.com/nguyenhuy))
-
-## [2.3.2](https://github.com/TextureGroup/Texture/tree/2.3.2) (2017-05-09)
-[Full Changelog](https://github.com/TextureGroup/Texture/compare/2.3.1...2.3.2)
-
-**Merged pull requests:**
-
-- \[ASDisplayNode\] Pass drawParameter in rendering context callbacks [\#248](https://github.com/TextureGroup/Texture/pull/248) ([maicki](https://github.com/maicki))
-- Assert only once we know URL has changed [\#247](https://github.com/TextureGroup/Texture/pull/247) ([garrettmoon](https://github.com/garrettmoon))
-- \[ASImageNode\] Move to class method of displayWithParameters:isCancelled: for drawing [\#244](https://github.com/TextureGroup/Texture/pull/244) ([maicki](https://github.com/maicki))
-- Don't Use Associated Objects for Drawing Priority \#trivial [\#239](https://github.com/TextureGroup/Texture/pull/239) ([Adlai-Holler](https://github.com/Adlai-Holler))
-- \[ASDimension\] Remove warning about float precision using CGFloat and … \#trivial [\#237](https://github.com/TextureGroup/Texture/pull/237) ([amegias](https://github.com/amegias))
-- \[ASImageNode\] Move debug label and will- / didDisplayNodeContentWithRenderingContext out of drawing method \#trivial [\#235](https://github.com/TextureGroup/Texture/pull/235) ([maicki](https://github.com/maicki))
-- Fixes assertion on startup in social app layout example [\#233](https://github.com/TextureGroup/Texture/pull/233) ([garrettmoon](https://github.com/garrettmoon))
-- \[ASTextNode\] Move to class method of drawRect:withParameters:isCancelled:isRasterizing: for drawing [\#232](https://github.com/TextureGroup/Texture/pull/232) ([maicki](https://github.com/maicki))
-- \[ASImageNode\] Remove unneeded pointer star \#trivial [\#231](https://github.com/TextureGroup/Texture/pull/231) ([maicki](https://github.com/maicki))
-- \[ASTwoDimensionalArrayUtils\] Fix extern C function definition to fix compiler issue. \#trivial [\#229](https://github.com/TextureGroup/Texture/pull/229) ([appleguy](https://github.com/appleguy))
-- Move Last Few Properties from ASTableView,ASCollectionView to Node [\#225](https://github.com/TextureGroup/Texture/pull/225) ([Adlai-Holler](https://github.com/Adlai-Holler))
-- Fix Issues in the Project File \#trivial [\#224](https://github.com/TextureGroup/Texture/pull/224) ([Adlai-Holler](https://github.com/Adlai-Holler))
-- Improve Our Handling of Subnodes [\#223](https://github.com/TextureGroup/Texture/pull/223) ([Adlai-Holler](https://github.com/Adlai-Holler))
-- Extract ASLayoutElement and ASLayoutElementStylability into categories \#trivial [\#131](https://github.com/TextureGroup/Texture/pull/131) ([maicki](https://github.com/maicki))
-- \[Layout\] Remove finalLayoutElement [\#96](https://github.com/TextureGroup/Texture/pull/96) ([maicki](https://github.com/maicki))
-- \[Docs\] Add workaround for setting a custom lineSpacing and maxNumberOfLines to ASTextNode docs [\#92](https://github.com/TextureGroup/Texture/pull/92) ([maicki](https://github.com/maicki))
-- \[ASDisplayNode\] Implement a std::atomic-based flag system for superb performance [\#89](https://github.com/TextureGroup/Texture/pull/89) ([appleguy](https://github.com/appleguy))
-- \[Yoga\] Ensure that calculated layout is nil'd in invalidate\*Layout [\#87](https://github.com/TextureGroup/Texture/pull/87) ([appleguy](https://github.com/appleguy))
-- Simplify Hashing Code [\#86](https://github.com/TextureGroup/Texture/pull/86) ([Adlai-Holler](https://github.com/Adlai-Holler))
-- Fix site header [\#84](https://github.com/TextureGroup/Texture/pull/84) ([levi](https://github.com/levi))
-- Tighten Rasterization API, Undeprecate It [\#82](https://github.com/TextureGroup/Texture/pull/82) ([Adlai-Holler](https://github.com/Adlai-Holler))
-- Implement ASPageTable [\#81](https://github.com/TextureGroup/Texture/pull/81) ([nguyenhuy](https://github.com/nguyenhuy))
-- Make Cell Node Properties Atomic [\#74](https://github.com/TextureGroup/Texture/pull/74) ([Adlai-Holler](https://github.com/Adlai-Holler))
-- \[ASNodeController+Beta\] Provide an option to allow nodes to own their controllers. [\#61](https://github.com/TextureGroup/Texture/pull/61) ([appleguy](https://github.com/appleguy))
-- \[Yoga Beta\] Improvements to the experimental support for Yoga layout. [\#59](https://github.com/TextureGroup/Texture/pull/59) ([appleguy](https://github.com/appleguy))
-- Fix issue with swipe to delete cell gesture. \#trivial [\#46](https://github.com/TextureGroup/Texture/pull/46) ([rewcraig](https://github.com/rewcraig))
-- Fix CustomCollectionView-Swift sample [\#22](https://github.com/TextureGroup/Texture/pull/22) ([george-gw](https://github.com/george-gw))
-- Automatically resume ASVideoNode after returning from background [\#13](https://github.com/TextureGroup/Texture/pull/13) ([plarson](https://github.com/plarson))
-
-## [2.3.1](https://github.com/TextureGroup/Texture/tree/2.3.1) (2017-04-27)
-[Full Changelog](https://github.com/TextureGroup/Texture/compare/2.2.1...2.3.1)
-
-**Merged pull requests:**
-
-- Don't run tests for the docs directory. [\#79](https://github.com/TextureGroup/Texture/pull/79) ([garrettmoon](https://github.com/garrettmoon))
-- Fix SCSS build [\#78](https://github.com/TextureGroup/Texture/pull/78) ([levi](https://github.com/levi))
-- Fix documentation warning on ASCollectionLayoutState.h \#trivial [\#77](https://github.com/TextureGroup/Texture/pull/77) ([garrettmoon](https://github.com/garrettmoon))
-- ASLayoutSpec to use more default implementations \#trivial [\#73](https://github.com/TextureGroup/Texture/pull/73) ([nguyenhuy](https://github.com/nguyenhuy))
-- Update the CI to the new ruby version [\#71](https://github.com/TextureGroup/Texture/pull/71) ([garrettmoon](https://github.com/garrettmoon))
-- Missing a word [\#68](https://github.com/TextureGroup/Texture/pull/68) ([djblake](https://github.com/djblake))
-- Update license v2 [\#67](https://github.com/TextureGroup/Texture/pull/67) ([garrettmoon](https://github.com/garrettmoon))
-- \[ASCollectionView\] Prevent prefetching from being enabled to eliminate overhead. [\#65](https://github.com/TextureGroup/Texture/pull/65) ([appleguy](https://github.com/appleguy))
-- \[CGPointNull\] Rename globally exported C function to avoid collisions \#trivial [\#62](https://github.com/TextureGroup/Texture/pull/62) ([appleguy](https://github.com/appleguy))
-- \[RTL\] Bridge the UISemanticContentAttribute property for more convenient RTL support. [\#60](https://github.com/TextureGroup/Texture/pull/60) ([appleguy](https://github.com/appleguy))
-- Fixes a potential deadlock; it's not safe to message likely super nod… [\#56](https://github.com/TextureGroup/Texture/pull/56) ([garrettmoon](https://github.com/garrettmoon))
-- Fix \_\_has\_include check in ASLog.h \#trivial [\#55](https://github.com/TextureGroup/Texture/pull/55) ([fsmorygo](https://github.com/fsmorygo))
-- GLKit workaround \#trivial [\#54](https://github.com/TextureGroup/Texture/pull/54) ([stephenkopylov](https://github.com/stephenkopylov))
-- Layout debugger proposal [\#52](https://github.com/TextureGroup/Texture/pull/52) ([nguyenhuy](https://github.com/nguyenhuy))
-- Fixes header check to accept the 'new' header for modified files. [\#50](https://github.com/TextureGroup/Texture/pull/50) ([garrettmoon](https://github.com/garrettmoon))
-- Remove References to IGListSectionType, Now that It's Gone [\#49](https://github.com/TextureGroup/Texture/pull/49) ([Adlai-Holler](https://github.com/Adlai-Holler))
-- Move doc stylesheets to sass [\#47](https://github.com/TextureGroup/Texture/pull/47) ([levi](https://github.com/levi))
-- Fixes for Dangerfile header checks [\#45](https://github.com/TextureGroup/Texture/pull/45) ([garrettmoon](https://github.com/garrettmoon))
-- Enforce header file changes [\#44](https://github.com/TextureGroup/Texture/pull/44) ([garrettmoon](https://github.com/garrettmoon))
-- Use \_ASCollectionReusableView inside ASIGListSupplementaryViewSourceMethods [\#40](https://github.com/TextureGroup/Texture/pull/40) ([plarson](https://github.com/plarson))
-- Bump Cartfile versions to match podspec [\#37](https://github.com/TextureGroup/Texture/pull/37) ([dymv](https://github.com/dymv))
-- \[Site\] Remove hero drop shadow [\#35](https://github.com/TextureGroup/Texture/pull/35) ([levi](https://github.com/levi))
-- Add announcement banner to documentation site [\#31](https://github.com/TextureGroup/Texture/pull/31) ([levi](https://github.com/levi))
-- \[ASCollectionLayout\] Manually set size to measured cells [\#24](https://github.com/TextureGroup/Texture/pull/24) ([nguyenhuy](https://github.com/nguyenhuy))
-- Create a Pluggable "Tips" System to Help in Development [\#19](https://github.com/TextureGroup/Texture/pull/19) ([Adlai-Holler](https://github.com/Adlai-Holler))
-- Add danger [\#18](https://github.com/TextureGroup/Texture/pull/18) ([garrettmoon](https://github.com/garrettmoon))
-- Fix Case where Network Image Node Stays Locked [\#17](https://github.com/TextureGroup/Texture/pull/17) ([Adlai-Holler](https://github.com/Adlai-Holler))
-- Update the homepage URL [\#10](https://github.com/TextureGroup/Texture/pull/10) ([garrettmoon](https://github.com/garrettmoon))
-
-## [2.2.1](https://github.com/TextureGroup/Texture/tree/2.2.1) (2017-04-14)
-[Full Changelog](https://github.com/TextureGroup/Texture/compare/2.3...2.2.1)
-
-**Merged pull requests:**
-
-- Add blog post [\#9](https://github.com/TextureGroup/Texture/pull/9) ([garrettmoon](https://github.com/garrettmoon))
-
-
-
-\* *This Change Log was automatically generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)*
diff --git a/submodules/AsyncDisplayKit/CONTRIBUTING.md b/submodules/AsyncDisplayKit/CONTRIBUTING.md
deleted file mode 100644
index 22aded2d6e..0000000000
--- a/submodules/AsyncDisplayKit/CONTRIBUTING.md
+++ /dev/null
@@ -1,261 +0,0 @@
-# Contribution Guidelines
-Texture is the most actively developed open source project at [Pinterest](https://www.pinterest.com) and is used extensively to deliver a world-class Pinner experience. This document is setup to ensure contributing to the project is easy and transparent.
-
-# Questions
-
-If you are having difficulties using Texture or have a question about usage, please ask a
-question in our [Slack channel](http://texturegroup.org/slack.html). **Please do not ask for help by filing Github issues.**
-
-# Core Team
-
-The Core Team reviews and helps iterate on the RFC Issues from the community at large and acting as the approver of these RFCs. Team members help drive Texture forward in a coherent direction consistent with the goal of creating the best possible general purpose UI framework for iOS. Team members will have merge permissions on the repository.
-
-Members of the core team are appointed based on their technical expertise and proven contribution to the community. The current core team members are:
-
-- Adlai Holler ([@](http://github.com/adlai-holler)[adlai-holler](http://github.com/adlai-holler))
-- Garrett Moon [(](https://github.com/garrettmoon)[@](https://github.com/garrettmoon)[garrett](https://github.com/garrettmoon)[moon](https://github.com/garrettmoon))
-- Huy Nguyen ([@](https://github.com/nguyenhuy)[nguyenhuy](https://github.com/nguyenhuy))
-- Michael Schneider ([@maicki](https://github.com/maicki))
-- Scott Goodson ([@appleguy](https://github.com/appleguy))
-
-Over time, exceptional community members from a much more diverse background will be appointed based on their record of community involvement and contributions.
-
-# Issues
-
-Think you've found a bug or have a new feature to suggest? [Let us know](https://github.com/TextureGroup/Texture/issues/new)!
-
-## Where to Find Known Issues
-
-We use [GitHub Issues](https://github.com/texturegroup/texture/issues) for all bug tracking. We keep a close eye on this and try to make it clear when we have an internal fix in progress. Before filing a new issue, try to make sure your problem doesn't already exist.
-
-## Reporting New Issues
-1. Update to the most recent master release if possible. We may have already fixed your bug.
-2. Search for similar [issues](https://github.com/TextureGroup/Texture/issues). It's possible somebody has encountered this bug already.
-3. Provide a reduced test case that specifically shows the problem. This demo should be fully operational with the exception of the bug you want to demonstrate. The more pared down, the better. If it is not possible to produce a test case, please make sure you provide very specific steps to reproduce the error. If we cannot reproduce it, and there is no other evidence to help us figure out a fix we will close the issue.
-4. Your issue will be verified. The provided example will be tested for correctness. The Texture team will work with you until your issue can be verified.
-5. Keep up to date with feedback from the Texture team on your issue. Your issue may be closed if it becomes stale.
-6. If possible, submit a Pull Request with a failing test. Better yet, take a stab at fixing the bug yourself if you can!
-
-The more information you provide, the easier it is for us to validate that there is a bug and the faster we'll be able to take action.
-
-## Issues Triaging
-- You might be requested to provide a reproduction or extra information. In that case, the issue will be labeled as **N****eeds More Info**. If we did not get any response after fourteen days, we will ping you to remind you about it. We might close the issue if we do not hear from you after two weeks since the original notice.
-- If you submit a feature request as a GitHub issue, you will be invited to follow the instructions in this section otherwise the issue will be closed.
-- Issues that become inactive will be labelled accordingly to inform the original poster and Texture contributors that the issue should be closed since the issue is no longer actionable. The issue can be reopened at a later time if needed, e.g. becomes actionable again.
-- If possible, issues will be labeled to indicate the status or priority. For example, labels may have a prefix for Status: X, or Priority: X. Statuses may include: In Progress, On Hold. Priorities may include: P1, P2 or P3 (high to low priority).
-# Requesting a Feature
-
-If you intend to change the public API, or make any non-trivial changes to the implementation, we recommend filing an RFC [issue](https://github.com/TextureGroup/Texture/issues/new) outlined below. This lets us reach an agreement on your proposal before you put significant effort into implementing it.
-
-If you're only fixing a bug, it's fine to submit a pull request right away, but we still recommend to file an issue detailing what you're fixing. This is helpful in case we don't accept that specific fix but want to keep track of the issue.
-
-## RFC Issue process
-1. Texture has an RFC process for feature requests. To begin the discussion either gather feedback on the Texture Slack channel or draft an Texture RFC as a Github Issue.
-2. The title of the GitHub RFC Issue should have `[RFC]` as prefix: `[RFC] Add new cool feature`
-3. Provide a clear and detailed explanation of the feature you want and why it's important to add. Keep in mind that we want features that will be useful to the majority of our users and not just a small subset. If you're just targeting a minority of users, consider writing an add-on library for Texture.
-4. If the feature is complex, consider writing an Texture RFC issue. Even if you can’t implement the feature yourself, consider writing an RFC issue. If we do end up accepting the feature, the issue provides the needed documentation for contributors to develop the feature according the specification accepted by the core team. We will tag accepted RFC issues with **Needs Volunteer**.
-5. After discussing the feature you may choose to attempt a Pull Request. If you're at all able, start writing some code. We always have more work to do than time to do it. If you can write some code then that will speed the process along.
-
-In short, if you have an idea that would be nice to have, create an issue on the [TextureGroup](https://github.com/TextureGroup/Texture)[/](https://github.com/TextureGroup/Texture)[Texture](https://github.com/TextureGroup/Texture) repo. If you have a question about requesting a feature, start a discussion in our [Slack channel](http://texturegroup.org/slack.html).
-
-# Our Development Process
-
-All work on Texture happens directly on [GitHub](https://github.com/TextureGroup/Texture). Both core team members and external contributors send pull requests which go through the same review process.
-
-## `master` is under active development
-
-We will do our best to keep master in good shape, with tests passing at all times. But in order to move fast, we will make API changes that your application might not be compatible with. We will do our best to communicate these changes and version appropriately so you can lock into a specific version if need be.
-
-## Pull Requests
-
-If you send a pull request, please do it against the master branch. We maintain stable branches for major versions separately but we don't accept pull requests to them directly. Instead, we cherry-pick non-breaking changes from master to the latest stable major version.
-
-Before submitting a pull request, please make sure the following is done…
-
-1. Search GitHub for an open or closed [pull request](https://github.com/TextureGroup/Texture/pulls?utf8=✓&q=is%3Apr) that relates to your submission. You don't want to duplicate effort.
-2. Fork the [repo](https://github.com/TextureGroup/Texture) and create your branch from master:
-    git checkout -b my-fix-branch master
-3. Create your patch, including appropriate test cases. Please follow our Coding Guidelines.
-4. Please make sure every commit message are meaningful so it that makes it clearer for people to review and easier to understand your intention
-5. Ensure tests pass CI on GitHub for your Pull Request.
-6. If you haven't already, sign the CLA.
-
-**Copyright Notice for files**
-Copy and paste this to the top of your new file(s):
-```objc
-//
-//  ASDisplayNode.mm
-//  Texture
-//
-//  Copyright (c) Pinterest, Inc.  All rights reserved.
-//  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
-//  
-```
-
-If you’ve modified an existing file, change the header to:
-```objc
-//
-//  ASDisplayNode.mm
-//  Texture
-//
-//  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.
-//  Changes after 4/13/2017 are: Copyright (c) Pinterest, Inc.  All rights reserved.
-//  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
-//
-```
-
-# Semantic Versioning
-
-Texture follows semantic versioning. We release patch versions for bug fixes, minor versions for new features (and rarely, clear and easy to fix breaking changes), and major versions for any major breaking changes. When we make breaking changes, we also introduce deprecation warnings in a minor version so that our users learn about the upcoming changes and migrate their code in advance.
-
-We tag every pull request with a label marking whether the change should go in the next patch, minor, or a major version. We release new versions pretty regularly usually every few weeks. The version will be a patch or minor version if it does not contain major new features or breaking API changes and a major version if it does.
-
-# Coding Guidelines
-- Indent using 2 spaces (this conserves space in print and makes line wrapping less likely). Never indent with tabs. Be sure to set this preference in Xcode.
-- Do your best to keep it around 120 characters line length
-- End files with a newline.
-- Don’t leave trailing whitespace.
-- Space after `@property` declarations and conform to ordering of attributes
-```objc
-@property (nonatomic, readonly, assign, getter=isTracking) BOOL tracking;
-@property (nonatomic, readwrite, strong, nullable) NSAttributedString *attributedText;
-```
-- In method signatures, there should be a space after the method type (-/+ symbol). There should be a space between the method segments (matching Apple's style). Always include a keyword and be descriptive with the word before the argument which describes the argument.
-```objc
-@interface SomeClass
-- (instancetype)initWithWidth:(CGFloat)width height:(CGFloat)height;
-- (void)setExampleText:(NSString *)text image:(UIImage *)image;
-- (void)sendAction:(SEL)aSelector to:(id)anObject forAllCells:(BOOL)flag;
-- (id)viewWithTag:(NSInteger)tag;
-@end
-```
-- Internal methods should be prefixed with a `_`
-```objc
-- (void)_internalMethodWithParameter:(id)param;
-```
-- Method braces and other braces (if/else/switch/while etc.) always open on the same line as the statement but close on a new line.
-```objc
-if (foo == bar) {
-  //..
-} else {
-  //..
-}
-```
-- Method, `@interface` , and `@implementation` brackets on the following line
-```objc
-@implementation SomeClass
-- (void)someMethod
-{
-  // Implementation
-}
-@end
-```
-- Function brackets on the same line
-```objc
-static void someFunction() {
-  // Implementation
-}
-```
-- Operator goes with the variable name
-```objc
-    NSAttributedString *attributedText = self.textNode.attributedText;
-```
-- Locking
-  - Add a `_locked_` in front of the method name that needs to be called with a lock held
-```objc
-- (void)_locked_needsToBeCalledWithLock {}
-```
-  - Locking safety:
-    - It is fine for a `_locked_` method to call other `_locked_` methods.
-    - On the other hand, the following should not be done:
-      - Calling normal, unlocked methods inside a `_locked_` method
-      - Calling subclass hooks that are meant to be overridden by developers inside a `_locked_` method.
-  - Subclass hooks
-    - that are meant to be overwritten by users should not be called with a lock held.
-    - that are used internally the same conventions as above apply.
-- There are multiple ways to acquire a lock:
-  1. Explicitly call `.lock()` and `.unlock()` :
-```objc
-- (void)setContentSpacing:(CGFloat)contentSpacing
-{
-  __instanceLock__.lock();
-  BOOL needsUpdate = (contentSpacing != _contentSpacing);
-  if (needsUpdate) {
-    _contentSpacing = contentSpacing;
-  }
-  __instanceLock__.unlock();
-
-  if (needsUpdate) {
-    [self setNeedsLayout];
-  }
-}
-
-- (CGFloat)contentSpacing
-{
-  CGFloat contentSpacing = 0.0;
-  __instanceLock__.lock();
-  contentSpacing = _contentSpacing;
-  __instanceLock__.unlock();
-  return contentSpacing;
-}
-```
-  2. Create an `ASDN::MutexLocker` :
-```objc
-- (void)setContentSpacing:(CGFloat)contentSpacing
-{
-  {
-    ASDN::MutexLocker l(__instanceLock__);
-    if (contentSpacing == _contentSpacing) {
-      return;
-    }
-
-    _contentSpacing = contentSpacing;
-  }
-
-  [self setNeedsLayout];
-}
-
-- (CGFloat)contentSpacing
-{
-  ASDN::MutexLocker l(__instanceLock__);
-  return _contentSpacing;
-}
-```
-- Nullability
-  - The adoption of annotations is straightforward. The standard we adopt is using the `NS_ASSUME_NONNULL_BEGIN` and `NS_ASSUME_NONNULL_END` on all headers. Then indicate nullability for the pointers that can be so.
-  - There is mostly no sense using nullability annotations outside of interface declarations.
-```objc
-// Properties
-// Never include: `atomic`, `readwrite`, `strong`, `assign`.
-// Only specify nullability if it isn't assumed from NS_ASSUME.
-// (nullability, atomicity, storage class, writability, custom getter, custom setter)
-@property (nullable, copy) NSNumber *status
-
-// Methods
-- (nullable NSNumber *)doSomethingWithString:(nullable NSString *)str;
-
-// Functions
-NSString * _Nullable ASStringWithQuotesIfMultiword(NSString * _Nullable string);
-
-// Typedefs
-typedef void (^RemoteCallback)(id _Nullable result, NSError * _Nullable error);
-
-// Block as parameter
-- (void)reloadDataWithCompletion:(void (^ _Nullable)())completion;
-
-// Block as parameter with parameter and return value
-- (void)convertObject:(id _Nonnull (^ _Nullable)(id _Nullable input))handler;
-
-// More complex pointer types
-- (void)allElementsForScrolling:(ASScrollDirection)scrollDirection rangeMode:(ASLayoutRangeMode)rangeMode displaySet:(NSSet<ASCollectionElement *> *__autoreleasing  _Nullable *)displaySet preloadSet:(NSSet<ASCollectionElement *> *__autoreleasing  _Nullable *)preloadSet map:(ASElementMap *)map;
-```
-
-# Contributor License Agreement (CLA)
-
-Please sign our Contributor License Agreement (CLA) before sending pull requests. For any code changes to be accepted, the CLA must be signed.
-
-Complete your CLA [here](https://cla-assistant.io/TextureGroup/Texture)
-
-# License
-
-By contributing to Texture, you agree that your contributions will be licensed under its Apache 2 license.
diff --git a/submodules/AsyncDisplayKit/Cartfile b/submodules/AsyncDisplayKit/Cartfile
deleted file mode 100644
index ea145be2cb..0000000000
--- a/submodules/AsyncDisplayKit/Cartfile
+++ /dev/null
@@ -1,2 +0,0 @@
-github "pinterest/PINRemoteImage" "3.0.0-beta.14"
-github "pinterest/PINCache" "3.0.1-beta.7"
diff --git a/submodules/AsyncDisplayKit/Dangerfile b/submodules/AsyncDisplayKit/Dangerfile
deleted file mode 100644
index 147d389069..0000000000
--- a/submodules/AsyncDisplayKit/Dangerfile
+++ /dev/null
@@ -1,83 +0,0 @@
-require 'open-uri'
-
-source_pattern = /(\.m|\.mm|\.h)$/
-
-modified_source_files = git.modified_files.grep(source_pattern)
-has_modified_source_files = !modified_source_files.empty?
-added_source_files = git.added_files.grep(source_pattern)
-has_added_source_files = !added_source_files.empty?
-
-# Make it more obvious that a PR is a work in progress and shouldn't be merged yet
-warn("PR is classed as Work in Progress") if github.pr_title.include? "[WIP]"
-
-# Warn when there is a big PR
-warn("This is a big PR, please consider splitting it up to ease code review.") if git.lines_of_code > 500
-
-# Modifying the changelog will probably get overwritten.
-if git.modified_files.include?("CHANGELOG.md") && !github.pr_title.include?("#changelog")
-  warn("PR modifies CHANGELOG.md, which is a generated file. Add #changelog to the title to suppress this warning.")
-end
-
-def full_license(partial_license, filename)
-    license_header = <<-HEREDOC
-//
-    HEREDOC
-    license_header += "//  " + filename + "\n"
-    license_header += <<-HEREDOC
-//  Texture
-//
-    HEREDOC
-    license_header += partial_license
-    return license_header
-end
-
-def check_file_header(files_to_check, licenses)
-  repo_name = github.pr_json["base"]["repo"]["full_name"]
-  pr_number = github.pr_json["number"]
-  files = github.api.pull_request_files(repo_name, pr_number)
-  files.each do |file|
-    if files_to_check.include?(file["filename"])
-      filename = File.basename(file["filename"])
-    
-      data = ""
-      contents = github.api.get file["contents_url"]
-      open(contents["download_url"]) { |io|
-        data += io.read
-      }
-      
-      correct_license = false
-      licenses.each do |license|
-        license_header = full_license(license, filename)
-        if data.include? "Pinterest, Inc."
-          correct_license = true
-        end
-      end
-      
-      if correct_license == false
-        warn ("Please ensure license is correct for #{filename}: \n```\n" + full_license(licenses[0], filename) + "```")
-      end
-      
-    end
-  end
-end
-
-# Ensure new files have proper header
-new_source_license_header = <<-HEREDOC
-//  Copyright (c) Pinterest, Inc.  All rights reserved.
-//  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
-HEREDOC
-
-if has_added_source_files
-  check_file_header(added_source_files, [new_source_license_header])
-end
-
-# Ensure modified files have proper header
-modified_source_license_header = <<-HEREDOC
-//  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.
-//  Changes after 4/13/2017 are: Copyright (c) Pinterest, Inc.  All rights reserved.
-//  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
-HEREDOC
-
-if has_modified_source_files
-  check_file_header(modified_source_files, [modified_source_license_header, new_source_license_header])
-end
diff --git a/submodules/AsyncDisplayKit/Gemfile b/submodules/AsyncDisplayKit/Gemfile
deleted file mode 100644
index 38bfbc8e08..0000000000
--- a/submodules/AsyncDisplayKit/Gemfile
+++ /dev/null
@@ -1,4 +0,0 @@
-source 'https://rubygems.org'
-
-gem 'danger'
-gem 'danger-slack'
\ No newline at end of file
diff --git a/submodules/AsyncDisplayKit/InstrumentsTemplates/SystemTrace.tracetemplate b/submodules/AsyncDisplayKit/InstrumentsTemplates/SystemTrace.tracetemplate
deleted file mode 100644
index 48cc3e6aef..0000000000
Binary files a/submodules/AsyncDisplayKit/InstrumentsTemplates/SystemTrace.tracetemplate and /dev/null differ
diff --git a/submodules/AsyncDisplayKit/Podfile b/submodules/AsyncDisplayKit/Podfile
deleted file mode 100644
index 98479737ec..0000000000
--- a/submodules/AsyncDisplayKit/Podfile
+++ /dev/null
@@ -1,31 +0,0 @@
-source 'https://github.com/CocoaPods/Specs.git'
-
-platform :ios, '9.0'
-
-target :'AsyncDisplayKitTests' do
-  pod 'OCMock', '=3.4.1' # 3.4.2 currently has issues.
-  pod 'FBSnapshotTestCase/Core', '~> 2.1'
-  pod 'JGMethodSwizzler', :git => 'https://github.com/JonasGessner/JGMethodSwizzler', :branch => 'master'
-
-  # Only for buck build
-  pod 'PINRemoteImage', '3.0.0-beta.14'
-end
-
-#TODO CocoaPods plugin instead?
-post_install do |installer|
-  require 'fileutils'
-
-  # Assuming we're at the root dir
-  buck_files_dir = 'buck-files'
-  if File.directory?(buck_files_dir)
-    installer.pod_targets.flat_map do |pod_target|
-      pod_name = pod_target.pod_name
-      # Copy the file at buck-files/BUCK_pod_name to Pods/pod_name/BUCK,
-      # override existing file if needed
-      buck_file = buck_files_dir + '/BUCK_' + pod_name
-      if File.file?(buck_file)
-        FileUtils.cp(buck_file, 'Pods/' + pod_name + '/BUCK', :preserve => false)
-      end
-    end
-  end
-end
diff --git a/submodules/AsyncDisplayKit/Podfile.lock b/submodules/AsyncDisplayKit/Podfile.lock
deleted file mode 100644
index df3c6fcb88..0000000000
--- a/submodules/AsyncDisplayKit/Podfile.lock
+++ /dev/null
@@ -1,55 +0,0 @@
-PODS:
-  - FBSnapshotTestCase/Core (2.1.4)
-  - JGMethodSwizzler (2.0.1)
-  - OCMock (3.4.1)
-  - PINCache (3.0.1-beta.7):
-    - PINCache/Arc-exception-safe (= 3.0.1-beta.7)
-    - PINCache/Core (= 3.0.1-beta.7)
-  - PINCache/Arc-exception-safe (3.0.1-beta.7):
-    - PINCache/Core
-  - PINCache/Core (3.0.1-beta.7):
-    - PINOperation (~> 1.1.1)
-  - PINOperation (1.1.1)
-  - PINRemoteImage (3.0.0-beta.14):
-    - PINRemoteImage/PINCache (= 3.0.0-beta.14)
-  - PINRemoteImage/Core (3.0.0-beta.14):
-    - PINOperation
-  - PINRemoteImage/PINCache (3.0.0-beta.14):
-    - PINCache (= 3.0.1-beta.7)
-    - PINRemoteImage/Core
-
-DEPENDENCIES:
-  - FBSnapshotTestCase/Core (~> 2.1)
-  - JGMethodSwizzler (from `https://github.com/JonasGessner/JGMethodSwizzler`, branch `master`)
-  - OCMock (= 3.4.1)
-  - PINRemoteImage (= 3.0.0-beta.14)
-
-SPEC REPOS:
-  https://github.com/cocoapods/specs.git:
-    - FBSnapshotTestCase
-    - OCMock
-    - PINCache
-    - PINOperation
-    - PINRemoteImage
-
-EXTERNAL SOURCES:
-  JGMethodSwizzler:
-    :branch: master
-    :git: https://github.com/JonasGessner/JGMethodSwizzler
-
-CHECKOUT OPTIONS:
-  JGMethodSwizzler:
-    :commit: 8791eccc5342224bd293b5867348657e3a240c7f
-    :git: https://github.com/JonasGessner/JGMethodSwizzler
-
-SPEC CHECKSUMS:
-  FBSnapshotTestCase: 094f9f314decbabe373b87cc339bea235a63e07a
-  JGMethodSwizzler: 7328146117fffa8a4038c42eb7cd3d4c75006f97
-  OCMock: 2cd0716969bab32a2283ff3a46fd26a8c8b4c5e3
-  PINCache: 7cb9ae068c8f655717f7c644ef1dff9fd573e979
-  PINOperation: a6219e6fc9db9c269eb7a7b871ac193bcf400aac
-  PINRemoteImage: 81bbff853acc71c6de9e106e9e489a791b8bbb08
-
-PODFILE CHECKSUM: 445046ac151568c694ff286684322273f0b597d6
-
-COCOAPODS: 1.6.0
diff --git a/submodules/AsyncDisplayKit/README.md b/submodules/AsyncDisplayKit/README.md
deleted file mode 100644
index 4b939fac5a..0000000000
--- a/submodules/AsyncDisplayKit/README.md
+++ /dev/null
@@ -1,51 +0,0 @@
-## Coming from AsyncDisplayKit? Learn more [here](https://medium.com/@Pinterest_Engineering/introducing-texture-a-new-home-for-asyncdisplaykit-e7c003308f50)
-
-![Texture](https://github.com/texturegroup/texture/raw/master/docs/static/images/logo.png)
-
-[![Apps Using](https://img.shields.io/cocoapods/at/Texture.svg?label=Apps%20Using%20Texture&colorB=28B9FE)](http://cocoapods.org/pods/Texture)
-[![Downloads](https://img.shields.io/cocoapods/dt/Texture.svg?label=Total%20Downloads&colorB=28B9FE)](http://cocoapods.org/pods/Texture)
-
-[![Platform](https://img.shields.io/badge/platforms-iOS%20%7C%20tvOS-orange.svg)](http://texturegroup.org)
-[![Languages](https://img.shields.io/badge/languages-ObjC%20%7C%20Swift-orange.svg)](http://texturegroup.org)
-
-[![Version](https://img.shields.io/cocoapods/v/Texture.svg)](http://cocoapods.org/pods/Texture)
-[![Carthage compatible](https://img.shields.io/badge/Carthage-compatible-59C939.svg?style=flat)](https://github.com/Carthage/Carthage)
-[![License](https://img.shields.io/cocoapods/l/Texture.svg)](https://github.com/texturegroup/texture/blob/master/LICENSE)
-
-## Installation
-
-Texture is available via CocoaPods or Carthage. See our [Installation](http://texturegroup.org/docs/installation.html) guide for instructions.
-
-## Performance Gains
-
-Texture's basic unit is the `node`. An ASDisplayNode is an abstraction over `UIView`, which in turn is an abstraction over `CALayer`. Unlike views, which can only be used on the main thread, nodes are thread-safe: you can instantiate and configure entire hierarchies of them in parallel on background threads.
-
-To keep its user interface smooth and responsive, your app should render at 60 frames per second — the gold standard on iOS. This means the main thread has one-sixtieth of a second to push each frame. That's 16 milliseconds to execute all layout and drawing code! And because of system overhead, your code usually has less than ten milliseconds to run before it causes a frame drop.
-
-Texture lets you move image decoding, text sizing and rendering, layout, and other expensive UI operations off the main thread, to keep the main thread available to respond to user interaction.
-
-## Advanced Developer Features
-
-As the framework has grown, many features have been added that can save developers tons of time by eliminating common boilerplate style structures common in modern iOS apps. If you've ever dealt with cell reuse bugs, tried to performantly preload data for a page or scroll style interface or even just tried to keep your app from dropping too many frames you can benefit from integrating Texture.
-
-## Learn More
-
-* Read the our [Getting Started](http://texturegroup.org/docs/getting-started.html) guide
-* Get the [sample projects](https://github.com/texturegroup/texture/tree/master/examples)
-* Browse the [API reference](http://texturegroup.org/appledocs.html)
-
-## Getting Help
-
-We use Slack for real-time debugging, community updates, and general talk about Texture. [Signup](http://asdk-slack-auto-invite.herokuapp.com) yourself or email textureframework@gmail.com to get an invite.
-
-## Release process
-
-For the release process see the [RELEASE] (https://github.com/texturegroup/texture/blob/master/RELEASE.md) file.
-
-## Contributing
-
-We welcome any contributions. See the [CONTRIBUTING](https://github.com/texturegroup/texture/blob/master/CONTRIBUTING.md) file for how to get involved.
-
-## License
-
-The Texture project is available for free use, as described by the [LICENSE](https://github.com/texturegroup/texture/blob/master/LICENSE) (Apache 2.0).
diff --git a/submodules/AsyncDisplayKit/RELEASE.md b/submodules/AsyncDisplayKit/RELEASE.md
deleted file mode 100644
index b675fa4922..0000000000
--- a/submodules/AsyncDisplayKit/RELEASE.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Release Process
-This document describes the process for a public Texture release.
-
-### Preparation
-- Install [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator): `sudo gem install github_changelog_generator`
-- Generate a GitHub Personal Access Token to prevent running into public GitHub API rate limits: https://github.com/github-changelog-generator/github-changelog-generator#github-token
-
-### Process
-- Run `github_changelog_generator` in Texture project directory: `github_changelog_generator --token <generated personal token> TextureGroup/Texture`. To avoid hitting rate limit, the generator will replace the entire file with just the changes from this version – revert that giant deletion to get the entire new changelog.
-- Update `spec.version` within `Texture.podspec` and the `since-tag` and `future-release` fields in `.github_changelog_generator`.
-- Create a new PR with the updated `Texture.podspec` and the newly generated changelog, add `#changelog` to the PR message so the CI will not prevent merging it.
-- After merging in the PR, [create a new GitHub release](https://github.com/TextureGroup/Texture/releases/new). Use the generated changelog for the new release.
-
-### Problems
-- Sometimes we will still run into GitHub rate limit issues although using a personal token to generate the changelog. For now there is no solution for this. The issue to track is: [Triggering Github Rate limits #656](https://github.com/github-changelog-generator/github-changelog-generator/issues/656)
\ No newline at end of file
diff --git a/submodules/AsyncDisplayKit/Schemas/configuration.json b/submodules/AsyncDisplayKit/Schemas/configuration.json
deleted file mode 100644
index 12957a12b5..0000000000
--- a/submodules/AsyncDisplayKit/Schemas/configuration.json
+++ /dev/null
@@ -1,33 +0,0 @@
-{
-    "id": "configuration.json",
-    "title": "configuration",
-    "description" : "Schema definition of a Texture Configuration",
-    "$schema": "http://json-schema.org/schema#",
-    "type": "object",
-    "properties": {
-      "version" : {
-        "type" : "number"
-      },
-    	"experimental_features": {
-    		"type": "array",
-    		"items": {
-        		"type": "string",
-        		"enum": [
-                    "exp_graphics_contexts",
-                    "exp_text_node",
-                    "exp_interface_state_coalesce",
-                    "exp_unfair_lock",
-                    "exp_infer_layer_defaults",
-                    "exp_collection_teardown",
-                    "exp_framesetter_cache",
-                    "exp_skip_clear_data",
-                    "exp_did_enter_preload_skip_asm_layout",
-                    "exp_disable_a11y_cache",
-                    "exp_dispatch_apply",
-                    "exp_image_downloader_priority",
-                    "exp_text_drawing"
-                ]
-    		}
-		}
-    }
-}
diff --git a/submodules/AsyncDisplayKit/Source/Private/ASAbstractLayoutController+FrameworkPrivate.h b/submodules/AsyncDisplayKit/Source/ASAbstractLayoutController+FrameworkPrivate.h
similarity index 100%
rename from submodules/AsyncDisplayKit/Source/Private/ASAbstractLayoutController+FrameworkPrivate.h
rename to submodules/AsyncDisplayKit/Source/ASAbstractLayoutController+FrameworkPrivate.h
diff --git a/submodules/AsyncDisplayKit/Source/Layout/ASAsciiArtBoxCreator.mm b/submodules/AsyncDisplayKit/Source/ASAsciiArtBoxCreator.mm
similarity index 100%
rename from submodules/AsyncDisplayKit/Source/Layout/ASAsciiArtBoxCreator.mm
rename to submodules/AsyncDisplayKit/Source/ASAsciiArtBoxCreator.mm
diff --git a/submodules/AsyncDisplayKit/Source/Base/ASAssert.mm b/submodules/AsyncDisplayKit/Source/ASAssert.mm
similarity index 100%
rename from submodules/AsyncDisplayKit/Source/Base/ASAssert.mm
rename to submodules/AsyncDisplayKit/Source/ASAssert.mm
diff --git a/submodules/AsyncDisplayKit/Source/ASButtonNode+Private.h b/submodules/AsyncDisplayKit/Source/ASButtonNode+Private.h
deleted file mode 100644
index 2ecc894463..0000000000
--- a/submodules/AsyncDisplayKit/Source/ASButtonNode+Private.h
+++ /dev/null
@@ -1,44 +0,0 @@
-//
-//  ASButtonNode+Private.h
-//  Texture
-//
-//  Copyright (c) Pinterest, Inc.  All rights reserved.
-//  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
-//
-
-#import <AsyncDisplayKit/ASButtonNode.h>
-#import <AsyncDisplayKit/ASTextNode.h>
-#import <AsyncDisplayKit/ASImageNode.h>
-#import <AsyncDisplayKit/ASStackLayoutDefines.h>
-
-@interface ASButtonNode() {
-  NSAttributedString *_normalAttributedTitle;
-  NSAttributedString *_highlightedAttributedTitle;
-  NSAttributedString *_selectedAttributedTitle;
-  NSAttributedString *_selectedHighlightedAttributedTitle;
-  NSAttributedString *_disabledAttributedTitle;
-
-  UIImage *_normalImage;
-  UIImage *_highlightedImage;
-  UIImage *_selectedImage;
-  UIImage *_selectedHighlightedImage;
-  UIImage *_disabledImage;
-
-  UIImage *_normalBackgroundImage;
-  UIImage *_highlightedBackgroundImage;
-  UIImage *_selectedBackgroundImage;
-  UIImage *_selectedHighlightedBackgroundImage;
-  UIImage *_disabledBackgroundImage;
-  
-  CGFloat _contentSpacing;
-  BOOL  _laysOutHorizontally;
-  ASVerticalAlignment _contentVerticalAlignment;
-  ASHorizontalAlignment _contentHorizontalAlignment;
-  UIEdgeInsets _contentEdgeInsets;
-  ASButtonNodeImageAlignment _imageAlignment;
-  ASTextNode *_titleNode;
-  ASImageNode *_imageNode;
-  ASImageNode *_backgroundImageNode;
-}
-
-@end
diff --git a/submodules/AsyncDisplayKit/Source/ASButtonNode+Yoga.h b/submodules/AsyncDisplayKit/Source/ASButtonNode+Yoga.h
deleted file mode 100644
index 4fddc9df3a..0000000000
--- a/submodules/AsyncDisplayKit/Source/ASButtonNode+Yoga.h
+++ /dev/null
@@ -1,20 +0,0 @@
-//
-//  ASButtonNode+Yoga.h
-//  Texture
-//
-//  Copyright (c) Pinterest, Inc.  All rights reserved.
-//  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
-//
-
-#import <Foundation/Foundation.h>
-#import <AsyncDisplayKit/ASButtonNode.h>
-
-NS_ASSUME_NONNULL_BEGIN
-
-@interface ASButtonNode (Yoga)
-
-- (void)updateYogaLayoutIfNeeded;
-
-@end
-
-NS_ASSUME_NONNULL_END
diff --git a/submodules/AsyncDisplayKit/Source/ASButtonNode+Yoga.mm b/submodules/AsyncDisplayKit/Source/ASButtonNode+Yoga.mm
deleted file mode 100644
index 4666475560..0000000000
--- a/submodules/AsyncDisplayKit/Source/ASButtonNode+Yoga.mm
+++ /dev/null
@@ -1,106 +0,0 @@
-//
-//  ASButtonNode+Yoga.mm
-//  Texture
-//
-//  Copyright (c) Pinterest, Inc.  All rights reserved.
-//  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
-//
-
-#import <AsyncDisplayKit/ASAvailability.h>
-#import "ASButtonNode+Yoga.h"
-#import <AsyncDisplayKit/ASButtonNode+Private.h>
-#import <AsyncDisplayKit/ASDisplayNodeInternal.h>
-#import <AsyncDisplayKit/ASStackLayoutSpecUtilities.h>
-#import <AsyncDisplayKit/ASThread.h>
-
-#if YOGA
-static void ASButtonNodeResolveHorizontalAlignmentForStyle(ASLayoutElementStyle *style, ASStackLayoutDirection _direction, ASHorizontalAlignment _horizontalAlignment, ASStackLayoutJustifyContent _justifyContent, ASStackLayoutAlignItems _alignItems) {
-  if (_direction == ASStackLayoutDirectionHorizontal) {
-    style.justifyContent = justifyContent(_horizontalAlignment, _justifyContent);
-  } else {
-    style.alignItems = alignment(_horizontalAlignment, _alignItems);
-  }
-}
-
-static void ASButtonNodeResolveVerticalAlignmentForStyle(ASLayoutElementStyle *style, ASStackLayoutDirection _direction, ASVerticalAlignment _verticalAlignment, ASStackLayoutJustifyContent _justifyContent, ASStackLayoutAlignItems _alignItems) {
-  if (_direction == ASStackLayoutDirectionHorizontal) {
-    style.alignItems = alignment(_verticalAlignment, _alignItems);
-  } else {
-    style.justifyContent = justifyContent(_verticalAlignment, _justifyContent);
-  }
-}
-
-@implementation ASButtonNode (Yoga)
-
-- (void)updateYogaLayoutIfNeeded
-{
-  NSMutableArray<ASDisplayNode *> *children = [[NSMutableArray alloc] initWithCapacity:2];
-  {
-    ASLockScopeSelf();
-
-    // Build up yoga children for button node  again
-    unowned ASLayoutElementStyle *style = [self _locked_style];
-    [style yogaNodeCreateIfNeeded];
-
-    // Setup stack layout values
-    style.flexDirection = _laysOutHorizontally ? ASStackLayoutDirectionHorizontal : ASStackLayoutDirectionVertical;
-
-    // Resolve horizontal and vertical alignment
-    ASButtonNodeResolveHorizontalAlignmentForStyle(style, style.flexDirection, _contentHorizontalAlignment, style.justifyContent, style.alignItems);
-    ASButtonNodeResolveVerticalAlignmentForStyle(style, style.flexDirection, _contentVerticalAlignment, style.justifyContent, style.alignItems);
-
-    // Setup new yoga children
-    if (_imageNode.image != nil) {
-      [_imageNode.style yogaNodeCreateIfNeeded];
-      [children addObject:_imageNode];
-    }
-
-    if (_titleNode.attributedText.length > 0) {
-      [_titleNode.style yogaNodeCreateIfNeeded];
-      if (_imageAlignment == ASButtonNodeImageAlignmentBeginning) {
-        [children addObject:_titleNode];
-      } else {
-        [children insertObject:_titleNode atIndex:0];
-      }
-    }
-
-    // Add spacing between title and button
-    if (children.count == 2) {
-      unowned ASLayoutElementStyle *firstChildStyle = children.firstObject.style;
-      if (_laysOutHorizontally) {
-        firstChildStyle.margin = ASEdgeInsetsMake(UIEdgeInsetsMake(0, 0, 0, _contentSpacing));
-      } else {
-        firstChildStyle.margin = ASEdgeInsetsMake(UIEdgeInsetsMake(0, 0, _contentSpacing, 0));
-      }
-    }
-
-    // Add padding to button
-    if (UIEdgeInsetsEqualToEdgeInsets(UIEdgeInsetsZero, _contentEdgeInsets) == NO) {
-      style.padding = ASEdgeInsetsMake(_contentEdgeInsets);
-    }
-
-    // Add background node
-    if (_backgroundImageNode.image) {
-      [_backgroundImageNode.style yogaNodeCreateIfNeeded];
-      [children insertObject:_backgroundImageNode atIndex:0];
-
-      _backgroundImageNode.style.positionType = YGPositionTypeAbsolute;
-      _backgroundImageNode.style.position = ASEdgeInsetsMake(UIEdgeInsetsZero);
-    }
-  }
-
-  // Update new children
-  [self setYogaChildren:children];
-}
-
-@end
-
-#else
-
-@implementation ASButtonNode (Yoga)
-
-- (void)updateYogaLayoutIfNeeded {}
-
-@end
-
-#endif
diff --git a/submodules/AsyncDisplayKit/Source/ASButtonNode.h b/submodules/AsyncDisplayKit/Source/ASButtonNode.h
deleted file mode 100644
index f43a544df1..0000000000
--- a/submodules/AsyncDisplayKit/Source/ASButtonNode.h
+++ /dev/null
@@ -1,130 +0,0 @@
-//
-//  ASButtonNode.h
-//  Texture
-//
-//  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.
-//  Changes after 4/13/2017 are: Copyright (c) Pinterest, Inc.  All rights reserved.
-//  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
-//
-
-#import <AsyncDisplayKit/ASControlNode.h>
-#import <UIKit/UIKit.h>
-
-NS_ASSUME_NONNULL_BEGIN
-
-@class ASImageNode, ASTextNode;
-
-/**
- Image alignment defines where the image will be placed relative to the text.
- */
-typedef NS_ENUM(NSInteger, ASButtonNodeImageAlignment) {
-  /** Places the image before the text. */
-  ASButtonNodeImageAlignmentBeginning,
-  /** Places the image after the text. */
-  ASButtonNodeImageAlignmentEnd
-};
-
-@interface ASButtonNode : ASControlNode
-
-@property (readonly) ASTextNode  * titleNode;
-@property (readonly) ASImageNode * imageNode;
-@property (readonly) ASImageNode * backgroundImageNode;
-
-/**
- Spacing between image and title. Defaults to 8.0.
- */
-@property CGFloat contentSpacing;
-
-/**
- Whether button should be laid out vertically (image on top of text) or horizontally (image to the left of text).
- ASButton node does not yet support RTL but it should be fairly easy to implement.
- Defaults to YES.
- */
-@property BOOL laysOutHorizontally;
-
-/** Horizontally align content (text or image).
- Defaults to ASHorizontalAlignmentMiddle.
- */
-@property ASHorizontalAlignment contentHorizontalAlignment;
-
-/** Vertically align content (text or image).
- Defaults to ASVerticalAlignmentCenter.
- */
-@property ASVerticalAlignment contentVerticalAlignment;
-
-/**
- * @discussion The insets used around the title and image node
- */
-@property UIEdgeInsets contentEdgeInsets;
-
-/**
- * @discusstion Whether the image should be aligned at the beginning or at the end of node. Default is `ASButtonNodeImageAlignmentBeginning`.
- */
-@property ASButtonNodeImageAlignment imageAlignment;
-
-/**
- *  Returns the styled title associated with the specified state.
- *
- *  @param state The control state that uses the styled title.
- *
- *  @return The title for the specified state.
- */
-- (nullable NSAttributedString *)attributedTitleForState:(UIControlState)state AS_WARN_UNUSED_RESULT;
-
-/**
- *  Sets the styled title to use for the specified state. This will reset styled title previously set with -setTitle:withFont:withColor:forState.
- *
- *  @param title The styled text string to use for the title.
- *  @param state The control state that uses the specified title.
- */
-- (void)setAttributedTitle:(nullable NSAttributedString *)title forState:(UIControlState)state;
-
-#if TARGET_OS_IOS
-/**
- *  Sets the title to use for the specified state. This will reset styled title previously set with -setAttributedTitle:forState.
- *
- *  @param title The styled text string to use for the title.
- *  @param font The font to use for the title.
- *  @param color The color to use for the title.
- *  @param state The control state that uses the specified title.
- */
-- (void)setTitle:(NSString *)title withFont:(nullable UIFont *)font withColor:(nullable UIColor *)color forState:(UIControlState)state;
-#endif
-/**
- *  Returns the image used for a button state.
- *
- *  @param state The control state that uses the image.
- *
- *  @return The image used for the specified state.
- */
-- (nullable UIImage *)imageForState:(UIControlState)state AS_WARN_UNUSED_RESULT;
-
-/**
- *  Sets the image to use for the specified state.
- *
- *  @param image The image to use for the specified state.
- *  @param state The control state that uses the specified title.
- */
-- (void)setImage:(nullable UIImage *)image forState:(UIControlState)state;
-
-/**
- *  Sets the background image to use for the specified state.
- *
- *  @param image The image to use for the specified state.
- *  @param state The control state that uses the specified title.
- */
-- (void)setBackgroundImage:(nullable UIImage *)image forState:(UIControlState)state;
-
-
-/**
- *  Returns the background image used for a button state.
- *
- *  @param state The control state that uses the image.
- *
- *  @return The background image used for the specified state.
- */
-- (nullable UIImage *)backgroundImageForState:(UIControlState)state AS_WARN_UNUSED_RESULT;
-
-@end
-
-NS_ASSUME_NONNULL_END
diff --git a/submodules/AsyncDisplayKit/Source/ASButtonNode.mm b/submodules/AsyncDisplayKit/Source/ASButtonNode.mm
deleted file mode 100644
index 828996bc9f..0000000000
--- a/submodules/AsyncDisplayKit/Source/ASButtonNode.mm
+++ /dev/null
@@ -1,561 +0,0 @@
-//
-//  ASButtonNode.mm
-//  Texture
-//
-//  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.
-//  Changes after 4/13/2017 are: Copyright (c) Pinterest, Inc.  All rights reserved.
-//  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
-//
-
-#import <AsyncDisplayKit/ASButtonNode+Private.h>
-#import <AsyncDisplayKit/ASButtonNode+Yoga.h>
-#import <AsyncDisplayKit/ASStackLayoutSpec.h>
-#import <AsyncDisplayKit/ASThread.h>
-#import <AsyncDisplayKit/ASDisplayNode+Subclasses.h>
-#import <AsyncDisplayKit/ASBackgroundLayoutSpec.h>
-#import <AsyncDisplayKit/ASInsetLayoutSpec.h>
-#import <AsyncDisplayKit/ASAbsoluteLayoutSpec.h>
-#import <AsyncDisplayKit/ASInternalHelpers.h>
-
-@implementation ASButtonNode
-
-@synthesize contentSpacing = _contentSpacing;
-@synthesize laysOutHorizontally = _laysOutHorizontally;
-@synthesize contentVerticalAlignment = _contentVerticalAlignment;
-@synthesize contentHorizontalAlignment = _contentHorizontalAlignment;
-@synthesize contentEdgeInsets = _contentEdgeInsets;
-@synthesize imageAlignment = _imageAlignment;
-@synthesize titleNode = _titleNode;
-@synthesize imageNode = _imageNode;
-@synthesize backgroundImageNode = _backgroundImageNode;
-
-#pragma mark - Lifecycle
-
-- (instancetype)init
-{
-  if (self = [super init]) {
-    self.automaticallyManagesSubnodes = YES;
-    
-    _contentSpacing = 8.0;
-    _laysOutHorizontally = YES;
-    _contentHorizontalAlignment = ASHorizontalAlignmentMiddle;
-    _contentVerticalAlignment = ASVerticalAlignmentCenter;
-    _contentEdgeInsets = UIEdgeInsetsZero;
-    _imageAlignment = ASButtonNodeImageAlignmentBeginning;
-    self.accessibilityTraits = self.defaultAccessibilityTraits;
-
-    [self updateYogaLayoutIfNeeded];
-  }
-  return self;
-}
-
-- (ASTextNode *)titleNode
-{
-  ASLockScopeSelf();
-  if (!_titleNode) {
-    _titleNode = [[ASTextNode alloc] init];
-#if TARGET_OS_IOS 
-      // tvOS needs access to the underlying view
-      // of the button node to add a touch handler.
-    [_titleNode setLayerBacked:YES];
-#endif
-    _titleNode.style.flexShrink = 1.0;
-  }
-  return _titleNode;
-}
-
-#pragma mark - Public Getter
-
-- (ASImageNode *)imageNode
-{
-  ASLockScopeSelf();
-  if (!_imageNode) {
-    _imageNode = [[ASImageNode alloc] init];
-    _imageNode.displayWithoutProcessing = true;
-    _imageNode.displaysAsynchronously = false;
-    [_imageNode setLayerBacked:YES];
-  }
-  return _imageNode;
-}
-
-- (ASImageNode *)backgroundImageNode
-{
-  ASLockScopeSelf();
-  if (!_backgroundImageNode) {
-    _backgroundImageNode = [[ASImageNode alloc] init];
-    _backgroundImageNode.displayWithoutProcessing = true;
-    _backgroundImageNode.displaysAsynchronously = false;
-    [_backgroundImageNode setLayerBacked:YES];
-    [_backgroundImageNode setContentMode:UIViewContentModeScaleToFill];
-  }
-  return _backgroundImageNode;
-}
-
-- (void)setLayerBacked:(BOOL)layerBacked
-{
-  ASDisplayNodeAssert(!layerBacked, @"ASButtonNode must not be layer backed!");
-  [super setLayerBacked:layerBacked];
-}
-
-- (void)setEnabled:(BOOL)enabled
-{
-  if (self.enabled != enabled) {
-    [super setEnabled:enabled];
-    self.accessibilityTraits = self.defaultAccessibilityTraits;
-    [self updateButtonContent];
-  }
-}
-
-- (void)setHighlighted:(BOOL)highlighted
-{
-  if (self.highlighted != highlighted) {
-    [super setHighlighted:highlighted];
-    [self updateButtonContent];
-  }
-}
-
-- (void)setSelected:(BOOL)selected
-{
-  if (self.selected != selected) {
-    [super setSelected:selected];
-    [self updateButtonContent];
-  }
-}
-
-- (void)updateButtonContent
-{
-  [self updateBackgroundImage];
-  [self updateImage];
-  [self updateTitle];
-}
-
-- (void)setDisplaysAsynchronously:(BOOL)displaysAsynchronously
-{
-  [super setDisplaysAsynchronously:displaysAsynchronously];
-  [self.backgroundImageNode setDisplaysAsynchronously:displaysAsynchronously];
-  [self.imageNode setDisplaysAsynchronously:displaysAsynchronously];
-  [self.titleNode setDisplaysAsynchronously:displaysAsynchronously];
-}
-
-- (void)updateImage
-{
-  [self lock];
-  
-  UIImage *newImage;
-  if (self.enabled == NO && _disabledImage) {
-    newImage = _disabledImage;
-  } else if (self.highlighted && self.selected && _selectedHighlightedImage) {
-    newImage = _selectedHighlightedImage;
-  } else if (self.highlighted && _highlightedImage) {
-    newImage = _highlightedImage;
-  } else if (self.selected && _selectedImage) {
-    newImage = _selectedImage;
-  } else {
-    newImage = _normalImage;
-  }
-  
-  if ((_imageNode != nil || newImage != nil) && newImage != self.imageNode.image) {
-    _imageNode.image = newImage;
-    [self unlock];
-
-    [self updateYogaLayoutIfNeeded];
-    [self setNeedsLayout];
-    return;
-  }
-  
-  [self unlock];
-}
-
-- (void)updateTitle
-{
-  [self lock];
-
-  NSAttributedString *newTitle;
-  if (self.enabled == NO && _disabledAttributedTitle) {
-    newTitle = _disabledAttributedTitle;
-  } else if (self.highlighted && self.selected && _selectedHighlightedAttributedTitle) {
-    newTitle = _selectedHighlightedAttributedTitle;
-  } else if (self.highlighted && _highlightedAttributedTitle) {
-    newTitle = _highlightedAttributedTitle;
-  } else if (self.selected && _selectedAttributedTitle) {
-    newTitle = _selectedAttributedTitle;
-  } else {
-    newTitle = _normalAttributedTitle;
-  }
-
-  // Calling self.titleNode is essential here because _titleNode is lazily created by the getter.
-  if ((_titleNode != nil || newTitle.length > 0) && [self.titleNode.attributedText isEqualToAttributedString:newTitle] == NO) {
-    _titleNode.attributedText = newTitle;
-    [self unlock];
-    
-    self.accessibilityLabel = self.defaultAccessibilityLabel;
-    [self updateYogaLayoutIfNeeded];
-    [self setNeedsLayout];
-    return;
-  }
-  
-  [self unlock];
-}
-
-- (void)updateBackgroundImage
-{
-  [self lock];
-  
-  UIImage *newImage;
-  if (self.enabled == NO && _disabledBackgroundImage) {
-    newImage = _disabledBackgroundImage;
-  } else if (self.highlighted && self.selected && _selectedHighlightedBackgroundImage) {
-    newImage = _selectedHighlightedBackgroundImage;
-  } else if (self.highlighted && _highlightedBackgroundImage) {
-    newImage = _highlightedBackgroundImage;
-  } else if (self.selected && _selectedBackgroundImage) {
-    newImage = _selectedBackgroundImage;
-  } else {
-    newImage = _normalBackgroundImage;
-  }
-  
-  if ((_backgroundImageNode != nil || newImage != nil) && newImage != self.backgroundImageNode.image) {
-    _backgroundImageNode.image = newImage;
-    [self unlock];
-
-    [self updateYogaLayoutIfNeeded];
-    [self setNeedsLayout];
-    return;
-  }
-  
-  [self unlock];
-}
-
-- (CGFloat)contentSpacing
-{
-  ASLockScopeSelf();
-  return _contentSpacing;
-}
-
-- (void)setContentSpacing:(CGFloat)contentSpacing
-{
-  if (ASLockedSelfCompareAssign(_contentSpacing, contentSpacing)) {
-    [self updateYogaLayoutIfNeeded];
-    [self setNeedsLayout];
-  }
-}
-
-- (BOOL)laysOutHorizontally
-{
-  ASLockScopeSelf();
-  return _laysOutHorizontally;
-}
-
-- (void)setLaysOutHorizontally:(BOOL)laysOutHorizontally
-{
-  if (ASLockedSelfCompareAssign(_laysOutHorizontally, laysOutHorizontally)) {
-    [self updateYogaLayoutIfNeeded];
-    [self setNeedsLayout];
-  }
-}
-
-- (ASVerticalAlignment)contentVerticalAlignment
-{
-  ASLockScopeSelf();
-  return _contentVerticalAlignment;
-}
-
-- (void)setContentVerticalAlignment:(ASVerticalAlignment)contentVerticalAlignment
-{
-  ASLockScopeSelf();
-  _contentVerticalAlignment = contentVerticalAlignment;
-}
-
-- (ASHorizontalAlignment)contentHorizontalAlignment
-{
-  ASLockScopeSelf();
-  return _contentHorizontalAlignment;
-}
-
-- (void)setContentHorizontalAlignment:(ASHorizontalAlignment)contentHorizontalAlignment
-{
-  ASLockScopeSelf();
-  _contentHorizontalAlignment = contentHorizontalAlignment;
-}
-
-- (UIEdgeInsets)contentEdgeInsets
-{
-  ASLockScopeSelf();
-  return _contentEdgeInsets;
-}
-
-- (void)setContentEdgeInsets:(UIEdgeInsets)contentEdgeInsets
-{
-  ASLockScopeSelf();
-  _contentEdgeInsets = contentEdgeInsets;
-}
-
-- (ASButtonNodeImageAlignment)imageAlignment
-{
-  ASLockScopeSelf();
-  return _imageAlignment;
-}
-
-- (void)setImageAlignment:(ASButtonNodeImageAlignment)imageAlignment
-{
-  ASLockScopeSelf();
-  _imageAlignment = imageAlignment;
-}
-
-
-#if TARGET_OS_IOS
-- (void)setTitle:(NSString *)title withFont:(UIFont *)font withColor:(UIColor *)color forState:(UIControlState)state
-{
-  NSDictionary *attributes = @{
-    NSFontAttributeName: font ? : [UIFont systemFontOfSize:[UIFont buttonFontSize]],
-    NSForegroundColorAttributeName : color ? : [UIColor blackColor]
-  };
-    
-  NSAttributedString *string = [[NSAttributedString alloc] initWithString:title attributes:attributes];
-  [self setAttributedTitle:string forState:state];
-}
-#endif
-
-- (NSAttributedString *)attributedTitleForState:(UIControlState)state
-{
-  ASLockScopeSelf();
-  switch (state) {
-    case UIControlStateNormal:
-      return _normalAttributedTitle;
-      
-    case UIControlStateHighlighted:
-      return _highlightedAttributedTitle;
-      
-    case UIControlStateSelected:
-      return _selectedAttributedTitle;
-        
-    case UIControlStateSelected | UIControlStateHighlighted:
-      return _selectedHighlightedAttributedTitle;
-      
-    case UIControlStateDisabled:
-      return _disabledAttributedTitle;
-          
-    default:
-      return _normalAttributedTitle;
-  }
-}
-
-- (void)setAttributedTitle:(NSAttributedString *)title forState:(UIControlState)state
-{
-  {
-    ASLockScopeSelf();
-    switch (state) {
-      case UIControlStateNormal:
-        _normalAttributedTitle = [title copy];
-        break;
-        
-      case UIControlStateHighlighted:
-        _highlightedAttributedTitle = [title copy];
-        break;
-        
-      case UIControlStateSelected:
-        _selectedAttributedTitle = [title copy];
-        break;
-            
-      case UIControlStateSelected | UIControlStateHighlighted:
-        _selectedHighlightedAttributedTitle = [title copy];
-        break;
-        
-      case UIControlStateDisabled:
-        _disabledAttributedTitle = [title copy];
-        break;
-        
-      default:
-        break;
-    }
-  }
-
-  [self updateTitle];
-}
-
-- (UIImage *)imageForState:(UIControlState)state
-{
-  ASLockScopeSelf();
-  switch (state) {
-    case UIControlStateNormal:
-      return _normalImage;
-      
-    case UIControlStateHighlighted:
-      return _highlightedImage;
-      
-    case UIControlStateSelected:
-      return _selectedImage;
-      
-    case UIControlStateSelected | UIControlStateHighlighted:
-      return _selectedHighlightedImage;
-          
-    case UIControlStateDisabled:
-      return _disabledImage;
-      
-    default:
-      return _normalImage;
-  }
-}
-
-- (void)setImage:(UIImage *)image forState:(UIControlState)state
-{
-  {
-    ASLockScopeSelf();
-    switch (state) {
-      case UIControlStateNormal:
-        _normalImage = image;
-        break;
-        
-      case UIControlStateHighlighted:
-        _highlightedImage = image;
-        break;
-        
-      case UIControlStateSelected:
-        _selectedImage = image;
-        break;
-      
-      case UIControlStateSelected | UIControlStateHighlighted:
-        _selectedHighlightedImage = image;
-        break;
-            
-      case UIControlStateDisabled:
-        _disabledImage = image;
-        break;
-        
-      default:
-        break;
-    }
-  }
-
-  [self updateImage];
-}
-
-- (UIImage *)backgroundImageForState:(UIControlState)state
-{
-  ASLockScopeSelf();
-  switch (state) {
-    case UIControlStateNormal:
-      return _normalBackgroundImage;
-    
-    case UIControlStateHighlighted:
-      return _highlightedBackgroundImage;
-    
-    case UIControlStateSelected:
-      return _selectedBackgroundImage;
-    
-    case UIControlStateSelected | UIControlStateHighlighted:
-      return _selectedHighlightedBackgroundImage;
-    
-    case UIControlStateDisabled:
-      return _disabledBackgroundImage;
-    
-    default:
-      return _normalBackgroundImage;
-  }
-}
-
-- (void)setBackgroundImage:(UIImage *)image forState:(UIControlState)state
-{
-  {
-    ASLockScopeSelf();
-    switch (state) {
-      case UIControlStateNormal:
-        _normalBackgroundImage = image;
-        break;
-        
-      case UIControlStateHighlighted:
-        _highlightedBackgroundImage = image;
-        break;
-        
-      case UIControlStateSelected:
-        _selectedBackgroundImage = image;
-        break;
-            
-      case UIControlStateSelected | UIControlStateHighlighted:
-        _selectedHighlightedBackgroundImage = image;
-        break;
-        
-      case UIControlStateDisabled:
-        _disabledBackgroundImage = image;
-        break;
-        
-      default:
-        break;
-    }
-  }
-
-  [self updateBackgroundImage];
-}
-
-
-- (NSString *)defaultAccessibilityLabel
-{
-  ASLockScopeSelf();
-  return _titleNode.defaultAccessibilityLabel;
-}
-
-- (UIAccessibilityTraits)defaultAccessibilityTraits
-{
-  return self.enabled ? UIAccessibilityTraitButton
-                      : (UIAccessibilityTraitButton | UIAccessibilityTraitNotEnabled);
-}
-
-#pragma mark - Layout
-
-#if !YOGA
-- (ASLayoutSpec *)layoutSpecThatFits:(ASSizeRange)constrainedSize
-{
-    UIEdgeInsets contentEdgeInsets;
-    ASButtonNodeImageAlignment imageAlignment;
-    ASLayoutSpec *spec;
-    ASStackLayoutSpec *stack = [[ASStackLayoutSpec alloc] init];
-    {
-        ASLockScopeSelf();
-        stack.direction = _laysOutHorizontally ? ASStackLayoutDirectionHorizontal : ASStackLayoutDirectionVertical;
-        stack.spacing = _contentSpacing;
-        stack.horizontalAlignment = _contentHorizontalAlignment;
-        stack.verticalAlignment = _contentVerticalAlignment;
-        
-        contentEdgeInsets = _contentEdgeInsets;
-        imageAlignment = _imageAlignment;
-    }
-    
-    NSMutableArray *children = [[NSMutableArray alloc] initWithCapacity:2];
-    if (_imageNode.image) {
-        [children addObject:_imageNode];
-    }
-    
-    if (_titleNode.attributedText.length > 0) {
-        if (imageAlignment == ASButtonNodeImageAlignmentBeginning) {
-            [children addObject:_titleNode];
-        } else {
-            [children insertObject:_titleNode atIndex:0];
-        }
-    }
-    
-    stack.children = children;
-    
-    spec = stack;
-    
-    if (UIEdgeInsetsEqualToEdgeInsets(UIEdgeInsetsZero, contentEdgeInsets) == NO) {
-        spec = [ASInsetLayoutSpec insetLayoutSpecWithInsets:contentEdgeInsets child:spec];
-    }
-    
-    if (_backgroundImageNode.image) {
-        spec = [ASBackgroundLayoutSpec backgroundLayoutSpecWithChild:spec background:_backgroundImageNode];
-    }
-    
-    return spec;
-}
-#endif
-
-- (void)layout
-{
-  [super layout];
-
-  _backgroundImageNode.hidden = (_backgroundImageNode.image == nil);
-  _imageNode.hidden = (_imageNode.image == nil);
-  _titleNode.hidden = (_titleNode.attributedText.length == 0);
-}
-
-@end
diff --git a/submodules/AsyncDisplayKit/Source/ASCellNode.h b/submodules/AsyncDisplayKit/Source/ASCellNode.h
deleted file mode 100644
index 35d836ce5f..0000000000
--- a/submodules/AsyncDisplayKit/Source/ASCellNode.h
+++ /dev/null
@@ -1,263 +0,0 @@
-//
-//  ASCellNode.h
-//  Texture
-//
-//  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.
-//  Changes after 4/13/2017 are: Copyright (c) Pinterest, Inc.  All rights reserved.
-//  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
-//
-
-#ifndef MINIMAL_ASDK
-
-#import <AsyncDisplayKit/ASDisplayNode.h>
-
-NS_ASSUME_NONNULL_BEGIN
-
-@class ASCellNode, ASTextNode;
-@protocol ASRangeManagingNode;
-
-typedef NSUInteger ASCellNodeAnimation;
-
-typedef NS_ENUM(NSUInteger, ASCellNodeVisibilityEvent) {
-  /**
-   * Indicates a cell has just became visible
-   */
-  ASCellNodeVisibilityEventVisible,
-  /**
-   * Its position (determined by scrollView.contentOffset) has changed while at least 1px remains visible.
-   * It is possible that 100% of the cell is visible both before and after and only its position has changed,
-   * or that the position change has resulted in more or less of the cell being visible.
-   * Use CGRectIntersect between cellFrame and scrollView.bounds to get this rectangle
-   */
-  ASCellNodeVisibilityEventVisibleRectChanged,
-  /**
-   * Indicates a cell is no longer visible
-   */
-  ASCellNodeVisibilityEventInvisible,
-  /**
-   * Indicates user has started dragging the visible cell
-   */
-  ASCellNodeVisibilityEventWillBeginDragging,
-  /**
-   * Indicates user has ended dragging the visible cell
-   */
-  ASCellNodeVisibilityEventDidEndDragging,
-};
-
-/**
- * Generic cell node.  Subclass this instead of `ASDisplayNode` to use with `ASTableView` and `ASCollectionView`.
- 
- * @note When a cell node is contained inside a collection view (or table view),
- * calling `-setNeedsLayout` will also notify the collection on the main thread
- * so that the collection can update its item layout if the cell's size changed.
- */
-@interface ASCellNode : ASDisplayNode
-
-/**
- * @abstract When enabled, ensures that the cell is completely displayed before allowed onscreen.
- *
- * @default NO
- * @discussion Normally, ASCellNodes are preloaded and have finished display before they are onscreen.
- * However, if the Table or Collection's rangeTuningParameters are set to small values (or 0),
- * or if the user is scrolling rapidly on a slow device, it is possible for a cell's display to
- * be incomplete when it becomes visible.
- *
- * In this case, normally placeholder states are shown and scrolling continues uninterrupted.
- * The finished, drawn content is then shown as soon as it is ready.
- *
- * With this property set to YES, the main thread will be blocked until display is complete for
- * the cell.  This is more similar to UIKit, and in fact makes AsyncDisplayKit scrolling visually
- * indistinguishable from UIKit's, except being faster.
- *
- * Using this option does not eliminate all of the performance advantages of AsyncDisplayKit.
- * Normally, a cell has been preloading and is almost done when it reaches the screen, so the
- * blocking time is very short.  If the rangeTuningParameters are set to 0, still this option
- * outperforms UIKit: while the main thread is waiting, subnode display executes concurrently.
- */
-@property BOOL neverShowPlaceholders;
-
-/*
- * The kind of supplementary element this node represents, if any.
- *
- * @return The supplementary element kind, or @c nil if this node does not represent a supplementary element.
- */
-@property (nullable, copy, readonly) NSString *supplementaryElementKind;
-
-/*
- * The layout attributes currently assigned to this node, if any.
- *
- * @discussion This property is useful because it is set before @c collectionView:willDisplayNode:forItemAtIndexPath:
- *   is called, when the node is not yet in the hierarchy and its frame cannot be converted to/from other nodes. Instead
- *   you can use the layout attributes object to learn where and how the cell will be displayed.
- */
-@property (nullable, copy, readonly) UICollectionViewLayoutAttributes *layoutAttributes;
-
-/**
- * A Boolean value that is synchronized with the underlying collection or tableView cell property.
- * Setting this value is equivalent to calling selectItem / deselectItem on the collection or table.
- */
-@property (getter=isSelected) BOOL selected;
-
-/**
- * A Boolean value that is synchronized with the underlying collection or tableView cell property.
- * Setting this value is equivalent to calling highlightItem / unHighlightItem on the collection or table.
- */
-@property (getter=isHighlighted) BOOL highlighted;
-
-/**
- * The current index path of this cell node, or @c nil if this node is
- * not a valid item inside a table node or collection node.
- */
-@property (nullable, copy, readonly) NSIndexPath *indexPath;
-
-/**
- * BETA: API is under development. We will attempt to provide an easy migration pathway for any changes.
- *
- * The view-model currently assigned to this node, if any.
- *
- * This property may be set off the main thread, but this method will never be invoked concurrently on the 
- */
-@property (nullable) id nodeModel;
-
-/**
- * Asks the node whether it can be updated to the given node model.
- *
- * The default implementation returns YES if the class matches that of the current view-model.
- */
-- (BOOL)canUpdateToNodeModel:(id)nodeModel;
-
-/**
- * The backing view controller, or @c nil if the node wasn't initialized with backing view controller
- * @note This property must be accessed on the main thread.
- */
-@property (nullable, nonatomic, readonly) UIViewController *viewController;
-
-
-/**
- * The table- or collection-node that this cell is a member of, if any.
- */
-@property (nullable, weak, readonly) id<ASRangeManagingNode> owningNode;
-
-/*
- * ASCellNode must forward touch events in order for UITableView and UICollectionView tap handling to work. Overriding
- * these methods (e.g. for highlighting) requires the super method be called.
- */
-- (void)touchesBegan:(NSSet<UITouch *> *)touches withEvent:(nullable UIEvent *)event ASDISPLAYNODE_REQUIRES_SUPER;
-- (void)touchesMoved:(NSSet<UITouch *> *)touches withEvent:(nullable UIEvent *)event ASDISPLAYNODE_REQUIRES_SUPER;
-- (void)touchesEnded:(NSSet<UITouch *> *)touches withEvent:(nullable UIEvent *)event ASDISPLAYNODE_REQUIRES_SUPER;
-- (void)touchesCancelled:(nullable NSSet<UITouch *> *)touches withEvent:(nullable UIEvent *)event ASDISPLAYNODE_REQUIRES_SUPER;
-
-/** 
- * Called by the system when ASCellNode is used with an ASCollectionNode.  It will not be called by ASTableNode.
- * When the UICollectionViewLayout object returns a new UICollectionViewLayoutAttributes object, the corresponding ASCellNode will be updated.
- * See UICollectionViewCell's applyLayoutAttributes: for a full description.
-*/
-- (void)applyLayoutAttributes:(UICollectionViewLayoutAttributes *)layoutAttributes;
-
-/**
- * @abstract Initializes a cell with a given view controller block.
- *
- * @param viewControllerBlock The block that will be used to create the backing view controller.
- * @param didLoadBlock The block that will be called after the view controller's view is loaded.
- *
- * @return An ASCellNode created using the root view of the view controller provided by the viewControllerBlock.
- * The view controller's root view is resized to match the calculated size produced during layout.
- *
- */
-- (instancetype)initWithViewControllerBlock:(ASDisplayNodeViewControllerBlock)viewControllerBlock didLoadBlock:(nullable ASDisplayNodeDidLoadBlock)didLoadBlock;
-
-/**
- * @abstract Notifies the cell node of certain visibility events, such as changing visible rect.
- *
- * @warning In cases where an ASCellNode is used as a plain node – i.e. not returned from the
- *   nodeBlockForItemAtIndexPath/nodeForItemAtIndexPath data source methods – this method will
- *   deliver only the `Visible` and `Invisible` events, `scrollView` will be nil, and
- *   `cellFrame` will be the zero rect.
- */
-- (void)cellNodeVisibilityEvent:(ASCellNodeVisibilityEvent)event inScrollView:(nullable UIScrollView *)scrollView withCellFrame:(CGRect)cellFrame;
-
-#pragma mark - UITableViewCell specific passthrough properties
-
-/* @abstract The selection style when a tap on a cell occurs
- * @default UITableViewCellSelectionStyleDefault
- * ASTableView uses these properties when configuring UITableViewCells that host ASCellNodes.
- */
-@property UITableViewCellSelectionStyle selectionStyle;
-
-/* @abstract The focus style when a cell is focused
- * @default UITableViewCellFocusStyleDefault
- * ASTableView uses these properties when configuring UITableViewCells that host ASCellNodes.
- */
-@property UITableViewCellFocusStyle focusStyle;
-
-/* @abstract The view used as the background of the cell when it is selected.
- * ASTableView uses these properties when configuring UITableViewCells that host ASCellNodes.
- * ASCollectionView uses these properties when configuring UICollectionViewCells that host ASCellNodes.
- */
-@property (nullable) UIView *selectedBackgroundView;
-
-/* @abstract The view used as the background of the cell.
- * ASTableView uses these properties when configuring UITableViewCells that host ASCellNodes.
- * ASCollectionView uses these properties when configuring UICollectionViewCells that host ASCellNodes.
- */
-@property (nullable) UIView *backgroundView;
-
-/* @abstract The accessory type view on the right side of the cell. Please take care of your ASLayoutSpec so that doesn't overlay the accessoryView
- * @default UITableViewCellAccessoryNone
- * ASTableView uses these properties when configuring UITableViewCells that host ASCellNodes.
- */
-@property UITableViewCellAccessoryType accessoryType;
-
-/* @abstract The inset of the cell separator line
- * ASTableView uses these properties when configuring UITableViewCells that host ASCellNodes.
- */
-@property UIEdgeInsets separatorInset;
-
-@end
-
-@interface ASCellNode (Unavailable)
-
-- (instancetype)initWithLayerBlock:(ASDisplayNodeLayerBlock)viewBlock didLoadBlock:(nullable ASDisplayNodeDidLoadBlock)didLoadBlock NS_UNAVAILABLE;
-
-- (instancetype)initWithViewBlock:(ASDisplayNodeViewBlock)viewBlock didLoadBlock:(nullable ASDisplayNodeDidLoadBlock)didLoadBlock NS_UNAVAILABLE;
-
-- (void)setLayerBacked:(BOOL)layerBacked AS_UNAVAILABLE("ASCellNode does not support layer-backing, although subnodes may be layer-backed.");
-
-@end
-
-
-/**
- * Simple label-style cell node.  Read its source for an example of custom <ASCellNode>s.
- */
-@interface ASTextCellNode : ASCellNode
-
-/**
- * Initializes a text cell with given text attributes and text insets
- */
-- (instancetype)initWithAttributes:(NSDictionary *)textAttributes insets:(UIEdgeInsets)textInsets;
-
-/**
- * Text to display.
- */
-@property (nullable, copy) NSString *text;
-
-/**
- * A dictionary containing key-value pairs for text attributes. You can specify the font, text color, text shadow color, and text shadow offset using the keys listed in NSString UIKit Additions Reference.
- */
-@property (copy) NSDictionary<NSAttributedStringKey, id> *textAttributes;
-
-/**
- * The text inset or outset for each edge. The default value is 15.0 horizontal and 11.0 vertical padding.
- */
-@property UIEdgeInsets textInsets;
-
-/**
- * The text node used by this cell node.
- */
-@property (readonly) ASTextNode *textNode;
-
-@end
-
-NS_ASSUME_NONNULL_END
-
-#endif
diff --git a/submodules/AsyncDisplayKit/Source/ASCellNode.mm b/submodules/AsyncDisplayKit/Source/ASCellNode.mm
deleted file mode 100644
index 5793dfabd7..0000000000
--- a/submodules/AsyncDisplayKit/Source/ASCellNode.mm
+++ /dev/null
@@ -1,488 +0,0 @@
-//
-//  ASCellNode.mm
-//  Texture
-//
-//  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.
-//  Changes after 4/13/2017 are: Copyright (c) Pinterest, Inc.  All rights reserved.
-//  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
-//
-
-#ifndef MINIMAL_ASDK
-
-#import <AsyncDisplayKit/ASCellNode+Internal.h>
-
-#import <AsyncDisplayKit/ASEqualityHelpers.h>
-#import <AsyncDisplayKit/ASInternalHelpers.h>
-#import <AsyncDisplayKit/ASDisplayNode+FrameworkPrivate.h>
-#import <AsyncDisplayKit/ASCollectionView+Undeprecated.h>
-#import <AsyncDisplayKit/ASCollectionElement.h>
-#import <AsyncDisplayKit/ASTableView+Undeprecated.h>
-#import <AsyncDisplayKit/_ASDisplayView.h>
-#import <AsyncDisplayKit/ASDisplayNode+Subclasses.h>
-#import <AsyncDisplayKit/ASTextNode.h>
-#import <AsyncDisplayKit/ASCollectionNode.h>
-#import <AsyncDisplayKit/ASTableNode.h>
-
-#import <AsyncDisplayKit/ASViewController.h>
-#import <AsyncDisplayKit/ASInsetLayoutSpec.h>
-#import <AsyncDisplayKit/ASDisplayNodeInternal.h>
-
-#pragma mark -
-#pragma mark ASCellNode
-
-@interface ASCellNode ()
-{
-  ASDisplayNodeViewControllerBlock _viewControllerBlock;
-  ASDisplayNodeDidLoadBlock _viewControllerDidLoadBlock;
-  ASDisplayNode *_viewControllerNode;
-  UIViewController *_viewController;
-  BOOL _suspendInteractionDelegate;
-  BOOL _selected;
-  BOOL _highlighted;
-  UICollectionViewLayoutAttributes *_layoutAttributes;
-}
-
-@end
-
-@implementation ASCellNode
-@synthesize interactionDelegate = _interactionDelegate;
-
-- (instancetype)init
-{
-  if (!(self = [super init]))
-    return nil;
-
-  // Use UITableViewCell defaults
-  _selectionStyle = UITableViewCellSelectionStyleDefault;
-  _focusStyle = UITableViewCellFocusStyleDefault;
-  self.clipsToBounds = YES;
-
-  return self;
-}
-
-- (instancetype)initWithViewControllerBlock:(ASDisplayNodeViewControllerBlock)viewControllerBlock didLoadBlock:(ASDisplayNodeDidLoadBlock)didLoadBlock
-{
-  if (!(self = [super init]))
-    return nil;
-  
-  ASDisplayNodeAssertNotNil(viewControllerBlock, @"should initialize with a valid block that returns a UIViewController");
-  _viewControllerBlock = viewControllerBlock;
-  _viewControllerDidLoadBlock = didLoadBlock;
-
-  return self;
-}
-
-- (void)didLoad
-{
-  [super didLoad];
-
-  if (_viewControllerBlock != nil) {
-
-    _viewController = _viewControllerBlock();
-    _viewControllerBlock = nil;
-
-    if ([_viewController isKindOfClass:[ASViewController class]]) {
-      ASViewController *asViewController = (ASViewController *)_viewController;
-      _viewControllerNode = asViewController.node;
-      [_viewController loadViewIfNeeded];
-    } else {
-      // Careful to avoid retain cycle
-      UIViewController *viewController = _viewController;
-      _viewControllerNode = [[ASDisplayNode alloc] initWithViewBlock:^{
-        return viewController.view;
-      }];
-    }
-    [self addSubnode:_viewControllerNode];
-
-    // Since we just loaded our node, and added _viewControllerNode as a subnode,
-    // _viewControllerNode must have just loaded its view, so now is an appropriate
-    // time to execute our didLoadBlock, if we were given one.
-    if (_viewControllerDidLoadBlock != nil) {
-      _viewControllerDidLoadBlock(self);
-      _viewControllerDidLoadBlock = nil;
-    }
-  }
-}
-
-- (void)layout
-{
-  [super layout];
-  
-  _viewControllerNode.frame = self.bounds;
-}
-
-- (void)_rootNodeDidInvalidateSize
-{
-  if (_interactionDelegate != nil) {
-    [_interactionDelegate nodeDidInvalidateSize:self];
-  } else {
-    [super _rootNodeDidInvalidateSize];
-  }
-}
-
-- (void)_layoutTransitionMeasurementDidFinish
-{
-  if (_interactionDelegate != nil) {
-    [_interactionDelegate nodeDidInvalidateSize:self];
-  } else {
-    [super _layoutTransitionMeasurementDidFinish];
-  }
-}
-
-- (BOOL)isSelected
-{
-  return ASLockedSelf(_selected);
-}
-
-- (void)setSelected:(BOOL)selected
-{
-  if (ASLockedSelfCompareAssign(_selected, selected)) {
-    if (!_suspendInteractionDelegate) {
-      ASPerformBlockOnMainThread(^{
-        [_interactionDelegate nodeSelectedStateDidChange:self];
-      });
-    }
-  }
-}
-
-- (BOOL)isHighlighted
-{
-  return ASLockedSelf(_highlighted);
-}
-
-- (void)setHighlighted:(BOOL)highlighted
-{
-  if (ASLockedSelfCompareAssign(_highlighted, highlighted)) {
-    if (!_suspendInteractionDelegate) {
-      ASPerformBlockOnMainThread(^{
-        [_interactionDelegate nodeHighlightedStateDidChange:self];
-      });
-    }
-  }
-}
-
-- (void)__setSelectedFromUIKit:(BOOL)selected;
-{
-  // Note: Race condition could mean redundant sets. Risk is low.
-  if (ASLockedSelf(_selected != selected)) {
-    _suspendInteractionDelegate = YES;
-    self.selected = selected;
-    _suspendInteractionDelegate = NO;
-  }
-}
-
-- (void)__setHighlightedFromUIKit:(BOOL)highlighted;
-{
-  // Note: Race condition could mean redundant sets. Risk is low.
-  if (ASLockedSelf(_highlighted != highlighted)) {
-    _suspendInteractionDelegate = YES;
-    self.highlighted = highlighted;
-    _suspendInteractionDelegate = NO;
-  }
-}
-
-- (BOOL)canUpdateToNodeModel:(id)nodeModel
-{
-  return [self.nodeModel class] == [nodeModel class];
-}
-
-- (NSIndexPath *)indexPath
-{
-  return [self.owningNode indexPathForNode:self];
-}
-
-- (UIViewController *)viewController
-{
-  ASDisplayNodeAssertMainThread();
-  // Force the view to load so that we will create the
-  // view controller if we haven't already.
-  if (self.isNodeLoaded == NO) {
-    [self view];
-  }
-  return _viewController;
-}
-
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wobjc-missing-super-calls"
-
-- (void)touchesBegan:(NSSet *)touches withEvent:(UIEvent *)event
-{
-  ASDisplayNodeAssertMainThread();
-  ASDisplayNodeAssert([self.view isKindOfClass:_ASDisplayView.class], @"ASCellNode views must be of type _ASDisplayView");
-  [(_ASDisplayView *)self.view __forwardTouchesBegan:touches withEvent:event];
-}
-
-- (void)touchesMoved:(NSSet *)touches withEvent:(UIEvent *)event
-{
-  ASDisplayNodeAssertMainThread();
-  ASDisplayNodeAssert([self.view isKindOfClass:_ASDisplayView.class], @"ASCellNode views must be of type _ASDisplayView");
-  [(_ASDisplayView *)self.view __forwardTouchesMoved:touches withEvent:event];
-}
-
-- (void)touchesEnded:(NSSet *)touches withEvent:(UIEvent *)event
-{
-  ASDisplayNodeAssertMainThread();
-  ASDisplayNodeAssert([self.view isKindOfClass:_ASDisplayView.class], @"ASCellNode views must be of type _ASDisplayView");
-  [(_ASDisplayView *)self.view __forwardTouchesEnded:touches withEvent:event];
-}
-
-- (void)touchesCancelled:(NSSet *)touches withEvent:(UIEvent *)event
-{
-  ASDisplayNodeAssertMainThread();
-  ASDisplayNodeAssert([self.view isKindOfClass:_ASDisplayView.class], @"ASCellNode views must be of type _ASDisplayView");
-  [(_ASDisplayView *)self.view __forwardTouchesCancelled:touches withEvent:event];
-}
-
-#pragma clang diagnostic pop
-
-- (UICollectionViewLayoutAttributes *)layoutAttributes
-{
-  return ASLockedSelf(_layoutAttributes);
-}
-
-- (void)setLayoutAttributes:(UICollectionViewLayoutAttributes *)layoutAttributes
-{
-  ASDisplayNodeAssertMainThread();
-  if (ASLockedSelfCompareAssignObjects(_layoutAttributes, layoutAttributes)) {
-    if (layoutAttributes != nil) {
-      [self applyLayoutAttributes:layoutAttributes];
-    }
-  }
-}
-
-- (void)applyLayoutAttributes:(UICollectionViewLayoutAttributes *)layoutAttributes
-{
-  // To be overriden by subclasses
-}
-
-- (void)cellNodeVisibilityEvent:(ASCellNodeVisibilityEvent)event inScrollView:(UIScrollView *)scrollView withCellFrame:(CGRect)cellFrame
-{
-  // To be overriden by subclasses
-}
-
-- (void)didEnterVisibleState
-{
-  [super didEnterVisibleState];
-  if (self.neverShowPlaceholders) {
-    [self recursivelyEnsureDisplaySynchronously:YES];
-  }
-  [self handleVisibilityChange:YES];
-}
-
-- (void)didExitVisibleState
-{
-  [super didExitVisibleState];
-  [self handleVisibilityChange:NO];
-}
-
-+ (BOOL)requestsVisibilityNotifications
-{
-  static NSCache<Class, NSNumber *> *cache;
-  static dispatch_once_t onceToken;
-  dispatch_once(&onceToken, ^{
-    cache = [[NSCache alloc] init];
-  });
-  NSNumber *result = [cache objectForKey:self];
-  if (result == nil) {
-    BOOL overrides = ASSubclassOverridesSelector([ASCellNode class], self, @selector(cellNodeVisibilityEvent:inScrollView:withCellFrame:));
-    result = overrides ? (NSNumber *)kCFBooleanTrue : (NSNumber *)kCFBooleanFalse;
-    [cache setObject:result forKey:self];
-  }
-  return (result == (NSNumber *)kCFBooleanTrue);
-}
-
-- (void)handleVisibilityChange:(BOOL)isVisible
-{
-  if ([self.class requestsVisibilityNotifications] == NO) {
-    return; // The work below is expensive, and only valuable for subclasses watching visibility events.
-  }
-  
-  // NOTE: This assertion is failing in some apps and will be enabled soon.
-  // ASDisplayNodeAssert(self.isNodeLoaded, @"Node should be loaded in order for it to become visible or invisible.  If not in this situation, we shouldn't trigger creating the view.");
-  
-  UIView *view = self.view;
-  CGRect cellFrame = CGRectZero;
-  
-  // Ensure our _scrollView is still valid before converting.  It's also possible that we have already been removed from the _scrollView,
-  // in which case it is not valid to perform a convertRect (this actually crashes on iOS 8).
-  UIScrollView *scrollView = (_scrollView != nil && view.superview != nil && [view isDescendantOfView:_scrollView]) ? _scrollView : nil;
-  if (scrollView) {
-    cellFrame = [view convertRect:view.bounds toView:_scrollView];
-  }
-  
-  // If we did not convert, we'll pass along CGRectZero and a nil scrollView.  The EventInvisible call is thus equivalent to
-  // didExitVisibileState, but is more convenient for the developer than implementing multiple methods.
-  [self cellNodeVisibilityEvent:isVisible ? ASCellNodeVisibilityEventVisible
-                                          : ASCellNodeVisibilityEventInvisible
-                   inScrollView:scrollView
-                  withCellFrame:cellFrame];
-}
-
-- (NSMutableArray<NSDictionary *> *)propertiesForDebugDescription
-{
-  NSMutableArray *result = [super propertiesForDebugDescription];
-  
-  UIScrollView *scrollView = self.scrollView;
-  
-  ASDisplayNode *owningNode = scrollView.asyncdisplaykit_node;
-  if ([owningNode isKindOfClass:[ASCollectionNode class]]) {
-    NSIndexPath *ip = [(ASCollectionNode *)owningNode indexPathForNode:self];
-    if (ip != nil) {
-      [result addObject:@{ @"indexPath" : ip }];
-    }
-    [result addObject:@{ @"collectionNode" : owningNode }];
-  } else if ([owningNode isKindOfClass:[ASTableNode class]]) {
-    NSIndexPath *ip = [(ASTableNode *)owningNode indexPathForNode:self];
-    if (ip != nil) {
-      [result addObject:@{ @"indexPath" : ip }];
-    }
-    [result addObject:@{ @"tableNode" : owningNode }];
-  
-  } else if ([scrollView isKindOfClass:[ASCollectionView class]]) {
-    NSIndexPath *ip = [(ASCollectionView *)scrollView indexPathForNode:self];
-    if (ip != nil) {
-      [result addObject:@{ @"indexPath" : ip }];
-    }
-    [result addObject:@{ @"collectionView" : ASObjectDescriptionMakeTiny(scrollView) }];
-    
-  } else if ([scrollView isKindOfClass:[ASTableView class]]) {
-    NSIndexPath *ip = [(ASTableView *)scrollView indexPathForNode:self];
-    if (ip != nil) {
-      [result addObject:@{ @"indexPath" : ip }];
-    }
-    [result addObject:@{ @"tableView" : ASObjectDescriptionMakeTiny(scrollView) }];
-  }
-
-  return result;
-}
-
-- (NSString *)supplementaryElementKind
-{
-  return self.collectionElement.supplementaryElementKind;
-}
-
-- (BOOL)supportsLayerBacking
-{
-  return NO;
-}
-
-- (BOOL)shouldUseUIKitCell
-{
-  return NO;
-}
-
-@end
-
-
-#pragma mark -
-#pragma mark ASWrapperCellNode
-
-// TODO: Consider if other calls, such as willDisplayCell, should be bridged to this class.
-@implementation ASWrapperCellNode : ASCellNode
-
-- (BOOL)shouldUseUIKitCell
-{
-  return YES;
-}
-
-@end
-
-
-#pragma mark -
-#pragma mark ASTextCellNode
-
-@implementation ASTextCellNode {
-  NSDictionary<NSAttributedStringKey, id> *_textAttributes;
-  UIEdgeInsets _textInsets;
-  NSString *_text;
-}
-
-static const CGFloat kASTextCellNodeDefaultFontSize = 18.0f;
-static const CGFloat kASTextCellNodeDefaultHorizontalPadding = 15.0f;
-static const CGFloat kASTextCellNodeDefaultVerticalPadding = 11.0f;
-
-- (instancetype)init
-{
-  return [self initWithAttributes:[ASTextCellNode defaultTextAttributes] insets:[ASTextCellNode defaultTextInsets]];
-}
-
-- (instancetype)initWithAttributes:(NSDictionary *)textAttributes insets:(UIEdgeInsets)textInsets
-{
-  self = [super init];
-  if (self) {
-    _textInsets = textInsets;
-    _textAttributes = [textAttributes copy];
-    _textNode = [[ASTextNode alloc] init];
-    self.automaticallyManagesSubnodes = YES;
-  }
-  return self;
-}
-
-- (ASLayoutSpec *)layoutSpecThatFits:(ASSizeRange)constrainedSize
-{
-  return [ASInsetLayoutSpec insetLayoutSpecWithInsets:self.textInsets child:self.textNode];
-}
-
-+ (NSDictionary *)defaultTextAttributes
-{
-  return @{NSFontAttributeName : [UIFont systemFontOfSize:kASTextCellNodeDefaultFontSize]};
-}
-
-+ (UIEdgeInsets)defaultTextInsets
-{
-    return UIEdgeInsetsMake(kASTextCellNodeDefaultVerticalPadding, kASTextCellNodeDefaultHorizontalPadding, kASTextCellNodeDefaultVerticalPadding, kASTextCellNodeDefaultHorizontalPadding);
-}
-
-- (NSDictionary *)textAttributes
-{
-  return ASLockedSelf(_textAttributes);
-}
-
-- (void)setTextAttributes:(NSDictionary *)textAttributes
-{
-  ASDisplayNodeAssertNotNil(textAttributes, @"Invalid text attributes");
-  ASLockScopeSelf();
-  if (ASCompareAssignCopy(_textAttributes, textAttributes)) {
-    [self locked_updateAttributedText];
-  }
-}
-
-- (UIEdgeInsets)textInsets
-{
-  return ASLockedSelf(_textInsets);
-}
-
-- (void)setTextInsets:(UIEdgeInsets)textInsets
-{
-  if (ASLockedSelfCompareAssignCustom(_textInsets, textInsets, UIEdgeInsetsEqualToEdgeInsets)) {
-    [self setNeedsLayout];
-  }
-}
-
-- (NSString *)text
-{
-  return ASLockedSelf(_text);
-}
-
-- (void)setText:(NSString *)text
-{
-  ASLockScopeSelf();
-  if (ASCompareAssignCopy(_text, text)) {
-    [self locked_updateAttributedText];
-  }
-}
-
-- (void)locked_updateAttributedText
-{
-  if (_text == nil) {
-    _textNode.attributedText = nil;
-    return;
-  }
-  
-  _textNode.attributedText = [[NSAttributedString alloc] initWithString:_text attributes:_textAttributes];
-  [self setNeedsLayout];
-}
-
-@end
-
-#endif
diff --git a/submodules/AsyncDisplayKit/Source/ASCollectionNode+Beta.h b/submodules/AsyncDisplayKit/Source/ASCollectionNode+Beta.h
deleted file mode 100644
index 5aefbb8a76..0000000000
--- a/submodules/AsyncDisplayKit/Source/ASCollectionNode+Beta.h
+++ /dev/null
@@ -1,82 +0,0 @@
-//
-//  ASCollectionNode+Beta.h
-//  Texture
-//
-//  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.
-//  Changes after 4/13/2017 are: Copyright (c) Pinterest, Inc.  All rights reserved.
-//  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
-//
-
-#ifndef MINIMAL_ASDK
-#import <AsyncDisplayKit/ASCollectionNode.h>
-
-@protocol ASCollectionViewLayoutFacilitatorProtocol, ASCollectionLayoutDelegate, ASBatchFetchingDelegate;
-@class ASElementMap;
-
-NS_ASSUME_NONNULL_BEGIN
-
-@interface ASCollectionNode (Beta)
-
-/**
- * Allows providing a custom subclass of ASCollectionView to be managed by ASCollectionNode.
- *
- * @default [ASCollectionView class] is used whenever this property is unset or nil.
- */
-@property (nullable, nonatomic) Class collectionViewClass;
-
-/**
- * The elements that are currently displayed. The "UIKit index space". Must be accessed on main thread.
- */
-@property (nonatomic, readonly) ASElementMap *visibleElements;
-
-@property (nullable, readonly) id<ASCollectionLayoutDelegate> layoutDelegate;
-
-@property (nullable, nonatomic, weak) id<ASBatchFetchingDelegate> batchFetchingDelegate;
-
-/**
- * When this mode is enabled, ASCollectionView matches the timing of UICollectionView as closely as
- * possible, ensuring that all reload and edit operations are performed on the main thread as
- * blocking calls.
- *
- * This mode is useful for applications that are debugging issues with their collection view
- * implementation. In particular, some applications do not properly conform to the API requirement
- * of UICollectionView, and these applications may experience difficulties with ASCollectionView.
- * Providing this mode allows for developers to work towards resolving technical debt in their
- * collection view data source, while ramping up asynchronous collection layout.
- *
- * NOTE: Because this mode results in expensive operations like cell layout being performed on the
- * main thread, it should be used as a tool to resolve data source conformance issues with Apple
- * collection view API.
- *
- * @default defaults to ASCellLayoutModeNone.
- */
-@property (nonatomic) ASCellLayoutMode cellLayoutMode;
-
-/**
- *  Returns YES if the ASCollectionNode contents are completely synchronized with the underlying collection-view layout.
- */
-@property (nonatomic, readonly, getter=isSynchronized) BOOL synchronized;
-
-/**
- *  Schedules a block to be performed (on the main thread) as soon as the completion block is called
- *  on performBatchUpdates:.
- *
- *  When isSynchronized == YES, the block is run block immediately (before the method returns).
- */
-- (void)onDidFinishSynchronizing:(void (^)(void))didFinishSynchronizing;
-
-- (instancetype)initWithFrame:(CGRect)frame collectionViewLayout:(UICollectionViewLayout *)layout layoutFacilitator:(nullable id<ASCollectionViewLayoutFacilitatorProtocol>)layoutFacilitator;
-
-- (instancetype)initWithLayoutDelegate:(id<ASCollectionLayoutDelegate>)layoutDelegate layoutFacilitator:(nullable id<ASCollectionViewLayoutFacilitatorProtocol>)layoutFacilitator;
-
-- (void)beginUpdates ASDISPLAYNODE_DEPRECATED_MSG("Use -performBatchUpdates:completion: instead.");
-
-- (void)endUpdatesAnimated:(BOOL)animated ASDISPLAYNODE_DEPRECATED_MSG("Use -performBatchUpdates:completion: instead.");
-
-- (void)endUpdatesAnimated:(BOOL)animated completion:(nullable void (^)(BOOL))completion ASDISPLAYNODE_DEPRECATED_MSG("Use -performBatchUpdates:completion: instead.");
-
-@end
-
-NS_ASSUME_NONNULL_END
-
-#endif
diff --git a/submodules/AsyncDisplayKit/Source/ASCollectionNode.h b/submodules/AsyncDisplayKit/Source/ASCollectionNode.h
deleted file mode 100644
index bbcd8befef..0000000000
--- a/submodules/AsyncDisplayKit/Source/ASCollectionNode.h
+++ /dev/null
@@ -1,954 +0,0 @@
-//
-//  ASCollectionNode.h
-//  Texture
-//
-//  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.
-//  Changes after 4/13/2017 are: Copyright (c) Pinterest, Inc.  All rights reserved.
-//  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
-//
-
-#ifndef MINIMAL_ASDK
-
-#import <UIKit/UICollectionView.h>
-#import <AsyncDisplayKit/ASDisplayNode.h>
-#import <AsyncDisplayKit/ASRangeControllerUpdateRangeProtocol+Beta.h>
-#import <AsyncDisplayKit/ASCollectionView.h>
-#import <AsyncDisplayKit/ASBlockTypes.h>
-#import <AsyncDisplayKit/ASRangeManagingNode.h>
-
-@protocol ASCollectionViewLayoutFacilitatorProtocol;
-@protocol ASCollectionDelegate;
-@protocol ASCollectionDataSource;
-@class ASCollectionView;
-
-NS_ASSUME_NONNULL_BEGIN
-
-/**
- * ASCollectionNode is a node based class that wraps an ASCollectionView. It can be used
- * as a subnode of another node, and provide room for many (great) features and improvements later on.
- */
-@interface ASCollectionNode : ASDisplayNode <ASRangeControllerUpdateRangeProtocol, ASRangeManagingNode>
-
-- (instancetype)init NS_UNAVAILABLE;
-
-/**
- * Initializes an ASCollectionNode
- *
- * @discussion Initializes and returns a newly allocated collection node object with the specified layout.
- *
- * @param layout The layout object to use for organizing items. The collection view stores a strong reference to the specified object. Must not be nil.
- */
-- (instancetype)initWithCollectionViewLayout:(UICollectionViewLayout *)layout;
-
-/**
- * Initializes an ASCollectionNode
- *
- * @discussion Initializes and returns a newly allocated collection node object with the specified frame and layout.
- *
- * @param frame The frame rectangle for the collection view, measured in points. The origin of the frame is relative to the superview in which you plan to add it. This frame is passed to the superclass during initialization.
- * @param layout The layout object to use for organizing items. The collection view stores a strong reference to the specified object. Must not be nil.
- */
-- (instancetype)initWithFrame:(CGRect)frame collectionViewLayout:(UICollectionViewLayout *)layout;
-
-/**
- * Returns the corresponding ASCollectionView
- *
- * @return view The corresponding ASCollectionView.
- */
-@property (readonly) ASCollectionView *view;
-
-/**
- * The object that acts as the asynchronous delegate of the collection view
- *
- * @discussion The delegate must adopt the ASCollectionDelegate protocol. The collection view maintains a weak reference to the delegate object.
- *
- * The delegate object is responsible for providing size constraints for nodes and indicating whether batch fetching should begin.
- * @note This is a convenience method which sets the asyncDelegate on the collection node's collection view.
- */
-@property (nullable, weak) id <ASCollectionDelegate>   delegate;
-
-/**
- * The object that acts as the asynchronous data source of the collection view
- *
- * @discussion The datasource must adopt the ASCollectionDataSource protocol. The collection view maintains a weak reference to the datasource object.
- *
- * The datasource object is responsible for providing nodes or node creation blocks to the collection view.
- * @note This is a convenience method which sets the asyncDatasource on the collection node's collection view.
- */
-@property (nullable, weak) id <ASCollectionDataSource> dataSource;
-
-/**
- * The number of screens left to scroll before the delegate -collectionNode:beginBatchFetchingWithContext: is called.
- *
- * Defaults to two screenfuls.
- */
-@property (nonatomic) CGFloat leadingScreensForBatching;
-
-/*
- * A Boolean value that determines whether the collection node will be flipped.
- * If the value of this property is YES, the first cell node will be at the bottom of the collection node (as opposed to the top by default). This is useful for chat/messaging apps. The default value is NO.
- */
-@property (nonatomic) BOOL inverted;
-
-/**
- * A Boolean value that indicates whether users can select items in the collection node.
- * If the value of this property is YES (the default), users can select items. If you want more fine-grained control over the selection of items, you must provide a delegate object and implement the appropriate methods of the UICollectionNodeDelegate protocol.
- */
-@property (nonatomic) BOOL allowsSelection;
-
-/**
- * A Boolean value that determines whether users can select more than one item in the collection node.
- * This property controls whether multiple items can be selected simultaneously. The default value of this property is NO.
- * When the value of this property is YES, tapping a cell adds it to the current selection (assuming the delegate permits the cell to be selected). Tapping the cell again removes it from the selection.
- */
-@property (nonatomic) BOOL allowsMultipleSelection;
-
-/**
- * A Boolean value that determines whether bouncing always occurs when vertical scrolling reaches the end of the content.
- * The default value of this property is NO.
- */
-@property (nonatomic) BOOL alwaysBounceVertical;
-
-/**
- * A Boolean value that determines whether bouncing always occurs when horizontal scrolling reaches the end of the content view.
- * The default value of this property is NO.
- */
-@property (nonatomic) BOOL alwaysBounceHorizontal;
-
-/**
- * A Boolean value that controls whether the vertical scroll indicator is visible.
- * The default value of this property is YES.
- */
-@property (nonatomic) BOOL showsVerticalScrollIndicator;
-
-/**
- * A Boolean value that controls whether the horizontal scroll indicator is visible.
- * The default value of this property is NO.
- */
-@property (nonatomic) BOOL showsHorizontalScrollIndicator;
-
-/**
- * The layout used to organize the node's items.
- *
- * @discussion Assigning a new layout object to this property causes the new layout to be applied (without animations) to the node’s items.
- */
-@property (nonatomic) UICollectionViewLayout *collectionViewLayout;
-
-/**
- * Optional introspection object for the collection node's layout.
- *
- * @discussion Since supplementary and decoration nodes are controlled by the layout, this object
- * is used as a bridge to provide information to the internal data controller about the existence of these views and
- * their associated index paths. For collections using `UICollectionViewFlowLayout`, a default inspector
- * implementation `ASCollectionViewFlowLayoutInspector` is created and set on this property by default. Custom
- * collection layout subclasses will need to provide their own implementation of an inspector object for their
- * supplementary elements to be compatible with `ASCollectionNode`'s supplementary node support.
- */
-@property (nonatomic, weak) id<ASCollectionViewLayoutInspecting> layoutInspector;
-
-/**
- * The distance that the content view is inset from the collection node edges. Defaults to UIEdgeInsetsZero.
- */
-@property (nonatomic) UIEdgeInsets contentInset;
-
-/**
- * The offset of the content view's origin from the collection node's origin. Defaults to CGPointZero.
- */
-@property (nonatomic) CGPoint contentOffset;
-
-/**
- * Sets the offset from the content node’s origin to the collection node’s origin.
- *
- * @param contentOffset The offset
- *
- * @param animated YES to animate to this new offset at a constant velocity, NO to not aniamte and immediately make the transition.
- */
-- (void)setContentOffset:(CGPoint)contentOffset animated:(BOOL)animated;
-
-/**
- * Tuning parameters for a range type in full mode.
- *
- * @param rangeType The range type to get the tuning parameters for.
- *
- * @return A tuning parameter value for the given range type in full mode.
- *
- * @see ASLayoutRangeMode
- * @see ASLayoutRangeType
- */
-- (ASRangeTuningParameters)tuningParametersForRangeType:(ASLayoutRangeType)rangeType AS_WARN_UNUSED_RESULT;
-
-/**
- * Set the tuning parameters for a range type in full mode.
- *
- * @param tuningParameters The tuning parameters to store for a range type.
- * @param rangeType The range type to set the tuning parameters for.
- *
- * @see ASLayoutRangeMode
- * @see ASLayoutRangeType
- */
-- (void)setTuningParameters:(ASRangeTuningParameters)tuningParameters forRangeType:(ASLayoutRangeType)rangeType;
-
-/**
- * Tuning parameters for a range type in the specified mode.
- *
- * @param rangeMode The range mode to get the running parameters for.
- * @param rangeType The range type to get the tuning parameters for.
- *
- * @return A tuning parameter value for the given range type in the given mode.
- *
- * @see ASLayoutRangeMode
- * @see ASLayoutRangeType
- */
-- (ASRangeTuningParameters)tuningParametersForRangeMode:(ASLayoutRangeMode)rangeMode rangeType:(ASLayoutRangeType)rangeType AS_WARN_UNUSED_RESULT;
-
-/**
- * Set the tuning parameters for a range type in the specified mode.
- *
- * @param tuningParameters The tuning parameters to store for a range type.
- * @param rangeMode The range mode to set the running parameters for.
- * @param rangeType The range type to set the tuning parameters for.
- *
- * @see ASLayoutRangeMode
- * @see ASLayoutRangeType
- */
-- (void)setTuningParameters:(ASRangeTuningParameters)tuningParameters forRangeMode:(ASLayoutRangeMode)rangeMode rangeType:(ASLayoutRangeType)rangeType;
-
-/**
- * Scrolls the collection to the given item.
- *
- * @param indexPath The index path of the item.
- * @param scrollPosition Where the item should end up after the scroll.
- * @param animated Whether the scroll should be animated or not.
- *
- * This method must be called on the main thread.
- */
-- (void)scrollToItemAtIndexPath:(NSIndexPath *)indexPath atScrollPosition:(UICollectionViewScrollPosition)scrollPosition animated:(BOOL)animated;
-
-/**
- * Determines collection node's current scroll direction. Supports 2-axis collection nodes.
- *
- * @return a bitmask of ASScrollDirection values.
- */
-@property (nonatomic, readonly) ASScrollDirection scrollDirection;
-
-/**
- * Determines collection node's scrollable directions.
- *
- * @return a bitmask of ASScrollDirection values.
- */
-@property (nonatomic, readonly) ASScrollDirection scrollableDirections;
-
-#pragma mark - Editing
-
-/**
- * Registers the given kind of supplementary node for use in creating node-backed supplementary elements.
- *
- * @param elementKind The kind of supplementary node that will be requested through the data source.
- *
- * @discussion Use this method to register support for the use of supplementary nodes in place of the default
- * `registerClass:forSupplementaryViewOfKind:withReuseIdentifier:` and `registerNib:forSupplementaryViewOfKind:withReuseIdentifier:`
- * methods. This method will register an internal backing view that will host the contents of the supplementary nodes
- * returned from the data source.
- */
-- (void)registerSupplementaryNodeOfKind:(NSString *)elementKind;
-
-/**
- *  Perform a batch of updates asynchronously, optionally disabling all animations in the batch. This method must be called from the main thread.
- *  The data source must be updated to reflect the changes before the update block completes.
- *
- *  @param animated   NO to disable animations for this batch
- *  @param updates    The block that performs the relevant insert, delete, reload, or move operations.
- *  @param completion A completion handler block to execute when all of the operations are finished. This block takes a single
- *                    Boolean parameter that contains the value YES if all of the related animations completed successfully or
- *                    NO if they were interrupted. This parameter may be nil. If supplied, the block is run on the main thread.
- */
-- (void)performBatchAnimated:(BOOL)animated updates:(nullable AS_NOESCAPE void (^)(void))updates completion:(nullable void (^)(BOOL finished))completion;
-
-/**
- *  Perform a batch of updates asynchronously, optionally disabling all animations in the batch. This method must be called from the main thread.
- *  The data source must be updated to reflect the changes before the update block completes.
- *
- *  @param updates    The block that performs the relevant insert, delete, reload, or move operations.
- *  @param completion A completion handler block to execute when all of the operations are finished. This block takes a single
- *                    Boolean parameter that contains the value YES if all of the related animations completed successfully or
- *                    NO if they were interrupted. This parameter may be nil. If supplied, the block is run on the main thread.
- */
-- (void)performBatchUpdates:(nullable AS_NOESCAPE void (^)(void))updates completion:(nullable void (^)(BOOL finished))completion;
-
-/**
- *  Returns YES if the ASCollectionNode is still processing changes from performBatchUpdates:.
- *  This is typically the concurrent allocation (calling nodeBlocks) and layout of newly inserted
- *  ASCellNodes. If YES is returned, then calling -waitUntilAllUpdatesAreProcessed may take tens of
- *  milliseconds to return as it blocks on these concurrent operations.
- *
- *  Returns NO if ASCollectionNode is fully synchronized with the underlying UICollectionView. This
- *  means that until the next performBatchUpdates: is called, it is safe to compare UIKit values
- *  (such as from UICollectionViewLayout) with your app's data source.
- *
- *  This method will always return NO if called immediately after -waitUntilAllUpdatesAreProcessed.
- */
-@property (nonatomic, readonly) BOOL isProcessingUpdates;
-
-/**
- *  Schedules a block to be performed (on the main thread) after processing of performBatchUpdates:
- *  is finished (completely synchronized to UIKit). The blocks will be run at the moment that
- *  -isProcessingUpdates changes from YES to NO;
- *
- *  When isProcessingUpdates == NO, the block is run block immediately (before the method returns).
- *
- *  Blocks scheduled by this mechanism are NOT guaranteed to run in the order they are scheduled.
- *  They may also be delayed if performBatchUpdates continues to be called; the blocks will wait until
- *  all running updates are finished.
- *
- *  Calling -waitUntilAllUpdatesAreProcessed is one way to flush any pending update completion blocks.
- */
-- (void)onDidFinishProcessingUpdates:(void (^)(void))didFinishProcessingUpdates;
-
-/**
- *  Blocks execution of the main thread until all section and item updates are committed to the view. This method must be called from the main thread.
- */
-- (void)waitUntilAllUpdatesAreProcessed;
-
-/**
- * Inserts one or more sections.
- *
- * @param sections An index set that specifies the sections to insert.
- *
- * @discussion This method must be called from the main thread. The data source must be updated to reflect the changes
- * before this method is called.
- */
-- (void)insertSections:(NSIndexSet *)sections;
-
-/**
- * Deletes one or more sections.
- *
- * @param sections An index set that specifies the sections to delete.
- *
- * @discussion This method must be called from the main thread. The data source must be updated to reflect the changes
- * before this method is called.
- */
-- (void)deleteSections:(NSIndexSet *)sections;
-
-/**
- * Reloads the specified sections.
- *
- * @param sections An index set that specifies the sections to reload.
- *
- * @discussion This method must be called from the main thread. The data source must be updated to reflect the changes
- * before this method is called.
- */
-- (void)reloadSections:(NSIndexSet *)sections;
-
-/**
- * Moves a section to a new location.
- *
- * @param section The index of the section to move.
- *
- * @param newSection The index that is the destination of the move for the section.
- *
- * @discussion This method must be called from the main thread. The data source must be updated to reflect the changes
- * before this method is called.
- */
-- (void)moveSection:(NSInteger)section toSection:(NSInteger)newSection;
-
-/**
- * Inserts items at the locations identified by an array of index paths.
- *
- * @param indexPaths An array of NSIndexPath objects, each representing an item index and section index that together identify an item.
- *
- * @discussion This method must be called from the main thread. The data source must be updated to reflect the changes
- * before this method is called.
- */
-- (void)insertItemsAtIndexPaths:(NSArray<NSIndexPath *> *)indexPaths;
-
-/**
- * Deletes the items specified by an array of index paths.
- *
- * @param indexPaths An array of NSIndexPath objects identifying the items to delete.
- *
- * @discussion This method must be called from the main thread. The data source must be updated to reflect the changes
- * before this method is called.
- */
-- (void)deleteItemsAtIndexPaths:(NSArray<NSIndexPath *> *)indexPaths;
-
-/**
- * Reloads the specified items.
- *
- * @param indexPaths An array of NSIndexPath objects identifying the items to reload.
- *
- * @discussion This method must be called from the main thread. The data source must be updated to reflect the changes
- * before this method is called.
- */
-- (void)reloadItemsAtIndexPaths:(NSArray<NSIndexPath *> *)indexPaths;
-
-/**
- * Moves the item at a specified location to a destination location.
- *
- * @param indexPath The index path identifying the item to move.
- *
- * @param newIndexPath The index path that is the destination of the move for the item.
- *
- * @discussion This method must be called from the main thread. The data source must be updated to reflect the changes
- * before this method is called.
- */
-- (void)moveItemAtIndexPath:(NSIndexPath *)indexPath toIndexPath:(NSIndexPath *)newIndexPath;
-
-/**
- * Reload everything from scratch, destroying the working range and all cached nodes.
- *
- * @param completion block to run on completion of asynchronous loading or nil. If supplied, the block is run on
- * the main thread.
- * @warning This method is substantially more expensive than UICollectionView's version.
- */
-- (void)reloadDataWithCompletion:(nullable void (^)(void))completion;
-
-
-/**
- * Reload everything from scratch, destroying the working range and all cached nodes.
- *
- * @warning This method is substantially more expensive than UICollectionView's version.
- */
-- (void)reloadData;
-
-/**
- * Triggers a relayout of all nodes.
- *
- * @discussion This method invalidates and lays out every cell node in the collection view.
- */
-- (void)relayoutItems;
-
-#pragma mark - Selection
-
-/**
- * The index paths of the selected items, or @c nil if no items are selected.
- */
-@property (nullable, nonatomic, copy, readonly) NSArray<NSIndexPath *> *indexPathsForSelectedItems;
-
-/**
- * Selects the item at the specified index path and optionally scrolls it into view.
- * If the `allowsSelection` property is NO, calling this method has no effect. If there is an existing selection with a different index path and the `allowsMultipleSelection` property is NO, calling this method replaces the previous selection.
- * This method does not cause any selection-related delegate methods to be called.
- *
- * @param indexPath The index path of the item to select. Specifying nil for this parameter clears the current selection.
- *
- * @param animated Specify YES to animate the change in the selection or NO to make the change without animating it.
- *
- * @param scrollPosition An option that specifies where the item should be positioned when scrolling finishes. For a list of possible values, see `UICollectionViewScrollPosition`.
- *
- * @discussion This method must be called from the main thread.
- */
-- (void)selectItemAtIndexPath:(nullable NSIndexPath *)indexPath animated:(BOOL)animated scrollPosition:(UICollectionViewScrollPosition)scrollPosition;
-
-/**
- * Deselects the item at the specified index.
- * If the allowsSelection property is NO, calling this method has no effect.
- * This method does not cause any selection-related delegate methods to be called.
- *
- * @param indexPath The index path of the item to select. Specifying nil for this parameter clears the current selection.
- *
- * @param animated Specify YES to animate the change in the selection or NO to make the change without animating it.
- *
- * @discussion This method must be called from the main thread.
- */
-- (void)deselectItemAtIndexPath:(NSIndexPath *)indexPath animated:(BOOL)animated;
-
-#pragma mark - Querying Data
-
-/**
- * Retrieves the number of items in the given section.
- *
- * @param section The section.
- *
- * @return The number of items.
- */
-- (NSInteger)numberOfItemsInSection:(NSInteger)section AS_WARN_UNUSED_RESULT;
-
-/**
- * The number of sections.
- */
-@property (nonatomic, readonly) NSInteger numberOfSections;
-
-/**
- * Similar to -visibleCells.
- *
- * @return an array containing the nodes being displayed on screen. This must be called on the main thread.
- */
-@property (nonatomic, readonly) NSArray<__kindof ASCellNode *> *visibleNodes;
-
-/**
- * Retrieves the node for the item at the given index path.
- *
- * @param indexPath The index path of the requested item.
- *
- * @return The node for the given item, or @c nil if no item exists at the specified path.
- */
-- (nullable __kindof ASCellNode *)nodeForItemAtIndexPath:(NSIndexPath *)indexPath AS_WARN_UNUSED_RESULT;
-
-/**
- * Retrieves the node-model for the item at the given index path, if any.
- *
- * @param indexPath The index path of the requested item.
- *
- * @return The node-model for the given item, or @c nil if no item exists at the specified path or no node-model was provided.
- *
- * @warning This API is beta and subject to change. We'll try to provide an easy migration path.
- */
-- (nullable id)nodeModelForItemAtIndexPath:(NSIndexPath *)indexPath AS_WARN_UNUSED_RESULT;
-
-/**
- * Retrieve the index path for the item with the given node.
- *
- * @param cellNode A node for an item in the collection node.
- *
- * @return The indexPath for this item.
- */
-- (nullable NSIndexPath *)indexPathForNode:(ASCellNode *)cellNode AS_WARN_UNUSED_RESULT;
-
-/**
- * Retrieve the index paths of all visible items.
- *
- * @return an array containing the index paths of all visible items. This must be called on the main thread.
- */
-@property (nonatomic, readonly) NSArray<NSIndexPath *> *indexPathsForVisibleItems;
-
-/**
- * Retrieve the index path of the item at the given point.
- *
- * @param point The point of the requested item.
- *
- * @return The indexPath for the item at the given point. This must be called on the main thread.
- */
-- (nullable NSIndexPath *)indexPathForItemAtPoint:(CGPoint)point AS_WARN_UNUSED_RESULT;
-
-/**
- * Retrieve the cell at the given index path.
- *
- * @param indexPath The index path of the requested item.
- *
- * @return The cell for the given index path. This must be called on the main thread.
- */
-- (nullable UICollectionViewCell *)cellForItemAtIndexPath:(NSIndexPath *)indexPath;
-
-/**
- * Retrieves the context object for the given section, as provided by the data source in
- * the @c collectionNode:contextForSection: method.
- *
- * @param section The section to get the context for.
- *
- * @return The context object, or @c nil if no context was provided.
- *
- * TODO: This method currently accepts @c section in the _view_ index space, but it should
- *   be in the node index space. To get the context in the view index space (e.g. for subclasses
- *   of @c UICollectionViewLayout, the user will call the same method on @c ASCollectionView.
- */
-- (nullable id<ASSectionContext>)contextForSection:(NSInteger)section AS_WARN_UNUSED_RESULT;
-
-@end
-
-@interface ASCollectionNode (Deprecated)
-
-- (void)waitUntilAllUpdatesAreCommitted ASDISPLAYNODE_DEPRECATED_MSG("This method has been renamed to -waitUntilAllUpdatesAreProcessed.");
-
-@end
-
-/**
- * This is a node-based UICollectionViewDataSource.
- */
-@protocol ASCollectionDataSource <ASCommonCollectionDataSource>
-
-@optional
-
-/**
- * Asks the data source for the number of items in the given section of the collection node.
- *
- * @see @c collectionView:numberOfItemsInSection:
- */
-- (NSInteger)collectionNode:(ASCollectionNode *)collectionNode numberOfItemsInSection:(NSInteger)section;
-
-/**
- * Asks the data source for the number of sections in the collection node.
- *
- * @see @c numberOfSectionsInCollectionView:
- */
-- (NSInteger)numberOfSectionsInCollectionNode:(ASCollectionNode *)collectionNode;
-
-/**
- * --BETA--
- * Asks the data source for a view-model for the item at the given index path.
- *
- * @param collectionNode The sender.
- * @param indexPath The index path of the item.
- *
- * @return An object that contains all the data for this item.
- */
-- (nullable id)collectionNode:(ASCollectionNode *)collectionNode nodeModelForItemAtIndexPath:(NSIndexPath *)indexPath;
-
-/**
- * Similar to -collectionNode:nodeForItemAtIndexPath:
- * This method takes precedence over collectionNode:nodeForItemAtIndexPath: if implemented.
- *
- * @param collectionNode The sender.
- * @param indexPath The index path of the item.
- *
- * @return a block that creates the node for display for this item.
- *   Must be thread-safe (can be called on the main thread or a background
- *   queue) and should not implement reuse (it will be called once per row).
- */
-- (ASCellNodeBlock)collectionNode:(ASCollectionNode *)collectionNode nodeBlockForItemAtIndexPath:(NSIndexPath *)indexPath;
-
-/**
- * Similar to -collectionView:cellForItemAtIndexPath:.
- *
- * @param collectionNode The sender.
- * @param indexPath The index path of the item.
- *
- * @return A node to display for the given item. This will be called on the main thread and should
- *   not implement reuse (it will be called once per item).  Unlike UICollectionView's version,
- *   this method is not called when the item is about to display.
- */
-- (ASCellNode *)collectionNode:(ASCollectionNode *)collectionNode nodeForItemAtIndexPath:(NSIndexPath *)indexPath;
-
-/**
- * Asks the data source to provide a node-block to display for the given supplementary element in the collection view.
- *
- * @param collectionNode The sender.
- * @param kind           The kind of supplementary element.
- * @param indexPath      The index path of the supplementary element.
- */
-- (ASCellNodeBlock)collectionNode:(ASCollectionNode *)collectionNode nodeBlockForSupplementaryElementOfKind:(NSString *)kind atIndexPath:(NSIndexPath *)indexPath;
-
-/**
- * Asks the data source to provide a node to display for the given supplementary element in the collection view.
- *
- * @param collectionNode The sender.
- * @param kind           The kind of supplementary element.
- * @param indexPath      The index path of the supplementary element.
- */
-- (ASCellNode *)collectionNode:(ASCollectionNode *)collectionNode nodeForSupplementaryElementOfKind:(NSString *)kind atIndexPath:(NSIndexPath *)indexPath;
-
-/**
- * Asks the data source to provide a context object for the given section. This object
- * can later be retrieved by calling @c contextForSection: and is useful when implementing
- * custom @c UICollectionViewLayout subclasses. The context object is ret
- *
- * @param collectionNode The sender.
- * @param section The index of the section to provide context for.
- *
- * @return A context object to assign to the given section, or @c nil.
- */
-- (nullable id<ASSectionContext>)collectionNode:(ASCollectionNode *)collectionNode contextForSection:(NSInteger)section;
-
-/**
- * Asks the data source to provide an array of supplementary element kinds that exist in a given section.
- *
- * @param collectionNode The sender.
- * @param section The index of the section to provide supplementary kinds for.
- *
- * @return The supplementary element kinds that exist in the given section, if any.
- */
-- (NSArray<NSString *> *)collectionNode:(ASCollectionNode *)collectionNode supplementaryElementKindsInSection:(NSInteger)section;
-
-/**
- * Asks the data source if it's possible to move the specified item interactively.
- *
- * See @p -[UICollectionViewDataSource collectionView:canMoveItemAtIndexPath:] @c.
- *
- * @param collectionNode  The sender.
- * @param node            The display node for the item that may be moved.
- *
- * @return Whether the item represented by @p node may be moved.
- */
-- (BOOL)collectionNode:(ASCollectionNode *)collectionNode canMoveItemWithNode:(ASCellNode *)node;
-
-/**
- * Called when the user has interactively moved an item. The data source
- * should update its internal data store to reflect the move. Note that you
- * should not call [collectionNode moveItemAtIndexPath:toIndexPath:] – the
- * collection node's internal state will be updated automatically.
- *
- * * See @p -[UICollectionViewDataSource collectionView:moveItemAtIndexPath:toIndexPath:] @c.
- *
- * @param collectionNode        The sender.
- * @param sourceIndexPath       The original item index path.
- * @param destinationIndexPath  The new item index path.
- */
-- (void)collectionNode:(ASCollectionNode *)collectionNode moveItemAtIndexPath:(NSIndexPath *)sourceIndexPath toIndexPath:(NSIndexPath *)destinationIndexPath;
-
-/**
- * Generate a unique identifier for an element in a collection. This helps state restoration persist the scroll position
- *  of a collection view even when the data in that table changes. See the documentation for UIDataSourceModelAssociation for more information.
- *
- * @param indexPath The index path of the requested node.
- *
- * @param collectionNode The sender.
- *
- * @return a unique identifier for the element at the given path. Return nil if the index path does not exist in the collection.
- */
-- (nullable NSString *)modelIdentifierForElementAtIndexPath:(NSIndexPath *)indexPath inNode:(ASCollectionNode *)collectionNode;
-
-/**
- * Similar to -collectionView:cellForItemAtIndexPath:. See the documentation for UIDataSourceModelAssociation for more information.
- *
- * @param identifier The model identifier of the element, previously generated by a call to modelIdentifierForElementAtIndexPath
- *
- * @param collectionNode The sender.
- *
- * @return the index path to the current position of the matching element in the collection. Return nil if the element is not found.
- */
-- (nullable NSIndexPath *)indexPathForElementWithModelIdentifier:(NSString *)identifier inNode:(ASCollectionNode *)collectionNode;
-
-/**
- * Similar to -collectionView:cellForItemAtIndexPath:.
- *
- * @param collectionView The sender.
- *
- * @param indexPath The index path of the requested node.
- *
- * @return a node for display at this indexpath. This will be called on the main thread and should
- *   not implement reuse (it will be called once per row).  Unlike UICollectionView's version,
- *   this method is not called when the row is about to display.
- */
-- (ASCellNode *)collectionView:(ASCollectionView *)collectionView nodeForItemAtIndexPath:(NSIndexPath *)indexPath ASDISPLAYNODE_DEPRECATED_MSG("Use ASCollectionNode's method instead.");
-
-/**
- * Similar to -collectionView:nodeForItemAtIndexPath:
- * This method takes precedence over collectionView:nodeForItemAtIndexPath: if implemented.
- *
- * @param collectionView The sender.
- *
- * @param indexPath The index path of the requested node.
- *
- * @return a block that creates the node for display at this indexpath.
- *   Must be thread-safe (can be called on the main thread or a background
- *   queue) and should not implement reuse (it will be called once per row).
- */
-- (ASCellNodeBlock)collectionView:(ASCollectionView *)collectionView nodeBlockForItemAtIndexPath:(NSIndexPath *)indexPath ASDISPLAYNODE_DEPRECATED_MSG("Use ASCollectionNode's method instead.");
-
-/**
- * Asks the collection view to provide a supplementary node to display in the collection view.
- *
- * @param collectionView An object representing the collection view requesting this information.
- * @param kind           The kind of supplementary node to provide.
- * @param indexPath      The index path that specifies the location of the new supplementary node.
- */
-- (ASCellNode *)collectionView:(ASCollectionView *)collectionView nodeForSupplementaryElementOfKind:(NSString *)kind atIndexPath:(NSIndexPath *)indexPath ASDISPLAYNODE_DEPRECATED_MSG("Use ASCollectionNode's method instead.");
-
-/**
- * Indicator to lock the data source for data fetching in async mode.
- * We should not update the data source until the data source has been unlocked. Otherwise, it will incur data inconsistency or exception
- * due to the data access in async mode.
- *
- * @param collectionView The sender.
- * @deprecated The data source is always accessed on the main thread, and this method will not be called.
- */
-- (void)collectionViewLockDataSource:(ASCollectionView *)collectionView ASDISPLAYNODE_DEPRECATED_MSG("Data source accesses are on the main thread. Method will not be called.");
-
-/**
- * Indicator to unlock the data source for data fetching in async mode.
- * We should not update the data source until the data source has been unlocked. Otherwise, it will incur data inconsistency or exception
- * due to the data access in async mode.
- *
- * @param collectionView The sender.
- * @deprecated The data source is always accessed on the main thread, and this method will not be called.
- */
-- (void)collectionViewUnlockDataSource:(ASCollectionView *)collectionView ASDISPLAYNODE_DEPRECATED_MSG("Data source accesses are on the main thread. Method will not be called.");
-
-@end
-
-/**
- * This is a node-based UICollectionViewDelegate.
- */
-@protocol ASCollectionDelegate <ASCommonCollectionDelegate, NSObject>
-
-@optional
-
-/**
- * Provides the constrained size range for measuring the given item.
- *
- * @param collectionNode The sender.
- *
- * @param indexPath The index path of the item.
- *
- * @return A constrained size range for layout for the item at this index path.
- */
-- (ASSizeRange)collectionNode:(ASCollectionNode *)collectionNode constrainedSizeForItemAtIndexPath:(NSIndexPath *)indexPath;
-
-- (void)collectionNode:(ASCollectionNode *)collectionNode willDisplayItemWithNode:(ASCellNode *)node;
-
-- (void)collectionNode:(ASCollectionNode *)collectionNode didEndDisplayingItemWithNode:(ASCellNode *)node;
-
-- (void)collectionNode:(ASCollectionNode *)collectionNode willDisplaySupplementaryElementWithNode:(ASCellNode *)node NS_AVAILABLE_IOS(8_0);
-- (void)collectionNode:(ASCollectionNode *)collectionNode didEndDisplayingSupplementaryElementWithNode:(ASCellNode *)node;
-
-- (BOOL)collectionNode:(ASCollectionNode *)collectionNode shouldHighlightItemAtIndexPath:(NSIndexPath *)indexPath;
-- (void)collectionNode:(ASCollectionNode *)collectionNode didHighlightItemAtIndexPath:(NSIndexPath *)indexPath;
-- (void)collectionNode:(ASCollectionNode *)collectionNode didUnhighlightItemAtIndexPath:(NSIndexPath *)indexPath;
-- (BOOL)collectionNode:(ASCollectionNode *)collectionNode shouldSelectItemAtIndexPath:(NSIndexPath *)indexPath;
-- (BOOL)collectionNode:(ASCollectionNode *)collectionNode shouldDeselectItemAtIndexPath:(NSIndexPath *)indexPath;
-- (void)collectionNode:(ASCollectionNode *)collectionNode didSelectItemAtIndexPath:(NSIndexPath *)indexPath;
-- (void)collectionNode:(ASCollectionNode *)collectionNode didDeselectItemAtIndexPath:(NSIndexPath *)indexPath;
-
-- (BOOL)collectionNode:(ASCollectionNode *)collectionNode shouldShowMenuForItemAtIndexPath:(NSIndexPath *)indexPath;
-- (BOOL)collectionNode:(ASCollectionNode *)collectionNode canPerformAction:(SEL)action forItemAtIndexPath:(NSIndexPath *)indexPath sender:(nullable id)sender;
-- (void)collectionNode:(ASCollectionNode *)collectionNode performAction:(SEL)action forItemAtIndexPath:(NSIndexPath *)indexPath sender:(nullable id)sender;
-
-/**
- * Receive a message that the collection node is near the end of its data set and more data should be fetched if
- * necessary.
- *
- * @param collectionNode The sender.
- * @param context A context object that must be notified when the batch fetch is completed.
- *
- * @discussion You must eventually call -completeBatchFetching: with an argument of YES in order to receive future
- * notifications to do batch fetches. This method is called on a background queue.
- *
- * ASCollectionNode currently only supports batch events for tail loads. If you require a head load, consider
- * implementing a UIRefreshControl.
- */
-- (void)collectionNode:(ASCollectionNode *)collectionNode willBeginBatchFetchWithContext:(ASBatchContext *)context;
-
-/**
- * Tell the collection node if batch fetching should begin.
- *
- * @param collectionNode The sender.
- *
- * @discussion Use this method to conditionally fetch batches. Example use cases are: limiting the total number of
- * objects that can be fetched or no network connection.
- *
- * If not implemented, the collection node assumes that it should notify its asyncDelegate when batch fetching
- * should occur.
- */
-- (BOOL)shouldBatchFetchForCollectionNode:(ASCollectionNode *)collectionNode;
-
-/**
- * Provides the constrained size range for measuring the node at the index path.
- *
- * @param collectionView The sender.
- *
- * @param indexPath The index path of the node.
- *
- * @return A constrained size range for layout the node at this index path.
- */
-- (ASSizeRange)collectionView:(ASCollectionView *)collectionView constrainedSizeForNodeAtIndexPath:(NSIndexPath *)indexPath ASDISPLAYNODE_DEPRECATED_MSG("Use ASCollectionNode's constrainedSizeForItemAtIndexPath: instead. PLEASE NOTE the very subtle method name change.");
-
-/**
- * Informs the delegate that the collection view will add the given node
- * at the given index path to the view hierarchy.
- *
- * @param collectionView The sender.
- * @param node The node that will be displayed.
- * @param indexPath The index path of the item that will be displayed.
- *
- * @warning AsyncDisplayKit processes collection view edits asynchronously. The index path
- *   passed into this method may not correspond to the same item in your data source
- *   if your data source has been updated since the last edit was processed.
- */
-- (void)collectionView:(ASCollectionView *)collectionView willDisplayNode:(ASCellNode *)node forItemAtIndexPath:(NSIndexPath *)indexPath ASDISPLAYNODE_DEPRECATED_MSG("Use ASCollectionNode's method instead.");
-
-/**
- * Informs the delegate that the collection view did remove the provided node from the view hierarchy.
- * This may be caused by the node scrolling out of view, or by deleting the item
- * or its containing section with @c deleteItemsAtIndexPaths: or @c deleteSections: .
- *
- * @param collectionView The sender.
- * @param node The node which was removed from the view hierarchy.
- * @param indexPath The index path at which the node was located before it was removed.
- *
- * @warning AsyncDisplayKit processes collection view edits asynchronously. The index path
- *   passed into this method may not correspond to the same item in your data source
- *   if your data source has been updated since the last edit was processed.
- */
-- (void)collectionView:(ASCollectionView *)collectionView didEndDisplayingNode:(ASCellNode *)node forItemAtIndexPath:(NSIndexPath *)indexPath ASDISPLAYNODE_DEPRECATED_MSG("Use ASCollectionNode's method instead.");
-
-- (void)collectionView:(ASCollectionView *)collectionView willBeginBatchFetchWithContext:(ASBatchContext *)context ASDISPLAYNODE_DEPRECATED_MSG("Use ASCollectionNode's method instead.");
-
-/**
- * Tell the collectionView if batch fetching should begin.
- *
- * @param collectionView The sender.
- *
- * @discussion Use this method to conditionally fetch batches. Example use cases are: limiting the total number of
- * objects that can be fetched or no network connection.
- *
- * If not implemented, the collectionView assumes that it should notify its asyncDelegate when batch fetching
- * should occur.
- */
-- (BOOL)shouldBatchFetchForCollectionView:(ASCollectionView *)collectionView ASDISPLAYNODE_DEPRECATED_MSG("Use ASCollectionNode's method instead.");
-
-/**
- * Informs the delegate that the collection view will add the node
- * at the given index path to the view hierarchy.
- *
- * @param collectionView The sender.
- * @param indexPath The index path of the item that will be displayed.
- *
- * @warning AsyncDisplayKit processes collection view edits asynchronously. The index path
- *   passed into this method may not correspond to the same item in your data source
- *   if your data source has been updated since the last edit was processed.
- *
- * This method is deprecated. Use @c collectionView:willDisplayNode:forItemAtIndexPath: instead.
- */
-- (void)collectionView:(ASCollectionView *)collectionView willDisplayNodeForItemAtIndexPath:(NSIndexPath *)indexPath ASDISPLAYNODE_DEPRECATED_MSG("Use ASCollectionNode's method instead.");
-
-@end
-
-@protocol ASCollectionDataSourceInterop <ASCollectionDataSource>
-
-/**
- * This method offers compatibility with synchronous, standard UICollectionViewCell objects.
- * These cells will **not** have the performance benefits of ASCellNodes (like preloading, async layout, and
- * async drawing) - even when mixed within the same ASCollectionNode.
- *
- * In order to use this method, you must:
- * 1. Implement it on your ASCollectionDataSource object.
- * 2. Call registerCellClass: on the collectionNode.view (in viewDidLoad, or register an onDidLoad: block).
- * 3. Return nil from the nodeBlockForItem...: or nodeForItem...: method. NOTE: it is an error to return
- *    nil from within a nodeBlock, if you have returned a nodeBlock object.
- * 4. Lastly, you must implement a method to provide the size for the cell. There are two ways this is done:
- * 4a. UICollectionViewFlowLayout (incl. ASPagerNode). Implement
- collectionNode:constrainedSizeForItemAtIndexPath:.
- * 4b. Custom collection layouts. Set .layoutInspector and have it implement
- collectionView:constrainedSizeForNodeAtIndexPath:.
- *
- * For an example of using this method with all steps above (including a custom layout, 4b.),
- * see the app in examples/CustomCollectionView and enable kShowUICollectionViewCells = YES.
- */
-- (__kindof UICollectionViewCell *)collectionView:(UICollectionView *)collectionView cellForItemAtIndexPath:(NSIndexPath *)indexPath;
-
-@optional
-
-- (UICollectionReusableView *)collectionView:(UICollectionView *)collectionView viewForSupplementaryElementOfKind:(NSString *)kind atIndexPath:(NSIndexPath *)indexPath;
-
-/**
- * Implement this property and return YES if you want your interop data source to be
- * used when dequeuing cells for node-backed items.
- *
- * If NO (the default), the interop data source will only be consulted in cases
- * where no ASCellNode was provided to AsyncDisplayKit.
- *
- * If YES, the interop data source will always be consulted to dequeue cells, and
- * will be expected to return _ASCollectionViewCells in cases where a node was provided.
- *
- * The default value is NO.
- */
-@property (class, nonatomic, readonly) BOOL dequeuesCellsForNodeBackedItems;
-
-@end
-
-@protocol ASCollectionDelegateInterop <ASCollectionDelegate>
-
-@optional
-
-- (void)collectionView:(UICollectionView *)collectionView willDisplayCell:(UICollectionViewCell *)cell forItemAtIndexPath:(NSIndexPath *)indexPath;
-
-- (void)collectionView:(UICollectionView *)collectionView didEndDisplayingCell:(UICollectionViewCell *)cell forItemAtIndexPath:(NSIndexPath *)indexPath;
-
-- (void)collectionView:(UICollectionView *)collectionView willDisplaySupplementaryView:(UICollectionReusableView *)view forElementKind:(NSString *)elementKind atIndexPath:(NSIndexPath *)indexPath;
-
-- (void)collectionView:(UICollectionView *)collectionView didEndDisplayingSupplementaryView:(UICollectionReusableView *)view forElementOfKind:(NSString *)elementKind atIndexPath:(NSIndexPath *)indexPath;
-
-@end
-
-NS_ASSUME_NONNULL_END
-
-#endif
diff --git a/submodules/AsyncDisplayKit/Source/ASCollectionNode.mm b/submodules/AsyncDisplayKit/Source/ASCollectionNode.mm
deleted file mode 100644
index 6068f1f038..0000000000
--- a/submodules/AsyncDisplayKit/Source/ASCollectionNode.mm
+++ /dev/null
@@ -1,1056 +0,0 @@
-//
-//  ASCollectionNode.mm
-//  Texture
-//
-//  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.
-//  Changes after 4/13/2017 are: Copyright (c) Pinterest, Inc.  All rights reserved.
-//  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
-//
-
-#ifndef MINIMAL_ASDK
-#import <AsyncDisplayKit/ASCollectionNode.h>
-#import <AsyncDisplayKit/ASCollectionNode+Beta.h>
-
-#import <AsyncDisplayKit/ASCollectionElement.h>
-#import <AsyncDisplayKit/ASElementMap.h>
-#import <AsyncDisplayKit/ASCollectionInternal.h>
-#import <AsyncDisplayKit/ASCollectionLayout.h>
-#import <AsyncDisplayKit/ASCollectionViewLayoutFacilitatorProtocol.h>
-#import <AsyncDisplayKit/ASDisplayNode+Beta.h>
-#import <AsyncDisplayKit/ASDisplayNode+Subclasses.h>
-#import <AsyncDisplayKit/ASDisplayNode+FrameworkPrivate.h>
-#import <AsyncDisplayKit/ASInternalHelpers.h>
-#import <AsyncDisplayKit/ASCellNode+Internal.h>
-#import <AsyncDisplayKit/_ASHierarchyChangeSet.h>
-#import <AsyncDisplayKit/AsyncDisplayKit+Debug.h>
-#import <AsyncDisplayKit/ASSectionContext.h>
-#import <AsyncDisplayKit/ASDataController.h>
-#import <AsyncDisplayKit/ASCollectionView+Undeprecated.h>
-#import <AsyncDisplayKit/ASThread.h>
-#import <AsyncDisplayKit/ASRangeController.h>
-#import <AsyncDisplayKit/ASAbstractLayoutController+FrameworkPrivate.h>
-
-#pragma mark - _ASCollectionPendingState
-
-@interface _ASCollectionPendingState : NSObject {
-@public
-  std::vector<std::vector<ASRangeTuningParameters>> _tuningParameters;
-}
-@property (nonatomic, weak) id <ASCollectionDelegate>   delegate;
-@property (nonatomic, weak) id <ASCollectionDataSource> dataSource;
-@property (nonatomic) UICollectionViewLayout *collectionViewLayout;
-@property (nonatomic) ASLayoutRangeMode rangeMode;
-@property (nonatomic) BOOL allowsSelection; // default is YES
-@property (nonatomic) BOOL allowsMultipleSelection; // default is NO
-@property (nonatomic) BOOL inverted; //default is NO
-@property (nonatomic) ASCellLayoutMode cellLayoutMode;
-@property (nonatomic) CGFloat leadingScreensForBatching;
-@property (nonatomic, weak) id <ASCollectionViewLayoutInspecting> layoutInspector;
-@property (nonatomic) BOOL alwaysBounceVertical;
-@property (nonatomic) BOOL alwaysBounceHorizontal;
-@property (nonatomic) UIEdgeInsets contentInset;
-@property (nonatomic) CGPoint contentOffset;
-@property (nonatomic) BOOL animatesContentOffset;
-@property (nonatomic) BOOL showsVerticalScrollIndicator;
-@property (nonatomic) BOOL showsHorizontalScrollIndicator;
-@end
-
-@implementation _ASCollectionPendingState
-
-#pragma mark Lifecycle
-
-- (instancetype)init
-{
-  self = [super init];
-  if (self) {
-    _rangeMode = ASLayoutRangeModeUnspecified;
-    _tuningParameters = [ASAbstractLayoutController defaultTuningParameters];
-    _allowsSelection = YES;
-    _allowsMultipleSelection = NO;
-    _inverted = NO;
-    _contentInset = UIEdgeInsetsZero;
-    _contentOffset = CGPointZero;
-    _animatesContentOffset = NO;
-    _showsVerticalScrollIndicator = YES;
-    _showsHorizontalScrollIndicator = YES;
-  }
-  return self;
-}
-
-#pragma mark Tuning Parameters
-
-- (ASRangeTuningParameters)tuningParametersForRangeType:(ASLayoutRangeType)rangeType
-{
-  return [self tuningParametersForRangeMode:ASLayoutRangeModeFull rangeType:rangeType];
-}
-
-- (void)setTuningParameters:(ASRangeTuningParameters)tuningParameters forRangeType:(ASLayoutRangeType)rangeType
-{
-  return [self setTuningParameters:tuningParameters forRangeMode:ASLayoutRangeModeFull rangeType:rangeType];
-}
-
-- (ASRangeTuningParameters)tuningParametersForRangeMode:(ASLayoutRangeMode)rangeMode rangeType:(ASLayoutRangeType)rangeType
-{
-  ASDisplayNodeAssert(rangeMode < _tuningParameters.size() && rangeType < _tuningParameters[rangeMode].size(), @"Requesting a range that is OOB for the configured tuning parameters");
-  return _tuningParameters[rangeMode][rangeType];
-}
-
-- (void)setTuningParameters:(ASRangeTuningParameters)tuningParameters forRangeMode:(ASLayoutRangeMode)rangeMode rangeType:(ASLayoutRangeType)rangeType
-{
-  ASDisplayNodeAssert(rangeMode < _tuningParameters.size() && rangeType < _tuningParameters[rangeMode].size(), @"Setting a range that is OOB for the configured tuning parameters");
-  _tuningParameters[rangeMode][rangeType] = tuningParameters;
-}
-
-@end
-
-#pragma mark - ASCollectionNode
-
-@interface ASCollectionNode ()
-{
-  AS::RecursiveMutex _environmentStateLock;
-  Class _collectionViewClass;
-  id<ASBatchFetchingDelegate> _batchFetchingDelegate;
-}
-@property (nonatomic) _ASCollectionPendingState *pendingState;
-@property (nonatomic, weak) ASRangeController *rangeController;
-@end
-
-@implementation ASCollectionNode
-
-#pragma mark Lifecycle
-
-- (Class)collectionViewClass
-{
-  return _collectionViewClass ? : [ASCollectionView class];
-}
-
-- (void)setCollectionViewClass:(Class)collectionViewClass
-{
-  if (_collectionViewClass != collectionViewClass) {
-    ASDisplayNodeAssert([collectionViewClass isSubclassOfClass:[ASCollectionView class]] || collectionViewClass == Nil, @"ASCollectionNode requires that .collectionViewClass is an ASCollectionView subclass");
-    ASDisplayNodeAssert([self isNodeLoaded] == NO, @"ASCollectionNode's .collectionViewClass cannot be changed after the view is loaded");
-    _collectionViewClass = collectionViewClass;
-  }
-}
-
-- (instancetype)initWithCollectionViewLayout:(UICollectionViewLayout *)layout
-{
-  return [self initWithFrame:CGRectZero collectionViewLayout:layout layoutFacilitator:nil];
-}
-
-- (instancetype)initWithFrame:(CGRect)frame collectionViewLayout:(UICollectionViewLayout *)layout
-{
-  return [self initWithFrame:frame collectionViewLayout:layout layoutFacilitator:nil];
-}
-
-- (instancetype)initWithLayoutDelegate:(id<ASCollectionLayoutDelegate>)layoutDelegate layoutFacilitator:(id<ASCollectionViewLayoutFacilitatorProtocol>)layoutFacilitator
-{
-  return [self initWithFrame:CGRectZero collectionViewLayout:[[ASCollectionLayout alloc] initWithLayoutDelegate:layoutDelegate] layoutFacilitator:layoutFacilitator];
-}
-
-- (instancetype)initWithFrame:(CGRect)frame collectionViewLayout:(UICollectionViewLayout *)layout layoutFacilitator:(id<ASCollectionViewLayoutFacilitatorProtocol>)layoutFacilitator
-{
-  if (self = [super init]) {
-    // Must call the setter here to make sure pendingState is created and the layout is configured.
-    [self setCollectionViewLayout:layout];
-    
-    __weak __typeof__(self) weakSelf = self;
-    [self setViewBlock:^{
-      __typeof__(self) strongSelf = weakSelf;
-      return [[[strongSelf collectionViewClass] alloc] _initWithFrame:frame collectionViewLayout:strongSelf->_pendingState.collectionViewLayout layoutFacilitator:layoutFacilitator owningNode:strongSelf eventLog:ASDisplayNodeGetEventLog(strongSelf)];
-    }];
-  }
-  return self;
-}
-
-#if ASDISPLAYNODE_ASSERTIONS_ENABLED
-- (void)dealloc
-{
-  if (self.nodeLoaded) {
-    __weak UIView *view = self.view;
-    ASPerformBlockOnMainThread(^{
-      ASDisplayNodeCAssertNil(view.superview, @"Node's view should be removed from hierarchy.");
-    });
-  }
-}
-#endif
-
-#pragma mark ASDisplayNode
-
-- (void)didLoad
-{
-  [super didLoad];
-  
-  ASCollectionView *view = self.view;
-  view.collectionNode    = self;
- 
-  _rangeController = view.rangeController;
-  
-  if (_pendingState) {
-    _ASCollectionPendingState *pendingState = _pendingState;
-    self.pendingState                   = nil;
-    view.asyncDelegate                  = pendingState.delegate;
-    view.asyncDataSource                = pendingState.dataSource;
-    view.inverted                       = pendingState.inverted;
-    view.allowsSelection                = pendingState.allowsSelection;
-    view.allowsMultipleSelection        = pendingState.allowsMultipleSelection;
-    view.cellLayoutMode                 = pendingState.cellLayoutMode;
-    view.layoutInspector                = pendingState.layoutInspector;
-    view.showsVerticalScrollIndicator   = pendingState.showsVerticalScrollIndicator;
-    view.showsHorizontalScrollIndicator = pendingState.showsHorizontalScrollIndicator;
-
-    // Only apply these flags if they're enabled; the view might come with them turned on.
-    if (pendingState.alwaysBounceVertical) {
-      view.alwaysBounceVertical = YES;
-    }
-    if (pendingState.alwaysBounceHorizontal) {
-      view.alwaysBounceHorizontal = YES;
-    }
-
-    UIEdgeInsets contentInset = pendingState.contentInset;
-    if (!UIEdgeInsetsEqualToEdgeInsets(contentInset, UIEdgeInsetsZero)) {
-      view.contentInset = contentInset;
-    }
-
-    CGPoint contentOffset = pendingState.contentOffset;
-    if (!CGPointEqualToPoint(contentOffset, CGPointZero)) {
-      [view setContentOffset:contentOffset animated:pendingState.animatesContentOffset];
-    }
-    
-    const auto tuningParametersVector = pendingState->_tuningParameters;
-    const auto tuningParametersVectorSize = tuningParametersVector.size();
-    for (NSInteger rangeMode = 0; rangeMode < tuningParametersVectorSize; rangeMode++) {
-      const auto tuningparametersRangeModeVector = tuningParametersVector[rangeMode];
-      const auto tuningParametersVectorRangeModeSize = tuningparametersRangeModeVector.size();
-      for (NSInteger rangeType = 0; rangeType < tuningParametersVectorRangeModeSize; rangeType++) {
-        ASRangeTuningParameters tuningParameters = tuningparametersRangeModeVector[rangeType];
-        [_rangeController setTuningParameters:tuningParameters
-                                 forRangeMode:(ASLayoutRangeMode)rangeMode
-                                    rangeType:(ASLayoutRangeType)rangeType];
-      }
-    }
-    
-    if (pendingState.rangeMode != ASLayoutRangeModeUnspecified) {
-      [_rangeController updateCurrentRangeWithMode:pendingState.rangeMode];
-    }
-    
-    // Don't need to set collectionViewLayout to the view as the layout was already used to init the view in view block.
-  }
-}
-
-- (ASCollectionView *)view
-{
-  return (ASCollectionView *)[super view];
-}
-
-- (void)clearContents
-{
-  [super clearContents];
-  [self.rangeController clearContents];
-}
-
-- (void)interfaceStateDidChange:(ASInterfaceState)newState fromState:(ASInterfaceState)oldState
-{
-  [super interfaceStateDidChange:newState fromState:oldState];
-  [ASRangeController layoutDebugOverlayIfNeeded];
-}
-
-- (void)didEnterPreloadState
-{
-  [super didEnterPreloadState];
-  // ASCollectionNode is often nested inside of other collections. In this case, ASHierarchyState's RangeManaged bit will be set.
-  // Intentionally allocate the view here and trigger a layout pass on it, which in turn will trigger the intial data load.
-  // We can get rid of this call later when ASDataController, ASRangeController and ASCollectionLayout can operate without the view.
-  // TODO (ASCL) If this node supports async layout, kick off the initial data load without allocating the view
-  if (ASHierarchyStateIncludesRangeManaged(self.hierarchyState) && CGRectEqualToRect(self.bounds, CGRectZero) == NO) {
-    [self.view layoutIfNeeded];
-  }
-}
-
-#if ASRangeControllerLoggingEnabled
-- (void)didEnterVisibleState
-{
-  [super didEnterVisibleState];
-  NSLog(@"%@ - visible: YES", self);
-}
-
-- (void)didExitVisibleState
-{
-  [super didExitVisibleState];
-  NSLog(@"%@ - visible: NO", self);
-}
-#endif
-
-- (void)didExitPreloadState
-{
-  [super didExitPreloadState];
-  [self.rangeController clearPreloadedData];
-}
-
-#pragma mark Setter / Getter
-
-// TODO: Implement this without the view. Then revisit ASLayoutElementCollectionTableSetTraitCollection
-- (ASDataController *)dataController
-{
-  return self.view.dataController;
-}
-
-- (_ASCollectionPendingState *)pendingState
-{
-  if (!_pendingState && ![self isNodeLoaded]) {
-    self.pendingState = [[_ASCollectionPendingState alloc] init];
-  }
-  ASDisplayNodeAssert(![self isNodeLoaded] || !_pendingState, @"ASCollectionNode should not have a pendingState once it is loaded");
-  return _pendingState;
-}
-
-- (void)setInverted:(BOOL)inverted
-{
-  self.transform = inverted ? CATransform3DMakeScale(1, -1, 1)  : CATransform3DIdentity;
-  if ([self pendingState]) {
-    _pendingState.inverted = inverted;
-  } else {
-    ASDisplayNodeAssert([self isNodeLoaded], @"ASCollectionNode should be loaded if pendingState doesn't exist");
-    self.view.inverted = inverted;
-  }
-}
-
-- (BOOL)inverted
-{
-  if ([self pendingState]) {
-    return _pendingState.inverted;
-  } else {
-    return self.view.inverted;
-  }
-}
-
-- (void)setLayoutInspector:(id<ASCollectionViewLayoutInspecting>)layoutInspector
-{
-  if ([self pendingState]) {
-    _pendingState.layoutInspector = layoutInspector;
-  } else {
-    ASDisplayNodeAssert([self isNodeLoaded], @"ASCollectionNode should be loaded if pendingState doesn't exist");
-    self.view.layoutInspector = layoutInspector;
-  }
-}
-
-- (id<ASCollectionViewLayoutInspecting>)layoutInspector
-{
-  if ([self pendingState]) {
-    return _pendingState.layoutInspector;
-  } else {
-    return self.view.layoutInspector;
-  }
-}
-
-- (void)setLeadingScreensForBatching:(CGFloat)leadingScreensForBatching
-{
-  if ([self pendingState]) {
-    _pendingState.leadingScreensForBatching = leadingScreensForBatching;
-  } else {
-    ASDisplayNodeAssert([self isNodeLoaded], @"ASCollectionNode should be loaded if pendingState doesn't exist");
-    self.view.leadingScreensForBatching = leadingScreensForBatching;
-  }
-}
-
-- (CGFloat)leadingScreensForBatching
-{
-  if ([self pendingState]) {
-    return _pendingState.leadingScreensForBatching;
-  } else {
-    return self.view.leadingScreensForBatching;
-  }
-}
-
-- (void)setDelegate:(id <ASCollectionDelegate>)delegate
-{
-  if ([self pendingState]) {
-    _pendingState.delegate = delegate;
-  } else {
-    ASDisplayNodeAssert([self isNodeLoaded], @"ASCollectionNode should be loaded if pendingState doesn't exist");
-
-    // Manually trampoline to the main thread. The view requires this be called on main
-    // and asserting here isn't an option – it is a common pattern for users to clear
-    // the delegate/dataSource in dealloc, which may be running on a background thread.
-    // It is important that we avoid retaining self in this block, so that this method is dealloc-safe.
-    ASCollectionView *view = self.view;
-    ASPerformBlockOnMainThread(^{
-      view.asyncDelegate = delegate;
-    });
-  }
-}
-
-- (id <ASCollectionDelegate>)delegate
-{
-  if ([self pendingState]) {
-    return _pendingState.delegate;
-  } else {
-    return self.view.asyncDelegate;
-  }
-}
-
-- (void)setDataSource:(id <ASCollectionDataSource>)dataSource
-{
-  if ([self pendingState]) {
-    _pendingState.dataSource = dataSource;
-  } else {
-    ASDisplayNodeAssert([self isNodeLoaded], @"ASCollectionNode should be loaded if pendingState doesn't exist");
-    // Manually trampoline to the main thread. The view requires this be called on main
-    // and asserting here isn't an option – it is a common pattern for users to clear
-    // the delegate/dataSource in dealloc, which may be running on a background thread.
-    // It is important that we avoid retaining self in this block, so that this method is dealloc-safe.
-    ASCollectionView *view = self.view;
-    ASPerformBlockOnMainThread(^{
-      view.asyncDataSource = dataSource;
-    });
-  }
-}
-
-- (id <ASCollectionDataSource>)dataSource
-{
-  if ([self pendingState]) {
-    return _pendingState.dataSource;
-  } else {
-    return self.view.asyncDataSource;
-  }
-}
-
-- (void)setAllowsSelection:(BOOL)allowsSelection
-{
-  if ([self pendingState]) {
-    _pendingState.allowsSelection = allowsSelection;
-  } else {
-    ASDisplayNodeAssert([self isNodeLoaded], @"ASCollectionNode should be loaded if pendingState doesn't exist");
-    self.view.allowsSelection = allowsSelection;
-  }
-}
-
-- (BOOL)allowsSelection
-{
-  if ([self pendingState]) {
-    return _pendingState.allowsSelection;
-  } else {
-    return self.view.allowsSelection;
-  }
-}
-
-- (void)setAllowsMultipleSelection:(BOOL)allowsMultipleSelection
-{
-  if ([self pendingState]) {
-    _pendingState.allowsMultipleSelection = allowsMultipleSelection;
-  } else {
-    ASDisplayNodeAssert([self isNodeLoaded], @"ASCollectionNode should be loaded if pendingState doesn't exist");
-    self.view.allowsMultipleSelection = allowsMultipleSelection;
-  }
-}
-
-- (BOOL)allowsMultipleSelection
-{
-  if ([self pendingState]) {
-    return _pendingState.allowsMultipleSelection;
-  } else {
-    return self.view.allowsMultipleSelection;
-  }
-}
-
-- (void)setAlwaysBounceVertical:(BOOL)alwaysBounceVertical
-{
-  if ([self pendingState]) {
-    _pendingState.alwaysBounceVertical = alwaysBounceVertical;
-  } else {
-    ASDisplayNodeAssert([self isNodeLoaded], @"ASCollectionNode should be loaded if pendingState doesn't exist");
-    self.view.alwaysBounceVertical = alwaysBounceVertical;
-  }
-}
-
-- (BOOL)alwaysBounceVertical
-{
-  if ([self pendingState]) {
-    return _pendingState.alwaysBounceVertical;
-  } else {
-    return self.view.alwaysBounceVertical;
-  }
-}
-
-- (void)setAlwaysBounceHorizontal:(BOOL)alwaysBounceHorizontal
-{
-  if ([self pendingState]) {
-    _pendingState.alwaysBounceHorizontal = alwaysBounceHorizontal;
-  } else {
-    ASDisplayNodeAssert([self isNodeLoaded], @"ASCollectionNode should be loaded if pendingState doesn't exist");
-    self.view.alwaysBounceHorizontal = alwaysBounceHorizontal;
-  }
-}
-
-- (BOOL)alwaysBounceHorizontal
-{
-  if ([self pendingState]) {
-    return _pendingState.alwaysBounceHorizontal;
-  } else {
-    return self.view.alwaysBounceHorizontal;
-  }
-}
-
-- (void)setShowsVerticalScrollIndicator:(BOOL)showsVerticalScrollIndicator
-{
-  if ([self pendingState]) {
-    _pendingState.showsVerticalScrollIndicator = showsVerticalScrollIndicator;
-  } else {
-    ASDisplayNodeAssert([self isNodeLoaded], @"ASCollectionNode should be loaded if pendingState doesn't exist");
-    self.view.showsVerticalScrollIndicator = showsVerticalScrollIndicator;
-  }
-}
-
-- (BOOL)showsVerticalScrollIndicator
-{
-  if ([self pendingState]) {
-    return _pendingState.showsVerticalScrollIndicator;
-  } else {
-    return self.view.showsVerticalScrollIndicator;
-  }
-}
-
-- (void)setShowsHorizontalScrollIndicator:(BOOL)showsHorizontalScrollIndicator
-{
-  if ([self pendingState]) {
-    _pendingState.showsHorizontalScrollIndicator = showsHorizontalScrollIndicator;
-  } else {
-    ASDisplayNodeAssert([self isNodeLoaded], @"ASCollectionNode should be loaded if pendingState doesn't exist");
-    self.view.showsHorizontalScrollIndicator = showsHorizontalScrollIndicator;
-  }
-}
-
-- (BOOL)showsHorizontalScrollIndicator
-{
-  if ([self pendingState]) {
-    return _pendingState.showsHorizontalScrollIndicator;
-  } else {
-    return self.view.showsHorizontalScrollIndicator;
-  }
-}
-
-- (void)setCollectionViewLayout:(UICollectionViewLayout *)layout
-{
-  if ([self pendingState]) {
-    [self _configureCollectionViewLayout:layout];
-    _pendingState.collectionViewLayout = layout;
-  } else {
-    [self _configureCollectionViewLayout:layout];
-    self.view.collectionViewLayout = layout;
-  }
-}
-
-- (UICollectionViewLayout *)collectionViewLayout
-{
-  if ([self pendingState]) {
-    return _pendingState.collectionViewLayout;
-  } else {
-    return self.view.collectionViewLayout;
-  }
-}
-
-- (void)setContentInset:(UIEdgeInsets)contentInset
-{
-  if ([self pendingState]) {
-    _pendingState.contentInset = contentInset;
-  } else {
-    ASDisplayNodeAssert([self isNodeLoaded], @"ASCollectionNode should be loaded if pendingState doesn't exist");
-    self.view.contentInset = contentInset;
-  }
-}
-
-- (UIEdgeInsets)contentInset
-{
-  if ([self pendingState]) {
-    return _pendingState.contentInset;
-  } else {
-    return self.view.contentInset;
-  }
-}
-
-- (void)setContentOffset:(CGPoint)contentOffset
-{
-  [self setContentOffset:contentOffset animated:NO];
-}
-
-- (void)setContentOffset:(CGPoint)contentOffset animated:(BOOL)animated
-{
-  if ([self pendingState]) {
-    _pendingState.contentOffset = contentOffset;
-    _pendingState.animatesContentOffset = animated;
-  } else {
-    ASDisplayNodeAssert([self isNodeLoaded], @"ASCollectionNode should be loaded if pendingState doesn't exist");
-    [self.view setContentOffset:contentOffset animated:animated];
-  }
-}
-
-- (CGPoint)contentOffset
-{
-  if ([self pendingState]) {
-    return _pendingState.contentOffset;
-  } else {
-    return self.view.contentOffset;
-  }
-}
-
-- (ASScrollDirection)scrollDirection
-{
-  return [self isNodeLoaded] ? self.view.scrollDirection : ASScrollDirectionNone;
-}
-
-- (ASScrollDirection)scrollableDirections
-{
-  return [self isNodeLoaded] ? self.view.scrollableDirections : ASScrollDirectionNone;
-}
-
-- (ASElementMap *)visibleElements
-{
-  ASDisplayNodeAssertMainThread();
-  // TODO Own the data controller when view is not yet loaded
-  return self.dataController.visibleMap;
-}
-
-- (id<ASCollectionLayoutDelegate>)layoutDelegate
-{
-  UICollectionViewLayout *layout = self.collectionViewLayout;
-  if ([layout isKindOfClass:[ASCollectionLayout class]]) {
-    return ((ASCollectionLayout *)layout).layoutDelegate;
-  }
-  return nil;
-}
-
-- (void)setBatchFetchingDelegate:(id<ASBatchFetchingDelegate>)batchFetchingDelegate
-{
-  _batchFetchingDelegate = batchFetchingDelegate;
-}
-
-- (id<ASBatchFetchingDelegate>)batchFetchingDelegate
-{
-  return _batchFetchingDelegate;
-}
-
-- (ASCellLayoutMode)cellLayoutMode
-{
-  if ([self pendingState]) {
-    return _pendingState.cellLayoutMode;
-  } else {
-    return self.view.cellLayoutMode;
-  }
-}
-
-- (void)setCellLayoutMode:(ASCellLayoutMode)cellLayoutMode
-{
-  if ([self pendingState]) {
-    _pendingState.cellLayoutMode = cellLayoutMode;
-  } else {
-    self.view.cellLayoutMode = cellLayoutMode;
-  }
-}
-
-#pragma mark - Range Tuning
-
-- (ASRangeTuningParameters)tuningParametersForRangeType:(ASLayoutRangeType)rangeType
-{
-  return [self tuningParametersForRangeMode:ASLayoutRangeModeFull rangeType:rangeType];
-}
-
-- (void)setTuningParameters:(ASRangeTuningParameters)tuningParameters forRangeType:(ASLayoutRangeType)rangeType
-{
-  [self setTuningParameters:tuningParameters forRangeMode:ASLayoutRangeModeFull rangeType:rangeType];
-}
-
-- (ASRangeTuningParameters)tuningParametersForRangeMode:(ASLayoutRangeMode)rangeMode rangeType:(ASLayoutRangeType)rangeType
-{
-  if ([self pendingState]) {
-    return [_pendingState tuningParametersForRangeMode:rangeMode rangeType:rangeType];
-  } else {
-    return [self.rangeController tuningParametersForRangeMode:rangeMode rangeType:rangeType];
-  }
-}
-
-- (void)setTuningParameters:(ASRangeTuningParameters)tuningParameters forRangeMode:(ASLayoutRangeMode)rangeMode rangeType:(ASLayoutRangeType)rangeType
-{
-  if ([self pendingState]) {
-    [_pendingState setTuningParameters:tuningParameters forRangeMode:rangeMode rangeType:rangeType];
-  } else {
-    return [self.rangeController setTuningParameters:tuningParameters forRangeMode:rangeMode rangeType:rangeType];
-  }
-}
-
-#pragma mark - Selection
-
-- (NSArray<NSIndexPath *> *)indexPathsForSelectedItems
-{
-  ASDisplayNodeAssertMainThread();
-  ASCollectionView *view = self.view;
-  return [view convertIndexPathsToCollectionNode:view.indexPathsForSelectedItems];
-}
-
-- (void)selectItemAtIndexPath:(nullable NSIndexPath *)indexPath animated:(BOOL)animated scrollPosition:(UICollectionViewScrollPosition)scrollPosition
-{
-  ASDisplayNodeAssertMainThread();
-  ASCollectionView *collectionView = self.view;
-
-  indexPath = [collectionView convertIndexPathFromCollectionNode:indexPath waitingIfNeeded:YES];
-
-  if (indexPath != nil) {
-    [collectionView selectItemAtIndexPath:indexPath animated:animated scrollPosition:scrollPosition];
-  } else {
-    NSLog(@"Failed to select item at index path %@ because the item never reached the view.", indexPath);
-  }
-}
-
-- (void)deselectItemAtIndexPath:(NSIndexPath *)indexPath animated:(BOOL)animated
-{
-  ASDisplayNodeAssertMainThread();
-  ASCollectionView *collectionView = self.view;
-
-  indexPath = [collectionView convertIndexPathFromCollectionNode:indexPath waitingIfNeeded:YES];
-
-  if (indexPath != nil) {
-    [collectionView deselectItemAtIndexPath:indexPath animated:animated];
-  } else {
-    NSLog(@"Failed to deselect item at index path %@ because the item never reached the view.", indexPath);
-  }
-}
-
-- (void)scrollToItemAtIndexPath:(NSIndexPath *)indexPath atScrollPosition:(UICollectionViewScrollPosition)scrollPosition animated:(BOOL)animated
-{
-  ASDisplayNodeAssertMainThread();
-  ASCollectionView *collectionView = self.view;
-
-  indexPath = [collectionView convertIndexPathFromCollectionNode:indexPath waitingIfNeeded:YES];
-
-  if (indexPath != nil) {
-    [collectionView scrollToItemAtIndexPath:indexPath atScrollPosition:scrollPosition animated:animated];
-  } else {
-    NSLog(@"Failed to scroll to item at index path %@ because the item never reached the view.", indexPath);
-  }
-}
-
-#pragma mark - Querying Data
-
-- (void)reloadDataInitiallyIfNeeded
-{
-  if (!self.dataController.initialReloadDataHasBeenCalled) {
-    [self reloadData];
-  }
-}
-
-- (NSInteger)numberOfItemsInSection:(NSInteger)section
-{
-  [self reloadDataInitiallyIfNeeded];
-  return [self.dataController.pendingMap numberOfItemsInSection:section];
-}
-
-- (NSInteger)numberOfSections
-{
-  [self reloadDataInitiallyIfNeeded];
-  return self.dataController.pendingMap.numberOfSections;
-}
-
-- (NSArray<__kindof ASCellNode *> *)visibleNodes
-{
-  ASDisplayNodeAssertMainThread();
-  return self.isNodeLoaded ? [self.view visibleNodes] : @[];
-}
-
-- (ASCellNode *)nodeForItemAtIndexPath:(NSIndexPath *)indexPath
-{
-  [self reloadDataInitiallyIfNeeded];
-  return [self.dataController.pendingMap elementForItemAtIndexPath:indexPath].node;
-}
-
-- (id)nodeModelForItemAtIndexPath:(NSIndexPath *)indexPath
-{
-  [self reloadDataInitiallyIfNeeded];
-  return [self.dataController.pendingMap elementForItemAtIndexPath:indexPath].nodeModel;
-}
-
-- (NSIndexPath *)indexPathForNode:(ASCellNode *)cellNode
-{
-  return [self.dataController.pendingMap indexPathForElement:cellNode.collectionElement];
-}
-
-- (NSArray<NSIndexPath *> *)indexPathsForVisibleItems
-{
-  ASDisplayNodeAssertMainThread();
-  NSMutableArray *indexPathsArray = [NSMutableArray new];
-  for (ASCellNode *cell in [self visibleNodes]) {
-    NSIndexPath *indexPath = [self indexPathForNode:cell];
-    if (indexPath) {
-      [indexPathsArray addObject:indexPath];
-    }
-  }
-  return indexPathsArray;
-}
-
-- (nullable NSIndexPath *)indexPathForItemAtPoint:(CGPoint)point
-{
-  ASDisplayNodeAssertMainThread();
-  ASCollectionView *collectionView = self.view;
-
-  NSIndexPath *indexPath = [collectionView indexPathForItemAtPoint:point];
-  if (indexPath != nil) {
-    return [collectionView convertIndexPathToCollectionNode:indexPath];
-  }
-  return indexPath;
-}
-
-- (nullable UICollectionViewCell *)cellForItemAtIndexPath:(NSIndexPath *)indexPath
-{
-  ASDisplayNodeAssertMainThread();
-  ASCollectionView *collectionView = self.view;
-
-  indexPath = [collectionView convertIndexPathFromCollectionNode:indexPath waitingIfNeeded:YES];
-  if (indexPath == nil) {
-    return nil;
-  }
-  return [collectionView cellForItemAtIndexPath:indexPath];
-}
-
-- (id<ASSectionContext>)contextForSection:(NSInteger)section
-{
-  ASDisplayNodeAssertMainThread();
-  return [self.dataController.pendingMap contextForSection:section];
-}
-
-#pragma mark - Editing
-
-- (void)registerSupplementaryNodeOfKind:(NSString *)elementKind
-{
-  [self.view registerSupplementaryNodeOfKind:elementKind];
-}
-
-- (void)performBatchAnimated:(BOOL)animated updates:(NS_NOESCAPE void (^)())updates completion:(void (^)(BOOL))completion
-{
-  ASDisplayNodeAssertMainThread();
-  if (self.nodeLoaded) {
-    [self.view performBatchAnimated:animated updates:updates completion:completion];
-  } else {
-    if (updates) {
-      updates();
-    }
-    if (completion) {
-      completion(YES);
-    }
-  }
-}
-
-- (void)performBatchUpdates:(NS_NOESCAPE void (^)())updates completion:(void (^)(BOOL))completion
-{
-  [self performBatchAnimated:UIView.areAnimationsEnabled updates:updates completion:completion];
-}
-
-- (BOOL)isProcessingUpdates
-{
-  return (self.nodeLoaded ? [self.view isProcessingUpdates] : NO);
-}
-
-- (void)onDidFinishProcessingUpdates:(void (^)())completion
-{
-  if (!completion) {
-    return;
-  }
-  if (!self.nodeLoaded) {
-    completion();
-  } else {
-    [self.view onDidFinishProcessingUpdates:completion];
-  }
-}
-
-- (BOOL)isSynchronized
-{
-  return (self.nodeLoaded ? [self.view isSynchronized] : YES);
-}
-
-- (void)onDidFinishSynchronizing:(void (^)())completion
-{
-  if (!completion) {
-    return;
-  }
-  if (!self.nodeLoaded) {
-    completion();
-  } else {
-    [self.view onDidFinishSynchronizing:completion];
-  }
-}
-
-- (void)waitUntilAllUpdatesAreProcessed
-{
-  ASDisplayNodeAssertMainThread();
-  if (self.nodeLoaded) {
-    [self.view waitUntilAllUpdatesAreCommitted];
-  }
-}
-
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-implementations"
-- (void)waitUntilAllUpdatesAreCommitted
-{
-  [self waitUntilAllUpdatesAreProcessed];
-}
-#pragma clang diagnostic pop
-
-- (void)reloadDataWithCompletion:(void (^)())completion
-{
-  ASDisplayNodeAssertMainThread();
-  if (!self.nodeLoaded) {
-    return;
-  }
-  
-  [self performBatchUpdates:^{
-    [self.view.changeSet reloadData];
-  } completion:^(BOOL finished){
-    if (completion) {
-      completion();
-    }
-  }];
-}
-
-- (void)reloadData
-{
-  [self reloadDataWithCompletion:nil];
-}
-
-- (void)relayoutItems
-{
-  ASDisplayNodeAssertMainThread();
-  if (self.nodeLoaded) {
-  	[self.view relayoutItems];
-  }
-}
-
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-implementations"
-- (void)beginUpdates
-{
-  ASDisplayNodeAssertMainThread();
-  if (self.nodeLoaded) {
-    [self.view beginUpdates];
-  }
-}
-
-- (void)endUpdatesAnimated:(BOOL)animated
-{
-  [self endUpdatesAnimated:animated completion:nil];
-}
-
-- (void)endUpdatesAnimated:(BOOL)animated completion:(void (^)(BOOL))completion
-{
-  ASDisplayNodeAssertMainThread();
-  if (self.nodeLoaded) {
-    [self.view endUpdatesAnimated:animated completion:completion];
-  }
-}
-#pragma clang diagnostic pop
-
-- (void)invalidateFlowLayoutDelegateMetrics {
-  ASDisplayNodeAssertMainThread();
-  if (self.nodeLoaded) {
-    [self.view invalidateFlowLayoutDelegateMetrics];
-  }
-}
-
-- (void)insertSections:(NSIndexSet *)sections
-{
-  ASDisplayNodeAssertMainThread();
-  if (self.nodeLoaded) {
-    [self.view insertSections:sections];
-  }
-}
-
-- (void)deleteSections:(NSIndexSet *)sections
-{
-  ASDisplayNodeAssertMainThread();
-  if (self.nodeLoaded) {
-    [self.view deleteSections:sections];
-  }
-}
-
-- (void)reloadSections:(NSIndexSet *)sections
-{
-  ASDisplayNodeAssertMainThread();
-  if (self.nodeLoaded) {
-    [self.view reloadSections:sections];
-  }
-}
-
-- (void)moveSection:(NSInteger)section toSection:(NSInteger)newSection
-{
-  ASDisplayNodeAssertMainThread();
-  if (self.nodeLoaded) {
-    [self.view moveSection:section toSection:newSection];
-  }
-}
-
-- (void)insertItemsAtIndexPaths:(NSArray *)indexPaths
-{
-  ASDisplayNodeAssertMainThread();
-  if (self.nodeLoaded) {
-    [self.view insertItemsAtIndexPaths:indexPaths];
-  }
-}
-
-- (void)deleteItemsAtIndexPaths:(NSArray *)indexPaths
-{
-  ASDisplayNodeAssertMainThread();
-  if (self.nodeLoaded) {
-    [self.view deleteItemsAtIndexPaths:indexPaths];
-  }
-}
-
-- (void)reloadItemsAtIndexPaths:(NSArray *)indexPaths
-{
-  ASDisplayNodeAssertMainThread();
-  if (self.nodeLoaded) {
-    [self.view reloadItemsAtIndexPaths:indexPaths];
-  }
-}
-
-- (void)moveItemAtIndexPath:(NSIndexPath *)indexPath toIndexPath:(NSIndexPath *)newIndexPath
-{
-  ASDisplayNodeAssertMainThread();
-  if (self.nodeLoaded) {
-    [self.view moveItemAtIndexPath:indexPath toIndexPath:newIndexPath];
-  }
-}
-
-#pragma mark - ASRangeControllerUpdateRangeProtocol
-
-- (void)updateCurrentRangeWithMode:(ASLayoutRangeMode)rangeMode;
-{
-  if ([self pendingState]) {
-    _pendingState.rangeMode = rangeMode;
-  } else {
-    [self.rangeController updateCurrentRangeWithMode:rangeMode];
-  }
-}
-
-#pragma mark - ASPrimitiveTraitCollection
-
-ASLayoutElementCollectionTableSetTraitCollection(_environmentStateLock)
-
-#pragma mark - Debugging (Private)
-
-- (NSMutableArray<NSDictionary *> *)propertiesForDebugDescription
-{
-  NSMutableArray<NSDictionary *> *result = [super propertiesForDebugDescription];
-  [result addObject:@{ @"dataSource" : ASObjectDescriptionMakeTiny(self.dataSource) }];
-  [result addObject:@{ @"delegate" : ASObjectDescriptionMakeTiny(self.delegate) }];
-  return result;
-}
-
-#pragma mark - Private methods
-
-- (void)_configureCollectionViewLayout:(UICollectionViewLayout *)layout
-{
-  if ([layout isKindOfClass:[ASCollectionLayout class]]) {
-    ASCollectionLayout *collectionLayout = (ASCollectionLayout *)layout;
-    collectionLayout.collectionNode = self;
-  }
-}
-
-@end
-
-#endif
diff --git a/submodules/AsyncDisplayKit/Source/ASCollectionView.h b/submodules/AsyncDisplayKit/Source/ASCollectionView.h
deleted file mode 100644
index 740efc41d9..0000000000
--- a/submodules/AsyncDisplayKit/Source/ASCollectionView.h
+++ /dev/null
@@ -1,496 +0,0 @@
-//
-//  ASCollectionView.h
-//  Texture
-//
-//  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.
-//  Changes after 4/13/2017 are: Copyright (c) Pinterest, Inc.  All rights reserved.
-//  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
-//
-
-#ifndef MINIMAL_ASDK
-
-#import <UIKit/UIKit.h>
-
-#import <AsyncDisplayKit/ASCollectionViewProtocols.h>
-#import <AsyncDisplayKit/ASBaseDefines.h>
-#import <AsyncDisplayKit/ASBatchContext.h>
-#import <AsyncDisplayKit/ASDimension.h>
-#import <AsyncDisplayKit/ASLayoutRangeType.h>
-#import <AsyncDisplayKit/ASScrollDirection.h>
-
-@class ASCellNode;
-@class ASCollectionNode;
-@protocol ASCollectionDataSource;
-@protocol ASCollectionDelegate;
-@protocol ASCollectionViewLayoutInspecting;
-@protocol ASSectionContext;
-
-NS_ASSUME_NONNULL_BEGIN
-
-/**
- * Asynchronous UICollectionView with Intelligent Preloading capabilities.
- *
- * @note ASCollectionNode is strongly recommended over ASCollectionView.  This class exists for adoption convenience.
- */
-@interface ASCollectionView : UICollectionView
-
-/**
- * Returns the corresponding ASCollectionNode
- *
- * @return collectionNode The corresponding ASCollectionNode, if one exists.
- */
-@property (nonatomic, weak, readonly) ASCollectionNode *collectionNode;
-
-/**
- * Retrieves the node for the item at the given index path.
- *
- * @param indexPath The index path of the requested node.
- * @return The node at the given index path, or @c nil if no item exists at the specified path.
- */
-- (nullable ASCellNode *)nodeForItemAtIndexPath:(NSIndexPath *)indexPath AS_WARN_UNUSED_RESULT;
-
-/**
- * Similar to -indexPathForCell:.
- *
- * @param cellNode a cellNode in the collection view
- *
- * @return The index path for this cell node.
- *
- * @discussion This index path returned by this method is in the _view's_ index space
- *    and should only be used with @c ASCollectionView directly. To get an index path suitable
- *    for use with your data source and @c ASCollectionNode, call @c indexPathForNode: on the
- *    collection node instead.
- */
-- (nullable NSIndexPath *)indexPathForNode:(ASCellNode *)cellNode AS_WARN_UNUSED_RESULT;
-
-/**
- * Similar to -supplementaryViewForElementKind:atIndexPath:
- *
- * @param elementKind The kind of supplementary node to locate.
- * @param indexPath The index path of the requested supplementary node.
- *
- * @return The specified supplementary node or @c nil.
- */
-- (nullable ASCellNode *)supplementaryNodeForElementKind:(NSString *)elementKind atIndexPath:(NSIndexPath *)indexPath AS_WARN_UNUSED_RESULT;
-
-/**
- * Retrieves the context object for the given section, as provided by the data source in
- * the @c collectionNode:contextForSection: method. This method must be called on the main thread.
- *
- * @param section The section to get the context for.
- *
- * @return The context object, or @c nil if no context was provided.
- */
-- (nullable id<ASSectionContext>)contextForSection:(NSInteger)section AS_WARN_UNUSED_RESULT;
-
-@end
-
-@interface ASCollectionView (Deprecated)
-
-/*
- * A Boolean value that determines whether the nodes that the data source renders will be flipped.
- */
-@property (nonatomic) BOOL inverted ASDISPLAYNODE_DEPRECATED_MSG("Use ASCollectionNode property instead.");
-
-/**
- * The number of screens left to scroll before the delegate -collectionView:beginBatchFetchingWithContext: is called.
- *
- * Defaults to two screenfuls.
- */
-@property (nonatomic) CGFloat leadingScreensForBatching ASDISPLAYNODE_DEPRECATED_MSG("Use ASCollectionNode property instead.");
-
-/**
- * Optional introspection object for the collection view's layout.
- *
- * @discussion Since supplementary and decoration views are controlled by the collection view's layout, this object
- * is used as a bridge to provide information to the internal data controller about the existence of these views and
- * their associated index paths. For collection views using `UICollectionViewFlowLayout`, a default inspector
- * implementation `ASCollectionViewFlowLayoutInspector` is created and set on this property by default. Custom
- * collection view layout subclasses will need to provide their own implementation of an inspector object for their
- * supplementary views to be compatible with `ASCollectionView`'s supplementary node support.
- */
-@property (nonatomic, weak) id<ASCollectionViewLayoutInspecting> layoutInspector ASDISPLAYNODE_DEPRECATED_MSG("Use ASCollectionNode property instead.");
-
-/**
- * Determines collection view's current scroll direction. Supports 2-axis collection views.
- *
- * @return a bitmask of ASScrollDirection values.
- */
-@property (nonatomic, readonly) ASScrollDirection scrollDirection ASDISPLAYNODE_DEPRECATED_MSG("Use ASCollectionNode property instead.");
-
-/**
- * Determines collection view's scrollable directions.
- *
- * @return a bitmask of ASScrollDirection values.
- */
-@property (nonatomic, readonly) ASScrollDirection scrollableDirections ASDISPLAYNODE_DEPRECATED_MSG("Use ASCollectionNode property instead.");
-
-/**
- * Forces the .contentInset to be UIEdgeInsetsZero.
- *
- * @discussion By default, UIKit sets the top inset to the navigation bar height, even for horizontally
- * scrolling views.  This can only be disabled by setting a property on the containing UIViewController,
- * automaticallyAdjustsScrollViewInsets, which may not be accessible.  ASPagerNode uses this to ensure
- * its flow layout behaves predictably and does not log undefined layout warnings.
- */
-@property (nonatomic) BOOL zeroContentInsets ASDISPLAYNODE_DEPRECATED_MSG("Set automaticallyAdjustsScrollViewInsets=NO on your view controller instead.");
-
-/**
- * The distance that the content view is inset from the collection view edges. Defaults to UIEdgeInsetsZero.
- */
-@property (nonatomic) UIEdgeInsets contentInset ASDISPLAYNODE_DEPRECATED_MSG("Use ASCollectionNode property instead");
-
-/**
- * The point at which the origin of the content view is offset from the origin of the collection view.
- */
-@property (nonatomic) CGPoint contentOffset ASDISPLAYNODE_DEPRECATED_MSG("Use ASCollectionNode property instead.");
-
-/**
- * The object that acts as the asynchronous delegate of the collection view
- *
- * @discussion The delegate must adopt the ASCollectionDelegate protocol. The collection view maintains a weak reference to the delegate object.
- *
- * The delegate object is responsible for providing size constraints for nodes and indicating whether batch fetching should begin.
- */
-@property (nonatomic, weak) id<ASCollectionDelegate> asyncDelegate ASDISPLAYNODE_DEPRECATED_MSG("Please use ASCollectionNode's .delegate property instead.");
-
-/**
- * The object that acts as the asynchronous data source of the collection view
- *
- * @discussion The datasource must adopt the ASCollectionDataSource protocol. The collection view maintains a weak reference to the datasource object.
- *
- * The datasource object is responsible for providing nodes or node creation blocks to the collection view.
- */
-@property (nonatomic, weak) id<ASCollectionDataSource> asyncDataSource ASDISPLAYNODE_DEPRECATED_MSG("Please use ASCollectionNode's .dataSource property instead.");
-
-/**
- * Initializes an ASCollectionView
- *
- * @discussion Initializes and returns a newly allocated collection view object with the specified layout.
- *
- * @param layout The layout object to use for organizing items. The collection view stores a strong reference to the specified object. Must not be nil.
- */
-- (instancetype)initWithCollectionViewLayout:(UICollectionViewLayout *)layout ASDISPLAYNODE_DEPRECATED_MSG("Please use ASCollectionNode instead of ASCollectionView.");
-
-/**
- * Initializes an ASCollectionView
- *
- * @discussion Initializes and returns a newly allocated collection view object with the specified frame and layout.
- *
- * @param frame The frame rectangle for the collection view, measured in points. The origin of the frame is relative to the superview in which you plan to add it. This frame is passed to the superclass during initialization.
- * @param layout The layout object to use for organizing items. The collection view stores a strong reference to the specified object. Must not be nil.
- */
-- (instancetype)initWithFrame:(CGRect)frame collectionViewLayout:(UICollectionViewLayout *)layout ASDISPLAYNODE_DEPRECATED_MSG("Please use ASCollectionNode instead of ASCollectionView.");
-
-/**
- * Tuning parameters for a range type in full mode.
- *
- * @param rangeType The range type to get the tuning parameters for.
- *
- * @return A tuning parameter value for the given range type in full mode.
- *
- * @see ASLayoutRangeMode
- * @see ASLayoutRangeType
- */
-- (ASRangeTuningParameters)tuningParametersForRangeType:(ASLayoutRangeType)rangeType AS_WARN_UNUSED_RESULT ASDISPLAYNODE_DEPRECATED_MSG("Use ASCollectionNode method instead.");
-
-/**
- * Set the tuning parameters for a range type in full mode.
- *
- * @param tuningParameters The tuning parameters to store for a range type.
- * @param rangeType The range type to set the tuning parameters for.
- *
- * @see ASLayoutRangeMode
- * @see ASLayoutRangeType
- */
-- (void)setTuningParameters:(ASRangeTuningParameters)tuningParameters forRangeType:(ASLayoutRangeType)rangeType ASDISPLAYNODE_DEPRECATED_MSG("Use ASCollectionNode method instead.");
-
-/**
- * Tuning parameters for a range type in the specified mode.
- *
- * @param rangeMode The range mode to get the running parameters for.
- * @param rangeType The range type to get the tuning parameters for.
- *
- * @return A tuning parameter value for the given range type in the given mode.
- *
- * @see ASLayoutRangeMode
- * @see ASLayoutRangeType
- */
-- (ASRangeTuningParameters)tuningParametersForRangeMode:(ASLayoutRangeMode)rangeMode rangeType:(ASLayoutRangeType)rangeType AS_WARN_UNUSED_RESULT ASDISPLAYNODE_DEPRECATED_MSG("Use ASCollectionNode method instead.");
-
-/**
- * Set the tuning parameters for a range type in the specified mode.
- *
- * @param tuningParameters The tuning parameters to store for a range type.
- * @param rangeMode The range mode to set the running parameters for.
- * @param rangeType The range type to set the tuning parameters for.
- *
- * @see ASLayoutRangeMode
- * @see ASLayoutRangeType
- */
-- (void)setTuningParameters:(ASRangeTuningParameters)tuningParameters forRangeMode:(ASLayoutRangeMode)rangeMode rangeType:(ASLayoutRangeType)rangeType ASDISPLAYNODE_DEPRECATED_MSG("Use ASCollectionNode method instead.");
-
-- (nullable __kindof UICollectionViewCell *)cellForItemAtIndexPath:(NSIndexPath *)indexPath ASDISPLAYNODE_DEPRECATED_MSG("Use ASCollectionNode method instead.");
-
-- (void)scrollToItemAtIndexPath:(NSIndexPath *)indexPath atScrollPosition:(UICollectionViewScrollPosition)scrollPosition animated:(BOOL)animated ASDISPLAYNODE_DEPRECATED_MSG("Use ASCollectionNode method instead.");
-
-- (void)selectItemAtIndexPath:(NSIndexPath *)indexPath animated:(BOOL)animated scrollPosition:(UICollectionViewScrollPosition)scrollPosition ASDISPLAYNODE_DEPRECATED_MSG("Use ASCollectionNode method instead.");
-
-@property (nonatomic, copy, readonly) NSArray<NSIndexPath *> *indexPathsForVisibleItems ASDISPLAYNODE_DEPRECATED_MSG("Use ASCollectionNode property instead.");
-
-@property (nullable, nonatomic, copy, readonly) NSArray<NSIndexPath *> *indexPathsForSelectedItems ASDISPLAYNODE_DEPRECATED_MSG("Use ASCollectionNode property instead.");
-
-/**
- *  Perform a batch of updates asynchronously, optionally disabling all animations in the batch. This method must be called from the main thread.
- *  The asyncDataSource must be updated to reflect the changes before the update block completes.
- *
- *  @param animated   NO to disable animations for this batch
- *  @param updates    The block that performs the relevant insert, delete, reload, or move operations.
- *  @param completion A completion handler block to execute when all of the operations are finished. This block takes a single
- *                    Boolean parameter that contains the value YES if all of the related animations completed successfully or
- *                    NO if they were interrupted. This parameter may be nil. If supplied, the block is run on the main thread.
- */
-- (void)performBatchAnimated:(BOOL)animated updates:(nullable AS_NOESCAPE void (^)(void))updates completion:(nullable void (^)(BOOL finished))completion ASDISPLAYNODE_DEPRECATED_MSG("Use ASCollectionNode method instead.");
-
-/**
- *  Perform a batch of updates asynchronously.  This method must be called from the main thread.
- *  The asyncDataSource must be updated to reflect the changes before update block completes.
- *
- *  @param updates    The block that performs the relevant insert, delete, reload, or move operations.
- *  @param completion A completion handler block to execute when all of the operations are finished. This block takes a single
- *                    Boolean parameter that contains the value YES if all of the related animations completed successfully or
- *                    NO if they were interrupted. This parameter may be nil. If supplied, the block is run on the main thread.
- */
-- (void)performBatchUpdates:(nullable AS_NOESCAPE void (^)(void))updates completion:(nullable void (^)(BOOL finished))completion ASDISPLAYNODE_DEPRECATED_MSG("Use ASCollectionNode method instead.");
-
-/**
- * Reload everything from scratch, destroying the working range and all cached nodes.
- *
- * @param completion block to run on completion of asynchronous loading or nil. If supplied, the block is run on
- * the main thread.
- * @warning This method is substantially more expensive than UICollectionView's version.
- */
-- (void)reloadDataWithCompletion:(nullable void (^)(void))completion AS_UNAVAILABLE("Use ASCollectionNode method instead.");
-
-/**
- * Reload everything from scratch, destroying the working range and all cached nodes.
- *
- * @warning This method is substantially more expensive than UICollectionView's version.
- */
-- (void)reloadData AS_UNAVAILABLE("Use ASCollectionNode method instead.");
-
-/**
- * Triggers a relayout of all nodes.
- *
- * @discussion This method invalidates and lays out every cell node in the collection.
- */
-- (void)relayoutItems ASDISPLAYNODE_DEPRECATED_MSG("Use ASCollectionNode method instead.");
-
-/**
- * See ASCollectionNode.h for full documentation of these methods.
- */
-@property (nonatomic, readonly) BOOL isProcessingUpdates;
-- (void)onDidFinishProcessingUpdates:(void (^)(void))completion;
-- (void)waitUntilAllUpdatesAreCommitted ASDISPLAYNODE_DEPRECATED_MSG("Use -[ASCollectionNode waitUntilAllUpdatesAreProcessed] instead.");
-
-/**
- * See ASCollectionNode.h for full documentation of these methods.
- */
-@property (nonatomic, readonly, getter=isSynchronized) BOOL synchronized;
-- (void)onDidFinishSynchronizing:(void (^)(void))completion;
-
-/**
- * Registers the given kind of supplementary node for use in creating node-backed supplementary views.
- *
- * @param elementKind The kind of supplementary node that will be requested through the data source.
- *
- * @discussion Use this method to register support for the use of supplementary nodes in place of the default
- * `registerClass:forSupplementaryViewOfKind:withReuseIdentifier:` and `registerNib:forSupplementaryViewOfKind:withReuseIdentifier:`
- * methods. This method will register an internal backing view that will host the contents of the supplementary nodes
- * returned from the data source.
- */
-- (void)registerSupplementaryNodeOfKind:(NSString *)elementKind ASDISPLAYNODE_DEPRECATED_MSG("Use ASCollectionNode method instead.");
-
-/**
- * Inserts one or more sections.
- *
- * @param sections An index set that specifies the sections to insert.
- *
- * @discussion This method must be called from the main thread. The asyncDataSource must be updated to reflect the changes
- * before this method is called.
- */
-- (void)insertSections:(NSIndexSet *)sections ASDISPLAYNODE_DEPRECATED_MSG("Use ASCollectionNode method instead.");
-
-/**
- * Deletes one or more sections.
- *
- * @param sections An index set that specifies the sections to delete.
- *
- * @discussion This method must be called from the main thread. The asyncDataSource must be updated to reflect the changes
- * before this method is called.
- */
-- (void)deleteSections:(NSIndexSet *)sections ASDISPLAYNODE_DEPRECATED_MSG("Use ASCollectionNode method instead.");
-
-/**
- * Reloads the specified sections.
- *
- * @param sections An index set that specifies the sections to reload.
- *
- * @discussion This method must be called from the main thread. The asyncDataSource must be updated to reflect the changes
- * before this method is called.
- */
-- (void)reloadSections:(NSIndexSet *)sections ASDISPLAYNODE_DEPRECATED_MSG("Use ASCollectionNode method instead.");
-
-/**
- * Moves a section to a new location.
- *
- * @param section The index of the section to move.
- *
- * @param newSection The index that is the destination of the move for the section.
- *
- * @discussion This method must be called from the main thread. The asyncDataSource must be updated to reflect the changes
- * before this method is called.
- */
-- (void)moveSection:(NSInteger)section toSection:(NSInteger)newSection ASDISPLAYNODE_DEPRECATED_MSG("Use ASCollectionNode method instead.");
-
-/**
- * Inserts items at the locations identified by an array of index paths.
- *
- * @param indexPaths An array of NSIndexPath objects, each representing an item index and section index that together identify an item.
- *
- * @discussion This method must be called from the main thread. The asyncDataSource must be updated to reflect the changes
- * before this method is called.
- */
-- (void)insertItemsAtIndexPaths:(NSArray<NSIndexPath *> *)indexPaths ASDISPLAYNODE_DEPRECATED_MSG("Use ASCollectionNode method instead.");
-
-/**
- * Deletes the items specified by an array of index paths.
- *
- * @param indexPaths An array of NSIndexPath objects identifying the items to delete.
- *
- * @discussion This method must be called from the main thread. The asyncDataSource must be updated to reflect the changes
- * before this method is called.
- */
-- (void)deleteItemsAtIndexPaths:(NSArray<NSIndexPath *> *)indexPaths ASDISPLAYNODE_DEPRECATED_MSG("Use ASCollectionNode method instead.");
-
-/**
- * Reloads the specified items.
- *
- * @param indexPaths An array of NSIndexPath objects identifying the items to reload.
- *
- * @discussion This method must be called from the main thread. The asyncDataSource must be updated to reflect the changes
- * before this method is called.
- */
-- (void)reloadItemsAtIndexPaths:(NSArray<NSIndexPath *> *)indexPaths ASDISPLAYNODE_DEPRECATED_MSG("Use ASCollectionNode method instead.");
-
-/**
- * Moves the item at a specified location to a destination location.
- *
- * @param indexPath The index path identifying the item to move.
- *
- * @param newIndexPath The index path that is the destination of the move for the item.
- *
- * @discussion This method must be called from the main thread. The asyncDataSource must be updated to reflect the changes
- * before this method is called.
- */
-- (void)moveItemAtIndexPath:(NSIndexPath *)indexPath toIndexPath:(NSIndexPath *)newIndexPath ASDISPLAYNODE_DEPRECATED_MSG("Use ASCollectionNode method instead.");
-
-/**
- * Query the sized node at @c indexPath for its calculatedSize.
- *
- * @param indexPath The index path for the node of interest.
- *
- * This method is deprecated. Call @c calculatedSize on the node of interest instead. First deprecated in version 2.0.
- */
-- (CGSize)calculatedSizeForNodeAtIndexPath:(NSIndexPath *)indexPath ASDISPLAYNODE_DEPRECATED_MSG("Call -calculatedSize on the node of interest instead.");
-
-/**
- * Similar to -visibleCells.
- *
- * @return an array containing the nodes being displayed on screen.
- */
-- (NSArray<__kindof ASCellNode *> *)visibleNodes AS_WARN_UNUSED_RESULT ASDISPLAYNODE_DEPRECATED_MSG("Use ASCollectionNode method instead.");
-
-- (void)setContentOffset:(CGPoint)contentOffset animated:(BOOL)animated ASDISPLAYNODE_DEPRECATED_MSG("Use ASCollectionNode method instead.");
-
-@end
-
-ASDISPLAYNODE_DEPRECATED_MSG("Renamed to ASCollectionDataSource.")
-@protocol ASCollectionViewDataSource <ASCollectionDataSource>
-@end
-
-ASDISPLAYNODE_DEPRECATED_MSG("Renamed to ASCollectionDelegate.")
-@protocol ASCollectionViewDelegate <ASCollectionDelegate>
-@end
-
-/**
- * Defines methods that let you coordinate a `UICollectionViewFlowLayout` in combination with an `ASCollectionNode`.
- */
-@protocol ASCollectionDelegateFlowLayout <ASCollectionDelegate>
-
-@optional
-
-/**
- * Asks the delegate for the inset that should be applied to the given section.
- *
- * @see the same method in UICollectionViewDelegate. 
- */
-- (UIEdgeInsets)collectionView:(UICollectionView *)collectionView layout:(UICollectionViewLayout *)collectionViewLayout insetForSectionAtIndex:(NSInteger)section;
-
-/**
- * Asks the delegate for the size range that should be used to measure the header in the given flow layout section.
- *
- * @param collectionNode The sender.
- * @param section The section.
- *
- * @return The size range for the header, or @c ASSizeRangeZero if there is no header in this section.
- *
- * If you want the header to completely determine its own size, return @c ASSizeRangeUnconstrained.
- *
- * @note Only the scrollable dimension of the returned size range will be used. In a vertical flow,
- * only the height will be used. In a horizontal flow, only the width will be used. The other dimension
- * will be constrained to fill the collection node.
- *
- * @discussion If you do not implement this method, ASDK will fall back to calling @c collectionView:layout:referenceSizeForHeaderInSection:
- * and using that as the exact constrained size. If you don't implement that method, ASDK will read the @c headerReferenceSize from the layout.
- */
-- (ASSizeRange)collectionNode:(ASCollectionNode *)collectionNode sizeRangeForHeaderInSection:(NSInteger)section;
-
-/**
- * Asks the delegate for the size range that should be used to measure the footer in the given flow layout section.
- *
- * @param collectionNode The sender.
- * @param section The section.
- *
- * @return The size range for the footer, or @c ASSizeRangeZero if there is no footer in this section.
- *
- * If you want the footer to completely determine its own size, return @c ASSizeRangeUnconstrained.
- *
- * @note Only the scrollable dimension of the returned size range will be used. In a vertical flow,
- * only the height will be used. In a horizontal flow, only the width will be used. The other dimension
- * will be constrained to fill the collection node.
- *
- * @discussion If you do not implement this method, ASDK will fall back to calling @c collectionView:layout:referenceSizeForFooterInSection:
- * and using that as the exact constrained size. If you don't implement that method, ASDK will read the @c footerReferenceSize from the layout.
- */
-- (ASSizeRange)collectionNode:(ASCollectionNode *)collectionNode sizeRangeForFooterInSection:(NSInteger)section;
-
-/**
- * Asks the delegate for the size of the header in the specified section.
- */
-- (CGSize)collectionView:(ASCollectionView *)collectionView layout:(UICollectionViewLayout *)collectionViewLayout referenceSizeForHeaderInSection:(NSInteger)section ASDISPLAYNODE_DEPRECATED_MSG("Implement collectionNode:sizeRangeForHeaderInSection: instead.");
-
-/**
- * Asks the delegate for the size of the footer in the specified section.
- */
-- (CGSize)collectionView:(ASCollectionView *)collectionView layout:(UICollectionViewLayout *)collectionViewLayout referenceSizeForFooterInSection:(NSInteger)section ASDISPLAYNODE_DEPRECATED_MSG("Implement collectionNode:sizeRangeForFooterInSection: instead.");
-
-@end
-
-ASDISPLAYNODE_DEPRECATED_MSG("Renamed to ASCollectionDelegateFlowLayout.")
-@protocol ASCollectionViewDelegateFlowLayout <ASCollectionDelegateFlowLayout>
-@end
-
-NS_ASSUME_NONNULL_END
-
-#endif
diff --git a/submodules/AsyncDisplayKit/Source/ASCollectionView.mm b/submodules/AsyncDisplayKit/Source/ASCollectionView.mm
deleted file mode 100644
index b619fd53a7..0000000000
--- a/submodules/AsyncDisplayKit/Source/ASCollectionView.mm
+++ /dev/null
@@ -1,2521 +0,0 @@
-//
-//  ASCollectionView.mm
-//  Texture
-//
-//  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.
-//  Changes after 4/13/2017 are: Copyright (c) Pinterest, Inc.  All rights reserved.
-//  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
-//
-#ifndef MINIMAL_ASDK
-#import <AsyncDisplayKit/ASAssert.h>
-#import <AsyncDisplayKit/ASBatchFetching.h>
-#import <AsyncDisplayKit/ASDelegateProxy.h>
-#import <AsyncDisplayKit/ASCellNode+Internal.h>
-#import <AsyncDisplayKit/ASCollectionElement.h>
-#import <AsyncDisplayKit/ASCollectionInternal.h>
-#import <AsyncDisplayKit/ASCollectionLayout.h>
-#import <AsyncDisplayKit/ASCollectionNode+Beta.h>
-#import <AsyncDisplayKit/ASCollections.h>
-#import <AsyncDisplayKit/ASCollectionViewLayoutController.h>
-#import <AsyncDisplayKit/ASCollectionViewLayoutFacilitatorProtocol.h>
-#import <AsyncDisplayKit/ASCollectionViewFlowLayoutInspector.h>
-#import <AsyncDisplayKit/ASDataController.h>
-#import <AsyncDisplayKit/ASDisplayNodeExtras.h>
-#import <AsyncDisplayKit/ASDisplayNode+FrameworkPrivate.h>
-#import <AsyncDisplayKit/ASDisplayNode+Subclasses.h>
-#import <AsyncDisplayKit/ASElementMap.h>
-#import <AsyncDisplayKit/ASInternalHelpers.h>
-#import <AsyncDisplayKit/UICollectionViewLayout+ASConvenience.h>
-#import <AsyncDisplayKit/ASRangeController.h>
-#import <AsyncDisplayKit/_ASCollectionViewCell.h>
-#import <AsyncDisplayKit/_ASDisplayLayer.h>
-#import <AsyncDisplayKit/_ASCollectionReusableView.h>
-#import <AsyncDisplayKit/ASPagerNode.h>
-#import <AsyncDisplayKit/ASSectionContext.h>
-#import <AsyncDisplayKit/ASCollectionView+Undeprecated.h>
-#import <AsyncDisplayKit/_ASHierarchyChangeSet.h>
-#import <AsyncDisplayKit/CoreGraphics+ASConvenience.h>
-#import <AsyncDisplayKit/ASLayout.h>
-#import <AsyncDisplayKit/ASThread.h>
-
-/**
- * A macro to get self.collectionNode and assign it to a local variable, or return
- * the given value if nil.
- *
- * Previously we would set ASCollectionNode's dataSource & delegate to nil
- * during dealloc. However, our asyncDelegate & asyncDataSource must be set on the
- * main thread, so if the node is deallocated off-main, we won't learn about the change
- * until later on. Since our @c collectionNode parameter to delegate methods (e.g.
- * collectionNode:didEndDisplayingItemWithNode:) is nonnull, it's important that we never
- * unintentionally pass nil (this will crash in Swift, in production). So we can use
- * this macro to ensure that our node is still alive before calling out to the user
- * on its behalf.
- */
-#define GET_COLLECTIONNODE_OR_RETURN(__var, __val) \
-  ASCollectionNode *__var = self.collectionNode; \
-  if (__var == nil) { \
-    return __val; \
-  }
-
-#define ASFlowLayoutDefault(layout, property, default)                                        \
-({                                                                                            \
-  UICollectionViewFlowLayout *flowLayout = ASDynamicCast(layout, UICollectionViewFlowLayout); \
-  flowLayout ? flowLayout.property : default;                                                 \
-})
-
-// ASCellLayoutMode is an NSUInteger-based NS_OPTIONS field. Be careful with BOOL handling on the
-// 32-bit Objective-C runtime, and pattern after ASInterfaceStateIncludesVisible() & friends.
-#define ASCellLayoutModeIncludes(layoutMode) ((_cellLayoutMode & layoutMode) == layoutMode)
-
-/// What, if any, invalidation should we perform during the next -layoutSubviews.
-typedef NS_ENUM(NSUInteger, ASCollectionViewInvalidationStyle) {
-  /// Perform no invalidation.
-  ASCollectionViewInvalidationStyleNone,
-  /// Perform invalidation with animation (use an empty batch update).
-  ASCollectionViewInvalidationStyleWithoutAnimation,
-  /// Perform invalidation without animation (use -invalidateLayout).
-  ASCollectionViewInvalidationStyleWithAnimation,
-};
-
-static const NSUInteger kASCollectionViewAnimationNone = UITableViewRowAnimationNone;
-
-/// Used for all cells and supplementaries. UICV keys by supp-kind+reuseID so this is plenty.
-static NSString * const kReuseIdentifier = @"_ASCollectionReuseIdentifier";
-
-#pragma mark -
-#pragma mark ASCollectionView.
-
-@interface ASCollectionView () <ASRangeControllerDataSource, ASRangeControllerDelegate, ASDataControllerSource, ASCellNodeInteractionDelegate, ASDelegateProxyInterceptor, ASBatchFetchingScrollView, ASCALayerExtendedDelegate, UICollectionViewDelegateFlowLayout> {
-  ASCollectionViewProxy *_proxyDataSource;
-  ASCollectionViewProxy *_proxyDelegate;
-  
-  ASDataController *_dataController;
-  ASRangeController *_rangeController;
-  ASCollectionViewLayoutController *_layoutController;
-  id<ASCollectionViewLayoutInspecting> _defaultLayoutInspector;
-  __weak id<ASCollectionViewLayoutInspecting> _layoutInspector;
-  NSHashTable<_ASCollectionViewCell *> *_cellsForVisibilityUpdates;
-  NSHashTable<ASCellNode *> *_cellsForLayoutUpdates;
-  id<ASCollectionViewLayoutFacilitatorProtocol> _layoutFacilitator;
-  CGFloat _leadingScreensForBatching;
-  
-  // When we update our data controller in response to an interactive move,
-  // we don't want to tell the collection view about the change (it knows!)
-  BOOL _updatingInResponseToInteractiveMove;
-  BOOL _inverted;
-  
-  NSUInteger _superBatchUpdateCount;
-  BOOL _isDeallocating;
-  
-  ASBatchContext *_batchContext;
-  
-  CGSize _lastBoundsSizeUsedForMeasuringNodes;
-  
-  NSMutableSet *_registeredSupplementaryKinds;
-  
-  // CountedSet because UIKit may display the same element in multiple cells e.g. during animations.
-  NSCountedSet<ASCollectionElement *> *_visibleElements;
-  
-  CGPoint _deceleratingVelocity;
-
-  BOOL _zeroContentInsets;
-  
-  ASCollectionViewInvalidationStyle _nextLayoutInvalidationStyle;
-  
-  /**
-   * If YES, the `UICollectionView` will reload its data on next layout pass so we should not forward any updates to it.
-   
-   * Rationale:
-   * In `reloadData`, a collection view invalidates its data and marks itself as needing reload, and waits until `layoutSubviews` to requery its data source.
-   * This can lead to data inconsistency problems.
-   * Say you have an empty collection view. You call `reloadData`, then immediately insert an item into your data source and call `insertItemsAtIndexPaths:[0,0]`.
-   * You will get an assertion failure saying `Invalid number of items in section 0.
-   * The number of items after the update (1) must be equal to the number of items before the update (1) plus or minus the items added and removed (1 added, 0 removed).`
-   * The collection view never queried your data source before the update to see that it actually had 0 items.
-   */
-  BOOL _superIsPendingDataLoad;
-
-  /**
-   * It's important that we always check for batch fetching at least once, but also
-   * that we do not check for batch fetching for empty updates (as that may cause an infinite
-   * loop of batch fetching, where the batch completes and performBatchUpdates: is called without
-   * actually making any changes.) So to handle the case where a collection is completely empty
-   * (0 sections) we always check at least once after each update (initial reload is the first update.)
-   */
-  BOOL _hasEverCheckedForBatchFetchingDueToUpdate;
-
-  /**
-   * Set during beginInteractiveMovementForItemAtIndexPath and UIGestureRecognizerStateEnded
-   * (or UIGestureRecognizerStateFailed, UIGestureRecognizerStateCancelled.
-   */
-  BOOL _reordering;
-  
-  /**
-   * Counter used to keep track of nested batch updates.
-   */
-  NSInteger _batchUpdateCount;
-
-  /**
-   * Keep a strong reference to node till view is ready to release.
-   */
-  ASCollectionNode *_keepalive_node;
-
-  struct {
-    unsigned int scrollViewDidScroll:1;
-    unsigned int scrollViewWillBeginDragging:1;
-    unsigned int scrollViewDidEndDragging:1;
-    unsigned int scrollViewWillEndDragging:1;
-    unsigned int scrollViewDidEndDecelerating:1;
-    unsigned int collectionViewWillDisplayNodeForItem:1;
-    unsigned int collectionViewWillDisplayNodeForItemDeprecated:1;
-    unsigned int collectionViewDidEndDisplayingNodeForItem:1;
-    unsigned int collectionViewShouldSelectItem:1;
-    unsigned int collectionViewDidSelectItem:1;
-    unsigned int collectionViewShouldDeselectItem:1;
-    unsigned int collectionViewDidDeselectItem:1;
-    unsigned int collectionViewShouldHighlightItem:1;
-    unsigned int collectionViewDidHighlightItem:1;
-    unsigned int collectionViewDidUnhighlightItem:1;
-    unsigned int collectionViewShouldShowMenuForItem:1;
-    unsigned int collectionViewCanPerformActionForItem:1;
-    unsigned int collectionViewPerformActionForItem:1;
-    unsigned int collectionViewWillBeginBatchFetch:1;
-    unsigned int shouldBatchFetchForCollectionView:1;
-    unsigned int collectionNodeWillDisplayItem:1;
-    unsigned int collectionNodeDidEndDisplayingItem:1;
-    unsigned int collectionNodeShouldSelectItem:1;
-    unsigned int collectionNodeDidSelectItem:1;
-    unsigned int collectionNodeShouldDeselectItem:1;
-    unsigned int collectionNodeDidDeselectItem:1;
-    unsigned int collectionNodeShouldHighlightItem:1;
-    unsigned int collectionNodeDidHighlightItem:1;
-    unsigned int collectionNodeDidUnhighlightItem:1;
-    unsigned int collectionNodeShouldShowMenuForItem:1;
-    unsigned int collectionNodeCanPerformActionForItem:1;
-    unsigned int collectionNodePerformActionForItem:1;
-    unsigned int collectionNodeWillBeginBatchFetch:1;
-    unsigned int collectionNodeWillDisplaySupplementaryElement:1;
-    unsigned int collectionNodeDidEndDisplayingSupplementaryElement:1;
-    unsigned int shouldBatchFetchForCollectionNode:1;
-
-    // Interop flags
-    unsigned int interop:1;
-    unsigned int interopWillDisplayCell:1;
-    unsigned int interopDidEndDisplayingCell:1;
-    unsigned int interopWillDisplaySupplementaryView:1;
-    unsigned int interopdidEndDisplayingSupplementaryView:1;
-  } _asyncDelegateFlags;
-  
-  struct {
-    unsigned int collectionViewNodeForItem:1;
-    unsigned int collectionViewNodeBlockForItem:1;
-    unsigned int collectionViewNodeForSupplementaryElement:1;
-    unsigned int numberOfSectionsInCollectionView:1;
-    unsigned int collectionViewNumberOfItemsInSection:1;
-    unsigned int collectionNodeNodeForItem:1;
-    unsigned int collectionNodeNodeBlockForItem:1;
-    unsigned int nodeModelForItem:1;
-    unsigned int collectionNodeNodeForSupplementaryElement:1;
-    unsigned int collectionNodeNodeBlockForSupplementaryElement:1;
-    unsigned int collectionNodeSupplementaryElementKindsInSection:1;
-    unsigned int numberOfSectionsInCollectionNode:1;
-    unsigned int collectionNodeNumberOfItemsInSection:1;
-    unsigned int collectionNodeContextForSection:1;
-    unsigned int collectionNodeCanMoveItem:1;
-    unsigned int collectionNodeMoveItem:1;
-
-    // Whether this data source conforms to ASCollectionDataSourceInterop
-    unsigned int interop:1;
-    // Whether this interop data source returns YES from +dequeuesCellsForNodeBackedItems
-    unsigned int interopAlwaysDequeue:1;
-    // Whether this interop data source implements viewForSupplementaryElementOfKind:
-    unsigned int interopViewForSupplementaryElement:1;
-    unsigned int modelIdentifierMethods:1; // if both modelIdentifierForElementAtIndexPath and indexPathForElementWithModelIdentifier are implemented
-  } _asyncDataSourceFlags;
-  
-  struct {
-    unsigned int constrainedSizeForSupplementaryNodeOfKindAtIndexPath:1;
-    unsigned int supplementaryNodesOfKindInSection:1;
-    unsigned int didChangeCollectionViewDataSource:1;
-    unsigned int didChangeCollectionViewDelegate:1;
-  } _layoutInspectorFlags;
-  
-  BOOL _hasDataControllerLayoutDelegate;
-}
-
-@end
-
-@implementation ASCollectionView
-{
-  __weak id<ASCollectionDelegate> _asyncDelegate;
-  __weak id<ASCollectionDataSource> _asyncDataSource;
-}
-
-// Using _ASDisplayLayer ensures things like -layout are properly forwarded to ASCollectionNode.
-+ (Class)layerClass
-{
-  return [_ASDisplayLayer class];
-}
-
-#pragma mark -
-#pragma mark Lifecycle.
-
-- (instancetype)initWithCollectionViewLayout:(UICollectionViewLayout *)layout
-{
-  return [self initWithFrame:CGRectZero collectionViewLayout:layout];
-}
-
-- (instancetype)initWithFrame:(CGRect)frame collectionViewLayout:(UICollectionViewLayout *)layout
-{
-  return [self _initWithFrame:frame collectionViewLayout:layout layoutFacilitator:nil owningNode:nil eventLog:nil];
-}
-
-- (instancetype)_initWithFrame:(CGRect)frame collectionViewLayout:(UICollectionViewLayout *)layout layoutFacilitator:(id<ASCollectionViewLayoutFacilitatorProtocol>)layoutFacilitator owningNode:(ASCollectionNode *)owningNode eventLog:(ASEventLog *)eventLog
-{
-  if (!(self = [super initWithFrame:frame collectionViewLayout:layout]))
-    return nil;
-
-  // Disable UICollectionView prefetching. Use super, because self disables this method.
-  // Experiments done by Instagram show that this option being YES (default)
-  // when unused causes a significant hit to scroll performance.
-  // https://github.com/Instagram/IGListKit/issues/318
-  if (AS_AVAILABLE_IOS_TVOS(10, 10)) {
-    super.prefetchingEnabled = NO;
-  }
-
-  _layoutController = [[ASCollectionViewLayoutController alloc] initWithCollectionView:self];
-  
-  _rangeController = [[ASRangeController alloc] init];
-  _rangeController.dataSource = self;
-  _rangeController.delegate = self;
-  _rangeController.layoutController = _layoutController;
-  
-  _dataController = [[ASDataController alloc] initWithDataSource:self node:owningNode eventLog:eventLog];
-  _dataController.delegate = _rangeController;
-  
-  _batchContext = [[ASBatchContext alloc] init];
-  
-  _leadingScreensForBatching = 2.0;
-  
-  _lastBoundsSizeUsedForMeasuringNodes = self.bounds.size;
-  
-  _layoutFacilitator = layoutFacilitator;
-  
-  _proxyDelegate = [[ASCollectionViewProxy alloc] initWithTarget:nil interceptor:self];
-  super.delegate = (id<UICollectionViewDelegate>)_proxyDelegate;
-  
-  _proxyDataSource = [[ASCollectionViewProxy alloc] initWithTarget:nil interceptor:self];
-  super.dataSource = (id<UICollectionViewDataSource>)_proxyDataSource;
-  
-  _registeredSupplementaryKinds = [[NSMutableSet alloc] init];
-  _visibleElements = [[NSCountedSet alloc] init];
-  
-  _cellsForVisibilityUpdates = [NSHashTable hashTableWithOptions:NSHashTableObjectPointerPersonality];
-  _cellsForLayoutUpdates = [NSHashTable hashTableWithOptions:NSHashTableObjectPointerPersonality];
-  self.backgroundColor = [UIColor whiteColor];
-  
-  [self registerClass:[_ASCollectionViewCell class] forCellWithReuseIdentifier:kReuseIdentifier];
-  
-  [self _configureCollectionViewLayout:layout];
-  
-  return self;
-}
-
-- (void)dealloc
-{
-  ASDisplayNodeAssertMainThread();
-  ASDisplayNodeCAssert(_batchUpdateCount == 0, @"ASCollectionView deallocated in the middle of a batch update.");
-  
-  // Sometimes the UIKit classes can call back to their delegate even during deallocation, due to animation completion blocks etc.
-  _isDeallocating = YES;
-  if (!ASActivateExperimentalFeature(ASExperimentalCollectionTeardown)) {
-    [self setAsyncDelegate:nil];
-    [self setAsyncDataSource:nil];
-  }
-
-  // Data controller & range controller may own a ton of nodes, let's deallocate those off-main.
-  ASPerformBackgroundDeallocation(&_dataController);
-  ASPerformBackgroundDeallocation(&_rangeController);
-}
-
-#pragma mark -
-#pragma mark Overrides.
-
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-implementations"
-/**
- * This method is not available to be called by the public i.e.
- * it should only be called by UICollectionView itself. UICollectionView
- * does this e.g. during the first layout pass, or if you call -numberOfSections
- * before its content is loaded.
- */
-- (void)reloadData
-{
-  [self _superReloadData:nil completion:nil];
-
-  // UICollectionView calls -reloadData during first layoutSubviews and when the data source changes.
-  // This fires off the first load of cell nodes.
-  if (_asyncDataSource != nil && !self.dataController.initialReloadDataHasBeenCalled) {
-    [self performBatchUpdates:^{
-      [_changeSet reloadData];
-    } completion:nil];
-  }
-}
-#pragma clang diagnostic pop
-
-- (void)scrollToItemAtIndexPath:(NSIndexPath *)indexPath atScrollPosition:(UICollectionViewScrollPosition)scrollPosition animated:(BOOL)animated
-{
-  if ([self validateIndexPath:indexPath]) {
-    [super scrollToItemAtIndexPath:indexPath atScrollPosition:scrollPosition animated:animated];
-  }
-}
-
-- (void)relayoutItems
-{
-  [_dataController relayoutAllNodesWithInvalidationBlock:^{
-    [self.collectionViewLayout invalidateLayout];
-    [self invalidateFlowLayoutDelegateMetrics];
-  }];
-}
-
-- (BOOL)isProcessingUpdates
-{
-  return [_dataController isProcessingUpdates];
-}
-
-- (void)onDidFinishProcessingUpdates:(void (^)())completion
-{
-  [_dataController onDidFinishProcessingUpdates:completion];
-}
-
-- (void)waitUntilAllUpdatesAreCommitted
-{
-  ASDisplayNodeAssertMainThread();
-  if (_batchUpdateCount > 0) {
-    // This assertion will be enabled soon.
-    //    ASDisplayNodeFailAssert(@"Should not call %@ during batch update", NSStringFromSelector(_cmd));
-    return;
-  }
-
-  [_dataController waitUntilAllUpdatesAreProcessed];
-}
-
-- (BOOL)isSynchronized
-{
-  return [_dataController isSynchronized];
-}
-
-- (void)onDidFinishSynchronizing:(void (^)())completion
-{
-  [_dataController onDidFinishSynchronizing:completion];
-}
-
-- (void)setDataSource:(id<UICollectionViewDataSource>)dataSource
-{
-  // UIKit can internally generate a call to this method upon changing the asyncDataSource; only assert for non-nil. We also allow this when we're doing interop.
-  ASDisplayNodeAssert(_asyncDelegateFlags.interop || dataSource == nil, @"ASCollectionView uses asyncDataSource, not UICollectionView's dataSource property.");
-}
-
-- (void)setDelegate:(id<UICollectionViewDelegate>)delegate
-{
-  // Our UIScrollView superclass sets its delegate to nil on dealloc. Only assert if we get a non-nil value here. We also allow this when we're doing interop.
-  ASDisplayNodeAssert(_asyncDelegateFlags.interop || delegate == nil, @"ASCollectionView uses asyncDelegate, not UICollectionView's delegate property.");
-}
-
-- (void)proxyTargetHasDeallocated:(ASDelegateProxy *)proxy
-{
-  if (proxy == _proxyDelegate) {
-    [self setAsyncDelegate:nil];
-  } else if (proxy == _proxyDataSource) {
-    [self setAsyncDataSource:nil];
-  }
-}
-
-- (id<ASCollectionDataSource>)asyncDataSource
-{
-  return _asyncDataSource;
-}
-
-- (void)setAsyncDataSource:(id<ASCollectionDataSource>)asyncDataSource
-{
-  // Changing super.dataSource will trigger a setNeedsLayout, so this must happen on the main thread.
-  ASDisplayNodeAssertMainThread();
-
-  // Note: It's common to check if the value hasn't changed and short-circuit but we aren't doing that here to handle
-  // the (common) case of nilling the asyncDataSource in the ViewController's dealloc. In this case our _asyncDataSource
-  // will return as nil (ARC magic) even though the _proxyDataSource still exists. It's really important to hold a strong
-  // reference to the old dataSource in this case because calls to ASCollectionViewProxy will start failing and cause crashes.
-  NS_VALID_UNTIL_END_OF_SCOPE id oldDataSource = super.dataSource;
-  
-  if (asyncDataSource == nil) {
-    _asyncDataSource = nil;
-    _proxyDataSource = _isDeallocating ? nil : [[ASCollectionViewProxy alloc] initWithTarget:nil interceptor:self];
-    _asyncDataSourceFlags = {};
-
-  } else {
-    _asyncDataSource = asyncDataSource;
-    _proxyDataSource = [[ASCollectionViewProxy alloc] initWithTarget:_asyncDataSource interceptor:self];
-    
-    _asyncDataSourceFlags.collectionViewNodeForItem = [_asyncDataSource respondsToSelector:@selector(collectionView:nodeForItemAtIndexPath:)];
-    _asyncDataSourceFlags.collectionViewNodeBlockForItem = [_asyncDataSource respondsToSelector:@selector(collectionView:nodeBlockForItemAtIndexPath:)];
-    _asyncDataSourceFlags.numberOfSectionsInCollectionView = [_asyncDataSource respondsToSelector:@selector(numberOfSectionsInCollectionView:)];
-    _asyncDataSourceFlags.collectionViewNumberOfItemsInSection = [_asyncDataSource respondsToSelector:@selector(collectionView:numberOfItemsInSection:)];
-    _asyncDataSourceFlags.collectionViewNodeForSupplementaryElement = [_asyncDataSource respondsToSelector:@selector(collectionView:nodeForSupplementaryElementOfKind:atIndexPath:)];
-
-    _asyncDataSourceFlags.collectionNodeNodeForItem = [_asyncDataSource respondsToSelector:@selector(collectionNode:nodeForItemAtIndexPath:)];
-    _asyncDataSourceFlags.collectionNodeNodeBlockForItem = [_asyncDataSource respondsToSelector:@selector(collectionNode:nodeBlockForItemAtIndexPath:)];
-    _asyncDataSourceFlags.numberOfSectionsInCollectionNode = [_asyncDataSource respondsToSelector:@selector(numberOfSectionsInCollectionNode:)];
-    _asyncDataSourceFlags.collectionNodeNumberOfItemsInSection = [_asyncDataSource respondsToSelector:@selector(collectionNode:numberOfItemsInSection:)];
-    _asyncDataSourceFlags.collectionNodeContextForSection = [_asyncDataSource respondsToSelector:@selector(collectionNode:contextForSection:)];
-    _asyncDataSourceFlags.collectionNodeNodeForSupplementaryElement = [_asyncDataSource respondsToSelector:@selector(collectionNode:nodeForSupplementaryElementOfKind:atIndexPath:)];
-    _asyncDataSourceFlags.collectionNodeNodeBlockForSupplementaryElement = [_asyncDataSource respondsToSelector:@selector(collectionNode:nodeBlockForSupplementaryElementOfKind:atIndexPath:)];
-    _asyncDataSourceFlags.collectionNodeSupplementaryElementKindsInSection = [_asyncDataSource respondsToSelector:@selector(collectionNode:supplementaryElementKindsInSection:)];
-    _asyncDataSourceFlags.nodeModelForItem = [_asyncDataSource respondsToSelector:@selector(collectionNode:nodeModelForItemAtIndexPath:)];
-    _asyncDataSourceFlags.collectionNodeCanMoveItem = [_asyncDataSource respondsToSelector:@selector(collectionNode:canMoveItemWithNode:)];
-    _asyncDataSourceFlags.collectionNodeMoveItem = [_asyncDataSource respondsToSelector:@selector(collectionNode:moveItemAtIndexPath:toIndexPath:)];
-
-    _asyncDataSourceFlags.interop = [_asyncDataSource conformsToProtocol:@protocol(ASCollectionDataSourceInterop)];
-    if (_asyncDataSourceFlags.interop) {
-      id<ASCollectionDataSourceInterop> interopDataSource = (id<ASCollectionDataSourceInterop>)_asyncDataSource;
-      _asyncDataSourceFlags.interopAlwaysDequeue = [[interopDataSource class] respondsToSelector:@selector(dequeuesCellsForNodeBackedItems)] && [[interopDataSource class] dequeuesCellsForNodeBackedItems];
-      _asyncDataSourceFlags.interopViewForSupplementaryElement = [interopDataSource respondsToSelector:@selector(collectionView:viewForSupplementaryElementOfKind:atIndexPath:)];
-    }
-
-    _asyncDataSourceFlags.modelIdentifierMethods = [_asyncDataSource respondsToSelector:@selector(modelIdentifierForElementAtIndexPath:inNode:)] && [_asyncDataSource respondsToSelector:@selector(indexPathForElementWithModelIdentifier:inNode:)];
-
-
-    ASDisplayNodeAssert(_asyncDataSourceFlags.collectionNodeNumberOfItemsInSection || _asyncDataSourceFlags.collectionViewNumberOfItemsInSection, @"Data source must implement collectionNode:numberOfItemsInSection:");
-    ASDisplayNodeAssert(_asyncDataSourceFlags.collectionNodeNodeBlockForItem
-                        || _asyncDataSourceFlags.collectionNodeNodeForItem
-                        || _asyncDataSourceFlags.collectionViewNodeBlockForItem
-                        || _asyncDataSourceFlags.collectionViewNodeForItem, @"Data source must implement collectionNode:nodeBlockForItemAtIndexPath: or collectionNode:nodeForItemAtIndexPath:");
-  }
-  
-  _dataController.validationErrorSource = asyncDataSource;
-  super.dataSource = (id<UICollectionViewDataSource>)_proxyDataSource;
-  
-  //Cache results of layoutInspector to ensure flags are up to date if getter lazily loads a new one.
-  id<ASCollectionViewLayoutInspecting> layoutInspector = self.layoutInspector;
-  if (_layoutInspectorFlags.didChangeCollectionViewDataSource) {
-    [layoutInspector didChangeCollectionViewDataSource:asyncDataSource];
-  }
-  [self _asyncDelegateOrDataSourceDidChange];
-}
-
-- (id<ASCollectionDelegate>)asyncDelegate
-{
-  return _asyncDelegate;
-}
-
-- (void)setAsyncDelegate:(id<ASCollectionDelegate>)asyncDelegate
-{
-  // Changing super.delegate will trigger a setNeedsLayout, so this must happen on the main thread.
-  ASDisplayNodeAssertMainThread();
-
-  // Note: It's common to check if the value hasn't changed and short-circuit but we aren't doing that here to handle
-  // the (common) case of nilling the asyncDelegate in the ViewController's dealloc. In this case our _asyncDelegate
-  // will return as nil (ARC magic) even though the _proxyDataSource still exists. It's really important to hold a strong
-  // reference to the old delegate in this case because calls to ASCollectionViewProxy will start failing and cause crashes.
-  NS_VALID_UNTIL_END_OF_SCOPE id oldDelegate = super.delegate;
-  
-  if (asyncDelegate == nil) {
-    _asyncDelegate = nil;
-    _proxyDelegate = _isDeallocating ? nil : [[ASCollectionViewProxy alloc] initWithTarget:nil interceptor:self];
-    _asyncDelegateFlags = {};
-  } else {
-    _asyncDelegate = asyncDelegate;
-    _proxyDelegate = [[ASCollectionViewProxy alloc] initWithTarget:_asyncDelegate interceptor:self];
-    
-    _asyncDelegateFlags.scrollViewDidScroll = [_asyncDelegate respondsToSelector:@selector(scrollViewDidScroll:)];
-    _asyncDelegateFlags.scrollViewWillEndDragging = [_asyncDelegate respondsToSelector:@selector(scrollViewWillEndDragging:withVelocity:targetContentOffset:)];
-    _asyncDelegateFlags.scrollViewDidEndDecelerating = [_asyncDelegate respondsToSelector:@selector(scrollViewDidEndDecelerating:)];
-    _asyncDelegateFlags.scrollViewWillBeginDragging = [_asyncDelegate respondsToSelector:@selector(scrollViewWillBeginDragging:)];
-    _asyncDelegateFlags.scrollViewDidEndDragging = [_asyncDelegate respondsToSelector:@selector(scrollViewDidEndDragging:willDecelerate:)];
-    _asyncDelegateFlags.collectionViewWillDisplayNodeForItem = [_asyncDelegate respondsToSelector:@selector(collectionView:willDisplayNode:forItemAtIndexPath:)];
-    if (_asyncDelegateFlags.collectionViewWillDisplayNodeForItem == NO) {
-      _asyncDelegateFlags.collectionViewWillDisplayNodeForItemDeprecated = [_asyncDelegate respondsToSelector:@selector(collectionView:willDisplayNodeForItemAtIndexPath:)];
-    }
-    _asyncDelegateFlags.collectionViewDidEndDisplayingNodeForItem = [_asyncDelegate respondsToSelector:@selector(collectionView:didEndDisplayingNode:forItemAtIndexPath:)];
-    _asyncDelegateFlags.collectionViewWillBeginBatchFetch = [_asyncDelegate respondsToSelector:@selector(collectionView:willBeginBatchFetchWithContext:)];
-    _asyncDelegateFlags.shouldBatchFetchForCollectionView = [_asyncDelegate respondsToSelector:@selector(shouldBatchFetchForCollectionView:)];
-    _asyncDelegateFlags.collectionViewShouldSelectItem = [_asyncDelegate respondsToSelector:@selector(collectionView:shouldSelectItemAtIndexPath:)];
-    _asyncDelegateFlags.collectionViewDidSelectItem = [_asyncDelegate respondsToSelector:@selector(collectionView:didSelectItemAtIndexPath:)];
-    _asyncDelegateFlags.collectionViewShouldDeselectItem = [_asyncDelegate respondsToSelector:@selector(collectionView:shouldDeselectItemAtIndexPath:)];
-    _asyncDelegateFlags.collectionViewDidDeselectItem = [_asyncDelegate respondsToSelector:@selector(collectionView:didDeselectItemAtIndexPath:)];
-    _asyncDelegateFlags.collectionViewShouldHighlightItem = [_asyncDelegate respondsToSelector:@selector(collectionView:shouldHighlightItemAtIndexPath:)];
-    _asyncDelegateFlags.collectionViewDidHighlightItem = [_asyncDelegate respondsToSelector:@selector(collectionView:didHighlightItemAtIndexPath:)];
-    _asyncDelegateFlags.collectionViewDidUnhighlightItem = [_asyncDelegate respondsToSelector:@selector(collectionView:didUnhighlightItemAtIndexPath:)];
-    _asyncDelegateFlags.collectionViewShouldShowMenuForItem = [_asyncDelegate respondsToSelector:@selector(collectionView:shouldShowMenuForItemAtIndexPath:)];
-    _asyncDelegateFlags.collectionViewCanPerformActionForItem = [_asyncDelegate respondsToSelector:@selector(collectionView:canPerformAction:forItemAtIndexPath:withSender:)];
-    _asyncDelegateFlags.collectionViewPerformActionForItem = [_asyncDelegate respondsToSelector:@selector(collectionView:performAction:forItemAtIndexPath:withSender:)];
-    _asyncDelegateFlags.collectionNodeWillDisplayItem = [_asyncDelegate respondsToSelector:@selector(collectionNode:willDisplayItemWithNode:)];
-    _asyncDelegateFlags.collectionNodeDidEndDisplayingItem = [_asyncDelegate respondsToSelector:@selector(collectionNode:didEndDisplayingItemWithNode:)];
-    _asyncDelegateFlags.collectionNodeWillBeginBatchFetch = [_asyncDelegate respondsToSelector:@selector(collectionNode:willBeginBatchFetchWithContext:)];
-    _asyncDelegateFlags.shouldBatchFetchForCollectionNode = [_asyncDelegate respondsToSelector:@selector(shouldBatchFetchForCollectionNode:)];
-    _asyncDelegateFlags.collectionNodeShouldSelectItem = [_asyncDelegate respondsToSelector:@selector(collectionNode:shouldSelectItemAtIndexPath:)];
-    _asyncDelegateFlags.collectionNodeDidSelectItem = [_asyncDelegate respondsToSelector:@selector(collectionNode:didSelectItemAtIndexPath:)];
-    _asyncDelegateFlags.collectionNodeShouldDeselectItem = [_asyncDelegate respondsToSelector:@selector(collectionNode:shouldDeselectItemAtIndexPath:)];
-    _asyncDelegateFlags.collectionNodeDidDeselectItem = [_asyncDelegate respondsToSelector:@selector(collectionNode:didDeselectItemAtIndexPath:)];
-    _asyncDelegateFlags.collectionNodeShouldHighlightItem = [_asyncDelegate respondsToSelector:@selector(collectionNode:shouldHighlightItemAtIndexPath:)];
-    _asyncDelegateFlags.collectionNodeDidHighlightItem = [_asyncDelegate respondsToSelector:@selector(collectionNode:didHighlightItemAtIndexPath:)];
-    _asyncDelegateFlags.collectionNodeDidUnhighlightItem = [_asyncDelegate respondsToSelector:@selector(collectionNode:didUnhighlightItemAtIndexPath:)];
-    _asyncDelegateFlags.collectionNodeShouldShowMenuForItem = [_asyncDelegate respondsToSelector:@selector(collectionNode:shouldShowMenuForItemAtIndexPath:)];
-    _asyncDelegateFlags.collectionNodeCanPerformActionForItem = [_asyncDelegate respondsToSelector:@selector(collectionNode:canPerformAction:forItemAtIndexPath:sender:)];
-    _asyncDelegateFlags.collectionNodePerformActionForItem = [_asyncDelegate respondsToSelector:@selector(collectionNode:performAction:forItemAtIndexPath:sender:)];
-    _asyncDelegateFlags.collectionNodeWillDisplaySupplementaryElement = [_asyncDelegate respondsToSelector:@selector(collectionNode:willDisplaySupplementaryElementWithNode:)];
-    _asyncDelegateFlags.collectionNodeDidEndDisplayingSupplementaryElement = [_asyncDelegate respondsToSelector:@selector(collectionNode:didEndDisplayingSupplementaryElementWithNode:)];
-    _asyncDelegateFlags.interop = [_asyncDelegate conformsToProtocol:@protocol(ASCollectionDelegateInterop)];
-    if (_asyncDelegateFlags.interop) {
-      id<ASCollectionDelegateInterop> interopDelegate = (id<ASCollectionDelegateInterop>)_asyncDelegate;
-      _asyncDelegateFlags.interopWillDisplayCell = [interopDelegate respondsToSelector:@selector(collectionView:willDisplayCell:forItemAtIndexPath:)];
-      _asyncDelegateFlags.interopDidEndDisplayingCell = [interopDelegate respondsToSelector:@selector(collectionView:didEndDisplayingCell:forItemAtIndexPath:)];
-      _asyncDelegateFlags.interopWillDisplaySupplementaryView = [interopDelegate respondsToSelector:@selector(collectionView:willDisplaySupplementaryView:forElementKind:atIndexPath:)];
-      _asyncDelegateFlags.interopdidEndDisplayingSupplementaryView = [interopDelegate respondsToSelector:@selector(collectionView:didEndDisplayingSupplementaryView:forElementOfKind:atIndexPath:)];
-    }
-  }
-
-  super.delegate = (id<UICollectionViewDelegate>)_proxyDelegate;
-  
-  //Cache results of layoutInspector to ensure flags are up to date if getter lazily loads a new one.
-  id<ASCollectionViewLayoutInspecting> layoutInspector = self.layoutInspector;
-  if (_layoutInspectorFlags.didChangeCollectionViewDelegate) {
-    [layoutInspector didChangeCollectionViewDelegate:asyncDelegate];
-  }
-  [self _asyncDelegateOrDataSourceDidChange];
-}
-
-- (void)_asyncDelegateOrDataSourceDidChange
-{
-  ASDisplayNodeAssertMainThread();
-
-  if (_asyncDataSource == nil && _asyncDelegate == nil && !ASActivateExperimentalFeature(ASExperimentalSkipClearData)) {
-    [_dataController clearData];
-  }
-}
-
-- (void)setCollectionViewLayout:(nonnull UICollectionViewLayout *)collectionViewLayout
-{
-  ASDisplayNodeAssertMainThread();
-  [super setCollectionViewLayout:collectionViewLayout];
-  
-  [self _configureCollectionViewLayout:collectionViewLayout];
-  
-  // Trigger recreation of layout inspector with new collection view layout
-  if (_layoutInspector != nil) {
-    _layoutInspector = nil;
-    [self layoutInspector];
-  }
-}
-
-- (id<ASCollectionViewLayoutInspecting>)layoutInspector
-{
-  if (_layoutInspector == nil) {
-    UICollectionViewLayout *layout = self.collectionViewLayout;
-    if (layout == nil) {
-      // Layout hasn't been set yet, we're still init'ing
-      return nil;
-    }
-
-    _defaultLayoutInspector = [layout asdk_layoutInspector];
-    ASDisplayNodeAssertNotNil(_defaultLayoutInspector, @"You must not return nil from -asdk_layoutInspector. Return [super asdk_layoutInspector] if you have to! Layout: %@", layout);
-    
-    // Explicitly call the setter to wire up the _layoutInspectorFlags
-    self.layoutInspector = _defaultLayoutInspector;
-  }
-
-  return _layoutInspector;
-}
-
-- (void)setLayoutInspector:(id<ASCollectionViewLayoutInspecting>)layoutInspector
-{
-  _layoutInspector = layoutInspector;
-  
-  _layoutInspectorFlags.constrainedSizeForSupplementaryNodeOfKindAtIndexPath = [_layoutInspector respondsToSelector:@selector(collectionView:constrainedSizeForSupplementaryNodeOfKind:atIndexPath:)];
-  _layoutInspectorFlags.supplementaryNodesOfKindInSection = [_layoutInspector respondsToSelector:@selector(collectionView:supplementaryNodesOfKind:inSection:)];
-  _layoutInspectorFlags.didChangeCollectionViewDataSource = [_layoutInspector respondsToSelector:@selector(didChangeCollectionViewDataSource:)];
-  _layoutInspectorFlags.didChangeCollectionViewDelegate = [_layoutInspector respondsToSelector:@selector(didChangeCollectionViewDelegate:)];
-
-  if (_layoutInspectorFlags.didChangeCollectionViewDataSource) {
-    [_layoutInspector didChangeCollectionViewDataSource:self.asyncDataSource];
-  }
-  if (_layoutInspectorFlags.didChangeCollectionViewDelegate) {
-    [_layoutInspector didChangeCollectionViewDelegate:self.asyncDelegate];
-  }
-}
-
-- (void)setTuningParameters:(ASRangeTuningParameters)tuningParameters forRangeType:(ASLayoutRangeType)rangeType
-{
-  [_rangeController setTuningParameters:tuningParameters forRangeMode:ASLayoutRangeModeFull rangeType:rangeType];
-}
-
-- (ASRangeTuningParameters)tuningParametersForRangeType:(ASLayoutRangeType)rangeType
-{
-  return [_rangeController tuningParametersForRangeMode:ASLayoutRangeModeFull rangeType:rangeType];
-}
-
-- (void)setTuningParameters:(ASRangeTuningParameters)tuningParameters forRangeMode:(ASLayoutRangeMode)rangeMode rangeType:(ASLayoutRangeType)rangeType
-{
-  [_rangeController setTuningParameters:tuningParameters forRangeMode:rangeMode rangeType:rangeType];
-}
-
-- (ASRangeTuningParameters)tuningParametersForRangeMode:(ASLayoutRangeMode)rangeMode rangeType:(ASLayoutRangeType)rangeType
-{
-  return [_rangeController tuningParametersForRangeMode:rangeMode rangeType:rangeType];
-}
-
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-implementations"
-- (void)setZeroContentInsets:(BOOL)zeroContentInsets
-{
-  _zeroContentInsets = zeroContentInsets;
-}
-
-- (BOOL)zeroContentInsets
-{
-  return _zeroContentInsets;
-}
-#pragma clang diagnostic pop
-
-/// Uses latest size range from data source and -layoutThatFits:.
-- (CGSize)sizeForElement:(ASCollectionElement *)element
-{
-  ASDisplayNodeAssertMainThread();
-  if (element == nil) {
-    return CGSizeZero;
-  }
-
-  ASCellNode *node = element.node;
-  ASDisplayNodeAssertNotNil(node, @"Node must not be nil!");
-
-  BOOL useUIKitCell = node.shouldUseUIKitCell;
-  if (useUIKitCell) {
-    ASWrapperCellNode *wrapperNode = (ASWrapperCellNode *)node;
-    if (wrapperNode.sizeForItemBlock) {
-      return wrapperNode.sizeForItemBlock(wrapperNode, element.constrainedSize.max);
-    } else {
-      // In this case, it is possible the model indexPath for this element will be nil. Attempt to convert it,
-      // and call out to the delegate directly. If it has been deleted from the model, the size returned will be the layout's default.
-      NSIndexPath *indexPath = [_dataController.visibleMap indexPathForElement:element];
-      return [self _sizeForUIKitCellWithKind:element.supplementaryElementKind atIndexPath:indexPath];
-    }
-  } else {
-    return [node layoutThatFits:element.constrainedSize].size;
-  }
-}
-
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-implementations"
-- (CGSize)calculatedSizeForNodeAtIndexPath:(NSIndexPath *)indexPath
-{
-  ASDisplayNodeAssertMainThread();
-
-  ASCollectionElement *e = [_dataController.visibleMap elementForItemAtIndexPath:indexPath];
-  return [self sizeForElement:e];
-}
-#pragma clang diagnostic pop
-
-- (ASCellNode *)nodeForItemAtIndexPath:(NSIndexPath *)indexPath
-{
-  return [_dataController.visibleMap elementForItemAtIndexPath:indexPath].node;
-}
-
-- (NSIndexPath *)convertIndexPathFromCollectionNode:(NSIndexPath *)indexPath waitingIfNeeded:(BOOL)wait
-{
-  if (indexPath == nil) {
-    return nil;
-  }
-
-  NSIndexPath *viewIndexPath = [_dataController.visibleMap convertIndexPath:indexPath fromMap:_dataController.pendingMap];
-  if (viewIndexPath == nil && wait) {
-    [self waitUntilAllUpdatesAreCommitted];
-    return [self convertIndexPathFromCollectionNode:indexPath waitingIfNeeded:NO];
-  }
-  return viewIndexPath;
-}
-
-/**
- * Asserts that the index path is a valid view-index-path, and returns it if so, nil otherwise.
- */
-- (nullable NSIndexPath *)validateIndexPath:(nullable NSIndexPath *)indexPath
-{
-  if (indexPath == nil) {
-    return nil;
-  }
-
-  NSInteger section = indexPath.section;
-  if (section >= self.numberOfSections) {
-    ASDisplayNodeFailAssert(@"Collection view index path has invalid section %lu, section count = %lu", (unsigned long)section, (unsigned long)self.numberOfSections);
-    return nil;
-  }
-
-  NSInteger item = indexPath.item;
-  // item == NSNotFound means e.g. "scroll to this section" and is acceptable
-  if (item != NSNotFound && item >= [self numberOfItemsInSection:section]) {
-    ASDisplayNodeFailAssert(@"Collection view index path has invalid item %lu in section %lu, item count = %lu", (unsigned long)indexPath.item, (unsigned long)section, (unsigned long)[self numberOfItemsInSection:section]);
-    return nil;
-  }
-
-  return indexPath;
-}
-
-- (NSIndexPath *)convertIndexPathToCollectionNode:(NSIndexPath *)indexPath
-{
-  if ([self validateIndexPath:indexPath] == nil) {
-    return nil;
-  }
-
-  return [_dataController.pendingMap convertIndexPath:indexPath fromMap:_dataController.visibleMap];
-}
-
-- (NSArray<NSIndexPath *> *)convertIndexPathsToCollectionNode:(NSArray<NSIndexPath *> *)indexPaths
-{
-  return ASArrayByFlatMapping(indexPaths, NSIndexPath *viewIndexPath, [self convertIndexPathToCollectionNode:viewIndexPath]);
-}
-
-- (ASCellNode *)supplementaryNodeForElementKind:(NSString *)elementKind atIndexPath:(NSIndexPath *)indexPath
-{
-  return [_dataController.visibleMap supplementaryElementOfKind:elementKind atIndexPath:indexPath].node;
-}
-
-- (NSIndexPath *)indexPathForNode:(ASCellNode *)cellNode
-{
-  return [_dataController.visibleMap indexPathForElement:cellNode.collectionElement];
-}
-
-- (NSArray *)visibleNodes
-{
-  NSArray *indexPaths = [self indexPathsForVisibleItems];
-  NSMutableArray *visibleNodes = [[NSMutableArray alloc] init];
-  
-  for (NSIndexPath *indexPath in indexPaths) {
-    ASCellNode *node = [self nodeForItemAtIndexPath:indexPath];
-    if (node) {
-      // It is possible for UICollectionView to return indexPaths before the node is completed.
-      [visibleNodes addObject:node];
-    }
-  }
-  
-  return visibleNodes;
-}
-
-- (void)invalidateFlowLayoutDelegateMetrics
-{
-  // Subclass hook
-}
-
-- (nullable NSString *)modelIdentifierForElementAtIndexPath:(NSIndexPath *)indexPath inView:(UIView *)view {
-    if (_asyncDataSourceFlags.modelIdentifierMethods) {
-        GET_COLLECTIONNODE_OR_RETURN(collectionNode, nil);
-        NSIndexPath *convertedPath = [self convertIndexPathToCollectionNode:indexPath];
-        if (convertedPath == nil) {
-            return nil;
-        } else {
-            return [_asyncDataSource modelIdentifierForElementAtIndexPath:convertedPath inNode:collectionNode];
-        }
-    } else {
-        return nil;
-    }
-}
-
-- (nullable NSIndexPath *)indexPathForElementWithModelIdentifier:(NSString *)identifier inView:(UIView *)view {
-    if (_asyncDataSourceFlags.modelIdentifierMethods) {
-        GET_COLLECTIONNODE_OR_RETURN(collectionNode, nil);
-        return [_asyncDataSource indexPathForElementWithModelIdentifier:identifier inNode:collectionNode];
-    } else {
-        return nil;
-    }
-}
-
-#pragma mark Internal
-
-- (void)_configureCollectionViewLayout:(nonnull UICollectionViewLayout *)layout
-{
-  _hasDataControllerLayoutDelegate = [layout conformsToProtocol:@protocol(ASDataControllerLayoutDelegate)];
-  if (_hasDataControllerLayoutDelegate) {
-    _dataController.layoutDelegate = (id<ASDataControllerLayoutDelegate>)layout;
-  }
-}
-
-/**
- This method is called only for UIKit Passthrough cells - either regular Items or Supplementary elements.
- It checks if the delegate implements the UICollectionViewFlowLayout methods that provide sizes, and if not,
- uses the default values set on the flow layout. If a flow layout is not in use, UICollectionView Passthrough
- cells must be sized by logic in the Layout object, and Texture does not participate in these paths.
-*/
-- (CGSize)_sizeForUIKitCellWithKind:(NSString *)kind atIndexPath:(NSIndexPath *)indexPath
-{
-  CGSize size = CGSizeZero;
-  UICollectionViewLayout *l = self.collectionViewLayout;
-
-  if (kind == nil) {
-    ASDisplayNodeAssert(_asyncDataSourceFlags.interop, @"This code should not be called except for UIKit passthrough compatibility");
-    SEL sizeForItem = @selector(collectionView:layout:sizeForItemAtIndexPath:);
-    if (indexPath && [_asyncDelegate respondsToSelector:sizeForItem]) {
-      size = [(id)_asyncDelegate collectionView:self layout:l sizeForItemAtIndexPath:indexPath];
-    } else {
-      size = ASFlowLayoutDefault(l, itemSize, CGSizeZero);
-    }
-  } else if ([kind isEqualToString:UICollectionElementKindSectionHeader]) {
-    ASDisplayNodeAssert(_asyncDataSourceFlags.interopViewForSupplementaryElement, @"This code should not be called except for UIKit passthrough compatibility");
-    SEL sizeForHeader = @selector(collectionView:layout:referenceSizeForHeaderInSection:);
-    if (indexPath && [_asyncDelegate respondsToSelector:sizeForHeader]) {
-      size = [(id)_asyncDelegate collectionView:self layout:l referenceSizeForHeaderInSection:indexPath.section];
-    } else {
-      size = ASFlowLayoutDefault(l, headerReferenceSize, CGSizeZero);
-    }
-  } else if ([kind isEqualToString:UICollectionElementKindSectionFooter]) {
-    ASDisplayNodeAssert(_asyncDataSourceFlags.interopViewForSupplementaryElement, @"This code should not be called except for UIKit passthrough compatibility");
-    SEL sizeForFooter = @selector(collectionView:layout:referenceSizeForFooterInSection:);
-    if (indexPath && [_asyncDelegate respondsToSelector:sizeForFooter]) {
-      size = [(id)_asyncDelegate collectionView:self layout:l referenceSizeForFooterInSection:indexPath.section];
-    } else {
-      size = ASFlowLayoutDefault(l, footerReferenceSize, CGSizeZero);
-    }
-  }
-
-  return size;
-}
-
-- (void)_superReloadData:(void(^)())updates completion:(void(^)(BOOL finished))completion
-{
-  if (updates) {
-    updates();
-  }
-  [super reloadData];
-  if (completion) {
-    completion(YES);
-  }
-}
-
-/**
- * Performing nested batch updates with super (e.g. resizing a cell node & updating collection view
- * during same frame) can cause super to throw data integrity exceptions because it checks the data
- * source counts before the update is complete.
- *
- * Always call [self _superPerform:] rather than [super performBatch:] so that we can keep our
- * `superPerformingBatchUpdates` flag updated.
-*/
-- (void)_superPerformBatchUpdates:(void(^)())updates completion:(void(^)(BOOL finished))completion
-{
-  ASDisplayNodeAssertMainThread();
-
-  _superBatchUpdateCount++;
-  [super performBatchUpdates:updates completion:completion];
-  _superBatchUpdateCount--;
-}
-
-#pragma mark Assertions.
-
-- (ASDataController *)dataController
-{
-  return _dataController;
-}
-
-- (void)beginUpdates
-{
-  ASDisplayNodeAssertMainThread();
-  // _changeSet must be available during batch update
-  ASDisplayNodeAssertTrue((_batchUpdateCount > 0) == (_changeSet != nil));
-  
-  if (_batchUpdateCount == 0) {
-    _changeSet = [[_ASHierarchyChangeSet alloc] initWithOldData:[_dataController itemCountsFromDataSource]];
-    _changeSet.rootActivity = as_activity_create("Perform async collection update", AS_ACTIVITY_CURRENT, OS_ACTIVITY_FLAG_DEFAULT);
-    _changeSet.submitActivity = as_activity_create("Submit changes for collection update", _changeSet.rootActivity, OS_ACTIVITY_FLAG_DEFAULT);
-  }
-  _batchUpdateCount++;  
-}
-
-- (void)endUpdatesAnimated:(BOOL)animated completion:(nullable void (^)(BOOL))completion
-{
-  ASDisplayNodeAssertMainThread();
-  ASDisplayNodeAssertNotNil(_changeSet, @"_changeSet must be available when batch update ends");
-
-  _batchUpdateCount--;
-  // Prevent calling endUpdatesAnimated:completion: in an unbalanced way
-  NSAssert(_batchUpdateCount >= 0, @"endUpdatesAnimated:completion: called without having a balanced beginUpdates call");
-  
-  [_changeSet addCompletionHandler:completion];
-  
-  if (_batchUpdateCount == 0) {
-    _ASHierarchyChangeSet *changeSet = _changeSet;
-
-    // Nil out _changeSet before forwarding to _dataController to allow the change set to cause subsequent batch updates on the same run loop
-    _changeSet = nil;
-    changeSet.animated = animated;
-    [_dataController updateWithChangeSet:changeSet];
-  }
-}
-
-- (void)performBatchAnimated:(BOOL)animated updates:(NS_NOESCAPE void (^)())updates completion:(void (^)(BOOL))completion
-{
-  ASDisplayNodeAssertMainThread();
-  [self beginUpdates];
-  as_activity_scope(_changeSet.rootActivity);
-  {
-    // Only include client code in the submit activity, the rest just lives in the root activity. 
-    as_activity_scope(_changeSet.submitActivity);
-    if (updates) {
-      updates();
-    }
-  }
-  [self endUpdatesAnimated:animated completion:completion];
-}
-
-- (void)performBatchUpdates:(NS_NOESCAPE void (^)())updates completion:(void (^)(BOOL))completion
-{
-  // We capture the current state of whether animations are enabled if they don't provide us with one.
-  [self performBatchAnimated:[UIView areAnimationsEnabled] updates:updates completion:completion];
-}
-
-- (void)registerSupplementaryNodeOfKind:(NSString *)elementKind
-{
-  ASDisplayNodeAssert(elementKind != nil, @"A kind is needed for supplementary node registration");
-  [_registeredSupplementaryKinds addObject:elementKind];
-  [self registerClass:[_ASCollectionReusableView class] forSupplementaryViewOfKind:elementKind withReuseIdentifier:kReuseIdentifier];
-}
-
-- (void)insertSections:(NSIndexSet *)sections
-{
-  ASDisplayNodeAssertMainThread();
-  if (sections.count == 0) { return; }
-  [self performBatchUpdates:^{
-    [_changeSet insertSections:sections animationOptions:kASCollectionViewAnimationNone];
-  } completion:nil];
-}
-
-- (void)deleteSections:(NSIndexSet *)sections
-{
-  ASDisplayNodeAssertMainThread();
-  if (sections.count == 0) { return; }
-  [self performBatchUpdates:^{
-    [_changeSet deleteSections:sections animationOptions:kASCollectionViewAnimationNone];
-  } completion:nil];
-}
-
-- (void)reloadSections:(NSIndexSet *)sections
-{
-  ASDisplayNodeAssertMainThread();
-  if (sections.count == 0) { return; }
-  [self performBatchUpdates:^{
-    [_changeSet reloadSections:sections animationOptions:kASCollectionViewAnimationNone];
-  } completion:nil];
-}
-
-- (void)moveSection:(NSInteger)section toSection:(NSInteger)newSection
-{
-  ASDisplayNodeAssertMainThread();
-  [self performBatchUpdates:^{
-    [_changeSet moveSection:section toSection:newSection animationOptions:kASCollectionViewAnimationNone];
-  } completion:nil];
-}
-
-- (id<ASSectionContext>)contextForSection:(NSInteger)section
-{
-  ASDisplayNodeAssertMainThread();
-  return [_dataController.visibleMap contextForSection:section];
-}
-
-- (void)insertItemsAtIndexPaths:(NSArray *)indexPaths
-{
-  ASDisplayNodeAssertMainThread();
-  if (indexPaths.count == 0) { return; }
-  [self performBatchUpdates:^{
-    [_changeSet insertItems:indexPaths animationOptions:kASCollectionViewAnimationNone];
-  } completion:nil];
-}
-
-- (void)deleteItemsAtIndexPaths:(NSArray *)indexPaths
-{
-  ASDisplayNodeAssertMainThread();
-  if (indexPaths.count == 0) { return; }
-  [self performBatchUpdates:^{
-    [_changeSet deleteItems:indexPaths animationOptions:kASCollectionViewAnimationNone];
-  } completion:nil];
-}
-
-- (void)reloadItemsAtIndexPaths:(NSArray *)indexPaths
-{
-  ASDisplayNodeAssertMainThread();
-  if (indexPaths.count == 0) { return; }
-  [self performBatchUpdates:^{
-    [_changeSet reloadItems:indexPaths animationOptions:kASCollectionViewAnimationNone];
-  } completion:nil];
-}
-
-- (void)moveItemAtIndexPath:(NSIndexPath *)indexPath toIndexPath:(NSIndexPath *)newIndexPath
-{
-  ASDisplayNodeAssertMainThread();
-  if (!_reordering) {
-    [self performBatchUpdates:^{
-      [_changeSet moveItemAtIndexPath:indexPath toIndexPath:newIndexPath animationOptions:kASCollectionViewAnimationNone];
-    } completion:nil];
-  } else {
-    [super moveItemAtIndexPath:indexPath toIndexPath:newIndexPath];
-  }
-}
-
-- (BOOL)beginInteractiveMovementForItemAtIndexPath:(NSIndexPath *)indexPath {
-  BOOL success = [super beginInteractiveMovementForItemAtIndexPath:indexPath];
-  _reordering = success;
-  return success;
-}
-
-- (void)endInteractiveMovement {
-  _reordering = NO;
-  [super endInteractiveMovement];
-}
-
-- (void)cancelInteractiveMovement {
-  _reordering = NO;
-  [super cancelInteractiveMovement];
-}
-
-#pragma mark -
-#pragma mark Intercepted selectors.
-
-- (NSInteger)numberOfSectionsInCollectionView:(UICollectionView *)collectionView
-{
-  if (_superIsPendingDataLoad) {
-    [_rangeController setNeedsUpdate];
-    [self _scheduleCheckForBatchFetchingForNumberOfChanges:1];
-    _superIsPendingDataLoad = NO;
-  }
-  return _dataController.visibleMap.numberOfSections;
-}
-
-- (NSInteger)collectionView:(UICollectionView *)collectionView numberOfItemsInSection:(NSInteger)section
-{
-  return [_dataController.visibleMap numberOfItemsInSection:section];
-}
-
-- (CGSize)collectionView:(UICollectionView *)collectionView layout:(UICollectionViewLayout *)layout
-                                            sizeForItemAtIndexPath:(NSIndexPath *)indexPath
-{
-  ASDisplayNodeAssertMainThread();
-  ASCollectionElement *e = [_dataController.visibleMap elementForItemAtIndexPath:indexPath];
-  return e ? [self sizeForElement:e] : ASFlowLayoutDefault(layout, itemSize, CGSizeZero);
-}
-
-- (CGSize)collectionView:(UICollectionView *)cv layout:(UICollectionViewLayout *)l
-                       referenceSizeForHeaderInSection:(NSInteger)section
-{
-  ASDisplayNodeAssertMainThread();
-  ASElementMap *map = _dataController.visibleMap;
-  ASCollectionElement *e = [map supplementaryElementOfKind:UICollectionElementKindSectionHeader
-                                               atIndexPath:[NSIndexPath indexPathForItem:0 inSection:section]];
-  return e ? [self sizeForElement:e] : ASFlowLayoutDefault(l, headerReferenceSize, CGSizeZero);
-}
-
-- (CGSize)collectionView:(UICollectionView *)cv layout:(UICollectionViewLayout *)l
-                       referenceSizeForFooterInSection:(NSInteger)section
-{
-  ASDisplayNodeAssertMainThread();
-  ASElementMap *map = _dataController.visibleMap;
-  ASCollectionElement *e = [map supplementaryElementOfKind:UICollectionElementKindSectionFooter
-                                               atIndexPath:[NSIndexPath indexPathForItem:0 inSection:section]];
-  return e ? [self sizeForElement:e] : ASFlowLayoutDefault(l, footerReferenceSize, CGSizeZero);
-}
-
-// For the methods that call delegateIndexPathForSection:withSelector:, translate the section from
-// visibleMap to pendingMap. If the section no longer exists, or the delegate doesn't implement
-// the selector, we will return NSNotFound (and then use the ASFlowLayoutDefault).
-- (NSInteger)delegateIndexForSection:(NSInteger)section withSelector:(SEL)selector
-{
-  if ([_asyncDelegate respondsToSelector:selector]) {
-    return [_dataController.pendingMap convertSection:section fromMap:_dataController.visibleMap];
-  } else {
-    return NSNotFound;
-  }
-}
-
-- (UIEdgeInsets)collectionView:(UICollectionView *)cv layout:(UICollectionViewLayout *)l
-                                      insetForSectionAtIndex:(NSInteger)section
-{
-  section = [self delegateIndexForSection:section withSelector:_cmd];
-  if (section != NSNotFound) {
-    return [(id)_asyncDelegate collectionView:cv layout:l insetForSectionAtIndex:section];
-  }
-  return ASFlowLayoutDefault(l, sectionInset, UIEdgeInsetsZero);
-}
-
-- (CGFloat)collectionView:(UICollectionView *)cv layout:(UICollectionViewLayout *)l
-               minimumInteritemSpacingForSectionAtIndex:(NSInteger)section
-{
-  section = [self delegateIndexForSection:section withSelector:_cmd];
-  if (section != NSNotFound) {
-    return [(id)_asyncDelegate collectionView:cv layout:l
-               minimumInteritemSpacingForSectionAtIndex:section];
-  }
-  return ASFlowLayoutDefault(l, minimumInteritemSpacing, 10.0); // Default is documented as 10.0
-}
-
-- (CGFloat)collectionView:(UICollectionView *)cv layout:(UICollectionViewLayout *)l
-                    minimumLineSpacingForSectionAtIndex:(NSInteger)section
-{
-  section = [self delegateIndexForSection:section withSelector:_cmd];
-  if (section != NSNotFound) {
-    return [(id)_asyncDelegate collectionView:cv layout:l
-                    minimumLineSpacingForSectionAtIndex:section];
-  }
-  return ASFlowLayoutDefault(l, minimumLineSpacing, 10.0);      // Default is documented as 10.0
-}
-
-- (UICollectionReusableView *)collectionView:(UICollectionView *)collectionView viewForSupplementaryElementOfKind:(NSString *)kind atIndexPath:(NSIndexPath *)indexPath
-{
-  if ([_registeredSupplementaryKinds containsObject:kind] == NO) {
-    [self registerSupplementaryNodeOfKind:kind];
-  }
-  
-  UICollectionReusableView *view = nil;
-  ASCollectionElement *element = [_dataController.visibleMap supplementaryElementOfKind:kind atIndexPath:indexPath];
-  ASCellNode *node = element.node;
-  ASWrapperCellNode *wrapperNode = (node.shouldUseUIKitCell ? (ASWrapperCellNode *)node : nil);
-  BOOL shouldDequeueExternally = _asyncDataSourceFlags.interopAlwaysDequeue || (_asyncDataSourceFlags.interopViewForSupplementaryElement && wrapperNode);
-
-  if (wrapperNode.viewForSupplementaryBlock) {
-    view = wrapperNode.viewForSupplementaryBlock(wrapperNode);
-  } else if (shouldDequeueExternally) {
-    // This codepath is used for both IGListKit mode, and app-level UICollectionView interop.
-    view = [(id<ASCollectionDataSourceInterop>)_asyncDataSource collectionView:collectionView viewForSupplementaryElementOfKind:kind atIndexPath:indexPath];
-  } else {
-    ASDisplayNodeAssert(node != nil, @"Supplementary node should exist.  Kind = %@, indexPath = %@, collectionDataSource = %@", kind, indexPath, self);
-    view = [self dequeueReusableSupplementaryViewOfKind:kind withReuseIdentifier:kReuseIdentifier forIndexPath:indexPath];
-  }
-  
-  if (_ASCollectionReusableView *reusableView = ASDynamicCastStrict(view, _ASCollectionReusableView)) {
-    reusableView.element = element;
-  }
-  
-  if (node) {
-    [_rangeController configureContentView:view forCellNode:node];
-  }
-
-  return view;
-}
-
-- (UICollectionViewCell *)collectionView:(UICollectionView *)collectionView cellForItemAtIndexPath:(NSIndexPath *)indexPath
-{
-  UICollectionViewCell *cell = nil;
-  ASCollectionElement *element = [_dataController.visibleMap elementForItemAtIndexPath:indexPath];
-  ASCellNode *node = element.node;
-  ASWrapperCellNode *wrapperNode = (node.shouldUseUIKitCell ? (ASWrapperCellNode *)node : nil);
-  BOOL shouldDequeueExternally = _asyncDataSourceFlags.interopAlwaysDequeue || (_asyncDataSourceFlags.interop && wrapperNode);
-
-  if (wrapperNode.cellForItemBlock) {
-    cell = wrapperNode.cellForItemBlock(wrapperNode);
-  } else if (shouldDequeueExternally) {
-    cell = [(id<ASCollectionDataSourceInterop>)_asyncDataSource collectionView:collectionView cellForItemAtIndexPath:indexPath];
-  } else {
-    cell = [self dequeueReusableCellWithReuseIdentifier:kReuseIdentifier forIndexPath:indexPath];
-  }
-
-  ASDisplayNodeAssert(element != nil, @"Element should exist. indexPath = %@, collectionDataSource = %@", indexPath, self);
-  ASDisplayNodeAssert(cell != nil, @"UICollectionViewCell must not be nil. indexPath = %@, collectionDataSource = %@", indexPath, self);
-
-  if (_ASCollectionViewCell *asCell = ASDynamicCastStrict(cell, _ASCollectionViewCell)) {
-    asCell.element = element;
-    [_rangeController configureContentView:cell.contentView forCellNode:node];
-  }
-  
-  return cell;
-}
-
-- (void)collectionView:(UICollectionView *)collectionView willDisplayCell:(UICollectionViewCell *)rawCell forItemAtIndexPath:(NSIndexPath *)indexPath
-{
-  if (_asyncDelegateFlags.interopWillDisplayCell) {
-    ASCellNode *node = [self nodeForItemAtIndexPath:indexPath];
-    if (node.shouldUseUIKitCell) {
-      [(id <ASCollectionDelegateInterop>)_asyncDelegate collectionView:collectionView willDisplayCell:rawCell forItemAtIndexPath:indexPath];
-    }
-  }
-
-  _ASCollectionViewCell *cell = ASDynamicCastStrict(rawCell, _ASCollectionViewCell);
-  if (cell == nil) {
-    [_rangeController setNeedsUpdate];
-    return;
-  }
-
-  ASCollectionElement *element = cell.element;
-  if (element) {
-    ASDisplayNodeAssertTrue([_dataController.visibleMap elementForItemAtIndexPath:indexPath] == element);
-    [_visibleElements addObject:element];
-  } else {
-    ASDisplayNodeAssert(NO, @"Unexpected nil element for willDisplayCell: %@, %@, %@", rawCell, self, indexPath);
-    return;
-  }
-
-  ASCellNode *cellNode = element.node;
-  cellNode.scrollView = collectionView;
-
-  // Update the selected background view in collectionView:willDisplayCell:forItemAtIndexPath: otherwise it could be too
-  // early e.g. if the selectedBackgroundView was set in didLoad()
-  cell.selectedBackgroundView = cellNode.selectedBackgroundView;
-  cell.backgroundView = cellNode.backgroundView;
-  
-  // Under iOS 10+, cells may be removed/re-added to the collection view without
-  // receiving prepareForReuse/applyLayoutAttributes, as an optimization for e.g.
-  // if the user is scrolling back and forth across a small set of items.
-  // In this case, we have to fetch the layout attributes manually.
-  // This may be possible under iOS < 10 but it has not been observed yet.
-  if (cell.layoutAttributes == nil) {
-    cell.layoutAttributes = [collectionView layoutAttributesForItemAtIndexPath:indexPath];
-  }
-
-  ASDisplayNodeAssertNotNil(cellNode, @"Expected node associated with cell that will be displayed not to be nil. indexPath: %@", indexPath);
-
-  if (_asyncDelegateFlags.collectionNodeWillDisplayItem && self.collectionNode != nil) {
-    [_asyncDelegate collectionNode:self.collectionNode willDisplayItemWithNode:cellNode];
-  } else if (_asyncDelegateFlags.collectionViewWillDisplayNodeForItem) {
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
-    [_asyncDelegate collectionView:self willDisplayNode:cellNode forItemAtIndexPath:indexPath];
-  } else if (_asyncDelegateFlags.collectionViewWillDisplayNodeForItemDeprecated) {
-    [_asyncDelegate collectionView:self willDisplayNodeForItemAtIndexPath:indexPath];
-  }
-#pragma clang diagnostic pop
-  
-  [_rangeController setNeedsUpdate];
-  
-  if ([cell consumesCellNodeVisibilityEvents]) {
-    [_cellsForVisibilityUpdates addObject:cell];
-  }
-}
-
-- (void)collectionView:(UICollectionView *)collectionView didEndDisplayingCell:(UICollectionViewCell *)rawCell forItemAtIndexPath:(NSIndexPath *)indexPath
-{
-  if (_asyncDelegateFlags.interopDidEndDisplayingCell) {
-    ASCellNode *node = [self nodeForItemAtIndexPath:indexPath];
-    if (node.shouldUseUIKitCell) {
-      [(id <ASCollectionDelegateInterop>)_asyncDelegate collectionView:collectionView didEndDisplayingCell:rawCell forItemAtIndexPath:indexPath];
-    }
-  }
-
-  _ASCollectionViewCell *cell = ASDynamicCastStrict(rawCell, _ASCollectionViewCell);
-  if (cell == nil) {
-    [_rangeController setNeedsUpdate];
-    return;
-  }
-
-  // Retrieve the element from cell instead of visible map because at this point visible map could have been updated and no longer holds the element.
-  ASCollectionElement *element = cell.element;
-  if (element) {
-    [_visibleElements removeObject:element];
-  } else {
-    ASDisplayNodeAssert(NO, @"Unexpected nil element for didEndDisplayingCell: %@, %@, %@", rawCell, self, indexPath);
-    return;
-  }
-
-  ASCellNode *cellNode = element.node;
-
-  if (_asyncDelegateFlags.collectionNodeDidEndDisplayingItem) {
-    if (ASCollectionNode *collectionNode = self.collectionNode) {
-    	[_asyncDelegate collectionNode:collectionNode didEndDisplayingItemWithNode:cellNode];
-    }
-  } else if (_asyncDelegateFlags.collectionViewDidEndDisplayingNodeForItem) {
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
-    [_asyncDelegate collectionView:self didEndDisplayingNode:cellNode forItemAtIndexPath:indexPath];
-#pragma clang diagnostic pop
-  }
-  
-  [_rangeController setNeedsUpdate];
-  
-  [_cellsForVisibilityUpdates removeObject:cell];
-  
-  cellNode.scrollView = nil;
-  cell.layoutAttributes = nil;
-}
-
-- (void)collectionView:(UICollectionView *)collectionView willDisplaySupplementaryView:(UICollectionReusableView *)rawView forElementKind:(NSString *)elementKind atIndexPath:(NSIndexPath *)indexPath
-{
-  if (_asyncDelegateFlags.interopWillDisplaySupplementaryView) {
-    ASCellNode *node = [self supplementaryNodeForElementKind:elementKind atIndexPath:indexPath];
-    if (node.shouldUseUIKitCell) {
-      [(id <ASCollectionDelegateInterop>)_asyncDelegate collectionView:collectionView willDisplaySupplementaryView:rawView forElementKind:elementKind atIndexPath:indexPath];
-    }
-  }
-
-  _ASCollectionReusableView *view = ASDynamicCastStrict(rawView, _ASCollectionReusableView);
-  if (view == nil) {
-    return;
-  }
-
-  ASCollectionElement *element = view.element;
-  if (element) {
-    ASDisplayNodeAssertTrue([_dataController.visibleMap supplementaryElementOfKind:elementKind atIndexPath:indexPath] == view.element);
-    [_visibleElements addObject:element];
-  } else {
-    ASDisplayNodeAssert(NO, @"Unexpected nil element for willDisplaySupplementaryView: %@, %@, %@", rawView, self, indexPath);
-    return;
-  }
-
-  // Under iOS 10+, cells may be removed/re-added to the collection view without
-  // receiving prepareForReuse/applyLayoutAttributes, as an optimization for e.g.
-  // if the user is scrolling back and forth across a small set of items.
-  // In this case, we have to fetch the layout attributes manually.
-  // This may be possible under iOS < 10 but it has not been observed yet.
-  if (view.layoutAttributes == nil) {
-    view.layoutAttributes = [collectionView layoutAttributesForSupplementaryElementOfKind:elementKind atIndexPath:indexPath];
-  }
-
-  if (_asyncDelegateFlags.collectionNodeWillDisplaySupplementaryElement) {
-    GET_COLLECTIONNODE_OR_RETURN(collectionNode, (void)0);
-    ASCellNode *node = element.node;
-    ASDisplayNodeAssert([node.supplementaryElementKind isEqualToString:elementKind], @"Expected node for supplementary element to have kind '%@', got '%@'.", elementKind, node.supplementaryElementKind);
-    [_asyncDelegate collectionNode:collectionNode willDisplaySupplementaryElementWithNode:node];
-  }
-}
-
-- (void)collectionView:(UICollectionView *)collectionView didEndDisplayingSupplementaryView:(UICollectionReusableView *)rawView forElementOfKind:(NSString *)elementKind atIndexPath:(NSIndexPath *)indexPath
-{
-  if (_asyncDelegateFlags.interopdidEndDisplayingSupplementaryView) {
-    ASCellNode *node = [self supplementaryNodeForElementKind:elementKind atIndexPath:indexPath];
-    if (node.shouldUseUIKitCell) {
-      [(id <ASCollectionDelegateInterop>)_asyncDelegate collectionView:collectionView didEndDisplayingSupplementaryView:rawView forElementOfKind:elementKind atIndexPath:indexPath];
-    }
-  }
-
-  _ASCollectionReusableView *view = ASDynamicCastStrict(rawView, _ASCollectionReusableView);
-  if (view == nil) {
-    return;
-  }
-
-  // Retrieve the element from cell instead of visible map because at this point visible map could have been updated and no longer holds the element.
-  ASCollectionElement *element = view.element;
-  if (element) {
-    [_visibleElements removeObject:element];
-  } else {
-    ASDisplayNodeAssert(NO, @"Unexpected nil element for didEndDisplayingSupplementaryView: %@, %@, %@", rawView, self, indexPath);
-    return;
-  }
-
-  if (_asyncDelegateFlags.collectionNodeDidEndDisplayingSupplementaryElement) {
-    GET_COLLECTIONNODE_OR_RETURN(collectionNode, (void)0);
-    ASCellNode *node = element.node;
-    ASDisplayNodeAssert([node.supplementaryElementKind isEqualToString:elementKind], @"Expected node for supplementary element to have kind '%@', got '%@'.", elementKind, node.supplementaryElementKind);
-    [_asyncDelegate collectionNode:collectionNode didEndDisplayingSupplementaryElementWithNode:node];
-  }
-}
-
-- (BOOL)collectionView:(UICollectionView *)collectionView shouldSelectItemAtIndexPath:(NSIndexPath *)indexPath
-{
-  if (_asyncDelegateFlags.collectionNodeShouldSelectItem) {
-    GET_COLLECTIONNODE_OR_RETURN(collectionNode, NO);
-    indexPath = [self convertIndexPathToCollectionNode:indexPath];
-    if (indexPath != nil) {
-      return [_asyncDelegate collectionNode:collectionNode shouldSelectItemAtIndexPath:indexPath];
-    }
-  } else if (_asyncDelegateFlags.collectionViewShouldSelectItem) {
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
-    return [_asyncDelegate collectionView:self shouldSelectItemAtIndexPath:indexPath];
-#pragma clang diagnostic pop
-  }
-  return YES;
-}
-
-- (void)collectionView:(UICollectionView *)collectionView didSelectItemAtIndexPath:(nonnull NSIndexPath *)indexPath
-{
-  if (_asyncDelegateFlags.collectionNodeDidSelectItem) {
-    GET_COLLECTIONNODE_OR_RETURN(collectionNode, (void)0);
-    indexPath = [self convertIndexPathToCollectionNode:indexPath];
-    if (indexPath != nil) {
-      [_asyncDelegate collectionNode:collectionNode didSelectItemAtIndexPath:indexPath];
-    }
-  } else if (_asyncDelegateFlags.collectionViewDidSelectItem) {
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
-    [_asyncDelegate collectionView:self didSelectItemAtIndexPath:indexPath];
-#pragma clang diagnostic pop
-  }
-}
-
-- (BOOL)collectionView:(UICollectionView *)collectionView shouldDeselectItemAtIndexPath:(NSIndexPath *)indexPath
-{
-  if (_asyncDelegateFlags.collectionNodeShouldDeselectItem) {
-    GET_COLLECTIONNODE_OR_RETURN(collectionNode, NO);
-    indexPath = [self convertIndexPathToCollectionNode:indexPath];
-    if (indexPath != nil) {
-      return [_asyncDelegate collectionNode:collectionNode shouldDeselectItemAtIndexPath:indexPath];
-    }
-  } else if (_asyncDelegateFlags.collectionViewShouldDeselectItem) {
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
-    return [_asyncDelegate collectionView:self shouldDeselectItemAtIndexPath:indexPath];
-#pragma clang diagnostic pop
-  }
-  return YES;
-}
-
-- (void)collectionView:(UICollectionView *)collectionView didDeselectItemAtIndexPath:(nonnull NSIndexPath *)indexPath
-{
-  if (_asyncDelegateFlags.collectionNodeDidDeselectItem) {
-    GET_COLLECTIONNODE_OR_RETURN(collectionNode, (void)0);
-    indexPath = [self convertIndexPathToCollectionNode:indexPath];
-    if (indexPath != nil) {
-      [_asyncDelegate collectionNode:collectionNode didDeselectItemAtIndexPath:indexPath];
-    }
-  } else if (_asyncDelegateFlags.collectionViewDidDeselectItem) {
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
-    [_asyncDelegate collectionView:self didDeselectItemAtIndexPath:indexPath];
-#pragma clang diagnostic pop
-  }
-}
-
-- (BOOL)collectionView:(UICollectionView *)collectionView shouldHighlightItemAtIndexPath:(NSIndexPath *)indexPath
-{
-  if (_asyncDelegateFlags.collectionNodeShouldHighlightItem) {
-    GET_COLLECTIONNODE_OR_RETURN(collectionNode, NO);
-    indexPath = [self convertIndexPathToCollectionNode:indexPath];
-    if (indexPath != nil) {
-      return [_asyncDelegate collectionNode:collectionNode shouldHighlightItemAtIndexPath:indexPath];
-    } else {
-      return YES;
-    }
-  } else if (_asyncDelegateFlags.collectionViewShouldHighlightItem) {
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
-    return [_asyncDelegate collectionView:self shouldHighlightItemAtIndexPath:indexPath];
-#pragma clang diagnostic pop
-  }
-  return YES;
-}
-
-- (void)collectionView:(UICollectionView *)collectionView didHighlightItemAtIndexPath:(nonnull NSIndexPath *)indexPath
-{
-  if (_asyncDelegateFlags.collectionNodeDidHighlightItem) {
-    GET_COLLECTIONNODE_OR_RETURN(collectionNode, (void)0);
-    indexPath = [self convertIndexPathToCollectionNode:indexPath];
-    if (indexPath != nil) {
-      [_asyncDelegate collectionNode:collectionNode didHighlightItemAtIndexPath:indexPath];
-    }
-  } else if (_asyncDelegateFlags.collectionViewDidHighlightItem) {
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
-    [_asyncDelegate collectionView:self didHighlightItemAtIndexPath:indexPath];
-#pragma clang diagnostic pop
-  }
-}
-
-- (void)collectionView:(UICollectionView *)collectionView didUnhighlightItemAtIndexPath:(nonnull NSIndexPath *)indexPath
-{
-  if (_asyncDelegateFlags.collectionNodeDidUnhighlightItem) {
-    GET_COLLECTIONNODE_OR_RETURN(collectionNode, (void)0);
-    indexPath = [self convertIndexPathToCollectionNode:indexPath];
-    if (indexPath != nil) {
-      [_asyncDelegate collectionNode:collectionNode didUnhighlightItemAtIndexPath:indexPath];
-    }
-  } else if (_asyncDelegateFlags.collectionViewDidUnhighlightItem) {
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
-    [_asyncDelegate collectionView:self didUnhighlightItemAtIndexPath:indexPath];
-#pragma clang diagnostic pop
-  }
-}
-
-- (BOOL)collectionView:(UICollectionView *)collectionView shouldShowMenuForItemAtIndexPath:(nonnull NSIndexPath *)indexPath
-{
-  if (_asyncDelegateFlags.collectionNodeShouldShowMenuForItem) {
-    GET_COLLECTIONNODE_OR_RETURN(collectionNode, NO);
-    indexPath = [self convertIndexPathToCollectionNode:indexPath];
-    if (indexPath != nil) {
-      return [_asyncDelegate collectionNode:collectionNode shouldShowMenuForItemAtIndexPath:indexPath];
-    }
-  } else if (_asyncDelegateFlags.collectionViewShouldShowMenuForItem) {
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
-    return [_asyncDelegate collectionView:self shouldShowMenuForItemAtIndexPath:indexPath];
-#pragma clang diagnostic pop
-  }
-  return NO;
-}
-
-- (BOOL)collectionView:(UICollectionView *)collectionView canPerformAction:(nonnull SEL)action forItemAtIndexPath:(nonnull NSIndexPath *)indexPath withSender:(nullable id)sender
-{
-  if (_asyncDelegateFlags.collectionNodeCanPerformActionForItem) {
-    GET_COLLECTIONNODE_OR_RETURN(collectionNode, NO);
-    indexPath = [self convertIndexPathToCollectionNode:indexPath];
-    if (indexPath != nil) {
-      return [_asyncDelegate collectionNode:collectionNode canPerformAction:action forItemAtIndexPath:indexPath sender:sender];
-    }
-  } else if (_asyncDelegateFlags.collectionViewCanPerformActionForItem) {
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
-    return [_asyncDelegate collectionView:self canPerformAction:action forItemAtIndexPath:indexPath withSender:sender];
-#pragma clang diagnostic pop
-  }
-  return NO;
-}
-
-- (void)collectionView:(UICollectionView *)collectionView performAction:(nonnull SEL)action forItemAtIndexPath:(nonnull NSIndexPath *)indexPath withSender:(nullable id)sender
-{
-  if (_asyncDelegateFlags.collectionNodePerformActionForItem) {
-    GET_COLLECTIONNODE_OR_RETURN(collectionNode, (void)0);
-    indexPath = [self convertIndexPathToCollectionNode:indexPath];
-    if (indexPath != nil) {
-      [_asyncDelegate collectionNode:collectionNode performAction:action forItemAtIndexPath:indexPath sender:sender];
-    }
-  } else if (_asyncDelegateFlags.collectionViewPerformActionForItem) {
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
-    [_asyncDelegate collectionView:self performAction:action forItemAtIndexPath:indexPath withSender:sender];
-#pragma clang diagnostic pop
-  }
-}
-
-- (BOOL)collectionView:(UICollectionView *)collectionView canMoveItemAtIndexPath:(NSIndexPath *)indexPath
-{
-  // Mimic UIKit's gating logic.
-  // If the data source doesn't support moving, then all bets are off.
-  if (!_asyncDataSourceFlags.collectionNodeMoveItem) {
-    return NO;
-  }
-  
-  // Currently we do not support interactive moves when using async layout. The reason is, we do not have a mechanism
-  // to propagate the "presentation data" element map (containing the speculative in-progress moves) to the layout delegate,
-  // and this can cause exceptions to be thrown from UICV. For example, if you drag an item out of a section,
-  // the element map will still contain N items in that section, even though there's only N-1 shown, and UICV will
-  // throw an exception that you specified an element that doesn't exist.
-  //
-  // In iOS >= 11, this is made much easier by the UIDataSourceTranslating API. In previous versions of iOS our best bet
-  // would be to capture the invalidation contexts that are sent during interactive moves and make our own data source translator.
-  if ([self.collectionViewLayout isKindOfClass:[ASCollectionLayout class]]) {
-    static dispatch_once_t onceToken;
-    dispatch_once(&onceToken, ^{
-      as_log_debug(ASCollectionLog(), "Collection node item interactive movement is not supported when using a layout delegate. This message will only be logged once. Node: %@", ASObjectDescriptionMakeTiny(self));
-    });
-    return NO;
-  }
-
-  // If the data source implements canMoveItem, let them decide.
-  if (_asyncDataSourceFlags.collectionNodeCanMoveItem) {
-    if (ASCellNode *cellNode = [self nodeForItemAtIndexPath:indexPath]) {
-      GET_COLLECTIONNODE_OR_RETURN(collectionNode, NO);
-      return [_asyncDataSource collectionNode:collectionNode canMoveItemWithNode:cellNode];
-    }
-  }
-  
-  // Otherwise allow the move for all items.
-  return YES;
-}
-
-- (void)collectionView:(UICollectionView *)collectionView moveItemAtIndexPath:(NSIndexPath *)sourceIndexPath toIndexPath:(NSIndexPath *)destinationIndexPath
-{
-  ASDisplayNodeAssert(_asyncDataSourceFlags.collectionNodeMoveItem, @"Should not allow interactive collection item movement if data source does not support it.");
-  
-  // Inform the data source first, in case they call nodeForItemAtIndexPath:.
-  // We want to make sure we return them the node for the item they have in mind.
-  if (ASCollectionNode *collectionNode = self.collectionNode) {
-    [_asyncDataSource collectionNode:collectionNode moveItemAtIndexPath:sourceIndexPath toIndexPath:destinationIndexPath];
-  }
-  
-  // Now we update our data controller's store.
-  // Get up to date
-  [self waitUntilAllUpdatesAreCommitted];
-  // Set our flag to suppress informing super about the change.
-  ASDisplayNodeAssertFalse(_updatingInResponseToInteractiveMove);
-  _updatingInResponseToInteractiveMove = YES;
-  // Submit the move
-  [self moveItemAtIndexPath:sourceIndexPath toIndexPath:destinationIndexPath];
-  // Wait for it to finish – should be fast!
-  [self waitUntilAllUpdatesAreCommitted];
-  // Clear the flag
-  _updatingInResponseToInteractiveMove = NO;
-}
-
-- (void)scrollViewDidScroll:(UIScrollView *)scrollView
-{
-  ASInterfaceState interfaceState = [self interfaceStateForRangeController:_rangeController];
-  if (ASInterfaceStateIncludesVisible(interfaceState)) {
-    [self _checkForBatchFetching];
-  }
-  for (_ASCollectionViewCell *cell in _cellsForVisibilityUpdates) {
-    // _cellsForVisibilityUpdates only includes cells for ASCellNode subclasses with overrides of the visibility method.
-    [cell cellNodeVisibilityEvent:ASCellNodeVisibilityEventVisibleRectChanged inScrollView:scrollView];
-  }
-  if (_asyncDelegateFlags.scrollViewDidScroll) {
-    [_asyncDelegate scrollViewDidScroll:scrollView];
-  }
-}
-
-- (void)scrollViewWillEndDragging:(UIScrollView *)scrollView withVelocity:(CGPoint)velocity targetContentOffset:(inout CGPoint *)targetContentOffset
-{
-  CGPoint contentOffset = scrollView.contentOffset;
-  _deceleratingVelocity = CGPointMake(
-    contentOffset.x - ((targetContentOffset != NULL) ? targetContentOffset->x : 0),
-    contentOffset.y - ((targetContentOffset != NULL) ? targetContentOffset->y : 0)
-  );
-
-  if (targetContentOffset != NULL) {
-    ASDisplayNodeAssert(_batchContext != nil, @"Batch context should exist");
-    [self _beginBatchFetchingIfNeededWithContentOffset:*targetContentOffset velocity:velocity];
-  }
-  
-  if (_asyncDelegateFlags.scrollViewWillEndDragging) {
-    [_asyncDelegate scrollViewWillEndDragging:scrollView withVelocity:velocity targetContentOffset:(targetContentOffset ? : &contentOffset)];
-  }
-}
-
-- (void)scrollViewDidEndDecelerating:(UIScrollView *)scrollView
-{
-  _deceleratingVelocity = CGPointZero;
-    
-  if (_asyncDelegateFlags.scrollViewDidEndDecelerating) {
-    [_asyncDelegate scrollViewDidEndDecelerating:scrollView];
-  }
-}
-
-- (void)scrollViewWillBeginDragging:(UIScrollView *)scrollView
-{
-  // If a scroll happens the current range mode needs to go to full
-  _rangeController.contentHasBeenScrolled = YES;
-  [_rangeController updateCurrentRangeWithMode:ASLayoutRangeModeFull];
-
-  for (_ASCollectionViewCell *cell in _cellsForVisibilityUpdates) {
-    [cell cellNodeVisibilityEvent:ASCellNodeVisibilityEventWillBeginDragging inScrollView:scrollView];
-  }
-  if (_asyncDelegateFlags.scrollViewWillBeginDragging) {
-    [_asyncDelegate scrollViewWillBeginDragging:scrollView];
-  }
-}
-
-- (void)scrollViewDidEndDragging:(UIScrollView *)scrollView willDecelerate:(BOOL)decelerate
-{
-  for (_ASCollectionViewCell *cell in _cellsForVisibilityUpdates) {
-    [cell cellNodeVisibilityEvent:ASCellNodeVisibilityEventDidEndDragging inScrollView:scrollView];
-  }
-  if (_asyncDelegateFlags.scrollViewDidEndDragging) {
-    [_asyncDelegate scrollViewDidEndDragging:scrollView willDecelerate:decelerate];
-  }
-}
-
-#pragma mark - Scroll Direction.
-
-- (BOOL)inverted
-{
-  return _inverted;
-}
-
-- (void)setInverted:(BOOL)inverted
-{
-  _inverted = inverted;
-}
-
-- (void)setLeadingScreensForBatching:(CGFloat)leadingScreensForBatching
-{
-  if (_leadingScreensForBatching != leadingScreensForBatching) {
-    _leadingScreensForBatching = leadingScreensForBatching;
-    // Push this to the next runloop to be sure the scroll view has the right content size
-    dispatch_async(dispatch_get_main_queue(), ^{
-      [self _checkForBatchFetching];
-    });
-  }
-}
-
-- (CGFloat)leadingScreensForBatching
-{
-  return _leadingScreensForBatching;
-}
-
-- (ASScrollDirection)scrollDirection
-{
-  CGPoint scrollVelocity;
-  if (self.isTracking) {
-    scrollVelocity = [self.panGestureRecognizer velocityInView:self.superview];
-  } else {
-    scrollVelocity = _deceleratingVelocity;
-  }
-  
-  ASScrollDirection scrollDirection = [self _scrollDirectionForVelocity:scrollVelocity];
-  return ASScrollDirectionApplyTransform(scrollDirection, self.transform);
-}
-
-- (ASScrollDirection)_scrollDirectionForVelocity:(CGPoint)scrollVelocity
-{
-  ASScrollDirection direction = ASScrollDirectionNone;
-  ASScrollDirection scrollableDirections = [self scrollableDirections];
-  
-  if (ASScrollDirectionContainsHorizontalDirection(scrollableDirections)) { // Can scroll horizontally.
-    if (scrollVelocity.x < 0.0) {
-      direction |= ASScrollDirectionRight;
-    } else if (scrollVelocity.x > 0.0) {
-      direction |= ASScrollDirectionLeft;
-    }
-  }
-  if (ASScrollDirectionContainsVerticalDirection(scrollableDirections)) { // Can scroll vertically.
-    if (scrollVelocity.y < 0.0) {
-      direction |= ASScrollDirectionDown;
-    } else if (scrollVelocity.y > 0.0) {
-      direction |= ASScrollDirectionUp;
-    }
-  }
-  
-  return direction;
-}
-
-- (ASScrollDirection)scrollableDirections
-{
-  ASDisplayNodeAssertNotNil(self.layoutInspector, @"Layout inspector should be assigned.");
-  return [self.layoutInspector scrollableDirections];
-}
-
-- (void)layoutSubviews
-{
-  if (_cellsForLayoutUpdates.count > 0) {
-    NSArray<ASCellNode *> *nodes = [_cellsForLayoutUpdates allObjects];
-    [_cellsForLayoutUpdates removeAllObjects];
-
-    NSMutableArray<ASCellNode *> *nodesSizeChanged = [[NSMutableArray alloc] init];
-
-    [_dataController relayoutNodes:nodes nodesSizeChanged:nodesSizeChanged];
-    [self nodesDidRelayout:nodesSizeChanged];
-  }
-
-  // Flush any pending invalidation action if needed.
-  ASCollectionViewInvalidationStyle invalidationStyle = _nextLayoutInvalidationStyle;
-  _nextLayoutInvalidationStyle = ASCollectionViewInvalidationStyleNone;
-  switch (invalidationStyle) {
-    case ASCollectionViewInvalidationStyleWithAnimation:
-      if (0 == _superBatchUpdateCount) {
-        if (ASCellLayoutModeIncludes(ASCellLayoutModeAlwaysReloadData)) {
-          [self _superReloadData:nil completion:nil];
-        } else {
-          [self _superPerformBatchUpdates:nil completion:nil];
-        }
-      }
-      break;
-    case ASCollectionViewInvalidationStyleWithoutAnimation:
-      [self.collectionViewLayout invalidateLayout];
-      break;
-    default:
-      break;
-  }
-  
-  // To ensure _maxSizeForNodesConstrainedSize is up-to-date for every usage, this call to super must be done last
-  [super layoutSubviews];
-    
-  if (_zeroContentInsets) {
-    self.contentInset = UIEdgeInsetsZero;
-  }
-  
-  // Update range controller immediately if possible & needed.
-  // Calling -updateIfNeeded in here with self.window == nil (early in the collection view's life)
-  // may cause UICollectionView data related crashes. We'll update in -didMoveToWindow anyway.
-  if (self.window != nil) {
-    [_rangeController updateIfNeeded];
-  }
-}
-
-
-#pragma mark - Batch Fetching
-
-- (ASBatchContext *)batchContext
-{
-  return _batchContext;
-}
-
-- (BOOL)canBatchFetch
-{
-  // if the delegate does not respond to this method, there is no point in starting to fetch
-  BOOL canFetch = _asyncDelegateFlags.collectionNodeWillBeginBatchFetch || _asyncDelegateFlags.collectionViewWillBeginBatchFetch;
-  if (canFetch && _asyncDelegateFlags.shouldBatchFetchForCollectionNode) {
-    GET_COLLECTIONNODE_OR_RETURN(collectionNode, NO);
-    return [_asyncDelegate shouldBatchFetchForCollectionNode:collectionNode];
-  } else if (canFetch && _asyncDelegateFlags.shouldBatchFetchForCollectionView) {
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
-    return [_asyncDelegate shouldBatchFetchForCollectionView:self];
-#pragma clang diagnostic pop
-  } else {
-    return canFetch;
-  }
-}
-
-- (id<ASBatchFetchingDelegate>)batchFetchingDelegate{
-  return self.collectionNode.batchFetchingDelegate;
-}
-
-- (void)_scheduleCheckForBatchFetchingForNumberOfChanges:(NSUInteger)changes
-{
-  // Prevent fetching will continually trigger in a loop after reaching end of content and no new content was provided
-  if (changes == 0 && _hasEverCheckedForBatchFetchingDueToUpdate) {
-    return;
-  }
-  _hasEverCheckedForBatchFetchingDueToUpdate = YES;
-  
-  // Push this to the next runloop to be sure the scroll view has the right content size
-  dispatch_async(dispatch_get_main_queue(), ^{
-    [self _checkForBatchFetching];
-  });
-}
-
-- (void)_checkForBatchFetching
-{
-  // Dragging will be handled in scrollViewWillEndDragging:withVelocity:targetContentOffset:
-  if (self.isDragging || self.isTracking) {
-    return;
-  }
-  
-  [self _beginBatchFetchingIfNeededWithContentOffset:self.contentOffset velocity:CGPointZero];
-}
-
-- (void)_beginBatchFetchingIfNeededWithContentOffset:(CGPoint)contentOffset velocity:(CGPoint)velocity
-{
-  if (ASDisplayShouldFetchBatchForScrollView(self, self.scrollDirection, self.scrollableDirections, contentOffset, velocity)) {
-    [self _beginBatchFetching];
-  }
-}
-
-- (void)_beginBatchFetching
-{
-  as_activity_create_for_scope("Batch fetch for collection node");
-  [_batchContext beginBatchFetching];
-  if (_asyncDelegateFlags.collectionNodeWillBeginBatchFetch) {
-    dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
-      GET_COLLECTIONNODE_OR_RETURN(collectionNode, (void)0);
-      as_log_debug(ASCollectionLog(), "Beginning batch fetch for %@ with context %@", collectionNode, _batchContext);
-      [_asyncDelegate collectionNode:collectionNode willBeginBatchFetchWithContext:_batchContext];
-    });
-  } else if (_asyncDelegateFlags.collectionViewWillBeginBatchFetch) {
-    dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
-      [_asyncDelegate collectionView:self willBeginBatchFetchWithContext:_batchContext];
-#pragma clang diagnostic pop
-    });
-  }
-}
-
-#pragma mark - ASDataControllerSource
-
-- (BOOL)dataController:(ASDataController *)dataController shouldEagerlyLayoutNode:(ASCellNode *)node
-{
-  NSAssert(!ASCellLayoutModeIncludes(ASCellLayoutModeAlwaysLazy),
-           @"ASCellLayoutModeAlwaysLazy flag is no longer supported");
-  return !node.shouldUseUIKitCell;
-}
-
-- (BOOL)dataController:(ASDataController *)dataController shouldSynchronouslyProcessChangeSet:(_ASHierarchyChangeSet *)changeSet
-{
-  // If we have AlwaysSync set, block and donate main priority.
-  if (ASCellLayoutModeIncludes(ASCellLayoutModeAlwaysSync)) {
-    return YES;
-  }
-  // Prioritize AlwaysAsync over the remaining heuristics for the Default mode.
-  if (ASCellLayoutModeIncludes(ASCellLayoutModeAlwaysAsync)) {
-    return NO;
-  }
-  // Reload data is expensive, don't block main while doing so.
-  if (changeSet.includesReloadData) {
-    return NO;
-  }
-  // If we have very few ASCellNodes (besides UIKit passthrough ones), match UIKit by blocking.
-  if (changeSet.countForAsyncLayout < 2) {
-    return YES;
-  }
-  CGSize contentSize = self.contentSize;
-  CGSize boundsSize = self.bounds.size;
-  if (contentSize.height <= boundsSize.height && contentSize.width <= boundsSize.width) {
-    return YES;
-  }
-  return NO; // ASCellLayoutModeNone
-}
-
-- (BOOL)dataControllerShouldSerializeNodeCreation:(ASDataController *)dataController
-{
-  return ASCellLayoutModeIncludes(ASCellLayoutModeSerializeNodeCreation);
-}
-
-- (id)dataController:(ASDataController *)dataController nodeModelForItemAtIndexPath:(NSIndexPath *)indexPath
-{
-  if (!_asyncDataSourceFlags.nodeModelForItem) {
-    return nil;
-  }
-
-  GET_COLLECTIONNODE_OR_RETURN(collectionNode, nil);
-  return [_asyncDataSource collectionNode:collectionNode nodeModelForItemAtIndexPath:indexPath];
-}
-
-- (ASCellNodeBlock)dataController:(ASDataController *)dataController nodeBlockAtIndexPath:(NSIndexPath *)indexPath shouldAsyncLayout:(BOOL *)shouldAsyncLayout
-{
-  ASDisplayNodeAssertMainThread();
-  ASCellNodeBlock block = nil;
-  ASCellNode *cell = nil;
-
-  if (_asyncDataSourceFlags.collectionNodeNodeBlockForItem) {
-    GET_COLLECTIONNODE_OR_RETURN(collectionNode, ^{ return [[ASCellNode alloc] init]; });
-    block = [_asyncDataSource collectionNode:collectionNode nodeBlockForItemAtIndexPath:indexPath];
-  }
-  if (!block && !cell && _asyncDataSourceFlags.collectionNodeNodeForItem) {
-    GET_COLLECTIONNODE_OR_RETURN(collectionNode, ^{ return [[ASCellNode alloc] init]; });
-    cell = [_asyncDataSource collectionNode:collectionNode nodeForItemAtIndexPath:indexPath];
-  }
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
- if (!block && !cell && _asyncDataSourceFlags.collectionViewNodeBlockForItem) {
-    block = [_asyncDataSource collectionView:self nodeBlockForItemAtIndexPath:indexPath];
-  }
-  if (!block && !cell && _asyncDataSourceFlags.collectionViewNodeForItem) {
-    cell = [_asyncDataSource collectionView:self nodeForItemAtIndexPath:indexPath];
-  }
-#pragma clang diagnostic pop
-
-  if (block == nil) {
-    if (cell == nil || ASDynamicCast(cell, ASCellNode) == nil) {
-      // In this case, either the client is expecting a UIKit passthrough cell to be created automatically,
-      // or it is an error.
-      if (_asyncDataSourceFlags.interop) {
-        cell = [[ASWrapperCellNode alloc] init];
-      } else {
-        ASDisplayNodeFailAssert(@"ASCollection could not get a node block for item at index path %@: %@, %@. If you are trying to display a UICollectionViewCell, make sure your dataSource conforms to the <ASCollectionDataSourceInterop> protocol!", indexPath, cell, block);
-        cell = [[ASCellNode alloc] init];
-      }
-    }
-
-    // This condition is intended to run for either cells received from the datasource, or created just above.
-    if (cell.shouldUseUIKitCell) {
-      *shouldAsyncLayout = NO;
-    }
-  }
-
-  // Wrap the node block
-  BOOL disableRangeController = ASCellLayoutModeIncludes(ASCellLayoutModeDisableRangeController);
-  __weak __typeof__(self) weakSelf = self;
-  return ^{
-    __typeof__(self) strongSelf = weakSelf;
-    ASCellNode *node = (block ? block() : cell);
-    ASDisplayNodeAssert([node isKindOfClass:[ASCellNode class]], @"ASCollectionNode provided a non-ASCellNode! %@, %@", node, strongSelf);
-
-    if (!disableRangeController) {
-      [node enterHierarchyState:ASHierarchyStateRangeManaged];
-    }
-    if (node.interactionDelegate == nil) {
-      node.interactionDelegate = strongSelf;
-    }
-    if (strongSelf.inverted) {
-      node.transform = CATransform3DMakeScale(1, -1, 1);
-    }
-    return node;
-  };
-}
-
-- (NSUInteger)dataController:(ASDataController *)dataController rowsInSection:(NSUInteger)section
-{
-  if (_asyncDataSourceFlags.collectionNodeNumberOfItemsInSection) {
-    GET_COLLECTIONNODE_OR_RETURN(collectionNode, 0);
-    return [_asyncDataSource collectionNode:collectionNode numberOfItemsInSection:section];
-  } else if (_asyncDataSourceFlags.collectionViewNumberOfItemsInSection) {
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
-    return [_asyncDataSource collectionView:self numberOfItemsInSection:section];
-#pragma clang diagnostic pop
-  } else {
-    return 0;
-  }
-}
-
-- (NSUInteger)numberOfSectionsInDataController:(ASDataController *)dataController {
-  if (_asyncDataSourceFlags.numberOfSectionsInCollectionNode) {
-    GET_COLLECTIONNODE_OR_RETURN(collectionNode, 0);
-    return [_asyncDataSource numberOfSectionsInCollectionNode:collectionNode];
-  } else if (_asyncDataSourceFlags.numberOfSectionsInCollectionView) {
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
-    return [_asyncDataSource numberOfSectionsInCollectionView:self];
-#pragma clang diagnostic pop
-  } else {
-    return 1;
-  }
-}
-
-- (BOOL)dataController:(ASDataController *)dataController presentedSizeForElement:(ASCollectionElement *)element matchesSize:(CGSize)size
-{
-  NSIndexPath *indexPath = [self indexPathForNode:element.node];
-  if (indexPath == nil) {
-    ASDisplayNodeFailAssert(@"Data controller should not ask for presented size for element that is not presented.");
-    return YES;
-  }
-
-  UICollectionViewLayoutAttributes *attributes;
-  if (element.supplementaryElementKind == nil) {
-    attributes = [self layoutAttributesForItemAtIndexPath:indexPath];
-  } else {
-    attributes = [self layoutAttributesForSupplementaryElementOfKind:element.supplementaryElementKind atIndexPath:indexPath];
-  }
-  return CGSizeEqualToSizeWithIn(attributes.size, size, FLT_EPSILON);
-}
-
-#pragma mark - ASDataControllerSource optional methods
-
-- (ASCellNodeBlock)dataController:(ASDataController *)dataController supplementaryNodeBlockOfKind:(NSString *)kind atIndexPath:(NSIndexPath *)indexPath shouldAsyncLayout:(BOOL *)shouldAsyncLayout
-{
-  ASDisplayNodeAssertMainThread();
-  ASCellNodeBlock block = nil;
-  ASCellNode *cell = nil;
-  if (_asyncDataSourceFlags.collectionNodeNodeBlockForSupplementaryElement) {
-    GET_COLLECTIONNODE_OR_RETURN(collectionNode, ^{ return [[ASCellNode alloc] init]; });
-    block = [_asyncDataSource collectionNode:collectionNode nodeBlockForSupplementaryElementOfKind:kind atIndexPath:indexPath];
-  }
-  if (!block && !cell && _asyncDataSourceFlags.collectionNodeNodeForSupplementaryElement) {
-    GET_COLLECTIONNODE_OR_RETURN(collectionNode, ^{ return [[ASCellNode alloc] init]; });
-    cell = [_asyncDataSource collectionNode:collectionNode nodeForSupplementaryElementOfKind:kind atIndexPath:indexPath];
-  }
-  if (!block && !cell && _asyncDataSourceFlags.collectionViewNodeForSupplementaryElement) {
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
-    cell = [_asyncDataSource collectionView:self nodeForSupplementaryElementOfKind:kind atIndexPath:indexPath];
-#pragma clang diagnostic pop
-  }
-
-  if (block == nil) {
-    if (cell == nil || ASDynamicCast(cell, ASCellNode) == nil) {
-      // In this case, the app code returned nil for the node and the nodeBlock.
-      // If the UIKit method is implemented, then we should use a passthrough cell.
-      // Otherwise the CGSizeZero default will cause UIKit to not show it (so this isn't an error like the cellForItem case).
-
-      BOOL useUIKitCell = _asyncDataSourceFlags.interopViewForSupplementaryElement;
-      if (useUIKitCell) {
-        cell = [[ASWrapperCellNode alloc] init];
-      } else {
-        cell = [[ASCellNode alloc] init];
-      }
-    }
-
-    // This condition is intended to run for either cells received from the datasource, or created just above.
-    if (cell.shouldUseUIKitCell) {
-      *shouldAsyncLayout = NO;
-    }
-
-    block = ^{ return cell; };
-  }
-
-  // Wrap the node block
-  // BOOL disableRangeController = ASCellLayoutModeIncludes(ASCellLayoutModeDisableRangeController);
-  __weak __typeof__(self) weakSelf = self;
-  return ^{
-    __typeof__(self) strongSelf = weakSelf;
-    ASCellNode *node = block();
-    ASDisplayNodeAssert([node isKindOfClass:[ASCellNode class]],
-                        @"ASCollectionNode provided a non-ASCellNode! %@, %@", node, strongSelf);
-
-    // TODO: ASRangeController doesn't currently support managing interfaceState for supplementary nodes.
-    // For now, we allow the standard ASInterfaceStateInHierarchy behavior by ensuring we do not inform
-    // the node that it should expect external management of interfaceState.
-    /*
-    if (!disableRangeController) {
-      [node enterHierarchyState:ASHierarchyStateRangeManaged];
-    }
-    */
-    
-    if (node.interactionDelegate == nil) {
-      node.interactionDelegate = strongSelf;
-    }
-    if (strongSelf.inverted) {
-      node.transform = CATransform3DMakeScale(1, -1, 1);
-    }
-    return node;
-  };
-}
-
-- (NSArray<NSString *> *)dataController:(ASDataController *)dataController supplementaryNodeKindsInSections:(NSIndexSet *)sections
-{
-  if (_asyncDataSourceFlags.collectionNodeSupplementaryElementKindsInSection) {
-    const auto kinds = [[NSMutableSet<NSString *> alloc] init];
-    GET_COLLECTIONNODE_OR_RETURN(collectionNode, @[]);
-    [sections enumerateIndexesUsingBlock:^(NSUInteger section, BOOL * _Nonnull stop) {
-      NSArray<NSString *> *kindsForSection = [_asyncDataSource collectionNode:collectionNode supplementaryElementKindsInSection:section];
-      [kinds addObjectsFromArray:kindsForSection];
-    }];
-    return [kinds allObjects];
-  } else {
-    // TODO: Lock this
-    return [_registeredSupplementaryKinds allObjects];
-  }
-}
-
-- (ASSizeRange)dataController:(ASDataController *)dataController constrainedSizeForNodeAtIndexPath:(NSIndexPath *)indexPath
-{
-  return [self.layoutInspector collectionView:self constrainedSizeForNodeAtIndexPath:indexPath];
-}
-
-- (ASSizeRange)dataController:(ASDataController *)dataController constrainedSizeForSupplementaryNodeOfKind:(NSString *)kind atIndexPath:(NSIndexPath *)indexPath
-{
-  if (_layoutInspectorFlags.constrainedSizeForSupplementaryNodeOfKindAtIndexPath) {
-    return [self.layoutInspector collectionView:self constrainedSizeForSupplementaryNodeOfKind:kind atIndexPath:indexPath];
-  }
-  
-  ASDisplayNodeAssert(NO, @"To support supplementary nodes in ASCollectionView, it must have a layoutInspector for layout inspection. (See ASCollectionViewFlowLayoutInspector for an example.)");
-  return ASSizeRangeMake(CGSizeZero, CGSizeZero);
-}
-
-- (NSUInteger)dataController:(ASDataController *)dataController supplementaryNodesOfKind:(NSString *)kind inSection:(NSUInteger)section
-{
-  if (_asyncDataSource == nil) {
-    return 0;
-  }
-  
-  if (_layoutInspectorFlags.supplementaryNodesOfKindInSection) {
-    return [self.layoutInspector collectionView:self supplementaryNodesOfKind:kind inSection:section];
-  }
-
-  ASDisplayNodeAssert(NO, @"To support supplementary nodes in ASCollectionView, it must have a layoutInspector for layout inspection. (See ASCollectionViewFlowLayoutInspector for an example.)");
-  return 0;
-}
-
-- (id<ASSectionContext>)dataController:(ASDataController *)dataController contextForSection:(NSInteger)section
-{
-  ASDisplayNodeAssertMainThread();
-  id<ASSectionContext> context = nil;
-  
-  if (_asyncDataSourceFlags.collectionNodeContextForSection) {
-    GET_COLLECTIONNODE_OR_RETURN(collectionNode, nil);
-    context = [_asyncDataSource collectionNode:collectionNode contextForSection:section];
-  }
-  
-  if (context != nil) {
-    context.collectionView = self;
-  }
-  return context;
-}
-
-#pragma mark - ASRangeControllerDataSource
-
-- (ASRangeController *)rangeController
-{
-  return _rangeController;
-}
-
-- (NSHashTable<ASCollectionElement *> *)visibleElementsForRangeController:(ASRangeController *)rangeController
-{
-  return ASPointerTableByFlatMapping(_visibleElements, id element, element);
-}
-
-- (ASElementMap *)elementMapForRangeController:(ASRangeController *)rangeController
-{
-  return _dataController.visibleMap;
-}
-
-- (ASScrollDirection)scrollDirectionForRangeController:(ASRangeController *)rangeController
-{
-  return self.scrollDirection;
-}
-
-- (ASInterfaceState)interfaceStateForRangeController:(ASRangeController *)rangeController
-{
-  return ASInterfaceStateForDisplayNode(self.collectionNode, self.window);
-}
-
-- (NSString *)nameForRangeControllerDataSource
-{
-  return self.asyncDataSource ? NSStringFromClass([self.asyncDataSource class]) : NSStringFromClass([self class]);
-}
-
-#pragma mark - ASRangeControllerDelegate
-
-- (BOOL)rangeControllerShouldUpdateRanges:(ASRangeController *)rangeController
-{
-  return !ASCellLayoutModeIncludes(ASCellLayoutModeDisableRangeController);
-}
-
-- (void)rangeController:(ASRangeController *)rangeController updateWithChangeSet:(_ASHierarchyChangeSet *)changeSet updates:(dispatch_block_t)updates
-{
-  ASDisplayNodeAssertMainThread();
-  if (!self.asyncDataSource || _superIsPendingDataLoad || _updatingInResponseToInteractiveMove) {
-    updates();
-    [changeSet executeCompletionHandlerWithFinished:NO];
-    return; // if the asyncDataSource has become invalid while we are processing, ignore this request to avoid crashes
-  }
-
-  //TODO Do we need to notify _layoutFacilitator before reloadData?
-  for (_ASHierarchyItemChange *change in [changeSet itemChangesOfType:_ASHierarchyChangeTypeDelete]) {
-    [_layoutFacilitator collectionViewWillEditCellsAtIndexPaths:change.indexPaths batched:YES];
-  }
-
-  for (_ASHierarchySectionChange *change in [changeSet sectionChangesOfType:_ASHierarchyChangeTypeDelete]) {
-    [_layoutFacilitator collectionViewWillEditSectionsAtIndexSet:change.indexSet batched:YES];
-  }
-
-  for (_ASHierarchySectionChange *change in [changeSet sectionChangesOfType:_ASHierarchyChangeTypeInsert]) {
-    [_layoutFacilitator collectionViewWillEditSectionsAtIndexSet:change.indexSet batched:YES];
-  }
-
-  for (_ASHierarchyItemChange *change in [changeSet itemChangesOfType:_ASHierarchyChangeTypeInsert]) {
-    [_layoutFacilitator collectionViewWillEditCellsAtIndexPaths:change.indexPaths batched:YES];
-  }
-
-  ASPerformBlockWithoutAnimation(!changeSet.animated, ^{
-    as_activity_scope(as_activity_create("Commit collection update", changeSet.rootActivity, OS_ACTIVITY_FLAG_DEFAULT));
-    if (changeSet.includesReloadData) {
-      _superIsPendingDataLoad = YES;
-      updates();
-      [self _superReloadData:nil completion:nil];
-      as_log_debug(ASCollectionLog(), "Did reloadData %@", self.collectionNode);
-      [changeSet executeCompletionHandlerWithFinished:YES];
-    } else {
-      [_layoutFacilitator collectionViewWillPerformBatchUpdates];
-      
-      __block NSUInteger numberOfUpdates = 0;
-      const auto completion = ^(BOOL finished) {
-        as_activity_scope(as_activity_create("Handle collection update completion", changeSet.rootActivity, OS_ACTIVITY_FLAG_DEFAULT));
-        as_log_verbose(ASCollectionLog(), "Update animation finished %{public}@", self.collectionNode);
-        // Flush any range changes that happened as part of the update animations ending.
-        [_rangeController updateIfNeeded];
-        [self _scheduleCheckForBatchFetchingForNumberOfChanges:numberOfUpdates];
-        [changeSet executeCompletionHandlerWithFinished:finished];
-      };
-
-      BOOL shouldReloadData = ASCellLayoutModeIncludes(ASCellLayoutModeAlwaysReloadData);
-      // TODO: Consider adding !changeSet.isEmpty as a check to also disable shouldReloadData.
-      if (ASCellLayoutModeIncludes(ASCellLayoutModeAlwaysBatchUpdateSectionReload) &&
-          [changeSet sectionChangesOfType:_ASHierarchyChangeTypeReload].count > 0) {
-        shouldReloadData = NO;
-      }
-
-      if (shouldReloadData) {
-        // When doing a reloadData, the insert / delete calls are not necessary.
-        // Calling updates() is enough, as it commits .pendingMap to .visibleMap.
-        [self _superReloadData:updates completion:completion];
-      } else {
-        [self _superPerformBatchUpdates:^{
-          updates();
-
-          for (_ASHierarchyItemChange *change in [changeSet itemChangesOfType:_ASHierarchyChangeTypeReload]) {
-            [super reloadItemsAtIndexPaths:change.indexPaths];
-            numberOfUpdates++;
-          }
-
-          for (_ASHierarchySectionChange *change in [changeSet sectionChangesOfType:_ASHierarchyChangeTypeReload]) {
-            [super reloadSections:change.indexSet];
-            numberOfUpdates++;
-          }
-
-          for (_ASHierarchyItemChange *change in [changeSet itemChangesOfType:_ASHierarchyChangeTypeOriginalDelete]) {
-            [super deleteItemsAtIndexPaths:change.indexPaths];
-            numberOfUpdates++;
-          }
-
-          for (_ASHierarchySectionChange *change in [changeSet sectionChangesOfType:_ASHierarchyChangeTypeOriginalDelete]) {
-            [super deleteSections:change.indexSet];
-            numberOfUpdates++;
-          }
-
-          for (_ASHierarchySectionChange *change in [changeSet sectionChangesOfType:_ASHierarchyChangeTypeOriginalInsert]) {
-            [super insertSections:change.indexSet];
-            numberOfUpdates++;
-          }
-
-          for (_ASHierarchyItemChange *change in [changeSet itemChangesOfType:_ASHierarchyChangeTypeOriginalInsert]) {
-            [super insertItemsAtIndexPaths:change.indexPaths];
-            numberOfUpdates++;
-          }
-        } completion:completion];
-      }
-
-      as_log_debug(ASCollectionLog(), "Completed batch update %{public}@", self.collectionNode);
-      
-      // Flush any range changes that happened as part of submitting the update.
-      as_activity_scope(changeSet.rootActivity);
-      [_rangeController updateIfNeeded];
-    }
-  });
-}
-
-#pragma mark - ASCellNodeDelegate
-
-- (void)nodeSelectedStateDidChange:(ASCellNode *)node
-{
-  NSIndexPath *indexPath = [self indexPathForNode:node];
-  if (indexPath) {
-    if (node.isSelected) {
-      [super selectItemAtIndexPath:indexPath animated:NO scrollPosition:UICollectionViewScrollPositionNone];
-    } else {
-      [super deselectItemAtIndexPath:indexPath animated:NO];
-    }
-  }
-}
-
-- (void)nodeHighlightedStateDidChange:(ASCellNode *)node
-{
-  NSIndexPath *indexPath = [self indexPathForNode:node];
-  if (indexPath) {
-    [self cellForItemAtIndexPath:indexPath].highlighted = node.isHighlighted;
-  }
-}
-
-- (void)nodeDidInvalidateSize:(ASCellNode *)node
-{
-  [_cellsForLayoutUpdates addObject:node];
-  [self setNeedsLayout];
-}
-
-- (void)nodesDidRelayout:(NSArray<ASCellNode *> *)nodes
-{
-  ASDisplayNodeAssertMainThread();
-  
-  if (nodes.count == 0) {
-    return;
-  }
-
-  const auto uikitIndexPaths = ASArrayByFlatMapping(nodes, ASCellNode *node, [self indexPathForNode:node]);
-  
-  [_layoutFacilitator collectionViewWillEditCellsAtIndexPaths:uikitIndexPaths batched:NO];
-  
-  ASCollectionViewInvalidationStyle invalidationStyle = _nextLayoutInvalidationStyle;
-  for (ASCellNode *node in nodes) {
-    if (invalidationStyle == ASCollectionViewInvalidationStyleNone) {
-      // We nodesDidRelayout also while we are in layoutSubviews. This should be no problem as CA will ignore this
-      // call while be in a layout pass
-      [self setNeedsLayout];
-      invalidationStyle = ASCollectionViewInvalidationStyleWithAnimation;
-    }
-    
-    // If we think we're going to animate, check if this node will prevent it.
-    if (invalidationStyle == ASCollectionViewInvalidationStyleWithAnimation) {
-      // TODO: Incorporate `shouldAnimateSizeChanges` into ASEnvironmentState for performance benefit.
-      static dispatch_once_t onceToken;
-      static BOOL (^shouldNotAnimateBlock)(ASDisplayNode *);
-      dispatch_once(&onceToken, ^{
-        shouldNotAnimateBlock = ^BOOL(ASDisplayNode * _Nonnull node) {
-          return (node.shouldAnimateSizeChanges == NO);
-        };
-      });
-      if (ASDisplayNodeFindFirstNode(node, shouldNotAnimateBlock) != nil) {
-        // One single non-animated node causes the whole layout update to be non-animated
-        invalidationStyle = ASCollectionViewInvalidationStyleWithoutAnimation;
-        break;
-      }
-    }
-  }
-  _nextLayoutInvalidationStyle = invalidationStyle;
-}
-
-#pragma mark - _ASDisplayView behavior substitutions
-// Need these to drive interfaceState so we know when we are visible, if not nested in another range-managing element.
-// Because our superclass is a true UIKit class, we cannot also subclass _ASDisplayView.
-- (void)willMoveToWindow:(UIWindow *)newWindow
-{
-  BOOL visible = (newWindow != nil);
-  ASDisplayNode *node = self.collectionNode;
-  if (visible && !node.inHierarchy) {
-    [node __enterHierarchy];
-  }
-}
-
-- (void)didMoveToWindow
-{
-  BOOL visible = (self.window != nil);
-  ASDisplayNode *node = self.collectionNode;
-  BOOL rangeControllerNeedsUpdate = ![node supportsRangeManagedInterfaceState];;
-
-  if (!visible && node.inHierarchy) {
-    if (rangeControllerNeedsUpdate) {
-      rangeControllerNeedsUpdate = NO;
-      // Exit CellNodes first before Collection to match UIKit behaviors (tear down bottom up).
-      // Although we have not yet cleared the interfaceState's Visible bit (this  happens in __exitHierarchy),
-      // the ASRangeController will get the correct value from -interfaceStateForRangeController:.
-      [_rangeController updateRanges];
-    }
-    [node __exitHierarchy];
-  }
-
-  // Updating the visible node index paths only for not range managed nodes. Range managed nodes will get their
-  // their update in the layout pass
-  if (rangeControllerNeedsUpdate) {
-    [_rangeController updateRanges];
-  }
-
-  // When we aren't visible, we will only fetch up to the visible area. Now that we are visible,
-  // we will fetch visible area + leading screens, so we need to check.
-  if (visible) {
-    [self _checkForBatchFetching];
-  }
-}
-
-- (void)willMoveToSuperview:(UIView *)newSuperview
-{
-  if (self.superview == nil && newSuperview != nil) {
-    _keepalive_node = self.collectionNode;
-  }
-}
-
-- (void)didMoveToSuperview
-{
-  if (self.superview == nil) {
-    _keepalive_node = nil;
-  }
-}
-
-#pragma mark ASCALayerExtendedDelegate
-
-/**
- * TODO: This code was added when we used @c calculatedSize as the size for 
- * items (e.g. collectionView:layout:sizeForItemAtIndexPath:) and so it
- * was critical that we remeasured all nodes at this time.
- *
- * The assumption was that cv-bounds-size-change -> constrained-size-change, so
- * this was the time when we get new constrained sizes for all items and remeasure
- * them. However, the constrained sizes for items can be invalidated for many other
- * reasons, hence why we never reuse the old constrained size anymore.
- *
- * UICollectionView inadvertently triggers a -prepareLayout call to its layout object
- * between [super setFrame:] and [self layoutSubviews] during size changes. So we need
- * to get in there and re-measure our nodes before that -prepareLayout call.
- * We can't wait until -layoutSubviews or the end of -setFrame:.
- *
- * @see @p testThatNodeCalculatedSizesAreUpdatedBeforeFirstPrepareLayoutAfterRotation
- */
-- (void)layer:(CALayer *)layer didChangeBoundsWithOldValue:(CGRect)oldBounds newValue:(CGRect)newBounds
-{
-  CGSize newSize = newBounds.size;
-  CGSize lastUsedSize = _lastBoundsSizeUsedForMeasuringNodes;
-  if (CGSizeEqualToSize(lastUsedSize, newSize)) {
-    return;
-  }
-  if (_hasDataControllerLayoutDelegate || self.collectionViewLayout == nil) {
-    // Let the layout delegate handle bounds changes if it's available. If no layout, it will init in the new state.
-    return;
-  }
-
-  _lastBoundsSizeUsedForMeasuringNodes = newSize;
-
-  // Laying out all nodes is expensive.
-  // We only need to do this if the bounds changed in the non-scrollable direction.
-  // If, for example, a vertical flow layout has its height changed due to a status bar
-  // appearance update, we do not need to relayout all nodes.
-  // For a more permanent fix to the unsafety mentioned above, see https://github.com/facebook/AsyncDisplayKit/pull/2182
-  ASScrollDirection scrollDirection = self.scrollableDirections;
-  BOOL fixedVertically   = (ASScrollDirectionContainsVerticalDirection  (scrollDirection) == NO);
-  BOOL fixedHorizontally = (ASScrollDirectionContainsHorizontalDirection(scrollDirection) == NO);
-
-  BOOL changedInNonScrollingDirection = (fixedHorizontally && newSize.width  != lastUsedSize.width) ||
-                                        (fixedVertically   && newSize.height != lastUsedSize.height);
-
-  if (changedInNonScrollingDirection) {
-    [self relayoutItems];
-  }
-}
-
-#pragma mark - UICollectionView dead-end intercepts
-
-- (void)setPrefetchDataSource:(id<UICollectionViewDataSourcePrefetching>)prefetchDataSource
-{
-  return;
-}
-
-- (void)setPrefetchingEnabled:(BOOL)prefetchingEnabled
-{
-  return;
-}
-
-#pragma mark - Accessibility overrides
-
-- (NSArray *)accessibilityElements
-{
-  [self waitUntilAllUpdatesAreCommitted];
-  return [super accessibilityElements];
-}
-
-@end
-
-#endif
diff --git a/submodules/AsyncDisplayKit/Source/ASCollectionViewLayoutFacilitatorProtocol.h b/submodules/AsyncDisplayKit/Source/ASCollectionViewLayoutFacilitatorProtocol.h
deleted file mode 100644
index b60dd0e02f..0000000000
--- a/submodules/AsyncDisplayKit/Source/ASCollectionViewLayoutFacilitatorProtocol.h
+++ /dev/null
@@ -1,48 +0,0 @@
-//
-//  ASCollectionViewLayoutFacilitatorProtocol.h
-//  Texture
-//
-//  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.
-//  Changes after 4/13/2017 are: Copyright (c) Pinterest, Inc.  All rights reserved.
-//  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
-//
-
-#ifndef MINIMAL_ASDK
-
-#pragma once
-#import <Foundation/Foundation.h>
-
-/**
- * This facilitator protocol is intended to help Layout to better
- * gel with the CollectionView
- */
-@protocol ASCollectionViewLayoutFacilitatorProtocol <NSObject>
-
-/**
- * Inform that the collectionView is editing the cells at a list of indexPaths
- *
- * @param indexPaths an array of NSIndexPath objects of cells being/will be edited.
- * @param isBatched indicates whether the editing operation will be batched by the collectionView
- *
- * NOTE: when isBatched, used in combination with -collectionViewWillPerformBatchUpdates
- */
-- (void)collectionViewWillEditCellsAtIndexPaths:(NSArray *)indexPaths batched:(BOOL)isBatched;
-
-/**
- * Inform that the collectionView is editing the sections at a set of indexes
- *
- * @param indexes an NSIndexSet of section indexes being/will be edited.
- * @param batched indicates whether the editing operation will be batched by the collectionView
- *
- * NOTE: when batched, used in combination with -collectionViewWillPerformBatchUpdates
- */
-- (void)collectionViewWillEditSectionsAtIndexSet:(NSIndexSet *)indexes batched:(BOOL)batched;
-
-/**
- * Informs the delegate that the collectionView is about to call performBatchUpdates
- */
-- (void)collectionViewWillPerformBatchUpdates;
-
-@end
-
-#endif
diff --git a/submodules/AsyncDisplayKit/Source/ASCollectionViewProtocols.h b/submodules/AsyncDisplayKit/Source/ASCollectionViewProtocols.h
deleted file mode 100644
index 459e12efcd..0000000000
--- a/submodules/AsyncDisplayKit/Source/ASCollectionViewProtocols.h
+++ /dev/null
@@ -1,103 +0,0 @@
-//
-//  ASCollectionViewProtocols.h
-//  Texture
-//
-//  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.
-//  Changes after 4/13/2017 are: Copyright (c) Pinterest, Inc.  All rights reserved.
-//  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
-//
-
-#ifndef MINIMAL_ASDK
-#import <UIKit/UIKit.h>
-#import <AsyncDisplayKit/ASBaseDefines.h>
-
-typedef NS_OPTIONS(NSUInteger, ASCellLayoutMode) {
-  /**
-   * No options set. If cell layout mode is set to ASCellLayoutModeNone, the default values for
-   * each flag listed below is used.
-   */
-  ASCellLayoutModeNone = 0,
-  /**
-   * If ASCellLayoutModeAlwaysSync is enabled it will cause the ASDataController to wait on the
-   * background queue, and this ensures that any new / changed cells are in the hierarchy by the
-   * very next CATransaction / frame draw.
-   *
-   * Note: Sync & Async flags force the behavior to be always one or the other, regardless of the
-   * items. Default: If neither ASCellLayoutModeAlwaysSync or ASCellLayoutModeAlwaysAsync is set,
-   * default behavior is synchronous when there are 0 or 1 ASCellNodes in the data source, and
-   * asynchronous when there are 2 or more.
-  */
-  ASCellLayoutModeAlwaysSync = 1 << 1,                // Default OFF
-  ASCellLayoutModeAlwaysAsync = 1 << 2,               // Default OFF
-  ASCellLayoutModeForceIfNeeded = 1 << 3,             // Deprecated, default OFF.
-  ASCellLayoutModeAlwaysPassthroughDelegate = 1 << 4, // Deprecated, default ON.
-  /** Instead of using performBatchUpdates: prefer using reloadData for changes for collection view */
-  ASCellLayoutModeAlwaysReloadData = 1 << 5,          // Default OFF
-  /** If flag is enabled nodes are *not* gonna be range managed. */
-  ASCellLayoutModeDisableRangeController = 1 << 6,    // Default OFF
-  ASCellLayoutModeAlwaysLazy = 1 << 7,                // Deprecated, default OFF.
-  /**
-   * Defines if the node creation should happen serialized and not in parallel within the
-   * data controller
-   */
-  ASCellLayoutModeSerializeNodeCreation = 1 << 8,     // Default OFF
-  /**
-   * When set, the performBatchUpdates: API (including animation) is used when handling Section
-   * Reload operations. This is useful only when ASCellLayoutModeAlwaysReloadData is enabled and
-   * cell height animations are desired.
-   */
-  ASCellLayoutModeAlwaysBatchUpdateSectionReload = 1 << 9, // Default OFF
-};
-
-NS_ASSUME_NONNULL_BEGIN
-
-/**
- * This is a subset of UICollectionViewDataSource.
- *
- * @see ASCollectionDataSource
- */
-@protocol ASCommonCollectionDataSource <NSObject>
-
-@optional
-
-- (NSInteger)collectionView:(UICollectionView *)collectionView numberOfItemsInSection:(NSInteger)section ASDISPLAYNODE_DEPRECATED_MSG("Implement -collectionNode:numberOfItemsInSection: instead.");
-
-- (NSInteger)numberOfSectionsInCollectionView:(UICollectionView *)collectionView ASDISPLAYNODE_DEPRECATED_MSG("Implement -numberOfSectionsInCollectionNode: instead.");
-
-- (UICollectionReusableView *)collectionView:(UICollectionView *)collectionView viewForSupplementaryElementOfKind:(NSString *)kind atIndexPath:(NSIndexPath *)indexPath ASDISPLAYNODE_DEPRECATED_MSG("Implement - collectionNode:nodeForSupplementaryElementOfKind:atIndexPath: instead.");
-
-@end
-
-
-/**
- * This is a subset of UICollectionViewDelegate.
- *
- * @see ASCollectionDelegate
- */
-@protocol ASCommonCollectionDelegate <NSObject, UIScrollViewDelegate>
-
-@optional
-
-- (UICollectionViewTransitionLayout *)collectionView:(UICollectionView *)collectionView transitionLayoutForOldLayout:(UICollectionViewLayout *)fromLayout newLayout:(UICollectionViewLayout *)toLayout;
-
-- (void)collectionView:(UICollectionView *)collectionView willDisplaySupplementaryView:(UICollectionReusableView *)view forElementKind:(NSString *)elementKind atIndexPath:(NSIndexPath *)indexPath ASDISPLAYNODE_DEPRECATED_MSG("Implement -collectionNode:willDisplaySupplementaryView:forElementKind:atIndexPath: instead.");
-- (void)collectionView:(UICollectionView *)collectionView didEndDisplayingSupplementaryView:(UICollectionReusableView *)view forElementOfKind:(NSString *)elementKind atIndexPath:(NSIndexPath *)indexPath ASDISPLAYNODE_DEPRECATED_MSG("Implement -collectionNode:didEndDisplayingSupplementaryView:forElementKind:atIndexPath: instead.");
-
-- (BOOL)collectionView:(UICollectionView *)collectionView shouldHighlightItemAtIndexPath:(NSIndexPath *)indexPath ASDISPLAYNODE_DEPRECATED_MSG("Implement collectionNode:shouldHighlightItemAtIndexPath: instead.");
-- (void)collectionView:(UICollectionView *)collectionView didHighlightItemAtIndexPath:(NSIndexPath *)indexPath ASDISPLAYNODE_DEPRECATED_MSG("Implement collectionNode:didHighlightItemAtIndexPath: instead.");
-- (void)collectionView:(UICollectionView *)collectionView didUnhighlightItemAtIndexPath:(NSIndexPath *)indexPath ASDISPLAYNODE_DEPRECATED_MSG("Implement collectionNode:didUnhighlightItemAtIndexPath: instead.");
-
-- (BOOL)collectionView:(UICollectionView *)collectionView shouldSelectItemAtIndexPath:(NSIndexPath *)indexPath ASDISPLAYNODE_DEPRECATED_MSG("Implement collectionNode:shouldSelectItemAtIndexPath: instead.");
-- (void)collectionView:(UICollectionView *)collectionView didSelectItemAtIndexPath:(NSIndexPath *)indexPath ASDISPLAYNODE_DEPRECATED_MSG("Implement collectionNode:didSelectItemAtIndexPath: instead.");
-- (BOOL)collectionView:(UICollectionView *)collectionView shouldDeselectItemAtIndexPath:(NSIndexPath *)indexPath ASDISPLAYNODE_DEPRECATED_MSG("Implement collectionNode:shouldDeselectItemAtIndexPath: instead.");
-- (void)collectionView:(UICollectionView *)collectionView didDeselectItemAtIndexPath:(NSIndexPath *)indexPath ASDISPLAYNODE_DEPRECATED_MSG("Implement collectionNode:didDeselectItemAtIndexPath: instead.");
-
-- (BOOL)collectionView:(UICollectionView *)collectionView shouldShowMenuForItemAtIndexPath:(NSIndexPath *)indexPath ASDISPLAYNODE_DEPRECATED_MSG("Implement collectionNode:shouldShowMenuForItemAtIndexPath: instead.");
-- (BOOL)collectionView:(UICollectionView *)collectionView canPerformAction:(SEL)action forItemAtIndexPath:(NSIndexPath *)indexPath withSender:(nullable id)sender ASDISPLAYNODE_DEPRECATED_MSG("Implement collectionNode:canPerformAction:forItemAtIndexPath:withSender: instead.");
-- (void)collectionView:(UICollectionView *)collectionView performAction:(SEL)action forItemAtIndexPath:(NSIndexPath *)indexPath withSender:(nullable id)sender ASDISPLAYNODE_DEPRECATED_MSG("Implement collectionNode:performAction:forItemAtIndexPath:withSender: instead.");
-
-@end
-
-NS_ASSUME_NONNULL_END
-
-#endif
diff --git a/submodules/AsyncDisplayKit/Source/ASConfigurationInternal.mm b/submodules/AsyncDisplayKit/Source/ASConfigurationInternal.mm
index 485fef0c58..2fb190103a 100644
--- a/submodules/AsyncDisplayKit/Source/ASConfigurationInternal.mm
+++ b/submodules/AsyncDisplayKit/Source/ASConfigurationInternal.mm
@@ -6,7 +6,7 @@
 //  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
 //
 
-#import "ASConfigurationInternal.h"
+#import <AsyncDisplayKit/ASConfigurationInternal.h>
 #import <AsyncDisplayKit/ASAssert.h>
 #import <AsyncDisplayKit/ASConfiguration.h>
 #import <AsyncDisplayKit/ASConfigurationDelegate.h>
diff --git a/submodules/AsyncDisplayKit/Source/Private/ASControlNode+Private.h b/submodules/AsyncDisplayKit/Source/ASControlNode+Private.h
similarity index 100%
rename from submodules/AsyncDisplayKit/Source/Private/ASControlNode+Private.h
rename to submodules/AsyncDisplayKit/Source/ASControlNode+Private.h
diff --git a/submodules/AsyncDisplayKit/Source/ASControlNode.mm b/submodules/AsyncDisplayKit/Source/ASControlNode.mm
index 1256d2d629..dcdb9ec829 100644
--- a/submodules/AsyncDisplayKit/Source/ASControlNode.mm
+++ b/submodules/AsyncDisplayKit/Source/ASControlNode.mm
@@ -8,11 +8,9 @@
 //
 
 #import <AsyncDisplayKit/ASControlNode.h>
-#import <AsyncDisplayKit/ASControlNode+Private.h>
+#import "ASControlNode+Private.h"
 #import <AsyncDisplayKit/ASControlNode+Subclasses.h>
 #import <AsyncDisplayKit/ASDisplayNode+Subclasses.h>
-#import <AsyncDisplayKit/ASImageNode.h>
-#import <AsyncDisplayKit/AsyncDisplayKit+Debug.h>
 #import <AsyncDisplayKit/ASInternalHelpers.h>
 #import <AsyncDisplayKit/ASControlTargetAction.h>
 #import <AsyncDisplayKit/ASDisplayNode+FrameworkPrivate.h>
@@ -73,7 +71,6 @@ CGRect _ASControlNodeGetExpandedBounds(ASControlNode *controlNode);
 
 @implementation ASControlNode
 {
-  ASImageNode *_debugHighlightOverlay;
 }
 
 #pragma mark - Lifecycle
@@ -292,20 +289,6 @@ CGRect _ASControlNodeGetExpandedBounds(ASControlNode *controlNode);
 
   if (!_controlEventDispatchTable) {
     _controlEventDispatchTable = [[NSMutableDictionary alloc] initWithCapacity:kASControlNodeEventDispatchTableInitialCapacity]; // enough to handle common types without re-hashing the dictionary when adding entries.
-    
-    // only show tap-able areas for views with 1 or more addTarget:action: pairs
-    if ([ASControlNode enableHitTestDebug] && _debugHighlightOverlay == nil) {
-      // do not use ASPerformBlockOnMainThread here, if it performs the block synchronously it will continue
-      // holding the lock while calling addSubnode.
-      dispatch_async(dispatch_get_main_queue(), ^{
-        // add a highlight overlay node with area of ASControlNode + UIEdgeInsets
-        self.clipsToBounds = NO;
-        _debugHighlightOverlay = [[ASImageNode alloc] init];
-        _debugHighlightOverlay.zPosition = 1000;  // ensure we're over the top of any siblings
-        _debugHighlightOverlay.layerBacked = YES;
-        [self addSubnode:_debugHighlightOverlay];
-      });
-    }
   }
   
   // Create new target action pair
@@ -509,8 +492,8 @@ CGRect _ASControlNodeGetExpandedBounds(ASControlNode *controlNode) {
 }
 
 #pragma mark - Debug
-- (ASImageNode *)debugHighlightOverlay
+- (ASDisplayNode *)debugHighlightOverlay
 {
-  return _debugHighlightOverlay;
+  return nil;
 }
 @end
diff --git a/submodules/AsyncDisplayKit/Source/Private/ASControlTargetAction.mm b/submodules/AsyncDisplayKit/Source/ASControlTargetAction.mm
similarity index 100%
rename from submodules/AsyncDisplayKit/Source/Private/ASControlTargetAction.mm
rename to submodules/AsyncDisplayKit/Source/ASControlTargetAction.mm
diff --git a/submodules/AsyncDisplayKit/Source/Layout/ASDimension.mm b/submodules/AsyncDisplayKit/Source/ASDimension.mm
similarity index 100%
rename from submodules/AsyncDisplayKit/Source/Layout/ASDimension.mm
rename to submodules/AsyncDisplayKit/Source/ASDimension.mm
diff --git a/submodules/AsyncDisplayKit/Source/Layout/ASDimensionInternal.mm b/submodules/AsyncDisplayKit/Source/ASDimensionInternal.mm
similarity index 100%
rename from submodules/AsyncDisplayKit/Source/Layout/ASDimensionInternal.mm
rename to submodules/AsyncDisplayKit/Source/ASDimensionInternal.mm
diff --git a/submodules/AsyncDisplayKit/Source/Private/ASDispatch.h b/submodules/AsyncDisplayKit/Source/ASDispatch.h
similarity index 100%
rename from submodules/AsyncDisplayKit/Source/Private/ASDispatch.h
rename to submodules/AsyncDisplayKit/Source/ASDispatch.h
diff --git a/submodules/AsyncDisplayKit/Source/Private/ASDispatch.mm b/submodules/AsyncDisplayKit/Source/ASDispatch.mm
similarity index 98%
rename from submodules/AsyncDisplayKit/Source/Private/ASDispatch.mm
rename to submodules/AsyncDisplayKit/Source/ASDispatch.mm
index 769a9185d4..edc2feba46 100644
--- a/submodules/AsyncDisplayKit/Source/Private/ASDispatch.mm
+++ b/submodules/AsyncDisplayKit/Source/ASDispatch.mm
@@ -6,7 +6,7 @@
 //  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
 //
 
-#import <AsyncDisplayKit/ASDispatch.h>
+#import "ASDispatch.h"
 #import <AsyncDisplayKit/ASConfigurationInternal.h>
 
 
diff --git a/submodules/AsyncDisplayKit/Source/Base/ASDisplayNode+Ancestry.mm b/submodules/AsyncDisplayKit/Source/ASDisplayNode+Ancestry.mm
similarity index 97%
rename from submodules/AsyncDisplayKit/Source/Base/ASDisplayNode+Ancestry.mm
rename to submodules/AsyncDisplayKit/Source/ASDisplayNode+Ancestry.mm
index 7003064c70..ea1376ed54 100644
--- a/submodules/AsyncDisplayKit/Source/Base/ASDisplayNode+Ancestry.mm
+++ b/submodules/AsyncDisplayKit/Source/ASDisplayNode+Ancestry.mm
@@ -7,7 +7,7 @@
 //  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
 //
 
-#import "ASDisplayNode+Ancestry.h"
+#import <AsyncDisplayKit/ASDisplayNode+Ancestry.h>
 #import <AsyncDisplayKit/ASThread.h>
 #import <AsyncDisplayKit/ASDisplayNodeExtras.h>
 
diff --git a/submodules/AsyncDisplayKit/Source/Private/ASDisplayNode+AsyncDisplay.mm b/submodules/AsyncDisplayKit/Source/ASDisplayNode+AsyncDisplay.mm
similarity index 99%
rename from submodules/AsyncDisplayKit/Source/Private/ASDisplayNode+AsyncDisplay.mm
rename to submodules/AsyncDisplayKit/Source/ASDisplayNode+AsyncDisplay.mm
index 4efd2b0a79..068f5509a7 100644
--- a/submodules/AsyncDisplayKit/Source/Private/ASDisplayNode+AsyncDisplay.mm
+++ b/submodules/AsyncDisplayKit/Source/ASDisplayNode+AsyncDisplay.mm
@@ -11,11 +11,11 @@
 #import <AsyncDisplayKit/_ASAsyncTransaction.h>
 #import <AsyncDisplayKit/_ASDisplayLayer.h>
 #import <AsyncDisplayKit/ASAssert.h>
-#import <AsyncDisplayKit/ASDisplayNodeInternal.h>
+#import "ASDisplayNodeInternal.h"
 #import <AsyncDisplayKit/ASDisplayNode+FrameworkPrivate.h>
 #import <AsyncDisplayKit/ASGraphicsContext.h>
 #import <AsyncDisplayKit/ASInternalHelpers.h>
-#import <AsyncDisplayKit/ASSignpost.h>
+#import "ASSignpost.h"
 #import <AsyncDisplayKit/ASDisplayNodeExtras.h>
 
 using AS::MutexLocker;
diff --git a/submodules/AsyncDisplayKit/Source/ASDisplayNode+Convenience.mm b/submodules/AsyncDisplayKit/Source/ASDisplayNode+Convenience.mm
index 42ae4e4a72..29d761be5a 100644
--- a/submodules/AsyncDisplayKit/Source/ASDisplayNode+Convenience.mm
+++ b/submodules/AsyncDisplayKit/Source/ASDisplayNode+Convenience.mm
@@ -7,12 +7,12 @@
 //  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
 //
 
-#import "ASDisplayNode+Convenience.h"
+#import <AsyncDisplayKit/ASDisplayNode+Convenience.h>
 
 #import <UIKit/UIViewController.h>
 
 #import <AsyncDisplayKit/ASDisplayNodeExtras.h>
-#import <AsyncDisplayKit/ASResponderChainEnumerator.h>
+#import "ASResponderChainEnumerator.h"
 
 @implementation ASDisplayNode (Convenience)
 
diff --git a/submodules/AsyncDisplayKit/Source/ASDisplayNode+Layout.mm b/submodules/AsyncDisplayKit/Source/ASDisplayNode+Layout.mm
index b7956541b4..32934a599c 100644
--- a/submodules/AsyncDisplayKit/Source/ASDisplayNode+Layout.mm
+++ b/submodules/AsyncDisplayKit/Source/ASDisplayNode+Layout.mm
@@ -10,15 +10,12 @@
 #import <AsyncDisplayKit/ASAvailability.h>
 #import <AsyncDisplayKit/ASCollections.h>
 #import <AsyncDisplayKit/ASDisplayNodeExtras.h>
-#import <AsyncDisplayKit/ASDisplayNodeInternal.h>
+#import "ASDisplayNodeInternal.h"
 #import <AsyncDisplayKit/ASDisplayNode+FrameworkPrivate.h>
 #import <AsyncDisplayKit/ASDisplayNode+Subclasses.h>
 #import <AsyncDisplayKit/ASInternalHelpers.h>
 #import <AsyncDisplayKit/ASLayout.h>
-#import <AsyncDisplayKit/ASLayoutElementStylePrivate.h>
-#import <AsyncDisplayKit/ASLog.h>
-#import <AsyncDisplayKit/ASNodeController+Beta.h>
-#import <AsyncDisplayKit/ASDisplayNode+Yoga.h>
+#import "ASLayoutElementStylePrivate.h"
 #import <AsyncDisplayKit/NSArray+Diffing.h>
 
 using AS::MutexLocker;
@@ -97,7 +94,6 @@ using AS::MutexLocker;
     layout = [self calculateLayoutThatFits:constrainedSize
                           restrictedToSize:self.style.size
                       relativeToParentSize:parentSize];
-    as_log_verbose(ASLayoutLog(), "Established pending layout for %@ in %s", self, sel_getName(_cmd));
     _pendingDisplayNodeLayout = ASDisplayNodeLayout(layout, constrainedSize, parentSize,version);
     ASDisplayNodeAssertNotNil(layout, @"-[ASDisplayNode layoutThatFits:parentSize:] newly calculated layout should not be nil! %@", self);
   }
@@ -230,8 +226,6 @@ ASLayoutElementStyleExtensibilityForwarding
   ASDisplayNodeAssertThreadAffinity(self);
   ASAssertUnlocked(__instanceLock__);
 
-  as_activity_create_for_scope("Set needs layout from above");
-
   // Mark the node for layout in the next layout pass
   [self setNeedsLayout];
   
@@ -346,13 +340,6 @@ ASLayoutElementStyleExtensibilityForwarding
   if (!pendingLayoutIsPreferred && calculatedLayoutIsReusable) {
     return;
   }
-
-  as_activity_create_for_scope("Update node layout for current bounds");
-  as_log_verbose(ASLayoutLog(), "Node %@, bounds size %@, calculatedSize %@, calculatedIsDirty %d",
-                 self,
-                 NSStringFromCGSize(boundsSizeForLayout),
-                 NSStringFromCGSize(_calculatedDisplayNodeLayout.layout.size),
-                 _calculatedDisplayNodeLayout.version < _layoutVersion);
   // _calculatedDisplayNodeLayout is not reusable we need to transition to a new one
   [self cancelLayoutTransition];
 
@@ -372,18 +359,13 @@ ASLayoutElementStyleExtensibilityForwarding
   // If our bounds size is different than it, or invalid, recalculate.  Use #define to avoid nullptr->
   BOOL pendingLayoutApplicable = NO;
   if (nextLayout.layout == nil) {
-    as_log_verbose(ASLayoutLog(), "No pending layout.");
   } else if (!nextLayout.isValid(_layoutVersion)) {
-    as_log_verbose(ASLayoutLog(), "Pending layout is stale.");
   } else if (layoutSizeDifferentFromBounds) {
-    as_log_verbose(ASLayoutLog(), "Pending layout size %@ doesn't match bounds size.", NSStringFromCGSize(nextLayout.layout.size));
   } else {
-    as_log_verbose(ASLayoutLog(), "Using pending layout %@.", nextLayout.layout);
     pendingLayoutApplicable = YES;
   }
 
   if (!pendingLayoutApplicable) {
-    as_log_verbose(ASLayoutLog(), "Measuring with previous constrained size.");
     // Use the last known constrainedSize passed from a parent during layout (if never, use bounds).
     NSUInteger version = _layoutVersion;
     ASSizeRange constrainedSize = [self _locked_constrainedSizeForLayoutPass];
@@ -404,7 +386,6 @@ ASLayoutElementStyleExtensibilityForwarding
   // This can occur for either pre-calculated or newly-calculated layouts.
   if (nextLayout.requestedLayoutFromAbove == NO
       && CGSizeEqualToSize(boundsSizeForLayout, nextLayout.layout.size) == NO) {
-    as_log_verbose(ASLayoutLog(), "Layout size doesn't match bounds size. Requesting layout from above.");
     // The layout that we have specifies that this node (self) would like to be a different size
     // than it currently is.  Because that size has been computed within the constrainedSize, we
     // expect that calling setNeedsLayoutFromAbove will result in our parent resizing us to this.
@@ -579,13 +560,10 @@ ASLayoutElementStyleExtensibilityForwarding
                 measurementCompletion:(void(^)())completion
 {
   ASDisplayNodeAssertMainThread();
-  as_activity_create_for_scope("Transition node layout");
-  as_log_debug(ASLayoutLog(), "Transition layout for %@ sizeRange %@ anim %d asyncMeasure %d", self, NSStringFromASSizeRange(constrainedSize), animated, shouldMeasureAsync);
   
   if (constrainedSize.max.width <= 0.0 || constrainedSize.max.height <= 0.0) {
     // Using CGSizeZero for the sizeRange can cause negative values in client layout code.
     // Most likely called transitionLayout: without providing a size, before first layout pass.
-    as_log_verbose(ASLayoutLog(), "Ignoring transition due to bad size range.");
     return;
   }
     
@@ -613,12 +591,10 @@ ASLayoutElementStyleExtensibilityForwarding
 
   // Every new layout transition has a transition id associated to check in subsequent transitions for cancelling
   int32_t transitionID = [self _startNewTransition];
-  as_log_verbose(ASLayoutLog(), "Transition ID is %d", transitionID);
   // NOTE: This block captures self. It's cheaper than hitting the weak table.
   asdisplaynode_iscancelled_block_t isCancelled = ^{
     BOOL result = (_transitionID != transitionID);
     if (result) {
-      as_log_verbose(ASLayoutLog(), "Transition %d canceled, superseded by %d", transitionID, _transitionID.load());
     }
     return result;
   };
@@ -666,7 +642,6 @@ ASLayoutElementStyleExtensibilityForwarding
       if (isCancelled()) {
         return;
       }
-      as_activity_create_for_scope("Commit layout transition");
       ASLayoutTransition *pendingLayoutTransition;
       _ASTransitionContext *pendingLayoutTransitionContext;
       {
@@ -694,7 +669,6 @@ ASLayoutElementStyleExtensibilityForwarding
       
       // Apply complete layout transitions for all subnodes
       {
-        as_activity_create_for_scope("Complete pending layout transitions for subtree");
         ASDisplayNodePerformBlockOnEverySubnode(self, NO, ^(ASDisplayNode * _Nonnull node) {
           [node _completePendingLayoutTransition];
           node.hierarchyState &= (~ASHierarchyStateLayoutPending);
@@ -713,7 +687,6 @@ ASLayoutElementStyleExtensibilityForwarding
       
       // Kick off animating the layout transition
       {
-        as_activity_create_for_scope("Animate layout transition");
         [self animateLayoutTransition:pendingLayoutTransitionContext];
       }
       
diff --git a/submodules/AsyncDisplayKit/Source/ASDisplayNode+LayoutSpec.mm b/submodules/AsyncDisplayKit/Source/ASDisplayNode+LayoutSpec.mm
index d79073ffdd..132bc666f8 100644
--- a/submodules/AsyncDisplayKit/Source/ASDisplayNode+LayoutSpec.mm
+++ b/submodules/AsyncDisplayKit/Source/ASDisplayNode+LayoutSpec.mm
@@ -9,13 +9,12 @@
 #import <UIKit/UIKit.h>
 #import <AsyncDisplayKit/ASAvailability.h>
 
-#import <AsyncDisplayKit/_ASScopeTimer.h>
-#import <AsyncDisplayKit/ASDisplayNodeInternal.h>
+#import "_ASScopeTimer.h"
+#import "ASDisplayNodeInternal.h"
 #import <AsyncDisplayKit/ASDisplayNode+Subclasses.h>
 #import <AsyncDisplayKit/ASLayout.h>
-#import <AsyncDisplayKit/ASLayoutSpec+Subclasses.h>
-#import <AsyncDisplayKit/ASLayoutSpecPrivate.h>
-#import <AsyncDisplayKit/ASLog.h>
+#import "ASLayoutSpec+Subclasses.h"
+#import "ASLayoutSpecPrivate.h"
 #import <AsyncDisplayKit/ASThread.h>
 
 
diff --git a/submodules/AsyncDisplayKit/Source/Private/ASDisplayNode+UIViewBridge.mm b/submodules/AsyncDisplayKit/Source/ASDisplayNode+UIViewBridge.mm
similarity index 99%
rename from submodules/AsyncDisplayKit/Source/Private/ASDisplayNode+UIViewBridge.mm
rename to submodules/AsyncDisplayKit/Source/ASDisplayNode+UIViewBridge.mm
index a6d60a7748..084800a1ed 100644
--- a/submodules/AsyncDisplayKit/Source/Private/ASDisplayNode+UIViewBridge.mm
+++ b/submodules/AsyncDisplayKit/Source/ASDisplayNode+UIViewBridge.mm
@@ -8,12 +8,12 @@
 //
 
 #import <AsyncDisplayKit/_ASCoreAnimationExtras.h>
-#import <AsyncDisplayKit/_ASPendingState.h>
+#import "_ASPendingState.h"
 #import <AsyncDisplayKit/ASInternalHelpers.h>
-#import <AsyncDisplayKit/ASDisplayNodeInternal.h>
+#import "ASDisplayNodeInternal.h"
 #import <AsyncDisplayKit/ASDisplayNode+Subclasses.h>
 #import <AsyncDisplayKit/ASDisplayNode+FrameworkPrivate.h>
-#import <AsyncDisplayKit/ASPendingStateController.h>
+#import "ASPendingStateController.h"
 
 /**
  * The following macros are conveniences to help in the common tasks related to the bridging that ASDisplayNode does to UIView and CALayer.
diff --git a/submodules/AsyncDisplayKit/Source/ASDisplayNode+Yoga.h b/submodules/AsyncDisplayKit/Source/ASDisplayNode+Yoga.h
deleted file mode 100644
index 93cbf7a7c1..0000000000
--- a/submodules/AsyncDisplayKit/Source/ASDisplayNode+Yoga.h
+++ /dev/null
@@ -1,102 +0,0 @@
-//
-//  ASDisplayNode+Yoga.h
-//  Texture
-//
-//  Copyright (c) Pinterest, Inc.  All rights reserved.
-//  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
-//
-
-#import <AsyncDisplayKit/ASAvailability.h>
-
-#if YOGA
-
-NS_ASSUME_NONNULL_BEGIN
-
-@class ASLayout;
-
-AS_EXTERN void ASDisplayNodePerformBlockOnEveryYogaChild(ASDisplayNode * _Nullable node, void(^block)(ASDisplayNode *node));
-
-@interface ASDisplayNode (Yoga)
-
-@property (copy) NSArray *yogaChildren;
-
-- (void)addYogaChild:(ASDisplayNode *)child;
-- (void)removeYogaChild:(ASDisplayNode *)child;
-- (void)insertYogaChild:(ASDisplayNode *)child atIndex:(NSUInteger)index;
-
-- (void)semanticContentAttributeDidChange:(UISemanticContentAttribute)attribute;
-
-@property BOOL yogaLayoutInProgress;
-// TODO: Make this atomic (lock).
-@property (nullable, nonatomic) ASLayout *yogaCalculatedLayout;
-
-// Will walk up the Yoga tree and returns the root node
-- (ASDisplayNode *)yogaRoot;
-
-
-@end
-
-@interface ASDisplayNode (YogaLocking)
-/**
- * @discussion Attempts(spinning) to lock all node up to root node when yoga is enabled.
- * This will lock self when yoga is not enabled;
- */
-- (ASLockSet)lockToRootIfNeededForLayout;
-
-@end
-
-
-// These methods are intended to be used internally to Texture, and should not be called directly.
-@interface ASDisplayNode (YogaInternal)
-
-/// For internal usage only
-- (BOOL)shouldHaveYogaMeasureFunc;
-/// For internal usage only
-- (ASLayout *)calculateLayoutYoga:(ASSizeRange)constrainedSize;
-/// For internal usage only
-- (void)calculateLayoutFromYogaRoot:(ASSizeRange)rootConstrainedSize;
-/// For internal usage only
-- (void)invalidateCalculatedYogaLayout;
-/**
- * @discussion return true only when yoga enabled and the node is in yoga tree and the node is
- * not leaf that implemented measure function.
- */
-- (BOOL)locked_shouldLayoutFromYogaRoot;
-
-@end
-
-@interface ASDisplayNode (YogaDebugging)
-
-- (NSString *)yogaTreeDescription;
-
-@end
-
-@interface ASLayoutElementStyle (Yoga)
-
-- (YGNodeRef)yogaNodeCreateIfNeeded;
-- (void)destroyYogaNode;
-
-@property (readonly) YGNodeRef yogaNode;
-
-@property ASStackLayoutDirection flexDirection;
-@property YGDirection direction;
-@property ASStackLayoutJustifyContent justifyContent;
-@property ASStackLayoutAlignItems alignItems;
-@property YGPositionType positionType;
-@property ASEdgeInsets position;
-@property ASEdgeInsets margin;
-@property ASEdgeInsets padding;
-@property ASEdgeInsets border;
-@property CGFloat aspectRatio;
-@property YGWrap flexWrap;
-
-@end
-
-NS_ASSUME_NONNULL_END
-
-// When Yoga is enabled, there are several points where we want to lock the tree to the root but otherwise (without Yoga)
-// will want to simply lock self.
-#define ASScopedLockSelfOrToRoot() ASScopedLockSet lockSet = [self lockToRootIfNeededForLayout]
-#else
-#define ASScopedLockSelfOrToRoot() ASLockScopeSelf()
-#endif
diff --git a/submodules/AsyncDisplayKit/Source/ASDisplayNode+Yoga.mm b/submodules/AsyncDisplayKit/Source/ASDisplayNode+Yoga.mm
deleted file mode 100644
index dcecda7279..0000000000
--- a/submodules/AsyncDisplayKit/Source/ASDisplayNode+Yoga.mm
+++ /dev/null
@@ -1,472 +0,0 @@
-//
-//  ASDisplayNode+Yoga.mm
-//  Texture
-//
-//  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.
-//  Changes after 4/13/2017 are: Copyright (c) Pinterest, Inc.  All rights reserved.
-//  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
-//
-
-#import <AsyncDisplayKit/ASAvailability.h>
-
-#if YOGA /* YOGA */
-
-#import <AsyncDisplayKit/_ASDisplayViewAccessiblity.h>
-#import <AsyncDisplayKit/ASYogaUtilities.h>
-#import <AsyncDisplayKit/ASCollections.h>
-#import <AsyncDisplayKit/ASDisplayNode+Beta.h>
-#import <AsyncDisplayKit/ASDimension.h>
-#import <AsyncDisplayKit/ASDisplayNode+FrameworkPrivate.h>
-#import <AsyncDisplayKit/ASDisplayNode+Subclasses.h>
-#import <AsyncDisplayKit/ASDisplayNodeInternal.h>
-#import <AsyncDisplayKit/ASLayout.h>
-#import <AsyncDisplayKit/ASLayoutElementStylePrivate.h>
-#import <AsyncDisplayKit/ASNodeController+Beta.h>
-
-#import <AsyncDisplayKit/ASDisplayNode+LayoutSpec.h>
-
-#define YOGA_LAYOUT_LOGGING 0
-
-#pragma mark - ASDisplayNode+Yoga
-
-@interface ASDisplayNode (YogaPrivate)
-@property (nonatomic, weak) ASDisplayNode *yogaParent;
-- (ASSizeRange)_locked_constrainedSizeForLayoutPass;
-@end
-
-@implementation ASDisplayNode (Yoga)
-
-- (ASDisplayNode *)yogaRoot
-{
-  ASDisplayNode *yogaRoot = self;
-  ASDisplayNode *yogaParent = nil;
-  while ((yogaParent = yogaRoot.yogaParent)) {
-    yogaRoot = yogaParent;
-  }
-  return yogaRoot;
-}
-
-- (void)setYogaChildren:(NSArray *)yogaChildren
-{
-  ASScopedLockSelfOrToRoot();
-  for (ASDisplayNode *child in [_yogaChildren copy]) {
-    // Make sure to un-associate the YGNodeRef tree before replacing _yogaChildren
-    // If this becomes a performance bottleneck, it can be optimized by not doing the NSArray removals here.
-    [self _locked_removeYogaChild:child];
-  }
-  _yogaChildren = nil;
-  for (ASDisplayNode *child in yogaChildren) {
-    [self _locked_addYogaChild:child];
-  }
-}
-
-- (NSArray *)yogaChildren
-{
-  ASLockScope(self.yogaRoot);
-  return [_yogaChildren copy] ?: @[];
-}
-
-- (void)addYogaChild:(ASDisplayNode *)child
-{
-  ASScopedLockSelfOrToRoot();
-  [self _locked_addYogaChild:child];
-}
-
-- (void)_locked_addYogaChild:(ASDisplayNode *)child
-{
-  [self insertYogaChild:child atIndex:_yogaChildren.count];
-}
-
-- (void)removeYogaChild:(ASDisplayNode *)child
-{
-  ASScopedLockSelfOrToRoot();
-  [self _locked_removeYogaChild:child];
-}
-
-- (void)_locked_removeYogaChild:(ASDisplayNode *)child
-{
-  if (child == nil) {
-    return;
-  }
-
-  [_yogaChildren removeObjectIdenticalTo:child];
-
-  // YGNodeRef removal is done in setParent:
-  child.yogaParent = nil;
-}
-
-- (void)insertYogaChild:(ASDisplayNode *)child atIndex:(NSUInteger)index
-{
-  ASScopedLockSelfOrToRoot();
-  [self _locked_insertYogaChild:child atIndex:index];
-}
-
-- (void)_locked_insertYogaChild:(ASDisplayNode *)child atIndex:(NSUInteger)index
-{
-  if (child == nil) {
-    return;
-  }
-  if (_yogaChildren == nil) {
-    _yogaChildren = [[NSMutableArray alloc] init];
-  }
-
-  // Clean up state in case this child had another parent.
-  [self _locked_removeYogaChild:child];
-
-  [_yogaChildren insertObject:child atIndex:index];
-
-  // YGNodeRef insertion is done in setParent:
-  child.yogaParent = self;
-}
-
-#pragma mark - Subclass Hooks
-
-- (void)semanticContentAttributeDidChange:(UISemanticContentAttribute)attribute
-{
-  UIUserInterfaceLayoutDirection layoutDirection =
-  [UIView userInterfaceLayoutDirectionForSemanticContentAttribute:attribute];
-  self.style.direction = (layoutDirection == UIUserInterfaceLayoutDirectionLeftToRight
-                          ? YGDirectionLTR : YGDirectionRTL);
-}
-
-- (void)setYogaParent:(ASDisplayNode *)yogaParent
-{
-  ASLockScopeSelf();
-  if (_yogaParent == yogaParent) {
-    return;
-  }
-
-  YGNodeRef yogaNode = [self.style yogaNodeCreateIfNeeded];
-  YGNodeRef oldParentRef = YGNodeGetParent(yogaNode);
-  if (oldParentRef != NULL) {
-    YGNodeRemoveChild(oldParentRef, yogaNode);
-  }
-
-  _yogaParent = yogaParent;
-  if (yogaParent) {
-    YGNodeRef newParentRef = [yogaParent.style yogaNodeCreateIfNeeded];
-    YGNodeInsertChild(newParentRef, yogaNode, YGNodeGetChildCount(newParentRef));
-  }
-}
-
-- (ASDisplayNode *)yogaParent
-{
-  return _yogaParent;
-}
-
-- (void)setYogaCalculatedLayout:(ASLayout *)yogaCalculatedLayout
-{
-  _yogaCalculatedLayout = yogaCalculatedLayout;
-}
-
-- (ASLayout *)yogaCalculatedLayout
-{
-  return _yogaCalculatedLayout;
-}
-
-- (void)setYogaLayoutInProgress:(BOOL)yogaLayoutInProgress
-{
-  setFlag(YogaLayoutInProgress, yogaLayoutInProgress);
-  [self updateYogaMeasureFuncIfNeeded];
-}
-
-- (BOOL)yogaLayoutInProgress
-{
-  return checkFlag(YogaLayoutInProgress);
-}
-
-- (ASLayout *)layoutForYogaNode
-{
-  YGNodeRef yogaNode = self.style.yogaNode;
-
-  CGSize  size     = CGSizeMake(YGNodeLayoutGetWidth(yogaNode), YGNodeLayoutGetHeight(yogaNode));
-  CGPoint position = CGPointMake(YGNodeLayoutGetLeft(yogaNode), YGNodeLayoutGetTop(yogaNode));
-
-  if (!ASIsCGSizeValidForSize(size)) {
-    size = CGSizeZero;
-  }
-
-  if (!ASIsCGPositionValidForLayout(position)) {
-    position = CGPointZero;
-  }
-  return [ASLayout layoutWithLayoutElement:self size:size position:position sublayouts:nil];
-}
-
-- (void)setupYogaCalculatedLayout
-{
-  ASScopedLockSelfOrToRoot();
-
-  YGNodeRef yogaNode = self.style.yogaNode;
-  uint32_t childCount = YGNodeGetChildCount(yogaNode);
-  ASDisplayNodeAssert(childCount == _yogaChildren.count,
-                      @"Yoga tree should always be in sync with .yogaNodes array! %@",
-                      _yogaChildren);
-
-  ASLayout *rawSublayouts[childCount];
-  int i = 0;
-  for (ASDisplayNode *subnode in _yogaChildren) {
-    rawSublayouts[i++] = [subnode layoutForYogaNode];
-  }
-  const auto sublayouts = [NSArray<ASLayout *> arrayByTransferring:rawSublayouts count:childCount];
-
-  // The layout for self should have position CGPointNull, but include the calculated size.
-  CGSize size = CGSizeMake(YGNodeLayoutGetWidth(yogaNode), YGNodeLayoutGetHeight(yogaNode));
-  if (!ASIsCGSizeValidForSize(size)) {
-    size = CGSizeZero;
-  }
-  ASLayout *layout = [ASLayout layoutWithLayoutElement:self size:size sublayouts:sublayouts];
-
-#if ASDISPLAYNODE_ASSERTIONS_ENABLED
-  // Assert that the sublayout is already flattened.
-  for (ASLayout *sublayout in layout.sublayouts) {
-    if (sublayout.sublayouts.count > 0 || ASDynamicCast(sublayout.layoutElement, ASDisplayNode) == nil) {
-      ASDisplayNodeAssert(NO, @"Yoga sublayout is not flattened! %@, %@", self, sublayout);
-    }
-  }
-#endif
-
-  // Because this layout won't go through the rest of the logic in calculateLayoutThatFits:, flatten it now.
-  layout = [layout filteredNodeLayoutTree];
-
-  if ([self.yogaCalculatedLayout isEqual:layout] == NO) {
-    self.yogaCalculatedLayout = layout;
-  } else {
-    layout = self.yogaCalculatedLayout;
-    ASYogaLog("-setupYogaCalculatedLayout: applying identical ASLayout: %@", layout);
-  }
-
-  // Setup _pendingDisplayNodeLayout to reference the Yoga-calculated ASLayout, *unless* we are a leaf node.
-  // Leaf yoga nodes may have their own .sublayouts, if they use a layout spec (such as ASButtonNode).
-  // Their _pending variable is set after passing the Yoga checks at the start of -calculateLayoutThatFits:
-
-  // For other Yoga nodes, there is no code that will set _pending unless we do it here. Why does it need to be set?
-  // When CALayer triggers the -[ASDisplayNode __layout] call, we will check if our current _pending layout
-  // has a size which matches our current bounds size. If it does, that layout will be used without recomputing it.
-
-  // NOTE: Yoga does not make the constrainedSize available to intermediate nodes in the tree (e.g. not root or leaves).
-  // Although the size range provided here is not accurate, this will only affect caching of calls to layoutThatFits:
-  // These calls will behave as if they are not cached, starting a new Yoga layout pass, but this will tap into Yoga's
-  // own internal cache.
-
-  if ([self shouldHaveYogaMeasureFunc] == NO) {
-    YGNodeRef parentNode = YGNodeGetParent(yogaNode);
-    CGSize parentSize = CGSizeZero;
-    if (parentNode) {
-      parentSize.width = YGNodeLayoutGetWidth(parentNode);
-      parentSize.height = YGNodeLayoutGetHeight(parentNode);
-    }
-    // For the root node in a Yoga tree, make sure to preserve the constrainedSize originally provided.
-    // This will be used for all relayouts triggered by children, since they escalate to root.
-    ASSizeRange range = parentNode ? ASSizeRangeUnconstrained : self.constrainedSizeForCalculatedLayout;
-    _pendingDisplayNodeLayout = ASDisplayNodeLayout(layout, range, parentSize, _layoutVersion);
-  }
-}
-
-- (BOOL)shouldHaveYogaMeasureFunc
-{
-  ASLockScopeSelf();
-  // Size calculation via calculateSizeThatFits: or layoutSpecThatFits:
-  // For these nodes, we assume they may need custom Baseline calculation too.
-  // This will be used for ASTextNode, as well as any other node that has no Yoga children
-  BOOL isLeafNode = (_yogaChildren.count == 0);
-  BOOL definesCustomLayout = [self implementsLayoutMethod];
-  return (isLeafNode && definesCustomLayout);
-}
-
-- (void)updateYogaMeasureFuncIfNeeded
-{
-  // We set the measure func only during layout. Otherwise, a cycle is created:
-  // The YGNodeRef Context will retain the ASDisplayNode, which retains the style, which owns the YGNodeRef.
-  BOOL shouldHaveMeasureFunc = ([self shouldHaveYogaMeasureFunc] && checkFlag(YogaLayoutInProgress));
-
-  ASLayoutElementYogaUpdateMeasureFunc(self.style.yogaNode, shouldHaveMeasureFunc ? self : nil);
-}
-
-- (void)invalidateCalculatedYogaLayout
-{
-  ASLockScopeSelf();
-  YGNodeRef yogaNode = self.style.yogaNode;
-  if (yogaNode && [self shouldHaveYogaMeasureFunc]) {
-    // Yoga internally asserts that MarkDirty() may only be called on nodes with a measurement function.
-    BOOL needsTemporaryMeasureFunc = (YGNodeGetMeasureFunc(yogaNode) == NULL);
-    if (needsTemporaryMeasureFunc) {
-      ASDisplayNodeAssert(self.yogaLayoutInProgress == NO,
-                          @"shouldHaveYogaMeasureFunc == YES, and inside a layout pass, but no measure func pointer! %@", self);
-      YGNodeSetMeasureFunc(yogaNode, &ASLayoutElementYogaMeasureFunc);
-    }
-    YGNodeMarkDirty(yogaNode);
-    if (needsTemporaryMeasureFunc) {
-      YGNodeSetMeasureFunc(yogaNode, NULL);
-    }
-  }
-  self.yogaCalculatedLayout = nil;
-}
-
-- (ASLayout *)calculateLayoutYoga:(ASSizeRange)constrainedSize
-{
-  AS::UniqueLock l(__instanceLock__);
-
-  // There are several cases where Yoga could arrive here:
-  // - This node is not in a Yoga tree: it has neither a yogaParent nor yogaChildren.
-  // - This node is a Yoga tree root: it has no yogaParent, but has yogaChildren.
-  // - This node is a Yoga tree node: it has both a yogaParent and yogaChildren.
-  // - This node is a Yoga tree leaf: it has a yogaParent, but no yogaChidlren.
-  if ([self locked_shouldLayoutFromYogaRoot]) {
-    // If we're a yoga root, tree node, or leaf with no measure func (e.g. spacer), then
-    // initiate a new Yoga calculation pass from root.
-    as_activity_create_for_scope("Yoga layout calculation");
-    if (self.yogaLayoutInProgress == NO) {
-      ASYogaLog("Calculating yoga layout from root %@, %@", self,
-              NSStringFromASSizeRange(constrainedSize));
-      [self calculateLayoutFromYogaRoot:constrainedSize];
-    } else {
-      ASYogaLog("Reusing existing yoga layout %@", _yogaCalculatedLayout);
-    }
-    ASDisplayNodeAssert(_yogaCalculatedLayout,
-            @"Yoga node should have a non-nil layout at this stage: %@", self);
-    return _yogaCalculatedLayout;
-  } else {
-    // If we're a yoga leaf node with custom measurement function, proceed with normal layout so
-    // layoutSpecs can run (e.g. ASButtonNode).
-    ASYogaLog("PROCEEDING past Yoga check to calculate ASLayout for: %@", self);
-  }
-
-  // Delegate to layout spec layout for nodes that do not support Yoga
-  return [self calculateLayoutLayoutSpec:constrainedSize];
-}
-
-- (void)calculateLayoutFromYogaRoot:(ASSizeRange)rootConstrainedSize
-{
-  ASScopedLockSet lockSet = [self lockToRootIfNeededForLayout];
-  ASDisplayNode *yogaRoot = self.yogaRoot;
-
-  if (self != yogaRoot) {
-    ASYogaLog("ESCALATING to Yoga root: %@", self);
-    // TODO(appleguy): Consider how to get the constrainedSize for the yogaRoot when escalating manually.
-    [yogaRoot calculateLayoutFromYogaRoot:ASSizeRangeUnconstrained];
-    return;
-  }
-
-  if (ASSizeRangeEqualToSizeRange(rootConstrainedSize, ASSizeRangeUnconstrained)) {
-    rootConstrainedSize = [self _locked_constrainedSizeForLayoutPass];
-  }
-
-  [self willCalculateLayout:rootConstrainedSize];
-  [self enumerateInterfaceStateDelegates:^(id<ASInterfaceStateDelegate>  _Nonnull delegate) {
-    if ([delegate respondsToSelector:@selector(nodeWillCalculateLayout:)]) {
-      [delegate nodeWillCalculateLayout:rootConstrainedSize];
-    }
-  }];
-
-  // Prepare all children for the layout pass with the current Yoga tree configuration.
-  ASDisplayNodePerformBlockOnEveryYogaChild(self, ^(ASDisplayNode *_Nonnull node) {
-    node.yogaLayoutInProgress = YES;
-    ASDisplayNode *yogaParent = node.yogaParent; 
-    if (yogaParent) {
-      node.style.parentAlignStyle = yogaParent.style.alignItems;
-    } else {
-      node.style.parentAlignStyle = ASStackLayoutAlignItemsNotSet;
-    };
-  });
-
-  ASYogaLog("CALCULATING at Yoga root with constraint = {%@, %@}: %@",
-            NSStringFromCGSize(rootConstrainedSize.min), NSStringFromCGSize(rootConstrainedSize.max), self);
-
-  YGNodeRef rootYogaNode = self.style.yogaNode;
-
-  // Apply the constrainedSize as a base, known frame of reference.
-  // If the root node also has style.*Size set, these will be overridden below.
-  // YGNodeCalculateLayout currently doesn't offer the ability to pass a minimum size (max is passed there).
-
-  // TODO(appleguy): Reconcile the self.style.*Size properties with rootConstrainedSize
-  YGNodeStyleSetMinWidth (rootYogaNode, yogaFloatForCGFloat(rootConstrainedSize.min.width));
-  YGNodeStyleSetMinHeight(rootYogaNode, yogaFloatForCGFloat(rootConstrainedSize.min.height));
-
-  // It is crucial to use yogaFloat... to convert CGFLOAT_MAX into YGUndefined here.
-  YGNodeCalculateLayout(rootYogaNode,
-                        yogaFloatForCGFloat(rootConstrainedSize.max.width),
-                        yogaFloatForCGFloat(rootConstrainedSize.max.height),
-                        YGDirectionInherit);
-
-  // Reset accessible elements, since layout may have changed.
-  ASPerformBlockOnMainThread(^{
-    if (self.nodeLoaded && !self.isSynchronous) {
-      [(_ASDisplayView *)self.view setAccessibilityElements:nil];
-    }
-  });
-
-  ASDisplayNodePerformBlockOnEveryYogaChild(self, ^(ASDisplayNode * _Nonnull node) {
-    [node setupYogaCalculatedLayout];
-    node.yogaLayoutInProgress = NO;
-  });
-
-#if YOGA_LAYOUT_LOGGING /* YOGA_LAYOUT_LOGGING */
-  // Concurrent layouts will interleave the NSLog messages unless we serialize.
-  // Use @synchornize rather than trampolining to the main thread so the tree state isn't changed.
-  @synchronized ([ASDisplayNode class]) {
-    NSLog(@"****************************************************************************");
-    NSLog(@"******************** STARTING YOGA -> ASLAYOUT CREATION ********************");
-    NSLog(@"****************************************************************************");
-    ASDisplayNodePerformBlockOnEveryYogaChild(self, ^(ASDisplayNode * _Nonnull node) {
-      NSLog(@"node = %@", node);
-      YGNodePrint(node.style.yogaNode, (YGPrintOptions)(YGPrintOptionsStyle | YGPrintOptionsLayout));
-      NSCAssert(ASIsCGSizeValidForSize(node.yogaCalculatedLayout.size), @"Yoga layout returned an invalid size");
-      NSLog(@" "); // Newline
-    });
-  }
-#endif /* YOGA_LAYOUT_LOGGING */
-}
-
-@end
-
-#pragma mark - ASDisplayNode (YogaLocking)
-
-@implementation ASDisplayNode (YogaLocking)
-
-- (ASLockSet)lockToRootIfNeededForLayout {
-  ASLockSet lockSet = ASLockSequence(^BOOL(ASAddLockBlock addLock) {
-    if (!addLock(self)) {
-      return NO;
-    }
-#if YOGA
-    if (![self locked_shouldLayoutFromYogaRoot]) {
-      return YES;
-    }
-    if (self.nodeController && !addLock(self.nodeController)) {
-      return NO;
-    }
-    ASDisplayNode *parent = _supernode;
-    while (parent) {
-      if (!addLock(parent)) {
-        return NO;
-      }
-      if (parent.nodeController && !addLock(parent.nodeController)) {
-        return NO;
-      }
-      parent = parent->_supernode;
-    }
-#endif
-    return true;
-  });
-  return lockSet;
-}
-
-@end
-
-@implementation ASDisplayNode (YogaDebugging)
-
-- (NSString *)yogaTreeDescription {
-  return [self _yogaTreeDescription:@""];
-}
-
-- (NSString *)_yogaTreeDescription:(NSString *)indent {
-  auto subtree = [NSMutableString stringWithFormat:@"%@%@\n", indent, self.description];
-  for (ASDisplayNode *n in self.yogaChildren) {
-    [subtree appendString:[n _yogaTreeDescription:[indent stringByAppendingString:@"| "]]];
-  }
-  return subtree;
-}
-
-@end
-
-#endif /* YOGA */
diff --git a/submodules/AsyncDisplayKit/Source/ASDisplayNode.mm b/submodules/AsyncDisplayKit/Source/ASDisplayNode.mm
index 8817bb8d8e..f17f390aff 100644
--- a/submodules/AsyncDisplayKit/Source/ASDisplayNode.mm
+++ b/submodules/AsyncDisplayKit/Source/ASDisplayNode.mm
@@ -7,47 +7,40 @@
 //  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
 //
 
-#import <AsyncDisplayKit/ASDisplayNodeInternal.h>
+#import "ASDisplayNodeInternal.h"
 
 #import <AsyncDisplayKit/ASDisplayNode+Ancestry.h>
 #import <AsyncDisplayKit/ASDisplayNode+Beta.h>
 #import <AsyncDisplayKit/ASDisplayNode+LayoutSpec.h>
-#import <AsyncDisplayKit/AsyncDisplayKit+Debug.h>
-#import <AsyncDisplayKit/ASLayoutSpec+Subclasses.h>
-#import <AsyncDisplayKit/ASCellNode+Internal.h>
+#import "ASLayoutSpec+Subclasses.h"
 
 #import <objc/runtime.h>
 #include <string>
 
 #import <AsyncDisplayKit/_ASAsyncTransaction.h>
-#import <AsyncDisplayKit/_ASAsyncTransactionContainer+Private.h>
+#import "_ASAsyncTransactionContainer+Private.h"
 #import <AsyncDisplayKit/_ASCoreAnimationExtras.h>
 #import <AsyncDisplayKit/_ASDisplayLayer.h>
 #import <AsyncDisplayKit/_ASDisplayView.h>
-#import <AsyncDisplayKit/_ASPendingState.h>
-#import <AsyncDisplayKit/_ASScopeTimer.h>
+#import "_ASPendingState.h"
+#import "_ASScopeTimer.h"
 #import <AsyncDisplayKit/ASDimension.h>
 #import <AsyncDisplayKit/ASDisplayNodeExtras.h>
-#import <AsyncDisplayKit/ASDisplayNodeInternal.h>
-#import <AsyncDisplayKit/ASDisplayNodeCornerLayerDelegate.h>
 #import <AsyncDisplayKit/ASDisplayNode+FrameworkPrivate.h>
 #import <AsyncDisplayKit/ASDisplayNode+InterfaceState.h>
 #import <AsyncDisplayKit/ASDisplayNode+Subclasses.h>
 #import <AsyncDisplayKit/ASEqualityHelpers.h>
 #import <AsyncDisplayKit/ASGraphicsContext.h>
 #import <AsyncDisplayKit/ASInternalHelpers.h>
-#import <AsyncDisplayKit/ASLayoutElementStylePrivate.h>
+#import "ASLayoutElementStylePrivate.h"
 #import <AsyncDisplayKit/ASLayoutSpec.h>
-#import <AsyncDisplayKit/ASLayoutSpecPrivate.h>
-#import <AsyncDisplayKit/ASLog.h>
+#import "ASLayoutSpecPrivate.h"
 #import <AsyncDisplayKit/ASMainThreadDeallocation.h>
-#import <AsyncDisplayKit/ASNodeController+Beta.h>
 #import <AsyncDisplayKit/ASRunLoopQueue.h>
-#import <AsyncDisplayKit/ASSignpost.h>
+#import "ASSignpost.h"
 #import <AsyncDisplayKit/ASTraitCollection.h>
-#import <AsyncDisplayKit/ASWeakProxy.h>
-#import <AsyncDisplayKit/ASResponderChainEnumerator.h>
-#import <AsyncDisplayKit/ASTipsController.h>
+#import "ASWeakProxy.h"
+#import "ASResponderChainEnumerator.h"
 
 // Conditionally time these scopes to our debug ivars (only exist in debug/profile builds)
 #if TIME_DISPLAYNODE_OPS
@@ -213,7 +206,7 @@ static ASDisplayNodeMethodOverrides GetASDisplayNodeMethodOverrides(Class c)
     // Subclasses should never override these. Use unused to prevent warnings
     __unused NSString *classString = NSStringFromClass(self);
     
-    ASDisplayNodeAssert(!ASDisplayNodeSubclassOverridesSelector(self, @selector(calculatedSize)), @"Subclass %@ must not override calculatedSize method.", classString);
+    //ASDisplayNodeAssert(!ASDisplayNodeSubclassOverridesSelector(self, @selector(calculatedSize)), @"Subclass %@ must not override calculatedSize method.", classString);
     ASDisplayNodeAssert(!ASDisplayNodeSubclassOverridesSelector(self, @selector(calculatedLayout)), @"Subclass %@ must not override calculatedLayout method.", classString);
     ASDisplayNodeAssert(!ASDisplayNodeSubclassOverridesSelector(self, @selector(layoutThatFits:)), @"Subclass %@ must not override layoutThatFits: method. Instead override calculateLayoutThatFits:.", classString);
     ASDisplayNodeAssert(!ASDisplayNodeSubclassOverridesSelector(self, @selector(layoutThatFits:parentSize:)), @"Subclass %@ must not override layoutThatFits:parentSize method. Instead override calculateLayoutThatFits:.", classString);
@@ -505,7 +498,9 @@ ASSynthesizeLockingMethodsWithMutex(__instanceLock__);
   ASAssertLocked(__instanceLock__);
   
   UIView *view = nil;
+  bool initializedWithCustomView = false;
   if (_viewBlock) {
+    initializedWithCustomView = true;
     view = _viewBlock();
     ASDisplayNodeAssertNotNil(view, @"View block returned nil");
     ASDisplayNodeAssert(![view isKindOfClass:[_ASDisplayView class]], @"View block should return a synchronously displayed view");
@@ -525,6 +520,19 @@ ASSynthesizeLockingMethodsWithMutex(__instanceLock__);
       _flags.canCallSetNeedsDisplayOfLayer = NO;
     }
       
+    if (initializedWithCustomView) {
+        static dispatch_once_t onceToken;
+        static IMP defaultMethod = NULL;
+        dispatch_once(&onceToken, ^{
+             defaultMethod = [[UIView class] instanceMethodForSelector:@selector(drawRect:)];
+        });
+        if ([[view class] instanceMethodForSelector:@selector(drawRect:)] != defaultMethod) {
+        } else {
+          _flags.canClearContentsOfLayer = NO;
+          _flags.canCallSetNeedsDisplayOfLayer = NO;
+        }
+    }
+      
     // UIActivityIndicator
     if ([_viewClass isSubclassOfClass:[UIActivityIndicatorView class]]
         || [_viewClass isSubclassOfClass:[UIVisualEffectView class]]) {
@@ -593,7 +601,6 @@ ASSynthesizeLockingMethodsWithMutex(__instanceLock__);
   ASDisplayNodeAssertMainThread();
   ASAssertUnlocked(__instanceLock__);
   ASDisplayNodeLogEvent(self, @"didLoad");
-  as_log_verbose(ASNodeLog(), "didLoad %@", self);
   TIME_SCOPED(_debugTimeForDidLoad);
   
   [self didLoad];
@@ -897,18 +904,6 @@ ASSynthesizeLockingMethodsWithMutex(__instanceLock__);
   _automaticallyRelayoutOnLayoutMarginsChanges = flag;
 }
 
-- (void)__setNodeController:(ASNodeController *)controller
-{
-  // See docs for why we don't lock.
-  if (controller.shouldInvertStrongReference) {
-    _strongNodeController = controller;
-    _weakNodeController = nil;
-  } else {
-    _weakNodeController = controller;
-    _strongNodeController = nil;
-  }
-}
-
 #pragma mark - UIResponder
 
 #define HANDLE_NODE_RESPONDER_METHOD(__sel) \
@@ -1060,7 +1055,6 @@ ASSynthesizeLockingMethodsWithMutex(__instanceLock__);
       // Performing layout on a zero-bounds view often results in frame calculations
       // with negative sizes after applying margins, which will cause
       // layoutThatFits: on subnodes to assert.
-      as_log_debug(OS_LOG_DISABLED, "Warning: No size given for node before node was trying to layout itself: %@. Please provide a frame for the node.", self);
       return;
     }
     
@@ -1070,8 +1064,6 @@ ASSynthesizeLockingMethodsWithMutex(__instanceLock__);
       return;
     }
 
-    as_activity_create_for_scope("-[ASDisplayNode __layout]");
-
     // This method will confirm that the layout is up to date (and update if needed).
     // Importantly, it will also APPLY the layout to all of our subnodes if (unless parent is transitioning).
     l.unlock();
@@ -1109,9 +1101,6 @@ ASSynthesizeLockingMethodsWithMutex(__instanceLock__);
                      restrictedToSize:(ASLayoutElementSize)size
                  relativeToParentSize:(CGSize)parentSize
 {
-  as_activity_scope_verbose(as_activity_create("Calculate node layout", AS_ACTIVITY_CURRENT, OS_ACTIVITY_FLAG_DEFAULT));
-  as_log_verbose(ASLayoutLog(), "Calculating layout for %@ sizeRange %@", self, NSStringFromASSizeRange(constrainedSize));
-
 #if AS_KDEBUG_ENABLE
   // We only want one calculateLayout signpost interval per thread.
   // Currently there is no fallback for profiling i386, since it's not useful.
@@ -1124,7 +1113,6 @@ ASSynthesizeLockingMethodsWithMutex(__instanceLock__);
   ASSizeRange styleAndParentSize = ASLayoutElementSizeResolve(self.style.size, parentSize);
   const ASSizeRange resolvedRange = ASSizeRangeIntersect(constrainedSize, styleAndParentSize);
   ASLayout *result = [self calculateLayoutThatFits:resolvedRange];
-  as_log_verbose(ASLayoutLog(), "Calculated layout %@", result);
 
 #if AS_KDEBUG_ENABLE
   if (--tls_callDepth == 0) {
@@ -1355,7 +1343,6 @@ NSString * const ASRenderingEngineDidDisplayNodesScheduledBeforeTimestamp = @"AS
     }];
   });
 
-  as_log_verbose(ASDisplayLog(), "%s %@", sel_getName(_cmd), node);
   [renderQueue enqueue:node];
 }
 
@@ -1580,29 +1567,6 @@ void recursivelyTriggerDisplayForLayer(CALayer *layer, BOOL shouldBlock)
 
 - (void)_setClipCornerLayersVisible:(BOOL)visible
 {
-  ASPerformBlockOnMainThread(^{
-    ASDisplayNodeAssertMainThread();
-    if (visible) {
-      for (int idx = 0; idx < NUM_CLIP_CORNER_LAYERS; idx++) {
-        if (_clipCornerLayers[idx] == nil) {
-          static ASDisplayNodeCornerLayerDelegate *clipCornerLayers;
-          static dispatch_once_t onceToken;
-          dispatch_once(&onceToken, ^{
-            clipCornerLayers = [[ASDisplayNodeCornerLayerDelegate alloc] init];
-          });
-          _clipCornerLayers[idx] = [[CALayer alloc] init];
-          _clipCornerLayers[idx].zPosition = 99999;
-          _clipCornerLayers[idx].delegate = clipCornerLayers;
-        }
-      }
-      [self _updateClipCornerLayerContentsWithRadius:_cornerRadius backgroundColor:self.backgroundColor];
-    } else {
-      for (int idx = 0; idx < NUM_CLIP_CORNER_LAYERS; idx++) {
-        [_clipCornerLayers[idx] removeFromSuperlayer];
-        _clipCornerLayers[idx] = nil;
-      }
-    }
-  });
 }
 
 - (void)updateCornerRoundingWithType:(ASCornerRoundingType)newRoundingType cornerRadius:(CGFloat)newCornerRadius
@@ -2112,8 +2076,6 @@ ASDISPLAYNODE_INLINE BOOL subtreeIsRasterized(ASDisplayNode *node) {
   // TODO: Disabled due to PR: https://github.com/TextureGroup/Texture/pull/1204
   // ASAssertUnlocked(__instanceLock__);
   
-  as_log_verbose(ASNodeLog(), "Insert subnode %@ at index %zd of %@ and remove subnode %@", subnode, subnodeIndex, self, oldSubnode);
-  
   if (subnode == nil || subnode == self) {
     ASDisplayNodeFailAssert(@"Cannot insert a nil subnode or self as subnode");
     return;
@@ -2550,7 +2512,6 @@ ASDISPLAYNODE_INLINE BOOL subtreeIsRasterized(ASDisplayNode *node) {
   // Note: we continue even if supernode is nil to ensure view/layer are removed from hierarchy.
 
   if (supernode != nil) {
-    as_log_verbose(ASNodeLog(), "Remove %@ from supernode %@", self, supernode);
   }
 
   // Clear supernode's reference to us before removing the view from the hierarchy, as _ASDisplayView
@@ -2830,7 +2791,6 @@ ASDISPLAYNODE_INLINE BOOL subtreeIsRasterized(ASDisplayNode *node) {
   }
 
   ASDisplayNodeLogEvent(self, @"setHierarchyState: %@", NSStringFromASHierarchyStateChange(oldState, newState));
-  as_log_verbose(ASNodeLog(), "%s%@ %@", sel_getName(_cmd), NSStringFromASHierarchyStateChange(oldState, newState), self);
 }
 
 - (void)willEnterHierarchy
@@ -2945,8 +2905,6 @@ ASDISPLAYNODE_INLINE BOOL subtreeIsRasterized(ASDisplayNode *node) {
 
 - (void)recursivelySetInterfaceState:(ASInterfaceState)newInterfaceState
 {
-  as_activity_create_for_scope("Recursively set interface state");
-
   // Instead of each node in the recursion assuming it needs to schedule itself for display,
   // setInterfaceState: skips this when handling range-managed nodes (our whole subtree has this set).
   // If our range manager intends for us to be displayed right now, and didn't before, get started!
@@ -3107,7 +3065,6 @@ ASDISPLAYNODE_INLINE BOOL subtreeIsRasterized(ASDisplayNode *node) {
   // for all cell nodes and it isn't currently meaningful.
   BOOL measureChangeOnly = ((oldState | newState) == ASInterfaceStateMeasureLayout);
   if (!measureChangeOnly) {
-    as_log_verbose(ASNodeLog(), "%s %@ %@", sel_getName(_cmd), NSStringFromASInterfaceStateChange(oldState, newState), self);
   }
   
   ASDisplayNodeLogEvent(self, @"interfaceStateDidChange: %@", NSStringFromASInterfaceStateChange(oldState, newState));
diff --git a/submodules/AsyncDisplayKit/Source/ASDisplayNode.mm.orig b/submodules/AsyncDisplayKit/Source/ASDisplayNode.mm.orig
deleted file mode 100644
index 50510817ab..0000000000
--- a/submodules/AsyncDisplayKit/Source/ASDisplayNode.mm.orig
+++ /dev/null
@@ -1,3927 +0,0 @@
-//
-//  ASDisplayNode.mm
-//  Texture
-//
-//  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.
-//  Changes after 4/13/2017 are: Copyright (c) Pinterest, Inc.  All rights reserved.
-//  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
-//
-
-#import <AsyncDisplayKit/ASDisplayNodeInternal.h>
-
-#import <AsyncDisplayKit/ASDisplayNode+Ancestry.h>
-#import <AsyncDisplayKit/ASDisplayNode+Beta.h>
-#import <AsyncDisplayKit/AsyncDisplayKit+Debug.h>
-#import <AsyncDisplayKit/ASLayoutSpec+Subclasses.h>
-#import <AsyncDisplayKit/ASCellNode+Internal.h>
-
-#import <objc/runtime.h>
-
-#import <AsyncDisplayKit/_ASAsyncTransaction.h>
-#import <AsyncDisplayKit/_ASAsyncTransactionContainer+Private.h>
-#import <AsyncDisplayKit/_ASCoreAnimationExtras.h>
-#import <AsyncDisplayKit/_ASDisplayLayer.h>
-#import <AsyncDisplayKit/_ASDisplayView.h>
-#import <AsyncDisplayKit/_ASPendingState.h>
-#import <AsyncDisplayKit/_ASScopeTimer.h>
-#import <AsyncDisplayKit/ASDimension.h>
-#import <AsyncDisplayKit/ASDisplayNodeExtras.h>
-#import <AsyncDisplayKit/ASDisplayNodeInternal.h>
-#import <AsyncDisplayKit/ASDisplayNodeCornerLayerDelegate.h>
-#import <AsyncDisplayKit/ASDisplayNode+FrameworkPrivate.h>
-#import <AsyncDisplayKit/ASDisplayNode+InterfaceState.h>
-#import <AsyncDisplayKit/ASDisplayNode+Subclasses.h>
-#import <AsyncDisplayKit/ASEqualityHelpers.h>
-#import <AsyncDisplayKit/ASGraphicsContext.h>
-#import <AsyncDisplayKit/ASInternalHelpers.h>
-#import <AsyncDisplayKit/ASLayoutElementStylePrivate.h>
-#import <AsyncDisplayKit/ASLayoutSpec.h>
-#import <AsyncDisplayKit/ASLayoutSpecPrivate.h>
-#import <AsyncDisplayKit/ASLog.h>
-#import <AsyncDisplayKit/ASMainThreadDeallocation.h>
-#import <AsyncDisplayKit/ASNodeController+Beta.h>
-#import <AsyncDisplayKit/ASRunLoopQueue.h>
-#import <AsyncDisplayKit/ASSignpost.h>
-#import <AsyncDisplayKit/ASTraitCollection.h>
-#import <AsyncDisplayKit/ASWeakProxy.h>
-#import <AsyncDisplayKit/ASResponderChainEnumerator.h>
-#import <AsyncDisplayKit/ASTipsController.h>
-
-// Conditionally time these scopes to our debug ivars (only exist in debug/profile builds)
-#if TIME_DISPLAYNODE_OPS
-  #define TIME_SCOPED(outVar) ASDN::ScopeTimer t(outVar)
-#else
-  #define TIME_SCOPED(outVar)
-#endif
-// This is trying to merge non-rangeManaged with rangeManaged, so both range-managed and standalone nodes wait before firing their exit-visibility handlers, as UIViewController transitions now do rehosting at both start & end of animation.
-// Enable this will mitigate interface updating state when coalescing disabled.
-// TODO(wsdwsd0829): Rework enabling code to ensure that interface state behavior is not altered when ASCATransactionQueue is disabled.
-#define ENABLE_NEW_EXIT_HIERARCHY_BEHAVIOR 0
-
-static ASDisplayNodeNonFatalErrorBlock _nonFatalErrorBlock = nil;
-NSInteger const ASDefaultDrawingPriority = ASDefaultTransactionPriority;
-
-// Forward declare CALayerDelegate protocol as the iOS 10 SDK moves CALayerDelegate from an informal delegate to a protocol.
-// We have to forward declare the protocol as this place otherwise it will not compile compiling with an Base SDK < iOS 10
-@protocol CALayerDelegate;
-
-@interface ASDisplayNode () <UIGestureRecognizerDelegate, CALayerDelegate, _ASDisplayLayerDelegate, ASCATransactionQueueObserving>
-/**
- * See ASDisplayNodeInternal.h for ivars
- */
-
-@end
-
-@implementation ASDisplayNode
-
-@dynamic layoutElementType;
-
-@synthesize threadSafeBounds = _threadSafeBounds;
-
-static std::atomic_bool storesUnflattenedLayouts = ATOMIC_VAR_INIT(NO);
-
-BOOL ASDisplayNodeSubclassOverridesSelector(Class subclass, SEL selector)
-{
-  return ASSubclassOverridesSelector([ASDisplayNode class], subclass, selector);
-}
-
-// For classes like ASTableNode, ASCollectionNode, ASScrollNode and similar - we have to be sure to set certain properties
-// like setFrame: and setBackgroundColor: directly to the UIView and not apply it to the layer only.
-BOOL ASDisplayNodeNeedsSpecialPropertiesHandling(BOOL isSynchronous, BOOL isLayerBacked)
-{
-  return isSynchronous && !isLayerBacked;
-}
-
-_ASPendingState *ASDisplayNodeGetPendingState(ASDisplayNode *node)
-{
-  ASLockScope(node);
-  _ASPendingState *result = node->_pendingViewState;
-  if (result == nil) {
-    result = [[_ASPendingState alloc] init];
-    node->_pendingViewState = result;
-  }
-  return result;
-}
-
-/**
- *  Returns ASDisplayNodeFlags for the given class/instance. instance MAY BE NIL.
- *
- *  @param c        the class, required
- *  @param instance the instance, which may be nil. (If so, the class is inspected instead)
- *  @remarks        The instance value is used only if we suspect the class may be dynamic (because it overloads 
- *                  +respondsToSelector: or -respondsToSelector.) In that case we use our "slow path", calling this 
- *                  method on each -init and passing the instance value. While this may seem like an unlikely scenario,
- *                  it turns our our own internal tests use a dynamic class, so it's worth capturing this edge case.
- *
- *  @return ASDisplayNode flags.
- */
-static struct ASDisplayNodeFlags GetASDisplayNodeFlags(Class c, ASDisplayNode *instance)
-{
-  ASDisplayNodeCAssertNotNil(c, @"class is required");
-
-  struct ASDisplayNodeFlags flags = {0};
-
-  flags.isInHierarchy = NO;
-  flags.displaysAsynchronously = YES;
-  flags.shouldAnimateSizeChanges = YES;
-  flags.implementsDrawRect = ([c respondsToSelector:@selector(drawRect:withParameters:isCancelled:isRasterizing:)] ? 1 : 0);
-  flags.implementsImageDisplay = ([c respondsToSelector:@selector(displayWithParameters:isCancelled:)] ? 1 : 0);
-  if (instance) {
-    flags.implementsDrawParameters = ([instance respondsToSelector:@selector(drawParametersForAsyncLayer:)] ? 1 : 0);
-  } else {
-    flags.implementsDrawParameters = ([c instancesRespondToSelector:@selector(drawParametersForAsyncLayer:)] ? 1 : 0);
-  }
-  
-  
-  return flags;
-}
-
-/**
- *  Returns ASDisplayNodeMethodOverrides for the given class
- *
- *  @param c the class, required.
- *
- *  @return ASDisplayNodeMethodOverrides.
- */
-static ASDisplayNodeMethodOverrides GetASDisplayNodeMethodOverrides(Class c)
-{
-  ASDisplayNodeCAssertNotNil(c, @"class is required");
-  
-  ASDisplayNodeMethodOverrides overrides = ASDisplayNodeMethodOverrideNone;
-  
-  // Handling touches
-  if (ASDisplayNodeSubclassOverridesSelector(c, @selector(touchesBegan:withEvent:))) {
-    overrides |= ASDisplayNodeMethodOverrideTouchesBegan;
-  }
-  if (ASDisplayNodeSubclassOverridesSelector(c, @selector(touchesMoved:withEvent:))) {
-    overrides |= ASDisplayNodeMethodOverrideTouchesMoved;
-  }
-  if (ASDisplayNodeSubclassOverridesSelector(c, @selector(touchesCancelled:withEvent:))) {
-    overrides |= ASDisplayNodeMethodOverrideTouchesCancelled;
-  }
-  if (ASDisplayNodeSubclassOverridesSelector(c, @selector(touchesEnded:withEvent:))) {
-    overrides |= ASDisplayNodeMethodOverrideTouchesEnded;
-  }
-  
-  // Responder chain
-  if (ASDisplayNodeSubclassOverridesSelector(c, @selector(canBecomeFirstResponder))) {
-    overrides |= ASDisplayNodeMethodOverrideCanBecomeFirstResponder;
-  }
-  if (ASDisplayNodeSubclassOverridesSelector(c, @selector(becomeFirstResponder))) {
-    overrides |= ASDisplayNodeMethodOverrideBecomeFirstResponder;
-  }
-  if (ASDisplayNodeSubclassOverridesSelector(c, @selector(canResignFirstResponder))) {
-    overrides |= ASDisplayNodeMethodOverrideCanResignFirstResponder;
-  }
-  if (ASDisplayNodeSubclassOverridesSelector(c, @selector(resignFirstResponder))) {
-    overrides |= ASDisplayNodeMethodOverrideResignFirstResponder;
-  }
-  if (ASDisplayNodeSubclassOverridesSelector(c, @selector(isFirstResponder))) {
-    overrides |= ASDisplayNodeMethodOverrideIsFirstResponder;
-  }
-  
-  // Layout related methods
-  if (ASDisplayNodeSubclassOverridesSelector(c, @selector(layoutSpecThatFits:))) {
-    overrides |= ASDisplayNodeMethodOverrideLayoutSpecThatFits;
-  }
-  if (ASDisplayNodeSubclassOverridesSelector(c, @selector(calculateLayoutThatFits:)) ||
-      ASDisplayNodeSubclassOverridesSelector(c, @selector(calculateLayoutThatFits:
-                                                          restrictedToSize:
-                                                          relativeToParentSize:))) {
-    overrides |= ASDisplayNodeMethodOverrideCalcLayoutThatFits;
-  }
-  if (ASDisplayNodeSubclassOverridesSelector(c, @selector(calculateSizeThatFits:))) {
-    overrides |= ASDisplayNodeMethodOverrideCalcSizeThatFits;
-  }
-
-  return overrides;
-}
-
-+ (void)initialize
-{
-#if ASDISPLAYNODE_ASSERTIONS_ENABLED
-  if (self != [ASDisplayNode class]) {
-    
-    // Subclasses should never override these. Use unused to prevent warnings
-    __unused NSString *classString = NSStringFromClass(self);
-    
-    ASDisplayNodeAssert(!ASDisplayNodeSubclassOverridesSelector(self, @selector(calculatedSize)), @"Subclass %@ must not override calculatedSize method.", classString);
-    ASDisplayNodeAssert(!ASDisplayNodeSubclassOverridesSelector(self, @selector(calculatedLayout)), @"Subclass %@ must not override calculatedLayout method.", classString);
-    ASDisplayNodeAssert(!ASDisplayNodeSubclassOverridesSelector(self, @selector(layoutThatFits:)), @"Subclass %@ must not override layoutThatFits: method. Instead override calculateLayoutThatFits:.", classString);
-    ASDisplayNodeAssert(!ASDisplayNodeSubclassOverridesSelector(self, @selector(layoutThatFits:parentSize:)), @"Subclass %@ must not override layoutThatFits:parentSize method. Instead override calculateLayoutThatFits:.", classString);
-    ASDisplayNodeAssert(!ASDisplayNodeSubclassOverridesSelector(self, @selector(recursivelyClearContents)), @"Subclass %@ must not override recursivelyClearContents method.", classString);
-    ASDisplayNodeAssert(!ASDisplayNodeSubclassOverridesSelector(self, @selector(recursivelyClearPreloadedData)), @"Subclass %@ must not override recursivelyClearFetchedData method.", classString);
-  } else {
-    // Check if subnodes where modified during the creation of the layout
-	  __block IMP originalLayoutSpecThatFitsIMP = ASReplaceMethodWithBlock(self, @selector(_locked_layoutElementThatFits:), ^(ASDisplayNode *_self, ASSizeRange sizeRange) {
-		  NSArray *oldSubnodes = _self.subnodes;
-		  ASLayoutSpec *layoutElement = ((ASLayoutSpec *( *)(id, SEL, ASSizeRange))originalLayoutSpecThatFitsIMP)(_self, @selector(_locked_layoutElementThatFits:), sizeRange);
-		  NSArray *subnodes = _self.subnodes;
-		  ASDisplayNodeAssert(oldSubnodes.count == subnodes.count, @"Adding or removing nodes in layoutSpecBlock or layoutSpecThatFits: is not allowed and can cause unexpected behavior.");
-		  for (NSInteger i = 0; i < oldSubnodes.count; i++) {
-			  ASDisplayNodeAssert(oldSubnodes[i] == subnodes[i], @"Adding or removing nodes in layoutSpecBlock or layoutSpecThatFits: is not allowed and can cause unexpected behavior.");
-		  }
-		  return layoutElement;
-	  });
-  }
-#endif
-
-  // Below we are pre-calculating values per-class and dynamically adding a method (_staticInitialize) to populate these values
-  // when each instance is constructed. These values don't change for each class, so there is significant performance benefit
-  // in doing it here. +initialize is guaranteed to be called before any instance method so it is safe to add this method here.
-  // Note that we take care to detect if the class overrides +respondsToSelector: or -respondsToSelector and take the slow path
-  // (recalculating for each instance) to make sure we are always correct.
-
-  BOOL classOverridesRespondsToSelector = ASSubclassOverridesClassSelector([NSObject class], self, @selector(respondsToSelector:));
-  BOOL instancesOverrideRespondsToSelector = ASSubclassOverridesSelector([NSObject class], self, @selector(respondsToSelector:));
-  struct ASDisplayNodeFlags flags = GetASDisplayNodeFlags(self, nil);
-  ASDisplayNodeMethodOverrides methodOverrides = GetASDisplayNodeMethodOverrides(self);
-  
-  __unused Class initializeSelf = self;
-
-  IMP staticInitialize = imp_implementationWithBlock(^(ASDisplayNode *node) {
-    ASDisplayNodeAssert(node.class == initializeSelf, @"Node class %@ does not have a matching _staticInitialize method; check to ensure [super initialize] is called within any custom +initialize implementations!  Overridden methods will not be called unless they are also implemented by superclass %@", node.class, initializeSelf);
-    node->_flags = (classOverridesRespondsToSelector || instancesOverrideRespondsToSelector) ? GetASDisplayNodeFlags(node.class, node) : flags;
-    node->_methodOverrides = (classOverridesRespondsToSelector) ? GetASDisplayNodeMethodOverrides(node.class) : methodOverrides;
-  });
-
-  class_replaceMethod(self, @selector(_staticInitialize), staticInitialize, "v:@");
-}
-
-#if !AS_INITIALIZE_FRAMEWORK_MANUALLY
-+ (void)load
-{
-  ASInitializeFrameworkMainThread();
-}
-#endif
-
-+ (Class)viewClass
-{
-  return [_ASDisplayView class];
-}
-
-+ (Class)layerClass
-{
-  return [_ASDisplayLayer class];
-}
-
-#pragma mark - Lifecycle
-
-- (void)_staticInitialize
-{
-  ASDisplayNodeAssert(NO, @"_staticInitialize must be overridden");
-}
-
-- (void)_initializeInstance
-{
-  [self _staticInitialize];
-
-#if ASEVENTLOG_ENABLE
-  _eventLog = [[ASEventLog alloc] initWithObject:self];
-#endif
-  
-  _viewClass = [self.class viewClass];
-  _layerClass = [self.class layerClass];
-  BOOL isSynchronous = ![_viewClass isSubclassOfClass:[_ASDisplayView class]]
-                        || ![_layerClass isSubclassOfClass:[_ASDisplayLayer class]];
-  setFlag(Synchronous, isSynchronous);
-  
-
-  _contentsScaleForDisplay = ASScreenScale();
-  _drawingPriority = ASDefaultDrawingPriority;
-  
-  _primitiveTraitCollection = ASPrimitiveTraitCollectionMakeDefault();
-  
-  _layoutVersion = 1;
-  
-  _defaultLayoutTransitionDuration = 0.2;
-  _defaultLayoutTransitionDelay = 0.0;
-  _defaultLayoutTransitionOptions = UIViewAnimationOptionCurveEaseInOut | UIViewAnimationOptionTransitionNone;
-  
-  _flags.canClearContentsOfLayer = YES;
-  _flags.canCallSetNeedsDisplayOfLayer = YES;
-
-  _fallbackSafeAreaInsets = UIEdgeInsetsZero;
-  _fallbackInsetsLayoutMarginsFromSafeArea = YES;
-  _isViewControllerRoot = NO;
-
-  _automaticallyRelayoutOnSafeAreaChanges = NO;
-  _automaticallyRelayoutOnLayoutMarginsChanges = NO;
-
-  ASDisplayNodeLogEvent(self, @"init");
-}
-
-- (instancetype)init
-{
-  if (!(self = [super init]))
-    return nil;
-
-  [self _initializeInstance];
-
-  return self;
-}
-
-- (instancetype)initWithViewClass:(Class)viewClass
-{
-  if (!(self = [self init]))
-    return nil;
-
-  ASDisplayNodeAssert([viewClass isSubclassOfClass:[UIView class]], @"should initialize with a subclass of UIView");
-
-  _viewClass = viewClass;
-  setFlag(Synchronous, ![viewClass isSubclassOfClass:[_ASDisplayView class]]);
-
-  return self;
-}
-
-- (instancetype)initWithLayerClass:(Class)layerClass
-{
-  if (!(self = [self init])) {
-    return nil;
-  }
-
-  ASDisplayNodeAssert([layerClass isSubclassOfClass:[CALayer class]], @"should initialize with a subclass of CALayer");
-
-  _layerClass = layerClass;
-  _flags.layerBacked = YES;
-  setFlag(Synchronous, ![layerClass isSubclassOfClass:[_ASDisplayLayer class]]);
-
-  return self;
-}
-
-- (instancetype)initWithViewBlock:(ASDisplayNodeViewBlock)viewBlock
-{
-  return [self initWithViewBlock:viewBlock didLoadBlock:nil];
-}
-
-- (instancetype)initWithViewBlock:(ASDisplayNodeViewBlock)viewBlock didLoadBlock:(ASDisplayNodeDidLoadBlock)didLoadBlock
-{
-  if (!(self = [self init])) {
-    return nil;
-  }
-
-  [self setViewBlock:viewBlock];
-  if (didLoadBlock != nil) {
-    [self onDidLoad:didLoadBlock];
-  }
-  
-  return self;
-}
-
-- (instancetype)initWithLayerBlock:(ASDisplayNodeLayerBlock)layerBlock
-{
-  return [self initWithLayerBlock:layerBlock didLoadBlock:nil];
-}
-
-- (instancetype)initWithLayerBlock:(ASDisplayNodeLayerBlock)layerBlock didLoadBlock:(ASDisplayNodeDidLoadBlock)didLoadBlock
-{
-  if (!(self = [self init])) {
-    return nil;
-  }
-  
-  [self setLayerBlock:layerBlock];
-  if (didLoadBlock != nil) {
-    [self onDidLoad:didLoadBlock];
-  }
-  
-  return self;
-}
-
-ASSynthesizeLockingMethodsWithMutex(__instanceLock__);
-
-- (void)setViewBlock:(ASDisplayNodeViewBlock)viewBlock
-{
-  ASDisplayNodeAssertFalse(self.nodeLoaded);
-  ASDisplayNodeAssertNotNil(viewBlock, @"should initialize with a valid block that returns a UIView");
-
-  _viewBlock = viewBlock;
-  setFlag(Synchronous, YES);
-}
-
-- (void)setLayerBlock:(ASDisplayNodeLayerBlock)layerBlock
-{
-  ASDisplayNodeAssertFalse(self.nodeLoaded);
-  ASDisplayNodeAssertNotNil(layerBlock, @"should initialize with a valid block that returns a CALayer");
-
-  _layerBlock = layerBlock;
-  _flags.layerBacked = YES;
-  setFlag(Synchronous, YES);
-}
-
-- (ASDisplayNodeMethodOverrides)methodOverrides
-{
-  return _methodOverrides;
-}
-
-- (void)onDidLoad:(ASDisplayNodeDidLoadBlock)body
-{
-  ASDN::MutexLocker l(__instanceLock__);
-
-  if ([self _locked_isNodeLoaded]) {
-    ASDisplayNodeAssertThreadAffinity(self);
-    ASDN::MutexUnlocker l(__instanceLock__);
-    body(self);
-  } else if (_onDidLoadBlocks == nil) {
-    _onDidLoadBlocks = [NSMutableArray arrayWithObject:body];
-  } else {
-    [_onDidLoadBlocks addObject:body];
-  }
-}
-
-- (void)dealloc
-{
-  _flags.isDeallocating = YES;
-
-  // Synchronous nodes may not be able to call the hierarchy notifications, so only enforce for regular nodes.
-  ASDisplayNodeAssert(checkFlag(Synchronous) || !ASInterfaceStateIncludesVisible(_interfaceState), @"Node should always be marked invisible before deallocating. Node: %@", self);
-  
-  self.asyncLayer.asyncDelegate = nil;
-  _view.asyncdisplaykit_node = nil;
-  _layer.asyncdisplaykit_node = nil;
-
-  // Remove any subnodes so they lose their connection to the now deallocated parent.  This can happen
-  // because subnodes do not retain their supernode, but subnodes can legitimately remain alive if another
-  // thing outside the view hierarchy system (e.g. async display, controller code, etc). keeps a retained
-  // reference to subnodes.
-
-  for (ASDisplayNode *subnode in _subnodes)
-    [subnode _setSupernode:nil];
-
-  [self scheduleIvarsForMainThreadDeallocation];
-
-  // TODO: Remove this? If supernode isn't already nil, this method isn't dealloc-safe anyway.
-  [self _setSupernode:nil];
-}
-
-#pragma mark - Loading
-
-- (BOOL)_locked_shouldLoadViewOrLayer
-{
-  ASAssertLocked(__instanceLock__);
-  return !_flags.isDeallocating && !(_hierarchyState & ASHierarchyStateRasterized);
-}
-
-- (UIView *)_locked_viewToLoad
-{
-  ASAssertLocked(__instanceLock__);
-  
-  UIView *view = nil;
-  if (_viewBlock) {
-    view = _viewBlock();
-    ASDisplayNodeAssertNotNil(view, @"View block returned nil");
-    ASDisplayNodeAssert(![view isKindOfClass:[_ASDisplayView class]], @"View block should return a synchronously displayed view");
-    _viewBlock = nil;
-    _viewClass = [view class];
-  } else {
-    view = [[_viewClass alloc] init];
-  }
-  
-  // Special handling of wrapping UIKit components
-  if (checkFlag(Synchronous)) {
-    [self checkResponderCompatibility];
-    
-    // UIImageView layers. More details on the flags
-    if ([_viewClass isSubclassOfClass:[UIImageView class]]) {
-      _flags.canClearContentsOfLayer = NO;
-      _flags.canCallSetNeedsDisplayOfLayer = NO;
-    }
-      
-    // UIActivityIndicator
-    if ([_viewClass isSubclassOfClass:[UIActivityIndicatorView class]]
-        || [_viewClass isSubclassOfClass:[UIVisualEffectView class]]) {
-      self.opaque = NO;
-    }
-      
-    // CAEAGLLayer
-    if([[view.layer class] isSubclassOfClass:[CAEAGLLayer class]]){
-      _flags.canClearContentsOfLayer = NO;
-    }
-  }
-
-  return view;
-}
-
-- (CALayer *)_locked_layerToLoad
-{
-  ASAssertLocked(__instanceLock__);
-  ASDisplayNodeAssert(_flags.layerBacked, @"_layerToLoad is only for layer-backed nodes");
-
-  CALayer *layer = nil;
-  if (_layerBlock) {
-    layer = _layerBlock();
-    ASDisplayNodeAssertNotNil(layer, @"Layer block returned nil");
-    ASDisplayNodeAssert(![layer isKindOfClass:[_ASDisplayLayer class]], @"Layer block should return a synchronously displayed layer");
-    _layerBlock = nil;
-    _layerClass = [layer class];
-  } else {
-    layer = [[_layerClass alloc] init];
-  }
-
-  return layer;
-}
-
-- (void)_locked_loadViewOrLayer
-{
-  ASAssertLocked(__instanceLock__);
-  
-  if (_flags.layerBacked) {
-    TIME_SCOPED(_debugTimeToCreateView);
-    _layer = [self _locked_layerToLoad];
-    static int ASLayerDelegateAssociationKey;
-    
-    /**
-     * CALayer's .delegate property is documented to be weak, but the implementation is actually assign.
-     * Because our layer may survive longer than the node (e.g. if someone else retains it, or if the node
-     * begins deallocation on a background thread and it waiting for the -dealloc call to reach main), the only
-     * way to avoid a dangling pointer is to use a weak proxy.
-     */
-    ASWeakProxy *instance = [ASWeakProxy weakProxyWithTarget:self];
-    _layer.delegate = (id<CALayerDelegate>)instance;
-    objc_setAssociatedObject(_layer, &ASLayerDelegateAssociationKey, instance, OBJC_ASSOCIATION_RETAIN_NONATOMIC);
-  } else {
-    TIME_SCOPED(_debugTimeToCreateView);
-    _view = [self _locked_viewToLoad];
-    _view.asyncdisplaykit_node = self;
-    _layer = _view.layer;
-  }
-  _layer.asyncdisplaykit_node = self;
-  
-  self._locked_asyncLayer.asyncDelegate = self;
-}
-
-- (void)_didLoad
-{
-  ASDisplayNodeAssertMainThread();
-  ASAssertUnlocked(__instanceLock__);
-  ASDisplayNodeLogEvent(self, @"didLoad");
-  as_log_verbose(ASNodeLog(), "didLoad %@", self);
-  TIME_SCOPED(_debugTimeForDidLoad);
-  
-  [self didLoad];
-  
-  __instanceLock__.lock();
-  let onDidLoadBlocks = ASTransferStrong(_onDidLoadBlocks);
-  __instanceLock__.unlock();
-  
-  for (ASDisplayNodeDidLoadBlock block in onDidLoadBlocks) {
-    block(self);
-  }
-  [self enumerateInterfaceStateDelegates:^(id<ASInterfaceStateDelegate> del) {
-    [del nodeDidLoad];
-  }];
-}
-
-- (void)didLoad
-{
-  ASDisplayNodeAssertMainThread();
-  
-  // Subclass hook
-}
-
-- (BOOL)isNodeLoaded
-{
-  if (ASDisplayNodeThreadIsMain()) {
-    // Because the view and layer can only be created and destroyed on Main, that is also the only thread
-    // where the state of this property can change. As an optimization, we can avoid locking.
-    return _loaded(self);
-  } else {
-    ASDN::MutexLocker l(__instanceLock__);
-    return [self _locked_isNodeLoaded];
-  }
-}
-
-- (BOOL)_locked_isNodeLoaded
-{
-  ASAssertLocked(__instanceLock__);
-  return _loaded(self);
-}
-
-#pragma mark - Misc Setter / Getter
-
-- (UIView *)view
-{
-  ASDN::MutexLocker l(__instanceLock__);
-
-  ASDisplayNodeAssert(!_flags.layerBacked, @"Call to -view undefined on layer-backed nodes");
-  BOOL isLayerBacked = _flags.layerBacked;
-  if (isLayerBacked) {
-    return nil;
-  }
-
-  if (_view != nil) {
-    return _view;
-  }
-
-  if (![self _locked_shouldLoadViewOrLayer]) {
-    return nil;
-  }
-  
-  // Loading a view needs to happen on the main thread
-  ASDisplayNodeAssertMainThread();
-  [self _locked_loadViewOrLayer];
-  
-  // FIXME: Ideally we'd call this as soon as the node receives -setNeedsLayout
-  // but automatic subnode management would require us to modify the node tree
-  // in the background on a loaded node, which isn't currently supported.
-  if (_pendingViewState.hasSetNeedsLayout) {
-    // Need to unlock before calling setNeedsLayout to avoid deadlocks.
-    // MutexUnlocker will re-lock at the end of scope.
-    ASDN::MutexUnlocker u(__instanceLock__);
-    [self __setNeedsLayout];
-  }
-  
-  [self _locked_applyPendingStateToViewOrLayer];
-  
-  {
-    // The following methods should not be called with a lock
-    ASDN::MutexUnlocker u(__instanceLock__);
-
-    // No need for the lock as accessing the subviews or layers are always happening on main
-    [self _addSubnodeViewsAndLayers];
-    
-    // A subclass hook should never be called with a lock
-    [self _didLoad];
-  }
-
-  return _view;
-}
-
-- (CALayer *)layer
-{
-  ASDN::MutexLocker l(__instanceLock__);
-  if (_layer != nil) {
-    return _layer;
-  }
-  
-  if (![self _locked_shouldLoadViewOrLayer]) {
-    return nil;
-  }
-  
-  // Loading a layer needs to happen on the main thread
-  ASDisplayNodeAssertMainThread();
-  [self _locked_loadViewOrLayer];
-  
-  // FIXME: Ideally we'd call this as soon as the node receives -setNeedsLayout
-  // but automatic subnode management would require us to modify the node tree
-  // in the background on a loaded node, which isn't currently supported.
-  if (_pendingViewState.hasSetNeedsLayout) {
-    // Need to unlock before calling setNeedsLayout to avoid deadlocks.
-    // MutexUnlocker will re-lock at the end of scope.
-    ASDN::MutexUnlocker u(__instanceLock__);
-    [self __setNeedsLayout];
-  }
-  
-  [self _locked_applyPendingStateToViewOrLayer];
-  
-  {
-    // The following methods should not be called with a lock
-    ASDN::MutexUnlocker u(__instanceLock__);
-
-    // No need for the lock as accessing the subviews or layers are always happening on main
-    [self _addSubnodeViewsAndLayers];
-    
-    // A subclass hook should never be called with a lock
-    [self _didLoad];
-  }
-
-  return _layer;
-}
-
-// Returns nil if the layer is not an _ASDisplayLayer; will not create the layer if nil.
-- (_ASDisplayLayer *)asyncLayer
-{
-  ASDN::MutexLocker l(__instanceLock__);
-  return [self _locked_asyncLayer];
-}
-
-- (_ASDisplayLayer *)_locked_asyncLayer
-{
-  ASAssertLocked(__instanceLock__);
-  return [_layer isKindOfClass:[_ASDisplayLayer class]] ? (_ASDisplayLayer *)_layer : nil;
-}
-
-- (BOOL)isSynchronous
-{
-  return checkFlag(Synchronous);
-}
-
-- (void)setLayerBacked:(BOOL)isLayerBacked
-{
-  // Only call this if assertions are enabled – it could be expensive.
-  ASDisplayNodeAssert(!isLayerBacked || self.supportsLayerBacking, @"Node %@ does not support layer backing.", self);
-
-  ASDN::MutexLocker l(__instanceLock__);
-  if (_flags.layerBacked == isLayerBacked) {
-    return;
-  }
-  
-  if ([self _locked_isNodeLoaded]) {
-    ASDisplayNodeFailAssert(@"Cannot change layerBacked after view/layer has loaded.");
-    return;
-  }
-
-  _flags.layerBacked = isLayerBacked;
-}
-
-- (BOOL)isLayerBacked
-{
-  ASDN::MutexLocker l(__instanceLock__);
-  return _flags.layerBacked;
-}
-
-- (BOOL)supportsLayerBacking
-{
-  ASDN::MutexLocker l(__instanceLock__);
-  return !checkFlag(Synchronous) && !_flags.viewEverHadAGestureRecognizerAttached && _viewClass == [_ASDisplayView class] && _layerClass == [_ASDisplayLayer class];
-}
-
-- (BOOL)shouldAnimateSizeChanges
-{
-  ASDN::MutexLocker l(__instanceLock__);
-  return _flags.shouldAnimateSizeChanges;
-}
-
-- (void)setShouldAnimateSizeChanges:(BOOL)shouldAnimateSizeChanges
-{
-  ASDN::MutexLocker l(__instanceLock__);
-  _flags.shouldAnimateSizeChanges = shouldAnimateSizeChanges;
-}
-
-- (CGRect)threadSafeBounds
-{
-  ASDN::MutexLocker l(__instanceLock__);
-  return [self _locked_threadSafeBounds];
-}
-
-- (CGRect)_locked_threadSafeBounds
-{
-  ASAssertLocked(__instanceLock__);
-  return _threadSafeBounds;
-}
-
-- (void)setThreadSafeBounds:(CGRect)newBounds
-{
-  ASDN::MutexLocker l(__instanceLock__);
-  _threadSafeBounds = newBounds;
-}
-
-- (void)nodeViewDidAddGestureRecognizer
-{
-  ASDN::MutexLocker l(__instanceLock__);
-  _flags.viewEverHadAGestureRecognizerAttached = YES;
-}
-
-- (UIEdgeInsets)fallbackSafeAreaInsets
-{
-  ASDN::MutexLocker l(__instanceLock__);
-  return _fallbackSafeAreaInsets;
-}
-
-- (void)setFallbackSafeAreaInsets:(UIEdgeInsets)insets
-{
-  BOOL needsManualUpdate;
-  BOOL updatesLayoutMargins;
-
-  {
-    ASDN::MutexLocker l(__instanceLock__);
-    ASDisplayNodeAssertThreadAffinity(self);
-
-    if (UIEdgeInsetsEqualToEdgeInsets(insets, _fallbackSafeAreaInsets)) {
-      return;
-    }
-
-    _fallbackSafeAreaInsets = insets;
-    needsManualUpdate = !AS_AT_LEAST_IOS11 || _flags.layerBacked;
-    updatesLayoutMargins = needsManualUpdate && [self _locked_insetsLayoutMarginsFromSafeArea];
-  }
-
-  if (needsManualUpdate) {
-    [self safeAreaInsetsDidChange];
-  }
-
-  if (updatesLayoutMargins) {
-    [self layoutMarginsDidChange];
-  }
-}
-
-- (void)_fallbackUpdateSafeAreaOnChildren
-{
-  ASDisplayNodeAssertThreadAffinity(self);
-
-  UIEdgeInsets insets = self.safeAreaInsets;
-  CGRect bounds = self.bounds;
-
-  for (ASDisplayNode *child in self.subnodes) {
-    if (AS_AT_LEAST_IOS11 && !child.layerBacked) {
-      // In iOS 11 view-backed nodes already know what their safe area is.
-      continue;
-    }
-
-    if (child.viewControllerRoot) {
-      // Its safe area is controlled by a view controller. Don't override it.
-      continue;
-    }
-
-    CGRect childFrame = child.frame;
-    UIEdgeInsets childInsets = UIEdgeInsetsMake(MAX(insets.top    - (CGRectGetMinY(childFrame) - CGRectGetMinY(bounds)), 0),
-                                                MAX(insets.left   - (CGRectGetMinX(childFrame) - CGRectGetMinX(bounds)), 0),
-                                                MAX(insets.bottom - (CGRectGetMaxY(bounds) - CGRectGetMaxY(childFrame)), 0),
-                                                MAX(insets.right  - (CGRectGetMaxX(bounds) - CGRectGetMaxX(childFrame)), 0));
-
-    child.fallbackSafeAreaInsets = childInsets;
-  }
-}
-
-- (BOOL)isViewControllerRoot
-{
-  ASDN::MutexLocker l(__instanceLock__);
-  return _isViewControllerRoot;
-}
-
-- (void)setViewControllerRoot:(BOOL)flag
-{
-  ASDN::MutexLocker l(__instanceLock__);
-  _isViewControllerRoot = flag;
-}
-
-- (BOOL)automaticallyRelayoutOnSafeAreaChanges
-{
-  ASDN::MutexLocker l(__instanceLock__);
-  return _automaticallyRelayoutOnSafeAreaChanges;
-}
-
-- (void)setAutomaticallyRelayoutOnSafeAreaChanges:(BOOL)flag
-{
-  ASDN::MutexLocker l(__instanceLock__);
-  _automaticallyRelayoutOnSafeAreaChanges = flag;
-}
-
-- (BOOL)automaticallyRelayoutOnLayoutMarginsChanges
-{
-  ASDN::MutexLocker l(__instanceLock__);
-  return _automaticallyRelayoutOnLayoutMarginsChanges;
-}
-
-- (void)setAutomaticallyRelayoutOnLayoutMarginsChanges:(BOOL)flag
-{
-  ASDN::MutexLocker l(__instanceLock__);
-  _automaticallyRelayoutOnLayoutMarginsChanges = flag;
-}
-
-- (void)__setNodeController:(ASNodeController *)controller
-{
-  // See docs for why we don't lock.
-  if (controller.shouldInvertStrongReference) {
-    _strongNodeController = controller;
-    _weakNodeController = nil;
-  } else {
-    _weakNodeController = controller;
-    _strongNodeController = nil;
-  }
-}
-
-#pragma mark - UIResponder
-
-#define HANDLE_NODE_RESPONDER_METHOD(__sel) \
-  /* All responder methods should be called on the main thread */ \
-  ASDisplayNodeAssertMainThread(); \
-  if (checkFlag(Synchronous)) { \
-    /* If the view is not a _ASDisplayView subclass (Synchronous) just call through to the view as we
-     expect it's a non _ASDisplayView subclass that will respond */ \
-    return [_view __sel]; \
-  } else { \
-    if (ASSubclassOverridesSelector([_ASDisplayView class], _viewClass, @selector(__sel))) { \
-    /* If the subclass overwrites canBecomeFirstResponder just call through
-       to it as we expect it will handle it */ \
-      return [_view __sel]; \
-    } else { \
-      /* Call through to _ASDisplayView's superclass to get it handled */ \
-      return [(_ASDisplayView *)_view __##__sel]; \
-    } \
-  } \
-
-- (void)checkResponderCompatibility
-{
-#if ASDISPLAYNODE_ASSERTIONS_ENABLED
-  // There are certain cases we cannot handle and are not supported:
-  // 1. If the _view class is not a subclass of _ASDisplayView
-  if (checkFlag(Synchronous)) {
-    // 2. At least one UIResponder methods are overwritten in the node subclass
-    NSString *message =  @"Overwritting %@ and having a backing view that is not an _ASDisplayView is not supported.";
-    ASDisplayNodeAssert(!ASDisplayNodeSubclassOverridesSelector(self.class, @selector(canBecomeFirstResponder)), ([NSString stringWithFormat:message, @"canBecomeFirstResponder"]));
-    ASDisplayNodeAssert(!ASDisplayNodeSubclassOverridesSelector(self.class, @selector(becomeFirstResponder)), ([NSString stringWithFormat:message, @"becomeFirstResponder"]));
-    ASDisplayNodeAssert(!ASDisplayNodeSubclassOverridesSelector(self.class, @selector(canResignFirstResponder)), ([NSString stringWithFormat:message, @"canResignFirstResponder"]));
-    ASDisplayNodeAssert(!ASDisplayNodeSubclassOverridesSelector(self.class, @selector(resignFirstResponder)), ([NSString stringWithFormat:message, @"resignFirstResponder"]));
-    ASDisplayNodeAssert(!ASDisplayNodeSubclassOverridesSelector(self.class, @selector(isFirstResponder)), ([NSString stringWithFormat:message, @"isFirstResponder"]));
-  }
-#endif
-}
-
-- (BOOL)__canBecomeFirstResponder
-{
-  if (_view == nil) {
-    // By default we return NO if not view is created yet
-    return NO;
-  }
-  
-  HANDLE_NODE_RESPONDER_METHOD(canBecomeFirstResponder);
-}
-
-- (BOOL)__becomeFirstResponder
-{
-  // Note: This implicitly loads the view if it hasn't been loaded yet.
-  [self view];
-
-  if (![self canBecomeFirstResponder]) {
-    return NO;
-  }
-
-  HANDLE_NODE_RESPONDER_METHOD(becomeFirstResponder);
-}
-
-- (BOOL)__canResignFirstResponder
-{
-  if (_view == nil) {
-    // By default we return YES if no view is created yet
-    return YES;
-  }
-  
-  HANDLE_NODE_RESPONDER_METHOD(canResignFirstResponder);
-}
-
-- (BOOL)__resignFirstResponder
-{
-  // Note: This implicitly loads the view if it hasn't been loaded yet.
-  [self view];
-
-  if (![self canResignFirstResponder]) {
-    return NO;
-  }
-  
-  HANDLE_NODE_RESPONDER_METHOD(resignFirstResponder);
-}
-
-- (BOOL)__isFirstResponder
-{
-  if (_view == nil) {
-    // If no view is created yet we can just return NO as it's unlikely it's the first responder
-    return NO;
-  }
-  
-  HANDLE_NODE_RESPONDER_METHOD(isFirstResponder);
-}
-
-#pragma mark <ASDebugNameProvider>
-
-- (NSString *)debugName
-{
-  ASDN::MutexLocker l(__instanceLock__);
-  return _debugName;
-}
-
-- (void)setDebugName:(NSString *)debugName
-{
-  ASDN::MutexLocker l(__instanceLock__);
-  if (!ASObjectIsEqual(_debugName, debugName)) {
-    _debugName = [debugName copy];
-  }
-}
-
-#pragma mark - Layout
-
-// At most a layoutSpecBlock or one of the three layout methods is overridden
-#define __ASDisplayNodeCheckForLayoutMethodOverrides \
-    ASDisplayNodeAssert(_layoutSpecBlock != NULL || \
-    ((ASDisplayNodeSubclassOverridesSelector(self.class, @selector(calculateSizeThatFits:)) ? 1 : 0) \
-    + (ASDisplayNodeSubclassOverridesSelector(self.class, @selector(layoutSpecThatFits:)) ? 1 : 0) \
-    + (ASDisplayNodeSubclassOverridesSelector(self.class, @selector(calculateLayoutThatFits:)) ? 1 : 0)) <= 1, \
-    @"Subclass %@ must at least provide a layoutSpecBlock or override at most one of the three layout methods: calculateLayoutThatFits:, layoutSpecThatFits:, or calculateSizeThatFits:", NSStringFromClass(self.class))
-
-
-#pragma mark <ASLayoutElementTransition>
-
-- (BOOL)canLayoutAsynchronous
-{
-  return !self.isNodeLoaded;
-}
-
-#pragma mark Layout Pass
-
-- (void)__setNeedsLayout
-{
-  [self invalidateCalculatedLayout];
-}
-
-- (void)invalidateCalculatedLayout
-{
-  ASDN::MutexLocker l(__instanceLock__);
-  
-  _layoutVersion++;
-  
-  _unflattenedLayout = nil;
-
-#if YOGA
-  [self invalidateCalculatedYogaLayout];
-#endif
-}
-
-- (void)__layout
-{
-  ASDisplayNodeAssertThreadAffinity(self);
-  ASAssertUnlocked(__instanceLock__);
-  
-  BOOL loaded = NO;
-  {
-    ASDN::MutexLocker l(__instanceLock__);
-    loaded = [self _locked_isNodeLoaded];
-    CGRect bounds = _threadSafeBounds;
-    
-    if (CGRectEqualToRect(bounds, CGRectZero)) {
-      // Performing layout on a zero-bounds view often results in frame calculations
-      // with negative sizes after applying margins, which will cause
-      // layoutThatFits: on subnodes to assert.
-      as_log_debug(OS_LOG_DISABLED, "Warning: No size given for node before node was trying to layout itself: %@. Please provide a frame for the node.", self);
-      return;
-    }
-    
-    // If a current layout transition is in progress there is no need to do a measurement and layout pass in here as
-    // this is supposed to happen within the layout transition process
-    if (_transitionID != ASLayoutElementContextInvalidTransitionID) {
-      return;
-    }
-
-    as_activity_create_for_scope("-[ASDisplayNode __layout]");
-
-    // This method will confirm that the layout is up to date (and update if needed).
-    // Importantly, it will also APPLY the layout to all of our subnodes if (unless parent is transitioning).
-    {
-      ASDN::MutexUnlocker u(__instanceLock__);
-      [self _u_measureNodeWithBoundsIfNecessary:bounds];
-    }
-    
-    [self _locked_layoutPlaceholderIfNecessary];
-  }
-  
-  [self _layoutSublayouts];
-  
-  // Per API contract, `-layout` and `-layoutDidFinish` are called only if the node is loaded. 
-  if (loaded) {
-    ASPerformBlockOnMainThread(^{
-      [self layout];
-      [self _layoutClipCornersIfNeeded];
-      [self layoutDidFinish];
-    });
-  }
-
-  [self _fallbackUpdateSafeAreaOnChildren];
-}
-
-- (void)layoutDidFinish
-{
-  // Hook for subclasses
-  ASDisplayNodeAssertMainThread();
-  ASAssertUnlocked(__instanceLock__);
-  ASDisplayNodeAssertTrue(self.isNodeLoaded);
-}
-
-#pragma mark Calculation
-
-- (ASLayout *)calculateLayoutThatFits:(ASSizeRange)constrainedSize
-                     restrictedToSize:(ASLayoutElementSize)size
-                 relativeToParentSize:(CGSize)parentSize
-{
-<<<<<<< HEAD
-  // We only want one calculateLayout signpost interval per thread.
-#ifndef MINIMAL_ASDK
-  static _Thread_local NSInteger tls_callDepth;
-=======
->>>>>>> 565da7d4935740d12fc204aa061faf093831da1e
-  as_activity_scope_verbose(as_activity_create("Calculate node layout", AS_ACTIVITY_CURRENT, OS_ACTIVITY_FLAG_DEFAULT));
-  as_log_verbose(ASLayoutLog(), "Calculating layout for %@ sizeRange %@", self, NSStringFromASSizeRange(constrainedSize));
-
-#if AS_KDEBUG_ENABLE
-  // We only want one calculateLayout signpost interval per thread.
-  // Currently there is no fallback for profiling i386, since it's not useful.
-  static _Thread_local NSInteger tls_callDepth;
-  if (tls_callDepth++ == 0) {
-    ASSignpostStart(ASSignpostCalculateLayout);
-  }
-#endif
-
-  ASSizeRange styleAndParentSize = ASLayoutElementSizeResolve(self.style.size, parentSize);
-  const ASSizeRange resolvedRange = ASSizeRangeIntersect(constrainedSize, styleAndParentSize);
-  ASLayout *result = [self calculateLayoutThatFits:resolvedRange];
-#ifndef MINIMAL_ASDK
-  as_log_verbose(ASLayoutLog(), "Calculated layout %@", result);
-
-#if AS_KDEBUG_ENABLE
-  if (--tls_callDepth == 0) {
-    ASSignpostEnd(ASSignpostCalculateLayout);
-  }
-#endif
-<<<<<<< HEAD
-=======
-  
->>>>>>> 565da7d4935740d12fc204aa061faf093831da1e
-  return result;
-}
-
-- (ASLayout *)calculateLayoutThatFits:(ASSizeRange)constrainedSize
-{
-  __ASDisplayNodeCheckForLayoutMethodOverrides;
-
-  ASDN::MutexLocker l(__instanceLock__);
-
-#if YOGA
-  // There are several cases where Yoga could arrive here:
-  // - This node is not in a Yoga tree: it has neither a yogaParent nor yogaChildren.
-  // - This node is a Yoga tree root: it has no yogaParent, but has yogaChildren.
-  // - This node is a Yoga tree node: it has both a yogaParent and yogaChildren.
-  // - This node is a Yoga tree leaf: it has a yogaParent, but no yogaChidlren.
-  YGNodeRef yogaNode = _style.yogaNode;
-  BOOL hasYogaParent = (_yogaParent != nil);
-  BOOL hasYogaChildren = (_yogaChildren.count > 0);
-  BOOL usesYoga = (yogaNode != NULL && (hasYogaParent || hasYogaChildren));
-  if (usesYoga) {
-    // This node has some connection to a Yoga tree.
-    if ([self shouldHaveYogaMeasureFunc] == NO) {
-      // If we're a yoga root, tree node, or leaf with no measure func (e.g. spacer), then
-      // initiate a new Yoga calculation pass from root.
-      ASDN::MutexUnlocker ul(__instanceLock__);
-      as_activity_create_for_scope("Yoga layout calculation");
-      if (self.yogaLayoutInProgress == NO) {
-        ASYogaLog("Calculating yoga layout from root %@, %@", self, NSStringFromASSizeRange(constrainedSize));
-        [self calculateLayoutFromYogaRoot:constrainedSize];
-      } else {
-        ASYogaLog("Reusing existing yoga layout %@", _yogaCalculatedLayout);
-      }
-      ASDisplayNodeAssert(_yogaCalculatedLayout, @"Yoga node should have a non-nil layout at this stage: %@", self);
-      return _yogaCalculatedLayout;
-    } else {
-      // If we're a yoga leaf node with custom measurement function, proceed with normal layout so layoutSpecs can run (e.g. ASButtonNode).
-      ASYogaLog("PROCEEDING past Yoga check to calculate ASLayout for: %@", self);
-    }
-  }
-#endif /* YOGA */
-  
-  // Manual size calculation via calculateSizeThatFits:
-  if (_layoutSpecBlock == NULL && (_methodOverrides & ASDisplayNodeMethodOverrideLayoutSpecThatFits) == 0) {
-    CGSize size = [self calculateSizeThatFits:constrainedSize.max];
-    ASDisplayNodeLogEvent(self, @"calculatedSize: %@", NSStringFromCGSize(size));
-    return [ASLayout layoutWithLayoutElement:self size:ASSizeRangeClamp(constrainedSize, size) sublayouts:nil];
-  }
-  
-  // Size calcualtion with layout elements
-  BOOL measureLayoutSpec = _measurementOptions & ASDisplayNodePerformanceMeasurementOptionLayoutSpec;
-  if (measureLayoutSpec) {
-    _layoutSpecNumberOfPasses++;
-  }
-
-  // Get layout element from the node
-  id<ASLayoutElement> layoutElement = [self _locked_layoutElementThatFits:constrainedSize];
-#if ASEnableVerboseLogging
-  for (NSString *asciiLine in [[layoutElement asciiArtString] componentsSeparatedByString:@"\n"]) {
-    as_log_verbose(ASLayoutLog(), "%@", asciiLine);
-  }
-#endif
-
-
-  // Certain properties are necessary to set on an element of type ASLayoutSpec
-  if (layoutElement.layoutElementType == ASLayoutElementTypeLayoutSpec) {
-    ASLayoutSpec *layoutSpec = (ASLayoutSpec *)layoutElement;
-  
-#if AS_DEDUPE_LAYOUT_SPEC_TREE
-    NSHashTable *duplicateElements = [layoutSpec findDuplicatedElementsInSubtree];
-    if (duplicateElements.count > 0) {
-      ASDisplayNodeFailAssert(@"Node %@ returned a layout spec that contains the same elements in multiple positions. Elements: %@", self, duplicateElements);
-      // Use an empty layout spec to avoid crashes
-      layoutSpec = [[ASLayoutSpec alloc] init];
-    }
-#endif
-
-    ASDisplayNodeAssert(layoutSpec.isMutable, @"Node %@ returned layout spec %@ that has already been used. Layout specs should always be regenerated.", self, layoutSpec);
-    
-    layoutSpec.isMutable = NO;
-  }
-  
-  // Manually propagate the trait collection here so that any layoutSpec children of layoutSpec will get a traitCollection
-  {
-    ASDN::SumScopeTimer t(_layoutSpecTotalTime, measureLayoutSpec);
-    ASTraitCollectionPropagateDown(layoutElement, self.primitiveTraitCollection);
-  }
-  
-  BOOL measureLayoutComputation = _measurementOptions & ASDisplayNodePerformanceMeasurementOptionLayoutComputation;
-  if (measureLayoutComputation) {
-    _layoutComputationNumberOfPasses++;
-  }
-
-  // Layout element layout creation
-  ASLayout *layout = ({
-    ASDN::SumScopeTimer t(_layoutComputationTotalTime, measureLayoutComputation);
-    [layoutElement layoutThatFits:constrainedSize];
-  });
-  ASDisplayNodeAssertNotNil(layout, @"[ASLayoutElement layoutThatFits:] should never return nil! %@, %@", self, layout);
-    
-  // Make sure layoutElementObject of the root layout is `self`, so that the flattened layout will be structurally correct.
-  BOOL isFinalLayoutElement = (layout.layoutElement != self);
-  if (isFinalLayoutElement) {
-    layout.position = CGPointZero;
-    layout = [ASLayout layoutWithLayoutElement:self size:layout.size sublayouts:@[layout]];
-  }
-  ASDisplayNodeLogEvent(self, @"computedLayout: %@", layout);
-
-  // PR #1157: Reduces accuracy of _unflattenedLayout for debugging/Weaver
-  if ([ASDisplayNode shouldStoreUnflattenedLayouts]) {
-      _unflattenedLayout = layout;
-  }
-  layout = [layout filteredNodeLayoutTree];
-  
-  return layout;
-}
-
-- (CGSize)calculateSizeThatFits:(CGSize)constrainedSize
-{
-  __ASDisplayNodeCheckForLayoutMethodOverrides;
-  
-  ASDisplayNodeLogEvent(self, @"calculateSizeThatFits: with constrainedSize: %@", NSStringFromCGSize(constrainedSize));
-
-  return ASIsCGSizeValidForSize(constrainedSize) ? constrainedSize : CGSizeZero;
-}
-
-- (id<ASLayoutElement>)_locked_layoutElementThatFits:(ASSizeRange)constrainedSize
-{
-  ASAssertLocked(__instanceLock__);
-  __ASDisplayNodeCheckForLayoutMethodOverrides;
-  
-  BOOL measureLayoutSpec = _measurementOptions & ASDisplayNodePerformanceMeasurementOptionLayoutSpec;
-  
-  if (_layoutSpecBlock != NULL) {
-    return ({
-      ASDN::MutexLocker l(__instanceLock__);
-      ASDN::SumScopeTimer t(_layoutSpecTotalTime, measureLayoutSpec);
-      _layoutSpecBlock(self, constrainedSize);
-    });
-  } else {
-    return ({
-      ASDN::SumScopeTimer t(_layoutSpecTotalTime, measureLayoutSpec);
-      [self layoutSpecThatFits:constrainedSize];
-    });
-  }
-}
-
-- (ASLayoutSpec *)layoutSpecThatFits:(ASSizeRange)constrainedSize
-{
-  __ASDisplayNodeCheckForLayoutMethodOverrides;
-  
-  ASDisplayNodeAssert(NO, @"-[ASDisplayNode layoutSpecThatFits:] should never return an empty value. One way this is caused is by calling -[super layoutSpecThatFits:] which is not currently supported.");
-  return [[ASLayoutSpec alloc] init];
-}
-
-- (void)layout
-{
-  // Hook for subclasses
-  ASDisplayNodeAssertMainThread();
-  ASAssertUnlocked(__instanceLock__);
-  ASDisplayNodeAssertTrue(self.isNodeLoaded);
-  [self enumerateInterfaceStateDelegates:^(id<ASInterfaceStateDelegate> del) {
-    [del nodeDidLayout];
-  }];
-}
-
-#pragma mark Layout Transition
-
-- (void)_layoutTransitionMeasurementDidFinish
-{
-  // Hook for subclasses - No-Op in ASDisplayNode
-}
-
-#pragma mark <_ASTransitionContextCompletionDelegate>
-
-/**
- * After completeTransition: is called on the ASContextTransitioning object in animateLayoutTransition: this
- * delegate method will be called that start the completion process of the transition
- */
-- (void)transitionContext:(_ASTransitionContext *)context didComplete:(BOOL)didComplete
-{
-  ASDisplayNodeAssertMainThread();
-
-  [self didCompleteLayoutTransition:context];
-  
-  _pendingLayoutTransitionContext = nil;
-
-  [self _pendingLayoutTransitionDidComplete];
-}
-
-- (void)calculatedLayoutDidChange
-{
-  // Subclass override
-}
-
-#pragma mark - Display
-
-NSString * const ASRenderingEngineDidDisplayScheduledNodesNotification = @"ASRenderingEngineDidDisplayScheduledNodes";
-NSString * const ASRenderingEngineDidDisplayNodesScheduledBeforeTimestamp = @"ASRenderingEngineDidDisplayNodesScheduledBeforeTimestamp";
-
-- (BOOL)displaysAsynchronously
-{
-  ASDN::MutexLocker l(__instanceLock__);
-  return [self _locked_displaysAsynchronously];
-}
-
-/**
- * Core implementation of -displaysAsynchronously.
- */
-- (BOOL)_locked_displaysAsynchronously
-{
-  ASAssertLocked(__instanceLock__);
-  return checkFlag(Synchronous) == NO && _flags.displaysAsynchronously;
-}
-
-- (void)setDisplaysAsynchronously:(BOOL)displaysAsynchronously
-{
-  ASDisplayNodeAssertThreadAffinity(self);
-  
-  ASDN::MutexLocker l(__instanceLock__);
-
-  // Can't do this for synchronous nodes (using layers that are not _ASDisplayLayer and so we can't control display prevention/cancel)
-  if (checkFlag(Synchronous)) {
-    return;
-  }
-
-  if (_flags.displaysAsynchronously == displaysAsynchronously) {
-    return;
-  }
-
-  _flags.displaysAsynchronously = displaysAsynchronously;
-
-  self._locked_asyncLayer.displaysAsynchronously = displaysAsynchronously;
-}
-
-- (BOOL)rasterizesSubtree
-{
-  ASDN::MutexLocker l(__instanceLock__);
-  return _flags.rasterizesSubtree;
-}
-
-- (void)enableSubtreeRasterization
-{
-  ASDN::MutexLocker l(__instanceLock__);
-  // Already rasterized from self.
-  if (_flags.rasterizesSubtree) {
-    return;
-  }
-
-  // If rasterized from above, bail.
-  if (ASHierarchyStateIncludesRasterized(_hierarchyState)) {
-    ASDisplayNodeFailAssert(@"Subnode of a rasterized node should not have redundant -enableSubtreeRasterization.");
-    return;
-  }
-
-  // Ensure not loaded.
-  if ([self _locked_isNodeLoaded]) {
-    ASDisplayNodeFailAssert(@"Cannot call %@ on loaded node: %@", NSStringFromSelector(_cmd), self);
-    return;
-  }
-
-  // Ensure no loaded subnodes
-  ASDisplayNode *loadedSubnode = ASDisplayNodeFindFirstSubnode(self, ^BOOL(ASDisplayNode * _Nonnull node) {
-    return node.nodeLoaded;
-  });
-  if (loadedSubnode != nil) {
-      ASDisplayNodeFailAssert(@"Cannot call %@ on node %@ with loaded subnode %@", NSStringFromSelector(_cmd), self, loadedSubnode);
-      return;
-  }
-
-  _flags.rasterizesSubtree = YES;
-
-  // Tell subnodes that now they're in a rasterized hierarchy (while holding lock!)
-  for (ASDisplayNode *subnode in _subnodes) {
-    [subnode enterHierarchyState:ASHierarchyStateRasterized];
-  }
-}
-
-- (CGFloat)contentsScaleForDisplay
-{
-  ASDN::MutexLocker l(__instanceLock__);
-
-  return _contentsScaleForDisplay;
-}
-
-- (void)setContentsScaleForDisplay:(CGFloat)contentsScaleForDisplay
-{
-  ASDN::MutexLocker l(__instanceLock__);
-
-  if (_contentsScaleForDisplay == contentsScaleForDisplay) {
-    return;
-  }
-
-  _contentsScaleForDisplay = contentsScaleForDisplay;
-}
-
-- (void)displayImmediately
-{
-  ASDisplayNodeAssertMainThread();
-  ASDisplayNodeAssert(!checkFlag(Synchronous), @"this method is designed for asynchronous mode only");
-
-  [self.asyncLayer displayImmediately];
-}
-
-- (void)recursivelyDisplayImmediately
-{
-  for (ASDisplayNode *child in self.subnodes) {
-    [child recursivelyDisplayImmediately];
-  }
-  [self displayImmediately];
-}
-
-- (void)__setNeedsDisplay
-{
-  BOOL shouldScheduleForDisplay = NO;
-  {
-    ASDN::MutexLocker l(__instanceLock__);
-    BOOL nowDisplay = ASInterfaceStateIncludesDisplay(_interfaceState);
-    // FIXME: This should not need to recursively display, so create a non-recursive variant.
-    // The semantics of setNeedsDisplay (as defined by CALayer behavior) are not recursive.
-    if (_layer != nil && !checkFlag(Synchronous) && nowDisplay && [self _implementsDisplay]) {
-      shouldScheduleForDisplay = YES;
-    }
-  }
-  
-  if (shouldScheduleForDisplay) {
-    [ASDisplayNode scheduleNodeForRecursiveDisplay:self];
-  }
-}
-
-+ (void)scheduleNodeForRecursiveDisplay:(ASDisplayNode *)node
-{
-  static dispatch_once_t onceToken;
-  static ASRunLoopQueue<ASDisplayNode *> *renderQueue;
-  dispatch_once(&onceToken, ^{
-    renderQueue = [[ASRunLoopQueue<ASDisplayNode *> alloc] initWithRunLoop:CFRunLoopGetMain()
-                                                             retainObjects:NO
-                                                                   handler:^(ASDisplayNode * _Nonnull dequeuedItem, BOOL isQueueDrained) {
-      [dequeuedItem _recursivelyTriggerDisplayAndBlock:NO];
-      if (isQueueDrained) {
-        CFTimeInterval timestamp = CACurrentMediaTime();
-        [[NSNotificationCenter defaultCenter] postNotificationName:ASRenderingEngineDidDisplayScheduledNodesNotification
-                                                            object:nil
-                                                          userInfo:@{ASRenderingEngineDidDisplayNodesScheduledBeforeTimestamp: @(timestamp)}];
-      }
-    }];
-  });
-
-  as_log_verbose(ASDisplayLog(), "%s %@", sel_getName(_cmd), node);
-  [renderQueue enqueue:node];
-}
-
-/// Helper method to summarize whether or not the node run through the display process
-- (BOOL)_implementsDisplay
-{
-  ASDN::MutexLocker l(__instanceLock__);
-  
-  return _flags.implementsDrawRect || _flags.implementsImageDisplay || _flags.rasterizesSubtree;
-}
-
-// Track that a node will be displayed as part of the current node hierarchy.
-// The node sending the message should usually be passed as the parameter, similar to the delegation pattern.
-- (void)_pendingNodeWillDisplay:(ASDisplayNode *)node
-{
-  ASDisplayNodeAssertMainThread();
-
-  // No lock needed as _pendingDisplayNodes is main thread only
-  if (!_pendingDisplayNodes) {
-    _pendingDisplayNodes = [[ASWeakSet alloc] init];
-  }
-
-  [_pendingDisplayNodes addObject:node];
-}
-
-// Notify that a node that was pending display finished
-// The node sending the message should usually be passed as the parameter, similar to the delegation pattern.
-- (void)_pendingNodeDidDisplay:(ASDisplayNode *)node
-{
-  ASDisplayNodeAssertMainThread();
-
-  // No lock for _pendingDisplayNodes needed as it's main thread only
-  [_pendingDisplayNodes removeObject:node];
-
-  if (_pendingDisplayNodes.isEmpty) {
-    
-    [self hierarchyDisplayDidFinish];
-    [self enumerateInterfaceStateDelegates:^(id<ASInterfaceStateDelegate> delegate) {
-      [delegate hierarchyDisplayDidFinish];
-    }];
-      
-    BOOL placeholderShouldPersist = [self placeholderShouldPersist];
-
-    __instanceLock__.lock();
-    if (_placeholderLayer.superlayer && !placeholderShouldPersist) {
-      void (^cleanupBlock)() = ^{
-        [_placeholderLayer removeFromSuperlayer];
-      };
-
-      if (_placeholderFadeDuration > 0.0 && ASInterfaceStateIncludesVisible(self.interfaceState)) {
-        [CATransaction begin];
-        [CATransaction setCompletionBlock:cleanupBlock];
-        [CATransaction setAnimationDuration:_placeholderFadeDuration];
-        _placeholderLayer.opacity = 0.0;
-        [CATransaction commit];
-      } else {
-        cleanupBlock();
-      }
-    }
-    __instanceLock__.unlock();
-  }
-}
-
-- (void)hierarchyDisplayDidFinish
-{
-  // Subclass hook
-}
-
-// Helper method to determine if it's safe to call setNeedsDisplay on a layer without throwing away the content.
-// For details look at the comment on the canCallSetNeedsDisplayOfLayer flag
-- (BOOL)_canCallSetNeedsDisplayOfLayer
-{
-  ASDN::MutexLocker l(__instanceLock__);
-  return _flags.canCallSetNeedsDisplayOfLayer;
-}
-
-void recursivelyTriggerDisplayForLayer(CALayer *layer, BOOL shouldBlock)
-{
-  // This recursion must handle layers in various states:
-  // 1. Just added to hierarchy, CA hasn't yet called -display
-  // 2. Previously in a hierarchy (such as a working window owned by an Intelligent Preloading class, like ASTableView / ASCollectionView / ASViewController)
-  // 3. Has no content to display at all
-  // Specifically for case 1), we need to explicitly trigger a -display call now.
-  // Otherwise, there is no opportunity to block the main thread after CoreAnimation's transaction commit
-  // (even a runloop observer at a late call order will not stop the next frame from compositing, showing placeholders).
-  
-  ASDisplayNode *node = [layer asyncdisplaykit_node];
-  
-  if (node.isSynchronous && [node _canCallSetNeedsDisplayOfLayer]) {
-    // Layers for UIKit components that are wrapped within a node needs to be set to be displayed as the contents of
-    // the layer get's cleared and would not be recreated otherwise.
-    // We do not call this for _ASDisplayLayer as an optimization.
-    [layer setNeedsDisplay];
-  }
-  
-  if ([node _implementsDisplay]) {
-    // For layers that do get displayed here, this immediately kicks off the work on the concurrent -[_ASDisplayLayer displayQueue].
-    // At the same time, it creates an associated _ASAsyncTransaction, which we can use to block on display completion.  See ASDisplayNode+AsyncDisplay.mm.
-    [layer displayIfNeeded];
-  }
-  
-  // Kick off the recursion first, so that all necessary display calls are sent and the displayQueue is full of parallelizable work.
-  // NOTE: The docs report that `sublayers` returns a copy but it actually doesn't.
-  for (CALayer *sublayer in [layer.sublayers copy]) {
-    recursivelyTriggerDisplayForLayer(sublayer, shouldBlock);
-  }
-  
-  if (shouldBlock) {
-    // As the recursion unwinds, verify each transaction is complete and block if it is not.
-    // While blocking on one transaction, others may be completing concurrently, so it doesn't matter which blocks first.
-    BOOL waitUntilComplete = (!node.shouldBypassEnsureDisplay);
-    if (waitUntilComplete) {
-      for (_ASAsyncTransaction *transaction in [layer.asyncdisplaykit_asyncLayerTransactions copy]) {
-        // Even if none of the layers have had a chance to start display earlier, they will still be allowed to saturate a multicore CPU while blocking main.
-        // This significantly reduces time on the main thread relative to UIKit.
-        [transaction waitUntilComplete];
-      }
-    }
-  }
-}
-
-- (void)_recursivelyTriggerDisplayAndBlock:(BOOL)shouldBlock
-{
-  ASDisplayNodeAssertMainThread();
-  
-  CALayer *layer = self.layer;
-  // -layoutIfNeeded is recursive, and even walks up to superlayers to check if they need layout,
-  // so we should call it outside of starting the recursion below.  If our own layer is not marked
-  // as dirty, we can assume layout has run on this subtree before.
-  if ([layer needsLayout]) {
-    [layer layoutIfNeeded];
-  }
-  recursivelyTriggerDisplayForLayer(layer, shouldBlock);
-}
-
-- (void)recursivelyEnsureDisplaySynchronously:(BOOL)synchronously
-{
-  [self _recursivelyTriggerDisplayAndBlock:synchronously];
-}
-
-- (void)setShouldBypassEnsureDisplay:(BOOL)shouldBypassEnsureDisplay
-{
-  ASDN::MutexLocker l(__instanceLock__);
-  _flags.shouldBypassEnsureDisplay = shouldBypassEnsureDisplay;
-}
-
-- (BOOL)shouldBypassEnsureDisplay
-{
-  ASDN::MutexLocker l(__instanceLock__);
-  return _flags.shouldBypassEnsureDisplay;
-}
-
-- (void)setNeedsDisplayAtScale:(CGFloat)contentsScale
-{
-  {
-    ASDN::MutexLocker l(__instanceLock__);
-    if (contentsScale == _contentsScaleForDisplay) {
-      return;
-    }
-    
-    _contentsScaleForDisplay = contentsScale;
-  }
-
-  [self setNeedsDisplay];
-}
-
-- (void)recursivelySetNeedsDisplayAtScale:(CGFloat)contentsScale
-{
-  ASDisplayNodePerformBlockOnEveryNode(nil, self, YES, ^(ASDisplayNode *node) {
-    [node setNeedsDisplayAtScale:contentsScale];
-  });
-}
-
-- (void)_layoutClipCornersIfNeeded
-{
-  ASDisplayNodeAssertMainThread();
-  if (_clipCornerLayers[0] == nil) {
-    return;
-  }
-  
-  CGSize boundsSize = self.bounds.size;
-  for (int idx = 0; idx < NUM_CLIP_CORNER_LAYERS; idx++) {
-    BOOL isTop   = (idx == 0 || idx == 1);
-    BOOL isRight = (idx == 1 || idx == 2);
-    if (_clipCornerLayers[idx]) {
-      // Note the Core Animation coordinates are reversed for y; 0 is at the bottom.
-      _clipCornerLayers[idx].position = CGPointMake(isRight ? boundsSize.width : 0.0, isTop ? boundsSize.height : 0.0);
-      [_layer addSublayer:_clipCornerLayers[idx]];
-    }
-  }
-}
-
-- (void)_updateClipCornerLayerContentsWithRadius:(CGFloat)radius backgroundColor:(UIColor *)backgroundColor
-{
-  ASPerformBlockOnMainThread(^{
-    for (int idx = 0; idx < NUM_CLIP_CORNER_LAYERS; idx++) {
-      // Layers are, in order: Top Left, Top Right, Bottom Right, Bottom Left.
-      // anchorPoint is Bottom Left at 0,0 and Top Right at 1,1.
-      BOOL isTop   = (idx == 0 || idx == 1);
-      BOOL isRight = (idx == 1 || idx == 2);
-      
-      CGSize size = CGSizeMake(radius + 1, radius + 1);
-      ASGraphicsBeginImageContextWithOptions(size, NO, self.contentsScaleForDisplay);
-      
-      CGContextRef ctx = UIGraphicsGetCurrentContext();
-      if (isRight == YES) {
-        CGContextTranslateCTM(ctx, -radius + 1, 0);
-      }
-      if (isTop == YES) {
-        CGContextTranslateCTM(ctx, 0, -radius + 1);
-      }
-      UIBezierPath *roundedRect = [UIBezierPath bezierPathWithRoundedRect:CGRectMake(0, 0, radius * 2, radius * 2) cornerRadius:radius];
-      [roundedRect setUsesEvenOddFillRule:YES];
-      [roundedRect appendPath:[UIBezierPath bezierPathWithRect:CGRectMake(-1, -1, radius * 2 + 1, radius * 2 + 1)]];
-      [backgroundColor setFill];
-      [roundedRect fill];
-      
-      // No lock needed, as _clipCornerLayers is only modified on the main thread.
-      CALayer *clipCornerLayer = _clipCornerLayers[idx];
-      clipCornerLayer.contents = (id)(ASGraphicsGetImageAndEndCurrentContext().CGImage);
-      clipCornerLayer.bounds = CGRectMake(0.0, 0.0, size.width, size.height);
-      clipCornerLayer.anchorPoint = CGPointMake(isRight ? 1.0 : 0.0, isTop ? 1.0 : 0.0);
-    }
-    [self _layoutClipCornersIfNeeded];
-  });
-}
-
-- (void)_setClipCornerLayersVisible:(BOOL)visible
-{
-  ASPerformBlockOnMainThread(^{
-    ASDisplayNodeAssertMainThread();
-    if (visible) {
-      for (int idx = 0; idx < NUM_CLIP_CORNER_LAYERS; idx++) {
-        if (_clipCornerLayers[idx] == nil) {
-          static ASDisplayNodeCornerLayerDelegate *clipCornerLayers;
-          static dispatch_once_t onceToken;
-          dispatch_once(&onceToken, ^{
-            clipCornerLayers = [[ASDisplayNodeCornerLayerDelegate alloc] init];
-          });
-          _clipCornerLayers[idx] = [[CALayer alloc] init];
-          _clipCornerLayers[idx].zPosition = 99999;
-          _clipCornerLayers[idx].delegate = clipCornerLayers;
-        }
-      }
-      [self _updateClipCornerLayerContentsWithRadius:_cornerRadius backgroundColor:self.backgroundColor];
-    } else {
-      for (int idx = 0; idx < NUM_CLIP_CORNER_LAYERS; idx++) {
-        [_clipCornerLayers[idx] removeFromSuperlayer];
-        _clipCornerLayers[idx] = nil;
-      }
-    }
-  });
-}
-
-- (void)updateCornerRoundingWithType:(ASCornerRoundingType)newRoundingType cornerRadius:(CGFloat)newCornerRadius
-{
-  __instanceLock__.lock();
-    CGFloat oldCornerRadius = _cornerRadius;
-    ASCornerRoundingType oldRoundingType = _cornerRoundingType;
-
-    _cornerRadius = newCornerRadius;
-    _cornerRoundingType = newRoundingType;
-  __instanceLock__.unlock();
- 
-  ASPerformBlockOnMainThread(^{
-    ASDisplayNodeAssertMainThread();
-    
-    if (oldRoundingType != newRoundingType || oldCornerRadius != newCornerRadius) {
-      if (oldRoundingType == ASCornerRoundingTypeDefaultSlowCALayer) {
-        if (newRoundingType == ASCornerRoundingTypePrecomposited) {
-          self.layerCornerRadius = 0.0;
-          if (oldCornerRadius > 0.0) {
-            [self displayImmediately];
-          } else {
-            [self setNeedsDisplay]; // Async display is OK if we aren't replacing an existing .cornerRadius.
-          }
-        }
-        else if (newRoundingType == ASCornerRoundingTypeClipping) {
-          self.layerCornerRadius = 0.0;
-          [self _setClipCornerLayersVisible:YES];
-        } else if (newRoundingType == ASCornerRoundingTypeDefaultSlowCALayer) {
-          self.layerCornerRadius = newCornerRadius;
-        }
-      }
-      else if (oldRoundingType == ASCornerRoundingTypePrecomposited) {
-        if (newRoundingType == ASCornerRoundingTypeDefaultSlowCALayer) {
-          self.layerCornerRadius = newCornerRadius;
-          [self setNeedsDisplay];
-        }
-        else if (newRoundingType == ASCornerRoundingTypePrecomposited) {
-          // Corners are already precomposited, but the radius has changed.
-          // Default to async re-display.  The user may force a synchronous display if desired.
-          [self setNeedsDisplay];
-        }
-        else if (newRoundingType == ASCornerRoundingTypeClipping) {
-          [self _setClipCornerLayersVisible:YES];
-          [self setNeedsDisplay];
-        }
-      }
-      else if (oldRoundingType == ASCornerRoundingTypeClipping) {
-        if (newRoundingType == ASCornerRoundingTypeDefaultSlowCALayer) {
-          self.layerCornerRadius = newCornerRadius;
-          [self _setClipCornerLayersVisible:NO];
-        }
-        else if (newRoundingType == ASCornerRoundingTypePrecomposited) {
-          [self _setClipCornerLayersVisible:NO];
-          [self displayImmediately];
-        }
-        else if (newRoundingType == ASCornerRoundingTypeClipping) {
-          // Clip corners already exist, but the radius has changed.
-          [self _updateClipCornerLayerContentsWithRadius:newCornerRadius backgroundColor:self.backgroundColor];
-        }
-      }
-    }
-  });
-}
-
-- (void)recursivelySetDisplaySuspended:(BOOL)flag
-{
-  _recursivelySetDisplaySuspended(self, nil, flag);
-}
-
-// TODO: Replace this with ASDisplayNodePerformBlockOnEveryNode or a variant with a condition / test block.
-static void _recursivelySetDisplaySuspended(ASDisplayNode *node, CALayer *layer, BOOL flag)
-{
-  // If there is no layer, but node whose its view is loaded, then we can traverse down its layer hierarchy.  Otherwise we must stick to the node hierarchy to avoid loading views prematurely.  Note that for nodes that haven't loaded their views, they can't possibly have subviews/sublayers, so we don't need to traverse the layer hierarchy for them.
-  if (!layer && node && node.nodeLoaded) {
-    layer = node.layer;
-  }
-
-  // If we don't know the node, but the layer is an async layer, get the node from the layer.
-  if (!node && layer && [layer isKindOfClass:[_ASDisplayLayer class]]) {
-    node = layer.asyncdisplaykit_node;
-  }
-
-  // Set the flag on the node.  If this is a pure layer (no node) then this has no effect (plain layers don't support preventing/cancelling display).
-  node.displaySuspended = flag;
-
-  if (layer && !node.rasterizesSubtree) {
-    // If there is a layer, recurse down the layer hierarchy to set the flag on descendants.  This will cover both layer-based and node-based children.
-    for (CALayer *sublayer in layer.sublayers) {
-      _recursivelySetDisplaySuspended(nil, sublayer, flag);
-    }
-  } else {
-    // If there is no layer (view not loaded yet) or this node rasterizes descendants (there won't be a layer tree to traverse), recurse down the subnode hierarchy to set the flag on descendants.  This covers only node-based children, but for a node whose view is not loaded it can't possibly have nodeless children.
-    for (ASDisplayNode *subnode in node.subnodes) {
-      _recursivelySetDisplaySuspended(subnode, nil, flag);
-    }
-  }
-}
-
-- (BOOL)displaySuspended
-{
-  ASDN::MutexLocker l(__instanceLock__);
-  return _flags.displaySuspended;
-}
-
-- (void)setDisplaySuspended:(BOOL)flag
-{
-  ASDisplayNodeAssertThreadAffinity(self);
-  __instanceLock__.lock();
-
-  // Can't do this for synchronous nodes (using layers that are not _ASDisplayLayer and so we can't control display prevention/cancel)
-  if (checkFlag(Synchronous) || _flags.displaySuspended == flag) {
-    __instanceLock__.unlock();
-    return;
-  }
-
-  _flags.displaySuspended = flag;
-
-  self._locked_asyncLayer.displaySuspended = flag;
-  
-  ASDisplayNode *supernode = _supernode;
-  __instanceLock__.unlock();
-
-  if ([self _implementsDisplay]) {
-    // Display start and finish methods needs to happen on the main thread
-    ASPerformBlockOnMainThread(^{
-      if (flag) {
-        [supernode subnodeDisplayDidFinish:self];
-      } else {
-        [supernode subnodeDisplayWillStart:self];
-      }
-    });
-  }
-}
-
-#pragma mark <_ASDisplayLayerDelegate>
-
-- (void)willDisplayAsyncLayer:(_ASDisplayLayer *)layer asynchronously:(BOOL)asynchronously
-{
-  // Subclass hook.
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
-  [self displayWillStart];
-#pragma clang diagnostic pop
-
-  [self displayWillStartAsynchronously:asynchronously];
-}
-
-- (void)didDisplayAsyncLayer:(_ASDisplayLayer *)layer
-{
-  // Subclass hook.
-  [self displayDidFinish];
-}
-
-- (void)displayWillStart {}
-- (void)displayWillStartAsynchronously:(BOOL)asynchronously
-{
-  ASDisplayNodeAssertMainThread();
-
-  ASDisplayNodeLogEvent(self, @"displayWillStart");
-  // in case current node takes longer to display than it's subnodes, treat it as a dependent node
-  [self _pendingNodeWillDisplay:self];
-  
-  __instanceLock__.lock();
-  ASDisplayNode *supernode = _supernode;
-  __instanceLock__.unlock();
-  
-  [supernode subnodeDisplayWillStart:self];
-}
-
-- (void)displayDidFinish
-{
-  ASDisplayNodeAssertMainThread();
-  
-  ASDisplayNodeLogEvent(self, @"displayDidFinish");
-  [self _pendingNodeDidDisplay:self];
-
-  __instanceLock__.lock();
-  ASDisplayNode *supernode = _supernode;
-  __instanceLock__.unlock();
-  
-  [supernode subnodeDisplayDidFinish:self];
-}
-
-- (void)subnodeDisplayWillStart:(ASDisplayNode *)subnode
-{
-  // Subclass hook
-  [self _pendingNodeWillDisplay:subnode];
-}
-
-- (void)subnodeDisplayDidFinish:(ASDisplayNode *)subnode
-{
-  // Subclass hook
-  [self _pendingNodeDidDisplay:subnode];
-}
-
-#pragma mark <CALayerDelegate>
-
-// We are only the delegate for the layer when we are layer-backed, as UIView performs this function normally
-- (id<CAAction>)actionForLayer:(CALayer *)layer forKey:(NSString *)event
-{
-  if (event == kCAOnOrderIn) {
-    [self __enterHierarchy];
-  } else if (event == kCAOnOrderOut) {
-    [self __exitHierarchy];
-  }
-
-  ASDisplayNodeAssert(_flags.layerBacked, @"We shouldn't get called back here unless we are layer-backed.");
-  return (id)kCFNull;
-}
-
-#pragma mark - Error Handling
-
-+ (void)setNonFatalErrorBlock:(ASDisplayNodeNonFatalErrorBlock)nonFatalErrorBlock
-{
-  if (_nonFatalErrorBlock != nonFatalErrorBlock) {
-    _nonFatalErrorBlock = [nonFatalErrorBlock copy];
-  }
-}
-
-+ (ASDisplayNodeNonFatalErrorBlock)nonFatalErrorBlock
-{
-  return _nonFatalErrorBlock;
-}
-
-#pragma mark - Converting to and from the Node's Coordinate System
-
-- (CATransform3D)_transformToAncestor:(ASDisplayNode *)ancestor
-{
-  CATransform3D transform = CATransform3DIdentity;
-  ASDisplayNode *currentNode = self;
-  while (currentNode.supernode) {
-    if (currentNode == ancestor) {
-      return transform;
-    }
-
-    CGPoint anchorPoint = currentNode.anchorPoint;
-    CGRect bounds = currentNode.bounds;
-    CGPoint position = currentNode.position;
-    CGPoint origin = CGPointMake(position.x - bounds.size.width * anchorPoint.x,
-                                 position.y - bounds.size.height * anchorPoint.y);
-
-    transform = CATransform3DTranslate(transform, origin.x, origin.y, 0);
-    transform = CATransform3DTranslate(transform, -bounds.origin.x, -bounds.origin.y, 0);
-    currentNode = currentNode.supernode;
-  }
-  return transform;
-}
-
-static inline CATransform3D _calculateTransformFromReferenceToTarget(ASDisplayNode *referenceNode, ASDisplayNode *targetNode)
-{
-  ASDisplayNode *ancestor = ASDisplayNodeFindClosestCommonAncestor(referenceNode, targetNode);
-
-  // Transform into global (away from reference coordinate space)
-  CATransform3D transformToGlobal = [referenceNode _transformToAncestor:ancestor];
-
-  // Transform into local (via inverse transform from target to ancestor)
-  CATransform3D transformToLocal = CATransform3DInvert([targetNode _transformToAncestor:ancestor]);
-
-  return CATransform3DConcat(transformToGlobal, transformToLocal);
-}
-
-- (CGPoint)convertPoint:(CGPoint)point fromNode:(ASDisplayNode *)node
-{
-  ASDisplayNodeAssertThreadAffinity(self);
-  
-  /**
-   * When passed node=nil, all methods in this family use the UIView-style
-   * behavior – that is, convert from/to window coordinates if there's a window,
-   * otherwise return the point untransformed.
-   */
-  if (node == nil && self.nodeLoaded) {
-    CALayer *layer = self.layer;
-    if (UIWindow *window = ASFindWindowOfLayer(layer)) {
-      return [layer convertPoint:point fromLayer:window.layer];
-    } else {
-      return point;
-    }
-  }
-  
-  // Get root node of the accessible node hierarchy, if node not specified
-  node = node ? : ASDisplayNodeUltimateParentOfNode(self);
-
-  // Calculate transform to map points between coordinate spaces
-  CATransform3D nodeTransform = _calculateTransformFromReferenceToTarget(node, self);
-  CGAffineTransform flattenedTransform = CATransform3DGetAffineTransform(nodeTransform);
-  ASDisplayNodeAssertTrue(CATransform3DIsAffine(nodeTransform));
-
-  // Apply to point
-  return CGPointApplyAffineTransform(point, flattenedTransform);
-}
-
-- (CGPoint)convertPoint:(CGPoint)point toNode:(ASDisplayNode *)node
-{
-  ASDisplayNodeAssertThreadAffinity(self);
-  
-  if (node == nil && self.nodeLoaded) {
-    CALayer *layer = self.layer;
-    if (UIWindow *window = ASFindWindowOfLayer(layer)) {
-      return [layer convertPoint:point toLayer:window.layer];
-    } else {
-      return point;
-    }
-  }
-  
-  // Get root node of the accessible node hierarchy, if node not specified
-  node = node ? : ASDisplayNodeUltimateParentOfNode(self);
-
-  // Calculate transform to map points between coordinate spaces
-  CATransform3D nodeTransform = _calculateTransformFromReferenceToTarget(self, node);
-  CGAffineTransform flattenedTransform = CATransform3DGetAffineTransform(nodeTransform);
-  ASDisplayNodeAssertTrue(CATransform3DIsAffine(nodeTransform));
-
-  // Apply to point
-  return CGPointApplyAffineTransform(point, flattenedTransform);
-}
-
-- (CGRect)convertRect:(CGRect)rect fromNode:(ASDisplayNode *)node
-{
-  ASDisplayNodeAssertThreadAffinity(self);
-  
-  if (node == nil && self.nodeLoaded) {
-    CALayer *layer = self.layer;
-    if (UIWindow *window = ASFindWindowOfLayer(layer)) {
-      return [layer convertRect:rect fromLayer:window.layer];
-    } else {
-      return rect;
-    }
-  }
-  
-  // Get root node of the accessible node hierarchy, if node not specified
-  node = node ? : ASDisplayNodeUltimateParentOfNode(self);
-
-  // Calculate transform to map points between coordinate spaces
-  CATransform3D nodeTransform = _calculateTransformFromReferenceToTarget(node, self);
-  CGAffineTransform flattenedTransform = CATransform3DGetAffineTransform(nodeTransform);
-  ASDisplayNodeAssertTrue(CATransform3DIsAffine(nodeTransform));
-
-  // Apply to rect
-  return CGRectApplyAffineTransform(rect, flattenedTransform);
-}
-
-- (CGRect)convertRect:(CGRect)rect toNode:(ASDisplayNode *)node
-{
-  ASDisplayNodeAssertThreadAffinity(self);
-  
-  if (node == nil && self.nodeLoaded) {
-    CALayer *layer = self.layer;
-    if (UIWindow *window = ASFindWindowOfLayer(layer)) {
-      return [layer convertRect:rect toLayer:window.layer];
-    } else {
-      return rect;
-    }
-  }
-  
-  // Get root node of the accessible node hierarchy, if node not specified
-  node = node ? : ASDisplayNodeUltimateParentOfNode(self);
-
-  // Calculate transform to map points between coordinate spaces
-  CATransform3D nodeTransform = _calculateTransformFromReferenceToTarget(self, node);
-  CGAffineTransform flattenedTransform = CATransform3DGetAffineTransform(nodeTransform);
-  ASDisplayNodeAssertTrue(CATransform3DIsAffine(nodeTransform));
-
-  // Apply to rect
-  return CGRectApplyAffineTransform(rect, flattenedTransform);
-}
-
-#pragma mark - Managing the Node Hierarchy
-
-ASDISPLAYNODE_INLINE bool shouldDisableNotificationsForMovingBetweenParents(ASDisplayNode *from, ASDisplayNode *to) {
-  if (!from || !to) return NO;
-  if (from.isSynchronous) return NO;
-  if (to.isSynchronous) return NO;
-  if (from.isInHierarchy != to.isInHierarchy) return NO;
-  return YES;
-}
-
-/// Returns incremented value of i if i is not NSNotFound
-ASDISPLAYNODE_INLINE NSInteger incrementIfFound(NSInteger i) {
-  return i == NSNotFound ? NSNotFound : i + 1;
-}
-
-/// Returns if a node is a member of a rasterized tree
-ASDISPLAYNODE_INLINE BOOL canUseViewAPI(ASDisplayNode *node, ASDisplayNode *subnode) {
-  return (subnode.isLayerBacked == NO && node.isLayerBacked == NO);
-}
-
-/// Returns if node is a member of a rasterized tree
-ASDISPLAYNODE_INLINE BOOL subtreeIsRasterized(ASDisplayNode *node) {
-  return (node.rasterizesSubtree || (node.hierarchyState & ASHierarchyStateRasterized));
-}
-
-// NOTE: This method must be dealloc-safe (should not retain self).
-- (ASDisplayNode *)supernode
-{
-#if CHECK_LOCKING_SAFETY
-  if (__instanceLock__.locked()) {
-    NSLog(@"WARNING: Accessing supernode while holding recursive instance lock of this node is worrisome. It's likely that you will soon try to acquire the supernode's lock, and this can easily cause deadlocks.");
-  }
-#endif
-  
-  ASDN::MutexLocker l(__instanceLock__);
-  return _supernode;
-}
-
-- (void)_setSupernode:(ASDisplayNode *)newSupernode
-{
-  BOOL supernodeDidChange = NO;
-  ASDisplayNode *oldSupernode = nil;
-  {
-    ASDN::MutexLocker l(__instanceLock__);
-    if (_supernode != newSupernode) {
-      oldSupernode = _supernode;  // Access supernode properties outside of lock to avoid remote chance of deadlock,
-                                  // in case supernode implementation must access one of our properties.
-      _supernode = newSupernode;
-      supernodeDidChange = YES;
-    }
-  }
-  
-  if (supernodeDidChange) {
-    ASDisplayNodeLogEvent(self, @"supernodeDidChange: %@, oldValue = %@", ASObjectDescriptionMakeTiny(newSupernode), ASObjectDescriptionMakeTiny(oldSupernode));
-    // Hierarchy state
-    ASHierarchyState stateToEnterOrExit = (newSupernode ? newSupernode.hierarchyState
-                                                        : oldSupernode.hierarchyState);
-    
-    // Rasterized state
-    BOOL parentWasOrIsRasterized        = (newSupernode ? newSupernode.rasterizesSubtree
-                                                        : oldSupernode.rasterizesSubtree);
-    if (parentWasOrIsRasterized) {
-      stateToEnterOrExit |= ASHierarchyStateRasterized;
-    }
-    if (newSupernode) {
-      [self enterHierarchyState:stateToEnterOrExit];
-      
-      // If a node was added to a supernode, the supernode could be in a layout pending state. All of the hierarchy state
-      // properties related to the transition need to be copied over as well as propagated down the subtree.
-      // This is especially important as with automatic subnode management, adding subnodes can happen while a transition
-      // is in fly
-      if (ASHierarchyStateIncludesLayoutPending(stateToEnterOrExit)) {
-        int32_t pendingTransitionId = newSupernode->_pendingTransitionID;
-        if (pendingTransitionId != ASLayoutElementContextInvalidTransitionID) {
-          {
-            _pendingTransitionID = pendingTransitionId;
-            
-            // Propagate down the new pending transition id
-            ASDisplayNodePerformBlockOnEverySubnode(self, NO, ^(ASDisplayNode * _Nonnull node) {
-              node->_pendingTransitionID = pendingTransitionId;
-            });
-          }
-        }
-      }
-      
-      // Now that we have a supernode, propagate its traits to self.
-      ASTraitCollectionPropagateDown(self, newSupernode.primitiveTraitCollection);
-      
-    } else {
-      // If a node will be removed from the supernode it should go out from the layout pending state to remove all
-      // layout pending state related properties on the node
-      stateToEnterOrExit |= ASHierarchyStateLayoutPending;
-      
-      [self exitHierarchyState:stateToEnterOrExit];
-
-      // We only need to explicitly exit hierarchy here if we were rasterized.
-      // Otherwise we will exit the hierarchy when our view/layer does so
-      // which has some nice carry-over machinery to handle cases where we are removed from a hierarchy
-      // and then added into it again shortly after.
-      __instanceLock__.lock();
-      BOOL isInHierarchy = _flags.isInHierarchy;
-      __instanceLock__.unlock();
-      
-      if (parentWasOrIsRasterized && isInHierarchy) {
-        [self __exitHierarchy];
-      }
-    }
-  }
-}
-
-- (NSArray *)subnodes
-{
-  ASDN::MutexLocker l(__instanceLock__);
-  if (_cachedSubnodes == nil) {
-    _cachedSubnodes = [_subnodes copy];
-  } else {
-    ASDisplayNodeAssert(ASObjectIsEqual(_cachedSubnodes, _subnodes), @"Expected _subnodes and _cachedSubnodes to have the same contents.");
-  }
-  return _cachedSubnodes ?: @[];
-}
-
-/*
- * Central private helper method that should eventually be called if submethods add, insert or replace subnodes
- * This method is called with thread affinity and without lock held.
- *
- * @param subnode       The subnode to insert
- * @param subnodeIndex  The index in _subnodes to insert it
- * @param viewSublayerIndex The index in layer.sublayers (not view.subviews) at which to insert the view (use if we can use the view API) otherwise pass NSNotFound
- * @param sublayerIndex The index in layer.sublayers at which to insert the layer (use if either parent or subnode is layer-backed) otherwise pass NSNotFound
- * @param oldSubnode Remove this subnode before inserting; ok to be nil if no removal is desired
- */
-- (void)_insertSubnode:(ASDisplayNode *)subnode atSubnodeIndex:(NSInteger)subnodeIndex sublayerIndex:(NSInteger)sublayerIndex andRemoveSubnode:(ASDisplayNode *)oldSubnode
-{
-  ASDisplayNodeAssertThreadAffinity(self);
-  ASAssertUnlocked(__instanceLock__);
-  
-  as_log_verbose(ASNodeLog(), "Insert subnode %@ at index %zd of %@ and remove subnode %@", subnode, subnodeIndex, self, oldSubnode);
-  
-  if (subnode == nil || subnode == self) {
-    ASDisplayNodeFailAssert(@"Cannot insert a nil subnode or self as subnode");
-    return;
-  }
-  
-  if (subnodeIndex == NSNotFound) {
-    ASDisplayNodeFailAssert(@"Try to insert node on an index that was not found");
-    return;
-  }
-  
-  if (self.layerBacked && !subnode.layerBacked) {
-    ASDisplayNodeFailAssert(@"Cannot add a view-backed node as a subnode of a layer-backed node. Supernode: %@, subnode: %@", self, subnode);
-    return;
-  }
-
-  BOOL isRasterized = subtreeIsRasterized(self);
-  if (isRasterized && subnode.nodeLoaded) {
-    ASDisplayNodeFailAssert(@"Cannot add loaded node %@ to rasterized subtree of node %@", ASObjectDescriptionMakeTiny(subnode), ASObjectDescriptionMakeTiny(self));
-    return;
-  }
-
-  __instanceLock__.lock();
-    NSUInteger subnodesCount = _subnodes.count;
-  __instanceLock__.unlock();
-  if (subnodeIndex > subnodesCount || subnodeIndex < 0) {
-    ASDisplayNodeFailAssert(@"Cannot insert a subnode at index %ld. Count is %ld", (long)subnodeIndex, (long)subnodesCount);
-    return;
-  }
-  
-  // Disable appearance methods during move between supernodes, but make sure we restore their state after we do our thing
-  ASDisplayNode *oldParent = subnode.supernode;
-  BOOL disableNotifications = shouldDisableNotificationsForMovingBetweenParents(oldParent, self);
-  if (disableNotifications) {
-    [subnode __incrementVisibilityNotificationsDisabled];
-  }
-  
-  [subnode _removeFromSupernode];
-  [oldSubnode _removeFromSupernode];
-  
-  __instanceLock__.lock();
-    if (_subnodes == nil) {
-      _subnodes = [[NSMutableArray alloc] init];
-    }
-    [_subnodes insertObject:subnode atIndex:subnodeIndex];
-    _cachedSubnodes = nil;
-  __instanceLock__.unlock();
-  
-  // This call will apply our .hierarchyState to the new subnode.
-  // If we are a managed hierarchy, as in ASCellNode trees, it will also apply our .interfaceState.
-  [subnode _setSupernode:self];
-
-  // If this subnode will be rasterized, enter hierarchy if needed
-  // TODO: Move this into _setSupernode: ?
-  if (isRasterized) {
-    if (self.inHierarchy) {
-      [subnode __enterHierarchy];
-    }
-  } else if (self.nodeLoaded) {
-    // If not rasterizing, and node is loaded insert the subview/sublayer now.
-    [self _insertSubnodeSubviewOrSublayer:subnode atIndex:sublayerIndex];
-  } // Otherwise we will insert subview/sublayer when we get loaded
-
-  ASDisplayNodeAssert(disableNotifications == shouldDisableNotificationsForMovingBetweenParents(oldParent, self), @"Invariant violated");
-  if (disableNotifications) {
-    [subnode __decrementVisibilityNotificationsDisabled];
-  }
-}
-
-/*
- * Inserts the view or layer of the given node at the given index
- *
- * @param subnode       The subnode to insert
- * @param idx           The index in _view.subviews or _layer.sublayers at which to insert the subnode.view or
- *                      subnode.layer of the subnode
- */
-- (void)_insertSubnodeSubviewOrSublayer:(ASDisplayNode *)subnode atIndex:(NSInteger)idx
-{
-  ASDisplayNodeAssertMainThread();
-  ASDisplayNodeAssert(self.nodeLoaded, @"_insertSubnodeSubviewOrSublayer:atIndex: should never be called before our own view is created");
-
-  ASDisplayNodeAssert(idx != NSNotFound, @"Try to insert node on an index that was not found");
-  if (idx == NSNotFound) {
-    return;
-  }
-  
-  // Because the view and layer can only be created and destroyed on Main, that is also the only thread
-  // where the view and layer can change. We can avoid locking.
-
-  // If we can use view API, do. Due to an apple bug, -insertSubview:atIndex: actually wants a LAYER index,
-  // which we pass in.
-  if (canUseViewAPI(self, subnode)) {
-    [_view insertSubview:subnode.view atIndex:idx];
-  } else {
-    [_layer insertSublayer:subnode.layer atIndex:(unsigned int)idx];
-  }
-}
-
-- (void)addSubnode:(ASDisplayNode *)subnode
-{
-  ASDisplayNodeLogEvent(self, @"addSubnode: %@ with automaticallyManagesSubnodes: %@",
-                        subnode, self.automaticallyManagesSubnodes ? @"YES" : @"NO");
-  [self _addSubnode:subnode];
-}
-
-- (void)_addSubnode:(ASDisplayNode *)subnode
-{
-  ASDisplayNodeAssertThreadAffinity(self);
-  
-  ASDisplayNodeAssert(subnode, @"Cannot insert a nil subnode");
-    
-  // Don't add if it's already a subnode
-  ASDisplayNode *oldParent = subnode.supernode;
-  if (!subnode || subnode == self || oldParent == self) {
-    return;
-  }
-
-  NSUInteger subnodesIndex;
-  NSUInteger sublayersIndex;
-  {
-    ASDN::MutexLocker l(__instanceLock__);
-    subnodesIndex = _subnodes.count;
-    sublayersIndex = _layer.sublayers.count;
-  }
-  
-  [self _insertSubnode:subnode atSubnodeIndex:subnodesIndex sublayerIndex:sublayersIndex andRemoveSubnode:nil];
-}
-
-- (void)_addSubnodeViewsAndLayers
-{
-  ASDisplayNodeAssertMainThread();
-  
-  TIME_SCOPED(_debugTimeToAddSubnodeViews);
-  
-  for (ASDisplayNode *node in self.subnodes) {
-    [self _addSubnodeSubviewOrSublayer:node];
-  }
-}
-
-- (void)_addSubnodeSubviewOrSublayer:(ASDisplayNode *)subnode
-{
-  ASDisplayNodeAssertMainThread();
-  
-  // Due to a bug in Apple's framework we have to use the layer index to insert a subview
-  // so just use the count of the sublayers to add the subnode
-  NSInteger idx = _layer.sublayers.count; // No locking is needed as it's main thread only
-  [self _insertSubnodeSubviewOrSublayer:subnode atIndex:idx];
-}
-
-- (void)replaceSubnode:(ASDisplayNode *)oldSubnode withSubnode:(ASDisplayNode *)replacementSubnode
-{
-  ASDisplayNodeLogEvent(self, @"replaceSubnode: %@ withSubnode: %@ with automaticallyManagesSubnodes: %@",
-                        oldSubnode, replacementSubnode, self.automaticallyManagesSubnodes ? @"YES" : @"NO");
-  [self _replaceSubnode:oldSubnode withSubnode:replacementSubnode];
-}
-
-- (void)_replaceSubnode:(ASDisplayNode *)oldSubnode withSubnode:(ASDisplayNode *)replacementSubnode
-{
-  ASDisplayNodeAssertThreadAffinity(self);
-
-  if (replacementSubnode == nil) {
-    ASDisplayNodeFailAssert(@"Invalid subnode to replace");
-    return;
-  }
-  
-  if (oldSubnode.supernode != self) {
-    ASDisplayNodeFailAssert(@"Old Subnode to replace must be a subnode");
-    return;
-  }
-
-  ASDisplayNodeAssert(!(self.nodeLoaded && !oldSubnode.nodeLoaded), @"We have view loaded, but child node does not.");
-
-  NSInteger subnodeIndex;
-  NSInteger sublayerIndex = NSNotFound;
-  {
-    ASDN::MutexLocker l(__instanceLock__);
-    ASDisplayNodeAssert(_subnodes, @"You should have subnodes if you have a subnode");
-    
-    subnodeIndex = [_subnodes indexOfObjectIdenticalTo:oldSubnode];
-    
-    // Don't bother figuring out the sublayerIndex if in a rasterized subtree, because there are no layers in the
-    // hierarchy and none of this could possibly work.
-    if (subtreeIsRasterized(self) == NO) {
-      if (_layer) {
-        sublayerIndex = [_layer.sublayers indexOfObjectIdenticalTo:oldSubnode.layer];
-        ASDisplayNodeAssert(sublayerIndex != NSNotFound, @"Somehow oldSubnode's supernode is self, yet we could not find it in our layers to replace");
-        if (sublayerIndex == NSNotFound) {
-          return;
-        }
-      }
-    }
-  }
-
-  [self _insertSubnode:replacementSubnode atSubnodeIndex:subnodeIndex sublayerIndex:sublayerIndex andRemoveSubnode:oldSubnode];
-}
-
-- (void)insertSubnode:(ASDisplayNode *)subnode belowSubnode:(ASDisplayNode *)below
-{
-  ASDisplayNodeLogEvent(self, @"insertSubnode: %@ belowSubnode: %@ with automaticallyManagesSubnodes: %@",
-                        subnode, below, self.automaticallyManagesSubnodes ? @"YES" : @"NO");
-  [self _insertSubnode:subnode belowSubnode:below];
-}
-
-- (void)_insertSubnode:(ASDisplayNode *)subnode belowSubnode:(ASDisplayNode *)below
-{
-  ASDisplayNodeAssertThreadAffinity(self);
-  ASAssertUnlocked(__instanceLock__);
-
-  if (subnode == nil) {
-    ASDisplayNodeFailAssert(@"Cannot insert a nil subnode");
-    return;
-  }
-
-  if (below.supernode != self) {
-    ASDisplayNodeFailAssert(@"Node to insert below must be a subnode");
-    return;
-  }
-
-  NSInteger belowSubnodeIndex;
-  NSInteger belowSublayerIndex = NSNotFound;
-  {
-    ASDN::MutexLocker l(__instanceLock__);
-    ASDisplayNodeAssert(_subnodes, @"You should have subnodes if you have a subnode");
-    
-    belowSubnodeIndex = [_subnodes indexOfObjectIdenticalTo:below];
-    
-    // Don't bother figuring out the sublayerIndex if in a rasterized subtree, because there are no layers in the
-    // hierarchy and none of this could possibly work.
-    if (subtreeIsRasterized(self) == NO) {
-      if (_layer) {
-        belowSublayerIndex = [_layer.sublayers indexOfObjectIdenticalTo:below.layer];
-        ASDisplayNodeAssert(belowSublayerIndex != NSNotFound, @"Somehow below's supernode is self, yet we could not find it in our layers to reference");
-        if (belowSublayerIndex == NSNotFound)
-          return;
-      }
-      
-      ASDisplayNodeAssert(belowSubnodeIndex != NSNotFound, @"Couldn't find above in subnodes");
-      
-      // If the subnode is already in the subnodes array / sublayers and it's before the below node, removing it to
-      // insert it will mess up our calculation
-      if (subnode.supernode == self) {
-        NSInteger currentIndexInSubnodes = [_subnodes indexOfObjectIdenticalTo:subnode];
-        if (currentIndexInSubnodes < belowSubnodeIndex) {
-          belowSubnodeIndex--;
-        }
-        if (_layer) {
-          NSInteger currentIndexInSublayers = [_layer.sublayers indexOfObjectIdenticalTo:subnode.layer];
-          if (currentIndexInSublayers < belowSublayerIndex) {
-            belowSublayerIndex--;
-          }
-        }
-      }
-    }
-  }
-
-  ASDisplayNodeAssert(belowSubnodeIndex != NSNotFound, @"Couldn't find below in subnodes");
-
-  [self _insertSubnode:subnode atSubnodeIndex:belowSubnodeIndex sublayerIndex:belowSublayerIndex andRemoveSubnode:nil];
-}
-
-- (void)insertSubnode:(ASDisplayNode *)subnode aboveSubnode:(ASDisplayNode *)above
-{
-  ASDisplayNodeLogEvent(self, @"insertSubnode: %@ abodeSubnode: %@ with automaticallyManagesSubnodes: %@",
-                        subnode, above, self.automaticallyManagesSubnodes ? @"YES" : @"NO");
-  [self _insertSubnode:subnode aboveSubnode:above];
-}
-
-- (void)_insertSubnode:(ASDisplayNode *)subnode aboveSubnode:(ASDisplayNode *)above
-{
-  ASDisplayNodeAssertThreadAffinity(self);
-  ASAssertUnlocked(__instanceLock__);
-
-  if (subnode == nil) {
-    ASDisplayNodeFailAssert(@"Cannot insert a nil subnode");
-    return;
-  }
-
-  if (above.supernode != self) {
-    ASDisplayNodeFailAssert(@"Node to insert above must be a subnode");
-    return;
-  }
-
-  NSInteger aboveSubnodeIndex;
-  NSInteger aboveSublayerIndex = NSNotFound;
-  {
-    ASDN::MutexLocker l(__instanceLock__);
-    ASDisplayNodeAssert(_subnodes, @"You should have subnodes if you have a subnode");
-    
-    aboveSubnodeIndex = [_subnodes indexOfObjectIdenticalTo:above];
-    
-    // Don't bother figuring out the sublayerIndex if in a rasterized subtree, because there are no layers in the
-    // hierarchy and none of this could possibly work.
-    if (subtreeIsRasterized(self) == NO) {
-      if (_layer) {
-        aboveSublayerIndex = [_layer.sublayers indexOfObjectIdenticalTo:above.layer];
-        ASDisplayNodeAssert(aboveSublayerIndex != NSNotFound, @"Somehow above's supernode is self, yet we could not find it in our layers to replace");
-        if (aboveSublayerIndex == NSNotFound)
-          return;
-      }
-      
-      ASDisplayNodeAssert(aboveSubnodeIndex != NSNotFound, @"Couldn't find above in subnodes");
-      
-      // If the subnode is already in the subnodes array / sublayers and it's before the below node, removing it to
-      // insert it will mess up our calculation
-      if (subnode.supernode == self) {
-        NSInteger currentIndexInSubnodes = [_subnodes indexOfObjectIdenticalTo:subnode];
-        if (currentIndexInSubnodes <= aboveSubnodeIndex) {
-          aboveSubnodeIndex--;
-        }
-        if (_layer) {
-          NSInteger currentIndexInSublayers = [_layer.sublayers indexOfObjectIdenticalTo:subnode.layer];
-          if (currentIndexInSublayers <= aboveSublayerIndex) {
-            aboveSublayerIndex--;
-          }
-        }
-      }
-    }
-  }
-
-  [self _insertSubnode:subnode atSubnodeIndex:incrementIfFound(aboveSubnodeIndex) sublayerIndex:incrementIfFound(aboveSublayerIndex) andRemoveSubnode:nil];
-}
-
-- (void)insertSubnode:(ASDisplayNode *)subnode atIndex:(NSInteger)idx
-{
-  ASDisplayNodeLogEvent(self, @"insertSubnode: %@ atIndex: %td with automaticallyManagesSubnodes: %@",
-                        subnode, idx, self.automaticallyManagesSubnodes ? @"YES" : @"NO");
-  [self _insertSubnode:subnode atIndex:idx];
-}
-
-- (void)_insertSubnode:(ASDisplayNode *)subnode atIndex:(NSInteger)idx
-{
-  ASDisplayNodeAssertThreadAffinity(self);
-  ASAssertUnlocked(__instanceLock__);
-  
-  if (subnode == nil) {
-    ASDisplayNodeFailAssert(@"Cannot insert a nil subnode");
-    return;
-  }
-
-  NSInteger sublayerIndex = NSNotFound;
-  {
-    ASDN::MutexLocker l(__instanceLock__);
-    
-    if (idx > _subnodes.count || idx < 0) {
-      ASDisplayNodeFailAssert(@"Cannot insert a subnode at index %ld. Count is %ld", (long)idx, (long)_subnodes.count);
-      return;
-    }
-    
-    // Don't bother figuring out the sublayerIndex if in a rasterized subtree, because there are no layers in the
-    // hierarchy and none of this could possibly work.
-    if (subtreeIsRasterized(self) == NO) {
-      // Account for potentially having other subviews
-      if (_layer && idx == 0) {
-        sublayerIndex = 0;
-      } else if (_layer) {
-        ASDisplayNode *positionInRelationTo = (_subnodes.count > 0 && idx > 0) ? _subnodes[idx - 1] : nil;
-        if (positionInRelationTo) {
-          sublayerIndex = incrementIfFound([_layer.sublayers indexOfObjectIdenticalTo:positionInRelationTo.layer]);
-        }
-      }
-    }
-  }
-
-  [self _insertSubnode:subnode atSubnodeIndex:idx sublayerIndex:sublayerIndex andRemoveSubnode:nil];
-}
-
-- (void)_removeSubnode:(ASDisplayNode *)subnode
-{
-  ASDisplayNodeAssertThreadAffinity(self);
-  ASAssertUnlocked(__instanceLock__);
-  
-  // Don't call self.supernode here because that will retain/autorelease the supernode.  This method -_removeSupernode: is often called while tearing down a node hierarchy, and the supernode in question might be in the middle of its -dealloc.  The supernode is never messaged, only compared by value, so this is safe.
-  // The particular issue that triggers this edge case is when a node calls -removeFromSupernode on a subnode from within its own -dealloc method.
-  if (!subnode || subnode.supernode != self) {
-    return;
-  }
-
-  __instanceLock__.lock();
-    [_subnodes removeObjectIdenticalTo:subnode];
-    _cachedSubnodes = nil;
-  __instanceLock__.unlock();
-
-  [subnode _setSupernode:nil];
-}
-
-- (void)removeFromSupernode
-{
-  ASDisplayNodeLogEvent(self, @"removeFromSupernode with automaticallyManagesSubnodes: %@",
-                        self.automaticallyManagesSubnodes ? @"YES" : @"NO");
-  [self _removeFromSupernode];
-}
-
-- (void)_removeFromSupernode
-{
-  ASDisplayNodeAssertThreadAffinity(self);
-  ASAssertUnlocked(__instanceLock__);
-  
-  __instanceLock__.lock();
-    __weak ASDisplayNode *supernode = _supernode;
-    __weak UIView *view = _view;
-    __weak CALayer *layer = _layer;
-  __instanceLock__.unlock();
-
-  [self _removeFromSupernode:supernode view:view layer:layer];
-}
-
-- (void)_removeFromSupernodeIfEqualTo:(ASDisplayNode *)supernode
-{
-  ASDisplayNodeAssertThreadAffinity(self);
-  ASAssertUnlocked(__instanceLock__);
-  
-  __instanceLock__.lock();
-
-    // Only remove if supernode is still the expected supernode
-    if (!ASObjectIsEqual(_supernode, supernode)) {
-      __instanceLock__.unlock();
-      return;
-    }
-  
-    __weak UIView *view = _view;
-    __weak CALayer *layer = _layer;
-  __instanceLock__.unlock();
-  
-  [self _removeFromSupernode:supernode view:view layer:layer];
-}
-
-- (void)_removeFromSupernode:(ASDisplayNode *)supernode view:(UIView *)view layer:(CALayer *)layer
-{
-  // Note: we continue even if supernode is nil to ensure view/layer are removed from hierarchy.
-
-  if (supernode != nil) {
-    as_log_verbose(ASNodeLog(), "Remove %@ from supernode %@", self, supernode);
-  }
-
-  // Clear supernode's reference to us before removing the view from the hierarchy, as _ASDisplayView
-  // will trigger us to clear our _supernode pointer in willMoveToSuperview:nil.
-  // This may result in removing the last strong reference, triggering deallocation after this method.
-  [supernode _removeSubnode:self];
-  
-  if (view != nil) {
-    [view removeFromSuperview];
-  } else if (layer != nil) {
-    [layer removeFromSuperlayer];
-  }
-}
-
-#pragma mark - Visibility API
-
-- (BOOL)__visibilityNotificationsDisabled
-{
-  // Currently, this method is only used by the testing infrastructure to verify this internal feature.
-  ASDN::MutexLocker l(__instanceLock__);
-  return _flags.visibilityNotificationsDisabled > 0;
-}
-
-- (BOOL)__selfOrParentHasVisibilityNotificationsDisabled
-{
-  ASDN::MutexLocker l(__instanceLock__);
-  return (_hierarchyState & ASHierarchyStateTransitioningSupernodes);
-}
-
-- (void)__incrementVisibilityNotificationsDisabled
-{
-  __instanceLock__.lock();
-  const size_t maxVisibilityIncrement = (1ULL<<VISIBILITY_NOTIFICATIONS_DISABLED_BITS) - 1ULL;
-  ASDisplayNodeAssert(_flags.visibilityNotificationsDisabled < maxVisibilityIncrement, @"Oops, too many increments of the visibility notifications API");
-  if (_flags.visibilityNotificationsDisabled < maxVisibilityIncrement) {
-    _flags.visibilityNotificationsDisabled++;
-  }
-  BOOL visibilityNotificationsDisabled = (_flags.visibilityNotificationsDisabled == 1);
-  __instanceLock__.unlock();
-
-  if (visibilityNotificationsDisabled) {
-    // Must have just transitioned from 0 to 1.  Notify all subnodes that we are in a disabled state.
-    [self enterHierarchyState:ASHierarchyStateTransitioningSupernodes];
-  }
-}
-
-- (void)__decrementVisibilityNotificationsDisabled
-{
-  __instanceLock__.lock();
-  ASDisplayNodeAssert(_flags.visibilityNotificationsDisabled > 0, @"Can't decrement past 0");
-  if (_flags.visibilityNotificationsDisabled > 0) {
-    _flags.visibilityNotificationsDisabled--;
-  }
-  BOOL visibilityNotificationsDisabled = (_flags.visibilityNotificationsDisabled == 0);
-  __instanceLock__.unlock();
-
-  if (visibilityNotificationsDisabled) {
-    // Must have just transitioned from 1 to 0.  Notify all subnodes that we are no longer in a disabled state.
-    // FIXME: This system should be revisited when refactoring and consolidating the implementation of the
-    // addSubnode: and insertSubnode:... methods.  As implemented, though logically irrelevant for expected use cases,
-    // multiple nodes in the subtree below may have a non-zero visibilityNotification count and still have
-    // the ASHierarchyState bit cleared (the only value checked when reading this state).
-    [self exitHierarchyState:ASHierarchyStateTransitioningSupernodes];
-  }
-}
-
-#pragma mark - Placeholder
-
-- (void)_locked_layoutPlaceholderIfNecessary
-{
-  ASAssertLocked(__instanceLock__);
-  if ([self _locked_shouldHavePlaceholderLayer]) {
-    [self _locked_setupPlaceholderLayerIfNeeded];
-  }
-  // Update the placeholderLayer size in case the node size has changed since the placeholder was added.
-  _placeholderLayer.frame = self.threadSafeBounds;
-}
-
-- (BOOL)_locked_shouldHavePlaceholderLayer
-{
-  ASAssertLocked(__instanceLock__);
-  return (_placeholderEnabled && [self _implementsDisplay]);
-}
-
-- (void)_locked_setupPlaceholderLayerIfNeeded
-{
-  ASDisplayNodeAssertMainThread();
-  ASAssertLocked(__instanceLock__);
-
-  if (!_placeholderLayer) {
-    _placeholderLayer = [CALayer layer];
-    // do not set to CGFLOAT_MAX in the case that something needs to be overtop the placeholder
-    _placeholderLayer.zPosition = 9999.0;
-  }
-
-  if (_placeholderLayer.contents == nil) {
-    if (!_placeholderImage) {
-      _placeholderImage = [self placeholderImage];
-    }
-    if (_placeholderImage) {
-      BOOL stretchable = !UIEdgeInsetsEqualToEdgeInsets(_placeholderImage.capInsets, UIEdgeInsetsZero);
-      if (stretchable) {
-        ASDisplayNodeSetResizableContents(_placeholderLayer, _placeholderImage);
-      } else {
-        _placeholderLayer.contentsScale = self.contentsScale;
-        _placeholderLayer.contents = (id)_placeholderImage.CGImage;
-      }
-    }
-  }
-}
-
-- (UIImage *)placeholderImage
-{
-  // Subclass hook
-  return nil;
-}
-
-- (BOOL)placeholderShouldPersist
-{
-  // Subclass hook
-  return NO;
-}
-
-#pragma mark - Hierarchy State
-
-- (BOOL)isInHierarchy
-{
-  ASDN::MutexLocker l(__instanceLock__);
-  return _flags.isInHierarchy;
-}
-
-- (void)__enterHierarchy
-{
-  ASDisplayNodeAssertMainThread();
-  ASDisplayNodeAssert(!_flags.isEnteringHierarchy, @"Should not cause recursive __enterHierarchy");
-  ASAssertUnlocked(__instanceLock__);
-  ASDisplayNodeLogEvent(self, @"enterHierarchy");
-  
-  // Profiling has shown that locking this method is beneficial, so each of the property accesses don't have to lock and unlock.
-  __instanceLock__.lock();
-  
-  if (!_flags.isInHierarchy && !_flags.visibilityNotificationsDisabled && ![self __selfOrParentHasVisibilityNotificationsDisabled]) {
-    _flags.isEnteringHierarchy = YES;
-    _flags.isInHierarchy = YES;
-
-    // Don't call -willEnterHierarchy while holding __instanceLock__.
-    // This method and subsequent ones (i.e -interfaceState and didEnter(.*)State)
-    // don't expect that they are called while the lock is being held.
-    // More importantly, didEnter(.*)State methods are meant to be overriden by clients.
-    // And so they can potentially walk up the node tree and cause deadlocks, or do expensive tasks and cause the lock to be held for too long.
-    __instanceLock__.unlock();
-      [self willEnterHierarchy];
-      for (ASDisplayNode *subnode in self.subnodes) {
-        [subnode __enterHierarchy];
-      }
-    __instanceLock__.lock();
-    
-    _flags.isEnteringHierarchy = NO;
-
-    // If we don't have contents finished drawing by the time we are on screen, immediately add the placeholder (if it is enabled and we do have something to draw).
-    if (self.contents == nil && [self _implementsDisplay]) {
-      CALayer *layer = self.layer;
-      [layer setNeedsDisplay];
-      
-      if ([self _locked_shouldHavePlaceholderLayer]) {
-        [CATransaction begin];
-        [CATransaction setDisableActions:YES];
-        [self _locked_setupPlaceholderLayerIfNeeded];
-        _placeholderLayer.opacity = 1.0;
-        [CATransaction commit];
-        [layer addSublayer:_placeholderLayer];
-      }
-    }
-  }
-  
-  __instanceLock__.unlock();
-
-  [self didEnterHierarchy];
-}
-
-- (void)__exitHierarchy
-{
-  ASDisplayNodeAssertMainThread();
-  ASDisplayNodeAssert(!_flags.isExitingHierarchy, @"Should not cause recursive __exitHierarchy");
-  ASAssertUnlocked(__instanceLock__);
-  ASDisplayNodeLogEvent(self, @"exitHierarchy");
-  
-  // Profiling has shown that locking this method is beneficial, so each of the property accesses don't have to lock and unlock.
-  __instanceLock__.lock();
-  
-  if (_flags.isInHierarchy && !_flags.visibilityNotificationsDisabled && ![self __selfOrParentHasVisibilityNotificationsDisabled]) {
-    _flags.isExitingHierarchy = YES;
-    _flags.isInHierarchy = NO;
-
-    // Don't call -didExitHierarchy while holding __instanceLock__. 
-    // This method and subsequent ones (i.e -interfaceState and didExit(.*)State)
-    // don't expect that they are called while the lock is being held.
-    // More importantly, didExit(.*)State methods are meant to be overriden by clients.
-    // And so they can potentially walk up the node tree and cause deadlocks, or do expensive tasks and cause the lock to be held for too long.
-    __instanceLock__.unlock();
-      [self didExitHierarchy];
-      for (ASDisplayNode *subnode in self.subnodes) {
-        [subnode __exitHierarchy];
-      }
-    __instanceLock__.lock();
-    
-    _flags.isExitingHierarchy = NO;
-  }
-  
-  __instanceLock__.unlock();
-}
-
-- (void)enterHierarchyState:(ASHierarchyState)hierarchyState
-{
-  if (hierarchyState == ASHierarchyStateNormal) {
-    return; // This method is a no-op with a 0-bitfield argument, so don't bother recursing.
-  }
-  
-  ASDisplayNodePerformBlockOnEveryNode(nil, self, NO, ^(ASDisplayNode *node) {
-    node.hierarchyState |= hierarchyState;
-  });
-}
-
-- (void)exitHierarchyState:(ASHierarchyState)hierarchyState
-{
-  if (hierarchyState == ASHierarchyStateNormal) {
-    return; // This method is a no-op with a 0-bitfield argument, so don't bother recursing.
-  }
-  ASDisplayNodePerformBlockOnEveryNode(nil, self, NO, ^(ASDisplayNode *node) {
-    node.hierarchyState &= (~hierarchyState);
-  });
-}
-
-- (ASHierarchyState)hierarchyState
-{
-  ASDN::MutexLocker l(__instanceLock__);
-  return _hierarchyState;
-}
-
-- (void)setHierarchyState:(ASHierarchyState)newState
-{
-  ASHierarchyState oldState = ASHierarchyStateNormal;
-  {
-    ASDN::MutexLocker l(__instanceLock__);
-    if (_hierarchyState == newState) {
-      return;
-    }
-    oldState = _hierarchyState;
-    _hierarchyState = newState;
-  }
-  
-  // Entered rasterization state.
-  if (newState & ASHierarchyStateRasterized) {
-    ASDisplayNodeAssert(checkFlag(Synchronous) == NO, @"Node created using -initWithViewBlock:/-initWithLayerBlock: cannot be added to subtree of node with subtree rasterization enabled. Node: %@", self);
-  }
-  
-  // Entered or exited range managed state.
-  if ((newState & ASHierarchyStateRangeManaged) != (oldState & ASHierarchyStateRangeManaged)) {
-    if (newState & ASHierarchyStateRangeManaged) {
-      [self enterInterfaceState:self.supernode.pendingInterfaceState];
-    } else {
-      // The case of exiting a range-managed state should be fairly rare.  Adding or removing the node
-      // to a view hierarchy will cause its interfaceState to be either fully set or unset (all fields),
-      // but because we might be about to be added to a view hierarchy, exiting the interface state now
-      // would cause inefficient churn.  The tradeoff is that we may not clear contents / fetched data
-      // for nodes that are removed from a managed state and then retained but not used (bad idea anyway!)
-    }
-  }
-  
-  if ((newState & ASHierarchyStateLayoutPending) != (oldState & ASHierarchyStateLayoutPending)) {
-    if (newState & ASHierarchyStateLayoutPending) {
-      // Entering layout pending state
-    } else {
-      // Leaving layout pending state, reset related properties
-      ASDN::MutexLocker l(__instanceLock__);
-      _pendingTransitionID = ASLayoutElementContextInvalidTransitionID;
-      _pendingLayoutTransition = nil;
-    }
-  }
-
-  ASDisplayNodeLogEvent(self, @"setHierarchyState: %@", NSStringFromASHierarchyStateChange(oldState, newState));
-  as_log_verbose(ASNodeLog(), "%s%@ %@", sel_getName(_cmd), NSStringFromASHierarchyStateChange(oldState, newState), self);
-}
-
-- (void)willEnterHierarchy
-{
-  ASDisplayNodeAssertMainThread();
-  ASDisplayNodeAssert(_flags.isEnteringHierarchy, @"You should never call -willEnterHierarchy directly. Appearance is automatically managed by ASDisplayNode");
-  ASDisplayNodeAssert(!_flags.isExitingHierarchy, @"ASDisplayNode inconsistency. __enterHierarchy and __exitHierarchy are mutually exclusive");
-  ASAssertUnlocked(__instanceLock__);
-  
-  if (![self supportsRangeManagedInterfaceState]) {
-    self.interfaceState = ASInterfaceStateInHierarchy;
-  } else if (ASCATransactionQueue.sharedQueue.isEnabled) {
-    __instanceLock__.lock();
-    ASInterfaceState state = _preExitingInterfaceState;
-    _preExitingInterfaceState = ASInterfaceStateNone;
-    __instanceLock__.unlock();
-    // Layer thrash happened, revert to before exiting.
-    if (state != ASInterfaceStateNone) {
-      self.interfaceState = state;
-    }
-  }
-}
-
-- (void)didEnterHierarchy {
-  ASDisplayNodeAssertMainThread();
-  ASDisplayNodeAssert(!_flags.isEnteringHierarchy, @"You should never call -didEnterHierarchy directly. Appearance is automatically managed by ASDisplayNode");
-  ASDisplayNodeAssert(!_flags.isExitingHierarchy, @"ASDisplayNode inconsistency. __enterHierarchy and __exitHierarchy are mutually exclusive");
-  ASDisplayNodeAssert(_flags.isInHierarchy, @"ASDisplayNode inconsistency. __enterHierarchy and __exitHierarchy are mutually exclusive");
-  ASAssertUnlocked(__instanceLock__);
-}
-
-- (void)didExitHierarchy
-{
-  ASDisplayNodeAssertMainThread();
-  ASDisplayNodeAssert(_flags.isExitingHierarchy, @"You should never call -didExitHierarchy directly. Appearance is automatically managed by ASDisplayNode");
-  ASDisplayNodeAssert(!_flags.isEnteringHierarchy, @"ASDisplayNode inconsistency. __enterHierarchy and __exitHierarchy are mutually exclusive");
-  ASAssertUnlocked(__instanceLock__);
-
-  // This case is important when tearing down hierarchies.  We must deliver a visibileStateDidChange:NO callback, as part our API guarantee that this method can be used for
-  // things like data analytics about user content viewing.  We cannot call the method in the dealloc as any incidental retain operations in client code would fail.
-  // Additionally, it may be that a Standard UIView which is containing us is moving between hierarchies, and we should not send the call if we will be re-added in the
-  // same runloop.  Strategy: strong reference (might be the last!), wait one runloop, and confirm we are still outside the hierarchy (both layer-backed and view-backed).
-  // TODO: This approach could be optimized by only performing the dispatch for root elements + recursively apply the interface state change. This would require a closer
-  // integration with _ASDisplayLayer to ensure that the superlayer pointer has been cleared by this stage (to check if we are root or not), or a different delegate call.
-
-#if !ENABLE_NEW_EXIT_HIERARCHY_BEHAVIOR
-  if (![self supportsRangeManagedInterfaceState]) {
-    self.interfaceState = ASInterfaceStateNone;
-    return;
-  }
-#endif
-  if (ASInterfaceStateIncludesVisible(self.pendingInterfaceState)) {
-    void(^exitVisibleInterfaceState)(void) = ^{
-      // This block intentionally retains self.
-      __instanceLock__.lock();
-      unsigned isStillInHierarchy = _flags.isInHierarchy;
-      BOOL isVisible = ASInterfaceStateIncludesVisible(_pendingInterfaceState);
-      ASInterfaceState newState = (_pendingInterfaceState & ~ASInterfaceStateVisible);
-      // layer may be thrashed, we need to remember the state so we can reset if it enters in same runloop later.
-      _preExitingInterfaceState = _pendingInterfaceState;
-      __instanceLock__.unlock();
-      if (!isStillInHierarchy && isVisible) {
-#if ENABLE_NEW_EXIT_HIERARCHY_BEHAVIOR
-        if (![self supportsRangeManagedInterfaceState]) {
-          newState = ASInterfaceStateNone;
-        }
-#endif
-        self.interfaceState = newState;
-      }
-    };
-
-    if (!ASCATransactionQueue.sharedQueue.enabled) {
-      dispatch_async(dispatch_get_main_queue(), exitVisibleInterfaceState);
-    } else {
-      exitVisibleInterfaceState();
-    }
-  }
-}
-
-#pragma mark - Interface State
-
-/**
- * We currently only set interface state on nodes in table/collection views. For other nodes, if they are
- * in the hierarchy we enable all ASInterfaceState types with `ASInterfaceStateInHierarchy`, otherwise `None`.
- */
-- (BOOL)supportsRangeManagedInterfaceState
-{
-  ASDN::MutexLocker l(__instanceLock__);
-  return ASHierarchyStateIncludesRangeManaged(_hierarchyState);
-}
-
-- (void)enterInterfaceState:(ASInterfaceState)interfaceState
-{
-  if (interfaceState == ASInterfaceStateNone) {
-    return; // This method is a no-op with a 0-bitfield argument, so don't bother recursing.
-  }
-  ASDisplayNodePerformBlockOnEveryNode(nil, self, YES, ^(ASDisplayNode *node) {
-    node.interfaceState |= interfaceState;
-  });
-}
-
-- (void)exitInterfaceState:(ASInterfaceState)interfaceState
-{
-  if (interfaceState == ASInterfaceStateNone) {
-    return; // This method is a no-op with a 0-bitfield argument, so don't bother recursing.
-  }
-  ASDisplayNodeLogEvent(self, @"%s %@", sel_getName(_cmd), NSStringFromASInterfaceState(interfaceState));
-  ASDisplayNodePerformBlockOnEveryNode(nil, self, YES, ^(ASDisplayNode *node) {
-    node.interfaceState &= (~interfaceState);
-  });
-}
-
-- (void)recursivelySetInterfaceState:(ASInterfaceState)newInterfaceState
-{
-  as_activity_create_for_scope("Recursively set interface state");
-
-  // Instead of each node in the recursion assuming it needs to schedule itself for display,
-  // setInterfaceState: skips this when handling range-managed nodes (our whole subtree has this set).
-  // If our range manager intends for us to be displayed right now, and didn't before, get started!
-  BOOL shouldScheduleDisplay = [self supportsRangeManagedInterfaceState] && [self shouldScheduleDisplayWithNewInterfaceState:newInterfaceState];
-  ASDisplayNodePerformBlockOnEveryNode(nil, self, YES, ^(ASDisplayNode *node) {
-    node.interfaceState = newInterfaceState;
-  });
-  if (shouldScheduleDisplay) {
-    [ASDisplayNode scheduleNodeForRecursiveDisplay:self];
-  }
-}
-
-- (ASInterfaceState)interfaceState
-{
-  ASDN::MutexLocker l(__instanceLock__);
-  return _interfaceState;
-}
-
-- (void)setInterfaceState:(ASInterfaceState)newState
-{
-  if (!ASCATransactionQueue.sharedQueue.enabled) {
-    [self applyPendingInterfaceState:newState];
-  } else {
-    ASDN::MutexLocker l(__instanceLock__);
-    if (_pendingInterfaceState != newState) {
-      _pendingInterfaceState = newState;
-      [[ASCATransactionQueue sharedQueue] enqueue:self];
-    }
-  }
-}
-
-- (ASInterfaceState)pendingInterfaceState
-{
-  ASDN::MutexLocker l(__instanceLock__);
-  return _pendingInterfaceState;
-}
-
-- (void)applyPendingInterfaceState:(ASInterfaceState)newPendingState
-{
-  //This method is currently called on the main thread. The assert has been added here because all of the
-  //did(Enter|Exit)(Display|Visible|Preload)State methods currently guarantee calling on main.
-  ASDisplayNodeAssertMainThread();
-
-  // This method manages __instanceLock__ itself, to ensure the lock is not held while didEnter/Exit(.*)State methods are called, thus avoid potential deadlocks
-  ASAssertUnlocked(__instanceLock__);
-  
-  ASInterfaceState oldState = ASInterfaceStateNone;
-  ASInterfaceState newState = ASInterfaceStateNone;
-  {
-    ASDN::MutexLocker l(__instanceLock__);
-    // newPendingState will not be used when ASCATransactionQueue is enabled
-    // and use _pendingInterfaceState instead for interfaceState update.
-    if (!ASCATransactionQueue.sharedQueue.enabled) {
-      _pendingInterfaceState = newPendingState;
-    }
-    oldState = _interfaceState;
-    newState = _pendingInterfaceState;
-    if (newState == oldState) {
-      return;
-    }
-    _interfaceState = newState;
-    _preExitingInterfaceState = ASInterfaceStateNone;
-  }
-
-  // It should never be possible for a node to be visible but not be allowed / expected to display.
-  ASDisplayNodeAssertFalse(ASInterfaceStateIncludesVisible(newState) && !ASInterfaceStateIncludesDisplay(newState));
-
-  // TODO: Trigger asynchronous measurement if it is not already cached or being calculated.
-  // if ((newState & ASInterfaceStateMeasureLayout) != (oldState & ASInterfaceStateMeasureLayout)) {
-  // }
-  
-  // For the Preload and Display ranges, we don't want to call -clear* if not being managed by a range controller.
-  // Otherwise we get flashing behavior from normal UIKit manipulations like navigation controller push / pop.
-  // Still, the interfaceState should be updated to the current state of the node; just don't act on the transition.
-  
-  // Entered or exited data loading state.
-  BOOL nowPreload = ASInterfaceStateIncludesPreload(newState);
-  BOOL wasPreload = ASInterfaceStateIncludesPreload(oldState);
-  
-  if (nowPreload != wasPreload) {
-    if (nowPreload) {
-      [self didEnterPreloadState];
-    } else {
-      // We don't want to call -didExitPreloadState on nodes that aren't being managed by a range controller.
-      // Otherwise we get flashing behavior from normal UIKit manipulations like navigation controller push / pop.
-      if ([self supportsRangeManagedInterfaceState]) {
-        [self didExitPreloadState];
-      }
-    }
-  }
-  
-  // Entered or exited contents rendering state.
-  BOOL nowDisplay = ASInterfaceStateIncludesDisplay(newState);
-  BOOL wasDisplay = ASInterfaceStateIncludesDisplay(oldState);
-
-  if (nowDisplay != wasDisplay) {
-    if ([self supportsRangeManagedInterfaceState]) {
-      if (nowDisplay) {
-        // Once the working window is eliminated (ASRangeHandlerRender), trigger display directly here.
-        [self setDisplaySuspended:NO];
-      } else {
-        [self setDisplaySuspended:YES];
-        //schedule clear contents on next runloop
-        dispatch_async(dispatch_get_main_queue(), ^{
-          __instanceLock__.lock();
-          ASInterfaceState interfaceState = _interfaceState;
-          __instanceLock__.unlock();
-          if (ASInterfaceStateIncludesDisplay(interfaceState) == NO) {
-            [self clearContents];
-          }
-        });
-      }
-    } else {
-      // NOTE: This case isn't currently supported as setInterfaceState: isn't exposed externally, and all
-      // internal use cases are range-managed.  When a node is visible, don't mess with display - CA will start it.
-      if (!ASInterfaceStateIncludesVisible(newState)) {
-        // Check _implementsDisplay purely for efficiency - it's faster even than calling -asyncLayer.
-        if ([self _implementsDisplay]) {
-          if (nowDisplay) {
-            [ASDisplayNode scheduleNodeForRecursiveDisplay:self];
-          } else {
-            [[self asyncLayer] cancelAsyncDisplay];
-            //schedule clear contents on next runloop
-            dispatch_async(dispatch_get_main_queue(), ^{
-              __instanceLock__.lock();
-              ASInterfaceState interfaceState = _interfaceState;
-              __instanceLock__.unlock();
-              if (ASInterfaceStateIncludesDisplay(interfaceState) == NO) {
-                [self clearContents];
-              }
-            });
-          }
-        }
-      }
-    }
-    
-    if (nowDisplay) {
-      [self didEnterDisplayState];
-    } else {
-      [self didExitDisplayState];
-    }
-  }
-
-  // Became visible or invisible.  When range-managed, this represents literal visibility - at least one pixel
-  // is onscreen.  If not range-managed, we can't guarantee more than the node being present in an onscreen window.
-  BOOL nowVisible = ASInterfaceStateIncludesVisible(newState);
-  BOOL wasVisible = ASInterfaceStateIncludesVisible(oldState);
-
-  if (nowVisible != wasVisible) {
-    if (nowVisible) {
-      [self didEnterVisibleState];
-    } else {
-      [self didExitVisibleState];
-    }
-  }
-
-  // Log this change, unless it's just the node going from {} -> {Measure} because that change happens
-  // for all cell nodes and it isn't currently meaningful.
-  BOOL measureChangeOnly = ((oldState | newState) == ASInterfaceStateMeasureLayout);
-  if (!measureChangeOnly) {
-    as_log_verbose(ASNodeLog(), "%s %@ %@", sel_getName(_cmd), NSStringFromASInterfaceStateChange(oldState, newState), self);
-  }
-  
-  ASDisplayNodeLogEvent(self, @"interfaceStateDidChange: %@", NSStringFromASInterfaceStateChange(oldState, newState));
-  [self interfaceStateDidChange:newState fromState:oldState];
-}
-
-- (void)prepareForCATransactionCommit
-{
-  // Apply _pendingInterfaceState actual _interfaceState, note that ASInterfaceStateNone is not used.
-  [self applyPendingInterfaceState:ASInterfaceStateNone];
-}
-
-- (void)interfaceStateDidChange:(ASInterfaceState)newState fromState:(ASInterfaceState)oldState
-{
-  // Subclass hook
-  ASAssertUnlocked(__instanceLock__);
-  ASDisplayNodeAssertMainThread();
-  [self enumerateInterfaceStateDelegates:^(id<ASInterfaceStateDelegate> del) {
-    [del interfaceStateDidChange:newState fromState:oldState];
-  }];
-}
-
-- (BOOL)shouldScheduleDisplayWithNewInterfaceState:(ASInterfaceState)newInterfaceState
-{
-  BOOL willDisplay = ASInterfaceStateIncludesDisplay(newInterfaceState);
-  BOOL nowDisplay = ASInterfaceStateIncludesDisplay(self.interfaceState);
-  return willDisplay && (willDisplay != nowDisplay);
-}
-
-- (void)addInterfaceStateDelegate:(id <ASInterfaceStateDelegate>)interfaceStateDelegate
-{
-  ASDN::MutexLocker l(__instanceLock__);
-  _hasHadInterfaceStateDelegates = YES;
-  for (int i = 0; i < AS_MAX_INTERFACE_STATE_DELEGATES; i++) {
-    if (_interfaceStateDelegates[i] == nil) {
-      _interfaceStateDelegates[i] = interfaceStateDelegate;
-      return;
-    }
-  }
-  ASDisplayNodeFailAssert(@"Exceeded interface state delegate limit: %d", AS_MAX_INTERFACE_STATE_DELEGATES);
-}
-
-- (void)removeInterfaceStateDelegate:(id <ASInterfaceStateDelegate>)interfaceStateDelegate
-{
-  ASDN::MutexLocker l(__instanceLock__);
-  for (int i = 0; i < AS_MAX_INTERFACE_STATE_DELEGATES; i++) {
-    if (_interfaceStateDelegates[i] == interfaceStateDelegate) {
-      _interfaceStateDelegates[i] = nil;
-      break;
-    }
-  }
-}
-
-- (BOOL)isVisible
-{
-  ASDN::MutexLocker l(__instanceLock__);
-  return ASInterfaceStateIncludesVisible(_interfaceState);
-}
-
-- (void)didEnterVisibleState
-{
-  // subclass override
-  ASDisplayNodeAssertMainThread();
-  ASAssertUnlocked(__instanceLock__);
-  [self enumerateInterfaceStateDelegates:^(id<ASInterfaceStateDelegate> del) {
-    [del didEnterVisibleState];
-  }];
-#if AS_ENABLE_TIPS
-  [ASTipsController.shared nodeDidAppear:self];
-#endif
-}
-
-- (void)didExitVisibleState
-{
-  // subclass override
-  ASDisplayNodeAssertMainThread();
-  ASAssertUnlocked(__instanceLock__);
-  [self enumerateInterfaceStateDelegates:^(id<ASInterfaceStateDelegate> del) {
-    [del didExitVisibleState];
-  }];
-}
-
-- (BOOL)isInDisplayState
-{
-  ASDN::MutexLocker l(__instanceLock__);
-  return ASInterfaceStateIncludesDisplay(_interfaceState);
-}
-
-- (void)didEnterDisplayState
-{
-  // subclass override
-  ASDisplayNodeAssertMainThread();
-  ASAssertUnlocked(__instanceLock__);
-  [self enumerateInterfaceStateDelegates:^(id<ASInterfaceStateDelegate> del) {
-    [del didEnterDisplayState];
-  }];
-}
-
-- (void)didExitDisplayState
-{
-  // subclass override
-  ASDisplayNodeAssertMainThread();
-  ASAssertUnlocked(__instanceLock__);
-  [self enumerateInterfaceStateDelegates:^(id<ASInterfaceStateDelegate> del) {
-    [del didExitDisplayState];
-  }];
-}
-
-- (BOOL)isInPreloadState
-{
-  ASDN::MutexLocker l(__instanceLock__);
-  return ASInterfaceStateIncludesPreload(_interfaceState);
-}
-
-- (void)setNeedsPreload
-{
-  if (self.isInPreloadState) {
-    [self recursivelyPreload];
-  }
-}
-
-- (void)recursivelyPreload
-{
-  ASPerformBlockOnMainThread(^{
-    ASDisplayNodePerformBlockOnEveryNode(nil, self, YES, ^(ASDisplayNode * _Nonnull node) {
-      [node didEnterPreloadState];
-    });
-  });
-}
-
-- (void)recursivelyClearPreloadedData
-{
-  ASPerformBlockOnMainThread(^{
-    ASDisplayNodePerformBlockOnEveryNode(nil, self, YES, ^(ASDisplayNode * _Nonnull node) {
-      [node didExitPreloadState];
-    });
-  });
-}
-
-- (void)didEnterPreloadState
-{
-  ASDisplayNodeAssertMainThread();
-  ASAssertUnlocked(__instanceLock__);
-
-  // If this node has ASM enabled and is not yet visible, force a layout pass to apply its applicable pending layout, if any,
-  // so that its subnodes are inserted/deleted and start preloading right away.
-  //
-  // - If it has an up-to-date layout (and subnodes), calling -layoutIfNeeded will be fast.
-  //
-  // - If it doesn't have a calculated or pending layout that fits its current bounds, a measurement pass will occur
-  // (see -__layout and -_u_measureNodeWithBoundsIfNecessary:). This scenario is uncommon,
-  // and running a measurement pass here is a fine trade-off because preloading any time after this point would be late.
-  if (self.automaticallyManagesSubnodes) {
-    [self layoutIfNeeded];
-  }
-  [self enumerateInterfaceStateDelegates:^(id<ASInterfaceStateDelegate> del) {
-    [del didEnterPreloadState];
-  }];
-}
-
-- (void)didExitPreloadState
-{
-  ASDisplayNodeAssertMainThread();
-  ASAssertUnlocked(__instanceLock__);
-  [self enumerateInterfaceStateDelegates:^(id<ASInterfaceStateDelegate> del) {
-    [del didExitPreloadState];
-  }];
-}
-
-- (void)clearContents
-{
-  ASDisplayNodeAssertMainThread();
-  ASAssertUnlocked(__instanceLock__);
-
-  ASDN::MutexLocker l(__instanceLock__);
-  if (_flags.canClearContentsOfLayer) {
-    // No-op if these haven't been created yet, as that guarantees they don't have contents that needs to be released.
-    _layer.contents = nil;
-  }
-  
-  _placeholderLayer.contents = nil;
-  _placeholderImage = nil;
-}
-
-- (void)recursivelyClearContents
-{
-  ASPerformBlockOnMainThread(^{
-    ASDisplayNodePerformBlockOnEveryNode(nil, self, YES, ^(ASDisplayNode * _Nonnull node) {
-      [node clearContents];
-    });
-  });
-}
-
-- (void)enumerateInterfaceStateDelegates:(void (NS_NOESCAPE ^)(id<ASInterfaceStateDelegate>))block
-{
-  ASAssertUnlocked(__instanceLock__);
-
-  id dels[AS_MAX_INTERFACE_STATE_DELEGATES];
-  int count = 0;
-  {
-    ASLockScopeSelf();
-    // Fast path for non-delegating nodes.
-    if (!_hasHadInterfaceStateDelegates) {
-      return;
-    }
-
-    for (int i = 0; i < AS_MAX_INTERFACE_STATE_DELEGATES; i++) {
-      if ((dels[count] = _interfaceStateDelegates[i])) {
-        count++;
-      }
-    }
-  }
-  for (int i = 0; i < count; i++) {
-    block(dels[i]);
-  }
-}
-
-#pragma mark - Gesture Recognizing
-
-- (void)touchesBegan:(NSSet *)touches withEvent:(UIEvent *)event
-{
-  // Subclass hook
-}
-
-- (void)touchesMoved:(NSSet *)touches withEvent:(UIEvent *)event
-{
-  // Subclass hook
-}
-
-- (void)touchesEnded:(NSSet *)touches withEvent:(UIEvent *)event
-{
-  // Subclass hook
-}
-
-- (void)touchesCancelled:(NSSet *)touches withEvent:(UIEvent *)event
-{
-  // Subclass hook
-}
-
-- (BOOL)gestureRecognizerShouldBegin:(UIGestureRecognizer *)gestureRecognizer
-{
-  // This method is only implemented on UIView on iOS 6+.
-  ASDisplayNodeAssertMainThread();
-  
-  // No locking needed as it's main thread only
-  UIView *view = _view;
-  if (view == nil) {
-    return YES;
-  }
-
-  // If we reach the base implementation, forward up the view hierarchy.
-  UIView *superview = view.superview;
-  return [superview gestureRecognizerShouldBegin:gestureRecognizer];
-}
-
-- (UIView *)hitTest:(CGPoint)point withEvent:(UIEvent *)event
-{
-  ASDisplayNodeAssertMainThread();
-  return [_view hitTest:point withEvent:event];
-}
-
-- (void)setHitTestSlop:(UIEdgeInsets)hitTestSlop
-{
-  ASDN::MutexLocker l(__instanceLock__);
-  _hitTestSlop = hitTestSlop;
-}
-
-- (UIEdgeInsets)hitTestSlop
-{
-  ASDN::MutexLocker l(__instanceLock__);
-  return _hitTestSlop;
-}
-
-- (BOOL)pointInside:(CGPoint)point withEvent:(UIEvent *)event
-{
-  ASDisplayNodeAssertMainThread();
-  UIEdgeInsets slop = self.hitTestSlop;
-  if (_view && UIEdgeInsetsEqualToEdgeInsets(slop, UIEdgeInsetsZero)) {
-    // Safer to use UIView's -pointInside:withEvent: if we can.
-    return [_view pointInside:point withEvent:event];
-  } else {
-    return CGRectContainsPoint(UIEdgeInsetsInsetRect(self.bounds, slop), point);
-  }
-}
-
-
-#pragma mark - Pending View State
-
-- (void)_locked_applyPendingStateToViewOrLayer
-{
-  ASDisplayNodeAssertMainThread();
-  ASAssertLocked(__instanceLock__);
-  ASDisplayNodeAssert(self.nodeLoaded, @"must have a view or layer");
-
-  TIME_SCOPED(_debugTimeToApplyPendingState);
-  
-  // If no view/layer properties were set before the view/layer were created, _pendingViewState will be nil and the default values
-  // for the view/layer are still valid.
-  [self _locked_applyPendingViewState];
-  
-  if (_flags.displaySuspended) {
-    self._locked_asyncLayer.displaySuspended = YES;
-  }
-  if (!_flags.displaysAsynchronously) {
-    self._locked_asyncLayer.displaysAsynchronously = NO;
-  }
-}
-
-- (void)applyPendingViewState
-{
-  ASDisplayNodeAssertMainThread();
-  ASAssertUnlocked(__instanceLock__);
-  
-  ASDN::MutexLocker l(__instanceLock__);
-  // FIXME: Ideally we'd call this as soon as the node receives -setNeedsLayout
-  // but automatic subnode management would require us to modify the node tree
-  // in the background on a loaded node, which isn't currently supported.
-  if (_pendingViewState.hasSetNeedsLayout) {
-    // Need to unlock before calling setNeedsLayout to avoid deadlocks.
-    // MutexUnlocker will re-lock at the end of scope.
-    ASDN::MutexUnlocker u(__instanceLock__);
-    [self __setNeedsLayout];
-  }
-  
-  [self _locked_applyPendingViewState];
-}
-
-- (void)_locked_applyPendingViewState
-{
-  ASDisplayNodeAssertMainThread();
-  ASAssertLocked(__instanceLock__);
-  ASDisplayNodeAssert([self _locked_isNodeLoaded], @"Expected node to be loaded before applying pending state.");
-
-  if (_flags.layerBacked) {
-    [_pendingViewState applyToLayer:_layer];
-  } else {
-    BOOL specialPropertiesHandling = ASDisplayNodeNeedsSpecialPropertiesHandling(checkFlag(Synchronous), _flags.layerBacked);
-    [_pendingViewState applyToView:_view withSpecialPropertiesHandling:specialPropertiesHandling];
-  }
-
-  // _ASPendingState objects can add up very quickly when adding
-  // many nodes. This is especially an issue in large collection views
-  // and table views. This needs to be weighed against the cost of
-  // reallocing a _ASPendingState. So in range managed nodes we
-  // delete the pending state, otherwise we just clear it.
-  if (ASHierarchyStateIncludesRangeManaged(_hierarchyState)) {
-    _pendingViewState = nil;
-  } else {
-    [_pendingViewState clearChanges];
-  }
-}
-
-// This method has proved helpful in a few rare scenarios, similar to a category extension on UIView, but assumes knowledge of _ASDisplayView.
-// It's considered private API for now and its use should not be encouraged.
-- (ASDisplayNode *)_supernodeWithClass:(Class)supernodeClass checkViewHierarchy:(BOOL)checkViewHierarchy
-{
-  ASDisplayNode *supernode = self.supernode;
-  while (supernode) {
-    if ([supernode isKindOfClass:supernodeClass])
-      return supernode;
-    supernode = supernode.supernode;
-  }
-  if (!checkViewHierarchy) {
-    return nil;
-  }
-
-  UIView *view = self.view.superview;
-  while (view) {
-    ASDisplayNode *viewNode = ((_ASDisplayView *)view).asyncdisplaykit_node;
-    if (viewNode) {
-      if ([viewNode isKindOfClass:supernodeClass])
-        return viewNode;
-    }
-
-    view = view.superview;
-  }
-
-  return nil;
-}
-
-#pragma mark - Performance Measurement
-
-- (void)setMeasurementOptions:(ASDisplayNodePerformanceMeasurementOptions)measurementOptions
-{
-  ASDN::MutexLocker l(__instanceLock__);
-  _measurementOptions = measurementOptions;
-}
-
-- (ASDisplayNodePerformanceMeasurementOptions)measurementOptions
-{
-  ASDN::MutexLocker l(__instanceLock__);
-  return _measurementOptions;
-}
-
-- (ASDisplayNodePerformanceMeasurements)performanceMeasurements
-{
-  ASDN::MutexLocker l(__instanceLock__);
-  ASDisplayNodePerformanceMeasurements measurements = { .layoutSpecNumberOfPasses = -1, .layoutSpecTotalTime = NAN, .layoutComputationNumberOfPasses = -1, .layoutComputationTotalTime = NAN };
-  if (_measurementOptions & ASDisplayNodePerformanceMeasurementOptionLayoutSpec) {
-    measurements.layoutSpecNumberOfPasses = _layoutSpecNumberOfPasses;
-    measurements.layoutSpecTotalTime = _layoutSpecTotalTime;
-  }
-  if (_measurementOptions & ASDisplayNodePerformanceMeasurementOptionLayoutComputation) {
-    measurements.layoutComputationNumberOfPasses = _layoutComputationNumberOfPasses;
-    measurements.layoutComputationTotalTime = _layoutComputationTotalTime;
-  }
-  return measurements;
-}
-
-#pragma mark - Accessibility
-
-- (void)setIsAccessibilityContainer:(BOOL)isAccessibilityContainer
-{
-  ASDN::MutexLocker l(__instanceLock__);
-  _isAccessibilityContainer = isAccessibilityContainer;
-}
-
-- (BOOL)isAccessibilityContainer
-{
-  ASDN::MutexLocker l(__instanceLock__);
-  return _isAccessibilityContainer;
-}
-
-#pragma mark - Debugging (Private)
-
-#if ASEVENTLOG_ENABLE
-- (ASEventLog *)eventLog
-{
-  return _eventLog;
-}
-#endif
-
-- (NSMutableArray<NSDictionary *> *)propertiesForDescription
-{
-  NSMutableArray<NSDictionary *> *result = [NSMutableArray array];
-  ASPushMainThreadAssertionsDisabled();
-  
-  NSString *debugName = self.debugName;
-  if (debugName.length > 0) {
-    [result addObject:@{ (id)kCFNull : ASStringWithQuotesIfMultiword(debugName) }];
-  }
-
-  NSString *axId = self.accessibilityIdentifier;
-  if (axId.length > 0) {
-    [result addObject:@{ (id)kCFNull : ASStringWithQuotesIfMultiword(axId) }];
-  }
-
-  ASPopMainThreadAssertionsDisabled();
-  return result;
-}
-
-- (NSMutableArray<NSDictionary *> *)propertiesForDebugDescription
-{
-  NSMutableArray<NSDictionary *> *result = [NSMutableArray array];
-  
-  if (self.debugName.length > 0) {
-    [result addObject:@{ @"debugName" : ASStringWithQuotesIfMultiword(self.debugName)}];
-  }
-  if (self.accessibilityIdentifier.length > 0) {
-    [result addObject:@{ @"axId": ASStringWithQuotesIfMultiword(self.accessibilityIdentifier) }];
-  }
-
-  CGRect windowFrame = [self _frameInWindow];
-  if (CGRectIsNull(windowFrame) == NO) {
-    [result addObject:@{ @"frameInWindow" : [NSValue valueWithCGRect:windowFrame] }];
-  }
-  
-  // Attempt to find view controller.
-  // Note that the convenience method asdk_associatedViewController has an assertion
-  // that it's run on main. Since this is a debug method, let's bypass the assertion
-  // and run up the chain ourselves.
-  if (_view != nil) {
-    for (UIResponder *responder in [_view asdk_responderChainEnumerator]) {
-      UIViewController *vc = ASDynamicCast(responder, UIViewController);
-      if (vc) {
-        [result addObject:@{ @"viewController" : ASObjectDescriptionMakeTiny(vc) }];
-        break;
-      }
-    }
-  }
-  
-  if (_view != nil) {
-    [result addObject:@{ @"alpha" : @(_view.alpha) }];
-    [result addObject:@{ @"frame" : [NSValue valueWithCGRect:_view.frame] }];
-  } else if (_layer != nil) {
-    [result addObject:@{ @"alpha" : @(_layer.opacity) }];
-    [result addObject:@{ @"frame" : [NSValue valueWithCGRect:_layer.frame] }];
-  } else if (_pendingViewState != nil) {
-    [result addObject:@{ @"alpha" : @(_pendingViewState.alpha) }];
-    [result addObject:@{ @"frame" : [NSValue valueWithCGRect:_pendingViewState.frame] }];
-  }
-#ifndef MINIMAL_ASDK
-  // Check supernode so that if we are a cell node we don't find self.
-  ASCellNode *cellNode = [self supernodeOfClass:[ASCellNode class] includingSelf:NO];
-  if (cellNode != nil) {
-    [result addObject:@{ @"cellNode" : ASObjectDescriptionMakeTiny(cellNode) }];
-  }
-#endif
-  
-  [result addObject:@{ @"interfaceState" : NSStringFromASInterfaceState(self.interfaceState)} ];
-  
-  if (_view != nil) {
-    [result addObject:@{ @"view" : ASObjectDescriptionMakeTiny(_view) }];
-  } else if (_layer != nil) {
-    [result addObject:@{ @"layer" : ASObjectDescriptionMakeTiny(_layer) }];
-  } else if (_viewClass != nil) {
-    [result addObject:@{ @"viewClass" : _viewClass }];
-  } else if (_layerClass != nil) {
-    [result addObject:@{ @"layerClass" : _layerClass }];
-  } else if (_viewBlock != nil) {
-    [result addObject:@{ @"viewBlock" : _viewBlock }];
-  } else if (_layerBlock != nil) {
-    [result addObject:@{ @"layerBlock" : _layerBlock }];
-  }
-
-#if TIME_DISPLAYNODE_OPS
-  NSString *creationTypeString = [NSString stringWithFormat:@"cr8:%.2lfms dl:%.2lfms ap:%.2lfms ad:%.2lfms",  1000 * _debugTimeToCreateView, 1000 * _debugTimeForDidLoad, 1000 * _debugTimeToApplyPendingState, 1000 * _debugTimeToAddSubnodeViews];
-  [result addObject:@{ @"creationTypeString" : creationTypeString }];
-#endif
-  
-  return result;
-}
-
-- (NSString *)description
-{
-  return ASObjectDescriptionMake(self, [self propertiesForDescription]);
-}
-
-- (NSString *)debugDescription
-{
-  ASPushMainThreadAssertionsDisabled();
-  let result = ASObjectDescriptionMake(self, [self propertiesForDebugDescription]);
-  ASPopMainThreadAssertionsDisabled();
-  return result;
-}
-
-// This should only be called for debugging. It's not thread safe and it doesn't assert.
-// NOTE: Returns CGRectNull if the node isn't in a hierarchy.
-- (CGRect)_frameInWindow
-{
-  if (self.isNodeLoaded == NO || self.isInHierarchy == NO) {
-    return CGRectNull;
-  }
-
-  if (self.layerBacked) {
-    CALayer *rootLayer = _layer;
-    CALayer *nextLayer = nil;
-    while ((nextLayer = rootLayer.superlayer) != nil) {
-      rootLayer = nextLayer;
-    }
-
-    return [_layer convertRect:self.threadSafeBounds toLayer:rootLayer];
-  } else {
-    return [_view convertRect:self.threadSafeBounds toView:nil];
-  }
-}
-
-#pragma mark - Trait Collection Hooks
-
-- (void)asyncTraitCollectionDidChange
-{
-  // Subclass override
-}
-@end
-
-#pragma mark - ASDisplayNode (Debugging)
-
-@implementation ASDisplayNode (Debugging)
-
-+ (void)setShouldStoreUnflattenedLayouts:(BOOL)shouldStore
-{
-  storesUnflattenedLayouts.store(shouldStore);
-}
-
-+ (BOOL)shouldStoreUnflattenedLayouts
-{
-  return storesUnflattenedLayouts.load();
-}
-
-- (ASLayout *)unflattenedCalculatedLayout
-{
-  ASDN::MutexLocker l(__instanceLock__);
-  return _unflattenedLayout;
-}
-
-- (NSString *)displayNodeRecursiveDescription
-{
-  return [self _recursiveDescriptionHelperWithIndent:@""];
-}
-
-- (NSString *)_recursiveDescriptionHelperWithIndent:(NSString *)indent
-{
-  NSMutableString *subtree = [[[indent stringByAppendingString:self.debugDescription] stringByAppendingString:@"\n"] mutableCopy];
-  for (ASDisplayNode *n in self.subnodes) {
-    [subtree appendString:[n _recursiveDescriptionHelperWithIndent:[indent stringByAppendingString:@" | "]]];
-  }
-  return subtree;
-}
-
-- (NSString *)detailedLayoutDescription
-{
-  ASPushMainThreadAssertionsDisabled();
-  ASDN::MutexLocker l(__instanceLock__);
-  let props = [[NSMutableArray<NSDictionary *> alloc] init];
-
-  [props addObject:@{ @"layoutVersion": @(_layoutVersion.load()) }];
-  [props addObject:@{ @"bounds": [NSValue valueWithCGRect:self.bounds] }];
-
-  if (_calculatedDisplayNodeLayout.layout) {
-    [props addObject:@{ @"calculatedLayout": _calculatedDisplayNodeLayout.layout }];
-    [props addObject:@{ @"calculatedVersion": @(_calculatedDisplayNodeLayout.version) }];
-    [props addObject:@{ @"calculatedConstrainedSize" : NSStringFromASSizeRange(_calculatedDisplayNodeLayout.constrainedSize) }];
-    if (_calculatedDisplayNodeLayout.requestedLayoutFromAbove) {
-      [props addObject:@{ @"calculatedRequestedLayoutFromAbove": @"YES" }];
-    }
-  }
-  if (_pendingDisplayNodeLayout.layout) {
-    [props addObject:@{ @"pendingLayout": _pendingDisplayNodeLayout.layout }];
-    [props addObject:@{ @"pendingVersion": @(_pendingDisplayNodeLayout.version) }];
-    [props addObject:@{ @"pendingConstrainedSize" : NSStringFromASSizeRange(_pendingDisplayNodeLayout.constrainedSize) }];
-    if (_pendingDisplayNodeLayout.requestedLayoutFromAbove) {
-      [props addObject:@{ @"pendingRequestedLayoutFromAbove": (id)kCFNull }];
-    }
-  }
-
-  ASPopMainThreadAssertionsDisabled();
-  return ASObjectDescriptionMake(self, props);
-}
-
-@end
-
-#pragma mark - ASDisplayNode UIKit / CA Categories
-
-// We use associated objects as a last resort if our view is not a _ASDisplayView ie it doesn't have the _node ivar to write to
-
-static const char *ASDisplayNodeAssociatedNodeKey = "ASAssociatedNode";
-
-@implementation UIView (ASDisplayNodeInternal)
-
-- (void)setAsyncdisplaykit_node:(ASDisplayNode *)node
-{
-  ASWeakProxy *weakProxy = [ASWeakProxy weakProxyWithTarget:node];
-  objc_setAssociatedObject(self, ASDisplayNodeAssociatedNodeKey, weakProxy, OBJC_ASSOCIATION_RETAIN); // Weak reference to avoid cycle, since the node retains the view.
-}
-
-- (ASDisplayNode *)asyncdisplaykit_node
-{
-  ASWeakProxy *weakProxy = objc_getAssociatedObject(self, ASDisplayNodeAssociatedNodeKey);
-  return weakProxy.target;
-}
-
-@end
-
-@implementation CALayer (ASDisplayNodeInternal)
-
-- (void)setAsyncdisplaykit_node:(ASDisplayNode *)node
-{
-  ASWeakProxy *weakProxy = [ASWeakProxy weakProxyWithTarget:node];
-  objc_setAssociatedObject(self, ASDisplayNodeAssociatedNodeKey, weakProxy, OBJC_ASSOCIATION_RETAIN); // Weak reference to avoid cycle, since the node retains the layer.
-}
-
-- (ASDisplayNode *)asyncdisplaykit_node
-{
-  ASWeakProxy *weakProxy = objc_getAssociatedObject(self, ASDisplayNodeAssociatedNodeKey);
-  return weakProxy.target;
-}
-
-@end
-
-@implementation UIView (AsyncDisplayKit)
-
-- (void)addSubnode:(ASDisplayNode *)subnode
-{
-  if (subnode.layerBacked) {
-    // Call -addSubnode: so that we use the asyncdisplaykit_node path if possible.
-    [self.layer addSubnode:subnode];
-  } else {
-    ASDisplayNode *selfNode = self.asyncdisplaykit_node;
-    if (selfNode) {
-      [selfNode addSubnode:subnode];
-    } else {
-      if (subnode.supernode) {
-        [subnode removeFromSupernode];
-      }
-      [self addSubview:subnode.view];
-    }
-  }
-}
-
-@end
-
-@implementation CALayer (AsyncDisplayKit)
-
-- (void)addSubnode:(ASDisplayNode *)subnode
-{
-  ASDisplayNode *selfNode = self.asyncdisplaykit_node;
-  if (selfNode) {
-    [selfNode addSubnode:subnode];
-  } else {
-    if (subnode.supernode) {
-      [subnode removeFromSupernode];
-    }
-    [self addSublayer:subnode.layer];
-  }
-}
-
-@end
diff --git a/submodules/AsyncDisplayKit/Source/ASDisplayNodeExtras.mm b/submodules/AsyncDisplayKit/Source/ASDisplayNodeExtras.mm
index d1be1576e3..02871409ca 100644
--- a/submodules/AsyncDisplayKit/Source/ASDisplayNodeExtras.mm
+++ b/submodules/AsyncDisplayKit/Source/ASDisplayNodeExtras.mm
@@ -8,9 +8,10 @@
 //
 
 #import <AsyncDisplayKit/ASDisplayNodeExtras.h>
-#import <AsyncDisplayKit/ASDisplayNodeInternal.h>
+#import "ASDisplayNodeInternal.h"
 #import <AsyncDisplayKit/ASDisplayNode+FrameworkPrivate.h>
 #import <AsyncDisplayKit/ASDisplayNode+Ancestry.h>
+#import <AsyncDisplayKit/ASDisplayNode.h>
 
 #import <queue>
 #import <AsyncDisplayKit/ASRunLoopQueue.h>
diff --git a/submodules/AsyncDisplayKit/Source/Private/ASDisplayNodeInternal.h b/submodules/AsyncDisplayKit/Source/ASDisplayNodeInternal.h
similarity index 97%
rename from submodules/AsyncDisplayKit/Source/Private/ASDisplayNodeInternal.h
rename to submodules/AsyncDisplayKit/Source/ASDisplayNodeInternal.h
index 8cc49441e1..88b268c696 100644
--- a/submodules/AsyncDisplayKit/Source/Private/ASDisplayNodeInternal.h
+++ b/submodules/AsyncDisplayKit/Source/ASDisplayNodeInternal.h
@@ -16,7 +16,7 @@
 #import <AsyncDisplayKit/ASDisplayNode.h>
 #import <AsyncDisplayKit/ASDisplayNode+Beta.h>
 #import <AsyncDisplayKit/ASLayoutElement.h>
-#import <AsyncDisplayKit/ASLayoutTransition.h>
+#import "ASLayoutTransition.h"
 #import <AsyncDisplayKit/ASThread.h>
 #import <AsyncDisplayKit/_ASTransitionContext.h>
 #import <AsyncDisplayKit/ASWeakSet.h>
@@ -287,16 +287,6 @@ AS_EXTERN NSString * const ASRenderingEngineDidDisplayNodesScheduledBeforeTimest
  */
 - (void)__setNeedsDisplay;
 
-/**
- * Setup the node -> controller reference. Strong or weak is based on
- * the "shouldInvertStrongReference" property of the controller.
- *
- * Note: To prevent lock-ordering deadlocks, this method does not take the node's lock.
- * In practice, changing the node controller of a node multiple times is not
- * supported behavior.
- */
-- (void)__setNodeController:(ASNodeController *)controller;
-
 /**
  * Called whenever the node needs to layout its subnodes and, if it's already loaded, its subviews. Executes the layout pass for the node
  *
diff --git a/submodules/AsyncDisplayKit/Source/Private/ASDisplayNodeLayout.h b/submodules/AsyncDisplayKit/Source/ASDisplayNodeLayout.h
similarity index 98%
rename from submodules/AsyncDisplayKit/Source/Private/ASDisplayNodeLayout.h
rename to submodules/AsyncDisplayKit/Source/ASDisplayNodeLayout.h
index ba8d9c273e..af905a813a 100644
--- a/submodules/AsyncDisplayKit/Source/Private/ASDisplayNodeLayout.h
+++ b/submodules/AsyncDisplayKit/Source/ASDisplayNodeLayout.h
@@ -9,6 +9,7 @@
 
 #pragma once
 
+#import <UIKit/UIKit.h>
 #import <AsyncDisplayKit/ASDimension.h>
 
 @class ASLayout;
diff --git a/submodules/AsyncDisplayKit/Source/ASEditableTextNode.mm b/submodules/AsyncDisplayKit/Source/ASEditableTextNode.mm
index 21f94b4493..87baeb09ac 100644
--- a/submodules/AsyncDisplayKit/Source/ASEditableTextNode.mm
+++ b/submodules/AsyncDisplayKit/Source/ASEditableTextNode.mm
@@ -15,7 +15,7 @@
 #import <AsyncDisplayKit/ASDisplayNode+Subclasses.h>
 #import <AsyncDisplayKit/ASEqualityHelpers.h>
 #import <AsyncDisplayKit/ASTextKitComponents.h>
-#import <AsyncDisplayKit/ASTextNodeWordKerner.h>
+#import "ASTextNodeWordKerner.h"
 #import <AsyncDisplayKit/ASThread.h>
 
 @implementation ASEditableTextNodeTargetForAction
diff --git a/submodules/AsyncDisplayKit/Source/Details/ASGraphicsContext.mm b/submodules/AsyncDisplayKit/Source/ASGraphicsContext.mm
similarity index 99%
rename from submodules/AsyncDisplayKit/Source/Details/ASGraphicsContext.mm
rename to submodules/AsyncDisplayKit/Source/ASGraphicsContext.mm
index b950613d0d..b181ee2728 100644
--- a/submodules/AsyncDisplayKit/Source/Details/ASGraphicsContext.mm
+++ b/submodules/AsyncDisplayKit/Source/ASGraphicsContext.mm
@@ -7,7 +7,7 @@
 //
 
 #import <AsyncDisplayKit/ASGraphicsContext.h>
-#import <AsyncDisplayKit/ASCGImageBuffer.h>
+#import "ASCGImageBuffer.h"
 #import <AsyncDisplayKit/ASAssert.h>
 #import <AsyncDisplayKit/ASConfigurationInternal.h>
 #import <AsyncDisplayKit/ASInternalHelpers.h>
diff --git a/submodules/AsyncDisplayKit/Source/Details/ASHashing.mm b/submodules/AsyncDisplayKit/Source/ASHashing.mm
similarity index 100%
rename from submodules/AsyncDisplayKit/Source/Details/ASHashing.mm
rename to submodules/AsyncDisplayKit/Source/ASHashing.mm
diff --git a/submodules/AsyncDisplayKit/Source/ASImageNode+AnimatedImage.mm b/submodules/AsyncDisplayKit/Source/ASImageNode+AnimatedImage.mm
deleted file mode 100644
index 7e4ccc2d10..0000000000
--- a/submodules/AsyncDisplayKit/Source/ASImageNode+AnimatedImage.mm
+++ /dev/null
@@ -1,416 +0,0 @@
-//
-//  ASImageNode+AnimatedImage.mm
-//  Texture
-//
-//  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.
-//  Changes after 4/13/2017 are: Copyright (c) Pinterest, Inc.  All rights reserved.
-//  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
-//
-
-#ifndef MINIMAL_ASDK
-
-#import <AsyncDisplayKit/ASImageNode.h>
-
-#import <AsyncDisplayKit/ASAssert.h>
-#import <AsyncDisplayKit/ASBaseDefines.h>
-#import <AsyncDisplayKit/ASDisplayNode+Subclasses.h>
-#import <AsyncDisplayKit/ASDisplayNodeExtras.h>
-#import <AsyncDisplayKit/ASDisplayNodeInternal.h>
-#import <AsyncDisplayKit/ASEqualityHelpers.h>
-#import <AsyncDisplayKit/ASImageNode+Private.h>
-#import <AsyncDisplayKit/ASImageNode+AnimatedImagePrivate.h>
-#import <AsyncDisplayKit/ASImageProtocols.h>
-#import <AsyncDisplayKit/ASInternalHelpers.h>
-#import <AsyncDisplayKit/ASNetworkImageNode.h>
-#import <AsyncDisplayKit/ASThread.h>
-#import <AsyncDisplayKit/ASWeakProxy.h>
-
-#define ASAnimatedImageDebug  0
-
-#ifndef MINIMAL_ASDK
-@interface ASNetworkImageNode (Private)
-- (void)_locked_setDefaultImage:(UIImage *)image;
-@end
-#endif
-
-
-@implementation ASImageNode (AnimatedImage)
-
-#pragma mark - GIF support
-
-- (void)setAnimatedImage:(id <ASAnimatedImageProtocol>)animatedImage
-{
-  ASLockScopeSelf();
-  [self _locked_setAnimatedImage:animatedImage];
-}
-
-- (void)_locked_setAnimatedImage:(id <ASAnimatedImageProtocol>)animatedImage
-{
-  ASAssertLocked(__instanceLock__);
-
-  if (ASObjectIsEqual(_animatedImage, animatedImage) && (animatedImage == nil || animatedImage.playbackReady)) {
-    return;
-  }
-  
-  __block id <ASAnimatedImageProtocol> previousAnimatedImage = _animatedImage;
-  
-  _animatedImage = animatedImage;
-  
-  if (animatedImage != nil) {
-    __weak ASImageNode *weakSelf = self;
-    if ([animatedImage respondsToSelector:@selector(setCoverImageReadyCallback:)]) {
-      animatedImage.coverImageReadyCallback = ^(UIImage *coverImage) {
-        // In this case the lock is already gone we have to call the unlocked version therefore
-        [weakSelf setCoverImageCompleted:coverImage];
-      };
-    }
-    
-    animatedImage.playbackReadyCallback = ^{
-      // In this case the lock is already gone we have to call the unlocked version therefore
-      [weakSelf setShouldAnimate:YES];
-    };
-    if (animatedImage.playbackReady) {
-      [self _locked_setShouldAnimate:YES];
-    }
-  } else {
-    // Clean up after ourselves.
-    
-    // Don't bother using a `_locked` version for setting contnst as it should be pretty safe calling it with
-    // reaquire the lock and would add overhead to introduce this version
-    self.contents = nil;
-    [self _locked_setCoverImage:nil];
-  }
-
-  // Push calling subclass to the next runloop cycle
-  // We have to schedule the block on the common modes otherwise the tracking mode will not be included and it will
-  // not fire e.g. while scrolling down
-  CFRunLoopPerformBlock(CFRunLoopGetCurrent(), kCFRunLoopCommonModes, ^(void) {
-    [self animatedImageSet:animatedImage previousAnimatedImage:previousAnimatedImage];
-
-    // Animated image can take while to dealloc, do it off the main queue
-    if (previousAnimatedImage != nil) {
-      ASPerformBackgroundDeallocation(&previousAnimatedImage);
-    }
-  });
-  // Don't need to wakeup the runloop as the current is already running
-  // CFRunLoopWakeUp(runLoop); // Should not be necessary
-}
-
-- (void)animatedImageSet:(id <ASAnimatedImageProtocol>)newAnimatedImage previousAnimatedImage:(id <ASAnimatedImageProtocol>)previousAnimatedImage
-{
-  // Subclass hook should not be called with the lock held
-  ASAssertUnlocked(__instanceLock__);
-  
-  // Subclasses may override
-}
-
-- (id <ASAnimatedImageProtocol>)animatedImage
-{
-  ASLockScopeSelf();
-  return _animatedImage;
-}
-
-- (void)setAnimatedImagePaused:(BOOL)animatedImagePaused
-{
-  ASLockScopeSelf();
-
-  _animatedImagePaused = animatedImagePaused;
-
-  [self _locked_setShouldAnimate:!animatedImagePaused];
-}
-
-- (BOOL)animatedImagePaused
-{
-  ASLockScopeSelf();
-  return _animatedImagePaused;
-}
-
-- (void)setCoverImageCompleted:(UIImage *)coverImage
-{
-  if (ASInterfaceStateIncludesDisplay(self.interfaceState)) {
-    ASLockScopeSelf();
-    [self _locked_setCoverImageCompleted:coverImage];
-  }
-}
-
-- (void)_locked_setCoverImageCompleted:(UIImage *)coverImage
-{
-  ASAssertLocked(__instanceLock__);
-  
-  _displayLinkLock.lock();
-  BOOL setCoverImage = (_displayLink == nil) || _displayLink.paused;
-  _displayLinkLock.unlock();
-  
-  if (setCoverImage) {
-    [self _locked_setCoverImage:coverImage];
-  }
-}
-
-- (void)setCoverImage:(UIImage *)coverImage
-{
-  ASLockScopeSelf();
-  [self _locked_setCoverImage:coverImage];
-}
-
-- (void)_locked_setCoverImage:(UIImage *)coverImage
-{
-  ASAssertLocked(__instanceLock__);
-  
-  //If we're a network image node, we want to set the default image so
-  //that it will correctly be restored if it exits the range.
-#ifndef MINIMAL_ASDK
-  if ([self isKindOfClass:[ASNetworkImageNode class]]) {
-    [(ASNetworkImageNode *)self _locked_setDefaultImage:coverImage];
-  } else if (_displayLink == nil || _displayLink.paused == YES) {
-    [self _locked_setImage:coverImage];
-  }
-#endif
-}
-
-- (NSString *)animatedImageRunLoopMode
-{
-  AS::MutexLocker l(_displayLinkLock);
-  return _animatedImageRunLoopMode;
-}
-
-- (void)setAnimatedImageRunLoopMode:(NSString *)runLoopMode
-{
-  AS::MutexLocker l(_displayLinkLock);
-
-  if (runLoopMode == nil) {
-    runLoopMode = ASAnimatedImageDefaultRunLoopMode;
-  }
-
-  if (_displayLink != nil) {
-    [_displayLink removeFromRunLoop:[NSRunLoop mainRunLoop] forMode:_animatedImageRunLoopMode];
-    [_displayLink addToRunLoop:[NSRunLoop mainRunLoop] forMode:runLoopMode];
-  }
-  _animatedImageRunLoopMode = [runLoopMode copy];
-}
-
-- (void)setShouldAnimate:(BOOL)shouldAnimate
-{
-  ASLockScopeSelf();
-  [self _locked_setShouldAnimate:shouldAnimate];
-}
-
-- (void)_locked_setShouldAnimate:(BOOL)shouldAnimate
-{
-  ASAssertLocked(__instanceLock__);
-  
-  // This test is explicitly done and not ASPerformBlockOnMainThread as this would perform the block immediately
-  // on main if called on main thread and we have to call methods locked or unlocked based on which thread we are on
-  if (ASDisplayNodeThreadIsMain()) {
-    if (shouldAnimate) {
-      [self _locked_startAnimating];
-    } else {
-      [self _locked_stopAnimating];
-    }
-  } else {
-    // We have to dispatch to the main thread and call the regular methods as the lock is already gone if the
-    // block is called
-    dispatch_async(dispatch_get_main_queue(), ^{
-      if (shouldAnimate) {
-        [self startAnimating];
-      } else {
-        [self stopAnimating];
-      }
-    });
-  }
-}
-
-#pragma mark - Animating
-
-- (void)startAnimating
-{
-  ASDisplayNodeAssertMainThread();
-
-  ASLockScopeSelf();
-  [self _locked_startAnimating];
-}
-
-- (void)_locked_startAnimating
-{
-  ASAssertLocked(__instanceLock__);
-  
-  // It should be safe to call self.interfaceState in this case as it will only grab the lock of the superclass
-  if (!ASInterfaceStateIncludesVisible(self.interfaceState)) {
-    return;
-  }
-  
-  if (_animatedImagePaused) {
-    return;
-  }
-  
-  if (_animatedImage.playbackReady == NO) {
-    return;
-  }
-  
-#if ASAnimatedImageDebug
-  NSLog(@"starting animation: %p", self);
-#endif
-
-  // Get frame interval before holding display link lock to avoid deadlock
-  NSUInteger frameInterval = self.animatedImage.frameInterval;
-  AS::MutexLocker l(_displayLinkLock);
-  if (_displayLink == nil) {
-    _playHead = 0;
-    _displayLink = [CADisplayLink displayLinkWithTarget:[ASWeakProxy weakProxyWithTarget:self] selector:@selector(displayLinkFired:)];
-    _displayLink.frameInterval = frameInterval;
-    _lastSuccessfulFrameIndex = NSUIntegerMax;
-    
-    [_displayLink addToRunLoop:[NSRunLoop mainRunLoop] forMode:_animatedImageRunLoopMode];
-  } else {
-    _displayLink.paused = NO;
-  }
-}
-
-- (void)stopAnimating
-{
-  ASDisplayNodeAssertMainThread();
-  
-  ASLockScopeSelf();
-  [self _locked_stopAnimating];
-}
-
-- (void)_locked_stopAnimating
-{
-  ASDisplayNodeAssertMainThread();
-  ASAssertLocked(__instanceLock__);
-  
-#if ASAnimatedImageDebug
-  NSLog(@"stopping animation: %p", self);
-#endif
-  ASDisplayNodeAssertMainThread();
-  AS::MutexLocker l(_displayLinkLock);
-  _displayLink.paused = YES;
-  self.lastDisplayLinkFire = 0;
-  
-  [_animatedImage clearAnimatedImageCache];
-}
-
-#pragma mark - ASDisplayNode
-
-- (void)didEnterVisibleState
-{
-  ASDisplayNodeAssertMainThread();
-  [super didEnterVisibleState];
-  
-  if (self.animatedImage.coverImageReady) {
-    [self setCoverImage:self.animatedImage.coverImage];
-  }
-  if (self.animatedImage.playbackReady) {
-    [self startAnimating];
-  }
-}
-
-- (void)didExitVisibleState
-{
-  ASDisplayNodeAssertMainThread();
-  [super didExitVisibleState];
-  
-  [self stopAnimating];
-}
-
-- (void)didExitDisplayState
-{
-  ASDisplayNodeAssertMainThread();
-#if ASAnimatedImageDebug
-    NSLog(@"exiting display state: %p", self);
-#endif
-    
-  // Check to see if we're an animated image before calling super in case someone
-  // decides they want to clear out the animatedImage itself on exiting the display
-  // state
-  BOOL isAnimatedImage = self.animatedImage != nil;
-  [super didExitDisplayState];
-  
-  // Also clear out the contents we've set to be good citizens, we'll put it back in when we become visible.
-  if (isAnimatedImage) {
-    self.contents = nil;
-    [self setCoverImage:nil];
-  }
-}
-
-#pragma mark - Display Link Callbacks
-
-- (void)displayLinkFired:(CADisplayLink *)displayLink
-{
-  ASDisplayNodeAssertMainThread();
-
-  CFTimeInterval timeBetweenLastFire;
-  if (self.lastDisplayLinkFire == 0) {
-    timeBetweenLastFire = 0;
-  } else if (AS_AVAILABLE_IOS_TVOS(10, 10)) {
-    timeBetweenLastFire = displayLink.targetTimestamp - displayLink.timestamp;
-  } else {
-    timeBetweenLastFire = CACurrentMediaTime() - self.lastDisplayLinkFire;
-  }
-  self.lastDisplayLinkFire = CACurrentMediaTime();
-  
-  _playHead += timeBetweenLastFire;
-  
-  while (_playHead > self.animatedImage.totalDuration) {
-      // Set playhead to zero to keep from showing different frames on different playthroughs
-    _playHead = 0;
-    _playedLoops++;
-  }
-  
-  if (self.animatedImage.loopCount > 0 && _playedLoops >= self.animatedImage.loopCount) {
-    [self stopAnimating];
-    return;
-  }
-  
-  NSUInteger frameIndex = [self frameIndexAtPlayHeadPosition:_playHead];
-  if (frameIndex == _lastSuccessfulFrameIndex) {
-    return;
-  }
-  CGImageRef frameImage = [self.animatedImage imageAtIndex:frameIndex];
-  
-  if (frameImage == nil) {
-    //Pause the display link until we get a file ready notification
-    displayLink.paused = YES;
-    self.lastDisplayLinkFire = 0;
-  } else {
-    self.contents = (__bridge id)frameImage;
-    _lastSuccessfulFrameIndex = frameIndex;
-    [self displayDidFinish];
-  }
-}
-
-- (NSUInteger)frameIndexAtPlayHeadPosition:(CFTimeInterval)playHead
-{
-  ASDisplayNodeAssertMainThread();
-  NSUInteger frameIndex = 0;
-  for (NSUInteger durationIndex = 0; durationIndex < self.animatedImage.frameCount; durationIndex++) {
-    playHead -= [self.animatedImage durationAtIndex:durationIndex];
-    if (playHead < 0) {
-      return frameIndex;
-    }
-    frameIndex++;
-  }
-  
-  return frameIndex;
-}
-
-@end
-
-#pragma mark - ASImageNode(AnimatedImageInvalidation)
-
-@implementation ASImageNode(AnimatedImageInvalidation)
-
-- (void)invalidateAnimatedImage
-{
-  AS::MutexLocker l(_displayLinkLock);
-#if ASAnimatedImageDebug
-  if (_displayLink) {
-    NSLog(@"invalidating display link");
-  }
-#endif
-  [_displayLink invalidate];
-  _displayLink = nil;
-}
-
-@end
-
-#endif
diff --git a/submodules/AsyncDisplayKit/Source/ASImageNode.h b/submodules/AsyncDisplayKit/Source/ASImageNode.h
deleted file mode 100644
index 902591c4f6..0000000000
--- a/submodules/AsyncDisplayKit/Source/ASImageNode.h
+++ /dev/null
@@ -1,219 +0,0 @@
-//
-//  ASImageNode.h
-//  Texture
-//
-//  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.
-//  Changes after 4/13/2017 are: Copyright (c) Pinterest, Inc.  All rights reserved.
-//  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
-//
-
-#import <UIKit/UIKit.h>
-#import <AsyncDisplayKit/ASControlNode.h>
-
-NS_ASSUME_NONNULL_BEGIN
-
-#ifndef MINIMAL_ASDK
-@protocol ASAnimatedImageProtocol;
-#endif
-
-/**
- * Image modification block.  Use to transform an image before display.
- *
- * @param image The image to be displayed.
- *
- * @return A transformed image.
- */
-typedef UIImage * _Nullable (^asimagenode_modification_block_t)(UIImage *image);
-
-
-/**
- * @abstract Draws images.
- * @discussion Supports cropping, tinting, and arbitrary image modification blocks.
- */
-@interface ASImageNode : ASControlNode
-
-/**
- * @abstract The image to display.
- *
- * @discussion The node will efficiently display stretchable images by using
- * the layer's contentsCenter property.  Non-stretchable images work too, of
- * course.
- */
-@property (nullable) UIImage *image;
-
-/**
- @abstract The placeholder color.
- */
-@property (nullable, copy) UIColor *placeholderColor;
-
-/**
- * @abstract Indicates whether efficient cropping of the receiver is enabled.
- *
- * @discussion Defaults to YES. See -setCropEnabled:recropImmediately:inBounds: for more
- * information.
- */
-@property (getter=isCropEnabled) BOOL cropEnabled;
-
-/**
- * @abstract Indicates that efficient downsizing of backing store should *not* be enabled.
- *
- * @discussion Defaults to NO. @see ASCroppedImageBackingSizeAndDrawRectInBounds for more
- * information.
- */
-@property BOOL forceUpscaling;
-
-@property (nonatomic, assign) BOOL displayWithoutProcessing;
-
-/**
- * @abstract Forces image to be rendered at forcedSize.
- * @discussion Defaults to CGSizeZero to indicate that the forcedSize should not be used.
- * Setting forcedSize to non-CGSizeZero will force the backing of the layer contents to 
- * be forcedSize (automatically adjusted for contentsSize).
- */
-@property CGSize forcedSize;
-
-/**
- * @abstract Enables or disables efficient cropping.
- * 
- * @param cropEnabled YES to efficiently crop the receiver's contents such that
- * contents outside of its bounds are not included; NO otherwise.
- *
- * @param recropImmediately If the receiver has an image, YES to redisplay the
- * receiver immediately; NO otherwise.
- *
- * @param cropBounds The bounds into which the receiver will be cropped. Useful
- * if bounds are to change in response to cropping (but have not yet done so).
- *
- * @discussion Efficient cropping is only performed when the receiver's view's
- * contentMode is UIViewContentModeScaleAspectFill. By default, cropping is
- * enabled. The crop alignment may be controlled via cropAlignmentFactor.
- */
-- (void)setCropEnabled:(BOOL)cropEnabled recropImmediately:(BOOL)recropImmediately inBounds:(CGRect)cropBounds;
-
-/**
- * @abstract A value that controls how the receiver's efficient cropping is aligned.
- *
- * @discussion This value defines a rectangle that is to be featured by the
- * receiver. The rectangle is specified as a "unit rectangle," using
- * fractions of the source image's width and height, e.g. CGRectMake(0.5, 0,
- * 0.5, 1.0) will feature the full right half a photo. If the cropRect is
- * empty, the content mode of the receiver will be used to determine its
- * dimensions, and only the cropRect's origin will be used for positioning. The
- * default value of this property is CGRectMake(0.5, 0.5, 0.0, 0.0).
- */
-@property CGRect cropRect;
-
-/**
- * @abstract An optional block which can perform drawing operations on image
- * during the display phase.
- *
- * @discussion Can be used to add image effects (such as rounding, adding
- * borders, or other pattern overlays) without extraneous display calls.
- */
-@property (nullable) asimagenode_modification_block_t imageModificationBlock;
-
-/**
- * @abstract Marks the receiver as needing display and performs a block after
- * display has finished.
- *
- * @param displayCompletionBlock The block to be performed after display has
- * finished.  Its `canceled` property will be YES if display was prevented or
- * canceled (via displaySuspended); NO otherwise.
- * 
- * @discussion displayCompletionBlock will be performed on the main-thread. If
- * `displaySuspended` is YES, `displayCompletionBlock` is will be
- * performed immediately and `YES` will be passed for `canceled`.
- */
-- (void)setNeedsDisplayWithCompletion:(nullable void (^)(BOOL canceled))displayCompletionBlock;
-
-#if TARGET_OS_TV
-/** 
- * A bool to track if the current appearance of the node
- * is the default focus appearance.
- * Exposed here so the category methods can set it.
- */
-@property BOOL isDefaultFocusAppearance;
-#endif
-
-@end
-
-#if TARGET_OS_TV
-@interface ASImageNode (tvOS)
-@end
-#endif
-
-#ifndef MINIMAL_ASDK
-@interface ASImageNode (AnimatedImage)
-
-/**
- * @abstract The animated image to playback
- *
- * @discussion Set this to an object which conforms to ASAnimatedImageProtocol
- * to have the ASImageNode playback an animated image.
- * @warning this method should not be overridden, it may not always be called as
- * another method is used internally. If you need to know when the animatedImage
- * is set, override @c animatedImageSet:previousAnimatedImage:
- */
-@property (nullable) id <ASAnimatedImageProtocol> animatedImage;
-
-/**
- * @abstract Pause the playback of an animated image.
- *
- * @discussion Set to YES to pause playback of an animated image and NO to resume
- * playback.
- */
-@property BOOL animatedImagePaused;
-
-/**
- * @abstract The runloop mode used to animate the image.
- *
- * @discussion Defaults to NSRunLoopCommonModes. Another commonly used mode is NSDefaultRunLoopMode.
- * Setting NSDefaultRunLoopMode will cause animation to pause while scrolling (if the ASImageNode is
- * in a scroll view), which may improve scroll performance in some use cases.
- */
-@property (copy) NSString *animatedImageRunLoopMode;
-
-/**
- * @abstract Method called when animated image has been set
- *
- * @discussion This method is for subclasses to override so they can know if an animated image
- * has been set on the node.
- */
-- (void)animatedImageSet:(nullable id <ASAnimatedImageProtocol>)newAnimatedImage previousAnimatedImage:(nullable id <ASAnimatedImageProtocol>)previousAnimatedImage ASDISPLAYNODE_REQUIRES_SUPER;
-
-@end
-#endif
-
-@interface ASImageNode (Unavailable)
-
-- (instancetype)initWithLayerBlock:(ASDisplayNodeLayerBlock)viewBlock didLoadBlock:(nullable ASDisplayNodeDidLoadBlock)didLoadBlock AS_UNAVAILABLE();
-
-- (instancetype)initWithViewBlock:(ASDisplayNodeViewBlock)viewBlock didLoadBlock:(nullable ASDisplayNodeDidLoadBlock)didLoadBlock AS_UNAVAILABLE();
-
-@end
-
-/**
- * @abstract Image modification block that rounds (and optionally adds a border to) an image.
- *
- * @param borderWidth The width of the round border to draw, or zero if no border is desired.
- * @param borderColor What colour border to draw.
- *
- * @see <imageModificationBlock>
- *
- * @return An ASImageNode image modification block.
- */
-AS_EXTERN asimagenode_modification_block_t ASImageNodeRoundBorderModificationBlock(CGFloat borderWidth, UIColor * _Nullable borderColor);
-
-/**
- * @abstract Image modification block that applies a tint color à la UIImage configured with
- * renderingMode set to UIImageRenderingModeAlwaysTemplate.
- *
- * @param color The color to tint the image.
- *
- * @see <imageModificationBlock>
- *
- * @return An ASImageNode image modification block.
- */
-AS_EXTERN asimagenode_modification_block_t ASImageNodeTintColorModificationBlock(UIColor *color);
-
-NS_ASSUME_NONNULL_END
diff --git a/submodules/AsyncDisplayKit/Source/ASImageNode.mm b/submodules/AsyncDisplayKit/Source/ASImageNode.mm
deleted file mode 100644
index e17597bde9..0000000000
--- a/submodules/AsyncDisplayKit/Source/ASImageNode.mm
+++ /dev/null
@@ -1,784 +0,0 @@
-//
-//  ASImageNode.mm
-//  Texture
-//
-//  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.
-//  Changes after 4/13/2017 are: Copyright (c) Pinterest, Inc.  All rights reserved.
-//  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
-//
-
-#import <AsyncDisplayKit/ASImageNode.h>
-
-#import <tgmath.h>
-
-#import <AsyncDisplayKit/_ASDisplayLayer.h>
-#import <AsyncDisplayKit/ASAssert.h>
-#import <AsyncDisplayKit/ASDimension.h>
-#import <AsyncDisplayKit/ASDisplayNode+FrameworkPrivate.h>
-#import <AsyncDisplayKit/ASDisplayNode+Subclasses.h>
-#import <AsyncDisplayKit/ASDisplayNodeExtras.h>
-#import <AsyncDisplayKit/ASGraphicsContext.h>
-#import <AsyncDisplayKit/ASLayout.h>
-#import <AsyncDisplayKit/ASTextNode.h>
-#import <AsyncDisplayKit/ASImageNode+AnimatedImagePrivate.h>
-#import <AsyncDisplayKit/ASImageNode+CGExtras.h>
-#import <AsyncDisplayKit/AsyncDisplayKit+Debug.h>
-#import <AsyncDisplayKit/ASInternalHelpers.h>
-#import <AsyncDisplayKit/ASEqualityHelpers.h>
-#import <AsyncDisplayKit/ASHashing.h>
-#import <AsyncDisplayKit/ASWeakMap.h>
-#import <AsyncDisplayKit/CoreGraphics+ASConvenience.h>
-#import <AsyncDisplayKit/_ASCoreAnimationExtras.h>
-
-// TODO: It would be nice to remove this dependency; it's the only subclass using more than +FrameworkSubclasses.h
-#import <AsyncDisplayKit/ASDisplayNodeInternal.h>
-
-static const CGSize kMinReleaseImageOnBackgroundSize = {20.0, 20.0};
-
-typedef void (^ASImageNodeDrawParametersBlock)(ASWeakMapEntry *entry);
-
-@interface ASImageNodeDrawParameters : NSObject {
-@package
-  UIImage *_image;
-  BOOL _opaque;
-  CGRect _bounds;
-  CGFloat _contentsScale;
-  UIColor *_backgroundColor;
-  UIViewContentMode _contentMode;
-  BOOL _cropEnabled;
-  BOOL _forceUpscaling;
-  CGSize _forcedSize;
-  CGRect _cropRect;
-  CGRect _cropDisplayBounds;
-  asimagenode_modification_block_t _imageModificationBlock;
-  ASDisplayNodeContextModifier _willDisplayNodeContentWithRenderingContext;
-  ASDisplayNodeContextModifier _didDisplayNodeContentWithRenderingContext;
-  ASImageNodeDrawParametersBlock _didDrawBlock;
-}
-
-@end
-
-@implementation ASImageNodeDrawParameters
-
-@end
-
-/**
- * Contains all data that is needed to generate the content bitmap.
- */
-@interface ASImageNodeContentsKey : NSObject
-
-@property (nonatomic) UIImage *image;
-@property CGSize backingSize;
-@property CGRect imageDrawRect;
-@property BOOL isOpaque;
-@property (nonatomic, copy) UIColor *backgroundColor;
-@property (nonatomic) ASDisplayNodeContextModifier willDisplayNodeContentWithRenderingContext;
-@property (nonatomic) ASDisplayNodeContextModifier didDisplayNodeContentWithRenderingContext;
-@property (nonatomic) asimagenode_modification_block_t imageModificationBlock;
-
-@end
-
-@implementation ASImageNodeContentsKey
-
-- (BOOL)isEqual:(id)object
-{
-  if (self == object) {
-    return YES;
-  }
-
-  // Optimization opportunity: The `isKindOfClass` call here could be avoided by not using the NSObject `isEqual:`
-  // convention and instead using a custom comparison function that assumes all items are heterogeneous.
-  // However, profiling shows that our entire `isKindOfClass` expression is only ~1/40th of the total
-  // overheard of our caching, so it's likely not high-impact.
-  if ([object isKindOfClass:[ASImageNodeContentsKey class]]) {
-    ASImageNodeContentsKey *other = (ASImageNodeContentsKey *)object;
-    return [_image isEqual:other.image]
-      && CGSizeEqualToSize(_backingSize, other.backingSize)
-      && CGRectEqualToRect(_imageDrawRect, other.imageDrawRect)
-      && _isOpaque == other.isOpaque
-      && [_backgroundColor isEqual:other.backgroundColor]
-      && _willDisplayNodeContentWithRenderingContext == other.willDisplayNodeContentWithRenderingContext
-      && _didDisplayNodeContentWithRenderingContext == other.didDisplayNodeContentWithRenderingContext
-      && _imageModificationBlock == other.imageModificationBlock;
-  } else {
-    return NO;
-  }
-}
-
-- (NSUInteger)hash
-{
-#pragma clang diagnostic push
-#pragma clang diagnostic warning "-Wpadded"
-  struct {
-    NSUInteger imageHash;
-    CGSize backingSize;
-    CGRect imageDrawRect;
-    NSInteger isOpaque;
-    NSUInteger backgroundColorHash;
-    void *willDisplayNodeContentWithRenderingContext;
-    void *didDisplayNodeContentWithRenderingContext;
-    void *imageModificationBlock;
-#pragma clang diagnostic pop
-  } data = {
-    _image.hash,
-    _backingSize,
-    _imageDrawRect,
-    _isOpaque,
-    _backgroundColor.hash,
-    (void *)_willDisplayNodeContentWithRenderingContext,
-    (void *)_didDisplayNodeContentWithRenderingContext,
-    (void *)_imageModificationBlock
-  };
-  return ASHashBytes(&data, sizeof(data));
-}
-
-@end
-
-
-@implementation ASImageNode
-{
-@private
-  UIImage *_image;
-  ASWeakMapEntry *_weakCacheEntry;  // Holds a reference that keeps our contents in cache.
-  UIColor *_placeholderColor;
-
-  void (^_displayCompletionBlock)(BOOL canceled);
-  
-  // Drawing
-  ASTextNode *_debugLabelNode;
-  
-  // Cropping.
-  BOOL _cropEnabled; // Defaults to YES.
-  BOOL _forceUpscaling; //Defaults to NO.
-  CGSize _forcedSize; //Defaults to CGSizeZero, indicating no forced size.
-  CGRect _cropRect; // Defaults to CGRectMake(0.5, 0.5, 0, 0)
-  CGRect _cropDisplayBounds; // Defaults to CGRectNull
-}
-
-@synthesize image = _image;
-@synthesize imageModificationBlock = _imageModificationBlock;
-
-#pragma mark - Lifecycle
-
-- (instancetype)init
-{
-  if (!(self = [super init]))
-    return nil;
-
-  // TODO can this be removed?
-  self.contentsScale = ASScreenScale();
-  self.contentMode = UIViewContentModeScaleAspectFill;
-  self.opaque = NO;
-  self.clipsToBounds = YES;
-
-  // If no backgroundColor is set to the image node and it's a subview of UITableViewCell, UITableView is setting
-  // the opaque value of all subviews to YES if highlighting / selection is happening and does not set it back to the
-  // initial value. With setting a explicit backgroundColor we can prevent that change.
-  self.backgroundColor = [UIColor clearColor];
-
-  _cropEnabled = YES;
-  _forceUpscaling = NO;
-  _cropRect = CGRectMake(0.5, 0.5, 0, 0);
-  _cropDisplayBounds = CGRectNull;
-  _placeholderColor = ASDisplayNodeDefaultPlaceholderColor();
-#ifndef MINIMAL_ASDK
-  _animatedImageRunLoopMode = ASAnimatedImageDefaultRunLoopMode;
-#endif
-  
-  return self;
-}
-
-- (void)dealloc
-{
-  // Invalidate all components around animated images
-#ifndef MINIMAL_ASDK
-  [self invalidateAnimatedImage];
-#endif
-}
-
-#pragma mark - Placeholder
-
-- (UIImage *)placeholderImage
-{
-  // FIXME: Replace this implementation with reusable CALayers that have .backgroundColor set.
-  // This would completely eliminate the memory and performance cost of the backing store.
-  CGSize size = self.calculatedSize;
-  if ((size.width * size.height) < CGFLOAT_EPSILON) {
-    return nil;
-  }
-  
-  AS::MutexLocker l(__instanceLock__);
-  
-  ASGraphicsBeginImageContextWithOptions(size, NO, 1);
-  [self.placeholderColor setFill];
-  UIRectFill(CGRectMake(0, 0, size.width, size.height));
-  UIImage *image = ASGraphicsGetImageAndEndCurrentContext();
-  
-  return image;
-}
-
-#pragma mark - Layout and Sizing
-
-- (CGSize)calculateSizeThatFits:(CGSize)constrainedSize
-{
-  const auto image = ASLockedSelf(_image);
-
-  if (image == nil) {
-    return [super calculateSizeThatFits:constrainedSize];
-  }
-
-  return image.size;
-}
-
-#pragma mark - Setter / Getter
-
-- (void)setImage:(UIImage *)image
-{
-  AS::MutexLocker l(__instanceLock__);
-  [self _locked_setImage:image];
-}
-
-- (void)_locked_setImage:(UIImage *)image
-{
-  ASAssertLocked(__instanceLock__);
-  if (ASObjectIsEqual(_image, image)) {
-    return;
-  }
-
-  UIImage *oldImage = _image;
-  _image = image;
-  
-  if (image != nil) {
-    // We explicitly call setNeedsDisplay in this case, although we know setNeedsDisplay will be called with lock held.
-    // Therefore we have to be careful in methods that are involved with setNeedsDisplay to not run into a deadlock
-    [self setNeedsDisplay];
-    
-    if (_displayWithoutProcessing && ASDisplayNodeThreadIsMain()) {
-      BOOL stretchable = !UIEdgeInsetsEqualToEdgeInsets(image.capInsets, UIEdgeInsetsZero);
-      if (stretchable) {
-        ASDisplayNodeSetResizableContents(self, image);
-      } else {
-        self.contents = (id)image.CGImage;
-      }
-      return;
-    }
-  } else {
-    self.contents = nil;
-  }
-
-  // Destruction of bigger images on the main thread can be expensive
-  // and can take some time, so we dispatch onto a bg queue to
-  // actually dealloc.
-  CGSize oldImageSize = oldImage.size;
-  BOOL shouldReleaseImageOnBackgroundThread = oldImageSize.width > kMinReleaseImageOnBackgroundSize.width
-                                              || oldImageSize.height > kMinReleaseImageOnBackgroundSize.height;
-  if (shouldReleaseImageOnBackgroundThread) {
-    ASPerformBackgroundDeallocation(&oldImage);
-  }
-}
-
-- (UIImage *)image
-{
-  return ASLockedSelf(_image);
-}
-
-- (UIColor *)placeholderColor
-{
-  return ASLockedSelf(_placeholderColor);
-}
-
-- (void)setPlaceholderColor:(UIColor *)placeholderColor
-{
-  ASLockScopeSelf();
-  if (ASCompareAssignCopy(_placeholderColor, placeholderColor)) {
-    _placeholderEnabled = (placeholderColor != nil);
-  }
-}
-
-#pragma mark - Drawing
-
-- (NSObject *)drawParametersForAsyncLayer:(_ASDisplayLayer *)layer
-{
-  ASLockScopeSelf();
-  
-  ASImageNodeDrawParameters *drawParameters = [[ASImageNodeDrawParameters alloc] init];
-  drawParameters->_image = _image;
-  drawParameters->_bounds = [self threadSafeBounds];
-  drawParameters->_opaque = self.opaque;
-  drawParameters->_contentsScale = _contentsScaleForDisplay;
-  drawParameters->_backgroundColor = self.backgroundColor;
-  drawParameters->_contentMode = self.contentMode;
-  drawParameters->_cropEnabled = _cropEnabled;
-  drawParameters->_forceUpscaling = _forceUpscaling;
-  drawParameters->_forcedSize = _forcedSize;
-  drawParameters->_cropRect = _cropRect;
-  drawParameters->_cropDisplayBounds = _cropDisplayBounds;
-  drawParameters->_imageModificationBlock = _imageModificationBlock;
-  drawParameters->_willDisplayNodeContentWithRenderingContext = _willDisplayNodeContentWithRenderingContext;
-  drawParameters->_didDisplayNodeContentWithRenderingContext = _didDisplayNodeContentWithRenderingContext;
-
-  // Hack for now to retain the weak entry that was created while this drawing happened
-  drawParameters->_didDrawBlock = ^(ASWeakMapEntry *entry){
-    ASLockScopeSelf();
-    _weakCacheEntry = entry;
-  };
-  
-  return drawParameters;
-}
-
-+ (UIImage *)displayWithParameters:(id<NSObject>)parameter isCancelled:(NS_NOESCAPE asdisplaynode_iscancelled_block_t)isCancelled
-{
-  ASImageNodeDrawParameters *drawParameter = (ASImageNodeDrawParameters *)parameter;
-
-  UIImage *image = drawParameter->_image;
-  if (image == nil) {
-    return nil;
-  }
-
-  if (true) {
-    return image;
-  }
-  
-  CGRect drawParameterBounds       = drawParameter->_bounds;
-  BOOL forceUpscaling              = drawParameter->_forceUpscaling;
-  CGSize forcedSize                = drawParameter->_forcedSize;
-  BOOL cropEnabled                 = drawParameter->_cropEnabled;
-  BOOL isOpaque                    = drawParameter->_opaque;
-  UIColor *backgroundColor         = drawParameter->_backgroundColor;
-  UIViewContentMode contentMode    = drawParameter->_contentMode;
-  CGFloat contentsScale            = drawParameter->_contentsScale;
-  CGRect cropDisplayBounds         = drawParameter->_cropDisplayBounds;
-  CGRect cropRect                  = drawParameter->_cropRect;
-  asimagenode_modification_block_t imageModificationBlock                 = drawParameter->_imageModificationBlock;
-  ASDisplayNodeContextModifier willDisplayNodeContentWithRenderingContext = drawParameter->_willDisplayNodeContentWithRenderingContext;
-  ASDisplayNodeContextModifier didDisplayNodeContentWithRenderingContext  = drawParameter->_didDisplayNodeContentWithRenderingContext;
-  
-  BOOL hasValidCropBounds = cropEnabled && !CGRectIsEmpty(cropDisplayBounds);
-  CGRect bounds = (hasValidCropBounds ? cropDisplayBounds : drawParameterBounds);
-  
-  
-  ASDisplayNodeAssert(contentsScale > 0, @"invalid contentsScale at display time");
-  
-  // if the image is resizable, bail early since the image has likely already been configured
-  BOOL stretchable = !UIEdgeInsetsEqualToEdgeInsets(image.capInsets, UIEdgeInsetsZero);
-  if (stretchable) {
-    if (imageModificationBlock != NULL) {
-      image = imageModificationBlock(image);
-    }
-    return image;
-  }
-  
-  CGSize imageSize = image.size;
-  CGSize imageSizeInPixels = CGSizeMake(imageSize.width * image.scale, imageSize.height * image.scale);
-  CGSize boundsSizeInPixels = CGSizeMake(std::floor(bounds.size.width * contentsScale), std::floor(bounds.size.height * contentsScale));
-  
-  BOOL contentModeSupported = contentMode == UIViewContentModeScaleAspectFill ||
-                              contentMode == UIViewContentModeScaleAspectFit ||
-                              contentMode == UIViewContentModeCenter;
-  
-  CGSize backingSize   = CGSizeZero;
-  CGRect imageDrawRect = CGRectZero;
-  
-  if (boundsSizeInPixels.width * contentsScale < 1.0f || boundsSizeInPixels.height * contentsScale < 1.0f ||
-      imageSizeInPixels.width < 1.0f                  || imageSizeInPixels.height < 1.0f) {
-    return nil;
-  }
-  
-  
-  // If we're not supposed to do any cropping, just decode image at original size
-  if (!cropEnabled || !contentModeSupported || stretchable) {
-    backingSize = imageSizeInPixels;
-    imageDrawRect = (CGRect){.size = backingSize};
-  } else {
-    if (CGSizeEqualToSize(CGSizeZero, forcedSize) == NO) {
-      //scale forced size
-      forcedSize.width *= contentsScale;
-      forcedSize.height *= contentsScale;
-    }
-    ASCroppedImageBackingSizeAndDrawRectInBounds(imageSizeInPixels,
-                                                 boundsSizeInPixels,
-                                                 contentMode,
-                                                 cropRect,
-                                                 forceUpscaling,
-                                                 forcedSize,
-                                                 &backingSize,
-                                                 &imageDrawRect);
-  }
-  
-  if (backingSize.width <= 0.0f        || backingSize.height <= 0.0f ||
-      imageDrawRect.size.width <= 0.0f || imageDrawRect.size.height <= 0.0f) {
-    return nil;
-  }
-
-  ASImageNodeContentsKey *contentsKey = [[ASImageNodeContentsKey alloc] init];
-  contentsKey.image = image;
-  contentsKey.backingSize = backingSize;
-  contentsKey.imageDrawRect = imageDrawRect;
-  contentsKey.isOpaque = isOpaque;
-  contentsKey.backgroundColor = backgroundColor;
-  contentsKey.willDisplayNodeContentWithRenderingContext = willDisplayNodeContentWithRenderingContext;
-  contentsKey.didDisplayNodeContentWithRenderingContext = didDisplayNodeContentWithRenderingContext;
-  contentsKey.imageModificationBlock = imageModificationBlock;
-
-  if (isCancelled()) {
-    return nil;
-  }
-
-  ASWeakMapEntry<UIImage *> *entry = [self.class contentsForkey:contentsKey
-                                                 drawParameters:parameter
-                                                    isCancelled:isCancelled];
-  // If nil, we were cancelled.
-  if (entry == nil) {
-    return nil;
-  }
-  
-  if (drawParameter->_didDrawBlock) {
-    drawParameter->_didDrawBlock(entry);
-  }
-
-  return entry.value;
-}
-
-static ASWeakMap<ASImageNodeContentsKey *, UIImage *> *cache = nil;
-
-+ (ASWeakMapEntry *)contentsForkey:(ASImageNodeContentsKey *)key drawParameters:(id)drawParameters isCancelled:(asdisplaynode_iscancelled_block_t)isCancelled
-{
-  static dispatch_once_t onceToken;
-  static AS::Mutex *cacheLock = nil;
-  dispatch_once(&onceToken, ^{
-    cacheLock = new AS::Mutex();
-  });
-  
-  {
-    AS::MutexLocker l(*cacheLock);
-    if (!cache) {
-      cache = [[ASWeakMap alloc] init];
-    }
-    ASWeakMapEntry *entry = [cache entryForKey:key];
-    if (entry != nil) {
-      return entry;
-    }
-  }
-
-  // cache miss
-  UIImage *contents = [self createContentsForkey:key drawParameters:drawParameters isCancelled:isCancelled];
-  if (contents == nil) { // If nil, we were cancelled
-    return nil;
-  }
-
-  {
-    AS::MutexLocker l(*cacheLock);
-    return [cache setObject:contents forKey:key];
-  }
-}
-
-+ (UIImage *)createContentsForkey:(ASImageNodeContentsKey *)key drawParameters:(id)drawParameters isCancelled:(asdisplaynode_iscancelled_block_t)isCancelled
-{
-  // The following `ASGraphicsBeginImageContextWithOptions` call will sometimes take take longer than 5ms on an
-  // A5 processor for a 400x800 backingSize.
-  // Check for cancellation before we call it.
-  if (isCancelled()) {
-    return nil;
-  }
-
-  // Use contentsScale of 1.0 and do the contentsScale handling in boundsSizeInPixels so ASCroppedImageBackingSizeAndDrawRectInBounds
-  // will do its rounding on pixel instead of point boundaries
-  ASGraphicsBeginImageContextWithOptions(key.backingSize, key.isOpaque, 1.0);
-  
-  BOOL contextIsClean = YES;
-  
-  CGContextRef context = UIGraphicsGetCurrentContext();
-  if (context && key.willDisplayNodeContentWithRenderingContext) {
-    key.willDisplayNodeContentWithRenderingContext(context, drawParameters);
-    contextIsClean = NO;
-  }
-  
-  // if view is opaque, fill the context with background color
-  if (key.isOpaque && key.backgroundColor) {
-    [key.backgroundColor setFill];
-    UIRectFill({ .size = key.backingSize });
-    contextIsClean = NO;
-  }
-  
-  // iOS 9 appears to contain a thread safety regression when drawing the same CGImageRef on
-  // multiple threads concurrently.  In fact, instead of crashing, it appears to deadlock.
-  // The issue is present in Mac OS X El Capitan and has been seen hanging Pro apps like Adobe Premiere,
-  // as well as iOS games, and a small number of ASDK apps that provide the same image reference
-  // to many separate ASImageNodes.  A workaround is to set .displaysAsynchronously = NO for the nodes
-  // that may get the same pointer for a given UI asset image, etc.
-  // FIXME: We should replace @synchronized here, probably using a global, locked NSMutableSet, and
-  // only if the object already exists in the set we should create a semaphore to signal waiting threads
-  // upon removal of the object from the set when the operation completes.
-  // Another option is to have ASDisplayNode+AsyncDisplay coordinate these cases, and share the decoded buffer.
-  // Details tracked in https://github.com/facebook/AsyncDisplayKit/issues/1068
-  
-  UIImage *image = key.image;
-  BOOL canUseCopy = (contextIsClean || ASImageAlphaInfoIsOpaque(CGImageGetAlphaInfo(image.CGImage)));
-  CGBlendMode blendMode = canUseCopy ? kCGBlendModeCopy : kCGBlendModeNormal;
-  
-  @synchronized(image) {
-    [image drawInRect:key.imageDrawRect blendMode:blendMode alpha:1];
-  }
-  
-  if (context && key.didDisplayNodeContentWithRenderingContext) {
-    key.didDisplayNodeContentWithRenderingContext(context, drawParameters);
-  }
-
-  // Check cancellation one last time before forming image.
-  if (isCancelled()) {
-    ASGraphicsEndImageContext();
-    return nil;
-  }
-
-  UIImage *result = ASGraphicsGetImageAndEndCurrentContext();
-  
-  if (key.imageModificationBlock) {
-    result = key.imageModificationBlock(result);
-  }
-  
-  return result;
-}
-
-- (void)displayDidFinish
-{
-  [super displayDidFinish];
-
-  __instanceLock__.lock();
-    UIImage *image = _image;
-    void (^displayCompletionBlock)(BOOL canceled) = _displayCompletionBlock;
-    BOOL shouldPerformDisplayCompletionBlock = (image && displayCompletionBlock);
-
-    // Clear the ivar now. The block is retained and will be executed shortly.
-    if (shouldPerformDisplayCompletionBlock) {
-      _displayCompletionBlock = nil;
-    }
-
-    BOOL hasDebugLabel = (_debugLabelNode != nil);
-  __instanceLock__.unlock();
-
-  // Update the debug label if necessary
-  if (hasDebugLabel) {
-    // For debugging purposes we don't care about locking for now
-    CGSize imageSize = image.size;
-    CGSize imageSizeInPixels = CGSizeMake(imageSize.width * image.scale, imageSize.height * image.scale);
-    CGSize boundsSizeInPixels = CGSizeMake(std::floor(self.bounds.size.width * self.contentsScale), std::floor(self.bounds.size.height * self.contentsScale));
-    CGFloat pixelCountRatio            = (imageSizeInPixels.width * imageSizeInPixels.height) / (boundsSizeInPixels.width * boundsSizeInPixels.height);
-    if (pixelCountRatio != 1.0) {
-      NSString *scaleString            = [NSString stringWithFormat:@"%.2fx", pixelCountRatio];
-      _debugLabelNode.attributedText   = [[NSAttributedString alloc] initWithString:scaleString attributes:[self debugLabelAttributes]];
-      _debugLabelNode.hidden           = NO;
-    } else {
-      _debugLabelNode.hidden           = YES;
-      _debugLabelNode.attributedText   = nil;
-    }
-  }
-  
-  // If we've got a block to perform after displaying, do it.
-  if (shouldPerformDisplayCompletionBlock) {
-    displayCompletionBlock(NO);
-  }
-}
-
-- (void)setNeedsDisplayWithCompletion:(void (^ _Nullable)(BOOL canceled))displayCompletionBlock
-{
-  if (self.displaySuspended) {
-    if (displayCompletionBlock)
-      displayCompletionBlock(YES);
-    return;
-  }
-
-  // Stash the block and call-site queue. We'll invoke it in -displayDidFinish.
-  {
-    AS::MutexLocker l(__instanceLock__);
-    if (_displayCompletionBlock != displayCompletionBlock) {
-      _displayCompletionBlock = displayCompletionBlock;
-    }
-  }
-
-  [self setNeedsDisplay];
-}
-
-#pragma mark Interface State
-
-- (void)clearContents
-{
-  [super clearContents];
-  
-  AS::MutexLocker l(__instanceLock__);
-  _weakCacheEntry = nil;  // release contents from the cache.
-}
-
-#pragma mark - Cropping
-
-- (BOOL)isCropEnabled
-{
-  AS::MutexLocker l(__instanceLock__);
-  return _cropEnabled;
-}
-
-- (void)setCropEnabled:(BOOL)cropEnabled
-{
-  [self setCropEnabled:cropEnabled recropImmediately:NO inBounds:self.bounds];
-}
-
-- (void)setCropEnabled:(BOOL)cropEnabled recropImmediately:(BOOL)recropImmediately inBounds:(CGRect)cropBounds
-{
-  __instanceLock__.lock();
-  if (_cropEnabled == cropEnabled) {
-    __instanceLock__.unlock();
-    return;
-  }
-
-  _cropEnabled = cropEnabled;
-  _cropDisplayBounds = cropBounds;
-  
-  UIImage *image = _image;
-  __instanceLock__.unlock();
-
-  // If we have an image to display, display it, respecting our recrop flag.
-  if (image != nil) {
-    ASPerformBlockOnMainThread(^{
-      if (recropImmediately)
-        [self displayImmediately];
-      else
-        [self setNeedsDisplay];
-    });
-  }
-}
-
-- (CGRect)cropRect
-{
-  AS::MutexLocker l(__instanceLock__);
-  return _cropRect;
-}
-
-- (void)setCropRect:(CGRect)cropRect
-{
-  {
-    AS::MutexLocker l(__instanceLock__);
-    if (CGRectEqualToRect(_cropRect, cropRect)) {
-      return;
-    }
-
-    _cropRect = cropRect;
-  }
-
-  // TODO: this logic needs to be updated to respect cropRect.
-  CGSize boundsSize = self.bounds.size;
-  CGSize imageSize = self.image.size;
-
-  BOOL isCroppingImage = ((boundsSize.width < imageSize.width) || (boundsSize.height < imageSize.height));
-
-  // Re-display if we need to.
-  ASPerformBlockOnMainThread(^{
-    if (self.nodeLoaded && self.contentMode == UIViewContentModeScaleAspectFill && isCroppingImage)
-      [self setNeedsDisplay];
-  });
-}
-
-- (BOOL)forceUpscaling
-{
-  AS::MutexLocker l(__instanceLock__);
-  return _forceUpscaling;
-}
-
-- (void)setForceUpscaling:(BOOL)forceUpscaling
-{
-  AS::MutexLocker l(__instanceLock__);
-  _forceUpscaling = forceUpscaling;
-}
-
-- (CGSize)forcedSize
-{
-  AS::MutexLocker l(__instanceLock__);
-  return _forcedSize;
-}
-
-- (void)setForcedSize:(CGSize)forcedSize
-{
-  AS::MutexLocker l(__instanceLock__);
-  _forcedSize = forcedSize;
-}
-
-- (asimagenode_modification_block_t)imageModificationBlock
-{
-  AS::MutexLocker l(__instanceLock__);
-  return _imageModificationBlock;
-}
-
-- (void)setImageModificationBlock:(asimagenode_modification_block_t)imageModificationBlock
-{
-  AS::MutexLocker l(__instanceLock__);
-  _imageModificationBlock = imageModificationBlock;
-}
-
-#pragma mark - Debug
-
-- (void)layout
-{
-  [super layout];
-  
-  if (_debugLabelNode) {
-    CGSize boundsSize        = self.bounds.size;
-    CGSize debugLabelSize    = [_debugLabelNode layoutThatFits:ASSizeRangeMake(CGSizeZero, boundsSize)].size;
-    CGPoint debugLabelOrigin = CGPointMake(boundsSize.width - debugLabelSize.width,
-                                           boundsSize.height - debugLabelSize.height);
-    _debugLabelNode.frame    = (CGRect) {debugLabelOrigin, debugLabelSize};
-  }
-}
-
-- (NSDictionary *)debugLabelAttributes
-{
-  return @{
-    NSFontAttributeName: [UIFont systemFontOfSize:15.0],
-    NSForegroundColorAttributeName: [UIColor redColor]
-  };
-}
-
-@end
-
-#pragma mark - Extras
-
-asimagenode_modification_block_t ASImageNodeRoundBorderModificationBlock(CGFloat borderWidth, UIColor *borderColor)
-{
-  return ^(UIImage *originalImage) {
-    ASGraphicsBeginImageContextWithOptions(originalImage.size, NO, originalImage.scale);
-    UIBezierPath *roundOutline = [UIBezierPath bezierPathWithOvalInRect:(CGRect){CGPointZero, originalImage.size}];
-
-    // Make the image round
-    [roundOutline addClip];
-
-    // Draw the original image
-    [originalImage drawAtPoint:CGPointZero blendMode:kCGBlendModeCopy alpha:1];
-
-    // Draw a border on top.
-    if (borderWidth > 0.0) {
-      [borderColor setStroke];
-      [roundOutline setLineWidth:borderWidth];
-      [roundOutline stroke];
-    }
-
-    return ASGraphicsGetImageAndEndCurrentContext();
-  };
-}
-
-asimagenode_modification_block_t ASImageNodeTintColorModificationBlock(UIColor *color)
-{
-  return ^(UIImage *originalImage) {
-    ASGraphicsBeginImageContextWithOptions(originalImage.size, NO, originalImage.scale);
-    
-    // Set color and render template
-    [color setFill];
-    UIImage *templateImage = [originalImage imageWithRenderingMode:UIImageRenderingModeAlwaysTemplate];
-    [templateImage drawAtPoint:CGPointZero blendMode:kCGBlendModeCopy alpha:1];
-    
-    UIImage *modifiedImage = ASGraphicsGetImageAndEndCurrentContext();
-
-    // if the original image was stretchy, keep it stretchy
-    if (!UIEdgeInsetsEqualToEdgeInsets(originalImage.capInsets, UIEdgeInsetsZero)) {
-      modifiedImage = [modifiedImage resizableImageWithCapInsets:originalImage.capInsets resizingMode:originalImage.resizingMode];
-    }
-
-    return modifiedImage;
-  };
-}
diff --git a/submodules/AsyncDisplayKit/Source/ASImageNode.mm.orig b/submodules/AsyncDisplayKit/Source/ASImageNode.mm.orig
deleted file mode 100644
index 0106295a55..0000000000
--- a/submodules/AsyncDisplayKit/Source/ASImageNode.mm.orig
+++ /dev/null
@@ -1,791 +0,0 @@
-//
-//  ASImageNode.mm
-//  Texture
-//
-//  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.
-//  Changes after 4/13/2017 are: Copyright (c) Pinterest, Inc.  All rights reserved.
-//  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
-//
-
-#import <AsyncDisplayKit/ASImageNode.h>
-
-#import <tgmath.h>
-
-#import <AsyncDisplayKit/_ASDisplayLayer.h>
-#import <AsyncDisplayKit/ASAssert.h>
-#import <AsyncDisplayKit/ASDimension.h>
-#import <AsyncDisplayKit/ASDisplayNode+FrameworkPrivate.h>
-#import <AsyncDisplayKit/ASDisplayNode+Subclasses.h>
-#import <AsyncDisplayKit/ASDisplayNodeExtras.h>
-#import <AsyncDisplayKit/ASDisplayNode+Beta.h>
-#import <AsyncDisplayKit/ASGraphicsContext.h>
-#import <AsyncDisplayKit/ASLayout.h>
-#import <AsyncDisplayKit/ASTextNode.h>
-#import <AsyncDisplayKit/ASImageNode+AnimatedImagePrivate.h>
-#import <AsyncDisplayKit/ASImageNode+CGExtras.h>
-#import <AsyncDisplayKit/AsyncDisplayKit+Debug.h>
-#import <AsyncDisplayKit/ASInternalHelpers.h>
-#import <AsyncDisplayKit/ASEqualityHelpers.h>
-#import <AsyncDisplayKit/ASHashing.h>
-#import <AsyncDisplayKit/ASWeakMap.h>
-#import <AsyncDisplayKit/CoreGraphics+ASConvenience.h>
-#import <AsyncDisplayKit/_ASCoreAnimationExtras.h>
-
-// TODO: It would be nice to remove this dependency; it's the only subclass using more than +FrameworkSubclasses.h
-#import <AsyncDisplayKit/ASDisplayNodeInternal.h>
-
-static const CGSize kMinReleaseImageOnBackgroundSize = {20.0, 20.0};
-
-typedef void (^ASImageNodeDrawParametersBlock)(ASWeakMapEntry *entry);
-
-@interface ASImageNodeDrawParameters : NSObject {
-@package
-  UIImage *_image;
-  BOOL _opaque;
-  CGRect _bounds;
-  CGFloat _contentsScale;
-  UIColor *_backgroundColor;
-  UIViewContentMode _contentMode;
-  BOOL _cropEnabled;
-  BOOL _forceUpscaling;
-  CGSize _forcedSize;
-  CGRect _cropRect;
-  CGRect _cropDisplayBounds;
-  asimagenode_modification_block_t _imageModificationBlock;
-  ASDisplayNodeContextModifier _willDisplayNodeContentWithRenderingContext;
-  ASDisplayNodeContextModifier _didDisplayNodeContentWithRenderingContext;
-  ASImageNodeDrawParametersBlock _didDrawBlock;
-}
-
-@end
-
-@implementation ASImageNodeDrawParameters
-
-@end
-
-/**
- * Contains all data that is needed to generate the content bitmap.
- */
-@interface ASImageNodeContentsKey : NSObject
-
-@property (nonatomic) UIImage *image;
-@property CGSize backingSize;
-@property CGRect imageDrawRect;
-@property BOOL isOpaque;
-@property (nonatomic, copy) UIColor *backgroundColor;
-@property (nonatomic) ASDisplayNodeContextModifier willDisplayNodeContentWithRenderingContext;
-@property (nonatomic) ASDisplayNodeContextModifier didDisplayNodeContentWithRenderingContext;
-@property (nonatomic) asimagenode_modification_block_t imageModificationBlock;
-
-@end
-
-@implementation ASImageNodeContentsKey
-
-- (BOOL)isEqual:(id)object
-{
-  if (self == object) {
-    return YES;
-  }
-
-  // Optimization opportunity: The `isKindOfClass` call here could be avoided by not using the NSObject `isEqual:`
-  // convention and instead using a custom comparison function that assumes all items are heterogeneous.
-  // However, profiling shows that our entire `isKindOfClass` expression is only ~1/40th of the total
-  // overheard of our caching, so it's likely not high-impact.
-  if ([object isKindOfClass:[ASImageNodeContentsKey class]]) {
-    ASImageNodeContentsKey *other = (ASImageNodeContentsKey *)object;
-    return [_image isEqual:other.image]
-      && CGSizeEqualToSize(_backingSize, other.backingSize)
-      && CGRectEqualToRect(_imageDrawRect, other.imageDrawRect)
-      && _isOpaque == other.isOpaque
-      && [_backgroundColor isEqual:other.backgroundColor]
-      && _willDisplayNodeContentWithRenderingContext == other.willDisplayNodeContentWithRenderingContext
-      && _didDisplayNodeContentWithRenderingContext == other.didDisplayNodeContentWithRenderingContext
-      && _imageModificationBlock == other.imageModificationBlock;
-  } else {
-    return NO;
-  }
-}
-
-- (NSUInteger)hash
-{
-#pragma clang diagnostic push
-#pragma clang diagnostic warning "-Wpadded"
-  struct {
-    NSUInteger imageHash;
-    CGSize backingSize;
-    CGRect imageDrawRect;
-    NSInteger isOpaque;
-    NSUInteger backgroundColorHash;
-    void *willDisplayNodeContentWithRenderingContext;
-    void *didDisplayNodeContentWithRenderingContext;
-    void *imageModificationBlock;
-#pragma clang diagnostic pop
-  } data = {
-    _image.hash,
-    _backingSize,
-    _imageDrawRect,
-    _isOpaque,
-    _backgroundColor.hash,
-    (void *)_willDisplayNodeContentWithRenderingContext,
-    (void *)_didDisplayNodeContentWithRenderingContext,
-    (void *)_imageModificationBlock
-  };
-  return ASHashBytes(&data, sizeof(data));
-}
-
-@end
-
-
-@implementation ASImageNode
-{
-@private
-  UIImage *_image;
-  ASWeakMapEntry *_weakCacheEntry;  // Holds a reference that keeps our contents in cache.
-  UIColor *_placeholderColor;
-
-  void (^_displayCompletionBlock)(BOOL canceled);
-  
-  // Drawing
-  ASTextNode *_debugLabelNode;
-  
-  // Cropping.
-  BOOL _cropEnabled; // Defaults to YES.
-  BOOL _forceUpscaling; //Defaults to NO.
-  CGSize _forcedSize; //Defaults to CGSizeZero, indicating no forced size.
-  CGRect _cropRect; // Defaults to CGRectMake(0.5, 0.5, 0, 0)
-  CGRect _cropDisplayBounds; // Defaults to CGRectNull
-}
-
-@synthesize image = _image;
-@synthesize imageModificationBlock = _imageModificationBlock;
-
-#pragma mark - Lifecycle
-
-- (instancetype)init
-{
-  if (!(self = [super init]))
-    return nil;
-
-  // TODO can this be removed?
-  self.contentsScale = ASScreenScale();
-  self.contentMode = UIViewContentModeScaleAspectFill;
-  self.opaque = NO;
-  self.clipsToBounds = YES;
-
-  // If no backgroundColor is set to the image node and it's a subview of UITableViewCell, UITableView is setting
-  // the opaque value of all subviews to YES if highlighting / selection is happening and does not set it back to the
-  // initial value. With setting a explicit backgroundColor we can prevent that change.
-  self.backgroundColor = [UIColor clearColor];
-
-  _cropEnabled = YES;
-  _forceUpscaling = NO;
-  _cropRect = CGRectMake(0.5, 0.5, 0, 0);
-  _cropDisplayBounds = CGRectNull;
-  _placeholderColor = ASDisplayNodeDefaultPlaceholderColor();
-#ifndef MINIMAL_ASDK
-  _animatedImageRunLoopMode = ASAnimatedImageDefaultRunLoopMode;
-#endif
-  
-  return self;
-}
-
-- (void)dealloc
-{
-  // Invalidate all components around animated images
-#ifndef MINIMAL_ASDK
-  [self invalidateAnimatedImage];
-#endif
-}
-
-#pragma mark - Placeholder
-
-- (UIImage *)placeholderImage
-{
-  // FIXME: Replace this implementation with reusable CALayers that have .backgroundColor set.
-  // This would completely eliminate the memory and performance cost of the backing store.
-  CGSize size = self.calculatedSize;
-  if ((size.width * size.height) < CGFLOAT_EPSILON) {
-    return nil;
-  }
-  
-  ASDN::MutexLocker l(__instanceLock__);
-  
-  ASGraphicsBeginImageContextWithOptions(size, NO, 1);
-  [self.placeholderColor setFill];
-  UIRectFill(CGRectMake(0, 0, size.width, size.height));
-  UIImage *image = ASGraphicsGetImageAndEndCurrentContext();
-  
-  return image;
-}
-
-#pragma mark - Layout and Sizing
-
-- (CGSize)calculateSizeThatFits:(CGSize)constrainedSize
-{
-  let image = ASLockedSelf(_image);
-
-  if (image == nil) {
-    return [super calculateSizeThatFits:constrainedSize];
-  }
-
-  return image.size;
-}
-
-#pragma mark - Setter / Getter
-
-- (void)setImage:(UIImage *)image
-{
-  ASDN::MutexLocker l(__instanceLock__);
-  [self _locked_setImage:image];
-}
-
-- (void)_locked_setImage:(UIImage *)image
-{
-  ASAssertLocked(__instanceLock__);
-  if (ASObjectIsEqual(_image, image)) {
-    return;
-  }
-
-  UIImage *oldImage = _image;
-  _image = image;
-  
-  if (image != nil) {
-    // We explicitly call setNeedsDisplay in this case, although we know setNeedsDisplay will be called with lock held.
-    // Therefore we have to be careful in methods that are involved with setNeedsDisplay to not run into a deadlock
-    [self setNeedsDisplay];
-    
-<<<<<<< HEAD
-    if (_displayWithoutProcessing && ASDisplayNodeThreadIsMain()) {
-      BOOL stretchable = !UIEdgeInsetsEqualToEdgeInsets(image.capInsets, UIEdgeInsetsZero);
-      if (stretchable) {
-        ASDisplayNodeSetupLayerContentsWithResizableImage(self.layer, image);
-      } else {
-        self.contents = (id)image.CGImage;
-      }
-      return;
-=======
-    // For debugging purposes we don't care about locking for now
-    if ([ASImageNode shouldShowImageScalingOverlay] && _debugLabelNode == nil) {
-      // do not use ASPerformBlockOnMainThread here, if it performs the block synchronously it will continue
-      // holding the lock while calling addSubnode.
-      dispatch_async(dispatch_get_main_queue(), ^{
-        _debugLabelNode = [[ASTextNode alloc] init];
-        _debugLabelNode.layerBacked = YES;
-        [self addSubnode:_debugLabelNode];
-      });
->>>>>>> 565da7d4935740d12fc204aa061faf093831da1e
-    }
-  } else {
-    self.contents = nil;
-  }
-
-  // Destruction of bigger images on the main thread can be expensive
-  // and can take some time, so we dispatch onto a bg queue to
-  // actually dealloc.
-  CGSize oldImageSize = oldImage.size;
-  BOOL shouldReleaseImageOnBackgroundThread = oldImageSize.width > kMinReleaseImageOnBackgroundSize.width
-                                              || oldImageSize.height > kMinReleaseImageOnBackgroundSize.height;
-  if (shouldReleaseImageOnBackgroundThread) {
-    ASPerformBackgroundDeallocation(&oldImage);
-  }
-}
-
-- (UIImage *)image
-{
-  return ASLockedSelf(_image);
-}
-
-- (UIColor *)placeholderColor
-{
-  return ASLockedSelf(_placeholderColor);
-}
-
-- (void)setPlaceholderColor:(UIColor *)placeholderColor
-{
-  ASLockScopeSelf();
-  if (ASCompareAssignCopy(_placeholderColor, placeholderColor)) {
-    _placeholderEnabled = (placeholderColor != nil);
-  }
-}
-
-#pragma mark - Drawing
-
-- (NSObject *)drawParametersForAsyncLayer:(_ASDisplayLayer *)layer
-{
-  ASLockScopeSelf();
-  
-  ASImageNodeDrawParameters *drawParameters = [[ASImageNodeDrawParameters alloc] init];
-  drawParameters->_image = _image;
-  drawParameters->_bounds = [self threadSafeBounds];
-  drawParameters->_opaque = self.opaque;
-  drawParameters->_contentsScale = _contentsScaleForDisplay;
-  drawParameters->_backgroundColor = self.backgroundColor;
-  drawParameters->_contentMode = self.contentMode;
-  drawParameters->_cropEnabled = _cropEnabled;
-  drawParameters->_forceUpscaling = _forceUpscaling;
-  drawParameters->_forcedSize = _forcedSize;
-  drawParameters->_cropRect = _cropRect;
-  drawParameters->_cropDisplayBounds = _cropDisplayBounds;
-  drawParameters->_imageModificationBlock = _imageModificationBlock;
-  drawParameters->_willDisplayNodeContentWithRenderingContext = _willDisplayNodeContentWithRenderingContext;
-  drawParameters->_didDisplayNodeContentWithRenderingContext = _didDisplayNodeContentWithRenderingContext;
-
-  // Hack for now to retain the weak entry that was created while this drawing happened
-  drawParameters->_didDrawBlock = ^(ASWeakMapEntry *entry){
-    ASLockScopeSelf();
-    _weakCacheEntry = entry;
-  };
-  
-  return drawParameters;
-}
-
-+ (UIImage *)displayWithParameters:(id<NSObject>)parameter isCancelled:(NS_NOESCAPE asdisplaynode_iscancelled_block_t)isCancelled
-{
-  ASImageNodeDrawParameters *drawParameter = (ASImageNodeDrawParameters *)parameter;
-
-  UIImage *image = drawParameter->_image;
-  if (image == nil) {
-    return nil;
-  }
-
-  if (true) {
-    return image;
-  }
-  
-  CGRect drawParameterBounds       = drawParameter->_bounds;
-  BOOL forceUpscaling              = drawParameter->_forceUpscaling;
-  CGSize forcedSize                = drawParameter->_forcedSize;
-  BOOL cropEnabled                 = drawParameter->_cropEnabled;
-  BOOL isOpaque                    = drawParameter->_opaque;
-  UIColor *backgroundColor         = drawParameter->_backgroundColor;
-  UIViewContentMode contentMode    = drawParameter->_contentMode;
-  CGFloat contentsScale            = drawParameter->_contentsScale;
-  CGRect cropDisplayBounds         = drawParameter->_cropDisplayBounds;
-  CGRect cropRect                  = drawParameter->_cropRect;
-  asimagenode_modification_block_t imageModificationBlock                 = drawParameter->_imageModificationBlock;
-  ASDisplayNodeContextModifier willDisplayNodeContentWithRenderingContext = drawParameter->_willDisplayNodeContentWithRenderingContext;
-  ASDisplayNodeContextModifier didDisplayNodeContentWithRenderingContext  = drawParameter->_didDisplayNodeContentWithRenderingContext;
-  
-  BOOL hasValidCropBounds = cropEnabled && !CGRectIsEmpty(cropDisplayBounds);
-  CGRect bounds = (hasValidCropBounds ? cropDisplayBounds : drawParameterBounds);
-  
-  
-  ASDisplayNodeAssert(contentsScale > 0, @"invalid contentsScale at display time");
-  
-  // if the image is resizable, bail early since the image has likely already been configured
-  BOOL stretchable = !UIEdgeInsetsEqualToEdgeInsets(image.capInsets, UIEdgeInsetsZero);
-  if (stretchable) {
-    if (imageModificationBlock != NULL) {
-      image = imageModificationBlock(image);
-    }
-    return image;
-  }
-  
-  CGSize imageSize = image.size;
-  CGSize imageSizeInPixels = CGSizeMake(imageSize.width * image.scale, imageSize.height * image.scale);
-  CGSize boundsSizeInPixels = CGSizeMake(std::floor(bounds.size.width * contentsScale), std::floor(bounds.size.height * contentsScale));
-  
-  BOOL contentModeSupported = contentMode == UIViewContentModeScaleAspectFill ||
-                              contentMode == UIViewContentModeScaleAspectFit ||
-                              contentMode == UIViewContentModeCenter;
-  
-  CGSize backingSize   = CGSizeZero;
-  CGRect imageDrawRect = CGRectZero;
-  
-  if (boundsSizeInPixels.width * contentsScale < 1.0f || boundsSizeInPixels.height * contentsScale < 1.0f ||
-      imageSizeInPixels.width < 1.0f                  || imageSizeInPixels.height < 1.0f) {
-    return nil;
-  }
-  
-  
-  // If we're not supposed to do any cropping, just decode image at original size
-  if (!cropEnabled || !contentModeSupported || stretchable) {
-    backingSize = imageSizeInPixels;
-    imageDrawRect = (CGRect){.size = backingSize};
-  } else {
-    if (CGSizeEqualToSize(CGSizeZero, forcedSize) == NO) {
-      //scale forced size
-      forcedSize.width *= contentsScale;
-      forcedSize.height *= contentsScale;
-    }
-    ASCroppedImageBackingSizeAndDrawRectInBounds(imageSizeInPixels,
-                                                 boundsSizeInPixels,
-                                                 contentMode,
-                                                 cropRect,
-                                                 forceUpscaling,
-                                                 forcedSize,
-                                                 &backingSize,
-                                                 &imageDrawRect);
-  }
-  
-  if (backingSize.width <= 0.0f        || backingSize.height <= 0.0f ||
-      imageDrawRect.size.width <= 0.0f || imageDrawRect.size.height <= 0.0f) {
-    return nil;
-  }
-
-  ASImageNodeContentsKey *contentsKey = [[ASImageNodeContentsKey alloc] init];
-  contentsKey.image = image;
-  contentsKey.backingSize = backingSize;
-  contentsKey.imageDrawRect = imageDrawRect;
-  contentsKey.isOpaque = isOpaque;
-  contentsKey.backgroundColor = backgroundColor;
-  contentsKey.willDisplayNodeContentWithRenderingContext = willDisplayNodeContentWithRenderingContext;
-  contentsKey.didDisplayNodeContentWithRenderingContext = didDisplayNodeContentWithRenderingContext;
-  contentsKey.imageModificationBlock = imageModificationBlock;
-
-  if (isCancelled()) {
-    return nil;
-  }
-
-  ASWeakMapEntry<UIImage *> *entry = [self.class contentsForkey:contentsKey
-                                                 drawParameters:parameter
-                                                    isCancelled:isCancelled];
-  // If nil, we were cancelled.
-  if (entry == nil) {
-    return nil;
-  }
-  
-  if (drawParameter->_didDrawBlock) {
-    drawParameter->_didDrawBlock(entry);
-  }
-
-  return entry.value;
-}
-
-static ASWeakMap<ASImageNodeContentsKey *, UIImage *> *cache = nil;
-// Allocate cacheLock on the heap to prevent destruction at app exit (https://github.com/TextureGroup/Texture/issues/136)
-static ASDN::StaticMutex& cacheLock = *new ASDN::StaticMutex;
-
-+ (ASWeakMapEntry *)contentsForkey:(ASImageNodeContentsKey *)key drawParameters:(id)drawParameters isCancelled:(asdisplaynode_iscancelled_block_t)isCancelled
-{
-  {
-    ASDN::StaticMutexLocker l(cacheLock);
-    if (!cache) {
-      cache = [[ASWeakMap alloc] init];
-    }
-    ASWeakMapEntry *entry = [cache entryForKey:key];
-    if (entry != nil) {
-      return entry;
-    }
-  }
-
-  // cache miss
-  UIImage *contents = [self createContentsForkey:key drawParameters:drawParameters isCancelled:isCancelled];
-  if (contents == nil) { // If nil, we were cancelled
-    return nil;
-  }
-
-  {
-    ASDN::StaticMutexLocker l(cacheLock);
-    return [cache setObject:contents forKey:key];
-  }
-}
-
-+ (UIImage *)createContentsForkey:(ASImageNodeContentsKey *)key drawParameters:(id)drawParameters isCancelled:(asdisplaynode_iscancelled_block_t)isCancelled
-{
-  // The following `ASGraphicsBeginImageContextWithOptions` call will sometimes take take longer than 5ms on an
-  // A5 processor for a 400x800 backingSize.
-  // Check for cancellation before we call it.
-  if (isCancelled()) {
-    return nil;
-  }
-
-  // Use contentsScale of 1.0 and do the contentsScale handling in boundsSizeInPixels so ASCroppedImageBackingSizeAndDrawRectInBounds
-  // will do its rounding on pixel instead of point boundaries
-  ASGraphicsBeginImageContextWithOptions(key.backingSize, key.isOpaque, 1.0);
-  
-  BOOL contextIsClean = YES;
-  
-  CGContextRef context = UIGraphicsGetCurrentContext();
-  if (context && key.willDisplayNodeContentWithRenderingContext) {
-    key.willDisplayNodeContentWithRenderingContext(context, drawParameters);
-    contextIsClean = NO;
-  }
-  
-  // if view is opaque, fill the context with background color
-  if (key.isOpaque && key.backgroundColor) {
-    [key.backgroundColor setFill];
-    UIRectFill({ .size = key.backingSize });
-    contextIsClean = NO;
-  }
-  
-  // iOS 9 appears to contain a thread safety regression when drawing the same CGImageRef on
-  // multiple threads concurrently.  In fact, instead of crashing, it appears to deadlock.
-  // The issue is present in Mac OS X El Capitan and has been seen hanging Pro apps like Adobe Premiere,
-  // as well as iOS games, and a small number of ASDK apps that provide the same image reference
-  // to many separate ASImageNodes.  A workaround is to set .displaysAsynchronously = NO for the nodes
-  // that may get the same pointer for a given UI asset image, etc.
-  // FIXME: We should replace @synchronized here, probably using a global, locked NSMutableSet, and
-  // only if the object already exists in the set we should create a semaphore to signal waiting threads
-  // upon removal of the object from the set when the operation completes.
-  // Another option is to have ASDisplayNode+AsyncDisplay coordinate these cases, and share the decoded buffer.
-  // Details tracked in https://github.com/facebook/AsyncDisplayKit/issues/1068
-  
-  UIImage *image = key.image;
-  BOOL canUseCopy = (contextIsClean || ASImageAlphaInfoIsOpaque(CGImageGetAlphaInfo(image.CGImage)));
-  CGBlendMode blendMode = canUseCopy ? kCGBlendModeCopy : kCGBlendModeNormal;
-  
-  @synchronized(image) {
-    [image drawInRect:key.imageDrawRect blendMode:blendMode alpha:1];
-  }
-  
-  if (context && key.didDisplayNodeContentWithRenderingContext) {
-    key.didDisplayNodeContentWithRenderingContext(context, drawParameters);
-  }
-
-  // Check cancellation one last time before forming image.
-  if (isCancelled()) {
-    ASGraphicsEndImageContext();
-    return nil;
-  }
-
-  UIImage *result = ASGraphicsGetImageAndEndCurrentContext();
-  
-  if (key.imageModificationBlock) {
-    result = key.imageModificationBlock(result);
-  }
-  
-  return result;
-}
-
-- (void)displayDidFinish
-{
-  [super displayDidFinish];
-
-  __instanceLock__.lock();
-    void (^displayCompletionBlock)(BOOL canceled) = _displayCompletionBlock;
-    UIImage *image = _image;
-    BOOL hasDebugLabel = (_debugLabelNode != nil);
-  __instanceLock__.unlock();
-
-  // Update the debug label if necessary
-  if (hasDebugLabel) {
-    // For debugging purposes we don't care about locking for now
-    CGSize imageSize = image.size;
-    CGSize imageSizeInPixels = CGSizeMake(imageSize.width * image.scale, imageSize.height * image.scale);
-    CGSize boundsSizeInPixels = CGSizeMake(std::floor(self.bounds.size.width * self.contentsScale), std::floor(self.bounds.size.height * self.contentsScale));
-    CGFloat pixelCountRatio            = (imageSizeInPixels.width * imageSizeInPixels.height) / (boundsSizeInPixels.width * boundsSizeInPixels.height);
-    if (pixelCountRatio != 1.0) {
-      NSString *scaleString            = [NSString stringWithFormat:@"%.2fx", pixelCountRatio];
-      _debugLabelNode.attributedText   = [[NSAttributedString alloc] initWithString:scaleString attributes:[self debugLabelAttributes]];
-      _debugLabelNode.hidden           = NO;
-    } else {
-      _debugLabelNode.hidden           = YES;
-      _debugLabelNode.attributedText   = nil;
-    }
-  }
-  
-  // If we've got a block to perform after displaying, do it.
-  if (image && displayCompletionBlock) {
-
-    displayCompletionBlock(NO);
-
-    __instanceLock__.lock();
-      _displayCompletionBlock = nil;
-    __instanceLock__.unlock();
-  }
-}
-
-- (void)setNeedsDisplayWithCompletion:(void (^ _Nullable)(BOOL canceled))displayCompletionBlock
-{
-  if (self.displaySuspended) {
-    if (displayCompletionBlock)
-      displayCompletionBlock(YES);
-    return;
-  }
-
-  // Stash the block and call-site queue. We'll invoke it in -displayDidFinish.
-  {
-    ASDN::MutexLocker l(__instanceLock__);
-    if (_displayCompletionBlock != displayCompletionBlock) {
-      _displayCompletionBlock = displayCompletionBlock;
-    }
-  }
-
-  [self setNeedsDisplay];
-}
-
-#pragma mark Interface State
-
-- (void)clearContents
-{
-  [super clearContents];
-  
-  ASDN::MutexLocker l(__instanceLock__);
-  _weakCacheEntry = nil;  // release contents from the cache.
-}
-
-#pragma mark - Cropping
-
-- (BOOL)isCropEnabled
-{
-  ASDN::MutexLocker l(__instanceLock__);
-  return _cropEnabled;
-}
-
-- (void)setCropEnabled:(BOOL)cropEnabled
-{
-  [self setCropEnabled:cropEnabled recropImmediately:NO inBounds:self.bounds];
-}
-
-- (void)setCropEnabled:(BOOL)cropEnabled recropImmediately:(BOOL)recropImmediately inBounds:(CGRect)cropBounds
-{
-  __instanceLock__.lock();
-  if (_cropEnabled == cropEnabled) {
-    __instanceLock__.unlock();
-    return;
-  }
-
-  _cropEnabled = cropEnabled;
-  _cropDisplayBounds = cropBounds;
-  
-  UIImage *image = _image;
-  __instanceLock__.unlock();
-
-  // If we have an image to display, display it, respecting our recrop flag.
-  if (image != nil) {
-    ASPerformBlockOnMainThread(^{
-      if (recropImmediately)
-        [self displayImmediately];
-      else
-        [self setNeedsDisplay];
-    });
-  }
-}
-
-- (CGRect)cropRect
-{
-  ASDN::MutexLocker l(__instanceLock__);
-  return _cropRect;
-}
-
-- (void)setCropRect:(CGRect)cropRect
-{
-  {
-    ASDN::MutexLocker l(__instanceLock__);
-    if (CGRectEqualToRect(_cropRect, cropRect)) {
-      return;
-    }
-
-    _cropRect = cropRect;
-  }
-
-  // TODO: this logic needs to be updated to respect cropRect.
-  CGSize boundsSize = self.bounds.size;
-  CGSize imageSize = self.image.size;
-
-  BOOL isCroppingImage = ((boundsSize.width < imageSize.width) || (boundsSize.height < imageSize.height));
-
-  // Re-display if we need to.
-  ASPerformBlockOnMainThread(^{
-    if (self.nodeLoaded && self.contentMode == UIViewContentModeScaleAspectFill && isCroppingImage)
-      [self setNeedsDisplay];
-  });
-}
-
-- (BOOL)forceUpscaling
-{
-  ASDN::MutexLocker l(__instanceLock__);
-  return _forceUpscaling;
-}
-
-- (void)setForceUpscaling:(BOOL)forceUpscaling
-{
-  ASDN::MutexLocker l(__instanceLock__);
-  _forceUpscaling = forceUpscaling;
-}
-
-- (CGSize)forcedSize
-{
-  ASDN::MutexLocker l(__instanceLock__);
-  return _forcedSize;
-}
-
-- (void)setForcedSize:(CGSize)forcedSize
-{
-  ASDN::MutexLocker l(__instanceLock__);
-  _forcedSize = forcedSize;
-}
-
-- (asimagenode_modification_block_t)imageModificationBlock
-{
-  ASDN::MutexLocker l(__instanceLock__);
-  return _imageModificationBlock;
-}
-
-- (void)setImageModificationBlock:(asimagenode_modification_block_t)imageModificationBlock
-{
-  ASDN::MutexLocker l(__instanceLock__);
-  _imageModificationBlock = imageModificationBlock;
-}
-
-#pragma mark - Debug
-
-- (void)layout
-{
-  [super layout];
-  
-  if (_debugLabelNode) {
-    CGSize boundsSize        = self.bounds.size;
-    CGSize debugLabelSize    = [_debugLabelNode layoutThatFits:ASSizeRangeMake(CGSizeZero, boundsSize)].size;
-    CGPoint debugLabelOrigin = CGPointMake(boundsSize.width - debugLabelSize.width,
-                                           boundsSize.height - debugLabelSize.height);
-    _debugLabelNode.frame    = (CGRect) {debugLabelOrigin, debugLabelSize};
-  }
-}
-
-- (NSDictionary *)debugLabelAttributes
-{
-  return @{
-    NSFontAttributeName: [UIFont systemFontOfSize:15.0],
-    NSForegroundColorAttributeName: [UIColor redColor]
-  };
-}
-
-@end
-
-#pragma mark - Extras
-
-asimagenode_modification_block_t ASImageNodeRoundBorderModificationBlock(CGFloat borderWidth, UIColor *borderColor)
-{
-  return ^(UIImage *originalImage) {
-    ASGraphicsBeginImageContextWithOptions(originalImage.size, NO, originalImage.scale);
-    UIBezierPath *roundOutline = [UIBezierPath bezierPathWithOvalInRect:(CGRect){CGPointZero, originalImage.size}];
-
-    // Make the image round
-    [roundOutline addClip];
-
-    // Draw the original image
-    [originalImage drawAtPoint:CGPointZero blendMode:kCGBlendModeCopy alpha:1];
-
-    // Draw a border on top.
-    if (borderWidth > 0.0) {
-      [borderColor setStroke];
-      [roundOutline setLineWidth:borderWidth];
-      [roundOutline stroke];
-    }
-
-    return ASGraphicsGetImageAndEndCurrentContext();
-  };
-}
-
-asimagenode_modification_block_t ASImageNodeTintColorModificationBlock(UIColor *color)
-{
-  return ^(UIImage *originalImage) {
-    ASGraphicsBeginImageContextWithOptions(originalImage.size, NO, originalImage.scale);
-    
-    // Set color and render template
-    [color setFill];
-    UIImage *templateImage = [originalImage imageWithRenderingMode:UIImageRenderingModeAlwaysTemplate];
-    [templateImage drawAtPoint:CGPointZero blendMode:kCGBlendModeCopy alpha:1];
-    
-    UIImage *modifiedImage = ASGraphicsGetImageAndEndCurrentContext();
-
-    // if the original image was stretchy, keep it stretchy
-    if (!UIEdgeInsetsEqualToEdgeInsets(originalImage.capInsets, UIEdgeInsetsZero)) {
-      modifiedImage = [modifiedImage resizableImageWithCapInsets:originalImage.capInsets resizingMode:originalImage.resizingMode];
-    }
-
-    return modifiedImage;
-  };
-}
diff --git a/submodules/AsyncDisplayKit/Source/Private/ASInternalHelpers.mm b/submodules/AsyncDisplayKit/Source/ASInternalHelpers.mm
similarity index 100%
rename from submodules/AsyncDisplayKit/Source/Private/ASInternalHelpers.mm
rename to submodules/AsyncDisplayKit/Source/ASInternalHelpers.mm
diff --git a/submodules/AsyncDisplayKit/Source/Layout/ASLayout.mm b/submodules/AsyncDisplayKit/Source/ASLayout.mm
similarity index 99%
rename from submodules/AsyncDisplayKit/Source/Layout/ASLayout.mm
rename to submodules/AsyncDisplayKit/Source/ASLayout.mm
index 5f09a1a398..6a6a96f24c 100644
--- a/submodules/AsyncDisplayKit/Source/Layout/ASLayout.mm
+++ b/submodules/AsyncDisplayKit/Source/ASLayout.mm
@@ -14,8 +14,8 @@
 
 #import <AsyncDisplayKit/ASCollections.h>
 #import <AsyncDisplayKit/ASDimension.h>
-#import <AsyncDisplayKit/ASLayoutSpecUtilities.h>
-#import <AsyncDisplayKit/ASLayoutSpec+Subclasses.h>
+#import "ASLayoutSpecUtilities.h"
+#import "ASLayoutSpec+Subclasses.h"
 
 #import <AsyncDisplayKit/ASEqualityHelpers.h>
 #import <AsyncDisplayKit/ASInternalHelpers.h>
diff --git a/submodules/AsyncDisplayKit/Source/Layout/ASLayoutElement.mm b/submodules/AsyncDisplayKit/Source/ASLayoutElement.mm
similarity index 100%
rename from submodules/AsyncDisplayKit/Source/Layout/ASLayoutElement.mm
rename to submodules/AsyncDisplayKit/Source/ASLayoutElement.mm
diff --git a/submodules/AsyncDisplayKit/Source/Private/Layout/ASLayoutElementStylePrivate.h b/submodules/AsyncDisplayKit/Source/ASLayoutElementStylePrivate.h
similarity index 100%
rename from submodules/AsyncDisplayKit/Source/Private/Layout/ASLayoutElementStylePrivate.h
rename to submodules/AsyncDisplayKit/Source/ASLayoutElementStylePrivate.h
diff --git a/submodules/AsyncDisplayKit/Source/TextKit/ASLayoutManager.h b/submodules/AsyncDisplayKit/Source/ASLayoutManager.h
similarity index 100%
rename from submodules/AsyncDisplayKit/Source/TextKit/ASLayoutManager.h
rename to submodules/AsyncDisplayKit/Source/ASLayoutManager.h
diff --git a/submodules/AsyncDisplayKit/Source/TextKit/ASLayoutManager.mm b/submodules/AsyncDisplayKit/Source/ASLayoutManager.mm
similarity index 96%
rename from submodules/AsyncDisplayKit/Source/TextKit/ASLayoutManager.mm
rename to submodules/AsyncDisplayKit/Source/ASLayoutManager.mm
index fbb3b49ea4..9eca28e489 100644
--- a/submodules/AsyncDisplayKit/Source/TextKit/ASLayoutManager.mm
+++ b/submodules/AsyncDisplayKit/Source/ASLayoutManager.mm
@@ -7,7 +7,7 @@
 //  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
 //
 
-#import <AsyncDisplayKit/ASLayoutManager.h>
+#import "ASLayoutManager.h"
 
 @implementation ASLayoutManager
 
diff --git a/submodules/AsyncDisplayKit/Source/Layout/ASLayoutSpec+Subclasses.h b/submodules/AsyncDisplayKit/Source/ASLayoutSpec+Subclasses.h
similarity index 100%
rename from submodules/AsyncDisplayKit/Source/Layout/ASLayoutSpec+Subclasses.h
rename to submodules/AsyncDisplayKit/Source/ASLayoutSpec+Subclasses.h
diff --git a/submodules/AsyncDisplayKit/Source/Layout/ASLayoutSpec+Subclasses.mm b/submodules/AsyncDisplayKit/Source/ASLayoutSpec+Subclasses.mm
similarity index 95%
rename from submodules/AsyncDisplayKit/Source/Layout/ASLayoutSpec+Subclasses.mm
rename to submodules/AsyncDisplayKit/Source/ASLayoutSpec+Subclasses.mm
index 17ff53e6c5..c1e4e2496a 100644
--- a/submodules/AsyncDisplayKit/Source/Layout/ASLayoutSpec+Subclasses.mm
+++ b/submodules/AsyncDisplayKit/Source/ASLayoutSpec+Subclasses.mm
@@ -7,10 +7,10 @@
 //  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
 //
 
-#import <AsyncDisplayKit/ASLayoutSpec+Subclasses.h>
+#import "ASLayoutSpec+Subclasses.h"
 
 #import <AsyncDisplayKit/ASLayoutSpec.h>
-#import <AsyncDisplayKit/ASLayoutSpecPrivate.h>
+#import "ASLayoutSpecPrivate.h"
 
 #pragma mark - ASNullLayoutSpec
 
diff --git a/submodules/AsyncDisplayKit/Source/Layout/ASLayoutSpec.mm b/submodules/AsyncDisplayKit/Source/ASLayoutSpec.mm
similarity index 98%
rename from submodules/AsyncDisplayKit/Source/Layout/ASLayoutSpec.mm
rename to submodules/AsyncDisplayKit/Source/ASLayoutSpec.mm
index 8da22d3d01..6123e4d734 100644
--- a/submodules/AsyncDisplayKit/Source/Layout/ASLayoutSpec.mm
+++ b/submodules/AsyncDisplayKit/Source/ASLayoutSpec.mm
@@ -8,12 +8,12 @@
 //
 
 #import <AsyncDisplayKit/ASLayoutSpec.h>
-#import <AsyncDisplayKit/ASLayoutSpecPrivate.h>
+#import "ASLayoutSpecPrivate.h"
 
-#import <AsyncDisplayKit/ASLayoutSpec+Subclasses.h>
+#import "ASLayoutSpec+Subclasses.h"
 
 #import <AsyncDisplayKit/ASCollections.h>
-#import <AsyncDisplayKit/ASLayoutElementStylePrivate.h>
+#import "ASLayoutElementStylePrivate.h"
 #import <AsyncDisplayKit/ASTraitCollection.h>
 #import <AsyncDisplayKit/ASEqualityHelpers.h>
 #import <AsyncDisplayKit/ASInternalHelpers.h>
diff --git a/submodules/AsyncDisplayKit/Source/Private/Layout/ASLayoutSpecPrivate.h b/submodules/AsyncDisplayKit/Source/ASLayoutSpecPrivate.h
similarity index 100%
rename from submodules/AsyncDisplayKit/Source/Private/Layout/ASLayoutSpecPrivate.h
rename to submodules/AsyncDisplayKit/Source/ASLayoutSpecPrivate.h
diff --git a/submodules/AsyncDisplayKit/Source/Private/Layout/ASLayoutSpecUtilities.h b/submodules/AsyncDisplayKit/Source/ASLayoutSpecUtilities.h
similarity index 100%
rename from submodules/AsyncDisplayKit/Source/Private/Layout/ASLayoutSpecUtilities.h
rename to submodules/AsyncDisplayKit/Source/ASLayoutSpecUtilities.h
diff --git a/submodules/AsyncDisplayKit/Source/Private/ASLayoutTransition.h b/submodules/AsyncDisplayKit/Source/ASLayoutTransition.h
similarity index 97%
rename from submodules/AsyncDisplayKit/Source/Private/ASLayoutTransition.h
rename to submodules/AsyncDisplayKit/Source/ASLayoutTransition.h
index f2bcf9b253..d11eb65fb1 100644
--- a/submodules/AsyncDisplayKit/Source/Private/ASLayoutTransition.h
+++ b/submodules/AsyncDisplayKit/Source/ASLayoutTransition.h
@@ -7,9 +7,10 @@
 //  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
 //
 
+#import <UIKit/UIKit.h>
 #import <AsyncDisplayKit/ASDimension.h>
 #import <AsyncDisplayKit/_ASTransitionContext.h>
-#import <AsyncDisplayKit/ASDisplayNodeLayout.h>
+#import "ASDisplayNodeLayout.h"
 #import <AsyncDisplayKit/ASBaseDefines.h>
 
 #import <AsyncDisplayKit/ASDisplayNode.h>
diff --git a/submodules/AsyncDisplayKit/Source/Private/ASLayoutTransition.mm b/submodules/AsyncDisplayKit/Source/ASLayoutTransition.mm
similarity index 96%
rename from submodules/AsyncDisplayKit/Source/Private/ASLayoutTransition.mm
rename to submodules/AsyncDisplayKit/Source/ASLayoutTransition.mm
index 2fea2b8ad0..0956943cc0 100644
--- a/submodules/AsyncDisplayKit/Source/Private/ASLayoutTransition.mm
+++ b/submodules/AsyncDisplayKit/Source/ASLayoutTransition.mm
@@ -7,13 +7,12 @@
 //  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
 //
 
-#import <AsyncDisplayKit/ASLayoutTransition.h>
+#import "ASLayoutTransition.h"
 
 #import <AsyncDisplayKit/NSArray+Diffing.h>
 
 #import <AsyncDisplayKit/ASLayout.h>
-#import <AsyncDisplayKit/ASDisplayNodeInternal.h> // Required for _insertSubnode... / _removeFromSupernode.
-#import <AsyncDisplayKit/ASLog.h>
+#import "ASDisplayNodeInternal.h" // Required for _insertSubnode... / _removeFromSupernode.
 
 #import <queue>
 
@@ -98,7 +97,6 @@ static inline BOOL ASLayoutCanTransitionAsynchronous(ASLayout *layout) {
   [self calculateSubnodeOperationsIfNeeded];
   
   // Create an activity even if no subnodes affected.
-  as_activity_create_for_scope("Apply subnode insertions and moves");
   if (_insertedSubnodePositions.size() == 0 && _subnodeMoves.size() == 0) {
     return;
   }
@@ -131,7 +129,6 @@ static inline BOOL ASLayoutCanTransitionAsynchronous(ASLayout *layout) {
 
 - (void)applySubnodeRemovals
 {
-  as_activity_scope(as_activity_create("Apply subnode removals", AS_ACTIVITY_CURRENT, OS_ACTIVITY_FLAG_DEFAULT));
   MutexLocker l(*__instanceLock__);
   [self calculateSubnodeOperationsIfNeeded];
 
@@ -158,7 +155,6 @@ static inline BOOL ASLayoutCanTransitionAsynchronous(ASLayout *layout) {
   }
   
   // Create an activity even if no subnodes affected.
-  as_activity_create_for_scope("Calculate subnode operations");
   ASLayout *previousLayout = _previousLayout.layout;
   ASLayout *pendingLayout = _pendingLayout.layout;
 
diff --git a/submodules/AsyncDisplayKit/Source/Details/ASMainSerialQueue.h b/submodules/AsyncDisplayKit/Source/ASMainSerialQueue.h
similarity index 100%
rename from submodules/AsyncDisplayKit/Source/Details/ASMainSerialQueue.h
rename to submodules/AsyncDisplayKit/Source/ASMainSerialQueue.h
diff --git a/submodules/AsyncDisplayKit/Source/Details/ASMainSerialQueue.mm b/submodules/AsyncDisplayKit/Source/ASMainSerialQueue.mm
similarity index 96%
rename from submodules/AsyncDisplayKit/Source/Details/ASMainSerialQueue.mm
rename to submodules/AsyncDisplayKit/Source/ASMainSerialQueue.mm
index 06cb7c3b9b..60bf8d7f67 100644
--- a/submodules/AsyncDisplayKit/Source/Details/ASMainSerialQueue.mm
+++ b/submodules/AsyncDisplayKit/Source/ASMainSerialQueue.mm
@@ -7,7 +7,7 @@
 //  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
 //
 
-#import <AsyncDisplayKit/ASMainSerialQueue.h>
+#import "ASMainSerialQueue.h"
 
 #import <AsyncDisplayKit/ASThread.h>
 #import <AsyncDisplayKit/ASInternalHelpers.h>
diff --git a/submodules/AsyncDisplayKit/Source/ASMainThreadDeallocation.mm b/submodules/AsyncDisplayKit/Source/ASMainThreadDeallocation.mm
index 1cf90ada05..4b16c932d2 100644
--- a/submodules/AsyncDisplayKit/Source/ASMainThreadDeallocation.mm
+++ b/submodules/AsyncDisplayKit/Source/ASMainThreadDeallocation.mm
@@ -11,7 +11,6 @@
 #import <AsyncDisplayKit/ASBaseDefines.h>
 #import <AsyncDisplayKit/ASDisplayNodeExtras.h>
 #import <AsyncDisplayKit/ASInternalHelpers.h>
-#import <AsyncDisplayKit/ASLog.h>
 #import <AsyncDisplayKit/ASThread.h>
 
 #import <objc/runtime.h>
@@ -42,15 +41,12 @@
     }
     
     if ([object_getClass(value) needsMainThreadDeallocation]) {
-      as_log_debug(ASMainThreadDeallocationLog(), "%@: Trampolining ivar '%s' value %@ for main deallocation.", self, ivar_getName(ivar), value);
-      
       // Release the ivar's reference before handing the object to the queue so we
       // don't risk holding onto it longer than the queue does.
       object_setIvar(self, ivar, nil);
       
       ASPerformMainThreadDeallocation(&value);
     } else {
-      as_log_debug(ASMainThreadDeallocationLog(), "%@: Not trampolining ivar '%s' value %@.", self, ivar_getName(ivar), value);
     }
   }
 }
@@ -112,16 +108,13 @@
       // If it's `id` we have to include it just in case.
       resultIvars[resultCount] = ivar;
       resultCount += 1;
-      as_log_verbose(ASMainThreadDeallocationLog(), "%@: Marking ivar '%s' for possible main deallocation due to type id", self, ivar_getName(ivar));
     } else {
       // If it's an ivar with a static type, check the type.
       Class c = ASGetClassFromType(type);
       if ([c needsMainThreadDeallocation]) {
         resultIvars[resultCount] = ivar;
         resultCount += 1;
-        as_log_verbose(ASMainThreadDeallocationLog(), "%@: Marking ivar '%s' for main deallocation due to class %@", self, ivar_getName(ivar), c);
       } else {
-        as_log_verbose(ASMainThreadDeallocationLog(), "%@: Skipping ivar '%s' for main deallocation.", self, ivar_getName(ivar));
       }
     }
   }
diff --git a/submodules/AsyncDisplayKit/Source/ASMapNode.h b/submodules/AsyncDisplayKit/Source/ASMapNode.h
deleted file mode 100644
index 9ddc2b6ffc..0000000000
--- a/submodules/AsyncDisplayKit/Source/ASMapNode.h
+++ /dev/null
@@ -1,92 +0,0 @@
-//
-//  ASMapNode.h
-//  Texture
-//
-//  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.
-//  Changes after 4/13/2017 are: Copyright (c) Pinterest, Inc.  All rights reserved.
-//  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
-//
-
-#import <Foundation/Foundation.h>
-#import <AsyncDisplayKit/ASAvailability.h>
-
-#if TARGET_OS_IOS && AS_USE_MAPKIT
-#import <AsyncDisplayKit/ASImageNode.h>
-#import <MapKit/MapKit.h>
-
-NS_ASSUME_NONNULL_BEGIN
-
-/**
-  * Map Annotation options. 
-  * The default behavior is to ignore the annotations' positions, use the region or options specified instead.
-  * Swift: to select the default behavior, use [].
-  */
-typedef NS_OPTIONS(NSUInteger, ASMapNodeShowAnnotationsOptions)
-{
-  /** The annotations' positions are ignored, use the region or options specified instead. */
-  ASMapNodeShowAnnotationsOptionsIgnored  = 0,
-  /** The annotations' positions are used to calculate the region to show in the map, equivalent to showAnnotations:animated. */
-  ASMapNodeShowAnnotationsOptionsZoomed   = 1 << 0,
-  /** This will only have an effect if combined with the Zoomed state with liveMap turned on.*/
-  ASMapNodeShowAnnotationsOptionsAnimated = 1 << 1
-};
-
-@interface ASMapNode : ASImageNode
-
-/**
- The current options of ASMapNode. This can be set at any time and ASMapNode will animate the change.<br><br>This property may be set from a background thread before the node is loaded, and will automatically be applied to define the behavior of the static snapshot (if .liveMap = NO) or the internal MKMapView (otherwise).<br><br> Changes to the region and camera options will only be animated when when the liveMap mode is enabled, otherwise these options will be applied statically to the new snapshot. <br><br> The options object is used to specify properties even when the liveMap mode is enabled, allowing seamless transitions between the snapshot and liveMap (as well as back to the snapshot).
- */
-@property (nonatomic) MKMapSnapshotOptions *options;
-
-/** The region is simply the sub-field on the options object.  If the objects object is reset,
-    this will in effect be overwritten and become the value of the .region property on that object.
-    Defaults to MKCoordinateRegionForMapRect(MKMapRectWorld).
- */
-@property (nonatomic) MKCoordinateRegion region;
-
-/**
- This is the MKMapView that is the live map part of ASMapNode. This will be nil if .liveMap = NO. Note, MKMapView is *not* thread-safe.
- */
-@property (nullable, readonly) MKMapView *mapView;
-
-/**
- Set this to YES to turn the snapshot into an interactive MKMapView and vice versa. Defaults to NO. This property may be set on a background thread before the node is loaded, and will automatically be actioned, once the node is loaded. 
- */
-@property (getter=isLiveMap) BOOL liveMap;
-
-/**
- @abstract Whether ASMapNode should automatically request a new map snapshot to correspond to the new node size.
- @default Default value is YES.
- @discussion If mapSize is set then this will be set to NO, since the size will be the same in all orientations.
- */
-@property BOOL needsMapReloadOnBoundsChange;
-
-/**
- Set the delegate of the MKMapView. This can be set even before mapView is created and will be set on the map in the case that the liveMap mode is engaged.
- 
- If the live map view has been created, this may only be set on the main thread.
- */
-@property (nonatomic, weak) id <MKMapViewDelegate> mapDelegate;
-
-/**
- * @abstract The annotations to display on the map.
- */
-@property (copy) NSArray<id<MKAnnotation>> *annotations;
-
-/**
- * @abstract This property specifies how to show the annotations.
- * @default Default value is ASMapNodeShowAnnotationsIgnored
- */
-@property ASMapNodeShowAnnotationsOptions showAnnotationsOptions;
-
-/**
- * @abstract The block which should return annotation image for static map based on provided annotation.
- * @discussion This block is executed on an arbitrary serial queue. If this block is nil, standard pin is used.
- */
-@property (nullable) UIImage * _Nullable (^imageForStaticMapAnnotationBlock)(id<MKAnnotation> annotation, CGPoint *centerOffset);
-
-@end
-
-NS_ASSUME_NONNULL_END
-
-#endif
diff --git a/submodules/AsyncDisplayKit/Source/ASMapNode.h.orig b/submodules/AsyncDisplayKit/Source/ASMapNode.h.orig
deleted file mode 100644
index 9ae005aa43..0000000000
--- a/submodules/AsyncDisplayKit/Source/ASMapNode.h.orig
+++ /dev/null
@@ -1,99 +0,0 @@
-//
-//  ASMapNode.h
-//  Texture
-//
-//  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.
-//  Changes after 4/13/2017 are: Copyright (c) Pinterest, Inc.  All rights reserved.
-//  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
-//
-
-<<<<<<< HEAD
-#ifndef MINIMAL_ASDK
-
-=======
-#import <Foundation/Foundation.h>
-#import <AsyncDisplayKit/ASAvailability.h>
-
-#if TARGET_OS_IOS && AS_USE_MAPKIT
->>>>>>> 565da7d4935740d12fc204aa061faf093831da1e
-#import <AsyncDisplayKit/ASImageNode.h>
-#import <MapKit/MapKit.h>
-
-NS_ASSUME_NONNULL_BEGIN
-
-/**
-  * Map Annotation options. 
-  * The default behavior is to ignore the annotations' positions, use the region or options specified instead.
-  * Swift: to select the default behavior, use [].
-  */
-typedef NS_OPTIONS(NSUInteger, ASMapNodeShowAnnotationsOptions)
-{
-  /** The annotations' positions are ignored, use the region or options specified instead. */
-  ASMapNodeShowAnnotationsOptionsIgnored  = 0,
-  /** The annotations' positions are used to calculate the region to show in the map, equivalent to showAnnotations:animated. */
-  ASMapNodeShowAnnotationsOptionsZoomed   = 1 << 0,
-  /** This will only have an effect if combined with the Zoomed state with liveMap turned on.*/
-  ASMapNodeShowAnnotationsOptionsAnimated = 1 << 1
-};
-
-@interface ASMapNode : ASImageNode
-
-/**
- The current options of ASMapNode. This can be set at any time and ASMapNode will animate the change.<br><br>This property may be set from a background thread before the node is loaded, and will automatically be applied to define the behavior of the static snapshot (if .liveMap = NO) or the internal MKMapView (otherwise).<br><br> Changes to the region and camera options will only be animated when when the liveMap mode is enabled, otherwise these options will be applied statically to the new snapshot. <br><br> The options object is used to specify properties even when the liveMap mode is enabled, allowing seamless transitions between the snapshot and liveMap (as well as back to the snapshot).
- */
-@property (nonatomic) MKMapSnapshotOptions *options;
-
-/** The region is simply the sub-field on the options object.  If the objects object is reset,
-    this will in effect be overwritten and become the value of the .region property on that object.
-    Defaults to MKCoordinateRegionForMapRect(MKMapRectWorld).
- */
-@property (nonatomic) MKCoordinateRegion region;
-
-/**
- This is the MKMapView that is the live map part of ASMapNode. This will be nil if .liveMap = NO. Note, MKMapView is *not* thread-safe.
- */
-@property (nullable, readonly) MKMapView *mapView;
-
-/**
- Set this to YES to turn the snapshot into an interactive MKMapView and vice versa. Defaults to NO. This property may be set on a background thread before the node is loaded, and will automatically be actioned, once the node is loaded. 
- */
-@property (getter=isLiveMap) BOOL liveMap;
-
-/**
- @abstract Whether ASMapNode should automatically request a new map snapshot to correspond to the new node size.
- @default Default value is YES.
- @discussion If mapSize is set then this will be set to NO, since the size will be the same in all orientations.
- */
-@property BOOL needsMapReloadOnBoundsChange;
-
-/**
- Set the delegate of the MKMapView. This can be set even before mapView is created and will be set on the map in the case that the liveMap mode is engaged.
- 
- If the live map view has been created, this may only be set on the main thread.
- */
-@property (nonatomic, weak) id <MKMapViewDelegate> mapDelegate;
-
-/**
- * @abstract The annotations to display on the map.
- */
-@property (copy) NSArray<id<MKAnnotation>> *annotations;
-
-/**
- * @abstract This property specifies how to show the annotations.
- * @default Default value is ASMapNodeShowAnnotationsIgnored
- */
-@property ASMapNodeShowAnnotationsOptions showAnnotationsOptions;
-
-/**
- * @abstract The block which should return annotation image for static map based on provided annotation.
- * @discussion This block is executed on an arbitrary serial queue. If this block is nil, standard pin is used.
- */
-@property (nullable) UIImage * _Nullable (^imageForStaticMapAnnotationBlock)(id<MKAnnotation> annotation, CGPoint *centerOffset);
-
-@end
-
-NS_ASSUME_NONNULL_END
-
-#endif
-
-#endif
diff --git a/submodules/AsyncDisplayKit/Source/ASMapNode.mm b/submodules/AsyncDisplayKit/Source/ASMapNode.mm
deleted file mode 100644
index 1c204ab974..0000000000
--- a/submodules/AsyncDisplayKit/Source/ASMapNode.mm
+++ /dev/null
@@ -1,442 +0,0 @@
-//
-//  ASMapNode.mm
-//  Texture
-//
-//  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.
-//  Changes after 4/13/2017 are: Copyright (c) Pinterest, Inc.  All rights reserved.
-//  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
-//
-
-#import <AsyncDisplayKit/ASMapNode.h>
-
-#if TARGET_OS_IOS && AS_USE_MAPKIT
-
-#import <tgmath.h>
-
-#import <AsyncDisplayKit/ASDisplayNode+Subclasses.h>
-#import <AsyncDisplayKit/ASDisplayNodeExtras.h>
-#import <AsyncDisplayKit/ASGraphicsContext.h>
-#import <AsyncDisplayKit/ASInsetLayoutSpec.h>
-#import <AsyncDisplayKit/ASInternalHelpers.h>
-#import <AsyncDisplayKit/ASLayout.h>
-#import <AsyncDisplayKit/ASThread.h>
-
-@interface ASMapNode()
-{
-  MKMapSnapshotter *_snapshotter;
-  BOOL _snapshotAfterLayout;
-  NSArray *_annotations;
-}
-@end
-
-@implementation ASMapNode
-
-@synthesize needsMapReloadOnBoundsChange = _needsMapReloadOnBoundsChange;
-@synthesize mapDelegate = _mapDelegate;
-@synthesize options = _options;
-@synthesize liveMap = _liveMap;
-@synthesize showAnnotationsOptions = _showAnnotationsOptions;
-
-#pragma mark - Lifecycle
-- (instancetype)init
-{
-  if (!(self = [super init])) {
-    return nil;
-  }
-  self.backgroundColor = ASDisplayNodeDefaultPlaceholderColor();
-  self.clipsToBounds = YES;
-  self.userInteractionEnabled = YES;
-  
-  _needsMapReloadOnBoundsChange = YES;
-  _liveMap = NO;
-  _annotations = @[];
-  _showAnnotationsOptions = ASMapNodeShowAnnotationsOptionsIgnored;
-  return self;
-}
-
-- (void)didLoad
-{
-  [super didLoad];
-  if (self.isLiveMap) {
-    [self addLiveMap];
-  }
-}
-
-- (void)dealloc
-{
-  [self destroySnapshotter];
-}
-
-- (void)setLayerBacked:(BOOL)layerBacked
-{
-  ASDisplayNodeAssert(!self.isLiveMap, @"ASMapNode can not be layer backed whilst .liveMap = YES, set .liveMap = NO to use layer backing.");
-  [super setLayerBacked:layerBacked];
-}
-
-- (void)didEnterPreloadState
-{
-  [super didEnterPreloadState];
-  ASPerformBlockOnMainThread(^{
-    if (self.isLiveMap) {
-      [self addLiveMap];
-    } else {
-      [self takeSnapshot];
-    }
-  });
-}
-
-- (void)didExitPreloadState
-{
-  [super didExitPreloadState];
-  ASPerformBlockOnMainThread(^{
-    if (self.isLiveMap) {
-      [self removeLiveMap];
-    }
-  });
-}
-
-#pragma mark - Settings
-
-- (BOOL)isLiveMap
-{
-  ASLockScopeSelf();
-  return _liveMap;
-}
-
-- (void)setLiveMap:(BOOL)liveMap
-{
-  ASDisplayNodeAssert(!self.isLayerBacked, @"ASMapNode can not use the interactive map feature whilst .isLayerBacked = YES, set .layerBacked = NO to use the interactive map feature.");
-  ASLockScopeSelf();
-  if (liveMap == _liveMap) {
-    return;
-  }
-  _liveMap = liveMap;
-  if (self.nodeLoaded) {
-    liveMap ? [self addLiveMap] : [self removeLiveMap];
-  }
-}
-
-- (BOOL)needsMapReloadOnBoundsChange
-{
-  ASLockScopeSelf();
-  return _needsMapReloadOnBoundsChange;
-}
-
-- (void)setNeedsMapReloadOnBoundsChange:(BOOL)needsMapReloadOnBoundsChange
-{
-  ASLockScopeSelf();
-  _needsMapReloadOnBoundsChange = needsMapReloadOnBoundsChange;
-}
-
-- (MKMapSnapshotOptions *)options
-{
-  ASLockScopeSelf();
-  if (!_options) {
-    _options = [[MKMapSnapshotOptions alloc] init];
-    _options.region = MKCoordinateRegionForMapRect(MKMapRectWorld);
-    CGSize calculatedSize = self.calculatedSize;
-    if (!CGSizeEqualToSize(calculatedSize, CGSizeZero)) {
-      _options.size = calculatedSize;
-    }
-  }
-  return _options;
-}
-
-- (void)setOptions:(MKMapSnapshotOptions *)options
-{
-  ASLockScopeSelf();
-  if (!_options || ![options isEqual:_options]) {
-    _options = options;
-    if (self.isLiveMap) {
-      [self applySnapshotOptions];
-    } else if (_snapshotter) {
-      [self destroySnapshotter];
-      [self takeSnapshot];
-    }
-  }
-}
-
-- (MKCoordinateRegion)region
-{
-  return self.options.region;
-}
-
-- (void)setRegion:(MKCoordinateRegion)region
-{
-  MKMapSnapshotOptions * options = [self.options copy];
-  options.region = region;
-  self.options = options;
-}
-
-- (id<MKMapViewDelegate>)mapDelegate
-{
-  return ASLockedSelf(_mapDelegate);
-}
-
-- (void)setMapDelegate:(id<MKMapViewDelegate>)mapDelegate {
-  ASLockScopeSelf();
-  _mapDelegate = mapDelegate;
-  
-  if (_mapView) {
-    ASDisplayNodeAssertMainThread();
-    _mapView.delegate = mapDelegate;
-  }
-}
-
-#pragma mark - Snapshotter
-
-- (void)takeSnapshot
-{
-  // If our size is zero, we want to avoid calling a default sized snapshot. Set _snapshotAfterLayout to YES
-  // so if layout changes in the future, we'll try snapshotting again.
-  ASLayout *layout = self.calculatedLayout;
-  if (layout == nil || CGSizeEqualToSize(CGSizeZero, layout.size)) {
-    _snapshotAfterLayout = YES;
-    return;
-  }
-  
-  _snapshotAfterLayout = NO;
-  
-  if (!_snapshotter) {
-    [self setUpSnapshotter];
-  }
-  
-  if (_snapshotter.isLoading) {
-    return;
-  }
-
-  __weak __typeof__(self) weakSelf = self;
-  [_snapshotter startWithQueue:dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0)
-             completionHandler:^(MKMapSnapshot *snapshot, NSError *error) {
-                 __typeof__(self) strongSelf = weakSelf;
-                if (!strongSelf) {
-                  return;
-                }
-                 
-                if (!error) {
-                  UIImage *image = snapshot.image;
-                  NSArray *annotations = strongSelf.annotations;
-                  if (annotations.count > 0) {
-                    // Only create a graphics context if we have annotations to draw.
-                    // The MKMapSnapshotter is currently not capable of rendering annotations automatically.
-                    
-                    CGRect finalImageRect = CGRectMake(0, 0, image.size.width, image.size.height);
-                    
-                    ASGraphicsBeginImageContextWithOptions(image.size, YES, image.scale);
-                    [image drawAtPoint:CGPointZero];
-                    
-                    UIImage *pinImage;
-                    CGPoint pinCenterOffset = CGPointZero;
-                    
-                    // Get a standard annotation view pin if there is no custom annotation block.
-                    if (!strongSelf.imageForStaticMapAnnotationBlock) {
-                      pinImage = [strongSelf.class defaultPinImageWithCenterOffset:&pinCenterOffset];
-                    }
-                    
-                    for (id<MKAnnotation> annotation in annotations) {
-                      if (strongSelf.imageForStaticMapAnnotationBlock) {
-                        // Get custom annotation image from custom annotation block.
-                        pinImage = strongSelf.imageForStaticMapAnnotationBlock(annotation, &pinCenterOffset);
-                        if (!pinImage) {
-                          // just for case block returned nil, which can happen
-                          pinImage = [strongSelf.class defaultPinImageWithCenterOffset:&pinCenterOffset];
-                        }
-                      }
-                      
-                      CGPoint point = [snapshot pointForCoordinate:annotation.coordinate];
-                      if (CGRectContainsPoint(finalImageRect, point)) {
-                        CGSize pinSize = pinImage.size;
-                        point.x -= pinSize.width / 2.0;
-                        point.y -= pinSize.height / 2.0;
-                        point.x += pinCenterOffset.x;
-                        point.y += pinCenterOffset.y;
-                        [pinImage drawAtPoint:point];
-                      }
-                    }
-                    
-                    image = ASGraphicsGetImageAndEndCurrentContext();
-                  }
-                  
-                  strongSelf.image = image;
-                }
-  }];
-}
-
-+ (UIImage *)defaultPinImageWithCenterOffset:(CGPoint *)centerOffset NS_RETURNS_RETAINED
-{
-  static MKAnnotationView *pin;
-  static dispatch_once_t onceToken;
-  dispatch_once(&onceToken, ^{
-    pin = [[MKPinAnnotationView alloc] initWithAnnotation:nil reuseIdentifier:@""];
-  });
-  *centerOffset = pin.centerOffset;
-  return pin.image;
-}
-
-- (void)setUpSnapshotter
-{
-  _snapshotter = [[MKMapSnapshotter alloc] initWithOptions:self.options];
-}
-
-- (void)destroySnapshotter
-{
-  [_snapshotter cancel];
-  _snapshotter = nil;
-}
-
-- (void)applySnapshotOptions
-{
-  MKMapSnapshotOptions *options = self.options;
-  [_mapView setCamera:options.camera animated:YES];
-  [_mapView setRegion:options.region animated:YES];
-  [_mapView setMapType:options.mapType];
-  _mapView.showsBuildings = options.showsBuildings;
-  _mapView.showsPointsOfInterest = options.showsPointsOfInterest;
-}
-
-#pragma mark - Actions
-- (void)addLiveMap
-{
-  ASDisplayNodeAssertMainThread();
-  if (!_mapView) {
-    __weak ASMapNode *weakSelf = self;
-    _mapView = [[MKMapView alloc] initWithFrame:CGRectZero];
-    _mapView.delegate = weakSelf.mapDelegate;
-    [weakSelf applySnapshotOptions];
-    [_mapView addAnnotations:_annotations];
-    [weakSelf setNeedsLayout];
-    [weakSelf.view addSubview:_mapView];
-
-    ASMapNodeShowAnnotationsOptions showAnnotationsOptions = self.showAnnotationsOptions;
-    if (showAnnotationsOptions & ASMapNodeShowAnnotationsOptionsZoomed) {
-      BOOL const animated = showAnnotationsOptions & ASMapNodeShowAnnotationsOptionsAnimated;
-      [_mapView showAnnotations:_mapView.annotations animated:animated];
-    }
-  }
-}
-
-- (void)removeLiveMap
-{
-  [_mapView removeFromSuperview];
-  _mapView = nil;
-}
-
-- (NSArray *)annotations
-{
-  ASLockScopeSelf();
-  return _annotations;
-}
-
-- (void)setAnnotations:(NSArray *)annotations
-{
-  annotations = [annotations copy] ? : @[];
-
-  ASLockScopeSelf();
-  _annotations = annotations;
-  ASMapNodeShowAnnotationsOptions showAnnotationsOptions = self.showAnnotationsOptions;
-  if (self.isLiveMap) {
-    [_mapView removeAnnotations:_mapView.annotations];
-    [_mapView addAnnotations:annotations];
-
-    if (showAnnotationsOptions & ASMapNodeShowAnnotationsOptionsZoomed) {
-      BOOL const animated = showAnnotationsOptions & ASMapNodeShowAnnotationsOptionsAnimated;
-      [_mapView showAnnotations:_mapView.annotations animated:animated];
-    }
-  } else {
-    if (showAnnotationsOptions & ASMapNodeShowAnnotationsOptionsZoomed) {
-      self.region = [self regionToFitAnnotations:annotations];
-    }
-    else {
-      [self takeSnapshot];
-    }
-  }
-}
-
-- (MKCoordinateRegion)regionToFitAnnotations:(NSArray<id<MKAnnotation>> *)annotations
-{
-  if([annotations count] == 0)
-    return MKCoordinateRegionForMapRect(MKMapRectWorld);
-
-  CLLocationCoordinate2D topLeftCoord = CLLocationCoordinate2DMake(-90, 180);
-  CLLocationCoordinate2D bottomRightCoord = CLLocationCoordinate2DMake(90, -180);
-
-  for (id<MKAnnotation> annotation in annotations) {
-    topLeftCoord = CLLocationCoordinate2DMake(std::fmax(topLeftCoord.latitude, annotation.coordinate.latitude),
-                                              std::fmin(topLeftCoord.longitude, annotation.coordinate.longitude));
-    bottomRightCoord = CLLocationCoordinate2DMake(std::fmin(bottomRightCoord.latitude, annotation.coordinate.latitude),
-                                                  std::fmax(bottomRightCoord.longitude, annotation.coordinate.longitude));
-  }
-
-  MKCoordinateRegion region = MKCoordinateRegionMake(CLLocationCoordinate2DMake(topLeftCoord.latitude - (topLeftCoord.latitude - bottomRightCoord.latitude) * 0.5,
-                                                                                topLeftCoord.longitude + (bottomRightCoord.longitude - topLeftCoord.longitude) * 0.5),
-                                                     MKCoordinateSpanMake(std::fabs(topLeftCoord.latitude - bottomRightCoord.latitude) * 2,
-                                                                          std::fabs(bottomRightCoord.longitude - topLeftCoord.longitude) * 2));
-
-  return region;
-}
-
--(ASMapNodeShowAnnotationsOptions)showAnnotationsOptions {
-  return ASLockedSelf(_showAnnotationsOptions);
-}
-
--(void)setShowAnnotationsOptions:(ASMapNodeShowAnnotationsOptions)showAnnotationsOptions {
-  ASLockScopeSelf();
-  _showAnnotationsOptions = showAnnotationsOptions;
-}
-
-#pragma mark - Layout
-- (void)setSnapshotSizeWithReloadIfNeeded:(CGSize)snapshotSize
-{
-  if (snapshotSize.height > 0 && snapshotSize.width > 0 && !CGSizeEqualToSize(self.options.size, snapshotSize)) {
-    _options.size = snapshotSize;
-    if (_snapshotter) {
-      [self destroySnapshotter];
-      [self takeSnapshot];
-    }
-  }
-}
-
-- (CGSize)calculateSizeThatFits:(CGSize)constrainedSize
-{
-  // FIXME: Need a better way to allow maps to take up the right amount of space in a layout (sizeRange, etc)
-  // These fallbacks protect against inheriting a constrainedSize that contains a CGFLOAT_MAX value.
-  if (!ASIsCGSizeValidForLayout(constrainedSize)) {
-    //ASDisplayNodeAssert(NO, @"Invalid width or height in ASMapNode");
-    constrainedSize = CGSizeZero;
-  }
-  [self setSnapshotSizeWithReloadIfNeeded:constrainedSize];
-  return constrainedSize;
-}
-
-- (void)calculatedLayoutDidChange
-{
-  [super calculatedLayoutDidChange];
-  
-  if (_snapshotAfterLayout) {
-    [self takeSnapshot];
-  }
-}
-
-// -layout isn't usually needed over -layoutSpecThatFits, but this way we can avoid a needless node wrapper for MKMapView.
-- (void)layout
-{
-  [super layout];
-  if (self.isLiveMap) {
-    _mapView.frame = CGRectMake(0.0f, 0.0f, self.calculatedSize.width, self.calculatedSize.height);
-  } else {
-    // If our bounds.size is different from our current snapshot size, then let's request a new image from MKMapSnapshotter.
-    if (_needsMapReloadOnBoundsChange) {
-      [self setSnapshotSizeWithReloadIfNeeded:self.bounds.size];
-      // FIXME: Adding a check for Preload here seems to cause intermittent map load failures, but shouldn't.
-      // if (ASInterfaceStateIncludesPreload(self.interfaceState)) {
-    }
-  }
-}
-
-- (BOOL)supportsLayerBacking
-{
-  return NO;
-}
-
-@end
-#endif // TARGET_OS_IOS && AS_USE_MAPKIT
diff --git a/submodules/AsyncDisplayKit/Source/ASMapNode.mm.orig b/submodules/AsyncDisplayKit/Source/ASMapNode.mm.orig
deleted file mode 100644
index 1014f2f32c..0000000000
--- a/submodules/AsyncDisplayKit/Source/ASMapNode.mm.orig
+++ /dev/null
@@ -1,456 +0,0 @@
-//
-//  ASMapNode.mm
-//  Texture
-//
-//  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.
-//  Changes after 4/13/2017 are: Copyright (c) Pinterest, Inc.  All rights reserved.
-//  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
-//
-
-<<<<<<< HEAD
-#ifndef MINIMAL_ASDK
-
-#import <Foundation/Foundation.h>
-
-#if TARGET_OS_IOS
-=======
->>>>>>> 565da7d4935740d12fc204aa061faf093831da1e
-#import <AsyncDisplayKit/ASMapNode.h>
-
-#if TARGET_OS_IOS && AS_USE_MAPKIT
-
-#import <tgmath.h>
-
-#import <AsyncDisplayKit/ASDisplayNode+Subclasses.h>
-#import <AsyncDisplayKit/ASDisplayNodeExtras.h>
-#import <AsyncDisplayKit/ASGraphicsContext.h>
-#import <AsyncDisplayKit/ASInsetLayoutSpec.h>
-#import <AsyncDisplayKit/ASInternalHelpers.h>
-#import <AsyncDisplayKit/ASLayout.h>
-#import <AsyncDisplayKit/ASThread.h>
-
-@interface ASMapNode()
-{
-  MKMapSnapshotter *_snapshotter;
-  BOOL _snapshotAfterLayout;
-  NSArray *_annotations;
-}
-@end
-
-@implementation ASMapNode
-
-@synthesize needsMapReloadOnBoundsChange = _needsMapReloadOnBoundsChange;
-@synthesize mapDelegate = _mapDelegate;
-@synthesize options = _options;
-@synthesize liveMap = _liveMap;
-@synthesize showAnnotationsOptions = _showAnnotationsOptions;
-
-#pragma mark - Lifecycle
-- (instancetype)init
-{
-  if (!(self = [super init])) {
-    return nil;
-  }
-  self.backgroundColor = ASDisplayNodeDefaultPlaceholderColor();
-  self.clipsToBounds = YES;
-  self.userInteractionEnabled = YES;
-  
-  _needsMapReloadOnBoundsChange = YES;
-  _liveMap = NO;
-  _annotations = @[];
-  _showAnnotationsOptions = ASMapNodeShowAnnotationsOptionsIgnored;
-  return self;
-}
-
-- (void)didLoad
-{
-  [super didLoad];
-  if (self.isLiveMap) {
-    [self addLiveMap];
-  }
-}
-
-- (void)dealloc
-{
-  [self destroySnapshotter];
-}
-
-- (void)setLayerBacked:(BOOL)layerBacked
-{
-  ASDisplayNodeAssert(!self.isLiveMap, @"ASMapNode can not be layer backed whilst .liveMap = YES, set .liveMap = NO to use layer backing.");
-  [super setLayerBacked:layerBacked];
-}
-
-- (void)didEnterPreloadState
-{
-  [super didEnterPreloadState];
-  ASPerformBlockOnMainThread(^{
-    if (self.isLiveMap) {
-      [self addLiveMap];
-    } else {
-      [self takeSnapshot];
-    }
-  });
-}
-
-- (void)didExitPreloadState
-{
-  [super didExitPreloadState];
-  ASPerformBlockOnMainThread(^{
-    if (self.isLiveMap) {
-      [self removeLiveMap];
-    }
-  });
-}
-
-#pragma mark - Settings
-
-- (BOOL)isLiveMap
-{
-  ASLockScopeSelf();
-  return _liveMap;
-}
-
-- (void)setLiveMap:(BOOL)liveMap
-{
-  ASDisplayNodeAssert(!self.isLayerBacked, @"ASMapNode can not use the interactive map feature whilst .isLayerBacked = YES, set .layerBacked = NO to use the interactive map feature.");
-  ASLockScopeSelf();
-  if (liveMap == _liveMap) {
-    return;
-  }
-  _liveMap = liveMap;
-  if (self.nodeLoaded) {
-    liveMap ? [self addLiveMap] : [self removeLiveMap];
-  }
-}
-
-- (BOOL)needsMapReloadOnBoundsChange
-{
-  ASLockScopeSelf();
-  return _needsMapReloadOnBoundsChange;
-}
-
-- (void)setNeedsMapReloadOnBoundsChange:(BOOL)needsMapReloadOnBoundsChange
-{
-  ASLockScopeSelf();
-  _needsMapReloadOnBoundsChange = needsMapReloadOnBoundsChange;
-}
-
-- (MKMapSnapshotOptions *)options
-{
-  ASLockScopeSelf();
-  if (!_options) {
-    _options = [[MKMapSnapshotOptions alloc] init];
-    _options.region = MKCoordinateRegionForMapRect(MKMapRectWorld);
-    CGSize calculatedSize = self.calculatedSize;
-    if (!CGSizeEqualToSize(calculatedSize, CGSizeZero)) {
-      _options.size = calculatedSize;
-    }
-  }
-  return _options;
-}
-
-- (void)setOptions:(MKMapSnapshotOptions *)options
-{
-  ASLockScopeSelf();
-  if (!_options || ![options isEqual:_options]) {
-    _options = options;
-    if (self.isLiveMap) {
-      [self applySnapshotOptions];
-    } else if (_snapshotter) {
-      [self destroySnapshotter];
-      [self takeSnapshot];
-    }
-  }
-}
-
-- (MKCoordinateRegion)region
-{
-  return self.options.region;
-}
-
-- (void)setRegion:(MKCoordinateRegion)region
-{
-  MKMapSnapshotOptions * options = [self.options copy];
-  options.region = region;
-  self.options = options;
-}
-
-- (id<MKMapViewDelegate>)mapDelegate
-{
-  return ASLockedSelf(_mapDelegate);
-}
-
-- (void)setMapDelegate:(id<MKMapViewDelegate>)mapDelegate {
-  ASLockScopeSelf();
-  _mapDelegate = mapDelegate;
-  
-  if (_mapView) {
-    ASDisplayNodeAssertMainThread();
-    _mapView.delegate = mapDelegate;
-  }
-}
-
-#pragma mark - Snapshotter
-
-- (void)takeSnapshot
-{
-  // If our size is zero, we want to avoid calling a default sized snapshot. Set _snapshotAfterLayout to YES
-  // so if layout changes in the future, we'll try snapshotting again.
-  ASLayout *layout = self.calculatedLayout;
-  if (layout == nil || CGSizeEqualToSize(CGSizeZero, layout.size)) {
-    _snapshotAfterLayout = YES;
-    return;
-  }
-  
-  _snapshotAfterLayout = NO;
-  
-  if (!_snapshotter) {
-    [self setUpSnapshotter];
-  }
-  
-  if (_snapshotter.isLoading) {
-    return;
-  }
-
-  __weak __typeof__(self) weakSelf = self;
-  [_snapshotter startWithQueue:dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0)
-             completionHandler:^(MKMapSnapshot *snapshot, NSError *error) {
-                 __typeof__(self) strongSelf = weakSelf;
-                if (!strongSelf) {
-                  return;
-                }
-                 
-                if (!error) {
-                  UIImage *image = snapshot.image;
-                  NSArray *annotations = strongSelf.annotations;
-                  if (annotations.count > 0) {
-                    // Only create a graphics context if we have annotations to draw.
-                    // The MKMapSnapshotter is currently not capable of rendering annotations automatically.
-                    
-                    CGRect finalImageRect = CGRectMake(0, 0, image.size.width, image.size.height);
-                    
-                    ASGraphicsBeginImageContextWithOptions(image.size, YES, image.scale);
-                    [image drawAtPoint:CGPointZero];
-                    
-                    UIImage *pinImage;
-                    CGPoint pinCenterOffset = CGPointZero;
-                    
-                    // Get a standard annotation view pin if there is no custom annotation block.
-                    if (!strongSelf.imageForStaticMapAnnotationBlock) {
-                      pinImage = [strongSelf.class defaultPinImageWithCenterOffset:&pinCenterOffset];
-                    }
-                    
-                    for (id<MKAnnotation> annotation in annotations) {
-                      if (strongSelf.imageForStaticMapAnnotationBlock) {
-                        // Get custom annotation image from custom annotation block.
-                        pinImage = strongSelf.imageForStaticMapAnnotationBlock(annotation, &pinCenterOffset);
-                        if (!pinImage) {
-                          // just for case block returned nil, which can happen
-                          pinImage = [strongSelf.class defaultPinImageWithCenterOffset:&pinCenterOffset];
-                        }
-                      }
-                      
-                      CGPoint point = [snapshot pointForCoordinate:annotation.coordinate];
-                      if (CGRectContainsPoint(finalImageRect, point)) {
-                        CGSize pinSize = pinImage.size;
-                        point.x -= pinSize.width / 2.0;
-                        point.y -= pinSize.height / 2.0;
-                        point.x += pinCenterOffset.x;
-                        point.y += pinCenterOffset.y;
-                        [pinImage drawAtPoint:point];
-                      }
-                    }
-                    
-                    image = ASGraphicsGetImageAndEndCurrentContext();
-                  }
-                  
-                  strongSelf.image = image;
-                }
-  }];
-}
-
-+ (UIImage *)defaultPinImageWithCenterOffset:(CGPoint *)centerOffset NS_RETURNS_RETAINED
-{
-  static MKAnnotationView *pin;
-  static dispatch_once_t onceToken;
-  dispatch_once(&onceToken, ^{
-    pin = [[MKPinAnnotationView alloc] initWithAnnotation:nil reuseIdentifier:@""];
-  });
-  *centerOffset = pin.centerOffset;
-  return pin.image;
-}
-
-- (void)setUpSnapshotter
-{
-  _snapshotter = [[MKMapSnapshotter alloc] initWithOptions:self.options];
-}
-
-- (void)destroySnapshotter
-{
-  [_snapshotter cancel];
-  _snapshotter = nil;
-}
-
-- (void)applySnapshotOptions
-{
-  MKMapSnapshotOptions *options = self.options;
-  [_mapView setCamera:options.camera animated:YES];
-  [_mapView setRegion:options.region animated:YES];
-  [_mapView setMapType:options.mapType];
-  _mapView.showsBuildings = options.showsBuildings;
-  _mapView.showsPointsOfInterest = options.showsPointsOfInterest;
-}
-
-#pragma mark - Actions
-- (void)addLiveMap
-{
-  ASDisplayNodeAssertMainThread();
-  if (!_mapView) {
-    __weak ASMapNode *weakSelf = self;
-    _mapView = [[MKMapView alloc] initWithFrame:CGRectZero];
-    _mapView.delegate = weakSelf.mapDelegate;
-    [weakSelf applySnapshotOptions];
-    [_mapView addAnnotations:_annotations];
-    [weakSelf setNeedsLayout];
-    [weakSelf.view addSubview:_mapView];
-
-    ASMapNodeShowAnnotationsOptions showAnnotationsOptions = self.showAnnotationsOptions;
-    if (showAnnotationsOptions & ASMapNodeShowAnnotationsOptionsZoomed) {
-      BOOL const animated = showAnnotationsOptions & ASMapNodeShowAnnotationsOptionsAnimated;
-      [_mapView showAnnotations:_mapView.annotations animated:animated];
-    }
-  }
-}
-
-- (void)removeLiveMap
-{
-  [_mapView removeFromSuperview];
-  _mapView = nil;
-}
-
-- (NSArray *)annotations
-{
-  ASLockScopeSelf();
-  return _annotations;
-}
-
-- (void)setAnnotations:(NSArray *)annotations
-{
-  annotations = [annotations copy] ? : @[];
-
-  ASLockScopeSelf();
-  _annotations = annotations;
-  ASMapNodeShowAnnotationsOptions showAnnotationsOptions = self.showAnnotationsOptions;
-  if (self.isLiveMap) {
-    [_mapView removeAnnotations:_mapView.annotations];
-    [_mapView addAnnotations:annotations];
-
-    if (showAnnotationsOptions & ASMapNodeShowAnnotationsOptionsZoomed) {
-      BOOL const animated = showAnnotationsOptions & ASMapNodeShowAnnotationsOptionsAnimated;
-      [_mapView showAnnotations:_mapView.annotations animated:animated];
-    }
-  } else {
-    if (showAnnotationsOptions & ASMapNodeShowAnnotationsOptionsZoomed) {
-      self.region = [self regionToFitAnnotations:annotations];
-    }
-    else {
-      [self takeSnapshot];
-    }
-  }
-}
-
-- (MKCoordinateRegion)regionToFitAnnotations:(NSArray<id<MKAnnotation>> *)annotations
-{
-  if([annotations count] == 0)
-    return MKCoordinateRegionForMapRect(MKMapRectWorld);
-
-  CLLocationCoordinate2D topLeftCoord = CLLocationCoordinate2DMake(-90, 180);
-  CLLocationCoordinate2D bottomRightCoord = CLLocationCoordinate2DMake(90, -180);
-
-  for (id<MKAnnotation> annotation in annotations) {
-    topLeftCoord = CLLocationCoordinate2DMake(std::fmax(topLeftCoord.latitude, annotation.coordinate.latitude),
-                                              std::fmin(topLeftCoord.longitude, annotation.coordinate.longitude));
-    bottomRightCoord = CLLocationCoordinate2DMake(std::fmin(bottomRightCoord.latitude, annotation.coordinate.latitude),
-                                                  std::fmax(bottomRightCoord.longitude, annotation.coordinate.longitude));
-  }
-
-  MKCoordinateRegion region = MKCoordinateRegionMake(CLLocationCoordinate2DMake(topLeftCoord.latitude - (topLeftCoord.latitude - bottomRightCoord.latitude) * 0.5,
-                                                                                topLeftCoord.longitude + (bottomRightCoord.longitude - topLeftCoord.longitude) * 0.5),
-                                                     MKCoordinateSpanMake(std::fabs(topLeftCoord.latitude - bottomRightCoord.latitude) * 2,
-                                                                          std::fabs(bottomRightCoord.longitude - topLeftCoord.longitude) * 2));
-
-  return region;
-}
-
--(ASMapNodeShowAnnotationsOptions)showAnnotationsOptions {
-  return ASLockedSelf(_showAnnotationsOptions);
-}
-
--(void)setShowAnnotationsOptions:(ASMapNodeShowAnnotationsOptions)showAnnotationsOptions {
-  ASLockScopeSelf();
-  _showAnnotationsOptions = showAnnotationsOptions;
-}
-
-#pragma mark - Layout
-- (void)setSnapshotSizeWithReloadIfNeeded:(CGSize)snapshotSize
-{
-  if (snapshotSize.height > 0 && snapshotSize.width > 0 && !CGSizeEqualToSize(self.options.size, snapshotSize)) {
-    _options.size = snapshotSize;
-    if (_snapshotter) {
-      [self destroySnapshotter];
-      [self takeSnapshot];
-    }
-  }
-}
-
-- (CGSize)calculateSizeThatFits:(CGSize)constrainedSize
-{
-  // FIXME: Need a better way to allow maps to take up the right amount of space in a layout (sizeRange, etc)
-  // These fallbacks protect against inheriting a constrainedSize that contains a CGFLOAT_MAX value.
-  if (!ASIsCGSizeValidForLayout(constrainedSize)) {
-    //ASDisplayNodeAssert(NO, @"Invalid width or height in ASMapNode");
-    constrainedSize = CGSizeZero;
-  }
-  [self setSnapshotSizeWithReloadIfNeeded:constrainedSize];
-  return constrainedSize;
-}
-
-- (void)calculatedLayoutDidChange
-{
-  [super calculatedLayoutDidChange];
-  
-  if (_snapshotAfterLayout) {
-    [self takeSnapshot];
-  }
-}
-
-// -layout isn't usually needed over -layoutSpecThatFits, but this way we can avoid a needless node wrapper for MKMapView.
-- (void)layout
-{
-  [super layout];
-  if (self.isLiveMap) {
-    _mapView.frame = CGRectMake(0.0f, 0.0f, self.calculatedSize.width, self.calculatedSize.height);
-  } else {
-    // If our bounds.size is different from our current snapshot size, then let's request a new image from MKMapSnapshotter.
-    if (_needsMapReloadOnBoundsChange) {
-      [self setSnapshotSizeWithReloadIfNeeded:self.bounds.size];
-      // FIXME: Adding a check for Preload here seems to cause intermittent map load failures, but shouldn't.
-      // if (ASInterfaceStateIncludesPreload(self.interfaceState)) {
-    }
-  }
-}
-
-- (BOOL)supportsLayerBacking
-{
-  return NO;
-}
-
-@end
-<<<<<<< HEAD
-#endif
-
-#endif
-=======
-#endif // TARGET_OS_IOS && AS_USE_MAPKIT
->>>>>>> 565da7d4935740d12fc204aa061faf093831da1e
diff --git a/submodules/AsyncDisplayKit/Source/ASMultiplexImageNode.h b/submodules/AsyncDisplayKit/Source/ASMultiplexImageNode.h
deleted file mode 100644
index 42342422a9..0000000000
--- a/submodules/AsyncDisplayKit/Source/ASMultiplexImageNode.h
+++ /dev/null
@@ -1,271 +0,0 @@
-//
-//  ASMultiplexImageNode.h
-//  Texture
-//
-//  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.
-//  Changes after 4/13/2017 are: Copyright (c) Pinterest, Inc.  All rights reserved.
-//  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
-//
-
-#ifndef MINIMAL_ASDK
-#import <AsyncDisplayKit/ASImageNode.h>
-#import <AsyncDisplayKit/ASImageProtocols.h>
-#import <Photos/Photos.h>
-
-NS_ASSUME_NONNULL_BEGIN
-
-@protocol ASMultiplexImageNodeDelegate;
-@protocol ASMultiplexImageNodeDataSource;
-
-typedef id<NSCopying, NSObject> ASImageIdentifier;
-
-AS_EXTERN NSString *const ASMultiplexImageNodeErrorDomain;
-
-/**
- * ASMultiplexImageNode error codes.
- */
-typedef NS_ENUM(NSUInteger, ASMultiplexImageNodeErrorCode) {
-  /**
-   * Indicates that the data source didn't provide a source for an image identifier.
-   */
-  ASMultiplexImageNodeErrorCodeNoSourceForImage = 0,
-
-  /**
-   * Indicates that the best image identifier changed before a download for a worse identifier began.
-   */
-  ASMultiplexImageNodeErrorCodeBestImageIdentifierChanged,
-
-  /**
-   * Indicates that the Photos framework returned no image and no error.
-   * This may happen if the image is in iCloud and the user did not specify `allowsNetworkAccess`
-   * in their image request.
-   */
-  ASMultiplexImageNodeErrorCodePhotosImageManagerFailedWithoutError,
-  
-  /**
-   * Indicates that the image node could not retrieve the PHAsset for a given asset identifier.
-   * This typically means that the user has not given Photos framework permissions yet or the asset 
-   * has been removed from the device.
-   */
-  ASMultiplexImageNodeErrorCodePHAssetIsUnavailable
-};
-
-
-/**
- * @abstract ASMultiplexImageNode is an image node that can load and display multiple versions of an image.  For
- * example, it can display a low-resolution version of an image while the high-resolution version is loading.
- *
- * @discussion ASMultiplexImageNode begins loading images when its resource can either return a UIImage directly, or a URL the image node should load.
- */
-@interface ASMultiplexImageNode : ASImageNode
-
-/**
- * @abstract The designated initializer.
- * @param cache The object that implements a cache of images for the image node.
- * @param downloader The object that implements image downloading for the image node.
- * @discussion If `cache` is nil, the receiver will not attempt to retrieve images from a cache before downloading them.
- * @return An initialized ASMultiplexImageNode.
- */
-- (instancetype)initWithCache:(nullable id<ASImageCacheProtocol>)cache downloader:(nullable id<ASImageDownloaderProtocol>)downloader NS_DESIGNATED_INITIALIZER;
-
-/**
- * @abstract The delegate, which must conform to the <ASMultiplexImageNodeDelegate> protocol.
- */
-@property (nonatomic, weak) id <ASMultiplexImageNodeDelegate> delegate;
-
-/**
- * @abstract The data source, which must conform to the <ASMultiplexImageNodeDataSource> protocol.
- * @discussion This value is required for ASMultiplexImageNode to load images.
- */
-@property (nonatomic, weak) id <ASMultiplexImageNodeDataSource> dataSource;
-
-/**
- * @abstract Whether the receiver should download more than just its highest-quality image.  Defaults to NO.
- *
- * @discussion ASMultiplexImageNode immediately loads and displays the first image specified in <imageIdentifiers> (its
- * highest-quality image).  If that image is not immediately available or cached, the node can download and display
- * lesser-quality images.  Set `downloadsIntermediateImages` to YES to enable this behaviour.
- */
-@property (nonatomic) BOOL downloadsIntermediateImages;
-
-/**
- * @abstract An array of identifiers representing various versions of an image for ASMultiplexImageNode to display.
- *
- * @discussion An identifier can be any object that conforms to NSObject and NSCopying.  The array should be in
- * decreasing order of image quality -- that is, the first identifier in the array represents the best version.
- *
- * @see <downloadsIntermediateImages> for more information on the image loading process.
- */
-@property (nonatomic, copy) NSArray<ASImageIdentifier> *imageIdentifiers;
-
-/**
- * @abstract Notify the receiver SSAA that its data source has new UIImages or NSURLs available for <imageIdentifiers>.
- *
- * @discussion If a higher-quality image than is currently displayed is now available, it will be loaded.
- */
-- (void)reloadImageIdentifierSources;
-
-/**
- * @abstract The identifier for the last image that the receiver loaded, or nil.
- *
- * @discussion This value may differ from <displayedImageIdentifier> if the image hasn't yet been displayed.
- */
-@property (nullable, nonatomic, readonly) ASImageIdentifier loadedImageIdentifier;
-
-/**
- * @abstract The identifier for the image that the receiver is currently displaying, or nil.
- */
-@property (nullable, nonatomic, readonly) ASImageIdentifier displayedImageIdentifier;
-
-/**
- * @abstract If the downloader implements progressive image rendering and this value is YES progressive renders of the
- * image will be displayed as the image downloads. Regardless of this properties value, progress renders will
- * only occur when the node is visible. Defaults to YES.
- */
-@property (nonatomic) BOOL shouldRenderProgressImages;
-
-/**
- * @abstract The image manager that this image node should use when requesting images from the Photos framework. If this is `nil` (the default), then `PHImageManager.defaultManager` is used.
- 
- * @see `+[NSURL URLWithAssetLocalIdentifier:targetSize:contentMode:options:]` below.
- */
-@property (nullable, nonatomic) PHImageManager *imageManager API_AVAILABLE(ios(8.0), tvos(10.0));
-@end
-
-
-#pragma mark -
-/**
- * The methods declared by the ASMultiplexImageNodeDelegate protocol allow the adopting delegate to respond to
- * notifications such as began, progressed and finished downloading, updated and displayed an image.
- */
-@protocol ASMultiplexImageNodeDelegate <NSObject>
-
-@optional
-/**
- * @abstract Notification that the image node began downloading an image.
- * @param imageNode The sender.
- * @param imageIdentifier The identifier for the image that is downloading.
- */
-- (void)multiplexImageNode:(ASMultiplexImageNode *)imageNode didStartDownloadOfImageWithIdentifier:(id)imageIdentifier;
-
-/**
- * @abstract Notification that the image node's download progressed.
- * @param imageNode The sender.
- * @param downloadProgress The progress of the download.  Value is between 0.0 and 1.0.
- * @param imageIdentifier The identifier for the image that is downloading.
- */
-- (void)multiplexImageNode:(ASMultiplexImageNode *)imageNode
- didUpdateDownloadProgress:(CGFloat)downloadProgress
-    forImageWithIdentifier:(ASImageIdentifier)imageIdentifier;
-
-/**
- * @abstract Notification that the image node's download has finished.
- * @param imageNode The sender.
- * @param imageIdentifier The identifier for the image that finished downloading.
- * @param error The error that occurred while downloading, if one occurred; nil otherwise.
- */
-- (void)multiplexImageNode:(ASMultiplexImageNode *)imageNode
-didFinishDownloadingImageWithIdentifier:(ASImageIdentifier)imageIdentifier
-                     error:(nullable NSError *)error;
-
-/**
- * @abstract Notification that the image node's image was updated.
- * @param imageNode The sender.
- * @param image The new image, ready for display.
- * @param imageIdentifier The identifier for `image`.
- * @param previousImage The old, previously-loaded image.
- * @param previousImageIdentifier The identifier for `previousImage`.
- * @note This method does not indicate that `image` has been displayed.
- * @see <[ASMultiplexImageNodeDelegate multiplexImageNode:didDisplayUpdatedImage:withIdentifier:]>.
- */
-- (void)multiplexImageNode:(ASMultiplexImageNode *)imageNode
-            didUpdateImage:(nullable UIImage *)image
-            withIdentifier:(nullable ASImageIdentifier)imageIdentifier
-                 fromImage:(nullable UIImage *)previousImage
-            withIdentifier:(nullable ASImageIdentifier)previousImageIdentifier;
-
-/**
- * @abstract Notification that the image node displayed a new image.
- * @param imageNode The sender.
- * @param image The new image, now being displayed.
- * @param imageIdentifier The identifier for `image`.
- * @discussion This method is only called when `image` changes, and not on subsequent redisplays of the same image.
- */
-- (void)multiplexImageNode:(ASMultiplexImageNode *)imageNode
-    didDisplayUpdatedImage:(nullable UIImage *)image
-            withIdentifier:(nullable ASImageIdentifier)imageIdentifier;
-
-/**
- * @abstract Notification that the image node finished displaying an image.
- * @param imageNode The sender.
- * @discussion This method is called every time an image is displayed, whether or not it has changed.
- */
-- (void)multiplexImageNodeDidFinishDisplay:(ASMultiplexImageNode *)imageNode;
-
-@end
-
-
-#pragma mark -
-/**
- * The ASMultiplexImageNodeDataSource protocol is adopted by an object that provides the multiplex image node,
- * for each image identifier, an image or a URL the image node should load.
- */
-@protocol ASMultiplexImageNodeDataSource <NSObject>
-
-@optional
-/**
- * @abstract An image for the specified identifier.
- * @param imageNode The sender.
- * @param imageIdentifier The identifier for the image that should be returned.
- * @discussion If the image is already available to the data source, this method should be used in lieu of providing the
- * URL to the image via -multiplexImageNode:URLForImageIdentifier:.
- * @return A UIImage corresponding to `imageIdentifier`, or nil if none is available.
- */
-- (nullable UIImage *)multiplexImageNode:(ASMultiplexImageNode *)imageNode imageForImageIdentifier:(ASImageIdentifier)imageIdentifier;
-
-/**
- * @abstract An image URL for the specified identifier.
- * @param imageNode The sender.
- * @param imageIdentifier The identifier for the image that will be downloaded.
- * @discussion Supported URLs include HTTP, HTTPS, AssetsLibrary, and FTP URLs as well as Photos framework URLs (see note).
- *
- * If the image is already available to the data source, it should be provided via <[ASMultiplexImageNodeDataSource
- * multiplexImageNode:imageForImageIdentifier:]> instead.
- * @return An NSURL for the image identified by `imageIdentifier`, or nil if none is available.
- * @see `+[NSURL URLWithAssetLocalIdentifier:targetSize:contentMode:options:]` below.
- */
-- (nullable NSURL *)multiplexImageNode:(ASMultiplexImageNode *)imageNode URLForImageIdentifier:(ASImageIdentifier)imageIdentifier;
-
-/**
- * @abstract A PHAsset for the specific asset local identifier
- * @param imageNode The sender.
- * @param assetLocalIdentifier The local identifier for a PHAsset that this image node is loading.
- *
- * @discussion This optional method can improve image performance if your data source already has the PHAsset available.
- * If this method is not implemented, or returns nil, the image node will request the asset from the Photos framework.
- * @note This method may be called from any thread.
- * @return A PHAsset corresponding to `assetLocalIdentifier`, or nil if none is available.
- */
-- (nullable PHAsset *)multiplexImageNode:(ASMultiplexImageNode *)imageNode assetForLocalIdentifier:(NSString *)assetLocalIdentifier API_AVAILABLE(ios(8.0), tvos(10.0));
-@end
-
-#pragma mark -
-@interface NSURL (ASPhotosFrameworkURLs)
-
-/**
- * @abstract Create an NSURL that specifies an image from the Photos framework.
- *
- * @discussion When implementing `-multiplexImageNode:URLForImageIdentifier:`, you can return a URL
- * created by this method and the image node will attempt to load the image from the Photos framework.
- * @note The `synchronous` flag in `options` is ignored.
- * @note The `Opportunistic` delivery mode is not supported and will be treated as `HighQualityFormat`.
- */
-+ (NSURL *)URLWithAssetLocalIdentifier:(NSString *)assetLocalIdentifier
-                            targetSize:(CGSize)targetSize
-                           contentMode:(PHImageContentMode)contentMode
-                               options:(PHImageRequestOptions *)options NS_RETURNS_RETAINED AS_WARN_UNUSED_RESULT API_AVAILABLE(ios(8.0), tvos(10.0));
-
-@end
-
-NS_ASSUME_NONNULL_END
-#endif
diff --git a/submodules/AsyncDisplayKit/Source/ASMultiplexImageNode.mm b/submodules/AsyncDisplayKit/Source/ASMultiplexImageNode.mm
deleted file mode 100644
index 476ace1a38..0000000000
--- a/submodules/AsyncDisplayKit/Source/ASMultiplexImageNode.mm
+++ /dev/null
@@ -1,962 +0,0 @@
-//
-//  ASMultiplexImageNode.mm
-//  Texture
-//
-//  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.
-//  Changes after 4/13/2017 are: Copyright (c) Pinterest, Inc.  All rights reserved.
-//  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
-//
-#ifndef MINIMAL_ASDK
-#import <AsyncDisplayKit/ASMultiplexImageNode.h>
-
-#if TARGET_OS_IOS && AS_USE_ASSETS_LIBRARY
-#import <AssetsLibrary/AssetsLibrary.h>
-#endif
-
-#import <AsyncDisplayKit/ASAvailability.h>
-#import <AsyncDisplayKit/ASDisplayNodeExtras.h>
-#import <AsyncDisplayKit/ASDisplayNode+Subclasses.h>
-#import <AsyncDisplayKit/ASDisplayNode+FrameworkPrivate.h>
-#import <AsyncDisplayKit/ASEqualityHelpers.h>
-#import <AsyncDisplayKit/ASInternalHelpers.h>
-#import <AsyncDisplayKit/ASLog.h>
-#import <AsyncDisplayKit/ASThread.h>
-
-#if AS_USE_PHOTOS
-#import <AsyncDisplayKit/ASPhotosFrameworkImageRequest.h>
-#endif
-
-#if AS_PIN_REMOTE_IMAGE
-#import <AsyncDisplayKit/ASPINRemoteImageDownloader.h>
-#else
-#import <AsyncDisplayKit/ASBasicImageDownloader.h>
-#endif
-
-using AS::MutexLocker;
-
-NSString *const ASMultiplexImageNodeErrorDomain = @"ASMultiplexImageNodeErrorDomain";
-
-#if AS_USE_ASSETS_LIBRARY
-static NSString *const kAssetsLibraryURLScheme = @"assets-library";
-#endif
-
-static const CGSize kMinReleaseImageOnBackgroundSize = {20.0, 20.0};
-
-/**
-  @abstract Signature for the block to be performed after an image has loaded.
-  @param image The image that was loaded, or nil if no image was loaded.
-  @param imageIdentifier The identifier of the image that was loaded, or nil if no image was loaded.
-  @param error An error describing why an image couldn't be loaded, if it failed to load; nil otherwise.
- */
-typedef void(^ASMultiplexImageLoadCompletionBlock)(UIImage *image, id imageIdentifier, NSError *error);
-
-@interface ASMultiplexImageNode ()
-{
-@private
-  // Core.
-  id<ASImageCacheProtocol> _cache;
-
-  id<ASImageDownloaderProtocol> _downloader;
-  struct {
-    unsigned int downloaderImplementsSetProgress:1;
-    unsigned int downloaderImplementsSetPriority:1;
-    unsigned int downloaderImplementsDownloadWithPriority:1;
-  } _downloaderFlags;
-
-  __weak id<ASMultiplexImageNodeDelegate> _delegate;
-  struct {
-    unsigned int downloadStart:1;
-    unsigned int downloadProgress:1;
-    unsigned int downloadFinish:1;
-    unsigned int updatedImageDisplayFinish:1;
-    unsigned int updatedImage:1;
-    unsigned int displayFinish:1;
-  } _delegateFlags;
-
-  __weak id<ASMultiplexImageNodeDataSource> _dataSource;
-  struct {
-    unsigned int image:1;
-    unsigned int URL:1;
-    unsigned int asset:1;
-  } _dataSourceFlags;
-
-  // Image flags.
-  BOOL _downloadsIntermediateImages; // Defaults to NO.
-  AS::Mutex _imageIdentifiersLock;
-  NSArray *_imageIdentifiers;
-  id _loadedImageIdentifier;
-  id _loadingImageIdentifier;
-  id _displayedImageIdentifier;
-  __weak NSOperation *_phImageRequestOperation;
-  
-  // Networking.
-  AS::RecursiveMutex _downloadIdentifierLock;
-  id _downloadIdentifier;
-  
-  // Properties
-  BOOL _shouldRenderProgressImages;
-  
-  //set on init only
-  BOOL _cacheSupportsClearing;
-}
-
-//! @abstract Read-write redeclaration of property declared in ASMultiplexImageNode.h.
-@property (nonatomic, copy) id loadedImageIdentifier;
-
-//! @abstract The image identifier that's being loaded by _loadNextImageWithCompletion:.
-@property (nonatomic, copy) id loadingImageIdentifier;
-
-/**
-  @abstract Returns the next image identifier that should be downloaded.
-  @discussion This method obeys and reflects the value of `downloadsIntermediateImages`.
-  @result The next image identifier, from `_imageIdentifiers`, that should be downloaded, or nil if no image should be downloaded next.
- */
-- (id)_nextImageIdentifierToDownload;
-
-/**
-  @abstract Returns the best image that is immediately available from our datasource without downloading or hitting the cache.
-  @param imageIdentifierOut Upon return, the image identifier for the returned image; nil otherwise.
-  @discussion This method exclusively uses the data source's -multiplexImageNode:imageForIdentifier: method to return images. It does not fetch from the cache or kick off downloading.
-  @result The best UIImage available immediately; nil if no image is immediately available.
- */
-- (UIImage *)_bestImmediatelyAvailableImageFromDataSource:(id *)imageIdentifierOut;
-
-/**
-  @abstract Loads and displays the next image in the receiver's loading sequence.
-  @discussion This method obeys `downloadsIntermediateImages`. This method has no effect if nothing further should be loaded, as indicated by `_nextImageIdentifierToDownload`. This method will load the next image from the data-source, if possible; otherwise, the session's image cache will be queried for the desired image, and as a last resort, the image will be downloaded.
- */
-- (void)_loadNextImage;
-
-/**
-  @abstract Fetches the image corresponding to the given imageIdentifier from the given URL from the session's image cache.
-  @param imageIdentifier The identifier for the image to be fetched. May not be nil.
-  @param imageURL The URL of the image to fetch. May not be nil.
-  @param completionBlock The block to be performed when the image has been fetched from the cache, if possible. May not be nil.
-  @discussion This method queries both the session's in-memory and on-disk caches (with preference for the in-memory cache).
- */
-- (void)_fetchImageWithIdentifierFromCache:(id)imageIdentifier URL:(NSURL *)imageURL completion:(void (^)(UIImage *image))completionBlock;
-
-#if TARGET_OS_IOS && AS_USE_ASSETS_LIBRARY
-/**
-  @abstract Loads the image corresponding to the given assetURL from the device's Assets Library.
-  @param imageIdentifier The identifier for the image to be loaded. May not be nil.
-  @param assetURL The assets-library URL (e.g., "assets-library://identifier") of the image to load, from ALAsset. May not be nil.
-  @param completionBlock The block to be performed when the image has been loaded, if possible. May not be nil.
- */
-- (void)_loadALAssetWithIdentifier:(id)imageIdentifier URL:(NSURL *)assetURL completion:(void (^)(UIImage *image, NSError *error))completionBlock;
-#endif
-
-#if AS_USE_PHOTOS
-/**
-  @abstract Loads the image corresponding to the given image request from the Photos framework.
-  @param imageIdentifier The identifier for the image to be loaded. May not be nil.
-  @param request The photos image request to load. May not be nil.
-  @param completionBlock The block to be performed when the image has been loaded, if possible. May not be nil.
- */
-- (void)_loadPHAssetWithRequest:(ASPhotosFrameworkImageRequest *)request identifier:(id)imageIdentifier completion:(void (^)(UIImage *image, NSError *error))completionBlock API_AVAILABLE(ios(8.0), tvos(10.0));
-#endif
-
-/**
- @abstract Downloads the image corresponding to the given imageIdentifier from the given URL.
- @param imageIdentifier The identifier for the image to be downloaded. May not be nil.
- @param imageURL The URL of the image to downloaded. May not be nil.
- @param completionBlock The block to be performed when the image has been downloaded, if possible. May not be nil.
- */
-- (void)_downloadImageWithIdentifier:(id)imageIdentifier URL:(NSURL *)imageURL completion:(void (^)(UIImage *image, NSError *error))completionBlock;
-
-@end
-
-@implementation ASMultiplexImageNode
-
-#pragma mark - Getting Started / Tearing Down
-- (instancetype)initWithCache:(id<ASImageCacheProtocol>)cache downloader:(id<ASImageDownloaderProtocol>)downloader
-{
-  if (!(self = [super init]))
-    return nil;
-
-  _cache = (id<ASImageCacheProtocol>)cache;
-  _downloader = (id<ASImageDownloaderProtocol>)downloader;
-  
-  _downloaderFlags.downloaderImplementsSetProgress = [downloader respondsToSelector:@selector(setProgressImageBlock:callbackQueue:withDownloadIdentifier:)];
-  _downloaderFlags.downloaderImplementsSetPriority = [downloader respondsToSelector:@selector(setPriority:withDownloadIdentifier:)];
-  _downloaderFlags.downloaderImplementsDownloadWithPriority = [downloader respondsToSelector:@selector(downloadImageWithURL:priority:callbackQueue:downloadProgress:completion:)];
-
-  _cacheSupportsClearing = [cache respondsToSelector:@selector(clearFetchedImageFromCacheWithURL:)];
-  
-  _shouldRenderProgressImages = YES;
-
-  self.shouldBypassEnsureDisplay = YES;
-
-  return self;
-}
-
-- (instancetype)init
-{
-#if AS_PIN_REMOTE_IMAGE
-  return [self initWithCache:[ASPINRemoteImageDownloader sharedDownloader] downloader:[ASPINRemoteImageDownloader sharedDownloader]];
-#else
-  return [self initWithCache:nil downloader:[ASBasicImageDownloader sharedImageDownloader]];
-#endif
-}
-
-- (void)dealloc
-{
-  [_phImageRequestOperation cancel];
-}
-
-#pragma mark - ASDisplayNode Overrides
-
-- (void)clearContents
-{
-  [super clearContents]; // This actually clears the contents, so we need to do this first for our displayedImageIdentifier to be meaningful.
-  [self _setDisplayedImageIdentifier:nil withImage:nil];
-
-  // NOTE: We intentionally do not cancel image downloads until `clearPreloadedData`.
-}
-
-- (void)didExitPreloadState
-{
-  [super didExitPreloadState];
-    
-  [_phImageRequestOperation cancel];
-
-  [self _setDownloadIdentifier:nil];
-  
-  if (_cacheSupportsClearing && self.loadedImageIdentifier != nil) {
-    NSURL *URL = [_dataSource multiplexImageNode:self URLForImageIdentifier:self.loadedImageIdentifier];
-    if (URL != nil) {
-      [_cache clearFetchedImageFromCacheWithURL:URL];
-    }
-  }
-
-  // setting this to nil makes the node fetch images the next time its display starts
-  _loadedImageIdentifier = nil;
-  [self _setImage:nil];
-}
-
-- (void)didEnterPreloadState
-{
-  [super didEnterPreloadState];
-
-  [self _loadImageIdentifiers];
-}
-
-- (void)displayDidFinish
-{
-  [super displayDidFinish];
-
-  // We may now be displaying the loaded identifier, if they're different.
-  UIImage *displayedImage = self.image;
-  if (displayedImage) {
-    if (!ASObjectIsEqual(_displayedImageIdentifier, _loadedImageIdentifier))
-      [self _setDisplayedImageIdentifier:_loadedImageIdentifier withImage:displayedImage];
-
-    // Delegateify
-    if (_delegateFlags.displayFinish) {
-      if (ASDisplayNodeThreadIsMain())
-        [_delegate multiplexImageNodeDidFinishDisplay:self];
-      else {
-        __weak __typeof__(self) weakSelf = self;
-        dispatch_async(dispatch_get_main_queue(), ^{
-          __typeof__(self) strongSelf = weakSelf;
-          if (!strongSelf)
-            return;
-          [strongSelf.delegate multiplexImageNodeDidFinishDisplay:strongSelf];
-        });
-      }
-    }
-  }
-}
-
-- (BOOL)placeholderShouldPersist
-{
-  return (self.image == nil && self.animatedImage == nil && self.imageIdentifiers.count > 0);
-}
-
-/* displayWillStartAsynchronously in ASNetworkImageNode has a very similar implementation. Changes here are likely necessary
- in ASNetworkImageNode as well. */
-- (void)displayWillStartAsynchronously:(BOOL)asynchronously
-{
-  [super displayWillStartAsynchronously:asynchronously];
-  [self didEnterPreloadState];
-  [self _updatePriorityOnDownloaderIfNeededWithDefaultPriority:ASImageDownloaderPriorityImminent];
-}
-
-/* didEnterVisibleState / didExitVisibleState in ASNetworkImageNode has a very similar implementation. Changes here are likely necessary
- in ASNetworkImageNode as well. */
-- (void)didEnterVisibleState
-{
-  [super didEnterVisibleState];
-  [self _updatePriorityOnDownloaderIfNeededWithDefaultPriority:ASImageDownloaderPriorityVisible];
-  [self _updateProgressImageBlockOnDownloaderIfNeeded];
-}
-
-- (void)didExitVisibleState
-{
-  [super didExitVisibleState];
-  [self _updatePriorityOnDownloaderIfNeededWithDefaultPriority:ASImageDownloaderPriorityPreload];
-  [self _updateProgressImageBlockOnDownloaderIfNeeded];
-}
-
-- (void)didExitDisplayState
-{
-  [super didExitDisplayState];
-  if (ASActivateExperimentalFeature(ASExperimentalImageDownloaderPriority)) {
-    [self _updatePriorityOnDownloaderIfNeededWithDefaultPriority:ASImageDownloaderPriorityPreload];
-  }
-}
-
-#pragma mark - Core
-
-- (void)setImage:(UIImage *)image
-{
-  ASDisplayNodeAssert(NO, @"Setting the image directly on an ASMultiplexImageNode is unsafe. It will be cleared in didExitPreloadRange and will have no way to restore in didEnterPreloadRange");
-  super.image = image;
-}
-
-- (void)_setImage:(UIImage *)image
-{
-  super.image = image;
-}
-
-- (void)setDelegate:(id <ASMultiplexImageNodeDelegate>)delegate
-{
-  if (_delegate == delegate)
-    return;
-
-  _delegate = delegate;
-  _delegateFlags.downloadStart = [_delegate respondsToSelector:@selector(multiplexImageNode:didStartDownloadOfImageWithIdentifier:)];
-  _delegateFlags.downloadProgress = [_delegate respondsToSelector:@selector(multiplexImageNode:didUpdateDownloadProgress:forImageWithIdentifier:)];
-  _delegateFlags.downloadFinish = [_delegate respondsToSelector:@selector(multiplexImageNode:didFinishDownloadingImageWithIdentifier:error:)];
-  _delegateFlags.updatedImageDisplayFinish = [_delegate respondsToSelector:@selector(multiplexImageNode:didDisplayUpdatedImage:withIdentifier:)];
-  _delegateFlags.updatedImage = [_delegate respondsToSelector:@selector(multiplexImageNode:didUpdateImage:withIdentifier:fromImage:withIdentifier:)];
-  _delegateFlags.displayFinish = [_delegate respondsToSelector:@selector(multiplexImageNodeDidFinishDisplay:)];
-}
-
-
-- (void)setDataSource:(id <ASMultiplexImageNodeDataSource>)dataSource
-{
-  if (_dataSource == dataSource)
-    return;
-
-  _dataSource = dataSource;
-  _dataSourceFlags.image = [_dataSource respondsToSelector:@selector(multiplexImageNode:imageForImageIdentifier:)];
-  _dataSourceFlags.URL = [_dataSource respondsToSelector:@selector(multiplexImageNode:URLForImageIdentifier:)];
-  if (AS_AVAILABLE_IOS_TVOS(9, 10)) {
-    _dataSourceFlags.asset = [_dataSource respondsToSelector:@selector(multiplexImageNode:assetForLocalIdentifier:)];
-  }
-}
-
-
-- (void)setShouldRenderProgressImages:(BOOL)shouldRenderProgressImages
-{
-  [self lock];
-  if (shouldRenderProgressImages == _shouldRenderProgressImages) {
-    [self unlock];
-    return;
-  }
-  
-  _shouldRenderProgressImages = shouldRenderProgressImages;
-  
-  [self unlock];
-  [self _updateProgressImageBlockOnDownloaderIfNeeded];
-}
-
-- (BOOL)shouldRenderProgressImages
-{
-  return ASLockedSelf(_shouldRenderProgressImages);
-}
-
-#pragma mark -
-
-#pragma mark -
-
-- (NSArray *)imageIdentifiers
-{
-  MutexLocker l(_imageIdentifiersLock);
-  return _imageIdentifiers;
-}
-
-- (void)setImageIdentifiers:(NSArray *)imageIdentifiers
-{
-  {
-    MutexLocker l(_imageIdentifiersLock);
-    if (ASObjectIsEqual(_imageIdentifiers, imageIdentifiers)) {
-      return;
-    }
-
-    _imageIdentifiers = [[NSArray alloc] initWithArray:imageIdentifiers copyItems:YES];
-  }
-
-  [self setNeedsPreload];
-}
-
-- (void)reloadImageIdentifierSources
-{
-  // setting this to nil makes the node think it has not downloaded any images
-  _loadedImageIdentifier = nil;
-  [self _loadImageIdentifiers];
-}
-
-#pragma mark -
-
-
-#pragma mark - Core Internal
-- (void)_setDisplayedImageIdentifier:(id)displayedImageIdentifier withImage:(UIImage *)image
-{
-  ASDisplayNodeAssertMainThread();
-    
-  if (ASObjectIsEqual(_displayedImageIdentifier, displayedImageIdentifier)) {
-    return;
-  }
-
-  _displayedImageIdentifier = displayedImageIdentifier;
-
-  // Delegateify.
-  // Note that we're using the params here instead of self.image and _displayedImageIdentifier because those can change before the async block below executes.
-  if (_delegateFlags.updatedImageDisplayFinish) {
-    if (ASDisplayNodeThreadIsMain())
-      [_delegate multiplexImageNode:self didDisplayUpdatedImage:image withIdentifier:displayedImageIdentifier];
-    else {
-      __weak __typeof__(self) weakSelf = self;
-      dispatch_async(dispatch_get_main_queue(), ^{
-        __typeof__(self) strongSelf = weakSelf;
-        if (!strongSelf)
-          return;
-        [strongSelf.delegate multiplexImageNode:strongSelf didDisplayUpdatedImage:image withIdentifier:displayedImageIdentifier];
-      });
-    }
-  }
-}
-
-- (void)_setDownloadIdentifier:(id)downloadIdentifier
-{
-  MutexLocker l(_downloadIdentifierLock);
-  if (ASObjectIsEqual(downloadIdentifier, _downloadIdentifier))
-    return;
-
-  if (_downloadIdentifier) {
-    [_downloader cancelImageDownloadForIdentifier:_downloadIdentifier];
-  }
-  _downloadIdentifier = downloadIdentifier;
-}
-
-#pragma mark - Image Loading Machinery
-
-- (void)_loadImageIdentifiers
-{
-  // Grab the best possible image we can load right now.
-  id bestImmediatelyAvailableImageIdentifier = nil;
-  UIImage *bestImmediatelyAvailableImage = [self _bestImmediatelyAvailableImageFromDataSource:&bestImmediatelyAvailableImageIdentifier];
-  as_log_verbose(ASImageLoadingLog(), "%@ Best immediately available image identifier is %@", self, bestImmediatelyAvailableImageIdentifier);
-
-  // Load it. This kicks off cache fetching/downloading, as appropriate.
-  [self _finishedLoadingImage:bestImmediatelyAvailableImage forIdentifier:bestImmediatelyAvailableImageIdentifier error:nil];
-}
-
-- (UIImage *)_bestImmediatelyAvailableImageFromDataSource:(id *)imageIdentifierOut
-{
-  MutexLocker l(_imageIdentifiersLock);
-
-  // If we don't have any identifiers to load or don't implement the image DS method, bail.
-  if ([_imageIdentifiers count] == 0 || !_dataSourceFlags.image) {
-    return nil;
-  }
-
-  // Grab the best available image from the data source.
-  UIImage *existingImage = self.image;
-  for (id imageIdentifier in _imageIdentifiers) {
-    // If this image is already loaded, don't request it from the data source again because
-    // the data source may generate a new instance of UIImage that returns NO for isEqual:
-    // and we'll end up in an infinite loading loop.
-    UIImage *image = ASObjectIsEqual(imageIdentifier, _loadedImageIdentifier) ? existingImage : [_dataSource multiplexImageNode:self imageForImageIdentifier:imageIdentifier];
-    if (image) {
-      if (imageIdentifierOut) {
-        *imageIdentifierOut = imageIdentifier;
-      }
-
-      return image;
-    }
-  }
-
-  return nil;
-}
-
-#pragma mark -
-
-- (void)_updatePriorityOnDownloaderIfNeededWithDefaultPriority:(ASImageDownloaderPriority)defaultPriority
-{
-  ASAssertUnlocked(_downloadIdentifierLock);
-
-  if (_downloaderFlags.downloaderImplementsSetPriority) {
-    // Read our interface state before locking so that we don't lock super while holding our lock.
-    ASInterfaceState interfaceState = self.interfaceState;
-    MutexLocker l(_downloadIdentifierLock);
-
-    if (_downloadIdentifier != nil) {
-      ASImageDownloaderPriority priority = defaultPriority;
-      if (ASActivateExperimentalFeature(ASExperimentalImageDownloaderPriority)) {
-        priority = ASImageDownloaderPriorityWithInterfaceState(interfaceState);
-      }
-
-      [_downloader setPriority:priority withDownloadIdentifier:_downloadIdentifier];
-    }
-  }
-}
-
-- (void)_updateProgressImageBlockOnDownloaderIfNeeded
-{
-  ASAssertUnlocked(_downloadIdentifierLock);
-
-  BOOL shouldRenderProgressImages = self.shouldRenderProgressImages;
-  
-  // Read our interface state before locking so that we don't lock super while holding our lock.
-  ASInterfaceState interfaceState = self.interfaceState;
-  MutexLocker l(_downloadIdentifierLock);
-  
-  if (!_downloaderFlags.downloaderImplementsSetProgress || _downloadIdentifier == nil) {
-    return;
-  }
-  
-  ASImageDownloaderProgressImage progress = nil;
-  if (shouldRenderProgressImages && ASInterfaceStateIncludesVisible(interfaceState)) {
-    __weak __typeof__(self) weakSelf = self;
-    progress = ^(UIImage * _Nonnull progressImage, CGFloat progress, id _Nullable downloadIdentifier) {
-      __typeof__(self) strongSelf = weakSelf;
-      if (strongSelf == nil) {
-        return;
-      }
-      
-      MutexLocker l(strongSelf->_downloadIdentifierLock);
-      //Getting a result back for a different download identifier, download must not have been successfully canceled
-      if (ASObjectIsEqual(strongSelf->_downloadIdentifier, downloadIdentifier) == NO && downloadIdentifier != nil) {
-        return;
-      }
-      [strongSelf _setImage:progressImage];
-    };
-  }
-  [_downloader setProgressImageBlock:progress callbackQueue:dispatch_get_main_queue() withDownloadIdentifier:_downloadIdentifier];
-}
-
-- (void)_clearImage
-{
-  // Destruction of bigger images on the main thread can be expensive
-  // and can take some time, so we dispatch onto a bg queue to
-  // actually dealloc.
-  UIImage *image = self.image;
-  CGSize imageSize = image.size;
-  BOOL shouldReleaseImageOnBackgroundThread = imageSize.width > kMinReleaseImageOnBackgroundSize.width ||
-  imageSize.height > kMinReleaseImageOnBackgroundSize.height;
-  [self _setImage:nil];
-  if (shouldReleaseImageOnBackgroundThread) {
-    ASPerformBackgroundDeallocation(&image);
-  }
-}
-
-#pragma mark -
-- (id)_nextImageIdentifierToDownload
-{
-  MutexLocker l(_imageIdentifiersLock);
-
-  // If we've already loaded the best identifier, we've got nothing else to do.
-  id bestImageIdentifier = _imageIdentifiers.firstObject;
-  if (!bestImageIdentifier || ASObjectIsEqual(_loadedImageIdentifier, bestImageIdentifier)) {
-    return nil;
-  }
-
-  id nextImageIdentifierToDownload = nil;
-
-  // If we're not supposed to download intermediate images, load the best identifier we've got.
-  if (!_downloadsIntermediateImages) {
-    nextImageIdentifierToDownload = bestImageIdentifier;
-  }
-  // Otherwise, load progressively.
-  else {
-    NSUInteger loadedIndex = [_imageIdentifiers indexOfObject:_loadedImageIdentifier];
-
-    // If nothing has loaded yet, load the worst identifier.
-    if (loadedIndex == NSNotFound) {
-      nextImageIdentifierToDownload = [_imageIdentifiers lastObject];
-    }
-    // Otherwise, load the next best identifier (if there is one)
-    else if (loadedIndex > 0) {
-      nextImageIdentifierToDownload = _imageIdentifiers[loadedIndex - 1];
-    }
-  }
-
-  return nextImageIdentifierToDownload;
-}
-
-- (void)_loadNextImage
-{
-  // Determine the next identifier to load (if any).
-  id nextImageIdentifier = [self _nextImageIdentifierToDownload];
-  if (!nextImageIdentifier) {
-    [self _finishedLoadingImage:nil forIdentifier:nil error:nil];
-    return;
-  }
-
-  as_activity_create_for_scope("Load next image for multiplex image node");
-  as_log_verbose(ASImageLoadingLog(), "Loading image for %@ ident: %@", self, nextImageIdentifier);
-  self.loadingImageIdentifier = nextImageIdentifier;
-
-  __weak __typeof__(self) weakSelf = self;
-  ASMultiplexImageLoadCompletionBlock finishedLoadingBlock = ^(UIImage *image, id imageIdentifier, NSError *error) {
-    __typeof__(self) strongSelf = weakSelf;
-    if (!strongSelf)
-      return;
-
-    // Only nil out the loading identifier if the loading identifier hasn't changed.
-    if (ASObjectIsEqual(strongSelf.loadingImageIdentifier, nextImageIdentifier)) {
-      strongSelf.loadingImageIdentifier = nil;
-    }
-    [strongSelf _finishedLoadingImage:image forIdentifier:imageIdentifier error:error];
-  };
-
-  // Ask our data-source if it's got this image.
-  if (_dataSourceFlags.image) {
-    UIImage *image = [_dataSource multiplexImageNode:self imageForImageIdentifier:nextImageIdentifier];
-    if (image) {
-      as_log_verbose(ASImageLoadingLog(), "Acquired image from data source for %@ ident: %@", self, nextImageIdentifier);
-      finishedLoadingBlock(image, nextImageIdentifier, nil);
-      return;
-    }
-  }
-
-  NSURL *nextImageURL = (_dataSourceFlags.URL) ? [_dataSource multiplexImageNode:self URLForImageIdentifier:nextImageIdentifier] : nil;
-  // If we fail to get a URL for the image, we have no source and can't proceed.
-  if (!nextImageURL) {
-    as_log_error(ASImageLoadingLog(), "Could not acquire URL %@ ident: (%@)", self, nextImageIdentifier);
-    finishedLoadingBlock(nil, nil, [NSError errorWithDomain:ASMultiplexImageNodeErrorDomain code:ASMultiplexImageNodeErrorCodeNoSourceForImage userInfo:nil]);
-    return;
-  }
-
-#if TARGET_OS_IOS && AS_USE_ASSETS_LIBRARY
-  // If it's an assets-library URL, we need to fetch it from the assets library.
-  if ([[nextImageURL scheme] isEqualToString:kAssetsLibraryURLScheme]) {
-    // Load the asset.
-    [self _loadALAssetWithIdentifier:nextImageIdentifier URL:nextImageURL completion:^(UIImage *downloadedImage, NSError *error) {
-      as_log_verbose(ASImageLoadingLog(), "Acquired image from assets library for %@ %@", weakSelf, nextImageIdentifier);
-      finishedLoadingBlock(downloadedImage, nextImageIdentifier, error);
-    }];
-    
-    return;
-  }
-#endif
-  
-#if AS_USE_PHOTOS
-  if (AS_AVAILABLE_IOS_TVOS(9, 10)) {
-    // Likewise, if it's a Photos asset, we need to fetch it accordingly.
-    if (ASPhotosFrameworkImageRequest *request = [ASPhotosFrameworkImageRequest requestWithURL:nextImageURL]) {
-      [self _loadPHAssetWithRequest:request identifier:nextImageIdentifier completion:^(UIImage *image, NSError *error) {
-        as_log_verbose(ASImageLoadingLog(), "Acquired image from Photos for %@ %@", weakSelf, nextImageIdentifier);
-        finishedLoadingBlock(image, nextImageIdentifier, error);
-      }];
-      
-      return;
-    }
-  }
-#endif
-  
-  // Otherwise, it's a web URL that we can download.
-  // First, check the cache.
-  [self _fetchImageWithIdentifierFromCache:nextImageIdentifier URL:nextImageURL completion:^(UIImage *imageFromCache) {
-    __typeof__(self) strongSelf = weakSelf;
-    if (!strongSelf)
-      return;
-    
-    // If we had a cache-hit, we're done.
-    if (imageFromCache) {
-      as_log_verbose(ASImageLoadingLog(), "Acquired image from cache for %@ id: %@ img: %@", strongSelf, nextImageIdentifier, imageFromCache);
-      finishedLoadingBlock(imageFromCache, nextImageIdentifier, nil);
-      return;
-    }
-    
-    // If the next image to load has changed, bail.
-    if (!ASObjectIsEqual([strongSelf _nextImageIdentifierToDownload], nextImageIdentifier)) {
-      finishedLoadingBlock(nil, nil, [NSError errorWithDomain:ASMultiplexImageNodeErrorDomain code:ASMultiplexImageNodeErrorCodeBestImageIdentifierChanged userInfo:nil]);
-      return;
-    }
-    
-    // Otherwise, we've got to download it.
-    [strongSelf _downloadImageWithIdentifier:nextImageIdentifier URL:nextImageURL completion:^(UIImage *downloadedImage, NSError *error) {
-      __typeof__(self) strongSelf = weakSelf;
-      if (downloadedImage) {
-        as_log_verbose(ASImageLoadingLog(), "Acquired image from download for %@ id: %@ img: %@", strongSelf, nextImageIdentifier, downloadedImage);
-      } else {
-        as_log_error(ASImageLoadingLog(), "Error downloading image for %@ id: %@ err: %@", strongSelf, nextImageIdentifier, error);
-      }
-      finishedLoadingBlock(downloadedImage, nextImageIdentifier, error);
-    }];
-  }];
-}
-#if TARGET_OS_IOS && AS_USE_ASSETS_LIBRARY
-- (void)_loadALAssetWithIdentifier:(id)imageIdentifier URL:(NSURL *)assetURL completion:(void (^)(UIImage *image, NSError *error))completionBlock
-{
-  ASDisplayNodeAssertNotNil(imageIdentifier, @"imageIdentifier is required");
-  ASDisplayNodeAssertNotNil(assetURL, @"assetURL is required");
-  ASDisplayNodeAssertNotNil(completionBlock, @"completionBlock is required");
-  
-  // ALAssetsLibrary was replaced in iOS 8 and deprecated in iOS 9.
-  // We'll drop support very soon.
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
-  ALAssetsLibrary *assetLibrary = [[ALAssetsLibrary alloc] init];
-
-  [assetLibrary assetForURL:assetURL resultBlock:^(ALAsset *asset) {
-    ALAssetRepresentation *representation = [asset defaultRepresentation];
-    CGImageRef coreGraphicsImage = [representation fullScreenImage];
-
-    UIImage *downloadedImage = (coreGraphicsImage ? [UIImage imageWithCGImage:coreGraphicsImage] : nil);
-    completionBlock(downloadedImage, nil);
-  } failureBlock:^(NSError *error) {
-    completionBlock(nil, error);
-  }];
-#pragma clang diagnostic pop
-}
-#endif
-
-#if AS_USE_PHOTOS
-- (void)_loadPHAssetWithRequest:(ASPhotosFrameworkImageRequest *)request identifier:(id)imageIdentifier completion:(void (^)(UIImage *image, NSError *error))completionBlock
-{
-  ASDisplayNodeAssertNotNil(imageIdentifier, @"imageIdentifier is required");
-  ASDisplayNodeAssertNotNil(request, @"request is required");
-  ASDisplayNodeAssertNotNil(completionBlock, @"completionBlock is required");
-  
-  /*
-   * Locking rationale:
-   * As of iOS 9, Photos.framework will eventually deadlock if you hit it with concurrent fetch requests. rdar://22984886
-   * Concurrent image requests are OK, but metadata requests aren't, so we limit ourselves to one at a time.
-   */
-  static NSLock *phRequestLock;
-  static NSOperationQueue *phImageRequestQueue;
-  static dispatch_once_t onceToken;
-  dispatch_once(&onceToken, ^{
-    phRequestLock = [NSLock new];
-    phImageRequestQueue = [NSOperationQueue new];
-    phImageRequestQueue.maxConcurrentOperationCount = 10;
-    phImageRequestQueue.name = @"org.AsyncDisplayKit.MultiplexImageNode.phImageRequestQueue";
-  });
-  
-  // Each ASMultiplexImageNode can have max 1 inflight Photos image request operation
-  [_phImageRequestOperation cancel];
-  
-  __weak __typeof(self) weakSelf = self;
-  NSOperation *newImageRequestOp = [NSBlockOperation blockOperationWithBlock:^{
-    __strong __typeof(weakSelf) strongSelf = weakSelf;
-    if (strongSelf == nil) { return; }
-    
-    PHAsset *imageAsset = nil;
-    
-    // Try to get the asset immediately from the data source.
-    if (_dataSourceFlags.asset) {
-      imageAsset = [strongSelf.dataSource multiplexImageNode:strongSelf assetForLocalIdentifier:request.assetIdentifier];
-    }
-    
-    // Fall back to locking and getting the PHAsset.
-    if (imageAsset == nil) {
-      [phRequestLock lock];
-      // -[PHFetchResult dealloc] plays a role in the deadlock mentioned above, so we make sure the PHFetchResult is deallocated inside the critical section
-      @autoreleasepool {
-        imageAsset = [PHAsset fetchAssetsWithLocalIdentifiers:@[request.assetIdentifier] options:nil].firstObject;
-      }
-      [phRequestLock unlock];
-    }
-    
-    if (imageAsset == nil) {
-      NSError *error = [NSError errorWithDomain:ASMultiplexImageNodeErrorDomain code:ASMultiplexImageNodeErrorCodePHAssetIsUnavailable userInfo:nil];
-      completionBlock(nil, error);
-      return;
-    }
-    
-    PHImageRequestOptions *options = [request.options copy];
-    
-    // We don't support opportunistic delivery – one request, one image.
-    if (options.deliveryMode == PHImageRequestOptionsDeliveryModeOpportunistic) {
-      options.deliveryMode = PHImageRequestOptionsDeliveryModeHighQualityFormat;
-    }
-    
-    if (options.deliveryMode == PHImageRequestOptionsDeliveryModeHighQualityFormat) {
-      // Without this flag the result will be delivered on the main queue, which is pointless
-      // But synchronous -> HighQualityFormat so we only use it if high quality format is specified
-      options.synchronous = YES;
-    }
-    
-    PHImageManager *imageManager = strongSelf.imageManager ? : PHImageManager.defaultManager;
-    [imageManager requestImageForAsset:imageAsset targetSize:request.targetSize contentMode:request.contentMode options:options resultHandler:^(UIImage *image, NSDictionary *info) {
-      NSError *error = info[PHImageErrorKey];
-      
-      if (error == nil && image == nil) {
-        error = [NSError errorWithDomain:ASMultiplexImageNodeErrorDomain code:ASMultiplexImageNodeErrorCodePhotosImageManagerFailedWithoutError userInfo:nil];
-      }
-      
-      if (NSThread.isMainThread) {
-        dispatch_async(dispatch_get_global_queue(QOS_CLASS_DEFAULT, 0), ^{
-          completionBlock(image, error);
-        });
-      } else {
-        completionBlock(image, error);
-      }
-    }];
-  }];
-  // If you don't set this, iOS will sometimes infer NSQualityOfServiceUserInteractive and promote the entire queue to that level, damaging system responsiveness
-  newImageRequestOp.qualityOfService = NSQualityOfServiceUserInitiated;
-  _phImageRequestOperation = newImageRequestOp;
-  [phImageRequestQueue addOperation:newImageRequestOp];
-}
-#endif
-
-- (void)_fetchImageWithIdentifierFromCache:(id)imageIdentifier URL:(NSURL *)imageURL completion:(void (^)(UIImage *image))completionBlock
-{
-  ASDisplayNodeAssertNotNil(imageIdentifier, @"imageIdentifier is required");
-  ASDisplayNodeAssertNotNil(imageURL, @"imageURL is required");
-  ASDisplayNodeAssertNotNil(completionBlock, @"completionBlock is required");
-
-  if (_cache) {
-    [_cache cachedImageWithURL:imageURL callbackQueue:dispatch_get_main_queue() completion:^(id <ASImageContainerProtocol> imageContainer) {
-      completionBlock([imageContainer asdk_image]);
-    }];
-  }
-  // If we don't have a cache, just fail immediately.
-  else {
-    completionBlock(nil);
-  }
-}
-
-- (void)_downloadImageWithIdentifier:(id)imageIdentifier URL:(NSURL *)imageURL completion:(void (^)(UIImage *image, NSError *error))completionBlock
-{
-  ASDisplayNodeAssertNotNil(imageIdentifier, @"imageIdentifier is required");
-  ASDisplayNodeAssertNotNil(imageURL, @"imageURL is required");
-  ASDisplayNodeAssertNotNil(completionBlock, @"completionBlock is required");
-
-  // Delegate (start)
-  if (_delegateFlags.downloadStart)
-    [_delegate multiplexImageNode:self didStartDownloadOfImageWithIdentifier:imageIdentifier];
-
-  __weak __typeof__(self) weakSelf = self;
-  ASImageDownloaderProgress downloadProgressBlock = NULL;
-  if (_delegateFlags.downloadProgress) {
-    downloadProgressBlock = ^(CGFloat progress) {
-      __typeof__(self) strongSelf = weakSelf;
-      if (!strongSelf)
-        return;
-      [strongSelf.delegate multiplexImageNode:strongSelf didUpdateDownloadProgress:progress forImageWithIdentifier:imageIdentifier];
-    };
-  }
-
-  ASImageDownloaderCompletion completion = ^(id <ASImageContainerProtocol> imageContainer, NSError *error, id downloadIdentifier, id userInfo) {
-    // We dereference iVars directly, so we can't have weakSelf going nil on us.
-    __typeof__(self) strongSelf = weakSelf;
-    if (!strongSelf)
-      return;
-
-    MutexLocker l(strongSelf->_downloadIdentifierLock);
-    //Getting a result back for a different download identifier, download must not have been successfully canceled
-    if (ASObjectIsEqual(strongSelf->_downloadIdentifier, downloadIdentifier) == NO && downloadIdentifier != nil) {
-      return;
-    }
-
-    completionBlock([imageContainer asdk_image], error);
-
-    // Delegateify.
-    if (strongSelf->_delegateFlags.downloadFinish)
-      [strongSelf->_delegate multiplexImageNode:weakSelf didFinishDownloadingImageWithIdentifier:imageIdentifier error:error];
-  };
-
-  // Download!
-  ASPerformBlockOnBackgroundThread(^{
-    __typeof__(self) strongSelf = weakSelf;
-    if (!strongSelf)
-      return;
-
-    dispatch_queue_t callbackQueue = dispatch_get_main_queue();
-
-    id downloadIdentifier;
-    if (strongSelf->_downloaderFlags.downloaderImplementsDownloadWithPriority
-        && ASActivateExperimentalFeature(ASExperimentalImageDownloaderPriority)) {
-
-      /*
-       Decide a priority based on the current interface state of this node.
-       It can happen that this method was called when the node entered preload state
-       but the interface state, at this point, tells us that the node is (going to be) visible,
-       If that's the case, we jump to a higher priority directly.
-       */
-      ASImageDownloaderPriority priority = ASImageDownloaderPriorityWithInterfaceState(strongSelf.interfaceState);
-      downloadIdentifier = [strongSelf->_downloader downloadImageWithURL:imageURL
-                                                                priority:priority
-                                                           callbackQueue:callbackQueue
-                                                        downloadProgress:downloadProgressBlock
-                                                              completion:completion];
-    } else {
-      /*
-       Kick off a download with default priority.
-       The actual "default" value is decided by the downloader.
-       ASBasicImageDownloader and ASPINRemoteImageDownloader both use ASImageDownloaderPriorityImminent
-       which is mapped to NSURLSessionTaskPriorityDefault.
-
-       This means that preload and display nodes use the same priority
-       and their requests are put into the same pool.
-       */
-      downloadIdentifier = [strongSelf->_downloader downloadImageWithURL:imageURL
-                                                           callbackQueue:callbackQueue
-                                                        downloadProgress:downloadProgressBlock
-                                                              completion:completion];
-    }
-
-    [strongSelf _setDownloadIdentifier:downloadIdentifier];
-    [strongSelf _updateProgressImageBlockOnDownloaderIfNeeded];
-  });
-}
-
-#pragma mark -
-- (void)_finishedLoadingImage:(UIImage *)image forIdentifier:(id)imageIdentifier error:(NSError *)error
-{
-  // If we failed to load, we stop the loading process.
-  // Note that if we bailed before we began downloading because the best identifier changed, we don't bail, but rather just begin loading the best image identifier.
-  if (error && !([error.domain isEqual:ASMultiplexImageNodeErrorDomain] && error.code == ASMultiplexImageNodeErrorCodeBestImageIdentifierChanged))
-    return;
-
-
-  _imageIdentifiersLock.lock();
-  NSUInteger imageIdentifierCount = [_imageIdentifiers count];
-  _imageIdentifiersLock.unlock();
-
-  // Update our image if we got one, or if we're not supposed to display one at all.
-  // We explicitly perform this check because our datasource often doesn't give back immediately available images, even though we might have downloaded one already.
-  // Because we seed this call with bestImmediatelyAvailableImageFromDataSource, we must be careful not to trample an existing image.
-  if (image || imageIdentifierCount == 0) {
-    as_log_verbose(ASImageLoadingLog(), "[%p] loaded -> displaying (%@, %@)", self, imageIdentifier, image);
-    id previousIdentifier = self.loadedImageIdentifier;
-    UIImage *previousImage = self.image;
-
-    self.loadedImageIdentifier = imageIdentifier;
-    [self _setImage:image];
-
-    if (_delegateFlags.updatedImage) {
-      [_delegate multiplexImageNode:self didUpdateImage:image withIdentifier:imageIdentifier fromImage:previousImage withIdentifier:previousIdentifier];
-    }
-
-  }
-
-  // Load our next image, if we have one to load.
-  if ([self _nextImageIdentifierToDownload])
-    [self _loadNextImage];
-}
-
-@end
-
-#if AS_USE_PHOTOS
-@implementation NSURL (ASPhotosFrameworkURLs)
-
-+ (NSURL *)URLWithAssetLocalIdentifier:(NSString *)assetLocalIdentifier targetSize:(CGSize)targetSize contentMode:(PHImageContentMode)contentMode options:(PHImageRequestOptions *)options NS_RETURNS_RETAINED
-{
-  ASPhotosFrameworkImageRequest *request = [[ASPhotosFrameworkImageRequest alloc] initWithAssetIdentifier:assetLocalIdentifier];
-  request.options = options;
-  request.contentMode = contentMode;
-  request.targetSize = targetSize;
-  return request.url;
-}
-
-@end
-#endif
-#endif
diff --git a/submodules/AsyncDisplayKit/Source/ASNavigationController.h b/submodules/AsyncDisplayKit/Source/ASNavigationController.h
deleted file mode 100644
index 4f7ac12df4..0000000000
--- a/submodules/AsyncDisplayKit/Source/ASNavigationController.h
+++ /dev/null
@@ -1,34 +0,0 @@
-//
-//  ASNavigationController.h
-//  Texture
-//
-//  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.
-//  Changes after 4/13/2017 are: Copyright (c) Pinterest, Inc.  All rights reserved.
-//  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
-//
-
-#ifndef MINIMAL_ASDK
-
-#import <UIKit/UIKit.h>
-
-#import <AsyncDisplayKit/ASVisibilityProtocols.h>
-
-NS_ASSUME_NONNULL_BEGIN
-
-/**
- * ASNavigationController
- *
- * @discussion ASNavigationController is a drop in replacement for UINavigationController
- * which improves memory efficiency by implementing the @c ASManagesChildVisibilityDepth protocol.
- * You can use ASNavigationController with regular UIViewControllers, as well as ASViewControllers. 
- * It is safe to subclass or use even where AsyncDisplayKit is not adopted.
- *
- * @see ASManagesChildVisibilityDepth
- */
-@interface ASNavigationController : UINavigationController <ASManagesChildVisibilityDepth>
-
-@end
-
-NS_ASSUME_NONNULL_END
-
-#endif
diff --git a/submodules/AsyncDisplayKit/Source/ASNavigationController.mm b/submodules/AsyncDisplayKit/Source/ASNavigationController.mm
deleted file mode 100644
index c92ddd7d27..0000000000
--- a/submodules/AsyncDisplayKit/Source/ASNavigationController.mm
+++ /dev/null
@@ -1,115 +0,0 @@
-//
-//  ASNavigationController.mm
-//  Texture
-//
-//  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.
-//  Changes after 4/13/2017 are: Copyright (c) Pinterest, Inc.  All rights reserved.
-//  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
-//
-#ifndef MINIMAL_ASDK
-#import <AsyncDisplayKit/ASNavigationController.h>
-#import <AsyncDisplayKit/ASLog.h>
-#import <AsyncDisplayKit/ASObjectDescriptionHelpers.h>
-
-@implementation ASNavigationController
-{
-  BOOL _parentManagesVisibilityDepth;
-  NSInteger _visibilityDepth;
-}
-
-ASVisibilityDidMoveToParentViewController;
-
-ASVisibilityViewWillAppear;
-
-ASVisibilityViewDidDisappearImplementation;
-
-ASVisibilitySetVisibilityDepth;
-
-ASVisibilityDepthImplementation;
-
-- (void)visibilityDepthDidChange
-{
-  for (UIViewController *viewController in self.viewControllers) {
-    if ([viewController conformsToProtocol:@protocol(ASVisibilityDepth)]) {
-      [(id <ASVisibilityDepth>)viewController visibilityDepthDidChange];
-    }
-  }
-}
-
-- (NSInteger)visibilityDepthOfChildViewController:(UIViewController *)childViewController
-{
-  NSUInteger viewControllerIndex = [self.viewControllers indexOfObjectIdenticalTo:childViewController];
-  if (viewControllerIndex == NSNotFound) {
-    //If childViewController is not actually a child, return NSNotFound which is also a really large number.
-    return NSNotFound;
-  }
-  
-  if (viewControllerIndex == self.viewControllers.count - 1) {
-    //view controller is at the top, just return our own visibility depth.
-    return [self visibilityDepth];
-  } else if (viewControllerIndex == 0) {
-    //view controller is the root view controller. Can be accessed by holding the back button.
-    return [self visibilityDepth] + 1;
-  }
-  
-  return [self visibilityDepth] + self.viewControllers.count - 1 - viewControllerIndex;
-}
-
-#pragma mark - UIKit overrides
-
-- (NSArray *)popToViewController:(UIViewController *)viewController animated:(BOOL)animated
-{
-  as_activity_create_for_scope("Pop multiple from ASNavigationController");
-  NSArray *viewControllers = [super popToViewController:viewController animated:animated];
-  as_log_info(ASNodeLog(), "Popped %@ to %@, removing %@", self, viewController, ASGetDescriptionValueString(viewControllers));
-
-  [self visibilityDepthDidChange];
-  return viewControllers;
-}
-
-- (NSArray *)popToRootViewControllerAnimated:(BOOL)animated
-{
-  as_activity_create_for_scope("Pop to root of ASNavigationController");
-  NSArray *viewControllers = [super popToRootViewControllerAnimated:animated];
-  as_log_info(ASNodeLog(), "Popped view controllers %@ from %@", ASGetDescriptionValueString(viewControllers), self);
-
-  [self visibilityDepthDidChange];
-  return viewControllers;
-}
-
-- (void)setViewControllers:(NSArray *)viewControllers
-{
-  // NOTE: As of now this method calls through to setViewControllers:animated: so no need to log/activity here.
-  
-  [super setViewControllers:viewControllers];
-  [self visibilityDepthDidChange];
-}
-
-- (void)setViewControllers:(NSArray *)viewControllers animated:(BOOL)animated
-{
-  as_activity_create_for_scope("Set view controllers of ASNavigationController");
-  as_log_info(ASNodeLog(), "Set view controllers of %@ to %@ animated: %d", self, ASGetDescriptionValueString(viewControllers), animated);
-  [super setViewControllers:viewControllers animated:animated];
-  [self visibilityDepthDidChange];
-}
-
-- (void)pushViewController:(UIViewController *)viewController animated:(BOOL)animated
-{
-  as_activity_create_for_scope("Push view controller on ASNavigationController");
-  as_log_info(ASNodeLog(), "Pushing %@ onto %@", viewController, self);
-  [super pushViewController:viewController animated:animated];
-  [self visibilityDepthDidChange];
-}
-
-- (UIViewController *)popViewControllerAnimated:(BOOL)animated
-{
-  as_activity_create_for_scope("Pop view controller from ASNavigationController");
-  UIViewController *viewController = [super popViewControllerAnimated:animated];
-  as_log_info(ASNodeLog(), "Popped %@ from %@", viewController, self);
-  [self visibilityDepthDidChange];
-  return viewController;
-}
-
-@end
-
-#endif
diff --git a/submodules/AsyncDisplayKit/Source/ASNetworkImageLoadInfo.h b/submodules/AsyncDisplayKit/Source/ASNetworkImageLoadInfo.h
deleted file mode 100644
index 55c4b49a7a..0000000000
--- a/submodules/AsyncDisplayKit/Source/ASNetworkImageLoadInfo.h
+++ /dev/null
@@ -1,39 +0,0 @@
-//
-//  ASNetworkImageLoadInfo.h
-//  Texture
-//
-//  Copyright (c) Pinterest, Inc.  All rights reserved.
-//  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
-//
-
-#import <Foundation/Foundation.h>
-#import <AsyncDisplayKit/ASBaseDefines.h>
-
-NS_ASSUME_NONNULL_BEGIN
-
-typedef NS_ENUM(NSInteger, ASNetworkImageSourceType) {
-  ASNetworkImageSourceUnspecified = 0,
-  ASNetworkImageSourceSynchronousCache,
-  ASNetworkImageSourceAsynchronousCache,
-  ASNetworkImageSourceFileURL,
-  ASNetworkImageSourceDownload,
-};
-
-AS_SUBCLASSING_RESTRICTED
-@interface ASNetworkImageLoadInfo : NSObject <NSCopying>
-
-/// The type of source from which the image was loaded.
-@property (readonly) ASNetworkImageSourceType sourceType;
-
-/// The image URL that was downloaded.
-@property (readonly) NSURL *url;
-
-/// The download identifier, if one was provided.
-@property (nullable, readonly) id downloadIdentifier;
-
-/// The userInfo object provided by the downloader, if one was provided.
-@property (nullable, readonly) id userInfo;
-
-@end
-
-NS_ASSUME_NONNULL_END
diff --git a/submodules/AsyncDisplayKit/Source/ASNetworkImageLoadInfo.mm b/submodules/AsyncDisplayKit/Source/ASNetworkImageLoadInfo.mm
deleted file mode 100644
index 4c3d553e74..0000000000
--- a/submodules/AsyncDisplayKit/Source/ASNetworkImageLoadInfo.mm
+++ /dev/null
@@ -1,32 +0,0 @@
-//
-//  ASNetworkImageLoadInfo.mm
-//  Texture
-//
-//  Copyright (c) Pinterest, Inc.  All rights reserved.
-//  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
-//
-
-#import <AsyncDisplayKit/ASNetworkImageLoadInfo.h>
-#import <AsyncDisplayKit/ASNetworkImageLoadInfo+Private.h>
-
-@implementation ASNetworkImageLoadInfo
-
-- (instancetype)initWithURL:(NSURL *)url sourceType:(ASNetworkImageSourceType)sourceType downloadIdentifier:(id)downloadIdentifier userInfo:(id)userInfo
-{
-  if (self = [super init]) {
-    _url = [url copy];
-    _sourceType = sourceType;
-    _downloadIdentifier = downloadIdentifier;
-    _userInfo = userInfo;
-  }
-  return self;
-}
-
-#pragma mark - NSCopying
-
-- (id)copyWithZone:(NSZone *)zone
-{
-  return self;
-}
-
-@end
diff --git a/submodules/AsyncDisplayKit/Source/ASNetworkImageNode.h b/submodules/AsyncDisplayKit/Source/ASNetworkImageNode.h
deleted file mode 100644
index f67826e86c..0000000000
--- a/submodules/AsyncDisplayKit/Source/ASNetworkImageNode.h
+++ /dev/null
@@ -1,241 +0,0 @@
-//
-//  ASNetworkImageNode.h
-//  Texture
-//
-//  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.
-//  Changes after 4/13/2017 are: Copyright (c) Pinterest, Inc.  All rights reserved.
-//  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
-//
-
-#ifndef MINIMAL_ASDK
-
-#import <AsyncDisplayKit/ASImageNode.h>
-
-NS_ASSUME_NONNULL_BEGIN
-
-@protocol ASNetworkImageNodeDelegate, ASImageCacheProtocol, ASImageDownloaderProtocol;
-@class ASNetworkImageLoadInfo;
-
-
-/**
- * ASNetworkImageNode is a simple image node that can download and display an image from the network, with support for a
- * placeholder image (<defaultImage>).  The currently-displayed image is always available in the inherited ASImageNode
- * <image> property.
- *
- * @see ASMultiplexImageNode for a more powerful counterpart to this class.
- */
-@interface ASNetworkImageNode : ASImageNode
-
-/**
- * The designated initializer. Cache and Downloader are WEAK references.
- *
- * @param cache The object that implements a cache of images for the image node.  Weak reference.
- * @param downloader The object that implements image downloading for the image node.  Must not be nil.  Weak reference.
- *
- * @discussion If `cache` is nil, the receiver will not attempt to retrieve images from a cache before downloading them.
- *
- * @return An initialized ASNetworkImageNode.
- */
-- (instancetype)initWithCache:(nullable id<ASImageCacheProtocol>)cache downloader:(id<ASImageDownloaderProtocol>)downloader NS_DESIGNATED_INITIALIZER;
-
-/**
- * Convenience initializer.
- *
- * @return An ASNetworkImageNode configured to use the NSURLSession-powered ASBasicImageDownloader, and no extra cache.
- */
-- (instancetype)init;
-
-/**
- * The delegate, which must conform to the <ASNetworkImageNodeDelegate> protocol.
- */
-@property (nullable, weak) id<ASNetworkImageNodeDelegate> delegate;
-
-/**
- * The delegate will receive callbacks on main thread. Default to YES.
- */
-@property (class) BOOL useMainThreadDelegateCallbacks;
-
-/**
- * The image to display.
- *
- * @discussion By setting an image to the image property the ASNetworkImageNode will act like a plain ASImageNode.
- * As soon as the URL is set the ASNetworkImageNode will act like an ASNetworkImageNode and the image property
- * will be managed internally. This means the image property will be cleared out and replaced by the placeholder 
- * (<defaultImage>) image while loading and the final image after the new image data was downloaded and processed.
- * If you want to use a placholder image functionality use the defaultImage property instead.
- */
-@property (nullable) UIImage *image;
-
-/**
- * A placeholder image to display while the URL is loading. This is slightly different than placeholderImage in the
- * ASDisplayNode superclass as defaultImage will *not* be displayed synchronously. If you wish to have the image
- * displayed synchronously, use @c placeholderImage.
- */
-@property (nullable) UIImage *defaultImage;
-
-/**
- * The URL of a new image to download and display.
- *
- * @discussion By setting an URL, the image property of this node will be managed internally. This means previously
- * directly set images to the image property will be cleared out and replaced by the placeholder (<defaultImage>) image
- * while loading and the final image after the new image data was downloaded and processed.
- */
-@property (nullable, copy) NSURL *URL;
-
-/**
-  * An array of URLs of increasing cost to download.
-  *
-  * @discussion By setting an array of URLs, the image property of this node will be managed internally. This means previously
-  * directly set images to the image property will be cleared out and replaced by the placeholder (<defaultImage>) image
-  * while loading and the final image after the new image data was downloaded and processed.
-  *
-  * @deprecated This API has been removed for now due to the increased complexity to the class that it brought.
-  * Please use .URL instead.
-  */
-@property (nullable, copy) NSArray <NSURL *> *URLs ASDISPLAYNODE_DEPRECATED_MSG("Please use URL instead.");
-
-/**
- * Download and display a new image.
- *
- * @param URL The URL of a new image to download and display.
- * @param reset Whether to display a placeholder (<defaultImage>) while loading the new image.
- *
- * @discussion By setting an URL, the image property of this node will be managed internally. This means previously
- * directly set images to the image property will be cleared out and replaced by the placeholder (<defaultImage>) image
- * while loading and the final image after the new image data was downloaded and processed.
- */
-- (void)setURL:(nullable NSURL *)URL resetToDefault:(BOOL)reset;
-
-/**
- * If <URL> is a local file, set this property to YES to take advantage of UIKit's image caching.  Defaults to YES.
- */
-@property BOOL shouldCacheImage;
-
-/**
- * If the downloader implements progressive image rendering and this value is YES progressive renders of the
- * image will be displayed as the image downloads. Regardless of this properties value, progress renders will
- * only occur when the node is visible. Defaults to YES.
- */
-@property BOOL shouldRenderProgressImages;
-
-/**
- * The image quality of the current image.
- *
- * If the URL is set, this is a number between 0 and 1 and can be used to track
- * progressive progress. Calculated by dividing number of bytes / expected number of total bytes.
- * This is zero until the first progressive render or the final display.
- *
- * If the URL is unset, this is 1 if defaultImage or image is set to non-nil.
- *
- */
-@property (readonly) CGFloat currentImageQuality;
-
-/**
- * The currentImageQuality (value between 0 and 1) of the last image that completed displaying.
- */
-@property (readonly) CGFloat renderedImageQuality;
-
-@end
-
-
-#pragma mark -
-
-/**
- * The methods declared by the ASNetworkImageNodeDelegate protocol allow the adopting delegate to respond to
- * notifications such as finished decoding and downloading an image.
- */
-@protocol ASNetworkImageNodeDelegate <NSObject>
-@optional
-
-/**
- * Notification that the image node started to load
- *
- * @param imageNode The sender.
- *
- * @discussion Called on the main thread.
- */
-- (void)imageNodeDidStartFetchingData:(ASNetworkImageNode *)imageNode;
-
-/**
- * Notification that the image node will load image from cache
- *
- * @param imageNode The sender.
- *
- * @discussion Called on the main thread.
- */
-- (void)imageNodeWillLoadImageFromCache:(ASNetworkImageNode *)imageNode;
-
-/**
- * Notification that the image node finished loading image from cache
- *
- * @param imageNode The sender.
- *
- * @discussion Called on the main thread.
- */
-- (void)imageNodeDidLoadImageFromCache:(ASNetworkImageNode *)imageNode;
-
-/**
- * Notification that the image node will load image from network
- *
- * @param imageNode The sender.
- *
- * @discussion Called on the main thread.
- */
-- (void)imageNodeWillLoadImageFromNetwork:(ASNetworkImageNode *)imageNode;
-
-/**
- * Notification that the image node will start display
- *
- * @param imageNode The sender.
- *
- * @discussion Called on the main thread.
- */
-- (void)imageNodeWillStartDisplayAsynchronously:(ASNetworkImageNode *)imageNode;
-
-/**
- * Notification that the image node finished downloading an image, with additional info.
- * If implemented, this method will be called instead of `imageNode:didLoadImage:`.
- *
- * @param imageNode The sender.
- * @param image The newly-loaded image.
- * @param info Additional information about the image load.
- *
- * @discussion Called on the main thread if useMainThreadDelegateCallbacks=YES (the default), otherwise on a background thread.
- */
-- (void)imageNode:(ASNetworkImageNode *)imageNode didLoadImage:(UIImage *)image info:(ASNetworkImageLoadInfo *)info;
-
-/**
- * Notification that the image node finished downloading an image.
- *
- * @param imageNode The sender.
- * @param image The newly-loaded image.
- *
- * @discussion Called on the main thread if useMainThreadDelegateCallbacks=YES (the default), otherwise on a background thread.
- */
-- (void)imageNode:(ASNetworkImageNode *)imageNode didLoadImage:(UIImage *)image;
-
-/**
- * Notification that the image node failed to download the image.
- *
- * @param imageNode The sender.
- * @param error The error with details.
- *
- * @discussion Called on the main thread if useMainThreadDelegateCallbacks=YES (the default), otherwise on a background thread.
- */
-- (void)imageNode:(ASNetworkImageNode *)imageNode didFailWithError:(NSError *)error;
-
-/**
- * Notification that the image node finished decoding an image.
- *
- * @param imageNode The sender.
- *
- * @discussion Called on the main thread.
- */
-- (void)imageNodeDidFinishDecoding:(ASNetworkImageNode *)imageNode;
-
-
-@end
-
-NS_ASSUME_NONNULL_END
-
-#endif
diff --git a/submodules/AsyncDisplayKit/Source/ASNetworkImageNode.mm b/submodules/AsyncDisplayKit/Source/ASNetworkImageNode.mm
deleted file mode 100644
index 29a600d8e8..0000000000
--- a/submodules/AsyncDisplayKit/Source/ASNetworkImageNode.mm
+++ /dev/null
@@ -1,892 +0,0 @@
-//
-//  ASNetworkImageNode.mm
-//  Texture
-//
-//  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.
-//  Changes after 4/13/2017 are: Copyright (c) Pinterest, Inc.  All rights reserved.
-//  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
-//
-
-#ifndef MINIMAL_ASDK
-#import <AsyncDisplayKit/ASNetworkImageNode.h>
-
-#import <AsyncDisplayKit/ASAvailability.h>
-#import <AsyncDisplayKit/ASBasicImageDownloader.h>
-#import <AsyncDisplayKit/ASDisplayNodeExtras.h>
-#import <AsyncDisplayKit/ASDisplayNodeInternal.h>
-#import <AsyncDisplayKit/ASDisplayNode+FrameworkPrivate.h>
-#import <AsyncDisplayKit/ASDisplayNode+Subclasses.h>
-#import <AsyncDisplayKit/ASEqualityHelpers.h>
-#import <AsyncDisplayKit/ASInternalHelpers.h>
-#import <AsyncDisplayKit/ASImageNode+Private.h>
-#import <AsyncDisplayKit/ASImageNode+AnimatedImagePrivate.h>
-#import <AsyncDisplayKit/ASImageContainerProtocolCategories.h>
-#import <AsyncDisplayKit/ASLog.h>
-#import <AsyncDisplayKit/ASNetworkImageLoadInfo+Private.h>
-
-#import <atomic>
-
-#if AS_PIN_REMOTE_IMAGE
-#import <AsyncDisplayKit/ASPINRemoteImageDownloader.h>
-#endif
-
-@interface ASNetworkImageNode ()
-{
-  // Only access any of these while locked.
-  __weak id<ASNetworkImageNodeDelegate> _delegate;
-
-  NSURL *_URL;
-  UIImage *_defaultImage;
-
-  NSInteger _cacheSentinel;
-  id _downloadIdentifier;
-  // The download identifier that we have set a progress block on, if any.
-  id _downloadIdentifierForProgressBlock;
-
-  BOOL _imageLoaded;
-  BOOL _imageWasSetExternally;
-  CGFloat _currentImageQuality;
-  CGFloat _renderedImageQuality;
-  BOOL _shouldRenderProgressImages;
-
-  struct {
-    unsigned int delegateWillStartDisplayAsynchronously:1;
-    unsigned int delegateWillLoadImageFromCache:1;
-    unsigned int delegateWillLoadImageFromNetwork:1;
-    unsigned int delegateDidStartFetchingData:1;
-    unsigned int delegateDidFailWithError:1;
-    unsigned int delegateDidFinishDecoding:1;
-    unsigned int delegateDidLoadImage:1;
-    unsigned int delegateDidLoadImageFromCache:1;
-    unsigned int delegateDidLoadImageWithInfo:1;
-  } _delegateFlags;
-
-  
-  // Immutable and set on init only. We don't need to lock in this case.
-  __weak id<ASImageDownloaderProtocol> _downloader;
-  struct {
-    unsigned int downloaderImplementsSetProgress:1;
-    unsigned int downloaderImplementsSetPriority:1;
-    unsigned int downloaderImplementsAnimatedImage:1;
-    unsigned int downloaderImplementsCancelWithResume:1;
-    unsigned int downloaderImplementsDownloadWithPriority:1;
-  } _downloaderFlags;
-
-  // Immutable and set on init only. We don't need to lock in this case.
-  __weak id<ASImageCacheProtocol> _cache;
-  struct {
-    unsigned int cacheSupportsClearing:1;
-    unsigned int cacheSupportsSynchronousFetch:1;
-  } _cacheFlags;
-}
-
-@end
-
-@implementation ASNetworkImageNode
-
-static std::atomic_bool _useMainThreadDelegateCallbacks(true);
-
-@dynamic image;
-
-- (instancetype)initWithCache:(id<ASImageCacheProtocol>)cache downloader:(id<ASImageDownloaderProtocol>)downloader
-{
-  if (!(self = [super init]))
-    return nil;
-
-  _cache = (id<ASImageCacheProtocol>)cache;
-  _downloader = (id<ASImageDownloaderProtocol>)downloader;
-  
-  _downloaderFlags.downloaderImplementsSetProgress = [downloader respondsToSelector:@selector(setProgressImageBlock:callbackQueue:withDownloadIdentifier:)];
-  _downloaderFlags.downloaderImplementsSetPriority = [downloader respondsToSelector:@selector(setPriority:withDownloadIdentifier:)];
-  _downloaderFlags.downloaderImplementsAnimatedImage = [downloader respondsToSelector:@selector(animatedImageWithData:)];
-  _downloaderFlags.downloaderImplementsCancelWithResume = [downloader respondsToSelector:@selector(cancelImageDownloadWithResumePossibilityForIdentifier:)];
-  _downloaderFlags.downloaderImplementsDownloadWithPriority = [downloader respondsToSelector:@selector(downloadImageWithURL:priority:callbackQueue:downloadProgress:completion:)];
-
-  _cacheFlags.cacheSupportsClearing = [cache respondsToSelector:@selector(clearFetchedImageFromCacheWithURL:)];
-  _cacheFlags.cacheSupportsSynchronousFetch = [cache respondsToSelector:@selector(synchronouslyFetchedCachedImageWithURL:)];
-  
-  _shouldCacheImage = YES;
-  _shouldRenderProgressImages = YES;
-  self.shouldBypassEnsureDisplay = YES;
-
-  return self;
-}
-
-- (instancetype)init
-{
-#if AS_PIN_REMOTE_IMAGE
-  return [self initWithCache:[ASPINRemoteImageDownloader sharedDownloader] downloader:[ASPINRemoteImageDownloader sharedDownloader]];
-#else
-  return [self initWithCache:nil downloader:[ASBasicImageDownloader sharedImageDownloader]];
-#endif
-}
-
-- (void)dealloc
-{
-  [self _cancelImageDownloadWithResumePossibility:NO];
-}
-
-- (dispatch_queue_t)callbackQueue
-{
-  return dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0);
-}
-
-#pragma mark - Public methods -- must lock
-
-/// Setter for public image property. It has the side effect of setting an internal _imageWasSetExternally that prevents setting an image internally. Setting an image internally should happen with the _setImage: method
-- (void)setImage:(UIImage *)image
-{
-  ASLockScopeSelf();
-  [self _locked_setImage:image];
-}
-
-- (void)_locked_setImage:(UIImage *)image
-{
-  ASAssertLocked(__instanceLock__);
-  
-  BOOL imageWasSetExternally = (image != nil);
-  BOOL shouldCancelAndClear = imageWasSetExternally && (imageWasSetExternally != _imageWasSetExternally);
-  _imageWasSetExternally = imageWasSetExternally;
-  if (shouldCancelAndClear) {
-    ASDisplayNodeAssertNil(_URL, @"Directly setting an image on an ASNetworkImageNode causes it to behave like an ASImageNode instead of an ASNetworkImageNode. If this is what you want, set the URL to nil first.");
-    _URL = nil;
-    [self _locked_cancelDownloadAndClearImageWithResumePossibility:NO];
-  }
-  
-  // If our image is being set externally, the image quality is 100%
-  if (imageWasSetExternally) {
-    [self _setCurrentImageQuality:1.0];
-  }
-  
-  [self _locked__setImage:image];
-}
-
-/// Setter for private image property. See @c _locked_setImage why this is needed
-- (void)_setImage:(UIImage *)image
-{
-  ASLockScopeSelf();
-  [self _locked__setImage:image];
-}
-
-- (void)_locked__setImage:(UIImage *)image
-{
-  ASAssertLocked(__instanceLock__);
-  [super _locked_setImage:image];
-}
-
-// Deprecated
-- (void)setURLs:(NSArray<NSURL *> *)URLs
-{
-  [self setURL:[URLs firstObject]];
-}
-
-// Deprecated
-- (NSArray<NSURL *> *)URLs
-{
-  return @[self.URL];
-}
-
-- (void)setURL:(NSURL *)URL
-{
-  [self setURL:URL resetToDefault:YES];
-}
-
-- (void)setURL:(NSURL *)URL resetToDefault:(BOOL)reset
-{
-  {
-    ASLockScopeSelf();
-    
-    if (ASObjectIsEqual(URL, _URL)) {
-      return;
-    }
-    
-    URL = [URL copy];
-    
-    ASDisplayNodeAssert(_imageWasSetExternally == NO, @"Setting a URL to an ASNetworkImageNode after setting an image changes its behavior from an ASImageNode to an ASNetworkImageNode. If this is what you want, set the image to nil first.");
-    
-    _imageWasSetExternally = NO;
-    
-    [self _locked_cancelImageDownloadWithResumePossibility:NO];
-
-    _imageLoaded = NO;
-    
-    _URL = URL;
-    
-    // If URL is nil and URL was not equal to _URL (checked at the top), then we previously had a URL but it's been nil'd out.
-    BOOL hadURL = (URL == nil);
-    if (reset || hadURL) {
-      [self _setCurrentImageQuality:(hadURL ? 0.0 : 1.0)];
-      [self _locked__setImage:_defaultImage];
-    }
-  }
-
-  [self setNeedsPreload];
-}
-
-- (NSURL *)URL
-{
-  return ASLockedSelf(_URL);
-}
-
-- (void)setDefaultImage:(UIImage *)defaultImage
-{
-  ASLockScopeSelf();
-
-  [self _locked_setDefaultImage:defaultImage];
-}
-
-- (void)_locked_setDefaultImage:(UIImage *)defaultImage
-{
-  if (ASObjectIsEqual(defaultImage, _defaultImage)) {
-    return;
-  }
-
-  _defaultImage = defaultImage;
-
-  if (!_imageLoaded) {
-    [self _setCurrentImageQuality:((_URL == nil) ? 0.0 : 1.0)];
-    [self _locked__setImage:defaultImage];
-  }
-}
-
-- (UIImage *)defaultImage
-{
-  return ASLockedSelf(_defaultImage);
-}
-
-- (void)setCurrentImageQuality:(CGFloat)currentImageQuality
-{
-  ASLockScopeSelf();
-  _currentImageQuality = currentImageQuality;
-}
-
-- (CGFloat)currentImageQuality
-{
-  return ASLockedSelf(_currentImageQuality);
-}
-
-/**
- * Always use these methods internally to update the current image quality
- * We want to maintain the order that currentImageQuality is set regardless of the calling thread,
- * so we always have to dispatch to the main thread to ensure that we queue the operations in the correct order.
- * (see comment in displayDidFinish)
- */
-- (void)_setCurrentImageQuality:(CGFloat)imageQuality
-{
-  dispatch_async(dispatch_get_main_queue(), ^{
-    self.currentImageQuality = imageQuality;
-  });
-}
-
-- (void)setRenderedImageQuality:(CGFloat)renderedImageQuality
-{
-  ASLockScopeSelf();
-  _renderedImageQuality = renderedImageQuality;
-}
-
-- (CGFloat)renderedImageQuality
-{
-  ASLockScopeSelf();
-  return _renderedImageQuality;
-}
-
-- (void)setDelegate:(id<ASNetworkImageNodeDelegate>)delegate
-{
-  ASLockScopeSelf();
-  _delegate = delegate;
-  
-  _delegateFlags.delegateWillStartDisplayAsynchronously = [delegate respondsToSelector:@selector(imageNodeWillStartDisplayAsynchronously:)];
-  _delegateFlags.delegateWillLoadImageFromCache = [delegate respondsToSelector:@selector(imageNodeWillLoadImageFromCache:)];
-  _delegateFlags.delegateWillLoadImageFromNetwork = [delegate respondsToSelector:@selector(imageNodeWillLoadImageFromNetwork:)];
-  _delegateFlags.delegateDidStartFetchingData = [delegate respondsToSelector:@selector(imageNodeDidStartFetchingData:)];
-  _delegateFlags.delegateDidFailWithError = [delegate respondsToSelector:@selector(imageNode:didFailWithError:)];
-  _delegateFlags.delegateDidFinishDecoding = [delegate respondsToSelector:@selector(imageNodeDidFinishDecoding:)];
-  _delegateFlags.delegateDidLoadImage = [delegate respondsToSelector:@selector(imageNode:didLoadImage:)];
-  _delegateFlags.delegateDidLoadImageFromCache = [delegate respondsToSelector:@selector(imageNodeDidLoadImageFromCache:)];
-  _delegateFlags.delegateDidLoadImageWithInfo = [delegate respondsToSelector:@selector(imageNode:didLoadImage:info:)];
-}
-
-- (id<ASNetworkImageNodeDelegate>)delegate
-{
-  ASLockScopeSelf();
-  return _delegate;
-}
-
-- (void)setShouldRenderProgressImages:(BOOL)shouldRenderProgressImages
-{
-  if (ASLockedSelfCompareAssign(_shouldRenderProgressImages, shouldRenderProgressImages)) {
-    [self _updateProgressImageBlockOnDownloaderIfNeeded];
-  }
-}
-
-- (BOOL)shouldRenderProgressImages
-{
-  ASLockScopeSelf();
-  return _shouldRenderProgressImages;
-}
-
-- (BOOL)placeholderShouldPersist
-{
-  ASLockScopeSelf();
-  return (self.image == nil && self.animatedImage == nil && _URL != nil);
-}
-
-/* displayWillStartAsynchronously: in ASMultiplexImageNode has a very similar implementation. Changes here are likely necessary
- in ASMultiplexImageNode as well. */
-- (void)displayWillStartAsynchronously:(BOOL)asynchronously
-{
-  [super displayWillStartAsynchronously:asynchronously];
-  
-  id<ASNetworkImageNodeDelegate> delegate;
-  BOOL notifyDelegate;
-  {
-    ASLockScopeSelf();
-    notifyDelegate = _delegateFlags.delegateWillStartDisplayAsynchronously;
-    delegate = _delegate;
-  }
-  if (notifyDelegate) {
-    [delegate imageNodeWillStartDisplayAsynchronously:self];
-  }
-  
-  if (asynchronously == NO && _cacheFlags.cacheSupportsSynchronousFetch) {
-    ASLockScopeSelf();
-
-    NSURL *url = _URL;
-    if (_imageLoaded == NO && url && _downloadIdentifier == nil) {
-      UIImage *result = [[_cache synchronouslyFetchedCachedImageWithURL:url] asdk_image];
-      if (result) {
-        [self _setCurrentImageQuality:1.0];
-        [self _locked__setImage:result];
-        _imageLoaded = YES;
-        
-        // Call out to the delegate.
-        if (_delegateFlags.delegateDidLoadImageWithInfo) {
-          ASUnlockScope(self);
-          const auto info = [[ASNetworkImageLoadInfo alloc] initWithURL:url sourceType:ASNetworkImageSourceSynchronousCache downloadIdentifier:nil userInfo:nil];
-          [delegate imageNode:self didLoadImage:result info:info];
-        } else if (_delegateFlags.delegateDidLoadImage) {
-          ASUnlockScope(self);
-          [delegate imageNode:self didLoadImage:result];
-        }
-      }
-    }
-  }
-
-  if (self.image == nil) {
-    [self _updatePriorityOnDownloaderIfNeededWithDefaultPriority:ASImageDownloaderPriorityImminent];
-  }
-}
-
-/* visibileStateDidChange in ASMultiplexImageNode has a very similar implementation. Changes here are likely necessary
- in ASMultiplexImageNode as well. */
-- (void)didEnterVisibleState
-{
-  [super didEnterVisibleState];
-  [self _updatePriorityOnDownloaderIfNeededWithDefaultPriority:ASImageDownloaderPriorityVisible];
-  [self _updateProgressImageBlockOnDownloaderIfNeeded];
-}
-
-- (void)didExitVisibleState
-{
-  [super didExitVisibleState];
-  [self _updatePriorityOnDownloaderIfNeededWithDefaultPriority:ASImageDownloaderPriorityPreload];
-  [self _updateProgressImageBlockOnDownloaderIfNeeded];
-}
-
-- (void)didExitDisplayState
-{
-  [super didExitDisplayState];
-  if (ASActivateExperimentalFeature(ASExperimentalImageDownloaderPriority)) {
-    [self _updatePriorityOnDownloaderIfNeededWithDefaultPriority:ASImageDownloaderPriorityPreload];
-  }
-}
-
-- (void)didExitPreloadState
-{
-  [super didExitPreloadState];
-
-  // If the image was set explicitly we don't want to remove it while exiting the preload state
-  if (ASLockedSelf(_imageWasSetExternally)) {
-    return;
-  }
-
-  [self _cancelDownloadAndClearImageWithResumePossibility:YES];
-}
-
-- (void)didEnterPreloadState
-{
-  [super didEnterPreloadState];
-  
-  // Image was set externally no need to load an image
-  [self _lazilyLoadImageIfNecessary];
-}
-
-+ (void)setUseMainThreadDelegateCallbacks:(BOOL)useMainThreadDelegateCallbacks
-{
-  _useMainThreadDelegateCallbacks = useMainThreadDelegateCallbacks;
-}
-
-+ (BOOL)useMainThreadDelegateCallbacks
-{
-  return _useMainThreadDelegateCallbacks;
-}
-
-#pragma mark - Progress
-
-- (void)handleProgressImage:(UIImage *)progressImage progress:(CGFloat)progress downloadIdentifier:(nullable id)downloadIdentifier
-{
-  ASLockScopeSelf();
-  
-  // Getting a result back for a different download identifier, download must not have been successfully canceled
-  if (ASObjectIsEqual(_downloadIdentifier, downloadIdentifier) == NO && downloadIdentifier != nil) {
-    return;
-  }
-  
-  as_log_verbose(ASImageLoadingLog(), "Received progress image for %@ q: %.2g id: %@", self, progress, progressImage);
-  [self _setCurrentImageQuality:progress];
-  [self _locked__setImage:progressImage];
-}
-
-- (void)_updatePriorityOnDownloaderIfNeededWithDefaultPriority:(ASImageDownloaderPriority)defaultPriority
-{
-  if (_downloaderFlags.downloaderImplementsSetPriority) {
-    ASLockScopeSelf();
-
-    if (_downloadIdentifier != nil) {
-      ASImageDownloaderPriority priority = defaultPriority;
-      if (ASActivateExperimentalFeature(ASExperimentalImageDownloaderPriority)) {
-        priority = ASImageDownloaderPriorityWithInterfaceState(_interfaceState);
-      }
-
-      [_downloader setPriority:priority withDownloadIdentifier:_downloadIdentifier];
-    }
-  }
-}
-
-- (void)_updateProgressImageBlockOnDownloaderIfNeeded
-{
-  // If the downloader doesn't do progress, we are done.
-  if (_downloaderFlags.downloaderImplementsSetProgress == NO) {
-    return;
-  }
-
-  // Read state.
-  [self lock];
-    BOOL shouldRender = _shouldRenderProgressImages && ASInterfaceStateIncludesVisible(_interfaceState);
-    id oldDownloadIDForProgressBlock = _downloadIdentifierForProgressBlock;
-    id newDownloadIDForProgressBlock = shouldRender ? _downloadIdentifier : nil;
-    BOOL clearAndReattempt = NO;
-  [self unlock];
-
-  // If we're already bound to the correct download, we're done.
-  if (ASObjectIsEqual(oldDownloadIDForProgressBlock, newDownloadIDForProgressBlock)) {
-    return;
-  }
-
-  // Unbind from the previous download.
-  if (oldDownloadIDForProgressBlock != nil) {
-    as_log_verbose(ASImageLoadingLog(), "Disabled progress images for %@ id: %@", self, oldDownloadIDForProgressBlock);
-    [_downloader setProgressImageBlock:nil callbackQueue:[self callbackQueue] withDownloadIdentifier:oldDownloadIDForProgressBlock];
-  }
-
-  // Bind to the current download.
-  if (newDownloadIDForProgressBlock != nil) {
-    __weak __typeof(self) weakSelf = self;
-    as_log_verbose(ASImageLoadingLog(), "Enabled progress images for %@ id: %@", self, newDownloadIDForProgressBlock);
-    [_downloader setProgressImageBlock:^(UIImage * _Nonnull progressImage, CGFloat progress, id  _Nullable downloadIdentifier) {
-      [weakSelf handleProgressImage:progressImage progress:progress downloadIdentifier:downloadIdentifier];
-    } callbackQueue:[self callbackQueue] withDownloadIdentifier:newDownloadIDForProgressBlock];
-  }
-
-  // Update state local state with lock held.
-  {
-    ASLockScopeSelf();
-    // Check if the oldDownloadIDForProgressBlock still is the same as the _downloadIdentifierForProgressBlock
-    if (_downloadIdentifierForProgressBlock == oldDownloadIDForProgressBlock) {
-      _downloadIdentifierForProgressBlock = newDownloadIDForProgressBlock;
-    } else if (newDownloadIDForProgressBlock != nil) {
-      // If this is not the case another thread did change the _downloadIdentifierForProgressBlock already so
-      // we have to deregister the newDownloadIDForProgressBlock that we registered above
-      clearAndReattempt = YES;
-    }
-  }
-  
-  if (clearAndReattempt) {
-    // In this case another thread changed the _downloadIdentifierForProgressBlock before we finished registering
-    // the new progress block for newDownloadIDForProgressBlock ID. Let's clear it now and reattempt to register
-    if (newDownloadIDForProgressBlock) {
-      [_downloader setProgressImageBlock:nil callbackQueue:[self callbackQueue] withDownloadIdentifier:newDownloadIDForProgressBlock];
-    }
-    [self _updateProgressImageBlockOnDownloaderIfNeeded];
-  }
-}
-
-- (void)_cancelDownloadAndClearImageWithResumePossibility:(BOOL)storeResume
-{
-  ASLockScopeSelf();
-  [self _locked_cancelDownloadAndClearImageWithResumePossibility:storeResume];
-}
-
-- (void)_locked_cancelDownloadAndClearImageWithResumePossibility:(BOOL)storeResume
-{
-  ASAssertLocked(__instanceLock__);
-  
-  [self _locked_cancelImageDownloadWithResumePossibility:storeResume];
-  
-  [self _locked_setAnimatedImage:nil];
-  [self _setCurrentImageQuality:0.0];
-  [self _locked__setImage:_defaultImage];
-
-  _imageLoaded = NO;
-
-  if (_cacheFlags.cacheSupportsClearing) {
-    if (_URL != nil) {
-      as_log_verbose(ASImageLoadingLog(), "Clearing cached image for %@ url: %@", self, _URL);
-      [_cache clearFetchedImageFromCacheWithURL:_URL];
-    }
-  }
-}
-
-- (void)_cancelImageDownloadWithResumePossibility:(BOOL)storeResume
-{
-  ASLockScopeSelf();
-  [self _locked_cancelImageDownloadWithResumePossibility:storeResume];
-}
-
-- (void)_locked_cancelImageDownloadWithResumePossibility:(BOOL)storeResume
-{
-  ASAssertLocked(__instanceLock__);
-  
-  if (!_downloadIdentifier) {
-    return;
-  }
-
-  if (_downloadIdentifier) {
-    if (storeResume && _downloaderFlags.downloaderImplementsCancelWithResume) {
-      as_log_verbose(ASImageLoadingLog(), "Canceling image download w resume for %@ id: %@", self, _downloadIdentifier);
-      [_downloader cancelImageDownloadWithResumePossibilityForIdentifier:_downloadIdentifier];
-    } else {
-      as_log_verbose(ASImageLoadingLog(), "Canceling image download no resume for %@ id: %@", self, _downloadIdentifier);
-      [_downloader cancelImageDownloadForIdentifier:_downloadIdentifier];
-    }
-  }
-  _downloadIdentifier = nil;
-  _cacheSentinel++;
-}
-
-- (void)_downloadImageWithCompletion:(void (^)(id <ASImageContainerProtocol> imageContainer, NSError*, id downloadIdentifier, id userInfo))finished
-{
-  ASPerformBlockOnBackgroundThread(^{
-    NSURL *url;
-    id downloadIdentifier;
-    BOOL cancelAndReattempt = NO;
-    ASInterfaceState interfaceState;
-
-    // Below, to avoid performance issues, we're calling downloadImageWithURL without holding the lock. This is a bit ugly because
-    // We need to reobtain the lock after and ensure that the task we've kicked off still matches our URL. If not, we need to cancel
-    // it and try again.
-    {
-      ASLockScopeSelf();
-      url = self->_URL;
-      interfaceState = self->_interfaceState;
-    }
-
-    dispatch_queue_t callbackQueue = [self callbackQueue];
-    ASImageDownloaderProgress downloadProgress = NULL;
-    ASImageDownloaderCompletion completion = ^(id <ASImageContainerProtocol> _Nullable imageContainer, NSError * _Nullable error, id  _Nullable downloadIdentifier, id _Nullable userInfo) {
-      if (finished != NULL) {
-        finished(imageContainer, error, downloadIdentifier, userInfo);
-      }
-    };
-
-    if (self->_downloaderFlags.downloaderImplementsDownloadWithPriority
-        && ASActivateExperimentalFeature(ASExperimentalImageDownloaderPriority)) {
-      /*
-        Decide a priority based on the current interface state of this node.
-        It can happen that this method was called when the node entered preload state
-        but the interface state, at this point, tells us that the node is (going to be) visible.
-        If that's the case, we jump to a higher priority directly.
-       */
-      ASImageDownloaderPriority priority = ASImageDownloaderPriorityWithInterfaceState(interfaceState);
-
-      downloadIdentifier = [self->_downloader downloadImageWithURL:url
-                                                          priority:priority
-                                                     callbackQueue:callbackQueue
-                                                  downloadProgress:downloadProgress
-                                                        completion:completion];
-    } else {
-      /*
-        Kick off a download with default priority.
-        The actual "default" value is decided by the downloader.
-        ASBasicImageDownloader and ASPINRemoteImageDownloader both use ASImageDownloaderPriorityImminent
-        which is mapped to NSURLSessionTaskPriorityDefault.
-
-       This means that preload and display nodes use the same priority
-        and their requests are put into the same pool.
-      */
-      downloadIdentifier = [self->_downloader downloadImageWithURL:url
-                                                     callbackQueue:callbackQueue
-                                                  downloadProgress:downloadProgress
-                                                        completion:completion];
-    }
-    as_log_verbose(ASImageLoadingLog(), "Downloading image for %@ url: %@", self, url);
-  
-    {
-      ASLockScopeSelf();
-      if (ASObjectIsEqual(self->_URL, url)) {
-        // The download we kicked off is correct, no need to do any more work.
-        self->_downloadIdentifier = downloadIdentifier;
-      } else {
-        // The URL changed since we kicked off our download task. This shouldn't happen often so we'll pay the cost and
-        // cancel that request and kick off a new one.
-        cancelAndReattempt = YES;
-      }
-    }
-    
-    if (cancelAndReattempt) {
-      if (downloadIdentifier != nil) {
-        as_log_verbose(ASImageLoadingLog(), "Canceling image download no resume for %@ id: %@", self, downloadIdentifier);
-        [self->_downloader cancelImageDownloadForIdentifier:downloadIdentifier];
-      }
-      [self _downloadImageWithCompletion:finished];
-      return;
-    }
-    
-    [self _updateProgressImageBlockOnDownloaderIfNeeded];
-  });
-}
-
-- (void)_lazilyLoadImageIfNecessary
-{
-  ASDisplayNodeAssertMainThread();
-
-  [self lock];
-    __weak id<ASNetworkImageNodeDelegate> delegate = _delegate;
-    BOOL delegateDidStartFetchingData = _delegateFlags.delegateDidStartFetchingData;
-    BOOL delegateWillLoadImageFromCache = _delegateFlags.delegateWillLoadImageFromCache;
-    BOOL delegateWillLoadImageFromNetwork = _delegateFlags.delegateWillLoadImageFromNetwork;
-    BOOL delegateDidLoadImageFromCache = _delegateFlags.delegateDidLoadImageFromCache;
-    BOOL isImageLoaded = _imageLoaded;
-    NSURL *URL = _URL;
-    id currentDownloadIdentifier = _downloadIdentifier;
-  [self unlock];
-  
-  if (!isImageLoaded && URL != nil && currentDownloadIdentifier == nil) {
-    if (delegateDidStartFetchingData) {
-      [delegate imageNodeDidStartFetchingData:self];
-    }
-    
-    if (URL.isFileURL) {
-      dispatch_async(dispatch_get_main_queue(), ^{
-        ASLockScopeSelf();
-        
-        // Bail out if not the same URL anymore
-        if (!ASObjectIsEqual(URL, self->_URL)) {
-          return;
-        }
-        
-        if (self->_shouldCacheImage) {
-          [self _locked__setImage:[UIImage imageNamed:URL.path.lastPathComponent]];
-        } else {
-          // First try to load the path directly, for efficiency assuming a developer who
-          // doesn't want caching is trying to be as minimal as possible.
-          auto nonAnimatedImage = [[UIImage alloc] initWithContentsOfFile:URL.path];
-          if (nonAnimatedImage == nil) {
-            // If we couldn't find it, execute an -imageNamed:-like search so we can find resources even if the
-            // extension is not provided in the path.  This allows the same path to work regardless of shouldCacheImage.
-            NSString *filename = [[NSBundle mainBundle] pathForResource:URL.path.lastPathComponent ofType:nil];
-            if (filename != nil) {
-              nonAnimatedImage = [[UIImage alloc] initWithContentsOfFile:filename];
-            }
-          }
-
-          // If the file may be an animated gif and then created an animated image.
-          id<ASAnimatedImageProtocol> animatedImage = nil;
-          if (self->_downloaderFlags.downloaderImplementsAnimatedImage) {
-            const auto data = [[NSData alloc] initWithContentsOfURL:URL];
-            if (data != nil) {
-              animatedImage = [self->_downloader animatedImageWithData:data];
-
-              if ([animatedImage respondsToSelector:@selector(isDataSupported:)] && [animatedImage isDataSupported:data] == NO) {
-                animatedImage = nil;
-              }
-            }
-          }
-
-          if (animatedImage != nil) {
-            [self _locked_setAnimatedImage:animatedImage];
-          } else {
-            [self _locked__setImage:nonAnimatedImage];
-          }
-        }
-
-        self->_imageLoaded = YES;
-
-        [self _setCurrentImageQuality:1.0];
-
-        if (self->_delegateFlags.delegateDidLoadImageWithInfo) {
-          ASUnlockScope(self);
-          const auto info = [[ASNetworkImageLoadInfo alloc] initWithURL:URL sourceType:ASNetworkImageSourceFileURL downloadIdentifier:nil userInfo:nil];
-          [delegate imageNode:self didLoadImage:self.image info:info];
-        } else if (self->_delegateFlags.delegateDidLoadImage) {
-          ASUnlockScope(self);
-          [delegate imageNode:self didLoadImage:self.image];
-        }
-      });
-    } else {
-      __weak __typeof__(self) weakSelf = self;
-      const auto finished = ^(id <ASImageContainerProtocol>imageContainer, NSError *error, id downloadIdentifier, ASNetworkImageSourceType imageSource, id userInfo) {
-        ASPerformBlockOnBackgroundThread(^{
-          __typeof__(self) strongSelf = weakSelf;
-          if (strongSelf == nil) {
-            return;
-          }
-          
-          as_log_verbose(ASImageLoadingLog(), "Downloaded image for %@ img: %@ url: %@", self, [imageContainer asdk_image], URL);
-          
-          // Grab the lock for the rest of the block
-          ASLockScope(strongSelf);
-          
-          //Getting a result back for a different download identifier, download must not have been successfully canceled
-          if (ASObjectIsEqual(strongSelf->_downloadIdentifier, downloadIdentifier) == NO && downloadIdentifier != nil) {
-            return;
-          }
-          
-          //No longer in preload range, no point in setting the results (they won't be cleared in exit preload range)
-          if (ASInterfaceStateIncludesPreload(strongSelf->_interfaceState) == NO) {
-            strongSelf->_downloadIdentifier = nil;
-            strongSelf->_cacheSentinel++;
-            return;
-          }
-          
-          UIImage *newImage;
-          if (imageContainer != nil) {
-            [strongSelf _setCurrentImageQuality:1.0];
-            NSData *animatedImageData = [imageContainer asdk_animatedImageData];
-            if (animatedImageData && strongSelf->_downloaderFlags.downloaderImplementsAnimatedImage) {
-              id animatedImage = [strongSelf->_downloader animatedImageWithData:animatedImageData];
-              [strongSelf _locked_setAnimatedImage:animatedImage];
-            } else {
-              newImage = [imageContainer asdk_image];
-              [strongSelf _locked__setImage:newImage];
-            }
-            strongSelf->_imageLoaded = YES;
-          }
-          
-          strongSelf->_downloadIdentifier = nil;
-          strongSelf->_cacheSentinel++;
-          
-          void (^calloutBlock)(ASNetworkImageNode *inst);
-          
-          if (newImage) {
-            if (strongSelf->_delegateFlags.delegateDidLoadImageWithInfo) {
-              calloutBlock = ^(ASNetworkImageNode *strongSelf) {
-                const auto info = [[ASNetworkImageLoadInfo alloc] initWithURL:URL sourceType:imageSource downloadIdentifier:downloadIdentifier userInfo:userInfo];
-                [delegate imageNode:strongSelf didLoadImage:newImage info:info];
-              };
-            } else if (strongSelf->_delegateFlags.delegateDidLoadImage) {
-              calloutBlock = ^(ASNetworkImageNode *strongSelf) {
-                [delegate imageNode:strongSelf didLoadImage:newImage];
-              };
-            }
-          } else if (error && strongSelf->_delegateFlags.delegateDidFailWithError) {
-            calloutBlock = ^(ASNetworkImageNode *strongSelf) {
-              [delegate imageNode:strongSelf didFailWithError:error];
-            };
-          }
-          
-          if (calloutBlock) {
-            if (ASNetworkImageNode.useMainThreadDelegateCallbacks) {
-              ASPerformBlockOnMainThread(^{
-                if (auto strongSelf = weakSelf) {
-                  calloutBlock(strongSelf);
-                }
-              });
-            } else {
-              calloutBlock(strongSelf);
-            }
-          }
-        });
-      };
-
-      // As the _cache and _downloader is only set once in the intializer we don't have to use a
-      // lock in here
-      if (_cache != nil) {
-        NSInteger cacheSentinel = ASLockedSelf(++_cacheSentinel);
-
-        as_log_verbose(ASImageLoadingLog(), "Decaching image for %@ url: %@", self, URL);
-        
-        ASImageCacherCompletion completion = ^(id <ASImageContainerProtocol> imageContainer) {
-          // If the cache sentinel changed, that means this request was cancelled.
-          if (ASLockedSelf(self->_cacheSentinel != cacheSentinel)) {
-            return;
-          }
-          
-          if ([imageContainer asdk_image] == nil && self->_downloader != nil) {
-            if (delegateWillLoadImageFromNetwork) {
-              [delegate imageNodeWillLoadImageFromNetwork:self];
-            }
-            [self _downloadImageWithCompletion:^(id<ASImageContainerProtocol> imageContainer, NSError *error, id downloadIdentifier, id userInfo) {
-              finished(imageContainer, error, downloadIdentifier, ASNetworkImageSourceDownload, userInfo);
-            }];
-          } else {
-            if (delegateDidLoadImageFromCache) {
-              [delegate imageNodeDidLoadImageFromCache:self];
-            }
-            as_log_verbose(ASImageLoadingLog(), "Decached image for %@ img: %@ url: %@", self, [imageContainer asdk_image], URL);
-            finished(imageContainer, nil, nil, ASNetworkImageSourceAsynchronousCache, nil);
-          }
-        };
-        
-        if (delegateWillLoadImageFromCache) {
-          [delegate imageNodeWillLoadImageFromCache:self];
-        }
-        [_cache cachedImageWithURL:URL
-                     callbackQueue:[self callbackQueue]
-                        completion:completion];
-      } else {
-        if (delegateWillLoadImageFromNetwork) {
-          [delegate imageNodeWillLoadImageFromNetwork:self];
-        }
-        [self _downloadImageWithCompletion:^(id<ASImageContainerProtocol> imageContainer, NSError *error, id downloadIdentifier, id userInfo) {
-          finished(imageContainer, error, downloadIdentifier, ASNetworkImageSourceDownload, userInfo);
-        }];
-      }
-    }
-  }
-}
-
-#pragma mark - ASDisplayNode+Subclasses
-
-- (void)displayDidFinish
-{
-  [super displayDidFinish];
-  
-  id<ASNetworkImageNodeDelegate> delegate = nil;
-  
-  {
-    ASLockScopeSelf();
-    if (_delegateFlags.delegateDidFinishDecoding && self.layer.contents != nil) {
-      /* We store the image quality in _currentImageQuality whenever _image is set. On the following displayDidFinish, we'll know that
-       _currentImageQuality is the quality of the image that has just finished rendering. In order for this to be accurate, we
-       need to be sure we are on main thread when we set _currentImageQuality. Otherwise, it is possible for _currentImageQuality
-       to be modified at a point where it is too late to cancel the main thread's previous display (the final sentinel check has passed), 
-       but before the displayDidFinish of the previous display pass is called. In this situation, displayDidFinish would be called and we
-       would set _renderedImageQuality to the new _currentImageQuality, but the actual quality of the rendered image should be the previous 
-       value stored in _currentImageQuality. */
-
-      _renderedImageQuality = _currentImageQuality;
-      
-      // Assign the delegate to be used
-      delegate = _delegate;
-    }
-  }
-  
-  if (delegate != nil) {
-    [delegate imageNodeDidFinishDecoding:self];
-  }
-}
-
-@end
-
-#endif
diff --git a/submodules/AsyncDisplayKit/Source/ASNodeController+Beta.h b/submodules/AsyncDisplayKit/Source/ASNodeController+Beta.h
deleted file mode 100644
index e9028f1986..0000000000
--- a/submodules/AsyncDisplayKit/Source/ASNodeController+Beta.h
+++ /dev/null
@@ -1,59 +0,0 @@
-//
-//  ASNodeController+Beta.h
-//  Texture
-//
-//  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.
-//  Changes after 4/13/2017 are: Copyright (c) Pinterest, Inc.  All rights reserved.
-//  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
-//
-
-#import <AsyncDisplayKit/ASDisplayNode.h>
-#import <AsyncDisplayKit/ASDisplayNode+Subclasses.h> // for ASInterfaceState protocol
-
-/* ASNodeController is currently beta and open to change in the future */
-@interface ASNodeController<__covariant DisplayNodeType : ASDisplayNode *>
-    : NSObject <ASInterfaceStateDelegate, ASLocking>
-
-@property (nonatomic, strong /* may be weak! */) DisplayNodeType node;
-
-// Until an ASNodeController can be provided in place of an ASCellNode, some apps may prefer to have
-// nodes keep their controllers alive (and a weak reference from controller to node)
-
-@property (nonatomic) BOOL shouldInvertStrongReference;
-
-- (void)loadNode;
-
-// for descriptions see <ASInterfaceState> definition
-- (void)nodeDidLoad ASDISPLAYNODE_REQUIRES_SUPER;
-- (void)nodeDidLayout ASDISPLAYNODE_REQUIRES_SUPER;
-
-// This is only called during Yoga-driven layouts.
-- (void)nodeWillCalculateLayout:(ASSizeRange)constrainedSize ASDISPLAYNODE_REQUIRES_SUPER;
-
-- (void)didEnterVisibleState ASDISPLAYNODE_REQUIRES_SUPER;
-- (void)didExitVisibleState  ASDISPLAYNODE_REQUIRES_SUPER;
-
-- (void)didEnterDisplayState ASDISPLAYNODE_REQUIRES_SUPER;
-- (void)didExitDisplayState  ASDISPLAYNODE_REQUIRES_SUPER;
-
-- (void)didEnterPreloadState ASDISPLAYNODE_REQUIRES_SUPER;
-- (void)didExitPreloadState  ASDISPLAYNODE_REQUIRES_SUPER;
-
-- (void)interfaceStateDidChange:(ASInterfaceState)newState
-                      fromState:(ASInterfaceState)oldState ASDISPLAYNODE_REQUIRES_SUPER;
-
-- (void)hierarchyDisplayDidFinish ASDISPLAYNODE_REQUIRES_SUPER;
-
-/**
- * @discussion Attempts (via ASLockSequence, a backing-off spinlock similar to
- * std::lock()) to lock both the node and its ASNodeController, if one exists.
- */
-- (ASLockSet)lockPair;
-
-@end
-
-@interface ASDisplayNode (ASNodeController)
-
-@property(nonatomic, readonly) ASNodeController *nodeController;
-
-@end
diff --git a/submodules/AsyncDisplayKit/Source/ASNodeController+Beta.mm b/submodules/AsyncDisplayKit/Source/ASNodeController+Beta.mm
deleted file mode 100644
index 14aae33633..0000000000
--- a/submodules/AsyncDisplayKit/Source/ASNodeController+Beta.mm
+++ /dev/null
@@ -1,135 +0,0 @@
-//
-//  ASNodeController+Beta.mm
-//  Texture
-//
-//  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.
-//  Changes after 4/13/2017 are: Copyright (c) Pinterest, Inc.  All rights reserved.
-//  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
-//
-
-#import <AsyncDisplayKit/ASDisplayNodeInternal.h>
-#import <AsyncDisplayKit/ASDisplayNode+FrameworkPrivate.h>
-#import <AsyncDisplayKit/ASNodeController+Beta.h>
-#import <AsyncDisplayKit/ASThread.h>
-
-#define _node (_shouldInvertStrongReference ? _weakNode : _strongNode)
-
-@implementation ASNodeController
-{
-  ASDisplayNode *_strongNode;
-  __weak ASDisplayNode *_weakNode;
-  AS::RecursiveMutex __instanceLock__;
-}
-
-- (void)loadNode
-{
-  ASLockScopeSelf();
-  self.node = [[ASDisplayNode alloc] init];
-}
-
-- (ASDisplayNode *)node
-{
-  ASLockScopeSelf();
-  if (_node == nil) {
-    [self loadNode];
-  }
-  return _node;
-}
-
-- (void)setupReferencesWithNode:(ASDisplayNode *)node
-{
-  ASLockScopeSelf();
-  if (_shouldInvertStrongReference) {
-    // The node should own the controller; weak reference from controller to node.
-    _weakNode = node;
-    _strongNode = nil;
-  } else {
-    // The controller should own the node; weak reference from node to controller.
-    _strongNode = node;
-    _weakNode = nil;
-  }
-
-  [node __setNodeController:self];
-}
-
-- (void)setNode:(ASDisplayNode *)node
-{
-  ASLockScopeSelf();
-  if (node == _node) {
-    return;
-  }
-  [self setupReferencesWithNode:node];
-  [node addInterfaceStateDelegate:self];
-}
-
-- (void)setShouldInvertStrongReference:(BOOL)shouldInvertStrongReference
-{
-  ASLockScopeSelf();
-  if (_shouldInvertStrongReference != shouldInvertStrongReference) {
-    // Because the BOOL controls which ivar we access, get the node before toggling.
-    ASDisplayNode *node = _node;
-    _shouldInvertStrongReference = shouldInvertStrongReference;
-    [self setupReferencesWithNode:node];
-  }
-}
-
-// subclass overrides
-- (void)nodeDidLoad {}
-- (void)nodeDidLayout {}
-- (void)nodeWillCalculateLayout:(ASSizeRange)constrainedSize {}
-
-- (void)didEnterVisibleState {}
-- (void)didExitVisibleState  {}
-
-- (void)didEnterDisplayState {}
-- (void)didExitDisplayState  {}
-
-- (void)didEnterPreloadState {}
-- (void)didExitPreloadState  {}
-
-- (void)interfaceStateDidChange:(ASInterfaceState)newState
-                      fromState:(ASInterfaceState)oldState {}
-
-- (void)hierarchyDisplayDidFinish {}
-
-- (ASLockSet)lockPair {
-  ASLockSet lockSet = ASLockSequence(^BOOL(ASAddLockBlock addLock) {
-    if (!addLock(_node)) {
-      return NO;
-    }
-    if (!addLock(self)) {
-      return NO;
-    }
-    return YES;
-  });
-
-  return lockSet;
-}
-
-#pragma mark NSLocking
-
-- (void)lock
-{
-  __instanceLock__.lock();
-}
-
-- (void)unlock
-{
-  __instanceLock__.unlock();
-}
-
-- (BOOL)tryLock
-{
-  return __instanceLock__.try_lock();
-}
-
-@end
-
-@implementation ASDisplayNode (ASNodeController)
-
-- (ASNodeController *)nodeController
-{
-  return _weakNodeController ?: _strongNodeController;
-}
-
-@end
diff --git a/submodules/AsyncDisplayKit/Source/Details/ASObjectDescriptionHelpers.mm b/submodules/AsyncDisplayKit/Source/ASObjectDescriptionHelpers.mm
similarity index 98%
rename from submodules/AsyncDisplayKit/Source/Details/ASObjectDescriptionHelpers.mm
rename to submodules/AsyncDisplayKit/Source/ASObjectDescriptionHelpers.mm
index cbd6be0963..2b5d94492c 100644
--- a/submodules/AsyncDisplayKit/Source/Details/ASObjectDescriptionHelpers.mm
+++ b/submodules/AsyncDisplayKit/Source/ASObjectDescriptionHelpers.mm
@@ -11,7 +11,7 @@
 
 #import <UIKit/UIGeometry.h>
 
-#import <AsyncDisplayKit/NSIndexSet+ASHelpers.h>
+#import "NSIndexSet+ASHelpers.h"
 
 NSString *ASGetDescriptionValueString(id object)
 {
diff --git a/submodules/AsyncDisplayKit/Source/ASPagerFlowLayout.h b/submodules/AsyncDisplayKit/Source/ASPagerFlowLayout.h
deleted file mode 100644
index 8b2f7e2684..0000000000
--- a/submodules/AsyncDisplayKit/Source/ASPagerFlowLayout.h
+++ /dev/null
@@ -1,22 +0,0 @@
-//
-//  ASPagerFlowLayout.h
-//  Texture
-//
-//  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.
-//  Changes after 4/13/2017 are: Copyright (c) Pinterest, Inc.  All rights reserved.
-//  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
-//
-
-#ifndef MINIMAL_ASDK
-
-#import <UIKit/UIKit.h>
-
-NS_ASSUME_NONNULL_BEGIN
-
-@interface ASPagerFlowLayout : UICollectionViewFlowLayout
-
-@end
-
-NS_ASSUME_NONNULL_END
-
-#endif
diff --git a/submodules/AsyncDisplayKit/Source/ASPagerFlowLayout.mm b/submodules/AsyncDisplayKit/Source/ASPagerFlowLayout.mm
deleted file mode 100644
index de20b08961..0000000000
--- a/submodules/AsyncDisplayKit/Source/ASPagerFlowLayout.mm
+++ /dev/null
@@ -1,113 +0,0 @@
-//
-//  ASPagerFlowLayout.mm
-//  Texture
-//
-//  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.
-//  Changes after 4/13/2017 are: Copyright (c) Pinterest, Inc.  All rights reserved.
-//  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
-//
-#ifndef MINIMAL_ASDK
-
-#import <AsyncDisplayKit/ASPagerFlowLayout.h>
-#import <AsyncDisplayKit/ASCellNode.h>
-#import <AsyncDisplayKit/ASCollectionView.h>
-
-@interface ASPagerFlowLayout () {
-  __weak ASCellNode *_currentCellNode;
-}
-
-@end
-
-//TODO make this an ASCollectionViewLayout
-@implementation ASPagerFlowLayout
-
-- (ASCollectionView *)asCollectionView
-{
-  // Dynamic cast is too slow and not worth it.
-  return (ASCollectionView *)self.collectionView;
-}
-
-- (void)prepareLayout
-{
-  [super prepareLayout];
-  if (_currentCellNode == nil) {
-    [self _updateCurrentNode];
-  }
-}
-
-- (CGPoint)targetContentOffsetForProposedContentOffset:(CGPoint)proposedContentOffset
-{
-  // Don't mess around if the user is interacting with the page node. Although if just a rotation happened we should
-  // try to use the current index path to not end up setting the target content offset to something in between pages
-  if (!self.collectionView.decelerating && !self.collectionView.tracking) {
-    NSIndexPath *indexPath = [self.asCollectionView indexPathForNode:_currentCellNode];
-    if (indexPath) {
-      return [self _targetContentOffsetForItemAtIndexPath:indexPath proposedContentOffset:proposedContentOffset];
-    }
-  }
-
-  return [super targetContentOffsetForProposedContentOffset:proposedContentOffset];
-}
-
-- (CGPoint)_targetContentOffsetForItemAtIndexPath:(NSIndexPath *)indexPath proposedContentOffset:(CGPoint)proposedContentOffset
-{
-  if ([self _dataSourceIsEmpty]) {
-    return proposedContentOffset;
-  }
-  
-  UICollectionViewLayoutAttributes *attributes = [self layoutAttributesForItemAtIndexPath:indexPath];
-  if (attributes == nil) {
-    return proposedContentOffset;
-  }
-
-  CGFloat xOffset = (CGRectGetWidth(self.collectionView.bounds) - CGRectGetWidth(attributes.frame)) / 2.0;
-  return CGPointMake(attributes.frame.origin.x - xOffset, proposedContentOffset.y);
-}
-
-- (BOOL)_dataSourceIsEmpty
-{
-  return ([self.collectionView numberOfSections] == 0 ||
-          [self.collectionView numberOfItemsInSection:0] == 0);
-}
-
-- (void)_updateCurrentNode
-{
-  // Never change node during an animated bounds change (rotation)
-  // NOTE! Listening for -prepareForAnimatedBoundsChange and -finalizeAnimatedBoundsChange
-  // isn't sufficient here! It's broken!
-  NSArray *animKeys = self.collectionView.layer.animationKeys;
-  for (NSString *key in animKeys) {
-    if ([key hasPrefix:@"bounds"]) {
-      return;
-    }
-  }
-  
-  CGRect bounds = self.collectionView.bounds;
-  CGRect rect = CGRectMake(CGRectGetMidX(bounds), CGRectGetMidY(bounds), 1, 1);
-
-  NSIndexPath *indexPath = [self layoutAttributesForElementsInRect:rect].firstObject.indexPath;
-  if (indexPath) {
-    ASCellNode *node = [self.asCollectionView nodeForItemAtIndexPath:indexPath];
-    if (node) {
-      _currentCellNode = node;
-    }
-  }
-}
-
-- (BOOL)shouldInvalidateLayoutForBoundsChange:(CGRect)newBounds
-{
-  [self _updateCurrentNode];
-  return [super shouldInvalidateLayoutForBoundsChange:newBounds];
-}
-
-- (UICollectionViewLayoutInvalidationContext *)invalidationContextForBoundsChange:(CGRect)newBounds
-{
-  UICollectionViewFlowLayoutInvalidationContext *ctx = (UICollectionViewFlowLayoutInvalidationContext *)[super invalidationContextForBoundsChange:newBounds];
-  ctx.invalidateFlowLayoutDelegateMetrics = YES;
-  ctx.invalidateFlowLayoutAttributes = YES;
-  return ctx;
-}
-
-@end
-
-#endif
diff --git a/submodules/AsyncDisplayKit/Source/ASPagerNode+Beta.h b/submodules/AsyncDisplayKit/Source/ASPagerNode+Beta.h
deleted file mode 100644
index c4de4f45de..0000000000
--- a/submodules/AsyncDisplayKit/Source/ASPagerNode+Beta.h
+++ /dev/null
@@ -1,17 +0,0 @@
-//
-//  ASPagerNode+Beta.h
-//  Texture
-//
-//  Copyright (c) Pinterest, Inc.  All rights reserved.
-//  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
-//
-
-#ifndef MINIMAL_ASDK
-#import <AsyncDisplayKit/ASPagerNode.h>
-
-@interface ASPagerNode (Beta)
-
-- (instancetype)initUsingAsyncCollectionLayout;
-
-@end
-#endif
diff --git a/submodules/AsyncDisplayKit/Source/ASPagerNode.h b/submodules/AsyncDisplayKit/Source/ASPagerNode.h
deleted file mode 100644
index b20f187f67..0000000000
--- a/submodules/AsyncDisplayKit/Source/ASPagerNode.h
+++ /dev/null
@@ -1,137 +0,0 @@
-//
-//  ASPagerNode.h
-//  Texture
-//
-//  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.
-//  Changes after 4/13/2017 are: Copyright (c) Pinterest, Inc.  All rights reserved.
-//  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
-//
-
-#ifndef MINIMAL_ASDK
-
-#import <AsyncDisplayKit/ASCollectionNode.h>
-
-@class ASPagerNode;
-@class ASPagerFlowLayout;
-
-NS_ASSUME_NONNULL_BEGIN
-
-#define ASPagerNodeDataSource ASPagerDataSource
-@protocol ASPagerDataSource <NSObject>
-
-/**
- * This method replaces -collectionView:numberOfItemsInSection:
- *
- * @param pagerNode The sender.
- * @return The total number of pages that can display in the pagerNode.
- */
-- (NSInteger)numberOfPagesInPagerNode:(ASPagerNode *)pagerNode;
-
-@optional
-
-/**
- * This method replaces -collectionView:nodeForItemAtIndexPath:
- *
- * @param pagerNode The sender.
- * @param index     The index of the requested node.
- * @return a node for display at this index. This will be called on the main thread and should
- *   not implement reuse (it will be called once per row).  Unlike UICollectionView's version,
- *   this method is not called when the row is about to display.
- */
-- (ASCellNode *)pagerNode:(ASPagerNode *)pagerNode nodeAtIndex:(NSInteger)index;
-
-/**
- * This method replaces -collectionView:nodeBlockForItemAtIndexPath:
- * This method takes precedence over pagerNode:nodeAtIndex: if implemented.
- *
- * @param pagerNode The sender.
- * @param index     The index of the requested node.
- * @return a block that creates the node for display at this index.
- *   Must be thread-safe (can be called on the main thread or a background
- *   queue) and should not implement reuse (it will be called once per row).
- */
-- (ASCellNodeBlock)pagerNode:(ASPagerNode *)pagerNode nodeBlockAtIndex:(NSInteger)index;
-
-@end
-
-@protocol ASPagerDelegate <ASCollectionDelegate>
-@end
-
-/**
- * A horizontal, paging collection node.
- */
-@interface ASPagerNode : ASCollectionNode
-
-/**
- * Configures a default horizontal, paging flow layout with 0 inter-item spacing.
- */
-- (instancetype)init;
-
-/**
- * Initializer with custom-configured flow layout properties.
- *
- * NOTE: The flow layout must have a horizontal scroll direction.
- */
-- (instancetype)initWithCollectionViewLayout:(ASPagerFlowLayout *)flowLayout;
-
-/**
- * Data Source is required, and uses a different protocol from ASCollectionNode.
- */
-- (void)setDataSource:(nullable id <ASPagerDataSource>)dataSource;
-- (nullable id <ASPagerDataSource>)dataSource AS_WARN_UNUSED_RESULT;
-
-/**
- * Delegate is optional.
- * This includes UIScrollViewDelegate as well as most methods from UICollectionViewDelegate, like willDisplay...
- */
-- (void)setDelegate:(nullable id <ASPagerDelegate>)delegate;
-- (nullable id <ASPagerDelegate>)delegate AS_WARN_UNUSED_RESULT;
-
-/**
- * The underlying ASCollectionView object.
- */
-@property (readonly) ASCollectionView *view;
-
-/**
- * Returns the current page index. Main thread only.
- */
-@property (nonatomic, readonly) NSInteger currentPageIndex;
-
-/**
- * Scroll the contents of the receiver to ensure that the page is visible
- */
-- (void)scrollToPageAtIndex:(NSInteger)index animated:(BOOL)animated;
-
-/**
- * Returns the node for the passed page index
- */
-- (ASCellNode *)nodeForPageAtIndex:(NSInteger)index AS_WARN_UNUSED_RESULT;
-
-/**
- * Returns the index of the page for the cell passed or NSNotFound
- */
-- (NSInteger)indexOfPageWithNode:(ASCellNode *)node;
-
-/**
- * Tells the pager node to allow its view controller to automatically adjust its content insets.
- *
- * @see UIViewController.automaticallyAdjustsScrollViewInsets
- *
- * @discussion ASPagerNode should usually not have its content insets automatically adjusted
- * because it scrolls horizontally, and flow layout will log errors because the pages
- * do not fit between the top & bottom insets of the collection view.
- *
- * The default value is NO, which means that ASPagerNode expects that its view controller will
- * have automaticallyAdjustsScrollViewInsets=NO.
- *
- * If this property is NO, but your view controller has automaticallyAdjustsScrollViewInsets=YES,
- * the pager node will set the property on the view controller to NO and log a warning message. In the future,
- * the pager node will just log the warning, and you'll need to configure your view controller on your own.
- */
-@property (nonatomic) BOOL allowsAutomaticInsetsAdjustment;
-
-@end
-
-NS_ASSUME_NONNULL_END
-
-#endif
diff --git a/submodules/AsyncDisplayKit/Source/ASPagerNode.mm b/submodules/AsyncDisplayKit/Source/ASPagerNode.mm
deleted file mode 100644
index 73c9987c68..0000000000
--- a/submodules/AsyncDisplayKit/Source/ASPagerNode.mm
+++ /dev/null
@@ -1,234 +0,0 @@
-//
-//  ASPagerNode.mm
-//  Texture
-//
-//  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.
-//  Changes after 4/13/2017 are: Copyright (c) Pinterest, Inc.  All rights reserved.
-//  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
-//
-
-#ifndef MINIMAL_ASDK
-#import <AsyncDisplayKit/ASPagerNode.h>
-#import <AsyncDisplayKit/ASPagerNode+Beta.h>
-
-#import <AsyncDisplayKit/ASCollectionGalleryLayoutDelegate.h>
-#import <AsyncDisplayKit/ASCollectionNode+Beta.h>
-#import <AsyncDisplayKit/ASDelegateProxy.h>
-#import <AsyncDisplayKit/ASDisplayNode+FrameworkPrivate.h>
-#import <AsyncDisplayKit/ASDisplayNode+Subclasses.h>
-#import <AsyncDisplayKit/ASPagerFlowLayout.h>
-#import <AsyncDisplayKit/ASAssert.h>
-#import <AsyncDisplayKit/ASCellNode.h>
-#import <AsyncDisplayKit/ASCollectionView+Undeprecated.h>
-#import <AsyncDisplayKit/UIResponder+AsyncDisplayKit.h>
-
-@interface ASPagerNode () <ASCollectionDataSource, ASCollectionDelegate, ASCollectionDelegateFlowLayout, ASDelegateProxyInterceptor, ASCollectionGalleryLayoutPropertiesProviding>
-{
-  __weak id <ASPagerDataSource> _pagerDataSource;
-  ASPagerNodeProxy *_proxyDataSource;
-  struct {
-    unsigned nodeBlockAtIndex:1;
-    unsigned nodeAtIndex:1;
-  } _pagerDataSourceFlags;
-
-  __weak id <ASPagerDelegate> _pagerDelegate;
-  ASPagerNodeProxy *_proxyDelegate;
-}
-
-@end
-
-@implementation ASPagerNode
-
-@dynamic view, delegate, dataSource;
-
-#pragma mark - Lifecycle
-
-- (instancetype)init
-{
-  ASPagerFlowLayout *flowLayout = [[ASPagerFlowLayout alloc] init];
-  flowLayout.scrollDirection = UICollectionViewScrollDirectionHorizontal;
-  flowLayout.minimumInteritemSpacing = 0;
-  flowLayout.minimumLineSpacing = 0;
-  
-  return [self initWithCollectionViewLayout:flowLayout];
-}
-
-- (instancetype)initWithCollectionViewLayout:(ASPagerFlowLayout *)flowLayout;
-{
-  ASDisplayNodeAssert([flowLayout isKindOfClass:[ASPagerFlowLayout class]], @"ASPagerNode requires a flow layout.");
-  ASDisplayNodeAssertTrue(flowLayout.scrollDirection == UICollectionViewScrollDirectionHorizontal);
-  self = [super initWithCollectionViewLayout:flowLayout];
-  return self;
-}
-
-- (instancetype)initUsingAsyncCollectionLayout
-{
-  ASCollectionGalleryLayoutDelegate *layoutDelegate = [[ASCollectionGalleryLayoutDelegate alloc] initWithScrollableDirections:ASScrollDirectionHorizontalDirections];
-  self = [super initWithLayoutDelegate:layoutDelegate layoutFacilitator:nil];
-  if (self) {
-    layoutDelegate.propertiesProvider = self;
-  }
-  return self;
-}
-
-#pragma mark - ASDisplayNode
-
-- (void)didLoad
-{
-  [super didLoad];
-  
-  ASCollectionView *cv = self.view;
-  cv.asyncDataSource = (id<ASCollectionDataSource>)_proxyDataSource ?: self;
-  cv.asyncDelegate = (id<ASCollectionDelegate>)_proxyDelegate ?: self;
-#if TARGET_OS_IOS
-  cv.pagingEnabled = YES;
-  cv.scrollsToTop = NO;
-#endif
-  cv.allowsSelection = NO;
-  cv.showsVerticalScrollIndicator = NO;
-  cv.showsHorizontalScrollIndicator = NO;
-
-  ASRangeTuningParameters minimumRenderParams = { .leadingBufferScreenfuls = 0.0, .trailingBufferScreenfuls = 0.0 };
-  ASRangeTuningParameters minimumPreloadParams = { .leadingBufferScreenfuls = 1.0, .trailingBufferScreenfuls = 1.0 };
-  [self setTuningParameters:minimumRenderParams forRangeMode:ASLayoutRangeModeMinimum rangeType:ASLayoutRangeTypeDisplay];
-  [self setTuningParameters:minimumPreloadParams forRangeMode:ASLayoutRangeModeMinimum rangeType:ASLayoutRangeTypePreload];
-  
-  ASRangeTuningParameters fullRenderParams = { .leadingBufferScreenfuls = 1.0, .trailingBufferScreenfuls = 1.0 };
-  ASRangeTuningParameters fullPreloadParams = { .leadingBufferScreenfuls = 2.0, .trailingBufferScreenfuls = 2.0 };
-  [self setTuningParameters:fullRenderParams forRangeMode:ASLayoutRangeModeFull rangeType:ASLayoutRangeTypeDisplay];
-  [self setTuningParameters:fullPreloadParams forRangeMode:ASLayoutRangeModeFull rangeType:ASLayoutRangeTypePreload];
-}
-
-#pragma mark - Getters / Setters
-
-- (NSInteger)currentPageIndex
-{
-  return (self.view.contentOffset.x / [self pageSize].width);
-}
-
-- (CGSize)pageSize
-{
-  UIEdgeInsets contentInset = self.contentInset;
-  CGSize pageSize = self.bounds.size;
-  pageSize.height -= (contentInset.top + contentInset.bottom);
-  return pageSize;
-}
-
-#pragma mark - Helpers
-
-- (void)scrollToPageAtIndex:(NSInteger)index animated:(BOOL)animated
-{
-  NSIndexPath *indexPath = [NSIndexPath indexPathForItem:index inSection:0];
-  [self scrollToItemAtIndexPath:indexPath atScrollPosition:UICollectionViewScrollPositionLeft animated:animated];
-}
-
-- (ASCellNode *)nodeForPageAtIndex:(NSInteger)index
-{
-  return [self nodeForItemAtIndexPath:[NSIndexPath indexPathForItem:index inSection:0]];
-}
-
-- (NSInteger)indexOfPageWithNode:(ASCellNode *)node
-{
-  NSIndexPath *indexPath = [self indexPathForNode:node];
-  if (!indexPath) {
-    return NSNotFound;
-  }
-  return indexPath.row;
-}
-
-#pragma mark - ASCollectionGalleryLayoutPropertiesProviding
-
-- (CGSize)galleryLayoutDelegate:(nonnull ASCollectionGalleryLayoutDelegate *)delegate sizeForElements:(nonnull ASElementMap *)elements
-{
-  ASDisplayNodeAssertMainThread();
-  return [self pageSize];
-}
-
-#pragma mark - ASCollectionDataSource
-
-- (ASCellNodeBlock)collectionNode:(ASCollectionNode *)collectionNode nodeBlockForItemAtIndexPath:(NSIndexPath *)indexPath
-{
-  if (_pagerDataSourceFlags.nodeBlockAtIndex) {
-    return [_pagerDataSource pagerNode:self nodeBlockAtIndex:indexPath.item];
-  } else if (_pagerDataSourceFlags.nodeAtIndex) {
-    ASCellNode *node = [_pagerDataSource pagerNode:self nodeAtIndex:indexPath.item];
-    return ^{ return node; };
-  } else {
-    ASDisplayNodeFailAssert(@"Pager data source must implement either %@ or %@. Data source: %@", NSStringFromSelector(@selector(pagerNode:nodeBlockAtIndex:)), NSStringFromSelector(@selector(pagerNode:nodeAtIndex:)), _pagerDataSource);
-    return ^{
-      return [[ASCellNode alloc] init];
-    };
-  }
-}
-
-- (NSInteger)collectionNode:(ASCollectionNode *)collectionNode numberOfItemsInSection:(NSInteger)section
-{
-  ASDisplayNodeAssert(_pagerDataSource != nil, @"ASPagerNode must have a data source to load nodes to display");
-  return [_pagerDataSource numberOfPagesInPagerNode:self];
-}
-
-#pragma mark - ASCollectionDelegate
-
-- (ASSizeRange)collectionNode:(ASCollectionNode *)collectionNode constrainedSizeForItemAtIndexPath:(NSIndexPath *)indexPath
-{
-  return ASSizeRangeMake([self pageSize]);
-}
-
-#pragma mark - Data Source Proxy
-
-- (id <ASPagerDataSource>)dataSource
-{
-  return _pagerDataSource;
-}
-
-- (void)setDataSource:(id <ASPagerDataSource>)dataSource
-{
-  if (dataSource != _pagerDataSource) {
-    _pagerDataSource = dataSource;
-    
-    if (dataSource == nil) {
-      memset(&_pagerDataSourceFlags, 0, sizeof(_pagerDataSourceFlags));
-    } else {
-      _pagerDataSourceFlags.nodeBlockAtIndex = [_pagerDataSource respondsToSelector:@selector(pagerNode:nodeBlockAtIndex:)];
-      _pagerDataSourceFlags.nodeAtIndex = [_pagerDataSource respondsToSelector:@selector(pagerNode:nodeAtIndex:)];
-    }
-    
-    _proxyDataSource = dataSource ? [[ASPagerNodeProxy alloc] initWithTarget:dataSource interceptor:self] : nil;
-    
-    super.dataSource = (id <ASCollectionDataSource>)_proxyDataSource;
-  }
-}
-
-- (void)setDelegate:(id<ASPagerDelegate>)delegate
-{
-  if (delegate != _pagerDelegate) {
-    _pagerDelegate = delegate;
-    _proxyDelegate = delegate ? [[ASPagerNodeProxy alloc] initWithTarget:delegate interceptor:self] : nil;
-    super.delegate = (id <ASCollectionDelegate>)_proxyDelegate;
-  }
-}
-
-- (void)proxyTargetHasDeallocated:(ASDelegateProxy *)proxy
-{
-  [self setDataSource:nil];
-  [self setDelegate:nil];
-}
-
-- (void)didEnterHierarchy
-{
-	[super didEnterHierarchy];
-
-	// Check that our view controller does not automatically set our content insets
-	// In every use case I can imagine, the pager is not hosted inside a range-managed node.
-	if (_allowsAutomaticInsetsAdjustment == NO) {
-		UIViewController *vc = [self.view asdk_associatedViewController];
-		if (vc.automaticallyAdjustsScrollViewInsets) {
-			NSLog(@"AsyncDisplayKit: ASPagerNode is setting automaticallyAdjustsScrollViewInsets=NO on its owning view controller %@. This automatic behavior will be disabled in the future. Set allowsAutomaticInsetsAdjustment=YES on the pager node to suppress this behavior.", vc);
-			vc.automaticallyAdjustsScrollViewInsets = NO;
-		}
-	}
-}
-
-@end
-
-#endif
diff --git a/submodules/AsyncDisplayKit/Source/Private/ASPendingStateController.h b/submodules/AsyncDisplayKit/Source/ASPendingStateController.h
similarity index 100%
rename from submodules/AsyncDisplayKit/Source/Private/ASPendingStateController.h
rename to submodules/AsyncDisplayKit/Source/ASPendingStateController.h
diff --git a/submodules/AsyncDisplayKit/Source/Private/ASPendingStateController.mm b/submodules/AsyncDisplayKit/Source/ASPendingStateController.mm
similarity index 91%
rename from submodules/AsyncDisplayKit/Source/Private/ASPendingStateController.mm
rename to submodules/AsyncDisplayKit/Source/ASPendingStateController.mm
index 269b37e948..e7ca4a71de 100644
--- a/submodules/AsyncDisplayKit/Source/Private/ASPendingStateController.mm
+++ b/submodules/AsyncDisplayKit/Source/ASPendingStateController.mm
@@ -7,10 +7,10 @@
 //  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
 //
 
-#import <AsyncDisplayKit/ASPendingStateController.h>
+#import "ASPendingStateController.h"
 #import <AsyncDisplayKit/ASThread.h>
 #import <AsyncDisplayKit/ASWeakSet.h>
-#import <AsyncDisplayKit/ASDisplayNodeInternal.h> // Required for -applyPendingViewState; consider moving this to +FrameworkPrivate
+#import "ASDisplayNodeInternal.h" // Required for -applyPendingViewState; consider moving this to +FrameworkPrivate
 
 @interface ASPendingStateController()
 {
diff --git a/submodules/AsyncDisplayKit/Source/ASRangeManagingNode.h b/submodules/AsyncDisplayKit/Source/ASRangeManagingNode.h
deleted file mode 100644
index c331a77bee..0000000000
--- a/submodules/AsyncDisplayKit/Source/ASRangeManagingNode.h
+++ /dev/null
@@ -1,31 +0,0 @@
-//
-//  ASRangeManagingNode.h
-//  Texture
-//
-//  Copyright (c) Pinterest, Inc.  All rights reserved.
-//  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
-//
-
-#import <Foundation/Foundation.h>
-#import <AsyncDisplayKit/ASTraitCollection.h>
-
-@class ASCellNode;
-
-NS_ASSUME_NONNULL_BEGIN
-
-/**
- * Basically ASTableNode or ASCollectionNode.
- */
-@protocol ASRangeManagingNode <NSObject, ASTraitEnvironment>
-
-/**
- * Retrieve the index path for the given node, if it's a member of this container.
- *
- * @param node The node.
- * @return The index path, or nil if the node is not part of this container.
- */
-- (nullable NSIndexPath *)indexPathForNode:(ASCellNode *)node;
-
-@end
-
-NS_ASSUME_NONNULL_END
diff --git a/submodules/AsyncDisplayKit/Source/Details/ASRecursiveUnfairLock.mm b/submodules/AsyncDisplayKit/Source/ASRecursiveUnfairLock.mm
similarity index 98%
rename from submodules/AsyncDisplayKit/Source/Details/ASRecursiveUnfairLock.mm
rename to submodules/AsyncDisplayKit/Source/ASRecursiveUnfairLock.mm
index 9e4a29d47a..e44eec76d1 100644
--- a/submodules/AsyncDisplayKit/Source/Details/ASRecursiveUnfairLock.mm
+++ b/submodules/AsyncDisplayKit/Source/ASRecursiveUnfairLock.mm
@@ -6,7 +6,7 @@
 //  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
 //
 
-#import "ASRecursiveUnfairLock.h"
+#import <AsyncDisplayKit/ASRecursiveUnfairLock.h>
 
 #import <stdatomic.h>
 
diff --git a/submodules/AsyncDisplayKit/Source/Private/ASResponderChainEnumerator.h b/submodules/AsyncDisplayKit/Source/ASResponderChainEnumerator.h
similarity index 100%
rename from submodules/AsyncDisplayKit/Source/Private/ASResponderChainEnumerator.h
rename to submodules/AsyncDisplayKit/Source/ASResponderChainEnumerator.h
diff --git a/submodules/AsyncDisplayKit/Source/Private/ASResponderChainEnumerator.mm b/submodules/AsyncDisplayKit/Source/ASResponderChainEnumerator.mm
similarity index 94%
rename from submodules/AsyncDisplayKit/Source/Private/ASResponderChainEnumerator.mm
rename to submodules/AsyncDisplayKit/Source/ASResponderChainEnumerator.mm
index bb16e0fc57..2d94c99945 100644
--- a/submodules/AsyncDisplayKit/Source/Private/ASResponderChainEnumerator.mm
+++ b/submodules/AsyncDisplayKit/Source/ASResponderChainEnumerator.mm
@@ -7,7 +7,7 @@
 //  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
 //
 
-#import <AsyncDisplayKit/ASResponderChainEnumerator.h>
+#import "ASResponderChainEnumerator.h"
 #import <AsyncDisplayKit/ASAssert.h>
 
 @implementation ASResponderChainEnumerator {
diff --git a/submodules/AsyncDisplayKit/Source/ASRunLoopQueue.mm b/submodules/AsyncDisplayKit/Source/ASRunLoopQueue.mm
index 4aefeeb89d..2d2415e2b1 100644
--- a/submodules/AsyncDisplayKit/Source/ASRunLoopQueue.mm
+++ b/submodules/AsyncDisplayKit/Source/ASRunLoopQueue.mm
@@ -9,11 +9,10 @@
 
 #import <AsyncDisplayKit/ASAvailability.h>
 #import <AsyncDisplayKit/ASConfigurationInternal.h>
-#import <AsyncDisplayKit/ASLog.h>
 #import <AsyncDisplayKit/ASObjectDescriptionHelpers.h>
 #import <AsyncDisplayKit/ASRunLoopQueue.h>
 #import <AsyncDisplayKit/ASThread.h>
-#import <AsyncDisplayKit/ASSignpost.h>
+#import "ASSignpost.h"
 #import <QuartzCore/QuartzCore.h>
 #import <cstdlib>
 #import <deque>
@@ -115,9 +114,6 @@ static void runLoopSourceCallback(void *info) {
   NSPointerArray *_internalQueue; // Use NSPointerArray so we can decide __strong or __weak per-instance.
   AS::RecursiveMutex _internalQueueLock;
 
-  // In order to not pollute the top-level activities, each queue has 1 root activity.
-  os_activity_t _rootActivity;
-
 #if ASRunLoopQueueLoggingEnabled
   NSTimer *_runloopQueueLoggingTimer;
 #endif
@@ -138,15 +134,6 @@ static void runLoopSourceCallback(void *info) {
     _queueConsumer = handlerBlock;
     _batchSize = 1;
     _ensureExclusiveMembership = YES;
-
-    // We don't want to pollute the top-level app activities with run loop batches, so we create one top-level
-    // activity per queue, and each batch activity joins that one instead.
-    _rootActivity = as_activity_create("Process run loop queue items", OS_ACTIVITY_NONE, OS_ACTIVITY_FLAG_DEFAULT);
-    {
-      // Log a message identifying this queue into the queue's root activity.
-      as_activity_scope_verbose(_rootActivity);
-      as_log_verbose(ASDisplayLog(), "Created run loop queue: %@", self);
-    }
     
     // Self is guaranteed to outlive the observer.  Without the high cost of a weak pointer,
     // __unsafe_unretained allows us to avoid flagging the memory cycle detector.
@@ -260,15 +247,10 @@ static void runLoopSourceCallback(void *info) {
   // itemsToProcess will be empty if _queueConsumer == nil so no need to check again.
   const auto count = itemsToProcess.size();
   if (count > 0) {
-    as_activity_scope_verbose(as_activity_create("Process run loop queue batch", _rootActivity, OS_ACTIVITY_FLAG_DEFAULT));
     const auto itemsEnd = itemsToProcess.cend();
     for (auto iterator = itemsToProcess.begin(); iterator < itemsEnd; iterator++) {
       __unsafe_unretained id value = *iterator;
       _queueConsumer(value, isQueueDrained && iterator == itemsEnd - 1);
-      as_log_verbose(ASDisplayLog(), "processed %@", value);
-    }
-    if (count > 1) {
-      as_log_verbose(ASDisplayLog(), "processed %lu items", (unsigned long)count);
     }
   }
 
@@ -339,7 +321,6 @@ ASSynthesizeLockingMethodsWithMutex(_internalQueueLock)
   AS::Mutex _internalQueueLock;
 
   // In order to not pollute the top-level activities, each queue has 1 root activity.
-  os_activity_t _rootActivity;
 
 #if ASRunLoopQueueLoggingEnabled
   NSTimer *_runloopQueueLoggingTimer;
@@ -368,15 +349,6 @@ dispatch_once_t _ASSharedCATransactionQueueOnceToken;
     _internalQueue.reserve(kInternalQueueInitialCapacity);
     _batchBuffer.reserve(kInternalQueueInitialCapacity);
 
-    // We don't want to pollute the top-level app activities with run loop batches, so we create one top-level
-    // activity per queue, and each batch activity joins that one instead.
-    _rootActivity = as_activity_create("Process run loop queue items", OS_ACTIVITY_NONE, OS_ACTIVITY_FLAG_DEFAULT);
-    {
-      // Log a message identifying this queue into the queue's root activity.
-      as_activity_scope_verbose(_rootActivity);
-      as_log_verbose(ASDisplayLog(), "Created run loop queue: %@", self);
-    }
-
     // Self is guaranteed to outlive the observer.  Without the high cost of a weak pointer,
     // __unsafe_unretained allows us to avoid flagging the memory cycle detector.
     __unsafe_unretained __typeof__(self) weakSelf = self;
@@ -439,7 +411,6 @@ dispatch_once_t _ASSharedCATransactionQueueOnceToken;
   if (count == 0) {
     return;
   }
-  as_activity_scope_verbose(as_activity_create("Process run loop queue batch", _rootActivity, OS_ACTIVITY_FLAG_DEFAULT));
   ASSignpostStart(ASSignpostRunLoopQueueBatch);
   
   // Swap buffers, clear our hash table.
@@ -451,10 +422,8 @@ dispatch_once_t _ASSharedCATransactionQueueOnceToken;
   
   for (const id<ASCATransactionQueueObserving> &value : _batchBuffer) {
     [value prepareForCATransactionCommit];
-    as_log_verbose(ASDisplayLog(), "processed %@", value);
   }
   _batchBuffer.clear();
-  as_log_verbose(ASDisplayLog(), "processed %lu items", (unsigned long)count);
   ASSignpostEnd(ASSignpostRunLoopQueueBatch);
 }
 
diff --git a/submodules/AsyncDisplayKit/Source/Details/ASScrollDirection.mm b/submodules/AsyncDisplayKit/Source/ASScrollDirection.mm
similarity index 100%
rename from submodules/AsyncDisplayKit/Source/Details/ASScrollDirection.mm
rename to submodules/AsyncDisplayKit/Source/ASScrollDirection.mm
diff --git a/submodules/AsyncDisplayKit/Source/ASScrollNode.mm b/submodules/AsyncDisplayKit/Source/ASScrollNode.mm
index 4dc0652820..08fd82da80 100644
--- a/submodules/AsyncDisplayKit/Source/ASScrollNode.mm
+++ b/submodules/AsyncDisplayKit/Source/ASScrollNode.mm
@@ -15,7 +15,6 @@
 #import <AsyncDisplayKit/ASLayout.h>
 #import <AsyncDisplayKit/_ASDisplayLayer.h>
 #import <AsyncDisplayKit/ASThread.h>
-#import <AsyncDisplayKit/ASDisplayNode+Yoga.h>
 
 @interface ASScrollView : UIScrollView
 @end
diff --git a/submodules/AsyncDisplayKit/Source/ASSectionController.h b/submodules/AsyncDisplayKit/Source/ASSectionController.h
deleted file mode 100644
index 7df4dc84b8..0000000000
--- a/submodules/AsyncDisplayKit/Source/ASSectionController.h
+++ /dev/null
@@ -1,88 +0,0 @@
-//
-//  ASSectionController.h
-//  Texture
-//
-//  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.
-//  Changes after 4/13/2017 are: Copyright (c) Pinterest, Inc.  All rights reserved.
-//  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
-//
-
-#ifndef MINIMAL_ASDK
-#import <Foundation/Foundation.h>
-#import <AsyncDisplayKit/ASBlockTypes.h>
-#import <AsyncDisplayKit/ASDimension.h>
-
-NS_ASSUME_NONNULL_BEGIN
-
-@class ASBatchContext;
-
-/**
- * A protocol that your section controllers should conform to, in order to be used with Texture.
- *
- * @note Your supplementary view source should conform to @c ASSupplementaryNodeSource.
- */
-@protocol ASSectionController <NSObject>
-
-@optional
-
-/**
- * A method to provide the node block for the item at the given index.
- * The node block you return will be run asynchronously off the main thread,
- * so it's important to retrieve any objects from your section _outside_ the block
- * because by the time the block is run, the array may have changed.
- *
- * @param index The index of the item.
- * @return A block to be run concurrently to build the node for this item.
- * @see collectionNode:nodeBlockForItemAtIndexPath:
- */
-- (ASCellNodeBlock)nodeBlockForItemAtIndex:(NSInteger)index;
-
-/**
- * Similar to -collectionView:cellForItemAtIndexPath:.
- *
- * Note: only called if nodeBlockForItemAtIndex: returns nil.
- *
- * @param index The index of the item.
- *
- * @return A node to display for the given item. This will be called on the main thread and should
- *   not implement reuse (it will be called once per item).  Unlike UICollectionView's version,
- *   this method is not called when the item is about to display.
- */
-- (ASCellNode *)nodeForItemAtIndex:(NSInteger)index;
-
-/**
- * Asks the section controller whether it should batch fetch because the user is
- * near the end of the current data set.
- *
- * @discussion Use this method to conditionally fetch batches. Example use cases are: limiting the total number of
- * objects that can be fetched or no network connection.
- *
- * If not implemented, the assumed return value is @c YES.
- */
-- (BOOL)shouldBatchFetch;
-
-/**
- * Asks the section controller to begin fetching more content (tail loading) because
- * the user is near the end of the current data set.
- *
- * @param context A context object that must be notified when the batch fetch is completed.
- *
- * @discussion You must eventually call -completeBatchFetching: with an argument of YES in order to receive future
- * notifications to do batch fetches. This method is called on a background queue.
- */
-- (void)beginBatchFetchWithContext:(ASBatchContext *)context;
-
-/**
- * A method to provide the size range used for measuring the item
- * at the given index.
- *
- * @param index The index of the item.
- * @return A size range used for asynchronously measuring the node at this index.
- * @see collectionNode:constrainedSizeForItemAtIndexPath:
- */
-- (ASSizeRange)sizeRangeForItemAtIndex:(NSInteger)index;
-
-@end
-
-NS_ASSUME_NONNULL_END
-#endif
diff --git a/submodules/AsyncDisplayKit/Source/Base/ASSignpost.h b/submodules/AsyncDisplayKit/Source/ASSignpost.h
similarity index 100%
rename from submodules/AsyncDisplayKit/Source/Base/ASSignpost.h
rename to submodules/AsyncDisplayKit/Source/ASSignpost.h
diff --git a/submodules/AsyncDisplayKit/Source/ASSupplementaryNodeSource.h b/submodules/AsyncDisplayKit/Source/ASSupplementaryNodeSource.h
deleted file mode 100644
index bc361dc736..0000000000
--- a/submodules/AsyncDisplayKit/Source/ASSupplementaryNodeSource.h
+++ /dev/null
@@ -1,55 +0,0 @@
-//
-//  ASSupplementaryNodeSource.h
-//  Texture
-//
-//  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.
-//  Changes after 4/13/2017 are: Copyright (c) Pinterest, Inc.  All rights reserved.
-//  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
-//
-
-#ifndef MINIMAL_ASDK
-
-#import <Foundation/Foundation.h>
-#import <AsyncDisplayKit/ASBlockTypes.h>
-#import <AsyncDisplayKit/ASDimension.h>
-
-NS_ASSUME_NONNULL_BEGIN
-
-@protocol ASSupplementaryNodeSource <NSObject>
-
-@optional
-
-/**
- * A method to provide the node-block for the supplementary element.
- *
- * @param elementKind The kind of supplementary element.
- * @param index The index of the item.
- * @return A node block for the supplementary element.
- * @see collectionNode:nodeForSupplementaryElementOfKind:atIndexPath:
- */
-- (ASCellNodeBlock)nodeBlockForSupplementaryElementOfKind:(NSString *)elementKind atIndex:(NSInteger)index;
-
-/**
- * Asks the controller to provide a node to display for the given supplementary element.
- *
- * @param kind The kind of supplementary element.
- * @param index The index of the item.
- */
-- (ASCellNode *)nodeForSupplementaryElementOfKind:(NSString *)kind atIndex:(NSInteger)index;
-
-/**
- * A method to provide the size range used for measuring the supplementary
- * element of the given kind at the given index.
- *
- * @param elementKind The kind of supplementary element.
- * @param index The index of the item.
- * @return A size range used for asynchronously measuring the node.
- * @see collectionNode:constrainedSizeForSupplementaryElementOfKind:atIndexPath:
- */
-- (ASSizeRange)sizeRangeForSupplementaryElementOfKind:(NSString *)elementKind atIndex:(NSInteger)index;
-
-@end
-
-NS_ASSUME_NONNULL_END
-
-#endif
diff --git a/submodules/AsyncDisplayKit/Source/ASTabBarController.h b/submodules/AsyncDisplayKit/Source/ASTabBarController.h
deleted file mode 100644
index 7479f7ac85..0000000000
--- a/submodules/AsyncDisplayKit/Source/ASTabBarController.h
+++ /dev/null
@@ -1,32 +0,0 @@
-//
-//  ASTabBarController.h
-//  Texture
-//
-//  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.
-//  Changes after 4/13/2017 are: Copyright (c) Pinterest, Inc.  All rights reserved.
-//  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
-//
-
-#ifndef MINIMAL_ASDK
-
-#import <UIKit/UIKit.h>
-
-#import <AsyncDisplayKit/ASVisibilityProtocols.h>
-
-NS_ASSUME_NONNULL_BEGIN
-
-/**
- * ASTabBarController
- *
- * @discussion ASTabBarController is a drop in replacement for UITabBarController
- * which implements the memory efficiency improving @c ASManagesChildVisibilityDepth protocol.
- *
- * @see ASManagesChildVisibilityDepth
- */
-@interface ASTabBarController : UITabBarController <ASManagesChildVisibilityDepth>
-
-@end
-
-NS_ASSUME_NONNULL_END
-
-#endif
diff --git a/submodules/AsyncDisplayKit/Source/ASTabBarController.mm b/submodules/AsyncDisplayKit/Source/ASTabBarController.mm
deleted file mode 100644
index c0f9e39dd3..0000000000
--- a/submodules/AsyncDisplayKit/Source/ASTabBarController.mm
+++ /dev/null
@@ -1,87 +0,0 @@
-//
-//  ASTabBarController.mm
-//  Texture
-//
-//  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.
-//  Changes after 4/13/2017 are: Copyright (c) Pinterest, Inc.  All rights reserved.
-//  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
-//
-
-#ifndef MINIMAL_ASDK
-#import <AsyncDisplayKit/ASTabBarController.h>
-#import <AsyncDisplayKit/ASLog.h>
-
-@implementation ASTabBarController
-{
-  BOOL _parentManagesVisibilityDepth;
-  NSInteger _visibilityDepth;
-}
-
-ASVisibilityDidMoveToParentViewController;
-
-ASVisibilityViewWillAppear;
-
-ASVisibilityViewDidDisappearImplementation;
-
-ASVisibilitySetVisibilityDepth;
-
-ASVisibilityDepthImplementation;
-
-- (void)visibilityDepthDidChange
-{
-  for (UIViewController *viewController in self.viewControllers) {
-    if ([viewController conformsToProtocol:@protocol(ASVisibilityDepth)]) {
-      [(id <ASVisibilityDepth>)viewController visibilityDepthDidChange];
-    }
-  }
-}
-
-- (NSInteger)visibilityDepthOfChildViewController:(UIViewController *)childViewController
-{
-  NSUInteger viewControllerIndex = [self.viewControllers indexOfObjectIdenticalTo:childViewController];
-  if (viewControllerIndex == NSNotFound) {
-    //If childViewController is not actually a child, return NSNotFound which is also a really large number.
-    return NSNotFound;
-  }
-  
-  if (self.selectedViewController == childViewController) {
-    return [self visibilityDepth];
-  }
-  return [self visibilityDepth] + 1;
-}
-
-#pragma mark - UIKit overrides
-
-- (void)setViewControllers:(NSArray<__kindof UIViewController *> *)viewControllers
-{
-  [super setViewControllers:viewControllers];
-  [self visibilityDepthDidChange];
-}
-
-- (void)setViewControllers:(NSArray<__kindof UIViewController *> *)viewControllers animated:(BOOL)animated
-{
-  [super setViewControllers:viewControllers animated:animated];
-  [self visibilityDepthDidChange];
-}
-
-- (void)setSelectedIndex:(NSUInteger)selectedIndex
-{
-  as_activity_create_for_scope("Set selected index of ASTabBarController");
-  as_log_info(ASNodeLog(), "Selected tab %tu of %@", selectedIndex, self);
-
-  [super setSelectedIndex:selectedIndex];
-  [self visibilityDepthDidChange];
-}
-
-- (void)setSelectedViewController:(__kindof UIViewController *)selectedViewController
-{
-  as_activity_create_for_scope("Set selected view controller of ASTabBarController");
-  as_log_info(ASNodeLog(), "Selected view controller %@ of %@", selectedViewController, self);
-
-  [super setSelectedViewController:selectedViewController];
-  [self visibilityDepthDidChange];
-}
-
-@end
-
-#endif
diff --git a/submodules/AsyncDisplayKit/Source/ASTableNode+Beta.h b/submodules/AsyncDisplayKit/Source/ASTableNode+Beta.h
deleted file mode 100644
index 6d580bdc43..0000000000
--- a/submodules/AsyncDisplayKit/Source/ASTableNode+Beta.h
+++ /dev/null
@@ -1,21 +0,0 @@
-//
-//  ASTableNode+Beta.h
-//  Texture
-//
-//  Copyright (c) Pinterest, Inc.  All rights reserved.
-//  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
-//
-
-#import <AsyncDisplayKit/ASTableNode.h>
-
-@protocol ASBatchFetchingDelegate;
-
-NS_ASSUME_NONNULL_BEGIN
-
-@interface ASTableNode (Beta)
-
-@property (nonatomic, weak) id<ASBatchFetchingDelegate> batchFetchingDelegate;
-
-@end
-
-NS_ASSUME_NONNULL_END
diff --git a/submodules/AsyncDisplayKit/Source/ASTableNode.h b/submodules/AsyncDisplayKit/Source/ASTableNode.h
deleted file mode 100644
index f05c9f1dc8..0000000000
--- a/submodules/AsyncDisplayKit/Source/ASTableNode.h
+++ /dev/null
@@ -1,759 +0,0 @@
-//
-//  ASTableNode.h
-//  Texture
-//
-//  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.
-//  Changes after 4/13/2017 are: Copyright (c) Pinterest, Inc.  All rights reserved.
-//  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
-//
-#ifndef MINIMAL_ASDK
-#import <AsyncDisplayKit/ASBlockTypes.h>
-#import <AsyncDisplayKit/ASDisplayNode.h>
-#import <AsyncDisplayKit/ASRangeControllerUpdateRangeProtocol+Beta.h>
-#import <AsyncDisplayKit/ASTableView.h>
-#import <AsyncDisplayKit/ASRangeManagingNode.h>
-
-NS_ASSUME_NONNULL_BEGIN
-
-@protocol ASTableDataSource;
-@protocol ASTableDelegate;
-@class ASTableView, ASBatchContext;
-
-/**
- * ASTableNode is a node based class that wraps an ASTableView. It can be used
- * as a subnode of another node, and provide room for many (great) features and improvements later on.
- */
-@interface ASTableNode : ASDisplayNode <ASRangeControllerUpdateRangeProtocol, ASRangeManagingNode>
-
-- (instancetype)init; // UITableViewStylePlain
-- (instancetype)initWithStyle:(UITableViewStyle)style NS_DESIGNATED_INITIALIZER;
-
-@property (readonly) ASTableView *view;
-
-// These properties can be set without triggering the view to be created, so it's fine to set them in -init.
-@property (nonatomic, weak) id <ASTableDelegate>   delegate;
-@property (nonatomic, weak) id <ASTableDataSource> dataSource;
-
-/**
- * The number of screens left to scroll before the delegate -tableNode:beginBatchFetchingWithContext: is called.
- *
- * Defaults to two screenfuls.
- */
-@property (nonatomic) CGFloat leadingScreensForBatching;
-
-/*
- * A Boolean value that determines whether the table will be flipped.
- * If the value of this property is YES, the first cell node will be at the bottom of the table (as opposed to the top by default). This is useful for chat/messaging apps. The default value is NO.
- */
-@property (nonatomic) BOOL inverted;
-
-/**
- * The distance that the content view is inset from the table node edges. Defaults to UIEdgeInsetsZero.
- */
-@property (nonatomic) UIEdgeInsets contentInset;
-
-/**
- * The offset of the content view's origin from the table node's origin. Defaults to CGPointZero.
- */
-@property (nonatomic) CGPoint contentOffset;
-
-/**
- * Sets the offset from the content node’s origin to the table node’s origin.
- *
- * @param contentOffset The offset
- *
- * @param animated YES to animate to this new offset at a constant velocity, NO to not aniamte and immediately make the transition.
- */
-- (void)setContentOffset:(CGPoint)contentOffset animated:(BOOL)animated;
-
-/**
- * YES to automatically adjust the contentOffset when cells are inserted or deleted above
- * visible cells, maintaining the users' visible scroll position.
- *
- * @note This is only applied to non-animated updates. For animated updates, there is no way to
- * synchronize or "cancel out" the appearance of a scroll due to UITableView API limitations.
- *
- * default is NO.
- */
-@property (nonatomic) BOOL automaticallyAdjustsContentOffset;
-
-/*
- * A Boolean value that determines whether users can select a row.
- * If the value of this property is YES (the default), users can select rows. If you set it to NO, they cannot select rows. Setting this property affects cell selection only when the table view is not in editing mode. If you want to restrict selection of cells in editing mode, use `allowsSelectionDuringEditing`.
- */
-@property (nonatomic) BOOL allowsSelection;
-/*
- * A Boolean value that determines whether users can select cells while the table view is in editing mode.
- * If the value of this property is YES, users can select rows during editing. The default value is NO. If you want to restrict selection of cells regardless of mode, use allowsSelection.
- */
-@property (nonatomic) BOOL allowsSelectionDuringEditing;
-/*
- * A Boolean value that determines whether users can select more than one row outside of editing mode.
- * This property controls whether multiple rows can be selected simultaneously outside of editing mode. When the value of this property is YES, each row that is tapped acquires a selected appearance. Tapping the row again removes the selected appearance. If you access indexPathsForSelectedRows, you can get the index paths that identify the selected rows.
- */
-@property (nonatomic) BOOL allowsMultipleSelection;
-/*
- * A Boolean value that controls whether users can select more than one cell simultaneously in editing mode.
- * The default value of this property is NO. If you set it to YES, check marks appear next to selected rows in editing mode. In addition, UITableView does not query for editing styles when it goes into editing mode. If you access indexPathsForSelectedRows, you can get the index paths that identify the selected rows.
- */
-@property (nonatomic) BOOL allowsMultipleSelectionDuringEditing;
-
-/**
- * Tuning parameters for a range type in full mode.
- *
- * @param rangeType The range type to get the tuning parameters for.
- *
- * @return A tuning parameter value for the given range type in full mode.
- *
- * @see ASLayoutRangeMode
- * @see ASLayoutRangeType
- */
-- (ASRangeTuningParameters)tuningParametersForRangeType:(ASLayoutRangeType)rangeType AS_WARN_UNUSED_RESULT;
-
-/**
- * Set the tuning parameters for a range type in full mode.
- *
- * @param tuningParameters The tuning parameters to store for a range type.
- * @param rangeType The range type to set the tuning parameters for.
- *
- * @see ASLayoutRangeMode
- * @see ASLayoutRangeType
- */
-- (void)setTuningParameters:(ASRangeTuningParameters)tuningParameters forRangeType:(ASLayoutRangeType)rangeType;
-
-/**
- * Tuning parameters for a range type in the specified mode.
- *
- * @param rangeMode The range mode to get the running parameters for.
- * @param rangeType The range type to get the tuning parameters for.
- *
- * @return A tuning parameter value for the given range type in the given mode.
- *
- * @see ASLayoutRangeMode
- * @see ASLayoutRangeType
- */
-- (ASRangeTuningParameters)tuningParametersForRangeMode:(ASLayoutRangeMode)rangeMode rangeType:(ASLayoutRangeType)rangeType AS_WARN_UNUSED_RESULT;
-
-/**
- * Set the tuning parameters for a range type in the specified mode.
- *
- * @param tuningParameters The tuning parameters to store for a range type.
- * @param rangeMode The range mode to set the running parameters for.
- * @param rangeType The range type to set the tuning parameters for.
- *
- * @see ASLayoutRangeMode
- * @see ASLayoutRangeType
- */
-- (void)setTuningParameters:(ASRangeTuningParameters)tuningParameters forRangeMode:(ASLayoutRangeMode)rangeMode rangeType:(ASLayoutRangeType)rangeType;
-
-/**
- * Scrolls the table to the given row.
- *
- * @param indexPath The index path of the row.
- * @param scrollPosition Where the row should end up after the scroll.
- * @param animated Whether the scroll should be animated or not.
- *
- * This method must be called on the main thread.
- */
-- (void)scrollToRowAtIndexPath:(NSIndexPath *)indexPath atScrollPosition:(UITableViewScrollPosition)scrollPosition animated:(BOOL)animated;
-
-/**
- * Reload everything from scratch, destroying the working range and all cached nodes.
- *
- * @param completion block to run on completion of asynchronous loading or nil. If supplied, the block is run on
- * the main thread.
- * @warning This method is substantially more expensive than UITableView's version.
- */
-- (void)reloadDataWithCompletion:(nullable void (^)(void))completion;
-
-/**
- * Reload everything from scratch, destroying the working range and all cached nodes.
- *
- * @warning This method is substantially more expensive than UITableView's version.
- */
-- (void)reloadData;
-
-/**
- * Triggers a relayout of all nodes.
- *
- * @discussion This method invalidates and lays out every cell node in the table view.
- */
-- (void)relayoutItems;
-
-/**
- *  Perform a batch of updates asynchronously, optionally disabling all animations in the batch. This method must be called from the main thread.
- *  The data source must be updated to reflect the changes before the update block completes.
- *
- *  @param animated   NO to disable animations for this batch
- *  @param updates    The block that performs the relevant insert, delete, reload, or move operations.
- *  @param completion A completion handler block to execute when all of the operations are finished. This block takes a single
- *                    Boolean parameter that contains the value YES if all of the related animations completed successfully or
- *                    NO if they were interrupted. This parameter may be nil. If supplied, the block is run on the main thread.
- */
-- (void)performBatchAnimated:(BOOL)animated updates:(nullable AS_NOESCAPE void (^)(void))updates completion:(nullable void (^)(BOOL finished))completion;
-
-/**
- *  Perform a batch of updates asynchronously with animations in the batch. This method must be called from the main thread.
- *  The data source must be updated to reflect the changes before the update block completes.
- *
- *  @param updates    The block that performs the relevant insert, delete, reload, or move operations.
- *  @param completion A completion handler block to execute when all of the operations are finished. This block takes a single
- *                    Boolean parameter that contains the value YES if all of the related animations completed successfully or
- *                    NO if they were interrupted. This parameter may be nil. If supplied, the block is run on the main thread.
- */
-- (void)performBatchUpdates:(nullable AS_NOESCAPE void (^)(void))updates completion:(nullable void (^)(BOOL finished))completion;
-
-/**
- *  Returns YES if the ASCollectionNode is still processing changes from performBatchUpdates:.
- *  This is typically the concurrent allocation (calling nodeBlocks) and layout of newly inserted
- *  ASCellNodes. If YES is returned, then calling -waitUntilAllUpdatesAreProcessed may take tens of
- *  milliseconds to return as it blocks on these concurrent operations.
- *
- *  Returns NO if ASCollectionNode is fully synchronized with the underlying UICollectionView. This
- *  means that until the next performBatchUpdates: is called, it is safe to compare UIKit values
- *  (such as from UICollectionViewLayout) with your app's data source.
- *
- *  This method will always return NO if called immediately after -waitUntilAllUpdatesAreProcessed.
- */
-@property (nonatomic, readonly) BOOL isProcessingUpdates;
-
-/**
- *  Schedules a block to be performed (on the main thread) after processing of performBatchUpdates:
- *  is finished (completely synchronized to UIKit). The blocks will be run at the moment that
- *  -isProcessingUpdates changes from YES to NO;
- *
- *  When isProcessingUpdates == NO, the block is run block immediately (before the method returns).
- *
- *  Blocks scheduled by this mechanism are NOT guaranteed to run in the order they are scheduled.
- *  They may also be delayed if performBatchUpdates continues to be called; the blocks will wait until
- *  all running updates are finished.
- *
- *  Calling -waitUntilAllUpdatesAreProcessed is one way to flush any pending update completion blocks.
- */
-- (void)onDidFinishProcessingUpdates:(void (^)(void))didFinishProcessingUpdates;
-
-/**
- *  Blocks execution of the main thread until all section and item updates are committed to the view. This method must be called from the main thread.
- */
-- (void)waitUntilAllUpdatesAreProcessed;
-
-/**
- * Inserts one or more sections, with an option to animate the insertion.
- *
- * @param sections An index set that specifies the sections to insert.
- *
- * @param animation A constant that indicates how the insertion is to be animated. See UITableViewRowAnimation.
- *
- * @discussion This method must be called from the main thread. The asyncDataSource must be updated to reflect the changes
- * before this method is called.
- */
-- (void)insertSections:(NSIndexSet *)sections withRowAnimation:(UITableViewRowAnimation)animation;
-
-/**
- * Deletes one or more sections, with an option to animate the deletion.
- *
- * @param sections An index set that specifies the sections to delete.
- *
- * @param animation A constant that indicates how the deletion is to be animated. See UITableViewRowAnimation.
- *
- * @discussion This method must be called from the main thread. The asyncDataSource must be updated to reflect the changes
- * before this method is called.
- */
-- (void)deleteSections:(NSIndexSet *)sections withRowAnimation:(UITableViewRowAnimation)animation;
-
-/**
- * Reloads the specified sections using a given animation effect.
- *
- * @param sections An index set that specifies the sections to reload.
- *
- * @param animation A constant that indicates how the reloading is to be animated. See UITableViewRowAnimation.
- *
- * @discussion This method must be called from the main thread. The asyncDataSource must be updated to reflect the changes
- * before this method is called.
- */
-- (void)reloadSections:(NSIndexSet *)sections withRowAnimation:(UITableViewRowAnimation)animation;
-
-/**
- * Moves a section to a new location.
- *
- * @param section The index of the section to move.
- *
- * @param newSection The index that is the destination of the move for the section.
- *
- * @discussion This method must be called from the main thread. The asyncDataSource must be updated to reflect the changes
- * before this method is called.
- */
-- (void)moveSection:(NSInteger)section toSection:(NSInteger)newSection;
-
-/**
- * Inserts rows at the locations identified by an array of index paths, with an option to animate the insertion.
- *
- * @param indexPaths An array of NSIndexPath objects, each representing a row index and section index that together identify a row.
- *
- * @param animation A constant that indicates how the insertion is to be animated. See UITableViewRowAnimation.
- *
- * @discussion This method must be called from the main thread. The asyncDataSource must be updated to reflect the changes
- * before this method is called.
- */
-- (void)insertRowsAtIndexPaths:(NSArray<NSIndexPath *> *)indexPaths withRowAnimation:(UITableViewRowAnimation)animation;
-
-/**
- * Deletes the rows specified by an array of index paths, with an option to animate the deletion.
- *
- * @param indexPaths An array of NSIndexPath objects identifying the rows to delete.
- *
- * @param animation A constant that indicates how the deletion is to be animated. See UITableViewRowAnimation.
- *
- * @discussion This method must be called from the main thread. The asyncDataSource must be updated to reflect the changes
- * before this method is called.
- */
-- (void)deleteRowsAtIndexPaths:(NSArray<NSIndexPath *> *)indexPaths withRowAnimation:(UITableViewRowAnimation)animation;
-
-/**
- * Reloads the specified rows using a given animation effect.
- *
- * @param indexPaths An array of NSIndexPath objects identifying the rows to reload.
- *
- * @param animation A constant that indicates how the reloading is to be animated. See UITableViewRowAnimation.
- *
- * @discussion This method must be called from the main thread. The asyncDataSource must be updated to reflect the changes
- * before this method is called.
- */
-- (void)reloadRowsAtIndexPaths:(NSArray<NSIndexPath *> *)indexPaths withRowAnimation:(UITableViewRowAnimation)animation;
-
-/**
- * Moves the row at a specified location to a destination location.
- *
- * @param indexPath The index path identifying the row to move.
- *
- * @param newIndexPath The index path that is the destination of the move for the row.
- *
- * @discussion This method must be called from the main thread. The asyncDataSource must be updated to reflect the changes
- * before this method is called.
- */
-- (void)moveRowAtIndexPath:(NSIndexPath *)indexPath toIndexPath:(NSIndexPath *)newIndexPath;
-
-#pragma mark - Selection
-
-/**
- * Selects a row in the table view identified by index path, optionally scrolling the row to a location in the table view.
- * This method does not cause any selection-related delegate methods to be called.
- *
- * @param indexPath An index path identifying a row in the table view.
- *
- * @param animated Specify YES to animate the change in the selection or NO to make the change without animating it.
- *
- * @param scrollPosition A constant that identifies a relative position in the table view (top, middle, bottom) for the row when scrolling concludes. See `UITableViewScrollPosition` for descriptions of valid constants.
- *
- * @discussion This method must be called from the main thread.
- */
-- (void)selectRowAtIndexPath:(nullable NSIndexPath *)indexPath animated:(BOOL)animated scrollPosition:(UITableViewScrollPosition)scrollPosition;
-
-/*
- * Deselects a given row identified by index path, with an option to animate the deselection.
- * This method does not cause any selection-related delegate methods to be called.
- * Calling this method does not cause any scrolling to the deselected row.
- *
- * @param indexPath An index path identifying a row in the table view.
- *
- * @param animated Specify YES to animate the change in the selection or NO to make the change without animating it.
- *
- * @discussion This method must be called from the main thread.
- */
-- (void)deselectRowAtIndexPath:(NSIndexPath *)indexPath animated:(BOOL)animated;
-
-#pragma mark - Querying Data
-
-/**
- * Retrieves the number of rows in the given section.
- *
- * @param section The section.
- *
- * @return The number of rows.
- */
-- (NSInteger)numberOfRowsInSection:(NSInteger)section AS_WARN_UNUSED_RESULT;
-
-/**
- * The number of sections in the table node.
- */
-@property (nonatomic, readonly) NSInteger numberOfSections;
-
-/**
- * Similar to -visibleCells.
- *
- * @return an array containing the nodes being displayed on screen. This must be called on the main thread.
- */
-@property (nonatomic, readonly) NSArray<__kindof ASCellNode *> *visibleNodes;
-
-/**
- * Retrieves the node for the row at the given index path.
- */
-- (nullable __kindof ASCellNode *)nodeForRowAtIndexPath:(NSIndexPath *)indexPath AS_WARN_UNUSED_RESULT;
-
-/**
- * Similar to -indexPathForCell:.
- *
- * @param cellNode a node for a row.
- *
- * @return The index path to this row, if it exists.
- *
- * @discussion This method will return @c nil for a node that is still being
- *   displayed in the table view, if the data source has deleted the row.
- *   That is, the node is visible but it no longer corresponds
- *   to any item in the data source and will be removed soon.
- */
-- (nullable NSIndexPath *)indexPathForNode:(ASCellNode *)cellNode AS_WARN_UNUSED_RESULT;
-
-/**
- * Similar to -[UITableView rectForRowAtIndexPath:]
- *
- * @param indexPath An index path identifying a row in the table view.
- *
- * @return A rectangle defining the area in which the table view draws the row or CGRectZero if indexPath is invalid.
- *
- * @discussion This method must be called from the main thread.
- */
-- (CGRect)rectForRowAtIndexPath:(NSIndexPath *)indexPath AS_WARN_UNUSED_RESULT;
-
-/**
- * Similar to -[UITableView cellForRowAtIndexPath:]
- *
- * @param indexPath An index path identifying a row in the table view.
- *
- * @return An object representing a cell of the table, or nil if the cell is not visible or indexPath is out of range.
- *
- * @discussion This method must be called from the main thread.
- */
-- (nullable __kindof UITableViewCell *)cellForRowAtIndexPath:(NSIndexPath *)indexPath AS_WARN_UNUSED_RESULT;
-
-/**
- * Similar to UITableView.indexPathForSelectedRow
- *
- * @return The value of this property is an index path identifying the row and section
- *   indexes of the selected row, or nil if the index path is invalid. If there are multiple selections,
- *   this property contains the first index-path object in the array of row selections;
- *   this object has the lowest index values for section and row.
- *
- * @discussion This method must be called from the main thread.
- */
-@property (nullable, nonatomic, copy, readonly) NSIndexPath *indexPathForSelectedRow;
-
-@property (nonatomic, readonly, nullable) NSArray<NSIndexPath *> *indexPathsForSelectedRows;
-
-/**
- * Similar to -[UITableView indexPathForRowAtPoint:]
- *
- * @param point A point in the local coordinate system of the table view (the table view’€™s bounds).
- *
- * @return An index path representing the row and section associated with point, 
- *  or nil if the point is out of the bounds of any row.
- *
- * @discussion This method must be called from the main thread.
- */
-- (nullable NSIndexPath *)indexPathForRowAtPoint:(CGPoint)point AS_WARN_UNUSED_RESULT;
-
-/**
- * Similar to -[UITableView indexPathsForRowsInRect:]
- *
- * @param rect A rectangle defining an area of the table view in local coordinates.
- *
- * @return An array of NSIndexPath objects each representing a row and section index identifying a row within rect.
- *  Returns an empty array if there aren’t any rows to return.
- *
- * @discussion This method must be called from the main thread.
- */
-- (nullable NSArray<NSIndexPath *> *)indexPathsForRowsInRect:(CGRect)rect AS_WARN_UNUSED_RESULT;
-
-/**
- * Similar to -[UITableView indexPathsForVisibleRows]
- *
- * @return The value of this property is an array of NSIndexPath objects each representing a row index and section index
- *  that together identify a visible row in the table view. If no rows are visible, the value is nil.
- *
- * @discussion This method must be called from the main thread.
- */
-- (NSArray<NSIndexPath *> *)indexPathsForVisibleRows AS_WARN_UNUSED_RESULT;
-
-@end
-
-/**
- * This is a node-based UITableViewDataSource.
- */
-@protocol ASTableDataSource <ASCommonTableDataSource, NSObject>
-
-@optional
-
-/**
- * Asks the data source for the number of sections in the table node.
- *
- * @see @c numberOfSectionsInTableView:
- */
-- (NSInteger)numberOfSectionsInTableNode:(ASTableNode *)tableNode;
-
-/**
- * Asks the data source for the number of rows in the given section of the table node.
- *
- * @see @c numberOfSectionsInTableView:
- */
-- (NSInteger)tableNode:(ASTableNode *)tableNode numberOfRowsInSection:(NSInteger)section;
-
-/**
- * Asks the data source for a block to create a node to represent the row at the given index path.
- * The block will be run by the table node concurrently in the background before the row is inserted
- * into the table view.
- *
- * @param tableNode The sender.
- * @param indexPath The index path of the row.
- *
- * @return a block that creates the node for display at this indexpath.
- *   Must be thread-safe (can be called on the main thread or a background
- *   queue) and should not implement reuse (it will be called once per row).
- *
- * @note This method takes precedence over tableNode:nodeForRowAtIndexPath: if implemented.
- */
-- (ASCellNodeBlock)tableNode:(ASTableNode *)tableNode nodeBlockForRowAtIndexPath:(NSIndexPath *)indexPath;
-
-/**
- * Asks the data source for a node to represent the row at the given index path.
- *
- * @param tableNode The sender.
- * @param indexPath The index path of the row.
- *
- * @return a node to display for this row. This will be called on the main thread and should not implement reuse (it will be called once per row). Unlike UITableView's version, this method
- * is not called when the row is about to display.
- */
-- (ASCellNode *)tableNode:(ASTableNode *)tableNode nodeForRowAtIndexPath:(NSIndexPath *)indexPath;
-
-/**
- * Similar to -tableView:cellForRowAtIndexPath:.
- *
- * @param tableView The sender.
- *
- * @param indexPath The index path of the requested node.
- *
- * @return a node for display at this indexpath. This will be called on the main thread and should not implement reuse (it will be called once per row). Unlike UITableView's version, this method
- * is not called when the row is about to display.
- */
-- (ASCellNode *)tableView:(ASTableView *)tableView nodeForRowAtIndexPath:(NSIndexPath *)indexPath AS_WARN_UNUSED_RESULT ASDISPLAYNODE_DEPRECATED_MSG("Use ASTableNode's method instead.");
-
-/**
- * Similar to -tableView:nodeForRowAtIndexPath:
- * This method takes precedence over tableView:nodeForRowAtIndexPath: if implemented.
- * @param tableView The sender.
- *
- * @param indexPath The index path of the requested node.
- *
- * @return a block that creates the node for display at this indexpath.
- *   Must be thread-safe (can be called on the main thread or a background
- *   queue) and should not implement reuse (it will be called once per row).
- */
-- (ASCellNodeBlock)tableView:(ASTableView *)tableView nodeBlockForRowAtIndexPath:(NSIndexPath *)indexPath AS_WARN_UNUSED_RESULT ASDISPLAYNODE_DEPRECATED_MSG("Use ASTableNode's method instead.");
-
-/**
- * Indicator to lock the data source for data fetching in async mode.
- * We should not update the data source until the data source has been unlocked. Otherwise, it will incur data inconsistency or exception
- * due to the data access in async mode.
- *
- * @param tableView The sender.
- * @deprecated The data source is always accessed on the main thread, and this method will not be called.
- */
-- (void)tableViewLockDataSource:(ASTableView *)tableView ASDISPLAYNODE_DEPRECATED_MSG("Data source accesses are on the main thread. Method will not be called.");
-
-/**
- * Indicator to unlock the data source for data fetching in asyn mode.
- * We should not update the data source until the data source has been unlocked. Otherwise, it will incur data inconsistency or exception
- * due to the data access in async mode.
- *
- * @param tableView The sender.
- * @deprecated The data source is always accessed on the main thread, and this method will not be called.
- */
-- (void)tableViewUnlockDataSource:(ASTableView *)tableView ASDISPLAYNODE_DEPRECATED_MSG("Data source accesses are on the main thread. Method will not be called.");
-
-/**
- * Generate a unique identifier for an element in a table. This helps state restoration persist the scroll position
- *  of a table view even when the data in that table changes. See the documentation for UIDataSourceModelAssociation for more information.
- *
- * @param indexPath The index path of the requested node.
- *
- * @param tableNode The sender.
- *
- * @return a unique identifier for the element at the given path. Return nil if the index path does not exist in the table.
- */
-- (nullable NSString *)modelIdentifierForElementAtIndexPath:(NSIndexPath *)indexPath inNode:(ASTableNode *)tableNode;
-
-/**
- * Similar to -tableView:cellForRowAtIndexPath:. See the documentation for UIDataSourceModelAssociation for more information.
- *
- * @param identifier The model identifier of the element, previously generated by a call to modelIdentifierForElementAtIndexPath.
- *
- * @param tableNode The sender.
- *
- * @return the index path to the current position of the matching element in the table. Return nil if the element is not found.
- */
-- (nullable NSIndexPath *)indexPathForElementWithModelIdentifier:(NSString *)identifier inNode:(ASTableNode *)tableNode;
-
-@end
-
-/**
- * This is a node-based UITableViewDelegate.
- *
- * Note that -tableView:heightForRowAtIndexPath: has been removed; instead, your custom ASCellNode subclasses are
- * responsible for deciding their preferred onscreen height in -calculateSizeThatFits:.
- */
-@protocol ASTableDelegate <ASCommonTableViewDelegate, NSObject>
-
-@optional
-
-- (void)tableNode:(ASTableNode *)tableNode willDisplayRowWithNode:(ASCellNode *)node;
-
-- (void)tableNode:(ASTableNode *)tableNode didEndDisplayingRowWithNode:(ASCellNode *)node;
-
-- (nullable NSIndexPath *)tableNode:(ASTableNode *)tableNode willSelectRowAtIndexPath:(NSIndexPath *)indexPath;
-
-- (void)tableNode:(ASTableNode *)tableNode didSelectRowAtIndexPath:(NSIndexPath *)indexPath;
-
-- (nullable NSIndexPath *)tableNode:(ASTableNode *)tableNode willDeselectRowAtIndexPath:(NSIndexPath *)indexPath;
-
-- (void)tableNode:(ASTableNode *)tableNode didDeselectRowAtIndexPath:(NSIndexPath *)indexPath;
-
-- (BOOL)tableNode:(ASTableNode *)tableNode shouldHighlightRowAtIndexPath:(NSIndexPath *)indexPath;
-- (void)tableNode:(ASTableNode *)tableNode didHighlightRowAtIndexPath:(NSIndexPath *)indexPath;
-- (void)tableNode:(ASTableNode *)tableNode didUnhighlightRowAtIndexPath:(NSIndexPath *)indexPath;
-
-- (BOOL)tableNode:(ASTableNode *)tableNode shouldShowMenuForRowAtIndexPath:(NSIndexPath *)indexPath;
-- (BOOL)tableNode:(ASTableNode *)tableNode canPerformAction:(SEL)action forRowAtIndexPath:(NSIndexPath *)indexPath withSender:(nullable id)sender;
-- (void)tableNode:(ASTableNode *)tableNode performAction:(SEL)action forRowAtIndexPath:(NSIndexPath *)indexPath withSender:(nullable id)sender;
-
-/**
- * Provides the constrained size range for measuring the row at the index path.
- * Note: the widths in the returned size range are ignored!
- *
- * @param tableNode The sender.
- *
- * @param indexPath The index path of the node.
- *
- * @return A constrained size range for layout the node at this index path.
- */
-- (ASSizeRange)tableNode:(ASTableNode *)tableNode constrainedSizeForRowAtIndexPath:(NSIndexPath *)indexPath;
-
-/**
- * Receive a message that the tableView is near the end of its data set and more data should be fetched if necessary.
- *
- * @param tableNode The sender.
- * @param context A context object that must be notified when the batch fetch is completed.
- *
- * @discussion You must eventually call -completeBatchFetching: with an argument of YES in order to receive future
- * notifications to do batch fetches. This method is called on a background queue.
- *
- * ASTableView currently only supports batch events for tail loads. If you require a head load, consider implementing a
- * UIRefreshControl.
- */
-- (void)tableNode:(ASTableNode *)tableNode willBeginBatchFetchWithContext:(ASBatchContext *)context;
-
-/**
- * Tell the tableView if batch fetching should begin.
- *
- * @param tableNode The sender.
- *
- * @discussion Use this method to conditionally fetch batches. Example use cases are: limiting the total number of
- * objects that can be fetched or no network connection.
- *
- * If not implemented, the tableView assumes that it should notify its asyncDelegate when batch fetching
- * should occur.
- */
-- (BOOL)shouldBatchFetchForTableNode:(ASTableNode *)tableNode;
-
-/**
- * Informs the delegate that the table view will add the given node
- * at the given index path to the view hierarchy.
- *
- * @param tableView The sender.
- * @param node The node that will be displayed.
- * @param indexPath The index path of the row that will be displayed.
- *
- * @warning AsyncDisplayKit processes table view edits asynchronously. The index path
- *   passed into this method may not correspond to the same item in your data source
- *   if your data source has been updated since the last edit was processed.
- */
-- (void)tableView:(ASTableView *)tableView willDisplayNode:(ASCellNode *)node forRowAtIndexPath:(NSIndexPath *)indexPath ASDISPLAYNODE_DEPRECATED_MSG("Use ASTableNode's method instead.");
-
-/**
- * Informs the delegate that the table view did remove the provided node from the view hierarchy.
- * This may be caused by the node scrolling out of view, or by deleting the row
- * or its containing section with @c deleteRowsAtIndexPaths:withRowAnimation: or @c deleteSections:withRowAnimation: .
- *
- * @param tableView The sender.
- * @param node The node which was removed from the view hierarchy.
- * @param indexPath The index path at which the node was located before the removal.
- *
- * @warning AsyncDisplayKit processes table view edits asynchronously. The index path
- *   passed into this method may not correspond to the same item in your data source
- *   if your data source has been updated since the last edit was processed.
- */
-- (void)tableView:(ASTableView *)tableView didEndDisplayingNode:(ASCellNode *)node forRowAtIndexPath:(NSIndexPath *)indexPath ASDISPLAYNODE_DEPRECATED_MSG("Use ASTableNode's method instead.");
-
-/**
- * Receive a message that the tableView is near the end of its data set and more data should be fetched if necessary.
- *
- * @param tableView The sender.
- * @param context A context object that must be notified when the batch fetch is completed.
- *
- * @discussion You must eventually call -completeBatchFetching: with an argument of YES in order to receive future
- * notifications to do batch fetches. This method is called on a background queue.
- *
- * ASTableView currently only supports batch events for tail loads. If you require a head load, consider implementing a
- * UIRefreshControl.
- */
-- (void)tableView:(ASTableView *)tableView willBeginBatchFetchWithContext:(ASBatchContext *)context ASDISPLAYNODE_DEPRECATED_MSG("Use ASTableNode's method instead.");
-
-/**
- * Tell the tableView if batch fetching should begin.
- *
- * @param tableView The sender.
- *
- * @discussion Use this method to conditionally fetch batches. Example use cases are: limiting the total number of
- * objects that can be fetched or no network connection.
- *
- * If not implemented, the tableView assumes that it should notify its asyncDelegate when batch fetching
- * should occur.
- */
-- (BOOL)shouldBatchFetchForTableView:(ASTableView *)tableView AS_WARN_UNUSED_RESULT ASDISPLAYNODE_DEPRECATED_MSG("Use ASTableNode's method instead.");
-
-/**
- * Provides the constrained size range for measuring the row at the index path.
- * Note: the widths in the returned size range are ignored!
- *
- * @param tableView The sender.
- *
- * @param indexPath The index path of the node.
- *
- * @return A constrained size range for layout the node at this index path.
- */
-- (ASSizeRange)tableView:(ASTableView *)tableView constrainedSizeForRowAtIndexPath:(NSIndexPath *)indexPath AS_WARN_UNUSED_RESULT ASDISPLAYNODE_DEPRECATED_MSG("Use ASTableNode's method instead.");
-
-/**
- * Informs the delegate that the table view will add the node
- * at the given index path to the view hierarchy.
- *
- * @param tableView The sender.
- * @param indexPath The index path of the row that will be displayed.
- *
- * @warning AsyncDisplayKit processes table view edits asynchronously. The index path
- *   passed into this method may not correspond to the same item in your data source
- *   if your data source has been updated since the last edit was processed.
- *
- * This method is deprecated. Use @c tableView:willDisplayNode:forRowAtIndexPath: instead.
- */
-- (void)tableView:(ASTableView *)tableView willDisplayNodeForRowAtIndexPath:(NSIndexPath *)indexPath ASDISPLAYNODE_DEPRECATED_MSG("Use ASTableNode's method instead.");
-
-@end
-
-@interface ASTableNode (Deprecated)
-
-- (void)waitUntilAllUpdatesAreCommitted ASDISPLAYNODE_DEPRECATED_MSG("This method has been renamed to -waitUntilAllUpdatesAreProcessed.");
-
-@end
-
-NS_ASSUME_NONNULL_END
-
-#endif
diff --git a/submodules/AsyncDisplayKit/Source/ASTableNode.mm b/submodules/AsyncDisplayKit/Source/ASTableNode.mm
deleted file mode 100644
index b1ce6a6274..0000000000
--- a/submodules/AsyncDisplayKit/Source/ASTableNode.mm
+++ /dev/null
@@ -1,871 +0,0 @@
-//
-//  ASTableNode.mm
-//  Texture
-//
-//  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.
-//  Changes after 4/13/2017 are: Copyright (c) Pinterest, Inc.  All rights reserved.
-//  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
-//
-
-#ifndef MINIMAL_ASDK
-#import <AsyncDisplayKit/ASTableNode.h>
-#import <AsyncDisplayKit/ASTableNode+Beta.h>
-
-#import <AsyncDisplayKit/ASCollectionElement.h>
-#import <AsyncDisplayKit/ASElementMap.h>
-#import <AsyncDisplayKit/ASTableViewInternal.h>
-#import <AsyncDisplayKit/ASDisplayNode+Subclasses.h>
-#import <AsyncDisplayKit/ASDisplayNode+FrameworkPrivate.h>
-#import <AsyncDisplayKit/ASInternalHelpers.h>
-#import <AsyncDisplayKit/ASCellNode+Internal.h>
-#import <AsyncDisplayKit/AsyncDisplayKit+Debug.h>
-#import <AsyncDisplayKit/ASTableView+Undeprecated.h>
-#import <AsyncDisplayKit/ASThread.h>
-#import <AsyncDisplayKit/ASDisplayNode+Beta.h>
-#import <AsyncDisplayKit/ASRangeController.h>
-#import <AsyncDisplayKit/ASAbstractLayoutController+FrameworkPrivate.h>
-
-#pragma mark - _ASTablePendingState
-
-@interface _ASTablePendingState : NSObject {
-@public
-  std::vector<std::vector<ASRangeTuningParameters>> _tuningParameters;
-}
-@property (nonatomic, weak) id <ASTableDelegate>   delegate;
-@property (nonatomic, weak) id <ASTableDataSource> dataSource;
-@property (nonatomic) ASLayoutRangeMode rangeMode;
-@property (nonatomic) BOOL allowsSelection;
-@property (nonatomic) BOOL allowsSelectionDuringEditing;
-@property (nonatomic) BOOL allowsMultipleSelection;
-@property (nonatomic) BOOL allowsMultipleSelectionDuringEditing;
-@property (nonatomic) BOOL inverted;
-@property (nonatomic) CGFloat leadingScreensForBatching;
-@property (nonatomic) UIEdgeInsets contentInset;
-@property (nonatomic) CGPoint contentOffset;
-@property (nonatomic) BOOL animatesContentOffset;
-@property (nonatomic) BOOL automaticallyAdjustsContentOffset;
-
-@end
-
-@implementation _ASTablePendingState
-
-#pragma mark - Lifecycle
-
-- (instancetype)init
-{
-  self = [super init];
-  if (self) {
-    _rangeMode = ASLayoutRangeModeUnspecified;
-    _tuningParameters = [ASAbstractLayoutController defaultTuningParameters];
-    _allowsSelection = YES;
-    _allowsSelectionDuringEditing = NO;
-    _allowsMultipleSelection = NO;
-    _allowsMultipleSelectionDuringEditing = NO;
-    _inverted = NO;
-    _leadingScreensForBatching = 2;
-    _contentInset = UIEdgeInsetsZero;
-    _contentOffset = CGPointZero;
-    _animatesContentOffset = NO;
-    _automaticallyAdjustsContentOffset = NO;
-  }
-  return self;
-}
-
-#pragma mark Tuning Parameters
-
-- (ASRangeTuningParameters)tuningParametersForRangeType:(ASLayoutRangeType)rangeType
-{
-  return [self tuningParametersForRangeMode:ASLayoutRangeModeFull rangeType:rangeType];
-}
-
-- (void)setTuningParameters:(ASRangeTuningParameters)tuningParameters forRangeType:(ASLayoutRangeType)rangeType
-{
-  return [self setTuningParameters:tuningParameters forRangeMode:ASLayoutRangeModeFull rangeType:rangeType];
-}
-
-- (ASRangeTuningParameters)tuningParametersForRangeMode:(ASLayoutRangeMode)rangeMode rangeType:(ASLayoutRangeType)rangeType
-{
-  ASDisplayNodeAssert(rangeMode < _tuningParameters.size() && rangeType < _tuningParameters[rangeMode].size(), @"Requesting a range that is OOB for the configured tuning parameters");
-  return _tuningParameters[rangeMode][rangeType];
-}
-
-- (void)setTuningParameters:(ASRangeTuningParameters)tuningParameters forRangeMode:(ASLayoutRangeMode)rangeMode rangeType:(ASLayoutRangeType)rangeType
-{
-  ASDisplayNodeAssert(rangeMode < _tuningParameters.size() && rangeType < _tuningParameters[rangeMode].size(), @"Setting a range that is OOB for the configured tuning parameters");
-  _tuningParameters[rangeMode][rangeType] = tuningParameters;
-}
-
-@end
-
-#pragma mark - ASTableView
-
-@interface ASTableNode ()
-{
-  AS::RecursiveMutex _environmentStateLock;
-  id<ASBatchFetchingDelegate> _batchFetchingDelegate;
-}
-
-@property (nonatomic) _ASTablePendingState *pendingState;
-@property (nonatomic, weak) ASRangeController *rangeController;
-@end
-
-@implementation ASTableNode
-
-#pragma mark Lifecycle
-
-- (instancetype)initWithStyle:(UITableViewStyle)style
-{
-  if (self = [super init]) {
-    __weak __typeof__(self) weakSelf = self;
-    [self setViewBlock:^{
-      // Variable will be unused if event logging is off.
-      __unused __typeof__(self) strongSelf = weakSelf;
-      return [[ASTableView alloc] _initWithFrame:CGRectZero style:style dataControllerClass:nil owningNode:strongSelf eventLog:ASDisplayNodeGetEventLog(strongSelf)];
-    }];
-  }
-  return self;
-}
-
-- (instancetype)init
-{
-  return [self initWithStyle:UITableViewStylePlain];
-}
-
-#if ASDISPLAYNODE_ASSERTIONS_ENABLED
-- (void)dealloc
-{
-  if (self.nodeLoaded) {
-    __weak UIView *view = self.view;
-    ASPerformBlockOnMainThread(^{
-      ASDisplayNodeCAssertNil(view.superview, @"Node's view should be removed from hierarchy.");
-    });
-  }
-}
-#endif
-
-#pragma mark ASDisplayNode
-
-- (void)didLoad
-{
-  [super didLoad];
-  
-  ASTableView *view = self.view;
-  view.tableNode    = self;
-  
-  _rangeController = view.rangeController;
-
-  if (_pendingState) {
-    _ASTablePendingState *pendingState        = _pendingState;
-    self.pendingState                         = nil;
-    view.asyncDelegate                        = pendingState.delegate;
-    view.asyncDataSource                      = pendingState.dataSource;
-    view.inverted                             = pendingState.inverted;
-    view.allowsSelection                      = pendingState.allowsSelection;
-    view.allowsSelectionDuringEditing         = pendingState.allowsSelectionDuringEditing;
-    view.allowsMultipleSelection              = pendingState.allowsMultipleSelection;
-    view.allowsMultipleSelectionDuringEditing = pendingState.allowsMultipleSelectionDuringEditing;
-    view.automaticallyAdjustsContentOffset    = pendingState.automaticallyAdjustsContentOffset;
-
-    UIEdgeInsets contentInset = pendingState.contentInset;
-    if (!UIEdgeInsetsEqualToEdgeInsets(contentInset, UIEdgeInsetsZero)) {
-      view.contentInset = contentInset;
-    }
-
-    CGPoint contentOffset = pendingState.contentOffset;
-    if (!CGPointEqualToPoint(contentOffset, CGPointZero)) {
-      [view setContentOffset:contentOffset animated:pendingState.animatesContentOffset];
-    }
-      
-    const auto tuningParametersVector = pendingState->_tuningParameters;
-    const auto tuningParametersVectorSize = tuningParametersVector.size();
-    for (NSInteger rangeMode = 0; rangeMode < tuningParametersVectorSize; rangeMode++) {
-      const auto tuningparametersRangeModeVector = tuningParametersVector[rangeMode];
-      const auto tuningParametersVectorRangeModeSize = tuningparametersRangeModeVector.size();
-      for (NSInteger rangeType = 0; rangeType < tuningParametersVectorRangeModeSize; rangeType++) {
-        ASRangeTuningParameters tuningParameters = tuningparametersRangeModeVector[rangeType];
-        [_rangeController setTuningParameters:tuningParameters
-                                 forRangeMode:(ASLayoutRangeMode)rangeMode
-                                    rangeType:(ASLayoutRangeType)rangeType];
-      }
-    }
-    
-    if (pendingState.rangeMode != ASLayoutRangeModeUnspecified) {
-      [_rangeController updateCurrentRangeWithMode:pendingState.rangeMode];
-    }
-  }
-}
-
-- (ASTableView *)view
-{
-  return (ASTableView *)[super view];
-}
-
-- (void)clearContents
-{
-  [super clearContents];
-  [self.rangeController clearContents];
-}
-
-- (void)interfaceStateDidChange:(ASInterfaceState)newState fromState:(ASInterfaceState)oldState
-{
-  [super interfaceStateDidChange:newState fromState:oldState];
-  [ASRangeController layoutDebugOverlayIfNeeded];
-}
-
-- (void)didEnterPreloadState
-{
-  [super didEnterPreloadState];
-  // Intentionally allocate the view here and trigger a layout pass on it, which in turn will trigger the intial data load.
-  // We can get rid of this call later when ASDataController, ASRangeController and ASCollectionLayout can operate without the view.
-  [self.view layoutIfNeeded];
-}
-
-#if ASRangeControllerLoggingEnabled
-- (void)didEnterVisibleState
-{
-  [super didEnterVisibleState];
-  NSLog(@"%@ - visible: YES", self);
-}
-
-- (void)didExitVisibleState
-{
-  [super didExitVisibleState];
-  NSLog(@"%@ - visible: NO", self);
-}
-#endif
-
-- (void)didExitPreloadState
-{
-  [super didExitPreloadState];
-  [self.rangeController clearPreloadedData];
-}
-
-#pragma mark Setter / Getter
-
-// TODO: Implement this without the view. Then revisit ASLayoutElementCollectionTableSetTraitCollection
-- (ASDataController *)dataController
-{
-  return self.view.dataController;
-}
-
-- (_ASTablePendingState *)pendingState
-{
-  if (!_pendingState && ![self isNodeLoaded]) {
-    _pendingState = [[_ASTablePendingState alloc] init];
-  }
-  ASDisplayNodeAssert(![self isNodeLoaded] || !_pendingState, @"ASTableNode should not have a pendingState once it is loaded");
-  return _pendingState;
-}
-
-- (void)setInverted:(BOOL)inverted
-{
-  self.transform = inverted ? CATransform3DMakeScale(1, -1, 1)  : CATransform3DIdentity;
-  if ([self pendingState]) {
-    _pendingState.inverted = inverted;
-  } else {
-    ASDisplayNodeAssert([self isNodeLoaded], @"ASTableNode should be loaded if pendingState doesn't exist");
-    self.view.inverted = inverted;
-  }
-}
-
-- (BOOL)inverted
-{
-  if ([self pendingState]) {
-    return _pendingState.inverted;
-  } else {
-    return self.view.inverted;
-  }
-}
-
-- (void)setLeadingScreensForBatching:(CGFloat)leadingScreensForBatching
-{
-  _ASTablePendingState *pendingState = self.pendingState;
-  if (pendingState) {
-    pendingState.leadingScreensForBatching = leadingScreensForBatching;
-  } else {
-    ASDisplayNodeAssert(self.nodeLoaded, @"ASTableNode should be loaded if pendingState doesn't exist");
-    self.view.leadingScreensForBatching = leadingScreensForBatching;
-  }
-}
-
-- (CGFloat)leadingScreensForBatching
-{
-  _ASTablePendingState *pendingState = self.pendingState;
-  if (pendingState) {
-    return pendingState.leadingScreensForBatching;
-  } else {
-    return self.view.leadingScreensForBatching;
-  }
-}
-
-- (void)setContentInset:(UIEdgeInsets)contentInset
-{
-  _ASTablePendingState *pendingState = self.pendingState;
-  if (pendingState) {
-    pendingState.contentInset = contentInset;
-  } else {
-    ASDisplayNodeAssert(self.nodeLoaded, @"ASTableNode should be loaded if pendingState doesn't exist");
-    self.view.contentInset = contentInset;
-  }
-}
-
-- (UIEdgeInsets)contentInset
-{
-  _ASTablePendingState *pendingState = self.pendingState;
-  if (pendingState) {
-    return pendingState.contentInset;
-  } else {
-    return self.view.contentInset;
-  }
-}
-
-- (void)setContentOffset:(CGPoint)contentOffset
-{
-  [self setContentOffset:contentOffset animated:NO];
-}
-
-- (void)setContentOffset:(CGPoint)contentOffset animated:(BOOL)animated
-{
-  _ASTablePendingState *pendingState = self.pendingState;
-  if (pendingState) {
-    pendingState.contentOffset = contentOffset;
-    pendingState.animatesContentOffset = animated;
-  } else {
-    ASDisplayNodeAssert(self.nodeLoaded, @"ASTableNode should be loaded if pendingState doesn't exist");
-    [self.view setContentOffset:contentOffset animated:animated];
-  }
-}
-
-- (CGPoint)contentOffset
-{
-  _ASTablePendingState *pendingState = self.pendingState;
-  if (pendingState) {
-    return pendingState.contentOffset;
-  } else {
-    return self.view.contentOffset;
-  }
-}
-
-- (void)setAutomaticallyAdjustsContentOffset:(BOOL)automaticallyAdjustsContentOffset
-{
-  _ASTablePendingState *pendingState = self.pendingState;
-  if (pendingState) {
-    pendingState.automaticallyAdjustsContentOffset = automaticallyAdjustsContentOffset;
-  } else {
-    ASDisplayNodeAssert(self.nodeLoaded, @"ASTableNode should be loaded if pendingState doesn't exist");
-    self.view.automaticallyAdjustsContentOffset = automaticallyAdjustsContentOffset;
-  }
-}
-
-- (BOOL)automaticallyAdjustsContentOffset
-{
-  _ASTablePendingState *pendingState = self.pendingState;
-  if (pendingState) {
-    return pendingState.automaticallyAdjustsContentOffset;
-  } else {
-    return self.view.automaticallyAdjustsContentOffset;
-  }
-}
-
-- (void)setDelegate:(id <ASTableDelegate>)delegate
-{
-  if ([self pendingState]) {
-    _pendingState.delegate = delegate;
-  } else {
-    ASDisplayNodeAssert([self isNodeLoaded], @"ASTableNode should be loaded if pendingState doesn't exist");
-
-    // Manually trampoline to the main thread. The view requires this be called on main
-    // and asserting here isn't an option – it is a common pattern for users to clear
-    // the delegate/dataSource in dealloc, which may be running on a background thread.
-    // It is important that we avoid retaining self in this block, so that this method is dealloc-safe.
-    ASTableView *view = self.view;
-    ASPerformBlockOnMainThread(^{
-      view.asyncDelegate = delegate;
-    });
-  }
-}
-
-- (id <ASTableDelegate>)delegate
-{
-  if ([self pendingState]) {
-    return _pendingState.delegate;
-  } else {
-    return self.view.asyncDelegate;
-  }
-}
-
-- (void)setDataSource:(id <ASTableDataSource>)dataSource
-{
-  if ([self pendingState]) {
-    _pendingState.dataSource = dataSource;
-  } else {
-    ASDisplayNodeAssert([self isNodeLoaded], @"ASTableNode should be loaded if pendingState doesn't exist");
-
-    // Manually trampoline to the main thread. The view requires this be called on main
-    // and asserting here isn't an option – it is a common pattern for users to clear
-    // the delegate/dataSource in dealloc, which may be running on a background thread.
-    // It is important that we avoid retaining self in this block, so that this method is dealloc-safe.
-    ASTableView *view = self.view;
-    ASPerformBlockOnMainThread(^{
-      view.asyncDataSource = dataSource;
-    });
-  }
-}
-
-- (id <ASTableDataSource>)dataSource
-{
-  if ([self pendingState]) {
-    return _pendingState.dataSource;
-  } else {
-    ASDisplayNodeAssert([self isNodeLoaded], @"ASTableNode should be loaded if pendingState doesn't exist");
-    return self.view.asyncDataSource;
-  }
-}
-
-- (void)setAllowsSelection:(BOOL)allowsSelection
-{
-  if ([self pendingState]) {
-    _pendingState.allowsSelection = allowsSelection;
-  } else {
-    ASDisplayNodeAssert([self isNodeLoaded], @"ASTableNode should be loaded if pendingState doesn't exist");
-    self.view.allowsSelection = allowsSelection;
-  }
-}
-
-- (BOOL)allowsSelection
-{
-  if ([self pendingState]) {
-    return _pendingState.allowsSelection;
-  } else {
-    return self.view.allowsSelection;
-  }
-}
-
-- (void)setAllowsSelectionDuringEditing:(BOOL)allowsSelectionDuringEditing
-{
-  if ([self pendingState]) {
-    _pendingState.allowsSelectionDuringEditing = allowsSelectionDuringEditing;
-  } else {
-    ASDisplayNodeAssert([self isNodeLoaded], @"ASTableNode should be loaded if pendingState doesn't exist");
-    self.view.allowsSelectionDuringEditing = allowsSelectionDuringEditing;
-  }
-}
-
-- (BOOL)allowsSelectionDuringEditing
-{
-  if ([self pendingState]) {
-    return _pendingState.allowsSelectionDuringEditing;
-  } else {
-    return self.view.allowsSelectionDuringEditing;
-  }
-}
-
-- (void)setAllowsMultipleSelection:(BOOL)allowsMultipleSelection
-{
-  if ([self pendingState]) {
-    _pendingState.allowsMultipleSelection = allowsMultipleSelection;
-  } else {
-    ASDisplayNodeAssert([self isNodeLoaded], @"ASTableNode should be loaded if pendingState doesn't exist");
-    self.view.allowsMultipleSelection = allowsMultipleSelection;
-  }
-}
-
-- (BOOL)allowsMultipleSelection
-{
-  if ([self pendingState]) {
-    return _pendingState.allowsMultipleSelection;
-  } else {
-    return self.view.allowsMultipleSelection;
-  }
-}
-
-- (void)setAllowsMultipleSelectionDuringEditing:(BOOL)allowsMultipleSelectionDuringEditing
-{
-  if ([self pendingState]) {
-    _pendingState.allowsMultipleSelectionDuringEditing = allowsMultipleSelectionDuringEditing;
-  } else {
-    ASDisplayNodeAssert([self isNodeLoaded], @"ASTableNode should be loaded if pendingState doesn't exist");
-    self.view.allowsMultipleSelectionDuringEditing = allowsMultipleSelectionDuringEditing;
-  }
-}
-
-- (BOOL)allowsMultipleSelectionDuringEditing
-{
-  if ([self pendingState]) {
-    return _pendingState.allowsMultipleSelectionDuringEditing;
-  } else {
-    return self.view.allowsMultipleSelectionDuringEditing;
-  }
-}
-
-- (void)setBatchFetchingDelegate:(id<ASBatchFetchingDelegate>)batchFetchingDelegate
-{
-  _batchFetchingDelegate = batchFetchingDelegate;
-}
-
-- (id<ASBatchFetchingDelegate>)batchFetchingDelegate
-{
-  return _batchFetchingDelegate;
-}
-
-#pragma mark ASRangeControllerUpdateRangeProtocol
-
-- (void)updateCurrentRangeWithMode:(ASLayoutRangeMode)rangeMode
-{
-  if ([self pendingState]) {
-    _pendingState.rangeMode = rangeMode;
-  } else {
-    ASDisplayNodeAssert([self isNodeLoaded], @"ASTableNode should be loaded if pendingState doesn't exist");
-    [self.rangeController updateCurrentRangeWithMode:rangeMode];
-  }
-}
-
-#pragma mark ASEnvironment
-
-ASLayoutElementCollectionTableSetTraitCollection(_environmentStateLock)
-
-#pragma mark - Range Tuning
-
-- (ASRangeTuningParameters)tuningParametersForRangeType:(ASLayoutRangeType)rangeType
-{
-  return [self tuningParametersForRangeMode:ASLayoutRangeModeFull rangeType:rangeType];
-}
-
-- (void)setTuningParameters:(ASRangeTuningParameters)tuningParameters forRangeType:(ASLayoutRangeType)rangeType
-{
-  [self setTuningParameters:tuningParameters forRangeMode:ASLayoutRangeModeFull rangeType:rangeType];
-}
-
-- (ASRangeTuningParameters)tuningParametersForRangeMode:(ASLayoutRangeMode)rangeMode rangeType:(ASLayoutRangeType)rangeType
-{
-  if ([self pendingState]) {
-    return [_pendingState tuningParametersForRangeMode:rangeMode rangeType:rangeType];
-  } else {
-    return [self.rangeController tuningParametersForRangeMode:rangeMode rangeType:rangeType];
-  }
-}
-
-- (void)setTuningParameters:(ASRangeTuningParameters)tuningParameters forRangeMode:(ASLayoutRangeMode)rangeMode rangeType:(ASLayoutRangeType)rangeType
-{
-  if ([self pendingState]) {
-    [_pendingState setTuningParameters:tuningParameters forRangeMode:rangeMode rangeType:rangeType];
-  } else {
-    return [self.rangeController setTuningParameters:tuningParameters forRangeMode:rangeMode rangeType:rangeType];
-  }
-}
-
-#pragma mark - Selection
-
-- (void)selectRowAtIndexPath:(nullable NSIndexPath *)indexPath animated:(BOOL)animated scrollPosition:(UITableViewScrollPosition)scrollPosition
-{
-  ASDisplayNodeAssertMainThread();
-  ASTableView *tableView = self.view;
-
-  indexPath = [tableView convertIndexPathFromTableNode:indexPath waitingIfNeeded:YES];
-  if (indexPath != nil) {
-    [tableView selectRowAtIndexPath:indexPath animated:animated scrollPosition:scrollPosition];
-  } else {
-    NSLog(@"Failed to select row at index path %@ because the row never reached the view.", indexPath);
-  }
-
-}
-
-- (void)deselectRowAtIndexPath:(NSIndexPath *)indexPath animated:(BOOL)animated
-{
-  ASDisplayNodeAssertMainThread();
-  ASTableView *tableView = self.view;
-
-  indexPath = [tableView convertIndexPathFromTableNode:indexPath waitingIfNeeded:YES];
-  if (indexPath != nil) {
-    [tableView deselectRowAtIndexPath:indexPath animated:animated];
-  } else {
-    NSLog(@"Failed to deselect row at index path %@ because the row never reached the view.", indexPath);
-  }
-}
-
-- (void)scrollToRowAtIndexPath:(NSIndexPath *)indexPath atScrollPosition:(UITableViewScrollPosition)scrollPosition animated:(BOOL)animated
-{
-  ASDisplayNodeAssertMainThread();
-  ASTableView *tableView = self.view;
-
-  indexPath = [tableView convertIndexPathFromTableNode:indexPath waitingIfNeeded:YES];
-
-  if (indexPath != nil) {
-    [tableView scrollToRowAtIndexPath:indexPath atScrollPosition:scrollPosition animated:animated];
-  } else {
-    NSLog(@"Failed to scroll to row at index path %@ because the row never reached the view.", indexPath);
-  }
-}
-
-#pragma mark - Querying Data
-
-- (void)reloadDataInitiallyIfNeeded
-{
-  ASDisplayNodeAssertMainThread();
-  if (!self.dataController.initialReloadDataHasBeenCalled) {
-    // Note: Just calling reloadData isn't enough here – we need to
-    // ensure that _nodesConstrainedWidth is updated first.
-    [self.view layoutIfNeeded];
-  }
-}
-
-- (NSInteger)numberOfRowsInSection:(NSInteger)section
-{
-  ASDisplayNodeAssertMainThread();
-  [self reloadDataInitiallyIfNeeded];
-  return [self.dataController.pendingMap numberOfItemsInSection:section];
-}
-
-- (NSInteger)numberOfSections
-{
-  ASDisplayNodeAssertMainThread();
-  [self reloadDataInitiallyIfNeeded];
-  return [self.dataController.pendingMap numberOfSections];
-}
-
-- (NSArray<__kindof ASCellNode *> *)visibleNodes
-{
-  ASDisplayNodeAssertMainThread();
-  return self.isNodeLoaded ? [self.view visibleNodes] : @[];
-}
-
-- (NSIndexPath *)indexPathForNode:(ASCellNode *)cellNode
-{
-  return [self.dataController.pendingMap indexPathForElement:cellNode.collectionElement];
-}
-
-- (ASCellNode *)nodeForRowAtIndexPath:(NSIndexPath *)indexPath
-{
-  [self reloadDataInitiallyIfNeeded];
-  return [self.dataController.pendingMap elementForItemAtIndexPath:indexPath].node;
-}
-
-- (CGRect)rectForRowAtIndexPath:(NSIndexPath *)indexPath
-{
-  ASDisplayNodeAssertMainThread();
-  ASTableView *tableView = self.view;
-
-  indexPath = [tableView convertIndexPathFromTableNode:indexPath waitingIfNeeded:YES];
-  return [tableView rectForRowAtIndexPath:indexPath];
-}
-
-- (nullable __kindof UITableViewCell *)cellForRowAtIndexPath:(NSIndexPath *)indexPath
-{
-  ASDisplayNodeAssertMainThread();
-  ASTableView *tableView = self.view;
-
-  indexPath = [tableView convertIndexPathFromTableNode:indexPath waitingIfNeeded:YES];
-  if (indexPath == nil) {
-    return nil;
-  }
-  return [tableView cellForRowAtIndexPath:indexPath];
-}
-
-- (nullable NSIndexPath *)indexPathForSelectedRow
-{
-  ASDisplayNodeAssertMainThread();
-  ASTableView *tableView = self.view;
-
-  NSIndexPath *indexPath = tableView.indexPathForSelectedRow;
-  if (indexPath != nil) {
-    return [tableView convertIndexPathToTableNode:indexPath];
-  }
-  return indexPath;
-}
-
-- (NSArray<NSIndexPath *> *)indexPathsForSelectedRows
-{
-  ASDisplayNodeAssertMainThread();
-  ASTableView *tableView = self.view;
-
-  return [tableView convertIndexPathsToTableNode:tableView.indexPathsForSelectedRows];
-}
-
-- (nullable NSIndexPath *)indexPathForRowAtPoint:(CGPoint)point
-{
-  ASDisplayNodeAssertMainThread();
-  ASTableView *tableView = self.view;
-
-  NSIndexPath *indexPath = [tableView indexPathForRowAtPoint:point];
-  if (indexPath != nil) {
-    return [tableView convertIndexPathToTableNode:indexPath];
-  }
-  return indexPath;
-}
-
-- (nullable NSArray<NSIndexPath *> *)indexPathsForRowsInRect:(CGRect)rect
-{
-  ASDisplayNodeAssertMainThread();
-  ASTableView *tableView = self.view;
-  return [tableView convertIndexPathsToTableNode:[tableView indexPathsForRowsInRect:rect]];
-}
-
-- (NSArray<NSIndexPath *> *)indexPathsForVisibleRows
-{
-  ASDisplayNodeAssertMainThread();
-  NSMutableArray *indexPathsArray = [NSMutableArray new];
-  for (ASCellNode *cell in [self visibleNodes]) {
-    NSIndexPath *indexPath = [self indexPathForNode:cell];
-    if (indexPath) {
-      [indexPathsArray addObject:indexPath];
-    }
-  }
-  return indexPathsArray;
-}
-
-#pragma mark - Editing
-
-- (void)reloadDataWithCompletion:(void (^)())completion
-{
-  ASDisplayNodeAssertMainThread();
-  if (self.nodeLoaded) {
-    [self.view reloadDataWithCompletion:completion];
-  } else {
-    if (completion) {
-      completion();
-    }
-  }
-}
-
-- (void)reloadData
-{
-  [self reloadDataWithCompletion:nil];
-}
-
-- (void)relayoutItems
-{
-  [self.view relayoutItems];
-}
-
-- (void)performBatchAnimated:(BOOL)animated updates:(NS_NOESCAPE void (^)())updates completion:(void (^)(BOOL))completion
-{
-  ASDisplayNodeAssertMainThread();
-  if (self.nodeLoaded) {
-    ASTableView *tableView = self.view;
-    [tableView beginUpdates];
-    if (updates) {
-      updates();
-    }
-    [tableView endUpdatesAnimated:animated completion:completion];
-  } else {
-    if (updates) {
-      updates();
-    }
-  }
-}
-
-- (void)performBatchUpdates:(NS_NOESCAPE void (^)())updates completion:(void (^)(BOOL))completion
-{
-  [self performBatchAnimated:YES updates:updates completion:completion];
-}
-
-- (void)insertSections:(NSIndexSet *)sections withRowAnimation:(UITableViewRowAnimation)animation
-{
-  ASDisplayNodeAssertMainThread();
-  if (self.nodeLoaded) {
-    [self.view insertSections:sections withRowAnimation:animation];
-  }
-}
-
-- (void)deleteSections:(NSIndexSet *)sections withRowAnimation:(UITableViewRowAnimation)animation
-{
-  ASDisplayNodeAssertMainThread();
-  if (self.nodeLoaded) {
-    [self.view deleteSections:sections withRowAnimation:animation];
-  }
-}
-
-- (void)reloadSections:(NSIndexSet *)sections withRowAnimation:(UITableViewRowAnimation)animation
-{
-  ASDisplayNodeAssertMainThread();
-  if (self.nodeLoaded) {
-    [self.view reloadSections:sections withRowAnimation:animation];
-  }
-}
-
-- (void)moveSection:(NSInteger)section toSection:(NSInteger)newSection
-{
-  ASDisplayNodeAssertMainThread();
-  if (self.nodeLoaded) {
-    [self.view moveSection:section toSection:newSection];
-  }
-}
-
-- (void)insertRowsAtIndexPaths:(NSArray *)indexPaths withRowAnimation:(UITableViewRowAnimation)animation
-{
-  ASDisplayNodeAssertMainThread();
-  if (self.nodeLoaded) {
-    [self.view insertRowsAtIndexPaths:indexPaths withRowAnimation:animation];
-  }
-}
-
-- (void)deleteRowsAtIndexPaths:(NSArray *)indexPaths withRowAnimation:(UITableViewRowAnimation)animation
-{
-  ASDisplayNodeAssertMainThread();
-  if (self.nodeLoaded) {
-    [self.view deleteRowsAtIndexPaths:indexPaths withRowAnimation:animation];
-  }
-}
-
-- (void)reloadRowsAtIndexPaths:(NSArray *)indexPaths withRowAnimation:(UITableViewRowAnimation)animation
-{
-  ASDisplayNodeAssertMainThread();
-  if (self.nodeLoaded) {
-    [self.view reloadRowsAtIndexPaths:indexPaths withRowAnimation:animation];
-  }
-}
-
-- (void)moveRowAtIndexPath:(NSIndexPath *)indexPath toIndexPath:(NSIndexPath *)newIndexPath
-{
-  ASDisplayNodeAssertMainThread();
-  if (self.nodeLoaded) {
-    [self.view moveRowAtIndexPath:indexPath toIndexPath:newIndexPath];
-  }
-}
-
-- (BOOL)isProcessingUpdates
-{
-  return (self.nodeLoaded ? [self.view isProcessingUpdates] : NO);
-}
-
-- (void)onDidFinishProcessingUpdates:(void (^)())completion
-{
-  if (!completion) {
-    return;
-  }
-  if (!self.nodeLoaded) {
-    completion();
-  } else {
-    [self.view onDidFinishProcessingUpdates:completion];
-  }
-}
-
-- (void)waitUntilAllUpdatesAreProcessed
-{
-  ASDisplayNodeAssertMainThread();
-  if (self.nodeLoaded) {
-    [self.view waitUntilAllUpdatesAreCommitted];
-  }
-}
-
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-implementations"
-- (void)waitUntilAllUpdatesAreCommitted
-{
-  [self waitUntilAllUpdatesAreProcessed];
-}
-#pragma clang diagnostic pop
-
-#pragma mark - Debugging (Private)
-
-- (NSMutableArray<NSDictionary *> *)propertiesForDebugDescription
-{
-  NSMutableArray<NSDictionary *> *result = [super propertiesForDebugDescription];
-  [result addObject:@{ @"dataSource" : ASObjectDescriptionMakeTiny(self.dataSource) }];
-  [result addObject:@{ @"delegate" : ASObjectDescriptionMakeTiny(self.delegate) }];
-  return result;
-}
-
-@end
-
-#endif
diff --git a/submodules/AsyncDisplayKit/Source/ASTableView.h b/submodules/AsyncDisplayKit/Source/ASTableView.h
deleted file mode 100644
index 3f627beb11..0000000000
--- a/submodules/AsyncDisplayKit/Source/ASTableView.h
+++ /dev/null
@@ -1,249 +0,0 @@
-//
-//  ASTableView.h
-//  Texture
-//
-//  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.
-//  Changes after 4/13/2017 are: Copyright (c) Pinterest, Inc.  All rights reserved.
-//  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
-//
-
-#ifndef MINIMAL_ASDK
-
-#import <UIKit/UIKit.h>
-
-#import <AsyncDisplayKit/ASBaseDefines.h>
-#import <AsyncDisplayKit/ASLayoutRangeType.h>
-#import <AsyncDisplayKit/ASTableViewProtocols.h>
-
-NS_ASSUME_NONNULL_BEGIN
-
-@class ASCellNode;
-@protocol ASTableDataSource;
-@protocol ASTableDelegate;
-@class ASTableNode;
-
-/**
- * Asynchronous UITableView with Intelligent Preloading capabilities.
- *
- * @note ASTableNode is strongly recommended over ASTableView.  This class is provided for adoption convenience.
- */
-@interface ASTableView : UITableView
-
-/// The corresponding table node, or nil if one does not exist.
-@property (nonatomic, weak, readonly) ASTableNode *tableNode;
-
-/**
- * Retrieves the node for the row at the given index path.
- */
-- (nullable ASCellNode *)nodeForRowAtIndexPath:(NSIndexPath *)indexPath AS_WARN_UNUSED_RESULT;
-
-@end
-
-@interface ASTableView (Deprecated)
-
-@property (nonatomic, weak) id<ASTableDelegate>   asyncDelegate ASDISPLAYNODE_DEPRECATED_MSG("Use ASTableNode's .delegate property instead.");
-@property (nonatomic, weak) id<ASTableDataSource> asyncDataSource ASDISPLAYNODE_DEPRECATED_MSG("Use ASTableNode .dataSource property instead.");
-
-/**
- * Initializer.
- *
- * @param frame A rectangle specifying the initial location and size of the table view in its superview’€™s coordinates.
- * The frame of the table view changes as table cells are added and deleted.
- *
- * @param style A constant that specifies the style of the table view. See UITableViewStyle for descriptions of valid constants.
- */
-- (instancetype)initWithFrame:(CGRect)frame style:(UITableViewStyle)style ASDISPLAYNODE_DEPRECATED_MSG("Please use ASTableNode instead of ASTableView.");
-
-/**
- * The number of screens left to scroll before the delegate -tableView:beginBatchFetchingWithContext: is called.
- *
- * Defaults to two screenfuls.
- */
-@property (nonatomic) CGFloat leadingScreensForBatching ASDISPLAYNODE_DEPRECATED_MSG("Use ASTableNode property instead.");
-
-/**
- * The distance that the content view is inset from the table view edges. Defaults to UIEdgeInsetsZero.
- */
-@property (nonatomic) UIEdgeInsets contentInset ASDISPLAYNODE_DEPRECATED_MSG("Use ASTableNode property instead");
-
-/**
- * The offset of the content view's origin from the table node's origin. Defaults to CGPointZero.
- */
-@property (nonatomic) CGPoint contentOffset ASDISPLAYNODE_DEPRECATED_MSG("Use ASTableNode property instead.");
-
-/**
- * YES to automatically adjust the contentOffset when cells are inserted or deleted above
- * visible cells, maintaining the users' visible scroll position.
- *
- * @note This is only applied to non-animated updates. For animated updates, there is no way to
- * synchronize or "cancel out" the appearance of a scroll due to UITableView API limitations.
- *
- * default is NO.
- */
-@property (nonatomic) BOOL automaticallyAdjustsContentOffset ASDISPLAYNODE_DEPRECATED_MSG("Use ASTableNode property instead.");
-
-/*
- * A Boolean value that determines whether the nodes that the data source renders will be flipped.
- */
-@property (nonatomic) BOOL inverted ASDISPLAYNODE_DEPRECATED_MSG("Use ASTableNode property instead.");
-
-@property (nonatomic, readonly, nullable) NSIndexPath *indexPathForSelectedRow  ASDISPLAYNODE_DEPRECATED_MSG("Use ASTableNode property instead.");
-
-@property (nonatomic, readonly, nullable) NSArray<NSIndexPath *> *indexPathsForSelectedRows ASDISPLAYNODE_DEPRECATED_MSG("Use ASTableNode property instead.");
-
-@property (nonatomic, readonly, nullable) NSArray<NSIndexPath *> *indexPathsForVisibleRows ASDISPLAYNODE_DEPRECATED_MSG("Use ASTableNode property instead.");
-
-/**
- * Tuning parameters for a range type in full mode.
- *
- * @param rangeType The range type to get the tuning parameters for.
- *
- * @return A tuning parameter value for the given range type in full mode.
- *
- * @see ASLayoutRangeMode
- * @see ASLayoutRangeType
- */
-- (ASRangeTuningParameters)tuningParametersForRangeType:(ASLayoutRangeType)rangeType AS_WARN_UNUSED_RESULT ASDISPLAYNODE_DEPRECATED_MSG("Use ASTableNode method instead.");
-
-/**
- * Set the tuning parameters for a range type in full mode.
- *
- * @param tuningParameters The tuning parameters to store for a range type.
- * @param rangeType The range type to set the tuning parameters for.
- *
- * @see ASLayoutRangeMode
- * @see ASLayoutRangeType
- */
-- (void)setTuningParameters:(ASRangeTuningParameters)tuningParameters forRangeType:(ASLayoutRangeType)rangeType ASDISPLAYNODE_DEPRECATED_MSG("Use ASTableNode method instead.");
-
-/**
- * Tuning parameters for a range type in the specified mode.
- *
- * @param rangeMode The range mode to get the running parameters for.
- * @param rangeType The range type to get the tuning parameters for.
- *
- * @return A tuning parameter value for the given range type in the given mode.
- *
- * @see ASLayoutRangeMode
- * @see ASLayoutRangeType
- */
-- (ASRangeTuningParameters)tuningParametersForRangeMode:(ASLayoutRangeMode)rangeMode rangeType:(ASLayoutRangeType)rangeType AS_WARN_UNUSED_RESULT ASDISPLAYNODE_DEPRECATED_MSG("Use ASTableNode method instead.");
-
-/**
- * Set the tuning parameters for a range type in the specified mode.
- *
- * @param tuningParameters The tuning parameters to store for a range type.
- * @param rangeMode The range mode to set the running parameters for.
- * @param rangeType The range type to set the tuning parameters for.
- *
- * @see ASLayoutRangeMode
- * @see ASLayoutRangeType
- */
-- (void)setTuningParameters:(ASRangeTuningParameters)tuningParameters forRangeMode:(ASLayoutRangeMode)rangeMode rangeType:(ASLayoutRangeType)rangeType ASDISPLAYNODE_DEPRECATED_MSG("Use ASTableNode method instead.");
-
-- (nullable __kindof UITableViewCell *)cellForRowAtIndexPath:(NSIndexPath *)indexPath ASDISPLAYNODE_DEPRECATED_MSG("Use ASTableNode method instead.");
-
-- (void)scrollToRowAtIndexPath:(NSIndexPath *)indexPath atScrollPosition:(UITableViewScrollPosition)scrollPosition animated:(BOOL)animated ASDISPLAYNODE_DEPRECATED_MSG("Use ASTableNode method instead.");
-
-- (void)selectRowAtIndexPath:(NSIndexPath *)indexPath animated:(BOOL)animated scrollPosition:(UITableViewScrollPosition)scrollPosition ASDISPLAYNODE_DEPRECATED_MSG("Use ASTableNode method instead.");
-
-- (nullable NSIndexPath *)indexPathForRowAtPoint:(CGPoint)point ASDISPLAYNODE_DEPRECATED_MSG("Use ASTableNode method instead.");
-
-- (nullable NSArray<NSIndexPath *> *)indexPathsForRowsInRect:(CGRect)rect ASDISPLAYNODE_DEPRECATED_MSG("Use ASTableNode method instead.");
-
-/**
- * Similar to -visibleCells.
- *
- * @return an array containing the cell nodes being displayed on screen.
- */
-- (NSArray<ASCellNode *> *)visibleNodes AS_WARN_UNUSED_RESULT ASDISPLAYNODE_DEPRECATED_MSG("Use ASTableNode method instead.");
-
-/**
- * Similar to -indexPathForCell:.
- *
- * @param cellNode a cellNode part of the table view
- *
- * @return an indexPath for this cellNode
- */
-- (nullable NSIndexPath *)indexPathForNode:(ASCellNode *)cellNode AS_WARN_UNUSED_RESULT ASDISPLAYNODE_DEPRECATED_MSG("Use ASTableNode method instead.");
-
-/**
- * Reload everything from scratch, destroying the working range and all cached nodes.
- *
- * @param completion block to run on completion of asynchronous loading or nil. If supplied, the block is run on
- * the main thread.
- * @warning This method is substantially more expensive than UITableView's version.
- */
--(void)reloadDataWithCompletion:(void (^ _Nullable)(void))completion ASDISPLAYNODE_DEPRECATED_MSG("Use ASTableNode method instead.");
-
-/**
- * Reload everything from scratch, destroying the working range and all cached nodes.
- *
- * @warning This method is substantially more expensive than UITableView's version.
- */
-- (void)reloadData ASDISPLAYNODE_DEPRECATED_MSG("Use ASTableNode method instead.");
-
-/**
- * Triggers a relayout of all nodes.
- *
- * @discussion This method invalidates and lays out every cell node in the table view.
- */
-- (void)relayoutItems ASDISPLAYNODE_DEPRECATED_MSG("Use ASTableNode method instead.");
-
-- (void)beginUpdates ASDISPLAYNODE_DEPRECATED_MSG("Use ASTableNode's -performBatchUpdates:completion: instead.");
-
-- (void)endUpdates ASDISPLAYNODE_DEPRECATED_MSG("Use ASTableNode's -performBatchUpdates:completion: instead.");
-
-/**
- *  Concludes a series of method calls that insert, delete, select, or reload rows and sections of the table view.
- *  You call this method to bracket a series of method calls that begins with beginUpdates and that consists of operations
- *  to insert, delete, select, and reload rows and sections of the table view. When you call endUpdates, ASTableView begins animating
- *  the operations simultaneously. This method is must be called from the main thread. It's important to remember that the ASTableView will
- *  be processing the updates asynchronously after this call and are not guaranteed to be reflected in the ASTableView until
- *  the completion block is executed.
- *
- *  @param animated   NO to disable all animations.
- *  @param completion A completion handler block to execute when all of the operations are finished. This block takes a single
- *                    Boolean parameter that contains the value YES if all of the related animations completed successfully or
- *                    NO if they were interrupted. This parameter may be nil. If supplied, the block is run on the main thread.
- */
-- (void)endUpdatesAnimated:(BOOL)animated completion:(void (^ _Nullable)(BOOL completed))completion ASDISPLAYNODE_DEPRECATED_MSG("Use ASTableNode's -performBatchUpdates:completion: instead.");
-
-/**
- * See ASTableNode.h for full documentation of these methods.
- */
-@property (nonatomic, readonly) BOOL isProcessingUpdates;
-- (void)onDidFinishProcessingUpdates:(void (^)(void))completion;
-- (void)waitUntilAllUpdatesAreCommitted ASDISPLAYNODE_DEPRECATED_MSG("Use -[ASTableNode waitUntilAllUpdatesAreProcessed] instead.");
-
-- (void)insertSections:(NSIndexSet *)sections withRowAnimation:(UITableViewRowAnimation)animation ASDISPLAYNODE_DEPRECATED_MSG("Use ASTableNode method instead.");
-
-- (void)deleteSections:(NSIndexSet *)sections withRowAnimation:(UITableViewRowAnimation)animation ASDISPLAYNODE_DEPRECATED_MSG("Use ASTableNode method instead.");
-
-- (void)reloadSections:(NSIndexSet *)sections withRowAnimation:(UITableViewRowAnimation)animation ASDISPLAYNODE_DEPRECATED_MSG("Use ASTableNode method instead.");
-
-- (void)moveSection:(NSInteger)section toSection:(NSInteger)newSection ASDISPLAYNODE_DEPRECATED_MSG("Use ASTableNode method instead.");
-
-- (void)insertRowsAtIndexPaths:(NSArray<NSIndexPath *> *)indexPaths withRowAnimation:(UITableViewRowAnimation)animation ASDISPLAYNODE_DEPRECATED_MSG("Use ASTableNode method instead.");
-
-- (void)deleteRowsAtIndexPaths:(NSArray<NSIndexPath *> *)indexPaths withRowAnimation:(UITableViewRowAnimation)animation ASDISPLAYNODE_DEPRECATED_MSG("Use ASTableNode method instead.");
-
-- (void)reloadRowsAtIndexPaths:(NSArray<NSIndexPath *> *)indexPaths withRowAnimation:(UITableViewRowAnimation)animation ASDISPLAYNODE_DEPRECATED_MSG("Use ASTableNode method instead.");
-
-- (void)moveRowAtIndexPath:(NSIndexPath *)indexPath toIndexPath:(NSIndexPath *)newIndexPath ASDISPLAYNODE_DEPRECATED_MSG("Use ASTableNode method instead.");
-
-- (void)setContentOffset:(CGPoint)contentOffset animated:(BOOL)animated ASDISPLAYNODE_DEPRECATED_MSG("Use ASTableNode method instead.");
-
-@end
-
-ASDISPLAYNODE_DEPRECATED_MSG("Renamed to ASTableDataSource.")
-@protocol ASTableViewDataSource <ASTableDataSource>
-@end
-
-ASDISPLAYNODE_DEPRECATED_MSG("Renamed to ASTableDelegate.")
-@protocol ASTableViewDelegate <ASTableDelegate>
-@end
-
-NS_ASSUME_NONNULL_END
-
-#endif
diff --git a/submodules/AsyncDisplayKit/Source/ASTableView.mm b/submodules/AsyncDisplayKit/Source/ASTableView.mm
deleted file mode 100644
index 170abb50b5..0000000000
--- a/submodules/AsyncDisplayKit/Source/ASTableView.mm
+++ /dev/null
@@ -1,2044 +0,0 @@
-//
-//  ASTableView.mm
-//  Texture
-//
-//  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.
-//  Changes after 4/13/2017 are: Copyright (c) Pinterest, Inc.  All rights reserved.
-//  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
-//
-
-#ifndef MINIMAL_ASDK
-#import <AsyncDisplayKit/ASTableViewInternal.h>
-
-#import <AsyncDisplayKit/_ASCoreAnimationExtras.h>
-#import <AsyncDisplayKit/_ASDisplayLayer.h>
-#import <AsyncDisplayKit/_ASHierarchyChangeSet.h>
-#import <AsyncDisplayKit/ASAssert.h>
-#import <AsyncDisplayKit/ASBatchFetching.h>
-#import <AsyncDisplayKit/ASCellNode+Internal.h>
-#import <AsyncDisplayKit/ASCollectionElement.h>
-#import <AsyncDisplayKit/ASCollections.h>
-#import <AsyncDisplayKit/ASConfigurationInternal.h>
-#import <AsyncDisplayKit/ASDelegateProxy.h>
-#import <AsyncDisplayKit/ASDisplayNodeExtras.h>
-#import <AsyncDisplayKit/ASDisplayNode+FrameworkPrivate.h>
-#import <AsyncDisplayKit/ASElementMap.h>
-#import <AsyncDisplayKit/ASInternalHelpers.h>
-#import <AsyncDisplayKit/ASLayout.h>
-#import <AsyncDisplayKit/ASTableNode+Beta.h>
-#import <AsyncDisplayKit/ASRangeController.h>
-#import <AsyncDisplayKit/ASEqualityHelpers.h>
-#import <AsyncDisplayKit/ASTableLayoutController.h>
-#import <AsyncDisplayKit/ASTableView+Undeprecated.h>
-#import <AsyncDisplayKit/ASBatchContext.h>
-
-static NSString * const kCellReuseIdentifier = @"_ASTableViewCell";
-
-//#define LOG(...) NSLog(__VA_ARGS__)
-#define LOG(...)
-
-/**
- * See note at the top of ASCollectionView.mm near declaration of macro GET_COLLECTIONNODE_OR_RETURN
- */
-#define GET_TABLENODE_OR_RETURN(__var, __val) \
-  ASTableNode *__var = self.tableNode; \
-  if (__var == nil) { \
-    return __val; \
-  }
-
-#define UITABLEVIEW_RESPONDS_TO_SELECTOR() \
-  ({ \
-    static BOOL superResponds; \
-    static dispatch_once_t onceToken; \
-    dispatch_once(&onceToken, ^{ \
-      superResponds = [UITableView instancesRespondToSelector:_cmd]; \
-    }); \
-    superResponds; \
-  })
-
-@interface UITableView (ScrollViewDelegate)
-
-- (void)scrollViewDidScroll:(UIScrollView *)scrollView;
-- (void)scrollViewDidEndDecelerating:(UIScrollView *)scrollView;
-- (void)scrollViewWillBeginDragging:(UIScrollView *)scrollView;
-- (void)scrollViewWillEndDragging:(UIScrollView *)scrollView withVelocity:(CGPoint)velocity targetContentOffset:(inout CGPoint *)targetContentOffset;
-- (void)scrollViewDidEndDragging:(UIScrollView *)scrollView willDecelerate:(BOOL)decelerate;
-
-@end
-
-#pragma mark -
-#pragma mark ASCellNode<->UITableViewCell bridging.
-
-@class _ASTableViewCell;
-
-@protocol _ASTableViewCellDelegate <NSObject>
-- (void)didLayoutSubviewsOfTableViewCell:(_ASTableViewCell *)tableViewCell;
-@end
-
-@interface _ASTableViewCell : UITableViewCell
-@property (nonatomic, weak) id<_ASTableViewCellDelegate> delegate;
-@property (nonatomic, readonly) ASCellNode *node;
-@property (nonatomic) ASCollectionElement *element;
-@end
-
-@implementation _ASTableViewCell
-// TODO add assertions to prevent use of view-backed UITableViewCell properties (eg .textLabel)
-
-- (void)layoutSubviews
-{
-  [super layoutSubviews];
-  [_delegate didLayoutSubviewsOfTableViewCell:self];
-}
-
-- (void)didTransitionToState:(UITableViewCellStateMask)state
-{
-  [self setNeedsLayout];
-  [self layoutIfNeeded];
-  [super didTransitionToState:state];
-}
-
-- (ASCellNode *)node
-{
-  return self.element.node;
-}
-
-- (void)setElement:(ASCollectionElement *)element
-{
-  _element = element;
-  ASCellNode *node = element.node;
-  
-  if (node) {
-    self.backgroundColor = node.backgroundColor;
-    self.selectedBackgroundView = node.selectedBackgroundView;
-    self.backgroundView = node.backgroundView;
-#if TARGET_OS_IOS
-    self.separatorInset = node.separatorInset;
-#endif
-    self.selectionStyle = node.selectionStyle; 
-    self.focusStyle = node.focusStyle;
-    self.accessoryType = node.accessoryType;
-    self.tintColor = node.tintColor;
-    
-    // the following ensures that we clip the entire cell to it's bounds if node.clipsToBounds is set (the default)
-    // This is actually a workaround for a bug we are seeing in some rare cases (selected background view
-    // overlaps other cells if size of ASCellNode has changed.)
-    self.clipsToBounds = node.clipsToBounds;
-  }
-  
-  [node __setSelectedFromUIKit:self.selected];
-  [node __setHighlightedFromUIKit:self.highlighted];
-}
-
-- (BOOL)consumesCellNodeVisibilityEvents
-{
-  ASCellNode *node = self.node;
-  if (node == nil) {
-    return NO;
-  }
-  return ASSubclassOverridesSelector([ASCellNode class], [node class], @selector(cellNodeVisibilityEvent:inScrollView:withCellFrame:));
-}
-
-- (void)setSelected:(BOOL)selected animated:(BOOL)animated
-{
-  [super setSelected:selected animated:animated];
-  [self.node __setSelectedFromUIKit:selected];
-}
-
-- (void)setHighlighted:(BOOL)highlighted animated:(BOOL)animated
-{
-  [super setHighlighted:highlighted animated:animated];
-  [self.node __setHighlightedFromUIKit:highlighted];
-}
-
-- (void)prepareForReuse
-{
-  // Need to clear element before UIKit calls setSelected:NO / setHighlighted:NO on its cells
-  self.element = nil;
-  [super prepareForReuse];
-}
-
-@end
-
-#pragma mark -
-#pragma mark ASTableView
-
-@interface ASTableView () <ASRangeControllerDataSource, ASRangeControllerDelegate, ASDataControllerSource, _ASTableViewCellDelegate, ASCellNodeInteractionDelegate, ASDelegateProxyInterceptor, ASBatchFetchingScrollView>
-{
-  ASTableViewProxy *_proxyDataSource;
-  ASTableViewProxy *_proxyDelegate;
-
-  ASTableLayoutController *_layoutController;
-
-  ASRangeController *_rangeController;
-
-  ASBatchContext *_batchContext;
-
-  // When we update our data controller in response to an interactive move,
-  // we don't want to tell the table view about the change (it knows!)
-  BOOL _updatingInResponseToInteractiveMove;
-  BOOL _inverted;
-
-  // The top cell node that was visible before the update.
-  __weak ASCellNode *_contentOffsetAdjustmentTopVisibleNode;
-  // The y-offset of the top visible row's origin before the update.
-  CGFloat _contentOffsetAdjustmentTopVisibleNodeOffset;
-  CGFloat _leadingScreensForBatching;
-  BOOL _automaticallyAdjustsContentOffset;
-  
-  CGPoint _deceleratingVelocity;
-
-  CGFloat _nodesConstrainedWidth;
-  BOOL _queuedNodeHeightUpdate;
-  BOOL _isDeallocating;
-  NSHashTable<_ASTableViewCell *> *_cellsForVisibilityUpdates;
-  
-  // CountedSet because UIKit may display the same element in multiple cells e.g. during animations.
-  NSCountedSet<ASCollectionElement *> *_visibleElements;
-  
-  NSHashTable<ASCellNode *> *_cellsForLayoutUpdates;
-
-  // See documentation on same property in ASCollectionView
-  BOOL _hasEverCheckedForBatchFetchingDueToUpdate;
-
-  // The section index overlay view, if there is one present.
-  // This is useful because we need to measure our row nodes against (width - indexView.width).
-  __weak UIView *_sectionIndexView;
-  
-  /**
-   * The change set that we're currently building, if any.
-   */
-  _ASHierarchyChangeSet *_changeSet;
-  
-  /**
-   * Counter used to keep track of nested batch updates.
-   */
-  NSInteger _batchUpdateCount;
-
-  /**
-   * Keep a strong reference to node till view is ready to release.
-   */
-  ASTableNode *_keepalive_node;
-
-  struct {
-    unsigned int scrollViewDidScroll:1;
-    unsigned int scrollViewWillBeginDragging:1;
-    unsigned int scrollViewDidEndDragging:1;
-    unsigned int scrollViewWillEndDragging:1;
-    unsigned int scrollViewDidEndDecelerating:1;
-    unsigned int tableNodeWillDisplayNodeForRow:1;
-    unsigned int tableViewWillDisplayNodeForRow:1;
-    unsigned int tableViewWillDisplayNodeForRowDeprecated:1;
-    unsigned int tableNodeDidEndDisplayingNodeForRow:1;
-    unsigned int tableViewDidEndDisplayingNodeForRow:1;
-    unsigned int tableNodeWillBeginBatchFetch:1;
-    unsigned int tableViewWillBeginBatchFetch:1;
-    unsigned int shouldBatchFetchForTableView:1;
-    unsigned int shouldBatchFetchForTableNode:1;
-    unsigned int tableViewConstrainedSizeForRow:1;
-    unsigned int tableNodeConstrainedSizeForRow:1;
-    unsigned int tableViewWillSelectRow:1;
-    unsigned int tableNodeWillSelectRow:1;
-    unsigned int tableViewDidSelectRow:1;
-    unsigned int tableNodeDidSelectRow:1;
-    unsigned int tableViewWillDeselectRow:1;
-    unsigned int tableNodeWillDeselectRow:1;
-    unsigned int tableViewDidDeselectRow:1;
-    unsigned int tableNodeDidDeselectRow:1;
-    unsigned int tableViewShouldHighlightRow:1;
-    unsigned int tableNodeShouldHighlightRow:1;
-    unsigned int tableViewDidHighlightRow:1;
-    unsigned int tableNodeDidHighlightRow:1;
-    unsigned int tableViewDidUnhighlightRow:1;
-    unsigned int tableNodeDidUnhighlightRow:1;
-    unsigned int tableViewShouldShowMenuForRow:1;
-    unsigned int tableNodeShouldShowMenuForRow:1;
-    unsigned int tableViewCanPerformActionForRow:1;
-    unsigned int tableNodeCanPerformActionForRow:1;
-    unsigned int tableViewPerformActionForRow:1;
-    unsigned int tableNodePerformActionForRow:1;
-  } _asyncDelegateFlags;
-  
-  struct {
-    unsigned int numberOfSectionsInTableView:1;
-    unsigned int numberOfSectionsInTableNode:1;
-    unsigned int tableNodeNumberOfRowsInSection:1;
-    unsigned int tableViewNumberOfRowsInSection:1;
-    unsigned int tableViewNodeBlockForRow:1;
-    unsigned int tableNodeNodeBlockForRow:1;
-    unsigned int tableViewNodeForRow:1;
-    unsigned int tableNodeNodeForRow:1;
-    unsigned int tableViewCanMoveRow:1;
-    unsigned int tableNodeCanMoveRow:1;
-    unsigned int tableViewMoveRow:1;
-    unsigned int tableNodeMoveRow:1;
-    unsigned int sectionIndexMethods:1; // if both section index methods are implemented
-    unsigned int modelIdentifierMethods:1; // if both modelIdentifierForElementAtIndexPath and indexPathForElementWithModelIdentifier are implemented
-  } _asyncDataSourceFlags;
-}
-
-@property (nonatomic) ASDataController *dataController;
-
-@property (nonatomic, weak)   ASTableNode *tableNode;
-
-@property (nonatomic) BOOL test_enableSuperUpdateCallLogging;
-@end
-
-@implementation ASTableView
-{
-  __weak id<ASTableDelegate> _asyncDelegate;
-  __weak id<ASTableDataSource> _asyncDataSource;
-}
-
-// Using _ASDisplayLayer ensures things like -layout are properly forwarded to ASTableNode.
-+ (Class)layerClass
-{
-  return [_ASDisplayLayer class];
-}
-
-+ (Class)dataControllerClass
-{
-  return [ASDataController class];
-}
-
-#pragma mark -
-#pragma mark Lifecycle
-
-- (instancetype)initWithFrame:(CGRect)frame style:(UITableViewStyle)style
-{
-  return [self _initWithFrame:frame style:style dataControllerClass:nil owningNode:nil eventLog:nil];
-}
-
-- (instancetype)_initWithFrame:(CGRect)frame style:(UITableViewStyle)style dataControllerClass:(Class)dataControllerClass owningNode:(ASTableNode *)tableNode eventLog:(ASEventLog *)eventLog
-{
-  if (!(self = [super initWithFrame:frame style:style])) {
-    return nil;
-  }
-  _cellsForVisibilityUpdates = [NSHashTable hashTableWithOptions:NSHashTableObjectPointerPersonality];
-  _cellsForLayoutUpdates = [NSHashTable hashTableWithOptions:NSHashTableObjectPointerPersonality];
-  if (!dataControllerClass) {
-    dataControllerClass = [[self class] dataControllerClass];
-  }
-  
-  _layoutController = [[ASTableLayoutController alloc] initWithTableView:self];
-  
-  _rangeController = [[ASRangeController alloc] init];
-  _rangeController.layoutController = _layoutController;
-  _rangeController.dataSource = self;
-  _rangeController.delegate = self;
-  
-  _dataController = [[dataControllerClass alloc] initWithDataSource:self node:tableNode eventLog:eventLog];
-  _dataController.delegate = _rangeController;
-  
-  _leadingScreensForBatching = 2.0;
-  _batchContext = [[ASBatchContext alloc] init];
-  _visibleElements = [[NSCountedSet alloc] init];
-  
-  _automaticallyAdjustsContentOffset = NO;
-  
-  _nodesConstrainedWidth = self.bounds.size.width;
-  
-  _proxyDelegate = [[ASTableViewProxy alloc] initWithTarget:nil interceptor:self];
-  super.delegate = (id<UITableViewDelegate>)_proxyDelegate;
-  
-  _proxyDataSource = [[ASTableViewProxy alloc] initWithTarget:nil interceptor:self];
-  super.dataSource = (id<UITableViewDataSource>)_proxyDataSource;
-  
-  [self registerClass:_ASTableViewCell.class forCellReuseIdentifier:kCellReuseIdentifier];
-  
-  // iOS 11 automatically uses estimated heights, so disable those (see PR #485)
-  if (AS_AT_LEAST_IOS11) {
-    super.estimatedRowHeight = 0.0;
-    super.estimatedSectionHeaderHeight = 0.0;
-    super.estimatedSectionFooterHeight = 0.0;
-  }
-  
-  return self;
-}
-
-- (instancetype)initWithCoder:(NSCoder *)aDecoder
-{
-  NSLog(@"Warning: AsyncDisplayKit is not designed to be used with Interface Builder.  Table properties set in IB will be lost.");
-  return [self initWithFrame:CGRectZero style:UITableViewStylePlain];
-}
-
-- (void)dealloc
-{
-  ASDisplayNodeAssertMainThread();
-  ASDisplayNodeCAssert(_batchUpdateCount == 0, @"ASTableView deallocated in the middle of a batch update.");
-  
-  // Sometimes the UIKit classes can call back to their delegate even during deallocation.
-  _isDeallocating = YES;
-  if (!ASActivateExperimentalFeature(ASExperimentalCollectionTeardown)) {
-    [self setAsyncDelegate:nil];
-    [self setAsyncDataSource:nil];
-  }
-
-  // Data controller & range controller may own a ton of nodes, let's deallocate those off-main
-  ASPerformBackgroundDeallocation(&_dataController);
-  ASPerformBackgroundDeallocation(&_rangeController);
-}
-
-#pragma mark -
-#pragma mark Overrides
-
-- (void)setDataSource:(id<UITableViewDataSource>)dataSource
-{
-  // UIKit can internally generate a call to this method upon changing the asyncDataSource; only assert for non-nil.
-  ASDisplayNodeAssert(dataSource == nil, @"ASTableView uses asyncDataSource, not UITableView's dataSource property.");
-}
-
-- (void)setDelegate:(id<UITableViewDelegate>)delegate
-{
-  // Our UIScrollView superclass sets its delegate to nil on dealloc. Only assert if we get a non-nil value here.
-  ASDisplayNodeAssert(delegate == nil, @"ASTableView uses asyncDelegate, not UITableView's delegate property.");
-}
-
-- (id<ASTableDataSource>)asyncDataSource
-{
-  return _asyncDataSource;
-}
-
-- (void)setAsyncDataSource:(id<ASTableDataSource>)asyncDataSource
-{
-  // Changing super.dataSource will trigger a setNeedsLayout, so this must happen on the main thread.
-  ASDisplayNodeAssertMainThread();
-
-  // Note: It's common to check if the value hasn't changed and short-circuit but we aren't doing that here to handle
-  // the (common) case of nilling the asyncDataSource in the ViewController's dealloc. In this case our _asyncDataSource
-  // will return as nil (ARC magic) even though the _proxyDataSource still exists. It's really important to hold a strong
-  // reference to the old dataSource in this case because calls to ASTableViewProxy will start failing and cause crashes.
-  NS_VALID_UNTIL_END_OF_SCOPE id oldDataSource = self.dataSource;
-  
-  if (asyncDataSource == nil) {
-    _asyncDataSource = nil;
-    _proxyDataSource = _isDeallocating ? nil : [[ASTableViewProxy alloc] initWithTarget:nil interceptor:self];
-    
-    memset(&_asyncDataSourceFlags, 0, sizeof(_asyncDataSourceFlags));
-  } else {
-    _asyncDataSource = asyncDataSource;
-    _proxyDataSource = [[ASTableViewProxy alloc] initWithTarget:_asyncDataSource interceptor:self];
-    
-    _asyncDataSourceFlags.numberOfSectionsInTableView = [_asyncDataSource respondsToSelector:@selector(numberOfSectionsInTableView:)];
-    _asyncDataSourceFlags.numberOfSectionsInTableNode = [_asyncDataSource respondsToSelector:@selector(numberOfSectionsInTableNode:)];
-    _asyncDataSourceFlags.tableViewNumberOfRowsInSection = [_asyncDataSource respondsToSelector:@selector(tableView:numberOfRowsInSection:)];
-    _asyncDataSourceFlags.tableNodeNumberOfRowsInSection = [_asyncDataSource respondsToSelector:@selector(tableNode:numberOfRowsInSection:)];
-    _asyncDataSourceFlags.tableViewNodeForRow = [_asyncDataSource respondsToSelector:@selector(tableView:nodeForRowAtIndexPath:)];
-    _asyncDataSourceFlags.tableNodeNodeForRow = [_asyncDataSource respondsToSelector:@selector(tableNode:nodeForRowAtIndexPath:)];
-    _asyncDataSourceFlags.tableViewNodeBlockForRow = [_asyncDataSource respondsToSelector:@selector(tableView:nodeBlockForRowAtIndexPath:)];
-    _asyncDataSourceFlags.tableNodeNodeBlockForRow = [_asyncDataSource respondsToSelector:@selector(tableNode:nodeBlockForRowAtIndexPath:)];
-    _asyncDataSourceFlags.tableViewCanMoveRow = [_asyncDataSource respondsToSelector:@selector(tableView:canMoveRowAtIndexPath:)];
-    _asyncDataSourceFlags.tableViewMoveRow = [_asyncDataSource respondsToSelector:@selector(tableView:moveRowAtIndexPath:toIndexPath:)];
-    _asyncDataSourceFlags.sectionIndexMethods = [_asyncDataSource respondsToSelector:@selector(sectionIndexTitlesForTableView:)] && [_asyncDataSource respondsToSelector:@selector(tableView:sectionForSectionIndexTitle:atIndex:)];
-    _asyncDataSourceFlags.modelIdentifierMethods = [_asyncDataSource respondsToSelector:@selector(modelIdentifierForElementAtIndexPath:inNode:)] && [_asyncDataSource respondsToSelector:@selector(indexPathForElementWithModelIdentifier:inNode:)];
-    
-    ASDisplayNodeAssert(_asyncDataSourceFlags.tableViewNodeBlockForRow
-                        || _asyncDataSourceFlags.tableViewNodeForRow
-                        || _asyncDataSourceFlags.tableNodeNodeBlockForRow
-                        || _asyncDataSourceFlags.tableNodeNodeForRow, @"Data source must implement tableNode:nodeBlockForRowAtIndexPath: or tableNode:nodeForRowAtIndexPath:");
-    ASDisplayNodeAssert(_asyncDataSourceFlags.tableNodeNumberOfRowsInSection || _asyncDataSourceFlags.tableViewNumberOfRowsInSection, @"Data source must implement tableNode:numberOfRowsInSection:");
-  }
-  
-  _dataController.validationErrorSource = asyncDataSource;
-  super.dataSource = (id<UITableViewDataSource>)_proxyDataSource;
-  [self _asyncDelegateOrDataSourceDidChange];
-}
-
-- (id<ASTableDelegate>)asyncDelegate
-{
-  return _asyncDelegate;
-}
-
-- (void)setAsyncDelegate:(id<ASTableDelegate>)asyncDelegate
-{
-  // Changing super.delegate will trigger a setNeedsLayout, so this must happen on the main thread.
-  ASDisplayNodeAssertMainThread();
-
-  // Note: It's common to check if the value hasn't changed and short-circuit but we aren't doing that here to handle
-  // the (common) case of nilling the asyncDelegate in the ViewController's dealloc. In this case our _asyncDelegate
-  // will return as nil (ARC magic) even though the _proxyDataSource still exists. It's really important to hold a strong
-  // reference to the old delegate in this case because calls to ASTableViewProxy will start failing and cause crashes.
-  NS_VALID_UNTIL_END_OF_SCOPE id oldDelegate = super.delegate;
-  
-  if (asyncDelegate == nil) {
-    _asyncDelegate = nil;
-    _proxyDelegate = _isDeallocating ? nil : [[ASTableViewProxy alloc] initWithTarget:nil interceptor:self];
-    
-    memset(&_asyncDelegateFlags, 0, sizeof(_asyncDelegateFlags));
-  } else {
-    _asyncDelegate = asyncDelegate;
-    _proxyDelegate = [[ASTableViewProxy alloc] initWithTarget:_asyncDelegate interceptor:self];
-    
-    _asyncDelegateFlags.scrollViewDidScroll = [_asyncDelegate respondsToSelector:@selector(scrollViewDidScroll:)];
-
-    _asyncDelegateFlags.tableViewWillDisplayNodeForRow = [_asyncDelegate respondsToSelector:@selector(tableView:willDisplayNode:forRowAtIndexPath:)];
-    _asyncDelegateFlags.tableNodeWillDisplayNodeForRow = [_asyncDelegate respondsToSelector:@selector(tableNode:willDisplayRowWithNode:)];
-    if (_asyncDelegateFlags.tableViewWillDisplayNodeForRow == NO) {
-      _asyncDelegateFlags.tableViewWillDisplayNodeForRowDeprecated = [_asyncDelegate respondsToSelector:@selector(tableView:willDisplayNodeForRowAtIndexPath:)];
-    }
-    _asyncDelegateFlags.tableViewDidEndDisplayingNodeForRow = [_asyncDelegate respondsToSelector:@selector(tableView:didEndDisplayingNode:forRowAtIndexPath:)];
-    _asyncDelegateFlags.tableNodeDidEndDisplayingNodeForRow = [_asyncDelegate respondsToSelector:@selector(tableNode:didEndDisplayingRowWithNode:)];
-    _asyncDelegateFlags.scrollViewWillEndDragging = [_asyncDelegate respondsToSelector:@selector(scrollViewWillEndDragging:withVelocity:targetContentOffset:)];
-    _asyncDelegateFlags.scrollViewDidEndDecelerating = [_asyncDelegate respondsToSelector:@selector(scrollViewDidEndDecelerating:)];
-    _asyncDelegateFlags.tableViewWillBeginBatchFetch = [_asyncDelegate respondsToSelector:@selector(tableView:willBeginBatchFetchWithContext:)];
-    _asyncDelegateFlags.tableNodeWillBeginBatchFetch = [_asyncDelegate respondsToSelector:@selector(tableNode:willBeginBatchFetchWithContext:)];
-    _asyncDelegateFlags.shouldBatchFetchForTableView = [_asyncDelegate respondsToSelector:@selector(shouldBatchFetchForTableView:)];
-    _asyncDelegateFlags.shouldBatchFetchForTableNode = [_asyncDelegate respondsToSelector:@selector(shouldBatchFetchForTableNode:)];
-    _asyncDelegateFlags.scrollViewWillBeginDragging = [_asyncDelegate respondsToSelector:@selector(scrollViewWillBeginDragging:)];
-    _asyncDelegateFlags.scrollViewDidEndDragging = [_asyncDelegate respondsToSelector:@selector(scrollViewDidEndDragging:willDecelerate:)];
-    _asyncDelegateFlags.tableViewConstrainedSizeForRow = [_asyncDelegate respondsToSelector:@selector(tableView:constrainedSizeForRowAtIndexPath:)];
-    _asyncDelegateFlags.tableNodeConstrainedSizeForRow = [_asyncDelegate respondsToSelector:@selector(tableNode:constrainedSizeForRowAtIndexPath:)];
-
-    _asyncDelegateFlags.tableViewWillSelectRow = [_asyncDelegate respondsToSelector:@selector(tableView:willSelectRowAtIndexPath:)];
-    _asyncDelegateFlags.tableNodeWillSelectRow = [_asyncDelegate respondsToSelector:@selector(tableNode:willSelectRowAtIndexPath:)];
-    _asyncDelegateFlags.tableViewDidSelectRow = [_asyncDelegate respondsToSelector:@selector(tableView:didSelectRowAtIndexPath:)];
-    _asyncDelegateFlags.tableNodeDidSelectRow = [_asyncDelegate respondsToSelector:@selector(tableNode:didSelectRowAtIndexPath:)];
-    _asyncDelegateFlags.tableViewWillDeselectRow = [_asyncDelegate respondsToSelector:@selector(tableView:willDeselectRowAtIndexPath:)];
-    _asyncDelegateFlags.tableNodeWillDeselectRow = [_asyncDelegate respondsToSelector:@selector(tableNode:willDeselectRowAtIndexPath:)];
-    _asyncDelegateFlags.tableViewDidDeselectRow = [_asyncDelegate respondsToSelector:@selector(tableView:didDeselectRowAtIndexPath:)];
-    _asyncDelegateFlags.tableNodeDidDeselectRow = [_asyncDelegate respondsToSelector:@selector(tableNode:didDeselectRowAtIndexPath:)];
-    _asyncDelegateFlags.tableViewShouldHighlightRow = [_asyncDelegate respondsToSelector:@selector(tableView:shouldHighlightRowAtIndexPath:)];
-    _asyncDelegateFlags.tableNodeShouldHighlightRow = [_asyncDelegate respondsToSelector:@selector(tableNode:shouldHighlightRowAtIndexPath:)];
-    _asyncDelegateFlags.tableViewDidHighlightRow = [_asyncDelegate respondsToSelector:@selector(tableView:didHighlightRowAtIndexPath:)];
-    _asyncDelegateFlags.tableNodeDidHighlightRow = [_asyncDelegate respondsToSelector:@selector(tableNode:didHighlightRowAtIndexPath:)];
-    _asyncDelegateFlags.tableViewDidUnhighlightRow = [_asyncDelegate respondsToSelector:@selector(tableView:didUnhighlightRowAtIndexPath:)];
-    _asyncDelegateFlags.tableNodeDidUnhighlightRow = [_asyncDelegate respondsToSelector:@selector(tableNode:didUnhighlightRowAtIndexPath:)];
-    _asyncDelegateFlags.tableViewShouldShowMenuForRow = [_asyncDelegate respondsToSelector:@selector(tableView:shouldShowMenuForRowAtIndexPath:)];
-    _asyncDelegateFlags.tableNodeShouldShowMenuForRow = [_asyncDelegate respondsToSelector:@selector(tableNode:shouldShowMenuForRowAtIndexPath:)];
-    _asyncDelegateFlags.tableViewCanPerformActionForRow = [_asyncDelegate respondsToSelector:@selector(tableView:canPerformAction:forRowAtIndexPath:withSender:)];
-    _asyncDelegateFlags.tableNodeCanPerformActionForRow = [_asyncDelegate respondsToSelector:@selector(tableNode:canPerformAction:forRowAtIndexPath:withSender:)];
-    _asyncDelegateFlags.tableViewPerformActionForRow = [_asyncDelegate respondsToSelector:@selector(tableView:performAction:forRowAtIndexPath:withSender:)];
-    _asyncDelegateFlags.tableNodePerformActionForRow = [_asyncDelegate respondsToSelector:@selector(tableNode:performAction:forRowAtIndexPath:withSender:)];
-  }
-  
-  super.delegate = (id<UITableViewDelegate>)_proxyDelegate;
-  [self _asyncDelegateOrDataSourceDidChange];
-}
-
-- (void)_asyncDelegateOrDataSourceDidChange
-{
-  ASDisplayNodeAssertMainThread();
- 
-  if (_asyncDataSource == nil && _asyncDelegate == nil && !ASActivateExperimentalFeature(ASExperimentalSkipClearData)) {
-    [_dataController clearData];
-  }
-}
-
-- (void)proxyTargetHasDeallocated:(ASDelegateProxy *)proxy
-{
-  if (proxy == _proxyDelegate) {
-    [self setAsyncDelegate:nil];
-  } else if (proxy == _proxyDataSource) {
-    [self setAsyncDataSource:nil];
-  }
-}
-
-- (void)reloadDataWithCompletion:(void (^)())completion
-{
-  ASDisplayNodeAssertMainThread();
-  
-  if (! _dataController.initialReloadDataHasBeenCalled) {
-    // If this is the first reload, forward to super immediately to prevent it from triggering more "initial" loads while our data controller is working. 
-    [super reloadData];
-  }
-  
-  void (^batchUpdatesCompletion)(BOOL);
-  if (completion) {
-    batchUpdatesCompletion = ^(BOOL) {
-      completion();
-    };
-  }
-  
-  [self beginUpdates];
-  [_changeSet reloadData];
-  [self endUpdatesWithCompletion:batchUpdatesCompletion];
-}
-
-- (void)reloadData
-{
-  [self reloadDataWithCompletion:nil];
-}
-
-- (void)scrollToRowAtIndexPath:(NSIndexPath *)indexPath atScrollPosition:(UITableViewScrollPosition)scrollPosition animated:(BOOL)animated
-{
-  if ([self validateIndexPath:indexPath]) {
-    [super scrollToRowAtIndexPath:indexPath atScrollPosition:scrollPosition animated:animated];
-  }
-}
-
-- (void)relayoutItems
-{
-  [_dataController relayoutAllNodesWithInvalidationBlock:nil];
-}
-
-- (void)setTuningParameters:(ASRangeTuningParameters)tuningParameters forRangeType:(ASLayoutRangeType)rangeType
-{
-  [_rangeController setTuningParameters:tuningParameters forRangeMode:ASLayoutRangeModeFull rangeType:rangeType];
-}
-
-- (ASRangeTuningParameters)tuningParametersForRangeType:(ASLayoutRangeType)rangeType
-{
-  return [_rangeController tuningParametersForRangeMode:ASLayoutRangeModeFull rangeType:rangeType];
-}
-
-- (void)setTuningParameters:(ASRangeTuningParameters)tuningParameters forRangeMode:(ASLayoutRangeMode)rangeMode rangeType:(ASLayoutRangeType)rangeType
-{
-  [_rangeController setTuningParameters:tuningParameters forRangeMode:rangeMode rangeType:rangeType];
-}
-
-- (ASRangeTuningParameters)tuningParametersForRangeMode:(ASLayoutRangeMode)rangeMode rangeType:(ASLayoutRangeType)rangeType
-{
-  return [_rangeController tuningParametersForRangeMode:rangeMode rangeType:rangeType];
-}
-
-- (ASElementMap *)elementMapForRangeController:(ASRangeController *)rangeController
-{
-  return _dataController.visibleMap;
-}
-
-- (ASCellNode *)nodeForRowAtIndexPath:(NSIndexPath *)indexPath
-{
-  return [_dataController.visibleMap elementForItemAtIndexPath:indexPath].node;
-}
-
-- (NSIndexPath *)convertIndexPathFromTableNode:(NSIndexPath *)indexPath waitingIfNeeded:(BOOL)wait
-{
-  NSIndexPath *viewIndexPath = [_dataController.visibleMap convertIndexPath:indexPath fromMap:_dataController.pendingMap];
-  if (viewIndexPath == nil && wait) {
-    [self waitUntilAllUpdatesAreCommitted];
-    return [self convertIndexPathFromTableNode:indexPath waitingIfNeeded:NO];
-  }
-  return viewIndexPath;
-}
-
-- (NSIndexPath *)convertIndexPathToTableNode:(NSIndexPath *)indexPath
-{
-  if ([self validateIndexPath:indexPath] == nil) {
-    return nil;
-  }
-
-  return [_dataController.pendingMap convertIndexPath:indexPath fromMap:_dataController.visibleMap];
-}
-
-- (NSArray<NSIndexPath *> *)convertIndexPathsToTableNode:(NSArray<NSIndexPath *> *)indexPaths
-{
-  if (indexPaths == nil) {
-    return nil;
-  }
-
-  NSMutableArray<NSIndexPath *> *indexPathsArray = [NSMutableArray new];
-
-  for (NSIndexPath *indexPathInView in indexPaths) {
-    NSIndexPath *indexPath = [self convertIndexPathToTableNode:indexPathInView];
-    if (indexPath != nil) {
-      [indexPathsArray addObject:indexPath];
-    }
-  }
-  return indexPathsArray;
-}
-
-- (NSIndexPath *)indexPathForNode:(ASCellNode *)cellNode
-{
-  return [self indexPathForNode:cellNode waitingIfNeeded:NO];
-}
-
-/**
- * Asserts that the index path is a valid view-index-path, and returns it if so, nil otherwise.
- */
-- (nullable NSIndexPath *)validateIndexPath:(nullable NSIndexPath *)indexPath
-{
-  if (indexPath == nil) {
-    return nil;
-  }
-
-  NSInteger section = indexPath.section;
-  if (section >= self.numberOfSections) {
-    ASDisplayNodeFailAssert(@"Table view index path has invalid section %lu, section count = %lu", (unsigned long)section, (unsigned long)self.numberOfSections);
-    return nil;
-  }
-
-  NSInteger item = indexPath.item;
-  // item == NSNotFound means e.g. "scroll to this section" and is acceptable
-  if (item != NSNotFound && item >= [self numberOfRowsInSection:section]) {
-    ASDisplayNodeFailAssert(@"Table view index path has invalid item %lu in section %lu, item count = %lu", (unsigned long)indexPath.item, (unsigned long)section, (unsigned long)[self numberOfRowsInSection:section]);
-    return nil;
-  }
-
-  return indexPath;
-}
-
-- (nullable NSIndexPath *)indexPathForNode:(ASCellNode *)cellNode waitingIfNeeded:(BOOL)wait
-{
-  if (cellNode == nil) {
-    return nil;
-  }
-
-  NSIndexPath *indexPath = [_dataController.visibleMap indexPathForElement:cellNode.collectionElement];
-  indexPath = [self validateIndexPath:indexPath];
-  if (indexPath == nil && wait) {
-    [self waitUntilAllUpdatesAreCommitted];
-    return [self indexPathForNode:cellNode waitingIfNeeded:NO];
-  }
-  return indexPath;
-}
-
-- (NSArray<ASCellNode *> *)visibleNodes
-{
-  const auto elements = [self visibleElementsForRangeController:_rangeController];
-  return ASArrayByFlatMapping(elements, ASCollectionElement *e, e.node);
-}
-
-- (void)beginUpdates
-{
-  ASDisplayNodeAssertMainThread();
-  // _changeSet must be available during batch update
-  ASDisplayNodeAssertTrue((_batchUpdateCount > 0) == (_changeSet != nil));
-  
-  if (_batchUpdateCount == 0) {
-    _changeSet = [[_ASHierarchyChangeSet alloc] initWithOldData:[_dataController itemCountsFromDataSource]];
-  }
-  _batchUpdateCount++;
-}
-
-- (void)endUpdates
-{
-  [self endUpdatesWithCompletion:nil];
-}
-
-- (void)endUpdatesWithCompletion:(void (^)(BOOL completed))completion
-{
-  // We capture the current state of whether animations are enabled if they don't provide us with one.
-  [self endUpdatesAnimated:[UIView areAnimationsEnabled] completion:completion];
-}
-
-- (void)endUpdatesAnimated:(BOOL)animated completion:(void (^)(BOOL completed))completion
-{
-  ASDisplayNodeAssertMainThread();
-  ASDisplayNodeAssertNotNil(_changeSet, @"_changeSet must be available when batch update ends");
-  
-  _batchUpdateCount--;
-  // Prevent calling endUpdatesAnimated:completion: in an unbalanced way
-  NSAssert(_batchUpdateCount >= 0, @"endUpdatesAnimated:completion: called without having a balanced beginUpdates call");
-  
-  [_changeSet addCompletionHandler:completion];
-
-  if (_batchUpdateCount == 0) {
-    _ASHierarchyChangeSet *changeSet = _changeSet;
-    // Nil out _changeSet before forwarding to _dataController to allow the change set to cause subsequent batch updates on the same run loop
-    _changeSet = nil;
-    changeSet.animated = animated;
-    [_dataController updateWithChangeSet:changeSet];
-  } 
-}
-
-- (BOOL)isProcessingUpdates
-{
-  return [_dataController isProcessingUpdates];
-}
-
-- (void)onDidFinishProcessingUpdates:(void (^)())completion
-{
-  [_dataController onDidFinishProcessingUpdates:completion];
-}
-
-- (void)waitUntilAllUpdatesAreCommitted
-{
-  ASDisplayNodeAssertMainThread();
-  if (_batchUpdateCount > 0) {
-    // This assertion will be enabled soon.
-    //    ASDisplayNodeFailAssert(@"Should not call %@ during batch update", NSStringFromSelector(_cmd));
-    return;
-  }
-
-  [_dataController waitUntilAllUpdatesAreProcessed];
-}
-
-- (void)layoutSubviews
-{
-  // Remeasure all rows if our row width has changed.
-  UIEdgeInsets contentInset = self.contentInset;
-  CGFloat constrainedWidth = self.bounds.size.width - [self sectionIndexWidth] - contentInset.left - contentInset.right;
-  if (constrainedWidth > 0 && _nodesConstrainedWidth != constrainedWidth) {
-    _nodesConstrainedWidth = constrainedWidth;
-    [_cellsForLayoutUpdates removeAllObjects];
-
-    [self beginUpdates];
-    [_dataController relayoutAllNodesWithInvalidationBlock:nil];
-    [self endUpdatesAnimated:(ASDisplayNodeLayerHasAnimations(self.layer) == NO) completion:nil];
-  } else {
-    if (_cellsForLayoutUpdates.count > 0) {
-      NSArray<ASCellNode *> *nodes = [_cellsForLayoutUpdates allObjects];
-      [_cellsForLayoutUpdates removeAllObjects];
-
-      const auto nodesSizeChanged = [[NSMutableArray<ASCellNode *> alloc] init];
-      [_dataController relayoutNodes:nodes nodesSizeChanged:nodesSizeChanged];
-      if (nodesSizeChanged.count > 0) {
-        [self requeryNodeHeights];
-      }
-    }
-  }
-
-  // To ensure _nodesConstrainedWidth is up-to-date for every usage, this call to super must be done last
-  [super layoutSubviews];
-  [_rangeController updateIfNeeded];
-}
-
-#pragma mark -
-#pragma mark Editing
-
-- (void)insertSections:(NSIndexSet *)sections withRowAnimation:(UITableViewRowAnimation)animation
-{
-  ASDisplayNodeAssertMainThread();
-  if (sections.count == 0) { return; }
-  [self beginUpdates];
-  [_changeSet insertSections:sections animationOptions:animation];
-  [self endUpdates];
-}
-
-- (void)deleteSections:(NSIndexSet *)sections withRowAnimation:(UITableViewRowAnimation)animation
-{
-  ASDisplayNodeAssertMainThread();
-  if (sections.count == 0) { return; }
-  [self beginUpdates];
-  [_changeSet deleteSections:sections animationOptions:animation];
-  [self endUpdates];
-}
-
-- (void)reloadSections:(NSIndexSet *)sections withRowAnimation:(UITableViewRowAnimation)animation
-{
-  ASDisplayNodeAssertMainThread();
-  if (sections.count == 0) { return; }
-  [self beginUpdates];
-  [_changeSet reloadSections:sections animationOptions:animation];
-  [self endUpdates];
-}
-
-- (void)moveSection:(NSInteger)section toSection:(NSInteger)newSection
-{
-  ASDisplayNodeAssertMainThread();
-  [self beginUpdates];
-  [_changeSet moveSection:section toSection:newSection animationOptions:UITableViewRowAnimationNone];
-  [self endUpdates];
-}
-
-- (void)insertRowsAtIndexPaths:(NSArray *)indexPaths withRowAnimation:(UITableViewRowAnimation)animation
-{
-  ASDisplayNodeAssertMainThread();
-  if (indexPaths.count == 0) { return; }
-  [self beginUpdates];
-  [_changeSet insertItems:indexPaths animationOptions:animation];
-  [self endUpdates];
-}
-
-- (void)deleteRowsAtIndexPaths:(NSArray *)indexPaths withRowAnimation:(UITableViewRowAnimation)animation
-{
-  ASDisplayNodeAssertMainThread();
-  if (indexPaths.count == 0) { return; }
-  [self beginUpdates];
-  [_changeSet deleteItems:indexPaths animationOptions:animation];
-  [self endUpdates];
-}
-
-- (void)reloadRowsAtIndexPaths:(NSArray *)indexPaths withRowAnimation:(UITableViewRowAnimation)animation
-{
-  ASDisplayNodeAssertMainThread();
-  if (indexPaths.count == 0) { return; }
-  [self beginUpdates];
-  [_changeSet reloadItems:indexPaths animationOptions:animation];
-  [self endUpdates];
-}
-
-- (void)moveRowAtIndexPath:(NSIndexPath *)indexPath toIndexPath:(NSIndexPath *)newIndexPath
-{
-  ASDisplayNodeAssertMainThread();
-  [self beginUpdates];
-  [_changeSet moveItemAtIndexPath:indexPath toIndexPath:newIndexPath animationOptions:UITableViewRowAnimationNone];
-  [self endUpdates];
-}
-
-#pragma mark -
-#pragma mark adjust content offset
-
-- (void)beginAdjustingContentOffset
-{
-  NSIndexPath *firstVisibleIndexPath = [self.indexPathsForVisibleRows sortedArrayUsingSelector:@selector(compare:)].firstObject;
-  if (firstVisibleIndexPath) {
-    ASCellNode *node = [self nodeForRowAtIndexPath:firstVisibleIndexPath];
-    if (node) {
-      _contentOffsetAdjustmentTopVisibleNode = node;
-      _contentOffsetAdjustmentTopVisibleNodeOffset = [self rectForRowAtIndexPath:firstVisibleIndexPath].origin.y - self.bounds.origin.y;
-    }
-  }
-}
-
-- (void)endAdjustingContentOffsetAnimated:(BOOL)animated
-{
-  // We can't do this for animated updates.
-  if (animated) {
-    return;
-  }
-  
-  // We can't do this if we didn't have a top visible row before.
-  if (_contentOffsetAdjustmentTopVisibleNode == nil) {
-    return;
-  }
-  
-  NSIndexPath *newIndexPathForTopVisibleRow = [self indexPathForNode:_contentOffsetAdjustmentTopVisibleNode];
-  // We can't do this if our top visible row was deleted
-  if (newIndexPathForTopVisibleRow == nil) {
-    return;
-  }
-  
-  CGFloat newRowOriginYInSelf = [self rectForRowAtIndexPath:newIndexPathForTopVisibleRow].origin.y - self.bounds.origin.y;
-  CGPoint newContentOffset = self.contentOffset;
-  newContentOffset.y += (newRowOriginYInSelf - _contentOffsetAdjustmentTopVisibleNodeOffset);
-  self.contentOffset = newContentOffset;
-  _contentOffsetAdjustmentTopVisibleNode = nil;
-}
-
-#pragma mark - Intercepted selectors
-
-- (void)setTableHeaderView:(UIView *)tableHeaderView
-{
-  // Typically the view will be nil before setting it, but reset state if it is being re-hosted.
-  [self.tableHeaderView.asyncdisplaykit_node exitHierarchyState:ASHierarchyStateRangeManaged];
-  [super setTableHeaderView:tableHeaderView];
-  [self.tableHeaderView.asyncdisplaykit_node enterHierarchyState:ASHierarchyStateRangeManaged];
-}
-
-- (void)setTableFooterView:(UIView *)tableFooterView
-{
-  // Typically the view will be nil before setting it, but reset state if it is being re-hosted.
-  [self.tableFooterView.asyncdisplaykit_node exitHierarchyState:ASHierarchyStateRangeManaged];
-  [super setTableFooterView:tableFooterView];
-  [self.tableFooterView.asyncdisplaykit_node enterHierarchyState:ASHierarchyStateRangeManaged];
-}
-
-- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath
-{
-  _ASTableViewCell *cell = [self dequeueReusableCellWithIdentifier:kCellReuseIdentifier forIndexPath:indexPath];
-  cell.delegate = self;
-
-  ASCollectionElement *element = [_dataController.visibleMap elementForItemAtIndexPath:indexPath];
-  cell.element = element;
-  ASCellNode *node = element.node;
-  if (node) {
-    [_rangeController configureContentView:cell.contentView forCellNode:node];
-  }
-
-  return cell;
-}
-
-- (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath
-{
-  CGFloat height = 0.0;
-
-  ASCollectionElement *element = [_dataController.visibleMap elementForItemAtIndexPath:indexPath];
-  if (element != nil) {
-    ASCellNode *node = element.node;
-    ASDisplayNodeAssertNotNil(node, @"Node must not be nil!");
-    height = [node layoutThatFits:element.constrainedSize].size.height;
-  }
-  
-#if TARGET_OS_IOS
-  /**
-   * Weirdly enough, Apple expects the return value here to _include_ the height
-   * of the separator, if there is one! So if our node wants to be 43.5, we need
-   * to return 44. UITableView will make a cell of height 44 with a content view
-   * of height 43.5.
-   */
-  if (tableView.separatorStyle != UITableViewCellSeparatorStyleNone) {
-    height += 1.0 / ASScreenScale();
-  }
-#endif
-  
-  return height;
-}
-
-- (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView
-{
-  return _dataController.visibleMap.numberOfSections;
-}
-
-- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section
-{
-  return [_dataController.visibleMap numberOfItemsInSection:section];
-}
-
-- (nullable NSString *)modelIdentifierForElementAtIndexPath:(NSIndexPath *)indexPath inView:(UIView *)view {
-    if (_asyncDataSourceFlags.modelIdentifierMethods) {
-        GET_TABLENODE_OR_RETURN(tableNode, nil);
-        NSIndexPath *convertedPath = [self convertIndexPathToTableNode:indexPath];
-        if (convertedPath == nil) {
-            return nil;
-        } else {
-            return [_asyncDataSource modelIdentifierForElementAtIndexPath:convertedPath inNode:tableNode];
-        }
-    } else {
-        return nil;
-    }
-}
-
-- (nullable NSIndexPath *)indexPathForElementWithModelIdentifier:(NSString *)identifier inView:(UIView *)view {
-    if (_asyncDataSourceFlags.modelIdentifierMethods) {
-        GET_TABLENODE_OR_RETURN(tableNode, nil);
-        return  [_asyncDataSource indexPathForElementWithModelIdentifier:identifier inNode:tableNode];
-      } else {
-        return nil;
-    }
-}
-
-- (BOOL)tableView:(UITableView *)tableView canMoveRowAtIndexPath:(NSIndexPath *)indexPath
-{
-  if (_asyncDataSourceFlags.tableViewCanMoveRow) {
-    return [_asyncDataSource tableView:self canMoveRowAtIndexPath:indexPath];
-  } else {
-    return NO;
-  }
-}
-
-- (void)tableView:(UITableView *)tableView moveRowAtIndexPath:(NSIndexPath *)sourceIndexPath toIndexPath:(NSIndexPath *)destinationIndexPath
-{
-  if (_asyncDataSourceFlags.tableViewMoveRow) {
-    [_asyncDataSource tableView:self moveRowAtIndexPath:sourceIndexPath toIndexPath:destinationIndexPath];
-  }
-
-  // Move node after informing data source in case they call nodeAtIndexPath:
-  // Get up to date
-  [self waitUntilAllUpdatesAreCommitted];
-  // Set our flag to suppress informing super about the change.
-  _updatingInResponseToInteractiveMove = YES;
-  // Submit the move
-  [self moveRowAtIndexPath:sourceIndexPath toIndexPath:destinationIndexPath];
-  // Wait for it to finish – should be fast!
-  [self waitUntilAllUpdatesAreCommitted];
-  // Clear the flag
-  _updatingInResponseToInteractiveMove = NO;
-}
-
-- (void)tableView:(UITableView *)tableView willDisplayCell:(_ASTableViewCell *)cell forRowAtIndexPath:(NSIndexPath *)indexPath
-{
-  ASCollectionElement *element = cell.element;
-  if (element) {
-    ASDisplayNodeAssertTrue([_dataController.visibleMap elementForItemAtIndexPath:indexPath] == element);
-    [_visibleElements addObject:element];
-  } else {
-    ASDisplayNodeAssert(NO, @"Unexpected nil element for willDisplayCell: %@, %@, %@", cell, self, indexPath);
-    return;
-  }
-
-  ASCellNode *cellNode = element.node;
-  cellNode.scrollView = tableView;
-
-  ASDisplayNodeAssertNotNil(cellNode, @"Expected node associated with cell that will be displayed not to be nil. indexPath: %@", indexPath);
-
-  if (_asyncDelegateFlags.tableNodeWillDisplayNodeForRow) {
-    GET_TABLENODE_OR_RETURN(tableNode, (void)0);
-    [_asyncDelegate tableNode:tableNode willDisplayRowWithNode:cellNode];
-  } else if (_asyncDelegateFlags.tableViewWillDisplayNodeForRow) {
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
-    [_asyncDelegate tableView:self willDisplayNode:cellNode forRowAtIndexPath:indexPath];
-  } else if (_asyncDelegateFlags.tableViewWillDisplayNodeForRowDeprecated) {
-    [_asyncDelegate tableView:self willDisplayNodeForRowAtIndexPath:indexPath];
-  }
-#pragma clang diagnostic pop
-  
-  [_rangeController setNeedsUpdate];
-  
-  if ([cell consumesCellNodeVisibilityEvents]) {
-    [_cellsForVisibilityUpdates addObject:cell];
-  }
-}
-
-- (void)tableView:(UITableView *)tableView didEndDisplayingCell:(_ASTableViewCell *)cell forRowAtIndexPath:(NSIndexPath *)indexPath
-{
-  // Retrieve the element from cell instead of visible map because at this point visible map could have been updated and no longer holds the element.
-  ASCollectionElement *element = cell.element;
-  if (element) {
-    [_visibleElements removeObject:element];
-  } else {
-    ASDisplayNodeAssert(NO, @"Unexpected nil element for didEndDisplayingCell: %@, %@, %@", cell, self, indexPath);
-    return;
-  }
-
-  ASCellNode *cellNode = element.node;
-
-  [_rangeController setNeedsUpdate];
-
-  ASDisplayNodeAssertNotNil(cellNode, @"Expected node associated with removed cell not to be nil.");
-  if (_asyncDelegateFlags.tableNodeDidEndDisplayingNodeForRow) {
-    if (ASTableNode *tableNode = self.tableNode) {
-    	[_asyncDelegate tableNode:tableNode didEndDisplayingRowWithNode:cellNode];
-    }
-  } else if (_asyncDelegateFlags.tableViewDidEndDisplayingNodeForRow) {
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
-    [_asyncDelegate tableView:self didEndDisplayingNode:cellNode forRowAtIndexPath:indexPath];
-#pragma clang diagnostic pop
-  }
-
-  [_cellsForVisibilityUpdates removeObject:cell];
-  
-  cellNode.scrollView = nil;
-}
-
-- (NSIndexPath *)tableView:(UITableView *)tableView willSelectRowAtIndexPath:(nonnull NSIndexPath *)indexPath
-{
-  if (_asyncDelegateFlags.tableNodeWillSelectRow) {
-    GET_TABLENODE_OR_RETURN(tableNode, indexPath);
-    NSIndexPath *result = [self convertIndexPathToTableNode:indexPath];
-    // If this item was is gone, just let the table view do its default behavior and select.
-    if (result == nil) {
-      return indexPath;
-    } else {
-      result = [_asyncDelegate tableNode:tableNode willSelectRowAtIndexPath:result];
-      result = [self convertIndexPathFromTableNode:result waitingIfNeeded:YES];
-      return result;
-    }
-  } else if (_asyncDelegateFlags.tableViewWillSelectRow) {
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
-    return [_asyncDelegate tableView:self willSelectRowAtIndexPath:indexPath];
-#pragma clang diagnostic pop
-  } else {
-    return indexPath;
-  }
-}
-
-- (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(nonnull NSIndexPath *)indexPath
-{
-  if (_asyncDelegateFlags.tableNodeDidSelectRow) {
-    GET_TABLENODE_OR_RETURN(tableNode, (void)0);
-    indexPath = [self convertIndexPathToTableNode:indexPath];
-    if (indexPath != nil) {
-      [_asyncDelegate tableNode:tableNode didSelectRowAtIndexPath:indexPath];
-    }
-  } else if (_asyncDelegateFlags.tableViewDidSelectRow) {
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
-    [_asyncDelegate tableView:self didSelectRowAtIndexPath:indexPath];
-#pragma clang diagnostic pop
-  }
-}
-
-- (NSIndexPath *)tableView:(UITableView *)tableView willDeselectRowAtIndexPath:(nonnull NSIndexPath *)indexPath
-{
-  if (_asyncDelegateFlags.tableNodeWillDeselectRow) {
-    GET_TABLENODE_OR_RETURN(tableNode, indexPath);
-    NSIndexPath *result = [self convertIndexPathToTableNode:indexPath];
-    // If this item was is gone, just let the table view do its default behavior and deselect.
-    if (result == nil) {
-      return indexPath;
-    } else {
-      result = [_asyncDelegate tableNode:tableNode willDeselectRowAtIndexPath:result];
-      result = [self convertIndexPathFromTableNode:result waitingIfNeeded:YES];
-      return result;
-    }
-  } else if (_asyncDelegateFlags.tableViewWillDeselectRow) {
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
-    return [_asyncDelegate tableView:self willDeselectRowAtIndexPath:indexPath];
-#pragma clang diagnostic pop
-  }
-  return indexPath;
-}
-
-- (void)tableView:(UITableView *)tableView didDeselectRowAtIndexPath:(nonnull NSIndexPath *)indexPath
-{
-  if (_asyncDelegateFlags.tableNodeDidDeselectRow) {
-    GET_TABLENODE_OR_RETURN(tableNode, (void)0);
-    indexPath = [self convertIndexPathToTableNode:indexPath];
-    if (indexPath != nil) {
-      [_asyncDelegate tableNode:tableNode didDeselectRowAtIndexPath:indexPath];
-    }
-  } else if (_asyncDelegateFlags.tableViewDidDeselectRow) {
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
-    [_asyncDelegate tableView:self didDeselectRowAtIndexPath:indexPath];
-#pragma clang diagnostic pop
-  }
-}
-
-- (BOOL)tableView:(UITableView *)tableView shouldHighlightRowAtIndexPath:(nonnull NSIndexPath *)indexPath
-{
-  if (_asyncDelegateFlags.tableNodeShouldHighlightRow) {
-    GET_TABLENODE_OR_RETURN(tableNode, NO);
-    indexPath = [self convertIndexPathToTableNode:indexPath];
-    if (indexPath != nil) {
-      return [_asyncDelegate tableNode:tableNode shouldHighlightRowAtIndexPath:indexPath];
-    }
-  } else if (_asyncDelegateFlags.tableViewShouldHighlightRow) {
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
-    return [_asyncDelegate tableView:self shouldHighlightRowAtIndexPath:indexPath];
-#pragma clang diagnostic pop
-  }
-  return YES;
-}
-
-- (void)tableView:(UITableView *)tableView didHighlightRowAtIndexPath:(nonnull NSIndexPath *)indexPath
-{
-  if (_asyncDelegateFlags.tableNodeDidHighlightRow) {
-    GET_TABLENODE_OR_RETURN(tableNode, (void)0);
-    indexPath = [self convertIndexPathToTableNode:indexPath];
-    if (indexPath != nil) {
-      return [_asyncDelegate tableNode:tableNode didHighlightRowAtIndexPath:indexPath];
-    }
-  } else if (_asyncDelegateFlags.tableViewDidHighlightRow) {
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
-    [_asyncDelegate tableView:self didHighlightRowAtIndexPath:indexPath];
-#pragma clang diagnostic pop
-  }
-}
-
-- (void)tableView:(UITableView *)tableView didUnhighlightRowAtIndexPath:(nonnull NSIndexPath *)indexPath
-{
-  if (_asyncDelegateFlags.tableNodeDidHighlightRow) {
-    GET_TABLENODE_OR_RETURN(tableNode, (void)0);
-    indexPath = [self convertIndexPathToTableNode:indexPath];
-    if (indexPath != nil) {
-      return [_asyncDelegate tableNode:tableNode didUnhighlightRowAtIndexPath:indexPath];
-    }
-  } else if (_asyncDelegateFlags.tableViewDidUnhighlightRow) {
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
-    [_asyncDelegate tableView:self didUnhighlightRowAtIndexPath:indexPath];
-#pragma clang diagnostic pop
-  }
-}
-
-- (BOOL)tableView:(UITableView *)tableView shouldShowMenuForRowAtIndexPath:(nonnull NSIndexPath *)indexPath
-{
-  if (_asyncDelegateFlags.tableNodeShouldShowMenuForRow) {
-    GET_TABLENODE_OR_RETURN(tableNode, NO);
-    indexPath = [self convertIndexPathToTableNode:indexPath];
-    if (indexPath != nil) {
-      return [_asyncDelegate tableNode:tableNode shouldShowMenuForRowAtIndexPath:indexPath];
-    }
-  } else if (_asyncDelegateFlags.tableViewShouldShowMenuForRow) {
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
-    return [_asyncDelegate tableView:self shouldShowMenuForRowAtIndexPath:indexPath];
-#pragma clang diagnostic pop
-  }
-  return NO;
-}
-
-- (BOOL)tableView:(UITableView *)tableView canPerformAction:(nonnull SEL)action forRowAtIndexPath:(nonnull NSIndexPath *)indexPath withSender:(nullable id)sender
-{
-  if (_asyncDelegateFlags.tableNodeCanPerformActionForRow) {
-    GET_TABLENODE_OR_RETURN(tableNode, NO);
-    indexPath = [self convertIndexPathToTableNode:indexPath];
-    if (indexPath != nil) {
-      return [_asyncDelegate tableNode:tableNode canPerformAction:action forRowAtIndexPath:indexPath withSender:sender];
-    }
-  } else if (_asyncDelegateFlags.tableViewCanPerformActionForRow) {
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
-    return [_asyncDelegate tableView:self canPerformAction:action forRowAtIndexPath:indexPath withSender:sender];
-#pragma clang diagnostic pop
-  }
-  return NO;
-}
-
-- (void)tableView:(UITableView *)tableView performAction:(nonnull SEL)action forRowAtIndexPath:(nonnull NSIndexPath *)indexPath withSender:(nullable id)sender
-{
-  if (_asyncDelegateFlags.tableNodePerformActionForRow) {
-    GET_TABLENODE_OR_RETURN(tableNode, (void)0);
-    indexPath = [self convertIndexPathToTableNode:indexPath];
-    if (indexPath != nil) {
-      [_asyncDelegate tableNode:tableNode performAction:action forRowAtIndexPath:indexPath withSender:sender];
-    }
-  } else if (_asyncDelegateFlags.tableViewPerformActionForRow) {
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
-    [_asyncDelegate tableView:self performAction:action forRowAtIndexPath:indexPath withSender:sender];
-#pragma clang diagnostic pop
-  }
-}
-
-- (void)scrollViewDidScroll:(UIScrollView *)scrollView
-{
-  if (scrollView != self && UITABLEVIEW_RESPONDS_TO_SELECTOR()) {
-    [super scrollViewDidScroll:scrollView];
-    return;
-  }
-  ASInterfaceState interfaceState = [self interfaceStateForRangeController:_rangeController];
-  if (ASInterfaceStateIncludesVisible(interfaceState)) {
-    [self _checkForBatchFetching];
-  }  
-  for (_ASTableViewCell *tableCell in _cellsForVisibilityUpdates) {
-    [[tableCell node] cellNodeVisibilityEvent:ASCellNodeVisibilityEventVisibleRectChanged
-                                 inScrollView:scrollView
-                                withCellFrame:tableCell.frame];
-  }
-  if (_asyncDelegateFlags.scrollViewDidScroll) {
-    [_asyncDelegate scrollViewDidScroll:scrollView];
-  }
-}
-
-- (void)scrollViewWillEndDragging:(UIScrollView *)scrollView withVelocity:(CGPoint)velocity targetContentOffset:(inout CGPoint *)targetContentOffset
-{
-  if (scrollView != self && UITABLEVIEW_RESPONDS_TO_SELECTOR()) {
-    [super scrollViewWillEndDragging:scrollView withVelocity:velocity targetContentOffset:targetContentOffset];
-    return;
-  }
-  CGPoint contentOffset = scrollView.contentOffset;
-  _deceleratingVelocity = CGPointMake(
-    contentOffset.x - ((targetContentOffset != NULL) ? targetContentOffset->x : 0),
-    contentOffset.y - ((targetContentOffset != NULL) ? targetContentOffset->y : 0)
-  );
-
-  if (targetContentOffset != NULL) {
-    ASDisplayNodeAssert(_batchContext != nil, @"Batch context should exist");
-    [self _beginBatchFetchingIfNeededWithContentOffset:*targetContentOffset velocity:velocity];
-  }
-  
-  if (_asyncDelegateFlags.scrollViewWillEndDragging) {
-    [_asyncDelegate scrollViewWillEndDragging:scrollView withVelocity:velocity targetContentOffset:(targetContentOffset ? : &contentOffset)];
-  }
-}
-
-- (void)scrollViewDidEndDecelerating:(UIScrollView *)scrollView
-{
-  if (scrollView != self && UITABLEVIEW_RESPONDS_TO_SELECTOR()) {
-    [super scrollViewDidEndDecelerating:scrollView];
-    return;
-  }
-  _deceleratingVelocity = CGPointZero;
-
-  if (_asyncDelegateFlags.scrollViewDidEndDecelerating) {
-      [_asyncDelegate scrollViewDidEndDecelerating:scrollView];
-  }
-}
-
-- (void)scrollViewWillBeginDragging:(UIScrollView *)scrollView
-{
-  if (scrollView != self && UITABLEVIEW_RESPONDS_TO_SELECTOR()) {
-    [super scrollViewWillBeginDragging:scrollView];
-    return;
-  }
-  // If a scroll happens the current range mode needs to go to full
-  _rangeController.contentHasBeenScrolled = YES;
-  [_rangeController updateCurrentRangeWithMode:ASLayoutRangeModeFull];
-
-  for (_ASTableViewCell *tableViewCell in _cellsForVisibilityUpdates) {
-    [[tableViewCell node] cellNodeVisibilityEvent:ASCellNodeVisibilityEventWillBeginDragging
-                                          inScrollView:scrollView
-                                         withCellFrame:tableViewCell.frame];
-  }
-  if (_asyncDelegateFlags.scrollViewWillBeginDragging) {
-    [_asyncDelegate scrollViewWillBeginDragging:scrollView];
-  }
-}
-
-- (void)scrollViewDidEndDragging:(UIScrollView *)scrollView willDecelerate:(BOOL)decelerate
-{
-  if (scrollView != self && UITABLEVIEW_RESPONDS_TO_SELECTOR()) {
-    [super scrollViewDidEndDragging:scrollView willDecelerate:decelerate];
-    return;
-  }
-  for (_ASTableViewCell *tableViewCell in _cellsForVisibilityUpdates) {
-    [[tableViewCell node] cellNodeVisibilityEvent:ASCellNodeVisibilityEventDidEndDragging
-                                          inScrollView:scrollView
-                                         withCellFrame:tableViewCell.frame];
-  }
-  if (_asyncDelegateFlags.scrollViewDidEndDragging) {
-    [_asyncDelegate scrollViewDidEndDragging:scrollView willDecelerate:decelerate];
-  }
-}
-
-#pragma mark - Misc
-
-- (BOOL)inverted
-{
-  return _inverted;
-}
-
-- (void)setInverted:(BOOL)inverted
-{
-  _inverted = inverted;
-}
-
-- (CGFloat)leadingScreensForBatching
-{
-  return _leadingScreensForBatching;
-}
-
-- (void)setLeadingScreensForBatching:(CGFloat)leadingScreensForBatching
-{
-  if (_leadingScreensForBatching != leadingScreensForBatching) {
-    _leadingScreensForBatching = leadingScreensForBatching;
-    ASPerformBlockOnMainThread(^{
-      [self _checkForBatchFetching];
-    });
-  }
-}
-
-- (BOOL)automaticallyAdjustsContentOffset
-{
-  return _automaticallyAdjustsContentOffset;
-}
-
-- (void)setAutomaticallyAdjustsContentOffset:(BOOL)automaticallyAdjustsContentOffset
-{
-  _automaticallyAdjustsContentOffset = automaticallyAdjustsContentOffset;
-}
-
-#pragma mark - Scroll Direction
-
-- (ASScrollDirection)scrollDirection
-{
-  CGPoint scrollVelocity;
-  if (self.isTracking) {
-    scrollVelocity = [self.panGestureRecognizer velocityInView:self.superview];
-  } else {
-    scrollVelocity = _deceleratingVelocity;
-  }
-  
-  ASScrollDirection scrollDirection = [self _scrollDirectionForVelocity:scrollVelocity];
-  return ASScrollDirectionApplyTransform(scrollDirection, self.transform);
-}
-
-- (ASScrollDirection)_scrollDirectionForVelocity:(CGPoint)scrollVelocity
-{
-  ASScrollDirection direction = ASScrollDirectionNone;
-  ASScrollDirection scrollableDirections = [self scrollableDirections];
-  
-  if (ASScrollDirectionContainsVerticalDirection(scrollableDirections)) { // Can scroll vertically.
-    if (scrollVelocity.y < 0.0) {
-      direction |= ASScrollDirectionDown;
-    } else if (scrollVelocity.y > 0.0) {
-      direction |= ASScrollDirectionUp;
-    }
-  }
-  
-  return direction;
-}
-
-- (ASScrollDirection)scrollableDirections
-{
-  ASScrollDirection scrollableDirection = ASScrollDirectionNone;
-  CGFloat totalContentWidth = self.contentSize.width + self.contentInset.left + self.contentInset.right;
-  CGFloat totalContentHeight = self.contentSize.height + self.contentInset.top + self.contentInset.bottom;
-  
-  if (self.alwaysBounceHorizontal || totalContentWidth > self.bounds.size.width) { // Can scroll horizontally.
-    scrollableDirection |= ASScrollDirectionHorizontalDirections;
-  }
-  if (self.alwaysBounceVertical || totalContentHeight > self.bounds.size.height) { // Can scroll vertically.
-    scrollableDirection |= ASScrollDirectionVerticalDirections;
-  }
-  return scrollableDirection;
-}
-
-
-#pragma mark - Batch Fetching
-
-- (ASBatchContext *)batchContext
-{
-  return _batchContext;
-}
-
-- (BOOL)canBatchFetch
-{
-  // if the delegate does not respond to this method, there is no point in starting to fetch
-  BOOL canFetch = _asyncDelegateFlags.tableNodeWillBeginBatchFetch || _asyncDelegateFlags.tableViewWillBeginBatchFetch;
-  if (canFetch && _asyncDelegateFlags.shouldBatchFetchForTableNode) {
-    GET_TABLENODE_OR_RETURN(tableNode, NO);
-    return [_asyncDelegate shouldBatchFetchForTableNode:tableNode];
-  } else if (canFetch && _asyncDelegateFlags.shouldBatchFetchForTableView) {
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
-    return [_asyncDelegate shouldBatchFetchForTableView:self];
-#pragma clang diagnostic pop
-  } else {
-    return canFetch;
-  }
-}
-
-- (id<ASBatchFetchingDelegate>)batchFetchingDelegate
-{
-  return self.tableNode.batchFetchingDelegate;
-}
-
-- (void)_scheduleCheckForBatchFetchingForNumberOfChanges:(NSUInteger)changes
-{
-  // Prevent fetching will continually trigger in a loop after reaching end of content and no new content was provided
-  if (changes == 0 && _hasEverCheckedForBatchFetchingDueToUpdate) {
-    return;
-  }
-  _hasEverCheckedForBatchFetchingDueToUpdate = YES;
-
-  // Push this to the next runloop to be sure the scroll view has the right content size
-  dispatch_async(dispatch_get_main_queue(), ^{
-    [self _checkForBatchFetching];
-  });
-}
-
-- (void)_checkForBatchFetching
-{
-  // Dragging will be handled in scrollViewWillEndDragging:withVelocity:targetContentOffset:
-  if (self.isDragging || self.isTracking) {
-    return;
-  }
-  
-  [self _beginBatchFetchingIfNeededWithContentOffset:self.contentOffset velocity:CGPointZero];
-}
-
-- (void)_beginBatchFetchingIfNeededWithContentOffset:(CGPoint)contentOffset velocity:(CGPoint)velocity
-{
-  if (ASDisplayShouldFetchBatchForScrollView(self, self.scrollDirection, ASScrollDirectionVerticalDirections, contentOffset, velocity)) {
-    [self _beginBatchFetching];
-  }
-}
-
-- (void)_beginBatchFetching
-{
-  [_batchContext beginBatchFetching];
-  if (_asyncDelegateFlags.tableNodeWillBeginBatchFetch) {
-    dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
-      GET_TABLENODE_OR_RETURN(tableNode, (void)0);
-      [_asyncDelegate tableNode:tableNode willBeginBatchFetchWithContext:_batchContext];
-    });
-  } else if (_asyncDelegateFlags.tableViewWillBeginBatchFetch) {
-    dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
-      [_asyncDelegate tableView:self willBeginBatchFetchWithContext:_batchContext];
-#pragma clang diagnostic pop
-    });
-  }
-}
-
-#pragma mark - ASRangeControllerDataSource
-
-- (ASRangeController *)rangeController
-{
-  return _rangeController;
-}
-
-- (NSHashTable<ASCollectionElement *> *)visibleElementsForRangeController:(ASRangeController *)rangeController
-{
-  return ASPointerTableByFlatMapping(_visibleElements, id element, element);
-}
-
-- (ASScrollDirection)scrollDirectionForRangeController:(ASRangeController *)rangeController
-{
-  return self.scrollDirection;
-}
-
-- (ASInterfaceState)interfaceStateForRangeController:(ASRangeController *)rangeController
-{
-  return ASInterfaceStateForDisplayNode(self.tableNode, self.window);
-}
-
-- (NSString *)nameForRangeControllerDataSource
-{
-  return self.asyncDataSource ? NSStringFromClass([self.asyncDataSource class]) : NSStringFromClass([self class]);
-}
-
-#pragma mark - ASRangeControllerDelegate
-
-- (BOOL)rangeControllerShouldUpdateRanges:(ASRangeController *)rangeController
-{
-  return YES;
-}
-
-- (void)rangeController:(ASRangeController *)rangeController updateWithChangeSet:(_ASHierarchyChangeSet *)changeSet updates:(dispatch_block_t)updates
-{
-  ASDisplayNodeAssertMainThread();
-  if (!self.asyncDataSource || _updatingInResponseToInteractiveMove) {
-    updates();
-    [changeSet executeCompletionHandlerWithFinished:NO];
-    return; // if the asyncDataSource has become invalid while we are processing, ignore this request to avoid crashes
-  }
-
-  if (changeSet.includesReloadData) {
-    LOG(@"UITableView reloadData");
-    ASPerformBlockWithoutAnimation(!changeSet.animated, ^{
-      if (self.test_enableSuperUpdateCallLogging) {
-        NSLog(@"-[super reloadData]");
-      }
-      updates();
-      [super reloadData];
-      // Flush any range changes that happened as part of submitting the reload.
-      [_rangeController updateIfNeeded];
-      [self _scheduleCheckForBatchFetchingForNumberOfChanges:1];
-      [changeSet executeCompletionHandlerWithFinished:YES];
-    });
-    return;
-  }
-
-  BOOL shouldAdjustContentOffset = (_automaticallyAdjustsContentOffset && !changeSet.includesReloadData);
-  if (shouldAdjustContentOffset) {
-    [self beginAdjustingContentOffset];
-  }
-  
-  NSUInteger numberOfUpdates = 0;
-  
-  LOG(@"--- UITableView beginUpdates");
-  [super beginUpdates];
-
-  updates();
-  
-  for (_ASHierarchyItemChange *change in [changeSet itemChangesOfType:_ASHierarchyChangeTypeReload]) {
-    NSArray<NSIndexPath *> *indexPaths = change.indexPaths;
-    UITableViewRowAnimation animationOptions = (UITableViewRowAnimation)change.animationOptions;
-    
-    LOG(@"UITableView reloadRows:%ld rows", indexPaths.count);
-    BOOL preventAnimation = animationOptions == UITableViewRowAnimationNone;
-    ASPerformBlockWithoutAnimation(preventAnimation, ^{
-      if (self.test_enableSuperUpdateCallLogging) {
-        NSLog(@"-[super reloadRowsAtIndexPaths]: %@", indexPaths);
-      }
-      [super reloadRowsAtIndexPaths:indexPaths withRowAnimation:animationOptions];
-    });
-    
-    numberOfUpdates++;
-  }
-  
-  for (_ASHierarchySectionChange *change in [changeSet sectionChangesOfType:_ASHierarchyChangeTypeReload]) {
-    NSIndexSet *sectionIndexes = change.indexSet;
-    UITableViewRowAnimation animationOptions = (UITableViewRowAnimation)change.animationOptions;
-    
-    LOG(@"UITableView reloadSections:%@", sectionIndexes);
-    BOOL preventAnimation = (animationOptions == UITableViewRowAnimationNone);
-    ASPerformBlockWithoutAnimation(preventAnimation, ^{
-      if (self.test_enableSuperUpdateCallLogging) {
-        NSLog(@"-[super reloadSections]: %@", sectionIndexes);
-      }
-      [super reloadSections:sectionIndexes withRowAnimation:animationOptions];
-    });
-    
-    numberOfUpdates++;
-  }
-  
-  for (_ASHierarchyItemChange *change in [changeSet itemChangesOfType:_ASHierarchyChangeTypeOriginalDelete]) {
-    NSArray<NSIndexPath *> *indexPaths = change.indexPaths;
-    UITableViewRowAnimation animationOptions = (UITableViewRowAnimation)change.animationOptions;
-    
-    LOG(@"UITableView deleteRows:%ld rows", indexPaths.count);
-    BOOL preventAnimation = animationOptions == UITableViewRowAnimationNone;
-    ASPerformBlockWithoutAnimation(preventAnimation, ^{
-      if (self.test_enableSuperUpdateCallLogging) {
-        NSLog(@"-[super deleteRowsAtIndexPaths]: %@", indexPaths);
-      }
-      [super deleteRowsAtIndexPaths:indexPaths withRowAnimation:animationOptions];
-    });
-    
-    numberOfUpdates++;
-  }
-  
-  for (_ASHierarchySectionChange *change in [changeSet sectionChangesOfType:_ASHierarchyChangeTypeOriginalDelete]) {
-    NSIndexSet *sectionIndexes = change.indexSet;
-    UITableViewRowAnimation animationOptions = (UITableViewRowAnimation)change.animationOptions;
-    
-    LOG(@"UITableView deleteSections:%@", sectionIndexes);
-    BOOL preventAnimation = (animationOptions == UITableViewRowAnimationNone);
-    ASPerformBlockWithoutAnimation(preventAnimation, ^{
-      if (self.test_enableSuperUpdateCallLogging) {
-        NSLog(@"-[super deleteSections]: %@", sectionIndexes);
-      }
-      [super deleteSections:sectionIndexes withRowAnimation:animationOptions];
-    });
-    
-    numberOfUpdates++;
-  }
-  
-  for (_ASHierarchySectionChange *change in [changeSet sectionChangesOfType:_ASHierarchyChangeTypeOriginalInsert]) {
-    NSIndexSet *sectionIndexes = change.indexSet;
-    UITableViewRowAnimation animationOptions = (UITableViewRowAnimation)change.animationOptions;
-    
-    LOG(@"UITableView insertSections:%@", sectionIndexes);
-    BOOL preventAnimation = (animationOptions == UITableViewRowAnimationNone);
-    ASPerformBlockWithoutAnimation(preventAnimation, ^{
-      if (self.test_enableSuperUpdateCallLogging) {
-        NSLog(@"-[super insertSections]: %@", sectionIndexes);
-      }
-      [super insertSections:sectionIndexes withRowAnimation:animationOptions];
-    });
-    
-    numberOfUpdates++;
-  }
-  
-  for (_ASHierarchyItemChange *change in [changeSet itemChangesOfType:_ASHierarchyChangeTypeOriginalInsert]) {
-    NSArray<NSIndexPath *> *indexPaths = change.indexPaths;
-    UITableViewRowAnimation animationOptions = (UITableViewRowAnimation)change.animationOptions;
-    
-    LOG(@"UITableView insertRows:%ld rows", indexPaths.count);
-    BOOL preventAnimation = (animationOptions == UITableViewRowAnimationNone);
-    ASPerformBlockWithoutAnimation(preventAnimation, ^{
-      if (self.test_enableSuperUpdateCallLogging) {
-        NSLog(@"-[super insertRowsAtIndexPaths]: %@", indexPaths);
-      }
-      [super insertRowsAtIndexPaths:indexPaths withRowAnimation:animationOptions];
-    });
-    
-    numberOfUpdates++;
-  }
-
-  LOG(@"--- UITableView endUpdates");
-  ASPerformBlockWithoutAnimation(!changeSet.animated, ^{
-    [super endUpdates];
-    [_rangeController updateIfNeeded];
-    [self _scheduleCheckForBatchFetchingForNumberOfChanges:numberOfUpdates];
-  });
-  if (shouldAdjustContentOffset) {
-    [self endAdjustingContentOffsetAnimated:changeSet.animated];
-  }
-  [changeSet executeCompletionHandlerWithFinished:YES];
-}
-
-#pragma mark - ASDataControllerSource
-
-- (BOOL)dataController:(ASDataController *)dataController shouldEagerlyLayoutNode:(ASCellNode *)node
-{
-  return YES;
-}
-
-- (BOOL)dataControllerShouldSerializeNodeCreation:(ASDataController *)dataController
-{
-  return NO;
-}
-
-- (BOOL)dataController:(ASDataController *)dataController shouldSynchronouslyProcessChangeSet:(_ASHierarchyChangeSet *)changeSet
-{
-  // Reload data is expensive, don't block main while doing so.
-  if (changeSet.includesReloadData) {
-    return NO;
-  }
-  // For more details on this method, see the comment in the ASCollectionView implementation.
-  if (changeSet.countForAsyncLayout < 2) {
-    return YES;
-  }
-  CGSize contentSize = self.contentSize;
-  CGSize boundsSize = self.bounds.size;
-  if (contentSize.height <= boundsSize.height && contentSize.width <= boundsSize.width) {
-    return YES;
-  }
-  return NO;
-}
-
-- (void)dataControllerDidFinishWaiting:(ASDataController *)dataController
-{
-  // ASCellLayoutMode is not currently supported on ASTableView (see ASCollectionView for details).
-}
-
-- (id)dataController:(ASDataController *)dataController nodeModelForItemAtIndexPath:(NSIndexPath *)indexPath
-{
-  // Not currently supported for tables. Will be added when the collection API stabilizes.
-  return nil;
-}
-
-- (ASCellNodeBlock)dataController:(ASDataController *)dataController nodeBlockAtIndexPath:(NSIndexPath *)indexPath shouldAsyncLayout:(BOOL *)shouldAsyncLayout
-{
-  ASCellNodeBlock block = nil;
-
-  if (_asyncDataSourceFlags.tableNodeNodeBlockForRow) {
-    if (ASTableNode *tableNode = self.tableNode) {
-      block = [_asyncDataSource tableNode:tableNode nodeBlockForRowAtIndexPath:indexPath];
-    }
-  } else if (_asyncDataSourceFlags.tableNodeNodeForRow) {
-    ASCellNode *node = nil;
-    if (ASTableNode *tableNode = self.tableNode) {
-    	node = [_asyncDataSource tableNode:tableNode nodeForRowAtIndexPath:indexPath];
-    }
-    if ([node isKindOfClass:[ASCellNode class]]) {
-      block = ^{
-        return node;
-      };
-    } else {
-      ASDisplayNodeFailAssert(@"Data source returned invalid node from tableNode:nodeForRowAtIndexPath:. Node: %@", node);
-    }
-  } else if (_asyncDataSourceFlags.tableViewNodeBlockForRow) {
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
-    block = [_asyncDataSource tableView:self nodeBlockForRowAtIndexPath:indexPath];
-  } else if (_asyncDataSourceFlags.tableViewNodeForRow) {
-    ASCellNode *node = [_asyncDataSource tableView:self nodeForRowAtIndexPath:indexPath];
-#pragma clang diagnostic pop
-    if ([node isKindOfClass:[ASCellNode class]]) {
-      block = ^{
-        return node;
-      };
-    } else {
-      ASDisplayNodeFailAssert(@"Data source returned invalid node from tableView:nodeForRowAtIndexPath:. Node: %@", node);
-    }
-  }
-
-  // Handle nil node block
-  if (block == nil) {
-    ASDisplayNodeFailAssert(@"ASTableNode could not get a node block for row at index path %@", indexPath);
-    block = ^{
-      return [[ASCellNode alloc] init];
-    };
-  }
-
-  // Wrap the node block
-  __weak __typeof__(self) weakSelf = self;
-  return ^{
-    __typeof__(self) strongSelf = weakSelf;
-    ASCellNode *node = (block != nil ? block() : [[ASCellNode alloc] init]);
-    ASDisplayNodeAssert([node isKindOfClass:[ASCellNode class]], @"ASTableNode provided a non-ASCellNode! %@, %@", node, strongSelf);
-
-    [node enterHierarchyState:ASHierarchyStateRangeManaged];
-    if (node.interactionDelegate == nil) {
-      node.interactionDelegate = strongSelf;
-    }
-    if (_inverted) {
-        node.transform = CATransform3DMakeScale(1, -1, 1) ;
-    }
-    return node;
-  };
-  return block;
-}
-
-- (ASSizeRange)dataController:(ASDataController *)dataController constrainedSizeForNodeAtIndexPath:(NSIndexPath *)indexPath
-{
-  ASSizeRange constrainedSize = ASSizeRangeZero;
-  if (_asyncDelegateFlags.tableNodeConstrainedSizeForRow) {
-    GET_TABLENODE_OR_RETURN(tableNode, constrainedSize);
-    ASSizeRange delegateConstrainedSize = [_asyncDelegate tableNode:tableNode constrainedSizeForRowAtIndexPath:indexPath];
-    // ignore widths in the returned size range (for TableView)
-    constrainedSize = ASSizeRangeMake(CGSizeMake(_nodesConstrainedWidth, delegateConstrainedSize.min.height),
-                                      CGSizeMake(_nodesConstrainedWidth, delegateConstrainedSize.max.height));
-  } else if (_asyncDelegateFlags.tableViewConstrainedSizeForRow) {
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
-    ASSizeRange delegateConstrainedSize = [_asyncDelegate tableView:self constrainedSizeForRowAtIndexPath:indexPath];
-#pragma clang diagnostic pop
-    // ignore widths in the returned size range (for TableView)
-    constrainedSize = ASSizeRangeMake(CGSizeMake(_nodesConstrainedWidth, delegateConstrainedSize.min.height),
-                                      CGSizeMake(_nodesConstrainedWidth, delegateConstrainedSize.max.height));
-  } else {
-    constrainedSize = ASSizeRangeMake(CGSizeMake(_nodesConstrainedWidth, 0),
-                                      CGSizeMake(_nodesConstrainedWidth, CGFLOAT_MAX));
-  }
-  return constrainedSize;
-}
-
-- (NSUInteger)dataController:(ASDataController *)dataController rowsInSection:(NSUInteger)section
-{
-  if (_asyncDataSourceFlags.tableNodeNumberOfRowsInSection) {
-    GET_TABLENODE_OR_RETURN(tableNode, 0);
-    return [_asyncDataSource tableNode:tableNode numberOfRowsInSection:section];
-  } else if (_asyncDataSourceFlags.tableViewNumberOfRowsInSection) {
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
-    return [_asyncDataSource tableView:self numberOfRowsInSection:section];
-#pragma clang diagnostic pop
-  } else {
-    return 0;
-  }
-}
-
-- (NSUInteger)numberOfSectionsInDataController:(ASDataController *)dataController
-{
-  if (_asyncDataSourceFlags.numberOfSectionsInTableNode) {
-    GET_TABLENODE_OR_RETURN(tableNode, 0);
-    return [_asyncDataSource numberOfSectionsInTableNode:tableNode];
-  } else if (_asyncDataSourceFlags.numberOfSectionsInTableView) {
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
-    return [_asyncDataSource numberOfSectionsInTableView:self];
-#pragma clang diagnostic pop
-  } else {
-    return 1; // default section number
-  }
-}
-
-- (BOOL)dataController:(ASDataController *)dataController presentedSizeForElement:(ASCollectionElement *)element matchesSize:(CGSize)size
-{
-  NSIndexPath *indexPath = [self indexPathForNode:element.node];
-  if (indexPath == nil) {
-    ASDisplayNodeFailAssert(@"Data controller should not ask for presented size for element that is not presented.");
-    return YES;
-  }
-  CGRect rect = [self rectForRowAtIndexPath:indexPath];
-  
-#if TARGET_OS_IOS
-  /**
-   * Weirdly enough, Apple expects the return value in tableView:heightForRowAtIndexPath: to _include_ the height
-   * of the separator, if there is one! So if rectForRow would return 44.0 we need to use 43.5.
-   */
-  if (self.separatorStyle != UITableViewCellSeparatorStyleNone) {
-    rect.size.height -= 1.0 / ASScreenScale();
-  }
-#endif
-
-  return (fabs(rect.size.height - size.height) < FLT_EPSILON);
-}
-
-#pragma mark - _ASTableViewCellDelegate
-
-- (void)didLayoutSubviewsOfTableViewCell:(_ASTableViewCell *)tableViewCell
-{
-  ASCellNode *node = tableViewCell.node;
-  if (node == nil || _asyncDataSource == nil) {
-    return;
-  }
-  
-  CGFloat contentViewWidth = tableViewCell.contentView.bounds.size.width;
-  ASSizeRange constrainedSize = node.constrainedSizeForCalculatedLayout;
-  
-  // Table view cells should always fill its content view width.
-  // Normally the content view width equals to the constrained size width (which equals to the table view width).
-  // If there is a mismatch between these values, for example after the table view entered or left editing mode,
-  // content view width is preferred and used to re-measure the cell node.
-  if (CGSizeEqualToSize(node.calculatedSize, CGSizeZero) == NO && contentViewWidth != constrainedSize.max.width) {
-    constrainedSize.min.width = contentViewWidth;
-    constrainedSize.max.width = contentViewWidth;
-
-    // Re-measurement is done on main to ensure thread affinity. In the worst case, this is as fast as UIKit's implementation.
-    //
-    // Unloaded nodes *could* be re-measured off the main thread, but only with the assumption that content view width
-    // is the same for all cells (because there is no easy way to get that individual value before the node being assigned to a _ASTableViewCell).
-    // Also, in many cases, some nodes may not need to be re-measured at all, such as when user enters and then immediately leaves editing mode.
-    // To avoid premature optimization and making such assumption, as well as to keep ASTableView simple, re-measurement is strictly done on main.
-    CGSize oldSize = node.bounds.size;
-    const CGSize calculatedSize = [node layoutThatFits:constrainedSize].size;
-    node.frame = { .size = calculatedSize };
-
-    // After the re-measurement, set the new constrained size to the node's backing colleciton element.
-    node.collectionElement.constrainedSize = constrainedSize;
-
-    // If the node height changed, trigger a height requery.
-    if (oldSize.height != calculatedSize.height) {
-      [self beginUpdates];
-      [self endUpdatesAnimated:(ASDisplayNodeLayerHasAnimations(self.layer) == NO) completion:nil];
-    }
-  }
-}
-
-#pragma mark - ASCellNodeDelegate
-
-- (void)nodeSelectedStateDidChange:(ASCellNode *)node
-{
-  NSIndexPath *indexPath = [self indexPathForNode:node];
-  if (indexPath) {
-    if (node.isSelected) {
-      [self selectRowAtIndexPath:indexPath animated:NO scrollPosition:UITableViewScrollPositionNone];
-    } else {
-      [self deselectRowAtIndexPath:indexPath animated:NO];
-    }
-  }
-}
-
-- (void)nodeHighlightedStateDidChange:(ASCellNode *)node
-{
-  NSIndexPath *indexPath = [self indexPathForNode:node];
-  if (indexPath) {
-    [self cellForRowAtIndexPath:indexPath].highlighted = node.isHighlighted;
-  }
-}
-
-- (void)nodeDidInvalidateSize:(ASCellNode *)node
-{
-  [_cellsForLayoutUpdates addObject:node];
-  [self setNeedsLayout];
-}
-
-// Cause UITableView to requery for the new height of this node
-- (void)requeryNodeHeights
-{
-  _queuedNodeHeightUpdate = NO;
-
-  [super beginUpdates];
-  [super endUpdates];
-}
-
-#pragma mark - Helper Methods
-
-// Note: This is called every layout, and so it is very performance sensitive.
-- (CGFloat)sectionIndexWidth
-{
-  // If they don't implement the methods, then there's no section index.
-  if (_asyncDataSourceFlags.sectionIndexMethods == NO) {
-    return 0;
-  }
-
-  UIView *indexView = _sectionIndexView;
-  if (indexView.superview == self) {
-    return indexView.frame.size.width;
-  }
-
-  CGRect bounds = self.bounds;
-  for (UIView *view in self.subviews) {
-    CGRect frame = view.frame;
-    // Section index is right-aligned and less than half-width.
-    if (CGRectGetMaxX(frame) == CGRectGetMaxX(bounds) && frame.size.width * 2 < bounds.size.width) {
-      _sectionIndexView = view;
-      return frame.size.width;
-    }
-  }
-  return 0;
-}
-
-#pragma mark - _ASDisplayView behavior substitutions
-// Need these to drive interfaceState so we know when we are visible, if not nested in another range-managing element.
-// Because our superclass is a true UIKit class, we cannot also subclass _ASDisplayView.
-- (void)willMoveToWindow:(UIWindow *)newWindow
-{
-  BOOL visible = (newWindow != nil);
-  ASDisplayNode *node = self.tableNode;
-  if (visible && !node.inHierarchy) {
-    [node __enterHierarchy];
-  }
-}
-
-- (void)didMoveToWindow
-{
-  BOOL visible = (self.window != nil);
-  ASDisplayNode *node = self.tableNode;
-  BOOL rangeControllerNeedsUpdate = ![node supportsRangeManagedInterfaceState];;
-
-  if (!visible && node.inHierarchy) {
-    if (rangeControllerNeedsUpdate) {
-      rangeControllerNeedsUpdate = NO;
-      // Exit CellNodes first before Table to match UIKit behaviors (tear down bottom up).
-      // Although we have not yet cleared the interfaceState's Visible bit (this  happens in __exitHierarchy),
-      // the ASRangeController will get the correct value from -interfaceStateForRangeController:.
-      [_rangeController updateRanges];
-    }
-    [node __exitHierarchy];
-  }
-
-  // Updating the visible node index paths only for not range managed nodes. Range managed nodes will get their
-  // their update in the layout pass
-  if (rangeControllerNeedsUpdate) {
-    [_rangeController updateRanges];
-  }
-
-  // When we aren't visible, we will only fetch up to the visible area. Now that we are visible,
-  // we will fetch visible area + leading screens, so we need to check.
-  if (visible) {
-    [self _checkForBatchFetching];
-  }
-}
-
-- (void)willMoveToSuperview:(UIView *)newSuperview
-{
-  if (self.superview == nil && newSuperview != nil) {
-    _keepalive_node = self.tableNode;
-  }
-}
-
-- (void)didMoveToSuperview
-{
-  if (self.superview == nil) {
-    _keepalive_node = nil;
-  }
-}
-
-#pragma mark - Accessibility overrides
-
-- (NSArray *)accessibilityElements
-{
-  [self waitUntilAllUpdatesAreCommitted];
-  return [super accessibilityElements];
-}
-
-@end
-
-#endif
diff --git a/submodules/AsyncDisplayKit/Source/ASTableViewInternal.h b/submodules/AsyncDisplayKit/Source/ASTableViewInternal.h
deleted file mode 100644
index b887e9323b..0000000000
--- a/submodules/AsyncDisplayKit/Source/ASTableViewInternal.h
+++ /dev/null
@@ -1,69 +0,0 @@
-//
-//  ASTableViewInternal.h
-//  Texture
-//
-//  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.
-//  Changes after 4/13/2017 are: Copyright (c) Pinterest, Inc.  All rights reserved.
-//  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
-//
-
-#ifndef MINIMAL_ASDK
-
-#import <AsyncDisplayKit/ASTableView.h>
-
-@class ASDataController;
-@class ASTableNode;
-@class ASRangeController;
-@class ASEventLog;
-
-@interface ASTableView (Internal)
-
-@property (nonatomic, readonly) ASDataController *dataController;
-@property (nonatomic, weak) ASTableNode *tableNode;
-@property (nonatomic, readonly) ASRangeController *rangeController;
-
-/**
- * Initializer.
- *
- * @param frame A rectangle specifying the initial location and size of the table view in its superview’€™s coordinates.
- * The frame of the table view changes as table cells are added and deleted.
- *
- * @param style A constant that specifies the style of the table view. See UITableViewStyle for descriptions of valid constants.
- *
- * @param dataControllerClass A controller class injected to and used to create a data controller for the table view.
- *
- * @param eventLog An event log passed through to the data controller.
- */
-- (instancetype)_initWithFrame:(CGRect)frame style:(UITableViewStyle)style dataControllerClass:(Class)dataControllerClass owningNode:(ASTableNode *)tableNode eventLog:(ASEventLog *)eventLog;
-
-/// Set YES and we'll log every time we call [super insertRows…] etc
-@property (nonatomic) BOOL test_enableSuperUpdateCallLogging;
-
-/**
- * Attempt to get the view-layer index path for the row with the given index path.
- *
- * @param indexPath The index path of the row.
- * @param wait If the item hasn't reached the view yet, this attempts to wait for updates to commit.
- */
-- (NSIndexPath *)convertIndexPathFromTableNode:(NSIndexPath *)indexPath waitingIfNeeded:(BOOL)wait;
-
-/**
- * Attempt to get the node index path given the view-layer index path.
- *
- * @param indexPath The index path of the row.
- */
-- (NSIndexPath *)convertIndexPathToTableNode:(NSIndexPath *)indexPath;
-
-/**
- * Attempt to get the node index paths given the view-layer index paths.
- *
- * @param indexPaths An array of index paths in the view space
- */
-- (NSArray<NSIndexPath *> *)convertIndexPathsToTableNode:(NSArray<NSIndexPath *> *)indexPaths;
-
-/// Returns the width of the section index view on the right-hand side of the table, if one is present.
-- (CGFloat)sectionIndexWidth;
-
-@end
-
-#endif
diff --git a/submodules/AsyncDisplayKit/Source/ASTableViewProtocols.h b/submodules/AsyncDisplayKit/Source/ASTableViewProtocols.h
deleted file mode 100644
index 56de956724..0000000000
--- a/submodules/AsyncDisplayKit/Source/ASTableViewProtocols.h
+++ /dev/null
@@ -1,98 +0,0 @@
-//
-//  ASTableViewProtocols.h
-//  Texture
-//
-//  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.
-//  Changes after 4/13/2017 are: Copyright (c) Pinterest, Inc.  All rights reserved.
-//  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
-//
-
-#ifndef MINIMAL_ASDK
-#import <AsyncDisplayKit/ASBaseDefines.h>
-
-NS_ASSUME_NONNULL_BEGIN
-
-/**
- * This is a subset of UITableViewDataSource.
- *
- * @see ASTableDataSource
- */
-@protocol ASCommonTableDataSource <NSObject>
-
-@optional
-
-- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section ASDISPLAYNODE_DEPRECATED_MSG("Implement -tableNode:numberOfRowsInSection: instead.");
-
-- (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView ASDISPLAYNODE_DEPRECATED_MSG("Implement numberOfSectionsInTableNode: instead.");
-
-- (nullable NSString *)tableView:(UITableView *)tableView titleForHeaderInSection:(NSInteger)section;
-- (nullable NSString *)tableView:(UITableView *)tableView titleForFooterInSection:(NSInteger)section;
-
-- (BOOL)tableView:(UITableView *)tableView canEditRowAtIndexPath:(NSIndexPath *)indexPath;
-
-- (BOOL)tableView:(UITableView *)tableView canMoveRowAtIndexPath:(NSIndexPath *)indexPath;
-
-- (nullable NSArray<NSString *> *)sectionIndexTitlesForTableView:(UITableView *)tableView;
-- (NSInteger)tableView:(UITableView *)tableView sectionForSectionIndexTitle:(NSString *)title atIndex:(NSInteger)index;
-
-- (void)tableView:(UITableView *)tableView commitEditingStyle:(UITableViewCellEditingStyle)editingStyle forRowAtIndexPath:(NSIndexPath *)indexPath;
-
-- (void)tableView:(UITableView *)tableView moveRowAtIndexPath:(NSIndexPath *)sourceIndexPath toIndexPath:(NSIndexPath *)destinationIndexPath;
-
-@end
-
-
-/**
- * This is a subset of UITableViewDelegate.
- *
- * @see ASTableDelegate
- */
-@protocol ASCommonTableViewDelegate <NSObject, UIScrollViewDelegate>
-
-@optional
-
-- (void)tableView:(UITableView *)tableView willDisplayHeaderView:(UIView *)view forSection:(NSInteger)section;
-- (void)tableView:(UITableView *)tableView willDisplayFooterView:(UIView *)view forSection:(NSInteger)section;
-- (void)tableView:(UITableView *)tableView didEndDisplayingHeaderView:(UIView *)view forSection:(NSInteger)section;
-- (void)tableView:(UITableView *)tableView didEndDisplayingFooterView:(UIView *)view forSection:(NSInteger)section;
-
-- (CGFloat)tableView:(UITableView *)tableView heightForHeaderInSection:(NSInteger)section;
-- (CGFloat)tableView:(UITableView *)tableView heightForFooterInSection:(NSInteger)section;
-
-- (nullable UIView *)tableView:(UITableView *)tableView viewForHeaderInSection:(NSInteger)section;
-- (nullable UIView *)tableView:(UITableView *)tableView viewForFooterInSection:(NSInteger)section;
-
-- (void)tableView:(UITableView *)tableView accessoryButtonTappedForRowWithIndexPath:(NSIndexPath *)indexPath;
-
-- (BOOL)tableView:(UITableView *)tableView shouldHighlightRowAtIndexPath:(NSIndexPath *)indexPath ASDISPLAYNODE_DEPRECATED_MSG("Implement -tableNode:shouldHighlightRowAtIndexPath: instead.");
-- (void)tableView:(UITableView *)tableView didHighlightRowAtIndexPath:(NSIndexPath *)indexPath ASDISPLAYNODE_DEPRECATED_MSG("Implement -tableNode:didHighlightRowAtIndexPath: instead.");
-- (void)tableView:(UITableView *)tableView didUnhighlightRowAtIndexPath:(NSIndexPath *)indexPath ASDISPLAYNODE_DEPRECATED_MSG("Implement -tableNode:didUnhighlightRowAtIndexPath: instead.");
-
-- (nullable NSIndexPath *)tableView:(UITableView *)tableView willSelectRowAtIndexPath:(NSIndexPath *)indexPath ASDISPLAYNODE_DEPRECATED_MSG("Implement -tableNode:willSelectRowAtIndexPath: instead.");
-- (nullable NSIndexPath *)tableView:(UITableView *)tableView willDeselectRowAtIndexPath:(NSIndexPath *)indexPath ASDISPLAYNODE_DEPRECATED_MSG("Implement -tableNode:willDeselectRowAtIndexPath: instead.");
-- (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath ASDISPLAYNODE_DEPRECATED_MSG("Implement -tableNode:didSelectRowAtIndexPath: instead.");
-- (void)tableView:(UITableView *)tableView didDeselectRowAtIndexPath:(NSIndexPath *)indexPath ASDISPLAYNODE_DEPRECATED_MSG("Implement -tableNode:didDeselectRowAtIndexPath: instead.");
-
-- (UITableViewCellEditingStyle)tableView:(UITableView *)tableView editingStyleForRowAtIndexPath:(NSIndexPath *)indexPath;
-- (nullable NSString *)tableView:(UITableView *)tableView titleForDeleteConfirmationButtonForRowAtIndexPath:(NSIndexPath *)indexPath;
-#if TARGET_OS_IOS
-- (nullable NSArray<UITableViewRowAction *> *)tableView:(UITableView *)tableView editActionsForRowAtIndexPath:(NSIndexPath *)indexPath;
-#endif
-- (BOOL)tableView:(UITableView *)tableView shouldIndentWhileEditingRowAtIndexPath:(NSIndexPath *)indexPath;
-
-- (void)tableView:(UITableView*)tableView willBeginEditingRowAtIndexPath:(NSIndexPath *)indexPath;
-- (void)tableView:(UITableView*)tableView didEndEditingRowAtIndexPath:(NSIndexPath *)indexPath;
-
-- (NSIndexPath *)tableView:(UITableView *)tableView targetIndexPathForMoveFromRowAtIndexPath:(NSIndexPath *)sourceIndexPath toProposedIndexPath:(NSIndexPath *)proposedDestinationIndexPath;
-
-- (NSInteger)tableView:(UITableView *)tableView indentationLevelForRowAtIndexPath:(NSIndexPath *)indexPath;
-
-- (BOOL)tableView:(UITableView *)tableView shouldShowMenuForRowAtIndexPath:(NSIndexPath *)indexPath ASDISPLAYNODE_DEPRECATED_MSG("Implement -tableNode:shouldShowMenuForRowAtIndexPath: instead.");
-- (BOOL)tableView:(UITableView *)tableView canPerformAction:(SEL)action forRowAtIndexPath:(NSIndexPath *)indexPath withSender:(nullable id)sender ASDISPLAYNODE_DEPRECATED_MSG("Implement -tableNode:canPerformAction:forRowAtIndexPath:withSender: instead.");
-- (void)tableView:(UITableView *)tableView performAction:(SEL)action forRowAtIndexPath:(NSIndexPath *)indexPath withSender:(nullable id)sender ASDISPLAYNODE_DEPRECATED_MSG("Implement -tableNode:performAction:forRowAtIndexPath:withSender: instead.");
-
-@end
-
-NS_ASSUME_NONNULL_END
-
-#endif
diff --git a/submodules/AsyncDisplayKit/Source/TextKit/ASTextKitComponents.mm b/submodules/AsyncDisplayKit/Source/ASTextKitComponents.mm
similarity index 100%
rename from submodules/AsyncDisplayKit/Source/TextKit/ASTextKitComponents.mm
rename to submodules/AsyncDisplayKit/Source/ASTextKitComponents.mm
diff --git a/submodules/AsyncDisplayKit/Source/TextKit/ASTextKitContext.h b/submodules/AsyncDisplayKit/Source/ASTextKitContext.h
similarity index 100%
rename from submodules/AsyncDisplayKit/Source/TextKit/ASTextKitContext.h
rename to submodules/AsyncDisplayKit/Source/ASTextKitContext.h
diff --git a/submodules/AsyncDisplayKit/Source/TextKit/ASTextKitContext.mm b/submodules/AsyncDisplayKit/Source/ASTextKitContext.mm
similarity index 96%
rename from submodules/AsyncDisplayKit/Source/TextKit/ASTextKitContext.mm
rename to submodules/AsyncDisplayKit/Source/ASTextKitContext.mm
index 8883f3175f..42f4a1a45c 100644
--- a/submodules/AsyncDisplayKit/Source/TextKit/ASTextKitContext.mm
+++ b/submodules/AsyncDisplayKit/Source/ASTextKitContext.mm
@@ -7,11 +7,11 @@
 //  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
 //
 
-#import <AsyncDisplayKit/ASTextKitContext.h>
+#import "ASTextKitContext.h"
 
 #if AS_ENABLE_TEXTNODE
 
-#import <AsyncDisplayKit/ASLayoutManager.h>
+#import "ASLayoutManager.h"
 #import <AsyncDisplayKit/ASThread.h>
 
 #include <memory>
diff --git a/submodules/AsyncDisplayKit/Source/ASTextNode+Beta.h b/submodules/AsyncDisplayKit/Source/ASTextNode+Beta.h
deleted file mode 100644
index ad897c5f0e..0000000000
--- a/submodules/AsyncDisplayKit/Source/ASTextNode+Beta.h
+++ /dev/null
@@ -1,45 +0,0 @@
-//
-//  ASTextNode+Beta.h
-//  Texture
-//
-//  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.
-//  Changes after 4/13/2017 are: Copyright (c) Pinterest, Inc.  All rights reserved.
-//  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
-//
-
-#import <UIKit/UIKit.h>
-
-#import <AsyncDisplayKit/ASTextNode.h>
-
-NS_ASSUME_NONNULL_BEGIN
-
-@interface ASTextNode ()
-
-/**
- @abstract An array of descending scale factors that will be applied to this text node to try to make it fit within its constrained size
- @discussion This array should be in descending order and NOT contain the scale factor 1.0. For example, it could return @[@(.9), @(.85), @(.8)];
- @default nil (no scaling)
- */
-@property (nullable, nonatomic, copy) NSArray<NSNumber *> *pointSizeScaleFactors;
-
-/**
- @abstract Text margins for text laid out in the text node.
- @discussion defaults to UIEdgeInsetsZero.
- This property can be useful for handling text which does not fit within the view by default. An example: like UILabel,
- ASTextNode will clip the left and right of the string "judar" if it's rendered in an italicised font.
- */
-@property (nonatomic) UIEdgeInsets textContainerInset;
-
-/**
- * Returns YES if this node is using the experimental implementation. NO otherwise. Will not change.
- */
-@property (readonly) BOOL usingExperiment;
-
-/**
- * Returns a Boolean indicating if the text node will truncate for the given constrained size
- */
-- (BOOL)shouldTruncateForConstrainedSize:(ASSizeRange)constrainedSize;
-
-@end
-
-NS_ASSUME_NONNULL_END
diff --git a/submodules/AsyncDisplayKit/Source/ASTextNode.h b/submodules/AsyncDisplayKit/Source/ASTextNode.h
deleted file mode 100644
index 783eafc53e..0000000000
--- a/submodules/AsyncDisplayKit/Source/ASTextNode.h
+++ /dev/null
@@ -1,264 +0,0 @@
-//
-//  ASTextNode.h
-//  Texture
-//
-//  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.
-//  Changes after 4/13/2017 are: Copyright (c) Pinterest, Inc.  All rights reserved.
-//  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
-//
-
-#import <AsyncDisplayKit/ASAvailability.h>
-
-#import <AsyncDisplayKit/ASControlNode.h>
-#import <AsyncDisplayKit/ASDisplayNode+Beta.h>
-#import <AsyncDisplayKit/ASTextNodeCommon.h>
-
-#if (!AS_ENABLE_TEXTNODE)
-
-// Pull in ASTextNode2 to replace ASTextNode with ASTextNode2
-#import <AsyncDisplayKit/ASTextNode2.h>
-
-#else
-
-NS_ASSUME_NONNULL_BEGIN
-
-/**
- @abstract Draws interactive rich text.
- @discussion Backed by TextKit.
- */
-@interface ASTextNode : ASControlNode
-
-/**
- @abstract The styled text displayed by the node.
- @discussion Defaults to nil, no text is shown.
- For inline image attachments, add an attribute of key NSAttachmentAttributeName, with a value of an NSTextAttachment.
- */
-@property (nullable, copy) NSAttributedString *attributedText;
-
-#pragma mark - Truncation
-
-/**
- @abstract The attributedText to use when the text must be truncated.
- @discussion Defaults to a localized ellipsis character.
- */
-@property (nullable, copy) NSAttributedString *truncationAttributedText;
-
-/**
- @summary The second attributed string appended for truncation.
- @discussion This string will be highlighted on touches.
- @default nil
- */
-@property (nullable, copy) NSAttributedString *additionalTruncationMessage;
-
-/**
- @abstract Determines how the text is truncated to fit within the receiver's maximum size.
- @discussion Defaults to NSLineBreakByWordWrapping.
- @note Setting a truncationMode in attributedString will override the truncation mode set here.
- */
-@property NSLineBreakMode truncationMode;
-
-/**
- @abstract If the text node is truncated. Text must have been sized first.
- */
-@property (readonly, getter=isTruncated) BOOL truncated;
-
-/**
- @abstract The maximum number of lines to render of the text before truncation.
- @default 0 (No limit)
- */
-@property NSUInteger maximumNumberOfLines;
-
-/**
- @abstract The number of lines in the text. Text must have been sized first.
- */
-@property (readonly) NSUInteger lineCount;
-
-/**
- * An array of path objects representing the regions where text should not be displayed.
- *
- * @discussion The default value of this property is an empty array. You can
- * assign an array of UIBezierPath objects to exclude text from one or more regions in
- * the text node's bounds. You can use this property to have text wrap around images,
- * shapes or other text like a fancy magazine.
- */
-@property (nullable, copy) NSArray<UIBezierPath *> *exclusionPaths;
-
-#pragma mark - Placeholders
-
-/**
- * @abstract ASTextNode has a special placeholder behavior when placeholderEnabled is YES.
- *
- * @discussion Defaults to NO.  When YES, it draws rectangles for each line of text,
- * following the true shape of the text's wrapping.  This visually mirrors the overall
- * shape and weight of paragraphs, making the appearance of the finished text less jarring.
- */
-@property BOOL placeholderEnabled;
-
-/**
- @abstract The placeholder color.
- */
-@property (nullable, copy) UIColor *placeholderColor;
-
-/**
- @abstract Inset each line of the placeholder.
- */
-@property UIEdgeInsets placeholderInsets;
-
-#pragma mark - Shadow
-
-/**
- @abstract When you set these ASDisplayNode properties, they are composited into the bitmap instead of being applied by CA.
-
- @property (nonatomic) CGColorRef shadowColor;
- @property (nonatomic) CGFloat    shadowOpacity;
- @property (nonatomic) CGSize     shadowOffset;
- @property (nonatomic) CGFloat    shadowRadius;
- */
-
-/**
- @abstract The number of pixels used for shadow padding on each side of the receiver.
- @discussion Each inset will be less than or equal to zero, so that applying
- UIEdgeInsetsRect(boundingRectForText, shadowPadding)
- will return a CGRect large enough to fit both the text and the appropriate shadow padding.
- */
-@property (readonly) UIEdgeInsets shadowPadding;
-
-#pragma mark - Positioning
-
-/**
- @abstract Returns an array of rects bounding the characters in a given text range.
- @param textRange A range of text. Must be valid for the receiver's string.
- @discussion Use this method to detect all the different rectangles a given range of text occupies.
- The rects returned are not guaranteed to be contiguous (for example, if the given text range spans
- a line break, the rects returned will be on opposite sides and different lines). The rects returned
- are in the coordinate system of the receiver.
- */
-- (NSArray<NSValue *> *)rectsForTextRange:(NSRange)textRange AS_WARN_UNUSED_RESULT;
-
-/**
- @abstract Returns an array of rects used for highlighting the characters in a given text range.
- @param textRange A range of text. Must be valid for the receiver's string.
- @discussion Use this method to detect all the different rectangles the highlights of a given range of text occupies.
- The rects returned are not guaranteed to be contiguous (for example, if the given text range spans
- a line break, the rects returned will be on opposite sides and different lines). The rects returned
- are in the coordinate system of the receiver. This method is useful for visual coordination with a
- highlighted range of text.
- */
-- (NSArray<NSValue *> *)highlightRectsForTextRange:(NSRange)textRange AS_WARN_UNUSED_RESULT;
-
-/**
- @abstract Returns a bounding rect for the given text range.
- @param textRange A range of text. Must be valid for the receiver's string.
- @discussion The height of the frame returned is that of the receiver's line-height; adjustment for
- cap-height and descenders is not performed. This method raises an exception if textRange is not
- a valid substring range of the receiver's string.
- */
-- (CGRect)frameForTextRange:(NSRange)textRange AS_WARN_UNUSED_RESULT;
-
-/**
- @abstract Returns the trailing rectangle of space in the receiver, after the final character.
- @discussion Use this method to detect which portion of the receiver is not occupied by characters.
- The rect returned is in the coordinate system of the receiver.
- */
-- (CGRect)trailingRect AS_WARN_UNUSED_RESULT;
-
-
-#pragma mark - Actions
-
-/**
- @abstract The set of attribute names to consider links.  Defaults to NSLinkAttributeName.
- */
-@property (copy) NSArray<NSString *> *linkAttributeNames;
-
-/**
- @abstract Indicates whether the receiver has an entity at a given point.
- @param point The point, in the receiver's coordinate system.
- @param attributeNameOut The name of the attribute at the point. Can be NULL.
- @param rangeOut The ultimate range of the found text. Can be NULL.
- @result YES if an entity exists at `point`; NO otherwise.
- */
-- (nullable id)linkAttributeValueAtPoint:(CGPoint)point attributeName:(out NSString * _Nullable * _Nullable)attributeNameOut range:(out NSRange * _Nullable)rangeOut AS_WARN_UNUSED_RESULT;
-
-/**
- @abstract The style to use when highlighting text.
- */
-@property ASTextNodeHighlightStyle highlightStyle;
-
-/**
- @abstract The range of text highlighted by the receiver. Changes to this property are not animated by default.
- */
-@property NSRange highlightRange;
-
-/**
- @abstract Set the range of text to highlight, with optional animation.
-
- @param highlightRange The range of text to highlight.
-
- @param animated Whether the text should be highlighted with an animation.
- */
-- (void)setHighlightRange:(NSRange)highlightRange animated:(BOOL)animated;
-
-/**
- @abstract Responds to actions from links in the text node.
- @discussion The delegate must be set before the node is loaded, and implement
-             textNode:longPressedLinkAttribute:value:atPoint:textRange: in order for
-             the long press gesture recognizer to be installed.
- */
-@property (nullable, weak) id<ASTextNodeDelegate> delegate;
-
-/**
- @abstract If YES and a long press is recognized, touches are cancelled. Default is NO
- */
-@property (nonatomic) BOOL longPressCancelsTouches;
-
-/**
- @abstract if YES will not intercept touches for non-link areas of the text. Default is NO.
- */
-@property (nonatomic) BOOL passthroughNonlinkTouches;
-
-@end
-
-@interface ASTextNode (Unavailable)
-
-- (instancetype)initWithLayerBlock:(ASDisplayNodeLayerBlock)viewBlock didLoadBlock:(nullable ASDisplayNodeDidLoadBlock)didLoadBlock NS_UNAVAILABLE;
-
-- (instancetype)initWithViewBlock:(ASDisplayNodeViewBlock)viewBlock didLoadBlock:(nullable ASDisplayNodeDidLoadBlock)didLoadBlock NS_UNAVAILABLE;
-
-@end
-
-/**
- * @abstract Text node unsupported properties
- */
-@interface ASTextNode (Unsupported)
-
-@property (nullable, nonatomic) id textContainerLinePositionModifier;
-
-@end
-
-/**
- * @abstract Text node deprecated properties
- */
-@interface ASTextNode (Deprecated)
-
-/**
- The attributedString and attributedText properties are equivalent, but attributedText is now the standard API
- name in order to match UILabel and ASEditableTextNode.
- 
- @see attributedText
- */
-@property (nullable, copy) NSAttributedString *attributedString ASDISPLAYNODE_DEPRECATED_MSG("Use .attributedText instead.");
-
-
-/**
- The truncationAttributedString and truncationAttributedText properties are equivalent, but truncationAttributedText is now the
- standard API name in order to match UILabel and ASEditableTextNode.
- 
- @see truncationAttributedText
- */
-@property (nullable, copy) NSAttributedString *truncationAttributedString ASDISPLAYNODE_DEPRECATED_MSG("Use .truncationAttributedText instead.");
-
-@end
-
-NS_ASSUME_NONNULL_END
-
-#endif
diff --git a/submodules/AsyncDisplayKit/Source/ASTextNode.mm b/submodules/AsyncDisplayKit/Source/ASTextNode.mm
deleted file mode 100644
index e872a09297..0000000000
--- a/submodules/AsyncDisplayKit/Source/ASTextNode.mm
+++ /dev/null
@@ -1,1494 +0,0 @@
-//
-//  ASTextNode.mm
-//  Texture
-//
-//  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.
-//  Changes after 4/13/2017 are: Copyright (c) Pinterest, Inc.  All rights reserved.
-//  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
-//
-
-#import <AsyncDisplayKit/ASTextNode.h>
-
-#if AS_ENABLE_TEXTNODE
-
-#import <AsyncDisplayKit/ASTextNode2.h>
-
-#import <AsyncDisplayKit/ASTextNode+Beta.h>
-
-#import <mutex>
-#import <tgmath.h>
-
-#import <AsyncDisplayKit/ASAvailability.h>
-#import <AsyncDisplayKit/_ASDisplayLayer.h>
-#import <AsyncDisplayKit/ASDisplayNode+FrameworkPrivate.h>
-#import <AsyncDisplayKit/ASDisplayNode+Subclasses.h>
-#import <AsyncDisplayKit/ASDisplayNodeExtras.h>
-#import <AsyncDisplayKit/ASDisplayNodeInternal.h>
-#import <AsyncDisplayKit/ASConfigurationInternal.h>
-#import <AsyncDisplayKit/ASHighlightOverlayLayer.h>
-#import <AsyncDisplayKit/ASGraphicsContext.h>
-
-#import <AsyncDisplayKit/ASTextKitCoreTextAdditions.h>
-#import <AsyncDisplayKit/ASTextKitRenderer+Positioning.h>
-#import <AsyncDisplayKit/ASTextKitShadower.h>
-
-#import <AsyncDisplayKit/ASInternalHelpers.h>
-#import <AsyncDisplayKit/ASLayout.h>
-
-#import <AsyncDisplayKit/CoreGraphics+ASConvenience.h>
-#import <AsyncDisplayKit/ASHashing.h>
-#import <AsyncDisplayKit/ASObjectDescriptionHelpers.h>
-#import <AsyncDisplayKit/ASThread.h>
-
-/**
- * If set, we will record all values set to attributedText into an array
- * and once we get 2000, we'll write them all out into a plist file.
- *
- * This is useful for gathering realistic text data sets from apps for performance
- * testing.
- */
-#define AS_TEXTNODE_RECORD_ATTRIBUTED_STRINGS 0
-
-static const NSTimeInterval ASTextNodeHighlightFadeOutDuration = 0.15;
-static const NSTimeInterval ASTextNodeHighlightFadeInDuration = 0.1;
-static const CGFloat ASTextNodeHighlightLightOpacity = 0.11;
-static const CGFloat ASTextNodeHighlightDarkOpacity = 0.22;
-static NSString *ASTextNodeTruncationTokenAttributeName = @"ASTextNodeTruncationAttribute";
-
-#pragma mark - ASTextKitRenderer
-
-@interface ASTextNodeRendererKey : NSObject
-@property (nonatomic) ASTextKitAttributes attributes;
-@property (nonatomic) CGSize constrainedSize;
-@end
-
-@implementation ASTextNodeRendererKey {
-  std::mutex _m;
-}
-
-- (NSUInteger)hash
-{
-  std::lock_guard<std::mutex> _l(_m);
-#pragma clang diagnostic push
-#pragma clang diagnostic warning "-Wpadded"
-  struct {
-    size_t attributesHash;
-    CGSize constrainedSize;
-#pragma clang diagnostic pop
-  } data = {
-    _attributes.hash(),
-    _constrainedSize
-  };
-  return ASHashBytes(&data, sizeof(data));
-}
-
-- (BOOL)isEqual:(ASTextNodeRendererKey *)object
-{
-  if (self == object) {
-    return YES;
-  }
-  
-  // NOTE: Skip the class check for this specialized, internal Key object.
-
-  // Lock both objects, avoiding deadlock.
-  std::lock(_m, object->_m);
-  std::lock_guard<std::mutex> lk1(_m, std::adopt_lock);
-  std::lock_guard<std::mutex> lk2(object->_m, std::adopt_lock);
-  
-  return _attributes == object->_attributes && CGSizeEqualToSize(_constrainedSize, object->_constrainedSize);
-}
-
-@end
-
-static NSCache *sharedRendererCache()
-{ 
- static dispatch_once_t onceToken;
- static NSCache *__rendererCache = nil;
- dispatch_once(&onceToken, ^{
-   __rendererCache = [[NSCache alloc] init];
-   __rendererCache.countLimit = 500; // 500 renders cache
- });
- return __rendererCache;
-}
-
-/**
- The concept here is that neither the node nor layout should ever have a strong reference to the renderer object.
- This is to reduce memory load when loading thousands and thousands of text nodes into memory at once. Instead
- we maintain a LRU renderer cache that is queried via a unique key based on text kit attributes and constrained size. 
- */
-
-static ASTextKitRenderer *rendererForAttributes(ASTextKitAttributes attributes, CGSize constrainedSize)
-{
-  NSCache *cache = sharedRendererCache();
-  
-  ASTextNodeRendererKey *key = [[ASTextNodeRendererKey alloc] init];
-  key.attributes = attributes;
-  key.constrainedSize = constrainedSize;
-
-  ASTextKitRenderer *renderer = [cache objectForKey:key];
-  if (renderer == nil) {
-    renderer = [[ASTextKitRenderer alloc] initWithTextKitAttributes:attributes constrainedSize:constrainedSize];
-    [cache setObject:renderer forKey:key];
-  }
-  
-  return renderer;
-}
-
-#pragma mark - ASTextNodeDrawParameter
-
-@interface ASTextNodeDrawParameter : NSObject {
-@package
-  ASTextKitAttributes _rendererAttributes;
-  UIColor *_backgroundColor;
-  UIEdgeInsets _textContainerInsets;
-  CGFloat _contentScale;
-  BOOL _opaque;
-  CGRect _bounds;
-}
-@end
-
-@implementation ASTextNodeDrawParameter
-
-- (instancetype)initWithRendererAttributes:(ASTextKitAttributes)rendererAttributes
-                           backgroundColor:(/*nullable*/ UIColor *)backgroundColor
-                       textContainerInsets:(UIEdgeInsets)textContainerInsets
-                              contentScale:(CGFloat)contentScale
-                                    opaque:(BOOL)opaque
-                                    bounds:(CGRect)bounds
-{
-  self = [super init];
-  if (self != nil) {
-    _rendererAttributes = rendererAttributes;
-    _backgroundColor = backgroundColor;
-    _textContainerInsets = textContainerInsets;
-    _contentScale = contentScale;
-    _opaque = opaque;
-    _bounds = bounds;
-  }
-  return self;
-}
-
-- (ASTextKitRenderer *)rendererForBounds:(CGRect)bounds
-{
-  CGRect rect = UIEdgeInsetsInsetRect(bounds, _textContainerInsets);
-  return rendererForAttributes(_rendererAttributes, rect.size);
-}
-
-@end
-
-
-#pragma mark - ASTextNode
-
-@interface ASTextNode () <UIGestureRecognizerDelegate>
-
-@end
-
-@implementation ASTextNode {
-  CGSize _shadowOffset;
-  CGColorRef _shadowColor;
-  UIColor *_cachedShadowUIColor;
-  UIColor *_placeholderColor;
-  CGFloat _shadowOpacity;
-  CGFloat _shadowRadius;
-  
-  UIEdgeInsets _textContainerInset;
-
-  NSArray *_exclusionPaths;
-
-  NSAttributedString *_attributedText;
-  NSAttributedString *_truncationAttributedText;
-  NSAttributedString *_additionalTruncationMessage;
-  NSAttributedString *_composedTruncationText;
-  NSArray<NSNumber *> *_pointSizeScaleFactors;
-  NSLineBreakMode _truncationMode;
-  
-  NSUInteger _maximumNumberOfLines;
-
-  NSString *_highlightedLinkAttributeName;
-  id _highlightedLinkAttributeValue;
-  ASTextNodeHighlightStyle _highlightStyle;
-  NSRange _highlightRange;
-  ASHighlightOverlayLayer *_activeHighlightLayer;
-
-  UILongPressGestureRecognizer *_longPressGestureRecognizer;
-}
-@dynamic placeholderEnabled;
-
-static NSArray *DefaultLinkAttributeNames() {
-  static NSArray *names;
-  static dispatch_once_t onceToken;
-  dispatch_once(&onceToken, ^{
-    names = @[ NSLinkAttributeName ];
-  });
-  return names;
-}
-
-- (instancetype)init
-{
-  if (self = [super init]) {
-    // Load default values from superclass.
-    _shadowOffset = [super shadowOffset];
-    _shadowColor = CGColorRetain([super shadowColor]);
-    _shadowOpacity = [super shadowOpacity];
-    _shadowRadius = [super shadowRadius];
-
-    // Disable user interaction for text node by default.
-    self.userInteractionEnabled = NO;
-    self.needsDisplayOnBoundsChange = YES;
-
-    _truncationMode = NSLineBreakByWordWrapping;
-
-    // The common case is for a text node to be non-opaque and blended over some background.
-    self.opaque = NO;
-    self.backgroundColor = [UIColor clearColor];
-
-    self.linkAttributeNames = DefaultLinkAttributeNames();
-
-    // Accessibility
-    self.isAccessibilityElement = YES;
-    self.accessibilityTraits = self.defaultAccessibilityTraits;
-
-    // Placeholders
-    // Disabled by default in ASDisplayNode, but add a few options for those who toggle
-    // on the special placeholder behavior of ASTextNode.
-    _placeholderColor = ASDisplayNodeDefaultPlaceholderColor();
-    _placeholderInsets = UIEdgeInsetsMake(1.0, 0.0, 1.0, 0.0);
-  }
-
-  return self;
-}
-
-- (void)dealloc
-{
-  CGColorRelease(_shadowColor);
-
-  // TODO: This may not be necessary post-iOS-9 when most UIKit assign APIs
-  // were changed to weak.
-  if (_longPressGestureRecognizer) {
-    _longPressGestureRecognizer.delegate = nil;
-    [_longPressGestureRecognizer removeTarget:nil action:NULL];
-    [self.view removeGestureRecognizer:_longPressGestureRecognizer];
-  }
-}
-
-#pragma mark - Description
-
-- (NSString *)_plainStringForDescription
-{
-  NSString *plainString = [[self.attributedText string] stringByTrimmingCharactersInSet:[NSCharacterSet newlineCharacterSet]];
-  if (plainString.length > 50) {
-    plainString = [[plainString substringToIndex:50] stringByAppendingString:@"\u2026"];
-  }
-  return plainString;
-}
-
-- (NSMutableArray<NSDictionary *> *)propertiesForDescription
-{
-  NSMutableArray *result = [super propertiesForDescription];
-  NSString *plainString = [self _plainStringForDescription];
-  if (plainString.length > 0) {
-    [result addObject:@{ (id)kCFNull : ASStringWithQuotesIfMultiword(plainString) }];
-  }
-  return result;
-}
-
-- (NSMutableArray<NSDictionary *> *)propertiesForDebugDescription
-{
-  NSMutableArray *result = [super propertiesForDebugDescription];
-  NSString *plainString = [self _plainStringForDescription];
-  if (plainString.length > 0) {
-    [result insertObject:@{ @"text" : ASStringWithQuotesIfMultiword(plainString) } atIndex:0];
-  }
-  return result;
-}
-
-#pragma mark - ASDisplayNode
-
-- (void)didLoad
-{
-  [super didLoad];
-  
-  // If we are view-backed and the delegate cares, support the long-press callback.
-  SEL longPressCallback = @selector(textNode:longPressedLinkAttribute:value:atPoint:textRange:);
-  if (!self.isLayerBacked && [_delegate respondsToSelector:longPressCallback]) {
-    _longPressGestureRecognizer = [[UILongPressGestureRecognizer alloc] initWithTarget:self action:@selector(_handleLongPress:)];
-    _longPressGestureRecognizer.cancelsTouchesInView = self.longPressCancelsTouches;
-    _longPressGestureRecognizer.delegate = self;
-    [self.view addGestureRecognizer:_longPressGestureRecognizer];
-  }
-}
-
-- (BOOL)supportsLayerBacking
-{
-  if (!super.supportsLayerBacking) {
-    return NO;
-  }
-  
-  // If the text contains any links, return NO.
-  NSAttributedString *attributedText = self.attributedText;
-  NSRange range = NSMakeRange(0, attributedText.length);
-  for (NSString *linkAttributeName in _linkAttributeNames) {
-    __block BOOL hasLink = NO;
-    [attributedText enumerateAttribute:linkAttributeName inRange:range options:NSAttributedStringEnumerationLongestEffectiveRangeNotRequired usingBlock:^(id  _Nullable value, NSRange range, BOOL * _Nonnull stop) {
-      hasLink = (value != nil);
-      *stop = YES;
-    }];
-    if (hasLink) {
-      return NO;
-    }
-  }
-  return YES;
-}
-
-#pragma mark - Renderer Management
-
-- (ASTextKitRenderer *)_renderer
-{
-  ASLockScopeSelf();
-  return [self _locked_renderer];
-}
-
-- (ASTextKitRenderer *)_rendererWithBounds:(CGRect)bounds
-{
-  ASLockScopeSelf();
-  return [self _locked_rendererWithBounds:bounds];
-}
-
-- (ASTextKitRenderer *)_locked_renderer
-{
-  ASAssertLocked(__instanceLock__);
-  return [self _locked_rendererWithBounds:[self _locked_threadSafeBounds]];
-}
-
-- (ASTextKitRenderer *)_locked_rendererWithBounds:(CGRect)bounds
-{
-  ASAssertLocked(__instanceLock__);
-  bounds = UIEdgeInsetsInsetRect(bounds, _textContainerInset);
-  return rendererForAttributes([self _locked_rendererAttributes], bounds.size);
-}
-
-- (ASTextKitAttributes)_locked_rendererAttributes
-{
-  ASAssertLocked(__instanceLock__);
-  return {
-    .attributedString = _attributedText,
-    .truncationAttributedString = [self _locked_composedTruncationText],
-    .lineBreakMode = _truncationMode,
-    .maximumNumberOfLines = _maximumNumberOfLines,
-    .exclusionPaths = _exclusionPaths,
-    // use the property getter so a subclass can provide these scale factors on demand if desired
-    .pointSizeScaleFactors = self.pointSizeScaleFactors,
-    .shadowOffset = _shadowOffset,
-    .shadowColor = _cachedShadowUIColor,
-    .shadowOpacity = _shadowOpacity,
-    .shadowRadius = _shadowRadius
-  };
-}
-
-- (NSString *)defaultAccessibilityLabel
-{
-  ASLockScopeSelf();
-  return _attributedText.string;
-}
-
-- (UIAccessibilityTraits)defaultAccessibilityTraits
-{
-  return UIAccessibilityTraitStaticText;
-}
-
-#pragma mark - Layout and Sizing
-
-- (void)setTextContainerInset:(UIEdgeInsets)textContainerInset
-{
-  if (ASLockedSelfCompareAssignCustom(_textContainerInset, textContainerInset, UIEdgeInsetsEqualToEdgeInsets)) {
-    [self setNeedsLayout];
-  }
-}
-
-- (UIEdgeInsets)textContainerInset
-{
-  return ASLockedSelf(_textContainerInset);
-}
-
-- (CGSize)calculateSizeThatFits:(CGSize)constrainedSize
-{
-  ASLockScopeSelf();
-  
-  ASDisplayNodeAssert(constrainedSize.width >= 0, @"Constrained width for text (%f) is too  narrow", constrainedSize.width);
-  ASDisplayNodeAssert(constrainedSize.height >= 0, @"Constrained height for text (%f) is too short", constrainedSize.height);
-  
-  // Cache the original constrained size for final size calculateion
-  CGSize originalConstrainedSize = constrainedSize;
-
-  [self setNeedsDisplay];
-  
-  ASTextKitRenderer *renderer = [self _locked_rendererWithBounds:{.size = constrainedSize}];
-  CGSize size = renderer.size;
-  if (_attributedText.length > 0) {
-    self.style.ascender = [[self class] ascenderWithAttributedString:_attributedText];
-    self.style.descender = [[_attributedText attribute:NSFontAttributeName atIndex:_attributedText.length - 1 effectiveRange:NULL] descender];
-    if (renderer.currentScaleFactor > 0 && renderer.currentScaleFactor < 1.0) {
-      // while not perfect, this is a good estimate of what the ascender of the scaled font will be.
-      self.style.ascender *= renderer.currentScaleFactor;
-      self.style.descender *= renderer.currentScaleFactor;
-    }
-  }
-  
-  // Add the constrained size back textContainerInset
-  size.width += (_textContainerInset.left + _textContainerInset.right);
-  size.height += (_textContainerInset.top + _textContainerInset.bottom);
-  
-  return CGSizeMake(std::fmin(size.width, originalConstrainedSize.width),
-                    std::fmin(size.height, originalConstrainedSize.height));
-}
-
-#pragma mark - Modifying User Text
-
-// Returns the ascender of the first character in attributedString by also including the line height if specified in paragraph style.
-+ (CGFloat)ascenderWithAttributedString:(NSAttributedString *)attributedString 
-{
-  UIFont *font = [attributedString attribute:NSFontAttributeName atIndex:0 effectiveRange:NULL];
-  NSParagraphStyle *paragraphStyle = [attributedString attribute:NSParagraphStyleAttributeName atIndex:0 effectiveRange:NULL];
-  if (!paragraphStyle) {
-    return font.ascender;
-  }
-  CGFloat lineHeight = MAX(font.lineHeight, paragraphStyle.minimumLineHeight);
-  if (paragraphStyle.maximumLineHeight > 0) {
-    lineHeight = MIN(lineHeight, paragraphStyle.maximumLineHeight);
-  }
-  return lineHeight + font.descender;
-}
-
-- (NSAttributedString *)attributedText
-{
-  ASLockScopeSelf();
-  return _attributedText;
-}
-
-- (void)setAttributedText:(NSAttributedString *)attributedText
-{
-  
-  if (attributedText == nil) {
-    attributedText = [[NSAttributedString alloc] initWithString:@"" attributes:nil];
-  }
-
-  {
-    ASLockScopeSelf();
-    if (ASObjectIsEqual(attributedText, _attributedText)) {
-      return;
-    }
-
-    NSAttributedString *cleanedAttributedString = ASCleanseAttributedStringOfCoreTextAttributes(attributedText);
-
-    // Invalidating the truncation text must be done while we still hold the lock. Because after we release it,
-    // another thread may set a new truncation text that will then be cleared by this thread, other may draw
-    // this soon-to-be-invalidated text.
-    [self _locked_invalidateTruncationText];
-
-    NSUInteger length = cleanedAttributedString.length;
-    if (length > 0) {
-      // Updating ascender and descender in one transaction while holding the lock.
-      ASLayoutElementStyle *style = [self _locked_style];
-      style.ascender = [[self class] ascenderWithAttributedString:cleanedAttributedString];
-      style.descender = [[attributedText attribute:NSFontAttributeName atIndex:cleanedAttributedString.length - 1 effectiveRange:NULL] descender];
-    }
-   
-    // Update attributed text with cleaned attributed string
-    _attributedText = cleanedAttributedString;
-  }
-  
-  // Tell the display node superclasses that the cached layout is incorrect now
-  [self setNeedsLayout];
-
-  // Force display to create renderer with new size and redisplay with new string
-  [self setNeedsDisplay];
-  
-  // Accessiblity
-  const auto currentAttributedText = self.attributedText; // Grab attributed string again in case it changed in the meantime
-  self.accessibilityLabel = self.defaultAccessibilityLabel;
-  self.isAccessibilityElement = (currentAttributedText.length != 0); // We're an accessibility element by default if there is a string.
-
-#if AS_TEXTNODE_RECORD_ATTRIBUTED_STRINGS
-  [ASTextNode _registerAttributedText:_attributedText];
-#endif
-}
-
-#pragma mark - Text Layout
-
-- (void)setExclusionPaths:(NSArray *)exclusionPaths
-{
-  if (ASLockedSelfCompareAssignCopy(_exclusionPaths, exclusionPaths)) {
-    [self setNeedsLayout];
-    [self setNeedsDisplay];
-  }
-}
-
-- (NSArray *)exclusionPaths
-{
-  return ASLockedSelf(_exclusionPaths);
-}
-
-#pragma mark - Drawing
-
-- (NSObject *)drawParametersForAsyncLayer:(_ASDisplayLayer *)layer
-{
-  ASLockScopeSelf();
-  
-  return [[ASTextNodeDrawParameter alloc] initWithRendererAttributes:[self _locked_rendererAttributes]
-                                                     backgroundColor:self.backgroundColor
-                                                 textContainerInsets:_textContainerInset
-                                                        contentScale:_contentsScaleForDisplay
-                                                              opaque:self.isOpaque
-                                                              bounds:[self threadSafeBounds]];
-}
-
-+ (UIImage *)displayWithParameters:(id<NSObject>)parameters isCancelled:(NS_NOESCAPE asdisplaynode_iscancelled_block_t)isCancelled
-{
-  ASTextNodeDrawParameter *drawParameter = (ASTextNodeDrawParameter *)parameters;
-  
-  if (drawParameter->_bounds.size.width <= 0 || drawParameter->_bounds.size.height <= 0) {
-    return nil;
-  }
-    
-  UIImage *result = nil;
-  UIColor *backgroundColor = drawParameter->_backgroundColor;
-  UIEdgeInsets textContainerInsets = drawParameter ? drawParameter->_textContainerInsets : UIEdgeInsetsZero;
-  ASTextKitRenderer *renderer = [drawParameter rendererForBounds:drawParameter->_bounds];
-  BOOL renderedWithGraphicsRenderer = NO;
-  
-  if (AS_AVAILABLE_IOS_TVOS(10, 10)) {
-    if (ASActivateExperimentalFeature(ASExperimentalTextDrawing)) {
-      renderedWithGraphicsRenderer = YES;
-      UIGraphicsImageRenderer *graphicsRenderer = [[UIGraphicsImageRenderer alloc] initWithSize:CGSizeMake(drawParameter->_bounds.size.width, drawParameter->_bounds.size.height)];
-      result = [graphicsRenderer imageWithActions:^(UIGraphicsImageRendererContext * _Nonnull rendererContext) {
-        CGContextRef context = rendererContext.CGContext;
-        ASDisplayNodeAssert(context, @"This is no good without a context.");
-        
-        CGContextSaveGState(context);
-        CGContextTranslateCTM(context, textContainerInsets.left, textContainerInsets.top);
-        
-        // Fill background
-        if (backgroundColor != nil) {
-          [backgroundColor setFill];
-          UIRectFillUsingBlendMode(CGContextGetClipBoundingBox(context), kCGBlendModeCopy);
-        }
-        
-        // Draw text
-        [renderer drawInContext:context bounds:drawParameter->_bounds];
-        CGContextRestoreGState(context);
-      }];
-    }
-  }
-  
-  if (!renderedWithGraphicsRenderer) {
-    UIGraphicsBeginImageContextWithOptions(CGSizeMake(drawParameter->_bounds.size.width, drawParameter->_bounds.size.height), drawParameter->_opaque, drawParameter->_contentScale);
-      
-    CGContextRef context = UIGraphicsGetCurrentContext();
-    ASDisplayNodeAssert(context, @"This is no good without a context.");
-    
-    CGContextSaveGState(context);
-    CGContextTranslateCTM(context, textContainerInsets.left, textContainerInsets.top);
-    
-    // Fill background
-    if (backgroundColor != nil) {
-      [backgroundColor setFill];
-      UIRectFillUsingBlendMode(CGContextGetClipBoundingBox(context), kCGBlendModeCopy);
-    }
-    
-    // Draw text
-    [renderer drawInContext:context bounds:drawParameter->_bounds];
-    CGContextRestoreGState(context);
-    
-    result = UIGraphicsGetImageFromCurrentImageContext();
-    UIGraphicsEndImageContext();
-  }
-
-  return result;
-}
-
-#pragma mark - Attributes
-
-- (id)linkAttributeValueAtPoint:(CGPoint)point
-                  attributeName:(out NSString **)attributeNameOut
-                          range:(out NSRange *)rangeOut
-{
-  return [self _linkAttributeValueAtPoint:point
-                            attributeName:attributeNameOut
-                                    range:rangeOut
-            inAdditionalTruncationMessage:NULL
-                          forHighlighting:NO];
-}
-
-- (id)_linkAttributeValueAtPoint:(CGPoint)point
-                   attributeName:(out NSString * __autoreleasing *)attributeNameOut
-                           range:(out NSRange *)rangeOut
-   inAdditionalTruncationMessage:(out BOOL *)inAdditionalTruncationMessageOut
-                 forHighlighting:(BOOL)highlighting
-{
-  ASDisplayNodeAssertMainThread();
-  
-  ASLockScopeSelf();
-  
-  ASTextKitRenderer *renderer = [self _locked_renderer];
-  NSRange visibleRange = renderer.firstVisibleRange;
-  NSAttributedString *attributedString = _attributedText;
-  NSRange clampedRange = NSIntersectionRange(visibleRange, NSMakeRange(0, attributedString.length));
-
-  // Check in a 9-point region around the actual touch point so we make sure
-  // we get the best attribute for the touch.
-  __block CGFloat minimumGlyphDistance = CGFLOAT_MAX;
-
-  // Final output vars
-  __block id linkAttributeValue = nil;
-  __block BOOL inTruncationMessage = NO;
-
-  [renderer enumerateTextIndexesAtPosition:point usingBlock:^(NSUInteger characterIndex, CGRect glyphBoundingRect, BOOL *stop) {
-    CGPoint glyphLocation = CGPointMake(CGRectGetMidX(glyphBoundingRect), CGRectGetMidY(glyphBoundingRect));
-    CGFloat currentDistance = std::sqrt(std::pow(point.x - glyphLocation.x, 2.f) + std::pow(point.y - glyphLocation.y, 2.f));
-    if (currentDistance >= minimumGlyphDistance) {
-      // If the distance computed from the touch to the glyph location is
-      // not the minimum among the located link attributes, we can just skip
-      // to the next location.
-      return;
-    }
-
-    // Check if it's outside the visible range, if so, then we mark this touch
-    // as inside the truncation message, because in at least one of the touch
-    // points it was.
-    if (!(NSLocationInRange(characterIndex, visibleRange))) {
-      inTruncationMessage = YES;
-    }
-
-    if (inAdditionalTruncationMessageOut != NULL) {
-      *inAdditionalTruncationMessageOut = inTruncationMessage;
-    }
-
-    // Short circuit here if it's just in the truncation message.  Since the
-    // truncation message may be beyond the scope of the actual input string,
-    // we have to make sure that we don't start asking for attributes on it.
-    if (inTruncationMessage) {
-      return;
-    }
-
-    for (NSString *attributeName in self->_linkAttributeNames) {
-      NSRange range;
-      id value = [attributedString attribute:attributeName atIndex:characterIndex longestEffectiveRange:&range inRange:clampedRange];
-      NSString *name = attributeName;
-
-      if (value == nil || name == nil) {
-        // Didn't find anything
-        continue;
-      }
-
-      // If highlighting, check with delegate first. If not implemented, assume YES.
-      if (highlighting
-          && [self->_delegate respondsToSelector:@selector(textNode:shouldHighlightLinkAttribute:value:atPoint:)]
-          && ![self->_delegate textNode:self shouldHighlightLinkAttribute:name value:value atPoint:point]) {
-        value = nil;
-        name = nil;
-      }
-
-      if (value != nil || name != nil) {
-        // We found a minimum glyph distance link attribute, so set the min
-        // distance, and the out params.
-        minimumGlyphDistance = currentDistance;
-
-        if (rangeOut != NULL && value != nil) {
-          *rangeOut = range;
-          // Limit to only the visible range, because the attributed string will
-          // return values outside the visible range.
-          if (NSMaxRange(*rangeOut) > NSMaxRange(visibleRange)) {
-            (*rangeOut).length = MAX(NSMaxRange(visibleRange) - (*rangeOut).location, 0);
-          }
-        }
-
-        if (attributeNameOut != NULL) {
-          *attributeNameOut = name;
-        }
-
-        // Set the values for the next iteration
-        linkAttributeValue = value;
-
-        break;
-      }
-    }
-  }];
-
-  return linkAttributeValue;
-}
-
-#pragma mark - UIGestureRecognizerDelegate
-
-- (BOOL)gestureRecognizerShouldBegin:(UIGestureRecognizer *)gestureRecognizer
-{
-  ASDisplayNodeAssertMainThread();
-  
-  if (gestureRecognizer == _longPressGestureRecognizer) {
-    // Don't allow long press on truncation message
-    if ([self _pendingTruncationTap]) {
-      return NO;
-    }
-
-    // Ask our delegate if a long-press on an attribute is relevant
-    if ([self _pendingLinkTap] && [_delegate respondsToSelector:@selector(textNode:shouldLongPressLinkAttribute:value:atPoint:)]) {
-      return [_delegate textNode:self
-        shouldLongPressLinkAttribute:_highlightedLinkAttributeName
-                               value:_highlightedLinkAttributeValue
-                             atPoint:[gestureRecognizer locationInView:self.view]];
-    }
-
-    // Otherwise we are good to go.
-    return YES;
-  }
-
-  if (([self _pendingLinkTap] || [self _pendingTruncationTap])
-      && [gestureRecognizer isKindOfClass:[UITapGestureRecognizer class]]
-      && CGRectContainsPoint(self.threadSafeBounds, [gestureRecognizer locationInView:self.view])) {
-    return NO;
-  }
-
-  return [super gestureRecognizerShouldBegin:gestureRecognizer];
-}
-
-#pragma mark - Highlighting
-
-- (ASTextNodeHighlightStyle)highlightStyle
-{
-  ASLockScopeSelf();
-  
-  return _highlightStyle;
-}
-
-- (void)setHighlightStyle:(ASTextNodeHighlightStyle)highlightStyle
-{
-  ASLockScopeSelf();
-  
-  _highlightStyle = highlightStyle;
-}
-
-- (NSRange)highlightRange
-{
-  ASDisplayNodeAssertMainThread();
-  
-  return _highlightRange;
-}
-
-- (void)setHighlightRange:(NSRange)highlightRange
-{
-  [self setHighlightRange:highlightRange animated:NO];
-}
-
-- (void)setHighlightRange:(NSRange)highlightRange animated:(BOOL)animated
-{
-  [self _setHighlightRange:highlightRange forAttributeName:nil value:nil animated:animated];
-}
-
-- (void)_setHighlightRange:(NSRange)highlightRange forAttributeName:(NSString *)highlightedAttributeName value:(id)highlightedAttributeValue animated:(BOOL)animated
-{
-  ASDisplayNodeAssertMainThread();
-
-  _highlightedLinkAttributeName = highlightedAttributeName;
-  _highlightedLinkAttributeValue = highlightedAttributeValue;
-
-  if (!NSEqualRanges(highlightRange, _highlightRange) && ((0 != highlightRange.length) || (0 != _highlightRange.length))) {
-
-    _highlightRange = highlightRange;
-
-    if (_activeHighlightLayer) {
-      if (animated) {
-        __weak CALayer *weakHighlightLayer = _activeHighlightLayer;
-        _activeHighlightLayer = nil;
-
-        weakHighlightLayer.opacity = 0.0;
-
-        CFTimeInterval beginTime = CACurrentMediaTime();
-        CABasicAnimation *possibleFadeIn = (CABasicAnimation *)[weakHighlightLayer animationForKey:@"opacity"];
-        if (possibleFadeIn) {
-          // Calculate when we should begin fading out based on the end of the fade in animation,
-          // Also check to make sure that the new begin time hasn't already passed
-          CGFloat newBeginTime = (possibleFadeIn.beginTime + possibleFadeIn.duration);
-          if (newBeginTime > beginTime) {
-            beginTime = newBeginTime;
-          }
-        }
-        
-        CABasicAnimation *fadeOut = [CABasicAnimation animationWithKeyPath:@"opacity"];
-        fadeOut.timingFunction = [CAMediaTimingFunction functionWithName:kCAMediaTimingFunctionEaseInEaseOut];
-        fadeOut.fromValue = possibleFadeIn.toValue ? : @(((CALayer *)weakHighlightLayer.presentationLayer).opacity);
-        fadeOut.toValue = @0.0;
-        fadeOut.fillMode = kCAFillModeBoth;
-        fadeOut.duration = ASTextNodeHighlightFadeOutDuration;
-        fadeOut.beginTime = beginTime;
-
-        dispatch_block_t prev = [CATransaction completionBlock];
-        [CATransaction setCompletionBlock:^{
-          [weakHighlightLayer removeFromSuperlayer];
-        }];
-
-        [weakHighlightLayer addAnimation:fadeOut forKey:fadeOut.keyPath];
-
-        [CATransaction setCompletionBlock:prev];
-
-      } else {
-        [_activeHighlightLayer removeFromSuperlayer];
-        _activeHighlightLayer = nil;
-      }
-    }
-    if (0 != highlightRange.length) {
-      // Find layer in hierarchy that allows us to draw highlighting on.
-      CALayer *highlightTargetLayer = self.layer;
-      while (highlightTargetLayer != nil) {
-        if (highlightTargetLayer.as_allowsHighlightDrawing) {
-          break;
-        }
-        highlightTargetLayer = highlightTargetLayer.superlayer;
-      }
-
-      if (highlightTargetLayer != nil) {
-        ASLockScopeSelf();
-        ASTextKitRenderer *renderer = [self _locked_renderer];
-
-        NSArray *highlightRects = [renderer rectsForTextRange:highlightRange measureOption:ASTextKitRendererMeasureOptionBlock];
-        NSMutableArray *converted = [NSMutableArray arrayWithCapacity:highlightRects.count];
-        for (NSValue *rectValue in highlightRects) {
-          UIEdgeInsets shadowPadding = renderer.shadower.shadowPadding;
-          CGRect rendererRect = ASTextNodeAdjustRenderRectForShadowPadding(rectValue.CGRectValue, shadowPadding);
-
-          // The rects returned from renderer don't have `textContainerInset`,
-          // as well as they are using the `constrainedSize` for layout,
-          // so we can simply increase the rect by insets to get the full blown layout.
-          rendererRect.size.width += _textContainerInset.left + _textContainerInset.right;
-          rendererRect.size.height += _textContainerInset.top + _textContainerInset.bottom;
-
-          CGRect highlightedRect = [self.layer convertRect:rendererRect toLayer:highlightTargetLayer];
-
-          // We set our overlay layer's frame to the bounds of the highlight target layer.
-          // Offset highlight rects to avoid double-counting target layer's bounds.origin.
-          highlightedRect.origin.x -= highlightTargetLayer.bounds.origin.x;
-          highlightedRect.origin.y -= highlightTargetLayer.bounds.origin.y;
-          [converted addObject:[NSValue valueWithCGRect:highlightedRect]];
-        }
-
-        ASHighlightOverlayLayer *overlayLayer = [[ASHighlightOverlayLayer alloc] initWithRects:converted];
-        overlayLayer.highlightColor = [[self class] _highlightColorForStyle:self.highlightStyle];
-        overlayLayer.frame = highlightTargetLayer.bounds;
-        overlayLayer.masksToBounds = NO;
-        overlayLayer.opacity = [[self class] _highlightOpacityForStyle:self.highlightStyle];
-        [highlightTargetLayer addSublayer:overlayLayer];
-
-        if (animated) {
-          CABasicAnimation *fadeIn = [CABasicAnimation animationWithKeyPath:@"opacity"];
-          fadeIn.fromValue = @0.0;
-          fadeIn.toValue = @(overlayLayer.opacity);
-          fadeIn.duration = ASTextNodeHighlightFadeInDuration;
-          fadeIn.beginTime = CACurrentMediaTime();
-
-          [overlayLayer addAnimation:fadeIn forKey:fadeIn.keyPath];
-        }
-
-        [overlayLayer setNeedsDisplay];
-
-        _activeHighlightLayer = overlayLayer;
-      }
-    }
-  }
-}
-
-- (void)_clearHighlightIfNecessary
-{
-  ASDisplayNodeAssertMainThread();
-  
-  if ([self _pendingLinkTap] || [self _pendingTruncationTap]) {
-    [self setHighlightRange:NSMakeRange(0, 0) animated:YES];
-  }
-}
-
-+ (CGColorRef)_highlightColorForStyle:(ASTextNodeHighlightStyle)style
-{
-  return [UIColor colorWithWhite:(style == ASTextNodeHighlightStyleLight ? 0.0 : 1.0) alpha:1.0].CGColor;
-}
-
-+ (CGFloat)_highlightOpacityForStyle:(ASTextNodeHighlightStyle)style
-{
-  return (style == ASTextNodeHighlightStyleLight) ? ASTextNodeHighlightLightOpacity : ASTextNodeHighlightDarkOpacity;
-}
-
-#pragma mark - Text rects
-
-static CGRect ASTextNodeAdjustRenderRectForShadowPadding(CGRect rendererRect, UIEdgeInsets shadowPadding) {
-  rendererRect.origin.x -= shadowPadding.left;
-  rendererRect.origin.y -= shadowPadding.top;
-  return rendererRect;
-}
-
-- (NSArray *)rectsForTextRange:(NSRange)textRange
-{
-  return [self _rectsForTextRange:textRange measureOption:ASTextKitRendererMeasureOptionCapHeight];
-}
-
-- (NSArray *)highlightRectsForTextRange:(NSRange)textRange
-{
-  return [self _rectsForTextRange:textRange measureOption:ASTextKitRendererMeasureOptionBlock];
-}
-
-- (NSArray *)_rectsForTextRange:(NSRange)textRange measureOption:(ASTextKitRendererMeasureOption)measureOption
-{
-  ASLockScopeSelf();
-  
-  NSArray *rects = [[self _locked_renderer] rectsForTextRange:textRange measureOption:measureOption];
-  const auto adjustedRects = [[NSMutableArray<NSValue *> alloc] init];
-
-  for (NSValue *rectValue in rects) {
-    CGRect rect = [rectValue CGRectValue];
-    rect = ASTextNodeAdjustRenderRectForShadowPadding(rect, self.shadowPadding);
-
-    NSValue *adjustedRectValue = [NSValue valueWithCGRect:rect];
-    [adjustedRects addObject:adjustedRectValue];
-  }
-
-  return adjustedRects;
-}
-
-- (CGRect)trailingRect
-{
-  ASLockScopeSelf();
-  
-  CGRect rect = [[self _locked_renderer] trailingRect];
-  return ASTextNodeAdjustRenderRectForShadowPadding(rect, self.shadowPadding);
-}
-
-- (CGRect)frameForTextRange:(NSRange)textRange
-{
-  ASLockScopeSelf();
-  
-  CGRect frame = [[self _locked_renderer] frameForTextRange:textRange];
-  return ASTextNodeAdjustRenderRectForShadowPadding(frame, self.shadowPadding);
-}
-
-#pragma mark - Placeholders
-
-- (UIColor *)placeholderColor
-{
-  return ASLockedSelf(_placeholderColor);
-}
-
-- (void)setPlaceholderColor:(UIColor *)placeholderColor
-{
-  if (ASLockedSelfCompareAssignCopy(_placeholderColor, placeholderColor)) {
-    self.placeholderEnabled = CGColorGetAlpha(placeholderColor.CGColor) > 0;
-  }
-}
-
-- (UIImage *)placeholderImage
-{
-  // FIXME: Replace this implementation with reusable CALayers that have .backgroundColor set.
-  // This would completely eliminate the memory and performance cost of the backing store.
-  CGSize size = self.calculatedSize;
-  if ((size.width * size.height) < CGFLOAT_EPSILON) {
-    return nil;
-  }
-  
-  ASLockScopeSelf();
-  
-  ASGraphicsBeginImageContextWithOptions(size, NO, 1.0);
-  [self.placeholderColor setFill];
-
-  ASTextKitRenderer *renderer = [self _locked_renderer];
-  NSRange visibleRange = renderer.firstVisibleRange;
-
-  // cap height is both faster and creates less subpixel blending
-  NSArray *lineRects = [self _rectsForTextRange:visibleRange measureOption:ASTextKitRendererMeasureOptionLineHeight];
-
-  // fill each line with the placeholder color
-  for (NSValue *rectValue in lineRects) {
-    CGRect lineRect = [rectValue CGRectValue];
-    CGRect fillBounds = CGRectIntegral(UIEdgeInsetsInsetRect(lineRect, self.placeholderInsets));
-
-    if (fillBounds.size.width > 0.0 && fillBounds.size.height > 0.0) {
-      UIRectFill(fillBounds);
-    }
-  }
-
-  UIImage *image = ASGraphicsGetImageAndEndCurrentContext();
-  return image;
-}
-
-#pragma mark - Touch Handling
-
-- (BOOL)pointInside:(CGPoint)point withEvent:(UIEvent *)event
-{
-  ASDisplayNodeAssertMainThread();
-  
-  if (!_passthroughNonlinkTouches) {
-    return [super pointInside:point withEvent:event];
-  }
-
-  NSRange range = NSMakeRange(0, 0);
-  NSString *linkAttributeName = nil;
-  BOOL inAdditionalTruncationMessage = NO;
-
-  id linkAttributeValue = [self _linkAttributeValueAtPoint:point
-                                             attributeName:&linkAttributeName
-                                                     range:&range
-                             inAdditionalTruncationMessage:&inAdditionalTruncationMessage
-                                           forHighlighting:YES];
-
-  NSUInteger lastCharIndex = NSIntegerMax;
-  BOOL linkCrossesVisibleRange = (lastCharIndex > range.location) && (lastCharIndex < NSMaxRange(range) - 1);
-
-  if (range.length > 0 && !linkCrossesVisibleRange && linkAttributeValue != nil && linkAttributeName != nil) {
-    return YES;
-  } else {
-    return NO;
-  }
-}
-
-- (void)touchesBegan:(NSSet *)touches withEvent:(UIEvent *)event
-{
-  ASDisplayNodeAssertMainThread();
-  
-  [super touchesBegan:touches withEvent:event];
-
-  CGPoint point = [[touches anyObject] locationInView:self.view];
-
-  NSRange range = NSMakeRange(0, 0);
-  NSString *linkAttributeName = nil;
-  BOOL inAdditionalTruncationMessage = NO;
-
-  id linkAttributeValue = [self _linkAttributeValueAtPoint:point
-                                             attributeName:&linkAttributeName
-                                                     range:&range
-                             inAdditionalTruncationMessage:&inAdditionalTruncationMessage
-                                           forHighlighting:YES];
-
-  NSUInteger lastCharIndex = NSIntegerMax;
-  BOOL linkCrossesVisibleRange = (lastCharIndex > range.location) && (lastCharIndex < NSMaxRange(range) - 1);
-
-  if (inAdditionalTruncationMessage) {
-    NSRange visibleRange = NSMakeRange(0, 0);
-    {
-      ASLockScopeSelf();
-      visibleRange = [self _locked_renderer].firstVisibleRange;
-    }
-    NSRange truncationMessageRange = [self _additionalTruncationMessageRangeWithVisibleRange:visibleRange];
-    [self _setHighlightRange:truncationMessageRange forAttributeName:ASTextNodeTruncationTokenAttributeName value:nil animated:YES];
-  } else if (range.length > 0 && !linkCrossesVisibleRange && linkAttributeValue != nil && linkAttributeName != nil) {
-    [self _setHighlightRange:range forAttributeName:linkAttributeName value:linkAttributeValue animated:YES];
-  }
-}
-
-
-- (void)touchesCancelled:(NSSet *)touches withEvent:(UIEvent *)event
-{
-  ASDisplayNodeAssertMainThread();
-  [super touchesCancelled:touches withEvent:event];
-  
-  [self _clearHighlightIfNecessary];
-}
-
-- (void)touchesEnded:(NSSet *)touches withEvent:(UIEvent *)event
-{
-  ASDisplayNodeAssertMainThread();
-  [super touchesEnded:touches withEvent:event];
-  
-  if ([self _pendingLinkTap] && [_delegate respondsToSelector:@selector(textNode:tappedLinkAttribute:value:atPoint:textRange:)]) {
-    CGPoint point = [[touches anyObject] locationInView:self.view];
-    [_delegate textNode:self tappedLinkAttribute:_highlightedLinkAttributeName value:_highlightedLinkAttributeValue atPoint:point textRange:_highlightRange];
-  }
-
-  if ([self _pendingTruncationTap]) {
-    if ([_delegate respondsToSelector:@selector(textNodeTappedTruncationToken:)]) {
-      [_delegate textNodeTappedTruncationToken:self];
-    }
-  }
-
-  [self _clearHighlightIfNecessary];
-}
-
-- (void)touchesMoved:(NSSet *)touches withEvent:(UIEvent *)event
-{
-  ASDisplayNodeAssertMainThread();
-  [super touchesMoved:touches withEvent:event];
-
-  UITouch *touch = [touches anyObject];
-  CGPoint locationInView = [touch locationInView:self.view];
-  // on 3D Touch enabled phones, this gets fired with changes in force, and usually will get fired immediately after touchesBegan:withEvent:
-  if (CGPointEqualToPoint([touch previousLocationInView:self.view], locationInView))
-    return;
-  
-  // If touch has moved out of the current highlight range, clear the highlight.
-  if (_highlightRange.length > 0) {
-    NSRange range = NSMakeRange(0, 0);
-    [self _linkAttributeValueAtPoint:locationInView
-                       attributeName:NULL
-                               range:&range
-       inAdditionalTruncationMessage:NULL
-                     forHighlighting:YES];
-
-    if (!NSEqualRanges(_highlightRange, range)) {
-      [self _clearHighlightIfNecessary];
-    }
-  }
-}
-
-- (void)_handleLongPress:(UILongPressGestureRecognizer *)longPressRecognizer
-{
-  ASDisplayNodeAssertMainThread();
-  
-  // Respond to long-press when it begins, not when it ends.
-  if (longPressRecognizer.state == UIGestureRecognizerStateBegan) {
-    if ([self _pendingLinkTap] && [_delegate respondsToSelector:@selector(textNode:longPressedLinkAttribute:value:atPoint:textRange:)]) {
-      CGPoint touchPoint = [_longPressGestureRecognizer locationInView:self.view];
-      [_delegate textNode:self longPressedLinkAttribute:_highlightedLinkAttributeName value:_highlightedLinkAttributeValue atPoint:touchPoint textRange:_highlightRange];
-    }
-  }
-}
-
-- (BOOL)_pendingLinkTap
-{
-  ASLockScopeSelf();
-  
-  return (_highlightedLinkAttributeValue != nil && ![self _pendingTruncationTap]) && _delegate != nil;
-}
-
-- (BOOL)_pendingTruncationTap
-{
-  ASLockScopeSelf();
-  
-  return [_highlightedLinkAttributeName isEqualToString:ASTextNodeTruncationTokenAttributeName];
-}
-
-#pragma mark - Shadow Properties
-
-- (CGColorRef)shadowColor
-{
-  return ASLockedSelf(_shadowColor);
-}
-
-- (void)setShadowColor:(CGColorRef)shadowColor
-{
-  [self lock];
-
-  if (_shadowColor != shadowColor && CGColorEqualToColor(shadowColor, _shadowColor) == NO) {
-    CGColorRelease(_shadowColor);
-    _shadowColor = CGColorRetain(shadowColor);
-    _cachedShadowUIColor = [UIColor colorWithCGColor:shadowColor];
-    [self unlock];
-    
-    [self setNeedsDisplay];
-    return;
-  }
-
-  [self unlock];
-}
-
-- (CGSize)shadowOffset
-{
-  return ASLockedSelf(_shadowOffset);
-}
-
-- (void)setShadowOffset:(CGSize)shadowOffset
-{
-  if (ASLockedSelfCompareAssignCustom(_shadowOffset, shadowOffset, CGSizeEqualToSize)) {
-    [self setNeedsDisplay];
-  }
-}
-
-- (CGFloat)shadowOpacity
-{
-  return ASLockedSelf(_shadowOpacity);
-}
-
-- (void)setShadowOpacity:(CGFloat)shadowOpacity
-{
-  if (ASLockedSelfCompareAssign(_shadowOpacity, shadowOpacity)) {
-    [self setNeedsDisplay];
-  }
-}
-
-- (CGFloat)shadowRadius
-{
-  return ASLockedSelf(_shadowRadius);
-}
-
-- (void)setShadowRadius:(CGFloat)shadowRadius
-{
-  if (ASLockedSelfCompareAssign(_shadowRadius, shadowRadius)) {
-    [self setNeedsDisplay];
-  }
-}
-
-- (UIEdgeInsets)shadowPadding
-{
-  ASLockScopeSelf();
-  return [self _locked_renderer].shadower.shadowPadding;
-}
-
-#pragma mark - Truncation Message
-
-static NSAttributedString *DefaultTruncationAttributedString()
-{
-  static NSAttributedString *defaultTruncationAttributedString;
-  static dispatch_once_t onceToken;
-  dispatch_once(&onceToken, ^{
-    defaultTruncationAttributedString = [[NSAttributedString alloc] initWithString:NSLocalizedString(@"\u2026", @"Default truncation string")];
-  });
-  return defaultTruncationAttributedString;
-}
-
-- (NSAttributedString *)truncationAttributedText
-{
-  return ASLockedSelf(_truncationAttributedText);
-}
-
-- (void)setTruncationAttributedText:(NSAttributedString *)truncationAttributedText
-{
-  if (ASLockedSelfCompareAssignCopy(_truncationAttributedText, truncationAttributedText)) {
-    [self _invalidateTruncationText];
-    [self setNeedsDisplay];
-  }
-}
-
-- (void)setAdditionalTruncationMessage:(NSAttributedString *)additionalTruncationMessage
-{
-  if (ASLockedSelfCompareAssignCopy(_additionalTruncationMessage, additionalTruncationMessage)) {
-    [self _invalidateTruncationText];
-    [self setNeedsDisplay];
-  }
-}
-
-- (NSAttributedString *)additionalTruncationMessage
-{
-  return ASLockedSelf(_additionalTruncationMessage);
-}
-
-- (void)setTruncationMode:(NSLineBreakMode)truncationMode
-{
-  if (ASLockedSelfCompareAssign(_truncationMode, truncationMode)) {
-    [self setNeedsDisplay];
-  }
-}
-
-- (NSLineBreakMode)truncationMode
-{
-  return ASLockedSelf(_truncationMode);
-}
-
-- (BOOL)isTruncated
-{
-  return ASLockedSelf([[self _locked_renderer] isTruncated]);
-}
-
-- (BOOL)shouldTruncateForConstrainedSize:(ASSizeRange)constrainedSize
-{
-  return ASLockedSelf([[self _locked_rendererWithBounds:{.size = constrainedSize.max}] isTruncated]);
-}
-
-- (void)setPointSizeScaleFactors:(NSArray<NSNumber *> *)pointSizeScaleFactors
-{
-  if (ASLockedSelfCompareAssignCopy(_pointSizeScaleFactors, pointSizeScaleFactors)) {
-    [self setNeedsDisplay];
-  }
-}
-
-- (NSArray<NSNumber *> *)pointSizeScaleFactors
-{
-  return ASLockedSelf(_pointSizeScaleFactors);
-}
-
-- (void)setMaximumNumberOfLines:(NSUInteger)maximumNumberOfLines
-{
-  if (ASLockedSelfCompareAssign(_maximumNumberOfLines, maximumNumberOfLines)) {
-    [self setNeedsDisplay];
-  }
-}
-
-- (NSUInteger)maximumNumberOfLines
-{
-   return ASLockedSelf(_maximumNumberOfLines);
-}
-
-- (NSUInteger)lineCount
-{
-  return ASLockedSelf([[self _locked_renderer] lineCount]);
-}
-
-#pragma mark - Truncation Message
-
-- (void)_invalidateTruncationText
-{
-  ASLockScopeSelf();
-  [self _locked_invalidateTruncationText];
-}
-
-- (void)_locked_invalidateTruncationText
-{
-  _composedTruncationText = nil;
-}
-
-/**
- * @return the additional truncation message range within the as-rendered text.
- * Must be called from main thread
- */
-- (NSRange)_additionalTruncationMessageRangeWithVisibleRange:(NSRange)visibleRange
-{
-  ASLockScopeSelf();
-  
-  // Check if we even have an additional truncation message.
-  if (!_additionalTruncationMessage) {
-    return NSMakeRange(NSNotFound, 0);
-  }
-
-  // Character location of the unicode ellipsis (the first index after the visible range)
-  NSInteger truncationTokenIndex = NSMaxRange(visibleRange);
-
-  NSUInteger additionalTruncationMessageLength = _additionalTruncationMessage.length;
-  // We get the location of the truncation token, then add the length of the
-  // truncation attributed string +1 for the space between.
-  return NSMakeRange(truncationTokenIndex + _truncationAttributedText.length + 1, additionalTruncationMessageLength);
-}
-
-/**
- * @return the truncation message for the string.  If there are both an
- * additional truncation message and a truncation attributed string, they will
- * be properly composed.
- */
-- (NSAttributedString *)_locked_composedTruncationText
-{
-  ASAssertLocked(__instanceLock__);
-  if (_composedTruncationText == nil) {
-    if (_truncationAttributedText != nil && _additionalTruncationMessage != nil) {
-      NSMutableAttributedString *newComposedTruncationString = [[NSMutableAttributedString alloc] initWithAttributedString:_truncationAttributedText];
-      [newComposedTruncationString.mutableString appendString:@" "];
-      [newComposedTruncationString appendAttributedString:_additionalTruncationMessage];
-      _composedTruncationText = newComposedTruncationString;
-    } else if (_truncationAttributedText != nil) {
-      _composedTruncationText = _truncationAttributedText;
-    } else if (_additionalTruncationMessage != nil) {
-      _composedTruncationText = _additionalTruncationMessage;
-    } else {
-      _composedTruncationText = DefaultTruncationAttributedString();
-    }
-    _composedTruncationText = [self _locked_prepareTruncationStringForDrawing:_composedTruncationText];
-  }
-  return _composedTruncationText;
-}
-
-/**
- * - cleanses it of core text attributes so TextKit doesn't crash
- * - Adds whole-string attributes so the truncation message matches the styling
- * of the body text
- */
-- (NSAttributedString *)_locked_prepareTruncationStringForDrawing:(NSAttributedString *)truncationString
-{
-  ASAssertLocked(__instanceLock__);
-  truncationString = ASCleanseAttributedStringOfCoreTextAttributes(truncationString);
-  NSMutableAttributedString *truncationMutableString = [truncationString mutableCopy];
-  // Grab the attributes from the full string
-  if (_attributedText.length > 0) {
-    NSAttributedString *originalString = _attributedText;
-    NSInteger originalStringLength = _attributedText.length;
-    // Add any of the original string's attributes to the truncation string,
-    // but don't overwrite any of the truncation string's attributes
-    NSDictionary *originalStringAttributes = [originalString attributesAtIndex:originalStringLength-1 effectiveRange:NULL];
-    [truncationString enumerateAttributesInRange:NSMakeRange(0, truncationString.length) options:0 usingBlock:
-     ^(NSDictionary *attributes, NSRange range, BOOL *stop) {
-       NSMutableDictionary *futureTruncationAttributes = [originalStringAttributes mutableCopy];
-       [futureTruncationAttributes addEntriesFromDictionary:attributes];
-       [truncationMutableString setAttributes:futureTruncationAttributes range:range];
-     }];
-  }
-  return truncationMutableString;
-}
-
-#if AS_TEXTNODE_RECORD_ATTRIBUTED_STRINGS
-+ (void)_registerAttributedText:(NSAttributedString *)str
-{
-  static NSMutableArray *array;
-  static NSLock *lock;
-  static dispatch_once_t onceToken;
-  dispatch_once(&onceToken, ^{
-    lock = [NSLock new];
-    array = [NSMutableArray new];
-  });
-  [lock lock];
-  [array addObject:str];
-  if (array.count % 20 == 0) {
-    NSLog(@"Got %d strings", (int)array.count);
-  }
-  if (array.count == 2000) {
-    NSString *path = [NSTemporaryDirectory() stringByAppendingPathComponent:@"AttributedStrings.plist"];
-    NSAssert([NSKeyedArchiver archiveRootObject:array toFile:path], nil);
-    NSLog(@"Saved to %@", path);
-  }
-  [lock unlock];
-}
-#endif
-
-// All direct descendants of ASTextNode get their superclass replaced by ASTextNode2.
-+ (void)initialize
-{
-  // Texture requires that node subclasses call [super initialize]
-  [super initialize];
-
-  if (class_getSuperclass(self) == [ASTextNode class]
-      && ASActivateExperimentalFeature(ASExperimentalTextNode)) {
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
-    class_setSuperclass(self, [ASTextNode2 class]);
-#pragma clang diagnostic pop
-  }
-}
-
-// For direct allocations of ASTextNode itself, we override allocWithZone:
-+ (id)allocWithZone:(struct _NSZone *)zone
-{
-  if (ASActivateExperimentalFeature(ASExperimentalTextNode)) {
-    return (ASTextNode *)[ASTextNode2 allocWithZone:zone];
-  } else {
-    return [super allocWithZone:zone];
-  }
-}
-
-@end
-
-@implementation ASTextNode (Unsupported)
-
-- (void)setTextContainerLinePositionModifier:(id)textContainerLinePositionModifier
-{
-  AS_TEXT_ALERT_UNIMPLEMENTED_FEATURE();
-}
-
-- (id)textContainerLinePositionModifier
-{
-  AS_TEXT_ALERT_UNIMPLEMENTED_FEATURE();
-  return nil;
-}
-
-@end
-
-@implementation ASTextNode (Deprecated)
-
-- (void)setAttributedString:(NSAttributedString *)attributedString
-{
-  self.attributedText = attributedString;
-}
-
-- (NSAttributedString *)attributedString
-{
-  return self.attributedText;
-}
-
-- (void)setTruncationAttributedString:(NSAttributedString *)truncationAttributedString
-{
-  self.truncationAttributedText = truncationAttributedString;
-}
-
-- (NSAttributedString *)truncationAttributedString
-{
-  return self.truncationAttributedText;
-}
-
-@end
-
-#endif
diff --git a/submodules/AsyncDisplayKit/Source/ASTextNode2.h b/submodules/AsyncDisplayKit/Source/ASTextNode2.h
deleted file mode 100644
index 254ce40a7e..0000000000
--- a/submodules/AsyncDisplayKit/Source/ASTextNode2.h
+++ /dev/null
@@ -1,242 +0,0 @@
-//
-//  ASTextNode2.h
-//  Texture
-//
-//  Copyright (c) Pinterest, Inc.  All rights reserved.
-//  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
-//
-
-#import <AsyncDisplayKit/ASControlNode.h>
-#import <AsyncDisplayKit/ASDisplayNode+Beta.h>
-#import <AsyncDisplayKit/ASTextNodeCommon.h>
-
-@protocol ASTextLinePositionModifier;
-
-NS_ASSUME_NONNULL_BEGIN
-
-/**
- @abstract Draws interactive rich text.
- @discussion Backed by the code in TextExperiment folder, on top of CoreText.
- */
-#if AS_ENABLE_TEXTNODE
-@interface ASTextNode2 : ASControlNode
-#else
-@interface ASTextNode : ASControlNode
-#endif
-
-/**
- @abstract The styled text displayed by the node.
- @discussion Defaults to nil, no text is shown.
- For inline image attachments, add an attribute of key NSAttachmentAttributeName, with a value of an NSTextAttachment.
- */
-@property (nullable, copy) NSAttributedString *attributedText;
-
-#pragma mark - Truncation
-
-/**
- @abstract The attributedText to use when the text must be truncated.
- @discussion Defaults to a localized ellipsis character.
- */
-@property (nullable, copy) NSAttributedString *truncationAttributedText;
-
-/**
- @summary The second attributed string appended for truncation.
- @discussion This string will be highlighted on touches.
- @default nil
- */
-@property (nullable, copy) NSAttributedString *additionalTruncationMessage;
-
-/**
- @abstract Determines how the text is truncated to fit within the receiver's maximum size.
- @discussion Defaults to NSLineBreakByWordWrapping.
- @note Setting a truncationMode in attributedString will override the truncation mode set here.
- */
-@property NSLineBreakMode truncationMode;
-
-/**
- @abstract If the text node is truncated. Text must have been sized first.
- */
-@property (readonly, getter=isTruncated) BOOL truncated;
-
-/**
- @abstract The maximum number of lines to render of the text before truncation.
- @default 0 (No limit)
- */
-@property NSUInteger maximumNumberOfLines;
-
-/**
- @abstract The number of lines in the text. Text must have been sized first.
- */
-@property (readonly) NSUInteger lineCount;
-
-/**
- * An array of path objects representing the regions where text should not be displayed.
- *
- * @discussion The default value of this property is an empty array. You can
- * assign an array of UIBezierPath objects to exclude text from one or more regions in
- * the text node's bounds. You can use this property to have text wrap around images,
- * shapes or other text like a fancy magazine.
- */
-@property (nullable, copy) NSArray<UIBezierPath *> *exclusionPaths;
-
-#pragma mark - Placeholders
-
-/**
- * @abstract ASTextNode has a special placeholder behavior when placeholderEnabled is YES.
- *
- * @discussion Defaults to NO.  When YES, it draws rectangles for each line of text,
- * following the true shape of the text's wrapping.  This visually mirrors the overall
- * shape and weight of paragraphs, making the appearance of the finished text less jarring.
- */
-@property BOOL placeholderEnabled;
-
-/**
- @abstract The placeholder color.
- */
-@property (nullable, copy) UIColor *placeholderColor;
-
-/**
- @abstract Inset each line of the placeholder.
- */
-@property UIEdgeInsets placeholderInsets;
-
-#pragma mark - Shadow
-
-/**
- @abstract When you set these ASDisplayNode properties, they are composited into the bitmap instead of being applied by CA.
- 
- @property (nonatomic) CGColorRef shadowColor;
- @property (nonatomic) CGFloat    shadowOpacity;
- @property (nonatomic) CGSize     shadowOffset;
- @property (nonatomic) CGFloat    shadowRadius;
- */
-
-/**
- @abstract The number of pixels used for shadow padding on each side of the receiver.
- @discussion Each inset will be less than or equal to zero, so that applying
- UIEdgeInsetsRect(boundingRectForText, shadowPadding)
- will return a CGRect large enough to fit both the text and the appropriate shadow padding.
- */
-@property (nonatomic, readonly) UIEdgeInsets shadowPadding;
-
-#pragma mark - Positioning
-
-/**
- @abstract Returns an array of rects bounding the characters in a given text range.
- @param textRange A range of text. Must be valid for the receiver's string.
- @discussion Use this method to detect all the different rectangles a given range of text occupies.
- The rects returned are not guaranteed to be contiguous (for example, if the given text range spans
- a line break, the rects returned will be on opposite sides and different lines). The rects returned
- are in the coordinate system of the receiver.
- */
-- (NSArray<NSValue *> *)rectsForTextRange:(NSRange)textRange AS_WARN_UNUSED_RESULT;
-
-/**
- @abstract Returns an array of rects used for highlighting the characters in a given text range.
- @param textRange A range of text. Must be valid for the receiver's string.
- @discussion Use this method to detect all the different rectangles the highlights of a given range of text occupies.
- The rects returned are not guaranteed to be contiguous (for example, if the given text range spans
- a line break, the rects returned will be on opposite sides and different lines). The rects returned
- are in the coordinate system of the receiver. This method is useful for visual coordination with a
- highlighted range of text.
- */
-- (NSArray<NSValue *> *)highlightRectsForTextRange:(NSRange)textRange AS_WARN_UNUSED_RESULT;
-
-/**
- @abstract Returns a bounding rect for the given text range.
- @param textRange A range of text. Must be valid for the receiver's string.
- @discussion The height of the frame returned is that of the receiver's line-height; adjustment for
- cap-height and descenders is not performed. This method raises an exception if textRange is not
- a valid substring range of the receiver's string.
- */
-- (CGRect)frameForTextRange:(NSRange)textRange AS_WARN_UNUSED_RESULT;
-
-/**
- @abstract Returns the trailing rectangle of space in the receiver, after the final character.
- @discussion Use this method to detect which portion of the receiver is not occupied by characters.
- The rect returned is in the coordinate system of the receiver.
- */
-- (CGRect)trailingRect AS_WARN_UNUSED_RESULT;
-
-
-#pragma mark - Actions
-
-/**
- @abstract The set of attribute names to consider links.  Defaults to NSLinkAttributeName.
- */
-@property (nonatomic, copy) NSArray<NSString *> *linkAttributeNames;
-
-/**
- @abstract Indicates whether the receiver has an entity at a given point.
- @param point The point, in the receiver's coordinate system.
- @param attributeNameOut The name of the attribute at the point. Can be NULL.
- @param rangeOut The ultimate range of the found text. Can be NULL.
- @result YES if an entity exists at `point`; NO otherwise.
- */
-- (nullable id)linkAttributeValueAtPoint:(CGPoint)point attributeName:(out NSString * _Nullable * _Nullable)attributeNameOut range:(out NSRange * _Nullable)rangeOut AS_WARN_UNUSED_RESULT;
-
-/**
- @abstract The style to use when highlighting text.
- */
-@property (nonatomic) ASTextNodeHighlightStyle highlightStyle;
-
-/**
- @abstract The range of text highlighted by the receiver. Changes to this property are not animated by default.
- */
-@property (nonatomic) NSRange highlightRange;
-
-/**
- @abstract Set the range of text to highlight, with optional animation.
- 
- @param highlightRange The range of text to highlight.
- 
- @param animated Whether the text should be highlighted with an animation.
- */
-- (void)setHighlightRange:(NSRange)highlightRange animated:(BOOL)animated;
-
-/**
- @abstract Responds to actions from links in the text node.
- @discussion The delegate must be set before the node is loaded, and implement
- textNode:longPressedLinkAttribute:value:atPoint:textRange: in order for
- the long press gesture recognizer to be installed.
- */
-@property (weak) id<ASTextNodeDelegate> delegate;
-
-/**
- @abstract If YES and a long press is recognized, touches are cancelled. Default is NO
- */
-@property (nonatomic) BOOL longPressCancelsTouches;
-
-/**
- @abstract if YES will not intercept touches for non-link areas of the text. Default is NO.
- */
-@property (nonatomic) BOOL passthroughNonlinkTouches;
-
-+ (void)enableDebugging;
-
-#pragma mark - Layout and Sizing
-
-@property (nullable, nonatomic) id<ASTextLinePositionModifier> textContainerLinePositionModifier;
-
-@end
-
-#if AS_ENABLE_TEXTNODE
-@interface ASTextNode2 (Unavailable)
-#else
-@interface ASTextNode (Unavailable)
-#endif
-
-- (instancetype)initWithLayerBlock:(ASDisplayNodeLayerBlock)viewBlock didLoadBlock:(nullable ASDisplayNodeDidLoadBlock)didLoadBlock NS_UNAVAILABLE;
-
-- (instancetype)initWithViewBlock:(ASDisplayNodeViewBlock)viewBlock didLoadBlock:(nullable ASDisplayNodeDidLoadBlock)didLoadBlock NS_UNAVAILABLE;
-
-@end
-
-#if (!AS_ENABLE_TEXTNODE)
-// For the time beeing remap ASTextNode2 to ASTextNode
-#define ASTextNode2 ASTextNode
-#endif
-
-NS_ASSUME_NONNULL_END
-
-
diff --git a/submodules/AsyncDisplayKit/Source/ASTextNode2.mm b/submodules/AsyncDisplayKit/Source/ASTextNode2.mm
deleted file mode 100644
index 7fa844ba1d..0000000000
--- a/submodules/AsyncDisplayKit/Source/ASTextNode2.mm
+++ /dev/null
@@ -1,1333 +0,0 @@
-//
-//  ASTextNode2.mm
-//  Texture
-//
-//  Copyright (c) Pinterest, Inc.  All rights reserved.
-//  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
-//
-
-#import <AsyncDisplayKit/ASTextNode2.h>
-#import <AsyncDisplayKit/ASTextNode.h>  // Definition of ASTextNodeDelegate
-
-#import <tgmath.h>
-#import <deque>
-
-#import <AsyncDisplayKit/_ASDisplayLayer.h>
-#import <AsyncDisplayKit/ASDisplayNode+FrameworkPrivate.h>
-#import <AsyncDisplayKit/ASDisplayNode+Subclasses.h>
-#import <AsyncDisplayKit/ASDisplayNodeExtras.h>
-#import <AsyncDisplayKit/ASDisplayNodeInternal.h>
-#import <AsyncDisplayKit/ASHighlightOverlayLayer.h>
-
-#import <AsyncDisplayKit/ASTextKitRenderer+Positioning.h>
-#import <AsyncDisplayKit/ASTextKitShadower.h>
-#import <AsyncDisplayKit/ASEqualityHelpers.h>
-
-#import <AsyncDisplayKit/ASInternalHelpers.h>
-
-#import <AsyncDisplayKit/CoreGraphics+ASConvenience.h>
-#import <AsyncDisplayKit/ASObjectDescriptionHelpers.h>
-#import <AsyncDisplayKit/ASTextLayout.h>
-#import <AsyncDisplayKit/ASThread.h>
-
-@interface ASTextCacheValue : NSObject {
-  @package
-  AS::Mutex _m;
-  std::deque<std::tuple<CGSize, ASTextLayout *>> _layouts;
-}
-@end
-@implementation ASTextCacheValue
-@end
-
-/**
- * If set, we will record all values set to attributedText into an array
- * and once we get 2000, we'll write them all out into a plist file.
- *
- * This is useful for gathering realistic text data sets from apps for performance
- * testing.
- */
-#define AS_TEXTNODE2_RECORD_ATTRIBUTED_STRINGS 0
-
-/**
- * If it can't find a compatible layout, this method creates one.
- *
- * NOTE: Be careful to copy `text` if needed.
- */
-static NS_RETURNS_RETAINED ASTextLayout *ASTextNodeCompatibleLayoutWithContainerAndText(ASTextContainer *container, NSAttributedString *text)  {
-  static dispatch_once_t onceToken;
-  static AS::Mutex *layoutCacheLock;
-  static NSCache<NSAttributedString *, ASTextCacheValue *> *textLayoutCache;
-  dispatch_once(&onceToken, ^{
-    layoutCacheLock = new AS::Mutex();
-    textLayoutCache = [[NSCache alloc] init];
-  });
-
-  layoutCacheLock->lock();
-
-  ASTextCacheValue *cacheValue = [textLayoutCache objectForKey:text];
-  if (cacheValue == nil) {
-    cacheValue = [[ASTextCacheValue alloc] init];
-    [textLayoutCache setObject:cacheValue forKey:[text copy]];
-  }
-
-  // Lock the cache item for the rest of the method. Only after acquiring can we release the NSCache.
-  AS::MutexLocker lock(cacheValue->_m);
-  layoutCacheLock->unlock();
-
-  CGRect containerBounds = (CGRect){ .size = container.size };
-  {
-    for (const auto &t : cacheValue->_layouts) {
-      CGSize constrainedSize = std::get<0>(t);
-      ASTextLayout *layout = std::get<1>(t);
-
-      CGSize layoutSize = layout.textBoundingSize;
-      // 1. CoreText can return frames that are narrower than the constrained width, for obvious reasons.
-      // 2. CoreText can return frames that are slightly wider than the constrained width, for some reason.
-      //    We have to trust that somehow it's OK to try and draw within our size constraint, despite the return value.
-      // 3. Thus, those two values (constrained width & returned width) form a range, where
-      //    intermediate values in that range will be snapped. Thus, we can use a given layout as long as our
-      //    width is in that range, between the min and max of those two values.
-      CGRect minRect = CGRectMake(0, 0, MIN(layoutSize.width, constrainedSize.width), MIN(layoutSize.height, constrainedSize.height));
-      if (!CGRectContainsRect(containerBounds, minRect)) {
-        continue;
-      }
-      CGRect maxRect = CGRectMake(0, 0, MAX(layoutSize.width, constrainedSize.width), MAX(layoutSize.height, constrainedSize.height));
-      if (!CGRectContainsRect(maxRect, containerBounds)) {
-        continue;
-      }
-      if (!CGSizeEqualToSize(container.size, constrainedSize)) {
-        continue;
-      }
-
-      // Now check container params.
-      ASTextContainer *otherContainer = layout.container;
-      if (!UIEdgeInsetsEqualToEdgeInsets(container.insets, otherContainer.insets)) {
-        continue;
-      }
-      if (!ASObjectIsEqual(container.exclusionPaths, otherContainer.exclusionPaths)) {
-        continue;
-      }
-      if (container.maximumNumberOfRows != otherContainer.maximumNumberOfRows) {
-        continue;
-      }
-      if (container.truncationType != otherContainer.truncationType) {
-        continue;
-      }
-      if (!ASObjectIsEqual(container.truncationToken, otherContainer.truncationToken)) {
-        continue;
-      }
-      // TODO: When we get a cache hit, move this entry to the front (LRU).
-      return layout;
-    }
-  }
-
-  // Cache Miss. Compute the text layout.
-  ASTextLayout *layout = [ASTextLayout layoutWithContainer:container text:text];
-
-  // Store the result in the cache.
-  {
-    // This is a critical section. However we also must hold the lock until this point, in case
-    // another thread requests this cache item while a layout is being calculated, so they don't race.
-    cacheValue->_layouts.push_front(std::make_tuple(container.size, layout));
-    if (cacheValue->_layouts.size() > 3) {
-      cacheValue->_layouts.pop_back();
-    }
-  }
-
-  return layout;
-}
-
-static const CGFloat ASTextNodeHighlightLightOpacity = 0.11;
-static const CGFloat ASTextNodeHighlightDarkOpacity = 0.22;
-static NSString *ASTextNodeTruncationTokenAttributeName = @"ASTextNodeTruncationAttribute";
-
-#if AS_ENABLE_TEXTNODE
-@interface ASTextNode2 () <UIGestureRecognizerDelegate>
-#else
-@interface ASTextNode () <UIGestureRecognizerDelegate>
-#endif
-
-@end
-
-#if AS_ENABLE_TEXTNODE
-@implementation ASTextNode2 {
-#else
-@implementation ASTextNode {
-#endif
-  ASTextContainer *_textContainer;
-  
-  CGSize _shadowOffset;
-  CGColorRef _shadowColor;
-  CGFloat _shadowOpacity;
-  CGFloat _shadowRadius;
-  
-  NSAttributedString *_attributedText;
-  NSAttributedString *_truncationAttributedText;
-  NSAttributedString *_additionalTruncationMessage;
-  NSAttributedString *_composedTruncationText;
-  NSArray<NSNumber *> *_pointSizeScaleFactors;
-  NSLineBreakMode _truncationMode;
-  
-  NSString *_highlightedLinkAttributeName;
-  id _highlightedLinkAttributeValue;
-  ASTextNodeHighlightStyle _highlightStyle;
-  NSRange _highlightRange;
-  ASHighlightOverlayLayer *_activeHighlightLayer;
-  UIColor *_placeholderColor;
-  
-  UILongPressGestureRecognizer *_longPressGestureRecognizer;
-}
-@dynamic placeholderEnabled;
-
-static NSArray *DefaultLinkAttributeNames() {
-  static NSArray *names;
-  static dispatch_once_t onceToken;
-  dispatch_once(&onceToken, ^{
-    names = @[ NSLinkAttributeName ];
-  });
-  return names;
-}
-
-- (instancetype)init
-{
-  if (self = [super init]) {
-    _textContainer = [[ASTextContainer alloc] init];
-    // Load default values from superclass.
-    _shadowOffset = [super shadowOffset];
-    _shadowColor = CGColorRetain([super shadowColor]);
-    _shadowOpacity = [super shadowOpacity];
-    _shadowRadius = [super shadowRadius];
-    
-    // Disable user interaction for text node by default.
-    self.userInteractionEnabled = NO;
-    self.needsDisplayOnBoundsChange = YES;
-    
-    _textContainer.truncationType = ASTextTruncationTypeEnd;
-    
-    // The common case is for a text node to be non-opaque and blended over some background.
-    self.opaque = NO;
-    self.backgroundColor = [UIColor clearColor];
-
-    self.linkAttributeNames = DefaultLinkAttributeNames();
-
-    // Accessibility
-    self.isAccessibilityElement = YES;
-    self.accessibilityTraits = self.defaultAccessibilityTraits;
-    
-    // Placeholders
-    // Disabled by default in ASDisplayNode, but add a few options for those who toggle
-    // on the special placeholder behavior of ASTextNode.
-    _placeholderColor = ASDisplayNodeDefaultPlaceholderColor();
-    _placeholderInsets = UIEdgeInsetsMake(1.0, 0.0, 1.0, 0.0);
-  }
-  
-  return self;
-}
-
-- (void)dealloc
-{
-  CGColorRelease(_shadowColor);
-  
-  if (_longPressGestureRecognizer) {
-    _longPressGestureRecognizer.delegate = nil;
-    [_longPressGestureRecognizer removeTarget:nil action:NULL];
-    [self.view removeGestureRecognizer:_longPressGestureRecognizer];
-  }
-}
-
-#pragma mark - Description
-
-- (NSString *)_plainStringForDescription
-{
-  NSString *plainString = [[self.attributedText string] stringByTrimmingCharactersInSet:[NSCharacterSet newlineCharacterSet]];
-  if (plainString.length > 50) {
-    plainString = [[plainString substringToIndex:50] stringByAppendingString:@"…"];
-  }
-  return plainString;
-}
-
-- (NSMutableArray<NSDictionary *> *)propertiesForDescription
-{
-  NSMutableArray *result = [super propertiesForDescription];
-  NSString *plainString = [self _plainStringForDescription];
-  if (plainString.length > 0) {
-    [result insertObject:@{ @"text" : ASStringWithQuotesIfMultiword(plainString) } atIndex:0];
-  }
-  return result;
-}
-
-- (NSMutableArray<NSDictionary *> *)propertiesForDebugDescription
-{
-  NSMutableArray *result = [super propertiesForDebugDescription];
-  NSString *plainString = [self _plainStringForDescription];
-  if (plainString.length > 0) {
-    [result insertObject:@{ @"text" : ASStringWithQuotesIfMultiword(plainString) } atIndex:0];
-  }
-  return result;
-}
-
-#pragma mark - ASDisplayNode
-
-- (void)didLoad
-{
-  [super didLoad];
-  
-  // If we are view-backed and the delegate cares, support the long-press callback.
-  // Locking is not needed, as all instance variables used are main-thread-only.
-  SEL longPressCallback = @selector(textNode:longPressedLinkAttribute:value:atPoint:textRange:);
-  if (!self.isLayerBacked && [self.delegate respondsToSelector:longPressCallback]) {
-    _longPressGestureRecognizer = [[UILongPressGestureRecognizer alloc] initWithTarget:self action:@selector(_handleLongPress:)];
-    _longPressGestureRecognizer.cancelsTouchesInView = self.longPressCancelsTouches;
-    _longPressGestureRecognizer.delegate = self;
-    [self.view addGestureRecognizer:_longPressGestureRecognizer];
-  }
-}
-
-- (BOOL)supportsLayerBacking
-{
-  if (!super.supportsLayerBacking) {
-    return NO;
-  }
-
-  ASLockScopeSelf();
-  // If the text contains any links, return NO.
-  NSAttributedString *attributedText = _attributedText;
-  NSRange range = NSMakeRange(0, attributedText.length);
-  for (NSString *linkAttributeName in _linkAttributeNames) {
-    __block BOOL hasLink = NO;
-    [attributedText enumerateAttribute:linkAttributeName inRange:range options:NSAttributedStringEnumerationLongestEffectiveRangeNotRequired usingBlock:^(id  _Nullable value, NSRange range, BOOL * _Nonnull stop) {
-      hasLink = (value != nil);
-      *stop = YES;
-    }];
-    if (hasLink) {
-      return NO;
-    }
-  }
-  return YES;
-}
-
-- (NSString *)defaultAccessibilityLabel
-{
-  ASLockScopeSelf();
-  return _attributedText.string;
-}
-
-- (UIAccessibilityTraits)defaultAccessibilityTraits
-{
-  return UIAccessibilityTraitStaticText;
-}
-
-#pragma mark - Layout and Sizing
-
-- (void)setTextContainerInset:(UIEdgeInsets)textContainerInset
-{
-  ASLockScopeSelf();
-  if (ASCompareAssignCustom(_textContainer.insets, textContainerInset, UIEdgeInsetsEqualToEdgeInsets)) {
-    [self setNeedsLayout];
-  }
-}
-
-- (UIEdgeInsets)textContainerInset
-{
-  // textContainer is invariant and has an atomic accessor.
-  return _textContainer.insets;
-}
-
-- (void)setTextContainerLinePositionModifier:(id<ASTextLinePositionModifier>)modifier
-{
-  ASLockedSelfCompareAssignObjects(_textContainer.linePositionModifier, modifier);
-}
-
-- (id<ASTextLinePositionModifier>)textContainerLinePositionModifier
-{
-  ASLockScopeSelf();
-  return _textContainer.linePositionModifier;
-}
-
-- (CGSize)calculateSizeThatFits:(CGSize)constrainedSize
-{
-  ASDisplayNodeAssert(constrainedSize.width >= 0, @"Constrained width for text (%f) is too  narrow", constrainedSize.width);
-  ASDisplayNodeAssert(constrainedSize.height >= 0, @"Constrained height for text (%f) is too short", constrainedSize.height);
-
-  ASLockScopeSelf();
-
-  _textContainer.size = constrainedSize;
-  [self _ensureTruncationText];
-
-  // If the constrained size has a max/inf value on the text's forward direction, the text node is calculating its intrinsic size.
-  // Need to consider both width and height when determining if it is calculating instrinsic size. Even the constrained width is provided, the height can be inf
-  // it may provide a text that is longer than the width and require a wordWrapping line break mode and looking for the height to be calculated.
-  BOOL isCalculatingIntrinsicSize = (_textContainer.size.width >= ASTextContainerMaxSize.width) || (_textContainer.size.height >= ASTextContainerMaxSize.height);
-
-  NSMutableAttributedString *mutableText = [_attributedText mutableCopy];
-  [self prepareAttributedString:mutableText isForIntrinsicSize:isCalculatingIntrinsicSize];
-  ASTextLayout *layout = ASTextNodeCompatibleLayoutWithContainerAndText(_textContainer, mutableText);
-  if (layout.truncatedLine != nil && layout.truncatedLine.size.width > layout.textBoundingSize.width) {
-    return (CGSize) {MIN(constrainedSize.width, layout.truncatedLine.size.width), layout.textBoundingSize.height};
-  }
-
-  return layout.textBoundingSize;
-}
-
-#pragma mark - Modifying User Text
-
-// Returns the ascender of the first character in attributedString by also including the line height if specified in paragraph style.
-+ (CGFloat)ascenderWithAttributedString:(NSAttributedString *)attributedString
-{
-  UIFont *font = [attributedString attribute:NSFontAttributeName atIndex:0 effectiveRange:NULL];
-  NSParagraphStyle *paragraphStyle = [attributedString attribute:NSParagraphStyleAttributeName atIndex:0 effectiveRange:NULL];
-  if (!paragraphStyle) {
-    return font.ascender;
-  }
-  CGFloat lineHeight = MAX(font.lineHeight, paragraphStyle.minimumLineHeight);
-  if (paragraphStyle.maximumLineHeight > 0) {
-    lineHeight = MIN(lineHeight, paragraphStyle.maximumLineHeight);
-  }
-  return lineHeight + font.descender;
-}
-
-- (NSAttributedString *)attributedText
-{
-  ASLockScopeSelf();
-  return _attributedText;
-}
-
-- (void)setAttributedText:(NSAttributedString *)attributedText
-{
-  if (attributedText == nil) {
-    attributedText = [[NSAttributedString alloc] initWithString:@"" attributes:nil];
-  }
-
-  // Many accessors in this method will acquire the lock (including ASDisplayNode methods).
-  // Holding it for the duration of the method is more efficient in this case.
-  ASLockScopeSelf();
-
-  if (!ASCompareAssignCopy(_attributedText, attributedText)) {
-    return;
-  }
-
-  // Since truncation text matches style of attributedText, invalidate it now.
-  [self _locked_invalidateTruncationText];
-
-  NSUInteger length = attributedText.length;
-  if (length > 0) {
-    ASLayoutElementStyle *style = [self _locked_style];
-    style.ascender = [[self class] ascenderWithAttributedString:attributedText];
-    style.descender = [[attributedText attribute:NSFontAttributeName atIndex:attributedText.length - 1 effectiveRange:NULL] descender];
-  }
-  
-  // Tell the display node superclasses that the cached layout is incorrect now
-  [self setNeedsLayout];
-  
-  // Force display to create renderer with new size and redisplay with new string
-  [self setNeedsDisplay];
-
-  // Accessiblity
-  self.accessibilityLabel = self.defaultAccessibilityLabel;
-  self.isAccessibilityElement = (length != 0); // We're an accessibility element by default if there is a string.
-
-#if AS_TEXTNODE2_RECORD_ATTRIBUTED_STRINGS
-  [ASTextNode _registerAttributedText:_attributedText];
-#endif
-}
-
-#pragma mark - Text Layout
-
-- (void)setExclusionPaths:(NSArray *)exclusionPaths
-{
-  ASLockScopeSelf();
-  _textContainer.exclusionPaths = exclusionPaths;
-  
-  [self setNeedsLayout];
-  [self setNeedsDisplay];
-}
-
-- (NSArray *)exclusionPaths
-{
-  ASLockScopeSelf();
-  return _textContainer.exclusionPaths;
-}
-
-- (void)prepareAttributedString:(NSMutableAttributedString *)attributedString isForIntrinsicSize:(BOOL)isForIntrinsicSize
-{
-  ASLockScopeSelf();
-  NSLineBreakMode innerMode;
-  switch (_truncationMode) {
-    case NSLineBreakByWordWrapping:
-    case NSLineBreakByCharWrapping:
-    case NSLineBreakByClipping:
-      innerMode = _truncationMode;
-      break;
-    default:
-      innerMode = NSLineBreakByWordWrapping;
-  }
-
-  // Apply/Fix paragraph style if needed
-  [attributedString enumerateAttribute:NSParagraphStyleAttributeName inRange:NSMakeRange(0, attributedString.length) options:kNilOptions usingBlock:^(NSParagraphStyle *style, NSRange range, BOOL * _Nonnull stop) {
-
-    BOOL applyTruncationMode = YES;
-    NSMutableParagraphStyle *paragraphStyle = nil;
-    // Only "left" and "justified" alignments are supported while calculating intrinsic size.
-    // Other alignments like "right", "center" and "natural" cause the size to be bigger than needed and thus should be ignored/overridden.
-    const BOOL forceLeftAlignment = (style != nil
-                                     && isForIntrinsicSize
-                                     && style.alignment != NSTextAlignmentLeft
-                                     && style.alignment != NSTextAlignmentJustified);
-    if (style != nil) {
-      if (innerMode == style.lineBreakMode) {
-        applyTruncationMode = NO;
-      }
-      paragraphStyle = [style mutableCopy];
-    } else {
-      if (innerMode == NSLineBreakByWordWrapping) {
-        applyTruncationMode = NO;
-      }
-      paragraphStyle = [NSMutableParagraphStyle new];
-    }
-    if (!applyTruncationMode && !forceLeftAlignment) {
-      return;
-    }
-    paragraphStyle.lineBreakMode = innerMode;
-
-    if (applyTruncationMode) {
-      paragraphStyle.lineBreakMode = _truncationMode;
-    }
-    if (forceLeftAlignment) {
-      paragraphStyle.alignment = NSTextAlignmentLeft;
-    }
-    [attributedString addAttribute:NSParagraphStyleAttributeName value:paragraphStyle range:range];
-  }];
-
-  // Apply shadow if needed
-  if (_shadowOpacity > 0 && (_shadowRadius != 0 || !CGSizeEqualToSize(_shadowOffset, CGSizeZero)) && CGColorGetAlpha(_shadowColor) > 0) {
-    NSShadow *shadow = [[NSShadow alloc] init];
-    if (_shadowOpacity != 1) {
-      CGColorRef shadowColorRef = CGColorCreateCopyWithAlpha(_shadowColor, _shadowOpacity * CGColorGetAlpha(_shadowColor));
-      shadow.shadowColor = [UIColor colorWithCGColor:shadowColorRef];
-      CGColorRelease(shadowColorRef);
-    } else {
-      shadow.shadowColor = [UIColor colorWithCGColor:_shadowColor];
-    }
-    shadow.shadowOffset = _shadowOffset;
-    shadow.shadowBlurRadius = _shadowRadius;
-    [attributedString addAttribute:NSShadowAttributeName value:shadow range:NSMakeRange(0, attributedString.length)];
-  }
-}
-
-#pragma mark - Drawing
-
-- (NSObject *)drawParametersForAsyncLayer:(_ASDisplayLayer *)layer
-{
-  ASLockScopeSelf();
-  [self _ensureTruncationText];
-
-  // Unlike layout, here we must copy the container since drawing is asynchronous.
-  ASTextContainer *copiedContainer = [_textContainer copy];
-  copiedContainer.size = self.bounds.size;
-  [copiedContainer makeImmutable];
-  NSMutableAttributedString *mutableText = [_attributedText mutableCopy] ?: [[NSMutableAttributedString alloc] init];
-
-  [self prepareAttributedString:mutableText isForIntrinsicSize:NO];
-  
-  return @{
-    @"container": copiedContainer,
-    @"text": mutableText,
-    @"bgColor": self.backgroundColor ?: [NSNull null]
-  };
-}
-
-+ (void)drawRect:(CGRect)bounds withParameters:(NSDictionary *)layoutDict isCancelled:(NS_NOESCAPE asdisplaynode_iscancelled_block_t)isCancelledBlock isRasterizing:(BOOL)isRasterizing
-{
-  ASTextContainer *container = layoutDict[@"container"];
-  NSAttributedString *text = layoutDict[@"text"];
-  UIColor *bgColor = layoutDict[@"bgColor"];
-  ASTextLayout *layout = ASTextNodeCompatibleLayoutWithContainerAndText(container, text);
-  
-  if (isCancelledBlock()) {
-    return;
-  }
-  
-  // Fill background color.
-  if (bgColor == (id)[NSNull null]) {
-    bgColor = nil;
-  }
-
-  // They may have already drawn into this context in the pre-context block
-  // so unfortunately we have to use the normal blend mode, not copy.
-  if (bgColor && CGColorGetAlpha(bgColor.CGColor) > 0) {
-    [bgColor setFill];
-    UIRectFillUsingBlendMode(bounds, kCGBlendModeNormal);
-  }
-  
-  CGContextRef context = UIGraphicsGetCurrentContext();
-  ASDisplayNodeAssert(context, @"This is no good without a context.");
-  
-  [layout drawInContext:context size:bounds.size point:bounds.origin view:nil layer:nil debug:[ASTextDebugOption sharedDebugOption] cancel:isCancelledBlock];
-}
-
-#pragma mark - Attributes
-
-- (id)linkAttributeValueAtPoint:(CGPoint)point
-                  attributeName:(out NSString **)attributeNameOut
-                          range:(out NSRange *)rangeOut
-{
-  return [self _linkAttributeValueAtPoint:point
-                            attributeName:attributeNameOut
-                                    range:rangeOut
-            inAdditionalTruncationMessage:NULL
-                          forHighlighting:NO];
-}
-
-- (id)_linkAttributeValueAtPoint:(CGPoint)point
-                   attributeName:(out NSString **)attributeNameOut
-                           range:(out NSRange *)rangeOut
-   inAdditionalTruncationMessage:(out BOOL *)inAdditionalTruncationMessageOut
-                 forHighlighting:(BOOL)highlighting
-{
-  ASLockScopeSelf();
-
-  // TODO: The copy and application of size shouldn't be required, but it is currently.
-  // See discussion in https://github.com/TextureGroup/Texture/pull/396
-  ASTextContainer *containerCopy = [_textContainer copy];
-  containerCopy.size = self.calculatedSize;
-  ASTextLayout *layout = ASTextNodeCompatibleLayoutWithContainerAndText(containerCopy, _attributedText);
-
-  if ([self _locked_pointInsideAdditionalTruncationMessage:point withLayout:layout]) {
-    if (inAdditionalTruncationMessageOut != NULL) {
-      *inAdditionalTruncationMessageOut = YES;
-    }
-    return nil;
-  }
-
-  NSRange visibleRange = layout.visibleRange;
-  NSRange clampedRange = NSIntersectionRange(visibleRange, NSMakeRange(0, _attributedText.length));
-  
-  // Search the 9 points of a 44x44 square around the touch until we find a link.
-  // Start from center, then do sides, then do top/bottom, then do corners.
-  static constexpr CGSize kRectOffsets[9] = {
-    { 0, 0 },
-    { -22, 0 }, { 22, 0 },
-    { 0, -22 }, { 0, 22 },
-    { -22, -22 }, { -22, 22 },
-    { 22, -22 }, { 22, 22 }
-  };
-
-  for (const CGSize &offset : kRectOffsets) {
-    const CGPoint testPoint = CGPointMake(point.x + offset.width,
-                                          point.y + offset.height);
-    ASTextPosition *pos = [layout closestPositionToPoint:testPoint];
-    if (!pos || !NSLocationInRange(pos.offset, clampedRange)) {
-      continue;
-    }
-    for (NSString *attributeName in _linkAttributeNames) {
-      NSRange effectiveRange = NSMakeRange(0, 0);
-      id value = [_attributedText attribute:attributeName atIndex:pos.offset
-                      longestEffectiveRange:&effectiveRange inRange:clampedRange];
-      if (value == nil) {
-        // Didn't find any links specified with this attribute.
-        continue;
-      }
-
-      // If highlighting, check with delegate first. If not implemented, assume YES.
-      if (highlighting
-          && [_delegate respondsToSelector:@selector(textNode:shouldHighlightLinkAttribute:value:atPoint:)]
-          && ![_delegate textNode:(ASTextNode *)self shouldHighlightLinkAttribute:attributeName
-                            value:value atPoint:point]) {
-        continue;
-      }
-
-      *rangeOut = NSIntersectionRange(visibleRange, effectiveRange);
-
-      if (attributeNameOut != NULL) {
-        *attributeNameOut = attributeName;
-      }
-
-      return value;
-    }
-  }
-
-  return nil;
-}
-
-- (BOOL)_locked_pointInsideAdditionalTruncationMessage:(CGPoint)point withLayout:(ASTextLayout *)layout
-{
-  // Check if the range is within the additional truncation range
-  BOOL inAdditionalTruncationMessage = NO;
-  
-  CTLineRef truncatedCTLine = layout.truncatedLine.CTLine;
-  if (truncatedCTLine != NULL && _additionalTruncationMessage != nil) {
-    CFIndex stringIndexForPosition = CTLineGetStringIndexForPosition(truncatedCTLine, point);
-    if (stringIndexForPosition != kCFNotFound) {
-      CFIndex truncatedCTLineGlyphCount = CTLineGetGlyphCount(truncatedCTLine);
-      
-      CTLineRef truncationTokenLine = CTLineCreateWithAttributedString((CFAttributedStringRef)_truncationAttributedText);
-      CFIndex truncationTokenLineGlyphCount = truncationTokenLine ? CTLineGetGlyphCount(truncationTokenLine) : 0;
-      CFRelease(truncationTokenLine);
-      
-      CTLineRef additionalTruncationTokenLine = CTLineCreateWithAttributedString((CFAttributedStringRef)_additionalTruncationMessage);
-      CFIndex additionalTruncationTokenLineGlyphCount = additionalTruncationTokenLine ? CTLineGetGlyphCount(additionalTruncationTokenLine) : 0;   
-      CFRelease(additionalTruncationTokenLine);
-
-      switch (_textContainer.truncationType) {
-        case ASTextTruncationTypeStart: {
-          CFIndex composedTruncationTextLineGlyphCount = truncationTokenLineGlyphCount + additionalTruncationTokenLineGlyphCount;
-          if (stringIndexForPosition > truncationTokenLineGlyphCount &&
-              stringIndexForPosition < composedTruncationTextLineGlyphCount) {
-            inAdditionalTruncationMessage = YES;
-          }      
-          break;
-        }
-        case ASTextTruncationTypeMiddle: {
-          CFIndex composedTruncationTextLineGlyphCount = truncationTokenLineGlyphCount + additionalTruncationTokenLineGlyphCount;
-          CFIndex firstTruncatedTokenIndex = (truncatedCTLineGlyphCount - composedTruncationTextLineGlyphCount) / 2.0;
-          if ((firstTruncatedTokenIndex + truncationTokenLineGlyphCount) < stringIndexForPosition &&
-              stringIndexForPosition < (firstTruncatedTokenIndex + composedTruncationTextLineGlyphCount)) {
-            inAdditionalTruncationMessage = YES;
-          }      
-          break;
-        }
-        case ASTextTruncationTypeEnd: {
-          if (stringIndexForPosition > (truncatedCTLineGlyphCount - additionalTruncationTokenLineGlyphCount)) {
-            inAdditionalTruncationMessage = YES;
-          }
-          break; 
-        }
-        default:
-          // For now, assume that a tap inside this text, but outside the text range is a tap on the
-          // truncation token.
-          if (![layout textRangeAtPoint:point]) {
-            inAdditionalTruncationMessage = YES;
-          }
-          break;
-      }
-    }
-  }
-  
-  return inAdditionalTruncationMessage;
-}
-
-#pragma mark - UIGestureRecognizerDelegate
-
-- (BOOL)gestureRecognizerShouldBegin:(UIGestureRecognizer *)gestureRecognizer
-{
-  ASDisplayNodeAssertMainThread();
-  ASLockScopeSelf(); // Protect usage of _highlight* ivars.
-  
-  if (gestureRecognizer == _longPressGestureRecognizer) {
-    // Don't allow long press on truncation message
-    if ([self _pendingTruncationTap]) {
-      return NO;
-    }
-    
-    // Ask our delegate if a long-press on an attribute is relevant
-    id<ASTextNodeDelegate> delegate = self.delegate;
-    if ([delegate respondsToSelector:@selector(textNode:shouldLongPressLinkAttribute:value:atPoint:)]) {
-      return [delegate textNode:(ASTextNode *)self
-		  shouldLongPressLinkAttribute:_highlightedLinkAttributeName
-                           value:_highlightedLinkAttributeValue
-                         atPoint:[gestureRecognizer locationInView:self.view]];
-    }
-    
-    // Otherwise we are good to go.
-    return YES;
-  }
-  
-  if (([self _pendingLinkTap] || [self _pendingTruncationTap])
-      && [gestureRecognizer isKindOfClass:[UITapGestureRecognizer class]]
-      && CGRectContainsPoint(self.threadSafeBounds, [gestureRecognizer locationInView:self.view])) {
-    return NO;
-  }
-  
-  return [super gestureRecognizerShouldBegin:gestureRecognizer];
-}
-
-#pragma mark - Highlighting
-
-- (ASTextNodeHighlightStyle)highlightStyle
-{
-  ASLockScopeSelf();
-  
-  return _highlightStyle;
-}
-
-- (void)setHighlightStyle:(ASTextNodeHighlightStyle)highlightStyle
-{
-  ASLockScopeSelf();
-  
-  _highlightStyle = highlightStyle;
-}
-
-- (NSRange)highlightRange
-{
-  ASLockScopeSelf();
-
-  return _highlightRange;
-}
-
-- (void)setHighlightRange:(NSRange)highlightRange
-{
-  [self setHighlightRange:highlightRange animated:NO];
-}
-
-- (void)setHighlightRange:(NSRange)highlightRange animated:(BOOL)animated
-{
-  [self _setHighlightRange:highlightRange forAttributeName:nil value:nil animated:animated];
-}
-
-- (void)_setHighlightRange:(NSRange)highlightRange forAttributeName:(NSString *)highlightedAttributeName value:(id)highlightedAttributeValue animated:(BOOL)animated
-{
-  ASLockScopeSelf(); // Protect usage of _highlight* ivars.
-
-  // Set these so that link tapping works.
-  _highlightedLinkAttributeName = highlightedAttributeName;
-  _highlightedLinkAttributeValue = highlightedAttributeValue;
-  _highlightRange = highlightRange;
-
-  AS_TEXT_ALERT_UNIMPLEMENTED_FEATURE();
-  // Much of the code from original ASTextNode is probably usable here.
-
-  return;
-}
-
-- (void)_clearHighlightIfNecessary
-{
-  ASDisplayNodeAssertMainThread();
-  
-  if ([self _pendingLinkTap] || [self _pendingTruncationTap]) {
-    [self setHighlightRange:NSMakeRange(0, 0) animated:YES];
-  }
-}
-
-+ (CGColorRef)_highlightColorForStyle:(ASTextNodeHighlightStyle)style
-{
-  return [UIColor colorWithWhite:(style == ASTextNodeHighlightStyleLight ? 0.0 : 1.0) alpha:1.0].CGColor;
-}
-
-+ (CGFloat)_highlightOpacityForStyle:(ASTextNodeHighlightStyle)style
-{
-  return (style == ASTextNodeHighlightStyleLight) ? ASTextNodeHighlightLightOpacity : ASTextNodeHighlightDarkOpacity;
-}
-
-#pragma mark - Text rects
-
-- (NSArray *)rectsForTextRange:(NSRange)textRange
-{
-  AS_TEXT_ALERT_UNIMPLEMENTED_FEATURE();
-  return @[];
-}
-
-- (NSArray *)highlightRectsForTextRange:(NSRange)textRange
-{
-  AS_TEXT_ALERT_UNIMPLEMENTED_FEATURE();
-  return @[];
-}
-
-- (CGRect)trailingRect
-{
-  AS_TEXT_ALERT_UNIMPLEMENTED_FEATURE();
-  return CGRectZero;
-}
-
-- (CGRect)frameForTextRange:(NSRange)textRange
-{
-  AS_TEXT_ALERT_UNIMPLEMENTED_FEATURE();
-  return CGRectZero;
-}
-
-#pragma mark - Placeholders
-
-- (UIColor *)placeholderColor
-{
-  return ASLockedSelf(_placeholderColor);
-}
-
-- (void)setPlaceholderColor:(UIColor *)placeholderColor
-{
-  ASLockScopeSelf();
-  if (ASCompareAssignCopy(_placeholderColor, placeholderColor)) {
-    self.placeholderEnabled = CGColorGetAlpha(placeholderColor.CGColor) > 0;
-  }
-}
-
-- (UIImage *)placeholderImage
-{
-  AS_TEXT_ALERT_UNIMPLEMENTED_FEATURE();
-  return nil;
-}
-
-#pragma mark - Touch Handling
-
-- (BOOL)pointInside:(CGPoint)point withEvent:(UIEvent *)event
-{
-  ASDisplayNodeAssertMainThread();
-  
-  if (!_passthroughNonlinkTouches) {
-    return [super pointInside:point withEvent:event];
-  }
-  
-  NSRange range = NSMakeRange(0, 0);
-  NSString *linkAttributeName = nil;
-  BOOL inAdditionalTruncationMessage = NO;
-  
-  id linkAttributeValue = [self _linkAttributeValueAtPoint:point
-                                             attributeName:&linkAttributeName
-                                                     range:&range
-                             inAdditionalTruncationMessage:&inAdditionalTruncationMessage
-                                           forHighlighting:YES];
-  
-  NSUInteger lastCharIndex = NSIntegerMax;
-  BOOL linkCrossesVisibleRange = (lastCharIndex > range.location) && (lastCharIndex < NSMaxRange(range) - 1);
-  
-  if (range.length > 0 && !linkCrossesVisibleRange && linkAttributeValue != nil && linkAttributeName != nil) {
-    return YES;
-  } else {
-    return NO;
-  }
-}
-
-- (void)touchesBegan:(NSSet *)touches withEvent:(UIEvent *)event
-{
-  ASDisplayNodeAssertMainThread();
-
-  [super touchesBegan:touches withEvent:event];
-
-  CGPoint point = [[touches anyObject] locationInView:self.view];
-
-  NSRange range = NSMakeRange(0, 0);
-  NSString *linkAttributeName = nil;
-  BOOL inAdditionalTruncationMessage = NO;
-
-  id linkAttributeValue = [self _linkAttributeValueAtPoint:point
-                                             attributeName:&linkAttributeName
-                                                     range:&range
-                             inAdditionalTruncationMessage:&inAdditionalTruncationMessage
-                                           forHighlighting:YES];
-
-  NSUInteger lastCharIndex = NSIntegerMax;
-  BOOL linkCrossesVisibleRange = (lastCharIndex > range.location) && (lastCharIndex < NSMaxRange(range) - 1);
-
-  if (inAdditionalTruncationMessage) {
-    NSRange visibleRange = NSMakeRange(0, 0);
-    {
-      ASLockScopeSelf();
-      // TODO: The copy and application of size shouldn't be required, but it is currently.
-      // See discussion in https://github.com/TextureGroup/Texture/pull/396
-      ASTextContainer *containerCopy = [_textContainer copy];
-      containerCopy.size = self.calculatedSize;
-      ASTextLayout *layout = ASTextNodeCompatibleLayoutWithContainerAndText(containerCopy, _attributedText);
-      visibleRange = layout.visibleRange;
-    }
-    NSRange truncationMessageRange = [self _additionalTruncationMessageRangeWithVisibleRange:visibleRange];
-    [self _setHighlightRange:truncationMessageRange forAttributeName:ASTextNodeTruncationTokenAttributeName value:nil animated:YES];
-  } else if (range.length > 0 && !linkCrossesVisibleRange && linkAttributeValue != nil && linkAttributeName != nil) {
-    [self _setHighlightRange:range forAttributeName:linkAttributeName value:linkAttributeValue animated:YES];
-  }
-
-  return;
-}
-
-
-- (void)touchesCancelled:(NSSet *)touches withEvent:(UIEvent *)event
-{
-  ASDisplayNodeAssertMainThread();
-  [super touchesCancelled:touches withEvent:event];
-  
-  [self _clearHighlightIfNecessary];
-}
-
-- (void)touchesEnded:(NSSet *)touches withEvent:(UIEvent *)event
-{
-  ASDisplayNodeAssertMainThread();
-  [super touchesEnded:touches withEvent:event];
-
-  ASLockScopeSelf(); // Protect usage of _highlight* ivars.
-  id<ASTextNodeDelegate> delegate = self.delegate;
-  if ([self _pendingLinkTap] && [delegate respondsToSelector:@selector(textNode:tappedLinkAttribute:value:atPoint:textRange:)]) {
-    CGPoint point = [[touches anyObject] locationInView:self.view];
-    [delegate textNode:(ASTextNode *)self tappedLinkAttribute:_highlightedLinkAttributeName value:_highlightedLinkAttributeValue atPoint:point textRange:_highlightRange];
-  }
-  
-  if ([self _pendingTruncationTap]) {
-    if ([delegate respondsToSelector:@selector(textNodeTappedTruncationToken:)]) {
-      [delegate textNodeTappedTruncationToken:(ASTextNode *)self];
-    }
-  }
-  
-  [self _clearHighlightIfNecessary];
-}
-
-- (void)touchesMoved:(NSSet *)touches withEvent:(UIEvent *)event
-{
-  ASDisplayNodeAssertMainThread();
-  [super touchesMoved:touches withEvent:event];
-
-  ASLockScopeSelf(); // Protect usage of _highlight* ivars.
-  UITouch *touch = [touches anyObject];
-  CGPoint locationInView = [touch locationInView:self.view];
-  // on 3D Touch enabled phones, this gets fired with changes in force, and usually will get fired immediately after touchesBegan:withEvent:
-  if (CGPointEqualToPoint([touch previousLocationInView:self.view], locationInView))
-    return;
-  
-  // If touch has moved out of the current highlight range, clear the highlight.
-  if (_highlightRange.length > 0) {
-    NSRange range = NSMakeRange(0, 0);
-    [self _linkAttributeValueAtPoint:locationInView
-                       attributeName:NULL
-                               range:&range
-       inAdditionalTruncationMessage:NULL
-                     forHighlighting:YES];
-    
-    if (!NSEqualRanges(_highlightRange, range)) {
-      [self _clearHighlightIfNecessary];
-    }
-  }
-}
-
-- (void)_handleLongPress:(UILongPressGestureRecognizer *)longPressRecognizer
-{
-  ASDisplayNodeAssertMainThread();
-  
-  // Respond to long-press when it begins, not when it ends.
-  if (longPressRecognizer.state == UIGestureRecognizerStateBegan) {
-    id<ASTextNodeDelegate> delegate = self.delegate;
-    if ([delegate respondsToSelector:@selector(textNode:longPressedLinkAttribute:value:atPoint:textRange:)]) {
-      ASLockScopeSelf(); // Protect usage of _highlight* ivars.
-      CGPoint touchPoint = [_longPressGestureRecognizer locationInView:self.view];
-      [delegate textNode:(ASTextNode *)self longPressedLinkAttribute:_highlightedLinkAttributeName value:_highlightedLinkAttributeValue atPoint:touchPoint textRange:_highlightRange];
-    }
-  }
-}
-
-- (BOOL)_pendingLinkTap
-{
-  ASLockScopeSelf();
-  
-  return (_highlightedLinkAttributeValue != nil && ![self _pendingTruncationTap]) && self.delegate != nil;
-}
-
-- (BOOL)_pendingTruncationTap
-{
-  return [ASLockedSelf(_highlightedLinkAttributeName) isEqualToString:ASTextNodeTruncationTokenAttributeName];
-}
-
-#pragma mark - Shadow Properties
-
-/**
- * Note about shadowed text:
- *
- * Shadowed text is pretty rare, and we are a framework that targets serious developers.
- * We should probably ignore these properties and tell developers to set the shadow into their attributed text instead.
- */
-- (CGColorRef)shadowColor
-{
-  return ASLockedSelf(_shadowColor);
-}
-
-- (void)setShadowColor:(CGColorRef)shadowColor
-{
-  ASLockScopeSelf();
-  if (_shadowColor != shadowColor && CGColorEqualToColor(shadowColor, _shadowColor) == NO) {
-    CGColorRelease(_shadowColor);
-    _shadowColor = CGColorRetain(shadowColor);
-    [self setNeedsDisplay];
-  }
-}
-
-- (CGSize)shadowOffset
-{
-  return ASLockedSelf(_shadowOffset);
-}
-
-- (void)setShadowOffset:(CGSize)shadowOffset
-{
-  ASLockScopeSelf();
-  if (ASCompareAssignCustom(_shadowOffset, shadowOffset, CGSizeEqualToSize)) {
-    [self setNeedsDisplay];
-  }
-}
-
-- (CGFloat)shadowOpacity
-{
-  return ASLockedSelf(_shadowOpacity);
-}
-
-- (void)setShadowOpacity:(CGFloat)shadowOpacity
-{
-  ASLockScopeSelf();
-  if (ASCompareAssign(_shadowOpacity, shadowOpacity)) {
-    [self setNeedsDisplay];
-  }
-}
-
-- (CGFloat)shadowRadius
-{
-  return ASLockedSelf(_shadowRadius);
-}
-
-- (void)setShadowRadius:(CGFloat)shadowRadius
-{
-  ASLockScopeSelf();
-  if (ASCompareAssign(_shadowRadius, shadowRadius)) {
-    [self setNeedsDisplay];
-  }
-}
-
-- (UIEdgeInsets)shadowPadding
-{
-  AS_TEXT_ALERT_UNIMPLEMENTED_FEATURE();
-  return UIEdgeInsetsZero;
-}
-
-- (void)setPointSizeScaleFactors:(NSArray<NSNumber *> *)scaleFactors
-{
-  AS_TEXT_ALERT_UNIMPLEMENTED_FEATURE();
-  ASLockScopeSelf();
-  if (ASCompareAssignCopy(_pointSizeScaleFactors, scaleFactors)) {
-    [self setNeedsLayout];
-  }
-}
-
-- (NSArray<NSNumber *> *)pointSizeScaleFactors
-{
-  return ASLockedSelf(_pointSizeScaleFactors);
-}
-
-#pragma mark - Truncation Message
-
-static NSAttributedString *DefaultTruncationAttributedString()
-{
-  static NSAttributedString *defaultTruncationAttributedString;
-  static dispatch_once_t onceToken;
-  dispatch_once(&onceToken, ^{
-    defaultTruncationAttributedString = [[NSAttributedString alloc] initWithString:NSLocalizedString(@"\u2026", @"Default truncation string")];
-  });
-  return defaultTruncationAttributedString;
-}
-
-- (void)_ensureTruncationText
-{
-  ASLockScopeSelf();
-  if (_textContainer.truncationToken == nil) {
-    _textContainer.truncationToken = [self _locked_composedTruncationText];
-  }
-}
-
-- (NSAttributedString *)truncationAttributedText
-{
-  return ASLockedSelf(_truncationAttributedText);
-}
-
-- (void)setTruncationAttributedText:(NSAttributedString *)truncationAttributedText
-{
-  ASLockScopeSelf();
-  if (ASCompareAssignCopy(_truncationAttributedText, truncationAttributedText)) {
-    [self _invalidateTruncationText];
-  }
-}
-
-- (NSAttributedString *)additionalTruncationMessage
-{
-  return ASLockedSelf(_additionalTruncationMessage);
-}
-
-- (void)setAdditionalTruncationMessage:(NSAttributedString *)additionalTruncationMessage
-{
-  ASLockScopeSelf();
-  if (ASCompareAssignCopy(_additionalTruncationMessage, additionalTruncationMessage)) {
-    [self _invalidateTruncationText];
-  }
-}
-
-- (NSLineBreakMode)truncationMode
-{
-  return ASLockedSelf(_truncationMode);
-}
-
-- (void)setTruncationMode:(NSLineBreakMode)truncationMode
-{
-  ASLockScopeSelf();
-  if (ASCompareAssign(_truncationMode, truncationMode)) {
-    ASTextTruncationType truncationType;
-    switch (truncationMode) {
-      case NSLineBreakByTruncatingHead:
-        truncationType = ASTextTruncationTypeStart;
-        break;
-      case NSLineBreakByTruncatingTail:
-        truncationType = ASTextTruncationTypeEnd;
-        break;
-      case NSLineBreakByTruncatingMiddle:
-        truncationType = ASTextTruncationTypeMiddle;
-        break;
-      default:
-        truncationType = ASTextTruncationTypeNone;
-    }
-    
-    _textContainer.truncationType = truncationType;
-    
-    [self setNeedsDisplay];
-  }
-}
-
-- (BOOL)isTruncated
-{
-  return ASLockedSelf([self locked_textLayoutForSize:[self _locked_threadSafeBounds].size].truncatedLine != nil);
-}
-
-- (BOOL)shouldTruncateForConstrainedSize:(ASSizeRange)constrainedSize
-{
-  return ASLockedSelf([self locked_textLayoutForSize:constrainedSize.max].truncatedLine != nil);
-}
-
-- (ASTextLayout *)locked_textLayoutForSize:(CGSize)size
-{
-  ASTextContainer *container = [_textContainer copy];
-  container.size = size;
-  return ASTextNodeCompatibleLayoutWithContainerAndText(container, _attributedText);
-}
-
-- (NSUInteger)maximumNumberOfLines
-{
-  // _textContainer is invariant and this is just atomic access.
-  return _textContainer.maximumNumberOfRows;
-}
-
-- (void)setMaximumNumberOfLines:(NSUInteger)maximumNumberOfLines
-{
-  ASLockScopeSelf();
-  if (ASCompareAssign(_textContainer.maximumNumberOfRows, maximumNumberOfLines)) {
-    [self setNeedsDisplay];
-  }
-}
-
-- (NSUInteger)lineCount
-{
-  ASLockScopeSelf();
-  AS_TEXT_ALERT_UNIMPLEMENTED_FEATURE();
-  return 0;
-}
-
-#pragma mark - Truncation Message
-
-- (void)_invalidateTruncationText
-{
-  ASLockScopeSelf();
-  [self _locked_invalidateTruncationText];
-  [self setNeedsDisplay];
-}
-
-- (void)_locked_invalidateTruncationText
-{
-  _textContainer.truncationToken = nil;
-}
-
-/**
- * @return the additional truncation message range within the as-rendered text.
- * Must be called from main thread
- */
-- (NSRange)_additionalTruncationMessageRangeWithVisibleRange:(NSRange)visibleRange
-{
-  ASLockScopeSelf();
-  
-  // Check if we even have an additional truncation message.
-  if (!_additionalTruncationMessage) {
-    return NSMakeRange(NSNotFound, 0);
-  }
-  
-  // Character location of the unicode ellipsis (the first index after the visible range)
-  NSInteger truncationTokenIndex = NSMaxRange(visibleRange);
-  
-  NSUInteger additionalTruncationMessageLength = _additionalTruncationMessage.length;
-  // We get the location of the truncation token, then add the length of the
-  // truncation attributed string +1 for the space between.
-  return NSMakeRange(truncationTokenIndex + _truncationAttributedText.length + 1, additionalTruncationMessageLength);
-}
-
-/**
- * @return the truncation message for the string.  If there are both an
- * additional truncation message and a truncation attributed string, they will
- * be properly composed.
- */
-- (NSAttributedString *)_locked_composedTruncationText
-{
-  ASAssertLocked(__instanceLock__);
-  if (_composedTruncationText == nil) {
-    if (_truncationAttributedText != nil && _additionalTruncationMessage != nil) {
-      NSMutableAttributedString *newComposedTruncationString = [[NSMutableAttributedString alloc] initWithAttributedString:_truncationAttributedText];
-      [newComposedTruncationString.mutableString appendString:@" "];
-      [newComposedTruncationString appendAttributedString:_additionalTruncationMessage];
-      _composedTruncationText = newComposedTruncationString;
-    } else if (_truncationAttributedText != nil) {
-      _composedTruncationText = _truncationAttributedText;
-    } else if (_additionalTruncationMessage != nil) {
-      _composedTruncationText = _additionalTruncationMessage;
-    } else {
-      _composedTruncationText = DefaultTruncationAttributedString();
-    }
-    _composedTruncationText = [self _locked_prepareTruncationStringForDrawing:_composedTruncationText];
-  }
-  return _composedTruncationText;
-}
-
-/**
- * - cleanses it of core text attributes so TextKit doesn't crash
- * - Adds whole-string attributes so the truncation message matches the styling
- * of the body text
- */
-- (NSAttributedString *)_locked_prepareTruncationStringForDrawing:(NSAttributedString *)truncationString
-{
-  ASAssertLocked(__instanceLock__);
-  NSMutableAttributedString *truncationMutableString = [truncationString mutableCopy];
-  // Grab the attributes from the full string
-  if (_attributedText.length > 0) {
-    NSAttributedString *originalString = _attributedText;
-    NSInteger originalStringLength = _attributedText.length;
-    // Add any of the original string's attributes to the truncation string,
-    // but don't overwrite any of the truncation string's attributes
-    NSDictionary *originalStringAttributes = [originalString attributesAtIndex:originalStringLength-1 effectiveRange:NULL];
-    [truncationString enumerateAttributesInRange:NSMakeRange(0, truncationString.length) options:0 usingBlock:
-     ^(NSDictionary *attributes, NSRange range, BOOL *stop) {
-       NSMutableDictionary *futureTruncationAttributes = [originalStringAttributes mutableCopy];
-       [futureTruncationAttributes addEntriesFromDictionary:attributes];
-       [truncationMutableString setAttributes:futureTruncationAttributes range:range];
-     }];
-  }
-  return truncationMutableString;
-}
-
-#if AS_TEXTNODE2_RECORD_ATTRIBUTED_STRINGS
-+ (void)_registerAttributedText:(NSAttributedString *)str
-{
-  static NSMutableArray *array;
-  static NSLock *lock;
-  static dispatch_once_t onceToken;
-  dispatch_once(&onceToken, ^{
-    lock = [NSLock new];
-    array = [NSMutableArray new];
-  });
-  [lock lock];
-  [array addObject:str];
-  if (array.count % 20 == 0) {
-    NSLog(@"Got %d strings", (int)array.count);
-  }
-  if (array.count == 2000) {
-    NSString *path = [NSTemporaryDirectory() stringByAppendingPathComponent:@"AttributedStrings.plist"];
-    NSAssert([NSKeyedArchiver archiveRootObject:array toFile:path], nil);
-    NSLog(@"Saved to %@", path);
-  }
-  [lock unlock];
-}
-#endif
-
-+ (void)enableDebugging
-{
-  ASTextDebugOption *debugOption = [[ASTextDebugOption alloc] init];
-  debugOption.CTLineFillColor = [UIColor colorWithRed:0 green:0.3 blue:1 alpha:0.1];
-  [ASTextDebugOption setSharedDebugOption:debugOption];
-}
-
-- (BOOL)usingExperiment
-{
-  return YES;
-}
-
-@end
diff --git a/submodules/AsyncDisplayKit/Source/ASTextNodeCommon.h b/submodules/AsyncDisplayKit/Source/ASTextNodeCommon.h
index ab4e134bfd..765f401c2a 100644
--- a/submodules/AsyncDisplayKit/Source/ASTextNodeCommon.h
+++ b/submodules/AsyncDisplayKit/Source/ASTextNodeCommon.h
@@ -10,8 +10,6 @@
 
 #import <AsyncDisplayKit/ASAvailability.h>
 
-@class ASTextNode;
-
 #define AS_TEXT_ALERT_UNIMPLEMENTED_FEATURE() { \
   static dispatch_once_t onceToken; \
   dispatch_once(&onceToken, ^{ \
@@ -34,58 +32,3 @@ typedef NS_ENUM(NSUInteger, ASTextNodeHighlightStyle) {
   ASTextNodeHighlightStyleDark
 };
 
-/**
- * @abstract Text node delegate.
- */
-@protocol ASTextNodeDelegate <NSObject>
-@optional
-
-/**
- @abstract Indicates to the delegate that a link was tapped within a text node.
- @param textNode The ASTextNode containing the link that was tapped.
- @param attribute The attribute that was tapped. Will not be nil.
- @param value The value of the tapped attribute.
- @param point The point within textNode, in textNode's coordinate system, that was tapped.
- @param textRange The range of highlighted text.
- */
-- (void)textNode:(ASTextNode *)textNode tappedLinkAttribute:(NSString *)attribute value:(id)value atPoint:(CGPoint)point textRange:(NSRange)textRange;
-
-/**
- @abstract Indicates to the delegate that a link was tapped within a text node.
- @param textNode The ASTextNode containing the link that was tapped.
- @param attribute The attribute that was tapped. Will not be nil.
- @param value The value of the tapped attribute.
- @param point The point within textNode, in textNode's coordinate system, that was tapped.
- @param textRange The range of highlighted text.
- @discussion In addition to implementing this method, the delegate must be set on the text
- node before it is loaded (the recognizer is created in -didLoad)
- */
-- (void)textNode:(ASTextNode *)textNode longPressedLinkAttribute:(NSString *)attribute value:(id)value atPoint:(CGPoint)point textRange:(NSRange)textRange;
-
-//! @abstract Called when the text node's truncation string has been tapped.
-- (void)textNodeTappedTruncationToken:(ASTextNode *)textNode;
-
-/**
- @abstract Indicates to the text node if an attribute should be considered a link.
- @param textNode The text node containing the entity attribute.
- @param attribute The attribute that was tapped. Will not be nil.
- @param value The value of the tapped attribute.
- @param point The point within textNode, in textNode's coordinate system, that was touched to trigger a highlight.
- @discussion If not implemented, the default value is YES.
- @return YES if the entity attribute should be a link, NO otherwise.
- */
-- (BOOL)textNode:(ASTextNode *)textNode shouldHighlightLinkAttribute:(NSString *)attribute value:(id)value atPoint:(CGPoint)point;
-
-/**
- @abstract Indicates to the text node if an attribute is a valid long-press target
- @param textNode The text node containing the entity attribute.
- @param attribute The attribute that was tapped. Will not be nil.
- @param value The value of the tapped attribute.
- @param point The point within textNode, in textNode's coordinate system, that was long-pressed.
- @discussion If not implemented, the default value is NO.
- @return YES if the entity attribute should be treated as a long-press target, NO otherwise.
- */
-- (BOOL)textNode:(ASTextNode *)textNode shouldLongPressLinkAttribute:(NSString *)attribute value:(id)value atPoint:(CGPoint)point;
-
-@end
-
diff --git a/submodules/AsyncDisplayKit/Source/TextKit/ASTextNodeWordKerner.h b/submodules/AsyncDisplayKit/Source/ASTextNodeWordKerner.h
similarity index 100%
rename from submodules/AsyncDisplayKit/Source/TextKit/ASTextNodeWordKerner.h
rename to submodules/AsyncDisplayKit/Source/ASTextNodeWordKerner.h
diff --git a/submodules/AsyncDisplayKit/Source/TextKit/ASTextNodeWordKerner.mm b/submodules/AsyncDisplayKit/Source/ASTextNodeWordKerner.mm
similarity index 99%
rename from submodules/AsyncDisplayKit/Source/TextKit/ASTextNodeWordKerner.mm
rename to submodules/AsyncDisplayKit/Source/ASTextNodeWordKerner.mm
index 67e640557c..e1d0c73c0e 100644
--- a/submodules/AsyncDisplayKit/Source/TextKit/ASTextNodeWordKerner.mm
+++ b/submodules/AsyncDisplayKit/Source/ASTextNodeWordKerner.mm
@@ -7,7 +7,7 @@
 //  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
 //
 
-#import <AsyncDisplayKit/ASTextNodeWordKerner.h>
+#import "ASTextNodeWordKerner.h"
 
 #import <UIKit/UIKit.h>
 
diff --git a/submodules/AsyncDisplayKit/Source/Details/ASTraitCollection.mm b/submodules/AsyncDisplayKit/Source/ASTraitCollection.mm
similarity index 100%
rename from submodules/AsyncDisplayKit/Source/Details/ASTraitCollection.mm
rename to submodules/AsyncDisplayKit/Source/ASTraitCollection.mm
diff --git a/submodules/AsyncDisplayKit/Source/ASVideoNode.h b/submodules/AsyncDisplayKit/Source/ASVideoNode.h
deleted file mode 100644
index 5c38a6f641..0000000000
--- a/submodules/AsyncDisplayKit/Source/ASVideoNode.h
+++ /dev/null
@@ -1,173 +0,0 @@
-//
-//  ASVideoNode.h
-//  Texture
-//
-//  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.
-//  Changes after 4/13/2017 are: Copyright (c) Pinterest, Inc.  All rights reserved.
-//  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
-//
-
-#ifndef MINIMAL_ASDK
-#import <AsyncDisplayKit/ASAvailability.h>
-#import <AsyncDisplayKit/ASNetworkImageNode.h>
-
-#if AS_USE_VIDEO
-
-@class AVAsset, AVPlayer, AVPlayerLayer, AVPlayerItem, AVVideoComposition, AVAudioMix;
-@protocol ASVideoNodeDelegate;
-
-typedef NS_ENUM(NSInteger, ASVideoNodePlayerState) {
-  ASVideoNodePlayerStateUnknown,
-  ASVideoNodePlayerStateInitialLoading,
-  ASVideoNodePlayerStateReadyToPlay,
-  ASVideoNodePlayerStatePlaybackLikelyToKeepUpButNotPlaying,
-  ASVideoNodePlayerStatePlaying,
-  ASVideoNodePlayerStateLoading,
-  ASVideoNodePlayerStatePaused,
-  ASVideoNodePlayerStateFinished
-};
-
-NS_ASSUME_NONNULL_BEGIN
-
-// IMPORTANT NOTES:
-// 1. Applications using ASVideoNode must link AVFoundation! (this provides the AV* classes below)
-// 2. This is a relatively new component of AsyncDisplayKit.  It has many useful features, but
-//    there is room for further expansion and optimization.  Please report any issues or requests
-//    in an issue on GitHub: https://github.com/facebook/AsyncDisplayKit/issues
-
-@interface ASVideoNode : ASNetworkImageNode
-
-- (void)play;
-- (void)pause;
-- (BOOL)isPlaying;
-- (void)resetToPlaceholder;
-
-// TODO: copy
-@property (nullable) AVAsset *asset;
-
-/**
- ** @abstract The URL with which the asset was initialized.
- ** @discussion Setting the URL will override the current asset with a newly created AVURLAsset created from the given URL, and AVAsset *asset will point to that newly created AVURLAsset.  Please don't set both assetURL and asset.
- ** @return Current URL the asset was initialized or nil if no URL was given.
- **/
-@property (nullable, copy) NSURL *assetURL;
-
-// TODO: copy both of these.
-@property (nullable) AVVideoComposition *videoComposition;
-@property (nullable) AVAudioMix *audioMix;
-
-@property (nullable, readonly) AVPlayer *player;
-
-// TODO: copy
-@property (nullable, readonly) AVPlayerItem *currentItem;
-
-@property (nullable, nonatomic, readonly) AVPlayerLayer *playerLayer;
-
-
-/**
- * When shouldAutoplay is set to true, a video node will play when it has both loaded and entered the "visible" interfaceState.
- * If it leaves the visible interfaceState it will pause but will resume once it has returned.
- */
-@property BOOL shouldAutoplay;
-@property BOOL shouldAutorepeat;
-
-@property BOOL muted;
-@property BOOL shouldAggressivelyRecoverFromStall;
-
-@property (readonly) ASVideoNodePlayerState playerState;
-//! Defaults to 1000
-@property int32_t periodicTimeObserverTimescale;
-
-//! Defaults to AVLayerVideoGravityResizeAspect
-@property (null_resettable, copy) NSString *gravity;
-
-@property (nullable, weak) id<ASVideoNodeDelegate, ASNetworkImageNodeDelegate> delegate;
-
-@end
-
-@protocol ASVideoNodeDelegate <ASNetworkImageNodeDelegate>
-@optional
-/**
- * @abstract Delegate method invoked when the node's video has played to its end time.
- * @param videoNode The video node has played to its end time.
- */
-- (void)videoDidPlayToEnd:(ASVideoNode *)videoNode;
-/**
- * @abstract Delegate method invoked the node is tapped.
- * @param videoNode The video node that was tapped.
- * @discussion The video's play state is toggled if this method is not implemented.
- */
-- (void)didTapVideoNode:(ASVideoNode *)videoNode;
-/**
- * @abstract Delegate method invoked when player changes state.
- * @param videoNode The video node.
- * @param state player state before this change.
- * @param toState player new state.
- * @discussion This method is called after each state change
- */
-- (void)videoNode:(ASVideoNode *)videoNode willChangePlayerState:(ASVideoNodePlayerState)state toState:(ASVideoNodePlayerState)toState;
-/**
- * @abstract Ssks delegate if state change is allowed
- * ASVideoNodePlayerStatePlaying or ASVideoNodePlayerStatePaused.
- * asks delegate if state change is allowed.
- * @param videoNode The video node.
- * @param state player state that is going to be set.
- * @discussion Delegate method invoked when player changes it's state to
- * ASVideoNodePlayerStatePlaying or ASVideoNodePlayerStatePaused
- * and asks delegate if state change is valid
- */
-- (BOOL)videoNode:(ASVideoNode*)videoNode shouldChangePlayerStateTo:(ASVideoNodePlayerState)state;
-/**
- * @abstract Delegate method invoked when player playback time is updated.
- * @param videoNode The video node.
- * @param timeInterval current playback time in seconds.
- */
-- (void)videoNode:(ASVideoNode *)videoNode didPlayToTimeInterval:(NSTimeInterval)timeInterval;
-/**
- * @abstract Delegate method invoked when the video player stalls.
- * @param videoNode The video node that has experienced the stall
- * @param timeInterval Current playback time when the stall happens
- */
-- (void)videoNode:(ASVideoNode *)videoNode didStallAtTimeInterval:(NSTimeInterval)timeInterval;
-/**
- * @abstract Delegate method invoked when the video player starts the inital asset loading
- * @param videoNode The videoNode
- */
-- (void)videoNodeDidStartInitialLoading:(ASVideoNode *)videoNode;
-/**
- * @abstract Delegate method invoked when the video is done loading the asset and can start the playback
- * @param videoNode The videoNode
- */
-- (void)videoNodeDidFinishInitialLoading:(ASVideoNode *)videoNode;
-/**
- * @abstract Delegate method invoked when the AVPlayerItem for the asset has been set up and can be accessed throught currentItem.
- * @param videoNode The videoNode.
- * @param currentItem The AVPlayerItem that was constructed from the asset.
- */
-- (void)videoNode:(ASVideoNode *)videoNode didSetCurrentItem:(AVPlayerItem *)currentItem;
-/**
- * @abstract Delegate method invoked when the video node has recovered from the stall
- * @param videoNode The videoNode
- */
-- (void)videoNodeDidRecoverFromStall:(ASVideoNode *)videoNode;
-/**
- * @abstract Delegate method invoked when an error occurs while trying to load an asset
- * @param videoNode The videoNode.
- * @param key The key of value that failed to load.
- * @param asset The asset.
- * @param error The error that occurs.
- */
-- (void)videoNode:(ASVideoNode *)videoNode didFailToLoadValueForKey:(NSString *)key asset:(AVAsset *)asset error:(NSError *)error;
-
-@end
-
-@interface ASVideoNode (Unavailable)
-
-- (instancetype)initWithViewBlock:(ASDisplayNodeViewBlock)viewBlock didLoadBlock:(nullable ASDisplayNodeDidLoadBlock)didLoadBlock NS_UNAVAILABLE;
-
-@end
-
-NS_ASSUME_NONNULL_END
-#endif
-
-#endif
diff --git a/submodules/AsyncDisplayKit/Source/ASVideoNode.mm b/submodules/AsyncDisplayKit/Source/ASVideoNode.mm
deleted file mode 100644
index 05478d91d6..0000000000
--- a/submodules/AsyncDisplayKit/Source/ASVideoNode.mm
+++ /dev/null
@@ -1,864 +0,0 @@
-//
-//  ASVideoNode.mm
-//  Texture
-//
-//  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.
-//  Changes after 4/13/2017 are: Copyright (c) Pinterest, Inc.  All rights reserved.
-//  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
-//
-#ifndef MINIMAL_ASDK
-
-#import <AsyncDisplayKit/ASVideoNode.h>
-
-#if AS_USE_VIDEO
-
-#import <AVFoundation/AVFoundation.h>
-#import <AsyncDisplayKit/ASDisplayNode+FrameworkPrivate.h>
-#import <AsyncDisplayKit/ASDisplayNode+Subclasses.h>
-#import <AsyncDisplayKit/ASDisplayNodeInternal.h>
-#import <AsyncDisplayKit/ASEqualityHelpers.h>
-#import <AsyncDisplayKit/ASInternalHelpers.h>
-#import <AsyncDisplayKit/ASDisplayNodeExtras.h>
-#import <AsyncDisplayKit/ASThread.h>
-
-static BOOL ASAssetIsEqual(AVAsset *asset1, AVAsset *asset2) {
-  return ASObjectIsEqual(asset1, asset2)
-  || ([asset1 isKindOfClass:[AVURLAsset class]]
-      && [asset2 isKindOfClass:[AVURLAsset class]]
-      && ASObjectIsEqual(((AVURLAsset *)asset1).URL, ((AVURLAsset *)asset2).URL));
-}
-
-static UIViewContentMode ASContentModeFromVideoGravity(NSString *videoGravity) {
-  if ([videoGravity isEqualToString:AVLayerVideoGravityResizeAspectFill]) {
-    return UIViewContentModeScaleAspectFill;
-  } else if ([videoGravity isEqualToString:AVLayerVideoGravityResize]) {
-    return UIViewContentModeScaleToFill;
-  } else {
-    return UIViewContentModeScaleAspectFit;
-  }
-}
-
-static void *ASVideoNodeContext = &ASVideoNodeContext;
-static NSString * const kPlaybackLikelyToKeepUpKey = @"playbackLikelyToKeepUp";
-static NSString * const kplaybackBufferEmpty = @"playbackBufferEmpty";
-static NSString * const kStatus = @"status";
-static NSString * const kRate = @"rate";
-
-@interface ASVideoNode ()
-{
-  struct {
-    unsigned int delegateVideNodeShouldChangePlayerStateTo:1;
-    unsigned int delegateVideoDidPlayToEnd:1;
-    unsigned int delegateDidTapVideoNode:1;
-    unsigned int delegateVideoNodeWillChangePlayerStateToState:1;
-    unsigned int delegateVideoNodeDidPlayToTimeInterval:1;
-    unsigned int delegateVideoNodeDidStartInitialLoading:1;
-    unsigned int delegateVideoNodeDidFinishInitialLoading:1;
-    unsigned int delegateVideoNodeDidSetCurrentItem:1;
-    unsigned int delegateVideoNodeDidStallAtTimeInterval:1;
-    unsigned int delegateVideoNodeDidRecoverFromStall:1;
-    unsigned int delegateVideoNodeDidFailToLoadValueForKey:1;
-  } _delegateFlags;
-  
-  BOOL _shouldBePlaying;
-  
-  BOOL _shouldAutorepeat;
-  BOOL _shouldAutoplay;
-  BOOL _shouldAggressivelyRecoverFromStall;
-  BOOL _muted;
-  
-  ASVideoNodePlayerState _playerState;
-  
-  AVAsset *_asset;
-  NSURL *_assetURL;
-  AVVideoComposition *_videoComposition;
-  AVAudioMix *_audioMix;
-  
-  AVPlayerItem *_currentPlayerItem;
-  AVPlayer *_player;
-  
-  id _timeObserver;
-  int32_t _periodicTimeObserverTimescale;
-  CMTime _timeObserverInterval;
-  
-  CMTime _lastPlaybackTime;
-	
-  ASDisplayNode *_playerNode;
-  NSString *_gravity;
-}
-
-@end
-
-@implementation ASVideoNode
-
-@dynamic delegate;
-
-// TODO: Support preview images with HTTP Live Streaming videos.
-
-#pragma mark - Construction and Layout
-
-- (instancetype)initWithCache:(id<ASImageCacheProtocol>)cache downloader:(id<ASImageDownloaderProtocol>)downloader
-{
-  if (!(self = [super initWithCache:cache downloader:downloader])) {
-    return nil;
-  }
-
-  self.gravity = AVLayerVideoGravityResizeAspect;
-  _periodicTimeObserverTimescale = 10000;
-  [self addTarget:self action:@selector(tapped) forControlEvents:ASControlNodeEventTouchUpInside];
-  _lastPlaybackTime = kCMTimeZero;
-  
-  NSNotificationCenter *notificationCenter = [NSNotificationCenter defaultCenter];
-  [notificationCenter addObserver:self selector:@selector(applicationDidBecomeActive:) name:UIApplicationDidBecomeActiveNotification object:nil];
-  
-  return self;
-}
-
-- (ASDisplayNode *)constructPlayerNode
-{
-  ASVideoNode * __weak weakSelf = self;
-
-  return [[ASDisplayNode alloc] initWithLayerBlock:^CALayer *{
-    AVPlayerLayer *playerLayer = [[AVPlayerLayer alloc] init];
-    playerLayer.player = weakSelf.player;
-    playerLayer.videoGravity = weakSelf.gravity;
-    return playerLayer;
-  }];
-}
-
-- (AVPlayerItem *)constructPlayerItem
-{
-  ASDisplayNodeAssertMainThread();
-  ASLockScopeSelf();
-
-  AVPlayerItem *playerItem = nil;
-  if (_assetURL != nil) {
-    playerItem = [[AVPlayerItem alloc] initWithURL:_assetURL];
-    _asset = [playerItem asset];
-  } else {
-    playerItem = [[AVPlayerItem alloc] initWithAsset:_asset];
-  }
-
-  playerItem.videoComposition = _videoComposition;
-  playerItem.audioMix = _audioMix;
-  return playerItem;
-}
-
-- (void)prepareToPlayAsset:(AVAsset *)asset withKeys:(NSArray<NSString *> *)requestedKeys
-{
-  ASDisplayNodeAssertMainThread();
-  
-  for (NSString *key in requestedKeys) {
-    NSError *error = nil;
-    AVKeyValueStatus keyStatus = [asset statusOfValueForKey:key error:&error];
-    if (keyStatus == AVKeyValueStatusFailed) {
-      NSLog(@"Asset loading failed with error: %@", error);
-      if (_delegateFlags.delegateVideoNodeDidFailToLoadValueForKey) {
-        [self.delegate videoNode:self didFailToLoadValueForKey:key asset:asset error:error];
-      }
-    }
-  }
-  
-  if ([asset isPlayable] == NO) {
-    NSLog(@"Asset is not playable.");
-    return;
-  }
-
-  AVPlayerItem *playerItem = [self constructPlayerItem];
-  [self setCurrentItem:playerItem];
-  
-  if (_player != nil) {
-    [_player replaceCurrentItemWithPlayerItem:playerItem];
-  } else {
-    self.player = [AVPlayer playerWithPlayerItem:playerItem];
-  }
-
-  if (_delegateFlags.delegateVideoNodeDidSetCurrentItem) {
-    [self.delegate videoNode:self didSetCurrentItem:playerItem];
-  }
-
-  if (self.image == nil && self.URL == nil) {
-    [self generatePlaceholderImage];
-  }
-}
-
-- (void)addPlayerItemObservers:(AVPlayerItem *)playerItem
-{
-  if (playerItem == nil) {
-    return;
-  }
-  
-  [playerItem addObserver:self forKeyPath:kStatus options:NSKeyValueObservingOptionInitial | NSKeyValueObservingOptionNew context:ASVideoNodeContext];
-  [playerItem addObserver:self forKeyPath:kPlaybackLikelyToKeepUpKey options:NSKeyValueObservingOptionNew context:ASVideoNodeContext];
-  [playerItem addObserver:self forKeyPath:kplaybackBufferEmpty options:NSKeyValueObservingOptionNew context:ASVideoNodeContext];
-  
-  NSNotificationCenter *notificationCenter = [NSNotificationCenter defaultCenter];
-  [notificationCenter addObserver:self selector:@selector(didPlayToEnd:) name:AVPlayerItemDidPlayToEndTimeNotification object:playerItem];
-  [notificationCenter addObserver:self selector:@selector(videoNodeDidStall:) name:AVPlayerItemPlaybackStalledNotification object:playerItem];
-  [notificationCenter addObserver:self selector:@selector(errorWhilePlaying:) name:AVPlayerItemFailedToPlayToEndTimeNotification object:playerItem];
-  [notificationCenter addObserver:self selector:@selector(errorWhilePlaying:) name:AVPlayerItemNewErrorLogEntryNotification object:playerItem];
-}
-
-- (void)removePlayerItemObservers:(AVPlayerItem *)playerItem
-{
-  @try {
-    [playerItem removeObserver:self forKeyPath:kStatus context:ASVideoNodeContext];
-    [playerItem removeObserver:self forKeyPath:kPlaybackLikelyToKeepUpKey context:ASVideoNodeContext];
-    [playerItem removeObserver:self forKeyPath:kplaybackBufferEmpty context:ASVideoNodeContext];
-  }
-  @catch (NSException * __unused exception) {
-    NSLog(@"Unnecessary KVO removal");
-  }
-
-  NSNotificationCenter *notificationCenter = [NSNotificationCenter defaultCenter];
-  [notificationCenter removeObserver:self name:AVPlayerItemDidPlayToEndTimeNotification object:playerItem];
-  [notificationCenter removeObserver:self name: AVPlayerItemPlaybackStalledNotification object:playerItem];
-  [notificationCenter removeObserver:self name:AVPlayerItemFailedToPlayToEndTimeNotification object:playerItem];
-  [notificationCenter removeObserver:self name:AVPlayerItemNewErrorLogEntryNotification object:playerItem];
-}
-
-- (void)addPlayerObservers:(AVPlayer *)player
-{
-  if (player == nil) {
-    return;
-  }
-
-  [player addObserver:self forKeyPath:kRate options:NSKeyValueObservingOptionNew context:ASVideoNodeContext];
-
-  __weak __typeof(self) weakSelf = self;
-  _timeObserverInterval = CMTimeMake(1, _periodicTimeObserverTimescale);
-  _timeObserver = [player addPeriodicTimeObserverForInterval:_timeObserverInterval queue:NULL usingBlock:^(CMTime time){
-    [weakSelf periodicTimeObserver:time];
-  }];
-}
-
-- (void) removePlayerObservers:(AVPlayer *)player
-{
-  if (_timeObserver != nil) {
-    [player removeTimeObserver:_timeObserver];
-    _timeObserver = nil;
-  }
-
-  @try {
-    [player removeObserver:self forKeyPath:kRate context:ASVideoNodeContext];
-  }
-  @catch (NSException * __unused exception) {
-    NSLog(@"Unnecessary KVO removal");
-  }
-}
-
-- (void)layout
-{
-  [super layout];
-  // The _playerNode wraps AVPlayerLayer, and therefore should extend across the entire bounds.
-  _playerNode.frame = self.bounds;
-}
-
-- (CGSize)calculateSizeThatFits:(CGSize)constrainedSize
-{
-  ASDisplayNode *playerNode = ASLockedSelf(_playerNode);
-
-  CGSize calculatedSize = constrainedSize;
-  
-  // Prevent crashes through if infinite width or height
-  if (isinf(calculatedSize.width) || isinf(calculatedSize.height)) {
-    ASDisplayNodeAssert(NO, @"Infinite width or height in ASVideoNode");
-    calculatedSize = CGSizeZero;
-  }
-  
-  if (playerNode != nil) {
-    playerNode.style.preferredSize = calculatedSize;
-    [playerNode layoutThatFits:ASSizeRangeMake(CGSizeZero, calculatedSize)];
-  }
-  
-  return calculatedSize;
-}
-
-- (void)generatePlaceholderImage
-{
-  ASVideoNode * __weak weakSelf = self;
-  AVAsset *asset = self.asset;
-
-  [self imageAtTime:kCMTimeZero completionHandler:^(UIImage *image) {
-    ASPerformBlockOnMainThread(^{
-      // Ensure the asset hasn't changed since the image request was made
-      if (ASAssetIsEqual(weakSelf.asset, asset)) {
-        [weakSelf setVideoPlaceholderImage:image];
-      }
-    });
-  }];
-}
-
-- (void)imageAtTime:(CMTime)imageTime completionHandler:(void(^)(UIImage *image))completionHandler
-{
-  ASPerformBlockOnBackgroundThread(^{
-    AVAsset *asset = self.asset;
-
-    // Skip the asset image generation if we don't have any tracks available that are capable of supporting it
-    NSArray<AVAssetTrack *>* visualAssetArray = [asset tracksWithMediaCharacteristic:AVMediaCharacteristicVisual];
-    if (visualAssetArray.count == 0) {
-      completionHandler(nil);
-      return;
-    }
-
-    AVAssetImageGenerator *previewImageGenerator = [AVAssetImageGenerator assetImageGeneratorWithAsset:asset];
-    previewImageGenerator.appliesPreferredTrackTransform = YES;
-    previewImageGenerator.videoComposition = _videoComposition;
-
-    [previewImageGenerator generateCGImagesAsynchronouslyForTimes:@[[NSValue valueWithCMTime:imageTime]]
-                                                completionHandler:^(CMTime requestedTime, CGImageRef image, CMTime actualTime, AVAssetImageGeneratorResult result, NSError *error) {
-                                                  if (error != nil && result != AVAssetImageGeneratorCancelled) {
-                                                    NSLog(@"Asset preview image generation failed with error: %@", error);
-                                                  }
-                                                  completionHandler(image ? [UIImage imageWithCGImage:image] : nil);
-                                                }];
-  });
-}
-
-- (void)setVideoPlaceholderImage:(UIImage *)image
-{
-  NSString *gravity = self.gravity;
-  
-  if (image != nil) {
-    self.contentMode = ASContentModeFromVideoGravity(gravity);
-  }
-  self.image = image;
-}
-
-- (void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(NSDictionary *)change context:(void *)context
-{
-  AS::UniqueLock l(__instanceLock__);
-
-  if (object == _currentPlayerItem) {
-    if ([keyPath isEqualToString:kStatus]) {
-      if ([change[NSKeyValueChangeNewKey] integerValue] == AVPlayerItemStatusReadyToPlay) {
-        if (self.playerState != ASVideoNodePlayerStatePlaying) {
-          self.playerState = ASVideoNodePlayerStateReadyToPlay;
-          if (_shouldBePlaying && ASInterfaceStateIncludesVisible(self.interfaceState)) {
-            l.unlock();
-            [self play];
-            l.lock();
-          }
-        }
-        // If we don't yet have a placeholder image update it now that we should have data available for it
-        if (self.image == nil && self.URL == nil) {
-          [self generatePlaceholderImage];
-        }
-      }
-    } else if ([keyPath isEqualToString:kPlaybackLikelyToKeepUpKey]) {
-      BOOL likelyToKeepUp = [change[NSKeyValueChangeNewKey] boolValue];
-      if (likelyToKeepUp && self.playerState == ASVideoNodePlayerStatePlaying) {
-        return;
-      }
-      if (!likelyToKeepUp) {
-        self.playerState = ASVideoNodePlayerStateLoading;
-      } else if (self.playerState != ASVideoNodePlayerStateFinished) {
-        self.playerState = ASVideoNodePlayerStatePlaybackLikelyToKeepUpButNotPlaying;
-      }
-      if (_shouldBePlaying && (_shouldAggressivelyRecoverFromStall || likelyToKeepUp) && ASInterfaceStateIncludesVisible(self.interfaceState)) {
-        if (self.playerState == ASVideoNodePlayerStateLoading && _delegateFlags.delegateVideoNodeDidRecoverFromStall) {
-          [self.delegate videoNodeDidRecoverFromStall:self];
-        }
-        
-        l.unlock();
-        [self play]; // autoresume after buffer catches up
-        // NOTE: Early return without re-locking.
-        return;
-      }
-    } else if ([keyPath isEqualToString:kplaybackBufferEmpty]) {
-      if (_shouldBePlaying && [change[NSKeyValueChangeNewKey] boolValue] == YES && ASInterfaceStateIncludesVisible(self.interfaceState)) {
-        self.playerState = ASVideoNodePlayerStateLoading;
-      }
-    }
-  } else if (object == _player) {
-    if ([keyPath isEqualToString:kRate]) {
-      if ([change[NSKeyValueChangeNewKey] floatValue] == 0.0) {
-        if (self.playerState == ASVideoNodePlayerStatePlaying) {
-          self.playerState = ASVideoNodePlayerStatePaused;
-        }
-      } else {
-        self.playerState = ASVideoNodePlayerStatePlaying;
-      }
-    }
-  }
-  
-  // NOTE: Early return above.
-}
-
-- (void)tapped
-{
-  if (_delegateFlags.delegateDidTapVideoNode) {
-    [self.delegate didTapVideoNode:self];
-    
-  } else {
-    if (_shouldBePlaying) {
-      [self pause];
-    } else {
-      [self play];
-    }
-  }
-}
-
-- (void)didEnterPreloadState
-{
-  [super didEnterPreloadState];
-  
-  ASLockScopeSelf();
-  AVAsset *asset = self.asset;
-  // Return immediately if the asset is nil;
-  if (asset == nil || self.playerState != ASVideoNodePlayerStateUnknown) {
-      return;
-  }
-
-  self.playerState = ASVideoNodePlayerStateLoading;
-  if (_delegateFlags.delegateVideoNodeDidStartInitialLoading) {
-      [self.delegate videoNodeDidStartInitialLoading:self];
-  }
-  
-  NSArray<NSString *> *requestedKeys = @[@"playable"];
-  [asset loadValuesAsynchronouslyForKeys:requestedKeys completionHandler:^{
-    ASPerformBlockOnMainThread(^{
-      if (_delegateFlags.delegateVideoNodeDidFinishInitialLoading) {
-        [self.delegate videoNodeDidFinishInitialLoading:self];
-      }
-      [self prepareToPlayAsset:asset withKeys:requestedKeys];
-    });
-  }];
-}
-
-- (void)periodicTimeObserver:(CMTime)time
-{
-  NSTimeInterval timeInSeconds = CMTimeGetSeconds(time);
-  if (timeInSeconds <= 0) {
-    return;
-  }
-  
-  if (_delegateFlags.delegateVideoNodeDidPlayToTimeInterval) {
-    [self.delegate videoNode:self didPlayToTimeInterval:timeInSeconds];
-    
-  }
-}
-
-- (void)didExitPreloadState
-{
-  [super didExitPreloadState];
-  
-  {
-    ASLockScopeSelf();
-
-    self.player = nil;
-    self.currentItem = nil;
-    self.playerState = ASVideoNodePlayerStateUnknown;
-  }
-}
-
-- (void)didEnterVisibleState
-{
-  [super didEnterVisibleState];
-  
-  BOOL shouldPlay = NO;
-  {
-    ASLockScopeSelf();
-    if (_shouldBePlaying || _shouldAutoplay) {
-      if (_player != nil && CMTIME_IS_VALID(_lastPlaybackTime)) {
-        [_player seekToTime:_lastPlaybackTime];
-      }
-      shouldPlay = YES;
-    }
-  }
-  
-  if (shouldPlay) {
-    [self play];
-  }
-}
-
-- (void)didExitVisibleState
-{
-  [super didExitVisibleState];
-  
-  ASLockScopeSelf();
-  
-  if (_shouldBePlaying) {
-    [self pause];
-    if (_player != nil && CMTIME_IS_VALID(_player.currentTime)) {
-      _lastPlaybackTime = _player.currentTime;
-    }
-    _shouldBePlaying = YES;
-  }
-}
-
-#pragma mark - Video Properties
-
-- (void)setPlayerState:(ASVideoNodePlayerState)playerState
-{
-  ASLockScopeSelf();
-  
-  ASVideoNodePlayerState oldState = _playerState;
-  
-  if (oldState == playerState) {
-    return;
-  }
-  
-  if (_delegateFlags.delegateVideoNodeWillChangePlayerStateToState) {
-    [self.delegate videoNode:self willChangePlayerState:oldState toState:playerState];
-  }
-  
-  _playerState = playerState;
-}
-
-- (void)setAssetURL:(NSURL *)assetURL
-{
-  ASDisplayNodeAssertMainThread();
-  
-  if (ASObjectIsEqual(assetURL, self.assetURL) == NO) {
-    [self setAndFetchAsset:[AVURLAsset assetWithURL:assetURL] url:assetURL];
-  }
-}
-
-- (NSURL *)assetURL
-{
-  ASLockScopeSelf();
-
-  if (_assetURL != nil) {
-    return _assetURL;
-  } else if ([_asset isKindOfClass:AVURLAsset.class]) {
-    return ((AVURLAsset *)_asset).URL;
-  }
-
-  return nil;
-}
-
-- (void)setAsset:(AVAsset *)asset
-{
-  ASDisplayNodeAssertMainThread();
-  
-  if (ASAssetIsEqual(asset, self.asset) == NO) {
-    [self setAndFetchAsset:asset url:nil];
-  }
-}
-
-- (AVAsset *)asset
-{
-  ASLockScopeSelf();
-  return _asset;
-}
-
-- (void)setAndFetchAsset:(AVAsset *)asset url:(NSURL *)assetURL
-{
-  ASDisplayNodeAssertMainThread();
-  
-  [self didExitPreloadState];
-  
-  {
-    ASLockScopeSelf();
-    self.videoPlaceholderImage = nil;
-    _asset = asset;
-    _assetURL = assetURL;
-  }
-  
-  [self setNeedsPreload];
-}
-
-- (void)setVideoComposition:(AVVideoComposition *)videoComposition
-{
-  ASLockScopeSelf();
-
-  _videoComposition = videoComposition;
-  _currentPlayerItem.videoComposition = videoComposition;
-}
-
-- (AVVideoComposition *)videoComposition
-{
-  ASLockScopeSelf();
-  return _videoComposition;
-}
-
-- (void)setAudioMix:(AVAudioMix *)audioMix
-{
-  ASLockScopeSelf();
-
-  _audioMix = audioMix;
-  _currentPlayerItem.audioMix = audioMix;
-}
-
-- (AVAudioMix *)audioMix
-{
-  ASLockScopeSelf();
-  return _audioMix;
-}
-
-- (AVPlayer *)player
-{
-  ASLockScopeSelf();
-  return _player;
-}
-
-- (AVPlayerLayer *)playerLayer
-{
-  ASLockScopeSelf();
-  return (AVPlayerLayer *)_playerNode.layer;
-}
-
-- (void)setDelegate:(id<ASVideoNodeDelegate>)delegate
-{
-  [super setDelegate:delegate];
-  
-  if (delegate == nil) {
-    memset(&_delegateFlags, 0, sizeof(_delegateFlags));
-  } else {
-    _delegateFlags.delegateVideNodeShouldChangePlayerStateTo = [delegate respondsToSelector:@selector(videoNode:shouldChangePlayerStateTo:)];
-    _delegateFlags.delegateVideoDidPlayToEnd = [delegate respondsToSelector:@selector(videoDidPlayToEnd:)];
-    _delegateFlags.delegateDidTapVideoNode = [delegate respondsToSelector:@selector(didTapVideoNode:)];
-    _delegateFlags.delegateVideoNodeWillChangePlayerStateToState = [delegate respondsToSelector:@selector(videoNode:willChangePlayerState:toState:)];
-    _delegateFlags.delegateVideoNodeDidPlayToTimeInterval = [delegate respondsToSelector:@selector(videoNode:didPlayToTimeInterval:)];
-    _delegateFlags.delegateVideoNodeDidStartInitialLoading = [delegate respondsToSelector:@selector(videoNodeDidStartInitialLoading:)];
-    _delegateFlags.delegateVideoNodeDidFinishInitialLoading = [delegate respondsToSelector:@selector(videoNodeDidFinishInitialLoading:)];
-    _delegateFlags.delegateVideoNodeDidSetCurrentItem = [delegate respondsToSelector:@selector(videoNode:didSetCurrentItem:)];
-    _delegateFlags.delegateVideoNodeDidStallAtTimeInterval = [delegate respondsToSelector:@selector(videoNode:didStallAtTimeInterval:)];
-    _delegateFlags.delegateVideoNodeDidRecoverFromStall = [delegate respondsToSelector:@selector(videoNodeDidRecoverFromStall:)];
-    _delegateFlags.delegateVideoNodeDidFailToLoadValueForKey = [delegate respondsToSelector:@selector(videoNode:didFailToLoadValueForKey:asset:error:)];
-  }
-}
-
-- (void)setGravity:(NSString *)gravity
-{
-  ASLockScopeSelf();
-  if (!gravity) {
-    gravity = AVLayerVideoGravityResizeAspect;
-  }
-  
-  if (!ASCompareAssignObjects(_gravity, gravity)) {
-    return;
-  }
-  
-  if (_playerNode.isNodeLoaded) {
-    ((AVPlayerLayer *)_playerNode.layer).videoGravity = gravity;
-  }
-  self.contentMode = ASContentModeFromVideoGravity(gravity);
-  _gravity = gravity;
-}
-
-- (NSString *)gravity
-{
-  ASLockScopeSelf();
-  return _gravity;
-}
-
-- (BOOL)muted
-{
-  ASLockScopeSelf();
-  return _muted;
-}
-
-- (void)setMuted:(BOOL)muted
-{
-  ASLockScopeSelf();
-  
-  _player.muted = muted;
-  _muted = muted;
-}
-
-#pragma mark - Video Playback
-
-- (void)play
-{
-  ASLockScopeSelf();
-
-  if (![self isStateChangeValid:ASVideoNodePlayerStatePlaying]) {
-    return;
-  }
-
-  if (_player == nil) {
-    ASUnlockScope(self);
-    [self setNeedsPreload];
-  }
-
-  if (_playerNode == nil) {
-    _playerNode = [self constructPlayerNode];
-
-    {
-      ASUnlockScope(self);
-      [self addSubnode:_playerNode];
-    }
-
-    [self setNeedsLayout];
-  }
-  
-  
-  [_player play];
-  _shouldBePlaying = YES;
-}
-
-- (BOOL)ready
-{
-  return _currentPlayerItem.status == AVPlayerItemStatusReadyToPlay;
-}
-
-- (void)pause
-{
-  ASLockScopeSelf();
-  if (![self isStateChangeValid:ASVideoNodePlayerStatePaused]) {
-    return;
-  }
-  [_player pause];
-  _shouldBePlaying = NO;
-}
-
-- (BOOL)isPlaying
-{
-  ASLockScopeSelf();
-  
-  return (_player.rate > 0 && !_player.error);
-}
-
-- (BOOL)isStateChangeValid:(ASVideoNodePlayerState)state
-{
-  if (_delegateFlags.delegateVideNodeShouldChangePlayerStateTo) {
-    if (![self.delegate videoNode:self shouldChangePlayerStateTo:state]) {
-      return NO;
-    }
-  }
-  return YES;
-}
-
-- (void)resetToPlaceholder
-{
-  ASLockScopeSelf();
-  
-  if (_playerNode != nil) {
-    [_playerNode removeFromSupernode];
-    _playerNode = nil;
-  }
-  
-  [_player seekToTime:kCMTimeZero];
-  [self pause];
-}
-
-
-#pragma mark - Playback observers
-
-- (void)applicationDidBecomeActive:(NSNotification *)notification
-{
-  if (self.shouldBePlaying && self.isVisible) {
-    [self play];
-  }
-}
-
-- (void)didPlayToEnd:(NSNotification *)notification
-{
-  self.playerState = ASVideoNodePlayerStateFinished;
-  if (_delegateFlags.delegateVideoDidPlayToEnd) {
-    [self.delegate videoDidPlayToEnd:self];
-  }
-
-  if (_shouldAutorepeat) {
-    [_player seekToTime:kCMTimeZero];
-    [self play];
-  } else {
-    [self pause];
-  }
-}
-
-- (void)videoNodeDidStall:(NSNotification *)notification
-{
-  self.playerState = ASVideoNodePlayerStateLoading;
-  if (_delegateFlags.delegateVideoNodeDidStallAtTimeInterval) {
-    [self.delegate videoNode:self didStallAtTimeInterval:CMTimeGetSeconds(_player.currentItem.currentTime)];
-  }
-}
-
-- (void)errorWhilePlaying:(NSNotification *)notification
-{
-  if ([notification.name isEqualToString:AVPlayerItemFailedToPlayToEndTimeNotification]) {
-    NSLog(@"Failed to play video");
-  } else if ([notification.name isEqualToString:AVPlayerItemNewErrorLogEntryNotification]) {
-    AVPlayerItem *item = (AVPlayerItem *)notification.object;
-    AVPlayerItemErrorLogEvent *logEvent = item.errorLog.events.lastObject;
-    NSLog(@"AVPlayerItem error log entry added for video with error %@ status %@", item.error,
-          (item.status == AVPlayerItemStatusFailed ? @"FAILED" : [NSString stringWithFormat:@"%ld", (long)item.status]));
-    NSLog(@"Item is %@", item);
-    
-    if (logEvent) {
-      NSLog(@"Log code %ld domain %@ comment %@", (long)logEvent.errorStatusCode, logEvent.errorDomain, logEvent.errorComment);
-    }
-  }
-}
-
-#pragma mark - Internal Properties
-
-- (AVPlayerItem *)currentItem
-{
-  ASLockScopeSelf();
-  return _currentPlayerItem;
-}
-
-- (void)setCurrentItem:(AVPlayerItem *)currentItem
-{
-  ASLockScopeSelf();
-
-  [self removePlayerItemObservers:_currentPlayerItem];
-
-  _currentPlayerItem = currentItem;
-
-  if (currentItem != nil) {
-    [self addPlayerItemObservers:currentItem];
-  }
-}
-
-- (ASDisplayNode *)playerNode
-{
-  ASLockScopeSelf();
-  return _playerNode;
-}
-
-- (void)setPlayerNode:(ASDisplayNode *)playerNode
-{
-  {
-    ASLockScopeSelf();
-    _playerNode = playerNode;
-  }
-
-  [self setNeedsLayout];
-}
-
-- (void)setPlayer:(AVPlayer *)player
-{
-  ASLockScopeSelf();
-
-  [self removePlayerObservers:_player];
-
-  _player = player;
-  player.muted = _muted;
-  ((AVPlayerLayer *)_playerNode.layer).player = player;
-
-  if (player != nil) {
-    [self addPlayerObservers:player];
-  }
-}
-
-- (BOOL)shouldBePlaying
-{
-  ASLockScopeSelf();
-  return _shouldBePlaying;
-}
-
-- (void)setShouldBePlaying:(BOOL)shouldBePlaying
-{
-  ASLockScopeSelf();
-  _shouldBePlaying = shouldBePlaying;
-}
-
-#pragma mark - Lifecycle
-
-- (void)dealloc
-{
-  [self removePlayerItemObservers:_currentPlayerItem];
-  [self removePlayerObservers:_player];
-
-  NSNotificationCenter *notificationCenter = [NSNotificationCenter defaultCenter];
-  [notificationCenter removeObserver:self name:UIApplicationDidBecomeActiveNotification object:nil];
-}
-
-@end
-#endif
-#endif
diff --git a/submodules/AsyncDisplayKit/Source/ASVideoPlayerNode.h b/submodules/AsyncDisplayKit/Source/ASVideoPlayerNode.h
deleted file mode 100644
index 879628051a..0000000000
--- a/submodules/AsyncDisplayKit/Source/ASVideoPlayerNode.h
+++ /dev/null
@@ -1,228 +0,0 @@
-//
-//  ASVideoPlayerNode.h
-//  Texture
-//
-//  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.
-//  Changes after 4/13/2017 are: Copyright (c) Pinterest, Inc.  All rights reserved.
-//  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
-//
-
-#ifndef MINIMAL_ASDK
-
-#import <AsyncDisplayKit/ASAvailability.h>
-
-#if AS_USE_VIDEO
-
-#if TARGET_OS_IOS
-#import <CoreMedia/CoreMedia.h>
-#import <AsyncDisplayKit/ASThread.h>
-#import <AsyncDisplayKit/ASVideoNode.h>
-#import <AsyncDisplayKit/ASDisplayNode+Subclasses.h>
-
-@class AVAsset;
-@class ASButtonNode;
-@protocol ASVideoPlayerNodeDelegate;
-
-typedef NS_ENUM(NSInteger, ASVideoPlayerNodeControlType) {
-  ASVideoPlayerNodeControlTypePlaybackButton,
-  ASVideoPlayerNodeControlTypeElapsedText,
-  ASVideoPlayerNodeControlTypeDurationText,
-  ASVideoPlayerNodeControlTypeScrubber,
-  ASVideoPlayerNodeControlTypeFullScreenButton,
-  ASVideoPlayerNodeControlTypeFlexGrowSpacer,
-};
-
-NS_ASSUME_NONNULL_BEGIN
-
-@interface ASVideoPlayerNode : ASDisplayNode
-
-@property (nullable, nonatomic, weak) id<ASVideoPlayerNodeDelegate> delegate;
-
-@property (nonatomic, readonly) CMTime duration;
-
-@property (nonatomic) BOOL controlsDisabled;
-
-#pragma mark - ASVideoNode property proxy
-/**
- * When shouldAutoplay is set to true, a video node will play when it has both loaded and entered the "visible" interfaceState.
- * If it leaves the visible interfaceState it will pause but will resume once it has returned.
- */
-@property (nonatomic) BOOL shouldAutoPlay;
-@property (nonatomic) BOOL shouldAutoRepeat;
-@property (nonatomic) BOOL muted;
-@property (nonatomic, readonly) ASVideoNodePlayerState playerState;
-@property (nonatomic) BOOL shouldAggressivelyRecoverFromStall;
-@property (nullable, nonatomic) NSURL *placeholderImageURL;
-
-@property (nullable, nonatomic) AVAsset *asset;
-/**
- ** @abstract The URL with which the asset was initialized.
- ** @discussion Setting the URL will override the current asset with a newly created AVURLAsset created from the given URL, and AVAsset *asset will point to that newly created AVURLAsset.  Please don't set both assetURL and asset.
- ** @return Current URL the asset was initialized or nil if no URL was given.
- **/
-@property (nullable, nonatomic) NSURL *assetURL;
-
-/// You should never set any value on the backing video node. Use exclusivively the video player node to set properties
-@property (nonatomic, readonly) ASVideoNode *videoNode;
-
-//! Defaults to 100
-@property (nonatomic) int32_t periodicTimeObserverTimescale;
-//! Defaults to AVLayerVideoGravityResizeAspect
-@property (nonatomic, copy) NSString *gravity;
-
-#pragma mark - Lifecycle
-- (instancetype)initWithURL:(NSURL *)URL;
-- (instancetype)initWithAsset:(AVAsset *)asset;
-- (instancetype)initWithAsset:(AVAsset *)asset videoComposition:(AVVideoComposition *)videoComposition audioMix:(AVAudioMix *)audioMix;
-
-#pragma mark - Public API
-- (void)seekToTime:(CGFloat)percentComplete;
-- (void)play;
-- (void)pause;
-- (BOOL)isPlaying;
-- (void)resetToPlaceholder;
-
-@end
-
-#pragma mark - ASVideoPlayerNodeDelegate -
-@protocol ASVideoPlayerNodeDelegate <NSObject>
-@optional
-/**
- * @abstract Delegate method invoked before creating controlbar controls
- * @param videoPlayer The sender
- */
-- (NSArray *)videoPlayerNodeNeededDefaultControls:(ASVideoPlayerNode*)videoPlayer;
-
-/**
- * @abstract Delegate method invoked before creating default controls, asks delegate for custom controls dictionary.
- * This dictionary must constain only ASDisplayNode subclass objects.
- * @param videoPlayer The sender
- * @discussion - This method is invoked only when developer implements videoPlayerNodeLayoutSpec:forControls:forMaximumSize:
- * and gives ability to add custom constrols to ASVideoPlayerNode, for example mute button.
- */
-- (NSDictionary *)videoPlayerNodeCustomControls:(ASVideoPlayerNode*)videoPlayer;
-
-/**
- * @abstract Delegate method invoked in layoutSpecThatFits:
- * @param videoPlayer The sender
- * @param controls - Dictionary of controls which are used in videoPlayer; Dictionary keys are ASVideoPlayerNodeControlType
- * @param maxSize - Maximum size for ASVideoPlayerNode
- * @discussion - Developer can layout whole ASVideoPlayerNode as he wants. ASVideoNode is locked and it can't be changed
- */
-- (ASLayoutSpec *)videoPlayerNodeLayoutSpec:(ASVideoPlayerNode *)videoPlayer
-                                forControls:(NSDictionary *)controls
-                             forMaximumSize:(CGSize)maxSize;
-
-#pragma mark Text delegate methods
-/**
- * @abstract Delegate method invoked before creating ASVideoPlayerNodeControlTypeElapsedText and ASVideoPlayerNodeControlTypeDurationText
- * @param videoPlayer The sender
- * @param timeLabelType The of the time label
- */
-- (NSDictionary *)videoPlayerNodeTimeLabelAttributes:(ASVideoPlayerNode *)videoPlayer timeLabelType:(ASVideoPlayerNodeControlType)timeLabelType;
-- (NSString *)videoPlayerNode:(ASVideoPlayerNode *)videoPlayerNode
-   timeStringForTimeLabelType:(ASVideoPlayerNodeControlType)timeLabelType
-                      forTime:(CMTime)time;
-
-#pragma mark Scrubber delegate methods
-- (UIColor *)videoPlayerNodeScrubberMaximumTrackTint:(ASVideoPlayerNode *)videoPlayer;
-- (UIColor *)videoPlayerNodeScrubberMinimumTrackTint:(ASVideoPlayerNode *)videoPlayer;
-- (UIColor *)videoPlayerNodeScrubberThumbTint:(ASVideoPlayerNode *)videoPlayer;
-- (UIImage *)videoPlayerNodeScrubberThumbImage:(ASVideoPlayerNode *)videoPlayer;
-
-#pragma mark - Spinner delegate methods
-- (UIColor *)videoPlayerNodeSpinnerTint:(ASVideoPlayerNode *)videoPlayer;
-- (UIActivityIndicatorViewStyle)videoPlayerNodeSpinnerStyle:(ASVideoPlayerNode *)videoPlayer;
-
-#pragma mark - Playback button delegate methods
-- (UIColor *)videoPlayerNodePlaybackButtonTint:(ASVideoPlayerNode *)videoPlayer;
-
-#pragma mark - Fullscreen button delegate methods
-
-- (UIImage *)videoPlayerNodeFullScreenButtonImage:(ASVideoPlayerNode *)videoPlayer;
-
-
-#pragma mark ASVideoNodeDelegate proxy methods
-/**
- * @abstract Delegate method invoked when ASVideoPlayerNode is taped.
- * @param videoPlayer The ASVideoPlayerNode that was tapped.
- */
-- (void)didTapVideoPlayerNode:(ASVideoPlayerNode *)videoPlayer;
-
-/**
- * @abstract Delegate method invoked when fullcreen button is taped.
- * @param buttonNode The fullscreen button node that was tapped.
- */
-- (void)didTapFullScreenButtonNode:(ASButtonNode *)buttonNode;
-
-/**
- * @abstract Delegate method invoked when ASVideoNode playback time is updated.
- * @param videoPlayer The video player node
- * @param time current playback time.
- */
-- (void)videoPlayerNode:(ASVideoPlayerNode *)videoPlayer didPlayToTime:(CMTime)time;
-
-/**
- * @abstract Delegate method invoked when ASVideoNode changes state.
- * @param videoPlayer The ASVideoPlayerNode whose ASVideoNode is changing state.
- * @param state ASVideoNode state before this change.
- * @param toState ASVideoNode new state.
- * @discussion This method is called after each state change
- */
-- (void)videoPlayerNode:(ASVideoPlayerNode *)videoPlayer willChangeVideoNodeState:(ASVideoNodePlayerState)state toVideoNodeState:(ASVideoNodePlayerState)toState;
-
-/**
- * @abstract Delegate method is invoked when ASVideoNode decides to change state.
- * @param videoPlayer The ASVideoPlayerNode whose ASVideoNode is changing state.
- * @param state ASVideoNode that is going to be set.
- * @discussion Delegate method invoked when player changes it's state to
- * ASVideoNodePlayerStatePlaying or ASVideoNodePlayerStatePaused
- * and asks delegate if state change is valid
- */
-- (BOOL)videoPlayerNode:(ASVideoPlayerNode*)videoPlayer shouldChangeVideoNodeStateTo:(ASVideoNodePlayerState)state;
-
-/**
- * @abstract Delegate method invoked when the ASVideoNode has played to its end time.
- * @param videoPlayer The video node has played to its end time.
- */
-- (void)videoPlayerNodeDidPlayToEnd:(ASVideoPlayerNode *)videoPlayer;
-
-/**
- * @abstract Delegate method invoked when the ASVideoNode has constructed its AVPlayerItem for the asset.
- * @param videoPlayer The video player node.
- * @param currentItem The AVPlayerItem that was constructed from the asset.
- */
-- (void)videoPlayerNode:(ASVideoPlayerNode *)videoPlayer didSetCurrentItem:(AVPlayerItem *)currentItem;
-
-/**
- * @abstract Delegate method invoked when the ASVideoNode stalls.
- * @param videoPlayer The video player node that has experienced the stall
- * @param timeInterval Current playback time when the stall happens
- */
-- (void)videoPlayerNode:(ASVideoPlayerNode *)videoPlayer didStallAtTimeInterval:(NSTimeInterval)timeInterval;
-
-/**
- * @abstract Delegate method invoked when the ASVideoNode starts the inital asset loading
- * @param videoPlayer The videoPlayer
- */
-- (void)videoPlayerNodeDidStartInitialLoading:(ASVideoPlayerNode *)videoPlayer;
-
-/**
- * @abstract Delegate method invoked when the ASVideoNode is done loading the asset and can start the playback
- * @param videoPlayer The videoPlayer
- */
-- (void)videoPlayerNodeDidFinishInitialLoading:(ASVideoPlayerNode *)videoPlayer;
-
-/**
- * @abstract Delegate method invoked when the ASVideoNode has recovered from the stall
- * @param videoPlayer The videoplayer
- */
-- (void)videoPlayerNodeDidRecoverFromStall:(ASVideoPlayerNode *)videoPlayer;
-
-
-@end
-NS_ASSUME_NONNULL_END
-#endif
-
-#endif
-#endif  // TARGET_OS_IOS
diff --git a/submodules/AsyncDisplayKit/Source/ASVideoPlayerNode.mm b/submodules/AsyncDisplayKit/Source/ASVideoPlayerNode.mm
deleted file mode 100644
index eaa8cd91a9..0000000000
--- a/submodules/AsyncDisplayKit/Source/ASVideoPlayerNode.mm
+++ /dev/null
@@ -1,1024 +0,0 @@
-//
-//  ASVideoPlayerNode.mm
-//  Texture
-//
-//  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.
-//  Changes after 4/13/2017 are: Copyright (c) Pinterest, Inc.  All rights reserved.
-//  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
-//
-
-#import <Foundation/Foundation.h>
-
-#ifndef MINIMAL_ASDK
-
-#import <AsyncDisplayKit/ASVideoPlayerNode.h>
-
-#if AS_USE_VIDEO
-#if TARGET_OS_IOS
-
-#import <AVFoundation/AVFoundation.h>
-
-#import <AsyncDisplayKit/AsyncDisplayKit.h>
-#import <AsyncDisplayKit/ASDefaultPlaybackButton.h>
-#import <AsyncDisplayKit/ASDisplayNode+Subclasses.h>
-#import <AsyncDisplayKit/ASDisplayNodeInternal.h>
-#import <AsyncDisplayKit/ASThread.h>
-
-static void *ASVideoPlayerNodeContext = &ASVideoPlayerNodeContext;
-
-@interface ASVideoPlayerNode() <ASVideoNodeDelegate, ASVideoPlayerNodeDelegate>
-{
-  __weak id<ASVideoPlayerNodeDelegate> _delegate;
-
-  struct {
-    unsigned int delegateNeededDefaultControls:1;
-    unsigned int delegateCustomControls:1;
-    unsigned int delegateSpinnerTintColor:1;
-    unsigned int delegateSpinnerStyle:1;
-    unsigned int delegatePlaybackButtonTint:1;
-    unsigned int delegateFullScreenButtonImage:1;
-    unsigned int delegateScrubberMaximumTrackTintColor:1;
-    unsigned int delegateScrubberMinimumTrackTintColor:1;
-    unsigned int delegateScrubberThumbTintColor:1;
-    unsigned int delegateScrubberThumbImage:1;
-    unsigned int delegateTimeLabelAttributes:1;
-    unsigned int delegateTimeLabelAttributedString:1;
-    unsigned int delegateLayoutSpecForControls:1;
-    unsigned int delegateVideoNodeDidPlayToTime:1;
-    unsigned int delegateVideoNodeWillChangeState:1;
-    unsigned int delegateVideoNodeShouldChangeState:1;
-    unsigned int delegateVideoNodePlaybackDidFinish:1;
-    unsigned int delegateDidTapVideoPlayerNode:1;
-    unsigned int delegateDidTapFullScreenButtonNode:1;
-    unsigned int delegateVideoPlayerNodeDidSetCurrentItem:1;
-    unsigned int delegateVideoPlayerNodeDidStallAtTimeInterval:1;
-    unsigned int delegateVideoPlayerNodeDidStartInitialLoading:1;
-    unsigned int delegateVideoPlayerNodeDidFinishInitialLoading:1;
-    unsigned int delegateVideoPlayerNodeDidRecoverFromStall:1;
-  } _delegateFlags;
-  
-  // The asset passed in the initializer will be assigned as pending asset. As soon as the first
-  // preload state happened all further asset handling is made by using the asset of the backing
-  // video node
-  AVAsset *_pendingAsset;
-  
-  // The backing video node. Ideally this is the source of truth and the video player node should
-  // not handle anything related to asset management
-  ASVideoNode *_videoNode;
-
-  NSArray *_neededDefaultControls;
-
-  NSMutableDictionary *_cachedControls;
-
-  ASDefaultPlaybackButton *_playbackButtonNode;
-  ASButtonNode *_fullScreenButtonNode;
-  ASTextNode  *_elapsedTextNode;
-  ASTextNode  *_durationTextNode;
-  ASDisplayNode *_scrubberNode;
-  ASStackLayoutSpec *_controlFlexGrowSpacerSpec;
-  ASDisplayNode *_spinnerNode;
-
-  BOOL _isSeeking;
-  CMTime _duration;
-
-  BOOL _controlsDisabled;
-
-  BOOL _shouldAutoPlay;
-  BOOL _shouldAutoRepeat;
-  BOOL _muted;
-  int32_t _periodicTimeObserverTimescale;
-  NSString *_gravity;
-
-  BOOL _shouldAggressivelyRecoverFromStall;
-
-  UIColor *_defaultControlsColor;
-}
-
-@end
-
-@implementation ASVideoPlayerNode
-
-@dynamic placeholderImageURL;
-
-#pragma mark - Lifecycle
-
-- (instancetype)init
-{
-  if (!(self = [super init])) {
-    return nil;
-  }
-
-  [self _initControlsAndVideoNode];
-
-  return self;
-}
-
-- (instancetype)initWithAsset:(AVAsset *)asset
-{
-  if (!(self = [self init])) {
-    return nil;
-  }
-  
-  _pendingAsset = asset;
-  
-  return self;
-}
-
-- (instancetype)initWithURL:(NSURL *)URL
-{
-  return [self initWithAsset:[AVAsset assetWithURL:URL]];
-}
-
-- (instancetype)initWithAsset:(AVAsset *)asset videoComposition:(AVVideoComposition *)videoComposition audioMix:(AVAudioMix *)audioMix
-{
-  if (!(self = [self initWithAsset:asset])) {
-    return nil;
-  }
-  
-  _videoNode.videoComposition = videoComposition;
-  _videoNode.audioMix = audioMix;
-
-  return self;
-}
-
-- (void)_initControlsAndVideoNode
-{
-  _defaultControlsColor = [UIColor whiteColor];
-  _cachedControls = [[NSMutableDictionary alloc] init];
-  
-  _videoNode = [[ASVideoNode alloc] init];
-  _videoNode.delegate = self;
-  [self addSubnode:_videoNode];
-}
-
-#pragma mark - Setter / Getter
-
-- (void)setAssetURL:(NSURL *)assetURL
-{
-  ASDisplayNodeAssertMainThread();
-  
-  self.asset = [AVAsset assetWithURL:assetURL];
-}
-
-- (NSURL *)assetURL
-{
-  NSURL *url = nil;
-  {
-    ASLockScopeSelf();
-    if ([_pendingAsset isKindOfClass:AVURLAsset.class]) {
-      url = ((AVURLAsset *)_pendingAsset).URL;
-    }
-  }
-  
-  return url ?: _videoNode.assetURL;
-}
-
-- (void)setAsset:(AVAsset *)asset
-{
-  ASDisplayNodeAssertMainThread();
-
-  [self lock];
-  
-  // Clean out pending asset
-  _pendingAsset = nil;
-  
-  // Set asset based on interface state
-  if ((ASInterfaceStateIncludesPreload(self.interfaceState))) {
-    // Don't hold the lock while accessing the subnode
-    [self unlock];
-    _videoNode.asset = asset;
-    return;
-  }
-  
-  _pendingAsset = asset;
-  [self unlock];
-}
-
-- (AVAsset *)asset
-{
-  return ASLockedSelf(_pendingAsset) ?: _videoNode.asset;
-}
-
-#pragma mark - ASDisplayNode
-
-- (void)didLoad
-{
-  [super didLoad];
-  
-  [self createControls];
-}
-
-- (void)didEnterPreloadState
-{
-  [super didEnterPreloadState];
-  
-  AVAsset *pendingAsset = nil;
-  {
-    ASLockScopeSelf();
-    pendingAsset = _pendingAsset;
-    _pendingAsset = nil;
-  }
-
-  // If we enter preload state we apply the pending asset to load to the video node so it can start and fetch the asset
-  if (pendingAsset != nil && _videoNode.asset != pendingAsset) {
-    _videoNode.asset = pendingAsset;
-  }
-}
-
-- (BOOL)supportsLayerBacking
-{
-  return NO;
-}
-
-#pragma mark - UI
-
-- (void)createControls
-{
-  {
-    ASLockScopeSelf();
-
-    if (_controlsDisabled) {
-      return;
-    }
-
-    if (_neededDefaultControls == nil) {
-      _neededDefaultControls = [self createDefaultControlElementArray];
-    }
-
-    if (_cachedControls == nil) {
-      _cachedControls = [[NSMutableDictionary alloc] init];
-    }
-
-    for (id object in _neededDefaultControls) {
-      ASVideoPlayerNodeControlType type = (ASVideoPlayerNodeControlType)[object integerValue];
-      switch (type) {
-        case ASVideoPlayerNodeControlTypePlaybackButton:
-          [self _locked_createPlaybackButton];
-          break;
-        case ASVideoPlayerNodeControlTypeElapsedText:
-          [self _locked_createElapsedTextField];
-          break;
-        case ASVideoPlayerNodeControlTypeDurationText:
-          [self _locked_createDurationTextField];
-          break;
-        case ASVideoPlayerNodeControlTypeScrubber:
-          [self _locked_createScrubber];
-          break;
-        case ASVideoPlayerNodeControlTypeFullScreenButton:
-          [self _locked_createFullScreenButton];
-          break;
-        case ASVideoPlayerNodeControlTypeFlexGrowSpacer:
-          [self _locked_createControlFlexGrowSpacer];
-          break;
-        default:
-          break;
-      }
-    }
-
-    if (_delegateFlags.delegateCustomControls && _delegateFlags.delegateLayoutSpecForControls) {
-      NSDictionary *customControls = [_delegate videoPlayerNodeCustomControls:self];
-      std::vector<ASDisplayNode *> subnodes;
-      for (id key in customControls) {
-        id node = customControls[key];
-        if (![node isKindOfClass:[ASDisplayNode class]]) {
-          continue;
-        }
-
-        subnodes.push_back(node);
-        [_cachedControls setObject:node forKey:key];
-      }
-      
-      {
-        ASUnlockScope(self);
-        for (ASDisplayNode *subnode : subnodes) {
-          [self addSubnode:subnode];
-        }
-      }
-    }
-  }
-
-  ASPerformBlockOnMainThread(^{
-    [self setNeedsLayout];
-  });
-}
-
-- (NSArray *)createDefaultControlElementArray
-{
-  if (_delegateFlags.delegateNeededDefaultControls) {
-    return [_delegate videoPlayerNodeNeededDefaultControls:self];
-  }
-
-  return @[ @(ASVideoPlayerNodeControlTypePlaybackButton),
-            @(ASVideoPlayerNodeControlTypeElapsedText),
-            @(ASVideoPlayerNodeControlTypeScrubber),
-            @(ASVideoPlayerNodeControlTypeDurationText) ];
-}
-
-- (void)removeControls
-{
-  NSMutableDictionary *cachedControls = nil;
-  {
-    ASLockScope(self);
-  
-    // Grab the cached controls for removing it
-    cachedControls = [_cachedControls copy];
-    [self _locked_cleanCachedControls];
-  }
-
-  for (ASDisplayNode *node in [cachedControls objectEnumerator]) {
-    [node removeFromSupernode];
-  }
-}
-
-- (void)_locked_cleanCachedControls
-{
-  [_cachedControls removeAllObjects];
-
-  _playbackButtonNode = nil;
-  _fullScreenButtonNode = nil;
-  _elapsedTextNode = nil;
-  _durationTextNode = nil;
-  _scrubberNode = nil;
-}
-
-- (void)_locked_createPlaybackButton
-{
-  ASAssertLocked(__instanceLock__);
-  
-  if (_playbackButtonNode == nil) {
-    _playbackButtonNode = [[ASDefaultPlaybackButton alloc] init];
-    _playbackButtonNode.style.preferredSize = CGSizeMake(16.0, 22.0);
-
-    if (_delegateFlags.delegatePlaybackButtonTint) {
-      _playbackButtonNode.tintColor = [_delegate videoPlayerNodePlaybackButtonTint:self];
-    } else {
-      _playbackButtonNode.tintColor = _defaultControlsColor;
-    }
-
-    if (_videoNode.playerState == ASVideoNodePlayerStatePlaying) {
-      _playbackButtonNode.buttonType = ASDefaultPlaybackButtonTypePause;
-    }
-
-    [_playbackButtonNode addTarget:self action:@selector(didTapPlaybackButton:) forControlEvents:ASControlNodeEventTouchUpInside];
-    [_cachedControls setObject:_playbackButtonNode forKey:@(ASVideoPlayerNodeControlTypePlaybackButton)];
-  }
-
-  {
-    ASUnlockScope(self);
-    [self addSubnode:_playbackButtonNode];
-  }
-}
-
-- (void)_locked_createFullScreenButton
-{
-  ASAssertLocked(__instanceLock__);
-  
-  if (_fullScreenButtonNode == nil) {
-    _fullScreenButtonNode = [[ASButtonNode alloc] init];
-    _fullScreenButtonNode.style.preferredSize = CGSizeMake(16.0, 22.0);
-    
-    if (_delegateFlags.delegateFullScreenButtonImage) {
-      [_fullScreenButtonNode setImage:[_delegate videoPlayerNodeFullScreenButtonImage:self] forState:UIControlStateNormal];
-    }
-
-    [_fullScreenButtonNode addTarget:self action:@selector(didTapFullScreenButton:) forControlEvents:ASControlNodeEventTouchUpInside];
-    [_cachedControls setObject:_fullScreenButtonNode forKey:@(ASVideoPlayerNodeControlTypeFullScreenButton)];
-  }
-  
-  {
-    ASUnlockScope(self);
-    [self addSubnode:_fullScreenButtonNode];
-  }
-}
-
-- (void)_locked_createElapsedTextField
-{
-  ASAssertLocked(__instanceLock__);
-  
-  if (_elapsedTextNode == nil) {
-    _elapsedTextNode = [[ASTextNode alloc] init];
-    _elapsedTextNode.attributedText = [self timeLabelAttributedStringForString:@"00:00"
-                                                                  forControlType:ASVideoPlayerNodeControlTypeElapsedText];
-    _elapsedTextNode.truncationMode = NSLineBreakByClipping;
-
-    [_cachedControls setObject:_elapsedTextNode forKey:@(ASVideoPlayerNodeControlTypeElapsedText)];
-  }
-  {
-    ASUnlockScope(self);
-    [self addSubnode:_elapsedTextNode];
-  }
-}
-
-- (void)_locked_createDurationTextField
-{
-  ASAssertLocked(__instanceLock__);
-  
-  if (_durationTextNode == nil) {
-    _durationTextNode = [[ASTextNode alloc] init];
-    _durationTextNode.attributedText = [self timeLabelAttributedStringForString:@"00:00"
-                                                                   forControlType:ASVideoPlayerNodeControlTypeDurationText];
-    _durationTextNode.truncationMode = NSLineBreakByClipping;
-
-    [_cachedControls setObject:_durationTextNode forKey:@(ASVideoPlayerNodeControlTypeDurationText)];
-  }
-  [self updateDurationTimeLabel];
-  {
-    ASUnlockScope(self);
-    [self addSubnode:_durationTextNode];
-  }
-}
-
-- (void)_locked_createScrubber
-{
-  ASAssertLocked(__instanceLock__);
-  
-  if (_scrubberNode == nil) {
-    __weak __typeof__(self) weakSelf = self;
-    _scrubberNode = [[ASDisplayNode alloc] initWithViewBlock:^UIView * _Nonnull {
-      __typeof__(self) strongSelf = weakSelf;
-      
-      UISlider *slider = [[UISlider alloc] initWithFrame:CGRectZero];
-      slider.minimumValue = 0.0;
-      slider.maximumValue = 1.0;
-
-      if (_delegateFlags.delegateScrubberMinimumTrackTintColor) {
-        slider.minimumTrackTintColor  = [strongSelf.delegate videoPlayerNodeScrubberMinimumTrackTint:strongSelf];
-      }
-
-      if (_delegateFlags.delegateScrubberMaximumTrackTintColor) {
-        slider.maximumTrackTintColor  = [strongSelf.delegate videoPlayerNodeScrubberMaximumTrackTint:strongSelf];
-      }
-
-      if (_delegateFlags.delegateScrubberThumbTintColor) {
-        slider.thumbTintColor  = [strongSelf.delegate videoPlayerNodeScrubberThumbTint:strongSelf];
-      }
-
-      if (_delegateFlags.delegateScrubberThumbImage) {
-        UIImage *thumbImage = [strongSelf.delegate videoPlayerNodeScrubberThumbImage:strongSelf];
-        [slider setThumbImage:thumbImage forState:UIControlStateNormal];
-      }
-
-
-      [slider addTarget:strongSelf action:@selector(beginSeek) forControlEvents:UIControlEventTouchDown];
-      [slider addTarget:strongSelf action:@selector(endSeek) forControlEvents:UIControlEventTouchUpInside|UIControlEventTouchUpOutside|UIControlEventTouchCancel];
-      [slider addTarget:strongSelf action:@selector(seekTimeDidChange:) forControlEvents:UIControlEventValueChanged];
-
-      return slider;
-    }];
-
-    _scrubberNode.style.flexShrink = 1;
-
-    [_cachedControls setObject:_scrubberNode forKey:@(ASVideoPlayerNodeControlTypeScrubber)];
-  }
-  {
-    ASUnlockScope(self);
-    [self addSubnode:_scrubberNode];
-  }
-}
-
-- (void)_locked_createControlFlexGrowSpacer
-{
-  ASAssertLocked(__instanceLock__);
-  
-  if (_controlFlexGrowSpacerSpec == nil) {
-    _controlFlexGrowSpacerSpec = [[ASStackLayoutSpec alloc] init];
-    _controlFlexGrowSpacerSpec.style.flexGrow = 1.0;
-  }
-
-  [_cachedControls setObject:_controlFlexGrowSpacerSpec forKey:@(ASVideoPlayerNodeControlTypeFlexGrowSpacer)];
-}
-
-- (void)updateDurationTimeLabel
-{
-  if (!_durationTextNode) {
-    return;
-  }
-  NSString *formattedDuration = [self timeStringForCMTime:_duration forTimeLabelType:ASVideoPlayerNodeControlTypeDurationText];
-  _durationTextNode.attributedText = [self timeLabelAttributedStringForString:formattedDuration forControlType:ASVideoPlayerNodeControlTypeDurationText];
-}
-
-- (void)updateElapsedTimeLabel:(NSTimeInterval)seconds
-{
-  if (!_elapsedTextNode) {
-    return;
-  }
-  NSString *formattedElapsed = [self timeStringForCMTime:CMTimeMakeWithSeconds( seconds, _videoNode.periodicTimeObserverTimescale ) forTimeLabelType:ASVideoPlayerNodeControlTypeElapsedText];
-  _elapsedTextNode.attributedText = [self timeLabelAttributedStringForString:formattedElapsed forControlType:ASVideoPlayerNodeControlTypeElapsedText];
-}
-
-- (NSAttributedString*)timeLabelAttributedStringForString:(NSString*)string forControlType:(ASVideoPlayerNodeControlType)controlType
-{
-  NSDictionary *options;
-  if (_delegateFlags.delegateTimeLabelAttributes) {
-    options = [_delegate videoPlayerNodeTimeLabelAttributes:self timeLabelType:controlType];
-  } else {
-    options = @{
-                NSFontAttributeName : [UIFont systemFontOfSize:12.0],
-                NSForegroundColorAttributeName: _defaultControlsColor
-                };
-  }
-
-
-  NSAttributedString *attributedString = [[NSAttributedString alloc] initWithString:string attributes:options];
-
-  return attributedString;
-}
-
-#pragma mark - ASVideoNodeDelegate
-- (void)videoNode:(ASVideoNode *)videoNode willChangePlayerState:(ASVideoNodePlayerState)state toState:(ASVideoNodePlayerState)toState
-{
-  if (_delegateFlags.delegateVideoNodeWillChangeState) {
-    [_delegate videoPlayerNode:self willChangeVideoNodeState:state toVideoNodeState:toState];
-  }
-
-  if (toState == ASVideoNodePlayerStateReadyToPlay) {
-    _duration = _videoNode.currentItem.duration;
-    [self updateDurationTimeLabel];
-  }
-
-  if (toState == ASVideoNodePlayerStatePlaying) {
-    _playbackButtonNode.buttonType = ASDefaultPlaybackButtonTypePause;
-    [self removeSpinner];
-  } else if (toState != ASVideoNodePlayerStatePlaybackLikelyToKeepUpButNotPlaying && toState != ASVideoNodePlayerStateReadyToPlay) {
-    _playbackButtonNode.buttonType = ASDefaultPlaybackButtonTypePlay;
-  }
-
-  if (toState == ASVideoNodePlayerStateLoading || toState == ASVideoNodePlayerStateInitialLoading) {
-    [self showSpinner];
-  }
-
-  if (toState == ASVideoNodePlayerStateReadyToPlay || toState == ASVideoNodePlayerStatePaused || toState == ASVideoNodePlayerStatePlaybackLikelyToKeepUpButNotPlaying) {
-    [self removeSpinner];
-  }
-}
-
-- (BOOL)videoNode:(ASVideoNode *)videoNode shouldChangePlayerStateTo:(ASVideoNodePlayerState)state
-{
-  if (_delegateFlags.delegateVideoNodeShouldChangeState) {
-    return [_delegate videoPlayerNode:self shouldChangeVideoNodeStateTo:state];
-  }
-  return YES;
-}
-
-- (void)videoNode:(ASVideoNode *)videoNode didPlayToTimeInterval:(NSTimeInterval)timeInterval
-{
-  if (_delegateFlags.delegateVideoNodeDidPlayToTime) {
-    [_delegate videoPlayerNode:self didPlayToTime:_videoNode.player.currentTime];
-  }
-
-  if (_isSeeking) {
-    return;
-  }
-
-  if (_elapsedTextNode) {
-    [self updateElapsedTimeLabel:timeInterval];
-  }
-
-  if (_scrubberNode) {
-    [(UISlider*)_scrubberNode.view setValue:( timeInterval / CMTimeGetSeconds(_duration) ) animated:NO];
-  }
-}
-
-- (void)videoDidPlayToEnd:(ASVideoNode *)videoNode
-{
-  if (_delegateFlags.delegateVideoNodePlaybackDidFinish) {
-    [_delegate videoPlayerNodeDidPlayToEnd:self];
-  }
-}
-
-- (void)didTapVideoNode:(ASVideoNode *)videoNode
-{
-  if (_delegateFlags.delegateDidTapVideoPlayerNode) {
-    [_delegate didTapVideoPlayerNode:self];
-  } else {
-    [self togglePlayPause];
-  }
-}
-
-- (void)videoNode:(ASVideoNode *)videoNode didSetCurrentItem:(AVPlayerItem *)currentItem
-{
-  if (_delegateFlags.delegateVideoPlayerNodeDidSetCurrentItem) {
-    [_delegate videoPlayerNode:self didSetCurrentItem:currentItem];
-  }
-}
-
-- (void)videoNode:(ASVideoNode *)videoNode didStallAtTimeInterval:(NSTimeInterval)timeInterval
-{
-  if (_delegateFlags.delegateVideoPlayerNodeDidStallAtTimeInterval) {
-    [_delegate videoPlayerNode:self didStallAtTimeInterval:timeInterval];
-  }
-}
-
-- (void)videoNodeDidStartInitialLoading:(ASVideoNode *)videoNode
-{
-  if (_delegateFlags.delegateVideoPlayerNodeDidStartInitialLoading) {
-    [_delegate videoPlayerNodeDidStartInitialLoading:self];
-  }
-}
-
-- (void)videoNodeDidFinishInitialLoading:(ASVideoNode *)videoNode
-{
-  if (_delegateFlags.delegateVideoPlayerNodeDidFinishInitialLoading) {
-    [_delegate videoPlayerNodeDidFinishInitialLoading:self];
-  }
-}
-
-- (void)videoNodeDidRecoverFromStall:(ASVideoNode *)videoNode
-{
-  if (_delegateFlags.delegateVideoPlayerNodeDidRecoverFromStall) {
-    [_delegate videoPlayerNodeDidRecoverFromStall:self];
-  }
-}
-
-#pragma mark - Actions
-- (void)togglePlayPause
-{
-  if (_videoNode.playerState == ASVideoNodePlayerStatePlaying) {
-    [_videoNode pause];
-  } else {
-    [_videoNode play];
-  }
-}
-
-- (void)showSpinner
-{
-  ASLockScopeSelf();
-
-  if (!_spinnerNode) {
-    __weak __typeof__(self) weakSelf = self;
-    _spinnerNode = [[ASDisplayNode alloc] initWithViewBlock:^UIView *{
-      __typeof__(self) strongSelf = weakSelf;
-      UIActivityIndicatorView *spinnnerView = [[UIActivityIndicatorView alloc] init];
-      spinnnerView.backgroundColor = [UIColor clearColor];
-
-      if (_delegateFlags.delegateSpinnerTintColor) {
-        spinnnerView.color = [_delegate videoPlayerNodeSpinnerTint:strongSelf];
-      } else {
-        spinnnerView.color = _defaultControlsColor;
-      }
-      
-      if (_delegateFlags.delegateSpinnerStyle) {
-        spinnnerView.activityIndicatorViewStyle = [_delegate videoPlayerNodeSpinnerStyle:strongSelf];
-      }
-      
-      return spinnnerView;
-    }];
-    _spinnerNode.style.preferredSize = CGSizeMake(44.0, 44.0);
-    
-    const auto spinnerNode = _spinnerNode;
-    {
-      ASUnlockScope(self);
-      [self addSubnode:spinnerNode];
-      [self setNeedsLayout];
-    }
-  }
-  [(UIActivityIndicatorView *)_spinnerNode.view startAnimating];
-}
-
-- (void)removeSpinner
-{
-  ASDisplayNode *spinnerNode = nil;
-  {
-    ASLockScopeSelf();
-    if (!_spinnerNode) {
-      return;
-    }
-    
-    spinnerNode = _spinnerNode;
-    _spinnerNode = nil;
-  }
-
-  [spinnerNode removeFromSupernode];
-}
-
-- (void)didTapPlaybackButton:(ASControlNode*)node
-{
-  [self togglePlayPause];
-}
-
-- (void)didTapFullScreenButton:(ASButtonNode*)node
-{
-  if (_delegateFlags.delegateDidTapFullScreenButtonNode) {
-    [_delegate didTapFullScreenButtonNode:node];
-  }
-}
-
-- (void)beginSeek
-{
-  _isSeeking = YES;
-}
-
-- (void)endSeek
-{
-  _isSeeking = NO;
-}
-
-- (void)seekTimeDidChange:(UISlider*)slider
-{
-  CGFloat percentage = slider.value * 100;
-  [self seekToTime:percentage];
-}
-
-#pragma mark - Public API
-- (void)seekToTime:(CGFloat)percentComplete
-{
-  CGFloat seconds = ( CMTimeGetSeconds(_duration) * percentComplete ) / 100;
-
-  [self updateElapsedTimeLabel:seconds];
-  [_videoNode.player seekToTime:CMTimeMakeWithSeconds(seconds, _videoNode.periodicTimeObserverTimescale)];
-
-  if (_videoNode.playerState != ASVideoNodePlayerStatePlaying) {
-    [self togglePlayPause];
-  }
-}
-
-- (void)play
-{
-  [_videoNode play];
-}
-
-- (void)pause
-{
-  [_videoNode pause];
-}
-
-- (BOOL)isPlaying
-{
-  return [_videoNode isPlaying];
-}
-
-- (void)resetToPlaceholder
-{
-  [_videoNode resetToPlaceholder];
-}
-
-- (NSArray *)controlsForLayoutSpec
-{
-  NSMutableArray *controls = [[NSMutableArray alloc] initWithCapacity:_cachedControls.count];
-
-  if (_cachedControls[ @(ASVideoPlayerNodeControlTypePlaybackButton) ]) {
-    [controls addObject:_cachedControls[ @(ASVideoPlayerNodeControlTypePlaybackButton) ]];
-  }
-
-  if (_cachedControls[ @(ASVideoPlayerNodeControlTypeElapsedText) ]) {
-    [controls addObject:_cachedControls[ @(ASVideoPlayerNodeControlTypeElapsedText) ]];
-  }
-
-  if (_cachedControls[ @(ASVideoPlayerNodeControlTypeScrubber) ]) {
-    [controls addObject:_cachedControls[ @(ASVideoPlayerNodeControlTypeScrubber) ]];
-  }
-
-  if (_cachedControls[ @(ASVideoPlayerNodeControlTypeDurationText) ]) {
-    [controls addObject:_cachedControls[ @(ASVideoPlayerNodeControlTypeDurationText) ]];
-  }
-  
-  if (_cachedControls[ @(ASVideoPlayerNodeControlTypeFullScreenButton) ]) {
-    [controls addObject:_cachedControls[ @(ASVideoPlayerNodeControlTypeFullScreenButton) ]];
-  }
-
-  return controls;
-}
-
-
-#pragma mark - Layout
-
-- (ASLayoutSpec *)layoutSpecThatFits:(ASSizeRange)constrainedSize
-{
-  CGSize maxSize = constrainedSize.max;
-
-  // Prevent crashes through if infinite width or height
-  if (isinf(maxSize.width) || isinf(maxSize.height)) {
-    ASDisplayNodeAssert(NO, @"Infinite width or height in ASVideoPlayerNode");
-    maxSize = CGSizeZero;
-  }
-
-  _videoNode.style.preferredSize = maxSize;
-
-  ASLayoutSpec *layoutSpec;
-  if (_delegateFlags.delegateLayoutSpecForControls) {
-    layoutSpec = [_delegate videoPlayerNodeLayoutSpec:self forControls:_cachedControls forMaximumSize:maxSize];
-  } else {
-    layoutSpec = [self defaultLayoutSpecThatFits:maxSize];
-  }
-
-  NSMutableArray *children = [[NSMutableArray alloc] init];
-
-  if (_spinnerNode) {
-    ASCenterLayoutSpec *centerLayoutSpec = [ASCenterLayoutSpec centerLayoutSpecWithCenteringOptions:ASCenterLayoutSpecCenteringXY sizingOptions:ASCenterLayoutSpecSizingOptionDefault child:_spinnerNode];
-    centerLayoutSpec.style.preferredSize = maxSize;
-    [children addObject:centerLayoutSpec];
-  }
-
-  ASOverlayLayoutSpec *overlaySpec = [ASOverlayLayoutSpec overlayLayoutSpecWithChild:_videoNode overlay:layoutSpec];
-  overlaySpec.style.preferredSize = maxSize;
-  [children addObject:overlaySpec];
-
-  return [ASAbsoluteLayoutSpec absoluteLayoutSpecWithChildren:children];
-}
-
-- (ASLayoutSpec *)defaultLayoutSpecThatFits:(CGSize)maxSize
-{
-  _scrubberNode.style.preferredSize = CGSizeMake(maxSize.width, 44.0);
-
-  ASLayoutSpec *spacer = [[ASLayoutSpec alloc] init];
-  spacer.style.flexGrow = 1.0;
-
-  ASStackLayoutSpec *controlbarSpec = [ASStackLayoutSpec stackLayoutSpecWithDirection:ASStackLayoutDirectionHorizontal
-                                                                            spacing:10.0
-                                                                     justifyContent:ASStackLayoutJustifyContentStart
-                                                                         alignItems:ASStackLayoutAlignItemsCenter
-                                                                           children: [self controlsForLayoutSpec] ];
-  controlbarSpec.style.alignSelf = ASStackLayoutAlignSelfStretch;
-
-  UIEdgeInsets insets = UIEdgeInsetsMake(10.0, 10.0, 10.0, 10.0);
-
-  ASInsetLayoutSpec *controlbarInsetSpec = [ASInsetLayoutSpec insetLayoutSpecWithInsets:insets child:controlbarSpec];
-
-  controlbarInsetSpec.style.alignSelf = ASStackLayoutAlignSelfStretch;
-
-  ASStackLayoutSpec *mainVerticalStack = [ASStackLayoutSpec stackLayoutSpecWithDirection:ASStackLayoutDirectionVertical
-                                                                                 spacing:0.0
-                                                                          justifyContent:ASStackLayoutJustifyContentStart
-                                                                              alignItems:ASStackLayoutAlignItemsStart
-                                                                                children:@[spacer,controlbarInsetSpec]];
-
-  return mainVerticalStack;
-}
-
-#pragma mark - Properties
-- (id<ASVideoPlayerNodeDelegate>)delegate
-{
-  return _delegate;
-}
-
-- (void)setDelegate:(id<ASVideoPlayerNodeDelegate>)delegate
-{
-  if (delegate == _delegate) {
-    return;
-  }
-
-  _delegate = delegate;
-  
-  if (_delegate == nil) {
-    memset(&_delegateFlags, 0, sizeof(_delegateFlags));
-  } else {
-    _delegateFlags.delegateNeededDefaultControls = [_delegate respondsToSelector:@selector(videoPlayerNodeNeededDefaultControls:)];
-    _delegateFlags.delegateCustomControls = [_delegate respondsToSelector:@selector(videoPlayerNodeCustomControls:)];
-    _delegateFlags.delegateSpinnerTintColor = [_delegate respondsToSelector:@selector(videoPlayerNodeSpinnerTint:)];
-    _delegateFlags.delegateSpinnerStyle = [_delegate respondsToSelector:@selector(videoPlayerNodeSpinnerStyle:)];
-    _delegateFlags.delegateScrubberMaximumTrackTintColor = [_delegate respondsToSelector:@selector(videoPlayerNodeScrubberMaximumTrackTint:)];
-    _delegateFlags.delegateScrubberMinimumTrackTintColor = [_delegate respondsToSelector:@selector(videoPlayerNodeScrubberMinimumTrackTint:)];
-    _delegateFlags.delegateScrubberThumbTintColor = [_delegate respondsToSelector:@selector(videoPlayerNodeScrubberThumbTint:)];
-    _delegateFlags.delegateScrubberThumbImage = [_delegate respondsToSelector:@selector(videoPlayerNodeScrubberThumbImage:)];
-    _delegateFlags.delegateTimeLabelAttributes = [_delegate respondsToSelector:@selector(videoPlayerNodeTimeLabelAttributes:timeLabelType:)];
-    _delegateFlags.delegateLayoutSpecForControls = [_delegate respondsToSelector:@selector(videoPlayerNodeLayoutSpec:forControls:forMaximumSize:)];
-    _delegateFlags.delegateVideoNodeDidPlayToTime = [_delegate respondsToSelector:@selector(videoPlayerNode:didPlayToTime:)];
-    _delegateFlags.delegateVideoNodeWillChangeState = [_delegate respondsToSelector:@selector(videoPlayerNode:willChangeVideoNodeState:toVideoNodeState:)];
-    _delegateFlags.delegateVideoNodePlaybackDidFinish = [_delegate respondsToSelector:@selector(videoPlayerNodeDidPlayToEnd:)];
-    _delegateFlags.delegateVideoNodeShouldChangeState = [_delegate respondsToSelector:@selector(videoPlayerNode:shouldChangeVideoNodeStateTo:)];
-    _delegateFlags.delegateTimeLabelAttributedString = [_delegate respondsToSelector:@selector(videoPlayerNode:timeStringForTimeLabelType:forTime:)];
-    _delegateFlags.delegatePlaybackButtonTint = [_delegate respondsToSelector:@selector(videoPlayerNodePlaybackButtonTint:)];
-    _delegateFlags.delegateFullScreenButtonImage = [_delegate respondsToSelector:@selector(videoPlayerNodeFullScreenButtonImage:)];
-    _delegateFlags.delegateDidTapVideoPlayerNode = [_delegate respondsToSelector:@selector(didTapVideoPlayerNode:)];
-    _delegateFlags.delegateDidTapFullScreenButtonNode = [_delegate respondsToSelector:@selector(didTapFullScreenButtonNode:)];
-    _delegateFlags.delegateVideoPlayerNodeDidSetCurrentItem = [_delegate respondsToSelector:@selector(videoPlayerNode:didSetCurrentItem:)];
-    _delegateFlags.delegateVideoPlayerNodeDidStallAtTimeInterval = [_delegate respondsToSelector:@selector(videoPlayerNode:didStallAtTimeInterval:)];
-    _delegateFlags.delegateVideoPlayerNodeDidStartInitialLoading = [_delegate respondsToSelector:@selector(videoPlayerNodeDidStartInitialLoading:)];
-    _delegateFlags.delegateVideoPlayerNodeDidFinishInitialLoading = [_delegate respondsToSelector:@selector(videoPlayerNodeDidFinishInitialLoading:)];
-    _delegateFlags.delegateVideoPlayerNodeDidRecoverFromStall = [_delegate respondsToSelector:@selector(videoPlayerNodeDidRecoverFromStall:)];
-  }
-}
-
-- (void)setControlsDisabled:(BOOL)controlsDisabled
-{
-  if (_controlsDisabled == controlsDisabled) {
-    return;
-  }
-  
-  _controlsDisabled = controlsDisabled;
-
-  if (_controlsDisabled && _cachedControls.count > 0) {
-    [self removeControls];
-  } else if (!_controlsDisabled) {
-    [self createControls];
-  }
-}
-
-- (void)setShouldAutoPlay:(BOOL)shouldAutoPlay
-{
-  if (_shouldAutoPlay == shouldAutoPlay) {
-    return;
-  }
-  _shouldAutoPlay = shouldAutoPlay;
-  _videoNode.shouldAutoplay = _shouldAutoPlay;
-}
-
-- (void)setShouldAutoRepeat:(BOOL)shouldAutoRepeat
-{
-  if (_shouldAutoRepeat == shouldAutoRepeat) {
-    return;
-  }
-  _shouldAutoRepeat = shouldAutoRepeat;
-  _videoNode.shouldAutorepeat = _shouldAutoRepeat;
-}
-
-- (void)setMuted:(BOOL)muted
-{
-  if (_muted == muted) {
-    return;
-  }
-  _muted = muted;
-  _videoNode.muted = _muted;
-}
-
-- (void)setPeriodicTimeObserverTimescale:(int32_t)periodicTimeObserverTimescale
-{
-  if (_periodicTimeObserverTimescale == periodicTimeObserverTimescale) {
-    return;
-  }
-  _periodicTimeObserverTimescale = periodicTimeObserverTimescale;
-  _videoNode.periodicTimeObserverTimescale = _periodicTimeObserverTimescale;
-}
-
-- (NSString *)gravity
-{
-  if (_gravity == nil) {
-    _gravity = _videoNode.gravity;
-  }
-  return _gravity;
-}
-
-- (void)setGravity:(NSString *)gravity
-{
-  if (_gravity == gravity) {
-    return;
-  }
-  _gravity = gravity;
-  _videoNode.gravity = _gravity;
-}
-
-- (ASVideoNodePlayerState)playerState
-{
-  return _videoNode.playerState;
-}
-
-- (BOOL)shouldAggressivelyRecoverFromStall
-{
-  return _videoNode.shouldAggressivelyRecoverFromStall;
-}
-
-- (void) setPlaceholderImageURL:(NSURL *)placeholderImageURL
-{
-  _videoNode.URL = placeholderImageURL;
-}
-
-- (NSURL*) placeholderImageURL
-{
-  return _videoNode.URL;
-}
-
-- (ASVideoNode*)videoNode
-{
-  return _videoNode;
-}
-
-- (void)setShouldAggressivelyRecoverFromStall:(BOOL)shouldAggressivelyRecoverFromStall
-{
-  if (_shouldAggressivelyRecoverFromStall == shouldAggressivelyRecoverFromStall) {
-    return;
-  }
-  _shouldAggressivelyRecoverFromStall = shouldAggressivelyRecoverFromStall;
-  _videoNode.shouldAggressivelyRecoverFromStall = _shouldAggressivelyRecoverFromStall;
-}
-
-#pragma mark - Helpers
-- (NSString *)timeStringForCMTime:(CMTime)time forTimeLabelType:(ASVideoPlayerNodeControlType)type
-{
-  if (!CMTIME_IS_VALID(time)) {
-    return @"00:00";
-  }
-  if (_delegateFlags.delegateTimeLabelAttributedString) {
-    return [_delegate videoPlayerNode:self timeStringForTimeLabelType:type forTime:time];
-  }
-
-  NSUInteger dTotalSeconds = CMTimeGetSeconds(time);
-
-  NSUInteger dHours = floor(dTotalSeconds / 3600);
-  NSUInteger dMinutes = floor(dTotalSeconds % 3600 / 60);
-  NSUInteger dSeconds = floor(dTotalSeconds % 3600 % 60);
-
-  NSString *videoDurationText;
-  if (dHours > 0) {
-    videoDurationText = [NSString stringWithFormat:@"%i:%02i:%02i", (int)dHours, (int)dMinutes, (int)dSeconds];
-  } else {
-    videoDurationText = [NSString stringWithFormat:@"%02i:%02i", (int)dMinutes, (int)dSeconds];
-  }
-  return videoDurationText;
-}
-
-@end
-
-#endif // TARGET_OS_IOS
-#endif
-
-#endif
diff --git a/submodules/AsyncDisplayKit/Source/ASViewController.h b/submodules/AsyncDisplayKit/Source/ASViewController.h
deleted file mode 100644
index 18c1be5456..0000000000
--- a/submodules/AsyncDisplayKit/Source/ASViewController.h
+++ /dev/null
@@ -1,96 +0,0 @@
-//
-//  ASViewController.h
-//  Texture
-//
-//  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.
-//  Changes after 4/13/2017 are: Copyright (c) Pinterest, Inc.  All rights reserved.
-//  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
-//
-
-#ifndef MINIMAL_ASDK
-
-#import <UIKit/UIKit.h>
-#import <AsyncDisplayKit/ASDisplayNode.h>
-#import <AsyncDisplayKit/ASVisibilityProtocols.h>
-
-@class ASTraitCollection;
-
-NS_ASSUME_NONNULL_BEGIN
-
-typedef ASTraitCollection * _Nonnull (^ASDisplayTraitsForTraitCollectionBlock)(UITraitCollection *traitCollection);
-typedef ASTraitCollection * _Nonnull (^ASDisplayTraitsForTraitWindowSizeBlock)(CGSize windowSize);
-
-/**
- * ASViewController allows you to have a completely node backed hierarchy. It automatically
- * handles @c ASVisibilityDepth, automatic range mode and propogating @c ASDisplayTraits to contained nodes.
- *
- * You can opt-out of node backed hierarchy and use it like a normal UIViewController.
- * More importantly, you can use it as a base class for all of your view controllers among which some use a node hierarchy and some don't.
- * See examples/ASDKgram project for actual implementation.
- */
-@interface ASViewController<__covariant DisplayNodeType : ASDisplayNode *> : UIViewController <ASVisibilityDepth>
-
-/**
- * ASViewController initializer.
- *
- * @param node An ASDisplayNode which will provide the root view (self.view)
- * @return An ASViewController instance whose root view will be backed by the provided ASDisplayNode.
- *
- * @see ASVisibilityDepth
- */
-- (instancetype)initWithNode:(DisplayNodeType)node NS_DESIGNATED_INITIALIZER;
-
-NS_ASSUME_NONNULL_END
-
-/**
- * @return node Returns the ASDisplayNode which provides the backing view to the view controller.
- */
-@property (nonatomic, readonly, null_unspecified) DisplayNodeType node;
-
-NS_ASSUME_NONNULL_BEGIN
-
-/**
- * Set this block to customize the ASDisplayTraits returned when the VC transitions to the given traitCollection.
- */
-@property (nonatomic, copy) ASDisplayTraitsForTraitCollectionBlock overrideDisplayTraitsWithTraitCollection;
-
-/**
- * Set this block to customize the ASDisplayTraits returned when the VC transitions to the given window size.
- */
-@property (nonatomic, copy) ASDisplayTraitsForTraitWindowSizeBlock overrideDisplayTraitsWithWindowSize ASDISPLAYNODE_DEPRECATED_MSG("This property is actually never accessed inside the framework");
-
-/**
- * @abstract Passthrough property to the the .interfaceState of the node.
- * @return The current ASInterfaceState of the node, indicating whether it is visible and other situational properties.
- * @see ASInterfaceState
- */
-@property (nonatomic, readonly) ASInterfaceState interfaceState;
-
-
-// AsyncDisplayKit 2.0 BETA: This property is still being tested, but it allows
-// blocking as a view controller becomes visible to ensure no placeholders flash onscreen.
-// Refer to examples/SynchronousConcurrency, AsyncViewController.m
-@property (nonatomic) BOOL neverShowPlaceholders;
-
-/* Custom container UIViewController subclasses can use this property to add to the overlay
- that UIViewController calculates for the safeAreaInsets for contained view controllers.
- */
-@property(nonatomic) UIEdgeInsets additionalSafeAreaInsets;
-
-@end
-
-@interface ASViewController (ASRangeControllerUpdateRangeProtocol)
-
-/**
- * Automatically adjust range mode based on view events. If you set this to YES, the view controller or its node
- * must conform to the ASRangeControllerUpdateRangeProtocol. 
- *
- * Default value is YES *if* node or view controller conform to ASRangeControllerUpdateRangeProtocol otherwise it is NO.
- */
-@property (nonatomic) BOOL automaticallyAdjustRangeModeBasedOnViewEvents;
-
-@end
-
-NS_ASSUME_NONNULL_END
-
-#endif
diff --git a/submodules/AsyncDisplayKit/Source/ASViewController.mm b/submodules/AsyncDisplayKit/Source/ASViewController.mm
deleted file mode 100644
index 5992c050f1..0000000000
--- a/submodules/AsyncDisplayKit/Source/ASViewController.mm
+++ /dev/null
@@ -1,362 +0,0 @@
-//
-//  ASViewController.mm
-//  Texture
-//
-//  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.
-//  Changes after 4/13/2017 are: Copyright (c) Pinterest, Inc.  All rights reserved.
-//  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
-//
-
-#ifndef MINIMAL_ASDK
-#import <AsyncDisplayKit/ASViewController.h>
-#import <AsyncDisplayKit/ASAssert.h>
-#import <AsyncDisplayKit/ASDisplayNode+FrameworkPrivate.h>
-#import <AsyncDisplayKit/ASLayout.h>
-#import <AsyncDisplayKit/ASLog.h>
-#import <AsyncDisplayKit/ASTraitCollection.h>
-#import <AsyncDisplayKit/ASRangeControllerUpdateRangeProtocol+Beta.h>
-#import <AsyncDisplayKit/ASInternalHelpers.h>
-
-@implementation ASViewController
-{
-  BOOL _ensureDisplayed;
-  BOOL _automaticallyAdjustRangeModeBasedOnViewEvents;
-  BOOL _parentManagesVisibilityDepth;
-  NSInteger _visibilityDepth;
-  BOOL _selfConformsToRangeModeProtocol;
-  BOOL _nodeConformsToRangeModeProtocol;
-  UIEdgeInsets _fallbackAdditionalSafeAreaInsets;
-}
-
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wobjc-designated-initializers"
-
-- (instancetype)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibBundleOrNil
-{
-  if (!(self = [super initWithNibName:nibNameOrNil bundle:nibBundleOrNil])) {
-    return nil;
-  }
-  
-  [self _initializeInstance];
-  
-  return self;
-}
-
-- (instancetype)initWithCoder:(NSCoder *)aDecoder
-{
-  if (!(self = [super initWithCoder:aDecoder])) {
-    return nil;
-  }
-  
-  [self _initializeInstance];
-  
-  return self;
-}
-
-#pragma clang diagnostic pop
-
-- (instancetype)initWithNode:(ASDisplayNode *)node
-{
-  if (!(self = [super initWithNibName:nil bundle:nil])) {
-    return nil;
-  }
-  
-  _node = node;
-  [self _initializeInstance];
-
-  return self;
-}
-
-- (void)_initializeInstance
-{
-  if (_node == nil) {
-    return;
-  }
-
-  _node.viewControllerRoot = YES;
-  
-  _selfConformsToRangeModeProtocol = [self conformsToProtocol:@protocol(ASRangeControllerUpdateRangeProtocol)];
-  _nodeConformsToRangeModeProtocol = [_node conformsToProtocol:@protocol(ASRangeControllerUpdateRangeProtocol)];
-  _automaticallyAdjustRangeModeBasedOnViewEvents = _selfConformsToRangeModeProtocol || _nodeConformsToRangeModeProtocol;
-
-  _fallbackAdditionalSafeAreaInsets = UIEdgeInsetsZero;
-  
-  // In case the node will get loaded
-  if (_node.nodeLoaded) {
-    // Node already loaded the view
-    [self view];
-  } else {
-    // If the node didn't load yet add ourselves as on did load observer to load the view in case the node gets loaded
-    // before the view controller
-    __weak __typeof__(self) weakSelf = self;
-    [_node onDidLoad:^(__kindof ASDisplayNode * _Nonnull node) {
-      if ([weakSelf isViewLoaded] == NO) {
-        [weakSelf view];
-      }
-    }];
-  }
-}
-
-- (void)dealloc
-{
-  ASPerformBackgroundDeallocation(&_node);
-}
-
-- (void)loadView
-{
-  // Apple applies a frame and autoresizing masks we need.  Allocating a view is not
-  // nearly as expensive as adding and removing it from a hierarchy, and fortunately
-  // we can avoid that here.  Enabling layerBacking on a single node in the hierarchy
-  // will have a greater performance benefit than the impact of this transient view.
-  [super loadView];
-  
-  if (_node == nil) {
-    return;
-  }
-  
-  ASDisplayNodeAssertTrue(!_node.layerBacked);
-  
-  UIView *view = self.view;
-  CGRect frame = view.frame;
-  UIViewAutoresizing autoresizingMask = view.autoresizingMask;
-  
-  // We have what we need, so now create and assign the view we actually want.
-  view = _node.view;
-  _node.frame = frame;
-  _node.autoresizingMask = autoresizingMask;
-  self.view = view;
-  
-  // ensure that self.node has a valid trait collection before a subclass's implementation of viewDidLoad.
-  // Any subnodes added in viewDidLoad will then inherit the proper environment.
-  ASPrimitiveTraitCollection traitCollection = [self primitiveTraitCollectionForUITraitCollection:self.traitCollection];
-  [self propagateNewTraitCollection:traitCollection];
-}
-
-- (void)viewWillLayoutSubviews
-{
-  [super viewWillLayoutSubviews];
-  
-  // Before layout, make sure that our trait collection containerSize actually matches the size of our bounds.
-  // If not, we need to update the traits and propagate them.
-
-  CGSize boundsSize = self.view.bounds.size;
-  if (CGSizeEqualToSize(self.node.primitiveTraitCollection.containerSize, boundsSize) == NO) {
-    [UIView performWithoutAnimation:^{
-      ASPrimitiveTraitCollection traitCollection = [self primitiveTraitCollectionForUITraitCollection:self.traitCollection];
-      traitCollection.containerSize = boundsSize;
-        
-      // this method will call measure
-      [self propagateNewTraitCollection:traitCollection];
-    }];
-  } else {
-    // Call layoutThatFits: to let the node prepare for a layout that will happen shortly in the layout pass of the view.
-    // If the node's constrained size didn't change between the last layout pass it's a no-op
-    [_node layoutThatFits:[self nodeConstrainedSize]];
-  }
-}
-
-- (void)viewDidLayoutSubviews
-{
-  if (_ensureDisplayed && self.neverShowPlaceholders) {
-    _ensureDisplayed = NO;
-    [_node recursivelyEnsureDisplaySynchronously:YES];
-  }
-  [super viewDidLayoutSubviews];
-
-  if (!AS_AT_LEAST_IOS11) {
-    [self _updateNodeFallbackSafeArea];
-  }
-}
-
-- (void)_updateNodeFallbackSafeArea
-{
-  UIEdgeInsets safeArea = UIEdgeInsetsMake(self.topLayoutGuide.length, 0, self.bottomLayoutGuide.length, 0);
-  UIEdgeInsets additionalInsets = self.additionalSafeAreaInsets;
-
-  safeArea = ASConcatInsets(safeArea, additionalInsets);
-
-  _node.fallbackSafeAreaInsets = safeArea;
-}
-
-ASVisibilityDidMoveToParentViewController;
-
-- (void)viewWillAppear:(BOOL)animated
-{
-  as_activity_create_for_scope("ASViewController will appear");
-  as_log_debug(ASNodeLog(), "View controller %@ will appear", self);
-
-  [super viewWillAppear:animated];
-
-  _ensureDisplayed = YES;
-
-  // A layout pass is forced this early to get nodes like ASCollectionNode, ASTableNode etc.
-  // into the hierarchy before UIKit applies the scroll view inset adjustments, if automatic subnode management
-  // is enabled. Otherwise the insets would not be applied.
-  [_node.view layoutIfNeeded];
-  
-  if (_parentManagesVisibilityDepth == NO) {
-    [self setVisibilityDepth:0];
-  }
-}
-
-ASVisibilitySetVisibilityDepth;
-
-ASVisibilityViewDidDisappearImplementation;
-
-ASVisibilityDepthImplementation;
-
-- (void)visibilityDepthDidChange
-{
-  ASLayoutRangeMode rangeMode = ASLayoutRangeModeForVisibilityDepth(self.visibilityDepth);
-#if ASEnableVerboseLogging
-  NSString *rangeModeString;
-  switch (rangeMode) {
-    case ASLayoutRangeModeMinimum:
-      rangeModeString = @"Minimum";
-      break;
-      
-    case ASLayoutRangeModeFull:
-      rangeModeString = @"Full";
-      break;
-      
-    case ASLayoutRangeModeVisibleOnly:
-      rangeModeString = @"Visible Only";
-      break;
-      
-    case ASLayoutRangeModeLowMemory:
-      rangeModeString = @"Low Memory";
-      break;
-      
-    default:
-      break;
-  }
-  as_log_verbose(ASNodeLog(), "Updating visibility of %@ to: %@ (visibility depth: %zd)", self, rangeModeString, self.visibilityDepth);
-#endif
-  [self updateCurrentRangeModeWithModeIfPossible:rangeMode];
-}
-
-#pragma mark - Automatic range mode
-
-- (BOOL)automaticallyAdjustRangeModeBasedOnViewEvents
-{
-  return _automaticallyAdjustRangeModeBasedOnViewEvents;
-}
-
-- (void)setAutomaticallyAdjustRangeModeBasedOnViewEvents:(BOOL)automaticallyAdjustRangeModeBasedOnViewEvents
-{
-  if (automaticallyAdjustRangeModeBasedOnViewEvents != _automaticallyAdjustRangeModeBasedOnViewEvents) {
-    if (automaticallyAdjustRangeModeBasedOnViewEvents && _selfConformsToRangeModeProtocol == NO && _nodeConformsToRangeModeProtocol == NO) {
-      NSLog(@"Warning: automaticallyAdjustRangeModeBasedOnViewEvents set to YES in %@, but range mode updating is not possible because neither view controller nor node %@ conform to ASRangeControllerUpdateRangeProtocol.", self, _node);
-    }
-    _automaticallyAdjustRangeModeBasedOnViewEvents = automaticallyAdjustRangeModeBasedOnViewEvents;
-  }
-}
-
-- (void)updateCurrentRangeModeWithModeIfPossible:(ASLayoutRangeMode)rangeMode
-{
-  if (!_automaticallyAdjustRangeModeBasedOnViewEvents) {
-    return;
-  }
-  
-  if (_selfConformsToRangeModeProtocol) {
-    id<ASRangeControllerUpdateRangeProtocol> rangeUpdater = (id<ASRangeControllerUpdateRangeProtocol>)self;
-    [rangeUpdater updateCurrentRangeWithMode:rangeMode];
-  }
-  
-  if (_nodeConformsToRangeModeProtocol) {
-    id<ASRangeControllerUpdateRangeProtocol> rangeUpdater = (id<ASRangeControllerUpdateRangeProtocol>)_node;
-    [rangeUpdater updateCurrentRangeWithMode:rangeMode];
-  }
-}
-
-#pragma mark - Layout Helpers
-
-- (ASSizeRange)nodeConstrainedSize
-{
-  return ASSizeRangeMake(self.view.bounds.size);
-}
-
-- (ASInterfaceState)interfaceState
-{
-  return _node.interfaceState;
-}
-
-- (UIEdgeInsets)additionalSafeAreaInsets
-{
-  if (AS_AVAILABLE_IOS(11.0)) {
-    return super.additionalSafeAreaInsets;
-  }
-
-  return _fallbackAdditionalSafeAreaInsets;
-}
-
-- (void)setAdditionalSafeAreaInsets:(UIEdgeInsets)additionalSafeAreaInsets
-{
-  if (AS_AVAILABLE_IOS(11.0)) {
-    [super setAdditionalSafeAreaInsets:additionalSafeAreaInsets];
-  } else {
-    _fallbackAdditionalSafeAreaInsets = additionalSafeAreaInsets;
-    [self _updateNodeFallbackSafeArea];
-  }
-}
-
-#pragma mark - ASTraitEnvironment
-
-- (ASPrimitiveTraitCollection)primitiveTraitCollectionForUITraitCollection:(UITraitCollection *)traitCollection
-{
-  if (self.overrideDisplayTraitsWithTraitCollection) {
-    ASTraitCollection *asyncTraitCollection = self.overrideDisplayTraitsWithTraitCollection(traitCollection);
-    return [asyncTraitCollection primitiveTraitCollection];
-  }
-  
-  ASDisplayNodeAssertMainThread();
-  ASPrimitiveTraitCollection asyncTraitCollection = ASPrimitiveTraitCollectionFromUITraitCollection(traitCollection);
-  asyncTraitCollection.containerSize = self.view.frame.size;
-  return asyncTraitCollection;
-}
-
-- (void)propagateNewTraitCollection:(ASPrimitiveTraitCollection)traitCollection
-{
-  ASPrimitiveTraitCollection oldTraitCollection = self.node.primitiveTraitCollection;
-  
-  if (ASPrimitiveTraitCollectionIsEqualToASPrimitiveTraitCollection(traitCollection, oldTraitCollection) == NO) {
-    as_activity_scope_verbose(as_activity_create("Propagate ASViewController trait collection", AS_ACTIVITY_CURRENT, OS_ACTIVITY_FLAG_DEFAULT));
-    as_log_debug(ASNodeLog(), "Propagating new traits for %@: %@", self, NSStringFromASPrimitiveTraitCollection(traitCollection));
-    self.node.primitiveTraitCollection = traitCollection;
-    
-    NSArray<id<ASLayoutElement>> *children = [self.node sublayoutElements];
-    for (id<ASLayoutElement> child in children) {
-      ASTraitCollectionPropagateDown(child, traitCollection);
-    }
-    
-    // Once we've propagated all the traits, layout this node.
-    // Remeasure the node with the latest constrained size – old constrained size may be incorrect.
-    as_activity_scope_verbose(as_activity_create("Layout ASViewController node with new traits", AS_ACTIVITY_CURRENT, OS_ACTIVITY_FLAG_DEFAULT));
-    [_node layoutThatFits:[self nodeConstrainedSize]];
-  }
-}
-
-- (void)traitCollectionDidChange:(UITraitCollection *)previousTraitCollection
-{
-  [super traitCollectionDidChange:previousTraitCollection];
-  
-  ASPrimitiveTraitCollection traitCollection = [self primitiveTraitCollectionForUITraitCollection:self.traitCollection];
-  traitCollection.containerSize = self.view.bounds.size;
-  [self propagateNewTraitCollection:traitCollection];
-}
-
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-implementations"
-- (void)didRotateFromInterfaceOrientation:(UIInterfaceOrientation)fromInterfaceOrientation
-{
-  [super didRotateFromInterfaceOrientation:fromInterfaceOrientation];
-  
-  ASPrimitiveTraitCollection traitCollection = _node.primitiveTraitCollection;
-  traitCollection.containerSize = self.view.bounds.size;
-  [self propagateNewTraitCollection:traitCollection];
-}
-#pragma clang diagnostic pop
-
-@end
-
-#endif
diff --git a/submodules/AsyncDisplayKit/Source/ASVisibilityProtocols.h b/submodules/AsyncDisplayKit/Source/ASVisibilityProtocols.h
deleted file mode 100644
index 837e848269..0000000000
--- a/submodules/AsyncDisplayKit/Source/ASVisibilityProtocols.h
+++ /dev/null
@@ -1,145 +0,0 @@
-//
-//  ASVisibilityProtocols.h
-//  Texture
-//
-//  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.
-//  Changes after 4/13/2017 are: Copyright (c) Pinterest, Inc.  All rights reserved.
-//  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
-//
-
-#import <AsyncDisplayKit/ASBaseDefines.h>
-#import <AsyncDisplayKit/ASLayoutRangeType.h>
-
-NS_ASSUME_NONNULL_BEGIN
-
-@class UIViewController;
-
-AS_EXTERN ASLayoutRangeMode ASLayoutRangeModeForVisibilityDepth(NSUInteger visibilityDepth);
-
-/**
- * ASVisibilityDepth
- *
- * @discussion "Visibility Depth" represents the number of user actions required to make an ASDisplayNode or 
- * ASViewController visibile. AsyncDisplayKit uses this information to intelligently manage memory and focus
- * resources where they are most visible to the user.
- *
- * The ASVisibilityDepth protocol describes how custom view controllers can integrate with this system.
- *
- * Parent view controllers should also implement @c ASManagesChildVisibilityDepth
- *
- * @see ASManagesChildVisibilityDepth
- */
-
-@protocol ASVisibilityDepth <NSObject>
-
-/**
- * Visibility depth
- *
- * @discussion Represents the number of user actions necessary to reach the view controller. An increased visibility
- * depth indicates a higher number of user interactions for the view controller to be visible again. For example,
- * an onscreen navigation controller's top view controller should have a visibility depth of 0. The view controller
- * one from the top should have a visibility deptch of 1 as should the root view controller in the stack (because
- * the user can hold the back button to pop to the root view controller).
- *
- * Visibility depth is used to automatically adjust ranges on range controllers (and thus free up memory) and can
- * be used to reduce memory usage of other items as well.
- */
-- (NSInteger)visibilityDepth;
-
-/**
- * Called when visibility depth changes
- *
- * @discussion @c visibilityDepthDidChange is called whenever the visibility depth of the represented view controller
- * has changed.
- * 
- * If implemented by a view controller container, use this method to notify child view controllers that their view
- * depth has changed @see ASNavigationController.m
- *
- * If implemented on an ASViewController, use this method to reduce or increase the resources that your
- * view controller uses. A higher visibility depth view controller should decrease it's resource usage, a lower
- * visibility depth controller should pre-warm resources in preperation for a display at 0 depth.
- *
- * ASViewController implements this method and reduces / increases range mode of supporting nodes (such as ASCollectionNode
- * and ASTableNode).
- *
- * @see visibilityDepth
- */
-- (void)visibilityDepthDidChange;
-
-@end
-
-/**
- * ASManagesChildVisibilityDepth
- *
- * @discussion A protocol which should be implemented by container view controllers to allow proper
- * propagation of visibility depth
- *
- * @see ASVisibilityDepth
- */
-@protocol ASManagesChildVisibilityDepth <ASVisibilityDepth>
-
-/**
- * @abstract Container view controllers should adopt this protocol to indicate that they will manage their child's
- * visibilityDepth. For example, ASNavigationController adopts this protocol and manages its childrens visibility
- * depth.
- *
- * If you adopt this protocol, you *must* also emit visibilityDepthDidChange messages to child view controllers.
- *
- * @param childViewController Expected to return the visibility depth of the child view controller.
- */
-- (NSInteger)visibilityDepthOfChildViewController:(UIViewController *)childViewController;
-
-@end
-
-#define ASVisibilitySetVisibilityDepth \
-- (void)setVisibilityDepth:(NSUInteger)visibilityDepth \
-{ \
-  if (_visibilityDepth == visibilityDepth) { \
-    return; \
-  } \
-  _visibilityDepth = visibilityDepth; \
-  [self visibilityDepthDidChange]; \
-}
-
-#define ASVisibilityDepthImplementation \
-- (NSInteger)visibilityDepth \
-{ \
-  if (self.parentViewController && _parentManagesVisibilityDepth == NO) { \
-    _parentManagesVisibilityDepth = [self.parentViewController conformsToProtocol:@protocol(ASManagesChildVisibilityDepth)]; \
-  } \
-  \
-  if (_parentManagesVisibilityDepth) { \
-    return [(id <ASManagesChildVisibilityDepth>)self.parentViewController visibilityDepthOfChildViewController:self]; \
-  } \
-  return _visibilityDepth; \
-}
-
-#define ASVisibilityViewDidDisappearImplementation \
-- (void)viewDidDisappear:(BOOL)animated \
-{ \
-  [super viewDidDisappear:animated]; \
-  \
-  if (_parentManagesVisibilityDepth == NO) { \
-    [self setVisibilityDepth:1]; \
-  } \
-}
-
-#define ASVisibilityViewWillAppear \
-- (void)viewWillAppear:(BOOL)animated \
-{ \
-  [super viewWillAppear:animated]; \
-  \
-  if (_parentManagesVisibilityDepth == NO) { \
-    [self setVisibilityDepth:0]; \
-  } \
-}
-
-#define ASVisibilityDidMoveToParentViewController \
-- (void)didMoveToParentViewController:(UIViewController *)parent \
-{ \
-  [super didMoveToParentViewController:parent]; \
-  _parentManagesVisibilityDepth = NO; \
-  [self visibilityDepthDidChange]; \
-}
-
-NS_ASSUME_NONNULL_END
diff --git a/submodules/AsyncDisplayKit/Source/ASVisibilityProtocols.mm b/submodules/AsyncDisplayKit/Source/ASVisibilityProtocols.mm
deleted file mode 100644
index b13a683bea..0000000000
--- a/submodules/AsyncDisplayKit/Source/ASVisibilityProtocols.mm
+++ /dev/null
@@ -1,22 +0,0 @@
-//
-//  ASVisibilityProtocols.mm
-//  Texture
-//
-//  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.
-//  Changes after 4/13/2017 are: Copyright (c) Pinterest, Inc.  All rights reserved.
-//  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
-//
-
-#import <AsyncDisplayKit/ASVisibilityProtocols.h>
-
-ASLayoutRangeMode ASLayoutRangeModeForVisibilityDepth(NSUInteger visibilityDepth)
-{
-  if (visibilityDepth == 0) {
-    return ASLayoutRangeModeFull;
-  } else if (visibilityDepth == 1) {
-    return ASLayoutRangeModeMinimum;
-  } else if (visibilityDepth == 2) {
-    return ASLayoutRangeModeVisibleOnly;
-  }
-  return ASLayoutRangeModeLowMemory;
-}
diff --git a/submodules/AsyncDisplayKit/Source/Private/ASWeakMap.h b/submodules/AsyncDisplayKit/Source/ASWeakMap.h
similarity index 100%
rename from submodules/AsyncDisplayKit/Source/Private/ASWeakMap.h
rename to submodules/AsyncDisplayKit/Source/ASWeakMap.h
diff --git a/submodules/AsyncDisplayKit/Source/Private/ASWeakMap.mm b/submodules/AsyncDisplayKit/Source/ASWeakMap.mm
similarity index 98%
rename from submodules/AsyncDisplayKit/Source/Private/ASWeakMap.mm
rename to submodules/AsyncDisplayKit/Source/ASWeakMap.mm
index 3110b13d37..1267d8ff69 100644
--- a/submodules/AsyncDisplayKit/Source/Private/ASWeakMap.mm
+++ b/submodules/AsyncDisplayKit/Source/ASWeakMap.mm
@@ -7,7 +7,7 @@
 //  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
 //
 
-#import <AsyncDisplayKit/ASWeakMap.h>
+#import "ASWeakMap.h"
 
 @interface ASWeakMapEntry ()
 @property (nonatomic, readonly) id key;
diff --git a/submodules/AsyncDisplayKit/Source/Details/ASWeakProxy.h b/submodules/AsyncDisplayKit/Source/ASWeakProxy.h
similarity index 100%
rename from submodules/AsyncDisplayKit/Source/Details/ASWeakProxy.h
rename to submodules/AsyncDisplayKit/Source/ASWeakProxy.h
diff --git a/submodules/AsyncDisplayKit/Source/Details/ASWeakProxy.mm b/submodules/AsyncDisplayKit/Source/ASWeakProxy.mm
similarity index 98%
rename from submodules/AsyncDisplayKit/Source/Details/ASWeakProxy.mm
rename to submodules/AsyncDisplayKit/Source/ASWeakProxy.mm
index 4a73408dd5..4a3b5c8a2a 100644
--- a/submodules/AsyncDisplayKit/Source/Details/ASWeakProxy.mm
+++ b/submodules/AsyncDisplayKit/Source/ASWeakProxy.mm
@@ -7,7 +7,7 @@
 //  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
 //
 
-#import <AsyncDisplayKit/ASWeakProxy.h>
+#import "ASWeakProxy.h"
 #import <AsyncDisplayKit/ASObjectDescriptionHelpers.h>
 #import <AsyncDisplayKit/ASAssert.h>
 
diff --git a/submodules/AsyncDisplayKit/Source/Details/ASWeakSet.mm b/submodules/AsyncDisplayKit/Source/ASWeakSet.mm
similarity index 100%
rename from submodules/AsyncDisplayKit/Source/Details/ASWeakSet.mm
rename to submodules/AsyncDisplayKit/Source/ASWeakSet.mm
diff --git a/submodules/AsyncDisplayKit/Source/AsyncDisplayKit+IGListKitMethods.h b/submodules/AsyncDisplayKit/Source/AsyncDisplayKit+IGListKitMethods.h
deleted file mode 100644
index aa0de42510..0000000000
--- a/submodules/AsyncDisplayKit/Source/AsyncDisplayKit+IGListKitMethods.h
+++ /dev/null
@@ -1,64 +0,0 @@
-//
-//  AsyncDisplayKit+IGListKitMethods.h
-//  Texture
-//
-//  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.
-//  Changes after 4/13/2017 are: Copyright (c) Pinterest, Inc.  All rights reserved.
-//  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
-//
-
-#import <AsyncDisplayKit/ASAvailability.h>
-
-#if AS_IG_LIST_KIT
-
-#import <Foundation/Foundation.h>
-#import <UIKit/UIKit.h>
-#import <AsyncDisplayKit/ASBaseDefines.h>
-#import <IGListKit/IGListKit.h>
-
-NS_ASSUME_NONNULL_BEGIN
-
-/**
- * If you are using AsyncDisplayKit with IGListKit, you should use
- * these methods to provide implementations for methods like
- * -cellForItemAtIndex: that don't apply when used with AsyncDisplayKit.
- *
- * Your section controllers should also conform to @c ASSectionController and your
- * supplementary view sources should conform to @c ASSupplementaryNodeSource.
- */
-
-AS_SUBCLASSING_RESTRICTED
-@interface ASIGListSectionControllerMethods : NSObject
-
-/**
- * Call this for your section controller's @c cellForItemAtIndex: method.
- */
-+ (__kindof UICollectionViewCell *)cellForItemAtIndex:(NSInteger)index sectionController:(IGListSectionController *)sectionController;
-
-/**
- * Call this for your section controller's @c sizeForItemAtIndex: method.
- */
-+ (CGSize)sizeForItemAtIndex:(NSInteger)index;
-
-@end
-
-AS_SUBCLASSING_RESTRICTED
-@interface ASIGListSupplementaryViewSourceMethods : NSObject
-
-/**
- * Call this for your supplementary source's @c viewForSupplementaryElementOfKind:atIndex: method.
- */
-+ (__kindof UICollectionReusableView *)viewForSupplementaryElementOfKind:(NSString *)elementKind
-                                                                 atIndex:(NSInteger)index
-                                                       sectionController:(IGListSectionController *)sectionController;
-
-/**
- * Call this for your supplementary source's @c sizeForSupplementaryViewOfKind:atIndex: method.
- */
-+ (CGSize)sizeForSupplementaryViewOfKind:(NSString *)elementKind atIndex:(NSInteger)index;
-
-@end
-
-NS_ASSUME_NONNULL_END
-
-#endif
diff --git a/submodules/AsyncDisplayKit/Source/AsyncDisplayKit+IGListKitMethods.mm b/submodules/AsyncDisplayKit/Source/AsyncDisplayKit+IGListKitMethods.mm
deleted file mode 100644
index 50d7a219f8..0000000000
--- a/submodules/AsyncDisplayKit/Source/AsyncDisplayKit+IGListKitMethods.mm
+++ /dev/null
@@ -1,53 +0,0 @@
-//
-//  AsyncDisplayKit+IGListKitMethods.m
-//  Texture
-//
-//  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.
-//  Changes after 4/13/2017 are: Copyright (c) Pinterest, Inc.  All rights reserved.
-//  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
-//
-
-#import <AsyncDisplayKit/ASAvailability.h>
-
-#if AS_IG_LIST_KIT
-
-#import "AsyncDisplayKit+IGListKitMethods.h"
-#import <AsyncDisplayKit/ASAssert.h>
-#import <AsyncDisplayKit/_ASCollectionViewCell.h>
-#import <AsyncDisplayKit/_ASCollectionReusableView.h>
-
-
-@implementation ASIGListSectionControllerMethods
-
-+ (__kindof UICollectionViewCell *)cellForItemAtIndex:(NSInteger)index sectionController:(IGListSectionController *)sectionController
-{
-  // Cast to id for backwards-compatibility until 3.0.0 is officially released – IGListSectionType was removed. This is safe.
-  return [sectionController.collectionContext dequeueReusableCellOfClass:[_ASCollectionViewCell class] forSectionController:(id)sectionController atIndex:index];
-}
-
-+ (CGSize)sizeForItemAtIndex:(NSInteger)index
-{
-  ASDisplayNodeFailAssert(@"Did not expect %@ to be called.", NSStringFromSelector(_cmd));
-  return CGSizeZero;
-}
-
-@end
-
-@implementation ASIGListSupplementaryViewSourceMethods
-
-+ (__kindof UICollectionReusableView *)viewForSupplementaryElementOfKind:(NSString *)elementKind
-                                                                 atIndex:(NSInteger)index
-                                                       sectionController:(IGListSectionController *)sectionController
-{
-  return [sectionController.collectionContext dequeueReusableSupplementaryViewOfKind:elementKind forSectionController:(id)sectionController class:[_ASCollectionReusableView class] atIndex:index];
-}
-
-+ (CGSize)sizeForSupplementaryViewOfKind:(NSString *)elementKind atIndex:(NSInteger)index
-{
-  ASDisplayNodeFailAssert(@"Did not expect %@ to be called.", NSStringFromSelector(_cmd));
-  return CGSizeZero;
-}
-
-@end
-
-#endif // AS_IG_LIST_KIT
diff --git a/submodules/AsyncDisplayKit/Source/AsyncDisplayKit.modulemap b/submodules/AsyncDisplayKit/Source/AsyncDisplayKit.modulemap
deleted file mode 100644
index fd7d49e620..0000000000
--- a/submodules/AsyncDisplayKit/Source/AsyncDisplayKit.modulemap
+++ /dev/null
@@ -1,19 +0,0 @@
-framework module AsyncDisplayKit {
-  umbrella header "AsyncDisplayKit.h"
-  
-  export *
-  module * {
-    export *
-  }
-  
-  explicit module ASControlNode_Subclasses {
-    header "ASControlNode+Subclasses.h"
-    export *
-  }
-  
-  explicit module ASDisplayNode_Subclasses {
-    header "ASDisplayNode+Subclasses.h"
-    export *
-  }
-  
-}
diff --git a/submodules/AsyncDisplayKit/Source/Base/ASAssert.m.orig b/submodules/AsyncDisplayKit/Source/Base/ASAssert.m.orig
deleted file mode 100644
index 45a3452180..0000000000
--- a/submodules/AsyncDisplayKit/Source/Base/ASAssert.m.orig
+++ /dev/null
@@ -1,72 +0,0 @@
-//
-//  ASAssert.m
-//  Texture
-//
-//  Copyright (c) Pinterest, Inc.  All rights reserved.
-//  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
-//
-
-#import <AsyncDisplayKit/ASAssert.h>
-#import <AsyncDisplayKit/ASAvailability.h>
-
-<<<<<<< HEAD
-#ifndef MINIMAL_ASDK
-static _Thread_local int tls_mainThreadAssertionsDisabledCount;
-#endif
-=======
-#if AS_TLS_AVAILABLE
->>>>>>> 565da7d4935740d12fc204aa061faf093831da1e
-
-static _Thread_local int tls_mainThreadAssertionsDisabledCount;
-BOOL ASMainThreadAssertionsAreDisabled() {
-#ifdef MINIMAL_ASDK
-  return false;
-#else
-  return tls_mainThreadAssertionsDisabledCount > 0;
-#endif
-}
-
-void ASPushMainThreadAssertionsDisabled() {
-#ifndef MINIMAL_ASDK
-  tls_mainThreadAssertionsDisabledCount += 1;
-#endif
-}
-
-void ASPopMainThreadAssertionsDisabled() {
-#ifndef MINIMAL_ASDK
-  tls_mainThreadAssertionsDisabledCount -= 1;
-  ASDisplayNodeCAssert(tls_mainThreadAssertionsDisabledCount >= 0, @"Attempt to pop thread assertion-disabling without corresponding push.");
-#endif
-}
-
-#else
-
-#import <dispatch/once.h>
-
-static pthread_key_t ASMainThreadAssertionsDisabledKey() {
-  static pthread_key_t k;
-  static dispatch_once_t onceToken;
-  dispatch_once(&onceToken, ^{
-    pthread_key_create(&k, NULL);
-  });
-  return k;
-}
-
-BOOL ASMainThreadAssertionsAreDisabled() {
-  return (pthread_getspecific(ASMainThreadAssertionsDisabledKey()) > 0);
-}
-
-void ASPushMainThreadAssertionsDisabled() {
-  let key = ASMainThreadAssertionsDisabledKey();
-  let oldVal = pthread_getspecific(key);
-  pthread_setspecific(key, oldVal + 1);
-}
-
-void ASPopMainThreadAssertionsDisabled() {
-  let key = ASMainThreadAssertionsDisabledKey();
-  let oldVal = pthread_getspecific(key);
-  pthread_setspecific(key, oldVal - 1);
-  ASDisplayNodeCAssert(oldVal > 0, @"Attempt to pop thread assertion-disabling without corresponding push.");
-}
-
-#endif // AS_TLS_AVAILABLE
diff --git a/submodules/AsyncDisplayKit/Source/Base/ASLog.h b/submodules/AsyncDisplayKit/Source/Base/ASLog.h
deleted file mode 100644
index ccab4b8e58..0000000000
--- a/submodules/AsyncDisplayKit/Source/Base/ASLog.h
+++ /dev/null
@@ -1,163 +0,0 @@
-//
-//  ASLog.h
-//  Texture
-//
-//  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.
-//  Changes after 4/13/2017 are: Copyright (c) Pinterest, Inc.  All rights reserved.
-//  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
-//
-
-#import <AsyncDisplayKit/ASAvailability.h>
-#import <AsyncDisplayKit/ASBaseDefines.h>
-#import <Foundation/Foundation.h>
-#import <os/log.h>
-#import <os/activity.h>
-
-#ifndef ASEnableVerboseLogging
-  #define ASEnableVerboseLogging 0
-#endif
-
-/**
- * Disable all logging.
- *
- * You should only use this function if the default log level is
- * annoying during development. By default, logging is run at
- * the appropriate system log level (see the os_log_* functions),
- * so you do not need to worry generally about the performance
- * implications of log messages.
- *
- * For example, virtually all log messages generated by Texture
- * are at the `debug` log level, which the system
- * disables in production.
- */
-AS_EXTERN void ASDisableLogging(void);
-
-/**
- * Restore logging that has been runtime-disabled via ASDisableLogging().
- *
- * Logging can be disabled at runtime using the ASDisableLogging() function.
- * This command restores logging to the level provided in the build
- * configuration. This can be used in conjunction with ASDisableLogging()
- * to allow logging to be toggled off and back on at runtime.
- */
-AS_EXTERN void ASEnableLogging(void);
-
-/// Log for general node events e.g. interfaceState, didLoad.
-#define ASNodeLogEnabled 1
-AS_EXTERN os_log_t ASNodeLog(void);
-
-/// Log for layout-specific events e.g. calculateLayout.
-#define ASLayoutLogEnabled 1
-AS_EXTERN os_log_t ASLayoutLog(void);
-
-/// Log for display-specific events e.g. display queue batches.
-#define ASDisplayLogEnabled 1
-AS_EXTERN os_log_t ASDisplayLog(void);
-
-/// Log for collection events e.g. reloadData, performBatchUpdates.
-#define ASCollectionLogEnabled 1
-AS_EXTERN os_log_t ASCollectionLog(void);
-
-/// Log for ASNetworkImageNode and ASMultiplexImageNode events.
-#define ASImageLoadingLogEnabled 1
-AS_EXTERN os_log_t ASImageLoadingLog(void);
-
-/// Specialized log for our main thread deallocation trampoline.
-#define ASMainThreadDeallocationLogEnabled 0
-AS_EXTERN os_log_t ASMainThreadDeallocationLog(void);
-
-/**
- * The activity tracing system changed a lot between iOS 9 and 10.
- * In iOS 10, the system was merged with logging and became much more powerful
- * and adopted a new API.
- *
- * The legacy API is visible, but its functionality is extremely limited and the API is so different
- * that we don't bother with it. For example, activities described by os_activity_start/end are not
- * reflected in the log whereas activities described by the newer
- * os_activity_scope are. So unfortunately we must use these iOS 10
- * APIs to get meaningful logging data.
- */
-#if OS_LOG_TARGET_HAS_10_12_FEATURES
-
-#define OS_ACTIVITY_NULLABLE                                              nullable
-#define AS_ACTIVITY_CURRENT                                               OS_ACTIVITY_CURRENT
-#define as_activity_scope(activity)                                       os_activity_scope(activity)
-#define as_activity_apply(activity, block)                                os_activity_apply(activity, block)
-#define as_activity_create(description, parent_activity, flags)           os_activity_create(description, parent_activity, flags)
-#define as_activity_scope_enter(activity, statePtr)                       os_activity_scope_enter(activity, statePtr)
-#define as_activity_scope_leave(statePtr)                                 os_activity_scope_leave(statePtr)
-#define as_activity_get_identifier(activity, outParentID)                 os_activity_get_identifier(activity, outParentID)
-
-#else
-
-#define OS_ACTIVITY_NULLABLE
-#define AS_ACTIVITY_CURRENT                                               OS_ACTIVITY_NULL
-#define as_activity_scope(activity)
-#define as_activity_apply(activity, block)
-#define as_activity_create(description, parent_activity, flags)           OS_ACTIVITY_NULL
-#define as_activity_scope_enter(activity, statePtr)
-#define as_activity_scope_leave(statePtr)
-#define as_activity_get_identifier(activity, outParentID)                 (os_activity_id_t)0
-
-#endif // OS_LOG_TARGET_HAS_10_12_FEATURES
-
-// Create activities only when verbose enabled. Doesn't materially impact performance, but good if we're cluttering up
-// activity scopes and reducing readability.
-#if ASEnableVerboseLogging
-  #define as_activity_scope_verbose(activity)                             as_activity_scope(activity)
-#else
-  #define as_activity_scope_verbose(activity)
-#endif
-
-// Convenience for: as_activity_scope(as_activity_create(description, AS_ACTIVITY_CURRENT, OS_ACTIVITY_FLAG_DEFAULT))
-#define as_activity_create_for_scope(description) \
-  as_activity_scope(as_activity_create(description, AS_ACTIVITY_CURRENT, OS_ACTIVITY_FLAG_DEFAULT))
-
-/**
- * The logging macros are not guarded by deployment-target checks like the activity macros are, but they are
- * only available on iOS >= 9 at runtime, so just make them conditional.
- */
-
-#define as_log_create(subsystem, category) ({     \
-os_log_t __val;                                   \
-if (AS_AVAILABLE_IOS_TVOS(9, 9)) {                \
-  __val = os_log_create(subsystem, category);     \
-} else {                                          \
-  __val = (os_log_t)0;                            \
-}                                                 \
-__val;                                            \
-})
-
-#define as_log_debug(log, format, ...)            \
-if (AS_AVAILABLE_IOS_TVOS(9, 9)) {                \
-  os_log_debug(log, format, ##__VA_ARGS__);       \
-} else {                                          \
-  (void)0;                                        \
-}                                                 \
-
-#define as_log_info(log, format, ...)             \
-if (AS_AVAILABLE_IOS_TVOS(9, 9)) {                \
-  os_log_info(log, format, ##__VA_ARGS__);        \
-} else {                                          \
-  (void)0;                                        \
-}                                                 \
-
-#define as_log_error(log, format, ...)            \
-if (AS_AVAILABLE_IOS_TVOS(9, 9)) {                \
-  os_log_error(log, format, ##__VA_ARGS__);       \
-} else {                                          \
-  (void)0;                                        \
-}                                                 \
-
-#define as_log_fault(log, format, ...)            \
-if (AS_AVAILABLE_IOS_TVOS(9, 9)) {                \
-  os_log_fault(log, format, ##__VA_ARGS__);       \
-} else {                                          \
-  (void)0;                                        \
-}                                                 \
-
-#if ASEnableVerboseLogging
-  #define as_log_verbose(log, format, ...)  as_log_debug(log, format, ##__VA_ARGS__)
-#else
-  #define as_log_verbose(log, format, ...)
-#endif
diff --git a/submodules/AsyncDisplayKit/Source/Base/ASLog.mm b/submodules/AsyncDisplayKit/Source/Base/ASLog.mm
deleted file mode 100644
index 270246454b..0000000000
--- a/submodules/AsyncDisplayKit/Source/Base/ASLog.mm
+++ /dev/null
@@ -1,48 +0,0 @@
-//
-//  ASLog.mm
-//  Texture
-//
-//  Copyright (c) Pinterest, Inc.  All rights reserved.
-//  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
-//
-
-#import <AsyncDisplayKit/ASLog.h>
-#import <stdatomic.h>
-
-static atomic_bool __ASLogEnabled = ATOMIC_VAR_INIT(YES);
-
-void ASDisableLogging() {
-  atomic_store(&__ASLogEnabled, NO);
-}
-
-void ASEnableLogging() {
-  atomic_store(&__ASLogEnabled, YES);
-}
-
-ASDISPLAYNODE_INLINE BOOL ASLoggingIsEnabled() {
-  return atomic_load(&__ASLogEnabled);
-}
-
-os_log_t ASNodeLog() {
-  return (ASNodeLogEnabled && ASLoggingIsEnabled()) ? ASCreateOnce(as_log_create("org.TextureGroup.Texture", "Node")) : OS_LOG_DISABLED;
-}
-
-os_log_t ASLayoutLog() {
-  return (ASLayoutLogEnabled && ASLoggingIsEnabled()) ? ASCreateOnce(as_log_create("org.TextureGroup.Texture", "Layout")) : OS_LOG_DISABLED;
-}
-
-os_log_t ASCollectionLog() {
-  return (ASCollectionLogEnabled && ASLoggingIsEnabled()) ?ASCreateOnce(as_log_create("org.TextureGroup.Texture", "Collection")) : OS_LOG_DISABLED;
-}
-
-os_log_t ASDisplayLog() {
-  return (ASDisplayLogEnabled && ASLoggingIsEnabled()) ?ASCreateOnce(as_log_create("org.TextureGroup.Texture", "Display")) : OS_LOG_DISABLED;
-}
-
-os_log_t ASImageLoadingLog() {
-  return (ASImageLoadingLogEnabled && ASLoggingIsEnabled()) ? ASCreateOnce(as_log_create("org.TextureGroup.Texture", "ImageLoading")) : OS_LOG_DISABLED;
-}
-
-os_log_t ASMainThreadDeallocationLog() {
-  return (ASMainThreadDeallocationLogEnabled && ASLoggingIsEnabled()) ? ASCreateOnce(as_log_create("org.TextureGroup.Texture", "MainDealloc")) : OS_LOG_DISABLED;
-}
diff --git a/submodules/AsyncDisplayKit/Source/Debug/AsyncDisplayKit+Debug.h b/submodules/AsyncDisplayKit/Source/Debug/AsyncDisplayKit+Debug.h
deleted file mode 100644
index 2f0826289a..0000000000
--- a/submodules/AsyncDisplayKit/Source/Debug/AsyncDisplayKit+Debug.h
+++ /dev/null
@@ -1,55 +0,0 @@
-//
-//  AsyncDisplayKit+Debug.h
-//  Texture
-//
-//  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.
-//  Changes after 4/13/2017 are: Copyright (c) Pinterest, Inc.  All rights reserved.
-//  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
-//
-
-#import <AsyncDisplayKit/ASControlNode.h>
-#import <AsyncDisplayKit/ASImageNode.h>
-
-NS_ASSUME_NONNULL_BEGIN
-
-@interface ASImageNode (Debugging)
-
-/**
- * Enables an ASImageNode debug label that shows the ratio of pixels in the source image to those in
- * the displayed bounds (including cropRect).  This helps detect excessive image fetching / downscaling,
- * as well as upscaling (such as providing a URL not suitable for a Retina device).  For dev purposes only.
- * Specify YES to show the label on all ASImageNodes with non-1.0x source-to-bounds pixel ratio.
- */
-@property (class, nonatomic) BOOL shouldShowImageScalingOverlay;
-
-@end
-
-@interface ASControlNode (Debugging)
-
-/**
- * Class method to enable a visualization overlay of the tappable area on the ASControlNode. For app debugging purposes only.
- * NOTE: GESTURE RECOGNIZERS, (including tap gesture recognizers on a control node) WILL NOT BE VISUALIZED!!!
- * Overlay = translucent GREEN color,
- * edges that are clipped by the tappable area of any parent (their bounds + hitTestSlop) in the hierarchy = DARK GREEN BORDERED EDGE,
- * edges that are clipped by clipToBounds = YES of any parent in the hierarchy = ORANGE BORDERED EDGE (may still receive touches beyond
- * overlay rect, but can't be visualized).
- * Specify YES to make this debug feature enabled when messaging the ASControlNode class.
- */
-@property (class, nonatomic) BOOL enableHitTestDebug;
-
-@end
-
-#ifndef MINIMAL_ASDK
-@interface ASDisplayNode (RangeDebugging)
-
-/**
- * Enable a visualization overlay of the all table/collection tuning parameters. For dev purposes only.
- * To use, set this in the AppDelegate --> ASDisplayNode.shouldShowRangeDebugOverlay = YES
- */
-@property (class, nonatomic) BOOL shouldShowRangeDebugOverlay;
-
-@end
-#endif
-
-
-NS_ASSUME_NONNULL_END
diff --git a/submodules/AsyncDisplayKit/Source/Debug/AsyncDisplayKit+Debug.mm b/submodules/AsyncDisplayKit/Source/Debug/AsyncDisplayKit+Debug.mm
deleted file mode 100644
index f527098dcc..0000000000
--- a/submodules/AsyncDisplayKit/Source/Debug/AsyncDisplayKit+Debug.mm
+++ /dev/null
@@ -1,758 +0,0 @@
-//
-//  AsyncDisplayKit+Debug.mm
-//  Texture
-//
-//  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.
-//  Changes after 4/13/2017 are: Copyright (c) Pinterest, Inc.  All rights reserved.
-//  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
-//
-
-#import <AsyncDisplayKit/AsyncDisplayKit+Debug.h>
-#import <AsyncDisplayKit/ASAbstractLayoutController.h>
-#import <AsyncDisplayKit/ASGraphicsContext.h>
-#import <AsyncDisplayKit/ASLayout.h>
-#import <AsyncDisplayKit/ASWeakSet.h>
-#import <AsyncDisplayKit/UIImage+ASConvenience.h>
-#import <AsyncDisplayKit/ASDisplayNode+Subclasses.h>
-#import <AsyncDisplayKit/CoreGraphics+ASConvenience.h>
-#import <AsyncDisplayKit/ASDisplayNodeExtras.h>
-#import <AsyncDisplayKit/ASTextNode.h>
-#import <AsyncDisplayKit/ASRangeController.h>
-
-
-#pragma mark - ASImageNode (Debugging)
-
-static BOOL __shouldShowImageScalingOverlay = NO;
-
-@implementation ASImageNode (Debugging)
-
-+ (void)setShouldShowImageScalingOverlay:(BOOL)show;
-{
-  __shouldShowImageScalingOverlay = show;
-}
-
-+ (BOOL)shouldShowImageScalingOverlay
-{
-  return __shouldShowImageScalingOverlay;
-}
-
-@end
-
-#pragma mark - ASControlNode (DebuggingInternal)
-
-static BOOL __enableHitTestDebug = NO;
-
-@interface ASControlNode (DebuggingInternal)
-
-- (ASImageNode *)debugHighlightOverlay;
-
-@end
-
-@implementation ASControlNode (Debugging)
-
-+ (void)setEnableHitTestDebug:(BOOL)enable
-{
-  __enableHitTestDebug = enable;
-}
-
-+ (BOOL)enableHitTestDebug
-{
-  return __enableHitTestDebug;
-}
-
-// layout method required ONLY when hitTestDebug is enabled
-- (void)layout
-{
-  [super layout];
-  
-  if ([ASControlNode enableHitTestDebug]) {
-    
-    // Construct hitTestDebug highlight overlay frame indicating tappable area of a node, which can be restricted by two things:
-    
-    // (1) Any parent's tapable area (its own bounds + hitTestSlop) may restrict the desired tappable area expansion using
-    // hitTestSlop of a child as UIKit event delivery (hitTest:) will not search sub-hierarchies if one of our parents does
-    // not return YES for pointInside:. To circumvent this restriction, a developer will need to set / adjust the hitTestSlop
-    // on the limiting parent. This is indicated in the overlay by a dark GREEN edge. This is an ACTUAL restriction.
-    
-    // (2) Any parent's .clipToBounds. If a parent is clipping, we cannot show the overlay outside that area
-    // (although it still respond to touch). To indicate that the overlay cannot accurately display the true tappable area,
-    // the overlay will have an ORANGE edge. This is a VISUALIZATION restriction.
-    
-    CGRect intersectRect                 = UIEdgeInsetsInsetRect(self.bounds, [self hitTestSlop]);
-    UIRectEdge clippedEdges              = UIRectEdgeNone;
-    UIRectEdge clipsToBoundsClippedEdges = UIRectEdgeNone;
-    CALayer *layer               = self.layer;
-    CALayer *intersectLayer      = layer;
-    CALayer *intersectSuperlayer = layer.superlayer;
-    
-    // FIXED: Stop climbing hierarchy if UIScrollView is encountered (its offset bounds origin may make it seem like our events
-    // will be clipped when scrolling will actually reveal them (because this process will not re-run due to scrolling))
-    while (intersectSuperlayer && ![intersectSuperlayer.delegate respondsToSelector:@selector(contentOffset)]) {
-      
-      // Get parent's tappable area
-      CGRect parentHitRect     = intersectSuperlayer.bounds;
-      BOOL parentClipsToBounds = NO;
-      
-      // If parent is a node, tappable area may be expanded by hitTestSlop
-      ASDisplayNode *parentNode = ASLayerToDisplayNode(intersectSuperlayer);
-      if (parentNode) {
-        UIEdgeInsets parentSlop = [parentNode hitTestSlop];
-        
-        // If parent has hitTestSlop, expand tappable area (if parent doesn't clipToBounds)
-        if (!UIEdgeInsetsEqualToEdgeInsets(UIEdgeInsetsZero, parentSlop)) {
-          parentClipsToBounds = parentNode.clipsToBounds;
-          if (!parentClipsToBounds) {
-            parentHitRect = UIEdgeInsetsInsetRect(parentHitRect, [parentNode hitTestSlop]);
-          }
-        }
-      }
-      
-      // Convert our current rect to parent coordinates
-      CGRect intersectRectInParentCoordinates = [intersectSuperlayer convertRect:intersectRect fromLayer:intersectLayer];
-      
-      // Intersect rect with the parent's tappable area rect
-      intersectRect = CGRectIntersection(parentHitRect, intersectRectInParentCoordinates);
-      if (!CGSizeEqualToSize(parentHitRect.size, intersectRectInParentCoordinates.size)) {
-        clippedEdges = [self setEdgesOfIntersectionForChildRect:intersectRectInParentCoordinates
-                                                     parentRect:parentHitRect rectEdge:clippedEdges];
-        if (parentClipsToBounds) {
-          clipsToBoundsClippedEdges = [self setEdgesOfIntersectionForChildRect:intersectRectInParentCoordinates
-                                                                    parentRect:parentHitRect rectEdge:clipsToBoundsClippedEdges];
-        }
-      }
-      
-      // move up hierarchy
-      intersectLayer      = intersectSuperlayer;
-      intersectSuperlayer = intersectLayer.superlayer;
-    }
-    
-    // produce final overlay image (or fill background if edges aren't restricted)
-    CGRect finalRect   = [intersectLayer convertRect:intersectRect toLayer:layer];
-    UIColor *fillColor = [[UIColor greenColor] colorWithAlphaComponent:0.4];
-    
-    ASImageNode *debugOverlay = [self debugHighlightOverlay];
-    
-    // determine if edges are clipped and if so, highlight the restricted edges
-    if (clippedEdges == UIRectEdgeNone) {
-      debugOverlay.backgroundColor = fillColor;
-    } else {
-      const CGFloat borderWidth = 2.0;
-      UIColor *borderColor      = [[UIColor orangeColor] colorWithAlphaComponent:0.8];
-      UIColor *clipsBorderColor = [UIColor colorWithRed:30/255.0 green:90/255.0 blue:50/255.0 alpha:0.7];
-      CGRect imgRect            = CGRectMake(0, 0, 2.0 * borderWidth + 1.0, 2.0 * borderWidth + 1.0);
-      
-      ASGraphicsBeginImageContextWithOptions(imgRect.size, NO, 1);
-      
-      [fillColor setFill];
-      UIRectFill(imgRect);
-      
-      [self drawEdgeIfClippedWithEdges:clippedEdges color:clipsBorderColor borderWidth:borderWidth imgRect:imgRect];
-      [self drawEdgeIfClippedWithEdges:clipsToBoundsClippedEdges color:borderColor borderWidth:borderWidth imgRect:imgRect];
-      
-      UIImage *debugHighlightImage = ASGraphicsGetImageAndEndCurrentContext();
-      
-      UIEdgeInsets edgeInsets = UIEdgeInsetsMake(borderWidth, borderWidth, borderWidth, borderWidth);
-      debugOverlay.image = [debugHighlightImage resizableImageWithCapInsets:edgeInsets resizingMode:UIImageResizingModeStretch];
-      debugOverlay.backgroundColor = nil;
-    }
-    
-    debugOverlay.frame = finalRect;
-  }
-}
-
-- (UIRectEdge)setEdgesOfIntersectionForChildRect:(CGRect)childRect parentRect:(CGRect)parentRect rectEdge:(UIRectEdge)rectEdge
-{
-  // determine which edges of childRect are outside parentRect (and thus will be clipped)
-  if (childRect.origin.y < parentRect.origin.y) {
-    rectEdge |= UIRectEdgeTop;
-  }
-  if (childRect.origin.x < parentRect.origin.x) {
-    rectEdge |= UIRectEdgeLeft;
-  }
-  if (CGRectGetMaxY(childRect) > CGRectGetMaxY(parentRect)) {
-    rectEdge |= UIRectEdgeBottom;
-  }
-  if (CGRectGetMaxX(childRect) > CGRectGetMaxX(parentRect)) {
-    rectEdge |= UIRectEdgeRight;
-  }
-  
-  return rectEdge;
-}
-
-- (void)drawEdgeIfClippedWithEdges:(UIRectEdge)rectEdge color:(UIColor *)color borderWidth:(CGFloat)borderWidth imgRect:(CGRect)imgRect
-{
-  [color setFill];
-  
-  // highlight individual edges of overlay if edge is restricted by parentRect
-  // so that the developer is aware that increasing hitTestSlop will not result in an expanded tappable area
-  if (rectEdge & UIRectEdgeTop) {
-    UIRectFill(CGRectMake(0.0, 0.0, imgRect.size.width, borderWidth));
-  }
-  if (rectEdge & UIRectEdgeLeft) {
-    UIRectFill(CGRectMake(0.0, 0.0, borderWidth, imgRect.size.height));
-  }
-  if (rectEdge & UIRectEdgeBottom) {
-    UIRectFill(CGRectMake(0.0, imgRect.size.height - borderWidth, imgRect.size.width, borderWidth));
-  }
-  if (rectEdge & UIRectEdgeRight) {
-    UIRectFill(CGRectMake(imgRect.size.width - borderWidth, 0.0, borderWidth, imgRect.size.height));
-  }
-}
-
-@end
-
-#pragma mark - ASRangeController (Debugging)
-
-#ifndef MINIMAL_ASDK
-
-@interface _ASRangeDebugOverlayView : UIView
-
-+ (instancetype)sharedInstance NS_RETURNS_RETAINED;
-
-- (void)addRangeController:(ASRangeController *)rangeController;
-
-- (void)updateRangeController:(ASRangeController *)controller
-     withScrollableDirections:(ASScrollDirection)scrollableDirections
-              scrollDirection:(ASScrollDirection)direction
-                    rangeMode:(ASLayoutRangeMode)mode
-      displayTuningParameters:(ASRangeTuningParameters)displayTuningParameters
-      preloadTuningParameters:(ASRangeTuningParameters)preloadTuningParameters
-               interfaceState:(ASInterfaceState)interfaceState;
-
-@end
-
-@interface _ASRangeDebugBarView : UIView
-
-@property (nonatomic, weak) ASRangeController *rangeController;
-@property (nonatomic) BOOL destroyOnLayout;
-@property (nonatomic) NSString *debugString;
-
-- (instancetype)initWithRangeController:(ASRangeController *)rangeController;
-
-- (void)updateWithVisibleRatio:(CGFloat)visibleRatio
-                  displayRatio:(CGFloat)displayRatio
-           leadingDisplayRatio:(CGFloat)leadingDisplayRatio
-                  preloadRatio:(CGFloat)preloadRatio
-           leadingpreloadRatio:(CGFloat)leadingpreloadRatio
-                     direction:(ASScrollDirection)direction;
-
-@end
-
-static BOOL __shouldShowRangeDebugOverlay = NO;
-
-@implementation ASDisplayNode (RangeDebugging)
-
-+ (void)setShouldShowRangeDebugOverlay:(BOOL)show
-{
-  __shouldShowRangeDebugOverlay = show;
-}
-
-+ (BOOL)shouldShowRangeDebugOverlay
-{
-  return __shouldShowRangeDebugOverlay;
-}
-
-@end
-
-@implementation ASRangeController (DebugInternal)
-
-+ (void)layoutDebugOverlayIfNeeded
-{
-  [[_ASRangeDebugOverlayView sharedInstance] setNeedsLayout];
-}
-
-- (void)addRangeControllerToRangeDebugOverlay
-{
-  [[_ASRangeDebugOverlayView sharedInstance] addRangeController:self];
-}
-
-- (void)updateRangeController:(ASRangeController *)controller
-     withScrollableDirections:(ASScrollDirection)scrollableDirections
-              scrollDirection:(ASScrollDirection)direction
-                    rangeMode:(ASLayoutRangeMode)mode
-      displayTuningParameters:(ASRangeTuningParameters)displayTuningParameters
-      preloadTuningParameters:(ASRangeTuningParameters)preloadTuningParameters
-               interfaceState:(ASInterfaceState)interfaceState
-{
-  [[_ASRangeDebugOverlayView sharedInstance] updateRangeController:controller
-                                          withScrollableDirections:scrollableDirections
-                                                   scrollDirection:direction
-                                                         rangeMode:mode
-                                           displayTuningParameters:displayTuningParameters
-                                           preloadTuningParameters:preloadTuningParameters
-                                                    interfaceState:interfaceState];
-}
-
-@end
-
-
-#pragma mark _ASRangeDebugOverlayView
-
-@interface _ASRangeDebugOverlayView () <UIGestureRecognizerDelegate>
-@end
-
-@implementation _ASRangeDebugOverlayView
-{
-  NSMutableArray *_rangeControllerViews;
-  NSInteger      _newControllerCount;
-  NSInteger      _removeControllerCount;
-  BOOL           _animating;
-}
-
-+ (UIWindow *)keyWindow
-{
-  // hack to work around app extensions not having UIApplication...not sure of a better way to do this?
-  return [[NSClassFromString(@"UIApplication") sharedApplication] keyWindow];
-}
-
-+ (_ASRangeDebugOverlayView *)sharedInstance NS_RETURNS_RETAINED
-{
-  static _ASRangeDebugOverlayView *__rangeDebugOverlay = nil;
-  
-  if (!__rangeDebugOverlay && ASDisplayNode.shouldShowRangeDebugOverlay) {
-    __rangeDebugOverlay = [[self alloc] initWithFrame:CGRectZero];
-    [[self keyWindow] addSubview:__rangeDebugOverlay];
-  }
-  
-  return __rangeDebugOverlay;
-}
-
-#define OVERLAY_INSET 10
-#define OVERLAY_SCALE 3
-- (instancetype)initWithFrame:(CGRect)frame
-{
-  self = [super initWithFrame:frame];
-  
-  if (self) {
-    _rangeControllerViews = [[NSMutableArray alloc] init];
-    self.backgroundColor = [[UIColor blackColor] colorWithAlphaComponent:0.4];
-    self.layer.zPosition = 1000;
-    self.clipsToBounds = YES;
-    
-    CGSize windowSize = [[[self class] keyWindow] bounds].size;
-    self.frame  = CGRectMake(windowSize.width - (windowSize.width / OVERLAY_SCALE) - OVERLAY_INSET, windowSize.height - OVERLAY_INSET,
-                                                 windowSize.width / OVERLAY_SCALE, 0.0);
-    
-    UIPanGestureRecognizer *panGR = [[UIPanGestureRecognizer alloc] initWithTarget:self action:@selector(rangeDebugOverlayWasPanned:)];
-    [self addGestureRecognizer:panGR];
-  }
-  
-  return self;
-}
-
-#define BAR_THICKNESS 24
-
-- (void)layoutSubviews
-{
-  [super layoutSubviews];
-  [UIView animateWithDuration:0.2 delay:0.0 options:UIViewAnimationOptionBeginFromCurrentState animations:^{
-    [self layoutToFitAllBarsExcept:0];
-  } completion:^(BOOL finished) {
-    
-  }];
-}
-
-- (void)layoutToFitAllBarsExcept:(NSInteger)barsToClip
-{
-  CGSize boundsSize = self.bounds.size;
-  CGFloat totalHeight = 0.0;
-  
-  CGRect barRect = CGRectMake(0, boundsSize.height - BAR_THICKNESS, self.bounds.size.width, BAR_THICKNESS);
-  NSMutableArray *displayedBars = [NSMutableArray array];
-  
-  for (_ASRangeDebugBarView *barView in [_rangeControllerViews copy]) {
-    barView.frame = barRect;
-    
-    ASInterfaceState interfaceState = [barView.rangeController.dataSource interfaceStateForRangeController:barView.rangeController];
-    
-    if (!(interfaceState & (ASInterfaceStateVisible))) {
-      if (barView.destroyOnLayout && barView.alpha == 0.0) {
-        [_rangeControllerViews removeObjectIdenticalTo:barView];
-        [barView removeFromSuperview];
-      } else {
-        barView.alpha = 0.0;
-      }
-    } else {
-      assert(!barView.destroyOnLayout); // In this case we should not have a visible interfaceState
-      barView.alpha = 1.0;
-      totalHeight += BAR_THICKNESS;
-      barRect.origin.y -= BAR_THICKNESS;
-      [displayedBars addObject:barView];
-    }
-  }
-  
-  if (totalHeight > 0) {
-    totalHeight -= (BAR_THICKNESS * barsToClip);
-  }
-  
-  if (barsToClip == 0) {
-    CGRect overlayFrame = self.frame;
-    CGFloat heightChange = (overlayFrame.size.height - totalHeight);
-    
-    overlayFrame.origin.y += heightChange;
-    overlayFrame.size.height = totalHeight;
-    self.frame = overlayFrame;
-    
-    for (_ASRangeDebugBarView *barView in displayedBars) {
-      [self offsetYOrigin:-heightChange forView:barView];
-    }
-  }
-}
-
-- (void)setOrigin:(CGPoint)origin forView:(UIView *)view
-{
-  CGRect newFrame = view.frame;
-  newFrame.origin = origin;
-  view.frame      = newFrame;
-}
-
-- (void)offsetYOrigin:(CGFloat)offset forView:(UIView *)view
-{
-  CGRect newFrame = view.frame;
-  newFrame.origin = CGPointMake(newFrame.origin.x, newFrame.origin.y + offset);
-  view.frame      = newFrame;
-}
-
-- (void)addRangeController:(ASRangeController *)rangeController
-{
-  for (_ASRangeDebugBarView *rangeView in _rangeControllerViews) {
-    if (rangeView.rangeController == rangeController) {
-      return;
-    }
-  }
-  _ASRangeDebugBarView *rangeView = [[_ASRangeDebugBarView alloc] initWithRangeController:rangeController];
-  [_rangeControllerViews addObject:rangeView];
-  [self addSubview:rangeView];
-  
-  if (!_animating) {
-    [self layoutToFitAllBarsExcept:1];
-  }
-  
-  [UIView animateWithDuration:0.2 delay:0.0 options:UIViewAnimationOptionBeginFromCurrentState animations:^{
-    _animating = YES;
-    [self layoutToFitAllBarsExcept:0];
-  } completion:^(BOOL finished) {
-    _animating = NO;
-  }];
-}
-
-- (void)updateRangeController:(ASRangeController *)controller
-     withScrollableDirections:(ASScrollDirection)scrollableDirections
-              scrollDirection:(ASScrollDirection)scrollDirection
-                    rangeMode:(ASLayoutRangeMode)rangeMode
-      displayTuningParameters:(ASRangeTuningParameters)displayTuningParameters
-      preloadTuningParameters:(ASRangeTuningParameters)preloadTuningParameters
-               interfaceState:(ASInterfaceState)interfaceState;
-{
-  _ASRangeDebugBarView *viewToUpdate = [self barViewForRangeController:controller];
-  
-  CGRect boundsRect = self.bounds;
-  CGRect visibleRect   = CGRectExpandToRangeWithScrollableDirections(boundsRect, ASRangeTuningParametersZero, scrollableDirections, scrollDirection);
-  CGRect displayRect   = CGRectExpandToRangeWithScrollableDirections(boundsRect, displayTuningParameters,     scrollableDirections, scrollDirection);
-  CGRect preloadRect   = CGRectExpandToRangeWithScrollableDirections(boundsRect, preloadTuningParameters,   scrollableDirections, scrollDirection);
-  
-  // figure out which is biggest and assume that is full bounds
-  BOOL displayRangeLargerThanPreload  = NO;
-  CGFloat visibleRatio                = 0;
-  CGFloat displayRatio                = 0;
-  CGFloat preloadRatio                = 0;
-  CGFloat leadingDisplayTuningRatio   = 0;
-  CGFloat leadingPreloadTuningRatio   = 0;
-
-  if (!((displayTuningParameters.leadingBufferScreenfuls + displayTuningParameters.trailingBufferScreenfuls) == 0)) {
-    leadingDisplayTuningRatio = displayTuningParameters.leadingBufferScreenfuls / (displayTuningParameters.leadingBufferScreenfuls + displayTuningParameters.trailingBufferScreenfuls);
-  }
-  if (!((preloadTuningParameters.leadingBufferScreenfuls + preloadTuningParameters.trailingBufferScreenfuls) == 0)) {
-    leadingPreloadTuningRatio = preloadTuningParameters.leadingBufferScreenfuls / (preloadTuningParameters.leadingBufferScreenfuls + preloadTuningParameters.trailingBufferScreenfuls);
-  }
-  
-  if (ASScrollDirectionContainsVerticalDirection(scrollDirection)) {
-    
-    if (displayRect.size.height >= preloadRect.size.height) {
-      displayRangeLargerThanPreload = YES;
-    } else {
-      displayRangeLargerThanPreload = NO;
-    }
-    
-    if (displayRangeLargerThanPreload) {
-      visibleRatio    = visibleRect.size.height / displayRect.size.height;
-      displayRatio    = 1.0;
-      preloadRatio    = preloadRect.size.height / displayRect.size.height;
-    } else {
-      visibleRatio    = visibleRect.size.height / preloadRect.size.height;
-      displayRatio    = displayRect.size.height / preloadRect.size.height;
-      preloadRatio    = 1.0;
-    }
-
-  } else {
-    
-    if (displayRect.size.width >= preloadRect.size.width) {
-      displayRangeLargerThanPreload = YES;
-    } else {
-      displayRangeLargerThanPreload = NO;
-    }
-    
-    if (displayRangeLargerThanPreload) {
-      visibleRatio    = visibleRect.size.width / displayRect.size.width;
-      displayRatio    = 1.0;
-      preloadRatio    = preloadRect.size.width / displayRect.size.width;
-    } else {
-      visibleRatio    = visibleRect.size.width / preloadRect.size.width;
-      displayRatio    = displayRect.size.width / preloadRect.size.width;
-      preloadRatio    = 1.0;
-    }
-  }
-
-  [viewToUpdate updateWithVisibleRatio:visibleRatio
-                          displayRatio:displayRatio
-                   leadingDisplayRatio:leadingDisplayTuningRatio
-                          preloadRatio:preloadRatio
-                   leadingpreloadRatio:leadingPreloadTuningRatio
-                             direction:scrollDirection];
-
-  [self setNeedsLayout];
-}
-
-- (_ASRangeDebugBarView *)barViewForRangeController:(ASRangeController *)controller
-{
-  _ASRangeDebugBarView *rangeControllerBarView = nil;
-  
-  for (_ASRangeDebugBarView *rangeView in [[_rangeControllerViews reverseObjectEnumerator] allObjects]) {
-    // remove barView if its rangeController has been deleted
-    if (!rangeView.rangeController) {
-      rangeView.destroyOnLayout = YES;
-      [self setNeedsLayout];
-    }
-    ASInterfaceState interfaceState = [rangeView.rangeController.dataSource interfaceStateForRangeController:rangeView.rangeController];
-    if (!(interfaceState & (ASInterfaceStateVisible | ASInterfaceStateDisplay))) {
-      [self setNeedsLayout];
-    }
-    
-    if ([rangeView.rangeController isEqual:controller]) {
-      rangeControllerBarView = rangeView;
-    }
-  }
-  
-  return rangeControllerBarView;
-}
-
-#define MIN_VISIBLE_INSET 40
-- (void)rangeDebugOverlayWasPanned:(UIPanGestureRecognizer *)recognizer
-{
-  CGPoint translation    = [recognizer translationInView:recognizer.view];
-  CGFloat newCenterX     = recognizer.view.center.x + translation.x;
-  CGFloat newCenterY     = recognizer.view.center.y + translation.y;
-  CGSize boundsSize      = recognizer.view.bounds.size;
-  CGSize superBoundsSize = recognizer.view.superview.bounds.size;
-  CGFloat minAllowableX  = -boundsSize.width / 2.0 + MIN_VISIBLE_INSET;
-  CGFloat maxAllowableX  = superBoundsSize.width + boundsSize.width / 2.0 - MIN_VISIBLE_INSET;
-  
-  if (newCenterX > maxAllowableX) {
-    newCenterX = maxAllowableX;
-  } else if (newCenterX < minAllowableX) {
-    newCenterX = minAllowableX;
-  }
-  
-  CGFloat minAllowableY = -boundsSize.height / 2.0 + MIN_VISIBLE_INSET;
-  CGFloat maxAllowableY = superBoundsSize.height + boundsSize.height / 2.0 - MIN_VISIBLE_INSET;
-    
-  if (newCenterY > maxAllowableY) {
-    newCenterY = maxAllowableY;
-  } else if (newCenterY < minAllowableY) {
-    newCenterY = minAllowableY;
-  }
-  
-  recognizer.view.center = CGPointMake(newCenterX, newCenterY);
-  [recognizer setTranslation:CGPointMake(0, 0) inView:recognizer.view];
-}
-
-@end
-
-#pragma mark _ASRangeDebugBarView
-
-@implementation _ASRangeDebugBarView
-{
-  ASTextNode        *_debugText;
-  ASTextNode        *_leftDebugText;
-  ASTextNode        *_rightDebugText;
-  ASImageNode       *_visibleRect;
-  ASImageNode       *_displayRect;
-  ASImageNode       *_preloadRect;
-  CGFloat           _visibleRatio;
-  CGFloat           _displayRatio;
-  CGFloat           _preloadRatio;
-  CGFloat           _leadingDisplayRatio;
-  CGFloat           _leadingpreloadRatio;
-  ASScrollDirection _scrollDirection;
-  BOOL              _firstLayoutOfRects;
-}
-
-- (instancetype)initWithRangeController:(ASRangeController *)rangeController
-{
-  self = [super initWithFrame:CGRectZero];
-  if (self) {
-    _firstLayoutOfRects = YES;
-    _rangeController    = rangeController;
-    _debugText          = [self createDebugTextNode];
-    _leftDebugText      = [self createDebugTextNode];
-    _rightDebugText     = [self createDebugTextNode];
-    _preloadRect        = [self createRangeNodeWithColor:[UIColor orangeColor]];
-    _displayRect        = [self createRangeNodeWithColor:[UIColor yellowColor]];
-    _visibleRect        = [self createRangeNodeWithColor:[UIColor greenColor]];
-  }
-  
-  return self;
-}
-
-#define HORIZONTAL_INSET 10
-- (void)layoutSubviews
-{
-  [super layoutSubviews];
-  
-  CGSize boundsSize     = self.bounds.size;
-  CGFloat subCellHeight = 9.0;
-  [self setBarDebugLabelsWithSize:subCellHeight];
-  [self setBarSubviewOrder];
-
-  CGRect rect       = CGRectIntegral(CGRectMake(0, 0, boundsSize.width, floorf(boundsSize.height / 2.0)));
-  rect.size         = [_debugText layoutThatFits:ASSizeRangeMake(CGSizeZero, CGSizeMake(CGFLOAT_MAX, CGFLOAT_MAX))].size;
-  rect.origin.x     = (boundsSize.width - rect.size.width) / 2.0;
-  _debugText.frame  = rect;
-  rect.origin.y    += rect.size.height;
-  
-  rect.origin.x          = 0;
-  rect.size              = CGSizeMake(HORIZONTAL_INSET, boundsSize.height / 2.0);
-  _leftDebugText.frame   = rect;
-
-  rect.origin.x          = boundsSize.width - HORIZONTAL_INSET;
-  _rightDebugText.frame  = rect;
-
-  CGFloat visibleDimension   = (boundsSize.width - 2 * HORIZONTAL_INSET) * _visibleRatio;
-  CGFloat displayDimension   = (boundsSize.width - 2 * HORIZONTAL_INSET) * _displayRatio;
-  CGFloat preloadDimension   = (boundsSize.width - 2 * HORIZONTAL_INSET) * _preloadRatio;
-  CGFloat visiblePoint       = 0;
-  CGFloat displayPoint       = 0;
-  CGFloat preloadPoint       = 0;
-  
-  BOOL displayLargerThanPreload = (_displayRatio == 1.0) ? YES : NO;
-  
-  if (ASScrollDirectionContainsLeft(_scrollDirection) || ASScrollDirectionContainsUp(_scrollDirection)) {
-    
-    if (displayLargerThanPreload) {
-      visiblePoint        = (displayDimension - visibleDimension) * _leadingDisplayRatio;
-      preloadPoint        = visiblePoint - (preloadDimension - visibleDimension) * _leadingpreloadRatio;
-    } else {
-      visiblePoint        = (preloadDimension - visibleDimension) * _leadingpreloadRatio;
-      displayPoint        = visiblePoint - (displayDimension - visibleDimension) * _leadingDisplayRatio;
-    }
-  } else if (ASScrollDirectionContainsRight(_scrollDirection) || ASScrollDirectionContainsDown(_scrollDirection)) {
-    
-    if (displayLargerThanPreload) {
-      visiblePoint        = (displayDimension - visibleDimension) * (1 - _leadingDisplayRatio);
-      preloadPoint        = visiblePoint - (preloadDimension - visibleDimension) * (1 - _leadingpreloadRatio);
-    } else {
-      visiblePoint        = (preloadDimension - visibleDimension) * (1 - _leadingpreloadRatio);
-      displayPoint        = visiblePoint - (displayDimension - visibleDimension) * (1 - _leadingDisplayRatio);
-    }
-  }
-  
-  BOOL animate = !_firstLayoutOfRects;
-  [UIView animateWithDuration:animate ? 0.3 : 0.0 delay:0.0 options:UIViewAnimationOptionLayoutSubviews animations:^{
-    _visibleRect.frame    = CGRectMake(HORIZONTAL_INSET + visiblePoint,    rect.origin.y, visibleDimension,    subCellHeight);
-    _displayRect.frame    = CGRectMake(HORIZONTAL_INSET + displayPoint,    rect.origin.y, displayDimension,    subCellHeight);
-    _preloadRect.frame    = CGRectMake(HORIZONTAL_INSET + preloadPoint,  rect.origin.y, preloadDimension,  subCellHeight);
-  } completion:^(BOOL finished) {}];
-  
-  if (!animate) {
-    _visibleRect.alpha = _displayRect.alpha = _preloadRect.alpha = 0;
-    [UIView animateWithDuration:0.3 animations:^{
-      _visibleRect.alpha = _displayRect.alpha = _preloadRect.alpha = 1;
-    }];
-  }
-  
-  _firstLayoutOfRects = NO;
-}
-
-- (void)updateWithVisibleRatio:(CGFloat)visibleRatio
-                  displayRatio:(CGFloat)displayRatio
-           leadingDisplayRatio:(CGFloat)leadingDisplayRatio
-                preloadRatio:(CGFloat)preloadRatio
-         leadingpreloadRatio:(CGFloat)leadingpreloadRatio
-                     direction:(ASScrollDirection)scrollDirection
-{
-  _visibleRatio          = visibleRatio;
-  _displayRatio          = displayRatio;
-  _leadingDisplayRatio   = leadingDisplayRatio;
-  _preloadRatio          = preloadRatio;
-  _leadingpreloadRatio   = leadingpreloadRatio;
-  _scrollDirection       = scrollDirection;
-  
-  [self setNeedsLayout];
-}
-
-- (void)setBarSubviewOrder
-{
-  if (_preloadRatio == 1.0) {
-    [self sendSubviewToBack:_preloadRect.view];
-  } else {
-    [self sendSubviewToBack:_displayRect.view];
-  }
-  
-  [self bringSubviewToFront:_visibleRect.view];
-}
-
-- (void)setBarDebugLabelsWithSize:(CGFloat)size
-{
-  if (!_debugString) {
-    _debugString = [[_rangeController dataSource] nameForRangeControllerDataSource];
-  }
-  if (_debugString) {
-    _debugText.attributedText = [_ASRangeDebugBarView whiteAttributedStringFromString:_debugString withSize:size];
-  }
-  
-  if (ASScrollDirectionContainsVerticalDirection(_scrollDirection)) {
-    _leftDebugText.attributedText = [_ASRangeDebugBarView whiteAttributedStringFromString:@"▲" withSize:size];
-    _rightDebugText.attributedText = [_ASRangeDebugBarView whiteAttributedStringFromString:@"▼" withSize:size];
-  } else if (ASScrollDirectionContainsHorizontalDirection(_scrollDirection)) {
-    _leftDebugText.attributedText = [_ASRangeDebugBarView whiteAttributedStringFromString:@"◀︎" withSize:size];
-    _rightDebugText.attributedText = [_ASRangeDebugBarView whiteAttributedStringFromString:@"▶︎" withSize:size];
-  }
-  
-  _leftDebugText.hidden = (_scrollDirection != ASScrollDirectionLeft && _scrollDirection != ASScrollDirectionUp);
-  _rightDebugText.hidden = (_scrollDirection != ASScrollDirectionRight && _scrollDirection != ASScrollDirectionDown);
-}
-
-- (ASTextNode *)createDebugTextNode
-{
-  ASTextNode *label = [[ASTextNode alloc] init];
-  [self addSubnode:label];
-  return label;
-}
-
-#define RANGE_BAR_CORNER_RADIUS 3
-#define RANGE_BAR_BORDER_WIDTH 1
-- (ASImageNode *)createRangeNodeWithColor:(UIColor *)color
-{
-    ASImageNode *rangeBarImageNode = [[ASImageNode alloc] init];
-    rangeBarImageNode.image = [UIImage as_resizableRoundedImageWithCornerRadius:RANGE_BAR_CORNER_RADIUS
-                                                                    cornerColor:[UIColor clearColor]
-                                                                      fillColor:[color colorWithAlphaComponent:0.5]
-                                                                    borderColor:[[UIColor blackColor] colorWithAlphaComponent:0.9]
-                                                                    borderWidth:RANGE_BAR_BORDER_WIDTH
-                                                                 roundedCorners:UIRectCornerAllCorners
-                                                                          scale:[[UIScreen mainScreen] scale]];
-    [self addSubnode:rangeBarImageNode];
-  
-    return rangeBarImageNode;
-}
-
-+ (NSAttributedString *)whiteAttributedStringFromString:(NSString *)string withSize:(CGFloat)size NS_RETURNS_RETAINED
-{
-  NSDictionary *attributes = @{NSForegroundColorAttributeName : [UIColor whiteColor],
-                               NSFontAttributeName            : [UIFont systemFontOfSize:size]};
-  return [[NSAttributedString alloc] initWithString:string attributes:attributes];
-}
-
-@end
-
-#endif
diff --git a/submodules/AsyncDisplayKit/Source/Debug/AsyncDisplayKit+Tips.h b/submodules/AsyncDisplayKit/Source/Debug/AsyncDisplayKit+Tips.h
deleted file mode 100644
index 6232746a57..0000000000
--- a/submodules/AsyncDisplayKit/Source/Debug/AsyncDisplayKit+Tips.h
+++ /dev/null
@@ -1,43 +0,0 @@
-//
-//  AsyncDisplayKit+Tips.h
-//  Texture
-//
-//  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.
-//  Changes after 4/13/2017 are: Copyright (c) Pinterest, Inc.  All rights reserved.
-//  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
-//
-
-#import <Foundation/Foundation.h>
-#import <AsyncDisplayKit/ASDisplayNode.h>
-
-NS_ASSUME_NONNULL_BEGIN
-
-typedef void(^ASTipDisplayBlock)(ASDisplayNode *node, NSString *message);
-
-/**
- * The methods added to ASDisplayNode to control the tips system.
- *
- * To enable tips, define AS_ENABLE_TIPS=1 (e.g. modify ASBaseDefines.h).
- */
-@interface ASDisplayNode (Tips)
-
-/**
- * Whether this class should have tips active. Default YES.
- *
- * NOTE: This property is for _disabling_ tips on a per-class basis,
- * if they become annoying or have false-positives. The tips system
- * is completely disabled unless you define AS_ENABLE_TIPS=1.
- */
-@property (class) BOOL enableTips;
-
-/**
- * A block to be run on the main thread to show text when a tip is tapped.
- *
- * If nil, the default, the message is just logged to the console with the
- * ancestry of the node.
- */
-@property (class, nonatomic, null_resettable) ASTipDisplayBlock tipDisplayBlock;
-
-@end
-
-NS_ASSUME_NONNULL_END
diff --git a/submodules/AsyncDisplayKit/Source/Debug/AsyncDisplayKit+Tips.mm b/submodules/AsyncDisplayKit/Source/Debug/AsyncDisplayKit+Tips.mm
deleted file mode 100644
index f1a3ec8d72..0000000000
--- a/submodules/AsyncDisplayKit/Source/Debug/AsyncDisplayKit+Tips.mm
+++ /dev/null
@@ -1,48 +0,0 @@
-//
-//  AsyncDisplayKit+Tips.mm
-//  Texture
-//
-//  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.
-//  Changes after 4/13/2017 are: Copyright (c) Pinterest, Inc.  All rights reserved.
-//  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
-//
-
-#import <AsyncDisplayKit/AsyncDisplayKit+Tips.h>
-#import <AsyncDisplayKit/ASDisplayNode+Ancestry.h>
-
-@implementation ASDisplayNode (Tips)
-
-static char ASDisplayNodeEnableTipsKey;
-static ASTipDisplayBlock _Nullable __tipDisplayBlock;
-
-/**
- * Use associated objects with NSNumbers. This is a debug property - simplicity is king.
- */
-+ (void)setEnableTips:(BOOL)enableTips
-{
-  objc_setAssociatedObject(self, &ASDisplayNodeEnableTipsKey, @(enableTips), OBJC_ASSOCIATION_COPY);
-}
-
-+ (BOOL)enableTips
-{
-  NSNumber *result = objc_getAssociatedObject(self, &ASDisplayNodeEnableTipsKey);
-  if (result == nil) {
-    return YES;
-  }
-  return result.boolValue;
-}
-
-
-+ (void)setTipDisplayBlock:(ASTipDisplayBlock)tipDisplayBlock
-{
-  __tipDisplayBlock = tipDisplayBlock;
-}
-
-+ (ASTipDisplayBlock)tipDisplayBlock
-{
-  return __tipDisplayBlock ?: ^(ASDisplayNode *node, NSString *string) {
-    NSLog(@"%@. Node ancestry: %@", string, node.ancestryDescription);
-  };
-}
-
-@end
diff --git a/submodules/AsyncDisplayKit/Source/Details/ASAbstractLayoutController.h b/submodules/AsyncDisplayKit/Source/Details/ASAbstractLayoutController.h
deleted file mode 100644
index 6de7801fb6..0000000000
--- a/submodules/AsyncDisplayKit/Source/Details/ASAbstractLayoutController.h
+++ /dev/null
@@ -1,33 +0,0 @@
-//
-//  ASAbstractLayoutController.h
-//  Texture
-//
-//  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.
-//  Changes after 4/13/2017 are: Copyright (c) Pinterest, Inc.  All rights reserved.
-//  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
-//
-
-#import <AsyncDisplayKit/ASLayoutController.h>
-#import <AsyncDisplayKit/ASBaseDefines.h>
-
-NS_ASSUME_NONNULL_BEGIN
-
-AS_EXTERN ASDirectionalScreenfulBuffer ASDirectionalScreenfulBufferHorizontal(ASScrollDirection scrollDirection, ASRangeTuningParameters rangeTuningParameters);
-
-AS_EXTERN ASDirectionalScreenfulBuffer ASDirectionalScreenfulBufferVertical(ASScrollDirection scrollDirection, ASRangeTuningParameters rangeTuningParameters);
-
-AS_EXTERN CGRect CGRectExpandToRangeWithScrollableDirections(CGRect rect, ASRangeTuningParameters tuningParameters, ASScrollDirection scrollableDirections, ASScrollDirection scrollDirection);
-
-@interface ASAbstractLayoutController : NSObject <ASLayoutController>
-
-@end
-
-@interface ASAbstractLayoutController (Unavailable)
-
-- (NSHashTable *)indexPathsForScrolling:(ASScrollDirection)scrollDirection rangeMode:(ASLayoutRangeMode)rangeMode rangeType:(ASLayoutRangeType)rangeType __unavailable;
-
-- (void)allIndexPathsForScrolling:(ASScrollDirection)scrollDirection rangeMode:(ASLayoutRangeMode)rangeMode displaySet:(NSHashTable * _Nullable * _Nullable)displaySet preloadSet:(NSHashTable * _Nullable * _Nullable)preloadSet __unavailable;
-
-@end
-
-NS_ASSUME_NONNULL_END
diff --git a/submodules/AsyncDisplayKit/Source/Details/ASAbstractLayoutController.mm b/submodules/AsyncDisplayKit/Source/Details/ASAbstractLayoutController.mm
deleted file mode 100644
index 9d6b61f689..0000000000
--- a/submodules/AsyncDisplayKit/Source/Details/ASAbstractLayoutController.mm
+++ /dev/null
@@ -1,185 +0,0 @@
-//
-//  ASAbstractLayoutController.mm
-//  Texture
-//
-//  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.
-//  Changes after 4/13/2017 are: Copyright (c) Pinterest, Inc.  All rights reserved.
-//  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
-//
-
-#import <AsyncDisplayKit/ASAbstractLayoutController.h>
-#import <AsyncDisplayKit/ASAbstractLayoutController+FrameworkPrivate.h>
-#import <AsyncDisplayKit/ASAssert.h>
-
-ASRangeTuningParameters const ASRangeTuningParametersZero = {};
-
-BOOL ASRangeTuningParametersEqualToRangeTuningParameters(ASRangeTuningParameters lhs, ASRangeTuningParameters rhs)
-{
-  return lhs.leadingBufferScreenfuls == rhs.leadingBufferScreenfuls && lhs.trailingBufferScreenfuls == rhs.trailingBufferScreenfuls;
-}
-
-ASDirectionalScreenfulBuffer ASDirectionalScreenfulBufferHorizontal(ASScrollDirection scrollDirection,
-                                                                    ASRangeTuningParameters rangeTuningParameters)
-{
-  ASDirectionalScreenfulBuffer horizontalBuffer = {0, 0};
-  BOOL movingRight = ASScrollDirectionContainsRight(scrollDirection);
-  
-  horizontalBuffer.positiveDirection = movingRight ? rangeTuningParameters.leadingBufferScreenfuls
-                                                   : rangeTuningParameters.trailingBufferScreenfuls;
-  horizontalBuffer.negativeDirection = movingRight ? rangeTuningParameters.trailingBufferScreenfuls
-                                                   : rangeTuningParameters.leadingBufferScreenfuls;
-  return horizontalBuffer;
-}
-
-ASDirectionalScreenfulBuffer ASDirectionalScreenfulBufferVertical(ASScrollDirection scrollDirection,
-                                                                  ASRangeTuningParameters rangeTuningParameters)
-{
-  ASDirectionalScreenfulBuffer verticalBuffer = {0, 0};
-  BOOL movingDown = ASScrollDirectionContainsDown(scrollDirection);
-  
-  verticalBuffer.positiveDirection = movingDown ? rangeTuningParameters.leadingBufferScreenfuls
-                                                : rangeTuningParameters.trailingBufferScreenfuls;
-  verticalBuffer.negativeDirection = movingDown ? rangeTuningParameters.trailingBufferScreenfuls
-                                                : rangeTuningParameters.leadingBufferScreenfuls;
-  return verticalBuffer;
-}
-
-CGRect CGRectExpandHorizontally(CGRect rect, ASDirectionalScreenfulBuffer buffer)
-{
-  CGFloat negativeDirectionWidth = buffer.negativeDirection * rect.size.width;
-  CGFloat positiveDirectionWidth = buffer.positiveDirection * rect.size.width;
-  rect.size.width = negativeDirectionWidth + rect.size.width + positiveDirectionWidth;
-  rect.origin.x -= negativeDirectionWidth;
-  return rect;
-}
-
-CGRect CGRectExpandVertically(CGRect rect, ASDirectionalScreenfulBuffer buffer)
-{
-  CGFloat negativeDirectionHeight = buffer.negativeDirection * rect.size.height;
-  CGFloat positiveDirectionHeight = buffer.positiveDirection * rect.size.height;
-  rect.size.height = negativeDirectionHeight + rect.size.height + positiveDirectionHeight;
-  rect.origin.y -= negativeDirectionHeight;
-  return rect;
-}
-
-CGRect CGRectExpandToRangeWithScrollableDirections(CGRect rect, ASRangeTuningParameters tuningParameters,
-                                                   ASScrollDirection scrollableDirections, ASScrollDirection scrollDirection)
-{
-  // Can scroll horizontally - expand the range appropriately
-  if (ASScrollDirectionContainsHorizontalDirection(scrollableDirections)) {
-    ASDirectionalScreenfulBuffer horizontalBuffer = ASDirectionalScreenfulBufferHorizontal(scrollDirection, tuningParameters);
-    rect = CGRectExpandHorizontally(rect, horizontalBuffer);
-  }
-
-  // Can scroll vertically - expand the range appropriately
-  if (ASScrollDirectionContainsVerticalDirection(scrollableDirections)) {
-    ASDirectionalScreenfulBuffer verticalBuffer = ASDirectionalScreenfulBufferVertical(scrollDirection, tuningParameters);
-    rect = CGRectExpandVertically(rect, verticalBuffer);
-  }
-  
-  return rect;
-}
-
-@interface ASAbstractLayoutController () {
-  std::vector<std::vector<ASRangeTuningParameters>> _tuningParameters;
-}
-@end
-
-@implementation ASAbstractLayoutController
-
-+ (std::vector<std::vector<ASRangeTuningParameters>>)defaultTuningParameters
-{
-  auto tuningParameters = std::vector<std::vector<ASRangeTuningParameters>> (ASLayoutRangeModeCount, std::vector<ASRangeTuningParameters> (ASLayoutRangeTypeCount));
-
-  tuningParameters[ASLayoutRangeModeFull][ASLayoutRangeTypeDisplay] = {
-    .leadingBufferScreenfuls = 1.0,
-    .trailingBufferScreenfuls = 0.5
-  };
-
-  tuningParameters[ASLayoutRangeModeFull][ASLayoutRangeTypePreload] = {
-    .leadingBufferScreenfuls = 2.5,
-    .trailingBufferScreenfuls = 1.5
-  };
-
-  tuningParameters[ASLayoutRangeModeMinimum][ASLayoutRangeTypeDisplay] = {
-    .leadingBufferScreenfuls = 0.25,
-    .trailingBufferScreenfuls = 0.25
-  };
-  tuningParameters[ASLayoutRangeModeMinimum][ASLayoutRangeTypePreload] = {
-    .leadingBufferScreenfuls = 0.5,
-    .trailingBufferScreenfuls = 0.25
-  };
-
-  tuningParameters[ASLayoutRangeModeVisibleOnly][ASLayoutRangeTypeDisplay] = {
-    .leadingBufferScreenfuls = 0,
-    .trailingBufferScreenfuls = 0
-  };
-  tuningParameters[ASLayoutRangeModeVisibleOnly][ASLayoutRangeTypePreload] = {
-    .leadingBufferScreenfuls = 0,
-    .trailingBufferScreenfuls = 0
-  };
-
-  // The Low Memory range mode has special handling. Because a zero range still includes the visible area / bounds,
-  // in order to implement the behavior of releasing all graphics memory (backing stores), ASRangeController must check
-  // for this range mode and use an empty set for displayIndexPaths rather than querying the ASLayoutController for the indexPaths.
-  tuningParameters[ASLayoutRangeModeLowMemory][ASLayoutRangeTypeDisplay] = {
-    .leadingBufferScreenfuls = 0,
-    .trailingBufferScreenfuls = 0
-  };
-  tuningParameters[ASLayoutRangeModeLowMemory][ASLayoutRangeTypePreload] = {
-    .leadingBufferScreenfuls = 0,
-    .trailingBufferScreenfuls = 0
-  };
-  return tuningParameters;
-}
-
-- (instancetype)init
-{
-  if (!(self = [super init])) {
-    return nil;
-  }
-  ASDisplayNodeAssert(self.class != [ASAbstractLayoutController class], @"Should never create instances of abstract class ASAbstractLayoutController.");
-  
-  _tuningParameters = [[self class] defaultTuningParameters];
-  
-  return self;
-}
-
-#pragma mark - Tuning Parameters
-
-- (ASRangeTuningParameters)tuningParametersForRangeType:(ASLayoutRangeType)rangeType
-{
-  return [self tuningParametersForRangeMode:ASLayoutRangeModeFull rangeType:rangeType];
-}
-
-- (void)setTuningParameters:(ASRangeTuningParameters)tuningParameters forRangeType:(ASLayoutRangeType)rangeType
-{
-  return [self setTuningParameters:tuningParameters forRangeMode:ASLayoutRangeModeFull rangeType:rangeType];
-}
-
-- (ASRangeTuningParameters)tuningParametersForRangeMode:(ASLayoutRangeMode)rangeMode rangeType:(ASLayoutRangeType)rangeType
-{
-  ASDisplayNodeAssert(rangeMode < _tuningParameters.size() && rangeType < _tuningParameters[rangeMode].size(), @"Requesting a range that is OOB for the configured tuning parameters");
-  return _tuningParameters[rangeMode][rangeType];
-}
-
-- (void)setTuningParameters:(ASRangeTuningParameters)tuningParameters forRangeMode:(ASLayoutRangeMode)rangeMode rangeType:(ASLayoutRangeType)rangeType
-{
-  ASDisplayNodeAssert(rangeMode < _tuningParameters.size() && rangeType < _tuningParameters[rangeMode].size(), @"Setting a range that is OOB for the configured tuning parameters");
-  _tuningParameters[rangeMode][rangeType] = tuningParameters;
-}
-
-#pragma mark - Abstract Index Path Range Support
-
-- (NSHashTable<ASCollectionElement *> *)elementsForScrolling:(ASScrollDirection)scrollDirection rangeMode:(ASLayoutRangeMode)rangeMode rangeType:(ASLayoutRangeType)rangeType map:(ASElementMap *)map
-{
-  ASDisplayNodeAssertNotSupported();
-  return nil;
-}
-
-- (void)allElementsForScrolling:(ASScrollDirection)scrollDirection rangeMode:(ASLayoutRangeMode)rangeMode displaySet:(NSHashTable<ASCollectionElement *> *__autoreleasing  _Nullable *)displaySet preloadSet:(NSHashTable<ASCollectionElement *> *__autoreleasing  _Nullable *)preloadSet map:(ASElementMap *)map
-{
-  ASDisplayNodeAssertNotSupported();
-}
-
-@end
diff --git a/submodules/AsyncDisplayKit/Source/Details/ASBasicImageDownloader.h b/submodules/AsyncDisplayKit/Source/Details/ASBasicImageDownloader.h
deleted file mode 100644
index d5f8169745..0000000000
--- a/submodules/AsyncDisplayKit/Source/Details/ASBasicImageDownloader.h
+++ /dev/null
@@ -1,40 +0,0 @@
-//
-//  ASBasicImageDownloader.h
-//  Texture
-//
-//  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.
-//  Changes after 4/13/2017 are: Copyright (c) Pinterest, Inc.  All rights reserved.
-//  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
-//
-
-#ifndef MINIMAL_ASDK
-
-#import <AsyncDisplayKit/ASImageProtocols.h>
-
-NS_ASSUME_NONNULL_BEGIN
-
-/**
- * @abstract Simple NSURLSession-based image downloader.
- */
-@interface ASBasicImageDownloader : NSObject <ASImageDownloaderProtocol>
-
-/**
- * A shared image downloader which can be used by @c ASNetworkImageNodes and @c ASMultiplexImageNodes.
- * The userInfo provided by this downloader is `nil`.
- *
- * This is a very basic image downloader. It does not support caching, progressive downloading and likely
- * isn't something you should use in production. If you'd like something production ready, see @c ASPINRemoteImageDownloader
- *
- * @note It is strongly recommended you include PINRemoteImage and use @c ASPINRemoteImageDownloader instead.
- */
-@property (class, readonly) ASBasicImageDownloader *sharedImageDownloader;
-+ (ASBasicImageDownloader *)sharedImageDownloader NS_RETURNS_RETAINED;
-
-+ (instancetype)new __attribute__((unavailable("+[ASBasicImageDownloader sharedImageDownloader] must be used.")));
-- (instancetype)init __attribute__((unavailable("+[ASBasicImageDownloader sharedImageDownloader] must be used.")));
-
-@end
-
-NS_ASSUME_NONNULL_END
-
-#endif
diff --git a/submodules/AsyncDisplayKit/Source/Details/ASBasicImageDownloader.mm b/submodules/AsyncDisplayKit/Source/Details/ASBasicImageDownloader.mm
deleted file mode 100644
index 17c035a41c..0000000000
--- a/submodules/AsyncDisplayKit/Source/Details/ASBasicImageDownloader.mm
+++ /dev/null
@@ -1,355 +0,0 @@
-//
-//  ASBasicImageDownloader.mm
-//  Texture
-//
-//  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.
-//  Changes after 4/13/2017 are: Copyright (c) Pinterest, Inc.  All rights reserved.
-//  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
-//
-#ifndef MINIMAL_ASDK
-#import <AsyncDisplayKit/ASBasicImageDownloader.h>
-
-#import <Foundation/NSURLSession.h>
-#import <objc/runtime.h>
-
-#import <AsyncDisplayKit/ASBasicImageDownloaderInternal.h>
-#import <AsyncDisplayKit/ASImageContainerProtocolCategories.h>
-#import <AsyncDisplayKit/ASThread.h>
-
-using AS::MutexLocker;
-
-#pragma mark -
-/**
- * Collection of properties associated with a download request.
- */
-
-NSString * const kASBasicImageDownloaderContextCallbackQueue = @"kASBasicImageDownloaderContextCallbackQueue";
-NSString * const kASBasicImageDownloaderContextProgressBlock = @"kASBasicImageDownloaderContextProgressBlock";
-NSString * const kASBasicImageDownloaderContextCompletionBlock = @"kASBasicImageDownloaderContextCompletionBlock";
-
-static inline float NSURLSessionTaskPriorityWithImageDownloaderPriority(ASImageDownloaderPriority priority) {
-  switch (priority) {
-    case ASImageDownloaderPriorityPreload:
-      return NSURLSessionTaskPriorityLow;
-
-    case ASImageDownloaderPriorityImminent:
-      return NSURLSessionTaskPriorityDefault;
-
-    case ASImageDownloaderPriorityVisible:
-      return NSURLSessionTaskPriorityHigh;
-  }
-}
-
-@interface ASBasicImageDownloaderContext ()
-{
-  BOOL _invalid;
-  AS::RecursiveMutex __instanceLock__;
-}
-
-@property (nonatomic) NSMutableArray *callbackDatas;
-
-@end
-
-@implementation ASBasicImageDownloaderContext
-
-static NSMutableDictionary *currentRequests = nil;
-
-+ (AS::Mutex *)currentRequestLock
-{
-  static dispatch_once_t onceToken;
-  static AS::Mutex *currentRequestsLock;
-  dispatch_once(&onceToken, ^{
-    currentRequestsLock = new AS::Mutex();
-  });
-  return currentRequestsLock;
-}
-
-+ (ASBasicImageDownloaderContext *)contextForURL:(NSURL *)URL
-{
-  MutexLocker l(*self.currentRequestLock);
-  if (!currentRequests) {
-    currentRequests = [[NSMutableDictionary alloc] init];
-  }
-  ASBasicImageDownloaderContext *context = currentRequests[URL];
-  if (!context) {
-    context = [[ASBasicImageDownloaderContext alloc] initWithURL:URL];
-    currentRequests[URL] = context;
-  }
-  return context;
-}
-
-+ (void)cancelContextWithURL:(NSURL *)URL
-{
-  MutexLocker l(*self.currentRequestLock);
-  if (currentRequests) {
-    [currentRequests removeObjectForKey:URL];
-  }
-}
-
-- (instancetype)initWithURL:(NSURL *)URL
-{
-  if (self = [super init]) {
-    _URL = URL;
-    _callbackDatas = [NSMutableArray array];
-  }
-  return self;
-}
-
-- (void)cancel
-{
-  MutexLocker l(__instanceLock__);
-
-  NSURLSessionTask *sessionTask = self.sessionTask;
-  if (sessionTask) {
-    [sessionTask cancel];
-    self.sessionTask = nil;
-  }
-
-  _invalid = YES;
-  [self.class cancelContextWithURL:self.URL];
-}
-
-- (BOOL)isCancelled
-{
-  MutexLocker l(__instanceLock__);
-  return _invalid;
-}
-
-- (void)addCallbackData:(NSDictionary *)callbackData
-{
-  MutexLocker l(__instanceLock__);
-  [self.callbackDatas addObject:callbackData];
-}
-
-- (void)performProgressBlocks:(CGFloat)progress
-{
-  MutexLocker l(__instanceLock__);
-  for (NSDictionary *callbackData in self.callbackDatas) {
-    ASImageDownloaderProgress progressBlock = callbackData[kASBasicImageDownloaderContextProgressBlock];
-    dispatch_queue_t callbackQueue = callbackData[kASBasicImageDownloaderContextCallbackQueue];
-
-    if (progressBlock) {
-      dispatch_async(callbackQueue, ^{
-        progressBlock(progress);
-      });
-    }
-  }
-}
-
-- (void)completeWithImage:(UIImage *)image error:(NSError *)error
-{
-  MutexLocker l(__instanceLock__);
-  for (NSDictionary *callbackData in self.callbackDatas) {
-    ASImageDownloaderCompletion completionBlock = callbackData[kASBasicImageDownloaderContextCompletionBlock];
-    dispatch_queue_t callbackQueue = callbackData[kASBasicImageDownloaderContextCallbackQueue];
-
-    if (completionBlock) {
-      dispatch_async(callbackQueue, ^{
-        completionBlock(image, error, nil, nil);
-      });
-    }
-  }
-
-  self.sessionTask = nil;
-  [self.callbackDatas removeAllObjects];
-}
-
-- (NSURLSessionTask *)createSessionTaskIfNecessaryWithBlock:(NSURLSessionTask *(^)())creationBlock {
-  {
-    MutexLocker l(__instanceLock__);
-
-    if (self.isCancelled) {
-      return nil;
-    }
-
-    if (self.sessionTask && (self.sessionTask.state == NSURLSessionTaskStateRunning)) {
-      return nil;
-    }
-  }
-
-  NSURLSessionTask *newTask = creationBlock();
-
-  {
-    MutexLocker l(__instanceLock__);
-
-    if (self.isCancelled) {
-      return nil;
-    }
-
-    if (self.sessionTask && (self.sessionTask.state == NSURLSessionTaskStateRunning)) {
-      return nil;
-    }
-
-    self.sessionTask = newTask;
-    
-    return self.sessionTask;
-  }
-}
-
-@end
-
-
-#pragma mark -
-/**
- * NSURLSessionDownloadTask lacks a `userInfo` property, so add this association ourselves.
- */
-@interface NSURLRequest (ASBasicImageDownloader)
-@property (nonatomic) ASBasicImageDownloaderContext *asyncdisplaykit_context;
-@end
-
-@implementation NSURLRequest (ASBasicImageDownloader)
-
-static const void *ContextKey() {
-  return @selector(asyncdisplaykit_context);
-}
-
-- (void)setAsyncdisplaykit_context:(ASBasicImageDownloaderContext *)asyncdisplaykit_context
-{
-  objc_setAssociatedObject(self, ContextKey(), asyncdisplaykit_context, OBJC_ASSOCIATION_RETAIN_NONATOMIC);
-}
-- (ASBasicImageDownloader *)asyncdisplaykit_context
-{
-  return objc_getAssociatedObject(self, ContextKey());
-}
-@end
-
-
-#pragma mark -
-@interface ASBasicImageDownloader () <NSURLSessionDownloadDelegate>
-{
-  NSOperationQueue *_sessionDelegateQueue;
-  NSURLSession *_session;
-}
-
-@end
-
-@implementation ASBasicImageDownloader
-
-+ (ASBasicImageDownloader *)sharedImageDownloader
-{
-  static ASBasicImageDownloader *sharedImageDownloader = nil;
-  static dispatch_once_t once = 0;
-  dispatch_once(&once, ^{
-    sharedImageDownloader = [[ASBasicImageDownloader alloc] _init];
-  });
-  return sharedImageDownloader;
-}
-
-#pragma mark Lifecycle.
-
-- (instancetype)_init
-{
-  if (!(self = [super init]))
-    return nil;
-
-  _sessionDelegateQueue = [[NSOperationQueue alloc] init];
-  _session = [NSURLSession sessionWithConfiguration:[NSURLSessionConfiguration defaultSessionConfiguration]
-                                           delegate:self
-                                      delegateQueue:_sessionDelegateQueue];
-
-  return self;
-}
-
-
-#pragma mark ASImageDownloaderProtocol.
-
-- (nullable id)downloadImageWithURL:(NSURL *)URL
-                      callbackQueue:(dispatch_queue_t)callbackQueue
-                   downloadProgress:(nullable ASImageDownloaderProgress)downloadProgress
-                         completion:(ASImageDownloaderCompletion)completion
-{
-  return [self downloadImageWithURL:URL
-                           priority:ASImageDownloaderPriorityImminent // maps to default priority
-                      callbackQueue:callbackQueue
-                   downloadProgress:downloadProgress
-                         completion:completion];
-}
-
-- (nullable id)downloadImageWithURL:(NSURL *)URL
-                           priority:(ASImageDownloaderPriority)priority
-                      callbackQueue:(dispatch_queue_t)callbackQueue
-                   downloadProgress:(ASImageDownloaderProgress)downloadProgress
-                         completion:(ASImageDownloaderCompletion)completion
-{
-  ASBasicImageDownloaderContext *context = [ASBasicImageDownloaderContext contextForURL:URL];
-
-  // NSURLSessionDownloadTask will do file I/O to create a temp directory. If called on the main thread this will
-  // cause significant performance issues.
-  dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
-    // associate metadata with it
-    const auto callbackData = [[NSMutableDictionary alloc] init];
-    callbackData[kASBasicImageDownloaderContextCallbackQueue] = callbackQueue ? : dispatch_get_main_queue();
-
-    if (downloadProgress) {
-      callbackData[kASBasicImageDownloaderContextProgressBlock] = [downloadProgress copy];
-    }
-
-    if (completion) {
-      callbackData[kASBasicImageDownloaderContextCompletionBlock] = [completion copy];
-    }
-
-    [context addCallbackData:[[NSDictionary alloc] initWithDictionary:callbackData]];
-
-    // Create new task if necessary
-    NSURLSessionDownloadTask *task = (NSURLSessionDownloadTask *)[context createSessionTaskIfNecessaryWithBlock:^(){return [_session downloadTaskWithURL:URL];}];
-
-    if (task) {
-      task.priority = NSURLSessionTaskPriorityWithImageDownloaderPriority(priority);
-      task.originalRequest.asyncdisplaykit_context = context;
-
-      // start downloading
-      [task resume];
-    }
-  });
-
-  return context;
-}
-
-- (void)cancelImageDownloadForIdentifier:(id)downloadIdentifier
-{
-  ASDisplayNodeAssert([downloadIdentifier isKindOfClass:ASBasicImageDownloaderContext.class], @"unexpected downloadIdentifier");
-  ASBasicImageDownloaderContext *context = (ASBasicImageDownloaderContext *)downloadIdentifier;
-
-  [context cancel];
-}
-
-
-#pragma mark NSURLSessionDownloadDelegate.
-
-- (void)URLSession:(NSURLSession *)session downloadTask:(NSURLSessionDownloadTask *)downloadTask
-                                           didWriteData:(int64_t)bytesWritten
-                                      totalBytesWritten:(int64_t)totalBytesWritten
-                              totalBytesExpectedToWrite:(int64_t)totalBytesExpectedToWrite
-{
-  ASBasicImageDownloaderContext *context = downloadTask.originalRequest.asyncdisplaykit_context;
-  [context performProgressBlocks:(CGFloat)totalBytesWritten / (CGFloat)totalBytesExpectedToWrite];
-}
-
-// invoked if the download succeeded with no error
-- (void)URLSession:(NSURLSession *)session downloadTask:(NSURLSessionDownloadTask *)downloadTask
-                              didFinishDownloadingToURL:(NSURL *)location
-{
-  ASBasicImageDownloaderContext *context = downloadTask.originalRequest.asyncdisplaykit_context;
-  if ([context isCancelled]) {
-    return;
-  }
-
-  if (context) {
-    UIImage *image = [UIImage imageWithData:[NSData dataWithContentsOfURL:location]];
-    [context completeWithImage:image error:nil];
-  }
-}
-
-// invoked unconditionally
-- (void)URLSession:(NSURLSession *)session task:(NSURLSessionDownloadTask *)task
-                           didCompleteWithError:(NSError *)error
-{
-  ASBasicImageDownloaderContext *context = task.originalRequest.asyncdisplaykit_context;
-  if (context && error) {
-    [context completeWithImage:nil error:error];
-  }
-}
-
-@end
-
-#endif
diff --git a/submodules/AsyncDisplayKit/Source/Details/ASBatchContext.h b/submodules/AsyncDisplayKit/Source/Details/ASBatchContext.h
deleted file mode 100644
index bbe92b8c34..0000000000
--- a/submodules/AsyncDisplayKit/Source/Details/ASBatchContext.h
+++ /dev/null
@@ -1,69 +0,0 @@
-//
-//  ASBatchContext.h
-//  Texture
-//
-//  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.
-//  Changes after 4/13/2017 are: Copyright (c) Pinterest, Inc.  All rights reserved.
-//  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
-//
-
-#ifndef MINIMAL_ASDK
-
-#import <Foundation/Foundation.h>
-
-NS_ASSUME_NONNULL_BEGIN
-
-/**
- * @abstract A context object to notify when batch fetches are finished or cancelled.
- */
-@interface ASBatchContext : NSObject
-
-/**
- * Retrieve the state of the current batch process.
- *
- * @return A boolean reflecting if the owner of the context object is fetching another batch.
- */
-- (BOOL)isFetching;
-
-/**
- * Let the context object know that a batch fetch was completed.
- *
- * @param didComplete A boolean that states whether or not the batch fetch completed.
- *
- * @discussion Only by passing YES will the owner of the context know to attempt another batch update when necessary.
- * For instance, when a table has reached the end of its data, a batch fetch will be attempted unless the context
- * object thinks that it is still fetching.
- */
-- (void)completeBatchFetching:(BOOL)didComplete;
-
-/**
- * Ask the context object if the batch fetching process was cancelled by the context owner.
- *
- * @discussion If an error occurs in the context owner, the batch fetching may become out of sync and need to be
- * cancelled. For best practices, pass the return value of -batchWasCancelled to -completeBatchFetch:.
- *
- * @return A boolean reflecting if the context object owner had to cancel the batch process.
- */
-- (BOOL)batchFetchingWasCancelled;
-
-/**
- * Notify the context object that something has interrupted the batch fetching process.
- *
- * @discussion Call this method only when something has corrupted the batch fetching process. Calling this method should
- * be left to the owner of the batch process unless there is a specific purpose.
- */
-- (void)cancelBatchFetching;
-
-/**
- * Notify the context object that fetching has started.
- *
- * @discussion Call this method only when you are beginning a fetch process. This should really only be called by the 
- * context object's owner. Calling this method should be paired with -completeBatchFetching:.
- */
-- (void)beginBatchFetching;
-
-@end
-
-NS_ASSUME_NONNULL_END
-
-#endif
diff --git a/submodules/AsyncDisplayKit/Source/Details/ASBatchContext.mm b/submodules/AsyncDisplayKit/Source/Details/ASBatchContext.mm
deleted file mode 100644
index ee4ec173a5..0000000000
--- a/submodules/AsyncDisplayKit/Source/Details/ASBatchContext.mm
+++ /dev/null
@@ -1,64 +0,0 @@
-//
-//  ASBatchContext.mm
-//  Texture
-//
-//  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.
-//  Changes after 4/13/2017 are: Copyright (c) Pinterest, Inc.  All rights reserved.
-//  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
-//
-
-#ifndef MINIMAL_ASDK
-#import <AsyncDisplayKit/ASBatchContext.h>
-
-#import <AsyncDisplayKit/ASLog.h>
-#import <stdatomic.h>
-
-typedef NS_ENUM(NSInteger, ASBatchContextState) {
-  ASBatchContextStateFetching,
-  ASBatchContextStateCancelled,
-  ASBatchContextStateCompleted
-};
-
-@implementation ASBatchContext {
-  atomic_int _state;
-}
-
-- (instancetype)init
-{
-  if (self = [super init]) {
-    _state = ATOMIC_VAR_INIT(ASBatchContextStateCompleted);
-  }
-  return self;
-}
-
-- (BOOL)isFetching
-{
-  return atomic_load(&_state) == ASBatchContextStateFetching;
-}
-
-- (BOOL)batchFetchingWasCancelled
-{
-  return atomic_load(&_state) == ASBatchContextStateCancelled;
-}
-
-- (void)beginBatchFetching
-{
-  atomic_store(&_state, ASBatchContextStateFetching);
-}
-
-- (void)completeBatchFetching:(BOOL)didComplete
-{
-  if (didComplete) {
-    as_log_debug(ASCollectionLog(), "Completed batch fetch with context %@", self);
-    atomic_store(&_state, ASBatchContextStateCompleted);
-  }
-}
-
-- (void)cancelBatchFetching
-{
-  atomic_store(&_state, ASBatchContextStateCancelled);
-}
-
-@end
-
-#endif
diff --git a/submodules/AsyncDisplayKit/Source/Details/ASBatchFetchingDelegate.h b/submodules/AsyncDisplayKit/Source/Details/ASBatchFetchingDelegate.h
deleted file mode 100644
index 3b35115026..0000000000
--- a/submodules/AsyncDisplayKit/Source/Details/ASBatchFetchingDelegate.h
+++ /dev/null
@@ -1,23 +0,0 @@
-//
-//  ASBatchFetchingDelegate.h
-//  Texture
-//
-//  Copyright (c) Pinterest, Inc.  All rights reserved.
-//  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
-//
-
-#import <UIKit/UIKit.h>
-
-@protocol ASBatchFetchingDelegate <NSObject>
-
-/**
- * @abstract Determine if batch fetching should begin based on the remaining time.
- * If the delegate doesn't have enough information to confidently decide, it can take the given hint.
- *
- * @param remainingTime The amount of time left for user to reach the end of the scroll view's content.
- *
- * @param hint A hint for the delegate to fallback to.
- */
-- (BOOL)shouldFetchBatchWithRemainingTime:(NSTimeInterval)remainingTime hint:(BOOL)hint;
-
-@end
diff --git a/submodules/AsyncDisplayKit/Source/Details/ASCollectionElement.h b/submodules/AsyncDisplayKit/Source/Details/ASCollectionElement.h
deleted file mode 100644
index ea8fc697c4..0000000000
--- a/submodules/AsyncDisplayKit/Source/Details/ASCollectionElement.h
+++ /dev/null
@@ -1,51 +0,0 @@
-//
-//  ASCollectionElement.h
-//  Texture
-//
-//  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.
-//  Changes after 4/13/2017 are: Copyright (c) Pinterest, Inc.  All rights reserved.
-//  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
-//
-
-#ifndef MINIMAL_ASDK
-
-#import <AsyncDisplayKit/ASDataController.h>
-#import <AsyncDisplayKit/ASTraitCollection.h>
-
-@class ASDisplayNode;
-@protocol ASRangeManagingNode;
-
-NS_ASSUME_NONNULL_BEGIN
-
-AS_SUBCLASSING_RESTRICTED
-@interface ASCollectionElement : NSObject
-
-@property (nullable, nonatomic, copy, readonly) NSString *supplementaryElementKind;
-@property (nonatomic) ASSizeRange constrainedSize;
-@property (nonatomic, weak, readonly) id<ASRangeManagingNode> owningNode;
-@property (nonatomic) ASPrimitiveTraitCollection traitCollection;
-@property (nullable, nonatomic, readonly) id nodeModel;
-
-- (instancetype)initWithNodeModel:(nullable id)nodeModel
-                        nodeBlock:(ASCellNodeBlock)nodeBlock
-         supplementaryElementKind:(nullable NSString *)supplementaryElementKind
-                  constrainedSize:(ASSizeRange)constrainedSize
-                       owningNode:(id<ASRangeManagingNode>)owningNode
-                  traitCollection:(ASPrimitiveTraitCollection)traitCollection;
-
-/**
- * @return The node, running the node block if necessary. The node block will be discarded
- * after the first time it is run.
- */
-@property (readonly) ASCellNode *node;
-
-/**
- * @return The node, if the node block has been run already.
- */
-@property (nullable, readonly) ASCellNode *nodeIfAllocated;
-
-@end
-
-NS_ASSUME_NONNULL_END
-
-#endif
diff --git a/submodules/AsyncDisplayKit/Source/Details/ASCollectionElement.mm b/submodules/AsyncDisplayKit/Source/Details/ASCollectionElement.mm
deleted file mode 100644
index 5b7b33862b..0000000000
--- a/submodules/AsyncDisplayKit/Source/Details/ASCollectionElement.mm
+++ /dev/null
@@ -1,91 +0,0 @@
-//
-//  ASCollectionElement.mm
-//  Texture
-//
-//  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.
-//  Changes after 4/13/2017 are: Copyright (c) Pinterest, Inc.  All rights reserved.
-//  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
-//
-
-#ifndef MINIMAL_ASDK
-#import <AsyncDisplayKit/ASCollectionElement.h>
-#import <AsyncDisplayKit/ASCellNode+Internal.h>
-#import <mutex>
-
-@interface ASCollectionElement ()
-
-/// Required node block used to allocate a cell node. Nil after the first execution.
-@property (nonatomic) ASCellNodeBlock nodeBlock;
-
-@end
-
-@implementation ASCollectionElement {
-  std::mutex _lock;
-  ASCellNode *_node;
-}
-
-- (instancetype)initWithNodeModel:(id)nodeModel
-                        nodeBlock:(ASCellNodeBlock)nodeBlock
-         supplementaryElementKind:(NSString *)supplementaryElementKind
-                  constrainedSize:(ASSizeRange)constrainedSize
-                       owningNode:(id<ASRangeManagingNode>)owningNode
-                  traitCollection:(ASPrimitiveTraitCollection)traitCollection
-{
-  NSAssert(nodeBlock != nil, @"Node block must not be nil");
-  self = [super init];
-  if (self) {
-    _nodeModel = nodeModel;
-    _nodeBlock = nodeBlock;
-    _supplementaryElementKind = [supplementaryElementKind copy];
-    _constrainedSize = constrainedSize;
-    _owningNode = owningNode;
-    _traitCollection = traitCollection;
-  }
-  return self;
-}
-
-- (ASCellNode *)node
-{
-  std::lock_guard<std::mutex> l(_lock);
-  if (_nodeBlock != nil) {
-    ASCellNode *node = _nodeBlock();
-    _nodeBlock = nil;
-    if (node == nil) {
-      ASDisplayNodeFailAssert(@"Node block returned nil node!");
-      node = [[ASCellNode alloc] init];
-    }
-    node.owningNode = _owningNode;
-    node.collectionElement = self;
-    ASTraitCollectionPropagateDown(node, _traitCollection);
-    node.nodeModel = _nodeModel;
-    _node = node;
-  }
-  return _node;
-}
-
-- (ASCellNode *)nodeIfAllocated
-{
-  std::lock_guard<std::mutex> l(_lock);
-  return _node;
-}
-
-- (void)setTraitCollection:(ASPrimitiveTraitCollection)traitCollection
-{
-  ASCellNode *nodeIfNeedsPropagation;
-  
-  {
-    std::lock_guard<std::mutex> l(_lock);
-    if (! ASPrimitiveTraitCollectionIsEqualToASPrimitiveTraitCollection(_traitCollection, traitCollection)) {
-      _traitCollection = traitCollection;
-      nodeIfNeedsPropagation = _node;
-    }
-  }
-  
-  if (nodeIfNeedsPropagation != nil) {
-    ASTraitCollectionPropagateDown(nodeIfNeedsPropagation, traitCollection);
-  }
-}
-
-@end
-
-#endif
diff --git a/submodules/AsyncDisplayKit/Source/Details/ASCollectionFlowLayoutDelegate.h b/submodules/AsyncDisplayKit/Source/Details/ASCollectionFlowLayoutDelegate.h
deleted file mode 100644
index ba6e5b48ed..0000000000
--- a/submodules/AsyncDisplayKit/Source/Details/ASCollectionFlowLayoutDelegate.h
+++ /dev/null
@@ -1,32 +0,0 @@
-//
-//  ASCollectionFlowLayoutDelegate.h
-//  Texture
-//
-//  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.
-//  Changes after 4/13/2017 are: Copyright (c) Pinterest, Inc.  All rights reserved.
-//  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
-//
-
-#ifndef MINIMAL_ASDK
-
-#import <AsyncDisplayKit/ASCollectionLayoutDelegate.h>
-
-NS_ASSUME_NONNULL_BEGIN
-
-AS_SUBCLASSING_RESTRICTED
-
-/**
- * A thread-safe, high performant layout delegate that arranges items into a flow layout. 
- * It uses a concurrent and multi-line ASStackLayoutSpec under the hood. Thus, per-child flex properties (i.e alignSelf, 
- * flexShrink, flexGrow, etc - see @ASStackLayoutElement) can be set directly on cell nodes to be used
- * to calculate the final collection layout.
- */
-@interface ASCollectionFlowLayoutDelegate : NSObject <ASCollectionLayoutDelegate>
-
-- (instancetype)initWithScrollableDirections:(ASScrollDirection)scrollableDirections NS_DESIGNATED_INITIALIZER;
-
-@end
-
-NS_ASSUME_NONNULL_END
-
-#endif
diff --git a/submodules/AsyncDisplayKit/Source/Details/ASCollectionFlowLayoutDelegate.mm b/submodules/AsyncDisplayKit/Source/Details/ASCollectionFlowLayoutDelegate.mm
deleted file mode 100644
index 37d311d24e..0000000000
--- a/submodules/AsyncDisplayKit/Source/Details/ASCollectionFlowLayoutDelegate.mm
+++ /dev/null
@@ -1,82 +0,0 @@
-//
-//  ASCollectionFlowLayoutDelegate.mm
-//  Texture
-//
-//  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.
-//  Changes after 4/13/2017 are: Copyright (c) Pinterest, Inc.  All rights reserved.
-//  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
-//
-
-#ifndef MINIMAL_ASDK
-
-#import <AsyncDisplayKit/ASCollectionFlowLayoutDelegate.h>
-
-#import <AsyncDisplayKit/ASCellNode+Internal.h>
-#import <AsyncDisplayKit/ASCollectionLayoutState.h>
-#import <AsyncDisplayKit/ASCollectionElement.h>
-#import <AsyncDisplayKit/ASCollectionLayoutContext.h>
-#import <AsyncDisplayKit/ASCollectionLayoutDefines.h>
-#import <AsyncDisplayKit/ASCollections.h>
-#import <AsyncDisplayKit/ASElementMap.h>
-#import <AsyncDisplayKit/ASLayout.h>
-#import <AsyncDisplayKit/ASStackLayoutSpec.h>
-
-@implementation ASCollectionFlowLayoutDelegate {
-  ASScrollDirection _scrollableDirections;
-}
-
-- (instancetype)init
-{
-  return [self initWithScrollableDirections:ASScrollDirectionVerticalDirections];
-}
-
-- (instancetype)initWithScrollableDirections:(ASScrollDirection)scrollableDirections
-{
-  self = [super init];
-  if (self) {
-    _scrollableDirections = scrollableDirections;
-  }
-  return self;
-}
-
-- (ASScrollDirection)scrollableDirections
-{
-  ASDisplayNodeAssertMainThread();
-  return _scrollableDirections;
-}
-
-- (id)additionalInfoForLayoutWithElements:(ASElementMap *)elements
-{
-  ASDisplayNodeAssertMainThread();
-  return nil;
-}
-
-+ (ASCollectionLayoutState *)calculateLayoutWithContext:(ASCollectionLayoutContext *)context
-{
-  ASElementMap *elements = context.elements;
-  NSArray<ASCellNode *> *children = ASArrayByFlatMapping(elements.itemElements, ASCollectionElement *element, element.node);
-  if (children.count == 0) {
-    return [[ASCollectionLayoutState alloc] initWithContext:context];
-  }
-  
-  ASStackLayoutSpec *stackSpec = [ASStackLayoutSpec stackLayoutSpecWithDirection:ASStackLayoutDirectionHorizontal
-                                                                         spacing:0
-                                                                  justifyContent:ASStackLayoutJustifyContentStart
-                                                                      alignItems:ASStackLayoutAlignItemsStart
-                                                                        flexWrap:ASStackLayoutFlexWrapWrap
-                                                                    alignContent:ASStackLayoutAlignContentStart
-                                                                        children:children];
-  stackSpec.concurrent = YES;
-
-  ASSizeRange sizeRange = ASSizeRangeForCollectionLayoutThatFitsViewportSize(context.viewportSize, context.scrollableDirections);
-  ASLayout *layout = [stackSpec layoutThatFits:sizeRange];
-
-  return [[ASCollectionLayoutState alloc] initWithContext:context layout:layout getElementBlock:^ASCollectionElement * _Nullable(ASLayout * _Nonnull sublayout) {
-    ASCellNode *node = ASDynamicCast(sublayout.layoutElement, ASCellNode);
-    return node ? node.collectionElement : nil;
-  }];
-}
-
-@end
-
-#endif
diff --git a/submodules/AsyncDisplayKit/Source/Details/ASCollectionGalleryLayoutDelegate.h b/submodules/AsyncDisplayKit/Source/Details/ASCollectionGalleryLayoutDelegate.h
deleted file mode 100644
index c6d1df2cb7..0000000000
--- a/submodules/AsyncDisplayKit/Source/Details/ASCollectionGalleryLayoutDelegate.h
+++ /dev/null
@@ -1,110 +0,0 @@
-//
-//  ASCollectionGalleryLayoutDelegate.h
-//  Texture
-//
-//  Copyright (c) Pinterest, Inc.  All rights reserved.
-//  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
-//
-
-#ifndef MINIMAL_ASDK
-
-#import <AsyncDisplayKit/ASCollectionLayoutDelegate.h>
-#import <AsyncDisplayKit/ASScrollDirection.h>
-
-@class ASElementMap;
-@class ASCollectionGalleryLayoutDelegate;
-
-NS_ASSUME_NONNULL_BEGIN
-
-@protocol ASCollectionGalleryLayoutPropertiesProviding <NSObject>
-
-/**
- * Returns the fixed size of each and every element.
- *
- * @discussion This method will only be called on main thread.
- *
- * @param delegate The calling object.
- *
- * @param elements All elements to be sized.
- *
- * @return The elements' size
- */
-- (CGSize)galleryLayoutDelegate:(ASCollectionGalleryLayoutDelegate *)delegate sizeForElements:(ASElementMap *)elements;
-
-@optional
-
-/**
- * Returns the minumum spacing to use between lines of items.
- *
- * @discussion This method will only be called on main thread.
- *
- * @discussion For a vertically scrolling layout, this value represents the minimum spacing between rows.
- * For a horizontally scrolling one, it represents the minimum spacing between columns.
- * It is not applied between the first line and the header, or between the last line and the footer.
- * This is the same behavior as UICollectionViewFlowLayout's minimumLineSpacing.
- *
- * @param delegate The calling object.
- *
- * @param elements All elements in the layout.
- *
- * @return The interitem spacing
- */
-- (CGFloat)galleryLayoutDelegate:(ASCollectionGalleryLayoutDelegate *)delegate minimumLineSpacingForElements:(ASElementMap *)elements;
-
-/**
- * Returns the minumum spacing to use between items in the same row or column, depending on the scroll directions.
- *
- * @discussion This method will only be called on main thread.
- *
- * @discussion For a vertically scrolling layout, this value represents the minimum spacing between items in the same row. 
- * For a horizontally scrolling one, it represents the minimum spacing between items in the same column.
- * It is considered while fitting items into lines, but the actual final spacing between some items might be larger.
- * This is the same behavior as UICollectionViewFlowLayout's minimumInteritemSpacing.
- *
- * @param delegate The calling object.
- *
- * @param elements All elements in the layout.
- *
- * @return The interitem spacing
- */
-- (CGFloat)galleryLayoutDelegate:(ASCollectionGalleryLayoutDelegate *)delegate minimumInteritemSpacingForElements:(ASElementMap *)elements;
-
-/**
- * Returns the margins of each section.
- *
- * @discussion This method will only be called on main thread.
- *
- * @param delegate The calling object.
- *
- * @param elements All elements in the layout.
- *
- * @return The margins used to layout content in a section
- */
-- (UIEdgeInsets)galleryLayoutDelegate:(ASCollectionGalleryLayoutDelegate *)delegate sectionInsetForElements:(ASElementMap *)elements;
-
-@end
-
-/**
- * A thread-safe layout delegate that arranges items with the same size into a flow layout.
- *
- * @note Supplemenraty elements are not supported.
- */
-AS_SUBCLASSING_RESTRICTED
-@interface ASCollectionGalleryLayoutDelegate : NSObject <ASCollectionLayoutDelegate>
-
-@property (nonatomic, weak) id<ASCollectionGalleryLayoutPropertiesProviding> propertiesProvider;
-
-/**
- * Designated initializer.
- *
- * @param scrollableDirections The scrollable directions of this layout. Must be either vertical or horizontal directions.
- */
-- (instancetype)initWithScrollableDirections:(ASScrollDirection)scrollableDirections NS_DESIGNATED_INITIALIZER;
-
-- (instancetype)init __unavailable;
-
-@end
-
-NS_ASSUME_NONNULL_END
-
-#endif
diff --git a/submodules/AsyncDisplayKit/Source/Details/ASCollectionGalleryLayoutDelegate.m b/submodules/AsyncDisplayKit/Source/Details/ASCollectionGalleryLayoutDelegate.m
deleted file mode 100644
index 99e65f8343..0000000000
--- a/submodules/AsyncDisplayKit/Source/Details/ASCollectionGalleryLayoutDelegate.m
+++ /dev/null
@@ -1,97 +0,0 @@
-//
-//  ASCollectionGalleryLayoutDelegate.m
-//  Texture
-//
-//  Copyright (c) 2017-present, Pinterest, Inc.  All rights reserved.
-//  Licensed under the Apache License, Version 2.0 (the "License");
-//  you may not use this file except in compliance with the License.
-//  You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-
-#ifndef MINIMAL_ASDK
-
-#import <AsyncDisplayKit/ASCollectionGalleryLayoutDelegate.h>
-
-#import <AsyncDisplayKit/_ASCollectionGalleryLayoutItem.h>
-#import <AsyncDisplayKit/ASAssert.h>
-#import <AsyncDisplayKit/ASCellNode.h>
-#import <AsyncDisplayKit/ASCollectionElement.h>
-#import <AsyncDisplayKit/ASCollectionLayoutContext.h>
-#import <AsyncDisplayKit/ASCollectionLayoutDefines.h>
-#import <AsyncDisplayKit/ASCollectionLayoutState.h>
-#import <AsyncDisplayKit/ASElementMap.h>
-#import <AsyncDisplayKit/ASLayout.h>
-#import <AsyncDisplayKit/ASLayoutRangeType.h>
-#import <AsyncDisplayKit/ASStackLayoutSpec.h>
-
-#pragma mark - ASCollectionGalleryLayoutDelegate
-
-@implementation ASCollectionGalleryLayoutDelegate {
-  ASScrollDirection _scrollableDirections;
-  CGSize _itemSize;
-}
-
-- (instancetype)initWithScrollableDirections:(ASScrollDirection)scrollableDirections
-{
-  self = [super init];
-  if (self) {
-    _scrollableDirections = scrollableDirections;
-  }
-  return self;
-}
-
-- (ASScrollDirection)scrollableDirections
-{
-  ASDisplayNodeAssertMainThread();
-  return _scrollableDirections;
-}
-
-- (id)additionalInfoForLayoutWithElements:(ASElementMap *)elements
-{
-  ASDisplayNodeAssertMainThread();
-  if (_sizeProvider == nil) {
-    return nil;
-  }
-
-  return [NSValue valueWithCGSize:[_sizeProvider sizeForElements:elements]];
-}
-
-+ (ASCollectionLayoutState *)calculateLayoutWithContext:(ASCollectionLayoutContext *)context
-{
-  ASElementMap *elements = context.elements;
-  CGSize pageSize = context.viewportSize;
-  ASScrollDirection scrollableDirections = context.scrollableDirections;
-
-  CGSize itemSize = context.additionalInfo ? ((NSValue *)context.additionalInfo).CGSizeValue : CGSizeZero;
-  if (CGSizeEqualToSize(CGSizeZero, itemSize)) {
-    return [[ASCollectionLayoutState alloc] initWithContext:context];
-  }
-
-  NSMutableArray<_ASGalleryLayoutItem *> *children = ASArrayByFlatMapping(elements.itemElements,
-                                                                          ASCollectionElement *element,
-                                                                          [[_ASGalleryLayoutItem alloc] initWithItemSize:itemSize collectionElement:element]);
-  if (children.count == 0) {
-    return [[ASCollectionLayoutState alloc] initWithContext:context];
-  }
-  
-  // Use a stack spec to calculate layout content size and frames of all elements without actually measuring each element
-  ASStackLayoutSpec *stackSpec = [ASStackLayoutSpec stackLayoutSpecWithDirection:ASStackLayoutDirectionHorizontal
-                                                                         spacing:0
-                                                                  justifyContent:ASStackLayoutJustifyContentStart
-                                                                      alignItems:ASStackLayoutAlignItemsStart
-                                                                        flexWrap:ASStackLayoutFlexWrapWrap
-                                                                    alignContent:ASStackLayoutAlignContentStart
-                                                                        children:children];
-  stackSpec.concurrent = YES;
-  ASLayout *layout = [stackSpec layoutThatFits:ASSizeRangeForCollectionLayoutThatFitsViewportSize(pageSize, scrollableDirections)];
-  
-  return [[ASCollectionLayoutState alloc] initWithContext:context layout:layout getElementBlock:^ASCollectionElement *(ASLayout *sublayout) {
-    return ((_ASGalleryLayoutItem *)sublayout.layoutElement).collectionElement;
-  }];
-}
-
-@end
-
-#endif
diff --git a/submodules/AsyncDisplayKit/Source/Details/ASCollectionGalleryLayoutDelegate.mm b/submodules/AsyncDisplayKit/Source/Details/ASCollectionGalleryLayoutDelegate.mm
deleted file mode 100644
index 94d1f0de36..0000000000
--- a/submodules/AsyncDisplayKit/Source/Details/ASCollectionGalleryLayoutDelegate.mm
+++ /dev/null
@@ -1,141 +0,0 @@
-//
-//  ASCollectionGalleryLayoutDelegate.mm
-//  Texture
-//
-//  Copyright (c) Pinterest, Inc.  All rights reserved.
-//  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
-//
-
-#ifndef MINIMAL_ASDK
-
-#import <AsyncDisplayKit/ASCollectionGalleryLayoutDelegate.h>
-
-#import <AsyncDisplayKit/_ASCollectionGalleryLayoutInfo.h>
-#import <AsyncDisplayKit/_ASCollectionGalleryLayoutItem.h>
-#import <AsyncDisplayKit/ASAssert.h>
-#import <AsyncDisplayKit/ASCellNode.h>
-#import <AsyncDisplayKit/ASCollectionElement.h>
-#import <AsyncDisplayKit/ASCollections.h>
-#import <AsyncDisplayKit/ASCollectionLayoutContext.h>
-#import <AsyncDisplayKit/ASCollectionLayoutDefines.h>
-#import <AsyncDisplayKit/ASCollectionLayoutState.h>
-#import <AsyncDisplayKit/ASElementMap.h>
-#import <AsyncDisplayKit/ASLayout.h>
-#import <AsyncDisplayKit/ASLayoutRangeType.h>
-#import <AsyncDisplayKit/ASInsetLayoutSpec.h>
-#import <AsyncDisplayKit/ASStackLayoutSpec.h>
-
-#pragma mark - ASCollectionGalleryLayoutDelegate
-
-@implementation ASCollectionGalleryLayoutDelegate {
-  ASScrollDirection _scrollableDirections;
-
-  struct {
-    unsigned int minimumLineSpacingForElements:1;
-    unsigned int minimumInteritemSpacingForElements:1;
-    unsigned int sectionInsetForElements:1;
-  } _propertiesProviderFlags;
-}
-
-- (instancetype)initWithScrollableDirections:(ASScrollDirection)scrollableDirections
-{
-  self = [super init];
-  if (self) {
-    // Scrollable directions must be either vertical or horizontal, but not both
-    ASDisplayNodeAssertTrue(ASScrollDirectionContainsVerticalDirection(scrollableDirections)
-                            || ASScrollDirectionContainsHorizontalDirection(scrollableDirections));
-    ASDisplayNodeAssertFalse(ASScrollDirectionContainsVerticalDirection(scrollableDirections)
-                             && ASScrollDirectionContainsHorizontalDirection(scrollableDirections));
-    _scrollableDirections = scrollableDirections;
-  }
-  return self;
-}
-
-- (ASScrollDirection)scrollableDirections
-{
-  ASDisplayNodeAssertMainThread();
-  return _scrollableDirections;
-}
-
-- (void)setPropertiesProvider:(id<ASCollectionGalleryLayoutPropertiesProviding>)propertiesProvider
-{
-  ASDisplayNodeAssertMainThread();
-  if (propertiesProvider == nil) {
-    _propertiesProvider = nil;
-    _propertiesProviderFlags = {};
-  } else {
-    _propertiesProvider = propertiesProvider;
-    _propertiesProviderFlags.minimumLineSpacingForElements = [_propertiesProvider respondsToSelector:@selector(galleryLayoutDelegate:minimumLineSpacingForElements:)];
-    _propertiesProviderFlags.minimumInteritemSpacingForElements = [_propertiesProvider respondsToSelector:@selector(galleryLayoutDelegate:minimumInteritemSpacingForElements:)];
-    _propertiesProviderFlags.sectionInsetForElements = [_propertiesProvider respondsToSelector:@selector(galleryLayoutDelegate:sectionInsetForElements:)];
-  }
-}
-
-- (id)additionalInfoForLayoutWithElements:(ASElementMap *)elements
-{
-  ASDisplayNodeAssertMainThread();
-  id<ASCollectionGalleryLayoutPropertiesProviding> propertiesProvider = _propertiesProvider;
-  if (propertiesProvider == nil) {
-    return nil;
-  }
-
-  CGSize itemSize = [propertiesProvider galleryLayoutDelegate:self sizeForElements:elements];
-  UIEdgeInsets sectionInset = _propertiesProviderFlags.sectionInsetForElements ? [propertiesProvider galleryLayoutDelegate:self sectionInsetForElements:elements] : UIEdgeInsetsZero;
-  CGFloat lineSpacing = _propertiesProviderFlags.minimumLineSpacingForElements ? [propertiesProvider galleryLayoutDelegate:self minimumLineSpacingForElements:elements] : 0.0;
-  CGFloat interitemSpacing = _propertiesProviderFlags.minimumInteritemSpacingForElements ? [propertiesProvider galleryLayoutDelegate:self minimumInteritemSpacingForElements:elements] : 0.0;
-  return [[_ASCollectionGalleryLayoutInfo alloc] initWithItemSize:itemSize
-                                               minimumLineSpacing:lineSpacing
-                                          minimumInteritemSpacing:interitemSpacing
-                                                     sectionInset:sectionInset];
-}
-
-+ (ASCollectionLayoutState *)calculateLayoutWithContext:(ASCollectionLayoutContext *)context
-{
-  ASElementMap *elements = context.elements;
-  CGSize pageSize = context.viewportSize;
-  ASScrollDirection scrollableDirections = context.scrollableDirections;
-
-  _ASCollectionGalleryLayoutInfo *info = ASDynamicCast(context.additionalInfo, _ASCollectionGalleryLayoutInfo);
-  CGSize itemSize = info.itemSize;
-  if (info == nil || CGSizeEqualToSize(CGSizeZero, itemSize)) {
-    return [[ASCollectionLayoutState alloc] initWithContext:context];
-  }
-
-  NSArray<_ASGalleryLayoutItem *> *children = ASArrayByFlatMapping(elements.itemElements,
-                                                                   ASCollectionElement *element,
-                                                                   [[_ASGalleryLayoutItem alloc] initWithItemSize:itemSize collectionElement:element]);
-  if (children.count == 0) {
-    return [[ASCollectionLayoutState alloc] initWithContext:context];
-  }
-
-  // Use a stack spec to calculate layout content size and frames of all elements without actually measuring each element
-  ASStackLayoutDirection stackDirection = ASScrollDirectionContainsVerticalDirection(scrollableDirections)
-                                              ? ASStackLayoutDirectionHorizontal
-                                              : ASStackLayoutDirectionVertical;
-  ASStackLayoutSpec *stackSpec = [ASStackLayoutSpec stackLayoutSpecWithDirection:stackDirection
-                                                                         spacing:info.minimumInteritemSpacing
-                                                                  justifyContent:ASStackLayoutJustifyContentStart
-                                                                      alignItems:ASStackLayoutAlignItemsStart
-                                                                        flexWrap:ASStackLayoutFlexWrapWrap
-                                                                    alignContent:ASStackLayoutAlignContentStart
-                                                                     lineSpacing:info.minimumLineSpacing
-                                                                        children:children];
-  stackSpec.concurrent = YES;
-
-  ASLayoutSpec *finalSpec = stackSpec;
-  UIEdgeInsets sectionInset = info.sectionInset;
-  if (UIEdgeInsetsEqualToEdgeInsets(sectionInset, UIEdgeInsetsZero) == NO) {
-    finalSpec = [ASInsetLayoutSpec insetLayoutSpecWithInsets:sectionInset child:stackSpec];
-  }
-
-  ASLayout *layout = [finalSpec layoutThatFits:ASSizeRangeForCollectionLayoutThatFitsViewportSize(pageSize, scrollableDirections)];
-
-  return [[ASCollectionLayoutState alloc] initWithContext:context layout:layout getElementBlock:^ASCollectionElement * _Nullable(ASLayout * _Nonnull sublayout) {
-    _ASGalleryLayoutItem *item = ASDynamicCast(sublayout.layoutElement, _ASGalleryLayoutItem);
-    return item ? item.collectionElement : nil;
-  }];
-}
-
-@end
-
-#endif
diff --git a/submodules/AsyncDisplayKit/Source/Details/ASCollectionInternal.h b/submodules/AsyncDisplayKit/Source/Details/ASCollectionInternal.h
deleted file mode 100644
index 925b19f970..0000000000
--- a/submodules/AsyncDisplayKit/Source/Details/ASCollectionInternal.h
+++ /dev/null
@@ -1,68 +0,0 @@
-//
-//  ASCollectionInternal.h
-//  Texture
-//
-//  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.
-//  Changes after 4/13/2017 are: Copyright (c) Pinterest, Inc.  All rights reserved.
-//  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
-//
-
-#ifndef MINIMAL_ASDK
-
-#import <AsyncDisplayKit/ASCollectionView.h>
-
-NS_ASSUME_NONNULL_BEGIN
-
-@protocol ASCollectionViewLayoutFacilitatorProtocol;
-@class ASCollectionNode;
-@class ASDataController;
-@class ASRangeController;
-
-@interface ASCollectionView ()
-- (instancetype)_initWithFrame:(CGRect)frame collectionViewLayout:(UICollectionViewLayout *)layout layoutFacilitator:(nullable id<ASCollectionViewLayoutFacilitatorProtocol>)layoutFacilitator owningNode:(nullable ASCollectionNode *)owningNode eventLog:(nullable ASEventLog *)eventLog;
-
-@property (nonatomic, weak) ASCollectionNode *collectionNode;
-@property (nonatomic, readonly) ASDataController *dataController;
-@property (nonatomic, readonly) ASRangeController *rangeController;
-
-/**
- * The change set that we're currently building, if any.
- */
-@property (nonatomic, nullable, readonly) _ASHierarchyChangeSet *changeSet;
-
-/**
- * @see ASCollectionNode+Beta.h for full documentation.
- */
-@property (nonatomic) ASCellLayoutMode cellLayoutMode;
-
-/**
- * Attempt to get the view-layer index path for the item with the given index path.
- *
- * @param indexPath The index path of the item.
- * @param wait If the item hasn't reached the view yet, this attempts to wait for updates to commit.
- */
-- (nullable NSIndexPath *)convertIndexPathFromCollectionNode:(NSIndexPath *)indexPath waitingIfNeeded:(BOOL)wait;
-
-/**
- * Attempt to get the node index path given the view-layer index path.
- *
- * @param indexPath The index path of the row.
- */
-- (nullable NSIndexPath *)convertIndexPathToCollectionNode:(NSIndexPath *)indexPath;
-
-/**
- * Attempt to get the node index paths given the view-layer index paths.
- *
- * @param indexPaths An array of index paths in the view space
- */
-- (nullable NSArray<NSIndexPath *> *)convertIndexPathsToCollectionNode:(nullable NSArray<NSIndexPath *> *)indexPaths;
-
-- (void)beginUpdates;
-
-- (void)endUpdatesAnimated:(BOOL)animated completion:(nullable void (^)(BOOL))completion;
-
-@end
-
-NS_ASSUME_NONNULL_END
-
-#endif
diff --git a/submodules/AsyncDisplayKit/Source/Details/ASCollectionLayoutContext.h b/submodules/AsyncDisplayKit/Source/Details/ASCollectionLayoutContext.h
deleted file mode 100644
index f5e875f561..0000000000
--- a/submodules/AsyncDisplayKit/Source/Details/ASCollectionLayoutContext.h
+++ /dev/null
@@ -1,35 +0,0 @@
-//
-//  ASCollectionLayoutContext.h
-//  Texture
-//
-//  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.
-//  Changes after 4/13/2017 are: Copyright (c) Pinterest, Inc.  All rights reserved.
-//  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
-//
-
-#ifndef MINIMAL_ASDK
-
-#import <UIKit/UIKit.h>
-#import <AsyncDisplayKit/ASBaseDefines.h>
-#import <AsyncDisplayKit/ASScrollDirection.h>
-
-@class ASElementMap;
-
-NS_ASSUME_NONNULL_BEGIN
-
-AS_SUBCLASSING_RESTRICTED
-@interface ASCollectionLayoutContext : NSObject
-
-@property (nonatomic, readonly) CGSize viewportSize;
-@property (nonatomic, readonly) CGPoint initialContentOffset;
-@property (nonatomic, readonly) ASScrollDirection scrollableDirections;
-@property (nonatomic, weak, readonly) ASElementMap *elements;
-@property (nullable, nonatomic, readonly) id additionalInfo;
-
-- (instancetype)init NS_UNAVAILABLE;
-
-@end
-
-NS_ASSUME_NONNULL_END
-
-#endif
diff --git a/submodules/AsyncDisplayKit/Source/Details/ASCollectionLayoutContext.mm b/submodules/AsyncDisplayKit/Source/Details/ASCollectionLayoutContext.mm
deleted file mode 100644
index 5f82fd76fa..0000000000
--- a/submodules/AsyncDisplayKit/Source/Details/ASCollectionLayoutContext.mm
+++ /dev/null
@@ -1,107 +0,0 @@
-//
-//  ASCollectionLayoutContext.mm
-//  Texture
-//
-//  Copyright (c) Pinterest, Inc.  All rights reserved.
-//  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
-//
-
-#ifndef MINIMAL_ASDK
-
-#import <AsyncDisplayKit/ASCollectionLayoutContext.h>
-#import <AsyncDisplayKit/ASCollectionLayoutContext+Private.h>
-
-#import <AsyncDisplayKit/ASAssert.h>
-#import <AsyncDisplayKit/ASCollectionLayoutDelegate.h>
-#import <AsyncDisplayKit/ASCollectionLayoutCache.h>
-#import <AsyncDisplayKit/ASElementMap.h>
-#import <AsyncDisplayKit/ASEqualityHelpers.h>
-#import <AsyncDisplayKit/ASHashing.h>
-
-@implementation ASCollectionLayoutContext {
-  Class<ASCollectionLayoutDelegate> _layoutDelegateClass;
-  __weak ASCollectionLayoutCache *_layoutCache;
-}
-
-- (instancetype)initWithViewportSize:(CGSize)viewportSize
-                initialContentOffset:(CGPoint)initialContentOffset
-                scrollableDirections:(ASScrollDirection)scrollableDirections
-                            elements:(ASElementMap *)elements
-                 layoutDelegateClass:(Class<ASCollectionLayoutDelegate>)layoutDelegateClass
-                         layoutCache:(ASCollectionLayoutCache *)layoutCache
-                      additionalInfo:(id)additionalInfo
-{
-  self = [super init];
-  if (self) {
-    _viewportSize = viewportSize;
-    _initialContentOffset = initialContentOffset;
-    _scrollableDirections = scrollableDirections;
-    _elements = elements;
-    _layoutDelegateClass = layoutDelegateClass;
-    _layoutCache = layoutCache;
-    _additionalInfo = additionalInfo;
-  }
-  return self;
-}
-
-- (Class<ASCollectionLayoutDelegate>)layoutDelegateClass
-{
-  return _layoutDelegateClass;
-}
-
-- (ASCollectionLayoutCache *)layoutCache
-{
-  return _layoutCache;
-}
-
-// NOTE: Some properties, like initialContentOffset and layoutCache are ignored in -isEqualToContext: and -hash.
-// That is because contexts can be equal regardless of the content offsets or layout caches.
-- (BOOL)isEqualToContext:(ASCollectionLayoutContext *)context
-{
-  if (context == nil) {
-    return NO;
-  }
-
-  // NOTE: ASObjectIsEqual returns YES when both objects are nil.
-  // So don't use ASObjectIsEqual on _elements.
-  // It is a weak property and 2 layouts generated from different sets of elements
-  // should never be considered the same even if they are nil now.
-  return CGSizeEqualToSize(_viewportSize, context.viewportSize)
-  && _scrollableDirections == context.scrollableDirections
-  && [_elements isEqual:context.elements]
-  && _layoutDelegateClass == context.layoutDelegateClass
-  && ASObjectIsEqual(_additionalInfo, context.additionalInfo);
-}
-
-- (BOOL)isEqual:(id)other
-{
-  if (self == other) {
-    return YES;
-  }
-  if (! [other isKindOfClass:[ASCollectionLayoutContext class]]) {
-    return NO;
-  }
-  return [self isEqualToContext:other];
-}
-
-- (NSUInteger)hash
-{
-  struct {
-    CGSize viewportSize;
-    ASScrollDirection scrollableDirections;
-    NSUInteger elementsHash;
-    NSUInteger layoutDelegateClassHash;
-    NSUInteger additionalInfoHash;
-  } data = {
-    _viewportSize,
-    _scrollableDirections,
-    _elements.hash,
-    _layoutDelegateClass.hash,
-    [_additionalInfo hash]
-  };
-  return ASHashBytes(&data, sizeof(data));
-}
-
-@end
-
-#endif
diff --git a/submodules/AsyncDisplayKit/Source/Details/ASCollectionLayoutDelegate.h b/submodules/AsyncDisplayKit/Source/Details/ASCollectionLayoutDelegate.h
deleted file mode 100644
index d92a8c0ab7..0000000000
--- a/submodules/AsyncDisplayKit/Source/Details/ASCollectionLayoutDelegate.h
+++ /dev/null
@@ -1,63 +0,0 @@
-//
-//  ASCollectionLayoutDelegate.h
-//  Texture
-//
-//  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.
-//  Changes after 4/13/2017 are: Copyright (c) Pinterest, Inc.  All rights reserved.
-//  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
-//
-
-#ifndef MINIMAL_ASDK
-
-#import <Foundation/Foundation.h>
-#import <UIKit/UIKit.h>
-#import <AsyncDisplayKit/ASScrollDirection.h>
-
-@class ASElementMap, ASCollectionLayoutContext, ASCollectionLayoutState;
-
-NS_ASSUME_NONNULL_BEGIN
-
-@protocol ASCollectionLayoutDelegate <NSObject>
-
-/**
- * @abstract Returns the scrollable directions of the coming layout (@see @c -calculateLayoutWithContext:).
- * It will be available in the context parameter in +calculateLayoutWithContext:
- *
- * @return The scrollable directions.
- *
- * @discusstion This method will be called on main thread.
- */
-- (ASScrollDirection)scrollableDirections;
-
-/**
- * @abstract Returns any additional information needed for a coming layout pass (@see @c -calculateLayoutWithContext:) with the given elements.
- *
- * @param elements The elements to be laid out later.
- *
- * @discussion The returned object must support equality and hashing (i.e `-isEqual:` and `-hash` must be properly implemented).
- * It should contain all the information needed for the layout pass to perform. It will be available in the context parameter in +calculateLayoutWithContext:
- *
- * This method will be called on main thread.
- */
-- (nullable id)additionalInfoForLayoutWithElements:(ASElementMap *)elements;
-
-/**
- * @abstract Prepares and returns a new layout for given context.
- *
- * @param context A context that contains all elements to be laid out and any additional information needed.
- *
- * @return The new layout calculated for the given context.
- *
- * @discussion This method is called ahead of time, i.e before the underlying collection/table view is aware of the provided elements.
- * As a result, clients must solely rely on the given context and should not reach out to other objects for information not available in the context.
- *
- * This method can be called on background theads. It must be thread-safe and should not change any internal state of this delegate.
- * It must block the calling thread but can dispatch to other theads to reduce total blocking time.
- */
-+ (ASCollectionLayoutState *)calculateLayoutWithContext:(ASCollectionLayoutContext *)context;
-
-@end
-
-NS_ASSUME_NONNULL_END
-
-#endif
diff --git a/submodules/AsyncDisplayKit/Source/Details/ASCollectionLayoutState.h b/submodules/AsyncDisplayKit/Source/Details/ASCollectionLayoutState.h
deleted file mode 100644
index 461f4b1296..0000000000
--- a/submodules/AsyncDisplayKit/Source/Details/ASCollectionLayoutState.h
+++ /dev/null
@@ -1,115 +0,0 @@
-//
-//  ASCollectionLayoutState.h
-//  Texture
-//
-//  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.
-//  Changes after 4/13/2017 are: Copyright (c) Pinterest, Inc.  All rights reserved.
-//  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
-//
-
-#ifndef MINIMAL_ASDK
-
-#import <Foundation/Foundation.h>
-#import <UIKit/UIKit.h>
-#import <AsyncDisplayKit/ASBaseDefines.h>
-
-@class ASCollectionLayoutContext, ASLayout, ASCollectionElement;
-
-NS_ASSUME_NONNULL_BEGIN
-
-typedef ASCollectionElement * _Nullable (^ASCollectionLayoutStateGetElementBlock)(ASLayout *);
-
-@interface NSMapTable (ASCollectionLayoutConvenience)
-
-+ (NSMapTable<ASCollectionElement *, UICollectionViewLayoutAttributes *> *)elementToLayoutAttributesTable;
-
-@end
-
-AS_SUBCLASSING_RESTRICTED
-
-/// An immutable state of the collection layout
-@interface ASCollectionLayoutState : NSObject
-
-/// The context used to calculate this object
-@property (readonly) ASCollectionLayoutContext *context;
-
-/// The final content size of the collection's layout
-@property (readonly) CGSize contentSize;
-
-- (instancetype)init NS_UNAVAILABLE;
-
-/**
- * Designated initializer.
- *
- * @param context The context used to calculate this object
- *
- * @param contentSize The content size of the collection's layout
- *
- * @param table A map between elements to their layout attributes. It must contain all elements.
- * It should have NSMapTableObjectPointerPersonality and NSMapTableWeakMemory as key options.
- */
-- (instancetype)initWithContext:(ASCollectionLayoutContext *)context
-                    contentSize:(CGSize)contentSize
- elementToLayoutAttributesTable:(NSMapTable<ASCollectionElement *, UICollectionViewLayoutAttributes *> *)table NS_DESIGNATED_INITIALIZER;
-
-/**
- * Convenience initializer. Returns an object with zero content size and an empty table.
- *
- * @param context The context used to calculate this object
- */
-- (instancetype)initWithContext:(ASCollectionLayoutContext *)context;
-
-/**
- * Convenience initializer.
- *
- * @param context The context used to calculate this object
- *
- * @param layout The layout describes size and position of all elements.
- *
- * @param getElementBlock A block that can retrieve the collection element from a sublayout of the root layout.
- */
-- (instancetype)initWithContext:(ASCollectionLayoutContext *)context
-                         layout:(ASLayout *)layout
-                getElementBlock:(ASCollectionLayoutStateGetElementBlock)getElementBlock;
-
-/**
- * Returns all layout attributes present in this object.
- */
-- (NSArray<UICollectionViewLayoutAttributes *> *)allLayoutAttributes;
-
-/**
- * Returns layout attributes of elements in the specified rect.
- *
- * @param rect The rect containing the target elements.
- */
-- (NSArray<UICollectionViewLayoutAttributes *> *)layoutAttributesForElementsInRect:(CGRect)rect;
-
-/**
- * Returns layout attributes of the element at the specified index path.
- *
- * @param indexPath The index path of the item.
- */
-- (nullable UICollectionViewLayoutAttributes *)layoutAttributesForItemAtIndexPath:(NSIndexPath *)indexPath;
-
-/**
- * Returns layout attributes of the specified supplementary element.
- *
- * @param kind A string that identifies the type of the supplementary element.
- *
- * @param indexPath The index path of the element.
- */
-- (nullable UICollectionViewLayoutAttributes *)layoutAttributesForSupplementaryElementOfKind:(NSString *)kind
-                                                                                 atIndexPath:(NSIndexPath *)indexPath;
-
-/**
- * Returns layout attributes of the specified element.
- *
- * @element The element.
- */
-- (nullable UICollectionViewLayoutAttributes *)layoutAttributesForElement:(ASCollectionElement *)element;
-
-@end
-
-NS_ASSUME_NONNULL_END
-
-#endif
diff --git a/submodules/AsyncDisplayKit/Source/Details/ASCollectionLayoutState.mm b/submodules/AsyncDisplayKit/Source/Details/ASCollectionLayoutState.mm
deleted file mode 100644
index 2c09202c1b..0000000000
--- a/submodules/AsyncDisplayKit/Source/Details/ASCollectionLayoutState.mm
+++ /dev/null
@@ -1,259 +0,0 @@
-//
-//  ASCollectionLayoutState.mm
-//  Texture
-//
-//  Copyright (c) Pinterest, Inc.  All rights reserved.
-//  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
-//
-
-#ifndef MINIMAL_ASDK
-
-#import <AsyncDisplayKit/ASCollectionLayoutState.h>
-#import <AsyncDisplayKit/ASCollectionLayoutState+Private.h>
-
-#import <AsyncDisplayKit/ASAssert.h>
-#import <AsyncDisplayKit/ASCellNode.h>
-#import <AsyncDisplayKit/ASCollectionElement.h>
-#import <AsyncDisplayKit/ASCollectionLayoutContext.h>
-#import <AsyncDisplayKit/ASDisplayNode+Subclasses.h>
-#import <AsyncDisplayKit/ASElementMap.h>
-#import <AsyncDisplayKit/ASLayout.h>
-#import <AsyncDisplayKit/ASLayoutSpecUtilities.h>
-#import <AsyncDisplayKit/ASPageTable.h>
-#import <AsyncDisplayKit/ASThread.h>
-
-#import <queue>
-
-@implementation NSMapTable (ASCollectionLayoutConvenience)
-
-+ (NSMapTable<ASCollectionElement *, UICollectionViewLayoutAttributes *> *)elementToLayoutAttributesTable
-{
-  return [NSMapTable mapTableWithKeyOptions:(NSMapTableWeakMemory | NSMapTableObjectPointerPersonality) valueOptions:NSMapTableStrongMemory];
-}
-
-@end
-
-@implementation ASCollectionLayoutState {
-  AS::Mutex __instanceLock__;
-  CGSize _contentSize;
-  ASCollectionLayoutContext *_context;
-  NSMapTable<ASCollectionElement *, UICollectionViewLayoutAttributes *> *_elementToLayoutAttributesTable;
-  ASPageToLayoutAttributesTable *_pageToLayoutAttributesTable;
-  ASPageToLayoutAttributesTable *_unmeasuredPageToLayoutAttributesTable;
-}
-
-- (instancetype)initWithContext:(ASCollectionLayoutContext *)context
-{
-  return [self initWithContext:context
-                   contentSize:CGSizeZero
-elementToLayoutAttributesTable:[NSMapTable elementToLayoutAttributesTable]];
-}
-
-- (instancetype)initWithContext:(ASCollectionLayoutContext *)context
-                         layout:(ASLayout *)layout
-                getElementBlock:(ASCollectionLayoutStateGetElementBlock)getElementBlock
-{
-  ASElementMap *elements = context.elements;
-  NSMapTable *table = [NSMapTable elementToLayoutAttributesTable];
-
-  // Traverse the given layout tree in breadth first fashion. Generate layout attributes for all included elements along the way. 
-  struct Context {
-    ASLayout *layout;
-    CGPoint absolutePosition;
-  };
-
-  std::queue<Context> queue;
-  queue.push({layout, CGPointZero});
-
-  while (!queue.empty()) {
-    Context context = queue.front();
-    queue.pop();
-
-    ASLayout *layout = context.layout;
-    const CGPoint absolutePosition = context.absolutePosition;
-
-    ASCollectionElement *element = getElementBlock(layout);
-    if (element != nil) {
-      NSIndexPath *indexPath = [elements indexPathForElement:element];
-      NSString *supplementaryElementKind = element.supplementaryElementKind;
-
-      UICollectionViewLayoutAttributes *attrs;
-      if (supplementaryElementKind == nil) {
-        attrs = [UICollectionViewLayoutAttributes layoutAttributesForCellWithIndexPath:indexPath];
-      } else {
-        attrs = [UICollectionViewLayoutAttributes layoutAttributesForSupplementaryViewOfKind:supplementaryElementKind withIndexPath:indexPath];
-      }
-
-      CGRect frame = layout.frame;
-      frame.origin = absolutePosition;
-      attrs.frame = frame;
-      [table setObject:attrs forKey:element];
-    }
-
-    // Add all sublayouts to process in next step
-    for (ASLayout *sublayout in layout.sublayouts) {
-      queue.push({sublayout, absolutePosition + sublayout.position});
-    }
-  }
-
-  return [self initWithContext:context contentSize:layout.size elementToLayoutAttributesTable:table];
-}
-
-- (instancetype)initWithContext:(ASCollectionLayoutContext *)context
-                    contentSize:(CGSize)contentSize
- elementToLayoutAttributesTable:(NSMapTable *)table
-{
-  self = [super init];
-  if (self) {
-    _context = context;
-    _contentSize = contentSize;
-    _elementToLayoutAttributesTable = [table copy]; // Copy the given table to make sure clients can't mutate it after this point.
-    CGSize pageSize = context.viewportSize;
-    _pageToLayoutAttributesTable = [ASPageTable pageTableWithLayoutAttributes:table.objectEnumerator contentSize:contentSize pageSize:pageSize];
-    _unmeasuredPageToLayoutAttributesTable = [ASCollectionLayoutState _unmeasuredLayoutAttributesTableFromTable:table contentSize:contentSize pageSize:pageSize];
-  }
-  return self;
-}
-
-- (ASCollectionLayoutContext *)context
-{
-  return _context;
-}
-
-- (CGSize)contentSize
-{
-  return _contentSize;
-}
-
-- (NSArray<UICollectionViewLayoutAttributes *> *)allLayoutAttributes
-{
-  return [_elementToLayoutAttributesTable.objectEnumerator allObjects];
-}
-
-- (UICollectionViewLayoutAttributes *)layoutAttributesForItemAtIndexPath:(NSIndexPath *)indexPath
-{
-  ASCollectionElement *element = [_context.elements elementForItemAtIndexPath:indexPath];
-  return [_elementToLayoutAttributesTable objectForKey:element];
-}
-
-- (UICollectionViewLayoutAttributes *)layoutAttributesForSupplementaryElementOfKind:(NSString *)elementKind
-                                                                        atIndexPath:(NSIndexPath *)indexPath
-{
-  ASCollectionElement *element = [_context.elements supplementaryElementOfKind:elementKind atIndexPath:indexPath];
-  return [_elementToLayoutAttributesTable objectForKey:element];
-}
-
-- (UICollectionViewLayoutAttributes *)layoutAttributesForElement:(ASCollectionElement *)element
-{
-  return [_elementToLayoutAttributesTable objectForKey:element];
-}
-
-- (NSArray<UICollectionViewLayoutAttributes *> *)layoutAttributesForElementsInRect:(CGRect)rect
-{
-  CGSize pageSize = _context.viewportSize;
-  NSPointerArray *pages = ASPageCoordinatesForPagesThatIntersectRect(rect, _contentSize, pageSize);
-  if (pages.count == 0) {
-    return @[];
-  }
-
-  // Use a set here because some items may span multiple pages
-  const auto result = [[NSMutableSet<UICollectionViewLayoutAttributes *> alloc] init];
-  for (id pagePtr in pages) {
-    ASPageCoordinate page = (ASPageCoordinate)pagePtr;
-    NSArray<UICollectionViewLayoutAttributes *> *allAttrs = [_pageToLayoutAttributesTable objectForPage:page];
-    if (allAttrs.count > 0) {
-      CGRect pageRect = ASPageCoordinateGetPageRect(page, pageSize);
-
-      if (CGRectContainsRect(rect, pageRect)) {
-        [result addObjectsFromArray:allAttrs];
-      } else {
-        for (UICollectionViewLayoutAttributes *attrs in allAttrs) {
-          if (CGRectIntersectsRect(rect, attrs.frame)) {
-            [result addObject:attrs];
-          }
-        }
-      }
-    }
-  }
-
-  return [result allObjects];
-}
-
-- (ASPageToLayoutAttributesTable *)getAndRemoveUnmeasuredLayoutAttributesPageTableInRect:(CGRect)rect
-{
-  CGSize pageSize = _context.viewportSize;
-  CGSize contentSize = _contentSize;
-
-  AS::MutexLocker l(__instanceLock__);
-  if (_unmeasuredPageToLayoutAttributesTable.count == 0 || CGRectIsNull(rect) || CGRectIsEmpty(rect) || CGSizeEqualToSize(CGSizeZero, contentSize) || CGSizeEqualToSize(CGSizeZero, pageSize)) {
-    return nil;
-  }
-
-  // Step 1: Determine all the pages that intersect the specified rect
-  NSPointerArray *pagesInRect = ASPageCoordinatesForPagesThatIntersectRect(rect, contentSize, pageSize);
-  if (pagesInRect.count == 0) {
-    return nil;
-  }
-
-  // Step 2: Filter out attributes in these pages that intersect the specified rect.
-  ASPageToLayoutAttributesTable *result = nil;
-  for (id pagePtr in pagesInRect) {
-    ASPageCoordinate page = (ASPageCoordinate)pagePtr;
-    NSMutableArray *attrsInPage = [_unmeasuredPageToLayoutAttributesTable objectForPage:page];
-    if (attrsInPage.count == 0) {
-      continue;
-    }
-
-    NSMutableArray *intersectingAttrsInPage = nil;
-    CGRect pageRect = ASPageCoordinateGetPageRect(page, pageSize);
-    if (CGRectContainsRect(rect, pageRect)) {
-      // This page fits well within the specified rect. Simply return all of its attributes.
-      intersectingAttrsInPage = attrsInPage;
-    } else {
-      // The page intersects the specified rect. Some attributes in this page are returned, some are not.
-      for (UICollectionViewLayoutAttributes *attrs in attrsInPage) {
-        if (CGRectIntersectsRect(rect, attrs.frame)) {
-          if (intersectingAttrsInPage == nil) {
-            intersectingAttrsInPage = [[NSMutableArray alloc] init];
-          }
-          [intersectingAttrsInPage addObject:attrs];
-        }
-      }
-    }
-
-    if (intersectingAttrsInPage.count > 0) {
-      if (attrsInPage.count == intersectingAttrsInPage.count) {
-        [_unmeasuredPageToLayoutAttributesTable removeObjectForPage:page];
-      } else {
-        [attrsInPage removeObjectsInArray:intersectingAttrsInPage];
-      }
-      if (result == nil) {
-        result = [ASPageTable pageTableForStrongObjectPointers];
-      }
-      [result setObject:intersectingAttrsInPage forPage:page];
-    }
-  }
-
-  return result;
-}
-
-#pragma mark - Private methods
-
-+ (ASPageToLayoutAttributesTable *)_unmeasuredLayoutAttributesTableFromTable:(NSMapTable<ASCollectionElement *, UICollectionViewLayoutAttributes *> *)table
-                                                                 contentSize:(CGSize)contentSize
-                                                                    pageSize:(CGSize)pageSize
-{
-  NSMutableArray<UICollectionViewLayoutAttributes *> *unmeasuredAttrs = [[NSMutableArray alloc] init];
-  for (ASCollectionElement *element in table) {
-    UICollectionViewLayoutAttributes *attrs = [table objectForKey:element];
-    if (element.nodeIfAllocated == nil || CGSizeEqualToSize(element.nodeIfAllocated.calculatedSize, attrs.frame.size) == NO) {
-      [unmeasuredAttrs addObject:attrs];
-    }
-  }
-
-  return [ASPageTable pageTableWithLayoutAttributes:unmeasuredAttrs contentSize:contentSize pageSize:pageSize];
-}
-
-@end
-
-#endif
diff --git a/submodules/AsyncDisplayKit/Source/Details/ASCollectionViewLayoutController.h b/submodules/AsyncDisplayKit/Source/Details/ASCollectionViewLayoutController.h
deleted file mode 100644
index 9441486b54..0000000000
--- a/submodules/AsyncDisplayKit/Source/Details/ASCollectionViewLayoutController.h
+++ /dev/null
@@ -1,27 +0,0 @@
-//
-//  ASCollectionViewLayoutController.h
-//  Texture
-//
-//  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.
-//  Changes after 4/13/2017 are: Copyright (c) Pinterest, Inc.  All rights reserved.
-//  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
-//
-
-#ifndef MINIMAL_ASDK
-
-#import <AsyncDisplayKit/ASAbstractLayoutController.h>
-
-NS_ASSUME_NONNULL_BEGIN
-
-@class ASCollectionView;
-
-AS_SUBCLASSING_RESTRICTED
-@interface ASCollectionViewLayoutController : ASAbstractLayoutController
-
-- (instancetype)initWithCollectionView:(ASCollectionView *)collectionView;
-
-@end
-
-NS_ASSUME_NONNULL_END
-
-#endif
diff --git a/submodules/AsyncDisplayKit/Source/Details/ASCollectionViewLayoutController.mm b/submodules/AsyncDisplayKit/Source/Details/ASCollectionViewLayoutController.mm
deleted file mode 100644
index 1d7f1ca013..0000000000
--- a/submodules/AsyncDisplayKit/Source/Details/ASCollectionViewLayoutController.mm
+++ /dev/null
@@ -1,130 +0,0 @@
-//
-//  ASCollectionViewLayoutController.mm
-//  Texture
-//
-//  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.
-//  Changes after 4/13/2017 are: Copyright (c) Pinterest, Inc.  All rights reserved.
-//  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
-//
-
-#ifndef MINIMAL_ASDK
-#import <AsyncDisplayKit/ASCollectionViewLayoutController.h>
-
-#import <AsyncDisplayKit/ASAssert.h>
-#import <AsyncDisplayKit/ASCollectionView+Undeprecated.h>
-#import <AsyncDisplayKit/ASElementMap.h>
-#import <AsyncDisplayKit/CoreGraphics+ASConvenience.h>
-#import <AsyncDisplayKit/UICollectionViewLayout+ASConvenience.h>
-
-struct ASRangeGeometry {
-  CGRect rangeBounds;
-  CGRect updateBounds;
-};
-typedef struct ASRangeGeometry ASRangeGeometry;
-
-#pragma mark -
-#pragma mark ASCollectionViewLayoutController
-
-@interface ASCollectionViewLayoutController ()
-{
-  @package
-  ASCollectionView * __weak _collectionView;
-  UICollectionViewLayout * __strong _collectionViewLayout;
-}
-@end
-
-@implementation ASCollectionViewLayoutController
-
-- (instancetype)initWithCollectionView:(ASCollectionView *)collectionView
-{
-  if (!(self = [super init])) {
-    return nil;
-  }
-  
-  _collectionView = collectionView;
-  _collectionViewLayout = [collectionView collectionViewLayout];
-  return self;
-}
-
-- (NSHashTable<ASCollectionElement *> *)elementsForScrolling:(ASScrollDirection)scrollDirection rangeMode:(ASLayoutRangeMode)rangeMode rangeType:(ASLayoutRangeType)rangeType map:(ASElementMap *)map
-{
-  ASRangeTuningParameters tuningParameters = [self tuningParametersForRangeMode:rangeMode rangeType:rangeType];
-  CGRect rangeBounds = [self rangeBoundsWithScrollDirection:scrollDirection rangeTuningParameters:tuningParameters];
-  return [self elementsWithinRangeBounds:rangeBounds map:map];
-}
-
-- (void)allElementsForScrolling:(ASScrollDirection)scrollDirection rangeMode:(ASLayoutRangeMode)rangeMode displaySet:(NSHashTable<ASCollectionElement *> *__autoreleasing  _Nullable *)displaySet preloadSet:(NSHashTable<ASCollectionElement *> *__autoreleasing  _Nullable *)preloadSet map:(ASElementMap *)map
-{
-  if (displaySet == NULL || preloadSet == NULL) {
-    return;
-  }
-  
-  ASRangeTuningParameters displayParams = [self tuningParametersForRangeMode:rangeMode rangeType:ASLayoutRangeTypeDisplay];
-  ASRangeTuningParameters preloadParams = [self tuningParametersForRangeMode:rangeMode rangeType:ASLayoutRangeTypePreload];
-  CGRect displayBounds = [self rangeBoundsWithScrollDirection:scrollDirection rangeTuningParameters:displayParams];
-  CGRect preloadBounds = [self rangeBoundsWithScrollDirection:scrollDirection rangeTuningParameters:preloadParams];
-  
-  CGRect unionBounds = CGRectUnion(displayBounds, preloadBounds);
-  NSArray *layoutAttributes = [_collectionViewLayout layoutAttributesForElementsInRect:unionBounds];
-  NSInteger count = layoutAttributes.count;
-
-  __auto_type display = [[NSHashTable<ASCollectionElement *> alloc] initWithOptions:NSHashTableObjectPointerPersonality capacity:count];
-  __auto_type preload = [[NSHashTable<ASCollectionElement *> alloc] initWithOptions:NSHashTableObjectPointerPersonality capacity:count];
-
-  for (UICollectionViewLayoutAttributes *la in layoutAttributes) {
-    // Manually filter out elements that don't intersect the range bounds.
-    // See comment in elementsForItemsWithinRangeBounds:
-    // This is re-implemented here so that the iteration over layoutAttributes can be done once to check both ranges.
-    CGRect frame = la.frame;
-    BOOL intersectsDisplay = CGRectIntersectsRect(displayBounds, frame);
-    BOOL intersectsPreload = CGRectIntersectsRect(preloadBounds, frame);
-    if (intersectsDisplay == NO && intersectsPreload == NO && CATransform3DIsIdentity(la.transform3D) == YES) {
-      // Questionable why the element would be included here, but it doesn't belong.
-      continue;
-    }
-    
-    // Avoid excessive retains and releases, as well as property calls. We know the element is kept alive by map.
-    __unsafe_unretained ASCollectionElement *e = [map elementForLayoutAttributes:la];
-    if (e != nil && intersectsDisplay) {
-      [display addObject:e];
-    }
-    if (e != nil && intersectsPreload) {
-      [preload addObject:e];
-    }
-  }
-
-  *displaySet = display;
-  *preloadSet = preload;
-  return;
-}
-
-- (NSHashTable<ASCollectionElement *> *)elementsWithinRangeBounds:(CGRect)rangeBounds map:(ASElementMap *)map
-{
-  NSArray *layoutAttributes = [_collectionViewLayout layoutAttributesForElementsInRect:rangeBounds];
-  NSHashTable<ASCollectionElement *> *elementSet = [[NSHashTable alloc] initWithOptions:NSHashTableObjectPointerPersonality capacity:layoutAttributes.count];
-  
-  for (UICollectionViewLayoutAttributes *la in layoutAttributes) {
-    // Manually filter out elements that don't intersect the range bounds.
-    // If a layout returns elements outside the requested rect this can be a huge problem.
-    // For instance in a paging flow, you may only want to preload 3 pages (one center, one on each side)
-    // but if flow layout includes the 4th page (which it does! as of iOS 9&10), you will preload a 4th
-    // page as well.
-    if (CATransform3DIsIdentity(la.transform3D) && CGRectIntersectsRect(la.frame, rangeBounds) == NO) {
-      continue;
-    }
-    [elementSet addObject:[map elementForLayoutAttributes:la]];
-  }
-
-  return elementSet;
-}
-
-- (CGRect)rangeBoundsWithScrollDirection:(ASScrollDirection)scrollDirection
-                   rangeTuningParameters:(ASRangeTuningParameters)tuningParameters
-{
-  CGRect rect = _collectionView.bounds;
-  
-  return CGRectExpandToRangeWithScrollableDirections(rect, tuningParameters, [_collectionView scrollableDirections], scrollDirection);
-}
-
-@end
-#endif
diff --git a/submodules/AsyncDisplayKit/Source/Details/ASCollectionViewLayoutInspector.h b/submodules/AsyncDisplayKit/Source/Details/ASCollectionViewLayoutInspector.h
deleted file mode 100644
index be812b68a3..0000000000
--- a/submodules/AsyncDisplayKit/Source/Details/ASCollectionViewLayoutInspector.h
+++ /dev/null
@@ -1,88 +0,0 @@
-//
-//  ASCollectionViewLayoutInspector.h
-//  Texture
-//
-//  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.
-//  Changes after 4/13/2017 are: Copyright (c) Pinterest, Inc.  All rights reserved.
-//  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
-//
-
-#ifndef MINIMAL_ASDK
-
-#import <Foundation/Foundation.h>
-#import <AsyncDisplayKit/ASDimension.h>
-#import <AsyncDisplayKit/ASScrollDirection.h>
-
-@class ASCollectionView;
-@protocol ASCollectionDataSource;
-@protocol ASCollectionDelegate;
-
-NS_ASSUME_NONNULL_BEGIN
-
-AS_EXTERN ASSizeRange NodeConstrainedSizeForScrollDirection(ASCollectionView *collectionView);
-
-@protocol ASCollectionViewLayoutInspecting <NSObject>
-
-/**
- * Asks the inspector to provide a constrained size range for the given collection view node.
- */
-- (ASSizeRange)collectionView:(ASCollectionView *)collectionView constrainedSizeForNodeAtIndexPath:(NSIndexPath *)indexPath;
-
-/**
- * Return the directions in which your collection view can scroll
- */
-- (ASScrollDirection)scrollableDirections;
-
-@optional
-
-/**
- * Asks the inspector to provide a constrained size range for the given supplementary node.
- */
-- (ASSizeRange)collectionView:(ASCollectionView *)collectionView constrainedSizeForSupplementaryNodeOfKind:(NSString *)kind atIndexPath:(NSIndexPath *)indexPath;
-
-/**
- * Asks the inspector for the number of supplementary views for the given kind in the specified section.
- */
-- (NSUInteger)collectionView:(ASCollectionView *)collectionView supplementaryNodesOfKind:(NSString *)kind inSection:(NSUInteger)section;
-
-/**
- * Allow the inspector to respond to delegate changes.
- *
- * @discussion A great time to update perform selector caches!
- */
-- (void)didChangeCollectionViewDelegate:(nullable id<ASCollectionDelegate>)delegate;
-
-/**
- * Allow the inspector to respond to dataSource changes.
- *
- * @discussion A great time to update perform selector caches!
- */
-- (void)didChangeCollectionViewDataSource:(nullable id<ASCollectionDataSource>)dataSource;
-
-#pragma mark Deprecated Methods
-
-/**
- * Asks the inspector for the number of supplementary sections in the collection view for the given kind.
- *
- * @deprecated This method will not be called, and it is only deprecated as a reminder to remove it.
- * Supplementary elements must exist in the same sections as regular collection view items i.e. -numberOfSectionsInCollectionView:
- */
-- (NSUInteger)collectionView:(ASCollectionView *)collectionView numberOfSectionsForSupplementaryNodeOfKind:(NSString *)kind ASDISPLAYNODE_DEPRECATED_MSG("Use ASCollectionNode's method instead.");
-
-@end
-
-/**
- * A layout inspector for non-flow layouts that returns a constrained size to let the cells layout itself as
- * far as possible based on the scrollable direction of the collection view.
- * It doesn't support supplementary nodes and therefore doesn't implement delegate methods
- * that are related to supplementary node's management.
- *
- * @warning This class is not meant to be subclassed and will be restricted in the future.
- */
-@interface ASCollectionViewLayoutInspector : NSObject <ASCollectionViewLayoutInspecting>
-@end
-
-
-NS_ASSUME_NONNULL_END
-
-#endif
\ No newline at end of file
diff --git a/submodules/AsyncDisplayKit/Source/Details/ASCollectionViewLayoutInspector.mm b/submodules/AsyncDisplayKit/Source/Details/ASCollectionViewLayoutInspector.mm
deleted file mode 100644
index f02fe1c171..0000000000
--- a/submodules/AsyncDisplayKit/Source/Details/ASCollectionViewLayoutInspector.mm
+++ /dev/null
@@ -1,78 +0,0 @@
-//
-//  ASCollectionViewLayoutInspector.mm
-//  Texture
-//
-//  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.
-//  Changes after 4/13/2017 are: Copyright (c) Pinterest, Inc.  All rights reserved.
-//  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
-//
-#ifndef MINIMAL_ASDK
-#import <AsyncDisplayKit/ASCollectionViewLayoutInspector.h>
-
-#import <AsyncDisplayKit/ASCollectionView.h>
-#import <AsyncDisplayKit/ASCollectionView+Undeprecated.h>
-#import <AsyncDisplayKit/ASCollectionNode.h>
-
-#pragma mark - Helper Functions
-
-// Returns a constrained size to let the cells layout itself as far as possible based on the scrollable direction
-// of the collection view
-ASSizeRange NodeConstrainedSizeForScrollDirection(ASCollectionView *collectionView) {
-  CGSize maxSize = collectionView.bounds.size;
-  UIEdgeInsets contentInset = collectionView.contentInset;
-  if (ASScrollDirectionContainsHorizontalDirection(collectionView.scrollableDirections)) {
-    maxSize.width = CGFLOAT_MAX;
-    maxSize.height -= (contentInset.top + contentInset.bottom);
-  } else {
-    maxSize.width -= (contentInset.left + contentInset.right);
-    maxSize.height = CGFLOAT_MAX;
-  }
-  return ASSizeRangeMake(CGSizeZero, maxSize);
-}
-
-#pragma mark - ASCollectionViewLayoutInspector
-
-@implementation ASCollectionViewLayoutInspector {
-  struct {
-    unsigned int implementsConstrainedSizeForNodeAtIndexPathDeprecated:1;
-    unsigned int implementsConstrainedSizeForNodeAtIndexPath:1;
-  } _delegateFlags;
-}
-
-#pragma mark ASCollectionViewLayoutInspecting
-
-- (void)didChangeCollectionViewDelegate:(id<ASCollectionDelegate>)delegate
-{
-  if (delegate == nil) {
-    memset(&_delegateFlags, 0, sizeof(_delegateFlags));
-  } else {
-    _delegateFlags.implementsConstrainedSizeForNodeAtIndexPathDeprecated = [delegate respondsToSelector:@selector(collectionView:constrainedSizeForNodeAtIndexPath:)];
-    _delegateFlags.implementsConstrainedSizeForNodeAtIndexPath = [delegate respondsToSelector:@selector(collectionNode:constrainedSizeForItemAtIndexPath:)];
-  }
-}
-
-- (ASSizeRange)collectionView:(ASCollectionView *)collectionView constrainedSizeForNodeAtIndexPath:(NSIndexPath *)indexPath
-{
-  if (_delegateFlags.implementsConstrainedSizeForNodeAtIndexPath) {
-    return [collectionView.asyncDelegate collectionNode:collectionView.collectionNode constrainedSizeForItemAtIndexPath:indexPath];
-  } else if (_delegateFlags.implementsConstrainedSizeForNodeAtIndexPathDeprecated) {
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
-    return [collectionView.asyncDelegate collectionView:collectionView constrainedSizeForNodeAtIndexPath:indexPath];
-#pragma clang diagnostic pop
-  } else {
-    // With 2.0 `collectionView:constrainedSizeForNodeAtIndexPath:` was moved to the delegate. Assert if not implemented on the delegate but on the data source
-    ASDisplayNodeAssert([collectionView.asyncDataSource respondsToSelector:@selector(collectionView:constrainedSizeForNodeAtIndexPath:)] == NO, @"collectionView:constrainedSizeForNodeAtIndexPath: was moved from the ASCollectionDataSource to the ASCollectionDelegate.");
-  }
-  
-  return NodeConstrainedSizeForScrollDirection(collectionView);
-}
-
-- (ASScrollDirection)scrollableDirections
-{
-  return ASScrollDirectionNone;
-}
-
-@end
-
-#endif
\ No newline at end of file
diff --git a/submodules/AsyncDisplayKit/Source/Details/ASDataController.h b/submodules/AsyncDisplayKit/Source/Details/ASDataController.h
deleted file mode 100644
index 5a03f24e23..0000000000
--- a/submodules/AsyncDisplayKit/Source/Details/ASDataController.h
+++ /dev/null
@@ -1,291 +0,0 @@
-//
-//  ASDataController.h
-//  Texture
-//
-//  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.
-//  Changes after 4/13/2017 are: Copyright (c) Pinterest, Inc.  All rights reserved.
-//  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
-//
-
-#ifndef MINIMAL_ASDK
-#pragma once
-
-#import <UIKit/UIKit.h>
-#import <AsyncDisplayKit/ASBlockTypes.h>
-#import <AsyncDisplayKit/ASDimension.h>
-#import <AsyncDisplayKit/ASEventLog.h>
-#ifdef __cplusplus
-#import <vector>
-#endif
-
-NS_ASSUME_NONNULL_BEGIN
-
-#if ASEVENTLOG_ENABLE
-#define ASDataControllerLogEvent(dataController, ...) [dataController.eventLog logEventWithBacktrace:(AS_SAVE_EVENT_BACKTRACES ? [NSThread callStackSymbols] : nil) format:__VA_ARGS__]
-#else
-#define ASDataControllerLogEvent(dataController, ...)
-#endif
-
-@class ASCellNode;
-@class ASCollectionElement;
-@class ASCollectionLayoutContext;
-@class ASCollectionLayoutState;
-@class ASDataController;
-@class ASElementMap;
-@class ASLayout;
-@class _ASHierarchyChangeSet;
-@protocol ASRangeManagingNode;
-@protocol ASTraitEnvironment;
-@protocol ASSectionContext;
-
-typedef NSUInteger ASDataControllerAnimationOptions;
-
-AS_EXTERN NSString * const ASDataControllerRowNodeKind;
-AS_EXTERN NSString * const ASCollectionInvalidUpdateException;
-
-/**
- Data source for data controller
- It will be invoked in the same thread as the api call of ASDataController.
- */
-
-@protocol ASDataControllerSource <NSObject>
-
-/**
- Fetch the ASCellNode block for specific index path. This block should return the ASCellNode for the specified index path.
- */
-- (ASCellNodeBlock)dataController:(ASDataController *)dataController nodeBlockAtIndexPath:(NSIndexPath *)indexPath shouldAsyncLayout:(BOOL *)shouldAsyncLayout;
-
-/**
- Fetch the number of rows in specific section.
- */
-- (NSUInteger)dataController:(ASDataController *)dataController rowsInSection:(NSUInteger)section;
-
-/**
- Fetch the number of sections.
- */
-- (NSUInteger)numberOfSectionsInDataController:(ASDataController *)dataController;
-
-/**
- Returns if the collection element size matches a given size.
- @precondition The element is present in the data controller's visible map.
- */
-- (BOOL)dataController:(ASDataController *)dataController presentedSizeForElement:(ASCollectionElement *)element matchesSize:(CGSize)size;
-
-- (nullable id)dataController:(ASDataController *)dataController nodeModelForItemAtIndexPath:(NSIndexPath *)indexPath;
-
-/**
- * Called just after dispatching ASCellNode allocation and layout to the concurrent background queue.
- * In some cases, for example on the first content load for a screen, it may be desirable to call
- * -waitUntilAllUpdatesAreProcessed at this point.
- *
- * Returning YES will cause the ASDataController to wait on the background queue, and this ensures
- * that any new / changed cells are in the hierarchy by the very next CATransaction / frame draw.
- */
-- (BOOL)dataController:(ASDataController *)dataController shouldSynchronouslyProcessChangeSet:(_ASHierarchyChangeSet *)changeSet;
-- (BOOL)dataController:(ASDataController *)dataController shouldEagerlyLayoutNode:(ASCellNode *)node;
-- (BOOL)dataControllerShouldSerializeNodeCreation:(ASDataController *)dataController;
-
-@optional
-
-/**
- The constrained size range for layout. Called only if collection layout delegate is not provided.
- */
-- (ASSizeRange)dataController:(ASDataController *)dataController constrainedSizeForNodeAtIndexPath:(NSIndexPath *)indexPath;
-
-- (NSArray<NSString *> *)dataController:(ASDataController *)dataController supplementaryNodeKindsInSections:(NSIndexSet *)sections;
-
-- (NSUInteger)dataController:(ASDataController *)dataController supplementaryNodesOfKind:(NSString *)kind inSection:(NSUInteger)section;
-
-- (ASCellNodeBlock)dataController:(ASDataController *)dataController supplementaryNodeBlockOfKind:(NSString *)kind atIndexPath:(NSIndexPath *)indexPath shouldAsyncLayout:(BOOL *)shouldAsyncLayout;
-
-/**
- The constrained size range for layout. Called only if no data controller layout delegate is provided.
- */
-- (ASSizeRange)dataController:(ASDataController *)dataController constrainedSizeForSupplementaryNodeOfKind:(NSString *)kind atIndexPath:(NSIndexPath *)indexPath;
-
-- (nullable id<ASSectionContext>)dataController:(ASDataController *)dataController contextForSection:(NSInteger)section;
-
-@end
-
-/**
- Delegate for notify the data updating of data controller.
- These methods will be invoked from main thread right now, but it may be moved to background thread in the future.
- */
-@protocol ASDataControllerDelegate <NSObject>
-
-/**
- * Called for change set updates.
- *
- * @param changeSet The change set that includes all updates
- *
- * @param updates The block that performs relevant data updates.
- *
- * @discussion The updates block must always be executed or the data controller will get into a bad state.
- * It should be called at the time the backing view is ready to process the updates,
- * i.e inside the updates block of `-[UICollectionView performBatchUpdates:completion:] or after calling `-[UITableView beginUpdates]`.
- */
-- (void)dataController:(ASDataController *)dataController updateWithChangeSet:(_ASHierarchyChangeSet *)changeSet updates:(dispatch_block_t)updates;
-
-@end
-
-@protocol ASDataControllerLayoutDelegate <NSObject>
-
-/**
- * @abstract Returns a layout context needed for a coming layout pass with the given elements.
- * The context should contain the elements and any additional information needed.
- *
- * @discussion This method will be called on main thread.
- */
-- (ASCollectionLayoutContext *)layoutContextWithElements:(ASElementMap *)elements;
-
-/**
- * @abstract Prepares and returns a new layout for given context.
- *
- * @param context A context that was previously returned by `-layoutContextWithElements:`.
- *
- * @return The new layout calculated for the given context.
- *
- * @discussion This method is called ahead of time, i.e before the underlying collection/table view is aware of the provided elements.
- * As a result, clients must solely rely on the given context and should not reach out to other objects for information not available in the context.
- *
- * This method will be called on background theads. It must be thread-safe and should not change any internal state of the conforming object.
- * It must block the calling thread but can dispatch to other theads to reduce total blocking time.
- */
-+ (ASCollectionLayoutState *)calculateLayoutWithContext:(ASCollectionLayoutContext *)context;
-
-@end
-
-/**
- * Controller to layout data in background, and managed data updating.
- *
- * All operations are asynchronous and thread safe. You can call it from background thread (it is recommendated) and the data
- * will be updated asynchronously. The dataSource must be updated to reflect the changes before these methods has been called.
- * For each data updating, the corresponding methods in delegate will be called.
- */
-@interface ASDataController : NSObject
-
-- (instancetype)initWithDataSource:(id<ASDataControllerSource>)dataSource node:(nullable id<ASRangeManagingNode>)node eventLog:(nullable ASEventLog *)eventLog NS_DESIGNATED_INITIALIZER;
-
-- (instancetype)init NS_UNAVAILABLE;
-
-/**
- * The node that owns this data controller, if any.
- *
- * NOTE: Soon we will drop support for using ASTableView/ASCollectionView without the node, so this will be non-null.
- */
-@property (nullable, nonatomic, weak, readonly) id<ASRangeManagingNode> node;
-
-/**
- * The map that is currently displayed. The "UIKit index space."
- *
- * This property will only be changed on the main thread.
- */
-@property (copy, readonly) ASElementMap *visibleMap;
-
-/**
- * The latest map fetched from the data source. May be more recent than @c visibleMap.
- *
- * This property will only be changed on the main thread.
- */
-@property (copy, readonly) ASElementMap *pendingMap;
-
-/**
- Data source for fetching data info.
- */
-@property (nonatomic, weak, readonly) id<ASDataControllerSource> dataSource;
-
-/**
- An object that will be included in the backtrace of any update validation exceptions that occur.
- */
-@property (nonatomic, weak) id validationErrorSource;
-
-/**
- Delegate to notify when data is updated.
- */
-@property (nonatomic, weak) id<ASDataControllerDelegate> delegate;
-
-/**
- * Delegate for preparing layouts. Main thead only.
- */
-@property (nonatomic, weak) id<ASDataControllerLayoutDelegate> layoutDelegate;
-
-#ifdef __cplusplus
-/**
- * Returns the most recently gathered item counts from the data source. If the counts
- * have been invalidated, this synchronously queries the data source and saves the result.
- *
- * This must be called on the main thread.
- */
-- (std::vector<NSInteger>)itemCountsFromDataSource;
-#endif
-
-/**
- * Returns YES if reloadData has been called at least once. Before this point it is
- * important to ignore/suppress some operations. For example, inserting a section
- * before the initial data load should have no effect.
- *
- * This must be called on the main thread.
- */
-@property (nonatomic, readonly) BOOL initialReloadDataHasBeenCalled;
-
-#if ASEVENTLOG_ENABLE
-/*
- * @abstract The primitive event tracing object. You shouldn't directly use it to log event. Use the ASDataControllerLogEvent macro instead.
- */
-@property (nonatomic, readonly) ASEventLog *eventLog;
-#endif
-
-/** @name Data Updating */
-
-- (void)updateWithChangeSet:(_ASHierarchyChangeSet *)changeSet;
-
-/**
- * Re-measures all loaded nodes in the backing store.
- * 
- * @discussion Used to respond to a change in size of the containing view
- * (e.g. ASTableView or ASCollectionView after an orientation change).
- *
- * The invalidationBlock is called after flushing the ASMainSerialQueue, which ensures that any in-progress
- * layout calculations have been applied. The block will not be called if data hasn't been loaded.
- */
-- (void)relayoutAllNodesWithInvalidationBlock:(nullable void (^)(void))invalidationBlock;
-
-/**
- * Re-measures given nodes in the backing store.
- *
- * @discussion Used to respond to setNeedsLayout calls in ASCellNode
- */
-- (void)relayoutNodes:(id<NSFastEnumeration>)nodes nodesSizeChanged:(NSMutableArray<ASCellNode *> *)nodesSizesChanged;
-
-/**
- * See ASCollectionNode.h for full documentation of these methods.
- */
-@property (nonatomic, readonly) BOOL isProcessingUpdates;
-- (void)onDidFinishProcessingUpdates:(void (^)(void))completion;
-- (void)waitUntilAllUpdatesAreProcessed;
-
-/**
- * See ASCollectionNode.h for full documentation of these methods.
- */
-@property (nonatomic, readonly, getter=isSynchronized) BOOL synchronized;
-- (void)onDidFinishSynchronizing:(void (^)(void))completion;
-
-/**
- * Notifies the data controller object that its environment has changed. The object will request its environment delegate for new information
- * and propagate the information to all visible elements, including ones that are being prepared in background.
- *
- * @discussion If called before the initial @c reloadData, this method will do nothing and the trait collection of the initial load will be requested from the environment delegate.
- *
- * @discussion This method can be called on any threads.
- */
-- (void)environmentDidChange;
-
-/**
- * Reset visibleMap and pendingMap when asyncDataSource and asyncDelegate of collection view become nil.
- */
-- (void)clearData;
-
-@end
-
-NS_ASSUME_NONNULL_END
-#endif
diff --git a/submodules/AsyncDisplayKit/Source/Details/ASDataController.mm b/submodules/AsyncDisplayKit/Source/Details/ASDataController.mm
deleted file mode 100644
index a842e76c44..0000000000
--- a/submodules/AsyncDisplayKit/Source/Details/ASDataController.mm
+++ /dev/null
@@ -1,958 +0,0 @@
-//
-//  ASDataController.mm
-//  Texture
-//
-//  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.
-//  Changes after 4/13/2017 are: Copyright (c) Pinterest, Inc.  All rights reserved.
-//  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
-//
-
-#ifndef MINIMAL_ASDK
-
-#import <AsyncDisplayKit/ASDataController.h>
-
-#include <atomic>
-
-#import <AsyncDisplayKit/_ASHierarchyChangeSet.h>
-#import <AsyncDisplayKit/_ASScopeTimer.h>
-#import <AsyncDisplayKit/ASAssert.h>
-#import <AsyncDisplayKit/ASCellNode.h>
-#import <AsyncDisplayKit/ASCollectionElement.h>
-#import <AsyncDisplayKit/ASCollectionLayoutContext.h>
-#import <AsyncDisplayKit/ASCollectionLayoutState.h>
-#import <AsyncDisplayKit/ASDispatch.h>
-#import <AsyncDisplayKit/ASDisplayNodeExtras.h>
-#import <AsyncDisplayKit/ASElementMap.h>
-#import <AsyncDisplayKit/ASLayout.h>
-#import <AsyncDisplayKit/ASLog.h>
-#import <AsyncDisplayKit/ASSignpost.h>
-#import <AsyncDisplayKit/ASMainSerialQueue.h>
-#import <AsyncDisplayKit/ASMutableElementMap.h>
-#import <AsyncDisplayKit/ASRangeManagingNode.h>
-#import <AsyncDisplayKit/ASThread.h>
-#import <AsyncDisplayKit/ASTwoDimensionalArrayUtils.h>
-#import <AsyncDisplayKit/ASSection.h>
-
-#import <AsyncDisplayKit/ASInternalHelpers.h>
-#import <AsyncDisplayKit/ASCellNode+Internal.h>
-#import <AsyncDisplayKit/ASDisplayNode+Subclasses.h>
-#import <AsyncDisplayKit/NSIndexSet+ASHelpers.h>
-
-//#define LOG(...) NSLog(__VA_ARGS__)
-#define LOG(...)
-
-#define ASSERT_ON_EDITING_QUEUE ASDisplayNodeAssertNotNil(dispatch_get_specific(&kASDataControllerEditingQueueKey), @"%@ must be called on the editing transaction queue.", NSStringFromSelector(_cmd))
-
-const static char * kASDataControllerEditingQueueKey = "kASDataControllerEditingQueueKey";
-const static char * kASDataControllerEditingQueueContext = "kASDataControllerEditingQueueContext";
-
-NSString * const ASDataControllerRowNodeKind = @"_ASDataControllerRowNodeKind";
-NSString * const ASCollectionInvalidUpdateException = @"ASCollectionInvalidUpdateException";
-
-typedef dispatch_block_t ASDataControllerCompletionBlock;
-
-typedef void (^ASDataControllerSynchronizationBlock)();
-
-@interface ASDataController () {
-  id<ASDataControllerLayoutDelegate> _layoutDelegate;
-
-  NSInteger _nextSectionID;
-  
-  BOOL _itemCountsFromDataSourceAreValid;     // Main thread only.
-  std::vector<NSInteger> _itemCountsFromDataSource;         // Main thread only.
-  
-  ASMainSerialQueue *_mainSerialQueue;
-
-  dispatch_queue_t _editingTransactionQueue;  // Serial background queue.  Dispatches concurrent layout and manages _editingNodes.
-  dispatch_group_t _editingTransactionGroup;  // Group of all edit transaction blocks. Useful for waiting.
-  std::atomic<int> _editingTransactionGroupCount;
-  
-  BOOL _initialReloadDataHasBeenCalled;
-
-  BOOL _synchronized;
-  NSMutableSet<ASDataControllerSynchronizationBlock> *_onDidFinishSynchronizingBlocks;
-
-  struct {
-    unsigned int supplementaryNodeKindsInSections:1;
-    unsigned int supplementaryNodesOfKindInSection:1;
-    unsigned int supplementaryNodeBlockOfKindAtIndexPath:1;
-    unsigned int constrainedSizeForNodeAtIndexPath:1;
-    unsigned int constrainedSizeForSupplementaryNodeOfKindAtIndexPath:1;
-    unsigned int contextForSection:1;
-  } _dataSourceFlags;
-}
-
-@property (copy) ASElementMap *pendingMap;
-@property (copy) ASElementMap *visibleMap;
-@end
-
-@implementation ASDataController
-
-#pragma mark - Lifecycle
-
-- (instancetype)initWithDataSource:(id<ASDataControllerSource>)dataSource node:(nullable id<ASRangeManagingNode>)node eventLog:(ASEventLog *)eventLog
-{
-  if (!(self = [super init])) {
-    return nil;
-  }
-  
-  _node = node;
-  _dataSource = dataSource;
-  
-  _dataSourceFlags.supplementaryNodeKindsInSections = [_dataSource respondsToSelector:@selector(dataController:supplementaryNodeKindsInSections:)];
-  _dataSourceFlags.supplementaryNodesOfKindInSection = [_dataSource respondsToSelector:@selector(dataController:supplementaryNodesOfKind:inSection:)];
-  _dataSourceFlags.supplementaryNodeBlockOfKindAtIndexPath = [_dataSource respondsToSelector:@selector(dataController:supplementaryNodeBlockOfKind:atIndexPath:shouldAsyncLayout:)];
-  _dataSourceFlags.constrainedSizeForNodeAtIndexPath = [_dataSource respondsToSelector:@selector(dataController:constrainedSizeForNodeAtIndexPath:)];
-  _dataSourceFlags.constrainedSizeForSupplementaryNodeOfKindAtIndexPath = [_dataSource respondsToSelector:@selector(dataController:constrainedSizeForSupplementaryNodeOfKind:atIndexPath:)];
-  _dataSourceFlags.contextForSection = [_dataSource respondsToSelector:@selector(dataController:contextForSection:)];
-  
-#if ASEVENTLOG_ENABLE
-  _eventLog = eventLog;
-#endif
-
-  self.visibleMap = self.pendingMap = [[ASElementMap alloc] init];
-  
-  _nextSectionID = 0;
-  
-  _mainSerialQueue = [[ASMainSerialQueue alloc] init];
-
-  _synchronized = YES;
-  _onDidFinishSynchronizingBlocks = [[NSMutableSet alloc] init];
-  
-  const char *queueName = [[NSString stringWithFormat:@"org.AsyncDisplayKit.ASDataController.editingTransactionQueue:%p", self] cStringUsingEncoding:NSASCIIStringEncoding];
-  _editingTransactionQueue = dispatch_queue_create(queueName, DISPATCH_QUEUE_SERIAL);
-  dispatch_queue_set_specific(_editingTransactionQueue, &kASDataControllerEditingQueueKey, &kASDataControllerEditingQueueContext, NULL);
-  _editingTransactionGroup = dispatch_group_create();
-  
-  return self;
-}
-
-- (id<ASDataControllerLayoutDelegate>)layoutDelegate
-{
-  ASDisplayNodeAssertMainThread();
-  return _layoutDelegate;
-}
-
-- (void)setLayoutDelegate:(id<ASDataControllerLayoutDelegate>)layoutDelegate
-{
-  ASDisplayNodeAssertMainThread();
-  if (layoutDelegate != _layoutDelegate) {
-    _layoutDelegate = layoutDelegate;
-  }
-}
-
-#pragma mark - Cell Layout
-
-- (void)_allocateNodesFromElements:(NSArray<ASCollectionElement *> *)elements
-{
-  ASSERT_ON_EDITING_QUEUE;
-  
-  NSUInteger nodeCount = elements.count;
-  __weak id<ASDataControllerSource> weakDataSource = _dataSource;
-  if (nodeCount == 0 || weakDataSource == nil) {
-    return;
-  }
-
-  ASSignpostStart(ASSignpostDataControllerBatch);
-
-  {
-    as_activity_create_for_scope("Data controller batch");
-
-    dispatch_queue_t queue = dispatch_get_global_queue(QOS_CLASS_USER_INITIATED, 0);
-    NSUInteger threadCount = 0;
-    if ([_dataSource dataControllerShouldSerializeNodeCreation:self]) {
-      threadCount = 1;
-    }
-    ASDispatchApply(nodeCount, queue, threadCount, ^(size_t i) {
-      __strong id<ASDataControllerSource> strongDataSource = weakDataSource;
-      if (strongDataSource == nil) {
-        return;
-      }
-
-      unowned ASCollectionElement *element = elements[i];
-
-      NSMutableDictionary *dict = [[NSThread currentThread] threadDictionary];
-      dict[ASThreadDictMaxConstraintSizeKey] =
-          [NSValue valueWithCGSize:element.constrainedSize.max];
-      unowned ASCellNode *node = element.node;
-      [dict removeObjectForKey:ASThreadDictMaxConstraintSizeKey];
-
-      // Layout the node if the size range is valid.
-      ASSizeRange sizeRange = element.constrainedSize;
-      if (ASSizeRangeHasSignificantArea(sizeRange)) {
-        [self _layoutNode:node withConstrainedSize:sizeRange];
-      }
-    });
-  }
-
-  ASSignpostEndCustom(ASSignpostDataControllerBatch, self, 0, (weakDataSource != nil ? ASSignpostColorDefault : ASSignpostColorRed));
-}
-
-/**
- * Measure and layout the given node with the constrained size range.
- */
-- (void)_layoutNode:(ASCellNode *)node withConstrainedSize:(ASSizeRange)constrainedSize
-{
-  if (![_dataSource dataController:self shouldEagerlyLayoutNode:node]) {
-    return;
-  }
-  
-  ASDisplayNodeAssert(ASSizeRangeHasSignificantArea(constrainedSize), @"Attempt to layout cell node with invalid size range %@", NSStringFromASSizeRange(constrainedSize));
-
-  CGRect frame = CGRectZero;
-  frame.size = [node layoutThatFits:constrainedSize].size;
-  node.frame = frame;
-}
-
-#pragma mark - Data Source Access (Calling _dataSource)
-
-- (NSArray<NSIndexPath *> *)_allIndexPathsForItemsOfKind:(NSString *)kind inSections:(NSIndexSet *)sections
-{
-  ASDisplayNodeAssertMainThread();
-  
-  if (sections.count == 0 || _dataSource == nil) {
-    return @[];
-  }
-  
-  const auto indexPaths = [[NSMutableArray<NSIndexPath *> alloc] init];
-  if ([kind isEqualToString:ASDataControllerRowNodeKind]) {
-    std::vector<NSInteger> counts = [self itemCountsFromDataSource];
-    [sections enumerateRangesUsingBlock:^(NSRange range, BOOL * _Nonnull stop) {
-      for (NSUInteger sectionIndex = range.location; sectionIndex < NSMaxRange(range); sectionIndex++) {
-        NSUInteger itemCount = counts[sectionIndex];
-        for (NSUInteger i = 0; i < itemCount; i++) {
-          [indexPaths addObject:[NSIndexPath indexPathForItem:i inSection:sectionIndex]];
-        }
-      }
-    }];
-  } else if (_dataSourceFlags.supplementaryNodesOfKindInSection) {
-    id<ASDataControllerSource> dataSource = _dataSource;
-    [sections enumerateRangesUsingBlock:^(NSRange range, BOOL * _Nonnull stop) {
-      for (NSUInteger sectionIndex = range.location; sectionIndex < NSMaxRange(range); sectionIndex++) {
-        NSUInteger itemCount = [dataSource dataController:self supplementaryNodesOfKind:kind inSection:sectionIndex];
-        for (NSUInteger i = 0; i < itemCount; i++) {
-          [indexPaths addObject:[NSIndexPath indexPathForItem:i inSection:sectionIndex]];
-        }
-      }
-    }];
-  }
-  
-  return indexPaths;
-}
-
-/**
- * Agressively repopulates supplementary nodes of all kinds for sections that contains some given index paths.
- *
- * @param map The element map into which to apply the change.
- * @param indexPaths The index paths belongs to sections whose supplementary nodes need to be repopulated.
- * @param changeSet The changeset that triggered this repopulation.
- * @param traitCollection The trait collection needed to initialize elements
- * @param indexPathsAreNew YES if index paths are "after the update," NO otherwise.
- * @param shouldFetchSizeRanges Whether constrained sizes should be fetched from data source
- */
-- (void)_repopulateSupplementaryNodesIntoMap:(ASMutableElementMap *)map
-             forSectionsContainingIndexPaths:(NSArray<NSIndexPath *> *)indexPaths
-                                   changeSet:(_ASHierarchyChangeSet *)changeSet
-                             traitCollection:(ASPrimitiveTraitCollection)traitCollection
-                            indexPathsAreNew:(BOOL)indexPathsAreNew
-                       shouldFetchSizeRanges:(BOOL)shouldFetchSizeRanges
-                                 previousMap:(ASElementMap *)previousMap
-{
-  ASDisplayNodeAssertMainThread();
-
-  if (indexPaths.count ==  0) {
-    return;
-  }
-
-  // Remove all old supplementaries from these sections
-  NSIndexSet *oldSections = [NSIndexSet as_sectionsFromIndexPaths:indexPaths];
-
-  // Add in new ones with the new kinds.
-  NSIndexSet *newSections;
-  if (indexPathsAreNew) {
-    newSections = oldSections;
-  } else {
-    newSections = [oldSections as_indexesByMapping:^NSUInteger(NSUInteger oldSection) {
-      return [changeSet newSectionForOldSection:oldSection];
-    }];
-  }
-
-  for (NSString *kind in [self supplementaryKindsInSections:newSections]) {
-    [self _insertElementsIntoMap:map kind:kind forSections:newSections traitCollection:traitCollection shouldFetchSizeRanges:shouldFetchSizeRanges changeSet:changeSet previousMap:previousMap];
-  }
-}
-
-/**
- * Update supplementary nodes of all kinds for sections.
- *
- * @param map The element map into which to apply the change.
- * @param traitCollection The trait collection needed to initialize elements
- * @param shouldFetchSizeRanges Whether constrained sizes should be fetched from data source
- */
-- (void)_updateSupplementaryNodesIntoMap:(ASMutableElementMap *)map
-                         traitCollection:(ASPrimitiveTraitCollection)traitCollection
-                   shouldFetchSizeRanges:(BOOL)shouldFetchSizeRanges
-                             previousMap:(ASElementMap *)previousMap
-{
-  ASDisplayNodeAssertMainThread();
-  if (self.layoutDelegate != nil) {
-    // TODO: https://github.com/TextureGroup/Texture/issues/948
-    return;
-  }
-  NSUInteger sectionCount = [self itemCountsFromDataSource].size();
-  if (sectionCount > 0) {
-    NSIndexSet *sectionIndexes = [NSIndexSet indexSetWithIndexesInRange:NSMakeRange(0, sectionCount)];
-    ASSizeRange newSizeRange = ASSizeRangeZero;
-    for (NSString *kind in [self supplementaryKindsInSections:sectionIndexes]) {
-      NSArray<NSIndexPath *> *indexPaths = [self _allIndexPathsForItemsOfKind:kind inSections:sectionIndexes];
-      NSMutableArray<NSIndexPath *> *indexPathsToDeleteForKind = [[NSMutableArray alloc] init];
-      NSMutableArray<NSIndexPath *> *indexPathsToInsertForKind = [[NSMutableArray alloc] init];
-      // If supplementary node does exist and size is now zero, remove it.
-      // If supplementary node doesn't exist and size is now non-zero, insert one.
-      for (NSIndexPath *indexPath in indexPaths) {
-        ASCollectionElement *previousElement = [previousMap supplementaryElementOfKind:kind atIndexPath:indexPath];
-        newSizeRange = [self constrainedSizeForNodeOfKind:kind atIndexPath:indexPath];
-        BOOL sizeRangeIsZero = ASSizeRangeEqualToSizeRange(ASSizeRangeZero, newSizeRange);
-        if (previousElement != nil && sizeRangeIsZero) {
-          [indexPathsToDeleteForKind addObject:indexPath];
-        } else if (previousElement == nil && !sizeRangeIsZero) {
-          [indexPathsToInsertForKind addObject:indexPath];
-        }
-      }
-
-      [map removeSupplementaryElementsAtIndexPaths:indexPathsToDeleteForKind kind:kind];
-      [self _insertElementsIntoMap:map kind:kind atIndexPaths:indexPathsToInsertForKind traitCollection:traitCollection shouldFetchSizeRanges:shouldFetchSizeRanges changeSet:nil previousMap:previousMap];
-    }
-  }
-}
-
-/**
- * Inserts new elements of a certain kind for some sections
- *
- * @param kind The kind of the elements, e.g ASDataControllerRowNodeKind
- * @param sections The sections that should be populated by new elements
- * @param traitCollection The trait collection needed to initialize elements
- * @param shouldFetchSizeRanges Whether constrained sizes should be fetched from data source
- */
-- (void)_insertElementsIntoMap:(ASMutableElementMap *)map
-                          kind:(NSString *)kind
-                   forSections:(NSIndexSet *)sections
-               traitCollection:(ASPrimitiveTraitCollection)traitCollection
-         shouldFetchSizeRanges:(BOOL)shouldFetchSizeRanges
-                     changeSet:(_ASHierarchyChangeSet *)changeSet
-                   previousMap:(ASElementMap *)previousMap
-{
-  ASDisplayNodeAssertMainThread();
-  
-  if (sections.count == 0 || _dataSource == nil) {
-    return;
-  }
-  
-  NSArray<NSIndexPath *> *indexPaths = [self _allIndexPathsForItemsOfKind:kind inSections:sections];
-  [self _insertElementsIntoMap:map kind:kind atIndexPaths:indexPaths traitCollection:traitCollection shouldFetchSizeRanges:shouldFetchSizeRanges changeSet:changeSet previousMap:previousMap];
-}
-
-/**
- * Inserts new elements of a certain kind at some index paths
- *
- * @param map The map to insert the elements into.
- * @param kind The kind of the elements, e.g ASDataControllerRowNodeKind
- * @param indexPaths The index paths at which new elements should be populated
- * @param traitCollection The trait collection needed to initialize elements
- * @param shouldFetchSizeRanges Whether constrained sizes should be fetched from data source
- */
-- (void)_insertElementsIntoMap:(ASMutableElementMap *)map
-                          kind:(NSString *)kind
-                  atIndexPaths:(NSArray<NSIndexPath *> *)indexPaths
-               traitCollection:(ASPrimitiveTraitCollection)traitCollection
-         shouldFetchSizeRanges:(BOOL)shouldFetchSizeRanges
-                     changeSet:(_ASHierarchyChangeSet *)changeSet
-                   previousMap:(ASElementMap *)previousMap
-{
-  ASDisplayNodeAssertMainThread();
-  
-  if (indexPaths.count == 0 || _dataSource == nil) {
-    return;
-  }
-  
-  BOOL isRowKind = [kind isEqualToString:ASDataControllerRowNodeKind];
-  if (!isRowKind && !_dataSourceFlags.supplementaryNodeBlockOfKindAtIndexPath) {
-    // Populating supplementary elements but data source doesn't support.
-    return;
-  }
-  
-  LOG(@"Populating elements of kind: %@, for index paths: %@", kind, indexPaths);
-  id<ASDataControllerSource> dataSource = self.dataSource;
-  id<ASRangeManagingNode> node = self.node;
-  BOOL shouldAsyncLayout = YES;
-  for (NSIndexPath *indexPath in indexPaths) {
-    ASCellNodeBlock nodeBlock;
-    id nodeModel;
-    if (isRowKind) {
-      nodeModel = [dataSource dataController:self nodeModelForItemAtIndexPath:indexPath];
-      
-      // Get the prior element and attempt to update the existing cell node.
-      if (nodeModel != nil && !changeSet.includesReloadData) {
-        NSIndexPath *oldIndexPath = [changeSet oldIndexPathForNewIndexPath:indexPath];
-        if (oldIndexPath != nil) {
-          ASCollectionElement *oldElement = [previousMap elementForItemAtIndexPath:oldIndexPath];
-          ASCellNode *oldNode = oldElement.node;
-          if ([oldNode canUpdateToNodeModel:nodeModel]) {
-            // Just wrap the node in a block. The collection element will -setNodeModel:
-            nodeBlock = ^{
-              return oldNode;
-            };
-          }
-        }
-      }
-      if (nodeBlock == nil) {
-        nodeBlock = [dataSource dataController:self nodeBlockAtIndexPath:indexPath shouldAsyncLayout:&shouldAsyncLayout];
-      }
-    } else {
-      nodeBlock = [dataSource dataController:self supplementaryNodeBlockOfKind:kind atIndexPath:indexPath shouldAsyncLayout:&shouldAsyncLayout];
-    }
-
-    ASSizeRange constrainedSize = ASSizeRangeUnconstrained;
-    if (shouldFetchSizeRanges) {
-      constrainedSize = [self constrainedSizeForNodeOfKind:kind atIndexPath:indexPath];
-    }
-    
-    ASCollectionElement *element = [[ASCollectionElement alloc] initWithNodeModel:nodeModel
-                                                                        nodeBlock:nodeBlock
-                                                         supplementaryElementKind:isRowKind ? nil : kind
-                                                                  constrainedSize:constrainedSize
-                                                                       owningNode:node
-                                                                  traitCollection:traitCollection];
-    [map insertElement:element atIndexPath:indexPath];
-    changeSet.countForAsyncLayout += (shouldAsyncLayout ? 1 : 0);
-  }
-}
-
-- (void)invalidateDataSourceItemCounts
-{
-  ASDisplayNodeAssertMainThread();
-  _itemCountsFromDataSourceAreValid = NO;
-}
-
-- (std::vector<NSInteger>)itemCountsFromDataSource
-{
-  ASDisplayNodeAssertMainThread();
-  if (NO == _itemCountsFromDataSourceAreValid) {
-    id<ASDataControllerSource> source = self.dataSource;
-    NSInteger sectionCount = [source numberOfSectionsInDataController:self];
-    std::vector<NSInteger> newCounts;
-    newCounts.reserve(sectionCount);
-    for (NSInteger i = 0; i < sectionCount; i++) {
-      newCounts.push_back([source dataController:self rowsInSection:i]);
-    }
-    _itemCountsFromDataSource = newCounts;
-    _itemCountsFromDataSourceAreValid = YES;
-  }
-  return _itemCountsFromDataSource;
-}
-
-- (NSArray<NSString *> *)supplementaryKindsInSections:(NSIndexSet *)sections
-{
-  if (_dataSourceFlags.supplementaryNodeKindsInSections) {
-    return [_dataSource dataController:self supplementaryNodeKindsInSections:sections];
-  }
-  
-  return @[];
-}
-
-/**
- * Returns constrained size for the node of the given kind and at the given index path.
- * NOTE: index path must be in the data-source index space.
- */
-- (ASSizeRange)constrainedSizeForNodeOfKind:(NSString *)kind atIndexPath:(NSIndexPath *)indexPath
-{
-  ASDisplayNodeAssertMainThread();
-  
-  id<ASDataControllerSource> dataSource = _dataSource;
-  if (dataSource == nil || indexPath == nil) {
-    return ASSizeRangeZero;
-  }
-  
-  if ([kind isEqualToString:ASDataControllerRowNodeKind]) {
-    ASDisplayNodeAssert(_dataSourceFlags.constrainedSizeForNodeAtIndexPath, @"-dataController:constrainedSizeForNodeAtIndexPath: must also be implemented");
-    return [dataSource dataController:self constrainedSizeForNodeAtIndexPath:indexPath];
-  }
-  
-  if (_dataSourceFlags.constrainedSizeForSupplementaryNodeOfKindAtIndexPath){
-    return [dataSource dataController:self constrainedSizeForSupplementaryNodeOfKind:kind atIndexPath:indexPath];
-  }
-  
-  ASDisplayNodeAssert(NO, @"Unknown constrained size for node of kind %@ by data source %@", kind, dataSource);
-  return ASSizeRangeZero;
-}
-
-#pragma mark - Batching (External API)
-
-- (void)waitUntilAllUpdatesAreProcessed
-{
-  // Schedule block in main serial queue to wait until all operations are finished that are
-  // where scheduled while waiting for the _editingTransactionQueue to finish
-  [self _scheduleBlockOnMainSerialQueue:^{ }];
-}
-
-- (BOOL)isProcessingUpdates
-{
-  ASDisplayNodeAssertMainThread();
-  return _mainSerialQueue.numberOfScheduledBlocks > 0 || _editingTransactionGroupCount > 0;
-}
-
-- (void)onDidFinishProcessingUpdates:(void (^)())completion
-{
-  ASDisplayNodeAssertMainThread();
-  if (!completion) {
-    return;
-  }
-  if ([self isProcessingUpdates] == NO) {
-    ASPerformBlockOnMainThread(completion);
-  } else {
-    dispatch_async(_editingTransactionQueue, ^{
-      // Retry the block. If we're done processing updates, it'll run immediately, otherwise
-      // wait again for updates to quiesce completely.
-      // Don't use _mainSerialQueue so that we don't affect -isProcessingUpdates.
-      dispatch_async(dispatch_get_main_queue(), ^{
-        [self onDidFinishProcessingUpdates:completion];
-      });
-    });
-  }
-}
-
-- (BOOL)isSynchronized {
-  return _synchronized;
-}
-
-- (void)onDidFinishSynchronizing:(void (^)())completion {
-  ASDisplayNodeAssertMainThread();
-  if (!completion) {
-    return;
-  }
-  if ([self isSynchronized]) {
-    ASPerformBlockOnMainThread(completion);
-  } else {
-    // Hang on to the completion block so that it gets called the next time view is synchronized to data.
-    [_onDidFinishSynchronizingBlocks addObject:[completion copy]];
-  }
-}
-
-- (void)updateWithChangeSet:(_ASHierarchyChangeSet *)changeSet
-{
-  ASDisplayNodeAssertMainThread();
-
-  _synchronized = NO;
-
-  [changeSet addCompletionHandler:^(BOOL finished) {
-    _synchronized = YES;
-    [self onDidFinishProcessingUpdates:^{
-      if (_synchronized) {
-        for (ASDataControllerSynchronizationBlock block in _onDidFinishSynchronizingBlocks) {
-          block();
-        }
-        [_onDidFinishSynchronizingBlocks removeAllObjects];
-      }
-    }];
-  }];
-  
-  if (changeSet.includesReloadData) {
-    if (_initialReloadDataHasBeenCalled) {
-      as_log_debug(ASCollectionLog(), "reloadData %@", ASViewToDisplayNode(ASDynamicCast(self.dataSource, UIView)));
-    } else {
-      as_log_debug(ASCollectionLog(), "Initial reloadData %@", ASViewToDisplayNode(ASDynamicCast(self.dataSource, UIView)));
-      _initialReloadDataHasBeenCalled = YES;
-    }
-  } else {
-    as_log_debug(ASCollectionLog(), "performBatchUpdates %@ %@", ASViewToDisplayNode(ASDynamicCast(self.dataSource, UIView)), changeSet);
-  }
-  
-  NSTimeInterval transactionQueueFlushDuration = 0.0f;
-  {
-    AS::ScopeTimer t(transactionQueueFlushDuration);
-    dispatch_group_wait(_editingTransactionGroup, DISPATCH_TIME_FOREVER);
-  }
-  
-  // If the initial reloadData has not been called, just bail because we don't have our old data source counts.
-  // See ASUICollectionViewTests.testThatIssuingAnUpdateBeforeInitialReloadIsUnacceptable
-  // for the issue that UICollectionView has that we're choosing to workaround.
-  if (!_initialReloadDataHasBeenCalled) {
-    as_log_debug(ASCollectionLog(), "%@ Skipped update because load hasn't happened.", ASObjectDescriptionMakeTiny(_dataSource));
-    [changeSet executeCompletionHandlerWithFinished:YES];
-    return;
-  }
-  
-  [self invalidateDataSourceItemCounts];
-  
-  // Log events
-#if ASEVENTLOG_ENABLE
-  ASDataControllerLogEvent(self, @"updateWithChangeSet waited on previous update for %fms. changeSet: %@",
-                           transactionQueueFlushDuration * 1000.0f, changeSet);
-  NSTimeInterval changeSetStartTime = CACurrentMediaTime();
-  NSString *changeSetDescription = ASObjectDescriptionMakeTiny(changeSet);
-  [changeSet addCompletionHandler:^(BOOL finished) {
-    ASDataControllerLogEvent(self, @"finishedUpdate in %fms: %@",
-                             (CACurrentMediaTime() - changeSetStartTime) * 1000.0f, changeSetDescription);
-  }];
-#endif
-  
-  // Attempt to mark the update completed. This is when update validation will occur inside the changeset.
-  // If an invalid update exception is thrown, we catch it and inject our "validationErrorSource" object,
-  // which is the table/collection node's data source, into the exception reason to help debugging.
-  @try {
-    [changeSet markCompletedWithNewItemCounts:[self itemCountsFromDataSource]];
-  } @catch (NSException *e) {
-    id responsibleDataSource = self.validationErrorSource;
-    if (e.name == ASCollectionInvalidUpdateException && responsibleDataSource != nil) {
-      [NSException raise:ASCollectionInvalidUpdateException format:@"%@: %@", [responsibleDataSource class], e.reason];
-    } else {
-      @throw e;
-    }
-  }
-
-  BOOL canDelegate = (self.layoutDelegate != nil);
-  ASElementMap *newMap;
-  ASCollectionLayoutContext *layoutContext;
-  {
-    as_activity_scope(as_activity_create("Latch new data for collection update", changeSet.rootActivity, OS_ACTIVITY_FLAG_DEFAULT));
-
-    // Step 1: Populate a new map that reflects the data source's state and use it as pendingMap
-    ASElementMap *previousMap = self.pendingMap;
-    if (changeSet.isEmpty) {
-      // If the change set is empty, nothing has changed so we can just reuse the previous map
-      newMap = previousMap;
-    } else {
-      // Mutable copy of current data.
-      ASMutableElementMap *mutableMap = [previousMap mutableCopy];
-
-      // Step 1.1: Update the mutable copies to match the data source's state
-      [self _updateSectionsInMap:mutableMap changeSet:changeSet];
-      ASPrimitiveTraitCollection existingTraitCollection = [self.node primitiveTraitCollection];
-      [self _updateElementsInMap:mutableMap changeSet:changeSet traitCollection:existingTraitCollection shouldFetchSizeRanges:(! canDelegate) previousMap:previousMap];
-
-      // Step 1.2: Clone the new data
-      newMap = [mutableMap copy];
-    }
-    self.pendingMap = newMap;
-
-    // Step 2: Ask layout delegate for contexts
-    if (canDelegate) {
-      layoutContext = [self.layoutDelegate layoutContextWithElements:newMap];
-    }
-  }
-
-  as_log_debug(ASCollectionLog(), "New content: %@", newMap.smallDescription);
-
-  Class<ASDataControllerLayoutDelegate> layoutDelegateClass = [self.layoutDelegate class];
-  ++_editingTransactionGroupCount;
-  dispatch_group_async(_editingTransactionGroup, _editingTransactionQueue, ^{
-    __block __unused os_activity_scope_state_s preparationScope = {}; // unused if deployment target < iOS10
-    as_activity_scope_enter(as_activity_create("Prepare nodes for collection update", AS_ACTIVITY_CURRENT, OS_ACTIVITY_FLAG_DEFAULT), &preparationScope);
-
-    // Step 3: Call the layout delegate if possible. Otherwise, allocate and layout all elements
-    if (canDelegate) {
-      [layoutDelegateClass calculateLayoutWithContext:layoutContext];
-    } else {
-      const auto elementsToProcess = [[NSMutableArray<ASCollectionElement *> alloc] init];
-      for (ASCollectionElement *element in newMap) {
-        ASCellNode *nodeIfAllocated = element.nodeIfAllocated;
-        if (nodeIfAllocated.shouldUseUIKitCell) {
-          // If the node exists and we know it is a passthrough cell, we know it will never have a .calculatedLayout.
-          continue;
-        } else if (nodeIfAllocated.calculatedLayout == nil) {
-          // If the node hasn't been allocated, or it doesn't have a valid layout, let's process it.
-          [elementsToProcess addObject:element];
-        }
-      }
-      [self _allocateNodesFromElements:elementsToProcess];
-    }
-
-    // Step 4: Inform the delegate on main thread
-    [_mainSerialQueue performBlockOnMainThread:^{
-      as_activity_scope_leave(&preparationScope);
-      [_delegate dataController:self updateWithChangeSet:changeSet updates:^{
-        // Step 5: Deploy the new data as "completed"
-        //
-        // Note that since the backing collection view might be busy responding to user events (e.g scrolling),
-        // it will not consume the batch update blocks immediately.
-        // As a result, in a short intermidate time, the view will still be relying on the old data source state.
-        // Thus, we can't just swap the new map immediately before step 4, but until this update block is executed.
-        // (https://github.com/TextureGroup/Texture/issues/378)
-        self.visibleMap = newMap;
-      }];
-    }];
-    --_editingTransactionGroupCount;
-  });
-
-  // We've now dispatched node allocation and layout to a concurrent background queue.
-  // In some cases, it's advantageous to prevent the main thread from returning, to ensure the next
-  // frame displayed to the user has the view updates in place. Doing this does slightly reduce
-  // total latency, by donating the main thread's priority to the background threads. As such, the
-  // two cases where it makes sense to block:
-  // 1. There is very little work to be performed in the background (UIKit passthrough)
-  // 2. There is a higher priority on display latency than smoothness, e.g. app startup.
-  if ([_dataSource dataController:self shouldSynchronouslyProcessChangeSet:changeSet]) {
-    [self waitUntilAllUpdatesAreProcessed];
-  }
-}
-
-/**
- * Update sections based on the given change set.
- */
-- (void)_updateSectionsInMap:(ASMutableElementMap *)map changeSet:(_ASHierarchyChangeSet *)changeSet
-{
-  ASDisplayNodeAssertMainThread();
-  
-  if (changeSet.includesReloadData) {
-    [map removeAllSections];
-    
-    NSUInteger sectionCount = [self itemCountsFromDataSource].size();
-    NSIndexSet *sectionIndexes = [NSIndexSet indexSetWithIndexesInRange:NSMakeRange(0, sectionCount)];
-    [self _insertSectionsIntoMap:map indexes:sectionIndexes];
-    // Return immediately because reloadData can't be used in conjuntion with other updates.
-    return;
-  }
-  
-  for (_ASHierarchySectionChange *change in [changeSet sectionChangesOfType:_ASHierarchyChangeTypeDelete]) {
-    [map removeSectionsAtIndexes:change.indexSet];
-  }
-  
-  for (_ASHierarchySectionChange *change in [changeSet sectionChangesOfType:_ASHierarchyChangeTypeInsert]) {
-    [self _insertSectionsIntoMap:map indexes:change.indexSet];
-  }
-}
-
-- (void)_insertSectionsIntoMap:(ASMutableElementMap *)map indexes:(NSIndexSet *)sectionIndexes
-{
-  ASDisplayNodeAssertMainThread();
-
-  [sectionIndexes enumerateIndexesUsingBlock:^(NSUInteger idx, BOOL * _Nonnull stop) {
-    id<ASSectionContext> context;
-    if (_dataSourceFlags.contextForSection) {
-      context = [_dataSource dataController:self contextForSection:idx];
-    }
-    ASSection *section = [[ASSection alloc] initWithSectionID:_nextSectionID context:context];
-    [map insertSection:section atIndex:idx];
-    _nextSectionID++;
-  }];
-}
-
-/**
- * Update elements based on the given change set.
- */
-- (void)_updateElementsInMap:(ASMutableElementMap *)map
-                   changeSet:(_ASHierarchyChangeSet *)changeSet
-             traitCollection:(ASPrimitiveTraitCollection)traitCollection
-       shouldFetchSizeRanges:(BOOL)shouldFetchSizeRanges
-                 previousMap:(ASElementMap *)previousMap
-{
-  ASDisplayNodeAssertMainThread();
-
-  if (changeSet.includesReloadData) {
-    [map removeAllElements];
-    
-    NSUInteger sectionCount = [self itemCountsFromDataSource].size();
-    if (sectionCount > 0) {
-      NSIndexSet *sectionIndexes = [NSIndexSet indexSetWithIndexesInRange:NSMakeRange(0, sectionCount)];
-      [self _insertElementsIntoMap:map sections:sectionIndexes traitCollection:traitCollection shouldFetchSizeRanges:shouldFetchSizeRanges changeSet:changeSet previousMap:previousMap];
-    }
-    // Return immediately because reloadData can't be used in conjuntion with other updates.
-    return;
-  }
-  
-  // Migrate old supplementary nodes to their new index paths.
-  [map migrateSupplementaryElementsWithSectionMapping:changeSet.sectionMapping];
-
-  for (_ASHierarchyItemChange *change in [changeSet itemChangesOfType:_ASHierarchyChangeTypeDelete]) {
-    [map removeItemsAtIndexPaths:change.indexPaths];
-    // Aggressively repopulate supplementary nodes (#1773 & #1629)
-    [self _repopulateSupplementaryNodesIntoMap:map forSectionsContainingIndexPaths:change.indexPaths
-                                     changeSet:changeSet
-                               traitCollection:traitCollection
-                              indexPathsAreNew:NO
-                         shouldFetchSizeRanges:shouldFetchSizeRanges
-                                   previousMap:previousMap];
-  }
-
-  for (_ASHierarchySectionChange *change in [changeSet sectionChangesOfType:_ASHierarchyChangeTypeDelete]) {
-    NSIndexSet *sectionIndexes = change.indexSet;
-    [map removeSectionsOfItems:sectionIndexes];
-  }
-  
-  for (_ASHierarchySectionChange *change in [changeSet sectionChangesOfType:_ASHierarchyChangeTypeInsert]) {
-    [self _insertElementsIntoMap:map sections:change.indexSet traitCollection:traitCollection shouldFetchSizeRanges:shouldFetchSizeRanges changeSet:changeSet previousMap:previousMap];
-  }
-  
-  for (_ASHierarchyItemChange *change in [changeSet itemChangesOfType:_ASHierarchyChangeTypeInsert]) {
-    [self _insertElementsIntoMap:map kind:ASDataControllerRowNodeKind atIndexPaths:change.indexPaths traitCollection:traitCollection shouldFetchSizeRanges:shouldFetchSizeRanges changeSet:changeSet previousMap:previousMap];
-    // Aggressively reload supplementary nodes (#1773 & #1629)
-    [self _repopulateSupplementaryNodesIntoMap:map forSectionsContainingIndexPaths:change.indexPaths
-                                     changeSet:changeSet
-                               traitCollection:traitCollection
-                              indexPathsAreNew:YES
-                         shouldFetchSizeRanges:shouldFetchSizeRanges
-                                   previousMap:previousMap];
-  }
-}
-
-- (void)_insertElementsIntoMap:(ASMutableElementMap *)map
-                      sections:(NSIndexSet *)sectionIndexes
-               traitCollection:(ASPrimitiveTraitCollection)traitCollection
-         shouldFetchSizeRanges:(BOOL)shouldFetchSizeRanges
-                     changeSet:(_ASHierarchyChangeSet *)changeSet
-                   previousMap:(ASElementMap *)previousMap
-{
-  ASDisplayNodeAssertMainThread();
-  
-  if (sectionIndexes.count == 0 || _dataSource == nil) {
-    return;
-  }
-
-  // Items
-  [map insertEmptySectionsOfItemsAtIndexes:sectionIndexes];
-  [self _insertElementsIntoMap:map kind:ASDataControllerRowNodeKind forSections:sectionIndexes traitCollection:traitCollection shouldFetchSizeRanges:shouldFetchSizeRanges changeSet:changeSet previousMap:previousMap];
-
-  // Supplementaries
-  for (NSString *kind in [self supplementaryKindsInSections:sectionIndexes]) {
-    // Step 2: Populate new elements for all sections
-    [self _insertElementsIntoMap:map kind:kind forSections:sectionIndexes traitCollection:traitCollection shouldFetchSizeRanges:shouldFetchSizeRanges changeSet:changeSet previousMap:previousMap];
-  }
-}
-
-#pragma mark - Relayout
-
-- (void)relayoutNodes:(id<NSFastEnumeration>)nodes nodesSizeChanged:(NSMutableArray<ASCellNode *> *)nodesSizesChanged
-{
-  NSParameterAssert(nodes);
-  NSParameterAssert(nodesSizesChanged);
-  
-  ASDisplayNodeAssertMainThread();
-  if (!_initialReloadDataHasBeenCalled) {
-    return;
-  }
-  
-  id<ASDataControllerSource> dataSource = self.dataSource;
-  const auto visibleMap = self.visibleMap;
-  const auto pendingMap = self.pendingMap;
-  for (ASCellNode *node in nodes) {
-    const auto element = node.collectionElement;
-    NSIndexPath *indexPathInPendingMap = [pendingMap indexPathForElement:element];
-    // Ensure the element is present in both maps or skip it. If it's not in the visible map,
-    // then we can't check the presented size. If it's not in the pending map, we can't get the constrained size.
-    // This will only happen if the element has been deleted, so the specifics of this behavior aren't important.
-    if (indexPathInPendingMap == nil || [visibleMap indexPathForElement:element] == nil) {
-      continue;
-    }
-
-    NSString *kind = element.supplementaryElementKind ?: ASDataControllerRowNodeKind;
-    ASSizeRange constrainedSize = [self constrainedSizeForNodeOfKind:kind atIndexPath:indexPathInPendingMap];
-    [self _layoutNode:node withConstrainedSize:constrainedSize];
-
-    BOOL matchesSize = [dataSource dataController:self presentedSizeForElement:element matchesSize:node.frame.size];
-    if (! matchesSize) {
-      [nodesSizesChanged addObject:node];
-    }
-  }
-}
-
-- (void)relayoutAllNodesWithInvalidationBlock:(nullable void (^)())invalidationBlock
-{
-  ASDisplayNodeAssertMainThread();
-  if (!_initialReloadDataHasBeenCalled) {
-    return;
-  }
-  
-  // Can't relayout right away because _visibleMap may not be up-to-date,
-  // i.e there might be some nodes that were measured using the old constrained size but haven't been added to _visibleMap
-  LOG(@"Edit Command - relayoutRows");
-  [self _scheduleBlockOnMainSerialQueue:^{
-    // Because -invalidateLayout doesn't trigger any operations by itself, and we answer queries from UICollectionView using layoutThatFits:,
-    // we invalidate the layout before we have updated all of the cells. Any cells that the collection needs the size of immediately will get
-    // -layoutThatFits: with a new constraint, on the main thread, and synchronously calculate them. Meanwhile, relayoutAllNodes will update
-    // the layout of any remaining nodes on background threads (and fast-return for any nodes that the UICV got to first).
-    if (invalidationBlock) {
-      invalidationBlock();
-    }
-    [self _relayoutAllNodes];
-  }];
-}
-
-- (void)_relayoutAllNodes
-{
-  ASDisplayNodeAssertMainThread();
-  // Aggressively repopulate all supplemtary elements
-  // Assuming this method is run on the main serial queue, _pending and _visible maps are synced and can be manipulated directly.
-  ASDisplayNodeAssert(_visibleMap == _pendingMap, @"Expected visible and pending maps to be synchronized: %@", self);
-
-  ASMutableElementMap *newMap = [_pendingMap mutableCopy];
-  [self _updateSupplementaryNodesIntoMap:newMap
-                         traitCollection:[self.node primitiveTraitCollection]
-                   shouldFetchSizeRanges:YES
-                             previousMap:_pendingMap];
-  _pendingMap = [newMap copy];
-  _visibleMap = _pendingMap;
-
-  for (ASCollectionElement *element in _visibleMap) {
-    // Ignore this element if it is no longer in the latest data. It is still recognized in the UIKit world but will be deleted soon.
-    NSIndexPath *indexPathInPendingMap = [_pendingMap indexPathForElement:element];
-    if (indexPathInPendingMap == nil) {
-      continue;
-    }
-
-    NSString *kind = element.supplementaryElementKind ?: ASDataControllerRowNodeKind;
-    ASSizeRange newConstrainedSize = [self constrainedSizeForNodeOfKind:kind atIndexPath:indexPathInPendingMap];
-
-    if (ASSizeRangeHasSignificantArea(newConstrainedSize)) {
-      element.constrainedSize = newConstrainedSize;
-
-      // Node may not be allocated yet (e.g node virtualization or same size optimization)
-      // Call context.nodeIfAllocated here to avoid premature node allocation and layout
-      ASCellNode *node = element.nodeIfAllocated;
-      if (node) {
-        [self _layoutNode:node withConstrainedSize:newConstrainedSize];
-      }
-    }
-  }
-}
-
-# pragma mark - ASPrimitiveTraitCollection
-
-- (void)environmentDidChange
-{
-  ASPerformBlockOnMainThread(^{
-    if (!_initialReloadDataHasBeenCalled) {
-      return;
-    }
-
-    // Can't update the trait collection right away because _visibleMap may not be up-to-date,
-    // i.e there might be some elements that were allocated using the old trait collection but haven't been added to _visibleMap
-    [self _scheduleBlockOnMainSerialQueue:^{
-      ASPrimitiveTraitCollection newTraitCollection = [self.node primitiveTraitCollection];
-      for (ASCollectionElement *element in _visibleMap) {
-        element.traitCollection = newTraitCollection;
-      }
-    }];
-  });
-}
-
-- (void)clearData
-{
-  ASDisplayNodeAssertMainThread();
-  if (_initialReloadDataHasBeenCalled) {
-    [self waitUntilAllUpdatesAreProcessed];
-    self.visibleMap = self.pendingMap = [[ASElementMap alloc] init];
-  }
-}
-
-# pragma mark - Helper methods
-
-- (void)_scheduleBlockOnMainSerialQueue:(dispatch_block_t)block
-{
-  ASDisplayNodeAssertMainThread();
-  dispatch_group_wait(_editingTransactionGroup, DISPATCH_TIME_FOREVER);
-  [_mainSerialQueue performBlockOnMainThread:block];
-}
-
-@end
-
-#endif
\ No newline at end of file
diff --git a/submodules/AsyncDisplayKit/Source/Details/ASDelegateProxy.h b/submodules/AsyncDisplayKit/Source/Details/ASDelegateProxy.h
deleted file mode 100644
index 7ed406b6db..0000000000
--- a/submodules/AsyncDisplayKit/Source/Details/ASDelegateProxy.h
+++ /dev/null
@@ -1,56 +0,0 @@
-//
-//  ASDelegateProxy.h
-//  Texture
-//
-//  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.
-//  Changes after 4/13/2017 are: Copyright (c) Pinterest, Inc.  All rights reserved.
-//  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
-//
-
-#import <Foundation/Foundation.h>
-
-@class ASDelegateProxy;
-@protocol ASDelegateProxyInterceptor <NSObject>
-@required
-// Called if the target object is discovered to be nil if it had been non-nil at init time.
-// This happens if the object is deallocated, because the proxy must maintain a weak reference to avoid cycles.
-// Though the target object may become nil, the interceptor must not; it is assumed the interceptor owns the proxy.
-- (void)proxyTargetHasDeallocated:(ASDelegateProxy *)proxy;
-@end
-
-/**
- * Stand-in for delegates like UITableView or UICollectionView's delegate / dataSource.
- * Any selectors flagged by "interceptsSelector" are routed to the interceptor object and are not delivered to the target.
- * Everything else leaves AsyncDisplayKit safely and arrives at the original target object.
- */
-
-@interface ASDelegateProxy : NSProxy
-
-- (instancetype)initWithTarget:(id)target interceptor:(id <ASDelegateProxyInterceptor>)interceptor;
-
-// This method must be overridden by a subclass.
-- (BOOL)interceptsSelector:(SEL)selector;
-
-@end
-
-/**
- * ASTableView intercepts and/or overrides a few of UITableView's critical data source and delegate methods.
- *
- * Any selector included in this function *MUST* be implemented by ASTableView.
- */
-
-@interface ASTableViewProxy : ASDelegateProxy
-@end
-
-/**
- * ASCollectionView intercepts and/or overrides a few of UICollectionView's critical data source and delegate methods.
- *
- * Any selector included in this function *MUST* be implemented by ASCollectionView.
- */
-
-@interface ASCollectionViewProxy : ASDelegateProxy
-@end
-
-@interface ASPagerNodeProxy : ASDelegateProxy
-@end
-
diff --git a/submodules/AsyncDisplayKit/Source/Details/ASDelegateProxy.mm b/submodules/AsyncDisplayKit/Source/Details/ASDelegateProxy.mm
deleted file mode 100644
index a5368024d1..0000000000
--- a/submodules/AsyncDisplayKit/Source/Details/ASDelegateProxy.mm
+++ /dev/null
@@ -1,273 +0,0 @@
-//
-//  ASDelegateProxy.mm
-//  Texture
-//
-//  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.
-//  Changes after 4/13/2017 are: Copyright (c) Pinterest, Inc.  All rights reserved.
-//  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
-//
-
-#ifndef MINIMAL_ASDK
-
-#import <AsyncDisplayKit/ASDelegateProxy.h>
-#import <AsyncDisplayKit/ASTableNode.h>
-#import <AsyncDisplayKit/ASCollectionNode.h>
-#import <AsyncDisplayKit/ASAssert.h>
-
-// UIKit performs a class check for UIDataSourceModelAssociation protocol conformance rather than an instance check, so
-//  the implementation of conformsToProtocol: below never gets called. We need to declare the two as conforming to the protocol here, then
-//  we need to implement dummy methods to get rid of a compiler warning about not conforming to the protocol.
-@interface ASTableViewProxy () <UIDataSourceModelAssociation>
-@end
-
-@interface ASCollectionViewProxy () <UIDataSourceModelAssociation>
-@end
-
-@interface ASDelegateProxy (UIDataSourceModelAssociationPrivate)
-- (nullable NSString *)_modelIdentifierForElementAtIndexPath:(NSIndexPath *)indexPath inView:(UIView *)view;
-- (nullable NSIndexPath *)_indexPathForElementWithModelIdentifier:(NSString *)identifier inView:(UIView *)view;
-@end
-
-@implementation ASTableViewProxy
-
-- (BOOL)interceptsSelector:(SEL)selector
-{
-  return (
-          // handled by ASTableView node<->cell machinery
-          selector == @selector(tableView:cellForRowAtIndexPath:) ||
-          selector == @selector(tableView:heightForRowAtIndexPath:) ||
-          
-          // Selection, highlighting, menu
-          selector == @selector(tableView:willSelectRowAtIndexPath:) ||
-          selector == @selector(tableView:didSelectRowAtIndexPath:) ||
-          selector == @selector(tableView:willDeselectRowAtIndexPath:) ||
-          selector == @selector(tableView:didDeselectRowAtIndexPath:) ||
-          selector == @selector(tableView:shouldHighlightRowAtIndexPath:) ||
-          selector == @selector(tableView:didHighlightRowAtIndexPath:) ||
-          selector == @selector(tableView:didUnhighlightRowAtIndexPath:) ||
-          selector == @selector(tableView:shouldShowMenuForRowAtIndexPath:) ||
-          selector == @selector(tableView:canPerformAction:forRowAtIndexPath:withSender:) ||
-          selector == @selector(tableView:performAction:forRowAtIndexPath:withSender:) ||
-
-          // handled by ASRangeController
-          selector == @selector(numberOfSectionsInTableView:) ||
-          selector == @selector(tableView:numberOfRowsInSection:) ||
-
-          // reordering support
-          selector == @selector(tableView:canMoveRowAtIndexPath:) ||
-          selector == @selector(tableView:moveRowAtIndexPath:toIndexPath:) ||
-          
-          // used for ASCellNode visibility
-          selector == @selector(scrollViewDidScroll:) ||
-
-          // used for ASCellNode user interaction
-          selector == @selector(scrollViewWillBeginDragging:) ||
-          selector == @selector(scrollViewDidEndDragging:willDecelerate:) ||
-          
-          // used for ASRangeController visibility updates
-          selector == @selector(tableView:willDisplayCell:forRowAtIndexPath:) ||
-          selector == @selector(tableView:didEndDisplayingCell:forRowAtIndexPath:) ||
-          
-          // used for batch fetching API
-          selector == @selector(scrollViewWillEndDragging:withVelocity:targetContentOffset:) ||
-          selector == @selector(scrollViewDidEndDecelerating:) ||
-
-          // UIDataSourceModelAssociation
-          selector == @selector(modelIdentifierForElementAtIndexPath:inView:) ||
-          selector == @selector(indexPathForElementWithModelIdentifier:inView:)
-          );
-}
-
-- (nullable NSString *)modelIdentifierForElementAtIndexPath:(NSIndexPath *)indexPath inView:(UIView *)view {
-  return [self _modelIdentifierForElementAtIndexPath:indexPath inView:view];
-}
-
-- (nullable NSIndexPath *)indexPathForElementWithModelIdentifier:(NSString *)identifier inView:(UIView *)view {
-  return [self _indexPathForElementWithModelIdentifier:identifier inView:view];
-}
-
-@end
-
-@implementation ASCollectionViewProxy
-
-- (BOOL)interceptsSelector:(SEL)selector
-{
-  return (
-          // handled by ASCollectionView node<->cell machinery
-          selector == @selector(collectionView:cellForItemAtIndexPath:) ||
-          selector == @selector(collectionView:layout:sizeForItemAtIndexPath:) ||
-          selector == @selector(collectionView:layout:insetForSectionAtIndex:) ||
-          selector == @selector(collectionView:layout:minimumLineSpacingForSectionAtIndex:) ||
-          selector == @selector(collectionView:layout:minimumInteritemSpacingForSectionAtIndex:) ||
-          selector == @selector(collectionView:layout:referenceSizeForHeaderInSection:) ||
-          selector == @selector(collectionView:layout:referenceSizeForFooterInSection:) ||
-          selector == @selector(collectionView:viewForSupplementaryElementOfKind:atIndexPath:) ||
-          
-          // Selection, highlighting, menu
-          selector == @selector(collectionView:shouldSelectItemAtIndexPath:) ||
-          selector == @selector(collectionView:didSelectItemAtIndexPath:) ||
-          selector == @selector(collectionView:shouldDeselectItemAtIndexPath:) ||
-          selector == @selector(collectionView:didDeselectItemAtIndexPath:) ||
-          selector == @selector(collectionView:shouldHighlightItemAtIndexPath:) ||
-          selector == @selector(collectionView:didHighlightItemAtIndexPath:) ||
-          selector == @selector(collectionView:didUnhighlightItemAtIndexPath:) ||
-          selector == @selector(collectionView:shouldShowMenuForItemAtIndexPath:) ||
-          selector == @selector(collectionView:canPerformAction:forItemAtIndexPath:withSender:) ||
-          selector == @selector(collectionView:performAction:forItemAtIndexPath:withSender:) ||
-
-          // Item counts
-          selector == @selector(numberOfSectionsInCollectionView:) ||
-          selector == @selector(collectionView:numberOfItemsInSection:) ||
-          
-          // Element appearance callbacks
-          selector == @selector(collectionView:willDisplayCell:forItemAtIndexPath:) ||
-          selector == @selector(collectionView:didEndDisplayingCell:forItemAtIndexPath:) ||
-          selector == @selector(collectionView:willDisplaySupplementaryView:forElementKind:atIndexPath:) ||
-          selector == @selector(collectionView:didEndDisplayingSupplementaryView:forElementOfKind:atIndexPath:) ||
-          
-          // used for batch fetching API
-          selector == @selector(scrollViewWillEndDragging:withVelocity:targetContentOffset:) ||
-          selector == @selector(scrollViewDidEndDecelerating:) ||
-          
-          // used for ASCellNode visibility
-          selector == @selector(scrollViewDidScroll:) ||
-
-          // used for ASCellNode user interaction
-          selector == @selector(scrollViewWillBeginDragging:) ||
-          selector == @selector(scrollViewDidEndDragging:willDecelerate:) ||
-          
-          // intercepted due to not being supported by ASCollectionView (prevent bugs caused by usage)
-          selector == @selector(collectionView:canMoveItemAtIndexPath:) ||
-          selector == @selector(collectionView:moveItemAtIndexPath:toIndexPath:) ||
-
-          // UIDataSourceModelAssociation
-          selector == @selector(modelIdentifierForElementAtIndexPath:inView:) ||
-          selector == @selector(indexPathForElementWithModelIdentifier:inView:)
-          );
-}
-
-- (nullable NSString *)modelIdentifierForElementAtIndexPath:(NSIndexPath *)indexPath inView:(UIView *)view {
-  return [self _modelIdentifierForElementAtIndexPath:indexPath inView:view];
-}
-
-- (nullable NSIndexPath *)indexPathForElementWithModelIdentifier:(NSString *)identifier inView:(UIView *)view {
-  return [self _indexPathForElementWithModelIdentifier:identifier inView:view];
-}
-
-@end
-
-@implementation ASPagerNodeProxy
-
-- (BOOL)interceptsSelector:(SEL)selector
-{
-  return (
-          // handled by ASPagerDataSource node<->cell machinery
-          selector == @selector(collectionNode:nodeForItemAtIndexPath:) ||
-          selector == @selector(collectionNode:nodeBlockForItemAtIndexPath:) ||
-          selector == @selector(collectionNode:numberOfItemsInSection:) ||
-          selector == @selector(collectionNode:constrainedSizeForItemAtIndexPath:)
-          );
-}
-
-@end
-
-@implementation ASDelegateProxy {
-  id <ASDelegateProxyInterceptor> __weak _interceptor;
-  id __weak _target;
-}
-
-- (instancetype)initWithTarget:(id)target interceptor:(id <ASDelegateProxyInterceptor>)interceptor
-{
-  ASDisplayNodeAssert(interceptor, @"interceptor must not be nil");
-  
-  _target = target ? : [NSNull null];
-  _interceptor = interceptor;
-  
-  return self;
-}
-
-- (BOOL)conformsToProtocol:(Protocol *)aProtocol
-{
-  id target = _target;
-  if (target) {
-    return [target conformsToProtocol:aProtocol];
-  } else {
-    return [super conformsToProtocol:aProtocol];
-  }
-}
-
-- (BOOL)respondsToSelector:(SEL)aSelector
-{
-  if ([self interceptsSelector:aSelector]) {
-    return [_interceptor respondsToSelector:aSelector];
-  } else {
-    // Also return NO if _target has become nil due to zeroing weak reference (or placeholder initialization).
-    return [_target respondsToSelector:aSelector];
-  }
-}
-
-- (id)forwardingTargetForSelector:(SEL)aSelector
-{
-  if ([self interceptsSelector:aSelector]) {
-    return _interceptor;
-  } else {
-    id target = _target;
-    if (target) {
-      return [target respondsToSelector:aSelector] ? target : nil;
-    } else {
-      // The _interceptor needs to be nilled out in this scenario. For that a strong reference needs to be created
-      // to be able to nil out the _interceptor but still let it know that the proxy target has deallocated
-      // We have to hold a strong reference to the interceptor as we have to nil it out and call the proxyTargetHasDeallocated
-      // The reason that the interceptor needs to be nilled out is that there maybe a change of a infinite loop, for example
-      // if a method will be called in the proxyTargetHasDeallocated: that again would trigger a whole new forwarding cycle
-      id <ASDelegateProxyInterceptor> interceptor = _interceptor;
-      _interceptor = nil;
-      [interceptor proxyTargetHasDeallocated:self];
-      
-      return nil;
-    }
-  }
-}
-
-- (NSMethodSignature *)methodSignatureForSelector:(SEL)aSelector
-{
-  // Check for a compiled definition for the selector
-  NSMethodSignature *methodSignature = nil;
-  if ([self interceptsSelector:aSelector]) {
-    methodSignature = [[_interceptor class] instanceMethodSignatureForSelector:aSelector];
-  } else {
-    methodSignature = [[_target class] instanceMethodSignatureForSelector:aSelector];
-  }
-  
-  // Unfortunately, in order to get this object to work properly, the use of a method which creates an NSMethodSignature
-  // from a C string. -methodSignatureForSelector is called when a compiled definition for the selector cannot be found.
-  // This is the place where we have to create our own dud NSMethodSignature. This is necessary because if this method
-  // returns nil, a selector not found exception is raised. The string argument to -signatureWithObjCTypes: outlines
-  // the return type and arguments to the message. To return a dud NSMethodSignature, pretty much any signature will
-  // suffice. Since the -forwardInvocation call will do nothing if the delegate does not respond to the selector,
-  // the dud NSMethodSignature simply gets us around the exception.
-  return methodSignature ?: [NSMethodSignature signatureWithObjCTypes:"@^v^c"];
-}
-
-- (void)forwardInvocation:(NSInvocation *)invocation
-{
-    // If we are down here this means _interceptor and _target where nil. Just don't do anything to prevent a crash
-}
-
-- (BOOL)interceptsSelector:(SEL)selector
-{
-  ASDisplayNodeAssert(NO, @"This method must be overridden by subclasses.");
-  return NO;
-}
-
-- (nullable NSString *)_modelIdentifierForElementAtIndexPath:(NSIndexPath *)indexPath inView:(UIView *)view {
-  return [(id)_interceptor modelIdentifierForElementAtIndexPath:indexPath inView:view];
-}
-
-- (nullable NSIndexPath *)_indexPathForElementWithModelIdentifier:(NSString *)identifier inView:(UIView *)view {
-  return [(id)_interceptor indexPathForElementWithModelIdentifier:identifier inView:view];
-}
-
-@end
-
-#endif
diff --git a/submodules/AsyncDisplayKit/Source/Details/ASElementMap.h b/submodules/AsyncDisplayKit/Source/Details/ASElementMap.h
deleted file mode 100644
index 1ea0ef58d4..0000000000
--- a/submodules/AsyncDisplayKit/Source/Details/ASElementMap.h
+++ /dev/null
@@ -1,137 +0,0 @@
-//
-//  ASElementMap.h
-//  Texture
-//
-//  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.
-//  Changes after 4/13/2017 are: Copyright (c) Pinterest, Inc.  All rights reserved.
-//  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
-//
-
-#ifndef MINIMAL_ASDK
-
-#import <Foundation/Foundation.h>
-#import <AsyncDisplayKit/ASBaseDefines.h>
-
-NS_ASSUME_NONNULL_BEGIN
-
-@class ASCollectionElement, ASSection, UICollectionViewLayoutAttributes;
-@protocol ASSectionContext;
-
-/**
- * An immutable representation of the state of a collection view's data.
- * All items and supplementary elements are represented by ASCollectionElement.
- * Fast enumeration is in terms of ASCollectionElement.
- */
-AS_SUBCLASSING_RESTRICTED
-@interface ASElementMap : NSObject <NSCopying, NSFastEnumeration>
-
-/**
- * The total number of elements in this map.
- */
-@property (readonly) NSUInteger count;
-
-/**
- * The number of sections (of items) in this map.
- */
-@property (readonly) NSInteger numberOfSections;
-
-/**
- * The kinds of supplementary elements present in this map. O(1)
- */
-@property (copy, readonly) NSArray<NSString *> *supplementaryElementKinds;
-
-/**
- * Returns number of items in the given section. O(1)
- */
-- (NSInteger)numberOfItemsInSection:(NSInteger)section;
-
-/**
- * Returns the context object for the given section, if any. O(1)
- */
-- (nullable id<ASSectionContext>)contextForSection:(NSInteger)section;
-
-/**
- * All the index paths for all the items in this map. O(N)
- *
- * This property may be removed in the future, since it doesn't account for supplementary nodes.
- */
-@property (copy, readonly) NSArray<NSIndexPath *> *itemIndexPaths;
-
-/**
- * All the item elements in this map, in ascending order. O(N)
- */
-@property (copy, readonly) NSArray<ASCollectionElement *> *itemElements;
-
-/**
- * Returns the index path that corresponds to the same element in @c map at the given @c indexPath.
- * O(1) for items, fast O(N) for sections.
- *
- * Note you can pass "section index paths" of length 1 and get a corresponding section index path.
- */
-- (nullable NSIndexPath *)convertIndexPath:(NSIndexPath *)indexPath fromMap:(ASElementMap *)map;
-
-/**
- * Returns the section index into the receiver that corresponds to the same element in @c map at @c sectionIndex. Fast O(N).
- *
- * Returns @c NSNotFound if the section does not exist in the receiver.
- */
-- (NSInteger)convertSection:(NSInteger)sectionIndex fromMap:(ASElementMap *)map;
-
-/**
- * Returns the index path for the given element. O(1)
- */
-- (nullable NSIndexPath *)indexPathForElement:(ASCollectionElement *)element;
-
-/**
- * Returns the index path for the given element, if it represents a cell. O(1)
- */
-- (nullable NSIndexPath *)indexPathForElementIfCell:(ASCollectionElement *)element;
-
-/**
- * Returns the item-element at the given index path. O(1)
- */
-- (nullable ASCollectionElement *)elementForItemAtIndexPath:(NSIndexPath *)indexPath;
-
-/**
- * Returns the element for the supplementary element of the given kind at the given index path. O(1)
- */
-- (nullable ASCollectionElement *)supplementaryElementOfKind:(NSString *)supplementaryElementKind atIndexPath:(NSIndexPath *)indexPath;
-
-/**
- * Returns the element that corresponds to the given layout attributes, if any.
- *
- * NOTE: This method only regards the category, kind, and index path of the attributes object. Elements do not
- * have any concept of size/position.
- */
-- (nullable ASCollectionElement *)elementForLayoutAttributes:(UICollectionViewLayoutAttributes *)layoutAttributes;
-
-/**
- * A very terse description e.g. { itemCounts = [ <S0: 1> <S1: 16> ] }
- */
-@property (readonly) NSString *smallDescription;
-
-#pragma mark - Initialization -- Only Useful to ASDataController
-
-
-// SectionIndex -> ItemIndex -> Element
-typedef NSArray<NSArray<ASCollectionElement *> *> ASCollectionElementTwoDimensionalArray;
-
-// ElementKind -> IndexPath -> Element
-typedef NSDictionary<NSString *, NSDictionary<NSIndexPath *, ASCollectionElement *> *> ASSupplementaryElementDictionary;
-
-/**
- * Create a new element map for this dataset. You probably don't need to use this – ASDataController is the only one who creates these.
- *
- * @param sections The array of ASSection objects.
- * @param items A 2D array of ASCollectionElements, for each item.
- * @param supplementaryElements A dictionary of gathered supplementary elements.
- */
-- (instancetype)initWithSections:(NSArray<ASSection *> *)sections
-                           items:(ASCollectionElementTwoDimensionalArray *)items
-           supplementaryElements:(ASSupplementaryElementDictionary *)supplementaryElements;
-
-@end
-
-NS_ASSUME_NONNULL_END
-
-#endif
diff --git a/submodules/AsyncDisplayKit/Source/Details/ASElementMap.mm b/submodules/AsyncDisplayKit/Source/Details/ASElementMap.mm
deleted file mode 100644
index 6df89ff6cd..0000000000
--- a/submodules/AsyncDisplayKit/Source/Details/ASElementMap.mm
+++ /dev/null
@@ -1,280 +0,0 @@
-//
-//  ASElementMap.mm
-//  Texture
-//
-//  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.
-//  Changes after 4/13/2017 are: Copyright (c) Pinterest, Inc.  All rights reserved.
-//  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
-//
-
-#ifndef MINIMAL_ASDK
-
-#import <AsyncDisplayKit/ASElementMap.h>
-#import <UIKit/UIKit.h>
-#import <AsyncDisplayKit/ASCollectionElement.h>
-#import <AsyncDisplayKit/ASTwoDimensionalArrayUtils.h>
-#import <AsyncDisplayKit/ASMutableElementMap.h>
-#import <AsyncDisplayKit/ASSection.h>
-#import <AsyncDisplayKit/NSIndexSet+ASHelpers.h>
-#import <AsyncDisplayKit/ASObjectDescriptionHelpers.h>
-
-@interface ASElementMap () <ASDescriptionProvider>
-
-@property (nonatomic, readonly) NSArray<ASSection *> *sections;
-
-// Element -> IndexPath
-@property (nonatomic, readonly) NSMapTable<ASCollectionElement *, NSIndexPath *> *elementToIndexPathMap;
-
-// The items, in a 2D array
-@property (nonatomic, readonly) ASCollectionElementTwoDimensionalArray *sectionsOfItems;
-
-@property (nonatomic, readonly) ASSupplementaryElementDictionary *supplementaryElements;
-
-@end
-
-@implementation ASElementMap
-
-- (instancetype)init
-{
-  return [self initWithSections:@[] items:@[] supplementaryElements:@{}];
-}
-
-- (instancetype)initWithSections:(NSArray<ASSection *> *)sections items:(ASCollectionElementTwoDimensionalArray *)items supplementaryElements:(ASSupplementaryElementDictionary *)supplementaryElements
-{
-  NSCParameterAssert(items.count == sections.count);
-
-  if (self = [super init]) {
-    _sections = [sections copy];
-    _sectionsOfItems = [[NSArray alloc] initWithArray:items copyItems:YES];
-    _supplementaryElements = [[NSDictionary alloc] initWithDictionary:supplementaryElements copyItems:YES];
-
-    // Setup our index path map
-    _elementToIndexPathMap = [NSMapTable mapTableWithKeyOptions:(NSMapTableStrongMemory | NSMapTableObjectPointerPersonality) valueOptions:NSMapTableCopyIn];
-    NSInteger s = 0;
-    for (NSArray *section in _sectionsOfItems) {
-      NSInteger i = 0;
-      for (ASCollectionElement *element in section) {
-        NSIndexPath *indexPath = [NSIndexPath indexPathForItem:i inSection:s];
-        [_elementToIndexPathMap setObject:indexPath forKey:element];
-        i++;
-      }
-      s++;
-    }
-    for (NSDictionary *supplementariesForKind in [_supplementaryElements objectEnumerator]) {
-      [supplementariesForKind enumerateKeysAndObjectsUsingBlock:^(NSIndexPath *_Nonnull indexPath, ASCollectionElement * _Nonnull element, BOOL * _Nonnull stop) {
-        [_elementToIndexPathMap setObject:indexPath forKey:element];
-      }];
-    }
-  }
-  return self;
-}
-
-- (NSUInteger)count
-{
-  return _elementToIndexPathMap.count;
-}
-
-- (NSArray<NSIndexPath *> *)itemIndexPaths
-{
-  return ASIndexPathsForTwoDimensionalArray(_sectionsOfItems);
-}
-
-- (NSArray<ASCollectionElement *> *)itemElements
-{
-  return ASElementsInTwoDimensionalArray(_sectionsOfItems);
-}
-
-- (NSInteger)numberOfSections
-{
-  return _sectionsOfItems.count;
-}
-
-- (NSArray<NSString *> *)supplementaryElementKinds
-{
-  return _supplementaryElements.allKeys;
-}
-
-- (NSInteger)numberOfItemsInSection:(NSInteger)section
-{
-  if (![self sectionIndexIsValid:section assert:YES]) {
-    return 0;
-  }
-
-  return _sectionsOfItems[section].count;
-}
-
-- (id<ASSectionContext>)contextForSection:(NSInteger)section
-{
-  if (![self sectionIndexIsValid:section assert:NO]) {
-    return nil;
-  }
-
-  return _sections[section].context;
-}
-
-- (nullable NSIndexPath *)indexPathForElement:(ASCollectionElement *)element
-{
-  return element ? [_elementToIndexPathMap objectForKey:element] : nil;
-}
-
-- (nullable NSIndexPath *)indexPathForElementIfCell:(ASCollectionElement *)element
-{
-  if (element.supplementaryElementKind == nil) {
-    return [self indexPathForElement:element];
-  } else {
-    return nil;
-  }
-}
-
-- (nullable ASCollectionElement *)elementForItemAtIndexPath:(NSIndexPath *)indexPath
-{
-  NSInteger section, item;
-  if (![self itemIndexPathIsValid:indexPath assert:NO item:&item section:&section]) {
-    return nil;
-  }
-
-  return _sectionsOfItems[section][item];
-}
-
-- (nullable ASCollectionElement *)supplementaryElementOfKind:(NSString *)supplementaryElementKind atIndexPath:(NSIndexPath *)indexPath
-{
-  return _supplementaryElements[supplementaryElementKind][indexPath];
-}
-
-- (ASCollectionElement *)elementForLayoutAttributes:(UICollectionViewLayoutAttributes *)layoutAttributes
-{
-  switch (layoutAttributes.representedElementCategory) {
-    case UICollectionElementCategoryCell:
-      // Cell
-      return [self elementForItemAtIndexPath:layoutAttributes.indexPath];
-    case UICollectionElementCategorySupplementaryView:
-      // Supplementary element.
-      return [self supplementaryElementOfKind:layoutAttributes.representedElementKind atIndexPath:layoutAttributes.indexPath];
-    case UICollectionElementCategoryDecorationView:
-      // No support for decoration views.
-      return nil;
-  }
-}
-
-- (NSIndexPath *)convertIndexPath:(NSIndexPath *)indexPath fromMap:(ASElementMap *)map
-{
-  if (indexPath.item == NSNotFound) {
-    // Section index path
-    NSInteger result = [self convertSection:indexPath.section fromMap:map];
-    return (result != NSNotFound ? [NSIndexPath indexPathWithIndex:result] : nil);
-  } else {
-    // Item index path
-    ASCollectionElement *element = [map elementForItemAtIndexPath:indexPath];
-    return [self indexPathForElement:element];
-  }
-}
-
-- (NSInteger)convertSection:(NSInteger)sectionIndex fromMap:(ASElementMap *)map
-{
-  if (![map sectionIndexIsValid:sectionIndex assert:YES]) {
-    return NSNotFound;
-  }
-
-  ASSection *section = map.sections[sectionIndex];
-  return [_sections indexOfObjectIdenticalTo:section];
-}
-
-#pragma mark - NSCopying
-
-- (id)copyWithZone:(NSZone *)zone
-{
-  return self;
-}
-
-// NSMutableCopying conformance is declared in ASMutableElementMap.h, so that most consumers of ASElementMap don't bother with it.
-#pragma mark - NSMutableCopying
-
-- (id)mutableCopyWithZone:(NSZone *)zone
-{
-  return [[ASMutableElementMap alloc] initWithSections:_sections items:_sectionsOfItems supplementaryElements:_supplementaryElements];
-}
-
-#pragma mark - NSFastEnumeration
-
-- (NSUInteger)countByEnumeratingWithState:(NSFastEnumerationState *)state objects:(id  _Nullable __unsafe_unretained [])buffer count:(NSUInteger)len
-{
-  return [_elementToIndexPathMap countByEnumeratingWithState:state objects:buffer count:len];
-}
-
-- (NSString *)smallDescription
-{
-  NSMutableArray *sectionDescriptions = [NSMutableArray array];
-
-  NSUInteger i = 0;
-  for (NSArray *section in _sectionsOfItems) {
-    [sectionDescriptions addObject:[NSString stringWithFormat:@"<S%tu: %tu>", i, section.count]];
-    i++;
-  }
-  return ASObjectDescriptionMakeWithoutObject(@[ @{ @"itemCounts": sectionDescriptions }]);
-}
-
-#pragma mark - ASDescriptionProvider
-
-- (NSString *)description
-{
-  return ASObjectDescriptionMake(self, [self propertiesForDescription]);
-}
-
-- (NSMutableArray<NSDictionary *> *)propertiesForDescription
-{
-  NSMutableArray *result = [NSMutableArray array];
-  [result addObject:@{ @"items" : _sectionsOfItems }];
-  [result addObject:@{ @"supplementaryElements" : _supplementaryElements }];
-  return result;
-}
-
-#pragma mark - Internal
-
-/**
- * Fails assert + return NO if section is out of bounds.
- */
-- (BOOL)sectionIndexIsValid:(NSInteger)section assert:(BOOL)assert
-{
-  NSInteger sectionCount = _sectionsOfItems.count;
-  if (section >= sectionCount || section < 0) {
-    if (assert) {
-      ASDisplayNodeFailAssert(@"Invalid section index %ld when there are only %ld sections!", (long)section, (long)sectionCount);
-    }
-    return NO;
-  } else {
-    return YES;
-  }
-}
-
-/**
- * If indexPath is nil, just returns NO.
- * If indexPath is invalid, fails assertion and returns NO.
- * Otherwise returns YES and sets the item & section.
- */
-- (BOOL)itemIndexPathIsValid:(NSIndexPath *)indexPath assert:(BOOL)assert item:(out NSInteger *)outItem section:(out NSInteger *)outSection
-{
-  if (indexPath == nil) {
-    return NO;
-  }
-
-  NSInteger section = indexPath.section;
-  if (![self sectionIndexIsValid:section assert:assert]) {
-    return NO;
-  }
-
-  NSInteger itemCount = _sectionsOfItems[section].count;
-  NSInteger item = indexPath.item;
-  if (item >= itemCount || item < 0) {
-    if (assert) {
-      ASDisplayNodeFailAssert(@"Invalid item index %ld in section %ld which only has %ld items!", (long)item, (long)section, (long)itemCount);
-    }
-    return NO;
-  }
-  *outItem = item;
-  *outSection = section;
-  return YES;
-}
-
-@end
-
-#endif
diff --git a/submodules/AsyncDisplayKit/Source/Details/ASEventLog.h b/submodules/AsyncDisplayKit/Source/Details/ASEventLog.h
deleted file mode 100644
index 9a147f259d..0000000000
--- a/submodules/AsyncDisplayKit/Source/Details/ASEventLog.h
+++ /dev/null
@@ -1,39 +0,0 @@
-//
-//  ASEventLog.h
-//  Texture
-//
-//  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.
-//  Changes after 4/13/2017 are: Copyright (c) Pinterest, Inc.  All rights reserved.
-//  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
-//
-
-#import <Foundation/Foundation.h>
-#import <AsyncDisplayKit/ASBaseDefines.h>
-
-#ifndef ASEVENTLOG_CAPACITY
-#define ASEVENTLOG_CAPACITY 5
-#endif
-
-#ifndef ASEVENTLOG_ENABLE
-#define ASEVENTLOG_ENABLE 0
-#endif
-
-NS_ASSUME_NONNULL_BEGIN
-
-AS_SUBCLASSING_RESTRICTED
-@interface ASEventLog : NSObject
-
-/**
- * Create a new event log.
- *
- * @param anObject The object whose events we are logging. This object is not retained.
- */
-- (instancetype)initWithObject:(id)anObject;
-
-- (void)logEventWithBacktrace:(nullable NSArray<NSString *> *)backtrace format:(NSString *)format, ... NS_FORMAT_FUNCTION(2, 3);
-
-- (instancetype)init NS_UNAVAILABLE;
-
-@end
-
-NS_ASSUME_NONNULL_END
diff --git a/submodules/AsyncDisplayKit/Source/Details/ASEventLog.mm b/submodules/AsyncDisplayKit/Source/Details/ASEventLog.mm
deleted file mode 100644
index 25ecc29968..0000000000
--- a/submodules/AsyncDisplayKit/Source/Details/ASEventLog.mm
+++ /dev/null
@@ -1,121 +0,0 @@
-//
-//  ASEventLog.mm
-//  Texture
-//
-//  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.
-//  Changes after 4/13/2017 are: Copyright (c) Pinterest, Inc.  All rights reserved.
-//  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
-//
-
-#import <AsyncDisplayKit/ASEventLog.h>
-#import <AsyncDisplayKit/ASThread.h>
-#import <AsyncDisplayKit/ASTraceEvent.h>
-#import <AsyncDisplayKit/ASObjectDescriptionHelpers.h>
-
-@implementation ASEventLog {
-  AS::RecursiveMutex __instanceLock__;
-
-  // The index of the most recent log entry. -1 until first entry.
-  NSInteger _eventLogHead;
-
-  // A description of the object we're logging for. This is immutable.
-  NSString *_objectDescription;
-}
-
-/**
- * Even just when debugging, all these events can take up considerable memory.
- * Store them in a shared NSCache to limit the total consumption.
- */
-+ (NSCache<ASEventLog *, NSMutableArray<ASTraceEvent *> *> *)contentsCache
-{
-  static NSCache *cache;
-  static dispatch_once_t onceToken;
-  dispatch_once(&onceToken, ^{
-    cache = [[NSCache alloc] init];
-  });
-  return cache;
-}
-
-- (instancetype)initWithObject:(id)anObject
-{
-  if ((self = [super init])) {
-    _objectDescription = ASObjectDescriptionMakeTiny(anObject);
-    _eventLogHead = -1;
-  }
-  return self;
-}
-
-- (instancetype)init
-{
-  // This method is marked unavailable so the compiler won't let them call it.
-  ASDisplayNodeFailAssert(@"Failed to call initWithObject:");
-  return nil;
-}
-
-- (void)logEventWithBacktrace:(NSArray<NSString *> *)backtrace format:(NSString *)format, ...
-{
-  va_list args;
-  va_start(args, format);
-  ASTraceEvent *event = [[ASTraceEvent alloc] initWithBacktrace:backtrace
-                                                         format:format
-                                                      arguments:args];
-  va_end(args);
-
-  AS::MutexLocker l(__instanceLock__);
-  NSCache *cache = [ASEventLog contentsCache];
-  NSMutableArray<ASTraceEvent *> *events = [cache objectForKey:self];
-  if (events == nil) {
-    events = [NSMutableArray arrayWithObject:event];
-    [cache setObject:events forKey:self];
-    _eventLogHead = 0;
-    return;
-  }
-
-  // Increment the head index.
-  _eventLogHead = (_eventLogHead + 1) % ASEVENTLOG_CAPACITY;
-  if (_eventLogHead < events.count) {
-    [events replaceObjectAtIndex:_eventLogHead withObject:event];
-  } else {
-    [events insertObject:event atIndex:_eventLogHead];
-  }
-}
-
-- (NSArray<ASTraceEvent *> *)events
-{
-  NSMutableArray<ASTraceEvent *> *events = [[ASEventLog contentsCache] objectForKey:self];
-  if (events == nil) {
-    return nil;
-  }
-
-  AS::MutexLocker l(__instanceLock__);
-  NSUInteger tail = (_eventLogHead + 1);
-  NSUInteger count = events.count;
-  
-  NSMutableArray<ASTraceEvent *> *result = [NSMutableArray array];
-  
-  // Start from `tail` and go through array, wrapping around when we exceed end index.
-  for (NSUInteger actualIndex = 0; actualIndex < ASEVENTLOG_CAPACITY; actualIndex++) {
-    NSInteger ringIndex = (tail + actualIndex) % ASEVENTLOG_CAPACITY;
-    if (ringIndex < count) {
-      [result addObject:events[ringIndex]];
-    }
-  }
-  return result;
-}
-
-- (NSString *)description
-{
-  /**
-   * This description intentionally doesn't follow the standard description format.
-   * Since this is a log, it's important for the description to look a certain way, and
-   * the formal description style doesn't allow for newlines and has a ton of punctuation.
-   */
-  NSArray *events = [self events];
-  if (events == nil) {
-    return [NSString stringWithFormat:@"Event log for %@ was purged to conserve memory.", _objectDescription];
-  } else {
-    return [NSString stringWithFormat:@"Event log for %@. Events: %@", _objectDescription, events];
-  }
-}
-
-@end
diff --git a/submodules/AsyncDisplayKit/Source/Details/ASHighlightOverlayLayer.h b/submodules/AsyncDisplayKit/Source/Details/ASHighlightOverlayLayer.h
deleted file mode 100644
index aff6694bf1..0000000000
--- a/submodules/AsyncDisplayKit/Source/Details/ASHighlightOverlayLayer.h
+++ /dev/null
@@ -1,51 +0,0 @@
-//
-//  ASHighlightOverlayLayer.h
-//  Texture
-//
-//  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.
-//  Changes after 4/13/2017 are: Copyright (c) Pinterest, Inc.  All rights reserved.
-//  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
-//
-
-#import <QuartzCore/QuartzCore.h>
-#import <Foundation/Foundation.h>
-#import <AsyncDisplayKit/ASBaseDefines.h>
-
-NS_ASSUME_NONNULL_BEGIN
-
-AS_SUBCLASSING_RESTRICTED
-@interface ASHighlightOverlayLayer : CALayer
-
-/**
- @summary Initializes with CGRects for the highlighting, in the targetLayer's coordinate space.
-
- @desc This is the designated initializer.
-
- @param rects Array containing CGRects wrapped in NSValue.
- @param targetLayer The layer that the rects are relative to.  The rects will be translated to the receiver's coordinate space when rendering.
- */
-- (instancetype)initWithRects:(NSArray<NSValue *> *)rects targetLayer:(nullable CALayer *)targetLayer;
-
-/**
- @summary Initializes with CGRects for the highlighting, in the receiver's coordinate space.
-
- @param rects Array containing CGRects wrapped in NSValue.
- */
-- (instancetype)initWithRects:(NSArray<NSValue *> *)rects;
-
-@property (nullable, nonatomic) __attribute__((NSObject)) CGColorRef highlightColor;
-@property (nonatomic, weak) CALayer *targetLayer;
-
-@end
-
-@interface CALayer (ASHighlightOverlayLayerSupport)
-
-/**
- @summary Set to YES to indicate to a sublayer that this is where highlight overlay layers (for pressed states) should
- be added so that the highlight won't be clipped by a neighboring layer.
- */
-@property (nonatomic, setter=as_setAllowsHighlightDrawing:) BOOL as_allowsHighlightDrawing;
-
-@end
-
-NS_ASSUME_NONNULL_END
diff --git a/submodules/AsyncDisplayKit/Source/Details/ASHighlightOverlayLayer.mm b/submodules/AsyncDisplayKit/Source/Details/ASHighlightOverlayLayer.mm
deleted file mode 100644
index 03cf468165..0000000000
--- a/submodules/AsyncDisplayKit/Source/Details/ASHighlightOverlayLayer.mm
+++ /dev/null
@@ -1,134 +0,0 @@
-//
-//  ASHighlightOverlayLayer.mm
-//  Texture
-//
-//  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.
-//  Changes after 4/13/2017 are: Copyright (c) Pinterest, Inc.  All rights reserved.
-//  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
-//
-
-#import <AsyncDisplayKit/ASHighlightOverlayLayer.h>
-
-#import <UIKit/UIKit.h>
-#import <tgmath.h>
-
-#import <AsyncDisplayKit/ASInternalHelpers.h>
-
-static const CGFloat kCornerRadius = 2.5;
-static const UIEdgeInsets padding = {2, 4, 1.5, 4};
-
-@implementation ASHighlightOverlayLayer
-{
-  NSArray *_rects;
-}
-
-+ (id)defaultValueForKey:(NSString *)key
-{
-  if ([key isEqualToString:@"contentsScale"]) {
-    return @(ASScreenScale());
-  } else if ([key isEqualToString:@"highlightColor"]) {
-    CGFloat components[] = {0, 0, 0, 0.25};
-    CGColorSpaceRef colorSpace = CGColorSpaceCreateDeviceRGB();
-    CGColorRef color = CGColorCreate(colorSpace, components);
-    CGColorSpaceRelease(colorSpace);
-    return CFBridgingRelease(color);
-  } else {
-    return [super defaultValueForKey:key];
-  }
-}
-
-+ (BOOL)needsDisplayForKey:(NSString *)key
-{
-  if ([key isEqualToString:@"bounds"]) {
-    return YES;
-  } else {
-    return [super needsDisplayForKey:key];
-  }
-}
-
-+ (id<CAAction>)defaultActionForKey:(NSString *)event
-{
-  return (id<CAAction>)[NSNull null];
-}
-
-- (instancetype)initWithRects:(NSArray *)rects
-{
-  return [self initWithRects:rects targetLayer:nil];
-}
-
-- (instancetype)initWithRects:(NSArray *)rects targetLayer:(id)targetLayer
-{
-  if (self = [super init]) {
-    _rects = [rects copy];
-    _targetLayer = targetLayer;
-  }
-  return self;
-}
-
-@dynamic highlightColor;
-
-- (void)drawInContext:(CGContextRef)ctx
-{
-  [super drawInContext:ctx];
-
-  CGAffineTransform affine = CGAffineTransformIdentity;
-  CGMutablePathRef highlightPath = CGPathCreateMutable();
-  CALayer *targetLayer = self.targetLayer;
-
-  for (NSValue *value in _rects) {
-    CGRect rect = [value CGRectValue];
-
-    // Don't highlight empty rects.
-    if (CGRectIsEmpty(rect)) {
-      continue;
-    }
-
-    if (targetLayer != nil) {
-      rect = [self convertRect:rect fromLayer:targetLayer];
-    }
-    rect = CGRectMake(std::round(rect.origin.x), std::round(rect.origin.y), std::round(rect.size.width), std::round(rect.size.height));
-
-    CGFloat minX = rect.origin.x - padding.left;
-    CGFloat maxX = CGRectGetMaxX(rect) + padding.right;
-    CGFloat midX = (maxX - minX) / 2 + minX;
-    CGFloat minY = rect.origin.y - padding.top;
-    CGFloat maxY = CGRectGetMaxY(rect) + padding.bottom;
-    CGFloat midY = (maxY - minY) / 2 + minY;
-
-    CGPathMoveToPoint(highlightPath, &affine, minX, midY);
-    CGPathAddArcToPoint(highlightPath, &affine, minX, maxY, midX, maxY, kCornerRadius);
-    CGPathAddArcToPoint(highlightPath, &affine, maxX, maxY, maxX, midY, kCornerRadius);
-    CGPathAddArcToPoint(highlightPath, &affine, maxX, minY, midX, minY, kCornerRadius);
-    CGPathAddArcToPoint(highlightPath, &affine, minX, minY, minX, midY, kCornerRadius);
-    CGPathCloseSubpath(highlightPath);
-  }
-
-  CGContextAddPath(ctx, highlightPath);
-  CGContextSetFillColorWithColor(ctx, self.highlightColor);
-  CGContextDrawPath(ctx, kCGPathFill);
-  CGPathRelease(highlightPath);
-}
-
-- (CALayer *)hitTest:(CGPoint)p
-{
-  // Don't handle taps
-  return nil;
-}
-
-@end
-
-@implementation CALayer (ASHighlightOverlayLayerSupport)
-
-static NSString *kAllowsHighlightDrawingKey = @"allows_highlight_drawing";
-
-- (BOOL)as_allowsHighlightDrawing
-{
-  return [[self valueForKey:kAllowsHighlightDrawingKey] boolValue];
-}
-
-- (void)as_setAllowsHighlightDrawing:(BOOL)allowsHighlightDrawing
-{
-  [self setValue:@(allowsHighlightDrawing) forKey:kAllowsHighlightDrawingKey];
-}
-
-@end
diff --git a/submodules/AsyncDisplayKit/Source/Details/ASImageContainerProtocolCategories.h b/submodules/AsyncDisplayKit/Source/Details/ASImageContainerProtocolCategories.h
deleted file mode 100644
index 44ddc354fd..0000000000
--- a/submodules/AsyncDisplayKit/Source/Details/ASImageContainerProtocolCategories.h
+++ /dev/null
@@ -1,19 +0,0 @@
-//
-//  ASImageContainerProtocolCategories.h
-//  Texture
-//
-//  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.
-//  Changes after 4/13/2017 are: Copyright (c) Pinterest, Inc.  All rights reserved.
-//  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
-//
-
-#import <UIKit/UIKit.h>
-#import <AsyncDisplayKit/ASImageProtocols.h>
-
-@interface UIImage (ASImageContainerProtocol) <ASImageContainerProtocol>
-
-@end
-
-@interface NSData (ASImageContainerProtocol) <ASImageContainerProtocol>
-
-@end
diff --git a/submodules/AsyncDisplayKit/Source/Details/ASImageContainerProtocolCategories.mm b/submodules/AsyncDisplayKit/Source/Details/ASImageContainerProtocolCategories.mm
deleted file mode 100644
index c9316c32ab..0000000000
--- a/submodules/AsyncDisplayKit/Source/Details/ASImageContainerProtocolCategories.mm
+++ /dev/null
@@ -1,38 +0,0 @@
-//
-//  ASImageContainerProtocolCategories.mm
-//  Texture
-//
-//  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.
-//  Changes after 4/13/2017 are: Copyright (c) Pinterest, Inc.  All rights reserved.
-//  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
-//
-
-#import <AsyncDisplayKit/ASImageContainerProtocolCategories.h>
-
-@implementation UIImage (ASImageContainerProtocol)
-
-- (UIImage *)asdk_image
-{
-    return self;
-}
-
-- (NSData *)asdk_animatedImageData
-{
-    return nil;
-}
-
-@end
-
-@implementation NSData (ASImageContainerProtocol)
-
-- (UIImage *)asdk_image
-{
-    return nil;
-}
-
-- (NSData *)asdk_animatedImageData
-{
-    return self;
-}
-
-@end
diff --git a/submodules/AsyncDisplayKit/Source/Details/ASImageProtocols.h b/submodules/AsyncDisplayKit/Source/Details/ASImageProtocols.h
deleted file mode 100644
index fae3b9f5b4..0000000000
--- a/submodules/AsyncDisplayKit/Source/Details/ASImageProtocols.h
+++ /dev/null
@@ -1,240 +0,0 @@
-//
-//  ASImageProtocols.h
-//  Texture
-//
-//  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.
-//  Changes after 4/13/2017 are: Copyright (c) Pinterest, Inc.  All rights reserved.
-//  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
-//
-
-#import <UIKit/UIKit.h>
-
-NS_ASSUME_NONNULL_BEGIN
-
-@protocol ASAnimatedImageProtocol;
-
-@protocol ASImageContainerProtocol <NSObject>
-
-- (nullable UIImage *)asdk_image;
-- (nullable NSData *)asdk_animatedImageData;
-
-@end
-
-typedef void(^ASImageCacherCompletion)(id <ASImageContainerProtocol> _Nullable imageFromCache);
-
-@protocol ASImageCacheProtocol <NSObject>
-
-/**
- @abstract Attempts to fetch an image with the given URL from the cache.
- @param URL The URL of the image to retrieve from the cache.
- @param callbackQueue The queue to call `completion` on.
- @param completion The block to be called when the cache has either hit or missed.
- @discussion If `URL` is nil, `completion` will be invoked immediately with a nil image. This method should not block
- the calling thread as it is likely to be called from the main thread.
- */
-- (void)cachedImageWithURL:(NSURL *)URL
-             callbackQueue:(dispatch_queue_t)callbackQueue
-                completion:(ASImageCacherCompletion)completion;
-
-@optional
-
-/**
- @abstract Attempts to fetch an image with the given URL from a memory cache.
- @param URL The URL of the image to retrieve from the cache.
- @discussion This method exists to support synchronous rendering of nodes. Before the layer is drawn, this method
- is called to attempt to get the image out of the cache synchronously. This allows drawing to occur on the main thread
- if displaysAsynchronously is set to NO or recursivelyEnsureDisplaySynchronously: has been called.
- 
- This method *should* block the calling thread to fetch the image from a fast memory cache. It is OK to return nil from
- this method and instead support only cachedImageWithURL:callbackQueue:completion: however, synchronous rendering will
- not be possible.
- */
-- (nullable id <ASImageContainerProtocol>)synchronouslyFetchedCachedImageWithURL:(NSURL *)URL;
-
-/**
- @abstract Called during clearPreloadedData. Allows the cache to optionally trim items.
- @note Depending on your caches implementation you may *not* wish to respond to this method. It is however useful
- if you have a memory and disk cache in which case you'll likely want to clear out the memory cache.
- */
-- (void)clearFetchedImageFromCacheWithURL:(NSURL *)URL;
-
-@end
-
-/**
- @param image The image that was downloaded, if the image could be successfully downloaded; nil otherwise.
- @param error An error describing why the download of `URL` failed, if the download failed; nil otherwise.
- @param downloadIdentifier The identifier for the download task that completed.
- @param userInfo Any additional info that your downloader would like to communicate through Texture.
- */
-typedef void(^ASImageDownloaderCompletion)(id <ASImageContainerProtocol> _Nullable image, NSError * _Nullable error, id _Nullable downloadIdentifier, id _Nullable userInfo);
-
-/**
- @param progress The progress of the download, in the range of (0.0, 1.0), inclusive.
- */
-typedef void(^ASImageDownloaderProgress)(CGFloat progress);
-typedef void(^ASImageDownloaderProgressImage)(UIImage *progressImage, CGFloat progress, id _Nullable downloadIdentifier);
-
-typedef NS_ENUM(NSUInteger, ASImageDownloaderPriority) {
-  ASImageDownloaderPriorityPreload = 0,
-  ASImageDownloaderPriorityImminent,
-  ASImageDownloaderPriorityVisible
-};
-
-@protocol ASImageDownloaderProtocol <NSObject>
-
-@required
-
-/**
- @abstract Downloads an image with the given URL.
- @param URL The URL of the image to download.
- @param callbackQueue The queue to call `downloadProgressBlock` and `completion` on.
- @param downloadProgress The block to be invoked when the download of `URL` progresses.
- @param completion The block to be invoked when the download has completed, or has failed.
- @discussion This method is likely to be called on the main thread, so any custom implementations should make sure to background any expensive download operations.
- @result An opaque identifier to be used in canceling the download, via `cancelImageDownloadForIdentifier:`. You must
- retain the identifier if you wish to use it later.
- */
-- (nullable id)downloadImageWithURL:(NSURL *)URL
-                      callbackQueue:(dispatch_queue_t)callbackQueue
-                   downloadProgress:(nullable ASImageDownloaderProgress)downloadProgress
-                         completion:(ASImageDownloaderCompletion)completion;
-
-/**
-  @abstract Cancels an image download.
-  @param downloadIdentifier The opaque download identifier object returned from 
-      `downloadImageWithURL:callbackQueue:downloadProgress:completion:`.
-  @discussion This method has no effect if `downloadIdentifier` is nil.
- */
-- (void)cancelImageDownloadForIdentifier:(id)downloadIdentifier;
-
-@optional
-
-/**
- @abstract Downloads an image with the given URL.
- @param URL The URL of the image to download.
- @param priority The priority at which the image should be downloaded.
- @param callbackQueue The queue to call `downloadProgressBlock` and `completion` on.
- @param downloadProgress The block to be invoked when the download of `URL` progresses.
- @param completion The block to be invoked when the download has completed, or has failed.
- @discussion This method is likely to be called on the main thread, so any custom implementations should make sure to background any expensive download operations.
- @note If this method is implemented, it will be called instead of the required method (`downloadImageWithURL:callbackQueue:downloadProgress:completion:`).
- @result An opaque identifier to be used in canceling the download, via `cancelImageDownloadForIdentifier:`. You must
- retain the identifier if you wish to use it later.
- */
-- (nullable id)downloadImageWithURL:(NSURL *)URL
-                           priority:(ASImageDownloaderPriority)priority
-                      callbackQueue:(dispatch_queue_t)callbackQueue
-                   downloadProgress:(nullable ASImageDownloaderProgress)downloadProgress
-                         completion:(ASImageDownloaderCompletion)completion;
-
-/**
- @abstract Cancels an image download, however indicating resume data should be stored in case of redownload.
- @param downloadIdentifier The opaque download identifier object returned from
- `downloadImageWithURL:callbackQueue:downloadProgress:completion:`.
- @discussion This method has no effect if `downloadIdentifier` is nil. If implemented, this method
- may be called instead of `cancelImageDownloadForIdentifier:` in cases where ASDK believes there's a chance
- the image download will be resumed (currently when an image exits preload range). You can use this to store
- any data that has already been downloaded for use in resuming the download later.
- */
-- (void)cancelImageDownloadWithResumePossibilityForIdentifier:(id)downloadIdentifier;
-
-/**
- @abstract Return an object that conforms to ASAnimatedImageProtocol
- @param animatedImageData Data that represents an animated image.
- */
-- (nullable id <ASAnimatedImageProtocol>)animatedImageWithData:(NSData *)animatedImageData;
-
-
-/**
- @abstract Sets block to be called when a progress image is available.
- @param progressBlock The block to be invoked when the download has a progressive render of an image available.
- @param callbackQueue The queue to call `progressImageBlock` on.
- @param downloadIdentifier The opaque download identifier object returned from
- `downloadImageWithURL:callbackQueue:downloadProgressBlock:completion:`.
- */
-- (void)setProgressImageBlock:(nullable ASImageDownloaderProgressImage)progressBlock
-                callbackQueue:(dispatch_queue_t)callbackQueue
-       withDownloadIdentifier:(id)downloadIdentifier;
-
-/**
- @abstract Called to indicate what priority an image should be downloaded at.
- @param priority The priority at which the image should be downloaded.
- @param downloadIdentifier The opaque download identifier object returned from
- `downloadImageWithURL:callbackQueue:downloadProgressBlock:completion:`.
- */
-- (void)setPriority:(ASImageDownloaderPriority)priority
-withDownloadIdentifier:(id)downloadIdentifier;
-
-@end
-
-@protocol ASAnimatedImageProtocol <NSObject>
-
-@optional
-
-/**
- @abstract A block which receives the cover image. Should be called when the objects cover image is ready.
- */
-@property (nonatomic) void (^coverImageReadyCallback)(UIImage *coverImage);
-
-/**
- @abstract Returns whether the supplied data contains a supported animated image format.
- @param data the data to check if contains a supported animated image.
- */
-- (BOOL)isDataSupported:(NSData *)data;
-
-
-@required
-
-/**
- @abstract Return the objects's cover image.
- */
-@property (nonatomic, readonly) UIImage *coverImage;
-/**
- @abstract Return a boolean to indicate that the cover image is ready.
- */
-@property (nonatomic, readonly) BOOL coverImageReady;
-/**
- @abstract Return the total duration of the animated image's playback.
- */
-@property (nonatomic, readonly) CFTimeInterval totalDuration;
-/**
- @abstract Return the interval at which playback should occur. Will be set to a CADisplayLink's frame interval.
- */
-@property (nonatomic, readonly) NSUInteger frameInterval;
-/**
- @abstract Return the total number of loops the animated image should play or 0 to loop infinitely.
- */
-@property (nonatomic, readonly) size_t loopCount;
-/**
- @abstract Return the total number of frames in the animated image.
- */
-@property (nonatomic, readonly) size_t frameCount;
-/**
- @abstract Return YES when playback is ready to occur.
- */
-@property (nonatomic, readonly) BOOL playbackReady;
-/**
- @abstract Return any error that has occured. Playback will be paused if this returns non-nil.
- */
-@property (nonatomic, readonly) NSError *error;
-/**
- @abstract Should be called when playback is ready.
- */
-@property (nonatomic) dispatch_block_t playbackReadyCallback;
-
-/**
- @abstract Return the image at a given index.
- */
-- (CGImageRef)imageAtIndex:(NSUInteger)index;
-/**
- @abstract Return the duration at a given index.
- */
-- (CFTimeInterval)durationAtIndex:(NSUInteger)index;
-/**
- @abstract Clear any cached data. Called when playback is paused.
- */
-- (void)clearAnimatedImageCache;
-
-@end
-
-NS_ASSUME_NONNULL_END
diff --git a/submodules/AsyncDisplayKit/Source/Details/ASIntegerMap.h b/submodules/AsyncDisplayKit/Source/Details/ASIntegerMap.h
deleted file mode 100644
index ece6f5a8bf..0000000000
--- a/submodules/AsyncDisplayKit/Source/Details/ASIntegerMap.h
+++ /dev/null
@@ -1,68 +0,0 @@
-//
-//  ASIntegerMap.h
-//  Texture
-//
-//  Copyright (c) Pinterest, Inc.  All rights reserved.
-//  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
-//
-
-#import <Foundation/Foundation.h>
-#import <AsyncDisplayKit/ASBaseDefines.h>
-
-NS_ASSUME_NONNULL_BEGIN
-
-/**
- * An objective-C wrapper for unordered_map.
- */
-AS_SUBCLASSING_RESTRICTED
-@interface ASIntegerMap : NSObject <NSCopying>
-
-/**
- * Creates a map based on the specified update to an array.
- *
- * If oldCount is 0, returns the empty map.
- * If deleted and inserted are empty, returns the identity map.
- */
-+ (ASIntegerMap *)mapForUpdateWithOldCount:(NSInteger)oldCount
-                                   deleted:(nullable NSIndexSet *)deleted
-                                  inserted:(nullable NSIndexSet *)inserted NS_RETURNS_RETAINED;
-
-/**
- * A singleton that maps each integer to itself. Its inverse is itself.
- *
- * Note: You cannot mutate this.
- */
-@property (class, readonly) ASIntegerMap *identityMap;
-+ (ASIntegerMap *)identityMap NS_RETURNS_RETAINED;
-
-/**
- * A singleton that returns NSNotFound for all keys. Its inverse is itself.
- *
- * Note: You cannot mutate this.
- */
-@property (class, readonly) ASIntegerMap *emptyMap;
-+ (ASIntegerMap *)emptyMap NS_RETURNS_RETAINED;
-
-/**
- * Retrieves the integer for a given key, or NSNotFound if the key is not found.
- *
- * @param key A key to lookup the value for.
- */
-- (NSInteger)integerForKey:(NSInteger)key;
-
-/**
- * Sets the value for a given key.
- *
- * @param value The new value.
- * @param key The key to store the value for.
- */
-- (void)setInteger:(NSInteger)value forKey:(NSInteger)key;
-
-/**
- * Create and return a map with the inverse mapping.
- */
-- (ASIntegerMap *)inverseMap;
-
-@end
-
-NS_ASSUME_NONNULL_END
diff --git a/submodules/AsyncDisplayKit/Source/Details/ASIntegerMap.mm b/submodules/AsyncDisplayKit/Source/Details/ASIntegerMap.mm
deleted file mode 100644
index b07a7a1806..0000000000
--- a/submodules/AsyncDisplayKit/Source/Details/ASIntegerMap.mm
+++ /dev/null
@@ -1,185 +0,0 @@
-//
-//  ASIntegerMap.mm
-//  Texture
-//
-//  Copyright (c) Pinterest, Inc.  All rights reserved.
-//  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
-//
-
-#import "ASIntegerMap.h"
-#import <AsyncDisplayKit/ASAssert.h>
-#import <unordered_map>
-#import <AsyncDisplayKit/NSIndexSet+ASHelpers.h>
-#import <AsyncDisplayKit/ASObjectDescriptionHelpers.h>
-
-/**
- * This is just a friendly Objective-C interface to unordered_map<NSInteger, NSInteger>
- */
-@interface ASIntegerMap () <ASDescriptionProvider>
-@end
-
-@implementation ASIntegerMap {
-  std::unordered_map<NSInteger, NSInteger> _map;
-  BOOL _isIdentity;
-  BOOL _isEmpty;
-  BOOL _immutable; // identity map and empty mape are immutable.
-}
-
-#pragma mark - Singleton
-
-+ (ASIntegerMap *)identityMap NS_RETURNS_RETAINED
-{
-  static ASIntegerMap *identityMap;
-  static dispatch_once_t onceToken;
-  dispatch_once(&onceToken, ^{
-    identityMap = [[ASIntegerMap alloc] init];
-    identityMap->_isIdentity = YES;
-    identityMap->_immutable = YES;
-  });
-  return identityMap;
-}
-
-+ (ASIntegerMap *)emptyMap NS_RETURNS_RETAINED
-{
-  static ASIntegerMap *emptyMap;
-  static dispatch_once_t onceToken;
-  dispatch_once(&onceToken, ^{
-    emptyMap = [[ASIntegerMap alloc] init];
-    emptyMap->_isEmpty = YES;
-    emptyMap->_immutable = YES;
-  });
-  return emptyMap;
-}
-
-+ (ASIntegerMap *)mapForUpdateWithOldCount:(NSInteger)oldCount deleted:(NSIndexSet *)deletions inserted:(NSIndexSet *)insertions NS_RETURNS_RETAINED
-{
-  if (oldCount == 0) {
-    return ASIntegerMap.emptyMap;
-  }
-
-  if (deletions.count == 0 && insertions.count == 0) {
-    return ASIntegerMap.identityMap;
-  }
-
-  ASIntegerMap *result = [[ASIntegerMap alloc] init];
-  // Start with the old indexes
-  NSMutableIndexSet *indexes = [NSMutableIndexSet indexSetWithIndexesInRange:NSMakeRange(0, oldCount)];
-
-  // Descending order, shift deleted ranges left
-  [deletions enumerateRangesWithOptions:NSEnumerationReverse usingBlock:^(NSRange range, BOOL * _Nonnull stop) {
-    [indexes shiftIndexesStartingAtIndex:NSMaxRange(range) by:-range.length];
-  }];
-
-  // Ascending order, shift inserted ranges right
-  [insertions enumerateRangesUsingBlock:^(NSRange range, BOOL * _Nonnull stop) {
-    [indexes shiftIndexesStartingAtIndex:range.location by:range.length];
-  }];
-
-  __block NSInteger oldIndex = 0;
-  [indexes enumerateRangesUsingBlock:^(NSRange range, BOOL * _Nonnull stop) {
-    // Note we advance oldIndex unconditionally, not newIndex
-    for (NSInteger newIndex = range.location; newIndex < NSMaxRange(range); oldIndex++) {
-      if ([deletions containsIndex:oldIndex]) {
-        // index was deleted, do nothing, just let oldIndex advance.
-      } else {
-        // assign the next index for this item.
-        result->_map[oldIndex] = newIndex++;
-      }
-    }
-  }];
-  return result;
-}
-
-- (NSInteger)integerForKey:(NSInteger)key
-{
-  if (_isIdentity) {
-    return key;
-  } else if (_isEmpty) {
-    return NSNotFound;
-  }
-
-  const auto result = _map.find(key);
-  return result != _map.end() ? result->second : NSNotFound;
-}
-
-- (void)setInteger:(NSInteger)value forKey:(NSInteger)key
-{
-  if (_immutable) {
-    ASDisplayNodeFailAssert(@"Cannot mutate special integer map: %@", self);
-    return;
-  }
-
-  _map[key] = value;
-}
-
-- (ASIntegerMap *)inverseMap
-{
-  if (_isIdentity || _isEmpty) {
-    return self;
-  }
-
-  const auto result = [[ASIntegerMap alloc] init];
-  
-  for (const auto &e : _map) {
-    result->_map[e.second] = e.first;
-  }
-  return result;
-}
-
-#pragma mark - NSCopying
-
-- (id)copyWithZone:(NSZone *)zone
-{
-  if (_immutable) {
-    return self;
-  }
-
-  const auto newMap = [[ASIntegerMap allocWithZone:zone] init];
-  newMap->_map = _map;
-  return newMap;
-}
-
-#pragma mark - Description
-
-- (NSMutableArray<NSDictionary *> *)propertiesForDescription
-{
-  NSMutableArray *result = [NSMutableArray array];
-
-  if (_isIdentity) {
-    [result addObject:@{ @"map": @"<identity>" }];
-  } else if (_isEmpty) {
-    [result addObject:@{ @"map": @"<empty>" }];
-  } else {
-    // { 1->2 3->4 5->6 }
-    NSMutableString *str = [NSMutableString string];
-    for (const auto &e : _map) {
-      [str appendFormat:@" %ld->%ld", (long)e.first, (long)e.second];
-    }
-    // Remove leading space
-    if (str.length > 0) {
-      [str deleteCharactersInRange:NSMakeRange(0, 1)];
-    }
-    [result addObject:@{ @"map": str }];
-  }
-
-  return result;
-}
-
-- (NSString *)description
-{
-  return ASObjectDescriptionMakeWithoutObject([self propertiesForDescription]);
-}
-
-- (BOOL)isEqual:(id)object
-{
-  if ([super isEqual:object]) {
-    return YES;
-  }
-
-  if (ASIntegerMap *otherMap = ASDynamicCast(object, ASIntegerMap)) {
-    return otherMap->_map == _map;
-  }
-  return NO;
-}
-
-@end
diff --git a/submodules/AsyncDisplayKit/Source/Details/ASLayoutController.h b/submodules/AsyncDisplayKit/Source/Details/ASLayoutController.h
deleted file mode 100644
index d0e2f60907..0000000000
--- a/submodules/AsyncDisplayKit/Source/Details/ASLayoutController.h
+++ /dev/null
@@ -1,40 +0,0 @@
-//
-//  ASLayoutController.h
-//  Texture
-//
-//  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.
-//  Changes after 4/13/2017 are: Copyright (c) Pinterest, Inc.  All rights reserved.
-//  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
-//
-
-#import <UIKit/UIKit.h>
-
-#import <AsyncDisplayKit/ASBaseDefines.h>
-#import <AsyncDisplayKit/ASLayoutRangeType.h>
-#import <AsyncDisplayKit/ASScrollDirection.h>
-
-NS_ASSUME_NONNULL_BEGIN
-
-@class ASCollectionElement, ASElementMap;
-
-struct ASDirectionalScreenfulBuffer {
-  CGFloat positiveDirection; // Positive relative to iOS Core Animation layer coordinate space.
-  CGFloat negativeDirection;
-};
-typedef struct ASDirectionalScreenfulBuffer ASDirectionalScreenfulBuffer;
-
-@protocol ASLayoutController <NSObject>
-
-- (void)setTuningParameters:(ASRangeTuningParameters)tuningParameters forRangeMode:(ASLayoutRangeMode)rangeMode rangeType:(ASLayoutRangeType)rangeType;
-
-- (ASRangeTuningParameters)tuningParametersForRangeMode:(ASLayoutRangeMode)rangeMode rangeType:(ASLayoutRangeType)rangeType;
-
-- (NSHashTable<ASCollectionElement *> *)elementsForScrolling:(ASScrollDirection)scrollDirection rangeMode:(ASLayoutRangeMode)rangeMode rangeType:(ASLayoutRangeType)rangeType map:(ASElementMap *)map;
-
-- (void)allElementsForScrolling:(ASScrollDirection)scrollDirection rangeMode:(ASLayoutRangeMode)rangeMode displaySet:(NSHashTable<ASCollectionElement *> * _Nullable * _Nullable)displaySet preloadSet:(NSHashTable<ASCollectionElement *> * _Nullable * _Nullable)preloadSet map:(ASElementMap *)map;
-
-@optional
-
-@end
-
-NS_ASSUME_NONNULL_END
diff --git a/submodules/AsyncDisplayKit/Source/Details/ASLayoutRangeType.h b/submodules/AsyncDisplayKit/Source/Details/ASLayoutRangeType.h
deleted file mode 100644
index d4af470c06..0000000000
--- a/submodules/AsyncDisplayKit/Source/Details/ASLayoutRangeType.h
+++ /dev/null
@@ -1,68 +0,0 @@
-//
-//  ASLayoutRangeType.h
-//  Texture
-//
-//  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.
-//  Changes after 4/13/2017 are: Copyright (c) Pinterest, Inc.  All rights reserved.
-//  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
-//
-
-#import <Foundation/Foundation.h>
-#import <CoreGraphics/CGGeometry.h>
-
-typedef struct {
-  CGFloat leadingBufferScreenfuls;
-  CGFloat trailingBufferScreenfuls;
-} ASRangeTuningParameters;
-
-AS_EXTERN ASRangeTuningParameters const ASRangeTuningParametersZero;
-
-AS_EXTERN BOOL ASRangeTuningParametersEqualToRangeTuningParameters(ASRangeTuningParameters lhs, ASRangeTuningParameters rhs);
-
-/**
- * Each mode has a complete set of tuning parameters for range types.
- * Depending on some conditions (including interface state and direction of the scroll view, state of rendering engine, etc),
- * a range controller can choose which mode it should use at a given time.
- */
-typedef NS_ENUM(NSInteger, ASLayoutRangeMode) {
-  ASLayoutRangeModeUnspecified = -1,
-  
-  /**
-   * Minimum mode is used when a range controller should limit the amount of work it performs.
-   * Thus, fewer views/layers are created and less data is fetched, saving system resources.
-   * Range controller can automatically switch to full mode when conditions change.
-   */
-  ASLayoutRangeModeMinimum = 0,
-    
-  /**
-   * Normal/Full mode that a range controller uses to provide the best experience for end users.
-   * This mode is usually used for an active scroll view.
-   * A range controller under this requires more resources compare to minimum mode.
-   */
-  ASLayoutRangeModeFull,
-  
-  /**
-   * Visible Only mode is used when a range controller should set its display and preload regions to only the size of their bounds.
-   * This causes all additional backing stores & preloaded data to be released, while ensuring a user revisiting the view will
-   * still be able to see the expected content.  This mode is automatically set on all ASRangeControllers when the app suspends,
-   * allowing the operating system to keep the app alive longer and increase the chance it is still warm when the user returns.
-   */
-  ASLayoutRangeModeVisibleOnly,
-  
-  /**
-   * Low Memory mode is used when a range controller should discard ALL graphics buffers, including for the area that would be visible
-   * the next time the user views it (bounds).  The only range it preserves is Preload, which is limited to the bounds, allowing
-   * the content to be restored relatively quickly by re-decoding images (the compressed images are ~10% the size of the decoded ones,
-   * and text is a tiny fraction of its rendered size).
-   */
-  ASLayoutRangeModeLowMemory
-};
-
-static NSInteger const ASLayoutRangeModeCount = 4;
-
-typedef NS_ENUM(NSInteger, ASLayoutRangeType) {
-  ASLayoutRangeTypeDisplay,
-  ASLayoutRangeTypePreload
-};
-
-static NSInteger const ASLayoutRangeTypeCount = 2;
diff --git a/submodules/AsyncDisplayKit/Source/Details/ASMutableAttributedStringBuilder.h b/submodules/AsyncDisplayKit/Source/Details/ASMutableAttributedStringBuilder.h
deleted file mode 100644
index d531549a0e..0000000000
--- a/submodules/AsyncDisplayKit/Source/Details/ASMutableAttributedStringBuilder.h
+++ /dev/null
@@ -1,65 +0,0 @@
-//
-//  ASMutableAttributedStringBuilder.h
-//  Texture
-//
-//  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.
-//  Changes after 4/13/2017 are: Copyright (c) Pinterest, Inc.  All rights reserved.
-//  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
-//
-
-#import <Foundation/Foundation.h>
-#import <AsyncDisplayKit/ASBaseDefines.h>
-
-NS_ASSUME_NONNULL_BEGIN
-
-/*
- * Use this class to compose new attributed strings.  You may use the normal
- * attributed string calls on this the same way you would on a normal mutable
- * attributed string, but it coalesces your changes into transactions on the
- * actual string allowing improvements in performance.
- *
- * @discussion This is a use-once and throw away class for each string you make.
- * Since this class is designed for increasing performance, we actually hand
- * back the internally managed mutable attributed string in the
- * `composedAttributedString` call.  So once you make that call, any more
- * changes will actually modify the string that was handed back to you in that
- * method.
- *
- * Combination of multiple calls into single attribution is managed through
- * merging of attribute dictionaries over ranges.  For best performance, call
- * collections of attributions over a single range together.  So for instance,
- * don't call addAttributes for range1, then range2, then range1 again.  Group
- * them together so you call addAttributes for both range1 together, and then
- * range2.
- *
- * Also please note that switching between addAttribute and setAttributes in the
- * middle of composition is a bad idea for performance because they have
- * semantically different meanings, and trigger a commit of the pending
- * attributes.
- *
- * Please note that ALL of the standard NSString methods are left unimplemented.
- */
-AS_SUBCLASSING_RESTRICTED
-@interface ASMutableAttributedStringBuilder : NSMutableAttributedString
-
-- (instancetype)initWithString:(NSString *)str attributes:(nullable NSDictionary<NSString *, id> *)attrs;
-- (instancetype)initWithAttributedString:(NSAttributedString *)attrStr;
-
-- (void)replaceCharactersInRange:(NSRange)range withString:(NSString *)str;
-- (void)setAttributes:(nullable NSDictionary<NSString *, id> *)attrs range:(NSRange)range;
-
-- (void)addAttribute:(NSString *)name value:(id)value range:(NSRange)range;
-- (void)addAttributes:(NSDictionary<NSString *, id> *)attrs range:(NSRange)range;
-- (void)removeAttribute:(NSString *)name range:(NSRange)range;
-
-- (void)replaceCharactersInRange:(NSRange)range withAttributedString:(NSAttributedString *)attrString;
-- (void)insertAttributedString:(NSAttributedString *)attrString atIndex:(NSUInteger)loc;
-- (void)appendAttributedString:(NSAttributedString *)attrString;
-- (void)deleteCharactersInRange:(NSRange)range;
-- (void)setAttributedString:(NSAttributedString *)attrString;
-
-- (NSMutableAttributedString *)composedAttributedString;
-
-@end
-
-NS_ASSUME_NONNULL_END
diff --git a/submodules/AsyncDisplayKit/Source/Details/ASMutableAttributedStringBuilder.mm b/submodules/AsyncDisplayKit/Source/Details/ASMutableAttributedStringBuilder.mm
deleted file mode 100644
index b393fe1118..0000000000
--- a/submodules/AsyncDisplayKit/Source/Details/ASMutableAttributedStringBuilder.mm
+++ /dev/null
@@ -1,254 +0,0 @@
-//
-//  ASMutableAttributedStringBuilder.mm
-//  Texture
-//
-//  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.
-//  Changes after 4/13/2017 are: Copyright (c) Pinterest, Inc.  All rights reserved.
-//  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
-//
-
-#import <AsyncDisplayKit/ASMutableAttributedStringBuilder.h>
-
-@implementation ASMutableAttributedStringBuilder {
-  // Flag for the type of the current transaction (set or add)
-  BOOL _setRange;
-  // The range over which the currently pending transaction will occur
-  NSRange _pendingRange;
-  // The actual attribute dictionary that is being composed
-  NSMutableDictionary *_pendingRangeAttributes;
-  NSMutableAttributedString *_attrStr;
-
-  // We delay initialization of the _attrStr until we need to
-  NSString *_initString;
-}
-
-- (instancetype)init
-{
-  if (self = [super init]) {
-    _attrStr = [[NSMutableAttributedString alloc] init];
-    _pendingRange.location = NSNotFound;
-  }
-  return self;
-}
-
-- (instancetype)initWithString:(NSString *)str
-{
-  return [self initWithString:str attributes:@{}];
-}
-
-- (instancetype)initWithString:(NSString *)str attributes:(NSDictionary *)attrs
-{
-  if (self = [super init]) {
-    // We cache this in an ivar that we can lazily construct the attributed
-    // string with when we get to a forced commit point.
-    _initString = str;
-    // Triggers a creation of the _pendingRangeAttributes dictionary which then
-    // is filled with entries from the given attrs dict.
-    [[self _pendingRangeAttributes] addEntriesFromDictionary:attrs];
-    _setRange = NO;
-    _pendingRange = NSMakeRange(0, _initString.length);
-  }
-  return self;
-}
-
-- (instancetype)initWithAttributedString:(NSAttributedString *)attrStr
-{
-  if (self = [super init]) {
-    _attrStr = [[NSMutableAttributedString alloc] initWithAttributedString:attrStr];
-    _pendingRange.location = NSNotFound;
-  }
-  return self;
-}
-
-- (NSMutableAttributedString *)_attributedString
-{
-  if (_attrStr == nil && _initString != nil) {
-    // We can lazily construct the attributed string if it hasn't already been
-    // created with the existing pending attributes.  This is significantly
-    // faster if more attributes are added after initializing this instance
-    // and the new attributions are for the entire string anyway.
-    _attrStr = [[NSMutableAttributedString alloc] initWithString:_initString attributes:_pendingRangeAttributes];
-    _pendingRangeAttributes = nil;
-    _pendingRange.location = NSNotFound;
-    _initString = nil;
-  }
-
-  return _attrStr;
-}
-
-#pragma mark - Pending attribution
-
-- (NSMutableDictionary *)_pendingRangeAttributes
-{
-  // Lazy dictionary creation.  Call this if you want to force initialization,
-  // otherwise just use the ivar.
-  if (_pendingRangeAttributes == nil) {
-    _pendingRangeAttributes = [[NSMutableDictionary alloc] init];
-  }
-  return _pendingRangeAttributes;
-}
-
-- (void)_applyPendingRangeAttributions
-{
-  if (_attrStr == nil) {
-    // Trigger its creation if it doesn't exist.
-    [self _attributedString];
-  }
-
-  if (_pendingRangeAttributes.count == 0) {
-    return;
-  }
-
-  if (_pendingRange.location == NSNotFound) {
-    return;
-  }
-
-  if (_setRange) {
-    [[self _attributedString] setAttributes:_pendingRangeAttributes range:_pendingRange];
-  } else {
-    [[self _attributedString] addAttributes:_pendingRangeAttributes range:_pendingRange];
-  }
-  _pendingRangeAttributes = nil;
-  _pendingRange.location = NSNotFound;
-}
-
-#pragma mark - Editing
-
-- (void)replaceCharactersInRange:(NSRange)range withString:(NSString *)str
-{
-  [self _applyPendingRangeAttributions];
-  [[self _attributedString] replaceCharactersInRange:range withString:str];
-}
-
-- (void)replaceCharactersInRange:(NSRange)range withAttributedString:(NSAttributedString *)attrString
-{
-  [self _applyPendingRangeAttributions];
-  [[self _attributedString] replaceCharactersInRange:range withAttributedString:attrString];
-}
-
-- (void)addAttribute:(NSString *)name value:(id)value range:(NSRange)range
-{
-  if (_setRange) {
-    [self _applyPendingRangeAttributions];
-    _setRange = NO;
-  }
-
-  if (!NSEqualRanges(_pendingRange, range)) {
-    [self _applyPendingRangeAttributions];
-    _pendingRange = range;
-  }
-
-  NSMutableDictionary *pendingAttributes = [self _pendingRangeAttributes];
-  pendingAttributes[name] = value;
-}
-
-- (void)addAttributes:(NSDictionary *)attrs range:(NSRange)range
-{
-  if (_setRange) {
-    [self _applyPendingRangeAttributions];
-    _setRange = NO;
-  }
-
-  if (!NSEqualRanges(_pendingRange, range)) {
-    [self _applyPendingRangeAttributions];
-    _pendingRange = range;
-  }
-
-  NSMutableDictionary *pendingAttributes = [self _pendingRangeAttributes];
-  [pendingAttributes addEntriesFromDictionary:attrs];
-}
-
-- (void)insertAttributedString:(NSAttributedString *)attrString atIndex:(NSUInteger)loc
-{
-  [self _applyPendingRangeAttributions];
-  [[self _attributedString] insertAttributedString:attrString atIndex:loc];
-}
-
-- (void)appendAttributedString:(NSAttributedString *)attrString
-{
-  [self _applyPendingRangeAttributions];
-  [[self _attributedString] appendAttributedString:attrString];
-}
-
-- (void)deleteCharactersInRange:(NSRange)range
-{
-  [self _applyPendingRangeAttributions];
-  [[self _attributedString] deleteCharactersInRange:range];
-}
-
-- (void)setAttributedString:(NSAttributedString *)attrString
-{
-  [self _applyPendingRangeAttributions];
-  [[self _attributedString] setAttributedString:attrString];
-}
-
-- (void)setAttributes:(NSDictionary *)attrs range:(NSRange)range
-{
-  if (!_setRange) {
-    [self _applyPendingRangeAttributions];
-    _setRange = YES;
-  }
-
-  if (!NSEqualRanges(_pendingRange, range)) {
-    [self _applyPendingRangeAttributions];
-    _pendingRange = range;
-  }
-
-  NSMutableDictionary *pendingAttributes = [self _pendingRangeAttributes];
-  [pendingAttributes addEntriesFromDictionary:attrs];
-}
-
-- (void)removeAttribute:(NSString *)name range:(NSRange)range
-{
-  // This call looks like the other set/add functions, but in order for this
-  // function to perform as advertised we MUST first add the attributes we
-  // currently have pending.
-  [self _applyPendingRangeAttributions];
-
-  [[self _attributedString] removeAttribute:name range:range];
-}
-
-#pragma mark - Output
-
-- (NSMutableAttributedString *)composedAttributedString
-{
-  if (_pendingRangeAttributes.count > 0) {
-    [self _applyPendingRangeAttributions];
-  }
-  return [self _attributedString];
-}
-
-#pragma mark - Forwarding
-
-- (NSUInteger)length
-{
-  // If we just want a length call, no need to lazily construct the attributed string
-  return _attrStr ? _attrStr.length : _initString.length;
-}
-
-- (NSDictionary *)attributesAtIndex:(NSUInteger)location effectiveRange:(NSRangePointer)range
-{
-  return [[self _attributedString] attributesAtIndex:location effectiveRange:range];
-}
-
-- (NSString *)string
-{
-  return _attrStr ? _attrStr.string : _initString;
-}
-
-- (NSMutableString *)mutableString
-{
-  return [[self _attributedString] mutableString];
-}
-
-- (void)beginEditing
-{
-  [[self _attributedString] beginEditing];
-}
-
-- (void)endEditing
-{
-  [[self _attributedString] endEditing];
-}
-
-@end
diff --git a/submodules/AsyncDisplayKit/Source/Details/ASPINRemoteImageDownloader.h b/submodules/AsyncDisplayKit/Source/Details/ASPINRemoteImageDownloader.h
deleted file mode 100644
index dceca079e2..0000000000
--- a/submodules/AsyncDisplayKit/Source/Details/ASPINRemoteImageDownloader.h
+++ /dev/null
@@ -1,84 +0,0 @@
-//
-//  ASPINRemoteImageDownloader.h
-//  Texture
-//
-//  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.
-//  Changes after 4/13/2017 are: Copyright (c) Pinterest, Inc.  All rights reserved.
-//  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
-//
-
-#ifndef MINIMAL_ASDK
-
-#import <AsyncDisplayKit/ASAvailability.h>
-
-#if AS_PIN_REMOTE_IMAGE
-
-#import <AsyncDisplayKit/ASImageProtocols.h>
-
-NS_ASSUME_NONNULL_BEGIN
-
-@class PINRemoteImageManager;
-@protocol PINRemoteImageCaching;
-
-@interface ASPINRemoteImageDownloader : NSObject <ASImageCacheProtocol, ASImageDownloaderProtocol>
-
-/**
- * A shared image downloader which can be used by @c ASNetworkImageNodes and @c ASMultiplexImageNodes.
- * The userInfo provided by this downloader is an instance of `PINRemoteImageManagerResult`.
- *
- * This is the default downloader used by network backed image nodes if PINRemoteImage and PINCache are
- * available. It uses PINRemoteImage's features to provide caching and progressive image downloads.
- */
-+ (ASPINRemoteImageDownloader *)sharedDownloader NS_RETURNS_RETAINED;
-
-/**
- * Sets the default NSURLSessionConfiguration that will be used by @c ASNetworkImageNodes and @c ASMultiplexImageNodes
- * while loading images off the network. This must be specified early in the application lifecycle before
- * `sharedDownloader` is accessed.
- *
- * @param configuration The session configuration that will be used by `sharedDownloader`
- *
- */
-+ (void)setSharedImageManagerWithConfiguration:(nullable NSURLSessionConfiguration *)configuration;
-
-/**
- * Sets the default NSURLSessionConfiguration that will be used by @c ASNetworkImageNodes and @c ASMultiplexImageNodes
- * while loading images off the network. This must be specified early in the application lifecycle before
- * `sharedDownloader` is accessed.
- *
- * @param configuration The session configuration that will be used by `sharedDownloader`
- * @param imageCache The cache to be used by PINRemoteImage - nil will set up a default cache: PINCache
- * if it is available, PINRemoteImageBasicCache (NSCache) if not.
- *
- */
-+ (void)setSharedImageManagerWithConfiguration:(nullable NSURLSessionConfiguration *)configuration
-                                    imageCache:(nullable id<PINRemoteImageCaching>)imageCache;
-
-/**
- * Sets a custom preconfigured PINRemoteImageManager that will be used by @c ASNetworkImageNodes and @c ASMultiplexImageNodes
- * while loading images off the network. This must be specified early in the application lifecycle before
- * `sharedDownloader` is accessed.
- *
- * @param preconfiguredPINRemoteImageManager The preconfigured remote image manager that will be used by `sharedDownloader`
- */
-+ (void)setSharedPreconfiguredRemoteImageManager:(PINRemoteImageManager *)preconfiguredPINRemoteImageManager;
-
-/**
- * The shared instance of a @c PINRemoteImageManager used by all @c ASPINRemoteImageDownloaders
- *
- * @discussion you can use this method to access the shared manager. This is useful to share a cache
- * and resources if you need to download images outside of an @c ASNetworkImageNode or 
- * @c ASMultiplexImageNode. It's also useful to access the memoryCache and diskCache to set limits
- * or handle authentication challenges.
- *
- * @return An instance of a @c PINRemoteImageManager
- */
-- (PINRemoteImageManager *)sharedPINRemoteImageManager;
-
-@end
-
-NS_ASSUME_NONNULL_END
-
-#endif
-
-#endif
diff --git a/submodules/AsyncDisplayKit/Source/Details/ASPINRemoteImageDownloader.mm b/submodules/AsyncDisplayKit/Source/Details/ASPINRemoteImageDownloader.mm
deleted file mode 100644
index 84341b40c8..0000000000
--- a/submodules/AsyncDisplayKit/Source/Details/ASPINRemoteImageDownloader.mm
+++ /dev/null
@@ -1,393 +0,0 @@
-//
-//  ASPINRemoteImageDownloader.mm
-//  Texture
-//
-//  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.
-//  Changes after 4/13/2017 are: Copyright (c) Pinterest, Inc.  All rights reserved.
-//  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
-//
-
-#ifndef MINIMAL_ASDK
-
-#import <AsyncDisplayKit/ASAvailability.h>
-
-#if AS_PIN_REMOTE_IMAGE
-#import <AsyncDisplayKit/ASPINRemoteImageDownloader.h>
-
-#import <AsyncDisplayKit/ASAssert.h>
-#import <AsyncDisplayKit/ASThread.h>
-#import <AsyncDisplayKit/ASImageContainerProtocolCategories.h>
-
-#if __has_include (<PINRemoteImage/PINGIFAnimatedImage.h>)
-#define PIN_ANIMATED_AVAILABLE 1
-#import <PINRemoteImage/PINCachedAnimatedImage.h>
-#import <PINRemoteImage/PINAlternateRepresentationProvider.h>
-#else
-#define PIN_ANIMATED_AVAILABLE 0
-#endif
-
-#if __has_include(<webp/decode.h>)
-#define PIN_WEBP_AVAILABLE  1
-#else
-#define PIN_WEBP_AVAILABLE  0
-#endif
-
-#import <PINRemoteImage/PINRemoteImageManager.h>
-#import <PINRemoteImage/NSData+ImageDetectors.h>
-#import <PINRemoteImage/PINRemoteImageCaching.h>
-
-static inline PINRemoteImageManagerPriority PINRemoteImageManagerPriorityWithASImageDownloaderPriority(ASImageDownloaderPriority priority) {
-  switch (priority) {
-    case ASImageDownloaderPriorityPreload:
-      return PINRemoteImageManagerPriorityLow;
-
-    case ASImageDownloaderPriorityImminent:
-      return PINRemoteImageManagerPriorityDefault;
-
-    case ASImageDownloaderPriorityVisible:
-      return PINRemoteImageManagerPriorityHigh;
-  }
-}
-
-#if PIN_ANIMATED_AVAILABLE
-
-@interface ASPINRemoteImageDownloader () <PINRemoteImageManagerAlternateRepresentationProvider>
-@end
-
-@interface PINCachedAnimatedImage (ASPINRemoteImageDownloader) <ASAnimatedImageProtocol>
-@end
-
-@implementation PINCachedAnimatedImage (ASPINRemoteImageDownloader)
-
-- (BOOL)isDataSupported:(NSData *)data
-{
-    if ([data pin_isGIF]) {
-        return YES;
-    }
-#if PIN_WEBP_AVAILABLE
-    else if ([data pin_isAnimatedWebP]) {
-        return YES;
-    }
-#endif
-  return NO;
-}
-
-@end
-#endif
-
-// Declare two key methods on PINCache objects, avoiding a direct dependency on PINCache.h
-@protocol ASPINCache
-- (id)diskCache;
-@end
-
-@protocol ASPINDiskCache
-@property NSUInteger byteLimit;
-@end
-
-@interface ASPINRemoteImageManager : PINRemoteImageManager
-@end
-
-@implementation ASPINRemoteImageManager
-
-//Share image cache with sharedImageManager image cache.
-+ (id <PINRemoteImageCaching>)defaultImageCache
-{
-  static dispatch_once_t onceToken;
-  static id <PINRemoteImageCaching> cache = nil;
-  dispatch_once(&onceToken, ^{
-    cache = [[PINRemoteImageManager sharedImageManager] cache];
-    if ([cache respondsToSelector:@selector(diskCache)]) {
-      id diskCache = [(id <ASPINCache>)cache diskCache];
-      if ([diskCache respondsToSelector:@selector(setByteLimit:)]) {
-        // Set a default byteLimit. PINCache recently implemented a 50MB default (PR #201).
-        // Ensure that older versions of PINCache also have a byteLimit applied.
-        // NOTE: Using 20MB limit while large cache initialization is being optimized (Issue #144).
-        ((id <ASPINDiskCache>)diskCache).byteLimit = 20 * 1024 * 1024;
-      }
-    }
-  });
-  return cache;
-}
-
-@end
-
-static ASPINRemoteImageDownloader *sharedDownloader = nil;
-static PINRemoteImageManager *sharedPINRemoteImageManager = nil;
-
-@interface ASPINRemoteImageDownloader ()
-@end
-
-@implementation ASPINRemoteImageDownloader
-
-+ (ASPINRemoteImageDownloader *)sharedDownloader NS_RETURNS_RETAINED
-{
-  static dispatch_once_t onceToken = 0;
-  dispatch_once(&onceToken, ^{
-    sharedDownloader = [[ASPINRemoteImageDownloader alloc] init];
-  });
-  return sharedDownloader;
-}
-
-+ (void)setSharedImageManagerWithConfiguration:(nullable NSURLSessionConfiguration *)configuration
-{
-  NSAssert(sharedDownloader == nil, @"Singleton has been created and session can no longer be configured.");
-  PINRemoteImageManager *sharedManager = [self PINRemoteImageManagerWithConfiguration:configuration imageCache:nil];
-  [self setSharedPreconfiguredRemoteImageManager:sharedManager];
-}
-
-+ (void)setSharedImageManagerWithConfiguration:(nullable NSURLSessionConfiguration *)configuration
-                                    imageCache:(nullable id<PINRemoteImageCaching>)imageCache
-{
-  NSAssert(sharedDownloader == nil, @"Singleton has been created and session can no longer be configured.");
-  PINRemoteImageManager *sharedManager = [self PINRemoteImageManagerWithConfiguration:configuration imageCache:imageCache];
-  [self setSharedPreconfiguredRemoteImageManager:sharedManager];
-}
-
-static dispatch_once_t shared_init_predicate;
-
-+ (void)setSharedPreconfiguredRemoteImageManager:(PINRemoteImageManager *)preconfiguredPINRemoteImageManager
-{
-  NSAssert(preconfiguredPINRemoteImageManager != nil, @"setSharedPreconfiguredRemoteImageManager requires a non-nil parameter");
-  NSAssert1(sharedPINRemoteImageManager == nil, @"An instance of %@ has been set. Either configuration or preconfigured image manager can be set at a time and only once.", [[sharedPINRemoteImageManager class] description]);
-
-  dispatch_once(&shared_init_predicate, ^{
-    sharedPINRemoteImageManager = preconfiguredPINRemoteImageManager;
-  });
-}
-
-+ (PINRemoteImageManager *)PINRemoteImageManagerWithConfiguration:(nullable NSURLSessionConfiguration *)configuration imageCache:(nullable id<PINRemoteImageCaching>)imageCache
-{
-  PINRemoteImageManager *manager = nil;
-#if DEBUG
-  // Check that Carthage users have linked both PINRemoteImage & PINCache by testing for one file each
-  if (!(NSClassFromString(@"PINRemoteImageManager"))) {
-    NSException *e = [NSException
-                      exceptionWithName:@"FrameworkSetupException"
-                      reason:@"Missing the path to the PINRemoteImage framework."
-                      userInfo:nil];
-    @throw e;
-  }
-  if (!(NSClassFromString(@"PINCache"))) {
-    NSException *e = [NSException
-                      exceptionWithName:@"FrameworkSetupException"
-                      reason:@"Missing the path to the PINCache framework."
-                      userInfo:nil];
-    @throw e;
-  }
-#endif
-#if PIN_ANIMATED_AVAILABLE
-    manager = [[ASPINRemoteImageManager alloc] initWithSessionConfiguration:configuration
-                                                                   alternativeRepresentationProvider:[self sharedDownloader]
-                                                                   imageCache:imageCache];
-#else
-    manager = [[ASPINRemoteImageManager alloc] initWithSessionConfiguration:configuration
-                                                                 alternativeRepresentationProvider:nil
-                                                                 imageCache:imageCache];
-#endif
-  return manager;
-}
-
-- (PINRemoteImageManager *)sharedPINRemoteImageManager
-{
-  dispatch_once(&shared_init_predicate, ^{
-    sharedPINRemoteImageManager = [ASPINRemoteImageDownloader PINRemoteImageManagerWithConfiguration:nil imageCache:nil];
-  });
-  return sharedPINRemoteImageManager;
-}
-
-- (BOOL)sharedImageManagerSupportsMemoryRemoval
-{
-  static BOOL sharedImageManagerSupportsMemoryRemoval = NO;
-  static dispatch_once_t onceToken;
-  dispatch_once(&onceToken, ^{
-    sharedImageManagerSupportsMemoryRemoval = [[[self sharedPINRemoteImageManager] cache] respondsToSelector:@selector(removeObjectForKeyFromMemory:)];
-  });
-  return sharedImageManagerSupportsMemoryRemoval;
-}
-
-#pragma mark ASImageProtocols
-
-#if PIN_ANIMATED_AVAILABLE
-- (nullable id <ASAnimatedImageProtocol>)animatedImageWithData:(NSData *)animatedImageData
-{
-  return [[PINCachedAnimatedImage alloc] initWithAnimatedImageData:animatedImageData];
-}
-#endif
-
-- (id <ASImageContainerProtocol>)synchronouslyFetchedCachedImageWithURL:(NSURL *)URL;
-{
-  PINRemoteImageManager *manager = [self sharedPINRemoteImageManager];
-  PINRemoteImageManagerResult *result = [manager synchronousImageFromCacheWithURL:URL processorKey:nil options:PINRemoteImageManagerDownloadOptionsSkipDecode];
-  
-#if PIN_ANIMATED_AVAILABLE
-  if (result.alternativeRepresentation) {
-    return result.alternativeRepresentation;
-  }
-#endif
-  return result.image;
-}
-
-- (void)cachedImageWithURL:(NSURL *)URL
-             callbackQueue:(dispatch_queue_t)callbackQueue
-                completion:(ASImageCacherCompletion)completion
-{
-  [[self sharedPINRemoteImageManager] imageFromCacheWithURL:URL processorKey:nil options:PINRemoteImageManagerDownloadOptionsSkipDecode completion:^(PINRemoteImageManagerResult * _Nonnull result) {
-    [ASPINRemoteImageDownloader _performWithCallbackQueue:callbackQueue work:^{
-#if PIN_ANIMATED_AVAILABLE
-      if (result.alternativeRepresentation) {
-        completion(result.alternativeRepresentation);
-      } else {
-        completion(result.image);
-      }
-#else
-      completion(result.image);
-#endif
-    }];
-  }];
-}
-
-- (void)clearFetchedImageFromCacheWithURL:(NSURL *)URL
-{
-  if ([self sharedImageManagerSupportsMemoryRemoval]) {
-    PINRemoteImageManager *manager = [self sharedPINRemoteImageManager];
-    NSString *key = [manager cacheKeyForURL:URL processorKey:nil];
-    [[manager cache] removeObjectForKeyFromMemory:key];
-  }
-}
-
-- (nullable id)downloadImageWithURL:(NSURL *)URL
-                      callbackQueue:(dispatch_queue_t)callbackQueue
-                   downloadProgress:(ASImageDownloaderProgress)downloadProgress
-                         completion:(ASImageDownloaderCompletion)completion;
-{
-  return [self downloadImageWithURL:URL
-                           priority:ASImageDownloaderPriorityImminent // maps to default priority
-                      callbackQueue:callbackQueue
-                   downloadProgress:downloadProgress
-                         completion:completion];
-}
-
-- (nullable id)downloadImageWithURL:(NSURL *)URL
-                           priority:(ASImageDownloaderPriority)priority
-                      callbackQueue:(dispatch_queue_t)callbackQueue
-                   downloadProgress:(ASImageDownloaderProgress)downloadProgress
-                         completion:(ASImageDownloaderCompletion)completion
-{
-  PINRemoteImageManagerPriority pi_priority = PINRemoteImageManagerPriorityWithASImageDownloaderPriority(priority);
-
-  PINRemoteImageManagerProgressDownload progressDownload = ^(int64_t completedBytes, int64_t totalBytes) {
-    if (downloadProgress == nil) { return; }
-
-    [ASPINRemoteImageDownloader _performWithCallbackQueue:callbackQueue work:^{
-      downloadProgress(completedBytes / (CGFloat)totalBytes);
-    }];
-  };
-
-  PINRemoteImageManagerImageCompletion imageCompletion = ^(PINRemoteImageManagerResult * _Nonnull result) {
-    [ASPINRemoteImageDownloader _performWithCallbackQueue:callbackQueue work:^{
-#if PIN_ANIMATED_AVAILABLE
-      if (result.alternativeRepresentation) {
-        completion(result.alternativeRepresentation, result.error, result.UUID, result);
-      } else {
-        completion(result.image, result.error, result.UUID, result);
-      }
-#else
-      completion(result.image, result.error, result.UUID, result);
-#endif
-    }];
-  };
-
-  // add "IgnoreCache" option since we have a caching API so we already checked it, not worth checking again.
-  // PINRemoteImage is responsible for coalescing downloads, and even if it wasn't, the tiny probability of
-  // extra downloads isn't worth the effort of rechecking caches every single time. In order to provide
-  // feedback to the consumer about whether images are cached, we can't simply make the cache a no-op and
-  // check the cache as part of this download.
-  return [[self sharedPINRemoteImageManager] downloadImageWithURL:URL
-                                                          options:PINRemoteImageManagerDownloadOptionsSkipDecode | PINRemoteImageManagerDownloadOptionsIgnoreCache
-                                                         priority:pi_priority
-                                                    progressImage:nil
-                                                 progressDownload:progressDownload
-                                                       completion:imageCompletion];
-}
-
-- (void)cancelImageDownloadForIdentifier:(id)downloadIdentifier
-{
-  ASDisplayNodeAssert([downloadIdentifier isKindOfClass:[NSUUID class]], @"downloadIdentifier must be NSUUID");
-  [[self sharedPINRemoteImageManager] cancelTaskWithUUID:downloadIdentifier storeResumeData:NO];
-}
-
-- (void)cancelImageDownloadWithResumePossibilityForIdentifier:(id)downloadIdentifier
-{
-  ASDisplayNodeAssert([downloadIdentifier isKindOfClass:[NSUUID class]], @"downloadIdentifier must be NSUUID");
-  [[self sharedPINRemoteImageManager] cancelTaskWithUUID:downloadIdentifier storeResumeData:YES];
-}
-
-- (void)setProgressImageBlock:(ASImageDownloaderProgressImage)progressBlock callbackQueue:(dispatch_queue_t)callbackQueue withDownloadIdentifier:(id)downloadIdentifier
-{
-  ASDisplayNodeAssert([downloadIdentifier isKindOfClass:[NSUUID class]], @"downloadIdentifier must be NSUUID");
-
-  if (progressBlock) {
-    [[self sharedPINRemoteImageManager] setProgressImageCallback:^(PINRemoteImageManagerResult * _Nonnull result) {
-      dispatch_async(callbackQueue, ^{
-        progressBlock(result.image, result.renderedImageQuality, result.UUID);
-      });
-    } ofTaskWithUUID:downloadIdentifier];
-  } else {
-    [[self sharedPINRemoteImageManager] setProgressImageCallback:nil ofTaskWithUUID:downloadIdentifier];
-  }
-}
-
-- (void)setPriority:(ASImageDownloaderPriority)priority withDownloadIdentifier:(id)downloadIdentifier
-{
-  ASDisplayNodeAssert([downloadIdentifier isKindOfClass:[NSUUID class]], @"downloadIdentifier must be NSUUID");
-
-  PINRemoteImageManagerPriority pi_priority = PINRemoteImageManagerPriorityWithASImageDownloaderPriority(priority);
-  [[self sharedPINRemoteImageManager] setPriority:pi_priority ofTaskWithUUID:downloadIdentifier];
-}
-
-#pragma mark - PINRemoteImageManagerAlternateRepresentationProvider
-
-- (id)alternateRepresentationWithData:(NSData *)data options:(PINRemoteImageManagerDownloadOptions)options
-{
-#if PIN_ANIMATED_AVAILABLE
-  if ([data pin_isAnimatedGIF]) {
-    return data;
-  }
-#if PIN_WEBP_AVAILABLE
-  else if ([data pin_isAnimatedWebP]) {
-      return data;
-  }
-#endif
-    
-#endif
-  return nil;
-}
-
-#pragma mark - Private
-
-/**
- * If on main thread and queue is main, perform now.
- * If queue is nil, assert and perform now.
- * Otherwise, dispatch async to queue.
- */
-+ (void)_performWithCallbackQueue:(dispatch_queue_t)queue work:(void (^)(void))work
-{
-  if (work == nil) {
-    // No need to assert here, really. We aren't expecting any feedback from this method.
-    return;
-  }
-
-  if (ASDisplayNodeThreadIsMain() && queue == dispatch_get_main_queue()) {
-    work();
-  } else if (queue == nil) {
-    ASDisplayNodeFailAssert(@"Callback queue should not be nil.");
-    work();
-  } else {
-    dispatch_async(queue, work);
-  }
-}
-
-@end
-#endif
-
-#endif
diff --git a/submodules/AsyncDisplayKit/Source/Details/ASPageTable.h b/submodules/AsyncDisplayKit/Source/Details/ASPageTable.h
deleted file mode 100644
index 7e01e933a6..0000000000
--- a/submodules/AsyncDisplayKit/Source/Details/ASPageTable.h
+++ /dev/null
@@ -1,124 +0,0 @@
-//
-//  ASPageTable.h
-//  Texture
-//
-//  Copyright (c) Pinterest, Inc.  All rights reserved.
-//  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
-//
-
-#ifndef MINIMAL_ASDK
-
-#import <Foundation/Foundation.h>
-#import <UIKit/UIKit.h>
-#import <AsyncDisplayKit/ASAssert.h>
-#import <AsyncDisplayKit/ASBaseDefines.h>
-
-@class ASCollectionElement;
-
-NS_ASSUME_NONNULL_BEGIN
-
-/**
- * Represents x and y coordinates of a page.
- */
-typedef uintptr_t ASPageCoordinate;
-
-/**
- * Returns a page coordinate with the given x and y values. Both of them must be less than 65,535.
- */
-AS_EXTERN ASPageCoordinate ASPageCoordinateMake(uint16_t x, uint16_t y) AS_WARN_UNUSED_RESULT;
-
-/**
- * Returns coordinate of the page that contains the specified point.
- * Similar to CGRectContainsPoint, a point is considered inside a page if its  lie inside the page or on the minimum X or minimum Y edge.
- *
- * @param point The point that the page at the returned  should contain. Any negative  of the point will be corrected to 0.0
- *
- * @param pageSize The size of each page.
- */
-AS_EXTERN ASPageCoordinate ASPageCoordinateForPageThatContainsPoint(CGPoint point, CGSize pageSize) AS_WARN_UNUSED_RESULT;
-
-AS_EXTERN uint16_t ASPageCoordinateGetX(ASPageCoordinate pageCoordinate) AS_WARN_UNUSED_RESULT;
-
-AS_EXTERN uint16_t ASPageCoordinateGetY(ASPageCoordinate pageCoordinate) AS_WARN_UNUSED_RESULT;
-
-AS_EXTERN CGRect ASPageCoordinateGetPageRect(ASPageCoordinate pageCoordinate, CGSize pageSize) AS_WARN_UNUSED_RESULT;
-
-/**
- * Returns coordinate pointers for pages that intersect the specified rect. For each pointer, use ASPageCoordinateFromPointer() to get the original coordinate.
- * The specified rect is restricted to the bounds of a content rect that has an origin of {0, 0} and a size of the given contentSize.
- *
- * @param rect The rect intersecting the target pages.
- *
- * @param contentSize The combined size of all pages.
- *
- * @param pageSize The size of each page.
- */
-AS_EXTERN NSPointerArray * _Nullable ASPageCoordinatesForPagesThatIntersectRect(CGRect rect, CGSize contentSize, CGSize pageSize) AS_WARN_UNUSED_RESULT;
-
-/**
- * An alias for an NSMapTable created to store objects using ASPageCoordinates as keys.
- *
- * You should not call -objectForKey:, -setObject:forKey:, or -removeObjectForKey:
- * on these objects.
- */
-typedef NSMapTable ASPageTable;
-
-/**
- * A page to array of layout attributes table.
- */
-typedef ASPageTable<id, NSMutableArray<UICollectionViewLayoutAttributes *> *> ASPageToLayoutAttributesTable;
-
-/**
- * A category for creating & using map tables meant for storing objects using ASPage as keys.
- */
-@interface NSMapTable<id, ObjectType> (ASPageTableMethods)
-
-/**
- * Creates a new page table with (NSMapTableStrongMemory | NSMapTableObjectPointerPersonality) for values.
- */
-+ (ASPageTable *)pageTableForStrongObjectPointers NS_RETURNS_RETAINED;
-
-/**
- * Creates a new page table with (NSMapTableWeakMemory | NSMapTableObjectPointerPersonality) for values.
- */
-+ (ASPageTable *)pageTableForWeakObjectPointers NS_RETURNS_RETAINED;
-
-/**
- * Builds a new page to layout attributes from the given layout attributes.
- *
- * @param layoutAttributesEnumerator The layout attributes to build from
- *
- * @param contentSize The combined size of all pages.
- *
- * @param pageSize The size of each page.
- */
-+ (ASPageToLayoutAttributesTable *)pageTableWithLayoutAttributes:(id<NSFastEnumeration>)layoutAttributesEnumerator contentSize:(CGSize)contentSize pageSize:(CGSize)pageSize NS_RETURNS_RETAINED;
-
-/**
- * Retrieves the object for a given page, or nil if the page is not found.
- *
- * @param page A page to lookup the object for.
- */
-- (nullable ObjectType)objectForPage:(ASPageCoordinate)page;
-
-/**
- * Sets the given object for the associated page.
- *
- * @param object The object to store as value.
- *
- * @param page The page to use for the rect.
- */
-- (void)setObject:(ObjectType)object forPage:(ASPageCoordinate)page;
-
-/**
- * Removes the object for the given page, if one exists.
- *
- * @param page The page to remove.
- */
-- (void)removeObjectForPage:(ASPageCoordinate)page;
-
-@end
-
-NS_ASSUME_NONNULL_END
-
-#endif
diff --git a/submodules/AsyncDisplayKit/Source/Details/ASPageTable.mm b/submodules/AsyncDisplayKit/Source/Details/ASPageTable.mm
deleted file mode 100644
index af74d0c59e..0000000000
--- a/submodules/AsyncDisplayKit/Source/Details/ASPageTable.mm
+++ /dev/null
@@ -1,151 +0,0 @@
-//
-//  ASPageTable.mm
-//  Texture
-//
-//  Copyright (c) Pinterest, Inc.  All rights reserved.
-//  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
-//
-
-#ifndef MINIMAL_ASDK
-
-#import <AsyncDisplayKit/ASPageTable.h>
-
-ASPageCoordinate ASPageCoordinateMake(uint16_t x, uint16_t y)
-{
-  // Add 1 to the end result because 0 is not accepted by NSArray and NSMapTable.
-  // To avoid overflow after adding, x and y can't be UINT16_MAX (0xFFFF) **at the same time**.
-  // But for API simplification, we enforce the same restriction to both values.
-  ASDisplayNodeCAssert(x < UINT16_MAX, @"x coordinate must be less than 65,535");
-  ASDisplayNodeCAssert(y < UINT16_MAX, @"y coordinate must be less than 65,535");
-  return (x << 16) + y + 1;
-}
-
-ASPageCoordinate ASPageCoordinateForPageThatContainsPoint(CGPoint point, CGSize pageSize)
-{
-  return ASPageCoordinateMake((MAX(0.0, point.x) / pageSize.width), (MAX(0.0, point.y) / pageSize.height));
-}
-
-uint16_t ASPageCoordinateGetX(ASPageCoordinate pageCoordinate)
-{
-  return (pageCoordinate - 1) >> 16;
-}
-
-uint16_t ASPageCoordinateGetY(ASPageCoordinate pageCoordinate)
-{
-  return (pageCoordinate - 1) & ~(0xFFFF<<16);
-}
-
-CGRect ASPageCoordinateGetPageRect(ASPageCoordinate pageCoordinate, CGSize pageSize)
-{
-  CGFloat pageWidth = pageSize.width;
-  CGFloat pageHeight = pageSize.height;
-  return CGRectMake(ASPageCoordinateGetX(pageCoordinate) * pageWidth, ASPageCoordinateGetY(pageCoordinate) * pageHeight, pageWidth, pageHeight);
-}
-
-NSPointerArray *ASPageCoordinatesForPagesThatIntersectRect(CGRect rect, CGSize contentSize, CGSize pageSize)
-{
-  CGRect contentRect = CGRectMake(0.0, 0.0, contentSize.width, contentSize.height);
-  // Make sure the specified rect is within contentRect
-  rect = CGRectIntersection(rect, contentRect);
-  if (CGRectIsNull(rect) || CGRectIsEmpty(rect)) {
-    return nil;
-  }
-  
-  NSPointerArray *result = [NSPointerArray pointerArrayWithOptions:(NSPointerFunctionsIntegerPersonality | NSPointerFunctionsOpaqueMemory)];
-  
-  ASPageCoordinate minPage = ASPageCoordinateForPageThatContainsPoint(CGPointMake(CGRectGetMinX(rect), CGRectGetMinY(rect)), pageSize);
-  ASPageCoordinate maxPage = ASPageCoordinateForPageThatContainsPoint(CGPointMake(CGRectGetMaxX(rect), CGRectGetMaxY(rect)), pageSize);
-  if (minPage == maxPage) {
-    [result addPointer:(void *)minPage];
-    return result;
-  }
-  
-  NSUInteger minX = ASPageCoordinateGetX(minPage);
-  NSUInteger minY = ASPageCoordinateGetY(minPage);
-  NSUInteger maxX = ASPageCoordinateGetX(maxPage);
-  NSUInteger maxY = ASPageCoordinateGetY(maxPage);
-  
-  for (NSUInteger x = minX; x <= maxX; x++) {
-    for (NSUInteger y = minY; y <= maxY; y++) {
-      ASPageCoordinate page = ASPageCoordinateMake(x, y);
-      [result addPointer:(void *)page];
-    }
-  }
-  
-  return result;
-}
-
-@implementation NSMapTable (ASPageTableMethods)
-
-+ (instancetype)pageTableWithValuePointerFunctions:(NSPointerFunctions *)valueFuncs NS_RETURNS_RETAINED
-{
-  static NSPointerFunctions *pageCoordinatesFuncs;
-  static dispatch_once_t onceToken;
-  dispatch_once(&onceToken, ^{
-    pageCoordinatesFuncs = [NSPointerFunctions pointerFunctionsWithOptions:NSPointerFunctionsIntegerPersonality | NSPointerFunctionsOpaqueMemory];
-  });
-  
-  return [[NSMapTable alloc] initWithKeyPointerFunctions:pageCoordinatesFuncs valuePointerFunctions:valueFuncs capacity:0];
-}
-
-+ (ASPageTable *)pageTableForStrongObjectPointers NS_RETURNS_RETAINED
-{
-  static NSPointerFunctions *strongObjectPointerFuncs;
-  static dispatch_once_t onceToken;
-  dispatch_once(&onceToken, ^{
-    strongObjectPointerFuncs = [NSPointerFunctions pointerFunctionsWithOptions:NSPointerFunctionsStrongMemory];
-  });
-  return [self pageTableWithValuePointerFunctions:strongObjectPointerFuncs];
-}
-
-+ (ASPageTable *)pageTableForWeakObjectPointers NS_RETURNS_RETAINED
-{
-  static NSPointerFunctions *weakObjectPointerFuncs;
-  static dispatch_once_t onceToken;
-  dispatch_once(&onceToken, ^{
-    weakObjectPointerFuncs = [NSPointerFunctions pointerFunctionsWithOptions:NSPointerFunctionsWeakMemory];
-  });
-  return [self pageTableWithValuePointerFunctions:weakObjectPointerFuncs];
-}
-
-+ (ASPageToLayoutAttributesTable *)pageTableWithLayoutAttributes:(id<NSFastEnumeration>)layoutAttributesEnumerator contentSize:(CGSize)contentSize pageSize:(CGSize)pageSize NS_RETURNS_RETAINED
-{
-  ASPageToLayoutAttributesTable *result = [ASPageTable pageTableForStrongObjectPointers];
-  for (UICollectionViewLayoutAttributes *attrs in layoutAttributesEnumerator) {
-    // This attrs may span multiple pages. Make sure it's registered to all of them
-    NSPointerArray *pages = ASPageCoordinatesForPagesThatIntersectRect(attrs.frame, contentSize, pageSize);
-    
-    for (id pagePtr in pages) {
-      ASPageCoordinate page = (ASPageCoordinate)pagePtr;
-      NSMutableArray<UICollectionViewLayoutAttributes *> *attrsInPage = [result objectForPage:page];
-      if (attrsInPage == nil) {
-        attrsInPage = [[NSMutableArray alloc] init];
-        [result setObject:attrsInPage forPage:page];
-      }
-      [attrsInPage addObject:attrs];
-    }
-  }  
-  return result;
-}
-
-- (id)objectForPage:(ASPageCoordinate)page
-{
-  __unsafe_unretained id key = (__bridge id)(void *)page;
-  return [self objectForKey:key];
-}
-
-- (void)setObject:(id)object forPage:(ASPageCoordinate)page
-{
-  __unsafe_unretained id key = (__bridge id)(void *)page;
-  [self setObject:object forKey:key];
-}
-
-- (void)removeObjectForPage:(ASPageCoordinate)page
-{
-  __unsafe_unretained id key = (__bridge id)(void *)page;
-  [self removeObjectForKey:key];
-}
-
-@end
-
-#endif
diff --git a/submodules/AsyncDisplayKit/Source/Details/ASPhotosFrameworkImageRequest.h b/submodules/AsyncDisplayKit/Source/Details/ASPhotosFrameworkImageRequest.h
deleted file mode 100644
index 2ca24bfbee..0000000000
--- a/submodules/AsyncDisplayKit/Source/Details/ASPhotosFrameworkImageRequest.h
+++ /dev/null
@@ -1,73 +0,0 @@
-//
-//  ASPhotosFrameworkImageRequest.h
-//  Texture
-//
-//  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.
-//  Changes after 4/13/2017 are: Copyright (c) Pinterest, Inc.  All rights reserved.
-//  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
-//
-
-#import <AsyncDisplayKit/ASAvailability.h>
-
-#if AS_USE_PHOTOS
-
-#import <UIKit/UIKit.h>
-#import <Photos/Photos.h>
-#import <AsyncDisplayKit/ASBaseDefines.h>
-
-NS_ASSUME_NONNULL_BEGIN
-
-AS_EXTERN NSString *const ASPhotosURLScheme;
-
-/**
- @abstract Use ASPhotosFrameworkImageRequest to encapsulate all the information needed to request an image from
- the Photos framework and store it in a URL.
- */
-API_AVAILABLE(ios(8.0), tvos(10.0))
-@interface ASPhotosFrameworkImageRequest : NSObject <NSCopying>
-
-- (instancetype)initWithAssetIdentifier:(NSString *)assetIdentifier NS_DESIGNATED_INITIALIZER;
-
-/**
- @return A new image request deserialized from `url`, or nil if `url` is not a valid photos URL.
- */
-+ (nullable ASPhotosFrameworkImageRequest *)requestWithURL:(NSURL *)url;
-
-/**
- @abstract The asset identifier for this image request provided during initialization.
- */
-@property (nonatomic, readonly) NSString *assetIdentifier;
-
-/**
- @abstract The target size for this image request. Defaults to `PHImageManagerMaximumSize`.
- */
-@property (nonatomic) CGSize targetSize;
-
-/**
- @abstract The content mode for this image request. Defaults to `PHImageContentModeDefault`.
- 
- @see `PHImageManager`
- */
-@property (nonatomic) PHImageContentMode contentMode;
-
-/**
- @abstract The options specified for this request. Default value is the result of `[PHImageRequestOptions new]`.
- 
- @discussion Some properties of this object are ignored when converting this request into a URL.
- As of iOS SDK 9.0, these properties are `progressHandler` and `synchronous`.
- */
-@property (nonatomic) PHImageRequestOptions *options;
-
-/**
- @return A new URL converted from this request.
- */
-@property (nonatomic, readonly) NSURL *url;
-
-- (instancetype)init NS_UNAVAILABLE;
-+ (instancetype)new NS_UNAVAILABLE;
-
-@end
-
-NS_ASSUME_NONNULL_END
-
-#endif // AS_USE_PHOTOS
diff --git a/submodules/AsyncDisplayKit/Source/Details/ASPhotosFrameworkImageRequest.h.orig b/submodules/AsyncDisplayKit/Source/Details/ASPhotosFrameworkImageRequest.h.orig
deleted file mode 100644
index bf52121f9e..0000000000
--- a/submodules/AsyncDisplayKit/Source/Details/ASPhotosFrameworkImageRequest.h.orig
+++ /dev/null
@@ -1,81 +0,0 @@
-//
-//  ASPhotosFrameworkImageRequest.h
-//  Texture
-//
-//  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.
-//  Changes after 4/13/2017 are: Copyright (c) Pinterest, Inc.  All rights reserved.
-//  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
-//
-
-<<<<<<< HEAD
-#ifndef MINIMAL_ASDK
-=======
-#import <AsyncDisplayKit/ASAvailability.h>
-
-#if AS_USE_PHOTOS
-
->>>>>>> 565da7d4935740d12fc204aa061faf093831da1e
-#import <UIKit/UIKit.h>
-#import <Photos/Photos.h>
-#import <AsyncDisplayKit/ASBaseDefines.h>
-
-NS_ASSUME_NONNULL_BEGIN
-
-AS_EXTERN NSString *const ASPhotosURLScheme;
-
-/**
- @abstract Use ASPhotosFrameworkImageRequest to encapsulate all the information needed to request an image from
- the Photos framework and store it in a URL.
- */
-API_AVAILABLE(ios(8.0), tvos(10.0))
-@interface ASPhotosFrameworkImageRequest : NSObject <NSCopying>
-
-- (instancetype)initWithAssetIdentifier:(NSString *)assetIdentifier NS_DESIGNATED_INITIALIZER;
-
-/**
- @return A new image request deserialized from `url`, or nil if `url` is not a valid photos URL.
- */
-+ (nullable ASPhotosFrameworkImageRequest *)requestWithURL:(NSURL *)url;
-
-/**
- @abstract The asset identifier for this image request provided during initialization.
- */
-@property (nonatomic, readonly) NSString *assetIdentifier;
-
-/**
- @abstract The target size for this image request. Defaults to `PHImageManagerMaximumSize`.
- */
-@property (nonatomic) CGSize targetSize;
-
-/**
- @abstract The content mode for this image request. Defaults to `PHImageContentModeDefault`.
- 
- @see `PHImageManager`
- */
-@property (nonatomic) PHImageContentMode contentMode;
-
-/**
- @abstract The options specified for this request. Default value is the result of `[PHImageRequestOptions new]`.
- 
- @discussion Some properties of this object are ignored when converting this request into a URL.
- As of iOS SDK 9.0, these properties are `progressHandler` and `synchronous`.
- */
-@property (nonatomic) PHImageRequestOptions *options;
-
-/**
- @return A new URL converted from this request.
- */
-@property (nonatomic, readonly) NSURL *url;
-
-- (instancetype)init NS_UNAVAILABLE;
-+ (instancetype)new NS_UNAVAILABLE;
-
-@end
-
-NS_ASSUME_NONNULL_END
-<<<<<<< HEAD
-#endif
-=======
-
-#endif // AS_USE_PHOTOS
->>>>>>> 565da7d4935740d12fc204aa061faf093831da1e
diff --git a/submodules/AsyncDisplayKit/Source/Details/ASPhotosFrameworkImageRequest.m.orig b/submodules/AsyncDisplayKit/Source/Details/ASPhotosFrameworkImageRequest.m.orig
deleted file mode 100644
index e24ee882b2..0000000000
--- a/submodules/AsyncDisplayKit/Source/Details/ASPhotosFrameworkImageRequest.m.orig
+++ /dev/null
@@ -1,163 +0,0 @@
-//
-//  ASPhotosFrameworkImageRequest.m
-//  Texture
-//
-//  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.
-//  Changes after 4/13/2017 are: Copyright (c) Pinterest, Inc.  All rights reserved.
-//  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
-//
-#ifndef MINIMAL_ASDK
-#import <AsyncDisplayKit/ASPhotosFrameworkImageRequest.h>
-
-#if AS_USE_PHOTOS
-
-#import <AsyncDisplayKit/ASBaseDefines.h>
-
-NSString *const ASPhotosURLScheme = @"ph";
-
-static NSString *const _ASPhotosURLQueryKeyWidth = @"width";
-static NSString *const _ASPhotosURLQueryKeyHeight = @"height";
-
-// value is PHImageContentMode value
-static NSString *const _ASPhotosURLQueryKeyContentMode = @"contentmode";
-
-// value is PHImageRequestOptionsResizeMode value
-static NSString *const _ASPhotosURLQueryKeyResizeMode = @"resizemode";
-
-// value is PHImageRequestOptionsDeliveryMode value
-static NSString *const _ASPhotosURLQueryKeyDeliveryMode = @"deliverymode";
-
-// value is PHImageRequestOptionsVersion value
-static NSString *const _ASPhotosURLQueryKeyVersion = @"version";
-
-// value is 0 or 1
-static NSString *const _ASPhotosURLQueryKeyAllowNetworkAccess = @"network";
-
-static NSString *const _ASPhotosURLQueryKeyCropOriginX = @"crop_x";
-static NSString *const _ASPhotosURLQueryKeyCropOriginY = @"crop_y";
-static NSString *const _ASPhotosURLQueryKeyCropWidth = @"crop_w";
-static NSString *const _ASPhotosURLQueryKeyCropHeight = @"crop_h";
-
-@implementation ASPhotosFrameworkImageRequest
-
-- (instancetype)initWithAssetIdentifier:(NSString *)assetIdentifier
-{
-  self = [super init];
-  if (self) {
-    _assetIdentifier = assetIdentifier;
-    _options = [PHImageRequestOptions new];
-    _contentMode = PHImageContentModeDefault;
-    _targetSize = PHImageManagerMaximumSize;
-  }
-  return self;
-}
-
-#pragma mark NSCopying
-
-- (id)copyWithZone:(NSZone *)zone
-{
-  ASPhotosFrameworkImageRequest *copy = [[ASPhotosFrameworkImageRequest alloc] initWithAssetIdentifier:self.assetIdentifier];
-  copy.options = [self.options copy];
-  copy.targetSize = self.targetSize;
-  copy.contentMode = self.contentMode;
-  return copy;
-}
-
-#pragma mark Converting to URL
-
-- (NSURL *)url
-{
-  NSURLComponents *comp = [NSURLComponents new];
-  comp.scheme = ASPhotosURLScheme;
-  comp.host = _assetIdentifier;
-  NSMutableArray *queryItems = [NSMutableArray arrayWithObjects:
-    [NSURLQueryItem queryItemWithName:_ASPhotosURLQueryKeyWidth value:@(_targetSize.width).stringValue],
-    [NSURLQueryItem queryItemWithName:_ASPhotosURLQueryKeyHeight value:@(_targetSize.height).stringValue],
-    [NSURLQueryItem queryItemWithName:_ASPhotosURLQueryKeyVersion value:@(_options.version).stringValue],
-    [NSURLQueryItem queryItemWithName:_ASPhotosURLQueryKeyContentMode value:@(_contentMode).stringValue],
-    [NSURLQueryItem queryItemWithName:_ASPhotosURLQueryKeyAllowNetworkAccess value:@(_options.networkAccessAllowed).stringValue],
-    [NSURLQueryItem queryItemWithName:_ASPhotosURLQueryKeyResizeMode value:@(_options.resizeMode).stringValue],
-    [NSURLQueryItem queryItemWithName:_ASPhotosURLQueryKeyDeliveryMode value:@(_options.deliveryMode).stringValue]
-  , nil];
-  
-  CGRect cropRect = _options.normalizedCropRect;
-  if (!CGRectIsEmpty(cropRect)) {
-    [queryItems addObjectsFromArray:@[
-      [NSURLQueryItem queryItemWithName:_ASPhotosURLQueryKeyCropOriginX value:@(cropRect.origin.x).stringValue],
-      [NSURLQueryItem queryItemWithName:_ASPhotosURLQueryKeyCropOriginY value:@(cropRect.origin.y).stringValue],
-      [NSURLQueryItem queryItemWithName:_ASPhotosURLQueryKeyCropWidth value:@(cropRect.size.width).stringValue],
-      [NSURLQueryItem queryItemWithName:_ASPhotosURLQueryKeyCropHeight value:@(cropRect.size.height).stringValue]
-    ]];
-  }
-  comp.queryItems = queryItems;
-  return comp.URL;
-}
-
-#pragma mark Converting from URL
-
-+ (ASPhotosFrameworkImageRequest *)requestWithURL:(NSURL *)url
-{
-  // not a photos URL
-  if (![url.scheme isEqualToString:ASPhotosURLScheme]) {
-    return nil;
-  }
-  
-  NSURLComponents *comp = [NSURLComponents componentsWithURL:url resolvingAgainstBaseURL:NO];
-  
-  ASPhotosFrameworkImageRequest *request = [[ASPhotosFrameworkImageRequest alloc] initWithAssetIdentifier:url.host];
-  
-  CGRect cropRect = CGRectZero;
-  CGSize targetSize = PHImageManagerMaximumSize;
-  for (NSURLQueryItem *item in comp.queryItems) {
-    if ([_ASPhotosURLQueryKeyAllowNetworkAccess isEqualToString:item.name]) {
-      request.options.networkAccessAllowed = item.value.boolValue;
-    } else if ([_ASPhotosURLQueryKeyWidth isEqualToString:item.name]) {
-      targetSize.width = item.value.doubleValue;
-    } else if ([_ASPhotosURLQueryKeyHeight isEqualToString:item.name]) {
-      targetSize.height = item.value.doubleValue;
-    } else if ([_ASPhotosURLQueryKeyContentMode isEqualToString:item.name]) {
-      request.contentMode = (PHImageContentMode)item.value.integerValue;
-    } else if ([_ASPhotosURLQueryKeyVersion isEqualToString:item.name]) {
-      request.options.version = (PHImageRequestOptionsVersion)item.value.integerValue;
-    } else if ([_ASPhotosURLQueryKeyCropOriginX isEqualToString:item.name]) {
-      cropRect.origin.x = item.value.doubleValue;
-    } else if ([_ASPhotosURLQueryKeyCropOriginY isEqualToString:item.name]) {
-      cropRect.origin.y = item.value.doubleValue;
-    } else if ([_ASPhotosURLQueryKeyCropWidth isEqualToString:item.name]) {
-      cropRect.size.width = item.value.doubleValue;
-    } else if ([_ASPhotosURLQueryKeyCropHeight isEqualToString:item.name]) {
-      cropRect.size.height = item.value.doubleValue;
-    } else if ([_ASPhotosURLQueryKeyResizeMode isEqualToString:item.name]) {
-      request.options.resizeMode = (PHImageRequestOptionsResizeMode)item.value.integerValue;
-    } else if ([_ASPhotosURLQueryKeyDeliveryMode isEqualToString:item.name]) {
-      request.options.deliveryMode = (PHImageRequestOptionsDeliveryMode)item.value.integerValue;
-    }
-  }
-  request.targetSize = targetSize;
-  request.options.normalizedCropRect = cropRect;
-  return request;
-}
-
-#pragma mark NSObject
-
-- (BOOL)isEqual:(id)object
-{
-  if (![object isKindOfClass:ASPhotosFrameworkImageRequest.class]) {
-    return NO;
-  }
-  ASPhotosFrameworkImageRequest *other = object;
-  return [other.assetIdentifier isEqualToString:self.assetIdentifier] &&
-    other.contentMode == self.contentMode &&
-    CGSizeEqualToSize(other.targetSize, self.targetSize) &&
-    CGRectEqualToRect(other.options.normalizedCropRect, self.options.normalizedCropRect) &&
-    other.options.resizeMode == self.options.resizeMode &&
-    other.options.version == self.options.version;
-}
-
-@end
-<<<<<<< HEAD
-#endif
-=======
-
-#endif // AS_USE_PHOTOS
->>>>>>> 565da7d4935740d12fc204aa061faf093831da1e
diff --git a/submodules/AsyncDisplayKit/Source/Details/ASPhotosFrameworkImageRequest.mm b/submodules/AsyncDisplayKit/Source/Details/ASPhotosFrameworkImageRequest.mm
deleted file mode 100644
index a7e0b41655..0000000000
--- a/submodules/AsyncDisplayKit/Source/Details/ASPhotosFrameworkImageRequest.mm
+++ /dev/null
@@ -1,159 +0,0 @@
-//
-//  ASPhotosFrameworkImageRequest.mm
-//  Texture
-//
-//  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.
-//  Changes after 4/13/2017 are: Copyright (c) Pinterest, Inc.  All rights reserved.
-//  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
-//
-
-#import <AsyncDisplayKit/ASPhotosFrameworkImageRequest.h>
-
-#if AS_USE_PHOTOS
-
-#import <AsyncDisplayKit/ASBaseDefines.h>
-
-NSString *const ASPhotosURLScheme = @"ph";
-
-static NSString *const _ASPhotosURLQueryKeyWidth = @"width";
-static NSString *const _ASPhotosURLQueryKeyHeight = @"height";
-
-// value is PHImageContentMode value
-static NSString *const _ASPhotosURLQueryKeyContentMode = @"contentmode";
-
-// value is PHImageRequestOptionsResizeMode value
-static NSString *const _ASPhotosURLQueryKeyResizeMode = @"resizemode";
-
-// value is PHImageRequestOptionsDeliveryMode value
-static NSString *const _ASPhotosURLQueryKeyDeliveryMode = @"deliverymode";
-
-// value is PHImageRequestOptionsVersion value
-static NSString *const _ASPhotosURLQueryKeyVersion = @"version";
-
-// value is 0 or 1
-static NSString *const _ASPhotosURLQueryKeyAllowNetworkAccess = @"network";
-
-static NSString *const _ASPhotosURLQueryKeyCropOriginX = @"crop_x";
-static NSString *const _ASPhotosURLQueryKeyCropOriginY = @"crop_y";
-static NSString *const _ASPhotosURLQueryKeyCropWidth = @"crop_w";
-static NSString *const _ASPhotosURLQueryKeyCropHeight = @"crop_h";
-
-@implementation ASPhotosFrameworkImageRequest
-
-- (instancetype)initWithAssetIdentifier:(NSString *)assetIdentifier
-{
-  self = [super init];
-  if (self) {
-    _assetIdentifier = assetIdentifier;
-    _options = [PHImageRequestOptions new];
-    _contentMode = PHImageContentModeDefault;
-    _targetSize = PHImageManagerMaximumSize;
-  }
-  return self;
-}
-
-#pragma mark NSCopying
-
-- (id)copyWithZone:(NSZone *)zone
-{
-  ASPhotosFrameworkImageRequest *copy = [[ASPhotosFrameworkImageRequest alloc] initWithAssetIdentifier:self.assetIdentifier];
-  copy.options = [self.options copy];
-  copy.targetSize = self.targetSize;
-  copy.contentMode = self.contentMode;
-  return copy;
-}
-
-#pragma mark Converting to URL
-
-- (NSURL *)url
-{
-  NSURLComponents *comp = [NSURLComponents new];
-  comp.scheme = ASPhotosURLScheme;
-  comp.host = _assetIdentifier;
-  NSMutableArray *queryItems = [NSMutableArray arrayWithObjects:
-    [NSURLQueryItem queryItemWithName:_ASPhotosURLQueryKeyWidth value:@(_targetSize.width).stringValue],
-    [NSURLQueryItem queryItemWithName:_ASPhotosURLQueryKeyHeight value:@(_targetSize.height).stringValue],
-    [NSURLQueryItem queryItemWithName:_ASPhotosURLQueryKeyVersion value:@(_options.version).stringValue],
-    [NSURLQueryItem queryItemWithName:_ASPhotosURLQueryKeyContentMode value:@(_contentMode).stringValue],
-    [NSURLQueryItem queryItemWithName:_ASPhotosURLQueryKeyAllowNetworkAccess value:@(_options.networkAccessAllowed).stringValue],
-    [NSURLQueryItem queryItemWithName:_ASPhotosURLQueryKeyResizeMode value:@(_options.resizeMode).stringValue],
-    [NSURLQueryItem queryItemWithName:_ASPhotosURLQueryKeyDeliveryMode value:@(_options.deliveryMode).stringValue]
-  , nil];
-  
-  CGRect cropRect = _options.normalizedCropRect;
-  if (!CGRectIsEmpty(cropRect)) {
-    [queryItems addObjectsFromArray:@[
-      [NSURLQueryItem queryItemWithName:_ASPhotosURLQueryKeyCropOriginX value:@(cropRect.origin.x).stringValue],
-      [NSURLQueryItem queryItemWithName:_ASPhotosURLQueryKeyCropOriginY value:@(cropRect.origin.y).stringValue],
-      [NSURLQueryItem queryItemWithName:_ASPhotosURLQueryKeyCropWidth value:@(cropRect.size.width).stringValue],
-      [NSURLQueryItem queryItemWithName:_ASPhotosURLQueryKeyCropHeight value:@(cropRect.size.height).stringValue]
-    ]];
-  }
-  comp.queryItems = queryItems;
-  return comp.URL;
-}
-
-#pragma mark Converting from URL
-
-+ (ASPhotosFrameworkImageRequest *)requestWithURL:(NSURL *)url
-{
-  // not a photos URL
-  if (![url.scheme isEqualToString:ASPhotosURLScheme]) {
-    return nil;
-  }
-  
-  NSURLComponents *comp = [NSURLComponents componentsWithURL:url resolvingAgainstBaseURL:NO];
-  
-  ASPhotosFrameworkImageRequest *request = [[ASPhotosFrameworkImageRequest alloc] initWithAssetIdentifier:url.host];
-  
-  CGRect cropRect = CGRectZero;
-  CGSize targetSize = PHImageManagerMaximumSize;
-  for (NSURLQueryItem *item in comp.queryItems) {
-    if ([_ASPhotosURLQueryKeyAllowNetworkAccess isEqualToString:item.name]) {
-      request.options.networkAccessAllowed = item.value.boolValue;
-    } else if ([_ASPhotosURLQueryKeyWidth isEqualToString:item.name]) {
-      targetSize.width = item.value.doubleValue;
-    } else if ([_ASPhotosURLQueryKeyHeight isEqualToString:item.name]) {
-      targetSize.height = item.value.doubleValue;
-    } else if ([_ASPhotosURLQueryKeyContentMode isEqualToString:item.name]) {
-      request.contentMode = (PHImageContentMode)item.value.integerValue;
-    } else if ([_ASPhotosURLQueryKeyVersion isEqualToString:item.name]) {
-      request.options.version = (PHImageRequestOptionsVersion)item.value.integerValue;
-    } else if ([_ASPhotosURLQueryKeyCropOriginX isEqualToString:item.name]) {
-      cropRect.origin.x = item.value.doubleValue;
-    } else if ([_ASPhotosURLQueryKeyCropOriginY isEqualToString:item.name]) {
-      cropRect.origin.y = item.value.doubleValue;
-    } else if ([_ASPhotosURLQueryKeyCropWidth isEqualToString:item.name]) {
-      cropRect.size.width = item.value.doubleValue;
-    } else if ([_ASPhotosURLQueryKeyCropHeight isEqualToString:item.name]) {
-      cropRect.size.height = item.value.doubleValue;
-    } else if ([_ASPhotosURLQueryKeyResizeMode isEqualToString:item.name]) {
-      request.options.resizeMode = (PHImageRequestOptionsResizeMode)item.value.integerValue;
-    } else if ([_ASPhotosURLQueryKeyDeliveryMode isEqualToString:item.name]) {
-      request.options.deliveryMode = (PHImageRequestOptionsDeliveryMode)item.value.integerValue;
-    }
-  }
-  request.targetSize = targetSize;
-  request.options.normalizedCropRect = cropRect;
-  return request;
-}
-
-#pragma mark NSObject
-
-- (BOOL)isEqual:(id)object
-{
-  if (![object isKindOfClass:ASPhotosFrameworkImageRequest.class]) {
-    return NO;
-  }
-  ASPhotosFrameworkImageRequest *other = object;
-  return [other.assetIdentifier isEqualToString:self.assetIdentifier] &&
-    other.contentMode == self.contentMode &&
-    CGSizeEqualToSize(other.targetSize, self.targetSize) &&
-    CGRectEqualToRect(other.options.normalizedCropRect, self.options.normalizedCropRect) &&
-    other.options.resizeMode == self.options.resizeMode &&
-    other.options.version == self.options.version;
-}
-
-@end
-
-#endif // AS_USE_PHOTOS
diff --git a/submodules/AsyncDisplayKit/Source/Details/ASRangeController.h b/submodules/AsyncDisplayKit/Source/Details/ASRangeController.h
deleted file mode 100644
index ebdc9befaf..0000000000
--- a/submodules/AsyncDisplayKit/Source/Details/ASRangeController.h
+++ /dev/null
@@ -1,206 +0,0 @@
-//
-//  ASRangeController.h
-//  Texture
-//
-//  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.
-//  Changes after 4/13/2017 are: Copyright (c) Pinterest, Inc.  All rights reserved.
-//  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
-//
-
-#ifndef MINIMAL_ASDK
-
-#import <Foundation/Foundation.h>
-#import <AsyncDisplayKit/ASDisplayNode.h>
-#import <AsyncDisplayKit/ASDataController.h>
-#import <AsyncDisplayKit/ASAbstractLayoutController.h>
-#import <AsyncDisplayKit/ASLayoutRangeType.h>
-#import <AsyncDisplayKit/ASRangeControllerUpdateRangeProtocol+Beta.h>
-#import <AsyncDisplayKit/ASBaseDefines.h>
-
-#define ASRangeControllerLoggingEnabled 0
-
-NS_ASSUME_NONNULL_BEGIN
-
-@class _ASHierarchyChangeSet;
-@protocol ASRangeControllerDataSource;
-@protocol ASRangeControllerDelegate;
-@protocol ASLayoutController;
-
-/**
- * Working range controller.
- *
- * Used internally by ASTableView and ASCollectionView.  It is paired with ASDataController.
- * It is designed to support custom scrolling containers as well.  Observes the visible range, maintains
- * "working ranges" to trigger network calls and rendering, and is responsible for driving asynchronous layout of cells.
- * This includes cancelling those asynchronous operations as cells fall outside of the working ranges.
- */
-AS_SUBCLASSING_RESTRICTED
-@interface ASRangeController : NSObject <ASDataControllerDelegate>
-{
-  id<ASLayoutController>                  _layoutController;
-  __weak id<ASRangeControllerDataSource>  _dataSource;
-  __weak id<ASRangeControllerDelegate>    _delegate;
-}
-
-/**
- * Notify the range controller that the visible range has been updated.
- * This is the primary input call that drives updating the working ranges, and triggering their actions.
- * The ranges will be updated in the next turn of the main loop, or when -updateIfNeeded is called.
- *
- * @see [ASRangeControllerDelegate rangeControllerVisibleNodeIndexPaths:]
- */
-- (void)setNeedsUpdate;
-
-/**
- * Update the ranges immediately, if -setNeedsUpdate has been called since the last update.
- * This is useful because the ranges must be updated immediately after a cell is added
- * into a table/collection to satisfy interface state API guarantees.
- */
-- (void)updateIfNeeded;
-
-/**
- * Force update the ranges immediately.
- */
-- (void)updateRanges;
-
-/**
- * Add the sized node for `indexPath` as a subview of `contentView`.
- *
- * @param contentView UIView to add a (sized) node's view to.
- *
- * @param node The cell node to be added.
- */
-- (void)configureContentView:(UIView *)contentView forCellNode:(ASCellNode *)node;
-
-- (void)setTuningParameters:(ASRangeTuningParameters)tuningParameters forRangeMode:(ASLayoutRangeMode)rangeMode rangeType:(ASLayoutRangeType)rangeType;
-
-- (ASRangeTuningParameters)tuningParametersForRangeMode:(ASLayoutRangeMode)rangeMode rangeType:(ASLayoutRangeType)rangeType;
-
-// These methods call the corresponding method on each node, visiting each one that
-// the range controller has set a non-default interface state on.
-- (void)clearContents;
-- (void)clearPreloadedData;
-
-/**
- * An object that describes the layout behavior of the ranged component (table view, collection view, etc.)
- *
- * Used primarily for providing the current range of index paths and identifying when the
- * range controller should invalidate its range.
- */
-@property (nonatomic) id<ASLayoutController> layoutController;
-
-/**
- * The underlying data source for the range controller
- */
-@property (nonatomic, weak) id<ASRangeControllerDataSource> dataSource;
-
-/**
- * Delegate for handling range controller events. Must not be nil.
- */
-@property (nonatomic, weak) id<ASRangeControllerDelegate> delegate;
-
-/**
- * Property that indicates whether the scroll view for this range controller has ever changed its contentOffset.
- */
-@property (nonatomic) BOOL contentHasBeenScrolled;
-
-@end
-
-
-/**
- * Data source for ASRangeController.
- *
- * Allows the range controller to perform external queries on the range. 
- * Ex. range nodes, visible index paths, and viewport size.
- */
-@protocol ASRangeControllerDataSource <NSObject>
-
-/**
- * @param rangeController Sender.
- *
- * @return an table of elements corresponding to the data currently visible onscreen (i.e., the visible range).
- */
-- (nullable NSHashTable<ASCollectionElement *> *)visibleElementsForRangeController:(ASRangeController *)rangeController;
-
-/**
- * @param rangeController Sender.
- *
- * @return the current scroll direction of the view using this range controller.
- */
-- (ASScrollDirection)scrollDirectionForRangeController:(ASRangeController *)rangeController;
-
-/**
- * @param rangeController Sender.
- *
- * @return the ASInterfaceState of the node that this controller is powering.  This allows nested range controllers
- * to collaborate with one another, as an outer controller may set bits in .interfaceState such as Visible.
- * If this controller is an orthogonally scrolling element, it waits until it is visible to preload outside the viewport.
- */
-- (ASInterfaceState)interfaceStateForRangeController:(ASRangeController *)rangeController;
-
-- (ASElementMap *)elementMapForRangeController:(ASRangeController *)rangeController;
-
-- (NSString *)nameForRangeControllerDataSource;
-
-@end
-
-/**
- * Delegate for ASRangeController.
- */
-@protocol ASRangeControllerDelegate <NSObject>
-
-/**
- * Called to update with given change set.
- *
- * @param changeSet The change set that includes all updates
- *
- * @param updates The block that performs relevant data updates.
- *
- * @discussion The updates block must always be executed or the data controller will get into a bad state.
- * It should be called at the time the backing view is ready to process the updates,
- * i.e inside the updates block of `-[UICollectionView performBatchUpdates:completion:] or after calling `-[UITableView beginUpdates]`.
- */
-- (void)rangeController:(ASRangeController *)rangeController updateWithChangeSet:(_ASHierarchyChangeSet *)changeSet updates:(dispatch_block_t)updates;
-
-- (BOOL)rangeControllerShouldUpdateRanges:(ASRangeController *)rangeController;
-
-@end
-
-@interface ASRangeController (ASRangeControllerUpdateRangeProtocol) <ASRangeControllerUpdateRangeProtocol>
-
-/**
- * Update the range mode for a range controller to a explicitly set mode until the node that contains the range
- * controller becomes visible again
- *
- * Logic for the automatic range mode:
- * 1. If there are no visible node paths available nothing is to be done and no range update will happen
- * 2. The initial range update if the range controller is visible always will be
- *    ASLayoutRangeModeMinimum as it's the initial fetch
- * 3. The range mode set explicitly via updateCurrentRangeWithMode: will last at least one range update. After that it
- the range controller will use the explicit set range mode until it becomes visible and a new range update was
- triggered or a new range mode via updateCurrentRangeWithMode: is set
- * 4. If range mode is not explicitly set the range mode is variying based if the range controller is visible or not
- */
-- (void)updateCurrentRangeWithMode:(ASLayoutRangeMode)rangeMode;
-
-@end
-
-@interface ASRangeController (DebugInternal)
-
-+ (void)layoutDebugOverlayIfNeeded;
-
-- (void)addRangeControllerToRangeDebugOverlay;
-
-- (void)updateRangeController:(ASRangeController *)controller
-     withScrollableDirections:(ASScrollDirection)scrollableDirections
-              scrollDirection:(ASScrollDirection)direction
-                    rangeMode:(ASLayoutRangeMode)mode
-      displayTuningParameters:(ASRangeTuningParameters)displayTuningParameters
-      preloadTuningParameters:(ASRangeTuningParameters)preloadTuningParameters
-               interfaceState:(ASInterfaceState)interfaceState;
-
-@end
-
-NS_ASSUME_NONNULL_END
-
-#endif
diff --git a/submodules/AsyncDisplayKit/Source/Details/ASRangeController.mm b/submodules/AsyncDisplayKit/Source/Details/ASRangeController.mm
deleted file mode 100644
index f3539ea4b7..0000000000
--- a/submodules/AsyncDisplayKit/Source/Details/ASRangeController.mm
+++ /dev/null
@@ -1,673 +0,0 @@
-//
-//  ASRangeController.mm
-//  Texture
-//
-//  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.
-//  Changes after 4/13/2017 are: Copyright (c) Pinterest, Inc.  All rights reserved.
-//  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
-//
-
-#ifndef MINIMAL_ASDK
-#import <AsyncDisplayKit/ASRangeController.h>
-
-#import <AsyncDisplayKit/_ASHierarchyChangeSet.h>
-#import <AsyncDisplayKit/ASAssert.h>
-#import <AsyncDisplayKit/ASCellNode+Internal.h>
-#import <AsyncDisplayKit/ASCollectionElement.h>
-#import <AsyncDisplayKit/ASDisplayNodeExtras.h>
-#import <AsyncDisplayKit/ASDisplayNodeInternal.h> // Required for interfaceState and hierarchyState setter methods.
-#import <AsyncDisplayKit/ASElementMap.h>
-#import <AsyncDisplayKit/ASInternalHelpers.h>
-#import <AsyncDisplayKit/ASSignpost.h>
-#import <AsyncDisplayKit/ASTwoDimensionalArrayUtils.h>
-#import <AsyncDisplayKit/ASWeakSet.h>
-
-#import <AsyncDisplayKit/ASDisplayNode+FrameworkPrivate.h>
-#import <AsyncDisplayKit/AsyncDisplayKit+Debug.h>
-
-#define AS_RANGECONTROLLER_LOG_UPDATE_FREQ 0
-
-#ifndef ASRangeControllerAutomaticLowMemoryHandling
-#define ASRangeControllerAutomaticLowMemoryHandling 1
-#endif
-
-@interface ASRangeController ()
-{
-  BOOL _rangeIsValid;
-  BOOL _needsRangeUpdate;
-  NSSet<NSIndexPath *> *_allPreviousIndexPaths;
-  NSHashTable<ASCellNode *> *_visibleNodes;
-  ASLayoutRangeMode _currentRangeMode;
-  BOOL _contentHasBeenScrolled;
-  BOOL _preserveCurrentRangeMode;
-  BOOL _didRegisterForNodeDisplayNotifications;
-  CFTimeInterval _pendingDisplayNodesTimestamp;
-
-  // If the user is not currently scrolling, we will keep our ranges
-  // configured to match their previous scroll direction. Defaults
-  // to [.right, .down] so that when the user first opens a screen
-  // the ranges point down into the content.
-  ASScrollDirection _previousScrollDirection;
-  
-#if AS_RANGECONTROLLER_LOG_UPDATE_FREQ
-  NSUInteger _updateCountThisFrame;
-  CADisplayLink *_displayLink;
-#endif
-}
-
-@end
-
-static UIApplicationState __ApplicationState = UIApplicationStateActive;
-
-@implementation ASRangeController
-
-#pragma mark - Lifecycle
-
-- (instancetype)init
-{
-  if (!(self = [super init])) {
-    return nil;
-  }
-  
-  _rangeIsValid = YES;
-  _currentRangeMode = ASLayoutRangeModeUnspecified;
-  _contentHasBeenScrolled = NO;
-  _preserveCurrentRangeMode = NO;
-  _previousScrollDirection = ASScrollDirectionDown | ASScrollDirectionRight;
-  
-  [[[self class] allRangeControllersWeakSet] addObject:self];
-  
-#if AS_RANGECONTROLLER_LOG_UPDATE_FREQ
-  _displayLink = [CADisplayLink displayLinkWithTarget:self selector:@selector(_updateCountDisplayLinkDidFire)];
-  [_displayLink addToRunLoop:[NSRunLoop mainRunLoop] forMode:NSRunLoopCommonModes];
-#endif
-  
-  if (ASDisplayNode.shouldShowRangeDebugOverlay) {
-    [self addRangeControllerToRangeDebugOverlay];
-  }
-  
-  return self;
-}
-
-- (void)dealloc
-{
-#if AS_RANGECONTROLLER_LOG_UPDATE_FREQ
-  [_displayLink invalidate];
-#endif
-  
-  if (_didRegisterForNodeDisplayNotifications) {
-    [[NSNotificationCenter defaultCenter] removeObserver:self name:ASRenderingEngineDidDisplayScheduledNodesNotification object:nil];
-  }
-}
-
-#pragma mark - Core visible node range management API
-
-+ (BOOL)isFirstRangeUpdateForRangeMode:(ASLayoutRangeMode)rangeMode
-{
-  return (rangeMode == ASLayoutRangeModeUnspecified);
-}
-
-+ (ASLayoutRangeMode)rangeModeForInterfaceState:(ASInterfaceState)interfaceState
-                               currentRangeMode:(ASLayoutRangeMode)currentRangeMode
-{
-  BOOL isVisible = (ASInterfaceStateIncludesVisible(interfaceState));
-  BOOL isFirstRangeUpdate = [self isFirstRangeUpdateForRangeMode:currentRangeMode];
-  if (!isVisible || isFirstRangeUpdate) {
-    return ASLayoutRangeModeMinimum;
-  }
-  
-  return ASLayoutRangeModeFull;
-}
-
-- (ASInterfaceState)interfaceState
-{
-  ASInterfaceState selfInterfaceState = ASInterfaceStateNone;
-  if (_dataSource) {
-    selfInterfaceState = [_dataSource interfaceStateForRangeController:self];
-  }
-  if (__ApplicationState == UIApplicationStateBackground) {
-    // If the app is background, pretend to be invisible so that we inform each cell it is no longer being viewed by the user
-    selfInterfaceState &= ~(ASInterfaceStateVisible);
-  }
-  return selfInterfaceState;
-}
-
-- (void)setNeedsUpdate
-{
-  if (!_needsRangeUpdate) {
-    _needsRangeUpdate = YES;
-      
-    __weak __typeof__(self) weakSelf = self;
-    dispatch_async(dispatch_get_main_queue(), ^{
-      [weakSelf updateIfNeeded];
-    });
-  }
-}
-
-- (void)updateIfNeeded
-{
-  if (_needsRangeUpdate) {
-    [self updateRanges];
-  }
-}
-
-- (void)updateRanges
-{
-  _needsRangeUpdate = NO;
-  [self _updateVisibleNodeIndexPaths];
-}
-
-- (void)updateCurrentRangeWithMode:(ASLayoutRangeMode)rangeMode
-{
-  _preserveCurrentRangeMode = YES;
-  if (_currentRangeMode != rangeMode) {
-    _currentRangeMode = rangeMode;
-
-    [self setNeedsUpdate];
-  }
-}
-
-- (void)setLayoutController:(id<ASLayoutController>)layoutController
-{
-  _layoutController = layoutController;
-  if (layoutController && _dataSource) {
-    [self updateIfNeeded];
-  }
-}
-
-- (void)setDataSource:(id<ASRangeControllerDataSource>)dataSource
-{
-  _dataSource = dataSource;
-  if (dataSource && _layoutController) {
-    [self updateIfNeeded];
-  }
-}
-
-// Clear the visible bit from any nodes that disappeared since last update.
-// Currently we guarantee that nodes will not be marked visible when deallocated,
-// but it's OK to be in e.g. the preload range. So for the visible bit specifically,
-// we add this extra mechanism to account for e.g. deleted items.
-//
-// NOTE: There is a minor risk here, if a node is transferred from one range controller
-// to another before the first rc updates and clears the node out of this set. It's a pretty
-// wild scenario that I doubt happens in practice.
-- (void)_setVisibleNodes:(NSHashTable *)newVisibleNodes
-{
-  for (ASCellNode *node in _visibleNodes) {
-    if (![newVisibleNodes containsObject:node] && node.isVisible) {
-      [node exitInterfaceState:ASInterfaceStateVisible];
-    }
-  }
-  _visibleNodes = newVisibleNodes;
-}
-
-- (void)_updateVisibleNodeIndexPaths
-{
-  as_activity_scope_verbose(as_activity_create("Update range controller", AS_ACTIVITY_CURRENT, OS_ACTIVITY_FLAG_DEFAULT));
-  as_log_verbose(ASCollectionLog(), "Updating ranges for %@", ASViewToDisplayNode(ASDynamicCast(self.delegate, UIView)));
-  ASDisplayNodeAssert(_layoutController, @"An ASLayoutController is required by ASRangeController");
-  if (!_layoutController || !_dataSource) {
-    return;
-  }
-
-  if (![_delegate rangeControllerShouldUpdateRanges:self]) {
-    return;
-  }
-
-#if AS_RANGECONTROLLER_LOG_UPDATE_FREQ
-  _updateCountThisFrame += 1;
-#endif
-  
-  ASElementMap *map = [_dataSource elementMapForRangeController:self];
-
-  // TODO: Consider if we need to use this codepath, or can rely on something more similar to the data & display ranges
-  // Example: ... = [_layoutController indexPathsForScrolling:scrollDirection rangeType:ASLayoutRangeTypeVisible];
-  auto visibleElements = [_dataSource visibleElementsForRangeController:self];
-  NSHashTable *newVisibleNodes = [NSHashTable hashTableWithOptions:NSHashTableObjectPointerPersonality];
-
-  ASSignpostStart(ASSignpostRangeControllerUpdate);
-
-  // Get the scroll direction. Default to using the previous one, if they're not scrolling.
-  ASScrollDirection scrollDirection = [_dataSource scrollDirectionForRangeController:self];
-  if (scrollDirection == ASScrollDirectionNone) {
-    scrollDirection = _previousScrollDirection;
-  }
-  _previousScrollDirection = scrollDirection;
-
-  if (visibleElements.count == 0) { // if we don't have any visibleNodes currently (scrolled before or after content)...
-    // Verify the actual state by checking the layout with a "VisibleOnly" range.
-    // This allows us to avoid thrashing through -didExitVisibleState in the case of -reloadData, since that generates didEndDisplayingCell calls.
-    // Those didEndDisplayingCell calls result in items being removed from the visibleElements returned by the _dataSource, even though the layout remains correct.
-    visibleElements = [_layoutController elementsForScrolling:scrollDirection rangeMode:ASLayoutRangeModeVisibleOnly rangeType:ASLayoutRangeTypeDisplay map:map];
-    for (ASCollectionElement *element in visibleElements) {
-      [newVisibleNodes addObject:element.node];
-    }
-    [self _setVisibleNodes:newVisibleNodes];
-    return; // don't do anything for this update, but leave _rangeIsValid == NO to make sure we update it later
-  }
-
-  ASInterfaceState selfInterfaceState = [self interfaceState];
-  ASLayoutRangeMode rangeMode = _currentRangeMode;
-  BOOL updateRangeMode = (!_preserveCurrentRangeMode && _contentHasBeenScrolled);
-
-  // If we've never scrolled before, we never update the range mode, so it doesn't jump into Full too early.
-  // This can happen if we have multiple, noisy updates occurring from application code before the user has engaged.
-  // If the range mode is explicitly set via updateCurrentRangeWithMode:, we'll preserve that for at least one update cycle.
-  // Once the user has scrolled and the range is visible, we'll always resume managing the range mode automatically.
-  if ((updateRangeMode && ASInterfaceStateIncludesVisible(selfInterfaceState)) || [[self class] isFirstRangeUpdateForRangeMode:rangeMode]) {
-    rangeMode = [ASRangeController rangeModeForInterfaceState:selfInterfaceState currentRangeMode:_currentRangeMode];
-  }
-
-  ASRangeTuningParameters parametersPreload = [_layoutController tuningParametersForRangeMode:rangeMode
-                                                                                    rangeType:ASLayoutRangeTypePreload];
-  ASRangeTuningParameters parametersDisplay = [_layoutController tuningParametersForRangeMode:rangeMode
-                                                                                    rangeType:ASLayoutRangeTypeDisplay];
-
-  // Preload can express the ultra-low-memory state with 0, 0 returned for its tuningParameters above, and will match Visible.
-  // However, in this rangeMode, Display is not supposed to contain *any* paths -- not even the visible bounds. TuningParameters can't express this.
-  BOOL emptyDisplayRange = (rangeMode == ASLayoutRangeModeLowMemory);
-  BOOL equalDisplayPreload = ASRangeTuningParametersEqualToRangeTuningParameters(parametersDisplay, parametersPreload);
-  BOOL equalDisplayVisible = (ASRangeTuningParametersEqualToRangeTuningParameters(parametersDisplay, ASRangeTuningParametersZero)
-                              && emptyDisplayRange == NO);
-
-  // Check if both Display and Preload are unique. If they are, we load them with a single fetch from the layout controller for performance.
-  BOOL optimizedLoadingOfBothRanges = (equalDisplayPreload == NO && equalDisplayVisible == NO && emptyDisplayRange == NO);
-
-  NSHashTable<ASCollectionElement *> *displayElements = nil;
-  NSHashTable<ASCollectionElement *> *preloadElements = nil;
-  
-  if (optimizedLoadingOfBothRanges) {
-    [_layoutController allElementsForScrolling:scrollDirection rangeMode:rangeMode displaySet:&displayElements preloadSet:&preloadElements map:map];
-  } else {
-    if (emptyDisplayRange == YES) {
-      displayElements = [NSHashTable hashTableWithOptions:NSHashTableObjectPointerPersonality];
-    } else if (equalDisplayVisible == YES) {
-      displayElements = visibleElements;
-    } else {
-      // Calculating only the Display range means the Preload range is either the same as Display or Visible.
-      displayElements = [_layoutController elementsForScrolling:scrollDirection rangeMode:rangeMode rangeType:ASLayoutRangeTypeDisplay map:map];
-    }
-    
-    BOOL equalPreloadVisible = ASRangeTuningParametersEqualToRangeTuningParameters(parametersPreload, ASRangeTuningParametersZero);
-    if (equalDisplayPreload == YES) {
-      preloadElements = displayElements;
-    } else if (equalPreloadVisible == YES) {
-      preloadElements = visibleElements;
-    } else {
-      preloadElements = [_layoutController elementsForScrolling:scrollDirection rangeMode:rangeMode rangeType:ASLayoutRangeTypePreload map:map];
-    }
-  }
-  
-  // For now we are only interested in items. Filter-map out from element to item-index-path.
-  NSSet<NSIndexPath *> *visibleIndexPaths = ASSetByFlatMapping(visibleElements, ASCollectionElement *element, [map indexPathForElementIfCell:element]);
-  NSSet<NSIndexPath *> *displayIndexPaths = ASSetByFlatMapping(displayElements, ASCollectionElement *element, [map indexPathForElementIfCell:element]);
-  NSSet<NSIndexPath *> *preloadIndexPaths = ASSetByFlatMapping(preloadElements, ASCollectionElement *element, [map indexPathForElementIfCell:element]);
-
-  // Prioritize the order in which we visit each.  Visible nodes should be updated first so they are enqueued on
-  // the network or display queues before preloading (offscreen) nodes are enqueued.
-  NSMutableOrderedSet<NSIndexPath *> *allIndexPaths = [[NSMutableOrderedSet alloc] initWithSet:visibleIndexPaths];
-  
-  // Typically the preloadIndexPaths will be the largest, and be a superset of the others, though it may be disjoint.
-  // Because allIndexPaths is an NSMutableOrderedSet, this adds the non-duplicate items /after/ the existing items.
-  // This means that during iteration, we will first visit visible, then display, then preload nodes.
-  [allIndexPaths unionSet:displayIndexPaths];
-  [allIndexPaths unionSet:preloadIndexPaths];
-  
-  // Add anything we had applied interfaceState to in the last update, but is no longer in range, so we can clear any
-  // range flags it still has enabled.  Most of the time, all but a few elements are equal; a large programmatic
-  // scroll or major main thread stall could cause entirely disjoint sets.  In either case we must visit all.
-  // Calling "-set" on NSMutableOrderedSet just references the underlying mutable data store, so we must copy it.
-  NSSet<NSIndexPath *> *allCurrentIndexPaths = [[allIndexPaths set] copy];
-  [allIndexPaths unionSet:_allPreviousIndexPaths];
-  _allPreviousIndexPaths = allCurrentIndexPaths;
-  
-  _currentRangeMode = rangeMode;
-  _preserveCurrentRangeMode = NO;
-  
-  if (!_rangeIsValid) {
-    [allIndexPaths addObjectsFromArray:map.itemIndexPaths];
-  }
-  
-#if ASRangeControllerLoggingEnabled
-  ASDisplayNodeAssertTrue([visibleIndexPaths isSubsetOfSet:displayIndexPaths]);
-  NSMutableArray<NSIndexPath *> *modifiedIndexPaths = (ASRangeControllerLoggingEnabled ? [NSMutableArray array] : nil);
-#endif
-
-  for (NSIndexPath *indexPath in allIndexPaths) {
-    // Before a node / indexPath is exposed to ASRangeController, ASDataController should have already measured it.
-    // For consistency, make sure each node knows that it should measure itself if something changes.
-    ASInterfaceState interfaceState = ASInterfaceStateMeasureLayout;
-    
-    if (ASInterfaceStateIncludesVisible(selfInterfaceState)) {
-      if ([visibleIndexPaths containsObject:indexPath]) {
-        interfaceState |= (ASInterfaceStateVisible | ASInterfaceStateDisplay | ASInterfaceStatePreload);
-      } else {
-        if ([preloadIndexPaths containsObject:indexPath]) {
-          interfaceState |= ASInterfaceStatePreload;
-        }
-        if ([displayIndexPaths containsObject:indexPath]) {
-          interfaceState |= ASInterfaceStateDisplay;
-        }
-      }
-    } else {
-      // If selfInterfaceState isn't visible, then visibleIndexPaths represents what /will/ be immediately visible at the
-      // instant we come onscreen.  So, preload and display all of those things, but don't waste resources preloading yet.
-      // We handle this as a separate case to minimize set operations for offscreen preloading, including containsObject:.
-      
-      if ([allCurrentIndexPaths containsObject:indexPath]) {
-        // DO NOT set Visible: even though these elements are in the visible range / "viewport",
-        // our overall container object is itself not visible yet.  The moment it becomes visible, we will run the condition above
-        
-        // Set Layout, Preload
-        interfaceState |= ASInterfaceStatePreload;
-        
-        if (rangeMode != ASLayoutRangeModeLowMemory) {
-          // Add Display.
-          // We might be looking at an indexPath that was previously in-range, but now we need to clear it.
-          // In that case we'll just set it back to MeasureLayout.  Only set Display | Preload if in allCurrentIndexPaths.
-          interfaceState |= ASInterfaceStateDisplay;
-        }
-      }
-    }
-
-    ASCellNode *node = [map elementForItemAtIndexPath:indexPath].nodeIfAllocated;
-    if (node != nil) {
-      ASDisplayNodeAssert(node.hierarchyState & ASHierarchyStateRangeManaged, @"All nodes reaching this point should be range-managed, or interfaceState may be incorrectly reset.");
-      if (ASInterfaceStateIncludesVisible(interfaceState)) {
-        [newVisibleNodes addObject:node];
-      }
-      // Skip the many method calls of the recursive operation if the top level cell node already has the right interfaceState.
-      if (node.pendingInterfaceState != interfaceState) {
-#if ASRangeControllerLoggingEnabled
-        [modifiedIndexPaths addObject:indexPath];
-#endif
-
-        BOOL nodeShouldScheduleDisplay = [node shouldScheduleDisplayWithNewInterfaceState:interfaceState];
-        [node recursivelySetInterfaceState:interfaceState];
-
-        if (nodeShouldScheduleDisplay) {
-          [self registerForNodeDisplayNotificationsForInterfaceStateIfNeeded:selfInterfaceState];
-          if (_didRegisterForNodeDisplayNotifications) {
-            _pendingDisplayNodesTimestamp = CACurrentMediaTime();
-          }
-        }
-      }
-    }
-  }
-
-  [self _setVisibleNodes:newVisibleNodes];
-  
-  // TODO: This code is for debugging only, but would be great to clean up with a delegate method implementation.
-  if (ASDisplayNode.shouldShowRangeDebugOverlay) {
-    ASScrollDirection scrollableDirections = ASScrollDirectionUp | ASScrollDirectionDown;
-    if ([_dataSource isKindOfClass:NSClassFromString(@"ASCollectionView")]) {
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wundeclared-selector"
-      scrollableDirections = (ASScrollDirection)[_dataSource performSelector:@selector(scrollableDirections)];
-#pragma clang diagnostic pop
-    }
-    
-    [self updateRangeController:self
-       withScrollableDirections:scrollableDirections
-                scrollDirection:scrollDirection
-                      rangeMode:rangeMode
-        displayTuningParameters:parametersDisplay
-        preloadTuningParameters:parametersPreload
-                 interfaceState:selfInterfaceState];
-  }
-  
-  _rangeIsValid = YES;
-  
-#if ASRangeControllerLoggingEnabled
-//  NSSet *visibleNodePathsSet = [NSSet setWithArray:visibleNodePaths];
-//  BOOL setsAreEqual = [visibleIndexPaths isEqualToSet:visibleNodePathsSet];
-//  NSLog(@"visible sets are equal: %d", setsAreEqual);
-//  if (!setsAreEqual) {
-//    NSLog(@"standard: %@", visibleIndexPaths);
-//    NSLog(@"custom: %@", visibleNodePathsSet);
-//  }
-  [modifiedIndexPaths sortUsingSelector:@selector(compare:)];
-  NSLog(@"Range update complete; modifiedIndexPaths: %@, rangeMode: %d", [self descriptionWithIndexPaths:modifiedIndexPaths], rangeMode);
-#endif
-  
-  ASSignpostEnd(ASSignpostRangeControllerUpdate);
-}
-
-#pragma mark - Notification observers
-
-/**
- * If we're in a restricted range mode, but we're going to change to a full range mode soon,
- * go ahead and schedule the transition as soon as all the currently-scheduled rendering is done #1163.
- */
-- (void)registerForNodeDisplayNotificationsForInterfaceStateIfNeeded:(ASInterfaceState)interfaceState
-{
-  // Do not schedule to listen if we're already in full range mode.
-  // This avoids updating the range controller during a collection teardown when it is removed
-  // from the hierarchy and its data source is cleared, causing UIKit to call -reloadData.
-  if (!_didRegisterForNodeDisplayNotifications && _currentRangeMode != ASLayoutRangeModeFull) {
-    ASLayoutRangeMode nextRangeMode = [ASRangeController rangeModeForInterfaceState:interfaceState
-                                                                   currentRangeMode:_currentRangeMode];
-    if (_currentRangeMode != nextRangeMode) {
-      [[NSNotificationCenter defaultCenter] addObserver:self
-                                               selector:@selector(scheduledNodesDidDisplay:)
-                                                   name:ASRenderingEngineDidDisplayScheduledNodesNotification
-                                                 object:nil];
-      _didRegisterForNodeDisplayNotifications = YES;
-    }
-  }
-}
-
-- (void)scheduledNodesDidDisplay:(NSNotification *)notification
-{
-  CFAbsoluteTime notificationTimestamp = ((NSNumber *) notification.userInfo[ASRenderingEngineDidDisplayNodesScheduledBeforeTimestamp]).doubleValue;
-  if (_pendingDisplayNodesTimestamp < notificationTimestamp) {
-    // The rendering engine has processed all the nodes this range controller scheduled. Let's schedule a range update
-    [[NSNotificationCenter defaultCenter] removeObserver:self name:ASRenderingEngineDidDisplayScheduledNodesNotification object:nil];
-    _didRegisterForNodeDisplayNotifications = NO;
-    
-    [self setNeedsUpdate];
-  }
-}
-
-#pragma mark - Cell node view handling
-
-- (void)configureContentView:(UIView *)contentView forCellNode:(ASCellNode *)node
-{
-  ASDisplayNodeAssertMainThread();
-  ASDisplayNodeAssert(node, @"Cannot move a nil node to a view");
-  ASDisplayNodeAssert(contentView, @"Cannot move a node to a non-existent view");
-
-  if (node.shouldUseUIKitCell) {
-    // When using UIKit cells, the ASCellNode is just a placeholder object with a preferredSize.
-    // In this case, we should not disrupt the subviews of the contentView.
-    return;
-  }
-
-  if (node.view.superview == contentView) {
-    // this content view is already correctly configured
-    return;
-  }
-  
-  // clean the content view
-  for (UIView *view in contentView.subviews) {
-    [view removeFromSuperview];
-  }
-  
-  [contentView addSubview:node.view];
-}
-
-- (void)setTuningParameters:(ASRangeTuningParameters)tuningParameters forRangeMode:(ASLayoutRangeMode)rangeMode rangeType:(ASLayoutRangeType)rangeType
-{
-  [_layoutController setTuningParameters:tuningParameters forRangeMode:rangeMode rangeType:rangeType];
-}
-
-- (ASRangeTuningParameters)tuningParametersForRangeMode:(ASLayoutRangeMode)rangeMode rangeType:(ASLayoutRangeType)rangeType
-{
-  return [_layoutController tuningParametersForRangeMode:rangeMode rangeType:rangeType];
-}
-
-#pragma mark - ASDataControllerDelegete
-
-- (void)dataController:(ASDataController *)dataController updateWithChangeSet:(_ASHierarchyChangeSet *)changeSet updates:(dispatch_block_t)updates
-{
-  ASDisplayNodeAssertMainThread();
-  if (changeSet.includesReloadData) {
-    [self _setVisibleNodes:nil];
-  }
-  _rangeIsValid = NO;
-  [_delegate rangeController:self updateWithChangeSet:changeSet updates:updates];
-}
-
-#pragma mark - Memory Management
-
-// Skip the many method calls of the recursive operation if the top level cell node already has the right interfaceState.
-- (void)clearContents
-{
-  ASDisplayNodeAssertMainThread();
-  for (ASCollectionElement *element in [_dataSource elementMapForRangeController:self]) {
-    ASCellNode *node = element.nodeIfAllocated;
-    if (ASInterfaceStateIncludesDisplay(node.interfaceState)) {
-      [node exitInterfaceState:ASInterfaceStateDisplay];
-    }
-  }
-}
-
-- (void)clearPreloadedData
-{
-  ASDisplayNodeAssertMainThread();
-  for (ASCollectionElement *element in [_dataSource elementMapForRangeController:self]) {
-    ASCellNode *node = element.nodeIfAllocated;
-    if (ASInterfaceStateIncludesPreload(node.interfaceState)) {
-      [node exitInterfaceState:ASInterfaceStatePreload];
-    }
-  }
-}
-
-#pragma mark - Class Methods (Application Notification Handlers)
-
-+ (ASWeakSet *)allRangeControllersWeakSet
-{
-  static ASWeakSet<ASRangeController *> *__allRangeControllersWeakSet;
-  static dispatch_once_t onceToken;
-  dispatch_once(&onceToken, ^{
-    __allRangeControllersWeakSet = [[ASWeakSet alloc] init];
-    [self registerSharedApplicationNotifications];
-  });
-  return __allRangeControllersWeakSet;
-}
-
-+ (void)registerSharedApplicationNotifications
-{
-  NSNotificationCenter *center = [NSNotificationCenter defaultCenter];
-#if ASRangeControllerAutomaticLowMemoryHandling
-  [center addObserver:self selector:@selector(didReceiveMemoryWarning:) name:UIApplicationDidReceiveMemoryWarningNotification object:nil];
-#endif
-  [center addObserver:self selector:@selector(didEnterBackground:) name:UIApplicationDidEnterBackgroundNotification object:nil];
-  [center addObserver:self selector:@selector(willEnterForeground:) name:UIApplicationWillEnterForegroundNotification object:nil];
-}
-
-static ASLayoutRangeMode __rangeModeForMemoryWarnings = ASLayoutRangeModeLowMemory;
-+ (void)setRangeModeForMemoryWarnings:(ASLayoutRangeMode)rangeMode
-{
-  ASDisplayNodeAssert(rangeMode == ASLayoutRangeModeVisibleOnly || rangeMode == ASLayoutRangeModeLowMemory, @"It is highly inadvisable to engage a larger range mode when a memory warning occurs, as this will almost certainly cause app eviction");
-  __rangeModeForMemoryWarnings = rangeMode;
-}
-
-+ (void)didReceiveMemoryWarning:(NSNotification *)notification
-{
-  NSArray *allRangeControllers = [[self allRangeControllersWeakSet] allObjects];
-  for (ASRangeController *rangeController in allRangeControllers) {
-    BOOL isDisplay = ASInterfaceStateIncludesDisplay([rangeController interfaceState]);
-    [rangeController updateCurrentRangeWithMode:isDisplay ? ASLayoutRangeModeVisibleOnly : __rangeModeForMemoryWarnings];
-    // There's no need to call needs update as updateCurrentRangeWithMode sets this if necessary.
-    [rangeController updateIfNeeded];
-  }
-  
-#if ASRangeControllerLoggingEnabled
-  NSLog(@"+[ASRangeController didReceiveMemoryWarning] with controllers: %@", allRangeControllers);
-#endif
-}
-
-+ (void)didEnterBackground:(NSNotification *)notification
-{
-  NSArray *allRangeControllers = [[self allRangeControllersWeakSet] allObjects];
-  for (ASRangeController *rangeController in allRangeControllers) {
-    // We do not want to fully collapse the Display ranges of any visible range controllers so that flashes can be avoided when
-    // the app is resumed.  Non-visible controllers can be more aggressively culled to the LowMemory state (see definitions for documentation)
-    BOOL isVisible = ASInterfaceStateIncludesVisible([rangeController interfaceState]);
-    [rangeController updateCurrentRangeWithMode:isVisible ? ASLayoutRangeModeVisibleOnly : ASLayoutRangeModeLowMemory];
-  }
-  
-  // Because -interfaceState checks __ApplicationState and always clears the "visible" bit if Backgrounded, we must set this after updating the range mode.
-  __ApplicationState = UIApplicationStateBackground;
-  for (ASRangeController *rangeController in allRangeControllers) {
-    // Trigger a range update immediately, as we may not be allowed by the system to run the update block scheduled by changing range mode.
-    // There's no need to call needs update as updateCurrentRangeWithMode sets this if necessary.
-    [rangeController updateIfNeeded];
-  }
-  
-#if ASRangeControllerLoggingEnabled
-  NSLog(@"+[ASRangeController didEnterBackground] with controllers, after backgrounding: %@", allRangeControllers);
-#endif
-}
-
-+ (void)willEnterForeground:(NSNotification *)notification
-{
-  NSArray *allRangeControllers = [[self allRangeControllersWeakSet] allObjects];
-  __ApplicationState = UIApplicationStateActive;
-  for (ASRangeController *rangeController in allRangeControllers) {
-    BOOL isVisible = ASInterfaceStateIncludesVisible([rangeController interfaceState]);
-    [rangeController updateCurrentRangeWithMode:isVisible ? ASLayoutRangeModeMinimum : ASLayoutRangeModeVisibleOnly];
-    // There's no need to call needs update as updateCurrentRangeWithMode sets this if necessary.
-    [rangeController updateIfNeeded];
-  }
-  
-#if ASRangeControllerLoggingEnabled
-  NSLog(@"+[ASRangeController willEnterForeground] with controllers, after foregrounding: %@", allRangeControllers);
-#endif
-}
-
-#pragma mark - Debugging
-
-#if AS_RANGECONTROLLER_LOG_UPDATE_FREQ
-- (void)_updateCountDisplayLinkDidFire
-{
-  if (_updateCountThisFrame > 1) {
-    NSLog(@"ASRangeController %p updated %lu times this frame.", self, (unsigned long)_updateCountThisFrame);
-  }
-  _updateCountThisFrame = 0;
-}
-#endif
-
-- (NSString *)descriptionWithIndexPaths:(NSArray<NSIndexPath *> *)indexPaths
-{
-  NSMutableString *description = [NSMutableString stringWithFormat:@"%@ %@", [super description], @" allPreviousIndexPaths:\n"];
-  for (NSIndexPath *indexPath in indexPaths) {
-    ASDisplayNode *node = [[_dataSource elementMapForRangeController:self] elementForItemAtIndexPath:indexPath].nodeIfAllocated;
-    ASInterfaceState interfaceState = node.interfaceState;
-    BOOL inVisible = ASInterfaceStateIncludesVisible(interfaceState);
-    BOOL inDisplay = ASInterfaceStateIncludesDisplay(interfaceState);
-    BOOL inPreload = ASInterfaceStateIncludesPreload(interfaceState);
-    [description appendFormat:@"indexPath %@, Visible: %d, Display: %d, Preload: %d\n", indexPath, inVisible, inDisplay, inPreload];
-  }
-  return description;
-}
-
-- (NSString *)description
-{
-  NSArray<NSIndexPath *> *indexPaths = [[_allPreviousIndexPaths allObjects] sortedArrayUsingSelector:@selector(compare:)];
-  return [self descriptionWithIndexPaths:indexPaths];
-}
-
-@end
-
-@implementation ASDisplayNode (RangeModeConfiguring)
-
-+ (void)setRangeModeForMemoryWarnings:(ASLayoutRangeMode)rangeMode
-{
-  [ASRangeController setRangeModeForMemoryWarnings:rangeMode];
-}
-
-@end
-
-#endif
diff --git a/submodules/AsyncDisplayKit/Source/Details/ASRangeControllerUpdateRangeProtocol+Beta.h b/submodules/AsyncDisplayKit/Source/Details/ASRangeControllerUpdateRangeProtocol+Beta.h
deleted file mode 100644
index 5bc4fae301..0000000000
--- a/submodules/AsyncDisplayKit/Source/Details/ASRangeControllerUpdateRangeProtocol+Beta.h
+++ /dev/null
@@ -1,24 +0,0 @@
-//
-//  ASRangeControllerUpdateRangeProtocol+Beta.h
-//  Texture
-//
-//  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.
-//  Changes after 4/13/2017 are: Copyright (c) Pinterest, Inc.  All rights reserved.
-//  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
-//
-
-#ifndef MINIMAL_ASDK
-#import <Foundation/Foundation.h>
-#import <AsyncDisplayKit/ASLayoutRangeType.h>
-
-@protocol ASRangeControllerUpdateRangeProtocol <NSObject>
-
-/**
- * Updates the current range mode of the range controller for at least the next range update
- * and, if the new mode is different from the previous mode, enqueues a range update.
- */
-- (void)updateCurrentRangeWithMode:(ASLayoutRangeMode)rangeMode;
-
-@end
-
-#endif
diff --git a/submodules/AsyncDisplayKit/Source/Details/ASSectionContext.h b/submodules/AsyncDisplayKit/Source/Details/ASSectionContext.h
deleted file mode 100644
index e7d4a190a4..0000000000
--- a/submodules/AsyncDisplayKit/Source/Details/ASSectionContext.h
+++ /dev/null
@@ -1,25 +0,0 @@
-//
-//  ASSectionContext.h
-//  Texture
-//
-//  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.
-//  Changes after 4/13/2017 are: Copyright (c) Pinterest, Inc.  All rights reserved.
-//  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
-//
-
-#ifndef MINIMAL_ASDK
-#import <Foundation/Foundation.h>
-
-@class ASCollectionView;
-
-@protocol ASSectionContext
-
-/**
- * Custom name of this section, for debugging only.
- */
-@property (nonatomic, copy, nullable) NSString *sectionName;
-@property (nonatomic, weak, nullable) ASCollectionView *collectionView;
-
-@end
-
-#endif
diff --git a/submodules/AsyncDisplayKit/Source/Details/ASTableLayoutController.h b/submodules/AsyncDisplayKit/Source/Details/ASTableLayoutController.h
deleted file mode 100644
index c294c2ecb4..0000000000
--- a/submodules/AsyncDisplayKit/Source/Details/ASTableLayoutController.h
+++ /dev/null
@@ -1,31 +0,0 @@
-//
-//  ASTableLayoutController.h
-//  Texture
-//
-//  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.
-//  Changes after 4/13/2017 are: Copyright (c) Pinterest, Inc.  All rights reserved.
-//  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
-//
-
-#ifndef MINIMAL_ASDK
-#import <Foundation/Foundation.h>
-#import <AsyncDisplayKit/ASAbstractLayoutController.h>
-
-NS_ASSUME_NONNULL_BEGIN
-
-@class UITableView;
-
-/**
- *  A layout controller designed for use with UITableView.
- */
-AS_SUBCLASSING_RESTRICTED
-@interface ASTableLayoutController : ASAbstractLayoutController
-
-@property (nonatomic, weak, readonly) UITableView *tableView;
-
-- (instancetype)initWithTableView:(UITableView *)tableView;
-
-@end
-
-NS_ASSUME_NONNULL_END
-#endif
diff --git a/submodules/AsyncDisplayKit/Source/Details/ASTableLayoutController.mm b/submodules/AsyncDisplayKit/Source/Details/ASTableLayoutController.mm
deleted file mode 100644
index 0669c76131..0000000000
--- a/submodules/AsyncDisplayKit/Source/Details/ASTableLayoutController.mm
+++ /dev/null
@@ -1,55 +0,0 @@
-//
-//  ASTableLayoutController.mm
-//  Texture
-//
-//  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.
-//  Changes after 4/13/2017 are: Copyright (c) Pinterest, Inc.  All rights reserved.
-//  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
-//
-#ifndef MINIMAL_ASDK
-#import <AsyncDisplayKit/ASTableLayoutController.h>
-
-#import <UIKit/UIKit.h>
-
-#import <AsyncDisplayKit/ASAssert.h>
-#import <AsyncDisplayKit/ASElementMap.h>
-
-@interface ASTableLayoutController()
-@end
-
-@implementation ASTableLayoutController
-
-- (instancetype)initWithTableView:(UITableView *)tableView
-{
-  if (!(self = [super init])) {
-    return nil;
-  }
-  _tableView = tableView;
-  return self;
-}
-
-#pragma mark - ASLayoutController
-
-- (NSHashTable<ASCollectionElement *> *)elementsForScrolling:(ASScrollDirection)scrollDirection rangeMode:(ASLayoutRangeMode)rangeMode rangeType:(ASLayoutRangeType)rangeType map:(ASElementMap *)map
-{
-  CGRect bounds = _tableView.bounds;
-
-  ASRangeTuningParameters tuningParameters = [self tuningParametersForRangeMode:rangeMode rangeType:rangeType];
-  CGRect rangeBounds = CGRectExpandToRangeWithScrollableDirections(bounds, tuningParameters, ASScrollDirectionVerticalDirections, scrollDirection);
-  NSArray *array = [_tableView indexPathsForRowsInRect:rangeBounds];
-  return ASPointerTableByFlatMapping(array, NSIndexPath *indexPath, [map elementForItemAtIndexPath:indexPath]);
-}
-
-- (void)allElementsForScrolling:(ASScrollDirection)scrollDirection rangeMode:(ASLayoutRangeMode)rangeMode displaySet:(NSHashTable<ASCollectionElement *> *__autoreleasing  _Nullable *)displaySet preloadSet:(NSHashTable<ASCollectionElement *> *__autoreleasing  _Nullable *)preloadSet map:(ASElementMap *)map
-{
-  if (displaySet == NULL || preloadSet == NULL) {
-    return;
-  }
-
-  *displaySet = [self elementsForScrolling:scrollDirection rangeMode:rangeMode rangeType:ASLayoutRangeTypeDisplay map:map];
-  *preloadSet = [self elementsForScrolling:scrollDirection rangeMode:rangeMode rangeType:ASLayoutRangeTypePreload map:map];
-  return;
-}
-
-@end
-#endif
diff --git a/submodules/AsyncDisplayKit/Source/Details/ASTraceEvent.h b/submodules/AsyncDisplayKit/Source/Details/ASTraceEvent.h
deleted file mode 100644
index 8ca7b32fa6..0000000000
--- a/submodules/AsyncDisplayKit/Source/Details/ASTraceEvent.h
+++ /dev/null
@@ -1,32 +0,0 @@
-//
-//  ASTraceEvent.h
-//  Texture
-//
-//  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.
-//  Changes after 4/13/2017 are: Copyright (c) Pinterest, Inc.  All rights reserved.
-//  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
-//
-
-#import <Foundation/Foundation.h>
-#import <AsyncDisplayKit/AsyncDisplayKit.h>
-
-NS_ASSUME_NONNULL_BEGIN
-
-AS_SUBCLASSING_RESTRICTED
-@interface ASTraceEvent : NSObject
-
-/**
- * This method is dealloc safe.
- */
-- (instancetype)initWithBacktrace:(nullable NSArray<NSString *> *)backtrace
-                           format:(NSString *)format
-                        arguments:(va_list)arguments NS_FORMAT_FUNCTION(2,0);
-
-// Will be nil unless AS_SAVE_EVENT_BACKTRACES=1 (default=0)
-@property (nonatomic, nullable, readonly) NSArray<NSString *> *backtrace;
-@property (nonatomic, readonly) NSString *message;
-@property (nonatomic, readonly) NSTimeInterval timestamp;
-
-@end
-
-NS_ASSUME_NONNULL_END
diff --git a/submodules/AsyncDisplayKit/Source/Details/ASTraceEvent.mm b/submodules/AsyncDisplayKit/Source/Details/ASTraceEvent.mm
deleted file mode 100644
index c809865591..0000000000
--- a/submodules/AsyncDisplayKit/Source/Details/ASTraceEvent.mm
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-//  ASTraceEvent.mm
-//  Texture
-//
-//  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.
-//  Changes after 4/13/2017 are: Copyright (c) Pinterest, Inc.  All rights reserved.
-//  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
-//
-
-#import <AsyncDisplayKit/ASTraceEvent.h>
-#import <QuartzCore/QuartzCore.h>
-
-static NSString *const ASTraceEventThreadDescriptionKey = @"ASThreadTraceEventDescription";
-
-@interface ASTraceEvent ()
-@property (nonatomic, readonly) NSString *objectDescription;
-@property (nonatomic, readonly) NSString *threadDescription;
-@end
-
-@implementation ASTraceEvent
-
-- (instancetype)initWithBacktrace:(NSArray<NSString *> *)backtrace format:(NSString *)format arguments:(va_list)args
-{
-  self = [super init];
-  if (self != nil) {
-    static NSTimeInterval refTime;
-    static dispatch_once_t onceToken;
-    dispatch_once(&onceToken, ^{
-      refTime = CACurrentMediaTime();
-    });
-    
-    // Create the format string passed to us.
-    _message = [[NSString alloc] initWithFormat:format arguments:args];
-	  
-    NSThread *thread = [NSThread currentThread];
-    NSString *threadDescription = thread.name;
-    if (threadDescription.length == 0) {
-      if ([thread isMainThread]) {
-        threadDescription = @"Main";
-      } else {
-        // If the bg thread has no name, we cache a 4-character ptr string to identify it by
-        // inside the thread dictionary.
-        NSMutableDictionary *threadDict = thread.threadDictionary;
-        threadDescription = threadDict[ASTraceEventThreadDescriptionKey];
-        if (threadDescription == nil) {
-          // Want these to be 4-chars to line up with "Main". It's possible that a collision could happen
-          // here but it's so unbelievably likely to impact development, the risk is acceptable.
-          NSString *ptrString = [NSString stringWithFormat:@"%p", thread];
-          threadDescription = [ptrString substringFromIndex:MAX(0, ptrString.length - 4)];
-          threadDict[ASTraceEventThreadDescriptionKey] = threadDescription;
-        }
-      }
-    }
-    _threadDescription = threadDescription;
-
-    _backtrace = backtrace;
-    _timestamp = CACurrentMediaTime() - refTime;
-  }
-  return self;
-}
-
-- (NSString *)description
-{
-  return [NSString stringWithFormat:@"<(%@) t=%7.3f: %@>", _threadDescription, _timestamp, _message];
-}
-
-@end
diff --git a/submodules/AsyncDisplayKit/Source/Details/NSMutableAttributedString+TextKitAdditions.h b/submodules/AsyncDisplayKit/Source/Details/NSMutableAttributedString+TextKitAdditions.h
deleted file mode 100644
index afb96722c6..0000000000
--- a/submodules/AsyncDisplayKit/Source/Details/NSMutableAttributedString+TextKitAdditions.h
+++ /dev/null
@@ -1,26 +0,0 @@
-//
-//  NSMutableAttributedString+TextKitAdditions.h
-//  Texture
-//
-//  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.
-//  Changes after 4/13/2017 are: Copyright (c) Pinterest, Inc.  All rights reserved.
-//  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
-//
-
-#import <UIKit/UIKit.h>
-
-NS_ASSUME_NONNULL_BEGIN
-
-@interface NSMutableAttributedString (TextKitAdditions)
-
-- (void)attributeTextInRange:(NSRange)range withTextKitMinimumLineHeight:(CGFloat)minimumLineHeight;
-
-- (void)attributeTextInRange:(NSRange)range withTextKitMinimumLineHeight:(CGFloat)minimumLineHeight maximumLineHeight:(CGFloat)maximumLineHeight;
-
-- (void)attributeTextInRange:(NSRange)range withTextKitLineHeight:(CGFloat)lineHeight;
-
-- (void)attributeTextInRange:(NSRange)range withTextKitParagraphStyle:(NSParagraphStyle *)paragraphStyle;
-
-@end
-
-NS_ASSUME_NONNULL_END
diff --git a/submodules/AsyncDisplayKit/Source/Details/NSMutableAttributedString+TextKitAdditions.mm b/submodules/AsyncDisplayKit/Source/Details/NSMutableAttributedString+TextKitAdditions.mm
deleted file mode 100644
index 3f2ed9d35c..0000000000
--- a/submodules/AsyncDisplayKit/Source/Details/NSMutableAttributedString+TextKitAdditions.mm
+++ /dev/null
@@ -1,49 +0,0 @@
-//
-//  NSMutableAttributedString+TextKitAdditions.mm
-//  Texture
-//
-//  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.
-//  Changes after 4/13/2017 are: Copyright (c) Pinterest, Inc.  All rights reserved.
-//  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
-//
-
-#import <AsyncDisplayKit/NSMutableAttributedString+TextKitAdditions.h>
-
-@implementation NSMutableAttributedString (TextKitAdditions)
-
-#pragma mark - Convenience Methods
-
-- (void)attributeTextInRange:(NSRange)range withTextKitMinimumLineHeight:(CGFloat)minimumLineHeight
-{
-  if (range.length) {
-
-    NSMutableParagraphStyle *style = [[NSMutableParagraphStyle alloc] init];
-    [style setMinimumLineHeight:minimumLineHeight];
-    [self attributeTextInRange:range withTextKitParagraphStyle:style];
-  }
-}
-
-- (void)attributeTextInRange:(NSRange)range withTextKitMinimumLineHeight:(CGFloat)minimumLineHeight maximumLineHeight:(CGFloat)maximumLineHeight
-{
-  if (range.length) {
-
-    NSMutableParagraphStyle *style = [[NSMutableParagraphStyle alloc] init];
-    [style setMinimumLineHeight:minimumLineHeight];
-    [style setMaximumLineHeight:maximumLineHeight];
-    [self attributeTextInRange:range withTextKitParagraphStyle:style];
-  }
-}
-
-- (void)attributeTextInRange:(NSRange)range withTextKitLineHeight:(CGFloat)lineHeight
-{
-  [self attributeTextInRange:range withTextKitMinimumLineHeight:lineHeight maximumLineHeight:lineHeight];
-}
-
-- (void)attributeTextInRange:(NSRange)range withTextKitParagraphStyle:(NSParagraphStyle *)paragraphStyle
-{
-  if (range.length) {
-    [self addAttribute:NSParagraphStyleAttributeName value:paragraphStyle range:range];
-  }
-}
-
-@end
diff --git a/submodules/AsyncDisplayKit/Source/Details/UICollectionViewLayout+ASConvenience.h b/submodules/AsyncDisplayKit/Source/Details/UICollectionViewLayout+ASConvenience.h
deleted file mode 100644
index 78e55a17bd..0000000000
--- a/submodules/AsyncDisplayKit/Source/Details/UICollectionViewLayout+ASConvenience.h
+++ /dev/null
@@ -1,28 +0,0 @@
-//
-//  UICollectionViewLayout+ASConvenience.h
-//  Texture
-//
-//  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.
-//  Changes after 4/13/2017 are: Copyright (c) Pinterest, Inc.  All rights reserved.
-//  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
-//
-
-#import <UIKit/UICollectionViewLayout.h>
-
-@protocol ASCollectionViewLayoutInspecting;
-
-NS_ASSUME_NONNULL_BEGIN
-
-@interface UICollectionViewLayout (ASLayoutInspectorProviding)
-
-/**
- * You can override this method on your @c UICollectionViewLayout subclass to
- * return a layout inspector tailored to your layout.
- *
- * It's fine to return @c self. You must not return @c nil.
- */
-- (id<ASCollectionViewLayoutInspecting>)asdk_layoutInspector;
-
-@end
-
-NS_ASSUME_NONNULL_END
diff --git a/submodules/AsyncDisplayKit/Source/Details/UICollectionViewLayout+ASConvenience.mm b/submodules/AsyncDisplayKit/Source/Details/UICollectionViewLayout+ASConvenience.mm
deleted file mode 100644
index d63b51a157..0000000000
--- a/submodules/AsyncDisplayKit/Source/Details/UICollectionViewLayout+ASConvenience.mm
+++ /dev/null
@@ -1,32 +0,0 @@
-//
-//  UICollectionViewLayout+ASConvenience.mm
-//  Texture
-//
-//  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.
-//  Changes after 4/13/2017 are: Copyright (c) Pinterest, Inc.  All rights reserved.
-//  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
-//
-
-#ifndef MINIMAL_ASDK
-
-#import <AsyncDisplayKit/UICollectionViewLayout+ASConvenience.h>
-
-#import <UIKit/UICollectionViewFlowLayout.h>
-
-#import <AsyncDisplayKit/ASCollectionViewFlowLayoutInspector.h>
-
-@implementation UICollectionViewLayout (ASLayoutInspectorProviding)
-
-- (id<ASCollectionViewLayoutInspecting>)asdk_layoutInspector
-{
-  UICollectionViewFlowLayout *flow = ASDynamicCast(self, UICollectionViewFlowLayout);
-  if (flow != nil) {
-    return [[ASCollectionViewFlowLayoutInspector alloc] initWithFlowLayout:flow];
-  } else {
-    return [[ASCollectionViewLayoutInspector alloc] init];
-  }
-}
-
-@end
-
-#endif
diff --git a/submodules/AsyncDisplayKit/Source/Details/_ASCollectionReusableView.h b/submodules/AsyncDisplayKit/Source/Details/_ASCollectionReusableView.h
deleted file mode 100644
index bb38bb25bf..0000000000
--- a/submodules/AsyncDisplayKit/Source/Details/_ASCollectionReusableView.h
+++ /dev/null
@@ -1,30 +0,0 @@
-//
-//  _ASCollectionReusableView.h
-//  Texture
-//
-//  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.
-//  Changes after 4/13/2017 are: Copyright (c) Pinterest, Inc.  All rights reserved.
-//  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
-//
-
-#ifndef MINIMAL_ASDK
-
-#import <UIKit/UIKit.h>
-#import <AsyncDisplayKit/ASBaseDefines.h>
-
-@class ASCellNode, ASCollectionElement;
-
-NS_ASSUME_NONNULL_BEGIN
-
-AS_SUBCLASSING_RESTRICTED // Note: ASDynamicCastStrict is used on instances of this class based on this restriction.
-@interface _ASCollectionReusableView : UICollectionReusableView
-
-@property (nullable, nonatomic, readonly) ASCellNode *node;
-@property (nullable, nonatomic) ASCollectionElement *element;
-@property (nullable, nonatomic) UICollectionViewLayoutAttributes *layoutAttributes;
-
-@end
-
-NS_ASSUME_NONNULL_END
-
-#endif
diff --git a/submodules/AsyncDisplayKit/Source/Details/_ASCollectionReusableView.mm b/submodules/AsyncDisplayKit/Source/Details/_ASCollectionReusableView.mm
deleted file mode 100644
index 6f5445654f..0000000000
--- a/submodules/AsyncDisplayKit/Source/Details/_ASCollectionReusableView.mm
+++ /dev/null
@@ -1,93 +0,0 @@
-//
-//  _ASCollectionReusableView.mm
-//  Texture
-//
-//  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.
-//  Changes after 4/13/2017 are: Copyright (c) Pinterest, Inc.  All rights reserved.
-//  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
-//
-
-#ifndef MINIMAL_ASDK
-
-#import <AsyncDisplayKit/_ASCollectionReusableView.h>
-
-#import <AsyncDisplayKit/ASCellNode+Internal.h>
-#import <AsyncDisplayKit/ASCollectionElement.h>
-
-@implementation _ASCollectionReusableView
-
-- (ASCellNode *)node
-{
-  return self.element.node;
-}
-
-- (void)setElement:(ASCollectionElement *)element
-{
-  ASDisplayNodeAssertMainThread();
-  element.node.layoutAttributes = _layoutAttributes;
-  _element = element;
-}
-
-- (void)setLayoutAttributes:(UICollectionViewLayoutAttributes *)layoutAttributes
-{
-  _layoutAttributes = layoutAttributes;
-  self.node.layoutAttributes = layoutAttributes;
-}
-
-- (void)prepareForReuse
-{
-  self.layoutAttributes = nil;
-  
-  // Need to clear element before UIKit calls setSelected:NO / setHighlighted:NO on its cells
-  self.element = nil;
-  [super prepareForReuse];
-}
-
-/**
- * In the initial case, this is called by UICollectionView during cell dequeueing, before
- *   we get a chance to assign a node to it, so we must be sure to set these layout attributes
- *   on our node when one is next assigned to us in @c setNode: . Since there may be cases when we _do_ already
- *   have our node assigned e.g. during a layout update for existing cells, we also attempt
- *   to update it now.
- */
-- (void)applyLayoutAttributes:(UICollectionViewLayoutAttributes *)layoutAttributes
-{
-  self.layoutAttributes = layoutAttributes;
-}
-
-/**
- * Keep our node filling our content view.
- */
-- (void)layoutSubviews
-{
-  [super layoutSubviews];
-  self.node.frame = self.bounds;
-}
-
-@end
-
-/**
- * A category that makes _ASCollectionReusableView conform to IGListBindable.
- *
- * We don't need to do anything to bind the view model – the cell node
- * serves the same purpose.
- */
-#if __has_include(<IGListKit/IGListBindable.h>)
-
-#import <IGListKit/IGListBindable.h>
-
-@interface _ASCollectionReusableView (IGListBindable) <IGListBindable>
-@end
-
-@implementation _ASCollectionReusableView (IGListBindable)
-
-- (void)bindViewModel:(id)viewModel
-{
-  // nop
-}
-
-@end
-
-#endif
-
-#endif
diff --git a/submodules/AsyncDisplayKit/Source/Details/_ASCollectionViewCell.h b/submodules/AsyncDisplayKit/Source/Details/_ASCollectionViewCell.h
deleted file mode 100644
index cf08d0d508..0000000000
--- a/submodules/AsyncDisplayKit/Source/Details/_ASCollectionViewCell.h
+++ /dev/null
@@ -1,39 +0,0 @@
-//
-//  _ASCollectionViewCell.h
-//  Texture
-//
-//  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.
-//  Changes after 4/13/2017 are: Copyright (c) Pinterest, Inc.  All rights reserved.
-//  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
-//
-
-#ifndef MINIMAL_ASDK
-
-#import <UIKit/UIKit.h>
-#import <AsyncDisplayKit/ASBaseDefines.h>
-#import <AsyncDisplayKit/ASCellNode.h>
-
-@class ASCollectionElement;
-
-NS_ASSUME_NONNULL_BEGIN
-
-AS_SUBCLASSING_RESTRICTED // Note: ASDynamicCastStrict is used on instances of this class based on this restriction.
-@interface _ASCollectionViewCell : UICollectionViewCell
-
-@property (nonatomic, nullable) ASCollectionElement *element;
-@property (nullable, nonatomic, readonly) ASCellNode *node;
-@property (nonatomic, nullable) UICollectionViewLayoutAttributes *layoutAttributes;
-
-/**
- * Whether or not this cell is interested in cell node visibility events.
- * -cellNodeVisibilityEvent:inScrollView: should be called only if this property is YES.
- */
-@property (nonatomic, readonly) BOOL consumesCellNodeVisibilityEvents;
-
-- (void)cellNodeVisibilityEvent:(ASCellNodeVisibilityEvent)event inScrollView:(UIScrollView *)scrollView;
-
-@end
-
-NS_ASSUME_NONNULL_END
-
-#endif
diff --git a/submodules/AsyncDisplayKit/Source/Details/_ASCollectionViewCell.mm b/submodules/AsyncDisplayKit/Source/Details/_ASCollectionViewCell.mm
deleted file mode 100644
index a7f0b55d3f..0000000000
--- a/submodules/AsyncDisplayKit/Source/Details/_ASCollectionViewCell.mm
+++ /dev/null
@@ -1,149 +0,0 @@
-//
-//  _ASCollectionViewCell.mm
-//  Texture
-//
-//  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.
-//  Changes after 4/13/2017 are: Copyright (c) Pinterest, Inc.  All rights reserved.
-//  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
-//
-
-#ifndef MINIMAL_ASDK
-#import <AsyncDisplayKit/_ASCollectionViewCell.h>
-#import <AsyncDisplayKit/ASDisplayNode+Subclasses.h>
-
-#import <AsyncDisplayKit/ASCellNode+Internal.h>
-#import <AsyncDisplayKit/ASCollectionElement.h>
-#import <AsyncDisplayKit/ASInternalHelpers.h>
-
-@implementation _ASCollectionViewCell
-
-- (ASCellNode *)node
-{
-  return self.element.node;
-}
-
-- (void)setElement:(ASCollectionElement *)element
-{
-  ASDisplayNodeAssertMainThread();
-  ASCellNode *node = element.node;
-  node.layoutAttributes = _layoutAttributes;
-  _element = element;
-  
-  [node __setSelectedFromUIKit:self.selected];
-  [node __setHighlightedFromUIKit:self.highlighted];
-}
-
-- (BOOL)consumesCellNodeVisibilityEvents
-{
-  ASCellNode *node = self.node;
-  if (node == nil) {
-    return NO;
-  }
-  return ASSubclassOverridesSelector([ASCellNode class], [node class], @selector(cellNodeVisibilityEvent:inScrollView:withCellFrame:));
-}
-
-- (void)cellNodeVisibilityEvent:(ASCellNodeVisibilityEvent)event inScrollView:(UIScrollView *)scrollView
-{
-  [self.node cellNodeVisibilityEvent:event inScrollView:scrollView withCellFrame:self.frame];
-}
-
-- (void)setSelected:(BOOL)selected
-{
-  [super setSelected:selected];
-  [self.node __setSelectedFromUIKit:selected];
-}
-
-- (void)setHighlighted:(BOOL)highlighted
-{
-  [super setHighlighted:highlighted];
-  [self.node __setHighlightedFromUIKit:highlighted];
-}
-
-- (void)setLayoutAttributes:(UICollectionViewLayoutAttributes *)layoutAttributes
-{
-  _layoutAttributes = layoutAttributes;
-  self.node.layoutAttributes = layoutAttributes;
-}
-
-- (void)prepareForReuse
-{
-  self.layoutAttributes = nil;
-
-  // Need to clear element before UIKit calls setSelected:NO / setHighlighted:NO on its cells
-  self.element = nil;
-  [super prepareForReuse];
-}
-
-/**
- * In the initial case, this is called by UICollectionView during cell dequeueing, before
- *   we get a chance to assign a node to it, so we must be sure to set these layout attributes
- *   on our node when one is next assigned to us in @c setNode: . Since there may be cases when we _do_ already
- *   have our node assigned e.g. during a layout update for existing cells, we also attempt
- *   to update it now.
- */
-- (void)applyLayoutAttributes:(UICollectionViewLayoutAttributes *)layoutAttributes
-{
-  [super applyLayoutAttributes:layoutAttributes];
-  self.layoutAttributes = layoutAttributes;
-}
-
-/**
- * Keep our node filling our content view.
- */
-- (void)layoutSubviews
-{
-  [super layoutSubviews];
-  self.node.frame = self.contentView.bounds;
-}
-
-- (UIView *)hitTest:(CGPoint)point withEvent:(UIEvent *)event
-{
-  /**
-   * The documentation for hitTest:withEvent: on an UIView explicitly states the fact that:
-   * it ignores view objects that are hidden, that have disabled user interactions, or have an
-   * alpha level less than 0.01.
-   * To be able to determine if the collection view cell should skip going further down the tree
-   * based on the states above we use a valid point within the cells bounds and check the
-   * superclass hitTest:withEvent: implementation. If this returns a valid value we can go on with
-   * checking the node as it's expected to not be in one of these states.
-   */
-  if (![super hitTest:self.bounds.origin withEvent:event]) {
-    return nil;
-  }
-
-  CGPoint pointOnNode = [self.node.view convertPoint:point fromView:self];
-  return [self.node hitTest:pointOnNode withEvent:event];
-}
-
-- (BOOL)pointInside:(CGPoint)point withEvent:(nullable UIEvent *)event
-{
-  CGPoint pointOnNode = [self.node.view convertPoint:point fromView:self];
-  return [self.node pointInside:pointOnNode withEvent:event];
-}
-
-@end
-
-/**
- * A category that makes _ASCollectionViewCell conform to IGListBindable.
- *
- * We don't need to do anything to bind the view model – the cell node
- * serves the same purpose.
- */
-#if __has_include(<IGListKit/IGListBindable.h>)
-
-#import <IGListKit/IGListBindable.h>
-
-@interface _ASCollectionViewCell (IGListBindable) <IGListBindable>
-@end
-
-@implementation _ASCollectionViewCell (IGListBindable)
-
-- (void)bindViewModel:(id)viewModel
-{
-  // nop
-}
-
-@end
-
-#endif
-#endif
diff --git a/submodules/AsyncDisplayKit/Source/IGListAdapter+AsyncDisplayKit.h b/submodules/AsyncDisplayKit/Source/IGListAdapter+AsyncDisplayKit.h
deleted file mode 100644
index 76b53c1933..0000000000
--- a/submodules/AsyncDisplayKit/Source/IGListAdapter+AsyncDisplayKit.h
+++ /dev/null
@@ -1,37 +0,0 @@
-//
-//  IGListAdapter+AsyncDisplayKit.h
-//  Texture
-//
-//  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.
-//  Changes after 4/13/2017 are: Copyright (c) Pinterest, Inc.  All rights reserved.
-//  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
-//
-
-#import <AsyncDisplayKit/ASAvailability.h>
-
-#if AS_IG_LIST_KIT
-
-#import <IGListKit/IGListKit.h>
-
-NS_ASSUME_NONNULL_BEGIN
-
-@class ASCollectionNode;
-
-@interface IGListAdapter (AsyncDisplayKit)
-
-/**
- * Connect this list adapter to the given collection node.
- *
- * @param collectionNode The collection node to drive with this list adapter.
- *
- * @note This method may only be called once per list adapter, 
- *   and it must be called on the main thread. -[UIViewController init]
- *   is a good place to call it. This method does not retain the collection node.
- */
-- (void)setASDKCollectionNode:(ASCollectionNode *)collectionNode;
-
-@end
-
-NS_ASSUME_NONNULL_END
-
-#endif // AS_IG_LIST_KIT
diff --git a/submodules/AsyncDisplayKit/Source/IGListAdapter+AsyncDisplayKit.mm b/submodules/AsyncDisplayKit/Source/IGListAdapter+AsyncDisplayKit.mm
deleted file mode 100644
index c3e81d3e33..0000000000
--- a/submodules/AsyncDisplayKit/Source/IGListAdapter+AsyncDisplayKit.mm
+++ /dev/null
@@ -1,53 +0,0 @@
-//
-//  IGListAdapter+AsyncDisplayKit.mm
-//  Texture
-//
-//  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.
-//  Changes after 4/13/2017 are: Copyright (c) Pinterest, Inc.  All rights reserved.
-//  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
-//
-
-#import <AsyncDisplayKit/ASAvailability.h>
-
-#if AS_IG_LIST_KIT
-
-#import <AsyncDisplayKit/IGListAdapter+AsyncDisplayKit.h>
-#import <AsyncDisplayKit/ASIGListAdapterBasedDataSource.h>
-#import <AsyncDisplayKit/ASAssert.h>
-#import <objc/runtime.h>
-
-@implementation IGListAdapter (AsyncDisplayKit)
-
-- (void)setASDKCollectionNode:(ASCollectionNode *)collectionNode
-{
-  ASDisplayNodeAssertMainThread();
-
-  // Attempt to retrieve previous data source.
-  ASIGListAdapterBasedDataSource *dataSource = objc_getAssociatedObject(self, _cmd);
-  // Bomb if we already made one.
-  if (dataSource != nil) {
-    ASDisplayNodeFailAssert(@"Attempt to call %@ multiple times on the same list adapter. Not currently allowed!", NSStringFromSelector(_cmd));
-    return;
-  }
-
-  // Make a data source and retain it.
-  dataSource = [[ASIGListAdapterBasedDataSource alloc] initWithListAdapter:self collectionDelegate:collectionNode.delegate];
-  objc_setAssociatedObject(self, _cmd, dataSource, OBJC_ASSOCIATION_RETAIN_NONATOMIC);
-
-  // Attach the data source to the collection node.
-  collectionNode.dataSource = dataSource;
-  collectionNode.delegate = dataSource;
-  __weak IGListAdapter *weakSelf = self;
-  [collectionNode onDidLoad:^(__kindof ASCollectionNode * _Nonnull collectionNode) {
-#if IG_LIST_COLLECTION_VIEW
-    // We manually set the superclass of ASCollectionView to IGListCollectionView at runtime if needed.
-    weakSelf.collectionView = (IGListCollectionView *)collectionNode.view;
-#else
-    weakSelf.collectionView = collectionNode.view;
-#endif
-  }];
-}
-
-@end
-
-#endif // AS_IG_LIST_KIT
diff --git a/submodules/AsyncDisplayKit/Source/Layout/ASAbsoluteLayoutSpec.h b/submodules/AsyncDisplayKit/Source/Layout/ASAbsoluteLayoutSpec.h
deleted file mode 100644
index 61bfbf8cd5..0000000000
--- a/submodules/AsyncDisplayKit/Source/Layout/ASAbsoluteLayoutSpec.h
+++ /dev/null
@@ -1,45 +0,0 @@
-//
-//  ASAbsoluteLayoutSpec.h
-//  Texture
-//
-//  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.
-//  Changes after 4/13/2017 are: Copyright (c) Pinterest, Inc.  All rights reserved.
-//  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
-//
-
-#import <AsyncDisplayKit/ASLayoutSpec.h>
-
-/** How much space the spec will take up. */
-typedef NS_ENUM(NSInteger, ASAbsoluteLayoutSpecSizing) {
-  /** The spec will take up the maximum size possible. */
-  ASAbsoluteLayoutSpecSizingDefault,
-  /** Computes a size for the spec that is the union of all childrens' frames. */
-  ASAbsoluteLayoutSpecSizingSizeToFit,
-};
-
-NS_ASSUME_NONNULL_BEGIN
-
-/**
- A layout spec that positions children at fixed positions.
- */
-@interface ASAbsoluteLayoutSpec : ASLayoutSpec
-
-/**
- How much space will the spec taken up
- */
-@property (nonatomic) ASAbsoluteLayoutSpecSizing sizing;
-
-/**
- @param sizing How much space the spec will take up
- @param children Children to be positioned at fixed positions
- */
-+ (instancetype)absoluteLayoutSpecWithSizing:(ASAbsoluteLayoutSpecSizing)sizing children:(NSArray<id<ASLayoutElement>> *)children NS_RETURNS_RETAINED AS_WARN_UNUSED_RESULT;
-
-/**
- @param children Children to be positioned at fixed positions
- */
-+ (instancetype)absoluteLayoutSpecWithChildren:(NSArray<id<ASLayoutElement>> *)children NS_RETURNS_RETAINED AS_WARN_UNUSED_RESULT;
-
-@end
-
-NS_ASSUME_NONNULL_END
diff --git a/submodules/AsyncDisplayKit/Source/Layout/ASAbsoluteLayoutSpec.mm b/submodules/AsyncDisplayKit/Source/Layout/ASAbsoluteLayoutSpec.mm
deleted file mode 100644
index 18a3a3a51c..0000000000
--- a/submodules/AsyncDisplayKit/Source/Layout/ASAbsoluteLayoutSpec.mm
+++ /dev/null
@@ -1,104 +0,0 @@
-//
-//  ASAbsoluteLayoutSpec.mm
-//  Texture
-//
-//  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.
-//  Changes after 4/13/2017 are: Copyright (c) Pinterest, Inc.  All rights reserved.
-//  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
-//
-
-#import <AsyncDisplayKit/ASAbsoluteLayoutSpec.h>
-
-#import <AsyncDisplayKit/ASCollections.h>
-#import <AsyncDisplayKit/ASLayout.h>
-#import <AsyncDisplayKit/ASLayoutSpec+Subclasses.h>
-#import <AsyncDisplayKit/ASLayoutSpecUtilities.h>
-#import <AsyncDisplayKit/ASLayoutElementStylePrivate.h>
-
-#pragma mark - ASAbsoluteLayoutSpec
-
-@implementation ASAbsoluteLayoutSpec
-
-#pragma mark - Class
-
-+ (instancetype)absoluteLayoutSpecWithChildren:(NSArray *)children NS_RETURNS_RETAINED
-{
-  return [[self alloc] initWithChildren:children];
-}
-
-+ (instancetype)absoluteLayoutSpecWithSizing:(ASAbsoluteLayoutSpecSizing)sizing children:(NSArray<id<ASLayoutElement>> *)children NS_RETURNS_RETAINED
-{
-  return [[self alloc] initWithSizing:sizing children:children];
-}
-
-#pragma mark - Lifecycle
-
-- (instancetype)init
-{
-  return [self initWithChildren:nil];
-}
-
-- (instancetype)initWithChildren:(NSArray *)children
-{
-  return [self initWithSizing:ASAbsoluteLayoutSpecSizingDefault children:children];
-}
-
-- (instancetype)initWithSizing:(ASAbsoluteLayoutSpecSizing)sizing children:(NSArray<id<ASLayoutElement>> *)children
-{
-  if (!(self = [super init])) {
-    return nil;
-  }
-
-  _sizing = sizing;
-  self.children = children;
-
-  return self;
-}
-
-#pragma mark - ASLayoutSpec
-
-- (ASLayout *)calculateLayoutThatFits:(ASSizeRange)constrainedSize
-{
-  CGSize size = {
-    ASPointsValidForSize(constrainedSize.max.width) == NO ? ASLayoutElementParentDimensionUndefined : constrainedSize.max.width,
-    ASPointsValidForSize(constrainedSize.max.height) == NO ? ASLayoutElementParentDimensionUndefined : constrainedSize.max.height
-  };
-  
-  NSArray *children = self.children;
-  ASLayout *rawSublayouts[children.count];
-  int i = 0;
-
-  for (id<ASLayoutElement> child in children) {
-    CGPoint layoutPosition = child.style.layoutPosition;
-    CGSize autoMaxSize = {
-      constrainedSize.max.width  - layoutPosition.x,
-      constrainedSize.max.height - layoutPosition.y
-    };
-
-    const ASSizeRange childConstraint = ASLayoutElementSizeResolveAutoSize(child.style.size, size, {{0,0}, autoMaxSize});
-    
-    ASLayout *sublayout = [child layoutThatFits:childConstraint parentSize:size];
-    sublayout.position = layoutPosition;
-    rawSublayouts[i++] = sublayout;
-  }
-  const auto sublayouts = [NSArray<ASLayout *> arrayByTransferring:rawSublayouts count:i];
-
-  if (_sizing == ASAbsoluteLayoutSpecSizingSizeToFit || isnan(size.width)) {
-    size.width = constrainedSize.min.width;
-    for (ASLayout *sublayout in sublayouts) {
-      size.width = MAX(size.width,  sublayout.position.x + sublayout.size.width);
-    }
-  }
-  
-  if (_sizing == ASAbsoluteLayoutSpecSizingSizeToFit || isnan(size.height)) {
-    size.height = constrainedSize.min.height;
-    for (ASLayout *sublayout in sublayouts) {
-      size.height = MAX(size.height, sublayout.position.y + sublayout.size.height);
-    }
-  }
-  
-  return [ASLayout layoutWithLayoutElement:self size:ASSizeRangeClamp(constrainedSize, size) sublayouts:sublayouts];
-}
-
-@end
-
diff --git a/submodules/AsyncDisplayKit/Source/Layout/ASBackgroundLayoutSpec.h b/submodules/AsyncDisplayKit/Source/Layout/ASBackgroundLayoutSpec.h
deleted file mode 100644
index 032a240bbd..0000000000
--- a/submodules/AsyncDisplayKit/Source/Layout/ASBackgroundLayoutSpec.h
+++ /dev/null
@@ -1,34 +0,0 @@
-//
-//  ASBackgroundLayoutSpec.h
-//  Texture
-//
-//  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.
-//  Changes after 4/13/2017 are: Copyright (c) Pinterest, Inc.  All rights reserved.
-//  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
-//
-
-#import <AsyncDisplayKit/ASLayoutSpec.h>
-
-NS_ASSUME_NONNULL_BEGIN
-
-/**
- Lays out a single layoutElement child, then lays out a background layoutElement instance behind it stretched to its size.
- */
-@interface ASBackgroundLayoutSpec : ASLayoutSpec
-
-/**
- * Background layoutElement for this layout spec
- */
-@property (nonatomic) id<ASLayoutElement> background;
-
-/**
- * Creates and returns an ASBackgroundLayoutSpec object
- *
- * @param child A child that is laid out to determine the size of this spec.
- * @param background A layoutElement object that is laid out behind the child.
- */
-+ (instancetype)backgroundLayoutSpecWithChild:(id<ASLayoutElement>)child background:(id<ASLayoutElement>)background NS_RETURNS_RETAINED AS_WARN_UNUSED_RESULT;
-
-@end
-
-NS_ASSUME_NONNULL_END
diff --git a/submodules/AsyncDisplayKit/Source/Layout/ASBackgroundLayoutSpec.mm b/submodules/AsyncDisplayKit/Source/Layout/ASBackgroundLayoutSpec.mm
deleted file mode 100644
index 31dd75487a..0000000000
--- a/submodules/AsyncDisplayKit/Source/Layout/ASBackgroundLayoutSpec.mm
+++ /dev/null
@@ -1,92 +0,0 @@
-//
-//  ASBackgroundLayoutSpec.mm
-//  Texture
-//
-//  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.
-//  Changes after 4/13/2017 are: Copyright (c) Pinterest, Inc.  All rights reserved.
-//  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
-//
-
-#import <AsyncDisplayKit/ASBackgroundLayoutSpec.h>
-
-#import <AsyncDisplayKit/ASLayoutSpec+Subclasses.h>
-
-#import <AsyncDisplayKit/ASAssert.h>
-#import <AsyncDisplayKit/ASCollections.h>
-
-static NSUInteger const kForegroundChildIndex = 0;
-static NSUInteger const kBackgroundChildIndex = 1;
-
-@implementation ASBackgroundLayoutSpec
-
-#pragma mark - Class
-
-+ (instancetype)backgroundLayoutSpecWithChild:(id<ASLayoutElement>)child background:(id<ASLayoutElement>)background NS_RETURNS_RETAINED
-{
-  return [[self alloc] initWithChild:child background:background];
-}
-
-#pragma mark - Lifecycle
-
-- (instancetype)initWithChild:(id<ASLayoutElement>)child background:(id<ASLayoutElement>)background
-{
-  if (!(self = [super init])) {
-    return nil;
-  }
-  self.child = child;
-  self.background = background;
-  return self;
-}
-
-#pragma mark - ASLayoutSpec
-
-/**
- * First layout the contents, then fit the background image.
- */
-- (ASLayout *)calculateLayoutThatFits:(ASSizeRange)constrainedSize
-                     restrictedToSize:(ASLayoutElementSize)size
-                 relativeToParentSize:(CGSize)parentSize
-{
-  ASLayout *contentsLayout = [self.child layoutThatFits:constrainedSize parentSize:parentSize];
-
-  ASLayout *rawSublayouts[2];
-  int i = 0;
-  if (self.background) {
-    // Size background to exactly the same size.
-    ASLayout *backgroundLayout = [self.background layoutThatFits:ASSizeRangeMake(contentsLayout.size)
-                                                      parentSize:parentSize];
-    backgroundLayout.position = CGPointZero;
-    rawSublayouts[i++] = backgroundLayout;
-  }
-  contentsLayout.position = CGPointZero;
-  rawSublayouts[i++] = contentsLayout;
-
-  const auto sublayouts = [NSArray<ASLayout *> arrayByTransferring:rawSublayouts count:i];
-  return [ASLayout layoutWithLayoutElement:self size:contentsLayout.size sublayouts:sublayouts];
-}
-
-#pragma mark - Background
-
-- (void)setChild:(id<ASLayoutElement>)child
-{
-  ASDisplayNodeAssertNotNil(child, @"Child cannot be nil");
-  [super setChild:child atIndex:kForegroundChildIndex];
-}
-
-- (id<ASLayoutElement>)child
-{
-  return [super childAtIndex:kForegroundChildIndex];
-}
-
-- (void)setBackground:(id<ASLayoutElement>)background
-{
-  ASDisplayNodeAssertNotNil(background, @"Background cannot be nil");
-  [super setChild:background atIndex:kBackgroundChildIndex];
-}
-
-- (id<ASLayoutElement>)background
-{
-  return [super childAtIndex:kBackgroundChildIndex];
-}
-
-@end
diff --git a/submodules/AsyncDisplayKit/Source/Layout/ASCenterLayoutSpec.h b/submodules/AsyncDisplayKit/Source/Layout/ASCenterLayoutSpec.h
deleted file mode 100644
index dd1f99aa5a..0000000000
--- a/submodules/AsyncDisplayKit/Source/Layout/ASCenterLayoutSpec.h
+++ /dev/null
@@ -1,70 +0,0 @@
-//
-//  ASCenterLayoutSpec.h
-//  Texture
-//
-//  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.
-//  Changes after 4/13/2017 are: Copyright (c) Pinterest, Inc.  All rights reserved.
-//  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
-//
-
-#import <AsyncDisplayKit/ASRelativeLayoutSpec.h>
-
-/** 
-  * How the child is centered within the spec.
-  *
-  * The default option will position the child at {0,0} relatively to the layout bound.
-  * Swift: use [] for the default behavior.
-  */
-typedef NS_OPTIONS(NSUInteger, ASCenterLayoutSpecCenteringOptions) {
-  /** The child is positioned in {0,0} relatively to the layout bounds */
-  ASCenterLayoutSpecCenteringNone = 0,
-  /** The child is centered along the X axis */
-  ASCenterLayoutSpecCenteringX = 1 << 0,
-  /** The child is centered along the Y axis */
-  ASCenterLayoutSpecCenteringY = 1 << 1,
-  /** Convenience option to center both along the X and Y axis */
-  ASCenterLayoutSpecCenteringXY = ASCenterLayoutSpecCenteringX | ASCenterLayoutSpecCenteringY
-};
-
-/** 
-  * How much space the spec will take up.
-  *
-  * The default option will allow the spec to take up the maximum size possible.
-  * Swift: use [] for the default behavior.
-  */
-typedef NS_OPTIONS(NSUInteger, ASCenterLayoutSpecSizingOptions) {
-  /** The spec will take up the maximum size possible */
-  ASCenterLayoutSpecSizingOptionDefault = ASRelativeLayoutSpecSizingOptionDefault,
-  /** The spec will take up the minimum size possible along the X axis */
-  ASCenterLayoutSpecSizingOptionMinimumX = ASRelativeLayoutSpecSizingOptionMinimumWidth,
-  /** The spec will take up the minimum size possible along the Y axis */
-  ASCenterLayoutSpecSizingOptionMinimumY = ASRelativeLayoutSpecSizingOptionMinimumHeight,
-  /** Convenience option to take up the minimum size along both the X and Y axis */
-  ASCenterLayoutSpecSizingOptionMinimumXY = ASRelativeLayoutSpecSizingOptionMinimumSize
-};
-
-NS_ASSUME_NONNULL_BEGIN
-
-/** Lays out a single layoutElement child and position it so that it is centered into the layout bounds.
-  * NOTE: ASRelativeLayoutSpec offers all of the capabilities of Center, and more.
-  * Check it out if you would like to be able to position the child at any corner or the middle of an edge.
- */
-@interface ASCenterLayoutSpec : ASRelativeLayoutSpec
-
-@property (nonatomic) ASCenterLayoutSpecCenteringOptions centeringOptions;
-@property (nonatomic) ASCenterLayoutSpecSizingOptions sizingOptions;
-
-/**
- * Initializer.
- *
- * @param centeringOptions How the child is centered.
- * @param sizingOptions How much space will be taken up.
- * @param child The child to center.
- */
-+ (instancetype)centerLayoutSpecWithCenteringOptions:(ASCenterLayoutSpecCenteringOptions)centeringOptions
-                                       sizingOptions:(ASCenterLayoutSpecSizingOptions)sizingOptions
-                                               child:(id<ASLayoutElement>)child NS_RETURNS_RETAINED AS_WARN_UNUSED_RESULT;
-
-@end
-
-NS_ASSUME_NONNULL_END
diff --git a/submodules/AsyncDisplayKit/Source/Layout/ASCenterLayoutSpec.mm b/submodules/AsyncDisplayKit/Source/Layout/ASCenterLayoutSpec.mm
deleted file mode 100644
index 107f317c0c..0000000000
--- a/submodules/AsyncDisplayKit/Source/Layout/ASCenterLayoutSpec.mm
+++ /dev/null
@@ -1,76 +0,0 @@
-//
-//  ASCenterLayoutSpec.mm
-//  Texture
-//
-//  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.
-//  Changes after 4/13/2017 are: Copyright (c) Pinterest, Inc.  All rights reserved.
-//  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
-//
-
-#import <AsyncDisplayKit/ASCenterLayoutSpec.h>
-
-#import <AsyncDisplayKit/ASLayout.h>
-
-@implementation ASCenterLayoutSpec
-{
-  ASCenterLayoutSpecCenteringOptions _centeringOptions;
-  ASCenterLayoutSpecSizingOptions _sizingOptions;
-}
-
-- (instancetype)initWithCenteringOptions:(ASCenterLayoutSpecCenteringOptions)centeringOptions
-                           sizingOptions:(ASCenterLayoutSpecSizingOptions)sizingOptions
-                                   child:(id<ASLayoutElement>)child;
-{
-  ASRelativeLayoutSpecPosition verticalPosition = [self verticalPositionFromCenteringOptions:centeringOptions];
-  ASRelativeLayoutSpecPosition horizontalPosition = [self horizontalPositionFromCenteringOptions:centeringOptions];
-  
-  if (!(self = [super initWithHorizontalPosition:horizontalPosition verticalPosition:verticalPosition sizingOption:sizingOptions child:child])) {
-    return nil;
-  }
-  _centeringOptions = centeringOptions;
-  _sizingOptions = sizingOptions;
-  return self;
-}
-
-+ (instancetype)centerLayoutSpecWithCenteringOptions:(ASCenterLayoutSpecCenteringOptions)centeringOptions
-                                       sizingOptions:(ASCenterLayoutSpecSizingOptions)sizingOptions
-                                               child:(id<ASLayoutElement>)child NS_RETURNS_RETAINED
-{
-  return [[self alloc] initWithCenteringOptions:centeringOptions sizingOptions:sizingOptions child:child];
-}
-
-- (void)setCenteringOptions:(ASCenterLayoutSpecCenteringOptions)centeringOptions
-{
-  ASDisplayNodeAssert(self.isMutable, @"Cannot set properties when layout spec is not mutable");
-  _centeringOptions = centeringOptions;
-  
-  [self setHorizontalPosition:[self horizontalPositionFromCenteringOptions:centeringOptions]];
-  [self setVerticalPosition:[self verticalPositionFromCenteringOptions:centeringOptions]];
-}
-
-- (void)setSizingOptions:(ASCenterLayoutSpecSizingOptions)sizingOptions
-{
-  ASDisplayNodeAssert(self.isMutable, @"Cannot set properties when layout spec is not mutable");
-  _sizingOptions = sizingOptions;
-  [self setSizingOption:sizingOptions];
-}
-
-- (ASRelativeLayoutSpecPosition)horizontalPositionFromCenteringOptions:(ASCenterLayoutSpecCenteringOptions)centeringOptions
-{
-  if ((centeringOptions & ASCenterLayoutSpecCenteringX) != 0) {
-    return ASRelativeLayoutSpecPositionCenter;
-  } else {
-    return ASRelativeLayoutSpecPositionNone;
-  }
-}
-
-- (ASRelativeLayoutSpecPosition)verticalPositionFromCenteringOptions:(ASCenterLayoutSpecCenteringOptions)centeringOptions
-{
-  if ((centeringOptions & ASCenterLayoutSpecCenteringY) != 0) {
-    return ASRelativeLayoutSpecPositionCenter;
-  } else {
-    return ASRelativeLayoutSpecPositionNone;
-  }
-}
-
-@end
diff --git a/submodules/AsyncDisplayKit/Source/Layout/ASCornerLayoutSpec.h b/submodules/AsyncDisplayKit/Source/Layout/ASCornerLayoutSpec.h
deleted file mode 100644
index 799c9c28c3..0000000000
--- a/submodules/AsyncDisplayKit/Source/Layout/ASCornerLayoutSpec.h
+++ /dev/null
@@ -1,75 +0,0 @@
-//
-//  ASCornerLayoutSpec.h
-//  Texture
-//
-//  Copyright (c) Pinterest, Inc.  All rights reserved.
-//  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
-//
-
-#import <AsyncDisplayKit/ASLayoutSpec.h>
-
-/**
- The corner location for positioning corner element.
- */
-typedef NS_ENUM(NSInteger, ASCornerLayoutLocation) {
-    ASCornerLayoutLocationTopLeft,
-    ASCornerLayoutLocationTopRight,
-    ASCornerLayoutLocationBottomLeft,
-    ASCornerLayoutLocationBottomRight,
-};
-
-NS_ASSUME_NONNULL_BEGIN
-
-/**
- A layout spec that positions a corner element which relatives to the child element.
-
- @warning Both child element and corner element must have valid preferredSize for layout calculation.
- */
-@interface ASCornerLayoutSpec : ASLayoutSpec
-
-/**
- A layout spec that positions a corner element which relatives to the child element.
- 
- @param child A child that is laid out to determine the size of this spec.
- @param corner A layoutElement object that is laid out to a corner on the child.
- @param location The corner position option.
- @return An ASCornerLayoutSpec object with a given child and an layoutElement that act as corner.
- */
-- (instancetype)initWithChild:(id <ASLayoutElement>)child corner:(id <ASLayoutElement>)corner location:(ASCornerLayoutLocation)location AS_WARN_UNUSED_RESULT;
-
-/**
- A layout spec that positions a corner element which relatives to the child element.
- 
- @param child A child that is laid out to determine the size of this spec.
- @param corner A layoutElement object that is laid out to a corner on the child.
- @param location The corner position option.
- @return An ASCornerLayoutSpec object with a given child and an layoutElement that act as corner.
- */
-+ (instancetype)cornerLayoutSpecWithChild:(id <ASLayoutElement>)child corner:(id <ASLayoutElement>)corner location:(ASCornerLayoutLocation)location NS_RETURNS_RETAINED AS_WARN_UNUSED_RESULT;
-
-/**
- A layoutElement object that is laid out to a corner on the child.
- */
-@property (nonatomic) id <ASLayoutElement> corner;
-
-/**
- The corner position option.
- */
-@property (nonatomic) ASCornerLayoutLocation cornerLocation;
-
-/**
- The point which offsets from the corner location. Use this property to make delta
- distance from the default corner location. Default is CGPointZero.
- */
-@property (nonatomic) CGPoint offset;
-
-/**
- Whether should include corner element into layout size calculation. If included,
- the layout size will be the union size of both child and corner; If not included,
- the layout size will be only child's size. Default is NO.
- */
-@property (nonatomic) BOOL wrapsCorner;
-
-@end
-
-NS_ASSUME_NONNULL_END
diff --git a/submodules/AsyncDisplayKit/Source/Layout/ASCornerLayoutSpec.mm b/submodules/AsyncDisplayKit/Source/Layout/ASCornerLayoutSpec.mm
deleted file mode 100644
index 6663b28935..0000000000
--- a/submodules/AsyncDisplayKit/Source/Layout/ASCornerLayoutSpec.mm
+++ /dev/null
@@ -1,165 +0,0 @@
-//
-//  ASCornerLayoutSpec.mm
-//  Texture
-//
-//  Copyright (c) Pinterest, Inc.  All rights reserved.
-//  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
-//
-
-#import <AsyncDisplayKit/ASCornerLayoutSpec.h>
-#import <AsyncDisplayKit/ASLayout.h>
-#import <AsyncDisplayKit/ASLayoutSpec+Subclasses.h>
-#import <AsyncDisplayKit/ASDisplayNode.h>
-
-CGPoint as_calculatedCornerOriginIn(CGRect baseFrame, CGSize cornerSize, ASCornerLayoutLocation cornerLocation, CGPoint offset)
-{
-  CGPoint cornerOrigin = CGPointZero;
-  CGPoint baseOrigin = baseFrame.origin;
-  CGSize baseSize = baseFrame.size;
-  
-  switch (cornerLocation) {
-    case ASCornerLayoutLocationTopLeft:
-      cornerOrigin.x = baseOrigin.x - cornerSize.width / 2;
-      cornerOrigin.y = baseOrigin.y - cornerSize.height / 2;
-      break;
-    case ASCornerLayoutLocationTopRight:
-      cornerOrigin.x = baseOrigin.x + baseSize.width - cornerSize.width / 2;
-      cornerOrigin.y = baseOrigin.y - cornerSize.height / 2;
-      break;
-    case ASCornerLayoutLocationBottomLeft:
-      cornerOrigin.x = baseOrigin.x - cornerSize.width / 2;
-      cornerOrigin.y = baseOrigin.y + baseSize.height - cornerSize.height / 2;
-      break;
-    case ASCornerLayoutLocationBottomRight:
-      cornerOrigin.x = baseOrigin.x + baseSize.width - cornerSize.width / 2;
-      cornerOrigin.y = baseOrigin.y + baseSize.height - cornerSize.height / 2;
-      break;
-  }
-  
-  cornerOrigin.x += offset.x;
-  cornerOrigin.y += offset.y;
-  
-  return cornerOrigin;
-}
-
-static NSUInteger const kBaseChildIndex = 0;
-static NSUInteger const kCornerChildIndex = 1;
-
-@interface ASCornerLayoutSpec()
-@end
-
-@implementation ASCornerLayoutSpec
-
-- (instancetype)initWithChild:(id <ASLayoutElement>)child corner:(id <ASLayoutElement>)corner location:(ASCornerLayoutLocation)location
-{
-  self = [super init];
-  if (self) {
-    self.child = child;
-    self.corner = corner;
-    self.cornerLocation = location;
-  }
-  return self;
-}
-
-+ (instancetype)cornerLayoutSpecWithChild:(id <ASLayoutElement>)child corner:(id <ASLayoutElement>)corner location:(ASCornerLayoutLocation)location NS_RETURNS_RETAINED
-{
-  return [[self alloc] initWithChild:child corner:corner location:location];
-}
-
-#pragma mark - Children
-
-- (void)setChild:(id<ASLayoutElement>)child
-{
-  ASDisplayNodeAssertNotNil(child, @"Child shouldn't be nil.");
-  [super setChild:child atIndex:kBaseChildIndex];
-}
-
-- (id<ASLayoutElement>)child
-{
-  return [super childAtIndex:kBaseChildIndex];
-}
-
-- (void)setCorner:(id<ASLayoutElement>)corner
-{
-  ASDisplayNodeAssertNotNil(corner, @"Corner element cannot be nil.");
-  [super setChild:corner atIndex:kCornerChildIndex];
-}
-
-- (id<ASLayoutElement>)corner
-{
-  return [super childAtIndex:kCornerChildIndex];
-}
-
-#pragma mark - Calculation
-
-- (ASLayout *)calculateLayoutThatFits:(ASSizeRange)constrainedSize
-{
-  CGSize size = {
-    ASPointsValidForSize(constrainedSize.max.width) == NO ? ASLayoutElementParentDimensionUndefined : constrainedSize.max.width,
-    ASPointsValidForSize(constrainedSize.max.height) == NO ? ASLayoutElementParentDimensionUndefined : constrainedSize.max.height
-  };
-  
-  id <ASLayoutElement> child = self.child;
-  id <ASLayoutElement> corner = self.corner;
-  
-  // Element validation
-  [self _validateElement:child];
-  [self _validateElement:corner];
-  
-  CGRect childFrame = CGRectZero;
-  CGRect cornerFrame = CGRectZero;
-  
-  // Layout child
-  ASLayout *childLayout = [child layoutThatFits:constrainedSize parentSize:size];
-  childFrame.size = childLayout.size;
-  
-  // Layout corner
-  ASLayout *cornerLayout = [corner layoutThatFits:constrainedSize parentSize:size];
-  cornerFrame.size = cornerLayout.size;
-  
-  // Calculate corner's position
-  CGPoint relativePosition = as_calculatedCornerOriginIn(childFrame, cornerFrame.size, _cornerLocation, _offset);
-  
-  // Update corner's position
-  cornerFrame.origin = relativePosition;
-  
-  // Calculate size
-  CGRect frame = childFrame;
-  if (_wrapsCorner) {
-    frame = CGRectUnion(childFrame, cornerFrame);
-    frame.size = ASSizeRangeClamp(constrainedSize, frame.size);
-  }
-  
-  // Shift sublayouts' positions if they are off the bounds.
-  if (frame.origin.x != 0) {
-    CGFloat deltaX = frame.origin.x;
-    childFrame.origin.x -= deltaX;
-    cornerFrame.origin.x -= deltaX;
-  }
-  
-  if (frame.origin.y != 0) {
-    CGFloat deltaY = frame.origin.y;
-    childFrame.origin.y -= deltaY;
-    cornerFrame.origin.y -= deltaY;
-  }
-  
-  childLayout.position = childFrame.origin;
-  cornerLayout.position = cornerFrame.origin;
-  
-  return [ASLayout layoutWithLayoutElement:self size:frame.size sublayouts:@[childLayout, cornerLayout]];
-}
-
-- (void)_validateElement:(id <ASLayoutElement>)element
-{
-  // Validate non-nil element
-  if (element == nil) {
-    ASDisplayNodeAssertNotNil(element, @"[%@]: Must have a non-nil child/corner for layout calculation.", self.class);
-  }
-  // Validate preferredSize if needed
-  CGSize size = element.style.preferredSize;
-  if (!CGSizeEqualToSize(size, CGSizeZero) && !ASIsCGSizeValidForSize(size) && (size.width < 0 || (size.height < 0))) {
-    ASDisplayNodeFailAssert(@"[%@]: Should give a valid preferredSize value for %@ before corner's position calculation.", self.class, element);
-  }
-}
-
-@end
diff --git a/submodules/AsyncDisplayKit/Source/Layout/ASInsetLayoutSpec.h b/submodules/AsyncDisplayKit/Source/Layout/ASInsetLayoutSpec.h
deleted file mode 100644
index 8e22fe9bd2..0000000000
--- a/submodules/AsyncDisplayKit/Source/Layout/ASInsetLayoutSpec.h
+++ /dev/null
@@ -1,43 +0,0 @@
-//
-//  ASInsetLayoutSpec.h
-//  Texture
-//
-//  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.
-//  Changes after 4/13/2017 are: Copyright (c) Pinterest, Inc.  All rights reserved.
-//  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
-//
-
-#import <AsyncDisplayKit/ASLayoutSpec.h>
-
-NS_ASSUME_NONNULL_BEGIN
-
-/**
- A layout spec that wraps another layoutElement child, applying insets around it.
-
- If the child has a size specified as a fraction, the fraction is resolved against this spec's parent
- size **after** applying insets.
-
- @example ASOuterLayoutSpec contains an ASInsetLayoutSpec with an ASInnerLayoutSpec. Suppose that:
- - ASOuterLayoutSpec is 200pt wide.
- - ASInnerLayoutSpec specifies its width as 100%.
- - The ASInsetLayoutSpec has insets of 10pt on every side.
- ASInnerLayoutSpec will have size 180pt, not 200pt, because it receives a parent size that has been adjusted for insets.
-
- If you're familiar with CSS: ASInsetLayoutSpec's child behaves similarly to "box-sizing: border-box".
-
- An infinite inset is resolved as an inset equal to all remaining space after applying the other insets and child size.
- @example An ASInsetLayoutSpec with an infinite left inset and 10px for all other edges will position it's child 10px from the right edge.
- */
-@interface ASInsetLayoutSpec : ASLayoutSpec
-
-@property (nonatomic) UIEdgeInsets insets;
-
-/**
- @param insets The amount of space to inset on each side.
- @param child The wrapped child to inset.
- */
-+ (instancetype)insetLayoutSpecWithInsets:(UIEdgeInsets)insets child:(id<ASLayoutElement>)child NS_RETURNS_RETAINED AS_WARN_UNUSED_RESULT;
-
-@end
-
-NS_ASSUME_NONNULL_END
diff --git a/submodules/AsyncDisplayKit/Source/Layout/ASInsetLayoutSpec.mm b/submodules/AsyncDisplayKit/Source/Layout/ASInsetLayoutSpec.mm
deleted file mode 100644
index 450480f1c4..0000000000
--- a/submodules/AsyncDisplayKit/Source/Layout/ASInsetLayoutSpec.mm
+++ /dev/null
@@ -1,123 +0,0 @@
-//
-//  ASInsetLayoutSpec.mm
-//  Texture
-//
-//  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.
-//  Changes after 4/13/2017 are: Copyright (c) Pinterest, Inc.  All rights reserved.
-//  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
-//
-
-#import <AsyncDisplayKit/ASInsetLayoutSpec.h>
-
-#import <AsyncDisplayKit/ASLayoutSpec+Subclasses.h>
-
-#import <AsyncDisplayKit/ASAssert.h>
-#import <AsyncDisplayKit/ASInternalHelpers.h>
-
-@interface ASInsetLayoutSpec ()
-{
-  UIEdgeInsets _insets;
-}
-@end
-
-/* Returns f if f is finite, substitute otherwise */
-static CGFloat finite(CGFloat f, CGFloat substitute)
-{
-  return isinf(f) ? substitute : f;
-}
-
-/* Returns f if f is finite, 0 otherwise */
-static CGFloat finiteOrZero(CGFloat f)
-{
-  return finite(f, 0);
-}
-
-/* Returns the inset required to center 'inner' in 'outer' */
-static CGFloat centerInset(CGFloat outer, CGFloat inner)
-{
-  return ASRoundPixelValue((outer - inner) / 2);
-}
-
-@implementation ASInsetLayoutSpec
-
-- (instancetype)initWithInsets:(UIEdgeInsets)insets child:(id<ASLayoutElement>)child;
-{
-  if (!(self = [super init])) {
-    return nil;
-  }
-  ASDisplayNodeAssertNotNil(child, @"Child cannot be nil");
-  _insets = insets;
-  [self setChild:child];
-  return self;
-}
-
-+ (instancetype)insetLayoutSpecWithInsets:(UIEdgeInsets)insets child:(id<ASLayoutElement>)child NS_RETURNS_RETAINED
-{
-  return [[self alloc] initWithInsets:insets child:child];
-}
-
-- (void)setInsets:(UIEdgeInsets)insets
-{
-  ASDisplayNodeAssert(self.isMutable, @"Cannot set properties when layout spec is not mutable");
-  _insets = insets;
-}
-
-/**
- Inset will compute a new constrained size for it's child after applying insets and re-positioning
- the child to respect the inset.
- */
-- (ASLayout *)calculateLayoutThatFits:(ASSizeRange)constrainedSize
-                     restrictedToSize:(ASLayoutElementSize)size
-                 relativeToParentSize:(CGSize)parentSize
-{
-  if (self.child == nil) {
-    ASDisplayNodeAssert(NO, @"Inset spec measured without a child. The spec will do nothing.");
-    return [ASLayout layoutWithLayoutElement:self size:CGSizeZero];
-  }
-  
-  const CGFloat insetsX = (finiteOrZero(_insets.left) + finiteOrZero(_insets.right));
-  const CGFloat insetsY = (finiteOrZero(_insets.top) + finiteOrZero(_insets.bottom));
-
-  // if either x-axis inset is infinite, let child be intrinsic width
-  const CGFloat minWidth = (isinf(_insets.left) || isinf(_insets.right)) ? 0 : constrainedSize.min.width;
-  // if either y-axis inset is infinite, let child be intrinsic height
-  const CGFloat minHeight = (isinf(_insets.top) || isinf(_insets.bottom)) ? 0 : constrainedSize.min.height;
-
-  const ASSizeRange insetConstrainedSize = {
-    {
-      MAX(0, minWidth - insetsX),
-      MAX(0, minHeight - insetsY),
-    },
-    {
-      MAX(0, constrainedSize.max.width - insetsX),
-      MAX(0, constrainedSize.max.height - insetsY),
-    }
-  };
-  
-  const CGSize insetParentSize = {
-    MAX(0, parentSize.width - insetsX),
-    MAX(0, parentSize.height - insetsY)
-  };
-  
-  ASLayout *sublayout = [self.child layoutThatFits:insetConstrainedSize parentSize:insetParentSize];
-
-  const CGSize computedSize = ASSizeRangeClamp(constrainedSize, {
-    finite(sublayout.size.width + _insets.left + _insets.right, constrainedSize.max.width),
-    finite(sublayout.size.height + _insets.top + _insets.bottom, constrainedSize.max.height),
-  });
-
-  const CGFloat x = finite(_insets.left, constrainedSize.max.width -
-                           (finite(_insets.right,
-                                   centerInset(constrainedSize.max.width, sublayout.size.width)) + sublayout.size.width));
-
-  const CGFloat y = finite(_insets.top,
-                           constrainedSize.max.height -
-                           (finite(_insets.bottom,
-                                   centerInset(constrainedSize.max.height, sublayout.size.height)) + sublayout.size.height));
-  
-  sublayout.position = CGPointMake(x, y);
-  
-  return [ASLayout layoutWithLayoutElement:self size:computedSize sublayouts:@[sublayout]];
-}
-
-@end
diff --git a/submodules/AsyncDisplayKit/Source/Layout/ASLayout+IGListKit.h b/submodules/AsyncDisplayKit/Source/Layout/ASLayout+IGListKit.h
deleted file mode 100644
index 6f6753da2c..0000000000
--- a/submodules/AsyncDisplayKit/Source/Layout/ASLayout+IGListKit.h
+++ /dev/null
@@ -1,15 +0,0 @@
-//
-//  ASLayout+IGListKit.h
-//  Texture
-//
-//  Copyright (c) Pinterest, Inc.  All rights reserved.
-//  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
-//
-
-#if AS_IG_LIST_KIT
-#import <AsyncDisplayKit/ASLayout.h>
-#import <IGListKit/IGListKit.h>
-@interface ASLayout(IGListKit) <IGListDiffable>
-@end
-
-#endif // AS_IG_LIST_KIT
diff --git a/submodules/AsyncDisplayKit/Source/Layout/ASLayout+IGListKit.mm b/submodules/AsyncDisplayKit/Source/Layout/ASLayout+IGListKit.mm
deleted file mode 100644
index f9cc139e9c..0000000000
--- a/submodules/AsyncDisplayKit/Source/Layout/ASLayout+IGListKit.mm
+++ /dev/null
@@ -1,30 +0,0 @@
-//
-//  ASLayout+IGListKit.mm
-//  Texture
-//
-//  Copyright (c) Pinterest, Inc.  All rights reserved.
-//  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
-//
-#import <AsyncDisplayKit/ASAvailability.h>
-#if AS_IG_LIST_KIT
-#import "ASLayout+IGListKit.h"
-
-@interface ASLayout() {
-@public
-  id<ASLayoutElement> _layoutElement;
-}
-@end
-
-@implementation ASLayout(IGListKit)
-
-- (id <NSObject>)diffIdentifier
-{
-  return self->_layoutElement;
-}
-
-- (BOOL)isEqualToDiffableObject:(id <IGListDiffable>)other
-{
-  return [self isEqual:other];
-}
-@end
-#endif // AS_IG_LIST_KIT
diff --git a/submodules/AsyncDisplayKit/Source/Layout/ASLayoutElement.mm.orig b/submodules/AsyncDisplayKit/Source/Layout/ASLayoutElement.mm.orig
deleted file mode 100644
index 3a17293bc9..0000000000
--- a/submodules/AsyncDisplayKit/Source/Layout/ASLayoutElement.mm.orig
+++ /dev/null
@@ -1,869 +0,0 @@
-//
-//  ASLayoutElement.mm
-//  Texture
-//
-//  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.
-//  Changes after 4/13/2017 are: Copyright (c) Pinterest, Inc.  All rights reserved.
-//  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
-//
-
-#import <AsyncDisplayKit/ASDisplayNode+FrameworkPrivate.h>
-#import <AsyncDisplayKit/ASAvailability.h>
-#import <AsyncDisplayKit/ASLayout.h>
-#import <AsyncDisplayKit/ASLayoutElement.h>
-#import <AsyncDisplayKit/ASThread.h>
-#import <AsyncDisplayKit/ASObjectDescriptionHelpers.h>
-#import <AsyncDisplayKit/ASInternalHelpers.h>
-
-#import <atomic>
-#include <pthread.h>
-
-#if YOGA
-  #import YOGA_HEADER_PATH
-  #import <AsyncDisplayKit/ASYogaUtilities.h>
-#endif
-
-#pragma mark - ASLayoutElementContext
-
-@implementation ASLayoutElementContext
-
-- (instancetype)init
-{
-  if (self = [super init]) {
-    _transitionID = ASLayoutElementContextDefaultTransitionID;
-  }
-  return self;
-}
-
-@end
-
-CGFloat const ASLayoutElementParentDimensionUndefined = NAN;
-CGSize const ASLayoutElementParentSizeUndefined = {ASLayoutElementParentDimensionUndefined, ASLayoutElementParentDimensionUndefined};
-
-int32_t const ASLayoutElementContextInvalidTransitionID = 0;
-int32_t const ASLayoutElementContextDefaultTransitionID = ASLayoutElementContextInvalidTransitionID + 1;
-
-<<<<<<< HEAD
-#ifdef MINIMAL_ASDK
-static ASLayoutElementContext *mainThreadTlsContext = nil;
-
-static ASLayoutElementContext *get_tls_context() {
-  if ([NSThread isMainThread]) {
-    return mainThreadTlsContext;
-  } else {
-    return [NSThread currentThread].threadDictionary[@"ASDK_tls_context"];
-  }
-}
-
-static void set_tls_context(ASLayoutElementContext *value) {
-  if ([NSThread isMainThread]) {
-    mainThreadTlsContext = value;
-  } else {
-    if (value != nil) {
-      [NSThread currentThread].threadDictionary[@"ASDK_tls_context"] = value;
-    } else {
-      [[NSThread currentThread].threadDictionary removeObjectForKey:@"ASDK_tls_context"];
-    }
-  }
-}
-#else
-=======
-#if AS_TLS_AVAILABLE
-
->>>>>>> 565da7d4935740d12fc204aa061faf093831da1e
-static _Thread_local __unsafe_unretained ASLayoutElementContext *tls_context;
-#endif
-
-void ASLayoutElementPushContext(ASLayoutElementContext *context)
-{
-#ifdef MINIMAL_ASDK
-  // NOTE: It would be easy to support nested contexts – just use an NSMutableArray here.
-  ASDisplayNodeCAssertNil(get_tls_context(), @"Nested ASLayoutElementContexts aren't supported.");
-  
-  ;
-  set_tls_context(context);
-#else
-  // NOTE: It would be easy to support nested contexts – just use an NSMutableArray here.
-  ASDisplayNodeCAssertNil(tls_context, @"Nested ASLayoutElementContexts aren't supported.");
-  
-  tls_context = (__bridge ASLayoutElementContext *)(__bridge_retained CFTypeRef)context;
-#endif
-}
-
-ASLayoutElementContext *ASLayoutElementGetCurrentContext()
-{
-  // Don't retain here. Caller will retain if it wants to!
-  return get_tls_context();
-}
-
-void ASLayoutElementPopContext()
-{
-#ifdef MINIMAL_ASDK
-  ASDisplayNodeCAssertNotNil(get_tls_context(), @"Attempt to pop context when there wasn't a context!");
-  set_tls_context(nil);
-#else
-  ASDisplayNodeCAssertNotNil(tls_context, @"Attempt to pop context when there wasn't a context!");
-  CFRelease((__bridge CFTypeRef)tls_context);
-  tls_context = nil;
-#endif
-}
-
-#else
-
-static pthread_key_t ASLayoutElementContextKey() {
-  static pthread_key_t k;
-  static dispatch_once_t onceToken;
-  dispatch_once(&onceToken, ^{
-    pthread_key_create(&k, NULL);
-  });
-  return k;
-}
-void ASLayoutElementPushContext(ASLayoutElementContext *context)
-{
-  // NOTE: It would be easy to support nested contexts – just use an NSMutableArray here.
-  ASDisplayNodeCAssertNil(pthread_getspecific(ASLayoutElementContextKey()), @"Nested ASLayoutElementContexts aren't supported.");
-  
-  let cfCtx = (__bridge_retained CFTypeRef)context;
-  pthread_setspecific(ASLayoutElementContextKey(), cfCtx);
-}
-
-ASLayoutElementContext *ASLayoutElementGetCurrentContext()
-{
-  // Don't retain here. Caller will retain if it wants to!
-  let ctxPtr = pthread_getspecific(ASLayoutElementContextKey());
-  return (__bridge ASLayoutElementContext *)ctxPtr;
-}
-
-void ASLayoutElementPopContext()
-{
-  let ctx = (CFTypeRef)pthread_getspecific(ASLayoutElementContextKey());
-  ASDisplayNodeCAssertNotNil(ctx, @"Attempt to pop context when there wasn't a context!");
-  CFRelease(ctx);
-  pthread_setspecific(ASLayoutElementContextKey(), NULL);
-}
-
-#endif // AS_TLS_AVAILABLE
-
-#pragma mark - ASLayoutElementStyle
-
-NSString * const ASLayoutElementStyleWidthProperty = @"ASLayoutElementStyleWidthProperty";
-NSString * const ASLayoutElementStyleMinWidthProperty = @"ASLayoutElementStyleMinWidthProperty";
-NSString * const ASLayoutElementStyleMaxWidthProperty = @"ASLayoutElementStyleMaxWidthProperty";
-
-NSString * const ASLayoutElementStyleHeightProperty = @"ASLayoutElementStyleHeightProperty";
-NSString * const ASLayoutElementStyleMinHeightProperty = @"ASLayoutElementStyleMinHeightProperty";
-NSString * const ASLayoutElementStyleMaxHeightProperty = @"ASLayoutElementStyleMaxHeightProperty";
-
-NSString * const ASLayoutElementStyleSpacingBeforeProperty = @"ASLayoutElementStyleSpacingBeforeProperty";
-NSString * const ASLayoutElementStyleSpacingAfterProperty = @"ASLayoutElementStyleSpacingAfterProperty";
-NSString * const ASLayoutElementStyleFlexGrowProperty = @"ASLayoutElementStyleFlexGrowProperty";
-NSString * const ASLayoutElementStyleFlexShrinkProperty = @"ASLayoutElementStyleFlexShrinkProperty";
-NSString * const ASLayoutElementStyleFlexBasisProperty = @"ASLayoutElementStyleFlexBasisProperty";
-NSString * const ASLayoutElementStyleAlignSelfProperty = @"ASLayoutElementStyleAlignSelfProperty";
-NSString * const ASLayoutElementStyleAscenderProperty = @"ASLayoutElementStyleAscenderProperty";
-NSString * const ASLayoutElementStyleDescenderProperty = @"ASLayoutElementStyleDescenderProperty";
-
-NSString * const ASLayoutElementStyleLayoutPositionProperty = @"ASLayoutElementStyleLayoutPositionProperty";
-
-#if YOGA
-NSString * const ASYogaFlexWrapProperty = @"ASLayoutElementStyleLayoutFlexWrapProperty";
-NSString * const ASYogaFlexDirectionProperty = @"ASYogaFlexDirectionProperty";
-NSString * const ASYogaDirectionProperty = @"ASYogaDirectionProperty";
-NSString * const ASYogaSpacingProperty = @"ASYogaSpacingProperty";
-NSString * const ASYogaJustifyContentProperty = @"ASYogaJustifyContentProperty";
-NSString * const ASYogaAlignItemsProperty = @"ASYogaAlignItemsProperty";
-NSString * const ASYogaPositionTypeProperty = @"ASYogaPositionTypeProperty";
-NSString * const ASYogaPositionProperty = @"ASYogaPositionProperty";
-NSString * const ASYogaMarginProperty = @"ASYogaMarginProperty";
-NSString * const ASYogaPaddingProperty = @"ASYogaPaddingProperty";
-NSString * const ASYogaBorderProperty = @"ASYogaBorderProperty";
-NSString * const ASYogaAspectRatioProperty = @"ASYogaAspectRatioProperty";
-#endif
-
-#define ASLayoutElementStyleSetSizeWithScope(x) \
-  __instanceLock__.lock(); \
-  ASLayoutElementSize newSize = _size.load(); \
-  { x } \
-  _size.store(newSize); \
-  __instanceLock__.unlock();
-
-#define ASLayoutElementStyleCallDelegate(propertyName)\
-do {\
-  [self propertyDidChange:propertyName];\
-  [_delegate style:self propertyDidChange:propertyName];\
-} while(0)
-
-@implementation ASLayoutElementStyle {
-  ASDN::RecursiveMutex __instanceLock__;
-  ASLayoutElementStyleExtensions _extensions;
-  
-  std::atomic<ASLayoutElementSize> _size;
-  std::atomic<CGFloat> _spacingBefore;
-  std::atomic<CGFloat> _spacingAfter;
-  std::atomic<CGFloat> _flexGrow;
-  std::atomic<CGFloat> _flexShrink;
-  std::atomic<ASDimension> _flexBasis;
-  std::atomic<ASStackLayoutAlignSelf> _alignSelf;
-  std::atomic<CGFloat> _ascender;
-  std::atomic<CGFloat> _descender;
-  std::atomic<CGPoint> _layoutPosition;
-
-#if YOGA
-  YGNodeRef _yogaNode;
-  std::atomic<YGWrap> _flexWrap;
-  std::atomic<ASStackLayoutDirection> _flexDirection;
-  std::atomic<YGDirection> _direction;
-  std::atomic<ASStackLayoutJustifyContent> _justifyContent;
-  std::atomic<ASStackLayoutAlignItems> _alignItems;
-  std::atomic<YGPositionType> _positionType;
-  std::atomic<ASEdgeInsets> _position;
-  std::atomic<ASEdgeInsets> _margin;
-  std::atomic<ASEdgeInsets> _padding;
-  std::atomic<ASEdgeInsets> _border;
-  std::atomic<CGFloat> _aspectRatio;
-#endif
-}
-
-@dynamic width, height, minWidth, maxWidth, minHeight, maxHeight;
-@dynamic preferredSize, minSize, maxSize, preferredLayoutSize, minLayoutSize, maxLayoutSize;
-
-#pragma mark - Lifecycle
-
-- (instancetype)initWithDelegate:(id<ASLayoutElementStyleDelegate>)delegate
-{
-  self = [self init];
-  if (self) {
-    _delegate = delegate;
-  }
-  return self;
-}
-
-- (instancetype)init
-{
-  self = [super init];
-  if (self) {
-    _size = ASLayoutElementSizeMake();
-  }
-  return self;
-}
-
-ASSynthesizeLockingMethodsWithMutex(__instanceLock__)
-
-#pragma mark - ASLayoutElementStyleSize
-
-- (ASLayoutElementSize)size
-{
-  return _size.load();
-}
-
-- (void)setSize:(ASLayoutElementSize)size
-{
-  ASLayoutElementStyleSetSizeWithScope({
-    newSize = size;
-  });
-  // No CallDelegate method as ASLayoutElementSize is currently internal.
-}
-
-#pragma mark - ASLayoutElementStyleSizeForwarding
-
-- (ASDimension)width
-{
-  return _size.load().width;
-}
-
-- (void)setWidth:(ASDimension)width
-{
-  ASLayoutElementStyleSetSizeWithScope({
-    newSize.width = width;
-  });
-  ASLayoutElementStyleCallDelegate(ASLayoutElementStyleWidthProperty);
-}
-
-- (ASDimension)height
-{
-  return _size.load().height;
-}
-
-- (void)setHeight:(ASDimension)height
-{
-  ASLayoutElementStyleSetSizeWithScope({
-    newSize.height = height;
-  });
-  ASLayoutElementStyleCallDelegate(ASLayoutElementStyleHeightProperty);
-}
-
-- (ASDimension)minWidth
-{
-  return _size.load().minWidth;
-}
-
-- (void)setMinWidth:(ASDimension)minWidth
-{
-  ASLayoutElementStyleSetSizeWithScope({
-    newSize.minWidth = minWidth;
-  });
-  ASLayoutElementStyleCallDelegate(ASLayoutElementStyleMinWidthProperty);
-}
-
-- (ASDimension)maxWidth
-{
-  return _size.load().maxWidth;
-}
-
-- (void)setMaxWidth:(ASDimension)maxWidth
-{
-  ASLayoutElementStyleSetSizeWithScope({
-    newSize.maxWidth = maxWidth;
-  });
-  ASLayoutElementStyleCallDelegate(ASLayoutElementStyleMaxWidthProperty);
-}
-
-- (ASDimension)minHeight
-{
-  return _size.load().minHeight;
-}
-
-- (void)setMinHeight:(ASDimension)minHeight
-{
-  ASLayoutElementStyleSetSizeWithScope({
-    newSize.minHeight = minHeight;
-  });
-  ASLayoutElementStyleCallDelegate(ASLayoutElementStyleMinHeightProperty);
-}
-
-- (ASDimension)maxHeight
-{
-  return _size.load().maxHeight;
-}
-
-- (void)setMaxHeight:(ASDimension)maxHeight
-{
-  ASLayoutElementStyleSetSizeWithScope({
-    newSize.maxHeight = maxHeight;
-  });
-  ASLayoutElementStyleCallDelegate(ASLayoutElementStyleMaxHeightProperty);
-}
-
-
-#pragma mark - ASLayoutElementStyleSizeHelpers
-
-- (void)setPreferredSize:(CGSize)preferredSize
-{
-  ASLayoutElementStyleSetSizeWithScope({
-    newSize.width = ASDimensionMakeWithPoints(preferredSize.width);
-    newSize.height = ASDimensionMakeWithPoints(preferredSize.height);
-  });
-  ASLayoutElementStyleCallDelegate(ASLayoutElementStyleWidthProperty);
-  ASLayoutElementStyleCallDelegate(ASLayoutElementStyleHeightProperty);
-}
-
-- (CGSize)preferredSize
-{
-  ASLayoutElementSize size = _size.load();
-  if (size.width.unit == ASDimensionUnitFraction) {
-    NSCAssert(NO, @"Cannot get preferredSize of element with fractional width. Width: %@.", NSStringFromASDimension(size.width));
-    return CGSizeZero;
-  }
-  
-  if (size.height.unit == ASDimensionUnitFraction) {
-    NSCAssert(NO, @"Cannot get preferredSize of element with fractional height. Height: %@.", NSStringFromASDimension(size.height));
-    return CGSizeZero;
-  }
-  
-  return CGSizeMake(size.width.value, size.height.value);
-}
-
-- (void)setMinSize:(CGSize)minSize
-{
-  ASLayoutElementStyleSetSizeWithScope({
-    newSize.minWidth = ASDimensionMakeWithPoints(minSize.width);
-    newSize.minHeight = ASDimensionMakeWithPoints(minSize.height);
-  });
-  ASLayoutElementStyleCallDelegate(ASLayoutElementStyleMinWidthProperty);
-  ASLayoutElementStyleCallDelegate(ASLayoutElementStyleMinHeightProperty);
-}
-
-- (void)setMaxSize:(CGSize)maxSize
-{
-  ASLayoutElementStyleSetSizeWithScope({
-    newSize.maxWidth = ASDimensionMakeWithPoints(maxSize.width);
-    newSize.maxHeight = ASDimensionMakeWithPoints(maxSize.height);
-  });
-  ASLayoutElementStyleCallDelegate(ASLayoutElementStyleMaxWidthProperty);
-  ASLayoutElementStyleCallDelegate(ASLayoutElementStyleMaxHeightProperty);
-}
-
-- (ASLayoutSize)preferredLayoutSize
-{
-  ASLayoutElementSize size = _size.load();
-  return ASLayoutSizeMake(size.width, size.height);
-}
-
-- (void)setPreferredLayoutSize:(ASLayoutSize)preferredLayoutSize
-{
-  ASLayoutElementStyleSetSizeWithScope({
-    newSize.width = preferredLayoutSize.width;
-    newSize.height = preferredLayoutSize.height;
-  });
-  ASLayoutElementStyleCallDelegate(ASLayoutElementStyleWidthProperty);
-  ASLayoutElementStyleCallDelegate(ASLayoutElementStyleHeightProperty);
-}
-
-- (ASLayoutSize)minLayoutSize
-{
-  ASLayoutElementSize size = _size.load();
-  return ASLayoutSizeMake(size.minWidth, size.minHeight);
-}
-
-- (void)setMinLayoutSize:(ASLayoutSize)minLayoutSize
-{
-  ASLayoutElementStyleSetSizeWithScope({
-    newSize.minWidth = minLayoutSize.width;
-    newSize.minHeight = minLayoutSize.height;
-  });
-  ASLayoutElementStyleCallDelegate(ASLayoutElementStyleMinWidthProperty);
-  ASLayoutElementStyleCallDelegate(ASLayoutElementStyleMinHeightProperty);
-}
-
-- (ASLayoutSize)maxLayoutSize
-{
-  ASLayoutElementSize size = _size.load();
-  return ASLayoutSizeMake(size.maxWidth, size.maxHeight);
-}
-
-- (void)setMaxLayoutSize:(ASLayoutSize)maxLayoutSize
-{
-  ASLayoutElementStyleSetSizeWithScope({
-    newSize.maxWidth = maxLayoutSize.width;
-    newSize.maxHeight = maxLayoutSize.height;
-  });
-  ASLayoutElementStyleCallDelegate(ASLayoutElementStyleMaxWidthProperty);
-  ASLayoutElementStyleCallDelegate(ASLayoutElementStyleMaxHeightProperty);
-}
-
-#pragma mark - ASStackLayoutElement
-
-- (void)setSpacingBefore:(CGFloat)spacingBefore
-{
-  _spacingBefore.store(spacingBefore);
-  ASLayoutElementStyleCallDelegate(ASLayoutElementStyleSpacingBeforeProperty);
-}
-
-- (CGFloat)spacingBefore
-{
-  return _spacingBefore.load();
-}
-
-- (void)setSpacingAfter:(CGFloat)spacingAfter
-{
-  _spacingAfter.store(spacingAfter);
-  ASLayoutElementStyleCallDelegate(ASLayoutElementStyleSpacingAfterProperty);
-}
-
-- (CGFloat)spacingAfter
-{
-  return _spacingAfter.load();
-}
-
-- (void)setFlexGrow:(CGFloat)flexGrow
-{
-  _flexGrow.store(flexGrow);
-  ASLayoutElementStyleCallDelegate(ASLayoutElementStyleFlexGrowProperty);
-}
-
-- (CGFloat)flexGrow
-{
-  return _flexGrow.load();
-}
-
-- (void)setFlexShrink:(CGFloat)flexShrink
-{
-  _flexShrink.store(flexShrink);
-  ASLayoutElementStyleCallDelegate(ASLayoutElementStyleFlexShrinkProperty);
-}
-
-- (CGFloat)flexShrink
-{
-  return _flexShrink.load();
-}
-
-- (void)setFlexBasis:(ASDimension)flexBasis
-{
-  _flexBasis.store(flexBasis);
-  ASLayoutElementStyleCallDelegate(ASLayoutElementStyleFlexBasisProperty);
-}
-
-- (ASDimension)flexBasis
-{
-  return _flexBasis.load();
-}
-
-- (void)setAlignSelf:(ASStackLayoutAlignSelf)alignSelf
-{
-  _alignSelf.store(alignSelf);
-  ASLayoutElementStyleCallDelegate(ASLayoutElementStyleAlignSelfProperty);
-}
-
-- (ASStackLayoutAlignSelf)alignSelf
-{
-  return _alignSelf.load();
-}
-
-- (void)setAscender:(CGFloat)ascender
-{
-  _ascender.store(ascender);
-  ASLayoutElementStyleCallDelegate(ASLayoutElementStyleAscenderProperty);
-}
-
-- (CGFloat)ascender
-{
-  return _ascender.load();
-}
-
-- (void)setDescender:(CGFloat)descender
-{
-  _descender.store(descender);
-  ASLayoutElementStyleCallDelegate(ASLayoutElementStyleDescenderProperty);
-}
-
-- (CGFloat)descender
-{
-  return _descender.load();
-}
-
-#pragma mark - ASAbsoluteLayoutElement
-
-- (void)setLayoutPosition:(CGPoint)layoutPosition
-{
-  _layoutPosition.store(layoutPosition);
-  ASLayoutElementStyleCallDelegate(ASLayoutElementStyleLayoutPositionProperty);
-}
-
-- (CGPoint)layoutPosition
-{
-  return _layoutPosition.load();
-}
-
-#pragma mark - Extensions
-
-- (void)setLayoutOptionExtensionBool:(BOOL)value atIndex:(int)idx
-{
-  NSCAssert(idx < kMaxLayoutElementBoolExtensions, @"Setting index outside of max bool extensions space");
-  
-  ASDN::MutexLocker l(__instanceLock__);
-  _extensions.boolExtensions[idx] = value;
-}
-
-- (BOOL)layoutOptionExtensionBoolAtIndex:(int)idx\
-{
-  NSCAssert(idx < kMaxLayoutElementBoolExtensions, @"Accessing index outside of max bool extensions space");
-  
-  ASDN::MutexLocker l(__instanceLock__);
-  return _extensions.boolExtensions[idx];
-}
-
-- (void)setLayoutOptionExtensionInteger:(NSInteger)value atIndex:(int)idx
-{
-  NSCAssert(idx < kMaxLayoutElementStateIntegerExtensions, @"Setting index outside of max integer extensions space");
-  
-  ASDN::MutexLocker l(__instanceLock__);
-  _extensions.integerExtensions[idx] = value;
-}
-
-- (NSInteger)layoutOptionExtensionIntegerAtIndex:(int)idx
-{
-  NSCAssert(idx < kMaxLayoutElementStateIntegerExtensions, @"Accessing index outside of max integer extensions space");
-  
-  ASDN::MutexLocker l(__instanceLock__);
-  return _extensions.integerExtensions[idx];
-}
-
-- (void)setLayoutOptionExtensionEdgeInsets:(UIEdgeInsets)value atIndex:(int)idx
-{
-  NSCAssert(idx < kMaxLayoutElementStateEdgeInsetExtensions, @"Setting index outside of max edge insets extensions space");
-  
-  ASDN::MutexLocker l(__instanceLock__);
-  _extensions.edgeInsetsExtensions[idx] = value;
-}
-
-- (UIEdgeInsets)layoutOptionExtensionEdgeInsetsAtIndex:(int)idx
-{
-  NSCAssert(idx < kMaxLayoutElementStateEdgeInsetExtensions, @"Accessing index outside of max edge insets extensions space");
-  
-  ASDN::MutexLocker l(__instanceLock__);
-  return _extensions.edgeInsetsExtensions[idx];
-}
-
-#pragma mark - Debugging
-
-- (NSString *)description
-{
-  return ASObjectDescriptionMake(self, [self propertiesForDescription]);
-}
-
-- (NSMutableArray<NSDictionary *> *)propertiesForDescription
-{
-  NSMutableArray<NSDictionary *> *result = [NSMutableArray array];
-  
-  if ((self.minLayoutSize.width.unit != ASDimensionUnitAuto ||
-    self.minLayoutSize.height.unit != ASDimensionUnitAuto)) {
-    [result addObject:@{ @"minLayoutSize" : NSStringFromASLayoutSize(self.minLayoutSize) }];
-  }
-  
-  if ((self.preferredLayoutSize.width.unit != ASDimensionUnitAuto ||
-    self.preferredLayoutSize.height.unit != ASDimensionUnitAuto)) {
-    [result addObject:@{ @"preferredSize" : NSStringFromASLayoutSize(self.preferredLayoutSize) }];
-  }
-  
-  if ((self.maxLayoutSize.width.unit != ASDimensionUnitAuto ||
-    self.maxLayoutSize.height.unit != ASDimensionUnitAuto)) {
-    [result addObject:@{ @"maxLayoutSize" : NSStringFromASLayoutSize(self.maxLayoutSize) }];
-  }
-  
-  if (self.alignSelf != ASStackLayoutAlignSelfAuto) {
-    [result addObject:@{ @"alignSelf" : [@[@"ASStackLayoutAlignSelfAuto",
-                                          @"ASStackLayoutAlignSelfStart",
-                                          @"ASStackLayoutAlignSelfEnd",
-                                          @"ASStackLayoutAlignSelfCenter",
-                                          @"ASStackLayoutAlignSelfStretch"] objectAtIndex:self.alignSelf] }];
-  }
-  
-  if (self.ascender != 0) {
-    [result addObject:@{ @"ascender" : @(self.ascender) }];
-  }
-  
-  if (self.descender != 0) {
-    [result addObject:@{ @"descender" : @(self.descender) }];
-  }
-  
-  if (ASDimensionEqualToDimension(self.flexBasis, ASDimensionAuto) == NO) {
-    [result addObject:@{ @"flexBasis" : NSStringFromASDimension(self.flexBasis) }];
-  }
-  
-  if (self.flexGrow != 0) {
-    [result addObject:@{ @"flexGrow" : @(self.flexGrow) }];
-  }
-  
-  if (self.flexShrink != 0) {
-    [result addObject:@{ @"flexShrink" : @(self.flexShrink) }];
-  }
-  
-  if (self.spacingAfter != 0) {
-    [result addObject:@{ @"spacingAfter" : @(self.spacingAfter) }];
-  }
-  
-  if (self.spacingBefore != 0) {
-    [result addObject:@{ @"spacingBefore" : @(self.spacingBefore) }];
-  }
-  
-  if (CGPointEqualToPoint(self.layoutPosition, CGPointZero) == NO) {
-    [result addObject:@{ @"layoutPosition" : [NSValue valueWithCGPoint:self.layoutPosition] }];
-  }
-
-  return result;
-}
-
-- (void)propertyDidChange:(NSString *)propertyName
-{
-#if YOGA
-  /* TODO(appleguy): STYLE SETTER METHODS LEFT TO IMPLEMENT
-   void YGNodeStyleSetOverflow(YGNodeRef node, YGOverflow overflow);
-   void YGNodeStyleSetFlex(YGNodeRef node, float flex);
-   */
-
-  if (_yogaNode == NULL) {
-    return;
-  }
-  // Because the NSStrings used to identify each property are const, use efficient pointer comparison.
-  if (propertyName == ASLayoutElementStyleWidthProperty) {
-    YGNODE_STYLE_SET_DIMENSION(_yogaNode, Width, self.width);
-  }
-  else if (propertyName == ASLayoutElementStyleMinWidthProperty) {
-    YGNODE_STYLE_SET_DIMENSION(_yogaNode, MinWidth, self.minWidth);
-  }
-  else if (propertyName == ASLayoutElementStyleMaxWidthProperty) {
-    YGNODE_STYLE_SET_DIMENSION(_yogaNode, MaxWidth, self.maxWidth);
-  }
-  else if (propertyName == ASLayoutElementStyleHeightProperty) {
-    YGNODE_STYLE_SET_DIMENSION(_yogaNode, Height, self.height);
-  }
-  else if (propertyName == ASLayoutElementStyleMinHeightProperty) {
-    YGNODE_STYLE_SET_DIMENSION(_yogaNode, MinHeight, self.minHeight);
-  }
-  else if (propertyName == ASLayoutElementStyleMaxHeightProperty) {
-    YGNODE_STYLE_SET_DIMENSION(_yogaNode, MaxHeight, self.maxHeight);
-  }
-  else if (propertyName == ASLayoutElementStyleFlexGrowProperty) {
-    YGNodeStyleSetFlexGrow(_yogaNode, self.flexGrow);
-  }
-  else if (propertyName == ASLayoutElementStyleFlexShrinkProperty) {
-    YGNodeStyleSetFlexShrink(_yogaNode, self.flexShrink);
-  }
-  else if (propertyName == ASLayoutElementStyleFlexBasisProperty) {
-    YGNODE_STYLE_SET_DIMENSION(_yogaNode, FlexBasis, self.flexBasis);
-  }
-  else if (propertyName == ASLayoutElementStyleAlignSelfProperty) {
-    YGNodeStyleSetAlignSelf(_yogaNode, yogaAlignSelf(self.alignSelf));
-  }
-  else if (propertyName == ASYogaFlexWrapProperty) {
-    YGNodeStyleSetFlexWrap(_yogaNode, self.flexWrap);
-  }
-  else if (propertyName == ASYogaFlexDirectionProperty) {
-    YGNodeStyleSetFlexDirection(_yogaNode, yogaFlexDirection(self.flexDirection));
-  }
-  else if (propertyName == ASYogaDirectionProperty) {
-    YGNodeStyleSetDirection(_yogaNode, self.direction);
-  }
-  else if (propertyName == ASYogaJustifyContentProperty) {
-    YGNodeStyleSetJustifyContent(_yogaNode, yogaJustifyContent(self.justifyContent));
-  }
-  else if (propertyName == ASYogaAlignItemsProperty) {
-    ASStackLayoutAlignItems alignItems = self.alignItems;
-    if (alignItems != ASStackLayoutAlignItemsNotSet) {
-      YGNodeStyleSetAlignItems(_yogaNode, yogaAlignItems(alignItems));
-    }
-  }
-  else if (propertyName == ASYogaPositionTypeProperty) {
-    YGNodeStyleSetPositionType(_yogaNode, self.positionType);
-  }
-  else if (propertyName == ASYogaPositionProperty) {
-    ASEdgeInsets position = self.position;
-    YGEdge edge = YGEdgeLeft;
-    for (int i = 0; i < YGEdgeAll + 1; ++i) {
-      YGNODE_STYLE_SET_DIMENSION_WITH_EDGE(_yogaNode, Position, dimensionForEdgeWithEdgeInsets(edge, position), edge);
-      edge = (YGEdge)(edge + 1);
-    }
-  }
-  else if (propertyName == ASYogaMarginProperty) {
-    ASEdgeInsets margin   = self.margin;
-    YGEdge edge = YGEdgeLeft;
-    for (int i = 0; i < YGEdgeAll + 1; ++i) {
-      YGNODE_STYLE_SET_DIMENSION_WITH_EDGE(_yogaNode, Margin, dimensionForEdgeWithEdgeInsets(edge, margin), edge);
-      edge = (YGEdge)(edge + 1);
-    }
-  }
-  else if (propertyName == ASYogaPaddingProperty) {
-    ASEdgeInsets padding  = self.padding;
-    YGEdge edge = YGEdgeLeft;
-    for (int i = 0; i < YGEdgeAll + 1; ++i) {
-      YGNODE_STYLE_SET_DIMENSION_WITH_EDGE(_yogaNode, Padding, dimensionForEdgeWithEdgeInsets(edge, padding), edge);
-      edge = (YGEdge)(edge + 1);
-    }
-  }
-  else if (propertyName == ASYogaBorderProperty) {
-    ASEdgeInsets border   = self.border;
-    YGEdge edge = YGEdgeLeft;
-    for (int i = 0; i < YGEdgeAll + 1; ++i) {
-      YGNODE_STYLE_SET_FLOAT_WITH_EDGE(_yogaNode, Border, dimensionForEdgeWithEdgeInsets(edge, border), edge);
-      edge = (YGEdge)(edge + 1);
-    }
-  }
-  else if (propertyName == ASYogaAspectRatioProperty) {
-    CGFloat aspectRatio = self.aspectRatio;
-    if (aspectRatio > FLT_EPSILON && aspectRatio < CGFLOAT_MAX / 2.0) {
-      YGNodeStyleSetAspectRatio(_yogaNode, aspectRatio);
-    }
-  }
-#endif
-}
-
-#pragma mark - Yoga Flexbox Properties
-
-#if YOGA
-
-+ (void)initialize
-{
-  [super initialize];
-  YGConfigSetPointScaleFactor(YGConfigGetDefault(), ASScreenScale());
-  // Yoga recommends using Web Defaults for all new projects. This will be enabled for Texture very soon.
-  //YGConfigSetUseWebDefaults(YGConfigGetDefault(), true);
-}
-
-- (YGNodeRef)yogaNode
-{
-  return _yogaNode;
-}
-
-- (YGNodeRef)yogaNodeCreateIfNeeded
-{
-  if (_yogaNode == NULL) {
-    _yogaNode = YGNodeNew();
-  }
-  return _yogaNode;
-}
-
-- (void)destroyYogaNode
-{
-  if (_yogaNode != NULL) {
-    // Release the __bridge_retained Context object.
-    ASLayoutElementYogaUpdateMeasureFunc(_yogaNode, nil);
-    YGNodeFree(_yogaNode);
-    _yogaNode = NULL;
-  }
-}
-
-- (void)dealloc
-{
-  [self destroyYogaNode];
-}
-
-- (YGWrap)flexWrap                            { return _flexWrap.load(); }
-- (ASStackLayoutDirection)flexDirection       { return _flexDirection.load(); }
-- (YGDirection)direction                      { return _direction.load(); }
-- (ASStackLayoutJustifyContent)justifyContent { return _justifyContent.load(); }
-- (ASStackLayoutAlignItems)alignItems         { return _alignItems.load(); }
-- (YGPositionType)positionType                { return _positionType.load(); }
-- (ASEdgeInsets)position                      { return _position.load(); }
-- (ASEdgeInsets)margin                        { return _margin.load(); }
-- (ASEdgeInsets)padding                       { return _padding.load(); }
-- (ASEdgeInsets)border                        { return _border.load(); }
-- (CGFloat)aspectRatio                        { return _aspectRatio.load(); }
-
-- (void)setFlexWrap:(YGWrap)flexWrap {
-  _flexWrap.store(flexWrap);
-  ASLayoutElementStyleCallDelegate(ASYogaFlexWrapProperty);
-}
-- (void)setFlexDirection:(ASStackLayoutDirection)flexDirection {
-  _flexDirection.store(flexDirection);
-  ASLayoutElementStyleCallDelegate(ASYogaFlexDirectionProperty);
-}
-- (void)setDirection:(YGDirection)direction {
-  _direction.store(direction);
-  ASLayoutElementStyleCallDelegate(ASYogaDirectionProperty);
-}
-- (void)setJustifyContent:(ASStackLayoutJustifyContent)justify {
-  _justifyContent.store(justify);
-  ASLayoutElementStyleCallDelegate(ASYogaJustifyContentProperty);
-}
-- (void)setAlignItems:(ASStackLayoutAlignItems)alignItems {
-  _alignItems.store(alignItems);
-  ASLayoutElementStyleCallDelegate(ASYogaAlignItemsProperty);
-}
-- (void)setPositionType:(YGPositionType)positionType {
-  _positionType.store(positionType);
-  ASLayoutElementStyleCallDelegate(ASYogaPositionTypeProperty);
-}
-- (void)setPosition:(ASEdgeInsets)position {
-  _position.store(position);
-  ASLayoutElementStyleCallDelegate(ASYogaPositionProperty);
-}
-- (void)setMargin:(ASEdgeInsets)margin {
-  _margin.store(margin);
-  ASLayoutElementStyleCallDelegate(ASYogaMarginProperty);
-}
-- (void)setPadding:(ASEdgeInsets)padding {
-  _padding.store(padding);
-  ASLayoutElementStyleCallDelegate(ASYogaPaddingProperty);
-}
-- (void)setBorder:(ASEdgeInsets)border {
-  _border.store(border);
-  ASLayoutElementStyleCallDelegate(ASYogaBorderProperty);
-}
-- (void)setAspectRatio:(CGFloat)aspectRatio {
-  _aspectRatio.store(aspectRatio);
-  ASLayoutElementStyleCallDelegate(ASYogaAspectRatioProperty);
-}
-
-#endif /* YOGA */
-
-@end
diff --git a/submodules/AsyncDisplayKit/Source/Layout/ASOverlayLayoutSpec.h b/submodules/AsyncDisplayKit/Source/Layout/ASOverlayLayoutSpec.h
deleted file mode 100644
index a29a72b750..0000000000
--- a/submodules/AsyncDisplayKit/Source/Layout/ASOverlayLayoutSpec.h
+++ /dev/null
@@ -1,34 +0,0 @@
-//
-//  ASOverlayLayoutSpec.h
-//  Texture
-//
-//  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.
-//  Changes after 4/13/2017 are: Copyright (c) Pinterest, Inc.  All rights reserved.
-//  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
-//
-
-#import <AsyncDisplayKit/ASLayoutSpec.h>
-
-NS_ASSUME_NONNULL_BEGIN
-
-/**
- This layout spec lays out a single layoutElement child and then overlays a layoutElement object on top of it streched to its size
- */
-@interface ASOverlayLayoutSpec : ASLayoutSpec
-
-/**
- * Overlay layoutElement of this layout spec
- */
-@property (nonatomic) id<ASLayoutElement> overlay;
-
-/**
- * Creates and returns an ASOverlayLayoutSpec object with a given child and an layoutElement that act as overlay.
- *
- * @param child A child that is laid out to determine the size of this spec.
- * @param overlay A layoutElement object that is laid out over the child.
- */
-+ (instancetype)overlayLayoutSpecWithChild:(id<ASLayoutElement>)child overlay:(id<ASLayoutElement>)overlay NS_RETURNS_RETAINED AS_WARN_UNUSED_RESULT;
-
-@end
-
-NS_ASSUME_NONNULL_END
diff --git a/submodules/AsyncDisplayKit/Source/Layout/ASOverlayLayoutSpec.mm b/submodules/AsyncDisplayKit/Source/Layout/ASOverlayLayoutSpec.mm
deleted file mode 100644
index 27ffbeb8c7..0000000000
--- a/submodules/AsyncDisplayKit/Source/Layout/ASOverlayLayoutSpec.mm
+++ /dev/null
@@ -1,88 +0,0 @@
-//
-//  ASOverlayLayoutSpec.mm
-//  Texture
-//
-//  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.
-//  Changes after 4/13/2017 are: Copyright (c) Pinterest, Inc.  All rights reserved.
-//  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
-//
-
-#import <AsyncDisplayKit/ASOverlayLayoutSpec.h>
-#import <AsyncDisplayKit/ASLayoutSpec+Subclasses.h>
-#import <AsyncDisplayKit/ASAssert.h>
-#import <AsyncDisplayKit/ASCollections.h>
-
-static NSUInteger const kUnderlayChildIndex = 0;
-static NSUInteger const kOverlayChildIndex = 1;
-
-@implementation ASOverlayLayoutSpec
-
-#pragma mark - Class
-
-+ (instancetype)overlayLayoutSpecWithChild:(id<ASLayoutElement>)child overlay:(id<ASLayoutElement>)overlay NS_RETURNS_RETAINED
-{
-  return [[self alloc] initWithChild:child overlay:overlay];
-}
-
-#pragma mark - Lifecycle
-
-- (instancetype)initWithChild:(id<ASLayoutElement>)child overlay:(id<ASLayoutElement>)overlay
-{
-  if (!(self = [super init])) {
-    return nil;
-  }
-  self.child = child;
-  self.overlay = overlay;
-  return self;
-}
-
-#pragma mark - Setter / Getter
-
-- (void)setChild:(id<ASLayoutElement>)child
-{
-  ASDisplayNodeAssertNotNil(child, @"Child that will be overlayed on shouldn't be nil");
-  [super setChild:child atIndex:kUnderlayChildIndex];
-}
-
-- (id<ASLayoutElement>)child
-{
-  return [super childAtIndex:kUnderlayChildIndex];
-}
-
-- (void)setOverlay:(id<ASLayoutElement>)overlay
-{
-  ASDisplayNodeAssertNotNil(overlay, @"Overlay cannot be nil");
-  [super setChild:overlay atIndex:kOverlayChildIndex];
-}
-
-- (id<ASLayoutElement>)overlay
-{
-  return [super childAtIndex:kOverlayChildIndex];
-}
-
-#pragma mark - ASLayoutSpec
-
-/**
- First layout the contents, then fit the overlay on top of it.
- */
-- (ASLayout *)calculateLayoutThatFits:(ASSizeRange)constrainedSize
-                     restrictedToSize:(ASLayoutElementSize)size
-                 relativeToParentSize:(CGSize)parentSize
-{
-  ASLayout *contentsLayout = [self.child layoutThatFits:constrainedSize parentSize:parentSize];
-  contentsLayout.position = CGPointZero;
-  ASLayout *rawSublayouts[2];
-  int i = 0;
-  rawSublayouts[i++] = contentsLayout;
-  if (self.overlay) {
-    ASLayout *overlayLayout = [self.overlay layoutThatFits:ASSizeRangeMake(contentsLayout.size)
-                                                parentSize:contentsLayout.size];
-    overlayLayout.position = CGPointZero;
-    rawSublayouts[i++] = overlayLayout;
-  }
-  
-  const auto sublayouts = [NSArray<ASLayout *> arrayByTransferring:rawSublayouts count:i];
-  return [ASLayout layoutWithLayoutElement:self size:contentsLayout.size sublayouts:sublayouts];
-}
-
-@end
diff --git a/submodules/AsyncDisplayKit/Source/Layout/ASRatioLayoutSpec.h b/submodules/AsyncDisplayKit/Source/Layout/ASRatioLayoutSpec.h
deleted file mode 100644
index b70e6fe7fb..0000000000
--- a/submodules/AsyncDisplayKit/Source/Layout/ASRatioLayoutSpec.h
+++ /dev/null
@@ -1,42 +0,0 @@
-//
-//  ASRatioLayoutSpec.h
-//  Texture
-//
-//  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.
-//  Changes after 4/13/2017 are: Copyright (c) Pinterest, Inc.  All rights reserved.
-//  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
-//
-
-#import <AsyncDisplayKit/ASLayoutSpec.h>
-
-NS_ASSUME_NONNULL_BEGIN
-
-@protocol ASLayoutElement;
-
-/**
- Ratio layout spec
- For when the content should respect a certain inherent ratio but can be scaled (think photos or videos)
- The ratio passed is the ratio of height / width you expect
-
- For a ratio 0.5, the spec will have a flat rectangle shape
-  _ _ _ _
- |       |
- |_ _ _ _|
-
- For a ratio 2.0, the spec will be twice as tall as it is wide
-  _ _
- |   |
- |   |
- |   |
- |_ _|
-
- **/
-@interface ASRatioLayoutSpec : ASLayoutSpec
-
-@property (nonatomic) CGFloat ratio;
-
-+ (instancetype)ratioLayoutSpecWithRatio:(CGFloat)ratio child:(id<ASLayoutElement>)child NS_RETURNS_RETAINED AS_WARN_UNUSED_RESULT;
-
-@end
-
-NS_ASSUME_NONNULL_END
diff --git a/submodules/AsyncDisplayKit/Source/Layout/ASRatioLayoutSpec.mm b/submodules/AsyncDisplayKit/Source/Layout/ASRatioLayoutSpec.mm
deleted file mode 100644
index 1580b2a60c..0000000000
--- a/submodules/AsyncDisplayKit/Source/Layout/ASRatioLayoutSpec.mm
+++ /dev/null
@@ -1,103 +0,0 @@
-//
-//  ASRatioLayoutSpec.mm
-//  Texture
-//
-//  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.
-//  Changes after 4/13/2017 are: Copyright (c) Pinterest, Inc.  All rights reserved.
-//  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
-//
-
-#import <AsyncDisplayKit/ASRatioLayoutSpec.h>
-
-#import <algorithm>
-#import <tgmath.h>
-#import <vector>
-
-#import <AsyncDisplayKit/ASLayoutSpec+Subclasses.h>
-
-#import <AsyncDisplayKit/ASAssert.h>
-#import <AsyncDisplayKit/ASInternalHelpers.h>
-
-#pragma mark - ASRatioLayoutSpec
-
-@implementation ASRatioLayoutSpec
-{
-  CGFloat _ratio;
-}
-
-#pragma mark - Lifecycle
-
-+ (instancetype)ratioLayoutSpecWithRatio:(CGFloat)ratio child:(id<ASLayoutElement>)child NS_RETURNS_RETAINED
-{
-  return [[self alloc] initWithRatio:ratio child:child];
-}
-
-- (instancetype)initWithRatio:(CGFloat)ratio child:(id<ASLayoutElement>)child;
-{
-  if (!(self = [super init])) {
-    return nil;
-  }
-
-  ASDisplayNodeAssertNotNil(child, @"Child cannot be nil");
-  ASDisplayNodeAssert(ratio > 0, @"Ratio should be strictly positive, but received %f", ratio);
-  _ratio = ratio;
-  self.child = child;
-
-  return self;
-}
-
-#pragma mark - Setter / Getter
-
-- (void)setRatio:(CGFloat)ratio
-{
-  ASDisplayNodeAssert(self.isMutable, @"Cannot set properties when layout spec is not mutable");
-  _ratio = ratio;
-}
-
-#pragma mark - ASLayoutElement
-
-- (ASLayout *)calculateLayoutThatFits:(ASSizeRange)constrainedSize
-{
-  std::vector<CGSize> sizeOptions;
-  
-  if (ASPointsValidForSize(constrainedSize.max.width)) {
-    sizeOptions.push_back(ASSizeRangeClamp(constrainedSize, {
-      constrainedSize.max.width,
-      ASFloorPixelValue(_ratio * constrainedSize.max.width)
-    }));
-  }
-  
-  if (ASPointsValidForSize(constrainedSize.max.height)) {
-    sizeOptions.push_back(ASSizeRangeClamp(constrainedSize, {
-      ASFloorPixelValue(constrainedSize.max.height / _ratio),
-      constrainedSize.max.height
-    }));
-  }
-
-  // Choose the size closest to the desired ratio.
-  const auto &bestSize = std::max_element(sizeOptions.begin(), sizeOptions.end(), [&](const CGSize &a, const CGSize &b){
-    return std::fabs((a.height / a.width) - _ratio) > std::fabs((b.height / b.width) - _ratio);
-  });
-
-  // If there is no max size in *either* dimension, we can't apply the ratio, so just pass our size range through.
-  const ASSizeRange childRange = (bestSize == sizeOptions.end()) ? constrainedSize : ASSizeRangeIntersect(constrainedSize, ASSizeRangeMake(*bestSize, *bestSize));
-  const CGSize parentSize = (bestSize == sizeOptions.end()) ? ASLayoutElementParentSizeUndefined : *bestSize;
-  ASLayout *sublayout = [self.child layoutThatFits:childRange parentSize:parentSize];
-  sublayout.position = CGPointZero;
-  return [ASLayout layoutWithLayoutElement:self size:sublayout.size sublayouts:@[sublayout]];
-}
-
-@end
-
-#pragma mark - ASRatioLayoutSpec (Debugging)
-
-@implementation ASRatioLayoutSpec (Debugging)
-
-#pragma mark - ASLayoutElementAsciiArtProtocol
-
-- (NSString *)asciiArtName
-{
-  return [NSString stringWithFormat:@"%@ (%.1f)", NSStringFromClass([self class]), self.ratio];
-}
-
-@end
diff --git a/submodules/AsyncDisplayKit/Source/Layout/ASRelativeLayoutSpec.h b/submodules/AsyncDisplayKit/Source/Layout/ASRelativeLayoutSpec.h
deleted file mode 100644
index 9b260d9ccc..0000000000
--- a/submodules/AsyncDisplayKit/Source/Layout/ASRelativeLayoutSpec.h
+++ /dev/null
@@ -1,87 +0,0 @@
-//
-//  ASRelativeLayoutSpec.h
-//  Texture
-//
-//  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.
-//  Changes after 4/13/2017 are: Copyright (c) Pinterest, Inc.  All rights reserved.
-//  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
-//
-
-#import <AsyncDisplayKit/ASLayoutSpec.h>
-
-/** 
-  * How the child is positioned within the spec.
-  *
-  * The default option will position the child at point 0.
-  * Swift: use [] for the default behavior.
-  */
-typedef NS_ENUM(NSUInteger, ASRelativeLayoutSpecPosition) {
-  /** The child is positioned at point 0 */ 
-  ASRelativeLayoutSpecPositionNone = 0,
-  /** The child is positioned at point 0 relatively to the layout axis (ie left / top most) */
-  ASRelativeLayoutSpecPositionStart = 1,
-  /** The child is centered along the specified axis */
-  ASRelativeLayoutSpecPositionCenter = 2,
-  /** The child is positioned at the maximum point of the layout axis (ie right / bottom most) */
-  ASRelativeLayoutSpecPositionEnd = 3,
-};
-
-/** 
-  * How much space the spec will take up.
-  *
-  * The default option will allow the spec to take up the maximum size possible.
-  * Swift: use [] for the default behavior.
-  */
-typedef NS_OPTIONS(NSUInteger, ASRelativeLayoutSpecSizingOption) {
-  /** The spec will take up the maximum size possible */
-  ASRelativeLayoutSpecSizingOptionDefault,
-  /** The spec will take up the minimum size possible along the X axis */
-  ASRelativeLayoutSpecSizingOptionMinimumWidth = 1 << 0,
-  /** The spec will take up the minimum size possible along the Y axis */
-  ASRelativeLayoutSpecSizingOptionMinimumHeight = 1 << 1,
-  /** Convenience option to take up the minimum size along both the X and Y axis */
-  ASRelativeLayoutSpecSizingOptionMinimumSize = ASRelativeLayoutSpecSizingOptionMinimumWidth | ASRelativeLayoutSpecSizingOptionMinimumHeight,
-};
-
-NS_ASSUME_NONNULL_BEGIN
-
-/** Lays out a single layoutElement child and positions it within the layout bounds according to vertical and horizontal positional specifiers.
- *  Can position the child at any of the 4 corners, or the middle of any of the 4 edges, as well as the center - similar to "9-part" image areas.
- */
-@interface ASRelativeLayoutSpec : ASLayoutSpec
-
-// You may create a spec with alloc / init, then set any non-default properties; or use a convenience initialize that accepts all properties.
-@property (nonatomic) ASRelativeLayoutSpecPosition horizontalPosition;
-@property (nonatomic) ASRelativeLayoutSpecPosition verticalPosition;
-@property (nonatomic) ASRelativeLayoutSpecSizingOption sizingOption;
-
-/*!
- * @discussion convenience constructor for a ASRelativeLayoutSpec
- * @param horizontalPosition how to position the item on the horizontal (x) axis
- * @param verticalPosition how to position the item on the vertical (y) axis
- * @param sizingOption how much size to take up
- * @param child the child to layout
- * @return a configured ASRelativeLayoutSpec
- */
-+ (instancetype)relativePositionLayoutSpecWithHorizontalPosition:(ASRelativeLayoutSpecPosition)horizontalPosition
-                                                verticalPosition:(ASRelativeLayoutSpecPosition)verticalPosition
-                                                    sizingOption:(ASRelativeLayoutSpecSizingOption)sizingOption
-                                                           child:(id<ASLayoutElement>)child NS_RETURNS_RETAINED AS_WARN_UNUSED_RESULT;
-
-/*!
- * @discussion convenience initializer for a ASRelativeLayoutSpec
- * @param horizontalPosition how to position the item on the horizontal (x) axis
- * @param verticalPosition how to position the item on the vertical (y) axis
- * @param sizingOption how much size to take up
- * @param child the child to layout
- * @return a configured ASRelativeLayoutSpec
- */
-- (instancetype)initWithHorizontalPosition:(ASRelativeLayoutSpecPosition)horizontalPosition
-                          verticalPosition:(ASRelativeLayoutSpecPosition)verticalPosition
-                              sizingOption:(ASRelativeLayoutSpecSizingOption)sizingOption
-                                     child:(id<ASLayoutElement>)child;
-
-@end
-
-NS_ASSUME_NONNULL_END
-
diff --git a/submodules/AsyncDisplayKit/Source/Layout/ASRelativeLayoutSpec.mm b/submodules/AsyncDisplayKit/Source/Layout/ASRelativeLayoutSpec.mm
deleted file mode 100644
index f096ce51d4..0000000000
--- a/submodules/AsyncDisplayKit/Source/Layout/ASRelativeLayoutSpec.mm
+++ /dev/null
@@ -1,104 +0,0 @@
-//
-//  ASRelativeLayoutSpec.mm
-//  Texture
-//
-//  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.
-//  Changes after 4/13/2017 are: Copyright (c) Pinterest, Inc.  All rights reserved.
-//  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
-//
-
-#import <AsyncDisplayKit/ASRelativeLayoutSpec.h>
-
-#import <AsyncDisplayKit/ASLayoutSpec+Subclasses.h>
-
-#import <AsyncDisplayKit/ASInternalHelpers.h>
-
-@implementation ASRelativeLayoutSpec
-
-- (instancetype)initWithHorizontalPosition:(ASRelativeLayoutSpecPosition)horizontalPosition verticalPosition:(ASRelativeLayoutSpecPosition)verticalPosition sizingOption:(ASRelativeLayoutSpecSizingOption)sizingOption child:(id<ASLayoutElement>)child
-{
-  if (!(self = [super init])) {
-    return nil;
-  }
-  ASDisplayNodeAssertNotNil(child, @"Child cannot be nil");
-  _horizontalPosition = horizontalPosition;
-  _verticalPosition = verticalPosition;
-  _sizingOption = sizingOption;
-  [self setChild:child];
-  return self;
-}
-
-+ (instancetype)relativePositionLayoutSpecWithHorizontalPosition:(ASRelativeLayoutSpecPosition)horizontalPosition verticalPosition:(ASRelativeLayoutSpecPosition)verticalPosition sizingOption:(ASRelativeLayoutSpecSizingOption)sizingOption child:(id<ASLayoutElement>)child NS_RETURNS_RETAINED
-{
-  return [[self alloc] initWithHorizontalPosition:horizontalPosition verticalPosition:verticalPosition sizingOption:sizingOption child:child];
-}
-
-- (void)setHorizontalPosition:(ASRelativeLayoutSpecPosition)horizontalPosition
-{
-  ASDisplayNodeAssert(self.isMutable, @"Cannot set properties when layout spec is not mutable");
-  _horizontalPosition = horizontalPosition;
-}
-
-- (void)setVerticalPosition:(ASRelativeLayoutSpecPosition)verticalPosition {
-  ASDisplayNodeAssert(self.isMutable, @"Cannot set properties when layout spec is not mutable");
-  _verticalPosition = verticalPosition;
-}
-
-- (void)setSizingOption:(ASRelativeLayoutSpecSizingOption)sizingOption
-{
-  ASDisplayNodeAssert(self.isMutable, @"Cannot set properties when layout spec is not mutable");
-  _sizingOption = sizingOption;
-}
-
-- (ASLayout *)calculateLayoutThatFits:(ASSizeRange)constrainedSize
-{
-  // If we have a finite size in any direction, pass this so that the child can resolve percentages against it.
-  // Otherwise pass ASLayoutElementParentDimensionUndefined as the size will depend on the content
-  CGSize size = {
-    ASPointsValidForSize(constrainedSize.max.width) == NO ? ASLayoutElementParentDimensionUndefined : constrainedSize.max.width,
-    ASPointsValidForSize(constrainedSize.max.height) == NO ? ASLayoutElementParentDimensionUndefined : constrainedSize.max.height
-  };
-  
-  // Layout the child
-  const CGSize minChildSize = {
-    (_horizontalPosition != ASRelativeLayoutSpecPositionNone) ? 0 : constrainedSize.min.width,
-    (_verticalPosition != ASRelativeLayoutSpecPositionNone) ? 0 : constrainedSize.min.height,
-  };
-  ASLayout *sublayout = [self.child layoutThatFits:ASSizeRangeMake(minChildSize, constrainedSize.max) parentSize:size];
-  
-  // If we have an undetermined height or width, use the child size to define the layout size
-  size = ASSizeRangeClamp(constrainedSize, {
-    isfinite(size.width) == NO ? sublayout.size.width : size.width,
-    isfinite(size.height) == NO ? sublayout.size.height : size.height
-  });
-  
-  // If minimum size options are set, attempt to shrink the size to the size of the child
-  size = ASSizeRangeClamp(constrainedSize, {
-    MIN(size.width, (_sizingOption & ASRelativeLayoutSpecSizingOptionMinimumWidth) != 0 ? sublayout.size.width : size.width),
-    MIN(size.height, (_sizingOption & ASRelativeLayoutSpecSizingOptionMinimumHeight) != 0 ? sublayout.size.height : size.height)
-  });
-  
-  // Compute the position for the child on each axis according to layout parameters
-  CGFloat xPosition = [self proportionOfAxisForAxisPosition:_horizontalPosition];
-  CGFloat yPosition = [self proportionOfAxisForAxisPosition:_verticalPosition];
-  
-  sublayout.position = {
-    ASRoundPixelValue((size.width - sublayout.size.width) * xPosition),
-    ASRoundPixelValue((size.height - sublayout.size.height) * yPosition)
-  };
-  
-  return [ASLayout layoutWithLayoutElement:self size:size sublayouts:@[sublayout]];
-}
-
-- (CGFloat)proportionOfAxisForAxisPosition:(ASRelativeLayoutSpecPosition)position
-{
-  if (position == ASRelativeLayoutSpecPositionCenter) {
-    return 0.5f;
-  } else if (position == ASRelativeLayoutSpecPositionEnd) {
-    return 1.0f;
-  } else {
-    return 0.0f;
-  }
-}
-
-@end
diff --git a/submodules/AsyncDisplayKit/Source/Layout/ASStackLayoutSpec.h b/submodules/AsyncDisplayKit/Source/Layout/ASStackLayoutSpec.h
deleted file mode 100644
index 535758ac7b..0000000000
--- a/submodules/AsyncDisplayKit/Source/Layout/ASStackLayoutSpec.h
+++ /dev/null
@@ -1,133 +0,0 @@
-//
-//  ASStackLayoutSpec.h
-//  Texture
-//
-//  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.
-//  Changes after 4/13/2017 are: Copyright (c) Pinterest, Inc.  All rights reserved.
-//  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
-//
-
-#import <AsyncDisplayKit/ASLayoutSpec.h>
-#import <AsyncDisplayKit/ASStackLayoutDefines.h>
-
-NS_ASSUME_NONNULL_BEGIN
-
-/**
- A simple layout spec that stacks a list of children vertically or horizontally.
-
- - All children are initially laid out with the an infinite available size in the stacking direction.
- - In the other direction, this spec's constraint is passed.
- - The children's sizes are summed in the stacking direction.
-   - If this sum is less than this spec's minimum size in stacking direction, children with flexGrow are flexed.
-   - If it is greater than this spec's maximum size in the stacking direction, children with flexShrink are flexed.
-   - If, even after flexing, the sum is still greater than this spec's maximum size in the stacking direction,
-     justifyContent determines how children are laid out.
-
- For example:
- 
- - Suppose stacking direction is Vertical, min-width=100, max-width=300, min-height=200, max-height=500.
- - All children are laid out with min-width=100, max-width=300, min-height=0, max-height=INFINITY.
- - If the sum of the childrens' heights is less than 200, children with flexGrow are flexed larger.
- - If the sum of the childrens' heights is greater than 500, children with flexShrink are flexed smaller.
-   Each child is shrunk by `((sum of heights) - 500)/(number of flexShrink-able children)`.
- - If the sum of the childrens' heights is greater than 500 even after flexShrink-able children are flexed,
-   justifyContent determines how children are laid out.
- */
-@interface ASStackLayoutSpec : ASLayoutSpec
-
-/** 
- Specifies the direction children are stacked in. If horizontalAlignment and verticalAlignment were set, 
- they will be resolved again, causing justifyContent and alignItems to be updated accordingly
- */
-@property (nonatomic) ASStackLayoutDirection direction;
-/** The amount of space between each child. */
-@property (nonatomic) CGFloat spacing;
-/** 
- Specifies how children are aligned horizontally. Depends on the stack direction, setting the alignment causes either
- justifyContent or alignItems to be updated. The alignment will remain valid after future direction changes.
- Thus, it is preferred to those properties
- */
-@property (nonatomic) ASHorizontalAlignment horizontalAlignment;
-/** 
- Specifies how children are aligned vertically. Depends on the stack direction, setting the alignment causes either
- justifyContent or alignItems to be updated. The alignment will remain valid after future direction changes.
- Thus, it is preferred to those properties
- */
-@property (nonatomic) ASVerticalAlignment verticalAlignment;
-/** The amount of space between each child. Defaults to ASStackLayoutJustifyContentStart */
-@property (nonatomic) ASStackLayoutJustifyContent justifyContent;
-/** Orientation of children along cross axis. Defaults to ASStackLayoutAlignItemsStretch */
-@property (nonatomic) ASStackLayoutAlignItems alignItems;
-/** Whether children are stacked into a single or multiple lines. Defaults to single line (ASStackLayoutFlexWrapNoWrap) */
-@property (nonatomic) ASStackLayoutFlexWrap flexWrap;
-/** Orientation of lines along cross axis if there are multiple lines. Defaults to ASStackLayoutAlignContentStart */
-@property (nonatomic) ASStackLayoutAlignContent alignContent;
-/** If the stack spreads on multiple lines using flexWrap, the amount of space between lines. */
-@property (nonatomic) CGFloat lineSpacing;
-/** Whether this stack can dispatch to other threads, regardless of which thread it's running on */
-@property (nonatomic, getter=isConcurrent) BOOL concurrent;
-
-- (instancetype)init;
-
-/**
- @param direction The direction of the stack view (horizontal or vertical)
- @param spacing The spacing between the children
- @param justifyContent If no children are flexible, this describes how to fill any extra space
- @param alignItems Orientation of the children along the cross axis
- @param children ASLayoutElement children to be positioned.
- */
-+ (instancetype)stackLayoutSpecWithDirection:(ASStackLayoutDirection)direction
-                                     spacing:(CGFloat)spacing
-                              justifyContent:(ASStackLayoutJustifyContent)justifyContent
-                                  alignItems:(ASStackLayoutAlignItems)alignItems
-                                    children:(NSArray<id<ASLayoutElement>> *)children NS_RETURNS_RETAINED AS_WARN_UNUSED_RESULT;
-
-/**
- @param direction The direction of the stack view (horizontal or vertical)
- @param spacing The spacing between the children
- @param justifyContent If no children are flexible, this describes how to fill any extra space
- @param alignItems Orientation of the children along the cross axis
- @param flexWrap Whether children are stacked into a single or multiple lines
- @param alignContent Orientation of lines along cross axis if there are multiple lines
- @param children ASLayoutElement children to be positioned.
- */
-+ (instancetype)stackLayoutSpecWithDirection:(ASStackLayoutDirection)direction
-                                     spacing:(CGFloat)spacing
-                              justifyContent:(ASStackLayoutJustifyContent)justifyContent
-                                  alignItems:(ASStackLayoutAlignItems)alignItems
-                                    flexWrap:(ASStackLayoutFlexWrap)flexWrap
-                                alignContent:(ASStackLayoutAlignContent)alignContent
-                                    children:(NSArray<id<ASLayoutElement>> *)children NS_RETURNS_RETAINED AS_WARN_UNUSED_RESULT;
-
-/**
- @param direction The direction of the stack view (horizontal or vertical)
- @param spacing The spacing between the children
- @param justifyContent If no children are flexible, this describes how to fill any extra space
- @param alignItems Orientation of the children along the cross axis
- @param flexWrap Whether children are stacked into a single or multiple lines
- @param alignContent Orientation of lines along cross axis if there are multiple lines
- @param lineSpacing The spacing between lines
- @param children ASLayoutElement children to be positioned.
- */
-+ (instancetype)stackLayoutSpecWithDirection:(ASStackLayoutDirection)direction
-                                     spacing:(CGFloat)spacing
-                              justifyContent:(ASStackLayoutJustifyContent)justifyContent
-                                  alignItems:(ASStackLayoutAlignItems)alignItems
-                                    flexWrap:(ASStackLayoutFlexWrap)flexWrap
-                                alignContent:(ASStackLayoutAlignContent)alignContent
-                                 lineSpacing:(CGFloat)lineSpacing
-                                    children:(NSArray<id<ASLayoutElement>> *)children NS_RETURNS_RETAINED AS_WARN_UNUSED_RESULT;
-
-/**
- * @return A stack layout spec with direction of ASStackLayoutDirectionVertical
- **/
-+ (instancetype)verticalStackLayoutSpec NS_RETURNS_RETAINED AS_WARN_UNUSED_RESULT;
-
-/**
- * @return A stack layout spec with direction of ASStackLayoutDirectionHorizontal
- **/
-+ (instancetype)horizontalStackLayoutSpec NS_RETURNS_RETAINED AS_WARN_UNUSED_RESULT;
-
-@end
-
-NS_ASSUME_NONNULL_END
diff --git a/submodules/AsyncDisplayKit/Source/Layout/ASStackLayoutSpec.mm b/submodules/AsyncDisplayKit/Source/Layout/ASStackLayoutSpec.mm
deleted file mode 100644
index c7c9f8dd21..0000000000
--- a/submodules/AsyncDisplayKit/Source/Layout/ASStackLayoutSpec.mm
+++ /dev/null
@@ -1,212 +0,0 @@
-//
-//  ASStackLayoutSpec.mm
-//  Texture
-//
-//  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.
-//  Changes after 4/13/2017 are: Copyright (c) Pinterest, Inc.  All rights reserved.
-//  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
-//
-
-#import <AsyncDisplayKit/ASStackLayoutSpec.h>
-
-#import <numeric>
-#import <vector>
-
-#import <AsyncDisplayKit/ASCollections.h>
-#import <AsyncDisplayKit/ASDimension.h>
-#import <AsyncDisplayKit/ASLayout.h>
-#import <AsyncDisplayKit/ASLayoutElement.h>
-#import <AsyncDisplayKit/ASLayoutElementStylePrivate.h>
-#import <AsyncDisplayKit/ASLayoutSpecUtilities.h>
-#import <AsyncDisplayKit/ASLog.h>
-#import <AsyncDisplayKit/ASStackPositionedLayout.h>
-#import <AsyncDisplayKit/ASStackUnpositionedLayout.h>
-
-@implementation ASStackLayoutSpec
-
-- (instancetype)init
-{
-  return [self initWithDirection:ASStackLayoutDirectionHorizontal spacing:0.0 justifyContent:ASStackLayoutJustifyContentStart alignItems:ASStackLayoutAlignItemsStretch flexWrap:ASStackLayoutFlexWrapNoWrap alignContent:ASStackLayoutAlignContentStart lineSpacing:0.0 children:nil];
-}
-
-+ (instancetype)stackLayoutSpecWithDirection:(ASStackLayoutDirection)direction spacing:(CGFloat)spacing justifyContent:(ASStackLayoutJustifyContent)justifyContent alignItems:(ASStackLayoutAlignItems)alignItems children:(NSArray *)children NS_RETURNS_RETAINED
-{
-  return [[self alloc] initWithDirection:direction spacing:spacing justifyContent:justifyContent alignItems:alignItems flexWrap:ASStackLayoutFlexWrapNoWrap alignContent:ASStackLayoutAlignContentStart lineSpacing: 0.0 children:children];
-}
-
-+ (instancetype)stackLayoutSpecWithDirection:(ASStackLayoutDirection)direction spacing:(CGFloat)spacing justifyContent:(ASStackLayoutJustifyContent)justifyContent alignItems:(ASStackLayoutAlignItems)alignItems flexWrap:(ASStackLayoutFlexWrap)flexWrap alignContent:(ASStackLayoutAlignContent)alignContent children:(NSArray<id<ASLayoutElement>> *)children NS_RETURNS_RETAINED
-{
-  return [[self alloc] initWithDirection:direction spacing:spacing justifyContent:justifyContent alignItems:alignItems flexWrap:flexWrap alignContent:alignContent lineSpacing:0.0 children:children];
-}
-
-+ (instancetype)stackLayoutSpecWithDirection:(ASStackLayoutDirection)direction spacing:(CGFloat)spacing justifyContent:(ASStackLayoutJustifyContent)justifyContent alignItems:(ASStackLayoutAlignItems)alignItems flexWrap:(ASStackLayoutFlexWrap)flexWrap alignContent:(ASStackLayoutAlignContent)alignContent lineSpacing:(CGFloat)lineSpacing children:(NSArray<id<ASLayoutElement>> *)children NS_RETURNS_RETAINED
-{
-  return [[self alloc] initWithDirection:direction spacing:spacing justifyContent:justifyContent alignItems:alignItems flexWrap:flexWrap alignContent:alignContent lineSpacing:lineSpacing children:children];
-}
-
-+ (instancetype)verticalStackLayoutSpec NS_RETURNS_RETAINED
-{
-  ASStackLayoutSpec *stackLayoutSpec = [[self alloc] init];
-  stackLayoutSpec.direction = ASStackLayoutDirectionVertical;
-  return stackLayoutSpec;
-}
-
-+ (instancetype)horizontalStackLayoutSpec NS_RETURNS_RETAINED
-{
-  ASStackLayoutSpec *stackLayoutSpec = [[self alloc] init];
-  stackLayoutSpec.direction = ASStackLayoutDirectionHorizontal;
-  return stackLayoutSpec;
-}
-
-- (instancetype)initWithDirection:(ASStackLayoutDirection)direction spacing:(CGFloat)spacing justifyContent:(ASStackLayoutJustifyContent)justifyContent alignItems:(ASStackLayoutAlignItems)alignItems flexWrap:(ASStackLayoutFlexWrap)flexWrap alignContent:(ASStackLayoutAlignContent)alignContent lineSpacing:(CGFloat)lineSpacing children:(NSArray *)children
-{
-  if (!(self = [super init])) {
-    return nil;
-  }
-  _direction = direction;
-  _spacing = spacing;
-  _horizontalAlignment = ASHorizontalAlignmentNone;
-  _verticalAlignment = ASVerticalAlignmentNone;
-  _alignItems = alignItems;
-  _justifyContent = justifyContent;
-  _flexWrap = flexWrap;
-  _alignContent = alignContent;
-  _lineSpacing = lineSpacing;
-  
-  [self setChildren:children];
-  return self;
-}
-
-- (void)setDirection:(ASStackLayoutDirection)direction
-{
-  ASDisplayNodeAssert(self.isMutable, @"Cannot set properties when layout spec is not mutable");
-  if (_direction != direction) {
-    _direction = direction;
-    [self resolveHorizontalAlignment];
-    [self resolveVerticalAlignment];
-  }
-}
-
-- (void)setHorizontalAlignment:(ASHorizontalAlignment)horizontalAlignment
-{
-  ASDisplayNodeAssert(self.isMutable, @"Cannot set properties when layout spec is not mutable");
-  if (_horizontalAlignment != horizontalAlignment) {
-    _horizontalAlignment = horizontalAlignment;
-    [self resolveHorizontalAlignment];
-  }
-}
-
-- (void)setVerticalAlignment:(ASVerticalAlignment)verticalAlignment
-{
-  ASDisplayNodeAssert(self.isMutable, @"Cannot set properties when layout spec is not mutable");
-  if (_verticalAlignment != verticalAlignment) {
-    _verticalAlignment = verticalAlignment;
-    [self resolveVerticalAlignment];
-  }
-}
-
-- (void)setAlignItems:(ASStackLayoutAlignItems)alignItems
-{
-  ASDisplayNodeAssert(self.isMutable, @"Cannot set properties when layout spec is not mutable");
-  ASDisplayNodeAssert(_horizontalAlignment == ASHorizontalAlignmentNone, @"Cannot set this property directly because horizontalAlignment is being used");
-  ASDisplayNodeAssert(_verticalAlignment == ASVerticalAlignmentNone, @"Cannot set this property directly because verticalAlignment is being used");
-  _alignItems = alignItems;
-}
-
-- (void)setJustifyContent:(ASStackLayoutJustifyContent)justifyContent
-{
-  ASDisplayNodeAssert(self.isMutable, @"Cannot set properties when layout spec is not mutable");
-  ASDisplayNodeAssert(_horizontalAlignment == ASHorizontalAlignmentNone, @"Cannot set this property directly because horizontalAlignment is being used");
-  ASDisplayNodeAssert(_verticalAlignment == ASVerticalAlignmentNone, @"Cannot set this property directly because verticalAlignment is being used");
-  _justifyContent = justifyContent;
-}
-
-- (void)setSpacing:(CGFloat)spacing
-{
-  ASDisplayNodeAssert(self.isMutable, @"Cannot set properties when layout spec is not mutable");
-  _spacing = spacing;
-}
-
-- (ASLayout *)calculateLayoutThatFits:(ASSizeRange)constrainedSize
-{
-  NSArray *children = self.children;
-  if (children.count == 0) {
-    return [ASLayout layoutWithLayoutElement:self size:constrainedSize.min];
-  }
- 
-  as_activity_scope_verbose(as_activity_create("Calculate stack layout", AS_ACTIVITY_CURRENT, OS_ACTIVITY_FLAG_DEFAULT));
-  as_log_verbose(ASLayoutLog(), "Stack layout %@", self);
-  // Accessing the style and size property is pretty costly we create layout spec children we use to figure
-  // out the layout for each child
-  const auto stackChildren = AS::map(children, [&](const id<ASLayoutElement> child) -> ASStackLayoutSpecChild {
-    ASLayoutElementStyle *style = child.style;
-    return {child, style, style.size};
-  });
-  
-  const ASStackLayoutSpecStyle style = {.direction = _direction, .spacing = _spacing, .justifyContent = _justifyContent, .alignItems = _alignItems, .flexWrap = _flexWrap, .alignContent = _alignContent, .lineSpacing = _lineSpacing};
-  
-  const auto unpositionedLayout = ASStackUnpositionedLayout::compute(stackChildren, style, constrainedSize, _concurrent);
-  const auto positionedLayout = ASStackPositionedLayout::compute(unpositionedLayout, style, constrainedSize);
-  
-  if (style.direction == ASStackLayoutDirectionVertical) {
-    self.style.ascender = stackChildren.front().style.ascender;
-    self.style.descender = stackChildren.back().style.descender;
-  }
-
-  ASLayout *rawSublayouts[positionedLayout.items.size()];
-  int i = 0;
-  for (const auto &item : positionedLayout.items) {
-    rawSublayouts[i++] = item.layout;
-  }
-
-  const auto sublayouts = [NSArray<ASLayout *> arrayByTransferring:rawSublayouts count:i];
-  return [ASLayout layoutWithLayoutElement:self size:positionedLayout.size sublayouts:sublayouts];
-}
-
-- (void)resolveHorizontalAlignment
-{
-  if (_direction == ASStackLayoutDirectionHorizontal) {
-    _justifyContent = justifyContent(_horizontalAlignment, _justifyContent);
-  } else {
-    _alignItems = alignment(_horizontalAlignment, _alignItems);
-  }
-}
-
-- (void)resolveVerticalAlignment
-{
-  if (_direction == ASStackLayoutDirectionHorizontal) {
-    _alignItems = alignment(_verticalAlignment, _alignItems);
-  } else {
-    _justifyContent = justifyContent(_verticalAlignment, _justifyContent);
-  }
-}
-
-- (NSMutableArray<NSDictionary *> *)propertiesForDescription
-{
-  auto result = [super propertiesForDescription];
-
-  // Add our direction
-  switch (self.direction) {
-    case ASStackLayoutDirectionVertical:
-      [result insertObject:@{ (id)kCFNull: @"vertical" } atIndex:0];
-      break;
-    case ASStackLayoutDirectionHorizontal:
-      [result insertObject:@{ (id)kCFNull: @"horizontal" } atIndex:0];
-      break;
-  }
-
-  return result;
-}
-
-@end
-
-@implementation ASStackLayoutSpec (Debugging)
-
-#pragma mark - ASLayoutElementAsciiArtProtocol
-
-- (NSString *)asciiArtString
-{
-  return [ASLayoutSpec asciiArtStringForChildren:self.children parentName:[self asciiArtName] direction:self.direction];
-}
-
-@end
diff --git a/submodules/AsyncDisplayKit/Source/Layout/ASYogaUtilities.h b/submodules/AsyncDisplayKit/Source/Layout/ASYogaUtilities.h
deleted file mode 100644
index c3d1d8233c..0000000000
--- a/submodules/AsyncDisplayKit/Source/Layout/ASYogaUtilities.h
+++ /dev/null
@@ -1,78 +0,0 @@
-//
-//  ASYogaUtilities.h
-//  Texture
-//
-//  Copyright (c) Pinterest, Inc.  All rights reserved.
-//  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
-//
-
-#import <AsyncDisplayKit/ASAvailability.h>
-
-#if YOGA /* YOGA */
-
-#import <AsyncDisplayKit/ASLayout.h>
-#import <AsyncDisplayKit/ASLog.h>
-#import <AsyncDisplayKit/ASDisplayNode+Beta.h>
-
-// Should pass a string literal, not an NSString as the first argument to ASYogaLog
-#define ASYogaLog(x, ...) as_log_verbose(ASLayoutLog(), x, ##__VA_ARGS__);
-
-@interface ASDisplayNode (YogaHelpers)
-
-+ (ASDisplayNode *)yogaNode;
-+ (ASDisplayNode *)yogaSpacerNode;
-+ (ASDisplayNode *)yogaVerticalStack;
-+ (ASDisplayNode *)yogaHorizontalStack;
-
-@end
-
-// pre-order, depth-first
-AS_EXTERN void ASDisplayNodePerformBlockOnEveryYogaChild(ASDisplayNode *node, void(^block)(ASDisplayNode *node));
-
-#pragma mark - Yoga Type Conversion Helpers
-
-AS_EXTERN YGAlign yogaAlignItems(ASStackLayoutAlignItems alignItems);
-AS_EXTERN YGJustify yogaJustifyContent(ASStackLayoutJustifyContent justifyContent);
-AS_EXTERN YGAlign yogaAlignSelf(ASStackLayoutAlignSelf alignSelf);
-AS_EXTERN YGFlexDirection yogaFlexDirection(ASStackLayoutDirection direction);
-AS_EXTERN float yogaFloatForCGFloat(CGFloat value);
-AS_EXTERN float yogaDimensionToPoints(ASDimension dimension);
-AS_EXTERN float yogaDimensionToPercent(ASDimension dimension);
-AS_EXTERN ASDimension dimensionForEdgeWithEdgeInsets(YGEdge edge, ASEdgeInsets insets);
-
-AS_EXTERN void ASLayoutElementYogaUpdateMeasureFunc(YGNodeRef yogaNode, id <ASLayoutElement> layoutElement);
-AS_EXTERN float ASLayoutElementYogaBaselineFunc(YGNodeRef yogaNode, const float width, const float height);
-AS_EXTERN YGSize ASLayoutElementYogaMeasureFunc(YGNodeRef yogaNode,
-                                      float width, YGMeasureMode widthMode,
-                                      float height, YGMeasureMode heightMode);
-
-#pragma mark - Yoga Style Setter Helpers
-
-#define YGNODE_STYLE_SET_DIMENSION(yogaNode, property, dimension) \
-  if (dimension.unit == ASDimensionUnitPoints) { \
-    YGNodeStyleSet##property(yogaNode, yogaDimensionToPoints(dimension)); \
-  } else if (dimension.unit == ASDimensionUnitFraction) { \
-    YGNodeStyleSet##property##Percent(yogaNode, yogaDimensionToPercent(dimension)); \
-  } else { \
-    YGNodeStyleSet##property(yogaNode, YGUndefined); \
-  }\
-
-#define YGNODE_STYLE_SET_DIMENSION_WITH_EDGE(yogaNode, property, dimension, edge) \
-  if (dimension.unit == ASDimensionUnitPoints) { \
-    YGNodeStyleSet##property(yogaNode, edge, yogaDimensionToPoints(dimension)); \
-  } else if (dimension.unit == ASDimensionUnitFraction) { \
-    YGNodeStyleSet##property##Percent(yogaNode, edge, yogaDimensionToPercent(dimension)); \
-  } else { \
-    YGNodeStyleSet##property(yogaNode, edge, YGUndefined); \
-  } \
-
-#define YGNODE_STYLE_SET_FLOAT_WITH_EDGE(yogaNode, property, dimension, edge) \
-  if (dimension.unit == ASDimensionUnitPoints) { \
-    YGNodeStyleSet##property(yogaNode, edge, yogaDimensionToPoints(dimension)); \
-  } else if (dimension.unit == ASDimensionUnitFraction) { \
-    ASDisplayNodeAssert(NO, @"Unexpected Fraction value in applying ##property## values to YGNode"); \
-  } else { \
-    YGNodeStyleSet##property(yogaNode, edge, YGUndefined); \
-  } \
-
-#endif /* YOGA */
diff --git a/submodules/AsyncDisplayKit/Source/Layout/ASYogaUtilities.mm b/submodules/AsyncDisplayKit/Source/Layout/ASYogaUtilities.mm
deleted file mode 100644
index f0602ed4bd..0000000000
--- a/submodules/AsyncDisplayKit/Source/Layout/ASYogaUtilities.mm
+++ /dev/null
@@ -1,240 +0,0 @@
-//
-//  ASYogaUtilities.mm
-//  Texture
-//
-//  Copyright (c) Pinterest, Inc.  All rights reserved.
-//  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
-//
-
-#import <AsyncDisplayKit/ASYogaUtilities.h>
-#import <AsyncDisplayKit/ASLayoutElementStylePrivate.h>
-#if YOGA /* YOGA */
-
-@implementation ASDisplayNode (YogaHelpers)
-
-+ (ASDisplayNode *)yogaNode
-{
-  ASDisplayNode *node = [[ASDisplayNode alloc] init];
-  node.automaticallyManagesSubnodes = YES;
-  [node.style yogaNodeCreateIfNeeded];
-  return node;
-}
-
-+ (ASDisplayNode *)yogaSpacerNode
-{
-  ASDisplayNode *node = [ASDisplayNode yogaNode];
-  node.style.flexGrow = 1.0f;
-  return node;
-}
-
-+ (ASDisplayNode *)yogaVerticalStack
-{
-  ASDisplayNode *node = [self yogaNode];
-  node.style.flexDirection = ASStackLayoutDirectionVertical;
-  return node;
-}
-
-+ (ASDisplayNode *)yogaHorizontalStack
-{
-  ASDisplayNode *node = [self yogaNode];
-  node.style.flexDirection = ASStackLayoutDirectionHorizontal;
-  return node;
-}
-
-@end
-
-void ASDisplayNodePerformBlockOnEveryYogaChild(ASDisplayNode *node, void(^block)(ASDisplayNode *node))
-{
-  if (node == nil) {
-    return;
-  }
-  block(node);
-  // We use the accessor here despite the copy, because the block may modify the yoga tree e.g.
-  // replacing a node.
-  for (ASDisplayNode *child in node.yogaChildren) {
-    ASDisplayNodePerformBlockOnEveryYogaChild(child, block);
-  }
-}
-
-#pragma mark - Yoga Type Conversion Helpers
-
-YGAlign yogaAlignItems(ASStackLayoutAlignItems alignItems)
-{
-  switch (alignItems) {
-    case ASStackLayoutAlignItemsNotSet:         return YGAlignAuto;
-    case ASStackLayoutAlignItemsStart:          return YGAlignFlexStart;
-    case ASStackLayoutAlignItemsEnd:            return YGAlignFlexEnd;
-    case ASStackLayoutAlignItemsCenter:         return YGAlignCenter;
-    case ASStackLayoutAlignItemsStretch:        return YGAlignStretch;
-    case ASStackLayoutAlignItemsBaselineFirst:  return YGAlignBaseline;
-      // FIXME: WARNING, Yoga does not currently support last-baseline item alignment.
-    case ASStackLayoutAlignItemsBaselineLast:   return YGAlignBaseline;
-  }
-}
-
-YGJustify yogaJustifyContent(ASStackLayoutJustifyContent justifyContent)
-{
-  switch (justifyContent) {
-    case ASStackLayoutJustifyContentStart:        return YGJustifyFlexStart;
-    case ASStackLayoutJustifyContentCenter:       return YGJustifyCenter;
-    case ASStackLayoutJustifyContentEnd:          return YGJustifyFlexEnd;
-    case ASStackLayoutJustifyContentSpaceBetween: return YGJustifySpaceBetween;
-    case ASStackLayoutJustifyContentSpaceAround:  return YGJustifySpaceAround;
-  }
-}
-
-YGAlign yogaAlignSelf(ASStackLayoutAlignSelf alignSelf)
-{
-  switch (alignSelf) {
-    case ASStackLayoutAlignSelfStart:   return YGAlignFlexStart;
-    case ASStackLayoutAlignSelfCenter:  return YGAlignCenter;
-    case ASStackLayoutAlignSelfEnd:     return YGAlignFlexEnd;
-    case ASStackLayoutAlignSelfStretch: return YGAlignStretch;
-    case ASStackLayoutAlignSelfAuto:    return YGAlignAuto;
-  }
-}
-
-YGFlexDirection yogaFlexDirection(ASStackLayoutDirection direction)
-{
-  return direction == ASStackLayoutDirectionVertical ? YGFlexDirectionColumn : YGFlexDirectionRow;
-}
-
-float yogaFloatForCGFloat(CGFloat value)
-{
-  if (value < CGFLOAT_MAX / 2) {
-    return value;
-  } else {
-    return YGUndefined;
-  }
-}
-
-float cgFloatForYogaFloat(float yogaFloat)
-{
-  return (yogaFloat == YGUndefined) ? CGFLOAT_MAX : yogaFloat;
-}
-
-float yogaDimensionToPoints(ASDimension dimension)
-{
-  ASDisplayNodeCAssert(dimension.unit == ASDimensionUnitPoints,
-                       @"Dimensions should not be type Fraction for this method: %f", dimension.value);
-  return yogaFloatForCGFloat(dimension.value);
-}
-
-float yogaDimensionToPercent(ASDimension dimension)
-{
-  ASDisplayNodeCAssert(dimension.unit == ASDimensionUnitFraction,
-                       @"Dimensions should not be type Points for this method: %f", dimension.value);
-  return 100.0 * yogaFloatForCGFloat(dimension.value);
-
-}
-
-ASDimension dimensionForEdgeWithEdgeInsets(YGEdge edge, ASEdgeInsets insets)
-{
-  switch (edge) {
-    case YGEdgeLeft:          return insets.left;
-    case YGEdgeTop:           return insets.top;
-    case YGEdgeRight:         return insets.right;
-    case YGEdgeBottom:        return insets.bottom;
-    case YGEdgeStart:         return insets.start;
-    case YGEdgeEnd:           return insets.end;
-    case YGEdgeHorizontal:    return insets.horizontal;
-    case YGEdgeVertical:      return insets.vertical;
-    case YGEdgeAll:           return insets.all;
-    default: ASDisplayNodeCAssert(NO, @"YGEdge other than ASEdgeInsets is not supported.");
-      return ASDimensionAuto;
-  }
-}
-
-void ASLayoutElementYogaUpdateMeasureFunc(YGNodeRef yogaNode, id <ASLayoutElement> layoutElement)
-{
-  if (yogaNode == NULL) {
-    return;
-  }
-
-  BOOL shouldHaveMeasureFunc = [layoutElement implementsLayoutMethod];
-  // How expensive is it to set a baselineFunc on all (leaf) nodes?
-  BOOL shouldHaveBaselineFunc = YES;
-
-  if (layoutElement != nil) {
-    if (shouldHaveMeasureFunc || shouldHaveBaselineFunc) {
-      // Retain the Context object. This must be explicitly released with a
-      // __bridge_transfer - YGNodeFree() is not sufficient.
-      YGNodeSetContext(yogaNode, (__bridge_retained void *)layoutElement);
-    }
-    if (shouldHaveMeasureFunc) {
-      YGNodeSetMeasureFunc(yogaNode, &ASLayoutElementYogaMeasureFunc);
-    }
-    if (shouldHaveBaselineFunc) {
-      YGNodeSetBaselineFunc(yogaNode, &ASLayoutElementYogaBaselineFunc);
-    }
-    ASDisplayNodeCAssert(YGNodeGetContext(yogaNode) == (__bridge void *)layoutElement,
-                         @"Yoga node context should contain layoutElement: %@", layoutElement);
-  } else {
-    // If we lack any of the conditions above, and currently have a measureFn/baselineFn/context,
-    // get rid of it.
-    // Release the __bridge_retained Context object.
-    __unused id<ASLayoutElement> element = (__bridge_transfer id)YGNodeGetContext(yogaNode);
-    YGNodeSetContext(yogaNode, NULL);
-    YGNodeSetMeasureFunc(yogaNode, NULL);
-    YGNodeSetBaselineFunc(yogaNode, NULL);
-  }
-}
-
-float ASLayoutElementYogaBaselineFunc(YGNodeRef yogaNode, const float width, const float height)
-{
-  id<ASLayoutElement> layoutElement = (__bridge id<ASLayoutElement>)YGNodeGetContext(yogaNode);
-  ASDisplayNodeCAssert([layoutElement conformsToProtocol:@protocol(ASLayoutElement)],
-                       @"Yoga context must be <ASLayoutElement>");
-
-  ASDisplayNode *displayNode = ASDynamicCast(layoutElement, ASDisplayNode);
-
-  switch (displayNode.style.parentAlignStyle) {
-    case ASStackLayoutAlignItemsBaselineFirst:
-      return layoutElement.style.ascender;
-    case ASStackLayoutAlignItemsBaselineLast:
-      return height + layoutElement.style.descender;
-    default:
-      return 0;
-  }
-}
-
-YGSize ASLayoutElementYogaMeasureFunc(YGNodeRef yogaNode, float width, YGMeasureMode widthMode,
-                                      float height, YGMeasureMode heightMode)
-{
-  id <ASLayoutElement> layoutElement = (__bridge id <ASLayoutElement>)YGNodeGetContext(yogaNode);
-  ASDisplayNodeCAssert([layoutElement conformsToProtocol:@protocol(ASLayoutElement)], @"Yoga context must be <ASLayoutElement>");
-
-  width = cgFloatForYogaFloat(width);
-  height = cgFloatForYogaFloat(height);
-
-  ASSizeRange sizeRange;
-  sizeRange.min = CGSizeZero;
-  sizeRange.max = CGSizeMake(width, height);
-  if (widthMode == YGMeasureModeExactly) {
-    sizeRange.min.width = sizeRange.max.width;
-  } else {
-    // Mode is (YGMeasureModeAtMost | YGMeasureModeUndefined)
-    ASDimension minWidth = layoutElement.style.minWidth;
-    sizeRange.min.width = (minWidth.unit == ASDimensionUnitPoints ? yogaDimensionToPoints(minWidth) : 0.0);
-  }
-  if (heightMode == YGMeasureModeExactly) {
-    sizeRange.min.height = sizeRange.max.height;
-  } else {
-    // Mode is (YGMeasureModeAtMost | YGMeasureModeUndefined)
-    ASDimension minHeight = layoutElement.style.minHeight;
-    sizeRange.min.height = (minHeight.unit == ASDimensionUnitPoints ? yogaDimensionToPoints(minHeight) : 0.0);
-  }
-
-  ASDisplayNodeCAssert(isnan(sizeRange.min.width) == NO && isnan(sizeRange.min.height) == NO, @"Yoga size range for measurement should not have NaN in minimum");
-  if (isnan(sizeRange.max.width)) {
-    sizeRange.max.width = CGFLOAT_MAX;
-  }
-  if (isnan(sizeRange.max.height)) {
-    sizeRange.max.height = CGFLOAT_MAX;
-  }
-
-  CGSize size = [[layoutElement layoutThatFits:sizeRange] size];
-  return (YGSize){ .width = (float)size.width, .height = (float)size.height };
-}
-
-#endif /* YOGA */
diff --git a/submodules/AsyncDisplayKit/Source/Details/NSArray+Diffing.mm b/submodules/AsyncDisplayKit/Source/NSArray+Diffing.mm
similarity index 100%
rename from submodules/AsyncDisplayKit/Source/Details/NSArray+Diffing.mm
rename to submodules/AsyncDisplayKit/Source/NSArray+Diffing.mm
diff --git a/submodules/AsyncDisplayKit/Source/Details/NSIndexSet+ASHelpers.h b/submodules/AsyncDisplayKit/Source/NSIndexSet+ASHelpers.h
similarity index 100%
rename from submodules/AsyncDisplayKit/Source/Details/NSIndexSet+ASHelpers.h
rename to submodules/AsyncDisplayKit/Source/NSIndexSet+ASHelpers.h
diff --git a/submodules/AsyncDisplayKit/Source/Details/NSIndexSet+ASHelpers.mm b/submodules/AsyncDisplayKit/Source/NSIndexSet+ASHelpers.mm
similarity index 98%
rename from submodules/AsyncDisplayKit/Source/Details/NSIndexSet+ASHelpers.mm
rename to submodules/AsyncDisplayKit/Source/NSIndexSet+ASHelpers.mm
index 0eba0358f4..615e1749f0 100644
--- a/submodules/AsyncDisplayKit/Source/Details/NSIndexSet+ASHelpers.mm
+++ b/submodules/AsyncDisplayKit/Source/NSIndexSet+ASHelpers.mm
@@ -10,7 +10,7 @@
 // UIKit indexPath helpers
 #import <UIKit/UIKit.h>
 
-#import <AsyncDisplayKit/NSIndexSet+ASHelpers.h>
+#import "NSIndexSet+ASHelpers.h"
 
 @implementation NSIndexSet (ASHelpers)
 
diff --git a/submodules/AsyncDisplayKit/Source/Private/ASBasicImageDownloaderInternal.h b/submodules/AsyncDisplayKit/Source/Private/ASBasicImageDownloaderInternal.h
deleted file mode 100644
index ba06e0bc81..0000000000
--- a/submodules/AsyncDisplayKit/Source/Private/ASBasicImageDownloaderInternal.h
+++ /dev/null
@@ -1,20 +0,0 @@
-//
-//  ASBasicImageDownloaderInternal.h
-//  Texture
-//
-//  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.
-//  Changes after 4/13/2017 are: Copyright (c) Pinterest, Inc.  All rights reserved.
-//  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
-//
-
-@interface ASBasicImageDownloaderContext : NSObject
-
-+ (ASBasicImageDownloaderContext *)contextForURL:(NSURL *)URL;
-
-@property (nonatomic, readonly) NSURL *URL;
-@property (nonatomic, weak) NSURLSessionTask *sessionTask;
-
-- (BOOL)isCancelled;
-- (void)cancel;
-
-@end
diff --git a/submodules/AsyncDisplayKit/Source/Private/ASBatchFetching.h b/submodules/AsyncDisplayKit/Source/Private/ASBatchFetching.h
deleted file mode 100644
index 0358bf12cc..0000000000
--- a/submodules/AsyncDisplayKit/Source/Private/ASBatchFetching.h
+++ /dev/null
@@ -1,77 +0,0 @@
-//
-//  ASBatchFetching.h
-//  Texture
-//
-//  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.
-//  Changes after 4/13/2017 are: Copyright (c) Pinterest, Inc.  All rights reserved.
-//  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
-//
-
-#ifndef MINIMAL_ASDK
-
-#import <UIKit/UIKit.h>
-
-#import <AsyncDisplayKit/ASScrollDirection.h>
-
-NS_ASSUME_NONNULL_BEGIN
-
-@class ASBatchContext;
-@protocol ASBatchFetchingDelegate;
-
-@protocol ASBatchFetchingScrollView <NSObject>
-
-- (BOOL)canBatchFetch;
-- (ASBatchContext *)batchContext;
-- (CGFloat)leadingScreensForBatching;
-- (nullable id<ASBatchFetchingDelegate>)batchFetchingDelegate;
-
-@end
-
-/**
- @abstract Determine if batch fetching should begin based on the state of the parameters.
- @discussion This method is broken into a category for unit testing purposes and should be used with the ASTableView and
- * ASCollectionView batch fetching API.
- @param scrollView The scroll view that in-flight fetches are happening.
- @param scrollDirection The current scrolling direction of the scroll view.
- @param scrollableDirections The possible scrolling directions of the scroll view.
- @param contentOffset The offset that the scrollview will scroll to.
- @param velocity The velocity of the scroll view (in points) at the moment the touch was released.
- @return Whether or not the current state should proceed with batch fetching.
- */
-AS_EXTERN BOOL ASDisplayShouldFetchBatchForScrollView(UIScrollView<ASBatchFetchingScrollView> *scrollView,
-                                            ASScrollDirection scrollDirection,
-                                            ASScrollDirection scrollableDirections,
-                                            CGPoint contentOffset,
-                                            CGPoint velocity);
-
-
-/**
- @abstract Determine if batch fetching should begin based on the state of the parameters.
- @param context The batch fetching context that contains knowledge about in-flight fetches.
- @param scrollDirection The current scrolling direction of the scroll view.
- @param scrollableDirections The possible scrolling directions of the scroll view.
- @param bounds The bounds of the scrollview.
- @param contentSize The content size of the scrollview.
- @param targetOffset The offset that the scrollview will scroll to.
- @param leadingScreens How many screens in the remaining distance will trigger batch fetching.
- @param visible Whether the view is visible or not.
- @param velocity The velocity of the scroll view (in points) at the moment the touch was released.
- @param delegate The delegate to be consulted if needed.
- @return Whether or not the current state should proceed with batch fetching.
- @discussion This method is broken into a category for unit testing purposes and should be used with the ASTableView and
- * ASCollectionView batch fetching API.
- */
-AS_EXTERN BOOL ASDisplayShouldFetchBatchForContext(ASBatchContext *context,
-                                                ASScrollDirection scrollDirection,
-                                                ASScrollDirection scrollableDirections,
-                                                CGRect bounds,
-                                                CGSize contentSize,
-                                                CGPoint targetOffset,
-                                                CGFloat leadingScreens,
-                                                BOOL visible,
-                                                CGPoint velocity,
-                                                _Nullable id<ASBatchFetchingDelegate> delegate);
-
-NS_ASSUME_NONNULL_END
-
-#endif
diff --git a/submodules/AsyncDisplayKit/Source/Private/ASBatchFetching.mm b/submodules/AsyncDisplayKit/Source/Private/ASBatchFetching.mm
deleted file mode 100644
index 44b31ed77d..0000000000
--- a/submodules/AsyncDisplayKit/Source/Private/ASBatchFetching.mm
+++ /dev/null
@@ -1,102 +0,0 @@
-//
-//  ASBatchFetching.mm
-//  Texture
-//
-//  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.
-//  Changes after 4/13/2017 are: Copyright (c) Pinterest, Inc.  All rights reserved.
-//  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
-//
-
-#ifndef MINIMAL_ASDK
-#import <AsyncDisplayKit/ASBatchFetching.h>
-#import <AsyncDisplayKit/ASBatchContext.h>
-#import <AsyncDisplayKit/ASBatchFetchingDelegate.h>
-
-BOOL ASDisplayShouldFetchBatchForScrollView(UIScrollView<ASBatchFetchingScrollView> *scrollView,
-                                            ASScrollDirection scrollDirection,
-                                            ASScrollDirection scrollableDirections,
-                                            CGPoint contentOffset,
-                                            CGPoint velocity)
-{
-  // Don't fetch if the scroll view does not allow
-  if (![scrollView canBatchFetch]) {
-    return NO;
-  }
-  
-  // Check if we should batch fetch
-  ASBatchContext *context = scrollView.batchContext;
-  CGRect bounds = scrollView.bounds;
-  CGSize contentSize = scrollView.contentSize;
-  CGFloat leadingScreens = scrollView.leadingScreensForBatching;
-  id<ASBatchFetchingDelegate> delegate = scrollView.batchFetchingDelegate;
-  BOOL visible = (scrollView.window != nil);
-  return ASDisplayShouldFetchBatchForContext(context, scrollDirection, scrollableDirections, bounds, contentSize, contentOffset, leadingScreens, visible, velocity, delegate);
-}
-
-BOOL ASDisplayShouldFetchBatchForContext(ASBatchContext *context,
-                                         ASScrollDirection scrollDirection,
-                                         ASScrollDirection scrollableDirections,
-                                         CGRect bounds,
-                                         CGSize contentSize,
-                                         CGPoint targetOffset,
-                                         CGFloat leadingScreens,
-                                         BOOL visible,
-                                         CGPoint velocity,
-                                         id<ASBatchFetchingDelegate> delegate)
-{
-  // Do not allow fetching if a batch is already in-flight and hasn't been completed or cancelled
-  if ([context isFetching]) {
-    return NO;
-  }
-
-  // No fetching for null states
-  if (leadingScreens <= 0.0 || CGRectIsEmpty(bounds)) {
-    return NO;
-  }
-
-
-  CGFloat viewLength, offset, contentLength, velocityLength;
-  if (ASScrollDirectionContainsVerticalDirection(scrollableDirections)) {
-    viewLength = bounds.size.height;
-    offset = targetOffset.y;
-    contentLength = contentSize.height;
-    velocityLength = velocity.y;
-  } else { // horizontal / right
-    viewLength = bounds.size.width;
-    offset = targetOffset.x;
-    contentLength = contentSize.width;
-    velocityLength = velocity.x;
-  }
-
-  BOOL hasSmallContent = contentLength < viewLength;
-  if (hasSmallContent) {
-    return YES;
-  }
-
-  // If we are not visible, but we do have enough content to fill visible area,
-  // don't batch fetch.
-  if (visible == NO) {
-    return NO;
-  }
-
-  // If they are scrolling toward the head of content, don't batch fetch.
-  BOOL isScrollingTowardHead = (ASScrollDirectionContainsUp(scrollDirection) || ASScrollDirectionContainsLeft(scrollDirection));
-  if (isScrollingTowardHead) {
-    return NO;
-  }
-
-  CGFloat triggerDistance = viewLength * leadingScreens;
-  CGFloat remainingDistance = contentLength - viewLength - offset;
-  BOOL result = remainingDistance <= triggerDistance;
-
-  if (delegate != nil && velocityLength > 0.0) {
-    // Don't need to get absolute value of remaining time
-    // because both remainingDistance and velocityLength are positive when scrolling toward tail
-    NSTimeInterval remainingTime = remainingDistance / (velocityLength * 1000);
-    result = [delegate shouldFetchBatchWithRemainingTime:remainingTime hint:result];
-  }
-  
-  return result;
-}
-
-#endif
diff --git a/submodules/AsyncDisplayKit/Source/Private/ASCellNode+Internal.h b/submodules/AsyncDisplayKit/Source/Private/ASCellNode+Internal.h
deleted file mode 100644
index 4c3e63d652..0000000000
--- a/submodules/AsyncDisplayKit/Source/Private/ASCellNode+Internal.h
+++ /dev/null
@@ -1,79 +0,0 @@
-//
-//  ASCellNode+Internal.h
-//  Texture
-//
-//  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.
-//  Changes after 4/13/2017 are: Copyright (c) Pinterest, Inc.  All rights reserved.
-//  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
-//
-
-#ifndef MINIMAL_ASDK
-#import <AsyncDisplayKit/ASCellNode.h>
-
-NS_ASSUME_NONNULL_BEGIN
-
-@class ASCollectionElement;
-
-@protocol ASCellNodeInteractionDelegate <NSObject>
-
-/**
- * Notifies the delegate that a specified cell node invalidates it's size what could result into a size change.
- *
- * @param node A node informing the delegate about the relayout.
- */
-- (void)nodeDidInvalidateSize:(ASCellNode *)node;
-
-/*
- * Methods to be called whenever the selection or highlight state changes
- * on ASCellNode. UIKit internally stores these values to update reusable cells.
- */
-
-- (void)nodeSelectedStateDidChange:(ASCellNode *)node;
-- (void)nodeHighlightedStateDidChange:(ASCellNode *)node;
-
-@end
-
-@interface ASCellNode ()
-
-@property (nonatomic, weak) id <ASCellNodeInteractionDelegate> interactionDelegate;
-
-/*
- * Back-pointer to the containing scrollView instance, set only for visible cells.  Used for Cell Visibility Event callbacks.
- */
-@property (nonatomic, weak) UIScrollView *scrollView;
-
-- (void)__setSelectedFromUIKit:(BOOL)selected;
-- (void)__setHighlightedFromUIKit:(BOOL)highlighted;
-
-/**
- * @note This could be declared @c copy, but since this is only settable internally, we can ensure
- *   that it's always safe simply to retain it, and copy if needed. Since @c UICollectionViewLayoutAttributes
- *   is always mutable, @c copy is never "free" like it is for e.g. NSString.
- */
-@property (nullable, nonatomic) UICollectionViewLayoutAttributes *layoutAttributes;
-
-@property (weak, nullable) ASCollectionElement *collectionElement;
-
-@property (weak, nullable) id<ASRangeManagingNode> owningNode;
-
-@property (nonatomic, readonly) BOOL shouldUseUIKitCell;
-
-@end
-
-@class ASWrapperCellNode;
-
-typedef CGSize (^ASSizeForItemBlock)(ASWrapperCellNode *node, CGSize collectionSize);
-typedef UICollectionViewCell * _Nonnull(^ASCellForItemBlock)(ASWrapperCellNode *node);
-typedef UICollectionReusableView * _Nonnull(^ASViewForSupplementaryBlock)(ASWrapperCellNode *node);
-
-@interface ASWrapperCellNode : ASCellNode
-
-@property (nonatomic, readonly) ASSizeForItemBlock sizeForItemBlock;
-@property (nonatomic, readonly) ASCellForItemBlock cellForItemBlock;
-@property (nonatomic, readonly) ASViewForSupplementaryBlock viewForSupplementaryBlock;
-
-@end
-
-NS_ASSUME_NONNULL_END
-
-#endif
diff --git a/submodules/AsyncDisplayKit/Source/Private/ASCollectionLayout.h b/submodules/AsyncDisplayKit/Source/Private/ASCollectionLayout.h
deleted file mode 100644
index 6ba15e96eb..0000000000
--- a/submodules/AsyncDisplayKit/Source/Private/ASCollectionLayout.h
+++ /dev/null
@@ -1,54 +0,0 @@
-//
-//  ASCollectionLayout.h
-//  Texture
-//
-//  Copyright (c) Pinterest, Inc.  All rights reserved.
-//  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
-//
-
-#ifndef MINIMAL_ASDK
-
-#import <Foundation/Foundation.h>
-#import <UIKit/UIKit.h>
-#import <AsyncDisplayKit/ASBaseDefines.h>
-
-@protocol ASCollectionLayoutDelegate;
-@class ASElementMap, ASCollectionLayout, ASCollectionNode;
-
-NS_ASSUME_NONNULL_BEGIN
-
-AS_SUBCLASSING_RESTRICTED
-@interface ASCollectionLayout : UICollectionViewLayout
-
-/**
- * The collection node object currently using this layout object.
- *
- * @discussion The collection node object sets the value of this property when a new layout object is assigned to it.
- *
- * @discussion To get the truth on the current state of the collection, call methods on the collection node or the data source rather than the collection view because:
- *  1. The view might not yet be allocated.
- *  2. The collection node and data source are thread-safe.
- */
-@property (nonatomic, weak) ASCollectionNode *collectionNode;
-
-@property (nonatomic, readonly) id<ASCollectionLayoutDelegate> layoutDelegate;
-
-/**
- * Initializes with a layout delegate.
- *
- * @discussion For developers' convenience, the delegate is retained by this layout object, similar to UICollectionView retains its UICollectionViewLayout object.
- *
- * @discussion For simplicity, the delegate is read-only. If a new layout delegate is needed, construct a new layout object with that delegate and notify ASCollectionView about it.
- * This ensures the underlying UICollectionView purges its cache and properly loads the new layout.
- */
-- (instancetype)initWithLayoutDelegate:(id<ASCollectionLayoutDelegate>)layoutDelegate NS_DESIGNATED_INITIALIZER;
-
-- (instancetype)init __unavailable;
-
-- (instancetype)initWithCoder:(NSCoder *)aDecoder __unavailable;
-
-@end
-
-NS_ASSUME_NONNULL_END
-
-#endif
diff --git a/submodules/AsyncDisplayKit/Source/Private/ASCollectionLayout.mm b/submodules/AsyncDisplayKit/Source/Private/ASCollectionLayout.mm
deleted file mode 100644
index 59697f0820..0000000000
--- a/submodules/AsyncDisplayKit/Source/Private/ASCollectionLayout.mm
+++ /dev/null
@@ -1,390 +0,0 @@
-//
-//  ASCollectionLayout.mm
-//  Texture
-//
-//  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.
-//  Changes after 4/13/2017 are: Copyright (c) Pinterest, Inc.  All rights reserved.
-//  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
-//
-
-#ifndef MINIMAL_ASDK
-
-#import <AsyncDisplayKit/ASCollectionLayout.h>
-
-#import <AsyncDisplayKit/ASAssert.h>
-#import <AsyncDisplayKit/ASAbstractLayoutController.h>
-#import <AsyncDisplayKit/ASCellNode.h>
-#import <AsyncDisplayKit/ASCollectionElement.h>
-#import <AsyncDisplayKit/ASCollectionLayoutCache.h>
-#import <AsyncDisplayKit/ASCollectionLayoutContext+Private.h>
-#import <AsyncDisplayKit/ASCollectionLayoutDelegate.h>
-#import <AsyncDisplayKit/ASCollectionLayoutState+Private.h>
-#import <AsyncDisplayKit/ASCollectionNode+Beta.h>
-#import <AsyncDisplayKit/ASDispatch.h>
-#import <AsyncDisplayKit/ASDisplayNode+FrameworkPrivate.h>
-#import <AsyncDisplayKit/ASElementMap.h>
-#import <AsyncDisplayKit/ASEqualityHelpers.h>
-#import <AsyncDisplayKit/ASPageTable.h>
-
-static const ASRangeTuningParameters kASDefaultMeasureRangeTuningParameters = {
-  .leadingBufferScreenfuls = 2.0,
-  .trailingBufferScreenfuls = 2.0
-};
-
-static const ASScrollDirection kASStaticScrollDirection = (ASScrollDirectionRight | ASScrollDirectionDown);
-
-@interface ASCollectionLayout () <ASDataControllerLayoutDelegate> {
-  ASCollectionLayoutCache *_layoutCache;
-  ASCollectionLayoutState *_layout; // Main thread only.
-
-  struct {
-    unsigned int implementsAdditionalInfoForLayoutWithElements:1;
-  } _layoutDelegateFlags;
-}
-
-@end
-
-@implementation ASCollectionLayout
-
-- (instancetype)initWithLayoutDelegate:(id<ASCollectionLayoutDelegate>)layoutDelegate
-{
-  self = [super init];
-  if (self) {
-    ASDisplayNodeAssertNotNil(layoutDelegate, @"Collection layout delegate cannot be nil");
-    _layoutDelegate = layoutDelegate;
-    _layoutDelegateFlags.implementsAdditionalInfoForLayoutWithElements = [layoutDelegate respondsToSelector:@selector(additionalInfoForLayoutWithElements:)];
-    _layoutCache = [[ASCollectionLayoutCache alloc] init];
-  }
-  return self;
-}
-
-#pragma mark - ASDataControllerLayoutDelegate
-
-- (ASCollectionLayoutContext *)layoutContextWithElements:(ASElementMap *)elements
-{
-  ASDisplayNodeAssertMainThread();
-
-  Class<ASCollectionLayoutDelegate> layoutDelegateClass = [_layoutDelegate class];
-  ASCollectionLayoutCache *layoutCache = _layoutCache;
-  ASCollectionNode *collectionNode = _collectionNode;
-  if (collectionNode == nil) {
-    return [[ASCollectionLayoutContext alloc] initWithViewportSize:CGSizeZero
-                                              initialContentOffset:CGPointZero
-                                              scrollableDirections:ASScrollDirectionNone
-                                                          elements:[[ASElementMap alloc] init]
-                                               layoutDelegateClass:layoutDelegateClass
-                                                       layoutCache:layoutCache
-                                                    additionalInfo:nil];
-  }
-
-  ASScrollDirection scrollableDirections = [_layoutDelegate scrollableDirections];
-  CGSize viewportSize = [ASCollectionLayout _viewportSizeForCollectionNode:collectionNode scrollableDirections:scrollableDirections];
-  CGPoint contentOffset = collectionNode.contentOffset;
-
-  id additionalInfo = nil;
-  if (_layoutDelegateFlags.implementsAdditionalInfoForLayoutWithElements) {
-    additionalInfo = [_layoutDelegate additionalInfoForLayoutWithElements:elements];
-  }
-
-  return [[ASCollectionLayoutContext alloc] initWithViewportSize:viewportSize
-                                            initialContentOffset:contentOffset
-                                            scrollableDirections:scrollableDirections
-                                                        elements:elements
-                                             layoutDelegateClass:layoutDelegateClass
-                                                     layoutCache:layoutCache
-                                                  additionalInfo:additionalInfo];
-}
-
-+ (ASCollectionLayoutState *)calculateLayoutWithContext:(ASCollectionLayoutContext *)context
-{
-  if (context.elements == nil) {
-    return [[ASCollectionLayoutState alloc] initWithContext:context];
-  }
-
-  ASCollectionLayoutState *layout = [context.layoutDelegateClass calculateLayoutWithContext:context];
-  [context.layoutCache setLayout:layout forContext:context];
-
-  // Measure elements in the measure range ahead of time
-  CGSize viewportSize = context.viewportSize;
-  CGPoint contentOffset = context.initialContentOffset;
-  CGRect initialRect = CGRectMake(contentOffset.x, contentOffset.y, viewportSize.width, viewportSize.height);
-  CGRect measureRect = CGRectExpandToRangeWithScrollableDirections(initialRect,
-                                                                   kASDefaultMeasureRangeTuningParameters,
-                                                                   context.scrollableDirections,
-                                                                   kASStaticScrollDirection);
-  // The first call to -layoutAttributesForElementsInRect: will be with a rect that is way bigger than initialRect here.
-  // If we only block on initialRect, a few elements that are outside of initialRect but inside measureRect
-  // may not be available by the time -layoutAttributesForElementsInRect: is called.
-  // Since this method is usually run off main, let's spawn more threads to measure and block on all elements in measureRect.
-  [self _measureElementsInRect:measureRect blockingRect:measureRect layout:layout];
-
-  return layout;
-}
-
-#pragma mark - UICollectionViewLayout overrides
-
-- (void)prepareLayout
-{
-  ASDisplayNodeAssertMainThread();
-  [super prepareLayout];
-
-  ASCollectionLayoutContext *context = [self layoutContextWithElements:_collectionNode.visibleElements];
-  if (_layout != nil && ASObjectIsEqual(_layout.context, context)) {
-    // The existing layout is still valid. No-op
-    return;
-  }
-
-  if (ASCollectionLayoutState *cachedLayout = [_layoutCache layoutForContext:context]) {
-    _layout = cachedLayout;
-  } else {
-    // A new layout is needed now. Calculate and apply it immediately
-    _layout = [ASCollectionLayout calculateLayoutWithContext:context];
-  }
-}
-
-- (void)invalidateLayout
-{
-  ASDisplayNodeAssertMainThread();
-  [super invalidateLayout];
-  if (_layout != nil) {
-    [_layoutCache removeLayoutForContext:_layout.context];
-    _layout = nil;
-  }
-}
-
-/**
- * NOTE: It is suggested practice on the Web to override invalidationContextForInteractivelyMovingItems… and call out to the
- * data source to move the item (so that if e.g. the item size depends on the data, you get the data you expect). However, as of iOS 11 this
- * doesn't work, because UICV machinery will also call out to the data source to move the item after the interaction is done. The result is
- * that your data source state will be incorrect due to this last move call. Plus it's just an API violation.
- *
- * Things tried:
- *   - Doing the speculative data source moves, and then UNDOING the last one in invalidationContextForEndingInteractiveMovementOfItems…
- *     but this does not work because the UICV machinery informs its data source before it calls that method on us, so we are too late.
- *
- * The correct practice is to use the UIDataSourceTranslating API introduced in iOS 11. Currently Texture does not support this API but we can
- * build it if there is demand. We could add an id<UIDataSourceTranslating> field onto the layout context object, and the layout client can
- * use data source index paths when it reads nodes or other data source data.
- */
-
-- (CGSize)collectionViewContentSize
-{
-  ASDisplayNodeAssertMainThread();
-  // The content size can be queried right after a layout invalidation (https://github.com/TextureGroup/Texture/pull/509).
-  // In that case, return zero.
-  return _layout ? _layout.contentSize : CGSizeZero;
-}
-
-- (NSArray<UICollectionViewLayoutAttributes *> *)layoutAttributesForElementsInRect:(CGRect)blockingRect
-{
-  ASDisplayNodeAssertMainThread();
-  if (CGRectIsEmpty(blockingRect)) {
-    return nil;
-  }
-
-  // Measure elements in the measure range, block on the requested rect
-  CGRect measureRect = CGRectExpandToRangeWithScrollableDirections(blockingRect,
-                                                                   kASDefaultMeasureRangeTuningParameters,
-                                                                   _layout.context.scrollableDirections,
-                                                                   kASStaticScrollDirection);
-  [ASCollectionLayout _measureElementsInRect:measureRect blockingRect:blockingRect layout:_layout];
-  
-  NSArray<UICollectionViewLayoutAttributes *> *result = [_layout layoutAttributesForElementsInRect:blockingRect];
-
-  ASElementMap *elements = _layout.context.elements;
-  for (UICollectionViewLayoutAttributes *attrs in result) {
-    ASCollectionElement *element = [elements elementForLayoutAttributes:attrs];
-    ASCollectionLayoutSetSizeToElement(attrs.frame.size, element);
-  }
-
-  return result;
-}
-
-- (UICollectionViewLayoutAttributes *)layoutAttributesForItemAtIndexPath:(NSIndexPath *)indexPath
-{
-  ASDisplayNodeAssertMainThread();
-
-  ASCollectionElement *element = [_layout.context.elements elementForItemAtIndexPath:indexPath];
-  UICollectionViewLayoutAttributes *attrs = [_layout layoutAttributesForElement:element];
-
-  ASCellNode *node = element.node;
-  CGSize elementSize = attrs.frame.size;
-  if (! CGSizeEqualToSize(elementSize, node.calculatedSize)) {
-    [node layoutThatFits:ASCollectionLayoutElementSizeRangeFromSize(elementSize)];
-  }
-
-  ASCollectionLayoutSetSizeToElement(attrs.frame.size, element);
-  return attrs;
-}
-
-- (UICollectionViewLayoutAttributes *)layoutAttributesForSupplementaryViewOfKind:(NSString *)elementKind atIndexPath:(NSIndexPath *)indexPath
-{
-  ASCollectionElement *element = [_layout.context.elements supplementaryElementOfKind:elementKind atIndexPath:indexPath];
-  UICollectionViewLayoutAttributes *attrs = [_layout layoutAttributesForElement:element];
-
-  ASCellNode *node = element.node;
-  CGSize elementSize = attrs.frame.size;
-  if (! CGSizeEqualToSize(elementSize, node.calculatedSize)) {
-    [node layoutThatFits:ASCollectionLayoutElementSizeRangeFromSize(elementSize)];
-  }
-
-  ASCollectionLayoutSetSizeToElement(attrs.frame.size, element);
-  return attrs;
-}
-
-- (BOOL)shouldInvalidateLayoutForBoundsChange:(CGRect)newBounds
-{
-  return (! CGSizeEqualToSize([ASCollectionLayout _boundsForCollectionNode:_collectionNode], newBounds.size));
-}
-
-#pragma mark - Private methods
-
-+ (CGSize)_boundsForCollectionNode:(nonnull ASCollectionNode *)collectionNode
-{
-  if (collectionNode == nil) {
-    return CGSizeZero;
-  }
-
-  if (!collectionNode.isNodeLoaded) {
-    // TODO consider calculatedSize as well
-    return collectionNode.threadSafeBounds.size;
-  }
-
-  ASDisplayNodeAssertMainThread();
-  return collectionNode.view.bounds.size;
-}
-
-+ (CGSize)_viewportSizeForCollectionNode:(nonnull ASCollectionNode *)collectionNode scrollableDirections:(ASScrollDirection)scrollableDirections
-{
-  if (collectionNode == nil) {
-    return CGSizeZero;
-  }
-
-  CGSize result = [ASCollectionLayout _boundsForCollectionNode:collectionNode];
-  // TODO: Consider using adjustedContentInset on iOS 11 and later, to include the safe area of the scroll view
-  UIEdgeInsets contentInset = collectionNode.contentInset;
-  if (ASScrollDirectionContainsHorizontalDirection(scrollableDirections)) {
-    result.height -= (contentInset.top + contentInset.bottom);
-  } else {
-    result.width -= (contentInset.left + contentInset.right);
-  }
-  return result;
-}
-
-/**
- * Measures all elements in the specified rect and blocks the calling thread while measuring those in the blocking rect.
- */
-+ (void)_measureElementsInRect:(CGRect)rect blockingRect:(CGRect)blockingRect layout:(ASCollectionLayoutState *)layout
-{
-  if (CGRectIsEmpty(rect) || layout.context.elements == nil) {
-    return;
-  }
-  BOOL hasBlockingRect = !CGRectIsEmpty(blockingRect);
-  if (hasBlockingRect && CGRectContainsRect(rect, blockingRect) == NO) {
-    ASDisplayNodeCAssert(NO, @"Blocking rect, if specified, must be within the other (outer) rect");
-    return;
-  }
-
-  // Step 1: Clamp the specified rects between the bounds of content rect
-  CGSize contentSize = layout.contentSize;
-  CGRect contentRect = CGRectMake(0, 0, contentSize.width, contentSize.height);
-  rect = CGRectIntersection(contentRect, rect);
-  if (CGRectIsNull(rect)) {
-    return;
-  }
-  if (hasBlockingRect) {
-    blockingRect = CGRectIntersection(contentRect, blockingRect);
-    hasBlockingRect = !CGRectIsNull(blockingRect);
-  }
-
-  // Step 2: Get layout attributes of all elements within the specified outer rect
-  ASPageToLayoutAttributesTable *attrsTable = [layout getAndRemoveUnmeasuredLayoutAttributesPageTableInRect:rect];
-  if (attrsTable.count == 0) {
-    // No elements in this rect! Bail early
-    return;
-  }
-
-  // Step 3: Split all those attributes into blocking and non-blocking buckets
-  // Use ordered sets here because some items may span multiple pages, and the sets will be accessed by indexes later on.
-  ASCollectionLayoutContext *context = layout.context;
-  CGSize pageSize = context.viewportSize;
-  NSMutableOrderedSet<UICollectionViewLayoutAttributes *> *blockingAttrs = hasBlockingRect ? [NSMutableOrderedSet orderedSet] : nil;
-  NSMutableOrderedSet<UICollectionViewLayoutAttributes *> *nonBlockingAttrs = [NSMutableOrderedSet orderedSet];
-  for (id pagePtr in attrsTable) {
-    ASPageCoordinate page = (ASPageCoordinate)pagePtr;
-    NSArray<UICollectionViewLayoutAttributes *> *attrsInPage = [attrsTable objectForPage:page];
-    // Calculate the page's rect but only if it's going to be used.
-    CGRect pageRect = hasBlockingRect ? ASPageCoordinateGetPageRect(page, pageSize) : CGRectZero;
-
-    if (hasBlockingRect && CGRectContainsRect(blockingRect, pageRect)) {
-      // The page fits well within the blocking rect. All attributes in this page are blocking.
-      [blockingAttrs addObjectsFromArray:attrsInPage];
-    } else if (hasBlockingRect && CGRectIntersectsRect(blockingRect, pageRect)) {
-      // The page intersects the blocking rect. Some elements in this page are blocking, some are not.
-      for (UICollectionViewLayoutAttributes *attrs in attrsInPage) {
-        if (CGRectIntersectsRect(blockingRect, attrs.frame)) {
-          [blockingAttrs addObject:attrs];
-        } else {
-          [nonBlockingAttrs addObject:attrs];
-        }
-      }
-    } else {
-      // The page doesn't intersect the blocking rect. All elements in this page are non-blocking.
-      [nonBlockingAttrs addObjectsFromArray:attrsInPage];
-    }
-  }
-
-  // Step 4: Allocate and measure blocking elements' node
-  ASElementMap *elements = context.elements;
-  dispatch_queue_t queue = dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0);
-  if (NSUInteger count = blockingAttrs.count) {
-    ASDispatchApply(count, queue, 0, ^(size_t i) {
-      UICollectionViewLayoutAttributes *attrs = blockingAttrs[i];
-      ASCellNode *node = [elements elementForItemAtIndexPath:attrs.indexPath].node;
-      CGSize expectedSize = attrs.frame.size;
-      if (! CGSizeEqualToSize(expectedSize, node.calculatedSize)) {
-        [node layoutThatFits:ASCollectionLayoutElementSizeRangeFromSize(expectedSize)];
-      }
-    });
-  }
-
-  // Step 5: Allocate and measure non-blocking ones
-  if (NSUInteger count = nonBlockingAttrs.count) {
-    __weak ASElementMap *weakElements = elements;
-    ASDispatchAsync(count, queue, 0, ^(size_t i) {
-      __strong ASElementMap *strongElements = weakElements;
-      if (strongElements) {
-        UICollectionViewLayoutAttributes *attrs = nonBlockingAttrs[i];
-        ASCellNode *node = [elements elementForItemAtIndexPath:attrs.indexPath].node;
-        CGSize expectedSize = attrs.frame.size;
-        if (! CGSizeEqualToSize(expectedSize, node.calculatedSize)) {
-          [node layoutThatFits:ASCollectionLayoutElementSizeRangeFromSize(expectedSize)];
-        }
-      }
-    });
-  }
-}
-
-# pragma mark - Convenient inline functions
-
-ASDISPLAYNODE_INLINE ASSizeRange ASCollectionLayoutElementSizeRangeFromSize(CGSize size)
-{
-  // The layout delegate consulted us that this element must fit within this size,
-  // and the only way to achieve that without asking it again is to use an exact size range here.
-  return ASSizeRangeMake(size);
-}
-
-ASDISPLAYNODE_INLINE void ASCollectionLayoutSetSizeToElement(CGSize size, ASCollectionElement *element)
-{
-  if (ASCellNode *node = element.node) {
-    if (! CGSizeEqualToSize(size, node.frame.size)) {
-      CGRect frame = CGRectZero;
-      frame.size = size;
-      node.frame = frame;
-    }
-  }
-}
-
-@end
-
-#endif
diff --git a/submodules/AsyncDisplayKit/Source/Private/ASCollectionLayoutCache.h b/submodules/AsyncDisplayKit/Source/Private/ASCollectionLayoutCache.h
deleted file mode 100644
index 857e43683f..0000000000
--- a/submodules/AsyncDisplayKit/Source/Private/ASCollectionLayoutCache.h
+++ /dev/null
@@ -1,34 +0,0 @@
-//
-//  ASCollectionLayoutCache.h
-//  Texture
-//
-//  Copyright (c) Pinterest, Inc.  All rights reserved.
-//  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
-//
-
-#ifndef MINIMAL_ASDK
-
-#import <Foundation/Foundation.h>
-#import <AsyncDisplayKit/ASBaseDefines.h>
-
-NS_ASSUME_NONNULL_BEGIN
-
-@class ASCollectionLayoutContext, ASCollectionLayoutState;
-
-/// A thread-safe cache for ASCollectionLayoutContext-ASCollectionLayoutState pairs
-AS_SUBCLASSING_RESTRICTED
-@interface ASCollectionLayoutCache : NSObject
-
-- (nullable ASCollectionLayoutState *)layoutForContext:(ASCollectionLayoutContext *)context;
-
-- (void)setLayout:(ASCollectionLayoutState *)layout forContext:(ASCollectionLayoutContext *)context;
-
-- (void)removeLayoutForContext:(ASCollectionLayoutContext *)context;
-
-- (void)removeAllLayouts;
-
-@end
-
-NS_ASSUME_NONNULL_END
-
-#endif
diff --git a/submodules/AsyncDisplayKit/Source/Private/ASCollectionLayoutCache.mm b/submodules/AsyncDisplayKit/Source/Private/ASCollectionLayoutCache.mm
deleted file mode 100644
index b5aecd78b6..0000000000
--- a/submodules/AsyncDisplayKit/Source/Private/ASCollectionLayoutCache.mm
+++ /dev/null
@@ -1,92 +0,0 @@
-//
-//  ASCollectionLayoutCache.mm
-//  Texture
-//
-//  Copyright (c) Pinterest, Inc.  All rights reserved.
-//  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
-//
-
-#ifndef MINIMAL_ASDK
-
-#import <AsyncDisplayKit/ASCollectionLayoutCache.h>
-
-#import <AsyncDisplayKit/ASCollectionLayoutContext.h>
-#import <AsyncDisplayKit/ASCollectionLayoutState.h>
-#import <AsyncDisplayKit/ASElementMap.h>
-#import <AsyncDisplayKit/ASThread.h>
-
-using AS::MutexLocker;
-
-@implementation ASCollectionLayoutCache {
-  AS::Mutex __instanceLock__;
-
-  /**
-   * The underlying data structure of this cache.
-   *
-   * The outer map table is a weak to strong table. That is because ASCollectionLayoutContext doesn't (and shouldn't) 
-   * hold a strong reference on its element map. As a result, this cache should handle the case in which 
-   * an element map no longer exists and all contexts and layouts associated with it should be cleared.
-   *
-   * The inner map table is a standard strong to strong map.
-   * Since different ASCollectionLayoutContext objects with the same content are considered equal, 
-   * "object pointer personality" can't be used as a key option.
-   */
-  NSMapTable<ASElementMap *, NSMapTable<ASCollectionLayoutContext *, ASCollectionLayoutState *> *> *_map;
-}
-
-- (instancetype)init
-{
-  self = [super init];
-  if (self) {
-    _map = [NSMapTable mapTableWithKeyOptions:(NSMapTableWeakMemory | NSMapTableObjectPointerPersonality) valueOptions:NSMapTableStrongMemory];
-  }
-  return self;
-}
-
-- (ASCollectionLayoutState *)layoutForContext:(ASCollectionLayoutContext *)context
-{
-  ASElementMap *elements = context.elements;
-  if (elements == nil) {
-    return nil;
-  }
-
-  MutexLocker l(__instanceLock__);
-  return [[_map objectForKey:elements] objectForKey:context];
-}
-
-- (void)setLayout:(ASCollectionLayoutState *)layout forContext:(ASCollectionLayoutContext *)context
-{
-  ASElementMap *elements = context.elements;
-  if (layout == nil || elements == nil) {
-    return;
-  }
-
-  MutexLocker l(__instanceLock__);
-  auto innerMap = [_map objectForKey:elements];
-  if (innerMap == nil) {
-    innerMap = [NSMapTable strongToStrongObjectsMapTable];
-    [_map setObject:innerMap forKey:elements];
-  }
-  [innerMap setObject:layout forKey:context];
-}
-
-- (void)removeLayoutForContext:(ASCollectionLayoutContext *)context
-{
-  ASElementMap *elements = context.elements;
-  if (elements == nil) {
-    return;
-  }
-
-  MutexLocker l(__instanceLock__);
-  [[_map objectForKey:elements] removeObjectForKey:context];
-}
-
-- (void)removeAllLayouts
-{
-  MutexLocker l(__instanceLock__);
-  [_map removeAllObjects];
-}
-
-@end
-
-#endif
diff --git a/submodules/AsyncDisplayKit/Source/Private/ASCollectionLayoutContext+Private.h b/submodules/AsyncDisplayKit/Source/Private/ASCollectionLayoutContext+Private.h
deleted file mode 100644
index 2ff68e17bc..0000000000
--- a/submodules/AsyncDisplayKit/Source/Private/ASCollectionLayoutContext+Private.h
+++ /dev/null
@@ -1,36 +0,0 @@
-//
-//  ASCollectionLayoutContext+Private.h
-//  Texture
-//
-//  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.
-//  Changes after 4/13/2017 are: Copyright (c) Pinterest, Inc.  All rights reserved.
-//  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
-//
-
-#ifndef MINIMAL_ASDK
-
-#import <AsyncDisplayKit/ASCollectionLayoutContext.h>
-
-@class ASCollectionLayoutCache;
-@protocol ASCollectionLayoutDelegate;
-
-NS_ASSUME_NONNULL_BEGIN
-
-@interface ASCollectionLayoutContext (Private)
-
-@property (nonatomic, readonly) Class<ASCollectionLayoutDelegate> layoutDelegateClass;
-@property (nonatomic, weak, readonly) ASCollectionLayoutCache *layoutCache;
-
-- (instancetype)initWithViewportSize:(CGSize)viewportSize
-                initialContentOffset:(CGPoint)initialContentOffset
-                scrollableDirections:(ASScrollDirection)scrollableDirections
-                            elements:(ASElementMap *)elements
-                 layoutDelegateClass:(Class<ASCollectionLayoutDelegate>)layoutDelegateClass
-                         layoutCache:(ASCollectionLayoutCache *)layoutCache
-                      additionalInfo:(nullable id)additionalInfo;
-
-@end
-
-NS_ASSUME_NONNULL_END
-
-#endif
diff --git a/submodules/AsyncDisplayKit/Source/Private/ASCollectionLayoutDefines.h b/submodules/AsyncDisplayKit/Source/Private/ASCollectionLayoutDefines.h
deleted file mode 100644
index 61a8ac4e88..0000000000
--- a/submodules/AsyncDisplayKit/Source/Private/ASCollectionLayoutDefines.h
+++ /dev/null
@@ -1,19 +0,0 @@
-//
-//  ASCollectionLayoutDefines.h
-//  Texture
-//
-//  Copyright (c) Pinterest, Inc.  All rights reserved.
-//  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
-//
-
-#import <UIKit/UIKit.h>
-
-#import <AsyncDisplayKit/ASBaseDefines.h>
-#import <AsyncDisplayKit/ASDimension.h>
-#import <AsyncDisplayKit/ASScrollDirection.h>
-
-NS_ASSUME_NONNULL_BEGIN
-
-AS_EXTERN ASSizeRange ASSizeRangeForCollectionLayoutThatFitsViewportSize(CGSize viewportSize, ASScrollDirection scrollableDirections) AS_WARN_UNUSED_RESULT;
-
-NS_ASSUME_NONNULL_END
diff --git a/submodules/AsyncDisplayKit/Source/Private/ASCollectionLayoutDefines.mm b/submodules/AsyncDisplayKit/Source/Private/ASCollectionLayoutDefines.mm
deleted file mode 100644
index e386575c5d..0000000000
--- a/submodules/AsyncDisplayKit/Source/Private/ASCollectionLayoutDefines.mm
+++ /dev/null
@@ -1,23 +0,0 @@
-//
-//  ASCollectionLayoutDefines.mm
-//  Texture
-//
-//  Copyright (c) Pinterest, Inc.  All rights reserved.
-//  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
-//
-
-#import <AsyncDisplayKit/ASCollectionLayoutDefines.h>
-
-ASSizeRange ASSizeRangeForCollectionLayoutThatFitsViewportSize(CGSize viewportSize, ASScrollDirection scrollableDirections)
-{
-  ASSizeRange sizeRange = ASSizeRangeUnconstrained;
-  if (ASScrollDirectionContainsVerticalDirection(scrollableDirections) == NO) {
-    sizeRange.min.height = viewportSize.height;
-    sizeRange.max.height = viewportSize.height;
-  }
-  if (ASScrollDirectionContainsHorizontalDirection(scrollableDirections) == NO) {
-    sizeRange.min.width = viewportSize.width;
-    sizeRange.max.width = viewportSize.width;
-  }
-  return sizeRange;
-}
diff --git a/submodules/AsyncDisplayKit/Source/Private/ASCollectionLayoutState+Private.h b/submodules/AsyncDisplayKit/Source/Private/ASCollectionLayoutState+Private.h
deleted file mode 100644
index c4d6013332..0000000000
--- a/submodules/AsyncDisplayKit/Source/Private/ASCollectionLayoutState+Private.h
+++ /dev/null
@@ -1,29 +0,0 @@
-//
-//  ASCollectionLayoutState+Private.h
-//  Texture
-//
-//  Copyright (c) Pinterest, Inc.  All rights reserved.
-//  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
-//
-
-#ifndef MINIMAL_ASDK
-
-#import <AsyncDisplayKit/ASCollectionLayoutState.h>
-#import <AsyncDisplayKit/ASPageTable.h>
-
-NS_ASSUME_NONNULL_BEGIN
-
-@interface ASCollectionLayoutState (Private)
-
-/**
- * Remove and returns layout attributes for unmeasured elements that intersect the specified rect
- *
- * @discussion This method is atomic and thread-safe
- */
-- (nullable ASPageToLayoutAttributesTable *)getAndRemoveUnmeasuredLayoutAttributesPageTableInRect:(CGRect)rect;
-
-@end
-
-NS_ASSUME_NONNULL_END
-
-#endif
diff --git a/submodules/AsyncDisplayKit/Source/Private/ASCollectionView+Undeprecated.h b/submodules/AsyncDisplayKit/Source/Private/ASCollectionView+Undeprecated.h
deleted file mode 100644
index 050e029313..0000000000
--- a/submodules/AsyncDisplayKit/Source/Private/ASCollectionView+Undeprecated.h
+++ /dev/null
@@ -1,303 +0,0 @@
-//
-//  ASCollectionView+Undeprecated.h
-//  Texture
-//
-//  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.
-//  Changes after 4/13/2017 are: Copyright (c) Pinterest, Inc.  All rights reserved.
-//  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
-//
-
-#ifndef MINIMAL_ASDK
-#import <AsyncDisplayKit/ASCollectionView.h>
-
-NS_ASSUME_NONNULL_BEGIN
-
-/**
- * Currently our public collection API is on @c ASCollectionNode and the @c ASCollectionView
- * API is deprecated, but the implementations still live in the view.
- *
- * This category lets us avoid deprecation warnings everywhere internally.
- * In the future, the @c ASCollectionView public API will be eliminated and so will this file.
- */
-@interface ASCollectionView (Undeprecated)
-
-/**
- * The object that acts as the asynchronous delegate of the collection view
- *
- * @discussion The delegate must adopt the ASCollectionDelegate protocol. The collection view maintains a weak reference to the delegate object.
- *
- * The delegate object is responsible for providing size constraints for nodes and indicating whether batch fetching should begin.
- */
-@property (nonatomic, weak) id<ASCollectionDelegate> asyncDelegate;
-
-/**
- * The object that acts as the asynchronous data source of the collection view
- *
- * @discussion The datasource must adopt the ASCollectionDataSource protocol. The collection view maintains a weak reference to the datasource object.
- *
- * The datasource object is responsible for providing nodes or node creation blocks to the collection view.
- */
-@property (nonatomic, weak) id<ASCollectionDataSource> asyncDataSource;
-
-/**
- * Initializes an ASCollectionView
- *
- * @discussion Initializes and returns a newly allocated collection view object with the specified layout.
- *
- * @param layout The layout object to use for organizing items. The collection view stores a strong reference to the specified object. Must not be nil.
- */
-- (instancetype)initWithCollectionViewLayout:(UICollectionViewLayout *)layout;
-
-/**
- * Initializes an ASCollectionView
- *
- * @discussion Initializes and returns a newly allocated collection view object with the specified frame and layout.
- *
- * @param frame The frame rectangle for the collection view, measured in points. The origin of the frame is relative to the superview in which you plan to add it. This frame is passed to the superclass during initialization.
- * @param layout The layout object to use for organizing items. The collection view stores a strong reference to the specified object. Must not be nil.
- */
-- (instancetype)initWithFrame:(CGRect)frame collectionViewLayout:(UICollectionViewLayout *)layout;
-
-@property (nonatomic) CGFloat leadingScreensForBatching;
-
-@property (nonatomic) BOOL inverted;
-
-@property (nonatomic, readonly) ASScrollDirection scrollDirection;
-
-@property (nonatomic, readonly) ASScrollDirection scrollableDirections;
-
-@property (nonatomic, weak) id<ASCollectionViewLayoutInspecting> layoutInspector;
-
-@property (nonatomic) UIEdgeInsets contentInset;
-
-@property (nonatomic) CGPoint contentOffset;
-
-/**
- * Tuning parameters for a range type in full mode.
- *
- * @param rangeType The range type to get the tuning parameters for.
- *
- * @return A tuning parameter value for the given range type in full mode.
- *
- * @see ASLayoutRangeMode
- * @see ASLayoutRangeType
- */
-- (ASRangeTuningParameters)tuningParametersForRangeType:(ASLayoutRangeType)rangeType AS_WARN_UNUSED_RESULT;
-
-/**
- * Set the tuning parameters for a range type in full mode.
- *
- * @param tuningParameters The tuning parameters to store for a range type.
- * @param rangeType The range type to set the tuning parameters for.
- *
- * @see ASLayoutRangeMode
- * @see ASLayoutRangeType
- */
-- (void)setTuningParameters:(ASRangeTuningParameters)tuningParameters forRangeType:(ASLayoutRangeType)rangeType;
-
-/**
- * Tuning parameters for a range type in the specified mode.
- *
- * @param rangeMode The range mode to get the running parameters for.
- * @param rangeType The range type to get the tuning parameters for.
- *
- * @return A tuning parameter value for the given range type in the given mode.
- *
- * @see ASLayoutRangeMode
- * @see ASLayoutRangeType
- */
-- (ASRangeTuningParameters)tuningParametersForRangeMode:(ASLayoutRangeMode)rangeMode rangeType:(ASLayoutRangeType)rangeType AS_WARN_UNUSED_RESULT;
-
-/**
- * Set the tuning parameters for a range type in the specified mode.
- *
- * @param tuningParameters The tuning parameters to store for a range type.
- * @param rangeMode The range mode to set the running parameters for.
- * @param rangeType The range type to set the tuning parameters for.
- *
- * @see ASLayoutRangeMode
- * @see ASLayoutRangeType
- */
-- (void)setTuningParameters:(ASRangeTuningParameters)tuningParameters forRangeMode:(ASLayoutRangeMode)rangeMode rangeType:(ASLayoutRangeType)rangeType;
-
-- (nullable __kindof UICollectionViewCell *)cellForItemAtIndexPath:(NSIndexPath *)indexPath;
-
-@property (nonatomic, readonly) NSArray<NSIndexPath *> *indexPathsForVisibleItems;
-
-@property (nonatomic, readonly, nullable) NSArray<NSIndexPath *> *indexPathsForSelectedItems;
-
-/**
- * Scrolls the collection to the given item.
- *
- * @param indexPath The index path of the item.
- * @param scrollPosition Where the row should end up after the scroll.
- * @param animated Whether the scroll should be animated or not.
- */
-- (void)scrollToItemAtIndexPath:(NSIndexPath *)indexPath atScrollPosition:(UICollectionViewScrollPosition)scrollPosition animated:(BOOL)animated;
-
-- (void)selectItemAtIndexPath:(NSIndexPath *)indexPath animated:(BOOL)animated scrollPosition:(UICollectionViewScrollPosition)scrollPosition;
-
-/**
- *  Perform a batch of updates asynchronously, optionally disabling all animations in the batch. This method must be called from the main thread.
- *  The asyncDataSource must be updated to reflect the changes before the update block completes.
- *
- *  @param animated   NO to disable animations for this batch
- *  @param updates    The block that performs the relevant insert, delete, reload, or move operations.
- *  @param completion A completion handler block to execute when all of the operations are finished. This block takes a single
- *                    Boolean parameter that contains the value YES if all of the related animations completed successfully or
- *                    NO if they were interrupted. This parameter may be nil. If supplied, the block is run on the main thread.
- */
-- (void)performBatchAnimated:(BOOL)animated updates:(nullable AS_NOESCAPE void (^)(void))updates completion:(nullable void (^)(BOOL finished))completion;
-
-/**
- *  Perform a batch of updates asynchronously.  This method must be called from the main thread.
- *  The asyncDataSource must be updated to reflect the changes before update block completes.
- *
- *  @param updates    The block that performs the relevant insert, delete, reload, or move operations.
- *  @param completion A completion handler block to execute when all of the operations are finished. This block takes a single
- *                    Boolean parameter that contains the value YES if all of the related animations completed successfully or
- *                    NO if they were interrupted. This parameter may be nil. If supplied, the block is run on the main thread.
- */
-- (void)performBatchUpdates:(nullable AS_NOESCAPE void (^)(void))updates completion:(nullable void (^)(BOOL finished))completion;
-
-/**
- * Triggers a relayout of all nodes.
- *
- * @discussion This method invalidates and lays out every cell node in the collection.
- */
-- (void)relayoutItems;
-
-/**
- *  Blocks execution of the main thread until all section and row updates are committed. This method must be called from the main thread.
- */
-- (void)waitUntilAllUpdatesAreCommitted;
-
-/**
- * Registers the given kind of supplementary node for use in creating node-backed supplementary views.
- *
- * @param elementKind The kind of supplementary node that will be requested through the data source.
- *
- * @discussion Use this method to register support for the use of supplementary nodes in place of the default
- * `registerClass:forSupplementaryViewOfKind:withReuseIdentifier:` and `registerNib:forSupplementaryViewOfKind:withReuseIdentifier:`
- * methods. This method will register an internal backing view that will host the contents of the supplementary nodes
- * returned from the data source.
- */
-- (void)registerSupplementaryNodeOfKind:(NSString *)elementKind;
-
-/**
- * Inserts one or more sections.
- *
- * @param sections An index set that specifies the sections to insert.
- *
- * @discussion This method must be called from the main thread. The asyncDataSource must be updated to reflect the changes
- * before this method is called.
- */
-- (void)insertSections:(NSIndexSet *)sections;
-
-/**
- * Deletes one or more sections.
- *
- * @param sections An index set that specifies the sections to delete.
- *
- * @discussion This method must be called from the main thread. The asyncDataSource must be updated to reflect the changes
- * before this method is called.
- */
-- (void)deleteSections:(NSIndexSet *)sections;
-
-/**
- * Reloads the specified sections.
- *
- * @param sections An index set that specifies the sections to reload.
- *
- * @discussion This method must be called from the main thread. The asyncDataSource must be updated to reflect the changes
- * before this method is called.
- */
-- (void)reloadSections:(NSIndexSet *)sections;
-
-/**
- * Moves a section to a new location.
- *
- * @param section The index of the section to move.
- *
- * @param newSection The index that is the destination of the move for the section.
- *
- * @discussion This method must be called from the main thread. The asyncDataSource must be updated to reflect the changes
- * before this method is called.
- */
-- (void)moveSection:(NSInteger)section toSection:(NSInteger)newSection;
-
-/**
- * Inserts items at the locations identified by an array of index paths.
- *
- * @param indexPaths An array of NSIndexPath objects, each representing an item index and section index that together identify an item.
- *
- * @discussion This method must be called from the main thread. The asyncDataSource must be updated to reflect the changes
- * before this method is called.
- */
-- (void)insertItemsAtIndexPaths:(NSArray<NSIndexPath *> *)indexPaths;
-
-/**
- * Deletes the items specified by an array of index paths.
- *
- * @param indexPaths An array of NSIndexPath objects identifying the items to delete.
- *
- * @discussion This method must be called from the main thread. The asyncDataSource must be updated to reflect the changes
- * before this method is called.
- */
-- (void)deleteItemsAtIndexPaths:(NSArray<NSIndexPath *> *)indexPaths;
-
-/**
- * Reloads the specified items.
- *
- * @param indexPaths An array of NSIndexPath objects identifying the items to reload.
- *
- * @discussion This method must be called from the main thread. The asyncDataSource must be updated to reflect the changes
- * before this method is called.
- */
-- (void)reloadItemsAtIndexPaths:(NSArray<NSIndexPath *> *)indexPaths;
-
-/**
- * Moves the item at a specified location to a destination location.
- *
- * @param indexPath The index path identifying the item to move.
- *
- * @param newIndexPath The index path that is the destination of the move for the item.
- *
- * @discussion This method must be called from the main thread. The asyncDataSource must be updated to reflect the changes
- * before this method is called.
- */
-- (void)moveItemAtIndexPath:(NSIndexPath *)indexPath toIndexPath:(NSIndexPath *)newIndexPath;
-
-/**
- * Similar to -visibleCells.
- *
- * @return an array containing the nodes being displayed on screen.
- */
-- (NSArray<__kindof ASCellNode *> *)visibleNodes AS_WARN_UNUSED_RESULT;
-
-/**
- * Similar to -indexPathForCell:.
- *
- * @param cellNode a cellNode in the collection view
- *
- * @return The index path for this cell node.
- *
- * @discussion This index path returned by this method is in the _view's_ index space
- *    and should only be used with @c ASCollectionView directly. To get an index path suitable
- *    for use with your data source and @c ASCollectionNode, call @c indexPathForNode: on the
- *    collection node instead.
- */
-- (nullable NSIndexPath *)indexPathForNode:(ASCellNode *)cellNode AS_WARN_UNUSED_RESULT;
-
-/**
- *  Invalidates and recalculates the cached sizes stored for pass-through cells used in interop mode.
- */
-- (void)invalidateFlowLayoutDelegateMetrics;
-
-- (void)setContentOffset:(CGPoint)contentOffset animated:(BOOL)animated;
-
-@end
-
-NS_ASSUME_NONNULL_END
-
-#endif
diff --git a/submodules/AsyncDisplayKit/Source/Private/ASCollectionViewFlowLayoutInspector.h b/submodules/AsyncDisplayKit/Source/Private/ASCollectionViewFlowLayoutInspector.h
deleted file mode 100644
index 0553dcd0b6..0000000000
--- a/submodules/AsyncDisplayKit/Source/Private/ASCollectionViewFlowLayoutInspector.h
+++ /dev/null
@@ -1,33 +0,0 @@
-//
-//  ASCollectionViewFlowLayoutInspector.h
-//  Texture
-//
-//  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.
-//  Changes after 4/13/2017 are: Copyright (c) Pinterest, Inc.  All rights reserved.
-//  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
-//
-
-#ifndef MINIMAL_ASDK
-#import <AsyncDisplayKit/ASCollectionViewLayoutInspector.h>
-
-NS_ASSUME_NONNULL_BEGIN
-
-@class ASCollectionView;
-@class UICollectionViewFlowLayout;
-
-/**
- * A layout inspector implementation specific for the sizing behavior of UICollectionViewFlowLayouts
- */
-AS_SUBCLASSING_RESTRICTED
-@interface ASCollectionViewFlowLayoutInspector : NSObject <ASCollectionViewLayoutInspecting>
-
-@property (nonatomic, weak, readonly) UICollectionViewFlowLayout *layout;
-
-- (instancetype)init NS_UNAVAILABLE;
-- (instancetype)initWithFlowLayout:(UICollectionViewFlowLayout *)flowLayout NS_DESIGNATED_INITIALIZER;
-
-@end
-
-NS_ASSUME_NONNULL_END
-
-#endif
diff --git a/submodules/AsyncDisplayKit/Source/Private/ASCollectionViewFlowLayoutInspector.mm b/submodules/AsyncDisplayKit/Source/Private/ASCollectionViewFlowLayoutInspector.mm
deleted file mode 100644
index 6dc9d73bfb..0000000000
--- a/submodules/AsyncDisplayKit/Source/Private/ASCollectionViewFlowLayoutInspector.mm
+++ /dev/null
@@ -1,159 +0,0 @@
-//
-//  ASCollectionViewFlowLayoutInspector.mm
-//  Texture
-//
-//  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.
-//  Changes after 4/13/2017 are: Copyright (c) Pinterest, Inc.  All rights reserved.
-//  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
-//
-#ifndef MINIMAL_ASDK
-#import <AsyncDisplayKit/ASCollectionViewFlowLayoutInspector.h>
-#import <AsyncDisplayKit/ASCollectionView.h>
-#import <AsyncDisplayKit/ASAssert.h>
-#import <AsyncDisplayKit/ASEqualityHelpers.h>
-#import <AsyncDisplayKit/ASCollectionView+Undeprecated.h>
-#import <AsyncDisplayKit/ASCollectionNode.h>
-
-#define kDefaultItemSize CGSizeMake(50, 50)
-
-#pragma mark - ASCollectionViewFlowLayoutInspector
-
-@interface ASCollectionViewFlowLayoutInspector ()
-@property (nonatomic, weak) UICollectionViewFlowLayout *layout;
-@end
- 
-@implementation ASCollectionViewFlowLayoutInspector {
-  struct {
-    unsigned int implementsSizeRangeForHeader:1;
-    unsigned int implementsReferenceSizeForHeader:1;
-    unsigned int implementsSizeRangeForFooter:1;
-    unsigned int implementsReferenceSizeForFooter:1;
-    unsigned int implementsConstrainedSizeForNodeAtIndexPathDeprecated:1;
-    unsigned int implementsConstrainedSizeForItemAtIndexPath:1;
-  } _delegateFlags;
-}
-
-#pragma mark Lifecycle
-
-- (instancetype)initWithFlowLayout:(UICollectionViewFlowLayout *)flowLayout;
-{
-  NSParameterAssert(flowLayout);
-  
-  self = [super init];
-  if (self != nil) {
-    _layout = flowLayout;
-  }
-  return self;
-}
-
-#pragma mark ASCollectionViewLayoutInspecting
-
-- (void)didChangeCollectionViewDelegate:(id<ASCollectionDelegate>)delegate;
-{
-  if (delegate == nil) {
-    memset(&_delegateFlags, 0, sizeof(_delegateFlags));
-  } else {
-    _delegateFlags.implementsSizeRangeForHeader = [delegate respondsToSelector:@selector(collectionNode:sizeRangeForHeaderInSection:)];
-    _delegateFlags.implementsReferenceSizeForHeader = [delegate respondsToSelector:@selector(collectionView:layout:referenceSizeForHeaderInSection:)];
-    _delegateFlags.implementsSizeRangeForFooter = [delegate respondsToSelector:@selector(collectionNode:sizeRangeForFooterInSection:)];
-    _delegateFlags.implementsReferenceSizeForFooter = [delegate respondsToSelector:@selector(collectionView:layout:referenceSizeForFooterInSection:)];
-    _delegateFlags.implementsConstrainedSizeForNodeAtIndexPathDeprecated = [delegate respondsToSelector:@selector(collectionView:constrainedSizeForNodeAtIndexPath:)];
-    _delegateFlags.implementsConstrainedSizeForItemAtIndexPath = [delegate respondsToSelector:@selector(collectionNode:constrainedSizeForItemAtIndexPath:)];
-  }
-}
-
-- (ASSizeRange)collectionView:(ASCollectionView *)collectionView constrainedSizeForNodeAtIndexPath:(NSIndexPath *)indexPath
-{
-  ASSizeRange result = ASSizeRangeUnconstrained;
-  if (_delegateFlags.implementsConstrainedSizeForItemAtIndexPath) {
-    result = [collectionView.asyncDelegate collectionNode:collectionView.collectionNode constrainedSizeForItemAtIndexPath:indexPath];
-  } else if (_delegateFlags.implementsConstrainedSizeForNodeAtIndexPathDeprecated) {
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
-    result = [collectionView.asyncDelegate collectionView:collectionView constrainedSizeForNodeAtIndexPath:indexPath];
-#pragma clang diagnostic pop
-  } else {
-    // With 2.0 `collectionView:constrainedSizeForNodeAtIndexPath:` was moved to the delegate. Assert if not implemented on the delegate but on the data source
-    ASDisplayNodeAssert([collectionView.asyncDataSource respondsToSelector:@selector(collectionView:constrainedSizeForNodeAtIndexPath:)] == NO, @"collectionView:constrainedSizeForNodeAtIndexPath: was moved from the ASCollectionDataSource to the ASCollectionDelegate.");
-  }
-
-  // If we got no size range:
-  if (ASSizeRangeEqualToSizeRange(result, ASSizeRangeUnconstrained)) {
-    // Use itemSize if they set it.
-    CGSize itemSize = _layout.itemSize;
-    if (CGSizeEqualToSize(itemSize, kDefaultItemSize) == NO) {
-      result = ASSizeRangeMake(itemSize, itemSize);
-    } else {
-      // Compute constraint from scroll direction otherwise.
-      result = NodeConstrainedSizeForScrollDirection(collectionView);
-    }
-  }
-  
-  return result;
-}
-
-- (ASSizeRange)collectionView:(ASCollectionView *)collectionView constrainedSizeForSupplementaryNodeOfKind:(NSString *)kind atIndexPath:(NSIndexPath *)indexPath
-{
-  ASSizeRange result = ASSizeRangeZero;
-  if (ASObjectIsEqual(kind, UICollectionElementKindSectionHeader)) {
-    if (_delegateFlags.implementsSizeRangeForHeader) {
-      result = [[self delegateForCollectionView:collectionView] collectionNode:collectionView.collectionNode sizeRangeForHeaderInSection:indexPath.section];
-    } else if (_delegateFlags.implementsReferenceSizeForHeader) {
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
-      CGSize exactSize = [[self delegateForCollectionView:collectionView] collectionView:collectionView layout:_layout referenceSizeForHeaderInSection:indexPath.section];
-#pragma clang diagnostic pop
-      result = ASSizeRangeMake(exactSize);
-    } else {
-      result = ASSizeRangeMake(_layout.headerReferenceSize);
-    }
-  } else if (ASObjectIsEqual(kind, UICollectionElementKindSectionFooter)) {
-    if (_delegateFlags.implementsSizeRangeForFooter) {
-      result = [[self delegateForCollectionView:collectionView] collectionNode:collectionView.collectionNode sizeRangeForFooterInSection:indexPath.section];
-    } else if (_delegateFlags.implementsReferenceSizeForFooter) {
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
-      CGSize exactSize = [[self delegateForCollectionView:collectionView] collectionView:collectionView layout:_layout referenceSizeForFooterInSection:indexPath.section];
-#pragma clang diagnostic pop
-      result = ASSizeRangeMake(exactSize);
-    } else {
-      result = ASSizeRangeMake(_layout.footerReferenceSize);
-    }
-  } else {
-    ASDisplayNodeFailAssert(@"Unexpected supplementary kind: %@", kind);
-    return ASSizeRangeZero;
-  }
-
-  if (_layout.scrollDirection == UICollectionViewScrollDirectionVertical) {
-    result.min.width = result.max.width = CGRectGetWidth(collectionView.bounds);
-  } else {
-    result.min.height = result.max.height = CGRectGetHeight(collectionView.bounds);
-  }
-  return result;
-}
-
-- (NSUInteger)collectionView:(ASCollectionView *)collectionView supplementaryNodesOfKind:(NSString *)kind inSection:(NSUInteger)section
-{
-  ASSizeRange constraint = [self collectionView:collectionView constrainedSizeForSupplementaryNodeOfKind:kind atIndexPath:[NSIndexPath indexPathForItem:0 inSection:section]];
-  if (_layout.scrollDirection == UICollectionViewScrollDirectionVertical) {
-    return (constraint.max.height > 0 ? 1 : 0);
-  } else {
-    return (constraint.max.width > 0 ? 1 : 0);
-  }
-}
-
-- (ASScrollDirection)scrollableDirections
-{
-  return (self.layout.scrollDirection == UICollectionViewScrollDirectionHorizontal) ? ASScrollDirectionHorizontalDirections : ASScrollDirectionVerticalDirections;
-}
-
-#pragma mark - Private helpers
-
-- (id<ASCollectionDelegateFlowLayout>)delegateForCollectionView:(ASCollectionView *)collectionView
-{
-  return (id<ASCollectionDelegateFlowLayout>)collectionView.asyncDelegate;
-}
-
-@end
-
-#endif
diff --git a/submodules/AsyncDisplayKit/Source/Private/ASDefaultPlayButton.h b/submodules/AsyncDisplayKit/Source/Private/ASDefaultPlayButton.h
deleted file mode 100644
index e3bc15246d..0000000000
--- a/submodules/AsyncDisplayKit/Source/Private/ASDefaultPlayButton.h
+++ /dev/null
@@ -1,14 +0,0 @@
-//
-//  ASDefaultPlayButton.h
-//  Texture
-//
-//  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.
-//  Changes after 4/13/2017 are: Copyright (c) Pinterest, Inc.  All rights reserved.
-//  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
-//
-
-#import <AsyncDisplayKit/ASButtonNode.h>
-
-@interface ASDefaultPlayButton : ASButtonNode
-
-@end
diff --git a/submodules/AsyncDisplayKit/Source/Private/ASDefaultPlayButton.mm b/submodules/AsyncDisplayKit/Source/Private/ASDefaultPlayButton.mm
deleted file mode 100644
index 589bda90c2..0000000000
--- a/submodules/AsyncDisplayKit/Source/Private/ASDefaultPlayButton.mm
+++ /dev/null
@@ -1,66 +0,0 @@
-//
-//  ASDefaultPlayButton.mm
-//  Texture
-//
-//  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.
-//  Changes after 4/13/2017 are: Copyright (c) Pinterest, Inc.  All rights reserved.
-//  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
-//
-
-#import <AsyncDisplayKit/ASDefaultPlayButton.h>
-#import <AsyncDisplayKit/_ASDisplayLayer.h>
-
-@implementation ASDefaultPlayButton
-
-- (instancetype)init
-{
-  if (!(self = [super init])) {
-    return nil;
-  }
-  
-  self.opaque = NO;
-  
-  return self;
-}
-
-+ (void)drawRect:(CGRect)bounds withParameters:(id)parameters isCancelled:(asdisplaynode_iscancelled_block_t)isCancelledBlock isRasterizing:(BOOL)isRasterizing
-{
-  CGFloat originX = bounds.size.width/4;
-  CGRect buttonBounds = CGRectMake(originX, bounds.size.height/4, bounds.size.width/2, bounds.size.height/2);
-  CGFloat widthHeight = buttonBounds.size.width;
-
-  //When the video isn't a square, the lower bound should be used to figure out the circle size
-  if (bounds.size.width < bounds.size.height) {
-    widthHeight = bounds.size.width/2;
-    originX = (bounds.size.width - widthHeight)/2;
-    buttonBounds = CGRectMake(originX, (bounds.size.height - widthHeight)/2, widthHeight, widthHeight);
-  }
-  if (bounds.size.width > bounds.size.height) {
-    widthHeight = bounds.size.height/2;
-    originX = (bounds.size.width - widthHeight)/2;
-    buttonBounds = CGRectMake(originX, (bounds.size.height - widthHeight)/2, widthHeight, widthHeight);
-  }
-
-  CGContextRef context = UIGraphicsGetCurrentContext();
-
-  // Circle Drawing
-  UIBezierPath *ovalPath = [UIBezierPath bezierPathWithOvalInRect: buttonBounds];
-  [[UIColor colorWithWhite:0.0 alpha:0.5] setFill];
-  [ovalPath fill];
-  
-  // Triangle Drawing
-  CGContextSaveGState(context);
-  
-  UIBezierPath *trianglePath = [UIBezierPath bezierPath];
-  [trianglePath moveToPoint:CGPointMake(originX + widthHeight/3, bounds.size.height/4 + (bounds.size.height/2)/4)];
-  [trianglePath addLineToPoint:CGPointMake(originX + widthHeight/3, bounds.size.height - bounds.size.height/4 - (bounds.size.height/2)/4)];
-  [trianglePath addLineToPoint:CGPointMake(bounds.size.width - originX - widthHeight/4, bounds.size.height/2)];
-
-  [trianglePath closePath];
-  [[UIColor colorWithWhite:0.9 alpha:0.9] setFill];
-  [trianglePath fill];
-  
-  CGContextRestoreGState(context);
-}
-
-@end
diff --git a/submodules/AsyncDisplayKit/Source/Private/ASDefaultPlaybackButton.h b/submodules/AsyncDisplayKit/Source/Private/ASDefaultPlaybackButton.h
deleted file mode 100644
index ae7e245dc0..0000000000
--- a/submodules/AsyncDisplayKit/Source/Private/ASDefaultPlaybackButton.h
+++ /dev/null
@@ -1,19 +0,0 @@
-//
-//  ASDefaultPlaybackButton.h
-//  Texture
-//
-//  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.
-//  Changes after 4/13/2017 are: Copyright (c) Pinterest, Inc.  All rights reserved.
-//  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
-//
-
-#import <AsyncDisplayKit/ASControlNode.h>
-
-typedef NS_ENUM(NSInteger, ASDefaultPlaybackButtonType) {
-  ASDefaultPlaybackButtonTypePlay,
-  ASDefaultPlaybackButtonTypePause
-};
-
-@interface ASDefaultPlaybackButton : ASControlNode
-@property (nonatomic) ASDefaultPlaybackButtonType buttonType;
-@end
diff --git a/submodules/AsyncDisplayKit/Source/Private/ASDefaultPlaybackButton.mm b/submodules/AsyncDisplayKit/Source/Private/ASDefaultPlaybackButton.mm
deleted file mode 100644
index deda7e8716..0000000000
--- a/submodules/AsyncDisplayKit/Source/Private/ASDefaultPlaybackButton.mm
+++ /dev/null
@@ -1,84 +0,0 @@
-//
-//  ASDefaultPlaybackButton.mm
-//  Texture
-//
-//  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.
-//  Changes after 4/13/2017 are: Copyright (c) Pinterest, Inc.  All rights reserved.
-//  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
-//
-
-#import <AsyncDisplayKit/ASDefaultPlaybackButton.h>
-#import <AsyncDisplayKit/_ASDisplayLayer.h>
-
-@interface ASDefaultPlaybackButton()
-{
-  ASDefaultPlaybackButtonType _buttonType;
-}
-@end
-
-@implementation ASDefaultPlaybackButton
-- (instancetype)init
-{
-  if (!(self = [super init])) {
-    return nil;
-  }
-
-  self.opaque = NO;
-
-  return self;
-}
-
-- (void)setButtonType:(ASDefaultPlaybackButtonType)buttonType
-{
-  ASDefaultPlaybackButtonType oldType = _buttonType;
-  _buttonType = buttonType;
-
-  if (oldType != _buttonType) {
-    [self setNeedsDisplay];
-  }
-}
-
-- (nullable NSDictionary *)drawParametersForAsyncLayer:(_ASDisplayLayer *)layer
-{
-  return @{
-    @"buttonType" : @(self.buttonType),
-    @"color" : self.tintColor
-  };
-}
-
-+ (void)drawRect:(CGRect)bounds withParameters:(NSDictionary *)parameters isCancelled:(asdisplaynode_iscancelled_block_t)isCancelledBlock isRasterizing:(BOOL)isRasterizing
-{
-  ASDefaultPlaybackButtonType buttonType = (ASDefaultPlaybackButtonType)[parameters[@"buttonType"] intValue];
-  UIColor *color = parameters[@"color"];
-
-  CGContextRef context = UIGraphicsGetCurrentContext();
-  CGContextSaveGState(context);
-  UIBezierPath* bezierPath = [UIBezierPath bezierPath];
-  if (buttonType == ASDefaultPlaybackButtonTypePlay) {
-    [bezierPath moveToPoint: CGPointMake(0, 0)];
-    [bezierPath addLineToPoint: CGPointMake(0, bounds.size.height)];
-    [bezierPath addLineToPoint: CGPointMake(bounds.size.width, bounds.size.height/2)];
-    [bezierPath addLineToPoint: CGPointMake(0, 0)];
-    [bezierPath closePath];
-  } else if (buttonType == ASDefaultPlaybackButtonTypePause) {
-    CGFloat pauseSingleLineWidth = bounds.size.width / 3.0;
-    [bezierPath moveToPoint: CGPointMake(0, bounds.size.height)];
-    [bezierPath addLineToPoint: CGPointMake(pauseSingleLineWidth, bounds.size.height)];
-    [bezierPath addLineToPoint: CGPointMake(pauseSingleLineWidth, 0)];
-    [bezierPath addLineToPoint: CGPointMake(0, 0)];
-    [bezierPath addLineToPoint: CGPointMake(0, bounds.size.height)];
-    [bezierPath closePath];
-    [bezierPath moveToPoint: CGPointMake(pauseSingleLineWidth * 2, 0)];
-    [bezierPath addLineToPoint: CGPointMake(pauseSingleLineWidth * 2, bounds.size.height)];
-    [bezierPath addLineToPoint: CGPointMake(bounds.size.width, bounds.size.height)];
-    [bezierPath addLineToPoint: CGPointMake(bounds.size.width, 0)];
-    [bezierPath addLineToPoint: CGPointMake(pauseSingleLineWidth * 2, 0)];
-    [bezierPath closePath];
-  }
-
-  [color setFill];
-  [bezierPath fill];
-
-  CGContextRestoreGState(context);
-}
-@end
diff --git a/submodules/AsyncDisplayKit/Source/Private/ASDisplayNode+DebugTiming.h b/submodules/AsyncDisplayKit/Source/Private/ASDisplayNode+DebugTiming.h
deleted file mode 100644
index f6935224a9..0000000000
--- a/submodules/AsyncDisplayKit/Source/Private/ASDisplayNode+DebugTiming.h
+++ /dev/null
@@ -1,21 +0,0 @@
-//
-//  ASDisplayNode+DebugTiming.h
-//  Texture
-//
-//  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.
-//  Changes after 4/13/2017 are: Copyright (c) Pinterest, Inc.  All rights reserved.
-//  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
-//
-
-#import <AsyncDisplayKit/ASDisplayNode.h>
-
-@interface ASDisplayNode (DebugTiming)
-
-@property (nonatomic, readonly) NSTimeInterval debugTimeToCreateView;
-@property (nonatomic, readonly) NSTimeInterval debugTimeToApplyPendingState;
-@property (nonatomic, readonly) NSTimeInterval debugTimeToAddSubnodeViews;
-@property (nonatomic, readonly) NSTimeInterval debugTimeForDidLoad;
-
-- (NSTimeInterval)debugAllCreationTime;
-
-@end
diff --git a/submodules/AsyncDisplayKit/Source/Private/ASDisplayNode+DebugTiming.mm b/submodules/AsyncDisplayKit/Source/Private/ASDisplayNode+DebugTiming.mm
deleted file mode 100644
index d9311a10d9..0000000000
--- a/submodules/AsyncDisplayKit/Source/Private/ASDisplayNode+DebugTiming.mm
+++ /dev/null
@@ -1,85 +0,0 @@
-//
-//  ASDisplayNode+DebugTiming.mm
-//  Texture
-//
-//  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.
-//  Changes after 4/13/2017 are: Copyright (c) Pinterest, Inc.  All rights reserved.
-//  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
-//
-
-#import <AsyncDisplayKit/ASDisplayNode+DebugTiming.h>
-#import <AsyncDisplayKit/ASDisplayNodeInternal.h>
-
-@implementation ASDisplayNode (DebugTiming)
-
-#if TIME_DISPLAYNODE_OPS
-- (NSTimeInterval)debugTimeToCreateView
-{
-  return _debugTimeToCreateView;
-}
-
-- (NSTimeInterval)debugTimeToApplyPendingState
-{
-  return _debugTimeToApplyPendingState;
-}
-
-- (NSTimeInterval)debugTimeToAddSubnodeViews
-{
-  return _debugTimeToAddSubnodeViews;
-}
-
-- (NSTimeInterval)debugTimeForDidLoad
-{
-  return _debugTimeForDidLoad;
-}
-
-- (NSTimeInterval)debugAllCreationTime
-{
-  return self.debugTimeToCreateView + self.debugTimeToApplyPendingState + self.debugTimeToAddSubnodeViews + self.debugTimeForDidLoad;
-}
-
-// This would over-count views that are created in the parent's didload or addsubnodesubviews, so we need to take a more basic approach
-//- (NSTimeInterval)debugRecursiveAllCreationTime
-//{
-//  __block NSTimeInterval total = 0;
-//  ASDisplayNodeFindAllSubnodes(self, ^(ASDisplayNode *n){
-//    total += self.debugTimeToCreateView;
-//    total += self.debugTimeToApplyPendingState;
-//    total += self.debugTimeToAddSubnodeViews;
-//    total += self.debugTimeForDidLoad;
-//    return NO;
-//  });
-//  return total;
-//}
-
-#else
-
-// These ivars are compiled out so we don't have the info available
-- (NSTimeInterval)debugTimeToCreateView
-{
-  return -1;
-}
-
-- (NSTimeInterval)debugTimeToApplyPendingState
-{
-  return -1;
-}
-
-- (NSTimeInterval)debugTimeToAddSubnodeViews
-{
-  return -1;
-}
-
-- (NSTimeInterval)debugTimeForDidLoad
-{
-  return -1;
-}
-
-- (NSTimeInterval)debugAllCreationTime
-{
-  return -1;
-}
-
-#endif
-
-@end
diff --git a/submodules/AsyncDisplayKit/Source/Private/ASDisplayNodeCornerLayerDelegate.h b/submodules/AsyncDisplayKit/Source/Private/ASDisplayNodeCornerLayerDelegate.h
deleted file mode 100644
index cb95e9fbf6..0000000000
--- a/submodules/AsyncDisplayKit/Source/Private/ASDisplayNodeCornerLayerDelegate.h
+++ /dev/null
@@ -1,13 +0,0 @@
-//
-//  ASDisplayNodeCornerLayerDelegate.h
-//  Texture
-//
-//  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.
-//  Changes after 4/13/2017 are: Copyright (c) Pinterest, Inc.  All rights reserved.
-//  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
-//
-
-#import <QuartzCore/QuartzCore.h>
-
-@interface ASDisplayNodeCornerLayerDelegate : NSObject <CALayerDelegate>
-@end
diff --git a/submodules/AsyncDisplayKit/Source/Private/ASDisplayNodeCornerLayerDelegate.mm b/submodules/AsyncDisplayKit/Source/Private/ASDisplayNodeCornerLayerDelegate.mm
deleted file mode 100644
index 42838baba1..0000000000
--- a/submodules/AsyncDisplayKit/Source/Private/ASDisplayNodeCornerLayerDelegate.mm
+++ /dev/null
@@ -1,19 +0,0 @@
-//
-//  ASDisplayNodeCornerLayerDelegate.mm
-//  Texture
-//
-//  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.
-//  Changes after 4/13/2017 are: Copyright (c) Pinterest, Inc.  All rights reserved.
-//  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
-//
-
-#import "ASDisplayNodeCornerLayerDelegate.h"
-
-@implementation ASDisplayNodeCornerLayerDelegate
-
-- (id<CAAction>)actionForLayer:(CALayer *)layer forKey:(NSString *)event
-{
-  return (id)kCFNull;
-}
-
-@end
diff --git a/submodules/AsyncDisplayKit/Source/Private/ASDisplayNodeTipState.h b/submodules/AsyncDisplayKit/Source/Private/ASDisplayNodeTipState.h
deleted file mode 100644
index 1e1ef20726..0000000000
--- a/submodules/AsyncDisplayKit/Source/Private/ASDisplayNodeTipState.h
+++ /dev/null
@@ -1,32 +0,0 @@
-//
-//  ASDisplayNodeTipState.h
-//  Texture
-//
-//  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.
-//  Changes after 4/13/2017 are: Copyright (c) Pinterest, Inc.  All rights reserved.
-//  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
-//
-
-#import <Foundation/Foundation.h>
-#import <AsyncDisplayKit/ASBaseDefines.h>
-
-@class ASDisplayNode, ASTipNode;
-
-NS_ASSUME_NONNULL_BEGIN
-
-AS_SUBCLASSING_RESTRICTED
-@interface ASDisplayNodeTipState : NSObject
-
-- (instancetype)initWithNode:(ASDisplayNode *)node NS_DESIGNATED_INITIALIZER;
-
-- (instancetype)init NS_UNAVAILABLE;
-
-/// Unsafe because once the node is deallocated, we will not be able to access the tip state.
-@property (nonatomic, unsafe_unretained, readonly) ASDisplayNode *node;
-
-/// Main-thread-only.
-@property (nonatomic, nullable) ASTipNode *tipNode;
-
-@end
-
-NS_ASSUME_NONNULL_END
diff --git a/submodules/AsyncDisplayKit/Source/Private/ASDisplayNodeTipState.mm b/submodules/AsyncDisplayKit/Source/Private/ASDisplayNodeTipState.mm
deleted file mode 100644
index b5a4231998..0000000000
--- a/submodules/AsyncDisplayKit/Source/Private/ASDisplayNodeTipState.mm
+++ /dev/null
@@ -1,25 +0,0 @@
-//
-//  ASDisplayNodeTipState.mm
-//  Texture
-//
-//  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.
-//  Changes after 4/13/2017 are: Copyright (c) Pinterest, Inc.  All rights reserved.
-//  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
-//
-
-#import "ASDisplayNodeTipState.h"
-
-@interface ASDisplayNodeTipState ()
-@end
-
-@implementation ASDisplayNodeTipState
-
-- (instancetype)initWithNode:(ASDisplayNode *)node
-{
-  if (self = [super init]) {
-    _node = node;
-  }
-  return self;
-}
-
-@end
diff --git a/submodules/AsyncDisplayKit/Source/Private/ASIGListAdapterBasedDataSource.h b/submodules/AsyncDisplayKit/Source/Private/ASIGListAdapterBasedDataSource.h
deleted file mode 100644
index 5be2185f2f..0000000000
--- a/submodules/AsyncDisplayKit/Source/Private/ASIGListAdapterBasedDataSource.h
+++ /dev/null
@@ -1,29 +0,0 @@
-//
-//  ASIGListAdapterBasedDataSource.h
-//  Texture
-//
-//  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.
-//  Changes after 4/13/2017 are: Copyright (c) Pinterest, Inc.  All rights reserved.
-//  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
-//
-
-#import <AsyncDisplayKit/ASAvailability.h>
-
-#if AS_IG_LIST_KIT
-
-#import <IGListKit/IGListKit.h>
-#import <AsyncDisplayKit/ASCollectionView.h>
-#import <AsyncDisplayKit/ASCollectionNode.h>
-
-NS_ASSUME_NONNULL_BEGIN
-
-AS_SUBCLASSING_RESTRICTED
-@interface ASIGListAdapterBasedDataSource : NSObject <ASCollectionDataSourceInterop, ASCollectionDelegateInterop, ASCollectionDelegateFlowLayout>
-
-- (instancetype)initWithListAdapter:(IGListAdapter *)listAdapter collectionDelegate:(nullable id<ASCollectionDelegate>)collectionDelegate;
-
-@end
-
-#endif
-
-NS_ASSUME_NONNULL_END
diff --git a/submodules/AsyncDisplayKit/Source/Private/ASIGListAdapterBasedDataSource.mm b/submodules/AsyncDisplayKit/Source/Private/ASIGListAdapterBasedDataSource.mm
deleted file mode 100644
index 3cf77afc0a..0000000000
--- a/submodules/AsyncDisplayKit/Source/Private/ASIGListAdapterBasedDataSource.mm
+++ /dev/null
@@ -1,364 +0,0 @@
-//
-//  ASIGListAdapterBasedDataSource.mm
-//  Texture
-//
-//  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.
-//  Changes after 4/13/2017 are: Copyright (c) Pinterest, Inc.  All rights reserved.
-//  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
-//
-
-#import <AsyncDisplayKit/ASAvailability.h>
-
-#if AS_IG_LIST_KIT
-
-#import "ASIGListAdapterBasedDataSource.h"
-#import <AsyncDisplayKit/AsyncDisplayKit.h>
-#import <objc/runtime.h>
-
-typedef IGListSectionController<ASSectionController> ASIGSectionController;
-
-/// The optional methods that a class implements from ASSectionController.
-/// Note: Bitfields are not supported by NSValue so we can't use them.
-typedef struct {
-  BOOL sizeRangeForItem;
-  BOOL shouldBatchFetch;
-  BOOL beginBatchFetchWithContext;
-} ASSectionControllerOverrides;
-
-/// The optional methods that a class implements from ASSupplementaryNodeSource.
-/// Note: Bitfields are not supported by NSValue so we can't use them.
-typedef struct {
-  BOOL sizeRangeForSupplementary;
-} ASSupplementarySourceOverrides;
-
-@protocol ASIGSupplementaryNodeSource <IGListSupplementaryViewSource, ASSupplementaryNodeSource>
-@end
-
-@interface ASIGListAdapterBasedDataSource ()
-@property (nonatomic, weak, readonly) IGListAdapter *listAdapter;
-@property (nonatomic, readonly) id<UICollectionViewDelegateFlowLayout> delegate;
-@property (nonatomic, readonly) id<UICollectionViewDataSource> dataSource;
-@property (nonatomic, weak, readonly) id<ASCollectionDelegate> collectionDelegate;
-
-/**
- * The section controller that we will forward beginBatchFetchWithContext: to.
- * Since shouldBatchFetch: is called on main, we capture the last section controller in there,
- * and then we use it and clear it in beginBatchFetchWithContext: (on default queue).
- *
- * It is safe to use it without a lock in this limited way, since those two methods will
- * never execute in parallel.
- */
-@property (nonatomic, weak) ASIGSectionController *sectionControllerForBatchFetching;
-@end
-
-@implementation ASIGListAdapterBasedDataSource
-
-- (instancetype)initWithListAdapter:(IGListAdapter *)listAdapter collectionDelegate:(nullable id<ASCollectionDelegate>)collectionDelegate
-{
-  if (self = [super init]) {
-#if IG_LIST_COLLECTION_VIEW
-    [ASIGListAdapterBasedDataSource setASCollectionViewSuperclass];
-#endif
-    [ASIGListAdapterBasedDataSource configureUpdater:listAdapter.updater];
-
-    ASDisplayNodeAssert([listAdapter conformsToProtocol:@protocol(UICollectionViewDataSource)], @"Expected IGListAdapter to conform to UICollectionViewDataSource.");
-    ASDisplayNodeAssert([listAdapter conformsToProtocol:@protocol(UICollectionViewDelegateFlowLayout)], @"Expected IGListAdapter to conform to UICollectionViewDelegateFlowLayout.");
-    _listAdapter = listAdapter;
-    _collectionDelegate = collectionDelegate;
-  }
-  return self;
-}
-
-- (id<UICollectionViewDataSource>)dataSource
-{
-  return (id<UICollectionViewDataSource>)_listAdapter;
-}
-
-- (id<UICollectionViewDelegateFlowLayout>)delegate
-{
-  return (id<UICollectionViewDelegateFlowLayout>)_listAdapter;
-}
-
-#pragma mark - ASCollectionDelegate
-
-- (void)collectionNode:(ASCollectionNode *)collectionNode didSelectItemAtIndexPath:(NSIndexPath *)indexPath
-{
-  [self.delegate collectionView:collectionNode.view didSelectItemAtIndexPath:indexPath];
-}
-
-- (void)scrollViewDidScroll:(UIScrollView *)scrollView
-{
-  [self.delegate scrollViewDidScroll:scrollView];
-}
-
-- (void)scrollViewWillBeginDragging:(UIScrollView *)scrollView
-{
-  [self.delegate scrollViewWillBeginDragging:scrollView];
-}
-
-- (void)scrollViewWillEndDragging:(UIScrollView *)scrollView withVelocity:(CGPoint)velocity targetContentOffset:(inout CGPoint *)targetContentOffset
-{
-  // IGListAdapter doesn't implement scrollViewWillEndDragging yet (pending pull request), so we need this check for now. Doesn't hurt to have it anyways :)
-  if ([self.delegate respondsToSelector:@selector(scrollViewWillEndDragging:withVelocity:targetContentOffset:)]) {
-    [self.delegate scrollViewWillEndDragging:scrollView withVelocity:velocity targetContentOffset:targetContentOffset];
-  }
-}
-
-- (void)scrollViewDidEndDragging:(UIScrollView *)scrollView willDecelerate:(BOOL)decelerate
-{
-  [self.delegate scrollViewDidEndDragging:scrollView willDecelerate:decelerate];
-}
-
-- (void)scrollViewDidEndDecelerating:(UIScrollView *)scrollView
-{
-  [self.delegate scrollViewDidEndDecelerating:scrollView];
-}
-
-- (BOOL)shouldBatchFetchForCollectionNode:(ASCollectionNode *)collectionNode
-{
-  if ([_collectionDelegate respondsToSelector:@selector(shouldBatchFetchForCollectionNode:)]) {
-    return [_collectionDelegate shouldBatchFetchForCollectionNode:collectionNode];
-  }
-
-  NSInteger sectionCount = [self numberOfSectionsInCollectionNode:collectionNode];
-  if (sectionCount == 0) {
-    return NO;
-  }
-
-  // If they implement shouldBatchFetch, call it. Otherwise, just say YES if they implement beginBatchFetch.
-  ASIGSectionController *ctrl = [self sectionControllerForSection:sectionCount - 1];
-  ASSectionControllerOverrides o = [ASIGListAdapterBasedDataSource overridesForSectionControllerClass:ctrl.class];
-  BOOL result = (o.shouldBatchFetch ? [ctrl shouldBatchFetch] : o.beginBatchFetchWithContext);
-  if (result) {
-    self.sectionControllerForBatchFetching = ctrl;
-  }
-  return result;
-}
-
-- (void)collectionNode:(ASCollectionNode *)collectionNode willBeginBatchFetchWithContext:(ASBatchContext *)context
-{
-  if ([_collectionDelegate respondsToSelector:@selector(collectionNode:willBeginBatchFetchWithContext:)]) {
-    [_collectionDelegate collectionNode:collectionNode willBeginBatchFetchWithContext:context];
-    return;
-  }
-  
-  ASIGSectionController *ctrl = self.sectionControllerForBatchFetching;
-  self.sectionControllerForBatchFetching = nil;
-  [ctrl beginBatchFetchWithContext:context];
-}
-
-/**
- * Note: It is not documented that ASCollectionNode will forward these UIKit delegate calls if they are implemented.
- * It is not considered harmful to do so, and adding them to documentation will confuse most users, who should
- * instead using the ASCollectionDelegate callbacks.
- */
-#pragma mark - ASCollectionDelegateInterop
-
-- (void)collectionView:(UICollectionView *)collectionView willDisplayCell:(UICollectionViewCell *)cell forItemAtIndexPath:(NSIndexPath *)indexPath
-{
-  [self.delegate collectionView:collectionView willDisplayCell:cell forItemAtIndexPath:indexPath];
-}
-
-- (void)collectionView:(UICollectionView *)collectionView didEndDisplayingCell:(UICollectionViewCell *)cell forItemAtIndexPath:(NSIndexPath *)indexPath
-{
-  [self.delegate collectionView:collectionView didEndDisplayingCell:cell forItemAtIndexPath:indexPath];
-}
-
-#pragma mark - ASCollectionDelegateFlowLayout
-
-- (ASSizeRange)collectionNode:(ASCollectionNode *)collectionNode sizeRangeForHeaderInSection:(NSInteger)section
-{
-  id<ASIGSupplementaryNodeSource> src = [self supplementaryElementSourceForSection:section];
-  if ([ASIGListAdapterBasedDataSource overridesForSupplementarySourceClass:[src class]].sizeRangeForSupplementary) {
-    return [src sizeRangeForSupplementaryElementOfKind:UICollectionElementKindSectionHeader atIndex:0];
-  } else {
-    return ASSizeRangeZero;
-  }
-}
-
-- (ASSizeRange)collectionNode:(ASCollectionNode *)collectionNode sizeRangeForFooterInSection:(NSInteger)section
-{
-  id<ASIGSupplementaryNodeSource> src = [self supplementaryElementSourceForSection:section];
-  if ([ASIGListAdapterBasedDataSource overridesForSupplementarySourceClass:[src class]].sizeRangeForSupplementary) {
-    return [src sizeRangeForSupplementaryElementOfKind:UICollectionElementKindSectionFooter atIndex:0];
-  } else {
-    return ASSizeRangeZero;
-  }
-}
-
-- (UIEdgeInsets)collectionView:(UICollectionView *)collectionView layout:(UICollectionViewLayout *)collectionViewLayout insetForSectionAtIndex:(NSInteger)section
-{
-  return [self.delegate collectionView:collectionView layout:collectionViewLayout insetForSectionAtIndex:section];
-}
-
-- (CGFloat)collectionView:(UICollectionView *)collectionView layout:(UICollectionViewLayout *)collectionViewLayout minimumLineSpacingForSectionAtIndex:(NSInteger)section
-{
-  return [self.delegate collectionView:collectionView layout:collectionViewLayout minimumLineSpacingForSectionAtIndex:section];
-}
-
-- (CGFloat)collectionView:(UICollectionView *)collectionView layout:(UICollectionViewLayout *)collectionViewLayout minimumInteritemSpacingForSectionAtIndex:(NSInteger)section
-{
-  return [self.delegate collectionView:collectionView layout:collectionViewLayout minimumInteritemSpacingForSectionAtIndex:section];
-}
-
-#pragma mark - ASCollectionDataSource
-
-- (NSInteger)collectionNode:(ASCollectionNode *)collectionNode numberOfItemsInSection:(NSInteger)section
-{
-  return [self.dataSource collectionView:collectionNode.view numberOfItemsInSection:section];
-}
-
-- (NSInteger)numberOfSectionsInCollectionNode:(ASCollectionNode *)collectionNode
-{
-  return [self.dataSource numberOfSectionsInCollectionView:collectionNode.view];
-}
-
-- (ASCellNodeBlock)collectionNode:(ASCollectionNode *)collectionNode nodeBlockForItemAtIndexPath:(NSIndexPath *)indexPath
-{
-  ASIGSectionController *ctrl = [self sectionControllerForSection:indexPath.section];
-  ASDisplayNodeAssert([ctrl respondsToSelector:@selector(nodeBlockForItemAtIndex:)], @"Expected section controller to respond to to %@. Controller: %@", NSStringFromSelector(@selector(nodeBlockForItemAtIndex:)), ctrl);
-  return [ctrl nodeBlockForItemAtIndex:indexPath.item];
-}
-
-- (ASCellNode *)collectionNode:(ASCollectionNode *)collectionNode nodeForItemAtIndexPath:(NSIndexPath *)indexPath
-{
-  ASIGSectionController *ctrl = [self sectionControllerForSection:indexPath.section];
-  ASDisplayNodeAssert([ctrl respondsToSelector:@selector(nodeForItemAtIndex:)], @"Expected section controller to respond to to %@. Controller: %@", NSStringFromSelector(@selector(nodeForItemAtIndex:)), ctrl);
-  return [ctrl nodeForItemAtIndex:indexPath.item];
-}
-
-- (ASSizeRange)collectionNode:(ASCollectionNode *)collectionNode constrainedSizeForItemAtIndexPath:(NSIndexPath *)indexPath
-{
-  ASIGSectionController *ctrl = [self sectionControllerForSection:indexPath.section];
-  if ([ASIGListAdapterBasedDataSource overridesForSectionControllerClass:ctrl.class].sizeRangeForItem) {
-    return [ctrl sizeRangeForItemAtIndex:indexPath.item];
-  } else {
-    return ASSizeRangeUnconstrained;
-  }
-}
-
-- (ASCellNodeBlock)collectionNode:(ASCollectionNode *)collectionNode nodeBlockForSupplementaryElementOfKind:(NSString *)kind atIndexPath:(NSIndexPath *)indexPath
-{
-  id<ASSupplementaryNodeSource> ctrl = [self supplementaryElementSourceForSection:indexPath.section];
-  ASDisplayNodeAssert([ctrl respondsToSelector:@selector(nodeBlockForSupplementaryElementOfKind:atIndex:)], @"Expected section controller to respond to to %@. Controller: %@", NSStringFromSelector(@selector(nodeBlockForSupplementaryElementOfKind:atIndex:)), ctrl);
-  return [ctrl nodeBlockForSupplementaryElementOfKind:kind atIndex:indexPath.item];
-}
-
-- (ASCellNode *)collectionNode:(ASCollectionNode *)collectionNode nodeForSupplementaryElementOfKind:(NSString *)kind atIndexPath:(NSIndexPath *)indexPath
-{
-  id<ASSupplementaryNodeSource> ctrl = [self supplementaryElementSourceForSection:indexPath.section];
-  ASDisplayNodeAssert([ctrl respondsToSelector:@selector(nodeForSupplementaryElementOfKind:atIndex:)], @"Expected section controller to respond to to %@. Controller: %@", NSStringFromSelector(@selector(nodeForSupplementaryElementOfKind:atIndex:)), ctrl);
-  return [ctrl nodeForSupplementaryElementOfKind:kind atIndex:indexPath.item];
-}
-
-- (NSArray<NSString *> *)collectionNode:(ASCollectionNode *)collectionNode supplementaryElementKindsInSection:(NSInteger)section
-{
-  return [[self supplementaryElementSourceForSection:section] supportedElementKinds];
-}
-
-#pragma mark - ASCollectionDataSourceInterop
-
-- (__kindof UICollectionViewCell *)collectionView:(UICollectionView *)collectionView cellForItemAtIndexPath:(nonnull NSIndexPath *)indexPath
-{
-  return [self.dataSource collectionView:collectionView cellForItemAtIndexPath:indexPath];
-}
-
-- (UICollectionReusableView *)collectionView:(UICollectionView *)collectionView viewForSupplementaryElementOfKind:(NSString *)kind atIndexPath:(NSIndexPath *)indexPath
-{
-  return [self.dataSource collectionView:collectionView viewForSupplementaryElementOfKind:kind atIndexPath:indexPath];
-}
-
-+ (BOOL)dequeuesCellsForNodeBackedItems
-{
-  return YES;
-}
-
-#pragma mark - Helpers
-
-- (id<ASIGSupplementaryNodeSource>)supplementaryElementSourceForSection:(NSInteger)section
-{
-  ASIGSectionController *ctrl = [self sectionControllerForSection:section];
-  id<ASIGSupplementaryNodeSource> src = (id<ASIGSupplementaryNodeSource>)ctrl.supplementaryViewSource;
-  ASDisplayNodeAssert(src == nil || [src conformsToProtocol:@protocol(ASSupplementaryNodeSource)], @"Supplementary view source should conform to %@", NSStringFromProtocol(@protocol(ASSupplementaryNodeSource)));
-  return src;
-}
-
-- (ASIGSectionController *)sectionControllerForSection:(NSInteger)section
-{
-  id object = [_listAdapter objectAtSection:section];
-  ASIGSectionController *ctrl = (ASIGSectionController *)[_listAdapter sectionControllerForObject:object];
-  ASDisplayNodeAssert([ctrl conformsToProtocol:@protocol(ASSectionController)], @"Expected section controller to conform to %@. Controller: %@", NSStringFromProtocol(@protocol(ASSectionController)), ctrl);
-  return ctrl;
-}
-
-/// If needed, set ASCollectionView's superclass to IGListCollectionView (IGListKit < 3.0).
-#if IG_LIST_COLLECTION_VIEW
-+ (void)setASCollectionViewSuperclass
-{
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
-  static dispatch_once_t onceToken;
-  dispatch_once(&onceToken, ^{
-    class_setSuperclass([ASCollectionView class], [IGListCollectionView class]);
-  });
-#pragma clang diagnostic pop
-}
-#endif
-
-/// Ensure updater won't call reloadData on us.
-+ (void)configureUpdater:(id<IGListUpdatingDelegate>)updater
-{
-  // Cast to NSObject will be removed after https://github.com/Instagram/IGListKit/pull/435
-  if ([(id<NSObject>)updater isKindOfClass:[IGListAdapterUpdater class]]) {
-    [(IGListAdapterUpdater *)updater setAllowsBackgroundReloading:NO];
-  } else {
-    static dispatch_once_t onceToken;
-    dispatch_once(&onceToken, ^{
-      NSLog(@"WARNING: Use of non-%@ updater with AsyncDisplayKit is discouraged. Updater: %@", NSStringFromClass([IGListAdapterUpdater class]), updater);
-    });
-  }
-}
-
-+ (ASSupplementarySourceOverrides)overridesForSupplementarySourceClass:(Class)c
-{
-  static NSCache<Class, NSValue *> *cache;
-  static dispatch_once_t onceToken;
-  dispatch_once(&onceToken, ^{
-    cache = [[NSCache alloc] init];
-  });
-  NSValue *obj = [cache objectForKey:c];
-  ASSupplementarySourceOverrides o;
-  if (obj == nil) {
-    o.sizeRangeForSupplementary = [c instancesRespondToSelector:@selector(sizeRangeForSupplementaryElementOfKind:atIndex:)];
-    obj = [NSValue valueWithBytes:&o objCType:@encode(ASSupplementarySourceOverrides)];
-    [cache setObject:obj forKey:c];
-  } else {
-    [obj getValue:&o];
-  }
-  return o;
-}
-
-+ (ASSectionControllerOverrides)overridesForSectionControllerClass:(Class)c
-{
-  static NSCache<Class, NSValue *> *cache;
-  static dispatch_once_t onceToken;
-  dispatch_once(&onceToken, ^{
-    cache = [[NSCache alloc] init];
-  });
-  NSValue *obj = [cache objectForKey:c];
-  ASSectionControllerOverrides o;
-  if (obj == nil) {
-    o.sizeRangeForItem = [c instancesRespondToSelector:@selector(sizeRangeForItemAtIndex:)];
-    o.beginBatchFetchWithContext = [c instancesRespondToSelector:@selector(beginBatchFetchWithContext:)];
-    o.shouldBatchFetch = [c instancesRespondToSelector:@selector(shouldBatchFetch)];
-    obj = [NSValue valueWithBytes:&o objCType:@encode(ASSectionControllerOverrides)];
-    [cache setObject:obj forKey:c];
-  } else {
-    [obj getValue:&o];
-  }
-  return o;
-}
-
-@end
-
-#endif // AS_IG_LIST_KIT
diff --git a/submodules/AsyncDisplayKit/Source/Private/ASImageNode+AnimatedImagePrivate.h b/submodules/AsyncDisplayKit/Source/Private/ASImageNode+AnimatedImagePrivate.h
deleted file mode 100644
index 528b39beb3..0000000000
--- a/submodules/AsyncDisplayKit/Source/Private/ASImageNode+AnimatedImagePrivate.h
+++ /dev/null
@@ -1,47 +0,0 @@
-//
-//  ASImageNode+AnimatedImagePrivate.h
-//  Texture
-//
-//  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.
-//  Changes after 4/13/2017 are: Copyright (c) Pinterest, Inc.  All rights reserved.
-//  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
-//
-
-#import <AsyncDisplayKit/ASThread.h>
-
-#define ASAnimatedImageDefaultRunLoopMode NSRunLoopCommonModes
-
-@interface ASImageNode ()
-{
-#ifndef MINIMAL_ASDK
-  AS::Mutex _displayLinkLock;
-  id <ASAnimatedImageProtocol> _animatedImage;
-  BOOL _animatedImagePaused;
-  NSString *_animatedImageRunLoopMode;
-  CADisplayLink *_displayLink;
-  NSUInteger _lastSuccessfulFrameIndex;
-  
-  //accessed on main thread only
-  CFTimeInterval _playHead;
-  NSUInteger _playedLoops;
-#endif
-}
-
-@property (nonatomic) CFTimeInterval lastDisplayLinkFire;
-
-@end
-
-#ifndef MINIMAL_ASDK
-@interface ASImageNode (AnimatedImagePrivate)
-
-- (void)_locked_setAnimatedImage:(id <ASAnimatedImageProtocol>)animatedImage;
-
-@end
-
-@interface ASImageNode (AnimatedImageInvalidation)
-
-- (void)invalidateAnimatedImage;
-
-@end
-
-#endif
diff --git a/submodules/AsyncDisplayKit/Source/Private/ASImageNode+CGExtras.h b/submodules/AsyncDisplayKit/Source/Private/ASImageNode+CGExtras.h
deleted file mode 100644
index 01b546443b..0000000000
--- a/submodules/AsyncDisplayKit/Source/Private/ASImageNode+CGExtras.h
+++ /dev/null
@@ -1,31 +0,0 @@
-//
-//  ASImageNode+CGExtras.h
-//  Texture
-//
-//  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.
-//  Changes after 4/13/2017 are: Copyright (c) Pinterest, Inc.  All rights reserved.
-//  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
-//
-
-#import <UIKit/UIKit.h>
-#import <AsyncDisplayKit/ASBaseDefines.h>
-
-/**
- @abstract Decides how to scale and crop an image to fit in the provided size, while not wasting memory by upscaling images
- @param sourceImageSize The size of the encoded image.
- @param boundsSize The bounds in which the image will be displayed.
- @param contentMode The mode that defines how image will be scaled and cropped to fit. Supported values are UIViewContentModeScaleToAspectFill and UIViewContentModeScaleToAspectFit.
- @param cropRect A rectangle that is to be featured by the cropped image. The rectangle is specified as a "unit rectangle," using fractions of the source image's width and height, e.g. CGRectMake(0.5, 0, 0.5, 1.0) will feature the full right half a photo. If the cropRect is empty, the contentMode will be used to determine the drawRect's size, and only the cropRect's origin will be used for positioning.
- @param forceUpscaling A boolean that indicates you would *not* like the backing size to be downscaled if the image is smaller than the destination size. Setting this to YES will result in higher memory usage when images are smaller than their destination.
- @param forcedSize A CGSize, that if non-CGSizeZero, indicates that the backing size should be forcedSize and not calculated based on boundsSize.
- @discussion If the image is smaller than the size and UIViewContentModeScaleToAspectFill is specified, we suggest the input size so it will be efficiently upscaled on the GPU by the displaying layer at composite time.
- */
-AS_EXTERN void ASCroppedImageBackingSizeAndDrawRectInBounds(CGSize sourceImageSize,
-                                                         CGSize boundsSize,
-                                                         UIViewContentMode contentMode,
-                                                         CGRect cropRect,
-                                                         BOOL forceUpscaling,
-                                                         CGSize forcedSize,
-                                                         CGSize *outBackingSize,
-                                                         CGRect *outDrawRect
-                                                         );
diff --git a/submodules/AsyncDisplayKit/Source/Private/ASImageNode+CGExtras.mm b/submodules/AsyncDisplayKit/Source/Private/ASImageNode+CGExtras.mm
deleted file mode 100644
index c4f9fdcbc9..0000000000
--- a/submodules/AsyncDisplayKit/Source/Private/ASImageNode+CGExtras.mm
+++ /dev/null
@@ -1,123 +0,0 @@
-//
-//  ASImageNode+CGExtras.mm
-//  Texture
-//
-//  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.
-//  Changes after 4/13/2017 are: Copyright (c) Pinterest, Inc.  All rights reserved.
-//  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
-//
-
-#import <AsyncDisplayKit/ASImageNode+CGExtras.h>
-
-#import <cmath>
-
-// TODO rewrite these to be closer to the intended use -- take UIViewContentMode as param, CGRect destinationBounds, CGSize sourceSize.
-static CGSize _ASSizeFillWithAspectRatio(CGFloat aspectRatio, CGSize constraints);
-static CGSize _ASSizeFitWithAspectRatio(CGFloat aspectRatio, CGSize constraints);
-
-static CGSize _ASSizeFillWithAspectRatio(CGFloat sizeToScaleAspectRatio, CGSize destinationSize)
-{
-  CGFloat destinationAspectRatio = destinationSize.width / destinationSize.height;
-  if (sizeToScaleAspectRatio > destinationAspectRatio) {
-    return CGSizeMake(destinationSize.height * sizeToScaleAspectRatio, destinationSize.height);
-  } else {
-    return CGSizeMake(destinationSize.width, round(destinationSize.width / sizeToScaleAspectRatio));
-  }
-}
-
-static CGSize _ASSizeFitWithAspectRatio(CGFloat aspectRatio, CGSize constraints)
-{
-  CGFloat constraintAspectRatio = constraints.width / constraints.height;
-  if (aspectRatio > constraintAspectRatio) {
-    return CGSizeMake(constraints.width, constraints.width / aspectRatio);
-  } else {
-    return CGSizeMake(constraints.height * aspectRatio, constraints.height);
-  }
-}
-
-void ASCroppedImageBackingSizeAndDrawRectInBounds(CGSize sourceImageSize,
-                                                  CGSize boundsSize,
-                                                  UIViewContentMode contentMode,
-                                                  CGRect cropRect,
-                                                  BOOL forceUpscaling,
-                                                  CGSize forcedSize,
-                                                  CGSize *outBackingSize,
-                                                  CGRect *outDrawRect
-                                                  )
-{
-
-  size_t destinationWidth = boundsSize.width;
-  size_t destinationHeight = boundsSize.height;
-
-  // Often, an image is too low resolution to completely fill the width and height provided.
-  // Per the API contract as commented in the header, we will adjust input parameters (destinationWidth, destinationHeight) to ensure that the image is not upscaled on the CPU.
-  CGFloat boundsAspectRatio = (CGFloat)destinationWidth / (CGFloat)destinationHeight;
-
-  CGSize scaledSizeForImage = sourceImageSize;
-  BOOL cropToRectDimensions = !CGRectIsEmpty(cropRect);
-
-  if (cropToRectDimensions) {
-    scaledSizeForImage = CGSizeMake(boundsSize.width / cropRect.size.width, boundsSize.height / cropRect.size.height);
-  } else {
-    if (contentMode == UIViewContentModeScaleAspectFill)
-      scaledSizeForImage = _ASSizeFillWithAspectRatio(boundsAspectRatio, sourceImageSize);
-    else if (contentMode == UIViewContentModeScaleAspectFit)
-      scaledSizeForImage = _ASSizeFitWithAspectRatio(boundsAspectRatio, sourceImageSize);
-  }
-
-  // If fitting the desired aspect ratio to the image size actually results in a larger buffer, use the input values.
-  // However, if there is a pixel savings (e.g. we would have to upscale the image), override the function arguments.
-  if (CGSizeEqualToSize(CGSizeZero, forcedSize) == NO) {
-    destinationWidth = (size_t)round(forcedSize.width);
-    destinationHeight = (size_t)round(forcedSize.height);
-  } else if (forceUpscaling == NO && (scaledSizeForImage.width * scaledSizeForImage.height) < (destinationWidth * destinationHeight)) {
-    destinationWidth = (size_t)round(scaledSizeForImage.width);
-    destinationHeight = (size_t)round(scaledSizeForImage.height);
-    if (destinationWidth == 0 || destinationHeight == 0) {
-      *outBackingSize = CGSizeZero;
-      *outDrawRect = CGRectZero;
-      return;
-    }
-  }
-
-  // Figure out the scaled size within the destination bounds.
-  CGFloat sourceImageAspectRatio = sourceImageSize.width / sourceImageSize.height;
-  CGSize scaledSizeForDestination = CGSizeMake(destinationWidth, destinationHeight);
-
-  if (cropToRectDimensions) {
-    scaledSizeForDestination = CGSizeMake(boundsSize.width / cropRect.size.width, boundsSize.height / cropRect.size.height);
-  } else {
-    if (contentMode == UIViewContentModeScaleAspectFill)
-      scaledSizeForDestination = _ASSizeFillWithAspectRatio(sourceImageAspectRatio, scaledSizeForDestination);
-    else if (contentMode == UIViewContentModeScaleAspectFit)
-      scaledSizeForDestination = _ASSizeFitWithAspectRatio(sourceImageAspectRatio, scaledSizeForDestination);
-  }
-
-  // Figure out the rectangle into which to draw the image.
-  CGRect drawRect = CGRectZero;
-  if (cropToRectDimensions) {
-    drawRect = CGRectMake(-cropRect.origin.x * scaledSizeForDestination.width,
-                          -cropRect.origin.y * scaledSizeForDestination.height,
-                          scaledSizeForDestination.width,
-                          scaledSizeForDestination.height);
-  } else {
-    // We want to obey the origin of cropRect in aspect-fill mode.
-    if (contentMode == UIViewContentModeScaleAspectFill) {
-      drawRect = CGRectMake(((destinationWidth - scaledSizeForDestination.width) * cropRect.origin.x),
-                            ((destinationHeight - scaledSizeForDestination.height) * cropRect.origin.y),
-                            scaledSizeForDestination.width,
-                            scaledSizeForDestination.height);
-
-    }
-    // And otherwise just center it.
-    else {
-      drawRect = CGRectMake(((destinationWidth - scaledSizeForDestination.width) / 2.0),
-                            ((destinationHeight - scaledSizeForDestination.height) / 2.0),
-                            scaledSizeForDestination.width,
-                            scaledSizeForDestination.height);
-    }
-  }
-
-  *outDrawRect = drawRect;
-  *outBackingSize = CGSizeMake(destinationWidth, destinationHeight);
-}
diff --git a/submodules/AsyncDisplayKit/Source/Private/ASImageNode+Private.h b/submodules/AsyncDisplayKit/Source/Private/ASImageNode+Private.h
deleted file mode 100644
index 8de78c8784..0000000000
--- a/submodules/AsyncDisplayKit/Source/Private/ASImageNode+Private.h
+++ /dev/null
@@ -1,17 +0,0 @@
-//
-//  ASImageNode+Private.h
-//  Texture
-//
-//  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.
-//  Changes after 4/13/2017 are: Copyright (c) Pinterest, Inc.  All rights reserved.
-//  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
-//
-
-#pragma once
-
-@interface ASImageNode (Private)
-
-- (void)_locked_setImage:(UIImage *)image;
-- (UIImage *)_locked_Image;
-
-@end
diff --git a/submodules/AsyncDisplayKit/Source/Private/ASLayerBackingTipProvider.h b/submodules/AsyncDisplayKit/Source/Private/ASLayerBackingTipProvider.h
deleted file mode 100644
index 0cc3d03b61..0000000000
--- a/submodules/AsyncDisplayKit/Source/Private/ASLayerBackingTipProvider.h
+++ /dev/null
@@ -1,24 +0,0 @@
-//
-//  ASLayerBackingTipProvider.h
-//  Texture
-//
-//  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.
-//  Changes after 4/13/2017 are: Copyright (c) Pinterest, Inc.  All rights reserved.
-//  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
-//
-
-#import "ASTipProvider.h"
-#import <AsyncDisplayKit/ASBaseDefines.h>
-
-#if AS_ENABLE_TIPS
-
-NS_ASSUME_NONNULL_BEGIN
-
-AS_SUBCLASSING_RESTRICTED
-@interface ASLayerBackingTipProvider : ASTipProvider
-
-@end
-
-NS_ASSUME_NONNULL_END
-
-#endif // AS_ENABLE_TIPS
diff --git a/submodules/AsyncDisplayKit/Source/Private/ASLayerBackingTipProvider.mm b/submodules/AsyncDisplayKit/Source/Private/ASLayerBackingTipProvider.mm
deleted file mode 100644
index 19d1850ab7..0000000000
--- a/submodules/AsyncDisplayKit/Source/Private/ASLayerBackingTipProvider.mm
+++ /dev/null
@@ -1,45 +0,0 @@
-//
-//  ASLayerBackingTipProvider.mm
-//  Texture
-//
-//  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.
-//  Changes after 4/13/2017 are: Copyright (c) Pinterest, Inc.  All rights reserved.
-//  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
-//
-
-#import "ASLayerBackingTipProvider.h"
-
-#if AS_ENABLE_TIPS
-
-#import <AsyncDisplayKit/ASCellNode.h>
-#import <AsyncDisplayKit/ASControlNode.h>
-#import <AsyncDisplayKit/ASDisplayNode.h>
-#import <AsyncDisplayKit/ASDisplayNodeExtras.h>
-#import <AsyncDisplayKit/ASTip.h>
-
-@implementation ASLayerBackingTipProvider
-
-- (ASTip *)tipForNode:(ASDisplayNode *)node
-{
-  // Already layer-backed.
-  if (node.layerBacked) {
-    return nil;
-  }
-
-  // TODO: Avoid revisiting nodes we already visited
-  ASDisplayNode *failNode = ASDisplayNodeFindFirstNode(node, ^BOOL(ASDisplayNode * _Nonnull node) {
-    return !node.supportsLayerBacking;
-  });
-  if (failNode != nil) {
-    return nil;
-  }
-
-  ASTip *result = [[ASTip alloc] initWithNode:node
-                                         kind:ASTipKindEnableLayerBacking
-                                       format:@"Enable layer backing to improve performance"];
-  return result;
-}
-
-@end
-
-#endif // AS_ENABLE_TIPS
diff --git a/submodules/AsyncDisplayKit/Source/Private/ASMutableElementMap.h b/submodules/AsyncDisplayKit/Source/Private/ASMutableElementMap.h
deleted file mode 100644
index ed4f0b5ff4..0000000000
--- a/submodules/AsyncDisplayKit/Source/Private/ASMutableElementMap.h
+++ /dev/null
@@ -1,66 +0,0 @@
-//
-//  ASMutableElementMap.h
-//  Texture
-//
-//  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.
-//  Changes after 4/13/2017 are: Copyright (c) Pinterest, Inc.  All rights reserved.
-//  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
-//
-
-#ifndef MINIMAL_ASDK
-
-#import <Foundation/Foundation.h>
-#import <AsyncDisplayKit/ASBaseDefines.h>
-#import <AsyncDisplayKit/ASElementMap.h>
-#import <AsyncDisplayKit/ASIntegerMap.h>
-
-NS_ASSUME_NONNULL_BEGIN
-
-@class ASSection, ASCollectionElement, _ASHierarchyChangeSet;
-
-/**
- * This mutable version will be removed in the future. It's only here now to keep the diff small
- * as we port data controller to use ASElementMap.
- */
-AS_SUBCLASSING_RESTRICTED
-@interface ASMutableElementMap : NSObject <NSCopying>
-
-- (instancetype)init __unavailable;
-
-- (instancetype)initWithSections:(NSArray<ASSection *> *)sections items:(ASCollectionElementTwoDimensionalArray *)items supplementaryElements:(ASSupplementaryElementDictionary *)supplementaryElements;
-
-- (void)insertSection:(ASSection *)section atIndex:(NSInteger)index;
-
-- (void)removeAllSections;
-
-/// Only modifies the array of ASSection * objects
-- (void)removeSectionsAtIndexes:(NSIndexSet *)indexes;
-
-- (void)removeAllElements;
-
-- (void)removeItemsAtIndexPaths:(NSArray<NSIndexPath *> *)indexPaths;
-
-- (void)removeSectionsOfItems:(NSIndexSet *)itemSections;
-
-- (void)removeSupplementaryElementsAtIndexPaths:(NSArray<NSIndexPath *> *)indexPaths kind:(NSString *)kind;
-
-- (void)insertEmptySectionsOfItemsAtIndexes:(NSIndexSet *)sections;
-
-- (void)insertElement:(ASCollectionElement *)element atIndexPath:(NSIndexPath *)indexPath;
-
-/**
- * Update the index paths for all supplementary elements to account for section-level
- * deletes, moves, inserts. This must be called before adding new supplementary elements.
- *
- * This also deletes any supplementary elements in deleted sections.
- */
-- (void)migrateSupplementaryElementsWithSectionMapping:(ASIntegerMap *)mapping;
-
-@end
-
-@interface ASElementMap (MutableCopying) <NSMutableCopying>
-@end
-
-NS_ASSUME_NONNULL_END
-
-#endif
diff --git a/submodules/AsyncDisplayKit/Source/Private/ASMutableElementMap.mm b/submodules/AsyncDisplayKit/Source/Private/ASMutableElementMap.mm
deleted file mode 100644
index 73798be119..0000000000
--- a/submodules/AsyncDisplayKit/Source/Private/ASMutableElementMap.mm
+++ /dev/null
@@ -1,149 +0,0 @@
-//
-//  ASMutableElementMap.mm
-//  Texture
-//
-//  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.
-//  Changes after 4/13/2017 are: Copyright (c) Pinterest, Inc.  All rights reserved.
-//  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
-//
-
-#ifndef MINIMAL_ASDK
-
-#import <AsyncDisplayKit/ASMutableElementMap.h>
-
-#import <AsyncDisplayKit/ASCollectionElement.h>
-#import <AsyncDisplayKit/ASDataController.h>
-#import <AsyncDisplayKit/ASElementMap.h>
-#import <AsyncDisplayKit/ASTwoDimensionalArrayUtils.h>
-#import <AsyncDisplayKit/NSIndexSet+ASHelpers.h>
-
-typedef NSMutableArray<NSMutableArray<ASCollectionElement *> *> ASMutableCollectionElementTwoDimensionalArray;
-
-typedef NSMutableDictionary<NSString *, NSMutableDictionary<NSIndexPath *, ASCollectionElement *> *> ASMutableSupplementaryElementDictionary;
-
-@implementation ASMutableElementMap {
-  ASMutableSupplementaryElementDictionary *_supplementaryElements;
-  NSMutableArray<ASSection *> *_sections;
-  ASMutableCollectionElementTwoDimensionalArray *_sectionsOfItems;
-}
-
-- (instancetype)initWithSections:(NSArray<ASSection *> *)sections items:(ASCollectionElementTwoDimensionalArray *)items supplementaryElements:(ASSupplementaryElementDictionary *)supplementaryElements
-{
-  if (self = [super init]) {
-    _sections = [sections mutableCopy];
-    _sectionsOfItems = (ASMutableCollectionElementTwoDimensionalArray *)ASTwoDimensionalArrayDeepMutableCopy(items);
-    _supplementaryElements = [ASMutableElementMap deepMutableCopyOfElementsDictionary:supplementaryElements];
-  }
-  return self;
-}
-
-- (id)copyWithZone:(NSZone *)zone
-{
-  return [[ASElementMap alloc] initWithSections:_sections items:_sectionsOfItems supplementaryElements:_supplementaryElements];
-}
-
-- (void)removeAllSections
-{
-  [_sections removeAllObjects];
-}
-
-- (void)insertSection:(ASSection *)section atIndex:(NSInteger)index
-{
-  [_sections insertObject:section atIndex:index];
-}
-
-- (void)removeItemsAtIndexPaths:(NSArray<NSIndexPath *> *)indexPaths
-{
-  ASDeleteElementsInTwoDimensionalArrayAtIndexPaths(_sectionsOfItems, indexPaths);
-}
-
-- (void)removeSectionsAtIndexes:(NSIndexSet *)indexes
-{
-  [_sections removeObjectsAtIndexes:indexes];
-}
-
-- (void)removeSupplementaryElementsAtIndexPaths:(NSArray<NSIndexPath *> *)indexPaths kind:(NSString *)kind
-{
-  [_supplementaryElements[kind] removeObjectsForKeys:indexPaths];
-}
-
-- (void)removeAllElements
-{
-  [_sectionsOfItems removeAllObjects];
-  [_supplementaryElements removeAllObjects];
-}
-
-- (void)removeSectionsOfItems:(NSIndexSet *)itemSections
-{
-  [_sectionsOfItems removeObjectsAtIndexes:itemSections];
-}
-
-- (void)insertEmptySectionsOfItemsAtIndexes:(NSIndexSet *)sections
-{
-  [sections enumerateIndexesUsingBlock:^(NSUInteger idx, BOOL * _Nonnull stop) {
-    [_sectionsOfItems insertObject:[[NSMutableArray alloc] init]  atIndex:idx];
-  }];
-}
-
-- (void)insertElement:(ASCollectionElement *)element atIndexPath:(NSIndexPath *)indexPath
-{
-  NSString *kind = element.supplementaryElementKind;
-  if (kind == nil) {
-    [_sectionsOfItems[indexPath.section] insertObject:element atIndex:indexPath.item];
-  } else {
-    NSMutableDictionary *supplementariesForKind = _supplementaryElements[kind];
-    if (supplementariesForKind == nil) {
-      supplementariesForKind = [[NSMutableDictionary alloc] init];
-      _supplementaryElements[kind] = supplementariesForKind;
-    }
-    supplementariesForKind[indexPath] = element;
-  }
-}
-
-- (void)migrateSupplementaryElementsWithSectionMapping:(ASIntegerMap *)mapping
-{
-  // Fast-path, no section changes.
-  if (mapping == ASIntegerMap.identityMap) {
-    return;
-  }
-
-  // For each element kind,
-  [_supplementaryElements enumerateKeysAndObjectsUsingBlock:^(NSString * _Nonnull key, NSMutableDictionary<NSIndexPath *,ASCollectionElement *> * _Nonnull supps, BOOL * _Nonnull stop) {
-    
-    // For each index path of that kind, move entries into a new dictionary.
-    // Note: it's tempting to update the dictionary in-place but because of the likely collision between old and new index paths,
-    // subtle bugs are possible. Note that this process is rare (only on section-level updates),
-    // that this work is done off-main, and that the typical supplementary element use case is just 1-per-section (header).
-    NSMutableDictionary *newSupps = [[NSMutableDictionary alloc] init];
-    [supps enumerateKeysAndObjectsUsingBlock:^(NSIndexPath * _Nonnull oldIndexPath, ASCollectionElement * _Nonnull obj, BOOL * _Nonnull stop) {
-      NSInteger oldSection = oldIndexPath.section;
-      NSInteger newSection = [mapping integerForKey:oldSection];
-      
-      if (oldSection == newSection) {
-        // Index path stayed the same, just copy it over.
-        newSupps[oldIndexPath] = obj;
-      } else if (newSection != NSNotFound) {
-        // Section index changed, move it.
-        NSIndexPath *newIndexPath = [NSIndexPath indexPathForItem:oldIndexPath.item inSection:newSection];
-        newSupps[newIndexPath] = obj;
-      }
-    }];
-    [supps setDictionary:newSupps];
-  }];
-}
-
-#pragma mark - Helpers
-
-+ (ASMutableSupplementaryElementDictionary *)deepMutableCopyOfElementsDictionary:(ASSupplementaryElementDictionary *)originalDict
-{
-  NSMutableDictionary *deepCopy = [[NSMutableDictionary alloc] initWithCapacity:originalDict.count];
-  [originalDict enumerateKeysAndObjectsUsingBlock:^(NSString * _Nonnull key, NSDictionary<NSIndexPath *,ASCollectionElement *> * _Nonnull obj, BOOL * _Nonnull stop) {
-    deepCopy[key] = [obj mutableCopy];
-  }];
-  
-  return deepCopy;
-}
-
-@end
-
-#endif
diff --git a/submodules/AsyncDisplayKit/Source/Private/ASNetworkImageLoadInfo+Private.h b/submodules/AsyncDisplayKit/Source/Private/ASNetworkImageLoadInfo+Private.h
deleted file mode 100644
index 36e423b535..0000000000
--- a/submodules/AsyncDisplayKit/Source/Private/ASNetworkImageLoadInfo+Private.h
+++ /dev/null
@@ -1,22 +0,0 @@
-//
-//  ASNetworkImageLoadInfo+Private.h
-//  Texture
-//
-//  Copyright (c) Pinterest, Inc.  All rights reserved.
-//  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
-//
-
-#import <AsyncDisplayKit/ASNetworkImageLoadInfo.h>
-
-NS_ASSUME_NONNULL_BEGIN
-
-@interface ASNetworkImageLoadInfo ()
-
-- (instancetype)initWithURL:(NSURL *)url
-                 sourceType:(ASNetworkImageSourceType)sourceType
-         downloadIdentifier:(nullable id)downloadIdentifier
-                   userInfo:(nullable id)userInfo;
-
-@end
-
-NS_ASSUME_NONNULL_END
diff --git a/submodules/AsyncDisplayKit/Source/Private/ASSection.h b/submodules/AsyncDisplayKit/Source/Private/ASSection.h
deleted file mode 100644
index 92b6a17170..0000000000
--- a/submodules/AsyncDisplayKit/Source/Private/ASSection.h
+++ /dev/null
@@ -1,40 +0,0 @@
-//
-//  ASSection.h
-//  Texture
-//
-//  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.
-//  Changes after 4/13/2017 are: Copyright (c) Pinterest, Inc.  All rights reserved.
-//  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
-//
-
-#ifndef MINIMAL_ASDK
-
-#import <Foundation/Foundation.h>
-#import <AsyncDisplayKit/ASBaseDefines.h>
-
-@protocol ASSectionContext;
-
-NS_ASSUME_NONNULL_BEGIN
-
-/**
- * An object representing the metadata for a section of elements in a collection.
- *
- * Its sectionID is namespaced to the data controller that created the section.
- *
- * These are useful for tracking the movement & lifetime of sections, independent of
- * their contents.
- */
-AS_SUBCLASSING_RESTRICTED
-@interface ASSection : NSObject
-
-@property (readonly) NSInteger sectionID;
-@property (nullable, readonly) id<ASSectionContext> context;
-
-- (instancetype)init NS_UNAVAILABLE;
-- (instancetype)initWithSectionID:(NSInteger)sectionID context:(nullable id<ASSectionContext>)context NS_DESIGNATED_INITIALIZER;
-
-@end
-
-NS_ASSUME_NONNULL_END
-
-#endif
diff --git a/submodules/AsyncDisplayKit/Source/Private/ASSection.mm b/submodules/AsyncDisplayKit/Source/Private/ASSection.mm
deleted file mode 100644
index a151774bd4..0000000000
--- a/submodules/AsyncDisplayKit/Source/Private/ASSection.mm
+++ /dev/null
@@ -1,29 +0,0 @@
-//
-//  ASSection.mm
-//  Texture
-//
-//  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.
-//  Changes after 4/13/2017 are: Copyright (c) Pinterest, Inc.  All rights reserved.
-//  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
-//
-
-#ifndef MINIMAL_ASDK
-
-#import <AsyncDisplayKit/ASSection.h>
-#import <AsyncDisplayKit/ASSectionContext.h>
-
-@implementation ASSection
-
-- (instancetype)initWithSectionID:(NSInteger)sectionID context:(id<ASSectionContext>)context
-{
-  self = [super init];
-  if (self) {
-    _sectionID = sectionID;
-    _context = context;
-  }
-  return self;
-}
-
-@end
-
-#endif
diff --git a/submodules/AsyncDisplayKit/Source/Private/ASTableView+Undeprecated.h b/submodules/AsyncDisplayKit/Source/Private/ASTableView+Undeprecated.h
deleted file mode 100644
index 46c54368a6..0000000000
--- a/submodules/AsyncDisplayKit/Source/Private/ASTableView+Undeprecated.h
+++ /dev/null
@@ -1,298 +0,0 @@
-//
-//  ASTableView+Undeprecated.h
-//  Texture
-//
-//  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.
-//  Changes after 4/13/2017 are: Copyright (c) Pinterest, Inc.  All rights reserved.
-//  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
-//
-
-#import <Foundation/Foundation.h>
-#import <UIKit/UIKit.h>
-#import <AsyncDisplayKit/ASTableNode.h>
-#import <AsyncDisplayKit/ASLayoutRangeType.h>
-
-NS_ASSUME_NONNULL_BEGIN
-
-/**
- * Currently our public table API is on @c ASTableNode and the @c ASTableView
- * API is deprecated, but the implementations still live in the view.
- *
- * This category lets us avoid deprecation warnings everywhere internally.
- * In the future, the ASTableView public API will be eliminated and so will this file.
- */
-@interface ASTableView (Undeprecated)
-
-@property (nullable, nonatomic, weak) id<ASTableDelegate>   asyncDelegate;
-@property (nullable, nonatomic, weak) id<ASTableDataSource> asyncDataSource;
-@property (nonatomic) UIEdgeInsets contentInset;
-@property (nonatomic) CGPoint contentOffset;
-@property (nonatomic) BOOL automaticallyAdjustsContentOffset;
-@property (nonatomic) BOOL inverted;
-@property (nullable, nonatomic, readonly) NSArray<NSIndexPath *> *indexPathsForVisibleRows;
-@property (nullable, nonatomic, readonly) NSArray<NSIndexPath *> *indexPathsForSelectedRows;
-@property (nullable, nonatomic, readonly) NSIndexPath *indexPathForSelectedRow;
-
-/**
- * The number of screens left to scroll before the delegate -tableView:beginBatchFetchingWithContext: is called.
- *
- * Defaults to two screenfuls.
- */
-@property (nonatomic) CGFloat leadingScreensForBatching;
-
-/**
- * Initializer.
- *
- * @param frame A rectangle specifying the initial location and size of the table view in its superview’€™s coordinates.
- * The frame of the table view changes as table cells are added and deleted.
- *
- * @param style A constant that specifies the style of the table view. See UITableViewStyle for descriptions of valid constants.
- */
-- (instancetype)initWithFrame:(CGRect)frame style:(UITableViewStyle)style;
-
-/**
- * Tuning parameters for a range type in full mode.
- *
- * @param rangeType The range type to get the tuning parameters for.
- *
- * @return A tuning parameter value for the given range type in full mode.
- *
- * @see ASLayoutRangeMode
- * @see ASLayoutRangeType
- */
-- (ASRangeTuningParameters)tuningParametersForRangeType:(ASLayoutRangeType)rangeType AS_WARN_UNUSED_RESULT;
-
-/**
- * Set the tuning parameters for a range type in full mode.
- *
- * @param tuningParameters The tuning parameters to store for a range type.
- * @param rangeType The range type to set the tuning parameters for.
- *
- * @see ASLayoutRangeMode
- * @see ASLayoutRangeType
- */
-- (void)setTuningParameters:(ASRangeTuningParameters)tuningParameters forRangeType:(ASLayoutRangeType)rangeType;
-
-/**
- * Tuning parameters for a range type in the specified mode.
- *
- * @param rangeMode The range mode to get the running parameters for.
- * @param rangeType The range type to get the tuning parameters for.
- *
- * @return A tuning parameter value for the given range type in the given mode.
- *
- * @see ASLayoutRangeMode
- * @see ASLayoutRangeType
- */
-- (ASRangeTuningParameters)tuningParametersForRangeMode:(ASLayoutRangeMode)rangeMode rangeType:(ASLayoutRangeType)rangeType AS_WARN_UNUSED_RESULT;
-
-/**
- * Set the tuning parameters for a range type in the specified mode.
- *
- * @param tuningParameters The tuning parameters to store for a range type.
- * @param rangeMode The range mode to set the running parameters for.
- * @param rangeType The range type to set the tuning parameters for.
- *
- * @see ASLayoutRangeMode
- * @see ASLayoutRangeType
- */
-- (void)setTuningParameters:(ASRangeTuningParameters)tuningParameters forRangeMode:(ASLayoutRangeMode)rangeMode rangeType:(ASLayoutRangeType)rangeType;
-
-- (nullable __kindof UITableViewCell *)cellForRowAtIndexPath:(NSIndexPath *)indexPath;
-
-/**
- * Scrolls the table to the given row.
- *
- * @param indexPath The index path of the row.
- * @param scrollPosition Where the row should end up after the scroll.
- * @param animated Whether the scroll should be animated or not.
- */
-- (void)scrollToRowAtIndexPath:(NSIndexPath *)indexPath atScrollPosition:(UITableViewScrollPosition)scrollPosition animated:(BOOL)animated;
-
-- (void)selectRowAtIndexPath:(NSIndexPath *)indexPath animated:(BOOL)animated scrollPosition:(UITableViewScrollPosition)scrollPosition;
-
-- (nullable NSIndexPath *)indexPathForRowAtPoint:(CGPoint)point;
-
-- (nullable NSArray<NSIndexPath *> *)indexPathsForRowsInRect:(CGRect)rect;
-
-/**
- * Similar to -visibleCells.
- *
- * @return an array containing the cell nodes being displayed on screen.
- */
-- (NSArray<ASCellNode *> *)visibleNodes AS_WARN_UNUSED_RESULT;
-
-/**
- * Similar to -indexPathForCell:.
- *
- * @param cellNode a cellNode part of the table view
- *
- * @return an indexPath for this cellNode
- */
-- (nullable NSIndexPath *)indexPathForNode:(ASCellNode *)cellNode AS_WARN_UNUSED_RESULT;
-
-/**
- * Reload everything from scratch, destroying the working range and all cached nodes.
- *
- * @param completion block to run on completion of asynchronous loading or nil. If supplied, the block is run on
- * the main thread.
- * @warning This method is substantially more expensive than UITableView's version.
- */
--(void)reloadDataWithCompletion:(void (^ _Nullable)(void))completion;
-
-/**
- * Reload everything from scratch, destroying the working range and all cached nodes.
- *
- * @warning This method is substantially more expensive than UITableView's version.
- */
-- (void)reloadData;
-
-/**
- * Triggers a relayout of all nodes.
- *
- * @discussion This method invalidates and lays out every cell node in the table view.
- */
-- (void)relayoutItems;
-
-/**
- *  Begins a series of method calls that insert, delete, select, or reload rows and sections of the table view, with animation enabled and no completion block.
- *
- *  @discussion You call this method to bracket a series of method calls that ends with endUpdates and that consists of operations
- *  to insert, delete, select, and reload rows and sections of the table view. When you call endUpdates, ASTableView begins animating
- *  the operations simultaneously. It's important to remember that the ASTableView will be processing the updates asynchronously after this call is completed.
- *
- *  @warning This method must be called from the main thread.
- */
-- (void)beginUpdates;
-
-/**
- *  Concludes a series of method calls that insert, delete, select, or reload rows and sections of the table view, with animation enabled and no completion block.
- *
- *  @discussion You call this method to bracket a series of method calls that begins with beginUpdates and that consists of operations
- *  to insert, delete, select, and reload rows and sections of the table view. When you call endUpdates, ASTableView begins animating
- *  the operations simultaneously. It's important to remember that the ASTableView will be processing the updates asynchronously after this call is completed.
- *
- *  @warning This method is must be called from the main thread.
- */
-- (void)endUpdates;
-
-/**
- *  Concludes a series of method calls that insert, delete, select, or reload rows and sections of the table view.
- *  You call this method to bracket a series of method calls that begins with beginUpdates and that consists of operations
- *  to insert, delete, select, and reload rows and sections of the table view. When you call endUpdates, ASTableView begins animating
- *  the operations simultaneously. This method is must be called from the main thread. It's important to remember that the ASTableView will
- *  be processing the updates asynchronously after this call and are not guaranteed to be reflected in the ASTableView until
- *  the completion block is executed.
- *
- *  @param animated   NO to disable all animations.
- *  @param completion A completion handler block to execute when all of the operations are finished. This block takes a single
- *                    Boolean parameter that contains the value YES if all of the related animations completed successfully or
- *                    NO if they were interrupted. This parameter may be nil. If supplied, the block is run on the main thread.
- */
-- (void)endUpdatesAnimated:(BOOL)animated completion:(void (^ _Nullable)(BOOL completed))completion;
-
-/**
- *  Blocks execution of the main thread until all section and row updates are committed. This method must be called from the main thread.
- */
-- (void)waitUntilAllUpdatesAreCommitted;
-
-/**
- * Inserts one or more sections, with an option to animate the insertion.
- *
- * @param sections An index set that specifies the sections to insert.
- *
- * @param animation A constant that indicates how the insertion is to be animated. See UITableViewRowAnimation.
- *
- * @discussion This method must be called from the main thread. The asyncDataSource must be updated to reflect the changes
- * before this method is called.
- */
-- (void)insertSections:(NSIndexSet *)sections withRowAnimation:(UITableViewRowAnimation)animation;
-
-/**
- * Deletes one or more sections, with an option to animate the deletion.
- *
- * @param sections An index set that specifies the sections to delete.
- *
- * @param animation A constant that indicates how the deletion is to be animated. See UITableViewRowAnimation.
- *
- * @discussion This method must be called from the main thread. The asyncDataSource must be updated to reflect the changes
- * before this method is called.
- */
-- (void)deleteSections:(NSIndexSet *)sections withRowAnimation:(UITableViewRowAnimation)animation;
-
-/**
- * Reloads the specified sections using a given animation effect.
- *
- * @param sections An index set that specifies the sections to reload.
- *
- * @param animation A constant that indicates how the reloading is to be animated. See UITableViewRowAnimation.
- *
- * @discussion This method must be called from the main thread. The asyncDataSource must be updated to reflect the changes
- * before this method is called.
- */
-- (void)reloadSections:(NSIndexSet *)sections withRowAnimation:(UITableViewRowAnimation)animation;
-
-/**
- * Moves a section to a new location.
- *
- * @param section The index of the section to move.
- *
- * @param newSection The index that is the destination of the move for the section.
- *
- * @discussion This method must be called from the main thread. The asyncDataSource must be updated to reflect the changes
- * before this method is called.
- */
-- (void)moveSection:(NSInteger)section toSection:(NSInteger)newSection;
-
-/**
- * Inserts rows at the locations identified by an array of index paths, with an option to animate the insertion.
- *
- * @param indexPaths An array of NSIndexPath objects, each representing a row index and section index that together identify a row.
- *
- * @param animation A constant that indicates how the insertion is to be animated. See UITableViewRowAnimation.
- *
- * @discussion This method must be called from the main thread. The asyncDataSource must be updated to reflect the changes
- * before this method is called.
- */
-- (void)insertRowsAtIndexPaths:(NSArray<NSIndexPath *> *)indexPaths withRowAnimation:(UITableViewRowAnimation)animation;
-
-/**
- * Deletes the rows specified by an array of index paths, with an option to animate the deletion.
- *
- * @param indexPaths An array of NSIndexPath objects identifying the rows to delete.
- *
- * @param animation A constant that indicates how the deletion is to be animated. See UITableViewRowAnimation.
- *
- * @discussion This method must be called from the main thread. The asyncDataSource must be updated to reflect the changes
- * before this method is called.
- */
-- (void)deleteRowsAtIndexPaths:(NSArray<NSIndexPath *> *)indexPaths withRowAnimation:(UITableViewRowAnimation)animation;
-
-/**
- * Reloads the specified rows using a given animation effect.
- *
- * @param indexPaths An array of NSIndexPath objects identifying the rows to reload.
- *
- * @param animation A constant that indicates how the reloading is to be animated. See UITableViewRowAnimation.
- *
- * @discussion This method must be called from the main thread. The asyncDataSource must be updated to reflect the changes
- * before this method is called.
- */
-- (void)reloadRowsAtIndexPaths:(NSArray<NSIndexPath *> *)indexPaths withRowAnimation:(UITableViewRowAnimation)animation;
-
-/**
- * Moves the row at a specified location to a destination location.
- *
- * @param indexPath The index path identifying the row to move.
- *
- * @param newIndexPath The index path that is the destination of the move for the row.
- *
- * @discussion This method must be called from the main thread. The asyncDataSource must be updated to reflect the changes
- * before this method is called.
- */
-- (void)moveRowAtIndexPath:(NSIndexPath *)indexPath toIndexPath:(NSIndexPath *)newIndexPath;
-
-- (void)setContentOffset:(CGPoint)contentOffset animated:(BOOL)animated;
-
-@end
-NS_ASSUME_NONNULL_END
diff --git a/submodules/AsyncDisplayKit/Source/Private/ASTip.h b/submodules/AsyncDisplayKit/Source/Private/ASTip.h
deleted file mode 100644
index 5ac6ac18bc..0000000000
--- a/submodules/AsyncDisplayKit/Source/Private/ASTip.h
+++ /dev/null
@@ -1,49 +0,0 @@
-//
-//  ASTip.h
-//  Texture
-//
-//  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.
-//  Changes after 4/13/2017 are: Copyright (c) Pinterest, Inc.  All rights reserved.
-//  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
-//
-
-#import <Foundation/Foundation.h>
-#import <AsyncDisplayKit/ASBaseDefines.h>
-
-#if AS_ENABLE_TIPS
-
-NS_ASSUME_NONNULL_BEGIN
-
-@class ASDisplayNode;
-
-typedef NS_ENUM (NSInteger, ASTipKind) {
-  ASTipKindEnableLayerBacking
-};
-
-AS_SUBCLASSING_RESTRICTED
-@interface ASTip : NSObject
-
-- (instancetype)initWithNode:(ASDisplayNode *)node
-                        kind:(ASTipKind)kind
-                      format:(NSString *)format, ... NS_FORMAT_FUNCTION(3, 4);
-
-/**
- * The kind of tip this is.
- */
-@property (nonatomic, readonly) ASTipKind kind;
-
-/**
- * The node that this tip applies to.
- */
-@property (nonatomic, readonly) ASDisplayNode *node;
-
-/**
- * The text to show the user.
- */
-@property (nonatomic, readonly) NSString *text;
-
-@end
-
-NS_ASSUME_NONNULL_END
-
-#endif // AS_ENABLE_TIPS
diff --git a/submodules/AsyncDisplayKit/Source/Private/ASTip.mm b/submodules/AsyncDisplayKit/Source/Private/ASTip.mm
deleted file mode 100644
index af1d299221..0000000000
--- a/submodules/AsyncDisplayKit/Source/Private/ASTip.mm
+++ /dev/null
@@ -1,35 +0,0 @@
-//
-//  ASTip.mm
-//  Texture
-//
-//  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.
-//  Changes after 4/13/2017 are: Copyright (c) Pinterest, Inc.  All rights reserved.
-//  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
-//
-
-#import <AsyncDisplayKit/ASTip.h>
-
-#if AS_ENABLE_TIPS
-
-#import <AsyncDisplayKit/ASDisplayNode.h>
-
-@implementation ASTip
-
-- (instancetype)initWithNode:(ASDisplayNode *)node
-                        kind:(ASTipKind)kind
-                      format:(NSString *)format, ...
-{
-  if (self = [super init]) {
-    _node = node;
-    _kind = kind;
-    va_list args;
-    va_start(args, format);
-    _text = [[NSString alloc] initWithFormat:format arguments:args];
-    va_end(args);
-  }
-  return self;
-}
-
-@end
-
-#endif // AS_ENABLE_TIPS
diff --git a/submodules/AsyncDisplayKit/Source/Private/ASTipNode.h b/submodules/AsyncDisplayKit/Source/Private/ASTipNode.h
deleted file mode 100644
index d01637d869..0000000000
--- a/submodules/AsyncDisplayKit/Source/Private/ASTipNode.h
+++ /dev/null
@@ -1,39 +0,0 @@
-//
-//  ASTipNode.h
-//  Texture
-//
-//  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.
-//  Changes after 4/13/2017 are: Copyright (c) Pinterest, Inc.  All rights reserved.
-//  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
-//
-
-#import <AsyncDisplayKit/ASControlNode.h>
-#import <AsyncDisplayKit/ASBaseDefines.h>
-
-#if AS_ENABLE_TIPS
-
-@class ASTip;
-
-NS_ASSUME_NONNULL_BEGIN
-
-/**
- * ASTipNode will send these up the responder chain.
- */
-@protocol ASTipNodeActions <NSObject>
-- (void)didTapTipNode:(id)sender;
-@end
-
-AS_SUBCLASSING_RESTRICTED
-@interface ASTipNode : ASControlNode
-
-- (instancetype)initWithTip:(ASTip *)tip NS_DESIGNATED_INITIALIZER;
-
-- (instancetype)init NS_UNAVAILABLE;
-
-@property (nonatomic, readonly) ASTip *tip;
-
-@end
-
-NS_ASSUME_NONNULL_END
-
-#endif // AS_ENABLE_TIPS
diff --git a/submodules/AsyncDisplayKit/Source/Private/ASTipNode.mm b/submodules/AsyncDisplayKit/Source/Private/ASTipNode.mm
deleted file mode 100644
index dcca908b8a..0000000000
--- a/submodules/AsyncDisplayKit/Source/Private/ASTipNode.mm
+++ /dev/null
@@ -1,28 +0,0 @@
-//
-//  ASTipNode.mm
-//  Texture
-//
-//  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.
-//  Changes after 4/13/2017 are: Copyright (c) Pinterest, Inc.  All rights reserved.
-//  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
-//
-
-#import "ASTipNode.h"
-
-#if AS_ENABLE_TIPS
-
-@implementation ASTipNode
-
-- (instancetype)initWithTip:(ASTip *)tip
-{
-  if (self = [super init]) {
-    self.backgroundColor = [UIColor colorWithRed:0 green:0.7 blue:0.2 alpha:0.3];
-    _tip = tip;
-    [self addTarget:nil action:@selector(didTapTipNode:) forControlEvents:ASControlNodeEventTouchUpInside];
-  }
-  return self;
-}
-
-@end
-
-#endif // AS_ENABLE_TIPS
diff --git a/submodules/AsyncDisplayKit/Source/Private/ASTipProvider.h b/submodules/AsyncDisplayKit/Source/Private/ASTipProvider.h
deleted file mode 100644
index e2aba6c5d9..0000000000
--- a/submodules/AsyncDisplayKit/Source/Private/ASTipProvider.h
+++ /dev/null
@@ -1,42 +0,0 @@
-//
-//  ASTipProvider.h
-//  Texture
-//
-//  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.
-//  Changes after 4/13/2017 are: Copyright (c) Pinterest, Inc.  All rights reserved.
-//  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
-//
-
-#import <Foundation/Foundation.h>
-#import <AsyncDisplayKit/ASBaseDefines.h>
-
-#if AS_ENABLE_TIPS
-
-@class ASDisplayNode, ASTip;
-
-NS_ASSUME_NONNULL_BEGIN
-
-/**
- * An abstract superclass for all tip providers.
- */
-@interface ASTipProvider : NSObject
-
-/**
- * The provider looks at the node's current situation and
- * generates a tip, if any, to add to the node.
- *
- * Subclasses must override this.
- */
-- (nullable ASTip *)tipForNode:(ASDisplayNode *)node;
-
-@end
-
-@interface ASTipProvider (Lookup)
-
-@property (class, nonatomic, copy, readonly) NSArray<__kindof ASTipProvider *> *all;
-
-@end
-
-NS_ASSUME_NONNULL_END
-
-#endif // AS_ENABLE_TIPS
diff --git a/submodules/AsyncDisplayKit/Source/Private/ASTipProvider.mm b/submodules/AsyncDisplayKit/Source/Private/ASTipProvider.mm
deleted file mode 100644
index 237e83cda0..0000000000
--- a/submodules/AsyncDisplayKit/Source/Private/ASTipProvider.mm
+++ /dev/null
@@ -1,43 +0,0 @@
-//
-//  ASTipProvider.mm
-//  Texture
-//
-//  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.
-//  Changes after 4/13/2017 are: Copyright (c) Pinterest, Inc.  All rights reserved.
-//  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
-//
-
-#import <AsyncDisplayKit/ASTipProvider.h>
-
-#if AS_ENABLE_TIPS
-
-#import <AsyncDisplayKit/ASAssert.h>
-
-// Concrete classes
-#import <AsyncDisplayKit/ASLayerBackingTipProvider.h>
-
-@implementation ASTipProvider
-
-- (ASTip *)tipForNode:(ASDisplayNode *)node
-{
-  ASDisplayNodeFailAssert(@"Subclasses must override %@", NSStringFromSelector(_cmd));
-  return nil;
-}
-
-@end
-
-@implementation ASTipProvider (Lookup)
-
-+ (NSArray<ASTipProvider *> *)all
-{
-  static NSArray<ASTipProvider *> *providers;
-  static dispatch_once_t onceToken;
-  dispatch_once(&onceToken, ^{
-    providers = @[ [ASLayerBackingTipProvider new] ];
-  });
-  return providers;
-}
-
-@end
-
-#endif // AS_ENABLE_TIPS
diff --git a/submodules/AsyncDisplayKit/Source/Private/ASTipsController.h b/submodules/AsyncDisplayKit/Source/Private/ASTipsController.h
deleted file mode 100644
index fceeb92f60..0000000000
--- a/submodules/AsyncDisplayKit/Source/Private/ASTipsController.h
+++ /dev/null
@@ -1,40 +0,0 @@
-//
-//  ASTipsController.h
-//  Texture
-//
-//  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.
-//  Changes after 4/13/2017 are: Copyright (c) Pinterest, Inc.  All rights reserved.
-//  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
-//
-
-#import <Foundation/Foundation.h>
-#import <AsyncDisplayKit/ASBaseDefines.h>
-
-#if AS_ENABLE_TIPS
-
-@class ASDisplayNode;
-
-NS_ASSUME_NONNULL_BEGIN
-
-AS_SUBCLASSING_RESTRICTED
-@interface ASTipsController : NSObject
-
-/**
- * The shared tip controller instance.
- */
-@property (class, readonly) ASTipsController *shared;
-
-#pragma mark - Node Event Hooks
-
-/**
- * Informs the controller that the sender did enter the visible range.
- *
- * The controller will run a pass with its tip providers, adding tips as needed.
- */
-- (void)nodeDidAppear:(ASDisplayNode *)node;
-
-@end
-
-NS_ASSUME_NONNULL_END
-
-#endif // AS_ENABLE_TIPS
diff --git a/submodules/AsyncDisplayKit/Source/Private/ASTipsController.mm b/submodules/AsyncDisplayKit/Source/Private/ASTipsController.mm
deleted file mode 100644
index acc592130c..0000000000
--- a/submodules/AsyncDisplayKit/Source/Private/ASTipsController.mm
+++ /dev/null
@@ -1,185 +0,0 @@
-//
-//  ASTipsController.mm
-//  Texture
-//
-//  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.
-//  Changes after 4/13/2017 are: Copyright (c) Pinterest, Inc.  All rights reserved.
-//  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
-//
-
-#import <AsyncDisplayKit/ASTipsController.h>
-
-#if AS_ENABLE_TIPS
-
-#import <AsyncDisplayKit/ASDisplayNodeTipState.h>
-#import <AsyncDisplayKit/AsyncDisplayKit+Tips.h>
-#import <AsyncDisplayKit/ASTipNode.h>
-#import <AsyncDisplayKit/ASTipProvider.h>
-#import <AsyncDisplayKit/ASTipsWindow.h>
-#import <AsyncDisplayKit/ASDisplayNodeExtras.h>
-
-@interface ASTipsController ()
-
-/// Nil on init, updates to most recent visible window.
-@property (nonatomic) UIWindow *appVisibleWindow;
-
-/// Nil until an application window has become visible.
-@property (nonatomic) ASTipsWindow *tipWindow;
-
-/// Main-thread-only.
-@property (nonatomic, readonly) NSMapTable<ASDisplayNode *, ASDisplayNodeTipState *> *nodeToTipStates;
-
-@property (nonatomic) NSMutableArray<ASDisplayNode *> *nodesThatAppearedDuringRunLoop;
-
-@end
-
-@implementation ASTipsController
-
-#pragma mark - Singleton
-
-+ (void)load
-{
-  [NSNotificationCenter.defaultCenter addObserver:self.shared
-                                         selector:@selector(windowDidBecomeVisibleWithNotification:)
-                                             name:UIWindowDidBecomeVisibleNotification
-                                           object:nil];
-}
-
-+ (ASTipsController *)shared
-{
-  static ASTipsController *ctrl;
-  static dispatch_once_t onceToken;
-  dispatch_once(&onceToken, ^{
-    ctrl = [[ASTipsController alloc] init];
-  });
-  return ctrl;
-}
-
-#pragma mark - Lifecycle
-
-- (instancetype)init
-{
-  ASDisplayNodeAssertMainThread();
-  if (self = [super init]) {
-    _nodeToTipStates = [NSMapTable mapTableWithKeyOptions:(NSPointerFunctionsWeakMemory | NSPointerFunctionsObjectPointerPersonality) valueOptions:NSPointerFunctionsStrongMemory];
-    _nodesThatAppearedDuringRunLoop = [NSMutableArray array];
-  }
-  return self;
-}
-
-#pragma mark - Event Handling
-
-- (void)nodeDidAppear:(ASDisplayNode *)node
-{
-  ASDisplayNodeAssertMainThread();
-  // If they disabled tips on this class, bail.
-  if (![[node class] enableTips]) {
-    return;
-  }
-
-  // If this node appeared in some other window (like our tips window) ignore it.
-  if (ASFindWindowOfLayer(node.layer) != self.appVisibleWindow) {
-    return;
-  }
-
-  [_nodesThatAppearedDuringRunLoop addObject:node];
-}
-
-// If this is a main window, start watching it and clear out our tip window.
-- (void)windowDidBecomeVisibleWithNotification:(NSNotification *)notification
-{
-  ASDisplayNodeAssertMainThread();
-  UIWindow *window = notification.object;
-
-  // If this is the same window we're already watching, bail.
-  if (window == self.appVisibleWindow) {
-    return;
-  }
-
-  // Ignore windows that are not at the normal level or have empty bounds
-  if (window.windowLevel != UIWindowLevelNormal || CGRectIsEmpty(window.bounds)) {
-    return;
-  }
-
-  self.appVisibleWindow = window;
-
-  // Create the tip window if needed.
-  [self createTipWindowIfNeededWithFrame:window.bounds];
-
-  // Clear out our tip window and reset our states.
-  self.tipWindow.mainWindow = window;
-  [_nodeToTipStates removeAllObjects];
-}
-
-- (void)runLoopDidTick
-{
-  NSArray *nodes = [_nodesThatAppearedDuringRunLoop copy];
-  [_nodesThatAppearedDuringRunLoop removeAllObjects];
-
-  // Go through the old array, removing any that have tips but aren't still visible.
-  for (ASDisplayNode *node in [_nodeToTipStates copy]) {
-    if (!node.visible) {
-      [_nodeToTipStates removeObjectForKey:node];
-    }
-  }
-
-  for (ASDisplayNode *node in nodes) {
-    // Get the tip state for the node.
-    ASDisplayNodeTipState *tipState = [_nodeToTipStates objectForKey:node];
-
-    // If the node already has a tip, bail. This could change.
-    if (tipState.tipNode != nil) {
-      return;
-    }
-
-    for (ASTipProvider *provider in ASTipProvider.all) {
-      ASTip *tip = [provider tipForNode:node];
-      if (!tip) { continue; }
-
-      if (!tipState) {
-        tipState = [self createTipStateForNode:node];
-      }
-      tipState.tipNode = [[ASTipNode alloc] initWithTip:tip];
-    }
-  }
-  self.tipWindow.nodeToTipStates = _nodeToTipStates;
-  [self.tipWindow setNeedsLayout];
-}
-
-#pragma mark - Internal
-
-- (void)createTipWindowIfNeededWithFrame:(CGRect)tipWindowFrame
-{
-  // Lots of property accesses, but simple safe code, only run once.
-  if (self.tipWindow == nil) {
-    self.tipWindow = [[ASTipsWindow alloc] initWithFrame:tipWindowFrame];
-    self.tipWindow.hidden = NO;
-    [self setupRunLoopObserver];
-  }
-}
-
-/**
- * In order to keep the UI updated, the tips controller registers a run loop observer.
- * Before the transaction commit happens, the tips controller calls -setNeedsLayout
- * on the view controller's view. It will then layout the main window, and then update the frames
- * for tip nodes accordingly.
- */
-- (void)setupRunLoopObserver
-{
-  CFRunLoopObserverRef o = CFRunLoopObserverCreateWithHandler(kCFAllocatorDefault, kCFRunLoopBeforeWaiting, true, 0, ^(CFRunLoopObserverRef observer, CFRunLoopActivity activity) {
-    [self runLoopDidTick];
-  });
-  CFRunLoopAddObserver(CFRunLoopGetMain(), o, kCFRunLoopCommonModes);
-}
-
-- (ASDisplayNodeTipState *)createTipStateForNode:(ASDisplayNode *)node
-{
-  ASDisplayNodeAssertMainThread();
-  ASDisplayNodeTipState *tipState = [[ASDisplayNodeTipState alloc] initWithNode:node];
-  [_nodeToTipStates setObject:tipState forKey:node];
-  return tipState;
-}
-
-@end
-
-#endif // AS_ENABLE_TIPS
diff --git a/submodules/AsyncDisplayKit/Source/Private/ASTipsWindow.h b/submodules/AsyncDisplayKit/Source/Private/ASTipsWindow.h
deleted file mode 100644
index fab52510fc..0000000000
--- a/submodules/AsyncDisplayKit/Source/Private/ASTipsWindow.h
+++ /dev/null
@@ -1,36 +0,0 @@
-//
-//  ASTipsWindow.h
-//  Texture
-//
-//  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.
-//  Changes after 4/13/2017 are: Copyright (c) Pinterest, Inc.  All rights reserved.
-//  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
-//
-
-#import <AsyncDisplayKit/ASViewController.h>
-#import <AsyncDisplayKit/ASBaseDefines.h>
-
-#if AS_ENABLE_TIPS
-
-@class ASDisplayNode, ASDisplayNodeTipState;
-
-NS_ASSUME_NONNULL_BEGIN
-
-/**
- * A window that shows tips. This was originally meant to be a view controller
- * but UIKit will not manage view controllers in non-key windows correctly AT ALL
- * as of the time of this writing.
- */
-AS_SUBCLASSING_RESTRICTED
-@interface ASTipsWindow : UIWindow
-
-/// The main application window that the tips are tracking.
-@property (nonatomic, weak) UIWindow *mainWindow;
-
-@property (nonatomic, copy, nullable) NSMapTable<ASDisplayNode *, ASDisplayNodeTipState *> *nodeToTipStates;
-
-@end
-
-NS_ASSUME_NONNULL_END
-
-#endif
diff --git a/submodules/AsyncDisplayKit/Source/Private/ASTipsWindow.mm b/submodules/AsyncDisplayKit/Source/Private/ASTipsWindow.mm
deleted file mode 100644
index 010932613a..0000000000
--- a/submodules/AsyncDisplayKit/Source/Private/ASTipsWindow.mm
+++ /dev/null
@@ -1,98 +0,0 @@
-//
-//  ASTipsWindow.mm
-//  Texture
-//
-//  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.
-//  Changes after 4/13/2017 are: Copyright (c) Pinterest, Inc.  All rights reserved.
-//  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
-//
-
-#import <AsyncDisplayKit/ASTipsWindow.h>
-#if AS_ENABLE_TIPS
-
-#import <AsyncDisplayKit/ASDisplayNodeTipState.h>
-#import <AsyncDisplayKit/ASTipNode.h>
-#import <AsyncDisplayKit/ASTip.h>
-#import <AsyncDisplayKit/AsyncDisplayKit+Tips.h>
-
-@interface ASTipsWindow ()
-@property (nonatomic, readonly) ASDisplayNode *node;
-@end
-
-@implementation ASTipsWindow
-
-- (instancetype)initWithFrame:(CGRect)frame
-{
-  if (self = [super initWithFrame:frame]) {
-    /**
-     * UIKit throws an exception if you don't add a root view controller to a window,
-     * but if the window isn't key, then it doesn't manage the root view controller correctly!
-     *
-     * So we set a dummy root view controller and hide it.
-     */
-    self.rootViewController = [UIViewController new];
-    self.rootViewController.view.hidden = YES;
-
-    _node = [[ASDisplayNode alloc] init];
-    [self addSubnode:_node];
-
-    self.windowLevel = UIWindowLevelNormal + 1;
-    self.opaque = NO;
-  }
-  return self;
-}
-
-- (UIView *)hitTest:(CGPoint)point withEvent:(UIEvent *)event
-{
-  UIView *result = [super hitTest:point withEvent:event];
-  // Ignore touches unless they hit one of my node's subnodes
-  if (result == _node.view) {
-    return nil;
-  }
-  return result;
-}
-
-- (void)setMainWindow:(UIWindow *)mainWindow
-{
-  _mainWindow = mainWindow;
-  for (ASDisplayNode *node in _node.subnodes) {
-    [node removeFromSupernode];
-  }
-}
-
-- (void)didTapTipNode:(ASTipNode *)tipNode
-{
-  ASDisplayNode.tipDisplayBlock(tipNode.tip.node, tipNode.tip.text);
-}
-
-- (void)layoutSubviews
-{
-  [super layoutSubviews];
-  _node.frame = self.bounds;
-  
-  // Ensure the main window is laid out first.
-  [self.mainWindow layoutIfNeeded];
-  
-  NSMutableSet *tipNodesToRemove = [NSMutableSet setWithArray:_node.subnodes];
-  for (ASDisplayNodeTipState *tipState in [_nodeToTipStates objectEnumerator]) {
-    ASDisplayNode *node = tipState.node;
-    ASTipNode *tipNode = tipState.tipNode;
-    [tipNodesToRemove removeObject:tipNode];
-    CGRect rect = node.bounds;
-    rect = [node.view convertRect:rect toView:nil];
-    rect = [self convertRect:rect fromView:nil];
-    tipNode.frame = rect;
-    if (tipNode.supernode != _node) {
-      [_node addSubnode:tipNode];
-    }
-  }
-  
-  // Clean up any tip nodes whose target nodes have disappeared.
-  for (ASTipNode *tipNode in tipNodesToRemove) {
-    [tipNode removeFromSupernode];
-  }
-}
-
-@end
-
-#endif // AS_ENABLE_TIPS
diff --git a/submodules/AsyncDisplayKit/Source/Private/ASTwoDimensionalArrayUtils.h b/submodules/AsyncDisplayKit/Source/Private/ASTwoDimensionalArrayUtils.h
deleted file mode 100644
index 6a3c9bb5ce..0000000000
--- a/submodules/AsyncDisplayKit/Source/Private/ASTwoDimensionalArrayUtils.h
+++ /dev/null
@@ -1,46 +0,0 @@
-//
-//  ASTwoDimensionalArrayUtils.h
-//  Texture
-//
-//  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.
-//  Changes after 4/13/2017 are: Copyright (c) Pinterest, Inc.  All rights reserved.
-//  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
-//
-
-#import <Foundation/Foundation.h>
-
-#import <AsyncDisplayKit/ASBaseDefines.h>
-
-NS_ASSUME_NONNULL_BEGIN
-
-/**
- * Helper functions for two-dimensional array, where the objects of the root array are each arrays.
- */
-
-/**
- * Deep mutable copy of an array that contains arrays, which contain objects.  It will go one level deep into the array to copy.
- * This method is substantially faster than the generalized version, e.g. about 10x faster, so use it whenever it fits the need.
- */
-AS_EXTERN NSMutableArray<NSMutableArray *> *ASTwoDimensionalArrayDeepMutableCopy(NSArray<NSArray *> *array) AS_WARN_UNUSED_RESULT;
-
-/**
- * Delete the elements of the mutable two-dimensional array at given index paths – sorted in descending order!
- */
-AS_EXTERN void ASDeleteElementsInTwoDimensionalArrayAtIndexPaths(NSMutableArray *mutableArray, NSArray<NSIndexPath *> *indexPaths);
-
-/**
- * Return all the index paths of a two-dimensional array, in ascending order.
- */
-AS_EXTERN NSArray<NSIndexPath *> *ASIndexPathsForTwoDimensionalArray(NSArray<NSArray *>* twoDimensionalArray) AS_WARN_UNUSED_RESULT;
-
-/**
- * Return all the elements of a two-dimensional array, in ascending order.
- */
-AS_EXTERN NSArray *ASElementsInTwoDimensionalArray(NSArray<NSArray *>* twoDimensionalArray) AS_WARN_UNUSED_RESULT;
-
-/**
- * Attempt to get the object at the given index path. Returns @c nil if the index path is out of bounds.
- */
-AS_EXTERN id _Nullable ASGetElementInTwoDimensionalArray(NSArray<NSArray *> *array, NSIndexPath *indexPath) AS_WARN_UNUSED_RESULT;
-
-NS_ASSUME_NONNULL_END
diff --git a/submodules/AsyncDisplayKit/Source/Private/ASTwoDimensionalArrayUtils.mm b/submodules/AsyncDisplayKit/Source/Private/ASTwoDimensionalArrayUtils.mm
deleted file mode 100644
index 67267b7a94..0000000000
--- a/submodules/AsyncDisplayKit/Source/Private/ASTwoDimensionalArrayUtils.mm
+++ /dev/null
@@ -1,122 +0,0 @@
-//
-//  ASTwoDimensionalArrayUtils.mm
-//  Texture
-//
-//  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.
-//  Changes after 4/13/2017 are: Copyright (c) Pinterest, Inc.  All rights reserved.
-//  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
-//
-
-#import <AsyncDisplayKit/ASAssert.h>
-#import <AsyncDisplayKit/ASCollections.h>
-#import <AsyncDisplayKit/ASInternalHelpers.h>
-#import <AsyncDisplayKit/ASTwoDimensionalArrayUtils.h>
-
-#import <vector>
-
-// Import UIKit to get [NSIndexPath indexPathForItem:inSection:] which uses
-// tagged pointers.
-#import <UIKit/UIKit.h>
-
-#pragma mark - Public Methods
-
-NSMutableArray<NSMutableArray *> *ASTwoDimensionalArrayDeepMutableCopy(NSArray<NSArray *> *array)
-{
-  NSMutableArray *newArray = [NSMutableArray arrayWithCapacity:array.count];
-  NSInteger i = 0;
-  for (NSArray *subarray in array) {
-    ASDisplayNodeCAssert([subarray isKindOfClass:[NSArray class]], @"This function expects NSArray<NSArray *> *");
-    newArray[i++] = [subarray mutableCopy];
-  }
-  return newArray;
-}
-
-void ASDeleteElementsInTwoDimensionalArrayAtIndexPaths(NSMutableArray *mutableArray, NSArray<NSIndexPath *> *indexPaths)
-{
-  if (indexPaths.count == 0) {
-    return;
-  }
-
-#if ASDISPLAYNODE_ASSERTIONS_ENABLED
-  NSArray *sortedIndexPaths = [indexPaths sortedArrayUsingSelector:@selector(asdk_inverseCompare:)];
-  ASDisplayNodeCAssert([sortedIndexPaths isEqualToArray:indexPaths], @"Expected array of index paths to be sorted in descending order.");
-#endif
-
-  /**
-   * It is tempting to do something clever here and collect indexes into ranges or NSIndexSets
-   * but deep down, __NSArrayM only implements removeObjectAtIndex: and so doing all that extra
-   * work ends up running the same code.
-   */
-  for (NSIndexPath *indexPath in indexPaths) {
-    NSInteger section = indexPath.section;
-    if (section >= mutableArray.count) {
-      ASDisplayNodeCFailAssert(@"Invalid section index %ld – only %ld sections", (long)section, (long)mutableArray.count);
-      continue;
-    }
-
-    NSMutableArray *subarray = mutableArray[section];
-    NSInteger item = indexPath.item;
-    if (item >= subarray.count) {
-      ASDisplayNodeCFailAssert(@"Invalid item index %ld – only %ld items in section %ld", (long)item, (long)subarray.count, (long)section);
-      continue;
-    }
-    [subarray removeObjectAtIndex:item];
-  }
-}
-
-NSArray<NSIndexPath *> *ASIndexPathsForTwoDimensionalArray(NSArray <NSArray *>* twoDimensionalArray)
-{
-  NSInteger sectionCount = twoDimensionalArray.count;
-  NSInteger counts[sectionCount];
-  NSInteger totalCount = 0;
-  NSInteger i = 0;
-  for (NSArray *subarray in twoDimensionalArray) {
-    NSInteger count = subarray.count;
-    counts[i++] = count;
-    totalCount += count;
-  }
-  
-  // Count could be huge. Use a reserved vector rather than VLA (stack.)
-  std::vector<NSIndexPath *> indexPaths;
-  indexPaths.reserve(totalCount);
-  for (NSInteger i = 0; i < sectionCount; i++) {
-    for (NSInteger j = 0; j < counts[i]; j++) {
-      indexPaths.push_back([NSIndexPath indexPathForItem:j inSection:i]);
-    }
-  }
-  return [NSArray arrayByTransferring:indexPaths.data() count:totalCount];
-}
-
-NSArray *ASElementsInTwoDimensionalArray(NSArray <NSArray *>* twoDimensionalArray)
-{
-  NSInteger totalCount = 0;
-  for (NSArray *subarray in twoDimensionalArray) {
-    totalCount += subarray.count;
-  }
-  
-  std::vector<id> elements;
-  elements.reserve(totalCount);
-  for (NSArray *subarray in twoDimensionalArray) {
-    for (id object in subarray) {
-      elements.push_back(object);
-    }
-  }
-  return [NSArray arrayByTransferring:elements.data() count:totalCount];
-}
-
-id ASGetElementInTwoDimensionalArray(NSArray *array, NSIndexPath *indexPath)
-{
-  ASDisplayNodeCAssertNotNil(indexPath, @"Expected non-nil index path");
-  ASDisplayNodeCAssert(indexPath.length == 2, @"Expected index path of length 2. Index path: %@", indexPath);
-  NSInteger section = indexPath.section;
-  if (array.count <= section) {
-    return nil;
-  }
-
-  NSArray *innerArray = array[section];
-  NSInteger item = indexPath.item;
-  if (innerArray.count <= item) {
-    return nil;
-  }
-  return innerArray[item];
-}
diff --git a/submodules/AsyncDisplayKit/Source/Private/Layout/ASStackLayoutSpecUtilities.h b/submodules/AsyncDisplayKit/Source/Private/Layout/ASStackLayoutSpecUtilities.h
deleted file mode 100644
index 6c708e0408..0000000000
--- a/submodules/AsyncDisplayKit/Source/Private/Layout/ASStackLayoutSpecUtilities.h
+++ /dev/null
@@ -1,135 +0,0 @@
-//
-//  ASStackLayoutSpecUtilities.h
-//  Texture
-//
-//  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.
-//  Changes after 4/13/2017 are: Copyright (c) Pinterest, Inc.  All rights reserved.
-//  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
-//
-
-#import <AsyncDisplayKit/ASStackLayoutSpec.h>
-
-typedef struct {
-  ASStackLayoutDirection direction;
-  CGFloat spacing;
-  ASStackLayoutJustifyContent justifyContent;
-  ASStackLayoutAlignItems alignItems;
-  ASStackLayoutFlexWrap flexWrap;
-  ASStackLayoutAlignContent alignContent;
-  CGFloat lineSpacing;
-} ASStackLayoutSpecStyle;
-
-inline CGFloat stackDimension(const ASStackLayoutDirection direction, const CGSize size)
-{
-  return (direction == ASStackLayoutDirectionVertical) ? size.height : size.width;
-}
-
-inline CGFloat crossDimension(const ASStackLayoutDirection direction, const CGSize size)
-{
-  return (direction == ASStackLayoutDirectionVertical) ? size.width : size.height;
-}
-
-inline BOOL compareCrossDimension(const ASStackLayoutDirection direction, const CGSize a, const CGSize b)
-{
-  return crossDimension(direction, a) < crossDimension(direction, b);
-}
-
-inline CGPoint directionPoint(const ASStackLayoutDirection direction, const CGFloat stack, const CGFloat cross)
-{
-  return (direction == ASStackLayoutDirectionVertical) ? CGPointMake(cross, stack) : CGPointMake(stack, cross);
-}
-
-inline CGSize directionSize(const ASStackLayoutDirection direction, const CGFloat stack, const CGFloat cross)
-{
-  return (direction == ASStackLayoutDirectionVertical) ? CGSizeMake(cross, stack) : CGSizeMake(stack, cross);
-}
-
-inline void setStackValueToPoint(const ASStackLayoutDirection direction, const CGFloat stack, CGPoint &point) {
-  (direction == ASStackLayoutDirectionVertical) ? (point.y = stack) : (point.x = stack);
-}
-
-inline ASSizeRange directionSizeRange(const ASStackLayoutDirection direction,
-                                      const CGFloat stackMin,
-                                      const CGFloat stackMax,
-                                      const CGFloat crossMin,
-                                      const CGFloat crossMax)
-{
-  return {directionSize(direction, stackMin, crossMin), directionSize(direction, stackMax, crossMax)};
-}
-
-inline ASStackLayoutAlignItems alignment(ASStackLayoutAlignSelf childAlignment, ASStackLayoutAlignItems stackAlignment)
-{
-  switch (childAlignment) {
-    case ASStackLayoutAlignSelfCenter:
-      return ASStackLayoutAlignItemsCenter;
-    case ASStackLayoutAlignSelfEnd:
-      return ASStackLayoutAlignItemsEnd;
-    case ASStackLayoutAlignSelfStart:
-      return ASStackLayoutAlignItemsStart;
-    case ASStackLayoutAlignSelfStretch:
-      return ASStackLayoutAlignItemsStretch;
-    case ASStackLayoutAlignSelfAuto:
-    default:
-      return stackAlignment;
-  }
-}
-
-inline ASStackLayoutAlignItems alignment(ASHorizontalAlignment alignment, ASStackLayoutAlignItems defaultAlignment)
-{
-  switch (alignment) {
-    case ASHorizontalAlignmentLeft:
-      return ASStackLayoutAlignItemsStart;
-    case ASHorizontalAlignmentMiddle:
-      return ASStackLayoutAlignItemsCenter;
-    case ASHorizontalAlignmentRight:
-      return ASStackLayoutAlignItemsEnd;
-    case ASHorizontalAlignmentNone:
-    default:
-      return defaultAlignment;
-  }
-}
-
-inline ASStackLayoutAlignItems alignment(ASVerticalAlignment alignment, ASStackLayoutAlignItems defaultAlignment)
-{
-  switch (alignment) {
-    case ASVerticalAlignmentTop:
-      return ASStackLayoutAlignItemsStart;
-    case ASVerticalAlignmentCenter:
-      return ASStackLayoutAlignItemsCenter;
-    case ASVerticalAlignmentBottom:
-      return ASStackLayoutAlignItemsEnd;
-    case ASVerticalAlignmentNone:
-    default:
-      return defaultAlignment;
-  }
-}
-
-inline ASStackLayoutJustifyContent justifyContent(ASHorizontalAlignment alignment, ASStackLayoutJustifyContent defaultJustifyContent)
-{
-  switch (alignment) {
-    case ASHorizontalAlignmentLeft:
-      return ASStackLayoutJustifyContentStart;
-    case ASHorizontalAlignmentMiddle:
-      return ASStackLayoutJustifyContentCenter;
-    case ASHorizontalAlignmentRight:
-      return ASStackLayoutJustifyContentEnd;
-    case ASHorizontalAlignmentNone:
-    default:
-      return defaultJustifyContent;
-  }
-}
-
-inline ASStackLayoutJustifyContent justifyContent(ASVerticalAlignment alignment, ASStackLayoutJustifyContent defaultJustifyContent)
-{
-  switch (alignment) {
-    case ASVerticalAlignmentTop:
-      return ASStackLayoutJustifyContentStart;
-    case ASVerticalAlignmentCenter:
-      return ASStackLayoutJustifyContentCenter;
-    case ASVerticalAlignmentBottom:
-      return ASStackLayoutJustifyContentEnd;
-    case ASVerticalAlignmentNone:
-    default:
-      return defaultJustifyContent;
-  }
-}
diff --git a/submodules/AsyncDisplayKit/Source/Private/Layout/ASStackPositionedLayout.h b/submodules/AsyncDisplayKit/Source/Private/Layout/ASStackPositionedLayout.h
deleted file mode 100644
index 103ec3a280..0000000000
--- a/submodules/AsyncDisplayKit/Source/Private/Layout/ASStackPositionedLayout.h
+++ /dev/null
@@ -1,24 +0,0 @@
-//
-//  ASStackPositionedLayout.h
-//  Texture
-//
-//  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.
-//  Changes after 4/13/2017 are: Copyright (c) Pinterest, Inc.  All rights reserved.
-//  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
-//
-
-#import <AsyncDisplayKit/ASLayout.h>
-#import <AsyncDisplayKit/ASDimension.h>
-#import <AsyncDisplayKit/ASStackUnpositionedLayout.h>
-
-/** Represents a set of laid out and positioned stack layout children. */
-struct ASStackPositionedLayout {
-  const std::vector<ASStackLayoutSpecItem> items;
-  /** Final size of the stack */
-  const CGSize size;
-  
-  /** Given an unpositioned layout, computes the positions each child should be placed at. */
-  static ASStackPositionedLayout compute(const ASStackUnpositionedLayout &unpositionedLayout,
-                                         const ASStackLayoutSpecStyle &style,
-                                         const ASSizeRange &constrainedSize);
-};
diff --git a/submodules/AsyncDisplayKit/Source/Private/Layout/ASStackPositionedLayout.mm b/submodules/AsyncDisplayKit/Source/Private/Layout/ASStackPositionedLayout.mm
deleted file mode 100644
index 727db5d2dd..0000000000
--- a/submodules/AsyncDisplayKit/Source/Private/Layout/ASStackPositionedLayout.mm
+++ /dev/null
@@ -1,186 +0,0 @@
-//
-//  ASStackPositionedLayout.mm
-//  Texture
-//
-//  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.
-//  Changes after 4/13/2017 are: Copyright (c) Pinterest, Inc.  All rights reserved.
-//  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
-//
-
-#import <AsyncDisplayKit/ASStackPositionedLayout.h>
-
-#import <tgmath.h>
-#import <numeric>
-
-#import <AsyncDisplayKit/ASDimension.h>
-#import <AsyncDisplayKit/ASInternalHelpers.h>
-#import <AsyncDisplayKit/ASLayoutSpecUtilities.h>
-#import <AsyncDisplayKit/ASLayoutSpec+Subclasses.h>
-
-static CGFloat crossOffsetForItem(const ASStackLayoutSpecItem &item,
-                                  const ASStackLayoutSpecStyle &style,
-                                  const CGFloat crossSize,
-                                  const CGFloat baseline)
-{
-  switch (alignment(item.child.style.alignSelf, style.alignItems)) {
-    case ASStackLayoutAlignItemsEnd:
-      return crossSize - crossDimension(style.direction, item.layout.size);
-    case ASStackLayoutAlignItemsCenter:
-      return ASFloorPixelValue((crossSize - crossDimension(style.direction, item.layout.size)) / 2);
-    case ASStackLayoutAlignItemsBaselineFirst:
-    case ASStackLayoutAlignItemsBaselineLast:
-      return baseline - ASStackUnpositionedLayout::baselineForItem(style, item);
-    case ASStackLayoutAlignItemsStart:
-    case ASStackLayoutAlignItemsStretch:
-    case ASStackLayoutAlignItemsNotSet:
-      return 0;
-  }
-}
-
-static void crossOffsetAndSpacingForEachLine(const std::size_t numOfLines,
-                                             const CGFloat crossViolation,
-                                             ASStackLayoutAlignContent alignContent,
-                                             CGFloat &offset,
-                                             CGFloat &spacing)
-{
-  ASDisplayNodeCAssertTrue(numOfLines > 0);
-  
-  // Handle edge cases
-  if (alignContent == ASStackLayoutAlignContentSpaceBetween && (crossViolation < kViolationEpsilon || numOfLines == 1)) {
-    alignContent = ASStackLayoutAlignContentStart;
-  } else if (alignContent == ASStackLayoutAlignContentSpaceAround && (crossViolation < kViolationEpsilon || numOfLines == 1)) {
-    alignContent = ASStackLayoutAlignContentCenter;
-  }
-  
-  offset = 0;
-  spacing = 0;
-  
-  switch (alignContent) {
-    case ASStackLayoutAlignContentCenter:
-      offset = crossViolation / 2;
-      break;
-    case ASStackLayoutAlignContentEnd:
-      offset = crossViolation;
-      break;
-    case ASStackLayoutAlignContentSpaceBetween:
-      // Spacing between the items, no spaces at the edges, evenly distributed
-      spacing = crossViolation / (numOfLines - 1);
-      break;
-    case ASStackLayoutAlignContentSpaceAround: {
-      // Spacing between items are twice the spacing on the edges
-      CGFloat spacingUnit = crossViolation / (numOfLines * 2);
-      offset = spacingUnit;
-      spacing = spacingUnit * 2;
-      break;
-    }
-    case ASStackLayoutAlignContentStart:
-    case ASStackLayoutAlignContentStretch:
-      break;
-  }
-}
-
-static void stackOffsetAndSpacingForEachItem(const std::size_t numOfItems,
-                                             const CGFloat stackViolation,
-                                             ASStackLayoutJustifyContent justifyContent,
-                                             CGFloat &offset,
-                                             CGFloat &spacing)
-{
-  ASDisplayNodeCAssertTrue(numOfItems > 0);
-  
-  // Handle edge cases
-  if (justifyContent == ASStackLayoutJustifyContentSpaceBetween && (stackViolation < kViolationEpsilon || numOfItems == 1)) {
-    justifyContent = ASStackLayoutJustifyContentStart;
-  } else if (justifyContent == ASStackLayoutJustifyContentSpaceAround && (stackViolation < kViolationEpsilon || numOfItems == 1)) {
-    justifyContent = ASStackLayoutJustifyContentCenter;
-  }
-  
-  offset = 0;
-  spacing = 0;
-  
-  switch (justifyContent) {
-    case ASStackLayoutJustifyContentCenter:
-      offset = stackViolation / 2;
-      break;
-    case ASStackLayoutJustifyContentEnd:
-      offset = stackViolation;
-      break;
-    case ASStackLayoutJustifyContentSpaceBetween:
-      // Spacing between the items, no spaces at the edges, evenly distributed
-      spacing = stackViolation / (numOfItems - 1);
-      break;
-    case ASStackLayoutJustifyContentSpaceAround: {
-      // Spacing between items are twice the spacing on the edges
-      CGFloat spacingUnit = stackViolation / (numOfItems * 2);
-      offset = spacingUnit;
-      spacing = spacingUnit * 2;
-      break;
-    }
-    case ASStackLayoutJustifyContentStart:
-      break;
-  }
-}
-
-static void positionItemsInLine(const ASStackUnpositionedLine &line,
-                                const ASStackLayoutSpecStyle &style,
-                                const CGPoint &startingPoint,
-                                const CGFloat stackSpacing)
-{
-  CGPoint p = startingPoint;
-  BOOL first = YES;
-  
-  for (const auto &item : line.items) {
-    p = p + directionPoint(style.direction, item.child.style.spacingBefore, 0);
-    if (!first) {
-      p = p + directionPoint(style.direction, style.spacing + stackSpacing, 0);
-    }
-    first = NO;
-    item.layout.position = p + directionPoint(style.direction, 0, crossOffsetForItem(item, style, line.crossSize, line.baseline));
-    
-    p = p + directionPoint(style.direction, stackDimension(style.direction, item.layout.size) + item.child.style.spacingAfter, 0);
-  }
-}
-
-ASStackPositionedLayout ASStackPositionedLayout::compute(const ASStackUnpositionedLayout &layout,
-                                                         const ASStackLayoutSpecStyle &style,
-                                                         const ASSizeRange &sizeRange)
-{
-  const auto &lines = layout.lines;
-  if (lines.empty()) {
-    return {};
-  }
-  
-  const auto numOfLines = lines.size();
-  const auto direction = style.direction;
-  const auto alignContent = style.alignContent;
-  const auto lineSpacing = style.lineSpacing;
-  const auto justifyContent = style.justifyContent;
-  const auto crossViolation = ASStackUnpositionedLayout::computeCrossViolation(layout.crossDimensionSum, style, sizeRange);
-  CGFloat crossOffset;
-  CGFloat crossSpacing;
-  crossOffsetAndSpacingForEachLine(numOfLines, crossViolation, alignContent, crossOffset, crossSpacing);
-  
-  std::vector<ASStackLayoutSpecItem> positionedItems;
-  CGPoint p = directionPoint(direction, 0, crossOffset);
-  BOOL first = YES;
-  for (const auto &line : lines) {
-    if (!first) {
-      p = p + directionPoint(direction, 0, crossSpacing + lineSpacing);
-    }
-    first = NO;
-    
-    const auto &items = line.items;
-    const auto stackViolation = ASStackUnpositionedLayout::computeStackViolation(line.stackDimensionSum, style, sizeRange);
-    CGFloat stackOffset;
-    CGFloat stackSpacing;
-    stackOffsetAndSpacingForEachItem(items.size(), stackViolation, justifyContent, stackOffset, stackSpacing);
-    
-    setStackValueToPoint(direction, stackOffset, p);
-    positionItemsInLine(line, style, p, stackSpacing);
-    std::move(items.begin(), items.end(), std::back_inserter(positionedItems));
-    
-    p = p + directionPoint(direction, -stackOffset, line.crossSize);
-  }
-
-  const CGSize finalSize = directionSize(direction, layout.stackDimensionSum, layout.crossDimensionSum);
-  return {std::move(positionedItems), ASSizeRangeClamp(sizeRange, finalSize)};
-}
diff --git a/submodules/AsyncDisplayKit/Source/Private/Layout/ASStackUnpositionedLayout.h b/submodules/AsyncDisplayKit/Source/Private/Layout/ASStackUnpositionedLayout.h
deleted file mode 100644
index 989b4c2f11..0000000000
--- a/submodules/AsyncDisplayKit/Source/Private/Layout/ASStackUnpositionedLayout.h
+++ /dev/null
@@ -1,73 +0,0 @@
-//
-//  ASStackUnpositionedLayout.h
-//  Texture
-//
-//  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.
-//  Changes after 4/13/2017 are: Copyright (c) Pinterest, Inc.  All rights reserved.
-//  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
-//
-
-#import <vector>
-
-#import <AsyncDisplayKit/ASLayout.h>
-#import <AsyncDisplayKit/ASStackLayoutSpecUtilities.h>
-#import <AsyncDisplayKit/ASStackLayoutSpec.h>
-
-/** The threshold that determines if a violation has actually occurred. */
-AS_EXTERN CGFloat const kViolationEpsilon;
-
-struct ASStackLayoutSpecChild {
-  /** The original source child. */
-  id<ASLayoutElement> element;
-  /** Style object of element. */
-  ASLayoutElementStyle *style;
-  /** Size object of the element */
-  ASLayoutElementSize size;
-};
-
-struct ASStackLayoutSpecItem {
-  /** The original source child. */
-  ASStackLayoutSpecChild child;
-  /** The proposed layout or nil if no is calculated yet. */
-  ASLayout *layout;
-};
-
-struct ASStackUnpositionedLine {
-  /** The set of proposed children in this line, each contains child layout, not yet positioned. */
-  std::vector<ASStackLayoutSpecItem> items;
-  /** The total size of the children in the stack dimension, including all spacing. */
-  CGFloat stackDimensionSum;
-  /** The size in the cross dimension */
-  CGFloat crossSize;
-  /** The baseline of the stack which baseline aligned children should align to */
-  CGFloat baseline;
-};
-
-/** Represents a set of stack layout children that have their final layout computed, but are not yet positioned. */
-struct ASStackUnpositionedLayout {
-  /** The set of proposed lines, each contains child layouts, not yet positioned. */
-  const std::vector<ASStackUnpositionedLine> lines;
-  /** 
-   * In a single line stack (e.g no wrao), this is the total size of the children in the stack dimension, including all spacing.
-   * In a multi-line stack, this is the largest stack dimension among lines.
-   */
-  const CGFloat stackDimensionSum;
-  const CGFloat crossDimensionSum;
-  
-  /** Given a set of children, computes the unpositioned layouts for those children. */
-  static ASStackUnpositionedLayout compute(const std::vector<ASStackLayoutSpecChild> &children,
-                                           const ASStackLayoutSpecStyle &style,
-                                           const ASSizeRange &sizeRange,
-                                           const BOOL concurrent);
-  
-  static CGFloat baselineForItem(const ASStackLayoutSpecStyle &style,
-                                 const ASStackLayoutSpecItem &l);
-  
-  static CGFloat computeStackViolation(const CGFloat stackDimensionSum,
-                                       const ASStackLayoutSpecStyle &style,
-                                       const ASSizeRange &sizeRange);
-
-  static CGFloat computeCrossViolation(const CGFloat crossDimensionSum,
-                                       const ASStackLayoutSpecStyle &style,
-                                       const ASSizeRange &sizeRange);
-};
diff --git a/submodules/AsyncDisplayKit/Source/Private/Layout/ASStackUnpositionedLayout.mm b/submodules/AsyncDisplayKit/Source/Private/Layout/ASStackUnpositionedLayout.mm
deleted file mode 100644
index 47141a7f7b..0000000000
--- a/submodules/AsyncDisplayKit/Source/Private/Layout/ASStackUnpositionedLayout.mm
+++ /dev/null
@@ -1,758 +0,0 @@
-//
-//  ASStackUnpositionedLayout.mm
-//  Texture
-//
-//  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.
-//  Changes after 4/13/2017 are: Copyright (c) Pinterest, Inc.  All rights reserved.
-//  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
-//
-
-#import <AsyncDisplayKit/ASStackUnpositionedLayout.h>
-
-#import <tgmath.h>
-#import <numeric>
-
-#import <AsyncDisplayKit/ASDispatch.h>
-#import <AsyncDisplayKit/ASLayoutSpecUtilities.h>
-#import <AsyncDisplayKit/ASLayoutElementStylePrivate.h>
-
-CGFloat const kViolationEpsilon = 0.01;
-
-static CGFloat resolveCrossDimensionMaxForStretchChild(const ASStackLayoutSpecStyle &style,
-                                                       const ASStackLayoutSpecChild &child,
-                                                       const CGFloat stackMax,
-                                                       const CGFloat crossMax)
-{
-  // stretched children may have a cross direction max that is smaller than the minimum size constraint of the parent.
-  const CGFloat computedMax = (style.direction == ASStackLayoutDirectionVertical ?
-                               ASLayoutElementSizeResolve(child.style.size, ASLayoutElementParentSizeUndefined).max.width :
-                               ASLayoutElementSizeResolve(child.style.size, ASLayoutElementParentSizeUndefined).max.height);
-  return computedMax == INFINITY ? crossMax : computedMax;
-}
-
-static CGFloat resolveCrossDimensionMinForStretchChild(const ASStackLayoutSpecStyle &style,
-                                                       const ASStackLayoutSpecChild &child,
-                                                       const CGFloat stackMax,
-                                                       const CGFloat crossMin)
-{
-  // stretched children will have a cross dimension of at least crossMin, unless they explicitly define a child size
-  // that is smaller than the constraint of the parent.
-  return (style.direction == ASStackLayoutDirectionVertical ?
-          ASLayoutElementSizeResolve(child.style.size, ASLayoutElementParentSizeUndefined).min.width :
-          ASLayoutElementSizeResolve(child.style.size, ASLayoutElementParentSizeUndefined).min.height) ?: crossMin;
-}
-
-/**
- Sizes the child given the parameters specified, and returns the computed layout.
- */
-static ASLayout *crossChildLayout(const ASStackLayoutSpecChild &child,
-                                  const ASStackLayoutSpecStyle &style,
-                                  const CGFloat stackMin,
-                                  const CGFloat stackMax,
-                                  const CGFloat crossMin,
-                                  const CGFloat crossMax,
-                                  const CGSize parentSize)
-{
-  const ASStackLayoutAlignItems alignItems = alignment(child.style.alignSelf, style.alignItems);
-  // stretched children will have a cross dimension of at least crossMin
-  const CGFloat childCrossMin = (alignItems == ASStackLayoutAlignItemsStretch ?
-                                 resolveCrossDimensionMinForStretchChild(style, child, stackMax, crossMin) :
-                                 0);
-  const CGFloat childCrossMax = (alignItems == ASStackLayoutAlignItemsStretch ?
-                                 resolveCrossDimensionMaxForStretchChild(style, child, stackMax, crossMax) :
-                                 crossMax);
-  const ASSizeRange childSizeRange = directionSizeRange(style.direction, stackMin, stackMax, childCrossMin, childCrossMax);
-  ASLayout *layout = [child.element layoutThatFits:childSizeRange parentSize:parentSize];
-  ASDisplayNodeCAssertNotNil(layout, @"ASLayout returned from -layoutThatFits:parentSize: must not be nil: %@", child.element);
-  return layout ? : [ASLayout layoutWithLayoutElement:child.element size:{0, 0}];
-}
-
-static void dispatchApplyIfNeeded(size_t iterationCount, BOOL forced, void(^work)(size_t i))
-{
-  if (iterationCount == 0) {
-    return;
-  }
-  
-  if (iterationCount == 1) {
-    work(0);
-    return;
-  }
-  
-  // TODO Once the locking situation in ASDisplayNode has improved, always dispatch if on main
-  if (forced == NO) {
-    for (size_t i = 0; i < iterationCount; i++) {
-      work(i);
-    }
-    return;
-  }
-  
-  dispatch_queue_t queue = dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0);
-  ASDispatchApply(iterationCount, queue, 0, work);
-}
-
-/**
- Computes the consumed cross dimension length for the given vector of lines and stacking style.
- 
-          Cross Dimension
-          +--------------------->
-          +--------+ +--------+ +--------+ +---------+
- Vertical |Vertical| |Vertical| |Vertical| |Vertical |
- Stack    | Line 1 | | Line 2 | | Line 3 | | Line 4  |
-          |        | |        | |        | |         |
-          +--------+ +--------+ +--------+ +---------+
-                      crossDimensionSum
-          |------------------------------------------|
-
- @param lines unpositioned lines
- */
-static CGFloat computeLinesCrossDimensionSum(const std::vector<ASStackUnpositionedLine> &lines,
-                                             const ASStackLayoutSpecStyle &style)
-{
-  return std::accumulate(lines.begin(), lines.end(),
-                         // Start from default spacing between each line:
-                         lines.empty() ? 0 : style.lineSpacing * (lines.size() - 1),
-                         [&](CGFloat x, const ASStackUnpositionedLine &l) {
-                           return x + l.crossSize;
-                         });
-}
-
-
-/**
- Computes the violation by comparing a cross dimension sum with the overall allowable size range for the stack.
- 
- Violation is the distance you would have to add to the unbounded cross-direction length of the stack spec's
- lines in order to bring the stack within its allowed sizeRange.  The diagram below shows 3 vertical stacks, each contains 3-5 vertical lines,
- with the different types of violation.
- 
-          Cross Dimension
-          +--------------------->
-                                              cross size range
-                                              |------------|
-          +--------+ +--------+ +--------+ +---------+  -  -  -  -  -  -  -  -
- Vertical |Vertical| |Vertical| |Vertical| |Vertical |     |                 ^
- Stack 1  | Line 1 | | Line 2 | | Line 3 | | Line 4  | (zero violation)      | stack size range
-          |        | |        | |        | |  |      |     |                 v
-          +--------+ +--------+ +--------+ +---------+  -  -  -  -  -  -  -  -
-                                              |            |
-          +--------+ +--------+ +--------+  -  -  -  -  -  -  -  -  -  -  -  -
- Vertical |        | |        | |        |    |            |                 ^
- Stack 2  |        | |        | |        |<--> (positive violation)          | stack size range
-          |        | |        | |        |    |            |                 v
-          +--------+ +--------+ +--------+  -  -  -  -  -  -  -  -  -  -  -  -
-                                              |            |<------> (negative violation)
-          +--------+ +--------+ +--------+ +---------+ +-----------+  -  -   -
- Vertical |        | |        | |        | |  |      | |   |       |         ^
- Stack 3  |        | |        | |        | |         | |           |         |  stack size range
-          |        | |        | |        | |  |      | |   |       |         v
-          +--------+ +--------+ +--------+ +---------+ +-----------+  -  -   -
- 
- @param crossDimensionSum the consumed length of the lines in the stack along the cross dimension
- @param style layout style to be applied to all children
- @param sizeRange the range of allowable sizes for the stack layout spec
- */
-CGFloat ASStackUnpositionedLayout::computeCrossViolation(const CGFloat crossDimensionSum,
-                                                         const ASStackLayoutSpecStyle &style,
-                                                         const ASSizeRange &sizeRange)
-{
-  const CGFloat minCrossDimension = crossDimension(style.direction, sizeRange.min);
-  const CGFloat maxCrossDimension = crossDimension(style.direction, sizeRange.max);
-  if (crossDimensionSum < minCrossDimension) {
-    return minCrossDimension - crossDimensionSum;
-  } else if (crossDimensionSum > maxCrossDimension) {
-    return maxCrossDimension - crossDimensionSum;
-  }
-  return 0;
-}
-
-/**
- Stretches children to lay out along the cross axis according to the alignment stretch settings of the children
- (child.alignSelf), and the stack layout's alignment settings (style.alignItems).  This does not do the actual alignment
- of the items once stretched though; ASStackPositionedLayout will do centering etc.
-
- Finds the maximum cross dimension among child layouts.  If that dimension exceeds the minimum cross layout size then
- we must stretch any children whose alignItems specify ASStackLayoutAlignItemsStretch.
-
- The diagram below shows 3 children in a horizontal stack.  The second child is larger than the minCrossDimension, so
- its height is used as the childCrossMax.  Any children that are stretchable (which may be all children if
- style.alignItems specifies stretch) like the first child must be stretched to match that maximum.  All children must be
- at least minCrossDimension in cross dimension size, which is shown by the sizing of the third child.
-
-                 Stack Dimension
-                 +--------------------->
-              +  +-+-------------+-+-------------+--+---------------+  + + +
-              |    | child.      | |             |  |               |  | | |
-              |    | alignSelf   | |             |  |               |  | | |
- Cross        |    | = stretch   | |             |  +-------+-------+  | | |
- Dimension    |    +-----+-------+ |             |  |       |       |  | | |
-              |    |     |       | |             |          |          | | |
-              |          |         |             |  |       v       |  | | |
-              v  +-+- - - - - - -+-+ - - - - - - +--+- - - - - - - -+  | | + minCrossDimension
-                         |         |             |                     | |
-                   |     v       | |             |                     | |
-                   +- - - - - - -+ +-------------+                     | + childCrossMax
-                                                                       |
-                 +--------------------------------------------------+  + crossMax
-
- @param items pre-computed items; modified in-place as needed
- @param style the layout style of the overall stack layout
- */
-static void stretchItemsAlongCrossDimension(std::vector<ASStackLayoutSpecItem> &items,
-                                            const ASStackLayoutSpecStyle &style,
-                                            const BOOL concurrent,
-                                            const CGSize parentSize,
-                                            const CGFloat crossSize)
-{
-  dispatchApplyIfNeeded(items.size(), concurrent, ^(size_t i) {
-    auto &item = items[i];
-    const ASStackLayoutAlignItems alignItems = alignment(item.child.style.alignSelf, style.alignItems);
-    if (alignItems == ASStackLayoutAlignItemsStretch) {
-      const CGFloat cross = crossDimension(style.direction, item.layout.size);
-      const CGFloat stack = stackDimension(style.direction, item.layout.size);
-      const CGFloat violation = crossSize - cross;
-      
-      // Only stretch if violation is positive. Compare against kViolationEpsilon here to avoid stretching against a tiny violation.
-      if (violation > kViolationEpsilon) {
-        item.layout = crossChildLayout(item.child, style, stack, stack, crossSize, crossSize, parentSize);
-      }
-    }
-  });
-}
-
-/**
- * Stretch lines and their items according to alignContent, alignItems and alignSelf.
- * https://www.w3.org/TR/css-flexbox-1/#algo-line-stretch
- * https://www.w3.org/TR/css-flexbox-1/#algo-stretch
- */
-static void stretchLinesAlongCrossDimension(std::vector<ASStackUnpositionedLine> &lines,
-                                            const ASStackLayoutSpecStyle &style,
-                                            const BOOL concurrent,
-                                            const ASSizeRange &sizeRange,
-                                            const CGSize parentSize)
-{
-  ASDisplayNodeCAssertFalse(lines.empty());
-  const std::size_t numOfLines = lines.size();
-  const CGFloat violation = ASStackUnpositionedLayout::computeCrossViolation(computeLinesCrossDimensionSum(lines, style), style, sizeRange);
-  // Don't stretch if the stack is single line, because the line's cross size was clamped against the stack's constrained size.
-  const BOOL shouldStretchLines = (numOfLines > 1
-                                   && style.alignContent == ASStackLayoutAlignContentStretch
-                                   && violation > kViolationEpsilon);
-  
-  CGFloat extraCrossSizePerLine = violation / numOfLines;
-  for (auto &line : lines) {
-    if (shouldStretchLines) {
-      line.crossSize += extraCrossSizePerLine;
-    }
-    
-    stretchItemsAlongCrossDimension(line.items, style, concurrent, parentSize, line.crossSize);
-  }
-}
-
-static BOOL itemIsBaselineAligned(const ASStackLayoutSpecStyle &style,
-                                  const ASStackLayoutSpecItem &l)
-{
-  ASStackLayoutAlignItems alignItems = alignment(l.child.style.alignSelf, style.alignItems);
-  return alignItems == ASStackLayoutAlignItemsBaselineFirst || alignItems == ASStackLayoutAlignItemsBaselineLast;
-}
-
-CGFloat ASStackUnpositionedLayout::baselineForItem(const ASStackLayoutSpecStyle &style,
-                                                   const ASStackLayoutSpecItem &item)
-{
-  switch (alignment(item.child.style.alignSelf, style.alignItems)) {
-    case ASStackLayoutAlignItemsBaselineFirst:
-      return item.child.style.ascender;
-    case ASStackLayoutAlignItemsBaselineLast:
-      return crossDimension(style.direction, item.layout.size) + item.child.style.descender;
-    default:
-      return 0;
-  }
-}
-
-/**
- * Computes cross size and baseline of each line.
- * https://www.w3.org/TR/css-flexbox-1/#algo-cross-line
- *
- * @param lines All items to lay out
- * @param style the layout style of the overall stack layout
- * @param sizeRange the range of allowable sizes for the stack layout component
- */
-static void computeLinesCrossSizeAndBaseline(std::vector<ASStackUnpositionedLine> &lines,
-                                             const ASStackLayoutSpecStyle &style,
-                                             const ASSizeRange &sizeRange)
-{
-  ASDisplayNodeCAssertFalse(lines.empty());
-  const BOOL isSingleLine = (lines.size() == 1);
-  
-  const auto minCrossSize = crossDimension(style.direction, sizeRange.min);
-  const auto maxCrossSize = crossDimension(style.direction, sizeRange.max);
-  const BOOL definiteCrossSize = (minCrossSize == maxCrossSize);
-  
-  // If the stack is single-line and has a definite cross size, the cross size of the line is the stack's definite cross size.
-  if (isSingleLine && definiteCrossSize) {
-    auto &line = lines[0];
-    line.crossSize = minCrossSize;
-    
-    // We still need to determine the line's baseline
-    //TODO unit test
-    for (const auto &item : line.items) {
-      if (itemIsBaselineAligned(style, item)) {
-        CGFloat baseline = ASStackUnpositionedLayout::baselineForItem(style, item);
-        line.baseline = MAX(line.baseline, baseline);
-      }
-    }
-    
-    return;
-  }
-  
-  for (auto &line : lines) {
-    const auto &items = line.items;
-    CGFloat maxStartToBaselineDistance = 0;
-    CGFloat maxBaselineToEndDistance = 0;
-    CGFloat maxItemCrossSize = 0;
-    
-    for (const auto &item : items) {
-      if (itemIsBaselineAligned(style, item)) {
-        // Step 1. Collect all the items whose align-self is baseline. Find the largest of the distances
-        // between each item’s baseline and its hypothetical outer cross-start edge (aka. its baseline value),
-        // and the largest of the distances between each item’s baseline and its hypothetical outer cross-end edge,
-        // and sum these two values.
-        CGFloat baseline = ASStackUnpositionedLayout::baselineForItem(style, item);
-        maxStartToBaselineDistance = MAX(maxStartToBaselineDistance, baseline);
-        maxBaselineToEndDistance = MAX(maxBaselineToEndDistance, crossDimension(style.direction, item.layout.size) - baseline);
-      } else {
-        // Step 2. Among all the items not collected by the previous step, find the largest outer hypothetical cross size.
-        maxItemCrossSize = MAX(maxItemCrossSize, crossDimension(style.direction, item.layout.size));
-      }
-    }
-    
-    // Step 3. The used cross-size of the flex line is the largest of the numbers found in the previous two steps and zero.
-    line.crossSize = MAX(maxStartToBaselineDistance + maxBaselineToEndDistance, maxItemCrossSize);
-    if (isSingleLine) {
-      // If the stack is single-line, then clamp the line’s cross-size to be within the stack's min and max cross-size properties.
-      line.crossSize = MIN(MAX(minCrossSize, line.crossSize), maxCrossSize);
-    }
-    
-    line.baseline = maxStartToBaselineDistance;
-  }
-}
-
-/**
- Returns a lambda that computes the relevant flex factor based on the given violation.
- @param violation The amount that the stack layout violates its size range.  See header for sign interpretation.
- */
-static std::function<CGFloat(const ASStackLayoutSpecItem &)> flexFactorInViolationDirection(const CGFloat violation)
-{
-  if (std::fabs(violation) < kViolationEpsilon) {
-    return [](const ASStackLayoutSpecItem &item) { return 0.0; };
-  } else if (violation > 0) {
-    return [](const ASStackLayoutSpecItem &item) { return item.child.style.flexGrow; };
-  } else {
-    return [](const ASStackLayoutSpecItem &item) { return item.child.style.flexShrink; };
-  }
-}
-
-static inline CGFloat scaledFlexShrinkFactor(const ASStackLayoutSpecItem &item,
-                                             const ASStackLayoutSpecStyle &style,
-                                             const CGFloat flexFactorSum)
-{
-  return stackDimension(style.direction, item.layout.size) * (item.child.style.flexShrink / flexFactorSum);
-}
-
-/**
- Returns a lambda that computes a flex shrink adjustment for a given item based on the provided violation.
- @param items The unpositioned items from the original unconstrained layout pass.
- @param style The layout style to be applied to all children.
- @param violation The amount that the stack layout violates its size range.
- @param flexFactorSum The sum of each item's flex factor as determined by the provided violation.
- @return A lambda capable of computing the flex shrink adjustment, if any, for a particular item.
- */
-static std::function<CGFloat(const ASStackLayoutSpecItem &)> flexShrinkAdjustment(const std::vector<ASStackLayoutSpecItem> &items,
-                                                                                  const ASStackLayoutSpecStyle &style,
-                                                                                  const CGFloat violation,
-                                                                                  const CGFloat flexFactorSum)
-{
-  const CGFloat scaledFlexShrinkFactorSum = std::accumulate(items.begin(), items.end(), 0.0, [&](CGFloat x, const ASStackLayoutSpecItem &item) {
-    return x + scaledFlexShrinkFactor(item, style, flexFactorSum);
-  });
-  return [style, scaledFlexShrinkFactorSum, violation, flexFactorSum](const ASStackLayoutSpecItem &item) {
-    if (scaledFlexShrinkFactorSum == 0.0) {
-      return (CGFloat)0.0;
-    }
-    
-    const CGFloat scaledFlexShrinkFactorRatio = scaledFlexShrinkFactor(item, style, flexFactorSum) / scaledFlexShrinkFactorSum;
-    // The item should shrink proportionally to the scaled flex shrink factor ratio computed above.
-    // Unlike the flex grow adjustment the flex shrink adjustment needs to take the size of each item into account.
-    return -std::fabs(scaledFlexShrinkFactorRatio * violation);
-  };
-}
-
-/**
- Returns a lambda that computes a flex grow adjustment for a given item based on the provided violation.
- @param items The unpositioned items from the original unconstrained layout pass.
- @param violation The amount that the stack layout violates its size range.
- @param flexFactorSum The sum of each item's flex factor as determined by the provided violation.
- @return A lambda capable of computing the flex grow adjustment, if any, for a particular item.
- */
-static std::function<CGFloat(const ASStackLayoutSpecItem &)> flexGrowAdjustment(const std::vector<ASStackLayoutSpecItem> &items,
-                                                                                const CGFloat violation,
-                                                                                const CGFloat flexFactorSum)
-{
-  // To compute the flex grow adjustment distribute the violation proportionally based on each item's flex grow factor.
-  return [violation, flexFactorSum](const ASStackLayoutSpecItem &item) {
-    return std::floor(violation * (item.child.style.flexGrow / flexFactorSum));
-  };
-}
-
-/**
- Returns a lambda that computes a flex adjustment for a given item based on the provided violation.
- @param items The unpositioned items from the original unconstrained layout pass.
- @param style The layout style to be applied to all children.
- @param violation The amount that the stack layout violates its size range.
- @param flexFactorSum The sum of each item's flex factor as determined by the provided violation.
- @return A lambda capable of computing the flex adjustment for a particular item.
- */
-static std::function<CGFloat(const ASStackLayoutSpecItem &)> flexAdjustmentInViolationDirection(const std::vector<ASStackLayoutSpecItem> &items,
-                                                                                                const ASStackLayoutSpecStyle &style,
-                                                                                                const CGFloat violation,
-                                                                                                const CGFloat flexFactorSum)
-{
-  if (violation > 0) {
-    return flexGrowAdjustment(items, violation, flexFactorSum);
-  } else {
-    return flexShrinkAdjustment(items, style, violation, flexFactorSum);
-  }
-}
-
-ASDISPLAYNODE_INLINE BOOL isFlexibleInBothDirections(const ASStackLayoutSpecChild &child)
-{
-    return child.style.flexGrow > 0 && child.style.flexShrink > 0;
-}
-
-/**
- The flexible children may have been left not laid out in the initial layout pass, so we may have to go through and size
- these children at zero size so that the children layouts are at least present.
- */
-static void layoutFlexibleChildrenAtZeroSize(std::vector<ASStackLayoutSpecItem> &items,
-                                             const ASStackLayoutSpecStyle &style,
-                                             const BOOL concurrent,
-                                             const ASSizeRange &sizeRange,
-                                             const CGSize parentSize)
-{
-  dispatchApplyIfNeeded(items.size(), concurrent, ^(size_t i) {
-    auto &item = items[i];
-    if (isFlexibleInBothDirections(item.child)) {
-      item.layout = crossChildLayout(item.child,
-                                     style,
-                                     0,
-                                     0,
-                                     crossDimension(style.direction, sizeRange.min),
-                                     crossDimension(style.direction, sizeRange.max),
-                                     parentSize);
-    }
-  });
-}
-
-/**
- Computes the consumed stack dimension length for the given vector of items and stacking style.
-
-              stackDimensionSum
-          <----------------------->
-          +-----+  +-------+  +---+
-          |     |  |       |  |   |
-          |     |  |       |  |   |
-          +-----+  |       |  +---+
-                   +-------+
-
- @param items unpositioned layouts for items
- @param style the layout style of the overall stack layout
- */
-static CGFloat computeItemsStackDimensionSum(const std::vector<ASStackLayoutSpecItem> &items,
-                                             const ASStackLayoutSpecStyle &style)
-{
-  // Sum up the childrens' spacing
-  const CGFloat childSpacingSum = std::accumulate(items.begin(), items.end(),
-                                                  // Start from default spacing between each child:
-                                                  items.empty() ? 0 : style.spacing * (items.size() - 1),
-                                                  [&](CGFloat x, const ASStackLayoutSpecItem &l) {
-                                                    return x + l.child.style.spacingBefore + l.child.style.spacingAfter;
-                                                  });
-
-  // Sum up the childrens' dimensions (including spacing) in the stack direction.
-  const CGFloat childStackDimensionSum = std::accumulate(items.begin(), items.end(),
-                                                         childSpacingSum,
-                                                         [&](CGFloat x, const ASStackLayoutSpecItem &l) {
-                                                           return x + stackDimension(style.direction, l.layout.size);
-                                                         });
-  return childStackDimensionSum;
-}
-
-//TODO move this up near computeCrossViolation and make both methods share the same code path, to make sure they share the same concept of "negative" and "positive" violations.
-/**
- Computes the violation by comparing a stack dimension sum with the overall allowable size range for the stack.
-
- Violation is the distance you would have to add to the unbounded stack-direction length of the stack spec's
- children in order to bring the stack within its allowed sizeRange.  The diagram below shows 3 horizontal stacks with
- the different types of violation.
-
-                                          sizeRange
-                                       |------------|
-       +------+ +-------+ +-------+ +---------+
-       |      | |       | |       | |  |      |     |
-       |      | |       | |       | |         | (zero violation)
-       |      | |       | |       | |  |      |     |
-       +------+ +-------+ +-------+ +---------+
-                                       |            |
-       +------+ +-------+ +-------+
-       |      | |       | |       |    |            |
-       |      | |       | |       |<--> (positive violation)
-       |      | |       | |       |    |            |
-       +------+ +-------+ +-------+
-                                       |            |<------> (negative violation)
-       +------+ +-------+ +-------+ +---------+ +-----------+
-       |      | |       | |       | |  |      | |   |       |
-       |      | |       | |       | |         | |           |
-       |      | |       | |       | |  |      | |   |       |
-       +------+ +-------+ +-------+ +---------+ +-----------+
-
- @param stackDimensionSum the consumed length of the children in the stack along the stack dimension
- @param style layout style to be applied to all children
- @param sizeRange the range of allowable sizes for the stack layout spec
- */
-CGFloat ASStackUnpositionedLayout::computeStackViolation(const CGFloat stackDimensionSum,
-                                                         const ASStackLayoutSpecStyle &style,
-                                                         const ASSizeRange &sizeRange)
-{
-  const CGFloat minStackDimension = stackDimension(style.direction, sizeRange.min);
-  const CGFloat maxStackDimension = stackDimension(style.direction, sizeRange.max);
-  if (stackDimensionSum < minStackDimension) {
-    return minStackDimension - stackDimensionSum;
-  } else if (stackDimensionSum > maxStackDimension) {
-    return maxStackDimension - stackDimensionSum;
-  }
-  return 0;
-}
-
-/**
- If we have a single flexible (both shrinkable and growable) child, and our allowed size range is set to a specific
- number then we may avoid the first "intrinsic" size calculation.
- */
-ASDISPLAYNODE_INLINE BOOL useOptimizedFlexing(const std::vector<ASStackLayoutSpecChild> &children,
-                                              const ASStackLayoutSpecStyle &style,
-                                              const ASSizeRange &sizeRange)
-{
-  const NSUInteger flexibleChildren = std::count_if(children.begin(), children.end(), isFlexibleInBothDirections);
-  return ((flexibleChildren == 1)
-          && (stackDimension(style.direction, sizeRange.min) ==
-              stackDimension(style.direction, sizeRange.max)));
-}
-
-/**
- Flexes children in the stack axis to resolve a min or max stack size violation. First, determines which children are
- flexible (see computeStackViolation and isFlexibleInViolationDirection). Then computes how much to flex each flexible child
- and performs re-layout. Note that there may still be a non-zero violation even after flexing.
-
- The actual CSS flexbox spec describes an iterative looping algorithm here, which may be adopted in t5837937:
- http://www.w3.org/TR/css3-flexbox/#resolve-flexible-lengths
-
- @param lines reference to unpositioned lines and items from the original, unconstrained layout pass; modified in-place
- @param style layout style to be applied to all children
- @param sizeRange the range of allowable sizes for the stack layout component
- @param parentSize Size of the stack layout component. May be undefined in either or both directions.
- */
-static void flexLinesAlongStackDimension(std::vector<ASStackUnpositionedLine> &lines,
-                                         const ASStackLayoutSpecStyle &style,
-                                         const BOOL concurrent,
-                                         const ASSizeRange &sizeRange,
-                                         const CGSize parentSize,
-                                         const BOOL useOptimizedFlexing)
-{
-  for (auto &line : lines) {
-    auto &items = line.items;
-    const CGFloat violation = ASStackUnpositionedLayout::computeStackViolation(computeItemsStackDimensionSum(items, style), style, sizeRange);
-    std::function<CGFloat(const ASStackLayoutSpecItem &)> flexFactor = flexFactorInViolationDirection(violation);
-    // The flex factor sum is needed to determine if flexing is necessary.
-    // This value is also needed if the violation is positive and flexible items need to grow, so keep it around.
-    const CGFloat flexFactorSum = std::accumulate(items.begin(), items.end(), 0.0, [&](CGFloat x, const ASStackLayoutSpecItem &item) {
-      return x + flexFactor(item);
-    });
-    
-    // If no items are able to flex then there is nothing left to do with this line. Bail.
-    if (flexFactorSum == 0) {
-      // If optimized flexing was used then we have to clean up the unsized items and lay them out at zero size.
-      if (useOptimizedFlexing) {
-        layoutFlexibleChildrenAtZeroSize(items, style, concurrent, sizeRange, parentSize);
-      }
-      continue;
-    }
-    
-    std::function<CGFloat(const ASStackLayoutSpecItem &)> flexAdjustment = flexAdjustmentInViolationDirection(items,
-                                                                                                              style,
-                                                                                                              violation,
-                                                                                                              flexFactorSum);
-    // Compute any remaining violation to the first flexible item.
-    const CGFloat remainingViolation = std::accumulate(items.begin(), items.end(), violation, [&](CGFloat x, const ASStackLayoutSpecItem &item) {
-      return x - flexAdjustment(item);
-    });
-    
-    size_t firstFlexItem = -1;
-    for(size_t i = 0; i < items.size(); i++) {
-      // Items are consider inflexible if they do not need to make a flex adjustment.
-      if (flexAdjustment(items[i]) != 0) {
-        firstFlexItem = i;
-        break;
-      }
-    }
-    if (firstFlexItem == -1) {
-      continue;
-    }
-    
-    dispatchApplyIfNeeded(items.size(), concurrent, ^(size_t i) {
-      auto &item = items[i];
-      const CGFloat currentFlexAdjustment = flexAdjustment(item);
-      // Items are consider inflexible if they do not need to make a flex adjustment.
-      if (currentFlexAdjustment != 0) {
-        const CGFloat originalStackSize = stackDimension(style.direction, item.layout.size);
-        // Only apply the remaining violation for the first flexible item that has a flex grow factor.
-        const CGFloat flexedStackSize = originalStackSize + currentFlexAdjustment + (i == firstFlexItem && item.child.style.flexGrow > 0 ? remainingViolation : 0);
-        item.layout = crossChildLayout(item.child,
-                                       style,
-                                       MAX(flexedStackSize, 0),
-                                       MAX(flexedStackSize, 0),
-                                       crossDimension(style.direction, sizeRange.min),
-                                       crossDimension(style.direction, sizeRange.max),
-                                       parentSize);
-      }
-    });
-  }
-}
-
-/**
- https://www.w3.org/TR/css-flexbox-1/#algo-line-break
- */
-static std::vector<ASStackUnpositionedLine> collectChildrenIntoLines(const std::vector<ASStackLayoutSpecItem> &items,
-                                                                     const ASStackLayoutSpecStyle &style,
-                                                                     const ASSizeRange &sizeRange)
-{
-  //TODO if infinite max stack size, fast path
-  if (style.flexWrap == ASStackLayoutFlexWrapNoWrap) {
-    return std::vector<ASStackUnpositionedLine> (1, {.items = std::move(items)});
-  }
-  
-  std::vector<ASStackUnpositionedLine> lines;
-  std::vector<ASStackLayoutSpecItem> lineItems;
-  CGFloat lineStackDimensionSum = 0;
-  CGFloat interitemSpacing = 0;
-
-  for(auto it = items.begin(); it != items.end(); ++it) {
-    const auto &item = *it;
-    const CGFloat itemStackDimension = stackDimension(style.direction, item.layout.size);
-    const CGFloat itemAndSpacingStackDimension = item.child.style.spacingBefore + itemStackDimension + item.child.style.spacingAfter;
-    const BOOL negativeViolationIfAddItem = (ASStackUnpositionedLayout::computeStackViolation(lineStackDimensionSum + interitemSpacing + itemAndSpacingStackDimension, style, sizeRange) < 0);
-    const BOOL breakCurrentLine = negativeViolationIfAddItem && !lineItems.empty();
-    
-    if (breakCurrentLine) {
-      lines.push_back({.items = std::vector<ASStackLayoutSpecItem> (lineItems)});
-      lineItems.clear();
-      lineStackDimensionSum = 0;
-      interitemSpacing = 0;
-    }
-    
-    lineItems.push_back(std::move(item));
-    lineStackDimensionSum += interitemSpacing + itemAndSpacingStackDimension;
-    interitemSpacing = style.spacing;
-  }
-  
-  // Handle last line
-  lines.push_back({.items = std::vector<ASStackLayoutSpecItem> (lineItems)});
-  
-  return lines;
-}
-
-/**
- Performs the first unconstrained layout of the children, generating the unpositioned items that are then flexed and
- stretched.
- */
-static void layoutItemsAlongUnconstrainedStackDimension(std::vector<ASStackLayoutSpecItem> &items,
-                                                        const ASStackLayoutSpecStyle &style,
-                                                        const BOOL concurrent,
-                                                        const ASSizeRange &sizeRange,
-                                                        const CGSize parentSize,
-                                                        const BOOL useOptimizedFlexing)
-{
-  const CGFloat minCrossDimension = crossDimension(style.direction, sizeRange.min);
-  const CGFloat maxCrossDimension = crossDimension(style.direction, sizeRange.max);
-  
-  dispatchApplyIfNeeded(items.size(), concurrent, ^(size_t i) {
-    auto &item = items[i];
-    if (useOptimizedFlexing && isFlexibleInBothDirections(item.child)) {
-      item.layout = [ASLayout layoutWithLayoutElement:item.child.element size:{0, 0}];
-    } else {
-      item.layout = crossChildLayout(item.child,
-                                     style,
-                                     ASDimensionResolve(item.child.style.flexBasis, stackDimension(style.direction, parentSize), 0),
-                                     ASDimensionResolve(item.child.style.flexBasis, stackDimension(style.direction, parentSize), INFINITY),
-                                     minCrossDimension,
-                                     maxCrossDimension,
-                                     parentSize);
-    }
-  });
-}
-
-ASStackUnpositionedLayout ASStackUnpositionedLayout::compute(const std::vector<ASStackLayoutSpecChild> &children,
-                                                             const ASStackLayoutSpecStyle &style,
-                                                             const ASSizeRange &sizeRange,
-                                                             const BOOL concurrent)
-{
-  if (children.empty()) {
-    return {};
-  }
-  
-  // If we have a fixed size in either dimension, pass it to children so they can resolve percentages against it.
-  // Otherwise, we pass ASLayoutElementParentDimensionUndefined since it will depend on the content.
-  const CGSize parentSize = {
-    (sizeRange.min.width == sizeRange.max.width) ? sizeRange.min.width : ASLayoutElementParentDimensionUndefined,
-    (sizeRange.min.height == sizeRange.max.height) ? sizeRange.min.height : ASLayoutElementParentDimensionUndefined,
-  };
-
-  // We may be able to avoid some redundant layout passes
-  const BOOL optimizedFlexing = useOptimizedFlexing(children, style, sizeRange);
-
-  std::vector<ASStackLayoutSpecItem> items = AS::map(children, [&](const ASStackLayoutSpecChild &child) -> ASStackLayoutSpecItem {
-    return {child, nil};
-  });
-  
-  // We do a first pass of all the children, generating an unpositioned layout for each with an unbounded range along
-  // the stack dimension.  This allows us to compute the "intrinsic" size of each child and find the available violation
-  // which determines whether we must grow or shrink the flexible children.
-  layoutItemsAlongUnconstrainedStackDimension(items,
-                                              style,
-                                              concurrent,
-                                              sizeRange,
-                                              parentSize,
-                                              optimizedFlexing);
-  
-  // Collect items into lines (https://www.w3.org/TR/css-flexbox-1/#algo-line-break)
-  std::vector<ASStackUnpositionedLine> lines = collectChildrenIntoLines(items, style, sizeRange);
-  
-  // Resolve the flexible lengths (https://www.w3.org/TR/css-flexbox-1/#resolve-flexible-lengths)
-  flexLinesAlongStackDimension(lines, style, concurrent, sizeRange, parentSize, optimizedFlexing);
-  
-  // Calculate the cross size of each flex line (https://www.w3.org/TR/css-flexbox-1/#algo-cross-line)
-  computeLinesCrossSizeAndBaseline(lines, style, sizeRange);
-  
-  // Handle 'align-content: stretch' (https://www.w3.org/TR/css-flexbox-1/#algo-line-stretch)
-  // Determine the used cross size of each item (https://www.w3.org/TR/css-flexbox-1/#algo-stretch)
-  stretchLinesAlongCrossDimension(lines, style, concurrent, sizeRange, parentSize);
-  
-  // Compute stack dimension sum of each line and the whole stack
-  CGFloat layoutStackDimensionSum = 0;
-  for (auto &line : lines) {
-    line.stackDimensionSum = computeItemsStackDimensionSum(line.items, style);
-    // layoutStackDimensionSum is the max stackDimensionSum among all lines
-    layoutStackDimensionSum = MAX(line.stackDimensionSum, layoutStackDimensionSum);
-  }
-  // Compute cross dimension sum of the stack.
-  // This should be done before `lines` are moved to a new ASStackUnpositionedLayout struct (i.e `std::move(lines)`)
-  CGFloat layoutCrossDimensionSum = computeLinesCrossDimensionSum(lines, style);
-  
-  return {.lines = std::move(lines), .stackDimensionSum = layoutStackDimensionSum, .crossDimensionSum = layoutCrossDimensionSum};
-}
diff --git a/submodules/AsyncDisplayKit/Source/Private/TextExperiment/Component/ASTextDebugOption.h b/submodules/AsyncDisplayKit/Source/Private/TextExperiment/Component/ASTextDebugOption.h
deleted file mode 100644
index efa7808c87..0000000000
--- a/submodules/AsyncDisplayKit/Source/Private/TextExperiment/Component/ASTextDebugOption.h
+++ /dev/null
@@ -1,92 +0,0 @@
-//
-//  ASTextDebugOption.h
-//  Texture
-//
-//  Copyright (c) Pinterest, Inc.  All rights reserved.
-//  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
-//
-
-#import <UIKit/UIKit.h>
-
-@class ASTextDebugOption;
-
-NS_ASSUME_NONNULL_BEGIN
-
-/**
- The ASTextDebugTarget protocol defines the method a debug target should implement.
- A debug target can be add to the global container to receive the shared debug
- option changed notification.
- */
-@protocol ASTextDebugTarget <NSObject>
-
-@required
-/**
- When the shared debug option changed, this method would be called on main thread.
- It should return as quickly as possible. The option's property should not be changed
- in this method.
- 
- @param option  The shared debug option.
- */
-- (void)setDebugOption:(nullable ASTextDebugOption *)option;
-@end
-
-
-
-/**
- The debug option for ASText.
- */
-@interface ASTextDebugOption : NSObject <NSCopying>
-@property (nullable, nonatomic) UIColor *baselineColor;      ///< baseline color
-@property (nullable, nonatomic) UIColor *CTFrameBorderColor; ///< CTFrame path border color
-@property (nullable, nonatomic) UIColor *CTFrameFillColor;   ///< CTFrame path fill color
-@property (nullable, nonatomic) UIColor *CTLineBorderColor;  ///< CTLine bounds border color
-@property (nullable, nonatomic) UIColor *CTLineFillColor;    ///< CTLine bounds fill color
-@property (nullable, nonatomic) UIColor *CTLineNumberColor;  ///< CTLine line number color
-@property (nullable, nonatomic) UIColor *CTRunBorderColor;   ///< CTRun bounds border color
-@property (nullable, nonatomic) UIColor *CTRunFillColor;     ///< CTRun bounds fill color
-@property (nullable, nonatomic) UIColor *CTRunNumberColor;   ///< CTRun number color
-@property (nullable, nonatomic) UIColor *CGGlyphBorderColor; ///< CGGlyph bounds border color
-@property (nullable, nonatomic) UIColor *CGGlyphFillColor;   ///< CGGlyph bounds fill color
-
-- (BOOL)needDrawDebug; ///< `YES`: at least one debug color is visible. `NO`: all debug color is invisible/nil.
-- (void)clear; ///< Set all debug color to nil.
-
-/**
- Add a debug target.
- 
- @discussion When `setSharedDebugOption:` is called, all added debug target will
- receive `setDebugOption:` in main thread. It maintains an unsafe_unretained
- reference to this target. The target must to removed before dealloc.
- 
- @param target A debug target.
- */
-+ (void)addDebugTarget:(id<ASTextDebugTarget>)target;
-
-/**
- Remove a debug target which is added by `addDebugTarget:`.
- 
- @param target A debug target.
- */
-+ (void)removeDebugTarget:(id<ASTextDebugTarget>)target;
-
-/**
- Returns the shared debug option.
- 
- @return The shared debug option, default is nil.
- */
-+ (nullable ASTextDebugOption *)sharedDebugOption;
-
-/**
- Set a debug option as shared debug option.
- This method must be called on main thread.
- 
- @discussion When call this method, the new option will set to all debug target
- which is added by `addDebugTarget:`.
- 
- @param option  A new debug option (nil is valid).
- */
-+ (void)setSharedDebugOption:(nullable ASTextDebugOption *)option;
-
-@end
-
-NS_ASSUME_NONNULL_END
diff --git a/submodules/AsyncDisplayKit/Source/Private/TextExperiment/Component/ASTextDebugOption.mm b/submodules/AsyncDisplayKit/Source/Private/TextExperiment/Component/ASTextDebugOption.mm
deleted file mode 100644
index 2565b903c9..0000000000
--- a/submodules/AsyncDisplayKit/Source/Private/TextExperiment/Component/ASTextDebugOption.mm
+++ /dev/null
@@ -1,135 +0,0 @@
-//
-//  ASTextDebugOption.mm
-//  Texture
-//
-//  Copyright (c) Pinterest, Inc.  All rights reserved.
-//  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
-//
-
-#import "ASTextDebugOption.h"
-#import <pthread.h>
-
-static pthread_mutex_t _sharedDebugLock;
-static CFMutableSetRef _sharedDebugTargets = nil;
-static ASTextDebugOption *_sharedDebugOption = nil;
-
-static const void* _as_sharedDebugSetRetain(CFAllocatorRef allocator, const void *value) {
-  return value;
-}
-
-static void _as_sharedDebugSetRelease(CFAllocatorRef allocator, const void *value) {
-}
-
-void _as_sharedDebugSetFunction(const void *value, void *context) {
-  id<ASTextDebugTarget> target = (__bridge id<ASTextDebugTarget>)(value);
-  [target setDebugOption:_sharedDebugOption];
-}
-
-static void _initSharedDebug() {
-  static dispatch_once_t onceToken;
-  dispatch_once(&onceToken, ^{
-    pthread_mutex_init(&_sharedDebugLock, NULL);
-    CFSetCallBacks callbacks = kCFTypeSetCallBacks;
-    callbacks.retain = _as_sharedDebugSetRetain;
-    callbacks.release = _as_sharedDebugSetRelease;
-    _sharedDebugTargets = CFSetCreateMutable(CFAllocatorGetDefault(), 0, &callbacks);
-  });
-}
-
-static void _setSharedDebugOption(ASTextDebugOption *option) {
-  _initSharedDebug();
-  pthread_mutex_lock(&_sharedDebugLock);
-  _sharedDebugOption = option.copy;
-  CFSetApplyFunction(_sharedDebugTargets, _as_sharedDebugSetFunction, NULL);
-  pthread_mutex_unlock(&_sharedDebugLock);
-}
-
-static ASTextDebugOption *_getSharedDebugOption() {
-  _initSharedDebug();
-  pthread_mutex_lock(&_sharedDebugLock);
-  ASTextDebugOption *op = _sharedDebugOption;
-  pthread_mutex_unlock(&_sharedDebugLock);
-  return op;
-}
-
-static void _addDebugTarget(id<ASTextDebugTarget> target) {
-  _initSharedDebug();
-  pthread_mutex_lock(&_sharedDebugLock);
-  CFSetAddValue(_sharedDebugTargets, (__bridge const void *)(target));
-  pthread_mutex_unlock(&_sharedDebugLock);
-}
-
-static void _removeDebugTarget(id<ASTextDebugTarget> target) {
-  _initSharedDebug();
-  pthread_mutex_lock(&_sharedDebugLock);
-  CFSetRemoveValue(_sharedDebugTargets, (__bridge const void *)(target));
-  pthread_mutex_unlock(&_sharedDebugLock);
-}
-
-
-@implementation ASTextDebugOption
-
-- (id)copyWithZone:(NSZone *)zone {
-  ASTextDebugOption *op = [self.class new];
-  op.baselineColor = self.baselineColor;
-  op.CTFrameBorderColor = self.CTFrameBorderColor;
-  op.CTFrameFillColor = self.CTFrameFillColor;
-  op.CTLineBorderColor = self.CTLineBorderColor;
-  op.CTLineFillColor = self.CTLineFillColor;
-  op.CTLineNumberColor = self.CTLineNumberColor;
-  op.CTRunBorderColor = self.CTRunBorderColor;
-  op.CTRunFillColor = self.CTRunFillColor;
-  op.CTRunNumberColor = self.CTRunNumberColor;
-  op.CGGlyphBorderColor = self.CGGlyphBorderColor;
-  op.CGGlyphFillColor = self.CGGlyphFillColor;
-  return op;
-}
-
-- (BOOL)needDrawDebug {
-  if (self.baselineColor ||
-      self.CTFrameBorderColor ||
-      self.CTFrameFillColor ||
-      self.CTLineBorderColor ||
-      self.CTLineFillColor ||
-      self.CTLineNumberColor ||
-      self.CTRunBorderColor ||
-      self.CTRunFillColor ||
-      self.CTRunNumberColor ||
-      self.CGGlyphBorderColor ||
-      self.CGGlyphFillColor) return YES;
-  return NO;
-}
-
-- (void)clear {
-  self.baselineColor = nil;
-  self.CTFrameBorderColor = nil;
-  self.CTFrameFillColor = nil;
-  self.CTLineBorderColor = nil;
-  self.CTLineFillColor = nil;
-  self.CTLineNumberColor = nil;
-  self.CTRunBorderColor = nil;
-  self.CTRunFillColor = nil;
-  self.CTRunNumberColor = nil;
-  self.CGGlyphBorderColor = nil;
-  self.CGGlyphFillColor = nil;
-}
-
-+ (void)addDebugTarget:(id<ASTextDebugTarget>)target {
-  if (target) _addDebugTarget(target);
-}
-
-+ (void)removeDebugTarget:(id<ASTextDebugTarget>)target {
-  if (target) _removeDebugTarget(target);
-}
-
-+ (ASTextDebugOption *)sharedDebugOption {
-  return _getSharedDebugOption();
-}
-
-+ (void)setSharedDebugOption:(ASTextDebugOption *)option {
-  NSAssert([NSThread isMainThread], @"This method must be called on the main thread");
-  _setSharedDebugOption(option);
-}
-
-@end
-
diff --git a/submodules/AsyncDisplayKit/Source/Private/TextExperiment/Component/ASTextInput.h b/submodules/AsyncDisplayKit/Source/Private/TextExperiment/Component/ASTextInput.h
deleted file mode 100644
index 9a6cbd13d1..0000000000
--- a/submodules/AsyncDisplayKit/Source/Private/TextExperiment/Component/ASTextInput.h
+++ /dev/null
@@ -1,85 +0,0 @@
-//
-//  ASTextInput.h
-//  Texture
-//
-//  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.
-//  Changes after 4/13/2017 are: Copyright (c) Pinterest, Inc.  All rights reserved.
-//  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
-//
-
-#import <UIKit/UIKit.h>
-
-NS_ASSUME_NONNULL_BEGIN
-
-/**
- Text position affinity. For example, the offset appears after the last
- character on a line is backward affinity, before the first character on
- the following line is forward affinity.
- */
-typedef NS_ENUM(NSInteger, ASTextAffinity) {
-  ASTextAffinityForward  = 0, ///< offset appears before the character
-  ASTextAffinityBackward = 1, ///< offset appears after the character
-};
-
-
-/**
- A ASTextPosition object represents a position in a text container; in other words,
- it is an index into the backing string in a text-displaying view.
- 
- ASTextPosition has the same API as Apple's implementation in UITextView/UITextField,
- so you can alse use it to interact with UITextView/UITextField.
- */
-@interface ASTextPosition : UITextPosition <NSCopying>
-
-@property (nonatomic, readonly) NSInteger offset;
-@property (nonatomic, readonly) ASTextAffinity affinity;
-
-+ (instancetype)positionWithOffset:(NSInteger)offset NS_RETURNS_RETAINED;
-+ (instancetype)positionWithOffset:(NSInteger)offset affinity:(ASTextAffinity) affinity NS_RETURNS_RETAINED;
-
-- (NSComparisonResult)compare:(id)otherPosition;
-
-@end
-
-
-/**
- A ASTextRange object represents a range of characters in a text container; in other words,
- it identifies a starting index and an ending index in string backing a text-displaying view.
- 
- ASTextRange has the same API as Apple's implementation in UITextView/UITextField,
- so you can alse use it to interact with UITextView/UITextField.
- */
-@interface ASTextRange : UITextRange <NSCopying>
-
-@property (nonatomic, readonly) ASTextPosition *start;
-@property (nonatomic, readonly) ASTextPosition *end;
-@property (nonatomic, readonly, getter=isEmpty) BOOL empty;
-
-+ (instancetype)rangeWithRange:(NSRange)range NS_RETURNS_RETAINED;
-+ (instancetype)rangeWithRange:(NSRange)range affinity:(ASTextAffinity) affinity NS_RETURNS_RETAINED;
-+ (instancetype)rangeWithStart:(ASTextPosition *)start end:(ASTextPosition *)end NS_RETURNS_RETAINED;
-+ (instancetype)defaultRange NS_RETURNS_RETAINED; ///< <{0,0} Forward>
-
-- (NSRange)asRange;
-
-@end
-
-
-/**
- A ASTextSelectionRect object encapsulates information about a selected range of
- text in a text-displaying view.
- 
- ASTextSelectionRect has the same API as Apple's implementation in UITextView/UITextField,
- so you can alse use it to interact with UITextView/UITextField.
- */
-@interface ASTextSelectionRect : UITextSelectionRect <NSCopying>
-
-@property (nonatomic) CGRect rect;
-@property (nonatomic) UITextWritingDirection writingDirection;
-@property (nonatomic) BOOL containsStart;
-@property (nonatomic) BOOL containsEnd;
-@property (nonatomic) BOOL isVertical;
-
-@end
-
-NS_ASSUME_NONNULL_END
diff --git a/submodules/AsyncDisplayKit/Source/Private/TextExperiment/Component/ASTextInput.mm b/submodules/AsyncDisplayKit/Source/Private/TextExperiment/Component/ASTextInput.mm
deleted file mode 100644
index 1cdfe73858..0000000000
--- a/submodules/AsyncDisplayKit/Source/Private/TextExperiment/Component/ASTextInput.mm
+++ /dev/null
@@ -1,150 +0,0 @@
-//
-//  ASTextInput.mm
-//  Texture
-//
-//  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.
-//  Changes after 4/13/2017 are: Copyright (c) Pinterest, Inc.  All rights reserved.
-//  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
-//
-
-#import <AsyncDisplayKit/ASTextInput.h>
-#import <AsyncDisplayKit/ASTextUtilities.h>
-
-
-@implementation ASTextPosition
-
-+ (instancetype)positionWithOffset:(NSInteger)offset NS_RETURNS_RETAINED {
-  return [self positionWithOffset:offset affinity:ASTextAffinityForward];
-}
-
-+ (instancetype)positionWithOffset:(NSInteger)offset affinity:(ASTextAffinity)affinity NS_RETURNS_RETAINED {
-  ASTextPosition *p = [self new];
-  p->_offset = offset;
-  p->_affinity = affinity;
-  return p;
-}
-
-- (instancetype)copyWithZone:(NSZone *)zone {
-  return [self.class positionWithOffset:_offset affinity:_affinity];
-}
-
-- (NSString *)description {
-  return [NSString stringWithFormat:@"<%@: %p> (%@%@)", self.class, self, @(_offset), _affinity == ASTextAffinityForward ? @"F":@"B"];
-}
-
-- (NSUInteger)hash {
-  return _offset * 2 + (_affinity == ASTextAffinityForward ? 1 : 0);
-}
-
-- (BOOL)isEqual:(ASTextPosition *)object {
-  if (!object) return NO;
-  return _offset == object.offset && _affinity == object.affinity;
-}
-
-- (NSComparisonResult)compare:(ASTextPosition *)otherPosition {
-  if (!otherPosition) return NSOrderedAscending;
-  if (_offset < otherPosition.offset) return NSOrderedAscending;
-  if (_offset > otherPosition.offset) return NSOrderedDescending;
-  if (_affinity == ASTextAffinityBackward && otherPosition.affinity == ASTextAffinityForward) return NSOrderedAscending;
-  if (_affinity == ASTextAffinityForward && otherPosition.affinity == ASTextAffinityBackward) return NSOrderedDescending;
-  return NSOrderedSame;
-}
-
-@end
-
-
-
-@implementation ASTextRange {
-  ASTextPosition *_start;
-  ASTextPosition *_end;
-}
-
-- (instancetype)init {
-  self = [super init];
-  if (!self) return nil;
-  _start = [ASTextPosition positionWithOffset:0];
-  _end = [ASTextPosition positionWithOffset:0];
-  return self;
-}
-
-- (ASTextPosition *)start {
-  return _start;
-}
-
-- (ASTextPosition *)end {
-  return _end;
-}
-
-- (BOOL)isEmpty {
-  return _start.offset == _end.offset;
-}
-
-- (NSRange)asRange {
-  return NSMakeRange(_start.offset, _end.offset - _start.offset);
-}
-
-+ (instancetype)rangeWithRange:(NSRange)range NS_RETURNS_RETAINED {
-  return [self rangeWithRange:range affinity:ASTextAffinityForward];
-}
-
-+ (instancetype)rangeWithRange:(NSRange)range affinity:(ASTextAffinity)affinity NS_RETURNS_RETAINED {
-  ASTextPosition *start = [ASTextPosition positionWithOffset:range.location affinity:affinity];
-  ASTextPosition *end = [ASTextPosition positionWithOffset:range.location + range.length affinity:affinity];
-  return [self rangeWithStart:start end:end];
-}
-
-+ (instancetype)rangeWithStart:(ASTextPosition *)start end:(ASTextPosition *)end NS_RETURNS_RETAINED {
-  if (!start || !end) return nil;
-  if ([start compare:end] == NSOrderedDescending) {
-    ASTEXT_SWAP(start, end);
-  }
-  ASTextRange *range = [ASTextRange new];
-  range->_start = start;
-  range->_end = end;
-  return range;
-}
-
-+ (instancetype)defaultRange NS_RETURNS_RETAINED {
-  return [self new];
-}
-
-- (instancetype)copyWithZone:(NSZone *)zone {
-  return [self.class rangeWithStart:_start end:_end];
-}
-
-- (NSString *)description {
-  return [NSString stringWithFormat:@"<%@: %p> (%@, %@)%@", self.class, self, @(_start.offset), @(_end.offset - _start.offset), _end.affinity == ASTextAffinityForward ? @"F":@"B"];
-}
-
-- (NSUInteger)hash {
-  return (sizeof(NSUInteger) == 8 ? OSSwapInt64(_start.hash) : OSSwapInt32(_start.hash)) + _end.hash;
-}
-
-- (BOOL)isEqual:(ASTextRange *)object {
-  if (!object) return NO;
-  return [_start isEqual:object.start] && [_end isEqual:object.end];
-}
-
-@end
-
-
-
-@implementation ASTextSelectionRect
-
-@synthesize rect = _rect;
-@synthesize writingDirection = _writingDirection;
-@synthesize containsStart = _containsStart;
-@synthesize containsEnd = _containsEnd;
-@synthesize isVertical = _isVertical;
-
-- (id)copyWithZone:(NSZone *)zone {
-  ASTextSelectionRect *one = [self.class new];
-  one.rect = _rect;
-  one.writingDirection = _writingDirection;
-  one.containsStart = _containsStart;
-  one.containsEnd = _containsEnd;
-  one.isVertical = _isVertical;
-  return one;
-}
-
-@end
diff --git a/submodules/AsyncDisplayKit/Source/Private/TextExperiment/Component/ASTextLayout.h b/submodules/AsyncDisplayKit/Source/Private/TextExperiment/Component/ASTextLayout.h
deleted file mode 100644
index 46bc8ccf52..0000000000
--- a/submodules/AsyncDisplayKit/Source/Private/TextExperiment/Component/ASTextLayout.h
+++ /dev/null
@@ -1,547 +0,0 @@
-//
-//  ASTextLayout.h
-//  Texture
-//
-//  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.
-//  Changes after 4/13/2017 are: Copyright (c) Pinterest, Inc.  All rights reserved.
-//  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
-//
-
-#import <UIKit/UIKit.h>
-#import <CoreText/CoreText.h>
-
-#import "ASTextDebugOption.h"
-#import "ASTextLine.h"
-#import "ASTextInput.h"
-
-@protocol ASTextLinePositionModifier;
-
-NS_ASSUME_NONNULL_BEGIN
-
-/**
- The max text container size in layout.
- */
-AS_EXTERN const CGSize ASTextContainerMaxSize;
-
-/**
- The ASTextContainer class defines a region in which text is laid out.
- ASTextLayout class uses one or more ASTextContainer objects to generate layouts.
- 
- A ASTextContainer defines rectangular regions (`size` and `insets`) or
- nonrectangular shapes (`path`), and you can define exclusion paths inside the
- text container's bounding rectangle so that text flows around the exclusion
- path as it is laid out.
- 
- All methods in this class is thread-safe.
- 
- Example:
- 
- ┌─────────────────────────────┐  <------- container
- │                             │
- │    asdfasdfasdfasdfasdfa   <------------ container insets
- │    asdfasdfa   asdfasdfa    │
- │    asdfas         asdasd    │
- │    asdfa        <----------------------- container exclusion path
- │    asdfas         adfasd    │
- │    asdfasdfa   asdfasdfa    │
- │    asdfasdfasdfasdfasdfa    │
- │                             │
- └─────────────────────────────┘
- */
-@interface ASTextContainer : NSObject <NSCoding, NSCopying>
-
-/// Creates a container with the specified size. @param size The size.
-+ (instancetype)containerWithSize:(CGSize)size NS_RETURNS_RETAINED;
-
-/// Creates a container with the specified size and insets. @param size The size. @param insets The text insets.
-+ (instancetype)containerWithSize:(CGSize)size insets:(UIEdgeInsets)insets NS_RETURNS_RETAINED;
-
-/// Creates a container with the specified path. @param path The path.
-+ (instancetype)containerWithPath:(nullable UIBezierPath *)path NS_RETURNS_RETAINED;
-
-/// Mark this immutable, so you get free copies going forward.
-- (void)makeImmutable;
-
-/// The constrained size. (if the size is larger than ASTextContainerMaxSize, it will be clipped)
-@property CGSize size;
-
-/// The insets for constrained size. The inset value should not be negative. Default is UIEdgeInsetsZero.
-@property UIEdgeInsets insets;
-
-/// Custom constrained path. Set this property to ignore `size` and `insets`. Default is nil.
-@property (nullable, copy) UIBezierPath *path;
-
-/// An array of `UIBezierPath` for path exclusion. Default is nil.
-@property (nullable, copy) NSArray<UIBezierPath *> *exclusionPaths;
-
-/// Path line width. Default is 0;
-@property CGFloat pathLineWidth;
-
-/// YES:(PathFillEvenOdd) Text is filled in the area that would be painted if the path were given to CGContextEOFillPath.
-/// NO: (PathFillWindingNumber) Text is fill in the area that would be painted if the path were given to CGContextFillPath.
-/// Default is YES;
-@property (getter=isPathFillEvenOdd) BOOL pathFillEvenOdd;
-
-/// Whether the text is vertical form (may used for CJK text layout). Default is NO.
-@property (getter=isVerticalForm) BOOL verticalForm;
-
-/// Maximum number of rows, 0 means no limit. Default is 0.
-@property NSUInteger maximumNumberOfRows;
-
-/// The line truncation type, default is none.
-@property ASTextTruncationType truncationType;
-
-/// The truncation token. If nil, the layout will use "…" instead. Default is nil.
-@property (nullable, copy) NSAttributedString *truncationToken;
-
-/// This modifier is applied to the lines before the layout is completed,
-/// give you a chance to modify the line position. Default is nil.
-@property (nullable, copy) id<ASTextLinePositionModifier> linePositionModifier;
-@end
-
-
-/**
- The ASTextLinePositionModifier protocol declares the required method to modify
- the line position in text layout progress. See `ASTextLinePositionSimpleModifier` for example.
- */
-@protocol ASTextLinePositionModifier <NSObject, NSCopying>
-@required
-/**
- This method will called before layout is completed. The method should be thread-safe.
- @param lines     An array of ASTextLine.
- @param text      The full text.
- @param container The layout container.
- */
-- (void)modifyLines:(NSArray<ASTextLine *> *)lines fromText:(NSAttributedString *)text inContainer:(ASTextContainer *)container;
-@end
-
-
-/**
- A simple implementation of `ASTextLinePositionModifier`. It can fix each line's position
- to a specified value, lets each line of height be the same.
- */
-@interface ASTextLinePositionSimpleModifier : NSObject <ASTextLinePositionModifier>
-@property CGFloat fixedLineHeight; ///< The fixed line height (distance between two baseline).
-@end
-
-
-
-/**
- ASTextLayout class is a readonly class stores text layout result.
- All the property in this class is readonly, and should not be changed.
- The methods in this class is thread-safe (except some of the draw methods).
- 
- example: (layout with a circle exclusion path)
- 
- ┌──────────────────────────┐  <------ container
- │ [--------Line0--------]  │  <- Row0
- │ [--------Line1--------]  │  <- Row1
- │ [-Line2-]     [-Line3-]  │  <- Row2
- │ [-Line4]       [Line5-]  │  <- Row3
- │ [-Line6-]     [-Line7-]  │  <- Row4
- │ [--------Line8--------]  │  <- Row5
- │ [--------Line9--------]  │  <- Row6
- └──────────────────────────┘
- */
-@interface ASTextLayout : NSObject <NSCopying>
-
-
-#pragma mark - Generate text layout
-///=============================================================================
-/// @name Generate text layout
-///=============================================================================
-
-/**
- Generate a layout with the given container size and text.
- 
- @param size The text container's size
- @param text The text (if nil, returns nil).
- @return A new layout, or nil when an error occurs.
- */
-+ (nullable ASTextLayout *)layoutWithContainerSize:(CGSize)size text:(NSAttributedString *)text;
-
-/**
- Generate a layout with the given container and text.
- 
- @param container The text container (if nil, returns nil).
- @param text      The text (if nil, returns nil).
- @return A new layout, or nil when an error occurs.
- */
-+ (nullable ASTextLayout *)layoutWithContainer:(ASTextContainer *)container text:(NSAttributedString *)text;
-
-/**
- Generate a layout with the given container and text.
- 
- @param container The text container (if nil, returns nil).
- @param text      The text (if nil, returns nil).
- @param range     The text range (if out of range, returns nil). If the
- length of the range is 0, it means the length is no limit.
- @return A new layout, or nil when an error occurs.
- */
-+ (nullable ASTextLayout *)layoutWithContainer:(ASTextContainer *)container text:(NSAttributedString *)text range:(NSRange)range;
-
-/**
- Generate layouts with the given containers and text.
- 
- @param containers An array of ASTextContainer object (if nil, returns nil).
- @param text       The text (if nil, returns nil).
- @return An array of ASTextLayout object (the count is same as containers),
- or nil when an error occurs.
- */
-+ (nullable NSArray<ASTextLayout *> *)layoutWithContainers:(NSArray<ASTextContainer *> *)containers
-                                                      text:(NSAttributedString *)text;
-
-/**
- Generate layouts with the given containers and text.
- 
- @param containers An array of ASTextContainer object (if nil, returns nil).
- @param text       The text (if nil, returns nil).
- @param range      The text range (if out of range, returns nil). If the
- length of the range is 0, it means the length is no limit.
- @return An array of ASTextLayout object (the count is same as containers),
- or nil when an error occurs.
- */
-+ (nullable NSArray<ASTextLayout *> *)layoutWithContainers:(NSArray<ASTextContainer *> *)containers
-                                                      text:(NSAttributedString *)text
-                                                     range:(NSRange)range;
-
-- (instancetype)init UNAVAILABLE_ATTRIBUTE;
-+ (instancetype)new UNAVAILABLE_ATTRIBUTE;
-
-
-#pragma mark - Text layout attributes
-///=============================================================================
-/// @name Text layout attributes
-///=============================================================================
-
-///< The text container
-@property (nonatomic, readonly) ASTextContainer *container;
-///< The full text
-@property (nonatomic, readonly) NSAttributedString *text;
-///< The text range in full text
-@property (nonatomic, readonly) NSRange range;
-///< CTFrame
-@property (nonatomic, readonly) CTFrameRef frame;
-///< Array of `ASTextLine`, no truncated
-@property (nonatomic, readonly) NSArray<ASTextLine *> *lines;
-///< ASTextLine with truncated token, or nil
-@property (nullable, nonatomic, readonly) ASTextLine *truncatedLine;
-///< Array of `ASTextAttachment`
-@property (nullable, nonatomic, readonly) NSArray<ASTextAttachment *> *attachments;
-///< Array of NSRange(wrapped by NSValue) in text
-@property (nullable, nonatomic, readonly) NSArray<NSValue *> *attachmentRanges;
-///< Array of CGRect(wrapped by NSValue) in container
-@property (nullable, nonatomic, readonly) NSArray<NSValue *> *attachmentRects;
-///< Set of Attachment (UIImage/UIView/CALayer)
-@property (nullable, nonatomic, readonly) NSSet *attachmentContentsSet;
-///< Number of rows
-@property (nonatomic, readonly) NSUInteger rowCount;
-///< Visible text range
-@property (nonatomic, readonly) NSRange visibleRange;
-///< Bounding rect (glyphs)
-@property (nonatomic, readonly) CGRect textBoundingRect;
-///< Bounding size (glyphs and insets, ceil to pixel)
-@property (nonatomic, readonly) CGSize textBoundingSize;
-///< Has highlight attribute
-@property (nonatomic, readonly) BOOL containsHighlight;
-///< Has block border attribute
-@property (nonatomic, readonly) BOOL needDrawBlockBorder;
-///< Has background border attribute
-@property (nonatomic, readonly) BOOL needDrawBackgroundBorder;
-///< Has shadow attribute
-@property (nonatomic, readonly) BOOL needDrawShadow;
-///< Has underline attribute
-@property (nonatomic, readonly) BOOL needDrawUnderline;
-///< Has visible text
-@property (nonatomic, readonly) BOOL needDrawText;
-///< Has attachment attribute
-@property (nonatomic, readonly) BOOL needDrawAttachment;
-///< Has inner shadow attribute
-@property (nonatomic, readonly) BOOL needDrawInnerShadow;
-///< Has strickthrough attribute
-@property (nonatomic, readonly) BOOL needDrawStrikethrough;
-///< Has border attribute
-@property (nonatomic, readonly) BOOL needDrawBorder;
-
-
-#pragma mark - Query information from text layout
-///=============================================================================
-/// @name Query information from text layout
-///=============================================================================
-
-/**
- The first line index for row.
- 
- @param row  A row index.
- @return The line index, or NSNotFound if not found.
- */
-- (NSUInteger)lineIndexForRow:(NSUInteger)row;
-
-/**
- The number of lines for row.
- 
- @param row  A row index.
- @return The number of lines, or NSNotFound when an error occurs.
- */
-- (NSUInteger)lineCountForRow:(NSUInteger)row;
-
-/**
- The row index for line.
- 
- @param line A row index.
- 
- @return The row index, or NSNotFound if not found.
- */
-- (NSUInteger)rowIndexForLine:(NSUInteger)line;
-
-/**
- The line index for a specified point.
- 
- @discussion It returns NSNotFound if there's no text at the point.
- 
- @param point  A point in the container.
- @return The line index, or NSNotFound if not found.
- */
-- (NSUInteger)lineIndexForPoint:(CGPoint)point;
-
-/**
- The line index closest to a specified point.
- 
- @param point  A point in the container.
- @return The line index, or NSNotFound if no line exist in layout.
- */
-- (NSUInteger)closestLineIndexForPoint:(CGPoint)point;
-
-/**
- The offset in container for a text position in a specified line.
- 
- @discussion The offset is the text position's baseline point.x.
- If the container is vertical form, the offset is the baseline point.y;
- 
- @param position   The text position in string.
- @param lineIndex  The line index.
- @return The offset in container, or CGFLOAT_MAX if not found.
- */
-- (CGFloat)offsetForTextPosition:(NSUInteger)position lineIndex:(NSUInteger)lineIndex;
-
-/**
- The text position for a point in a specified line.
- 
- @discussion This method just call CTLineGetStringIndexForPosition() and does
- NOT consider the emoji, line break character, binding text...
- 
- @param point      A point in the container.
- @param lineIndex  The line index.
- @return The text position, or NSNotFound if not found.
- */
-- (NSUInteger)textPositionForPoint:(CGPoint)point lineIndex:(NSUInteger)lineIndex;
-
-/**
- The closest text position to a specified point.
- 
- @discussion This method takes into account the restrict of emoji, line break
- character, binding text and text affinity.
- 
- @param point  A point in the container.
- @return A text position, or nil if not found.
- */
-- (nullable ASTextPosition *)closestPositionToPoint:(CGPoint)point;
-
-/**
- Returns the new position when moving selection grabber in text view.
- 
- @discussion There are two grabber in the text selection period, user can only
- move one grabber at the same time.
- 
- @param point          A point in the container.
- @param oldPosition    The old text position for the moving grabber.
- @param otherPosition  The other position in text selection view.
- 
- @return A text position, or nil if not found.
- */
-- (nullable ASTextPosition *)positionForPoint:(CGPoint)point
-                                  oldPosition:(ASTextPosition *)oldPosition
-                                otherPosition:(ASTextPosition *)otherPosition;
-
-/**
- Returns the character or range of characters that is at a given point in the container.
- If there is no text at the point, returns nil.
- 
- @discussion This method takes into account the restrict of emoji, line break
- character, binding text and text affinity.
- 
- @param point  A point in the container.
- @return An object representing a range that encloses a character (or characters)
- at point. Or nil if not found.
- */
-- (nullable ASTextRange *)textRangeAtPoint:(CGPoint)point;
-
-/**
- Returns the closest character or range of characters that is at a given point in
- the container.
- 
- @discussion This method takes into account the restrict of emoji, line break
- character, binding text and text affinity.
- 
- @param point  A point in the container.
- @return An object representing a range that encloses a character (or characters)
- at point. Or nil if not found.
- */
-- (nullable ASTextRange *)closestTextRangeAtPoint:(CGPoint)point;
-
-/**
- If the position is inside an emoji, composed character sequences, line break '\\r\\n'
- or custom binding range, then returns the range by extend the position. Otherwise,
- returns a zero length range from the position.
- 
- @param position A text-position object that identifies a location in layout.
- 
- @return A text-range object that extend the position. Or nil if an error occurs
- */
-- (nullable ASTextRange *)textRangeByExtendingPosition:(ASTextPosition *)position;
-
-/**
- Returns a text range at a given offset in a specified direction from another
- text position to its farthest extent in a certain direction of layout.
- 
- @param position  A text-position object that identifies a location in layout.
- @param direction A constant that indicates a direction of layout (right, left, up, down).
- @param offset    A character offset from position.
- 
- @return A text-range object that represents the distance from position to the
- farthest extent in direction. Or nil if an error occurs.
- */
-- (nullable ASTextRange *)textRangeByExtendingPosition:(ASTextPosition *)position
-                                           inDirection:(UITextLayoutDirection)direction
-                                                offset:(NSInteger)offset;
-
-/**
- Returns the line index for a given text position.
- 
- @discussion This method takes into account the text affinity.
- 
- @param position A text-position object that identifies a location in layout.
- @return The line index, or NSNotFound if not found.
- */
-- (NSUInteger)lineIndexForPosition:(ASTextPosition *)position;
-
-/**
- Returns the baseline position for a given text position.
- 
- @param position An object that identifies a location in the layout.
- @return The baseline position for text, or CGPointZero if not found.
- */
-- (CGPoint)linePositionForPosition:(ASTextPosition *)position;
-
-/**
- Returns a rectangle used to draw the caret at a given insertion point.
- 
- @param position An object that identifies a location in the layout.
- @return A rectangle that defines the area for drawing the caret. The width is
- always zero in normal container, the height is always zero in vertical form container.
- If not found, it returns CGRectNull.
- */
-- (CGRect)caretRectForPosition:(ASTextPosition *)position;
-
-/**
- Returns the first rectangle that encloses a range of text in the layout.
- 
- @param range An object that represents a range of text in layout.
- 
- @return The first rectangle in a range of text. You might use this rectangle to
- draw a correction rectangle. The "first" in the name refers the rectangle
- enclosing the first line when the range encompasses multiple lines of text.
- If not found, it returns CGRectNull.
- */
-- (CGRect)firstRectForRange:(ASTextRange *)range;
-
-/**
- Returns the rectangle union that encloses a range of text in the layout.
- 
- @param range An object that represents a range of text in layout.
- 
- @return A rectangle that defines the area than encloses the range.
- If not found, it returns CGRectNull.
- */
-- (CGRect)rectForRange:(ASTextRange *)range;
-
-/**
- Returns an array of selection rects corresponding to the range of text.
- The start and end rect can be used to show grabber.
- 
- @param range An object representing a range in text.
- @return An array of `ASTextSelectionRect` objects that encompass the selection.
- If not found, the array is empty.
- */
-- (NSArray<ASTextSelectionRect *> *)selectionRectsForRange:(ASTextRange *)range;
-
-/**
- Returns an array of selection rects corresponding to the range of text.
- 
- @param range An object representing a range in text.
- @return An array of `ASTextSelectionRect` objects that encompass the selection.
- If not found, the array is empty.
- */
-- (NSArray<ASTextSelectionRect *> *)selectionRectsWithoutStartAndEndForRange:(ASTextRange *)range;
-
-/**
- Returns the start and end selection rects corresponding to the range of text.
- The start and end rect can be used to show grabber.
- 
- @param range An object representing a range in text.
- @return An array of `ASTextSelectionRect` objects contains the start and end to
- the selection. If not found, the array is empty.
- */
-- (NSArray<ASTextSelectionRect *> *)selectionRectsWithOnlyStartAndEndForRange:(ASTextRange *)range;
-
-
-#pragma mark - Draw text layout
-///=============================================================================
-/// @name Draw text layout
-///=============================================================================
-
-/**
- Draw the layout and show the attachments.
- 
- @discussion If the `view` parameter is not nil, then the attachment views will
- add to this `view`, and if the `layer` parameter is not nil, then the attachment
- layers will add to this `layer`.
- 
- @warning This method should be called on main thread if `view` or `layer` parameter
- is not nil and there's UIView or CALayer attachments in layout.
- Otherwise, it can be called on any thread.
- 
- @param context The draw context. Pass nil to avoid text and image drawing.
- @param size    The context size.
- @param point   The point at which to draw the layout.
- @param view    The attachment views will add to this view.
- @param layer   The attachment layers will add to this layer.
- @param debug   The debug option. Pass nil to avoid debug drawing.
- @param cancel  The cancel checker block. It will be called in drawing progress.
- If it returns YES, the further draw progress will be canceled.
- Pass nil to ignore this feature.
- */
-- (void)drawInContext:(nullable CGContextRef)context
-                 size:(CGSize)size
-                point:(CGPoint)point
-                 view:(nullable UIView *)view
-                layer:(nullable CALayer *)layer
-                debug:(nullable ASTextDebugOption *)debug
-               cancel:(nullable BOOL (^)(void))cancel;
-
-/**
- Draw the layout text and image (without view or layer attachments).
- 
- @discussion This method is thread safe and can be called on any thread.
- 
- @param context The draw context. Pass nil to avoid text and image drawing.
- @param size    The context size.
- @param debug   The debug option. Pass nil to avoid debug drawing.
- */
-- (void)drawInContext:(nullable CGContextRef)context
-                 size:(CGSize)size
-                debug:(nullable ASTextDebugOption *)debug;
-
-@end
-
-NS_ASSUME_NONNULL_END
diff --git a/submodules/AsyncDisplayKit/Source/Private/TextExperiment/Component/ASTextLayout.mm b/submodules/AsyncDisplayKit/Source/Private/TextExperiment/Component/ASTextLayout.mm
deleted file mode 100644
index 135709a845..0000000000
--- a/submodules/AsyncDisplayKit/Source/Private/TextExperiment/Component/ASTextLayout.mm
+++ /dev/null
@@ -1,3485 +0,0 @@
-//
-//  ASTextLayout.mm
-//  Texture
-//
-//  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.
-//  Changes after 4/13/2017 are: Copyright (c) Pinterest, Inc.  All rights reserved.
-//  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
-//
-
-#import <AsyncDisplayKit/ASTextLayout.h>
-
-#import <AsyncDisplayKit/ASAssert.h>
-#import <AsyncDisplayKit/ASConfigurationInternal.h>
-#import <AsyncDisplayKit/ASTextUtilities.h>
-#import <AsyncDisplayKit/ASTextAttribute.h>
-#import <AsyncDisplayKit/NSAttributedString+ASText.h>
-#import <AsyncDisplayKit/ASInternalHelpers.h>
-
-#import <pthread.h>
-
-const CGSize ASTextContainerMaxSize = (CGSize){0x100000, 0x100000};
-
-typedef struct {
-  CGFloat head;
-  CGFloat foot;
-} ASRowEdge;
-
-static inline CGSize ASTextClipCGSize(CGSize size) {
-  if (size.width > ASTextContainerMaxSize.width) size.width = ASTextContainerMaxSize.width;
-  if (size.height > ASTextContainerMaxSize.height) size.height = ASTextContainerMaxSize.height;
-  return size;
-}
-
-static inline UIEdgeInsets UIEdgeInsetRotateVertical(UIEdgeInsets insets) {
-  UIEdgeInsets one;
-  one.top = insets.left;
-  one.left = insets.bottom;
-  one.bottom = insets.right;
-  one.right = insets.top;
-  return one;
-}
-
-/**
- Sometimes CoreText may convert CGColor to UIColor for `kCTForegroundColorAttributeName`
- attribute in iOS7. This should be a bug of CoreText, and may cause crash. Here's a workaround.
- */
-static CGColorRef ASTextGetCGColor(CGColorRef color) {
-  static UIColor *defaultColor;
-  static dispatch_once_t onceToken;
-  dispatch_once(&onceToken, ^{
-    defaultColor = [UIColor blackColor];
-  });
-  if (!color) return defaultColor.CGColor;
-  if ([((__bridge NSObject *)color) respondsToSelector:@selector(CGColor)]) {
-    return ((__bridge UIColor *)color).CGColor;
-  }
-  return color;
-}
-
-@implementation ASTextLinePositionSimpleModifier
-- (void)modifyLines:(NSArray *)lines fromText:(NSAttributedString *)text inContainer:(ASTextContainer *)container {
-  if (container.verticalForm) {
-    for (NSUInteger i = 0, max = lines.count; i < max; i++) {
-      ASTextLine *line = lines[i];
-      CGPoint pos = line.position;
-      pos.x = container.size.width - container.insets.right - line.row * _fixedLineHeight - _fixedLineHeight * 0.9;
-      line.position = pos;
-    }
-  } else {
-    for (NSUInteger i = 0, max = lines.count; i < max; i++) {
-      ASTextLine *line = lines[i];
-      CGPoint pos = line.position;
-      pos.y = line.row * _fixedLineHeight + _fixedLineHeight * 0.9 + container.insets.top;
-      line.position = pos;
-    }
-  }
-}
-
-- (id)copyWithZone:(NSZone *)zone {
-  ASTextLinePositionSimpleModifier *one = [self.class new];
-  one.fixedLineHeight = _fixedLineHeight;
-  return one;
-}
-@end
-
-
-@implementation ASTextContainer {
-  @package
-  BOOL _readonly; ///< used only in ASTextLayout.implementation
-  dispatch_semaphore_t _lock;
-  
-  CGSize _size;
-  UIEdgeInsets _insets;
-  UIBezierPath *_path;
-  NSArray *_exclusionPaths;
-  BOOL _pathFillEvenOdd;
-  CGFloat _pathLineWidth;
-  BOOL _verticalForm;
-  NSUInteger _maximumNumberOfRows;
-  ASTextTruncationType _truncationType;
-  NSAttributedString *_truncationToken;
-  id<ASTextLinePositionModifier> _linePositionModifier;
-}
-
-- (NSString *)description
-{
-  return [NSString
-          stringWithFormat:@"immutable: %@, insets: %@, size: %@", self->_readonly ? @"YES" : @"NO",
-                           NSStringFromUIEdgeInsets(self->_insets), NSStringFromCGSize(self->_size)];
-}
-
-+ (instancetype)containerWithSize:(CGSize)size NS_RETURNS_RETAINED {
-  return [self containerWithSize:size insets:UIEdgeInsetsZero];
-}
-
-+ (instancetype)containerWithSize:(CGSize)size insets:(UIEdgeInsets)insets NS_RETURNS_RETAINED {
-  ASTextContainer *one = [self new];
-  one.size = ASTextClipCGSize(size);
-  one.insets = insets;
-  return one;
-}
-
-+ (instancetype)containerWithPath:(UIBezierPath *)path NS_RETURNS_RETAINED {
-  ASTextContainer *one = [self new];
-  one.path = path;
-  return one;
-}
-
-- (instancetype)init {
-  self = [super init];
-  if (!self) return nil;
-  _lock = dispatch_semaphore_create(1);
-  _pathFillEvenOdd = YES;
-  return self;
-}
-
-- (id)copyForced:(BOOL)forceCopy
-{
-  dispatch_semaphore_wait(_lock, DISPATCH_TIME_FOREVER);
-  if (_readonly && !forceCopy) {
-    dispatch_semaphore_signal(_lock);
-    return self;
-  }
-
-  ASTextContainer *one = [self.class new];
-  one->_size = _size;
-  one->_insets = _insets;
-  one->_path = _path;
-  one->_exclusionPaths = [_exclusionPaths copy];
-  one->_pathFillEvenOdd = _pathFillEvenOdd;
-  one->_pathLineWidth = _pathLineWidth;
-  one->_verticalForm = _verticalForm;
-  one->_maximumNumberOfRows = _maximumNumberOfRows;
-  one->_truncationType = _truncationType;
-  one->_truncationToken = [_truncationToken copy];
-  one->_linePositionModifier = [(NSObject *)_linePositionModifier copy];
-  dispatch_semaphore_signal(_lock);
-  return one;
-}
-
-- (id)copyWithZone:(NSZone *)zone {
-  return [self copyForced:NO];
-}
-
-- (id)mutableCopyWithZone:(NSZone *)zone {
-  return [self copyForced:YES];
-}
-
-- (void)encodeWithCoder:(NSCoder *)aCoder {
-  [aCoder encodeObject:[NSValue valueWithCGSize:_size] forKey:@"size"];
-  [aCoder encodeObject:[NSValue valueWithUIEdgeInsets:_insets] forKey:@"insets"];
-  [aCoder encodeObject:_path forKey:@"path"];
-  [aCoder encodeObject:_exclusionPaths forKey:@"exclusionPaths"];
-  [aCoder encodeBool:_pathFillEvenOdd forKey:@"pathFillEvenOdd"];
-  [aCoder encodeDouble:_pathLineWidth forKey:@"pathLineWidth"];
-  [aCoder encodeBool:_verticalForm forKey:@"verticalForm"];
-  [aCoder encodeInteger:_maximumNumberOfRows forKey:@"maximumNumberOfRows"];
-  [aCoder encodeInteger:_truncationType forKey:@"truncationType"];
-  [aCoder encodeObject:_truncationToken forKey:@"truncationToken"];
-  if ([_linePositionModifier respondsToSelector:@selector(encodeWithCoder:)] &&
-      [_linePositionModifier respondsToSelector:@selector(initWithCoder:)]) {
-    [aCoder encodeObject:_linePositionModifier forKey:@"linePositionModifier"];
-  }
-}
-
-- (id)initWithCoder:(NSCoder *)aDecoder {
-  self = [self init];
-  _size = ((NSValue *)[aDecoder decodeObjectForKey:@"size"]).CGSizeValue;
-  _insets = ((NSValue *)[aDecoder decodeObjectForKey:@"insets"]).UIEdgeInsetsValue;
-  _path = [aDecoder decodeObjectForKey:@"path"];
-  _exclusionPaths = [aDecoder decodeObjectForKey:@"exclusionPaths"];
-  _pathFillEvenOdd = [aDecoder decodeBoolForKey:@"pathFillEvenOdd"];
-  _pathLineWidth = [aDecoder decodeDoubleForKey:@"pathLineWidth"];
-  _verticalForm = [aDecoder decodeBoolForKey:@"verticalForm"];
-  _maximumNumberOfRows = [aDecoder decodeIntegerForKey:@"maximumNumberOfRows"];
-  _truncationType = (ASTextTruncationType)[aDecoder decodeIntegerForKey:@"truncationType"];
-  _truncationToken = [aDecoder decodeObjectForKey:@"truncationToken"];
-  _linePositionModifier = [aDecoder decodeObjectForKey:@"linePositionModifier"];
-  return self;
-}
-
-- (void)makeImmutable
-{
-  dispatch_semaphore_wait(_lock, DISPATCH_TIME_FOREVER);
-  _readonly = YES;
-  dispatch_semaphore_signal(_lock);
-}
-
-#define Getter(...) \
-dispatch_semaphore_wait(_lock, DISPATCH_TIME_FOREVER); \
-__VA_ARGS__; \
-dispatch_semaphore_signal(_lock);
-
-#define Setter(...) \
-dispatch_semaphore_wait(_lock, DISPATCH_TIME_FOREVER); \
-if (__builtin_expect(_readonly, NO)) { \
-  ASDisplayNodeFailAssert(@"Attempt to modify immutable text container."); \
-  dispatch_semaphore_signal(_lock); \
-  return; \
-} \
-__VA_ARGS__; \
-dispatch_semaphore_signal(_lock);
-
-- (CGSize)size {
-  Getter(CGSize size = _size) return size;
-}
-
-- (void)setSize:(CGSize)size {
-  Setter(if(!_path) _size = ASTextClipCGSize(size));
-}
-
-- (UIEdgeInsets)insets {
-  Getter(UIEdgeInsets insets = _insets) return insets;
-}
-
-- (void)setInsets:(UIEdgeInsets)insets {
-  Setter(if(!_path){
-    if (insets.top < 0) insets.top = 0;
-    if (insets.left < 0) insets.left = 0;
-    if (insets.bottom < 0) insets.bottom = 0;
-    if (insets.right < 0) insets.right = 0;
-    _insets = insets;
-  });
-}
-
-- (UIBezierPath *)path {
-  Getter(UIBezierPath *path = _path) return path;
-}
-
-- (void)setPath:(UIBezierPath *)path {
-  Setter(
-         _path = path.copy;
-         if (_path) {
-           CGRect bounds = _path.bounds;
-           CGSize size = bounds.size;
-           UIEdgeInsets insets = UIEdgeInsetsZero;
-           if (bounds.origin.x < 0) size.width += bounds.origin.x;
-           if (bounds.origin.x > 0) insets.left = bounds.origin.x;
-           if (bounds.origin.y < 0) size.height += bounds.origin.y;
-           if (bounds.origin.y > 0) insets.top = bounds.origin.y;
-           _size = size;
-           _insets = insets;
-         }
-         );
-}
-
-- (NSArray *)exclusionPaths {
-  Getter(NSArray *paths = _exclusionPaths) return paths;
-}
-
-- (void)setExclusionPaths:(NSArray *)exclusionPaths {
-  Setter(_exclusionPaths = exclusionPaths.copy);
-}
-
-- (BOOL)isPathFillEvenOdd {
-  Getter(BOOL is = _pathFillEvenOdd) return is;
-}
-
-- (void)setPathFillEvenOdd:(BOOL)pathFillEvenOdd {
-  Setter(_pathFillEvenOdd = pathFillEvenOdd);
-}
-
-- (CGFloat)pathLineWidth {
-  Getter(CGFloat width = _pathLineWidth) return width;
-}
-
-- (void)setPathLineWidth:(CGFloat)pathLineWidth {
-  Setter(_pathLineWidth = pathLineWidth);
-}
-
-- (BOOL)isVerticalForm {
-  Getter(BOOL v = _verticalForm) return v;
-}
-
-- (void)setVerticalForm:(BOOL)verticalForm {
-  Setter(_verticalForm = verticalForm);
-}
-
-- (NSUInteger)maximumNumberOfRows {
-  Getter(NSUInteger num = _maximumNumberOfRows) return num;
-}
-
-- (void)setMaximumNumberOfRows:(NSUInteger)maximumNumberOfRows {
-  Setter(_maximumNumberOfRows = maximumNumberOfRows);
-}
-
-- (ASTextTruncationType)truncationType {
-  Getter(ASTextTruncationType type = _truncationType) return type;
-}
-
-- (void)setTruncationType:(ASTextTruncationType)truncationType {
-  Setter(_truncationType = truncationType);
-}
-
-- (NSAttributedString *)truncationToken {
-  Getter(NSAttributedString *token = _truncationToken) return token;
-}
-
-- (void)setTruncationToken:(NSAttributedString *)truncationToken {
-  Setter(_truncationToken = truncationToken.copy);
-}
-
-- (void)setLinePositionModifier:(id<ASTextLinePositionModifier>)linePositionModifier {
-  Setter(_linePositionModifier = [(NSObject *)linePositionModifier copy]);
-}
-
-- (id<ASTextLinePositionModifier>)linePositionModifier {
-  Getter(id<ASTextLinePositionModifier> m = _linePositionModifier) return m;
-}
-
-#undef Getter
-#undef Setter
-@end
-
-
-
-
-@interface ASTextLayout ()
-
-@property (nonatomic) ASTextContainer *container;
-@property (nonatomic) NSAttributedString *text;
-@property (nonatomic) NSRange range;
-
-@property (nonatomic) CTFrameRef frame;
-@property (nonatomic) NSArray *lines;
-@property (nonatomic) ASTextLine *truncatedLine;
-@property (nonatomic) NSArray *attachments;
-@property (nonatomic) NSArray *attachmentRanges;
-@property (nonatomic) NSArray *attachmentRects;
-@property (nonatomic) NSSet *attachmentContentsSet;
-@property (nonatomic) NSUInteger rowCount;
-@property (nonatomic) NSRange visibleRange;
-@property (nonatomic) CGRect textBoundingRect;
-@property (nonatomic) CGSize textBoundingSize;
-
-@property (nonatomic) BOOL containsHighlight;
-@property (nonatomic) BOOL needDrawBlockBorder;
-@property (nonatomic) BOOL needDrawBackgroundBorder;
-@property (nonatomic) BOOL needDrawShadow;
-@property (nonatomic) BOOL needDrawUnderline;
-@property (nonatomic) BOOL needDrawText;
-@property (nonatomic) BOOL needDrawAttachment;
-@property (nonatomic) BOOL needDrawInnerShadow;
-@property (nonatomic) BOOL needDrawStrikethrough;
-@property (nonatomic) BOOL needDrawBorder;
-
-@property (nonatomic) NSUInteger *lineRowsIndex;
-@property (nonatomic) ASRowEdge *lineRowsEdge; ///< top-left origin
-
-@end
-
-
-
-@implementation ASTextLayout
-
-#pragma mark - Layout
-
-- (instancetype)_init {
-  self = [super init];
-  return self;
-}
-
-- (NSString *)description
-{
-  return [NSString stringWithFormat:@"lines: %ld, visibleRange:%@, textBoundingRect:%@",
-                                    [self.lines count],
-                                    NSStringFromRange(self.visibleRange),
-                                    NSStringFromCGRect(self.textBoundingRect)];
-}
-
-+ (ASTextLayout *)layoutWithContainerSize:(CGSize)size text:(NSAttributedString *)text {
-  ASTextContainer *container = [ASTextContainer containerWithSize:size];
-  return [self layoutWithContainer:container text:text];
-}
-
-+ (ASTextLayout *)layoutWithContainer:(ASTextContainer *)container text:(NSAttributedString *)text {
-  return [self layoutWithContainer:container text:text range:NSMakeRange(0, text.length)];
-}
-
-+ (ASTextLayout *)layoutWithContainer:(ASTextContainer *)container text:(NSAttributedString *)text range:(NSRange)range {
-  ASTextLayout *layout = NULL;
-  CGPathRef cgPath = nil;
-  CGRect cgPathBox = {0};
-  BOOL isVerticalForm = NO;
-  BOOL rowMaySeparated = NO;
-  NSMutableDictionary *frameAttrs = nil;
-  CTFramesetterRef ctSetter = NULL;
-  CTFrameRef ctFrame = NULL;
-  CFArrayRef ctLines = nil;
-  CGPoint *lineOrigins = NULL;
-  NSUInteger lineCount = 0;
-  NSMutableArray *lines = nil;
-  NSMutableArray *attachments = nil;
-  NSMutableArray *attachmentRanges = nil;
-  NSMutableArray *attachmentRects = nil;
-  NSMutableSet *attachmentContentsSet = nil;
-  BOOL needTruncation = NO;
-  NSAttributedString *truncationToken = nil;
-  ASTextLine *truncatedLine = nil;
-  ASRowEdge *lineRowsEdge = NULL;
-  NSUInteger *lineRowsIndex = NULL;
-  NSRange visibleRange;
-  NSUInteger maximumNumberOfRows = 0;
-  BOOL constraintSizeIsExtended = NO;
-  CGRect constraintRectBeforeExtended = {0};
-#define FAIL_AND_RETURN {\
-  if (cgPath) CFRelease(cgPath); \
-  if (ctSetter) CFRelease(ctSetter); \
-  if (ctFrame) CFRelease(ctFrame); \
-  if (lineOrigins) free(lineOrigins); \
-  if (lineRowsEdge) free(lineRowsEdge); \
-  if (lineRowsIndex) free(lineRowsIndex); \
-  return nil; }
-  
-  container = [container copy];
-  if (!text || !container) return nil;
-  if (range.location + range.length > text.length) return nil;
-  [container makeImmutable];
-  maximumNumberOfRows = container.maximumNumberOfRows;
-  
-  // It may use larger constraint size when create CTFrame with
-  // CTFramesetterCreateFrame in iOS 10.
-  BOOL needFixLayoutSizeBug = AS_AT_LEAST_IOS10;
-
-  layout = [[ASTextLayout alloc] _init];
-  layout.text = text;
-  layout.container = container;
-  layout.range = range;
-  isVerticalForm = container.verticalForm;
-  
-  // set cgPath and cgPathBox
-  if (container.path == nil && container.exclusionPaths.count == 0) {
-    if (container.size.width <= 0 || container.size.height <= 0) FAIL_AND_RETURN
-    CGRect rect = (CGRect) {CGPointZero, container.size };
-    if (needFixLayoutSizeBug) {
-      constraintSizeIsExtended = YES;
-      constraintRectBeforeExtended = UIEdgeInsetsInsetRect(rect, container.insets);
-      constraintRectBeforeExtended = CGRectStandardize(constraintRectBeforeExtended);
-      if (container.isVerticalForm) {
-        rect.size.width = ASTextContainerMaxSize.width;
-      } else {
-        rect.size.height = ASTextContainerMaxSize.height;
-      }
-    }
-    rect = UIEdgeInsetsInsetRect(rect, container.insets);
-    rect = CGRectStandardize(rect);
-    cgPathBox = rect;
-    rect = CGRectApplyAffineTransform(rect, CGAffineTransformMakeScale(1, -1));
-    cgPath = CGPathCreateWithRect(rect, NULL); // let CGPathIsRect() returns true
-  } else if (container.path && CGPathIsRect(container.path.CGPath, &cgPathBox) && container.exclusionPaths.count == 0) {
-    CGRect rect = CGRectApplyAffineTransform(cgPathBox, CGAffineTransformMakeScale(1, -1));
-    cgPath = CGPathCreateWithRect(rect, NULL); // let CGPathIsRect() returns true
-  } else {
-    rowMaySeparated = YES;
-    CGMutablePathRef path = NULL;
-    if (container.path) {
-      path = CGPathCreateMutableCopy(container.path.CGPath);
-    } else {
-      CGRect rect = (CGRect) {CGPointZero, container.size };
-      rect = UIEdgeInsetsInsetRect(rect, container.insets);
-      CGPathRef rectPath = CGPathCreateWithRect(rect, NULL);
-      if (rectPath) {
-        path = CGPathCreateMutableCopy(rectPath);
-        CGPathRelease(rectPath);
-      }
-    }
-    if (path) {
-      [layout.container.exclusionPaths enumerateObjectsUsingBlock: ^(UIBezierPath *onePath, NSUInteger idx, BOOL *stop) {
-        CGPathAddPath(path, NULL, onePath.CGPath);
-      }];
-      
-      cgPathBox = CGPathGetPathBoundingBox(path);
-      CGAffineTransform trans = CGAffineTransformMakeScale(1, -1);
-      CGMutablePathRef transPath = CGPathCreateMutableCopyByTransformingPath(path, &trans);
-      CGPathRelease(path);
-      path = transPath;
-    }
-    cgPath = path;
-  }
-  if (!cgPath) FAIL_AND_RETURN
-  
-  // frame setter config
-  frameAttrs = [[NSMutableDictionary alloc] init];
-  if (container.isPathFillEvenOdd == NO) {
-    frameAttrs[(id)kCTFramePathFillRuleAttributeName] = @(kCTFramePathFillWindingNumber);
-  }
-  if (container.pathLineWidth > 0) {
-    frameAttrs[(id)kCTFramePathWidthAttributeName] = @(container.pathLineWidth);
-  }
-  if (container.isVerticalForm == YES) {
-    frameAttrs[(id)kCTFrameProgressionAttributeName] = @(kCTFrameProgressionRightToLeft);
-  }
-  
-  /*
-   * Framesetter cache.
-   * Framesetters can only be used by one thread at a time.
-   * Create a CFSet with no callbacks (raw pointers) to keep track of which
-   * framesetters are in use on other threads. If the one for our string is already in use,
-   * just create a new one. This should be pretty rare.
-   */
-  static pthread_mutex_t busyFramesettersLock = PTHREAD_MUTEX_INITIALIZER;
-  static NSCache<NSAttributedString *, id> *framesetterCache;
-  static CFMutableSetRef busyFramesetters;
-  static dispatch_once_t onceToken;
-  dispatch_once(&onceToken, ^{
-    if (ASActivateExperimentalFeature(ASExperimentalFramesetterCache)) {
-      framesetterCache = [[NSCache alloc] init];
-      framesetterCache.name = @"org.TextureGroup.Texture.framesetterCache";
-      busyFramesetters = CFSetCreateMutable(NULL, 0, NULL);
-    }
-  });
-
-  BOOL haveCached = NO, useCached = NO;
-  if (framesetterCache) {
-    // Check if there's one in the cache.
-    ctSetter = (__bridge_retained CTFramesetterRef)[framesetterCache objectForKey:text];
-
-    if (ctSetter) {
-      haveCached = YES;
-
-      // Check-and-set busy on the cached one.
-      pthread_mutex_lock(&busyFramesettersLock);
-      BOOL busy = CFSetContainsValue(busyFramesetters, ctSetter);
-      if (!busy) {
-        CFSetAddValue(busyFramesetters, ctSetter);
-        useCached = YES;
-      }
-      pthread_mutex_unlock(&busyFramesettersLock);
-
-      // Release if it was busy.
-      if (busy) {
-        CFRelease(ctSetter);
-        ctSetter = NULL;
-      }
-    }
-  }
-
-  // Create a framesetter if needed.
-  if (!ctSetter) {
-    ctSetter = CTFramesetterCreateWithAttributedString((CFAttributedStringRef)text);
-  }
-
-  if (!ctSetter) FAIL_AND_RETURN
-  ctFrame = CTFramesetterCreateFrame(ctSetter, ASTextCFRangeFromNSRange(range), cgPath, (CFDictionaryRef)frameAttrs);
-
-  // Return to cache.
-  if (framesetterCache) {
-    if (useCached) {
-      // If reused: mark available.
-      pthread_mutex_lock(&busyFramesettersLock);
-      CFSetRemoveValue(busyFramesetters, ctSetter);
-      pthread_mutex_unlock(&busyFramesettersLock);
-    } else if (!haveCached) {
-      // If first framesetter, add to cache.
-      [framesetterCache setObject:(__bridge id)ctSetter forKey:text];
-    }
-  }
-
-  if (!ctFrame) FAIL_AND_RETURN
-  lines = [NSMutableArray new];
-  ctLines = CTFrameGetLines(ctFrame);
-  lineCount = CFArrayGetCount(ctLines);
-  if (lineCount > 0) {
-    lineOrigins = (CGPoint *)malloc(lineCount * sizeof(CGPoint));
-    if (lineOrigins == NULL) FAIL_AND_RETURN
-    CTFrameGetLineOrigins(ctFrame, CFRangeMake(0, lineCount), lineOrigins);
-  }
-  
-  CGRect textBoundingRect = CGRectZero;
-  CGSize textBoundingSize = CGSizeZero;
-  NSInteger rowIdx = -1;
-  NSUInteger rowCount = 0;
-  CGRect lastRect = CGRectMake(0, -FLT_MAX, 0, 0);
-  CGPoint lastPosition = CGPointMake(0, -FLT_MAX);
-  if (isVerticalForm) {
-    lastRect = CGRectMake(FLT_MAX, 0, 0, 0);
-    lastPosition = CGPointMake(FLT_MAX, 0);
-  }
-  
-  // calculate line frame
-  NSUInteger lineCurrentIdx = 0;
-  BOOL measuringBeyondConstraints = NO;
-  for (NSUInteger i = 0; i < lineCount; i++) {
-    CTLineRef ctLine = (CTLineRef)CFArrayGetValueAtIndex(ctLines, i);
-    CFArrayRef ctRuns = CTLineGetGlyphRuns(ctLine);
-    if (!ctRuns || CFArrayGetCount(ctRuns) == 0) continue;
-    
-    // CoreText coordinate system
-    CGPoint ctLineOrigin = lineOrigins[i];
-    
-    // UIKit coordinate system
-    CGPoint position;
-    position.x = cgPathBox.origin.x + ctLineOrigin.x;
-    position.y = cgPathBox.size.height + cgPathBox.origin.y - ctLineOrigin.y;
-    
-    ASTextLine *line = [ASTextLine lineWithCTLine:ctLine position:position vertical:isVerticalForm];
-    
-    [lines addObject:line];
-  }
-  
-  // Give user a chance to modify the line's position.
-  [container.linePositionModifier modifyLines:lines fromText:text inContainer:container];
-  
-  BOOL first = YES;
-  for (ASTextLine *line in lines) {
-    CGPoint position = line.position;
-    CGRect rect = line.bounds;
-    if (constraintSizeIsExtended) {
-      if (isVerticalForm) {
-        if (rect.origin.x + rect.size.width >
-            constraintRectBeforeExtended.origin.x +
-                constraintRectBeforeExtended.size.width) {
-          measuringBeyondConstraints = YES;
-        }
-      } else {
-        if (rect.origin.y + rect.size.height >
-            constraintRectBeforeExtended.origin.y +
-                constraintRectBeforeExtended.size.height) {
-          measuringBeyondConstraints = YES;
-        }
-      }
-    }
-
-    BOOL newRow = !measuringBeyondConstraints;
-    if (newRow && rowMaySeparated && position.x != lastPosition.x) {
-      if (isVerticalForm) {
-        if (rect.size.width > lastRect.size.width) {
-          if (rect.origin.x > lastPosition.x && lastPosition.x > rect.origin.x - rect.size.width) newRow = NO;
-        } else {
-          if (lastRect.origin.x > position.x && position.x > lastRect.origin.x - lastRect.size.width) newRow = NO;
-        }
-      } else {
-        if (rect.size.height > lastRect.size.height) {
-          if (rect.origin.y < lastPosition.y && lastPosition.y < rect.origin.y + rect.size.height) newRow = NO;
-        } else {
-          if (lastRect.origin.y < position.y && position.y < lastRect.origin.y + lastRect.size.height) newRow = NO;
-        }
-      }
-    }
-    
-    if (newRow) rowIdx++;
-    lastRect = rect;
-    lastPosition = position;
-    
-    line.index = lineCurrentIdx;
-    line.row = rowIdx;
-
-    rowCount = rowIdx + 1;
-    lineCurrentIdx ++;
-
-    if (first) {
-      first = NO;
-      textBoundingRect = rect;
-    } else if (!measuringBeyondConstraints) {
-      if (maximumNumberOfRows == 0 || rowIdx < maximumNumberOfRows) {
-        textBoundingRect = CGRectUnion(textBoundingRect, rect);
-      }
-    }
-  }
-
-  {
-    NSMutableArray<ASTextLine *> *removedLines = [NSMutableArray new];
-    if (rowCount > 0) {
-      if (maximumNumberOfRows > 0) {
-        if (rowCount > maximumNumberOfRows) {
-          needTruncation = YES;
-          rowCount = maximumNumberOfRows;
-          do {
-            ASTextLine *line = lines.lastObject;
-            if (!line) break;
-            if (line.row < rowCount) break; // we have removed down to an allowed # of lines now
-            [lines removeLastObject];
-            [removedLines addObject:line];
-          } while (1);
-        }
-      }
-      ASTextLine *lastLine = rowCount < lines.count ? lines[rowCount - 1] : lines.lastObject;
-      if (!needTruncation && lastLine.range.location + lastLine.range.length < text.length) {
-        needTruncation = YES;
-        while (lines.count > rowCount) {
-          ASTextLine *line = lines.lastObject;
-          [lines removeLastObject];
-          [removedLines addObject:line];
-        }
-      }
-
-      lineRowsEdge = (ASRowEdge *) calloc(rowCount, sizeof(ASRowEdge));
-      if (lineRowsEdge == NULL) FAIL_AND_RETURN
-      lineRowsIndex = (NSUInteger *) calloc(rowCount, sizeof(NSUInteger));
-      if (lineRowsIndex == NULL) FAIL_AND_RETURN
-      NSInteger lastRowIdx = -1;
-      CGFloat lastHead = 0;
-      CGFloat lastFoot = 0;
-      for (NSUInteger i = 0, max = lines.count; i < max; i++) {
-        ASTextLine *line = lines[i];
-        CGRect rect = line.bounds;
-        if ((NSInteger) line.row != lastRowIdx) {
-          if (lastRowIdx >= 0) {
-            lineRowsEdge[lastRowIdx] = (ASRowEdge) {.head = lastHead, .foot = lastFoot};
-          }
-          lastRowIdx = line.row;
-          lineRowsIndex[lastRowIdx] = i;
-          if (isVerticalForm) {
-            lastHead = rect.origin.x + rect.size.width;
-            lastFoot = lastHead - rect.size.width;
-          } else {
-            lastHead = rect.origin.y;
-            lastFoot = lastHead + rect.size.height;
-          }
-        } else {
-          if (isVerticalForm) {
-            lastHead = MAX(lastHead, rect.origin.x + rect.size.width);
-            lastFoot = MIN(lastFoot, rect.origin.x);
-          } else {
-            lastHead = MIN(lastHead, rect.origin.y);
-            lastFoot = MAX(lastFoot, rect.origin.y + rect.size.height);
-          }
-        }
-      }
-      lineRowsEdge[lastRowIdx] = (ASRowEdge) {.head = lastHead, .foot = lastFoot};
-
-      for (NSUInteger i = 1; i < rowCount; i++) {
-        ASRowEdge v0 = lineRowsEdge[i - 1];
-        ASRowEdge v1 = lineRowsEdge[i];
-        lineRowsEdge[i - 1].foot = lineRowsEdge[i].head = (v0.foot + v1.head) * 0.5;
-      }
-    }
-
-    { // calculate bounding size
-      CGRect rect = textBoundingRect;
-      if (container.path) {
-        if (container.pathLineWidth > 0) {
-          CGFloat inset = container.pathLineWidth / 2;
-          rect = CGRectInset(rect, -inset, -inset);
-        }
-      } else {
-        rect = UIEdgeInsetsInsetRect(rect, ASTextUIEdgeInsetsInvert(container.insets));
-      }
-      rect = CGRectStandardize(rect);
-      CGSize size = rect.size;
-      if (container.verticalForm) {
-        size.width += container.size.width - (rect.origin.x + rect.size.width);
-      } else {
-        size.width += rect.origin.x;
-      }
-      size.height += rect.origin.y;
-      if (size.width < 0) size.width = 0;
-      if (size.height < 0) size.height = 0;
-      size.width = ceil(size.width);
-      size.height = ceil(size.height);
-      textBoundingSize = size;
-    }
-
-    visibleRange = ASTextNSRangeFromCFRange(CTFrameGetVisibleStringRange(ctFrame));
-    if (needTruncation) {
-      ASTextLine *lastLine = lines.lastObject;
-      NSRange lastRange = lastLine.range;
-      visibleRange.length = lastRange.location + lastRange.length - visibleRange.location;
-
-      // create truncated line
-      if (container.truncationType != ASTextTruncationTypeNone) {
-        CTLineRef truncationTokenLine = NULL;
-        if (container.truncationToken) {
-          truncationToken = container.truncationToken;
-          truncationTokenLine = CTLineCreateWithAttributedString((CFAttributedStringRef) truncationToken);
-        } else {
-          CFArrayRef runs = CTLineGetGlyphRuns(lastLine.CTLine);
-          NSUInteger runCount = CFArrayGetCount(runs);
-          NSMutableDictionary *attrs = nil;
-          if (runCount > 0) {
-            CTRunRef run = (CTRunRef) CFArrayGetValueAtIndex(runs, runCount - 1);
-            attrs = (id) CTRunGetAttributes(run);
-            attrs = attrs ? attrs.mutableCopy : [NSMutableArray new];
-            [attrs removeObjectsForKeys:[NSMutableAttributedString as_allDiscontinuousAttributeKeys]];
-            CTFontRef font = (__bridge CTFontRef) attrs[(id) kCTFontAttributeName];
-            CGFloat fontSize = font ? CTFontGetSize(font) : 12.0;
-            UIFont *uiFont = [UIFont systemFontOfSize:fontSize * 0.9];
-            if (uiFont) {
-              font = CTFontCreateWithName((__bridge CFStringRef) uiFont.fontName, uiFont.pointSize, NULL);
-            } else {
-              font = NULL;
-            }
-            if (font) {
-              attrs[(id) kCTFontAttributeName] = (__bridge id) (font);
-              uiFont = nil;
-              CFRelease(font);
-            }
-            CGColorRef color = (__bridge CGColorRef) (attrs[(id) kCTForegroundColorAttributeName]);
-            if (color && CFGetTypeID(color) == CGColorGetTypeID() && CGColorGetAlpha(color) == 0) {
-              // ignore clear color
-              [attrs removeObjectForKey:(id) kCTForegroundColorAttributeName];
-            }
-            if (!attrs) attrs = [NSMutableDictionary new];
-          }
-          truncationToken = [[NSAttributedString alloc] initWithString:ASTextTruncationToken attributes:attrs];
-          truncationTokenLine = CTLineCreateWithAttributedString((CFAttributedStringRef) truncationToken);
-        }
-        if (truncationTokenLine) {
-          CTLineTruncationType type = kCTLineTruncationEnd;
-          if (container.truncationType == ASTextTruncationTypeStart) {
-            type = kCTLineTruncationStart;
-          } else if (container.truncationType == ASTextTruncationTypeMiddle) {
-            type = kCTLineTruncationMiddle;
-          }
-          NSMutableAttributedString *lastLineText = [text attributedSubstringFromRange:lastLine.range].mutableCopy;
-          CGFloat truncatedWidth = lastLine.width;
-          CGFloat atLeastOneLine = lastLine.width;
-          CGRect cgPathRect = CGRectZero;
-          if (CGPathIsRect(cgPath, &cgPathRect)) {
-            if (isVerticalForm) {
-              truncatedWidth = cgPathRect.size.height;
-             } else {
-              truncatedWidth = cgPathRect.size.width;
-            }
-          }
-          int i = 0;
-          if (type != kCTLineTruncationStart) { // Middle or End/Tail wants to collect some text (at least one line's
-              // worth) preceding the truncated content, with which to construct a "truncated line".
-            i = (int)removedLines.count - 1;
-            while (atLeastOneLine < truncatedWidth && i >= 0) {
-              if (lastLineText.length > 0 && [lastLineText.string characterAtIndex:lastLineText.string.length - 1] == '\n') { // Explicit newlines are always "long enough".
-                [lastLineText deleteCharactersInRange:NSMakeRange(lastLineText.string.length - 1, 1)];
-                break;
-              }
-              [lastLineText appendAttributedString:[text attributedSubstringFromRange:removedLines[i].range]];
-              atLeastOneLine += removedLines[i--].width;
-            }
-            [lastLineText appendAttributedString:truncationToken];
-          }
-          if (type != kCTLineTruncationEnd && removedLines.count > 0) { // Middle or Start/Head wants to collect some
-              // text following the truncated content.
-            i = 0;
-            atLeastOneLine = removedLines[i].width;
-            while (atLeastOneLine < truncatedWidth && i < removedLines.count) {
-              atLeastOneLine += removedLines[i++].width;
-            }
-            for (i--; i >= 0; i--) {
-              NSAttributedString *nextLine = [text attributedSubstringFromRange:removedLines[i].range];
-              if ([nextLine.string characterAtIndex:nextLine.string.length - 1] == '\n') { // Explicit newlines are always "long enough".
-                lastLineText = [NSMutableAttributedString new];
-              } else {
-                [lastLineText appendAttributedString:nextLine];
-              }
-            }
-            if (type == kCTLineTruncationStart) {
-              [lastLineText insertAttributedString:truncationToken atIndex:0];
-            }
-          }
-
-          CTLineRef ctLastLineExtend = CTLineCreateWithAttributedString((CFAttributedStringRef) lastLineText);
-          if (ctLastLineExtend) {
-            CTLineRef ctTruncatedLine = CTLineCreateTruncatedLine(ctLastLineExtend, truncatedWidth, type, truncationTokenLine);
-            CFRelease(ctLastLineExtend);
-            if (ctTruncatedLine) {
-              truncatedLine = [ASTextLine lineWithCTLine:ctTruncatedLine position:lastLine.position vertical:isVerticalForm];
-              truncatedLine.index = lastLine.index;
-              truncatedLine.row = lastLine.row;
-              CFRelease(ctTruncatedLine);
-            }
-          }
-          CFRelease(truncationTokenLine);
-        }
-      }
-    }
-  }
-  
-  if (isVerticalForm) {
-    NSCharacterSet *rotateCharset = ASTextVerticalFormRotateCharacterSet();
-    NSCharacterSet *rotateMoveCharset = ASTextVerticalFormRotateAndMoveCharacterSet();
-
-    void (^lineBlock)(ASTextLine *) = ^(ASTextLine *line){
-      CFArrayRef runs = CTLineGetGlyphRuns(line.CTLine);
-      if (!runs) return;
-      NSUInteger runCount = CFArrayGetCount(runs);
-      if (runCount == 0) return;
-      NSMutableArray *lineRunRanges = [NSMutableArray new];
-      line.verticalRotateRange = lineRunRanges;
-      for (NSUInteger r = 0; r < runCount; r++) {
-        CTRunRef run = (CTRunRef)CFArrayGetValueAtIndex(runs, r);
-        NSMutableArray *runRanges = [NSMutableArray new];
-        [lineRunRanges addObject:runRanges];
-        NSUInteger glyphCount = CTRunGetGlyphCount(run);
-        if (glyphCount == 0) continue;
-        
-        CFIndex runStrIdx[glyphCount + 1];
-        CTRunGetStringIndices(run, CFRangeMake(0, 0), runStrIdx);
-        CFRange runStrRange = CTRunGetStringRange(run);
-        runStrIdx[glyphCount] = runStrRange.location + runStrRange.length;
-        CFDictionaryRef runAttrs = CTRunGetAttributes(run);
-        CTFontRef font = (CTFontRef)CFDictionaryGetValue(runAttrs, kCTFontAttributeName);
-        BOOL isColorGlyph = ASTextCTFontContainsColorBitmapGlyphs(font);
-        
-        NSUInteger prevIdx = 0;
-        ASTextRunGlyphDrawMode prevMode = ASTextRunGlyphDrawModeHorizontal;
-        NSString *layoutStr = layout.text.string;
-        for (NSUInteger g = 0; g < glyphCount; g++) {
-          BOOL glyphRotate = 0, glyphRotateMove = NO;
-          CFIndex runStrLen = runStrIdx[g + 1] - runStrIdx[g];
-          if (isColorGlyph) {
-            glyphRotate = YES;
-          } else if (runStrLen == 1) {
-            unichar c = [layoutStr characterAtIndex:runStrIdx[g]];
-            glyphRotate = [rotateCharset characterIsMember:c];
-            if (glyphRotate) glyphRotateMove = [rotateMoveCharset characterIsMember:c];
-          } else if (runStrLen > 1){
-            NSString *glyphStr = [layoutStr substringWithRange:NSMakeRange(runStrIdx[g], runStrLen)];
-            BOOL glyphRotate = [glyphStr rangeOfCharacterFromSet:rotateCharset].location != NSNotFound;
-            if (glyphRotate) glyphRotateMove = [glyphStr rangeOfCharacterFromSet:rotateMoveCharset].location != NSNotFound;
-          }
-          
-          ASTextRunGlyphDrawMode mode = glyphRotateMove ? ASTextRunGlyphDrawModeVerticalRotateMove : (glyphRotate ? ASTextRunGlyphDrawModeVerticalRotate : ASTextRunGlyphDrawModeHorizontal);
-          if (g == 0) {
-            prevMode = mode;
-          } else if (mode != prevMode) {
-            ASTextRunGlyphRange *aRange = [ASTextRunGlyphRange rangeWithRange:NSMakeRange(prevIdx, g - prevIdx) drawMode:prevMode];
-            [runRanges addObject:aRange];
-            prevIdx = g;
-            prevMode = mode;
-          }
-        }
-        if (prevIdx < glyphCount) {
-          ASTextRunGlyphRange *aRange = [ASTextRunGlyphRange rangeWithRange:NSMakeRange(prevIdx, glyphCount - prevIdx) drawMode:prevMode];
-          [runRanges addObject:aRange];
-        }
-        
-      }
-    };
-    for (ASTextLine *line in lines) {
-      lineBlock(line);
-    }
-    if (truncatedLine) lineBlock(truncatedLine);
-  }
-  
-  if (visibleRange.length > 0) {
-    layout.needDrawText = YES;
-    
-    void (^block)(NSDictionary *attrs, NSRange range, BOOL *stop) = ^(NSDictionary *attrs, NSRange range, BOOL *stop) {
-      if (attrs[ASTextHighlightAttributeName]) layout.containsHighlight = YES;
-      if (attrs[ASTextBlockBorderAttributeName]) layout.needDrawBlockBorder = YES;
-      if (attrs[ASTextBackgroundBorderAttributeName]) layout.needDrawBackgroundBorder = YES;
-      if (attrs[ASTextShadowAttributeName] || attrs[NSShadowAttributeName]) layout.needDrawShadow = YES;
-      if (attrs[ASTextUnderlineAttributeName]) layout.needDrawUnderline = YES;
-      if (attrs[ASTextAttachmentAttributeName]) layout.needDrawAttachment = YES;
-      if (attrs[ASTextInnerShadowAttributeName]) layout.needDrawInnerShadow = YES;
-      if (attrs[ASTextStrikethroughAttributeName]) layout.needDrawStrikethrough = YES;
-      if (attrs[ASTextBorderAttributeName]) layout.needDrawBorder = YES;
-    };
-    
-    [layout.text enumerateAttributesInRange:visibleRange options:NSAttributedStringEnumerationLongestEffectiveRangeNotRequired usingBlock:block];
-    if (truncatedLine) {
-      [truncationToken enumerateAttributesInRange:NSMakeRange(0, truncationToken.length) options:NSAttributedStringEnumerationLongestEffectiveRangeNotRequired usingBlock:block];
-    }
-  }
-  
-  attachments = [NSMutableArray new];
-  attachmentRanges = [NSMutableArray new];
-  attachmentRects = [NSMutableArray new];
-  attachmentContentsSet = [NSMutableSet new];
-  for (NSUInteger i = 0, max = lines.count; i < max; i++) {
-    ASTextLine *line = lines[i];
-    if (truncatedLine && line.index == truncatedLine.index) line = truncatedLine;
-    if (line.attachments.count > 0) {
-      [attachments addObjectsFromArray:line.attachments];
-      [attachmentRanges addObjectsFromArray:line.attachmentRanges];
-      [attachmentRects addObjectsFromArray:line.attachmentRects];
-      for (ASTextAttachment *attachment in line.attachments) {
-        if (attachment.content) {
-          [attachmentContentsSet addObject:attachment.content];
-        }
-      }
-    }
-  }
-  if (attachments.count == 0) {
-    attachments = attachmentRanges = attachmentRects = nil;
-  }
-
-  layout.frame = ctFrame;
-  layout.lines = lines;
-  layout.truncatedLine = truncatedLine;
-  layout.attachments = attachments;
-  layout.attachmentRanges = attachmentRanges;
-  layout.attachmentRects = attachmentRects;
-  layout.attachmentContentsSet = attachmentContentsSet;
-  layout.rowCount = rowCount;
-  layout.visibleRange = visibleRange;
-  layout.textBoundingRect = textBoundingRect;
-  layout.textBoundingSize = textBoundingSize;
-  layout.lineRowsEdge = lineRowsEdge;
-  layout.lineRowsIndex = lineRowsIndex;
-  CFRelease(cgPath);
-  CFRelease(ctSetter);
-  CFRelease(ctFrame);
-  if (lineOrigins) free(lineOrigins);
-  return layout;
-}
-
-+ (NSArray *)layoutWithContainers:(NSArray *)containers text:(NSAttributedString *)text {
-  return [self layoutWithContainers:containers text:text range:NSMakeRange(0, text.length)];
-}
-
-+ (NSArray *)layoutWithContainers:(NSArray *)containers text:(NSAttributedString *)text range:(NSRange)range {
-  if (!containers || !text) return nil;
-  if (range.location + range.length > text.length) return nil;
-  NSMutableArray *layouts = [[NSMutableArray alloc] init];
-  for (NSUInteger i = 0, max = containers.count; i < max; i++) {
-    ASTextContainer *container = containers[i];
-    ASTextLayout *layout = [self layoutWithContainer:container text:text range:range];
-    if (!layout) return nil;
-    NSInteger length = (NSInteger)range.length - (NSInteger)layout.visibleRange.length;
-    if (length <= 0) {
-      range.length = 0;
-      range.location = text.length;
-    } else {
-      range.length = length;
-      range.location += layout.visibleRange.length;
-    }
-  }
-  return layouts;
-}
-
-- (void)setFrame:(CTFrameRef)frame {
-  if (_frame != frame) {
-    if (frame) CFRetain(frame);
-    if (_frame) CFRelease(_frame);
-    _frame = frame;
-  }
-}
-
-- (void)dealloc {
-  if (_frame) CFRelease(_frame);
-  if (_lineRowsIndex) free(_lineRowsIndex);
-  if (_lineRowsEdge) free(_lineRowsEdge);
-}
-
-#pragma mark - Copying
-
-- (id)copyWithZone:(NSZone *)zone {
-  return self; // readonly object
-}
-
-
-#pragma mark - Query
-
-/**
- Get the row index with 'edge' distance.
- 
- @param edge  The distance from edge to the point.
- If vertical form, the edge is left edge, otherwise the edge is top edge.
- 
- @return Returns NSNotFound if there's no row at the point.
- */
-- (NSUInteger)_rowIndexForEdge:(CGFloat)edge {
-  if (_rowCount == 0) return NSNotFound;
-  BOOL isVertical = _container.verticalForm;
-  NSUInteger lo = 0, hi = _rowCount - 1, mid = 0;
-  NSUInteger rowIdx = NSNotFound;
-  while (lo <= hi) {
-    mid = (lo + hi) / 2;
-    ASRowEdge oneEdge = _lineRowsEdge[mid];
-    if (isVertical ?
-        (oneEdge.foot <= edge && edge <= oneEdge.head) :
-        (oneEdge.head <= edge && edge <= oneEdge.foot)) {
-      rowIdx = mid;
-      break;
-    }
-    if ((isVertical ? (edge > oneEdge.head) : (edge < oneEdge.head))) {
-      if (mid == 0) break;
-      hi = mid - 1;
-    } else {
-      lo = mid + 1;
-    }
-  }
-  return rowIdx;
-}
-
-/**
- Get the closest row index with 'edge' distance.
- 
- @param edge  The distance from edge to the point.
- If vertical form, the edge is left edge, otherwise the edge is top edge.
- 
- @return Returns NSNotFound if there's no line.
- */
-- (NSUInteger)_closestRowIndexForEdge:(CGFloat)edge {
-  if (_rowCount == 0) return NSNotFound;
-  NSUInteger rowIdx = [self _rowIndexForEdge:edge];
-  if (rowIdx == NSNotFound) {
-    if (_container.verticalForm) {
-      if (edge > _lineRowsEdge[0].head) {
-        rowIdx = 0;
-      } else if (edge < _lineRowsEdge[_rowCount - 1].foot) {
-        rowIdx = _rowCount - 1;
-      }
-    } else {
-      if (edge < _lineRowsEdge[0].head) {
-        rowIdx = 0;
-      } else if (edge > _lineRowsEdge[_rowCount - 1].foot) {
-        rowIdx = _rowCount - 1;
-      }
-    }
-  }
-  return rowIdx;
-}
-
-/**
- Get a CTRun from a line position.
- 
- @param line     The text line.
- @param position The position in the whole text.
- 
- @return Returns NULL if not found (no CTRun at the position).
- */
-- (CTRunRef)_runForLine:(ASTextLine *)line position:(ASTextPosition *)position {
-  if (!line || !position) return NULL;
-  CFArrayRef runs = CTLineGetGlyphRuns(line.CTLine);
-  for (NSUInteger i = 0, max = CFArrayGetCount(runs); i < max; i++) {
-    CTRunRef run = (CTRunRef)CFArrayGetValueAtIndex(runs, i);
-    CFRange range = CTRunGetStringRange(run);
-    if (position.affinity == ASTextAffinityBackward) {
-      if (range.location < position.offset && position.offset <= range.location + range.length) {
-        return run;
-      }
-    } else {
-      if (range.location <= position.offset && position.offset < range.location + range.length) {
-        return run;
-      }
-    }
-  }
-  return NULL;
-}
-
-/**
- Whether the position is inside a composed character sequence.
- 
- @param line     The text line.
- @param position Text text position in whole text.
- @param block    The block to be executed before returns YES.
- left:  left X offset
- right: right X offset
- prev:  left position
- next:  right position
- */
-- (BOOL)_insideComposedCharacterSequences:(ASTextLine *)line position:(NSUInteger)position block:(void (^)(CGFloat left, CGFloat right, NSUInteger prev, NSUInteger next))block {
-  NSRange range = line.range;
-  if (range.length == 0) return NO;
-  __block BOOL inside = NO;
-  __block NSUInteger _prev, _next;
-  [_text.string enumerateSubstringsInRange:range options:NSStringEnumerationByComposedCharacterSequences usingBlock: ^(NSString *substring, NSRange substringRange, NSRange enclosingRange, BOOL *stop) {
-    NSUInteger prev = substringRange.location;
-    NSUInteger next = substringRange.location + substringRange.length;
-    if (prev == position || next == position) {
-      *stop = YES;
-    }
-    if (prev < position && position < next) {
-      inside = YES;
-      _prev = prev;
-      _next = next;
-      *stop = YES;
-    }
-  }];
-  if (inside && block) {
-    CGFloat left = [self offsetForTextPosition:_prev lineIndex:line.index];
-    CGFloat right = [self offsetForTextPosition:_next lineIndex:line.index];
-    block(left, right, _prev, _next);
-  }
-  return inside;
-}
-
-/**
- Whether the position is inside an emoji (such as National Flag Emoji).
- 
- @param line     The text line.
- @param position Text text position in whole text.
- @param block    Yhe block to be executed before returns YES.
- left:  emoji's left X offset
- right: emoji's right X offset
- prev:  emoji's left position
- next:  emoji's right position
- */
-- (BOOL)_insideEmoji:(ASTextLine *)line position:(NSUInteger)position block:(void (^)(CGFloat left, CGFloat right, NSUInteger prev, NSUInteger next))block {
-  if (!line) return NO;
-  CFArrayRef runs = CTLineGetGlyphRuns(line.CTLine);
-  for (NSUInteger r = 0, rMax = CFArrayGetCount(runs); r < rMax; r++) {
-    CTRunRef run = (CTRunRef)CFArrayGetValueAtIndex(runs, r);
-    NSUInteger glyphCount = CTRunGetGlyphCount(run);
-    if (glyphCount == 0) continue;
-    CFRange range = CTRunGetStringRange(run);
-    if (range.length <= 1) continue;
-    if (position <= range.location || position >= range.location + range.length) continue;
-    CFDictionaryRef attrs = CTRunGetAttributes(run);
-    CTFontRef font = (CTFontRef)CFDictionaryGetValue(attrs, kCTFontAttributeName);
-    if (!ASTextCTFontContainsColorBitmapGlyphs(font)) continue;
-    
-    // Here's Emoji runs (larger than 1 unichar), and position is inside the range.
-    CFIndex indices[glyphCount];
-    CTRunGetStringIndices(run, CFRangeMake(0, glyphCount), indices);
-    for (NSUInteger g = 0; g < glyphCount; g++) {
-      CFIndex prev = indices[g];
-      CFIndex next = g + 1 < glyphCount ? indices[g + 1] : range.location + range.length;
-      if (position == prev) break; // Emoji edge
-      if (prev < position && position < next) { // inside an emoji (such as National Flag Emoji)
-        CGPoint pos = CGPointZero;
-        CGSize adv = CGSizeZero;
-        CTRunGetPositions(run, CFRangeMake(g, 1), &pos);
-        CTRunGetAdvances(run, CFRangeMake(g, 1), &adv);
-        if (block) {
-          block(line.position.x + pos.x,
-                line.position.x + pos.x + adv.width,
-                prev, next);
-        }
-        return YES;
-      }
-    }
-  }
-  return NO;
-}
-/**
- Whether the write direction is RTL at the specified point
- 
- @param line  The text line
- @param point The point in layout.
- 
- @return YES if RTL.
- */
-- (BOOL)_isRightToLeftInLine:(ASTextLine *)line atPoint:(CGPoint)point {
-  if (!line) return NO;
-  // get write direction
-  BOOL RTL = NO;
-  CFArrayRef runs = CTLineGetGlyphRuns(line.CTLine);
-  for (NSUInteger r = 0, max = CFArrayGetCount(runs); r < max; r++) {
-    CTRunRef run = (CTRunRef)CFArrayGetValueAtIndex(runs, r);
-    CGPoint glyphPosition;
-    CTRunGetPositions(run, CFRangeMake(0, 1), &glyphPosition);
-    if (_container.verticalForm) {
-      CGFloat runX = glyphPosition.x;
-      runX += line.position.y;
-      CGFloat runWidth = CTRunGetTypographicBounds(run, CFRangeMake(0, 0), NULL, NULL, NULL);
-      if (runX <= point.y && point.y <= runX + runWidth) {
-        if (CTRunGetStatus(run) & kCTRunStatusRightToLeft) RTL = YES;
-        break;
-      }
-    } else {
-      CGFloat runX = glyphPosition.x;
-      runX += line.position.x;
-      CGFloat runWidth = CTRunGetTypographicBounds(run, CFRangeMake(0, 0), NULL, NULL, NULL);
-      if (runX <= point.x && point.x <= runX + runWidth) {
-        if (CTRunGetStatus(run) & kCTRunStatusRightToLeft) RTL = YES;
-        break;
-      }
-    }
-  }
-  return RTL;
-}
-
-/**
- Correct the range's edge.
- */
-- (ASTextRange *)_correctedRangeWithEdge:(ASTextRange *)range {
-  NSRange visibleRange = self.visibleRange;
-  ASTextPosition *start = range.start;
-  ASTextPosition *end = range.end;
-  
-  if (start.offset == visibleRange.location && start.affinity == ASTextAffinityBackward) {
-    start = [ASTextPosition positionWithOffset:start.offset affinity:ASTextAffinityForward];
-  }
-  
-  if (end.offset == visibleRange.location + visibleRange.length && start.affinity == ASTextAffinityForward) {
-    end = [ASTextPosition positionWithOffset:end.offset affinity:ASTextAffinityBackward];
-  }
-  
-  if (start != range.start || end != range.end) {
-    range = [ASTextRange rangeWithStart:start end:end];
-  }
-  return range;
-}
-
-- (NSUInteger)lineIndexForRow:(NSUInteger)row {
-  if (row >= _rowCount) return NSNotFound;
-  return _lineRowsIndex[row];
-}
-
-- (NSUInteger)lineCountForRow:(NSUInteger)row {
-  if (row >= _rowCount) return NSNotFound;
-  if (row == _rowCount - 1) {
-    return _lines.count - _lineRowsIndex[row];
-  } else {
-    return _lineRowsIndex[row + 1] - _lineRowsIndex[row];
-  }
-}
-
-- (NSUInteger)rowIndexForLine:(NSUInteger)line {
-  if (line >= _lines.count) return NSNotFound;
-  return ((ASTextLine *)_lines[line]).row;
-}
-
-- (NSUInteger)lineIndexForPoint:(CGPoint)point {
-  if (_lines.count == 0 || _rowCount == 0) return NSNotFound;
-  NSUInteger rowIdx = [self _rowIndexForEdge:_container.verticalForm ? point.x : point.y];
-  if (rowIdx == NSNotFound) return NSNotFound;
-  
-  NSUInteger lineIdx0 = _lineRowsIndex[rowIdx];
-  NSUInteger lineIdx1 = rowIdx == _rowCount - 1 ? _lines.count - 1 : _lineRowsIndex[rowIdx + 1] - 1;
-  for (NSUInteger i = lineIdx0; i <= lineIdx1; i++) {
-    CGRect bounds = ((ASTextLine *)_lines[i]).bounds;
-    if (CGRectContainsPoint(bounds, point)) return i;
-  }
-  
-  return NSNotFound;
-}
-
-- (NSUInteger)closestLineIndexForPoint:(CGPoint)point {
-  BOOL isVertical = _container.verticalForm;
-  if (_lines.count == 0 || _rowCount == 0) return NSNotFound;
-  NSUInteger rowIdx = [self _closestRowIndexForEdge:isVertical ? point.x : point.y];
-  if (rowIdx == NSNotFound) return NSNotFound;
-  
-  NSUInteger lineIdx0 = _lineRowsIndex[rowIdx];
-  NSUInteger lineIdx1 = rowIdx == _rowCount - 1 ? _lines.count - 1 : _lineRowsIndex[rowIdx + 1] - 1;
-  if (lineIdx0 == lineIdx1) return lineIdx0;
-  
-  CGFloat minDistance = CGFLOAT_MAX;
-  NSUInteger minIndex = lineIdx0;
-  for (NSUInteger i = lineIdx0; i <= lineIdx1; i++) {
-    CGRect bounds = ((ASTextLine *)_lines[i]).bounds;
-    if (isVertical) {
-      if (bounds.origin.y <= point.y && point.y <= bounds.origin.y + bounds.size.height) return i;
-      CGFloat distance;
-      if (point.y < bounds.origin.y) {
-        distance = bounds.origin.y - point.y;
-      } else {
-        distance = point.y - (bounds.origin.y + bounds.size.height);
-      }
-      if (distance < minDistance) {
-        minDistance = distance;
-        minIndex = i;
-      }
-    } else {
-      if (bounds.origin.x <= point.x && point.x <= bounds.origin.x + bounds.size.width) return i;
-      CGFloat distance;
-      if (point.x < bounds.origin.x) {
-        distance = bounds.origin.x - point.x;
-      } else {
-        distance = point.x - (bounds.origin.x + bounds.size.width);
-      }
-      if (distance < minDistance) {
-        minDistance = distance;
-        minIndex = i;
-      }
-    }
-  }
-  return minIndex;
-}
-
-- (CGFloat)offsetForTextPosition:(NSUInteger)position lineIndex:(NSUInteger)lineIndex {
-  if (lineIndex >= _lines.count) return CGFLOAT_MAX;
-  ASTextLine *line = _lines[lineIndex];
-  CFRange range = CTLineGetStringRange(line.CTLine);
-  if (position < range.location || position > range.location + range.length) return CGFLOAT_MAX;
-  
-  CGFloat offset = CTLineGetOffsetForStringIndex(line.CTLine, position, NULL);
-  return _container.verticalForm ? (offset + line.position.y) : (offset + line.position.x);
-}
-
-- (NSUInteger)textPositionForPoint:(CGPoint)point lineIndex:(NSUInteger)lineIndex {
-  if (lineIndex >= _lines.count) return NSNotFound;
-  ASTextLine *line = _lines[lineIndex];
-  if (_container.verticalForm) {
-    point.x = point.y - line.position.y;
-    point.y = 0;
-  } else {
-    point.x -= line.position.x;
-    point.y = 0;
-  }
-  CFIndex idx = CTLineGetStringIndexForPosition(line.CTLine, point);
-  if (idx == kCFNotFound) return NSNotFound;
-  
-  /*
-   If the emoji contains one or more variant form (such as ☔️ "\u2614\uFE0F")
-   and the font size is smaller than 379/15, then each variant form ("\uFE0F")
-   will rendered as a single blank glyph behind the emoji glyph. Maybe it's a
-   bug in CoreText? Seems iOS8.3 fixes this problem.
-   
-   If the point hit the blank glyph, the CTLineGetStringIndexForPosition()
-   returns the position before the emoji glyph, but it should returns the
-   position after the emoji and variant form.
-   
-   Here's a workaround.
-   */
-  CFArrayRef runs = CTLineGetGlyphRuns(line.CTLine);
-  for (NSUInteger r = 0, max = CFArrayGetCount(runs); r < max; r++) {
-    CTRunRef run = (CTRunRef)CFArrayGetValueAtIndex(runs, r);
-    CFRange range = CTRunGetStringRange(run);
-    if (range.location <= idx && idx < range.location + range.length) {
-      NSUInteger glyphCount = CTRunGetGlyphCount(run);
-      if (glyphCount == 0) break;
-      CFDictionaryRef attrs = CTRunGetAttributes(run);
-      CTFontRef font = (CTFontRef)CFDictionaryGetValue(attrs, kCTFontAttributeName);
-      if (!ASTextCTFontContainsColorBitmapGlyphs(font)) break;
-      
-      CFIndex indices[glyphCount];
-      CGPoint positions[glyphCount];
-      CTRunGetStringIndices(run, CFRangeMake(0, glyphCount), indices);
-      CTRunGetPositions(run, CFRangeMake(0, glyphCount), positions);
-      for (NSUInteger g = 0; g < glyphCount; g++) {
-        NSUInteger gIdx = indices[g];
-        if (gIdx == idx && g + 1 < glyphCount) {
-          CGFloat right = positions[g + 1].x;
-          if (point.x < right) break;
-          NSUInteger next = indices[g + 1];
-          do {
-            if (next == range.location + range.length) break;
-            unichar c = [_text.string characterAtIndex:next];
-            if ((c == 0xFE0E || c == 0xFE0F)) { // unicode variant form for emoji style
-              next++;
-            } else break;
-          }
-          while (1);
-          if (next != indices[g + 1]) idx = next;
-          break;
-        }
-      }
-      break;
-    }
-  }
-  return idx;
-}
-
-- (ASTextPosition *)closestPositionToPoint:(CGPoint)point {
-  BOOL isVertical = _container.verticalForm;
-  // When call CTLineGetStringIndexForPosition() on ligature such as 'fi',
-  // and the point `hit` the glyph's left edge, it may get the ligature inside offset.
-  // I don't know why, maybe it's a bug of CoreText. Try to avoid it.
-  if (isVertical) point.y += 0.00001234;
-  else point.x += 0.00001234;
-  
-  NSUInteger lineIndex = [self closestLineIndexForPoint:point];
-  if (lineIndex == NSNotFound) return nil;
-  ASTextLine *line = _lines[lineIndex];
-  __block NSUInteger position = [self textPositionForPoint:point lineIndex:lineIndex];
-  if (position == NSNotFound) position = line.range.location;
-  if (position <= _visibleRange.location) {
-    return [ASTextPosition positionWithOffset:_visibleRange.location affinity:ASTextAffinityForward];
-  } else if (position >= _visibleRange.location + _visibleRange.length) {
-    return [ASTextPosition positionWithOffset:_visibleRange.location + _visibleRange.length affinity:ASTextAffinityBackward];
-  }
-  
-  ASTextAffinity finalAffinity = ASTextAffinityForward;
-  BOOL finalAffinityDetected = NO;
-  
-  // binding range
-  NSRange bindingRange;
-  ASTextBinding *binding = [_text attribute:ASTextBindingAttributeName atIndex:position longestEffectiveRange:&bindingRange inRange:NSMakeRange(0, _text.length)];
-  if (binding && bindingRange.length > 0) {
-    NSUInteger headLineIdx = [self lineIndexForPosition:[ASTextPosition positionWithOffset:bindingRange.location]];
-    NSUInteger tailLineIdx = [self lineIndexForPosition:[ASTextPosition positionWithOffset:bindingRange.location + bindingRange.length affinity:ASTextAffinityBackward]];
-    if (headLineIdx == lineIndex && lineIndex == tailLineIdx) { // all in same line
-      CGFloat left = [self offsetForTextPosition:bindingRange.location lineIndex:lineIndex];
-      CGFloat right = [self offsetForTextPosition:bindingRange.location + bindingRange.length lineIndex:lineIndex];
-      if (left != CGFLOAT_MAX && right != CGFLOAT_MAX) {
-        if (_container.isVerticalForm) {
-          if (fabs(point.y - left) < fabs(point.y - right)) {
-            position = bindingRange.location;
-            finalAffinity = ASTextAffinityForward;
-          } else {
-            position = bindingRange.location + bindingRange.length;
-            finalAffinity = ASTextAffinityBackward;
-          }
-        } else {
-          if (fabs(point.x - left) < fabs(point.x - right)) {
-            position = bindingRange.location;
-            finalAffinity = ASTextAffinityForward;
-          } else {
-            position = bindingRange.location + bindingRange.length;
-            finalAffinity = ASTextAffinityBackward;
-          }
-        }
-      } else if (left != CGFLOAT_MAX) {
-        position = left;
-        finalAffinity = ASTextAffinityForward;
-      } else if (right != CGFLOAT_MAX) {
-        position = right;
-        finalAffinity = ASTextAffinityBackward;
-      }
-      finalAffinityDetected = YES;
-    } else if (headLineIdx == lineIndex) {
-      CGFloat left = [self offsetForTextPosition:bindingRange.location lineIndex:lineIndex];
-      if (left != CGFLOAT_MAX) {
-        position = bindingRange.location;
-        finalAffinity = ASTextAffinityForward;
-        finalAffinityDetected = YES;
-      }
-    } else if (tailLineIdx == lineIndex) {
-      CGFloat right = [self offsetForTextPosition:bindingRange.location + bindingRange.length lineIndex:lineIndex];
-      if (right != CGFLOAT_MAX) {
-        position = bindingRange.location + bindingRange.length;
-        finalAffinity = ASTextAffinityBackward;
-        finalAffinityDetected = YES;
-      }
-    } else {
-      BOOL onLeft = NO, onRight = NO;
-      if (headLineIdx != NSNotFound && tailLineIdx != NSNotFound) {
-        if (abs((int)headLineIdx - (int)lineIndex) < abs((int)tailLineIdx - (int)lineIndex)) onLeft = YES;
-        else onRight = YES;
-      } else if (headLineIdx != NSNotFound) {
-        onLeft = YES;
-      } else if (tailLineIdx != NSNotFound) {
-        onRight = YES;
-      }
-      
-      if (onLeft) {
-        CGFloat left = [self offsetForTextPosition:bindingRange.location lineIndex:headLineIdx];
-        if (left != CGFLOAT_MAX) {
-          lineIndex = headLineIdx;
-          line = _lines[headLineIdx];
-          position = bindingRange.location;
-          finalAffinity = ASTextAffinityForward;
-          finalAffinityDetected = YES;
-        }
-      } else if (onRight) {
-        CGFloat right = [self offsetForTextPosition:bindingRange.location + bindingRange.length lineIndex:tailLineIdx];
-        if (right != CGFLOAT_MAX) {
-          lineIndex = tailLineIdx;
-          line = _lines[tailLineIdx];
-          position = bindingRange.location + bindingRange.length;
-          finalAffinity = ASTextAffinityBackward;
-          finalAffinityDetected = YES;
-        }
-      }
-    }
-  }
-  
-  // empty line
-  if (line.range.length == 0) {
-    BOOL behind = (_lines.count > 1 && lineIndex == _lines.count - 1);  //end line
-    return [ASTextPosition positionWithOffset:line.range.location affinity:behind ? ASTextAffinityBackward:ASTextAffinityForward];
-  }
-  
-  // detect weather the line is a linebreak token
-  if (line.range.length <= 2) {
-    NSString *str = [_text.string substringWithRange:line.range];
-    if (ASTextIsLinebreakString(str)) { // an empty line ("\r", "\n", "\r\n")
-      return [ASTextPosition positionWithOffset:line.range.location];
-    }
-  }
-  
-  // above whole text frame
-  if (lineIndex == 0 && (isVertical ? (point.x > line.right) : (point.y < line.top))) {
-    position = 0;
-    finalAffinity = ASTextAffinityForward;
-    finalAffinityDetected = YES;
-  }
-  // below whole text frame
-  if (lineIndex == _lines.count - 1 && (isVertical ? (point.x < line.left) : (point.y > line.bottom))) {
-    position = line.range.location + line.range.length;
-    finalAffinity = ASTextAffinityBackward;
-    finalAffinityDetected = YES;
-  }
-  
-  // There must be at least one non-linebreak char,
-  // ignore the linebreak characters at line end if exists.
-  if (position >= line.range.location + line.range.length - 1) {
-    if (position > line.range.location) {
-      unichar c1 = [_text.string characterAtIndex:position - 1];
-      if (ASTextIsLinebreakChar(c1)) {
-        position--;
-        if (position > line.range.location) {
-          unichar c0 = [_text.string characterAtIndex:position - 1];
-          if (ASTextIsLinebreakChar(c0)) {
-            position--;
-          }
-        }
-      }
-    }
-  }
-  if (position == line.range.location) {
-    return [ASTextPosition positionWithOffset:position];
-  }
-  if (position == line.range.location + line.range.length) {
-    return [ASTextPosition positionWithOffset:position affinity:ASTextAffinityBackward];
-  }
-  
-  [self _insideComposedCharacterSequences:line position:position block: ^(CGFloat left, CGFloat right, NSUInteger prev, NSUInteger next) {
-    if (isVertical) {
-      position = fabs(left - point.y) < fabs(right - point.y) < (right ? prev : next);
-    } else {
-      position = fabs(left - point.x) < fabs(right - point.x) < (right ? prev : next);
-    }
-  }];
-  
-  [self _insideEmoji:line position:position block: ^(CGFloat left, CGFloat right, NSUInteger prev, NSUInteger next) {
-    if (isVertical) {
-      position = fabs(left - point.y) < fabs(right - point.y) < (right ? prev : next);
-    } else {
-      position = fabs(left - point.x) < fabs(right - point.x) < (right ? prev : next);
-    }
-  }];
-  
-  if (position < _visibleRange.location) position = _visibleRange.location;
-  else if (position > _visibleRange.location + _visibleRange.length) position = _visibleRange.location + _visibleRange.length;
-  
-  if (!finalAffinityDetected) {
-    CGFloat ofs = [self offsetForTextPosition:position lineIndex:lineIndex];
-    if (ofs != CGFLOAT_MAX) {
-      BOOL RTL = [self _isRightToLeftInLine:line atPoint:point];
-      if (position >= line.range.location + line.range.length) {
-        finalAffinity = RTL ? ASTextAffinityForward : ASTextAffinityBackward;
-      } else if (position <= line.range.location) {
-        finalAffinity = RTL ? ASTextAffinityBackward : ASTextAffinityForward;
-      } else {
-        finalAffinity = (ofs < (isVertical ? point.y : point.x) && !RTL) ? ASTextAffinityForward : ASTextAffinityBackward;
-      }
-    }
-  }
-  
-  return [ASTextPosition positionWithOffset:position affinity:finalAffinity];
-}
-
-- (ASTextPosition *)positionForPoint:(CGPoint)point
-                         oldPosition:(ASTextPosition *)oldPosition
-                       otherPosition:(ASTextPosition *)otherPosition {
-  if (!oldPosition || !otherPosition) {
-    return oldPosition;
-  }
-  ASTextPosition *newPos = [self closestPositionToPoint:point];
-  if (!newPos) return oldPosition;
-  if ([newPos compare:otherPosition] == [oldPosition compare:otherPosition] &&
-      newPos.offset != otherPosition.offset) {
-    return newPos;
-  }
-  NSUInteger lineIndex = [self lineIndexForPosition:otherPosition];
-  if (lineIndex == NSNotFound) return oldPosition;
-  ASTextLine *line = _lines[lineIndex];
-  ASRowEdge vertical = _lineRowsEdge[line.row];
-  if (_container.verticalForm) {
-    point.x = (vertical.head + vertical.foot) * 0.5;
-  } else {
-    point.y = (vertical.head + vertical.foot) * 0.5;
-  }
-  newPos = [self closestPositionToPoint:point];
-  if ([newPos compare:otherPosition] == [oldPosition compare:otherPosition] &&
-      newPos.offset != otherPosition.offset) {
-    return newPos;
-  }
-  
-  if (_container.isVerticalForm) {
-    if ([oldPosition compare:otherPosition] == NSOrderedAscending) { // search backward
-      ASTextRange *range = [self textRangeByExtendingPosition:otherPosition inDirection:UITextLayoutDirectionUp offset:1];
-      if (range) return range.start;
-    } else { // search forward
-      ASTextRange *range = [self textRangeByExtendingPosition:otherPosition inDirection:UITextLayoutDirectionDown offset:1];
-      if (range) return range.end;
-    }
-  } else {
-    if ([oldPosition compare:otherPosition] == NSOrderedAscending) { // search backward
-      ASTextRange *range = [self textRangeByExtendingPosition:otherPosition inDirection:UITextLayoutDirectionLeft offset:1];
-      if (range) return range.start;
-    } else { // search forward
-      ASTextRange *range = [self textRangeByExtendingPosition:otherPosition inDirection:UITextLayoutDirectionRight offset:1];
-      if (range) return range.end;
-    }
-  }
-  
-  return oldPosition;
-}
-
-- (ASTextRange *)textRangeAtPoint:(CGPoint)point {
-  NSUInteger lineIndex = [self lineIndexForPoint:point];
-  if (lineIndex == NSNotFound) return nil;
-  NSUInteger textPosition = [self textPositionForPoint:point lineIndex:[self lineIndexForPoint:point]];
-  if (textPosition == NSNotFound) return nil;
-  ASTextPosition *pos = [self closestPositionToPoint:point];
-  if (!pos) return nil;
-  
-  // get write direction
-  BOOL RTL = [self _isRightToLeftInLine:_lines[lineIndex] atPoint:point];
-  CGRect rect = [self caretRectForPosition:pos];
-  if (CGRectIsNull(rect)) return nil;
-  
-  if (_container.verticalForm) {
-    ASTextRange *range = [self textRangeByExtendingPosition:pos inDirection:(rect.origin.y >= point.y && !RTL) ? UITextLayoutDirectionUp:UITextLayoutDirectionDown offset:1];
-    return range;
-  } else {
-    ASTextRange *range = [self textRangeByExtendingPosition:pos inDirection:(rect.origin.x >= point.x && !RTL) ? UITextLayoutDirectionLeft:UITextLayoutDirectionRight offset:1];
-    return range;
-  }
-}
-
-- (ASTextRange *)closestTextRangeAtPoint:(CGPoint)point {
-  ASTextPosition *pos = [self closestPositionToPoint:point];
-  if (!pos) return nil;
-  NSUInteger lineIndex = [self lineIndexForPosition:pos];
-  if (lineIndex == NSNotFound) return nil;
-  ASTextLine *line = _lines[lineIndex];
-  BOOL RTL = [self _isRightToLeftInLine:line atPoint:point];
-  CGRect rect = [self caretRectForPosition:pos];
-  if (CGRectIsNull(rect)) return nil;
-  
-  UITextLayoutDirection direction = UITextLayoutDirectionRight;
-  if (pos.offset >= line.range.location + line.range.length) {
-    if (direction != RTL) {
-      direction = _container.verticalForm ? UITextLayoutDirectionUp : UITextLayoutDirectionLeft;
-    } else {
-      direction = _container.verticalForm ? UITextLayoutDirectionDown : UITextLayoutDirectionRight;
-    }
-  } else if (pos.offset <= line.range.location) {
-    if (direction != RTL) {
-      direction = _container.verticalForm ? UITextLayoutDirectionDown : UITextLayoutDirectionRight;
-    } else {
-      direction = _container.verticalForm ? UITextLayoutDirectionUp : UITextLayoutDirectionLeft;
-    }
-  } else {
-    if (_container.verticalForm) {
-      direction = (rect.origin.y >= point.y && !RTL) ? UITextLayoutDirectionUp:UITextLayoutDirectionDown;
-    } else {
-      direction = (rect.origin.x >= point.x && !RTL) ? UITextLayoutDirectionLeft:UITextLayoutDirectionRight;
-    }
-  }
-  
-  ASTextRange *range = [self textRangeByExtendingPosition:pos inDirection:direction offset:1];
-  return range;
-}
-
-- (ASTextRange *)textRangeByExtendingPosition:(ASTextPosition *)position {
-  NSUInteger visibleStart = _visibleRange.location;
-  NSUInteger visibleEnd = _visibleRange.location + _visibleRange.length;
-  
-  if (!position) return nil;
-  if (position.offset < visibleStart || position.offset > visibleEnd) return nil;
-  
-  // head or tail, returns immediately
-  if (position.offset == visibleStart) {
-    return [ASTextRange rangeWithRange:NSMakeRange(position.offset, 0)];
-  } else if (position.offset == visibleEnd) {
-    return [ASTextRange rangeWithRange:NSMakeRange(position.offset, 0) affinity:ASTextAffinityBackward];
-  }
-  
-  // binding range
-  NSRange tRange;
-  ASTextBinding *binding = [_text attribute:ASTextBindingAttributeName atIndex:position.offset longestEffectiveRange:&tRange inRange:_visibleRange];
-  if (binding && tRange.length > 0 && tRange.location < position.offset) {
-    return [ASTextRange rangeWithRange:tRange];
-  }
-  
-  // inside emoji or composed character sequences
-  NSUInteger lineIndex = [self lineIndexForPosition:position];
-  if (lineIndex != NSNotFound) {
-    __block NSUInteger _prev, _next;
-    BOOL emoji = NO, seq = NO;
-    
-    ASTextLine *line = _lines[lineIndex];
-    emoji = [self _insideEmoji:line position:position.offset block: ^(CGFloat left, CGFloat right, NSUInteger prev, NSUInteger next) {
-      _prev = prev;
-      _next = next;
-    }];
-    if (!emoji) {
-      seq = [self _insideComposedCharacterSequences:line position:position.offset block: ^(CGFloat left, CGFloat right, NSUInteger prev, NSUInteger next) {
-        _prev = prev;
-        _next = next;
-      }];
-    }
-    if (emoji || seq) {
-      return [ASTextRange rangeWithRange:NSMakeRange(_prev, _next - _prev)];
-    }
-  }
-  
-  // inside linebreak '\r\n'
-  if (position.offset > visibleStart && position.offset < visibleEnd) {
-    unichar c0 = [_text.string characterAtIndex:position.offset - 1];
-    if ((c0 == '\r') && position.offset < visibleEnd) {
-      unichar c1 = [_text.string characterAtIndex:position.offset];
-      if (c1 == '\n') {
-        return [ASTextRange rangeWithStart:[ASTextPosition positionWithOffset:position.offset - 1] end:[ASTextPosition positionWithOffset:position.offset + 1]];
-      }
-    }
-    if (ASTextIsLinebreakChar(c0) && position.affinity == ASTextAffinityBackward) {
-      NSString *str = [_text.string substringToIndex:position.offset];
-      NSUInteger len = ASTextLinebreakTailLength(str);
-      return [ASTextRange rangeWithStart:[ASTextPosition positionWithOffset:position.offset - len] end:[ASTextPosition positionWithOffset:position.offset]];
-    }
-  }
-  
-  return [ASTextRange rangeWithRange:NSMakeRange(position.offset, 0) affinity:position.affinity];
-}
-
-- (ASTextRange *)textRangeByExtendingPosition:(ASTextPosition *)position
-                                  inDirection:(UITextLayoutDirection)direction
-                                       offset:(NSInteger)offset {
-  NSInteger visibleStart = _visibleRange.location;
-  NSInteger visibleEnd = _visibleRange.location + _visibleRange.length;
-  
-  if (!position) return nil;
-  if (position.offset < visibleStart || position.offset > visibleEnd) return nil;
-  if (offset == 0) return [self textRangeByExtendingPosition:position];
-  
-  BOOL isVerticalForm = _container.verticalForm;
-  BOOL verticalMove, forwardMove;
-  
-  if (isVerticalForm) {
-    verticalMove = direction == UITextLayoutDirectionLeft || direction == UITextLayoutDirectionRight;
-    forwardMove = direction == UITextLayoutDirectionLeft || direction == UITextLayoutDirectionDown;
-  } else {
-    verticalMove = direction == UITextLayoutDirectionUp || direction == UITextLayoutDirectionDown;
-    forwardMove = direction == UITextLayoutDirectionDown || direction == UITextLayoutDirectionRight;
-  }
-  
-  if (offset < 0) {
-    forwardMove = !forwardMove;
-    offset = -offset;
-  }
-  
-  // head or tail, returns immediately
-  if (!forwardMove && position.offset == visibleStart) {
-    return [ASTextRange rangeWithRange:NSMakeRange(_visibleRange.location, 0)];
-  } else if (forwardMove && position.offset == visibleEnd) {
-    return [ASTextRange rangeWithRange:NSMakeRange(position.offset, 0) affinity:ASTextAffinityBackward];
-  }
-  
-  // extend from position
-  ASTextRange *fromRange = [self textRangeByExtendingPosition:position];
-  if (!fromRange) return nil;
-  ASTextRange *allForward = [ASTextRange rangeWithStart:fromRange.start end:[ASTextPosition positionWithOffset:visibleEnd]];
-  ASTextRange *allBackward = [ASTextRange rangeWithStart:[ASTextPosition positionWithOffset:visibleStart] end:fromRange.end];
-  
-  if (verticalMove) { // up/down in text layout
-    NSInteger lineIndex = [self lineIndexForPosition:position];
-    if (lineIndex == NSNotFound) return nil;
-    
-    ASTextLine *line = _lines[lineIndex];
-    NSInteger moveToRowIndex = (NSInteger)line.row + (forwardMove ? offset : -offset);
-    if (moveToRowIndex < 0) return allBackward;
-    else if (moveToRowIndex >= (NSInteger)_rowCount) return allForward;
-    
-    CGFloat ofs = [self offsetForTextPosition:position.offset lineIndex:lineIndex];
-    if (ofs == CGFLOAT_MAX) return nil;
-    
-    NSUInteger moveToLineFirstIndex = [self lineIndexForRow:moveToRowIndex];
-    NSUInteger moveToLineCount = [self lineCountForRow:moveToRowIndex];
-    if (moveToLineFirstIndex == NSNotFound || moveToLineCount == NSNotFound || moveToLineCount == 0) return nil;
-    CGFloat mostLeft = CGFLOAT_MAX, mostRight = -CGFLOAT_MAX;
-    ASTextLine *mostLeftLine = nil, *mostRightLine = nil;
-    NSUInteger insideIndex = NSNotFound;
-    for (NSUInteger i = 0; i < moveToLineCount; i++) {
-      NSUInteger lineIndex = moveToLineFirstIndex + i;
-      ASTextLine *line = _lines[lineIndex];
-      if (isVerticalForm) {
-        if (line.top <= ofs && ofs <= line.bottom) {
-          insideIndex = line.index;
-          break;
-        }
-        if (line.top < mostLeft) {
-          mostLeft = line.top;
-          mostLeftLine = line;
-        }
-        if (line.bottom > mostRight) {
-          mostRight = line.bottom;
-          mostRightLine = line;
-        }
-      } else {
-        if (line.left <= ofs && ofs <= line.right) {
-          insideIndex = line.index;
-          break;
-        }
-        if (line.left < mostLeft) {
-          mostLeft = line.left;
-          mostLeftLine = line;
-        }
-        if (line.right > mostRight) {
-          mostRight = line.right;
-          mostRightLine = line;
-        }
-      }
-    }
-    BOOL afinityEdge = NO;
-    if (insideIndex == NSNotFound) {
-      if (ofs <= mostLeft) {
-        insideIndex = mostLeftLine.index;
-      } else {
-        insideIndex = mostRightLine.index;
-      }
-      afinityEdge = YES;
-    }
-    ASTextLine *insideLine = _lines[insideIndex];
-    NSUInteger pos;
-    if (isVerticalForm) {
-      pos = [self textPositionForPoint:CGPointMake(insideLine.position.x, ofs) lineIndex:insideIndex];
-    } else {
-      pos = [self textPositionForPoint:CGPointMake(ofs, insideLine.position.y) lineIndex:insideIndex];
-    }
-    if (pos == NSNotFound) return nil;
-    ASTextPosition *extPos;
-    if (afinityEdge) {
-      if (pos == insideLine.range.location + insideLine.range.length) {
-        NSString *subStr = [_text.string substringWithRange:insideLine.range];
-        NSUInteger lineBreakLen = ASTextLinebreakTailLength(subStr);
-        extPos = [ASTextPosition positionWithOffset:pos - lineBreakLen];
-      } else {
-        extPos = [ASTextPosition positionWithOffset:pos];
-      }
-    } else {
-      extPos = [ASTextPosition positionWithOffset:pos];
-    }
-    ASTextRange *ext = [self textRangeByExtendingPosition:extPos];
-    if (!ext) return nil;
-    if (forwardMove) {
-      return [ASTextRange rangeWithStart:fromRange.start end:ext.end];
-    } else {
-      return [ASTextRange rangeWithStart:ext.start end:fromRange.end];
-    }
-    
-  } else { // left/right in text layout
-    ASTextPosition *toPosition = [ASTextPosition positionWithOffset:position.offset + (forwardMove ? offset : -offset)];
-    if (toPosition.offset <= visibleStart) return allBackward;
-    else if (toPosition.offset >= visibleEnd) return allForward;
-    
-    ASTextRange *toRange = [self textRangeByExtendingPosition:toPosition];
-    if (!toRange) return nil;
-    
-    NSInteger start = MIN(fromRange.start.offset, toRange.start.offset);
-    NSInteger end = MAX(fromRange.end.offset, toRange.end.offset);
-    return [ASTextRange rangeWithRange:NSMakeRange(start, end - start)];
-  }
-}
-
-- (NSUInteger)lineIndexForPosition:(ASTextPosition *)position {
-  if (!position) return NSNotFound;
-  if (_lines.count == 0) return NSNotFound;
-  NSUInteger location = position.offset;
-  NSInteger lo = 0, hi = _lines.count - 1, mid = 0;
-  if (position.affinity == ASTextAffinityBackward) {
-    while (lo <= hi) {
-      mid = (lo + hi) / 2;
-      ASTextLine *line = _lines[mid];
-      NSRange range = line.range;
-      if (range.location < location && location <= range.location + range.length) {
-        return mid;
-      }
-      if (location <= range.location) {
-        hi = mid - 1;
-      } else {
-        lo = mid + 1;
-      }
-    }
-  } else {
-    while (lo <= hi) {
-      mid = (lo + hi) / 2;
-      ASTextLine *line = _lines[mid];
-      NSRange range = line.range;
-      if (range.location <= location && location < range.location + range.length) {
-        return mid;
-      }
-      if (location < range.location) {
-        hi = mid - 1;
-      } else {
-        lo = mid + 1;
-      }
-    }
-  }
-  return NSNotFound;
-}
-
-- (CGPoint)linePositionForPosition:(ASTextPosition *)position {
-  NSUInteger lineIndex = [self lineIndexForPosition:position];
-  if (lineIndex == NSNotFound) return CGPointZero;
-  ASTextLine *line = _lines[lineIndex];
-  CGFloat offset = [self offsetForTextPosition:position.offset lineIndex:lineIndex];
-  if (offset == CGFLOAT_MAX) return CGPointZero;
-  if (_container.verticalForm) {
-    return CGPointMake(line.position.x, offset);
-  } else {
-    return CGPointMake(offset, line.position.y);
-  }
-}
-
-- (CGRect)caretRectForPosition:(ASTextPosition *)position {
-  NSUInteger lineIndex = [self lineIndexForPosition:position];
-  if (lineIndex == NSNotFound) return CGRectNull;
-  ASTextLine *line = _lines[lineIndex];
-  CGFloat offset = [self offsetForTextPosition:position.offset lineIndex:lineIndex];
-  if (offset == CGFLOAT_MAX) return CGRectNull;
-  if (_container.verticalForm) {
-    return CGRectMake(line.bounds.origin.x, offset, line.bounds.size.width, 0);
-  } else {
-    return CGRectMake(offset, line.bounds.origin.y, 0, line.bounds.size.height);
-  }
-}
-
-- (CGRect)firstRectForRange:(ASTextRange *)range {
-  range = [self _correctedRangeWithEdge:range];
-  
-  NSUInteger startLineIndex = [self lineIndexForPosition:range.start];
-  NSUInteger endLineIndex = [self lineIndexForPosition:range.end];
-  if (startLineIndex == NSNotFound || endLineIndex == NSNotFound) return CGRectNull;
-  if (startLineIndex > endLineIndex) return CGRectNull;
-  ASTextLine *startLine = _lines[startLineIndex];
-  ASTextLine *endLine = _lines[endLineIndex];
-  NSMutableArray *lines = [NSMutableArray new];
-  for (NSUInteger i = startLineIndex; i <= startLineIndex; i++) {
-    ASTextLine *line = _lines[i];
-    if (line.row != startLine.row) break;
-    [lines addObject:line];
-  }
-  if (_container.verticalForm) {
-    if (lines.count == 1) {
-      CGFloat top = [self offsetForTextPosition:range.start.offset lineIndex:startLineIndex];
-      CGFloat bottom;
-      if (startLine == endLine) {
-        bottom = [self offsetForTextPosition:range.end.offset lineIndex:startLineIndex];
-      } else {
-        bottom = startLine.bottom;
-      }
-      if (top == CGFLOAT_MAX || bottom == CGFLOAT_MAX) return CGRectNull;
-      if (top > bottom) ASTEXT_SWAP(top, bottom);
-      return CGRectMake(startLine.left, top, startLine.width, bottom - top);
-    } else {
-      CGFloat top = [self offsetForTextPosition:range.start.offset lineIndex:startLineIndex];
-      CGFloat bottom = startLine.bottom;
-      if (top == CGFLOAT_MAX || bottom == CGFLOAT_MAX) return CGRectNull;
-      if (top > bottom) ASTEXT_SWAP(top, bottom);
-      CGRect rect = CGRectMake(startLine.left, top, startLine.width, bottom - top);
-      for (NSUInteger i = 1; i < lines.count; i++) {
-        ASTextLine *line = lines[i];
-        rect = CGRectUnion(rect, line.bounds);
-      }
-      return rect;
-    }
-  } else {
-    if (lines.count == 1) {
-      CGFloat left = [self offsetForTextPosition:range.start.offset lineIndex:startLineIndex];
-      CGFloat right;
-      if (startLine == endLine) {
-        right = [self offsetForTextPosition:range.end.offset lineIndex:startLineIndex];
-      } else {
-        right = startLine.right;
-      }
-      if (left == CGFLOAT_MAX || right == CGFLOAT_MAX) return CGRectNull;
-      if (left > right) ASTEXT_SWAP(left, right);
-      return CGRectMake(left, startLine.top, right - left, startLine.height);
-    } else {
-      CGFloat left = [self offsetForTextPosition:range.start.offset lineIndex:startLineIndex];
-      CGFloat right = startLine.right;
-      if (left == CGFLOAT_MAX || right == CGFLOAT_MAX) return CGRectNull;
-      if (left > right) ASTEXT_SWAP(left, right);
-      CGRect rect = CGRectMake(left, startLine.top, right - left, startLine.height);
-      for (NSUInteger i = 1; i < lines.count; i++) {
-        ASTextLine *line = lines[i];
-        rect = CGRectUnion(rect, line.bounds);
-      }
-      return rect;
-    }
-  }
-}
-
-- (CGRect)rectForRange:(ASTextRange *)range {
-  NSArray *rects = [self selectionRectsForRange:range];
-  if (rects.count == 0) return CGRectNull;
-  CGRect rectUnion = ((ASTextSelectionRect *)rects.firstObject).rect;
-  for (NSUInteger i = 1; i < rects.count; i++) {
-    ASTextSelectionRect *rect = rects[i];
-    rectUnion = CGRectUnion(rectUnion, rect.rect);
-  }
-  return rectUnion;
-}
-
-- (NSArray *)selectionRectsForRange:(ASTextRange *)range {
-  range = [self _correctedRangeWithEdge:range];
-  
-  BOOL isVertical = _container.verticalForm;
-  NSMutableArray *rects = [[NSMutableArray<ASTextSelectionRect *> alloc] init];
-  if (!range) return rects;
-  
-  NSUInteger startLineIndex = [self lineIndexForPosition:range.start];
-  NSUInteger endLineIndex = [self lineIndexForPosition:range.end];
-  if (startLineIndex == NSNotFound || endLineIndex == NSNotFound) return rects;
-  if (startLineIndex > endLineIndex) ASTEXT_SWAP(startLineIndex, endLineIndex);
-  ASTextLine *startLine = _lines[startLineIndex];
-  ASTextLine *endLine = _lines[endLineIndex];
-  CGFloat offsetStart = [self offsetForTextPosition:range.start.offset lineIndex:startLineIndex];
-  CGFloat offsetEnd = [self offsetForTextPosition:range.end.offset lineIndex:endLineIndex];
-  
-  ASTextSelectionRect *start = [ASTextSelectionRect new];
-  if (isVertical) {
-    start.rect = CGRectMake(startLine.left, offsetStart, startLine.width, 0);
-  } else {
-    start.rect = CGRectMake(offsetStart, startLine.top, 0, startLine.height);
-  }
-  start.containsStart = YES;
-  start.isVertical = isVertical;
-  [rects addObject:start];
-  
-  ASTextSelectionRect *end = [ASTextSelectionRect new];
-  if (isVertical) {
-    end.rect = CGRectMake(endLine.left, offsetEnd, endLine.width, 0);
-  } else {
-    end.rect = CGRectMake(offsetEnd, endLine.top, 0, endLine.height);
-  }
-  end.containsEnd = YES;
-  end.isVertical = isVertical;
-  [rects addObject:end];
-  
-  if (startLine.row == endLine.row) { // same row
-    if (offsetStart > offsetEnd) ASTEXT_SWAP(offsetStart, offsetEnd);
-    ASTextSelectionRect *rect = [ASTextSelectionRect new];
-    if (isVertical) {
-      rect.rect = CGRectMake(startLine.bounds.origin.x, offsetStart, MAX(startLine.width, endLine.width), offsetEnd - offsetStart);
-    } else {
-      rect.rect = CGRectMake(offsetStart, startLine.bounds.origin.y, offsetEnd - offsetStart, MAX(startLine.height, endLine.height));
-    }
-    rect.isVertical = isVertical;
-    [rects addObject:rect];
-    
-  } else { // more than one row
-    
-    // start line select rect
-    ASTextSelectionRect *topRect = [ASTextSelectionRect new];
-    topRect.isVertical = isVertical;
-    CGFloat topOffset = [self offsetForTextPosition:range.start.offset lineIndex:startLineIndex];
-    CTRunRef topRun = [self _runForLine:startLine position:range.start];
-    if (topRun && (CTRunGetStatus(topRun) & kCTRunStatusRightToLeft)) {
-      if (isVertical) {
-        topRect.rect = CGRectMake(startLine.left, _container.path ? startLine.top : _container.insets.top, startLine.width, topOffset - startLine.top);
-      } else {
-        topRect.rect = CGRectMake(_container.path ? startLine.left : _container.insets.left, startLine.top, topOffset - startLine.left, startLine.height);
-      }
-      topRect.writingDirection = UITextWritingDirectionRightToLeft;
-    } else {
-      if (isVertical) {
-        topRect.rect = CGRectMake(startLine.left, topOffset, startLine.width, (_container.path ? startLine.bottom : _container.size.height - _container.insets.bottom) - topOffset);
-      } else {
-        topRect.rect = CGRectMake(topOffset, startLine.top, (_container.path ? startLine.right : _container.size.width - _container.insets.right) - topOffset, startLine.height);
-      }
-    }
-    [rects addObject:topRect];
-    
-    // end line select rect
-    ASTextSelectionRect *bottomRect = [ASTextSelectionRect new];
-    bottomRect.isVertical = isVertical;
-    CGFloat bottomOffset = [self offsetForTextPosition:range.end.offset lineIndex:endLineIndex];
-    CTRunRef bottomRun = [self _runForLine:endLine position:range.end];
-    if (bottomRun && (CTRunGetStatus(bottomRun) & kCTRunStatusRightToLeft)) {
-      if (isVertical) {
-        bottomRect.rect = CGRectMake(endLine.left, bottomOffset, endLine.width, (_container.path ? endLine.bottom : _container.size.height - _container.insets.bottom) - bottomOffset);
-      } else {
-        bottomRect.rect = CGRectMake(bottomOffset, endLine.top, (_container.path ? endLine.right : _container.size.width - _container.insets.right) - bottomOffset, endLine.height);
-      }
-      bottomRect.writingDirection = UITextWritingDirectionRightToLeft;
-    } else {
-      if (isVertical) {
-        CGFloat top = _container.path ? endLine.top : _container.insets.top;
-        bottomRect.rect = CGRectMake(endLine.left, top, endLine.width, bottomOffset - top);
-      } else {
-        CGFloat left = _container.path ? endLine.left : _container.insets.left;
-        bottomRect.rect = CGRectMake(left, endLine.top, bottomOffset - left, endLine.height);
-      }
-    }
-    [rects addObject:bottomRect];
-    
-    if (endLineIndex - startLineIndex >= 2) {
-      CGRect r = CGRectZero;
-      BOOL startLineDetected = NO;
-      for (NSUInteger l = startLineIndex + 1; l < endLineIndex; l++) {
-        ASTextLine *line = _lines[l];
-        if (line.row == startLine.row || line.row == endLine.row) continue;
-        if (!startLineDetected) {
-          r = line.bounds;
-          startLineDetected = YES;
-        } else {
-          r = CGRectUnion(r, line.bounds);
-        }
-      }
-      if (startLineDetected) {
-        if (isVertical) {
-          if (!_container.path) {
-            r.origin.y = _container.insets.top;
-            r.size.height = _container.size.height - _container.insets.bottom - _container.insets.top;
-          }
-          r.size.width =  CGRectGetMinX(topRect.rect) - CGRectGetMaxX(bottomRect.rect);
-          r.origin.x = CGRectGetMaxX(bottomRect.rect);
-        } else {
-          if (!_container.path) {
-            r.origin.x = _container.insets.left;
-            r.size.width = _container.size.width - _container.insets.right - _container.insets.left;
-          }
-          r.origin.y = CGRectGetMaxY(topRect.rect);
-          r.size.height = bottomRect.rect.origin.y - r.origin.y;
-        }
-        
-        ASTextSelectionRect *rect = [ASTextSelectionRect new];
-        rect.rect = r;
-        rect.isVertical = isVertical;
-        [rects addObject:rect];
-      }
-    } else {
-      if (isVertical) {
-        CGRect r0 = bottomRect.rect;
-        CGRect r1 = topRect.rect;
-        CGFloat mid = (CGRectGetMaxX(r0) + CGRectGetMinX(r1)) * 0.5;
-        r0.size.width = mid - r0.origin.x;
-        CGFloat r1ofs = r1.origin.x - mid;
-        r1.origin.x -= r1ofs;
-        r1.size.width += r1ofs;
-        topRect.rect = r1;
-        bottomRect.rect = r0;
-      } else {
-        CGRect r0 = topRect.rect;
-        CGRect r1 = bottomRect.rect;
-        CGFloat mid = (CGRectGetMaxY(r0) + CGRectGetMinY(r1)) * 0.5;
-        r0.size.height = mid - r0.origin.y;
-        CGFloat r1ofs = r1.origin.y - mid;
-        r1.origin.y -= r1ofs;
-        r1.size.height += r1ofs;
-        topRect.rect = r0;
-        bottomRect.rect = r1;
-      }
-    }
-  }
-  return rects;
-}
-
-- (NSArray *)selectionRectsWithoutStartAndEndForRange:(ASTextRange *)range {
-  NSMutableArray *rects = [self selectionRectsForRange:range].mutableCopy;
-  for (NSInteger i = 0, max = rects.count; i < max; i++) {
-    ASTextSelectionRect *rect = rects[i];
-    if (rect.containsStart || rect.containsEnd) {
-      [rects removeObjectAtIndex:i];
-      i--;
-      max--;
-    }
-  }
-  return rects;
-}
-
-- (NSArray *)selectionRectsWithOnlyStartAndEndForRange:(ASTextRange *)range {
-  NSMutableArray *rects = [self selectionRectsForRange:range].mutableCopy;
-  for (NSInteger i = 0, max = rects.count; i < max; i++) {
-    ASTextSelectionRect *rect = rects[i];
-    if (!rect.containsStart && !rect.containsEnd) {
-      [rects removeObjectAtIndex:i];
-      i--;
-      max--;
-    }
-  }
-  return rects;
-}
-
-
-#pragma mark - Draw
-
-
-typedef NS_OPTIONS(NSUInteger, ASTextDecorationType) {
-  ASTextDecorationTypeUnderline     = 1 << 0,
-  ASTextDecorationTypeStrikethrough = 1 << 1,
-};
-
-typedef NS_OPTIONS(NSUInteger, ASTextBorderType) {
-  ASTextBorderTypeBackgound = 1 << 0,
-  ASTextBorderTypeNormal    = 1 << 1,
-};
-
-static CGRect ASTextMergeRectInSameLine(CGRect rect1, CGRect rect2, BOOL isVertical) {
-  if (isVertical) {
-    CGFloat top = MIN(rect1.origin.y, rect2.origin.y);
-    CGFloat bottom = MAX(rect1.origin.y + rect1.size.height, rect2.origin.y + rect2.size.height);
-    CGFloat width = MAX(rect1.size.width, rect2.size.width);
-    return CGRectMake(rect1.origin.x, top, width, bottom - top);
-  } else {
-    CGFloat left = MIN(rect1.origin.x, rect2.origin.x);
-    CGFloat right = MAX(rect1.origin.x + rect1.size.width, rect2.origin.x + rect2.size.width);
-    CGFloat height = MAX(rect1.size.height, rect2.size.height);
-    return CGRectMake(left, rect1.origin.y, right - left, height);
-  }
-}
-
-static void ASTextGetRunsMaxMetric(CFArrayRef runs, CGFloat *xHeight, CGFloat *underlinePosition, CGFloat *lineThickness) {
-  CGFloat maxXHeight = 0;
-  CGFloat maxUnderlinePos = 0;
-  CGFloat maxLineThickness = 0;
-  for (NSUInteger i = 0, max = CFArrayGetCount(runs); i < max; i++) {
-    CTRunRef run = (CTRunRef)CFArrayGetValueAtIndex(runs, i);
-    CFDictionaryRef attrs = CTRunGetAttributes(run);
-    if (attrs) {
-      CTFontRef font = (CTFontRef)CFDictionaryGetValue(attrs, kCTFontAttributeName);
-      if (font) {
-        CGFloat xHeight = CTFontGetXHeight(font);
-        if (xHeight > maxXHeight) maxXHeight = xHeight;
-        CGFloat underlinePos = CTFontGetUnderlinePosition(font);
-        if (underlinePos < maxUnderlinePos) maxUnderlinePos = underlinePos;
-        CGFloat lineThickness = CTFontGetUnderlineThickness(font);
-        if (lineThickness > maxLineThickness) maxLineThickness = lineThickness;
-      }
-    }
-  }
-  if (xHeight) *xHeight = maxXHeight;
-  if (underlinePosition) *underlinePosition = maxUnderlinePos;
-  if (lineThickness) *lineThickness = maxLineThickness;
-}
-
-static void ASTextDrawRun(ASTextLine *line, CTRunRef run, CGContextRef context, CGSize size, BOOL isVertical, NSArray *runRanges, CGFloat verticalOffset) {
-  CGAffineTransform runTextMatrix = CTRunGetTextMatrix(run);
-  BOOL runTextMatrixIsID = CGAffineTransformIsIdentity(runTextMatrix);
-  
-  CFDictionaryRef runAttrs = CTRunGetAttributes(run);
-  NSValue *glyphTransformValue = (NSValue *)CFDictionaryGetValue(runAttrs, (__bridge const void *)(ASTextGlyphTransformAttributeName));
-  if (!isVertical && !glyphTransformValue) { // draw run
-    if (!runTextMatrixIsID) {
-      CGContextSaveGState(context);
-      CGAffineTransform trans = CGContextGetTextMatrix(context);
-      CGContextSetTextMatrix(context, CGAffineTransformConcat(trans, runTextMatrix));
-    }
-    CTRunDraw(run, context, CFRangeMake(0, 0));
-    if (!runTextMatrixIsID) {
-      CGContextRestoreGState(context);
-    }
-  } else { // draw glyph
-    CTFontRef runFont = (CTFontRef)CFDictionaryGetValue(runAttrs, kCTFontAttributeName);
-    if (!runFont) return;
-    NSUInteger glyphCount = CTRunGetGlyphCount(run);
-    if (glyphCount <= 0) return;
-    
-    CGGlyph glyphs[glyphCount];
-    CGPoint glyphPositions[glyphCount];
-    CTRunGetGlyphs(run, CFRangeMake(0, 0), glyphs);
-    CTRunGetPositions(run, CFRangeMake(0, 0), glyphPositions);
-    
-    CGColorRef fillColor = (CGColorRef)CFDictionaryGetValue(runAttrs, kCTForegroundColorAttributeName);
-    fillColor = ASTextGetCGColor(fillColor);
-    NSNumber *strokeWidth = (NSNumber *)CFDictionaryGetValue(runAttrs, kCTStrokeWidthAttributeName);
-    
-    CGContextSaveGState(context); {
-      CGContextSetFillColorWithColor(context, fillColor);
-      if (!strokeWidth || strokeWidth.floatValue == 0) {
-        CGContextSetTextDrawingMode(context, kCGTextFill);
-      } else {
-        CGColorRef strokeColor = (CGColorRef)CFDictionaryGetValue(runAttrs, kCTStrokeColorAttributeName);
-        if (!strokeColor) strokeColor = fillColor;
-        CGContextSetStrokeColorWithColor(context, strokeColor);
-        CGContextSetLineWidth(context, CTFontGetSize(runFont) * fabs(strokeWidth.floatValue * 0.01));
-        if (strokeWidth.floatValue > 0) {
-          CGContextSetTextDrawingMode(context, kCGTextStroke);
-        } else {
-          CGContextSetTextDrawingMode(context, kCGTextFillStroke);
-        }
-      }
-      
-      if (isVertical) {
-        CFIndex runStrIdx[glyphCount + 1];
-        CTRunGetStringIndices(run, CFRangeMake(0, 0), runStrIdx);
-        CFRange runStrRange = CTRunGetStringRange(run);
-        runStrIdx[glyphCount] = runStrRange.location + runStrRange.length;
-        CGSize glyphAdvances[glyphCount];
-        CTRunGetAdvances(run, CFRangeMake(0, 0), glyphAdvances);
-        CGFloat ascent = CTFontGetAscent(runFont);
-        CGFloat descent = CTFontGetDescent(runFont);
-        CGAffineTransform glyphTransform = glyphTransformValue.CGAffineTransformValue;
-        CGPoint zeroPoint = CGPointZero;
-        
-        for (ASTextRunGlyphRange *oneRange in runRanges) {
-          NSRange range = oneRange.glyphRangeInRun;
-          NSUInteger rangeMax = range.location + range.length;
-          ASTextRunGlyphDrawMode mode = oneRange.drawMode;
-          
-          for (NSUInteger g = range.location; g < rangeMax; g++) {
-            CGContextSaveGState(context); {
-              CGContextSetTextMatrix(context, CGAffineTransformIdentity);
-              if (glyphTransformValue) {
-                CGContextSetTextMatrix(context, glyphTransform);
-              }
-              if (mode) { // CJK glyph, need rotated
-                CGFloat ofs = (ascent - descent) * 0.5;
-                CGFloat w = glyphAdvances[g].width * 0.5;
-                CGFloat x = x = line.position.x + verticalOffset + glyphPositions[g].y + (ofs - w);
-                CGFloat y = -line.position.y + size.height - glyphPositions[g].x - (ofs + w);
-                if (mode == ASTextRunGlyphDrawModeVerticalRotateMove) {
-                  x += w;
-                  y += w;
-                }
-                CGContextSetTextPosition(context, x, y);
-              } else {
-                CGContextRotateCTM(context, -M_PI_2);
-                CGContextSetTextPosition(context,
-                                         line.position.y - size.height + glyphPositions[g].x,
-                                         line.position.x + verticalOffset + glyphPositions[g].y);
-              }
-              
-              if (ASTextCTFontContainsColorBitmapGlyphs(runFont)) {
-                CTFontDrawGlyphs(runFont, glyphs + g, &zeroPoint, 1, context);
-              } else {
-                CGFontRef cgFont = CTFontCopyGraphicsFont(runFont, NULL);
-                CGContextSetFont(context, cgFont);
-                CGContextSetFontSize(context, CTFontGetSize(runFont));
-                CGContextShowGlyphsAtPositions(context, glyphs + g, &zeroPoint, 1);
-                CGFontRelease(cgFont);
-              }
-            } CGContextRestoreGState(context);
-          }
-        }
-      } else { // not vertical
-        if (glyphTransformValue) {
-          CFIndex runStrIdx[glyphCount + 1];
-          CTRunGetStringIndices(run, CFRangeMake(0, 0), runStrIdx);
-          CFRange runStrRange = CTRunGetStringRange(run);
-          runStrIdx[glyphCount] = runStrRange.location + runStrRange.length;
-          CGSize glyphAdvances[glyphCount];
-          CTRunGetAdvances(run, CFRangeMake(0, 0), glyphAdvances);
-          CGAffineTransform glyphTransform = glyphTransformValue.CGAffineTransformValue;
-          CGPoint zeroPoint = CGPointZero;
-          
-          for (NSUInteger g = 0; g < glyphCount; g++) {
-            CGContextSaveGState(context); {
-              CGContextSetTextMatrix(context, CGAffineTransformIdentity);
-              CGContextSetTextMatrix(context, glyphTransform);
-              CGContextSetTextPosition(context,
-                                       line.position.x + glyphPositions[g].x,
-                                       size.height - (line.position.y + glyphPositions[g].y));
-              
-              if (ASTextCTFontContainsColorBitmapGlyphs(runFont)) {
-                CTFontDrawGlyphs(runFont, glyphs + g, &zeroPoint, 1, context);
-              } else {
-                CGFontRef cgFont = CTFontCopyGraphicsFont(runFont, NULL);
-                CGContextSetFont(context, cgFont);
-                CGContextSetFontSize(context, CTFontGetSize(runFont));
-                CGContextShowGlyphsAtPositions(context, glyphs + g, &zeroPoint, 1);
-                CGFontRelease(cgFont);
-              }
-            } CGContextRestoreGState(context);
-          }
-        } else {
-          if (ASTextCTFontContainsColorBitmapGlyphs(runFont)) {
-            CTFontDrawGlyphs(runFont, glyphs, glyphPositions, glyphCount, context);
-          } else {
-            CGFontRef cgFont = CTFontCopyGraphicsFont(runFont, NULL);
-            CGContextSetFont(context, cgFont);
-            CGContextSetFontSize(context, CTFontGetSize(runFont));
-            CGContextShowGlyphsAtPositions(context, glyphs, glyphPositions, glyphCount);
-            CGFontRelease(cgFont);
-          }
-        }
-      }
-      
-    } CGContextRestoreGState(context);
-  }
-}
-
-static void ASTextSetLinePatternInContext(ASTextLineStyle style, CGFloat width, CGFloat phase, CGContextRef context){
-  CGContextSetLineWidth(context, width);
-  CGContextSetLineCap(context, kCGLineCapButt);
-  CGContextSetLineJoin(context, kCGLineJoinMiter);
-  
-  CGFloat dash = 12, dot = 5, space = 3;
-  NSUInteger pattern = style & 0xF00;
-  if (pattern == ASTextLineStylePatternSolid) {
-    CGContextSetLineDash(context, phase, NULL, 0);
-  } else if (pattern == ASTextLineStylePatternDot) {
-    CGFloat lengths[2] = {width * dot, width * space};
-    CGContextSetLineDash(context, phase, lengths, 2);
-  } else if (pattern == ASTextLineStylePatternDash) {
-    CGFloat lengths[2] = {width * dash, width * space};
-    CGContextSetLineDash(context, phase, lengths, 2);
-  } else if (pattern == ASTextLineStylePatternDashDot) {
-    CGFloat lengths[4] = {width * dash, width * space, width * dot, width * space};
-    CGContextSetLineDash(context, phase, lengths, 4);
-  } else if (pattern == ASTextLineStylePatternDashDotDot) {
-    CGFloat lengths[6] = {width * dash, width * space,width * dot, width * space, width * dot, width * space};
-    CGContextSetLineDash(context, phase, lengths, 6);
-  } else if (pattern == ASTextLineStylePatternCircleDot) {
-    CGFloat lengths[2] = {width * 0, width * 3};
-    CGContextSetLineDash(context, phase, lengths, 2);
-    CGContextSetLineCap(context, kCGLineCapRound);
-    CGContextSetLineJoin(context, kCGLineJoinRound);
-  }
-}
-
-
-static void ASTextDrawBorderRects(CGContextRef context, CGSize size, ASTextBorder *border, NSArray *rects, BOOL isVertical) {
-  if (rects.count == 0) return;
-  
-  ASTextShadow *shadow = border.shadow;
-  if (shadow.color) {
-    CGContextSaveGState(context);
-    CGContextSetShadowWithColor(context, shadow.offset, shadow.radius, shadow.color.CGColor);
-    CGContextBeginTransparencyLayer(context, NULL);
-  }
-  
-  NSMutableArray *paths = [NSMutableArray new];
-  for (NSValue *value in rects) {
-    CGRect rect = value.CGRectValue;
-    if (isVertical) {
-      rect = UIEdgeInsetsInsetRect(rect, UIEdgeInsetRotateVertical(border.insets));
-    } else {
-      rect = UIEdgeInsetsInsetRect(rect, border.insets);
-    }
-    rect = ASTextCGRectPixelRound(rect);
-    UIBezierPath *path = [UIBezierPath bezierPathWithRoundedRect:rect cornerRadius:border.cornerRadius];
-    [path closePath];
-    [paths addObject:path];
-  }
-  
-  if (border.fillColor) {
-    CGContextSaveGState(context);
-    CGContextSetFillColorWithColor(context, border.fillColor.CGColor);
-    for (UIBezierPath *path in paths) {
-      CGContextAddPath(context, path.CGPath);
-    }
-    CGContextFillPath(context);
-    CGContextRestoreGState(context);
-  }
-  
-  if (border.strokeColor && border.lineStyle > 0 && border.strokeWidth > 0) {
-    
-    //-------------------------- single line ------------------------------//
-    CGContextSaveGState(context);
-    for (UIBezierPath *path in paths) {
-      CGRect bounds = CGRectUnion(path.bounds, (CGRect){CGPointZero, size});
-      bounds = CGRectInset(bounds, -2 * border.strokeWidth, -2 * border.strokeWidth);
-      CGContextAddRect(context, bounds);
-      CGContextAddPath(context, path.CGPath);
-      CGContextEOClip(context);
-    }
-    [border.strokeColor setStroke];
-    ASTextSetLinePatternInContext(border.lineStyle, border.strokeWidth, 0, context);
-    CGFloat inset = -border.strokeWidth * 0.5;
-    if ((border.lineStyle & 0xFF) == ASTextLineStyleThick) {
-      inset *= 2;
-      CGContextSetLineWidth(context, border.strokeWidth * 2);
-    }
-    CGFloat radiusDelta = -inset;
-    if (border.cornerRadius <= 0) {
-      radiusDelta = 0;
-    }
-    CGContextSetLineJoin(context, border.lineJoin);
-    for (NSValue *value in rects) {
-      CGRect rect = value.CGRectValue;
-      if (isVertical) {
-        rect = UIEdgeInsetsInsetRect(rect, UIEdgeInsetRotateVertical(border.insets));
-      } else {
-        rect = UIEdgeInsetsInsetRect(rect, border.insets);
-      }
-      rect = CGRectInset(rect, inset, inset);
-      UIBezierPath *path = [UIBezierPath bezierPathWithRoundedRect:rect cornerRadius:border.cornerRadius + radiusDelta];
-      [path closePath];
-      CGContextAddPath(context, path.CGPath);
-    }
-    CGContextStrokePath(context);
-    CGContextRestoreGState(context);
-    
-    //------------------------- second line ------------------------------//
-    if ((border.lineStyle & 0xFF) == ASTextLineStyleDouble) {
-      CGContextSaveGState(context);
-      CGFloat inset = -border.strokeWidth * 2;
-      for (NSValue *value in rects) {
-        CGRect rect = value.CGRectValue;
-        rect = UIEdgeInsetsInsetRect(rect, border.insets);
-        rect = CGRectInset(rect, inset, inset);
-        UIBezierPath *path = [UIBezierPath bezierPathWithRoundedRect:rect cornerRadius:border.cornerRadius + 2 * border.strokeWidth];
-        [path closePath];
-        
-        CGRect bounds = CGRectUnion(path.bounds, (CGRect){CGPointZero, size});
-        bounds = CGRectInset(bounds, -2 * border.strokeWidth, -2 * border.strokeWidth);
-        CGContextAddRect(context, bounds);
-        CGContextAddPath(context, path.CGPath);
-        CGContextEOClip(context);
-      }
-      CGContextSetStrokeColorWithColor(context, border.strokeColor.CGColor);
-      ASTextSetLinePatternInContext(border.lineStyle, border.strokeWidth, 0, context);
-      CGContextSetLineJoin(context, border.lineJoin);
-      inset = -border.strokeWidth * 2.5;
-      radiusDelta = border.strokeWidth * 2;
-      if (border.cornerRadius <= 0) {
-        radiusDelta = 0;
-      }
-      for (NSValue *value in rects) {
-        CGRect rect = value.CGRectValue;
-        rect = UIEdgeInsetsInsetRect(rect, border.insets);
-        rect = CGRectInset(rect, inset, inset);
-        UIBezierPath *path = [UIBezierPath bezierPathWithRoundedRect:rect cornerRadius:border.cornerRadius + radiusDelta];
-        [path closePath];
-        CGContextAddPath(context, path.CGPath);
-      }
-      CGContextStrokePath(context);
-      CGContextRestoreGState(context);
-    }
-  }
-  
-  if (shadow.color) {
-    CGContextEndTransparencyLayer(context);
-    CGContextRestoreGState(context);
-  }
-}
-
-static void ASTextDrawLineStyle(CGContextRef context, CGFloat length, CGFloat lineWidth, ASTextLineStyle style, CGPoint position, CGColorRef color, BOOL isVertical) {
-  NSUInteger styleBase = style & 0xFF;
-  if (styleBase == 0) return;
-  
-  CGContextSaveGState(context); {
-    if (isVertical) {
-      CGFloat x, y1, y2, w;
-      y1 = ASRoundPixelValue(position.y);
-      y2 = ASRoundPixelValue(position.y + length);
-      w = (styleBase == ASTextLineStyleThick ? lineWidth * 2 : lineWidth);
-      
-      CGFloat linePixel = ASTextCGFloatToPixel(w);
-      if (fabs(linePixel - floor(linePixel)) < 0.1) {
-        int iPixel = linePixel;
-        if (iPixel == 0 || (iPixel % 2)) { // odd line pixel
-          x = ASTextCGFloatPixelHalf(position.x);
-        } else {
-          x = ASFloorPixelValue(position.x);
-        }
-      } else {
-        x = position.x;
-      }
-      
-      CGContextSetStrokeColorWithColor(context, color);
-      ASTextSetLinePatternInContext(style, lineWidth, position.y, context);
-      CGContextSetLineWidth(context, w);
-      if (styleBase == ASTextLineStyleSingle) {
-        CGContextMoveToPoint(context, x, y1);
-        CGContextAddLineToPoint(context, x, y2);
-        CGContextStrokePath(context);
-      } else if (styleBase == ASTextLineStyleThick) {
-        CGContextMoveToPoint(context, x, y1);
-        CGContextAddLineToPoint(context, x, y2);
-        CGContextStrokePath(context);
-      } else if (styleBase == ASTextLineStyleDouble) {
-        CGContextMoveToPoint(context, x - w, y1);
-        CGContextAddLineToPoint(context, x - w, y2);
-        CGContextStrokePath(context);
-        CGContextMoveToPoint(context, x + w, y1);
-        CGContextAddLineToPoint(context, x + w, y2);
-        CGContextStrokePath(context);
-      }
-    } else {
-      CGFloat x1, x2, y, w;
-      x1 = ASRoundPixelValue(position.x);
-      x2 = ASRoundPixelValue(position.x + length);
-      w = (styleBase == ASTextLineStyleThick ? lineWidth * 2 : lineWidth);
-      
-      CGFloat linePixel = ASTextCGFloatToPixel(w);
-      if (fabs(linePixel - floor(linePixel)) < 0.1) {
-        int iPixel = linePixel;
-        if (iPixel == 0 || (iPixel % 2)) { // odd line pixel
-          y = ASTextCGFloatPixelHalf(position.y);
-        } else {
-          y = ASFloorPixelValue(position.y);
-        }
-      } else {
-        y = position.y;
-      }
-      
-      CGContextSetStrokeColorWithColor(context, color);
-      ASTextSetLinePatternInContext(style, lineWidth, position.x, context);
-      CGContextSetLineWidth(context, w);
-      if (styleBase == ASTextLineStyleSingle) {
-        CGContextMoveToPoint(context, x1, y);
-        CGContextAddLineToPoint(context, x2, y);
-        CGContextStrokePath(context);
-      } else if (styleBase == ASTextLineStyleThick) {
-        CGContextMoveToPoint(context, x1, y);
-        CGContextAddLineToPoint(context, x2, y);
-        CGContextStrokePath(context);
-      } else if (styleBase == ASTextLineStyleDouble) {
-        CGContextMoveToPoint(context, x1, y - w);
-        CGContextAddLineToPoint(context, x2, y - w);
-        CGContextStrokePath(context);
-        CGContextMoveToPoint(context, x1, y + w);
-        CGContextAddLineToPoint(context, x2, y + w);
-        CGContextStrokePath(context);
-      }
-    }
-  } CGContextRestoreGState(context);
-}
-
-static void ASTextDrawText(ASTextLayout *layout, CGContextRef context, CGSize size, CGPoint point, BOOL (^cancel)(void)) {
-  CGContextSaveGState(context); {
-    
-    CGContextTranslateCTM(context, point.x, point.y);
-    CGContextTranslateCTM(context, 0, size.height);
-    CGContextScaleCTM(context, 1, -1);
-    
-    BOOL isVertical = layout.container.verticalForm;
-    CGFloat verticalOffset = isVertical ? (size.width - layout.container.size.width) : 0;
-    
-    NSArray *lines = layout.lines;
-    for (NSUInteger l = 0, lMax = lines.count; l < lMax; l++) {
-      ASTextLine *line = lines[l];
-      if (layout.truncatedLine && layout.truncatedLine.index == line.index) line = layout.truncatedLine;
-      NSArray *lineRunRanges = line.verticalRotateRange;
-      CGFloat posX = line.position.x + verticalOffset;
-      CGFloat posY = size.height - line.position.y;
-      CFArrayRef runs = CTLineGetGlyphRuns(line.CTLine);
-      for (NSUInteger r = 0, rMax = CFArrayGetCount(runs); r < rMax; r++) {
-        CTRunRef run = (CTRunRef)CFArrayGetValueAtIndex(runs, r);
-        CGContextSetTextMatrix(context, CGAffineTransformIdentity);
-        CGContextSetTextPosition(context, posX, posY);
-        ASTextDrawRun(line, run, context, size, isVertical, lineRunRanges[r], verticalOffset);
-      }
-      if (cancel && cancel()) break;
-    }
-    
-    // Use this to draw frame for test/debug.
-    // CGContextTranslateCTM(context, verticalOffset, size.height);
-    // CTFrameDraw(layout.frame, context);
-    
-  } CGContextRestoreGState(context);
-}
-
-static void ASTextDrawBlockBorder(ASTextLayout *layout, CGContextRef context, CGSize size, CGPoint point, BOOL (^cancel)(void)) {
-  CGContextSaveGState(context);
-  CGContextTranslateCTM(context, point.x, point.y);
-  
-  BOOL isVertical = layout.container.verticalForm;
-  CGFloat verticalOffset = isVertical ? (size.width - layout.container.size.width) : 0;
-  
-  NSArray *lines = layout.lines;
-  for (NSInteger l = 0, lMax = lines.count; l < lMax; l++) {
-    if (cancel && cancel()) break;
-    
-    ASTextLine *line = lines[l];
-    if (layout.truncatedLine && layout.truncatedLine.index == line.index) line = layout.truncatedLine;
-    CFArrayRef runs = CTLineGetGlyphRuns(line.CTLine);
-    for (NSInteger r = 0, rMax = CFArrayGetCount(runs); r < rMax; r++) {
-      CTRunRef run = (CTRunRef)CFArrayGetValueAtIndex(runs, r);
-      CFIndex glyphCount = CTRunGetGlyphCount(run);
-      if (glyphCount == 0) continue;
-      NSDictionary *attrs = (id)CTRunGetAttributes(run);
-      ASTextBorder *border = attrs[ASTextBlockBorderAttributeName];
-      if (!border) continue;
-      
-      NSUInteger lineStartIndex = line.index;
-      while (lineStartIndex > 0) {
-        if (((ASTextLine *)lines[lineStartIndex - 1]).row == line.row) lineStartIndex--;
-        else break;
-      }
-      
-      CGRect unionRect = CGRectZero;
-      NSUInteger lineStartRow = ((ASTextLine *)lines[lineStartIndex]).row;
-      NSUInteger lineContinueIndex = lineStartIndex;
-      NSUInteger lineContinueRow = lineStartRow;
-      do {
-        ASTextLine *one = lines[lineContinueIndex];
-        if (lineContinueIndex == lineStartIndex) {
-          unionRect = one.bounds;
-        } else {
-          unionRect = CGRectUnion(unionRect, one.bounds);
-        }
-        if (lineContinueIndex + 1 == lMax) break;
-        ASTextLine *next = lines[lineContinueIndex + 1];
-        if (next.row != lineContinueRow) {
-          ASTextBorder *nextBorder = [layout.text as_attribute:ASTextBlockBorderAttributeName atIndex:next.range.location];
-          if ([nextBorder isEqual:border]) {
-            lineContinueRow++;
-          } else {
-            break;
-          }
-        }
-        lineContinueIndex++;
-      } while (true);
-      
-      if (isVertical) {
-        UIEdgeInsets insets = layout.container.insets;
-        unionRect.origin.y = insets.top;
-        unionRect.size.height = layout.container.size.height -insets.top - insets.bottom;
-      } else {
-        UIEdgeInsets insets = layout.container.insets;
-        unionRect.origin.x = insets.left;
-        unionRect.size.width = layout.container.size.width -insets.left - insets.right;
-      }
-      unionRect.origin.x += verticalOffset;
-      ASTextDrawBorderRects(context, size, border, @[[NSValue valueWithCGRect:unionRect]], isVertical);
-      
-      l = lineContinueIndex;
-      break;
-    }
-  }
-  
-  
-  CGContextRestoreGState(context);
-}
-
-static void ASTextDrawBorder(ASTextLayout *layout, CGContextRef context, CGSize size, CGPoint point, ASTextBorderType type, BOOL (^cancel)(void)) {
-  CGContextSaveGState(context);
-  CGContextTranslateCTM(context, point.x, point.y);
-  
-  BOOL isVertical = layout.container.verticalForm;
-  CGFloat verticalOffset = isVertical ? (size.width - layout.container.size.width) : 0;
-  
-  NSArray *lines = layout.lines;
-  NSString *borderKey = (type == ASTextBorderTypeNormal ? ASTextBorderAttributeName : ASTextBackgroundBorderAttributeName);
-  
-  BOOL needJumpRun = NO;
-  NSUInteger jumpRunIndex = 0;
-  
-  for (NSInteger l = 0, lMax = lines.count; l < lMax; l++) {
-    if (cancel && cancel()) break;
-    
-    ASTextLine *line = lines[l];
-    if (layout.truncatedLine && layout.truncatedLine.index == line.index) line = layout.truncatedLine;
-    CFArrayRef runs = CTLineGetGlyphRuns(line.CTLine);
-    for (NSInteger r = 0, rMax = CFArrayGetCount(runs); r < rMax; r++) {
-      if (needJumpRun) {
-        needJumpRun = NO;
-        r = jumpRunIndex + 1;
-        if (r >= rMax) break;
-      }
-      
-      CTRunRef run = (CTRunRef)CFArrayGetValueAtIndex(runs, r);
-      CFIndex glyphCount = CTRunGetGlyphCount(run);
-      if (glyphCount == 0) continue;
-      
-      NSDictionary *attrs = (id)CTRunGetAttributes(run);
-      ASTextBorder *border = attrs[borderKey];
-      if (!border) continue;
-      
-      CFRange runRange = CTRunGetStringRange(run);
-      if (runRange.location == kCFNotFound || runRange.length == 0) continue;
-      if (runRange.location + runRange.length > layout.text.length) continue;
-      
-      NSMutableArray *runRects = [NSMutableArray new];
-      NSInteger endLineIndex = l;
-      NSInteger endRunIndex = r;
-      BOOL endFound = NO;
-      for (NSInteger ll = l; ll < lMax; ll++) {
-        if (endFound) break;
-        ASTextLine *iLine = lines[ll];
-        CFArrayRef iRuns = CTLineGetGlyphRuns(iLine.CTLine);
-        
-        CGRect extLineRect = CGRectNull;
-        for (NSInteger rr = (ll == l) ? r : 0, rrMax = CFArrayGetCount(iRuns); rr < rrMax; rr++) {
-          CTRunRef iRun = (CTRunRef)CFArrayGetValueAtIndex(iRuns, rr);
-          NSDictionary *iAttrs = (id)CTRunGetAttributes(iRun);
-          ASTextBorder *iBorder = iAttrs[borderKey];
-          if (![border isEqual:iBorder]) {
-            endFound = YES;
-            break;
-          }
-          endLineIndex = ll;
-          endRunIndex = rr;
-          
-          CGPoint iRunPosition = CGPointZero;
-          CTRunGetPositions(iRun, CFRangeMake(0, 1), &iRunPosition);
-          CGFloat ascent, descent;
-          CGFloat iRunWidth = CTRunGetTypographicBounds(iRun, CFRangeMake(0, 0), &ascent, &descent, NULL);
-          
-          if (isVertical) {
-            ASTEXT_SWAP(iRunPosition.x, iRunPosition.y);
-            iRunPosition.y += iLine.position.y;
-            CGRect iRect = CGRectMake(verticalOffset + line.position.x - descent, iRunPosition.y, ascent + descent, iRunWidth);
-            if (CGRectIsNull(extLineRect)) {
-              extLineRect = iRect;
-            } else {
-              extLineRect = CGRectUnion(extLineRect, iRect);
-            }
-          } else {
-            iRunPosition.x += iLine.position.x;
-            CGRect iRect = CGRectMake(iRunPosition.x, iLine.position.y - ascent, iRunWidth, ascent + descent);
-            if (CGRectIsNull(extLineRect)) {
-              extLineRect = iRect;
-            } else {
-              extLineRect = CGRectUnion(extLineRect, iRect);
-            }
-          }
-        }
-        
-        if (!CGRectIsNull(extLineRect)) {
-          [runRects addObject:[NSValue valueWithCGRect:extLineRect]];
-        }
-      }
-      
-      NSMutableArray *drawRects = [NSMutableArray new];
-      CGRect curRect= ((NSValue *)[runRects firstObject]).CGRectValue;
-      for (NSInteger re = 0, reMax = runRects.count; re < reMax; re++) {
-        CGRect rect = ((NSValue *)runRects[re]).CGRectValue;
-        if (isVertical) {
-          if (fabs(rect.origin.x - curRect.origin.x) < 1) {
-            curRect = ASTextMergeRectInSameLine(rect, curRect, isVertical);
-          } else {
-            [drawRects addObject:[NSValue valueWithCGRect:curRect]];
-            curRect = rect;
-          }
-        } else {
-          if (fabs(rect.origin.y - curRect.origin.y) < 1) {
-            curRect = ASTextMergeRectInSameLine(rect, curRect, isVertical);
-          } else {
-            [drawRects addObject:[NSValue valueWithCGRect:curRect]];
-            curRect = rect;
-          }
-        }
-      }
-      if (!CGRectEqualToRect(curRect, CGRectZero)) {
-        [drawRects addObject:[NSValue valueWithCGRect:curRect]];
-      }
-      
-      ASTextDrawBorderRects(context, size, border, drawRects, isVertical);
-      
-      if (l == endLineIndex) {
-        r = endRunIndex;
-      } else {
-        l = endLineIndex - 1;
-        needJumpRun = YES;
-        jumpRunIndex = endRunIndex;
-        break;
-      }
-      
-    }
-  }
-  
-  CGContextRestoreGState(context);
-}
-
-static void ASTextDrawDecoration(ASTextLayout *layout, CGContextRef context, CGSize size, CGPoint point, ASTextDecorationType type, BOOL (^cancel)(void)) {
-  NSArray *lines = layout.lines;
-  
-  CGContextSaveGState(context);
-  CGContextTranslateCTM(context, point.x, point.y);
-  
-  BOOL isVertical = layout.container.verticalForm;
-  CGFloat verticalOffset = isVertical ? (size.width - layout.container.size.width) : 0;
-  CGContextTranslateCTM(context, verticalOffset, 0);
-  
-  for (NSUInteger l = 0, lMax = layout.lines.count; l < lMax; l++) {
-    if (cancel && cancel()) break;
-    
-    ASTextLine *line = lines[l];
-    if (layout.truncatedLine && layout.truncatedLine.index == line.index) line = layout.truncatedLine;
-    CFArrayRef runs = CTLineGetGlyphRuns(line.CTLine);
-    for (NSUInteger r = 0, rMax = CFArrayGetCount(runs); r < rMax; r++) {
-      CTRunRef run = (CTRunRef)CFArrayGetValueAtIndex(runs, r);
-      CFIndex glyphCount = CTRunGetGlyphCount(run);
-      if (glyphCount == 0) continue;
-      
-      NSDictionary *attrs = (id)CTRunGetAttributes(run);
-      ASTextDecoration *underline = attrs[ASTextUnderlineAttributeName];
-      ASTextDecoration *strikethrough = attrs[ASTextStrikethroughAttributeName];
-      
-      BOOL needDrawUnderline = NO, needDrawStrikethrough = NO;
-      if ((type & ASTextDecorationTypeUnderline) && underline.style > 0) {
-        needDrawUnderline = YES;
-      }
-      if ((type & ASTextDecorationTypeStrikethrough) && strikethrough.style > 0) {
-        needDrawStrikethrough = YES;
-      }
-      if (!needDrawUnderline && !needDrawStrikethrough) continue;
-      
-      CFRange runRange = CTRunGetStringRange(run);
-      if (runRange.location == kCFNotFound || runRange.length == 0) continue;
-      if (runRange.location + runRange.length > layout.text.length) continue;
-      NSString *runStr = [layout.text attributedSubstringFromRange:NSMakeRange(runRange.location, runRange.length)].string;
-      if (ASTextIsLinebreakString(runStr)) continue; // may need more checks...
-      
-      CGFloat xHeight, underlinePosition, lineThickness;
-      ASTextGetRunsMaxMetric(runs, &xHeight, &underlinePosition, &lineThickness);
-      
-      CGPoint underlineStart, strikethroughStart;
-      CGFloat length;
-      
-      if (isVertical) {
-        underlineStart.x = line.position.x + underlinePosition;
-        strikethroughStart.x = line.position.x + xHeight / 2;
-        
-        CGPoint runPosition = CGPointZero;
-        CTRunGetPositions(run, CFRangeMake(0, 1), &runPosition);
-        underlineStart.y = strikethroughStart.y = runPosition.x + line.position.y;
-        length = CTRunGetTypographicBounds(run, CFRangeMake(0, 0), NULL, NULL, NULL);
-        
-      } else {
-        underlineStart.y = line.position.y - underlinePosition;
-        strikethroughStart.y = line.position.y - xHeight / 2;
-        
-        CGPoint runPosition = CGPointZero;
-        CTRunGetPositions(run, CFRangeMake(0, 1), &runPosition);
-        underlineStart.x = strikethroughStart.x = runPosition.x + line.position.x;
-        length = CTRunGetTypographicBounds(run, CFRangeMake(0, 0), NULL, NULL, NULL);
-      }
-      
-      if (needDrawUnderline) {
-        CGColorRef color = underline.color.CGColor;
-        if (!color) {
-          color = (__bridge CGColorRef)(attrs[(id)kCTForegroundColorAttributeName]);
-          color = ASTextGetCGColor(color);
-        }
-        CGFloat thickness = underline.width ? underline.width.floatValue : lineThickness;
-        ASTextShadow *shadow = underline.shadow;
-        while (shadow) {
-          if (!shadow.color) {
-            shadow = shadow.subShadow;
-            continue;
-          }
-          CGFloat offsetAlterX = size.width + 0xFFFF;
-          CGContextSaveGState(context); {
-            CGSize offset = shadow.offset;
-            offset.width -= offsetAlterX;
-            CGContextSaveGState(context); {
-              CGContextSetShadowWithColor(context, offset, shadow.radius, shadow.color.CGColor);
-              CGContextSetBlendMode(context, shadow.blendMode);
-              CGContextTranslateCTM(context, offsetAlterX, 0);
-              ASTextDrawLineStyle(context, length, thickness, underline.style, underlineStart, color, isVertical);
-            } CGContextRestoreGState(context);
-          } CGContextRestoreGState(context);
-          shadow = shadow.subShadow;
-        }
-        ASTextDrawLineStyle(context, length, thickness, underline.style, underlineStart, color, isVertical);
-      }
-      
-      if (needDrawStrikethrough) {
-        CGColorRef color = strikethrough.color.CGColor;
-        if (!color) {
-          color = (__bridge CGColorRef)(attrs[(id)kCTForegroundColorAttributeName]);
-          color = ASTextGetCGColor(color);
-        }
-        CGFloat thickness = strikethrough.width ? strikethrough.width.floatValue : lineThickness;
-        ASTextShadow *shadow = underline.shadow;
-        while (shadow) {
-          if (!shadow.color) {
-            shadow = shadow.subShadow;
-            continue;
-          }
-          CGFloat offsetAlterX = size.width + 0xFFFF;
-          CGContextSaveGState(context); {
-            CGSize offset = shadow.offset;
-            offset.width -= offsetAlterX;
-            CGContextSaveGState(context); {
-              CGContextSetShadowWithColor(context, offset, shadow.radius, shadow.color.CGColor);
-              CGContextSetBlendMode(context, shadow.blendMode);
-              CGContextTranslateCTM(context, offsetAlterX, 0);
-              ASTextDrawLineStyle(context, length, thickness, underline.style, underlineStart, color, isVertical);
-            } CGContextRestoreGState(context);
-          } CGContextRestoreGState(context);
-          shadow = shadow.subShadow;
-        }
-        ASTextDrawLineStyle(context, length, thickness, strikethrough.style, strikethroughStart, color, isVertical);
-      }
-    }
-  }
-  CGContextRestoreGState(context);
-}
-
-static void ASTextDrawAttachment(ASTextLayout *layout, CGContextRef context, CGSize size, CGPoint point, UIView *targetView, CALayer *targetLayer, BOOL (^cancel)(void)) {
-  
-  BOOL isVertical = layout.container.verticalForm;
-  CGFloat verticalOffset = isVertical ? (size.width - layout.container.size.width) : 0;
-  
-  for (NSUInteger i = 0, max = layout.attachments.count; i < max; i++) {
-    ASTextAttachment *a = layout.attachments[i];
-    if (!a.content) continue;
-    
-    UIImage *image = nil;
-    UIView *view = nil;
-    CALayer *layer = nil;
-    if ([a.content isKindOfClass:[UIImage class]]) {
-      image = a.content;
-    } else if ([a.content isKindOfClass:[UIView class]]) {
-      view = a.content;
-    } else if ([a.content isKindOfClass:[CALayer class]]) {
-      layer = a.content;
-    }
-    if (!image && !view && !layer) continue;
-    if (image && !context) continue;
-    if (view && !targetView) continue;
-    if (layer && !targetLayer) continue;
-    if (cancel && cancel()) break;
-    
-    CGSize asize = image ? image.size : view ? view.frame.size : layer.frame.size;
-    CGRect rect = ((NSValue *)layout.attachmentRects[i]).CGRectValue;
-    if (isVertical) {
-      rect = UIEdgeInsetsInsetRect(rect, UIEdgeInsetRotateVertical(a.contentInsets));
-    } else {
-      rect = UIEdgeInsetsInsetRect(rect, a.contentInsets);
-    }
-    rect = ASTextCGRectFitWithContentMode(rect, asize, a.contentMode);
-    rect = ASTextCGRectPixelRound(rect);
-    rect = CGRectStandardize(rect);
-    rect.origin.x += point.x + verticalOffset;
-    rect.origin.y += point.y;
-    if (image) {
-      CGImageRef ref = image.CGImage;
-      if (ref) {
-        CGContextSaveGState(context);
-        CGContextTranslateCTM(context, 0, CGRectGetMaxY(rect) + CGRectGetMinY(rect));
-        CGContextScaleCTM(context, 1, -1);
-        CGContextDrawImage(context, rect, ref);
-        CGContextRestoreGState(context);
-      }
-    } else if (view) {
-      view.frame = rect;
-      [targetView addSubview:view];
-    } else if (layer) {
-      layer.frame = rect;
-      [targetLayer addSublayer:layer];
-    }
-  }
-}
-
-static void ASTextDrawShadow(ASTextLayout *layout, CGContextRef context, CGSize size, CGPoint point, BOOL (^cancel)(void)) {
-  //move out of context. (0xFFFF is just a random large number)
-  CGFloat offsetAlterX = size.width + 0xFFFF;
-  
-  BOOL isVertical = layout.container.verticalForm;
-  CGFloat verticalOffset = isVertical ? (size.width - layout.container.size.width) : 0;
-  
-  CGContextSaveGState(context); {
-    CGContextTranslateCTM(context, point.x, point.y);
-    CGContextTranslateCTM(context, 0, size.height);
-    CGContextScaleCTM(context, 1, -1);
-    NSArray *lines = layout.lines;
-    for (NSUInteger l = 0, lMax = layout.lines.count; l < lMax; l++) {
-      if (cancel && cancel()) break;
-      ASTextLine *line = lines[l];
-      if (layout.truncatedLine && layout.truncatedLine.index == line.index) line = layout.truncatedLine;
-      NSArray *lineRunRanges = line.verticalRotateRange;
-      CGFloat linePosX = line.position.x;
-      CGFloat linePosY = size.height - line.position.y;
-      CFArrayRef runs = CTLineGetGlyphRuns(line.CTLine);
-      for (NSUInteger r = 0, rMax = CFArrayGetCount(runs); r < rMax; r++) {
-        CTRunRef run = (CTRunRef)CFArrayGetValueAtIndex(runs, r);
-        CGContextSetTextMatrix(context, CGAffineTransformIdentity);
-        CGContextSetTextPosition(context, linePosX, linePosY);
-        NSDictionary *attrs = (id)CTRunGetAttributes(run);
-        ASTextShadow *shadow = attrs[ASTextShadowAttributeName];
-        ASTextShadow *nsShadow = [ASTextShadow shadowWithNSShadow:attrs[NSShadowAttributeName]]; // NSShadow compatible
-        if (nsShadow) {
-          nsShadow.subShadow = shadow;
-          shadow = nsShadow;
-        }
-        while (shadow) {
-          if (!shadow.color) {
-            shadow = shadow.subShadow;
-            continue;
-          }
-          CGSize offset = shadow.offset;
-          offset.width -= offsetAlterX;
-          CGContextSaveGState(context); {
-            CGContextSetShadowWithColor(context, offset, shadow.radius, shadow.color.CGColor);
-            CGContextSetBlendMode(context, shadow.blendMode);
-            CGContextTranslateCTM(context, offsetAlterX, 0);
-            ASTextDrawRun(line, run, context, size, isVertical, lineRunRanges[r], verticalOffset);
-          } CGContextRestoreGState(context);
-          shadow = shadow.subShadow;
-        }
-      }
-    }
-  } CGContextRestoreGState(context);
-}
-
-static void ASTextDrawInnerShadow(ASTextLayout *layout, CGContextRef context, CGSize size, CGPoint point, BOOL (^cancel)(void)) {
-  CGContextSaveGState(context);
-  CGContextTranslateCTM(context, point.x, point.y);
-  CGContextTranslateCTM(context, 0, size.height);
-  CGContextScaleCTM(context, 1, -1);
-  CGContextSetTextMatrix(context, CGAffineTransformIdentity);
-  
-  BOOL isVertical = layout.container.verticalForm;
-  CGFloat verticalOffset = isVertical ? (size.width - layout.container.size.width) : 0;
-  
-  NSArray *lines = layout.lines;
-  for (NSUInteger l = 0, lMax = lines.count; l < lMax; l++) {
-    if (cancel && cancel()) break;
-    
-    ASTextLine *line = lines[l];
-    if (layout.truncatedLine && layout.truncatedLine.index == line.index) line = layout.truncatedLine;
-    NSArray *lineRunRanges = line.verticalRotateRange;
-    CGFloat linePosX = line.position.x;
-    CGFloat linePosY = size.height - line.position.y;
-    CFArrayRef runs = CTLineGetGlyphRuns(line.CTLine);
-    for (NSUInteger r = 0, rMax = CFArrayGetCount(runs); r < rMax; r++) {
-      CTRunRef run = (CTRunRef)CFArrayGetValueAtIndex(runs, r);
-      if (CTRunGetGlyphCount(run) == 0) continue;
-      CGContextSetTextMatrix(context, CGAffineTransformIdentity);
-      CGContextSetTextPosition(context, linePosX, linePosY);
-      NSDictionary *attrs = (id)CTRunGetAttributes(run);
-      ASTextShadow *shadow = attrs[ASTextInnerShadowAttributeName];
-      while (shadow) {
-        if (!shadow.color) {
-          shadow = shadow.subShadow;
-          continue;
-        }
-        CGPoint runPosition = CGPointZero;
-        CTRunGetPositions(run, CFRangeMake(0, 1), &runPosition);
-        CGRect runImageBounds = CTRunGetImageBounds(run, context, CFRangeMake(0, 0));
-        runImageBounds.origin.x += runPosition.x;
-        if (runImageBounds.size.width < 0.1 || runImageBounds.size.height < 0.1) continue;
-        
-        CFDictionaryRef runAttrs = CTRunGetAttributes(run);
-        NSValue *glyphTransformValue = (NSValue *)CFDictionaryGetValue(runAttrs, (__bridge const void *)(ASTextGlyphTransformAttributeName));
-        if (glyphTransformValue) {
-          runImageBounds = CGRectMake(0, 0, size.width, size.height);
-        }
-        
-        // text inner shadow
-        CGContextSaveGState(context); {
-          CGContextSetBlendMode(context, shadow.blendMode);
-          CGContextSetShadowWithColor(context, CGSizeZero, 0, NULL);
-          CGContextSetAlpha(context, CGColorGetAlpha(shadow.color.CGColor));
-          CGContextClipToRect(context, runImageBounds);
-          CGContextBeginTransparencyLayer(context, NULL); {
-            UIColor *opaqueShadowColor = [shadow.color colorWithAlphaComponent:1];
-            CGContextSetShadowWithColor(context, shadow.offset, shadow.radius, opaqueShadowColor.CGColor);
-            CGContextSetFillColorWithColor(context, opaqueShadowColor.CGColor);
-            CGContextSetBlendMode(context, kCGBlendModeSourceOut);
-            CGContextBeginTransparencyLayer(context, NULL); {
-              CGContextFillRect(context, runImageBounds);
-              CGContextSetBlendMode(context, kCGBlendModeDestinationIn);
-              CGContextBeginTransparencyLayer(context, NULL); {
-                ASTextDrawRun(line, run, context, size, isVertical, lineRunRanges[r], verticalOffset);
-              } CGContextEndTransparencyLayer(context);
-            } CGContextEndTransparencyLayer(context);
-          } CGContextEndTransparencyLayer(context);
-        } CGContextRestoreGState(context);
-        shadow = shadow.subShadow;
-      }
-    }
-  }
-  
-  CGContextRestoreGState(context);
-}
-
-static void ASTextDrawDebug(ASTextLayout *layout, CGContextRef context, CGSize size, CGPoint point, ASTextDebugOption *op) {
-  UIGraphicsPushContext(context);
-  CGContextSaveGState(context);
-  CGContextTranslateCTM(context, point.x, point.y);
-  CGContextSetLineWidth(context, 1.0 / ASScreenScale());
-  CGContextSetLineDash(context, 0, NULL, 0);
-  CGContextSetLineJoin(context, kCGLineJoinMiter);
-  CGContextSetLineCap(context, kCGLineCapButt);
-  
-  BOOL isVertical = layout.container.verticalForm;
-  CGFloat verticalOffset = isVertical ? (size.width - layout.container.size.width) : 0;
-  CGContextTranslateCTM(context, verticalOffset, 0);
-  
-  if (op.CTFrameBorderColor || op.CTFrameFillColor) {
-    UIBezierPath *path = layout.container.path;
-    if (!path) {
-      CGRect rect = (CGRect){CGPointZero, layout.container.size};
-      rect = UIEdgeInsetsInsetRect(rect, layout.container.insets);
-      if (op.CTFrameBorderColor) rect = ASTextCGRectPixelHalf(rect);
-      else rect = ASTextCGRectPixelRound(rect);
-      path = [UIBezierPath bezierPathWithRect:rect];
-    }
-    [path closePath];
-    
-    for (UIBezierPath *ex in layout.container.exclusionPaths) {
-      [path appendPath:ex];
-    }
-    if (op.CTFrameFillColor) {
-      [op.CTFrameFillColor setFill];
-      if (layout.container.pathLineWidth > 0) {
-        CGContextSaveGState(context); {
-          CGContextBeginTransparencyLayer(context, NULL); {
-            CGContextAddPath(context, path.CGPath);
-            if (layout.container.pathFillEvenOdd) {
-              CGContextEOFillPath(context);
-            } else {
-              CGContextFillPath(context);
-            }
-            CGContextSetBlendMode(context, kCGBlendModeDestinationOut);
-            [[UIColor blackColor] setFill];
-            CGPathRef cgPath = CGPathCreateCopyByStrokingPath(path.CGPath, NULL, layout.container.pathLineWidth, kCGLineCapButt, kCGLineJoinMiter, 0);
-            if (cgPath) {
-              CGContextAddPath(context, cgPath);
-              CGContextFillPath(context);
-            }
-            CGPathRelease(cgPath);
-          } CGContextEndTransparencyLayer(context);
-        } CGContextRestoreGState(context);
-      } else {
-        CGContextAddPath(context, path.CGPath);
-        if (layout.container.pathFillEvenOdd) {
-          CGContextEOFillPath(context);
-        } else {
-          CGContextFillPath(context);
-        }
-      }
-    }
-    if (op.CTFrameBorderColor) {
-      CGContextSaveGState(context); {
-        if (layout.container.pathLineWidth > 0) {
-          CGContextSetLineWidth(context, layout.container.pathLineWidth);
-        }
-        [op.CTFrameBorderColor setStroke];
-        CGContextAddPath(context, path.CGPath);
-        CGContextStrokePath(context);
-      } CGContextRestoreGState(context);
-    }
-  }
-  
-  NSArray *lines = layout.lines;
-  for (NSUInteger l = 0, lMax = lines.count; l < lMax; l++) {
-    ASTextLine *line = lines[l];
-    if (layout.truncatedLine && layout.truncatedLine.index == line.index) line = layout.truncatedLine;
-    CGRect lineBounds = line.bounds;
-    if (op.CTLineFillColor) {
-      [op.CTLineFillColor setFill];
-      CGContextAddRect(context, ASTextCGRectPixelRound(lineBounds));
-      CGContextFillPath(context);
-    }
-    if (op.CTLineBorderColor) {
-      [op.CTLineBorderColor setStroke];
-      CGContextAddRect(context, ASTextCGRectPixelHalf(lineBounds));
-      CGContextStrokePath(context);
-    }
-    if (op.baselineColor) {
-      [op.baselineColor setStroke];
-      if (isVertical) {
-        CGFloat x = ASTextCGFloatPixelHalf(line.position.x);
-        CGFloat y1 = ASTextCGFloatPixelHalf(line.top);
-        CGFloat y2 = ASTextCGFloatPixelHalf(line.bottom);
-        CGContextMoveToPoint(context, x, y1);
-        CGContextAddLineToPoint(context, x, y2);
-        CGContextStrokePath(context);
-      } else {
-        CGFloat x1 = ASTextCGFloatPixelHalf(lineBounds.origin.x);
-        CGFloat x2 = ASTextCGFloatPixelHalf(lineBounds.origin.x + lineBounds.size.width);
-        CGFloat y = ASTextCGFloatPixelHalf(line.position.y);
-        CGContextMoveToPoint(context, x1, y);
-        CGContextAddLineToPoint(context, x2, y);
-        CGContextStrokePath(context);
-      }
-    }
-    if (op.CTLineNumberColor) {
-      [op.CTLineNumberColor set];
-      NSMutableAttributedString *num = [[NSMutableAttributedString alloc] initWithString:@(l).description];
-      num.as_color = op.CTLineNumberColor;
-      num.as_font = [UIFont systemFontOfSize:6];
-      [num drawAtPoint:CGPointMake(line.position.x, line.position.y - (isVertical ? 1 : 6))];
-    }
-    if (op.CTRunFillColor || op.CTRunBorderColor || op.CTRunNumberColor || op.CGGlyphFillColor || op.CGGlyphBorderColor) {
-      CFArrayRef runs = CTLineGetGlyphRuns(line.CTLine);
-      for (NSUInteger r = 0, rMax = CFArrayGetCount(runs); r < rMax; r++) {
-        CTRunRef run = (CTRunRef)CFArrayGetValueAtIndex(runs, r);
-        CFIndex glyphCount = CTRunGetGlyphCount(run);
-        if (glyphCount == 0) continue;
-        
-        CGPoint glyphPositions[glyphCount];
-        CTRunGetPositions(run, CFRangeMake(0, glyphCount), glyphPositions);
-        
-        CGSize glyphAdvances[glyphCount];
-        CTRunGetAdvances(run, CFRangeMake(0, glyphCount), glyphAdvances);
-        
-        CGPoint runPosition = glyphPositions[0];
-        if (isVertical) {
-          ASTEXT_SWAP(runPosition.x, runPosition.y);
-          runPosition.x = line.position.x;
-          runPosition.y += line.position.y;
-        } else {
-          runPosition.x += line.position.x;
-          runPosition.y = line.position.y - runPosition.y;
-        }
-        
-        CGFloat ascent, descent, leading;
-        CGFloat width = CTRunGetTypographicBounds(run, CFRangeMake(0, 0), &ascent, &descent, &leading);
-        CGRect runTypoBounds;
-        if (isVertical) {
-          runTypoBounds = CGRectMake(runPosition.x - descent, runPosition.y, ascent + descent, width);
-        } else {
-          runTypoBounds = CGRectMake(runPosition.x, line.position.y - ascent, width, ascent + descent);
-        }
-        
-        if (op.CTRunFillColor) {
-          [op.CTRunFillColor setFill];
-          CGContextAddRect(context, ASTextCGRectPixelRound(runTypoBounds));
-          CGContextFillPath(context);
-        }
-        if (op.CTRunBorderColor) {
-          [op.CTRunBorderColor setStroke];
-          CGContextAddRect(context, ASTextCGRectPixelHalf(runTypoBounds));
-          CGContextStrokePath(context);
-        }
-        if (op.CTRunNumberColor) {
-          [op.CTRunNumberColor set];
-          NSMutableAttributedString *num = [[NSMutableAttributedString alloc] initWithString:@(r).description];
-          num.as_color = op.CTRunNumberColor;
-          num.as_font = [UIFont systemFontOfSize:6];
-          [num drawAtPoint:CGPointMake(runTypoBounds.origin.x, runTypoBounds.origin.y - 1)];
-        }
-        if (op.CGGlyphBorderColor || op.CGGlyphFillColor) {
-          for (NSUInteger g = 0; g < glyphCount; g++) {
-            CGPoint pos = glyphPositions[g];
-            CGSize adv = glyphAdvances[g];
-            CGRect rect;
-            if (isVertical) {
-              ASTEXT_SWAP(pos.x, pos.y);
-              pos.x = runPosition.x;
-              pos.y += line.position.y;
-              rect = CGRectMake(pos.x - descent, pos.y, runTypoBounds.size.width, adv.width);
-            } else {
-              pos.x += line.position.x;
-              pos.y = runPosition.y;
-              rect = CGRectMake(pos.x, pos.y - ascent, adv.width, runTypoBounds.size.height);
-            }
-            if (op.CGGlyphFillColor) {
-              [op.CGGlyphFillColor setFill];
-              CGContextAddRect(context, ASTextCGRectPixelRound(rect));
-              CGContextFillPath(context);
-            }
-            if (op.CGGlyphBorderColor) {
-              [op.CGGlyphBorderColor setStroke];
-              CGContextAddRect(context, ASTextCGRectPixelHalf(rect));
-              CGContextStrokePath(context);
-            }
-          }
-        }
-      }
-    }
-  }
-  CGContextRestoreGState(context);
-  UIGraphicsPopContext();
-}
-
-
-- (void)drawInContext:(CGContextRef)context
-                 size:(CGSize)size
-                point:(CGPoint)point
-                 view:(UIView *)view
-                layer:(CALayer *)layer
-                debug:(ASTextDebugOption *)debug
-               cancel:(BOOL (^)(void))cancel{
-  @autoreleasepool {
-    if (self.needDrawBlockBorder && context) {
-      if (cancel && cancel()) return;
-      ASTextDrawBlockBorder(self, context, size, point, cancel);
-    }
-    if (self.needDrawBackgroundBorder && context) {
-      if (cancel && cancel()) return;
-      ASTextDrawBorder(self, context, size, point, ASTextBorderTypeBackgound, cancel);
-    }
-    if (self.needDrawShadow && context) {
-      if (cancel && cancel()) return;
-      ASTextDrawShadow(self, context, size, point, cancel);
-    }
-    if (self.needDrawUnderline && context) {
-      if (cancel && cancel()) return;
-      ASTextDrawDecoration(self, context, size, point, ASTextDecorationTypeUnderline, cancel);
-    }
-    if (self.needDrawText && context) {
-      if (cancel && cancel()) return;
-      ASTextDrawText(self, context, size, point, cancel);
-    }
-    if (self.needDrawAttachment && (context || view || layer)) {
-      if (cancel && cancel()) return;
-      ASTextDrawAttachment(self, context, size, point, view, layer, cancel);
-    }
-    if (self.needDrawInnerShadow && context) {
-      if (cancel && cancel()) return;
-      ASTextDrawInnerShadow(self, context, size, point, cancel);
-    }
-    if (self.needDrawStrikethrough && context) {
-      if (cancel && cancel()) return;
-      ASTextDrawDecoration(self, context, size, point, ASTextDecorationTypeStrikethrough, cancel);
-    }
-    if (self.needDrawBorder && context) {
-      if (cancel && cancel()) return;
-      ASTextDrawBorder(self, context, size, point, ASTextBorderTypeNormal, cancel);
-    }
-    if (debug.needDrawDebug && context) {
-      if (cancel && cancel()) return;
-      ASTextDrawDebug(self, context, size, point, debug);
-    }
-  }
-}
-
-- (void)drawInContext:(CGContextRef)context
-                 size:(CGSize)size
-                debug:(ASTextDebugOption *)debug {
-  [self drawInContext:context size:size point:CGPointZero view:nil layer:nil debug:debug cancel:nil];
-}
-
-@end
diff --git a/submodules/AsyncDisplayKit/Source/Private/TextExperiment/Component/ASTextLine.h b/submodules/AsyncDisplayKit/Source/Private/TextExperiment/Component/ASTextLine.h
deleted file mode 100644
index acb02e991b..0000000000
--- a/submodules/AsyncDisplayKit/Source/Private/TextExperiment/Component/ASTextLine.h
+++ /dev/null
@@ -1,77 +0,0 @@
-//
-//  ASTextLine.h
-//  Texture
-//
-//  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.
-//  Changes after 4/13/2017 are: Copyright (c) Pinterest, Inc.  All rights reserved.
-//  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
-//
-
-#import <UIKit/UIKit.h>
-#import <CoreText/CoreText.h>
-#import <AsyncDisplayKit/ASTextAttribute.h>
-
-@class ASTextRunGlyphRange;
-
-NS_ASSUME_NONNULL_BEGIN
-
-/**
- A text line object wrapped `CTLineRef`, see `ASTextLayout` for more.
- */
-@interface ASTextLine : NSObject
-
-+ (instancetype)lineWithCTLine:(CTLineRef)CTLine position:(CGPoint)position vertical:(BOOL)isVertical NS_RETURNS_RETAINED;
-
-@property (nonatomic) NSUInteger index;     ///< line index
-@property (nonatomic) NSUInteger row;       ///< line row
-@property (nullable, nonatomic) NSArray<NSArray<ASTextRunGlyphRange *> *> *verticalRotateRange; ///< Run rotate range
-
-@property (nonatomic, readonly) CTLineRef CTLine;   ///< CoreText line
-@property (nonatomic, readonly) NSRange range;      ///< string range
-@property (nonatomic, readonly) BOOL vertical;      ///< vertical form
-
-@property (nonatomic, readonly) CGRect bounds;      ///< bounds (ascent + descent)
-@property (nonatomic, readonly) CGSize size;        ///< bounds.size
-@property (nonatomic, readonly) CGFloat width;      ///< bounds.size.width
-@property (nonatomic, readonly) CGFloat height;     ///< bounds.size.height
-@property (nonatomic, readonly) CGFloat top;        ///< bounds.origin.y
-@property (nonatomic, readonly) CGFloat bottom;     ///< bounds.origin.y + bounds.size.height
-@property (nonatomic, readonly) CGFloat left;       ///< bounds.origin.x
-@property (nonatomic, readonly) CGFloat right;      ///< bounds.origin.x + bounds.size.width
-
-@property (nonatomic)   CGPoint position;   ///< baseline position
-@property (nonatomic, readonly) CGFloat ascent;     ///< line ascent
-@property (nonatomic, readonly) CGFloat descent;    ///< line descent
-@property (nonatomic, readonly) CGFloat leading;    ///< line leading
-@property (nonatomic, readonly) CGFloat lineWidth;  ///< line width
-@property (nonatomic, readonly) CGFloat trailingWhitespaceWidth;
-
-@property (nullable, nonatomic, readonly) NSArray<ASTextAttachment *> *attachments; ///< ASTextAttachment
-@property (nullable, nonatomic, readonly) NSArray<NSValue *> *attachmentRanges;     ///< NSRange(NSValue)
-@property (nullable, nonatomic, readonly) NSArray<NSValue *> *attachmentRects;      ///< CGRect(NSValue)
-
-@end
-
-
-typedef NS_ENUM(NSUInteger, ASTextRunGlyphDrawMode) {
-  /// No rotate.
-  ASTextRunGlyphDrawModeHorizontal = 0,
-  
-  /// Rotate vertical for single glyph.
-  ASTextRunGlyphDrawModeVerticalRotate = 1,
-  
-  /// Rotate vertical for single glyph, and move the glyph to a better position,
-  /// such as fullwidth punctuation.
-  ASTextRunGlyphDrawModeVerticalRotateMove = 2,
-};
-
-/**
- A range in CTRun, used for vertical form.
- */
-@interface ASTextRunGlyphRange : NSObject
-@property (nonatomic) NSRange glyphRangeInRun;
-@property (nonatomic) ASTextRunGlyphDrawMode drawMode;
-+ (instancetype)rangeWithRange:(NSRange)range drawMode:(ASTextRunGlyphDrawMode)mode NS_RETURNS_RETAINED;
-@end
-
-NS_ASSUME_NONNULL_END
diff --git a/submodules/AsyncDisplayKit/Source/Private/TextExperiment/Component/ASTextLine.mm b/submodules/AsyncDisplayKit/Source/Private/TextExperiment/Component/ASTextLine.mm
deleted file mode 100644
index a01311d83c..0000000000
--- a/submodules/AsyncDisplayKit/Source/Private/TextExperiment/Component/ASTextLine.mm
+++ /dev/null
@@ -1,164 +0,0 @@
-//
-//  ASTextLine.mm
-//  Texture
-//
-//  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.
-//  Changes after 4/13/2017 are: Copyright (c) Pinterest, Inc.  All rights reserved.
-//  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
-//
-
-#import <AsyncDisplayKit/ASTextLine.h>
-#import <AsyncDisplayKit/ASTextUtilities.h>
-
-@implementation ASTextLine {
-  CGFloat _firstGlyphPos; // first glyph position for baseline, typically 0.
-}
-
-+ (instancetype)lineWithCTLine:(CTLineRef)CTLine position:(CGPoint)position vertical:(BOOL)isVertical NS_RETURNS_RETAINED {
-  if (!CTLine) return nil;
-  ASTextLine *line = [self new];
-  line->_position = position;
-  line->_vertical = isVertical;
-  [line setCTLine:CTLine];
-  return line;
-}
-
-- (void)dealloc {
-  if (_CTLine) CFRelease(_CTLine);
-}
-
-- (void)setCTLine:(_Nonnull CTLineRef)CTLine {
-  if (_CTLine != CTLine) {
-    if (CTLine) CFRetain(CTLine);
-    if (_CTLine) CFRelease(_CTLine);
-    _CTLine = CTLine;
-    if (_CTLine) {
-      _lineWidth = CTLineGetTypographicBounds(_CTLine, &_ascent, &_descent, &_leading);
-      CFRange range = CTLineGetStringRange(_CTLine);
-      _range = NSMakeRange(range.location, range.length);
-      if (CTLineGetGlyphCount(_CTLine) > 0) {
-        CFArrayRef runs = CTLineGetGlyphRuns(_CTLine);
-        CTRunRef run = (CTRunRef)CFArrayGetValueAtIndex(runs, 0);
-        CGPoint pos;
-        CTRunGetPositions(run, CFRangeMake(0, 1), &pos);
-        _firstGlyphPos = pos.x;
-      } else {
-        _firstGlyphPos = 0;
-      }
-      _trailingWhitespaceWidth = CTLineGetTrailingWhitespaceWidth(_CTLine);
-    } else {
-      _lineWidth = _ascent = _descent = _leading = _firstGlyphPos = _trailingWhitespaceWidth = 0;
-      _range = NSMakeRange(0, 0);
-    }
-    [self reloadBounds];
-  }
-}
-
-- (void)setPosition:(CGPoint)position {
-  _position = position;
-  [self reloadBounds];
-}
-
-- (void)reloadBounds {
-  if (_vertical) {
-    _bounds = CGRectMake(_position.x - _descent, _position.y, _ascent + _descent, _lineWidth);
-    _bounds.origin.y += _firstGlyphPos;
-  } else {
-    _bounds = CGRectMake(_position.x, _position.y - _ascent, _lineWidth, _ascent + _descent);
-    _bounds.origin.x += _firstGlyphPos;
-  }
-  
-  _attachments = nil;
-  _attachmentRanges = nil;
-  _attachmentRects = nil;
-  if (!_CTLine) return;
-  CFArrayRef runs = CTLineGetGlyphRuns(_CTLine);
-  NSUInteger runCount = CFArrayGetCount(runs);
-  if (runCount == 0) return;
-  
-  NSMutableArray *attachments = [NSMutableArray new];
-  NSMutableArray *attachmentRanges = [NSMutableArray new];
-  NSMutableArray *attachmentRects = [NSMutableArray new];
-  for (NSUInteger r = 0; r < runCount; r++) {
-    CTRunRef run = (CTRunRef)CFArrayGetValueAtIndex(runs, r);
-    CFIndex glyphCount = CTRunGetGlyphCount(run);
-    if (glyphCount == 0) continue;
-    NSDictionary *attrs = (id)CTRunGetAttributes(run);
-    ASTextAttachment *attachment = attrs[ASTextAttachmentAttributeName];
-    if (attachment) {
-      CGPoint runPosition = CGPointZero;
-      CTRunGetPositions(run, CFRangeMake(0, 1), &runPosition);
-      
-      CGFloat ascent, descent, leading, runWidth;
-      CGRect runTypoBounds;
-      runWidth = CTRunGetTypographicBounds(run, CFRangeMake(0, 0), &ascent, &descent, &leading);
-      
-      if (_vertical) {
-        ASTEXT_SWAP(runPosition.x, runPosition.y);
-        runPosition.y = _position.y + runPosition.y;
-        runTypoBounds = CGRectMake(_position.x + runPosition.x - descent, runPosition.y , ascent + descent, runWidth);
-      } else {
-        runPosition.x += _position.x;
-        runPosition.y = _position.y - runPosition.y;
-        runTypoBounds = CGRectMake(runPosition.x, runPosition.y - ascent, runWidth, ascent + descent);
-      }
-      
-      NSRange runRange = ASTextNSRangeFromCFRange(CTRunGetStringRange(run));
-      [attachments addObject:attachment];
-      [attachmentRanges addObject:[NSValue valueWithRange:runRange]];
-      [attachmentRects addObject:[NSValue valueWithCGRect:runTypoBounds]];
-    }
-  }
-  _attachments = attachments.count ? attachments : nil;
-  _attachmentRanges = attachmentRanges.count ? attachmentRanges : nil;
-  _attachmentRects = attachmentRects.count ? attachmentRects : nil;
-}
-
-- (CGSize)size {
-  return _bounds.size;
-}
-
-- (CGFloat)width {
-  return CGRectGetWidth(_bounds);
-}
-
-- (CGFloat)height {
-  return CGRectGetHeight(_bounds);
-}
-
-- (CGFloat)top {
-  return CGRectGetMinY(_bounds);
-}
-
-- (CGFloat)bottom {
-  return CGRectGetMaxY(_bounds);
-}
-
-- (CGFloat)left {
-  return CGRectGetMinX(_bounds);
-}
-
-- (CGFloat)right {
-  return CGRectGetMaxX(_bounds);
-}
-
-- (NSString *)description {
-  NSMutableString *desc = @"".mutableCopy;
-  NSRange range = self.range;
-  [desc appendFormat:@"<ASTextLine: %p> row:%ld range:%tu,%tu", self, (long)self.row, range.location, range.length];
-  [desc appendFormat:@" position:%@",NSStringFromCGPoint(self.position)];
-  [desc appendFormat:@" bounds:%@",NSStringFromCGRect(self.bounds)];
-  return desc;
-}
-
-@end
-
-
-@implementation ASTextRunGlyphRange
-+ (instancetype)rangeWithRange:(NSRange)range drawMode:(ASTextRunGlyphDrawMode)mode NS_RETURNS_RETAINED {
-  ASTextRunGlyphRange *one = [self new];
-  one.glyphRangeInRun = range;
-  one.drawMode = mode;
-  return one;
-}
-@end
diff --git a/submodules/AsyncDisplayKit/Source/Private/TextExperiment/String/ASTextAttribute.h b/submodules/AsyncDisplayKit/Source/Private/TextExperiment/String/ASTextAttribute.h
deleted file mode 100644
index 2d9e3771a0..0000000000
--- a/submodules/AsyncDisplayKit/Source/Private/TextExperiment/String/ASTextAttribute.h
+++ /dev/null
@@ -1,346 +0,0 @@
-//
-//  ASTextAttribute.h
-//  Texture
-//
-//  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.
-//  Changes after 4/13/2017 are: Copyright (c) Pinterest, Inc.  All rights reserved.
-//  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
-//
-
-#import <AsyncDisplayKit/ASBaseDefines.h>
-#import <UIKit/UIKit.h>
-
-NS_ASSUME_NONNULL_BEGIN
-
-#pragma mark - Enum Define
-
-/// The attribute type
-typedef NS_OPTIONS(NSInteger, ASTextAttributeType) {
-  ASTextAttributeTypeNone     = 0,
-  ASTextAttributeTypeUIKit    = 1 << 0, ///< UIKit attributes, such as UILabel/UITextField/drawInRect.
-  ASTextAttributeTypeCoreText = 1 << 1, ///< CoreText attributes, used by CoreText.
-  ASTextAttributeTypeASText   = 1 << 2, ///< ASText attributes, used by ASText.
-};
-
-/// Get the attribute type from an attribute name.
-AS_EXTERN ASTextAttributeType ASTextAttributeGetType(NSString *attributeName);
-
-/**
- Line style in ASText (similar to NSUnderlineStyle).
- */
-typedef NS_OPTIONS (NSInteger, ASTextLineStyle) {
-  // basic style (bitmask:0xFF)
-  ASTextLineStyleNone       = 0x00, ///< (        ) Do not draw a line (Default).
-  ASTextLineStyleSingle     = 0x01, ///< (──────) Draw a single line.
-  ASTextLineStyleThick      = 0x02, ///< (━━━━━━━) Draw a thick line.
-  ASTextLineStyleDouble     = 0x09, ///< (══════) Draw a double line.
-  
-  // style pattern (bitmask:0xF00)
-  ASTextLineStylePatternSolid      = 0x000, ///< (────────) Draw a solid line (Default).
-  ASTextLineStylePatternDot        = 0x100, ///< (‑ ‑ ‑ ‑ ‑ ‑) Draw a line of dots.
-  ASTextLineStylePatternDash       = 0x200, ///< (— — — —) Draw a line of dashes.
-  ASTextLineStylePatternDashDot    = 0x300, ///< (— ‑ — ‑ — ‑) Draw a line of alternating dashes and dots.
-  ASTextLineStylePatternDashDotDot = 0x400, ///< (— ‑ ‑ — ‑ ‑) Draw a line of alternating dashes and two dots.
-  ASTextLineStylePatternCircleDot  = 0x900, ///< (••••••••••••) Draw a line of small circle dots.
-};
-
-/**
- Text vertical alignment.
- */
-typedef NS_ENUM(NSInteger, ASTextVerticalAlignment) {
-  ASTextVerticalAlignmentTop =    0, ///< Top alignment.
-  ASTextVerticalAlignmentCenter = 1, ///< Center alignment.
-  ASTextVerticalAlignmentBottom = 2, ///< Bottom alignment.
-};
-
-/**
- The direction define in ASText.
- */
-typedef NS_OPTIONS(NSUInteger, ASTextDirection) {
-  ASTextDirectionNone   = 0,
-  ASTextDirectionTop    = 1 << 0,
-  ASTextDirectionRight  = 1 << 1,
-  ASTextDirectionBottom = 1 << 2,
-  ASTextDirectionLeft   = 1 << 3,
-};
-
-/**
- The trunction type, tells the truncation engine which type of truncation is being requested.
- */
-typedef NS_ENUM (NSUInteger, ASTextTruncationType) {
-  /// No truncate.
-  ASTextTruncationTypeNone   = 0,
-  
-  /// Truncate at the beginning of the line, leaving the end portion visible.
-  ASTextTruncationTypeStart  = 1,
-  
-  /// Truncate at the end of the line, leaving the start portion visible.
-  ASTextTruncationTypeEnd    = 2,
-  
-  /// Truncate in the middle of the line, leaving both the start and the end portions visible.
-  ASTextTruncationTypeMiddle = 3,
-};
-
-
-
-#pragma mark - Attribute Name Defined in ASText
-
-/// The value of this attribute is a `ASTextBackedString` object.
-/// Use this attribute to store the original plain text if it is replaced by something else (such as attachment).
-UIKIT_EXTERN NSString *const ASTextBackedStringAttributeName;
-
-/// The value of this attribute is a `ASTextBinding` object.
-/// Use this attribute to bind a range of text together, as if it was a single charactor.
-UIKIT_EXTERN NSString *const ASTextBindingAttributeName;
-
-/// The value of this attribute is a `ASTextShadow` object.
-/// Use this attribute to add shadow to a range of text.
-/// Shadow will be drawn below text glyphs. Use ASTextShadow.subShadow to add multi-shadow.
-UIKIT_EXTERN NSString *const ASTextShadowAttributeName;
-
-/// The value of this attribute is a `ASTextShadow` object.
-/// Use this attribute to add inner shadow to a range of text.
-/// Inner shadow will be drawn above text glyphs. Use ASTextShadow.subShadow to add multi-shadow.
-UIKIT_EXTERN NSString *const ASTextInnerShadowAttributeName;
-
-/// The value of this attribute is a `ASTextDecoration` object.
-/// Use this attribute to add underline to a range of text.
-/// The underline will be drawn below text glyphs.
-UIKIT_EXTERN NSString *const ASTextUnderlineAttributeName;
-
-/// The value of this attribute is a `ASTextDecoration` object.
-/// Use this attribute to add strikethrough (delete line) to a range of text.
-/// The strikethrough will be drawn above text glyphs.
-UIKIT_EXTERN NSString *const ASTextStrikethroughAttributeName;
-
-/// The value of this attribute is a `ASTextBorder` object.
-/// Use this attribute to add cover border or cover color to a range of text.
-/// The border will be drawn above the text glyphs.
-UIKIT_EXTERN NSString *const ASTextBorderAttributeName;
-
-/// The value of this attribute is a `ASTextBorder` object.
-/// Use this attribute to add background border or background color to a range of text.
-/// The border will be drawn below the text glyphs.
-UIKIT_EXTERN NSString *const ASTextBackgroundBorderAttributeName;
-
-/// The value of this attribute is a `ASTextBorder` object.
-/// Use this attribute to add a code block border to one or more line of text.
-/// The border will be drawn below the text glyphs.
-UIKIT_EXTERN NSString *const ASTextBlockBorderAttributeName;
-
-/// The value of this attribute is a `ASTextAttachment` object.
-/// Use this attribute to add attachment to text.
-/// It should be used in conjunction with a CTRunDelegate.
-UIKIT_EXTERN NSString *const ASTextAttachmentAttributeName;
-
-/// The value of this attribute is a `ASTextHighlight` object.
-/// Use this attribute to add a touchable highlight state to a range of text.
-UIKIT_EXTERN NSString *const ASTextHighlightAttributeName;
-
-/// The value of this attribute is a `NSValue` object stores CGAffineTransform.
-/// Use this attribute to add transform to each glyph in a range of text.
-UIKIT_EXTERN NSString *const ASTextGlyphTransformAttributeName;
-
-
-
-#pragma mark - String Token Define
-
-UIKIT_EXTERN NSString *const ASTextAttachmentToken; ///< Object replacement character (U+FFFC), used for text attachment.
-UIKIT_EXTERN NSString *const ASTextTruncationToken; ///< Horizontal ellipsis (U+2026), used for text truncation  "…".
-
-
-
-#pragma mark - Attribute Value Define
-
-/**
- The tap/long press action callback defined in ASText.
- 
- @param containerView The text container view (such as ASLabel/ASTextView).
- @param text          The whole text.
- @param range         The text range in `text` (if no range, the range.location is NSNotFound).
- @param rect          The text frame in `containerView` (if no data, the rect is CGRectNull).
- */
-typedef void(^ASTextAction)(UIView *containerView, NSAttributedString *text, NSRange range, CGRect rect);
-
-
-/**
- ASTextBackedString objects are used by the NSAttributedString class cluster
- as the values for text backed string attributes (stored in the attributed
- string under the key named ASTextBackedStringAttributeName).
- 
- It may used for copy/paste plain text from attributed string.
- Example: If :) is replace by a custom emoji (such as😊), the backed string can be set to @":)".
- */
-@interface ASTextBackedString : NSObject <NSCoding, NSCopying>
-+ (instancetype)stringWithString:(nullable NSString *)string NS_RETURNS_RETAINED;
-@property (nullable, nonatomic, copy) NSString *string; ///< backed string
-@end
-
-
-/**
- ASTextBinding objects are used by the NSAttributedString class cluster
- as the values for shadow attributes (stored in the attributed string under
- the key named ASTextBindingAttributeName).
- 
- Add this to a range of text will make the specified characters 'binding together'.
- ASTextView will treat the range of text as a single character during text
- selection and edit.
- */
-@interface ASTextBinding : NSObject <NSCoding, NSCopying>
-+ (instancetype)bindingWithDeleteConfirm:(BOOL)deleteConfirm NS_RETURNS_RETAINED;
-@property (nonatomic) BOOL deleteConfirm; ///< confirm the range when delete in ASTextView
-@end
-
-
-/**
- ASTextShadow objects are used by the NSAttributedString class cluster
- as the values for shadow attributes (stored in the attributed string under
- the key named ASTextShadowAttributeName or ASTextInnerShadowAttributeName).
- 
- It's similar to `NSShadow`, but offers more options.
- */
-@interface ASTextShadow : NSObject <NSCoding, NSCopying>
-+ (instancetype)shadowWithColor:(nullable UIColor *)color offset:(CGSize)offset radius:(CGFloat)radius NS_RETURNS_RETAINED;
-
-@property (nullable, nonatomic) UIColor *color; ///< shadow color
-@property (nonatomic) CGSize offset;                    ///< shadow offset
-@property (nonatomic) CGFloat radius;                   ///< shadow blur radius
-@property (nonatomic) CGBlendMode blendMode;            ///< shadow blend mode
-@property (nullable, nonatomic) ASTextShadow *subShadow;  ///< a sub shadow which will be added above the parent shadow
-
-+ (instancetype)shadowWithNSShadow:(NSShadow *)nsShadow NS_RETURNS_RETAINED; ///< convert NSShadow to ASTextShadow
-- (NSShadow *)nsShadow; ///< convert ASTextShadow to NSShadow
-@end
-
-
-/**
- ASTextDecorationLine objects are used by the NSAttributedString class cluster
- as the values for decoration line attributes (stored in the attributed string under
- the key named ASTextUnderlineAttributeName or ASTextStrikethroughAttributeName).
- 
- When it's used as underline, the line is drawn below text glyphs;
- when it's used as strikethrough, the line is drawn above text glyphs.
- */
-@interface ASTextDecoration : NSObject <NSCoding, NSCopying>
-+ (instancetype)decorationWithStyle:(ASTextLineStyle)style NS_RETURNS_RETAINED;
-+ (instancetype)decorationWithStyle:(ASTextLineStyle)style width:(nullable NSNumber *)width color:(nullable UIColor *)color NS_RETURNS_RETAINED;
-@property (nonatomic) ASTextLineStyle style;                   ///< line style
-@property (nullable, nonatomic) NSNumber *width;       ///< line width (nil means automatic width)
-@property (nullable, nonatomic) UIColor *color;        ///< line color (nil means automatic color)
-@property (nullable, nonatomic) ASTextShadow *shadow;  ///< line shadow
-@end
-
-
-/**
- ASTextBorder objects are used by the NSAttributedString class cluster
- as the values for border attributes (stored in the attributed string under
- the key named ASTextBorderAttributeName or ASTextBackgroundBorderAttributeName).
- 
- It can be used to draw a border around a range of text, or draw a background
- to a range of text.
- 
- Example:
- ╭──────╮
- │ Text │
- ╰──────╯
- */
-@interface ASTextBorder : NSObject <NSCoding, NSCopying>
-+ (instancetype)borderWithLineStyle:(ASTextLineStyle)lineStyle lineWidth:(CGFloat)width strokeColor:(nullable UIColor *)color NS_RETURNS_RETAINED;
-+ (instancetype)borderWithFillColor:(nullable UIColor *)color cornerRadius:(CGFloat)cornerRadius NS_RETURNS_RETAINED;
-@property (nonatomic) ASTextLineStyle lineStyle;              ///< border line style
-@property (nonatomic) CGFloat strokeWidth;                    ///< border line width
-@property (nullable, nonatomic) UIColor *strokeColor; ///< border line color
-@property (nonatomic) CGLineJoin lineJoin;                    ///< border line join
-@property (nonatomic) UIEdgeInsets insets;                    ///< border insets for text bounds
-@property (nonatomic) CGFloat cornerRadius;                   ///< border corder radius
-@property (nullable, nonatomic) ASTextShadow *shadow; ///< border shadow
-@property (nullable, nonatomic) UIColor *fillColor;   ///< inner fill color
-@end
-
-
-/**
- ASTextAttachment objects are used by the NSAttributedString class cluster
- as the values for attachment attributes (stored in the attributed string under
- the key named ASTextAttachmentAttributeName).
- 
- When display an attributed string which contains `ASTextAttachment` object,
- the content will be placed in text metric. If the content is `UIImage`,
- then it will be drawn to CGContext; if the content is `UIView` or `CALayer`,
- then it will be added to the text container's view or layer.
- */
-@interface ASTextAttachment : NSObject<NSCoding, NSCopying>
-+ (instancetype)attachmentWithContent:(nullable id)content NS_RETURNS_RETAINED;
-@property (nullable, nonatomic) id content;             ///< Supported type: UIImage, UIView, CALayer
-@property (nonatomic) UIViewContentMode contentMode;            ///< Content display mode.
-@property (nonatomic) UIEdgeInsets contentInsets;               ///< The insets when drawing content.
-@property (nullable, nonatomic) NSDictionary *userInfo; ///< The user information dictionary.
-@end
-
-
-/**
- ASTextHighlight objects are used by the NSAttributedString class cluster
- as the values for touchable highlight attributes (stored in the attributed string
- under the key named ASTextHighlightAttributeName).
- 
- When display an attributed string in `ASLabel` or `ASTextView`, the range of
- highlight text can be toucheds down by users. If a range of text is turned into
- highlighted state, the `attributes` in `ASTextHighlight` will be used to modify
- (set or remove) the original attributes in the range for display.
- */
-@interface ASTextHighlight : NSObject <NSCopying>
-
-/**
- Attributes that you can apply to text in an attributed string when highlight.
- Key:   Same as CoreText/ASText Attribute Name.
- Value: Modify attribute value when highlight (NSNull for remove attribute).
- */
-@property (nullable, nonatomic, copy) NSDictionary<NSString *, id> *attributes;
-
-/**
- Creates a highlight object with specified attributes.
- 
- @param attributes The attributes which will replace original attributes when highlight,
- If the value is NSNull, it will removed when highlight.
- */
-+ (instancetype)highlightWithAttributes:(nullable NSDictionary<NSString *, id> *)attributes NS_RETURNS_RETAINED;
-
-/**
- Convenience methods to create a default highlight with the specifeid background color.
- 
- @param color The background border color.
- */
-+ (instancetype)highlightWithBackgroundColor:(nullable UIColor *)color NS_RETURNS_RETAINED;
-
-// Convenience methods below to set the `attributes`.
-- (void)setFont:(nullable UIFont *)font;
-- (void)setColor:(nullable UIColor *)color;
-- (void)setStrokeWidth:(nullable NSNumber *)width;
-- (void)setStrokeColor:(nullable UIColor *)color;
-- (void)setShadow:(nullable ASTextShadow *)shadow;
-- (void)setInnerShadow:(nullable ASTextShadow *)shadow;
-- (void)setUnderline:(nullable ASTextDecoration *)underline;
-- (void)setStrikethrough:(nullable ASTextDecoration *)strikethrough;
-- (void)setBackgroundBorder:(nullable ASTextBorder *)border;
-- (void)setBorder:(nullable ASTextBorder *)border;
-- (void)setAttachment:(nullable ASTextAttachment *)attachment;
-
-/**
- The user information dictionary, default is nil.
- */
-@property (nullable, nonatomic, copy) NSDictionary *userInfo;
-
-/**
- Tap action when user tap the highlight, default is nil.
- If the value is nil, ASTextView or ASLabel will ask it's delegate to handle the tap action.
- */
-@property (nullable, nonatomic) ASTextAction tapAction;
-
-/**
- Long press action when user long press the highlight, default is nil.
- If the value is nil, ASTextView or ASLabel will ask it's delegate to handle the long press action.
- */
-@property (nullable, nonatomic) ASTextAction longPressAction;
-
-@end
-
-NS_ASSUME_NONNULL_END
diff --git a/submodules/AsyncDisplayKit/Source/Private/TextExperiment/String/ASTextAttribute.mm b/submodules/AsyncDisplayKit/Source/Private/TextExperiment/String/ASTextAttribute.mm
deleted file mode 100644
index d1abadbe1f..0000000000
--- a/submodules/AsyncDisplayKit/Source/Private/TextExperiment/String/ASTextAttribute.mm
+++ /dev/null
@@ -1,488 +0,0 @@
-//
-//  ASTextAttribute.mm
-//  Texture
-//
-//  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.
-//  Changes after 4/13/2017 are: Copyright (c) Pinterest, Inc.  All rights reserved.
-//  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
-//
-
-#import "ASTextAttribute.h"
-#import <UIKit/UIKit.h>
-#import <CoreText/CoreText.h>
-#import <AsyncDisplayKit/NSAttributedString+ASText.h>
-
-NSString *const ASTextBackedStringAttributeName = @"ASTextBackedString";
-NSString *const ASTextBindingAttributeName = @"ASTextBinding";
-NSString *const ASTextShadowAttributeName = @"ASTextShadow";
-NSString *const ASTextInnerShadowAttributeName = @"ASTextInnerShadow";
-NSString *const ASTextUnderlineAttributeName = @"ASTextUnderline";
-NSString *const ASTextStrikethroughAttributeName = @"ASTextStrikethrough";
-NSString *const ASTextBorderAttributeName = @"ASTextBorder";
-NSString *const ASTextBackgroundBorderAttributeName = @"ASTextBackgroundBorder";
-NSString *const ASTextBlockBorderAttributeName = @"ASTextBlockBorder";
-NSString *const ASTextAttachmentAttributeName = @"ASTextAttachment";
-NSString *const ASTextHighlightAttributeName = @"ASTextHighlight";
-NSString *const ASTextGlyphTransformAttributeName = @"ASTextGlyphTransform";
-
-NSString *const ASTextAttachmentToken = @"\uFFFC";
-NSString *const ASTextTruncationToken = @"\u2026";
-
-
-ASTextAttributeType ASTextAttributeGetType(NSString *name){
-  if (name.length == 0) return ASTextAttributeTypeNone;
-  
-  static NSMutableDictionary *dic;
-  static dispatch_once_t onceToken;
-  dispatch_once(&onceToken, ^{
-    dic = [NSMutableDictionary new];
-    NSNumber *All = @(ASTextAttributeTypeUIKit | ASTextAttributeTypeCoreText | ASTextAttributeTypeASText);
-    NSNumber *CoreText_ASText = @(ASTextAttributeTypeCoreText | ASTextAttributeTypeASText);
-    NSNumber *UIKit_ASText = @(ASTextAttributeTypeUIKit | ASTextAttributeTypeASText);
-    NSNumber *UIKit_CoreText = @(ASTextAttributeTypeUIKit | ASTextAttributeTypeCoreText);
-    NSNumber *UIKit = @(ASTextAttributeTypeUIKit);
-    NSNumber *CoreText = @(ASTextAttributeTypeCoreText);
-    NSNumber *ASText = @(ASTextAttributeTypeASText);
-    
-    dic[NSFontAttributeName] = All;
-    dic[NSKernAttributeName] = All;
-    dic[NSForegroundColorAttributeName] = UIKit;
-    dic[(id)kCTForegroundColorAttributeName] = CoreText;
-    dic[(id)kCTForegroundColorFromContextAttributeName] = CoreText;
-    dic[NSBackgroundColorAttributeName] = UIKit;
-    dic[NSStrokeWidthAttributeName] = All;
-    dic[NSStrokeColorAttributeName] = UIKit;
-    dic[(id)kCTStrokeColorAttributeName] = CoreText_ASText;
-    dic[NSShadowAttributeName] = UIKit_ASText;
-    dic[NSStrikethroughStyleAttributeName] = UIKit;
-    dic[NSUnderlineStyleAttributeName] = UIKit_CoreText;
-    dic[(id)kCTUnderlineColorAttributeName] = CoreText;
-    dic[NSLigatureAttributeName] = All;
-    dic[(id)kCTSuperscriptAttributeName] = UIKit; //it's a CoreText attrubite, but only supported by UIKit...
-    dic[NSVerticalGlyphFormAttributeName] = All;
-    dic[(id)kCTGlyphInfoAttributeName] = CoreText_ASText;
-#if TARGET_OS_IOS
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
-    dic[(id)kCTCharacterShapeAttributeName] = CoreText_ASText;
-#pragma clang diagnostic pop
-#endif
-    dic[(id)kCTRunDelegateAttributeName] = CoreText_ASText;
-    dic[(id)kCTBaselineClassAttributeName] = CoreText_ASText;
-    dic[(id)kCTBaselineInfoAttributeName] = CoreText_ASText;
-    dic[(id)kCTBaselineReferenceInfoAttributeName] = CoreText_ASText;
-    dic[(id)kCTWritingDirectionAttributeName] = CoreText_ASText;
-    dic[NSParagraphStyleAttributeName] = All;
-    
-    dic[NSStrikethroughColorAttributeName] = UIKit;
-    dic[NSUnderlineColorAttributeName] = UIKit;
-    dic[NSTextEffectAttributeName] = UIKit;
-    dic[NSObliquenessAttributeName] = UIKit;
-    dic[NSExpansionAttributeName] = UIKit;
-    dic[(id)kCTLanguageAttributeName] = CoreText_ASText;
-    dic[NSBaselineOffsetAttributeName] = UIKit;
-    dic[NSWritingDirectionAttributeName] = All;
-    dic[NSAttachmentAttributeName] = UIKit;
-    dic[NSLinkAttributeName] = UIKit;
-    dic[(id)kCTRubyAnnotationAttributeName] = CoreText;
-    
-    dic[ASTextBackedStringAttributeName] = ASText;
-    dic[ASTextBindingAttributeName] = ASText;
-    dic[ASTextShadowAttributeName] = ASText;
-    dic[ASTextInnerShadowAttributeName] = ASText;
-    dic[ASTextUnderlineAttributeName] = ASText;
-    dic[ASTextStrikethroughAttributeName] = ASText;
-    dic[ASTextBorderAttributeName] = ASText;
-    dic[ASTextBackgroundBorderAttributeName] = ASText;
-    dic[ASTextBlockBorderAttributeName] = ASText;
-    dic[ASTextAttachmentAttributeName] = ASText;
-    dic[ASTextHighlightAttributeName] = ASText;
-    dic[ASTextGlyphTransformAttributeName] = ASText;
-  });
-  NSNumber *num = dic[name];
-  if (num) return num.integerValue;
-  return ASTextAttributeTypeNone;
-}
-
-
-@implementation ASTextBackedString
-
-+ (instancetype)stringWithString:(NSString *)string NS_RETURNS_RETAINED {
-  ASTextBackedString *one = [self new];
-  one.string = string;
-  return one;
-}
-
-- (void)encodeWithCoder:(NSCoder *)aCoder {
-  [aCoder encodeObject:self.string forKey:@"string"];
-}
-
-- (id)initWithCoder:(NSCoder *)aDecoder {
-  self = [super init];
-  _string = [aDecoder decodeObjectForKey:@"string"];
-  return self;
-}
-
-- (id)copyWithZone:(NSZone *)zone {
-  __typeof__(self) one = [self.class new];
-  one.string = self.string;
-  return one;
-}
-
-@end
-
-
-@implementation ASTextBinding
-
-+ (instancetype)bindingWithDeleteConfirm:(BOOL)deleteConfirm NS_RETURNS_RETAINED {
-  ASTextBinding *one = [self new];
-  one.deleteConfirm = deleteConfirm;
-  return one;
-}
-
-- (void)encodeWithCoder:(NSCoder *)aCoder {
-  [aCoder encodeObject:@(self.deleteConfirm) forKey:@"deleteConfirm"];
-}
-
-- (id)initWithCoder:(NSCoder *)aDecoder {
-  self = [super init];
-  _deleteConfirm = ((NSNumber *)[aDecoder decodeObjectForKey:@"deleteConfirm"]).boolValue;
-  return self;
-}
-
-- (id)copyWithZone:(NSZone *)zone {
-  __typeof__(self) one = [self.class new];
-  one.deleteConfirm = self.deleteConfirm;
-  return one;
-}
-
-@end
-
-
-@implementation ASTextShadow
-
-+ (instancetype)shadowWithColor:(UIColor *)color offset:(CGSize)offset radius:(CGFloat)radius NS_RETURNS_RETAINED {
-  ASTextShadow *one = [self new];
-  one.color = color;
-  one.offset = offset;
-  one.radius = radius;
-  return one;
-}
-
-+ (instancetype)shadowWithNSShadow:(NSShadow *)nsShadow NS_RETURNS_RETAINED {
-  if (!nsShadow) return nil;
-  ASTextShadow *shadow = [self new];
-  shadow.offset = nsShadow.shadowOffset;
-  shadow.radius = nsShadow.shadowBlurRadius;
-  id color = nsShadow.shadowColor;
-  if (color) {
-    if (CGColorGetTypeID() == CFGetTypeID((__bridge CFTypeRef)(color))) {
-      color = [UIColor colorWithCGColor:(__bridge CGColorRef)(color)];
-    }
-    if ([color isKindOfClass:[UIColor class]]) {
-      shadow.color = color;
-    }
-  }
-  return shadow;
-}
-
-- (NSShadow *)nsShadow {
-  NSShadow *shadow = [NSShadow new];
-  shadow.shadowOffset = self.offset;
-  shadow.shadowBlurRadius = self.radius;
-  shadow.shadowColor = self.color;
-  return shadow;
-}
-
-- (void)encodeWithCoder:(NSCoder *)aCoder {
-  [aCoder encodeObject:self.color forKey:@"color"];
-  [aCoder encodeObject:@(self.radius) forKey:@"radius"];
-  [aCoder encodeObject:[NSValue valueWithCGSize:self.offset] forKey:@"offset"];
-  [aCoder encodeObject:self.subShadow forKey:@"subShadow"];
-}
-
-- (id)initWithCoder:(NSCoder *)aDecoder {
-  self = [super init];
-  _color = [aDecoder decodeObjectForKey:@"color"];
-  _radius = ((NSNumber *)[aDecoder decodeObjectForKey:@"radius"]).floatValue;
-  _offset = ((NSValue *)[aDecoder decodeObjectForKey:@"offset"]).CGSizeValue;
-  _subShadow = [aDecoder decodeObjectForKey:@"subShadow"];
-  return self;
-}
-
-- (id)copyWithZone:(NSZone *)zone {
-  __typeof__(self) one = [self.class new];
-  one.color = self.color;
-  one.radius = self.radius;
-  one.offset = self.offset;
-  one.subShadow = self.subShadow.copy;
-  return one;
-}
-
-@end
-
-
-@implementation ASTextDecoration
-
-- (instancetype)init {
-  self = [super init];
-  _style = ASTextLineStyleSingle;
-  return self;
-}
-
-+ (instancetype)decorationWithStyle:(ASTextLineStyle)style NS_RETURNS_RETAINED {
-  ASTextDecoration *one = [self new];
-  one.style = style;
-  return one;
-}
-+ (instancetype)decorationWithStyle:(ASTextLineStyle)style width:(NSNumber *)width color:(UIColor *)color NS_RETURNS_RETAINED {
-  ASTextDecoration *one = [self new];
-  one.style = style;
-  one.width = width;
-  one.color = color;
-  return one;
-}
-
-- (void)encodeWithCoder:(NSCoder *)aCoder {
-  [aCoder encodeObject:@(self.style) forKey:@"style"];
-  [aCoder encodeObject:self.width forKey:@"width"];
-  [aCoder encodeObject:self.color forKey:@"color"];
-}
-
-- (id)initWithCoder:(NSCoder *)aDecoder {
-  self = [super init];
-  self.style = ((NSNumber *)[aDecoder decodeObjectForKey:@"style"]).unsignedIntegerValue;
-  self.width = [aDecoder decodeObjectForKey:@"width"];
-  self.color = [aDecoder decodeObjectForKey:@"color"];
-  return self;
-}
-
-- (id)copyWithZone:(NSZone *)zone {
-  __typeof__(self) one = [self.class new];
-  one.style = self.style;
-  one.width = self.width;
-  one.color = self.color;
-  return one;
-}
-
-@end
-
-
-@implementation ASTextBorder
-
-+ (instancetype)borderWithLineStyle:(ASTextLineStyle)lineStyle lineWidth:(CGFloat)width strokeColor:(UIColor *)color NS_RETURNS_RETAINED {
-  ASTextBorder *one = [self new];
-  one.lineStyle = lineStyle;
-  one.strokeWidth = width;
-  one.strokeColor = color;
-  return one;
-}
-
-+ (instancetype)borderWithFillColor:(UIColor *)color cornerRadius:(CGFloat)cornerRadius NS_RETURNS_RETAINED {
-  ASTextBorder *one = [self new];
-  one.fillColor = color;
-  one.cornerRadius = cornerRadius;
-  one.insets = UIEdgeInsetsMake(-2, 0, 0, -2);
-  return one;
-}
-
-- (instancetype)init {
-  self = [super init];
-  self.lineStyle = ASTextLineStyleSingle;
-  return self;
-}
-
-- (void)encodeWithCoder:(NSCoder *)aCoder {
-  [aCoder encodeObject:@(self.lineStyle) forKey:@"lineStyle"];
-  [aCoder encodeObject:@(self.strokeWidth) forKey:@"strokeWidth"];
-  [aCoder encodeObject:self.strokeColor forKey:@"strokeColor"];
-  [aCoder encodeObject:@(self.lineJoin) forKey:@"lineJoin"];
-  [aCoder encodeObject:[NSValue valueWithUIEdgeInsets:self.insets] forKey:@"insets"];
-  [aCoder encodeObject:@(self.cornerRadius) forKey:@"cornerRadius"];
-  [aCoder encodeObject:self.shadow forKey:@"shadow"];
-  [aCoder encodeObject:self.fillColor forKey:@"fillColor"];
-}
-
-- (id)initWithCoder:(NSCoder *)aDecoder {
-  self = [super init];
-  _lineStyle = ((NSNumber *)[aDecoder decodeObjectForKey:@"lineStyle"]).unsignedIntegerValue;
-  _strokeWidth = ((NSNumber *)[aDecoder decodeObjectForKey:@"strokeWidth"]).doubleValue;
-  _strokeColor = [aDecoder decodeObjectForKey:@"strokeColor"];
-  _lineJoin = (CGLineJoin)((NSNumber *)[aDecoder decodeObjectForKey:@"join"]).unsignedIntegerValue;
-  _insets = ((NSValue *)[aDecoder decodeObjectForKey:@"insets"]).UIEdgeInsetsValue;
-  _cornerRadius = ((NSNumber *)[aDecoder decodeObjectForKey:@"cornerRadius"]).doubleValue;
-  _shadow = [aDecoder decodeObjectForKey:@"shadow"];
-  _fillColor = [aDecoder decodeObjectForKey:@"fillColor"];
-  return self;
-}
-
-- (id)copyWithZone:(NSZone *)zone {
-  __typeof__(self) one = [self.class new];
-  one.lineStyle = self.lineStyle;
-  one.strokeWidth = self.strokeWidth;
-  one.strokeColor = self.strokeColor;
-  one.lineJoin = self.lineJoin;
-  one.insets = self.insets;
-  one.cornerRadius = self.cornerRadius;
-  one.shadow = self.shadow.copy;
-  one.fillColor = self.fillColor;
-  return one;
-}
-
-@end
-
-
-@implementation ASTextAttachment
-
-+ (instancetype)attachmentWithContent:(id)content NS_RETURNS_RETAINED {
-  ASTextAttachment *one = [self new];
-  one.content = content;
-  return one;
-}
-
-- (void)encodeWithCoder:(NSCoder *)aCoder {
-  [aCoder encodeObject:self.content forKey:@"content"];
-  [aCoder encodeObject:[NSValue valueWithUIEdgeInsets:self.contentInsets] forKey:@"contentInsets"];
-  [aCoder encodeObject:self.userInfo forKey:@"userInfo"];
-}
-
-- (id)initWithCoder:(NSCoder *)aDecoder {
-  self = [super init];
-  _content = [aDecoder decodeObjectForKey:@"content"];
-  _contentInsets = ((NSValue *)[aDecoder decodeObjectForKey:@"contentInsets"]).UIEdgeInsetsValue;
-  _userInfo = [aDecoder decodeObjectForKey:@"userInfo"];
-  return self;
-}
-
-- (id)copyWithZone:(NSZone *)zone {
-  __typeof__(self) one = [self.class new];
-  if ([self.content respondsToSelector:@selector(copy)]) {
-    one.content = [self.content copy];
-  } else {
-    one.content = self.content;
-  }
-  one.contentInsets = self.contentInsets;
-  one.userInfo = self.userInfo.copy;
-  return one;
-}
-
-@end
-
-
-@implementation ASTextHighlight
-
-+ (instancetype)highlightWithAttributes:(NSDictionary *)attributes NS_RETURNS_RETAINED {
-  ASTextHighlight *one = [self new];
-  one.attributes = attributes;
-  return one;
-}
-
-+ (instancetype)highlightWithBackgroundColor:(UIColor *)color NS_RETURNS_RETAINED {
-  ASTextBorder *highlightBorder = [ASTextBorder new];
-  highlightBorder.insets = UIEdgeInsetsMake(-2, -1, -2, -1);
-  highlightBorder.cornerRadius = 3;
-  highlightBorder.fillColor = color;
-  
-  ASTextHighlight *one = [self new];
-  [one setBackgroundBorder:highlightBorder];
-  return one;
-}
-
-- (void)setAttributes:(NSDictionary *)attributes {
-  _attributes = attributes.mutableCopy;
-}
-
-- (id)copyWithZone:(NSZone *)zone {
-  __typeof__(self) one = [self.class new];
-  one.attributes = self.attributes.mutableCopy;
-  return one;
-}
-
-- (void)_makeMutableAttributes {
-  if (!_attributes) {
-    _attributes = [NSMutableDictionary new];
-  } else if (![_attributes isKindOfClass:[NSMutableDictionary class]]) {
-    _attributes = _attributes.mutableCopy;
-  }
-}
-
-- (void)setFont:(UIFont *)font {
-  [self _makeMutableAttributes];
-  if (font == (id)[NSNull null] || font == nil) {
-    ((NSMutableDictionary *)_attributes)[(id)kCTFontAttributeName] = [NSNull null];
-  } else {
-    CTFontRef ctFont = CTFontCreateWithName((__bridge CFStringRef)font.fontName, font.pointSize, NULL);
-    if (ctFont) {
-      ((NSMutableDictionary *)_attributes)[(id)kCTFontAttributeName] = (__bridge id)(ctFont);
-      CFRelease(ctFont);
-    }
-  }
-}
-
-- (void)setColor:(UIColor *)color {
-  [self _makeMutableAttributes];
-  if (color == (id)[NSNull null] || color == nil) {
-    ((NSMutableDictionary *)_attributes)[(id)kCTForegroundColorAttributeName] = [NSNull null];
-    ((NSMutableDictionary *)_attributes)[NSForegroundColorAttributeName] = [NSNull null];
-  } else {
-    ((NSMutableDictionary *)_attributes)[(id)kCTForegroundColorAttributeName] = (__bridge id)(color.CGColor);
-    ((NSMutableDictionary *)_attributes)[NSForegroundColorAttributeName] = color;
-  }
-}
-
-- (void)setStrokeWidth:(NSNumber *)width {
-  [self _makeMutableAttributes];
-  if (width == (id)[NSNull null] || width == nil) {
-    ((NSMutableDictionary *)_attributes)[(id)kCTStrokeWidthAttributeName] = [NSNull null];
-  } else {
-    ((NSMutableDictionary *)_attributes)[(id)kCTStrokeWidthAttributeName] = width;
-  }
-}
-
-- (void)setStrokeColor:(UIColor *)color {
-  [self _makeMutableAttributes];
-  if (color == (id)[NSNull null] || color == nil) {
-    ((NSMutableDictionary *)_attributes)[(id)kCTStrokeColorAttributeName] = [NSNull null];
-    ((NSMutableDictionary *)_attributes)[NSStrokeColorAttributeName] = [NSNull null];
-  } else {
-    ((NSMutableDictionary *)_attributes)[(id)kCTStrokeColorAttributeName] = (__bridge id)(color.CGColor);
-    ((NSMutableDictionary *)_attributes)[NSStrokeColorAttributeName] = color;
-  }
-}
-
-- (void)setTextAttribute:(NSString *)attribute value:(id)value {
-  [self _makeMutableAttributes];
-  if (value == nil) value = [NSNull null];
-  ((NSMutableDictionary *)_attributes)[attribute] = value;
-}
-
-- (void)setShadow:(ASTextShadow *)shadow {
-  [self setTextAttribute:ASTextShadowAttributeName value:shadow];
-}
-
-- (void)setInnerShadow:(ASTextShadow *)shadow {
-  [self setTextAttribute:ASTextInnerShadowAttributeName value:shadow];
-}
-
-- (void)setUnderline:(ASTextDecoration *)underline {
-  [self setTextAttribute:ASTextUnderlineAttributeName value:underline];
-}
-
-- (void)setStrikethrough:(ASTextDecoration *)strikethrough {
-  [self setTextAttribute:ASTextStrikethroughAttributeName value:strikethrough];
-}
-
-- (void)setBackgroundBorder:(ASTextBorder *)border {
-  [self setTextAttribute:ASTextBackgroundBorderAttributeName value:border];
-}
-
-- (void)setBorder:(ASTextBorder *)border {
-  [self setTextAttribute:ASTextBorderAttributeName value:border];
-}
-
-- (void)setAttachment:(ASTextAttachment *)attachment {
-  [self setTextAttribute:ASTextAttachmentAttributeName value:attachment];
-}
-
-@end
-
diff --git a/submodules/AsyncDisplayKit/Source/Private/TextExperiment/String/ASTextRunDelegate.h b/submodules/AsyncDisplayKit/Source/Private/TextExperiment/String/ASTextRunDelegate.h
deleted file mode 100644
index 3d3bf11c2c..0000000000
--- a/submodules/AsyncDisplayKit/Source/Private/TextExperiment/String/ASTextRunDelegate.h
+++ /dev/null
@@ -1,65 +0,0 @@
-//
-//  ASTextRunDelegate.h
-//  Texture
-//
-//  Copyright (c) Pinterest, Inc.  All rights reserved.
-//  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
-//
-
-#import <UIKit/UIKit.h>
-#import <CoreText/CoreText.h>
-
-NS_ASSUME_NONNULL_BEGIN
-
-/**
- Wrapper for CTRunDelegateRef.
- 
- Example:
- 
- ASTextRunDelegate *delegate = [ASTextRunDelegate new];
- delegate.ascent = 20;
- delegate.descent = 4;
- delegate.width = 20;
- CTRunDelegateRef ctRunDelegate = delegate.CTRunDelegate;
- if (ctRunDelegate) {
-   /// add to attributed string
-   CFRelease(ctRunDelegate);
- }
- 
- */
-@interface ASTextRunDelegate : NSObject <NSCopying, NSCoding>
-
-/**
- Creates and returns the CTRunDelegate.
- 
- @discussion You need call CFRelease() after used.
- The CTRunDelegateRef has a strong reference to this ASTextRunDelegate object.
- In CoreText, use CTRunDelegateGetRefCon() to get this ASTextRunDelegate object.
- 
- @return The CTRunDelegate object.
- */
-- (nullable CTRunDelegateRef)CTRunDelegate CF_RETURNS_RETAINED;
-
-/**
- Additional information about the the run delegate.
- */
-@property (nullable, nonatomic) NSDictionary *userInfo;
-
-/**
- The typographic ascent of glyphs in the run.
- */
-@property (nonatomic) CGFloat ascent;
-
-/**
- The typographic descent of glyphs in the run.
- */
-@property (nonatomic) CGFloat descent;
-
-/**
- The typographic width of glyphs in the run.
- */
-@property (nonatomic) CGFloat width;
-
-@end
-
-NS_ASSUME_NONNULL_END
diff --git a/submodules/AsyncDisplayKit/Source/Private/TextExperiment/String/ASTextRunDelegate.mm b/submodules/AsyncDisplayKit/Source/Private/TextExperiment/String/ASTextRunDelegate.mm
deleted file mode 100644
index 1c179b1fea..0000000000
--- a/submodules/AsyncDisplayKit/Source/Private/TextExperiment/String/ASTextRunDelegate.mm
+++ /dev/null
@@ -1,68 +0,0 @@
-//
-//  ASTextRunDelegate.mm
-//  Texture
-//
-//  Copyright (c) Pinterest, Inc.  All rights reserved.
-//  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
-//
-
-#import <AsyncDisplayKit/ASTextRunDelegate.h>
-
-static void DeallocCallback(void *ref) {
-  ASTextRunDelegate *self = (__bridge_transfer ASTextRunDelegate *)(ref);
-  self = nil; // release
-}
-
-static CGFloat GetAscentCallback(void *ref) {
-  ASTextRunDelegate *self = (__bridge ASTextRunDelegate *)(ref);
-  return self.ascent;
-}
-
-static CGFloat GetDecentCallback(void *ref) {
-  ASTextRunDelegate *self = (__bridge ASTextRunDelegate *)(ref);
-  return self.descent;
-}
-
-static CGFloat GetWidthCallback(void *ref) {
-  ASTextRunDelegate *self = (__bridge ASTextRunDelegate *)(ref);
-  return self.width;
-}
-
-@implementation ASTextRunDelegate
-
-- (CTRunDelegateRef)CTRunDelegate CF_RETURNS_RETAINED {
-  CTRunDelegateCallbacks callbacks;
-  callbacks.version = kCTRunDelegateCurrentVersion;
-  callbacks.dealloc = DeallocCallback;
-  callbacks.getAscent = GetAscentCallback;
-  callbacks.getDescent = GetDecentCallback;
-  callbacks.getWidth = GetWidthCallback;
-  return CTRunDelegateCreate(&callbacks, (__bridge_retained void *)(self.copy));
-}
-
-- (void)encodeWithCoder:(NSCoder *)aCoder {
-  [aCoder encodeObject:@(_ascent) forKey:@"ascent"];
-  [aCoder encodeObject:@(_descent) forKey:@"descent"];
-  [aCoder encodeObject:@(_width) forKey:@"width"];
-  [aCoder encodeObject:_userInfo forKey:@"userInfo"];
-}
-
-- (id)initWithCoder:(NSCoder *)aDecoder {
-  self = [super init];
-  _ascent = ((NSNumber *)[aDecoder decodeObjectForKey:@"ascent"]).floatValue;
-  _descent = ((NSNumber *)[aDecoder decodeObjectForKey:@"descent"]).floatValue;
-  _width = ((NSNumber *)[aDecoder decodeObjectForKey:@"width"]).floatValue;
-  _userInfo = [aDecoder decodeObjectForKey:@"userInfo"];
-  return self;
-}
-
-- (id)copyWithZone:(NSZone *)zone {
-  __typeof__(self) one = [self.class new];
-  one.ascent = self.ascent;
-  one.descent = self.descent;
-  one.width = self.width;
-  one.userInfo = self.userInfo;
-  return one;
-}
-
-@end
diff --git a/submodules/AsyncDisplayKit/Source/Private/TextExperiment/Utility/ASTextUtilities.h b/submodules/AsyncDisplayKit/Source/Private/TextExperiment/Utility/ASTextUtilities.h
deleted file mode 100644
index f21a931ba8..0000000000
--- a/submodules/AsyncDisplayKit/Source/Private/TextExperiment/Utility/ASTextUtilities.h
+++ /dev/null
@@ -1,316 +0,0 @@
-//
-//  ASTextUtilities.h
-//  Texture
-//
-//  Copyright (c) Pinterest, Inc.  All rights reserved.
-//  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
-//
-
-#import <UIKit/UIKit.h>
-#import <QuartzCore/QuartzCore.h>
-#import <CoreText/CoreText.h>
-#import <tgmath.h>
-#import <AsyncDisplayKit/ASInternalHelpers.h>
-
-
-#ifndef ASTEXT_CLAMP // return the clamped value
-#define ASTEXT_CLAMP(_x_, _low_, _high_)  (((_x_) > (_high_)) ? (_high_) : (((_x_) < (_low_)) ? (_low_) : (_x_)))
-#endif
-
-#ifndef ASTEXT_SWAP // swap two value
-#define ASTEXT_SWAP(_a_, _b_)  do { __typeof__(_a_) _tmp_ = (_a_); (_a_) = (_b_); (_b_) = _tmp_; } while (0)
-#endif
-
-NS_ASSUME_NONNULL_BEGIN
-
-/**
- Whether the character is 'line break char':
- U+000D (\\r or CR)
- U+2028 (Unicode line separator)
- U+000A (\\n or LF)
- U+2029 (Unicode paragraph separator)
- 
- @param c  A character
- @return YES or NO.
- */
-static inline BOOL ASTextIsLinebreakChar(unichar c) {
-  switch (c) {
-    case 0x000D:
-    case 0x2028:
-    case 0x000A:
-    case 0x2029:
-      return YES;
-    default:
-      return NO;
-  }
-}
-
-/**
- Whether the string is a 'line break':
- U+000D (\\r or CR)
- U+2028 (Unicode line separator)
- U+000A (\\n or LF)
- U+2029 (Unicode paragraph separator)
- \\r\\n, in that order (also known as CRLF)
- 
- @param str A string
- @return YES or NO.
- */
-static inline BOOL ASTextIsLinebreakString(NSString * _Nullable str) {
-  if (str.length > 2 || str.length == 0) return NO;
-  if (str.length == 1) {
-    unichar c = [str characterAtIndex:0];
-    return ASTextIsLinebreakChar(c);
-  } else {
-    return ([str characterAtIndex:0] == '\r') && ([str characterAtIndex:1] == '\n');
-  }
-}
-
-/**
- If the string has a 'line break' suffix, return the 'line break' length.
- 
- @param str  A string.
- @return The length of the tail line break: 0, 1 or 2.
- */
-static inline NSUInteger ASTextLinebreakTailLength(NSString * _Nullable str) {
-  if (str.length >= 2) {
-    unichar c2 = [str characterAtIndex:str.length - 1];
-    if (ASTextIsLinebreakChar(c2)) {
-      unichar c1 = [str characterAtIndex:str.length - 2];
-      if (c1 == '\r' && c2 == '\n') return 2;
-      else return 1;
-    } else {
-      return 0;
-    }
-  } else if (str.length == 1) {
-    return ASTextIsLinebreakChar([str characterAtIndex:0]) ? 1 : 0;
-  } else {
-    return 0;
-  }
-}
-
-/**
- Whether the font contains color bitmap glyphs.
- 
- @discussion Only `AppleColorEmoji` contains color bitmap glyphs in iOS system fonts.
- @param font  A font.
- @return YES: the font contains color bitmap glyphs, NO: the font has no color bitmap glyph.
- */
-static inline BOOL ASTextCTFontContainsColorBitmapGlyphs(CTFontRef font) {
-  return  (CTFontGetSymbolicTraits(font) & kCTFontTraitColorGlyphs) != 0;
-}
-
-/**
- Get the `AppleColorEmoji` font's ascent with a specified font size.
- It may used to create custom emoji.
- 
- @param fontSize  The specified font size.
- @return The font ascent.
- */
-static inline CGFloat ASTextEmojiGetAscentWithFontSize(CGFloat fontSize) {
-  if (fontSize < 16) {
-    return 1.25 * fontSize;
-  } else if (16 <= fontSize && fontSize <= 24) {
-    return 0.5 * fontSize + 12;
-  } else {
-    return fontSize;
-  }
-}
-
-/**
- Get the `AppleColorEmoji` font's descent with a specified font size.
- It may used to create custom emoji.
- 
- @param fontSize  The specified font size.
- @return The font descent.
- */
-static inline CGFloat ASTextEmojiGetDescentWithFontSize(CGFloat fontSize) {
-  if (fontSize < 16) {
-    return 0.390625 * fontSize;
-  } else if (16 <= fontSize && fontSize <= 24) {
-    return 0.15625 * fontSize + 3.75;
-  } else {
-    return 0.3125 * fontSize;
-  }
-  return 0;
-}
-
-/**
- Get the `AppleColorEmoji` font's glyph bounding rect with a specified font size.
- It may used to create custom emoji.
- 
- @param fontSize  The specified font size.
- @return The font glyph bounding rect.
- */
-static inline CGRect ASTextEmojiGetGlyphBoundingRectWithFontSize(CGFloat fontSize) {
-  CGRect rect;
-  rect.origin.x = 0.75;
-  rect.size.width = rect.size.height = ASTextEmojiGetAscentWithFontSize(fontSize);
-  if (fontSize < 16) {
-    rect.origin.y = -0.2525 * fontSize;
-  } else if (16 <= fontSize && fontSize <= 24) {
-    rect.origin.y = 0.1225 * fontSize -6;
-  } else {
-    rect.origin.y = -0.1275 * fontSize;
-  }
-  return rect;
-}
-
-
-/**
- Get the character set which should rotate in vertical form.
- @return The shared character set.
- */
-NSCharacterSet *ASTextVerticalFormRotateCharacterSet(void);
-
-/**
- Get the character set which should rotate and move in vertical form.
- @return The shared character set.
- */
-NSCharacterSet *ASTextVerticalFormRotateAndMoveCharacterSet(void);
-
-
-/// Get the transform rotation.
-/// @return the rotation in radians [-PI,PI] ([-180°,180°])
-static inline CGFloat ASTextCGAffineTransformGetRotation(CGAffineTransform transform) {
-  return atan2(transform.b, transform.a);
-}
-
-/// Negates/inverts a UIEdgeInsets.
-static inline UIEdgeInsets ASTextUIEdgeInsetsInvert(UIEdgeInsets insets) {
-  return UIEdgeInsetsMake(-insets.top, -insets.left, -insets.bottom, -insets.right);
-}
-
-/**
- Returns a rectangle to fit `rect` with specified content mode.
- 
- @param rect The constraint rect
- @param size The content size
- @param mode The content mode
- @return A rectangle for the given content mode.
- @discussion UIViewContentModeRedraw is same as UIViewContentModeScaleToFill.
- */
-CGRect ASTextCGRectFitWithContentMode(CGRect rect, CGSize size, UIViewContentMode mode);
-
-/// Returns the center for the rectangle.
-static inline CGPoint ASTextCGRectGetCenter(CGRect rect) {
-  return CGPointMake(CGRectGetMidX(rect), CGRectGetMidY(rect));
-}
-
-/// Returns the area of the rectangle.
-static inline CGFloat ASTextCGRectGetArea(CGRect rect) {
-  if (CGRectIsNull(rect)) return 0;
-  rect = CGRectStandardize(rect);
-  return rect.size.width * rect.size.height;
-}
-
-/// Returns the minmium distance between a point to a rectangle.
-static inline CGFloat ASTextCGPointGetDistanceToRect(CGPoint p, CGRect r) {
-  r = CGRectStandardize(r);
-  if (CGRectContainsPoint(r, p)) return 0;
-  CGFloat distV, distH;
-  if (CGRectGetMinY(r) <= p.y && p.y <= CGRectGetMaxY(r)) {
-    distV = 0;
-  } else {
-    distV = p.y < CGRectGetMinY(r) ? CGRectGetMinY(r) - p.y : p.y - CGRectGetMaxY(r);
-  }
-  if (CGRectGetMinX(r) <= p.x && p.x <= CGRectGetMaxX(r)) {
-    distH = 0;
-  } else {
-    distH = p.x < CGRectGetMinX(r) ? CGRectGetMinX(r) - p.x : p.x - CGRectGetMaxX(r);
-  }
-  return MAX(distV, distH);
-}
-
-/// Convert point to pixel.
-static inline CGFloat ASTextCGFloatToPixel(CGFloat value) {
-  return value * ASScreenScale();
-}
-
-/// Convert pixel to point.
-static inline CGFloat ASTextCGFloatFromPixel(CGFloat value) {
-  return value / ASScreenScale();
-}
-
-/// round point value to .5 pixel for path stroke (odd pixel line width pixel-aligned)
-static inline CGFloat ASTextCGFloatPixelHalf(CGFloat value) {
-  CGFloat scale = ASScreenScale();
-  return (floor(value * scale) + 0.5) / scale;
-}
-
-/// floor point value for pixel-aligned
-static inline CGPoint ASTextCGPointPixelFloor(CGPoint point) {
-  CGFloat scale = ASScreenScale();
-  return CGPointMake(floor(point.x * scale) / scale,
-                     floor(point.y * scale) / scale);
-}
-
-/// round point value for pixel-aligned
-static inline CGPoint ASTextCGPointPixelRound(CGPoint point) {
-  CGFloat scale = ASScreenScale();
-  return CGPointMake(round(point.x * scale) / scale,
-                     round(point.y * scale) / scale);
-}
-
-/// ceil point value for pixel-aligned
-static inline CGPoint ASTextCGPointPixelCeil(CGPoint point) {
-  CGFloat scale = ASScreenScale();
-  return CGPointMake(ceil(point.x * scale) / scale,
-                     ceil(point.y * scale) / scale);
-}
-
-/// round point value to .5 pixel for path stroke (odd pixel line width pixel-aligned)
-static inline CGPoint ASTextCGPointPixelHalf(CGPoint point) {
-  CGFloat scale = ASScreenScale();
-  return CGPointMake((floor(point.x * scale) + 0.5) / scale,
-                     (floor(point.y * scale) + 0.5) / scale);
-}
-
-/// round point value for pixel-aligned
-static inline CGRect ASTextCGRectPixelRound(CGRect rect) {
-  CGPoint origin = ASTextCGPointPixelRound(rect.origin);
-  CGPoint corner = ASTextCGPointPixelRound(CGPointMake(rect.origin.x + rect.size.width,
-                                                       rect.origin.y + rect.size.height));
-  return CGRectMake(origin.x, origin.y, corner.x - origin.x, corner.y - origin.y);
-}
-
-/// round point value to .5 pixel for path stroke (odd pixel line width pixel-aligned)
-static inline CGRect ASTextCGRectPixelHalf(CGRect rect) {
-  CGPoint origin = ASTextCGPointPixelHalf(rect.origin);
-  CGPoint corner = ASTextCGPointPixelHalf(CGPointMake(rect.origin.x + rect.size.width,
-                                                      rect.origin.y + rect.size.height));
-  return CGRectMake(origin.x, origin.y, corner.x - origin.x, corner.y - origin.y);
-}
-
-
-static inline UIFont * _Nullable ASTextFontWithBold(UIFont *font) {
-  return [UIFont fontWithDescriptor:[font.fontDescriptor fontDescriptorWithSymbolicTraits:UIFontDescriptorTraitBold] size:font.pointSize];
-}
-
-static inline UIFont * _Nullable ASTextFontWithItalic(UIFont *font) {
-  return [UIFont fontWithDescriptor:[font.fontDescriptor fontDescriptorWithSymbolicTraits:UIFontDescriptorTraitItalic] size:font.pointSize];
-}
-
-static inline UIFont * _Nullable ASTextFontWithBoldItalic(UIFont *font) {
-  return [UIFont fontWithDescriptor:[font.fontDescriptor fontDescriptorWithSymbolicTraits:UIFontDescriptorTraitBold | UIFontDescriptorTraitItalic] size:font.pointSize];
-}
-
-
-
-/**
- Convert CFRange to NSRange
- @param range CFRange @return NSRange
- */
-static inline NSRange ASTextNSRangeFromCFRange(CFRange range) {
-  return NSMakeRange(range.location, range.length);
-}
-
-/**
- Convert NSRange to CFRange
- @param range NSRange @return CFRange
- */
-static inline CFRange ASTextCFRangeFromNSRange(NSRange range) {
-  return CFRangeMake(range.location, range.length);
-}
-
-NS_ASSUME_NONNULL_END
diff --git a/submodules/AsyncDisplayKit/Source/Private/TextExperiment/Utility/ASTextUtilities.mm b/submodules/AsyncDisplayKit/Source/Private/TextExperiment/Utility/ASTextUtilities.mm
deleted file mode 100644
index 8d0137718b..0000000000
--- a/submodules/AsyncDisplayKit/Source/Private/TextExperiment/Utility/ASTextUtilities.mm
+++ /dev/null
@@ -1,143 +0,0 @@
-//
-//  ASTextUtilities.mm
-//  Texture
-//
-//  Copyright (c) Pinterest, Inc.  All rights reserved.
-//  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
-//
-
-#import "ASTextUtilities.h"
-#import <Accelerate/Accelerate.h>
-
-NSCharacterSet *ASTextVerticalFormRotateCharacterSet() {
-  static NSMutableCharacterSet *set;
-  static dispatch_once_t onceToken;
-  dispatch_once(&onceToken, ^{
-    set = [NSMutableCharacterSet new];
-    [set addCharactersInRange:NSMakeRange(0x1100, 256)]; // Hangul Jamo
-    [set addCharactersInRange:NSMakeRange(0x2460, 160)]; // Enclosed Alphanumerics
-    [set addCharactersInRange:NSMakeRange(0x2600, 256)]; // Miscellaneous Symbols
-    [set addCharactersInRange:NSMakeRange(0x2700, 192)]; // Dingbats
-    [set addCharactersInRange:NSMakeRange(0x2E80, 128)]; // CJK Radicals Supplement
-    [set addCharactersInRange:NSMakeRange(0x2F00, 224)]; // Kangxi Radicals
-    [set addCharactersInRange:NSMakeRange(0x2FF0, 16)]; // Ideographic Description Characters
-    [set addCharactersInRange:NSMakeRange(0x3000, 64)]; // CJK Symbols and Punctuation
-    [set removeCharactersInRange:NSMakeRange(0x3008, 10)];
-    [set removeCharactersInRange:NSMakeRange(0x3014, 12)];
-    [set addCharactersInRange:NSMakeRange(0x3040, 96)]; // Hiragana
-    [set addCharactersInRange:NSMakeRange(0x30A0, 96)]; // Katakana
-    [set addCharactersInRange:NSMakeRange(0x3100, 48)]; // Bopomofo
-    [set addCharactersInRange:NSMakeRange(0x3130, 96)]; // Hangul Compatibility Jamo
-    [set addCharactersInRange:NSMakeRange(0x3190, 16)]; // Kanbun
-    [set addCharactersInRange:NSMakeRange(0x31A0, 32)]; // Bopomofo Extended
-    [set addCharactersInRange:NSMakeRange(0x31C0, 48)]; // CJK Strokes
-    [set addCharactersInRange:NSMakeRange(0x31F0, 16)]; // Katakana Phonetic Extensions
-    [set addCharactersInRange:NSMakeRange(0x3200, 256)]; // Enclosed CJK Letters and Months
-    [set addCharactersInRange:NSMakeRange(0x3300, 256)]; // CJK Compatibility
-    [set addCharactersInRange:NSMakeRange(0x3400, 2582)]; // CJK Unified Ideographs Extension A
-    [set addCharactersInRange:NSMakeRange(0x4E00, 20941)]; // CJK Unified Ideographs
-    [set addCharactersInRange:NSMakeRange(0xAC00, 11172)]; // Hangul Syllables
-    [set addCharactersInRange:NSMakeRange(0xD7B0, 80)]; // Hangul Jamo Extended-B
-    [set addCharactersInString:@""]; // U+F8FF (Private Use Area)
-    [set addCharactersInRange:NSMakeRange(0xF900, 512)]; // CJK Compatibility Ideographs
-    [set addCharactersInRange:NSMakeRange(0xFE10, 16)]; // Vertical Forms
-    [set addCharactersInRange:NSMakeRange(0xFF00, 240)]; // Halfwidth and Fullwidth Forms
-    [set addCharactersInRange:NSMakeRange(0x1F200, 256)]; // Enclosed Ideographic Supplement
-    [set addCharactersInRange:NSMakeRange(0x1F300, 768)]; // Enclosed Ideographic Supplement
-    [set addCharactersInRange:NSMakeRange(0x1F600, 80)]; // Emoticons (Emoji)
-    [set addCharactersInRange:NSMakeRange(0x1F680, 128)]; // Transport and Map Symbols
-    
-    // See http://unicode-table.com/ for more information.
-  });
-  return set;
-}
-
-NSCharacterSet *ASTextVerticalFormRotateAndMoveCharacterSet() {
-  static NSMutableCharacterSet *set;
-  static dispatch_once_t onceToken;
-  dispatch_once(&onceToken, ^{
-    set = [NSMutableCharacterSet new];
-    [set addCharactersInString:@"，。、．"];
-  });
-  return set;
-}
-
-CGRect ASTextCGRectFitWithContentMode(CGRect rect, CGSize size, UIViewContentMode mode) {
-  rect = CGRectStandardize(rect);
-  size.width = size.width < 0 ? -size.width : size.width;
-  size.height = size.height < 0 ? -size.height : size.height;
-  CGPoint center = CGPointMake(CGRectGetMidX(rect), CGRectGetMidY(rect));
-  switch (mode) {
-    case UIViewContentModeScaleAspectFit:
-    case UIViewContentModeScaleAspectFill: {
-      if (rect.size.width < 0.01 || rect.size.height < 0.01 ||
-          size.width < 0.01 || size.height < 0.01) {
-        rect.origin = center;
-        rect.size = CGSizeZero;
-      } else {
-        CGFloat scale;
-        if (mode == UIViewContentModeScaleAspectFit) {
-          if (size.width / size.height < rect.size.width / rect.size.height) {
-            scale = rect.size.height / size.height;
-          } else {
-            scale = rect.size.width / size.width;
-          }
-        } else {
-          if (size.width / size.height < rect.size.width / rect.size.height) {
-            scale = rect.size.width / size.width;
-          } else {
-            scale = rect.size.height / size.height;
-          }
-        }
-        size.width *= scale;
-        size.height *= scale;
-        rect.size = size;
-        rect.origin = CGPointMake(center.x - size.width * 0.5, center.y - size.height * 0.5);
-      }
-    } break;
-    case UIViewContentModeCenter: {
-      rect.size = size;
-      rect.origin = CGPointMake(center.x - size.width * 0.5, center.y - size.height * 0.5);
-    } break;
-    case UIViewContentModeTop: {
-      rect.origin.x = center.x - size.width * 0.5;
-      rect.size = size;
-    } break;
-    case UIViewContentModeBottom: {
-      rect.origin.x = center.x - size.width * 0.5;
-      rect.origin.y += rect.size.height - size.height;
-      rect.size = size;
-    } break;
-    case UIViewContentModeLeft: {
-      rect.origin.y = center.y - size.height * 0.5;
-      rect.size = size;
-    } break;
-    case UIViewContentModeRight: {
-      rect.origin.y = center.y - size.height * 0.5;
-      rect.origin.x += rect.size.width - size.width;
-      rect.size = size;
-    } break;
-    case UIViewContentModeTopLeft: {
-      rect.size = size;
-    } break;
-    case UIViewContentModeTopRight: {
-      rect.origin.x += rect.size.width - size.width;
-      rect.size = size;
-    } break;
-    case UIViewContentModeBottomLeft: {
-      rect.origin.y += rect.size.height - size.height;
-      rect.size = size;
-    } break;
-    case UIViewContentModeBottomRight: {
-      rect.origin.x += rect.size.width - size.width;
-      rect.origin.y += rect.size.height - size.height;
-      rect.size = size;
-    } break;
-    case UIViewContentModeScaleToFill:
-    case UIViewContentModeRedraw:
-    default: {
-      rect = rect;
-    }
-  }
-  return rect;
-}
diff --git a/submodules/AsyncDisplayKit/Source/Private/TextExperiment/Utility/NSAttributedString+ASText.h b/submodules/AsyncDisplayKit/Source/Private/TextExperiment/Utility/NSAttributedString+ASText.h
deleted file mode 100644
index ef44fb4f35..0000000000
--- a/submodules/AsyncDisplayKit/Source/Private/TextExperiment/Utility/NSAttributedString+ASText.h
+++ /dev/null
@@ -1,1375 +0,0 @@
-//
-//  NSAttributedString+ASText.h
-//  Texture
-//
-//  Copyright (c) Pinterest, Inc.  All rights reserved.
-//  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
-//
-
-#import <UIKit/UIKit.h>
-#import <CoreText/CoreText.h>
-
-#import <AsyncDisplayKit/ASTextAttribute.h>
-
-NS_ASSUME_NONNULL_BEGIN
-
-/**
- Get pre-defined attributes from attributed string.
- All properties defined in UIKit, CoreText and ASText are included.
- */
-@interface NSAttributedString (ASText)
-
-#pragma mark - Retrieving character attribute information
-///=============================================================================
-/// @name Retrieving character attribute information
-///=============================================================================
-
-/**
- Returns the attributes at first charactor.
- */
-@property (nullable, nonatomic, copy, readonly) NSDictionary<NSString *, id> *as_attributes;
-
-/**
- Returns the attributes for the character at a given index.
- 
- @discussion Raises an `NSRangeException` if index lies beyond the end of the
- receiver's characters.
- 
- @param index  The index for which to return attributes.
- This value must lie within the bounds of the receiver.
- 
- @return The attributes for the character at index.
- */
-- (nullable NSDictionary<NSString *, id> *)as_attributesAtIndex:(NSUInteger)index;
-
-/**
- Returns the value for an attribute with a given name of the character at a given index.
- 
- @discussion Raises an `NSRangeException` if index lies beyond the end of the
- receiver's characters.
- 
- @param attributeName  The name of an attribute.
- @param index          The index for which to return attributes.
- This value must not exceed the bounds of the receiver.
- 
- @return The value for the attribute named `attributeName` of the character at
- index `index`, or nil if there is no such attribute.
- */
-- (nullable id)as_attribute:(NSString *)attributeName atIndex:(NSUInteger)index;
-
-
-#pragma mark - Get character attribute as property
-///=============================================================================
-/// @name Get character attribute as property
-///=============================================================================
-
-/**
- The font of the text. (read-only)
- 
- @discussion Default is Helvetica (Neue) 12.
- @discussion Get this property returns the first character's attribute.
- @since CoreText:3.2  UIKit:6.0  ASText:6.0
- */
-@property (nullable, nonatomic, readonly) UIFont *as_font;
-- (nullable UIFont *)as_fontAtIndex:(NSUInteger)index;
-
-/**
- A kerning adjustment. (read-only)
- 
- @discussion Default is standard kerning. The kerning attribute indicate how many
- points the following character should be shifted from its default offset as
- defined by the current character's font in points; a positive kern indicates a
- shift farther along and a negative kern indicates a shift closer to the current
- character. If this attribute is not present, standard kerning will be used.
- If this attribute is set to 0.0, no kerning will be done at all.
- @discussion Get this property returns the first character's attribute.
- @since CoreText:3.2  UIKit:6.0  ASText:6.0
- */
-@property (nullable, nonatomic, readonly) NSNumber *as_kern;
-- (nullable NSNumber *)as_kernAtIndex:(NSUInteger)index;
-
-/**
- The foreground color. (read-only)
- 
- @discussion Default is Black.
- @discussion Get this property returns the first character's attribute.
- @since CoreText:3.2  UIKit:6.0  ASText:6.0
- */
-@property (nullable, nonatomic, readonly) UIColor *as_color;
-- (nullable UIColor *)as_colorAtIndex:(NSUInteger)index;
-
-/**
- The background color. (read-only)
- 
- @discussion Default is nil (or no background).
- @discussion Get this property returns the first character's attribute.
- @since UIKit:6.0
- */
-@property (nullable, nonatomic, readonly) UIColor *as_backgroundColor;
-- (nullable UIColor *)as_backgroundColorAtIndex:(NSUInteger)index;
-
-/**
- The stroke width. (read-only)
- 
- @discussion Default value is 0.0 (no stroke). This attribute, interpreted as
- a percentage of font point size, controls the text drawing mode: positive
- values effect drawing with stroke only; negative values are for stroke and fill.
- A typical value for outlined text is 3.0.
- @discussion Get this property returns the first character's attribute.
- @since CoreText:3.2  UIKit:6.0
- */
-@property (nullable, nonatomic, readonly) NSNumber *as_strokeWidth;
-- (nullable NSNumber *)as_strokeWidthAtIndex:(NSUInteger)index;
-
-/**
- The stroke color. (read-only)
- 
- @discussion Default value is nil (same as foreground color).
- @discussion Get this property returns the first character's attribute.
- @since CoreText:3.2  UIKit:6.0
- */
-@property (nullable, nonatomic, readonly) UIColor *as_strokeColor;
-- (nullable UIColor *)as_strokeColorAtIndex:(NSUInteger)index;
-
-/**
- The text shadow. (read-only)
- 
- @discussion Default value is nil (no shadow).
- @discussion Get this property returns the first character's attribute.
- @since UIKit:6.0  ASText:6.0
- */
-@property (nullable, nonatomic, readonly) NSShadow *as_shadow;
-- (nullable NSShadow *)as_shadowAtIndex:(NSUInteger)index;
-
-/**
- The strikethrough style. (read-only)
- 
- @discussion Default value is NSUnderlineStyleNone (no strikethrough).
- @discussion Get this property returns the first character's attribute.
- @since UIKit:6.0
- */
-@property (nonatomic, readonly) NSUnderlineStyle as_strikethroughStyle;
-- (NSUnderlineStyle)as_strikethroughStyleAtIndex:(NSUInteger)index;
-
-/**
- The strikethrough color. (read-only)
- 
- @discussion Default value is nil (same as foreground color).
- @discussion Get this property returns the first character's attribute.
- @since UIKit:7.0
- */
-@property (nullable, nonatomic, readonly) UIColor *as_strikethroughColor;
-- (nullable UIColor *)as_strikethroughColorAtIndex:(NSUInteger)index;
-
-/**
- The underline style. (read-only)
- 
- @discussion Default value is NSUnderlineStyleNone (no underline).
- @discussion Get this property returns the first character's attribute.
- @since CoreText:3.2  UIKit:6.0
- */
-@property (nonatomic, readonly) NSUnderlineStyle as_underlineStyle;
-- (NSUnderlineStyle)as_underlineStyleAtIndex:(NSUInteger)index;
-
-/**
- The underline color. (read-only)
- 
- @discussion Default value is nil (same as foreground color).
- @discussion Get this property returns the first character's attribute.
- @since CoreText:3.2  UIKit:7.0
- */
-@property (nullable, nonatomic, readonly) UIColor *as_underlineColor;
-- (nullable UIColor *)as_underlineColorAtIndex:(NSUInteger)index;
-
-/**
- Ligature formation control. (read-only)
- 
- @discussion Default is int value 1. The ligature attribute determines what kinds
- of ligatures should be used when displaying the string. A value of 0 indicates
- that only ligatures essential for proper rendering of text should be used,
- 1 indicates that standard ligatures should be used, and 2 indicates that all
- available ligatures should be used. Which ligatures are standard depends on the
- script and possibly the font.
- @discussion Get this property returns the first character's attribute.
- @since CoreText:3.2  UIKit:6.0  ASText:6.0
- */
-@property (nullable, nonatomic, readonly) NSNumber *as_ligature;
-- (nullable NSNumber *)as_ligatureAtIndex:(NSUInteger)index;
-
-/**
- The text effect. (read-only)
- 
- @discussion Default is nil (no effect). The only currently supported value
- is NSTextEffectLetterpressStyle.
- @discussion Get this property returns the first character's attribute.
- @since UIKit:7.0
- */
-@property (nullable, nonatomic, readonly) NSString *as_textEffect;
-- (nullable NSString *)as_textEffectAtIndex:(NSUInteger)index;
-
-/**
- The skew to be applied to glyphs. (read-only)
- 
- @discussion Default is 0 (no skew).
- @discussion Get this property returns the first character's attribute.
- @since UIKit:7.0
- */
-@property (nullable, nonatomic, readonly) NSNumber *as_obliqueness;
-- (nullable NSNumber *)as_obliquenessAtIndex:(NSUInteger)index;
-
-/**
- The log of the expansion factor to be applied to glyphs. (read-only)
- 
- @discussion Default is 0 (no expansion).
- @discussion Get this property returns the first character's attribute.
- @since UIKit:7.0
- */
-@property (nullable, nonatomic, readonly) NSNumber *as_expansion;
-- (nullable NSNumber *)as_expansionAtIndex:(NSUInteger)index;
-
-/**
- The character's offset from the baseline, in points. (read-only)
- 
- @discussion Default is 0.
- @discussion Get this property returns the first character's attribute.
- @since UIKit:7.0
- */
-@property (nullable, nonatomic, readonly) NSNumber *as_baselineOffset;
-- (nullable NSNumber *)as_baselineOffsetAtIndex:(NSUInteger)index;
-
-/**
- Glyph orientation control. (read-only)
- 
- @discussion Default is NO. A value of NO indicates that horizontal glyph forms
- are to be used, YES indicates that vertical glyph forms are to be used.
- @discussion Get this property returns the first character's attribute.
- @since CoreText:4.3  ASText:6.0
- */
-@property (nonatomic, readonly) BOOL as_verticalGlyphForm;
-- (BOOL)as_verticalGlyphFormAtIndex:(NSUInteger)index;
-
-/**
- Specifies text language. (read-only)
- 
- @discussion Value must be a NSString containing a locale identifier. Default is
- unset. When this attribute is set to a valid identifier, it will be used to select
- localized glyphs (if supported by the font) and locale-specific line breaking rules.
- @discussion Get this property returns the first character's attribute.
- @since CoreText:7.0  ASText:7.0
- */
-@property (nullable, nonatomic, readonly) NSString *as_language;
-- (nullable NSString *)as_languageAtIndex:(NSUInteger)index;
-
-/**
- Specifies a bidirectional override or embedding. (read-only)
- 
- @discussion See alse NSWritingDirection and NSWritingDirectionAttributeName.
- @discussion Get this property returns the first character's attribute.
- @since CoreText:6.0  UIKit:7.0  ASText:6.0
- */
-@property (nullable, nonatomic, readonly) NSArray<NSNumber *> *as_writingDirection;
-- (nullable NSArray<NSNumber *> *)as_writingDirectionAtIndex:(NSUInteger)index;
-
-/**
- An NSParagraphStyle object which is used to specify things like
- line alignment, tab rulers, writing direction, etc. (read-only)
- 
- @discussion Default is nil ([NSParagraphStyle defaultParagraphStyle]).
- @discussion Get this property returns the first character's attribute.
- @since CoreText:6.0  UIKit:6.0  ASText:6.0
- */
-@property (nullable, nonatomic, readonly) NSParagraphStyle *as_paragraphStyle;
-- (nullable NSParagraphStyle *)as_paragraphStyleAtIndex:(NSUInteger)index;
-
-#pragma mark - Get paragraph attribute as property
-///=============================================================================
-/// @name Get paragraph attribute as property
-///=============================================================================
-
-/**
- The text alignment (A wrapper for NSParagraphStyle). (read-only)
- 
- @discussion Natural text alignment is realized as left or right alignment
- depending on the line sweep direction of the first script contained in the paragraph.
- @discussion Default is NSTextAlignmentNatural.
- @discussion Get this property returns the first character's attribute.
- @since CoreText:6.0  UIKit:6.0  ASText:6.0
- */
-@property (nonatomic, readonly) NSTextAlignment as_alignment;
-- (NSTextAlignment)as_alignmentAtIndex:(NSUInteger)index;
-
-/**
- The mode that should be used to break lines (A wrapper for NSParagraphStyle). (read-only)
- 
- @discussion This property contains the line break mode to be used laying out the paragraph's text.
- @discussion Default is NSLineBreakByWordWrapping.
- @discussion Get this property returns the first character's attribute.
- @since CoreText:6.0  UIKit:6.0  ASText:6.0
- */
-@property (nonatomic, readonly) NSLineBreakMode as_lineBreakMode;
-- (NSLineBreakMode)as_lineBreakModeAtIndex:(NSUInteger)index;
-
-/**
- The distance in points between the bottom of one line fragment and the top of the next.
- (A wrapper for NSParagraphStyle) (read-only)
- 
- @discussion This value is always nonnegative. This value is included in the line
- fragment heights in the layout manager.
- @discussion Default is 0.
- @discussion Get this property returns the first character's attribute.
- @since CoreText:6.0  UIKit:6.0  ASText:6.0
- */
-@property (nonatomic, readonly) CGFloat as_lineSpacing;
-- (CGFloat)as_lineSpacingAtIndex:(NSUInteger)index;
-
-/**
- The space after the end of the paragraph (A wrapper for NSParagraphStyle). (read-only)
- 
- @discussion This property contains the space (measured in points) added at the
- end of the paragraph to separate it from the following paragraph. This value must
- be nonnegative. The space between paragraphs is determined by adding the previous
- paragraph's paragraphSpacing and the current paragraph's paragraphSpacingBefore.
- @discussion Default is 0.
- @discussion Get this property returns the first character's attribute.
- @since CoreText:6.0  UIKit:6.0  ASText:6.0
- */
-@property (nonatomic, readonly) CGFloat as_paragraphSpacing;
-- (CGFloat)as_paragraphSpacingAtIndex:(NSUInteger)index;
-
-/**
- The distance between the paragraph's top and the beginning of its text content.
- (A wrapper for NSParagraphStyle). (read-only)
- 
- @discussion This property contains the space (measured in points) between the
- paragraph's top and the beginning of its text content.
- @discussion Default is 0.
- @discussion Get this property returns the first character's attribute.
- @since CoreText:6.0  UIKit:6.0  ASText:6.0
- */
-@property (nonatomic, readonly) CGFloat as_paragraphSpacingBefore;
-- (CGFloat)as_paragraphSpacingBeforeAtIndex:(NSUInteger)index;
-
-/**
- The indentation of the first line (A wrapper for NSParagraphStyle). (read-only)
- 
- @discussion This property contains the distance (in points) from the leading margin
- of a text container to the beginning of the paragraph's first line. This value
- is always nonnegative.
- @discussion Default is 0.
- @discussion Get this property returns the first character's attribute.
- @since CoreText:6.0  UIKit:6.0  ASText:6.0
- */
-@property (nonatomic, readonly) CGFloat as_firstLineHeadIndent;
-- (CGFloat)as_firstLineHeadIndentAtIndex:(NSUInteger)index;
-
-/**
- The indentation of the receiver's lines other than the first. (A wrapper for NSParagraphStyle). (read-only)
- 
- @discussion This property contains the distance (in points) from the leading margin
- of a text container to the beginning of lines other than the first. This value is
- always nonnegative.
- @discussion Default is 0.
- @discussion Get this property returns the first character's attribute.
- @since CoreText:6.0  UIKit:6.0  ASText:6.0
- */
-@property (nonatomic, readonly) CGFloat as_headIndent;
-- (CGFloat)as_headIndentAtIndex:(NSUInteger)index;
-
-/**
- The trailing indentation (A wrapper for NSParagraphStyle). (read-only)
- 
- @discussion If positive, this value is the distance from the leading margin
- (for example, the left margin in left-to-right text). If 0 or negative, it's the
- distance from the trailing margin.
- @discussion Default is 0.
- @discussion Get this property returns the first character's attribute.
- @since CoreText:6.0  UIKit:6.0  ASText:6.0
- */
-@property (nonatomic, readonly) CGFloat as_tailIndent;
-- (CGFloat)as_tailIndentAtIndex:(NSUInteger)index;
-
-/**
- The receiver's minimum height (A wrapper for NSParagraphStyle). (read-only)
- 
- @discussion This property contains the minimum height in points that any line in
- the receiver will occupy, regardless of the font size or size of any attached graphic.
- This value must be nonnegative.
- @discussion Default is 0.
- @discussion Get this property returns the first character's attribute.
- @since CoreText:6.0  UIKit:6.0  ASText:6.0
- */
-@property (nonatomic, readonly) CGFloat as_minimumLineHeight;
-- (CGFloat)as_minimumLineHeightAtIndex:(NSUInteger)index;
-
-/**
- The receiver's maximum line height (A wrapper for NSParagraphStyle). (read-only)
- 
- @discussion This property contains the maximum height in points that any line in
- the receiver will occupy, regardless of the font size or size of any attached graphic.
- This value is always nonnegative. Glyphs and graphics exceeding this height will
- overlap neighboring lines; however, a maximum height of 0 implies no line height limit.
- Although this limit applies to the line itself, line spacing adds extra space between adjacent lines.
- @discussion Default is 0 (no limit).
- @discussion Get this property returns the first character's attribute.
- @since CoreText:6.0  UIKit:6.0  ASText:6.0
- */
-@property (nonatomic, readonly) CGFloat as_maximumLineHeight;
-- (CGFloat)as_maximumLineHeightAtIndex:(NSUInteger)index;
-
-/**
- The line height multiple (A wrapper for NSParagraphStyle). (read-only)
- 
- @discussion This property contains the line break mode to be used laying out the paragraph's text.
- @discussion Default is 0 (no multiple).
- @discussion Get this property returns the first character's attribute.
- @since CoreText:6.0  UIKit:6.0  ASText:6.0
- */
-@property (nonatomic, readonly) CGFloat as_lineHeightMultiple;
-- (CGFloat)as_lineHeightMultipleAtIndex:(NSUInteger)index;
-
-/**
- The base writing direction (A wrapper for NSParagraphStyle). (read-only)
- 
- @discussion If you specify NSWritingDirectionNaturalDirection, the receiver resolves
- the writing direction to either NSWritingDirectionLeftToRight or NSWritingDirectionRightToLeft,
- depending on the direction for the user's `language` preference setting.
- @discussion Default is NSWritingDirectionNatural.
- @discussion Get this property returns the first character's attribute.
- @since CoreText:6.0  UIKit:6.0  ASText:6.0
- */
-@property (nonatomic, readonly) NSWritingDirection as_baseWritingDirection;
-- (NSWritingDirection)as_baseWritingDirectionAtIndex:(NSUInteger)index;
-
-/**
- The paragraph's threshold for hyphenation. (A wrapper for NSParagraphStyle). (read-only)
- 
- @discussion Valid values lie between 0.0 and 1.0 inclusive. Hyphenation is attempted
- when the ratio of the text width (as broken without hyphenation) to the width of the
- line fragment is less than the hyphenation factor. When the paragraph's hyphenation
- factor is 0.0, the layout manager's hyphenation factor is used instead. When both
- are 0.0, hyphenation is disabled.
- @discussion Default is 0.
- @discussion Get this property returns the first character's attribute.
- @since UIKit:6.0
- */
-@property (nonatomic, readonly) float as_hyphenationFactor;
-- (float)as_hyphenationFactorAtIndex:(NSUInteger)index;
-
-/**
- The document-wide default tab interval (A wrapper for NSParagraphStyle). (read-only)
- 
- @discussion This property represents the default tab interval in points. Tabs after the
- last specified in tabStops are placed at integer multiples of this distance (if positive).
- @discussion Default is 0.
- @discussion Get this property returns the first character's attribute.
- @since CoreText:7.0  UIKit:7.0  ASText:7.0
- */
-@property (nonatomic, readonly) CGFloat as_defaultTabInterval;
-- (CGFloat)as_defaultTabIntervalAtIndex:(NSUInteger)index;
-
-/**
- An array of NSTextTab objects representing the receiver's tab stops.
- (A wrapper for NSParagraphStyle). (read-only)
- 
- @discussion The NSTextTab objects, sorted by location, define the tab stops for
- the paragraph style.
- @discussion Default is 12 TabStops with 28.0 tab interval.
- @discussion Get this property returns the first character's attribute.
- @since CoreText:7.0  UIKit:7.0  ASText:7.0
- */
-@property (nullable, nonatomic, copy, readonly) NSArray<NSTextTab *> *as_tabStops;
-- (nullable NSArray<NSTextTab *> *)as_tabStopsAtIndex:(NSUInteger)index;
-
-#pragma mark - Get ASText attribute as property
-///=============================================================================
-/// @name Get ASText attribute as property
-///=============================================================================
-
-/**
- The text shadow. (read-only)
- 
- @discussion Default value is nil (no shadow).
- @discussion Get this property returns the first character's attribute.
- @since ASText:6.0
- */
-@property (nullable, nonatomic, readonly) ASTextShadow *as_textShadow;
-- (nullable ASTextShadow *)as_textShadowAtIndex:(NSUInteger)index;
-
-/**
- The text inner shadow. (read-only)
- 
- @discussion Default value is nil (no shadow).
- @discussion Get this property returns the first character's attribute.
- @since ASText:6.0
- */
-@property (nullable, nonatomic, readonly) ASTextShadow *as_textInnerShadow;
-- (nullable ASTextShadow *)as_textInnerShadowAtIndex:(NSUInteger)index;
-
-/**
- The text underline. (read-only)
- 
- @discussion Default value is nil (no underline).
- @discussion Get this property returns the first character's attribute.
- @since ASText:6.0
- */
-@property (nullable, nonatomic, readonly) ASTextDecoration *as_textUnderline;
-- (nullable ASTextDecoration *)as_textUnderlineAtIndex:(NSUInteger)index;
-
-/**
- The text strikethrough. (read-only)
- 
- @discussion Default value is nil (no strikethrough).
- @discussion Get this property returns the first character's attribute.
- @since ASText:6.0
- */
-@property (nullable, nonatomic, readonly) ASTextDecoration *as_textStrikethrough;
-- (nullable ASTextDecoration *)as_textStrikethroughAtIndex:(NSUInteger)index;
-
-/**
- The text border. (read-only)
- 
- @discussion Default value is nil (no border).
- @discussion Get this property returns the first character's attribute.
- @since ASText:6.0
- */
-@property (nullable, nonatomic, readonly) ASTextBorder *as_textBorder;
-- (nullable ASTextBorder *)as_textBorderAtIndex:(NSUInteger)index;
-
-/**
- The text background border. (read-only)
- 
- @discussion Default value is nil (no background border).
- @discussion Get this property returns the first character's attribute.
- @since ASText:6.0
- */
-@property (nullable, nonatomic, readonly) ASTextBorder *as_textBackgroundBorder;
-- (nullable ASTextBorder *)as_textBackgroundBorderAtIndex:(NSUInteger)index;
-
-/**
- The glyph transform. (read-only)
- 
- @discussion Default value is CGAffineTransformIdentity (no transform).
- @discussion Get this property returns the first character's attribute.
- @since ASText:6.0
- */
-@property (nonatomic, readonly) CGAffineTransform as_textGlyphTransform;
-- (CGAffineTransform)as_textGlyphTransformAtIndex:(NSUInteger)index;
-
-
-#pragma mark - Query for ASText
-///=============================================================================
-/// @name Query for ASText
-///=============================================================================
-
-/**
- Returns the plain text from a range.
- If there's `ASTextBackedStringAttributeName` attribute, the backed string will
- replace the attributed string range.
- 
- @param range A range in receiver.
- @return The plain text.
- */
-- (nullable NSString *)as_plainTextForRange:(NSRange)range;
-
-
-#pragma mark - Create attachment string for ASText
-///=============================================================================
-/// @name Create attachment string for ASText
-///=============================================================================
-
-/**
- Creates and returns an attachment.
- 
- @param content      The attachment (UIImage/UIView/CALayer).
- @param contentMode  The attachment's content mode.
- @param width        The attachment's container width in layout.
- @param ascent       The attachment's container ascent in layout.
- @param descent      The attachment's container descent in layout.
- 
- @return An attributed string, or nil if an error occurs.
- @since ASText:6.0
- */
-+ (NSMutableAttributedString *)as_attachmentStringWithContent:(nullable id)content
-                                                  contentMode:(UIViewContentMode)contentMode
-                                                        width:(CGFloat)width
-                                                       ascent:(CGFloat)ascent
-                                                      descent:(CGFloat)descent;
-
-/**
- Creates and returns an attachment.
- 
- 
- Example: ContentMode:bottom Alignment:Top.
- 
- The text      The attachment holder
- ↓                ↓
- ─────────┌──────────────────────┐───────
- / \   │                      │ / ___|
- / _ \  │                      │| |
- / ___ \ │                      │| |___     ←── The text line
- /_/   \_\│    ██████████████    │ \____|
- ─────────│    ██████████████    │───────
- │    ██████████████    │
- │    ██████████████ ←───────────────── The attachment content
- │    ██████████████    │
- └──────────────────────┘
- 
- @param content        The attachment (UIImage/UIView/CALayer).
- @param contentMode    The attachment's content mode in attachment holder
- @param attachmentSize The attachment holder's size in text layout.
- @param font           The attachment will align to this font.
- @param alignment      The attachment holder's alignment to text line.
- 
- @return An attributed string, or nil if an error occurs.
- @since ASText:6.0
- */
-+ (NSMutableAttributedString *)as_attachmentStringWithContent:(nullable id)content
-                                                  contentMode:(UIViewContentMode)contentMode
-                                               attachmentSize:(CGSize)attachmentSize
-                                                  alignToFont:(UIFont *)font
-                                                    alignment:(ASTextVerticalAlignment)alignment;
-
-/**
- Creates and returns an attahment from a fourquare image as if it was an emoji.
- 
- @param image     A fourquare image.
- @param fontSize  The font size.
- 
- @return An attributed string, or nil if an error occurs.
- @since ASText:6.0
- */
-+ (nullable NSMutableAttributedString *)as_attachmentStringWithEmojiImage:(UIImage *)image
-                                                                 fontSize:(CGFloat)fontSize;
-
-#pragma mark - Utility
-///=============================================================================
-/// @name Utility
-///=============================================================================
-
-/**
- Returns NSMakeRange(0, self.length).
- */
-- (NSRange)as_rangeOfAll;
-
-/**
- If YES, it share the same attribute in entire text range.
- */
-- (BOOL)as_isSharedAttributesInAllRange;
-
-/**
- If YES, it can be drawn with the [drawWithRect:options:context:] method or displayed with UIKit.
- If NO, it should be drawn with CoreText or ASText.
- 
- @discussion If the method returns NO, it means that there's at least one attribute
- which is not supported by UIKit (such as CTParagraphStyleRef). If display this string
- in UIKit, it may lose some attribute, or even crash the app.
- */
-- (BOOL)as_canDrawWithUIKit;
-
-@end
-
-
-
-
-/**
- Set pre-defined attributes to attributed string.
- All properties defined in UIKit, CoreText and ASText are included.
- */
-@interface NSMutableAttributedString (ASText)
-
-#pragma mark - Set character attribute
-///=============================================================================
-/// @name Set character attribute
-///=============================================================================
-
-/**
- Sets the attributes to the entire text string.
- 
- @discussion The old attributes will be removed.
- 
- @param attributes  A dictionary containing the attributes to set, or nil to remove all attributes.
- */
-- (void)as_setAttributes:(nullable NSDictionary<NSString *, id> *)attributes;
-- (void)setAs_attributes:(nullable NSDictionary<NSString *, id> *)attributes;
-
-/**
- Sets an attribute with the given name and value to the entire text string.
- 
- @param name   A string specifying the attribute name.
- @param value  The attribute value associated with name. Pass `nil` or `NSNull` to
- remove the attribute.
- */
-- (void)as_setAttribute:(NSString *)name value:(nullable id)value;
-
-/**
- Sets an attribute with the given name and value to the characters in the specified range.
- 
- @param name   A string specifying the attribute name.
- @param value  The attribute value associated with name. Pass `nil` or `NSNull` to
- remove the attribute.
- @param range  The range of characters to which the specified attribute/value pair applies.
- */
-- (void)as_setAttribute:(NSString *)name value:(nullable id)value range:(NSRange)range;
-
-/**
- Removes all attributes in the specified range.
- 
- @param range  The range of characters.
- */
-- (void)as_removeAttributesInRange:(NSRange)range;
-
-
-#pragma mark - Set character attribute as property
-///=============================================================================
-/// @name Set character attribute as property
-///=============================================================================
-
-/**
- The font of the text.
- 
- @discussion Default is Helvetica (Neue) 12.
- @discussion Set this property applies to the entire text string.
- Get this property returns the first character's attribute.
- @since CoreText:3.2  UIKit:6.0  ASText:6.0
- */
-@property (nullable, nonatomic) UIFont *as_font;
-- (void)as_setFont:(nullable UIFont *)font range:(NSRange)range;
-
-/**
- A kerning adjustment.
- 
- @discussion Default is standard kerning. The kerning attribute indicate how many
- points the following character should be shifted from its default offset as
- defined by the current character's font in points; a positive kern indicates a
- shift farther along and a negative kern indicates a shift closer to the current
- character. If this attribute is not present, standard kerning will be used.
- If this attribute is set to 0.0, no kerning will be done at all.
- @discussion Set this property applies to the entire text string.
- Get this property returns the first character's attribute.
- @since CoreText:3.2  UIKit:6.0  ASText:6.0
- */
-@property (nullable, nonatomic) NSNumber *as_kern;
-- (void)as_setKern:(nullable NSNumber *)kern range:(NSRange)range;
-
-/**
- The foreground color.
- 
- @discussion Default is Black.
- @discussion Set this property applies to the entire text string.
- Get this property returns the first character's attribute.
- @since CoreText:3.2  UIKit:6.0  ASText:6.0
- */
-@property (nullable, nonatomic) UIColor *as_color;
-- (void)as_setColor:(nullable UIColor *)color range:(NSRange)range;
-
-/**
- The background color.
- 
- @discussion Default is nil (or no background).
- @discussion Set this property applies to the entire text string.
- Get this property returns the first character's attribute.
- @since UIKit:6.0
- */
-@property (nullable, nonatomic) UIColor *as_backgroundColor;
-- (void)as_setBackgroundColor:(nullable UIColor *)backgroundColor range:(NSRange)range;
-
-/**
- The stroke width.
- 
- @discussion Default value is 0.0 (no stroke). This attribute, interpreted as
- a percentage of font point size, controls the text drawing mode: positive
- values effect drawing with stroke only; negative values are for stroke and fill.
- A typical value for outlined text is 3.0.
- @discussion Set this property applies to the entire text string.
- Get this property returns the first character's attribute.
- @since CoreText:3.2  UIKit:6.0  ASText:6.0
- */
-@property (nullable, nonatomic) NSNumber *as_strokeWidth;
-- (void)as_setStrokeWidth:(nullable NSNumber *)strokeWidth range:(NSRange)range;
-
-/**
- The stroke color.
- 
- @discussion Default value is nil (same as foreground color).
- @discussion Set this property applies to the entire text string.
- Get this property returns the first character's attribute.
- @since CoreText:3.2  UIKit:6.0  ASText:6.0
- */
-@property (nullable, nonatomic) UIColor *as_strokeColor;
-- (void)as_setStrokeColor:(nullable UIColor *)strokeColor range:(NSRange)range;
-
-/**
- The text shadow.
- 
- @discussion Default value is nil (no shadow).
- @discussion Set this property applies to the entire text string.
- Get this property returns the first character's attribute.
- @since UIKit:6.0  ASText:6.0
- */
-@property (nullable, nonatomic) NSShadow *as_shadow;
-- (void)as_setShadow:(nullable NSShadow *)shadow range:(NSRange)range;
-
-/**
- The strikethrough style.
- 
- @discussion Default value is NSUnderlineStyleNone (no strikethrough).
- @discussion Set this property applies to the entire text string.
- Get this property returns the first character's attribute.
- @since UIKit:6.0
- */
-@property (nonatomic) NSUnderlineStyle as_strikethroughStyle;
-- (void)as_setStrikethroughStyle:(NSUnderlineStyle)strikethroughStyle range:(NSRange)range;
-
-/**
- The strikethrough color.
- 
- @discussion Default value is nil (same as foreground color).
- @discussion Set this property applies to the entire text string.
- Get this property returns the first character's attribute.
- @since UIKit:7.0
- */
-@property (nullable, nonatomic) UIColor *as_strikethroughColor;
-- (void)as_setStrikethroughColor:(nullable UIColor *)strikethroughColor range:(NSRange)range NS_AVAILABLE_IOS(7_0);
-
-/**
- The underline style.
- 
- @discussion Default value is NSUnderlineStyleNone (no underline).
- @discussion Set this property applies to the entire text string.
- Get this property returns the first character's attribute.
- @since CoreText:3.2  UIKit:6.0
- */
-@property (nonatomic) NSUnderlineStyle as_underlineStyle;
-- (void)as_setUnderlineStyle:(NSUnderlineStyle)underlineStyle range:(NSRange)range;
-
-/**
- The underline color.
- 
- @discussion Default value is nil (same as foreground color).
- @discussion Set this property applies to the entire text string.
- Get this property returns the first character's attribute.
- @since CoreText:3.2  UIKit:7.0
- */
-@property (nullable, nonatomic) UIColor *as_underlineColor;
-- (void)as_setUnderlineColor:(nullable UIColor *)underlineColor range:(NSRange)range;
-
-/**
- Ligature formation control.
- 
- @discussion Default is int value 1. The ligature attribute determines what kinds
- of ligatures should be used when displaying the string. A value of 0 indicates
- that only ligatures essential for proper rendering of text should be used,
- 1 indicates that standard ligatures should be used, and 2 indicates that all
- available ligatures should be used. Which ligatures are standard depends on the
- script and possibly the font.
- @discussion Set this property applies to the entire text string.
- Get this property returns the first character's attribute.
- @since CoreText:3.2  UIKit:6.0  ASText:6.0
- */
-@property (nullable, nonatomic) NSNumber *as_ligature;
-- (void)as_setLigature:(nullable NSNumber *)ligature range:(NSRange)range;
-
-/**
- The text effect.
- 
- @discussion Default is nil (no effect). The only currently supported value
- is NSTextEffectLetterpressStyle.
- @discussion Set this property applies to the entire text string.
- Get this property returns the first character's attribute.
- @since UIKit:7.0
- */
-@property (nullable, nonatomic) NSString *as_textEffect;
-- (void)as_setTextEffect:(nullable NSString *)textEffect range:(NSRange)range NS_AVAILABLE_IOS(7_0);
-
-/**
- The skew to be applied to glyphs.
- 
- @discussion Default is 0 (no skew).
- @discussion Set this property applies to the entire text string.
- Get this property returns the first character's attribute.
- @since UIKit:7.0
- */
-@property (nullable, nonatomic) NSNumber *as_obliqueness;
-- (void)as_setObliqueness:(nullable NSNumber *)obliqueness range:(NSRange)range NS_AVAILABLE_IOS(7_0);
-
-/**
- The log of the expansion factor to be applied to glyphs.
- 
- @discussion Default is 0 (no expansion).
- @discussion Set this property applies to the entire text string.
- Get this property returns the first character's attribute.
- @since UIKit:7.0
- */
-@property (nullable, nonatomic) NSNumber *as_expansion;
-- (void)as_setExpansion:(nullable NSNumber *)expansion range:(NSRange)range NS_AVAILABLE_IOS(7_0);
-
-/**
- The character's offset from the baseline, in points.
- 
- @discussion Default is 0.
- @discussion Set this property applies to the entire text string.
- Get this property returns the first character's attribute.
- @since UIKit:7.0
- */
-@property (nullable, nonatomic) NSNumber *as_baselineOffset;
-- (void)as_setBaselineOffset:(nullable NSNumber *)baselineOffset range:(NSRange)range NS_AVAILABLE_IOS(7_0);
-
-/**
- Glyph orientation control.
- 
- @discussion Default is NO. A value of NO indicates that horizontal glyph forms
- are to be used, YES indicates that vertical glyph forms are to be used.
- @discussion Set this property applies to the entire text string.
- Get this property returns the first character's attribute.
- @since CoreText:4.3  ASText:6.0
- */
-@property (nonatomic) BOOL as_verticalGlyphForm;
-- (void)as_setVerticalGlyphForm:(BOOL)verticalGlyphForm range:(NSRange)range;
-
-/**
- Specifies text language.
- 
- @discussion Value must be a NSString containing a locale identifier. Default is
- unset. When this attribute is set to a valid identifier, it will be used to select
- localized glyphs (if supported by the font) and locale-specific line breaking rules.
- @discussion Set this property applies to the entire text string.
- Get this property returns the first character's attribute.
- @since CoreText:7.0  ASText:7.0
- */
-@property (nullable, nonatomic) NSString *as_language;
-- (void)as_setLanguage:(nullable NSString *)language range:(NSRange)range NS_AVAILABLE_IOS(7_0);
-
-/**
- Specifies a bidirectional override or embedding.
- 
- @discussion See alse NSWritingDirection and NSWritingDirectionAttributeName.
- @discussion Set this property applies to the entire text string.
- Get this property returns the first character's attribute.
- @since CoreText:6.0  UIKit:7.0  ASText:6.0
- */
-@property (nullable, nonatomic) NSArray<NSNumber *> *as_writingDirection;
-- (void)as_setWritingDirection:(nullable NSArray<NSNumber *> *)writingDirection range:(NSRange)range;
-
-/**
- An NSParagraphStyle object which is used to specify things like
- line alignment, tab rulers, writing direction, etc.
- 
- @discussion Default is nil ([NSParagraphStyle defaultParagraphStyle]).
- @discussion Set this property applies to the entire text string.
- Get this property returns the first character's attribute.
- @since CoreText:6.0  UIKit:6.0  ASText:6.0
- */
-@property (nullable, nonatomic) NSParagraphStyle *as_paragraphStyle;
-- (void)as_setParagraphStyle:(nullable NSParagraphStyle *)paragraphStyle range:(NSRange)range;
-
-
-#pragma mark - Set paragraph attribute as property
-///=============================================================================
-/// @name Set paragraph attribute as property
-///=============================================================================
-
-/**
- The text alignment (A wrapper for NSParagraphStyle).
- 
- @discussion Natural text alignment is realized as left or right alignment
- depending on the line sweep direction of the first script contained in the paragraph.
- @discussion Default is NSTextAlignmentNatural.
- @discussion Set this property applies to the entire text string.
- Get this property returns the first character's attribute.
- @since CoreText:6.0  UIKit:6.0  ASText:6.0
- */
-@property (nonatomic) NSTextAlignment as_alignment;
-- (void)as_setAlignment:(NSTextAlignment)alignment range:(NSRange)range;
-
-/**
- The mode that should be used to break lines (A wrapper for NSParagraphStyle).
- 
- @discussion This property contains the line break mode to be used laying out the paragraph's text.
- @discussion Default is NSLineBreakByWordWrapping.
- @discussion Set this property applies to the entire text string.
- Get this property returns the first character's attribute.
- @since CoreText:6.0  UIKit:6.0  ASText:6.0
- */
-@property (nonatomic) NSLineBreakMode as_lineBreakMode;
-- (void)as_setLineBreakMode:(NSLineBreakMode)lineBreakMode range:(NSRange)range;
-
-/**
- The distance in points between the bottom of one line fragment and the top of the next.
- (A wrapper for NSParagraphStyle)
- 
- @discussion This value is always nonnegative. This value is included in the line
- fragment heights in the layout manager.
- @discussion Default is 0.
- @discussion Set this property applies to the entire text string.
- Get this property returns the first character's attribute.
- @since CoreText:6.0  UIKit:6.0  ASText:6.0
- */
-@property (nonatomic) CGFloat as_lineSpacing;
-- (void)as_setLineSpacing:(CGFloat)lineSpacing range:(NSRange)range;
-
-/**
- The space after the end of the paragraph (A wrapper for NSParagraphStyle).
- 
- @discussion This property contains the space (measured in points) added at the
- end of the paragraph to separate it from the following paragraph. This value must
- be nonnegative. The space between paragraphs is determined by adding the previous
- paragraph's paragraphSpacing and the current paragraph's paragraphSpacingBefore.
- @discussion Default is 0.
- @discussion Set this property applies to the entire text string.
- Get this property returns the first character's attribute.
- @since CoreText:6.0  UIKit:6.0  ASText:6.0
- */
-@property (nonatomic) CGFloat as_paragraphSpacing;
-- (void)as_setParagraphSpacing:(CGFloat)paragraphSpacing range:(NSRange)range;
-
-/**
- The distance between the paragraph's top and the beginning of its text content.
- (A wrapper for NSParagraphStyle).
- 
- @discussion This property contains the space (measured in points) between the
- paragraph's top and the beginning of its text content.
- @discussion Default is 0.
- @discussion Set this property applies to the entire text string.
- Get this property returns the first character's attribute.
- @since CoreText:6.0  UIKit:6.0  ASText:6.0
- */
-@property (nonatomic) CGFloat as_paragraphSpacingBefore;
-- (void)as_setParagraphSpacingBefore:(CGFloat)paragraphSpacingBefore range:(NSRange)range;
-
-/**
- The indentation of the first line (A wrapper for NSParagraphStyle).
- 
- @discussion This property contains the distance (in points) from the leading margin
- of a text container to the beginning of the paragraph's first line. This value
- is always nonnegative.
- @discussion Default is 0.
- @discussion Set this property applies to the entire text string.
- Get this property returns the first character's attribute.
- @since CoreText:6.0  UIKit:6.0  ASText:6.0
- */
-@property (nonatomic) CGFloat as_firstLineHeadIndent;
-- (void)as_setFirstLineHeadIndent:(CGFloat)firstLineHeadIndent range:(NSRange)range;
-
-/**
- The indentation of the receiver's lines other than the first. (A wrapper for NSParagraphStyle).
- 
- @discussion This property contains the distance (in points) from the leading margin
- of a text container to the beginning of lines other than the first. This value is
- always nonnegative.
- @discussion Default is 0.
- @discussion Set this property applies to the entire text string.
- Get this property returns the first character's attribute.
- @since CoreText:6.0  UIKit:6.0  ASText:6.0
- */
-@property (nonatomic) CGFloat as_headIndent;
-- (void)as_setHeadIndent:(CGFloat)headIndent range:(NSRange)range;
-
-/**
- The trailing indentation (A wrapper for NSParagraphStyle).
- 
- @discussion If positive, this value is the distance from the leading margin
- (for example, the left margin in left-to-right text). If 0 or negative, it's the
- distance from the trailing margin.
- @discussion Default is 0.
- @discussion Set this property applies to the entire text string.
- Get this property returns the first character's attribute.
- @since CoreText:6.0  UIKit:6.0  ASText:6.0
- */
-@property (nonatomic) CGFloat as_tailIndent;
-- (void)as_setTailIndent:(CGFloat)tailIndent range:(NSRange)range;
-
-/**
- The receiver's minimum height (A wrapper for NSParagraphStyle).
- 
- @discussion This property contains the minimum height in points that any line in
- the receiver will occupy, regardless of the font size or size of any attached graphic.
- This value must be nonnegative.
- @discussion Default is 0.
- @discussion Set this property applies to the entire text string.
- Get this property returns the first character's attribute.
- @since CoreText:6.0  UIKit:6.0  ASText:6.0
- */
-@property (nonatomic) CGFloat as_minimumLineHeight;
-- (void)as_setMinimumLineHeight:(CGFloat)minimumLineHeight range:(NSRange)range;
-
-/**
- The receiver's maximum line height (A wrapper for NSParagraphStyle).
- 
- @discussion This property contains the maximum height in points that any line in
- the receiver will occupy, regardless of the font size or size of any attached graphic.
- This value is always nonnegative. Glyphs and graphics exceeding this height will
- overlap neighboring lines; however, a maximum height of 0 implies no line height limit.
- Although this limit applies to the line itself, line spacing adds extra space between adjacent lines.
- @discussion Default is 0 (no limit).
- @discussion Set this property applies to the entire text string.
- Get this property returns the first character's attribute.
- @since CoreText:6.0  UIKit:6.0  ASText:6.0
- */
-@property (nonatomic) CGFloat as_maximumLineHeight;
-- (void)as_setMaximumLineHeight:(CGFloat)maximumLineHeight range:(NSRange)range;
-
-/**
- The line height multiple (A wrapper for NSParagraphStyle).
- 
- @discussion This property contains the line break mode to be used laying out the paragraph's text.
- @discussion Default is 0 (no multiple).
- @discussion Set this property applies to the entire text string.
- Get this property returns the first character's attribute.
- @since CoreText:6.0  UIKit:6.0  ASText:6.0
- */
-@property (nonatomic) CGFloat as_lineHeightMultiple;
-- (void)as_setLineHeightMultiple:(CGFloat)lineHeightMultiple range:(NSRange)range;
-
-/**
- The base writing direction (A wrapper for NSParagraphStyle).
- 
- @discussion If you specify NSWritingDirectionNaturalDirection, the receiver resolves
- the writing direction to either NSWritingDirectionLeftToRight or NSWritingDirectionRightToLeft,
- depending on the direction for the user's `language` preference setting.
- @discussion Default is NSWritingDirectionNatural.
- @discussion Set this property applies to the entire text string.
- Get this property returns the first character's attribute.
- @since CoreText:6.0  UIKit:6.0  ASText:6.0
- */
-@property (nonatomic) NSWritingDirection as_baseWritingDirection;
-- (void)as_setBaseWritingDirection:(NSWritingDirection)baseWritingDirection range:(NSRange)range;
-
-/**
- The paragraph's threshold for hyphenation. (A wrapper for NSParagraphStyle).
- 
- @discussion Valid values lie between 0.0 and 1.0 inclusive. Hyphenation is attempted
- when the ratio of the text width (as broken without hyphenation) to the width of the
- line fragment is less than the hyphenation factor. When the paragraph's hyphenation
- factor is 0.0, the layout manager's hyphenation factor is used instead. When both
- are 0.0, hyphenation is disabled.
- @discussion Default is 0.
- @discussion Set this property applies to the entire text string.
- Get this property returns the first character's attribute.
- @since UIKit:6.0
- */
-@property (nonatomic) float as_hyphenationFactor;
-- (void)as_setHyphenationFactor:(float)hyphenationFactor range:(NSRange)range;
-
-/**
- The document-wide default tab interval (A wrapper for NSParagraphStyle).
- 
- @discussion This property represents the default tab interval in points. Tabs after the
- last specified in tabStops are placed at integer multiples of this distance (if positive).
- @discussion Default is 0.
- @discussion Set this property applies to the entire text string.
- Get this property returns the first character's attribute.
- @since CoreText:7.0  UIKit:7.0  ASText:7.0
- */
-@property (nonatomic) CGFloat as_defaultTabInterval;
-- (void)as_setDefaultTabInterval:(CGFloat)defaultTabInterval range:(NSRange)range NS_AVAILABLE_IOS(7_0);
-
-/**
- An array of NSTextTab objects representing the receiver's tab stops.
- (A wrapper for NSParagraphStyle).
- 
- @discussion The NSTextTab objects, sorted by location, define the tab stops for
- the paragraph style.
- @discussion Default is 12 TabStops with 28.0 tab interval.
- @discussion Set this property applies to the entire text string.
- Get this property returns the first character's attribute.
- @since CoreText:7.0  UIKit:7.0  ASText:7.0
- */
-@property (nullable, nonatomic, copy) NSArray<NSTextTab *> *as_tabStops;
-- (void)as_setTabStops:(nullable NSArray<NSTextTab *> *)tabStops range:(NSRange)range NS_AVAILABLE_IOS(7_0);
-
-#pragma mark - Set ASText attribute as property
-///=============================================================================
-/// @name Set ASText attribute as property
-///=============================================================================
-
-/**
- The text shadow.
- 
- @discussion Default value is nil (no shadow).
- @discussion Set this property applies to the entire text string.
- Get this property returns the first character's attribute.
- @since ASText:6.0
- */
-@property (nullable, nonatomic) ASTextShadow *as_textShadow;
-- (void)as_setTextShadow:(nullable ASTextShadow *)textShadow range:(NSRange)range;
-
-/**
- The text inner shadow.
- 
- @discussion Default value is nil (no shadow).
- @discussion Set this property applies to the entire text string.
- Get this property returns the first character's attribute.
- @since ASText:6.0
- */
-@property (nullable, nonatomic) ASTextShadow *as_textInnerShadow;
-- (void)as_setTextInnerShadow:(nullable ASTextShadow *)textInnerShadow range:(NSRange)range;
-
-/**
- The text underline.
- 
- @discussion Default value is nil (no underline).
- @discussion Set this property applies to the entire text string.
- Get this property returns the first character's attribute.
- @since ASText:6.0
- */
-@property (nullable, nonatomic) ASTextDecoration *as_textUnderline;
-- (void)as_setTextUnderline:(nullable ASTextDecoration *)textUnderline range:(NSRange)range;
-
-/**
- The text strikethrough.
- 
- @discussion Default value is nil (no strikethrough).
- @discussion Set this property applies to the entire text string.
- Get this property returns the first character's attribute.
- @since ASText:6.0
- */
-@property (nullable, nonatomic) ASTextDecoration *as_textStrikethrough;
-- (void)as_setTextStrikethrough:(nullable ASTextDecoration *)textStrikethrough range:(NSRange)range;
-
-/**
- The text border.
- 
- @discussion Default value is nil (no border).
- @discussion Set this property applies to the entire text string.
- Get this property returns the first character's attribute.
- @since ASText:6.0
- */
-@property (nullable, nonatomic) ASTextBorder *as_textBorder;
-- (void)as_setTextBorder:(nullable ASTextBorder *)textBorder range:(NSRange)range;
-
-/**
- The text background border.
- 
- @discussion Default value is nil (no background border).
- @discussion Set this property applies to the entire text string.
- Get this property returns the first character's attribute.
- @since ASText:6.0
- */
-@property (nullable, nonatomic) ASTextBorder *as_textBackgroundBorder;
-- (void)as_setTextBackgroundBorder:(nullable ASTextBorder *)textBackgroundBorder range:(NSRange)range;
-
-/**
- The glyph transform.
- 
- @discussion Default value is CGAffineTransformIdentity (no transform).
- @discussion Set this property applies to the entire text string.
- Get this property returns the first character's attribute.
- @since ASText:6.0
- */
-@property (nonatomic) CGAffineTransform as_textGlyphTransform;
-- (void)as_setTextGlyphTransform:(CGAffineTransform)textGlyphTransform range:(NSRange)range;
-
-
-#pragma mark - Set discontinuous attribute for range
-///=============================================================================
-/// @name Set discontinuous attribute for range
-///=============================================================================
-
-- (void)as_setSuperscript:(nullable NSNumber *)superscript range:(NSRange)range;
-- (void)as_setGlyphInfo:(nullable CTGlyphInfoRef)glyphInfo range:(NSRange)range;
-- (void)as_setCharacterShape:(nullable NSNumber *)characterShape range:(NSRange)range __TVOS_PROHIBITED;
-- (void)as_setRunDelegate:(nullable CTRunDelegateRef)runDelegate range:(NSRange)range;
-- (void)as_setBaselineClass:(nullable CFStringRef)baselineClass range:(NSRange)range;
-- (void)as_setBaselineInfo:(nullable CFDictionaryRef)baselineInfo range:(NSRange)range;
-- (void)as_setBaselineReferenceInfo:(nullable CFDictionaryRef)referenceInfo range:(NSRange)range;
-- (void)as_setRubyAnnotation:(nullable CTRubyAnnotationRef)ruby range:(NSRange)range NS_AVAILABLE_IOS(8_0);
-- (void)as_setAttachment:(nullable NSTextAttachment *)attachment range:(NSRange)range NS_AVAILABLE_IOS(7_0);
-- (void)as_setLink:(nullable id)link range:(NSRange)range NS_AVAILABLE_IOS(7_0);
-- (void)as_setTextBackedString:(nullable ASTextBackedString *)textBackedString range:(NSRange)range;
-- (void)as_setTextBinding:(nullable ASTextBinding *)textBinding range:(NSRange)range;
-- (void)as_setTextAttachment:(nullable ASTextAttachment *)textAttachment range:(NSRange)range;
-- (void)as_setTextHighlight:(nullable ASTextHighlight *)textHighlight range:(NSRange)range;
-- (void)as_setTextBlockBorder:(nullable ASTextBorder *)textBlockBorder range:(NSRange)range;
-
-
-#pragma mark - Convenience methods for text highlight
-///=============================================================================
-/// @name Convenience methods for text highlight
-///=============================================================================
-
-/**
- Convenience method to set text highlight
- 
- @param range           text range
- @param color           text color (pass nil to ignore)
- @param backgroundColor text background color when highlight
- @param userInfo        user information dictionary (pass nil to ignore)
- @param tapAction       tap action when user tap the highlight (pass nil to ignore)
- @param longPressAction long press action when user long press the highlight (pass nil to ignore)
- */
-- (void)as_setTextHighlightRange:(NSRange)range
-                           color:(nullable UIColor *)color
-                 backgroundColor:(nullable UIColor *)backgroundColor
-                        userInfo:(nullable NSDictionary *)userInfo
-                       tapAction:(nullable ASTextAction)tapAction
-                 longPressAction:(nullable ASTextAction)longPressAction;
-
-/**
- Convenience method to set text highlight
- 
- @param range           text range
- @param color           text color (pass nil to ignore)
- @param backgroundColor text background color when highlight
- @param tapAction       tap action when user tap the highlight (pass nil to ignore)
- */
-- (void)as_setTextHighlightRange:(NSRange)range
-                           color:(nullable UIColor *)color
-                 backgroundColor:(nullable UIColor *)backgroundColor
-                       tapAction:(nullable ASTextAction)tapAction;
-
-/**
- Convenience method to set text highlight
- 
- @param range           text range
- @param color           text color (pass nil to ignore)
- @param backgroundColor text background color when highlight
- @param userInfo        tap action when user tap the highlight (pass nil to ignore)
- */
-- (void)as_setTextHighlightRange:(NSRange)range
-                           color:(nullable UIColor *)color
-                 backgroundColor:(nullable UIColor *)backgroundColor
-                        userInfo:(nullable NSDictionary *)userInfo;
-
-#pragma mark - Utilities
-///=============================================================================
-/// @name Utilities
-///=============================================================================
-
-/**
- Inserts into the receiver the characters of a given string at a given location.
- The new string inherit the attributes of the first replaced character from location.
- 
- @param string  The string to insert into the receiver, must not be nil.
- @param location The location at which string is inserted. The location must not
- exceed the bounds of the receiver.
- @throw Raises an NSRangeException if the location out of bounds.
- */
-- (void)as_insertString:(NSString *)string atIndex:(NSUInteger)location;
-
-/**
- Adds to the end of the receiver the characters of a given string.
- The new string inherit the attributes of the receiver's tail.
- 
- @param string  The string to append to the receiver, must not be nil.
- */
-- (void)as_appendString:(NSString *)string;
-
-/**
- Removes all discontinuous attributes in a specified range.
- See `allDiscontinuousAttributeKeys`.
- 
- @param range A text range.
- */
-- (void)as_removeDiscontinuousAttributesInRange:(NSRange)range;
-
-/**
- Returns all discontinuous attribute keys, such as RunDelegate/Attachment/Ruby.
- 
- @discussion These attributes can only set to a specified range of text, and
- should not extend to other range when editing text.
- */
-+ (NSArray<NSString *> *)as_allDiscontinuousAttributeKeys;
-
-@end
-
-NS_ASSUME_NONNULL_END
diff --git a/submodules/AsyncDisplayKit/Source/Private/TextExperiment/Utility/NSAttributedString+ASText.mm b/submodules/AsyncDisplayKit/Source/Private/TextExperiment/Utility/NSAttributedString+ASText.mm
deleted file mode 100644
index 39f628151c..0000000000
--- a/submodules/AsyncDisplayKit/Source/Private/TextExperiment/Utility/NSAttributedString+ASText.mm
+++ /dev/null
@@ -1,1208 +0,0 @@
-//
-//  NSAttributedString+ASText.mm
-//  Texture
-//
-//  Copyright (c) Pinterest, Inc.  All rights reserved.
-//  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
-//
-
-#import <AsyncDisplayKit/NSAttributedString+ASText.h>
-#import <AsyncDisplayKit/NSParagraphStyle+ASText.h>
-#import <AsyncDisplayKit/ASTextRunDelegate.h>
-#import <AsyncDisplayKit/ASTextUtilities.h>
-#import <CoreFoundation/CoreFoundation.h>
-
-
-// Dummy class for category
-@interface NSAttributedString_ASText : NSObject @end
-@implementation NSAttributedString_ASText @end
-
-
-@implementation NSAttributedString (ASText)
-
-- (NSDictionary *)as_attributesAtIndex:(NSUInteger)index {
-  if (index > self.length || self.length == 0) return nil;
-  if (self.length > 0 && index == self.length) index--;
-  return [self attributesAtIndex:index effectiveRange:NULL];
-}
-
-- (id)as_attribute:(NSString *)attributeName atIndex:(NSUInteger)index {
-  if (!attributeName) return nil;
-  if (index > self.length || self.length == 0) return nil;
-  if (self.length > 0 && index == self.length) index--;
-  return [self attribute:attributeName atIndex:index effectiveRange:NULL];
-}
-
-- (NSDictionary *)as_attributes {
-  return [self as_attributesAtIndex:0];
-}
-
-- (UIFont *)as_font {
-  return [self as_fontAtIndex:0];
-}
-
-- (UIFont *)as_fontAtIndex:(NSUInteger)index {
-  return [self as_attribute:NSFontAttributeName atIndex:index];
-}
-
-- (NSNumber *)as_kern {
-  return [self as_kernAtIndex:0];
-}
-
-- (NSNumber *)as_kernAtIndex:(NSUInteger)index {
-  return [self as_attribute:NSKernAttributeName atIndex:index];
-}
-
-- (UIColor *)as_color {
-  return [self as_colorAtIndex:0];
-}
-
-- (UIColor *)as_colorAtIndex:(NSUInteger)index {
-  UIColor *color = [self as_attribute:NSForegroundColorAttributeName atIndex:index];
-  if (!color) {
-    CGColorRef ref = (__bridge CGColorRef)([self as_attribute:(NSString *)kCTForegroundColorAttributeName atIndex:index]);
-    color = [UIColor colorWithCGColor:ref];
-  }
-  if (color && ![color isKindOfClass:[UIColor class]]) {
-    if (CFGetTypeID((__bridge CFTypeRef)(color)) == CGColorGetTypeID()) {
-      color = [UIColor colorWithCGColor:(__bridge CGColorRef)(color)];
-    } else {
-      color = nil;
-    }
-  }
-  return color;
-}
-
-- (UIColor *)as_backgroundColor {
-  return [self as_backgroundColorAtIndex:0];
-}
-
-- (UIColor *)as_backgroundColorAtIndex:(NSUInteger)index {
-  return [self as_attribute:NSBackgroundColorAttributeName atIndex:index];
-}
-
-- (NSNumber *)as_strokeWidth {
-  return [self as_strokeWidthAtIndex:0];
-}
-
-- (NSNumber *)as_strokeWidthAtIndex:(NSUInteger)index {
-  return [self as_attribute:NSStrokeWidthAttributeName atIndex:index];
-}
-
-- (UIColor *)as_strokeColor {
-  return [self as_strokeColorAtIndex:0];
-}
-
-- (UIColor *)as_strokeColorAtIndex:(NSUInteger)index {
-  UIColor *color = [self as_attribute:NSStrokeColorAttributeName atIndex:index];
-  if (!color) {
-    CGColorRef ref = (__bridge CGColorRef)([self as_attribute:(NSString *)kCTStrokeColorAttributeName atIndex:index]);
-    color = [UIColor colorWithCGColor:ref];
-  }
-  return color;
-}
-
-- (NSShadow *)as_shadow {
-  return [self as_shadowAtIndex:0];
-}
-
-- (NSShadow *)as_shadowAtIndex:(NSUInteger)index {
-  return [self as_attribute:NSShadowAttributeName atIndex:index];
-}
-
-- (NSUnderlineStyle)as_strikethroughStyle {
-  return [self as_strikethroughStyleAtIndex:0];
-}
-
-- (NSUnderlineStyle)as_strikethroughStyleAtIndex:(NSUInteger)index {
-  NSNumber *style = [self as_attribute:NSStrikethroughStyleAttributeName atIndex:index];
-  return (NSUnderlineStyle)style.integerValue;
-}
-
-- (UIColor *)as_strikethroughColor {
-  return [self as_strikethroughColorAtIndex:0];
-}
-
-- (UIColor *)as_strikethroughColorAtIndex:(NSUInteger)index {
-  return [self as_attribute:NSStrikethroughColorAttributeName atIndex:index];
-}
-
-- (NSUnderlineStyle)as_underlineStyle {
-  return [self as_underlineStyleAtIndex:0];
-}
-
-- (NSUnderlineStyle)as_underlineStyleAtIndex:(NSUInteger)index {
-  NSNumber *style = [self as_attribute:NSUnderlineStyleAttributeName atIndex:index];
-  return (NSUnderlineStyle)style.integerValue;
-}
-
-- (UIColor *)as_underlineColor {
-  return [self as_underlineColorAtIndex:0];
-}
-
-- (UIColor *)as_underlineColorAtIndex:(NSUInteger)index {
-  UIColor *color = [self as_attribute:NSUnderlineColorAttributeName atIndex:index];
-  if (!color) {
-    CGColorRef ref = (__bridge CGColorRef)([self as_attribute:(NSString *)kCTUnderlineColorAttributeName atIndex:index]);
-    color = [UIColor colorWithCGColor:ref];
-  }
-  return color;
-}
-
-- (NSNumber *)as_ligature {
-  return [self as_ligatureAtIndex:0];
-}
-
-- (NSNumber *)as_ligatureAtIndex:(NSUInteger)index {
-  return [self as_attribute:NSLigatureAttributeName atIndex:index];
-}
-
-- (NSString *)as_textEffect {
-  return [self as_textEffectAtIndex:0];
-}
-
-- (NSString *)as_textEffectAtIndex:(NSUInteger)index {
-  return [self as_attribute:NSTextEffectAttributeName atIndex:index];
-}
-
-- (NSNumber *)as_obliqueness {
-  return [self as_obliquenessAtIndex:0];
-}
-
-- (NSNumber *)as_obliquenessAtIndex:(NSUInteger)index {
-  return [self as_attribute:NSObliquenessAttributeName atIndex:index];
-}
-
-- (NSNumber *)as_expansion {
-  return [self as_expansionAtIndex:0];
-}
-
-- (NSNumber *)as_expansionAtIndex:(NSUInteger)index {
-  return [self as_attribute:NSExpansionAttributeName atIndex:index];
-}
-
-- (NSNumber *)as_baselineOffset {
-  return [self as_baselineOffsetAtIndex:0];
-}
-
-- (NSNumber *)as_baselineOffsetAtIndex:(NSUInteger)index {
-  return [self as_attribute:NSBaselineOffsetAttributeName atIndex:index];
-}
-
-- (BOOL)as_verticalGlyphForm {
-  return [self as_verticalGlyphFormAtIndex:0];
-}
-
-- (BOOL)as_verticalGlyphFormAtIndex:(NSUInteger)index {
-  NSNumber *num = [self as_attribute:NSVerticalGlyphFormAttributeName atIndex:index];
-  return num.boolValue;
-}
-
-- (NSString *)as_language {
-  return [self as_languageAtIndex:0];
-}
-
-- (NSString *)as_languageAtIndex:(NSUInteger)index {
-  return [self as_attribute:(id)kCTLanguageAttributeName atIndex:index];
-}
-
-- (NSArray *)as_writingDirection {
-  return [self as_writingDirectionAtIndex:0];
-}
-
-- (NSArray *)as_writingDirectionAtIndex:(NSUInteger)index {
-  return [self as_attribute:(id)kCTWritingDirectionAttributeName atIndex:index];
-}
-
-- (NSParagraphStyle *)as_paragraphStyle {
-  return [self as_paragraphStyleAtIndex:0];
-}
-
-- (NSParagraphStyle *)as_paragraphStyleAtIndex:(NSUInteger)index {
-  /*
-   NSParagraphStyle is NOT toll-free bridged to CTParagraphStyleRef.
-   
-   CoreText can use both NSParagraphStyle and CTParagraphStyleRef,
-   but UILabel/UITextView can only use NSParagraphStyle.
-   
-   We use NSParagraphStyle in both CoreText and UIKit.
-   */
-  NSParagraphStyle *style = [self as_attribute:NSParagraphStyleAttributeName atIndex:index];
-  if (style) {
-    if (CFGetTypeID((__bridge CFTypeRef)(style)) == CTParagraphStyleGetTypeID()) { \
-      style = [NSParagraphStyle as_styleWithCTStyle:(__bridge CTParagraphStyleRef)(style)];
-    }
-  }
-  return style;
-}
-
-#define ParagraphAttribute(_attr_) \
-NSParagraphStyle *style = self.as_paragraphStyle; \
-if (!style) style = [NSParagraphStyle defaultParagraphStyle]; \
-return style. _attr_;
-
-#define ParagraphAttributeAtIndex(_attr_) \
-NSParagraphStyle *style = [self as_paragraphStyleAtIndex:index]; \
-if (!style) style = [NSParagraphStyle defaultParagraphStyle]; \
-return style. _attr_;
-
-- (NSTextAlignment)as_alignment {
-  ParagraphAttribute(alignment);
-}
-
-- (NSLineBreakMode)as_lineBreakMode {
-  ParagraphAttribute(lineBreakMode);
-}
-
-- (CGFloat)as_lineSpacing {
-  ParagraphAttribute(lineSpacing);
-}
-
-- (CGFloat)as_paragraphSpacing {
-  ParagraphAttribute(paragraphSpacing);
-}
-
-- (CGFloat)as_paragraphSpacingBefore {
-  ParagraphAttribute(paragraphSpacingBefore);
-}
-
-- (CGFloat)as_firstLineHeadIndent {
-  ParagraphAttribute(firstLineHeadIndent);
-}
-
-- (CGFloat)as_headIndent {
-  ParagraphAttribute(headIndent);
-}
-
-- (CGFloat)as_tailIndent {
-  ParagraphAttribute(tailIndent);
-}
-
-- (CGFloat)as_minimumLineHeight {
-  ParagraphAttribute(minimumLineHeight);
-}
-
-- (CGFloat)as_maximumLineHeight {
-  ParagraphAttribute(maximumLineHeight);
-}
-
-- (CGFloat)as_lineHeightMultiple {
-  ParagraphAttribute(lineHeightMultiple);
-}
-
-- (NSWritingDirection)as_baseWritingDirection {
-  ParagraphAttribute(baseWritingDirection);
-}
-
-- (float)as_hyphenationFactor {
-  ParagraphAttribute(hyphenationFactor);
-}
-
-- (CGFloat)as_defaultTabInterval {
-  ParagraphAttribute(defaultTabInterval);
-}
-
-- (NSArray *)as_tabStops {
-  ParagraphAttribute(tabStops);
-}
-
-- (NSTextAlignment)as_alignmentAtIndex:(NSUInteger)index {
-  ParagraphAttributeAtIndex(alignment);
-}
-
-- (NSLineBreakMode)as_lineBreakModeAtIndex:(NSUInteger)index {
-  ParagraphAttributeAtIndex(lineBreakMode);
-}
-
-- (CGFloat)as_lineSpacingAtIndex:(NSUInteger)index {
-  ParagraphAttributeAtIndex(lineSpacing);
-}
-
-- (CGFloat)as_paragraphSpacingAtIndex:(NSUInteger)index {
-  ParagraphAttributeAtIndex(paragraphSpacing);
-}
-
-- (CGFloat)as_paragraphSpacingBeforeAtIndex:(NSUInteger)index {
-  ParagraphAttributeAtIndex(paragraphSpacingBefore);
-}
-
-- (CGFloat)as_firstLineHeadIndentAtIndex:(NSUInteger)index {
-  ParagraphAttributeAtIndex(firstLineHeadIndent);
-}
-
-- (CGFloat)as_headIndentAtIndex:(NSUInteger)index {
-  ParagraphAttributeAtIndex(headIndent);
-}
-
-- (CGFloat)as_tailIndentAtIndex:(NSUInteger)index {
-  ParagraphAttributeAtIndex(tailIndent);
-}
-
-- (CGFloat)as_minimumLineHeightAtIndex:(NSUInteger)index {
-  ParagraphAttributeAtIndex(minimumLineHeight);
-}
-
-- (CGFloat)as_maximumLineHeightAtIndex:(NSUInteger)index {
-  ParagraphAttributeAtIndex(maximumLineHeight);
-}
-
-- (CGFloat)as_lineHeightMultipleAtIndex:(NSUInteger)index {
-  ParagraphAttributeAtIndex(lineHeightMultiple);
-}
-
-- (NSWritingDirection)as_baseWritingDirectionAtIndex:(NSUInteger)index {
-  ParagraphAttributeAtIndex(baseWritingDirection);
-}
-
-- (float)as_hyphenationFactorAtIndex:(NSUInteger)index {
-  ParagraphAttributeAtIndex(hyphenationFactor);
-}
-
-- (CGFloat)as_defaultTabIntervalAtIndex:(NSUInteger)index {
-  ParagraphAttributeAtIndex(defaultTabInterval);
-}
-
-- (NSArray *)as_tabStopsAtIndex:(NSUInteger)index {
-  ParagraphAttributeAtIndex(tabStops);
-}
-
-#undef ParagraphAttribute
-#undef ParagraphAttributeAtIndex
-
-- (ASTextShadow *)as_textShadow {
-  return [self as_textShadowAtIndex:0];
-}
-
-- (ASTextShadow *)as_textShadowAtIndex:(NSUInteger)index {
-  return [self as_attribute:ASTextShadowAttributeName atIndex:index];
-}
-
-- (ASTextShadow *)as_textInnerShadow {
-  return [self as_textInnerShadowAtIndex:0];
-}
-
-- (ASTextShadow *)as_textInnerShadowAtIndex:(NSUInteger)index {
-  return [self as_attribute:ASTextInnerShadowAttributeName atIndex:index];
-}
-
-- (ASTextDecoration *)as_textUnderline {
-  return [self as_textUnderlineAtIndex:0];
-}
-
-- (ASTextDecoration *)as_textUnderlineAtIndex:(NSUInteger)index {
-  return [self as_attribute:ASTextUnderlineAttributeName atIndex:index];
-}
-
-- (ASTextDecoration *)as_textStrikethrough {
-  return [self as_textStrikethroughAtIndex:0];
-}
-
-- (ASTextDecoration *)as_textStrikethroughAtIndex:(NSUInteger)index {
-  return [self as_attribute:ASTextStrikethroughAttributeName atIndex:index];
-}
-
-- (ASTextBorder *)as_textBorder {
-  return [self as_textBorderAtIndex:0];
-}
-
-- (ASTextBorder *)as_textBorderAtIndex:(NSUInteger)index {
-  return [self as_attribute:ASTextBorderAttributeName atIndex:index];
-}
-
-- (ASTextBorder *)as_textBackgroundBorder {
-  return [self as_textBackgroundBorderAtIndex:0];
-}
-
-- (ASTextBorder *)as_textBackgroundBorderAtIndex:(NSUInteger)index {
-  return [self as_attribute:ASTextBackedStringAttributeName atIndex:index];
-}
-
-- (CGAffineTransform)as_textGlyphTransform {
-  return [self as_textGlyphTransformAtIndex:0];
-}
-
-- (CGAffineTransform)as_textGlyphTransformAtIndex:(NSUInteger)index {
-  NSValue *value = [self as_attribute:ASTextGlyphTransformAttributeName atIndex:index];
-  if (!value) return CGAffineTransformIdentity;
-  return [value CGAffineTransformValue];
-}
-
-- (NSString *)as_plainTextForRange:(NSRange)range {
-  if (range.location == NSNotFound ||range.length == NSNotFound) return nil;
-  NSMutableString *result = [NSMutableString string];
-  if (range.length == 0) return result;
-  NSString *string = self.string;
-  [self enumerateAttribute:ASTextBackedStringAttributeName inRange:range options:kNilOptions usingBlock:^(id value, NSRange range, BOOL *stop) {
-    ASTextBackedString *backed = value;
-    if (backed && backed.string) {
-      [result appendString:backed.string];
-    } else {
-      [result appendString:[string substringWithRange:range]];
-    }
-  }];
-  return result;
-}
-
-+ (NSMutableAttributedString *)as_attachmentStringWithContent:(id)content
-                                                  contentMode:(UIViewContentMode)contentMode
-                                                        width:(CGFloat)width
-                                                       ascent:(CGFloat)ascent
-                                                      descent:(CGFloat)descent {
-  NSMutableAttributedString *atr = [[NSMutableAttributedString alloc] initWithString:ASTextAttachmentToken];
-  
-  ASTextAttachment *attach = [ASTextAttachment new];
-  attach.content = content;
-  attach.contentMode = contentMode;
-  [atr as_setTextAttachment:attach range:NSMakeRange(0, atr.length)];
-  
-  ASTextRunDelegate *delegate = [ASTextRunDelegate new];
-  delegate.width = width;
-  delegate.ascent = ascent;
-  delegate.descent = descent;
-  CTRunDelegateRef delegateRef = delegate.CTRunDelegate;
-  [atr as_setRunDelegate:delegateRef range:NSMakeRange(0, atr.length)];
-  if (delegate) CFRelease(delegateRef);
-  
-  return atr;
-}
-
-+ (NSMutableAttributedString *)as_attachmentStringWithContent:(id)content
-                                                  contentMode:(UIViewContentMode)contentMode
-                                               attachmentSize:(CGSize)attachmentSize
-                                                  alignToFont:(UIFont *)font
-                                                    alignment:(ASTextVerticalAlignment)alignment {
-  NSMutableAttributedString *atr = [[NSMutableAttributedString alloc] initWithString:ASTextAttachmentToken];
-  
-  ASTextAttachment *attach = [ASTextAttachment new];
-  attach.content = content;
-  attach.contentMode = contentMode;
-  [atr as_setTextAttachment:attach range:NSMakeRange(0, atr.length)];
-  
-  ASTextRunDelegate *delegate = [ASTextRunDelegate new];
-  delegate.width = attachmentSize.width;
-  switch (alignment) {
-    case ASTextVerticalAlignmentTop: {
-      delegate.ascent = font.ascender;
-      delegate.descent = attachmentSize.height - font.ascender;
-      if (delegate.descent < 0) {
-        delegate.descent = 0;
-        delegate.ascent = attachmentSize.height;
-      }
-    } break;
-    case ASTextVerticalAlignmentCenter: {
-      CGFloat fontHeight = font.ascender - font.descender;
-      CGFloat yOffset = font.ascender - fontHeight * 0.5;
-      delegate.ascent = attachmentSize.height * 0.5 + yOffset;
-      delegate.descent = attachmentSize.height - delegate.ascent;
-      if (delegate.descent < 0) {
-        delegate.descent = 0;
-        delegate.ascent = attachmentSize.height;
-      }
-    } break;
-    case ASTextVerticalAlignmentBottom: {
-      delegate.ascent = attachmentSize.height + font.descender;
-      delegate.descent = -font.descender;
-      if (delegate.ascent < 0) {
-        delegate.ascent = 0;
-        delegate.descent = attachmentSize.height;
-      }
-    } break;
-    default: {
-      delegate.ascent = attachmentSize.height;
-      delegate.descent = 0;
-    } break;
-  }
-  
-  CTRunDelegateRef delegateRef = delegate.CTRunDelegate;
-  [atr as_setRunDelegate:delegateRef range:NSMakeRange(0, atr.length)];
-  if (delegate) CFRelease(delegateRef);
-  
-  return atr;
-}
-
-+ (NSMutableAttributedString *)as_attachmentStringWithEmojiImage:(UIImage *)image
-                                                        fontSize:(CGFloat)fontSize {
-  if (!image || fontSize <= 0) return nil;
-  
-  BOOL hasAnim = NO;
-  if (image.images.count > 1) {
-    hasAnim = YES;
-  } else if (NSProtocolFromString(@"ASAnimatedImage") &&
-             [image conformsToProtocol:NSProtocolFromString(@"ASAnimatedImage")]) {
-    NSNumber *frameCount = [image valueForKey:@"animatedImageFrameCount"];
-    if (frameCount.intValue > 1) hasAnim = YES;
-  }
-  
-  CGFloat ascent = ASTextEmojiGetAscentWithFontSize(fontSize);
-  CGFloat descent = ASTextEmojiGetDescentWithFontSize(fontSize);
-  CGRect bounding = ASTextEmojiGetGlyphBoundingRectWithFontSize(fontSize);
-  
-  ASTextRunDelegate *delegate = [ASTextRunDelegate new];
-  delegate.ascent = ascent;
-  delegate.descent = descent;
-  delegate.width = bounding.size.width + 2 * bounding.origin.x;
-  
-  ASTextAttachment *attachment = [ASTextAttachment new];
-  attachment.contentMode = UIViewContentModeScaleAspectFit;
-  attachment.contentInsets = UIEdgeInsetsMake(ascent - (bounding.size.height + bounding.origin.y), bounding.origin.x, descent + bounding.origin.y, bounding.origin.x);
-  if (hasAnim) {
-    Class imageClass = NSClassFromString(@"ASAnimatedImageView");
-    if (!imageClass) imageClass = [UIImageView class];
-    UIImageView *view = (id)[imageClass new];
-    view.frame = bounding;
-    view.image = image;
-    view.contentMode = UIViewContentModeScaleAspectFit;
-    attachment.content = view;
-  } else {
-    attachment.content = image;
-  }
-  
-  NSMutableAttributedString *atr = [[NSMutableAttributedString alloc] initWithString:ASTextAttachmentToken];
-  [atr as_setTextAttachment:attachment range:NSMakeRange(0, atr.length)];
-  CTRunDelegateRef ctDelegate = delegate.CTRunDelegate;
-  [atr as_setRunDelegate:ctDelegate range:NSMakeRange(0, atr.length)];
-  if (ctDelegate) CFRelease(ctDelegate);
-  
-  return atr;
-}
-
-- (NSRange)as_rangeOfAll {
-  return NSMakeRange(0, self.length);
-}
-
-- (BOOL)as_isSharedAttributesInAllRange {
-  __block BOOL shared = YES;
-  __block NSDictionary *firstAttrs = nil;
-  [self enumerateAttributesInRange:self.as_rangeOfAll options:NSAttributedStringEnumerationLongestEffectiveRangeNotRequired usingBlock:^(NSDictionary *attrs, NSRange range, BOOL *stop) {
-    if (range.location == 0) {
-      firstAttrs = attrs;
-    } else {
-      if (firstAttrs.count != attrs.count) {
-        shared = NO;
-        *stop = YES;
-      } else if (firstAttrs) {
-        if (![firstAttrs isEqualToDictionary:attrs]) {
-          shared = NO;
-          *stop = YES;
-        }
-      }
-    }
-  }];
-  return shared;
-}
-
-- (BOOL)as_canDrawWithUIKit {
-  static NSMutableSet *failSet;
-  static dispatch_once_t onceToken;
-  dispatch_once(&onceToken, ^{
-    failSet = [NSMutableSet new];
-    [failSet addObject:(id)kCTGlyphInfoAttributeName];
-#if TARGET_OS_IOS
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
-    [failSet addObject:(id)kCTCharacterShapeAttributeName];
-#pragma clang diagnostic pop
-#endif
-    [failSet addObject:(id)kCTLanguageAttributeName];
-    [failSet addObject:(id)kCTRunDelegateAttributeName];
-    [failSet addObject:(id)kCTBaselineClassAttributeName];
-    [failSet addObject:(id)kCTBaselineInfoAttributeName];
-    [failSet addObject:(id)kCTBaselineReferenceInfoAttributeName];
-    [failSet addObject:(id)kCTRubyAnnotationAttributeName];
-    [failSet addObject:ASTextShadowAttributeName];
-    [failSet addObject:ASTextInnerShadowAttributeName];
-    [failSet addObject:ASTextUnderlineAttributeName];
-    [failSet addObject:ASTextStrikethroughAttributeName];
-    [failSet addObject:ASTextBorderAttributeName];
-    [failSet addObject:ASTextBackgroundBorderAttributeName];
-    [failSet addObject:ASTextBlockBorderAttributeName];
-    [failSet addObject:ASTextAttachmentAttributeName];
-    [failSet addObject:ASTextHighlightAttributeName];
-    [failSet addObject:ASTextGlyphTransformAttributeName];
-  });
-  
-#define Fail { result = NO; *stop = YES; return; }
-  __block BOOL result = YES;
-  [self enumerateAttributesInRange:self.as_rangeOfAll options:NSAttributedStringEnumerationLongestEffectiveRangeNotRequired usingBlock:^(NSDictionary *attrs, NSRange range, BOOL *stop) {
-    if (attrs.count == 0) return;
-    for (NSString *str in attrs.allKeys) {
-      if ([failSet containsObject:str]) Fail;
-    }
-    if (attrs[(id)kCTForegroundColorAttributeName] && !attrs[NSForegroundColorAttributeName]) Fail;
-    if (attrs[(id)kCTStrokeColorAttributeName] && !attrs[NSStrokeColorAttributeName]) Fail;
-    if (attrs[(id)kCTUnderlineColorAttributeName]) {
-      if (!attrs[NSUnderlineColorAttributeName]) Fail;
-    }
-    NSParagraphStyle *style = attrs[NSParagraphStyleAttributeName];
-    if (style && CFGetTypeID((__bridge CFTypeRef)(style)) == CTParagraphStyleGetTypeID()) Fail;
-  }];
-  return result;
-#undef Fail
-}
-
-@end
-
-@implementation NSMutableAttributedString (ASText)
-
-- (void)as_setAttributes:(NSDictionary *)attributes {
-  [self setAs_attributes:attributes];
-}
-
-- (void)setAs_attributes:(NSDictionary *)attributes {
-  if (attributes == (id)[NSNull null]) attributes = nil;
-  [self setAttributes:@{} range:NSMakeRange(0, self.length)];
-  [attributes enumerateKeysAndObjectsUsingBlock:^(id key, id obj, BOOL *stop) {
-    [self as_setAttribute:key value:obj];
-  }];
-}
-
-- (void)as_setAttribute:(NSString *)name value:(id)value {
-  [self as_setAttribute:name value:value range:NSMakeRange(0, self.length)];
-}
-
-- (void)as_setAttribute:(NSString *)name value:(id)value range:(NSRange)range {
-  if (!name || [NSNull isEqual:name]) return;
-  if (value && ![NSNull isEqual:value]) [self addAttribute:name value:value range:range];
-  else [self removeAttribute:name range:range];
-}
-
-- (void)as_removeAttributesInRange:(NSRange)range {
-  [self setAttributes:nil range:range];
-}
-
-#pragma mark - Property Setter
-
-- (void)setAs_font:(UIFont *)font {
-  /*
-   In iOS7 and later, UIFont is toll-free bridged to CTFontRef,
-   although Apple does not mention it in documentation.
-   
-   In iOS6, UIFont is a wrapper for CTFontRef, so CoreText can alse use UIfont,
-   but UILabel/UITextView cannot use CTFontRef.
-   
-   We use UIFont for both CoreText and UIKit.
-   */
-  [self as_setFont:font range:NSMakeRange(0, self.length)];
-}
-
-- (void)setAs_kern:(NSNumber *)kern {
-  [self as_setKern:kern range:NSMakeRange(0, self.length)];
-}
-
-- (void)setAs_color:(UIColor *)color {
-  [self as_setColor:color range:NSMakeRange(0, self.length)];
-}
-
-- (void)setAs_backgroundColor:(UIColor *)backgroundColor {
-  [self as_setBackgroundColor:backgroundColor range:NSMakeRange(0, self.length)];
-}
-
-- (void)setAs_strokeWidth:(NSNumber *)strokeWidth {
-  [self as_setStrokeWidth:strokeWidth range:NSMakeRange(0, self.length)];
-}
-
-- (void)setAs_strokeColor:(UIColor *)strokeColor {
-  [self as_setStrokeColor:strokeColor range:NSMakeRange(0, self.length)];
-}
-
-- (void)setAs_shadow:(NSShadow *)shadow {
-  [self as_setShadow:shadow range:NSMakeRange(0, self.length)];
-}
-
-- (void)setAs_strikethroughStyle:(NSUnderlineStyle)strikethroughStyle {
-  [self as_setStrikethroughStyle:strikethroughStyle range:NSMakeRange(0, self.length)];
-}
-
-- (void)setAs_strikethroughColor:(UIColor *)strikethroughColor {
-  [self as_setStrikethroughColor:strikethroughColor range:NSMakeRange(0, self.length)];
-}
-
-- (void)setAs_underlineStyle:(NSUnderlineStyle)underlineStyle {
-  [self as_setUnderlineStyle:underlineStyle range:NSMakeRange(0, self.length)];
-}
-
-- (void)setAs_underlineColor:(UIColor *)underlineColor {
-  [self as_setUnderlineColor:underlineColor range:NSMakeRange(0, self.length)];
-}
-
-- (void)setAs_ligature:(NSNumber *)ligature {
-  [self as_setLigature:ligature range:NSMakeRange(0, self.length)];
-}
-
-- (void)setAs_textEffect:(NSString *)textEffect {
-  [self as_setTextEffect:textEffect range:NSMakeRange(0, self.length)];
-}
-
-- (void)setAs_obliqueness:(NSNumber *)obliqueness {
-  [self as_setObliqueness:obliqueness range:NSMakeRange(0, self.length)];
-}
-
-- (void)setAs_expansion:(NSNumber *)expansion {
-  [self as_setExpansion:expansion range:NSMakeRange(0, self.length)];
-}
-
-- (void)setAs_baselineOffset:(NSNumber *)baselineOffset {
-  [self as_setBaselineOffset:baselineOffset range:NSMakeRange(0, self.length)];
-}
-
-- (void)setAs_verticalGlyphForm:(BOOL)verticalGlyphForm {
-  [self as_setVerticalGlyphForm:verticalGlyphForm range:NSMakeRange(0, self.length)];
-}
-
-- (void)setAs_language:(NSString *)language {
-  [self as_setLanguage:language range:NSMakeRange(0, self.length)];
-}
-
-- (void)setAs_writingDirection:(NSArray *)writingDirection {
-  [self as_setWritingDirection:writingDirection range:NSMakeRange(0, self.length)];
-}
-
-- (void)setAs_paragraphStyle:(NSParagraphStyle *)paragraphStyle {
-  /*
-   NSParagraphStyle is NOT toll-free bridged to CTParagraphStyleRef.
-   
-   CoreText can use both NSParagraphStyle and CTParagraphStyleRef,
-   but UILabel/UITextView can only use NSParagraphStyle.
-   
-   We use NSParagraphStyle in both CoreText and UIKit.
-   */
-  [self as_setParagraphStyle:paragraphStyle range:NSMakeRange(0, self.length)];
-}
-
-- (void)setAs_alignment:(NSTextAlignment)alignment {
-  [self as_setAlignment:alignment range:NSMakeRange(0, self.length)];
-}
-
-- (void)setAs_baseWritingDirection:(NSWritingDirection)baseWritingDirection {
-  [self as_setBaseWritingDirection:baseWritingDirection range:NSMakeRange(0, self.length)];
-}
-
-- (void)setAs_lineSpacing:(CGFloat)lineSpacing {
-  [self as_setLineSpacing:lineSpacing range:NSMakeRange(0, self.length)];
-}
-
-- (void)setAs_paragraphSpacing:(CGFloat)paragraphSpacing {
-  [self as_setParagraphSpacing:paragraphSpacing range:NSMakeRange(0, self.length)];
-}
-
-- (void)setAs_paragraphSpacingBefore:(CGFloat)paragraphSpacingBefore {
-  [self as_setParagraphSpacing:paragraphSpacingBefore range:NSMakeRange(0, self.length)];
-}
-
-- (void)setAs_firstLineHeadIndent:(CGFloat)firstLineHeadIndent {
-  [self as_setFirstLineHeadIndent:firstLineHeadIndent range:NSMakeRange(0, self.length)];
-}
-
-- (void)setAs_headIndent:(CGFloat)headIndent {
-  [self as_setHeadIndent:headIndent range:NSMakeRange(0, self.length)];
-}
-
-- (void)setAs_tailIndent:(CGFloat)tailIndent {
-  [self as_setTailIndent:tailIndent range:NSMakeRange(0, self.length)];
-}
-
-- (void)setAs_lineBreakMode:(NSLineBreakMode)lineBreakMode {
-  [self as_setLineBreakMode:lineBreakMode range:NSMakeRange(0, self.length)];
-}
-
-- (void)setAs_minimumLineHeight:(CGFloat)minimumLineHeight {
-  [self as_setMinimumLineHeight:minimumLineHeight range:NSMakeRange(0, self.length)];
-}
-
-- (void)setAs_maximumLineHeight:(CGFloat)maximumLineHeight {
-  [self as_setMaximumLineHeight:maximumLineHeight range:NSMakeRange(0, self.length)];
-}
-
-- (void)setAs_lineHeightMultiple:(CGFloat)lineHeightMultiple {
-  [self as_setLineHeightMultiple:lineHeightMultiple range:NSMakeRange(0, self.length)];
-}
-
-- (void)setAs_hyphenationFactor:(float)hyphenationFactor {
-  [self as_setHyphenationFactor:hyphenationFactor range:NSMakeRange(0, self.length)];
-}
-
-- (void)setAs_defaultTabInterval:(CGFloat)defaultTabInterval {
-  [self as_setDefaultTabInterval:defaultTabInterval range:NSMakeRange(0, self.length)];
-}
-
-- (void)setAs_tabStops:(NSArray *)tabStops {
-  [self as_setTabStops:tabStops range:NSMakeRange(0, self.length)];
-}
-
-- (void)setAs_textShadow:(ASTextShadow *)textShadow {
-  [self as_setTextShadow:textShadow range:NSMakeRange(0, self.length)];
-}
-
-- (void)setAs_textInnerShadow:(ASTextShadow *)textInnerShadow {
-  [self as_setTextInnerShadow:textInnerShadow range:NSMakeRange(0, self.length)];
-}
-
-- (void)setAs_textUnderline:(ASTextDecoration *)textUnderline {
-  [self as_setTextUnderline:textUnderline range:NSMakeRange(0, self.length)];
-}
-
-- (void)setAs_textStrikethrough:(ASTextDecoration *)textStrikethrough {
-  [self as_setTextStrikethrough:textStrikethrough range:NSMakeRange(0, self.length)];
-}
-
-- (void)setAs_textBorder:(ASTextBorder *)textBorder {
-  [self as_setTextBorder:textBorder range:NSMakeRange(0, self.length)];
-}
-
-- (void)setAs_textBackgroundBorder:(ASTextBorder *)textBackgroundBorder {
-  [self as_setTextBackgroundBorder:textBackgroundBorder range:NSMakeRange(0, self.length)];
-}
-
-- (void)setAs_textGlyphTransform:(CGAffineTransform)textGlyphTransform {
-  [self as_setTextGlyphTransform:textGlyphTransform range:NSMakeRange(0, self.length)];
-}
-
-#pragma mark - Range Setter
-
-- (void)as_setFont:(UIFont *)font range:(NSRange)range {
-  [self as_setAttribute:NSFontAttributeName value:font range:range];
-}
-
-- (void)as_setKern:(NSNumber *)kern range:(NSRange)range {
-  [self as_setAttribute:NSKernAttributeName value:kern range:range];
-}
-
-- (void)as_setColor:(UIColor *)color range:(NSRange)range {
-  [self as_setAttribute:(id)kCTForegroundColorAttributeName value:(id)color.CGColor range:range];
-  [self as_setAttribute:NSForegroundColorAttributeName value:color range:range];
-}
-
-- (void)as_setBackgroundColor:(UIColor *)backgroundColor range:(NSRange)range {
-  [self as_setAttribute:NSBackgroundColorAttributeName value:backgroundColor range:range];
-}
-
-- (void)as_setStrokeWidth:(NSNumber *)strokeWidth range:(NSRange)range {
-  [self as_setAttribute:NSStrokeWidthAttributeName value:strokeWidth range:range];
-}
-
-- (void)as_setStrokeColor:(UIColor *)strokeColor range:(NSRange)range {
-  [self as_setAttribute:(id)kCTStrokeColorAttributeName value:(id)strokeColor.CGColor range:range];
-  [self as_setAttribute:NSStrokeColorAttributeName value:strokeColor range:range];
-}
-
-- (void)as_setShadow:(NSShadow *)shadow range:(NSRange)range {
-  [self as_setAttribute:NSShadowAttributeName value:shadow range:range];
-}
-
-- (void)as_setStrikethroughStyle:(NSUnderlineStyle)strikethroughStyle range:(NSRange)range {
-  NSNumber *style = strikethroughStyle == 0 ? nil : @(strikethroughStyle);
-  [self as_setAttribute:NSStrikethroughStyleAttributeName value:style range:range];
-}
-
-- (void)as_setStrikethroughColor:(UIColor *)strikethroughColor range:(NSRange)range {
-  [self as_setAttribute:NSStrikethroughColorAttributeName value:strikethroughColor range:range];
-}
-
-- (void)as_setUnderlineStyle:(NSUnderlineStyle)underlineStyle range:(NSRange)range {
-  NSNumber *style = underlineStyle == 0 ? nil : @(underlineStyle);
-  [self as_setAttribute:NSUnderlineStyleAttributeName value:style range:range];
-}
-
-- (void)as_setUnderlineColor:(UIColor *)underlineColor range:(NSRange)range {
-  [self as_setAttribute:(id)kCTUnderlineColorAttributeName value:(id)underlineColor.CGColor range:range];
-  [self as_setAttribute:NSUnderlineColorAttributeName value:underlineColor range:range];
-}
-
-- (void)as_setLigature:(NSNumber *)ligature range:(NSRange)range {
-  [self as_setAttribute:NSLigatureAttributeName value:ligature range:range];
-}
-
-- (void)as_setTextEffect:(NSString *)textEffect range:(NSRange)range {
-  [self as_setAttribute:NSTextEffectAttributeName value:textEffect range:range];
-}
-
-- (void)as_setObliqueness:(NSNumber *)obliqueness range:(NSRange)range {
-  [self as_setAttribute:NSObliquenessAttributeName value:obliqueness range:range];
-}
-
-- (void)as_setExpansion:(NSNumber *)expansion range:(NSRange)range {
-  [self as_setAttribute:NSExpansionAttributeName value:expansion range:range];
-}
-
-- (void)as_setBaselineOffset:(NSNumber *)baselineOffset range:(NSRange)range {
-  [self as_setAttribute:NSBaselineOffsetAttributeName value:baselineOffset range:range];
-}
-
-- (void)as_setVerticalGlyphForm:(BOOL)verticalGlyphForm range:(NSRange)range {
-  NSNumber *v = verticalGlyphForm ? @(YES) : nil;
-  [self as_setAttribute:NSVerticalGlyphFormAttributeName value:v range:range];
-}
-
-- (void)as_setLanguage:(NSString *)language range:(NSRange)range {
-  [self as_setAttribute:(id)kCTLanguageAttributeName value:language range:range];
-}
-
-- (void)as_setWritingDirection:(NSArray *)writingDirection range:(NSRange)range {
-  [self as_setAttribute:(id)kCTWritingDirectionAttributeName value:writingDirection range:range];
-}
-
-- (void)as_setParagraphStyle:(NSParagraphStyle *)paragraphStyle range:(NSRange)range {
-  /*
-   NSParagraphStyle is NOT toll-free bridged to CTParagraphStyleRef.
-   
-   CoreText can use both NSParagraphStyle and CTParagraphStyleRef,
-   but UILabel/UITextView can only use NSParagraphStyle.
-   
-   We use NSParagraphStyle in both CoreText and UIKit.
-   */
-  [self as_setAttribute:NSParagraphStyleAttributeName value:paragraphStyle range:range];
-}
-
-#define ParagraphStyleSet(_attr_) \
-[self enumerateAttribute:NSParagraphStyleAttributeName \
-inRange:range \
-options:kNilOptions \
-usingBlock: ^(NSParagraphStyle *value, NSRange subRange, BOOL *stop) { \
-NSMutableParagraphStyle *style = nil; \
-if (value) { \
-if (CFGetTypeID((__bridge CFTypeRef)(value)) == CTParagraphStyleGetTypeID()) { \
-value = [NSParagraphStyle as_styleWithCTStyle:(__bridge CTParagraphStyleRef)(value)]; \
-} \
-if (value. _attr_ == _attr_) return; \
-if ([value isKindOfClass:[NSMutableParagraphStyle class]]) { \
-style = (id)value; \
-} else { \
-style = value.mutableCopy; \
-} \
-} else { \
-if ([NSParagraphStyle defaultParagraphStyle]. _attr_ == _attr_) return; \
-style = [NSParagraphStyle defaultParagraphStyle].mutableCopy; \
-} \
-style. _attr_ = _attr_; \
-[self as_setParagraphStyle:style range:subRange]; \
-}];
-
-- (void)as_setAlignment:(NSTextAlignment)alignment range:(NSRange)range {
-  ParagraphStyleSet(alignment);
-}
-
-- (void)as_setBaseWritingDirection:(NSWritingDirection)baseWritingDirection range:(NSRange)range {
-  ParagraphStyleSet(baseWritingDirection);
-}
-
-- (void)as_setLineSpacing:(CGFloat)lineSpacing range:(NSRange)range {
-  ParagraphStyleSet(lineSpacing);
-}
-
-- (void)as_setParagraphSpacing:(CGFloat)paragraphSpacing range:(NSRange)range {
-  ParagraphStyleSet(paragraphSpacing);
-}
-
-- (void)as_setParagraphSpacingBefore:(CGFloat)paragraphSpacingBefore range:(NSRange)range {
-  ParagraphStyleSet(paragraphSpacingBefore);
-}
-
-- (void)as_setFirstLineHeadIndent:(CGFloat)firstLineHeadIndent range:(NSRange)range {
-  ParagraphStyleSet(firstLineHeadIndent);
-}
-
-- (void)as_setHeadIndent:(CGFloat)headIndent range:(NSRange)range {
-  ParagraphStyleSet(headIndent);
-}
-
-- (void)as_setTailIndent:(CGFloat)tailIndent range:(NSRange)range {
-  ParagraphStyleSet(tailIndent);
-}
-
-- (void)as_setLineBreakMode:(NSLineBreakMode)lineBreakMode range:(NSRange)range {
-  ParagraphStyleSet(lineBreakMode);
-}
-
-- (void)as_setMinimumLineHeight:(CGFloat)minimumLineHeight range:(NSRange)range {
-  ParagraphStyleSet(minimumLineHeight);
-}
-
-- (void)as_setMaximumLineHeight:(CGFloat)maximumLineHeight range:(NSRange)range {
-  ParagraphStyleSet(maximumLineHeight);
-}
-
-- (void)as_setLineHeightMultiple:(CGFloat)lineHeightMultiple range:(NSRange)range {
-  ParagraphStyleSet(lineHeightMultiple);
-}
-
-- (void)as_setHyphenationFactor:(float)hyphenationFactor range:(NSRange)range {
-  ParagraphStyleSet(hyphenationFactor);
-}
-
-- (void)as_setDefaultTabInterval:(CGFloat)defaultTabInterval range:(NSRange)range {
-  ParagraphStyleSet(defaultTabInterval);
-}
-
-- (void)as_setTabStops:(NSArray *)tabStops range:(NSRange)range {
-  ParagraphStyleSet(tabStops);
-}
-
-#undef ParagraphStyleSet
-
-- (void)as_setSuperscript:(NSNumber *)superscript range:(NSRange)range {
-  if ([superscript isEqualToNumber:@(0)]) {
-    superscript = nil;
-  }
-  [self as_setAttribute:(id)kCTSuperscriptAttributeName value:superscript range:range];
-}
-
-- (void)as_setGlyphInfo:(CTGlyphInfoRef)glyphInfo range:(NSRange)range {
-  [self as_setAttribute:(id)kCTGlyphInfoAttributeName value:(__bridge id)glyphInfo range:range];
-}
-
-- (void)as_setCharacterShape:(NSNumber *)characterShape range:(NSRange)range {
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
-  [self as_setAttribute:(id)kCTCharacterShapeAttributeName value:characterShape range:range];
-#pragma clang diagnostic pop
-}
-
-- (void)as_setRunDelegate:(CTRunDelegateRef)runDelegate range:(NSRange)range {
-  [self as_setAttribute:(id)kCTRunDelegateAttributeName value:(__bridge id)runDelegate range:range];
-}
-
-- (void)as_setBaselineClass:(CFStringRef)baselineClass range:(NSRange)range {
-  [self as_setAttribute:(id)kCTBaselineClassAttributeName value:(__bridge id)baselineClass range:range];
-}
-
-- (void)as_setBaselineInfo:(CFDictionaryRef)baselineInfo range:(NSRange)range {
-  [self as_setAttribute:(id)kCTBaselineInfoAttributeName value:(__bridge id)baselineInfo range:range];
-}
-
-- (void)as_setBaselineReferenceInfo:(CFDictionaryRef)referenceInfo range:(NSRange)range {
-  [self as_setAttribute:(id)kCTBaselineReferenceInfoAttributeName value:(__bridge id)referenceInfo range:range];
-}
-
-- (void)as_setRubyAnnotation:(CTRubyAnnotationRef)ruby range:(NSRange)range {
-  [self as_setAttribute:(id)kCTRubyAnnotationAttributeName value:(__bridge id)ruby range:range];
-}
-
-- (void)as_setAttachment:(NSTextAttachment *)attachment range:(NSRange)range {
-  [self as_setAttribute:NSAttachmentAttributeName value:attachment range:range];
-}
-
-- (void)as_setLink:(id)link range:(NSRange)range {
-  [self as_setAttribute:NSLinkAttributeName value:link range:range];
-}
-
-- (void)as_setTextBackedString:(ASTextBackedString *)textBackedString range:(NSRange)range {
-  [self as_setAttribute:ASTextBackedStringAttributeName value:textBackedString range:range];
-}
-
-- (void)as_setTextBinding:(ASTextBinding *)textBinding range:(NSRange)range {
-  [self as_setAttribute:ASTextBindingAttributeName value:textBinding range:range];
-}
-
-- (void)as_setTextShadow:(ASTextShadow *)textShadow range:(NSRange)range {
-  [self as_setAttribute:ASTextShadowAttributeName value:textShadow range:range];
-}
-
-- (void)as_setTextInnerShadow:(ASTextShadow *)textInnerShadow range:(NSRange)range {
-  [self as_setAttribute:ASTextInnerShadowAttributeName value:textInnerShadow range:range];
-}
-
-- (void)as_setTextUnderline:(ASTextDecoration *)textUnderline range:(NSRange)range {
-  [self as_setAttribute:ASTextUnderlineAttributeName value:textUnderline range:range];
-}
-
-- (void)as_setTextStrikethrough:(ASTextDecoration *)textStrikethrough range:(NSRange)range {
-  [self as_setAttribute:ASTextStrikethroughAttributeName value:textStrikethrough range:range];
-}
-
-- (void)as_setTextBorder:(ASTextBorder *)textBorder range:(NSRange)range {
-  [self as_setAttribute:ASTextBorderAttributeName value:textBorder range:range];
-}
-
-- (void)as_setTextBackgroundBorder:(ASTextBorder *)textBackgroundBorder range:(NSRange)range {
-  [self as_setAttribute:ASTextBackgroundBorderAttributeName value:textBackgroundBorder range:range];
-}
-
-- (void)as_setTextAttachment:(ASTextAttachment *)textAttachment range:(NSRange)range {
-  [self as_setAttribute:ASTextAttachmentAttributeName value:textAttachment range:range];
-}
-
-- (void)as_setTextHighlight:(ASTextHighlight *)textHighlight range:(NSRange)range {
-  [self as_setAttribute:ASTextHighlightAttributeName value:textHighlight range:range];
-}
-
-- (void)as_setTextBlockBorder:(ASTextBorder *)textBlockBorder range:(NSRange)range {
-  [self as_setAttribute:ASTextBlockBorderAttributeName value:textBlockBorder range:range];
-}
-
-- (void)as_setTextGlyphTransform:(CGAffineTransform)textGlyphTransform range:(NSRange)range {
-  NSValue *value = CGAffineTransformIsIdentity(textGlyphTransform) ? nil : [NSValue valueWithCGAffineTransform:textGlyphTransform];
-  [self as_setAttribute:ASTextGlyphTransformAttributeName value:value range:range];
-}
-
-- (void)as_setTextHighlightRange:(NSRange)range
-                           color:(UIColor *)color
-                 backgroundColor:(UIColor *)backgroundColor
-                        userInfo:(NSDictionary *)userInfo
-                       tapAction:(ASTextAction)tapAction
-                 longPressAction:(ASTextAction)longPressAction {
-  ASTextHighlight *highlight = [ASTextHighlight highlightWithBackgroundColor:backgroundColor];
-  highlight.userInfo = userInfo;
-  highlight.tapAction = tapAction;
-  highlight.longPressAction = longPressAction;
-  if (color) [self as_setColor:color range:range];
-  [self as_setTextHighlight:highlight range:range];
-}
-
-- (void)as_setTextHighlightRange:(NSRange)range
-                           color:(UIColor *)color
-                 backgroundColor:(UIColor *)backgroundColor
-                       tapAction:(ASTextAction)tapAction {
-  [self as_setTextHighlightRange:range
-                           color:color
-                 backgroundColor:backgroundColor
-                        userInfo:nil
-                       tapAction:tapAction
-                 longPressAction:nil];
-}
-
-- (void)as_setTextHighlightRange:(NSRange)range
-                           color:(UIColor *)color
-                 backgroundColor:(UIColor *)backgroundColor
-                        userInfo:(NSDictionary *)userInfo {
-  [self as_setTextHighlightRange:range
-                           color:color
-                 backgroundColor:backgroundColor
-                        userInfo:userInfo
-                       tapAction:nil
-                 longPressAction:nil];
-}
-
-- (void)as_insertString:(NSString *)string atIndex:(NSUInteger)location {
-  [self replaceCharactersInRange:NSMakeRange(location, 0) withString:string];
-  [self as_removeDiscontinuousAttributesInRange:NSMakeRange(location, string.length)];
-}
-
-- (void)as_appendString:(NSString *)string {
-  NSUInteger length = self.length;
-  [self replaceCharactersInRange:NSMakeRange(length, 0) withString:string];
-  [self as_removeDiscontinuousAttributesInRange:NSMakeRange(length, string.length)];
-}
-
-- (void)as_removeDiscontinuousAttributesInRange:(NSRange)range {
-  NSArray *keys = [NSMutableAttributedString as_allDiscontinuousAttributeKeys];
-  for (NSString *key in keys) {
-    [self removeAttribute:key range:range];
-  }
-}
-
-+ (NSArray *)as_allDiscontinuousAttributeKeys {
-  static NSArray *keys;
-  static dispatch_once_t onceToken;
-  dispatch_once(&onceToken, ^{
-    keys = @[(id)kCTSuperscriptAttributeName,
-             (id)kCTRunDelegateAttributeName,
-             ASTextBackedStringAttributeName,
-             ASTextBindingAttributeName,
-             ASTextAttachmentAttributeName,
-             (id)kCTRubyAnnotationAttributeName,
-             NSAttachmentAttributeName];
-  });
-  return keys;
-}
-
-@end
diff --git a/submodules/AsyncDisplayKit/Source/Private/TextExperiment/Utility/NSParagraphStyle+ASText.h b/submodules/AsyncDisplayKit/Source/Private/TextExperiment/Utility/NSParagraphStyle+ASText.h
deleted file mode 100644
index a7c0aec5ff..0000000000
--- a/submodules/AsyncDisplayKit/Source/Private/TextExperiment/Utility/NSParagraphStyle+ASText.h
+++ /dev/null
@@ -1,34 +0,0 @@
-//
-//  NSParagraphStyle+ASText.h
-//  Texture
-//
-//  Copyright (c) Pinterest, Inc.  All rights reserved.
-//  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
-//
-
-#import <UIKit/UIKit.h>
-
-NS_ASSUME_NONNULL_BEGIN
-
-/**
- Provides extensions for `NSParagraphStyle` to work with CoreText.
- */
-@interface NSParagraphStyle (ASText)
-
-/**
- Creates a new NSParagraphStyle object from the CoreText Style.
- 
- @param CTStyle CoreText Paragraph Style.
- 
- @return a new NSParagraphStyle
- */
-+ (nullable NSParagraphStyle *)as_styleWithCTStyle:(CTParagraphStyleRef)CTStyle;
-
-/**
- Creates and returns a CoreText Paragraph Style. (need call CFRelease() after used)
- */
-- (nullable CTParagraphStyleRef)as_CTStyle CF_RETURNS_RETAINED;
-
-@end
-
-NS_ASSUME_NONNULL_END
diff --git a/submodules/AsyncDisplayKit/Source/Private/TextExperiment/Utility/NSParagraphStyle+ASText.mm b/submodules/AsyncDisplayKit/Source/Private/TextExperiment/Utility/NSParagraphStyle+ASText.mm
deleted file mode 100644
index bc19fd234c..0000000000
--- a/submodules/AsyncDisplayKit/Source/Private/TextExperiment/Utility/NSParagraphStyle+ASText.mm
+++ /dev/null
@@ -1,219 +0,0 @@
-//
-//  NSParagraphStyle+ASText.mm
-//  Texture
-//
-//  Copyright (c) Pinterest, Inc.  All rights reserved.
-//  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
-//
-
-#import <AsyncDisplayKit/NSParagraphStyle+ASText.h>
-#import <AsyncDisplayKit/ASTextAttribute.h>
-#import <CoreText/CoreText.h>
-
-// Dummy class for category
-@interface NSParagraphStyle_ASText : NSObject @end
-@implementation NSParagraphStyle_ASText @end
-
-
-@implementation NSParagraphStyle (ASText)
-
-+ (NSParagraphStyle *)as_styleWithCTStyle:(CTParagraphStyleRef)CTStyle {
-  if (CTStyle == NULL) return nil;
-  
-  NSMutableParagraphStyle *style = [[NSParagraphStyle defaultParagraphStyle] mutableCopy];
-  
-#if TARGET_OS_IOS
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
-  CGFloat lineSpacing;
-  if (CTParagraphStyleGetValueForSpecifier(CTStyle, kCTParagraphStyleSpecifierLineSpacing, sizeof(CGFloat), &lineSpacing)) {
-    style.lineSpacing = lineSpacing;
-  }
-#pragma clang diagnostic pop
-#endif
-  
-  CGFloat paragraphSpacing;
-  if (CTParagraphStyleGetValueForSpecifier(CTStyle, kCTParagraphStyleSpecifierParagraphSpacing, sizeof(CGFloat), &paragraphSpacing)) {
-    style.paragraphSpacing = paragraphSpacing;
-  }
-  
-  CTTextAlignment alignment;
-  if (CTParagraphStyleGetValueForSpecifier(CTStyle, kCTParagraphStyleSpecifierAlignment, sizeof(CTTextAlignment), &alignment)) {
-    style.alignment = NSTextAlignmentFromCTTextAlignment(alignment);
-  }
-  
-  CGFloat firstLineHeadIndent;
-  if (CTParagraphStyleGetValueForSpecifier(CTStyle, kCTParagraphStyleSpecifierFirstLineHeadIndent, sizeof(CGFloat), &firstLineHeadIndent)) {
-    style.firstLineHeadIndent = firstLineHeadIndent;
-  }
-  
-  CGFloat headIndent;
-  if (CTParagraphStyleGetValueForSpecifier(CTStyle, kCTParagraphStyleSpecifierHeadIndent, sizeof(CGFloat), &headIndent)) {
-    style.headIndent = headIndent;
-  }
-  
-  CGFloat tailIndent;
-  if (CTParagraphStyleGetValueForSpecifier(CTStyle, kCTParagraphStyleSpecifierTailIndent, sizeof(CGFloat), &tailIndent)) {
-    style.tailIndent = tailIndent;
-  }
-  
-  CTLineBreakMode lineBreakMode;
-  if (CTParagraphStyleGetValueForSpecifier(CTStyle, kCTParagraphStyleSpecifierLineBreakMode, sizeof(CTLineBreakMode), &lineBreakMode)) {
-    style.lineBreakMode = (NSLineBreakMode)lineBreakMode;
-  }
-  
-  CGFloat minimumLineHeight;
-  if (CTParagraphStyleGetValueForSpecifier(CTStyle, kCTParagraphStyleSpecifierMinimumLineHeight, sizeof(CGFloat), &minimumLineHeight)) {
-    style.minimumLineHeight = minimumLineHeight;
-  }
-  
-  CGFloat maximumLineHeight;
-  if (CTParagraphStyleGetValueForSpecifier(CTStyle, kCTParagraphStyleSpecifierMaximumLineHeight, sizeof(CGFloat), &maximumLineHeight)) {
-    style.maximumLineHeight = maximumLineHeight;
-  }
-  
-  CTWritingDirection baseWritingDirection;
-  if (CTParagraphStyleGetValueForSpecifier(CTStyle, kCTParagraphStyleSpecifierBaseWritingDirection, sizeof(CTWritingDirection), &baseWritingDirection)) {
-    style.baseWritingDirection = (NSWritingDirection)baseWritingDirection;
-  }
-  
-  CGFloat lineHeightMultiple;
-  if (CTParagraphStyleGetValueForSpecifier(CTStyle, kCTParagraphStyleSpecifierLineHeightMultiple, sizeof(CGFloat), &lineHeightMultiple)) {
-    style.lineHeightMultiple = lineHeightMultiple;
-  }
-  
-  CGFloat paragraphSpacingBefore;
-  if (CTParagraphStyleGetValueForSpecifier(CTStyle, kCTParagraphStyleSpecifierParagraphSpacingBefore, sizeof(CGFloat), &paragraphSpacingBefore)) {
-    style.paragraphSpacingBefore = paragraphSpacingBefore;
-  }
-  
-  CFArrayRef tabStops;
-  if (CTParagraphStyleGetValueForSpecifier(CTStyle, kCTParagraphStyleSpecifierTabStops, sizeof(CFArrayRef), &tabStops)) {
-    NSMutableArray *tabs = [NSMutableArray new];
-    [((__bridge NSArray *)(tabStops))enumerateObjectsUsingBlock : ^(id obj, NSUInteger idx, BOOL *stop) {
-      CTTextTabRef ctTab = (__bridge CTTextTabRef)obj;
-      
-      NSTextTab *tab = [[NSTextTab alloc] initWithTextAlignment:NSTextAlignmentFromCTTextAlignment(CTTextTabGetAlignment(ctTab)) location:CTTextTabGetLocation(ctTab) options:(__bridge id)CTTextTabGetOptions(ctTab)];
-      [tabs addObject:tab];
-    }];
-    if (tabs.count) {
-      style.tabStops = tabs;
-    }
-  }
-  
-  CGFloat defaultTabInterval;
-  if (CTParagraphStyleGetValueForSpecifier(CTStyle, kCTParagraphStyleSpecifierDefaultTabInterval, sizeof(CGFloat), &defaultTabInterval)) {
-    style.defaultTabInterval = defaultTabInterval;
-  }
-  
-  return style;
-}
-
-- (CTParagraphStyleRef)as_CTStyle CF_RETURNS_RETAINED {
-  CTParagraphStyleSetting set[kCTParagraphStyleSpecifierCount] = { };
-  int count = 0;
-  
-#if TARGET_OS_IOS
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
-  CGFloat lineSpacing = self.lineSpacing;
-  set[count].spec = kCTParagraphStyleSpecifierLineSpacing;
-  set[count].valueSize = sizeof(CGFloat);
-  set[count].value = &lineSpacing;
-  count++;
-#pragma clang diagnostic pop
-#endif
-  
-  CGFloat paragraphSpacing = self.paragraphSpacing;
-  set[count].spec = kCTParagraphStyleSpecifierParagraphSpacing;
-  set[count].valueSize = sizeof(CGFloat);
-  set[count].value = &paragraphSpacing;
-  count++;
-  
-  CTTextAlignment alignment = NSTextAlignmentToCTTextAlignment(self.alignment);
-  set[count].spec = kCTParagraphStyleSpecifierAlignment;
-  set[count].valueSize = sizeof(CTTextAlignment);
-  set[count].value = &alignment;
-  count++;
-  
-  CGFloat firstLineHeadIndent = self.firstLineHeadIndent;
-  set[count].spec = kCTParagraphStyleSpecifierFirstLineHeadIndent;
-  set[count].valueSize = sizeof(CGFloat);
-  set[count].value = &firstLineHeadIndent;
-  count++;
-  
-  CGFloat headIndent = self.headIndent;
-  set[count].spec = kCTParagraphStyleSpecifierHeadIndent;
-  set[count].valueSize = sizeof(CGFloat);
-  set[count].value = &headIndent;
-  count++;
-  
-  CGFloat tailIndent = self.tailIndent;
-  set[count].spec = kCTParagraphStyleSpecifierTailIndent;
-  set[count].valueSize = sizeof(CGFloat);
-  set[count].value = &tailIndent;
-  count++;
-  
-  CTLineBreakMode paraLineBreak = (CTLineBreakMode)self.lineBreakMode;
-  set[count].spec = kCTParagraphStyleSpecifierLineBreakMode;
-  set[count].valueSize = sizeof(CTLineBreakMode);
-  set[count].value = &paraLineBreak;
-  count++;
-  
-  CGFloat minimumLineHeight = self.minimumLineHeight;
-  set[count].spec = kCTParagraphStyleSpecifierMinimumLineHeight;
-  set[count].valueSize = sizeof(CGFloat);
-  set[count].value = &minimumLineHeight;
-  count++;
-  
-  CGFloat maximumLineHeight = self.maximumLineHeight;
-  set[count].spec = kCTParagraphStyleSpecifierMaximumLineHeight;
-  set[count].valueSize = sizeof(CGFloat);
-  set[count].value = &maximumLineHeight;
-  count++;
-  
-  CTWritingDirection paraWritingDirection = (CTWritingDirection)self.baseWritingDirection;
-  set[count].spec = kCTParagraphStyleSpecifierBaseWritingDirection;
-  set[count].valueSize = sizeof(CTWritingDirection);
-  set[count].value = &paraWritingDirection;
-  count++;
-  
-  CGFloat lineHeightMultiple = self.lineHeightMultiple;
-  set[count].spec = kCTParagraphStyleSpecifierLineHeightMultiple;
-  set[count].valueSize = sizeof(CGFloat);
-  set[count].value = &lineHeightMultiple;
-  count++;
-  
-  CGFloat paragraphSpacingBefore = self.paragraphSpacingBefore;
-  set[count].spec = kCTParagraphStyleSpecifierParagraphSpacingBefore;
-  set[count].valueSize = sizeof(CGFloat);
-  set[count].value = &paragraphSpacingBefore;
-  count++;
-  
-  NSMutableArray *tabs = [NSMutableArray array];
-  NSInteger numTabs = self.tabStops.count;
-  if (numTabs) {
-    [self.tabStops enumerateObjectsUsingBlock: ^(NSTextTab *tab, NSUInteger idx, BOOL *stop) {
-      CTTextTabRef ctTab = CTTextTabCreate(NSTextAlignmentToCTTextAlignment(tab.alignment), tab.location, (__bridge CFDictionaryRef)tab.options);
-      [tabs addObject:(__bridge id)ctTab];
-      CFRelease(ctTab);
-    }];
-    
-    CFArrayRef tabStops = (__bridge CFArrayRef)(tabs);
-    set[count].spec = kCTParagraphStyleSpecifierTabStops;
-    set[count].valueSize = sizeof(CFArrayRef);
-    set[count].value = &tabStops;
-    count++;
-  }
-  
-  CGFloat defaultTabInterval = self.defaultTabInterval;
-  set[count].spec = kCTParagraphStyleSpecifierDefaultTabInterval;
-  set[count].valueSize = sizeof(CGFloat);
-  set[count].value = &defaultTabInterval;
-  count++;
-  
-  CTParagraphStyleRef style = CTParagraphStyleCreate(set, count);
-  return style;
-}
-
-@end
diff --git a/submodules/AsyncDisplayKit/Source/Private/_ASCollectionGalleryLayoutInfo.h b/submodules/AsyncDisplayKit/Source/Private/_ASCollectionGalleryLayoutInfo.h
deleted file mode 100644
index 6d7c91e5e5..0000000000
--- a/submodules/AsyncDisplayKit/Source/Private/_ASCollectionGalleryLayoutInfo.h
+++ /dev/null
@@ -1,26 +0,0 @@
-//
-//  _ASCollectionGalleryLayoutInfo.h
-//  Texture
-//
-//  Copyright (c) Pinterest, Inc.  All rights reserved.
-//  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
-//
-
-#import <UIKit/UIKit.h>
-
-@interface _ASCollectionGalleryLayoutInfo : NSObject
-
-// Read-only properties
-@property (nonatomic, readonly) CGSize itemSize;
-@property (nonatomic, readonly) CGFloat minimumLineSpacing;
-@property (nonatomic, readonly) CGFloat minimumInteritemSpacing;
-@property (nonatomic, readonly) UIEdgeInsets sectionInset;
-
-- (instancetype)initWithItemSize:(CGSize)itemSize
-              minimumLineSpacing:(CGFloat)minimumLineSpacing
-         minimumInteritemSpacing:(CGFloat)minimumInteritemSpacing
-                    sectionInset:(UIEdgeInsets)sectionInset NS_DESIGNATED_INITIALIZER;
-
-- (instancetype)init NS_UNAVAILABLE;
-
-@end
diff --git a/submodules/AsyncDisplayKit/Source/Private/_ASCollectionGalleryLayoutInfo.mm b/submodules/AsyncDisplayKit/Source/Private/_ASCollectionGalleryLayoutInfo.mm
deleted file mode 100644
index fec0b52872..0000000000
--- a/submodules/AsyncDisplayKit/Source/Private/_ASCollectionGalleryLayoutInfo.mm
+++ /dev/null
@@ -1,68 +0,0 @@
-//
-//  _ASCollectionGalleryLayoutInfo.mm
-//  Texture
-//
-//  Copyright (c) Pinterest, Inc.  All rights reserved.
-//  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
-//
-
-#import <AsyncDisplayKit/_ASCollectionGalleryLayoutInfo.h>
-#import <AsyncDisplayKit/ASHashing.h>
-
-@implementation _ASCollectionGalleryLayoutInfo
-
-- (instancetype)initWithItemSize:(CGSize)itemSize
-              minimumLineSpacing:(CGFloat)minimumLineSpacing
-         minimumInteritemSpacing:(CGFloat)minimumInteritemSpacing
-                    sectionInset:(UIEdgeInsets)sectionInset
-{
-  self = [super init];
-  if (self) {
-    _itemSize = itemSize;
-    _minimumLineSpacing = minimumLineSpacing;
-    _minimumInteritemSpacing = minimumInteritemSpacing;
-    _sectionInset = sectionInset;
-  }
-  return self;
-}
-
-- (BOOL)isEqualToInfo:(_ASCollectionGalleryLayoutInfo *)info
-{
-  if (info == nil) {
-    return NO;
-  }
-
-  return CGSizeEqualToSize(_itemSize, info.itemSize)
-  && _minimumLineSpacing == info.minimumLineSpacing
-  && _minimumInteritemSpacing == info.minimumInteritemSpacing
-  && UIEdgeInsetsEqualToEdgeInsets(_sectionInset, info.sectionInset);
-}
-
-- (BOOL)isEqual:(id)other
-{
-  if (self == other) {
-    return YES;
-  }
-  if (! [other isKindOfClass:[_ASCollectionGalleryLayoutInfo class]]) {
-    return NO;
-  }
-  return [self isEqualToInfo:other];
-}
-
-- (NSUInteger)hash
-{
-  struct {
-    CGSize itemSize;
-    CGFloat minimumLineSpacing;
-    CGFloat minimumInteritemSpacing;
-    UIEdgeInsets sectionInset;
-  } data = {
-    _itemSize,
-    _minimumLineSpacing,
-    _minimumInteritemSpacing,
-    _sectionInset,
-  };
-  return ASHashBytes(&data, sizeof(data));
-}
-
-@end
diff --git a/submodules/AsyncDisplayKit/Source/Private/_ASCollectionGalleryLayoutItem.h b/submodules/AsyncDisplayKit/Source/Private/_ASCollectionGalleryLayoutItem.h
deleted file mode 100644
index 21df3bcdc0..0000000000
--- a/submodules/AsyncDisplayKit/Source/Private/_ASCollectionGalleryLayoutItem.h
+++ /dev/null
@@ -1,38 +0,0 @@
-//
-//  _ASCollectionGalleryLayoutItem.h
-//  Texture
-//
-//  Copyright (c) Pinterest, Inc.  All rights reserved.
-//  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
-//
-
-#ifndef MINIMAL_ASDK
-
-#import <UIKit/UIKit.h>
-#import <AsyncDisplayKit/ASBaseDefines.h>
-#import <AsyncDisplayKit/ASLayoutElement.h>
-
-@class ASCollectionElement;
-
-NS_ASSUME_NONNULL_BEGIN
-
-/**
- * A dummy item that represents a collection element to participate in the collection layout calculation process
- * without triggering measurement on the actual node of the collection element.
- *
- * This item always has a fixed size that is the item size passed to it.
- */
-AS_SUBCLASSING_RESTRICTED
-@interface _ASGalleryLayoutItem : NSObject <ASLayoutElement>
-
-@property (nonatomic, readonly) CGSize itemSize;
-@property (nonatomic, weak, readonly) ASCollectionElement *collectionElement;
-
-- (instancetype)initWithItemSize:(CGSize)itemSize collectionElement:(ASCollectionElement *)collectionElement;
-- (instancetype)init __unavailable;
-
-@end
-
-NS_ASSUME_NONNULL_END
-
-#endif
diff --git a/submodules/AsyncDisplayKit/Source/Private/_ASCollectionGalleryLayoutItem.mm b/submodules/AsyncDisplayKit/Source/Private/_ASCollectionGalleryLayoutItem.mm
deleted file mode 100644
index 582d7983cc..0000000000
--- a/submodules/AsyncDisplayKit/Source/Private/_ASCollectionGalleryLayoutItem.mm
+++ /dev/null
@@ -1,85 +0,0 @@
-//
-//  _ASCollectionGalleryLayoutItem.mm
-//  Texture
-//
-//  Copyright (c) Pinterest, Inc.  All rights reserved.
-//  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
-//
-
-#ifndef MINIMAL_ASDK
-
-#import <AsyncDisplayKit/_ASCollectionGalleryLayoutItem.h>
-
-#import <AsyncDisplayKit/ASCollectionElement.h>
-#import <AsyncDisplayKit/ASLayout.h>
-#import <AsyncDisplayKit/ASLayoutElementPrivate.h>
-#import <AsyncDisplayKit/ASLayoutElementStylePrivate.h>
-#import <AsyncDisplayKit/ASLayoutSpec.h>
-
-@implementation _ASGalleryLayoutItem {
-  std::atomic<ASPrimitiveTraitCollection> _primitiveTraitCollection;
-}
-
-@synthesize style;
-
-- (instancetype)initWithItemSize:(CGSize)itemSize collectionElement:(ASCollectionElement *)collectionElement
-{
-  self = [super init];
-  if (self) {
-    ASDisplayNodeAssert(! CGSizeEqualToSize(CGSizeZero, itemSize), @"Item size should not be zero");
-    ASDisplayNodeAssertNotNil(collectionElement, @"Collection element should not be nil");
-    _itemSize = itemSize;
-    _collectionElement = collectionElement;
-  }
-  return self;
-}
-
-ASLayoutElementStyleExtensibilityForwarding
-ASPrimitiveTraitCollectionDefaults
-
-- (ASTraitCollection *)asyncTraitCollection
-{
-  ASDisplayNodeAssertNotSupported();
-  return nil;
-}
-
-- (ASLayoutElementType)layoutElementType
-{
-  return ASLayoutElementTypeLayoutSpec;
-}
-
-- (NSArray<id<ASLayoutElement>> *)sublayoutElements
-{
-  ASDisplayNodeAssertNotSupported();
-  return nil;
-}
-
-- (BOOL)implementsLayoutMethod
-{
-  return YES;
-}
-
-ASLayoutElementLayoutCalculationDefaults
-
-- (ASLayout *)calculateLayoutThatFits:(ASSizeRange)constrainedSize
-{
-  ASDisplayNodeAssert(CGSizeEqualToSize(_itemSize, ASSizeRangeClamp(constrainedSize, _itemSize)),
-                      @"Item size %@ can't fit within the bounds of constrained size %@", NSStringFromCGSize(_itemSize), NSStringFromASSizeRange(constrainedSize));
-  return [ASLayout layoutWithLayoutElement:self size:_itemSize];
-}
-
-#pragma mark - ASLayoutElementAsciiArtProtocol
-
-- (NSString *)asciiArtString
-{
-  return [ASLayoutSpec asciiArtStringForChildren:@[] parentName:[self asciiArtName]];
-}
-
-- (NSString *)asciiArtName
-{
-  return [NSMutableString stringWithCString:object_getClassName(self) encoding:NSASCIIStringEncoding];
-}
-
-@end
-
-#endif
diff --git a/submodules/AsyncDisplayKit/Source/Private/_ASHierarchyChangeSet.h b/submodules/AsyncDisplayKit/Source/Private/_ASHierarchyChangeSet.h
deleted file mode 100644
index 800be37517..0000000000
--- a/submodules/AsyncDisplayKit/Source/Private/_ASHierarchyChangeSet.h
+++ /dev/null
@@ -1,218 +0,0 @@
-//
-//  _ASHierarchyChangeSet.h
-//  Texture
-//
-//  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.
-//  Changes after 4/13/2017 are: Copyright (c) Pinterest, Inc.  All rights reserved.
-//  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
-//
-
-#ifndef MINIMAL_ASDK
-
-#import <Foundation/Foundation.h>
-#import <vector>
-#import <AsyncDisplayKit/ASObjectDescriptionHelpers.h>
-#import <AsyncDisplayKit/ASIntegerMap.h>
-#import <AsyncDisplayKit/ASLog.h>
-
-NS_ASSUME_NONNULL_BEGIN
-
-typedef NSUInteger ASDataControllerAnimationOptions;
-
-typedef NS_ENUM(NSInteger, _ASHierarchyChangeType) {
-  /**
-   * A reload change, as submitted by the user. When a change set is
-   * completed, these changes are decomposed into delete-insert pairs
-   * and combined with the original deletes and inserts of the change.
-   */
-  _ASHierarchyChangeTypeReload,
-  
-  /**
-   * A change that was either an original delete, or the first 
-   * part of a decomposed reload.
-   */
-  _ASHierarchyChangeTypeDelete,
-  
-  /**
-   * A change that was submitted by the user as a delete.
-   */
-  _ASHierarchyChangeTypeOriginalDelete,
-  
-  /**
-   * A change that was either an original insert, or the second
-   * part of a decomposed reload.
-   */
-  _ASHierarchyChangeTypeInsert,
-  
-  /**
-   * A change that was submitted by the user as an insert.
-   */
-  _ASHierarchyChangeTypeOriginalInsert
-};
-
-/**
- * Returns YES if the given change type is either .Insert or .Delete, NO otherwise.
- * Other change types – .Reload, .OriginalInsert, .OriginalDelete – are
- * intermediary types used while building the change set. All changes will
- * be reduced to either .Insert or .Delete when the change is marked completed.
- */
-BOOL ASHierarchyChangeTypeIsFinal(_ASHierarchyChangeType changeType);
-
-NSString *NSStringFromASHierarchyChangeType(_ASHierarchyChangeType changeType);
-
-@interface _ASHierarchySectionChange : NSObject <ASDescriptionProvider, ASDebugDescriptionProvider>
-
-// FIXME: Generalize this to `changeMetadata` dict?
-@property (nonatomic, readonly) ASDataControllerAnimationOptions animationOptions;
-
-@property (nonatomic, readonly) NSIndexSet *indexSet;
-
-@property (nonatomic, readonly) _ASHierarchyChangeType changeType;
-
-/**
- * If this is a .OriginalInsert or .OriginalDelete change, this returns a copied change
- * with type .Insert or .Delete. Calling this on changes of other types is an error.
- */
-- (_ASHierarchySectionChange *)changeByFinalizingType;
-
-@end
-
-@interface _ASHierarchyItemChange : NSObject <ASDescriptionProvider, ASDebugDescriptionProvider>
-
-@property (nonatomic, readonly) ASDataControllerAnimationOptions animationOptions;
-
-/// Index paths are sorted descending for changeType .Delete, ascending otherwise
-@property (nonatomic, readonly) NSArray<NSIndexPath *> *indexPaths;
-
-@property (nonatomic, readonly) _ASHierarchyChangeType changeType;
-
-+ (NSDictionary<NSNumber *, NSIndexSet *> *)sectionToIndexSetMapFromChanges:(NSArray<_ASHierarchyItemChange *> *)changes;
-
-/**
- * If this is a .OriginalInsert or .OriginalDelete change, this returns a copied change
- * with type .Insert or .Delete. Calling this on changes of other types is an error.
- */
-- (_ASHierarchyItemChange *)changeByFinalizingType;
-
-@end
-
-@interface _ASHierarchyChangeSet : NSObject <ASDescriptionProvider, ASDebugDescriptionProvider>
-
-/// @precondition The change set must be completed.
-@property (nonatomic, readonly) NSIndexSet *deletedSections;
-
-/// @precondition The change set must be completed.
-@property (nonatomic, readonly) NSIndexSet *insertedSections;
-
-@property (nonatomic, readonly) BOOL completed;
-
-/// Whether or not changes should be animated.
-// TODO: if any update in this chagne set is non-animated, the whole update should be non-animated.
-@property (nonatomic) BOOL animated;
-
-@property (nonatomic, readonly) BOOL includesReloadData;
-
-/// Indicates whether the change set is empty, that is it includes neither reload data nor per item or section changes.
-@property (nonatomic, readonly) BOOL isEmpty;
-
-/// The count of new ASCellNodes that can undergo async layout calculation. May be zero if all UIKit passthrough cells.
-@property (nonatomic, assign) NSUInteger countForAsyncLayout;
-
-/// The top-level activity for this update.
-@property (nonatomic, OS_ACTIVITY_NULLABLE) os_activity_t rootActivity;
-
-/// The activity for submitting this update i.e. between -beginUpdates and -endUpdates.
-@property (nonatomic, OS_ACTIVITY_NULLABLE) os_activity_t submitActivity;
-
-- (instancetype)initWithOldData:(std::vector<NSInteger>)oldItemCounts NS_DESIGNATED_INITIALIZER;
-
-/**
- * Append the given completion handler to the combined @c completionHandler.
- *
- * @discussion Since batch updates can be nested, we have to support multiple
- * completion handlers per update.
- *
- * @precondition The change set must not be completed.
- */
-- (void)addCompletionHandler:(nullable void(^)(BOOL finished))completion;
-
-/**
- * Execute the combined completion handler.
- *
- * @warning The completion block is discarded after reading because it may have captured
- *   significant resources that we would like to reclaim as soon as possible.
- */
-- (void)executeCompletionHandlerWithFinished:(BOOL)finished;
-
-/**
- * Get the section index after the update for the given section before the update.
- *
- * @precondition The change set must be completed.
- * @return The new section index, or NSNotFound if the given section was deleted.
- */
-- (NSUInteger)newSectionForOldSection:(NSUInteger)oldSection;
-
-/**
- * A table that maps old section indexes to new section indexes.
- */
-@property (nonatomic, readonly) ASIntegerMap *sectionMapping;
-
-/**
- * A table that maps new section indexes to old section indexes.
- */
-@property (nonatomic, readonly) ASIntegerMap *reverseSectionMapping;
-
-/**
- * A table that provides the item mapping for the old section. If the section was deleted
- * or is out of bounds, returns the empty table.
- */
-- (ASIntegerMap *)itemMappingInSection:(NSInteger)oldSection;
-
-/**
- * A table that provides the reverse item mapping for the new section. If the section was inserted
- * or is out of bounds, returns the empty table.
- */
-- (ASIntegerMap *)reverseItemMappingInSection:(NSInteger)newSection;
-
-/**
- * Get the old item index path for the given new index path.
- *
- * @precondition The change set must be completed.
- * @return The old index path, or nil if the given item was inserted.
- */
-- (nullable NSIndexPath *)oldIndexPathForNewIndexPath:(NSIndexPath *)indexPath;
-
-/**
- * Get the new item index path for the given old index path.
- *
- * @precondition The change set must be completed.
- * @return The new index path, or nil if the given item was deleted.
- */
-- (nullable NSIndexPath *)newIndexPathForOldIndexPath:(NSIndexPath *)indexPath;
-
-/// Call this once the change set has been constructed to prevent future modifications to the changeset. Calling this more than once is a programmer error.
-/// NOTE: Calling this method will cause the changeset to convert all reloads into delete/insert pairs.
-- (void)markCompletedWithNewItemCounts:(std::vector<NSInteger>)newItemCounts;
-
-- (nullable NSArray <_ASHierarchySectionChange *> *)sectionChangesOfType:(_ASHierarchyChangeType)changeType;
-
-- (nullable NSArray <_ASHierarchyItemChange *> *)itemChangesOfType:(_ASHierarchyChangeType)changeType;
-
-/// Returns all item indexes affected by changes of the given type in the given section.
-- (NSIndexSet *)indexesForItemChangesOfType:(_ASHierarchyChangeType)changeType inSection:(NSUInteger)section;
-
-- (void)reloadData;
-- (void)deleteSections:(NSIndexSet *)sections animationOptions:(ASDataControllerAnimationOptions)options;
-- (void)insertSections:(NSIndexSet *)sections animationOptions:(ASDataControllerAnimationOptions)options;
-- (void)reloadSections:(NSIndexSet *)sections animationOptions:(ASDataControllerAnimationOptions)options;
-- (void)insertItems:(NSArray<NSIndexPath *> *)indexPaths animationOptions:(ASDataControllerAnimationOptions)options;
-- (void)deleteItems:(NSArray<NSIndexPath *> *)indexPaths animationOptions:(ASDataControllerAnimationOptions)options;
-- (void)reloadItems:(NSArray<NSIndexPath *> *)indexPaths animationOptions:(ASDataControllerAnimationOptions)options;
-- (void)moveSection:(NSInteger)section toSection:(NSInteger)newSection animationOptions:(ASDataControllerAnimationOptions)options;
-- (void)moveItemAtIndexPath:(NSIndexPath *)indexPath toIndexPath:(NSIndexPath *)newIndexPath animationOptions:(ASDataControllerAnimationOptions)options;
-
-@end
-
-NS_ASSUME_NONNULL_END
-
-#endif
diff --git a/submodules/AsyncDisplayKit/Source/Private/_ASHierarchyChangeSet.mm b/submodules/AsyncDisplayKit/Source/Private/_ASHierarchyChangeSet.mm
deleted file mode 100644
index 77d4d1af3f..0000000000
--- a/submodules/AsyncDisplayKit/Source/Private/_ASHierarchyChangeSet.mm
+++ /dev/null
@@ -1,1016 +0,0 @@
-//
-//  _ASHierarchyChangeSet.mm
-//  Texture
-//
-//  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.
-//  Changes after 4/13/2017 are: Copyright (c) Pinterest, Inc.  All rights reserved.
-//  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
-//
-
-#ifndef MINIMAL_ASDK
-
-#import <AsyncDisplayKit/_ASHierarchyChangeSet.h>
-#import <AsyncDisplayKit/ASInternalHelpers.h>
-#import <AsyncDisplayKit/ASCollections.h>
-#import <AsyncDisplayKit/NSIndexSet+ASHelpers.h>
-#import <AsyncDisplayKit/ASAssert.h>
-#import <AsyncDisplayKit/ASDisplayNode+Beta.h>
-#import <AsyncDisplayKit/ASObjectDescriptionHelpers.h>
-#import <unordered_map>
-#import <AsyncDisplayKit/ASDataController.h>
-#import <AsyncDisplayKit/ASBaseDefines.h>
-
-// If assertions are enabled and they haven't forced us to suppress the exception,
-// then throw, otherwise log.
-#if ASDISPLAYNODE_ASSERTIONS_ENABLED
-  #define ASFailUpdateValidation(...)\
-    _Pragma("clang diagnostic push")\
-    _Pragma("clang diagnostic ignored \"-Wdeprecated-declarations\"")\
-    if ([ASDisplayNode suppressesInvalidCollectionUpdateExceptions]) {\
-      NSLog(__VA_ARGS__);\
-    } else {\
-      NSLog(__VA_ARGS__);\
-      [NSException raise:ASCollectionInvalidUpdateException format:__VA_ARGS__];\
-    }\
-  _Pragma("clang diagnostic pop")
-#else
-  #define ASFailUpdateValidation(...) NSLog(__VA_ARGS__);
-#endif
-
-BOOL ASHierarchyChangeTypeIsFinal(_ASHierarchyChangeType changeType) {
-    switch (changeType) {
-        case _ASHierarchyChangeTypeInsert:
-        case _ASHierarchyChangeTypeDelete:
-            return YES;
-        default:
-            return NO;
-    }
-}
-
-NSString *NSStringFromASHierarchyChangeType(_ASHierarchyChangeType changeType)
-{
-  switch (changeType) {
-    case _ASHierarchyChangeTypeInsert:
-      return @"Insert";
-    case _ASHierarchyChangeTypeOriginalInsert:
-      return @"OriginalInsert";
-    case _ASHierarchyChangeTypeDelete:
-      return @"Delete";
-    case _ASHierarchyChangeTypeOriginalDelete:
-      return @"OriginalDelete";
-    case _ASHierarchyChangeTypeReload:
-      return @"Reload";
-    default:
-      return @"(invalid)";
-  }
-}
-
-@interface _ASHierarchySectionChange ()
-- (instancetype)initWithChangeType:(_ASHierarchyChangeType)changeType indexSet:(NSIndexSet *)indexSet animationOptions:(ASDataControllerAnimationOptions)animationOptions;
-
-/**
- On return `changes` is sorted according to the change type with changes coalesced by animationOptions
- Assumes: `changes` all have the same changeType
- */
-+ (void)sortAndCoalesceSectionChanges:(NSMutableArray<_ASHierarchySectionChange *> *)changes;
-
-/// Returns all the indexes from all the `indexSet`s of the given `_ASHierarchySectionChange` objects.
-+ (NSMutableIndexSet *)allIndexesInSectionChanges:(NSArray *)changes;
-
-+ (NSString *)smallDescriptionForSectionChanges:(NSArray<_ASHierarchySectionChange *> *)changes;
-@end
-
-@interface _ASHierarchyItemChange ()
-- (instancetype)initWithChangeType:(_ASHierarchyChangeType)changeType indexPaths:(NSArray *)indexPaths animationOptions:(ASDataControllerAnimationOptions)animationOptions presorted:(BOOL)presorted;
-
-/**
- On return `changes` is sorted according to the change type with changes coalesced by animationOptions
- Assumes: `changes` all have the same changeType
- */
-+ (void)sortAndCoalesceItemChanges:(NSMutableArray<_ASHierarchyItemChange *> *)changes ignoringChangesInSections:(NSIndexSet *)sections;
-
-+ (NSString *)smallDescriptionForItemChanges:(NSArray<_ASHierarchyItemChange *> *)changes;
-
-+ (void)ensureItemChanges:(NSArray<_ASHierarchyItemChange *> *)changes ofSameType:(_ASHierarchyChangeType)changeType;
-@end
-
-@interface _ASHierarchyChangeSet ()
-
-// array index is old section index, map goes oldItem -> newItem
-@property (nonatomic, readonly) NSMutableArray<ASIntegerMap *> *itemMappings;
-
-// array index is new section index, map goes newItem -> oldItem
-@property (nonatomic, readonly) NSMutableArray<ASIntegerMap *> *reverseItemMappings;
-
-@property (nonatomic, readonly) NSMutableArray<_ASHierarchyItemChange *> *insertItemChanges;
-@property (nonatomic, readonly) NSMutableArray<_ASHierarchyItemChange *> *originalInsertItemChanges;
-
-@property (nonatomic, readonly) NSMutableArray<_ASHierarchyItemChange *> *deleteItemChanges;
-@property (nonatomic, readonly) NSMutableArray<_ASHierarchyItemChange *> *originalDeleteItemChanges;
-
-@property (nonatomic, readonly) NSMutableArray<_ASHierarchyItemChange *> *reloadItemChanges;
-
-@property (nonatomic, readonly) NSMutableArray<_ASHierarchySectionChange *> *insertSectionChanges;
-@property (nonatomic, readonly) NSMutableArray<_ASHierarchySectionChange *> *originalInsertSectionChanges;
-
-@property (nonatomic, readonly) NSMutableArray<_ASHierarchySectionChange *> *deleteSectionChanges;
-@property (nonatomic, readonly) NSMutableArray<_ASHierarchySectionChange *> *originalDeleteSectionChanges;
-
-@property (nonatomic, readonly) NSMutableArray<_ASHierarchySectionChange *> *reloadSectionChanges;
-
-@end
-
-@implementation _ASHierarchyChangeSet {
-  NSUInteger _countForAsyncLayout;
-  std::vector<NSInteger> _oldItemCounts;
-  std::vector<NSInteger> _newItemCounts;
-  void (^_completionHandler)(BOOL finished);
-}
-@synthesize sectionMapping = _sectionMapping;
-@synthesize reverseSectionMapping = _reverseSectionMapping;
-@synthesize itemMappings = _itemMappings;
-@synthesize reverseItemMappings = _reverseItemMappings;
-@synthesize countForAsyncLayout = _countForAsyncLayout;
-
-- (instancetype)init
-{
-  ASFailUpdateValidation(@"_ASHierarchyChangeSet: -init is not supported. Call -initWithOldData:");
-  return [self initWithOldData:std::vector<NSInteger>()];
-}
-
-- (instancetype)initWithOldData:(std::vector<NSInteger>)oldItemCounts
-{
-  self = [super init];
-  if (self) {
-    _oldItemCounts = oldItemCounts;
-    
-    _originalInsertItemChanges = [[NSMutableArray alloc] init];
-    _insertItemChanges = [[NSMutableArray alloc] init];
-    _originalDeleteItemChanges = [[NSMutableArray alloc] init];
-    _deleteItemChanges = [[NSMutableArray alloc] init];
-    _reloadItemChanges = [[NSMutableArray alloc] init];
-    
-    _originalInsertSectionChanges = [[NSMutableArray alloc] init];
-    _insertSectionChanges = [[NSMutableArray alloc] init];
-    _originalDeleteSectionChanges = [[NSMutableArray alloc] init];
-    _deleteSectionChanges = [[NSMutableArray alloc] init];
-    _reloadSectionChanges = [[NSMutableArray alloc] init];
-  }
-  return self;
-}
-
-#pragma mark External API
-
-- (BOOL)isEmpty
-{
-  return (! _includesReloadData) && (! [self _includesPerItemOrSectionChanges]);
-}
-
-- (void)addCompletionHandler:(void (^)(BOOL))completion
-{
-  [self _ensureNotCompleted];
-  if (completion == nil) {
-    return;
-  }
-
-  void (^oldCompletionHandler)(BOOL finished) = _completionHandler;
-  _completionHandler = ^(BOOL finished) {
-    if (oldCompletionHandler != nil) {
-    	oldCompletionHandler(finished);
-    }
-    completion(finished);
-  };
-}
-
-- (void)executeCompletionHandlerWithFinished:(BOOL)finished
-{
-  if (_completionHandler != nil) {
-    _completionHandler(finished);
-    _completionHandler = nil;
-  }
-}
-
-- (void)markCompletedWithNewItemCounts:(std::vector<NSInteger>)newItemCounts
-{
-  NSAssert(!_completed, @"Attempt to mark already-completed changeset as completed.");
-  _completed = YES;
-  _newItemCounts = newItemCounts;
-  [self _sortAndCoalesceChangeArrays];
-  [self _validateUpdate];
-}
-
-- (NSArray *)sectionChangesOfType:(_ASHierarchyChangeType)changeType
-{
-  [self _ensureCompleted];
-  switch (changeType) {
-    case _ASHierarchyChangeTypeInsert:
-      return _insertSectionChanges;
-    case _ASHierarchyChangeTypeReload:
-      return _reloadSectionChanges;
-    case _ASHierarchyChangeTypeDelete:
-      return _deleteSectionChanges;
-    case _ASHierarchyChangeTypeOriginalDelete:
-      return _originalDeleteSectionChanges;
-    case _ASHierarchyChangeTypeOriginalInsert:
-      return _originalInsertSectionChanges;
-    default:
-      NSAssert(NO, @"Request for section changes with invalid type: %lu", (long)changeType);
-      return nil;
-  }
-}
-
-- (NSArray *)itemChangesOfType:(_ASHierarchyChangeType)changeType
-{
-  [self _ensureCompleted];
-  switch (changeType) {
-    case _ASHierarchyChangeTypeInsert:
-      return _insertItemChanges;
-    case _ASHierarchyChangeTypeReload:
-      return _reloadItemChanges;
-    case _ASHierarchyChangeTypeDelete:
-      return _deleteItemChanges;
-    case _ASHierarchyChangeTypeOriginalInsert:
-      return _originalInsertItemChanges;
-    case _ASHierarchyChangeTypeOriginalDelete:
-      return _originalDeleteItemChanges;
-    default:
-      NSAssert(NO, @"Request for item changes with invalid type: %lu", (long)changeType);
-      return nil;
-  }
-}
-
-- (NSIndexSet *)indexesForItemChangesOfType:(_ASHierarchyChangeType)changeType inSection:(NSUInteger)section
-{
-  [self _ensureCompleted];
-  const auto result = [[NSMutableIndexSet alloc] init];
-  for (_ASHierarchyItemChange *change in [self itemChangesOfType:changeType]) {
-    [result addIndexes:[NSIndexSet as_indexSetFromIndexPaths:change.indexPaths inSection:section]];
-  }
-  return result;
-}
-
-- (NSUInteger)newSectionForOldSection:(NSUInteger)oldSection
-{
-  return [self.sectionMapping integerForKey:oldSection];
-}
-
-- (NSUInteger)oldSectionForNewSection:(NSUInteger)newSection
-{
-  return [self.reverseSectionMapping integerForKey:newSection];
-}
-
-- (ASIntegerMap *)sectionMapping
-{
-  ASDisplayNodeAssertNotNil(_deletedSections, @"Cannot call %s before `markCompleted` returns.", sel_getName(_cmd));
-  ASDisplayNodeAssertNotNil(_insertedSections, @"Cannot call %s before `markCompleted` returns.", sel_getName(_cmd));
-  [self _ensureCompleted];
-  if (_sectionMapping == nil) {
-    _sectionMapping = [ASIntegerMap mapForUpdateWithOldCount:_oldItemCounts.size() deleted:_deletedSections inserted:_insertedSections];
-  }
-  return _sectionMapping;
-}
-
-- (ASIntegerMap *)reverseSectionMapping
-{
-  if (_reverseSectionMapping == nil) {
-    _reverseSectionMapping = [self.sectionMapping inverseMap];
-  }
-  return _reverseSectionMapping;
-}
-
-- (NSMutableArray *)itemMappings
-{
-  [self _ensureCompleted];
-
-  if (_itemMappings == nil) {
-    _itemMappings = [[NSMutableArray alloc] init];
-    const auto insertMap = [_ASHierarchyItemChange sectionToIndexSetMapFromChanges:_originalInsertItemChanges];
-    const auto deleteMap = [_ASHierarchyItemChange sectionToIndexSetMapFromChanges:_originalDeleteItemChanges];
-    NSInteger oldSection = 0;
-    for (NSInteger oldCount : _oldItemCounts) {
-      NSInteger newSection = [self newSectionForOldSection:oldSection];
-      ASIntegerMap *table;
-      if (newSection == NSNotFound) {
-        table = ASIntegerMap.emptyMap;
-      } else {
-        table = [ASIntegerMap mapForUpdateWithOldCount:oldCount deleted:deleteMap[@(oldSection)] inserted:insertMap[@(newSection)]];
-      }
-      _itemMappings[oldSection] = table;
-      oldSection++;
-    }
-  }
-  return _itemMappings;
-}
-
-- (NSMutableArray *)reverseItemMappings
-{
-  [self _ensureCompleted];
-
-  if (_reverseItemMappings == nil) {
-    _reverseItemMappings = [[NSMutableArray alloc] init];
-    for (NSInteger newSection = 0; newSection < _newItemCounts.size(); newSection++) {
-      NSInteger oldSection = [self oldSectionForNewSection:newSection];
-      ASIntegerMap *table;
-      if (oldSection == NSNotFound) {
-        table = ASIntegerMap.emptyMap;
-      } else {
-        table = [[self itemMappingInSection:oldSection] inverseMap];
-      }
-      _reverseItemMappings[newSection] = table;
-    }
-  }
-  return _reverseItemMappings;
-}
-
-- (ASIntegerMap *)itemMappingInSection:(NSInteger)oldSection
-{
-  if (self.includesReloadData || oldSection >= _oldItemCounts.size()) {
-    return ASIntegerMap.emptyMap;
-  }
-  return self.itemMappings[oldSection];
-}
-
-- (ASIntegerMap *)reverseItemMappingInSection:(NSInteger)newSection
-{
-  if (self.includesReloadData || newSection >= _newItemCounts.size()) {
-    return ASIntegerMap.emptyMap;
-  }
-  return self.reverseItemMappings[newSection];
-}
-
-- (NSIndexPath *)oldIndexPathForNewIndexPath:(NSIndexPath *)indexPath
-{
-  [self _ensureCompleted];
-  NSInteger newSection = indexPath.section;
-  NSInteger oldSection = [self oldSectionForNewSection:newSection];
-  if (oldSection == NSNotFound) {
-    return nil;
-  }
-  NSInteger oldItem = [[self reverseItemMappingInSection:newSection] integerForKey:indexPath.item];
-  if (oldItem == NSNotFound) {
-    return nil;
-  }
-  return [NSIndexPath indexPathForItem:oldItem inSection:oldSection];
-}
-
-- (NSIndexPath *)newIndexPathForOldIndexPath:(NSIndexPath *)indexPath
-{
-  [self _ensureCompleted];
-  NSInteger oldSection = indexPath.section;
-  NSInteger newSection = [self newSectionForOldSection:oldSection];
-  if (newSection == NSNotFound) {
-    return nil;
-  }
-  NSInteger newItem = [[self itemMappingInSection:oldSection] integerForKey:indexPath.item];
-  if (newItem == NSNotFound) {
-    return nil;
-  }
-  return [NSIndexPath indexPathForItem:newItem inSection:newSection];
-}
-
-- (void)reloadData
-{
-  [self _ensureNotCompleted];
-  NSAssert(_includesReloadData == NO, @"Attempt to reload data multiple times %@", self);
-  _includesReloadData = YES;
-}
-
-- (void)deleteItems:(NSArray *)indexPaths animationOptions:(ASDataControllerAnimationOptions)options
-{
-  [self _ensureNotCompleted];
-  _ASHierarchyItemChange *change = [[_ASHierarchyItemChange alloc] initWithChangeType:_ASHierarchyChangeTypeOriginalDelete indexPaths:indexPaths animationOptions:options presorted:NO];
-  [_originalDeleteItemChanges addObject:change];
-}
-
-- (void)deleteSections:(NSIndexSet *)sections animationOptions:(ASDataControllerAnimationOptions)options
-{
-  [self _ensureNotCompleted];
-  _ASHierarchySectionChange *change = [[_ASHierarchySectionChange alloc] initWithChangeType:_ASHierarchyChangeTypeOriginalDelete indexSet:sections animationOptions:options];
-  [_originalDeleteSectionChanges addObject:change];
-}
-
-- (void)insertItems:(NSArray *)indexPaths animationOptions:(ASDataControllerAnimationOptions)options
-{
-  [self _ensureNotCompleted];
-  _ASHierarchyItemChange *change = [[_ASHierarchyItemChange alloc] initWithChangeType:_ASHierarchyChangeTypeOriginalInsert indexPaths:indexPaths animationOptions:options presorted:NO];
-  [_originalInsertItemChanges addObject:change];
-}
-
-- (void)insertSections:(NSIndexSet *)sections animationOptions:(ASDataControllerAnimationOptions)options
-{
-  [self _ensureNotCompleted];
-  _ASHierarchySectionChange *change = [[_ASHierarchySectionChange alloc] initWithChangeType:_ASHierarchyChangeTypeOriginalInsert indexSet:sections animationOptions:options];
-  [_originalInsertSectionChanges addObject:change];
-}
-
-- (void)reloadItems:(NSArray *)indexPaths animationOptions:(ASDataControllerAnimationOptions)options
-{
-  [self _ensureNotCompleted];
-  _ASHierarchyItemChange *change = [[_ASHierarchyItemChange alloc] initWithChangeType:_ASHierarchyChangeTypeReload indexPaths:indexPaths animationOptions:options presorted:NO];
-  [_reloadItemChanges addObject:change];
-}
-
-- (void)reloadSections:(NSIndexSet *)sections animationOptions:(ASDataControllerAnimationOptions)options
-{
-  [self _ensureNotCompleted];
-  _ASHierarchySectionChange *change = [[_ASHierarchySectionChange alloc] initWithChangeType:_ASHierarchyChangeTypeReload indexSet:sections animationOptions:options];
-  [_reloadSectionChanges addObject:change];
-}
-
-- (void)moveItemAtIndexPath:(NSIndexPath *)indexPath toIndexPath:(NSIndexPath *)newIndexPath animationOptions:(ASDataControllerAnimationOptions)options
-{
-  /**
-   * TODO: Proper move implementation.
-   */
-  [self deleteItems:@[ indexPath ] animationOptions:options];
-  [self insertItems:@[ newIndexPath ] animationOptions:options];
-}
-
-- (void)moveSection:(NSInteger)section toSection:(NSInteger)newSection animationOptions:(ASDataControllerAnimationOptions)options
-{
-  /**
-   * TODO: Proper move implementation.
-   */
-  [self deleteSections:[NSIndexSet indexSetWithIndex:section] animationOptions:options];
-  [self insertSections:[NSIndexSet indexSetWithIndex:newSection] animationOptions:options];
-}
-
-#pragma mark Private
-
-- (BOOL)_ensureNotCompleted
-{
-  NSAssert(!_completed, @"Attempt to modify completed changeset %@", self);
-  return !_completed;
-}
-
-- (BOOL)_ensureCompleted
-{
-  NSAssert(_completed, @"Attempt to process incomplete changeset %@", self);
-  return _completed;
-}
-
-- (void)_sortAndCoalesceChangeArrays
-{
-  if (_includesReloadData) {
-    return;
-  }
-  
-  @autoreleasepool {
-
-    // Split reloaded sections into [delete(oldIndex), insert(newIndex)]
-    
-    // Give these their "pre-reloads" values. Once we add in the reloads we'll re-process them.
-    _deletedSections = [_ASHierarchySectionChange allIndexesInSectionChanges:_originalDeleteSectionChanges];
-    _insertedSections = [_ASHierarchySectionChange allIndexesInSectionChanges:_originalInsertSectionChanges];
-    for (_ASHierarchySectionChange *originalDeleteSectionChange in _originalDeleteSectionChanges) {
-      [_deleteSectionChanges addObject:[originalDeleteSectionChange changeByFinalizingType]];
-    }
-    for (_ASHierarchySectionChange *originalInsertSectionChange in _originalInsertSectionChanges) {
-      [_insertSectionChanges addObject:[originalInsertSectionChange changeByFinalizingType]];
-    }
-    
-    for (_ASHierarchySectionChange *change in _reloadSectionChanges) {
-      NSIndexSet *newSections = [change.indexSet as_indexesByMapping:^(NSUInteger idx) {
-        NSUInteger newSec = [self newSectionForOldSection:idx];
-        ASDisplayNodeAssert(newSec != NSNotFound, @"Request to reload and delete same section %tu", idx);
-        return newSec;
-      }];
-      
-      _ASHierarchySectionChange *deleteChange = [[_ASHierarchySectionChange alloc] initWithChangeType:_ASHierarchyChangeTypeDelete indexSet:change.indexSet animationOptions:change.animationOptions];
-      [_deleteSectionChanges addObject:deleteChange];
-      
-      _ASHierarchySectionChange *insertChange = [[_ASHierarchySectionChange alloc] initWithChangeType:_ASHierarchyChangeTypeInsert indexSet:newSections animationOptions:change.animationOptions];
-      [_insertSectionChanges addObject:insertChange];
-    }
-    
-    [_ASHierarchySectionChange sortAndCoalesceSectionChanges:_deleteSectionChanges];
-    [_ASHierarchySectionChange sortAndCoalesceSectionChanges:_insertSectionChanges];
-    _deletedSections = [_ASHierarchySectionChange allIndexesInSectionChanges:_deleteSectionChanges];
-    _insertedSections = [_ASHierarchySectionChange allIndexesInSectionChanges:_insertSectionChanges];
-
-    // Split reloaded items into [delete(oldIndexPath), insert(newIndexPath)]
-    for (_ASHierarchyItemChange *originalDeleteItemChange in _originalDeleteItemChanges) {
-      [_deleteItemChanges addObject:[originalDeleteItemChange changeByFinalizingType]];
-    }
-    for (_ASHierarchyItemChange *originalInsertItemChange in _originalInsertItemChanges) {
-      [_insertItemChanges addObject:[originalInsertItemChange changeByFinalizingType]];
-    }
-    
-    [_ASHierarchyItemChange ensureItemChanges:_insertItemChanges ofSameType:_ASHierarchyChangeTypeInsert];
-    [_ASHierarchyItemChange ensureItemChanges:_deleteItemChanges ofSameType:_ASHierarchyChangeTypeDelete];
-    
-    for (_ASHierarchyItemChange *change in _reloadItemChanges) {
-      NSAssert(change.changeType == _ASHierarchyChangeTypeReload, @"It must be a reload change to be in here");
-
-      const auto newIndexPaths = ASArrayByFlatMapping(change.indexPaths, NSIndexPath *indexPath, [self newIndexPathForOldIndexPath:indexPath]);
-      
-      // All reload changes are translated into deletes and inserts
-      // We delete the items that needs reload together with other deleted items, at their original index
-      _ASHierarchyItemChange *deleteItemChangeFromReloadChange = [[_ASHierarchyItemChange alloc] initWithChangeType:_ASHierarchyChangeTypeDelete indexPaths:change.indexPaths animationOptions:change.animationOptions presorted:NO];
-      [_deleteItemChanges addObject:deleteItemChangeFromReloadChange];
-      // We insert the items that needs reload together with other inserted items, at their future index
-      _ASHierarchyItemChange *insertItemChangeFromReloadChange = [[_ASHierarchyItemChange alloc] initWithChangeType:_ASHierarchyChangeTypeInsert indexPaths:newIndexPaths animationOptions:change.animationOptions presorted:NO];
-      [_insertItemChanges addObject:insertItemChangeFromReloadChange];
-    }
-    
-    // Ignore item deletes in reloaded/deleted sections.
-    [_ASHierarchyItemChange sortAndCoalesceItemChanges:_deleteItemChanges ignoringChangesInSections:_deletedSections];
-
-    // Ignore item inserts in reloaded(new)/inserted sections.
-    [_ASHierarchyItemChange sortAndCoalesceItemChanges:_insertItemChanges ignoringChangesInSections:_insertedSections];
-  }
-}
-
-- (void)_validateUpdate
-{
-  // If reloadData exists, ignore other changes
-  if (_includesReloadData) {
-    if ([self _includesPerItemOrSectionChanges]) {
-      NSLog(@"Warning: A reload data shouldn't be used in conjuntion with other updates.");
-    }
-    return;
-  }
-  
-  NSIndexSet *allReloadedSections = [_ASHierarchySectionChange allIndexesInSectionChanges:_reloadSectionChanges];
-  
-  NSInteger newSectionCount = _newItemCounts.size();
-  NSInteger oldSectionCount = _oldItemCounts.size();
-  
-  NSInteger insertedSectionCount = _insertedSections.count;
-  NSInteger deletedSectionCount = _deletedSections.count;
-  // Assert that the new section count is correct.
-  if (newSectionCount != oldSectionCount + insertedSectionCount - deletedSectionCount) {
-    ASFailUpdateValidation(@"Invalid number of sections. The number of sections after the update (%ld) must be equal to the number of sections before the update (%ld) plus or minus the number of sections inserted or deleted (%ld inserted, %ld deleted)", (long)newSectionCount, (long)oldSectionCount, (long)insertedSectionCount, (long)deletedSectionCount);
-    return;
-  }
-  
-  // Assert that no invalid deletes/reloads happened.
-  NSInteger invalidSectionDelete = NSNotFound;
-  if (oldSectionCount == 0) {
-    invalidSectionDelete = _deletedSections.firstIndex;
-  } else {
-    invalidSectionDelete = [_deletedSections indexGreaterThanIndex:oldSectionCount - 1];
-  }
-  if (invalidSectionDelete != NSNotFound) {
-    ASFailUpdateValidation(@"Attempt to delete section %ld but there are only %ld sections before the update.", (long)invalidSectionDelete, (long)oldSectionCount);
-    return;
-  }
-  
-  for (_ASHierarchyItemChange *change in _deleteItemChanges) {
-    for (NSIndexPath *indexPath in change.indexPaths) {
-      // Assert that item delete happened in a valid section.
-      NSInteger section = indexPath.section;
-      NSInteger item = indexPath.item;
-      if (section >= oldSectionCount) {
-        ASFailUpdateValidation(@"Attempt to delete item %ld from section %ld, but there are only %ld sections before the update.", (long)item, (long)section, (long)oldSectionCount);
-        return;
-      }
-      
-      // Assert that item delete happened to a valid item.
-      NSInteger oldItemCount = _oldItemCounts[section];
-      if (item >= oldItemCount) {
-        ASFailUpdateValidation(@"Attempt to delete item %ld from section %ld, which only contains %ld items before the update.", (long)item, (long)section, (long)oldItemCount);
-        return;
-      }
-    }
-  }
-  
-  for (_ASHierarchyItemChange *change in _insertItemChanges) {
-    for (NSIndexPath *indexPath in change.indexPaths) {
-      NSInteger section = indexPath.section;
-      NSInteger item = indexPath.item;
-      // Assert that item insert happened in a valid section.
-      if (section >= newSectionCount) {
-        ASFailUpdateValidation(@"Attempt to insert item %ld into section %ld, but there are only %ld sections after the update.", (long)item, (long)section, (long)newSectionCount);
-        return;
-      }
-      
-      // Assert that item delete happened to a valid item.
-      NSInteger newItemCount = _newItemCounts[section];
-      if (item >= newItemCount) {
-        ASFailUpdateValidation(@"Attempt to insert item %ld into section %ld, which only contains %ld items after the update.", (long)item, (long)section, (long)newItemCount);
-        return;
-      }
-    }
-  }
-  
-  // Assert that no sections were inserted out of bounds.
-  NSInteger invalidSectionInsert = NSNotFound;
-  if (newSectionCount == 0) {
-    invalidSectionInsert = _insertedSections.firstIndex;
-  } else {
-    invalidSectionInsert = [_insertedSections indexGreaterThanIndex:newSectionCount - 1];
-  }
-  if (invalidSectionInsert != NSNotFound) {
-    ASFailUpdateValidation(@"Attempt to insert section %ld but there are only %ld sections after the update.", (long)invalidSectionInsert, (long)newSectionCount);
-    return;
-  }
-  
-  for (NSUInteger oldSection = 0; oldSection < oldSectionCount; oldSection++) {
-    NSInteger oldItemCount = _oldItemCounts[oldSection];
-    // If section was reloaded, ignore.
-    if ([allReloadedSections containsIndex:oldSection]) {
-      continue;
-    }
-    
-    // If section was deleted, ignore.
-    NSUInteger newSection = [self newSectionForOldSection:oldSection];
-    if (newSection == NSNotFound) {
-      continue;
-    }
-    
-    NSIndexSet *originalInsertedItems = [self indexesForItemChangesOfType:_ASHierarchyChangeTypeOriginalInsert inSection:newSection];
-    NSIndexSet *originalDeletedItems = [self indexesForItemChangesOfType:_ASHierarchyChangeTypeOriginalDelete inSection:oldSection];
-    NSIndexSet *reloadedItems = [self indexesForItemChangesOfType:_ASHierarchyChangeTypeReload inSection:oldSection];
-    
-    // Assert that no reloaded items were deleted.
-    NSInteger deletedReloadedItem = [originalDeletedItems as_intersectionWithIndexes:reloadedItems].firstIndex;
-    if (deletedReloadedItem != NSNotFound) {
-      ASFailUpdateValidation(@"Attempt to delete and reload the same item at index path %@", [NSIndexPath indexPathForItem:deletedReloadedItem inSection:oldSection]);
-      return;
-    }
-    
-    // Assert that the new item count is correct.
-    NSInteger newItemCount = _newItemCounts[newSection];
-    NSInteger insertedItemCount = originalInsertedItems.count;
-    NSInteger deletedItemCount = originalDeletedItems.count;
-    if (newItemCount != oldItemCount + insertedItemCount - deletedItemCount) {
-      ASFailUpdateValidation(@"Invalid number of items in section %ld. The number of items after the update (%ld) must be equal to the number of items before the update (%ld) plus or minus the number of items inserted or deleted (%ld inserted, %ld deleted).", (long)oldSection, (long)newItemCount, (long)oldItemCount, (long)insertedItemCount, (long)deletedItemCount);
-      return;
-    }
-  }
-}
-
-- (BOOL)_includesPerItemOrSectionChanges
-{
-  return 0 < (_originalDeleteSectionChanges.count + _originalDeleteItemChanges.count
-              +_originalInsertSectionChanges.count + _originalInsertItemChanges.count
-              + _reloadSectionChanges.count + _reloadItemChanges.count);
-}
-
-#pragma mark - Debugging (Private)
-
-- (NSString *)description
-{
-  return ASObjectDescriptionMakeWithoutObject([self propertiesForDescription]);
-}
-
-- (NSString *)debugDescription
-{
-  return ASObjectDescriptionMake(self, [self propertiesForDebugDescription]);
-}
-
-- (NSMutableArray<NSDictionary *> *)propertiesForDescription
-{
-  NSMutableArray<NSDictionary *> *result = [NSMutableArray array];
-  if (_includesReloadData) {
-    [result addObject:@{ @"reloadData" : @"YES" }];
-  }
-  if (_reloadSectionChanges.count > 0) {
-    [result addObject:@{ @"reloadSections" : [_ASHierarchySectionChange smallDescriptionForSectionChanges:_reloadSectionChanges] }];
-  }
-  if (_reloadItemChanges.count > 0) {
-    [result addObject:@{ @"reloadItems" : [_ASHierarchyItemChange smallDescriptionForItemChanges:_reloadItemChanges] }];
-  }
-  if (_originalDeleteSectionChanges.count > 0) {
-    [result addObject:@{ @"deleteSections" : [_ASHierarchySectionChange smallDescriptionForSectionChanges:_originalDeleteSectionChanges] }];
-  }
-  if (_originalDeleteItemChanges.count > 0) {
-    [result addObject:@{ @"deleteItems" : [_ASHierarchyItemChange smallDescriptionForItemChanges:_originalDeleteItemChanges] }];
-  }
-  if (_originalInsertSectionChanges.count > 0) {
-    [result addObject:@{ @"insertSections" : [_ASHierarchySectionChange smallDescriptionForSectionChanges:_originalInsertSectionChanges] }];
-  }
-  if (_originalInsertItemChanges.count > 0) {
-    [result addObject:@{ @"insertItems" : [_ASHierarchyItemChange smallDescriptionForItemChanges:_originalInsertItemChanges] }];
-  }
-  return result;
-}
-
-- (NSMutableArray<NSDictionary *> *)propertiesForDebugDescription
-{
-  return [self propertiesForDescription];
-}
-
-@end
-
-@implementation _ASHierarchySectionChange
-
-- (instancetype)initWithChangeType:(_ASHierarchyChangeType)changeType indexSet:(NSIndexSet *)indexSet animationOptions:(ASDataControllerAnimationOptions)animationOptions
-{
-  self = [super init];
-  if (self) {
-    ASDisplayNodeAssert(indexSet.count > 0, @"Request to create _ASHierarchySectionChange with no sections!");
-    _changeType = changeType;
-    _indexSet = indexSet;
-    _animationOptions = animationOptions;
-  }
-  return self;
-}
-
-- (_ASHierarchySectionChange *)changeByFinalizingType
-{
-  _ASHierarchyChangeType newType;
-  switch (_changeType) {
-    case _ASHierarchyChangeTypeOriginalInsert:
-      newType = _ASHierarchyChangeTypeInsert;
-      break;
-    case _ASHierarchyChangeTypeOriginalDelete:
-      newType = _ASHierarchyChangeTypeDelete;
-      break;
-    default:
-      ASFailUpdateValidation(@"Attempt to finalize section change of invalid type %@.", NSStringFromASHierarchyChangeType(_changeType));
-      return self;
-  }
-  return [[_ASHierarchySectionChange alloc] initWithChangeType:newType indexSet:_indexSet animationOptions:_animationOptions];
-}
-
-+ (void)sortAndCoalesceSectionChanges:(NSMutableArray<_ASHierarchySectionChange *> *)changes
-{
-  _ASHierarchySectionChange *firstChange = changes.firstObject;
-  if (firstChange == nil) {
-    return;
-  }
-  _ASHierarchyChangeType type = [firstChange changeType];
-  
-  ASDisplayNodeAssert(ASHierarchyChangeTypeIsFinal(type), @"Attempt to sort and coalesce section changes of intermediary type %@. Why?", NSStringFromASHierarchyChangeType(type));
-    
-  // Lookup table [Int: AnimationOptions]
-  __block std::unordered_map<NSUInteger, ASDataControllerAnimationOptions> animationOptions;
-  
-  // All changed indexes
-  NSMutableIndexSet *allIndexes = [NSMutableIndexSet new];
-  
-  for (_ASHierarchySectionChange *change in changes) {
-    ASDataControllerAnimationOptions options = change.animationOptions;
-    NSIndexSet *indexes = change.indexSet;
-    [indexes enumerateRangesUsingBlock:^(NSRange range, BOOL * _Nonnull stop) {
-      for (NSUInteger i = range.location; i < NSMaxRange(range); i++) {
-        animationOptions[i] = options;
-      }
-    }];
-    [allIndexes addIndexes:indexes];
-  }
-  
-  // Create new changes by grouping sorted changes by animation option
-  NSMutableArray *result = [[NSMutableArray alloc] init];
-  
-  __block ASDataControllerAnimationOptions currentOptions = 0;
-  const auto currentIndexes = [[NSMutableIndexSet alloc] init];
-
-  BOOL reverse = type == _ASHierarchyChangeTypeDelete || type == _ASHierarchyChangeTypeOriginalDelete;
-  NSEnumerationOptions options = reverse ? NSEnumerationReverse : kNilOptions;
-
-  [allIndexes enumerateRangesWithOptions:options usingBlock:^(NSRange range, BOOL * _Nonnull stop) {
-    NSInteger increment = reverse ? -1 : 1;
-    NSUInteger start = reverse ? NSMaxRange(range) - 1 : range.location;
-    NSInteger limit = reverse ? range.location - 1 : NSMaxRange(range);
-    for (NSInteger i = start; i != limit; i += increment) {
-      ASDataControllerAnimationOptions options = animationOptions[i];
-      
-      // End the previous group if needed.
-      if (options != currentOptions && currentIndexes.count > 0) {
-        _ASHierarchySectionChange *change = [[_ASHierarchySectionChange alloc] initWithChangeType:type indexSet:[currentIndexes copy] animationOptions:currentOptions];
-        [result addObject:change];
-        [currentIndexes removeAllIndexes];
-      }
-      
-      // Start a new group if needed.
-      if (currentIndexes.count == 0) {
-        currentOptions = options;
-      }
-      
-      [currentIndexes addIndex:i];
-    }
-  }];
-
-  // Finish up the last group.
-  if (currentIndexes.count > 0) {
-    _ASHierarchySectionChange *change = [[_ASHierarchySectionChange alloc] initWithChangeType:type indexSet:[currentIndexes copy] animationOptions:currentOptions];
-    [result addObject:change];
-  }
-
-  [changes setArray:result];
-}
-
-+ (NSMutableIndexSet *)allIndexesInSectionChanges:(NSArray<_ASHierarchySectionChange *> *)changes
-{
-  const auto indexes = [[NSMutableIndexSet alloc] init];
-  for (_ASHierarchySectionChange *change in changes) {
-    [indexes addIndexes:change.indexSet];
-  }
-  return indexes;
-}
-
-#pragma mark - Debugging (Private)
-
-+ (NSString *)smallDescriptionForSectionChanges:(NSArray<_ASHierarchySectionChange *> *)changes
-{
-  NSMutableIndexSet *unionIndexSet = [NSMutableIndexSet indexSet];
-  for (_ASHierarchySectionChange *change in changes) {
-    [unionIndexSet addIndexes:change.indexSet];
-  }
-  return [unionIndexSet as_smallDescription];
-}
-
-- (NSString *)description
-{
-  return ASObjectDescriptionMake(self, [self propertiesForDescription]);
-}
-
-- (NSString *)debugDescription
-{
-  return ASObjectDescriptionMake(self, [self propertiesForDebugDescription]);
-}
-
-- (NSString *)smallDescription
-{
-  return [self.indexSet as_smallDescription];
-}
-
-- (NSMutableArray<NSDictionary *> *)propertiesForDescription
-{
-  NSMutableArray<NSDictionary *> *result = [NSMutableArray array];
-  [result addObject:@{ @"indexes" : [self.indexSet as_smallDescription] }];
-  return result;
-}
-
-- (NSMutableArray<NSDictionary *> *)propertiesForDebugDescription
-{
-  NSMutableArray<NSDictionary *> *result = [NSMutableArray array];
-  [result addObject:@{ @"anim" : @(_animationOptions) }];
-  [result addObject:@{ @"type" : NSStringFromASHierarchyChangeType(_changeType) }];
-  [result addObject:@{ @"indexes" : self.indexSet }];
-  return result;
-}
-
-@end
-
-@implementation _ASHierarchyItemChange
-
-- (instancetype)initWithChangeType:(_ASHierarchyChangeType)changeType indexPaths:(NSArray *)indexPaths animationOptions:(ASDataControllerAnimationOptions)animationOptions presorted:(BOOL)presorted
-{
-  self = [super init];
-  if (self) {
-    ASDisplayNodeAssert(indexPaths.count > 0, @"Request to create _ASHierarchyItemChange with no items!");
-    _changeType = changeType;
-    if (presorted) {
-      _indexPaths = indexPaths;
-    } else {
-      SEL sorting = changeType == _ASHierarchyChangeTypeDelete ? @selector(asdk_inverseCompare:) : @selector(compare:);
-      _indexPaths = [indexPaths sortedArrayUsingSelector:sorting];
-    }
-    _animationOptions = animationOptions;
-  }
-  return self;
-}
-
-// Create a mapping out of changes indexPaths to a {@section : [indexSet]} fashion
-// e.g. changes: (0 - 0), (0 - 1), (2 - 5)
-//  will become: {@0 : [0, 1], @2 : [5]}
-+ (NSDictionary *)sectionToIndexSetMapFromChanges:(NSArray<_ASHierarchyItemChange *> *)changes
-{
-  NSMutableDictionary *sectionToIndexSetMap = [[NSMutableDictionary alloc] init];
-  for (_ASHierarchyItemChange *change in changes) {
-    for (NSIndexPath *indexPath in change.indexPaths) {
-      NSNumber *sectionKey = @(indexPath.section);
-      NSMutableIndexSet *indexSet = sectionToIndexSetMap[sectionKey];
-      if (indexSet) {
-        [indexSet addIndex:indexPath.item];
-      } else {
-        indexSet = [NSMutableIndexSet indexSetWithIndex:indexPath.item];
-        sectionToIndexSetMap[sectionKey] = indexSet;
-      }
-    }
-  }
-  return sectionToIndexSetMap;
-}
-
-+ (void)ensureItemChanges:(NSArray<_ASHierarchyItemChange *> *)changes ofSameType:(_ASHierarchyChangeType)changeType
-{
-#if ASDISPLAYNODE_ASSERTIONS_ENABLED
-  for (_ASHierarchyItemChange *change in changes) {
-    NSAssert(change.changeType == changeType, @"The map we created must all be of the same changeType as of now");
-  }
-#endif
-}
-
-- (_ASHierarchyItemChange *)changeByFinalizingType
-{
-  _ASHierarchyChangeType newType;
-  switch (_changeType) {
-    case _ASHierarchyChangeTypeOriginalInsert:
-      newType = _ASHierarchyChangeTypeInsert;
-      break;
-    case _ASHierarchyChangeTypeOriginalDelete:
-      newType = _ASHierarchyChangeTypeDelete;
-      break;
-    default:
-      ASFailUpdateValidation(@"Attempt to finalize item change of invalid type %@.", NSStringFromASHierarchyChangeType(_changeType));
-      return self;
-  }
-  return [[_ASHierarchyItemChange alloc] initWithChangeType:newType indexPaths:_indexPaths animationOptions:_animationOptions presorted:YES];
-}
-
-+ (void)sortAndCoalesceItemChanges:(NSMutableArray<_ASHierarchyItemChange *> *)changes ignoringChangesInSections:(NSIndexSet *)ignoredSections
-{
-  if (changes.count < 1) {
-    return;
-  }
-  
-  _ASHierarchyChangeType type = [changes.firstObject changeType];
-  ASDisplayNodeAssert(ASHierarchyChangeTypeIsFinal(type), @"Attempt to sort and coalesce item changes of intermediary type %@. Why?", NSStringFromASHierarchyChangeType(type));
-    
-  // Lookup table [NSIndexPath: AnimationOptions]
-  const auto animationOptions = [[NSMutableDictionary<NSIndexPath *, NSNumber *> alloc] init];
-  
-  // All changed index paths, sorted
-  const auto allIndexPaths = [[NSMutableArray<NSIndexPath *> alloc] init];
-  
-  for (_ASHierarchyItemChange *change in changes) {
-    for (NSIndexPath *indexPath in change.indexPaths) {
-      if (![ignoredSections containsIndex:indexPath.section]) {
-        animationOptions[indexPath] = @(change.animationOptions);
-        [allIndexPaths addObject:indexPath];
-      }
-    }
-  }
-  
-  SEL sorting = type == _ASHierarchyChangeTypeDelete ? @selector(asdk_inverseCompare:) : @selector(compare:);
-  [allIndexPaths sortUsingSelector:sorting];
-
-  // Create new changes by grouping sorted changes by animation option
-  const auto result = [[NSMutableArray<_ASHierarchyItemChange *> alloc] init];
-
-  ASDataControllerAnimationOptions currentOptions = 0;
-  const auto currentIndexPaths = [[NSMutableArray<NSIndexPath *> alloc] init];
-
-  for (NSIndexPath *indexPath in allIndexPaths) {
-    ASDataControllerAnimationOptions options = [animationOptions[indexPath] integerValue];
-
-    // End the previous group if needed.
-    if (options != currentOptions && currentIndexPaths.count > 0) {
-      _ASHierarchyItemChange *change = [[_ASHierarchyItemChange alloc] initWithChangeType:type indexPaths:[currentIndexPaths copy] animationOptions:currentOptions presorted:YES];
-      [result addObject:change];
-      [currentIndexPaths removeAllObjects];
-    }
-
-    // Start a new group if needed.
-    if (currentIndexPaths.count == 0) {
-      currentOptions = options;
-    }
-
-    [currentIndexPaths addObject:indexPath];
-  }
-
-  // Finish up the last group.
-  if (currentIndexPaths.count > 0) {
-    _ASHierarchyItemChange *change = [[_ASHierarchyItemChange alloc] initWithChangeType:type indexPaths:[currentIndexPaths copy] animationOptions:currentOptions presorted:YES];
-    [result addObject:change];
-  }
-
-  [changes setArray:result];
-}
-
-#pragma mark - Debugging (Private)
-
-+ (NSString *)smallDescriptionForItemChanges:(NSArray<_ASHierarchyItemChange *> *)changes
-{
-  NSDictionary *map = [self sectionToIndexSetMapFromChanges:changes];
-  NSMutableString *str = [NSMutableString stringWithString:@"{ "];
-  [map enumerateKeysAndObjectsUsingBlock:^(NSNumber * _Nonnull section, NSIndexSet * _Nonnull indexSet, BOOL * _Nonnull stop) {
-    [str appendFormat:@"@%lu : %@ ", (long)section.integerValue, [indexSet as_smallDescription]];
-  }];
-  [str appendString:@"}"];
-  return str;
-}
-
-- (NSString *)description
-{
-  return ASObjectDescriptionMake(self, [self propertiesForDescription]);
-}
-
-- (NSString *)debugDescription
-{
-  return ASObjectDescriptionMake(self, [self propertiesForDebugDescription]);
-}
-
-- (NSMutableArray<NSDictionary *> *)propertiesForDescription
-{
-  NSMutableArray<NSDictionary *> *result = [NSMutableArray array];
-  [result addObject:@{ @"indexPaths" : self.indexPaths }];
-  return result;
-}
-
-- (NSMutableArray<NSDictionary *> *)propertiesForDebugDescription
-{
-  NSMutableArray<NSDictionary *> *result = [NSMutableArray array];
-  [result addObject:@{ @"anim" : @(_animationOptions) }];
-  [result addObject:@{ @"type" : NSStringFromASHierarchyChangeType(_changeType) }];
-  [result addObject:@{ @"indexPaths" : self.indexPaths }];
-  return result;
-}
-
-@end
-
-#endif
diff --git a/submodules/AsyncDisplayKit/Source/Layout/ASAbsoluteLayoutElement.h b/submodules/AsyncDisplayKit/Source/PublicHeaders/AsyncDisplayKit/ASAbsoluteLayoutElement.h
similarity index 96%
rename from submodules/AsyncDisplayKit/Source/Layout/ASAbsoluteLayoutElement.h
rename to submodules/AsyncDisplayKit/Source/PublicHeaders/AsyncDisplayKit/ASAbsoluteLayoutElement.h
index 109816de20..18f488d9de 100644
--- a/submodules/AsyncDisplayKit/Source/Layout/ASAbsoluteLayoutElement.h
+++ b/submodules/AsyncDisplayKit/Source/PublicHeaders/AsyncDisplayKit/ASAbsoluteLayoutElement.h
@@ -8,6 +8,7 @@
 //
 
 #import <AsyncDisplayKit/ASBaseDefines.h>
+#import <UIKit/UIKit.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/submodules/AsyncDisplayKit/Source/Layout/ASAsciiArtBoxCreator.h b/submodules/AsyncDisplayKit/Source/PublicHeaders/AsyncDisplayKit/ASAsciiArtBoxCreator.h
similarity index 98%
rename from submodules/AsyncDisplayKit/Source/Layout/ASAsciiArtBoxCreator.h
rename to submodules/AsyncDisplayKit/Source/PublicHeaders/AsyncDisplayKit/ASAsciiArtBoxCreator.h
index 83c7bec414..6d4fe22ea9 100644
--- a/submodules/AsyncDisplayKit/Source/Layout/ASAsciiArtBoxCreator.h
+++ b/submodules/AsyncDisplayKit/Source/PublicHeaders/AsyncDisplayKit/ASAsciiArtBoxCreator.h
@@ -8,6 +8,7 @@
 //
 
 #import <Foundation/Foundation.h>
+#import <UIKit/UIKit.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/submodules/AsyncDisplayKit/Source/Base/ASAssert.h b/submodules/AsyncDisplayKit/Source/PublicHeaders/AsyncDisplayKit/ASAssert.h
similarity index 99%
rename from submodules/AsyncDisplayKit/Source/Base/ASAssert.h
rename to submodules/AsyncDisplayKit/Source/PublicHeaders/AsyncDisplayKit/ASAssert.h
index f00ce967d6..d6e9dad1c2 100644
--- a/submodules/AsyncDisplayKit/Source/Base/ASAssert.h
+++ b/submodules/AsyncDisplayKit/Source/PublicHeaders/AsyncDisplayKit/ASAssert.h
@@ -9,6 +9,7 @@
 
 #pragma once
 
+#import <UIKit/UIKit.h>
 #import <Foundation/NSException.h>
 #import <pthread.h>
 #import <AsyncDisplayKit/ASBaseDefines.h>
diff --git a/submodules/AsyncDisplayKit/Source/Base/ASAvailability.h b/submodules/AsyncDisplayKit/Source/PublicHeaders/AsyncDisplayKit/ASAvailability.h
similarity index 100%
rename from submodules/AsyncDisplayKit/Source/Base/ASAvailability.h
rename to submodules/AsyncDisplayKit/Source/PublicHeaders/AsyncDisplayKit/ASAvailability.h
diff --git a/submodules/AsyncDisplayKit/Source/Base/ASBaseDefines.h b/submodules/AsyncDisplayKit/Source/PublicHeaders/AsyncDisplayKit/ASBaseDefines.h
similarity index 99%
rename from submodules/AsyncDisplayKit/Source/Base/ASBaseDefines.h
rename to submodules/AsyncDisplayKit/Source/PublicHeaders/AsyncDisplayKit/ASBaseDefines.h
index 4e880f9024..dd15d1aca4 100644
--- a/submodules/AsyncDisplayKit/Source/Base/ASBaseDefines.h
+++ b/submodules/AsyncDisplayKit/Source/PublicHeaders/AsyncDisplayKit/ASBaseDefines.h
@@ -8,6 +8,7 @@
 //
 
 #import <Foundation/Foundation.h>
+#import <UIKit/UIKit.h>
 
 #define AS_EXTERN FOUNDATION_EXTERN
 #define unowned __unsafe_unretained
diff --git a/submodules/AsyncDisplayKit/Source/ASBlockTypes.h b/submodules/AsyncDisplayKit/Source/PublicHeaders/AsyncDisplayKit/ASBlockTypes.h
similarity index 96%
rename from submodules/AsyncDisplayKit/Source/ASBlockTypes.h
rename to submodules/AsyncDisplayKit/Source/PublicHeaders/AsyncDisplayKit/ASBlockTypes.h
index e1c7456019..a4c22ff0f4 100644
--- a/submodules/AsyncDisplayKit/Source/ASBlockTypes.h
+++ b/submodules/AsyncDisplayKit/Source/PublicHeaders/AsyncDisplayKit/ASBlockTypes.h
@@ -8,6 +8,7 @@
 //
 
 #import <Foundation/Foundation.h>
+#import <UIKit/UIKit.h>
 
 @class ASCellNode;
 
diff --git a/submodules/AsyncDisplayKit/Source/ASCollections.h b/submodules/AsyncDisplayKit/Source/PublicHeaders/AsyncDisplayKit/ASCollections.h
similarity index 97%
rename from submodules/AsyncDisplayKit/Source/ASCollections.h
rename to submodules/AsyncDisplayKit/Source/PublicHeaders/AsyncDisplayKit/ASCollections.h
index ca3b31c65c..ce1f0d1fd2 100644
--- a/submodules/AsyncDisplayKit/Source/ASCollections.h
+++ b/submodules/AsyncDisplayKit/Source/PublicHeaders/AsyncDisplayKit/ASCollections.h
@@ -7,6 +7,7 @@
 //
 
 #import <Foundation/Foundation.h>
+#import <UIKit/UIKit.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/submodules/AsyncDisplayKit/Source/ASConfiguration.h b/submodules/AsyncDisplayKit/Source/PublicHeaders/AsyncDisplayKit/ASConfiguration.h
similarity index 98%
rename from submodules/AsyncDisplayKit/Source/ASConfiguration.h
rename to submodules/AsyncDisplayKit/Source/PublicHeaders/AsyncDisplayKit/ASConfiguration.h
index c529dad801..a97f62bb1b 100644
--- a/submodules/AsyncDisplayKit/Source/ASConfiguration.h
+++ b/submodules/AsyncDisplayKit/Source/PublicHeaders/AsyncDisplayKit/ASConfiguration.h
@@ -7,6 +7,7 @@
 //
 
 #import <Foundation/Foundation.h>
+#import <UIKit/UIKit.h>
 #import <AsyncDisplayKit/ASBaseDefines.h>
 #import <AsyncDisplayKit/ASExperimentalFeatures.h>
 
diff --git a/submodules/AsyncDisplayKit/Source/ASConfigurationDelegate.h b/submodules/AsyncDisplayKit/Source/PublicHeaders/AsyncDisplayKit/ASConfigurationDelegate.h
similarity index 97%
rename from submodules/AsyncDisplayKit/Source/ASConfigurationDelegate.h
rename to submodules/AsyncDisplayKit/Source/PublicHeaders/AsyncDisplayKit/ASConfigurationDelegate.h
index 127ec3eb14..45fdec442c 100644
--- a/submodules/AsyncDisplayKit/Source/ASConfigurationDelegate.h
+++ b/submodules/AsyncDisplayKit/Source/PublicHeaders/AsyncDisplayKit/ASConfigurationDelegate.h
@@ -7,6 +7,7 @@
 //
 
 #import <Foundation/Foundation.h>
+#import <UIKit/UIKit.h>
 #import <AsyncDisplayKit/ASConfiguration.h>
 
 NS_ASSUME_NONNULL_BEGIN
diff --git a/submodules/AsyncDisplayKit/Source/ASConfigurationInternal.h b/submodules/AsyncDisplayKit/Source/PublicHeaders/AsyncDisplayKit/ASConfigurationInternal.h
similarity index 98%
rename from submodules/AsyncDisplayKit/Source/ASConfigurationInternal.h
rename to submodules/AsyncDisplayKit/Source/PublicHeaders/AsyncDisplayKit/ASConfigurationInternal.h
index eb639c2243..7164d041cb 100644
--- a/submodules/AsyncDisplayKit/Source/ASConfigurationInternal.h
+++ b/submodules/AsyncDisplayKit/Source/PublicHeaders/AsyncDisplayKit/ASConfigurationInternal.h
@@ -10,6 +10,7 @@
 /// It will be private again after exp_unfair_lock ends.
 
 #import <Foundation/Foundation.h>
+#import <UIKit/UIKit.h>
 #import <AsyncDisplayKit/ASConfiguration.h>
 
 NS_ASSUME_NONNULL_BEGIN
diff --git a/submodules/AsyncDisplayKit/Source/ASContextTransitioning.h b/submodules/AsyncDisplayKit/Source/PublicHeaders/AsyncDisplayKit/ASContextTransitioning.h
similarity index 98%
rename from submodules/AsyncDisplayKit/Source/ASContextTransitioning.h
rename to submodules/AsyncDisplayKit/Source/PublicHeaders/AsyncDisplayKit/ASContextTransitioning.h
index 9802ecefc4..6bd5fb7b5f 100644
--- a/submodules/AsyncDisplayKit/Source/ASContextTransitioning.h
+++ b/submodules/AsyncDisplayKit/Source/PublicHeaders/AsyncDisplayKit/ASContextTransitioning.h
@@ -7,6 +7,7 @@
 //  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
 //
 
+#import <UIKit/UIKit.h>
 #import <AsyncDisplayKit/ASDimension.h>
 
 @class ASDisplayNode;
diff --git a/submodules/AsyncDisplayKit/Source/ASControlNode+Subclasses.h b/submodules/AsyncDisplayKit/Source/PublicHeaders/AsyncDisplayKit/ASControlNode+Subclasses.h
similarity index 100%
rename from submodules/AsyncDisplayKit/Source/ASControlNode+Subclasses.h
rename to submodules/AsyncDisplayKit/Source/PublicHeaders/AsyncDisplayKit/ASControlNode+Subclasses.h
diff --git a/submodules/AsyncDisplayKit/Source/ASControlNode.h b/submodules/AsyncDisplayKit/Source/PublicHeaders/AsyncDisplayKit/ASControlNode.h
similarity index 99%
rename from submodules/AsyncDisplayKit/Source/ASControlNode.h
rename to submodules/AsyncDisplayKit/Source/PublicHeaders/AsyncDisplayKit/ASControlNode.h
index 0918fdb0b0..4370967387 100644
--- a/submodules/AsyncDisplayKit/Source/ASControlNode.h
+++ b/submodules/AsyncDisplayKit/Source/PublicHeaders/AsyncDisplayKit/ASControlNode.h
@@ -7,6 +7,7 @@
 //  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
 //
 
+#import <UIKit/UIKit.h>
 #import <AsyncDisplayKit/ASDisplayNode.h>
 
 #pragma once
diff --git a/submodules/AsyncDisplayKit/Source/Private/ASControlTargetAction.h b/submodules/AsyncDisplayKit/Source/PublicHeaders/AsyncDisplayKit/ASControlTargetAction.h
similarity index 97%
rename from submodules/AsyncDisplayKit/Source/Private/ASControlTargetAction.h
rename to submodules/AsyncDisplayKit/Source/PublicHeaders/AsyncDisplayKit/ASControlTargetAction.h
index 5a3595c5d3..c37e8504bb 100644
--- a/submodules/AsyncDisplayKit/Source/Private/ASControlTargetAction.h
+++ b/submodules/AsyncDisplayKit/Source/PublicHeaders/AsyncDisplayKit/ASControlTargetAction.h
@@ -8,6 +8,7 @@
 //
 
 #import <Foundation/Foundation.h>
+#import <UIKit/UIKit.h>
 
 /**
  @abstract ASControlTargetAction stores target action pairs registered for specific ASControlNodeEvent values.
diff --git a/submodules/AsyncDisplayKit/Source/Layout/ASDimension.h b/submodules/AsyncDisplayKit/Source/PublicHeaders/AsyncDisplayKit/ASDimension.h
similarity index 99%
rename from submodules/AsyncDisplayKit/Source/Layout/ASDimension.h
rename to submodules/AsyncDisplayKit/Source/PublicHeaders/AsyncDisplayKit/ASDimension.h
index 0b3c6b7beb..a10839459c 100644
--- a/submodules/AsyncDisplayKit/Source/Layout/ASDimension.h
+++ b/submodules/AsyncDisplayKit/Source/PublicHeaders/AsyncDisplayKit/ASDimension.h
@@ -8,6 +8,8 @@
 //
 
 #pragma once
+
+#import <UIKit/UIKit.h>
 #import <UIKit/UIGeometry.h>
 #import <AsyncDisplayKit/ASAvailability.h>
 #import <AsyncDisplayKit/ASBaseDefines.h>
diff --git a/submodules/AsyncDisplayKit/Source/Layout/ASDimensionInternal.h b/submodules/AsyncDisplayKit/Source/PublicHeaders/AsyncDisplayKit/ASDimensionInternal.h
similarity index 99%
rename from submodules/AsyncDisplayKit/Source/Layout/ASDimensionInternal.h
rename to submodules/AsyncDisplayKit/Source/PublicHeaders/AsyncDisplayKit/ASDimensionInternal.h
index df8f05600c..7bdcf8b739 100644
--- a/submodules/AsyncDisplayKit/Source/Layout/ASDimensionInternal.h
+++ b/submodules/AsyncDisplayKit/Source/PublicHeaders/AsyncDisplayKit/ASDimensionInternal.h
@@ -7,6 +7,7 @@
 //  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
 //
 
+#import <UIKit/UIKit.h>
 #import <AsyncDisplayKit/ASBaseDefines.h>
 #import <AsyncDisplayKit/ASDimension.h>
 
diff --git a/submodules/AsyncDisplayKit/Source/Base/ASDisplayNode+Ancestry.h b/submodules/AsyncDisplayKit/Source/PublicHeaders/AsyncDisplayKit/ASDisplayNode+Ancestry.h
similarity index 98%
rename from submodules/AsyncDisplayKit/Source/Base/ASDisplayNode+Ancestry.h
rename to submodules/AsyncDisplayKit/Source/PublicHeaders/AsyncDisplayKit/ASDisplayNode+Ancestry.h
index 2c61cee00c..a952e96a34 100644
--- a/submodules/AsyncDisplayKit/Source/Base/ASDisplayNode+Ancestry.h
+++ b/submodules/AsyncDisplayKit/Source/PublicHeaders/AsyncDisplayKit/ASDisplayNode+Ancestry.h
@@ -8,6 +8,7 @@
 //
 
 #import <Foundation/Foundation.h>
+#import <UIKit/UIKit.h>
 #import <AsyncDisplayKit/ASDisplayNode.h>
 
 NS_ASSUME_NONNULL_BEGIN
diff --git a/submodules/AsyncDisplayKit/Source/ASDisplayNode+Beta.h b/submodules/AsyncDisplayKit/Source/PublicHeaders/AsyncDisplayKit/ASDisplayNode+Beta.h
similarity index 89%
rename from submodules/AsyncDisplayKit/Source/ASDisplayNode+Beta.h
rename to submodules/AsyncDisplayKit/Source/PublicHeaders/AsyncDisplayKit/ASDisplayNode+Beta.h
index 2bb2a4c932..d08bce5d66 100644
--- a/submodules/AsyncDisplayKit/Source/ASDisplayNode+Beta.h
+++ b/submodules/AsyncDisplayKit/Source/PublicHeaders/AsyncDisplayKit/ASDisplayNode+Beta.h
@@ -7,16 +7,9 @@
 //  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
 //
 
+#import <UIKit/UIKit.h>
 #import <AsyncDisplayKit/ASAvailability.h>
 #import <AsyncDisplayKit/ASDisplayNode.h>
-#import <AsyncDisplayKit/ASLayoutRangeType.h>
-#import <AsyncDisplayKit/ASEventLog.h>
-
-#if YOGA
-  #import YOGA_HEADER_PATH
-  #import <AsyncDisplayKit/ASYogaUtilities.h>
-  #import <AsyncDisplayKit/ASDisplayNode+Yoga.h>
-#endif
 
 NS_ASSUME_NONNULL_BEGIN
 
@@ -152,15 +145,6 @@ AS_CATEGORY_IMPLEMENTABLE
 AS_CATEGORY_IMPLEMENTABLE
 - (void)willCalculateLayout:(ASSizeRange)constrainedSize NS_REQUIRES_SUPER;
 
-/**
- * Only ASLayoutRangeModeVisibleOnly or ASLayoutRangeModeLowMemory are recommended.  Default is ASLayoutRangeModeVisibleOnly,
- * because this is the only way to ensure an application will not have blank / flashing views as the user navigates back after
- * a memory warning.  Apps that wish to use the more effective / aggressive ASLayoutRangeModeLowMemory may need to take steps
- * to mitigate this behavior, including: restoring a larger range mode to the next controller before the user navigates there,
- * enabling .neverShowPlaceholders on ASCellNodes so that the navigation operation is blocked on redisplay completing, etc.
- */
-+ (void)setRangeModeForMemoryWarnings:(ASLayoutRangeMode)rangeMode;
-
 /**
  * @abstract Whether to draw all descendent nodes' contents into this node's layer's backing store.
  *
diff --git a/submodules/AsyncDisplayKit/Source/ASDisplayNode+Convenience.h b/submodules/AsyncDisplayKit/Source/PublicHeaders/AsyncDisplayKit/ASDisplayNode+Convenience.h
similarity index 97%
rename from submodules/AsyncDisplayKit/Source/ASDisplayNode+Convenience.h
rename to submodules/AsyncDisplayKit/Source/PublicHeaders/AsyncDisplayKit/ASDisplayNode+Convenience.h
index 3c00f67213..b7ff13220e 100644
--- a/submodules/AsyncDisplayKit/Source/ASDisplayNode+Convenience.h
+++ b/submodules/AsyncDisplayKit/Source/PublicHeaders/AsyncDisplayKit/ASDisplayNode+Convenience.h
@@ -7,6 +7,7 @@
 //  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
 //
 
+#import <UIKit/UIKit.h>
 #import <AsyncDisplayKit/ASDisplayNode.h>
 
 NS_ASSUME_NONNULL_BEGIN
diff --git a/submodules/AsyncDisplayKit/Source/Private/ASDisplayNode+FrameworkPrivate.h b/submodules/AsyncDisplayKit/Source/PublicHeaders/AsyncDisplayKit/ASDisplayNode+FrameworkPrivate.h
similarity index 99%
rename from submodules/AsyncDisplayKit/Source/Private/ASDisplayNode+FrameworkPrivate.h
rename to submodules/AsyncDisplayKit/Source/PublicHeaders/AsyncDisplayKit/ASDisplayNode+FrameworkPrivate.h
index 0c101697a6..adb96c74c5 100644
--- a/submodules/AsyncDisplayKit/Source/Private/ASDisplayNode+FrameworkPrivate.h
+++ b/submodules/AsyncDisplayKit/Source/PublicHeaders/AsyncDisplayKit/ASDisplayNode+FrameworkPrivate.h
@@ -13,6 +13,7 @@
 //
 
 #import <Foundation/Foundation.h>
+#import <UIKit/UIKit.h>
 #import <AsyncDisplayKit/ASDisplayNode.h>
 #import <AsyncDisplayKit/ASObjectDescriptionHelpers.h>
 
@@ -316,8 +317,4 @@ __unused static NSString * _Nonnull NSStringFromASHierarchyStateChange(ASHierarc
 - (NSArray *)accessibilityElements;
 @end;
 
-@interface CALayer (ASDisplayNodeInternal)
-@property (nullable, weak) ASDisplayNode *asyncdisplaykit_node;
-@end
-
 NS_ASSUME_NONNULL_END
diff --git a/submodules/AsyncDisplayKit/Source/ASDisplayNode+InterfaceState.h b/submodules/AsyncDisplayKit/Source/PublicHeaders/AsyncDisplayKit/ASDisplayNode+InterfaceState.h
similarity index 99%
rename from submodules/AsyncDisplayKit/Source/ASDisplayNode+InterfaceState.h
rename to submodules/AsyncDisplayKit/Source/PublicHeaders/AsyncDisplayKit/ASDisplayNode+InterfaceState.h
index 1de83700ac..dfcb52f95d 100644
--- a/submodules/AsyncDisplayKit/Source/ASDisplayNode+InterfaceState.h
+++ b/submodules/AsyncDisplayKit/Source/PublicHeaders/AsyncDisplayKit/ASDisplayNode+InterfaceState.h
@@ -7,6 +7,7 @@
 //
 
 #import <Foundation/Foundation.h>
+#import <UIKit/UIKit.h>
 
 /**
  * Interface state is available on ASDisplayNode and ASViewController, and
diff --git a/submodules/AsyncDisplayKit/Source/ASDisplayNode+LayoutSpec.h b/submodules/AsyncDisplayKit/Source/PublicHeaders/AsyncDisplayKit/ASDisplayNode+LayoutSpec.h
similarity index 99%
rename from submodules/AsyncDisplayKit/Source/ASDisplayNode+LayoutSpec.h
rename to submodules/AsyncDisplayKit/Source/PublicHeaders/AsyncDisplayKit/ASDisplayNode+LayoutSpec.h
index d7cd862047..a3ae8cb5c5 100644
--- a/submodules/AsyncDisplayKit/Source/ASDisplayNode+LayoutSpec.h
+++ b/submodules/AsyncDisplayKit/Source/PublicHeaders/AsyncDisplayKit/ASDisplayNode+LayoutSpec.h
@@ -6,6 +6,7 @@
 //  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
 //
 
+#import <UIKit/UIKit.h>
 #import <AsyncDisplayKit/ASDisplayNode.h>
 #import <AsyncDisplayKit/ASDimension.h>
 
diff --git a/submodules/AsyncDisplayKit/Source/ASDisplayNode+Subclasses.h b/submodules/AsyncDisplayKit/Source/PublicHeaders/AsyncDisplayKit/ASDisplayNode+Subclasses.h
similarity index 99%
rename from submodules/AsyncDisplayKit/Source/ASDisplayNode+Subclasses.h
rename to submodules/AsyncDisplayKit/Source/PublicHeaders/AsyncDisplayKit/ASDisplayNode+Subclasses.h
index d3c9575fbb..5ea0b2e6fe 100644
--- a/submodules/AsyncDisplayKit/Source/ASDisplayNode+Subclasses.h
+++ b/submodules/AsyncDisplayKit/Source/PublicHeaders/AsyncDisplayKit/ASDisplayNode+Subclasses.h
@@ -7,6 +7,7 @@
 //  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
 //
 
+#import <UIKit/UIKit.h>
 #import <AsyncDisplayKit/ASBlockTypes.h>
 #import <AsyncDisplayKit/ASDisplayNode.h>
 #import <AsyncDisplayKit/ASDisplayNode+LayoutSpec.h>
diff --git a/submodules/AsyncDisplayKit/Source/ASDisplayNode.h b/submodules/AsyncDisplayKit/Source/PublicHeaders/AsyncDisplayKit/ASDisplayNode.h
similarity index 99%
rename from submodules/AsyncDisplayKit/Source/ASDisplayNode.h
rename to submodules/AsyncDisplayKit/Source/PublicHeaders/AsyncDisplayKit/ASDisplayNode.h
index 7d962747d7..5b97e3fd83 100644
--- a/submodules/AsyncDisplayKit/Source/ASDisplayNode.h
+++ b/submodules/AsyncDisplayKit/Source/PublicHeaders/AsyncDisplayKit/ASDisplayNode.h
@@ -983,8 +983,14 @@ typedef NS_ENUM(NSInteger, ASLayoutEngineType) {
 
 @end
 
+#define ASScopedLockSelfOrToRoot() ASLockScopeSelf()
+
 @interface UIView (ASDisplayNodeInternal)
 @property (nullable, weak) ASDisplayNode *asyncdisplaykit_node;
 @end
 
+@interface CALayer (ASDisplayNodeInternal)
+@property (nullable, weak) ASDisplayNode *asyncdisplaykit_node;
+@end
+
 NS_ASSUME_NONNULL_END
diff --git a/submodules/AsyncDisplayKit/Source/ASDisplayNodeExtras.h b/submodules/AsyncDisplayKit/Source/PublicHeaders/AsyncDisplayKit/ASDisplayNodeExtras.h
similarity index 100%
rename from submodules/AsyncDisplayKit/Source/ASDisplayNodeExtras.h
rename to submodules/AsyncDisplayKit/Source/PublicHeaders/AsyncDisplayKit/ASDisplayNodeExtras.h
diff --git a/submodules/AsyncDisplayKit/Source/ASEditableTextNode.h b/submodules/AsyncDisplayKit/Source/PublicHeaders/AsyncDisplayKit/ASEditableTextNode.h
similarity index 100%
rename from submodules/AsyncDisplayKit/Source/ASEditableTextNode.h
rename to submodules/AsyncDisplayKit/Source/PublicHeaders/AsyncDisplayKit/ASEditableTextNode.h
diff --git a/submodules/AsyncDisplayKit/Source/Base/ASEqualityHelpers.h b/submodules/AsyncDisplayKit/Source/PublicHeaders/AsyncDisplayKit/ASEqualityHelpers.h
similarity index 100%
rename from submodules/AsyncDisplayKit/Source/Base/ASEqualityHelpers.h
rename to submodules/AsyncDisplayKit/Source/PublicHeaders/AsyncDisplayKit/ASEqualityHelpers.h
diff --git a/submodules/AsyncDisplayKit/Source/ASExperimentalFeatures.h b/submodules/AsyncDisplayKit/Source/PublicHeaders/AsyncDisplayKit/ASExperimentalFeatures.h
similarity index 98%
rename from submodules/AsyncDisplayKit/Source/ASExperimentalFeatures.h
rename to submodules/AsyncDisplayKit/Source/PublicHeaders/AsyncDisplayKit/ASExperimentalFeatures.h
index c3d56eb7d8..7b2a160c11 100644
--- a/submodules/AsyncDisplayKit/Source/ASExperimentalFeatures.h
+++ b/submodules/AsyncDisplayKit/Source/PublicHeaders/AsyncDisplayKit/ASExperimentalFeatures.h
@@ -7,6 +7,7 @@
 //
 
 #import <Foundation/Foundation.h>
+#import <UIKit/UIKit.h>
 #import <AsyncDisplayKit/ASAvailability.h>
 #import <AsyncDisplayKit/ASBaseDefines.h>
 
diff --git a/submodules/AsyncDisplayKit/Source/Details/ASGraphicsContext.h b/submodules/AsyncDisplayKit/Source/PublicHeaders/AsyncDisplayKit/ASGraphicsContext.h
similarity index 98%
rename from submodules/AsyncDisplayKit/Source/Details/ASGraphicsContext.h
rename to submodules/AsyncDisplayKit/Source/PublicHeaders/AsyncDisplayKit/ASGraphicsContext.h
index d22d3806b0..1ef56518c9 100644
--- a/submodules/AsyncDisplayKit/Source/Details/ASGraphicsContext.h
+++ b/submodules/AsyncDisplayKit/Source/PublicHeaders/AsyncDisplayKit/ASGraphicsContext.h
@@ -7,6 +7,7 @@
 //
 
 #import <Foundation/Foundation.h>
+#import <UIKit/UIKit.h>
 #import <AsyncDisplayKit/ASBaseDefines.h>
 #import <CoreGraphics/CoreGraphics.h>
 
diff --git a/submodules/AsyncDisplayKit/Source/Details/ASHashing.h b/submodules/AsyncDisplayKit/Source/PublicHeaders/AsyncDisplayKit/ASHashing.h
similarity index 98%
rename from submodules/AsyncDisplayKit/Source/Details/ASHashing.h
rename to submodules/AsyncDisplayKit/Source/PublicHeaders/AsyncDisplayKit/ASHashing.h
index 084d74078a..d1393bfec5 100644
--- a/submodules/AsyncDisplayKit/Source/Details/ASHashing.h
+++ b/submodules/AsyncDisplayKit/Source/PublicHeaders/AsyncDisplayKit/ASHashing.h
@@ -7,6 +7,7 @@
 //
 
 #import <Foundation/Foundation.h>
+#import <UIKit/UIKit.h>
 #import <AsyncDisplayKit/ASBaseDefines.h>
 
 NS_ASSUME_NONNULL_BEGIN
diff --git a/submodules/AsyncDisplayKit/Source/Private/ASInternalHelpers.h b/submodules/AsyncDisplayKit/Source/PublicHeaders/AsyncDisplayKit/ASInternalHelpers.h
similarity index 86%
rename from submodules/AsyncDisplayKit/Source/Private/ASInternalHelpers.h
rename to submodules/AsyncDisplayKit/Source/PublicHeaders/AsyncDisplayKit/ASInternalHelpers.h
index 8bc53fa0e6..780566f395 100644
--- a/submodules/AsyncDisplayKit/Source/Private/ASInternalHelpers.h
+++ b/submodules/AsyncDisplayKit/Source/PublicHeaders/AsyncDisplayKit/ASInternalHelpers.h
@@ -7,13 +7,12 @@
 //  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
 //
 
-#import "ASAvailability.h"
+#import <AsyncDisplayKit/ASAvailability.h>
 
 #import <UIKit/UIKit.h>
 
 #import <AsyncDisplayKit/ASBaseDefines.h>
 #import <AsyncDisplayKit/ASDisplayNodeExtras.h>
-#import <AsyncDisplayKit/ASImageProtocols.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
@@ -97,22 +96,6 @@ ASDISPLAYNODE_INLINE UIEdgeInsets ASConcatInsets(UIEdgeInsets insetsA, UIEdgeIns
   return insetsA;
 }
 
-ASDISPLAYNODE_INLINE AS_WARN_UNUSED_RESULT ASImageDownloaderPriority ASImageDownloaderPriorityWithInterfaceState(ASInterfaceState interfaceState) {
-  if (ASInterfaceStateIncludesVisible(interfaceState)) {
-    return ASImageDownloaderPriorityVisible;
-  }
-
-  if (ASInterfaceStateIncludesDisplay(interfaceState)) {
-    return ASImageDownloaderPriorityImminent;
-  }
-
-  if (ASInterfaceStateIncludesPreload(interfaceState)) {
-    return ASImageDownloaderPriorityPreload;
-  }
-
-  return ASImageDownloaderPriorityPreload;
-}
-
 @interface NSIndexPath (ASInverseComparison)
 - (NSComparisonResult)asdk_inverseCompare:(NSIndexPath *)otherIndexPath;
 @end
diff --git a/submodules/AsyncDisplayKit/Source/Layout/ASLayout.h b/submodules/AsyncDisplayKit/Source/PublicHeaders/AsyncDisplayKit/ASLayout.h
similarity index 99%
rename from submodules/AsyncDisplayKit/Source/Layout/ASLayout.h
rename to submodules/AsyncDisplayKit/Source/PublicHeaders/AsyncDisplayKit/ASLayout.h
index 0e40574d07..7ee6e80fc0 100644
--- a/submodules/AsyncDisplayKit/Source/Layout/ASLayout.h
+++ b/submodules/AsyncDisplayKit/Source/PublicHeaders/AsyncDisplayKit/ASLayout.h
@@ -8,7 +8,9 @@
 //
 
 #pragma once
+
 #import <Foundation/Foundation.h>
+#import <UIKit/UIKit.h>
 #import <AsyncDisplayKit/ASDimension.h>
 #import <AsyncDisplayKit/ASLayoutElement.h>
 
diff --git a/submodules/AsyncDisplayKit/Source/Layout/ASLayoutElement.h b/submodules/AsyncDisplayKit/Source/PublicHeaders/AsyncDisplayKit/ASLayoutElement.h
similarity index 99%
rename from submodules/AsyncDisplayKit/Source/Layout/ASLayoutElement.h
rename to submodules/AsyncDisplayKit/Source/PublicHeaders/AsyncDisplayKit/ASLayoutElement.h
index c4ba689cfc..b32d9d73e9 100644
--- a/submodules/AsyncDisplayKit/Source/Layout/ASLayoutElement.h
+++ b/submodules/AsyncDisplayKit/Source/PublicHeaders/AsyncDisplayKit/ASLayoutElement.h
@@ -7,6 +7,7 @@
 //  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
 //
 
+#import <UIKit/UIKit.h>
 #import <AsyncDisplayKit/ASLayoutElementPrivate.h>
 #import <AsyncDisplayKit/ASLayoutElementExtensibility.h>
 #import <AsyncDisplayKit/ASDimensionInternal.h>
diff --git a/submodules/AsyncDisplayKit/Source/Layout/ASLayoutElementExtensibility.h b/submodules/AsyncDisplayKit/Source/PublicHeaders/AsyncDisplayKit/ASLayoutElementExtensibility.h
similarity index 99%
rename from submodules/AsyncDisplayKit/Source/Layout/ASLayoutElementExtensibility.h
rename to submodules/AsyncDisplayKit/Source/PublicHeaders/AsyncDisplayKit/ASLayoutElementExtensibility.h
index f46b63e812..8aae2e3442 100644
--- a/submodules/AsyncDisplayKit/Source/Layout/ASLayoutElementExtensibility.h
+++ b/submodules/AsyncDisplayKit/Source/PublicHeaders/AsyncDisplayKit/ASLayoutElementExtensibility.h
@@ -7,6 +7,7 @@
 //  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
 //
 
+#import <UIKit/UIKit.h>
 #import <UIKit/UIGeometry.h>
 
 #import <objc/runtime.h>
diff --git a/submodules/AsyncDisplayKit/Source/Layout/ASLayoutElementPrivate.h b/submodules/AsyncDisplayKit/Source/PublicHeaders/AsyncDisplayKit/ASLayoutElementPrivate.h
similarity index 99%
rename from submodules/AsyncDisplayKit/Source/Layout/ASLayoutElementPrivate.h
rename to submodules/AsyncDisplayKit/Source/PublicHeaders/AsyncDisplayKit/ASLayoutElementPrivate.h
index cf699f42a2..6f713f3908 100644
--- a/submodules/AsyncDisplayKit/Source/Layout/ASLayoutElementPrivate.h
+++ b/submodules/AsyncDisplayKit/Source/PublicHeaders/AsyncDisplayKit/ASLayoutElementPrivate.h
@@ -7,6 +7,7 @@
 //  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
 //
 
+#import <UIKit/UIKit.h>
 #import <AsyncDisplayKit/ASDimension.h>
 #import <UIKit/UIGeometry.h>
 
diff --git a/submodules/AsyncDisplayKit/Source/Layout/ASLayoutSpec.h b/submodules/AsyncDisplayKit/Source/PublicHeaders/AsyncDisplayKit/ASLayoutSpec.h
similarity index 99%
rename from submodules/AsyncDisplayKit/Source/Layout/ASLayoutSpec.h
rename to submodules/AsyncDisplayKit/Source/PublicHeaders/AsyncDisplayKit/ASLayoutSpec.h
index c7aa01c386..2056557b05 100644
--- a/submodules/AsyncDisplayKit/Source/Layout/ASLayoutSpec.h
+++ b/submodules/AsyncDisplayKit/Source/PublicHeaders/AsyncDisplayKit/ASLayoutSpec.h
@@ -7,6 +7,7 @@
 //  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
 //
 
+#import <UIKit/UIKit.h>
 #import <AsyncDisplayKit/ASLayoutElement.h>
 #import <AsyncDisplayKit/ASAsciiArtBoxCreator.h>
 #import <AsyncDisplayKit/ASLocking.h>
diff --git a/submodules/AsyncDisplayKit/Source/ASLocking.h b/submodules/AsyncDisplayKit/Source/PublicHeaders/AsyncDisplayKit/ASLocking.h
similarity index 99%
rename from submodules/AsyncDisplayKit/Source/ASLocking.h
rename to submodules/AsyncDisplayKit/Source/PublicHeaders/AsyncDisplayKit/ASLocking.h
index 3e284dc26c..c78fcce43d 100644
--- a/submodules/AsyncDisplayKit/Source/ASLocking.h
+++ b/submodules/AsyncDisplayKit/Source/PublicHeaders/AsyncDisplayKit/ASLocking.h
@@ -7,6 +7,7 @@
 //
 
 #import <Foundation/Foundation.h>
+#import <UIKit/UIKit.h>
 #import <pthread/sched.h>
 
 #import <AsyncDisplayKit/ASAssert.h>
diff --git a/submodules/AsyncDisplayKit/Source/ASMainThreadDeallocation.h b/submodules/AsyncDisplayKit/Source/PublicHeaders/AsyncDisplayKit/ASMainThreadDeallocation.h
similarity index 98%
rename from submodules/AsyncDisplayKit/Source/ASMainThreadDeallocation.h
rename to submodules/AsyncDisplayKit/Source/PublicHeaders/AsyncDisplayKit/ASMainThreadDeallocation.h
index 391b6bb696..1ac44fb6d4 100644
--- a/submodules/AsyncDisplayKit/Source/ASMainThreadDeallocation.h
+++ b/submodules/AsyncDisplayKit/Source/PublicHeaders/AsyncDisplayKit/ASMainThreadDeallocation.h
@@ -7,6 +7,7 @@
 //
 
 #import <Foundation/Foundation.h>
+#import <UIKit/UIKit.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/submodules/AsyncDisplayKit/Source/Details/ASObjectDescriptionHelpers.h b/submodules/AsyncDisplayKit/Source/PublicHeaders/AsyncDisplayKit/ASObjectDescriptionHelpers.h
similarity index 98%
rename from submodules/AsyncDisplayKit/Source/Details/ASObjectDescriptionHelpers.h
rename to submodules/AsyncDisplayKit/Source/PublicHeaders/AsyncDisplayKit/ASObjectDescriptionHelpers.h
index 5a2823bd99..46aa7bacd9 100644
--- a/submodules/AsyncDisplayKit/Source/Details/ASObjectDescriptionHelpers.h
+++ b/submodules/AsyncDisplayKit/Source/PublicHeaders/AsyncDisplayKit/ASObjectDescriptionHelpers.h
@@ -8,6 +8,7 @@
 //
 
 #import <Foundation/Foundation.h>
+#import <UIKit/UIKit.h>
 #import <AsyncDisplayKit/ASBaseDefines.h>
 
 NS_ASSUME_NONNULL_BEGIN
diff --git a/submodules/AsyncDisplayKit/Source/Details/ASRecursiveUnfairLock.h b/submodules/AsyncDisplayKit/Source/PublicHeaders/AsyncDisplayKit/ASRecursiveUnfairLock.h
similarity index 98%
rename from submodules/AsyncDisplayKit/Source/Details/ASRecursiveUnfairLock.h
rename to submodules/AsyncDisplayKit/Source/PublicHeaders/AsyncDisplayKit/ASRecursiveUnfairLock.h
index d705e4d384..7ded8926b3 100644
--- a/submodules/AsyncDisplayKit/Source/Details/ASRecursiveUnfairLock.h
+++ b/submodules/AsyncDisplayKit/Source/PublicHeaders/AsyncDisplayKit/ASRecursiveUnfairLock.h
@@ -7,6 +7,7 @@
 //
 
 #import <Foundation/Foundation.h>
+#import <UIKit/UIKit.h>
 #import <AsyncDisplayKit/ASBaseDefines.h>
 #import <pthread/pthread.h>
 #import <os/lock.h>
diff --git a/submodules/AsyncDisplayKit/Source/ASRunLoopQueue.h b/submodules/AsyncDisplayKit/Source/PublicHeaders/AsyncDisplayKit/ASRunLoopQueue.h
similarity index 99%
rename from submodules/AsyncDisplayKit/Source/ASRunLoopQueue.h
rename to submodules/AsyncDisplayKit/Source/PublicHeaders/AsyncDisplayKit/ASRunLoopQueue.h
index 07f3682bbf..ea61b2962a 100644
--- a/submodules/AsyncDisplayKit/Source/ASRunLoopQueue.h
+++ b/submodules/AsyncDisplayKit/Source/PublicHeaders/AsyncDisplayKit/ASRunLoopQueue.h
@@ -8,6 +8,7 @@
 //
 
 #import <Foundation/Foundation.h>
+#import <UIKit/UIKit.h>
 #import <AsyncDisplayKit/ASBaseDefines.h>
 #import <AsyncDisplayKit/ASLocking.h>
 
diff --git a/submodules/AsyncDisplayKit/Source/Details/ASScrollDirection.h b/submodules/AsyncDisplayKit/Source/PublicHeaders/AsyncDisplayKit/ASScrollDirection.h
similarity index 98%
rename from submodules/AsyncDisplayKit/Source/Details/ASScrollDirection.h
rename to submodules/AsyncDisplayKit/Source/PublicHeaders/AsyncDisplayKit/ASScrollDirection.h
index 41538ed31b..0b7842250a 100644
--- a/submodules/AsyncDisplayKit/Source/Details/ASScrollDirection.h
+++ b/submodules/AsyncDisplayKit/Source/PublicHeaders/AsyncDisplayKit/ASScrollDirection.h
@@ -8,6 +8,7 @@
 //
 
 #import <Foundation/Foundation.h>
+#import <UIKit/UIKit.h>
 #import <CoreGraphics/CGAffineTransform.h>
 
 #import <AsyncDisplayKit/ASBaseDefines.h>
diff --git a/submodules/AsyncDisplayKit/Source/ASScrollNode.h b/submodules/AsyncDisplayKit/Source/PublicHeaders/AsyncDisplayKit/ASScrollNode.h
similarity index 98%
rename from submodules/AsyncDisplayKit/Source/ASScrollNode.h
rename to submodules/AsyncDisplayKit/Source/PublicHeaders/AsyncDisplayKit/ASScrollNode.h
index 35f6622f1a..6977047fe5 100644
--- a/submodules/AsyncDisplayKit/Source/ASScrollNode.h
+++ b/submodules/AsyncDisplayKit/Source/PublicHeaders/AsyncDisplayKit/ASScrollNode.h
@@ -7,6 +7,7 @@
 //  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
 //
 
+#import <UIKit/UIKit.h>
 #import <AsyncDisplayKit/ASDisplayNode.h>
 #import <AsyncDisplayKit/ASScrollDirection.h>
 
diff --git a/submodules/AsyncDisplayKit/Source/Layout/ASStackLayoutDefines.h b/submodules/AsyncDisplayKit/Source/PublicHeaders/AsyncDisplayKit/ASStackLayoutDefines.h
similarity index 99%
rename from submodules/AsyncDisplayKit/Source/Layout/ASStackLayoutDefines.h
rename to submodules/AsyncDisplayKit/Source/PublicHeaders/AsyncDisplayKit/ASStackLayoutDefines.h
index 8a86be1b5a..357b7bee2e 100644
--- a/submodules/AsyncDisplayKit/Source/Layout/ASStackLayoutDefines.h
+++ b/submodules/AsyncDisplayKit/Source/PublicHeaders/AsyncDisplayKit/ASStackLayoutDefines.h
@@ -7,6 +7,7 @@
 //  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
 //
 
+#import <UIKit/UIKit.h>
 #import <AsyncDisplayKit/ASBaseDefines.h>
 
 /** The direction children are stacked in */
diff --git a/submodules/AsyncDisplayKit/Source/Layout/ASStackLayoutElement.h b/submodules/AsyncDisplayKit/Source/PublicHeaders/AsyncDisplayKit/ASStackLayoutElement.h
similarity index 98%
rename from submodules/AsyncDisplayKit/Source/Layout/ASStackLayoutElement.h
rename to submodules/AsyncDisplayKit/Source/PublicHeaders/AsyncDisplayKit/ASStackLayoutElement.h
index 46b263b4ff..246cd34384 100644
--- a/submodules/AsyncDisplayKit/Source/Layout/ASStackLayoutElement.h
+++ b/submodules/AsyncDisplayKit/Source/PublicHeaders/AsyncDisplayKit/ASStackLayoutElement.h
@@ -7,6 +7,7 @@
 //  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
 //
 
+#import <UIKit/UIKit.h>
 #import <AsyncDisplayKit/ASDimension.h>
 
 #import <AsyncDisplayKit/ASStackLayoutDefines.h>
diff --git a/submodules/AsyncDisplayKit/Source/TextKit/ASTextKitComponents.h b/submodules/AsyncDisplayKit/Source/PublicHeaders/AsyncDisplayKit/ASTextKitComponents.h
similarity index 100%
rename from submodules/AsyncDisplayKit/Source/TextKit/ASTextKitComponents.h
rename to submodules/AsyncDisplayKit/Source/PublicHeaders/AsyncDisplayKit/ASTextKitComponents.h
diff --git a/submodules/AsyncDisplayKit/Source/TextKit/ASTextNodeTypes.h b/submodules/AsyncDisplayKit/Source/PublicHeaders/AsyncDisplayKit/ASTextNodeTypes.h
similarity index 100%
rename from submodules/AsyncDisplayKit/Source/TextKit/ASTextNodeTypes.h
rename to submodules/AsyncDisplayKit/Source/PublicHeaders/AsyncDisplayKit/ASTextNodeTypes.h
diff --git a/submodules/AsyncDisplayKit/Source/Details/ASThread.h b/submodules/AsyncDisplayKit/Source/PublicHeaders/AsyncDisplayKit/ASThread.h
similarity index 100%
rename from submodules/AsyncDisplayKit/Source/Details/ASThread.h
rename to submodules/AsyncDisplayKit/Source/PublicHeaders/AsyncDisplayKit/ASThread.h
diff --git a/submodules/AsyncDisplayKit/Source/Details/ASTraitCollection.h b/submodules/AsyncDisplayKit/Source/PublicHeaders/AsyncDisplayKit/ASTraitCollection.h
similarity index 100%
rename from submodules/AsyncDisplayKit/Source/Details/ASTraitCollection.h
rename to submodules/AsyncDisplayKit/Source/PublicHeaders/AsyncDisplayKit/ASTraitCollection.h
diff --git a/submodules/AsyncDisplayKit/Source/Details/ASWeakSet.h b/submodules/AsyncDisplayKit/Source/PublicHeaders/AsyncDisplayKit/ASWeakSet.h
similarity index 100%
rename from submodules/AsyncDisplayKit/Source/Details/ASWeakSet.h
rename to submodules/AsyncDisplayKit/Source/PublicHeaders/AsyncDisplayKit/ASWeakSet.h
diff --git a/submodules/AsyncDisplayKit/Source/AsyncDisplayKit.h b/submodules/AsyncDisplayKit/Source/PublicHeaders/AsyncDisplayKit/AsyncDisplayKit.h
similarity index 59%
rename from submodules/AsyncDisplayKit/Source/AsyncDisplayKit.h
rename to submodules/AsyncDisplayKit/Source/PublicHeaders/AsyncDisplayKit/AsyncDisplayKit.h
index 00a0fb37f1..dc00ed8339 100644
--- a/submodules/AsyncDisplayKit/Source/AsyncDisplayKit.h
+++ b/submodules/AsyncDisplayKit/Source/PublicHeaders/AsyncDisplayKit/AsyncDisplayKit.h
@@ -22,44 +22,16 @@
 #import <AsyncDisplayKit/ASConfigurationInternal.h>
 
 #import <AsyncDisplayKit/ASControlNode.h>
-#import <AsyncDisplayKit/ASImageNode.h>
-#import <AsyncDisplayKit/ASTextNode.h>
-#import <AsyncDisplayKit/ASTextNode2.h>
 #import <AsyncDisplayKit/ASEditableTextNode.h>
-#import <AsyncDisplayKit/ASButtonNode.h>
-
-#import <AsyncDisplayKit/ASImageProtocols.h>
-
-#import <AsyncDisplayKit/ASRangeManagingNode.h>
-#import <AsyncDisplayKit/ASSectionContext.h>
-
-#import <AsyncDisplayKit/ASElementMap.h>
-
-#import <AsyncDisplayKit/ASSupplementaryNodeSource.h>
 
 #import <AsyncDisplayKit/ASScrollNode.h>
 
-#import <AsyncDisplayKit/ASNodeController+Beta.h>
-#import <AsyncDisplayKit/ASViewController.h>
-#import <AsyncDisplayKit/ASNavigationController.h>
-#import <AsyncDisplayKit/ASTabBarController.h>
-#import <AsyncDisplayKit/ASRangeControllerUpdateRangeProtocol+Beta.h>
-
 #import <AsyncDisplayKit/ASLayout.h>
 #import <AsyncDisplayKit/ASDimension.h>
 #import <AsyncDisplayKit/ASDimensionInternal.h>
 #import <AsyncDisplayKit/ASLayoutElement.h>
 #import <AsyncDisplayKit/ASLayoutSpec.h>
-#import <AsyncDisplayKit/ASBackgroundLayoutSpec.h>
-#import <AsyncDisplayKit/ASCenterLayoutSpec.h>
-#import <AsyncDisplayKit/ASCornerLayoutSpec.h>
-#import <AsyncDisplayKit/ASRelativeLayoutSpec.h>
-#import <AsyncDisplayKit/ASInsetLayoutSpec.h>
-#import <AsyncDisplayKit/ASOverlayLayoutSpec.h>
-#import <AsyncDisplayKit/ASRatioLayoutSpec.h>
-#import <AsyncDisplayKit/ASAbsoluteLayoutSpec.h>
 #import <AsyncDisplayKit/ASStackLayoutDefines.h>
-#import <AsyncDisplayKit/ASStackLayoutSpec.h>
 
 #import <AsyncDisplayKit/_ASAsyncTransaction.h>
 #import <AsyncDisplayKit/_ASAsyncTransactionGroup.h>
@@ -68,36 +40,26 @@
 #import <AsyncDisplayKit/_ASDisplayLayer.h>
 #import <AsyncDisplayKit/_ASDisplayView.h>
 #import <AsyncDisplayKit/ASDisplayNode+Beta.h>
-#import <AsyncDisplayKit/ASTextNode+Beta.h>
 #import <AsyncDisplayKit/ASTextNodeTypes.h>
 #import <AsyncDisplayKit/ASBlockTypes.h>
 #import <AsyncDisplayKit/ASContextTransitioning.h>
 #import <AsyncDisplayKit/ASControlNode+Subclasses.h>
 #import <AsyncDisplayKit/ASDisplayNode+Subclasses.h>
 #import <AsyncDisplayKit/ASEqualityHelpers.h>
-#import <AsyncDisplayKit/ASEventLog.h>
 #import <AsyncDisplayKit/ASHashing.h>
-#import <AsyncDisplayKit/ASHighlightOverlayLayer.h>
-#import <AsyncDisplayKit/ASImageContainerProtocolCategories.h>
 #import <AsyncDisplayKit/ASLocking.h>
-#import <AsyncDisplayKit/ASLog.h>
 #import <AsyncDisplayKit/ASMainThreadDeallocation.h>
-#import <AsyncDisplayKit/ASMutableAttributedStringBuilder.h>
 #import <AsyncDisplayKit/ASRunLoopQueue.h>
 #import <AsyncDisplayKit/ASTextKitComponents.h>
 #import <AsyncDisplayKit/ASThread.h>
 #import <AsyncDisplayKit/ASTraitCollection.h>
-#import <AsyncDisplayKit/ASVisibilityProtocols.h>
 #import <AsyncDisplayKit/ASWeakSet.h>
 
 #import <AsyncDisplayKit/CoreGraphics+ASConvenience.h>
-#import <AsyncDisplayKit/NSMutableAttributedString+TextKitAdditions.h>
-#import <AsyncDisplayKit/UICollectionViewLayout+ASConvenience.h>
 #import <AsyncDisplayKit/UIView+ASConvenience.h>
-#import <AsyncDisplayKit/UIImage+ASConvenience.h>
 #import <AsyncDisplayKit/ASGraphicsContext.h>
 #import <AsyncDisplayKit/NSArray+Diffing.h>
 #import <AsyncDisplayKit/ASObjectDescriptionHelpers.h>
 #import <AsyncDisplayKit/UIResponder+AsyncDisplayKit.h>
 
-#import <AsyncDisplayKit/AsyncDisplayKit+Debug.h>
+#import <AsyncDisplayKit/_ASCoreAnimationExtras.h>
diff --git a/submodules/AsyncDisplayKit/Source/Details/CoreGraphics+ASConvenience.h b/submodules/AsyncDisplayKit/Source/PublicHeaders/AsyncDisplayKit/CoreGraphics+ASConvenience.h
similarity index 97%
rename from submodules/AsyncDisplayKit/Source/Details/CoreGraphics+ASConvenience.h
rename to submodules/AsyncDisplayKit/Source/PublicHeaders/AsyncDisplayKit/CoreGraphics+ASConvenience.h
index a0805f1701..da8c6273d9 100644
--- a/submodules/AsyncDisplayKit/Source/Details/CoreGraphics+ASConvenience.h
+++ b/submodules/AsyncDisplayKit/Source/PublicHeaders/AsyncDisplayKit/CoreGraphics+ASConvenience.h
@@ -8,7 +8,7 @@
 //
 
 #import <Foundation/Foundation.h>
-
+#import <UIKit/UIKit.h>
 #import <CoreGraphics/CoreGraphics.h>
 #import <tgmath.h>
 
diff --git a/submodules/AsyncDisplayKit/Source/Details/NSArray+Diffing.h b/submodules/AsyncDisplayKit/Source/PublicHeaders/AsyncDisplayKit/NSArray+Diffing.h
similarity index 100%
rename from submodules/AsyncDisplayKit/Source/Details/NSArray+Diffing.h
rename to submodules/AsyncDisplayKit/Source/PublicHeaders/AsyncDisplayKit/NSArray+Diffing.h
diff --git a/submodules/AsyncDisplayKit/Source/UIResponder+AsyncDisplayKit.h b/submodules/AsyncDisplayKit/Source/PublicHeaders/AsyncDisplayKit/UIResponder+AsyncDisplayKit.h
similarity index 100%
rename from submodules/AsyncDisplayKit/Source/UIResponder+AsyncDisplayKit.h
rename to submodules/AsyncDisplayKit/Source/PublicHeaders/AsyncDisplayKit/UIResponder+AsyncDisplayKit.h
diff --git a/submodules/AsyncDisplayKit/Source/Details/UIView+ASConvenience.h b/submodules/AsyncDisplayKit/Source/PublicHeaders/AsyncDisplayKit/UIView+ASConvenience.h
similarity index 100%
rename from submodules/AsyncDisplayKit/Source/Details/UIView+ASConvenience.h
rename to submodules/AsyncDisplayKit/Source/PublicHeaders/AsyncDisplayKit/UIView+ASConvenience.h
diff --git a/submodules/AsyncDisplayKit/Source/Details/Transactions/_ASAsyncTransaction.h b/submodules/AsyncDisplayKit/Source/PublicHeaders/AsyncDisplayKit/_ASAsyncTransaction.h
similarity index 99%
rename from submodules/AsyncDisplayKit/Source/Details/Transactions/_ASAsyncTransaction.h
rename to submodules/AsyncDisplayKit/Source/PublicHeaders/AsyncDisplayKit/_ASAsyncTransaction.h
index 245c62b295..dd44b027a4 100644
--- a/submodules/AsyncDisplayKit/Source/Details/Transactions/_ASAsyncTransaction.h
+++ b/submodules/AsyncDisplayKit/Source/PublicHeaders/AsyncDisplayKit/_ASAsyncTransaction.h
@@ -8,6 +8,7 @@
 //
 
 #import <Foundation/Foundation.h>
+#import <UIKit/UIKit.h>
 #import <AsyncDisplayKit/ASBaseDefines.h>
 
 NS_ASSUME_NONNULL_BEGIN
diff --git a/submodules/AsyncDisplayKit/Source/Details/Transactions/_ASAsyncTransactionContainer.h b/submodules/AsyncDisplayKit/Source/PublicHeaders/AsyncDisplayKit/_ASAsyncTransactionContainer.h
similarity index 100%
rename from submodules/AsyncDisplayKit/Source/Details/Transactions/_ASAsyncTransactionContainer.h
rename to submodules/AsyncDisplayKit/Source/PublicHeaders/AsyncDisplayKit/_ASAsyncTransactionContainer.h
diff --git a/submodules/AsyncDisplayKit/Source/Details/Transactions/_ASAsyncTransactionGroup.h b/submodules/AsyncDisplayKit/Source/PublicHeaders/AsyncDisplayKit/_ASAsyncTransactionGroup.h
similarity index 97%
rename from submodules/AsyncDisplayKit/Source/Details/Transactions/_ASAsyncTransactionGroup.h
rename to submodules/AsyncDisplayKit/Source/PublicHeaders/AsyncDisplayKit/_ASAsyncTransactionGroup.h
index cd0b216c06..bda8e4170c 100644
--- a/submodules/AsyncDisplayKit/Source/Details/Transactions/_ASAsyncTransactionGroup.h
+++ b/submodules/AsyncDisplayKit/Source/PublicHeaders/AsyncDisplayKit/_ASAsyncTransactionGroup.h
@@ -8,6 +8,7 @@
 //
 
 #import <Foundation/Foundation.h>
+#import <UIKit/UIKit.h>
 #import <AsyncDisplayKit/ASBaseDefines.h>
 
 NS_ASSUME_NONNULL_BEGIN
diff --git a/submodules/AsyncDisplayKit/Source/Private/_ASCoreAnimationExtras.h b/submodules/AsyncDisplayKit/Source/PublicHeaders/AsyncDisplayKit/_ASCoreAnimationExtras.h
similarity index 100%
rename from submodules/AsyncDisplayKit/Source/Private/_ASCoreAnimationExtras.h
rename to submodules/AsyncDisplayKit/Source/PublicHeaders/AsyncDisplayKit/_ASCoreAnimationExtras.h
diff --git a/submodules/AsyncDisplayKit/Source/Details/_ASDisplayLayer.h b/submodules/AsyncDisplayKit/Source/PublicHeaders/AsyncDisplayKit/_ASDisplayLayer.h
similarity index 100%
rename from submodules/AsyncDisplayKit/Source/Details/_ASDisplayLayer.h
rename to submodules/AsyncDisplayKit/Source/PublicHeaders/AsyncDisplayKit/_ASDisplayLayer.h
diff --git a/submodules/AsyncDisplayKit/Source/Details/_ASDisplayView.h b/submodules/AsyncDisplayKit/Source/PublicHeaders/AsyncDisplayKit/_ASDisplayView.h
similarity index 100%
rename from submodules/AsyncDisplayKit/Source/Details/_ASDisplayView.h
rename to submodules/AsyncDisplayKit/Source/PublicHeaders/AsyncDisplayKit/_ASDisplayView.h
diff --git a/submodules/AsyncDisplayKit/Source/_ASTransitionContext.h b/submodules/AsyncDisplayKit/Source/PublicHeaders/AsyncDisplayKit/_ASTransitionContext.h
similarity index 98%
rename from submodules/AsyncDisplayKit/Source/_ASTransitionContext.h
rename to submodules/AsyncDisplayKit/Source/PublicHeaders/AsyncDisplayKit/_ASTransitionContext.h
index 44c4906c39..71cac29736 100644
--- a/submodules/AsyncDisplayKit/Source/_ASTransitionContext.h
+++ b/submodules/AsyncDisplayKit/Source/PublicHeaders/AsyncDisplayKit/_ASTransitionContext.h
@@ -8,6 +8,7 @@
 //
 
 #import <Foundation/Foundation.h>
+#import <UIKit/UIKit.h>
 
 #import <AsyncDisplayKit/ASContextTransitioning.h>
 
diff --git a/submodules/AsyncDisplayKit/Source/TextKit/ASTextKitAttributes.h b/submodules/AsyncDisplayKit/Source/TextKit/ASTextKitAttributes.h
deleted file mode 100644
index d8c21dbc23..0000000000
--- a/submodules/AsyncDisplayKit/Source/TextKit/ASTextKitAttributes.h
+++ /dev/null
@@ -1,128 +0,0 @@
-//
-//  ASTextKitAttributes.h
-//  Texture
-//
-//  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.
-//  Changes after 4/13/2017 are: Copyright (c) Pinterest, Inc.  All rights reserved.
-//  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
-//
-
-#pragma once
-
-#import <UIKit/UIKit.h>
-
-#import <AsyncDisplayKit/ASAvailability.h>
-
-#if AS_ENABLE_TEXTNODE
-
-#import <AsyncDisplayKit/ASEqualityHelpers.h>
-
-AS_EXTERN NSString *const ASTextKitTruncationAttributeName;
-/**
- Use ASTextKitEntityAttribute as the value of this attribute to embed a link or other interactable content inside the
- text.
- */
-AS_EXTERN NSString *const ASTextKitEntityAttributeName;
-
-/**
- All NSObject values in this struct should be copied when passed into the TextComponent.
- */
-struct ASTextKitAttributes {
-  /**
-   The string to be drawn.  ASTextKit will not augment this string with default colors, etc. so this must be complete.
-   */
-  NSAttributedString *attributedString;
-  /**
-   The string to use as the truncation string, usually just "...".  If you have a range of text you would like to
-   restrict highlighting to (for instance if you have "... Continue Reading", use the ASTextKitTruncationAttributeName
-   to mark the specific range of the string that should be highlightable.
-   */
-  NSAttributedString *truncationAttributedString;
-  /**
-   This is the character set that ASTextKit should attempt to avoid leaving as a trailing character before your
-   truncation token.  By default this set includes "\s\t\n\r.,!?:;" so you don't end up with ugly looking truncation
-   text like "Hey, this is some fancy Truncation!\n\n...".  Instead it would be truncated as "Hey, this is some fancy
-   truncation...".  This is not always possible.
-
-   Set this to the empty charset if you want to just use the "dumb" truncation behavior.  A nil value will be
-   substituted with the default described above.
-   */
-  NSCharacterSet *avoidTailTruncationSet;
-  /**
-   The line-break mode to apply to the text.  Since this also impacts how TextKit will attempt to truncate the text
-   in your string, we only support NSLineBreakByWordWrapping and NSLineBreakByCharWrapping.
-   */
-  NSLineBreakMode lineBreakMode;
-  /**
-   The maximum number of lines to draw in the drawable region.  Leave blank or set to 0 to define no maximum.
-   This is required to apply scale factors to shrink text to fit within a number of lines
-   */
-  NSUInteger maximumNumberOfLines;
-  /**
-   An array of UIBezierPath objects representing the exclusion paths inside the receiver's bounding rectangle. Default value: nil.
-   */
-  NSArray<UIBezierPath *> *exclusionPaths;
-  /**
-   The shadow offset for any shadows applied to the text.  The coordinate space for this is the same as UIKit, so a
-   positive width means towards the right, and a positive height means towards the bottom.
-   */
-  CGSize shadowOffset;
-  /**
-   The color to use in drawing the text's shadow.
-   */
-  UIColor *shadowColor;
-  /**
-   The opacity of the shadow from 0 to 1.
-   */
-  CGFloat shadowOpacity;
-  /**
-   The radius that should be applied to the shadow blur.  Larger values mean a larger, more blurred shadow.
-   */
-  CGFloat shadowRadius;
-  /**
-   An array of scale factors in descending order to apply to the text to try to make it fit into a constrained size.
-   */
-  NSArray *pointSizeScaleFactors;
-
-  /**
-   We provide an explicit copy function so we can use aggregate initializer syntax while providing copy semantics for
-   the NSObjects inside.
-   */
-  const ASTextKitAttributes copy() const
-  {
-    return {
-      [attributedString copy],
-      [truncationAttributedString copy],
-      [avoidTailTruncationSet copy],
-      lineBreakMode,
-      maximumNumberOfLines,
-      [exclusionPaths copy],
-      shadowOffset,
-      [shadowColor copy],
-      shadowOpacity,
-      shadowRadius,
-      pointSizeScaleFactors,
-    };
-  };
-
-  bool operator==(const ASTextKitAttributes &other) const
-  {
-    // These comparisons are in a specific order to reduce the overall cost of this function.
-    return lineBreakMode == other.lineBreakMode
-    && maximumNumberOfLines == other.maximumNumberOfLines
-    && shadowOpacity == other.shadowOpacity
-    && shadowRadius == other.shadowRadius
-    && (pointSizeScaleFactors == other.pointSizeScaleFactors
-        || [pointSizeScaleFactors isEqualToArray:other.pointSizeScaleFactors])
-    && CGSizeEqualToSize(shadowOffset, other.shadowOffset)
-    && ASObjectIsEqual(exclusionPaths, other.exclusionPaths)
-    && ASObjectIsEqual(avoidTailTruncationSet, other.avoidTailTruncationSet)
-    && ASObjectIsEqual(shadowColor, other.shadowColor)
-    && ASObjectIsEqual(attributedString, other.attributedString)
-    && ASObjectIsEqual(truncationAttributedString, other.truncationAttributedString);
-  }
-
-  size_t hash() const;
-};
-
-#endif
diff --git a/submodules/AsyncDisplayKit/Source/TextKit/ASTextKitAttributes.mm b/submodules/AsyncDisplayKit/Source/TextKit/ASTextKitAttributes.mm
deleted file mode 100644
index 400ef437bb..0000000000
--- a/submodules/AsyncDisplayKit/Source/TextKit/ASTextKitAttributes.mm
+++ /dev/null
@@ -1,50 +0,0 @@
-//
-//  ASTextKitAttributes.mm
-//  Texture
-//
-//  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.
-//  Changes after 4/13/2017 are: Copyright (c) Pinterest, Inc.  All rights reserved.
-//  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
-//
-
-#import <AsyncDisplayKit/ASTextKitAttributes.h>
-
-#if AS_ENABLE_TEXTNODE
-
-#import <AsyncDisplayKit/ASHashing.h>
-
-NSString *const ASTextKitTruncationAttributeName = @"ck_truncation";
-NSString *const ASTextKitEntityAttributeName = @"ck_entity";
-
-size_t ASTextKitAttributes::hash() const
-{
-#pragma clang diagnostic push
-#pragma clang diagnostic warning "-Wpadded"
-  struct {
-    NSUInteger attrStringHash;
-    NSUInteger truncationStringHash;
-    NSUInteger avoidTrunactionSetHash;
-    NSLineBreakMode lineBreakMode;
-    NSUInteger maximumNumberOfLines;
-    NSUInteger exclusionPathsHash;
-    CGSize shadowOffset;
-    NSUInteger shadowColorHash;
-    CGFloat shadowOpacity;
-    CGFloat shadowRadius;
-#pragma clang diagnostic pop
-  } data = {
-    [attributedString hash],
-    [truncationAttributedString hash],
-    [avoidTailTruncationSet hash],
-    lineBreakMode,
-    maximumNumberOfLines,
-    [exclusionPaths hash],
-    shadowOffset,
-    [shadowColor hash],
-    shadowOpacity,
-    shadowRadius,
-  };
-  return ASHashBytes(&data, sizeof(data));
-}
-
-#endif
diff --git a/submodules/AsyncDisplayKit/Source/TextKit/ASTextKitCoreTextAdditions.h b/submodules/AsyncDisplayKit/Source/TextKit/ASTextKitCoreTextAdditions.h
deleted file mode 100644
index 9a8f48050a..0000000000
--- a/submodules/AsyncDisplayKit/Source/TextKit/ASTextKitCoreTextAdditions.h
+++ /dev/null
@@ -1,89 +0,0 @@
-//
-//  ASTextKitCoreTextAdditions.h
-//  Texture
-//
-//  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.
-//  Changes after 4/13/2017 are: Copyright (c) Pinterest, Inc.  All rights reserved.
-//  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
-//
-
-#import <UIKit/UIKit.h>
-
-#import <AsyncDisplayKit/ASAvailability.h>
-
-#if AS_ENABLE_TEXTNODE
-
-#import <AsyncDisplayKit/ASBaseDefines.h>
-
-NS_ASSUME_NONNULL_BEGIN
-
-/**
- @abstract Returns whether a given attribute is an unsupported Core Text attribute.
- @param attributeName The name of the attribute
- @discussion The following Core Text attributes are not supported on NSAttributedString, and thus will not be preserved during the conversion:
-              - kCTForegroundColorFromContextAttributeName
-              - kCTSuperscriptAttributeName
-              - kCTGlyphInfoAttributeName
-              - kCTCharacterShapeAttributeName
-              - kCTLanguageAttributeName
-              - kCTRunDelegateAttributeName
-              - kCTBaselineClassAttributeName
-              - kCTBaselineInfoAttributeName
-              - kCTBaselineReferenceInfoAttributeName
-              - kCTWritingDirectionAttributeName
-              - kCTUnderlineColorAttributeName
- @result Whether attributeName is an unsupported Core Text attribute.
- */
-AS_EXTERN BOOL ASAttributeWithNameIsUnsupportedCoreTextAttribute(NSString *attributeName);
-
-
-/**
- @abstract Returns an attributes dictionary for use by NSAttributedString, given a dictionary of Core Text attributes.
- @param coreTextAttributes An NSDictionary whose keys are CFAttributedStringRef attributes.
- @discussion The following Core Text attributes are not supported on NSAttributedString, and thus will not be preserved during the conversion:
-              - kCTForegroundColorFromContextAttributeName
-              - kCTSuperscriptAttributeName
-              - kCTGlyphInfoAttributeName
-              - kCTCharacterShapeAttributeName
-              - kCTLanguageAttributeName
-              - kCTRunDelegateAttributeName
-              - kCTBaselineClassAttributeName
-              - kCTBaselineInfoAttributeName
-              - kCTBaselineReferenceInfoAttributeName
-              - kCTWritingDirectionAttributeName
-              - kCTUnderlineColorAttributeName
- @result An NSDictionary of attributes for use by NSAttributedString.
- */
-AS_EXTERN NSDictionary *NSAttributedStringAttributesForCoreTextAttributes(NSDictionary *coreTextAttributes);
-
-/**
-  @abstract Returns an NSAttributedString whose Core Text attributes have been converted, where possible, to NSAttributedString attributes.
-  @param dirtyAttributedString An NSAttributedString that may contain Core Text attributes.
-  @result An NSAttributedString that's preserved as many CFAttributedString attributes as possible.
- */
-AS_EXTERN NSAttributedString *ASCleanseAttributedStringOfCoreTextAttributes(NSAttributedString *dirtyAttributedString);
-
-#pragma mark -
-#pragma mark -
-@interface NSParagraphStyle (ASTextKitCoreTextAdditions)
-
-/**
-  @abstract Returns an NSParagraphStyle initialized with the paragraph specifiers from the given CTParagraphStyleRef.
-  @param coreTextParagraphStyle A Core Text paragraph style.
-  @discussion It is important to note that not all CTParagraphStyle specifiers are supported by NSParagraphStyle, and consequently, this is a lossy conversion. Notably, the following specifiers will not preserved:
-        - kCTParagraphStyleSpecifierTabStops
-        - kCTParagraphStyleSpecifierDefaultTabInterval
-        - kCTParagraphStyleSpecifierMaximumLineSpacing
-        - kCTParagraphStyleSpecifierMinimumLineSpacing
-        - kCTParagraphStyleSpecifierLineSpacingAdjustment
-        - kCTParagraphStyleSpecifierLineBoundsOptions
-  @result An NSParagraphStyle initialized with as many of the paragraph specifiers from `coreTextParagraphStyle` as possible.
-
- */
-+ (NSParagraphStyle *)paragraphStyleWithCTParagraphStyle:(CTParagraphStyleRef)coreTextParagraphStyle NS_RETURNS_RETAINED;
-
-@end
-
-NS_ASSUME_NONNULL_END
-
-#endif
diff --git a/submodules/AsyncDisplayKit/Source/TextKit/ASTextKitCoreTextAdditions.mm b/submodules/AsyncDisplayKit/Source/TextKit/ASTextKitCoreTextAdditions.mm
deleted file mode 100644
index 8ae370de14..0000000000
--- a/submodules/AsyncDisplayKit/Source/TextKit/ASTextKitCoreTextAdditions.mm
+++ /dev/null
@@ -1,331 +0,0 @@
-//
-//  ASTextKitCoreTextAdditions.mm
-//  Texture
-//
-//  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.
-//  Changes after 4/13/2017 are: Copyright (c) Pinterest, Inc.  All rights reserved.
-//  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
-//
-
-#import <AsyncDisplayKit/ASTextKitCoreTextAdditions.h>
-
-#if AS_ENABLE_TEXTNODE
-
-#import <CoreText/CTFont.h>
-#import <CoreText/CTStringAttributes.h>
-
-#import <AsyncDisplayKit/ASAssert.h>
-
-#pragma mark - Public
-BOOL ASAttributeWithNameIsUnsupportedCoreTextAttribute(NSString *attributeName)
-{
-  static NSSet *coreTextAttributes;
-  static dispatch_once_t onceToken;
-  dispatch_once(&onceToken, ^{
-    coreTextAttributes = [NSSet setWithObjects:(__bridge id)kCTForegroundColorAttributeName,
-                          kCTForegroundColorFromContextAttributeName,
-                          kCTForegroundColorAttributeName,
-                          kCTStrokeColorAttributeName,
-                          kCTUnderlineStyleAttributeName,
-                          kCTVerticalFormsAttributeName,
-                          kCTRunDelegateAttributeName,
-                          kCTBaselineClassAttributeName,
-                          kCTBaselineInfoAttributeName,
-                          kCTBaselineReferenceInfoAttributeName,
-                          kCTUnderlineColorAttributeName,
-                          kCTParagraphStyleAttributeName,
-                          nil];
-  });
-  return [coreTextAttributes containsObject:attributeName];
-}
-
-NSDictionary *NSAttributedStringAttributesForCoreTextAttributes(NSDictionary *coreTextAttributes)
-{
-  NSMutableDictionary *cleanAttributes = [[NSMutableDictionary alloc] initWithCapacity:coreTextAttributes.count];
-
-  [coreTextAttributes enumerateKeysAndObjectsUsingBlock:^(NSString *coreTextKey, id coreTextValue, BOOL *stop) {
-    // The following attributes are not supported on NSAttributedString. Should they become available, we should add them.
-    /*
-     kCTForegroundColorFromContextAttributeName
-     kCTSuperscriptAttributeName
-     kCTGlyphInfoAttributeName
-     kCTCharacterShapeAttributeName
-     kCTLanguageAttributeName
-     kCTRunDelegateAttributeName
-     kCTBaselineClassAttributeName
-     kCTBaselineInfoAttributeName
-     kCTBaselineReferenceInfoAttributeName
-     kCTWritingDirectionAttributeName
-     kCTUnderlineColorAttributeName
-     */
-
-    // Conversely, the following attributes are not supported on CFAttributedString. Should they become available, we should add them.
-    /*
-     NSStrikethroughStyleAttributeName
-     NSShadowAttributeName
-     NSBackgroundColorAttributeName
-     */
-
-    // kCTFontAttributeName -> NSFontAttributeName
-    if ([coreTextKey isEqualToString:(NSString *)kCTFontAttributeName]) {
-      CTFontRef coreTextFont = (__bridge CTFontRef)coreTextValue;
-      cleanAttributes[NSFontAttributeName] = (__bridge UIFont *)coreTextFont;
-    }
-    // kCTKernAttributeName -> NSKernAttributeName
-    else if ([coreTextKey isEqualToString:(NSString *)kCTKernAttributeName]) {
-      cleanAttributes[NSKernAttributeName] = (NSNumber *)coreTextValue;
-    }
-    // kCTLigatureAttributeName -> NSLigatureAttributeName
-    else if ([coreTextKey isEqualToString:(NSString *)kCTLigatureAttributeName]) {
-      cleanAttributes[NSLigatureAttributeName] = (NSNumber *)coreTextValue;
-    }
-    // kCTForegroundColorAttributeName -> NSForegroundColorAttributeName
-    else if ([coreTextKey isEqualToString:(NSString *)kCTForegroundColorAttributeName]) {
-      cleanAttributes[NSForegroundColorAttributeName] = [UIColor colorWithCGColor:(CGColorRef)coreTextValue];
-    }
-    // kCTParagraphStyleAttributeName -> NSParagraphStyleAttributeName
-    else if ([coreTextKey isEqualToString:(NSString *)kCTParagraphStyleAttributeName]) {
-      if ([coreTextValue isKindOfClass:[NSParagraphStyle class]]) {
-        cleanAttributes[NSParagraphStyleAttributeName] = (NSParagraphStyle *)coreTextValue;
-      }
-      else {
-        cleanAttributes[NSParagraphStyleAttributeName] = [NSParagraphStyle paragraphStyleWithCTParagraphStyle:(CTParagraphStyleRef)coreTextValue];
-      }
-    }
-    // kCTStrokeWidthAttributeName -> NSStrokeWidthAttributeName
-    else if ([coreTextKey isEqualToString:(NSString *)kCTStrokeWidthAttributeName]) {
-      cleanAttributes[NSStrokeWidthAttributeName] = (NSNumber *)coreTextValue;
-    }
-    // kCTStrokeColorAttributeName -> NSStrokeColorAttributeName
-    else if ([coreTextKey isEqualToString:(NSString *)kCTStrokeColorAttributeName]) {
-      cleanAttributes[NSStrokeColorAttributeName] = [UIColor colorWithCGColor:(CGColorRef)coreTextValue];
-    }
-    // kCTUnderlineStyleAttributeName -> NSUnderlineStyleAttributeName
-    else if ([coreTextKey isEqualToString:(NSString *)kCTUnderlineStyleAttributeName]) {
-      cleanAttributes[NSUnderlineStyleAttributeName] = (NSNumber *)coreTextValue;
-    }
-    // kCTVerticalFormsAttributeName -> NSVerticalGlyphFormAttributeName
-    else if ([coreTextKey isEqualToString:(NSString *)kCTVerticalFormsAttributeName]) {
-      BOOL flag = (BOOL)CFBooleanGetValue((CFBooleanRef)coreTextValue);
-      cleanAttributes[NSVerticalGlyphFormAttributeName] = @((int)flag); // NSVerticalGlyphFormAttributeName is documented to be an NSNumber with an integer that's either 0 or 1.
-    }
-    // Don't filter out any internal text attributes
-    else if (!ASAttributeWithNameIsUnsupportedCoreTextAttribute(coreTextKey)){
-      cleanAttributes[coreTextKey] = coreTextValue;
-    }
-  }];
-
-  return cleanAttributes;
-}
-
-NSAttributedString *ASCleanseAttributedStringOfCoreTextAttributes(NSAttributedString *dirtyAttributedString)
-{
-  if (!dirtyAttributedString)
-    return nil;
-
-  // First see if there are any core text attributes on the string
-  __block BOOL containsCoreTextAttributes = NO;
-  [dirtyAttributedString enumerateAttributesInRange:NSMakeRange(0, dirtyAttributedString.length)
-                                            options:0
-                                         usingBlock:^(NSDictionary *dirtyAttributes, NSRange range, BOOL *stop) {
-                                           [dirtyAttributes enumerateKeysAndObjectsUsingBlock:^(NSString *coreTextKey, id coreTextValue, BOOL *innerStop) {
-                                             if (ASAttributeWithNameIsUnsupportedCoreTextAttribute(coreTextKey)) {
-                                               containsCoreTextAttributes = YES;
-                                               *innerStop = YES;
-                                             }
-                                           }];
-                                           *stop = containsCoreTextAttributes;
-                                         }];
-  if (containsCoreTextAttributes) {
-
-    NSString *plainString = dirtyAttributedString.string;
-    NSMutableAttributedString *cleanAttributedString = [[NSMutableAttributedString alloc] initWithString:plainString];
-
-    // Iterate over all of the attributes, cleaning them as appropriate and applying them as we go.
-    [dirtyAttributedString enumerateAttributesInRange:NSMakeRange(0, plainString.length)
-                                              options:0
-                                           usingBlock:^(NSDictionary *dirtyAttributes, NSRange range, BOOL *stop) {
-                                             [cleanAttributedString addAttributes:NSAttributedStringAttributesForCoreTextAttributes(dirtyAttributes) range:range];
-                                           }];
-
-    return cleanAttributedString;
-  } else {
-    return [dirtyAttributedString copy];
-  }
-}
-
-#pragma mark -
-#pragma mark -
-@implementation NSParagraphStyle (ASTextKitCoreTextAdditions)
-
-+ (NSParagraphStyle *)paragraphStyleWithCTParagraphStyle:(CTParagraphStyleRef)coreTextParagraphStyle NS_RETURNS_RETAINED
-{
-  NSMutableParagraphStyle *newParagraphStyle = [[NSMutableParagraphStyle alloc] init];
-
-  if (!coreTextParagraphStyle) {
-    return newParagraphStyle;
-  }
-
-  // The following paragraph style specifiers are not supported on NSParagraphStyle. Should they become available, we should add them.
-  /*
-   kCTParagraphStyleSpecifierTabStops
-   kCTParagraphStyleSpecifierDefaultTabInterval
-   kCTParagraphStyleSpecifierMaximumLineSpacing
-   kCTParagraphStyleSpecifierMinimumLineSpacing
-   kCTParagraphStyleSpecifierLineSpacingAdjustment
-   kCTParagraphStyleSpecifierLineBoundsOptions
-   */
-
-  // Conversely, the following paragraph styles are not supported on CTParagraphStyle. Should they become available, we should add them.
-  /*
-   hyphenationFactor
-   */
-
-  // kCTParagraphStyleSpecifierAlignment -> alignment
-  CTTextAlignment coreTextAlignment;
-  if (CTParagraphStyleGetValueForSpecifier(coreTextParagraphStyle,
-                                           kCTParagraphStyleSpecifierAlignment,
-                                           sizeof(coreTextAlignment),
-                                           &coreTextAlignment)) {
-    newParagraphStyle.alignment = NSTextAlignmentFromCTTextAlignment(coreTextAlignment);
-  }
-
-  // kCTParagraphStyleSpecifierFirstLineHeadIndent -> firstLineHeadIndent
-  CGFloat firstLineHeadIndent;
-  if (CTParagraphStyleGetValueForSpecifier(coreTextParagraphStyle,
-                                           kCTParagraphStyleSpecifierFirstLineHeadIndent,
-                                           sizeof(firstLineHeadIndent),
-                                           &firstLineHeadIndent)) {
-    newParagraphStyle.firstLineHeadIndent = firstLineHeadIndent;
-  }
-
-  // kCTParagraphStyleSpecifierHeadIndent -> headIndent
-  CGFloat headIndent;
-  if (CTParagraphStyleGetValueForSpecifier(coreTextParagraphStyle,
-                                           kCTParagraphStyleSpecifierHeadIndent,
-                                           sizeof(headIndent),
-                                           &headIndent)) {
-    newParagraphStyle.headIndent = headIndent;
-  }
-
-  // kCTParagraphStyleSpecifierTailIndent -> tailIndent
-  CGFloat tailIndent;
-  if (CTParagraphStyleGetValueForSpecifier(coreTextParagraphStyle,
-                                           kCTParagraphStyleSpecifierTailIndent,
-                                           sizeof(tailIndent),
-                                           &tailIndent)) {
-    newParagraphStyle.tailIndent = tailIndent;
-  }
-
-  // kCTParagraphStyleSpecifierLineBreakMode -> lineBreakMode
-  CTLineBreakMode coreTextLineBreakMode;
-  if (CTParagraphStyleGetValueForSpecifier(coreTextParagraphStyle,
-                                           kCTParagraphStyleSpecifierLineBreakMode,
-                                           sizeof(coreTextLineBreakMode),
-                                           &coreTextLineBreakMode)) {
-    newParagraphStyle.lineBreakMode = (NSLineBreakMode)coreTextLineBreakMode; // They're the same enum.
-  }
-
-  // kCTParagraphStyleSpecifierLineHeightMultiple -> lineHeightMultiple
-  CGFloat lineHeightMultiple;
-  if (CTParagraphStyleGetValueForSpecifier(coreTextParagraphStyle,
-                                           kCTParagraphStyleSpecifierLineHeightMultiple,
-                                           sizeof(lineHeightMultiple),
-                                           &lineHeightMultiple)) {
-    newParagraphStyle.lineHeightMultiple = lineHeightMultiple;
-  }
-
-  // kCTParagraphStyleSpecifierMaximumLineHeight -> maximumLineHeight
-  CGFloat maximumLineHeight;
-  if (CTParagraphStyleGetValueForSpecifier(coreTextParagraphStyle,
-                                           kCTParagraphStyleSpecifierMaximumLineHeight,
-                                           sizeof(maximumLineHeight),
-                                           &maximumLineHeight)) {
-    newParagraphStyle.maximumLineHeight = maximumLineHeight;
-  }
-
-  // kCTParagraphStyleSpecifierMinimumLineHeight -> minimumLineHeight
-  CGFloat minimumLineHeight;
-  if (CTParagraphStyleGetValueForSpecifier(coreTextParagraphStyle,
-                                           kCTParagraphStyleSpecifierMinimumLineHeight,
-                                           sizeof(minimumLineHeight),
-                                           &minimumLineHeight)) {
-    newParagraphStyle.minimumLineHeight = minimumLineHeight;
-  }
-  
-  CGFloat lineSpacing = 0;
-#if TARGET_OS_IOS
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
-  // kCTParagraphStyleSpecifierLineSpacing -> lineSpacing
-  // Note that kCTParagraphStyleSpecifierLineSpacing is deprecated and will die soon. We should not be using it.
-  if (CTParagraphStyleGetValueForSpecifier(coreTextParagraphStyle,
-                                           kCTParagraphStyleSpecifierLineSpacing,
-                                           sizeof(lineSpacing),
-                                           &lineSpacing)) {
-    newParagraphStyle.lineSpacing = lineSpacing;
-  }
-#pragma clang diagnostic pop
-#endif
-  
-  // Attempt to weakly map the following onto -[NSParagraphStyle lineSpacing]:
-  //   - kCTParagraphStyleSpecifierMinimumLineSpacing
-  //   - kCTParagraphStyleSpecifierMaximumLineSpacing
-  //   - kCTParagraphStyleSpecifierLineSpacingAdjustment
-  if (fabs(lineSpacing) <= FLT_EPSILON &&
-      CTParagraphStyleGetValueForSpecifier(coreTextParagraphStyle,
-                                           kCTParagraphStyleSpecifierMinimumLineSpacing,
-                                           sizeof(lineSpacing),
-                                           &lineSpacing)) {
-    newParagraphStyle.lineSpacing = lineSpacing;
-  }
-  
-  if (fabs(lineSpacing) <= FLT_EPSILON &&
-      CTParagraphStyleGetValueForSpecifier(coreTextParagraphStyle,
-                                           kCTParagraphStyleSpecifierMaximumLineSpacing,
-                                           sizeof(lineSpacing),
-                                           &lineSpacing)) {
-    newParagraphStyle.lineSpacing = lineSpacing;
-  }
-  
-  if (fabs(lineSpacing) <= FLT_EPSILON &&
-      CTParagraphStyleGetValueForSpecifier(coreTextParagraphStyle,
-                                           kCTParagraphStyleSpecifierLineSpacingAdjustment,
-                                           sizeof(lineSpacing),
-                                           &lineSpacing)) {
-    newParagraphStyle.lineSpacing = lineSpacing;
-  }
-
-  // kCTParagraphStyleSpecifierParagraphSpacing -> paragraphSpacing
-  CGFloat paragraphSpacing;
-  if (CTParagraphStyleGetValueForSpecifier(coreTextParagraphStyle,
-                                           kCTParagraphStyleSpecifierParagraphSpacing,
-                                           sizeof(paragraphSpacing),
-                                           &paragraphSpacing)) {
-    newParagraphStyle.paragraphSpacing = paragraphSpacing;
-  }
-
-  // kCTParagraphStyleSpecifierParagraphSpacingBefore -> paragraphSpacingBefore
-  CGFloat paragraphSpacingBefore;
-  if (CTParagraphStyleGetValueForSpecifier(coreTextParagraphStyle,
-                                           kCTParagraphStyleSpecifierParagraphSpacingBefore,
-                                           sizeof(paragraphSpacingBefore),
-                                           &paragraphSpacingBefore)) {
-    newParagraphStyle.paragraphSpacingBefore = paragraphSpacingBefore;
-  }
-
-  // kCTParagraphStyleSpecifierBaseWritingDirection -> baseWritingDirection
-  CTWritingDirection coreTextBaseWritingDirection;
-  if (CTParagraphStyleGetValueForSpecifier(coreTextParagraphStyle,
-                                           kCTParagraphStyleSpecifierBaseWritingDirection,
-                                           sizeof(coreTextBaseWritingDirection),
-                                           &coreTextBaseWritingDirection)) {
-    newParagraphStyle.baseWritingDirection = (NSWritingDirection)coreTextBaseWritingDirection; // They're the same enum.
-  }
-
-  return newParagraphStyle;
-}
-
-@end
-
-#endif
diff --git a/submodules/AsyncDisplayKit/Source/TextKit/ASTextKitEntityAttribute.h b/submodules/AsyncDisplayKit/Source/TextKit/ASTextKitEntityAttribute.h
deleted file mode 100644
index 3655138be7..0000000000
--- a/submodules/AsyncDisplayKit/Source/TextKit/ASTextKitEntityAttribute.h
+++ /dev/null
@@ -1,36 +0,0 @@
-//
-//  ASTextKitEntityAttribute.h
-//  Texture
-//
-//  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.
-//  Changes after 4/13/2017 are: Copyright (c) Pinterest, Inc.  All rights reserved.
-//  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
-//
-
-#import <Foundation/Foundation.h>
-
-#import <AsyncDisplayKit/ASAvailability.h>
-
-#if AS_ENABLE_TEXTNODE
-
-#import <AsyncDisplayKit/ASBaseDefines.h>
-
-/**
- The object that should be embedded with ASTextKitEntityAttributeName.  Please note that the entity you provide MUST
- implement a proper hash and isEqual function or your application performance will grind to a halt due to
- NSMutableAttributedString's usage of a global hash table of all attributes.  This means the entity should NOT be a
- Foundation Collection (NSArray, NSDictionary, NSSet, etc.) since their hash function is a simple count of the values
- in the collection, which causes pathological performance problems deep inside NSAttributedString's implementation.
-
- rdar://19352367
- */
-AS_SUBCLASSING_RESTRICTED
-@interface ASTextKitEntityAttribute : NSObject
-
-@property (nonatomic, readonly) id<NSObject> entity;
-
-- (instancetype)initWithEntity:(id<NSObject>)entity;
-
-@end
-
-#endif
diff --git a/submodules/AsyncDisplayKit/Source/TextKit/ASTextKitEntityAttribute.mm b/submodules/AsyncDisplayKit/Source/TextKit/ASTextKitEntityAttribute.mm
deleted file mode 100644
index fb87e9bd3a..0000000000
--- a/submodules/AsyncDisplayKit/Source/TextKit/ASTextKitEntityAttribute.mm
+++ /dev/null
@@ -1,43 +0,0 @@
-//
-//  ASTextKitEntityAttribute.mm
-//  Texture
-//
-//  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.
-//  Changes after 4/13/2017 are: Copyright (c) Pinterest, Inc.  All rights reserved.
-//  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
-//
-
-#import <AsyncDisplayKit/ASTextKitEntityAttribute.h>
-
-#if AS_ENABLE_TEXTNODE
-
-@implementation ASTextKitEntityAttribute
-
-- (instancetype)initWithEntity:(id<NSObject>)entity
-{
-  if (self = [super init]) {
-    _entity = entity;
-  }
-  return self;
-}
-
-- (NSUInteger)hash
-{
-  return [_entity hash];
-}
-
-- (BOOL)isEqual:(id)object
-{
-  if (self == object) {
-    return YES;
-  }
-  if (![object isKindOfClass:[self class]]) {
-    return NO;
-  }
-  ASTextKitEntityAttribute *other = (ASTextKitEntityAttribute *)object;
-  return _entity == other.entity || [_entity isEqual:other.entity];
-}
-
-@end
-
-#endif
diff --git a/submodules/AsyncDisplayKit/Source/TextKit/ASTextKitFontSizeAdjuster.h b/submodules/AsyncDisplayKit/Source/TextKit/ASTextKitFontSizeAdjuster.h
deleted file mode 100644
index 1b7b10ff5f..0000000000
--- a/submodules/AsyncDisplayKit/Source/TextKit/ASTextKitFontSizeAdjuster.h
+++ /dev/null
@@ -1,58 +0,0 @@
-//
-//  ASTextKitFontSizeAdjuster.h
-//  Texture
-//
-//  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.
-//  Changes after 4/13/2017 are: Copyright (c) Pinterest, Inc.  All rights reserved.
-//  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
-//
-
-#import <UIKit/UIKit.h>
-
-#import <AsyncDisplayKit/ASAvailability.h>
-
-#if AS_ENABLE_TEXTNODE
-
-#import <AsyncDisplayKit/ASTextKitAttributes.h>
-
-NS_ASSUME_NONNULL_BEGIN
-
-@class ASTextKitContext;
-
-AS_SUBCLASSING_RESTRICTED
-@interface ASTextKitFontSizeAdjuster : NSObject
-
-@property (nonatomic) CGSize constrainedSize;
-
-/**
- *  Creates a class that will return a scale factor the will make a string fit inside the constrained size.
- *
- *  "Fitting" means that both the longest word in the string will fit without breaking in the constrained
- *  size's width AND that the entire string will try to fit within attribute's maximumLineCount. The amount
- *  that the string will scale is based upon the attribute's pointSizeScaleFactors. If the string cannot fit
- *  in the given width/number of lines, the smallest scale factor will be returned.
- *
- *  @param context                 The text kit context
- *  @param constrainedSize         The constrained size to render into
- *  @param textComponentAttributes The renderer's text attributes
- */
-- (instancetype)initWithContext:(ASTextKitContext *)context
-                constrainedSize:(CGSize)constrainedSize
-              textKitAttributes:(const ASTextKitAttributes &)textComponentAttributes;
-
-/**
- *  Returns the best fit scale factor for the text
- */
-- (CGFloat)scaleFactor;
-
-/**
- *  Takes all of the attributed string attributes dealing with size (font size, line spacing, kerning, etc) and
- *  scales them by the scaleFactor. I wouldn't be surprised if I missed some in here.
- */
-+ (void)adjustFontSizeForAttributeString:(NSMutableAttributedString *)attrString withScaleFactor:(CGFloat)scaleFactor;
-
-@end
-
-NS_ASSUME_NONNULL_END
-
-#endif
diff --git a/submodules/AsyncDisplayKit/Source/TextKit/ASTextKitFontSizeAdjuster.mm b/submodules/AsyncDisplayKit/Source/TextKit/ASTextKitFontSizeAdjuster.mm
deleted file mode 100644
index aeea44d7cc..0000000000
--- a/submodules/AsyncDisplayKit/Source/TextKit/ASTextKitFontSizeAdjuster.mm
+++ /dev/null
@@ -1,241 +0,0 @@
-//
-//  ASTextKitFontSizeAdjuster.mm
-//  Texture
-//
-//  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.
-//  Changes after 4/13/2017 are: Copyright (c) Pinterest, Inc.  All rights reserved.
-//  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
-//
-
-
-#import <AsyncDisplayKit/ASTextKitFontSizeAdjuster.h>
-
-#if AS_ENABLE_TEXTNODE
-
-#import <tgmath.h>
-#import <mutex>
-
-#import <AsyncDisplayKit/ASLayoutManager.h>
-#import <AsyncDisplayKit/ASTextKitContext.h>
-#import <AsyncDisplayKit/ASThread.h>
-
-//#define LOG(...) NSLog(__VA_ARGS__)
-#define LOG(...)
-
-@interface ASTextKitFontSizeAdjuster()
-@property (nonatomic, readonly) NSLayoutManager *sizingLayoutManager;
-@property (nonatomic, readonly) NSTextContainer *sizingTextContainer;
-@end
-
-@implementation ASTextKitFontSizeAdjuster
-{
-  __weak ASTextKitContext *_context;
-  ASTextKitAttributes _attributes;
-  BOOL _measured;
-  CGFloat _scaleFactor;
-  AS::Mutex __instanceLock__;
-}
-
-@synthesize sizingLayoutManager = _sizingLayoutManager;
-@synthesize sizingTextContainer = _sizingTextContainer;
-
-- (instancetype)initWithContext:(ASTextKitContext *)context
-                constrainedSize:(CGSize)constrainedSize
-              textKitAttributes:(const ASTextKitAttributes &)textComponentAttributes;
-{
-  if (self = [super init]) {
-    _context = context;
-    _constrainedSize = constrainedSize;
-    _attributes = textComponentAttributes;
-  }
-  return self;
-}
-
-+ (void)adjustFontSizeForAttributeString:(NSMutableAttributedString *)attrString withScaleFactor:(CGFloat)scaleFactor
-{
-  if (scaleFactor == 1.0) return;
-  
-  [attrString beginEditing];
-
-  // scale all the attributes that will change the bounding box
-  [attrString enumerateAttributesInRange:NSMakeRange(0, attrString.length) options:0 usingBlock:^(NSDictionary<NSString *,id> * _Nonnull attrs, NSRange range, BOOL * _Nonnull stop) {
-    if (attrs[NSFontAttributeName] != nil) {
-      UIFont *font = attrs[NSFontAttributeName];
-      font = [font fontWithSize:std::round(font.pointSize * scaleFactor)];
-      [attrString removeAttribute:NSFontAttributeName range:range];
-      [attrString addAttribute:NSFontAttributeName value:font range:range];
-    }
-    
-    if (attrs[NSKernAttributeName] != nil) {
-      NSNumber *kerning = attrs[NSKernAttributeName];
-      [attrString removeAttribute:NSKernAttributeName range:range];
-      [attrString addAttribute:NSKernAttributeName value:@([kerning floatValue] * scaleFactor) range:range];
-    }
-    
-    if (attrs[NSParagraphStyleAttributeName] != nil) {
-      NSMutableParagraphStyle *paragraphStyle = [attrs[NSParagraphStyleAttributeName] mutableCopy];
-      paragraphStyle.lineSpacing = (paragraphStyle.lineSpacing * scaleFactor);
-      paragraphStyle.paragraphSpacing = (paragraphStyle.paragraphSpacing * scaleFactor);
-      paragraphStyle.firstLineHeadIndent = (paragraphStyle.firstLineHeadIndent * scaleFactor);
-      paragraphStyle.headIndent = (paragraphStyle.headIndent * scaleFactor);
-      paragraphStyle.tailIndent = (paragraphStyle.tailIndent * scaleFactor);
-      paragraphStyle.minimumLineHeight = (paragraphStyle.minimumLineHeight * scaleFactor);
-      paragraphStyle.maximumLineHeight = (paragraphStyle.maximumLineHeight * scaleFactor);
-      
-      [attrString removeAttribute:NSParagraphStyleAttributeName range:range];
-      [attrString addAttribute:NSParagraphStyleAttributeName value:paragraphStyle range:range];
-    }
-    
-  }];
-
-  [attrString endEditing];
-}
-
-- (NSUInteger)lineCountForString:(NSAttributedString *)attributedString
-{
-  NSUInteger lineCount = 0;
-  
-  NSLayoutManager *sizingLayoutManager = [self sizingLayoutManager];
-  NSTextContainer *sizingTextContainer = [self sizingTextContainer];
-  
-  NSTextStorage *textStorage = [[NSTextStorage alloc] initWithAttributedString:attributedString];
-  [textStorage addLayoutManager:sizingLayoutManager];
-  
-  [sizingLayoutManager ensureLayoutForTextContainer:sizingTextContainer];
-  for (NSRange lineRange = { 0, 0 }; NSMaxRange(lineRange) < [sizingLayoutManager numberOfGlyphs] && lineCount <= _attributes.maximumNumberOfLines; lineCount++) {
-    [sizingLayoutManager lineFragmentRectForGlyphAtIndex:NSMaxRange(lineRange) effectiveRange:&lineRange];
-  }
-  
-  [textStorage removeLayoutManager:sizingLayoutManager];
-  return lineCount;
-}
-
-- (CGSize)boundingBoxForString:(NSAttributedString *)attributedString
-{
-  NSLayoutManager *sizingLayoutManager = [self sizingLayoutManager];
-  NSTextContainer *sizingTextContainer = [self sizingTextContainer];
-  
-  NSTextStorage *textStorage = [[NSTextStorage alloc] initWithAttributedString:attributedString];
-  [textStorage addLayoutManager:sizingLayoutManager];
-  
-  [sizingLayoutManager ensureLayoutForTextContainer:sizingTextContainer];
-  CGRect textRect = [sizingLayoutManager boundingRectForGlyphRange:NSMakeRange(0, [textStorage length])
-                                                   inTextContainer:sizingTextContainer];
-  [textStorage removeLayoutManager:sizingLayoutManager];
-  return textRect.size;
-}
-
-- (NSLayoutManager *)sizingLayoutManager
-{
-  AS::MutexLocker l(__instanceLock__);
-  if (_sizingLayoutManager == nil) {
-    _sizingLayoutManager = [[ASLayoutManager alloc] init];
-    _sizingLayoutManager.usesFontLeading = NO;
-    
-    if (_sizingTextContainer == nil) {
-      // make this text container unbounded in height so that the layout manager will compute the total
-      // number of lines and not stop counting when height runs out.
-      _sizingTextContainer = [[NSTextContainer alloc] initWithSize:CGSizeMake(_constrainedSize.width, CGFLOAT_MAX)];
-      _sizingTextContainer.lineFragmentPadding = 0;
-      
-      // use 0 regardless of what is in the attributes so that we get an accurate line count
-      _sizingTextContainer.maximumNumberOfLines = 0;
-      
-      _sizingTextContainer.lineBreakMode = _attributes.lineBreakMode;
-      _sizingTextContainer.exclusionPaths = _attributes.exclusionPaths;
-    }
-    [_sizingLayoutManager addTextContainer:_sizingTextContainer];
-  }
-  
-  return _sizingLayoutManager;
-}
-
-- (CGFloat)scaleFactor
-{
-  if (_measured) {
-    return _scaleFactor;
-  }
-  
-  if ([_attributes.pointSizeScaleFactors count] == 0 || isinf(_constrainedSize.width)) {
-    _measured = YES;
-    _scaleFactor = 1.0;
-    return _scaleFactor;
-  }
-  
-  __block CGFloat adjustedScale = 1.0;
-  
-  // We add the scale factor of 1 to our scaleFactors array so that in the first iteration of the loop below, we are
-  // actually determining if we need to scale at all. If something doesn't fit, we will continue to iterate our scale factors.
-  NSArray *scaleFactors = [@[@(1)] arrayByAddingObjectsFromArray:_attributes.pointSizeScaleFactors];
-  
-  [_context performBlockWithLockedTextKitComponents:^(NSLayoutManager *layoutManager, NSTextStorage *textStorage, NSTextContainer *textContainer) {
-    
-    // Check for two different situations (and correct for both)
-    // 1. The longest word in the string fits without being wrapped
-    // 2. The entire text fits in the given constrained size.
-    
-    NSString *str = textStorage.string;
-    NSArray *words = [str componentsSeparatedByCharactersInSet:[NSCharacterSet whitespaceCharacterSet]];
-    NSString *longestWordNeedingResize = @"";
-    for (NSString *word in words) {
-      if ([word length] > [longestWordNeedingResize length]) {
-        longestWordNeedingResize = word;
-      }
-    }
-    
-    // check to see if we may need to shrink for any of these things
-    BOOL longestWordFits = [longestWordNeedingResize length] ? NO : YES;
-    BOOL maxLinesFits = self->_attributes.maximumNumberOfLines > 0 ? NO : YES;
-    BOOL heightFits = isinf(self->_constrainedSize.height) ? YES : NO;
-
-    CGSize longestWordSize = CGSizeZero;
-    if (longestWordFits == NO) {
-        NSRange longestWordRange = [str rangeOfString:longestWordNeedingResize];
-        NSAttributedString *attrString = [textStorage attributedSubstringFromRange:longestWordRange];
-        longestWordSize = [attrString boundingRectWithSize:CGSizeMake(CGFLOAT_MAX, CGFLOAT_MAX) options:NSStringDrawingUsesLineFragmentOrigin context:nil].size;
-    }
-    
-    // we may need to shrink for some reason, so let's iterate through our scale factors to see if we actually need to shrink
-    // Note: the first scale factor in the array is 1.0 so will make sure that things don't fit without shrinking
-    for (NSNumber *adjustedScaleObj in scaleFactors) {
-      if (longestWordFits && maxLinesFits && heightFits) {
-        break;
-      }
-      
-      adjustedScale = [adjustedScaleObj floatValue];
-      
-      if (longestWordFits == NO) {
-        // we need to check the longest word to make sure it fits
-        longestWordFits = std::ceil((longestWordSize.width * adjustedScale) <= self->_constrainedSize.width);
-      }
-      
-      // if the longest word fits, go ahead and check max line and height. If it didn't fit continue to the next scale factor
-      if (longestWordFits == YES) {
-        
-        // scale our string by the current scale factor
-        NSMutableAttributedString *scaledString = [[NSMutableAttributedString alloc] initWithAttributedString:textStorage];
-        [[self class] adjustFontSizeForAttributeString:scaledString withScaleFactor:adjustedScale];
-        
-        // check to see if this scaled string fit in the max lines
-        if (maxLinesFits == NO) {
-          maxLinesFits = ([self lineCountForString:scaledString] <= self->_attributes.maximumNumberOfLines);
-        }
-        
-        // if max lines still doesn't fit, continue without checking that we fit in the constrained height
-        if (maxLinesFits == YES && heightFits == NO) {
-          // max lines fit so make sure that we fit in the constrained height.
-          CGSize stringSize = [self boundingBoxForString:scaledString];
-          heightFits = (stringSize.height <= self->_constrainedSize.height);
-        }
-      }
-    }
-   
-  }];
-  _measured = YES;
-  _scaleFactor = adjustedScale;
-  return _scaleFactor;
-}
-
-@end
-
-#endif
diff --git a/submodules/AsyncDisplayKit/Source/TextKit/ASTextKitRenderer+Positioning.h b/submodules/AsyncDisplayKit/Source/TextKit/ASTextKitRenderer+Positioning.h
deleted file mode 100644
index c887282568..0000000000
--- a/submodules/AsyncDisplayKit/Source/TextKit/ASTextKitRenderer+Positioning.h
+++ /dev/null
@@ -1,106 +0,0 @@
-//
-//  ASTextKitRenderer+Positioning.h
-//  Texture
-//
-//  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.
-//  Changes after 4/13/2017 are: Copyright (c) Pinterest, Inc.  All rights reserved.
-//  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
-//
-
-#import <AsyncDisplayKit/ASTextKitRenderer.h>
-
-#if AS_ENABLE_TEXTNODE
-
-typedef void (^as_text_component_index_block_t)(NSUInteger characterIndex,
-                                                CGRect glyphBoundingRect,
-                                                BOOL *stop);
-
-/**
- Measure options are used to specify which type of line height measurement to use.
-
- ASTextNodeRendererMeasureOptionLineHeight is faster and will give the height from the baseline to the next line.
-
- ASTextNodeRendererMeasureOptionCapHeight is a more nuanced measure of the glyphs in the given range that attempts to
- produce a visually balanced rectangle above and below the glyphs to produce nice looking text highlights.
-
- ASTextNodeRendererMeasureOptionBlock uses the cap height option to generate each glyph index, but combines all but the
- first and last line rect into a single block.  Looks nice for multiline selection.
- */
-typedef NS_ENUM(NSUInteger, ASTextKitRendererMeasureOption) {
-  ASTextKitRendererMeasureOptionLineHeight,
-  ASTextKitRendererMeasureOptionCapHeight,
-  ASTextKitRendererMeasureOptionBlock
-};
-
-@interface ASTextKitRenderer (Positioning)
-
-/**
- Returns the bounding rect for the given character range.
-
- @param textRange The character range for which the bounding rect will be computed.  Should be within the range of the
- attributedString of this renderer.
-
- @discussion In the external, shadowed coordinate space.
- */
-- (CGRect)frameForTextRange:(NSRange)textRange;
-
-/**
- Returns an array of rects representing the lines in the given character range
-
- @param textRange The character range for which the rects will be computed. Should be within the range of the
- attributedString of this renderer.
- @param measureOption The measure option to use for construction of the rects. See ASTextKitRendererMeasureOption
- docs for usage.
-
- @discussion This method is useful for providing highlighting text.  Returned rects are in the coordinate space of the
- renderer.
-
- Triggers initialization of textkit components, truncation, and sizing.
- */
-- (NSArray *)rectsForTextRange:(NSRange)textRange
-                 measureOption:(ASTextKitRendererMeasureOption)measureOption;
-
-/**
- Enumerate the text character indexes at a position within the coordinate space of the renderer.
-
- @param position The point in the shadowed coordinate space at which text indexes will be enumerated.
- @param block The block that will be executed for each index identified that may correspond to the given position.  The
- block is given the character index that corresponds to the glyph at each index in question, as well as the bounding
- rect for that glyph.
-
- @discussion Glyph location based on a touch point is not an exact science because user touches are not well-represented
- by a simple point, especially in the context of link-heavy text.  So we have this method to make it a bit easier.  This
- method checks a grid of candidate positions around the touch point you give it, and computes the bounding rect of the
- glyph corresponding to the character index given.
-
- The bounding rect of the glyph can be used to identify the best glyph index that corresponds to your touch.  For
- instance, comparing centroidal distance from the glyph bounding rect to the touch center is useful for identifying
- which link a user actually intended to select.
-
- Triggers initialization of textkit components, truncation, and sizing.
- */
-- (void)enumerateTextIndexesAtPosition:(CGPoint)position
-                            usingBlock:(as_text_component_index_block_t)block;
-
-/**
- Returns the single text index whose glyph's centroid is closest to the given position.
-
- @param position The point in the shadowed coordinate space that should be checked.
-
- @discussion This will use the grid enumeration function above, `enumerateTextIndexesAtPosition...`, in order to find
- the closest glyph, so it is possible that a glyph could be missed, but ultimately unlikely.
- */
-- (NSUInteger)nearestTextIndexAtPosition:(CGPoint)position;
-
-/**
- Returns the trailing rect unused by the renderer in the last rendered line.
-
- @discussion In the external shadowed coordinate space.
-
- Triggers initialization of textkit components, truncation, and sizing.
- */
-- (CGRect)trailingRect;
-
-@end
-
-#endif
diff --git a/submodules/AsyncDisplayKit/Source/TextKit/ASTextKitRenderer+Positioning.mm b/submodules/AsyncDisplayKit/Source/TextKit/ASTextKitRenderer+Positioning.mm
deleted file mode 100644
index 9dc770e1d9..0000000000
--- a/submodules/AsyncDisplayKit/Source/TextKit/ASTextKitRenderer+Positioning.mm
+++ /dev/null
@@ -1,386 +0,0 @@
-//
-//  ASTextKitRenderer+Positioning.mm
-//  Texture
-//
-//  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.
-//  Changes after 4/13/2017 are: Copyright (c) Pinterest, Inc.  All rights reserved.
-//  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
-//
-
-#import <AsyncDisplayKit/ASTextKitRenderer+Positioning.h>
-
-#if AS_ENABLE_TEXTNODE
-
-#import <CoreText/CoreText.h>
-#import <tgmath.h>
-
-#import <AsyncDisplayKit/ASAssert.h>
-
-#import <AsyncDisplayKit/ASTextKitContext.h>
-#import <AsyncDisplayKit/ASTextKitShadower.h>
-
-static const CGFloat ASTextKitRendererGlyphTouchHitSlop = 5.0;
-static const CGFloat ASTextKitRendererTextCapHeightPadding = 1.3;
-
-@implementation ASTextKitRenderer (Tracking)
-
-- (NSArray *)rectsForTextRange:(NSRange)textRange measureOption:(ASTextKitRendererMeasureOption)measureOption
-{
-  __block NSArray *textRects = nil;
-  [self.context performBlockWithLockedTextKitComponents:^(NSLayoutManager *layoutManager, NSTextStorage *textStorage, NSTextContainer *textContainer) {
-    textRects = [self unlockedRectsForTextRange:textRange measureOptions:measureOption layoutManager:layoutManager textStorage:textStorage textContainer:textContainer];
-  }];
-  return textRects;
-}
-
-/**
- Helper function that should be called within performBlockWithLockedTextKitComponents: in an already locked state to
- prevent a deadlock
- */
-- (NSArray *)unlockedRectsForTextRange:(NSRange)textRange measureOptions:(ASTextKitRendererMeasureOption)measureOption layoutManager:(NSLayoutManager *)layoutManager textStorage:(NSTextStorage *)textStorage textContainer:(NSTextContainer *)textContainer
-{
-  NSRange clampedRange = NSIntersectionRange(textRange, NSMakeRange(0, [textStorage length]));
-  if (clampedRange.location == NSNotFound || clampedRange.length == 0) {
-    return @[];
-  }
-
-  // Used for block measure option
-  __block CGRect firstRect = CGRectNull;
-  __block CGRect lastRect = CGRectNull;
-  __block CGRect blockRect = CGRectNull;
-  NSMutableArray *mutableTextRects = [NSMutableArray array];
-
-  NSString *string = textStorage.string;
-
-  NSRange totalGlyphRange = [layoutManager glyphRangeForCharacterRange:clampedRange actualCharacterRange:NULL];
-
-  [layoutManager enumerateLineFragmentsForGlyphRange:totalGlyphRange usingBlock:^(CGRect rect,
-                                                                                  CGRect usedRect,
-                                                                                  NSTextContainer *innerTextContainer,
-                                                                                  NSRange glyphRange,
-                                                                                  BOOL *stop) {
-
-    CGRect lineRect = CGRectNull;
-    // If we're empty, don't bother looping through glyphs, use the default.
-    if (CGRectIsEmpty(usedRect)) {
-      lineRect = usedRect;
-    } else {
-      // TextKit's bounding rect computations are just a touch off, so we actually
-      // compose the rects by hand from the center of the given TextKit bounds and
-      // imposing the font attributes returned by the glyph's font.
-      NSRange lineGlyphRange = NSIntersectionRange(totalGlyphRange, glyphRange);
-      for (NSUInteger i = lineGlyphRange.location; i < NSMaxRange(lineGlyphRange) && i < string.length; i++) {
-        // We grab the properly sized rect for the glyph
-        CGRect properGlyphRect = [self _internalRectForGlyphAtIndex:i
-                                                      measureOption:measureOption
-                                                      layoutManager:layoutManager
-                                                      textContainer:textContainer
-                                                        textStorage:textStorage];
-
-        // Don't count empty glyphs towards our line rect.
-        if (!CGRectIsEmpty(properGlyphRect)) {
-          lineRect = CGRectIsNull(lineRect) ? properGlyphRect
-          : CGRectUnion(lineRect, properGlyphRect);
-        }
-      }
-    }
-
-    if (!CGRectIsNull(lineRect)) {
-      if (measureOption == ASTextKitRendererMeasureOptionBlock) {
-        // For the block measurement option we store the first & last rect as
-        // special cases, then merge everything else into a single block rect
-        if (CGRectIsNull(firstRect)) {
-          // We don't have a firstRect, so we must be on the first line.
-          firstRect = lineRect;
-        } else if(CGRectIsNull(lastRect)) {
-          // We don't have a lastRect, but we do have a firstRect, so we must
-          // be on the second line.  No need to merge in the blockRect just yet
-          lastRect = lineRect;
-        } else if(CGRectIsNull(blockRect)) {
-          // We have both a first and last rect, so we must be on the third line
-          // we don't have any blockRect to merge it into, so we just set it
-          // directly.
-          blockRect = lastRect;
-          lastRect = lineRect;
-        } else {
-          // Everything is already set, so we just merge this line into the
-          // block.
-          blockRect = CGRectUnion(blockRect, lastRect);
-          lastRect = lineRect;
-        }
-      } else {
-        // If the block option isn't being used then each line is being treated
-        // individually.
-        [mutableTextRects addObject:[NSValue valueWithCGRect:[self.shadower offsetRectWithInternalRect:lineRect]]];
-      }
-    }
-  }];
-
-  if (measureOption == ASTextKitRendererMeasureOptionBlock) {
-    // Block measure option is handled differently with just 3 vars for the entire range.
-    if (!CGRectIsNull(firstRect)) {
-      if (!CGRectIsNull(blockRect)) {
-        CGFloat rightEdge = MAX(CGRectGetMaxX(blockRect), CGRectGetMaxX(lastRect));
-        if (rightEdge > CGRectGetMaxX(firstRect)) {
-          // Force the right side of the first rect to properly align with the
-          // right side of the rightmost of the block and last rect
-          firstRect.size.width += rightEdge - CGRectGetMaxX(firstRect);
-        }
-
-        // Force the left side of the block rect to properly align with the
-        // left side of the leftmost of the first and last rect
-        blockRect.origin.x = MIN(CGRectGetMinX(firstRect), CGRectGetMinX(lastRect));
-        // Force the right side of the block rect to properly align with the
-        // right side of the rightmost of the first and last rect
-        blockRect.size.width += MAX(CGRectGetMaxX(firstRect), CGRectGetMaxX(lastRect)) - CGRectGetMaxX(blockRect);
-      }
-      if (!CGRectIsNull(lastRect)) {
-        // Force the left edge of the last rect to properly align with the
-        // left side of the leftmost of the first and block rect, if necessary.
-        CGFloat leftEdge = MIN(CGRectGetMinX(blockRect), CGRectGetMinX(firstRect));
-        CGFloat lastRectNudgeAmount = MAX(CGRectGetMinX(lastRect) - leftEdge, 0);
-        lastRect.origin.x = MIN(leftEdge, CGRectGetMinX(lastRect));
-        lastRect.size.width += lastRectNudgeAmount;
-      }
-
-      [mutableTextRects addObject:[NSValue valueWithCGRect:[self.shadower offsetRectWithInternalRect:firstRect]]];
-    }
-    if (!CGRectIsNull(blockRect)) {
-      [mutableTextRects addObject:[NSValue valueWithCGRect:[self.shadower offsetRectWithInternalRect:blockRect]]];
-    }
-    if (!CGRectIsNull(lastRect)) {
-      [mutableTextRects addObject:[NSValue valueWithCGRect:[self.shadower offsetRectWithInternalRect:lastRect]]];
-    }
-  }
-
-  return [mutableTextRects copy];
-}
-
-- (NSUInteger)nearestTextIndexAtPosition:(CGPoint)position
-{
-  // Check in a 9-point region around the actual touch point so we make sure
-  // we get the best attribute for the touch.
-  __block CGFloat minimumGlyphDistance = CGFLOAT_MAX;
-  __block NSUInteger minimumGlyphCharacterIndex = NSNotFound;
-
-  [self enumerateTextIndexesAtPosition:position usingBlock:^(NSUInteger characterIndex, CGRect glyphBoundingRect, BOOL *stop) {
-    CGPoint glyphLocation = CGPointMake(CGRectGetMidX(glyphBoundingRect), CGRectGetMidY(glyphBoundingRect));
-    CGFloat currentDistance = std::sqrt(std::pow(position.x - glyphLocation.x, 2.f) + std::pow(position.y - glyphLocation.y, 2.f));
-    if (currentDistance < minimumGlyphDistance) {
-      minimumGlyphDistance = currentDistance;
-      minimumGlyphCharacterIndex = characterIndex;
-    }
-  }];
-  return minimumGlyphCharacterIndex;
-}
-
-/**
- Measured from the internal coordinate space of the context, not accounting for shadow offsets.  Actually uses CoreText
- as an approximation to work around problems in TextKit's glyph sizing.
- */
-- (CGRect)_internalRectForGlyphAtIndex:(NSUInteger)glyphIndex
-                         measureOption:(ASTextKitRendererMeasureOption)measureOption
-                         layoutManager:(NSLayoutManager *)layoutManager
-                         textContainer:(NSTextContainer *)textContainer
-                           textStorage:(NSTextStorage *)textStorage
-{
-  NSUInteger charIndex = [layoutManager characterIndexForGlyphAtIndex:glyphIndex];
-  CGGlyph glyph = [layoutManager glyphAtIndex:glyphIndex];
-  CTFontRef font = (__bridge_retained CTFontRef)[textStorage attribute:NSFontAttributeName
-                                                               atIndex:charIndex
-                                                        effectiveRange:NULL];
-  if (font == nil) {
-    font = (__bridge_retained CTFontRef)[UIFont systemFontOfSize:12.0];
-  }
-
-  //                                    Glyph Advance
-  //                             +-------------------------+
-  //                             |                         |
-  //                             |                         |
-  // +------------------------+--|-------------------------|--+-----------+-----+ What TextKit returns sometimes
-  // |                        |  |             XXXXXXXXXXX +  |           |     | (approx. correct height, but
-  // |               ---------|--+---------+  XXX       XXXX +|-----------|-----|  sometimes inaccurate bounding
-  // |               |        |             XXX          XXXXX|           |     |  widths)
-  // |               |        |             XX             XX |           |     |
-  // |               |        |            XX                 |           |     |
-  // |               |        |           XXX                 |           |     |
-  // |               |        |           XX                  |           |     |
-  // |               |        |      XXXXXXXXXXX              |           |     |
-  // |   Cap Height->|        |          XX                   |           |     |
-  // |               |        |          XX                   |  Ascent-->|     |
-  // |               |        |          XX                   |           |     |
-  // |               |        |          XX                   |           |     |
-  // |               |        |          X                    |           |     |
-  // |               |        |          X                    |           |     |
-  // |               |        |          X                    |           |     |
-  // |               |        |         XX                    |           |     |
-  // |               |        |         X                     |           |     |
-  // |               ---------|-------+ X +-------------------------------------|
-  // |                        |        XX                     |                 |
-  // |                        |        X                      |                 |
-  // |                        |      XX         Descent------>|                 |
-  // |                        | XXXXXX                        |                 |
-  // |                        |  XXX                          |                 |
-  // +------------------------+-------------------------------------------------+
-  //                                                          |
-  //                                                          +--+Actual bounding box
-
-  CGRect glyphRect = [layoutManager boundingRectForGlyphRange:NSMakeRange(glyphIndex, 1)
-                                                           inTextContainer:textContainer];
-
-  // If it is a NSTextAttachment, we don't have the matched glyph and use width of glyphRect instead of advance.
-  CGFloat advance = (glyph == kCGFontIndexInvalid) ? glyphRect.size.width : CTFontGetAdvancesForGlyphs(font, kCTFontOrientationHorizontal, &glyph, NULL, 1);
-
-  // We treat the center of the glyph's bounding box as the center of our new rect
-  CGPoint glyphCenter = CGPointMake(CGRectGetMidX(glyphRect), CGRectGetMidY(glyphRect));
-
-  CGRect properGlyphRect;
-  if (measureOption == ASTextKitRendererMeasureOptionCapHeight
-      || measureOption == ASTextKitRendererMeasureOptionBlock) {
-    CGFloat ascent = CTFontGetAscent(font);
-    CGFloat descent = CTFontGetDescent(font);
-    CGFloat capHeight = CTFontGetCapHeight(font);
-    CGFloat leading = CTFontGetLeading(font);
-    CGFloat glyphHeight = ascent + descent;
-
-    // For visual balance, we add the cap height padding above the cap, and
-    // below the baseline, we scale by the descent so it grows with the size of
-    // the text.
-    CGFloat topPadding = ASTextKitRendererTextCapHeightPadding * descent;
-    CGFloat bottomPadding = topPadding;
-
-    properGlyphRect = CGRectMake(glyphCenter.x - advance * 0.5,
-                                 glyphCenter.y - glyphHeight * 0.5 + (ascent - capHeight) - topPadding + leading,
-                                 advance,
-                                 capHeight + topPadding + bottomPadding);
-  } else {
-    // We are just measuring the line heights here, so we can use the
-    // heights used by TextKit, which tend to be pretty good.
-    properGlyphRect = CGRectMake(glyphCenter.x - advance * 0.5,
-                                 glyphRect.origin.y,
-                                 advance,
-                                 glyphRect.size.height);
-  }
-
-  CFRelease(font);
-
-  return properGlyphRect;
-}
-
-- (void)enumerateTextIndexesAtPosition:(CGPoint)externalPosition usingBlock:(as_text_component_index_block_t)block
-{
-  // This method is a little complex because it has to call out to client code from inside an enumeration that needs
-  // to achieve a lock on the textkit components.  It cannot call out to client code from within that lock so we just
-  // perform the textkit-locked ops inside the locked context.
-  ASTextKitContext *lockingContext = self.context;
-  CGPoint internalPosition = [self.shadower offsetPointWithExternalPoint:externalPosition];
-  __block BOOL invalidPosition = NO;
-  [lockingContext performBlockWithLockedTextKitComponents:^(NSLayoutManager *layoutManager, NSTextStorage *textStorage, NSTextContainer *textContainer) {
-    invalidPosition = internalPosition.x > textContainer.size.width
-    || internalPosition.y > textContainer.size.height
-    || block == NULL;
-  }];
-  if (invalidPosition) {
-    // Short circuit if the position is outside the size of this renderer, or if the block is null.
-    return;
-  }
-
-  // We break it up into a 44pt box for the touch, and find the closest link attribute-containing glyph to the center of
-  // the touch.
-  CGFloat squareSide = 44.f;
-  // Should be odd if you want to test the center of the touch.
-  NSInteger pointsOnASide = 3;
-
-  // The distance between any 2 of the adjacent points
-  CGFloat pointSeparation = squareSide / pointsOnASide;
-  // These are for tracking which point we're on.  We start with -pointsOnASide/2 and go to pointsOnASide/2.  So if
-  // pointsOnASide=3, we go from -1 to 1.
-  NSInteger endIndex = pointsOnASide / 2;
-  NSInteger startIndex = -endIndex;
-
-  BOOL stop = NO;
-  for (NSInteger i = startIndex; i <= endIndex && !stop; i++) {
-    for (NSInteger j = startIndex; j <= endIndex && !stop; j++) {
-      CGPoint currentPoint = CGPointMake(internalPosition.x + i * pointSeparation,
-                                         internalPosition.y + j * pointSeparation);
-
-      __block NSUInteger characterIndex = NSNotFound;
-      __block BOOL isValidGlyph = NO;
-      __block CGRect glyphRect = CGRectNull;
-
-      [lockingContext performBlockWithLockedTextKitComponents:^(NSLayoutManager *layoutManager, NSTextStorage *textStorage, NSTextContainer *textContainer) {
-        // We ask the layout manager for the proper glyph at the touch point
-        NSUInteger glyphIndex = [layoutManager glyphIndexForPoint:currentPoint
-                                                  inTextContainer:textContainer];
-
-        // If it's an invalid glyph, quit.
-
-        [layoutManager glyphAtIndex:glyphIndex isValidIndex:&isValidGlyph];
-        if (!isValidGlyph) {
-          return;
-        }
-
-        characterIndex = [layoutManager characterIndexForGlyphAtIndex:glyphIndex];
-
-        glyphRect = [self _internalRectForGlyphAtIndex:glyphIndex
-                                         measureOption:ASTextKitRendererMeasureOptionLineHeight
-                                         layoutManager:layoutManager
-                                         textContainer:textContainer
-                                           textStorage:textStorage];
-      }];
-
-      // Sometimes TextKit plays jokes on us and returns glyphs that really aren't close to the point in question.
-      // Silly TextKit...
-      if (!isValidGlyph || !CGRectContainsPoint(CGRectInset(glyphRect, -ASTextKitRendererGlyphTouchHitSlop, -ASTextKitRendererGlyphTouchHitSlop), currentPoint)) {
-        continue;
-      }
-
-      block(characterIndex, [self.shadower offsetRectWithInternalRect:glyphRect], &stop);
-    }
-  }
-}
-
-- (CGRect)trailingRect
-{
-  __block CGRect trailingRect = CGRectNull;
-  [self.context performBlockWithLockedTextKitComponents:^(NSLayoutManager *layoutManager, NSTextStorage *textStorage, NSTextContainer *textContainer) {
-    CGSize calculatedSize = textContainer.size;
-    // If have an empty string, then our whole bounds constitute trailing space.
-    if ([textStorage length] == 0) {
-      trailingRect = CGRectMake(0, 0, calculatedSize.width, calculatedSize.height);
-      return;
-    }
-
-    // Take everything after our final character as trailing space.
-    NSRange textRange = NSMakeRange([textStorage length] - 1, 1);
-    NSArray *finalRects = [self unlockedRectsForTextRange:textRange measureOptions:ASTextKitRendererMeasureOptionLineHeight layoutManager:layoutManager textStorage:textStorage textContainer:textContainer];
-    CGRect finalGlyphRect = [[finalRects lastObject] CGRectValue];
-    CGPoint origin = CGPointMake(CGRectGetMaxX(finalGlyphRect), CGRectGetMinY(finalGlyphRect));
-    CGSize size = CGSizeMake(calculatedSize.width - origin.x, calculatedSize.height - origin.y);
-    trailingRect = (CGRect){origin, size};
-  }];
-  return trailingRect;
-}
-
-- (CGRect)frameForTextRange:(NSRange)textRange
-{
-  __block CGRect textRect = CGRectNull;
-  [self.context performBlockWithLockedTextKitComponents:^(NSLayoutManager *layoutManager, NSTextStorage *textStorage, NSTextContainer *textContainer) {
-    // Bail on invalid range.
-    if (NSMaxRange(textRange) > [textStorage length]) {
-      ASDisplayNodeCFailAssert(@"Invalid range");
-      return;
-    }
-
-    // Force glyph generation and layout.
-    [layoutManager ensureLayoutForTextContainer:textContainer];
-
-    NSRange glyphRange = [layoutManager glyphRangeForCharacterRange:textRange actualCharacterRange:NULL];
-    textRect = [layoutManager boundingRectForGlyphRange:glyphRange inTextContainer:textContainer];
-  }];
-  return textRect;
-}
-
-@end
-
-#endif
diff --git a/submodules/AsyncDisplayKit/Source/TextKit/ASTextKitRenderer+TextChecking.h b/submodules/AsyncDisplayKit/Source/TextKit/ASTextKitRenderer+TextChecking.h
deleted file mode 100644
index d4ba74fd32..0000000000
--- a/submodules/AsyncDisplayKit/Source/TextKit/ASTextKitRenderer+TextChecking.h
+++ /dev/null
@@ -1,32 +0,0 @@
-//
-//  ASTextKitRenderer+TextChecking.h
-//  Texture
-//
-//  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.
-//  Changes after 4/13/2017 are: Copyright (c) Pinterest, Inc.  All rights reserved.
-//  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
-//
-
-#import <AsyncDisplayKit/ASTextKitRenderer.h>
-
-#if AS_ENABLE_TEXTNODE
-
-/**
- Application extensions to NSTextCheckingType. We're allowed to do this (see NSTextCheckingAllCustomTypes).
- */
-static uint64_t const ASTextKitTextCheckingTypeEntity =               1ULL << 33;
-static uint64_t const ASTextKitTextCheckingTypeTruncation =           1ULL << 34;
-
-@class ASTextKitEntityAttribute;
-
-@interface ASTextKitTextCheckingResult : NSTextCheckingResult
-@property (nonatomic, readonly) ASTextKitEntityAttribute *entityAttribute;
-@end
-
-@interface ASTextKitRenderer (TextChecking)
-
-- (NSTextCheckingResult *)textCheckingResultAtPoint:(CGPoint)point;
-
-@end
-
-#endif
diff --git a/submodules/AsyncDisplayKit/Source/TextKit/ASTextKitRenderer+TextChecking.mm b/submodules/AsyncDisplayKit/Source/TextKit/ASTextKitRenderer+TextChecking.mm
deleted file mode 100644
index e556393572..0000000000
--- a/submodules/AsyncDisplayKit/Source/TextKit/ASTextKitRenderer+TextChecking.mm
+++ /dev/null
@@ -1,104 +0,0 @@
-//
-//  ASTextKitRenderer+TextChecking.mm
-//  Texture
-//
-//  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.
-//  Changes after 4/13/2017 are: Copyright (c) Pinterest, Inc.  All rights reserved.
-//  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
-//
-
-#import <AsyncDisplayKit/ASTextKitRenderer+TextChecking.h>
-
-#if AS_ENABLE_TEXTNODE
-
-#import <AsyncDisplayKit/ASTextKitEntityAttribute.h>
-#import <AsyncDisplayKit/ASTextKitRenderer+Positioning.h>
-#import <AsyncDisplayKit/ASTextKitTailTruncater.h>
-
-@implementation ASTextKitTextCheckingResult
-
-{
-  // Be explicit about the fact that we are overriding the super class' implementation of -range and -resultType
-  // and substituting our own custom values. (We could use @synthesize to make these ivars, but our linter correctly
-  // complains; it's weird to use @synthesize for properties that are redeclared on top of an original declaration in
-  // the superclass. We only do it here because NSTextCheckingResult doesn't expose an initializer, which is silly.)
-  NSRange _rangeOverride;
-  NSTextCheckingType _resultTypeOverride;
-}
-
-- (instancetype)initWithType:(NSTextCheckingType)type
-             entityAttribute:(ASTextKitEntityAttribute *)entityAttribute
-                       range:(NSRange)range
-{
-  if ((self = [super init])) {
-    _resultTypeOverride = type;
-    _rangeOverride = range;
-    _entityAttribute = entityAttribute;
-  }
-  return self;
-}
-
-- (NSTextCheckingType)resultType
-{
-  return _resultTypeOverride;
-}
-
-- (NSRange)range
-{
-  return _rangeOverride;
-}
-
-@end
-
-@implementation ASTextKitRenderer (TextChecking)
-
-- (NSTextCheckingResult *)textCheckingResultAtPoint:(CGPoint)point
-{
-  __block NSTextCheckingResult *result = nil;
-  NSAttributedString *attributedString = self.attributes.attributedString;
-  NSAttributedString *truncationAttributedString = self.attributes.truncationAttributedString;
-
-  // get the index of the last character, so we can handle text in the truncation token
-  __block NSRange truncationTokenRange = { NSNotFound, 0 };
-
-  [truncationAttributedString enumerateAttribute:ASTextKitTruncationAttributeName inRange:NSMakeRange(0, truncationAttributedString.length)
-                                         options:0
-                                      usingBlock:^(id value, NSRange range, BOOL *stop) {
-    if (value != nil && range.length > 0) {
-      truncationTokenRange = range;
-    }
-  }];
-
-  if (truncationTokenRange.location == NSNotFound) {
-    // The truncation string didn't specify a substring which should be highlighted, so we just highlight it all
-    truncationTokenRange = { 0, truncationAttributedString.length };
-  }
-
-  NSRange visibleRange = self.truncater.firstVisibleRange;
-  truncationTokenRange.location += NSMaxRange(visibleRange);
-  
-  __block CGFloat minDistance = CGFLOAT_MAX;
-  [self enumerateTextIndexesAtPosition:point usingBlock:^(NSUInteger index, CGRect glyphBoundingRect, BOOL *stop){
-    if (index >= truncationTokenRange.location) {
-      result = [[ASTextKitTextCheckingResult alloc] initWithType:ASTextKitTextCheckingTypeTruncation
-                                                 entityAttribute:nil
-                                                           range:truncationTokenRange];
-    } else {
-      NSRange range;
-      NSDictionary *attributes = [attributedString attributesAtIndex:index effectiveRange:&range];
-      ASTextKitEntityAttribute *entityAttribute = attributes[ASTextKitEntityAttributeName];
-      CGFloat distance = hypot(CGRectGetMidX(glyphBoundingRect) - point.x, CGRectGetMidY(glyphBoundingRect) - point.y);
-      if (entityAttribute && distance < minDistance) {
-        result = [[ASTextKitTextCheckingResult alloc] initWithType:ASTextKitTextCheckingTypeEntity
-                                                   entityAttribute:entityAttribute
-                                                             range:range];
-        minDistance = distance;
-      }
-    }
-  }];
-  return result;
-}
-
-@end
-
-#endif
diff --git a/submodules/AsyncDisplayKit/Source/TextKit/ASTextKitRenderer.h b/submodules/AsyncDisplayKit/Source/TextKit/ASTextKitRenderer.h
deleted file mode 100644
index 0f0cc00e0a..0000000000
--- a/submodules/AsyncDisplayKit/Source/TextKit/ASTextKitRenderer.h
+++ /dev/null
@@ -1,108 +0,0 @@
-//
-//  ASTextKitRenderer.h
-//  Texture
-//
-//  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.
-//  Changes after 4/13/2017 are: Copyright (c) Pinterest, Inc.  All rights reserved.
-//  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
-//
-
-#import <UIKit/UIKit.h>
-
-#import <AsyncDisplayKit/ASAvailability.h>
-
-#if AS_ENABLE_TEXTNODE
-
-#import <AsyncDisplayKit/ASTextKitAttributes.h>
-
-#import <vector>
-
-@class ASTextKitContext;
-@class ASTextKitShadower;
-@class ASTextKitFontSizeAdjuster;
-@protocol ASTextKitTruncating;
-
-/**
- ASTextKitRenderer is a modular object that is responsible for laying out and drawing text.
-
- A renderer will hold onto the TextKit layouts for the given attributes after initialization.  This may constitute a
- large amount of memory for large enough applications, so care must be taken when keeping many of these around in-memory
- at once.
-
- This object is designed to be modular and simple.  All complex maintenance of state should occur in sub-objects or be
- derived via pure functions or categories.  No touch-related handling belongs in this class.
-
- ALL sizing and layout information from this class is in the external coordinate space of the TextKit components.  This
- is an important distinction because all internal sizing and layout operations are carried out within the shadowed
- coordinate space.  Padding will be added for you in order to ensure clipping does not occur, and additional information
- on this transform is available via the shadower should you need it.
- */
-@interface ASTextKitRenderer : NSObject
-
-/**
- Designated Initializer
- @discussion Sizing will occur as a result of initialization, so be careful when/where you use this.
- */
-- (instancetype)initWithTextKitAttributes:(const ASTextKitAttributes &)textComponentAttributes
-                          constrainedSize:(const CGSize)constrainedSize;
-
-@property (nonatomic, readonly) ASTextKitContext *context;
-
-@property (nonatomic, readonly) id<ASTextKitTruncating> truncater;
-
-@property (nonatomic, readonly) ASTextKitFontSizeAdjuster *fontSizeAdjuster;
-
-@property (nonatomic, readonly) ASTextKitShadower *shadower;
-
-@property (nonatomic, readonly) ASTextKitAttributes attributes;
-
-@property (nonatomic, readonly) CGSize constrainedSize;
-
-@property (nonatomic, readonly) CGFloat currentScaleFactor;
-
-#pragma mark - Drawing
-/**
- Draw the renderer's text content into the bounds provided.
-
- @param bounds The rect in which to draw the contents of the renderer.
- */
-- (void)drawInContext:(CGContextRef)context bounds:(CGRect)bounds;
-
-#pragma mark - Layout
-
-/**
- Returns the computed size of the renderer given the constrained size and other parameters in the initializer.
- */
-- (CGSize)size;
-
-#pragma mark - Text Ranges
-
-/**
- The character range from the original attributedString that is displayed by the renderer given the parameters in the
- initializer.
- */
-@property (nonatomic, readonly) std::vector<NSRange> visibleRanges;
-
-/**
- The number of lines shown in the string.
- */
-- (NSUInteger)lineCount;
-
-/**
- Whether or not the text is truncated.
- */
-- (BOOL)isTruncated;
-
-@end
-
-@interface ASTextKitRenderer (ASTextKitRendererConvenience)
-
-/**
- Returns the first visible range or an NSRange with location of NSNotFound and size of 0 if no first visible
- range exists
- */
-@property (nonatomic, readonly) NSRange firstVisibleRange;
-
-@end
-
-#endif
diff --git a/submodules/AsyncDisplayKit/Source/TextKit/ASTextKitRenderer.mm b/submodules/AsyncDisplayKit/Source/TextKit/ASTextKitRenderer.mm
deleted file mode 100644
index b724d70747..0000000000
--- a/submodules/AsyncDisplayKit/Source/TextKit/ASTextKitRenderer.mm
+++ /dev/null
@@ -1,295 +0,0 @@
-//
-//  ASTextKitRenderer.mm
-//  Texture
-//
-//  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.
-//  Changes after 4/13/2017 are: Copyright (c) Pinterest, Inc.  All rights reserved.
-//  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
-//
-
-#import <AsyncDisplayKit/ASTextKitRenderer.h>
-
-#if AS_ENABLE_TEXTNODE
-
-#import <AsyncDisplayKit/ASAssert.h>
-
-#import <AsyncDisplayKit/ASTextKitContext.h>
-#import <AsyncDisplayKit/ASTextKitShadower.h>
-#import <AsyncDisplayKit/ASTextKitTailTruncater.h>
-#import <AsyncDisplayKit/ASTextKitFontSizeAdjuster.h>
-#import <AsyncDisplayKit/ASInternalHelpers.h>
-#import <AsyncDisplayKit/ASRunLoopQueue.h>
-
-//#define LOG(...) NSLog(__VA_ARGS__)
-#define LOG(...)
-
-static NSCharacterSet *_defaultAvoidTruncationCharacterSet()
-{
-  static NSCharacterSet *truncationCharacterSet;
-  static dispatch_once_t onceToken;
-  dispatch_once(&onceToken, ^{
-    NSMutableCharacterSet *mutableCharacterSet = [[NSMutableCharacterSet alloc] init];
-    [mutableCharacterSet formUnionWithCharacterSet:[NSCharacterSet whitespaceAndNewlineCharacterSet]];
-    [mutableCharacterSet addCharactersInString:@".,!?:;"];
-    truncationCharacterSet = mutableCharacterSet;
-  });
-  return truncationCharacterSet;
-}
-
-@implementation ASTextKitRenderer {
-  CGSize _calculatedSize;
-}
-@synthesize attributes = _attributes, context = _context, shadower = _shadower, truncater = _truncater, fontSizeAdjuster = _fontSizeAdjuster;
-
-#pragma mark - Initialization
-
-- (instancetype)initWithTextKitAttributes:(const ASTextKitAttributes &)attributes
-                          constrainedSize:(const CGSize)constrainedSize
-{
-  if (self = [super init]) {
-    _constrainedSize = constrainedSize;
-    _attributes = attributes;
-    _currentScaleFactor = 1;
-    
-    // As the renderer should be thread safe, create all subcomponents in the initialization method
-    _shadower = [ASTextKitShadower shadowerWithShadowOffset:attributes.shadowOffset
-                                                shadowColor:attributes.shadowColor
-                                              shadowOpacity:attributes.shadowOpacity
-                                               shadowRadius:attributes.shadowRadius];
-    
-    // We must inset the constrained size by the size of the shadower.
-    CGSize shadowConstrainedSize = [[self shadower] insetSizeWithConstrainedSize:_constrainedSize];
-    
-    _context = [[ASTextKitContext alloc] initWithAttributedString:attributes.attributedString
-                                                    lineBreakMode:attributes.lineBreakMode
-                                             maximumNumberOfLines:attributes.maximumNumberOfLines
-                                                   exclusionPaths:attributes.exclusionPaths
-                                                  constrainedSize:shadowConstrainedSize];
-    
-    NSCharacterSet *avoidTailTruncationSet = attributes.avoidTailTruncationSet ?: _defaultAvoidTruncationCharacterSet();
-    _truncater = [[ASTextKitTailTruncater alloc] initWithContext:[self context]
-                                      truncationAttributedString:attributes.truncationAttributedString
-                                          avoidTailTruncationSet:avoidTailTruncationSet];
-      
-    ASTextKitAttributes attributes = _attributes;
-    // We must inset the constrained size by the size of the shadower.
-    _fontSizeAdjuster = [[ASTextKitFontSizeAdjuster alloc] initWithContext:[self context]
-                                                           constrainedSize:shadowConstrainedSize
-                                                         textKitAttributes:attributes];
-    
-    // Calcualate size immediately
-    [self _calculateSize];
-  }
-  return self;
-}
-
-- (NSStringDrawingContext *)stringDrawingContext
-{
-  // String drawing contexts are not safe to use from more than one thread.
-  // i.e. if they are created on one thread, it is unsafe to use them on another.
-  // Therefore we always need to create a new one.
-  //
-  // http://web.archive.org/web/20140703122636/https://developer.apple.com/library/ios/documentation/uikit/reference/NSAttributedString_UIKit_Additions/Reference/Reference.html
-  NSStringDrawingContext *stringDrawingContext = [[NSStringDrawingContext alloc] init];
-  
-  if (isinf(_constrainedSize.width) == NO && _attributes.maximumNumberOfLines > 0) {
-    ASDisplayNodeAssert(_attributes.maximumNumberOfLines != 1, @"Max line count 1 is not supported in fast-path.");
-    [stringDrawingContext setValue:@(_attributes.maximumNumberOfLines) forKey:@"maximumNumberOfLines"];
-  }
-  return stringDrawingContext;
-}
-
-#pragma mark - Sizing
-
-- (CGSize)size
-{
-  return _calculatedSize;
-}
-
-- (void)_calculateSize
-{
-  // if we have no scale factors or an unconstrained width, there is no reason to try to adjust the font size
-  if (isinf(_constrainedSize.width) == NO && [_attributes.pointSizeScaleFactors count] > 0) {
-    _currentScaleFactor = [[self fontSizeAdjuster] scaleFactor];
-  }
-
-  const CGRect constrainedRect = {CGPointZero, _constrainedSize};
-
-  // If we do not scale, do exclusion, or do custom truncation, we should just use NSAttributedString drawing for a fast-path.
-  if (self.canUseFastPath) {
-    CGRect rect = [_attributes.attributedString boundingRectWithSize:_constrainedSize options:NSStringDrawingUsesLineFragmentOrigin | NSStringDrawingTruncatesLastVisibleLine context:self.stringDrawingContext];
-    // Intersect with constrained rect, in case text kit goes out-of-bounds.
-    rect = CGRectIntersection(rect, constrainedRect);
-    _calculatedSize = [self.shadower outsetSizeWithInsetSize:rect.size];
-    return;
-  }
-
-  BOOL isScaled = [self isScaled];
-  __block NSTextStorage *scaledTextStorage = nil;
-  if (isScaled) {
-    // apply the string scale before truncating or else we may truncate the string after we've done the work to shrink it.
-    [[self context] performBlockWithLockedTextKitComponents:^(NSLayoutManager *layoutManager, NSTextStorage *textStorage, NSTextContainer *textContainer) {
-      NSMutableAttributedString *scaledString = [[NSMutableAttributedString alloc] initWithAttributedString:textStorage];
-      [ASTextKitFontSizeAdjuster adjustFontSizeForAttributeString:scaledString withScaleFactor:self->_currentScaleFactor];
-      scaledTextStorage = [[NSTextStorage alloc] initWithAttributedString:scaledString];
-      
-      [textStorage removeLayoutManager:layoutManager];
-      [scaledTextStorage addLayoutManager:layoutManager];
-    }];
-  }
-  
-  [[self truncater] truncate];
-  
-  __block CGRect boundingRect;
-
-  // Force glyph generation and layout, which may not have happened yet (and isn't triggered by
-  // -usedRectForTextContainer:).
-  [[self context] performBlockWithLockedTextKitComponents:^(NSLayoutManager *layoutManager, NSTextStorage *textStorage, NSTextContainer *textContainer) {
-    [layoutManager ensureLayoutForTextContainer:textContainer];
-    boundingRect = [layoutManager usedRectForTextContainer:textContainer];
-    if (isScaled) {
-      // put the non-scaled version back
-      [scaledTextStorage removeLayoutManager:layoutManager];
-      [textStorage addLayoutManager:layoutManager];
-    }
-  }];
-  
-  // TextKit often returns incorrect glyph bounding rects in the horizontal direction, so we clip to our bounding rect
-  // to make sure our width calculations aren't being offset by glyphs going beyond the constrained rect.
-  boundingRect = CGRectIntersection(boundingRect, constrainedRect);
-  _calculatedSize = [_shadower outsetSizeWithInsetSize:boundingRect.size];
-}
-
-- (BOOL)isScaled
-{
-  return (_currentScaleFactor > 0 && _currentScaleFactor < 1.0);
-}
-
-- (BOOL)usesCustomTruncation
-{
-  // NOTE: This code does not correctly handle if they set `…` with different attributes.
-  return _attributes.avoidTailTruncationSet != nil || [_attributes.truncationAttributedString.string isEqualToString:@"\u2026"] == NO;
-}
-
-- (BOOL)usesExclusionPaths
-{
-  return _attributes.exclusionPaths.count > 0;
-}
-
-- (BOOL)canUseFastPath
-{
-  return NO;
-//  Fast path is temporarily disabled, because it's crashing in production.
-//  NOTE: Remember to re-enable testFastPathTruncation when we re-enable this.
-//  return self.isScaled == NO
-//    && self.usesCustomTruncation == NO
-//    && self.usesExclusionPaths == NO
-//    // NSAttributedString drawing methods ignore usesLineFragmentOrigin if max line count 1,
-//    // rendering them useless:
-//    && (_attributes.maximumNumberOfLines != 1 || isinf(_constrainedSize.width));
-}
-
-#pragma mark - Drawing
-
-- (void)drawInContext:(CGContextRef)context bounds:(CGRect)bounds;
-{
-  // We add an assertion so we can track the rare conditions where a graphics context is not present
-  ASDisplayNodeAssertNotNil(context, @"This is no good without a context.");
-
-  bounds = CGRectIntersection(bounds, { .size = _constrainedSize });
-  CGRect shadowInsetBounds = [[self shadower] insetRectWithConstrainedRect:bounds];
-
-  CGContextSaveGState(context);
-  [[self shadower] setShadowInContext:context];
-  UIGraphicsPushContext(context);
-
-  LOG(@"%@, shadowInsetBounds = %@",self, NSStringFromCGRect(shadowInsetBounds));
-
-  // If we use default options, we can use NSAttributedString for a
-  // fast path.
-  if (self.canUseFastPath) {
-    CGRect drawingBounds = shadowInsetBounds;
-    [_attributes.attributedString drawWithRect:drawingBounds options:NSStringDrawingUsesLineFragmentOrigin | NSStringDrawingTruncatesLastVisibleLine context:self.stringDrawingContext];
-  } else {
-    BOOL isScaled = [self isScaled];
-    [[self context] performBlockWithLockedTextKitComponents:^(NSLayoutManager *layoutManager, NSTextStorage *textStorage, NSTextContainer *textContainer) {
-      
-      NSTextStorage *scaledTextStorage = nil;
-
-      if (isScaled) {
-        // if we are going to scale the text, swap out the non-scaled text for the scaled version.
-        NSMutableAttributedString *scaledString = [[NSMutableAttributedString alloc] initWithAttributedString:textStorage];
-        [ASTextKitFontSizeAdjuster adjustFontSizeForAttributeString:scaledString withScaleFactor:self->_currentScaleFactor];
-        scaledTextStorage = [[NSTextStorage alloc] initWithAttributedString:scaledString];
-        
-        [textStorage removeLayoutManager:layoutManager];
-        [scaledTextStorage addLayoutManager:layoutManager];
-      }
-      
-      LOG(@"usedRect: %@", NSStringFromCGRect([layoutManager usedRectForTextContainer:textContainer]));
-
-      NSRange glyphRange = [layoutManager glyphRangeForBoundingRect:(CGRect){ .size = textContainer.size } inTextContainer:textContainer];
-      LOG(@"boundingRect: %@", NSStringFromCGRect([layoutManager boundingRectForGlyphRange:glyphRange inTextContainer:textContainer]));
-      
-      [layoutManager drawBackgroundForGlyphRange:glyphRange atPoint:shadowInsetBounds.origin];
-      [layoutManager drawGlyphsForGlyphRange:glyphRange atPoint:shadowInsetBounds.origin];
-      
-      if (isScaled) {
-        // put the non-scaled version back
-        [scaledTextStorage removeLayoutManager:layoutManager];
-        [textStorage addLayoutManager:layoutManager];
-      }
-    }];
-  }
-
-  UIGraphicsPopContext();
-  CGContextRestoreGState(context);
-}
-
-#pragma mark - String Ranges
-
-- (NSUInteger)lineCount
-{
-  __block NSUInteger lineCount = 0;
-  [[self context] performBlockWithLockedTextKitComponents:^(NSLayoutManager *layoutManager, NSTextStorage *textStorage, NSTextContainer *textContainer) {
-    for (NSRange lineRange = { 0, 0 }; NSMaxRange(lineRange) < [layoutManager numberOfGlyphs]; lineCount++) {
-      [layoutManager lineFragmentRectForGlyphAtIndex:NSMaxRange(lineRange) effectiveRange:&lineRange];
-    }
-  }];
-  return lineCount;
-}
-
-- (BOOL)isTruncated
-{
-  if (self.canUseFastPath) {
-    CGRect boundedRect = [_attributes.attributedString boundingRectWithSize:CGSizeMake(_constrainedSize.width, CGFLOAT_MAX)
-                                                                    options:NSStringDrawingUsesLineFragmentOrigin | NSStringDrawingTruncatesLastVisibleLine
-                                                                    context:nil];
-    return boundedRect.size.height > _constrainedSize.height;
-  } else {
-    return self.firstVisibleRange.length < _attributes.attributedString.length;
-  }
-}
-
-- (std::vector<NSRange>)visibleRanges
-{
-  return _truncater.visibleRanges;
-}
-
-@end
-
-@implementation ASTextKitRenderer (ASTextKitRendererConvenience)
-
-- (NSRange)firstVisibleRange
-{
-  std::vector<NSRange> visibleRanges = self.visibleRanges;
-  if (visibleRanges.size() > 0) {
-    return visibleRanges[0];
-  }
-  
-  return NSMakeRange(0, 0);
-}
-
-@end
-
-#endif
diff --git a/submodules/AsyncDisplayKit/Source/TextKit/ASTextKitShadower.h b/submodules/AsyncDisplayKit/Source/TextKit/ASTextKitShadower.h
deleted file mode 100644
index 2f9c604fbc..0000000000
--- a/submodules/AsyncDisplayKit/Source/TextKit/ASTextKitShadower.h
+++ /dev/null
@@ -1,78 +0,0 @@
-//
-//  ASTextKitShadower.h
-//  Texture
-//
-//  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.
-//  Changes after 4/13/2017 are: Copyright (c) Pinterest, Inc.  All rights reserved.
-//  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
-//
-
-#import <UIKit/UIKit.h>
-
-#import <AsyncDisplayKit/ASAvailability.h>
-
-#if AS_ENABLE_TEXTNODE
-
-#import <AsyncDisplayKit/ASBaseDefines.h>
-
-/**
- * @abstract an immutable class for calculating shadow padding drawing a shadowed background for text
- */
-AS_SUBCLASSING_RESTRICTED
-@interface ASTextKitShadower : NSObject
-
-+ (ASTextKitShadower *)shadowerWithShadowOffset:(CGSize)shadowOffset
-                                    shadowColor:(UIColor *)shadowColor
-                                  shadowOpacity:(CGFloat)shadowOpacity
-                                   shadowRadius:(CGFloat)shadowRadius;
-
-/**
- * @abstract The offset from the top-left corner at which the shadow starts.
- * @discussion A positive width will move the shadow to the right.
- *             A positive height will move the shadow downwards.
- */
-@property (nonatomic, readonly) CGSize shadowOffset;
-
-//! CGColor in which the shadow is drawn
-@property (nonatomic, copy, readonly) UIColor *shadowColor;
-
-//! Alpha of the shadow
-@property (nonatomic, readonly) CGFloat shadowOpacity;
-
-//! Radius, in pixels
-@property (nonatomic, readonly) CGFloat shadowRadius;
-
-/**
- * @abstract The edge insets which represent shadow padding
- * @discussion Each edge inset is less than or equal to zero.
- *
- * Example:
- *  CGRect boundsWithoutShadowPadding; // Large enough to fit text, not large enough to fit the shadow as well
- *  UIEdgeInsets shadowPadding = [shadower shadowPadding];
- *  CGRect boundsWithShadowPadding = UIEdgeInsetsRect(boundsWithoutShadowPadding, shadowPadding);
- */
-- (UIEdgeInsets)shadowPadding;
-
-- (CGSize)insetSizeWithConstrainedSize:(CGSize)constrainedSize;
-
-- (CGRect)insetRectWithConstrainedRect:(CGRect)constrainedRect;
-
-- (CGSize)outsetSizeWithInsetSize:(CGSize)insetSize;
-
-- (CGRect)outsetRectWithInsetRect:(CGRect)insetRect;
-
-- (CGRect)offsetRectWithInternalRect:(CGRect)internalRect;
-
-- (CGPoint)offsetPointWithInternalPoint:(CGPoint)internalPoint;
-
-- (CGPoint)offsetPointWithExternalPoint:(CGPoint)externalPoint;
-
-/**
- * @abstract draws the shadow for text in the provided CGContext
- * @discussion Call within the text node's +drawRect method
- */
-- (void)setShadowInContext:(CGContextRef)context;
-
-@end
-
-#endif
diff --git a/submodules/AsyncDisplayKit/Source/TextKit/ASTextKitShadower.mm b/submodules/AsyncDisplayKit/Source/TextKit/ASTextKitShadower.mm
deleted file mode 100644
index a2f37f7e06..0000000000
--- a/submodules/AsyncDisplayKit/Source/TextKit/ASTextKitShadower.mm
+++ /dev/null
@@ -1,177 +0,0 @@
-//
-//  ASTextKitShadower.mm
-//  Texture
-//
-//  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.
-//  Changes after 4/13/2017 are: Copyright (c) Pinterest, Inc.  All rights reserved.
-//  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
-//
-
-#import <AsyncDisplayKit/ASTextKitShadower.h>
-
-#if AS_ENABLE_TEXTNODE
-
-#import <tgmath.h>
-
-static inline CGSize _insetSize(CGSize size, UIEdgeInsets insets)
-{
-  size.width -= (insets.left + insets.right);
-  size.height -= (insets.top + insets.bottom);
-  return size;
-}
-
-static inline UIEdgeInsets _invertInsets(UIEdgeInsets insets)
-{
-  return {
-    .top = -insets.top,
-    .left = -insets.left,
-    .bottom = -insets.bottom,
-    .right = -insets.right
-  };
-}
-
-@implementation ASTextKitShadower {
-  UIEdgeInsets _calculatedShadowPadding;
-}
-
-+ (ASTextKitShadower *)shadowerWithShadowOffset:(CGSize)shadowOffset
-                                    shadowColor:(UIColor *)shadowColor
-                                  shadowOpacity:(CGFloat)shadowOpacity
-                                   shadowRadius:(CGFloat)shadowRadius
-{
-  /**
-   * For all cases where no shadow is drawn, we share this singleton shadower to save resources.
-   */
-  static dispatch_once_t onceToken;
-  static ASTextKitShadower *sharedNonShadower;
-  dispatch_once(&onceToken, ^{
-    sharedNonShadower = [[ASTextKitShadower alloc] initWithShadowOffset:CGSizeZero shadowColor:nil shadowOpacity:0 shadowRadius:0];
-  });
-
-  BOOL hasShadow = shadowOpacity > 0 && (shadowRadius > 0 || CGSizeEqualToSize(shadowOffset, CGSizeZero) == NO) && CGColorGetAlpha(shadowColor.CGColor) > 0;
-  if (hasShadow == NO) {
-    return sharedNonShadower;
-  } else {
-    return [[ASTextKitShadower alloc] initWithShadowOffset:shadowOffset shadowColor:shadowColor shadowOpacity:shadowOpacity shadowRadius:shadowRadius];
-  }
-}
-
-- (instancetype)initWithShadowOffset:(CGSize)shadowOffset
-                         shadowColor:(UIColor *)shadowColor
-                       shadowOpacity:(CGFloat)shadowOpacity
-                        shadowRadius:(CGFloat)shadowRadius
-{
-  if (self = [super init]) {
-    _shadowOffset = shadowOffset;
-    _shadowColor = shadowColor;
-    _shadowOpacity = shadowOpacity;
-    _shadowRadius = shadowRadius;
-    _calculatedShadowPadding = UIEdgeInsetsMake(-INFINITY, -INFINITY, INFINITY, INFINITY);
-  }
-  return self;
-}
-
-/*
- * This method is duplicated here because it gets called frequently, and we were
- * wasting valuable time constructing a state object to ask it.
- */
-- (BOOL)_shouldDrawShadow
-{
-  return _shadowOpacity != 0.0 && (_shadowRadius != 0 || !CGSizeEqualToSize(_shadowOffset, CGSizeZero)) && CGColorGetAlpha(_shadowColor.CGColor) > 0;
-}
-
-- (void)setShadowInContext:(CGContextRef)context
-{
-  if ([self _shouldDrawShadow]) {
-    CGColorRef textShadowColor = CGColorRetain(_shadowColor.CGColor);
-    CGSize textShadowOffset = _shadowOffset;
-    CGFloat textShadowOpacity = _shadowOpacity;
-    CGFloat textShadowRadius = _shadowRadius;
-
-    if (textShadowOpacity != 1.0) {
-      CGFloat inherentAlpha = CGColorGetAlpha(textShadowColor);
-
-      CGColorRef oldTextShadowColor = textShadowColor;
-      textShadowColor = CGColorCreateCopyWithAlpha(textShadowColor, inherentAlpha * textShadowOpacity);
-      CGColorRelease(oldTextShadowColor);
-    }
-
-    CGContextSetShadowWithColor(context, textShadowOffset, textShadowRadius, textShadowColor);
-
-    CGColorRelease(textShadowColor);
-  }
-}
-
-
-- (UIEdgeInsets)shadowPadding
-{
-  if (_calculatedShadowPadding.top == -INFINITY) {
-    if (![self _shouldDrawShadow]) {
-      return UIEdgeInsetsZero;
-    }
-
-    UIEdgeInsets shadowPadding = UIEdgeInsetsZero;
-
-    // min values are expected to be negative for most typical shadowOffset and
-    // blurRadius settings:
-    shadowPadding.top = std::fmin(0.0f, _shadowOffset.height - _shadowRadius);
-    shadowPadding.left = std::fmin(0.0f, _shadowOffset.width - _shadowRadius);
-
-    shadowPadding.bottom = std::fmin(0.0f, -_shadowOffset.height - _shadowRadius);
-    shadowPadding.right = std::fmin(0.0f, -_shadowOffset.width - _shadowRadius);
-
-    _calculatedShadowPadding = shadowPadding;
-  }
-
-  return _calculatedShadowPadding;
-}
-
-- (CGSize)insetSizeWithConstrainedSize:(CGSize)constrainedSize
-{
-  return _insetSize(constrainedSize, _invertInsets([self shadowPadding]));
-}
-
-- (CGRect)insetRectWithConstrainedRect:(CGRect)constrainedRect
-{
-  return UIEdgeInsetsInsetRect(constrainedRect, _invertInsets([self shadowPadding]));
-}
-
-- (CGSize)outsetSizeWithInsetSize:(CGSize)insetSize
-{
-  return _insetSize(insetSize, [self shadowPadding]);
-}
-
-- (CGRect)outsetRectWithInsetRect:(CGRect)insetRect
-{
-  return UIEdgeInsetsInsetRect(insetRect, [self shadowPadding]);
-}
-
-- (CGRect)offsetRectWithInternalRect:(CGRect)internalRect
-{
-  return (CGRect){
-    .origin = [self offsetPointWithInternalPoint:internalRect.origin],
-    .size = internalRect.size
-  };
-}
-
-- (CGPoint)offsetPointWithInternalPoint:(CGPoint)internalPoint
-{
-  UIEdgeInsets shadowPadding = [self shadowPadding];
-  return (CGPoint){
-    internalPoint.x + shadowPadding.left,
-    internalPoint.y + shadowPadding.top
-  };
-}
-
-- (CGPoint)offsetPointWithExternalPoint:(CGPoint)externalPoint
-{
-  UIEdgeInsets shadowPadding = [self shadowPadding];
-  return (CGPoint){
-    externalPoint.x - shadowPadding.left,
-    externalPoint.y - shadowPadding.top
-  };
-}
-
-@end
-
-#endif
diff --git a/submodules/AsyncDisplayKit/Source/TextKit/ASTextKitTailTruncater.h b/submodules/AsyncDisplayKit/Source/TextKit/ASTextKitTailTruncater.h
deleted file mode 100644
index 70734d9e2c..0000000000
--- a/submodules/AsyncDisplayKit/Source/TextKit/ASTextKitTailTruncater.h
+++ /dev/null
@@ -1,21 +0,0 @@
-//
-//  ASTextKitTailTruncater.h
-//  Texture
-//
-//  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.
-//  Changes after 4/13/2017 are: Copyright (c) Pinterest, Inc.  All rights reserved.
-//  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
-//
-
-#import <UIKit/UIKit.h>
-
-#import <AsyncDisplayKit/ASTextKitTruncating.h>
-
-#if AS_ENABLE_TEXTNODE
-
-AS_SUBCLASSING_RESTRICTED
-@interface ASTextKitTailTruncater : NSObject <ASTextKitTruncating>
-
-@end
-
-#endif
diff --git a/submodules/AsyncDisplayKit/Source/TextKit/ASTextKitTailTruncater.mm b/submodules/AsyncDisplayKit/Source/TextKit/ASTextKitTailTruncater.mm
deleted file mode 100644
index b81e27be05..0000000000
--- a/submodules/AsyncDisplayKit/Source/TextKit/ASTextKitTailTruncater.mm
+++ /dev/null
@@ -1,196 +0,0 @@
-//
-//  ASTextKitTailTruncater.mm
-//  Texture
-//
-//  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.
-//  Changes after 4/13/2017 are: Copyright (c) Pinterest, Inc.  All rights reserved.
-//  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
-//
-
-#import <AsyncDisplayKit/ASTextKitTailTruncater.h>
-
-#if AS_ENABLE_TEXTNODE
-
-#import <AsyncDisplayKit/ASTextKitContext.h>
-
-@implementation ASTextKitTailTruncater
-{
-  __weak ASTextKitContext *_context;
-  NSAttributedString *_truncationAttributedString;
-  NSCharacterSet *_avoidTailTruncationSet;
-}
-@synthesize visibleRanges = _visibleRanges;
-
-- (instancetype)initWithContext:(ASTextKitContext *)context
-     truncationAttributedString:(NSAttributedString *)truncationAttributedString
-         avoidTailTruncationSet:(NSCharacterSet *)avoidTailTruncationSet
-{
-  if (self = [super init]) {
-    _context = context;
-    _truncationAttributedString = truncationAttributedString;
-    _avoidTailTruncationSet = avoidTailTruncationSet;
-  }
-  return self;
-}
-
-/**
- Calculates the intersection of the truncation message within the end of the last line.
- */
-- (NSUInteger)_calculateCharacterIndexBeforeTruncationMessage:(NSLayoutManager *)layoutManager
-                                                  textStorage:(NSTextStorage *)textStorage
-                                                textContainer:(NSTextContainer *)textContainer
-{
-  CGRect constrainedRect = (CGRect){ .size = textContainer.size };
-
-  NSRange visibleGlyphRange = [layoutManager glyphRangeForBoundingRect:constrainedRect
-                                                       inTextContainer:textContainer];
-  NSInteger lastVisibleGlyphIndex = (NSMaxRange(visibleGlyphRange) - 1);
-
-  if (lastVisibleGlyphIndex < 0) {
-    return NSNotFound;
-  }
-
-  CGRect lastLineRect = [layoutManager lineFragmentRectForGlyphAtIndex:lastVisibleGlyphIndex
-                                                        effectiveRange:NULL];
-  CGRect lastLineUsedRect = [layoutManager lineFragmentUsedRectForGlyphAtIndex:lastVisibleGlyphIndex
-                                                                effectiveRange:NULL];
-  NSParagraphStyle *paragraphStyle = [textStorage attributesAtIndex:[layoutManager characterIndexForGlyphAtIndex:lastVisibleGlyphIndex]
-                                                     effectiveRange:NULL][NSParagraphStyleAttributeName];
-  
-  // We assume LTR so long as the writing direction is not
-  BOOL rtlWritingDirection = paragraphStyle ? paragraphStyle.baseWritingDirection == NSWritingDirectionRightToLeft : NO;
-  // We only want to treat the truncation rect as left-aligned in the case that we are right-aligned and our writing
-  // direction is RTL.
-  BOOL leftAligned = CGRectGetMinX(lastLineRect) == CGRectGetMinX(lastLineUsedRect) || !rtlWritingDirection;
-
-  // Calculate the bounding rectangle for the truncation message
-  ASTextKitContext *truncationContext = [[ASTextKitContext alloc] initWithAttributedString:_truncationAttributedString
-                                                                             lineBreakMode:NSLineBreakByWordWrapping
-                                                                      maximumNumberOfLines:1
-                                                                            exclusionPaths:nil
-                                                                           constrainedSize:constrainedRect.size];
-  __block CGRect truncationUsedRect;
-
-  [truncationContext performBlockWithLockedTextKitComponents:^(NSLayoutManager *truncationLayoutManager, NSTextStorage *truncationTextStorage, NSTextContainer *truncationTextContainer) {
-    // Size the truncation message
-    [truncationLayoutManager ensureLayoutForTextContainer:truncationTextContainer];
-    NSRange truncationGlyphRange = [truncationLayoutManager glyphRangeForTextContainer:truncationTextContainer];
-    truncationUsedRect = [truncationLayoutManager boundingRectForGlyphRange:truncationGlyphRange
-                                                            inTextContainer:truncationTextContainer];
-  }];
-  CGFloat truncationOriginX = (leftAligned ?
-                               CGRectGetMaxX(constrainedRect) - truncationUsedRect.size.width :
-                               CGRectGetMinX(constrainedRect));
-  CGRect translatedTruncationRect = CGRectMake(truncationOriginX,
-                                               CGRectGetMinY(lastLineRect),
-                                               truncationUsedRect.size.width,
-                                               truncationUsedRect.size.height);
-
-  // Determine which glyph is the first to be clipped / overlaps the truncation message.
-  CGFloat truncationMessageX = (leftAligned ?
-                                CGRectGetMinX(translatedTruncationRect) :
-                                CGRectGetMaxX(translatedTruncationRect));
-  CGPoint beginningOfTruncationMessage = CGPointMake(truncationMessageX,
-                                                     CGRectGetMidY(translatedTruncationRect));
-  NSUInteger firstClippedGlyphIndex = [layoutManager glyphIndexForPoint:beginningOfTruncationMessage
-                                                        inTextContainer:textContainer
-                                         fractionOfDistanceThroughGlyph:NULL];
-  // If it didn't intersect with any text then it should just return the last visible character index, since the
-  // truncation rect can fully fit on the line without clipping any other text.
-  if (firstClippedGlyphIndex == NSNotFound) {
-    return [layoutManager characterIndexForGlyphAtIndex:lastVisibleGlyphIndex];
-  }
-  NSUInteger firstCharacterIndexToReplace = [layoutManager characterIndexForGlyphAtIndex:firstClippedGlyphIndex];
-
-  // Break on word boundaries
-  return [self _findTruncationInsertionPointAtOrBeforeCharacterIndex:firstCharacterIndexToReplace
-                                                       layoutManager:layoutManager
-                                                         textStorage:textStorage];
-}
-
-/**
- Finds the first whitespace at or before the character index do we don't truncate in the middle of words
- If there are multiple whitespaces together (say a space and a newline), this will backtrack to the first one
- */
-- (NSUInteger)_findTruncationInsertionPointAtOrBeforeCharacterIndex:(NSUInteger)firstCharacterIndexToReplace
-                                                      layoutManager:(NSLayoutManager *)layoutManager
-                                                        textStorage:(NSTextStorage *)textStorage
-{
-  // Don't attempt to truncate beyond the end of the string
-  if (firstCharacterIndexToReplace >= textStorage.length) {
-    return 0;
-  }
-
-  // Find the glyph range of the line fragment containing the first character to replace.
-  NSRange lineGlyphRange;
-  [layoutManager lineFragmentRectForGlyphAtIndex:[layoutManager glyphIndexForCharacterAtIndex:firstCharacterIndexToReplace]
-                                  effectiveRange:&lineGlyphRange];
-
-  // Look for the first whitespace from the end of the line, starting from the truncation point
-  NSUInteger startingSearchIndex = [layoutManager characterIndexForGlyphAtIndex:lineGlyphRange.location];
-  NSUInteger endingSearchIndex = firstCharacterIndexToReplace;
-  NSRange rangeToSearch = NSMakeRange(startingSearchIndex, (endingSearchIndex - startingSearchIndex));
-
-  NSRange rangeOfLastVisibleAvoidedChars = { .location = NSNotFound };
-  if (_avoidTailTruncationSet) {
-    rangeOfLastVisibleAvoidedChars = [textStorage.string rangeOfCharacterFromSet:_avoidTailTruncationSet
-                                                                         options:NSBackwardsSearch
-                                                                           range:rangeToSearch];
-  }
-
-  // Couldn't find a good place to truncate. Might be because there is no whitespace in the text, or we're dealing
-  // with a foreign language encoding. Settle for truncating at the original place, which may be mid-word.
-  if (rangeOfLastVisibleAvoidedChars.location == NSNotFound) {
-    return firstCharacterIndexToReplace;
-  } else {
-    return rangeOfLastVisibleAvoidedChars.location;
-  }
-}
-
-- (void)truncate
-{
-  [_context performBlockWithLockedTextKitComponents:^(NSLayoutManager *layoutManager, NSTextStorage *textStorage, NSTextContainer *textContainer) {
-    NSUInteger originalStringLength = textStorage.length;
-
-    [layoutManager ensureLayoutForTextContainer:textContainer];
-
-    NSRange visibleGlyphRange = [layoutManager glyphRangeForBoundingRect:{ .size = textContainer.size }
-                                                         inTextContainer:textContainer];
-    NSRange visibleCharacterRange = [layoutManager characterRangeForGlyphRange:visibleGlyphRange
-                                                              actualGlyphRange:NULL];
-
-    // Check if text is truncated, and if so apply our truncation string
-    if (visibleCharacterRange.length < originalStringLength && self->_truncationAttributedString.length > 0) {
-      NSInteger firstCharacterIndexToReplace = [self _calculateCharacterIndexBeforeTruncationMessage:layoutManager
-                                                                                         textStorage:textStorage
-                                                                                       textContainer:textContainer];
-      if (firstCharacterIndexToReplace == 0 || firstCharacterIndexToReplace == NSNotFound) {
-        return;
-      }
-
-      // Update/truncate the visible range of text
-      visibleCharacterRange = NSMakeRange(0, firstCharacterIndexToReplace);
-      NSRange truncationReplacementRange = NSMakeRange(firstCharacterIndexToReplace,
-                                                       textStorage.length - firstCharacterIndexToReplace);
-      // Replace the end of the visible message with the truncation string
-      [textStorage replaceCharactersInRange:truncationReplacementRange
-                       withAttributedString:self->_truncationAttributedString];
-    }
-
-    self->_visibleRanges = { visibleCharacterRange };
-  }];
-}
-
-- (NSRange)firstVisibleRange
-{
-  std::vector<NSRange> visibleRanges = _visibleRanges;
-  if (visibleRanges.size() > 0) {
-    return visibleRanges[0];
-  }
-
-  return NSMakeRange(NSNotFound, 0);
-}
-
-@end
-
-#endif
diff --git a/submodules/AsyncDisplayKit/Source/TextKit/ASTextKitTruncating.h b/submodules/AsyncDisplayKit/Source/TextKit/ASTextKitTruncating.h
deleted file mode 100644
index 35392fd6b3..0000000000
--- a/submodules/AsyncDisplayKit/Source/TextKit/ASTextKitTruncating.h
+++ /dev/null
@@ -1,61 +0,0 @@
-//
-//  ASTextKitTruncating.h
-//  Texture
-//
-//  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.
-//  Changes after 4/13/2017 are: Copyright (c) Pinterest, Inc.  All rights reserved.
-//  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
-//
-
-#import <Foundation/Foundation.h>
-
-#import <AsyncDisplayKit/ASAvailability.h>
-
-#if AS_ENABLE_TEXTNODE
-
-#import <AsyncDisplayKit/ASBaseDefines.h>
-
-#import <vector>
-
-NS_ASSUME_NONNULL_BEGIN
-
-@class ASTextKitContext;
-
-@protocol ASTextKitTruncating <NSObject>
-
-/**
- The character range from the original attributedString that is displayed by the renderer given the parameters in the
- initializer.
- */
-@property (nonatomic, readonly) std::vector<NSRange> visibleRanges;
-
-/**
- Returns the first visible range or an NSRange with location of NSNotFound and size of 0 if no first visible
- range exists
- */
-@property (nonatomic, readonly) NSRange firstVisibleRange;
-
-/**
- A truncater object is initialized with the full state of the text.  It is a Single Responsibility Object that is
- mutative.  It configures the state of the TextKit components (layout manager, text container, text storage) to achieve
- the intended truncation, then it stores the resulting state for later fetching.
-
- The truncater may mutate the state of the text storage such that only the drawn string is actually present in the
- text storage itself.
-
- The truncater should not store a strong reference to the context to prevent retain cycles.
- */
-- (instancetype)initWithContext:(ASTextKitContext *)context
-     truncationAttributedString:(NSAttributedString * _Nullable)truncationAttributedString
-         avoidTailTruncationSet:(NSCharacterSet * _Nullable)avoidTailTruncationSet;
-
-/**
- Actually do the truncation.
- */
-- (void)truncate;
-
-@end
-
-NS_ASSUME_NONNULL_END
-
-#endif
diff --git a/submodules/AsyncDisplayKit/Source/UIImage+ASConvenience.h b/submodules/AsyncDisplayKit/Source/UIImage+ASConvenience.h
deleted file mode 100644
index b24c97d1c5..0000000000
--- a/submodules/AsyncDisplayKit/Source/UIImage+ASConvenience.h
+++ /dev/null
@@ -1,109 +0,0 @@
-//
-//  UIImage+ASConvenience.h
-//  Texture
-//
-//  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.
-//  Changes after 4/13/2017 are: Copyright (c) Pinterest, Inc.  All rights reserved.
-//  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
-//
-
-#import <UIKit/UIKit.h>
-#import <AsyncDisplayKit/ASBaseDefines.h>
-
-NS_ASSUME_NONNULL_BEGIN
-
-/**
- * Dramatically faster version of +[UIImage imageNamed:]. Although it is believed that imageNamed:
- * has a cache and is fast, it actually performs expensive asset catalog lookups and is often a
- * performance bottleneck (verified on iOS 7 through iOS 10).
- *
- * Use [UIImage as_imageNamed:] anywhere in your app, even if you aren't using other parts of ASDK.
- * Although not the best choice for extremely large assets that are only used once, it is the ideal
- * choice for any assets used in tab bars, nav bars, buttons, table or collection cells, etc.
- */
-
-@interface UIImage (ASDKFastImageNamed)
-
-/**
- *  A version of imageNamed that caches results because loading an image is expensive.
- *  Calling with the same name value will usually return the same object.  A UIImage,
- *  after creation, is immutable and thread-safe so it's fine to share these objects across multiple threads.
- *
- *  @param imageName The name of the image to load
- *  @return The loaded image or nil
- */
-+ (nullable UIImage *)as_imageNamed:(NSString *)imageName NS_RETURNS_RETAINED;
-
-/**
- *  A version of imageNamed that caches results because loading an image is expensive.
- *  Calling with the same name value will usually return the same object.  A UIImage,
- *  after creation, is immutable and thread-safe so it's fine to share these objects across multiple threads.
- *
- *  @param imageName The name of the image to load
- *  @param traitCollection The traits associated with the intended environment for the image.
- *  @return The loaded image or nil
- */
-+ (nullable UIImage *)as_imageNamed:(NSString *)imageName compatibleWithTraitCollection:(nullable UITraitCollection *)traitCollection NS_RETURNS_RETAINED;
-
-@end
-
-/**
- * High-performance flat-colored, rounded-corner resizable images
- *
- * For "Baked-in Opaque" corners, set cornerColor equal to the color behind the rounded image object,
- * i.e. the background color.
- * For "Baked-in Alpha" corners, set cornerColor = [UIColor clearColor]
- *
- * See http://asyncdisplaykit.org/docs/corner-rounding.html for an explanation.
- */
-
-@interface UIImage (ASDKResizableRoundedRects)
-
-/**
- * This generates a flat-color, rounded-corner resizeable image
- *
- * @param cornerRadius The radius of the rounded-corner
- * @param cornerColor  The fill color of the corners (For Alpha corners use clearColor)
- * @param fillColor    The fill color of the rounded-corner image
- */
-+ (UIImage *)as_resizableRoundedImageWithCornerRadius:(CGFloat)cornerRadius
-                                          cornerColor:(nullable UIColor *)cornerColor
-                                            fillColor:(UIColor *)fillColor NS_RETURNS_RETAINED AS_WARN_UNUSED_RESULT;
-
-/**
- * This generates a flat-color, rounded-corner resizeable image with a border
- *
- * @param cornerRadius The radius of the rounded-corner
- * @param cornerColor  The fill color of the corners (For Alpha corners use clearColor)
- * @param fillColor    The fill color of the rounded-corner image
- * @param borderColor  The border color. Set to nil for no border.
- * @param borderWidth  The border width. Dummy value if borderColor = nil.
- */
-+ (UIImage *)as_resizableRoundedImageWithCornerRadius:(CGFloat)cornerRadius
-                                          cornerColor:(UIColor *)cornerColor
-                                            fillColor:(UIColor *)fillColor
-                                          borderColor:(nullable UIColor *)borderColor
-                                          borderWidth:(CGFloat)borderWidth NS_RETURNS_RETAINED AS_WARN_UNUSED_RESULT;
-
-/**
- * This generates a flat-color, rounded-corner resizeable image with a border
- *
- * @param cornerRadius    The radius of the rounded-corner
- * @param cornerColor     The fill color of the corners (For Alpha corners use clearColor)
- * @param fillColor       The fill color of the rounded-corner image
- * @param borderColor     The border color. Set to nil for no border.
- * @param borderWidth     The border width. Dummy value if borderColor = nil.
- * @param roundedCorners  Select individual or multiple corners to round. Set to UIRectCornerAllCorners to round all 4 corners.
- * @param scale           The number of pixels per point. Provide 0.0 to use the screen scale.
- */
-+ (UIImage *)as_resizableRoundedImageWithCornerRadius:(CGFloat)cornerRadius
-                                          cornerColor:(nullable UIColor *)cornerColor
-                                            fillColor:(UIColor *)fillColor
-                                          borderColor:(nullable UIColor *)borderColor
-                                          borderWidth:(CGFloat)borderWidth
-                                       roundedCorners:(UIRectCorner)roundedCorners
-                                                scale:(CGFloat)scale NS_RETURNS_RETAINED AS_WARN_UNUSED_RESULT;
-
-@end
-
-NS_ASSUME_NONNULL_END
diff --git a/submodules/AsyncDisplayKit/Source/UIImage+ASConvenience.mm b/submodules/AsyncDisplayKit/Source/UIImage+ASConvenience.mm
deleted file mode 100644
index 936514cf14..0000000000
--- a/submodules/AsyncDisplayKit/Source/UIImage+ASConvenience.mm
+++ /dev/null
@@ -1,172 +0,0 @@
-//
-//  UIImage+ASConvenience.mm
-//  Texture
-//
-//  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.
-//  Changes after 4/13/2017 are: Copyright (c) Pinterest, Inc.  All rights reserved.
-//  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
-//
-
-#import <AsyncDisplayKit/UIImage+ASConvenience.h>
-#import <AsyncDisplayKit/ASGraphicsContext.h>
-#import <AsyncDisplayKit/ASInternalHelpers.h>
-#import <AsyncDisplayKit/ASAssert.h>
-
-#pragma mark - ASDKFastImageNamed
-
-@implementation UIImage (ASDKFastImageNamed)
-
-UIImage *cachedImageNamed(NSString *imageName, UITraitCollection *traitCollection) NS_RETURNS_RETAINED
-{
-  static NSCache *imageCache = nil;
-  static dispatch_once_t onceToken;
-  dispatch_once(&onceToken, ^{
-    // Because NSCache responds to memory warnings, we do not need an explicit limit.
-    // all of these objects contain compressed image data and are relatively small
-    // compared to the backing stores of text and image views.
-    imageCache = [[NSCache alloc] init];
-  });
-
-  UIImage *image = nil;
-  if ([imageName length] > 0) {
-    NSString *imageKey = imageName;
-    if (traitCollection) {
-      char imageKeyBuffer[256];
-      snprintf(imageKeyBuffer, sizeof(imageKeyBuffer), "%s|%ld|%ld", imageName.UTF8String, (long)traitCollection.horizontalSizeClass, (long)traitCollection.verticalSizeClass);
-      imageKey = [NSString stringWithUTF8String:imageKeyBuffer];
-    }
-
-    image = [imageCache objectForKey:imageKey];
-    if (!image) {
-      image =  [UIImage imageNamed:imageName inBundle:nil compatibleWithTraitCollection:traitCollection];
-      if (image) {
-        [imageCache setObject:image forKey:imageKey];
-      }
-    }
-  }
-  return image;
-}
-
-+ (UIImage *)as_imageNamed:(NSString *)imageName NS_RETURNS_RETAINED
-{
-  return cachedImageNamed(imageName, nil);
-}
-
-+ (UIImage *)as_imageNamed:(NSString *)imageName compatibleWithTraitCollection:(UITraitCollection *)traitCollection NS_RETURNS_RETAINED
-{
-  return cachedImageNamed(imageName, traitCollection);
-}
-
-@end
-
-#pragma mark - ASDKResizableRoundedRects
-
-@implementation UIImage (ASDKResizableRoundedRects)
-
-+ (UIImage *)as_resizableRoundedImageWithCornerRadius:(CGFloat)cornerRadius
-                                          cornerColor:(UIColor *)cornerColor
-                                            fillColor:(UIColor *)fillColor NS_RETURNS_RETAINED
-{
-  return [self as_resizableRoundedImageWithCornerRadius:cornerRadius
-                                            cornerColor:cornerColor
-                                              fillColor:fillColor
-                                            borderColor:nil
-                                            borderWidth:1.0
-                                         roundedCorners:UIRectCornerAllCorners
-                                                  scale:0.0];
-}
-
-+ (UIImage *)as_resizableRoundedImageWithCornerRadius:(CGFloat)cornerRadius
-                                          cornerColor:(UIColor *)cornerColor
-                                            fillColor:(UIColor *)fillColor
-                                          borderColor:(UIColor *)borderColor
-                                          borderWidth:(CGFloat)borderWidth NS_RETURNS_RETAINED
-{
-  return [self as_resizableRoundedImageWithCornerRadius:cornerRadius
-                                            cornerColor:cornerColor
-                                              fillColor:fillColor
-                                            borderColor:borderColor
-                                            borderWidth:borderWidth
-                                         roundedCorners:UIRectCornerAllCorners
-                                                  scale:0.0];
-}
-
-+ (UIImage *)as_resizableRoundedImageWithCornerRadius:(CGFloat)cornerRadius
-                                          cornerColor:(UIColor *)cornerColor
-                                            fillColor:(UIColor *)fillColor
-                                          borderColor:(UIColor *)borderColor
-                                          borderWidth:(CGFloat)borderWidth
-                                       roundedCorners:(UIRectCorner)roundedCorners
-                                                scale:(CGFloat)scale NS_RETURNS_RETAINED
-{
-  static NSCache *__pathCache = nil;
-  static dispatch_once_t onceToken;
-  dispatch_once(&onceToken, ^{
-    __pathCache = [[NSCache alloc] init];
-    // UIBezierPath objects are fairly small and these are equally sized. 20 should be plenty for many different parameters.
-    __pathCache.countLimit = 20;
-  });
-  
-  // Treat clear background color as no background color
-  if ([cornerColor isEqual:[UIColor clearColor]]) {
-    cornerColor = nil;
-  }
-  
-  CGFloat dimension = (cornerRadius * 2) + 1;
-  CGRect bounds = CGRectMake(0, 0, dimension, dimension);
-  
-  typedef struct {
-    UIRectCorner corners;
-    CGFloat radius;
-  } PathKey;
-  PathKey key = { roundedCorners, cornerRadius };
-  NSValue *pathKeyObject = [[NSValue alloc] initWithBytes:&key objCType:@encode(PathKey)];
-
-  CGSize cornerRadii = CGSizeMake(cornerRadius, cornerRadius);
-  UIBezierPath *path = [__pathCache objectForKey:pathKeyObject];
-  if (path == nil) {
-    path = [UIBezierPath bezierPathWithRoundedRect:bounds byRoundingCorners:roundedCorners cornerRadii:cornerRadii];
-    [__pathCache setObject:path forKey:pathKeyObject];
-  }
-  
-  // We should probably check if the background color has any alpha component but that
-  // might be expensive due to needing to check mulitple color spaces.
-  ASGraphicsBeginImageContextWithOptions(bounds.size, cornerColor != nil, scale);
-  
-  BOOL contextIsClean = YES;
-  if (cornerColor) {
-    contextIsClean = NO;
-    [cornerColor setFill];
-    // Copy "blend" mode is extra fast because it disregards any value currently in the buffer and overrides directly.
-    UIRectFillUsingBlendMode(bounds, kCGBlendModeCopy);
-  }
-  
-  BOOL canUseCopy = contextIsClean || (CGColorGetAlpha(fillColor.CGColor) == 1);
-  [fillColor setFill];
-  [path fillWithBlendMode:(canUseCopy ? kCGBlendModeCopy : kCGBlendModeNormal) alpha:1];
-  
-  if (borderColor) {
-    [borderColor setStroke];
-    
-    // Inset border fully inside filled path (not halfway on each side of path)
-    CGRect strokeRect = CGRectInset(bounds, borderWidth / 2.0, borderWidth / 2.0);
-    
-    // It is rarer to have a stroke path, and our cache key only handles rounded rects for the exact-stretchable
-    // size calculated by cornerRadius, so we won't bother caching this path.  Profiling validates this decision.
-    UIBezierPath *strokePath = [UIBezierPath bezierPathWithRoundedRect:strokeRect
-                                                     byRoundingCorners:roundedCorners
-                                                           cornerRadii:cornerRadii];
-    [strokePath setLineWidth:borderWidth];
-    BOOL canUseCopy = (CGColorGetAlpha(borderColor.CGColor) == 1);
-    [strokePath strokeWithBlendMode:(canUseCopy ? kCGBlendModeCopy : kCGBlendModeNormal) alpha:1];
-  }
-  
-  UIImage *result = ASGraphicsGetImageAndEndCurrentContext();
-  
-  UIEdgeInsets capInsets = UIEdgeInsetsMake(cornerRadius, cornerRadius, cornerRadius, cornerRadius);
-  result = [result resizableImageWithCapInsets:capInsets resizingMode:UIImageResizingModeStretch];
-  
-  return result;
-}
-
-@end
diff --git a/submodules/AsyncDisplayKit/Source/UIResponder+AsyncDisplayKit.mm b/submodules/AsyncDisplayKit/Source/UIResponder+AsyncDisplayKit.mm
index 8c3ec24de3..9365fba5e0 100644
--- a/submodules/AsyncDisplayKit/Source/UIResponder+AsyncDisplayKit.mm
+++ b/submodules/AsyncDisplayKit/Source/UIResponder+AsyncDisplayKit.mm
@@ -7,11 +7,11 @@
 //  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
 //
 
-#import "UIResponder+AsyncDisplayKit.h"
+#import <AsyncDisplayKit/UIResponder+AsyncDisplayKit.h>
 
 #import <AsyncDisplayKit/ASAssert.h>
 #import <AsyncDisplayKit/ASBaseDefines.h>
-#import <AsyncDisplayKit/ASResponderChainEnumerator.h>
+#import "ASResponderChainEnumerator.h"
 
 @implementation UIResponder (AsyncDisplayKit)
 
diff --git a/submodules/AsyncDisplayKit/Source/Details/Transactions/_ASAsyncTransaction.mm b/submodules/AsyncDisplayKit/Source/_ASAsyncTransaction.mm
similarity index 100%
rename from submodules/AsyncDisplayKit/Source/Details/Transactions/_ASAsyncTransaction.mm
rename to submodules/AsyncDisplayKit/Source/_ASAsyncTransaction.mm
diff --git a/submodules/AsyncDisplayKit/Source/Details/Transactions/_ASAsyncTransactionContainer+Private.h b/submodules/AsyncDisplayKit/Source/_ASAsyncTransactionContainer+Private.h
similarity index 100%
rename from submodules/AsyncDisplayKit/Source/Details/Transactions/_ASAsyncTransactionContainer+Private.h
rename to submodules/AsyncDisplayKit/Source/_ASAsyncTransactionContainer+Private.h
diff --git a/submodules/AsyncDisplayKit/Source/Details/Transactions/_ASAsyncTransactionContainer.mm b/submodules/AsyncDisplayKit/Source/_ASAsyncTransactionContainer.mm
similarity index 98%
rename from submodules/AsyncDisplayKit/Source/Details/Transactions/_ASAsyncTransactionContainer.mm
rename to submodules/AsyncDisplayKit/Source/_ASAsyncTransactionContainer.mm
index ed44231ce2..5bbfd95f15 100644
--- a/submodules/AsyncDisplayKit/Source/Details/Transactions/_ASAsyncTransactionContainer.mm
+++ b/submodules/AsyncDisplayKit/Source/_ASAsyncTransactionContainer.mm
@@ -8,7 +8,7 @@
 //
 
 #import <AsyncDisplayKit/_ASAsyncTransactionContainer.h>
-#import <AsyncDisplayKit/_ASAsyncTransactionContainer+Private.h>
+#import "_ASAsyncTransactionContainer+Private.h"
 
 #import <AsyncDisplayKit/_ASAsyncTransaction.h>
 #import <AsyncDisplayKit/_ASAsyncTransactionGroup.h>
diff --git a/submodules/AsyncDisplayKit/Source/Details/Transactions/_ASAsyncTransactionGroup.mm b/submodules/AsyncDisplayKit/Source/_ASAsyncTransactionGroup.mm
similarity index 98%
rename from submodules/AsyncDisplayKit/Source/Details/Transactions/_ASAsyncTransactionGroup.mm
rename to submodules/AsyncDisplayKit/Source/_ASAsyncTransactionGroup.mm
index ae651d1870..ca170229b8 100644
--- a/submodules/AsyncDisplayKit/Source/Details/Transactions/_ASAsyncTransactionGroup.mm
+++ b/submodules/AsyncDisplayKit/Source/_ASAsyncTransactionGroup.mm
@@ -12,7 +12,7 @@
 #import <AsyncDisplayKit/_ASAsyncTransaction.h>
 #import <AsyncDisplayKit/_ASAsyncTransactionGroup.h>
 #import <AsyncDisplayKit/_ASAsyncTransactionContainer.h>
-#import <AsyncDisplayKit/_ASAsyncTransactionContainer+Private.h>
+#import "_ASAsyncTransactionContainer+Private.h"
 
 @implementation _ASAsyncTransactionGroup {
   NSHashTable<id<ASAsyncTransactionContainer>> *_containers;
diff --git a/submodules/AsyncDisplayKit/Source/Private/_ASCoreAnimationExtras.mm b/submodules/AsyncDisplayKit/Source/_ASCoreAnimationExtras.mm
similarity index 100%
rename from submodules/AsyncDisplayKit/Source/Private/_ASCoreAnimationExtras.mm
rename to submodules/AsyncDisplayKit/Source/_ASCoreAnimationExtras.mm
diff --git a/submodules/AsyncDisplayKit/Source/Details/_ASDisplayLayer.mm b/submodules/AsyncDisplayKit/Source/_ASDisplayLayer.mm
similarity index 97%
rename from submodules/AsyncDisplayKit/Source/Details/_ASDisplayLayer.mm
rename to submodules/AsyncDisplayKit/Source/_ASDisplayLayer.mm
index a7478f1883..9ad2ca289b 100644
--- a/submodules/AsyncDisplayKit/Source/Details/_ASDisplayLayer.mm
+++ b/submodules/AsyncDisplayKit/Source/_ASDisplayLayer.mm
@@ -14,10 +14,9 @@
 #import <AsyncDisplayKit/_ASAsyncTransactionContainer.h>
 #import <AsyncDisplayKit/ASAssert.h>
 #import <AsyncDisplayKit/ASDisplayNode.h>
-#import <AsyncDisplayKit/ASDisplayNodeInternal.h>
+#import "ASDisplayNodeInternal.h"
 #import <AsyncDisplayKit/ASDisplayNode+FrameworkPrivate.h>
 #import <AsyncDisplayKit/ASObjectDescriptionHelpers.h>
-#import <AsyncDisplayKit/ASLog.h>
 
 @implementation _ASDisplayLayer
 {
@@ -94,7 +93,6 @@
 - (void)setNeedsLayout
 {
   ASDisplayNodeAssertMainThread();
-  as_log_verbose(ASNodeLog(), "%s on %@", sel_getName(_cmd), self);
   [super setNeedsLayout];
 }
 #endif
diff --git a/submodules/AsyncDisplayKit/Source/Details/_ASDisplayView.mm b/submodules/AsyncDisplayKit/Source/_ASDisplayView.mm
similarity index 99%
rename from submodules/AsyncDisplayKit/Source/Details/_ASDisplayView.mm
rename to submodules/AsyncDisplayKit/Source/_ASDisplayView.mm
index 5225fb9958..365b141bbf 100644
--- a/submodules/AsyncDisplayKit/Source/Details/_ASDisplayView.mm
+++ b/submodules/AsyncDisplayKit/Source/_ASDisplayView.mm
@@ -8,18 +8,17 @@
 //
 
 #import <AsyncDisplayKit/_ASDisplayView.h>
-#import <AsyncDisplayKit/_ASDisplayViewAccessiblity.h>
+#import "_ASDisplayViewAccessiblity.h"
 
 #import <AsyncDisplayKit/_ASCoreAnimationExtras.h>
 #import <AsyncDisplayKit/_ASDisplayLayer.h>
-#import <AsyncDisplayKit/ASDisplayNodeInternal.h>
+#import "ASDisplayNodeInternal.h"
 #import <AsyncDisplayKit/ASDisplayNode+Convenience.h>
 #import <AsyncDisplayKit/ASDisplayNode+FrameworkPrivate.h>
 #import <AsyncDisplayKit/ASDisplayNode+Subclasses.h>
 #import <AsyncDisplayKit/ASInternalHelpers.h>
 #import <AsyncDisplayKit/ASLayout.h>
 #import <AsyncDisplayKit/ASObjectDescriptionHelpers.h>
-#import <AsyncDisplayKit/ASViewController.h>
 
 #pragma mark - _ASDisplayViewMethodOverrides
 
diff --git a/submodules/AsyncDisplayKit/Source/Details/_ASDisplayViewAccessiblity.h b/submodules/AsyncDisplayKit/Source/_ASDisplayViewAccessiblity.h
similarity index 100%
rename from submodules/AsyncDisplayKit/Source/Details/_ASDisplayViewAccessiblity.h
rename to submodules/AsyncDisplayKit/Source/_ASDisplayViewAccessiblity.h
diff --git a/submodules/AsyncDisplayKit/Source/Details/_ASDisplayViewAccessiblity.mm b/submodules/AsyncDisplayKit/Source/_ASDisplayViewAccessiblity.mm
similarity index 98%
rename from submodules/AsyncDisplayKit/Source/Details/_ASDisplayViewAccessiblity.mm
rename to submodules/AsyncDisplayKit/Source/_ASDisplayViewAccessiblity.mm
index 9e91056aaf..b24e8e9f58 100644
--- a/submodules/AsyncDisplayKit/Source/Details/_ASDisplayViewAccessiblity.mm
+++ b/submodules/AsyncDisplayKit/Source/_ASDisplayViewAccessiblity.mm
@@ -11,11 +11,9 @@
 
 #import <AsyncDisplayKit/_ASDisplayView.h>
 #import <AsyncDisplayKit/ASAvailability.h>
-#import <AsyncDisplayKit/ASCollectionNode.h>
 #import <AsyncDisplayKit/ASDisplayNodeExtras.h>
 #import <AsyncDisplayKit/ASDisplayNode+FrameworkPrivate.h>
-#import <AsyncDisplayKit/ASDisplayNodeInternal.h>
-#import <AsyncDisplayKit/ASTableNode.h>
+#import "ASDisplayNodeInternal.h"
 
 #import <queue>
 
diff --git a/submodules/AsyncDisplayKit/Source/Private/_ASPendingState.h b/submodules/AsyncDisplayKit/Source/_ASPendingState.h
similarity index 100%
rename from submodules/AsyncDisplayKit/Source/Private/_ASPendingState.h
rename to submodules/AsyncDisplayKit/Source/_ASPendingState.h
diff --git a/submodules/AsyncDisplayKit/Source/Private/_ASPendingState.mm b/submodules/AsyncDisplayKit/Source/_ASPendingState.mm
similarity index 99%
rename from submodules/AsyncDisplayKit/Source/Private/_ASPendingState.mm
rename to submodules/AsyncDisplayKit/Source/_ASPendingState.mm
index 9e9778cf04..5bf75e50d1 100644
--- a/submodules/AsyncDisplayKit/Source/Private/_ASPendingState.mm
+++ b/submodules/AsyncDisplayKit/Source/_ASPendingState.mm
@@ -7,13 +7,13 @@
 //  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
 //
 
-#import <AsyncDisplayKit/_ASPendingState.h>
+#import "_ASPendingState.h"
 
 #import <AsyncDisplayKit/_ASCoreAnimationExtras.h>
 #import <AsyncDisplayKit/_ASAsyncTransactionContainer.h>
 #import <AsyncDisplayKit/ASAssert.h>
 #import <AsyncDisplayKit/ASEqualityHelpers.h>
-#import <AsyncDisplayKit/ASDisplayNodeInternal.h>
+#import "ASDisplayNodeInternal.h"
 #import <AsyncDisplayKit/ASInternalHelpers.h>
 
 #define __shouldSetNeedsDisplay(layer) (flags.needsDisplay \
diff --git a/submodules/AsyncDisplayKit/Source/Private/_ASScopeTimer.h b/submodules/AsyncDisplayKit/Source/_ASScopeTimer.h
similarity index 100%
rename from submodules/AsyncDisplayKit/Source/Private/_ASScopeTimer.h
rename to submodules/AsyncDisplayKit/Source/_ASScopeTimer.h
diff --git a/submodules/AsyncDisplayKit/Source/asdkmodule.modulemap b/submodules/AsyncDisplayKit/Source/asdkmodule.modulemap
deleted file mode 100644
index fd7d49e620..0000000000
--- a/submodules/AsyncDisplayKit/Source/asdkmodule.modulemap
+++ /dev/null
@@ -1,19 +0,0 @@
-framework module AsyncDisplayKit {
-  umbrella header "AsyncDisplayKit.h"
-  
-  export *
-  module * {
-    export *
-  }
-  
-  explicit module ASControlNode_Subclasses {
-    header "ASControlNode+Subclasses.h"
-    export *
-  }
-  
-  explicit module ASDisplayNode_Subclasses {
-    header "ASDisplayNode+Subclasses.h"
-    export *
-  }
-  
-}
diff --git a/submodules/AsyncDisplayKit/Source/tvOS/ASControlNode+tvOS.mm b/submodules/AsyncDisplayKit/Source/tvOS/ASControlNode+tvOS.mm
deleted file mode 100644
index a823d9625c..0000000000
--- a/submodules/AsyncDisplayKit/Source/tvOS/ASControlNode+tvOS.mm
+++ /dev/null
@@ -1,92 +0,0 @@
-//
-//  ASControlNode+tvOS.mm
-//  Texture
-//
-//  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.
-//  Changes after 4/13/2017 are: Copyright (c) Pinterest, Inc.  All rights reserved.
-//  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
-//
-
-#import <Foundation/Foundation.h>
-#if TARGET_OS_TV
-#import <AsyncDisplayKit/ASControlNode.h>
-#import <AsyncDisplayKit/ASControlNode+Private.h>
-
-@implementation ASControlNode (tvOS)
-
-#pragma mark - tvOS
-- (void)_pressDown
-{
-  [UIView animateWithDuration:0.1 delay:0 options:UIViewAnimationOptionCurveLinear animations:^{
-    [self setPressedState];
-  } completion:^(BOOL finished) {
-    if (finished) {
-      [UIView animateWithDuration:0.1 delay:0 options:UIViewAnimationOptionCurveLinear animations:^{
-        [self setFocusedState];
-      } completion:nil];
-    }
-  }];
-}
-
-- (BOOL)canBecomeFocused
-{
-  return YES;
-}
-
-- (BOOL)shouldUpdateFocusInContext:(nonnull UIFocusUpdateContext *)context
-{
-  return YES;
-}
-
-- (void)didUpdateFocusInContext:(UIFocusUpdateContext *)context withAnimationCoordinator:(UIFocusAnimationCoordinator *)coordinator
-{
-  //FIXME: This is never valid inside an ASCellNode
-  if (context.nextFocusedView && context.nextFocusedView == self.view) {
-    //Focused
-    [coordinator addCoordinatedAnimations:^{
-      [self setFocusedState];
-    } completion:nil];
-  } else{
-    //Not focused
-    [coordinator addCoordinatedAnimations:^{
-      [self setDefaultFocusAppearance];
-    } completion:nil];
-  }
-}
-
-- (void)setFocusedState
-{
-  CALayer *layer = self.layer;
-  layer.shadowOffset = CGSizeMake(2, 10);
-  [self applyDefaultShadowProperties: layer];
-  self.view.transform = CGAffineTransformScale(CGAffineTransformIdentity, 1.1, 1.1);
-}
-
-- (void)setPressedState
-{
-  CALayer *layer = self.layer;
-  layer.shadowOffset = CGSizeMake(2, 2);
-  [self applyDefaultShadowProperties: layer];
-  self.view.transform = CGAffineTransformScale(CGAffineTransformIdentity, 1, 1);
-}
-
-- (void)applyDefaultShadowProperties:(CALayer *)layer
-{
-  layer.shadowColor = [UIColor blackColor].CGColor;
-  layer.shadowRadius = 12.0;
-  layer.shadowOpacity = 0.45;
-  layer.shadowPath = [UIBezierPath bezierPathWithRect:self.layer.bounds].CGPath;
-}
-
-- (void)setDefaultFocusAppearance
-{
-  CALayer *layer = self.layer;
-  layer.shadowOffset = CGSizeZero;
-  layer.shadowColor = [UIColor blackColor].CGColor;
-  layer.shadowRadius = 0;
-  layer.shadowOpacity = 0;
-  layer.shadowPath = [UIBezierPath bezierPathWithRect:self.layer.bounds].CGPath;
-  self.view.transform = CGAffineTransformScale(CGAffineTransformIdentity, 1, 1);
-}
-@end
-#endif
diff --git a/submodules/AsyncDisplayKit/Source/tvOS/ASImageNode+tvOS.mm b/submodules/AsyncDisplayKit/Source/tvOS/ASImageNode+tvOS.mm
deleted file mode 100644
index fa760f1291..0000000000
--- a/submodules/AsyncDisplayKit/Source/tvOS/ASImageNode+tvOS.mm
+++ /dev/null
@@ -1,191 +0,0 @@
-//
-//  ASImageNode+tvOS.mm
-//  Texture
-//
-//  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.
-//  Changes after 4/13/2017 are: Copyright (c) Pinterest, Inc.  All rights reserved.
-//  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
-//
-
-#import <Foundation/Foundation.h>
-#if TARGET_OS_TV
-#import <AsyncDisplayKit/ASImageNode.h>
-#import <AsyncDisplayKit/ASDisplayNode+Subclasses.h>
-
-// TODO: Remove this – we don't need to link GLKit just to convert degrees to radians.
-#import <GLKit/GLKit.h>
-#import <tgmath.h>
-
-#import <AsyncDisplayKit/ASDisplayNodeExtras.h>
-
-@implementation ASImageNode (tvOS)
-
-- (void)touchesBegan:(NSSet *)touches withEvent:(UIEvent *)event
-{
-  [super touchesBegan:touches withEvent:event];
-  self.isDefaultFocusAppearance = NO;
-  UIView *view = [self getView];
-  CALayer *layer = view.layer;
-  
-  CGSize targetShadowOffset = CGSizeMake(0.0, self.bounds.size.height/8);
-  [layer removeAllAnimations];
-  [CATransaction begin];
-  [CATransaction setCompletionBlock:^{
-    layer.shadowOffset = targetShadowOffset;
-  }];
-  
-  CABasicAnimation *shadowOffsetAnimation = [CABasicAnimation animationWithKeyPath:@"shadowOffset"];
-  shadowOffsetAnimation.toValue = [NSValue valueWithCGSize:targetShadowOffset];
-  shadowOffsetAnimation.duration = 0.4;
-  shadowOffsetAnimation.removedOnCompletion = NO;
-  shadowOffsetAnimation.fillMode = kCAFillModeForwards;
-  shadowOffsetAnimation.timingFunction = [CAMediaTimingFunction functionWithName:@"easeOut"];
-  [layer addAnimation:shadowOffsetAnimation forKey:@"shadowOffset"];
-  [CATransaction commit];
-  
-  CABasicAnimation *shadowOpacityAnimation = [CABasicAnimation animationWithKeyPath:@"shadowOpacity"];
-  shadowOpacityAnimation.toValue = [NSNumber numberWithFloat:0.45];
-  shadowOpacityAnimation.duration = 0.4;
-  shadowOpacityAnimation.removedOnCompletion = false;
-  shadowOpacityAnimation.fillMode = kCAFillModeForwards;
-  shadowOpacityAnimation.timingFunction = [CAMediaTimingFunction functionWithName:@"easeOut"];
-  [layer addAnimation:shadowOpacityAnimation forKey:@"shadowOpacityAnimation"];
-  
-  view.transform = CGAffineTransformScale(CGAffineTransformIdentity, 1.25, 1.25);
-  
-  [CATransaction commit];
-}
-
-- (void)touchesMoved:(NSSet *)touches withEvent:(UIEvent *)event
-{
-  [super touchesMoved:touches withEvent:event];
-  
-  // TODO: Clean up, and improve visuals.
-  
-  if (!self.isDefaultFocusAppearance) {
-    // This view may correspond to either self.view
-    // or our superview if we are in a ASCellNode
-    UIView *view = [self getView];
-    
-    UITouch *touch = [touches anyObject];
-    // Get the specific point that was touched
-    
-    // This is quite messy in it's current state so is not ready for production.
-    // The reason it is here is for others to contribute and to make it clear what is occuring.
-    
-    // We get the touch location in self.view because
-    // we are operating in that coordinate system.
-    // BUT we apply our transforms to *view since we want to apply
-    // the transforms to the root view (L: 107)
-    CGPoint point = [touch locationInView:self.view];
-    CGFloat pitch = 0;
-    CGFloat yaw = 0;
-    BOOL topHalf = NO;
-    if (point.y > CGRectGetHeight(self.view.frame)) {
-      pitch = 15;
-    } else if (point.y < -CGRectGetHeight(self.view.frame)) {
-      pitch = -15;
-    } else {
-      pitch = (point.y/CGRectGetHeight(self.view.frame))*15;
-    }
-    if (pitch < 0) {
-      topHalf = YES;
-    }
-    
-    if (point.x > CGRectGetWidth(self.view.frame)) {
-      yaw = 10;
-    } else if (point.x < -CGRectGetWidth(self.view.frame)) {
-      yaw = -10;
-    } else {
-      yaw = (point.x/CGRectGetWidth(self.view.frame))*10;
-    }
-    if (!topHalf) {
-      if (yaw > 0) {
-        yaw = -yaw;
-      } else {
-        yaw = fabs(yaw);
-      }
-    }
-    
-    CATransform3D pitchTransform = CATransform3DMakeRotation(GLKMathDegreesToRadians(pitch),1.0,0.0,0.0);
-    CATransform3D yawTransform = CATransform3DMakeRotation(GLKMathDegreesToRadians(yaw),0.0,1.0,0.0);
-    CATransform3D transform = CATransform3DConcat(pitchTransform, yawTransform);
-    CATransform3D scaleAndTransform = CATransform3DConcat(transform, CATransform3DMakeAffineTransform(CGAffineTransformScale(CGAffineTransformIdentity, 1.25, 1.25)));
-    
-    [UIView animateWithDuration:0.5 animations:^{
-      view.layer.transform = scaleAndTransform;
-    }];
-  } else {
-    [self setDefaultFocusAppearance];
-  }
-}
-
-
-- (void)touchesEnded:(NSSet<UITouch *> *)touches withEvent:(UIEvent *)event
-{
-  [super touchesEnded:touches withEvent:event];
-  [self finishTouches];
-}
-
-- (void)finishTouches
-{
-  if (!self.isDefaultFocusAppearance) {
-    UIView *view = [self getView];
-    CALayer *layer = view.layer;
-    
-    CGSize targetShadowOffset = CGSizeMake(0.0, self.bounds.size.height/8);
-    CATransform3D targetScaleTransform = CATransform3DMakeScale(1.2, 1.2, 1.2);
-    [CATransaction begin];
-    [CATransaction setCompletionBlock:^{
-      layer.shadowOffset = targetShadowOffset;
-    }];
-    [CATransaction commit];
-    
-    [UIView animateWithDuration:0.4 delay:0.0 options:UIViewAnimationOptionCurveEaseInOut animations:^{
-      view.layer.transform = targetScaleTransform;
-    } completion:^(BOOL finished) {
-      if (finished) {
-        [layer removeAnimationForKey:@"shadowOffset"];
-        [layer removeAnimationForKey:@"shadowOpacity"];
-      }
-    }];
-  } else {
-    [self setDefaultFocusAppearance];
-  }
-}
-
-- (void)setFocusedState
-{
-  UIView *view = [self getView];
-  CALayer *layer = view.layer;
-  layer.shadowOffset = CGSizeMake(2, 10);
-  layer.shadowColor = [UIColor blackColor].CGColor;
-  layer.shadowRadius = 12.0;
-  layer.shadowOpacity = 0.45;
-  layer.shadowPath = [UIBezierPath bezierPathWithRect:self.layer.bounds].CGPath;
-  view.transform = CGAffineTransformScale(CGAffineTransformIdentity, 1.25, 1.25);
-}
-
-- (void)setDefaultFocusAppearance
-{
-  UIView *view = [self getView];
-  CALayer *layer = view.layer;
-  view.transform = CGAffineTransformIdentity;
-  layer.shadowOpacity = 0;
-  layer.shadowOffset = CGSizeZero;
-  layer.shadowRadius = 0;
-  layer.shadowPath = nil;
-  [layer removeAnimationForKey:@"shadowOffset"];
-  [layer removeAnimationForKey:@"shadowOpacity"];
-  self.isDefaultFocusAppearance = YES;
-}
-
-- (UIView *)getView
-{
-  // TODO: This needs to be re-visited to handle all possibilities.
-  // If we are inside a ASCellNode, then we need to apply our focus effects to the ASCellNode view/layer rather than the ASImageNode view/layer.
-  return ASDisplayNodeUltimateParentOfNode(self).view;
-}
-
-@end
-#endif
diff --git a/submodules/AsyncDisplayKit/SubspecWorkspaces/ASDKListKit/ASDKListKit.xcworkspace/contents.xcworkspacedata b/submodules/AsyncDisplayKit/SubspecWorkspaces/ASDKListKit/ASDKListKit.xcworkspace/contents.xcworkspacedata
deleted file mode 100644
index 4d0db5485c..0000000000
--- a/submodules/AsyncDisplayKit/SubspecWorkspaces/ASDKListKit/ASDKListKit.xcworkspace/contents.xcworkspacedata
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Workspace
-   version = "1.0">
-   <FileRef
-      location = "group:ASDKListKit.xcodeproj">
-   </FileRef>
-   <FileRef
-      location = "group:Pods/Pods.xcodeproj">
-   </FileRef>
-</Workspace>
diff --git a/submodules/AsyncDisplayKit/SubspecWorkspaces/ASDKListKit/ASDKListKitTests/ASListKitTestAdapterDataSource.h b/submodules/AsyncDisplayKit/SubspecWorkspaces/ASDKListKit/ASDKListKitTests/ASListKitTestAdapterDataSource.h
deleted file mode 100644
index c3cdab0bad..0000000000
--- a/submodules/AsyncDisplayKit/SubspecWorkspaces/ASDKListKit/ASDKListKitTests/ASListKitTestAdapterDataSource.h
+++ /dev/null
@@ -1,17 +0,0 @@
-//
-//  ASListKitTestAdapterDataSource.h
-//  Texture
-//
-//  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.
-//  Changes after 4/13/2017 are: Copyright (c) Pinterest, Inc.  All rights reserved.
-//  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
-//
-
-#import <IGListKit/IGListKit.h>
-
-@interface ASListKitTestAdapterDataSource : NSObject <IGListAdapterDataSource>
-
-// array of numbers which is then passed to -[IGListTestSection setItems:]
-@property (nonatomic, strong) NSArray <NSNumber *> *objects;
-
-@end
diff --git a/submodules/AsyncDisplayKit/SubspecWorkspaces/ASDKListKit/ASDKListKitTests/ASListKitTestAdapterDataSource.m b/submodules/AsyncDisplayKit/SubspecWorkspaces/ASDKListKit/ASDKListKitTests/ASListKitTestAdapterDataSource.m
deleted file mode 100644
index b0cd9a8a6d..0000000000
--- a/submodules/AsyncDisplayKit/SubspecWorkspaces/ASDKListKit/ASDKListKitTests/ASListKitTestAdapterDataSource.m
+++ /dev/null
@@ -1,31 +0,0 @@
-//
-//  ASListKitTestAdapterDataSource.m
-//  Texture
-//
-//  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.
-//  Changes after 4/13/2017 are: Copyright (c) Pinterest, Inc.  All rights reserved.
-//  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
-//
-
-#import "ASListKitTestAdapterDataSource.h"
-#import "ASListTestSection.h"
-
-@implementation ASListKitTestAdapterDataSource
-
-- (NSArray *)objectsForListAdapter:(IGListAdapter *)listAdapter
-{
-  return self.objects;
-}
-
-- (IGListSectionController *)listAdapter:(IGListAdapter *)listAdapter sectionControllerForObject:(id)object
-{
-  ASListTestSection *section = [[ASListTestSection alloc] init];
-  return section;
-}
-
-- (nullable UIView *)emptyViewForListAdapter:(IGListAdapter *)listAdapter
-{
-  return nil;
-}
-
-@end
diff --git a/submodules/AsyncDisplayKit/SubspecWorkspaces/ASDKListKit/ASDKListKitTests/ASListKitTests.m b/submodules/AsyncDisplayKit/SubspecWorkspaces/ASDKListKit/ASDKListKitTests/ASListKitTests.m
deleted file mode 100644
index 1bb2c6fed0..0000000000
--- a/submodules/AsyncDisplayKit/SubspecWorkspaces/ASDKListKit/ASDKListKitTests/ASListKitTests.m
+++ /dev/null
@@ -1,112 +0,0 @@
-//
-//  ASListKitTests.m
-//  Texture
-//
-//  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.
-//  Changes after 4/13/2017 are: Copyright (c) Pinterest, Inc.  All rights reserved.
-//  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
-//
-
-#import <XCTest/XCTest.h>
-#import <AsyncDisplayKit/AsyncDisplayKit.h>
-#import "ASListKitTestAdapterDataSource.h"
-#import "ASXCTExtensions.h"
-#import <JGMethodSwizzler/JGMethodSwizzler.h>
-#import "ASTestCase.h"
-
-@interface ASListKitTests : ASTestCase
-
-@property (nonatomic, strong) ASCollectionNode *collectionNode;
-@property (nonatomic, strong) UICollectionView *collectionView;
-@property (nonatomic, strong) IGListAdapter *adapter;
-@property (nonatomic, strong) ASListKitTestAdapterDataSource *dataSource;
-@property (nonatomic, strong) UICollectionViewFlowLayout *layout;
-@property (nonatomic, strong) UIWindow *window;
-@property (nonatomic) NSInteger reloadDataCount;
-
-@end
-
-@implementation ASListKitTests
-
-- (void)setUp
-{
-  [super setUp];
-
-  [ASCollectionView swizzleInstanceMethod:@selector(reloadData) withReplacement:JGMethodReplacementProviderBlock {
-    return JGMethodReplacement(void, ASCollectionView *) {
-      JGOriginalImplementation(void);
-      _reloadDataCount++;
-    };
-  }];
-
-  self.window = [[UIWindow alloc] initWithFrame:CGRectMake(0, 0, 100, 100)];
-
-  self.layout = [[UICollectionViewFlowLayout alloc] init];
-  self.collectionNode = [[ASCollectionNode alloc] initWithCollectionViewLayout:self.layout];
-  self.collectionNode.frame = self.window.bounds;
-  self.collectionView = self.collectionNode.view;
-
-  [self.window addSubnode:self.collectionNode];
-
-  IGListAdapterUpdater *updater = [[IGListAdapterUpdater alloc] init];
-
-  self.dataSource = [[ASListKitTestAdapterDataSource alloc] init];
-  self.adapter = [[IGListAdapter alloc] initWithUpdater:updater
-                                         viewController:nil
-                                       workingRangeSize:0];
-  self.adapter.dataSource = self.dataSource;
-  [self.adapter setASDKCollectionNode:self.collectionNode];
-  XCTAssertNotNil(self.adapter.collectionView, @"Adapter was not bound to collection view. You may have a stale copy of AsyncDisplayKit that was built without IG_LIST_KIT. Clean Builder Folder IMO.");
-}
-
-- (void)tearDown
-{
-  [super tearDown];
-  XCTAssert([ASCollectionView deswizzleAllMethods]);
-  self.reloadDataCount = 0;
-  self.window = nil;
-  self.collectionNode = nil;
-  self.collectionView = nil;
-  self.adapter = nil;
-  self.dataSource = nil;
-  self.layout = nil;
-}
-
-- (void)test_whenAdapterUpdated_withObjectsOverflow_thatVisibleObjectsIsSubsetOfAllObjects
-{
-  // each section controller returns n items sized 100x10
-  self.dataSource.objects = @[@1, @2, @3, @4, @5, @6];
-  XCTestExpectation *e = [self expectationWithDescription:@"Data update completed"];
-
-  [self.adapter performUpdatesAnimated:NO completion:^(BOOL finished) {
-    [e fulfill];
-  }];
-  
-  [self waitForExpectationsWithTimeout:1 handler:nil];
-  self.collectionNode.view.contentOffset = CGPointMake(0, 30);
-  [self.collectionNode.view layoutIfNeeded];
-
-
-  NSArray *visibleObjects = [[self.adapter visibleObjects] sortedArrayUsingSelector:@selector(compare:)];
-  NSArray *expectedObjects = @[@3, @4, @5];
-  XCTAssertEqualObjects(visibleObjects, expectedObjects);
-}
-
-- (void)test_whenCollectionViewIsNotInAWindow_updaterDoesNotJustCallReloadData
-{
-  [self.collectionView removeFromSuperview];
-
-  [self.collectionView layoutIfNeeded];
-  self.dataSource.objects = @[@1, @2, @3, @4, @5, @6];
-  XCTestExpectation *e = [self expectationWithDescription:@"Data update completed"];
-
-  [self.adapter performUpdatesAnimated:NO completion:^(BOOL finished) {
-    [e fulfill];
-  }];
-  [self waitForExpectationsWithTimeout:1 handler:nil];
-  [self.collectionView layoutIfNeeded];
-
-  XCTAssertEqual(self.reloadDataCount, 2);
-}
-
-@end
diff --git a/submodules/AsyncDisplayKit/SubspecWorkspaces/ASDKListKit/ASDKListKitTests/ASListTestCellNode.h b/submodules/AsyncDisplayKit/SubspecWorkspaces/ASDKListKit/ASDKListKitTests/ASListTestCellNode.h
deleted file mode 100644
index e0a4ad7f44..0000000000
--- a/submodules/AsyncDisplayKit/SubspecWorkspaces/ASDKListKit/ASDKListKitTests/ASListTestCellNode.h
+++ /dev/null
@@ -1,14 +0,0 @@
-//
-//  ASListTestCellNode.h
-//  Texture
-//
-//  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.
-//  Changes after 4/13/2017 are: Copyright (c) Pinterest, Inc.  All rights reserved.
-//  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
-//
-
-#import <AsyncDisplayKit/AsyncDisplayKit.h>
-
-@interface ASListTestCellNode : ASCellNode
-
-@end
diff --git a/submodules/AsyncDisplayKit/SubspecWorkspaces/ASDKListKit/ASDKListKitTests/ASListTestCellNode.m b/submodules/AsyncDisplayKit/SubspecWorkspaces/ASDKListKit/ASDKListKitTests/ASListTestCellNode.m
deleted file mode 100644
index cd3bfb3a8d..0000000000
--- a/submodules/AsyncDisplayKit/SubspecWorkspaces/ASDKListKit/ASDKListKitTests/ASListTestCellNode.m
+++ /dev/null
@@ -1,14 +0,0 @@
-//
-//  ASListTestCellNode.m
-//  Texture
-//
-//  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.
-//  Changes after 4/13/2017 are: Copyright (c) Pinterest, Inc.  All rights reserved.
-//  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
-//
-
-#import "ASListTestCellNode.h"
-
-@implementation ASListTestCellNode
-
-@end
diff --git a/submodules/AsyncDisplayKit/SubspecWorkspaces/ASDKListKit/ASDKListKitTests/ASListTestObject.h b/submodules/AsyncDisplayKit/SubspecWorkspaces/ASDKListKit/ASDKListKitTests/ASListTestObject.h
deleted file mode 100644
index 1362ebf560..0000000000
--- a/submodules/AsyncDisplayKit/SubspecWorkspaces/ASDKListKit/ASDKListKitTests/ASListTestObject.h
+++ /dev/null
@@ -1,23 +0,0 @@
-//
-//  ASListTestObject.h
-//  Texture
-//
-//  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.
-//  Changes after 4/13/2017 are: Copyright (c) Pinterest, Inc.  All rights reserved.
-//  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
-//
-
-#import <IGListKit/IGListKit.h>
-
-NS_ASSUME_NONNULL_BEGIN
-
-@interface ASListTestObject : NSObject <IGListDiffable, NSCopying>
-
-- (instancetype)initWithKey:(id <NSCopying>)key value:(id)value;
-
-@property (nonatomic, strong, readonly) id key;
-@property (nonatomic, strong) id value;
-
-@end
-
-NS_ASSUME_NONNULL_END
diff --git a/submodules/AsyncDisplayKit/SubspecWorkspaces/ASDKListKit/ASDKListKitTests/ASListTestObject.m b/submodules/AsyncDisplayKit/SubspecWorkspaces/ASDKListKit/ASDKListKitTests/ASListTestObject.m
deleted file mode 100644
index 64cd83649b..0000000000
--- a/submodules/AsyncDisplayKit/SubspecWorkspaces/ASDKListKit/ASDKListKitTests/ASListTestObject.m
+++ /dev/null
@@ -1,50 +0,0 @@
-//
-//  ASListTestObject.m
-//  Texture
-//
-//  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.
-//  Changes after 4/13/2017 are: Copyright (c) Pinterest, Inc.  All rights reserved.
-//  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
-//
-
-#import "ASListTestObject.h"
-
-@implementation ASListTestObject
-
-- (instancetype)initWithKey:(id)key value:(id)value
-{
-  if (self = [super init]) {
-    _key = [key copy];
-    _value = value;
-  }
-  return self;
-}
-
-- (instancetype)copyWithZone:(NSZone *)zone
-{
-  return [[ASListTestObject alloc] initWithKey:self.key value:self.value];
-}
-
-#pragma mark - IGListDiffable
-
-- (id<NSObject>)diffIdentifier
-{
-  return self.key;
-}
-
-- (BOOL)isEqualToDiffableObject:(id)object
-{
-  if (object == self) {
-    return YES;
-  }
-  if ([object isKindOfClass:[ASListTestObject class]]) {
-    id k1 = self.key;
-    id k2 = [object key];
-    id v1 = self.value;
-    id v2 = [(ASListTestObject *)object value];
-    return (v1 == v2 || [v1 isEqual:v2]) && (k1 == k2 || [k1 isEqual:k2]);
-  }
-  return NO;
-}
-
-@end
diff --git a/submodules/AsyncDisplayKit/SubspecWorkspaces/ASDKListKit/ASDKListKitTests/ASListTestSection.h b/submodules/AsyncDisplayKit/SubspecWorkspaces/ASDKListKit/ASDKListKitTests/ASListTestSection.h
deleted file mode 100644
index d62e21b1f6..0000000000
--- a/submodules/AsyncDisplayKit/SubspecWorkspaces/ASDKListKit/ASDKListKitTests/ASListTestSection.h
+++ /dev/null
@@ -1,19 +0,0 @@
-//
-//  ASListTestSection.h
-//  Texture
-//
-//  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.
-//  Changes after 4/13/2017 are: Copyright (c) Pinterest, Inc.  All rights reserved.
-//  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
-//
-
-#import <IGListKit/IGListKit.h>
-#import <AsyncDisplayKit/AsyncDisplayKit.h>
-
-@interface ASListTestSection : IGListSectionController <ASSectionController>
-
-@property (nonatomic) NSInteger itemCount;
-
-@property (nonatomic) NSInteger selectedItemIndex;
-
-@end
diff --git a/submodules/AsyncDisplayKit/SubspecWorkspaces/ASDKListKit/ASDKListKitTests/ASListTestSection.m b/submodules/AsyncDisplayKit/SubspecWorkspaces/ASDKListKit/ASDKListKitTests/ASListTestSection.m
deleted file mode 100644
index edf939b7c0..0000000000
--- a/submodules/AsyncDisplayKit/SubspecWorkspaces/ASDKListKit/ASDKListKitTests/ASListTestSection.m
+++ /dev/null
@@ -1,61 +0,0 @@
-//
-//  ASListTestSection.m
-//  Texture
-//
-//  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.
-//  Changes after 4/13/2017 are: Copyright (c) Pinterest, Inc.  All rights reserved.
-//  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
-//
-
-#import "ASListTestSection.h"
-#import "ASListTestCellNode.h"
-
-@implementation ASListTestSection
-
-- (instancetype)init
-{
-  if (self = [super init])
-{
-    _selectedItemIndex = NSNotFound;
-  }
-  return self;
-}
-
-- (NSInteger)numberOfItems
-{
-  return self.itemCount;
-}
-
-- (CGSize)sizeForItemAtIndex:(NSInteger)index
-{
-  return [ASIGListSectionControllerMethods sizeForItemAtIndex:index];
-}
-
-- (__kindof UICollectionViewCell *)cellForItemAtIndex:(NSInteger)index
-{
-  return [ASIGListSectionControllerMethods cellForItemAtIndex:index sectionController:self];
-}
-
-- (void)didUpdateToObject:(id)object
-{
-  if ([object isKindOfClass:[NSNumber class]])
-{
-    self.itemCount = [object integerValue];
-  }
-}
-
-- (void)didSelectItemAtIndex:(NSInteger)index
-{
-  self.selectedItemIndex = index;
-}
-
-- (ASCellNodeBlock)nodeBlockForItemAtIndex:(NSInteger)index
-{
-  return ^{
-    ASListTestCellNode *node = [[ASListTestCellNode alloc] init];
-    node.style.preferredSize = CGSizeMake(100, 10);
-    return node;
-  };
-}
-
-@end
diff --git a/submodules/AsyncDisplayKit/SubspecWorkspaces/ASDKListKit/ASDKListKitTests/ASListTestSupplementaryNode.h b/submodules/AsyncDisplayKit/SubspecWorkspaces/ASDKListKit/ASDKListKitTests/ASListTestSupplementaryNode.h
deleted file mode 100644
index c4f40e4ab7..0000000000
--- a/submodules/AsyncDisplayKit/SubspecWorkspaces/ASDKListKit/ASDKListKitTests/ASListTestSupplementaryNode.h
+++ /dev/null
@@ -1,14 +0,0 @@
-//
-//  ASListTestSupplementaryNode.h
-//  Texture
-//
-//  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.
-//  Changes after 4/13/2017 are: Copyright (c) Pinterest, Inc.  All rights reserved.
-//  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
-//
-
-#import <AsyncDisplayKit/AsyncDisplayKit.h>
-
-@interface ASListTestSupplementaryNode : ASCellNode
-
-@end
diff --git a/submodules/AsyncDisplayKit/SubspecWorkspaces/ASDKListKit/ASDKListKitTests/ASListTestSupplementaryNode.m b/submodules/AsyncDisplayKit/SubspecWorkspaces/ASDKListKit/ASDKListKitTests/ASListTestSupplementaryNode.m
deleted file mode 100644
index a10f6a8f69..0000000000
--- a/submodules/AsyncDisplayKit/SubspecWorkspaces/ASDKListKit/ASDKListKitTests/ASListTestSupplementaryNode.m
+++ /dev/null
@@ -1,14 +0,0 @@
-//
-//  ASListTestSupplementaryNode.m
-//  Texture
-//
-//  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.
-//  Changes after 4/13/2017 are: Copyright (c) Pinterest, Inc.  All rights reserved.
-//  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
-//
-
-#import "ASListTestSupplementaryNode.h"
-
-@implementation ASListTestSupplementaryNode
-
-@end
diff --git a/submodules/AsyncDisplayKit/SubspecWorkspaces/ASDKListKit/ASDKListKitTests/ASListTestSupplementarySource.h b/submodules/AsyncDisplayKit/SubspecWorkspaces/ASDKListKit/ASDKListKitTests/ASListTestSupplementarySource.h
deleted file mode 100644
index acdec1ef94..0000000000
--- a/submodules/AsyncDisplayKit/SubspecWorkspaces/ASDKListKit/ASDKListKitTests/ASListTestSupplementarySource.h
+++ /dev/null
@@ -1,21 +0,0 @@
-//
-//  ASListTestSupplementarySource.h
-//  Texture
-//
-//  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.
-//  Changes after 4/13/2017 are: Copyright (c) Pinterest, Inc.  All rights reserved.
-//  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
-//
-
-#import <IGListKit/IGListKit.h>
-#import <AsyncDisplayKit/AsyncDisplayKit.h>
-
-@interface ASListTestSupplementarySource : NSObject <IGListSupplementaryViewSource, ASSupplementaryNodeSource>
-
-@property (nonatomic, strong, readwrite) NSArray<NSString *> *supportedElementKinds;
-
-@property (nonatomic, weak) id<IGListCollectionContext> collectionContext;
-
-@property (nonatomic, weak) IGListSectionController *sectionController;
-
-@end
diff --git a/submodules/AsyncDisplayKit/SubspecWorkspaces/ASDKListKit/ASDKListKitTests/ASListTestSupplementarySource.m b/submodules/AsyncDisplayKit/SubspecWorkspaces/ASDKListKit/ASDKListKitTests/ASListTestSupplementarySource.m
deleted file mode 100644
index 07410131e2..0000000000
--- a/submodules/AsyncDisplayKit/SubspecWorkspaces/ASDKListKit/ASDKListKitTests/ASListTestSupplementarySource.m
+++ /dev/null
@@ -1,34 +0,0 @@
-//
-//  ASListTestSupplementarySource.m
-//  Texture
-//
-//  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.
-//  Changes after 4/13/2017 are: Copyright (c) Pinterest, Inc.  All rights reserved.
-//  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
-//
-
-#import "ASListTestSupplementarySource.h"
-#import "ASListTestSupplementaryNode.h"
-
-@implementation ASListTestSupplementarySource
-
-- (__kindof UICollectionReusableView *)viewForSupplementaryElementOfKind:(NSString *)elementKind atIndex:(NSInteger)index
-{
-  return [ASIGListSupplementaryViewSourceMethods viewForSupplementaryElementOfKind:elementKind atIndex:index sectionController:self.sectionController];
-}
-
-- (CGSize)sizeForSupplementaryViewOfKind:(NSString *)elementKind atIndex:(NSInteger)index
-{
-  return [ASIGListSupplementaryViewSourceMethods sizeForSupplementaryViewOfKind:elementKind atIndex:index];
-}
-
-- (ASCellNodeBlock)nodeBlockForSupplementaryElementOfKind:(NSString *)elementKind atIndex:(NSInteger)index
-{
-  return ^{
-    ASListTestSupplementaryNode *node = [[ASListTestSupplementaryNode alloc] init];
-    node.style.preferredSize = CGSizeMake(100, 10);
-    return node;
-  };
-}
-
-@end
diff --git a/submodules/AsyncDisplayKit/SubspecWorkspaces/ASDKListKit/ASDKListKitTests/Info.plist b/submodules/AsyncDisplayKit/SubspecWorkspaces/ASDKListKit/ASDKListKitTests/Info.plist
deleted file mode 100644
index 6c6c23c43a..0000000000
--- a/submodules/AsyncDisplayKit/SubspecWorkspaces/ASDKListKit/ASDKListKitTests/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>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>BNDL</string>
-	<key>CFBundleShortVersionString</key>
-	<string>1.0</string>
-	<key>CFBundleVersion</key>
-	<string>1</string>
-</dict>
-</plist>
diff --git a/submodules/AsyncDisplayKit/SubspecWorkspaces/ASDKListKit/Podfile b/submodules/AsyncDisplayKit/SubspecWorkspaces/ASDKListKit/Podfile
deleted file mode 100644
index 36498c2473..0000000000
--- a/submodules/AsyncDisplayKit/SubspecWorkspaces/ASDKListKit/Podfile
+++ /dev/null
@@ -1,9 +0,0 @@
-source 'https://github.com/CocoaPods/Specs.git'
-
-platform :ios, '9.0'
-target 'ASDKListKitTests' do
-  pod 'Texture/IGListKit', :path => '../..'
-  pod 'OCMock', '~> 3.4'
-  pod 'JGMethodSwizzler', :git => 'https://github.com/JonasGessner/JGMethodSwizzler', :branch => 'master'
-end
-
diff --git a/submodules/AsyncDisplayKit/Texture.podspec b/submodules/AsyncDisplayKit/Texture.podspec
deleted file mode 100644
index ef915ac597..0000000000
--- a/submodules/AsyncDisplayKit/Texture.podspec
+++ /dev/null
@@ -1,99 +0,0 @@
-Pod::Spec.new do |spec|
-  spec.name         = 'Texture'
-  spec.version      = '2.8'
-  spec.license      =  { :type => 'Apache 2',  }
-  spec.homepage     = 'http://texturegroup.org'
-  spec.authors      = { 'Huy Nguyen' => 'hi@huytnguyen.me', 'Garrett Moon' => 'garrett@excitedpixel.com', 'Scott Goodson' => 'scottgoodson@gmail.com', 'Michael Schneider' => 'mischneider1@gmail.com', 'Adlai Holler' => 'adlai@icloud.com' }
-  spec.summary      = 'Smooth asynchronous user interfaces for iOS apps.'
-  spec.source       = { :git => 'https://github.com/TextureGroup/Texture.git', :tag => spec.version.to_s }
-  spec.module_name  = 'AsyncDisplayKit'
-  spec.header_dir   = 'AsyncDisplayKit'
-
-  spec.documentation_url = 'http://texturegroup.org/appledoc/'
-
-  spec.ios.deployment_target = '9.0'
-  spec.tvos.deployment_target = '9.0'
-
-  # Subspecs
-  spec.subspec 'Core' do |core|
-    core.compiler_flags = '-fno-exceptions -Wno-implicit-retain-self'
-    core.public_header_files = [
-      'Source/*.h',
-      'Source/Details/**/*.h',
-      'Source/Layout/**/*.h',
-      'Source/Base/*.h',
-      'Source/Debug/**/*.h',
-      'Source/TextKit/ASTextNodeTypes.h',
-      'Source/TextKit/ASTextKitComponents.h'
-    ]
-    
-    core.source_files = [
-      'Source/**/*.{h,mm}',
-      
-      # Most TextKit components are not public because the C++ content
-      # in the headers will cause build errors when using
-      # `use_frameworks!` on 0.39.0 & Swift 2.1.
-      # See https://github.com/facebook/AsyncDisplayKit/issues/1153
-      'Source/TextKit/*.h',
-    ]
-  end
-  
-  spec.subspec 'PINRemoteImage' do |pin|
-    pin.dependency 'PINRemoteImage/iOS', '= 3.0.0-beta.14'
-    pin.dependency 'PINRemoteImage/PINCache'
-    pin.dependency 'Texture/Core'
-  end
-
-  spec.subspec 'IGListKit' do |igl|
-    igl.dependency 'IGListKit', '~> 3.0'
-    igl.dependency 'Texture/Core'
-  end
-
-  spec.subspec 'Yoga' do |yoga|
-    yoga.xcconfig = { 'GCC_PREPROCESSOR_DEFINITIONS' => '$(inherited) YOGA=1' }
-    yoga.dependency 'Yoga', '1.6.0'
-    yoga.dependency 'Texture/Core'
-  end
-  
-  # If flag is enabled the old TextNode with all dependencies will be compiled out
-  spec.subspec 'TextNode2' do |text_node|
-    text_node.xcconfig = { 'GCC_PREPROCESSOR_DEFINITIONS' => '$(inherited) AS_ENABLE_TEXTNODE=0' }
-    text_node.dependency 'Texture/Core'
-  end
-
-  spec.subspec 'Video' do |video|
-    video.frameworks = ['AVFoundation', 'CoreMedia']
-    video.xcconfig = { 'GCC_PREPROCESSOR_DEFINITIONS' => '$(inherited) AS_USE_VIDEO=1' }
-    video.dependency 'Texture/Core'
-  end 
-
-  spec.subspec 'MapKit' do |map|
-    map.frameworks = ['CoreLocation', 'MapKit']
-    map.xcconfig = { 'GCC_PREPROCESSOR_DEFINITIONS' => '$(inherited) AS_USE_MAPKIT=1' }
-    map.dependency 'Texture/Core'
-  end
-
-  spec.subspec 'Photos' do |photos|
-    photos.frameworks = 'Photos'
-    photos.xcconfig = { 'GCC_PREPROCESSOR_DEFINITIONS' => '$(inherited) AS_USE_PHOTOS=1' }
-    photos.dependency 'Texture/Core'
-  end
-
-  spec.subspec 'AssetsLibrary' do |assetslib|
-    assetslib.frameworks = 'AssetsLibrary'
-    assetslib.xcconfig = { 'GCC_PREPROCESSOR_DEFINITIONS' => '$(inherited) AS_USE_ASSETS_LIBRARY=1' }
-    assetslib.dependency 'Texture/Core'
-  end
-
-  # Include these by default for backwards compatibility.
-  # This will change in 3.0.
-  spec.default_subspecs = 'Core', 'PINRemoteImage', 'Video', 'MapKit', 'AssetsLibrary', 'Photos'
-
-  spec.social_media_url = 'https://twitter.com/TextureiOS'
-  spec.library = 'c++'
-  spec.pod_target_xcconfig = {
-    'CLANG_CXX_LANGUAGE_STANDARD' => 'c++11',
-    'CLANG_CXX_LIBRARY' => 'libc++'
-   }
-   
-end
diff --git a/submodules/AsyncDisplayKit/buck-files/BUCK_FBSnapshotTestCase b/submodules/AsyncDisplayKit/buck-files/BUCK_FBSnapshotTestCase
deleted file mode 100755
index c8b969639e..0000000000
--- a/submodules/AsyncDisplayKit/buck-files/BUCK_FBSnapshotTestCase
+++ /dev/null
@@ -1,12 +0,0 @@
-apple_library(
-  name = 'FBSnapshotTestCase',
-  exported_headers = glob(['FBSnapshotTestCase' + '/**/*.h']),
-  srcs = glob(['FBSnapshotTestCase' + '/**/*.m']),
-  frameworks = [
-    '$SDKROOT/System/Library/Frameworks/Foundation.framework',
-    '$SDKROOT/System/Library/Frameworks/UIKit.framework',
-    '$SDKROOT/System/Library/Frameworks/QuartzCore.framework',
-    '$PLATFORM_DIR/Developer/Library/Frameworks/XCTest.framework',
-  ],
-  visibility = ['PUBLIC'],
-)
diff --git a/submodules/AsyncDisplayKit/buck-files/BUCK_FLAnimatedImage b/submodules/AsyncDisplayKit/buck-files/BUCK_FLAnimatedImage
deleted file mode 100755
index f04abd396b..0000000000
--- a/submodules/AsyncDisplayKit/buck-files/BUCK_FLAnimatedImage
+++ /dev/null
@@ -1,18 +0,0 @@
-apple_library(
-  name = 'FLAnimatedImage',
-  exported_headers = glob(['FLAnimatedImage/*.h']),
-  srcs = glob(['FLAnimatedImage/*.m']),
-  preprocessor_flags = ['-fobjc-arc', '-Wno-deprecated-declarations'],
-  lang_preprocessor_flags = {
-    'C': ['-std=gnu99'],
-    'CXX': ['-std=gnu++11', '-stdlib=libc++'],
-  },
-  frameworks = [
-    '$SDKROOT/System/Library/Frameworks/Foundation.framework',
-    '$SDKROOT/System/Library/Frameworks/UIKit.framework',
-    '$SDKROOT/System/Library/Frameworks/ImageIO.framework',
-    '$SDKROOT/System/Library/Frameworks/MobileCoreServices.framework',
-    '$SDKROOT/System/Library/Frameworks/QuartzCore.framework',
-  ],
-  visibility = ['PUBLIC'],
-)
diff --git a/submodules/AsyncDisplayKit/buck-files/BUCK_JGMethodSwizzler b/submodules/AsyncDisplayKit/buck-files/BUCK_JGMethodSwizzler
deleted file mode 100755
index 169cfa1e01..0000000000
--- a/submodules/AsyncDisplayKit/buck-files/BUCK_JGMethodSwizzler
+++ /dev/null
@@ -1,9 +0,0 @@
-apple_library(
-  name = 'JGMethodSwizzler',
-  exported_headers = ['JGMethodSwizzler' + '/JGMethodSwizzler.h'],
-  srcs = ['JGMethodSwizzler' + '/JGMethodSwizzler.m'],
-  frameworks = [
-    '$SDKROOT/System/Library/Frameworks/Foundation.framework',
-  ],
-  visibility = ['PUBLIC'],
-)
diff --git a/submodules/AsyncDisplayKit/buck-files/BUCK_OCMock b/submodules/AsyncDisplayKit/buck-files/BUCK_OCMock
deleted file mode 100755
index 666f844582..0000000000
--- a/submodules/AsyncDisplayKit/buck-files/BUCK_OCMock
+++ /dev/null
@@ -1,9 +0,0 @@
-apple_library(
-  name = 'OCMock',
-  exported_headers = glob(['Source/OCMock' + '/*.h']),
-  srcs = glob(['Source/OCMock' + '/*.m']),
-  frameworks = [
-    '$SDKROOT/System/Library/Frameworks/Foundation.framework',
-  ],
-  visibility = ['PUBLIC'],
-)
diff --git a/submodules/AsyncDisplayKit/buck-files/BUCK_PINCache b/submodules/AsyncDisplayKit/buck-files/BUCK_PINCache
deleted file mode 100755
index 660b69f716..0000000000
--- a/submodules/AsyncDisplayKit/buck-files/BUCK_PINCache
+++ /dev/null
@@ -1,23 +0,0 @@
-apple_library(
-  name = 'PINCache',
-  exported_headers = glob(['PINCache/*.h']),
-  # PINDiskCache.m should be compiled with '-fobjc-arc-exceptions' (#105)
-  srcs =
-    glob(['PINCache/*.m'], excludes = ['PINCache/PINDiskCache.m']) +
-    [('PINCache/PINDiskCache.m', ['-fobjc-arc-exceptions'])],
-  preprocessor_flags = ['-fobjc-arc'],
-  lang_preprocessor_flags = {
-    'C': ['-std=gnu99'],
-    'CXX': ['-std=gnu++11', '-stdlib=libc++'],
-  },
-  linker_flags = [
-    '-weak_framework',
-    'UIKit',
-    '-weak_framework',
-    'AppKit',
-  ],
-  frameworks = [
-    '$SDKROOT/System/Library/Frameworks/Foundation.framework',
-  ],
-  visibility = ['PUBLIC'],
-)
diff --git a/submodules/AsyncDisplayKit/buck-files/BUCK_PINRemoteImage b/submodules/AsyncDisplayKit/buck-files/BUCK_PINRemoteImage
deleted file mode 100755
index 95825e4d95..0000000000
--- a/submodules/AsyncDisplayKit/buck-files/BUCK_PINRemoteImage
+++ /dev/null
@@ -1,93 +0,0 @@
-#####################################
-# Defines
-#####################################
-COMMON_PREPROCESSOR_FLAGS = ['-fobjc-arc']
-
-COMMON_LANG_PREPROCESSOR_FLAGS = {
-  'C': ['-std=gnu99'],
-  'CXX': ['-std=gnu++11', '-stdlib=libc++'],
-}
-
-FLANIMATEDIMAGE_HEADER_FILES = ['Pod/Classes/Image Categories/FLAnimatedImageView+PINRemoteImage.h']
-FLANIMATEDIMAGE_SOURCE_FILES = ['Pod/Classes/Image Categories/FLAnimatedImageView+PINRemoteImage.m']
-
-PINCACHE_HEADER_FILES = glob(['Pod/Classes/PINCache/**/*.h'])
-PINCACHE_SOURCE_FILES = glob(['Pod/Classes/PINCache/**/*.m'])
-
-#####################################
-# PINRemoteImage core targets
-#####################################
-apple_library(
-  name = 'PINRemoteImage-Core',
-  header_path_prefix = 'PINRemoteImage',
-  exported_headers = glob([
-      'Pod/Classes/**/*.h',
-    ],
-    excludes = FLANIMATEDIMAGE_HEADER_FILES + PINCACHE_HEADER_FILES
-  ),
-  srcs = glob([
-      'Pod/Classes/**/*.m',
-    ],
-    excludes = FLANIMATEDIMAGE_SOURCE_FILES + PINCACHE_SOURCE_FILES
-  ),
-  preprocessor_flags = COMMON_PREPROCESSOR_FLAGS + [
-    '-DPIN_TARGET_IOS=(TARGET_OS_IPHONE || TARGET_IPHONE_SIMULATOR || TARGET_OS_TV)',
-    '-DPIN_TARGET_MAC=(TARGET_OS_MAC)',
-  ],
-  lang_preprocessor_flags = COMMON_LANG_PREPROCESSOR_FLAGS,
-  linker_flags = [
-    '-weak_framework',
-    'UIKit',
-    '-weak_framework',
-    'MobileCoreServices',
-    '-weak_framework',
-    'Cocoa',
-    '-weak_framework',
-    'CoreServices',
-  ],
-  frameworks = [
-    '$SDKROOT/System/Library/Frameworks/ImageIO.framework',
-    '$SDKROOT/System/Library/Frameworks/Accelerate.framework',
-  ],
-  visibility = ['PUBLIC'],
-)
-
-apple_library(
-  name = 'PINRemoteImage',
-  deps = [
-    ':PINRemoteImage-FLAnimatedImage',
-    ':PINRemoteImage-PINCache'
-  ],
-  visibility = ['PUBLIC'],
-)
-
-#####################################
-# Other PINRemoteImage targets
-#####################################
-apple_library(
-  name = 'PINRemoteImage-FLAnimatedImage',
-  header_path_prefix = 'PINRemoteImage',
-  exported_headers = FLANIMATEDIMAGE_HEADER_FILES,
-  srcs = FLANIMATEDIMAGE_SOURCE_FILES,
-  preprocessor_flags = COMMON_PREPROCESSOR_FLAGS,
-  deps = [
-    ':PINRemoteImage-Core',
-    '//Pods/FLAnimatedImage:FLAnimatedImage'
-  ],
-  visibility = ['PUBLIC'],
-)
-
-apple_library(
-  name = 'PINRemoteImage-PINCache',
-  header_path_prefix = 'PINRemoteImage',
-  exported_headers = PINCACHE_HEADER_FILES,
-  srcs = PINCACHE_SOURCE_FILES,
-  preprocessor_flags = COMMON_PREPROCESSOR_FLAGS,
-  deps = [
-    ':PINRemoteImage-Core',
-    '//Pods/PINCache:PINCache'
-  ],
-  visibility = ['PUBLIC'],
-)
-
-#TODO WebP variants
diff --git a/submodules/AsyncDisplayKit/build.sh b/submodules/AsyncDisplayKit/build.sh
deleted file mode 100755
index e866f305af..0000000000
--- a/submodules/AsyncDisplayKit/build.sh
+++ /dev/null
@@ -1,212 +0,0 @@
-#!/bin/bash
-
-PLATFORM="${TEXTURE_BUILD_PLATFORM:-platform=iOS Simulator,OS=10.2,name=iPhone 7}"
-SDK="${TEXTURE_BUILD_SDK:-iphonesimulator11.4}"
-DERIVED_DATA_PATH="~/ASDKDerivedData"
-
-# It is pitch black.
-set -e
-function trap_handler {
-    echo -e "\n\nOh no! You walked directly into the slavering fangs of a lurking grue!"
-    echo "**** You have died ****"
-    exit 255
-}
-trap trap_handler INT TERM EXIT
-
-# Derived data handling
-eval [ ! -d $DERIVED_DATA_PATH ] && eval mkdir $DERIVED_DATA_PATH
-function clean_derived_data {
-    eval find $DERIVED_DATA_PATH -mindepth 1 -delete
-}
-
-# Build example
-function build_example {
-    example="$1"
-
-    clean_derived_data
-    
-    if [ -f "${example}/Podfile" ]; then
-        echo "Using CocoaPods"
-        if [ -f "${example}/Podfile.lock" ]; then
-            rm "$example/Podfile.lock"
-        fi
-        rm -rf "$example/Pods"
-        pod install --project-directory=$example
-
-        set -o pipefail && xcodebuild \
-            -workspace "${example}/Sample.xcworkspace" \
-            -scheme Sample \
-            -sdk "$SDK" \
-            -destination "$PLATFORM" \
-            -derivedDataPath "$DERIVED_DATA_PATH" \
-            build | xcpretty $FORMATTER
-    elif [ -f "${example}/Cartfile" ]; then
-        echo "Using Carthage"
-        local_repo=`pwd`
-        current_branch=`git rev-parse --abbrev-ref HEAD`
-        cd $example
-
-        echo "git \"file://${local_repo}\" \"${current_branch}\"" > "Cartfile"
-        carthage update --platform iOS
-
-        set -o pipefail && xcodebuild \
-            -project "Sample.xcodeproj" \
-            -scheme Sample \
-            -sdk "$SDK" \
-            -destination "$PLATFORM" \
-            build | xcpretty $FORMATTER
-
-        cd ../..
-    fi
-}
-
-MODE="$1"
-
-if type xcpretty-travis-formatter &> /dev/null; then
-    FORMATTER="-f $(xcpretty-travis-formatter)"
-  else
-    FORMATTER="-s"
-fi
-
-if [ "$MODE" = "tests" -o "$MODE" = "all" ]; then
-    echo "Building & testing AsyncDisplayKit."
-    pod install
-    set -o pipefail && xcodebuild \
-        -workspace AsyncDisplayKit.xcworkspace \
-        -scheme AsyncDisplayKit \
-        -sdk "$SDK" \
-        -destination "$PLATFORM" \
-        build-for-testing test | xcpretty $FORMATTER
-    success="1"
-fi
-
-if [ "$MODE" = "tests_listkit" ]; then
-    echo "Building & testing AsyncDisplayKit+IGListKit."
-    pod install --project-directory=SubspecWorkspaces/ASDKListKit
-    set -o pipefail && xcodebuild \
-        -workspace SubspecWorkspaces/ASDKListKit/ASDKListKit.xcworkspace \
-        -scheme ASDKListKitTests \
-        -sdk "$SDK" \
-        -destination "$PLATFORM" \
-        build-for-testing test | xcpretty $FORMATTER
-    success="1"
-fi
-
-if [ "$MODE" = "examples" -o "$MODE" = "all" ]; then
-    echo "Verifying that all AsyncDisplayKit examples compile."
-    #Update cocoapods repo
-    pod repo update master
-
-    for example in examples/*/; do
-        echo "Building (examples) $example."
-
-        build_example $example
-    done
-    success="1"
-fi
-
-if [ "$MODE" = "examples-pt1" ]; then
-    echo "Verifying that all AsyncDisplayKit examples compile."
-    #Update cocoapods repo
-    pod repo update master
-
-    for example in $((find ./examples -type d -maxdepth 1 \( ! -iname ".*" \)) | head -6 | head); do
-        echo "Building (examples-pt1) $example."
-
-        build_example $example
-    done
-    success="1"
-fi
-
-if [ "$MODE" = "examples-pt2" ]; then
-    echo "Verifying that all AsyncDisplayKit examples compile."
-    #Update cocoapods repo
-    pod repo update master
-
-    for example in $((find ./examples -type d -maxdepth 1 \( ! -iname ".*" \)) | head -12 | tail -6 | head); do
-        echo "Building $example (examples-pt2)."
-
-        build_example $example
-    done
-    success="1"
-fi
-
-if [ "$MODE" = "examples-pt3" ]; then
-    echo "Verifying that all AsyncDisplayKit examples compile."
-    #Update cocoapods repo
-    pod repo update master
-
-    for example in $((find ./examples -type d -maxdepth 1 \( ! -iname ".*" \)) | head -7 | head); do
-        echo "Building $example (examples-pt3)."
-
-        build_example $example
-    done
-    success="1"
-fi
-
-if [ "$MODE" = "examples-extra" ]; then
-    echo "Verifying that all AsyncDisplayKit examples compile."
-    #Update cocoapods repo
-    pod repo update master
-
-    for example in $((find ./examples_extra -type d -maxdepth 1 \( ! -iname ".*" \)) | head -7 | head); do
-        echo "Building $example (examples-extra)."
-
-        build_example $example
-    done
-    success="1"
-fi
-
-# Support building a specific example: sh build.sh example examples/ASDKLayoutTransition
-if [ "$MODE" = "example" ]; then
-    echo "Verifying that all AsyncDisplayKit examples compile."
-    #Update cocoapods repo
-    pod repo update master
-
-    build_example $2
-    success="1"
-fi
-
-if [ "$MODE" = "life-without-cocoapods" -o "$MODE" = "all" ]; then
-    echo "Verifying that AsyncDisplayKit functions as a static library."
-
-    set -o pipefail && xcodebuild \
-        -workspace "smoke-tests/Life Without CocoaPods/Life Without CocoaPods.xcworkspace" \
-        -scheme "Life Without CocoaPods" \
-        -sdk "$SDK" \
-        -destination "$PLATFORM" \
-        build | xcpretty $FORMATTER
-    success="1"
-fi
-
-if [ "$MODE" = "framework" -o "$MODE" = "all" ]; then
-    echo "Verifying that AsyncDisplayKit functions as a dynamic framework (for Swift/Carthage users)."
-
-    set -o pipefail && xcodebuild \
-        -project "smoke-tests/Framework/Sample.xcodeproj" \
-        -scheme Sample \
-        -sdk "$SDK" \
-        -destination "$PLATFORM" \
-        build | xcpretty $FORMATTER
-    success="1"
-fi
-
-if [ "$MODE" = "cocoapods-lint" -o "$MODE" = "all" ]; then
-    echo "Verifying that podspec lints."
-
-    set -o pipefail && pod env && pod lib lint --allow-warnings
-    success="1"
-fi
-
-if [ "$MODE" = "carthage" -o "$MODE" = "all" ]; then
-    echo "Verifying carthage works."
-    
-    set -o pipefail && carthage update && carthage build --no-skip-current
-fi
-
-if [ "$success" = "1" ]; then 
-  trap - EXIT
-  exit 0
-fi
-
-echo "Unrecognised mode '$MODE'."
diff --git a/submodules/AsyncDisplayKit/plans/LayoutDebugger/Overview.md b/submodules/AsyncDisplayKit/plans/LayoutDebugger/Overview.md
deleted file mode 100644
index 593cbb1a79..0000000000
--- a/submodules/AsyncDisplayKit/plans/LayoutDebugger/Overview.md
+++ /dev/null
@@ -1,43 +0,0 @@
-# Layout Debugger
-
-## Motivation
-
-The layout system is arguably one of the hardest parts to deal with in the framework.  There are many factors, such as constrained size range, preferred size and flex properties, that make a layout spec to behave in a certain way.  As a result, it's often hard to debug a layout, as well as to help debugging because we have to grab the whole context of the layout in order to pinpoint the problem at hand.  Currently we have a couple of tools to help address this issue, namely ASCII art string and the layout inspector project from @hannahmbanana.
-
-While the layout inspector project is definitely a step toward the right direction and was proven to be helpful, I think we can do a lot more.  One drawback of that project is that we didn't have a clear integration contract with the core components of the framework.  We ended up introducing lots of complexities to ASDisplayNode that were hard to reason and mantain.  Another problem is it was difficult to bootstrap the tool into existing code/layout.
-
-This project aims to provide a functional layout debugging solution that requires minimal change to the core framework, is easy to setup and works out-of-the-box on existing applications.  These will be achieved by building an extension framework that is hosted in a separate repository, integrates with Texture core and leverages Chrome DevTools.
-
-## Execution plan
-
-At first, we'll build on top of [PonyDebugger](https://github.com/square/PonyDebugger).  I played with it for a few hours and [the result](https://www.dropbox.com/s/8bcpdgogoewmox9/view%20debugger.mov?dl=0) looks promising.  The bottom line is that we'll implement a new `PDDomainController` that is inspired by `PDDOMDomainController` but is catered toward `ASLayoutElement`.  The controller should expose style properties, allow editting those properties and, as a result, support hot reloading.  It should also expose the constrained size passed to each element during the previous layout pass.
-
-Eventually, we'll possibly move away from PonyDebugger and implement our own framework due to a few reasons:
-
-1. PonyDebugger is not actively maintained.  That might be because it's considered a "done" project, although the amount of open issues may suggest otherwise.
-2. It's not easy to setup the environment, especially because of the [ponyd gateway server](https://github.com/square/PonyDebugger/tree/master/ponyd).  Ponyd is essentially a middleman that sits between the client code and Chrome DevTools.  It is implemented in Python and hosts its own version of DevTools.  Its bootstrap script is more or less broken.  It's not trivial (at least for me) to setup a working environment.  Instead, my limitted research showed that we can do better by letting the client app be a mDNS broadcaster and allowing Chrome DevTools to connect to it.  The workflow will be very straight-forward for developers, similar to [Stetho](https://facebook.github.io/stetho/)'s.  In addition, the whole project will be simpler because we don't need to maintain ponyd.
-3. It contains other features besides layout debugging, such as network monitoring and remote logging.  While they are absolutely useful, they are not in the scope of this project and add complexities to it.
-
-## Integration with Texture (core)
-
-As mentioned above, this framework will be a seperate project that integrates with Texture.  Most of the changes in Texture's components, like `ASLayoutElement`, `ASDisplayNode` and `ASLayoutSpec`s, will be implemented as extensions inside the debugger framework.  We'll try as much as we can to minimalize changes in Texture (core) that are needed to support this project.
-
-## Technical issues related to Texture (core)
-
-There are a few technical difficulties that we need to address:
-
-- Layout spec flattening:  Currently `ASDisplayNode` flattens its layout tree right after it receives an `ASLayout`.  As a result, `ASLayoutSpec` objects are discarded and are not available for inspecting/debugging.  My current solution is introducing a new `shouldSkipFlattening` flag that tells `ASDisplayNode` to keep its layout tree as is.  This flag defaults to `NO`.  In addition, we need to update `-layoutSublayouts` to skip any non-node objects in the tree.  We should avoid introducing runtime overheads to production code and projects that don't use the debugger.
-- Style properties overrding:  It's common for client code to set flex properties to subnodes inside `-layoutSpecThatFits:`.  Doing this will override any values set to these properties by the debugger right before a layout pass which is needed for these changes to be taken into account.  My current idea is adding a special `style` object that is loaded once from the exising object and can be changed by the debugger.  This special object will be preferred over the built-in one when it's time to calculate a new layout.
-- Manual layout is not supported:  Layouts that are done manually (via `-calculateSizeThatFits:` and `-layout`) can't be updated by the debugger.  Nodes inside these layouts are still available for inspecting though.
-
-## Long-term ideas
-
-Once we have a functional debugger with a solid foundation, we can start exploring below ideas:
-
-- Remote debugging:  Since the client app is a mDNS broadcaster, I *think* it's possible to support remote debugging as well as pair programming: "I have a layout issue" "Let me connect to your runtime and inspect it".  Crazy I know!  Inspired by this [Chrome extension](https://github.com/auchenberg/devtools-remote).
-- Layout spec injecting:  We may try to abstract `-layoutSpecThatFits:` in such a way that the entire layout specification of a node is not only defined within the class but can be loaded (or manipulated) elsewhere, be it from the debugger or even a backend server.
-
-## Naming
-
-I'm planning to call this project "Texture Debugger".  It'll be a suite of debugging tools tailored mainly for Texture framework.
-
diff --git a/submodules/AsyncDisplayKit/run_tests_update_status.sh b/submodules/AsyncDisplayKit/run_tests_update_status.sh
deleted file mode 100755
index 3f457c07ce..0000000000
--- a/submodules/AsyncDisplayKit/run_tests_update_status.sh
+++ /dev/null
@@ -1,44 +0,0 @@
-#!/usr/bin/env bash
-set -eo pipefail
-
-UPDATE_STATUS_PATH=$1
-BUILDKITE_PULL_REQUEST=$2
-BUILDKITE_BUILD_URL=$3
-
-function updateStatus() {
-  if [ "${BUILDKITE_PULL_REQUEST}" != "false" ] ; then
-    ${UPDATE_STATUS_PATH} "TextureGroup" "Texture" ${BUILDKITE_PULL_REQUEST} "$1" ${BUILDKITE_BUILD_URL} "$2" "CI/Pinterest" "$3"
-  fi
-}
-
-if [[ -z "${UPDATE_STATUS_PATH}" || -z "${BUILDKITE_PULL_REQUEST}" || -z "${BUILDKITE_BUILD_URL}" ]] ; then
-    echo "Update status path (${UPDATE_STATUS_PATH}), pull request (${BUILDKITE_BUILD_URL}) or build url (${BUILDKITE_PULL_REQUEST}) unset."
-    trap - EXIT
-    exit 255
-fi
-
-trapped="false"
-function trap_handler() {
-    if [[ "$trapped" = "false" ]]; then
-        updateStatus "failure" "Tests failed…" `pwd`/log.txt
-        echo "Tests failed, updated status to failure"
-        rm `pwd`/log.txt
-    fi
-    trapped="true"
-}
-trap trap_handler INT TERM EXIT
-
-updateStatus "pending" "Starting build…"
-
-echo "--- Running Danger"
-bundle exec danger --verbose 2>&1|tee `pwd`/log.txt
-
-./build.sh all 2>&1|tee `pwd`/log.txt
-
-rm `pwd`/log.txt
-
-updateStatus "success" "Tests passed"
-
-echo "All tests succeeded, updated status to success"
-trap - EXIT
-exit 0
\ No newline at end of file
diff --git a/submodules/AsyncDisplayKit/smoke-tests/Framework/Default-568h@2x.png b/submodules/AsyncDisplayKit/smoke-tests/Framework/Default-568h@2x.png
deleted file mode 100644
index 1547a98454..0000000000
Binary files a/submodules/AsyncDisplayKit/smoke-tests/Framework/Default-568h@2x.png and /dev/null differ
diff --git a/submodules/AsyncDisplayKit/smoke-tests/Framework/Default-667h@2x.png b/submodules/AsyncDisplayKit/smoke-tests/Framework/Default-667h@2x.png
deleted file mode 100644
index 988ea56bab..0000000000
Binary files a/submodules/AsyncDisplayKit/smoke-tests/Framework/Default-667h@2x.png and /dev/null differ
diff --git a/submodules/AsyncDisplayKit/smoke-tests/Framework/Default-736h@3x.png b/submodules/AsyncDisplayKit/smoke-tests/Framework/Default-736h@3x.png
deleted file mode 100644
index d19eb325a2..0000000000
Binary files a/submodules/AsyncDisplayKit/smoke-tests/Framework/Default-736h@3x.png and /dev/null differ
diff --git a/submodules/AsyncDisplayKit/smoke-tests/Framework/README.md b/submodules/AsyncDisplayKit/smoke-tests/Framework/README.md
deleted file mode 100644
index cce2cb22fb..0000000000
--- a/submodules/AsyncDisplayKit/smoke-tests/Framework/README.md
+++ /dev/null
@@ -1,11 +0,0 @@
-# "Framework"
-
-This is a very simple pseudo-"integration test" project that links against
-AsyncDisplayKit as a dynamic framework, for Swift/Carthage users.  
-
-If it fails to compile, Travis CI builds will fail.  To escape from such dire straits:
-
-* If you've added a new class intended for public use, make sure you added its
-  header to the "Public" group of the "Headers" build phase in the
-  AsyncDisplayKit-iOS framework target.  Note that this smoke test will only fail
-  if you remembered to add your new file to the umbrella helper.
diff --git a/submodules/AsyncDisplayKit/smoke-tests/Framework/Sample/AppDelegate.swift b/submodules/AsyncDisplayKit/smoke-tests/Framework/Sample/AppDelegate.swift
deleted file mode 100644
index a2c10adbba..0000000000
--- a/submodules/AsyncDisplayKit/smoke-tests/Framework/Sample/AppDelegate.swift
+++ /dev/null
@@ -1,26 +0,0 @@
-//
-//  AppDelegate.swift
-//  Texture
-//
-//  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.
-//  Changes after 4/13/2017 are: Copyright (c) Pinterest, Inc.  All rights reserved.
-//  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
-//
-
-import UIKit
-
-@UIApplicationMain
-class AppDelegate: UIResponder, UIApplicationDelegate {
-
-  var window: UIWindow?
-
-  func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey: Any]?) -> Bool {
-    let window = UIWindow(frame: UIScreen.main.bounds)
-    window.backgroundColor = UIColor.white
-    window.rootViewController = ViewController(nibName: nil, bundle: nil)
-    window.makeKeyAndVisible()
-    self.window = window
-    return true
-  }
-
-}
diff --git a/submodules/AsyncDisplayKit/smoke-tests/Framework/Sample/Info.plist b/submodules/AsyncDisplayKit/smoke-tests/Framework/Sample/Info.plist
deleted file mode 100644
index fb4115c84c..0000000000
--- a/submodules/AsyncDisplayKit/smoke-tests/Framework/Sample/Info.plist
+++ /dev/null
@@ -1,36 +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>APPL</string>
-	<key>CFBundleShortVersionString</key>
-	<string>1.0</string>
-	<key>CFBundleSignature</key>
-	<string>????</string>
-	<key>CFBundleVersion</key>
-	<string>1</string>
-	<key>LSRequiresIPhoneOS</key>
-	<true/>
-	<key>UIRequiredDeviceCapabilities</key>
-	<array>
-		<string>armv7</string>
-	</array>
-	<key>UISupportedInterfaceOrientations</key>
-	<array>
-		<string>UIInterfaceOrientationPortrait</string>
-		<string>UIInterfaceOrientationLandscapeLeft</string>
-		<string>UIInterfaceOrientationLandscapeRight</string>
-	</array>
-</dict>
-</plist>
diff --git a/submodules/AsyncDisplayKit/smoke-tests/Framework/Sample/ViewController.swift b/submodules/AsyncDisplayKit/smoke-tests/Framework/Sample/ViewController.swift
deleted file mode 100644
index 9d96ac7477..0000000000
--- a/submodules/AsyncDisplayKit/smoke-tests/Framework/Sample/ViewController.swift
+++ /dev/null
@@ -1,61 +0,0 @@
-//
-//  ViewController.swift
-//  Texture
-//
-//  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.
-//  Changes after 4/13/2017 are: Copyright (c) Pinterest, Inc.  All rights reserved.
-//  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
-//
-
-import UIKit
-import AsyncDisplayKit
-
-class ViewController: UIViewController, ASTableDataSource, ASTableDelegate {
-
-  var tableNode: ASTableNode
-
-
-  // MARK: UIViewController.
-
-  override required init(nibName nibNameOrNil: String?, bundle nibBundleOrNil: Bundle?) {
-    self.tableNode = ASTableNode()
-
-    super.init(nibName: nil, bundle: nil)
-
-    self.tableNode.dataSource = self
-    self.tableNode.delegate = self
-  }
-
-  required init(coder aDecoder: NSCoder) {
-    fatalError("storyboards are incompatible with truth and beauty")
-  }
-
-  override func viewDidLoad() {
-    super.viewDidLoad()
-    self.view.addSubview(self.tableNode.view)
-  }
-
-  override func viewWillLayoutSubviews() {
-    self.tableNode.frame = self.view.bounds
-  }
-
-
-  // MARK: ASTableView data source and delegate.
-
-  func tableNode(_ tableNode: ASTableNode, nodeForRowAt indexPath: IndexPath) -> ASCellNode {
-    let patter = NSString(format: "[%ld.%ld] says hello!", indexPath.section, indexPath.row)
-    let node = ASTextCellNode()
-    node.text = patter as String
-
-    return node
-  }
-
-  func numberOfSections(in tableNode: ASTableNode) -> Int {
-    return 1
-  }
-
-  func tableNode(_ tableNode: ASTableNode, numberOfRowsInSection section: Int) -> Int {
-    return 20
-  }
-
-}
diff --git a/submodules/AsyncDisplayKit/smoke-tests/Life Without CocoaPods/Life With Frameworks/Assets.xcassets/AppIcon.appiconset/Contents.json b/submodules/AsyncDisplayKit/smoke-tests/Life Without CocoaPods/Life With Frameworks/Assets.xcassets/AppIcon.appiconset/Contents.json
deleted file mode 100644
index eeea76c2db..0000000000
--- a/submodules/AsyncDisplayKit/smoke-tests/Life Without CocoaPods/Life With Frameworks/Assets.xcassets/AppIcon.appiconset/Contents.json	
+++ /dev/null
@@ -1,73 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "iphone",
-      "size" : "29x29",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "iphone",
-      "size" : "29x29",
-      "scale" : "3x"
-    },
-    {
-      "idiom" : "iphone",
-      "size" : "40x40",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "iphone",
-      "size" : "40x40",
-      "scale" : "3x"
-    },
-    {
-      "idiom" : "iphone",
-      "size" : "60x60",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "iphone",
-      "size" : "60x60",
-      "scale" : "3x"
-    },
-    {
-      "idiom" : "ipad",
-      "size" : "29x29",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "ipad",
-      "size" : "29x29",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "ipad",
-      "size" : "40x40",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "ipad",
-      "size" : "40x40",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "ipad",
-      "size" : "76x76",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "ipad",
-      "size" : "76x76",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "ipad",
-      "size" : "83.5x83.5",
-      "scale" : "2x"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}
\ No newline at end of file
diff --git a/submodules/AsyncDisplayKit/smoke-tests/Life Without CocoaPods/Life With Frameworks/Base.lproj/LaunchScreen.storyboard b/submodules/AsyncDisplayKit/smoke-tests/Life Without CocoaPods/Life With Frameworks/Base.lproj/LaunchScreen.storyboard
deleted file mode 100644
index ebf48f6039..0000000000
--- a/submodules/AsyncDisplayKit/smoke-tests/Life Without CocoaPods/Life With Frameworks/Base.lproj/LaunchScreen.storyboard	
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="10117" systemVersion="15F34" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" initialViewController="01J-lp-oVM">
-    <dependencies>
-        <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="10085"/>
-    </dependencies>
-    <scenes>
-        <!--View Controller-->
-        <scene sceneID="EHf-IW-A2E">
-            <objects>
-                <viewController id="01J-lp-oVM" sceneMemberID="viewController">
-                    <layoutGuides>
-                        <viewControllerLayoutGuide type="top" id="Llm-lL-Icb"/>
-                        <viewControllerLayoutGuide type="bottom" id="xb3-aO-Qok"/>
-                    </layoutGuides>
-                    <view key="view" contentMode="scaleToFill" id="Ze5-6b-2t3">
-                        <rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
-                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                        <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
-                    </view>
-                </viewController>
-                <placeholder placeholderIdentifier="IBFirstResponder" id="iYj-Kq-Ea1" userLabel="First Responder" sceneMemberID="firstResponder"/>
-            </objects>
-            <point key="canvasLocation" x="53" y="375"/>
-        </scene>
-    </scenes>
-</document>
diff --git a/submodules/AsyncDisplayKit/smoke-tests/Life Without CocoaPods/Life With Frameworks/Info.plist b/submodules/AsyncDisplayKit/smoke-tests/Life Without CocoaPods/Life With Frameworks/Info.plist
deleted file mode 100644
index eabb3ae346..0000000000
--- a/submodules/AsyncDisplayKit/smoke-tests/Life Without CocoaPods/Life With Frameworks/Info.plist	
+++ /dev/null
@@ -1,45 +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>APPL</string>
-	<key>CFBundleShortVersionString</key>
-	<string>1.0</string>
-	<key>CFBundleSignature</key>
-	<string>????</string>
-	<key>CFBundleVersion</key>
-	<string>1</string>
-	<key>LSRequiresIPhoneOS</key>
-	<true/>
-	<key>UILaunchStoryboardName</key>
-	<string>LaunchScreen</string>
-	<key>UIRequiredDeviceCapabilities</key>
-	<array>
-		<string>armv7</string>
-	</array>
-	<key>UISupportedInterfaceOrientations</key>
-	<array>
-		<string>UIInterfaceOrientationPortrait</string>
-		<string>UIInterfaceOrientationLandscapeLeft</string>
-		<string>UIInterfaceOrientationLandscapeRight</string>
-	</array>
-	<key>UISupportedInterfaceOrientations~ipad</key>
-	<array>
-		<string>UIInterfaceOrientationPortrait</string>
-		<string>UIInterfaceOrientationPortraitUpsideDown</string>
-		<string>UIInterfaceOrientationLandscapeLeft</string>
-		<string>UIInterfaceOrientationLandscapeRight</string>
-	</array>
-</dict>
-</plist>
diff --git a/submodules/AsyncDisplayKit/smoke-tests/Life Without CocoaPods/Life With Frameworks/main.m b/submodules/AsyncDisplayKit/smoke-tests/Life Without CocoaPods/Life With Frameworks/main.m
deleted file mode 100644
index feb53cc3f7..0000000000
--- a/submodules/AsyncDisplayKit/smoke-tests/Life Without CocoaPods/Life With Frameworks/main.m	
+++ /dev/null
@@ -1,16 +0,0 @@
-//
-//  main.m
-//  Texture
-//
-//  Copyright (c) Pinterest, Inc.  All rights reserved.
-//  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
-//
-
-#import <UIKit/UIKit.h>
-#import "AppDelegate.h"
-
-int main(int argc, char * argv[]) {
-    @autoreleasepool {
-        return UIApplicationMain(argc, argv, nil, NSStringFromClass([AppDelegate class]));
-    }
-}
diff --git a/submodules/AsyncDisplayKit/smoke-tests/Life Without CocoaPods/Life Without CocoaPods.xcodeproj/project.pbxproj b/submodules/AsyncDisplayKit/smoke-tests/Life Without CocoaPods/Life Without CocoaPods.xcodeproj/project.pbxproj
deleted file mode 100644
index dd795b7545..0000000000
--- a/submodules/AsyncDisplayKit/smoke-tests/Life Without CocoaPods/Life Without CocoaPods.xcodeproj/project.pbxproj	
+++ /dev/null
@@ -1,555 +0,0 @@
-// !$*UTF8*$!
-{
-	archiveVersion = 1;
-	classes = {
-	};
-	objectVersion = 46;
-	objects = {
-
-/* Begin PBXBuildFile section */
-		058968F51ABCE06E0059CE2A /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 058968F41ABCE06E0059CE2A /* main.m */; };
-		058968F81ABCE06E0059CE2A /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 058968F71ABCE06E0059CE2A /* AppDelegate.m */; };
-		058968FB1ABCE06E0059CE2A /* ViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 058968FA1ABCE06E0059CE2A /* ViewController.m */; };
-		0589691B1ABCE0E80059CE2A /* Default-568h@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 058969181ABCE0E80059CE2A /* Default-568h@2x.png */; };
-		0589691C1ABCE0E80059CE2A /* Default-667h@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 058969191ABCE0E80059CE2A /* Default-667h@2x.png */; };
-		0589691D1ABCE0E80059CE2A /* Default-736h@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = 0589691A1ABCE0E80059CE2A /* Default-736h@3x.png */; };
-		0589692A1ABCE17C0059CE2A /* AssetsLibrary.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 058969291ABCE17C0059CE2A /* AssetsLibrary.framework */; };
-		0589692C1ABCE1820059CE2A /* Photos.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0589692B1ABCE1820059CE2A /* Photos.framework */; };
-		92DD2FEC1BF4D8BB0074C9DD /* MapKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 92DD2FEB1BF4D8BB0074C9DD /* MapKit.framework */; };
-		F729B8BB1D2E176700C9EDBC /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = F729B8BA1D2E176700C9EDBC /* main.m */; };
-		F729B8C61D2E176700C9EDBC /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = F729B8C51D2E176700C9EDBC /* Assets.xcassets */; };
-		F729B8C91D2E176700C9EDBC /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = F729B8C71D2E176700C9EDBC /* LaunchScreen.storyboard */; };
-		F729B8D11D2E17A300C9EDBC /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 058968F71ABCE06E0059CE2A /* AppDelegate.m */; };
-		F729B8D21D2E17A300C9EDBC /* ViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 058968FA1ABCE06E0059CE2A /* ViewController.m */; };
-		F7CE6CB61D2CE00800BE4C15 /* AsyncDisplayKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F7CE6CAD1D2CDFFB00BE4C15 /* AsyncDisplayKit.framework */; };
-/* End PBXBuildFile section */
-
-/* Begin PBXContainerItemProxy section */
-		F729B8D51D2E17C800C9EDBC /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = F7CE6CA51D2CDFFB00BE4C15 /* AsyncDisplayKit.xcodeproj */;
-			proxyType = 1;
-			remoteGlobalIDString = B35061D91B010EDF0018CF92;
-			remoteInfo = "AsyncDisplayKit-iOS";
-		};
-		F7CE6CAC1D2CDFFB00BE4C15 /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = F7CE6CA51D2CDFFB00BE4C15 /* AsyncDisplayKit.xcodeproj */;
-			proxyType = 2;
-			remoteGlobalIDString = 058D09AC195D04C000B7D73C;
-			remoteInfo = AsyncDisplayKit;
-		};
-		F7CE6CAE1D2CDFFB00BE4C15 /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = F7CE6CA51D2CDFFB00BE4C15 /* AsyncDisplayKit.xcodeproj */;
-			proxyType = 2;
-			remoteGlobalIDString = 058D09BC195D04C000B7D73C;
-			remoteInfo = AsyncDisplayKitTests;
-		};
-		F7CE6CB01D2CDFFB00BE4C15 /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = F7CE6CA51D2CDFFB00BE4C15 /* AsyncDisplayKit.xcodeproj */;
-			proxyType = 2;
-			remoteGlobalIDString = 057D02BF1AC0A66700C7AC3C;
-			remoteInfo = AsyncDisplayKitTestHost;
-		};
-		F7CE6CB41D2CE00300BE4C15 /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = F7CE6CA51D2CDFFB00BE4C15 /* AsyncDisplayKit.xcodeproj */;
-			proxyType = 1;
-			remoteGlobalIDString = B35061D91B010EDF0018CF92;
-			remoteInfo = AsyncDisplayKit;
-		};
-/* End PBXContainerItemProxy section */
-
-/* Begin PBXCopyFilesBuildPhase section */
-		F729B8D71D2E17C800C9EDBC /* Embed Frameworks */ = {
-			isa = PBXCopyFilesBuildPhase;
-			buildActionMask = 2147483647;
-			dstPath = "";
-			dstSubfolderSpec = 10;
-			files = (
-			);
-			name = "Embed Frameworks";
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-/* End PBXCopyFilesBuildPhase section */
-
-/* Begin PBXFileReference section */
-		058968EF1ABCE06E0059CE2A /* Life Without CocoaPods.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "Life Without CocoaPods.app"; sourceTree = BUILT_PRODUCTS_DIR; };
-		058968F31ABCE06E0059CE2A /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
-		058968F41ABCE06E0059CE2A /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
-		058968F61ABCE06E0059CE2A /* AppDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = "<group>"; };
-		058968F71ABCE06E0059CE2A /* AppDelegate.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = "<group>"; };
-		058968F91ABCE06E0059CE2A /* ViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ViewController.h; sourceTree = "<group>"; };
-		058968FA1ABCE06E0059CE2A /* ViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ViewController.m; sourceTree = "<group>"; };
-		058969181ABCE0E80059CE2A /* Default-568h@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Default-568h@2x.png"; sourceTree = "<group>"; };
-		058969191ABCE0E80059CE2A /* Default-667h@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Default-667h@2x.png"; sourceTree = "<group>"; };
-		0589691A1ABCE0E80059CE2A /* Default-736h@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Default-736h@3x.png"; sourceTree = "<group>"; };
-		058969291ABCE17C0059CE2A /* AssetsLibrary.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AssetsLibrary.framework; path = System/Library/Frameworks/AssetsLibrary.framework; sourceTree = SDKROOT; };
-		0589692B1ABCE1820059CE2A /* Photos.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Photos.framework; path = System/Library/Frameworks/Photos.framework; sourceTree = SDKROOT; };
-		92DD2FEB1BF4D8BB0074C9DD /* MapKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = MapKit.framework; path = System/Library/Frameworks/MapKit.framework; sourceTree = SDKROOT; };
-		F729B8B71D2E176700C9EDBC /* Life With Frameworks.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "Life With Frameworks.app"; sourceTree = BUILT_PRODUCTS_DIR; };
-		F729B8BA1D2E176700C9EDBC /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
-		F729B8C51D2E176700C9EDBC /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
-		F729B8C81D2E176700C9EDBC /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
-		F729B8CA1D2E176700C9EDBC /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
-		F7CE6CA51D2CDFFB00BE4C15 /* AsyncDisplayKit.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = AsyncDisplayKit.xcodeproj; path = ../../AsyncDisplayKit.xcodeproj; sourceTree = "<group>"; };
-/* End PBXFileReference section */
-
-/* Begin PBXFrameworksBuildPhase section */
-		058968EC1ABCE06E0059CE2A /* Frameworks */ = {
-			isa = PBXFrameworksBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				F7CE6CB61D2CE00800BE4C15 /* AsyncDisplayKit.framework in Frameworks */,
-				92DD2FEC1BF4D8BB0074C9DD /* MapKit.framework in Frameworks */,
-				0589692C1ABCE1820059CE2A /* Photos.framework in Frameworks */,
-				0589692A1ABCE17C0059CE2A /* AssetsLibrary.framework in Frameworks */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		F729B8B41D2E176700C9EDBC /* Frameworks */ = {
-			isa = PBXFrameworksBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-/* End PBXFrameworksBuildPhase section */
-
-/* Begin PBXGroup section */
-		058968E61ABCE06E0059CE2A = {
-			isa = PBXGroup;
-			children = (
-				92DD2FEB1BF4D8BB0074C9DD /* MapKit.framework */,
-				0589692B1ABCE1820059CE2A /* Photos.framework */,
-				058969291ABCE17C0059CE2A /* AssetsLibrary.framework */,
-				F7CE6CA51D2CDFFB00BE4C15 /* AsyncDisplayKit.xcodeproj */,
-				058968F11ABCE06E0059CE2A /* Life Without CocoaPods */,
-				F729B8B81D2E176700C9EDBC /* Life With Frameworks */,
-				058968F01ABCE06E0059CE2A /* Products */,
-			);
-			indentWidth = 2;
-			sourceTree = "<group>";
-			tabWidth = 2;
-			usesTabs = 0;
-		};
-		058968F01ABCE06E0059CE2A /* Products */ = {
-			isa = PBXGroup;
-			children = (
-				058968EF1ABCE06E0059CE2A /* Life Without CocoaPods.app */,
-				F729B8B71D2E176700C9EDBC /* Life With Frameworks.app */,
-			);
-			name = Products;
-			sourceTree = "<group>";
-		};
-		058968F11ABCE06E0059CE2A /* Life Without CocoaPods */ = {
-			isa = PBXGroup;
-			children = (
-				058968F61ABCE06E0059CE2A /* AppDelegate.h */,
-				058968F71ABCE06E0059CE2A /* AppDelegate.m */,
-				058968F91ABCE06E0059CE2A /* ViewController.h */,
-				058968FA1ABCE06E0059CE2A /* ViewController.m */,
-				058968F21ABCE06E0059CE2A /* Supporting Files */,
-			);
-			path = "Life Without CocoaPods";
-			sourceTree = "<group>";
-		};
-		058968F21ABCE06E0059CE2A /* Supporting Files */ = {
-			isa = PBXGroup;
-			children = (
-				058969181ABCE0E80059CE2A /* Default-568h@2x.png */,
-				058969191ABCE0E80059CE2A /* Default-667h@2x.png */,
-				0589691A1ABCE0E80059CE2A /* Default-736h@3x.png */,
-				058968F31ABCE06E0059CE2A /* Info.plist */,
-				058968F41ABCE06E0059CE2A /* main.m */,
-			);
-			name = "Supporting Files";
-			sourceTree = "<group>";
-		};
-		F729B8B81D2E176700C9EDBC /* Life With Frameworks */ = {
-			isa = PBXGroup;
-			children = (
-				F729B8C51D2E176700C9EDBC /* Assets.xcassets */,
-				F729B8C71D2E176700C9EDBC /* LaunchScreen.storyboard */,
-				F729B8CA1D2E176700C9EDBC /* Info.plist */,
-				F729B8B91D2E176700C9EDBC /* Supporting Files */,
-			);
-			path = "Life With Frameworks";
-			sourceTree = "<group>";
-		};
-		F729B8B91D2E176700C9EDBC /* Supporting Files */ = {
-			isa = PBXGroup;
-			children = (
-				F729B8BA1D2E176700C9EDBC /* main.m */,
-			);
-			name = "Supporting Files";
-			sourceTree = "<group>";
-		};
-		F7CE6CA61D2CDFFB00BE4C15 /* Products */ = {
-			isa = PBXGroup;
-			children = (
-				F7CE6CAD1D2CDFFB00BE4C15 /* AsyncDisplayKit.framework */,
-				F7CE6CAF1D2CDFFB00BE4C15 /* AsyncDisplayKitTests.xctest */,
-				F7CE6CB11D2CDFFB00BE4C15 /* AsyncDisplayKitTestHost.app */,
-			);
-			name = Products;
-			sourceTree = "<group>";
-		};
-/* End PBXGroup section */
-
-/* Begin PBXNativeTarget section */
-		058968EE1ABCE06E0059CE2A /* Life Without CocoaPods */ = {
-			isa = PBXNativeTarget;
-			buildConfigurationList = 058969121ABCE06E0059CE2A /* Build configuration list for PBXNativeTarget "Life Without CocoaPods" */;
-			buildPhases = (
-				058968EB1ABCE06E0059CE2A /* Sources */,
-				058968EC1ABCE06E0059CE2A /* Frameworks */,
-				058968ED1ABCE06E0059CE2A /* Resources */,
-			);
-			buildRules = (
-			);
-			dependencies = (
-				F7CE6CB51D2CE00300BE4C15 /* PBXTargetDependency */,
-			);
-			name = "Life Without CocoaPods";
-			productName = "Life Without CocoaPods";
-			productReference = 058968EF1ABCE06E0059CE2A /* Life Without CocoaPods.app */;
-			productType = "com.apple.product-type.application";
-		};
-		F729B8B61D2E176700C9EDBC /* Life With Frameworks */ = {
-			isa = PBXNativeTarget;
-			buildConfigurationList = F729B8D01D2E176700C9EDBC /* Build configuration list for PBXNativeTarget "Life With Frameworks" */;
-			buildPhases = (
-				F729B8B31D2E176700C9EDBC /* Sources */,
-				F729B8B41D2E176700C9EDBC /* Frameworks */,
-				F729B8B51D2E176700C9EDBC /* Resources */,
-				F729B8D71D2E17C800C9EDBC /* Embed Frameworks */,
-			);
-			buildRules = (
-			);
-			dependencies = (
-				F729B8D61D2E17C800C9EDBC /* PBXTargetDependency */,
-			);
-			name = "Life With Frameworks";
-			productName = "Life With Frameworks";
-			productReference = F729B8B71D2E176700C9EDBC /* Life With Frameworks.app */;
-			productType = "com.apple.product-type.application";
-		};
-/* End PBXNativeTarget section */
-
-/* Begin PBXProject section */
-		058968E71ABCE06E0059CE2A /* Project object */ = {
-			isa = PBXProject;
-			attributes = {
-				LastUpgradeCheck = 0730;
-				ORGANIZATIONNAME = Facebook;
-				TargetAttributes = {
-					058968EE1ABCE06E0059CE2A = {
-						CreatedOnToolsVersion = 6.2;
-					};
-					F729B8B61D2E176700C9EDBC = {
-						CreatedOnToolsVersion = 7.3.1;
-					};
-				};
-			};
-			buildConfigurationList = 058968EA1ABCE06E0059CE2A /* Build configuration list for PBXProject "Life Without CocoaPods" */;
-			compatibilityVersion = "Xcode 3.2";
-			developmentRegion = English;
-			hasScannedForEncodings = 0;
-			knownRegions = (
-				en,
-				Base,
-			);
-			mainGroup = 058968E61ABCE06E0059CE2A;
-			productRefGroup = 058968F01ABCE06E0059CE2A /* Products */;
-			projectDirPath = "";
-			projectReferences = (
-				{
-					ProductGroup = F7CE6CA61D2CDFFB00BE4C15 /* Products */;
-					ProjectRef = F7CE6CA51D2CDFFB00BE4C15 /* AsyncDisplayKit.xcodeproj */;
-				},
-			);
-			projectRoot = "";
-			targets = (
-				058968EE1ABCE06E0059CE2A /* Life Without CocoaPods */,
-				F729B8B61D2E176700C9EDBC /* Life With Frameworks */,
-			);
-		};
-/* End PBXProject section */
-
-/* Begin PBXReferenceProxy section */
-		F7CE6CAD1D2CDFFB00BE4C15 /* AsyncDisplayKit.framework */ = {
-			isa = PBXReferenceProxy;
-			fileType = wrapper.framework;
-			path = AsyncDisplayKit.framework;
-			remoteRef = F7CE6CAC1D2CDFFB00BE4C15 /* PBXContainerItemProxy */;
-			sourceTree = BUILT_PRODUCTS_DIR;
-		};
-		F7CE6CAF1D2CDFFB00BE4C15 /* AsyncDisplayKitTests.xctest */ = {
-			isa = PBXReferenceProxy;
-			fileType = wrapper.cfbundle;
-			path = AsyncDisplayKitTests.xctest;
-			remoteRef = F7CE6CAE1D2CDFFB00BE4C15 /* PBXContainerItemProxy */;
-			sourceTree = BUILT_PRODUCTS_DIR;
-		};
-		F7CE6CB11D2CDFFB00BE4C15 /* AsyncDisplayKitTestHost.app */ = {
-			isa = PBXReferenceProxy;
-			fileType = wrapper.application;
-			path = AsyncDisplayKitTestHost.app;
-			remoteRef = F7CE6CB01D2CDFFB00BE4C15 /* PBXContainerItemProxy */;
-			sourceTree = BUILT_PRODUCTS_DIR;
-		};
-/* End PBXReferenceProxy section */
-
-/* Begin PBXResourcesBuildPhase section */
-		058968ED1ABCE06E0059CE2A /* Resources */ = {
-			isa = PBXResourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				0589691B1ABCE0E80059CE2A /* Default-568h@2x.png in Resources */,
-				0589691C1ABCE0E80059CE2A /* Default-667h@2x.png in Resources */,
-				0589691D1ABCE0E80059CE2A /* Default-736h@3x.png in Resources */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		F729B8B51D2E176700C9EDBC /* Resources */ = {
-			isa = PBXResourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				F729B8C91D2E176700C9EDBC /* LaunchScreen.storyboard in Resources */,
-				F729B8C61D2E176700C9EDBC /* Assets.xcassets in Resources */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-/* End PBXResourcesBuildPhase section */
-
-/* Begin PBXSourcesBuildPhase section */
-		058968EB1ABCE06E0059CE2A /* Sources */ = {
-			isa = PBXSourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				058968FB1ABCE06E0059CE2A /* ViewController.m in Sources */,
-				058968F81ABCE06E0059CE2A /* AppDelegate.m in Sources */,
-				058968F51ABCE06E0059CE2A /* main.m in Sources */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		F729B8B31D2E176700C9EDBC /* Sources */ = {
-			isa = PBXSourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				F729B8D21D2E17A300C9EDBC /* ViewController.m in Sources */,
-				F729B8D11D2E17A300C9EDBC /* AppDelegate.m in Sources */,
-				F729B8BB1D2E176700C9EDBC /* main.m in Sources */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-/* End PBXSourcesBuildPhase section */
-
-/* Begin PBXTargetDependency section */
-		F729B8D61D2E17C800C9EDBC /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			name = "AsyncDisplayKit-iOS";
-			targetProxy = F729B8D51D2E17C800C9EDBC /* PBXContainerItemProxy */;
-		};
-		F7CE6CB51D2CE00300BE4C15 /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			name = AsyncDisplayKit;
-			targetProxy = F7CE6CB41D2CE00300BE4C15 /* PBXContainerItemProxy */;
-		};
-/* End PBXTargetDependency section */
-
-/* Begin PBXVariantGroup section */
-		F729B8C71D2E176700C9EDBC /* LaunchScreen.storyboard */ = {
-			isa = PBXVariantGroup;
-			children = (
-				F729B8C81D2E176700C9EDBC /* Base */,
-			);
-			name = LaunchScreen.storyboard;
-			sourceTree = "<group>";
-		};
-/* End PBXVariantGroup section */
-
-/* Begin XCBuildConfiguration section */
-		058969101ABCE06E0059CE2A /* Debug */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				ALWAYS_SEARCH_USER_PATHS = NO;
-				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
-				CLANG_CXX_LIBRARY = "libc++";
-				CLANG_ENABLE_MODULES = YES;
-				CLANG_ENABLE_OBJC_ARC = YES;
-				CLANG_WARN_BOOL_CONVERSION = YES;
-				CLANG_WARN_CONSTANT_CONVERSION = YES;
-				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
-				CLANG_WARN_EMPTY_BODY = YES;
-				CLANG_WARN_ENUM_CONVERSION = YES;
-				CLANG_WARN_INT_CONVERSION = YES;
-				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
-				CLANG_WARN_UNREACHABLE_CODE = YES;
-				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
-				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
-				COPY_PHASE_STRIP = NO;
-				ENABLE_STRICT_OBJC_MSGSEND = YES;
-				ENABLE_TESTABILITY = YES;
-				GCC_C_LANGUAGE_STANDARD = gnu99;
-				GCC_DYNAMIC_NO_PIC = NO;
-				GCC_GENERATE_TEST_COVERAGE_FILES = YES;
-				GCC_INSTRUMENT_PROGRAM_FLOW_ARCS = YES;
-				GCC_OPTIMIZATION_LEVEL = 0;
-				GCC_PREPROCESSOR_DEFINITIONS = (
-					"DEBUG=1",
-					"$(inherited)",
-				);
-				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
-				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
-				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
-				GCC_WARN_UNDECLARED_SELECTOR = YES;
-				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
-				GCC_WARN_UNUSED_FUNCTION = YES;
-				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
-				MTL_ENABLE_DEBUG_INFO = YES;
-				ONLY_ACTIVE_ARCH = YES;
-				SDKROOT = iphoneos;
-			};
-			name = Debug;
-		};
-		058969111ABCE06E0059CE2A /* Release */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				ALWAYS_SEARCH_USER_PATHS = NO;
-				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
-				CLANG_CXX_LIBRARY = "libc++";
-				CLANG_ENABLE_MODULES = YES;
-				CLANG_ENABLE_OBJC_ARC = YES;
-				CLANG_WARN_BOOL_CONVERSION = YES;
-				CLANG_WARN_CONSTANT_CONVERSION = YES;
-				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
-				CLANG_WARN_EMPTY_BODY = YES;
-				CLANG_WARN_ENUM_CONVERSION = YES;
-				CLANG_WARN_INT_CONVERSION = YES;
-				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
-				CLANG_WARN_UNREACHABLE_CODE = YES;
-				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
-				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
-				COPY_PHASE_STRIP = NO;
-				ENABLE_NS_ASSERTIONS = NO;
-				ENABLE_STRICT_OBJC_MSGSEND = YES;
-				GCC_C_LANGUAGE_STANDARD = gnu99;
-				GCC_GENERATE_TEST_COVERAGE_FILES = YES;
-				GCC_INSTRUMENT_PROGRAM_FLOW_ARCS = YES;
-				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
-				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
-				GCC_WARN_UNDECLARED_SELECTOR = YES;
-				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
-				GCC_WARN_UNUSED_FUNCTION = YES;
-				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
-				MTL_ENABLE_DEBUG_INFO = NO;
-				SDKROOT = iphoneos;
-				VALIDATE_PRODUCT = YES;
-			};
-			name = Release;
-		};
-		058969131ABCE06E0059CE2A /* Debug */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
-				INFOPLIST_FILE = "Life Without CocoaPods/Info.plist";
-				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				LIBRARY_SEARCH_PATHS = "$(inherited)";
-				OTHER_LDFLAGS = (
-					"-ObjC",
-					"-lc++",
-				);
-				PRODUCT_BUNDLE_IDENTIFIER = "com.facebook.$(PRODUCT_NAME:rfc1034identifier)";
-				PRODUCT_NAME = "$(TARGET_NAME)";
-			};
-			name = Debug;
-		};
-		058969141ABCE06E0059CE2A /* Release */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
-				INFOPLIST_FILE = "Life Without CocoaPods/Info.plist";
-				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				LIBRARY_SEARCH_PATHS = "$(inherited)";
-				OTHER_LDFLAGS = (
-					"-ObjC",
-					"-lc++",
-				);
-				PRODUCT_BUNDLE_IDENTIFIER = "com.facebook.$(PRODUCT_NAME:rfc1034identifier)";
-				PRODUCT_NAME = "$(TARGET_NAME)";
-			};
-			name = Release;
-		};
-		F729B8CB1D2E176700C9EDBC /* Debug */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
-				CLANG_ANALYZER_NONNULL = YES;
-				DEBUG_INFORMATION_FORMAT = dwarf;
-				ENABLE_TESTABILITY = YES;
-				GCC_NO_COMMON_BLOCKS = YES;
-				INFOPLIST_FILE = "Life With Frameworks/Info.plist";
-				IPHONEOS_DEPLOYMENT_TARGET = 9.3;
-				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				PRODUCT_BUNDLE_IDENTIFIER = "com.facebook.Life-With-Frameworks";
-				PRODUCT_NAME = "$(TARGET_NAME)";
-				TARGETED_DEVICE_FAMILY = "1,2";
-			};
-			name = Debug;
-		};
-		F729B8CC1D2E176700C9EDBC /* Release */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
-				CLANG_ANALYZER_NONNULL = YES;
-				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
-				GCC_NO_COMMON_BLOCKS = YES;
-				INFOPLIST_FILE = "Life With Frameworks/Info.plist";
-				IPHONEOS_DEPLOYMENT_TARGET = 9.3;
-				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				PRODUCT_BUNDLE_IDENTIFIER = "com.facebook.Life-With-Frameworks";
-				PRODUCT_NAME = "$(TARGET_NAME)";
-				TARGETED_DEVICE_FAMILY = "1,2";
-			};
-			name = Release;
-		};
-/* End XCBuildConfiguration section */
-
-/* Begin XCConfigurationList section */
-		058968EA1ABCE06E0059CE2A /* Build configuration list for PBXProject "Life Without CocoaPods" */ = {
-			isa = XCConfigurationList;
-			buildConfigurations = (
-				058969101ABCE06E0059CE2A /* Debug */,
-				058969111ABCE06E0059CE2A /* Release */,
-			);
-			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Release;
-		};
-		058969121ABCE06E0059CE2A /* Build configuration list for PBXNativeTarget "Life Without CocoaPods" */ = {
-			isa = XCConfigurationList;
-			buildConfigurations = (
-				058969131ABCE06E0059CE2A /* Debug */,
-				058969141ABCE06E0059CE2A /* Release */,
-			);
-			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Release;
-		};
-		F729B8D01D2E176700C9EDBC /* Build configuration list for PBXNativeTarget "Life With Frameworks" */ = {
-			isa = XCConfigurationList;
-			buildConfigurations = (
-				F729B8CB1D2E176700C9EDBC /* Debug */,
-				F729B8CC1D2E176700C9EDBC /* Release */,
-			);
-			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Release;
-		};
-/* End XCConfigurationList section */
-	};
-	rootObject = 058968E71ABCE06E0059CE2A /* Project object */;
-}
diff --git a/submodules/AsyncDisplayKit/smoke-tests/Life Without CocoaPods/Life Without CocoaPods.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/submodules/AsyncDisplayKit/smoke-tests/Life Without CocoaPods/Life Without CocoaPods.xcodeproj/project.xcworkspace/contents.xcworkspacedata
deleted file mode 100644
index a9e8c819ee..0000000000
--- a/submodules/AsyncDisplayKit/smoke-tests/Life Without CocoaPods/Life Without CocoaPods.xcodeproj/project.xcworkspace/contents.xcworkspacedata	
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Workspace
-   version = "1.0">
-   <FileRef
-      location = "self:Life Without CocoaPods.xcodeproj">
-   </FileRef>
-</Workspace>
diff --git a/submodules/AsyncDisplayKit/smoke-tests/Life Without CocoaPods/Life Without CocoaPods.xcodeproj/xcshareddata/xcschemes/Life Without CocoaPods.xcscheme b/submodules/AsyncDisplayKit/smoke-tests/Life Without CocoaPods/Life Without CocoaPods.xcodeproj/xcshareddata/xcschemes/Life Without CocoaPods.xcscheme
deleted file mode 100644
index 2abacce743..0000000000
--- a/submodules/AsyncDisplayKit/smoke-tests/Life Without CocoaPods/Life Without CocoaPods.xcodeproj/xcshareddata/xcschemes/Life Without CocoaPods.xcscheme	
+++ /dev/null
@@ -1,91 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Scheme
-   LastUpgradeVersion = "0730"
-   version = "1.3">
-   <BuildAction
-      parallelizeBuildables = "YES"
-      buildImplicitDependencies = "YES">
-      <BuildActionEntries>
-         <BuildActionEntry
-            buildForTesting = "YES"
-            buildForRunning = "YES"
-            buildForProfiling = "YES"
-            buildForArchiving = "YES"
-            buildForAnalyzing = "YES">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "058968EE1ABCE06E0059CE2A"
-               BuildableName = "Life Without CocoaPods.app"
-               BlueprintName = "Life Without CocoaPods"
-               ReferencedContainer = "container:Life Without CocoaPods.xcodeproj">
-            </BuildableReference>
-         </BuildActionEntry>
-      </BuildActionEntries>
-   </BuildAction>
-   <TestAction
-      buildConfiguration = "Debug"
-      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
-      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      shouldUseLaunchSchemeArgsEnv = "YES">
-      <Testables>
-      </Testables>
-      <MacroExpansion>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "058968EE1ABCE06E0059CE2A"
-            BuildableName = "Life Without CocoaPods.app"
-            BlueprintName = "Life Without CocoaPods"
-            ReferencedContainer = "container:Life Without CocoaPods.xcodeproj">
-         </BuildableReference>
-      </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
-   </TestAction>
-   <LaunchAction
-      buildConfiguration = "Debug"
-      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
-      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      launchStyle = "0"
-      useCustomWorkingDirectory = "NO"
-      ignoresPersistentStateOnLaunch = "NO"
-      debugDocumentVersioning = "YES"
-      debugServiceExtension = "internal"
-      allowLocationSimulation = "YES">
-      <BuildableProductRunnable
-         runnableDebuggingMode = "0">
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "058968EE1ABCE06E0059CE2A"
-            BuildableName = "Life Without CocoaPods.app"
-            BlueprintName = "Life Without CocoaPods"
-            ReferencedContainer = "container:Life Without CocoaPods.xcodeproj">
-         </BuildableReference>
-      </BuildableProductRunnable>
-      <AdditionalOptions>
-      </AdditionalOptions>
-   </LaunchAction>
-   <ProfileAction
-      buildConfiguration = "Release"
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      savedToolIdentifier = ""
-      useCustomWorkingDirectory = "NO"
-      debugDocumentVersioning = "YES">
-      <BuildableProductRunnable
-         runnableDebuggingMode = "0">
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "058968EE1ABCE06E0059CE2A"
-            BuildableName = "Life Without CocoaPods.app"
-            BlueprintName = "Life Without CocoaPods"
-            ReferencedContainer = "container:Life Without CocoaPods.xcodeproj">
-         </BuildableReference>
-      </BuildableProductRunnable>
-   </ProfileAction>
-   <AnalyzeAction
-      buildConfiguration = "Debug">
-   </AnalyzeAction>
-   <ArchiveAction
-      buildConfiguration = "Release"
-      revealArchiveInOrganizer = "YES">
-   </ArchiveAction>
-</Scheme>
diff --git a/submodules/AsyncDisplayKit/smoke-tests/Life Without CocoaPods/Life Without CocoaPods.xcworkspace/contents.xcworkspacedata b/submodules/AsyncDisplayKit/smoke-tests/Life Without CocoaPods/Life Without CocoaPods.xcworkspace/contents.xcworkspacedata
deleted file mode 100644
index b2fcbec3ec..0000000000
--- a/submodules/AsyncDisplayKit/smoke-tests/Life Without CocoaPods/Life Without CocoaPods.xcworkspace/contents.xcworkspacedata	
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Workspace
-   version = "1.0">
-   <FileRef
-      location = "container:Life Without CocoaPods.xcodeproj">
-   </FileRef>
-   <FileRef
-      location = "group:../../AsyncDisplayKit.xcodeproj">
-   </FileRef>
-</Workspace>
diff --git a/submodules/AsyncDisplayKit/smoke-tests/Life Without CocoaPods/Life Without CocoaPods/AppDelegate.h b/submodules/AsyncDisplayKit/smoke-tests/Life Without CocoaPods/Life Without CocoaPods/AppDelegate.h
deleted file mode 100644
index 75aff7fc14..0000000000
--- a/submodules/AsyncDisplayKit/smoke-tests/Life Without CocoaPods/Life Without CocoaPods/AppDelegate.h	
+++ /dev/null
@@ -1,17 +0,0 @@
-//
-//  AppDelegate.h
-//  Texture
-//
-//  Copyright (c) Pinterest, Inc.  All rights reserved.
-//  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
-//
-
-#import <UIKit/UIKit.h>
-
-@interface AppDelegate : UIResponder <UIApplicationDelegate>
-
-@property (strong, nonatomic) UIWindow *window;
-
-
-@end
-
diff --git a/submodules/AsyncDisplayKit/smoke-tests/Life Without CocoaPods/Life Without CocoaPods/AppDelegate.m b/submodules/AsyncDisplayKit/smoke-tests/Life Without CocoaPods/Life Without CocoaPods/AppDelegate.m
deleted file mode 100644
index d6890ff2e3..0000000000
--- a/submodules/AsyncDisplayKit/smoke-tests/Life Without CocoaPods/Life Without CocoaPods/AppDelegate.m	
+++ /dev/null
@@ -1,24 +0,0 @@
-//
-//  AppDelegate.m
-//  Texture
-//
-//  Copyright (c) Pinterest, Inc.  All rights reserved.
-//  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
-//
-
-#import "AppDelegate.h"
-
-#import "ViewController.h"
-
-@implementation AppDelegate
-
-- (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions
-{
-  self.window = [[UIWindow alloc] initWithFrame:[[UIScreen mainScreen] bounds]];
-  self.window.backgroundColor = [UIColor whiteColor];
-  self.window.rootViewController = [[ViewController alloc] init];
-  [self.window makeKeyAndVisible];
-  return YES;
-}
-
-@end
diff --git a/submodules/AsyncDisplayKit/smoke-tests/Life Without CocoaPods/Life Without CocoaPods/Default-568h@2x.png b/submodules/AsyncDisplayKit/smoke-tests/Life Without CocoaPods/Life Without CocoaPods/Default-568h@2x.png
deleted file mode 100644
index 6ee80b9393..0000000000
Binary files a/submodules/AsyncDisplayKit/smoke-tests/Life Without CocoaPods/Life Without CocoaPods/Default-568h@2x.png and /dev/null differ
diff --git a/submodules/AsyncDisplayKit/smoke-tests/Life Without CocoaPods/Life Without CocoaPods/Default-667h@2x.png b/submodules/AsyncDisplayKit/smoke-tests/Life Without CocoaPods/Life Without CocoaPods/Default-667h@2x.png
deleted file mode 100644
index e7b975e21b..0000000000
Binary files a/submodules/AsyncDisplayKit/smoke-tests/Life Without CocoaPods/Life Without CocoaPods/Default-667h@2x.png and /dev/null differ
diff --git a/submodules/AsyncDisplayKit/smoke-tests/Life Without CocoaPods/Life Without CocoaPods/Default-736h@3x.png b/submodules/AsyncDisplayKit/smoke-tests/Life Without CocoaPods/Life Without CocoaPods/Default-736h@3x.png
deleted file mode 100644
index c8949cae16..0000000000
Binary files a/submodules/AsyncDisplayKit/smoke-tests/Life Without CocoaPods/Life Without CocoaPods/Default-736h@3x.png and /dev/null differ
diff --git a/submodules/AsyncDisplayKit/smoke-tests/Life Without CocoaPods/Life Without CocoaPods/Info.plist b/submodules/AsyncDisplayKit/smoke-tests/Life Without CocoaPods/Life Without CocoaPods/Info.plist
deleted file mode 100644
index fb4115c84c..0000000000
--- a/submodules/AsyncDisplayKit/smoke-tests/Life Without CocoaPods/Life Without CocoaPods/Info.plist	
+++ /dev/null
@@ -1,36 +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>APPL</string>
-	<key>CFBundleShortVersionString</key>
-	<string>1.0</string>
-	<key>CFBundleSignature</key>
-	<string>????</string>
-	<key>CFBundleVersion</key>
-	<string>1</string>
-	<key>LSRequiresIPhoneOS</key>
-	<true/>
-	<key>UIRequiredDeviceCapabilities</key>
-	<array>
-		<string>armv7</string>
-	</array>
-	<key>UISupportedInterfaceOrientations</key>
-	<array>
-		<string>UIInterfaceOrientationPortrait</string>
-		<string>UIInterfaceOrientationLandscapeLeft</string>
-		<string>UIInterfaceOrientationLandscapeRight</string>
-	</array>
-</dict>
-</plist>
diff --git a/submodules/AsyncDisplayKit/smoke-tests/Life Without CocoaPods/Life Without CocoaPods/ViewController.h b/submodules/AsyncDisplayKit/smoke-tests/Life Without CocoaPods/Life Without CocoaPods/ViewController.h
deleted file mode 100644
index 261e9ff480..0000000000
--- a/submodules/AsyncDisplayKit/smoke-tests/Life Without CocoaPods/Life Without CocoaPods/ViewController.h	
+++ /dev/null
@@ -1,15 +0,0 @@
-//
-//  ViewController.h
-//  Texture
-//
-//  Copyright (c) Pinterest, Inc.  All rights reserved.
-//  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
-//
-
-#import <UIKit/UIKit.h>
-
-@interface ViewController : UIViewController
-
-
-@end
-
diff --git a/submodules/AsyncDisplayKit/smoke-tests/Life Without CocoaPods/Life Without CocoaPods/ViewController.m b/submodules/AsyncDisplayKit/smoke-tests/Life Without CocoaPods/Life Without CocoaPods/ViewController.m
deleted file mode 100644
index 106ee524f4..0000000000
--- a/submodules/AsyncDisplayKit/smoke-tests/Life Without CocoaPods/Life Without CocoaPods/ViewController.m	
+++ /dev/null
@@ -1,28 +0,0 @@
-//
-//  ViewController.m
-//  Texture
-//
-//  Copyright (c) Pinterest, Inc.  All rights reserved.
-//  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
-//
-
-#import "ViewController.h"
-
-#import <AsyncDisplayKit/AsyncDisplayKit.h>
-
-@interface ViewController ()
-@property (nonatomic, strong) ASTextNode *textNode;
-@end
-
-@implementation ViewController
-
-- (void)viewDidLoad
-{
-  self.textNode = [[ASTextNode alloc] init];
-  self.textNode.attributedText = [[NSAttributedString alloc] initWithString:@"Testing, testing." attributes:@{ NSForegroundColorAttributeName: [UIColor redColor] }];
-  [self.textNode layoutThatFits:ASSizeRangeMake(CGSizeZero, self.view.bounds.size)];
-  self.textNode.frame = (CGRect){ .origin = CGPointZero, .size = self.textNode.calculatedSize };
-  [self.view addSubnode:self.textNode];
-}
-
-@end
diff --git a/submodules/AsyncDisplayKit/smoke-tests/Life Without CocoaPods/Life Without CocoaPods/main.m b/submodules/AsyncDisplayKit/smoke-tests/Life Without CocoaPods/Life Without CocoaPods/main.m
deleted file mode 100644
index ec43dab250..0000000000
--- a/submodules/AsyncDisplayKit/smoke-tests/Life Without CocoaPods/Life Without CocoaPods/main.m	
+++ /dev/null
@@ -1,16 +0,0 @@
-//
-//  main.m
-//  Texture
-//
-//  Copyright (c) Pinterest, Inc.  All rights reserved.
-//  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
-//
-
-#import <UIKit/UIKit.h>
-#import "AppDelegate.h"
-
-int main(int argc, char * argv[]) {
-  @autoreleasepool {
-      return UIApplicationMain(argc, argv, nil, NSStringFromClass([AppDelegate class]));
-  }
-}
diff --git a/submodules/AsyncDisplayKit/smoke-tests/Life Without CocoaPods/README.md b/submodules/AsyncDisplayKit/smoke-tests/Life Without CocoaPods/README.md
deleted file mode 100644
index c20f63a5df..0000000000
--- a/submodules/AsyncDisplayKit/smoke-tests/Life Without CocoaPods/README.md	
+++ /dev/null
@@ -1,14 +0,0 @@
-# "Life Without CocoaPods"
-
-This is a very simple pseudo-"integration test" project that links against
-AsyncDisplayKit manually, rather than using CocoaPods.  If it fails to compile,
-Travis CI builds will fail.  To escape from such dire straits:
-
-* If you've added a new class intended for public use, make sure you added its
-  header to the "Public" group of the "Headers" build phase in the
-  AsyncDisplayKit target.  Note that this smoke test will only fail if you
-  remembered to add your new file to the umbrella helper.
-
-* If you added a new framework dependency (like AssetsLibrary or Photos), add
-  it to this project's Link Binary With Libraries build phase and update the
-  project README (both README.md and docs/index.md).
diff --git a/submodules/AsyncDisplayKit/smoke-tests/README.md b/submodules/AsyncDisplayKit/smoke-tests/README.md
deleted file mode 100644
index 2c0e607456..0000000000
--- a/submodules/AsyncDisplayKit/smoke-tests/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Integration tests
-
-See READMEs in subfolders.
diff --git a/submodules/AuthTransferUI/BUILD b/submodules/AuthTransferUI/BUILD
new file mode 100644
index 0000000000..df8e758fa6
--- /dev/null
+++ b/submodules/AuthTransferUI/BUILD
@@ -0,0 +1,34 @@
+load("@build_bazel_rules_swift//swift:swift.bzl", "swift_library")
+
+swift_library(
+    name = "AuthTransferUI",
+    module_name = "AuthTransferUI",
+    srcs = glob([
+        "Sources/**/*.swift",
+    ]),
+    deps = [
+        "//submodules/TelegramCore:TelegramCore",
+        "//submodules/SyncCore:SyncCore",
+        "//submodules/SSignalKit/SwiftSignalKit:SwiftSignalKit",
+        "//submodules/AsyncDisplayKit:AsyncDisplayKit",
+        "//submodules/Display:Display",
+        "//submodules/TelegramPresentationData:TelegramPresentationData",
+        "//submodules/AccountContext:AccountContext",
+        "//submodules/QrCode:QrCode",
+        "//submodules/Camera:Camera",
+        "//submodules/GlassButtonNode:GlassButtonNode",
+        "//submodules/AlertUI:AlertUI",
+        "//submodules/AppBundle:AppBundle",
+        "//submodules/SolidRoundedButtonNode:SolidRoundedButtonNode",
+        "//submodules/OverlayStatusController:OverlayStatusController",
+        "//submodules/AnimatedStickerNode:AnimatedStickerNode",
+        "//submodules/Markdown:Markdown",
+        "//submodules/AnimationUI:AnimationUI",
+        "//submodules/PresentationDataUtils:PresentationDataUtils",
+        "//submodules/DeviceAccess:DeviceAccess",
+        "//submodules/UndoUI:UndoUI",
+    ],
+    visibility = [
+        "//visibility:public",
+    ],
+)
diff --git a/submodules/AuthorizationUI/BUILD b/submodules/AuthorizationUI/BUILD
new file mode 100644
index 0000000000..9e15b1858d
--- /dev/null
+++ b/submodules/AuthorizationUI/BUILD
@@ -0,0 +1,21 @@
+load("@build_bazel_rules_swift//swift:swift.bzl", "swift_library")
+
+swift_library(
+    name = "AuthorizationUI",
+    module_name = "AuthorizationUI",
+    srcs = glob([
+        "Sources/**/*.swift",
+    ]),
+    deps = [
+        "//submodules/AsyncDisplayKit:AsyncDisplayKit",
+        "//submodules/TelegramCore:TelegramCore",
+        "//submodules/SyncCore:SyncCore",
+        "//submodules/Display:Display",
+        "//submodules/TextFormat:TextFormat",
+        "//submodules/Markdown:Markdown",
+        "//submodules/TelegramPresentationData:TelegramPresentationData",
+    ],
+    visibility = [
+        "//visibility:public",
+    ],
+)
diff --git a/submodules/AuthorizationUI/Info.plist b/submodules/AuthorizationUI/Info.plist
deleted file mode 100644
index e1fe4cfb7b..0000000000
--- a/submodules/AuthorizationUI/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/AuthorizationUI/Sources/AuthorizationOptionText.swift b/submodules/AuthorizationUI/Sources/AuthorizationOptionText.swift
index 218d8017c9..e9d2cadc8d 100644
--- a/submodules/AuthorizationUI/Sources/AuthorizationOptionText.swift
+++ b/submodules/AuthorizationUI/Sources/AuthorizationOptionText.swift
@@ -1,4 +1,5 @@
 import Foundation
+import UIKit
 import TelegramCore
 import SyncCore
 import Display
diff --git a/submodules/AuthorizationUI/Sources/AuthorizationUI.h b/submodules/AuthorizationUI/Sources/AuthorizationUI.h
deleted file mode 100644
index ff41738826..0000000000
--- a/submodules/AuthorizationUI/Sources/AuthorizationUI.h
+++ /dev/null
@@ -1,19 +0,0 @@
-//
-//  AuthorizationUI.h
-//  AuthorizationUI
-//
-//  Created by Peter on 8/17/19.
-//  Copyright © 2019 Telegram Messenger LLP. All rights reserved.
-//
-
-#import <UIKit/UIKit.h>
-
-//! Project version number for AuthorizationUI.
-FOUNDATION_EXPORT double AuthorizationUIVersionNumber;
-
-//! Project version string for AuthorizationUI.
-FOUNDATION_EXPORT const unsigned char AuthorizationUIVersionString[];
-
-// In this header, you should import all the public headers of your framework using statements like #import <AuthorizationUI/PublicHeader.h>
-
-
diff --git a/submodules/AvatarNode/BUILD b/submodules/AvatarNode/BUILD
new file mode 100644
index 0000000000..df2c2c6837
--- /dev/null
+++ b/submodules/AvatarNode/BUILD
@@ -0,0 +1,22 @@
+load("@build_bazel_rules_swift//swift:swift.bzl", "swift_library")
+
+swift_library(
+    name = "AvatarNode",
+    module_name = "AvatarNode",
+    srcs = glob([
+        "Sources/**/*.swift",
+    ]),
+    deps = [
+        "//submodules/AsyncDisplayKit:AsyncDisplayKit",
+        "//submodules/Display:Display",
+        "//submodules/TelegramCore:TelegramCore",
+        "//submodules/SyncCore:SyncCore",
+        "//submodules/TelegramPresentationData:TelegramPresentationData",
+        "//submodules/AnimationUI:AnimationUI",
+        "//submodules/AppBundle:AppBundle",
+        "//submodules/AccountContext:AccountContext",
+    ],
+    visibility = [
+        "//visibility:public",
+    ],
+)
diff --git a/submodules/AvatarNode/Info.plist b/submodules/AvatarNode/Info.plist
deleted file mode 100644
index e1fe4cfb7b..0000000000
--- a/submodules/AvatarNode/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/AvatarNode/Sources/AvatarNode.h b/submodules/AvatarNode/Sources/AvatarNode.h
deleted file mode 100644
index 999cedcf3d..0000000000
--- a/submodules/AvatarNode/Sources/AvatarNode.h
+++ /dev/null
@@ -1,19 +0,0 @@
-//
-//  AvatarNode.h
-//  AvatarNode
-//
-//  Created by Peter on 8/4/19.
-//  Copyright © 2019 Telegram Messenger LLP. All rights reserved.
-//
-
-#import <UIKit/UIKit.h>
-
-//! Project version number for AvatarNode.
-FOUNDATION_EXPORT double AvatarNodeVersionNumber;
-
-//! Project version string for AvatarNode.
-FOUNDATION_EXPORT const unsigned char AvatarNodeVersionString[];
-
-// In this header, you should import all the public headers of your framework using statements like #import <AvatarNode/PublicHeader.h>
-
-
diff --git a/submodules/AvatarNode/Sources/AvatarNode.swift b/submodules/AvatarNode/Sources/AvatarNode.swift
index 2f4e502e6a..4671db3fb1 100644
--- a/submodules/AvatarNode/Sources/AvatarNode.swift
+++ b/submodules/AvatarNode/Sources/AvatarNode.swift
@@ -427,7 +427,7 @@ public final class AvatarNode: ASDisplayNode {
             if let explicitColorIndex = parameters.explicitColorIndex {
                 colorIndex = explicitColorIndex
             } else {
-                if let accountPeerId = parameters.accountPeerId, let peerId = parameters.peerId {
+                if let peerId = parameters.peerId {
                     if peerId.namespace == -1 {
                         colorIndex = -1
                     } else {
@@ -622,3 +622,65 @@ public func drawPeerAvatarLetters(context: CGContext, size: CGSize, font: UIFont
     context.translateBy(x: -lineOrigin.x, y: -lineOrigin.y)
     context.textPosition = textPosition
 }
+
+public enum AvatarBackgroundColor {
+    case blue
+    case yellow
+    case green
+    case purple
+    case red
+    case violet
+}
+
+public func generateAvatarImage(size: CGSize, icon: UIImage?, color: AvatarBackgroundColor) -> UIImage? {
+    return generateImage(size, rotatedContext: { size, context in
+        context.clear(CGRect(origin: CGPoint(), size: size))
+        context.beginPath()
+        context.addEllipse(in: CGRect(x: 0.0, y: 0.0, width: size.width, height:
+            size.height))
+        context.clip()
+        
+        let colorIndex: Int
+        switch color {
+        case .blue:
+            colorIndex = 5
+        case .yellow:
+            colorIndex = 1
+        case .green:
+            colorIndex = 3
+        case .purple:
+            colorIndex = 2
+        case .red:
+            colorIndex = 0
+        case .violet:
+            colorIndex = 6
+        }
+        
+        let colorsArray: NSArray
+        if colorIndex == -1 {
+            colorsArray = grayscaleColors
+        } else {
+            colorsArray = AvatarNode.gradientColors[colorIndex % AvatarNode.gradientColors.count]
+        }
+        
+        var locations: [CGFloat] = [1.0, 0.0]
+        
+        let colorSpace = CGColorSpaceCreateDeviceRGB()
+        let gradient = CGGradient(colorsSpace: colorSpace, colors: colorsArray, locations: &locations)!
+        
+        context.drawLinearGradient(gradient, start: CGPoint(), end: CGPoint(x: 0.0, y: size.height), options: CGGradientDrawingOptions())
+        
+        context.resetClip()
+        
+        context.setBlendMode(.normal)
+        
+        context.translateBy(x: size.width / 2.0, y: size.height / 2.0)
+        context.scaleBy(x: 1.0, y: -1.0)
+        context.translateBy(x: -size.width / 2.0, y: -size.height / 2.0)
+        
+        if let icon = icon {
+            let iconFrame = CGRect(origin: CGPoint(x: floor((size.width - icon.size.width) / 2.0), y: floor((size.height - icon.size.height) / 2.0)), size: icon.size)
+            context.draw(icon.cgImage!, in: iconFrame)
+        }
+    })
+}
diff --git a/submodules/BotPaymentsUI/BUILD b/submodules/BotPaymentsUI/BUILD
new file mode 100644
index 0000000000..f7213427bf
--- /dev/null
+++ b/submodules/BotPaymentsUI/BUILD
@@ -0,0 +1,29 @@
+load("@build_bazel_rules_swift//swift:swift.bzl", "swift_library")
+
+swift_library(
+    name = "BotPaymentsUI",
+    module_name = "BotPaymentsUI",
+    srcs = glob([
+        "Sources/**/*.swift",
+    ]),
+    deps = [
+        "//submodules/SSignalKit/SwiftSignalKit:SwiftSignalKit",
+        "//submodules/Postbox:Postbox",
+        "//submodules/TelegramCore:TelegramCore",
+        "//submodules/SyncCore:SyncCore",
+        "//submodules/TelegramPresentationData:TelegramPresentationData",
+        "//submodules/LocalAuth:LocalAuth",
+        "//submodules/AccountContext:AccountContext",
+        "//submodules/ItemListUI:ItemListUI",
+        "//submodules/PasswordSetupUI:PasswordSetupUI",
+        "//submodules/PhotoResources:PhotoResources",
+        "//submodules/TelegramNotices:TelegramNotices",
+        "//submodules/Stripe:Stripe",
+        "//submodules/CountrySelectionUI:CountrySelectionUI",
+        "//submodules/AppBundle:AppBundle",
+        "//submodules/PresentationDataUtils:PresentationDataUtils",
+    ],
+    visibility = [
+        "//visibility:public",
+    ],
+)
diff --git a/submodules/BotPaymentsUI/Info.plist b/submodules/BotPaymentsUI/Info.plist
deleted file mode 100644
index e1fe4cfb7b..0000000000
--- a/submodules/BotPaymentsUI/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/BotPaymentsUI/Sources/BotPaymentsUI.h b/submodules/BotPaymentsUI/Sources/BotPaymentsUI.h
deleted file mode 100644
index 52ac46ad1b..0000000000
--- a/submodules/BotPaymentsUI/Sources/BotPaymentsUI.h
+++ /dev/null
@@ -1,19 +0,0 @@
-//
-//  BotPaymentsUI.h
-//  BotPaymentsUI
-//
-//  Created by Peter on 8/12/19.
-//  Copyright © 2019 Telegram Messenger LLP. All rights reserved.
-//
-
-#import <UIKit/UIKit.h>
-
-//! Project version number for BotPaymentsUI.
-FOUNDATION_EXPORT double BotPaymentsUIVersionNumber;
-
-//! Project version string for BotPaymentsUI.
-FOUNDATION_EXPORT const unsigned char BotPaymentsUIVersionString[];
-
-// In this header, you should import all the public headers of your framework using statements like #import <BotPaymentsUI/PublicHeader.h>
-
-
diff --git a/submodules/BuildConfig/BUILD b/submodules/BuildConfig/BUILD
new file mode 100644
index 0000000000..347afe08eb
--- /dev/null
+++ b/submodules/BuildConfig/BUILD
@@ -0,0 +1,34 @@
+load(
+    "//build-input/data:variables.bzl",
+    "telegram_api_id",
+    "telegram_api_hash",
+    "telegram_app_center_id",
+    "telegram_is_internal_build",
+    "telegram_is_appstore_build",
+    "telegram_appstore_id",
+    "telegram_app_specific_url_scheme",
+)
+
+objc_library(
+    name = "BuildConfig",
+    module_name = "BuildConfig",
+    enable_modules = True,
+    srcs = glob([
+        "Sources/*.m",
+    ]),
+    copts = [
+        "-DAPP_CONFIG_API_ID={}".format(telegram_api_id),
+        "-DAPP_CONFIG_API_HASH=\\\"{}\\\"".format(telegram_api_hash),
+        "-DAPP_CONFIG_APP_CENTER_ID=\\\"{}\\\"".format(telegram_app_center_id),
+        "-DAPP_CONFIG_IS_INTERNAL_BUILD={}".format(telegram_is_internal_build),
+        "-DAPP_CONFIG_IS_APPSTORE_BUILD={}".format(telegram_is_appstore_build),
+        "-DAPP_CONFIG_APPSTORE_ID={}".format(telegram_appstore_id),
+        "-DAPP_SPECIFIC_URL_SCHEME=\\\"{}\\\"".format(telegram_app_specific_url_scheme),
+    ],
+    hdrs = glob([
+        "Sources/*.h",
+    ]),
+    deps = [
+    ],
+    visibility = ["//visibility:public"],
+)
diff --git a/submodules/BuildConfig/Config-AppStoreLLC.xcconfig b/submodules/BuildConfig/Config-AppStoreLLC.xcconfig
deleted file mode 100644
index d6449fc612..0000000000
--- a/submodules/BuildConfig/Config-AppStoreLLC.xcconfig
+++ /dev/null
@@ -1 +0,0 @@
-#include "../../Telegram-iOS/Config-AppStoreLLC.xcconfig"
diff --git a/submodules/BuildConfig/Config-Fork.xcconfig b/submodules/BuildConfig/Config-Fork.xcconfig
deleted file mode 100644
index efe0d66c5c..0000000000
--- a/submodules/BuildConfig/Config-Fork.xcconfig
+++ /dev/null
@@ -1 +0,0 @@
-#include "../../Telegram-iOS/Config-Fork.xcconfig"
diff --git a/submodules/BuildConfig/Config-Hockeyapp-Internal.xcconfig b/submodules/BuildConfig/Config-Hockeyapp-Internal.xcconfig
deleted file mode 100644
index 8b9e14fa83..0000000000
--- a/submodules/BuildConfig/Config-Hockeyapp-Internal.xcconfig
+++ /dev/null
@@ -1 +0,0 @@
-#include "../../../Telegram-iOS-Shared/Config/Hockeyapp-Internal/Config.xcconfig"
diff --git a/submodules/BuildConfig/Info.plist b/submodules/BuildConfig/Info.plist
deleted file mode 100644
index e1fe4cfb7b..0000000000
--- a/submodules/BuildConfig/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/BuildConfigExtra/BUCK b/submodules/BuildConfigExtra/BUCK
index 5d87460156..7c4e20f519 100644
--- a/submodules/BuildConfigExtra/BUCK
+++ b/submodules/BuildConfigExtra/BUCK
@@ -9,7 +9,7 @@ static_library(
         "Sources/*.h",
     ]),
     exported_headers = glob([
-        "Sources/*.h",
+        "PublicHeaders/**/*.h",
     ]),
     deps = [
         "//submodules/PKCS:PKCS",
diff --git a/submodules/BuildConfigExtra/BUILD b/submodules/BuildConfigExtra/BUILD
new file mode 100644
index 0000000000..7e3972e6a0
--- /dev/null
+++ b/submodules/BuildConfigExtra/BUILD
@@ -0,0 +1,25 @@
+
+objc_library(
+    name = "BuildConfigExtra",
+    enable_modules = True,
+    module_name = "BuildConfigExtra",
+    srcs = glob([
+        "Sources/**/*.m",
+        "Sources/**/*.h",
+    ]),
+    hdrs = glob([
+        "PublicHeaders/**/*.h",
+    ]),
+    includes = [
+        "PublicHeaders",
+    ],
+    deps = [
+        "//submodules/PKCS:PKCS",
+    ],
+    sdk_frameworks = [
+        "Foundation",
+    ],
+    visibility = [
+        "//visibility:public",
+    ],
+)
diff --git a/submodules/BuildConfigExtra/Sources/BuildConfigExtra.h b/submodules/BuildConfigExtra/PublicHeaders/BuildConfigExtra/BuildConfigExtra.h
similarity index 100%
rename from submodules/BuildConfigExtra/Sources/BuildConfigExtra.h
rename to submodules/BuildConfigExtra/PublicHeaders/BuildConfigExtra/BuildConfigExtra.h
diff --git a/submodules/BuildConfigExtra/Sources/BuildConfigExtra.m b/submodules/BuildConfigExtra/Sources/BuildConfigExtra.m
index ddb6a760ca..fcad93dc2a 100644
--- a/submodules/BuildConfigExtra/Sources/BuildConfigExtra.m
+++ b/submodules/BuildConfigExtra/Sources/BuildConfigExtra.m
@@ -1,4 +1,4 @@
-#import "BuildConfigExtra.h"
+#import <BuildConfigExtra/BuildConfigExtra.h>
 
 #include <mach-o/arch.h>
 #include <mach-o/loader.h>
diff --git a/submodules/CallListUI/BUILD b/submodules/CallListUI/BUILD
new file mode 100644
index 0000000000..7828266e84
--- /dev/null
+++ b/submodules/CallListUI/BUILD
@@ -0,0 +1,30 @@
+load("@build_bazel_rules_swift//swift:swift.bzl", "swift_library")
+
+swift_library(
+    name = "CallListUI",
+    module_name = "CallListUI",
+    srcs = glob([
+        "Sources/**/*.swift",
+    ]),
+    deps = [
+        "//submodules/SSignalKit/SwiftSignalKit:SwiftSignalKit",
+        "//submodules/AsyncDisplayKit:AsyncDisplayKit",
+        "//submodules/Display:Display",
+        "//submodules/Postbox:Postbox",
+        "//submodules/TelegramCore:TelegramCore",
+        "//submodules/SyncCore:SyncCore",
+        "//submodules/TelegramPresentationData:TelegramPresentationData",
+        "//submodules/TelegramUIPreferences:TelegramUIPreferences",
+        "//submodules/AccountContext:AccountContext",
+        "//submodules/ItemListUI:ItemListUI",
+        "//submodules/AvatarNode:AvatarNode",
+        "//submodules/TelegramStringFormatting:TelegramStringFormatting",
+        "//submodules/AlertUI:AlertUI",
+        "//submodules/PresentationDataUtils:PresentationDataUtils",
+        "//submodules/TelegramNotices:TelegramNotices",
+        "//submodules/MergeLists:MergeLists",
+    ],
+    visibility = [
+        "//visibility:public",
+    ],
+)
diff --git a/submodules/CallListUI/Info.plist b/submodules/CallListUI/Info.plist
deleted file mode 100644
index e1fe4cfb7b..0000000000
--- a/submodules/CallListUI/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/CallListUI/Sources/CallListUI.h b/submodules/CallListUI/Sources/CallListUI.h
deleted file mode 100644
index 0104a06195..0000000000
--- a/submodules/CallListUI/Sources/CallListUI.h
+++ /dev/null
@@ -1,19 +0,0 @@
-//
-//  CallListUI.h
-//  CallListUI
-//
-//  Created by Peter on 8/13/19.
-//  Copyright © 2019 Telegram Messenger LLP. All rights reserved.
-//
-
-#import <UIKit/UIKit.h>
-
-//! Project version number for CallListUI.
-FOUNDATION_EXPORT double CallListUIVersionNumber;
-
-//! Project version string for CallListUI.
-FOUNDATION_EXPORT const unsigned char CallListUIVersionString[];
-
-// In this header, you should import all the public headers of your framework using statements like #import <CallListUI/PublicHeader.h>
-
-
diff --git a/submodules/Camera/BUILD b/submodules/Camera/BUILD
new file mode 100644
index 0000000000..6cced36441
--- /dev/null
+++ b/submodules/Camera/BUILD
@@ -0,0 +1,17 @@
+load("@build_bazel_rules_swift//swift:swift.bzl", "swift_library")
+
+swift_library(
+    name = "Camera",
+    module_name = "Camera",
+    srcs = glob([
+        "Sources/**/*.swift",
+    ]),
+    deps = [
+        "//submodules/SSignalKit/SwiftSignalKit:SwiftSignalKit",
+        "//submodules/AsyncDisplayKit:AsyncDisplayKit",
+        "//submodules/Display:Display",
+    ],
+    visibility = [
+        "//visibility:public",
+    ],
+)
diff --git a/submodules/ChatListSearchItemHeader/BUILD b/submodules/ChatListSearchItemHeader/BUILD
new file mode 100644
index 0000000000..edfacc2082
--- /dev/null
+++ b/submodules/ChatListSearchItemHeader/BUILD
@@ -0,0 +1,17 @@
+load("@build_bazel_rules_swift//swift:swift.bzl", "swift_library")
+
+swift_library(
+    name = "ChatListSearchItemHeader",
+    module_name = "ChatListSearchItemHeader",
+    srcs = glob([
+        "Sources/**/*.swift",
+    ]),
+    deps = [
+        "//submodules/Display:Display",
+        "//submodules/TelegramPresentationData:TelegramPresentationData",
+        "//submodules/ListSectionHeaderNode:ListSectionHeaderNode",
+    ],
+    visibility = [
+        "//visibility:public",
+    ],
+)
diff --git a/submodules/ChatListSearchItemHeader/Info.plist b/submodules/ChatListSearchItemHeader/Info.plist
deleted file mode 100644
index e1fe4cfb7b..0000000000
--- a/submodules/ChatListSearchItemHeader/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/ChatListSearchItemHeader/Sources/ChatListSearchItemHeader.h b/submodules/ChatListSearchItemHeader/Sources/ChatListSearchItemHeader.h
deleted file mode 100644
index 4fbda00392..0000000000
--- a/submodules/ChatListSearchItemHeader/Sources/ChatListSearchItemHeader.h
+++ /dev/null
@@ -1,19 +0,0 @@
-//
-//  ChatListSearchItemHeader.h
-//  ChatListSearchItemHeader
-//
-//  Created by Peter on 8/12/19.
-//  Copyright © 2019 Telegram Messenger LLP. All rights reserved.
-//
-
-#import <UIKit/UIKit.h>
-
-//! Project version number for ChatListSearchItemHeader.
-FOUNDATION_EXPORT double ChatListSearchItemHeaderVersionNumber;
-
-//! Project version string for ChatListSearchItemHeader.
-FOUNDATION_EXPORT const unsigned char ChatListSearchItemHeaderVersionString[];
-
-// In this header, you should import all the public headers of your framework using statements like #import <ChatListSearchItemHeader/PublicHeader.h>
-
-
diff --git a/submodules/ChatListSearchItemHeader/Sources/ChatListSearchItemHeader.swift b/submodules/ChatListSearchItemHeader/Sources/ChatListSearchItemHeader.swift
index 19fcbdb221..e90987fbdd 100644
--- a/submodules/ChatListSearchItemHeader/Sources/ChatListSearchItemHeader.swift
+++ b/submodules/ChatListSearchItemHeader/Sources/ChatListSearchItemHeader.swift
@@ -19,6 +19,8 @@ public enum ChatListSearchItemHeaderType: Int32 {
     case addToExceptions
     case mapAddress
     case nearbyVenues
+    case chats
+    case chatTypes
 }
 
 public final class ChatListSearchItemHeader: ListViewItemHeader {
@@ -101,6 +103,11 @@ public final class ChatListSearchItemHeaderNode: ListViewItemHeaderNode {
             self.sectionHeaderNode.title = strings.Map_AddressOnMap.uppercased()
         case .nearbyVenues:
             self.sectionHeaderNode.title = strings.Map_PlacesNearby.uppercased()
+        case .chats:
+            self.sectionHeaderNode.title = strings.Cache_ByPeerHeader.uppercased()
+        case .chatTypes:
+            //TODO:localize
+            self.sectionHeaderNode.title = "CHAT TYPES"
         }
         
         self.sectionHeaderNode.action = actionTitle
@@ -147,6 +154,11 @@ public final class ChatListSearchItemHeaderNode: ListViewItemHeaderNode {
             self.sectionHeaderNode.title = strings.Map_AddressOnMap.uppercased()
         case .nearbyVenues:
             self.sectionHeaderNode.title = strings.Map_PlacesNearby.uppercased()
+        case .chats:
+            self.sectionHeaderNode.title = strings.Cache_ByPeerHeader.uppercased()
+        case .chatTypes:
+            //TODO:localize
+            self.sectionHeaderNode.title = "CHAT TYPES"
         }
         
         self.sectionHeaderNode.action = actionTitle
diff --git a/submodules/ChatListSearchItemNode/BUILD b/submodules/ChatListSearchItemNode/BUILD
new file mode 100644
index 0000000000..c57793411e
--- /dev/null
+++ b/submodules/ChatListSearchItemNode/BUILD
@@ -0,0 +1,20 @@
+load("@build_bazel_rules_swift//swift:swift.bzl", "swift_library")
+
+swift_library(
+    name = "ChatListSearchItemNode",
+    module_name = "ChatListSearchItemNode",
+    srcs = glob([
+        "Sources/**/*.swift",
+    ]),
+    deps = [
+        "//submodules/SSignalKit/SwiftSignalKit:SwiftSignalKit",
+        "//submodules/AsyncDisplayKit:AsyncDisplayKit",
+        "//submodules/Display:Display",
+        "//submodules/Postbox:Postbox",
+        "//submodules/TelegramPresentationData:TelegramPresentationData",
+        "//submodules/SearchBarNode:SearchBarNode",
+    ],
+    visibility = [
+        "//visibility:public",
+    ],
+)
diff --git a/submodules/ChatListSearchItemNode/Info.plist b/submodules/ChatListSearchItemNode/Info.plist
deleted file mode 100644
index e1fe4cfb7b..0000000000
--- a/submodules/ChatListSearchItemNode/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/ChatListSearchItemNode/Sources/ChatListSearchItemNode.h b/submodules/ChatListSearchItemNode/Sources/ChatListSearchItemNode.h
deleted file mode 100644
index 74066c502e..0000000000
--- a/submodules/ChatListSearchItemNode/Sources/ChatListSearchItemNode.h
+++ /dev/null
@@ -1,19 +0,0 @@
-//
-//  ChatListSearchItemNode.h
-//  ChatListSearchItemNode
-//
-//  Created by Peter on 8/13/19.
-//  Copyright © 2019 Telegram Messenger LLP. All rights reserved.
-//
-
-#import <UIKit/UIKit.h>
-
-//! Project version number for ChatListSearchItemNode.
-FOUNDATION_EXPORT double ChatListSearchItemNodeVersionNumber;
-
-//! Project version string for ChatListSearchItemNode.
-FOUNDATION_EXPORT const unsigned char ChatListSearchItemNodeVersionString[];
-
-// In this header, you should import all the public headers of your framework using statements like #import <ChatListSearchItemNode/PublicHeader.h>
-
-
diff --git a/submodules/ChatListSearchRecentPeersNode/BUILD b/submodules/ChatListSearchRecentPeersNode/BUILD
new file mode 100644
index 0000000000..659eec2f7a
--- /dev/null
+++ b/submodules/ChatListSearchRecentPeersNode/BUILD
@@ -0,0 +1,26 @@
+load("@build_bazel_rules_swift//swift:swift.bzl", "swift_library")
+
+swift_library(
+    name = "ChatListSearchRecentPeersNode",
+    module_name = "ChatListSearchRecentPeersNode",
+    srcs = glob([
+        "Sources/**/*.swift",
+    ]),
+    deps = [
+        "//submodules/SSignalKit/SwiftSignalKit:SwiftSignalKit",
+        "//submodules/AsyncDisplayKit:AsyncDisplayKit",
+        "//submodules/Display:Display",
+        "//submodules/Postbox:Postbox",
+        "//submodules/TelegramCore:TelegramCore",
+        "//submodules/SyncCore:SyncCore",
+        "//submodules/ListSectionHeaderNode:ListSectionHeaderNode",
+        "//submodules/HorizontalPeerItem:HorizontalPeerItem",
+        "//submodules/MergeLists:MergeLists",
+        "//submodules/TelegramPresentationData:TelegramPresentationData",
+        "//submodules/ContextUI:ContextUI",
+        "//submodules/AccountContext:AccountContext",
+    ],
+    visibility = [
+        "//visibility:public",
+    ],
+)
diff --git a/submodules/ChatListSearchRecentPeersNode/Info.plist b/submodules/ChatListSearchRecentPeersNode/Info.plist
deleted file mode 100644
index e1fe4cfb7b..0000000000
--- a/submodules/ChatListSearchRecentPeersNode/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/ChatListSearchRecentPeersNode/Sources/ChatListSearchRecentPeersNode.h b/submodules/ChatListSearchRecentPeersNode/Sources/ChatListSearchRecentPeersNode.h
deleted file mode 100644
index 82bc0e1c74..0000000000
--- a/submodules/ChatListSearchRecentPeersNode/Sources/ChatListSearchRecentPeersNode.h
+++ /dev/null
@@ -1,19 +0,0 @@
-//
-//  ChatListSearchRecentPeersNode.h
-//  ChatListSearchRecentPeersNode
-//
-//  Created by Peter on 8/5/19.
-//  Copyright © 2019 Telegram Messenger LLP. All rights reserved.
-//
-
-#import <UIKit/UIKit.h>
-
-//! Project version number for ChatListSearchRecentPeersNode.
-FOUNDATION_EXPORT double ChatListSearchRecentPeersNodeVersionNumber;
-
-//! Project version string for ChatListSearchRecentPeersNode.
-FOUNDATION_EXPORT const unsigned char ChatListSearchRecentPeersNodeVersionString[];
-
-// In this header, you should import all the public headers of your framework using statements like #import <ChatListSearchRecentPeersNode/PublicHeader.h>
-
-
diff --git a/submodules/ChatListUI/BUCK b/submodules/ChatListUI/BUCK
index 5dc03a48f1..2694f6a128 100644
--- a/submodules/ChatListUI/BUCK
+++ b/submodules/ChatListUI/BUCK
@@ -45,6 +45,7 @@ static_library(
         "//submodules/ItemListPeerActionItem:ItemListPeerActionItem",
         "//submodules/AnimatedStickerNode:AnimatedStickerNode",
         "//submodules/SolidRoundedButtonNode:SolidRoundedButtonNode",
+        "//submodules/TooltipUI:TooltipUI",
     ],
     frameworks = [
         "$SDKROOT/System/Library/Frameworks/Foundation.framework",
diff --git a/submodules/ChatListUI/BUILD b/submodules/ChatListUI/BUILD
new file mode 100644
index 0000000000..0eb8212ebd
--- /dev/null
+++ b/submodules/ChatListUI/BUILD
@@ -0,0 +1,53 @@
+load("@build_bazel_rules_swift//swift:swift.bzl", "swift_library")
+
+swift_library(
+    name = "ChatListUI",
+    module_name = "ChatListUI",
+    srcs = glob([
+        "Sources/**/*.swift",
+    ]),
+    deps = [
+        "//submodules/SSignalKit/SwiftSignalKit:SwiftSignalKit",
+        "//submodules/AsyncDisplayKit:AsyncDisplayKit",
+        "//submodules/Display:Display",
+        "//submodules/Postbox:Postbox",
+        "//submodules/TelegramCore:TelegramCore",
+        "//submodules/SyncCore:SyncCore",
+        "//submodules/TelegramPresentationData:TelegramPresentationData",
+        "//submodules/TelegramUIPreferences:TelegramUIPreferences",
+        "//submodules/AccountContext:AccountContext",
+        "//submodules/TelegramBaseController:TelegramBaseController",
+        "//submodules/OverlayStatusController:OverlayStatusController",
+        "//submodules/AlertUI:AlertUI",
+        "//submodules/PresentationDataUtils:PresentationDataUtils",
+        "//submodules/UndoUI:UndoUI",
+        "//submodules/TelegramNotices:TelegramNotices",
+        "//submodules/SearchUI:SearchUI",
+        "//submodules/MergeLists:MergeLists",
+        "//submodules/ActivityIndicator:ActivityIndicator",
+        "//submodules/SearchBarNode:SearchBarNode",
+        "//submodules/ChatListSearchRecentPeersNode:ChatListSearchRecentPeersNode",
+        "//submodules/ChatListSearchItemNode:ChatListSearchItemNode",
+        "//submodules/ChatListSearchItemHeader:ChatListSearchItemHeader",
+        "//submodules/TemporaryCachedPeerDataManager:TemporaryCachedPeerDataManager",
+        "//submodules/PeerPresenceStatusManager:PeerPresenceStatusManager",
+        "//submodules/PeerOnlineMarkerNode:PeerOnlineMarkerNode",
+        "//submodules/LocalizedPeerData:LocalizedPeerData",
+        "//submodules/ChatTitleActivityNode:ChatTitleActivityNode",
+        "//submodules/DeleteChatPeerActionSheetItem:DeleteChatPeerActionSheetItem",
+        "//submodules/LanguageSuggestionUI:LanguageSuggestionUI",
+        "//submodules/ContactsPeerItem:ContactsPeerItem",
+        "//submodules/ContactListUI:ContactListUI",
+        "//submodules/PhotoResources:PhotoResources",
+        "//submodules/AppBundle:AppBundle",
+        "//submodules/ContextUI:ContextUI",
+        "//submodules/PhoneNumberFormat:PhoneNumberFormat",
+        "//submodules/TelegramIntents:TelegramIntents",
+        "//submodules/ItemListPeerActionItem:ItemListPeerActionItem",
+        "//submodules/AnimatedStickerNode:AnimatedStickerNode",
+        "//submodules/TooltipUI:TooltipUI",
+    ],
+    visibility = [
+        "//visibility:public",
+    ],
+)
diff --git a/submodules/ChatListUI/Info.plist b/submodules/ChatListUI/Info.plist
deleted file mode 100644
index e1fe4cfb7b..0000000000
--- a/submodules/ChatListUI/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/ChatListUI/Sources/ChatContextMenus.swift b/submodules/ChatListUI/Sources/ChatContextMenus.swift
index 28ca57540d..8894256308 100644
--- a/submodules/ChatListUI/Sources/ChatContextMenus.swift
+++ b/submodules/ChatListUI/Sources/ChatContextMenus.swift
@@ -18,7 +18,7 @@ func archiveContextMenuItems(context: AccountContext, groupId: PeerGroupId, chat
         var items: [ContextMenuItem] = []
         
         if !transaction.getUnreadChatListPeerIds(groupId: groupId, filterPredicate: nil).isEmpty {
-            items.append(.action(ContextMenuActionItem(text: strings.ChatList_Context_MarkAllAsRead, icon: { theme in generateTintedImage(image: UIImage(bundleImageName: "Chat/Context Menu/MarkAsRead"), color: theme.contextMenu.primaryColor) }, action: { [weak chatListController] _, f in
+            items.append(.action(ContextMenuActionItem(text: strings.ChatList_Context_MarkAllAsRead, icon: { theme in generateTintedImage(image: UIImage(bundleImageName: "Chat/Context Menu/MarkAsRead"), color: theme.contextMenu.primaryColor) }, action: { _, f in
                 let _ = (context.account.postbox.transaction { transaction in
                     markAllChatsAsReadInteractively(transaction: transaction, viewTracker: context.account.viewTracker, groupId: groupId, filterPredicate: nil)
                 }
@@ -40,7 +40,7 @@ func archiveContextMenuItems(context: AccountContext, groupId: PeerGroupId, chat
 }
 
 enum ChatContextMenuSource {
-    case chatList
+    case chatList(isFilter: Bool)
     case search(ChatListSearchContextActionSource)
 }
 
@@ -146,20 +146,22 @@ func chatContextMenuItems(context: AccountContext, peerId: PeerId, source: ChatC
                 })))
             }
             
-            let isPinned = index.pinningIndex != nil
-            items.append(.action(ContextMenuActionItem(text: isPinned ? strings.ChatList_Context_Unpin : strings.ChatList_Context_Pin, icon: { theme in generateTintedImage(image: UIImage(bundleImageName: isPinned ? "Chat/Context Menu/Unpin" : "Chat/Context Menu/Pin"), color: theme.contextMenu.primaryColor) }, action: { _, f in
-                let _ = (toggleItemPinned(postbox: context.account.postbox, groupId: group, itemId: .peer(peerId))
-                |> deliverOnMainQueue).start(next: { result in
-                    switch result {
-                    case .done:
-                        break
-                    case let .limitExceeded(maxCount):
-                        break
-                        //strongSelf.presentAlert?(strongSelf.currentState.presentationData.strings.DialogList_PinLimitError("\(maxCount)").0)
-                    }
-                    f(.default)
-                })
-            })))
+            if case .chatList(false) = source {
+                let isPinned = index.pinningIndex != nil
+                items.append(.action(ContextMenuActionItem(text: isPinned ? strings.ChatList_Context_Unpin : strings.ChatList_Context_Pin, icon: { theme in generateTintedImage(image: UIImage(bundleImageName: isPinned ? "Chat/Context Menu/Unpin" : "Chat/Context Menu/Pin"), color: theme.contextMenu.primaryColor) }, action: { _, f in
+                    let _ = (toggleItemPinned(postbox: context.account.postbox, groupId: group, itemId: .peer(peerId))
+                    |> deliverOnMainQueue).start(next: { result in
+                        switch result {
+                        case .done:
+                            break
+                        case let .limitExceeded(maxCount):
+                            break
+                            //strongSelf.presentAlert?(strongSelf.currentState.presentationData.strings.DialogList_PinLimitError("\(maxCount)").0)
+                        }
+                        f(.default)
+                    })
+                })))
+            }
         
             if !isSavedMessages, let notificationSettings = transaction.getPeerNotificationSettings(peerId) as? TelegramPeerNotificationSettings {
                 var isMuted = false
diff --git a/submodules/ChatListUI/Sources/ChatListAdditionalCategoryItem.swift b/submodules/ChatListUI/Sources/ChatListAdditionalCategoryItem.swift
new file mode 100644
index 0000000000..a41331f8ba
--- /dev/null
+++ b/submodules/ChatListUI/Sources/ChatListAdditionalCategoryItem.swift
@@ -0,0 +1,327 @@
+import Foundation
+import UIKit
+import AsyncDisplayKit
+import Display
+import SwiftSignalKit
+import ItemListUI
+import CheckNode
+import AvatarNode
+import AccountContext
+import TelegramPresentationData
+import ChatListSearchItemHeader
+
+public class ChatListAdditionalCategoryItem: ItemListItem, ListViewItemWithHeader {
+    let presentationData: ItemListPresentationData
+    public let sectionId: ItemListSectionId
+    let context: AccountContext
+    let title: String
+    let image: UIImage?
+    let isSelected: Bool
+    let action: () -> Void
+    
+    public let selectable: Bool = true
+    
+    public let header: ListViewItemHeader?
+    
+    public init(
+        presentationData: ItemListPresentationData,
+        sectionId: ItemListSectionId = 0,
+        context: AccountContext,
+        title: String,
+        image: UIImage?,
+        isSelected: Bool,
+        action: @escaping () -> Void
+    ) {
+        self.presentationData = presentationData
+        self.sectionId = sectionId
+        self.context = context
+        self.title = title
+        self.image = image
+        self.isSelected = isSelected
+        self.action = action
+        
+        self.header = ChatListSearchItemHeader(type: .chatTypes, theme: presentationData.theme, strings: presentationData.strings, actionTitle: nil, action: nil)
+    }
+    
+    public func nodeConfiguredForParams(async: @escaping (@escaping () -> Void) -> Void, params: ListViewItemLayoutParams, synchronousLoads: Bool, previousItem: ListViewItem?, nextItem: ListViewItem?, completion: @escaping (ListViewItemNode, @escaping () -> (Signal<Void, NoError>?, (ListViewItemApply) -> Void)) -> Void) {
+        async {
+            let node = ChatListAdditionalCategoryItemNode()
+            let makeLayout = node.asyncLayout()
+            let (first, last, firstWithHeader) = ChatListAdditionalCategoryItem.mergeType(item: self, previousItem: previousItem, nextItem: nextItem)
+            let (nodeLayout, nodeApply) = makeLayout(self, params, first, last, firstWithHeader, itemListNeighbors(item: self, topItem: previousItem as? ItemListItem, bottomItem: nextItem as? ItemListItem))
+            node.contentSize = nodeLayout.contentSize
+            node.insets = nodeLayout.insets
+            
+            Queue.mainQueue().async {
+                completion(node, {
+                    let (signal, apply) = nodeApply()
+                    return (signal, { _ in
+                        apply(false, synchronousLoads)
+                    })
+                })
+            }
+        }
+    }
+    
+    public func updateNode(async: @escaping (@escaping () -> Void) -> Void, node: @escaping () -> ListViewItemNode, params: ListViewItemLayoutParams, previousItem: ListViewItem?, nextItem: ListViewItem?, animation: ListViewItemUpdateAnimation, completion: @escaping (ListViewItemNodeLayout, @escaping (ListViewItemApply) -> Void) -> Void) {
+        Queue.mainQueue().async {
+            if let nodeValue = node() as? ChatListAdditionalCategoryItemNode {
+                let layout = nodeValue.asyncLayout()
+                async {
+                    let (first, last, firstWithHeader) = ChatListAdditionalCategoryItem.mergeType(item: self, previousItem: previousItem, nextItem: nextItem)
+                    let (nodeLayout, apply) = layout(self, params, first, last, firstWithHeader, itemListNeighbors(item: self, topItem: previousItem as? ItemListItem, bottomItem: nextItem as? ItemListItem))
+                    Queue.mainQueue().async {
+                        completion(nodeLayout, { _ in
+                            apply().1(animation.isAnimated, false)
+                        })
+                    }
+                }
+            }
+        }
+    }
+    
+    public func selected(listView: ListView) {
+        self.action()
+    }
+    
+    static func mergeType(item: ChatListAdditionalCategoryItem, previousItem: ListViewItem?, nextItem: ListViewItem?) -> (first: Bool, last: Bool, firstWithHeader: Bool) {
+        var first = false
+        var last = false
+        var firstWithHeader = false
+        if let previousItem = previousItem {
+            if let header = item.header {
+                if let previousItem = previousItem as? ListViewItemWithHeader {
+                    firstWithHeader = header.id != previousItem.header?.id
+                } else {
+                    firstWithHeader = true
+                }
+            }
+        } else {
+            first = true
+            firstWithHeader = item.header != nil
+        }
+        if let nextItem = nextItem {
+            if let header = item.header {
+                if let nextItem = nextItem as? ListViewItemWithHeader {
+                    last = header.id != nextItem.header?.id
+                } else {
+                    last = true
+                }
+            }
+        } else {
+            last = true
+        }
+        return (first, last, firstWithHeader)
+    }
+}
+
+private let avatarFont = avatarPlaceholderFont(size: 16.0)
+
+public class ChatListAdditionalCategoryItemNode: ItemListRevealOptionsItemNode {
+    private let backgroundNode: ASDisplayNode
+    private let topSeparatorNode: ASDisplayNode
+    private let separatorNode: ASDisplayNode
+    private let highlightedBackgroundNode: ASDisplayNode
+    
+    private let avatarNode: ASImageNode
+    private let titleNode: TextNode
+    private var selectionNode: CheckNode?
+    
+    private var isHighlighted: Bool = false
+
+    private var item: ChatListAdditionalCategoryItem?
+
+    required public init() {
+        self.backgroundNode = ASDisplayNode()
+        self.backgroundNode.isLayerBacked = true
+        
+        self.topSeparatorNode = ASDisplayNode()
+        self.topSeparatorNode.isLayerBacked = true
+        
+        self.separatorNode = ASDisplayNode()
+        self.separatorNode.isLayerBacked = true
+        
+        self.highlightedBackgroundNode = ASDisplayNode()
+        self.highlightedBackgroundNode.isLayerBacked = true
+        
+        self.avatarNode = ASImageNode()
+        
+        self.titleNode = TextNode()
+        
+        super.init(layerBacked: false, dynamicBounce: false, rotated: false, seeThrough: false)
+        
+        self.isAccessibilityElement = true
+        
+        self.addSubnode(self.backgroundNode)
+        self.addSubnode(self.topSeparatorNode)
+        self.addSubnode(self.separatorNode)
+        
+        self.addSubnode(self.avatarNode)
+        self.addSubnode(self.titleNode)
+    }
+    
+    override public func layoutForParams(_ params: ListViewItemLayoutParams, item: ListViewItem, previousItem: ListViewItem?, nextItem: ListViewItem?) {
+        if let item = self.item {
+            let (first, last, firstWithHeader) = ChatListAdditionalCategoryItem.mergeType(item: item, previousItem: previousItem, nextItem: nextItem)
+            let makeLayout = self.asyncLayout()
+            let (nodeLayout, nodeApply) = makeLayout(item, params, first, last, firstWithHeader, itemListNeighbors(item: item, topItem: previousItem as? ItemListItem, bottomItem: nextItem as? ItemListItem))
+            self.contentSize = nodeLayout.contentSize
+            self.insets = nodeLayout.insets
+            let _ = nodeApply()
+        }
+    }
+    
+    override public func setHighlighted(_ highlighted: Bool, at point: CGPoint, animated: Bool) {
+        return
+        
+        /*super.setHighlighted(highlighted, at: point, animated: animated)
+        
+        self.isHighlighted = highlighted
+        self.updateIsHighlighted(transition: (animated && !highlighted) ? .animated(duration: 0.3, curve: .easeInOut) : .immediate)*/
+    }
+
+    
+    public func updateIsHighlighted(transition: ContainedViewLayoutTransition) {
+    }
+    
+    public func asyncLayout() -> (_ item: ChatListAdditionalCategoryItem, _ params: ListViewItemLayoutParams, _ first: Bool, _ last: Bool, _ firstWithHeader: Bool, _ neighbors: ItemListNeighbors) -> (ListViewItemNodeLayout, () -> (Signal<Void, NoError>?, (Bool, Bool) -> Void)) {
+        let makeTitleLayout = TextNode.asyncLayout(self.titleNode)
+        let currentSelectionNode = self.selectionNode
+        
+        let currentItem = self.item
+        
+        return { [weak self] item, params, first, last, firstWithHeader, neighbors in
+            var updatedTheme: PresentationTheme?
+            
+            let titleFont = Font.regular(item.presentationData.fontSize.itemListBaseFontSize)
+            
+            let avatarDiameter: CGFloat = 40.0
+            
+            if currentItem?.presentationData.theme !== item.presentationData.theme {
+                updatedTheme = item.presentationData.theme
+            }
+            let leftInset: CGFloat = 65.0 + params.leftInset
+            var rightInset: CGFloat = 10.0 + params.rightInset
+            
+            let updatedSelectionNode: CheckNode?
+            let isSelected = item.isSelected
+            
+            rightInset += 28.0
+            
+            let selectionNode: CheckNode
+            if let current = currentSelectionNode {
+                selectionNode = current
+                updatedSelectionNode = selectionNode
+            } else {
+                selectionNode = CheckNode(strokeColor: item.presentationData.theme.list.itemCheckColors.strokeColor, fillColor: item.presentationData.theme.list.itemCheckColors.fillColor, foregroundColor: item.presentationData.theme.list.itemCheckColors.foregroundColor, style: .plain)
+                selectionNode.isUserInteractionEnabled = false
+                updatedSelectionNode = selectionNode
+            }
+            
+            var titleAttributedString: NSAttributedString?
+            let textColor = item.presentationData.theme.list.itemPrimaryTextColor
+            titleAttributedString = NSAttributedString(string: item.title, font: titleFont, textColor: textColor)
+            
+            let (titleLayout, titleApply) = makeTitleLayout(TextNodeLayoutArguments(attributedString: titleAttributedString, backgroundColor: nil, maximumNumberOfLines: 1, truncationType: .end, constrainedSize: CGSize(width: max(0.0, params.width - leftInset - rightInset), height: CGFloat.infinity), alignment: .natural, cutout: nil, insets: UIEdgeInsets()))
+            
+            let verticalInset: CGFloat = 13.0
+            
+            let statusHeightComponent: CGFloat
+            statusHeightComponent = 0.0
+            
+            let nodeLayout = ListViewItemNodeLayout(contentSize: CGSize(width: params.width, height: verticalInset * 2.0 + titleLayout.size.height + statusHeightComponent), insets: UIEdgeInsets(top: firstWithHeader ? 29.0 : 0.0, left: 0.0, bottom: 0.0, right: 0.0))
+            
+            let titleFrame: CGRect
+            titleFrame = CGRect(origin: CGPoint(x: leftInset, y: floor((nodeLayout.contentSize.height - titleLayout.size.height) / 2.0)), size: titleLayout.size)
+            
+            return (nodeLayout, { [weak self] in
+                if let strongSelf = self {
+                    return (.complete(), { [weak strongSelf] animated, synchronousLoads in
+                        if let strongSelf = strongSelf {
+                            strongSelf.item = item
+                            
+                            strongSelf.accessibilityLabel = titleAttributedString?.string
+                            
+                            //strongSelf.containerNode.frame = CGRect(origin: CGPoint(), size: nodeLayout.contentSize)
+                            //strongSelf.containerNode.isGestureEnabled = item.contextAction != nil
+                            
+                            let transition: ContainedViewLayoutTransition
+                            if animated {
+                                transition = ContainedViewLayoutTransition.animated(duration: 0.4, curve: .spring)
+                            } else {
+                                transition = .immediate
+                            }
+                            
+                            let revealOffset = strongSelf.revealOffset
+                            
+                            if let _ = updatedTheme {
+                                strongSelf.topSeparatorNode.backgroundColor = item.presentationData.theme.list.itemPlainSeparatorColor
+                                strongSelf.separatorNode.backgroundColor = item.presentationData.theme.list.itemPlainSeparatorColor
+                                strongSelf.backgroundNode.backgroundColor = item.presentationData.theme.list.plainBackgroundColor
+                                strongSelf.highlightedBackgroundNode.backgroundColor = item.presentationData.theme.list.itemHighlightedBackgroundColor
+                            }
+                            
+                            strongSelf.avatarNode.image = item.image
+                            
+                            strongSelf.topSeparatorNode.isHidden = true
+                            
+                            transition.updateFrame(node: strongSelf.avatarNode, frame: CGRect(origin: CGPoint(x: revealOffset + leftInset - 50.0, y: floor((nodeLayout.contentSize.height - avatarDiameter) / 2.0)), size: CGSize(width: avatarDiameter, height: avatarDiameter)))
+                            
+                            let _ = titleApply()
+                            transition.updateFrame(node: strongSelf.titleNode, frame: titleFrame.offsetBy(dx: revealOffset, dy: 0.0))
+                            
+                            if let updatedSelectionNode = updatedSelectionNode {
+                                if strongSelf.selectionNode !== updatedSelectionNode {
+                                    strongSelf.selectionNode?.removeFromSupernode()
+                                    strongSelf.selectionNode = updatedSelectionNode
+                                    strongSelf.addSubnode(updatedSelectionNode)
+                                }
+                                updatedSelectionNode.setIsChecked(isSelected, animated: animated)
+                                
+                                updatedSelectionNode.frame = CGRect(origin: CGPoint(x: params.width - params.rightInset - 32.0 - 12.0, y: floor((nodeLayout.contentSize.height - 32.0) / 2.0)), size: CGSize(width: 32.0, height: 32.0))
+                            } else if let selectionNode = strongSelf.selectionNode {
+                                selectionNode.removeFromSupernode()
+                                strongSelf.selectionNode = nil
+                            }
+                            
+                            let separatorHeight = UIScreenPixel
+                            
+                            let topHighlightInset: CGFloat = (first || !nodeLayout.insets.top.isZero) ? 0.0 : separatorHeight
+                            strongSelf.backgroundNode.frame = CGRect(origin: CGPoint(x: 0.0, y: 0.0), size: CGSize(width: nodeLayout.contentSize.width, height: nodeLayout.contentSize.height))
+                            strongSelf.highlightedBackgroundNode.frame = CGRect(origin: CGPoint(x: 0.0, y: -nodeLayout.insets.top - topHighlightInset), size: CGSize(width: nodeLayout.size.width, height: nodeLayout.size.height + topHighlightInset))
+                            strongSelf.topSeparatorNode.frame = CGRect(origin: CGPoint(x: 0.0, y: -min(nodeLayout.insets.top, separatorHeight)), size: CGSize(width: nodeLayout.contentSize.width, height: separatorHeight))
+                            strongSelf.separatorNode.frame = CGRect(origin: CGPoint(x: leftInset, y: nodeLayout.contentSize.height - separatorHeight), size: CGSize(width: max(0.0, nodeLayout.size.width - leftInset), height: separatorHeight))
+                            strongSelf.separatorNode.isHidden = last
+                            
+                            strongSelf.updateLayout(size: nodeLayout.contentSize, leftInset: params.leftInset, rightInset: params.rightInset)
+                        }
+                    })
+                } else {
+                    return (nil, { _, _ in
+                    })
+                }
+            })
+        }
+    }
+    
+    override public func layoutHeaderAccessoryItemNode(_ accessoryItemNode: ListViewAccessoryItemNode) {
+        let bounds = self.bounds
+        accessoryItemNode.frame = CGRect(origin: CGPoint(x: 0.0, y: -29.0), size: CGSize(width: bounds.size.width, height: 29.0))
+    }
+    
+    override public func animateInsertion(_ currentTimestamp: Double, duration: Double, short: Bool) {
+        self.layer.animateAlpha(from: 0.0, to: 1.0, duration: duration * 0.5)
+    }
+    
+    override public func animateRemoved(_ currentTimestamp: Double, duration: Double) {
+        self.layer.animateAlpha(from: 1.0, to: 0.0, duration: duration * 0.5, removeOnCompletion: false)
+    }
+    
+    override public func header() -> ListViewItemHeader? {
+        if let item = self.item {
+            return item.header
+        } else {
+            return nil
+        }
+    }
+}
diff --git a/submodules/ChatListUI/Sources/ChatListController.swift b/submodules/ChatListUI/Sources/ChatListController.swift
index 751772e64b..48731695cb 100644
--- a/submodules/ChatListUI/Sources/ChatListController.swift
+++ b/submodules/ChatListUI/Sources/ChatListController.swift
@@ -2,6 +2,7 @@ import Foundation
 import UIKit
 import Postbox
 import SwiftSignalKit
+import AsyncDisplayKit
 import Display
 import TelegramCore
 import SyncCore
@@ -21,21 +22,20 @@ import ContextUI
 import AppBundle
 import LocalizedPeerData
 import TelegramIntents
+import TooltipUI
 
 private func fixListNodeScrolling(_ listNode: ListView, searchNode: NavigationBarSearchContentNode) -> Bool {
+    if listNode.scroller.isDragging {
+        return false
+    }
     if searchNode.expansionProgress > 0.0 && searchNode.expansionProgress < 1.0 {
-        let scrollToItem: ListViewScrollToItem
-        let targetProgress: CGFloat
+        let offset: CGFloat
         if searchNode.expansionProgress < 0.6 {
-            scrollToItem = ListViewScrollToItem(index: 0, position: .top(-navigationBarSearchContentHeight), animated: true, curve: .Default(duration: nil), directionHint: .Up)
-            targetProgress = 0.0
+            offset = navigationBarSearchContentHeight
         } else {
-            scrollToItem = ListViewScrollToItem(index: 0, position: .top(0.0), animated: true, curve: .Default(duration: nil), directionHint: .Up)
-            targetProgress = 1.0
+            offset = 0.0
         }
-        searchNode.updateExpansionProgress(targetProgress, animated: true)
-        
-        listNode.transaction(deleteIndices: [], insertIndicesAndItems: [], updateIndicesAndItems: [], options: ListViewDeleteAndInsertOptions(), scrollToItem: scrollToItem, updateSizeAndInsets: nil, stationaryItemRange: nil, updateOpaqueState: nil, completion: { _ in })
+        let _ = listNode.scrollToOffsetFromTop(offset)
         return true
     } else if searchNode.expansionProgress == 1.0 {
         var sortItemNode: ListViewItemNode?
@@ -120,6 +120,7 @@ public class ChatListControllerImpl: TelegramBaseController, ChatListController,
     private var badgeDisposable: Disposable?
     private var badgeIconDisposable: Disposable?
     
+    private var didAppear = false
     private var dismissSearchOnDisappear = false
         
     private var passcodeLockTooltipDisposable = MetaDisposable()
@@ -133,18 +134,20 @@ public class ChatListControllerImpl: TelegramBaseController, ChatListController,
     private var presentationDataDisposable: Disposable?
     
     private let stateDisposable = MetaDisposable()
-    private var filterDisposable: Disposable?
+    private let filterDisposable = MetaDisposable()
+    private let featuredFiltersDisposable = MetaDisposable()
+    private var processedFeaturedFilters = false
+    
+    private let isReorderingTabsValue = ValuePromise<Bool>(false)
     
     private var searchContentNode: NavigationBarSearchContentNode?
     
     private let tabContainerNode: ChatListFilterTabContainerNode
-    private var tabContainerData: ([ChatListFilterTabEntry], ChatListFilterTabEntryId)?
-    
-    private let chatListFilterValue = Promise<ChatListFilter?>()
+    private var tabContainerData: [ChatListFilterTabEntry]?
     
     public override func updateNavigationCustomData(_ data: Any?, progress: CGFloat, transition: ContainedViewLayoutTransition) {
         if self.isNodeLoaded {
-            self.chatListDisplayNode.chatListNode.updateSelectedChatLocation(data as? ChatLocation, progress: progress, transition: transition)
+            self.chatListDisplayNode.containerNode.updateSelectedChatLocation(data: data as? ChatLocation, progress: progress, transition: transition)
         }
     }
     
@@ -166,13 +169,13 @@ public class ChatListControllerImpl: TelegramBaseController, ChatListController,
         
         super.init(context: context, navigationBarPresentationData: NavigationBarPresentationData(presentationData: self.presentationData), mediaAccessoryPanelVisibility: .always, locationBroadcastPanelSource: .summary)
         
-        self.hasTabBarItemContextAction = true
+        self.tabBarItemContextActionType = .whenActive
         
         self.statusBar.statusBarStyle = self.presentationData.theme.rootController.statusBarStyle.style
         
         let title: String
         if let filter = self.filter {
-            title = filter.title ?? ""
+            title = filter.title
         } else if self.groupId == .root {
             title = self.presentationData.strings.DialogList_Title
             self.navigationBar?.item = nil
@@ -232,37 +235,24 @@ public class ChatListControllerImpl: TelegramBaseController, ChatListController,
             if strongSelf.chatListDisplayNode.searchDisplayController != nil {
                 strongSelf.deactivateSearch(animated: true)
             } else {
-                switch strongSelf.chatListDisplayNode.chatListNode.visibleContentOffset() {
+                switch strongSelf.chatListDisplayNode.containerNode.currentItemNode.visibleContentOffset() {
                 case .none, .unknown:
                     if let searchContentNode = strongSelf.searchContentNode {
                         searchContentNode.updateExpansionProgress(1.0, animated: true)
                     }
-                    strongSelf.chatListDisplayNode.chatListNode.scrollToPosition(.top)
+                    strongSelf.chatListDisplayNode.containerNode.currentItemNode.scrollToPosition(.top)
                 case let .known(offset):
-                    if offset <= navigationBarSearchContentHeight + 1.0 {
+                    if offset <= navigationBarSearchContentHeight + 1.0 && strongSelf.chatListDisplayNode.containerNode.currentItemNode.chatListFilter != nil {
                         strongSelf.tabContainerNode.tabSelected?(.all)
                     } else {
                         if let searchContentNode = strongSelf.searchContentNode {
                             searchContentNode.updateExpansionProgress(1.0, animated: true)
                         }
-                        strongSelf.chatListDisplayNode.chatListNode.scrollToPosition(.top)
+                        strongSelf.chatListDisplayNode.containerNode.currentItemNode.scrollToPosition(.top)
                     }
                 }
             }
         }
-        self.longTapWithTabBar = { [weak self] in
-            guard let strongSelf = self else {
-                return
-            }
-            if strongSelf.chatListDisplayNode.searchDisplayController != nil {
-                strongSelf.deactivateSearch(animated: true)
-            } else {
-                if let searchContentNode = strongSelf.searchContentNode {
-                    searchContentNode.updateExpansionProgress(1.0, animated: true)
-                }
-                strongSelf.chatListDisplayNode.chatListNode.scrollToPosition(.auto)
-            }
-        }
         
         let hasProxy = context.sharedContext.accountManager.sharedData(keys: [SharedDataKeys.proxySettings])
         |> map { sharedData -> (Bool, Bool) in
@@ -287,36 +277,72 @@ public class ChatListControllerImpl: TelegramBaseController, ChatListController,
                 context.account.networkState,
                 hasProxy,
                 passcode,
-                self.chatListDisplayNode.chatListNode.state
-            ).start(next: { [weak self] networkState, proxy, passcode, state in
+                self.chatListDisplayNode.containerNode.currentItemState,
+                self.isReorderingTabsValue.get()
+            ).start(next: { [weak self] networkState, proxy, passcode, state, isReorderingTabs in
                 if let strongSelf = self {
                     let defaultTitle: String
                     if strongSelf.groupId == .root {
-                        if let chatListFilter = strongSelf.filter {
-                            let title: String = chatListFilter.title ?? strongSelf.presentationData.strings.DialogList_Title
-                            defaultTitle = title
-                        } else {
-                            defaultTitle = strongSelf.presentationData.strings.DialogList_Title
-                        }
+                        defaultTitle = strongSelf.presentationData.strings.DialogList_Title
                     } else {
                         defaultTitle = strongSelf.presentationData.strings.ChatList_ArchivedChatsTitle
                     }
                     if state.editing {
-                        if strongSelf.groupId == .root && strongSelf.filter == nil {
+                        if strongSelf.groupId == .root {
                             strongSelf.navigationItem.rightBarButtonItem = nil
                         }
                         
                         let title = !state.selectedPeerIds.isEmpty ? strongSelf.presentationData.strings.ChatList_SelectedChats(Int32(state.selectedPeerIds.count)) : defaultTitle
                         strongSelf.titleView.title = NetworkStatusTitle(text: title, activity: false, hasProxy: false, connectsViaProxy: false, isPasscodeSet: false, isManuallyLocked: false)
+                    } else if isReorderingTabs {
+                        if strongSelf.groupId == .root {
+                            strongSelf.navigationItem.rightBarButtonItem = nil
+                        }
+                        let leftBarButtonItem = UIBarButtonItem(title: strongSelf.presentationData.strings.Common_Done, style: .done, target: strongSelf, action: #selector(strongSelf.reorderingDonePressed))
+                        strongSelf.navigationItem.leftBarButtonItem = leftBarButtonItem
+                        
+                        let (_, connectsViaProxy) = proxy
+                        switch networkState {
+                        case .waitingForNetwork:
+                            strongSelf.titleView.title = NetworkStatusTitle(text: strongSelf.presentationData.strings.State_WaitingForNetwork, activity: true, hasProxy: false, connectsViaProxy: connectsViaProxy, isPasscodeSet: false, isManuallyLocked: false)
+                        case let .connecting(proxy):
+                            var text = strongSelf.presentationData.strings.State_Connecting
+                            if let layout = strongSelf.validLayout, proxy != nil && layout.metrics.widthClass != .regular && layout.size.width > 320.0 {
+                                text = strongSelf.presentationData.strings.State_ConnectingToProxy
+                            }
+                            strongSelf.titleView.title = NetworkStatusTitle(text: text, activity: true, hasProxy: false, connectsViaProxy: connectsViaProxy, isPasscodeSet: false, isManuallyLocked: false)
+                        case .updating:
+                            strongSelf.titleView.title = NetworkStatusTitle(text: strongSelf.presentationData.strings.State_Updating, activity: true, hasProxy: false, connectsViaProxy: connectsViaProxy, isPasscodeSet: false, isManuallyLocked: false)
+                        case .online:
+                            strongSelf.titleView.title = NetworkStatusTitle(text: defaultTitle, activity: false, hasProxy: false, connectsViaProxy: connectsViaProxy, isPasscodeSet: false, isManuallyLocked: false)
+                        }
                     } else {
                         var isRoot = false
                         if case .root = strongSelf.groupId {
                             isRoot = true
-                            if strongSelf.filter == nil {
+                            
+                            if isReorderingTabs {
+                                strongSelf.navigationItem.rightBarButtonItem = nil
+                            } else {
                                 let rightBarButtonItem = UIBarButtonItem(image: PresentationResourcesRootController.navigationComposeIcon(strongSelf.presentationData.theme), style: .plain, target: strongSelf, action: #selector(strongSelf.composePressed))
                                 rightBarButtonItem.accessibilityLabel = strongSelf.presentationData.strings.VoiceOver_Navigation_Compose
                                 strongSelf.navigationItem.rightBarButtonItem = rightBarButtonItem
                             }
+                            
+                            if isReorderingTabs {
+                                let leftBarButtonItem = UIBarButtonItem(title: strongSelf.presentationData.strings.Common_Done, style: .done, target: strongSelf, action: #selector(strongSelf.reorderingDonePressed))
+                                strongSelf.navigationItem.leftBarButtonItem = leftBarButtonItem
+                            } else {
+                                let editItem: UIBarButtonItem
+                                if state.editing {
+                                    editItem = UIBarButtonItem(title: strongSelf.presentationData.strings.Common_Done, style: .done, target: self, action: #selector(strongSelf.donePressed))
+                                    editItem.accessibilityLabel = strongSelf.presentationData.strings.Common_Done
+                                } else {
+                                    editItem = UIBarButtonItem(title: strongSelf.presentationData.strings.Common_Edit, style: .plain, target: self, action: #selector(strongSelf.editPressed))
+                                    editItem.accessibilityLabel = strongSelf.presentationData.strings.Common_Edit
+                                }
+                                strongSelf.navigationItem.leftBarButtonItem = editItem
+                            }
                         }
                         
                         let (hasProxy, connectsViaProxy) = proxy
@@ -419,85 +445,34 @@ public class ChatListControllerImpl: TelegramBaseController, ChatListController,
             }
         }
         
-        if self.filter == nil {
-            let preferencesKey: PostboxViewKey = .preferences(keys: Set([
-                ApplicationSpecificPreferencesKeys.chatListFilterSettings
-            ]))
-            let filterItems = chatListFilterItems(context: context)
-            |> map { totalCount, items -> [ChatListFilterTabEntry] in
-                var result: [ChatListFilterTabEntry] = []
-                result.append(.all(unreadCount: totalCount))
-                for (filter, unreadCount) in items {
-                    result.append(.filter(id: filter.id, text: filter.title ?? "", unreadCount: unreadCount))
-                }
-                return result
-            }
-            |> distinctUntilChanged
-            self.filterDisposable = (combineLatest(queue: .mainQueue(),
-                    context.account.postbox.combinedView(keys: [
-                    preferencesKey
-                ]),
-                filterItems,
-                self.chatListFilterValue.get() |> map { $0?.id } |> distinctUntilChanged
-            )
-            |> deliverOnMainQueue).start(next: { [weak self] combinedView, filterItems, selectedFilter in
+        if self.filter == nil, case .root = self.groupId {
+            self.chatListDisplayNode.containerNode.currentItemFilterUpdated = { [weak self] filter, fraction, transition, force in
                 guard let strongSelf = self else {
                     return
                 }
-                var filterSettings: ChatListFilterSettings = .default
-                if let preferencesView = combinedView.views[preferencesKey] as? PreferencesView {
-                    if let value = preferencesView.values[ApplicationSpecificPreferencesKeys.chatListFilterSettings] as? ChatListFilterSettings {
-                        filterSettings = value
-                    }
+                guard let layout = strongSelf.validLayout else {
+                    return
                 }
-                
-                var resolvedItems = filterItems
-                if !filterSettings.displayTabs || groupId != .root {
-                    resolvedItems = []
+                guard let tabContainerData = strongSelf.tabContainerData else {
+                    return
                 }
-                
-                var wasEmpty = false
-                if let tabContainerData = strongSelf.tabContainerData {
-                    wasEmpty = tabContainerData.0.count <= 1
-                } else {
-                    wasEmpty = true
+                if force {
+                    strongSelf.tabContainerNode.cancelAnimations()
                 }
-                let selectedEntryId: ChatListFilterTabEntryId = selectedFilter.flatMap { .filter($0) } ?? .all
-                strongSelf.tabContainerData = (resolvedItems, selectedEntryId)
-                
-                let isEmpty = resolvedItems.count <= 1
-                
-                if wasEmpty != isEmpty {
-                    strongSelf.navigationBar?.setSecondaryContentNode(isEmpty ? nil : strongSelf.tabContainerNode)
-                    if let parentController = strongSelf.parent as? TabBarController {
-                        parentController.navigationBar?.setSecondaryContentNode(isEmpty ? nil : strongSelf.tabContainerNode)
-                    }
-                }
-                
-                if let layout = strongSelf.validLayout {
-                    if wasEmpty != isEmpty {
-                        strongSelf.containerLayoutUpdated(layout, transition: .immediate)
-                        (strongSelf.parent as? TabBarController)?.updateLayout()
-                    } else {
-                        strongSelf.tabContainerNode.update(size: CGSize(width: layout.size.width, height: NavigationBar.defaultSecondaryContentHeight), sideInset: layout.safeInsets.left, filters: resolvedItems, selectedFilter: selectedEntryId, presentationData: strongSelf.presentationData, transition: .animated(duration: 0.4, curve: .spring))
-                    }
-                }
-            })
+                strongSelf.tabContainerNode.update(size: CGSize(width: layout.size.width, height: 46.0), sideInset: layout.safeInsets.left, filters: tabContainerData, selectedFilter: filter, isReordering: strongSelf.chatListDisplayNode.isReorderingFilters || strongSelf.chatListDisplayNode.containerNode.currentItemNode.currentState.editing, isEditing: false, transitionFraction: fraction, presentationData: strongSelf.presentationData, transition: transition)
+            }
+            self.reloadFilters()
         }
         
         self.tabContainerNode.tabSelected = { [weak self] id in
             guard let strongSelf = self else {
                 return
             }
-            let _ = (strongSelf.context.account.postbox.transaction { transaction -> [ChatListFilter] in
-                let settings = transaction.getPreferencesEntry(key: PreferencesKeys.chatListFilters) as? ChatListFiltersState ?? ChatListFiltersState.default
-                return settings.filters
-            }
+            let _ = (currentChatListFilters(postbox: strongSelf.context.account.postbox)
             |> deliverOnMainQueue).start(next: { [weak self] filters in
                 guard let strongSelf = self else {
                     return
                 }
-                let previousFilter = strongSelf.chatListDisplayNode.chatListNode.chatListFilter
                 let updatedFilter: ChatListFilter?
                 switch id {
                 case .all:
@@ -518,29 +493,16 @@ public class ChatListControllerImpl: TelegramBaseController, ChatListController,
                         updatedFilter = nil
                     }
                 }
-                if previousFilter?.id != updatedFilter?.id {
-                    var paneSwitchAnimationDirection: ChatListNodePaneSwitchAnimationDirection?
-                    if let previousId = previousFilter?.id, let updatedId = updatedFilter?.id, let previousIndex = filters.index(where: { $0.id == previousId }), let updatedIndex = filters.index(where: { $0.id == updatedId }) {
-                        if previousIndex > updatedIndex {
-                            paneSwitchAnimationDirection = .right
-                        } else {
-                            paneSwitchAnimationDirection = .left
-                        }
-                    } else if (previousFilter != nil) != (updatedFilter != nil) {
-                        if previousFilter != nil {
-                            paneSwitchAnimationDirection = .right
-                        } else {
-                            paneSwitchAnimationDirection = .left
-                        }
-                    }
-                    if let direction = paneSwitchAnimationDirection {
-                        strongSelf.chatListDisplayNode.chatListNode.paneSwitchAnimation = (direction, .animated(duration: 0.4, curve: .spring))
-                    }
-                }
-                strongSelf.chatListDisplayNode.chatListNode.updateFilter(updatedFilter)
+                strongSelf.chatListDisplayNode.containerNode.switchToFilter(id: updatedFilter.flatMap { .filter($0.id) } ?? .all)
             })
         }
         
+        self.tabContainerNode.tabRequestedDeletion = { [weak self] id in
+            if case let .filter(id) = id {
+                self?.askForFilterRemoval(id: id)
+            }
+        }
+        
         self.tabContainerNode.addFilter = { [weak self] in
             self?.openFilterSettings()
         }
@@ -549,47 +511,21 @@ public class ChatListControllerImpl: TelegramBaseController, ChatListController,
             guard let strongSelf = self else {
                 return
             }
-            var items: [ContextMenuItem] = []
-            items.append(.action(ContextMenuActionItem(text: strongSelf.presentationData.strings.Common_Edit, icon: { _ in
-                return nil
-            }, action: { c, f in
-                c.dismiss(completion: {
-                    guard let strongSelf = self else {
-                        return
-                    }
-                    let _ = (strongSelf.context.account.postbox.transaction { transaction -> [ChatListFilter] in
-                        let settings = transaction.getPreferencesEntry(key: PreferencesKeys.chatListFilters) as? ChatListFiltersState ?? ChatListFiltersState.default
-                        return settings.filters
-                    }
-                    |> deliverOnMainQueue).start(next: { presetList in
-                        guard let strongSelf = self else {
-                            return
-                        }
-                        var found = false
-                        for filter in presetList {
-                            if filter.id == id {
-                                strongSelf.push(chatListFilterPresetController(context: strongSelf.context, currentPreset: filter, updated: { _ in }))
-                                f(.dismissWithoutContent)
-                                found = true
-                                break
-                            }
-                        }
-                    })
-                })
-            })))
-            if let chatListFilter = strongSelf.chatListDisplayNode.chatListNode.chatListFilter, chatListFilter.includePeers.count < 100 {
+            let _ = (currentChatListFilters(postbox: strongSelf.context.account.postbox)
+            |> deliverOnMainQueue).start(next: { [weak self] filters in
+                guard let strongSelf = self else {
+                    return
+                }
+                var items: [ContextMenuItem] = []
                 //TODO:localization
-                items.append(.action(ContextMenuActionItem(text: "Add Chats", icon: { _ in
-                    return nil
+                items.append(.action(ContextMenuActionItem(text: "Edit Folder", icon: { theme in
+                    return generateTintedImage(image: UIImage(bundleImageName: "Chat/Context Menu/Edit"), color: theme.contextMenu.primaryColor)
                 }, action: { c, f in
                     c.dismiss(completion: {
                         guard let strongSelf = self else {
                             return
                         }
-                        let _ = (strongSelf.context.account.postbox.transaction { transaction -> [ChatListFilter] in
-                            let settings = transaction.getPreferencesEntry(key: PreferencesKeys.chatListFilters) as? ChatListFiltersState ?? ChatListFiltersState.default
-                            return settings.filters
-                        }
+                        let _ = (currentChatListFilters(postbox: strongSelf.context.account.postbox)
                         |> deliverOnMainQueue).start(next: { presetList in
                             guard let strongSelf = self else {
                                 return
@@ -597,19 +533,84 @@ public class ChatListControllerImpl: TelegramBaseController, ChatListController,
                             var found = false
                             for filter in presetList {
                                 if filter.id == id {
-                                    strongSelf.push(chatListFilterAddChatsController(context: strongSelf.context, filter: filter))
+                                    strongSelf.push(chatListFilterPresetController(context: strongSelf.context, currentPreset: filter, updated: { _ in }))
                                     f(.dismissWithoutContent)
                                     found = true
                                     break
                                 }
                             }
+                            if !found {
+                                f(.default)
+                            }
                         })
                     })
                 })))
-            }
-            
-            let controller = ContextController(account: strongSelf.context.account, presentationData: strongSelf.presentationData, source: .extracted(ChatListHeaderBarContextExtractedContentSource(controller: strongSelf, sourceNode: sourceNode)), items: .single(items), reactionItems: [], recognizer: nil, gesture: gesture)
-            strongSelf.context.sharedContext.mainWindow?.presentInGlobalOverlay(controller)
+                if let filter = filters.first(where: { $0.id == id }), filter.data.includePeers.count < 100 {
+                    //TODO:localization
+                    items.append(.action(ContextMenuActionItem(text: "Add Chats", icon: { theme in
+                        return generateTintedImage(image: UIImage(bundleImageName: "Chat/Context Menu/Add"), color: theme.contextMenu.primaryColor)
+                    }, action: { c, f in
+                        c.dismiss(completion: {
+                            guard let strongSelf = self else {
+                                return
+                            }
+                            let _ = (currentChatListFilters(postbox: strongSelf.context.account.postbox)
+                            |> deliverOnMainQueue).start(next: { presetList in
+                                guard let strongSelf = self else {
+                                    return
+                                }
+                                var found = false
+                                for filter in presetList {
+                                    if filter.id == id {
+                                        strongSelf.push(chatListFilterAddChatsController(context: strongSelf.context, filter: filter))
+                                        f(.dismissWithoutContent)
+                                        found = true
+                                        break
+                                    }
+                                }
+                                if !found {
+                                    f(.default)
+                                }
+                            })
+                        })
+                    })))
+                    //TODO:localize
+                    items.append(.action(ContextMenuActionItem(text: "Remove", textColor: .destructive, icon: { theme in
+                        return generateTintedImage(image: UIImage(bundleImageName: "Chat/Context Menu/Delete"), color: theme.contextMenu.destructiveColor)
+                    }, action: { c, f in
+                        c.dismiss(completion: {
+                            guard let strongSelf = self else {
+                                return
+                            }
+                            strongSelf.askForFilterRemoval(id: id)
+                        })
+                    })))
+                    
+                    if filters.count > 1 {
+                        items.append(.separator)
+                        items.append(.action(ContextMenuActionItem(text: "Reorder Tabs", icon: { theme in
+                            return generateTintedImage(image: UIImage(bundleImageName: "Chat/Context Menu/ReorderItems"), color: theme.contextMenu.primaryColor)
+                        }, action: { c, f in
+                            //f(.default)
+                            c.dismiss(completion: {
+                                guard let strongSelf = self else {
+                                    return
+                                }
+                                
+                                strongSelf.chatListDisplayNode.isReorderingFilters = true
+                                strongSelf.isReorderingTabsValue.set(true)
+                                strongSelf.searchContentNode?.setIsEnabled(false, animated: true)
+                                if let layout = strongSelf.validLayout {
+                                    strongSelf.updateLayout(layout: layout, transition: .animated(duration: 0.2, curve: .easeInOut))
+                                }
+                            })
+                        })))
+                    }
+                }
+                
+                let controller = ContextController(account: strongSelf.context.account, presentationData: strongSelf.presentationData, source: .extracted(ChatListHeaderBarContextExtractedContentSource(controller: strongSelf, sourceNode: sourceNode)), items: .single(items), reactionItems: [], recognizer: nil, gesture: gesture)
+                strongSelf.context.sharedContext.mainWindow?.presentInGlobalOverlay(controller)
+            })
         }
     }
 
@@ -626,7 +627,8 @@ public class ChatListControllerImpl: TelegramBaseController, ChatListController,
         self.suggestLocalizationDisposable.dispose()
         self.presentationDataDisposable?.dispose()
         self.stateDisposable.dispose()
-        self.filterDisposable?.dispose()
+        self.filterDisposable.dispose()
+        self.featuredFiltersDisposable.dispose()
     }
     
     private func updateThemeAndStrings() {
@@ -642,11 +644,7 @@ public class ChatListControllerImpl: TelegramBaseController, ChatListController,
         }
         
         self.searchContentNode?.updateThemeAndPlaceholder(theme: self.presentationData.theme, placeholder: self.presentationData.strings.DialogList_SearchLabel)
-        var editing = false
-        self.chatListDisplayNode.chatListNode.updateState { state in
-            editing = state.editing
-            return state
-        }
+        let editing = self.chatListDisplayNode.containerNode.currentItemNode.currentState.editing
         let editItem: UIBarButtonItem
         if editing {
             editItem = UIBarButtonItem(title: self.presentationData.strings.Common_Done, style: .done, target: self, action: #selector(self.donePressed))
@@ -669,6 +667,10 @@ public class ChatListControllerImpl: TelegramBaseController, ChatListController,
         self.statusBar.statusBarStyle = self.presentationData.theme.rootController.statusBarStyle.style
         self.navigationBar?.updatePresentationData(NavigationBarPresentationData(presentationData: self.presentationData))
         
+        if let layout = self.validLayout {
+            self.tabContainerNode.update(size: CGSize(width: layout.size.width, height: 46.0), sideInset: layout.safeInsets.left, filters: self.tabContainerData ?? [], selectedFilter: self.chatListDisplayNode.containerNode.currentItemFilter, isReordering: self.chatListDisplayNode.isReorderingFilters || self.chatListDisplayNode.containerNode.currentItemNode.currentState.editing, isEditing: false, transitionFraction: self.chatListDisplayNode.containerNode.transitionFraction, presentationData: self.presentationData, transition: .immediate)
+        }
+        
         if self.isNodeLoaded {
             self.chatListDisplayNode.updatePresentationData(self.presentationData)
         }
@@ -676,7 +678,6 @@ public class ChatListControllerImpl: TelegramBaseController, ChatListController,
     
     override public func loadDisplayNode() {
         self.displayNode = ChatListControllerNode(context: self.context, groupId: self.groupId, filter: self.filter, previewing: self.previewing, controlsHistoryPreload: self.controlsHistoryPreload, presentationData: self.presentationData, controller: self)
-        self.chatListFilterValue.set(self.chatListDisplayNode.chatListNode.appliedChatListFilterSignal)
         
         self.chatListDisplayNode.navigationBar = self.navigationBar
         
@@ -684,37 +685,37 @@ public class ChatListControllerImpl: TelegramBaseController, ChatListController,
             self?.deactivateSearch(animated: true)
         }
         
-        self.chatListDisplayNode.chatListNode.activateSearch = { [weak self] in
+        self.chatListDisplayNode.containerNode.activateSearch = { [weak self] in
             self?.activateSearch()
         }
         
-        self.chatListDisplayNode.chatListNode.presentAlert = { [weak self] text in
+        self.chatListDisplayNode.containerNode.presentAlert = { [weak self] text in
             if let strongSelf = self {
                 self?.present(textAlertController(context: strongSelf.context, title: nil, text: text, actions: [TextAlertAction(type: .defaultAction, title: strongSelf.presentationData.strings.Common_OK, action: {})]), in: .window(.root))
             }
         }
         
-        self.chatListDisplayNode.chatListNode.present = { [weak self] c in
+        self.chatListDisplayNode.containerNode.present = { [weak self] c in
             if let strongSelf = self {
-                self?.present(c, in: .window(.root))
+                strongSelf.present(c, in: .window(.root))
             }
         }
         
-        self.chatListDisplayNode.chatListNode.toggleArchivedFolderHiddenByDefault = { [weak self] in
+        self.chatListDisplayNode.containerNode.toggleArchivedFolderHiddenByDefault = { [weak self] in
             guard let strongSelf = self else {
                 return
             }
             strongSelf.toggleArchivedFolderHiddenByDefault()
         }
         
-        self.chatListDisplayNode.chatListNode.deletePeerChat = { [weak self] peerId in
+        self.chatListDisplayNode.containerNode.deletePeerChat = { [weak self] peerId in
             guard let strongSelf = self else {
                 return
             }
             strongSelf.deletePeerChat(peerId: peerId)
         }
         
-        self.chatListDisplayNode.chatListNode.peerSelected = { [weak self] peerId, animated, isAd in
+        self.chatListDisplayNode.containerNode.peerSelected = { [weak self] peer, animated, isAd in
             if let strongSelf = self {
                 if let navigationController = strongSelf.navigationController as? NavigationController {
                     if isAd {
@@ -738,37 +739,37 @@ public class ChatListControllerImpl: TelegramBaseController, ChatListController,
                         scrollToEndIfExists = true
                     }
                     
-                    strongSelf.context.sharedContext.navigateToChatController(NavigateToChatControllerParams(navigationController: navigationController, context: strongSelf.context, chatLocation: .peer(peerId), scrollToEndIfExists: scrollToEndIfExists, options: strongSelf.groupId == PeerGroupId.root ? [.removeOnMasterDetails] : [], parentGroupId: strongSelf.groupId, completion: { [weak self] in
-                        self?.chatListDisplayNode.chatListNode.clearHighlightAnimated(true)
+                    strongSelf.context.sharedContext.navigateToChatController(NavigateToChatControllerParams(navigationController: navigationController, context: strongSelf.context, chatLocation: .peer(peer.id), scrollToEndIfExists: scrollToEndIfExists, options: strongSelf.groupId == PeerGroupId.root ? [.removeOnMasterDetails] : [], parentGroupId: strongSelf.groupId, completion: { [weak self] in
+                        self?.chatListDisplayNode.containerNode.currentItemNode.clearHighlightAnimated(true)
                     }))
                 }
             }
         }
         
-        self.chatListDisplayNode.chatListNode.groupSelected = { [weak self] groupId in
+        self.chatListDisplayNode.containerNode.groupSelected = { [weak self] groupId in
             if let strongSelf = self {
                 if let navigationController = strongSelf.navigationController as? NavigationController {
                     let chatListController = ChatListControllerImpl(context: strongSelf.context, groupId: groupId, controlsHistoryPreload: false, enableDebugActions: false)
                     chatListController.navigationPresentation = .master
                     navigationController.pushViewController(chatListController)
-                    strongSelf.chatListDisplayNode.chatListNode.clearHighlightAnimated(true)
+                    strongSelf.chatListDisplayNode.containerNode.currentItemNode.clearHighlightAnimated(true)
                 }
             }
         }
         
-        self.chatListDisplayNode.chatListNode.updatePeerGrouping = { [weak self] peerId, group in
+        self.chatListDisplayNode.containerNode.updatePeerGrouping = { [weak self] peerId, group in
             guard let strongSelf = self else {
                 return
             }
             if group {
                 strongSelf.archiveChats(peerIds: [peerId])
             } else {
-                strongSelf.chatListDisplayNode.chatListNode.setCurrentRemovingPeerId(peerId)
+                strongSelf.chatListDisplayNode.containerNode.currentItemNode.setCurrentRemovingPeerId(peerId)
                 let _ = updatePeerGroupIdInteractively(postbox: strongSelf.context.account.postbox, peerId: peerId, groupId: group ? Namespaces.PeerGroup.archive : .root).start(completed: {
                     guard let strongSelf = self else {
                         return
                     }
-                    strongSelf.chatListDisplayNode.chatListNode.setCurrentRemovingPeerId(nil)
+                    strongSelf.chatListDisplayNode.containerNode.currentItemNode.setCurrentRemovingPeerId(nil)
                 })
             }
         }
@@ -786,7 +787,7 @@ public class ChatListControllerImpl: TelegramBaseController, ChatListController,
                             strongSelf.context.sharedContext.navigateToChatController(NavigateToChatControllerParams(navigationController: navigationController, context: strongSelf.context, chatLocation: .peer(actualPeerId), subject: .message(messageId), purposefulAction: {
                                 self?.deactivateSearch(animated: false)
                             }, scrollToEndIfExists: scrollToEndIfExists, options:  strongSelf.groupId == PeerGroupId.root ? [.removeOnMasterDetails] : []))
-                            strongSelf.chatListDisplayNode.chatListNode.clearHighlightAnimated(true)
+                            strongSelf.chatListDisplayNode.containerNode.currentItemNode.clearHighlightAnimated(true)
                         }
                     }
                 }))
@@ -815,7 +816,7 @@ public class ChatListControllerImpl: TelegramBaseController, ChatListController,
                             strongSelf.context.sharedContext.navigateToChatController(NavigateToChatControllerParams(navigationController: navigationController, context: strongSelf.context, chatLocation: .peer(peer.id), purposefulAction: { [weak self] in
                                 self?.deactivateSearch(animated: false)
                             }, scrollToEndIfExists: scrollToEndIfExists, options:  strongSelf.groupId == PeerGroupId.root ? [.removeOnMasterDetails] : []))
-                            strongSelf.chatListDisplayNode.chatListNode.clearHighlightAnimated(true)
+                            strongSelf.chatListDisplayNode.containerNode.currentItemNode.clearHighlightAnimated(true)
                         }
                     }
                 }))
@@ -860,14 +861,17 @@ public class ChatListControllerImpl: TelegramBaseController, ChatListController,
             }
         }
         
-        self.chatListDisplayNode.dismissSelf = { [weak self] in
+        self.chatListDisplayNode.dismissSelfIfCompletedPresentation = { [weak self] in
             guard let strongSelf = self, let navigationController = strongSelf.navigationController as? NavigationController else {
                 return
             }
+            if !strongSelf.didAppear {
+                return
+            }
             navigationController.filterController(strongSelf, animated: true)
         }
         
-        self.chatListDisplayNode.chatListNode.contentOffsetChanged = { [weak self] offset in
+        self.chatListDisplayNode.containerNode.contentOffsetChanged = { [weak self] offset in
             if let strongSelf = self, let searchContentNode = strongSelf.searchContentNode, let validLayout = strongSelf.validLayout {
                 var offset = offset
                 if validLayout.inVoiceOver {
@@ -877,7 +881,7 @@ public class ChatListControllerImpl: TelegramBaseController, ChatListController,
             }
         }
         
-        self.chatListDisplayNode.chatListNode.contentScrollingEnded = { [weak self] listView in
+        self.chatListDisplayNode.containerNode.contentScrollingEnded = { [weak self] listView in
             if let strongSelf = self, let searchContentNode = strongSelf.searchContentNode {
                 return fixListNodeScrolling(listView, searchNode: searchContentNode)
             } else {
@@ -885,19 +889,11 @@ public class ChatListControllerImpl: TelegramBaseController, ChatListController,
             }
         }
         
-        self.chatListDisplayNode.isEmptyUpdated = { [weak self] isEmpty in
-            if let strongSelf = self, let searchContentNode = strongSelf.searchContentNode, let _ = strongSelf.validLayout {
-                if isEmpty {
-                    //searchContentNode.updateListVisibleContentOffset(.known(0.0))
-                }
-            }
-        }
-        
         self.chatListDisplayNode.emptyListAction = { [weak self] in
             guard let strongSelf = self else {
                 return
             }
-            if let filter = strongSelf.chatListDisplayNode.chatListNode.chatListFilter {
+            if let filter = strongSelf.chatListDisplayNode.containerNode.currentItemNode.chatListFilter {
                 strongSelf.push(chatListFilterPresetController(context: strongSelf.context, currentPreset: filter, updated: { _ in }))
             } else {
                 strongSelf.composePressed()
@@ -908,7 +904,7 @@ public class ChatListControllerImpl: TelegramBaseController, ChatListController,
             self?.toolbarActionSelected(action: action)
         }
         
-        self.chatListDisplayNode.chatListNode.activateChatPreview = { [weak self] item, node, gesture in
+        self.chatListDisplayNode.containerNode.activateChatPreview = { [weak self] item, node, gesture in
             guard let strongSelf = self else {
                 gesture?.cancel()
                 return
@@ -922,7 +918,7 @@ public class ChatListControllerImpl: TelegramBaseController, ChatListController,
             case let .peer(peer):
                 let chatController = strongSelf.context.sharedContext.makeChatController(context: strongSelf.context, chatLocation: .peer(peer.peer.peerId), subject: nil, botStart: nil, mode: .standard(previewing: true))
                 chatController.canReadHistory.set(false)
-                let contextController = ContextController(account: strongSelf.context.account, presentationData: strongSelf.presentationData, source: .controller(ContextControllerContentSourceImpl(controller: chatController, sourceNode: node, navigationController: strongSelf.navigationController as? NavigationController)), items: chatContextMenuItems(context: strongSelf.context, peerId: peer.peer.peerId, source: .chatList, chatListController: strongSelf), reactionItems: [], gesture: gesture)
+                let contextController = ContextController(account: strongSelf.context.account, presentationData: strongSelf.presentationData, source: .controller(ContextControllerContentSourceImpl(controller: chatController, sourceNode: node, navigationController: strongSelf.navigationController as? NavigationController)), items: chatContextMenuItems(context: strongSelf.context, peerId: peer.peer.peerId, source: .chatList(isFilter: strongSelf.chatListDisplayNode.containerNode.currentItemNode.chatListFilter != nil), chatListController: strongSelf), reactionItems: [], gesture: gesture)
                 strongSelf.presentInGlobalOverlay(contextController)
             }
         }
@@ -940,7 +936,7 @@ public class ChatListControllerImpl: TelegramBaseController, ChatListController,
         }
         
         let context = self.context
-        let peerIdsAndOptions: Signal<(ChatListSelectionOptions, Set<PeerId>)?, NoError> = self.chatListDisplayNode.chatListNode.state
+        let peerIdsAndOptions: Signal<(ChatListSelectionOptions, Set<PeerId>)?, NoError> = self.chatListDisplayNode.containerNode.currentItemState
         |> map { state -> Set<PeerId>? in
             if !state.editing {
                 return nil
@@ -988,7 +984,7 @@ public class ChatListControllerImpl: TelegramBaseController, ChatListController,
                             }
                         }
                     }
-                    toolbar = Toolbar(leftAction: leftAction, rightAction: ToolbarAction(title: presentationData.strings.Common_Delete, isEnabled: options.delete), middleAction: strongSelf.chatListDisplayNode.chatListNode.chatListFilter != nil ? nil : ToolbarAction(title: presentationData.strings.ChatList_ArchiveAction, isEnabled: archiveEnabled))
+                    toolbar = Toolbar(leftAction: leftAction, rightAction: ToolbarAction(title: presentationData.strings.Common_Delete, isEnabled: options.delete), middleAction: strongSelf.chatListDisplayNode.containerNode.currentItemNode.chatListFilter != nil ? nil : ToolbarAction(title: presentationData.strings.ChatList_ArchiveAction, isEnabled: archiveEnabled))
                 }
             } else {
                 if let (options, peerIds) = peerIdsAndOptions {
@@ -1006,7 +1002,7 @@ public class ChatListControllerImpl: TelegramBaseController, ChatListController,
             strongSelf.setToolbar(toolbar, transition: .animated(duration: 0.3, curve: .easeInOut))
         }))
         
-        self.ready.set(self.chatListDisplayNode.chatListNode.ready)
+        self.ready.set(self.chatListDisplayNode.containerNode.ready)
         
         self.displayNodeDidLoad()
     }
@@ -1014,6 +1010,10 @@ public class ChatListControllerImpl: TelegramBaseController, ChatListController,
     override public func viewDidAppear(_ animated: Bool) {
         super.viewDidAppear(animated)
         
+        self.didAppear = true
+        
+        self.chatListDisplayNode.containerNode.updateEnableAdjacentFilterLoading(true)
+        
         guard case .root = self.groupId else {
             return
         }
@@ -1105,7 +1105,7 @@ public class ChatListControllerImpl: TelegramBaseController, ChatListController,
             }))
         }
         
-        self.chatListDisplayNode.chatListNode.addedVisibleChatsWithPeerIds = { [weak self] peerIds in
+        self.chatListDisplayNode.containerNode.addedVisibleChatsWithPeerIds = { [weak self] peerIds in
             guard let strongSelf = self else {
                 return
             }
@@ -1124,17 +1124,71 @@ public class ChatListControllerImpl: TelegramBaseController, ChatListController,
                 return true
             })
         }
+        
+        if !self.processedFeaturedFilters {
+            self.featuredFiltersDisposable.set((
+                self.context.account.postbox.transaction { transaction -> ChatListFiltersFeaturedState? in
+                    return transaction.getPreferencesEntry(key: PreferencesKeys.chatListFiltersFeaturedState) as? ChatListFiltersFeaturedState
+                }
+                |> delay(1.0, queue: .mainQueue())
+                |> deliverOnMainQueue
+            ).start(next: { [weak self] featuredState in
+                guard let strongSelf = self, let featuredState = featuredState else {
+                    return
+                }
+                
+                let _ = (currentChatListFilters(postbox: strongSelf.context.account.postbox)
+                |> deliverOnMainQueue).start(next: { filters in
+                    guard let strongSelf = self else {
+                        return
+                    }
+                    strongSelf.processedFeaturedFilters = true
+                    if !featuredState.isSeen && !featuredState.filters.isEmpty && filters.isEmpty {
+                        let _ = (currentChatListFilters(postbox: strongSelf.context.account.postbox)
+                        |> deliverOnMainQueue).start(next: { filters in
+                            guard let strongSelf = self else {
+                                return
+                            }
+                            let hasFilters = !filters.isEmpty
+                            if let _ = strongSelf.validLayout, let parentController = strongSelf.parent as? TabBarController, let sourceFrame = parentController.frameForControllerTab(controller: strongSelf) {
+                                let absoluteFrame = sourceFrame
+                                //TODO:localize
+                                let text: String
+                                if hasFilters {
+                                    text = "Hold on 'Chats' to edit folders and switch between views."
+                                } else {
+                                    text = "Hold to organize your chats with folders."
+                                }
+                                parentController.present(TooltipScreen(text: text, location: CGPoint(x: absoluteFrame.midX - 14.0, y: absoluteFrame.minY - 8.0), shouldDismissOnTouch: { point in
+                                    guard let strongSelf = self, let parentController = strongSelf.parent as? TabBarController else {
+                                        return true
+                                    }
+                                    if parentController.isPointInsideContentArea(point: point) {
+                                        return false
+                                    }
+                                    return true
+                                }), in: .current)
+                            }
+                        })
+                    }
+                })
+            }))
+        }
     }
     
     override public func viewWillDisappear(_ animated: Bool) {
         super.viewWillDisappear(animated)
         
+        self.chatListDisplayNode.containerNode.updateEnableAdjacentFilterLoading(false)
+        
         self.forEachController({ controller in
             if let controller = controller as? UndoOverlayController {
                 controller.dismissWithCommitAction()
             }
             return true
         })
+        
+        self.featuredFiltersDisposable.set(nil)
     }
     
     override public func viewDidDisappear(_ animated: Bool) {
@@ -1145,7 +1199,7 @@ public class ChatListControllerImpl: TelegramBaseController, ChatListController,
             self.deactivateSearch(animated: false)
         }
         
-        self.chatListDisplayNode.chatListNode.clearHighlightAnimated(true)
+        self.chatListDisplayNode.containerNode.currentItemNode.clearHighlightAnimated(true)
     }
     
     override public func containerLayoutUpdated(_ layout: ContainerViewLayout, transition: ContainedViewLayoutTransition) {
@@ -1155,19 +1209,23 @@ public class ChatListControllerImpl: TelegramBaseController, ChatListController,
         
         self.validLayout = layout
         
-        var tabContainerOffset: CGFloat = 0.0
-        if !self.displayNavigationBar {
-            tabContainerOffset += layout.statusBarHeight ?? 0.0
-            tabContainerOffset += 44.0 + 44.0 + 44.0
-        }
-        
-        transition.updateFrame(node: self.tabContainerNode, frame: CGRect(origin: CGPoint(x: 0.0, y: self.visualNavigationInsetHeight - self.additionalHeight - NavigationBar.defaultSecondaryContentHeight + tabContainerOffset), size: CGSize(width: layout.size.width, height: NavigationBar.defaultSecondaryContentHeight)))
-        self.tabContainerNode.update(size: CGSize(width: layout.size.width, height: NavigationBar.defaultSecondaryContentHeight), sideInset: layout.safeInsets.left, filters: self.tabContainerData?.0 ?? [], selectedFilter: self.tabContainerData?.1, presentationData: self.presentationData, transition: .animated(duration: 0.4, curve: .spring))
+        self.updateLayout(layout: layout, transition: transition)
         
         if let searchContentNode = self.searchContentNode, layout.inVoiceOver != wasInVoiceOver {
             searchContentNode.updateListVisibleContentOffset(.known(0.0))
-            self.chatListDisplayNode.chatListNode.scrollToPosition(.top)
+            self.chatListDisplayNode.scrollToTop()
         }
+    }
+    
+    private func updateLayout(layout: ContainerViewLayout, transition: ContainedViewLayoutTransition) {
+        var tabContainerOffset: CGFloat = 0.0
+        if !self.displayNavigationBar {
+            tabContainerOffset += layout.statusBarHeight ?? 0.0
+            tabContainerOffset += 44.0 + 20.0
+        }
+        
+        transition.updateFrame(node: self.tabContainerNode, frame: CGRect(origin: CGPoint(x: 0.0, y: self.visualNavigationInsetHeight - self.additionalHeight - 46.0 + tabContainerOffset), size: CGSize(width: layout.size.width, height: 46.0)))
+        self.tabContainerNode.update(size: CGSize(width: layout.size.width, height: 46.0), sideInset: layout.safeInsets.left, filters: self.tabContainerData ?? [], selectedFilter: self.chatListDisplayNode.containerNode.currentItemFilter, isReordering: self.chatListDisplayNode.isReorderingFilters || self.chatListDisplayNode.containerNode.currentItemNode.currentState.editing, isEditing: false, transitionFraction: self.chatListDisplayNode.containerNode.transitionFraction, presentationData: self.presentationData, transition: .animated(duration: 0.4, curve: .spring))
         
         self.chatListDisplayNode.containerLayoutUpdated(layout, navigationBarHeight: self.navigationInsetHeight, visualNavigationHeight: self.visualNavigationInsetHeight, cleanNavigationBarHeight: self.cleanNavigationHeight, transition: transition)
     }
@@ -1188,15 +1246,21 @@ public class ChatListControllerImpl: TelegramBaseController, ChatListController,
         }
         self.searchContentNode?.setIsEnabled(false, animated: true)
         
-        self.chatListDisplayNode.chatListNode.updateState { state in
+        self.chatListDisplayNode.containerNode.updateState { state in
             var state = state
             state.editing = true
             state.peerIdWithRevealedOptions = nil
             return state
         }
+        self.chatListDisplayNode.isEditing = true
+        if let layout = self.validLayout {
+            self.updateLayout(layout: layout, transition: .animated(duration: 0.2, curve: .easeInOut))
+        }
     }
     
     @objc private func donePressed() {
+        self.reorderingDonePressed()
+        
         let editItem = UIBarButtonItem(title: self.presentationData.strings.Common_Edit, style: .plain, target: self, action: #selector(self.editPressed))
         editItem.accessibilityLabel = self.presentationData.strings.Common_Edit
         if case .root = self.groupId, self.filter == nil {
@@ -1206,18 +1270,200 @@ public class ChatListControllerImpl: TelegramBaseController, ChatListController,
         }
         (self.navigationController as? NavigationController)?.updateMasterDetailsBlackout(nil, transition: .animated(duration: 0.4, curve: .spring))
         self.searchContentNode?.setIsEnabled(true, animated: true)
-        self.chatListDisplayNode.chatListNode.updateState { state in
+        self.chatListDisplayNode.containerNode.updateState { state in
             var state = state
             state.editing = false
             state.peerIdWithRevealedOptions = nil
             state.selectedPeerIds.removeAll()
             return state
         }
+        self.chatListDisplayNode.isEditing = false
+        if let layout = self.validLayout {
+            self.updateLayout(layout: layout, transition: .animated(duration: 0.2, curve: .easeInOut))
+        }
+    }
+    
+    @objc private func reorderingDonePressed() {
+        if let reorderedFilterIds = self.tabContainerNode.reorderedFilterIds {
+            let _ = (updateChatListFiltersInteractively(postbox: self.context.account.postbox, { stateFilters in
+                var updatedFilters: [ChatListFilter] = []
+                for id in reorderedFilterIds {
+                    if let index = stateFilters.firstIndex(where: { $0.id == id }) {
+                        updatedFilters.append(stateFilters[index])
+                    }
+                }
+                updatedFilters.append(contentsOf: stateFilters.compactMap { filter -> ChatListFilter? in
+                    if !updatedFilters.contains(where: { $0.id == filter.id }) {
+                        return filter
+                    } else {
+                        return nil
+                    }
+                })
+                return updatedFilters
+            })
+            |> deliverOnMainQueue).start(completed: { [weak self] in
+                guard let strongSelf = self else {
+                    return
+                }
+                strongSelf.reloadFilters(firstUpdate: {
+                    guard let strongSelf = self else {
+                        return
+                    }
+                    strongSelf.chatListDisplayNode.isReorderingFilters = false
+                    strongSelf.isReorderingTabsValue.set(false)
+                    strongSelf.searchContentNode?.setIsEnabled(true, animated: true)
+                    if let layout = strongSelf.validLayout {
+                        strongSelf.updateLayout(layout: layout, transition: .animated(duration: 0.2, curve: .easeInOut))
+                    }
+                })
+            })
+        }
+    }
+    
+    private func reloadFilters(firstUpdate: (() -> Void)? = nil) {
+        let preferencesKey: PostboxViewKey = .preferences(keys: Set([
+            ApplicationSpecificPreferencesKeys.chatListFilterSettings
+        ]))
+        let filterItems = chatListFilterItems(context: self.context)
+        var notifiedFirstUpdate = false
+        self.filterDisposable.set((combineLatest(queue: .mainQueue(),
+                context.account.postbox.combinedView(keys: [
+                preferencesKey
+            ]),
+            filterItems
+        )
+        |> deliverOnMainQueue).start(next: { [weak self] _, countAndFilterItems in
+            guard let strongSelf = self else {
+                return
+            }
+            let (_, items) = countAndFilterItems
+            var filterItems: [ChatListFilterTabEntry] = []
+            filterItems.append(.all(unreadCount: 0))
+            for (filter, unreadCount) in items {
+                filterItems.append(.filter(id: filter.id, text: filter.title, unreadCount: unreadCount))
+            }
+            
+            var resolvedItems = filterItems
+            if strongSelf.groupId != .root {
+                resolvedItems = []
+            }
+            
+            var wasEmpty = false
+            if let tabContainerData = strongSelf.tabContainerData {
+                wasEmpty = tabContainerData.count <= 1
+            } else {
+                wasEmpty = true
+            }
+            var selectedEntryId = strongSelf.chatListDisplayNode.containerNode.currentItemFilter
+            var resetCurrentEntry = false
+            if !resolvedItems.contains(where: { $0.id == selectedEntryId }) {
+                resetCurrentEntry = true
+                if let tabContainerData = strongSelf.tabContainerData {
+                    var found = false
+                    if let index = tabContainerData.firstIndex(where: { $0.id == selectedEntryId }) {
+                        for i in (0 ..< index - 1).reversed() {
+                            if resolvedItems.contains(where: { $0.id == tabContainerData[i].id }) {
+                                selectedEntryId = tabContainerData[i].id
+                                found = true
+                                break
+                            }
+                        }
+                    }
+                    if !found {
+                        selectedEntryId = .all
+                    }
+                } else {
+                    selectedEntryId = .all
+                }
+            }
+            strongSelf.tabContainerData = resolvedItems
+            var availableFilters: [ChatListContainerNodeFilter] = []
+            availableFilters.append(.all)
+            for item in items {
+                availableFilters.append(.filter(item.0))
+            }
+            strongSelf.chatListDisplayNode.containerNode.updateAvailableFilters(availableFilters)
+            
+            let isEmpty = resolvedItems.count <= 1
+            
+            if wasEmpty != isEmpty {
+                strongSelf.navigationBar?.setSecondaryContentNode(isEmpty ? nil : strongSelf.tabContainerNode)
+                if let parentController = strongSelf.parent as? TabBarController {
+                    parentController.navigationBar?.setSecondaryContentNode(isEmpty ? nil : strongSelf.tabContainerNode)
+                }
+            }
+            
+            if let layout = strongSelf.validLayout {
+                if wasEmpty != isEmpty {
+                    strongSelf.containerLayoutUpdated(layout, transition: .immediate)
+                    (strongSelf.parent as? TabBarController)?.updateLayout()
+                } else {
+                    strongSelf.tabContainerNode.update(size: CGSize(width: layout.size.width, height: 46.0), sideInset: layout.safeInsets.left, filters: resolvedItems, selectedFilter: selectedEntryId, isReordering: strongSelf.chatListDisplayNode.isReorderingFilters || strongSelf.chatListDisplayNode.containerNode.currentItemNode.currentState.editing, isEditing: false, transitionFraction: strongSelf.chatListDisplayNode.containerNode.transitionFraction, presentationData: strongSelf.presentationData, transition: .animated(duration: 0.4, curve: .spring))
+                }
+            }
+            
+            if !notifiedFirstUpdate {
+                notifiedFirstUpdate = true
+                firstUpdate?()
+            }
+            
+            if resetCurrentEntry {
+                strongSelf.tabContainerNode.tabSelected?(selectedEntryId)
+            }
+        }))
+    }
+    
+    private func askForFilterRemoval(id: Int32) {
+        let actionSheet = ActionSheetController(presentationData: self.presentationData)
+        
+        //TODO:localization
+        actionSheet.setItemGroups([
+            ActionSheetItemGroup(items: [
+                ActionSheetTextItem(title: "This will remove the filter, your chats will not be deleted."),
+                ActionSheetButtonItem(title: "Remove", color: .destructive, action: { [weak self, weak actionSheet] in
+                    actionSheet?.dismissAnimated()
+                    
+                    guard let strongSelf = self else {
+                        return
+                    }
+                    
+                    let commit: () -> Void = {
+                        guard let strongSelf = self else {
+                            return
+                        }
+                        
+                        if strongSelf.chatListDisplayNode.containerNode.currentItemNode.chatListFilter?.id == id {
+                            if strongSelf.chatListDisplayNode.containerNode.currentItemNode.currentState.editing {
+                                    strongSelf.donePressed()
+                            }
+                        }
+                        
+                        let _ = updateChatListFiltersInteractively(postbox: strongSelf.context.account.postbox, { filters in
+                            return filters.filter({ $0.id != id })
+                        }).start()
+                    }
+                    
+                    if strongSelf.chatListDisplayNode.containerNode.currentItemNode.chatListFilter?.id == id {
+                        strongSelf.chatListDisplayNode.containerNode.switchToFilter(id: .all, completion: {
+                            commit()
+                        })
+                    } else {
+                        commit()
+                    }
+                })
+            ]),
+            ActionSheetItemGroup(items: [
+                ActionSheetButtonItem(title: self.presentationData.strings.Common_Cancel, color: .accent, font: .bold, action: { [weak actionSheet] in
+                    actionSheet?.dismissAnimated()
+                })
+            ])
+        ])
+        self.present(actionSheet, in: .window(.root))
     }
     
     public func activateSearch() {
         if self.displayNavigationBar {
-            let _ = (self.chatListDisplayNode.chatListNode.contentsReady
+            let _ = (self.chatListDisplayNode.containerNode.currentItemNode.contentsReady
             |> take(1)
             |> deliverOnMainQueue).start(completed: { [weak self] in
                 guard let strongSelf = self else {
@@ -1303,10 +1549,10 @@ public class ChatListControllerImpl: TelegramBaseController, ChatListController,
             return nil
         }
         
-        let listLocation = self.view.convert(location, to: self.chatListDisplayNode.chatListNode.view)
+        let listLocation = self.view.convert(location, to: self.chatListDisplayNode.containerNode.currentItemNode.view)
         
         var selectedNode: ChatListItemNode?
-        self.chatListDisplayNode.chatListNode.forEachItemNode { itemNode in
+        self.chatListDisplayNode.containerNode.currentItemNode.forEachItemNode { itemNode in
             if let itemNode = itemNode as? ChatListItemNode, itemNode.frame.contains(listLocation), !itemNode.isDisplayingRevealedOptions {
                 selectedNode = itemNode
             }
@@ -1346,12 +1592,12 @@ public class ChatListControllerImpl: TelegramBaseController, ChatListController,
                 chatController.updatePresentationMode(.standard(previewing: false))
                 if let navigationController = self.navigationController as? NavigationController {
                     self.context.sharedContext.navigateToChatController(NavigateToChatControllerParams(navigationController: navigationController, chatController: chatController, context: self.context, chatLocation: chatController.chatLocation, animated: false))
-                    self.chatListDisplayNode.chatListNode.clearHighlightAnimated(true)
+                    self.chatListDisplayNode.containerNode.currentItemNode.clearHighlightAnimated(true)
                 }
             } else if let chatListController = viewControllerToCommit as? ChatListController {
                 if let navigationController = self.navigationController as? NavigationController {
                     navigationController.pushViewController(chatListController, animated: false, completion: {})
-                    self.chatListDisplayNode.chatListNode.clearHighlightAnimated(true)
+                    self.chatListDisplayNode.containerNode.currentItemNode.clearHighlightAnimated(true)
                 }
             }
         }
@@ -1373,22 +1619,22 @@ public class ChatListControllerImpl: TelegramBaseController, ChatListController,
         let inputShortcuts: [KeyShortcut] = [
             KeyShortcut(title: strings.KeyCommand_JumpToPreviousChat, input: UIKeyCommand.inputUpArrow, modifiers: [.alternate], action: { [weak self] in
                 if let strongSelf = self {
-                    strongSelf.chatListDisplayNode.chatListNode.selectChat(.previous(unread: false))
+                    strongSelf.chatListDisplayNode.containerNode.currentItemNode.selectChat(.previous(unread: false))
                 }
             }),
             KeyShortcut(title: strings.KeyCommand_JumpToNextChat, input: UIKeyCommand.inputDownArrow, modifiers: [.alternate], action: { [weak self] in
                 if let strongSelf = self {
-                    strongSelf.chatListDisplayNode.chatListNode.selectChat(.next(unread: false))
+                    strongSelf.chatListDisplayNode.containerNode.currentItemNode.selectChat(.next(unread: false))
                 }
             }),
             KeyShortcut(title: strings.KeyCommand_JumpToPreviousUnreadChat, input: UIKeyCommand.inputUpArrow, modifiers: [.alternate, .shift], action: { [weak self] in
                 if let strongSelf = self {
-                    strongSelf.chatListDisplayNode.chatListNode.selectChat(.previous(unread: true))
+                    strongSelf.chatListDisplayNode.containerNode.currentItemNode.selectChat(.previous(unread: true))
                 }
             }),
             KeyShortcut(title: strings.KeyCommand_JumpToNextUnreadChat, input: UIKeyCommand.inputDownArrow, modifiers: [.alternate, .shift], action: { [weak self] in
                 if let strongSelf = self {
-                    strongSelf.chatListDisplayNode.chatListNode.selectChat(.next(unread: true))
+                    strongSelf.chatListDisplayNode.containerNode.currentItemNode.selectChat(.next(unread: true))
                 }
             }),
             KeyShortcut(title: strings.KeyCommand_NewMessage, input: "N", modifiers: [.command], action: { [weak self] in
@@ -1403,9 +1649,9 @@ public class ChatListControllerImpl: TelegramBaseController, ChatListController,
         let openChat: (Int) -> Void = { [weak self] index in
             if let strongSelf = self {
                 if index == 0 {
-                    strongSelf.chatListDisplayNode.chatListNode.selectChat(.peerId(strongSelf.context.account.peerId))
+                    strongSelf.chatListDisplayNode.containerNode.currentItemNode.selectChat(.peerId(strongSelf.context.account.peerId))
                 } else {
-                    strongSelf.chatListDisplayNode.chatListNode.selectChat(.index(index - 1))
+                    strongSelf.chatListDisplayNode.containerNode.currentItemNode.selectChat(.index(index - 1))
                 }
             }
         }
@@ -1420,11 +1666,16 @@ public class ChatListControllerImpl: TelegramBaseController, ChatListController,
     }
     
     override public func toolbarActionSelected(action: ToolbarActionOption) {
-        let peerIds = self.chatListDisplayNode.chatListNode.currentState.selectedPeerIds
+        let peerIds = self.chatListDisplayNode.containerNode.currentItemNode.currentState.selectedPeerIds
         if case .left = action {
             let signal: Signal<Void, NoError>
+            var completion: (() -> Void)?
             let context = self.context
             if !peerIds.isEmpty {
+                self.chatListDisplayNode.containerNode.currentItemNode.setCurrentRemovingPeerId(peerIds.first!)
+                completion = { [weak self] in
+                    self?.chatListDisplayNode.containerNode.currentItemNode.setCurrentRemovingPeerId(nil)
+                }
                 signal = self.context.account.postbox.transaction { transaction -> Void in
                     for peerId in peerIds {
                         togglePeerUnreadMarkInteractively(transaction: transaction, viewTracker: context.account.viewTracker, peerId: peerId, setToValue: false)
@@ -1433,12 +1684,19 @@ public class ChatListControllerImpl: TelegramBaseController, ChatListController,
             } else {
                 let groupId = self.groupId
                 signal = self.context.account.postbox.transaction { transaction -> Void in
-                    markAllChatsAsReadInteractively(transaction: transaction, viewTracker: context.account.viewTracker, groupId: groupId, filterPredicate: self.chatListDisplayNode.chatListNode.chatListFilter.flatMap(chatListFilterPredicate))
+                    let filterPredicate = (self.chatListDisplayNode.containerNode.currentItemNode.chatListFilter?.data).flatMap(chatListFilterPredicate)
+                    markAllChatsAsReadInteractively(transaction: transaction, viewTracker: context.account.viewTracker, groupId: groupId, filterPredicate: filterPredicate)
+                    if let filterPredicate = filterPredicate {
+                        for additionalGroupId in filterPredicate.includeAdditionalPeerGroupIds {
+                            markAllChatsAsReadInteractively(transaction: transaction, viewTracker: context.account.viewTracker, groupId: additionalGroupId, filterPredicate: filterPredicate)
+                        }
+                    }
                 }
             }
             let _ = (signal
             |> deliverOnMainQueue).start(completed: { [weak self] in
                 self?.donePressed()
+                completion?()
             })
         } else if case .right = action, !peerIds.isEmpty {
             let actionSheet = ActionSheetController(presentationData: self.presentationData)
@@ -1450,7 +1708,7 @@ public class ChatListControllerImpl: TelegramBaseController, ChatListController,
                     return
                 }
                 
-                strongSelf.chatListDisplayNode.chatListNode.updateState({ state in
+                strongSelf.chatListDisplayNode.containerNode.updateState({ state in
                     var state = state
                     for peerId in peerIds {
                         state.pendingRemovalPeerIds.insert(peerId)
@@ -1494,15 +1752,15 @@ public class ChatListControllerImpl: TelegramBaseController, ChatListController,
                         |> deliverOnMainQueue).start()
                         return true
                     } else if value == .undo {
-                        strongSelf.chatListDisplayNode.chatListNode.setCurrentRemovingPeerId(peerIds.first!)
-                        strongSelf.chatListDisplayNode.chatListNode.updateState({ state in
+                        strongSelf.chatListDisplayNode.containerNode.currentItemNode.setCurrentRemovingPeerId(peerIds.first!)
+                        strongSelf.chatListDisplayNode.containerNode.updateState({ state in
                             var state = state
                             for peerId in peerIds {
                                 state.pendingRemovalPeerIds.remove(peerId)
                             }
                             return state
                         })
-                        self?.chatListDisplayNode.chatListNode.setCurrentRemovingPeerId(peerIds.first!)
+                        self?.chatListDisplayNode.containerNode.currentItemNode.setCurrentRemovingPeerId(peerIds.first!)
                         return true
                     }
                     return false
@@ -1526,7 +1784,7 @@ public class ChatListControllerImpl: TelegramBaseController, ChatListController,
                 self.archiveChats(peerIds: Array(peerIds))
             } else {
                 if !peerIds.isEmpty {
-                    self.chatListDisplayNode.chatListNode.setCurrentRemovingPeerId(peerIds.first!)
+                    self.chatListDisplayNode.containerNode.currentItemNode.setCurrentRemovingPeerId(peerIds.first!)
                     let _ = (self.context.account.postbox.transaction { transaction -> Void in
                         for peerId in peerIds {
                             updatePeerGroupIdInteractively(transaction: transaction, peerId: peerId, groupId: .root)
@@ -1536,7 +1794,7 @@ public class ChatListControllerImpl: TelegramBaseController, ChatListController,
                         guard let strongSelf = self else {
                             return
                         }
-                        strongSelf.chatListDisplayNode.chatListNode.setCurrentRemovingPeerId(nil)
+                        strongSelf.chatListDisplayNode.containerNode.currentItemNode.setCurrentRemovingPeerId(nil)
                         strongSelf.donePressed()
                     })
                 }
@@ -1559,7 +1817,7 @@ public class ChatListControllerImpl: TelegramBaseController, ChatListController,
             guard let strongSelf = self else {
                 return
             }
-            strongSelf.chatListDisplayNode.chatListNode.updateState { state in
+            strongSelf.chatListDisplayNode.containerNode.updateState { state in
                 var state = state
                 if value {
                     state.archiveShouldBeTemporaryRevealed = false
@@ -1677,7 +1935,7 @@ public class ChatListControllerImpl: TelegramBaseController, ChatListController,
                             guard let strongSelf = self else {
                                 return
                             }
-                            strongSelf.chatListDisplayNode.chatListNode.updateState({ state in
+                            strongSelf.chatListDisplayNode.containerNode.updateState({ state in
                                 var state = state
                                 state.pendingClearHistoryPeerIds.insert(peer.peerId)
                                 return state
@@ -1698,7 +1956,7 @@ public class ChatListControllerImpl: TelegramBaseController, ChatListController,
                                         guard let strongSelf = self else {
                                             return
                                         }
-                                        strongSelf.chatListDisplayNode.chatListNode.updateState({ state in
+                                        strongSelf.chatListDisplayNode.containerNode.updateState({ state in
                                             var state = state
                                             state.pendingClearHistoryPeerIds.remove(peer.peerId)
                                             return state
@@ -1706,7 +1964,7 @@ public class ChatListControllerImpl: TelegramBaseController, ChatListController,
                                     })
                                     return true
                                 } else if value == .undo {
-                                    strongSelf.chatListDisplayNode.chatListNode.updateState({ state in
+                                    strongSelf.chatListDisplayNode.containerNode.updateState({ state in
                                         var state = state
                                         state.pendingClearHistoryPeerIds.remove(peer.peerId)
                                         return state
@@ -1870,7 +2128,7 @@ public class ChatListControllerImpl: TelegramBaseController, ChatListController,
             return
         }
         let postbox = self.context.account.postbox
-        self.chatListDisplayNode.chatListNode.setCurrentRemovingPeerId(peerIds[0])
+        self.chatListDisplayNode.containerNode.currentItemNode.setCurrentRemovingPeerId(peerIds[0])
         let _ = (ApplicationSpecificNotice.incrementArchiveChatTips(accountManager: self.context.sharedContext.accountManager, count: 1)
         |> deliverOnMainQueue).start(next: { [weak self] previousHintCount in
             let _ = (postbox.transaction { transaction -> Void in
@@ -1882,7 +2140,7 @@ public class ChatListControllerImpl: TelegramBaseController, ChatListController,
                 guard let strongSelf = self else {
                     return
                 }
-                strongSelf.chatListDisplayNode.chatListNode.setCurrentRemovingPeerId(nil)
+                strongSelf.chatListDisplayNode.containerNode.currentItemNode.setCurrentRemovingPeerId(nil)
         
                 for peerId in peerIds {
                     deleteSendMessageIntents(peerId: peerId)
@@ -1893,7 +2151,7 @@ public class ChatListControllerImpl: TelegramBaseController, ChatListController,
                         return false
                     }
                     if value == .undo {
-                        strongSelf.chatListDisplayNode.chatListNode.setCurrentRemovingPeerId(peerIds[0])
+                        strongSelf.chatListDisplayNode.containerNode.currentItemNode.setCurrentRemovingPeerId(peerIds[0])
                         let _ = (postbox.transaction { transaction -> Void in
                             for peerId in peerIds {
                                 updatePeerGroupIdInteractively(transaction: transaction, peerId: peerId, groupId: .root)
@@ -1903,7 +2161,7 @@ public class ChatListControllerImpl: TelegramBaseController, ChatListController,
                             guard let strongSelf = self else {
                                 return
                             }
-                            strongSelf.chatListDisplayNode.chatListNode.setCurrentRemovingPeerId(nil)
+                            strongSelf.chatListDisplayNode.containerNode.currentItemNode.setCurrentRemovingPeerId(nil)
                         })
                         return true
                     } else {
@@ -1949,13 +2207,13 @@ public class ChatListControllerImpl: TelegramBaseController, ChatListController,
         }
         
         let peerId = peer.peerId
-        self.chatListDisplayNode.chatListNode.setCurrentRemovingPeerId(peerId)
-        self.chatListDisplayNode.chatListNode.updateState({ state in
+        self.chatListDisplayNode.containerNode.currentItemNode.setCurrentRemovingPeerId(peerId)
+        self.chatListDisplayNode.containerNode.updateState({ state in
             var state = state
             state.pendingRemovalPeerIds.insert(peer.peerId)
             return state
         })
-        self.chatListDisplayNode.chatListNode.setCurrentRemovingPeerId(nil)
+        self.chatListDisplayNode.containerNode.currentItemNode.setCurrentRemovingPeerId(nil)
         let statusText: String
         if let channel = chatPeer as? TelegramChannel {
             if deleteGloballyIfPossible {
@@ -1999,7 +2257,7 @@ public class ChatListControllerImpl: TelegramBaseController, ChatListController,
                 return false
             }
             if value == .commit {
-                strongSelf.chatListDisplayNode.chatListNode.setCurrentRemovingPeerId(peerId)
+                strongSelf.chatListDisplayNode.containerNode.currentItemNode.setCurrentRemovingPeerId(peerId)
                 if let channel = chatPeer as? TelegramChannel {
                     strongSelf.context.peerChannelMemberCategoriesContextsManager.externallyRemoved(peerId: channel.id, memberId: strongSelf.context.account.peerId)
                 }
@@ -2007,25 +2265,25 @@ public class ChatListControllerImpl: TelegramBaseController, ChatListController,
                     guard let strongSelf = self else {
                         return
                     }
-                    strongSelf.chatListDisplayNode.chatListNode.updateState({ state in
+                    strongSelf.chatListDisplayNode.containerNode.updateState({ state in
                         var state = state
                         state.pendingRemovalPeerIds.remove(peer.peerId)
                         return state
                     })
-                    strongSelf.chatListDisplayNode.chatListNode.setCurrentRemovingPeerId(nil)
+                    strongSelf.chatListDisplayNode.containerNode.currentItemNode.setCurrentRemovingPeerId(nil)
                     
                     deleteSendMessageIntents(peerId: peerId)
                 })
                 completion()
                 return true
             } else if value == .undo {
-                strongSelf.chatListDisplayNode.chatListNode.setCurrentRemovingPeerId(peerId)
-                strongSelf.chatListDisplayNode.chatListNode.updateState({ state in
+                strongSelf.chatListDisplayNode.containerNode.currentItemNode.setCurrentRemovingPeerId(peerId)
+                strongSelf.chatListDisplayNode.containerNode.updateState({ state in
                     var state = state
                     state.pendingRemovalPeerIds.remove(peer.peerId)
                     return state
                 })
-                strongSelf.chatListDisplayNode.chatListNode.setCurrentRemovingPeerId(nil)
+                strongSelf.chatListDisplayNode.containerNode.currentItemNode.setCurrentRemovingPeerId(nil)
                 return true
             }
             return false
@@ -2050,45 +2308,15 @@ public class ChatListControllerImpl: TelegramBaseController, ChatListController,
     }
     
     private func openFilterSettings() {
-        self.push(chatListFilterPresetListController(context: self.context, updated: { _ in
+        self.chatListDisplayNode.containerNode.updateEnableAdjacentFilterLoading(false)
+        self.push(chatListFilterPresetListController(context: self.context, mode: .modal, dismissed: { [weak self] in
+            self?.chatListDisplayNode.containerNode.updateEnableAdjacentFilterLoading(true)
         }))
     }
     
-    public func presentTabBarPreviewingController(sourceNodes: [ASDisplayNode]) {
-        if self.isNodeLoaded {
-            let _ = (self.context.account.postbox.transaction { transaction -> [ChatListFilter] in
-                let settings = transaction.getPreferencesEntry(key: PreferencesKeys.chatListFilters) as? ChatListFiltersState ?? ChatListFiltersState.default
-                return settings.filters
-            }
-            |> deliverOnMainQueue).start(next: { [weak self] presetList in
-                guard let strongSelf = self else {
-                    return
-                }
-                let controller = TabBarChatListFilterController(context: strongSelf.context, sourceNodes: sourceNodes, presetList: presetList, currentPreset: strongSelf.chatListDisplayNode.chatListNode.chatListFilter, setup: {
-                    guard let strongSelf = self else {
-                        return
-                    }
-                    strongSelf.push(chatListFilterPresetListController(context: strongSelf.context, updated: { _ in
-                    }))
-                }, updatePreset: { value in
-                    guard let strongSelf = self else {
-                        return
-                    }
-                    if let value = value {
-                        strongSelf.tabContainerNode.tabSelected?(.filter(value.id))
-                    }
-                })
-                strongSelf.context.sharedContext.mainWindow?.present(controller, on: .root)
-            })
-        }
-    }
-    
     override public func tabBarItemContextAction(sourceNode: ContextExtractedContentContainingNode, gesture: ContextGesture) {
         let _ = (combineLatest(queue: .mainQueue(),
-            self.context.account.postbox.transaction { transaction -> [ChatListFilter] in
-                let settings = transaction.getPreferencesEntry(key: PreferencesKeys.chatListFilters) as? ChatListFiltersState ?? ChatListFiltersState.default
-                return settings.filters
-            },
+            currentChatListFilters(postbox: self.context.account.postbox),
             chatListFilterItems(context: self.context)
             |> take(1)
         )
@@ -2097,78 +2325,46 @@ public class ChatListControllerImpl: TelegramBaseController, ChatListController,
                 return
             }
             
+            let _ = markChatListFeaturedFiltersAsSeen(postbox: strongSelf.context.account.postbox).start()
+            
             let (_, filterItems) = filterItemsAndTotalCount
             
             var items: [ContextMenuItem] = []
-            items.append(.action(ContextMenuActionItem(text: presetList.isEmpty ? "Add Filter" : "Edit Filters", icon: { theme in
-                return generateTintedImage(image: UIImage(bundleImageName: "Chat/Context Menu/Add"), color: theme.contextMenu.primaryColor)
+            items.append(.action(ContextMenuActionItem(text: presetList.isEmpty ? "Add Folder" : "Edit Folders", icon: { theme in
+                return generateTintedImage(image: UIImage(bundleImageName: presetList.isEmpty ? "Chat/Context Menu/Add" : "Chat/Context Menu/ItemList"), color: theme.contextMenu.primaryColor)
             }, action: { c, f in
                 c.dismiss(completion: {
                     guard let strongSelf = self else {
                         return
                     }
-                    if presetList.isEmpty {
-                        if let navigationController = strongSelf.navigationController as? NavigationController {
-                            var viewControllers = navigationController.viewControllers
-                            //viewControllers.append(chatListFilterPresetListController(context: strongSelf.context, updated: { _ in }))
-                            viewControllers.append(chatListFilterPresetController(context: strongSelf.context, currentPreset: nil, updated: { _ in }))
-                            navigationController.setViewControllers(viewControllers, animated: true)
-                        }
-                    } else {
-                        strongSelf.push(chatListFilterPresetListController(context: strongSelf.context, updated: { _ in }))
-                    }
+                    strongSelf.openFilterSettings()
                 })
             })))
             
+            if strongSelf.chatListDisplayNode.containerNode.currentItemNode.chatListFilter != nil {
+                items.append(.action(ContextMenuActionItem(text: "All Chats", icon: { theme in
+                    return nil
+                }, action: { c, f in
+                    f(.dismissWithoutContent)
+                    guard let strongSelf = self else {
+                        return
+                    }
+                    strongSelf.tabContainerNode.tabSelected?(.all)
+                })))
+            }
+            
             if !presetList.isEmpty {
                 items.append(.separator)
                 
                 for preset in presetList {
-                    enum ChatListFilterType {
-                        case generic
-                        case unmuted
-                        case unread
-                        case channels
-                        case groups
-                        case bots
-                        case secretChats
-                        case privateChats
-                    }
-                    let filterType: ChatListFilterType
-                    if preset.includePeers.isEmpty {
-                        if preset.categories == .all {
-                            if preset.excludeRead {
-                                filterType = .unread
-                            } else if preset.excludeMuted {
-                                filterType = .unmuted
-                            } else {
-                                filterType = .generic
-                            }
-                        } else {
-                            if preset.categories == .channels {
-                                filterType = .channels
-                            } else if preset.categories.isSubset(of: [.publicGroups, .privateGroups]) {
-                                filterType = .groups
-                            } else if preset.categories == .bots {
-                                filterType = .bots
-                            } else if preset.categories == .secretChats {
-                                filterType = .secretChats
-                            } else if preset.categories == .privateChats {
-                                filterType = .privateChats
-                            } else {
-                                filterType = .generic
-                            }
-                        }
-                    } else {
-                        filterType = .generic
-                    }
+                    let filterType = chatListFilterType(preset)
                     var badge = ""
                     for item in filterItems {
                         if item.0.id == preset.id && item.1 != 0 {
                             badge = "\(item.1)"
                         }
                     }
-                    items.append(.action(ContextMenuActionItem(text: preset.title ?? "", badge: badge, icon: { theme in
+                    items.append(.action(ContextMenuActionItem(text: preset.title, badge: badge, icon: { theme in
                         let imageName: String
                         switch filterType {
                         case .generic:
@@ -2183,10 +2379,10 @@ public class ChatListControllerImpl: TelegramBaseController, ChatListController,
                             imageName = "Chat/Context Menu/Groups"
                         case .bots:
                             imageName = "Chat/Context Menu/Bots"
-                        case .secretChats:
-                            imageName = "Chat/Context Menu/Timer"
-                        case .privateChats:
+                        case .contacts:
                             imageName = "Chat/Context Menu/User"
+                        case .nonContacts:
+                            imageName = "Chat/Context Menu/UnknownUser"
                         }
                         return generateTintedImage(image: UIImage(bundleImageName: imageName), color: theme.contextMenu.primaryColor)
                     }, action: { _, f in
@@ -2203,10 +2399,32 @@ public class ChatListControllerImpl: TelegramBaseController, ChatListController,
             strongSelf.context.sharedContext.mainWindow?.presentInGlobalOverlay(controller)
         })
     }
+    
+    override public func tabBarItemSwipeAction(direction: TabBarItemSwipeDirection) {
+        guard let entries = self.tabContainerData, var index = entries.firstIndex(where: { $0.id == self.chatListDisplayNode.containerNode.currentItemFilter }) else {
+            return
+        }
+        switch direction {
+        case .right:
+            if index == 0 {
+                index = entries.count - 1
+            } else {
+                index -= 1
+            }
+        case .left:
+            if index == entries.count - 1 {
+                index = 0
+            } else {
+                index += 1
+            }
+        }
+        self.tabContainerNode.tabSelected?(entries[index].id)
+    }
 }
 
 private final class ChatListTabBarContextExtractedContentSource: ContextExtractedContentSource {
     let keepInPlace: Bool = true
+    let ignoreContentTouches: Bool = true
     
     private let controller: ChatListController
     private let sourceNode: ContextExtractedContentContainingNode
@@ -2227,6 +2445,7 @@ private final class ChatListTabBarContextExtractedContentSource: ContextExtracte
 
 private final class ChatListHeaderBarContextExtractedContentSource: ContextExtractedContentSource {
     let keepInPlace: Bool = false
+    let ignoreContentTouches: Bool = true
     
     private let controller: ChatListController
     private let sourceNode: ContextExtractedContentContainingNode
diff --git a/submodules/ChatListUI/Sources/ChatListControllerNode.swift b/submodules/ChatListUI/Sources/ChatListControllerNode.swift
index 4464bf8cfc..bdde633318 100644
--- a/submodules/ChatListUI/Sources/ChatListControllerNode.swift
+++ b/submodules/ChatListUI/Sources/ChatListControllerNode.swift
@@ -26,19 +26,906 @@ private final class ChatListControllerNodeView: UITracingLayerView, PreviewingHo
     weak var controller: ChatListControllerImpl?
 }
 
-private struct TestItem: Comparable, Identifiable {
-    var value: Int
-    var version: Int
+enum ChatListContainerNodeFilter: Equatable {
+    case all
+    case filter(ChatListFilter)
     
-    var stableId: Int {
-        return self.value
+    var id: ChatListFilterTabEntryId {
+        switch self {
+        case .all:
+            return .all
+        case let .filter(filter):
+            return .filter(filter.id)
+        }
     }
     
-    static func <(lhs: TestItem, rhs: TestItem) -> Bool {
-        if lhs.version != rhs.version {
-            return lhs.version < rhs.version
+    var filter: ChatListFilter? {
+        switch self {
+        case .all:
+            return nil
+        case let .filter(filter):
+            return filter
+        }
+    }
+}
+
+private final class ShimmerEffectNode: ASDisplayNode {
+    private var currentBackgroundColor: UIColor?
+    private var currentForegroundColor: UIColor?
+    private let imageNodeContainer: ASDisplayNode
+    private let imageNode: ASImageNode
+    
+    private var absoluteLocation: (CGRect, CGSize)?
+    private var isCurrentlyInHierarchy = false
+    private var shouldBeAnimating = false
+    
+    override init() {
+        self.imageNodeContainer = ASDisplayNode()
+        self.imageNodeContainer.isLayerBacked = true
+        
+        self.imageNode = ASImageNode()
+        self.imageNode.isLayerBacked = true
+        self.imageNode.displaysAsynchronously = false
+        self.imageNode.displayWithoutProcessing = true
+        self.imageNode.contentMode = .scaleToFill
+        
+        super.init()
+        
+        self.isLayerBacked = true
+        self.clipsToBounds = true
+        
+        self.imageNodeContainer.addSubnode(self.imageNode)
+        self.addSubnode(self.imageNodeContainer)
+    }
+    
+    override func didEnterHierarchy() {
+        super.didEnterHierarchy()
+        
+        self.isCurrentlyInHierarchy = true
+        self.updateAnimation()
+    }
+    
+    override func didExitHierarchy() {
+        super.didExitHierarchy()
+        
+        self.isCurrentlyInHierarchy = false
+        self.updateAnimation()
+    }
+    
+    func update(backgroundColor: UIColor, foregroundColor: UIColor) {
+        if let currentBackgroundColor = self.currentBackgroundColor, currentBackgroundColor.isEqual(backgroundColor), let currentForegroundColor = self.currentForegroundColor, currentForegroundColor.isEqual(foregroundColor) {
+            return
+        }
+        self.currentBackgroundColor = backgroundColor
+        self.currentForegroundColor = foregroundColor
+        
+        self.imageNode.image = generateImage(CGSize(width: 4.0, height: 320.0), opaque: true, scale: 1.0, rotatedContext: { size, context in
+            context.setFillColor(backgroundColor.cgColor)
+            context.fill(CGRect(origin: CGPoint(), size: size))
+            
+            context.clip(to: CGRect(origin: CGPoint(), size: size))
+            
+            let transparentColor = foregroundColor.withAlphaComponent(0.0).cgColor
+            let peakColor = foregroundColor.cgColor
+            
+            var locations: [CGFloat] = [0.0, 0.5, 1.0]
+            let colors: [CGColor] = [transparentColor, peakColor, transparentColor]
+            
+            let colorSpace = CGColorSpaceCreateDeviceRGB()
+            let gradient = CGGradient(colorsSpace: colorSpace, colors: colors as CFArray, locations: &locations)!
+            
+            context.drawLinearGradient(gradient, start: CGPoint(x: 0.0, y: 0.0), end: CGPoint(x: 0.0, y: size.height), options: CGGradientDrawingOptions())
+        })
+    }
+    
+    func updateAbsoluteRect(_ rect: CGRect, within containerSize: CGSize) {
+        if let absoluteLocation = self.absoluteLocation, absoluteLocation.0 == rect && absoluteLocation.1 == containerSize {
+            return
+        }
+        let sizeUpdated = self.absoluteLocation?.1 != containerSize
+        let frameUpdated = self.absoluteLocation?.0 != rect
+        self.absoluteLocation = (rect, containerSize)
+        
+        if sizeUpdated {
+            if self.shouldBeAnimating {
+                self.imageNode.layer.removeAnimation(forKey: "shimmer")
+                self.addImageAnimation()
+            }
+        }
+        
+        if frameUpdated {
+            self.imageNodeContainer.frame = CGRect(origin: CGPoint(x: -rect.minX, y: -rect.minY), size: containerSize)
+        }
+        
+        self.updateAnimation()
+    }
+    
+    private func updateAnimation() {
+        let shouldBeAnimating = self.isCurrentlyInHierarchy && self.absoluteLocation != nil
+        if shouldBeAnimating != self.shouldBeAnimating {
+            self.shouldBeAnimating = shouldBeAnimating
+            if shouldBeAnimating {
+                self.addImageAnimation()
+            } else {
+                self.imageNode.layer.removeAnimation(forKey: "shimmer")
+            }
+        }
+    }
+    
+    private func addImageAnimation() {
+        guard let containerSize = self.absoluteLocation?.1 else {
+            return
+        }
+        let gradientHeight: CGFloat = 250.0
+        self.imageNode.frame = CGRect(origin: CGPoint(x: 0.0, y: -gradientHeight), size: CGSize(width: containerSize.width, height: gradientHeight))
+        let animation = self.imageNode.layer.makeAnimation(from: 0.0 as NSNumber, to: (containerSize.height + gradientHeight) as NSNumber, keyPath: "position.y", timingFunction: CAMediaTimingFunctionName.easeOut.rawValue, duration: 1.3 * 1.0, delay: 0.0, mediaTimingFunction: nil, removeOnCompletion: true, additive: true)
+        animation.repeatCount = Float.infinity
+        animation.beginTime = 1.0
+        self.imageNode.layer.add(animation, forKey: "shimmer")
+    }
+}
+
+private final class ChatListShimmerNode: ASDisplayNode {
+    private let backgroundColorNode: ASDisplayNode
+    private let effectNode: ShimmerEffectNode
+    private let maskNode: ASImageNode
+    private var currentParams: (size: CGSize, presentationData: PresentationData)?
+    
+    override init() {
+        self.backgroundColorNode = ASDisplayNode()
+        self.effectNode = ShimmerEffectNode()
+        self.maskNode = ASImageNode()
+        
+        super.init()
+        
+        self.isUserInteractionEnabled = false
+        
+        self.addSubnode(self.backgroundColorNode)
+        self.addSubnode(self.effectNode)
+        self.addSubnode(self.maskNode)
+    }
+    
+    func update(context: AccountContext, size: CGSize, presentationData: PresentationData, transition: ContainedViewLayoutTransition) {
+        if self.currentParams?.size != size || self.currentParams?.presentationData !== presentationData {
+            self.currentParams = (size, presentationData)
+            
+            let chatListPresentationData = ChatListPresentationData(theme: presentationData.theme, fontSize: presentationData.chatFontSize, strings: presentationData.strings, dateTimeFormat: presentationData.dateTimeFormat, nameSortOrder: presentationData.nameSortOrder, nameDisplayOrder: presentationData.nameDisplayOrder, disableAnimations: true)
+            
+            let peer1 = TelegramUser(id: PeerId(namespace: Namespaces.Peer.CloudUser, id: 1), accessHash: nil, firstName: "FirstName", lastName: nil, username: nil, phone: nil, photo: [], botInfo: nil, restrictionInfo: nil, flags: [])
+            let timestamp1: Int32 = 100000
+            let peers = SimpleDictionary<PeerId, Peer>()
+            let interaction = ChatListNodeInteraction(activateSearch: {}, peerSelected: { _ in }, disabledPeerSelected: { _ in }, togglePeerSelected: { _ in }, additionalCategorySelected: { _ in
+            }, messageSelected: { _, _, _ in}, groupSelected: { _ in }, addContact: { _ in }, setPeerIdWithRevealedOptions: { _, _ in }, setItemPinned: { _, _ in }, setPeerMuted: { _, _ in }, deletePeer: { _ in }, updatePeerGrouping: { _, _ in }, togglePeerMarkedUnread: { _, _ in}, toggleArchivedFolderHiddenByDefault: {}, activateChatPreview: { _, _, gesture in
+                gesture?.cancel()
+            }, present: { _ in })
+            
+            let items = (0 ..< 2).map { _ -> ChatListItem in
+                return ChatListItem(presentationData: chatListPresentationData, context: context, peerGroupId: .root, isInFilter: false, index: ChatListIndex(pinningIndex: 0, messageIndex: MessageIndex(id: MessageId(peerId: peer1.id, namespace: 0, id: 0), timestamp: timestamp1)), content: .peer(message: Message(stableId: 0, stableVersion: 0, id: MessageId(peerId: peer1.id, namespace: 0, id: 0), globallyUniqueId: nil, groupingKey: nil, groupInfo: nil, timestamp: timestamp1, flags: [], tags: [], globalTags: [], localTags: [], forwardInfo: nil, author: peer1, text: "Text", attributes: [], media: [], peers: peers, associatedMessages: SimpleDictionary(), associatedMessageIds: []), peer: RenderedPeer(peer: peer1), combinedReadState: CombinedPeerReadState(states: [(Namespaces.Message.Cloud, PeerReadState.idBased(maxIncomingReadId: 0, maxOutgoingReadId: 0, maxKnownId: 0, count: 0, markedUnread: false))]), notificationSettings: nil, presence: nil, summaryInfo: ChatListMessageTagSummaryInfo(tagSummaryCount: nil, actionsSummaryCount: nil), embeddedState: nil, inputActivities: nil, isAd: false, ignoreUnreadBadge: false, displayAsMessage: false, hasFailedMessages: false), editing: false, hasActiveRevealControls: false, selected: false, header: nil, enableContextActions: false, hiddenOffset: false, interaction: interaction)
+            }
+            
+            var itemNodes: [ChatListItemNode] = []
+            for i in 0 ..< items.count {
+                items[i].nodeConfiguredForParams(async: { f in f() }, params: ListViewItemLayoutParams(width: size.width, leftInset: 0.0, rightInset: 0.0, availableHeight: 100.0), synchronousLoads: false, previousItem: i == 0 ? nil : items[i - 1], nextItem: (i == items.count - 1) ? nil : items[i + 1], completion: { node, apply in
+                    if let itemNode = node as? ChatListItemNode {
+                        itemNodes.append(itemNode)
+                    }
+                    apply().1(ListViewItemApply(isOnScreen: true))
+                })
+            }
+            
+            self.backgroundColorNode.backgroundColor = presentationData.theme.list.mediaPlaceholderColor
+            
+            self.maskNode.image = generateImage(size, rotatedContext: { size, context in
+                context.setFillColor(presentationData.theme.chatList.backgroundColor.cgColor)
+                context.fill(CGRect(origin: CGPoint(), size: size))
+                
+                var currentY: CGFloat = 0.0
+                let fakeLabelPlaceholderHeight: CGFloat = 8.0
+                
+                func fillLabelPlaceholderRect(origin: CGPoint, width: CGFloat) {
+                    let startPoint = origin
+                    let diameter = fakeLabelPlaceholderHeight
+                    context.fillEllipse(in: CGRect(origin: startPoint, size: CGSize(width: diameter, height: diameter)))
+                    context.fillEllipse(in: CGRect(origin: CGPoint(x: startPoint.x + width - diameter, y: startPoint.y), size: CGSize(width: diameter, height: diameter)))
+                    context.fill(CGRect(origin: CGPoint(x: startPoint.x + diameter / 2.0, y: startPoint.y), size: CGSize(width: width - diameter, height: diameter)))
+                }
+                
+                while currentY < size.height {
+                    let sampleIndex = 0
+                    let itemHeight: CGFloat = itemNodes[sampleIndex].contentSize.height
+                    
+                    context.setBlendMode(.copy)
+                    context.setFillColor(UIColor.clear.cgColor)
+                    
+                    context.fillEllipse(in: itemNodes[sampleIndex].avatarNode.frame.offsetBy(dx: 0.0, dy: currentY))
+                    let titleFrame = itemNodes[sampleIndex].titleNode.frame.offsetBy(dx: 0.0, dy: currentY)
+                    fillLabelPlaceholderRect(origin: CGPoint(x: titleFrame.minX, y: floor(titleFrame.midY - fakeLabelPlaceholderHeight / 2.0)), width: 60.0)
+                    
+                    fillLabelPlaceholderRect(origin: CGPoint(x: titleFrame.minX, y: currentY + itemHeight - floor(itemNodes[sampleIndex].titleNode.frame.midY - fakeLabelPlaceholderHeight / 2.0) - fakeLabelPlaceholderHeight), width: 60.0)
+                    
+                    fillLabelPlaceholderRect(origin: CGPoint(x: titleFrame.minX, y: currentY + floor((itemHeight - fakeLabelPlaceholderHeight) / 2.0)), width: 120.0)
+                    fillLabelPlaceholderRect(origin: CGPoint(x: titleFrame.minX + 120.0 + 10.0, y: currentY + floor((itemHeight - fakeLabelPlaceholderHeight) / 2.0)), width: 60.0)
+                    
+                    let dateFrame = itemNodes[sampleIndex].dateNode.frame.offsetBy(dx: 0.0, dy: currentY)
+                    fillLabelPlaceholderRect(origin: CGPoint(x: dateFrame.maxX - 30.0, y: dateFrame.minY), width: 30.0)
+                    
+                    context.setBlendMode(.normal)
+                    context.setFillColor(presentationData.theme.chatList.itemSeparatorColor.cgColor)
+                    context.fill(itemNodes[sampleIndex].separatorNode.frame.offsetBy(dx: 0.0, dy: currentY))
+                    
+                    currentY += itemHeight
+                }
+            })
+            
+            self.effectNode.update(backgroundColor: presentationData.theme.list.mediaPlaceholderColor, foregroundColor: presentationData.theme.list.itemBlocksBackgroundColor.withAlphaComponent(0.4))
+            self.effectNode.updateAbsoluteRect(CGRect(origin: CGPoint(), size: size), within: size)
+        }
+        transition.updateFrame(node: self.backgroundColorNode, frame: CGRect(origin: CGPoint(x: 0.0, y: 0.0), size: size))
+        transition.updateFrame(node: self.maskNode, frame: CGRect(origin: CGPoint(x: 0.0, y: 0.0), size: size))
+        transition.updateFrame(node: self.effectNode, frame: CGRect(origin: CGPoint(x: 0.0, y: 0.0), size: size))
+    }
+}
+
+private final class ChatListContainerItemNode: ASDisplayNode {
+    private let context: AccountContext
+    private var presentationData: PresentationData
+    private let becameEmpty: (ChatListFilter?) -> Void
+    private let emptyAction: (ChatListFilter?) -> Void
+    
+    private var floatingHeaderOffset: CGFloat?
+    
+    private var emptyNode: ChatListEmptyNode?
+    var emptyShimmerEffectNode: ChatListShimmerNode?
+    let listNode: ChatListNode
+    
+    private var validLayout: (CGSize, UIEdgeInsets, CGFloat)?
+    
+    init(context: AccountContext, groupId: PeerGroupId, filter: ChatListFilter?, previewing: Bool, presentationData: PresentationData, becameEmpty: @escaping (ChatListFilter?) -> Void, emptyAction: @escaping (ChatListFilter?) -> Void) {
+        self.context = context
+        self.presentationData = presentationData
+        self.becameEmpty = becameEmpty
+        self.emptyAction = emptyAction
+        
+        self.listNode = ChatListNode(context: context, groupId: groupId, chatListFilter: filter, previewing: previewing, controlsHistoryPreload: false, mode: .chatList, theme: presentationData.theme, fontSize: presentationData.listsFontSize, strings: presentationData.strings, dateTimeFormat: presentationData.dateTimeFormat, nameSortOrder: presentationData.nameSortOrder, nameDisplayOrder: presentationData.nameDisplayOrder, disableAnimations: presentationData.disableAnimations)
+        
+        super.init()
+        
+        self.addSubnode(self.listNode)
+        
+        self.listNode.isEmptyUpdated = { [weak self] isEmptyState, _, transition in
+            guard let strongSelf = self else {
+                return
+            }
+            var needsShimmerNode = false
+            switch isEmptyState {
+            case let .empty(isLoading):
+                if isLoading {
+                    needsShimmerNode = true
+                    
+                    if let emptyNode = strongSelf.emptyNode {
+                        strongSelf.emptyNode = nil
+                        transition.updateAlpha(node: emptyNode, alpha: 0.0, completion: { [weak emptyNode] _ in
+                            emptyNode?.removeFromSupernode()
+                        })
+                    }
+                } else {
+                    if let currentNode = strongSelf.emptyNode {
+                        currentNode.updateIsLoading(isLoading)
+                    } else {
+                        let emptyNode = ChatListEmptyNode(isFilter: filter != nil, isLoading: isLoading, theme: strongSelf.presentationData.theme, strings: strongSelf.presentationData.strings, action: {
+                            self?.emptyAction(filter)
+                        })
+                        strongSelf.emptyNode = emptyNode
+                        strongSelf.addSubnode(emptyNode)
+                        if let (size, insets, _) = strongSelf.validLayout {
+                            let emptyNodeFrame = CGRect(origin: CGPoint(x: 0.0, y: insets.top), size: CGSize(width: size.width, height: size.height - insets.top - insets.bottom))
+                            emptyNode.frame = emptyNodeFrame
+                            emptyNode.updateLayout(size: emptyNodeFrame.size, transition: .immediate)
+                        }
+                        emptyNode.alpha = 0.0
+                        transition.updateAlpha(node: emptyNode, alpha: 1.0)
+                    }
+                }
+                if !isLoading {
+                    strongSelf.becameEmpty(filter)
+                }
+            case .notEmpty:
+                if let emptyNode = strongSelf.emptyNode {
+                    strongSelf.emptyNode = nil
+                    transition.updateAlpha(node: emptyNode, alpha: 0.0, completion: { [weak emptyNode] _ in
+                        emptyNode?.removeFromSupernode()
+                    })
+                }
+            }
+            if needsShimmerNode {
+                if strongSelf.emptyShimmerEffectNode == nil {
+                    let emptyShimmerEffectNode = ChatListShimmerNode()
+                    strongSelf.emptyShimmerEffectNode = emptyShimmerEffectNode
+                    strongSelf.addSubnode(emptyShimmerEffectNode)
+                    if let (size, insets, _) = strongSelf.validLayout, let offset = strongSelf.floatingHeaderOffset {
+                        strongSelf.layoutEmptyShimmerEffectNode(node: emptyShimmerEffectNode, size: size, insets: insets, verticalOffset: offset, transition: .immediate)
+                    }
+                }
+            } else if let emptyShimmerEffectNode = strongSelf.emptyShimmerEffectNode {
+                strongSelf.emptyShimmerEffectNode = nil
+                let emptyNodeTransition = transition.isAnimated ? transition : .animated(duration: 0.3, curve: .easeInOut)
+                emptyNodeTransition.updateAlpha(node: emptyShimmerEffectNode, alpha: 0.0, completion: { [weak emptyShimmerEffectNode] _ in
+                    emptyShimmerEffectNode?.removeFromSupernode()
+                })
+            }
+        }
+        
+        self.listNode.updateFloatingHeaderOffset = { [weak self] offset, transition in
+            guard let strongSelf = self else {
+                return
+            }
+            strongSelf.floatingHeaderOffset = offset
+            if let (size, insets, _) = strongSelf.validLayout, let emptyShimmerEffectNode = strongSelf.emptyShimmerEffectNode {
+                strongSelf.layoutEmptyShimmerEffectNode(node: emptyShimmerEffectNode, size: size, insets: insets, verticalOffset: offset, transition: transition)
+            }
+        }
+    }
+    
+    private func layoutEmptyShimmerEffectNode(node: ChatListShimmerNode, size: CGSize, insets: UIEdgeInsets, verticalOffset: CGFloat, transition: ContainedViewLayoutTransition) {
+        node.update(context: self.context, size: size, presentationData: self.presentationData, transition: .immediate)
+        transition.updateFrameAdditive(node: node, frame: CGRect(origin: CGPoint(x: 0.0, y: verticalOffset), size: size))
+    }
+    
+    func updatePresentationData(_ presentationData: PresentationData) {
+        self.presentationData = presentationData
+        
+        self.listNode.updateThemeAndStrings(theme: presentationData.theme, fontSize: presentationData.listsFontSize, strings: presentationData.strings, dateTimeFormat: presentationData.dateTimeFormat, nameSortOrder: presentationData.nameSortOrder, nameDisplayOrder: presentationData.nameDisplayOrder, disableAnimations: presentationData.disableAnimations)
+        
+        self.emptyNode?.updateThemeAndStrings(theme: presentationData.theme, strings: presentationData.strings)
+    }
+    
+    func updateLayout(size: CGSize, insets: UIEdgeInsets, visualNavigationHeight: CGFloat, transition: ContainedViewLayoutTransition) {
+        self.validLayout = (size, insets, visualNavigationHeight)
+        
+        let (duration, curve) = listViewAnimationDurationAndCurve(transition: transition)
+        let updateSizeAndInsets = ListViewUpdateSizeAndInsets(size: size, insets: insets, duration: duration, curve: curve)
+        
+        transition.updateFrame(node: self.listNode, frame: CGRect(origin: CGPoint(), size: size))
+        self.listNode.visualInsets = UIEdgeInsets(top: visualNavigationHeight, left: 0.0, bottom: 0.0, right: 0.0)
+        self.listNode.updateLayout(transition: transition, updateSizeAndInsets: updateSizeAndInsets)
+        
+        if let emptyNode = self.emptyNode {
+            let emptyNodeFrame = CGRect(origin: CGPoint(x: 0.0, y: insets.top), size: CGSize(width: size.width, height: size.height - insets.top - insets.bottom))
+            transition.updateFrame(node: emptyNode, frame: emptyNodeFrame)
+            emptyNode.updateLayout(size: emptyNodeFrame.size, transition: transition)
+        }
+    }
+}
+
+final class ChatListContainerNode: ASDisplayNode, UIGestureRecognizerDelegate {
+    private let context: AccountContext
+    private let groupId: PeerGroupId
+    private let previewing: Bool
+    private let filterBecameEmpty: (ChatListFilter?) -> Void
+    private let filterEmptyAction: (ChatListFilter?) -> Void
+    
+    private var presentationData: PresentationData
+    
+    private var itemNodes: [ChatListFilterTabEntryId: ChatListContainerItemNode] = [:]
+    private var pendingItemNode: (ChatListFilterTabEntryId, ChatListContainerItemNode, Disposable)?
+    private var availableFilters: [ChatListContainerNodeFilter] = [.all]
+    private var selectedId: ChatListFilterTabEntryId
+    
+    private(set) var transitionFraction: CGFloat = 0.0
+    private var transitionFractionOffset: CGFloat = 0.0
+    private var disableItemNodeOperationsWhileAnimating: Bool = false
+    private var validLayout: (layout: ContainerViewLayout, navigationBarHeight: CGFloat, visualNavigationHeight: CGFloat, cleanNavigationBarHeight: CGFloat, isReorderingFilters: Bool, isEditing: Bool)?
+    
+    private var enableAdjacentFilterLoading: Bool = false
+    
+    private var panRecognizer: InteractiveTransitionGestureRecognizer?
+    
+    private let _ready = Promise<Bool>()
+    var ready: Signal<Bool, NoError> {
+        return _ready.get()
+    }
+    
+    private var currentItemNodeValue: ChatListContainerItemNode?
+    var currentItemNode: ChatListNode {
+        return self.currentItemNodeValue!.listNode
+    }
+    
+    private let currentItemStateValue = Promise<ChatListNodeState>()
+    var currentItemState: Signal<ChatListNodeState, NoError> {
+        return self.currentItemStateValue.get()
+    }
+    
+    var currentItemFilterUpdated: ((ChatListFilterTabEntryId, CGFloat, ContainedViewLayoutTransition, Bool) -> Void)?
+    var currentItemFilter: ChatListFilterTabEntryId {
+        return self.currentItemNode.chatListFilter.flatMap { .filter($0.id) } ?? .all
+    }
+    
+    private func applyItemNodeAsCurrent(id: ChatListFilterTabEntryId, itemNode: ChatListContainerItemNode) {
+        if let previousItemNode = self.currentItemNodeValue {
+            previousItemNode.listNode.activateSearch = nil
+            previousItemNode.listNode.presentAlert = nil
+            previousItemNode.listNode.present = nil
+            previousItemNode.listNode.toggleArchivedFolderHiddenByDefault = nil
+            previousItemNode.listNode.deletePeerChat = nil
+            previousItemNode.listNode.peerSelected = nil
+            previousItemNode.listNode.groupSelected = nil
+            previousItemNode.listNode.updatePeerGrouping = nil
+            previousItemNode.listNode.contentOffsetChanged = nil
+            previousItemNode.listNode.contentScrollingEnded = nil
+            previousItemNode.listNode.activateChatPreview = nil
+            previousItemNode.listNode.addedVisibleChatsWithPeerIds = nil
+            
+            previousItemNode.accessibilityElementsHidden = true
+        }
+        self.currentItemNodeValue = itemNode
+        itemNode.accessibilityElementsHidden = false
+        
+        itemNode.listNode.activateSearch = { [weak self] in
+            self?.activateSearch?()
+        }
+        itemNode.listNode.presentAlert = { [weak self] text in
+            self?.presentAlert?(text)
+        }
+        itemNode.listNode.present = { [weak self] c in
+            self?.present?(c)
+        }
+        itemNode.listNode.toggleArchivedFolderHiddenByDefault = { [weak self] in
+            self?.toggleArchivedFolderHiddenByDefault?()
+        }
+        itemNode.listNode.deletePeerChat = { [weak self] peerId in
+            self?.deletePeerChat?(peerId)
+        }
+        itemNode.listNode.peerSelected = { [weak self] peerId, a, b in
+            self?.peerSelected?(peerId, a, b)
+        }
+        itemNode.listNode.groupSelected = { [weak self] groupId in
+            self?.groupSelected?(groupId)
+        }
+        itemNode.listNode.updatePeerGrouping = { [weak self] peerId, group in
+            self?.updatePeerGrouping?(peerId, group)
+        }
+        itemNode.listNode.contentOffsetChanged = { [weak self] offset in
+            self?.contentOffsetChanged?(offset)
+        }
+        itemNode.listNode.contentScrollingEnded = { [weak self] listView in
+            return self?.contentScrollingEnded?(listView) ?? false
+        }
+        itemNode.listNode.activateChatPreview = { [weak self] item, sourceNode, gesture in
+            self?.activateChatPreview?(item, sourceNode, gesture)
+        }
+        itemNode.listNode.addedVisibleChatsWithPeerIds = { [weak self] ids in
+            self?.addedVisibleChatsWithPeerIds?(ids)
+        }
+        
+        self.currentItemStateValue.set(itemNode.listNode.state)
+    }
+    
+    var activateSearch: (() -> Void)?
+    var presentAlert: ((String) -> Void)?
+    var present: ((ViewController) -> Void)?
+    var toggleArchivedFolderHiddenByDefault: (() -> Void)?
+    var deletePeerChat: ((PeerId) -> Void)?
+    var peerSelected: ((Peer, Bool, Bool) -> Void)?
+    var groupSelected: ((PeerGroupId) -> Void)?
+    var updatePeerGrouping: ((PeerId, Bool) -> Void)?
+    var contentOffsetChanged: ((ListViewVisibleContentOffset) -> Void)?
+    var contentScrollingEnded: ((ListView) -> Bool)?
+    var activateChatPreview: ((ChatListItem, ASDisplayNode, ContextGesture?) -> Void)?
+    var addedVisibleChatsWithPeerIds: (([PeerId]) -> Void)?
+    
+    init(context: AccountContext, groupId: PeerGroupId, previewing: Bool, presentationData: PresentationData, filterBecameEmpty: @escaping (ChatListFilter?) -> Void, filterEmptyAction: @escaping (ChatListFilter?) -> Void) {
+        self.context = context
+        self.groupId = groupId
+        self.previewing = previewing
+        self.filterBecameEmpty = filterBecameEmpty
+        self.filterEmptyAction = filterEmptyAction
+        
+        self.presentationData = presentationData
+        
+        self.selectedId = .all
+        
+        super.init()
+        
+        let itemNode = ChatListContainerItemNode(context: self.context, groupId: self.groupId, filter: nil, previewing: self.previewing, presentationData: presentationData, becameEmpty: { [weak self] filter in
+            self?.filterBecameEmpty(filter)
+        }, emptyAction: { [weak self] filter in
+            self?.filterEmptyAction(filter)
+        })
+        self.itemNodes[.all] = itemNode
+        self.addSubnode(itemNode)
+        
+        self._ready.set(itemNode.listNode.ready)
+        
+        self.applyItemNodeAsCurrent(id: .all, itemNode: itemNode)
+        
+        let panRecognizer = InteractiveTransitionGestureRecognizer(target: self, action: #selector(self.panGesture(_:)), allowedDirections: { [weak self] _ in
+            guard let strongSelf = self, strongSelf.availableFilters.count > 1 else {
+                return []
+            }
+            let directions: InteractiveTransitionGestureRecognizerDirections = [.leftCenter, .rightCenter]
+            return directions
+        }, edgeWidth: .widthMultiplier(factor: 1.0 / 6.0, min: 22.0, max: 80.0))
+        panRecognizer.delegate = self
+        panRecognizer.delaysTouchesBegan = false
+        panRecognizer.cancelsTouchesInView = true
+        self.panRecognizer = panRecognizer
+        self.view.addGestureRecognizer(panRecognizer)
+    }
+    
+    deinit {
+        self.pendingItemNode?.2.dispose()
+    }
+    
+    func gestureRecognizer(_ gestureRecognizer: UIGestureRecognizer, shouldRecognizeSimultaneouslyWith otherGestureRecognizer: UIGestureRecognizer) -> Bool {
+        return false
+    }
+    
+    func gestureRecognizer(_ gestureRecognizer: UIGestureRecognizer, shouldBeRequiredToFailBy otherGestureRecognizer: UIGestureRecognizer) -> Bool {
+        if let _ = otherGestureRecognizer as? InteractiveTransitionGestureRecognizer {
+            return false
+        }
+        if let _ = otherGestureRecognizer as? UIPanGestureRecognizer {
+            return true
+        }
+        return false
+    }
+    
+    @objc private func panGesture(_ recognizer: UIPanGestureRecognizer) {
+        switch recognizer.state {
+        case .began:
+            self.transitionFractionOffset = 0.0
+            if let (layout, navigationBarHeight, visualNavigationHeight, cleanNavigationBarHeight, isReorderingFilters, isEditing) = self.validLayout, let itemNode = self.itemNodes[self.selectedId] {
+                if let presentationLayer = itemNode.layer.presentation() {
+                    self.transitionFraction = presentationLayer.frame.minX / layout.size.width
+                    self.transitionFractionOffset = self.transitionFraction
+                    if !self.transitionFraction.isZero {
+                        for (_, itemNode) in self.itemNodes {
+                            itemNode.layer.removeAllAnimations()
+                        }
+                        self.update(layout: layout, navigationBarHeight: navigationBarHeight, visualNavigationHeight: visualNavigationHeight, cleanNavigationBarHeight: cleanNavigationBarHeight, isReorderingFilters: isReorderingFilters, isEditing: isEditing, transition: .immediate)
+                        self.currentItemFilterUpdated?(self.currentItemFilter, self.transitionFraction, .immediate, true)
+                    }
+                }
+            }
+        case .changed:
+            if let (layout, navigationBarHeight, visualNavigationHeight, cleanNavigationBarHeight, isReorderingFilters, isEditing) = self.validLayout, let selectedIndex = self.availableFilters.firstIndex(where: { $0.id == self.selectedId }) {
+                let translation = recognizer.translation(in: self.view)
+                var transitionFraction = translation.x / layout.size.width
+                
+                func rubberBandingOffset(offset: CGFloat, bandingStart: CGFloat) -> CGFloat {
+                    let bandedOffset = offset - bandingStart
+                    let range: CGFloat = 600.0
+                    let coefficient: CGFloat = 0.4
+                    return bandingStart + (1.0 - (1.0 / ((bandedOffset * coefficient / range) + 1.0))) * range
+                }
+                
+                if selectedIndex <= 0 && translation.x > 0.0 {
+                    let overscroll = translation.x
+                    transitionFraction = rubberBandingOffset(offset: overscroll, bandingStart: 0.0) / layout.size.width
+                }
+                if selectedIndex >= self.availableFilters.count - 1 && translation.x < 0.0 {
+                    let overscroll = -translation.x
+                    transitionFraction = -rubberBandingOffset(offset: overscroll, bandingStart: 0.0) / layout.size.width
+                }
+                self.transitionFraction = transitionFraction + self.transitionFractionOffset
+                if let currentItemNode = self.currentItemNodeValue {
+                    let isNavigationHidden = currentItemNode.listNode.isNavigationHidden
+                    for (_, itemNode) in self.itemNodes {
+                        if itemNode !== currentItemNode {
+                            itemNode.listNode.adjustScrollOffsetForNavigation(isNavigationHidden: isNavigationHidden)
+                        }
+                    }
+                }
+                self.update(layout: layout, navigationBarHeight: navigationBarHeight, visualNavigationHeight: visualNavigationHeight, cleanNavigationBarHeight: cleanNavigationBarHeight, isReorderingFilters: isReorderingFilters, isEditing: isEditing, transition: .immediate)
+                self.currentItemFilterUpdated?(self.currentItemFilter, self.transitionFraction, .immediate, false)
+            }
+        case .cancelled, .ended:
+            if let (layout, navigationBarHeight, visualNavigationHeight, cleanNavigationBarHeight, isReorderingFilters, isEditing) = self.validLayout, let selectedIndex = self.availableFilters.firstIndex(where: { $0.id == self.selectedId }) {
+                let translation = recognizer.translation(in: self.view)
+                let velocity = recognizer.velocity(in: self.view)
+                var directionIsToRight: Bool?
+                if abs(velocity.x) > 10.0 {
+                    if translation.x < 0.0 {
+                        if velocity.x >= 0.0 {
+                            directionIsToRight = nil
+                        } else {
+                            directionIsToRight = true
+                        }
+                    } else {
+                        if velocity.x <= 0.0 {
+                            directionIsToRight = nil
+                        } else {
+                            directionIsToRight = false
+                        }
+                    }
+                } else {
+                    if abs(translation.x) > layout.size.width / 2.0 {
+                        directionIsToRight = translation.x > layout.size.width / 2.0
+                    }
+                }
+                if let directionIsToRight = directionIsToRight {
+                    var updatedIndex = selectedIndex
+                    if directionIsToRight {
+                        updatedIndex = min(updatedIndex + 1, self.availableFilters.count - 1)
+                    } else {
+                        updatedIndex = max(updatedIndex - 1, 0)
+                    }
+                    let switchToId = self.availableFilters[updatedIndex].id
+                    if switchToId != self.selectedId, let itemNode = self.itemNodes[switchToId] {
+                        self.selectedId = switchToId
+                        self.applyItemNodeAsCurrent(id: switchToId, itemNode: itemNode)
+                    }
+                }
+                self.transitionFraction = 0.0
+                let transition: ContainedViewLayoutTransition = .animated(duration: 0.45, curve: .spring)
+                self.disableItemNodeOperationsWhileAnimating = true
+                self.update(layout: layout, navigationBarHeight: navigationBarHeight, visualNavigationHeight: visualNavigationHeight, cleanNavigationBarHeight: cleanNavigationBarHeight, isReorderingFilters: isReorderingFilters, isEditing: isEditing, transition: transition)
+                self.currentItemFilterUpdated?(self.currentItemFilter, self.transitionFraction, transition, false)
+                DispatchQueue.main.async {
+                    self.disableItemNodeOperationsWhileAnimating = false
+                    if let (layout, navigationBarHeight, visualNavigationHeight, cleanNavigationBarHeight, isReorderingFilters, isEditing) = self.validLayout {
+                        self.update(layout: layout, navigationBarHeight: navigationBarHeight, visualNavigationHeight: visualNavigationHeight, cleanNavigationBarHeight: cleanNavigationBarHeight, isReorderingFilters: isReorderingFilters, isEditing: isEditing, transition: .immediate)
+                    }
+                }
+            }
+        default:
+            break
+        }
+    }
+    
+    func updatePresentationData(_ presentationData: PresentationData) {
+        self.presentationData = presentationData
+        
+        for (_, itemNode) in self.itemNodes {
+            itemNode.updatePresentationData(presentationData)
+        }
+    }
+    
+    func playArchiveAnimation() {
+        if let itemNode = self.itemNodes[self.selectedId] {
+            itemNode.listNode.forEachVisibleItemNode { node in
+                if let node = node as? ChatListItemNode {
+                    node.playArchiveAnimation()
+                }
+            }
+        }
+    }
+    
+    func scrollToTop() {
+        if let itemNode = self.itemNodes[self.selectedId] {
+            itemNode.listNode.scrollToPosition(.top)
+        }
+    }
+    
+    func updateSelectedChatLocation(data: ChatLocation?, progress: CGFloat, transition: ContainedViewLayoutTransition) {
+        for (_, itemNode) in self.itemNodes {
+            itemNode.listNode.updateSelectedChatLocation(data, progress: progress, transition: transition)
+        }
+    }
+    
+    func updateState(_ f: (ChatListNodeState) -> ChatListNodeState) {
+        self.currentItemNode.updateState(f)
+        let updatedState = self.currentItemNode.currentState
+        for (id, itemNode) in self.itemNodes {
+            if id != self.selectedId {
+                itemNode.listNode.updateState { state in
+                    var state = state
+                    state.editing = updatedState.editing
+                    state.selectedPeerIds = updatedState.selectedPeerIds
+                    return state
+                }
+            }
+        }
+    }
+    
+    func updateAvailableFilters(_ availableFilters: [ChatListContainerNodeFilter]) {
+        if self.availableFilters != availableFilters {
+            let apply: () -> Void = { [weak self] in
+                guard let strongSelf = self else {
+                    return
+                }
+                strongSelf.availableFilters = availableFilters
+                if let (layout, navigationBarHeight, visualNavigationHeight, cleanNavigationBarHeight, isReorderingFilters, isEditing) = strongSelf.validLayout {
+                    strongSelf.update(layout: layout, navigationBarHeight: navigationBarHeight, visualNavigationHeight: visualNavigationHeight, cleanNavigationBarHeight: cleanNavigationBarHeight, isReorderingFilters: isReorderingFilters, isEditing: isEditing, transition: .immediate)
+                }
+            }
+            if !availableFilters.contains(where: { $0.id == self.selectedId }) {
+                self.switchToFilter(id: .all, completion: {
+                    apply()
+                })
+            } else {
+                apply()
+            }
+        }
+    }
+    
+    func updateEnableAdjacentFilterLoading(_ value: Bool) {
+        if value != self.enableAdjacentFilterLoading {
+            self.enableAdjacentFilterLoading = value
+            
+            if self.enableAdjacentFilterLoading, let (layout, navigationBarHeight, visualNavigationHeight, cleanNavigationBarHeight, isReorderingFilters, isEditing) = self.validLayout {
+                self.update(layout: layout, navigationBarHeight: navigationBarHeight, visualNavigationHeight: visualNavigationHeight, cleanNavigationBarHeight: cleanNavigationBarHeight, isReorderingFilters: isReorderingFilters, isEditing: isEditing, transition: .immediate)
+            }
+        }
+    }
+    
+    func switchToFilter(id: ChatListFilterTabEntryId, completion: (() -> Void)? = nil) {
+        guard let (layout, navigationBarHeight, visualNavigationHeight, cleanNavigationBarHeight, isReorderingFilters, isEditing) = self.validLayout else {
+            return
+        }
+        if id != self.selectedId, let index = self.availableFilters.firstIndex(where: { $0.id == id }) {
+            if let itemNode = self.itemNodes[id] {
+                self.selectedId = id
+                if let currentItemNode = self.currentItemNodeValue {
+                    itemNode.listNode.adjustScrollOffsetForNavigation(isNavigationHidden: currentItemNode.listNode.isNavigationHidden)
+                }
+                self.applyItemNodeAsCurrent(id: id, itemNode: itemNode)
+                let transition: ContainedViewLayoutTransition = .animated(duration: 0.35, curve: .spring)
+                self.update(layout: layout, navigationBarHeight: navigationBarHeight, visualNavigationHeight: visualNavigationHeight, cleanNavigationBarHeight: cleanNavigationBarHeight, isReorderingFilters: isReorderingFilters, isEditing: isEditing, transition: transition)
+                self.currentItemFilterUpdated?(self.currentItemFilter, self.transitionFraction, transition, false)
+                completion?()
+            } else if self.pendingItemNode == nil {
+                let itemNode = ChatListContainerItemNode(context: self.context, groupId: self.groupId, filter: self.availableFilters[index].filter, previewing: self.previewing, presentationData: self.presentationData, becameEmpty: { [weak self] filter in
+                    self?.filterBecameEmpty(filter)
+                }, emptyAction: { [weak self] filter in
+                    self?.filterEmptyAction(filter)
+                })
+                let disposable = MetaDisposable()
+                self.pendingItemNode = (id, itemNode, disposable)
+                
+                disposable.set((itemNode.listNode.ready
+                |> filter { $0 }
+                |> take(1)
+                |> deliverOnMainQueue).start(next: { [weak self, weak itemNode] _ in
+                    guard let strongSelf = self, let itemNode = itemNode, itemNode === strongSelf.pendingItemNode?.1 else {
+                        return
+                    }
+                    guard let (layout, navigationBarHeight, visualNavigationHeight, cleanNavigationBarHeight, isReorderingFilters, isEditing) = strongSelf.validLayout else {
+                        return
+                    }
+                    strongSelf.pendingItemNode = nil
+                    
+                    let transition: ContainedViewLayoutTransition = .animated(duration: 0.35, curve: .spring)
+                    
+                    if let previousIndex = strongSelf.availableFilters.firstIndex(where: { $0.id == strongSelf.selectedId }), let index = strongSelf.availableFilters.firstIndex(where: { $0.id == id }) {
+                        let previousId = strongSelf.selectedId
+                        let offsetDirection: CGFloat = index < previousIndex ? 1.0 : -1.0
+                        let offset = offsetDirection * layout.size.width
+                        
+                        var validNodeIds: [ChatListFilterTabEntryId] = []
+                        for i in max(0, index - 1) ... min(strongSelf.availableFilters.count - 1, index + 1) {
+                            validNodeIds.append(strongSelf.availableFilters[i].id)
+                        }
+                        
+                        var removeIds: [ChatListFilterTabEntryId] = []
+                        for (id, _) in strongSelf.itemNodes {
+                            if !validNodeIds.contains(id) {
+                                removeIds.append(id)
+                            }
+                        }
+                        for id in removeIds {
+                            if let itemNode = strongSelf.itemNodes.removeValue(forKey: id) {
+                                if id == previousId {
+                                    transition.updateFrame(node: itemNode, frame: itemNode.frame.offsetBy(dx: offset, dy: 0.0), completion: { [weak itemNode] _ in
+                                        itemNode?.removeFromSupernode()
+                                    })
+                                } else {
+                                    itemNode.removeFromSupernode()
+                                }
+                            }
+                        }
+                        
+                        strongSelf.itemNodes[id] = itemNode
+                        strongSelf.addSubnode(itemNode)
+                        
+                        let itemFrame = CGRect(origin: CGPoint(x: 0.0, y: 0.0), size: layout.size)
+                        itemNode.frame = itemFrame
+                        
+                        transition.animatePositionAdditive(node: itemNode, offset: CGPoint(x: -offset, y: 0.0))
+                        
+                        var insets = layout.insets(options: [.input])
+                        insets.top += navigationBarHeight
+                        
+                        insets.left += layout.safeInsets.left
+                        insets.right += layout.safeInsets.right
+                        
+                        itemNode.updateLayout(size: layout.size, insets: insets, visualNavigationHeight: visualNavigationHeight, transition: .immediate)
+                        
+                        strongSelf.selectedId = id
+                        if let currentItemNode = strongSelf.currentItemNodeValue {
+                            itemNode.listNode.adjustScrollOffsetForNavigation(isNavigationHidden: currentItemNode.listNode.isNavigationHidden)
+                        }
+                        strongSelf.applyItemNodeAsCurrent(id: id, itemNode: itemNode)
+                        
+                        strongSelf.update(layout: layout, navigationBarHeight: navigationBarHeight, visualNavigationHeight: visualNavigationHeight, cleanNavigationBarHeight: cleanNavigationBarHeight, isReorderingFilters: isReorderingFilters, isEditing: isEditing, transition: .immediate)
+                        
+                        strongSelf.currentItemFilterUpdated?(strongSelf.currentItemFilter, strongSelf.transitionFraction, transition, false)
+                    }
+                    
+                    completion?()
+                }))
+            }
+        }
+    }
+    
+    func update(layout: ContainerViewLayout, navigationBarHeight: CGFloat, visualNavigationHeight: CGFloat, cleanNavigationBarHeight: CGFloat, isReorderingFilters: Bool, isEditing: Bool, transition: ContainedViewLayoutTransition) {
+        self.validLayout = (layout, navigationBarHeight, visualNavigationHeight, cleanNavigationBarHeight, isReorderingFilters, isEditing)
+        
+        var insets = layout.insets(options: [.input])
+        insets.top += navigationBarHeight
+        
+        insets.left += layout.safeInsets.left
+        insets.right += layout.safeInsets.right
+        
+        transition.updateAlpha(node: self, alpha: isReorderingFilters ? 0.5 : 1.0)
+        self.isUserInteractionEnabled = !isReorderingFilters
+        
+        self.panRecognizer?.isEnabled = !isEditing
+        
+        if let selectedIndex = self.availableFilters.firstIndex(where: { $0.id == self.selectedId }) {
+            var validNodeIds: [ChatListFilterTabEntryId] = []
+            for i in max(0, selectedIndex - 1) ... min(self.availableFilters.count - 1, selectedIndex + 1) {
+                let id = self.availableFilters[i].id
+                validNodeIds.append(id)
+                
+                if self.itemNodes[id] == nil && self.enableAdjacentFilterLoading && !self.disableItemNodeOperationsWhileAnimating {
+                    let itemNode = ChatListContainerItemNode(context: self.context, groupId: self.groupId, filter: self.availableFilters[i].filter, previewing: self.previewing, presentationData: self.presentationData, becameEmpty: { [weak self] filter in
+                        self?.filterBecameEmpty(filter)
+                    }, emptyAction: { [weak self] filter in
+                        self?.filterEmptyAction(filter)
+                    })
+                    self.itemNodes[id] = itemNode
+                }
+            }
+            
+            var removeIds: [ChatListFilterTabEntryId] = []
+            var animateSlidingIds: [ChatListFilterTabEntryId] = []
+            var slidingOffset: CGFloat?
+            for (id, itemNode) in self.itemNodes {
+                if !validNodeIds.contains(id) {
+                    removeIds.append(id)
+                }
+                guard let index = self.availableFilters.firstIndex(where: { $0.id == id }) else {
+                    continue
+                }
+                let indexDistance = CGFloat(index - selectedIndex) + self.transitionFraction
+                
+                let wasAdded = itemNode.supernode == nil
+                var nodeTransition = transition
+                if wasAdded {
+                    self.addSubnode(itemNode)
+                    nodeTransition = .immediate
+                }
+                
+                let itemFrame = CGRect(origin: CGPoint(x: indexDistance * layout.size.width, y: 0.0), size: layout.size)
+                if !wasAdded && slidingOffset == nil {
+                    slidingOffset = itemNode.frame.minX - itemFrame.minX
+                }
+                nodeTransition.updateFrame(node: itemNode, frame: itemFrame, completion: { _ in
+                })
+                
+                itemNode.updateLayout(size: layout.size, insets: insets, visualNavigationHeight: visualNavigationHeight, transition: nodeTransition)
+                
+                if wasAdded, case .animated = transition {
+                    animateSlidingIds.append(id)
+                }
+            }
+            if let slidingOffset = slidingOffset {
+                for id in animateSlidingIds {
+                    if let itemNode = self.itemNodes[id] {
+                        transition.animatePositionAdditive(node: itemNode, offset: CGPoint(x: slidingOffset, y: 0.0), completion: {
+                        })
+                    }
+                }
+            }
+            if !self.disableItemNodeOperationsWhileAnimating {
+                for id in removeIds {
+                    if let itemNode = self.itemNodes.removeValue(forKey: id) {
+                        itemNode.removeFromSupernode()
+                    }
+                }
+            }
         }
-        return lhs.value < rhs.value
     }
 }
 
@@ -47,9 +934,7 @@ final class ChatListControllerNode: ASDisplayNode {
     private let groupId: PeerGroupId
     private var presentationData: PresentationData
     
-    private var chatListEmptyNodeContainer: ChatListEmptyNodeContainer
-    private var chatListEmptyIndicator: ActivityIndicator?
-    let chatListNode: ChatListNode
+    let containerNode: ChatListContainerNode
     var navigationBar: NavigationBar?
     weak var controller: ChatListControllerImpl?
     
@@ -59,6 +944,9 @@ final class ChatListControllerNode: ASDisplayNode {
     
     private(set) var searchDisplayController: SearchDisplayController?
     
+    var isReorderingFilters: Bool = false
+    var isEditing: Bool = false
+    
     private var containerLayout: (ContainerViewLayout, CGFloat, CGFloat, CGFloat)?
     
     var requestDeactivateSearch: (() -> Void)?
@@ -67,7 +955,7 @@ final class ChatListControllerNode: ASDisplayNode {
     var requestOpenMessageFromSearch: ((Peer, MessageId) -> Void)?
     var requestAddContact: ((String) -> Void)?
     var peerContextAction: ((Peer, ChatListSearchContextActionSource, ASDisplayNode, ContextGesture?) -> Void)?
-    var dismissSelf: (() -> Void)?
+    var dismissSelfIfCompletedPresentation: (() -> Void)?
     var isEmptyUpdated: ((Bool) -> Void)?
     var emptyListAction: (() -> Void)?
 
@@ -78,8 +966,13 @@ final class ChatListControllerNode: ASDisplayNode {
         self.groupId = groupId
         self.presentationData = presentationData
         
-        self.chatListEmptyNodeContainer = ChatListEmptyNodeContainer(theme: presentationData.theme, strings: presentationData.strings)
-        self.chatListNode = ChatListNode(context: context, groupId: groupId, chatListFilter: filter, previewing: previewing, controlsHistoryPreload: controlsHistoryPreload, mode: .chatList, theme: presentationData.theme, fontSize: presentationData.listsFontSize, strings: presentationData.strings, dateTimeFormat: presentationData.dateTimeFormat, nameSortOrder: presentationData.nameSortOrder, nameDisplayOrder: presentationData.nameDisplayOrder, disableAnimations: presentationData.disableAnimations)
+        var filterBecameEmpty: ((ChatListFilter?) -> Void)?
+        var filterEmptyAction: ((ChatListFilter?) -> Void)?
+        self.containerNode = ChatListContainerNode(context: context, groupId: groupId, previewing: previewing, presentationData: presentationData, filterBecameEmpty: { filter in
+            filterBecameEmpty?(filter)
+        }, filterEmptyAction: { filter in
+            filterEmptyAction?(filter)
+        })
         
         self.controller = controller
         
@@ -91,35 +984,24 @@ final class ChatListControllerNode: ASDisplayNode {
         
         self.backgroundColor = presentationData.theme.chatList.backgroundColor
         
-        self.addSubnode(self.chatListNode)
-        self.addSubnode(self.chatListEmptyNodeContainer)
-        self.chatListNode.isEmptyUpdated = { [weak self] isEmptyState, isFilter, transitionDirection, transition in
+        self.addSubnode(self.containerNode)
+        
+        self.addSubnode(self.debugListView)
+        
+        filterBecameEmpty = { [weak self] _ in
             guard let strongSelf = self else {
                 return
             }
-            switch isEmptyState {
-            case .empty(false):
-                if case .group = strongSelf.groupId {
-                    strongSelf.dismissSelf?()
-                } else {
-                    strongSelf.chatListEmptyNodeContainer.update(state: isEmptyState, isFilter: isFilter, direction: transitionDirection, transition: transition)
-                }
-            case .notEmpty(false):
-                if case .group = strongSelf.groupId {
-                    strongSelf.dismissSelf?()
-                } else {
-                    strongSelf.chatListEmptyNodeContainer.update(state: isEmptyState, isFilter: isFilter, direction: transitionDirection, transition: transition)
-                }
-            default:
-                strongSelf.chatListEmptyNodeContainer.update(state: isEmptyState, isFilter: isFilter, direction: transitionDirection, transition: transition)
+            if case .group = strongSelf.groupId {
+                strongSelf.dismissSelfIfCompletedPresentation?()
             }
         }
-        
-        self.chatListEmptyNodeContainer.action = { [weak self] in
-            self?.emptyListAction?()
+        filterEmptyAction = { [weak self] filter in
+            guard let strongSelf = self else {
+                return
+            }
+            strongSelf.emptyListAction?()
         }
-        
-        self.addSubnode(self.debugListView)
     }
     
     override func didLoad() {
@@ -133,9 +1015,8 @@ final class ChatListControllerNode: ASDisplayNode {
         
         self.backgroundColor = self.presentationData.theme.chatList.backgroundColor
         
-        self.chatListNode.updateThemeAndStrings(theme: self.presentationData.theme, fontSize: self.presentationData.listsFontSize, strings: self.presentationData.strings, dateTimeFormat: self.presentationData.dateTimeFormat, nameSortOrder: self.presentationData.nameSortOrder, nameDisplayOrder: self.presentationData.nameDisplayOrder, disableAnimations: self.presentationData.disableAnimations)
+        self.containerNode.updatePresentationData(presentationData)
         self.searchDisplayController?.updatePresentationData(presentationData)
-        self.chatListEmptyNodeContainer.updateThemeAndStrings(theme: self.presentationData.theme, strings: self.presentationData.strings)
         
         if let toolbarNode = self.toolbarNode {
             toolbarNode.updateTheme(TabBarControllerTheme(rootControllerTheme: self.presentationData.theme))
@@ -194,23 +1075,8 @@ final class ChatListControllerNode: ASDisplayNode {
             })
         }
         
-        self.chatListNode.bounds = CGRect(x: 0.0, y: 0.0, width: layout.size.width, height: layout.size.height)
-        self.chatListNode.position = CGPoint(x: layout.size.width / 2.0, y: layout.size.height / 2.0)
-        
-        let (duration, curve) = listViewAnimationDurationAndCurve(transition: transition)
-        let updateSizeAndInsets = ListViewUpdateSizeAndInsets(size: layout.size, insets: insets, duration: duration, curve: curve)
-        
-        self.chatListNode.visualInsets = UIEdgeInsets(top: visualNavigationHeight, left: 0.0, bottom: 0.0, right: 0.0)
-        self.chatListNode.updateLayout(transition: transition, updateSizeAndInsets: updateSizeAndInsets)
-        
-        let emptySize = CGSize(width: updateSizeAndInsets.size.width, height: updateSizeAndInsets.size.height - updateSizeAndInsets.insets.top - updateSizeAndInsets.insets.bottom)
-        transition.updateFrame(node: self.chatListEmptyNodeContainer, frame: CGRect(origin: CGPoint(x: 0.0, y: updateSizeAndInsets.insets.top), size: emptySize))
-        self.chatListEmptyNodeContainer.updateLayout(size: emptySize, transition: transition)
-        
-        if let chatListEmptyIndicator = self.chatListEmptyIndicator {
-            let indicatorSize = chatListEmptyIndicator.measure(CGSize(width: 100.0, height: 100.0))
-            transition.updateFrame(node: chatListEmptyIndicator, frame: CGRect(origin: CGPoint(x: floor((layout.size.width - indicatorSize.width) / 2.0), y: updateSizeAndInsets.insets.top + floor((layout.size.height -  updateSizeAndInsets.insets.top - updateSizeAndInsets.insets.bottom - indicatorSize.height) / 2.0)), size: indicatorSize))
-        }
+        transition.updateFrame(node: self.containerNode, frame: CGRect(origin: CGPoint(), size: layout.size))
+        self.containerNode.update(layout: layout, navigationBarHeight: navigationBarHeight, visualNavigationHeight: visualNavigationHeight, cleanNavigationBarHeight: cleanNavigationBarHeight, isReorderingFilters: self.isReorderingFilters, isEditing: self.isEditing, transition: transition)
         
         if let searchDisplayController = self.searchDisplayController {
             searchDisplayController.containerLayoutUpdated(layout, navigationBarHeight: cleanNavigationBarHeight, transition: transition)
@@ -218,7 +1084,7 @@ final class ChatListControllerNode: ASDisplayNode {
     }
     
     func activateSearch(placeholderNode: SearchBarPlaceholderNode) {
-        guard let (containerLayout, navigationBarHeight, _, cleanNavigationBarHeight) = self.containerLayout, let navigationBar = self.navigationBar, self.searchDisplayController == nil else {
+        guard let (containerLayout, _, _, cleanNavigationBarHeight) = self.containerLayout, let navigationBar = self.navigationBar, self.searchDisplayController == nil else {
             return
         }
         
@@ -242,7 +1108,7 @@ final class ChatListControllerNode: ASDisplayNode {
                 requestDeactivateSearch()
             }
         })
-        self.chatListNode.accessibilityElementsHidden = true
+        self.containerNode.accessibilityElementsHidden = true
         
         self.searchDisplayController?.containerLayoutUpdated(containerLayout, navigationBarHeight: cleanNavigationBarHeight, transition: .immediate)
         self.searchDisplayController?.activate(insertSubnode: { [weak self, weak placeholderNode] subnode, isSearchBar in
@@ -260,23 +1126,19 @@ final class ChatListControllerNode: ASDisplayNode {
         if let searchDisplayController = self.searchDisplayController {
             searchDisplayController.deactivate(placeholder: placeholderNode, animated: animated)
             self.searchDisplayController = nil
-            self.chatListNode.accessibilityElementsHidden = false
+            self.containerNode.accessibilityElementsHidden = false
         }
     }
     
     func playArchiveAnimation() {
-        self.chatListNode.forEachVisibleItemNode { node in
-            if let node = node as? ChatListItemNode {
-                node.playArchiveAnimation()
-            }
-        }
+        self.containerNode.playArchiveAnimation()
     }
     
     func scrollToTop() {
         if let searchDisplayController = self.searchDisplayController {
             searchDisplayController.contentNode.scrollToTop()
         } else {
-            self.chatListNode.scrollToPosition(.top)
+            self.containerNode.scrollToTop()
         }
     }
 }
diff --git a/submodules/ChatListUI/Sources/ChatListEmptyNode.swift b/submodules/ChatListUI/Sources/ChatListEmptyNode.swift
index 4176e5ed4d..63f0352da2 100644
--- a/submodules/ChatListUI/Sources/ChatListEmptyNode.swift
+++ b/submodules/ChatListUI/Sources/ChatListEmptyNode.swift
@@ -8,138 +8,6 @@ import AppBundle
 import SolidRoundedButtonNode
 import ActivityIndicator
 
-final class ChatListEmptyNodeContainer: ASDisplayNode {
-    private var currentNode: ChatListEmptyNode?
-    
-    private var theme: PresentationTheme
-    private var strings: PresentationStrings
-    private var validLayout: CGSize?
-    
-    var action: (() -> Void)?
-    
-    init(theme: PresentationTheme, strings: PresentationStrings) {
-        self.theme = theme
-        self.strings = strings
-        
-        super.init()
-    }
-    
-    func updateThemeAndStrings(theme: PresentationTheme, strings: PresentationStrings) {
-        self.theme = theme
-        self.strings = strings
-        
-        if let currentNode = self.currentNode {
-            currentNode.updateThemeAndStrings(theme: theme, strings: strings)
-        }
-    }
-    
-    func updateLayout(size: CGSize, transition: ContainedViewLayoutTransition) {
-        self.validLayout = size
-        
-        if let currentNode = self.currentNode {
-            currentNode.updateLayout(size: size, transition: transition)
-        }
-    }
-    
-    func update(state: ChatListNodeEmptyState, isFilter: Bool, direction: ChatListNodePaneSwitchAnimationDirection?, transition: ContainedViewLayoutTransition) {
-        switch state {
-        case let .empty(isLoading):
-            if let direction = direction {
-                let previousNode = self.currentNode
-                let currentNode = ChatListEmptyNode(isFilter: isFilter, isLoading: isLoading, theme: self.theme, strings: self.strings, action: { [weak self] in
-                    self?.action?()
-                })
-                self.currentNode = currentNode
-                if let size = self.validLayout {
-                    currentNode.frame = CGRect(origin: CGPoint(), size: size)
-                    currentNode.updateLayout(size: size, transition: .immediate)
-                }
-                self.addSubnode(currentNode)
-                if case .animated = transition, let size = self.validLayout {
-                    let offset: CGFloat
-                    switch direction {
-                    case .left:
-                        offset = -size.width
-                    case .right:
-                        offset = size.width
-                    }
-                    if let previousNode = previousNode {
-                        previousNode.frame = self.bounds.offsetBy(dx: offset, dy: 0.0)
-                    }
-                    transition.animateHorizontalOffsetAdditive(node: self, offset: offset, completion: { [weak previousNode] in
-                        previousNode?.removeFromSupernode()
-                    })
-                } else {
-                    previousNode?.removeFromSupernode()
-                }
-            } else {
-                if let previousNode = self.currentNode, previousNode.isFilter != isFilter {
-                    let currentNode = ChatListEmptyNode(isFilter: isFilter, isLoading: isLoading, theme: self.theme, strings: self.strings, action: { [weak self] in
-                        self?.action?()
-                    })
-                    self.currentNode = currentNode
-                    if let size = self.validLayout {
-                        currentNode.frame = CGRect(origin: CGPoint(), size: size)
-                        currentNode.updateLayout(size: size, transition: .immediate)
-                    }
-                    self.addSubnode(currentNode)
-                    currentNode.alpha = 0.0
-                    transition.updateAlpha(node: currentNode, alpha: 1.0)
-                    transition.updateAlpha(node: previousNode, alpha: 0.0, completion: { [weak previousNode] _ in
-                        previousNode?.removeFromSupernode()
-                    })
-                } else if let currentNode = self.currentNode {
-                    currentNode.updateIsLoading(isLoading)
-                } else {
-                    let currentNode = ChatListEmptyNode(isFilter: isFilter, isLoading: isLoading, theme: self.theme, strings: self.strings, action: { [weak self] in
-                        self?.action?()
-                    })
-                    self.currentNode = currentNode
-                    if let size = self.validLayout {
-                        currentNode.frame = CGRect(origin: CGPoint(), size: size)
-                        currentNode.updateLayout(size: size, transition: .immediate)
-                    }
-                    self.addSubnode(currentNode)
-                    currentNode.alpha = 0.0
-                    transition.updateAlpha(node: currentNode, alpha: 1.0)
-                }
-            }
-        case .notEmpty:
-            if let previousNode = self.currentNode {
-                self.currentNode = nil
-                if let direction = direction {
-                    if case .animated = transition, let size = self.validLayout {
-                        let offset: CGFloat
-                        switch direction {
-                        case .left:
-                            offset = -size.width
-                        case .right:
-                            offset = size.width
-                        }
-                        previousNode.frame = self.bounds.offsetBy(dx: offset, dy: 0.0)
-                        transition.animateHorizontalOffsetAdditive(node: self, offset: offset, completion: { [weak previousNode] in
-                            previousNode?.removeFromSupernode()
-                        })
-                    } else {
-                        previousNode.removeFromSupernode()
-                    }
-                } else {
-                    transition.updateAlpha(node: previousNode, alpha: 0.0, completion: { [weak previousNode] _ in
-                        previousNode?.removeFromSupernode()
-                    })
-                }
-            }
-        }
-    }
-    
-    override func hitTest(_ point: CGPoint, with event: UIEvent?) -> UIView? {
-        if let currentNode = self.currentNode {
-            return currentNode.view.hitTest(self.view.convert(point, to: currentNode.view), with: event)
-        }
-        return nil
-    }
-}
-
 final class ChatListEmptyNode: ASDisplayNode {
     let isFilter: Bool
     private(set) var isLoading: Bool
@@ -174,6 +42,7 @@ final class ChatListEmptyNode: ASDisplayNode {
         self.addSubnode(self.animationNode)
         self.addSubnode(self.textNode)
         self.addSubnode(self.buttonNode)
+        self.addSubnode(self.activityIndicator)
         
         let animationName: String
         if isFilter {
diff --git a/submodules/ChatListUI/Sources/ChatListFilterPresetCategoryItem.swift b/submodules/ChatListUI/Sources/ChatListFilterPresetCategoryItem.swift
new file mode 100644
index 0000000000..52751ffef9
--- /dev/null
+++ b/submodules/ChatListUI/Sources/ChatListFilterPresetCategoryItem.swift
@@ -0,0 +1,471 @@
+import Foundation
+import UIKit
+import AsyncDisplayKit
+import Display
+import SwiftSignalKit
+import ItemListUI
+import CheckNode
+import AvatarNode
+import AccountContext
+import TelegramPresentationData
+import ChatListSearchItemHeader
+
+enum ChatListFilterCategoryIcon {
+    case contacts
+    case nonContacts
+    case groups
+    case channels
+    case bots
+    case muted
+    case read
+    case archived
+}
+
+final class ChatListFilterPresetCategoryItem: ListViewItem, ItemListItem {
+    let presentationData: ItemListPresentationData
+    let title: String
+    let icon: ChatListFilterCategoryIcon
+    let isRevealed: Bool
+    let selectable: Bool = false
+    let sectionId: ItemListSectionId
+    let updatedRevealedOptions: (Bool) -> Void
+    let remove: () -> Void
+    
+    init(
+        presentationData: ItemListPresentationData,
+        title: String,
+        icon: ChatListFilterCategoryIcon,
+        isRevealed: Bool,
+        sectionId: ItemListSectionId,
+        updatedRevealedOptions: @escaping (Bool) -> Void,
+        remove: @escaping () -> Void
+    ) {
+        self.presentationData = presentationData
+        self.title = title
+        self.icon = icon
+        self.isRevealed = isRevealed
+        self.sectionId = sectionId
+        self.updatedRevealedOptions = updatedRevealedOptions
+        self.remove = remove
+    }
+    
+    func nodeConfiguredForParams(async: @escaping (@escaping () -> Void) -> Void, params: ListViewItemLayoutParams, synchronousLoads: Bool, previousItem: ListViewItem?, nextItem: ListViewItem?, completion: @escaping (ListViewItemNode, @escaping () -> (Signal<Void, NoError>?, (ListViewItemApply) -> Void)) -> Void) {
+        async {
+            let node = ChatListFilterPresetCategoryItemNode()
+            let (layout, apply) = node.asyncLayout()(self, params, itemListNeighbors(item: self, topItem: previousItem as? ItemListItem, bottomItem: nextItem as? ItemListItem), false)
+            
+            node.contentSize = layout.contentSize
+            node.insets = layout.insets
+            
+            Queue.mainQueue().async {
+                completion(node, {
+                    return (.complete(), { _ in apply(synchronousLoads, false) })
+                })
+            }
+        }
+    }
+    
+    func updateNode(async: @escaping (@escaping () -> Void) -> Void, node: @escaping () -> ListViewItemNode, params: ListViewItemLayoutParams, previousItem: ListViewItem?, nextItem: ListViewItem?, animation: ListViewItemUpdateAnimation, completion: @escaping (ListViewItemNodeLayout, @escaping (ListViewItemApply) -> Void) -> Void) {
+        Queue.mainQueue().async {
+            if let nodeValue = node() as? ChatListFilterPresetCategoryItemNode {
+                let makeLayout = nodeValue.asyncLayout()
+                
+                var animated = true
+                if case .None = animation {
+                    animated = false
+                }
+                
+                async {
+                    let (layout, apply) = makeLayout(self, params, itemListNeighbors(item: self, topItem: previousItem as? ItemListItem, bottomItem: nextItem as? ItemListItem), false)
+                    Queue.mainQueue().async {
+                        completion(layout, { _ in
+                            apply(false, animated)
+                        })
+                    }
+                }
+            }
+        }
+    }
+    
+    func selected(listView: ListView){
+        listView.clearHighlightAnimated(true)
+    }
+}
+
+private let avatarFont = avatarPlaceholderFont(size: floor(40.0 * 16.0 / 37.0))
+private let badgeFont = Font.regular(15.0)
+
+class ChatListFilterPresetCategoryItemNode: ItemListRevealOptionsItemNode, ItemListItemNode {
+    private let backgroundNode: ASDisplayNode
+    private let topStripeNode: ASDisplayNode
+    private let bottomStripeNode: ASDisplayNode
+    private let highlightedBackgroundNode: ASDisplayNode
+    private let maskNode: ASImageNode
+    
+    private let avatarNode: ASImageNode
+    private let titleNode: TextNode
+    
+    private var item: ChatListFilterPresetCategoryItem?
+    private var layoutParams: ListViewItemLayoutParams?
+    
+    private var editableControlNode: ItemListEditableControlNode?
+    
+    override var canBeSelected: Bool {
+        if self.editableControlNode != nil {
+            return false
+        }
+        return false
+    }
+    
+    var tag: ItemListItemTag? {
+        return nil
+    }
+    
+    init() {
+        self.backgroundNode = ASDisplayNode()
+        self.backgroundNode.isLayerBacked = true
+        
+        self.topStripeNode = ASDisplayNode()
+        self.topStripeNode.isLayerBacked = true
+        
+        self.bottomStripeNode = ASDisplayNode()
+        self.bottomStripeNode.isLayerBacked = true
+        self.maskNode = ASImageNode()
+        
+        self.avatarNode = ASImageNode()
+        self.avatarNode.isUserInteractionEnabled = false
+        
+        self.titleNode = TextNode()
+        self.titleNode.isUserInteractionEnabled = false
+        self.titleNode.contentMode = .left
+        self.titleNode.contentsScale = UIScreen.main.scale
+        
+        self.highlightedBackgroundNode = ASDisplayNode()
+        self.highlightedBackgroundNode.isLayerBacked = true
+        
+        super.init(layerBacked: false, dynamicBounce: false, rotated: false, seeThrough: false)
+        
+        self.isAccessibilityElement = true
+        
+        self.addSubnode(self.avatarNode)
+        self.addSubnode(self.titleNode)
+    }
+    
+    override func didLoad() {
+        super.didLoad()
+    }
+    
+    func asyncLayout() -> (_ item: ChatListFilterPresetCategoryItem, _ params: ListViewItemLayoutParams, _ neighbors: ItemListNeighbors, _ headerAtTop: Bool) -> (ListViewItemNodeLayout, (Bool, Bool) -> Void) {
+        let makeTitleLayout = TextNode.asyncLayout(self.titleNode)
+        let editableControlLayout = ItemListEditableControlNode.asyncLayout(self.editableControlNode)
+        
+        let currentItem = self.item
+        
+        return { item, params, neighbors, headerAtTop in
+            var updatedTheme: PresentationTheme?
+            
+            let titleFont = Font.medium(item.presentationData.fontSize.itemListBaseFontSize)
+            
+            if currentItem?.presentationData.theme !== item.presentationData.theme {
+                updatedTheme = item.presentationData.theme
+            }
+            
+            var titleAttributedString: NSAttributedString?
+            
+            let peerRevealOptions: [ItemListRevealOption]
+            peerRevealOptions = [ItemListRevealOption(key: 0, title: item.presentationData.strings.Common_Delete, icon: .none, color: item.presentationData.theme.list.itemDisclosureActions.destructive.fillColor, textColor: item.presentationData.theme.list.itemDisclosureActions.destructive.foregroundColor)]
+            
+            let rightInset: CGFloat = params.rightInset
+            
+            let titleColor: UIColor
+            titleColor = item.presentationData.theme.list.itemPrimaryTextColor
+            
+            
+            titleAttributedString = NSAttributedString(string: item.title, font: titleFont, textColor: titleColor)
+
+            let leftInset: CGFloat
+            let verticalInset: CGFloat
+            let verticalOffset: CGFloat
+            let avatarSize: CGFloat
+            
+            verticalInset = 14.0
+            verticalOffset = 0.0
+            avatarSize = 40.0
+            leftInset = 65.0 + params.leftInset
+            
+            var editableControlSizeAndApply: (CGFloat, (CGFloat) -> ItemListEditableControlNode)?
+            
+            let editingOffset: CGFloat
+            if false {
+                let sizeAndApply = editableControlLayout(item.presentationData.theme, false)
+                editableControlSizeAndApply = sizeAndApply
+                editingOffset = sizeAndApply.0
+            } else {
+                editingOffset = 0.0
+            }
+            
+            let (titleLayout, titleApply) = makeTitleLayout(TextNodeLayoutArguments(attributedString: titleAttributedString, backgroundColor: nil, maximumNumberOfLines: 1, truncationType: .end, constrainedSize: CGSize(width: params.width - leftInset - 12.0 - editingOffset - rightInset, height: CGFloat.greatestFiniteMagnitude), alignment: .natural, cutout: nil, insets: UIEdgeInsets()))
+            
+            let insets = itemListNeighborsGroupedInsets(neighbors)
+            
+            let minHeight: CGFloat = titleLayout.size.height + verticalInset * 2.0
+            let rawHeight: CGFloat = verticalInset * 2.0 + titleLayout.size.height
+            
+            let contentSize = CGSize(width: params.width, height: max(minHeight, rawHeight))
+            let separatorHeight = UIScreenPixel
+            
+            let layout = ListViewItemNodeLayout(contentSize: contentSize, insets: insets)
+            let layoutSize = layout.size
+            
+            let hadAvatarImage = self.avatarNode.image != nil
+            
+            return (layout, { [weak self] synchronousLoad, animated in
+                if let strongSelf = self {
+                    strongSelf.item = item
+                    strongSelf.layoutParams = params
+                    
+                    strongSelf.accessibilityLabel = titleAttributedString?.string
+                    
+                    if let _ = updatedTheme {
+                        strongSelf.topStripeNode.backgroundColor = item.presentationData.theme.list.itemBlocksSeparatorColor
+                        strongSelf.bottomStripeNode.backgroundColor = item.presentationData.theme.list.itemBlocksSeparatorColor
+                        strongSelf.backgroundNode.backgroundColor = item.presentationData.theme.list.itemBlocksBackgroundColor
+                        strongSelf.highlightedBackgroundNode.backgroundColor = item.presentationData.theme.list.itemHighlightedBackgroundColor
+                    }
+                    
+                    var updatedAvatarImage: UIImage?
+                    if !hadAvatarImage {
+                        let color: AvatarBackgroundColor
+                        let imageName: String
+                        switch item.icon {
+                        case .contacts:
+                            color = .blue
+                            imageName = "Chat/Context Menu/User"
+                        case .nonContacts:
+                            color = .yellow
+                            imageName = "Chat/Context Menu/UnknownUser"
+                        case .groups:
+                            color = .green
+                            imageName = "Chat/Context Menu/Groups"
+                        case .channels:
+                            color = .red
+                            imageName = "Chat/Context Menu/Channels"
+                        case .bots:
+                            color = .violet
+                            imageName = "Chat/Context Menu/Bots"
+                        case .muted:
+                            color = .red
+                            imageName = "Chat/Context Menu/Muted"
+                        case .read:
+                            color = .blue
+                            imageName = "Chat/Context Menu/Message"
+                        case .archived:
+                            color = .yellow
+                            imageName = "Chat/Context Menu/Archive"
+                        }
+                        updatedAvatarImage = generateAvatarImage(size: CGSize(width: avatarSize, height: avatarSize), icon: generateTintedImage(image: UIImage(bundleImageName: imageName), color: .white), color: color)
+                    }
+                    
+                    let revealOffset = strongSelf.revealOffset
+                    
+                    let transition: ContainedViewLayoutTransition
+                    if animated {
+                        transition = ContainedViewLayoutTransition.animated(duration: 0.4, curve: .spring)
+                    } else {
+                        transition = .immediate
+                    }
+                    
+                    
+                    if let editableControlSizeAndApply = editableControlSizeAndApply {
+                        let editableControlFrame = CGRect(origin: CGPoint(x: params.leftInset + revealOffset, y: 0.0), size: CGSize(width: editableControlSizeAndApply.0, height: layout.contentSize.height))
+                        if strongSelf.editableControlNode == nil {
+                            let editableControlNode = editableControlSizeAndApply.1(layout.contentSize.height)
+                            editableControlNode.tapped = {
+                                if let strongSelf = self {
+                                    strongSelf.setRevealOptionsOpened(true, animated: true)
+                                    strongSelf.revealOptionsInteractivelyOpened()
+                                }
+                            }
+                            strongSelf.editableControlNode = editableControlNode
+                            strongSelf.addSubnode(editableControlNode)
+                            editableControlNode.frame = editableControlFrame
+                            transition.animatePosition(node: editableControlNode, from: CGPoint(x: -editableControlFrame.size.width / 2.0, y: editableControlFrame.midY))
+                            editableControlNode.alpha = 0.0
+                            transition.updateAlpha(node: editableControlNode, alpha: 1.0)
+                        } else {
+                            strongSelf.editableControlNode?.frame = editableControlFrame
+                        }
+                        strongSelf.editableControlNode?.isHidden = true
+                    } else if let editableControlNode = strongSelf.editableControlNode {
+                        var editableControlFrame = editableControlNode.frame
+                        editableControlFrame.origin.x = -editableControlFrame.size.width
+                        strongSelf.editableControlNode = nil
+                        transition.updateAlpha(node: editableControlNode, alpha: 0.0)
+                        transition.updateFrame(node: editableControlNode, frame: editableControlFrame, completion: { [weak editableControlNode] _ in
+                            editableControlNode?.removeFromSupernode()
+                        })
+                    }
+                    
+                    let _ = titleApply()
+                    
+                    if strongSelf.backgroundNode.supernode == nil {
+                        strongSelf.insertSubnode(strongSelf.backgroundNode, at: 0)
+                    }
+                    if strongSelf.topStripeNode.supernode == nil {
+                        strongSelf.insertSubnode(strongSelf.topStripeNode, at: 1)
+                    }
+                    if strongSelf.bottomStripeNode.supernode == nil {
+                        strongSelf.insertSubnode(strongSelf.bottomStripeNode, at: 2)
+                    }
+                    if strongSelf.maskNode.supernode == nil {
+                        strongSelf.insertSubnode(strongSelf.maskNode, at: 3)
+                    }
+                    
+                    let hasCorners = itemListHasRoundedBlockLayout(params)
+                    var hasTopCorners = false
+                    var hasBottomCorners = false
+                    switch neighbors.top {
+                    case .sameSection(false):
+                        strongSelf.topStripeNode.isHidden = true
+                    default:
+                        hasTopCorners = true
+                        strongSelf.topStripeNode.isHidden = hasCorners
+                    }
+                    let bottomStripeInset: CGFloat
+                    let bottomStripeOffset: CGFloat
+                    switch neighbors.bottom {
+                    case .sameSection(false):
+                        bottomStripeInset = leftInset + editingOffset
+                        bottomStripeOffset = -separatorHeight
+                    default:
+                        bottomStripeInset = 0.0
+                        bottomStripeOffset = 0.0
+                        hasBottomCorners = true
+                        strongSelf.bottomStripeNode.isHidden = hasCorners
+                    }
+                    
+                    strongSelf.maskNode.image = hasCorners ? PresentationResourcesItemList.cornersImage(item.presentationData.theme, top: hasTopCorners, bottom: hasBottomCorners) : nil
+                    
+                    strongSelf.backgroundNode.frame = CGRect(origin: CGPoint(x: 0.0, y: -min(insets.top, separatorHeight)), size: CGSize(width: params.width, height: contentSize.height + min(insets.top, separatorHeight) + min(insets.bottom, separatorHeight)))
+                    strongSelf.maskNode.frame = strongSelf.backgroundNode.frame.insetBy(dx: params.leftInset, dy: 0.0)
+                    transition.updateFrame(node: strongSelf.topStripeNode, frame: CGRect(origin: CGPoint(x: 0.0, y: -min(insets.top, separatorHeight)), size: CGSize(width: layoutSize.width, height: separatorHeight)))
+                    transition.updateFrame(node: strongSelf.bottomStripeNode, frame: CGRect(origin: CGPoint(x: bottomStripeInset, y: contentSize.height + bottomStripeOffset), size: CGSize(width: layoutSize.width - bottomStripeInset, height: separatorHeight)))
+                    
+                    transition.updateFrame(node: strongSelf.titleNode, frame: CGRect(origin: CGPoint(x: leftInset + revealOffset + editingOffset, y: verticalInset + verticalOffset), size: titleLayout.size))
+                    
+                    transition.updateFrame(node: strongSelf.avatarNode, frame: CGRect(origin: CGPoint(x: params.leftInset + revealOffset + editingOffset + 15.0, y: floorToScreenPixels((layout.contentSize.height - avatarSize) / 2.0)), size: CGSize(width: avatarSize, height: avatarSize)))
+                    
+                    if let updatedAvatarImage = updatedAvatarImage {
+                        strongSelf.avatarNode.image = updatedAvatarImage
+                    }
+                    
+                    strongSelf.highlightedBackgroundNode.frame = CGRect(origin: CGPoint(x: 0.0, y: -UIScreenPixel), size: CGSize(width: params.width, height: layout.contentSize.height + UIScreenPixel + UIScreenPixel))
+                    
+                    strongSelf.backgroundNode.isHidden = false
+                    strongSelf.highlightedBackgroundNode.isHidden = true
+                    
+                    strongSelf.updateLayout(size: layout.contentSize, leftInset: params.leftInset, rightInset: params.rightInset)
+                    
+                    strongSelf.setRevealOptions((left: [], right: peerRevealOptions))
+                    strongSelf.setRevealOptionsOpened(item.isRevealed, animated: animated)
+                }
+            })
+        }
+    }
+    
+    override func setHighlighted(_ highlighted: Bool, at point: CGPoint, animated: Bool) {
+        super.setHighlighted(highlighted, at: point, animated: animated)
+        
+        if highlighted {
+            self.highlightedBackgroundNode.alpha = 1.0
+            if self.highlightedBackgroundNode.supernode == nil {
+                var anchorNode: ASDisplayNode?
+                if self.bottomStripeNode.supernode != nil {
+                    anchorNode = self.bottomStripeNode
+                } else if self.topStripeNode.supernode != nil {
+                    anchorNode = self.topStripeNode
+                } else if self.backgroundNode.supernode != nil {
+                    anchorNode = self.backgroundNode
+                }
+                if let anchorNode = anchorNode {
+                    self.insertSubnode(self.highlightedBackgroundNode, aboveSubnode: anchorNode)
+                } else {
+                    self.addSubnode(self.highlightedBackgroundNode)
+                }
+            }
+        } else {
+            if self.highlightedBackgroundNode.supernode != nil {
+                if animated {
+                    self.highlightedBackgroundNode.layer.animateAlpha(from: self.highlightedBackgroundNode.alpha, to: 0.0, duration: 0.4, completion: { [weak self] completed in
+                        if let strongSelf = self {
+                            if completed {
+                                strongSelf.highlightedBackgroundNode.removeFromSupernode()
+                            }
+                        }
+                        })
+                    self.highlightedBackgroundNode.alpha = 0.0
+                } else {
+                    self.highlightedBackgroundNode.removeFromSupernode()
+                }
+            }
+        }
+    }
+    
+    override func animateInsertion(_ currentTimestamp: Double, duration: Double, short: Bool) {
+        self.layer.animateAlpha(from: 0.0, to: 1.0, duration: 0.4)
+    }
+    
+    override func animateRemoved(_ currentTimestamp: Double, duration: Double) {
+        self.layer.animateAlpha(from: 1.0, to: 0.0, duration: 0.15, removeOnCompletion: false)
+    }
+    
+    override func updateRevealOffset(offset: CGFloat, transition: ContainedViewLayoutTransition) {
+        super.updateRevealOffset(offset: offset, transition: transition)
+        
+        guard let _ = self.item, let params = self.layoutParams else {
+            return
+        }
+        
+        let leftInset: CGFloat
+        leftInset = 65.0 + params.leftInset
+        
+        let editingOffset: CGFloat
+        if let editableControlNode = self.editableControlNode {
+            editingOffset = editableControlNode.bounds.size.width
+            var editableControlFrame = editableControlNode.frame
+            editableControlFrame.origin.x = params.leftInset + offset
+            transition.updateFrame(node: editableControlNode, frame: editableControlFrame)
+        } else {
+            editingOffset = 0.0
+        }
+        
+        transition.updateFrame(node: self.titleNode, frame: CGRect(origin: CGPoint(x: leftInset + revealOffset + editingOffset, y: self.titleNode.frame.minY), size: self.titleNode.bounds.size))
+        
+        transition.updateFrame(node: self.avatarNode, frame: CGRect(origin: CGPoint(x: revealOffset + editingOffset + params.leftInset + 15.0, y: self.avatarNode.frame.minY), size: self.avatarNode.bounds.size))
+    }
+    
+    override func revealOptionsInteractivelyOpened() {
+        if let item = self.item {
+            item.updatedRevealedOptions(true)
+        }
+    }
+    
+    override func revealOptionsInteractivelyClosed() {
+        if let item = self.item {
+            item.updatedRevealedOptions(false)
+        }
+    }
+    
+    override func revealOptionSelected(_ option: ItemListRevealOption, animated: Bool) {
+        self.setRevealOptionsOpened(false, animated: true)
+        self.revealOptionsInteractivelyClosed()
+        
+        if let item = self.item {
+            item.remove()
+        }
+    }
+    
+    override func header() -> ListViewItemHeader? {
+        return nil
+    }
+}
diff --git a/submodules/ChatListUI/Sources/ChatListFilterPresetController.swift b/submodules/ChatListUI/Sources/ChatListFilterPresetController.swift
index c9bdcc3c23..8f6ee3873e 100644
--- a/submodules/ChatListUI/Sources/ChatListFilterPresetController.swift
+++ b/submodules/ChatListUI/Sources/ChatListFilterPresetController.swift
@@ -6,323 +6,762 @@ import Postbox
 import TelegramCore
 import SyncCore
 import TelegramPresentationData
+import PresentationDataUtils
 import ItemListUI
 import AccountContext
 import TelegramUIPreferences
 import ItemListPeerItem
 import ItemListPeerActionItem
+import AvatarNode
 
 private final class ChatListFilterPresetControllerArguments {
     let context: AccountContext
     let updateState: ((ChatListFilterPresetControllerState) -> ChatListFilterPresetControllerState) -> Void
-    let openAddPeer: () -> Void
-    let deleteAdditionalPeer: (PeerId) -> Void
-    let setPeerIdWithRevealedOptions: (PeerId?, PeerId?) -> Void
+    let openAddIncludePeer: () -> Void
+    let openAddExcludePeer: () -> Void
+    let deleteIncludePeer: (PeerId) -> Void
+    let deleteExcludePeer: (PeerId) -> Void
+    let setItemIdWithRevealedOptions: (ChatListFilterRevealedItemId?, ChatListFilterRevealedItemId?) -> Void
+    let deleteIncludeCategory: (ChatListFilterIncludeCategory) -> Void
+    let deleteExcludeCategory: (ChatListFilterExcludeCategory) -> Void
+    let focusOnName: () -> Void
     
-    init(context: AccountContext, updateState: @escaping ((ChatListFilterPresetControllerState) -> ChatListFilterPresetControllerState) -> Void, openAddPeer: @escaping () -> Void, deleteAdditionalPeer: @escaping (PeerId) -> Void, setPeerIdWithRevealedOptions: @escaping (PeerId?, PeerId?) -> Void) {
+    init(
+        context: AccountContext,
+        updateState: @escaping ((ChatListFilterPresetControllerState) -> ChatListFilterPresetControllerState) -> Void,
+        openAddIncludePeer: @escaping () -> Void,
+        openAddExcludePeer: @escaping () -> Void,
+        deleteIncludePeer: @escaping (PeerId) -> Void,
+        deleteExcludePeer: @escaping (PeerId) -> Void,
+        setItemIdWithRevealedOptions: @escaping (ChatListFilterRevealedItemId?, ChatListFilterRevealedItemId?) -> Void,
+        deleteIncludeCategory: @escaping (ChatListFilterIncludeCategory) -> Void,
+        deleteExcludeCategory: @escaping (ChatListFilterExcludeCategory) -> Void,
+        focusOnName: @escaping () -> Void
+    ) {
         self.context = context
         self.updateState = updateState
-        self.openAddPeer = openAddPeer
-        self.deleteAdditionalPeer = deleteAdditionalPeer
-        self.setPeerIdWithRevealedOptions = setPeerIdWithRevealedOptions
+        self.openAddIncludePeer = openAddIncludePeer
+        self.openAddExcludePeer = openAddExcludePeer
+        self.deleteIncludePeer = deleteIncludePeer
+        self.deleteExcludePeer = deleteExcludePeer
+        self.setItemIdWithRevealedOptions = setItemIdWithRevealedOptions
+        self.deleteIncludeCategory = deleteIncludeCategory
+        self.deleteExcludeCategory = deleteExcludeCategory
+        self.focusOnName = focusOnName
     }
 }
 
 private enum ChatListFilterPresetControllerSection: Int32 {
+    case screenHeader
     case name
-    case categories
-    case excludeCategories
-    case additionalPeers
-}
-
-private func filterEntry(presentationData: ItemListPresentationData, arguments: ChatListFilterPresetControllerArguments, title: String, value: Bool, filter: ChatListFilterPeerCategories, section: Int32) -> ItemListCheckboxItem {
-    return ItemListCheckboxItem(presentationData: presentationData, title: title, style: .left, checked: value, zeroSeparatorInsets: false, sectionId: section, action: {
-        arguments.updateState { current in
-            var state = current
-            if state.includeCategories.contains(filter) {
-                state.includeCategories.remove(filter)
-            } else {
-                state.includeCategories.insert(filter)
-            }
-            return state
-        }
-    })
+    case includePeers
+    case excludePeers
 }
 
 private enum ChatListFilterPresetEntryStableId: Hashable {
     case index(Int)
     case peer(PeerId)
-    case additionalPeerInfo
+    case includePeerInfo
+    case excludePeerInfo
+    case includeCategory(ChatListFilterIncludeCategory)
+    case excludeCategory(ChatListFilterExcludeCategory)
+}
+
+private enum ChatListFilterPresetEntrySortId: Comparable {
+    case screenHeader
+    case topIndex(Int)
+    case includeIndex(Int)
+    case excludeIndex(Int)
+    
+    static func <(lhs: ChatListFilterPresetEntrySortId, rhs: ChatListFilterPresetEntrySortId) -> Bool {
+        switch lhs {
+        case .screenHeader:
+            switch rhs {
+            case .screenHeader:
+                return false
+            default:
+                return true
+            }
+        case let .topIndex(lhsIndex):
+            switch rhs {
+            case .screenHeader:
+                return false
+            case let .topIndex(rhsIndex):
+                return lhsIndex < rhsIndex
+            case .includeIndex:
+                return true
+            case .excludeIndex:
+                return true
+            }
+        case let .includeIndex(lhsIndex):
+            switch rhs {
+            case .screenHeader:
+                return false
+            case .topIndex:
+                return false
+            case let .includeIndex(rhsIndex):
+                return lhsIndex < rhsIndex
+            case .excludeIndex:
+                return true
+            }
+        case let .excludeIndex(lhsIndex):
+            switch rhs {
+            case .screenHeader:
+                return false
+            case .topIndex:
+                return false
+            case .includeIndex:
+                return false
+            case let .excludeIndex(rhsIndex):
+                return lhsIndex < rhsIndex
+            }
+        }
+    }
+}
+
+private enum ChatListFilterIncludeCategory: Int32, CaseIterable {
+    case contacts
+    case nonContacts
+    case groups
+    case channels
+    case bots
+    
+    var category: ChatListFilterPeerCategories {
+        switch self {
+        case .contacts:
+            return .contacts
+        case .nonContacts:
+            return .nonContacts
+        case .groups:
+            return .groups
+        case .channels:
+            return .channels
+        case .bots:
+            return .bots
+        }
+    }
+    
+    func title(strings: PresentationStrings) -> String {
+        switch self {
+        case .contacts:
+            return "Contacts"
+        case .nonContacts:
+            return "Non-Contacts"
+        case .groups:
+            return "Groups"
+        case .channels:
+            return "Channels"
+        case .bots:
+            return "Bots"
+        }
+    }
+}
+
+private enum ChatListFilterExcludeCategory: Int32, CaseIterable {
+    case muted
+    case read
+    case archived
+    
+    func title(strings: PresentationStrings) -> String {
+        switch self {
+        case .muted:
+            return "Muted"
+        case .read:
+            return "Read"
+        case .archived:
+            return "Archived"
+        }
+    }
+}
+
+private extension ChatListFilterCategoryIcon {
+    init(category: ChatListFilterIncludeCategory) {
+        switch category {
+        case .contacts:
+            self = .contacts
+        case .nonContacts:
+            self = .nonContacts
+        case .groups:
+            self = .groups
+        case .channels:
+            self = .channels
+        case .bots:
+            self = .bots
+        }
+    }
+    
+    init(category: ChatListFilterExcludeCategory) {
+        switch category {
+        case .muted:
+            self = .muted
+        case .read:
+            self = .read
+        case .archived:
+            self = .archived
+        }
+    }
+}
+
+private enum ChatListFilterRevealedItemId: Equatable {
+    case peer(PeerId)
+    case includeCategory(ChatListFilterIncludeCategory)
+    case excludeCategory(ChatListFilterExcludeCategory)
 }
 
 private enum ChatListFilterPresetEntry: ItemListNodeEntry {
+    case screenHeader
     case nameHeader(String)
     case name(placeholder: String, value: String)
-    case typesHeader(text: String)
-    case filterPrivateChats(title: String, value: Bool)
-    case filterSecretChats(title: String, value: Bool)
-    case filterPrivateGroups(title: String, value: Bool)
-    case filterBots(title: String, value: Bool)
-    case filterPublicGroups(title: String, value: Bool)
-    case filterChannels(title: String, value: Bool)
-    case filterMuted(title: String, value: Bool)
-    case filterRead(title: String, value: Bool)
-    case additionalPeersHeader(String)
-    case addAdditionalPeer(title: String)
-    case additionalPeer(index: Int, peer: RenderedPeer, isRevealed: Bool)
-    case additionalPeerInfo(String)
+    case includePeersHeader(String)
+    case addIncludePeer(title: String)
+    case includeCategory(index: Int, category: ChatListFilterIncludeCategory, title: String, isRevealed: Bool)
+    case includePeer(index: Int, peer: RenderedPeer, isRevealed: Bool)
+    case includePeerInfo(String)
+    case excludePeersHeader(String)
+    case addExcludePeer(title: String)
+    case excludeCategory(index: Int, category: ChatListFilterExcludeCategory, title: String, isRevealed: Bool)
+    case excludePeer(index: Int, peer: RenderedPeer, isRevealed: Bool)
+    case excludePeerInfo(String)
     
     var section: ItemListSectionId {
         switch self {
+        case .screenHeader:
+            return ChatListFilterPresetControllerSection.screenHeader.rawValue
         case .nameHeader, .name:
             return ChatListFilterPresetControllerSection.name.rawValue
-        case .typesHeader, .filterPrivateChats, .filterSecretChats, .filterPrivateGroups, .filterBots, .filterPublicGroups, .filterChannels:
-            return ChatListFilterPresetControllerSection.categories.rawValue
-        case .filterMuted, .filterRead:
-            return ChatListFilterPresetControllerSection.excludeCategories.rawValue
-        case .additionalPeersHeader, .addAdditionalPeer, .additionalPeer, .additionalPeerInfo:
-            return ChatListFilterPresetControllerSection.additionalPeers.rawValue
+        case .includePeersHeader, .addIncludePeer, .includeCategory, .includePeer, .includePeerInfo:
+            return ChatListFilterPresetControllerSection.includePeers.rawValue
+        case .excludePeersHeader, .addExcludePeer, .excludeCategory, .excludePeer, .excludePeerInfo:
+            return ChatListFilterPresetControllerSection.excludePeers.rawValue
         }
     }
     
     var stableId: ChatListFilterPresetEntryStableId {
         switch self {
-        case .nameHeader:
+        case .screenHeader:
             return .index(0)
-        case .name:
+        case .nameHeader:
             return .index(1)
-        case .typesHeader:
+        case .name:
             return .index(2)
-        case .filterPrivateChats:
+        case .includePeersHeader:
             return .index(3)
-        case .filterSecretChats:
+        case .addIncludePeer:
             return .index(4)
-        case .filterPrivateGroups:
+        case let .includeCategory(includeCategory):
+            return .includeCategory(includeCategory.category)
+        case .includePeerInfo:
             return .index(5)
-        case .filterPublicGroups:
+        case .excludePeersHeader:
             return .index(6)
-        case .filterChannels:
+        case .addExcludePeer:
             return .index(7)
-        case .filterBots:
+        case let .excludeCategory(excludeCategory):
+            return .excludeCategory(excludeCategory.category)
+        case .excludePeerInfo:
             return .index(8)
-        case .filterMuted:
-            return .index(9)
-        case .filterRead:
-            return .index(10)
-        case .additionalPeersHeader:
-            return .index(11)
-        case .addAdditionalPeer:
-            return .index(12)
-        case let .additionalPeer(additionalPeer):
-            return .peer(additionalPeer.peer.peerId)
-        case .additionalPeerInfo:
-            return .additionalPeerInfo
+        case let .includePeer(peer):
+            return .peer(peer.peer.peerId)
+        case let .excludePeer(peer):
+            return .peer(peer.peer.peerId)
+        }
+    }
+    
+    private var sortIndex: ChatListFilterPresetEntrySortId {
+        switch self {
+        case .screenHeader:
+            return .screenHeader
+        case .nameHeader:
+            return .topIndex(0)
+        case .name:
+            return .topIndex(1)
+        case .includePeersHeader:
+            return .includeIndex(0)
+        case .addIncludePeer:
+            return .includeIndex(1)
+        case let .includeCategory(includeCategory):
+            return .includeIndex(2 + includeCategory.index)
+        case let .includePeer(includePeer):
+            return .includeIndex(200 + includePeer.index)
+        case .includePeerInfo:
+            return .includeIndex(1000)
+        case .excludePeersHeader:
+            return .excludeIndex(0)
+        case .addExcludePeer:
+            return .excludeIndex(1)
+        case let .excludeCategory(excludeCategory):
+            return .excludeIndex(2 + excludeCategory.index)
+        case let .excludePeer(excludePeer):
+            return .excludeIndex(200 + excludePeer.index)
+        case .excludePeerInfo:
+            return .excludeIndex(1000)
         }
     }
     
     static func <(lhs: ChatListFilterPresetEntry, rhs: ChatListFilterPresetEntry) -> Bool {
-        switch lhs.stableId {
-        case let .index(lhsIndex):
-            switch rhs.stableId {
-            case let .index(rhsIndex):
-                return lhsIndex < rhsIndex
-            case .peer:
-                return true
-            case .additionalPeerInfo:
-                return true
-            }
-        case .peer:
-            switch lhs {
-            case let .additionalPeer(lhsIndex, _, _):
-                switch rhs.stableId {
-                case .index:
-                    return false
-                case .additionalPeerInfo:
-                    return true
-                case .peer:
-                    switch rhs {
-                    case let .additionalPeer(rhsIndex, _, _):
-                        return lhsIndex < rhsIndex
-                    default:
-                        preconditionFailure()
-                    }
-                }
-            default:
-                preconditionFailure()
-            }
-        case .additionalPeerInfo:
-            switch rhs.stableId {
-            case .index:
-                return false
-            case .peer:
-                return false
-            case .additionalPeerInfo:
-                return false
-            }
-        }
+        return lhs.sortIndex < rhs.sortIndex
     }
     
     func item(presentationData: ItemListPresentationData, arguments: Any) -> ListViewItem {
         let arguments = arguments as! ChatListFilterPresetControllerArguments
         switch self {
+        case .screenHeader:
+            return ChatListFilterSettingsHeaderItem(theme: presentationData.theme, text: "", animation: .newFolder, sectionId: self.section)
         case let .nameHeader(title):
             return ItemListSectionHeaderItem(presentationData: presentationData, text: title, sectionId: self.section)
         case let .name(placeholder, value):
-            return ItemListSingleLineInputItem(presentationData: presentationData, title: NSAttributedString(), text: value, placeholder: placeholder, type: .regular(capitalization: true, autocorrection: false), sectionId: self.section, textUpdated: { value in
+            return ItemListSingleLineInputItem(presentationData: presentationData, title: NSAttributedString(), text: value, placeholder: placeholder, type: .regular(capitalization: true, autocorrection: false), clearType: .always, maxLength: 20, sectionId: self.section, textUpdated: { value in
                 arguments.updateState { current in
                     var state = current
                     state.name = value
+                    state.changedName = true
                     return state
                 }
-            }, action: {})
-        case let .typesHeader(text):
+            }, action: {}, cleared: {
+                arguments.focusOnName()
+            })
+        case .includePeersHeader(let text), .excludePeersHeader(let text):
             return ItemListSectionHeaderItem(presentationData: presentationData, text: text, sectionId: self.section)
-        case let .filterPrivateChats(title, value):
-            return filterEntry(presentationData: presentationData, arguments: arguments, title: title, value: value, filter: .privateChats, section: self.section)
-        case let .filterSecretChats(title, value):
-            return filterEntry(presentationData: presentationData, arguments: arguments, title: title, value: value, filter: .secretChats, section: self.section)
-        case let .filterPrivateGroups(title, value):
-            return filterEntry(presentationData: presentationData, arguments: arguments, title: title, value: value, filter: .privateGroups, section: self.section)
-        case let .filterBots(title, value):
-            return filterEntry(presentationData: presentationData, arguments: arguments, title: title, value: value, filter: .bots, section: self.section)
-        case let .filterPublicGroups(title, value):
-            return filterEntry(presentationData: presentationData, arguments: arguments, title: title, value: value, filter: .publicGroups, section: self.section)
-        case let .filterChannels(title, value):
-            return filterEntry(presentationData: presentationData, arguments: arguments, title: title, value: value, filter: .channels, section: self.section)
-        case let .filterMuted(title, value):
-            return ItemListSwitchItem(presentationData: presentationData, title: title, value: value, sectionId: self.section, style: .blocks, updated: { _ in
-                arguments.updateState { current in
-                    var state = current
-                    state.excludeMuted = !state.excludeMuted
-                    return state
-                }
-            })
-        case let .filterRead(title, value):
-            return ItemListSwitchItem(presentationData: presentationData, title: title, value: value, sectionId: self.section, style: .blocks, updated: { _ in
-                arguments.updateState { current in
-                    var state = current
-                    state.excludeRead = !state.excludeRead
-                    return state
-                }
-            })
-        case let .additionalPeersHeader(title):
-            return ItemListSectionHeaderItem(presentationData: presentationData, text: title, sectionId: self.section)
-        case let .addAdditionalPeer(title):
-            return ItemListPeerActionItem(presentationData: presentationData, icon: PresentationResourcesItemList.addPersonIcon(presentationData.theme), title: title, alwaysPlain: false, sectionId: self.section, height: .peerList, editing: false, action: {
-                arguments.openAddPeer()
-            })
-        case let .additionalPeer(title, peer, isRevealed):
-            return ItemListPeerItem(presentationData: presentationData, dateTimeFormat: PresentationDateTimeFormat(timeFormat: .regular, dateFormat: .monthFirst, dateSeparator: ".", decimalSeparator: ".", groupingSeparator: "."), nameDisplayOrder: .firstLast, context: arguments.context, peer: peer.chatMainPeer!, height: .peerList, presence: nil, text: .none, label: .none, editing: ItemListPeerItemEditing(editable: true, editing: false, revealed: isRevealed), revealOptions: ItemListPeerItemRevealOptions(options: [ItemListPeerItemRevealOption(type: .destructive, title: presentationData.strings.Common_Delete, action: {
-                arguments.deleteAdditionalPeer(peer.peerId)
-            })]), switchValue: nil, enabled: true, selectable: false, sectionId: self.section, action: nil, setPeerIdWithRevealedOptions: { lhs, rhs in
-                arguments.setPeerIdWithRevealedOptions(lhs, rhs)
-            }, removePeer: { id in
-                arguments.deleteAdditionalPeer(id)
-            })
-        case let .additionalPeerInfo(text):
+        case .includePeerInfo(let text), .excludePeerInfo(let text):
             return ItemListTextItem(presentationData: presentationData, text: .plain(text), sectionId: self.section)
+        case let .addIncludePeer(title):
+            return ItemListPeerActionItem(presentationData: presentationData, icon: PresentationResourcesItemList.plusIconImage(presentationData.theme), title: title, alwaysPlain: false, sectionId: self.section, height: .peerList, editing: false, action: {
+                arguments.openAddIncludePeer()
+            })
+        case let .includeCategory(_, category, title, isRevealed):
+            return ChatListFilterPresetCategoryItem(
+                presentationData: presentationData,
+                title: title,
+                icon: ChatListFilterCategoryIcon(category: category),
+                isRevealed: isRevealed,
+                sectionId: self.section,
+                updatedRevealedOptions: { reveal in
+                    if reveal {
+                        arguments.setItemIdWithRevealedOptions(.includeCategory(category), nil)
+                    } else {
+                        arguments.setItemIdWithRevealedOptions(nil, .includeCategory(category))
+                    }
+                },
+                remove: {
+                    arguments.deleteIncludeCategory(category)
+                }
+            )
+        case let .addExcludePeer(title):
+            return ItemListPeerActionItem(presentationData: presentationData, icon: PresentationResourcesItemList.plusIconImage(presentationData.theme), title: title, alwaysPlain: false, sectionId: self.section, height: .peerList, editing: false, action: {
+                arguments.openAddExcludePeer()
+            })
+        case let .excludeCategory(_, category, title, isRevealed):
+            return ChatListFilterPresetCategoryItem(
+                presentationData: presentationData,
+                title: title,
+                icon: ChatListFilterCategoryIcon(category: category),
+                isRevealed: isRevealed,
+                sectionId: self.section,
+                updatedRevealedOptions: { reveal in
+                    if reveal {
+                        arguments.setItemIdWithRevealedOptions(.excludeCategory(category), nil)
+                    } else {
+                        arguments.setItemIdWithRevealedOptions(nil, .excludeCategory(category))
+                    }
+                },
+                remove: {
+                    arguments.deleteExcludeCategory(category)
+                }
+            )
+        case let .includePeer(_, peer, isRevealed):
+            return ItemListPeerItem(presentationData: presentationData, dateTimeFormat: PresentationDateTimeFormat(timeFormat: .regular, dateFormat: .monthFirst, dateSeparator: ".", decimalSeparator: ".", groupingSeparator: "."), nameDisplayOrder: .firstLast, context: arguments.context, peer: peer.chatMainPeer!, height: .peerList, presence: nil, text: .none, label: .none, editing: ItemListPeerItemEditing(editable: true, editing: false, revealed: isRevealed), revealOptions: ItemListPeerItemRevealOptions(options: [ItemListPeerItemRevealOption(type: .destructive, title: presentationData.strings.Common_Delete, action: {
+                arguments.deleteIncludePeer(peer.peerId)
+            })]), switchValue: nil, enabled: true, selectable: false, sectionId: self.section, action: nil, setPeerIdWithRevealedOptions: { lhs, rhs in
+                arguments.setItemIdWithRevealedOptions(lhs.flatMap { .peer($0) }, rhs.flatMap { .peer($0) })
+            }, removePeer: { id in
+                arguments.deleteIncludePeer(id)
+            })
+        case let .excludePeer(_, peer, isRevealed):
+            return ItemListPeerItem(presentationData: presentationData, dateTimeFormat: PresentationDateTimeFormat(timeFormat: .regular, dateFormat: .monthFirst, dateSeparator: ".", decimalSeparator: ".", groupingSeparator: "."), nameDisplayOrder: .firstLast, context: arguments.context, peer: peer.chatMainPeer!, height: .peerList, presence: nil, text: .none, label: .none, editing: ItemListPeerItemEditing(editable: true, editing: false, revealed: isRevealed), revealOptions: ItemListPeerItemRevealOptions(options: [ItemListPeerItemRevealOption(type: .destructive, title: presentationData.strings.Common_Delete, action: {
+                arguments.deleteExcludePeer(peer.peerId)
+            })]), switchValue: nil, enabled: true, selectable: false, sectionId: self.section, action: nil, setPeerIdWithRevealedOptions: { lhs, rhs in
+                arguments.setItemIdWithRevealedOptions(lhs.flatMap { .peer($0) }, rhs.flatMap { .peer($0) })
+            }, removePeer: { id in
+                arguments.deleteExcludePeer(id)
+            })
         }
     }
 }
 
 private struct ChatListFilterPresetControllerState: Equatable {
     var name: String
+    var changedName: Bool
     var includeCategories: ChatListFilterPeerCategories
     var excludeMuted: Bool
     var excludeRead: Bool
+    var excludeArchived: Bool
     var additionallyIncludePeers: [PeerId]
+    var additionallyExcludePeers: [PeerId]
     
-    var revealedPeerId: PeerId?
+    var revealedItemId: ChatListFilterRevealedItemId?
     
     var isComplete: Bool {
         if self.name.isEmpty {
             return false
         }
-        if self.includeCategories.isEmpty && self.additionallyIncludePeers.isEmpty && !self.excludeMuted && !self.excludeRead {
+        
+        let defaultCategories: ChatListFilterPeerCategories = .all
+        let defaultExcludeArchived = true
+        let defaultExcludeMuted = false
+        let defaultExcludeRead = false
+        
+        if self.includeCategories == defaultCategories &&
+           self.excludeArchived == defaultExcludeArchived &&
+           self.excludeMuted == defaultExcludeMuted &&
+           self.excludeRead == defaultExcludeRead {
+           return false
+        }
+        
+        if self.includeCategories.isEmpty && self.additionallyIncludePeers.isEmpty {
             return false
         }
+        
         return true
     }
 }
 
 //TODO:localization
-private func chatListFilterPresetControllerEntries(presentationData: PresentationData, state: ChatListFilterPresetControllerState, peers: [RenderedPeer]) -> [ChatListFilterPresetEntry] {
+private func chatListFilterPresetControllerEntries(presentationData: PresentationData, isNewFilter: Bool, state: ChatListFilterPresetControllerState, includePeers: [RenderedPeer], excludePeers: [RenderedPeer]) -> [ChatListFilterPresetEntry] {
     var entries: [ChatListFilterPresetEntry] = []
     
-    entries.append(.nameHeader("FILTER NAME"))
-    entries.append(.name(placeholder: "Filter Name", value: state.name))
-    
-    entries.append(.typesHeader(text: "INCLUDE CHAT TYPES"))
-    entries.append(.filterPrivateChats(title: "Private Chats", value: state.includeCategories.contains(.privateChats)))
-    entries.append(.filterSecretChats(title: "Secret Chats", value: state.includeCategories.contains(.secretChats)))
-    entries.append(.filterPrivateGroups(title: "Private Groups", value: state.includeCategories.contains(.privateGroups)))
-    entries.append(.filterPublicGroups(title: "Public Groups", value: state.includeCategories.contains(.publicGroups)))
-    entries.append(.filterChannels(title: "Channels", value: state.includeCategories.contains(.channels)))
-    entries.append(.filterBots(title: "Bots", value: state.includeCategories.contains(.bots)))
-    
-    entries.append(.filterMuted(title: "Exclude Muted", value: state.excludeMuted))
-    entries.append(.filterRead(title: "Exclude Read", value: state.excludeRead))
-    
-    entries.append(.additionalPeersHeader("ALWAYS INCLUDE"))
-    entries.append(.addAdditionalPeer(title: "Add Chats"))
-    
-    for peer in peers {
-        entries.append(.additionalPeer(index: entries.count, peer: peer, isRevealed: state.revealedPeerId == peer.peerId))
+    if isNewFilter {
+        entries.append(.screenHeader)
     }
     
-    entries.append(.additionalPeerInfo("These chats will always be included in the list."))
+    entries.append(.nameHeader("FOLDER NAME"))
+    entries.append(.name(placeholder: "Folder Name", value: state.name))
+    
+    entries.append(.includePeersHeader("INCLUDED CHATS"))
+    entries.append(.addIncludePeer(title: "Add Chats"))
+    
+    var includeCategoryIndex = 0
+    for category in ChatListFilterIncludeCategory.allCases {
+        if state.includeCategories.contains(category.category) {
+            entries.append(.includeCategory(index: includeCategoryIndex, category: category, title: category.title(strings: presentationData.strings), isRevealed: state.revealedItemId == .includeCategory(category)))
+        }
+        includeCategoryIndex += 1
+    }
+    
+    for peer in includePeers {
+        entries.append(.includePeer(index: entries.count, peer: peer, isRevealed: state.revealedItemId == .peer(peer.peerId)))
+    }
+    
+    entries.append(.includePeerInfo("Choose chats and types of chats that will appear in this filter."))
+    
+    entries.append(.excludePeersHeader("EXCLUDED CHATS"))
+    entries.append(.addExcludePeer(title: "Add Chats"))
+    
+    var excludeCategoryIndex = 0
+    for category in ChatListFilterExcludeCategory.allCases {
+        let isExcluded: Bool
+        switch category {
+        case .read:
+            isExcluded = state.excludeRead
+        case .muted:
+            isExcluded = state.excludeMuted
+        case .archived:
+            isExcluded = state.excludeArchived
+        }
+        
+        if isExcluded {
+            entries.append(.excludeCategory(index: excludeCategoryIndex, category: category, title: category.title(strings: presentationData.strings), isRevealed: state.revealedItemId == .excludeCategory(category)))
+        }
+        excludeCategoryIndex += 1
+    }
+    
+    for peer in excludePeers {
+        entries.append(.excludePeer(index: entries.count, peer: peer, isRevealed: state.revealedItemId == .peer(peer.peerId)))
+    }
+    
+    entries.append(.excludePeerInfo("Choose chats and types of chats that will never appear in the filter."))
     
     return entries
 }
 
+private enum AdditionalCategoryId: Int {
+    case contacts
+    case nonContacts
+    case groups
+    case channels
+    case bots
+}
+
+private enum AdditionalExcludeCategoryId: Int {
+    case muted
+    case read
+    case archived
+}
+
 func chatListFilterAddChatsController(context: AccountContext, filter: ChatListFilter) -> ViewController {
-    let controller = context.sharedContext.makeContactMultiselectionController(ContactMultiselectionControllerParams(context: context, mode: .peerSelection(searchChatList: true, searchGroups: true, searchChannels: true), options: []))
+    return internalChatListFilterAddChatsController(context: context, filter: filter, applyAutomatically: true, updated: { _ in })
+}
+    
+private func internalChatListFilterAddChatsController(context: AccountContext, filter: ChatListFilter, applyAutomatically: Bool, updated: @escaping (ChatListFilter) -> Void) -> ViewController {
+    let additionalCategories: [ChatListNodeAdditionalCategory] = [
+        ChatListNodeAdditionalCategory(
+            id: AdditionalCategoryId.contacts.rawValue,
+            icon: generateAvatarImage(size: CGSize(width: 40.0, height: 40.0), icon: generateTintedImage(image: UIImage(bundleImageName: "Chat/Context Menu/User"), color: .white), color: .blue),
+            title: "Contacts"
+        ),
+        ChatListNodeAdditionalCategory(
+            id: AdditionalCategoryId.nonContacts.rawValue,
+            icon: generateAvatarImage(size: CGSize(width: 40.0, height: 40.0), icon: generateTintedImage(image: UIImage(bundleImageName: "Chat/Context Menu/UnknownUser"), color: .white), color: .yellow),
+            title: "Non-Contacts"
+        ),
+        ChatListNodeAdditionalCategory(
+            id: AdditionalCategoryId.groups.rawValue,
+            icon: generateAvatarImage(size: CGSize(width: 40.0, height: 40.0), icon: generateTintedImage(image: UIImage(bundleImageName: "Chat/Context Menu/Groups"), color: .white), color: .green),
+            title: "Groups"
+        ),
+        ChatListNodeAdditionalCategory(
+            id: AdditionalCategoryId.channels.rawValue,
+            icon: generateAvatarImage(size: CGSize(width: 40.0, height: 40.0), icon: generateTintedImage(image: UIImage(bundleImageName: "Chat/Context Menu/Channels"), color: .white), color: .red),
+            title: "Channels"
+        ),
+        ChatListNodeAdditionalCategory(
+            id: AdditionalCategoryId.bots.rawValue,
+            icon: generateAvatarImage(size: CGSize(width: 40.0, height: 40.0), icon: generateTintedImage(image: UIImage(bundleImageName: "Chat/Context Menu/Bots"), color: .white), color: .violet),
+            title: "Bots"
+        )
+    ]
+    var selectedCategories = Set<Int>()
+    let categoryMapping: [ChatListFilterPeerCategories: AdditionalCategoryId] = [
+        .contacts: .contacts,
+        .nonContacts: .nonContacts,
+        .groups: .groups,
+        .channels: .channels,
+        .bots: .bots
+    ]
+    for (category, id) in categoryMapping {
+        if filter.data.categories.contains(category) {
+            selectedCategories.insert(id.rawValue)
+        }
+    }
+    
+    let controller = context.sharedContext.makeContactMultiselectionController(ContactMultiselectionControllerParams(context: context, mode: .chatSelection(selectedChats: Set(filter.data.includePeers), additionalCategories: ContactMultiselectionControllerAdditionalCategories(categories: additionalCategories, selectedCategories: selectedCategories)), options: [], alwaysEnabled: true))
     controller.navigationPresentation = .modal
     let _ = (controller.result
     |> take(1)
-    |> deliverOnMainQueue).start(next: { [weak controller] peerIds in
-        let _ = (updateChatListFilterSettingsInteractively(postbox: context.account.postbox, { settings in
-            var settings = settings
-            for i in 0 ..< settings.filters.count {
-                if settings.filters[i].id == filter.id {
-                    let previousIncludePeers = settings.filters[i].includePeers
-                    
-                    var chatPeerIds: [PeerId] = []
-                    for peerId in peerIds {
-                        switch peerId {
-                        case let .peer(id):
-                            chatPeerIds.append(id)
-                        default:
-                            break
-                        }
-                    }
-                    settings.filters[i].includePeers = chatPeerIds + previousIncludePeers.filter { peerId in
-                        return !chatPeerIds.contains(peerId)
+    |> deliverOnMainQueue).start(next: { [weak controller] result in
+        guard case let .result(peerIds, additionalCategoryIds) = result else {
+            controller?.dismiss()
+            return
+        }
+        
+        var includePeers: [PeerId] = []
+        for peerId in peerIds {
+            switch peerId {
+            case let .peer(id):
+                includePeers.append(id)
+            default:
+                break
+            }
+        }
+        includePeers.sort()
+        
+        var categories: ChatListFilterPeerCategories = []
+        for id in additionalCategoryIds {
+            if let index = categoryMapping.firstIndex(where: { $0.1.rawValue == id }) {
+                categories.insert(categoryMapping[index].0)
+            } else {
+                assertionFailure()
+            }
+        }
+        
+        if applyAutomatically {
+            let _ = (updateChatListFiltersInteractively(postbox: context.account.postbox, { filters in
+                var filters = filters
+                for i in 0 ..< filters.count {
+                    if filters[i].id == filter.id {
+                        filters[i].data.categories = categories
+                        filters[i].data.includePeers = includePeers
+                        filters[i].data.excludePeers = filters[i].data.excludePeers.filter { !filters[i].data.includePeers.contains($0) }
                     }
                 }
-            }
-            return settings
-        })
-        |> deliverOnMainQueue).start(next: { settings in
+                return filters
+            })
+            |> deliverOnMainQueue).start(next: { _ in
+                controller?.dismiss()
+            })
+        } else {
+            var filter = filter
+            filter.data.categories = categories
+            filter.data.includePeers = includePeers
+            filter.data.excludePeers = filter.data.excludePeers.filter { !filter.data.includePeers.contains($0) }
+            updated(filter)
             controller?.dismiss()
-        })
+        }
     })
     return controller
 }
 
+private func internalChatListFilterExcludeChatsController(context: AccountContext, filter: ChatListFilter, applyAutomatically: Bool, updated: @escaping (ChatListFilter) -> Void) -> ViewController {
+    let additionalCategories: [ChatListNodeAdditionalCategory] = [
+        ChatListNodeAdditionalCategory(
+            id: AdditionalExcludeCategoryId.muted.rawValue,
+            icon: generateAvatarImage(size: CGSize(width: 40.0, height: 40.0), icon: generateTintedImage(image: UIImage(bundleImageName: "Chat/Context Menu/Muted"), color: .white), color: .red),
+            title: "Muted"
+        ),
+        ChatListNodeAdditionalCategory(
+            id: AdditionalExcludeCategoryId.read.rawValue,
+            icon: generateAvatarImage(size: CGSize(width: 40.0, height: 40.0), icon: generateTintedImage(image: UIImage(bundleImageName: "Chat/Context Menu/MarkAsRead"), color: .white), color: .blue),
+            title: "Read"
+        ),
+        ChatListNodeAdditionalCategory(
+            id: AdditionalExcludeCategoryId.archived.rawValue,
+            icon: generateAvatarImage(size: CGSize(width: 40.0, height: 40.0), icon: generateTintedImage(image: UIImage(bundleImageName: "Chat/Context Menu/Archive"), color: .white), color: .yellow),
+            title: "Archived"
+        ),
+    ]
+    var selectedCategories = Set<Int>()
+    if filter.data.excludeMuted {
+        selectedCategories.insert(AdditionalExcludeCategoryId.muted.rawValue)
+    }
+    if filter.data.excludeRead {
+        selectedCategories.insert(AdditionalExcludeCategoryId.read.rawValue)
+    }
+    if filter.data.excludeArchived {
+        selectedCategories.insert(AdditionalExcludeCategoryId.archived.rawValue)
+    }
+    
+    let controller = context.sharedContext.makeContactMultiselectionController(ContactMultiselectionControllerParams(context: context, mode: .chatSelection(selectedChats: Set(filter.data.excludePeers), additionalCategories: ContactMultiselectionControllerAdditionalCategories(categories: additionalCategories, selectedCategories: selectedCategories)), options: [], alwaysEnabled: true))
+    controller.navigationPresentation = .modal
+    let _ = (controller.result
+    |> take(1)
+    |> deliverOnMainQueue).start(next: { [weak controller] result in
+        guard case let .result(peerIds, additionalCategoryIds) = result else {
+            controller?.dismiss()
+            return
+        }
+        
+        var excludePeers: [PeerId] = []
+        for peerId in peerIds {
+            switch peerId {
+            case let .peer(id):
+                excludePeers.append(id)
+            default:
+                break
+            }
+        }
+        excludePeers.sort()
+        
+        if applyAutomatically {
+            let _ = (updateChatListFiltersInteractively(postbox: context.account.postbox, { filters in
+                var filters = filters
+                for i in 0 ..< filters.count {
+                    if filters[i].id == filter.id {
+                        filters[i].data.excludeMuted = additionalCategoryIds.contains(AdditionalExcludeCategoryId.muted.rawValue)
+                        filters[i].data.excludeRead = additionalCategoryIds.contains(AdditionalExcludeCategoryId.read.rawValue)
+                        filters[i].data.excludeArchived = additionalCategoryIds.contains(AdditionalExcludeCategoryId.archived.rawValue)
+                        filters[i].data.excludePeers = excludePeers
+                        filters[i].data.includePeers = filters[i].data.includePeers.filter { !filters[i].data.excludePeers.contains($0) }
+                    }
+                }
+                return filters
+            })
+            |> deliverOnMainQueue).start(next: { _ in
+                controller?.dismiss()
+            })
+        } else {
+            var filter = filter
+            filter.data.excludeMuted = additionalCategoryIds.contains(AdditionalExcludeCategoryId.muted.rawValue)
+            filter.data.excludeRead = additionalCategoryIds.contains(AdditionalExcludeCategoryId.read.rawValue)
+            filter.data.excludeArchived = additionalCategoryIds.contains(AdditionalExcludeCategoryId.archived.rawValue)
+            filter.data.excludePeers = excludePeers
+            filter.data.includePeers = filter.data.includePeers.filter { !filter.data.excludePeers.contains($0) }
+            updated(filter)
+            controller?.dismiss()
+        }
+    })
+    return controller
+}
+
+enum ChatListFilterType {
+    case generic
+    case unmuted
+    case unread
+    case channels
+    case groups
+    case bots
+    case contacts
+    case nonContacts
+}
+
+func chatListFilterType(_ filter: ChatListFilter) -> ChatListFilterType {
+    let filterType: ChatListFilterType
+    if filter.data.includePeers.isEmpty {
+        if filter.data.categories == .all {
+            if filter.data.excludeRead {
+                filterType = .unread
+            } else if filter.data.excludeMuted {
+                filterType = .unmuted
+            } else {
+                filterType = .generic
+            }
+        } else {
+            if filter.data.categories == .channels {
+                filterType = .channels
+            } else if filter.data.categories == .groups {
+                filterType = .groups
+            } else if filter.data.categories == .bots {
+                filterType = .bots
+            } else if filter.data.categories == .contacts {
+                filterType = .contacts
+            } else if filter.data.categories == .nonContacts {
+                filterType = .nonContacts
+            } else {
+                filterType = .generic
+            }
+        }
+    } else {
+        filterType = .generic
+    }
+    return filterType
+}
+
 func chatListFilterPresetController(context: AccountContext, currentPreset: ChatListFilter?, updated: @escaping ([ChatListFilter]) -> Void) -> ViewController {
     let initialName: String
     if let currentPreset = currentPreset {
-        initialName = currentPreset.title ?? ""
+        initialName = currentPreset.title
     } else {
-        initialName = "New Filter"
+        initialName = "New Folder"
     }
-    let initialState = ChatListFilterPresetControllerState(name: initialName, includeCategories: currentPreset?.categories ?? .all, excludeMuted: currentPreset?.excludeMuted ?? false, excludeRead: currentPreset?.excludeRead ?? false, additionallyIncludePeers: currentPreset?.includePeers ?? [])
+    let initialState = ChatListFilterPresetControllerState(name: initialName, changedName: currentPreset != nil, includeCategories: currentPreset?.data.categories ?? [], excludeMuted: currentPreset?.data.excludeMuted ?? false, excludeRead: currentPreset?.data.excludeRead ?? false, excludeArchived: currentPreset?.data.excludeArchived ?? false, additionallyIncludePeers: currentPreset?.data.includePeers ?? [], additionallyExcludePeers: currentPreset?.data.excludePeers ?? [])
     let stateValue = Atomic(value: initialState)
     let statePromise = ValuePromise(initialState, ignoreRepeated: true)
     let updateState: ((ChatListFilterPresetControllerState) -> ChatListFilterPresetControllerState) -> Void = { f in
-        statePromise.set(stateValue.modify { f($0) })
+        statePromise.set(stateValue.modify { current in
+            var state = f(current)
+            if !state.changedName {
+                let filter = ChatListFilter(id: currentPreset?.id ?? -1, title: state.name, data: ChatListFilterData(categories: state.includeCategories, excludeMuted: state.excludeMuted, excludeRead: state.excludeRead, excludeArchived: state.excludeArchived, includePeers: state.additionallyIncludePeers, excludePeers: state.additionallyExcludePeers))
+                switch chatListFilterType(filter) {
+                case .generic:
+                    state.name = initialName
+                case .unmuted:
+                    state.name = "Not Muted"
+                case .unread:
+                    state.name = "Unread"
+                case .channels:
+                    state.name = "Channels"
+                case .groups:
+                    state.name = "Groups"
+                case .bots:
+                    state.name = "Bots"
+                case .contacts:
+                    state.name = "Contacts"
+                case .nonContacts:
+                    state.name = "Non-Contacts"
+                }
+            }
+            return state
+        })
     }
+    var skipStateAnimation = false
     
     let actionsDisposable = DisposableSet()
     
@@ -331,115 +770,207 @@ func chatListFilterPresetController(context: AccountContext, currentPreset: Chat
     
     var presentControllerImpl: ((ViewController, Any?) -> Void)?
     var dismissImpl: (() -> Void)?
+    var focusOnNameImpl: (() -> Void)?
     
     let arguments = ChatListFilterPresetControllerArguments(
         context: context,
         updateState: { f in
             updateState(f)
         },
-        openAddPeer: {
-            let controller = context.sharedContext.makeContactMultiselectionController(ContactMultiselectionControllerParams(context: context, mode: .peerSelection(searchChatList: true, searchGroups: true, searchChannels: true), options: []))
-            addPeerDisposable.set((controller.result
-            |> take(1)
-            |> deliverOnMainQueue).start(next: { [weak controller] peerIds in
-                controller?.dismiss()
+        openAddIncludePeer: {
+            let state = stateValue.with { $0 }
+            let filter = ChatListFilter(id: currentPreset?.id ?? -1, title: state.name, data: ChatListFilterData(categories: state.includeCategories, excludeMuted: state.excludeMuted, excludeRead: state.excludeRead, excludeArchived: state.excludeArchived, includePeers: state.additionallyIncludePeers, excludePeers: state.additionallyExcludePeers))
+            
+            let controller = internalChatListFilterAddChatsController(context: context, filter: filter, applyAutomatically: false, updated: { filter in
+                skipStateAnimation = true
                 updateState { state in
                     var state = state
-                    for peerId in peerIds {
-                        switch peerId {
-                        case let .peer(id):
-                            if !state.additionallyIncludePeers.contains(id) {
-                                state.additionallyIncludePeers.insert(id, at: 0)
-                            }
-                        default:
-                            break
-                        }
-                    }
+                    state.additionallyIncludePeers = filter.data.includePeers
+                    state.additionallyExcludePeers = filter.data.excludePeers
+                    state.includeCategories = filter.data.categories
                     return state
                 }
-            }))
+            })
             presentControllerImpl?(controller, ViewControllerPresentationArguments(presentationAnimation: .modalSheet))
         },
-        deleteAdditionalPeer: { peerId in
+        openAddExcludePeer: {
+            let state = stateValue.with { $0 }
+            let filter = ChatListFilter(id: currentPreset?.id ?? -1, title: state.name, data: ChatListFilterData(categories: state.includeCategories, excludeMuted: state.excludeMuted, excludeRead: state.excludeRead, excludeArchived: state.excludeArchived, includePeers: state.additionallyIncludePeers, excludePeers: state.additionallyExcludePeers))
+            
+            let controller = internalChatListFilterExcludeChatsController(context: context, filter: filter, applyAutomatically: false, updated: { filter in
+                skipStateAnimation = true
+                updateState { state in
+                    var state = state
+                    state.additionallyIncludePeers = filter.data.includePeers
+                    state.additionallyExcludePeers = filter.data.excludePeers
+                    state.includeCategories = filter.data.categories
+                    state.excludeRead = filter.data.excludeRead
+                    state.excludeMuted = filter.data.excludeMuted
+                    state.excludeArchived = filter.data.excludeArchived
+                    return state
+                }
+            })
+            presentControllerImpl?(controller, ViewControllerPresentationArguments(presentationAnimation: .modalSheet))
+        },
+        deleteIncludePeer: { peerId in
             updateState { state in
                 var state = state
-                if let index = state.additionallyIncludePeers.index(of: peerId) {
+                if let index = state.additionallyIncludePeers.firstIndex(of: peerId) {
                     state.additionallyIncludePeers.remove(at: index)
                 }
                 return state
             }
         },
-        setPeerIdWithRevealedOptions: { peerId, fromPeerId in
+        deleteExcludePeer: { peerId in
             updateState { state in
                 var state = state
-                if (peerId == nil && fromPeerId == state.revealedPeerId) || (peerId != nil && fromPeerId == nil) {
-                    state.revealedPeerId = peerId
+                if let index = state.additionallyExcludePeers.firstIndex(of: peerId) {
+                    state.additionallyExcludePeers.remove(at: index)
                 }
                 return state
             }
+        },
+        setItemIdWithRevealedOptions: { itemId, fromItemId in
+            updateState { state in
+                var state = state
+                if (itemId == nil && fromItemId == state.revealedItemId) || (itemId != nil && fromItemId == nil) {
+                    state.revealedItemId = itemId
+                }
+                return state
+            }
+        },
+        deleteIncludeCategory: { category in
+            updateState { state in
+                var state = state
+                state.includeCategories.remove(category.category)
+                return state
+            }
+        },
+        deleteExcludeCategory: { category in
+            updateState { state in
+                var state = state
+                switch category {
+                case .muted:
+                    state.excludeMuted = false
+                case .read:
+                    state.excludeRead = false
+                case .archived:
+                    state.excludeArchived = false
+                }
+                return state
+            }
+        },
+        focusOnName: {
+            focusOnNameImpl?()
         }
     )
     
-    let statePeers = statePromise.get()
-    |> map { state -> [PeerId] in
-        return state.additionallyIncludePeers
-    }
-    |> distinctUntilChanged
-    |> mapToSignal { peerIds -> Signal<[RenderedPeer], NoError> in
-        return context.account.postbox.transaction { transaction -> [RenderedPeer] in
-            var result: [RenderedPeer] = []
-            for peerId in peerIds {
-                if let peer = transaction.getPeer(peerId) {
-                    result.append(RenderedPeer(peer: peer))
-                }
+    let currentPeers = Atomic<[PeerId: RenderedPeer]>(value: [:])
+    let stateWithPeers = statePromise.get()
+    |> mapToSignal { state -> Signal<(ChatListFilterPresetControllerState, [RenderedPeer], [RenderedPeer]), NoError> in
+        let currentPeersValue = currentPeers.with { $0 }
+        var included: [RenderedPeer] = []
+        var excluded: [RenderedPeer] = []
+        var missingPeers = false
+        for peerId in state.additionallyIncludePeers {
+            if let peer = currentPeersValue[peerId] {
+                included.append(peer)
+            } else {
+                missingPeers = true
             }
-            return result
         }
+        for peerId in state.additionallyExcludePeers {
+            if let peer = currentPeersValue[peerId] {
+                excluded.append(peer)
+            } else {
+                missingPeers = true
+            }
+        }
+        if missingPeers {
+            return context.account.postbox.transaction { transaction -> (ChatListFilterPresetControllerState, [RenderedPeer], [RenderedPeer]) in
+                var included: [RenderedPeer] = []
+                var excluded: [RenderedPeer] = []
+                var allPeers: [PeerId: RenderedPeer] = [:]
+                for peerId in state.additionallyIncludePeers {
+                    if let peer = transaction.getPeer(peerId) {
+                        let renderedPeer = RenderedPeer(peer: peer)
+                        included.append(renderedPeer)
+                        allPeers[renderedPeer.peerId] = renderedPeer
+                    }
+                }
+                for peerId in state.additionallyExcludePeers {
+                    if let peer = transaction.getPeer(peerId) {
+                        let renderedPeer = RenderedPeer(peer: peer)
+                        excluded.append(renderedPeer)
+                        allPeers[renderedPeer.peerId] = renderedPeer
+                    }
+                }
+                let _ = currentPeers.swap(allPeers)
+                return (state, included, excluded)
+            }
+        } else {
+            return .single((state, included, excluded))
+        }
+    }
+    
+    var attemptNavigationImpl: (() -> Bool)?
+    var applyImpl: (() -> Void)? = {
+        let state = stateValue.with { $0 }
+        let preset = ChatListFilter(id: currentPreset?.id ?? -1, title: state.name, data: ChatListFilterData(categories: state.includeCategories, excludeMuted: state.excludeMuted, excludeRead: state.excludeRead, excludeArchived: state.excludeArchived, includePeers: state.additionallyIncludePeers, excludePeers: state.additionallyExcludePeers))
+        let _ = (updateChatListFiltersInteractively(postbox: context.account.postbox, { filters in
+            var preset = preset
+            if currentPreset == nil {
+                preset.id = max(2, filters.map({ $0.id + 1 }).max() ?? 2)
+            }
+            var filters = filters
+            if let _ = currentPreset {
+                var found = false
+                for i in 0 ..< filters.count {
+                    if filters[i].id == preset.id {
+                        filters[i] = preset
+                        found = true
+                    }
+                }
+                if !found {
+                    filters = filters.filter { listFilter in
+                        if listFilter.title == preset.title && listFilter.data == preset.data {
+                            return false
+                        }
+                        return true
+                    }
+                    filters.append(preset)
+                }
+            } else {
+                filters.append(preset)
+            }
+            return filters
+        })
+        |> deliverOnMainQueue).start(next: { filters in
+            updated(filters)
+            dismissImpl?()
+        })
     }
     
     let signal = combineLatest(queue: .mainQueue(),
         context.sharedContext.presentationData,
-        statePromise.get(),
-        statePeers
+        stateWithPeers
     )
     |> deliverOnMainQueue
-    |> map { presentationData, state, statePeers -> (ItemListControllerState, (ItemListNodeState, Any)) in
+    |> map { presentationData, stateWithPeers -> (ItemListControllerState, (ItemListNodeState, Any)) in
+        let (state, includePeers, excludePeers) = stateWithPeers
+        
         let leftNavigationButton = ItemListNavigationButton(content: .text(presentationData.strings.Common_Cancel), style: .regular, enabled: true, action: {
-            dismissImpl?()
+            if attemptNavigationImpl?() ?? true {
+                dismissImpl?()
+            }
         })
         let rightNavigationButton = ItemListNavigationButton(content: .text(currentPreset == nil ? presentationData.strings.Common_Create : presentationData.strings.Common_Done), style: .bold, enabled: state.isComplete, action: {
-            let state = stateValue.with { $0 }
-            let preset = ChatListFilter(id: currentPreset?.id ?? -1, title: state.name, categories: state.includeCategories, excludeMuted: state.excludeMuted, excludeRead: state.excludeRead, includePeers: state.additionallyIncludePeers)
-            let _ = (updateChatListFilterSettingsInteractively(postbox: context.account.postbox, { settings in
-                var preset = preset
-                if currentPreset == nil {
-                    preset.id = max(2, settings.filters.map({ $0.id + 1 }).max() ?? 2)
-                }
-                var settings = settings
-                if let currentPreset = currentPreset {
-                    var found = false
-                    for i in 0 ..< settings.filters.count {
-                        if settings.filters[i].id == preset.id {
-                            settings.filters[i] = preset
-                            found = true
-                        }
-                    }
-                    if !found {
-                        settings.filters.append(preset)
-                    }
-                } else {
-                    settings.filters.append(preset)
-                }
-                return settings
-            })
-            |> deliverOnMainQueue).start(next: { settings in
-                updated(settings.filters)
-                dismissImpl?()
-            })
+            applyImpl?()
         })
         
-        let controllerState = ItemListControllerState(presentationData: ItemListPresentationData(presentationData), title: .text(currentPreset != nil ? "Filter" : "Create Filter"), leftNavigationButton: leftNavigationButton, rightNavigationButton: rightNavigationButton, backNavigationButton: ItemListBackButton(title: presentationData.strings.Common_Back), animateChanges: false)
-        let listState = ItemListNodeState(presentationData: ItemListPresentationData(presentationData), entries: chatListFilterPresetControllerEntries(presentationData: presentationData, state: state, peers: statePeers), style: .blocks, emptyStateItem: nil, animateChanges: true)
+        let controllerState = ItemListControllerState(presentationData: ItemListPresentationData(presentationData), title: .text(currentPreset != nil ? "Edit Folder" : "Create Folder"), leftNavigationButton: leftNavigationButton, rightNavigationButton: rightNavigationButton, backNavigationButton: ItemListBackButton(title: presentationData.strings.Common_Back), animateChanges: false)
+        let listState = ItemListNodeState(presentationData: ItemListPresentationData(presentationData), entries: chatListFilterPresetControllerEntries(presentationData: presentationData, isNewFilter: currentPreset == nil, state: state, includePeers: includePeers, excludePeers: excludePeers), style: .blocks, emptyStateItem: nil, animateChanges: !skipStateAnimation)
+        skipStateAnimation = false
         
         return (controllerState, (listState, arguments))
     }
@@ -455,6 +986,45 @@ func chatListFilterPresetController(context: AccountContext, currentPreset: Chat
     dismissImpl = { [weak controller] in
         let _ = controller?.dismiss()
     }
+    focusOnNameImpl = { [weak controller] in
+        guard let controller = controller else {
+            return
+        }
+        controller.forEachItemNode { itemNode in
+            if let itemNode = itemNode as? ItemListSingleLineInputItemNode {
+                itemNode.focus()
+            }
+        }
+    }
+    controller.attemptNavigation = { _ in
+        return attemptNavigationImpl?() ?? true
+    }
+    let displaySaveAlert: () -> Void = {
+        let presentationData = context.sharedContext.currentPresentationData.with { $0 }
+        presentControllerImpl?(textAlertController(context: context, title: nil, text: "You have changed the filter. Apply changes?", actions: [
+            TextAlertAction(type: .genericAction, title: "Discard", action: {
+                dismissImpl?()
+            }),
+            TextAlertAction(type: .defaultAction, title: "Apply", action: {
+            applyImpl?()
+        })]), nil)
+    }
+    attemptNavigationImpl = {
+        let state = stateValue.with { $0 }
+        if let currentPreset = currentPreset {
+            let filter = ChatListFilter(id: currentPreset.id, title: state.name, data: ChatListFilterData(categories: state.includeCategories, excludeMuted: state.excludeMuted, excludeRead: state.excludeRead, excludeArchived: state.excludeArchived, includePeers: state.additionallyIncludePeers, excludePeers: state.additionallyExcludePeers))
+            if currentPreset != filter {
+                displaySaveAlert()
+                return false
+            }
+        } else {
+            if state.isComplete {
+                displaySaveAlert()
+                return false
+            }
+        }
+        return true
+    }
     
     return controller
 }
diff --git a/submodules/ChatListUI/Sources/ChatListFilterPresetListController.swift b/submodules/ChatListUI/Sources/ChatListFilterPresetListController.swift
index 53b5d67994..398b2eb674 100644
--- a/submodules/ChatListUI/Sources/ChatListFilterPresetListController.swift
+++ b/submodules/ChatListUI/Sources/ChatListFilterPresetListController.swift
@@ -14,13 +14,15 @@ import ItemListPeerActionItem
 private final class ChatListFilterPresetListControllerArguments {
     let context: AccountContext
     
+    let addSuggestedPresed: (String, ChatListFilterData) -> Void
     let openPreset: (ChatListFilter) -> Void
     let addNew: () -> Void
     let setItemWithRevealedOptions: (Int32?, Int32?) -> Void
     let removePreset: (Int32) -> Void
     
-    init(context: AccountContext, openPreset: @escaping (ChatListFilter) -> Void, addNew: @escaping () -> Void, setItemWithRevealedOptions: @escaping (Int32?, Int32?) -> Void, removePreset: @escaping (Int32) -> Void) {
+    init(context: AccountContext, addSuggestedPresed: @escaping (String, ChatListFilterData) -> Void, openPreset: @escaping (ChatListFilter) -> Void, addNew: @escaping () -> Void, setItemWithRevealedOptions: @escaping (Int32?, Int32?) -> Void, removePreset: @escaping (Int32) -> Void) {
         self.context = context
+        self.addSuggestedPresed = addSuggestedPresed
         self.openPreset = openPreset
         self.addNew = addNew
         self.setItemWithRevealedOptions = setItemWithRevealedOptions
@@ -29,6 +31,8 @@ private final class ChatListFilterPresetListControllerArguments {
 }
 
 private enum ChatListFilterPresetListSection: Int32 {
+    case screenHeader
+    case suggested
     case list
 }
 
@@ -45,20 +49,40 @@ private func stringForUserCount(_ peers: [PeerId: SelectivePrivacyPeer], strings
 }
 
 private enum ChatListFilterPresetListEntryStableId: Hashable {
+    case screenHeader
+    case suggestedListHeader
+    case suggestedPreset(ChatListFilterData)
+    case suggestedAddCustom
     case listHeader
     case preset(Int32)
     case addItem
     case listFooter
 }
 
+private struct PresetIndex: Equatable {
+    let value: Int
+    
+    static func ==(lhs: PresetIndex, rhs: PresetIndex) -> Bool {
+        return true
+    }
+}
+
 private enum ChatListFilterPresetListEntry: ItemListNodeEntry {
+    case screenHeader(String)
+    case suggestedListHeader(String)
+    case suggestedPreset(index: PresetIndex, title: String, label: String, preset: ChatListFilterData)
+    case suggestedAddCustom(String)
     case listHeader(String)
-    case preset(index: Int, title: String?, preset: ChatListFilter, canBeReordered: Bool, canBeDeleted: Bool, isEditing: Bool)
+    case preset(index: PresetIndex, title: String, label: String, preset: ChatListFilter, canBeReordered: Bool, canBeDeleted: Bool, isEditing: Bool)
     case addItem(text: String, isEditing: Bool)
     case listFooter(String)
     
     var section: ItemListSectionId {
         switch self {
+        case .screenHeader:
+            return ChatListFilterPresetListSection.screenHeader.rawValue
+        case .suggestedListHeader, .suggestedPreset, .suggestedAddCustom:
+            return ChatListFilterPresetListSection.suggested.rawValue
         case .listHeader, .preset, .addItem, .listFooter:
             return ChatListFilterPresetListSection.list.rawValue
         }
@@ -66,19 +90,35 @@ private enum ChatListFilterPresetListEntry: ItemListNodeEntry {
     
     var sortId: Int {
         switch self {
+        case .screenHeader:
+            return 0
         case .listHeader:
-            return 2
+            return 100
         case let .preset(preset):
-            return 3 + preset.index
+            return 101 + preset.index.value
         case .addItem:
             return 1000
         case .listFooter:
             return 1001
+        case .suggestedListHeader:
+            return 1002
+        case let .suggestedPreset(suggestedPreset):
+            return 1003 + suggestedPreset.index.value
+        case .suggestedAddCustom:
+            return 2000
         }
     }
     
     var stableId: ChatListFilterPresetListEntryStableId {
         switch self {
+        case .screenHeader:
+            return .screenHeader
+        case .suggestedListHeader:
+            return .suggestedListHeader
+        case let .suggestedPreset(suggestedPreset):
+            return .suggestedPreset(suggestedPreset.preset)
+        case .suggestedAddCustom:
+            return .suggestedAddCustom
         case .listHeader:
             return .listHeader
         case let .preset(preset):
@@ -97,10 +137,22 @@ private enum ChatListFilterPresetListEntry: ItemListNodeEntry {
     func item(presentationData: ItemListPresentationData, arguments: Any) -> ListViewItem {
         let arguments = arguments as! ChatListFilterPresetListControllerArguments
         switch self {
+        case let .screenHeader(text):
+            return ChatListFilterSettingsHeaderItem(theme: presentationData.theme, text: text, animation: .folders, sectionId: self.section)
+        case let .suggestedListHeader(text):
+            return ItemListSectionHeaderItem(presentationData: presentationData, text: text, multiline: true, sectionId: self.section)
+        case let .suggestedPreset(_, title, label, preset):
+            return ChatListFilterPresetListSuggestedItem(presentationData: presentationData, title: title, label: label, sectionId: self.section, style: .blocks, installAction: {
+                arguments.addSuggestedPresed(title, preset)
+            }, tag: nil)
+        case let .suggestedAddCustom(text):
+            return ItemListPeerActionItem(presentationData: presentationData, icon: nil, title: text, sectionId: self.section, height: .generic, editing: false, action: {
+                arguments.addNew()
+            })
         case let .listHeader(text):
             return ItemListSectionHeaderItem(presentationData: presentationData, text: text, multiline: true, sectionId: self.section)
-        case let .preset(index, title, preset, canBeReordered, canBeDeleted, isEditing):
-            return ChatListFilterPresetListItem(presentationData: presentationData, preset: preset, title: title ?? "", editing: ChatListFilterPresetListItemEditing(editable: true, editing: isEditing, revealed: false), canBeReordered: canBeReordered, canBeDeleted: canBeDeleted, sectionId: self.section, action: {
+        case let .preset(_, title, label, preset, canBeReordered, canBeDeleted, isEditing):
+            return ChatListFilterPresetListItem(presentationData: presentationData, preset: preset, title: title, label: label, editing: ChatListFilterPresetListItemEditing(editable: true, editing: isEditing, revealed: false), canBeReordered: canBeReordered, canBeDeleted: canBeDeleted, sectionId: self.section, action: {
                 arguments.openPreset(preset)
             }, setItemWithRevealedOptions: { lhs, rhs in
                 arguments.setItemWithRevealedOptions(lhs, rhs)
@@ -122,22 +174,68 @@ private struct ChatListFilterPresetListControllerState: Equatable {
     var revealedPreset: Int32? = nil
 }
 
-private func chatListFilterPresetListControllerEntries(presentationData: PresentationData, state: ChatListFilterPresetListControllerState, filtersState: ChatListFiltersState, settings: ChatListFilterSettings) -> [ChatListFilterPresetListEntry] {
+private func filtersWithAppliedOrder(filters: [(ChatListFilter, Int)], order: [Int32]?) -> [(ChatListFilter, Int)] {
+    let sortedFilters: [(ChatListFilter, Int)]
+    if let updatedFilterOrder = order {
+        var updatedFilters: [(ChatListFilter, Int)] = []
+        for id in updatedFilterOrder {
+            if let index = filters.firstIndex(where: { $0.0.id == id }) {
+                updatedFilters.append(filters[index])
+            }
+        }
+        sortedFilters = updatedFilters
+    } else {
+        sortedFilters = filters
+    }
+    return sortedFilters
+}
+
+private func chatListFilterPresetListControllerEntries(presentationData: PresentationData, state: ChatListFilterPresetListControllerState, filters: [(ChatListFilter, Int)], updatedFilterOrder: [Int32]?, suggestedFilters: [ChatListFeaturedFilter], settings: ChatListFilterSettings) -> [ChatListFilterPresetListEntry] {
     var entries: [ChatListFilterPresetListEntry] = []
 
-    entries.append(.listHeader("FILTERS"))
-    for preset in filtersState.filters {
-        entries.append(.preset(index: entries.count, title: preset.title, preset: preset, canBeReordered: filtersState.filters.count > 1, canBeDeleted: true, isEditing: state.isEditing))
+    
+    entries.append(.screenHeader("Create folders for different groups of chats and\nquickly switch between them."))
+    
+    let filteredSuggestedFilters = suggestedFilters.filter { suggestedFilter in
+        for (filter, _) in filters {
+            if filter.data == suggestedFilter.data {
+                return false
+            }
+        }
+        return true
     }
-    if filtersState.filters.count < 10 {
-        entries.append(.addItem(text: "Create New Filter", isEditing: state.isEditing))
+    
+    if !filters.isEmpty || suggestedFilters.isEmpty {
+        entries.append(.listHeader("FOLDERS"))
+        
+        for (filter, chatCount) in filtersWithAppliedOrder(filters: filters, order: updatedFilterOrder) {
+            entries.append(.preset(index: PresetIndex(value: entries.count), title: filter.title, label: chatCount == 0 ? "" : "\(chatCount)", preset: filter, canBeReordered: filters.count > 1, canBeDeleted: true, isEditing: state.isEditing))
+        }
+        if filters.count < 10 {
+            entries.append(.addItem(text: "Create New Folder", isEditing: state.isEditing))
+        }
+        entries.append(.listFooter("Tap \"Edit\" to change the order or delete folders."))
+    }
+    
+    if !filteredSuggestedFilters.isEmpty && filters.count < 10 {
+        entries.append(.suggestedListHeader("RECOMMENDED FOLDERS"))
+        for filter in filteredSuggestedFilters {
+            entries.append(.suggestedPreset(index: PresetIndex(value: entries.count), title: filter.title, label: filter.description, preset: filter.data))
+        }
+        if filters.isEmpty {
+            entries.append(.suggestedAddCustom("Add Custom Folder"))
+        }
     }
-    entries.append(.listFooter("Tap \"Edit\" to change the order or delete filters."))
     
     return entries
 }
 
-func chatListFilterPresetListController(context: AccountContext, updated: @escaping ([ChatListFilter]) -> Void) -> ViewController {
+public enum ChatListFilterPresetListControllerMode {
+    case `default`
+    case modal
+}
+
+public func chatListFilterPresetListController(context: AccountContext, mode: ChatListFilterPresetListControllerMode, dismissed: (() -> Void)? = nil) -> ViewController {
     let initialState = ChatListFilterPresetListControllerState()
     let statePromise = ValuePromise(initialState, ignoreRepeated: true)
     let stateValue = Atomic(value: initialState)
@@ -147,12 +245,21 @@ func chatListFilterPresetListController(context: AccountContext, updated: @escap
     
     var dismissImpl: (() -> Void)?
     var pushControllerImpl: ((ViewController) -> Void)?
-    var presentControllerImpl: ((ViewController, Any?) -> Void)?
     
-    let arguments = ChatListFilterPresetListControllerArguments(context: context, openPreset: { preset in
-        pushControllerImpl?(chatListFilterPresetController(context: context, currentPreset: preset, updated: updated))
+    let arguments = ChatListFilterPresetListControllerArguments(context: context,
+    addSuggestedPresed: { title, data in
+        let _ = (updateChatListFiltersInteractively(postbox: context.account.postbox, { filters in
+            var filters = filters
+            let id = generateNewChatListFilterId(filters: filters)
+            filters.insert(ChatListFilter(id: id, title: title, data: data), at: 0)
+            return filters
+        })
+        |> deliverOnMainQueue).start(next: { _ in
+        })
+    }, openPreset: { preset in
+        pushControllerImpl?(chatListFilterPresetController(context: context, currentPreset: preset, updated: { _ in }))
     }, addNew: {
-        pushControllerImpl?(chatListFilterPresetController(context: context, currentPreset: nil, updated: updated))
+        pushControllerImpl?(chatListFilterPresetController(context: context, currentPreset: nil, updated: { _ in }))
     }, setItemWithRevealedOptions: { preset, fromPreset in
         updateState { state in
             var state = state
@@ -162,42 +269,126 @@ func chatListFilterPresetListController(context: AccountContext, updated: @escap
             return state
         }
     }, removePreset: { id in
-        let _ = (updateChatListFilterSettingsInteractively(postbox: context.account.postbox, { settings in
-            var settings = settings
-            if let index = settings.filters.index(where: { $0.id == id }) {
-                settings.filters.remove(at: index)
+        let _ = (updateChatListFiltersInteractively(postbox: context.account.postbox, { filters in
+            var filters = filters
+            if let index = filters.firstIndex(where: { $0.id == id }) {
+                filters.remove(at: index)
             }
-            return settings
+            return filters
         })
-        |> deliverOnMainQueue).start(next: { settings in
-            updated(settings.filters)
+        |> deliverOnMainQueue).start(next: { _ in
         })
     })
     
-    let preferences = context.account.postbox.preferencesView(keys: [PreferencesKeys.chatListFilters, ApplicationSpecificPreferencesKeys.chatListFilterSettings])
+    let chatCountCache = Atomic<[ChatListFilterData: Int]>(value: [:])
+    
+    let filtersWithCountsSignal = updatedChatListFilters(postbox: context.account.postbox)
+    |> distinctUntilChanged
+    |> mapToSignal { filters -> Signal<[(ChatListFilter, Int)], NoError> in
+        return .single(filters.map { filter -> (ChatListFilter, Int) in
+            return (filter, 0)
+        })
+        /*return context.account.postbox.transaction { transaction -> [(ChatListFilter, Int)] in
+            return filters.map { filter -> (ChatListFilter, Int) in
+                let count: Int
+                if let cachedValue = chatCountCache.with({ dict -> Int? in
+                    return dict[filter.data]
+                }) {
+                    count = cachedValue
+                } else {
+                    count = transaction.getChatCountMatchingPredicate(chatListFilterPredicate(filter: filter.data))
+                    let _ = chatCountCache.modify { dict in
+                        var dict = dict
+                        dict[filter.data] = count
+                        return dict
+                    }
+                }
+                return (filter, count)
+            }
+        }*/
+    }
+    
+    let featuredFilters = context.account.postbox.preferencesView(keys: [PreferencesKeys.chatListFiltersFeaturedState])
+    |> map { preferences -> [ChatListFeaturedFilter] in
+        guard let state = preferences.values[PreferencesKeys.chatListFiltersFeaturedState] as? ChatListFiltersFeaturedState else {
+            return []
+        }
+        return state.filters
+    }
+    |> distinctUntilChanged
+    
+    let filtersWithCounts = Promise<[(ChatListFilter, Int)]>()
+    filtersWithCounts.set(filtersWithCountsSignal)
+    
+    let updatedFilterOrder = Promise<[Int32]?>(nil)
+    
+    let preferences = context.account.postbox.preferencesView(keys: [ApplicationSpecificPreferencesKeys.chatListFilterSettings])
     
     let signal = combineLatest(queue: .mainQueue(),
         context.sharedContext.presentationData,
         statePromise.get(),
-        preferences
+        filtersWithCounts.get(),
+        preferences,
+        updatedFilterOrder.get(),
+        featuredFilters
     )
-    |> map { presentationData, state, preferences -> (ItemListControllerState, (ItemListNodeState, Any)) in
-        let filtersState = preferences.values[PreferencesKeys.chatListFilters] as? ChatListFiltersState ?? ChatListFiltersState.default
+    |> map { presentationData, state, filtersWithCountsValue, preferences, updatedFilterOrderValue, suggestedFilters -> (ItemListControllerState, (ItemListNodeState, Any)) in
         let filterSettings = preferences.values[ApplicationSpecificPreferencesKeys.chatListFilterSettings] as? ChatListFilterSettings ?? ChatListFilterSettings.default
-        let leftNavigationButton = ItemListNavigationButton(content: .text(presentationData.strings.Common_Close), style: .regular, enabled: true, action: {
-            let _ = replaceRemoteChatListFilters(account: context.account).start()
-            dismissImpl?()
-        })
-        let rightNavigationButton: ItemListNavigationButton
+        let leftNavigationButton: ItemListNavigationButton?
+        switch mode {
+        case .default:
+            leftNavigationButton = nil
+        case .modal:
+            leftNavigationButton = ItemListNavigationButton(content: .text(presentationData.strings.Common_Close), style: .regular, enabled: true, action: {
+                dismissImpl?()
+            })
+        }
+        let rightNavigationButton: ItemListNavigationButton?
         if state.isEditing {
-             rightNavigationButton = ItemListNavigationButton(content: .text(presentationData.strings.Common_Done), style: .bold, enabled: true, action: {
-                updateState { state in
-                    var state = state
-                    state.isEditing = false
-                    return state
-                }
-             })
-        } else {
+            rightNavigationButton = ItemListNavigationButton(content: .text(presentationData.strings.Common_Done), style: .bold, enabled: true, action: {
+                let _ = (updatedFilterOrder.get()
+                |> take(1)
+                |> deliverOnMainQueue).start(next: { [weak updatedFilterOrder] updatedFilterOrderValue in
+                    if let updatedFilterOrderValue = updatedFilterOrderValue {
+                        let _ = (updateChatListFiltersInteractively(postbox: context.account.postbox, { filters in
+                            var updatedFilters: [ChatListFilter] = []
+                            for id in updatedFilterOrderValue {
+                                if let index = filters.firstIndex(where: { $0.id == id }) {
+                                    updatedFilters.append(filters[index])
+                                }
+                            }
+                            for filter in filters {
+                                if !updatedFilters.contains(where: { $0.id == filter.id }) {
+                                    updatedFilters.append(filter)
+                                }
+                            }
+                            
+                            return updatedFilters
+                        })
+                        |> deliverOnMainQueue).start(next: { _ in
+                            filtersWithCounts.set(filtersWithCountsSignal)
+                            let _ = (filtersWithCounts.get()
+                            |> take(1)
+                            |> deliverOnMainQueue).start(next: { _ in
+                                updatedFilterOrder?.set(.single(nil))
+                                
+                                updateState { state in
+                                    var state = state
+                                    state.isEditing = false
+                                    return state
+                                }
+                            })
+                        })
+                    } else {
+                        updateState { state in
+                            var state = state
+                            state.isEditing = false
+                            return state
+                        }
+                    }
+                })
+            })
+        } else if !filtersWithCountsValue.isEmpty {
             rightNavigationButton = ItemListNavigationButton(content: .text(presentationData.strings.Common_Edit), style: .regular, enabled: true, action: {
                 updateState { state in
                     var state = state
@@ -205,10 +396,12 @@ func chatListFilterPresetListController(context: AccountContext, updated: @escap
                     return state
                 }
             })
+        } else {
+            rightNavigationButton = nil
         }
         
-        let controllerState = ItemListControllerState(presentationData: ItemListPresentationData(presentationData), title: .text("Filters"), leftNavigationButton: leftNavigationButton, rightNavigationButton: rightNavigationButton, backNavigationButton: ItemListBackButton(title: presentationData.strings.Common_Back), animateChanges: false)
-        let listState = ItemListNodeState(presentationData: ItemListPresentationData(presentationData), entries: chatListFilterPresetListControllerEntries(presentationData: presentationData, state: state, filtersState: filtersState, settings: filterSettings), style: .blocks, animateChanges: true)
+        let controllerState = ItemListControllerState(presentationData: ItemListPresentationData(presentationData), title: .text("Folders"), leftNavigationButton: leftNavigationButton, rightNavigationButton: rightNavigationButton, backNavigationButton: ItemListBackButton(title: presentationData.strings.Common_Back), animateChanges: false)
+        let listState = ItemListNodeState(presentationData: ItemListPresentationData(presentationData), entries: chatListFilterPresetListControllerEntries(presentationData: presentationData, state: state, filters: filtersWithCountsValue, updatedFilterOrder: updatedFilterOrderValue, suggestedFilters: suggestedFilters, settings: filterSettings), style: .blocks, animateChanges: true)
         
         return (controllerState, (listState, arguments))
     }
@@ -216,13 +409,18 @@ func chatListFilterPresetListController(context: AccountContext, updated: @escap
     }
     
     let controller = ItemListController(context: context, state: signal)
-    controller.navigationPresentation = .modal
+    switch mode {
+    case .default:
+        controller.navigationPresentation = .default
+    case .modal:
+        controller.navigationPresentation = .modal
+    }
+    controller.didDisappear = { _ in
+        dismissed?()
+    }
     pushControllerImpl = { [weak controller] c in
         controller?.push(c)
     }
-    presentControllerImpl = { [weak controller] c, a in
-        controller?.present(c, in: .window(.root), with: a)
-    }
     dismissImpl = { [weak controller] in
         controller?.dismiss()
     }
@@ -249,39 +447,48 @@ func chatListFilterPresetListController(context: AccountContext, updated: @escap
             afterAll = true
         }
 
-        return updateChatListFilterSettingsInteractively(postbox: context.account.postbox, { filtersState in
-            var filtersState = filtersState
-            if let index = filtersState.filters.firstIndex(where: { $0.id == fromFilter.preset.id }) {
-                filtersState.filters.remove(at: index)
+        return combineLatest(
+            updatedFilterOrder.get() |> take(1),
+            filtersWithCounts.get() |> take(1)
+        )
+        |> mapToSignal { updatedFilterOrderValue, filtersWithCountsValue -> Signal<Bool, NoError> in
+            var filters = filtersWithAppliedOrder(filters: filtersWithCountsValue, order: updatedFilterOrderValue).map { $0.0 }
+            let initialOrder = filters.map { $0.id }
+            
+            if let index = filters.firstIndex(where: { $0.id == fromFilter.preset.id }) {
+                filters.remove(at: index)
             }
             if let referenceFilter = referenceFilter {
                 var inserted = false
-                for i in 0 ..< filtersState.filters.count {
-                    if filtersState.filters[i].id == referenceFilter.id {
+                for i in 0 ..< filters.count {
+                    if filters[i].id == referenceFilter.id {
                         if fromIndex < toIndex {
-                            filtersState.filters.insert(fromFilter.preset, at: i + 1)
+                            filters.insert(fromFilter.preset, at: i + 1)
                         } else {
-                            filtersState.filters.insert(fromFilter.preset, at: i)
+                            filters.insert(fromFilter.preset, at: i)
                         }
                         inserted = true
                         break
                     }
                 }
                 if !inserted {
-                    filtersState.filters.append(fromFilter.preset)
+                    filters.append(fromFilter.preset)
                 }
             } else if beforeAll {
-                filtersState.filters.insert(fromFilter.preset, at: 0)
+                filters.insert(fromFilter.preset, at: 0)
             } else if afterAll {
-                filtersState.filters.append(fromFilter.preset)
+                filters.append(fromFilter.preset)
+            }
+            
+            let updatedOrder = filters.map { $0.id }
+            if initialOrder != updatedOrder {
+                updatedFilterOrder.set(.single(updatedOrder))
+                return .single(true)
+            } else {
+                return .single(false)
             }
-            return filtersState
-        })
-        |> map { _ -> Bool in
-            return false
         }
     })
     
     return controller
 }
-
diff --git a/submodules/ChatListUI/Sources/ChatListFilterPresetListItem.swift b/submodules/ChatListUI/Sources/ChatListFilterPresetListItem.swift
index be38d24b1d..77855286cc 100644
--- a/submodules/ChatListUI/Sources/ChatListFilterPresetListItem.swift
+++ b/submodules/ChatListUI/Sources/ChatListFilterPresetListItem.swift
@@ -20,6 +20,7 @@ final class ChatListFilterPresetListItem: ListViewItem, ItemListItem {
     let presentationData: ItemListPresentationData
     let preset: ChatListFilter
     let title: String
+    let label: String
     let editing: ChatListFilterPresetListItemEditing
     let canBeReordered: Bool
     let canBeDeleted: Bool
@@ -32,6 +33,7 @@ final class ChatListFilterPresetListItem: ListViewItem, ItemListItem {
         presentationData: ItemListPresentationData,
         preset: ChatListFilter,
         title: String,
+        label: String,
         editing: ChatListFilterPresetListItemEditing,
         canBeReordered: Bool,
         canBeDeleted: Bool,
@@ -43,6 +45,7 @@ final class ChatListFilterPresetListItem: ListViewItem, ItemListItem {
         self.presentationData = presentationData
         self.preset = preset
         self.title = title
+        self.label = label
         self.editing = editing
         self.canBeReordered = canBeReordered
         self.canBeDeleted = canBeDeleted
@@ -108,6 +111,8 @@ private final class ChatListFilterPresetListItemNode: ItemListRevealOptionsItemN
     private let maskNode: ASImageNode
     
     private let titleNode: TextNode
+    private let labelNode: TextNode
+    private let arrowNode: ASImageNode
     
     private let activateArea: AccessibilityAreaNode
     
@@ -141,6 +146,14 @@ private final class ChatListFilterPresetListItemNode: ItemListRevealOptionsItemN
         self.titleNode.contentMode = .left
         self.titleNode.contentsScale = UIScreen.main.scale
         
+        self.labelNode = TextNode()
+        self.labelNode.isUserInteractionEnabled = false
+        
+        self.arrowNode = ASImageNode()
+        self.arrowNode.displayWithoutProcessing = true
+        self.arrowNode.displaysAsynchronously = false
+        self.arrowNode.isLayerBacked = true
+        
         self.activateArea = AccessibilityAreaNode()
         
         self.highlightedBackgroundNode = ASDisplayNode()
@@ -149,6 +162,8 @@ private final class ChatListFilterPresetListItemNode: ItemListRevealOptionsItemN
         super.init(layerBacked: false, dynamicBounce: false, rotated: false, seeThrough: false)
         
         self.addSubnode(self.titleNode)
+        self.addSubnode(self.labelNode)
+        self.addSubnode(self.arrowNode)
         self.addSubnode(self.activateArea)
         
         self.activateArea.activate = { [weak self] in
@@ -159,6 +174,7 @@ private final class ChatListFilterPresetListItemNode: ItemListRevealOptionsItemN
     
     func asyncLayout() -> (_ item: ChatListFilterPresetListItem, _ params: ListViewItemLayoutParams, _ neighbors: ItemListNeighbors) -> (ListViewItemNodeLayout, (Bool) -> Void) {
         let makeTitleLayout = TextNode.asyncLayout(self.titleNode)
+        let makeLabelLayout = TextNode.asyncLayout(self.labelNode)
         let editableControlLayout = ItemListEditableControlNode.asyncLayout(self.editableControlNode)
         let reorderControlLayout = ItemListEditableReorderControlNode.asyncLayout(self.reorderControlNode)
         
@@ -166,9 +182,11 @@ private final class ChatListFilterPresetListItemNode: ItemListRevealOptionsItemN
         
         return { item, params, neighbors in
             var updatedTheme: PresentationTheme?
+            var updateArrowImage: UIImage?
             
             if currentItem?.presentationData.theme !== item.presentationData.theme {
                 updatedTheme = item.presentationData.theme
+                updateArrowImage = PresentationResourcesItemList.disclosureArrowImage(item.presentationData.theme)
             }
             
             let peerRevealOptions: [ItemListRevealOption]
@@ -187,21 +205,27 @@ private final class ChatListFilterPresetListItemNode: ItemListRevealOptionsItemN
             var editingOffset: CGFloat = 0.0
             var reorderInset: CGFloat = 0.0
             
-            if item.editing.editing && item.canBeReordered {
+            if item.editing.editing {
                 let sizeAndApply = editableControlLayout(item.presentationData.theme, false)
                 editableControlSizeAndApply = sizeAndApply
                 editingOffset = sizeAndApply.0
                 
-                let reorderSizeAndApply = reorderControlLayout(item.presentationData.theme)
-                reorderControlSizeAndApply = reorderSizeAndApply
-                reorderInset = reorderSizeAndApply.0
+                if item.canBeReordered {
+                    let reorderSizeAndApply = reorderControlLayout(item.presentationData.theme)
+                    reorderControlSizeAndApply = reorderSizeAndApply
+                    reorderInset = reorderSizeAndApply.0
+                }
             }
             
             let leftInset: CGFloat = 16.0 + params.leftInset
             let rightInset: CGFloat = params.rightInset + max(reorderInset, 55.0)
+            let rightArrowInset: CGFloat = 34.0 + params.rightInset
             
             let (titleLayout, titleApply) = makeTitleLayout(TextNodeLayoutArguments(attributedString: titleAttributedString, backgroundColor: nil, maximumNumberOfLines: 1, truncationType: .middle, constrainedSize: CGSize(width: params.width - leftInset - 12.0 - editingOffset - rightInset, height: CGFloat.greatestFiniteMagnitude), alignment: .natural, cutout: nil, insets: UIEdgeInsets()))
             
+            let labelConstrain: CGFloat = params.width - params.rightInset - leftInset - 40.0 - titleLayout.size.width - 10.0
+            let (labelLayout, labelApply) = makeLabelLayout(TextNodeLayoutArguments(attributedString: NSAttributedString(string: item.label, font: titleFont, textColor: item.presentationData.theme.list.itemSecondaryTextColor), backgroundColor: nil, maximumNumberOfLines: 1, truncationType: .end, constrainedSize: CGSize(width: labelConstrain, height: CGFloat.greatestFiniteMagnitude), alignment: .natural, cutout: nil, insets: UIEdgeInsets()))
+            
             let insets = itemListNeighborsGroupedInsets(neighbors)
             let contentSize = CGSize(width: params.width, height: titleLayout.size.height + 11.0 * 2.0)
             let separatorHeight = UIScreenPixel
@@ -280,6 +304,7 @@ private final class ChatListFilterPresetListItemNode: ItemListRevealOptionsItemN
                     }
                     
                     let _ = titleApply()
+                    let _ = labelApply()
                     
                     if strongSelf.backgroundNode.supernode == nil {
                         strongSelf.insertSubnode(strongSelf.backgroundNode, at: 0)
@@ -326,6 +351,20 @@ private final class ChatListFilterPresetListItemNode: ItemListRevealOptionsItemN
                     
                     transition.updateFrame(node: strongSelf.titleNode, frame: CGRect(origin: CGPoint(x: leftInset + revealOffset + editingOffset, y: 11.0), size: titleLayout.size))
                     
+                    let labelFrame = CGRect(origin: CGPoint(x: params.width - rightArrowInset - labelLayout.size.width + revealOffset, y: 11.0), size: labelLayout.size)
+                    strongSelf.labelNode.frame = labelFrame
+                    
+                    transition.updateAlpha(node: strongSelf.labelNode, alpha: reorderControlSizeAndApply != nil ? 0.0 : 1.0)
+                    transition.updateAlpha(node: strongSelf.arrowNode, alpha: reorderControlSizeAndApply != nil ? 0.0 : 1.0)
+                    
+                    if let updateArrowImage = updateArrowImage {
+                        strongSelf.arrowNode.image = updateArrowImage
+                    }
+                    
+                    if let arrowImage = strongSelf.arrowNode.image {
+                        strongSelf.arrowNode.frame = CGRect(origin: CGPoint(x: params.width - params.rightInset - 7.0 - arrowImage.size.width + revealOffset, y: floorToScreenPixels((layout.contentSize.height - arrowImage.size.height) / 2.0)), size: arrowImage.size)
+                    }
+                    
                     strongSelf.activateArea.frame = CGRect(origin: CGPoint(x: leftInset + revealOffset + editingOffset, y: 0.0), size: CGSize(width: params.width - params.rightInset - 56.0 - (leftInset + revealOffset + editingOffset), height: layout.contentSize.height))
                     
                     strongSelf.highlightedBackgroundNode.frame = CGRect(origin: CGPoint(x: 0.0, y: -UIScreenPixel), size: CGSize(width: params.width, height: layout.contentSize.height + UIScreenPixel + UIScreenPixel))
@@ -393,6 +432,7 @@ private final class ChatListFilterPresetListItemNode: ItemListRevealOptionsItemN
         }
         
         let leftInset: CGFloat = 16.0 + params.leftInset
+        let rightArrowInset: CGFloat = 34.0 + params.rightInset
         
         let editingOffset: CGFloat
         if let editableControlNode = self.editableControlNode {
@@ -405,6 +445,14 @@ private final class ChatListFilterPresetListItemNode: ItemListRevealOptionsItemN
         }
         
         transition.updateFrame(node: self.titleNode, frame: CGRect(origin: CGPoint(x: leftInset + offset + editingOffset, y: self.titleNode.frame.minY), size: self.titleNode.bounds.size))
+        
+        var labelFrame = self.labelNode.frame
+        labelFrame.origin.x = params.width - rightArrowInset - labelFrame.width + revealOffset
+        transition.updateFrame(node: self.labelNode, frame: labelFrame)
+        
+        var arrowFrame = self.arrowNode.frame
+        arrowFrame.origin.x = params.width - params.rightInset - 7.0 - arrowFrame.width + revealOffset
+        transition.updateFrame(node: self.arrowNode, frame: arrowFrame)
     }
     
     override func revealOptionsInteractivelyOpened() {
diff --git a/submodules/ChatListUI/Sources/ChatListFilterPresetListSuggestedItem.swift b/submodules/ChatListUI/Sources/ChatListFilterPresetListSuggestedItem.swift
new file mode 100644
index 0000000000..225d95d2b1
--- /dev/null
+++ b/submodules/ChatListUI/Sources/ChatListFilterPresetListSuggestedItem.swift
@@ -0,0 +1,381 @@
+import Foundation
+import UIKit
+import Display
+import AsyncDisplayKit
+import SwiftSignalKit
+import TelegramPresentationData
+import ItemListUI
+
+public class ChatListFilterPresetListSuggestedItem: ListViewItem, ItemListItem {
+    let presentationData: ItemListPresentationData
+    let title: String
+    let label: String
+    public let sectionId: ItemListSectionId
+    let style: ItemListStyle
+    let installAction: (() -> Void)?
+    public let tag: ItemListItemTag?
+    
+    public init(
+        presentationData: ItemListPresentationData,
+        title: String,
+        label: String,
+        sectionId: ItemListSectionId,
+        style: ItemListStyle,
+        installAction: (() -> Void)?,
+        tag: ItemListItemTag? = nil
+    ) {
+        self.presentationData = presentationData
+        self.title = title
+        self.label = label
+        self.sectionId = sectionId
+        self.style = style
+        self.installAction = installAction
+        self.tag = tag
+    }
+    
+    public func nodeConfiguredForParams(async: @escaping (@escaping () -> Void) -> Void, params: ListViewItemLayoutParams, synchronousLoads: Bool, previousItem: ListViewItem?, nextItem: ListViewItem?, completion: @escaping (ListViewItemNode, @escaping () -> (Signal<Void, NoError>?, (ListViewItemApply) -> Void)) -> Void) {
+        async {
+            let node = ChatListFilterPresetListSuggestedItemNode()
+            let (layout, apply) = node.asyncLayout()(self, params, itemListNeighbors(item: self, topItem: previousItem as? ItemListItem, bottomItem: nextItem as? ItemListItem))
+            
+            node.contentSize = layout.contentSize
+            node.insets = layout.insets
+            
+            Queue.mainQueue().async {
+                completion(node, {
+                    return (nil, { _ in apply() })
+                })
+            }
+        }
+    }
+    
+    public func updateNode(async: @escaping (@escaping () -> Void) -> Void, node: @escaping () -> ListViewItemNode, params: ListViewItemLayoutParams, previousItem: ListViewItem?, nextItem: ListViewItem?, animation: ListViewItemUpdateAnimation, completion: @escaping (ListViewItemNodeLayout, @escaping (ListViewItemApply) -> Void) -> Void) {
+        Queue.mainQueue().async {
+            if let nodeValue = node() as? ChatListFilterPresetListSuggestedItemNode {
+                let makeLayout = nodeValue.asyncLayout()
+                
+                async {
+                    let (layout, apply) = makeLayout(self, params, itemListNeighbors(item: self, topItem: previousItem as? ItemListItem, bottomItem: nextItem as? ItemListItem))
+                    Queue.mainQueue().async {
+                        completion(layout, { _ in
+                            apply()
+                        })
+                    }
+                }
+            }
+        }
+    }
+    
+    public var selectable: Bool = false
+    
+    public func selected(listView: ListView){
+    }
+}
+
+public class ChatListFilterPresetListSuggestedItemNode: ListViewItemNode, ItemListItemNode {
+    private let backgroundNode: ASDisplayNode
+    private let topStripeNode: ASDisplayNode
+    private let bottomStripeNode: ASDisplayNode
+    private let highlightedBackgroundNode: ASDisplayNode
+    private let maskNode: ASImageNode
+    
+    private let titleNode: TextNode
+    private let labelNode: TextNode
+    private let buttonBackgroundNode: ASImageNode
+    private let buttonTitleNode: TextNode
+    private let buttonNode: HighlightTrackingButtonNode
+    
+    private let activateArea: AccessibilityAreaNode
+    
+    private var item: ChatListFilterPresetListSuggestedItem?
+    
+    override public var canBeSelected: Bool {
+        return false
+    }
+    
+    public var tag: ItemListItemTag? {
+        return self.item?.tag
+    }
+    
+    public init() {
+        self.backgroundNode = ASDisplayNode()
+        self.backgroundNode.isLayerBacked = true
+        self.backgroundNode.backgroundColor = .white
+        
+        self.maskNode = ASImageNode()
+        
+        self.topStripeNode = ASDisplayNode()
+        self.topStripeNode.isLayerBacked = true
+        
+        self.bottomStripeNode = ASDisplayNode()
+        self.bottomStripeNode.isLayerBacked = true
+        
+        self.titleNode = TextNode()
+        self.titleNode.isUserInteractionEnabled = false
+        
+        self.labelNode = TextNode()
+        self.labelNode.isUserInteractionEnabled = false
+        
+        self.buttonBackgroundNode = ASImageNode()
+        self.buttonBackgroundNode.isUserInteractionEnabled = false
+        
+        self.buttonTitleNode = TextNode()
+        self.buttonTitleNode.isUserInteractionEnabled = false
+        
+        self.highlightedBackgroundNode = ASDisplayNode()
+        self.highlightedBackgroundNode.isLayerBacked = true
+        
+        self.buttonNode = HighlightTrackingButtonNode()
+        
+        self.activateArea = AccessibilityAreaNode()
+        
+        super.init(layerBacked: false, dynamicBounce: false)
+        
+        self.addSubnode(self.titleNode)
+        self.addSubnode(self.labelNode)
+        
+        self.addSubnode(self.buttonBackgroundNode)
+        self.addSubnode(self.buttonTitleNode)
+        self.addSubnode(self.buttonNode)
+        
+        self.addSubnode(self.activateArea)
+        
+        self.buttonNode.addTarget(self, action: #selector(self.buttonPressed), forControlEvents: .touchUpInside)
+        self.buttonNode.highligthedChanged = { [weak self] highlighted in
+            if let strongSelf = self {
+                if highlighted {
+                    strongSelf.buttonBackgroundNode.layer.removeAnimation(forKey: "opacity")
+                    strongSelf.buttonBackgroundNode.alpha = 0.7
+                } else {
+                    strongSelf.buttonBackgroundNode.alpha = 1.0
+                    strongSelf.buttonBackgroundNode.layer.animateAlpha(from: 0.7, to: 1.0, duration: 0.3)
+                }
+            }
+        }
+    }
+    
+    @objc private func buttonPressed() {
+        self.item?.installAction?()
+    }
+    
+    public func asyncLayout() -> (_ item: ChatListFilterPresetListSuggestedItem, _ params: ListViewItemLayoutParams, _ insets: ItemListNeighbors) -> (ListViewItemNodeLayout, () -> Void) {
+        let makeTitleLayout = TextNode.asyncLayout(self.titleNode)
+        let makeLabelLayout = TextNode.asyncLayout(self.labelNode)
+        let makeButtonTitleLayout = TextNode.asyncLayout(self.buttonTitleNode)
+        
+        let currentItem = self.item
+        
+        return { item, params, neighbors in
+            let rightInset: CGFloat
+            rightInset = 16.0 + params.rightInset
+            
+            var updatedTheme: PresentationTheme?
+            var updatedButtonImage: UIImage?
+            let buttonDiameter: CGFloat = 28.0
+            if currentItem?.presentationData.theme !== item.presentationData.theme {
+                updatedTheme = item.presentationData.theme
+                updatedButtonImage = generateStretchableFilledCircleImage(diameter: buttonDiameter, color: item.presentationData.theme.list.itemCheckColors.fillColor)
+            }
+            
+            let contentSize: CGSize
+            let insets: UIEdgeInsets
+            let separatorHeight = UIScreenPixel
+            let itemBackgroundColor: UIColor
+            let itemSeparatorColor: UIColor
+            
+            let leftInset = 16.0 + params.leftInset
+            
+            let titleColor: UIColor
+            titleColor = item.presentationData.theme.list.itemPrimaryTextColor
+            
+            let titleFont = Font.regular(item.presentationData.fontSize.itemListBaseFontSize)
+            
+            let (buttonTitleLayout, buttonTitleApply) = makeButtonTitleLayout(TextNodeLayoutArguments(attributedString: NSAttributedString(string: item.presentationData.strings.Stickers_Install, font: Font.semibold(14.0), textColor: item.presentationData.theme.list.itemCheckColors.foregroundColor), backgroundColor: nil, maximumNumberOfLines: 1, truncationType: .end, constrainedSize: CGSize(width: params.width - params.rightInset - 20.0 - leftInset - rightInset, height: CGFloat.greatestFiniteMagnitude), alignment: .natural, cutout: nil, insets: UIEdgeInsets()))
+            
+            let additionalTextRightInset: CGFloat = buttonTitleLayout.size.width + 16.0
+            
+            let (titleLayout, titleApply) = makeTitleLayout(TextNodeLayoutArguments(attributedString: NSAttributedString(string: item.title, font: titleFont, textColor: titleColor), backgroundColor: nil, maximumNumberOfLines: 1, truncationType: .end, constrainedSize: CGSize(width: params.width - params.rightInset - 20.0 - leftInset - rightInset - additionalTextRightInset, height: CGFloat.greatestFiniteMagnitude), alignment: .natural, cutout: nil, insets: UIEdgeInsets()))
+            
+            let detailFont = Font.regular(floor(item.presentationData.fontSize.itemListBaseFontSize * 13.0 / 17.0))
+            
+            let labelFont: UIFont
+            let labelBadgeColor: UIColor
+            var labelConstrain: CGFloat = params.width - params.rightInset - leftInset - 40.0 - titleLayout.size.width - 10.0
+            
+            labelBadgeColor = item.presentationData.theme.list.itemSecondaryTextColor
+            labelFont = detailFont
+            labelConstrain = params.width - params.rightInset - 40.0 - leftInset
+            
+            let multilineLabel = false
+            
+            let (labelLayout, labelApply) = makeLabelLayout(TextNodeLayoutArguments(attributedString: NSAttributedString(string: item.label, font: labelFont, textColor:labelBadgeColor), backgroundColor: nil, maximumNumberOfLines: multilineLabel ? 0 : 1, truncationType: .end, constrainedSize: CGSize(width: labelConstrain, height: CGFloat.greatestFiniteMagnitude), alignment: .natural, cutout: nil, insets: UIEdgeInsets()))
+            
+            let verticalInset: CGFloat = 11.0
+            let titleSpacing: CGFloat = 3.0
+            
+            let height: CGFloat
+            height = verticalInset * 2.0 + titleLayout.size.height + titleSpacing + labelLayout.size.height
+            
+            switch item.style {
+            case .plain:
+                itemBackgroundColor = item.presentationData.theme.list.plainBackgroundColor
+                itemSeparatorColor = item.presentationData.theme.list.itemPlainSeparatorColor
+                contentSize = CGSize(width: params.width, height: height)
+                insets = itemListNeighborsPlainInsets(neighbors)
+            case .blocks:
+                itemBackgroundColor = item.presentationData.theme.list.itemBlocksBackgroundColor
+                itemSeparatorColor = item.presentationData.theme.list.itemBlocksSeparatorColor
+                contentSize = CGSize(width: params.width, height: height)
+                insets = itemListNeighborsGroupedInsets(neighbors)
+            }
+            
+            let layout = ListViewItemNodeLayout(contentSize: contentSize, insets: insets)
+            
+            return (ListViewItemNodeLayout(contentSize: contentSize, insets: insets), { [weak self] in
+                if let strongSelf = self {
+                    strongSelf.item = item
+                    
+                    strongSelf.activateArea.frame = CGRect(origin: CGPoint(x: params.leftInset, y: 0.0), size: CGSize(width: params.width - params.leftInset - params.rightInset, height: layout.contentSize.height))
+                    strongSelf.activateArea.accessibilityLabel = item.title
+                    strongSelf.activateArea.accessibilityValue = item.label
+                    strongSelf.activateArea.accessibilityTraits = []
+                    
+                    if let _ = updatedTheme {
+                        strongSelf.topStripeNode.backgroundColor = itemSeparatorColor
+                        strongSelf.bottomStripeNode.backgroundColor = itemSeparatorColor
+                        strongSelf.backgroundNode.backgroundColor = itemBackgroundColor
+                        strongSelf.highlightedBackgroundNode.backgroundColor = item.presentationData.theme.list.itemHighlightedBackgroundColor
+                    }
+                    
+                    let _ = titleApply()
+                    let _ = labelApply()
+                    let _ = buttonTitleApply()
+                    
+                    switch item.style {
+                    case .plain:
+                        if strongSelf.backgroundNode.supernode != nil {
+                            strongSelf.backgroundNode.removeFromSupernode()
+                        }
+                        if strongSelf.topStripeNode.supernode != nil {
+                            strongSelf.topStripeNode.removeFromSupernode()
+                        }
+                        if strongSelf.bottomStripeNode.supernode == nil {
+                            strongSelf.insertSubnode(strongSelf.bottomStripeNode, at: 0)
+                        }
+                        if strongSelf.maskNode.supernode != nil {
+                            strongSelf.maskNode.removeFromSupernode()
+                        }
+                        strongSelf.bottomStripeNode.frame = CGRect(origin: CGPoint(x: leftInset, y: contentSize.height - separatorHeight), size: CGSize(width: params.width - leftInset, height: separatorHeight))
+                    case .blocks:
+                        if strongSelf.backgroundNode.supernode == nil {
+                            strongSelf.insertSubnode(strongSelf.backgroundNode, at: 0)
+                        }
+                        if strongSelf.topStripeNode.supernode == nil {
+                            strongSelf.insertSubnode(strongSelf.topStripeNode, at: 1)
+                        }
+                        if strongSelf.bottomStripeNode.supernode == nil {
+                            strongSelf.insertSubnode(strongSelf.bottomStripeNode, at: 2)
+                        }
+                        if strongSelf.maskNode.supernode == nil {
+                            strongSelf.insertSubnode(strongSelf.maskNode, at: 3)
+                        }
+                        
+                        let hasCorners = itemListHasRoundedBlockLayout(params)
+                        var hasTopCorners = false
+                        var hasBottomCorners = false
+                        switch neighbors.top {
+                            case .sameSection(false):
+                                strongSelf.topStripeNode.isHidden = true
+                            default:
+                                hasTopCorners = true
+                                strongSelf.topStripeNode.isHidden = hasCorners
+                        }
+                        let bottomStripeInset: CGFloat
+                        switch neighbors.bottom {
+                            case .sameSection(false):
+                                bottomStripeInset = leftInset
+                            default:
+                                bottomStripeInset = 0.0
+                                hasBottomCorners = true
+                                strongSelf.bottomStripeNode.isHidden = hasCorners
+                        }
+                        
+                        strongSelf.maskNode.image = hasCorners ? PresentationResourcesItemList.cornersImage(item.presentationData.theme, top: hasTopCorners, bottom: hasBottomCorners) : nil
+                        
+                        strongSelf.backgroundNode.frame = CGRect(origin: CGPoint(x: 0.0, y: -min(insets.top, separatorHeight)), size: CGSize(width: params.width, height: contentSize.height + min(insets.top, separatorHeight) + min(insets.bottom, separatorHeight)))
+                        strongSelf.maskNode.frame = strongSelf.backgroundNode.frame.insetBy(dx: params.leftInset, dy: 0.0)
+                        strongSelf.topStripeNode.frame = CGRect(origin: CGPoint(x: 0.0, y: -min(insets.top, separatorHeight)), size: CGSize(width: params.width, height: separatorHeight))
+                        strongSelf.bottomStripeNode.frame = CGRect(origin: CGPoint(x: bottomStripeInset, y: contentSize.height - separatorHeight), size: CGSize(width: params.width - bottomStripeInset, height: separatorHeight))
+                    }
+                    
+                    let titleFrame = CGRect(origin: CGPoint(x: leftInset, y: 11.0), size: titleLayout.size)
+                    strongSelf.titleNode.frame = titleFrame
+                    
+                    let labelFrame = CGRect(origin: CGPoint(x: leftInset, y: titleFrame.maxY + titleSpacing), size: labelLayout.size)
+                    strongSelf.labelNode.frame = labelFrame
+                    
+                    let buttonSize = CGSize(width: buttonTitleLayout.size.width + 14.0 * 2.0, height: buttonDiameter)
+                    let buttonFrame = CGRect(origin: CGPoint(x: params.width - rightInset - buttonSize.width, y: floor((layout.contentSize.height - buttonSize.height) / 2.0)), size: buttonSize)
+                    strongSelf.buttonNode.frame = buttonFrame
+                    if let updatedButtonImage = updatedButtonImage {
+                        strongSelf.buttonBackgroundNode.image = updatedButtonImage
+                    }
+                    strongSelf.buttonBackgroundNode.frame = buttonFrame
+                    strongSelf.buttonTitleNode.frame = CGRect(origin: CGPoint(x: buttonFrame.minX + floor((buttonFrame.width - buttonTitleLayout.size.width) / 2.0), y: buttonFrame.minY + 1.0 + floor((buttonFrame.height - buttonTitleLayout.size.height) / 2.0)), size: buttonTitleLayout.size)
+                    
+                    strongSelf.highlightedBackgroundNode.frame = CGRect(origin: CGPoint(x: 0.0, y: -UIScreenPixel), size: CGSize(width: params.width, height: height + UIScreenPixel))
+                }
+            })
+        }
+    }
+    
+    override public func setHighlighted(_ highlighted: Bool, at point: CGPoint, animated: Bool) {
+        super.setHighlighted(highlighted, at: point, animated: animated)
+        
+        if highlighted && false {
+            self.highlightedBackgroundNode.alpha = 1.0
+            if self.highlightedBackgroundNode.supernode == nil {
+                var anchorNode: ASDisplayNode?
+                if self.bottomStripeNode.supernode != nil {
+                    anchorNode = self.bottomStripeNode
+                } else if self.topStripeNode.supernode != nil {
+                    anchorNode = self.topStripeNode
+                } else if self.backgroundNode.supernode != nil {
+                    anchorNode = self.backgroundNode
+                }
+                if let anchorNode = anchorNode {
+                    self.insertSubnode(self.highlightedBackgroundNode, aboveSubnode: anchorNode)
+                } else {
+                    self.addSubnode(self.highlightedBackgroundNode)
+                }
+            }
+        } else {
+            if self.highlightedBackgroundNode.supernode != nil {
+                if animated {
+                    self.highlightedBackgroundNode.layer.animateAlpha(from: self.highlightedBackgroundNode.alpha, to: 0.0, duration: 0.4, completion: { [weak self] completed in
+                        if let strongSelf = self {
+                            if completed {
+                                strongSelf.highlightedBackgroundNode.removeFromSupernode()
+                            }
+                        }
+                        })
+                    self.highlightedBackgroundNode.alpha = 0.0
+                } else {
+                    self.highlightedBackgroundNode.removeFromSupernode()
+                }
+            }
+        }
+    }
+    
+    override public func animateInsertion(_ currentTimestamp: Double, duration: Double, short: Bool) {
+        self.layer.animateAlpha(from: 0.0, to: 1.0, duration: 0.4)
+    }
+    
+    override public func animateAdded(_ currentTimestamp: Double, duration: Double) {
+        self.layer.animateAlpha(from: 0.0, to: 1.0, duration: 0.2)
+    }
+    
+    override public func animateRemoved(_ currentTimestamp: Double, duration: Double) {
+        self.layer.animateAlpha(from: 1.0, to: 0.0, duration: 0.15, removeOnCompletion: false)
+    }
+}
diff --git a/submodules/ChatListUI/Sources/ChatListFilterSettingsHeaderItem.swift b/submodules/ChatListUI/Sources/ChatListFilterSettingsHeaderItem.swift
new file mode 100644
index 0000000000..006a39ce43
--- /dev/null
+++ b/submodules/ChatListUI/Sources/ChatListFilterSettingsHeaderItem.swift
@@ -0,0 +1,153 @@
+import Foundation
+import UIKit
+import Display
+import AsyncDisplayKit
+import SwiftSignalKit
+import TelegramPresentationData
+import ItemListUI
+import PresentationDataUtils
+import AnimatedStickerNode
+import AppBundle
+
+enum ChatListFilterSettingsHeaderAnimation {
+    case folders
+    case newFolder
+}
+
+class ChatListFilterSettingsHeaderItem: ListViewItem, ItemListItem {
+    let theme: PresentationTheme
+    let text: String
+    let animation: ChatListFilterSettingsHeaderAnimation
+    let sectionId: ItemListSectionId
+    
+    init(theme: PresentationTheme, text: String, animation: ChatListFilterSettingsHeaderAnimation, sectionId: ItemListSectionId) {
+        self.theme = theme
+        self.text = text
+        self.animation = animation
+        self.sectionId = sectionId
+    }
+    
+    func nodeConfiguredForParams(async: @escaping (@escaping () -> Void) -> Void, params: ListViewItemLayoutParams, synchronousLoads: Bool, previousItem: ListViewItem?, nextItem: ListViewItem?, completion: @escaping (ListViewItemNode, @escaping () -> (Signal<Void, NoError>?, (ListViewItemApply) -> Void)) -> Void) {
+        async {
+            let node = ChatListFilterSettingsHeaderItemNode()
+            let (layout, apply) = node.asyncLayout()(self, params, itemListNeighbors(item: self, topItem: previousItem as? ItemListItem, bottomItem: nextItem as? ItemListItem))
+            
+            node.contentSize = layout.contentSize
+            node.insets = layout.insets
+            
+            Queue.mainQueue().async {
+                completion(node, {
+                    return (nil, { _ in apply() })
+                })
+            }
+        }
+    }
+    
+    func updateNode(async: @escaping (@escaping () -> Void) -> Void, node: @escaping () -> ListViewItemNode, params: ListViewItemLayoutParams, previousItem: ListViewItem?, nextItem: ListViewItem?, animation: ListViewItemUpdateAnimation, completion: @escaping (ListViewItemNodeLayout, @escaping (ListViewItemApply) -> Void) -> Void) {
+        Queue.mainQueue().async {
+            guard let nodeValue = node() as? ChatListFilterSettingsHeaderItemNode else {
+                assertionFailure()
+                return
+            }
+            
+            let makeLayout = nodeValue.asyncLayout()
+            
+            async {
+                let (layout, apply) = makeLayout(self, params, itemListNeighbors(item: self, topItem: previousItem as? ItemListItem, bottomItem: nextItem as? ItemListItem))
+                Queue.mainQueue().async {
+                    completion(layout, { _ in
+                        apply()
+                    })
+                }
+            }
+        }
+    }
+}
+
+private let titleFont = Font.regular(13.0)
+
+class ChatListFilterSettingsHeaderItemNode: ListViewItemNode {
+    private let titleNode: TextNode
+    private var animationNode: AnimatedStickerNode
+    
+    private var item: ChatListFilterSettingsHeaderItem?
+    
+    init() {
+        self.titleNode = TextNode()
+        self.titleNode.isUserInteractionEnabled = false
+        self.titleNode.contentMode = .left
+        self.titleNode.contentsScale = UIScreen.main.scale
+        
+        self.animationNode = AnimatedStickerNode()
+        
+        super.init(layerBacked: false, dynamicBounce: false)
+        
+        self.addSubnode(self.titleNode)
+        self.addSubnode(self.animationNode)
+    }
+    
+    override func didLoad() {
+        super.didLoad()
+        
+        self.animationNode.view.addGestureRecognizer(UITapGestureRecognizer(target: self, action: #selector(self.animationTapGesture(_:))))
+    }
+    
+    @objc private func animationTapGesture(_ recognizer: UITapGestureRecognizer) {
+        if case .ended = recognizer.state {
+            self.animationNode.play()
+        }
+    }
+    
+    func asyncLayout() -> (_ item: ChatListFilterSettingsHeaderItem, _ params: ListViewItemLayoutParams, _ neighbors: ItemListNeighbors) -> (ListViewItemNodeLayout, () -> Void) {
+        let makeTitleLayout = TextNode.asyncLayout(self.titleNode)
+        
+        return { item, params, neighbors in
+            let leftInset: CGFloat = 32.0 + params.leftInset
+            let topInset: CGFloat = 92.0
+            
+            let attributedText = NSAttributedString(string: item.text, font: titleFont, textColor: item.theme.list.freeTextColor)
+            let (titleLayout, titleApply) = makeTitleLayout(TextNodeLayoutArguments(attributedString: attributedText, backgroundColor: nil, maximumNumberOfLines: 0, truncationType: .end, constrainedSize: CGSize(width: params.width - params.rightInset - leftInset * 2.0, height: CGFloat.greatestFiniteMagnitude), alignment: .center, cutout: nil, insets: UIEdgeInsets()))
+            
+            let contentSize = CGSize(width: params.width, height: topInset + titleLayout.size.height)
+            let insets = itemListNeighborsGroupedInsets(neighbors)
+            
+            let layout = ListViewItemNodeLayout(contentSize: contentSize, insets: insets)
+            
+            return (layout, { [weak self] in
+                if let strongSelf = self {
+                    if strongSelf.item == nil {
+                        let animationName: String
+                        switch item.animation {
+                        case .folders:
+                            animationName = "ChatListFolders"
+                        case .newFolder:
+                            animationName = "ChatListNewFolder"
+                        }
+                        if let path = getAppBundle().path(forResource: animationName, ofType: "tgs") {
+                            strongSelf.animationNode.setup(source: AnimatedStickerNodeLocalFileSource(path: path), width: 192, height: 192, playbackMode: .once, mode: .direct)
+                            strongSelf.animationNode.visibility = true
+                        }
+                    }
+                    
+                    strongSelf.item = item
+                    strongSelf.accessibilityLabel = attributedText.string
+                                        
+                    let iconSize = CGSize(width: 96.0, height: 96.0)
+                    strongSelf.animationNode.frame = CGRect(origin: CGPoint(x: floor((layout.size.width - iconSize.width) / 2.0), y: -10.0), size: iconSize)
+                    strongSelf.animationNode.updateLayout(size: iconSize)
+                    
+                    let _ = titleApply()
+                    strongSelf.titleNode.frame = CGRect(origin: CGPoint(x: floor((layout.size.width - titleLayout.size.width) / 2.0), y: topInset + 8.0), size: titleLayout.size)
+                }
+            })
+        }
+    }
+    
+    override func animateInsertion(_ currentTimestamp: Double, duration: Double, short: Bool) {
+        self.layer.animateAlpha(from: 0.0, to: 1.0, duration: 0.4)
+    }
+    
+    override func animateRemoved(_ currentTimestamp: Double, duration: Double) {
+        self.layer.animateAlpha(from: 1.0, to: 0.0, duration: 0.15, removeOnCompletion: false)
+    }
+}
diff --git a/submodules/ChatListUI/Sources/ChatListFilterTabContainerNode.swift b/submodules/ChatListUI/Sources/ChatListFilterTabContainerNode.swift
index 4d8a690927..87f91df2d3 100644
--- a/submodules/ChatListUI/Sources/ChatListFilterTabContainerNode.swift
+++ b/submodules/ChatListUI/Sources/ChatListFilterTabContainerNode.swift
@@ -7,36 +7,94 @@ import Postbox
 import TelegramCore
 import TelegramPresentationData
 
+private final class ItemNodeDeleteButtonNode: HighlightableButtonNode {
+    private let pressed: () -> Void
+    
+    private let contentImageNode: ASImageNode
+    
+    private var theme: PresentationTheme?
+    
+    init(pressed: @escaping () -> Void) {
+        self.pressed = pressed
+        
+        self.contentImageNode = ASImageNode()
+        
+        super.init()
+        
+        self.addSubnode(self.contentImageNode)
+        
+        self.addTarget(self, action: #selector(self.pressedEvent), forControlEvents: .touchUpInside)
+    }
+    
+    @objc private func pressedEvent() {
+        self.pressed()
+    }
+    
+    func update(theme: PresentationTheme) -> CGSize {
+        let size = CGSize(width: 18.0, height: 18.0)
+        if self.theme !== theme {
+            self.theme = theme
+            self.contentImageNode.image = generateImage(size, rotatedContext: { size, context in
+                context.clear(CGRect(origin: CGPoint(), size: size))
+                context.setFillColor(theme.rootController.navigationBar.clearButtonBackgroundColor.cgColor)
+                context.fillEllipse(in: CGRect(origin: CGPoint(), size: size))
+                context.setStrokeColor(theme.rootController.navigationBar.clearButtonForegroundColor.cgColor)
+                context.setLineWidth(1.5)
+                context.setLineCap(.round)
+                context.move(to: CGPoint(x: 6.38, y: 6.38))
+                context.addLine(to: CGPoint(x: 11.63, y: 11.63))
+                context.strokePath()
+                context.move(to: CGPoint(x: 6.38, y: 11.63))
+                context.addLine(to: CGPoint(x: 11.63, y: 6.38))
+                context.strokePath()
+            })
+        }
+        
+        self.contentImageNode.frame = CGRect(origin: CGPoint(), size: size)
+        
+        return size
+    }
+}
+
 private final class ItemNode: ASDisplayNode {
     private let pressed: () -> Void
+    private let requestedDeletion: () -> Void
     
     private let extractedContainerNode: ContextExtractedContentContainingNode
     private let containerNode: ContextControllerSourceNode
     
+    private let extractedBackgroundNode: ASImageNode
     private let titleNode: ImmediateTextNode
-    private let extractedTitleNode: ImmediateTextNode
+    private let shortTitleNode: ImmediateTextNode
     private let badgeContainerNode: ASDisplayNode
     private let badgeTextNode: ImmediateTextNode
     private let badgeBackgroundNode: ASImageNode
+    private var deleteButtonNode: ItemNodeDeleteButtonNode?
     private let buttonNode: HighlightTrackingButtonNode
     
     private var isSelected: Bool = false
     private(set) var unreadCount: Int = 0
     
+    private var isReordering: Bool = false
+    
     private var theme: PresentationTheme?
     
-    init(pressed: @escaping () -> Void, contextGesture: @escaping (ContextExtractedContentContainingNode, ContextGesture) -> Void) {
+    init(pressed: @escaping () -> Void, requestedDeletion: @escaping () -> Void, contextGesture: @escaping (ContextExtractedContentContainingNode, ContextGesture) -> Void) {
         self.pressed = pressed
+        self.requestedDeletion = requestedDeletion
         
         self.extractedContainerNode = ContextExtractedContentContainingNode()
         self.containerNode = ContextControllerSourceNode()
         
+        self.extractedBackgroundNode = ASImageNode()
+        self.extractedBackgroundNode.alpha = 0.0
+        
         self.titleNode = ImmediateTextNode()
         self.titleNode.displaysAsynchronously = false
         
-        self.extractedTitleNode = ImmediateTextNode()
-        self.extractedTitleNode.displaysAsynchronously = false
-        self.extractedTitleNode.alpha = 0.0
+        self.shortTitleNode = ImmediateTextNode()
+        self.shortTitleNode.displaysAsynchronously = false
+        self.shortTitleNode.alpha = 0.0
         
         self.badgeContainerNode = ASDisplayNode()
         
@@ -51,8 +109,9 @@ private final class ItemNode: ASDisplayNode {
         
         super.init()
         
+        self.extractedContainerNode.contentNode.addSubnode(self.extractedBackgroundNode)
         self.extractedContainerNode.contentNode.addSubnode(self.titleNode)
-        self.extractedContainerNode.contentNode.addSubnode(self.extractedTitleNode)
+        self.extractedContainerNode.contentNode.addSubnode(self.shortTitleNode)
         self.badgeContainerNode.addSubnode(self.badgeBackgroundNode)
         self.badgeContainerNode.addSubnode(self.badgeTextNode)
         self.extractedContainerNode.contentNode.addSubnode(self.badgeContainerNode)
@@ -75,8 +134,15 @@ private final class ItemNode: ASDisplayNode {
             guard let strongSelf = self else {
                 return
             }
-            transition.updateAlpha(node: strongSelf.titleNode, alpha: isExtracted ? 0.0 : 1.0)
-            transition.updateAlpha(node: strongSelf.extractedTitleNode, alpha: isExtracted ? 1.0 : 0.0)
+            
+            if isExtracted, let theme = strongSelf.theme {
+                strongSelf.extractedBackgroundNode.image = generateStretchableFilledCircleImage(diameter: 28.0, color: theme.contextMenu.backgroundColor)
+            }
+            transition.updateAlpha(node: strongSelf.extractedBackgroundNode, alpha: isExtracted ? 1.0 : 0.0, completion: { _ in
+                if !isExtracted {
+                    self?.extractedBackgroundNode.image = nil
+                }
+            })
         }
     }
     
@@ -84,30 +150,73 @@ private final class ItemNode: ASDisplayNode {
         self.pressed()
     }
     
-    func updateText(title: String, unreadCount: Int, isNoFilter: Bool, isSelected: Bool, presentationData: PresentationData) {
+    func updateText(title: String, shortTitle: String, unreadCount: Int, isNoFilter: Bool, isSelected: Bool, isEditing: Bool, isAllChats: Bool, isReordering: Bool, presentationData: PresentationData, transition: ContainedViewLayoutTransition) {
         if self.theme !== presentationData.theme {
             self.theme = presentationData.theme
             
             self.badgeBackgroundNode.image = generateStretchableFilledCircleImage(diameter: 18.0, color: presentationData.theme.list.itemCheckColors.fillColor)
         }
         
-        self.containerNode.isGestureEnabled = !isNoFilter
+        self.containerNode.isGestureEnabled = !isNoFilter && !isEditing && !isReordering
+        self.buttonNode.isUserInteractionEnabled = !isEditing && !isReordering
         
         self.isSelected = isSelected
         self.unreadCount = unreadCount
         
+        transition.updateAlpha(node: self.containerNode, alpha: isReordering && isAllChats ? 0.5 : 1.0)
+        
+        if isReordering && !isAllChats {
+            if self.deleteButtonNode == nil {
+                let deleteButtonNode = ItemNodeDeleteButtonNode(pressed: { [weak self] in
+                    self?.requestedDeletion()
+                })
+                self.extractedContainerNode.contentNode.addSubnode(deleteButtonNode)
+                self.deleteButtonNode = deleteButtonNode
+                if case .animated = transition {
+                    deleteButtonNode.layer.animateScale(from: 0.1, to: 1.0, duration: 0.25)
+                    deleteButtonNode.layer.animateAlpha(from: 0.0, to: 1.0, duration: 0.25)
+                }
+            }
+        } else if let deleteButtonNode = self.deleteButtonNode {
+            self.deleteButtonNode = nil
+            transition.updateTransformScale(node: deleteButtonNode, scale: 0.1)
+            transition.updateAlpha(node: deleteButtonNode, alpha: 0.0, completion: { [weak deleteButtonNode] _ in
+                deleteButtonNode?.removeFromSupernode()
+            })
+        }
+        
+        transition.updateAlpha(node: self.badgeContainerNode, alpha: (isReordering || unreadCount == 0) ? 0.0 : 1.0)
+        
         self.titleNode.attributedText = NSAttributedString(string: title, font: Font.medium(14.0), textColor: isSelected ? presentationData.theme.list.itemAccentColor : presentationData.theme.list.itemSecondaryTextColor)
-        self.extractedTitleNode.attributedText = NSAttributedString(string: title, font: Font.medium(14.0), textColor: presentationData.theme.contextMenu.extractedContentTintColor)
+        self.shortTitleNode.attributedText = NSAttributedString(string: shortTitle, font: Font.medium(14.0), textColor: isSelected ? presentationData.theme.list.itemAccentColor : presentationData.theme.list.itemSecondaryTextColor)
         if unreadCount != 0 {
             self.badgeTextNode.attributedText = NSAttributedString(string: "\(unreadCount)", font: Font.regular(14.0), textColor: presentationData.theme.list.itemCheckColors.foregroundColor)
         }
+        
+        if self.isReordering != isReordering {
+            self.isReordering = isReordering
+            if self.isReordering && !isAllChats {
+                self.startShaking()
+            } else {
+                self.layer.removeAnimation(forKey: "shaking_position")
+                self.layer.removeAnimation(forKey: "shaking_rotation")
+            }
+        }
     }
     
-    func updateLayout(height: CGFloat, transition: ContainedViewLayoutTransition) -> CGFloat {
-        let titleSize = self.titleNode.updateLayout(CGSize(width: 200.0, height: .greatestFiniteMagnitude))
-        let _ = self.extractedTitleNode.updateLayout(CGSize(width: 200.0, height: .greatestFiniteMagnitude))
+    func updateLayout(height: CGFloat, transition: ContainedViewLayoutTransition) -> (width: CGFloat, shortWidth: CGFloat) {
+        let titleSize = self.titleNode.updateLayout(CGSize(width: 160.0, height: .greatestFiniteMagnitude))
         self.titleNode.frame = CGRect(origin: CGPoint(x: 0.0, y: floor((height - titleSize.height) / 2.0)), size: titleSize)
-        self.extractedTitleNode.frame = CGRect(origin: CGPoint(x: 0.0, y: floor((height - titleSize.height) / 2.0)), size: titleSize)
+        
+        let shortTitleSize = self.shortTitleNode.updateLayout(CGSize(width: 160.0, height: .greatestFiniteMagnitude))
+        self.shortTitleNode.frame = CGRect(origin: CGPoint(x: 0.0, y: floor((height - shortTitleSize.height) / 2.0)), size: shortTitleSize)
+        
+        if let deleteButtonNode = self.deleteButtonNode {
+            if let theme = self.theme {
+                let deleteButtonSize = deleteButtonNode.update(theme: theme)
+                deleteButtonNode.frame = CGRect(origin: CGPoint(x: -deleteButtonSize.width, y: 5.0), size: deleteButtonSize)
+            }
+        }
         
         let badgeSize = self.badgeTextNode.updateLayout(CGSize(width: 200.0, height: .greatestFiniteMagnitude))
         let badgeInset: CGFloat = 4.0
@@ -116,21 +225,35 @@ private final class ItemNode: ASDisplayNode {
         self.badgeBackgroundNode.frame = CGRect(origin: CGPoint(), size: badgeBackgroundFrame.size)
         self.badgeTextNode.frame = CGRect(origin: CGPoint(x: floorToScreenPixels((badgeBackgroundFrame.width - badgeSize.width) / 2.0), y: floor((badgeBackgroundFrame.height - badgeSize.height) / 2.0)), size: badgeSize)
         
-        if self.unreadCount == 0 {
-            self.badgeContainerNode.alpha = 0.0
-            return titleSize.width
+        let width: CGFloat
+        if self.unreadCount == 0 || self.isReordering {
+            if !self.isReordering {
+                self.badgeContainerNode.alpha = 0.0
+            }
+            width = titleSize.width
         } else {
-            self.badgeContainerNode.alpha = 1.0
-            return badgeBackgroundFrame.maxX
+            if !self.isReordering {
+                self.badgeContainerNode.alpha = 1.0
+            }
+            width = badgeBackgroundFrame.maxX
         }
+        
+        let extractedBackgroundHeight: CGFloat = 36.0
+        let extractedBackgroundInset: CGFloat = 14.0
+        self.extractedBackgroundNode.frame = CGRect(origin: CGPoint(x: -extractedBackgroundInset, y: floor((height - extractedBackgroundHeight) / 2.0)), size: CGSize(width: width + extractedBackgroundInset * 2.0, height: extractedBackgroundHeight))
+        
+        return (width, shortTitleSize.width)
     }
     
-    func updateArea(size: CGSize, sideInset: CGFloat) {
+    func updateArea(size: CGSize, sideInset: CGFloat, useShortTitle: Bool, transition: ContainedViewLayoutTransition) {
+        transition.updateAlpha(node: self.titleNode, alpha: useShortTitle ? 0.0 : 1.0)
+        transition.updateAlpha(node: self.shortTitleNode, alpha: useShortTitle ? 1.0 : 0.0)
+        
         self.buttonNode.frame = CGRect(origin: CGPoint(x: -sideInset, y: 0.0), size: CGSize(width: size.width + sideInset * 2.0, height: size.height))
         
         self.extractedContainerNode.frame = CGRect(origin: CGPoint(), size: size)
         self.extractedContainerNode.contentNode.frame = CGRect(origin: CGPoint(), size: size)
-        self.extractedContainerNode.contentRect = CGRect(origin: CGPoint(), size: size)
+        self.extractedContainerNode.contentRect = CGRect(origin: CGPoint(x: self.extractedBackgroundNode.frame.minX, y: 0.0), size: CGSize(width:self.extractedBackgroundNode.frame.width, height: size.height))
         self.containerNode.frame = CGRect(origin: CGPoint(), size: size)
         
         self.hitTestSlop = UIEdgeInsets(top: 0.0, left: -sideInset, bottom: 0.0, right: -sideInset)
@@ -140,17 +263,75 @@ private final class ItemNode: ASDisplayNode {
     }
     
     func animateBadgeIn() {
-        let transition: ContainedViewLayoutTransition = .animated(duration: 0.4, curve: .spring)
-        self.badgeContainerNode.layer.animateAlpha(from: 0.0, to: 1.0, duration: 0.25)
-        ContainedViewLayoutTransition.immediate.updateSublayerTransformScale(node: self.badgeContainerNode, scale: 0.1)
-        transition.updateSublayerTransformScale(node: self.badgeContainerNode, scale: 1.0)
+        if !self.isReordering {
+            let transition: ContainedViewLayoutTransition = .animated(duration: 0.4, curve: .spring)
+            self.badgeContainerNode.layer.animateAlpha(from: 0.0, to: 1.0, duration: 0.25)
+            ContainedViewLayoutTransition.immediate.updateSublayerTransformScale(node: self.badgeContainerNode, scale: 0.1)
+            transition.updateSublayerTransformScale(node: self.badgeContainerNode, scale: 1.0)
+        }
     }
     
     func animateBadgeOut() {
-        let transition: ContainedViewLayoutTransition = .animated(duration: 0.4, curve: .spring)
-        self.badgeContainerNode.layer.animateAlpha(from: 1.0, to: 0.0, duration: 0.25)
-        ContainedViewLayoutTransition.immediate.updateSublayerTransformScale(node: self.badgeContainerNode, scale: 1.0)
-        transition.updateSublayerTransformScale(node: self.badgeContainerNode, scale: 0.1)
+        if !self.isReordering {
+            let transition: ContainedViewLayoutTransition = .animated(duration: 0.4, curve: .spring)
+            self.badgeContainerNode.layer.animateAlpha(from: 1.0, to: 0.0, duration: 0.25)
+            ContainedViewLayoutTransition.immediate.updateSublayerTransformScale(node: self.badgeContainerNode, scale: 1.0)
+            transition.updateSublayerTransformScale(node: self.badgeContainerNode, scale: 0.1)
+        }
+    }
+    
+    private func startShaking() {
+        func degreesToRadians(_ x: CGFloat) -> CGFloat {
+            return .pi * x / 180.0
+        }
+
+        let duration: Double = 0.4
+        let displacement: CGFloat = 1.0
+        let degreesRotation: CGFloat = 2.0
+        
+        let negativeDisplacement = -1.0 * displacement
+        let position = CAKeyframeAnimation.init(keyPath: "position")
+        position.beginTime = 0.8
+        position.duration = duration
+        position.values = [
+            NSValue(cgPoint: CGPoint(x: negativeDisplacement, y: negativeDisplacement)),
+            NSValue(cgPoint: CGPoint(x: 0, y: 0)),
+            NSValue(cgPoint: CGPoint(x: negativeDisplacement, y: 0)),
+            NSValue(cgPoint: CGPoint(x: 0, y: negativeDisplacement)),
+            NSValue(cgPoint: CGPoint(x: negativeDisplacement, y: negativeDisplacement))
+        ]
+        position.calculationMode = .linear
+        position.isRemovedOnCompletion = false
+        position.repeatCount = Float.greatestFiniteMagnitude
+        position.beginTime = CFTimeInterval(Float(arc4random()).truncatingRemainder(dividingBy: Float(25)) / Float(100))
+        position.isAdditive = true
+
+        let transform = CAKeyframeAnimation.init(keyPath: "transform")
+        transform.beginTime = 2.6
+        transform.duration = 0.3
+        transform.valueFunction = CAValueFunction(name: CAValueFunctionName.rotateZ)
+        transform.values = [
+            degreesToRadians(-1.0 * degreesRotation),
+            degreesToRadians(degreesRotation),
+            degreesToRadians(-1.0 * degreesRotation)
+        ]
+        transform.calculationMode = .linear
+        transform.isRemovedOnCompletion = false
+        transform.repeatCount = Float.greatestFiniteMagnitude
+        transform.isAdditive = true
+        transform.beginTime = CFTimeInterval(Float(arc4random()).truncatingRemainder(dividingBy: Float(25)) / Float(100))
+
+        self.layer.add(position, forKey: "shaking_position")
+        self.layer.add(transform, forKey: "shaking_rotation")
+    }
+    
+    override func hitTest(_ point: CGPoint, with event: UIEvent?) -> UIView? {
+        if let deleteButtonNode = self.deleteButtonNode {
+            if deleteButtonNode.frame.insetBy(dx: -4.0, dy: -4.0).contains(point) {
+                return deleteButtonNode.view
+            }
+        }
+        return super.hitTest(point, with: event)
     }
 }
 
@@ -180,39 +361,13 @@ enum ChatListFilterTabEntry: Equatable {
             return filter.text
         }
     }
-}
-
-private final class AddItemNode: HighlightableButtonNode {
-    private let iconNode: ASImageNode
     
-    var pressed: (() -> Void)?
-    
-    private var theme: PresentationTheme?
-    
-    override init() {
-        self.iconNode = ASImageNode()
-        self.iconNode.displaysAsynchronously = false
-        self.iconNode.displayWithoutProcessing = true
-        
-        super.init()
-        
-        self.addSubnode(self.iconNode)
-        
-        self.addTarget(self, action: #selector(self.onPressed), forControlEvents: .touchUpInside)
-    }
-    
-    @objc private func onPressed() {
-        self.pressed?()
-    }
-    
-    func update(size: CGSize, theme: PresentationTheme) {
-        if self.theme !== theme {
-            self.theme = theme
-            self.iconNode.image = PresentationResourcesItemList.plusIconImage(theme)
-        }
-        
-        if let image = self.iconNode.image {
-            self.iconNode.frame = CGRect(origin: CGPoint(x: floor((size.width - image.size.width) / 2.0), y: floor((size.height - image.size.height) / 2.0)), size: image.size)
+    func shortTitle(strings: PresentationStrings) -> String {
+        switch self {
+        case .all:
+            return "All"
+        case let .filter(filter):
+            return filter.text
         }
     }
 }
@@ -221,13 +376,33 @@ final class ChatListFilterTabContainerNode: ASDisplayNode {
     private let scrollNode: ASScrollNode
     private let selectedLineNode: ASImageNode
     private var itemNodes: [ChatListFilterTabEntryId: ItemNode] = [:]
-    private let addNode: AddItemNode
     
     var tabSelected: ((ChatListFilterTabEntryId) -> Void)?
+    var tabRequestedDeletion: ((ChatListFilterTabEntryId) -> Void)?
     var addFilter: (() -> Void)?
     var contextGesture: ((Int32, ContextExtractedContentContainingNode, ContextGesture) -> Void)?
     
-    private var currentParams: (size: CGSize, sideInset: CGFloat, filters: [ChatListFilterTabEntry], selectedFilter: ChatListFilterTabEntryId?, presentationData: PresentationData)?
+    private var reorderingGesture: ReorderingGestureRecognizer?
+    private var reorderingItem: ChatListFilterTabEntryId?
+    private var reorderingItemPosition: (initial: CGFloat, offset: CGFloat)?
+    private var reorderingAutoScrollAnimator: ConstantDisplayLinkAnimator?
+    private var reorderedItemIds: [ChatListFilterTabEntryId]?
+    private lazy var hapticFeedback = { HapticFeedback() }()
+    
+    private var currentParams: (size: CGSize, sideInset: CGFloat, filters: [ChatListFilterTabEntry], selectedFilter: ChatListFilterTabEntryId?, isReordering: Bool, isEditing: Bool, transitionFraction: CGFloat, presentationData: PresentationData)?
+    
+    var reorderedFilterIds: [Int32]? {
+        return self.reorderedItemIds.flatMap {
+            $0.compactMap {
+                switch $0 {
+                case .all:
+                    return nil
+                case let .filter(id):
+                    return id
+                }
+            }
+        }
+    }
     
     override init() {
         self.scrollNode = ASScrollNode()
@@ -236,8 +411,6 @@ final class ChatListFilterTabContainerNode: ASDisplayNode {
         self.selectedLineNode.displaysAsynchronously = false
         self.selectedLineNode.displayWithoutProcessing = true
         
-        self.addNode = AddItemNode()
-        
         super.init()
         
         self.scrollNode.view.showsHorizontalScrollIndicator = false
@@ -250,20 +423,136 @@ final class ChatListFilterTabContainerNode: ASDisplayNode {
         
         self.addSubnode(self.scrollNode)
         self.scrollNode.addSubnode(self.selectedLineNode)
-        self.scrollNode.addSubnode(self.addNode)
         
-        self.addNode.pressed = { [weak self] in
-            self?.addFilter?()
-        }
+        let reorderingGesture = ReorderingGestureRecognizer(shouldBegin: { [weak self] point in
+            guard let strongSelf = self else {
+                return false
+            }
+            for (id, itemNode) in strongSelf.itemNodes {
+                if itemNode.view.convert(itemNode.bounds, to: strongSelf.view).contains(point) {
+                    if case .all = id {
+                        return false
+                    }
+                    return true
+                }
+            }
+            return false
+        }, began: { [weak self] point in
+            guard let strongSelf = self, let _ = strongSelf.currentParams else {
+                return
+            }
+            for (id, itemNode) in strongSelf.itemNodes {
+                let itemFrame = itemNode.view.convert(itemNode.bounds, to: strongSelf.view)
+                if itemFrame.contains(point) {
+                    strongSelf.hapticFeedback.impact()
+                    
+                    strongSelf.reorderingItem = id
+                    itemNode.frame = itemFrame
+                    strongSelf.reorderingAutoScrollAnimator = ConstantDisplayLinkAnimator(update: {
+                        guard let strongSelf = self, let currentLocation = strongSelf.reorderingGesture?.currentLocation else {
+                            return
+                        }
+                        let edgeWidth: CGFloat = 20.0
+                        if currentLocation.x <= edgeWidth {
+                            var contentOffset = strongSelf.scrollNode.view.contentOffset
+                            contentOffset.x = max(0.0, contentOffset.x - 3.0)
+                            strongSelf.scrollNode.view.setContentOffset(contentOffset, animated: false)
+                        } else if currentLocation.x >= strongSelf.bounds.width - edgeWidth {
+                            var contentOffset = strongSelf.scrollNode.view.contentOffset
+                            contentOffset.x = max(0.0, min(strongSelf.scrollNode.view.contentSize.width - strongSelf.scrollNode.bounds.width, contentOffset.x + 3.0))
+                            strongSelf.scrollNode.view.setContentOffset(contentOffset, animated: false)
+                        }
+                    })
+                    strongSelf.reorderingAutoScrollAnimator?.isPaused = false
+                    strongSelf.addSubnode(itemNode)
+                    
+                    strongSelf.reorderingItemPosition = (itemNode.frame.minX, 0.0)
+                    if let (size, sideInset, filters, selectedFilter, isReordering, isEditing, transitionFraction, presentationData) = strongSelf.currentParams {
+                        strongSelf.update(size: size, sideInset: sideInset, filters: filters, selectedFilter: selectedFilter, isReordering: isReordering, isEditing: isEditing, transitionFraction: transitionFraction, presentationData: presentationData, transition: .animated(duration: 0.25, curve: .easeInOut))
+                    }
+                    return
+                }
+            }
+        }, ended: { [weak self] in
+            guard let strongSelf = self, let reorderingItem = strongSelf.reorderingItem else {
+                return
+            }
+            if let itemNode = strongSelf.itemNodes[reorderingItem] {
+                let projectedItemFrame = itemNode.view.convert(itemNode.bounds, to: strongSelf.scrollNode.view)
+                itemNode.frame = projectedItemFrame
+                strongSelf.scrollNode.addSubnode(itemNode)
+            }
+            
+            strongSelf.reorderingItem = nil
+            strongSelf.reorderingItemPosition = nil
+            strongSelf.reorderingAutoScrollAnimator?.invalidate()
+            strongSelf.reorderingAutoScrollAnimator = nil
+            if let (size, sideInset, filters, selectedFilter, isReordering, isEditing, transitionFraction, presentationData) = strongSelf.currentParams {
+                strongSelf.update(size: size, sideInset: sideInset, filters: filters, selectedFilter: selectedFilter, isReordering: isReordering, isEditing: isEditing, transitionFraction: transitionFraction, presentationData: presentationData, transition: .animated(duration: 0.25, curve: .easeInOut))
+            }
+        }, moved: { [weak self] offset in
+            guard let strongSelf = self, let reorderingItem = strongSelf.reorderingItem else {
+                return
+            }
+            if let reorderingItemNode = strongSelf.itemNodes[reorderingItem], let (initial, _) = strongSelf.reorderingItemPosition, let reorderedItemIds = strongSelf.reorderedItemIds, let currentItemIndex = reorderedItemIds.firstIndex(of: reorderingItem) {
+                
+                for (id, itemNode) in strongSelf.itemNodes {
+                    guard let itemIndex = reorderedItemIds.firstIndex(of: id) else {
+                        continue
+                    }
+                    if id != reorderingItem {
+                        let itemFrame = itemNode.view.convert(itemNode.bounds, to: strongSelf.view)
+                        if reorderingItemNode.frame.intersects(itemFrame) {
+                            let targetIndex: Int
+                            if reorderingItemNode.frame.midX < itemFrame.midX {
+                                targetIndex = max(1, itemIndex - 1)
+                            } else {
+                                targetIndex = max(1, min(reorderedItemIds.count - 1, itemIndex))
+                            }
+                            if targetIndex != currentItemIndex {
+                                strongSelf.hapticFeedback.tap()
+                                
+                                var updatedReorderedItemIds = reorderedItemIds
+                                if targetIndex > currentItemIndex {
+                                    updatedReorderedItemIds.insert(reorderingItem, at: targetIndex + 1)
+                                    updatedReorderedItemIds.remove(at: currentItemIndex)
+                                } else {
+                                    updatedReorderedItemIds.remove(at: currentItemIndex)
+                                    updatedReorderedItemIds.insert(reorderingItem, at: targetIndex)
+                                }
+                                strongSelf.reorderedItemIds = updatedReorderedItemIds
+                                if let (size, sideInset, filters, selectedFilter, isReordering, isEditing, transitionFraction, presentationData) = strongSelf.currentParams {
+                                    strongSelf.update(size: size, sideInset: sideInset, filters: filters, selectedFilter: selectedFilter, isReordering: isReordering, isEditing: isEditing, transitionFraction: transitionFraction, presentationData: presentationData, transition: .animated(duration: 0.25, curve: .easeInOut))
+                                }
+                            }
+                            break
+                        }
+                    }
+                }
+                
+                strongSelf.reorderingItemPosition = (initial, offset)
+            }
+            if let (size, sideInset, filters, selectedFilter, isReordering, isEditing, transitionFraction, presentationData) = strongSelf.currentParams {
+                strongSelf.update(size: size, sideInset: sideInset, filters: filters, selectedFilter: selectedFilter, isReordering: isReordering, isEditing: isEditing, transitionFraction: transitionFraction, presentationData: presentationData, transition: .immediate)
+            }
+        })
+        self.reorderingGesture = reorderingGesture
+        self.view.addGestureRecognizer(reorderingGesture)
+        reorderingGesture.isEnabled = false
     }
     
-    func update(size: CGSize, sideInset: CGFloat, filters: [ChatListFilterTabEntry], selectedFilter: ChatListFilterTabEntryId?, presentationData: PresentationData, transition: ContainedViewLayoutTransition) {
-        let focusOnSelectedFilter = self.currentParams?.selectedFilter != selectedFilter
-        var previousSelectedAbsFrame: CGRect?
+    private var previousSelectedAbsFrame: CGRect?
+    private var previousSelectedFrame: CGRect?
+    
+    func cancelAnimations() {
+        self.selectedLineNode.layer.removeAllAnimations()
+        self.scrollNode.layer.removeAllAnimations()
+    }
+    
+    func update(size: CGSize, sideInset: CGFloat, filters: [ChatListFilterTabEntry], selectedFilter: ChatListFilterTabEntryId?, isReordering: Bool, isEditing: Bool, transitionFraction: CGFloat, presentationData: PresentationData, transition: ContainedViewLayoutTransition) {
+        var focusOnSelectedFilter = self.currentParams?.selectedFilter != selectedFilter
         let previousScrollBounds = self.scrollNode.bounds
-        if let currentSelectedFilter = self.currentParams?.selectedFilter, let itemNode = self.itemNodes[currentSelectedFilter] {
-            previousSelectedAbsFrame = itemNode.frame.offsetBy(dx: -self.scrollNode.bounds.minX, dy: 0.0)
-        }
+        let previousContentWidth = self.scrollNode.view.contentSize.width
         
         if self.currentParams?.presentationData.theme !== presentationData.theme {
             self.selectedLineNode.image = generateImage(CGSize(width: 7.0, height: 4.0), rotatedContext: { size, context in
@@ -273,7 +562,30 @@ final class ChatListFilterTabContainerNode: ASDisplayNode {
             })?.stretchableImage(withLeftCapWidth: 4, topCapHeight: 1)
         }
         
-        self.currentParams = (size: size, sideInset: sideInset, filters: filters, selectedFilter: selectedFilter, presentationData: presentationData)
+        if isReordering {
+            if let reorderedItemIds = self.reorderedItemIds {
+                let currentIds = Set(reorderedItemIds)
+                if currentIds != Set(filters.map { $0.id }) {
+                    var updatedReorderedItemIds = reorderedItemIds.filter { id in
+                        return filters.contains(where: { $0.id == id })
+                    }
+                    for filter in filters {
+                        if !currentIds.contains(filter.id) {
+                            updatedReorderedItemIds.append(filter.id)
+                        }
+                    }
+                    self.reorderedItemIds = updatedReorderedItemIds
+                }
+            } else {
+                self.reorderedItemIds = filters.map { $0.id }
+            }
+        } else if self.reorderedItemIds != nil {
+            self.reorderedItemIds = nil
+        }
+        
+        self.currentParams = (size: size, sideInset: sideInset, filters: filters, selectedFilter: selectedFilter, isReordering, isEditing, transitionFraction, presentationData: presentationData)
+        
+        self.reorderingGesture?.isEnabled = isEditing || isReordering
         
         transition.updateFrame(node: self.scrollNode, frame: CGRect(origin: CGPoint(), size: size))
         
@@ -284,15 +596,30 @@ final class ChatListFilterTabContainerNode: ASDisplayNode {
         
         var badgeAnimations: [ChatListFilterTabEntryId: BadgeAnimation] = [:]
         
-        for filter in filters {
+        var reorderedFilters: [ChatListFilterTabEntry] = filters
+        if let reorderedItemIds = self.reorderedItemIds {
+            reorderedFilters = reorderedItemIds.compactMap { id -> ChatListFilterTabEntry? in
+                if let index = filters.firstIndex(where: { $0.id == id }) {
+                    return filters[index]
+                } else {
+                    return nil
+                }
+            }
+        }
+        
+        for filter in reorderedFilters {
             let itemNode: ItemNode
+            var itemNodeTransition = transition
             var wasAdded = false
             if let current = self.itemNodes[filter.id] {
                 itemNode = current
             } else {
+                itemNodeTransition = .immediate
                 wasAdded = true
                 itemNode = ItemNode(pressed: { [weak self] in
                     self?.tabSelected?(filter.id)
+                }, requestedDeletion: { [weak self] in
+                    self?.tabRequestedDeletion?(filter.id)
                 }, contextGesture: { [weak self] sourceNode, gesture in
                     guard let strongSelf = self else {
                         return
@@ -321,7 +648,7 @@ final class ChatListFilterTabContainerNode: ASDisplayNode {
             if !wasAdded && (itemNode.unreadCount != 0) != (unreadCount != 0) {
                 badgeAnimations[filter.id] = (unreadCount != 0) ? .in : .out
             }
-            itemNode.updateText(title: filter.title(strings: presentationData.strings), unreadCount: unreadCount, isNoFilter: isNoFilter, isSelected: selectedFilter == filter.id, presentationData: presentationData)
+            itemNode.updateText(title: filter.title(strings: presentationData.strings), shortTitle: filter.shortTitle(strings: presentationData.strings), unreadCount: unreadCount, isNoFilter: isNoFilter, isSelected: selectedFilter == filter.id, isEditing: false, isAllChats: isNoFilter, isReordering: isEditing || isReordering, presentationData: presentationData, transition: itemNodeTransition)
         }
         var removeKeys: [ChatListFilterTabEntryId] = []
         for (id, _) in self.itemNodes {
@@ -331,25 +658,31 @@ final class ChatListFilterTabContainerNode: ASDisplayNode {
         }
         for id in removeKeys {
             if let itemNode = self.itemNodes.removeValue(forKey: id) {
-                itemNode.removeFromSupernode()
+                transition.updateAlpha(node: itemNode, alpha: 0.0, completion: { [weak itemNode] _ in
+                    itemNode?.removeFromSupernode()
+                })
+                transition.updateTransformScale(node: itemNode, scale: 0.1)
             }
         }
         
-        var tabSizes: [(CGSize, ItemNode, Bool)] = []
+        var tabSizes: [(ChatListFilterTabEntryId, CGSize, CGSize, ItemNode, Bool)] = []
         var totalRawTabSize: CGFloat = 0.0
         var selectionFrames: [CGRect] = []
         
-        for filter in filters {
+        for filter in reorderedFilters {
             guard let itemNode = self.itemNodes[filter.id] else {
                 continue
             }
             let wasAdded = itemNode.supernode == nil
+            var itemNodeTransition = transition
             if wasAdded {
+                itemNodeTransition = .immediate
                 self.scrollNode.addSubnode(itemNode)
             }
-            let paneNodeWidth = itemNode.updateLayout(height: size.height, transition: transition)
+            let (paneNodeWidth, paneNodeShortWidth) = itemNode.updateLayout(height: size.height, transition: itemNodeTransition)
             let paneNodeSize = CGSize(width: paneNodeWidth, height: size.height)
-            tabSizes.append((paneNodeSize, itemNode, wasAdded))
+            let paneNodeShortSize = CGSize(width: paneNodeShortWidth, height: size.height)
+            tabSizes.append((filter.id, paneNodeSize, paneNodeShortSize, itemNode, wasAdded))
             totalRawTabSize += paneNodeSize.width
             
             if case .animated = transition, let badgeAnimation = badgeAnimations[filter.id] {
@@ -362,38 +695,65 @@ final class ChatListFilterTabContainerNode: ASDisplayNode {
             }
         }
         
-        let minSpacing: CGFloat = 30.0
+        let minSpacing: CGFloat = 26.0
         
-        let sideInset: CGFloat = 16.0
-        var leftOffset: CGFloat = sideInset
+        let resolvedSideInset: CGFloat = 16.0 + sideInset
+        var leftOffset: CGFloat = resolvedSideInset
+        
+        var longTitlesWidth: CGFloat = resolvedSideInset
         for i in 0 ..< tabSizes.count {
-            let (paneNodeSize, paneNode, wasAdded) = tabSizes[i]
-            let paneFrame = CGRect(origin: CGPoint(x: leftOffset, y: floor((size.height - paneNodeSize.height) / 2.0)), size: paneNodeSize)
-            if wasAdded {
-                paneNode.frame = paneFrame
-                paneNode.alpha = 0.0
-                transition.updateAlpha(node: paneNode, alpha: 1.0)
-            } else {
-                transition.updateFrameAdditive(node: paneNode, frame: paneFrame)
+            let (itemId, paneNodeSize, paneNodeShortSize, paneNode, wasAdded) = tabSizes[i]
+            longTitlesWidth += paneNodeSize.width
+            if i != tabSizes.count - 1 {
+                longTitlesWidth += minSpacing
             }
-            paneNode.updateArea(size: paneFrame.size, sideInset: minSpacing / 2.0)
+        }
+        longTitlesWidth += resolvedSideInset
+        let useShortTitles = longTitlesWidth > size.width
+        
+        for i in 0 ..< tabSizes.count {
+            let (itemId, paneNodeLongSize, paneNodeShortSize, paneNode, wasAdded) = tabSizes[i]
+            var itemNodeTransition = transition
+            if wasAdded {
+                itemNodeTransition = .immediate
+            }
+            
+            let useShortTitle = itemId == .all && useShortTitles
+            let paneNodeSize = useShortTitle ? paneNodeShortSize : paneNodeLongSize
+            
+            let paneFrame = CGRect(origin: CGPoint(x: leftOffset, y: floor((size.height - paneNodeSize.height) / 2.0)), size: paneNodeSize)
+            
+            if itemId == self.reorderingItem, let (initial, offset) = self.reorderingItemPosition {
+                itemNodeTransition.updateSublayerTransformScale(node: paneNode, scale: 1.2)
+                itemNodeTransition.updateAlpha(node: paneNode, alpha: 0.9)
+                itemNodeTransition.updateFrameAdditive(node: paneNode, frame: CGRect(origin: CGPoint(x: initial + offset, y: paneFrame.minY), size: paneFrame.size))
+            } else {
+                itemNodeTransition.updateSublayerTransformScale(node: paneNode, scale: 1.0)
+                itemNodeTransition.updateAlpha(node: paneNode, alpha: 1.0)
+                if wasAdded {
+                    paneNode.frame = paneFrame
+                    paneNode.alpha = 0.0
+                    itemNodeTransition.updateAlpha(node: paneNode, alpha: 1.0)
+                } else {
+                    itemNodeTransition.updateFrameAdditive(node: paneNode, frame: paneFrame)
+                }
+            }
+            paneNode.updateArea(size: paneFrame.size, sideInset: minSpacing / 2.0, useShortTitle: useShortTitle, transition: itemNodeTransition)
             paneNode.hitTestSlop = UIEdgeInsets(top: 0.0, left: -minSpacing / 2.0, bottom: 0.0, right: -minSpacing / 2.0)
             
             selectionFrames.append(paneFrame)
             
             leftOffset += paneNodeSize.width + minSpacing
         }
+        leftOffset -= minSpacing
+        leftOffset += resolvedSideInset
         
-        let addSize = CGSize(width: 32.0, height: size.height)
-        transition.updateFrame(node: self.addNode, frame: CGRect(origin: CGPoint(x: max(leftOffset, size.width - sideInset - addSize.width + 6.0), y: 0.0), size: addSize))
-        self.addNode.update(size: addSize, theme: presentationData.theme)
-        leftOffset += addSize.width + minSpacing
+        self.scrollNode.view.contentSize = CGSize(width: leftOffset, height: size.height)
         
-        self.scrollNode.view.contentSize = CGSize(width: leftOffset - minSpacing + sideInset - 5.0, height: size.height)
-        
-        let transitionFraction: CGFloat = 0.0
+        var previousFrame: CGRect?
+        var nextFrame: CGRect?
         var selectedFrame: CGRect?
-        if let selectedFilter = selectedFilter, let currentIndex = filters.index(where: { $0.id == selectedFilter }) {
+        if let selectedFilter = selectedFilter, let currentIndex = reorderedFilters.firstIndex(where: { $0.id == selectedFilter }) {
             func interpolateFrame(from fromValue: CGRect, to toValue: CGRect, t: CGFloat) -> CGRect {
                 return CGRect(x: floorToScreenPixels(toValue.origin.x * t + fromValue.origin.x * (1.0 - t)), y: floorToScreenPixels(toValue.origin.y * t + fromValue.origin.y * (1.0 - t)), width: floorToScreenPixels(toValue.size.width * t + fromValue.size.width * (1.0 - t)), height: floorToScreenPixels(toValue.size.height * t + fromValue.size.height * (1.0 - t)))
             }
@@ -418,32 +778,168 @@ final class ChatListFilterTabContainerNode: ASDisplayNode {
             if wasAdded {
                 self.selectedLineNode.frame = lineFrame
                 self.selectedLineNode.alpha = 0.0
-                transition.updateAlpha(node: self.selectedLineNode, alpha: 1.0)
             } else {
                 transition.updateFrame(node: self.selectedLineNode, frame: lineFrame)
             }
-            if focusOnSelectedFilter {
-                if selectedFilter == filters.first?.id {
-                    transition.updateBounds(node: self.scrollNode, bounds: CGRect(origin: CGPoint(), size: self.scrollNode.bounds.size))
-                } else if selectedFilter == filters.last?.id {
-                    transition.updateBounds(node: self.scrollNode, bounds: CGRect(origin: CGPoint(x: max(0.0, self.scrollNode.view.contentSize.width - self.scrollNode.bounds.width), y: 0.0), size: self.scrollNode.bounds.size))
+            transition.updateAlpha(node: self.selectedLineNode, alpha: isReordering && selectedFilter == .all ? 0.5 : 1.0)
+            
+            if let previousSelectedFrame = self.previousSelectedFrame {
+                let previousContentOffsetX = max(0.0, min(previousContentWidth - previousScrollBounds.width, floor(previousSelectedFrame.midX - previousScrollBounds.width / 2.0)))
+                if abs(previousContentOffsetX - previousScrollBounds.minX) < 1.0 {
+                    focusOnSelectedFilter = true
+                }
+            }
+            
+            if focusOnSelectedFilter && self.reorderingItem == nil {
+                let updatedBounds: CGRect
+                if transitionFraction.isZero && selectedFilter == reorderedFilters.first?.id {
+                    updatedBounds = CGRect(origin: CGPoint(), size: self.scrollNode.bounds.size)
+                } else if transitionFraction.isZero && selectedFilter == reorderedFilters.last?.id {
+                    updatedBounds = CGRect(origin: CGPoint(x: max(0.0, self.scrollNode.view.contentSize.width - self.scrollNode.bounds.width), y: 0.0), size: self.scrollNode.bounds.size)
                 } else {
                     let contentOffsetX = max(0.0, min(self.scrollNode.view.contentSize.width - self.scrollNode.bounds.width, floor(selectedFrame.midX - self.scrollNode.bounds.width / 2.0)))
-                    transition.updateBounds(node: self.scrollNode, bounds: CGRect(origin: CGPoint(x: contentOffsetX, y: 0.0), size: self.scrollNode.bounds.size))
+                    updatedBounds = CGRect(origin: CGPoint(x: contentOffsetX, y: 0.0), size: self.scrollNode.bounds.size)
                 }
-            } else if !wasAdded, let previousSelectedAbsFrame = previousSelectedAbsFrame {
-                let contentOffsetX: CGFloat
-                if previousScrollBounds.minX.isZero {
-                    contentOffsetX = 0.0
-                } else if previousScrollBounds.maxX == previousScrollBounds.width {
-                    contentOffsetX = self.scrollNode.view.contentSize.width - self.scrollNode.bounds.width
-                } else {
-                    contentOffsetX = selectedFrame.midX - previousSelectedAbsFrame.midX
-                }
-                transition.updateBounds(node: self.scrollNode, bounds: CGRect(origin: CGPoint(x: contentOffsetX, y: 0.0), size: self.scrollNode.bounds.size))
+                self.scrollNode.bounds = updatedBounds
             }
+            transition.animateHorizontalOffsetAdditive(node: self.scrollNode, offset: previousScrollBounds.minX - self.scrollNode.bounds.minX)
+            
+            self.previousSelectedAbsFrame = selectedFrame.offsetBy(dx: -self.scrollNode.bounds.minX, dy: 0.0)
+            self.previousSelectedFrame = selectedFrame
         } else {
             self.selectedLineNode.isHidden = true
+            self.previousSelectedAbsFrame = nil
+            self.previousSelectedFrame = nil
+        }
+    }
+}
+
+private class ReorderingGestureRecognizerTimerTarget: NSObject {
+    private let f: () -> Void
+    
+    init(_ f: @escaping () -> Void) {
+        self.f = f
+        
+        super.init()
+    }
+    
+    @objc func timerEvent() {
+        self.f()
+    }
+}
+
+private final class ReorderingGestureRecognizer: UIGestureRecognizer, UIGestureRecognizerDelegate {
+    private let shouldBegin: (CGPoint) -> Bool
+    private let began: (CGPoint) -> Void
+    private let ended: () -> Void
+    private let moved: (CGFloat) -> Void
+    
+    private var initialLocation: CGPoint?
+    private var delayTimer: Foundation.Timer?
+    
+    var currentLocation: CGPoint?
+    
+    init(shouldBegin: @escaping (CGPoint) -> Bool, began: @escaping (CGPoint) -> Void, ended: @escaping () -> Void, moved: @escaping (CGFloat) -> Void) {
+        self.shouldBegin = shouldBegin
+        self.began = began
+        self.ended = ended
+        self.moved = moved
+        
+        super.init(target: nil, action: nil)
+        
+        self.delegate = self
+    }
+    
+    override func reset() {
+        super.reset()
+        
+        self.initialLocation = nil
+        self.delayTimer?.invalidate()
+        self.delayTimer = nil
+        self.currentLocation = nil
+    }
+    
+    func gestureRecognizer(_ gestureRecognizer: UIGestureRecognizer, shouldBeRequiredToFailBy otherGestureRecognizer: UIGestureRecognizer) -> Bool {
+        if otherGestureRecognizer is UIPanGestureRecognizer {
+            return true
+        } else {
+            return false
+        }
+    }
+    
+    override func touchesBegan(_ touches: Set<UITouch>, with event: UIEvent) {
+        super.touchesBegan(touches, with: event)
+        
+        guard let location = touches.first?.location(in: self.view) else {
+            self.state = .failed
+            return
+        }
+        
+        if self.state == .possible {
+            if self.delayTimer == nil {
+                if !self.shouldBegin(location) {
+                    self.state = .failed
+                    return
+                }
+                self.initialLocation = location
+                let timer = Foundation.Timer(timeInterval: 0.2, target: ReorderingGestureRecognizerTimerTarget { [weak self] in
+                    guard let strongSelf = self else {
+                        return
+                    }
+                    strongSelf.delayTimer = nil
+                    strongSelf.state = .began
+                    strongSelf.began(location)
+                }, selector: #selector(ReorderingGestureRecognizerTimerTarget.timerEvent), userInfo: nil, repeats: false)
+                self.delayTimer = timer
+                RunLoop.main.add(timer, forMode: .common)
+            } else {
+                self.state = .failed
+            }
+        }
+    }
+    
+    override func touchesEnded(_ touches: Set<UITouch>, with event: UIEvent) {
+        super.touchesEnded(touches, with: event)
+        
+        self.delayTimer?.invalidate()
+        
+        if self.state == .began || self.state == .changed {
+            self.ended()
+        }
+        
+        self.state = .failed
+    }
+    
+    override func touchesCancelled(_ touches: Set<UITouch>, with event: UIEvent) {
+        super.touchesCancelled(touches, with: event)
+        
+        if self.state == .began || self.state == .changed {
+            self.delayTimer?.invalidate()
+            self.ended()
+            self.state = .failed
+        }
+    }
+    
+    override func touchesMoved(_ touches: Set<UITouch>, with event: UIEvent) {
+        super.touchesMoved(touches, with: event)
+        
+        guard let initialLocation = self.initialLocation, let location = touches.first?.location(in: self.view) else {
+            return
+        }
+        let offset = location.x - initialLocation.x
+        self.currentLocation = location
+        
+        if self.delayTimer != nil {
+            if abs(offset) > 4.0 {
+                self.delayTimer?.invalidate()
+                self.state = .failed
+                return
+            }
+        } else {
+            if self.state == .began || self.state == .changed {
+                self.state = .changed
+                self.moved(offset)
+            }
         }
     }
 }
diff --git a/submodules/ChatListUI/Sources/ChatListSearchContainerNode.swift b/submodules/ChatListUI/Sources/ChatListSearchContainerNode.swift
index 4b60962349..87ab517a47 100644
--- a/submodules/ChatListUI/Sources/ChatListSearchContainerNode.swift
+++ b/submodules/ChatListUI/Sources/ChatListSearchContainerNode.swift
@@ -1003,6 +1003,7 @@ public final class ChatListSearchContainerNode: SearchDisplayControllerContentNo
             self?.listNode.clearHighlightAnimated(true)
         }, disabledPeerSelected: { _ in
         }, togglePeerSelected: { _ in
+        }, additionalCategorySelected: { _ in
         }, messageSelected: { [weak self] peer, message, _ in
             self?.view.endEditing(true)
             if let peer = message.peers[message.id.peerId] {
diff --git a/submodules/ChatListUI/Sources/ChatListUI.h b/submodules/ChatListUI/Sources/ChatListUI.h
deleted file mode 100644
index 4a3e46fa3c..0000000000
--- a/submodules/ChatListUI/Sources/ChatListUI.h
+++ /dev/null
@@ -1,19 +0,0 @@
-//
-//  ChatListUI.h
-//  ChatListUI
-//
-//  Created by Peter on 8/13/19.
-//  Copyright © 2019 Telegram Messenger LLP. All rights reserved.
-//
-
-#import <UIKit/UIKit.h>
-
-//! Project version number for ChatListUI.
-FOUNDATION_EXPORT double ChatListUIVersionNumber;
-
-//! Project version string for ChatListUI.
-FOUNDATION_EXPORT const unsigned char ChatListUIVersionString[];
-
-// In this header, you should import all the public headers of your framework using statements like #import <ChatListUI/PublicHeader.h>
-
-
diff --git a/submodules/ChatListUI/Sources/Node/ChatListHoleItem.swift b/submodules/ChatListUI/Sources/Node/ChatListHoleItem.swift
index ccce665a4c..f69ff4eb35 100644
--- a/submodules/ChatListUI/Sources/Node/ChatListHoleItem.swift
+++ b/submodules/ChatListUI/Sources/Node/ChatListHoleItem.swift
@@ -6,8 +6,6 @@ import Display
 import SwiftSignalKit
 import TelegramPresentationData
 
-private let titleFont = Font.regular(17.0)
-
 class ChatListHoleItem: ListViewItem {
     let theme: PresentationTheme
     
@@ -45,9 +43,6 @@ class ChatListHoleItem: ListViewItem {
                     Queue.mainQueue().async {
                         completion(nodeLayout, { _ in
                             apply()
-                            if let nodeValue = node() as? ChatListHoleItemNode {
-                                nodeValue.updateBackgroundAndSeparatorsLayout()
-                            }
                         })
                     }
                 }
@@ -56,25 +51,11 @@ class ChatListHoleItem: ListViewItem {
     }
 }
 
-private let separatorHeight = 1.0 / UIScreen.main.scale
-
 class ChatListHoleItemNode: ListViewItemNode {
-    let separatorNode: ASDisplayNode
-    let labelNode: TextNode
-    
     var relativePosition: (first: Bool, last: Bool) = (false, false)
     
     required init() {
-        self.separatorNode = ASDisplayNode()
-        self.separatorNode.backgroundColor = UIColor(rgb: 0xc8c7cc)
-        self.separatorNode.isLayerBacked = true
-        
-        self.labelNode = TextNode()
-        
         super.init(layerBacked: false, dynamicBounce: false)
-        
-        self.addSubnode(self.separatorNode)
-        self.addSubnode(self.labelNode)
     }
     
     override func layoutForParams(_ params: ListViewItemLayoutParams, item: ListViewItem, previousItem: ListViewItem?, nextItem: ListViewItem?) {
@@ -84,45 +65,17 @@ class ChatListHoleItemNode: ListViewItemNode {
     }
     
     func asyncLayout() -> (_ item: ChatListHoleItem, _ params: ListViewItemLayoutParams, _ first: Bool, _ last: Bool) -> (ListViewItemNodeLayout, () -> Void) {
-        let labelNodeLayout = TextNode.asyncLayout(self.labelNode)
-        
         return { item, params, first, last in
-            let baseWidth = params.width - params.leftInset - params.rightInset
-            
-            let (labelLayout, labelApply) = labelNodeLayout(TextNodeLayoutArguments(attributedString: NSAttributedString(string: "", font: titleFont, textColor: item.theme.chatList.messageTextColor), backgroundColor: nil, maximumNumberOfLines: 1, truncationType: .end, constrainedSize: CGSize(width: baseWidth, height: CGFloat.greatestFiniteMagnitude), alignment: .natural, cutout: nil, insets: UIEdgeInsets()))
-            
-            let insets = ChatListItemNode.insets(first: first, last: last, firstWithHeader: false)
-            let layout = ListViewItemNodeLayout(contentSize: CGSize(width: params.width, height: 68.0), insets: insets)
-            
-            let separatorInset: CGFloat
-            if last {
-                separatorInset = 0.0
-            } else {
-                separatorInset = 80.0 + params.leftInset
-            }
+            let layout = ListViewItemNodeLayout(contentSize: CGSize(width: params.width, height: 0.0), insets: UIEdgeInsets())
             
             return (layout, { [weak self] in
                 if let strongSelf = self {
                     strongSelf.relativePosition = (first, last)
                     
-                    let _ = labelApply()
-                    
-                    strongSelf.separatorNode.backgroundColor = item.theme.chatList.itemSeparatorColor
-                    
-                    strongSelf.labelNode.frame = CGRect(origin: CGPoint(x: floor((params.width - labelLayout.size.width) / 2.0), y: floor((layout.contentSize.height - labelLayout.size.height) / 2.0)), size: labelLayout.size)
-                    
-                    strongSelf.separatorNode.frame = CGRect(origin: CGPoint(x: separatorInset, y: 68.0 - separatorHeight), size: CGSize(width: params.width - separatorInset, height: separatorHeight))
-                    
                     strongSelf.contentSize = layout.contentSize
                     strongSelf.insets = layout.insets
-                    strongSelf.updateBackgroundAndSeparatorsLayout()
                 }
             })
         }
     }
-    
-    func updateBackgroundAndSeparatorsLayout() {
-        //let size = self.bounds.size
-        //let insets = self.insets
-    }
 }
diff --git a/submodules/ChatListUI/Sources/Node/ChatListItem.swift b/submodules/ChatListUI/Sources/Node/ChatListItem.swift
index 33615bf3cb..b63019d418 100644
--- a/submodules/ChatListUI/Sources/Node/ChatListItem.swift
+++ b/submodules/ChatListUI/Sources/Node/ChatListItem.swift
@@ -1665,7 +1665,7 @@ class ChatListItemNode: ItemListRevealOptionsItemNode {
             
             let leftInset: CGFloat = params.leftInset + avatarLeftInset
             
-            let rawContentRect = CGRect(origin: CGPoint(x: 2.0, y: layoutOffset + 8.0), size: CGSize(width: params.width - leftInset - params.rightInset - 10.0 - 1.0 - editingOffset, height: self.bounds.size.height - 12.0 - 9.0))
+            let rawContentRect = CGRect(origin: CGPoint(x: 2.0, y: layoutOffset + 8.0), size: CGSize(width: params.width - leftInset - params.rightInset - 10.0 - editingOffset, height: self.bounds.size.height - 12.0 - 9.0))
             
             let contentRect = rawContentRect.offsetBy(dx: editingOffset + leftInset + offset, dy: 0.0)
             
diff --git a/submodules/ChatListUI/Sources/Node/ChatListNode.swift b/submodules/ChatListUI/Sources/Node/ChatListNode.swift
index 6d2f4b5903..76e06b45d8 100644
--- a/submodules/ChatListUI/Sources/Node/ChatListNode.swift
+++ b/submodules/ChatListUI/Sources/Node/ChatListNode.swift
@@ -14,10 +14,11 @@ import ContactsPeerItem
 import ContextUI
 import ItemListUI
 import SearchUI
+import ChatListSearchItemHeader
 
 public enum ChatListNodeMode {
     case chatList
-    case peers(filter: ChatListNodePeersFilter)
+    case peers(filter: ChatListNodePeersFilter, isSelecting: Bool, additionalCategories: [ChatListNodeAdditionalCategory])
 }
 
 struct ChatListNodeListViewTransition {
@@ -29,6 +30,7 @@ struct ChatListNodeListViewTransition {
     let scrollToItem: ListViewScrollToItem?
     let stationaryItemRange: (Int, Int)?
     let adjustScrollToFirstItem: Bool
+    let animateCrossfade: Bool
 }
 
 final class ChatListHighlightedLocation {
@@ -50,6 +52,7 @@ public final class ChatListNodeInteraction {
     let peerSelected: (Peer) -> Void
     let disabledPeerSelected: (Peer) -> Void
     let togglePeerSelected: (PeerId) -> Void
+    let additionalCategorySelected: (Int) -> Void
     let messageSelected: (Peer, Message, Bool) -> Void
     let groupSelected: (PeerGroupId) -> Void
     let addContact: (String) -> Void
@@ -66,11 +69,12 @@ public final class ChatListNodeInteraction {
     public var searchTextHighightState: String?
     var highlightedChatLocation: ChatListHighlightedLocation?
     
-    public init(activateSearch: @escaping () -> Void, peerSelected: @escaping (Peer) -> Void, disabledPeerSelected: @escaping (Peer) -> Void, togglePeerSelected: @escaping (PeerId) -> Void, messageSelected: @escaping (Peer, Message, Bool) -> Void, groupSelected: @escaping (PeerGroupId) -> Void, addContact: @escaping (String) -> Void, setPeerIdWithRevealedOptions: @escaping (PeerId?, PeerId?) -> Void, setItemPinned: @escaping (PinnedItemId, Bool) -> Void, setPeerMuted: @escaping (PeerId, Bool) -> Void, deletePeer: @escaping (PeerId) -> Void, updatePeerGrouping: @escaping (PeerId, Bool) -> Void, togglePeerMarkedUnread: @escaping (PeerId, Bool) -> Void, toggleArchivedFolderHiddenByDefault: @escaping () -> Void, activateChatPreview: @escaping (ChatListItem, ASDisplayNode, ContextGesture?) -> Void, present: @escaping (ViewController) -> Void) {
+    public init(activateSearch: @escaping () -> Void, peerSelected: @escaping (Peer) -> Void, disabledPeerSelected: @escaping (Peer) -> Void, togglePeerSelected: @escaping (PeerId) -> Void, additionalCategorySelected: @escaping (Int) -> Void, messageSelected: @escaping (Peer, Message, Bool) -> Void, groupSelected: @escaping (PeerGroupId) -> Void, addContact: @escaping (String) -> Void, setPeerIdWithRevealedOptions: @escaping (PeerId?, PeerId?) -> Void, setItemPinned: @escaping (PinnedItemId, Bool) -> Void, setPeerMuted: @escaping (PeerId, Bool) -> Void, deletePeer: @escaping (PeerId) -> Void, updatePeerGrouping: @escaping (PeerId, Bool) -> Void, togglePeerMarkedUnread: @escaping (PeerId, Bool) -> Void, toggleArchivedFolderHiddenByDefault: @escaping () -> Void, activateChatPreview: @escaping (ChatListItem, ASDisplayNode, ContextGesture?) -> Void, present: @escaping (ViewController) -> Void) {
         self.activateSearch = activateSearch
         self.peerSelected = peerSelected
         self.disabledPeerSelected = disabledPeerSelected
         self.togglePeerSelected = togglePeerSelected
+        self.additionalCategorySelected = additionalCategorySelected
         self.messageSelected = messageSelected
         self.groupSelected = groupSelected
         self.addContact = addContact
@@ -103,12 +107,14 @@ public struct ChatListNodeState: Equatable {
     public var pendingRemovalPeerIds: Set<PeerId>
     public var pendingClearHistoryPeerIds: Set<PeerId>
     public var archiveShouldBeTemporaryRevealed: Bool
+    public var selectedAdditionalCategoryIds: Set<Int>
     
-    public init(presentationData: ChatListPresentationData, editing: Bool, peerIdWithRevealedOptions: PeerId?, selectedPeerIds: Set<PeerId>, peerInputActivities: ChatListNodePeerInputActivities?, pendingRemovalPeerIds: Set<PeerId>, pendingClearHistoryPeerIds: Set<PeerId>, archiveShouldBeTemporaryRevealed: Bool) {
+    public init(presentationData: ChatListPresentationData, editing: Bool, peerIdWithRevealedOptions: PeerId?, selectedPeerIds: Set<PeerId>, selectedAdditionalCategoryIds: Set<Int>, peerInputActivities: ChatListNodePeerInputActivities?, pendingRemovalPeerIds: Set<PeerId>, pendingClearHistoryPeerIds: Set<PeerId>, archiveShouldBeTemporaryRevealed: Bool) {
         self.presentationData = presentationData
         self.editing = editing
         self.peerIdWithRevealedOptions = peerIdWithRevealedOptions
         self.selectedPeerIds = selectedPeerIds
+        self.selectedAdditionalCategoryIds = selectedAdditionalCategoryIds
         self.peerInputActivities = peerInputActivities
         self.pendingRemovalPeerIds = pendingRemovalPeerIds
         self.pendingClearHistoryPeerIds = pendingClearHistoryPeerIds
@@ -128,6 +134,9 @@ public struct ChatListNodeState: Equatable {
         if lhs.selectedPeerIds != rhs.selectedPeerIds {
             return false
         }
+        if lhs.selectedAdditionalCategoryIds != rhs.selectedAdditionalCategoryIds {
+            return false
+        }
         if lhs.peerInputActivities !== rhs.peerInputActivities {
             return false
         }
@@ -149,11 +158,22 @@ private func mappedInsertEntries(context: AccountContext, nodeInteraction: ChatL
         switch entry.entry {
             case .HeaderEntry:
                 return ListViewInsertItem(index: entry.index, previousIndex: entry.previousIndex, item: ChatListEmptyHeaderItem(), directionHint: entry.directionHint)
-            case let .PeerEntry(index, presentationData, message, combinedReadState, notificationSettings, embeddedState, peer, presence, summaryInfo, editing, hasActiveRevealControls, selected, inputActivities, isAd, hasFailedMessages):
+            case let .AdditionalCategory(_, id, title, image, selected, presentationData):
+                return ListViewInsertItem(index: entry.index, previousIndex: entry.previousIndex, item: ChatListAdditionalCategoryItem(
+                    presentationData: ItemListPresentationData(theme: presentationData.theme, fontSize: presentationData.fontSize, strings: presentationData.strings),
+                    context: context,
+                    title: title,
+                    image: image,
+                    isSelected: selected,
+                    action: {
+                        nodeInteraction.additionalCategorySelected(id)
+                    }
+                ), directionHint: entry.directionHint)
+            case let .PeerEntry(index, presentationData, message, combinedReadState, notificationSettings, embeddedState, peer, presence, summaryInfo, editing, hasActiveRevealControls, selected, inputActivities, isAd, hasFailedMessages, isContact):
                 switch mode {
                     case .chatList:
                         return ListViewInsertItem(index: entry.index, previousIndex: entry.previousIndex, item: ChatListItem(presentationData: presentationData, context: context, peerGroupId: peerGroupId, isInFilter: isInFilter, index: index, content: .peer(message: message, peer: peer, combinedReadState: combinedReadState, notificationSettings: notificationSettings, presence: presence, summaryInfo: summaryInfo, embeddedState: embeddedState, inputActivities: inputActivities, isAd: isAd, ignoreUnreadBadge: false, displayAsMessage: false, hasFailedMessages: hasFailedMessages), editing: editing, hasActiveRevealControls: hasActiveRevealControls, selected: selected, header: nil, enableContextActions: true, hiddenOffset: false, interaction: nodeInteraction), directionHint: entry.directionHint)
-                    case let .peers(filter):
+                    case let .peers(filter, isSelecting, _):
                         let itemPeer = peer.chatMainPeer
                         var chatPeer: Peer?
                         if let peer = peer.peers[peer.peerId] {
@@ -217,8 +237,23 @@ private func mappedInsertEntries(context: AccountContext, nodeInteraction: ChatL
                                 }
                             }
                         }
+                        
+                        var header: ChatListSearchItemHeader?
+                        switch mode {
+                        case let .peers(_, _, additionalCategories):
+                            if !additionalCategories.isEmpty {
+                                header = ChatListSearchItemHeader(type: .chats, theme: presentationData.theme, strings: presentationData.strings, actionTitle: nil, action: nil)
+                            }
+                        default:
+                            break
+                        }
+                        
+                        var status: ContactsPeerItemStatus = .none
+                        if isSelecting, let itemPeer = itemPeer {
+                            status = .custom(statusStringForPeerType(strings: presentationData.strings, peer: itemPeer, isContact: isContact))
+                        }
 
-                        return ListViewInsertItem(index: entry.index, previousIndex: entry.previousIndex, item: ContactsPeerItem(presentationData: ItemListPresentationData(theme: presentationData.theme, fontSize: presentationData.fontSize, strings: presentationData.strings), sortOrder: presentationData.nameSortOrder, displayOrder: presentationData.nameDisplayOrder, context: context, peerMode: .generalSearch, peer: .peer(peer: itemPeer, chatPeer: chatPeer), status: .none, enabled: enabled, selection: .none, editing: ContactsPeerItemEditing(editable: false, editing: false, revealed: false), index: nil, header: nil, action: { _ in
+                        return ListViewInsertItem(index: entry.index, previousIndex: entry.previousIndex, item: ContactsPeerItem(presentationData: ItemListPresentationData(theme: presentationData.theme, fontSize: presentationData.fontSize, strings: presentationData.strings), sortOrder: presentationData.nameSortOrder, displayOrder: presentationData.nameDisplayOrder, context: context, peerMode: .generalSearch, peer: .peer(peer: itemPeer, chatPeer: chatPeer), status: status, enabled: enabled, selection: editing ? .selectable(selected: selected) : .none, editing: ContactsPeerItemEditing(editable: false, editing: false, revealed: false), index: nil, header: header, action: { _ in
                             if let chatPeer = chatPeer {
                                 nodeInteraction.peerSelected(chatPeer)
                             }
@@ -241,11 +276,11 @@ private func mappedInsertEntries(context: AccountContext, nodeInteraction: ChatL
 private func mappedUpdateEntries(context: AccountContext, nodeInteraction: ChatListNodeInteraction, peerGroupId: PeerGroupId, isInFilter: Bool, mode: ChatListNodeMode, entries: [ChatListNodeViewTransitionUpdateEntry]) -> [ListViewUpdateItem] {
     return entries.map { entry -> ListViewUpdateItem in
         switch entry.entry {
-            case let .PeerEntry(index, presentationData, message, combinedReadState, notificationSettings, embeddedState, peer, presence, summaryInfo, editing, hasActiveRevealControls, selected, inputActivities, isAd, hasFailedMessages):
+            case let .PeerEntry(index, presentationData, message, combinedReadState, notificationSettings, embeddedState, peer, presence, summaryInfo, editing, hasActiveRevealControls, selected, inputActivities, isAd, hasFailedMessages, isContact):
                 switch mode {
                     case .chatList:
                         return ListViewUpdateItem(index: entry.index, previousIndex: entry.previousIndex, item: ChatListItem(presentationData: presentationData, context: context, peerGroupId: peerGroupId, isInFilter: isInFilter, index: index, content: .peer(message: message, peer: peer, combinedReadState: combinedReadState, notificationSettings: notificationSettings, presence: presence, summaryInfo: summaryInfo, embeddedState: embeddedState, inputActivities: inputActivities, isAd: isAd, ignoreUnreadBadge: false, displayAsMessage: false, hasFailedMessages: hasFailedMessages), editing: editing, hasActiveRevealControls: hasActiveRevealControls, selected: selected, header: nil, enableContextActions: true, hiddenOffset: false, interaction: nodeInteraction), directionHint: entry.directionHint)
-                    case let .peers(filter):
+                    case let .peers(filter, isSelecting, _):
                         let itemPeer = peer.chatMainPeer
                         var chatPeer: Peer?
                         if let peer = peer.peers[peer.peerId] {
@@ -266,7 +301,22 @@ private func mappedUpdateEntries(context: AccountContext, nodeInteraction: ChatL
                                 enabled = false
                             }
                         }
-                        return ListViewUpdateItem(index: entry.index, previousIndex: entry.previousIndex, item: ContactsPeerItem(presentationData: ItemListPresentationData(theme: presentationData.theme, fontSize: presentationData.fontSize, strings: presentationData.strings), sortOrder: presentationData.nameSortOrder, displayOrder: presentationData.nameDisplayOrder, context: context, peerMode: .generalSearch, peer: .peer(peer: itemPeer, chatPeer: chatPeer), status: .none, enabled: enabled, selection: .none, editing: ContactsPeerItemEditing(editable: false, editing: false, revealed: false), index: nil, header: nil, action: { _ in
+                        var header: ChatListSearchItemHeader?
+                        switch mode {
+                        case let .peers(_, _, additionalCategories):
+                            if !additionalCategories.isEmpty {
+                                header = ChatListSearchItemHeader(type: .chats, theme: presentationData.theme, strings: presentationData.strings, actionTitle: nil, action: nil)
+                            }
+                        default:
+                            break
+                        }
+                        
+                        var status: ContactsPeerItemStatus = .none
+                        if isSelecting, let itemPeer = itemPeer {
+                            status = .custom(statusStringForPeerType(strings: presentationData.strings, peer: itemPeer, isContact: isContact))
+                        }
+                        
+                        return ListViewUpdateItem(index: entry.index, previousIndex: entry.previousIndex, item: ContactsPeerItem(presentationData: ItemListPresentationData(theme: presentationData.theme, fontSize: presentationData.fontSize, strings: presentationData.strings), sortOrder: presentationData.nameSortOrder, displayOrder: presentationData.nameDisplayOrder, context: context, peerMode: .generalSearch, peer: .peer(peer: itemPeer, chatPeer: chatPeer), status: status, enabled: enabled, selection: editing ? .selectable(selected: selected) : .none, editing: ContactsPeerItemEditing(editable: false, editing: false, revealed: false), index: nil, header: header, action: { _ in
                             if let chatPeer = chatPeer {
                                 nodeInteraction.peerSelected(chatPeer)
                             }
@@ -284,12 +334,23 @@ private func mappedUpdateEntries(context: AccountContext, nodeInteraction: ChatL
                 return ListViewUpdateItem(index: entry.index, previousIndex: entry.previousIndex, item: ChatListArchiveInfoItem(theme: presentationData.theme, strings: presentationData.strings), directionHint: entry.directionHint)
             case .HeaderEntry:
                 return ListViewUpdateItem(index: entry.index, previousIndex: entry.previousIndex, item: ChatListEmptyHeaderItem(), directionHint: entry.directionHint)
+            case let .AdditionalCategory(index: _, id, title, image, selected, presentationData):
+                return ListViewUpdateItem(index: entry.index, previousIndex: entry.previousIndex, item: ChatListAdditionalCategoryItem(
+                    presentationData: ItemListPresentationData(theme: presentationData.theme, fontSize: presentationData.fontSize, strings: presentationData.strings),
+                    context: context,
+                    title: title,
+                    image: image,
+                    isSelected: selected,
+                    action: {
+                        nodeInteraction.additionalCategorySelected(id)
+                    }
+                ), directionHint: entry.directionHint)
         }
     }
 }
 
 private func mappedChatListNodeViewListTransition(context: AccountContext, nodeInteraction: ChatListNodeInteraction, peerGroupId: PeerGroupId, isInFilter: Bool, mode: ChatListNodeMode, transition: ChatListNodeViewTransition) -> ChatListNodeListViewTransition {
-    return ChatListNodeListViewTransition(chatListView: transition.chatListView, deleteItems: transition.deleteItems, insertItems: mappedInsertEntries(context: context, nodeInteraction: nodeInteraction, peerGroupId: peerGroupId, isInFilter: isInFilter, mode: mode, entries: transition.insertEntries), updateItems: mappedUpdateEntries(context: context, nodeInteraction: nodeInteraction, peerGroupId: peerGroupId, isInFilter: isInFilter, mode: mode, entries: transition.updateEntries), options: transition.options, scrollToItem: transition.scrollToItem, stationaryItemRange: transition.stationaryItemRange, adjustScrollToFirstItem: transition.adjustScrollToFirstItem)
+    return ChatListNodeListViewTransition(chatListView: transition.chatListView, deleteItems: transition.deleteItems, insertItems: mappedInsertEntries(context: context, nodeInteraction: nodeInteraction, peerGroupId: peerGroupId, isInFilter: isInFilter, mode: mode, entries: transition.insertEntries), updateItems: mappedUpdateEntries(context: context, nodeInteraction: nodeInteraction, peerGroupId: peerGroupId, isInFilter: isInFilter, mode: mode, entries: transition.updateEntries), options: transition.options, scrollToItem: transition.scrollToItem, stationaryItemRange: transition.stationaryItemRange, adjustScrollToFirstItem: transition.adjustScrollToFirstItem, animateCrossfade: transition.animateCrossfade)
 }
 
 private final class ChatListOpaqueTransactionState {
@@ -329,11 +390,6 @@ public enum ChatListNodeEmptyState: Equatable {
     case empty(isLoading: Bool)
 }
 
-enum ChatListNodePaneSwitchAnimationDirection {
-    case left
-    case right
-}
-
 public final class ChatListNode: ListView {
     private let controlsHistoryPreload: Bool
     private let context: AccountContext
@@ -352,8 +408,9 @@ public final class ChatListNode: ListView {
         return _contentsReady.get()
     }
     
-    public var peerSelected: ((PeerId, Bool, Bool) -> Void)?
+    public var peerSelected: ((Peer, Bool, Bool) -> Void)?
     public var disabledPeerSelected: ((Peer) -> Void)?
+    public var additionalCategorySelected: ((Int) -> Void)?
     public var groupSelected: ((PeerGroupId) -> Void)?
     public var addContact: ((String) -> Void)?
     public var activateSearch: (() -> Void)?
@@ -373,22 +430,19 @@ public final class ChatListNode: ListView {
     private var dequeuedInitialTransitionOnLayout = false
     private var enqueuedTransition: (ChatListNodeListViewTransition, () -> Void)?
     
-    private(set) var currentState: ChatListNodeState
+    public private(set) var currentState: ChatListNodeState
     private let statePromise: ValuePromise<ChatListNodeState>
     public var state: Signal<ChatListNodeState, NoError> {
         return self.statePromise.get()
     }
     
-    var paneSwitchAnimation: (ChatListNodePaneSwitchAnimationDirection, ContainedViewLayoutTransition)?
     private var currentLocation: ChatListNodeLocation?
     private(set) var chatListFilter: ChatListFilter? {
         didSet {
             self.chatListFilterValue.set(.single(self.chatListFilter))
             
             if self.chatListFilter != oldValue {
-                if let currentLocation = self.currentLocation {
-                    self.setChatListLocation(.initial(count: 50, filter: self.chatListFilter))
-                }
+                self.setChatListLocation(.initial(count: 50, filter: self.chatListFilter))
             }
         }
     }
@@ -433,7 +487,7 @@ public final class ChatListNode: ListView {
         }
     }
     
-    var isEmptyUpdated: ((ChatListNodeEmptyState, Bool, ChatListNodePaneSwitchAnimationDirection?, ContainedViewLayoutTransition) -> Void)?
+    var isEmptyUpdated: ((ChatListNodeEmptyState, Bool, ContainedViewLayoutTransition) -> Void)?
     private var currentIsEmptyState: ChatListNodeEmptyState?
     
     public var addedVisibleChatsWithPeerIds: (([PeerId]) -> Void)?
@@ -453,7 +507,12 @@ public final class ChatListNode: ListView {
         self.controlsHistoryPreload = controlsHistoryPreload
         self.mode = mode
         
-        self.currentState = ChatListNodeState(presentationData: ChatListPresentationData(theme: theme, fontSize: fontSize, strings: strings, dateTimeFormat: dateTimeFormat, nameSortOrder: nameSortOrder, nameDisplayOrder: nameDisplayOrder, disableAnimations: disableAnimations), editing: false, peerIdWithRevealedOptions: nil, selectedPeerIds: Set(), peerInputActivities: nil, pendingRemovalPeerIds: Set(), pendingClearHistoryPeerIds: Set(), archiveShouldBeTemporaryRevealed: false)
+        var isSelecting = false
+        if case .peers(_, true, _) = mode {
+            isSelecting = true
+        }
+        
+        self.currentState = ChatListNodeState(presentationData: ChatListPresentationData(theme: theme, fontSize: fontSize, strings: strings, dateTimeFormat: dateTimeFormat, nameSortOrder: nameSortOrder, nameDisplayOrder: nameDisplayOrder, disableAnimations: disableAnimations), editing: isSelecting, peerIdWithRevealedOptions: nil, selectedPeerIds: Set(), selectedAdditionalCategoryIds: Set(), peerInputActivities: nil, pendingRemovalPeerIds: Set(), pendingClearHistoryPeerIds: Set(), archiveShouldBeTemporaryRevealed: false)
         self.statePromise = ValuePromise(self.currentState, ignoreRepeated: true)
         
         self.theme = theme
@@ -471,7 +530,7 @@ public final class ChatListNode: ListView {
             }
         }, peerSelected: { [weak self] peer in
             if let strongSelf = self, let peerSelected = strongSelf.peerSelected {
-                peerSelected(peer.id, true, false)
+                peerSelected(peer, true, false)
             }
         }, disabledPeerSelected: { [weak self] peer in
             if let strongSelf = self, let disabledPeerSelected = strongSelf.disabledPeerSelected {
@@ -489,9 +548,11 @@ public final class ChatListNode: ListView {
                 }
                 return state
             }
+        }, additionalCategorySelected: { [weak self] id in
+            self?.additionalCategorySelected?(id)
         }, messageSelected: { [weak self] peer, message, isAd in
             if let strongSelf = self, let peerSelected = strongSelf.peerSelected {
-                peerSelected(peer.id, true, isAd)
+                peerSelected(peer, true, isAd)
             }
         }, groupSelected: { [weak self] groupId in
             if let strongSelf = self, let groupSelected = strongSelf.groupSelected {
@@ -586,7 +647,7 @@ public final class ChatListNode: ListView {
         let currentRemovingPeerId = self.currentRemovingPeerId
         
         let savedMessagesPeer: Signal<Peer?, NoError>
-        if case let .peers(filter) = mode, filter.contains(.onlyWriteable) {
+        if case let .peers(filter, _, _) = mode, filter.contains(.onlyWriteable) {
             savedMessagesPeer = context.account.postbox.loadedPeerWithId(context.account.peerId)
             |> map(Optional.init)
         } else {
@@ -635,11 +696,11 @@ public final class ChatListNode: ListView {
             let (rawEntries, isLoading) = chatListNodeEntriesForView(update.view, state: state, savedMessagesPeer: savedMessagesPeer, hideArchivedFolderByDefault: hideArchivedFolderByDefault, displayArchiveIntro: displayArchiveIntro, mode: mode)
             let entries = rawEntries.filter { entry in
                 switch entry {
-                case let .PeerEntry(_, _, _, _, _, _, peer, _, _, _, _, _, _, _, _):
+                case let .PeerEntry(_, _, _, _, _, _, peer, _, _, _, _, _, _, _, _, _):
                     switch mode {
                         case .chatList:
                             return true
-                        case let .peers(filter):
+                        case let .peers(filter, _, _):
                             guard !filter.contains(.excludeSavedMessages) || peer.peerId != currentPeerId else { return false }
                             guard !filter.contains(.excludeSecretChats) || peer.peerId.namespace != Namespaces.Peer.SecretChat else { return false }
                             guard !filter.contains(.onlyPrivateChats) || peer.peerId.namespace == Namespaces.Peer.CloudUser else { return false }
@@ -745,7 +806,7 @@ public final class ChatListNode: ListView {
                 var didIncludeHiddenByDefaultArchive = false
                 if let previous = previousView {
                     for entry in previous.filteredEntries {
-                        if case let .PeerEntry(index, _, _, _, _, _, _, _, _, _, _, _, _, _, _) = entry {
+                        if case let .PeerEntry(index, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _) = entry {
                             if index.pinningIndex != nil {
                                 previousPinnedChats.append(index.messageIndex.id.peerId)
                             }
@@ -779,6 +840,9 @@ public final class ChatListNode: ListView {
                 if previousState.selectedPeerIds != state.selectedPeerIds {
                     disableAnimations = false
                 }
+                if previousState.selectedAdditionalCategoryIds != state.selectedAdditionalCategoryIds {
+                    disableAnimations = false
+                }
                 if doesIncludeRemovingPeerId != didIncludeRemovingPeerId {
                     disableAnimations = false
                 }
@@ -823,10 +887,10 @@ public final class ChatListNode: ListView {
                 let originalView = chatListView.originalView
                 if let range = range.loadedRange {
                     var location: ChatListNodeLocation?
-                    if range.firstIndex < 5 && originalView.laterIndex != nil {
-                        location = .navigation(index: originalView.entries[originalView.entries.count - 1].index, filter: strongSelf.chatListFilter)
-                    } else if range.firstIndex >= 5 && range.lastIndex >= originalView.entries.count - 5 && originalView.earlierIndex != nil {
-                        location = .navigation(index: originalView.entries[0].index, filter: strongSelf.chatListFilter)
+                    if range.firstIndex < 5, let laterIndex = originalView.laterIndex {
+                        location = .navigation(index: laterIndex, filter: strongSelf.chatListFilter)
+                    } else if range.firstIndex >= 5, range.lastIndex >= originalView.entries.count - 5, let earlierIndex = originalView.earlierIndex {
+                        location = .navigation(index: earlierIndex, filter: strongSelf.chatListFilter)
                     }
                     
                     if let location = location, location != strongSelf.currentLocation {
@@ -847,7 +911,7 @@ public final class ChatListNode: ListView {
                             continue
                         }
                         switch chatListView.filteredEntries[entryCount - i - 1] {
-                            case let .PeerEntry(_, _, _, readState, notificationSettings, _, _, _, _, _, _, _, _, _, _):
+                            case let .PeerEntry(_, _, _, readState, notificationSettings, _, _, _, _, _, _, _, _, _, _, _):
                                 if let readState = readState {
                                     let count = readState.count
                                     rawUnreadCount += count
@@ -993,7 +1057,7 @@ public final class ChatListNode: ListView {
                     var referenceId: PinnedItemId?
                     var beforeAll = false
                     switch toEntry {
-                        case let .PeerEntry(index, _, _, _, _, _, _, _, _, _, _, _, _, isAd, _):
+                        case let .PeerEntry(index, _, _, _, _, _, _, _, _, _, _, _, _, isAd, _, _):
                             if isAd {
                                 beforeAll = true
                             } else {
@@ -1005,13 +1069,13 @@ public final class ChatListNode: ListView {
                             break
                     }
                     
-                    if let _ = fromEntry.sortIndex.pinningIndex {
+                    if case let .index(index) = fromEntry.sortIndex, let _ = index.pinningIndex {
                         return strongSelf.context.account.postbox.transaction { transaction -> Bool in
                             var itemIds = transaction.getPinnedItemIds(groupId: groupId)
                             
                             var itemId: PinnedItemId?
                             switch fromEntry {
-                                case let .PeerEntry(index, _, _, _, _, _, _, _, _, _, _, _, _, _, _):
+                                case let .PeerEntry(index, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _):
                                     itemId = .peer(index.messageIndex.id.peerId)
                                 /*case let .GroupReferenceEntry(_, _, groupId, _, _, _, _):
                                     itemId = .group(groupId)*/
@@ -1180,15 +1244,10 @@ public final class ChatListNode: ListView {
     }
     
     private func resetFilter() {
-        if let chatListFilter = chatListFilter {
-            let preferencesKey: PostboxViewKey = .preferences(keys: Set([PreferencesKeys.chatListFilters]))
-            self.updatedFilterDisposable.set((context.account.postbox.combinedView(keys: [preferencesKey])
-            |> map { view -> ChatListFilter? in
-                guard let preferencesView = view.views[preferencesKey] as? PreferencesView else {
-                    return nil
-                }
-                let filersState = preferencesView.values[PreferencesKeys.chatListFilters] as? ChatListFiltersState ?? ChatListFiltersState.default
-                for filter in filersState.filters {
+        if let chatListFilter = self.chatListFilter {
+            self.updatedFilterDisposable.set((updatedChatListFilters(postbox: self.context.account.postbox)
+            |> map { filters -> ChatListFilter? in
+                for filter in filters {
                     if filter.id == chatListFilter.id {
                         return filter
                     }
@@ -1263,13 +1322,6 @@ public final class ChatListNode: ListView {
         if let (transition, completion) = self.enqueuedTransition {
             self.enqueuedTransition = nil
             
-            let paneSwitchCopyView: UIView?
-            if let (direction, transition) = self.paneSwitchAnimation, let copyView = self.view.snapshotContentTree(unhide: false, keepTransform: true) {
-                paneSwitchCopyView = copyView
-            } else {
-               paneSwitchCopyView = nil
-            }
-            
             let completion: (ListViewDisplayedItemRange) -> Void = { [weak self] visibleRange in
                 if let strongSelf = self {
                     strongSelf.chatListView = transition.chatListView
@@ -1278,7 +1330,7 @@ public final class ChatListNode: ListView {
                     if case .chatList = strongSelf.mode {
                         let entryCount = transition.chatListView.filteredEntries.count
                         if entryCount >= 1 {
-                            if transition.chatListView.filteredEntries[entryCount - 1].sortIndex.pinningIndex != nil {
+                            if case let .index(index) = transition.chatListView.filteredEntries[entryCount - 1].sortIndex, index.pinningIndex != nil {
                                 pinnedOverscroll = true
                             }
                         }
@@ -1308,20 +1360,37 @@ public final class ChatListNode: ListView {
                     }
                     
                     var isEmpty = false
+                    var isLoading = false
                     if transition.chatListView.filteredEntries.isEmpty {
                         isEmpty = true
                     } else {
                         if transition.chatListView.filteredEntries.count <= 2 {
                             isEmpty = true
-                            loop: for entry in transition.chatListView.filteredEntries {
+                            loop1: for entry in transition.chatListView.filteredEntries {
                                 switch entry {
-                                case .GroupReferenceEntry, .HeaderEntry:
+                                case .GroupReferenceEntry, .HeaderEntry, .HoleEntry:
                                     break
                                 default:
                                     isEmpty = false
-                                    break loop
+                                    break loop1
                                 }
                             }
+                            isLoading = true
+                            var hasHoles = false
+                            loop2: for entry in transition.chatListView.filteredEntries {
+                                switch entry {
+                                case .HoleEntry:
+                                    hasHoles = true
+                                case .HeaderEntry:
+                                    break
+                                default:
+                                    isLoading = false
+                                    break loop2
+                                }
+                            }
+                            if !hasHoles {
+                                isLoading = false
+                            }
                         }
                     }
                 
@@ -1329,16 +1398,16 @@ public final class ChatListNode: ListView {
                     if transition.chatListView.isLoading {
                         isEmptyState = .empty(isLoading: true)
                     } else if isEmpty {
-                        isEmptyState = .empty(isLoading: false)
+                        isEmptyState = .empty(isLoading: isLoading)
                     } else {
                         var containsChats = false
                         loop: for entry in transition.chatListView.filteredEntries {
                             switch entry {
-                                case .GroupReferenceEntry, .HoleEntry, .PeerEntry:
-                                    containsChats = true
-                                    break loop
-                                case .ArchiveIntro, .HeaderEntry:
-                                    break
+                            case .GroupReferenceEntry, .HoleEntry, .PeerEntry:
+                                containsChats = true
+                                break loop
+                            case .ArchiveIntro, .HeaderEntry, .AdditionalCategory:
+                                break
                             }
                         }
                         isEmptyState = .notEmpty(containsChats: containsChats)
@@ -1359,33 +1428,14 @@ public final class ChatListNode: ListView {
                         strongSelf.addedVisibleChatsWithPeerIds?(insertedPeerIds)
                     }
                     
-                    var isEmptyUpdate: (ChatListNodePaneSwitchAnimationDirection?, ContainedViewLayoutTransition) = (nil, .immediate)
-                    if let (direction, transition) = strongSelf.paneSwitchAnimation {
-                        strongSelf.paneSwitchAnimation = nil
-                        if let copyView = paneSwitchCopyView {
-                            let offset: CGFloat
-                            switch direction {
-                            case .left:
-                                offset = -strongSelf.bounds.width
-                            case .right:
-                                offset = strongSelf.bounds.width
-                            }
-                            copyView.frame = strongSelf.bounds.offsetBy(dx: offset, dy: 0.0)
-                            strongSelf.view.addSubview(copyView)
-                            transition.animateHorizontalOffsetAdditive(node: strongSelf, offset: offset, completion: { [weak copyView] in
-                                copyView?.removeFromSuperview()
-                            })
-                            isEmptyUpdate = (direction, transition)
-                        }
-                    } else {
-                        if transition.options.contains(.AnimateInsertion) {
-                            isEmptyUpdate.1 = .animated(duration: 0.25, curve: .easeInOut)
-                        }
+                    var isEmptyUpdate: ContainedViewLayoutTransition = .immediate
+                    if transition.options.contains(.AnimateInsertion) || transition.animateCrossfade {
+                        isEmptyUpdate = .animated(duration: 0.25, curve: .easeInOut)
                     }
                     
                     if strongSelf.currentIsEmptyState != isEmptyState {
                         strongSelf.currentIsEmptyState = isEmptyState
-                        strongSelf.isEmptyUpdated?(isEmptyState, transition.chatListView.filter != nil, isEmptyUpdate.0, isEmptyUpdate.1)
+                        strongSelf.isEmptyUpdated?(isEmptyState, transition.chatListView.filter != nil, isEmptyUpdate)
                     }
                     
                     if !strongSelf.hasUpdatedAppliedChatListFilterValueOnce || transition.chatListView.filter != strongSelf.currentAppliedChatListFilterValue {
@@ -1422,6 +1472,35 @@ public final class ChatListNode: ListView {
         }
     }
     
+    var isNavigationHidden: Bool {
+        switch self.visibleContentOffset() {
+        case let .known(value) where abs(value) < navigationBarSearchContentHeight - 1.0:
+            return false
+        default:
+            return true
+        }
+    }
+    
+    func adjustScrollOffsetForNavigation(isNavigationHidden: Bool) {
+        if self.isNavigationHidden == isNavigationHidden {
+            return
+        }
+        var scrollToItem: ListViewScrollToItem?
+        switch self.visibleContentOffset() {
+        case let .known(value) where abs(value) < navigationBarSearchContentHeight - 1.0:
+            if isNavigationHidden {
+                scrollToItem = ListViewScrollToItem(index: 0, position: .top(-navigationBarSearchContentHeight), animated: false, curve: .Default(duration: 0.0), directionHint: .Up)
+            }
+        default:
+            if !isNavigationHidden {
+                scrollToItem = ListViewScrollToItem(index: 0, position: .top(0.0), animated: false, curve: .Default(duration: 0.0), directionHint: .Up)
+            }
+        }
+        if let scrollToItem = scrollToItem {
+            self.transaction(deleteIndices: [], insertIndicesAndItems: [], updateIndicesAndItems: [], options: [.Synchronous], scrollToItem: scrollToItem, updateSizeAndInsets: nil, stationaryItemRange: nil, updateOpaqueState: nil, completion: { _ in })
+        }
+    }
+    
     public func updateLayout(transition: ContainedViewLayoutTransition, updateSizeAndInsets: ListViewUpdateSizeAndInsets) {
         self.transaction(deleteIndices: [], insertIndicesAndItems: [], updateIndicesAndItems: [], options: [.Synchronous, .LowLatency], scrollToItem: nil, updateSizeAndInsets: updateSizeAndInsets, stationaryItemRange: nil, updateOpaqueState: nil, completion: { _ in })
         
@@ -1524,9 +1603,9 @@ public final class ChatListNode: ListView {
         }
         
         let entryCount = chatListView.filteredEntries.count
-        var current: (ChatListIndex, PeerId, Int)? = nil
-        var previous: (ChatListIndex, PeerId)? = nil
-        var next: (ChatListIndex, PeerId)? = nil
+        var current: (ChatListIndex, Peer, Int)? = nil
+        var previous: (ChatListIndex, Peer)? = nil
+        var next: (ChatListIndex, Peer)? = nil
         
         outer: for i in range.firstIndex ..< range.lastIndex {
             if i < 0 || i >= entryCount {
@@ -1534,9 +1613,9 @@ public final class ChatListNode: ListView {
                 continue
             }
             switch chatListView.filteredEntries[entryCount - i - 1] {
-                case let .PeerEntry(index, _, _, _, _, _, peer, _, _, _, _, _, _, _, _):
+                case let .PeerEntry(index, _, _, _, _, _, peer, _, _, _, _, _, _, _, _, _):
                     if interaction.highlightedChatLocation?.location == ChatLocation.peer(peer.peerId) {
-                        current = (index, peer.peerId, entryCount - i - 1)
+                        current = (index, peer.peer!, entryCount - i - 1)
                         break outer
                     }
                 default:
@@ -1556,22 +1635,35 @@ public final class ChatListNode: ListView {
                 } else {
                     position = .later(than: nil)
                 }
-                let _ = (relativeUnreadChatListIndex(position: position) |> deliverOnMainQueue).start(next: { [weak self] index in
-                    guard let strongSelf = self, let index = index else {
+                let postbox = self.context.account.postbox
+                let _ = (relativeUnreadChatListIndex(position: position)
+                |> mapToSignal { index -> Signal<(ChatListIndex, Peer)?, NoError> in
+                    if let index = index {
+                        return postbox.transaction { transaction -> (ChatListIndex, Peer)? in
+                            return transaction.getPeer(index.messageIndex.id.peerId).flatMap { peer -> (ChatListIndex, Peer)? in
+                                (index, peer)
+                            }
+                        }
+                    } else {
+                        return .single(nil)
+                    }
+                }
+                |> deliverOnMainQueue).start(next: { [weak self] indexAndPeer in
+                    guard let strongSelf = self, let (index, peer) = indexAndPeer else {
                         return
                     }
                     let location: ChatListNodeLocation = .scroll(index: index, sourceIndex: strongSelf.currentlyVisibleLatestChatListIndex() ?? .absoluteUpperBound, scrollPosition: .center(.top), animated: true, filter: strongSelf.chatListFilter)
                     strongSelf.setChatListLocation(location)
-                    strongSelf.peerSelected?(index.messageIndex.id.peerId, false, false)
+                    strongSelf.peerSelected?(peer, false, false)
                 })
             case .previous(unread: false), .next(unread: false):
-                var target: (ChatListIndex, PeerId)? = nil
+                var target: (ChatListIndex, Peer)? = nil
                 if let current = current, entryCount > 1 {
-                    if current.2 > 0, case let .PeerEntry(index, _, _, _, _, _, peer, _, _, _, _, _, _, _, _) = chatListView.filteredEntries[current.2 - 1] {
-                        next = (index, peer.peerId)
+                    if current.2 > 0, case let .PeerEntry(index, _, _, _, _, _, peer, _, _, _, _, _, _, _, _, _) = chatListView.filteredEntries[current.2 - 1] {
+                        next = (index, peer.peer!)
                     }
-                    if current.2 <= entryCount - 2, case let .PeerEntry(index, _, _, _, _, _, peer, _, _, _, _, _, _, _, _) = chatListView.filteredEntries[current.2 + 1] {
-                        previous = (index, peer.peerId)
+                    if current.2 <= entryCount - 2, case let .PeerEntry(index, _, _, _, _, _, peer, _, _, _, _, _, _, _, _, _) = chatListView.filteredEntries[current.2 + 1] {
+                        previous = (index, peer.peer!)
                     }
                     if case .previous = option {
                         target = previous
@@ -1579,8 +1671,8 @@ public final class ChatListNode: ListView {
                         target = next
                     }
                 } else if entryCount > 0 {
-                    if case let .PeerEntry(index, _, _, _, _, _, peer, _, _, _, _, _, _, _, _) = chatListView.filteredEntries[entryCount - 1] {
-                        target = (index, peer.peerId)
+                    if case let .PeerEntry(index, _, _, _, _, _, peer, _, _, _, _, _, _, _, _, _) = chatListView.filteredEntries[entryCount - 1] {
+                        target = (index, peer.peer!)
                     }
                 }
                 if let target = target {
@@ -1589,7 +1681,15 @@ public final class ChatListNode: ListView {
                     self.peerSelected?(target.1, false, false)
                 }
             case let .peerId(peerId):
-                self.peerSelected?(peerId, false, false)
+                let _ = (self.context.account.postbox.transaction { transaction -> Peer? in
+                    return transaction.getPeer(peerId)
+                }
+                |> deliverOnMainQueue).start(next: { [weak self] peer in
+                    guard let strongSelf = self, let peer = peer else {
+                        return
+                    }
+                    strongSelf.peerSelected?(peer, false, false)
+                })
             case let .index(index):
                 guard index < 10 else {
                     return
@@ -1604,10 +1704,10 @@ public final class ChatListNode: ListView {
                     |> take(1)
                     |> deliverOnMainQueue).start(next: { update in
                         let entries = update.view.entries
-                        if entries.count > index, case let .MessageEntry(index, _, _, _, _, renderedPeer, _, _, _) = entries[10 - index - 1] {
+                        if entries.count > index, case let .MessageEntry(index, _, _, _, _, renderedPeer, _, _, _, _) = entries[10 - index - 1] {
                             let location: ChatListNodeLocation = .scroll(index: index, sourceIndex: .absoluteLowerBound, scrollPosition: .center(.top), animated: true, filter: filter)
                             self.setChatListLocation(location)
-                            self.peerSelected?(renderedPeer.peerId, false, false)
+                            self.peerSelected?(renderedPeer.peer!, false, false)
                         }
                     })
                 })
@@ -1647,7 +1747,7 @@ public final class ChatListNode: ListView {
                     continue
                 }
                 switch chatListView.filteredEntries[entryCount - i - 1] {
-                    case let .PeerEntry(index, _, _, _, _, _, _, _, _, _, _, _, _, _, _):
+                    case let .PeerEntry(index, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _):
                         return index
                     default:
                         break
@@ -1657,3 +1757,31 @@ public final class ChatListNode: ListView {
         return nil
     }
 }
+
+//TODO:localize
+private func statusStringForPeerType(strings: PresentationStrings, peer: Peer, isContact: Bool) -> String {
+    if let user = peer as? TelegramUser {
+        if user.botInfo != nil || user.flags.contains(.isSupport) {
+            return "bot"
+        } else if isContact {
+            return "contact"
+        } else {
+            return "user"
+        }
+    } else if peer is TelegramSecretChat {
+        if isContact {
+            return "contact"
+        } else {
+            return "user"
+        }
+    } else if peer is TelegramGroup {
+        return "group"
+    } else if let channel = peer as? TelegramChannel {
+        if case .group = channel.info {
+            return "group"
+        } else {
+            return "channel"
+        }
+    }
+    return "user"
+}
diff --git a/submodules/ChatListUI/Sources/Node/ChatListNodeEntries.swift b/submodules/ChatListUI/Sources/Node/ChatListNodeEntries.swift
index 2da2b52acf..cb0eca58a3 100644
--- a/submodules/ChatListUI/Sources/Node/ChatListNodeEntries.swift
+++ b/submodules/ChatListUI/Sources/Node/ChatListNodeEntries.swift
@@ -1,4 +1,5 @@
 import Foundation
+import UIKit
 import Postbox
 import TelegramCore
 import SyncCore
@@ -11,27 +12,55 @@ enum ChatListNodeEntryId: Hashable {
     case PeerId(Int64)
     case GroupId(PeerGroupId)
     case ArchiveIntro
+    case additionalCategory(Int)
+}
+
+enum ChatListNodeEntrySortIndex: Comparable {
+    case index(ChatListIndex)
+    case additionalCategory(Int)
+    
+    static func <(lhs: ChatListNodeEntrySortIndex, rhs: ChatListNodeEntrySortIndex) -> Bool {
+        switch lhs {
+        case let .index(lhsIndex):
+            switch rhs {
+            case let .index(rhsIndex):
+                return lhsIndex < rhsIndex
+            case .additionalCategory:
+                return false
+            }
+        case let .additionalCategory(lhsIndex):
+            switch rhs {
+            case let .additionalCategory(rhsIndex):
+                return lhsIndex < rhsIndex
+            case .index:
+                return true
+            }
+        }
+    }
 }
 
 enum ChatListNodeEntry: Comparable, Identifiable {
     case HeaderEntry
-    case PeerEntry(index: ChatListIndex, presentationData: ChatListPresentationData, message: Message?, readState: CombinedPeerReadState?, notificationSettings: PeerNotificationSettings?, embeddedInterfaceState: PeerChatListEmbeddedInterfaceState?, peer: RenderedPeer, presence: PeerPresence?, summaryInfo: ChatListMessageTagSummaryInfo, editing: Bool, hasActiveRevealControls: Bool, selected: Bool, inputActivities: [(Peer, PeerInputActivity)]?, isAd: Bool, hasFailedMessages: Bool)
+    case PeerEntry(index: ChatListIndex, presentationData: ChatListPresentationData, message: Message?, readState: CombinedPeerReadState?, notificationSettings: PeerNotificationSettings?, embeddedInterfaceState: PeerChatListEmbeddedInterfaceState?, peer: RenderedPeer, presence: PeerPresence?, summaryInfo: ChatListMessageTagSummaryInfo, editing: Bool, hasActiveRevealControls: Bool, selected: Bool, inputActivities: [(Peer, PeerInputActivity)]?, isAd: Bool, hasFailedMessages: Bool, isContact: Bool)
     case HoleEntry(ChatListHole, theme: PresentationTheme)
     case GroupReferenceEntry(index: ChatListIndex, presentationData: ChatListPresentationData, groupId: PeerGroupId, peers: [ChatListGroupReferencePeer], message: Message?, editing: Bool, unreadState: PeerGroupUnreadCountersCombinedSummary, revealed: Bool, hiddenByDefault: Bool)
     case ArchiveIntro(presentationData: ChatListPresentationData)
+    case AdditionalCategory(index: Int, id: Int, title: String, image: UIImage?, selected: Bool, presentationData: ChatListPresentationData)
     
-    var sortIndex: ChatListIndex {
+    var sortIndex: ChatListNodeEntrySortIndex {
         switch self {
         case .HeaderEntry:
-            return ChatListIndex.absoluteUpperBound
-        case let .PeerEntry(index, _, _, _, _, _, _, _, _, _, _, _, _, _, _):
-            return index
+            return .index(ChatListIndex.absoluteUpperBound)
+        case let .PeerEntry(index, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _):
+            return .index(index)
         case let .HoleEntry(hole, _):
-            return ChatListIndex(pinningIndex: nil, messageIndex: hole.index)
+            return .index(ChatListIndex(pinningIndex: nil, messageIndex: hole.index))
         case let .GroupReferenceEntry(index, _, _, _, _, _, _, _, _):
-            return index
+            return .index(index)
         case .ArchiveIntro:
-            return ChatListIndex.absoluteUpperBound.successor
+            return .index(ChatListIndex.absoluteUpperBound.successor)
+        case let .AdditionalCategory(additionalCategory):
+            return .additionalCategory(additionalCategory.index)
         }
     }
     
@@ -39,7 +68,7 @@ enum ChatListNodeEntry: Comparable, Identifiable {
         switch self {
         case .HeaderEntry:
             return .Header
-        case let .PeerEntry(index, _, _, _, _, _, _, _, _, _, _, _, _, _, _):
+        case let .PeerEntry(index, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _):
             return .PeerId(index.messageIndex.id.peerId.toInt64())
         case let .HoleEntry(hole, _):
             return .Hole(Int64(hole.index.id.id))
@@ -47,6 +76,8 @@ enum ChatListNodeEntry: Comparable, Identifiable {
             return .GroupId(groupId)
         case .ArchiveIntro:
             return .ArchiveIntro
+        case let .AdditionalCategory(additionalCategory):
+            return .additionalCategory(additionalCategory.id)
         }
     }
     
@@ -62,9 +93,9 @@ enum ChatListNodeEntry: Comparable, Identifiable {
                 } else {
                     return false
                 }
-            case let .PeerEntry(lhsIndex, lhsPresentationData, lhsMessage, lhsUnreadCount, lhsNotificationSettings, lhsEmbeddedState, lhsPeer, lhsPresence, lhsSummaryInfo, lhsEditing, lhsHasRevealControls, lhsSelected, lhsInputActivities, lhsAd, lhsHasFailedMessages):
+            case let .PeerEntry(lhsIndex, lhsPresentationData, lhsMessage, lhsUnreadCount, lhsNotificationSettings, lhsEmbeddedState, lhsPeer, lhsPresence, lhsSummaryInfo, lhsEditing, lhsHasRevealControls, lhsSelected, lhsInputActivities, lhsAd, lhsHasFailedMessages, lhsIsContact):
                 switch rhs {
-                    case let .PeerEntry(rhsIndex, rhsPresentationData, rhsMessage, rhsUnreadCount, rhsNotificationSettings, rhsEmbeddedState, rhsPeer, rhsPresence, rhsSummaryInfo, rhsEditing, rhsHasRevealControls, rhsSelected, rhsInputActivities, rhsAd, rhsHasFailedMessages):
+                    case let .PeerEntry(rhsIndex, rhsPresentationData, rhsMessage, rhsUnreadCount, rhsNotificationSettings, rhsEmbeddedState, rhsPeer, rhsPresence, rhsSummaryInfo, rhsEditing, rhsHasRevealControls, rhsSelected, rhsInputActivities, rhsAd, rhsHasFailedMessages, rhsIsContact):
                         if lhsIndex != rhsIndex {
                             return false
                         }
@@ -148,6 +179,9 @@ enum ChatListNodeEntry: Comparable, Identifiable {
                         if lhsHasFailedMessages != rhsHasFailedMessages {
                             return false
                         }
+                        if lhsIsContact != rhsIsContact {
+                            return false
+                        }
                         return true
                     default:
                         return false
@@ -201,6 +235,30 @@ enum ChatListNodeEntry: Comparable, Identifiable {
                 } else {
                     return false
                 }
+            case let .AdditionalCategory(lhsIndex, lhsId, lhsTitle, lhsImage, lhsSelected, lhsPresentationData):
+                if case let .AdditionalCategory(rhsIndex, rhsId, rhsTitle, rhsImage, rhsSelected, rhsPresentationData) = rhs {
+                    if lhsIndex != rhsIndex {
+                        return false
+                    }
+                    if lhsId != rhsId {
+                        return false
+                    }
+                    if lhsTitle != rhsTitle {
+                        return false
+                    }
+                    if lhsImage !== rhsImage {
+                        return false
+                    }
+                    if lhsSelected != rhsSelected {
+                        return false
+                    }
+                    if lhsPresentationData !== rhsPresentationData {
+                        return false
+                    }
+                    return true
+                } else {
+                    return false
+                }
         }
     }
 }
@@ -220,7 +278,7 @@ func chatListNodeEntriesForView(_ view: ChatListView, state: ChatListNodeState,
     
     if view.laterIndex == nil, case .chatList = mode {
         var groupEntryCount = 0
-        for groupReference in view.groupEntries {
+        for _ in view.groupEntries {
             groupEntryCount += 1
         }
         pinnedIndexOffset += UInt16(groupEntryCount)
@@ -231,7 +289,7 @@ func chatListNodeEntriesForView(_ view: ChatListView, state: ChatListNodeState,
     }
     loop: for entry in view.entries {
         switch entry {
-            case let .MessageEntry(index, message, combinedReadState, notificationSettings, embeddedState, peer, peerPresence, summaryInfo, hasFailed):
+            case let .MessageEntry(index, message, combinedReadState, notificationSettings, embeddedState, peer, peerPresence, summaryInfo, hasFailed, isContact):
                 if let savedMessagesPeer = savedMessagesPeer, savedMessagesPeer.id == index.messageIndex.id.peerId {
                     continue loop
                 }
@@ -244,10 +302,10 @@ func chatListNodeEntriesForView(_ view: ChatListView, state: ChatListNodeState,
                     updatedMessage = nil
                     updatedCombinedReadState = nil
                 }
-                result.append(.PeerEntry(index: offsetPinnedIndex(index, offset: pinnedIndexOffset), presentationData: state.presentationData, message: updatedMessage, readState: updatedCombinedReadState, notificationSettings: notificationSettings, embeddedInterfaceState: embeddedState, peer: peer, presence: peerPresence, summaryInfo: summaryInfo, editing: state.editing, hasActiveRevealControls: index.messageIndex.id.peerId == state.peerIdWithRevealedOptions, selected: state.selectedPeerIds.contains(index.messageIndex.id.peerId), inputActivities: state.peerInputActivities?.activities[index.messageIndex.id.peerId], isAd: false, hasFailedMessages: hasFailed))
+                result.append(.PeerEntry(index: offsetPinnedIndex(index, offset: pinnedIndexOffset), presentationData: state.presentationData, message: updatedMessage, readState: updatedCombinedReadState, notificationSettings: notificationSettings, embeddedInterfaceState: embeddedState, peer: peer, presence: peerPresence, summaryInfo: summaryInfo, editing: state.editing, hasActiveRevealControls: index.messageIndex.id.peerId == state.peerIdWithRevealedOptions, selected: state.selectedPeerIds.contains(index.messageIndex.id.peerId), inputActivities: state.peerInputActivities?.activities[index.messageIndex.id.peerId], isAd: false, hasFailedMessages: hasFailed, isContact: isContact))
             case let .HoleEntry(hole):
                 if hole.index.timestamp == Int32.max - 1 {
-                    return ([], true)
+                    return ([.HeaderEntry], true)
                 }
                 result.append(.HoleEntry(hole, theme: state.presentationData.theme))
         }
@@ -256,13 +314,13 @@ func chatListNodeEntriesForView(_ view: ChatListView, state: ChatListNodeState,
         var pinningIndex: UInt16 = UInt16(pinnedIndexOffset == 0 ? 0 : (pinnedIndexOffset - 1))
         
         if let savedMessagesPeer = savedMessagesPeer {
-            result.append(.PeerEntry(index: ChatListIndex.absoluteUpperBound.predecessor, presentationData: state.presentationData, message: nil, readState: nil, notificationSettings: nil, embeddedInterfaceState: nil, peer: RenderedPeer(peerId: savedMessagesPeer.id, peers: SimpleDictionary([savedMessagesPeer.id: savedMessagesPeer])), presence: nil, summaryInfo: ChatListMessageTagSummaryInfo(), editing: state.editing, hasActiveRevealControls: false, selected: false, inputActivities: nil, isAd: false, hasFailedMessages: false))
+            result.append(.PeerEntry(index: ChatListIndex.absoluteUpperBound.predecessor, presentationData: state.presentationData, message: nil, readState: nil, notificationSettings: nil, embeddedInterfaceState: nil, peer: RenderedPeer(peerId: savedMessagesPeer.id, peers: SimpleDictionary([savedMessagesPeer.id: savedMessagesPeer])), presence: nil, summaryInfo: ChatListMessageTagSummaryInfo(), editing: state.editing, hasActiveRevealControls: false, selected: false, inputActivities: nil, isAd: false, hasFailedMessages: false, isContact: false))
         } else {
             if !view.additionalItemEntries.isEmpty {
                 for entry in view.additionalItemEntries.reversed() {
                     switch entry {
-                        case let .MessageEntry(index, message, combinedReadState, notificationSettings, embeddedState, peer, peerPresence, summaryInfo, hasFailed):
-                            result.append(.PeerEntry(index: ChatListIndex(pinningIndex: pinningIndex, messageIndex: index.messageIndex), presentationData: state.presentationData, message: message, readState: combinedReadState, notificationSettings: notificationSettings, embeddedInterfaceState: embeddedState, peer: peer, presence: peerPresence, summaryInfo: summaryInfo, editing: state.editing, hasActiveRevealControls: index.messageIndex.id.peerId == state.peerIdWithRevealedOptions, selected: state.selectedPeerIds.contains(index.messageIndex.id.peerId), inputActivities: state.peerInputActivities?.activities[index.messageIndex.id.peerId], isAd: true, hasFailedMessages: hasFailed))
+                        case let .MessageEntry(index, message, combinedReadState, notificationSettings, embeddedState, peer, peerPresence, summaryInfo, hasFailed, isContact):
+                            result.append(.PeerEntry(index: ChatListIndex(pinningIndex: pinningIndex, messageIndex: index.messageIndex), presentationData: state.presentationData, message: message, readState: combinedReadState, notificationSettings: notificationSettings, embeddedInterfaceState: embeddedState, peer: peer, presence: peerPresence, summaryInfo: summaryInfo, editing: state.editing, hasActiveRevealControls: index.messageIndex.id.peerId == state.peerIdWithRevealedOptions, selected: state.selectedPeerIds.contains(index.messageIndex.id.peerId), inputActivities: state.peerInputActivities?.activities[index.messageIndex.id.peerId], isAd: true, hasFailedMessages: hasFailed, isContact: isContact))
                             if pinningIndex != 0 {
                                 pinningIndex -= 1
                             }
@@ -288,12 +346,20 @@ func chatListNodeEntriesForView(_ view: ChatListView, state: ChatListNodeState,
             
             result.append(.HeaderEntry)
         }
+        
+        if view.laterIndex == nil, case let .peers(_, _, additionalCategories) = mode {
+            var index = 0
+            for category in additionalCategories.reversed(){
+                result.append(.AdditionalCategory(index: index, id: category.id, title: category.title, image: category.icon, selected: state.selectedAdditionalCategoryIds.contains(category.id), presentationData: state.presentationData))
+                index += 1
+            }
+        }
     }
 
     if result.count >= 1, case .HoleEntry = result[result.count - 1] {
-        return ([], true)
+        return ([.HeaderEntry], true)
     } else if result.count == 1, case .HoleEntry = result[0] {
-        return ([], true)
+        return ([.HeaderEntry], true)
     }
     return (result, false)
 }
diff --git a/submodules/ChatListUI/Sources/Node/ChatListNodeLocation.swift b/submodules/ChatListUI/Sources/Node/ChatListNodeLocation.swift
index 802010adb0..a5ac5daeae 100644
--- a/submodules/ChatListUI/Sources/Node/ChatListNodeLocation.swift
+++ b/submodules/ChatListUI/Sources/Node/ChatListNodeLocation.swift
@@ -29,9 +29,14 @@ struct ChatListNodeViewUpdate {
     let scrollPosition: ChatListNodeViewScrollPosition?
 }
 
-func chatListFilterPredicate(filter: ChatListFilter) -> ChatListFilterPredicate {
+func chatListFilterPredicate(filter: ChatListFilterData) -> ChatListFilterPredicate {
     let includePeers = Set(filter.includePeers)
-    return ChatListFilterPredicate(includePeerIds: includePeers, include: { peer, notificationSettings, isUnread in
+    let excludePeers = Set(filter.excludePeers)
+    var includeAdditionalPeerGroupIds: [PeerGroupId] = []
+    if !filter.excludeArchived {
+        includeAdditionalPeerGroupIds.append(Namespaces.PeerGroup.archive)
+    }
+    return ChatListFilterPredicate(includePeerIds: includePeers, excludePeerIds: excludePeers, includeAdditionalPeerGroupIds: includeAdditionalPeerGroupIds, include: { peer, notificationSettings, isUnread, isContact in
         if filter.excludeRead {
             if !isUnread {
                 return false
@@ -46,15 +51,21 @@ func chatListFilterPredicate(filter: ChatListFilter) -> ChatListFilterPredicate
                 return false
             }
         }
-        if !filter.categories.contains(.privateChats) {
+        if !filter.categories.contains(.contacts) && isContact {
             if let user = peer as? TelegramUser {
                 if user.botInfo == nil {
                     return false
                 }
+            } else if let _ = peer as? TelegramSecretChat {
+                return false
             }
         }
-        if !filter.categories.contains(.secretChats) {
-            if let _ = peer as? TelegramSecretChat {
+        if !filter.categories.contains(.nonContacts) && !isContact {
+            if let user = peer as? TelegramUser {
+                if user.botInfo == nil {
+                    return false
+                }
+            } else if let _ = peer as? TelegramSecretChat {
                 return false
             }
         }
@@ -65,23 +76,12 @@ func chatListFilterPredicate(filter: ChatListFilter) -> ChatListFilterPredicate
                 }
             }
         }
-        if !filter.categories.contains(.privateGroups) {
+        if !filter.categories.contains(.groups) {
             if let _ = peer as? TelegramGroup {
                 return false
             } else if let channel = peer as? TelegramChannel {
                 if case .group = channel.info {
-                    if channel.username == nil {
-                        return false
-                    }
-                }
-            }
-        }
-        if !filter.categories.contains(.publicGroups) {
-            if let channel = peer as? TelegramChannel {
-                if case .group = channel.info {
-                    if channel.username != nil {
-                        return false
-                    }
+                    return false
                 }
             }
         }
@@ -97,7 +97,7 @@ func chatListFilterPredicate(filter: ChatListFilter) -> ChatListFilterPredicate
 }
 
 func chatListViewForLocation(groupId: PeerGroupId, location: ChatListNodeLocation, account: Account) -> Signal<ChatListNodeViewUpdate, NoError> {
-    let filterPredicate: ChatListFilterPredicate? = location.filter.flatMap(chatListFilterPredicate)
+    let filterPredicate: ChatListFilterPredicate? = (location.filter?.data).flatMap(chatListFilterPredicate)
     
     switch location {
         case let .initial(count, _):
diff --git a/submodules/ChatListUI/Sources/Node/ChatListViewTransition.swift b/submodules/ChatListUI/Sources/Node/ChatListViewTransition.swift
index ae320a81e9..ce0208db95 100644
--- a/submodules/ChatListUI/Sources/Node/ChatListViewTransition.swift
+++ b/submodules/ChatListUI/Sources/Node/ChatListViewTransition.swift
@@ -45,6 +45,7 @@ struct ChatListNodeViewTransition {
     let scrollToItem: ListViewScrollToItem?
     let stationaryItemRange: (Int, Int)?
     let adjustScrollToFirstItem: Bool
+    let animateCrossfade: Bool
 }
 
 enum ChatListNodeViewScrollPosition {
@@ -71,7 +72,6 @@ func preparedChatListNodeViewTransition(from fromView: ChatListNodeView?, to toV
         
         var options: ListViewDeleteAndInsertOptions = []
         var maxAnimatedInsertionIndex = -1
-        var stationaryItemRange: (Int, Int)?
         var scrollToItem: ListViewScrollToItem?
         
         switch reason {
@@ -89,8 +89,8 @@ func preparedChatListNodeViewTransition(from fromView: ChatListNodeView?, to toV
                 var minTimestamp: Int32?
                 var maxTimestamp: Int32?
                 for (_, item, _) in indicesAndItems {
-                    if case .PeerEntry = item, item.sortIndex.pinningIndex == nil {
-                        let timestamp = item.sortIndex.messageIndex.timestamp
+                    if case .PeerEntry = item, case let .index(index) = item.sortIndex, index.pinningIndex == nil {
+                        let timestamp = index.messageIndex.timestamp
                         
                         if minTimestamp == nil || timestamp < minTimestamp! {
                             minTimestamp = timestamp
@@ -146,7 +146,7 @@ func preparedChatListNodeViewTransition(from fromView: ChatListNodeView?, to toV
                 case let .index(scrollIndex, position, directionHint, animated):
                     var index = toView.filteredEntries.count - 1
                     for entry in toView.filteredEntries {
-                        if entry.sortIndex >= scrollIndex {
+                        if entry.sortIndex >= .index(scrollIndex) {
                             scrollToItem = ListViewScrollToItem(index: index, position: position, animated: animated, curve: .Default(duration: nil), directionHint: directionHint)
                             break
                         }
@@ -156,7 +156,7 @@ func preparedChatListNodeViewTransition(from fromView: ChatListNodeView?, to toV
                     if scrollToItem == nil {
                         var index = 0
                         for entry in toView.filteredEntries.reversed() {
-                            if entry.sortIndex < scrollIndex {
+                            if entry.sortIndex < .index(scrollIndex) {
                                 scrollToItem = ListViewScrollToItem(index: index, position: position, animated: animated, curve: .Default(duration: nil), directionHint: directionHint)
                                 break
                             }
@@ -167,8 +167,27 @@ func preparedChatListNodeViewTransition(from fromView: ChatListNodeView?, to toV
         }
         
         var fromEmptyView = false
+        var animateCrossfade = false
         if let fromView = fromView {
-            if fromView.filteredEntries.isEmpty || fromView.filter != toView.filter {
+            var wasSingleHeader = false
+            if fromView.filteredEntries.count == 1, case .HeaderEntry = fromView.filteredEntries[0] {
+                wasSingleHeader = true
+            }
+            var isSingleHeader = false
+            if toView.filteredEntries.count == 1, case .HeaderEntry = toView.filteredEntries[0] {
+                isSingleHeader = true
+            }
+            if (wasSingleHeader || isSingleHeader), case .interactiveChanges = reason {
+                if wasSingleHeader != isSingleHeader {
+                    if wasSingleHeader {
+                        animateCrossfade = true
+                        options.remove(.AnimateInsertion)
+                        options.remove(.AnimateAlpha)
+                    } else {
+                        let _ = options.insert(.AnimateInsertion)
+                    }
+                }
+            } else if fromView.filteredEntries.isEmpty || fromView.filter != toView.filter {
                 options.remove(.AnimateInsertion)
                 options.remove(.AnimateAlpha)
                 fromEmptyView = true
@@ -182,7 +201,7 @@ func preparedChatListNodeViewTransition(from fromView: ChatListNodeView?, to toV
             adjustScrollToFirstItem = true
         }
         
-        subscriber.putNext(ChatListNodeViewTransition(chatListView: toView, deleteItems: adjustedDeleteIndices, insertEntries: adjustedIndicesAndItems, updateEntries: adjustedUpdateItems, options: options, scrollToItem: scrollToItem, stationaryItemRange: stationaryItemRange, adjustScrollToFirstItem: adjustScrollToFirstItem))
+        subscriber.putNext(ChatListNodeViewTransition(chatListView: toView, deleteItems: adjustedDeleteIndices, insertEntries: adjustedIndicesAndItems, updateEntries: adjustedUpdateItems, options: options, scrollToItem: scrollToItem, stationaryItemRange: nil, adjustScrollToFirstItem: adjustScrollToFirstItem, animateCrossfade: animateCrossfade))
         subscriber.putCompletion()
         
         return EmptyDisposable
diff --git a/submodules/ChatListUI/Sources/TabBarChatListFilterController.swift b/submodules/ChatListUI/Sources/TabBarChatListFilterController.swift
index c02d9656b6..2af6a41583 100644
--- a/submodules/ChatListUI/Sources/TabBarChatListFilterController.swift
+++ b/submodules/ChatListUI/Sources/TabBarChatListFilterController.swift
@@ -10,317 +10,15 @@ import Postbox
 import TelegramUIPreferences
 import TelegramCore
 
-final class TabBarChatListFilterController: ViewController {
-    private var controllerNode: TabBarChatListFilterControllerNode {
-        return self.displayNode as! TabBarChatListFilterControllerNode
-    }
-    
-    private let _ready = Promise<Bool>()
-    override public var ready: Promise<Bool> {
-        return self._ready
-    }
-    
-    private let context: AccountContext
-    private let sourceNodes: [ASDisplayNode]
-    private let presetList: [ChatListFilter]
-    private let currentPreset: ChatListFilter?
-    private let setup: () -> Void
-    private let updatePreset: (ChatListFilter?) -> Void
-    
-    private var presentationData: PresentationData
-    private var didPlayPresentationAnimation = false
-    
-    private let hapticFeedback = HapticFeedback()
-    
-    public init(context: AccountContext, sourceNodes: [ASDisplayNode], presetList: [ChatListFilter], currentPreset: ChatListFilter?, setup: @escaping () -> Void, updatePreset: @escaping (ChatListFilter?) -> Void) {
-        self.context = context
-        self.sourceNodes = sourceNodes
-        self.presetList = presetList
-        self.currentPreset = currentPreset
-        self.setup = setup
-        self.updatePreset = updatePreset
-        
-        self.presentationData = context.sharedContext.currentPresentationData.with { $0 }
-        
-        super.init(navigationBarPresentationData: nil)
-        
-        self.statusBar.statusBarStyle = .Ignore
-        self.statusBar.ignoreInCall = true
-        
-        self.lockOrientation = true
-    }
-    
-    required public init(coder aDecoder: NSCoder) {
-        fatalError("init(coder:) has not been implemented")
-    }
-    
-    deinit {
-    }
-    
-    override public func loadDisplayNode() {
-        self.displayNode = TabBarChatListFilterControllerNode(context: self.context, presentationData: self.presentationData, cancel: { [weak self] in
-            self?.dismiss()
-        }, sourceNodes: self.sourceNodes, presetList: self.presetList, currentPreset: self.currentPreset, setup: { [weak self] in
-            self?.setup()
-            self?.dismiss(sourceNodes: [], fadeOutIcon: true)
-        }, updatePreset: { [weak self] filter in
-            self?.updatePreset(filter)
-            self?.dismiss()
-        })
-        self._ready.set(self.controllerNode.isReady.get())
-        self.displayNodeDidLoad()
-    }
-    
-    override public func viewDidAppear(_ animated: Bool) {
-        super.viewDidAppear(animated)
-        
-        if !self.didPlayPresentationAnimation {
-            self.didPlayPresentationAnimation = true
-            
-            self.hapticFeedback.impact()
-            self.controllerNode.animateIn()
-        }
-    }
-    
-    override public func containerLayoutUpdated(_ layout: ContainerViewLayout, transition: ContainedViewLayoutTransition) {
-        super.containerLayoutUpdated(layout, transition: transition)
-        
-        self.controllerNode.containerLayoutUpdated(layout, transition: transition)
-    }
-    
-    override public func dismiss(completion: (() -> Void)? = nil) {
-        self.dismiss(sourceNodes: [], fadeOutIcon: false)
-    }
-    
-    func dismiss(sourceNodes: [ASDisplayNode], fadeOutIcon: Bool) {
-        self.controllerNode.animateOut(sourceNodes: sourceNodes, fadeOutIcon: fadeOutIcon, completion: { [weak self] in
-            self?.didPlayPresentationAnimation = false
-            self?.presentingViewController?.dismiss(animated: false, completion: nil)
-        })
-    }
-}
-
-private let animationDurationFactor: Double = 1.0
-
-private protocol AbstractTabBarChatListFilterItemNode {
-    func updateLayout(maxWidth: CGFloat) -> (CGFloat, CGFloat, (CGFloat) -> Void)
-}
-
-private final class AddFilterItemNode: ASDisplayNode, AbstractTabBarChatListFilterItemNode {
-    private let action: () -> Void
-    
-    private let separatorNode: ASDisplayNode
-    private let highlightedBackgroundNode: ASDisplayNode
-    private let buttonNode: HighlightTrackingButtonNode
-    private let plusNode: ASImageNode
-    private let titleNode: ImmediateTextNode
-    
-    init(displaySeparator: Bool, presentationData: PresentationData, action: @escaping () -> Void) {
-        self.action = action
-        
-        self.separatorNode = ASDisplayNode()
-        self.separatorNode.backgroundColor = presentationData.theme.actionSheet.opaqueItemSeparatorColor
-        self.separatorNode.isHidden = !displaySeparator
-        
-        self.highlightedBackgroundNode = ASDisplayNode()
-        self.highlightedBackgroundNode.backgroundColor = presentationData.theme.actionSheet.opaqueItemHighlightedBackgroundColor
-        self.highlightedBackgroundNode.alpha = 0.0
-        
-        self.buttonNode = HighlightTrackingButtonNode()
-        
-        self.titleNode = ImmediateTextNode()
-        self.titleNode.maximumNumberOfLines = 1
-        self.titleNode.attributedText = NSAttributedString(string: "Setup", font: Font.regular(17.0), textColor: presentationData.theme.actionSheet.primaryTextColor)
-        
-        self.plusNode = ASImageNode()
-        self.plusNode.image = generateItemListPlusIcon(presentationData.theme.actionSheet.primaryTextColor)
-        
-        super.init()
-        
-        self.addSubnode(self.separatorNode)
-        self.addSubnode(self.highlightedBackgroundNode)
-        self.addSubnode(self.titleNode)
-        self.addSubnode(self.plusNode)
-        self.addSubnode(self.buttonNode)
-        
-        self.buttonNode.addTarget(self, action: #selector(self.buttonPressed), forControlEvents: .touchUpInside)
-        self.buttonNode.highligthedChanged = { [weak self] highlighted in
-            if let strongSelf = self {
-                if highlighted {
-                    strongSelf.highlightedBackgroundNode.layer.removeAnimation(forKey: "opacity")
-                    strongSelf.highlightedBackgroundNode.alpha = 1.0
-                } else {
-                    strongSelf.highlightedBackgroundNode.alpha = 0.0
-                    strongSelf.highlightedBackgroundNode.layer.animateAlpha(from: 1.0, to: 0.0, duration: 0.3)
-                }
-            }
-        }
-    }
-    
-    func updateLayout(maxWidth: CGFloat) -> (CGFloat, CGFloat, (CGFloat) -> Void) {
-        let leftInset: CGFloat = 16.0
-        let rightInset: CGFloat = 10.0
-        let iconInset: CGFloat = 60.0
-        let titleSize = self.titleNode.updateLayout(CGSize(width: maxWidth - leftInset - rightInset, height: .greatestFiniteMagnitude))
-        let height: CGFloat = 61.0
-        
-        return (titleSize.width + leftInset + rightInset, height, { width in
-            self.titleNode.frame = CGRect(origin: CGPoint(x: leftInset, y: floor((height - titleSize.height) / 2.0)), size: titleSize)
-            
-            if let image = self.plusNode.image {
-                self.plusNode.frame = CGRect(origin: CGPoint(x: floor(width - iconInset + (iconInset - image.size.width) / 2.0), y: floor((height - image.size.height) / 2.0)), size: image.size)
-            }
-            
-            self.separatorNode.frame = CGRect(origin: CGPoint(x: 0.0, y: height - UIScreenPixel), size: CGSize(width: width, height: UIScreenPixel))
-            self.highlightedBackgroundNode.frame = CGRect(origin: CGPoint(x: 0.0, y: 0.0), size: CGSize(width: width, height: height))
-            self.buttonNode.frame = CGRect(origin: CGPoint(x: 0.0, y: 0.0), size: CGSize(width: width, height: height))
-        })
-    }
-    
-    @objc private func buttonPressed() {
-        self.action()
-    }
-}
-
-private final class FilterItemNode: ASDisplayNode, AbstractTabBarChatListFilterItemNode {
-    private let context: AccountContext
-    private let title: String
-    let preset: ChatListFilter?
-    private let isCurrent: Bool
-    private let presentationData: PresentationData
-    private let action: () -> Bool
-    
-    private let separatorNode: ASDisplayNode
-    private let highlightedBackgroundNode: ASDisplayNode
-    private let buttonNode: HighlightTrackingButtonNode
-    private let titleNode: ImmediateTextNode
-    private let checkNode: ASImageNode
-    
-    private let badgeBackgroundNode: ASImageNode
-    private let badgeTitleNode: ImmediateTextNode
-    private var badgeText: String = ""
-    
-    init(context: AccountContext, title: String, preset: ChatListFilter?, isCurrent: Bool, displaySeparator: Bool, presentationData: PresentationData, action: @escaping () -> Bool) {
-        self.context = context
-        self.title = title
-        self.preset = preset
-        self.isCurrent = isCurrent
-        self.presentationData = presentationData
-        self.action = action
-        
-        self.separatorNode = ASDisplayNode()
-        self.separatorNode.backgroundColor = presentationData.theme.actionSheet.opaqueItemSeparatorColor
-        self.separatorNode.isHidden = !displaySeparator
-        
-        self.highlightedBackgroundNode = ASDisplayNode()
-        self.highlightedBackgroundNode.backgroundColor = presentationData.theme.actionSheet.opaqueItemHighlightedBackgroundColor
-        self.highlightedBackgroundNode.alpha = 0.0
-        
-        self.buttonNode = HighlightTrackingButtonNode()
-        
-        self.titleNode = ImmediateTextNode()
-        self.titleNode.maximumNumberOfLines = 1
-        self.titleNode.attributedText = NSAttributedString(string: title, font: Font.regular(17.0), textColor: presentationData.theme.actionSheet.primaryTextColor)
-        
-        self.checkNode = ASImageNode()
-        self.checkNode.image = generateItemListCheckIcon(color: presentationData.theme.actionSheet.primaryTextColor)
-        self.checkNode.isHidden = true//!isCurrent
-        
-        self.badgeBackgroundNode = ASImageNode()
-        self.badgeBackgroundNode.image = generateStretchableFilledCircleImage(diameter: 20.0, color: presentationData.theme.list.itemCheckColors.fillColor)
-        self.badgeTitleNode = ImmediateTextNode()
-        self.badgeBackgroundNode.isHidden = true
-        self.badgeTitleNode.isHidden = true
-        
-        super.init()
-        
-        self.addSubnode(self.separatorNode)
-        self.addSubnode(self.highlightedBackgroundNode)
-        self.addSubnode(self.titleNode)
-        self.addSubnode(self.checkNode)
-        self.addSubnode(self.badgeBackgroundNode)
-        self.addSubnode(self.badgeTitleNode)
-        self.addSubnode(self.buttonNode)
-        
-        self.buttonNode.addTarget(self, action: #selector(self.buttonPressed), forControlEvents: .touchUpInside)
-        self.buttonNode.highligthedChanged = { [weak self] highlighted in
-            if let strongSelf = self {
-                if highlighted {
-                    strongSelf.highlightedBackgroundNode.layer.removeAnimation(forKey: "opacity")
-                    strongSelf.highlightedBackgroundNode.alpha = 1.0
-                } else {
-                    strongSelf.highlightedBackgroundNode.alpha = 0.0
-                    strongSelf.highlightedBackgroundNode.layer.animateAlpha(from: 1.0, to: 0.0, duration: 0.3)
-                }
-            }
-        }
-    }
-    
-    func updateLayout(maxWidth: CGFloat) -> (CGFloat, CGFloat, (CGFloat) -> Void) {
-        let leftInset: CGFloat = 16.0
-        
-        let badgeTitleSize = self.badgeTitleNode.updateLayout(CGSize(width: 100.0, height: .greatestFiniteMagnitude))
-        let badgeMinSize = self.badgeBackgroundNode.image?.size.width ?? 20.0
-        let badgeSize = CGSize(width: max(badgeMinSize, badgeTitleSize.width + 12.0), height: badgeMinSize)
-        
-        let rightInset: CGFloat = max(20.0, badgeSize.width + 20.0)
-        
-        let titleSize = self.titleNode.updateLayout(CGSize(width: maxWidth - leftInset - rightInset, height: .greatestFiniteMagnitude))
-        
-        let height: CGFloat = 61.0
-        
-        return (titleSize.width + leftInset + rightInset, height, { width in
-            self.titleNode.frame = CGRect(origin: CGPoint(x: leftInset, y: floor((height - titleSize.height) / 2.0)), size: titleSize)
-            
-            if let image = self.checkNode.image {
-                self.checkNode.frame = CGRect(origin: CGPoint(x: width - rightInset + floor((rightInset - image.size.width) / 2.0), y: floor((height - image.size.height) / 2.0)), size: image.size)
-            }
-            
-            let badgeBackgroundFrame = CGRect(origin: CGPoint(x: width - rightInset + floor((rightInset - badgeSize.width) / 2.0), y: floor((height - badgeSize.height) / 2.0)), size: badgeSize)
-            self.badgeBackgroundNode.frame = badgeBackgroundFrame
-            self.badgeTitleNode.frame = CGRect(origin: CGPoint(x: badgeBackgroundFrame.minX + floor((badgeBackgroundFrame.width - badgeTitleSize.width) / 2.0), y: badgeBackgroundFrame.minY + floor((badgeBackgroundFrame.height - badgeTitleSize.height) / 2.0)), size: badgeTitleSize)
-            
-            self.separatorNode.frame = CGRect(origin: CGPoint(x: 0.0, y: height - UIScreenPixel), size: CGSize(width: width, height: UIScreenPixel))
-            self.highlightedBackgroundNode.frame = CGRect(origin: CGPoint(x: 0.0, y: 0.0), size: CGSize(width: width, height: height))
-            self.buttonNode.frame = CGRect(origin: CGPoint(x: 0.0, y: 0.0), size: CGSize(width: width, height: height))
-        })
-    }
-    
-    @objc private func buttonPressed() {
-        let _ = self.action()
-        //self.checkNode.isHidden = !isCurrent
-    }
-    
-    func updateBadge(text: String) -> Bool {
-        if text != self.badgeText {
-            self.badgeText = text
-            self.badgeTitleNode.attributedText = NSAttributedString(string: text, font: Font.regular(14.0), textColor: self.presentationData.theme.list.itemCheckColors.foregroundColor)
-            self.badgeBackgroundNode.isHidden = text.isEmpty
-            self.badgeTitleNode.isHidden = text.isEmpty
-            return true
-        } else {
-            return false
-        }
-    }
-}
-
 func chatListFilterItems(context: AccountContext) -> Signal<(Int, [(ChatListFilter, Int)]), NoError> {
-    let preferencesKey: PostboxViewKey = .preferences(keys: [PreferencesKeys.chatListFilters])
-    return context.account.postbox.combinedView(keys: [preferencesKey])
-    |> map { combinedView -> [ChatListFilter] in
-        if let filtersState = (combinedView.views[preferencesKey] as? PreferencesView)?.values[PreferencesKeys.chatListFilters] as? ChatListFiltersState {
-            return filtersState.filters
-        } else {
-            return []
-        }
-    }
+    return updatedChatListFilters(postbox: context.account.postbox)
     |> distinctUntilChanged
     |> mapToSignal { filters -> Signal<(Int, [(ChatListFilter, Int)]), NoError> in
         var unreadCountItems: [UnreadMessageCountsItem] = []
         unreadCountItems.append(.total(nil))
         var additionalPeerIds = Set<PeerId>()
         for filter in filters {
-            additionalPeerIds.formUnion(filter.includePeers)
+            additionalPeerIds.formUnion(filter.data.includePeers)
         }
         if !additionalPeerIds.isEmpty {
             for peerId in additionalPeerIds {
@@ -336,25 +34,13 @@ func chatListFilterItems(context: AccountContext) -> Signal<(Int, [(ChatListFilt
         
         return combineLatest(queue: context.account.postbox.queue,
             context.account.postbox.combinedView(keys: keys),
-            context.sharedContext.accountManager.sharedData(keys: [ApplicationSpecificSharedDataKeys.inAppNotificationSettings])
+            Signal<Bool, NoError>.single(true)
         )
-        |> map { view, sharedData -> (Int, [(ChatListFilter, Int)]) in
+        |> map { view, _ -> (Int, [(ChatListFilter, Int)]) in
             guard let unreadCounts = view.views[unreadKey] as? UnreadMessageCountsView else {
                 return (0, [])
             }
             
-            let inAppSettings: InAppNotificationSettings
-            if let value = sharedData.entries[ApplicationSpecificSharedDataKeys.inAppNotificationSettings] as? InAppNotificationSettings {
-                inAppSettings = value
-            } else {
-                inAppSettings = .defaultSettings
-            }
-            let type: RenderedTotalUnreadCountType
-            switch inAppSettings.totalUnreadCountDisplayStyle {
-                case .filtered:
-                    type = .filtered
-            }
-            
             var result: [(ChatListFilter, Int)] = []
             
             var peerTagAndCount: [PeerId: (PeerSummaryCounterTags, Int)] = [:]
@@ -364,10 +50,12 @@ func chatListFilterItems(context: AccountContext) -> Signal<(Int, [(ChatListFilt
                 switch entry {
                 case let .total(_, totalStateValue):
                     totalState = totalStateValue
+                case let .totalInGroup(groupId, totalGroupState):
+                    break
                 case let .peer(peerId, state):
                     if let state = state, state.isUnread {
                         if let peerView = view.views[.basicPeer(peerId)] as? BasicPeerView, let peer = peerView.peer {
-                            let tag = context.account.postbox.seedConfiguration.peerSummaryCounterTags(peer)
+                            let tag = context.account.postbox.seedConfiguration.peerSummaryCounterTags(peer, peerView.isContact)
                             if let notificationSettings = peerView.notificationSettings as? TelegramPeerNotificationSettings, case .muted = notificationSettings.muteState {
                                 peerTagAndCount[peerId] = (tag, 0)
                             } else {
@@ -382,30 +70,23 @@ func chatListFilterItems(context: AccountContext) -> Signal<(Int, [(ChatListFilt
                 }
             }
             
-            var totalBadge = 0
-            if let totalState = totalState {
-                totalBadge = Int(totalState.count(for: inAppSettings.totalUnreadCountDisplayStyle.category, in: inAppSettings.totalUnreadCountDisplayCategory.statsType, with: inAppSettings.totalUnreadCountIncludeTags))
-            }
+            let totalBadge = 0
             
-            var shouldUpdateLayout = false
             for filter in filters {
                 var tags: [PeerSummaryCounterTags] = []
-                if filter.categories.contains(.privateChats) {
-                    tags.append(.privateChat)
+                if filter.data.categories.contains(.contacts) {
+                    tags.append(.contact)
                 }
-                if filter.categories.contains(.secretChats) {
-                    tags.append(.secretChat)
+                if filter.data.categories.contains(.nonContacts) {
+                    tags.append(.nonContact)
                 }
-                if filter.categories.contains(.privateGroups) {
-                    tags.append(.privateGroup)
+                if filter.data.categories.contains(.groups) {
+                    tags.append(.group)
                 }
-                if filter.categories.contains(.bots) {
+                if filter.data.categories.contains(.bots) {
                     tags.append(.bot)
                 }
-                if filter.categories.contains(.publicGroups) {
-                    tags.append(.publicGroup)
-                }
-                if filter.categories.contains(.channels) {
+                if filter.data.categories.contains(.channels) {
                     tags.append(.channel)
                 }
                     
@@ -417,7 +98,7 @@ func chatListFilterItems(context: AccountContext) -> Signal<(Int, [(ChatListFilt
                         }
                     }
                 }
-                for peerId in filter.includePeers {
+                for peerId in filter.data.includePeers {
                     if let (tag, peerCount) = peerTagAndCount[peerId] {
                         if !tags.contains(tag) {
                             if peerCount != 0 {
@@ -433,399 +114,3 @@ func chatListFilterItems(context: AccountContext) -> Signal<(Int, [(ChatListFilt
         }
     }
 }
-
-private final class TabBarChatListFilterControllerNode: ViewControllerTracingNode {
-    private let presentationData: PresentationData
-    private let cancel: () -> Void
-    
-    private let effectView: UIVisualEffectView
-    private var propertyAnimator: AnyObject?
-    private var displayLinkAnimator: DisplayLinkAnimator?
-    private let dimNode: ASDisplayNode
-    
-    private let contentContainerNode: ASDisplayNode
-    private let contentNodes: [ASDisplayNode & AbstractTabBarChatListFilterItemNode]
-    
-    private var sourceNodes: [ASDisplayNode]
-    private var snapshotViews: [UIView] = []
-    
-    private var validLayout: ContainerViewLayout?
-    
-    private var countsDisposable: Disposable?
-    let isReady = Promise<Bool>()
-    private var didSetIsReady = false
-    
-    init(context: AccountContext, presentationData: PresentationData, cancel: @escaping () -> Void, sourceNodes: [ASDisplayNode], presetList: [ChatListFilter], currentPreset: ChatListFilter?, setup: @escaping () -> Void, updatePreset: @escaping (ChatListFilter?) -> Void) {
-        self.presentationData = presentationData
-        self.cancel = cancel
-        self.sourceNodes = sourceNodes
-        
-        self.effectView = UIVisualEffectView()
-        if #available(iOS 9.0, *) {
-        } else {
-            if presentationData.theme.rootController.keyboardColor == .dark {
-                self.effectView.effect = UIBlurEffect(style: .dark)
-            } else {
-                self.effectView.effect = UIBlurEffect(style: .light)
-            }
-            self.effectView.alpha = 0.0
-        }
-        
-        self.dimNode = ASDisplayNode()
-        self.dimNode.alpha = 1.0
-        if presentationData.theme.rootController.keyboardColor == .light {
-            self.dimNode.backgroundColor = UIColor(white: 0.0, alpha: 0.04)
-        } else {
-            self.dimNode.backgroundColor = presentationData.theme.chatList.backgroundColor.withAlphaComponent(0.2)
-        }
-        
-        self.contentContainerNode = ASDisplayNode()
-        self.contentContainerNode.backgroundColor = self.presentationData.theme.actionSheet.opaqueItemBackgroundColor
-        self.contentContainerNode.cornerRadius = 20.0
-        self.contentContainerNode.clipsToBounds = true
-        
-        var contentNodes: [ASDisplayNode & AbstractTabBarChatListFilterItemNode] = []
-        contentNodes.append(AddFilterItemNode(displaySeparator: true, presentationData: presentationData, action: {
-            setup()
-        }))
-        
-        for i in 0 ..< presetList.count {
-            let preset = presetList[i]
-            
-            let title: String = preset.title ?? ""
-            contentNodes.append(FilterItemNode(context: context, title: title, preset: preset, isCurrent: currentPreset == preset, displaySeparator: i != presetList.count - 1, presentationData: presentationData, action: {
-                updatePreset(preset)
-                return false
-            }))
-        }
-        self.contentNodes = contentNodes
-        
-        super.init()
-        
-        self.view.addSubview(self.effectView)
-        self.addSubnode(self.dimNode)
-        self.addSubnode(self.contentContainerNode)
-        self.contentNodes.forEach(self.contentContainerNode.addSubnode)
-        
-        self.dimNode.view.addGestureRecognizer(UITapGestureRecognizer(target: self, action: #selector(self.dimTapGesture(_:))))
-        
-        var unreadCountItems: [UnreadMessageCountsItem] = []
-        unreadCountItems.append(.total(nil))
-        var additionalPeerIds = Set<PeerId>()
-        for preset in presetList {
-            additionalPeerIds.formUnion(preset.includePeers)
-        }
-        if !additionalPeerIds.isEmpty {
-            for peerId in additionalPeerIds {
-                unreadCountItems.append(.peer(peerId))
-            }
-        }
-        let unreadKey: PostboxViewKey = .unreadCounts(items: unreadCountItems)
-        var keys: [PostboxViewKey] = []
-        keys.append(unreadKey)
-        for peerId in additionalPeerIds {
-            keys.append(.basicPeer(peerId))
-        }
-        
-        self.countsDisposable = (context.account.postbox.combinedView(keys: keys)
-        |> deliverOnMainQueue).start(next: { [weak self] view in
-            guard let strongSelf = self else {
-                return
-            }
-            
-            if let unreadCounts = view.views[unreadKey] as? UnreadMessageCountsView {
-                var peerTagAndCount: [PeerId: (PeerSummaryCounterTags, Int)] = [:]
-                
-                var totalState: ChatListTotalUnreadState?
-                for entry in unreadCounts.entries {
-                    switch entry {
-                    case let .total(_, totalStateValue):
-                        totalState = totalStateValue
-                    case let .peer(peerId, state):
-                        if let state = state, state.isUnread {
-                            if let peerView = view.views[.basicPeer(peerId)] as? BasicPeerView, let peer = peerView.peer {
-                                let tag = context.account.postbox.seedConfiguration.peerSummaryCounterTags(peer)
-                                var peerCount = Int(state.count)
-                                if state.isUnread {
-                                    peerCount = max(1, peerCount)
-                                }
-                                peerTagAndCount[peerId] = (tag, peerCount)
-                            }
-                        }
-                    }
-                }
-                
-                var totalUnreadChatCount = 0
-                if let totalState = totalState {
-                    for (_, counters) in totalState.filteredCounters {
-                        totalUnreadChatCount += Int(counters.chatCount)
-                    }
-                }
-                
-                var shouldUpdateLayout = false
-                for case let contentNode as FilterItemNode in strongSelf.contentNodes {
-                    let badgeString: String
-                    if let preset = contentNode.preset {
-                        var tags: [PeerSummaryCounterTags] = []
-                        if preset.categories.contains(.privateChats) {
-                            tags.append(.privateChat)
-                        }
-                        if preset.categories.contains(.secretChats) {
-                            tags.append(.secretChat)
-                        }
-                        if preset.categories.contains(.privateGroups) {
-                            tags.append(.privateGroup)
-                        }
-                        if preset.categories.contains(.bots) {
-                            tags.append(.bot)
-                        }
-                        if preset.categories.contains(.publicGroups) {
-                            tags.append(.publicGroup)
-                        }
-                        if preset.categories.contains(.channels) {
-                            tags.append(.channel)
-                        }
-                        
-                        var count = 0
-                        if let totalState = totalState {
-                            for tag in tags {
-                                if let value = totalState.filteredCounters[tag] {
-                                    count += Int(value.chatCount)
-                                }
-                            }
-                        }
-                        for peerId in preset.includePeers {
-                            if let (tag, peerCount) = peerTagAndCount[peerId] {
-                                if !tags.contains(tag) {
-                                    count += peerCount
-                                }
-                            }
-                        }
-                        if count != 0 {
-                            badgeString = "\(count)"
-                        } else {
-                            badgeString = ""
-                        }
-                    } else {
-                        badgeString = ""
-                    }
-                    if contentNode.updateBadge(text: badgeString) {
-                        shouldUpdateLayout = true
-                    }
-                }
-                
-                if shouldUpdateLayout {
-                    if let layout = strongSelf.validLayout {
-                        strongSelf.containerLayoutUpdated(layout, transition: .immediate)
-                    }
-                }
-            }
-            
-            if !strongSelf.didSetIsReady {
-                strongSelf.didSetIsReady = true
-                strongSelf.isReady.set(.single(true))
-            }
-        })
-    }
-    
-    deinit {
-        if let propertyAnimator = self.propertyAnimator {
-            if #available(iOSApplicationExtension 10.0, iOS 10.0, *) {
-                let propertyAnimator = propertyAnimator as? UIViewPropertyAnimator
-                propertyAnimator?.stopAnimation(true)
-            }
-        }
-        
-        self.countsDisposable?.dispose()
-    }
-    
-    func animateIn() {
-        self.dimNode.layer.animateAlpha(from: 0.0, to: 1.0, duration: 0.2)
-        
-        if #available(iOS 10.0, *) {
-            if let propertyAnimator = self.propertyAnimator {
-                let propertyAnimator = propertyAnimator as? UIViewPropertyAnimator
-                propertyAnimator?.stopAnimation(true)
-            }
-            self.propertyAnimator = UIViewPropertyAnimator(duration: 0.2 * animationDurationFactor, curve: .easeInOut, animations: { [weak self] in
-                self?.effectView.effect = makeCustomZoomBlurEffect()
-            })
-        }
-        
-        if let _ = self.propertyAnimator {
-            if #available(iOSApplicationExtension 10.0, iOS 10.0, *) {
-                self.displayLinkAnimator = DisplayLinkAnimator(duration: 0.2 * animationDurationFactor, from: 0.0, to: 1.0, update: { [weak self] value in
-                    (self?.propertyAnimator as? UIViewPropertyAnimator)?.fractionComplete = value
-                }, completion: {
-                })
-            }
-        } else {
-            UIView.animate(withDuration: 0.2 * animationDurationFactor, animations: {
-                self.effectView.effect = makeCustomZoomBlurEffect()
-            }, completion: { _ in
-            })
-        }
-        
-        self.contentContainerNode.layer.animateAlpha(from: 0.0, to: 1.0, duration: 0.2)
-        
-        if let _ = self.validLayout, let sourceNode = self.sourceNodes.first {
-            let sourceFrame = sourceNode.view.convert(sourceNode.bounds, to: self.view)
-            self.contentContainerNode.layer.animateFrame(from: sourceFrame, to: self.contentContainerNode.frame, duration: 0.3, timingFunction: kCAMediaTimingFunctionSpring)
-        }
-        
-        for sourceNode in self.sourceNodes {
-            if let imageNode = sourceNode as? ASImageNode {
-                let snapshot = UIImageView()
-                snapshot.image = imageNode.image
-                snapshot.frame = sourceNode.view.convert(sourceNode.bounds, to: self.view)
-                snapshot.isUserInteractionEnabled = false
-                self.view.addSubview(snapshot)
-                self.snapshotViews.append(snapshot)
-            } else if let snapshot = sourceNode.view.snapshotContentTree() {
-                snapshot.frame = sourceNode.view.convert(sourceNode.bounds, to: self.view)
-                snapshot.isUserInteractionEnabled = false
-                self.view.addSubview(snapshot)
-                self.snapshotViews.append(snapshot)
-            }
-            sourceNode.alpha = 0.0
-        }
-    }
-    
-    func animateOut(sourceNodes: [ASDisplayNode], fadeOutIcon: Bool, completion: @escaping () -> Void) {
-        self.isUserInteractionEnabled = false
-        
-        var completedEffect = false
-        var completedSourceNodes = false
-        
-        let intermediateCompletion: () -> Void = {
-            if completedEffect && completedSourceNodes {
-                completion()
-            }
-        }
-        
-        if #available(iOS 10.0, *) {
-            if let propertyAnimator = self.propertyAnimator {
-                let propertyAnimator = propertyAnimator as? UIViewPropertyAnimator
-                propertyAnimator?.stopAnimation(true)
-            }
-            self.propertyAnimator = UIViewPropertyAnimator(duration: 0.2, curve: .easeInOut, animations: { [weak self] in
-                self?.effectView.effect = nil
-            })
-        }
-        
-        if let _ = self.propertyAnimator {
-            if #available(iOSApplicationExtension 10.0, iOS 10.0, *) {
-                self.displayLinkAnimator = DisplayLinkAnimator(duration: 0.2 * animationDurationFactor, from: 0.0, to: 0.999, update: { [weak self] value in
-                    (self?.propertyAnimator as? UIViewPropertyAnimator)?.fractionComplete = value
-                    }, completion: { [weak self] in
-                        if let strongSelf = self {
-                            for sourceNode in strongSelf.sourceNodes {
-                                sourceNode.alpha = 1.0
-                            }
-                        }
-                        
-                        completedEffect = true
-                        intermediateCompletion()
-                })
-            }
-            self.effectView.layer.animateAlpha(from: 1.0, to: 0.0, duration: 0.05 * animationDurationFactor, delay: 0.15, timingFunction: CAMediaTimingFunctionName.easeInEaseOut.rawValue, removeOnCompletion: false)
-        } else {
-            UIView.animate(withDuration: 0.21 * animationDurationFactor, animations: {
-                if #available(iOS 9.0, *) {
-                    self.effectView.effect = nil
-                } else {
-                    self.effectView.alpha = 0.0
-                }
-            }, completion: { [weak self] _ in
-                if let strongSelf = self {
-                    for sourceNode in strongSelf.sourceNodes {
-                        sourceNode.alpha = 1.0
-                    }
-                }
-                
-                completedEffect = true
-                intermediateCompletion()
-            })
-        }
-        
-        self.dimNode.layer.animateAlpha(from: 1.0, to: 0.0, duration: 0.2, removeOnCompletion: false)
-        self.contentContainerNode.layer.animateAlpha(from: 1.0, to: 0.0, duration: 0.12, removeOnCompletion: false, completion: { _ in
-        })
-        if let _ = self.validLayout, let sourceNode = self.sourceNodes.first {
-            let sourceFrame = sourceNode.view.convert(sourceNode.bounds, to: self.view)
-            self.contentContainerNode.layer.animateFrame(from: self.contentContainerNode.frame, to: sourceFrame, duration: 0.15, timingFunction: CAMediaTimingFunctionName.easeIn.rawValue, removeOnCompletion: false)
-        }
-        if fadeOutIcon {
-            for snapshotView in self.snapshotViews {
-                snapshotView.layer.animateAlpha(from: 1.0, to: 0.0, duration: 0.2, removeOnCompletion: false)
-            }
-            completedSourceNodes = true
-        } else {
-            completedSourceNodes = true
-        }
-    }
-    
-    func containerLayoutUpdated(_ layout: ContainerViewLayout, transition: ContainedViewLayoutTransition) {
-        self.validLayout = layout
-        
-        transition.updateFrame(view: self.effectView, frame: CGRect(origin: CGPoint(), size: layout.size))
-        transition.updateFrame(node: self.dimNode, frame: CGRect(origin: CGPoint(), size: layout.size))
-        
-        let sideInset: CGFloat = 18.0
-        
-        var contentSize = CGSize()
-        contentSize.width = min(layout.size.width - 40.0, 260.0)
-        var applyNodes: [(ASDisplayNode, CGFloat, (CGFloat) -> Void)] = []
-        for itemNode in self.contentNodes {
-            let (width, height, apply) = itemNode.updateLayout(maxWidth: contentSize.width - sideInset * 2.0)
-            applyNodes.append((itemNode, height, apply))
-            contentSize.width = max(contentSize.width, width)
-            contentSize.height += height
-        }
-        
-        let insets = layout.insets(options: .input)
-        
-        let contentOrigin: CGPoint
-        if let sourceNode = self.sourceNodes.first, let screenFrame = sourceNode.supernode?.convert(sourceNode.frame, to: nil) {
-            contentOrigin = CGPoint(x: max(16.0, screenFrame.maxX - contentSize.width + 8.0), y: layout.size.height - 66.0 - insets.bottom - contentSize.height)
-        } else {
-            contentOrigin = CGPoint(x: max(16.0, layout.size.width - sideInset - contentSize.width), y: layout.size.height - 66.0 - layout.intrinsicInsets.bottom - contentSize.height)
-        }
-
-        transition.updateFrame(node: self.contentContainerNode, frame: CGRect(origin: contentOrigin, size: contentSize))
-        var nextY: CGFloat = 0.0
-        for (itemNode, height, apply) in applyNodes {
-            transition.updateFrame(node: itemNode, frame: CGRect(origin: CGPoint(x: 0.0, y: nextY), size: CGSize(width: contentSize.width, height: height)))
-            apply(contentSize.width)
-            nextY += height
-        }
-    }
-    
-    @objc private func dimTapGesture(_ recognizer: UITapGestureRecognizer) {
-        if case .ended = recognizer.state {
-            self.cancel()
-        }
-    }
-}
-
-private func setAnchorPoint(anchorPoint: CGPoint, forView view: UIView) {
-    var newPoint = CGPoint(x: view.bounds.size.width * anchorPoint.x,
-                           y: view.bounds.size.height * anchorPoint.y)
-    
-    
-    var oldPoint = CGPoint(x: view.bounds.size.width * view.layer.anchorPoint.x,
-                           y: view.bounds.size.height * view.layer.anchorPoint.y)
-    
-    newPoint = newPoint.applying(view.transform)
-    oldPoint = oldPoint.applying(view.transform)
-    
-    var position = view.layer.position
-    position.x -= oldPoint.x
-    position.x += newPoint.x
-    
-    position.y -= oldPoint.y
-    position.y += newPoint.y
-    
-    view.layer.position = position
-    view.layer.anchorPoint = anchorPoint
-}
diff --git a/submodules/ChatTitleActivityNode/BUILD b/submodules/ChatTitleActivityNode/BUILD
new file mode 100644
index 0000000000..c6d3c8966e
--- /dev/null
+++ b/submodules/ChatTitleActivityNode/BUILD
@@ -0,0 +1,17 @@
+load("@build_bazel_rules_swift//swift:swift.bzl", "swift_library")
+
+swift_library(
+    name = "ChatTitleActivityNode",
+    module_name = "ChatTitleActivityNode",
+    srcs = glob([
+        "Sources/**/*.swift",
+    ]),
+    deps = [
+        "//submodules/AsyncDisplayKit:AsyncDisplayKit",
+        "//submodules/Display:Display",
+        "//submodules/LegacyComponents:LegacyComponents",
+    ],
+    visibility = [
+        "//visibility:public",
+    ],
+)
diff --git a/submodules/ChatTitleActivityNode/Info.plist b/submodules/ChatTitleActivityNode/Info.plist
deleted file mode 100644
index e1fe4cfb7b..0000000000
--- a/submodules/ChatTitleActivityNode/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/ChatTitleActivityNode/Sources/ChatTitleActivityNode.h b/submodules/ChatTitleActivityNode/Sources/ChatTitleActivityNode.h
deleted file mode 100644
index 0d41a1270b..0000000000
--- a/submodules/ChatTitleActivityNode/Sources/ChatTitleActivityNode.h
+++ /dev/null
@@ -1,19 +0,0 @@
-//
-//  ChatTitleActivityNode.h
-//  ChatTitleActivityNode
-//
-//  Created by Peter on 8/13/19.
-//  Copyright © 2019 Telegram Messenger LLP. All rights reserved.
-//
-
-#import <UIKit/UIKit.h>
-
-//! Project version number for ChatTitleActivityNode.
-FOUNDATION_EXPORT double ChatTitleActivityNodeVersionNumber;
-
-//! Project version string for ChatTitleActivityNode.
-FOUNDATION_EXPORT const unsigned char ChatTitleActivityNodeVersionString[];
-
-// In this header, you should import all the public headers of your framework using statements like #import <ChatTitleActivityNode/PublicHeader.h>
-
-
diff --git a/submodules/CheckNode/BUCK b/submodules/CheckNode/BUCK
index 138e1ec664..78852663a9 100644
--- a/submodules/CheckNode/BUCK
+++ b/submodules/CheckNode/BUCK
@@ -4,14 +4,7 @@ static_library(
     name = "CheckNode",
     srcs = glob([
         "Sources/**/*.swift",
-        "Sources/*.m",
     ]),
-    headers = glob([
-        "Sources/*.h",
-    ], exclude = ["Sources/TelegramPresentationData.h"]),
-    exported_headers = glob([
-        "Sources/*.h",
-    ], exclude = ["Sources/TelegramPresentationData.h"]),
     deps = [
     	"//submodules/AsyncDisplayKit:AsyncDisplayKit#shared",
 	    "//submodules/Display:Display#shared",
diff --git a/submodules/CheckNode/BUILD b/submodules/CheckNode/BUILD
new file mode 100644
index 0000000000..fb56fea55e
--- /dev/null
+++ b/submodules/CheckNode/BUILD
@@ -0,0 +1,17 @@
+load("@build_bazel_rules_swift//swift:swift.bzl", "swift_library")
+
+swift_library(
+    name = "CheckNode",
+    module_name = "CheckNode",
+    srcs = glob([
+        "Sources/**/*.swift",
+    ]),
+    deps = [
+        "//submodules/AsyncDisplayKit:AsyncDisplayKit",
+        "//submodules/Display:Display",
+        "//submodules/LegacyComponents:LegacyComponents",
+    ],
+    visibility = [
+        "//visibility:public",
+    ],
+)
diff --git a/submodules/CheckNode/Info.plist b/submodules/CheckNode/Info.plist
deleted file mode 100644
index e1fe4cfb7b..0000000000
--- a/submodules/CheckNode/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/CheckNode/Sources/CheckNode.h b/submodules/CheckNode/Sources/CheckNode.h
deleted file mode 100644
index 20e15c1826..0000000000
--- a/submodules/CheckNode/Sources/CheckNode.h
+++ /dev/null
@@ -1,19 +0,0 @@
-//
-//  CheckNode.h
-//  CheckNode
-//
-//  Created by Peter on 8/1/19.
-//  Copyright © 2019 Telegram Messenger LLP. All rights reserved.
-//
-
-#import <UIKit/UIKit.h>
-
-//! Project version number for CheckNode.
-FOUNDATION_EXPORT double CheckNodeVersionNumber;
-
-//! Project version string for CheckNode.
-FOUNDATION_EXPORT const unsigned char CheckNodeVersionString[];
-
-// In this header, you should import all the public headers of your framework using statements like #import <CheckNode/PublicHeader.h>
-
-
diff --git a/submodules/CloudData/BUCK b/submodules/CloudData/BUCK
index dbe59042fe..61dc3a640e 100644
--- a/submodules/CloudData/BUCK
+++ b/submodules/CloudData/BUCK
@@ -9,6 +9,7 @@ static_library(
         "//submodules/SSignalKit/SwiftSignalKit:SwiftSignalKit#shared",
         "//submodules/Postbox:Postbox#shared",
         "//submodules/MtProtoKit:MtProtoKit#shared",
+        "//submodules/EncryptionProvider:EncryptionProvider",
     ],
     frameworks = [
         "$SDKROOT/System/Library/Frameworks/Foundation.framework",
diff --git a/submodules/CloudData/BUILD b/submodules/CloudData/BUILD
new file mode 100644
index 0000000000..662ebc2ee3
--- /dev/null
+++ b/submodules/CloudData/BUILD
@@ -0,0 +1,18 @@
+load("@build_bazel_rules_swift//swift:swift.bzl", "swift_library")
+
+swift_library(
+    name = "CloudData",
+    module_name = "CloudData",
+    srcs = glob([
+        "Sources/**/*.swift",
+    ]),
+    deps = [
+        "//submodules/SSignalKit/SwiftSignalKit:SwiftSignalKit",
+        "//submodules/Postbox:Postbox",
+        "//submodules/MtProtoKit:MtProtoKit",
+        "//submodules/EncryptionProvider:EncryptionProvider",
+    ],
+    visibility = [
+        "//visibility:public",
+    ],
+)
diff --git a/submodules/ComposePollUI/BUILD b/submodules/ComposePollUI/BUILD
new file mode 100644
index 0000000000..df9b19b552
--- /dev/null
+++ b/submodules/ComposePollUI/BUILD
@@ -0,0 +1,24 @@
+load("@build_bazel_rules_swift//swift:swift.bzl", "swift_library")
+
+swift_library(
+    name = "ComposePollUI",
+    module_name = "ComposePollUI",
+    srcs = glob([
+        "Sources/**/*.swift",
+    ]),
+    deps = [
+        "//submodules/AsyncDisplayKit:AsyncDisplayKit",
+        "//submodules/Display:Display",
+        "//submodules/Postbox:Postbox",
+        "//submodules/TelegramCore:TelegramCore",
+        "//submodules/SyncCore:SyncCore",
+        "//submodules/TelegramPresentationData:TelegramPresentationData",
+        "//submodules/ItemListUI:ItemListUI",
+        "//submodules/AccountContext:AccountContext",
+        "//submodules/AlertUI:AlertUI",
+        "//submodules/PresentationDataUtils:PresentationDataUtils",
+    ],
+    visibility = [
+        "//visibility:public",
+    ],
+)
diff --git a/submodules/ComposePollUI/Info.plist b/submodules/ComposePollUI/Info.plist
deleted file mode 100644
index e1fe4cfb7b..0000000000
--- a/submodules/ComposePollUI/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/ComposePollUI/Sources/ComposePollUI.h b/submodules/ComposePollUI/Sources/ComposePollUI.h
deleted file mode 100644
index 0bdf9b7117..0000000000
--- a/submodules/ComposePollUI/Sources/ComposePollUI.h
+++ /dev/null
@@ -1,19 +0,0 @@
-//
-//  ComposePollUI.h
-//  ComposePollUI
-//
-//  Created by Peter on 8/10/19.
-//  Copyright © 2019 Telegram Messenger LLP. All rights reserved.
-//
-
-#import <UIKit/UIKit.h>
-
-//! Project version number for ComposePollUI.
-FOUNDATION_EXPORT double ComposePollUIVersionNumber;
-
-//! Project version string for ComposePollUI.
-FOUNDATION_EXPORT const unsigned char ComposePollUIVersionString[];
-
-// In this header, you should import all the public headers of your framework using statements like #import <ComposePollUI/PublicHeader.h>
-
-
diff --git a/submodules/ContactListUI/BUILD b/submodules/ContactListUI/BUILD
new file mode 100644
index 0000000000..9222087c53
--- /dev/null
+++ b/submodules/ContactListUI/BUILD
@@ -0,0 +1,38 @@
+load("@build_bazel_rules_swift//swift:swift.bzl", "swift_library")
+
+swift_library(
+    name = "ContactListUI",
+    module_name = "ContactListUI",
+    srcs = glob([
+        "Sources/**/*.swift",
+    ]),
+    deps = [
+        "//submodules/SSignalKit/SwiftSignalKit:SwiftSignalKit",
+        "//submodules/AsyncDisplayKit:AsyncDisplayKit",
+        "//submodules/Display:Display",
+        "//submodules/Postbox:Postbox",
+        "//submodules/TelegramCore:TelegramCore",
+        "//submodules/SyncCore:SyncCore",
+        "//submodules/TelegramPresentationData:TelegramPresentationData",
+        "//submodules/AccountContext:AccountContext",
+        "//submodules/TelegramUIPreferences:TelegramUIPreferences",
+        "//submodules/MergeLists:MergeLists",
+        "//submodules/SearchUI:SearchUI",
+        "//submodules/ChatListSearchItemHeader:ChatListSearchItemHeader",
+        "//submodules/ItemListPeerItem:ItemListPeerItem",
+        "//submodules/ContactsPeerItem:ContactsPeerItem",
+        "//submodules/ChatListSearchItemNode:ChatListSearchItemNode",
+        "//submodules/TelegramPermissionsUI:TelegramPermissionsUI",
+        "//submodules/TelegramNotices:TelegramNotices",
+        "//submodules/AlertUI:AlertUI",
+        "//submodules/PresentationDataUtils:PresentationDataUtils",
+        "//submodules/ShareController:ShareController",
+        "//submodules/AppBundle:AppBundle",
+        "//submodules/OverlayStatusController:OverlayStatusController",
+        "//submodules/PhoneNumberFormat:PhoneNumberFormat",
+        "//submodules/SolidRoundedButtonNode:SolidRoundedButtonNode",
+    ],
+    visibility = [
+        "//visibility:public",
+    ],
+)
diff --git a/submodules/ContactListUI/Info.plist b/submodules/ContactListUI/Info.plist
deleted file mode 100644
index e1fe4cfb7b..0000000000
--- a/submodules/ContactListUI/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/ContactListUI/Sources/ContactListUI.h b/submodules/ContactListUI/Sources/ContactListUI.h
deleted file mode 100644
index 4d1cb36e9b..0000000000
--- a/submodules/ContactListUI/Sources/ContactListUI.h
+++ /dev/null
@@ -1,19 +0,0 @@
-//
-//  ContactListUI.h
-//  ContactListUI
-//
-//  Created by Peter on 8/12/19.
-//  Copyright © 2019 Telegram Messenger LLP. All rights reserved.
-//
-
-#import <UIKit/UIKit.h>
-
-//! Project version number for ContactListUI.
-FOUNDATION_EXPORT double ContactListUIVersionNumber;
-
-//! Project version string for ContactListUI.
-FOUNDATION_EXPORT const unsigned char ContactListUIVersionString[];
-
-// In this header, you should import all the public headers of your framework using statements like #import <ContactListUI/PublicHeader.h>
-
-
diff --git a/submodules/ContactsPeerItem/BUILD b/submodules/ContactsPeerItem/BUILD
new file mode 100644
index 0000000000..1af726ec27
--- /dev/null
+++ b/submodules/ContactsPeerItem/BUILD
@@ -0,0 +1,32 @@
+load("@build_bazel_rules_swift//swift:swift.bzl", "swift_library")
+
+swift_library(
+    name = "ContactsPeerItem",
+    module_name = "ContactsPeerItem",
+    srcs = glob([
+        "Sources/**/*.swift",
+    ]),
+    deps = [
+        "//submodules/SSignalKit/SwiftSignalKit:SwiftSignalKit",
+        "//submodules/AsyncDisplayKit:AsyncDisplayKit",
+        "//submodules/Display:Display",
+        "//submodules/Postbox:Postbox",
+        "//submodules/TelegramCore:TelegramCore",
+        "//submodules/SyncCore:SyncCore",
+        "//submodules/AccountContext:AccountContext",
+        "//submodules/AvatarNode:AvatarNode",
+        "//submodules/TelegramPresentationData:TelegramPresentationData",
+        "//submodules/CheckNode:CheckNode",
+        "//submodules/TelegramStringFormatting:TelegramStringFormatting",
+        "//submodules/ItemListPeerItem:ItemListPeerItem",
+        "//submodules/PeerPresenceStatusManager:PeerPresenceStatusManager",
+        "//submodules/ItemListUI:ItemListUI",
+        "//submodules/TelegramUIPreferences:TelegramUIPreferences",
+        "//submodules/ListSectionHeaderNode:ListSectionHeaderNode",
+        "//submodules/ContextUI:ContextUI",
+        "//submodules/PresentationDataUtils:PresentationDataUtils",
+    ],
+    visibility = [
+        "//visibility:public",
+    ],
+)
diff --git a/submodules/ContactsPeerItem/Info.plist b/submodules/ContactsPeerItem/Info.plist
deleted file mode 100644
index e1fe4cfb7b..0000000000
--- a/submodules/ContactsPeerItem/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/ContactsPeerItem/Sources/ContactsPeerItem.h b/submodules/ContactsPeerItem/Sources/ContactsPeerItem.h
deleted file mode 100644
index 9addb32e87..0000000000
--- a/submodules/ContactsPeerItem/Sources/ContactsPeerItem.h
+++ /dev/null
@@ -1,19 +0,0 @@
-//
-//  ContactsPeerItem.h
-//  ContactsPeerItem
-//
-//  Created by Peter on 8/13/19.
-//  Copyright © 2019 Telegram Messenger LLP. All rights reserved.
-//
-
-#import <UIKit/UIKit.h>
-
-//! Project version number for ContactsPeerItem.
-FOUNDATION_EXPORT double ContactsPeerItemVersionNumber;
-
-//! Project version string for ContactsPeerItem.
-FOUNDATION_EXPORT const unsigned char ContactsPeerItemVersionString[];
-
-// In this header, you should import all the public headers of your framework using statements like #import <ContactsPeerItem/PublicHeader.h>
-
-
diff --git a/submodules/ContactsPeerItem/Sources/ContactsPeerItem.swift b/submodules/ContactsPeerItem/Sources/ContactsPeerItem.swift
index 183287730b..f8fc1cd46d 100644
--- a/submodules/ContactsPeerItem/Sources/ContactsPeerItem.swift
+++ b/submodules/ContactsPeerItem/Sources/ContactsPeerItem.swift
@@ -456,8 +456,8 @@ public class ContactsPeerItemNode: ItemListRevealOptionsItemNode {
             if currentItem?.presentationData.theme !== item.presentationData.theme {
                 updatedTheme = item.presentationData.theme
             }
-            var leftInset: CGFloat = 65.0 + params.leftInset
-            let rightInset: CGFloat = 10.0 + params.rightInset
+            let leftInset: CGFloat = 65.0 + params.leftInset
+            var rightInset: CGFloat = 10.0 + params.rightInset
             
             let updatedSelectionNode: CheckNode?
             var isSelected = false
@@ -465,7 +465,7 @@ public class ContactsPeerItemNode: ItemListRevealOptionsItemNode {
             case .none:
                 updatedSelectionNode = nil
             case let .selectable(selected):
-                leftInset += 28.0
+                rightInset += 38.0
                 isSelected = selected
                 
                 let selectionNode: CheckNode
@@ -849,7 +849,7 @@ public class ContactsPeerItemNode: ItemListRevealOptionsItemNode {
                                 }
                                 updatedSelectionNode.setIsChecked(isSelected, animated: animated)
                                 
-                                updatedSelectionNode.frame = CGRect(origin: CGPoint(x: params.leftInset + 6.0, y: floor((nodeLayout.contentSize.height - 32.0) / 2.0)), size: CGSize(width: 32.0, height: 32.0))
+                                updatedSelectionNode.frame = CGRect(origin: CGPoint(x: params.width - params.rightInset - 32.0 - 12.0, y: floor((nodeLayout.contentSize.height - 32.0) / 2.0)), size: CGSize(width: 32.0, height: 32.0))
                             } else if let selectionNode = strongSelf.selectionNode {
                                 selectionNode.removeFromSupernode()
                                 strongSelf.selectionNode = nil
diff --git a/submodules/ContextUI/BUILD b/submodules/ContextUI/BUILD
new file mode 100644
index 0000000000..f8157be861
--- /dev/null
+++ b/submodules/ContextUI/BUILD
@@ -0,0 +1,21 @@
+load("@build_bazel_rules_swift//swift:swift.bzl", "swift_library")
+
+swift_library(
+    name = "ContextUI",
+    module_name = "ContextUI",
+    srcs = glob([
+        "Sources/**/*.swift",
+    ]),
+    deps = [
+        "//submodules/SSignalKit/SwiftSignalKit:SwiftSignalKit",
+        "//submodules/AsyncDisplayKit:AsyncDisplayKit",
+        "//submodules/Display:Display",
+        "//submodules/TelegramPresentationData:TelegramPresentationData",
+        "//submodules/TextSelectionNode:TextSelectionNode",
+        "//submodules/ReactionSelectionNode:ReactionSelectionNode",
+        "//submodules/AppBundle:AppBundle",
+    ],
+    visibility = [
+        "//visibility:public",
+    ],
+)
diff --git a/submodules/ContextUI/Info.plist b/submodules/ContextUI/Info.plist
deleted file mode 100644
index e1fe4cfb7b..0000000000
--- a/submodules/ContextUI/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/ContextUI/Sources/ContextController.swift b/submodules/ContextUI/Sources/ContextController.swift
index f63658522d..bf3b21f1e1 100644
--- a/submodules/ContextUI/Sources/ContextController.swift
+++ b/submodules/ContextUI/Sources/ContextController.swift
@@ -747,7 +747,7 @@ private final class ContextControllerNode: ViewControllerTracingNode, UIScrollVi
                 self.withoutBlurDimNode.layer.animateAlpha(from: 1.0, to: 0.0, duration: transitionDuration * animationDurationFactor, removeOnCompletion: false)
             }
             
-            self.actionsContainerNode.layer.animateAlpha(from: 1.0, to: 0.0, duration: 0.2 * animationDurationFactor, removeOnCompletion: false, completion: { _ in
+            self.actionsContainerNode.layer.animateAlpha(from: 1.0, to: 0.0, duration: 0.15 * animationDurationFactor, removeOnCompletion: false, completion: { _ in
                 completedActionsNode = true
                 intermediateCompletion()
             })
@@ -1363,12 +1363,16 @@ private final class ContextControllerNode: ViewControllerTracingNode, UIScrollVi
         if let maybeContentNode = self.contentContainerNode.contentNode {
             switch maybeContentNode {
             case let .extracted(contentParentNode, _):
-                let contentPoint = self.view.convert(point, to: contentParentNode.contentNode.view)
-                if let result = contentParentNode.contentNode.hitTest(contentPoint, with: event) {
-                    if result is TextSelectionNodeView {
-                        return result
-                    } else if contentParentNode.contentRect.contains(contentPoint) {
-                        return contentParentNode.contentNode.view
+                if case let .extracted(source) = self.source {
+                    if !source.ignoreContentTouches {
+                        let contentPoint = self.view.convert(point, to: contentParentNode.contentNode.view)
+                        if let result = contentParentNode.contentNode.hitTest(contentPoint, with: event) {
+                            if result is TextSelectionNodeView {
+                                return result
+                            } else if contentParentNode.contentRect.contains(contentPoint) {
+                                return contentParentNode.contentNode.view
+                            }
+                        }
                     }
                 }
             case let .controller(controller):
@@ -1429,6 +1433,7 @@ public final class ContextControllerPutBackViewInfo {
 
 public protocol ContextExtractedContentSource: class {
     var keepInPlace: Bool { get }
+    var ignoreContentTouches: Bool { get }
     
     func takeView() -> ContextControllerTakeViewInfo?
     func putBack() -> ContextControllerPutBackViewInfo?
@@ -1487,6 +1492,7 @@ public final class ContextController: ViewController, StandalonePresentableContr
         super.init(navigationBarPresentationData: nil)
         
         self.statusBar.statusBarStyle = .Hide
+        self.lockOrientation = true
     }
     
     required init(coder aDecoder: NSCoder) {
diff --git a/submodules/ContextUI/Sources/ContextUI.h b/submodules/ContextUI/Sources/ContextUI.h
deleted file mode 100644
index 8ba61f93ed..0000000000
--- a/submodules/ContextUI/Sources/ContextUI.h
+++ /dev/null
@@ -1,19 +0,0 @@
-//
-//  ContextUI.h
-//  ContextUI
-//
-//  Created by Peter on 8/5/19.
-//  Copyright © 2019 Telegram Messenger LLP. All rights reserved.
-//
-
-#import <UIKit/UIKit.h>
-
-//! Project version number for ContextUI.
-FOUNDATION_EXPORT double ContextUIVersionNumber;
-
-//! Project version string for ContextUI.
-FOUNDATION_EXPORT const unsigned char ContextUIVersionString[];
-
-// In this header, you should import all the public headers of your framework using statements like #import <ContextUI/PublicHeader.h>
-
-
diff --git a/submodules/CounterContollerTitleView/BUILD b/submodules/CounterContollerTitleView/BUILD
new file mode 100644
index 0000000000..0462915bd5
--- /dev/null
+++ b/submodules/CounterContollerTitleView/BUILD
@@ -0,0 +1,17 @@
+load("@build_bazel_rules_swift//swift:swift.bzl", "swift_library")
+
+swift_library(
+    name = "CounterContollerTitleView",
+    module_name = "CounterContollerTitleView",
+    srcs = glob([
+        "Sources/**/*.swift",
+    ]),
+    deps = [
+        "//submodules/AsyncDisplayKit:AsyncDisplayKit",
+        "//submodules/Display:Display",
+        "//submodules/TelegramPresentationData:TelegramPresentationData",
+    ],
+    visibility = [
+        "//visibility:public",
+    ],
+)
diff --git a/submodules/CounterContollerTitleView/Info.plist b/submodules/CounterContollerTitleView/Info.plist
deleted file mode 100644
index e1fe4cfb7b..0000000000
--- a/submodules/CounterContollerTitleView/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/CounterContollerTitleView/Sources/CounterContollerTitleView.h b/submodules/CounterContollerTitleView/Sources/CounterContollerTitleView.h
deleted file mode 100644
index c0ddce18a5..0000000000
--- a/submodules/CounterContollerTitleView/Sources/CounterContollerTitleView.h
+++ /dev/null
@@ -1,19 +0,0 @@
-//
-//  CounterContollerTitleView.h
-//  CounterContollerTitleView
-//
-//  Created by Peter on 8/17/19.
-//  Copyright © 2019 Telegram Messenger LLP. All rights reserved.
-//
-
-#import <UIKit/UIKit.h>
-
-//! Project version number for CounterContollerTitleView.
-FOUNDATION_EXPORT double CounterContollerTitleViewVersionNumber;
-
-//! Project version string for CounterContollerTitleView.
-FOUNDATION_EXPORT const unsigned char CounterContollerTitleViewVersionString[];
-
-// In this header, you should import all the public headers of your framework using statements like #import <CounterContollerTitleView/PublicHeader.h>
-
-
diff --git a/submodules/CountrySelectionUI/BUILD b/submodules/CountrySelectionUI/BUILD
new file mode 100644
index 0000000000..7fcc859b8b
--- /dev/null
+++ b/submodules/CountrySelectionUI/BUILD
@@ -0,0 +1,21 @@
+load("@build_bazel_rules_swift//swift:swift.bzl", "swift_library")
+
+swift_library(
+    name = "CountrySelectionUI",
+    module_name = "CountrySelectionUI",
+    srcs = glob([
+        "Sources/**/*.swift",
+    ]),
+    deps = [
+        "//submodules/SSignalKit/SwiftSignalKit:SwiftSignalKit",
+        "//submodules/AsyncDisplayKit:AsyncDisplayKit",
+        "//submodules/Display:Display",
+        "//submodules/TelegramPresentationData:TelegramPresentationData",
+        "//submodules/TelegramStringFormatting:TelegramStringFormatting",
+        "//submodules/SearchBarNode:SearchBarNode",
+        "//submodules/AppBundle:AppBundle",
+    ],
+    visibility = [
+        "//visibility:public",
+    ],
+)
diff --git a/submodules/CountrySelectionUI/Info.plist b/submodules/CountrySelectionUI/Info.plist
deleted file mode 100644
index e1fe4cfb7b..0000000000
--- a/submodules/CountrySelectionUI/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/CountrySelectionUI/Sources/CountrySelectionUI.h b/submodules/CountrySelectionUI/Sources/CountrySelectionUI.h
deleted file mode 100644
index 3505c8a4d6..0000000000
--- a/submodules/CountrySelectionUI/Sources/CountrySelectionUI.h
+++ /dev/null
@@ -1,19 +0,0 @@
-//
-//  CountrySelectionUI.h
-//  CountrySelectionUI
-//
-//  Created by Peter on 8/11/19.
-//  Copyright © 2019 Telegram Messenger LLP. All rights reserved.
-//
-
-#import <UIKit/UIKit.h>
-
-//! Project version number for CountrySelectionUI.
-FOUNDATION_EXPORT double CountrySelectionUIVersionNumber;
-
-//! Project version string for CountrySelectionUI.
-FOUNDATION_EXPORT const unsigned char CountrySelectionUIVersionString[];
-
-// In this header, you should import all the public headers of your framework using statements like #import <CountrySelectionUI/PublicHeader.h>
-
-
diff --git a/submodules/Crc32/BUCK b/submodules/Crc32/BUCK
index 9e0e9aeb63..5380c8191d 100644
--- a/submodules/Crc32/BUCK
+++ b/submodules/Crc32/BUCK
@@ -9,7 +9,7 @@ static_library(
         "Sources/*.h",
     ]),
     exported_headers = glob([
-        "Sources/*.h",
+        "PublicHeaders/**/*.h",
     ]),
     deps = [
     ],
diff --git a/submodules/Crc32/BUILD b/submodules/Crc32/BUILD
new file mode 100644
index 0000000000..6a635794e7
--- /dev/null
+++ b/submodules/Crc32/BUILD
@@ -0,0 +1,22 @@
+
+objc_library(
+    name = "Crc32",
+    enable_modules = True,
+    module_name = "Crc32",
+    srcs = glob([
+        "Sources/**/*.m",
+        "Sources/**/*.h",
+    ]),
+    hdrs = glob([
+        "PublicHeaders/**/*.h",
+    ]),
+    includes = [
+        "PublicHeaders",
+    ],
+    sdk_frameworks = [
+        "Foundation",
+    ],
+    visibility = [
+        "//visibility:public",
+    ],
+)
diff --git a/submodules/Crc32/Sources/Crc32.h b/submodules/Crc32/PublicHeaders/Crc32/Crc32.h
similarity index 100%
rename from submodules/Crc32/Sources/Crc32.h
rename to submodules/Crc32/PublicHeaders/Crc32/Crc32.h
diff --git a/submodules/Crc32/Sources/Crc32.m b/submodules/Crc32/Sources/Crc32.m
index 7dfded40f5..adc7c6b54d 100644
--- a/submodules/Crc32/Sources/Crc32.m
+++ b/submodules/Crc32/Sources/Crc32.m
@@ -1,4 +1,4 @@
-#import "Crc32.h"
+#import <Crc32/Crc32.h>
 
 #import <zlib.h>
 
diff --git a/submodules/CryptoUtils/BUCK b/submodules/CryptoUtils/BUCK
new file mode 100644
index 0000000000..411184de09
--- /dev/null
+++ b/submodules/CryptoUtils/BUCK
@@ -0,0 +1,19 @@
+load("//Config:buck_rule_macros.bzl", "static_library")
+
+static_library(
+    name = "CryptoUtils",
+    srcs = glob([
+        "Sources/*.m",
+    ]),
+    headers = glob([
+        "Sources/*.h",
+    ]),
+    exported_headers = glob([
+        "PublicHeaders/**/*.h",
+    ]),
+    deps = [
+    ],
+    frameworks = [
+        "$SDKROOT/System/Library/Frameworks/Foundation.framework",
+    ],
+)
diff --git a/submodules/CryptoUtils/BUILD b/submodules/CryptoUtils/BUILD
new file mode 100644
index 0000000000..da7b17b786
--- /dev/null
+++ b/submodules/CryptoUtils/BUILD
@@ -0,0 +1,21 @@
+
+objc_library(
+    name = "CryptoUtils",
+    enable_modules = True,
+    module_name = "CryptoUtils",
+    srcs = glob([
+        "Sources/*.m",
+    ]),
+    hdrs = glob([
+        "PublicHeaders/**/*.h",
+    ]),
+    includes = [
+        "PublicHeaders",
+    ],
+    sdk_frameworks = [
+      "Foundation",
+    ],
+    visibility = [
+        "//visibility:public",
+    ],
+)
diff --git a/submodules/TelegramCore/Sources/Crypto.h b/submodules/CryptoUtils/PublicHeaders/CryptoUtils/Crypto.h
similarity index 100%
rename from submodules/TelegramCore/Sources/Crypto.h
rename to submodules/CryptoUtils/PublicHeaders/CryptoUtils/Crypto.h
diff --git a/submodules/TelegramCore/Sources/Crypto.m b/submodules/CryptoUtils/Sources/Crypto.m
similarity index 98%
rename from submodules/TelegramCore/Sources/Crypto.m
rename to submodules/CryptoUtils/Sources/Crypto.m
index 86cf407f0c..028031ddbd 100644
--- a/submodules/TelegramCore/Sources/Crypto.m
+++ b/submodules/CryptoUtils/Sources/Crypto.m
@@ -1,4 +1,4 @@
-#include "Crypto.h"
+#include <CryptoUtils/Crypto.h>
 
 #import <CommonCrypto/CommonCrypto.h>
 
diff --git a/submodules/DateSelectionUI/BUILD b/submodules/DateSelectionUI/BUILD
new file mode 100644
index 0000000000..a34f436ac4
--- /dev/null
+++ b/submodules/DateSelectionUI/BUILD
@@ -0,0 +1,20 @@
+load("@build_bazel_rules_swift//swift:swift.bzl", "swift_library")
+
+swift_library(
+    name = "DateSelectionUI",
+    module_name = "DateSelectionUI",
+    srcs = glob([
+        "Sources/**/*.swift",
+    ]),
+    deps = [
+        "//submodules/SSignalKit/SwiftSignalKit:SwiftSignalKit",
+        "//submodules/AsyncDisplayKit:AsyncDisplayKit",
+        "//submodules/Display:Display",
+        "//submodules/AccountContext:AccountContext",
+        "//submodules/TelegramStringFormatting:TelegramStringFormatting",
+        "//submodules/TelegramPresentationData:TelegramPresentationData",
+    ],
+    visibility = [
+        "//visibility:public",
+    ],
+)
diff --git a/submodules/DateSelectionUI/Info.plist b/submodules/DateSelectionUI/Info.plist
deleted file mode 100644
index e1fe4cfb7b..0000000000
--- a/submodules/DateSelectionUI/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/DateSelectionUI/Sources/DateSelectionUI.h b/submodules/DateSelectionUI/Sources/DateSelectionUI.h
deleted file mode 100644
index f52f7827f6..0000000000
--- a/submodules/DateSelectionUI/Sources/DateSelectionUI.h
+++ /dev/null
@@ -1,19 +0,0 @@
-//
-//  DateSelectionUI.h
-//  DateSelectionUI
-//
-//  Created by Peter on 8/12/19.
-//  Copyright © 2019 Telegram Messenger LLP. All rights reserved.
-//
-
-#import <UIKit/UIKit.h>
-
-//! Project version number for DateSelectionUI.
-FOUNDATION_EXPORT double DateSelectionUIVersionNumber;
-
-//! Project version string for DateSelectionUI.
-FOUNDATION_EXPORT const unsigned char DateSelectionUIVersionString[];
-
-// In this header, you should import all the public headers of your framework using statements like #import <DateSelectionUI/PublicHeader.h>
-
-
diff --git a/submodules/DeleteChatPeerActionSheetItem/BUILD b/submodules/DeleteChatPeerActionSheetItem/BUILD
new file mode 100644
index 0000000000..c8da24e78c
--- /dev/null
+++ b/submodules/DeleteChatPeerActionSheetItem/BUILD
@@ -0,0 +1,22 @@
+load("@build_bazel_rules_swift//swift:swift.bzl", "swift_library")
+
+swift_library(
+    name = "DeleteChatPeerActionSheetItem",
+    module_name = "DeleteChatPeerActionSheetItem",
+    srcs = glob([
+        "Sources/**/*.swift",
+    ]),
+    deps = [
+        "//submodules/AsyncDisplayKit:AsyncDisplayKit",
+        "//submodules/Display:Display",
+        "//submodules/Postbox:Postbox",
+        "//submodules/TelegramCore:TelegramCore",
+        "//submodules/SyncCore:SyncCore",
+        "//submodules/AccountContext:AccountContext",
+        "//submodules/AvatarNode:AvatarNode",
+        "//submodules/TelegramPresentationData:TelegramPresentationData",
+    ],
+    visibility = [
+        "//visibility:public",
+    ],
+)
diff --git a/submodules/DeleteChatPeerActionSheetItem/Info.plist b/submodules/DeleteChatPeerActionSheetItem/Info.plist
deleted file mode 100644
index e1fe4cfb7b..0000000000
--- a/submodules/DeleteChatPeerActionSheetItem/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/DeleteChatPeerActionSheetItem/Sources/DeleteChatPeerActionSheetItem.h b/submodules/DeleteChatPeerActionSheetItem/Sources/DeleteChatPeerActionSheetItem.h
deleted file mode 100644
index eff87f3b1f..0000000000
--- a/submodules/DeleteChatPeerActionSheetItem/Sources/DeleteChatPeerActionSheetItem.h
+++ /dev/null
@@ -1,19 +0,0 @@
-//
-//  DeleteChatPeerActionSheetItem.h
-//  DeleteChatPeerActionSheetItem
-//
-//  Created by Peter on 8/13/19.
-//  Copyright © 2019 Telegram Messenger LLP. All rights reserved.
-//
-
-#import <UIKit/UIKit.h>
-
-//! Project version number for DeleteChatPeerActionSheetItem.
-FOUNDATION_EXPORT double DeleteChatPeerActionSheetItemVersionNumber;
-
-//! Project version string for DeleteChatPeerActionSheetItem.
-FOUNDATION_EXPORT const unsigned char DeleteChatPeerActionSheetItemVersionString[];
-
-// In this header, you should import all the public headers of your framework using statements like #import <DeleteChatPeerActionSheetItem/PublicHeader.h>
-
-
diff --git a/submodules/DeviceAccess/BUILD b/submodules/DeviceAccess/BUILD
new file mode 100644
index 0000000000..1bfb8443f5
--- /dev/null
+++ b/submodules/DeviceAccess/BUILD
@@ -0,0 +1,21 @@
+load("@build_bazel_rules_swift//swift:swift.bzl", "swift_library")
+
+swift_library(
+    name = "DeviceAccess",
+    module_name = "DeviceAccess",
+    srcs = glob([
+        "Sources/**/*.swift",
+    ]),
+    deps = [
+        "//submodules/TelegramCore:TelegramCore",
+        "//submodules/SyncCore:SyncCore",
+        "//submodules/SSignalKit/SwiftSignalKit:SwiftSignalKit",
+        "//submodules/Display:Display",
+        "//submodules/AccountContext:AccountContext",
+        "//submodules/TelegramPresentationData:TelegramPresentationData",
+        "//submodules/LegacyComponents:LegacyComponents",
+    ],
+    visibility = [
+        "//visibility:public",
+    ],
+)
diff --git a/submodules/DeviceAccess/Info.plist b/submodules/DeviceAccess/Info.plist
deleted file mode 100644
index e1fe4cfb7b..0000000000
--- a/submodules/DeviceAccess/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/DeviceAccess/Sources/DeviceAccess.h b/submodules/DeviceAccess/Sources/DeviceAccess.h
deleted file mode 100644
index bfb7ce3a32..0000000000
--- a/submodules/DeviceAccess/Sources/DeviceAccess.h
+++ /dev/null
@@ -1,19 +0,0 @@
-//
-//  DeviceAccess.h
-//  DeviceAccess
-//
-//  Created by Peter on 6/13/19.
-//  Copyright © 2019 Telegram LLP. All rights reserved.
-//
-
-#import <UIKit/UIKit.h>
-
-//! Project version number for DeviceAccess.
-FOUNDATION_EXPORT double DeviceAccessVersionNumber;
-
-//! Project version string for DeviceAccess.
-FOUNDATION_EXPORT const unsigned char DeviceAccessVersionString[];
-
-// In this header, you should import all the public headers of your framework using statements like #import <DeviceAccess/PublicHeader.h>
-
-
diff --git a/submodules/DeviceLocationManager/BUILD b/submodules/DeviceLocationManager/BUILD
new file mode 100644
index 0000000000..583f811cfb
--- /dev/null
+++ b/submodules/DeviceLocationManager/BUILD
@@ -0,0 +1,15 @@
+load("@build_bazel_rules_swift//swift:swift.bzl", "swift_library")
+
+swift_library(
+    name = "DeviceLocationManager",
+    module_name = "DeviceLocationManager",
+    srcs = glob([
+        "Sources/**/*.swift",
+    ]),
+    deps = [
+        "//submodules/SSignalKit/SwiftSignalKit:SwiftSignalKit",
+    ],
+    visibility = [
+        "//visibility:public",
+    ],
+)
diff --git a/submodules/DeviceProximity/BUCK b/submodules/DeviceProximity/BUCK
index 8d7d99755b..94392f0568 100644
--- a/submodules/DeviceProximity/BUCK
+++ b/submodules/DeviceProximity/BUCK
@@ -7,10 +7,10 @@ static_library(
     ]),
     headers = glob([
         "Sources/*.h",
-    ], exclude = ["Sources/DeviceProximity.h"]),
+    ]),
     exported_headers = glob([
-        "Sources/*.h",
-    ], exclude = ["Sources/DeviceProximity.h"]),
+        "PublicHeaders/**/*.h",
+    ]),
     frameworks = [
         "$SDKROOT/System/Library/Frameworks/Foundation.framework",
         "$SDKROOT/System/Library/Frameworks/UIKit.framework",
diff --git a/submodules/DeviceProximity/BUILD b/submodules/DeviceProximity/BUILD
new file mode 100644
index 0000000000..243c604641
--- /dev/null
+++ b/submodules/DeviceProximity/BUILD
@@ -0,0 +1,22 @@
+
+objc_library(
+    name = "DeviceProximity",
+    enable_modules = True,
+    module_name = "DeviceProximity",
+    srcs = glob([
+        "Sources/*.m",
+    ]),
+    hdrs = glob([
+        "PublicHeaders/**/*.h",
+    ]),
+    includes = [
+        "PublicHeaders",
+    ],
+    sdk_frameworks = [
+      "Foundation",
+      "UIKit",
+    ],
+    visibility = [
+        "//visibility:public",
+    ],
+)
diff --git a/submodules/DeviceProximity/Info.plist b/submodules/DeviceProximity/Info.plist
deleted file mode 100644
index e1fe4cfb7b..0000000000
--- a/submodules/DeviceProximity/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/DeviceProximity/PublicHeaders/DeviceProximity/DeviceProximity.h b/submodules/DeviceProximity/PublicHeaders/DeviceProximity/DeviceProximity.h
new file mode 100644
index 0000000000..be14dd0c27
--- /dev/null
+++ b/submodules/DeviceProximity/PublicHeaders/DeviceProximity/DeviceProximity.h
@@ -0,0 +1,5 @@
+#import <UIKit/UIKit.h>
+
+#import <DeviceProximity/DeviceProximityManager.h>
+
+
diff --git a/submodules/DeviceProximity/Sources/DeviceProximityManager.h b/submodules/DeviceProximity/PublicHeaders/DeviceProximity/DeviceProximityManager.h
similarity index 100%
rename from submodules/DeviceProximity/Sources/DeviceProximityManager.h
rename to submodules/DeviceProximity/PublicHeaders/DeviceProximity/DeviceProximityManager.h
diff --git a/submodules/DeviceProximity/Sources/DeviceProximity.h b/submodules/DeviceProximity/Sources/DeviceProximity.h
deleted file mode 100644
index 449c242823..0000000000
--- a/submodules/DeviceProximity/Sources/DeviceProximity.h
+++ /dev/null
@@ -1,11 +0,0 @@
-#import <UIKit/UIKit.h>
-
-//! Project version number for DeviceProximity.
-FOUNDATION_EXPORT double DeviceProximityVersionNumber;
-
-//! Project version string for DeviceProximity.
-FOUNDATION_EXPORT const unsigned char DeviceProximityVersionString[];
-
-#import <DeviceProximity/DeviceProximityManager.h>
-
-
diff --git a/submodules/DeviceProximity/Sources/DeviceProximityManager.m b/submodules/DeviceProximity/Sources/DeviceProximityManager.m
index 3061832dcf..94ef975a8d 100644
--- a/submodules/DeviceProximity/Sources/DeviceProximityManager.m
+++ b/submodules/DeviceProximity/Sources/DeviceProximityManager.m
@@ -1,4 +1,4 @@
-#import "DeviceProximityManager.h"
+#import <DeviceProximity/DeviceProximityManager.h>
 
 #import <UIKit/UIKit.h>
 
diff --git a/submodules/DirectionalPanGesture/BUILD b/submodules/DirectionalPanGesture/BUILD
new file mode 100644
index 0000000000..9e62d95bb1
--- /dev/null
+++ b/submodules/DirectionalPanGesture/BUILD
@@ -0,0 +1,12 @@
+load("@build_bazel_rules_swift//swift:swift.bzl", "swift_library")
+
+swift_library(
+    name = "DirectionalPanGesture",
+    module_name = "DirectionalPanGesture",
+    srcs = glob([
+        "Sources/**/*.swift",
+    ]),
+    visibility = [
+        "//visibility:public",
+    ],
+)
diff --git a/submodules/DirectionalPanGesture/Info.plist b/submodules/DirectionalPanGesture/Info.plist
deleted file mode 100644
index e1fe4cfb7b..0000000000
--- a/submodules/DirectionalPanGesture/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/DirectionalPanGesture/Sources/DirectionalPanGesture.h b/submodules/DirectionalPanGesture/Sources/DirectionalPanGesture.h
deleted file mode 100644
index 25ac53274e..0000000000
--- a/submodules/DirectionalPanGesture/Sources/DirectionalPanGesture.h
+++ /dev/null
@@ -1,19 +0,0 @@
-//
-//  DirectionalPanGesture.h
-//  DirectionalPanGesture
-//
-//  Created by Peter on 8/10/19.
-//  Copyright © 2019 Telegram Messenger LLP. All rights reserved.
-//
-
-#import <UIKit/UIKit.h>
-
-//! Project version number for DirectionalPanGesture.
-FOUNDATION_EXPORT double DirectionalPanGestureVersionNumber;
-
-//! Project version string for DirectionalPanGesture.
-FOUNDATION_EXPORT const unsigned char DirectionalPanGestureVersionString[];
-
-// In this header, you should import all the public headers of your framework using statements like #import <DirectionalPanGesture/PublicHeader.h>
-
-
diff --git a/submodules/Display/BUCK b/submodules/Display/BUCK
index 64506971d0..6fb664021d 100644
--- a/submodules/Display/BUCK
+++ b/submodules/Display/BUCK
@@ -3,16 +3,11 @@ load("//Config:buck_rule_macros.bzl", "framework")
 framework(
     name = "Display",
     srcs = glob([
-        "Display/**/*.swift",
-        "Display/**/*.m",
+        "Source/**/*.swift",
     ]),
-    headers = glob([
-        "Display/*.h",
-    ], exclude = ["Display/Display.h"]),
-    exported_headers = glob([
-        "Display/*.h",
-    ], exclude = ["Display/Display.h"]),
     deps = [
+        "//submodules/ObjCRuntimeUtils:ObjCRuntimeUtils",
+        "//submodules/UIKitRuntimeUtils:UIKitRuntimeUtils",
     	"//submodules/AsyncDisplayKit:AsyncDisplayKit#shared",
     	"//submodules/SSignalKit/SwiftSignalKit:SwiftSignalKit#shared",
         "//submodules/AppBundle:AppBundle",
diff --git a/submodules/Display/BUILD b/submodules/Display/BUILD
new file mode 100644
index 0000000000..277d09ae20
--- /dev/null
+++ b/submodules/Display/BUILD
@@ -0,0 +1,20 @@
+load("@build_bazel_rules_swift//swift:swift.bzl", "swift_library")
+
+swift_library(
+    name = "Display",
+    module_name = "Display",
+    srcs = glob([
+        "Source/**/*.swift",
+    ]),
+    deps = [
+    	"//submodules/ObjCRuntimeUtils:ObjCRuntimeUtils",
+    	"//submodules/UIKitRuntimeUtils:UIKitRuntimeUtils",
+        "//submodules/AppBundle:AppBundle",
+    	"//submodules/SSignalKit/SwiftSignalKit:SwiftSignalKit",
+        "//submodules/Markdown:Markdown",
+        "//submodules/AsyncDisplayKit:AsyncDisplayKit",
+    ],
+    visibility = [
+        "//visibility:public",
+    ],
+)
diff --git a/submodules/Display/Display/CASeeThroughTracingLayer.h b/submodules/Display/Display/CASeeThroughTracingLayer.h
deleted file mode 100644
index 8c6ff3de8e..0000000000
--- a/submodules/Display/Display/CASeeThroughTracingLayer.h
+++ /dev/null
@@ -1,9 +0,0 @@
-#import <UIKit/UIKit.h>
-
-@interface CASeeThroughTracingLayer : CALayer
-
-@end
-
-@interface CASeeThroughTracingView : UIView
-
-@end
diff --git a/submodules/Display/Display/CASeeThroughTracingLayer.m b/submodules/Display/Display/CASeeThroughTracingLayer.m
deleted file mode 100644
index 79ff8d3631..0000000000
--- a/submodules/Display/Display/CASeeThroughTracingLayer.m
+++ /dev/null
@@ -1,57 +0,0 @@
-#import "CASeeThroughTracingLayer.h"
-
-@interface CASeeThroughTracingLayer () {
-    CGPoint _parentOffset;
-}
-
-@end
-
-@implementation CASeeThroughTracingLayer
-
-- (void)addAnimation:(CAAnimation *)anim forKey:(NSString *)key {
-    [super addAnimation:anim forKey:key];
-}
-
-- (void)setFrame:(CGRect)frame {
-    [super setFrame:frame];
-    
-    [self _mirrorTransformToSublayers];
-}
-
-- (void)setBounds:(CGRect)bounds {
-    [super setBounds:bounds];
-    
-    [self _mirrorTransformToSublayers];
-}
-
-- (void)setPosition:(CGPoint)position {
-    [super setPosition:position];
-    
-    [self _mirrorTransformToSublayers];
-}
-
-- (void)_mirrorTransformToSublayers {
-    CGRect bounds = self.bounds;
-    CGPoint position = self.position;
-    
-    CGPoint sublayerParentOffset = _parentOffset;
-    sublayerParentOffset.x += position.x - (bounds.size.width) / 2.0f;
-    sublayerParentOffset.y += position.y - (bounds.size.width) / 2.0f;
-    
-    for (CALayer *sublayer in self.sublayers) {
-        if ([sublayer isKindOfClass:[CASeeThroughTracingLayer class]]) {
-            ((CASeeThroughTracingLayer *)sublayer)->_parentOffset = sublayerParentOffset;
-            [(CASeeThroughTracingLayer *)sublayer _mirrorTransformToSublayers];
-        }
-    }
-}
-
-@end
-
-@implementation CASeeThroughTracingView
-
-+ (Class)layerClass {
-    return [CASeeThroughTracingLayer class];
-}
-
-@end
diff --git a/submodules/Display/Display/CATracingLayer.h b/submodules/Display/Display/CATracingLayer.h
deleted file mode 100644
index 22037b19a4..0000000000
--- a/submodules/Display/Display/CATracingLayer.h
+++ /dev/null
@@ -1,34 +0,0 @@
-#import <UIKit/UIKit.h>
-
-@interface CATracingLayer : CALayer
-
-@end
-
-@interface CATracingLayerInfo : NSObject
-
-@property (nonatomic, readonly) bool shouldBeAdjustedToInverseTransform;
-@property (nonatomic, weak, readonly) id _Nullable userData;
-@property (nonatomic, readonly) int32_t tracingTag;
-@property (nonatomic, readonly) int32_t disableChildrenTracingTags;
-
-- (instancetype _Nonnull)initWithShouldBeAdjustedToInverseTransform:(bool)shouldBeAdjustedToInverseTransform userData:(id _Nullable)userData tracingTag:(int32_t)tracingTag disableChildrenTracingTags:(int32_t)disableChildrenTracingTags;
-
-@end
-
-@interface CALayer (Tracing)
-
-- (CATracingLayerInfo * _Nullable)traceableInfo;
-- (void)setTraceableInfo:(CATracingLayerInfo * _Nullable)info;
-
-- (bool)hasPositionOrOpacityAnimations;
-- (bool)hasPositionAnimations;
-
-- (void)setInvalidateTracingSublayers:(void (^_Nullable)())block;
-- (NSArray<NSArray<CALayer *> *> * _Nonnull)traceableLayerSurfacesWithTag:(int32_t)tracingTag;
-- (void)adjustTraceableLayerTransforms:(CGSize)offset;
-
-- (void)setPositionAnimationMirrorTarget:(CALayer * _Nullable)animationMirrorTarget;
-
-- (void)invalidateUpTheTree;
-
-@end
diff --git a/submodules/Display/Display/CATracingLayer.m b/submodules/Display/Display/CATracingLayer.m
deleted file mode 100644
index dd463b5b56..0000000000
--- a/submodules/Display/Display/CATracingLayer.m
+++ /dev/null
@@ -1,364 +0,0 @@
-#import "CATracingLayer.h"
-
-#import "RuntimeUtils.h"
-
-static void *CATracingLayerInvalidatedKey = &CATracingLayerInvalidatedKey;
-static void *CATracingLayerIsInvalidatedBlock = &CATracingLayerIsInvalidatedBlock;
-static void *CATracingLayerTraceableInfoKey = &CATracingLayerTraceableInfoKey;
-static void *CATracingLayerPositionAnimationMirrorTarget = &CATracingLayerPositionAnimationMirrorTarget;
-
-@implementation CALayer (Tracing)
-
-- (void)setInvalidateTracingSublayers:(void (^_Nullable)())block {
-    [self setAssociatedObject:[block copy] forKey:CATracingLayerIsInvalidatedBlock];
-}
-
-- (void (^_Nullable)())invalidateTracingSublayers {
-    return [self associatedObjectForKey:CATracingLayerIsInvalidatedBlock];
-}
-
-- (bool)isTraceable {
-    return [self associatedObjectForKey:CATracingLayerTraceableInfoKey] != nil || [self isKindOfClass:[CATracingLayer class]];
-}
-
-- (CATracingLayerInfo * _Nullable)traceableInfo {
-    return [self associatedObjectForKey:CATracingLayerTraceableInfoKey];
-}
-
-- (void)setTraceableInfo:(CATracingLayerInfo * _Nullable)info {
-    [self setAssociatedObject:info forKey:CATracingLayerTraceableInfoKey];
-}
-
-- (bool)hasPositionOrOpacityAnimations {
-    return [self animationForKey:@"position"] != nil || [self animationForKey:@"bounds"] != nil || [self animationForKey:@"sublayerTransform"] != nil || [self animationForKey:@"opacity"] != nil;
-}
-
-- (bool)hasPositionAnimations {
-    return [self animationForKey:@"position"] != nil || [self animationForKey:@"bounds"] != nil;
-}
-
-static void traceLayerSurfaces(int32_t tracingTag, int depth, CALayer * _Nonnull layer, NSMutableDictionary<NSNumber *, NSMutableArray<CALayer *> *> *layersByDepth, bool skipIfNoTraceableSublayers) {
-    bool hadTraceableSublayers = false;
-    for (CALayer *sublayer in layer.sublayers.reverseObjectEnumerator) {
-        CATracingLayerInfo *sublayerTraceableInfo = [sublayer traceableInfo];
-        if (sublayerTraceableInfo != nil && sublayerTraceableInfo.tracingTag == tracingTag) {
-            NSMutableArray *array = layersByDepth[@(depth)];
-            if (array == nil) {
-                array = [[NSMutableArray alloc] init];
-                layersByDepth[@(depth)] = array;
-            }
-            [array addObject:sublayer];
-            hadTraceableSublayers = true;
-        }
-        if (sublayerTraceableInfo.disableChildrenTracingTags & tracingTag) {
-            return;
-        }
-    }
-    
-    if (!skipIfNoTraceableSublayers || !hadTraceableSublayers) {
-        for (CALayer *sublayer in layer.sublayers.reverseObjectEnumerator) {
-            if ([sublayer isKindOfClass:[CATracingLayer class]]) {
-                traceLayerSurfaces(tracingTag, depth + 1, sublayer, layersByDepth, hadTraceableSublayers);
-            }
-        }
-    }
-}
-
-- (NSArray<NSArray<CALayer *> *> * _Nonnull)traceableLayerSurfacesWithTag:(int32_t)tracingTag {
-    NSMutableDictionary<NSNumber *, NSMutableArray<CALayer *> *> *layersByDepth = [[NSMutableDictionary alloc] init];
-    
-    traceLayerSurfaces(tracingTag, 0, self, layersByDepth, false);
-    
-    NSMutableArray<NSMutableArray<CALayer *> *> *result = [[NSMutableArray alloc] init];
-    
-    for (id key in [[layersByDepth allKeys] sortedArrayUsingSelector:@selector(compare:)]) {
-        [result addObject:layersByDepth[key]];
-    }
-    
-    return result;
-}
-
-- (void)adjustTraceableLayerTransforms:(CGSize)offset {
-    CGRect frame = self.frame;
-    CGSize sublayerOffset = CGSizeMake(frame.origin.x + offset.width, frame.origin.y + offset.height);
-    for (CALayer *sublayer in self.sublayers) {
-        CATracingLayerInfo *sublayerTraceableInfo = [sublayer traceableInfo];
-        if (sublayerTraceableInfo != nil && sublayerTraceableInfo.shouldBeAdjustedToInverseTransform) {
-            sublayer.sublayerTransform = CATransform3DMakeTranslation(-sublayerOffset.width, -sublayerOffset.height, 0.0f);
-        } else if ([sublayer isKindOfClass:[CATracingLayer class]]) {
-            [(CATracingLayer *)sublayer adjustTraceableLayerTransforms:sublayerOffset];
-        }
-    }
-}
-
-- (CALayer * _Nullable)animationMirrorTarget {
-    return [self associatedObjectForKey:CATracingLayerPositionAnimationMirrorTarget];
-}
-
-- (void)setPositionAnimationMirrorTarget:(CALayer * _Nullable)animationMirrorTarget {
-    [self setAssociatedObject:animationMirrorTarget forKey:CATracingLayerPositionAnimationMirrorTarget associationPolicy:NSObjectAssociationPolicyRetain];
-}
-
-- (void)invalidateUpTheTree {
-    CALayer *superlayer = self;
-    while (true) {
-        if (superlayer == nil) {
-            break;
-        }
-        
-        void (^block)() = [superlayer invalidateTracingSublayers];
-        if (block != nil) {
-            block();
-        }
-        
-        superlayer = superlayer.superlayer;
-    }
-}
-
-@end
-
-@interface CATracingLayerAnimationDelegate : NSObject <CAAnimationDelegate> {
-    id<CAAnimationDelegate> _delegate;
-    void (^_animationStopped)();
-}
-
-@end
-
-@implementation CATracingLayerAnimationDelegate
-
-- (instancetype)initWithDelegate:(id<CAAnimationDelegate>)delegate animationStopped:(void (^_Nonnull)())animationStopped {
-    _delegate = delegate;
-    _animationStopped = [animationStopped copy];
-    return self;
-}
-
-- (void)animationDidStart:(CAAnimation *)anim {
-    if ([_delegate respondsToSelector:@selector(animationDidStart:)]) {
-        [(id)_delegate animationDidStart:anim];
-    }
-}
-
-- (void)animationDidStop:(CAAnimation *)anim finished:(BOOL)flag {
-    if ([_delegate respondsToSelector:@selector(animationDidStop:finished:)]) {
-        [(id)_delegate animationDidStop:anim finished:flag];
-    }
-    
-    if (_animationStopped) {
-        _animationStopped();
-    }
-}
-
-@end
-
-@interface CATracingLayer ()
-
-@property (nonatomic) bool isInvalidated;
-
-@end
-
-@implementation CATracingLayer
-
-- (void)setNeedsDisplay {
-}
-
-- (void)displayIfNeeded {
-}
-
-- (bool)isInvalidated {
-    return [[self associatedObjectForKey:CATracingLayerInvalidatedKey] intValue] != 0;
-}
-
-- (void)setIsInvalidated:(bool)isInvalidated {
-    [self setAssociatedObject: isInvalidated ? @1 : @0 forKey:CATracingLayerInvalidatedKey];
-}
-
-- (void)setPosition:(CGPoint)position {
-    [super setPosition:position];
-    
-    [self invalidateUpTheTree];
-}
-
-- (void)setOpacity:(float)opacity {
-    [super setOpacity:opacity];
-    
-    [self invalidateUpTheTree];
-}
-
-- (void)addSublayer:(CALayer *)layer {
-    [super addSublayer:layer];
-    
-    if ([layer isTraceable] || [layer isKindOfClass:[CATracingLayer class]]) {
-        [self invalidateUpTheTree];
-    }
-}
-
-- (void)insertSublayer:(CALayer *)layer atIndex:(unsigned)idx {
-    [super insertSublayer:layer atIndex:idx];
-    
-    if ([layer isTraceable] || [layer isKindOfClass:[CATracingLayer class]]) {
-        [self invalidateUpTheTree];
-    }
-}
-
-- (void)insertSublayer:(CALayer *)layer below:(nullable CALayer *)sibling {
-    [super insertSublayer:layer below:sibling];
-    
-    if ([layer isTraceable] || [layer isKindOfClass:[CATracingLayer class]]) {
-        [self invalidateUpTheTree];
-    }
-}
-
-- (void)insertSublayer:(CALayer *)layer above:(nullable CALayer *)sibling {
-    [super insertSublayer:layer above:sibling];
-    
-    if ([layer isTraceable] || [layer isKindOfClass:[CATracingLayer class]]) {
-        [self invalidateUpTheTree];
-    }
-}
-
-- (void)replaceSublayer:(CALayer *)layer with:(CALayer *)layer2 {
-    [super replaceSublayer:layer with:layer2];
-    
-    if ([layer isTraceable] || [layer2 isTraceable]) {
-        [self invalidateUpTheTree];
-    }
-}
-
-- (void)removeFromSuperlayer {
-    if ([self isTraceable]) {
-        [self invalidateUpTheTree];
-    }
-    
-    [super removeFromSuperlayer];
-}
-
-- (void)addAnimation:(CAAnimation *)anim forKey:(NSString *)key {
-    if ([anim isKindOfClass:[CABasicAnimation class]]) {
-        if (false && [key isEqualToString:@"bounds.origin.y"]) {
-            CABasicAnimation *animCopy = [anim copy];
-            CGFloat from = [animCopy.fromValue floatValue];
-            CGFloat to = [animCopy.toValue floatValue];
-            
-            animCopy.fromValue = [NSValue valueWithCATransform3D:CATransform3DMakeTranslation(0.0, to - from, 0.0f)];
-            animCopy.toValue = [NSValue valueWithCATransform3D:CATransform3DIdentity];
-            animCopy.keyPath = @"sublayerTransform";
-            
-            __weak CATracingLayer *weakSelf = self;
-            anim.delegate = [[CATracingLayerAnimationDelegate alloc] initWithDelegate:anim.delegate animationStopped:^{
-                __strong CATracingLayer *strongSelf = weakSelf;
-                if (strongSelf != nil) {
-                    [strongSelf invalidateUpTheTree];
-                }
-            }];
-            
-            [super addAnimation:anim forKey:key];
-            
-            CABasicAnimation *positionAnimCopy = [animCopy copy];
-            positionAnimCopy.fromValue = [NSValue valueWithCATransform3D:CATransform3DMakeTranslation(0.0, 0.0, 0.0f)];
-            positionAnimCopy.toValue = [NSValue valueWithCATransform3D:CATransform3DIdentity];
-            positionAnimCopy.additive = true;
-            positionAnimCopy.delegate = [[CATracingLayerAnimationDelegate alloc] initWithDelegate:anim.delegate animationStopped:^{
-                __strong CATracingLayer *strongSelf = weakSelf;
-                if (strongSelf != nil) {
-                    [strongSelf invalidateUpTheTree];
-                }
-            }];
-            
-            [self invalidateUpTheTree];
-            
-            [self mirrorAnimationDownTheTree:animCopy key:@"sublayerTransform"];
-            [self mirrorPositionAnimationDownTheTree:positionAnimCopy key:@"sublayerTransform"];
-        } else if ([key isEqualToString:@"position"]) {
-            CABasicAnimation *animCopy = [anim copy];
-            CGPoint from = [animCopy.fromValue CGPointValue];
-            CGPoint to = [animCopy.toValue CGPointValue];
-            
-            animCopy.fromValue = [NSValue valueWithCATransform3D:CATransform3DMakeTranslation(to.x - from.x, to.y - from.y, 0.0f)];
-            animCopy.toValue = [NSValue valueWithCATransform3D:CATransform3DIdentity];
-            animCopy.keyPath = @"sublayerTransform";
-            
-            __weak CATracingLayer *weakSelf = self;
-            anim.delegate = [[CATracingLayerAnimationDelegate alloc] initWithDelegate:anim.delegate animationStopped:^{
-                __strong CATracingLayer *strongSelf = weakSelf;
-                if (strongSelf != nil) {
-                    [strongSelf invalidateUpTheTree];
-                }
-            }];
-            
-            [super addAnimation:anim forKey:key];
-            
-            CABasicAnimation *positionAnimCopy = [animCopy copy];
-            positionAnimCopy.fromValue = [NSValue valueWithCATransform3D:CATransform3DMakeTranslation(-to.x + from.x, 0.0, 0.0f)];
-            positionAnimCopy.toValue = [NSValue valueWithCATransform3D:CATransform3DIdentity];
-            positionAnimCopy.additive = true;
-            positionAnimCopy.delegate = [[CATracingLayerAnimationDelegate alloc] initWithDelegate:anim.delegate animationStopped:^{
-                __strong CATracingLayer *strongSelf = weakSelf;
-                if (strongSelf != nil) {
-                    [strongSelf invalidateUpTheTree];
-                }
-            }];
-            
-            [self invalidateUpTheTree];
-            
-            [self mirrorAnimationDownTheTree:animCopy key:@"sublayerTransform"];
-            [self mirrorPositionAnimationDownTheTree:positionAnimCopy key:@"sublayerTransform"];
-        } else if ([key isEqualToString:@"opacity"]) {
-            __weak CATracingLayer *weakSelf = self;
-            anim.delegate = [[CATracingLayerAnimationDelegate alloc] initWithDelegate:anim.delegate animationStopped:^{
-                __strong CATracingLayer *strongSelf = weakSelf;
-                if (strongSelf != nil) {
-                    [strongSelf invalidateUpTheTree];
-                }
-            }];
-            
-            [super addAnimation:anim forKey:key];
-            
-            [self invalidateUpTheTree];
-        } else {
-            [super addAnimation:anim forKey:key];
-        }
-    } else {
-        [super addAnimation:anim forKey:key];
-    }
-}
-
-- (void)mirrorPositionAnimationDownTheTree:(CAAnimation *)animation key:(NSString *)key {
-    if ([animation isKindOfClass:[CABasicAnimation class]]) {
-        if ([((CABasicAnimation *)animation).keyPath isEqualToString:@"sublayerTransform"]) {
-            CALayer *positionAnimationMirrorTarget = [self animationMirrorTarget];
-            if (positionAnimationMirrorTarget != nil) {
-                [positionAnimationMirrorTarget addAnimation:[animation copy] forKey:key];
-            }
-        }
-    }
-}
-
-- (void)mirrorAnimationDownTheTree:(CAAnimation *)animation key:(NSString *)key {
-    for (CALayer *sublayer in self.sublayers) {
-        CATracingLayerInfo *traceableInfo = [sublayer traceableInfo];
-        if (traceableInfo != nil && traceableInfo.shouldBeAdjustedToInverseTransform) {
-            [sublayer addAnimation:[animation copy] forKey:key];
-        }
-        
-        if ([sublayer isKindOfClass:[CATracingLayer class]]) {
-            [(CATracingLayer *)sublayer mirrorAnimationDownTheTree:animation key:key];
-        }
-    }
-}
-
-@end
-
-@implementation CATracingLayerInfo
-
-- (instancetype _Nonnull)initWithShouldBeAdjustedToInverseTransform:(bool)shouldBeAdjustedToInverseTransform userData:(id _Nullable)userData tracingTag:(int32_t)tracingTag disableChildrenTracingTags:(int32_t)disableChildrenTracingTags {
-    self = [super init];
-    if (self != nil) {
-        _shouldBeAdjustedToInverseTransform = shouldBeAdjustedToInverseTransform;
-        _userData = userData;
-        _tracingTag = tracingTag;
-        _disableChildrenTracingTags = disableChildrenTracingTags;
-    }
-    return self;
-}
-
-@end
diff --git a/submodules/Display/Display/Display.h b/submodules/Display/Display/Display.h
deleted file mode 100644
index e013c37f97..0000000000
--- a/submodules/Display/Display/Display.h
+++ /dev/null
@@ -1,33 +0,0 @@
-//
-//  Display.h
-//  Display
-//
-//  Created by Peter on 29/07/15.
-//  Copyright © 2015 Telegram. All rights reserved.
-//
-
-#import <UIKit/UIKit.h>
-
-//! Project version number for Display.
-FOUNDATION_EXPORT double DisplayVersionNumber;
-
-//! Project version string for Display.
-FOUNDATION_EXPORT const unsigned char DisplayVersionString[];
-
-// In this header, you should import all the public headers of your framework using statements like #import <Display/PublicHeader.h>
-
-#import <Display/RuntimeUtils.h>
-#import <Display/UIViewController+Navigation.h>
-#import <Display/UIKitUtils.h>
-#import <Display/UINavigationItem+Proxy.h>
-#import <Display/UIWindow+OrientationChange.h>
-#import <Display/NotificationCenterUtils.h>
-#import <Display/NSBag.h>
-#import <Display/UIBarButtonItem+Proxy.h>
-#import <Display/NavigationControllerProxy.h>
-#import <Display/NavigationBarProxy.h>
-#import <UIKit/UIGestureRecognizerSubclass.h>
-#import <Display/NSWeakReference.h>
-#import <Display/CATracingLayer.h>
-#import <Display/CASeeThroughTracingLayer.h>
-#import <Display/UIMenuItem+Icons.h>
diff --git a/submodules/Display/Display/Info.plist b/submodules/Display/Display/Info.plist
deleted file mode 100644
index d3de8eefb6..0000000000
--- a/submodules/Display/Display/Info.plist
+++ /dev/null
@@ -1,26 +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>CFBundleSignature</key>
-	<string>????</string>
-	<key>CFBundleVersion</key>
-	<string>$(CURRENT_PROJECT_VERSION)</string>
-	<key>NSPrincipalClass</key>
-	<string></string>
-</dict>
-</plist>
diff --git a/submodules/Display/Display/InteractiveTransitionGestureRecognizer.swift b/submodules/Display/Display/InteractiveTransitionGestureRecognizer.swift
deleted file mode 100644
index 6462a0d325..0000000000
--- a/submodules/Display/Display/InteractiveTransitionGestureRecognizer.swift
+++ /dev/null
@@ -1,111 +0,0 @@
-import Foundation
-import UIKit
-
-private func hasHorizontalGestures(_ view: UIView, point: CGPoint?) -> Bool {
-    if view.disablesInteractiveTransitionGestureRecognizer {
-        return true
-    }
-    if let disablesInteractiveTransitionGestureRecognizerNow = view.disablesInteractiveTransitionGestureRecognizerNow, disablesInteractiveTransitionGestureRecognizerNow() {
-        return true
-    }
-    
-    if let point = point, let test = view.interactiveTransitionGestureRecognizerTest, test(point) {
-        return true
-    }
-    
-    if let view = view as? ListViewBackingView {
-        let transform = view.transform
-        let angle: Double = Double(atan2f(Float(transform.b), Float(transform.a)))
-        let term1: Double = abs(angle - Double.pi / 2.0)
-        let term2: Double = abs(angle + Double.pi / 2.0)
-        let term3: Double = abs(angle - Double.pi * 3.0 / 2.0)
-        if term1 < 0.001 || term2 < 0.001 || term3 < 0.001 {
-            return true
-        }
-    }
-    
-    if let superview = view.superview {
-        return hasHorizontalGestures(superview, point: point != nil ? view.convert(point!, to: superview) : nil)
-    } else {
-        return false
-    }
-}
-
-public struct InteractiveTransitionGestureRecognizerDirections: OptionSet {
-    public var rawValue: Int
-    
-    public init(rawValue: Int) {
-        self.rawValue = rawValue
-    }
-    
-    public static let left = InteractiveTransitionGestureRecognizerDirections(rawValue: 1 << 0)
-    public static let right = InteractiveTransitionGestureRecognizerDirections(rawValue: 1 << 1)
-}
-
-public class InteractiveTransitionGestureRecognizer: UIPanGestureRecognizer {
-    private let allowedDirections: () -> InteractiveTransitionGestureRecognizerDirections
-    
-    private var validatedGesture = false
-    private var firstLocation: CGPoint = CGPoint()
-    private var currentAllowedDirections: InteractiveTransitionGestureRecognizerDirections = []
-    
-    public init(target: Any?, action: Selector?, allowedDirections: @escaping () -> InteractiveTransitionGestureRecognizerDirections) {
-        self.allowedDirections = allowedDirections
-        
-        super.init(target: target, action: action)
-        
-        self.maximumNumberOfTouches = 1
-    }
-    
-    override public func reset() {
-        super.reset()
-        
-        self.validatedGesture = false
-        self.currentAllowedDirections = []
-    }
-    
-    override public func touchesBegan(_ touches: Set<UITouch>, with event: UIEvent) {
-        self.currentAllowedDirections = self.allowedDirections()
-        if self.currentAllowedDirections.isEmpty {
-            self.state = .failed
-            return
-        }
-        
-        super.touchesBegan(touches, with: event)
-        
-        let touch = touches.first!
-        self.firstLocation = touch.location(in: self.view)
-        
-        if let target = self.view?.hitTest(self.firstLocation, with: event) {
-            if hasHorizontalGestures(target, point: self.view?.convert(self.firstLocation, to: target)) {
-                self.state = .cancelled
-            }
-        }
-    }
-    
-    override public func touchesMoved(_ touches: Set<UITouch>, with event: UIEvent) {
-        let location = touches.first!.location(in: self.view)
-        let translation = CGPoint(x: location.x - firstLocation.x, y: location.y - firstLocation.y)
-        
-        let absTranslationX: CGFloat = abs(translation.x)
-        let absTranslationY: CGFloat = abs(translation.y)
-        
-        if !self.validatedGesture {
-            if self.currentAllowedDirections.contains(.right) && self.firstLocation.x < 16.0 {
-                self.validatedGesture = true
-            } else if !self.currentAllowedDirections.contains(.left) && translation.x < 0.0 {
-                self.state = .failed
-            } else if !self.currentAllowedDirections.contains(.right) && translation.x > 0.0 {
-                self.state = .failed
-            } else if absTranslationY > 2.0 && absTranslationY > absTranslationX * 2.0 {
-                self.state = .failed
-            } else if absTranslationX > 2.0 && absTranslationY * 2.0 < absTranslationX {
-                self.validatedGesture = true
-            }
-        }
-        
-        if validatedGesture {
-            super.touchesMoved(touches, with: event)
-        }
-    }
-}
diff --git a/submodules/Display/Display/NavigationBarProxy.h b/submodules/Display/Display/NavigationBarProxy.h
deleted file mode 100644
index 9936b4726a..0000000000
--- a/submodules/Display/Display/NavigationBarProxy.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#import <UIKit/UIKit.h>
-
-@interface NavigationBarProxy : UINavigationBar
-
-@property (nonatomic, copy) void (^setItemsProxy)(NSArray *, NSArray *, bool);
-
-@end
diff --git a/submodules/Display/Display/NavigationBarProxy.m b/submodules/Display/Display/NavigationBarProxy.m
deleted file mode 100644
index 9f5700c13b..0000000000
--- a/submodules/Display/Display/NavigationBarProxy.m
+++ /dev/null
@@ -1,67 +0,0 @@
-#import "NavigationBarProxy.h"
-
-@interface NavigationBarProxy ()
-{
-    NSArray *_items;
-}
-
-@end
-
-@implementation NavigationBarProxy
-
-- (instancetype)initWithFrame:(CGRect)frame
-{
-    self = [super initWithFrame:frame];
-    if (self != nil)
-    {
-    }
-    return self;
-}
-
-- (void)pushNavigationItem:(UINavigationItem *)item animated:(BOOL)animated
-{
-    [self setItems:[[self items] arrayByAddingObject:item] animated:animated];
-}
-
-- (UINavigationItem *)popNavigationItemAnimated:(BOOL)animated
-{
-    NSMutableArray *items = [[NSMutableArray alloc] initWithArray:[self items]];
-    UINavigationItem *lastItem = [items lastObject];
-    [items removeLastObject];
-    [self setItems:items animated:animated];
-    return lastItem;
-}
-
-- (UINavigationItem *)topItem
-{
-    return [[self items] lastObject];
-}
-
-- (UINavigationItem *)backItem
-{
-    NSLog(@"backItem");
-    return nil;
-}
-
-- (NSArray *)items
-{
-    if (_items == nil)
-        return @[];
-    return _items;
-}
-
-- (void)setItems:(NSArray *)items
-{
-    [self setItems:items animated:false];
-}
-
-- (void)setItems:(NSArray *)items animated:(BOOL)animated
-{
-    NSArray *previousItems = _items;
-    _items = items;
-    
-    if (_setItemsProxy)
-        _setItemsProxy(previousItems, items, animated);
-}
-
-@end
diff --git a/submodules/Display/Display/NavigationControllerProxy.h b/submodules/Display/Display/NavigationControllerProxy.h
deleted file mode 100644
index 02e4fb6208..0000000000
--- a/submodules/Display/Display/NavigationControllerProxy.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#import <UIKit/UIKit.h>
-
-@interface NavigationControllerProxy : UINavigationController
-
-- (instancetype)init;
-
-@end
diff --git a/submodules/Display/Display/NavigationControllerProxy.m b/submodules/Display/Display/NavigationControllerProxy.m
deleted file mode 100644
index 6a86a5062f..0000000000
--- a/submodules/Display/Display/NavigationControllerProxy.m
+++ /dev/null
@@ -1,15 +0,0 @@
-#import "NavigationControllerProxy.h"
-
-#import "NavigationBarProxy.h"
-
-@implementation NavigationControllerProxy
-
-- (instancetype)init
-{
-    self = [super initWithNavigationBarClass:[NavigationBarProxy class] toolbarClass:[UIToolbar class]];
-    if (self != nil) {
-    }
-    return self;
-}
-
-@end
diff --git a/submodules/Display/Display/UIKitUtils.h b/submodules/Display/Display/UIKitUtils.h
deleted file mode 100644
index 71c6a986d7..0000000000
--- a/submodules/Display/Display/UIKitUtils.h
+++ /dev/null
@@ -1,16 +0,0 @@
-#import <UIKit/UIKit.h>
-#import <Foundation/Foundation.h>
-
-@interface UIView (AnimationUtils)
-
-+ (double)animationDurationFactor;
-
-@end
-
-CABasicAnimation * _Nonnull makeSpringAnimation(NSString * _Nonnull keyPath);
-CABasicAnimation * _Nonnull makeSpringBounceAnimation(NSString * _Nonnull keyPath, CGFloat initialVelocity, CGFloat damping);
-CGFloat springAnimationValueAt(CABasicAnimation * _Nonnull animation, CGFloat t);
-
-void testZoomBlurEffect(UIVisualEffect *effect);
-UIBlurEffect *makeCustomZoomBlurEffect();
-void applySmoothRoundedCorners(CALayer * _Nonnull layer);
diff --git a/submodules/Display/DisplayTests/DisplayTests.swift b/submodules/Display/DisplayTests/DisplayTests.swift
deleted file mode 100644
index 3f8d2f268a..0000000000
--- a/submodules/Display/DisplayTests/DisplayTests.swift
+++ /dev/null
@@ -1,36 +0,0 @@
-//
-//  DisplayTests.swift
-//  DisplayTests
-//
-//  Created by Peter on 29/07/15.
-//  Copyright © 2015 Telegram. All rights reserved.
-//
-
-import XCTest
-@testable import Display
-
-class DisplayTests: XCTestCase {
-    
-    override func setUp() {
-        super.setUp()
-        // Put setup code here. This method is called before the invocation of each test method in the class.
-    }
-    
-    override func tearDown() {
-        // Put teardown code here. This method is called after the invocation of each test method in the class.
-        super.tearDown()
-    }
-    
-    func testExample() {
-        // This is an example of a functional test case.
-        // Use XCTAssert and related functions to verify your tests produce the correct results.
-    }
-    
-    func testPerformanceExample() {
-        // This is an example of a performance test case.
-        self.measure {
-            // Put the code you want to measure the time of here.
-        }
-    }
-    
-}
diff --git a/submodules/Display/DisplayTests/Info.plist b/submodules/Display/DisplayTests/Info.plist
deleted file mode 100644
index ba72822e87..0000000000
--- a/submodules/Display/DisplayTests/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>BNDL</string>
-	<key>CFBundleShortVersionString</key>
-	<string>1.0</string>
-	<key>CFBundleSignature</key>
-	<string>????</string>
-	<key>CFBundleVersion</key>
-	<string>1</string>
-</dict>
-</plist>
diff --git a/submodules/Display/Display/ASTransformLayerNode.swift b/submodules/Display/Source/ASTransformLayerNode.swift
similarity index 100%
rename from submodules/Display/Display/ASTransformLayerNode.swift
rename to submodules/Display/Source/ASTransformLayerNode.swift
diff --git a/submodules/Display/Display/Accessibility.swift b/submodules/Display/Source/Accessibility.swift
similarity index 100%
rename from submodules/Display/Display/Accessibility.swift
rename to submodules/Display/Source/Accessibility.swift
diff --git a/submodules/Display/Display/AccessibilityAreaNode.swift b/submodules/Display/Source/AccessibilityAreaNode.swift
similarity index 100%
rename from submodules/Display/Display/AccessibilityAreaNode.swift
rename to submodules/Display/Source/AccessibilityAreaNode.swift
diff --git a/submodules/Display/Display/ActionSheetButtonItem.swift b/submodules/Display/Source/ActionSheetButtonItem.swift
similarity index 95%
rename from submodules/Display/Display/ActionSheetButtonItem.swift
rename to submodules/Display/Source/ActionSheetButtonItem.swift
index 89abbaf404..5c02b3c448 100644
--- a/submodules/Display/Display/ActionSheetButtonItem.swift
+++ b/submodules/Display/Source/ActionSheetButtonItem.swift
@@ -53,7 +53,7 @@ public class ActionSheetButtonNode: ActionSheetItemNode {
     private var item: ActionSheetButtonItem?
     
     private let button: HighlightTrackingButton
-    private let label: ASTextNode
+    private let label: ImmediateTextNode
     private let accessibilityArea: AccessibilityAreaNode
     
     override public init(theme: ActionSheetControllerTheme) {
@@ -65,11 +65,11 @@ public class ActionSheetButtonNode: ActionSheetItemNode {
         self.button = HighlightTrackingButton()
         self.button.isAccessibilityElement = false
         
-        self.label = ASTextNode()
+        self.label = ImmediateTextNode()
         self.label.isUserInteractionEnabled = false
         self.label.maximumNumberOfLines = 1
         self.label.displaysAsynchronously = false
-        self.label.truncationMode = .byTruncatingTail
+        self.label.truncationType = .end
         
         self.accessibilityArea = AccessibilityAreaNode()
         
@@ -147,7 +147,7 @@ public class ActionSheetButtonNode: ActionSheetItemNode {
         
         self.button.frame = CGRect(origin: CGPoint(), size: size)
         
-        let labelSize = self.label.measure(CGSize(width: max(1.0, size.width - 10.0), height: size.height))
+        let labelSize = self.label.updateLayout(CGSize(width: max(1.0, size.width - 10.0), height: size.height))
         self.label.frame = CGRect(origin: CGPoint(x: floorToScreenPixels((size.width - labelSize.width) / 2.0), y: floorToScreenPixels((size.height - labelSize.height) / 2.0)), size: labelSize)
         self.accessibilityArea.frame = CGRect(origin: CGPoint(), size: size)
     }
diff --git a/submodules/Display/Display/ActionSheetCheckboxItem.swift b/submodules/Display/Source/ActionSheetCheckboxItem.swift
similarity index 99%
rename from submodules/Display/Display/ActionSheetCheckboxItem.swift
rename to submodules/Display/Source/ActionSheetCheckboxItem.swift
index a24220e064..e4472f0539 100644
--- a/submodules/Display/Display/ActionSheetCheckboxItem.swift
+++ b/submodules/Display/Source/ActionSheetCheckboxItem.swift
@@ -73,7 +73,6 @@ public class ActionSheetCheckboxItemNode: ActionSheetItemNode {
         
         self.checkNode = ASImageNode()
         self.checkNode.isUserInteractionEnabled = false
-        self.checkNode.displayWithoutProcessing = true
         self.checkNode.displaysAsynchronously = false
         self.checkNode.image = generateImage(CGSize(width: 14.0, height: 11.0), rotatedContext: { size, context in
             context.clear(CGRect(origin: CGPoint(), size: size))
diff --git a/submodules/Display/Display/ActionSheetController.swift b/submodules/Display/Source/ActionSheetController.swift
similarity index 100%
rename from submodules/Display/Display/ActionSheetController.swift
rename to submodules/Display/Source/ActionSheetController.swift
diff --git a/submodules/Display/Display/ActionSheetControllerNode.swift b/submodules/Display/Source/ActionSheetControllerNode.swift
similarity index 100%
rename from submodules/Display/Display/ActionSheetControllerNode.swift
rename to submodules/Display/Source/ActionSheetControllerNode.swift
diff --git a/submodules/Display/Display/ActionSheetItem.swift b/submodules/Display/Source/ActionSheetItem.swift
similarity index 100%
rename from submodules/Display/Display/ActionSheetItem.swift
rename to submodules/Display/Source/ActionSheetItem.swift
diff --git a/submodules/Display/Display/ActionSheetItemGroup.swift b/submodules/Display/Source/ActionSheetItemGroup.swift
similarity index 100%
rename from submodules/Display/Display/ActionSheetItemGroup.swift
rename to submodules/Display/Source/ActionSheetItemGroup.swift
diff --git a/submodules/Display/Display/ActionSheetItemGroupNode.swift b/submodules/Display/Source/ActionSheetItemGroupNode.swift
similarity index 100%
rename from submodules/Display/Display/ActionSheetItemGroupNode.swift
rename to submodules/Display/Source/ActionSheetItemGroupNode.swift
diff --git a/submodules/Display/Display/ActionSheetItemGroupsContainerNode.swift b/submodules/Display/Source/ActionSheetItemGroupsContainerNode.swift
similarity index 100%
rename from submodules/Display/Display/ActionSheetItemGroupsContainerNode.swift
rename to submodules/Display/Source/ActionSheetItemGroupsContainerNode.swift
diff --git a/submodules/Display/Display/ActionSheetItemNode.swift b/submodules/Display/Source/ActionSheetItemNode.swift
similarity index 100%
rename from submodules/Display/Display/ActionSheetItemNode.swift
rename to submodules/Display/Source/ActionSheetItemNode.swift
diff --git a/submodules/Display/Display/ActionSheetSwitchItem.swift b/submodules/Display/Source/ActionSheetSwitchItem.swift
similarity index 94%
rename from submodules/Display/Display/ActionSheetSwitchItem.swift
rename to submodules/Display/Source/ActionSheetSwitchItem.swift
index 7dddc07701..110a4b4277 100644
--- a/submodules/Display/Display/ActionSheetSwitchItem.swift
+++ b/submodules/Display/Source/ActionSheetSwitchItem.swift
@@ -35,7 +35,7 @@ public class ActionSheetSwitchNode: ActionSheetItemNode {
     private var item: ActionSheetSwitchItem?
     
     private let button: HighlightTrackingButton
-    private let label: ASTextNode
+    private let label: ImmediateTextNode
     private let switchNode: SwitchNode
     
     private let accessibilityArea: AccessibilityAreaNode
@@ -47,11 +47,11 @@ public class ActionSheetSwitchNode: ActionSheetItemNode {
         self.button = HighlightTrackingButton()
         self.button.isAccessibilityElement = false
         
-        self.label = ASTextNode()
+        self.label = ImmediateTextNode()
         self.label.isUserInteractionEnabled = false
         self.label.maximumNumberOfLines = 1
         self.label.displaysAsynchronously = false
-        self.label.truncationMode = .byTruncatingTail
+        self.label.truncationType = .end
         self.label.isAccessibilityElement = false
         
         self.switchNode = SwitchNode()
@@ -115,7 +115,7 @@ public class ActionSheetSwitchNode: ActionSheetItemNode {
         
         self.button.frame = CGRect(origin: CGPoint(), size: size)
         
-        let labelSize = self.label.measure(CGSize(width: max(1.0, size.width - 51.0 - 16.0 * 2.0), height: size.height))
+        let labelSize = self.label.updateLayout(CGSize(width: max(1.0, size.width - 51.0 - 16.0 * 2.0), height: size.height))
         self.label.frame = CGRect(origin: CGPoint(x: 16.0, y: floorToScreenPixels((size.height - labelSize.height) / 2.0)), size: labelSize)
         
         let switchSize = CGSize(width: 51.0, height: 31.0)
diff --git a/submodules/Display/Display/ActionSheetTextItem.swift b/submodules/Display/Source/ActionSheetTextItem.swift
similarity index 87%
rename from submodules/Display/Display/ActionSheetTextItem.swift
rename to submodules/Display/Source/ActionSheetTextItem.swift
index 65f0be42b0..c49add5114 100644
--- a/submodules/Display/Display/ActionSheetTextItem.swift
+++ b/submodules/Display/Source/ActionSheetTextItem.swift
@@ -32,7 +32,7 @@ public class ActionSheetTextNode: ActionSheetItemNode {
     
     private var item: ActionSheetTextItem?
     
-    private let label: ASTextNode
+    private let label: ImmediateTextNode
     
     private let accessibilityArea: AccessibilityAreaNode
     
@@ -40,11 +40,11 @@ public class ActionSheetTextNode: ActionSheetItemNode {
         self.theme = theme
         self.defaultFont = Font.regular(floor(theme.baseFontSize * 13.0 / 17.0))
         
-        self.label = ASTextNode()
+        self.label = ImmediateTextNode()
         self.label.isUserInteractionEnabled = false
         self.label.maximumNumberOfLines = 0
         self.label.displaysAsynchronously = false
-        self.label.truncationMode = .byTruncatingTail
+        self.label.truncationType = .end
         self.label.isAccessibilityElement = false
         
         self.accessibilityArea = AccessibilityAreaNode()
@@ -70,7 +70,7 @@ public class ActionSheetTextNode: ActionSheetItemNode {
     }
     
     public override func calculateSizeThatFits(_ constrainedSize: CGSize) -> CGSize {
-        let labelSize = self.label.measure(CGSize(width: max(1.0, constrainedSize.width - 20.0), height: constrainedSize.height))
+        let labelSize = self.label.updateLayout(CGSize(width: max(1.0, constrainedSize.width - 20.0), height: constrainedSize.height))
         return CGSize(width: constrainedSize.width, height: max(57.0, labelSize.height + 32.0))
     }
     
@@ -79,7 +79,7 @@ public class ActionSheetTextNode: ActionSheetItemNode {
         
         let size = self.bounds.size
         
-        let labelSize = self.label.measure(CGSize(width: max(1.0, size.width - 20.0), height: size.height))
+        let labelSize = self.label.updateLayout(CGSize(width: max(1.0, size.width - 20.0), height: size.height))
         self.label.frame = CGRect(origin: CGPoint(x: floorToScreenPixels((size.width - labelSize.width) / 2.0), y: floorToScreenPixels((size.height - labelSize.height) / 2.0)), size: labelSize)
         
         self.accessibilityArea.frame = CGRect(origin: CGPoint(), size: size)
diff --git a/submodules/Display/Display/ActionSheetTheme.swift b/submodules/Display/Source/ActionSheetTheme.swift
similarity index 100%
rename from submodules/Display/Display/ActionSheetTheme.swift
rename to submodules/Display/Source/ActionSheetTheme.swift
diff --git a/submodules/Display/Display/AlertContentNode.swift b/submodules/Display/Source/AlertContentNode.swift
similarity index 100%
rename from submodules/Display/Display/AlertContentNode.swift
rename to submodules/Display/Source/AlertContentNode.swift
diff --git a/submodules/Display/Display/AlertController.swift b/submodules/Display/Source/AlertController.swift
similarity index 100%
rename from submodules/Display/Display/AlertController.swift
rename to submodules/Display/Source/AlertController.swift
diff --git a/submodules/Display/Display/AlertControllerNode.swift b/submodules/Display/Source/AlertControllerNode.swift
similarity index 100%
rename from submodules/Display/Display/AlertControllerNode.swift
rename to submodules/Display/Source/AlertControllerNode.swift
diff --git a/submodules/Display/Display/CAAnimationUtils.swift b/submodules/Display/Source/CAAnimationUtils.swift
similarity index 99%
rename from submodules/Display/Display/CAAnimationUtils.swift
rename to submodules/Display/Source/CAAnimationUtils.swift
index 0a251ebae1..6eb000add6 100644
--- a/submodules/Display/Display/CAAnimationUtils.swift
+++ b/submodules/Display/Source/CAAnimationUtils.swift
@@ -1,4 +1,5 @@
 import UIKit
+import UIKitRuntimeUtils
 
 @objc private class CALayerAnimationDelegate: NSObject, CAAnimationDelegate {
     private let keyPath: String?
diff --git a/submodules/Display/Display/ChildWindowHostView.swift b/submodules/Display/Source/ChildWindowHostView.swift
similarity index 100%
rename from submodules/Display/Display/ChildWindowHostView.swift
rename to submodules/Display/Source/ChildWindowHostView.swift
diff --git a/submodules/Display/Display/CollectionIndexNode.swift b/submodules/Display/Source/CollectionIndexNode.swift
similarity index 100%
rename from submodules/Display/Display/CollectionIndexNode.swift
rename to submodules/Display/Source/CollectionIndexNode.swift
diff --git a/submodules/Display/Display/ContainableController.swift b/submodules/Display/Source/ContainableController.swift
similarity index 100%
rename from submodules/Display/Display/ContainableController.swift
rename to submodules/Display/Source/ContainableController.swift
diff --git a/submodules/Display/Display/ContainedViewLayoutTransition.swift b/submodules/Display/Source/ContainedViewLayoutTransition.swift
similarity index 100%
rename from submodules/Display/Display/ContainedViewLayoutTransition.swift
rename to submodules/Display/Source/ContainedViewLayoutTransition.swift
diff --git a/submodules/Display/Display/ContainerViewLayout.swift b/submodules/Display/Source/ContainerViewLayout.swift
similarity index 100%
rename from submodules/Display/Display/ContainerViewLayout.swift
rename to submodules/Display/Source/ContainerViewLayout.swift
diff --git a/submodules/Display/Display/ContextContentContainerNode.swift b/submodules/Display/Source/ContextContentContainerNode.swift
similarity index 100%
rename from submodules/Display/Display/ContextContentContainerNode.swift
rename to submodules/Display/Source/ContextContentContainerNode.swift
diff --git a/submodules/Display/Display/ContextContentSourceNode.swift b/submodules/Display/Source/ContextContentSourceNode.swift
similarity index 100%
rename from submodules/Display/Display/ContextContentSourceNode.swift
rename to submodules/Display/Source/ContextContentSourceNode.swift
diff --git a/submodules/Display/Display/ContextControllerSourceNode.swift b/submodules/Display/Source/ContextControllerSourceNode.swift
similarity index 100%
rename from submodules/Display/Display/ContextControllerSourceNode.swift
rename to submodules/Display/Source/ContextControllerSourceNode.swift
diff --git a/submodules/Display/Display/ContextGesture.swift b/submodules/Display/Source/ContextGesture.swift
similarity index 100%
rename from submodules/Display/Display/ContextGesture.swift
rename to submodules/Display/Source/ContextGesture.swift
diff --git a/submodules/Display/Display/ContextMenuAction.swift b/submodules/Display/Source/ContextMenuAction.swift
similarity index 100%
rename from submodules/Display/Display/ContextMenuAction.swift
rename to submodules/Display/Source/ContextMenuAction.swift
diff --git a/submodules/Display/Display/ContextMenuActionNode.swift b/submodules/Display/Source/ContextMenuActionNode.swift
similarity index 98%
rename from submodules/Display/Display/ContextMenuActionNode.swift
rename to submodules/Display/Source/ContextMenuActionNode.swift
index a26ed60144..c626ff7e0c 100644
--- a/submodules/Display/Display/ContextMenuActionNode.swift
+++ b/submodules/Display/Source/ContextMenuActionNode.swift
@@ -41,7 +41,6 @@ final class ContextMenuActionNode: ASDisplayNode {
             case let .icon(image):
                 let iconNode = ASImageNode()
                 iconNode.displaysAsynchronously = false
-                iconNode.displayWithoutProcessing = true
                 iconNode.image = image
                 
                 self.iconNode = iconNode
diff --git a/submodules/Display/Display/ContextMenuContainerNode.swift b/submodules/Display/Source/ContextMenuContainerNode.swift
similarity index 100%
rename from submodules/Display/Display/ContextMenuContainerNode.swift
rename to submodules/Display/Source/ContextMenuContainerNode.swift
diff --git a/submodules/Display/Display/ContextMenuController.swift b/submodules/Display/Source/ContextMenuController.swift
similarity index 100%
rename from submodules/Display/Display/ContextMenuController.swift
rename to submodules/Display/Source/ContextMenuController.swift
diff --git a/submodules/Display/Display/ContextMenuNode.swift b/submodules/Display/Source/ContextMenuNode.swift
similarity index 99%
rename from submodules/Display/Display/ContextMenuNode.swift
rename to submodules/Display/Source/ContextMenuNode.swift
index 8da32a3d48..00e9eab0c1 100644
--- a/submodules/Display/Display/ContextMenuNode.swift
+++ b/submodules/Display/Source/ContextMenuNode.swift
@@ -28,11 +28,9 @@ private final class ContextMenuContentScrollNode: ASDisplayNode {
         let shadowImage = generateShadowImage()
         
         self.leftShadow = ASImageNode()
-        self.leftShadow.displayWithoutProcessing = true
         self.leftShadow.displaysAsynchronously = false
         self.leftShadow.image = shadowImage
         self.rightShadow = ASImageNode()
-        self.rightShadow.displayWithoutProcessing = true
         self.rightShadow.displaysAsynchronously = false
         self.rightShadow.image = shadowImage
         self.rightShadow.transform = CATransform3DMakeScale(-1.0, 1.0, 1.0)
diff --git a/submodules/Display/Display/DeviceMetrics.swift b/submodules/Display/Source/DeviceMetrics.swift
similarity index 100%
rename from submodules/Display/Display/DeviceMetrics.swift
rename to submodules/Display/Source/DeviceMetrics.swift
diff --git a/submodules/Display/Display/DisplayLinkAnimator.swift b/submodules/Display/Source/DisplayLinkAnimator.swift
similarity index 100%
rename from submodules/Display/Display/DisplayLinkAnimator.swift
rename to submodules/Display/Source/DisplayLinkAnimator.swift
diff --git a/submodules/Display/Display/DisplayLinkDispatcher.swift b/submodules/Display/Source/DisplayLinkDispatcher.swift
similarity index 100%
rename from submodules/Display/Display/DisplayLinkDispatcher.swift
rename to submodules/Display/Source/DisplayLinkDispatcher.swift
diff --git a/submodules/Display/Display/EditableTextNode.swift b/submodules/Display/Source/EditableTextNode.swift
similarity index 100%
rename from submodules/Display/Display/EditableTextNode.swift
rename to submodules/Display/Source/EditableTextNode.swift
diff --git a/submodules/Display/Display/Font.swift b/submodules/Display/Source/Font.swift
similarity index 100%
rename from submodules/Display/Display/Font.swift
rename to submodules/Display/Source/Font.swift
diff --git a/submodules/Display/Display/GenerateImage.swift b/submodules/Display/Source/GenerateImage.swift
similarity index 95%
rename from submodules/Display/Display/GenerateImage.swift
rename to submodules/Display/Source/GenerateImage.swift
index 4b7f38fbe9..fc8437bd5c 100644
--- a/submodules/Display/Display/GenerateImage.swift
+++ b/submodules/Display/Source/GenerateImage.swift
@@ -207,6 +207,24 @@ public func generateFilledCircleImage(diameter: CGFloat, color: UIColor?, stroke
     })
 }
 
+public func generateAdjustedStretchableFilledCircleImage(diameter: CGFloat, color: UIColor) -> UIImage? {
+    let corner: CGFloat = diameter / 2.0
+    return generateImage(CGSize(width: diameter + 2.0, height: diameter + 2.0), contextGenerator: { size, context in
+        context.clear(CGRect(origin: CGPoint(), size: size))
+        context.setFillColor(color.cgColor)
+        context.move(to: CGPoint(x: 0.0, y: corner))
+        context.addArc(tangent1End: CGPoint(x: 0.0, y: 0.0), tangent2End: CGPoint(x: corner, y: 0.0), radius: corner)
+        context.addLine(to: CGPoint(x: size.width - corner, y: 0.0))
+        context.addArc(tangent1End: CGPoint(x: size.width, y: 0.0), tangent2End: CGPoint(x: size.width, y: corner), radius: corner)
+        context.addLine(to: CGPoint(x: size.width, y: size.height - corner))
+        context.addArc(tangent1End: CGPoint(x: size.width, y: size.height), tangent2End: CGPoint(x: size.width - corner, y: size.height), radius: corner)
+        context.addLine(to: CGPoint(x: corner, y: size.height))
+        context.addArc(tangent1End: CGPoint(x: 0.0, y: size.height), tangent2End: CGPoint(x: 0.0, y: size.height - corner), radius: corner)
+        context.closePath()
+        context.fillPath()
+    })?.stretchableImage(withLeftCapWidth: Int(diameter / 2) + 1, topCapHeight: Int(diameter / 2) + 1)
+}
+
 public func generateCircleImage(diameter: CGFloat, lineWidth: CGFloat, color: UIColor?, strokeColor: UIColor? = nil, strokeWidth: CGFloat? = nil, backgroundColor: UIColor? = nil) -> UIImage? {
     return generateImage(CGSize(width: diameter, height: diameter), contextGenerator: { size, context in
         context.clear(CGRect(origin: CGPoint(), size: size))
diff --git a/submodules/Display/Display/GlobalOverlayPresentationContext.swift b/submodules/Display/Source/GlobalOverlayPresentationContext.swift
similarity index 99%
rename from submodules/Display/Display/GlobalOverlayPresentationContext.swift
rename to submodules/Display/Source/GlobalOverlayPresentationContext.swift
index c30965ce97..127aa07ddd 100644
--- a/submodules/Display/Display/GlobalOverlayPresentationContext.swift
+++ b/submodules/Display/Source/GlobalOverlayPresentationContext.swift
@@ -150,7 +150,6 @@ final class GlobalOverlayPresentationContext {
                             view.addSubview(controller.view)
                         }
                         (controller as? UIViewController)?.setIgnoreAppearanceMethodInvocations(false)
-                        view.layer.invalidateUpTheTree()
                         controller.viewWillAppear(false)
                         controller.viewDidAppear(false)
                     }
diff --git a/submodules/Display/Display/GridItem.swift b/submodules/Display/Source/GridItem.swift
similarity index 100%
rename from submodules/Display/Display/GridItem.swift
rename to submodules/Display/Source/GridItem.swift
diff --git a/submodules/Display/Display/GridItemNode.swift b/submodules/Display/Source/GridItemNode.swift
similarity index 100%
rename from submodules/Display/Display/GridItemNode.swift
rename to submodules/Display/Source/GridItemNode.swift
diff --git a/submodules/Display/Display/GridNode.swift b/submodules/Display/Source/GridNode.swift
similarity index 100%
rename from submodules/Display/Display/GridNode.swift
rename to submodules/Display/Source/GridNode.swift
diff --git a/submodules/Display/Display/GridNodeScroller.swift b/submodules/Display/Source/GridNodeScroller.swift
similarity index 100%
rename from submodules/Display/Display/GridNodeScroller.swift
rename to submodules/Display/Source/GridNodeScroller.swift
diff --git a/submodules/Display/Display/HapticFeedback.swift b/submodules/Display/Source/HapticFeedback.swift
similarity index 100%
rename from submodules/Display/Display/HapticFeedback.swift
rename to submodules/Display/Source/HapticFeedback.swift
diff --git a/submodules/Display/Display/HighlightTrackingButton.swift b/submodules/Display/Source/HighlightTrackingButton.swift
similarity index 100%
rename from submodules/Display/Display/HighlightTrackingButton.swift
rename to submodules/Display/Source/HighlightTrackingButton.swift
diff --git a/submodules/Display/Display/HighlightableButton.swift b/submodules/Display/Source/HighlightableButton.swift
similarity index 100%
rename from submodules/Display/Display/HighlightableButton.swift
rename to submodules/Display/Source/HighlightableButton.swift
diff --git a/submodules/Display/Display/ImageCorners.swift b/submodules/Display/Source/ImageCorners.swift
similarity index 100%
rename from submodules/Display/Display/ImageCorners.swift
rename to submodules/Display/Source/ImageCorners.swift
diff --git a/submodules/Display/Display/ImageNode.swift b/submodules/Display/Source/ImageNode.swift
similarity index 100%
rename from submodules/Display/Display/ImageNode.swift
rename to submodules/Display/Source/ImageNode.swift
diff --git a/submodules/Display/Display/ImmediateTextNode.swift b/submodules/Display/Source/ImmediateTextNode.swift
similarity index 83%
rename from submodules/Display/Display/ImmediateTextNode.swift
rename to submodules/Display/Source/ImmediateTextNode.swift
index f7e8dfc340..75116832f0 100644
--- a/submodules/Display/Display/ImmediateTextNode.swift
+++ b/submodules/Display/Source/ImmediateTextNode.swift
@@ -16,6 +16,32 @@ public class ImmediateTextNode: TextNode {
     public var textShadowColor: UIColor?
     public var textStroke: (UIColor, CGFloat)?
     public var cutout: TextNodeCutout?
+
+    public var truncationMode: NSLineBreakMode {
+        get {
+            switch self.truncationType {
+            case .start:
+                return .byTruncatingHead
+            case .middle:
+                return .byTruncatingMiddle
+            case .end:
+                return .byTruncatingTail
+            @unknown default:
+                return .byTruncatingTail
+            }
+        } set(value) {
+            switch value {
+            case .byTruncatingHead:
+                self.truncationType = .start
+            case .byTruncatingMiddle:
+                self.truncationType = .middle
+            case .byTruncatingTail:
+                self.truncationType = .end
+            default:
+                self.truncationType = .end
+            }
+        }
+    }
     
     private var tapRecognizer: TapLongTapOrDoubleTapGestureRecognizer?
     private var linkHighlightingNode: LinkHighlightingNode?
@@ -24,6 +50,8 @@ public class ImmediateTextNode: TextNode {
     
     public var trailingLineWidth: CGFloat?
     
+    var constrainedSize: CGSize?
+    
     public var highlightAttributeAction: (([NSAttributedString.Key: Any]) -> NSAttributedString.Key?)? {
         didSet {
             if self.isNodeLoaded {
@@ -57,6 +85,8 @@ public class ImmediateTextNode: TextNode {
     }
     
     public func updateLayout(_ constrainedSize: CGSize) -> CGSize {
+        self.constrainedSize = constrainedSize
+        
         let makeLayout = TextNode.asyncLayout(self)
         let (layout, apply) = makeLayout(TextNodeLayoutArguments(attributedString: self.attributedText, backgroundColor: nil, maximumNumberOfLines: self.maximumNumberOfLines, truncationType: self.truncationType, constrainedSize: constrainedSize, alignment: self.textAlignment, lineSpacing: self.lineSpacing, cutout: self.cutout, insets: self.insets, textShadowColor: self.textShadowColor, textStroke: self.textStroke))
         let _ = apply()
@@ -69,12 +99,20 @@ public class ImmediateTextNode: TextNode {
     }
     
     public func updateLayoutInfo(_ constrainedSize: CGSize) -> ImmediateTextNodeLayoutInfo {
+        self.constrainedSize = constrainedSize
+        
         let makeLayout = TextNode.asyncLayout(self)
         let (layout, apply) = makeLayout(TextNodeLayoutArguments(attributedString: self.attributedText, backgroundColor: nil, maximumNumberOfLines: self.maximumNumberOfLines, truncationType: self.truncationType, constrainedSize: constrainedSize, alignment: self.textAlignment, lineSpacing: self.lineSpacing, cutout: self.cutout, insets: self.insets))
         let _ = apply()
         return ImmediateTextNodeLayoutInfo(size: layout.size, truncated: layout.truncated)
     }
     
+    public func redrawIfPossible() {
+        if let constrainedSize = self.constrainedSize {
+            let _ = self.updateLayout(constrainedSize)
+        }
+    }
+    
     override public func didLoad() {
         super.didLoad()
         
@@ -157,3 +195,21 @@ public class ImmediateTextNode: TextNode {
         }
     }
 }
+
+public class ASTextNode: ImmediateTextNode {
+    override public var attributedText: NSAttributedString? {
+        didSet {
+            self.setNeedsLayout()
+        }
+    }
+    
+    override public init() {
+        super.init()
+        
+        self.maximumNumberOfLines = 0
+    }
+    
+    override public func calculateSizeThatFits(_ constrainedSize: CGSize) -> CGSize {
+        return self.updateLayout(constrainedSize)
+    }
+}
diff --git a/submodules/Display/Source/InteractiveTransitionGestureRecognizer.swift b/submodules/Display/Source/InteractiveTransitionGestureRecognizer.swift
new file mode 100644
index 0000000000..48761f12a1
--- /dev/null
+++ b/submodules/Display/Source/InteractiveTransitionGestureRecognizer.swift
@@ -0,0 +1,168 @@
+import Foundation
+import UIKit
+
+private enum HorizontalGestures {
+    case none
+    case some
+    case strict
+}
+
+private func hasHorizontalGestures(_ view: UIView, point: CGPoint?) -> HorizontalGestures {
+    if let disablesInteractiveTransitionGestureRecognizerNow = view.disablesInteractiveTransitionGestureRecognizerNow, disablesInteractiveTransitionGestureRecognizerNow() {
+        return .strict
+    }
+    
+    if view.disablesInteractiveTransitionGestureRecognizer {
+        return .some
+    }
+    
+    if let point = point, let test = view.interactiveTransitionGestureRecognizerTest, test(point) {
+        return .some
+    }
+    
+    if let view = view as? ListViewBackingView {
+        let transform = view.transform
+        let angle: Double = Double(atan2f(Float(transform.b), Float(transform.a)))
+        let term1: Double = abs(angle - Double.pi / 2.0)
+        let term2: Double = abs(angle + Double.pi / 2.0)
+        let term3: Double = abs(angle - Double.pi * 3.0 / 2.0)
+        if term1 < 0.001 || term2 < 0.001 || term3 < 0.001 {
+            return .some
+        }
+    }
+    
+    if let superview = view.superview {
+        return hasHorizontalGestures(superview, point: point != nil ? view.convert(point!, to: superview) : nil)
+    } else {
+        return .none
+    }
+}
+
+public struct InteractiveTransitionGestureRecognizerDirections: OptionSet {
+    public var rawValue: Int
+    
+    public init(rawValue: Int) {
+        self.rawValue = rawValue
+    }
+    
+    public static let leftEdge = InteractiveTransitionGestureRecognizerDirections(rawValue: 1 << 2)
+    public static let rightEdge = InteractiveTransitionGestureRecognizerDirections(rawValue: 1 << 3)
+    public static let leftCenter = InteractiveTransitionGestureRecognizerDirections(rawValue: 1 << 0)
+    public static let rightCenter = InteractiveTransitionGestureRecognizerDirections(rawValue: 1 << 1)
+    
+    public static let left: InteractiveTransitionGestureRecognizerDirections = [.leftEdge, .leftCenter]
+    public static let right: InteractiveTransitionGestureRecognizerDirections = [.rightEdge, .rightCenter]
+}
+
+public enum InteractiveTransitionGestureRecognizerEdgeWidth {
+    case constant(CGFloat)
+    case widthMultiplier(factor: CGFloat, min: CGFloat, max: CGFloat)
+}
+
+public class InteractiveTransitionGestureRecognizer: UIPanGestureRecognizer {
+    private let edgeWidth: InteractiveTransitionGestureRecognizerEdgeWidth
+    private let allowedDirections: (CGPoint) -> InteractiveTransitionGestureRecognizerDirections
+    
+    private var validatedGesture = false
+    private var firstLocation: CGPoint = CGPoint()
+    private var currentAllowedDirections: InteractiveTransitionGestureRecognizerDirections = []
+    
+    public init(target: Any?, action: Selector?, allowedDirections: @escaping (CGPoint) -> InteractiveTransitionGestureRecognizerDirections, edgeWidth: InteractiveTransitionGestureRecognizerEdgeWidth = .constant(16.0)) {
+        self.allowedDirections = allowedDirections
+        self.edgeWidth = edgeWidth
+        
+        super.init(target: target, action: action)
+        
+        self.maximumNumberOfTouches = 1
+    }
+    
+    override public func reset() {
+        super.reset()
+        
+        self.validatedGesture = false
+        self.currentAllowedDirections = []
+    }
+    
+    override public func touchesBegan(_ touches: Set<UITouch>, with event: UIEvent) {
+        let touch = touches.first!
+        let point = touch.location(in: self.view)
+        
+        var allowedDirections = self.allowedDirections(point)
+        if allowedDirections.isEmpty {
+            self.state = .failed
+            return
+        }
+        
+        super.touchesBegan(touches, with: event)
+        
+        self.firstLocation = point
+        
+        if let target = self.view?.hitTest(self.firstLocation, with: event) {
+            let horizontalGestures = hasHorizontalGestures(target, point: self.view?.convert(self.firstLocation, to: target))
+            switch horizontalGestures {
+            case .some, .strict:
+                if case .strict = horizontalGestures {
+                    allowedDirections = []
+                } else if allowedDirections.contains(.leftEdge) || allowedDirections.contains(.rightEdge) {
+                    allowedDirections.remove(.leftCenter)
+                    allowedDirections.remove(.rightCenter)
+                }
+            case .none:
+                break
+            }
+        }
+        
+        if allowedDirections.isEmpty {
+            self.state = .failed
+        } else {
+            self.currentAllowedDirections = allowedDirections
+        }
+    }
+    
+    override public func touchesMoved(_ touches: Set<UITouch>, with event: UIEvent) {
+        let location = touches.first!.location(in: self.view)
+        let translation = CGPoint(x: location.x - self.firstLocation.x, y: location.y - self.firstLocation.y)
+        
+        let absTranslationX: CGFloat = abs(translation.x)
+        let absTranslationY: CGFloat = abs(translation.y)
+        
+        let size = self.view?.bounds.size ?? CGSize()
+        
+        let edgeWidth: CGFloat
+        switch self.edgeWidth {
+        case let .constant(value):
+            edgeWidth = value
+        case let .widthMultiplier(factor, minValue, maxValue):
+            edgeWidth = max(minValue, min(size.width * factor, maxValue))
+        }
+        
+        if !self.validatedGesture {
+            if self.firstLocation.x < edgeWidth && !self.currentAllowedDirections.contains(.rightEdge) {
+                self.state = .failed
+                return
+            }
+            if self.firstLocation.x > size.width - edgeWidth && !self.currentAllowedDirections.contains(.leftEdge) {
+                self.state = .failed
+                return
+            }
+            
+            if self.currentAllowedDirections.contains(.rightEdge) && self.firstLocation.x < edgeWidth {
+                self.validatedGesture = true
+            } else if self.currentAllowedDirections.contains(.leftEdge) && self.firstLocation.x > size.width - edgeWidth {
+                self.validatedGesture = true
+            } else if !self.currentAllowedDirections.contains(.leftCenter) && translation.x < 0.0 {
+                self.state = .failed
+            } else if !self.currentAllowedDirections.contains(.rightCenter) && translation.x > 0.0 {
+                self.state = .failed
+            } else if absTranslationY > 2.0 && absTranslationY > absTranslationX * 2.0 {
+                self.state = .failed
+            } else if absTranslationX > 2.0 && absTranslationY * 2.0 < absTranslationX {
+                self.validatedGesture = true
+            }
+        }
+        
+        if self.validatedGesture {
+            super.touchesMoved(touches, with: event)
+        }
+    }
+}
diff --git a/submodules/Display/Display/KeyShortcut.swift b/submodules/Display/Source/KeyShortcut.swift
similarity index 100%
rename from submodules/Display/Display/KeyShortcut.swift
rename to submodules/Display/Source/KeyShortcut.swift
diff --git a/submodules/Display/Display/KeyShortcutsController.swift b/submodules/Display/Source/KeyShortcutsController.swift
similarity index 100%
rename from submodules/Display/Display/KeyShortcutsController.swift
rename to submodules/Display/Source/KeyShortcutsController.swift
diff --git a/submodules/Display/Display/Keyboard.swift b/submodules/Display/Source/Keyboard.swift
similarity index 84%
rename from submodules/Display/Display/Keyboard.swift
rename to submodules/Display/Source/Keyboard.swift
index 912cd8fb44..53c3b5d048 100644
--- a/submodules/Display/Display/Keyboard.swift
+++ b/submodules/Display/Source/Keyboard.swift
@@ -1,4 +1,5 @@
 import Foundation
+import UIKitRuntimeUtils
 
 public enum Keyboard {
     public static func applyAutocorrection() {
diff --git a/submodules/Display/Display/KeyboardManager.swift b/submodules/Display/Source/KeyboardManager.swift
similarity index 82%
rename from submodules/Display/Display/KeyboardManager.swift
rename to submodules/Display/Source/KeyboardManager.swift
index 67e903a8e0..89d4de9ffe 100644
--- a/submodules/Display/Display/KeyboardManager.swift
+++ b/submodules/Display/Source/KeyboardManager.swift
@@ -1,6 +1,7 @@
 import Foundation
 import UIKit
 import AsyncDisplayKit
+import UIKitRuntimeUtils
 
 struct KeyboardSurface {
     let host: UIView
@@ -22,7 +23,6 @@ private func getFirstResponder(_ view: UIView) -> UIView? {
 class KeyboardManager {
     private let host: StatusBarHost
     
-    private weak var previousPositionAnimationMirrorSource: CATracingLayer?
     private weak var previousFirstResponderView: UIView?
     private var interactiveInputOffset: CGFloat = 0.0
     
@@ -95,22 +95,8 @@ class KeyboardManager {
                 //print("set to \(CGPoint(x: containerOrigin.x, y: self.interactiveInputOffset))")
                 keyboardWindow.layer.sublayerTransform = horizontalTranslation
             }
-            if let tracingLayer = firstResponderView.layer as? CATracingLayer, firstResponderDisableAutomaticKeyboardHandling.isEmpty {
-                if let previousPositionAnimationMirrorSource = self.previousPositionAnimationMirrorSource, previousPositionAnimationMirrorSource !== tracingLayer {
-                    previousPositionAnimationMirrorSource.setPositionAnimationMirrorTarget(nil)
-                }
-                tracingLayer.setPositionAnimationMirrorTarget(keyboardWindow.layer)
-                self.previousPositionAnimationMirrorSource = tracingLayer
-            } else if let previousPositionAnimationMirrorSource = self.previousPositionAnimationMirrorSource {
-                previousPositionAnimationMirrorSource.setPositionAnimationMirrorTarget(nil)
-                self.previousPositionAnimationMirrorSource = nil
-            }
         } else {
             keyboardWindow.layer.sublayerTransform = CATransform3DIdentity
-            if let previousPositionAnimationMirrorSource = self.previousPositionAnimationMirrorSource {
-                previousPositionAnimationMirrorSource.setPositionAnimationMirrorTarget(nil)
-                self.previousPositionAnimationMirrorSource = nil
-            }
             if let previousFirstResponderView = previousFirstResponderView {
                 if previousFirstResponderView.window == nil {
                     keyboardWindow.isHidden = true
diff --git a/submodules/Display/Display/LayoutSizes.swift b/submodules/Display/Source/LayoutSizes.swift
similarity index 100%
rename from submodules/Display/Display/LayoutSizes.swift
rename to submodules/Display/Source/LayoutSizes.swift
diff --git a/submodules/Display/Display/LegacyPresentedController.swift b/submodules/Display/Source/LegacyPresentedController.swift
similarity index 100%
rename from submodules/Display/Display/LegacyPresentedController.swift
rename to submodules/Display/Source/LegacyPresentedController.swift
diff --git a/submodules/Display/Display/LegacyPresentedControllerNode.swift b/submodules/Display/Source/LegacyPresentedControllerNode.swift
similarity index 100%
rename from submodules/Display/Display/LegacyPresentedControllerNode.swift
rename to submodules/Display/Source/LegacyPresentedControllerNode.swift
diff --git a/submodules/Display/Display/LinkHighlightingNode.swift b/submodules/Display/Source/LinkHighlightingNode.swift
similarity index 99%
rename from submodules/Display/Display/LinkHighlightingNode.swift
rename to submodules/Display/Source/LinkHighlightingNode.swift
index 611616965e..26efc7afff 100644
--- a/submodules/Display/Display/LinkHighlightingNode.swift
+++ b/submodules/Display/Source/LinkHighlightingNode.swift
@@ -181,7 +181,6 @@ public final class LinkHighlightingNode: ASDisplayNode {
         self.imageNode = ASImageNode()
         self.imageNode.isUserInteractionEnabled = false
         self.imageNode.displaysAsynchronously = false
-        self.imageNode.displayWithoutProcessing = true
         
         super.init()
         
diff --git a/submodules/Display/Display/ListView.swift b/submodules/Display/Source/ListView.swift
similarity index 99%
rename from submodules/Display/Display/ListView.swift
rename to submodules/Display/Source/ListView.swift
index 0e098f0d79..33ecb3d5e3 100644
--- a/submodules/Display/Display/ListView.swift
+++ b/submodules/Display/Source/ListView.swift
@@ -1,6 +1,7 @@
 import UIKit
 import AsyncDisplayKit
 import SwiftSignalKit
+import UIKitRuntimeUtils
 
 private let infiniteScrollSize: CGFloat = 10000.0
 private let insertionAnimationDuration: Double = 0.4
@@ -989,8 +990,8 @@ open class ListView: ASDisplayNode, UIScrollViewAccessibilityDelegate, UIGesture
             }
         }
         
-        if let keepMinimalScrollHeightWithTopInset = self.keepMinimalScrollHeightWithTopInset {
-            completeHeight = max(completeHeight, self.visibleSize.height + keepMinimalScrollHeightWithTopInset)
+        if let keepMinimalScrollHeightWithTopInset = self.keepMinimalScrollHeightWithTopInset, topItemFound {
+            completeHeight = max(completeHeight, self.visibleSize.height + keepMinimalScrollHeightWithTopInset - effectiveInsets.bottom - effectiveInsets.top)
             bottomItemEdge = max(bottomItemEdge, topItemEdge + completeHeight)
         }
         
diff --git a/submodules/Display/Display/ListViewAccessoryItem.swift b/submodules/Display/Source/ListViewAccessoryItem.swift
similarity index 100%
rename from submodules/Display/Display/ListViewAccessoryItem.swift
rename to submodules/Display/Source/ListViewAccessoryItem.swift
diff --git a/submodules/Display/Display/ListViewAccessoryItemNode.swift b/submodules/Display/Source/ListViewAccessoryItemNode.swift
similarity index 100%
rename from submodules/Display/Display/ListViewAccessoryItemNode.swift
rename to submodules/Display/Source/ListViewAccessoryItemNode.swift
diff --git a/submodules/Display/Display/ListViewAnimation.swift b/submodules/Display/Source/ListViewAnimation.swift
similarity index 99%
rename from submodules/Display/Display/ListViewAnimation.swift
rename to submodules/Display/Source/ListViewAnimation.swift
index fa432d852d..57dc0d4b2e 100644
--- a/submodules/Display/Display/ListViewAnimation.swift
+++ b/submodules/Display/Source/ListViewAnimation.swift
@@ -1,5 +1,6 @@
 import Foundation
 import UIKit
+import UIKitRuntimeUtils
 
 public protocol Interpolatable {
     static func interpolator() -> (Interpolatable, Interpolatable, CGFloat) -> (Interpolatable)
diff --git a/submodules/Display/Display/ListViewFloatingHeaderNode.swift b/submodules/Display/Source/ListViewFloatingHeaderNode.swift
similarity index 100%
rename from submodules/Display/Display/ListViewFloatingHeaderNode.swift
rename to submodules/Display/Source/ListViewFloatingHeaderNode.swift
diff --git a/submodules/Display/Display/ListViewIntermediateState.swift b/submodules/Display/Source/ListViewIntermediateState.swift
similarity index 100%
rename from submodules/Display/Display/ListViewIntermediateState.swift
rename to submodules/Display/Source/ListViewIntermediateState.swift
diff --git a/submodules/Display/Display/ListViewItem.swift b/submodules/Display/Source/ListViewItem.swift
similarity index 100%
rename from submodules/Display/Display/ListViewItem.swift
rename to submodules/Display/Source/ListViewItem.swift
diff --git a/submodules/Display/Display/ListViewItemHeader.swift b/submodules/Display/Source/ListViewItemHeader.swift
similarity index 91%
rename from submodules/Display/Display/ListViewItemHeader.swift
rename to submodules/Display/Source/ListViewItemHeader.swift
index fb288b3187..e81635ae8f 100644
--- a/submodules/Display/Display/ListViewItemHeader.swift
+++ b/submodules/Display/Source/ListViewItemHeader.swift
@@ -50,24 +50,9 @@ open class ListViewItemHeaderNode: ASDisplayNode {
             self.spring = ListViewItemSpring(stiffness: -280.0, damping: -24.0, mass: 0.85)
         }
         
-        if seeThrough {
-            if (layerBacked) {
-                super.init()
-                self.setLayerBlock({
-                    return CASeeThroughTracingLayer()
-                })
-            } else {
-                super.init()
-        
-                self.setViewBlock({
-                    return CASeeThroughTracingView()
-                })
-            }
-        } else {
-            super.init()
+        super.init()
             
-            self.isLayerBacked = layerBacked
-        }
+        self.isLayerBacked = layerBacked
     }
     
     open func updateStickDistanceFactor(_ factor: CGFloat, transition: ContainedViewLayoutTransition) {
diff --git a/submodules/Display/Display/ListViewItemNode.swift b/submodules/Display/Source/ListViewItemNode.swift
similarity index 97%
rename from submodules/Display/Display/ListViewItemNode.swift
rename to submodules/Display/Source/ListViewItemNode.swift
index 9ef0d00b25..1f41a35689 100644
--- a/submodules/Display/Display/ListViewItemNode.swift
+++ b/submodules/Display/Source/ListViewItemNode.swift
@@ -211,24 +211,9 @@ open class ListViewItemNode: ASDisplayNode {
         
         self.rotated = rotated
         
-        if seeThrough {
-            if (layerBacked) {
-                super.init()
-                self.setLayerBlock({
-                    return CASeeThroughTracingLayer()
-                })
-            } else {
-                super.init()
+        super.init()
         
-                self.setViewBlock({
-                    return CASeeThroughTracingView()
-                })
-            }
-        } else {
-            super.init()
-            
-            self.isLayerBacked = layerBacked
-        }
+        self.isLayerBacked = layerBacked
     }
     
     var apparentHeight: CGFloat = 0.0
diff --git a/submodules/Display/Display/ListViewOverscrollBackgroundNode.swift b/submodules/Display/Source/ListViewOverscrollBackgroundNode.swift
similarity index 100%
rename from submodules/Display/Display/ListViewOverscrollBackgroundNode.swift
rename to submodules/Display/Source/ListViewOverscrollBackgroundNode.swift
diff --git a/submodules/Display/Display/ListViewReorderingGestureRecognizer.swift b/submodules/Display/Source/ListViewReorderingGestureRecognizer.swift
similarity index 100%
rename from submodules/Display/Display/ListViewReorderingGestureRecognizer.swift
rename to submodules/Display/Source/ListViewReorderingGestureRecognizer.swift
diff --git a/submodules/Display/Display/ListViewReorderingItemNode.swift b/submodules/Display/Source/ListViewReorderingItemNode.swift
similarity index 100%
rename from submodules/Display/Display/ListViewReorderingItemNode.swift
rename to submodules/Display/Source/ListViewReorderingItemNode.swift
diff --git a/submodules/Display/Display/ListViewScroller.swift b/submodules/Display/Source/ListViewScroller.swift
similarity index 100%
rename from submodules/Display/Display/ListViewScroller.swift
rename to submodules/Display/Source/ListViewScroller.swift
diff --git a/submodules/Display/Display/ListViewTapGestureRecognizer.swift b/submodules/Display/Source/ListViewTapGestureRecognizer.swift
similarity index 100%
rename from submodules/Display/Display/ListViewTapGestureRecognizer.swift
rename to submodules/Display/Source/ListViewTapGestureRecognizer.swift
diff --git a/submodules/Display/Display/ListViewTempItemNode.swift b/submodules/Display/Source/ListViewTempItemNode.swift
similarity index 100%
rename from submodules/Display/Display/ListViewTempItemNode.swift
rename to submodules/Display/Source/ListViewTempItemNode.swift
diff --git a/submodules/Display/Display/ListViewTransactionQueue.swift b/submodules/Display/Source/ListViewTransactionQueue.swift
similarity index 100%
rename from submodules/Display/Display/ListViewTransactionQueue.swift
rename to submodules/Display/Source/ListViewTransactionQueue.swift
diff --git a/submodules/Display/Display/MinimizeKeyboardGestureRecognizer.swift b/submodules/Display/Source/MinimizeKeyboardGestureRecognizer.swift
similarity index 100%
rename from submodules/Display/Display/MinimizeKeyboardGestureRecognizer.swift
rename to submodules/Display/Source/MinimizeKeyboardGestureRecognizer.swift
diff --git a/submodules/Display/Display/NativeWindowHostView.swift b/submodules/Display/Source/NativeWindowHostView.swift
similarity index 100%
rename from submodules/Display/Display/NativeWindowHostView.swift
rename to submodules/Display/Source/NativeWindowHostView.swift
diff --git a/submodules/Display/Display/Navigation/NavigationContainer.swift b/submodules/Display/Source/Navigation/NavigationContainer.swift
similarity index 99%
rename from submodules/Display/Display/Navigation/NavigationContainer.swift
rename to submodules/Display/Source/Navigation/NavigationContainer.swift
index c45e446656..b5be8762d8 100644
--- a/submodules/Display/Display/Navigation/NavigationContainer.swift
+++ b/submodules/Display/Source/Navigation/NavigationContainer.swift
@@ -111,7 +111,7 @@ final class NavigationContainer: ASDisplayNode, UIGestureRecognizerDelegate {
     override func didLoad() {
         super.didLoad()
         
-        let panRecognizer = InteractiveTransitionGestureRecognizer(target: self, action: #selector(self.panGesture(_:)), allowedDirections: { [weak self] in
+        let panRecognizer = InteractiveTransitionGestureRecognizer(target: self, action: #selector(self.panGesture(_:)), allowedDirections: { [weak self] _ in
             guard let strongSelf = self, strongSelf.controllers.count > 1 else {
                 return []
             }
diff --git a/submodules/Display/Display/Navigation/NavigationController.swift b/submodules/Display/Source/Navigation/NavigationController.swift
similarity index 99%
rename from submodules/Display/Display/Navigation/NavigationController.swift
rename to submodules/Display/Source/Navigation/NavigationController.swift
index 4278c6c275..1240f957d3 100644
--- a/submodules/Display/Display/Navigation/NavigationController.swift
+++ b/submodules/Display/Source/Navigation/NavigationController.swift
@@ -35,9 +35,6 @@ public struct NavigationAnimationOptions : OptionSet {
 }
 
 private final class NavigationControllerContainerView: UIView {
-    override class var layerClass: AnyClass {
-        return CATracingLayer.self
-    }
 }
 
 public enum NavigationEmptyDetailsBackgoundMode {
@@ -423,14 +420,14 @@ open class NavigationController: UINavigationController, ContainableController,
                 self.modalContainers.append(modalContainer)
                 if !modalContainer.isReady {
                     modalContainer.isReadyUpdated = { [weak self, weak modalContainer] in
-                        guard let strongSelf = self, let modalContainer = modalContainer else {
+                        guard let strongSelf = self, let _ = modalContainer else {
                             return
                         }
                         strongSelf.updateContainersNonReentrant(transition: .animated(duration: 0.5, curve: .spring))
                     }
                 }
                 modalContainer.updateDismissProgress = { [weak self, weak modalContainer] _, transition in
-                    guard let strongSelf = self, let modalContainer = modalContainer else {
+                    guard let strongSelf = self, let _ = modalContainer else {
                         return
                     }
                     strongSelf.updateContainersNonReentrant(transition: transition)
@@ -457,7 +454,7 @@ open class NavigationController: UINavigationController, ContainableController,
                     container.view.endEditing(true)
                 }
                 
-                transition = container.dismiss(transition: transition, completion: { [weak self, weak container] in
+                transition = container.dismiss(transition: transition, completion: { [weak container] in
                     container?.removeFromSupernode()
                 })
             }
diff --git a/submodules/Display/Display/Navigation/NavigationLayout.swift b/submodules/Display/Source/Navigation/NavigationLayout.swift
similarity index 100%
rename from submodules/Display/Display/Navigation/NavigationLayout.swift
rename to submodules/Display/Source/Navigation/NavigationLayout.swift
diff --git a/submodules/Display/Display/Navigation/NavigationModalContainer.swift b/submodules/Display/Source/Navigation/NavigationModalContainer.swift
similarity index 98%
rename from submodules/Display/Display/Navigation/NavigationModalContainer.swift
rename to submodules/Display/Source/Navigation/NavigationModalContainer.swift
index 1798a9c436..aa40c78ee3 100644
--- a/submodules/Display/Display/Navigation/NavigationModalContainer.swift
+++ b/submodules/Display/Source/Navigation/NavigationModalContainer.swift
@@ -2,6 +2,7 @@ import Foundation
 import UIKit
 import AsyncDisplayKit
 import SwiftSignalKit
+import UIKitRuntimeUtils
 
 final class NavigationModalContainer: ASDisplayNode, UIScrollViewDelegate, UIGestureRecognizerDelegate {
     private var theme: NavigationControllerTheme
@@ -90,7 +91,7 @@ final class NavigationModalContainer: ASDisplayNode, UIScrollViewDelegate, UIGes
         self.scrollNode.view.clipsToBounds = false
         self.scrollNode.view.delegate = self
         
-        let panRecognizer = InteractiveTransitionGestureRecognizer(target: self, action: #selector(self.panGesture(_:)), allowedDirections: { [weak self] in
+        let panRecognizer = InteractiveTransitionGestureRecognizer(target: self, action: #selector(self.panGesture(_:)), allowedDirections: { [weak self] _ in
             guard let strongSelf = self, !strongSelf.isDismissed else {
                 return []
             }
@@ -432,6 +433,12 @@ final class NavigationModalContainer: ASDisplayNode, UIScrollViewDelegate, UIGes
                 let positionTransition: ContainedViewLayoutTransition = .animated(duration: 0.25, curve: .easeInOut)
                 alphaTransition.updateAlpha(node: self.dim, alpha: 0.0, beginWithCurrentState: true)
                 positionTransition.updatePosition(node: self.container, position: CGPoint(x: self.container.position.x, y: self.bounds.height + self.container.bounds.height / 2.0 + self.bounds.height), beginWithCurrentState: true, completion: { [weak self] _ in
+                    guard let strongSelf = self else {
+                        return
+                    }
+                    for controller in strongSelf.container.controllers {
+                        controller.viewDidDisappear(transition.isAnimated)
+                    }
                     completion()
                 })
                 return positionTransition
diff --git a/submodules/Display/Display/Navigation/NavigationModalFrame.swift b/submodules/Display/Source/Navigation/NavigationModalFrame.swift
similarity index 96%
rename from submodules/Display/Display/Navigation/NavigationModalFrame.swift
rename to submodules/Display/Source/Navigation/NavigationModalFrame.swift
index b40bec751f..023d255262 100644
--- a/submodules/Display/Display/Navigation/NavigationModalFrame.swift
+++ b/submodules/Display/Source/Navigation/NavigationModalFrame.swift
@@ -62,16 +62,12 @@ final class NavigationModalFrame: ASDisplayNode {
         
         self.topLeftCorner = ASImageNode()
         self.topLeftCorner.displaysAsynchronously = false
-        self.topLeftCorner.displayWithoutProcessing = true
         self.topRightCorner = ASImageNode()
         self.topRightCorner.displaysAsynchronously = false
-        self.topRightCorner.displayWithoutProcessing = true
         self.bottomLeftCorner = ASImageNode()
         self.bottomLeftCorner.displaysAsynchronously = false
-        self.bottomLeftCorner.displayWithoutProcessing = true
         self.bottomRightCorner = ASImageNode()
         self.bottomRightCorner.displaysAsynchronously = false
-        self.bottomRightCorner.displayWithoutProcessing = true
         
         super.init()
         
diff --git a/submodules/Display/Display/Navigation/NavigationOverlayContainer.swift b/submodules/Display/Source/Navigation/NavigationOverlayContainer.swift
similarity index 100%
rename from submodules/Display/Display/Navigation/NavigationOverlayContainer.swift
rename to submodules/Display/Source/Navigation/NavigationOverlayContainer.swift
diff --git a/submodules/Display/Display/Navigation/NavigationSplitContainer.swift b/submodules/Display/Source/Navigation/NavigationSplitContainer.swift
similarity index 100%
rename from submodules/Display/Display/Navigation/NavigationSplitContainer.swift
rename to submodules/Display/Source/Navigation/NavigationSplitContainer.swift
diff --git a/submodules/Display/Display/NavigationBackButtonNode.swift b/submodules/Display/Source/NavigationBackButtonNode.swift
similarity index 95%
rename from submodules/Display/Display/NavigationBackButtonNode.swift
rename to submodules/Display/Source/NavigationBackButtonNode.swift
index 2aa17d953e..b6082776f2 100644
--- a/submodules/Display/Display/NavigationBackButtonNode.swift
+++ b/submodules/Display/Source/NavigationBackButtonNode.swift
@@ -15,7 +15,7 @@ public class NavigationBackButtonNode: ASControlNode {
     }
     
     let arrow: ASDisplayNode
-    let label: ASTextNode
+    let label: ImmediateTextNode
     
     private let arrowSpacing: CGFloat = 4.0
     
@@ -48,7 +48,7 @@ public class NavigationBackButtonNode: ASControlNode {
     
     override public init() {
         self.arrow = ASDisplayNode()
-        self.label = ASTextNode()
+        self.label = ImmediateTextNode()
         
         super.init()
         
@@ -69,7 +69,7 @@ public class NavigationBackButtonNode: ASControlNode {
     }
     
     public override func calculateSizeThatFits(_ constrainedSize: CGSize) -> CGSize {
-        self.label.measure(CGSize(width: max(0.0, constrainedSize.width - self.arrow.frame.size.width - self.arrowSpacing), height: constrainedSize.height))
+        self.label.updateLayout(CGSize(width: max(0.0, constrainedSize.width - self.arrow.frame.size.width - self.arrowSpacing), height: constrainedSize.height))
         
         return CGSize(width: self.arrow.frame.size.width + self.arrowSpacing + self.label.calculatedSize.width, height: max(self.arrow.frame.size.height, self.label.calculatedSize.height))
     }
diff --git a/submodules/Display/Display/NavigationBar.swift b/submodules/Display/Source/NavigationBar.swift
similarity index 98%
rename from submodules/Display/Display/NavigationBar.swift
rename to submodules/Display/Source/NavigationBar.swift
index 4c2039be42..8987abd847 100644
--- a/submodules/Display/Display/NavigationBar.swift
+++ b/submodules/Display/Source/NavigationBar.swift
@@ -288,7 +288,7 @@ open class NavigationBar: ASDisplayNode {
     
     public var layoutSuspended: Bool = false
     
-    private let titleNode: ASTextNode
+    private let titleNode: ImmediateTextNode
     
     var previousItemListenerKey: Int?
     var previousItemBackListenerKey: Int?
@@ -685,7 +685,7 @@ open class NavigationBar: ASDisplayNode {
         self.presentationData = presentationData
         self.stripeNode = ASDisplayNode()
         
-        self.titleNode = ASTextNode()
+        self.titleNode = ImmediateTextNode()
         self.titleNode.isAccessibilityElement = true
         self.titleNode.accessibilityTraits = .header
         
@@ -729,7 +729,7 @@ open class NavigationBar: ASDisplayNode {
         
         self.titleNode.displaysAsynchronously = false
         self.titleNode.maximumNumberOfLines = 1
-        self.titleNode.truncationMode = .byTruncatingTail
+        self.titleNode.truncationType = .end
         self.titleNode.isOpaque = false
         
         self.backButtonNode.highlightChanged = { [weak self] index, highlighted in
@@ -793,12 +793,16 @@ open class NavigationBar: ASDisplayNode {
             self.stripeNode.backgroundColor = self.presentationData.theme.separatorColor
             
             self.badgeNode.updateTheme(fillColor: self.presentationData.theme.badgeBackgroundColor, strokeColor: self.presentationData.theme.badgeStrokeColor, textColor: self.presentationData.theme.badgeTextColor)
+            
+            self.requestLayout()
         }
     }
     
     private func requestLayout() {
-        self.requestedLayout = true
-        self.setNeedsLayout()
+        if self.transitionState == nil {
+            self.requestedLayout = true
+            self.setNeedsLayout()
+        }
     }
     
     override open func layout() {
@@ -869,8 +873,14 @@ open class NavigationBar: ASDisplayNode {
                         let initialX: CGFloat = backButtonInset
                         let finalX: CGFloat = floor((size.width - backButtonSize.width) / 2.0) - size.width
                         
-                        self.backButtonNode.frame = CGRect(origin: CGPoint(x: initialX * (1.0 - progress) + finalX * progress, y: contentVerticalOrigin + floor((nominalHeight - backButtonSize.height) / 2.0)), size: backButtonSize)
-                        self.backButtonNode.alpha = (1.0 - progress) * (1.0 - progress)
+                        let backButtonFrame = CGRect(origin: CGPoint(x: initialX * (1.0 - progress) + finalX * progress, y: contentVerticalOrigin + floor((nominalHeight - backButtonSize.height) / 2.0)), size: backButtonSize)
+                        if self.backButtonNode.frame != backButtonFrame {
+                            self.backButtonNode.frame = backButtonFrame
+                        }
+                        let backButtonAlpha = self.backButtonNode.alpha
+                        if self.backButtonNode.alpha != backButtonAlpha {
+                            self.backButtonNode.alpha = backButtonAlpha
+                        }
                     
                         if let transitionTitleNode = self.transitionTitleNode {
                             let transitionTitleSize = transitionTitleNode.measure(CGSize(width: size.width, height: nominalHeight))
@@ -955,7 +965,7 @@ open class NavigationBar: ASDisplayNode {
         }
         
         if self.titleNode.supernode != nil {
-            let titleSize = self.titleNode.measure(CGSize(width: max(1.0, size.width - max(leftTitleInset, rightTitleInset) * 2.0), height: nominalHeight))
+            let titleSize = self.titleNode.updateLayout(CGSize(width: max(1.0, size.width - max(leftTitleInset, rightTitleInset) * 2.0), height: nominalHeight))
             
             if let transitionState = self.transitionState, let otherNavigationBar = transitionState.navigationBar {
                 let progress = transitionState.progress
@@ -1037,7 +1047,7 @@ open class NavigationBar: ASDisplayNode {
                 return nil
             }
         } else if let title = self.title {
-            let node = ASTextNode()
+            let node = ImmediateTextNode()
             node.attributedText = NSAttributedString(string: title, font: Font.semibold(17.0), textColor: foregroundColor)
             return node
         } else {
diff --git a/submodules/Display/Display/NavigationBarBadge.swift b/submodules/Display/Source/NavigationBarBadge.swift
similarity index 92%
rename from submodules/Display/Display/NavigationBarBadge.swift
rename to submodules/Display/Source/NavigationBarBadge.swift
index 348ff085c5..333bcfb825 100644
--- a/submodules/Display/Display/NavigationBarBadge.swift
+++ b/submodules/Display/Source/NavigationBarBadge.swift
@@ -7,7 +7,7 @@ public final class NavigationBarBadgeNode: ASDisplayNode {
     private var strokeColor: UIColor
     private var textColor: UIColor
     
-    private let textNode: ASTextNode
+    private let textNode: ImmediateTextNode
     private let backgroundNode: ASImageNode
     
     private let font: UIFont = Font.regular(13.0)
@@ -24,13 +24,12 @@ public final class NavigationBarBadgeNode: ASDisplayNode {
         self.strokeColor = strokeColor
         self.textColor = textColor
         
-        self.textNode = ASTextNode()
+        self.textNode = ImmediateTextNode()
         self.textNode.isUserInteractionEnabled = false
         self.textNode.displaysAsynchronously = false
         
         self.backgroundNode = ASImageNode()
         self.backgroundNode.isLayerBacked = true
-        self.backgroundNode.displayWithoutProcessing = true
         self.backgroundNode.displaysAsynchronously = false
         self.backgroundNode.image = generateStretchableFilledCircleImage(diameter: 18.0, color: fillColor, strokeColor: strokeColor, strokeWidth: 1.0)
         
@@ -49,7 +48,7 @@ public final class NavigationBarBadgeNode: ASDisplayNode {
     }
     
     override public func calculateSizeThatFits(_ constrainedSize: CGSize) -> CGSize {
-        let badgeSize = self.textNode.measure(constrainedSize)
+        let badgeSize = self.textNode.updateLayout(constrainedSize)
         let backgroundSize = CGSize(width: max(18.0, badgeSize.width + 10.0 + 1.0), height: 18.0)
         let backgroundFrame = CGRect(origin: CGPoint(), size: backgroundSize)
         self.backgroundNode.frame = backgroundFrame
diff --git a/submodules/Display/Display/NavigationBarContentNode.swift b/submodules/Display/Source/NavigationBarContentNode.swift
similarity index 100%
rename from submodules/Display/Display/NavigationBarContentNode.swift
rename to submodules/Display/Source/NavigationBarContentNode.swift
diff --git a/submodules/Display/Display/NavigationBarTitleTransitionNode.swift b/submodules/Display/Source/NavigationBarTitleTransitionNode.swift
similarity index 100%
rename from submodules/Display/Display/NavigationBarTitleTransitionNode.swift
rename to submodules/Display/Source/NavigationBarTitleTransitionNode.swift
diff --git a/submodules/Display/Display/NavigationBarTitleView.swift b/submodules/Display/Source/NavigationBarTitleView.swift
similarity index 100%
rename from submodules/Display/Display/NavigationBarTitleView.swift
rename to submodules/Display/Source/NavigationBarTitleView.swift
diff --git a/submodules/Display/Display/NavigationBarTransitionContainer.swift b/submodules/Display/Source/NavigationBarTransitionContainer.swift
similarity index 100%
rename from submodules/Display/Display/NavigationBarTransitionContainer.swift
rename to submodules/Display/Source/NavigationBarTransitionContainer.swift
diff --git a/submodules/Display/Display/NavigationBarTransitionState.swift b/submodules/Display/Source/NavigationBarTransitionState.swift
similarity index 100%
rename from submodules/Display/Display/NavigationBarTransitionState.swift
rename to submodules/Display/Source/NavigationBarTransitionState.swift
diff --git a/submodules/Display/Display/NavigationButtonNode.swift b/submodules/Display/Source/NavigationButtonNode.swift
similarity index 96%
rename from submodules/Display/Display/NavigationButtonNode.swift
rename to submodules/Display/Source/NavigationButtonNode.swift
index 43519c3cb9..62217eeac6 100644
--- a/submodules/Display/Display/NavigationButtonNode.swift
+++ b/submodules/Display/Source/NavigationButtonNode.swift
@@ -5,7 +5,7 @@ public protocol NavigationButtonCustomDisplayNode {
     var isHighlightable: Bool { get }
 }
 
-private final class NavigationButtonItemNode: ASTextNode {
+private final class NavigationButtonItemNode: ImmediateTextNode {
     private func fontForCurrentState() -> UIFont {
         return self.bold ? UIFont.boldSystemFont(ofSize: 17.0) : UIFont.systemFont(ofSize: 17.0)
     }
@@ -202,8 +202,8 @@ private final class NavigationButtonItemNode: ASTextNode {
         self.accessibilityTraits = .button
     }
     
-    func updateLayout(_ constrainedSize: CGSize) -> CGSize {
-        let superSize = super.calculateSizeThatFits(constrainedSize)
+    override func updateLayout(_ constrainedSize: CGSize) -> CGSize {
+        let superSize = super.updateLayout(constrainedSize)
         
         if let node = self.node {
             let nodeSize = node.measure(constrainedSize)
@@ -280,15 +280,13 @@ private final class NavigationButtonItemNode: ASTextNode {
         }
     }
     
-    public override var isEnabled: Bool {
-        get {
-            return super.isEnabled
-        }
-        set(value) {
-            if self.isEnabled != value {
-                super.isEnabled = value
-                
-                self.attributedText = NSAttributedString(string: text, attributes: self.attributesForCurrentState())
+    public var isEnabled: Bool = true {
+        didSet {
+            if self.isEnabled != oldValue {
+                self.attributedText = NSAttributedString(string: self.text, attributes: self.attributesForCurrentState())
+                if let constrainedSize = self.constrainedSize {
+                    let _ = self.updateLayout(constrainedSize)
+                }
             }
         }
     }
diff --git a/submodules/Display/Display/NavigationTitleNode.swift b/submodules/Display/Source/NavigationTitleNode.swift
similarity index 89%
rename from submodules/Display/Display/NavigationTitleNode.swift
rename to submodules/Display/Source/NavigationTitleNode.swift
index 458bc461ff..ef3db73f23 100644
--- a/submodules/Display/Display/NavigationTitleNode.swift
+++ b/submodules/Display/Source/NavigationTitleNode.swift
@@ -2,7 +2,7 @@ import UIKit
 import AsyncDisplayKit
 
 public class NavigationTitleNode: ASDisplayNode {
-    private let label: ASTextNode
+    private let label: ImmediateTextNode
     
     private var _text: NSString = ""
     public var text: NSString {
@@ -22,9 +22,9 @@ public class NavigationTitleNode: ASDisplayNode {
     }
     
     public init(text: NSString) {
-        self.label = ASTextNode()
+        self.label = ImmediateTextNode()
         self.label.maximumNumberOfLines = 1
-        self.label.truncationMode = .byTruncatingTail
+        self.label.truncationType = .end
         self.label.displaysAsynchronously = false
         
         super.init()
@@ -48,7 +48,7 @@ public class NavigationTitleNode: ASDisplayNode {
     }
     
     public override func calculateSizeThatFits(_ constrainedSize: CGSize) -> CGSize {
-        self.label.measure(constrainedSize)
+        self.label.updateLayout(constrainedSize)
         return self.label.calculatedSize
     }
     
diff --git a/submodules/Display/Display/NavigationTransitionCoordinator.swift b/submodules/Display/Source/NavigationTransitionCoordinator.swift
similarity index 99%
rename from submodules/Display/Display/NavigationTransitionCoordinator.swift
rename to submodules/Display/Source/NavigationTransitionCoordinator.swift
index 48aec470c2..692f8fa287 100644
--- a/submodules/Display/Display/NavigationTransitionCoordinator.swift
+++ b/submodules/Display/Source/NavigationTransitionCoordinator.swift
@@ -1,5 +1,6 @@
 import UIKit
 import AppBundle
+import AsyncDisplayKit
 
 enum NavigationTransition {
     case Push
@@ -63,7 +64,6 @@ final class NavigationTransitionCoordinator {
         self.dimNode.backgroundColor = UIColor.black
         self.shadowNode = ASImageNode()
         self.shadowNode.displaysAsynchronously = false
-        self.shadowNode.displayWithoutProcessing = true
         self.shadowNode.image = shadowImage
         
         if let topNavigationBar = topNavigationBar, let bottomNavigationBar = bottomNavigationBar {
diff --git a/submodules/Display/Source/Nodes/ASImageNode.swift b/submodules/Display/Source/Nodes/ASImageNode.swift
new file mode 100644
index 0000000000..8baa7359e2
--- /dev/null
+++ b/submodules/Display/Source/Nodes/ASImageNode.swift
@@ -0,0 +1,34 @@
+import Foundation
+import UIKit
+import AsyncDisplayKit
+
+open class ASImageNode: ASDisplayNode {
+    public var image: UIImage? {
+        didSet {
+            if let image = self.image {
+                let capInsets = image.capInsets
+                if capInsets.left.isZero && capInsets.top.isZero {
+                    self.contentsScale = image.scale
+                    self.contents = image.cgImage
+                } else {
+                    ASDisplayNodeSetResizableContents(self, image)
+                }
+            } else {
+                self.contents = nil
+            }
+            if self.image?.size != oldValue?.size {
+                self.invalidateCalculatedLayout()
+            }
+        }
+    }
+
+    public var displayWithoutProcessing: Bool = true
+
+    override public init() {
+        super.init()
+    }
+    
+    override public func calculateSizeThatFits(_ contrainedSize: CGSize) -> CGSize {
+        return self.image?.size ?? CGSize()
+    }
+}
diff --git a/submodules/Display/Source/Nodes/ButtonNode.swift b/submodules/Display/Source/Nodes/ButtonNode.swift
new file mode 100644
index 0000000000..927eea4f7e
--- /dev/null
+++ b/submodules/Display/Source/Nodes/ButtonNode.swift
@@ -0,0 +1,350 @@
+import Foundation
+import UIKit
+import AsyncDisplayKit
+
+open class ASButtonNode: ASControlNode {
+    public let titleNode: ImmediateTextNode
+    public let highlightedTitleNode: ImmediateTextNode
+    public let disabledTitleNode: ImmediateTextNode
+    public let imageNode: ASImageNode
+    public let disabledImageNode: ASImageNode
+    public let backgroundImageNode: ASImageNode
+    public let highlightedBackgroundImageNode: ASImageNode
+    
+    public var contentEdgeInsets: UIEdgeInsets = UIEdgeInsets() {
+        didSet {
+            if self.contentEdgeInsets != oldValue {
+                self.invalidateCalculatedLayout()
+                self.setNeedsLayout()
+            }
+        }
+    }
+    
+    public var contentHorizontalAlignment: ASHorizontalAlignment = .middle {
+        didSet {
+            if self.contentHorizontalAlignment != oldValue {
+                self.invalidateCalculatedLayout()
+                self.setNeedsLayout()
+            }
+        }
+    }
+    
+    public var laysOutHorizontally: Bool = true {
+        didSet {
+            if self.laysOutHorizontally != oldValue {
+                self.invalidateCalculatedLayout()
+                self.setNeedsLayout()
+            }
+        }
+    }
+    
+    public var contentSpacing: CGFloat = 0.0 {
+        didSet {
+            if self.contentSpacing != oldValue {
+                self.invalidateCalculatedLayout()
+                self.setNeedsLayout()
+            }
+        }
+    }
+    
+    private var calculatedTitleSize: CGSize = CGSize()
+    private var calculatedHighlightedTitleSize: CGSize = CGSize()
+    private var calculatedDisabledTitleSize: CGSize = CGSize()
+    
+    override public init() {
+        self.titleNode = ImmediateTextNode()
+        self.titleNode.isUserInteractionEnabled = false
+        self.titleNode.displaysAsynchronously = false
+        
+        self.highlightedTitleNode = ImmediateTextNode()
+        self.highlightedTitleNode.isUserInteractionEnabled = false
+        self.highlightedTitleNode.displaysAsynchronously = false
+        
+        self.disabledTitleNode = ImmediateTextNode()
+        self.disabledTitleNode.isUserInteractionEnabled = false
+        self.disabledTitleNode.displaysAsynchronously = false
+        
+        self.imageNode = ASImageNode()
+        self.imageNode.isUserInteractionEnabled = false
+        self.imageNode.displaysAsynchronously = false
+        self.imageNode.displayWithoutProcessing = true
+        
+        self.disabledImageNode = ASImageNode()
+        self.disabledImageNode.isUserInteractionEnabled = false
+        self.disabledImageNode.displaysAsynchronously = false
+        self.disabledImageNode.displayWithoutProcessing = true
+        
+        self.backgroundImageNode = ASImageNode()
+        self.backgroundImageNode.isUserInteractionEnabled = false
+        self.backgroundImageNode.displaysAsynchronously = false
+        self.backgroundImageNode.displayWithoutProcessing = true
+        
+        self.highlightedBackgroundImageNode = ASImageNode()
+        self.highlightedBackgroundImageNode.isUserInteractionEnabled = false
+        self.highlightedBackgroundImageNode.displaysAsynchronously = false
+        self.highlightedBackgroundImageNode.displayWithoutProcessing = true
+        
+        super.init()
+        
+        self.addSubnode(self.backgroundImageNode)
+        self.addSubnode(self.highlightedBackgroundImageNode)
+        self.highlightedBackgroundImageNode.isHidden = true
+        self.addSubnode(self.titleNode)
+        self.addSubnode(self.highlightedTitleNode)
+        self.highlightedTitleNode.isHidden = true
+        self.addSubnode(self.disabledTitleNode)
+        self.disabledTitleNode.isHidden = true
+        self.addSubnode(self.imageNode)
+        self.addSubnode(self.disabledImageNode)
+        self.disabledImageNode.isHidden = true
+    }
+    
+    override open func calculateSizeThatFits(_ constrainedSize: CGSize) -> CGSize {
+        let horizontalInsets = self.contentEdgeInsets.left + self.contentEdgeInsets.right
+        let verticalInsets = self.contentEdgeInsets.top + self.contentEdgeInsets.bottom
+        
+        let imageSize = self.imageNode.image?.size ?? CGSize()
+        
+        let widthForTitle: CGFloat
+        if self.laysOutHorizontally {
+            widthForTitle = max(1.0, constrainedSize.width - horizontalInsets - imageSize.width - (imageSize.width.isZero ? 0.0 : self.contentSpacing))
+        } else {
+            widthForTitle = max(1.0, constrainedSize.width - horizontalInsets)
+        }
+        
+        let normalTitleSize = self.titleNode.updateLayout(CGSize(width: widthForTitle, height: max(1.0, constrainedSize.height - verticalInsets)))
+        self.calculatedTitleSize = normalTitleSize
+        let highlightedTitleSize = self.highlightedTitleNode.updateLayout(CGSize(width: widthForTitle, height: max(1.0, constrainedSize.height - verticalInsets)))
+        self.calculatedHighlightedTitleSize = highlightedTitleSize
+        self.calculatedDisabledTitleSize = self.disabledTitleNode.updateLayout(CGSize(width: widthForTitle, height: max(1.0, constrainedSize.height - verticalInsets)))
+        
+        let titleSize = CGSize(width: max(normalTitleSize.width, highlightedTitleSize.width), height: max(normalTitleSize.height, highlightedTitleSize.height))
+        
+        var contentSize: CGSize
+        if self.laysOutHorizontally {
+            contentSize = CGSize(width: titleSize.width + imageSize.width, height: max(titleSize.height, imageSize.height))
+            if !titleSize.width.isZero && !imageSize.width.isZero {
+                contentSize.width += self.contentSpacing
+            }
+        } else {
+            contentSize = CGSize(width: max(titleSize.width, imageSize.width), height: titleSize.height + imageSize.height)
+            if !titleSize.width.isZero && !imageSize.width.isZero {
+                contentSize.height += self.contentSpacing
+            }
+        }
+        
+        return CGSize(width: min(constrainedSize.width, contentSize.width + self.contentEdgeInsets.left + self.contentEdgeInsets.right), height: min(constrainedSize.height, contentSize.height + self.contentEdgeInsets.top + self.contentEdgeInsets.bottom))
+    }
+    
+    open func setAttributedTitle(_ title: NSAttributedString, for state: UIControl.State) {
+        if state == [] {
+            if let attributedText = self.titleNode.attributedText {
+                if !attributedText.isEqual(to: title) {
+                    self.invalidateCalculatedLayout()
+                    self.setNeedsLayout()
+                }
+            } else {
+                self.invalidateCalculatedLayout()
+                self.setNeedsLayout()
+            }
+            self.titleNode.attributedText = title
+            
+            if let attributedText = self.highlightedTitleNode.attributedText {
+                if !attributedText.isEqual(to: title) {
+                    self.invalidateCalculatedLayout()
+                    self.setNeedsLayout()
+                }
+            } else {
+                self.invalidateCalculatedLayout()
+                self.setNeedsLayout()
+            }
+            self.highlightedTitleNode.attributedText = title
+        } else if state == .highlighted || state == .selected {
+            if let attributedText = self.highlightedTitleNode.attributedText {
+                if !attributedText.isEqual(to: title) {
+                    self.invalidateCalculatedLayout()
+                    self.setNeedsLayout()
+                }
+            } else {
+                self.invalidateCalculatedLayout()
+                self.setNeedsLayout()
+            }
+            self.highlightedTitleNode.attributedText = title
+        } else if state == .disabled {
+            if let attributedText = self.disabledTitleNode.attributedText {
+                if !attributedText.isEqual(to: title) {
+                    self.invalidateCalculatedLayout()
+                    self.setNeedsLayout()
+                }
+            } else {
+                self.invalidateCalculatedLayout()
+                self.setNeedsLayout()
+            }
+            self.disabledTitleNode.attributedText = title
+        } else {
+            if let attributedText = self.titleNode.attributedText {
+                if !attributedText.isEqual(to: title) {
+                    self.invalidateCalculatedLayout()
+                    self.setNeedsLayout()
+                }
+            } else {
+                self.invalidateCalculatedLayout()
+                self.setNeedsLayout()
+            }
+            self.titleNode.attributedText = title
+        }
+    }
+    
+    open func attributedTitle(for state: UIControl.State) -> NSAttributedString? {
+        if state == .highlighted || state == .selected {
+            return self.highlightedTitleNode.attributedText
+        } else if state == .disabled {
+            return self.disabledTitleNode.attributedText
+        } else {
+            return self.titleNode.attributedText
+        }
+    }
+    
+    open func setTitle(_ title: String, with font: UIFont, with color: UIColor, for state: UIControl.State) {
+        self.setAttributedTitle(NSAttributedString(string: title, font: font, textColor: color), for: state)
+    }
+    
+    open func setImage(_ image: UIImage?, for state: UIControl.State) {
+        if image?.size != self.imageNode.image?.size {
+            self.invalidateCalculatedLayout()
+            self.setNeedsLayout()
+        }
+        if state == .disabled {
+            self.disabledImageNode.image = image
+        } else {
+            self.imageNode.image = image
+        }
+    }
+    
+    open func setBackgroundImage(_ image: UIImage?, for state: UIControl.State) {
+        if state == [] {
+            self.backgroundImageNode.image = image
+            self.highlightedBackgroundImageNode.image = image
+        } else if state == .highlighted || state == .selected {
+            self.highlightedBackgroundImageNode.image = image
+        } else {
+            self.backgroundImageNode.image = image
+        }
+    }
+    
+    open func image(for state: UIControl.State) -> UIImage? {
+        switch state {
+        case .disabled:
+            return self.disabledImageNode.image ?? self.imageNode.image
+        default:
+            return self.imageNode.image
+        }
+    }
+    
+    open func backgroundImage(for state: UIControl.State) -> UIImage? {
+        return self.backgroundImageNode.image
+    }
+    
+    override open var isHighlighted: Bool {
+        didSet {
+            if self.isHighlighted != oldValue {
+                if self.isHighlighted {
+                    if self.highlightedTitleNode.attributedText != nil {
+                        self.highlightedTitleNode.isHidden = false
+                        self.titleNode.isHidden = true
+                    } else {
+                        self.highlightedTitleNode.isHidden = true
+                        self.titleNode.isHidden = false
+                    }
+                    if self.highlightedBackgroundImageNode.image != nil {
+                        self.highlightedBackgroundImageNode.isHidden = false
+                        self.backgroundImageNode.isHidden = true
+                    } else {
+                        self.highlightedBackgroundImageNode.isHidden = true
+                        self.backgroundImageNode.isHidden = false
+                    }
+                } else {
+                    self.highlightedTitleNode.isHidden = true
+                    self.titleNode.isHidden = false
+                    
+                    self.highlightedBackgroundImageNode.isHidden = true
+                    self.backgroundImageNode.isHidden = false
+                }
+            }
+        }
+    }
+    
+    override open var isEnabled: Bool {
+        didSet {
+            if self.isEnabled != oldValue {
+                if self.isEnabled || self.disabledTitleNode.attributedText == nil {
+                    self.titleNode.isHidden = false
+                    self.disabledTitleNode.isHidden = true
+                } else {
+                    self.titleNode.isHidden = true
+                    self.disabledTitleNode.isHidden = false
+                }
+                
+                if self.isEnabled || self.disabledImageNode.image == nil {
+                    self.imageNode.isHidden = false
+                    self.disabledImageNode.isHidden = true
+                } else {
+                    self.imageNode.isHidden = true
+                    self.disabledImageNode.isHidden = false
+                }
+            }
+        }
+    }
+    
+    override open func layout() {
+        let size = self.bounds.size
+        
+        let contentRect = CGRect(origin: CGPoint(x: self.contentEdgeInsets.left, y: self.contentEdgeInsets.top), size: CGSize(width: size.width - self.contentEdgeInsets.left - self.contentEdgeInsets.right, height: size.height - self.contentEdgeInsets.top - self.contentEdgeInsets.bottom))
+        
+        let imageSize = self.imageNode.image?.size ?? CGSize()
+        
+        let titleOrigin: CGPoint
+        let highlightedTitleOrigin: CGPoint
+        let disabledTitleOrigin: CGPoint
+        let imageOrigin: CGPoint
+        
+        if self.laysOutHorizontally {
+            switch self.contentHorizontalAlignment {
+            case .left:
+                titleOrigin = CGPoint(x: contentRect.minX, y: contentRect.minY + floor((contentRect.height - self.calculatedTitleSize.height) / 2.0))
+                highlightedTitleOrigin = CGPoint(x: contentRect.minX, y: contentRect.minY + floor((contentRect.height - self.calculatedHighlightedTitleSize.height) / 2.0))
+                disabledTitleOrigin = CGPoint(x: contentRect.minX, y: contentRect.minY + floor((contentRect.height - self.calculatedDisabledTitleSize.height) / 2.0))
+                imageOrigin = CGPoint(x: titleOrigin.x + self.calculatedTitleSize.width + self.contentSpacing, y: contentRect.minY + floor((contentRect.height - imageSize.height) / 2.0))
+            case .right:
+                titleOrigin = CGPoint(x: contentRect.maxX - self.calculatedTitleSize.width, y: contentRect.minY + floor((contentRect.height - self.calculatedTitleSize.height) / 2.0))
+                highlightedTitleOrigin = CGPoint(x: contentRect.maxX - self.calculatedHighlightedTitleSize.width, y: contentRect.minY + floor((contentRect.height - self.calculatedHighlightedTitleSize.height) / 2.0))
+                disabledTitleOrigin = CGPoint(x: contentRect.maxX - self.calculatedDisabledTitleSize.width, y: contentRect.minY + floor((contentRect.height - self.calculatedDisabledTitleSize.height) / 2.0))
+                imageOrigin = CGPoint(x: titleOrigin.x - self.contentSpacing - imageSize.width, y: contentRect.minY + floor((contentRect.height - imageSize.height) / 2.0))
+            default:
+                titleOrigin = CGPoint(x: contentRect.minX + floor((contentRect.width - self.calculatedTitleSize.width) / 2.0), y: contentRect.minY + floor((contentRect.height - self.calculatedTitleSize.height) / 2.0))
+                highlightedTitleOrigin = CGPoint(x: floor((contentRect.width - self.calculatedHighlightedTitleSize.width) / 2.0), y: contentRect.minY + floor((contentRect.height - self.calculatedHighlightedTitleSize.height) / 2.0))
+                disabledTitleOrigin = CGPoint(x: floor((contentRect.width - self.calculatedDisabledTitleSize.width) / 2.0), y: contentRect.minY + floor((contentRect.height - self.calculatedDisabledTitleSize.height) / 2.0))
+                imageOrigin = CGPoint(x: floor((contentRect.width - imageSize.width) / 2.0), y: contentRect.minY + floor((contentRect.height - imageSize.height) / 2.0))
+            }
+        } else {
+            var contentHeight: CGFloat = self.calculatedTitleSize.height
+            if !imageSize.height.isZero {
+                contentHeight += self.contentSpacing + imageSize.height
+            }
+            let contentY = contentRect.minY + floor((contentRect.height - contentHeight) / 2.0)
+            titleOrigin = CGPoint(x: contentRect.minX + floor((contentRect.width - self.calculatedTitleSize.width) / 2.0), y: contentY + contentHeight - self.calculatedTitleSize.height)
+            highlightedTitleOrigin = CGPoint(x: contentRect.minX + floor((contentRect.width - self.calculatedHighlightedTitleSize.width) / 2.0), y: contentY + contentHeight - self.calculatedHighlightedTitleSize.height)
+            disabledTitleOrigin = CGPoint(x: contentRect.minX + floor((contentRect.width - self.calculatedDisabledTitleSize.width) / 2.0), y: contentY + contentHeight - self.calculatedDisabledTitleSize.height)
+            imageOrigin = CGPoint(x: floor((contentRect.width - imageSize.width) / 2.0), y: contentY)
+        }
+        
+        self.titleNode.frame = CGRect(origin: titleOrigin, size: self.calculatedTitleSize)
+        self.highlightedTitleNode.frame = CGRect(origin: highlightedTitleOrigin, size: self.calculatedHighlightedTitleSize)
+        self.disabledTitleNode.frame = CGRect(origin: disabledTitleOrigin, size: self.calculatedDisabledTitleSize)
+        self.imageNode.frame = CGRect(origin: imageOrigin, size: imageSize)
+        self.disabledImageNode.frame = CGRect(origin: imageOrigin, size: imageSize)
+        
+        self.backgroundImageNode.frame = CGRect(origin: CGPoint(), size: size)
+        self.highlightedBackgroundImageNode.frame = CGRect(origin: CGPoint(), size: size)
+    }
+}
diff --git a/submodules/Display/Display/PageControlNode.swift b/submodules/Display/Source/PageControlNode.swift
similarity index 98%
rename from submodules/Display/Display/PageControlNode.swift
rename to submodules/Display/Source/PageControlNode.swift
index 283d7f6bd3..0b600ac17c 100644
--- a/submodules/Display/Display/PageControlNode.swift
+++ b/submodules/Display/Source/PageControlNode.swift
@@ -58,7 +58,6 @@ public final class PageControlNode: ASDisplayNode {
                     let dotNode = ASImageNode()
                     dotNode.image = self.normalDotImage
                     dotNode.displaysAsynchronously = false
-                    dotNode.displayWithoutProcessing = true
                     dotNode.isUserInteractionEnabled = false
                     self.dotNodes.append(dotNode)
                     self.addSubnode(dotNode)
diff --git a/submodules/Display/Display/PeekController.swift b/submodules/Display/Source/PeekController.swift
similarity index 100%
rename from submodules/Display/Display/PeekController.swift
rename to submodules/Display/Source/PeekController.swift
diff --git a/submodules/Display/Display/PeekControllerContent.swift b/submodules/Display/Source/PeekControllerContent.swift
similarity index 100%
rename from submodules/Display/Display/PeekControllerContent.swift
rename to submodules/Display/Source/PeekControllerContent.swift
diff --git a/submodules/Display/Display/PeekControllerGestureRecognizer.swift b/submodules/Display/Source/PeekControllerGestureRecognizer.swift
similarity index 100%
rename from submodules/Display/Display/PeekControllerGestureRecognizer.swift
rename to submodules/Display/Source/PeekControllerGestureRecognizer.swift
diff --git a/submodules/Display/Display/PeekControllerMenuItemNode.swift b/submodules/Display/Source/PeekControllerMenuItemNode.swift
similarity index 95%
rename from submodules/Display/Display/PeekControllerMenuItemNode.swift
rename to submodules/Display/Source/PeekControllerMenuItemNode.swift
index 5d4890b1da..b91fc4aed6 100644
--- a/submodules/Display/Display/PeekControllerMenuItemNode.swift
+++ b/submodules/Display/Source/PeekControllerMenuItemNode.swift
@@ -32,7 +32,7 @@ final class PeekControllerMenuItemNode: HighlightTrackingButtonNode {
     
     private let separatorNode: ASDisplayNode
     private let highlightedBackgroundNode: ASDisplayNode
-    private let textNode: ASTextNode
+    private let textNode: ImmediateTextNode
     
     init(theme: PeekControllerTheme, item: PeekControllerMenuItem, activatedAction: @escaping () -> Void) {
         self.item = item
@@ -47,7 +47,7 @@ final class PeekControllerMenuItemNode: HighlightTrackingButtonNode {
         self.highlightedBackgroundNode.backgroundColor = theme.menuItemHighligtedColor
         self.highlightedBackgroundNode.alpha = 0.0
         
-        self.textNode = ASTextNode()
+        self.textNode = ImmediateTextNode()
         self.textNode.isUserInteractionEnabled = false
         self.textNode.displaysAsynchronously = false
         
@@ -93,7 +93,7 @@ final class PeekControllerMenuItemNode: HighlightTrackingButtonNode {
         transition.updateFrame(node: self.highlightedBackgroundNode, frame: CGRect(origin: CGPoint(), size: CGSize(width: width, height: height)))
         transition.updateFrame(node: self.separatorNode, frame: CGRect(origin: CGPoint(x: 0.0, y: height), size: CGSize(width: width, height: UIScreenPixel)))
         
-        let textSize = self.textNode.measure(CGSize(width: width - 10.0, height: height))
+        let textSize = self.textNode.updateLayout(CGSize(width: width - 10.0, height: height))
         transition.updateFrame(node: self.textNode, frame: CGRect(origin: CGPoint(x: floor((width - textSize.width) / 2.0), y: floor((height - textSize.height) / 2.0)), size: textSize))
         
         return height
diff --git a/submodules/Display/Display/PeekControllerMenuNode.swift b/submodules/Display/Source/PeekControllerMenuNode.swift
similarity index 100%
rename from submodules/Display/Display/PeekControllerMenuNode.swift
rename to submodules/Display/Source/PeekControllerMenuNode.swift
diff --git a/submodules/Display/Display/PeekControllerNode.swift b/submodules/Display/Source/PeekControllerNode.swift
similarity index 99%
rename from submodules/Display/Display/PeekControllerNode.swift
rename to submodules/Display/Source/PeekControllerNode.swift
index 9b80c23a40..fabe9c53b9 100644
--- a/submodules/Display/Display/PeekControllerNode.swift
+++ b/submodules/Display/Source/PeekControllerNode.swift
@@ -46,7 +46,6 @@ final class PeekControllerNode: ViewControllerTracingNode {
         
         self.containerBackgroundNode = ASImageNode()
         self.containerBackgroundNode.isLayerBacked = true
-        self.containerBackgroundNode.displayWithoutProcessing = true
         self.containerBackgroundNode.displaysAsynchronously = false
         
         self.containerNode = ASDisplayNode()
diff --git a/submodules/Display/Display/PresentationContext.swift b/submodules/Display/Source/PresentationContext.swift
similarity index 99%
rename from submodules/Display/Display/PresentationContext.swift
rename to submodules/Display/Source/PresentationContext.swift
index 651db2cd8e..8c47306966 100644
--- a/submodules/Display/Display/PresentationContext.swift
+++ b/submodules/Display/Source/PresentationContext.swift
@@ -198,7 +198,6 @@ public final class PresentationContext {
                             }
                         }
                         (controller as? UIViewController)?.setIgnoreAppearanceMethodInvocations(false)
-                        view.layer.invalidateUpTheTree()
                         strongSelf.updateViews()
                         controller.viewWillAppear(false)
                         if let controller = controller as? PresentableController {
diff --git a/submodules/Display/Display/RuntimeUtils.swift b/submodules/Display/Source/RuntimeUtils.swift
similarity index 100%
rename from submodules/Display/Display/RuntimeUtils.swift
rename to submodules/Display/Source/RuntimeUtils.swift
diff --git a/submodules/Display/Display/ScrollToTopProxyView.swift b/submodules/Display/Source/ScrollToTopProxyView.swift
similarity index 98%
rename from submodules/Display/Display/ScrollToTopProxyView.swift
rename to submodules/Display/Source/ScrollToTopProxyView.swift
index d0e8eb459e..b7aa0d8d9c 100644
--- a/submodules/Display/Display/ScrollToTopProxyView.swift
+++ b/submodules/Display/Source/ScrollToTopProxyView.swift
@@ -1,4 +1,5 @@
 import UIKit
+import AsyncDisplayKit
 
 class ScrollToTopView: UIScrollView, UIScrollViewDelegate {
     var action: (() -> Void)?
diff --git a/submodules/Display/Display/ShakeAnimation.swift b/submodules/Display/Source/ShakeAnimation.swift
similarity index 100%
rename from submodules/Display/Display/ShakeAnimation.swift
rename to submodules/Display/Source/ShakeAnimation.swift
diff --git a/submodules/Display/Display/Spring.swift b/submodules/Display/Source/Spring.swift
similarity index 100%
rename from submodules/Display/Display/Spring.swift
rename to submodules/Display/Source/Spring.swift
diff --git a/submodules/Display/Display/StatusBar.swift b/submodules/Display/Source/StatusBar.swift
similarity index 95%
rename from submodules/Display/Display/StatusBar.swift
rename to submodules/Display/Source/StatusBar.swift
index c316f014a7..c7cc1fe8ba 100644
--- a/submodules/Display/Display/StatusBar.swift
+++ b/submodules/Display/Source/StatusBar.swift
@@ -38,7 +38,7 @@ private func addInCallAnimation(_ layer: CALayer) {
     layer.add(animation, forKey: "blink")
 }
 
-private final class StatusBarLabelNode: ASTextNode {
+private final class StatusBarLabelNode: ImmediateTextNode {
     override func willEnterHierarchy() {
         super.willEnterHierarchy()
         
@@ -101,7 +101,6 @@ public final class StatusBar: ASDisplayNode {
         didSet {
             if !self.verticalOffset.isEqual(to: oldValue) {
                 self.offsetNode.frame = CGRect(origin: CGPoint(x: 0.0, y: -self.verticalOffset), size: CGSize())
-                self.layer.invalidateUpTheTree()
             }
         }
     }
@@ -119,7 +118,7 @@ public final class StatusBar: ASDisplayNode {
         
         self.offsetNode.isUserInteractionEnabled = false
         
-        let labelSize = self.inCallLabel.measure(CGSize(width: 300.0, height: 300.0))
+        let labelSize = self.inCallLabel.updateLayout(CGSize(width: 300.0, height: 300.0))
         self.inCallLabel.frame = CGRect(origin: CGPoint(x: 10.0, y: 20.0 + 4.0), size: labelSize)
         
         super.init()
@@ -133,8 +132,6 @@ public final class StatusBar: ASDisplayNode {
         self.addSubnode(self.offsetNode)
         self.addSubnode(self.inCallBackgroundNode)
         
-        self.layer.setTraceableInfo(CATracingLayerInfo(shouldBeAdjustedToInverseTransform: true, userData: self, tracingTag: WindowTracingTags.statusBar, disableChildrenTracingTags: 0))
-        
         self.clipsToBounds = true
         
         self.view.addGestureRecognizer(UITapGestureRecognizer(target: self, action: #selector(self.tapGesture(_:))))
@@ -259,7 +256,7 @@ public final class StatusBar: ASDisplayNode {
         if self.inCallLabel.supernode != nil {
             let size = self.bounds.size
             if !size.width.isZero && !size.height.isZero {
-                let labelSize = self.inCallLabel.measure(size)
+                let labelSize = self.inCallLabel.updateLayout(size)
                 self.inCallLabel.frame = CGRect(origin: CGPoint(x: floor((size.width - labelSize.width) / 2.0), y: 20.0 + floor((20.0 - labelSize.height) / 2.0)), size: labelSize)
             }
         }
diff --git a/submodules/Display/Display/StatusBarHost.swift b/submodules/Display/Source/StatusBarHost.swift
similarity index 100%
rename from submodules/Display/Display/StatusBarHost.swift
rename to submodules/Display/Source/StatusBarHost.swift
diff --git a/submodules/Display/Display/StatusBarProxyNode.swift b/submodules/Display/Source/StatusBarProxyNode.swift
similarity index 99%
rename from submodules/Display/Display/StatusBarProxyNode.swift
rename to submodules/Display/Source/StatusBarProxyNode.swift
index 24ae8f815b..c429a8c176 100644
--- a/submodules/Display/Display/StatusBarProxyNode.swift
+++ b/submodules/Display/Source/StatusBarProxyNode.swift
@@ -1,6 +1,7 @@
 import Foundation
 import UIKit
 import AsyncDisplayKit
+import ObjCRuntimeUtils
 
 public enum StatusBarStyle {
     case Black
diff --git a/submodules/Display/Display/SubstringSearch.swift b/submodules/Display/Source/SubstringSearch.swift
similarity index 100%
rename from submodules/Display/Display/SubstringSearch.swift
rename to submodules/Display/Source/SubstringSearch.swift
diff --git a/submodules/Display/Display/SwitchNode.swift b/submodules/Display/Source/SwitchNode.swift
similarity index 100%
rename from submodules/Display/Display/SwitchNode.swift
rename to submodules/Display/Source/SwitchNode.swift
diff --git a/submodules/Display/Display/TabBarContollerNode.swift b/submodules/Display/Source/TabBarContollerNode.swift
similarity index 95%
rename from submodules/Display/Display/TabBarContollerNode.swift
rename to submodules/Display/Source/TabBarContollerNode.swift
index dee3c1f46a..c84927e88a 100644
--- a/submodules/Display/Display/TabBarContollerNode.swift
+++ b/submodules/Display/Source/TabBarContollerNode.swift
@@ -25,10 +25,10 @@ final class TabBarControllerNode: ASDisplayNode {
         }
     }
     
-    init(theme: TabBarControllerTheme, navigationBar: NavigationBar?, itemSelected: @escaping (Int, Bool, [ASDisplayNode]) -> Void, contextAction: @escaping (Int, ContextExtractedContentContainingNode, ContextGesture) -> Void, toolbarActionSelected: @escaping (ToolbarActionOption) -> Void) {
+    init(theme: TabBarControllerTheme, navigationBar: NavigationBar?, itemSelected: @escaping (Int, Bool, [ASDisplayNode]) -> Void, contextAction: @escaping (Int, ContextExtractedContentContainingNode, ContextGesture) -> Void, swipeAction: @escaping (Int, TabBarItemSwipeDirection) -> Void, toolbarActionSelected: @escaping (ToolbarActionOption) -> Void) {
         self.theme = theme
         self.navigationBar = navigationBar
-        self.tabBarNode = TabBarNode(theme: theme, itemSelected: itemSelected, contextAction: contextAction)
+        self.tabBarNode = TabBarNode(theme: theme, itemSelected: itemSelected, contextAction: contextAction, swipeAction: swipeAction)
         self.toolbarActionSelected = toolbarActionSelected
         
         super.init()
diff --git a/submodules/Display/Display/TabBarController.swift b/submodules/Display/Source/TabBarController.swift
similarity index 94%
rename from submodules/Display/Display/TabBarController.swift
rename to submodules/Display/Source/TabBarController.swift
index bf48fe944b..36b93c9b5f 100644
--- a/submodules/Display/Display/TabBarController.swift
+++ b/submodules/Display/Source/TabBarController.swift
@@ -166,6 +166,21 @@ open class TabBarController: ViewController {
         return self.tabBarControllerNode.tabBarNode.sourceNodesForController(at: index)
     }
     
+    public func frameForControllerTab(controller: ViewController) -> CGRect? {
+        if let index = self.controllers.firstIndex(of: controller) {
+            return self.tabBarControllerNode.tabBarNode.frameForControllerTab(at: index).flatMap { self.tabBarControllerNode.tabBarNode.view.convert($0, to: self.view) }
+        } else {
+            return nil
+        }
+    }
+    
+    public func isPointInsideContentArea(point: CGPoint) -> Bool {
+        if point.y < self.tabBarControllerNode.tabBarNode.frame.minY {
+            return true
+        }
+        return false
+    }
+    
     override open func loadDisplayNode() {
         self.displayNode = TabBarControllerNode(theme: self.theme, navigationBar: self.navigationBar, itemSelected: { [weak self] index, longTap, itemNodes in
             if let strongSelf = self {
@@ -240,6 +255,13 @@ open class TabBarController: ViewController {
             if index >= 0 && index < strongSelf.controllers.count {
                 strongSelf.controllers[index].tabBarItemContextAction(sourceNode: node, gesture: gesture)
             }
+        }, swipeAction: { [weak self] index, direction in
+            guard let strongSelf = self else {
+                return
+            }
+            if index >= 0 && index < strongSelf.controllers.count {
+                strongSelf.controllers[index].tabBarItemSwipeAction(direction: direction)
+            }
         }, toolbarActionSelected: { [weak self] action in
             self?.currentController?.toolbarActionSelected(action: action)
         })
@@ -378,7 +400,7 @@ open class TabBarController: ViewController {
             }
         }
         self.controllers = controllers
-        self.tabBarControllerNode.tabBarNode.tabBarItems = self.controllers.map({ TabBarNodeItem(item: $0.tabBarItem, hasContext: $0.hasTabBarItemContextAction) })
+        self.tabBarControllerNode.tabBarNode.tabBarItems = self.controllers.map({ TabBarNodeItem(item: $0.tabBarItem, contextActionType: $0.tabBarItemContextActionType) })
         
         let signals = combineLatest(self.controllers.map({ $0.tabBarItem }).map { tabBarItem -> Signal<Bool, NoError> in
             if let tabBarItem = tabBarItem, tabBarItem.image == nil {
diff --git a/submodules/Display/Display/TabBarNode.swift b/submodules/Display/Source/TabBarNode.swift
similarity index 92%
rename from submodules/Display/Display/TabBarNode.swift
rename to submodules/Display/Source/TabBarNode.swift
index c4e5b28033..4ae3ea97d8 100644
--- a/submodules/Display/Display/TabBarNode.swift
+++ b/submodules/Display/Source/TabBarNode.swift
@@ -2,6 +2,7 @@ import Foundation
 import UIKit
 import AsyncDisplayKit
 import SwiftSignalKit
+import UIKitRuntimeUtils
 
 private let separatorHeight: CGFloat = 1.0 / UIScreen.main.scale
 private func tabBarItemImage(_ image: UIImage?, title: String, backgroundColor: UIColor, tintColor: UIColor, horizontal: Bool, imageMode: Bool, centered: Bool = false) -> (UIImage, CGFloat) {
@@ -88,6 +89,11 @@ private func tabBarItemImage(_ image: UIImage?, title: String, backgroundColor:
 
 private let badgeFont = Font.regular(13.0)
 
+public enum TabBarItemSwipeDirection {
+    case left
+    case right
+}
+
 private final class TabBarItemNode: ASDisplayNode {
     let extractedContainerNode: ContextExtractedContentContainingNode
     let containerNode: ContextControllerSourceNode
@@ -96,6 +102,9 @@ private final class TabBarItemNode: ASDisplayNode {
     let contextImageNode: ASImageNode
     let contextTextImageNode: ASImageNode
     var contentWidth: CGFloat?
+    var isSelected: Bool = false
+    
+    var swiped: ((TabBarItemSwipeDirection) -> Void)?
     
     override init() {
         self.extractedContainerNode = ContextExtractedContentContainingNode()
@@ -146,6 +155,26 @@ private final class TabBarItemNode: ASDisplayNode {
             transition.updateAlpha(node: strongSelf.contextImageNode, alpha: isExtracted ? 1.0 : 0.0)
             transition.updateAlpha(node: strongSelf.contextTextImageNode, alpha: isExtracted ? 1.0 : 0.0)
         }
+        
+        /*let leftSwipe = UISwipeGestureRecognizer(target: self, action: #selector(self.swipeGesture(_:)))
+        leftSwipe.direction = .left
+        self.containerNode.view.addGestureRecognizer(leftSwipe)
+        let rightSwipe = UISwipeGestureRecognizer(target: self, action: #selector(self.swipeGesture(_:)))
+        rightSwipe.direction = .right
+        self.containerNode.view.addGestureRecognizer(rightSwipe)*/
+    }
+    
+    @objc private func swipeGesture(_ gesture: UISwipeGestureRecognizer) {
+        if case .ended = gesture.state {
+            self.containerNode.cancelGesture()
+            
+            switch gesture.direction {
+            case .left:
+                self.swiped?(.left)
+            default:
+                self.swiped?(.right)
+            }
+        }
     }
 }
 
@@ -173,7 +202,7 @@ private final class TabBarNodeContainer {
     var selectedImageValue: UIImage?
     var appliedSelectedImageValue: UIImage?
     
-    init(item: TabBarNodeItem, imageNode: TabBarItemNode, updateBadge: @escaping (String) -> Void, updateTitle: @escaping (String, Bool) -> Void, updateImage: @escaping (UIImage?) -> Void, updateSelectedImage: @escaping (UIImage?) -> Void, contextAction: @escaping (ContextExtractedContentContainingNode, ContextGesture) -> Void) {
+    init(item: TabBarNodeItem, imageNode: TabBarItemNode, updateBadge: @escaping (String) -> Void, updateTitle: @escaping (String, Bool) -> Void, updateImage: @escaping (UIImage?) -> Void, updateSelectedImage: @escaping (UIImage?) -> Void, contextAction: @escaping (ContextExtractedContentContainingNode, ContextGesture) -> Void, swipeAction: @escaping (TabBarItemSwipeDirection) -> Void) {
         self.item = item.item
         
         self.imageNode = imageNode
@@ -225,7 +254,24 @@ private final class TabBarNodeContainer {
             }
             contextAction(strongSelf.imageNode.extractedContainerNode, gesture)
         }
-        imageNode.containerNode.isGestureEnabled = item.hasContext
+        imageNode.swiped = { [weak imageNode] direction in
+            guard let imageNode = imageNode, imageNode.isSelected else {
+                return
+            }
+            swipeAction(direction)
+        }
+        imageNode.containerNode.isGestureEnabled = item.contextActionType != .none
+        let contextActionType = item.contextActionType
+        imageNode.containerNode.shouldBegin = { [weak imageNode] _ in
+            switch contextActionType {
+            case .none:
+                return false
+            case .always:
+                return true
+            case .whenActive:
+                return imageNode?.isSelected ?? false
+            }
+        }
     }
     
     deinit {
@@ -238,11 +284,11 @@ private final class TabBarNodeContainer {
 
 final class TabBarNodeItem {
     let item: UITabBarItem
-    let hasContext: Bool
+    let contextActionType: TabBarItemContextActionType
     
-    init(item: UITabBarItem, hasContext: Bool) {
+    init(item: UITabBarItem, contextActionType: TabBarItemContextActionType) {
         self.item = item
-        self.hasContext = hasContext
+        self.contextActionType = contextActionType
     }
 }
 
@@ -269,6 +315,7 @@ class TabBarNode: ASDisplayNode {
     
     private let itemSelected: (Int, Bool, [ASDisplayNode]) -> Void
     private let contextAction: (Int, ContextExtractedContentContainingNode, ContextGesture) -> Void
+    private let swipeAction: (Int, TabBarItemSwipeDirection) -> Void
     
     private var theme: TabBarControllerTheme
     private var validLayout: (CGSize, CGFloat, CGFloat, CGFloat)?
@@ -282,9 +329,10 @@ class TabBarNode: ASDisplayNode {
     
     private var tapRecognizer: TapLongTapOrDoubleTapGestureRecognizer?
     
-    init(theme: TabBarControllerTheme, itemSelected: @escaping (Int, Bool, [ASDisplayNode]) -> Void, contextAction: @escaping (Int, ContextExtractedContentContainingNode, ContextGesture) -> Void) {
+    init(theme: TabBarControllerTheme, itemSelected: @escaping (Int, Bool, [ASDisplayNode]) -> Void, contextAction: @escaping (Int, ContextExtractedContentContainingNode, ContextGesture) -> Void, swipeAction: @escaping (Int, TabBarItemSwipeDirection) -> Void) {
         self.itemSelected = itemSelected
         self.contextAction = contextAction
+        self.swipeAction = swipeAction
         self.theme = theme
         
         self.separatorNode = ASDisplayNode()
@@ -359,6 +407,11 @@ class TabBarNode: ASDisplayNode {
         return [container.imageNode.imageNode, container.imageNode.textImageNode, container.badgeContainerNode]
     }
     
+    func frameForControllerTab(at index: Int) -> CGRect? {
+        let container = self.tabBarNodeContainers[index]
+        return container.imageNode.frame
+    }
+    
     private func reloadTabBarItems() {
         for node in self.tabBarNodeContainers {
             node.imageNode.removeFromSupernode()
@@ -381,6 +434,8 @@ class TabBarNode: ASDisplayNode {
             }, contextAction: { [weak self] node, gesture in
                 self?.tapRecognizer?.cancel()
                 self?.contextAction(i, node, gesture)
+            }, swipeAction: { [weak self] direction in
+                self?.swipeAction(i, direction)
             })
             if let selectedIndex = self.selectedIndex, selectedIndex == i {
                 let (textImage, contentWidth) = tabBarItemImage(item.item.selectedImage, title: item.item.title ?? "", backgroundColor: .clear, tintColor: self.theme.tabBarSelectedTextColor, horizontal: self.horizontal, imageMode: false, centered: self.centered)
@@ -389,6 +444,7 @@ class TabBarNode: ASDisplayNode {
                 node.imageNode.image = image
                 node.accessibilityLabel = item.item.title
                 node.contentWidth = max(contentWidth, imageContentWidth)
+                node.isSelected = true
             } else {
                 let (textImage, contentWidth) = tabBarItemImage(item.item.image, title: item.item.title ?? "", backgroundColor: .clear, tintColor: self.theme.tabBarTextColor, horizontal: self.horizontal, imageMode: false, centered: self.centered)
                 let (image, imageContentWidth) = tabBarItemImage(item.item.image, title: item.item.title ?? "", backgroundColor: .clear, tintColor: self.theme.tabBarIconColor, horizontal: self.horizontal, imageMode: true, centered: self.centered)
@@ -396,6 +452,7 @@ class TabBarNode: ASDisplayNode {
                 node.accessibilityLabel = item.item.title
                 node.imageNode.image = image
                 node.contentWidth = max(contentWidth, imageContentWidth)
+                node.isSelected = false
             }
             container.badgeBackgroundNode.image = self.badgeImage
             node.extractedContainerNode.contentNode.addSubnode(container.badgeContainerNode)
@@ -428,6 +485,7 @@ class TabBarNode: ASDisplayNode {
                 node.contextTextImageNode.image = contextTextImage
                 node.contextImageNode.image = contextImage
                 node.contentWidth = max(contentWidth, imageContentWidth)
+                node.isSelected = true
             } else {
                 let (textImage, contentWidth) = tabBarItemImage(item.item.image, title: item.item.title ?? "", backgroundColor: .clear, tintColor: self.theme.tabBarTextColor, horizontal: self.horizontal, imageMode: false, centered: self.centered)
                 let (image, imageContentWidth) = tabBarItemImage(item.item.image, title: item.item.title ?? "", backgroundColor: .clear, tintColor: self.theme.tabBarIconColor, horizontal: self.horizontal, imageMode: true, centered: self.centered)
@@ -439,6 +497,7 @@ class TabBarNode: ASDisplayNode {
                 node.contextTextImageNode.image = contextTextImage
                 node.contextImageNode.image = contextImage
                 node.contentWidth = max(contentWidth, imageContentWidth)
+                node.isSelected = false
             }
             
             let updatedImageSize = node.imageNode.image?.size ?? CGSize()
diff --git a/submodules/Display/Display/TabBarTapRecognizer.swift b/submodules/Display/Source/TabBarTapRecognizer.swift
similarity index 100%
rename from submodules/Display/Display/TabBarTapRecognizer.swift
rename to submodules/Display/Source/TabBarTapRecognizer.swift
diff --git a/submodules/Display/Display/TapLongTapOrDoubleTapGestureRecognizer.swift b/submodules/Display/Source/TapLongTapOrDoubleTapGestureRecognizer.swift
similarity index 100%
rename from submodules/Display/Display/TapLongTapOrDoubleTapGestureRecognizer.swift
rename to submodules/Display/Source/TapLongTapOrDoubleTapGestureRecognizer.swift
diff --git a/submodules/Display/Display/TextAlertController.swift b/submodules/Display/Source/TextAlertController.swift
similarity index 97%
rename from submodules/Display/Display/TextAlertController.swift
rename to submodules/Display/Source/TextAlertController.swift
index d1d4d3f99e..d94ee19393 100644
--- a/submodules/Display/Display/TextAlertController.swift
+++ b/submodules/Display/Source/TextAlertController.swift
@@ -116,7 +116,7 @@ public final class TextAlertContentNode: AlertContentNode {
     private var theme: AlertControllerTheme
     private let actionLayout: TextAlertContentActionLayout
     
-    private let titleNode: ASTextNode?
+    private let titleNode: ImmediateTextNode?
     private let textNode: ImmediateTextNode
     
     private let actionNodesSeparator: ASDisplayNode
@@ -152,12 +152,12 @@ public final class TextAlertContentNode: AlertContentNode {
         self.theme = theme
         self.actionLayout = actionLayout
         if let title = title {
-            let titleNode = ASTextNode()
+            let titleNode = ImmediateTextNode()
             titleNode.attributedText = title
             titleNode.displaysAsynchronously = false
             titleNode.isUserInteractionEnabled = false
             titleNode.maximumNumberOfLines = 2
-            titleNode.truncationMode = .byTruncatingTail
+            titleNode.truncationType = .end
             titleNode.isAccessibilityElement = true
             self.titleNode = titleNode
         } else {
@@ -252,7 +252,7 @@ public final class TextAlertContentNode: AlertContentNode {
         
         var titleSize: CGSize?
         if let titleNode = self.titleNode {
-            titleSize = titleNode.measure(CGSize(width: size.width - insets.left - insets.right, height: CGFloat.greatestFiniteMagnitude))
+            titleSize = titleNode.updateLayout(CGSize(width: size.width - insets.left - insets.right, height: CGFloat.greatestFiniteMagnitude))
         }
         let textSize = self.textNode.updateLayout(CGSize(width: size.width - insets.left - insets.right, height: CGFloat.greatestFiniteMagnitude))
         
@@ -264,7 +264,7 @@ public final class TextAlertContentNode: AlertContentNode {
         
         var effectiveActionLayout = self.actionLayout
         for actionNode in self.actionNodes {
-            let actionTitleSize = actionNode.titleNode.measure(CGSize(width: maxActionWidth, height: actionButtonHeight))
+            let actionTitleSize = actionNode.titleNode.updateLayout(CGSize(width: maxActionWidth, height: actionButtonHeight))
             if case .horizontal = effectiveActionLayout, actionTitleSize.height > actionButtonHeight * 0.6667 {
                 effectiveActionLayout = .vertical
             }
diff --git a/submodules/Display/Display/TextFieldNode.swift b/submodules/Display/Source/TextFieldNode.swift
similarity index 100%
rename from submodules/Display/Display/TextFieldNode.swift
rename to submodules/Display/Source/TextFieldNode.swift
diff --git a/submodules/Display/Display/TextNode.swift b/submodules/Display/Source/TextNode.swift
similarity index 95%
rename from submodules/Display/Display/TextNode.swift
rename to submodules/Display/Source/TextNode.swift
index 2cbb4708ca..cbde782489 100644
--- a/submodules/Display/Display/TextNode.swift
+++ b/submodules/Display/Source/TextNode.swift
@@ -132,7 +132,8 @@ public final class TextNodeLayout: NSObject {
     fileprivate let truncationType: CTLineTruncationType
     fileprivate let backgroundColor: UIColor?
     fileprivate let constrainedSize: CGSize
-    fileprivate let alignment: NSTextAlignment
+    fileprivate let explicitAlignment: NSTextAlignment
+    fileprivate let resolvedAlignment: NSTextAlignment
     fileprivate let lineSpacing: CGFloat
     fileprivate let cutout: TextNodeCutout?
     fileprivate let insets: UIEdgeInsets
@@ -147,12 +148,13 @@ public final class TextNodeLayout: NSObject {
     fileprivate let textStroke: (UIColor, CGFloat)?
     public let hasRTL: Bool
     
-    fileprivate init(attributedString: NSAttributedString?, maximumNumberOfLines: Int, truncationType: CTLineTruncationType, constrainedSize: CGSize, alignment: NSTextAlignment, lineSpacing: CGFloat, cutout: TextNodeCutout?, insets: UIEdgeInsets, size: CGSize, rawTextSize: CGSize, truncated: Bool, firstLineOffset: CGFloat, lines: [TextNodeLine], blockQuotes: [TextNodeBlockQuote], backgroundColor: UIColor?, lineColor: UIColor?, textShadowColor: UIColor?, textStroke: (UIColor, CGFloat)?) {
+    fileprivate init(attributedString: NSAttributedString?, maximumNumberOfLines: Int, truncationType: CTLineTruncationType, constrainedSize: CGSize, explicitAlignment: NSTextAlignment, resolvedAlignment: NSTextAlignment, lineSpacing: CGFloat, cutout: TextNodeCutout?, insets: UIEdgeInsets, size: CGSize, rawTextSize: CGSize, truncated: Bool, firstLineOffset: CGFloat, lines: [TextNodeLine], blockQuotes: [TextNodeBlockQuote], backgroundColor: UIColor?, lineColor: UIColor?, textShadowColor: UIColor?, textStroke: (UIColor, CGFloat)?) {
         self.attributedString = attributedString
         self.maximumNumberOfLines = maximumNumberOfLines
         self.truncationType = truncationType
         self.constrainedSize = constrainedSize
-        self.alignment = alignment
+        self.explicitAlignment = explicitAlignment
+        self.resolvedAlignment = resolvedAlignment
         self.lineSpacing = lineSpacing
         self.cutout = cutout
         self.insets = insets
@@ -240,7 +242,7 @@ public final class TextNodeLayout: NSObject {
                 for line in self.lines {
                     lineIndex += 1
                     var lineFrame = CGRect(origin: CGPoint(x: line.frame.origin.x, y: line.frame.origin.y - line.frame.size.height + self.firstLineOffset), size: line.frame.size)
-                    switch self.alignment {
+                    switch self.resolvedAlignment {
                     case .center:
                         lineFrame.origin.x = floor((self.size.width - lineFrame.size.width) / 2.0)
                     case .natural:
@@ -308,7 +310,7 @@ public final class TextNodeLayout: NSObject {
             for line in self.lines {
                 lineIndex += 1
                 var lineFrame = CGRect(origin: CGPoint(x: line.frame.origin.x, y: line.frame.origin.y - line.frame.size.height + self.firstLineOffset), size: line.frame.size)
-                switch self.alignment {
+                switch self.resolvedAlignment {
                     case .center:
                         lineFrame.origin.x = floor((self.size.width - lineFrame.size.width) / 2.0)
                     case .natural:
@@ -383,7 +385,7 @@ public final class TextNodeLayout: NSObject {
             for line in self.lines {
                 lineIndex += 1
                 var lineFrame = CGRect(origin: CGPoint(x: line.frame.origin.x, y: line.frame.origin.y - line.frame.size.height + self.firstLineOffset), size: line.frame.size)
-                switch self.alignment {
+                switch self.resolvedAlignment {
                     case .center:
                         lineFrame.origin.x = floor((self.size.width - lineFrame.size.width) / 2.0)
                     case .natural:
@@ -823,17 +825,30 @@ public class TextNode: ASDisplayNode {
     
     private class func calculateLayout(attributedString: NSAttributedString?, minimumNumberOfLines: Int, maximumNumberOfLines: Int, truncationType: CTLineTruncationType, backgroundColor: UIColor?, constrainedSize: CGSize, alignment: NSTextAlignment, lineSpacingFactor: CGFloat, cutout: TextNodeCutout?, insets: UIEdgeInsets, lineColor: UIColor?, textShadowColor: UIColor?, textStroke: (UIColor, CGFloat)?) -> TextNodeLayout {
         if let attributedString = attributedString {
+            
             let stringLength = attributedString.length
             
             let font: CTFont
+            let resolvedAlignment: NSTextAlignment
+            
             if stringLength != 0 {
                 if let stringFont = attributedString.attribute(NSAttributedString.Key.font, at: 0, effectiveRange: nil) {
                     font = stringFont as! CTFont
                 } else {
                     font = defaultFont
                 }
+                if alignment == .center {
+                    resolvedAlignment = .center
+                } else {
+                    if let paragraphStyle = attributedString.attribute(NSAttributedString.Key.paragraphStyle, at: 0, effectiveRange: nil) as? NSParagraphStyle {
+                        resolvedAlignment = paragraphStyle.alignment
+                    } else {
+                        resolvedAlignment = alignment
+                    }
+                }
             } else {
                 font = defaultFont
+                resolvedAlignment = alignment
             }
             
             let fontAscent = CTFontGetAscent(font)
@@ -847,7 +862,7 @@ public class TextNode: ASDisplayNode {
             var maybeTypesetter: CTTypesetter?
             maybeTypesetter = CTTypesetterCreateWithAttributedString(attributedString as CFAttributedString)
             if maybeTypesetter == nil {
-                return TextNodeLayout(attributedString: attributedString, maximumNumberOfLines: maximumNumberOfLines, truncationType: truncationType, constrainedSize: constrainedSize, alignment: alignment, lineSpacing: lineSpacingFactor, cutout: cutout, insets: insets, size: CGSize(), rawTextSize: CGSize(), truncated: false, firstLineOffset: 0.0, lines: [], blockQuotes: [], backgroundColor: backgroundColor, lineColor: lineColor, textShadowColor: textShadowColor, textStroke: textStroke)
+                return TextNodeLayout(attributedString: attributedString, maximumNumberOfLines: maximumNumberOfLines, truncationType: truncationType, constrainedSize: constrainedSize, explicitAlignment: alignment, resolvedAlignment: resolvedAlignment, lineSpacing: lineSpacingFactor, cutout: cutout, insets: insets, size: CGSize(), rawTextSize: CGSize(), truncated: false, firstLineOffset: 0.0, lines: [], blockQuotes: [], backgroundColor: backgroundColor, lineColor: lineColor, textShadowColor: textShadowColor, textStroke: textStroke)
             }
             
             let typesetter = maybeTypesetter!
@@ -1056,9 +1071,9 @@ public class TextNode: ASDisplayNode {
                 }
             }
             
-            return TextNodeLayout(attributedString: attributedString, maximumNumberOfLines: maximumNumberOfLines, truncationType: truncationType, constrainedSize: constrainedSize, alignment: alignment, lineSpacing: lineSpacingFactor, cutout: cutout, insets: insets, size: CGSize(width: ceil(layoutSize.width) + insets.left + insets.right, height: ceil(layoutSize.height) + insets.top + insets.bottom), rawTextSize: CGSize(width: ceil(rawLayoutSize.width) + insets.left + insets.right, height: ceil(rawLayoutSize.height) + insets.top + insets.bottom), truncated: truncated, firstLineOffset: firstLineOffset, lines: lines, blockQuotes: blockQuotes, backgroundColor: backgroundColor, lineColor: lineColor, textShadowColor: textShadowColor, textStroke: textStroke)
+            return TextNodeLayout(attributedString: attributedString, maximumNumberOfLines: maximumNumberOfLines, truncationType: truncationType, constrainedSize: constrainedSize, explicitAlignment: alignment, resolvedAlignment: resolvedAlignment, lineSpacing: lineSpacingFactor, cutout: cutout, insets: insets, size: CGSize(width: ceil(layoutSize.width) + insets.left + insets.right, height: ceil(layoutSize.height) + insets.top + insets.bottom), rawTextSize: CGSize(width: ceil(rawLayoutSize.width) + insets.left + insets.right, height: ceil(rawLayoutSize.height) + insets.top + insets.bottom), truncated: truncated, firstLineOffset: firstLineOffset, lines: lines, blockQuotes: blockQuotes, backgroundColor: backgroundColor, lineColor: lineColor, textShadowColor: textShadowColor, textStroke: textStroke)
         } else {
-            return TextNodeLayout(attributedString: attributedString, maximumNumberOfLines: maximumNumberOfLines, truncationType: truncationType, constrainedSize: constrainedSize, alignment: alignment, lineSpacing: lineSpacingFactor, cutout: cutout, insets: insets, size: CGSize(), rawTextSize: CGSize(), truncated: false, firstLineOffset: 0.0, lines: [], blockQuotes: [], backgroundColor: backgroundColor, lineColor: lineColor, textShadowColor: textShadowColor, textStroke: textStroke)
+            return TextNodeLayout(attributedString: attributedString, maximumNumberOfLines: maximumNumberOfLines, truncationType: truncationType, constrainedSize: constrainedSize, explicitAlignment: alignment, resolvedAlignment: alignment, lineSpacing: lineSpacingFactor, cutout: cutout, insets: insets, size: CGSize(), rawTextSize: CGSize(), truncated: false, firstLineOffset: 0.0, lines: [], blockQuotes: [], backgroundColor: backgroundColor, lineColor: lineColor, textShadowColor: textShadowColor, textStroke: textStroke)
         }
     }
     
@@ -1110,7 +1125,7 @@ public class TextNode: ASDisplayNode {
             let textPosition = context.textPosition
             context.textMatrix = CGAffineTransform(scaleX: 1.0, y: -1.0)
             
-            let alignment = layout.alignment
+            let alignment = layout.resolvedAlignment
             let offset = CGPoint(x: layout.insets.left, y: layout.insets.top)
             
             for i in 0 ..< layout.lines.count {
@@ -1187,7 +1202,7 @@ public class TextNode: ASDisplayNode {
             let layout: TextNodeLayout
             
             var updated = false
-            if let existingLayout = existingLayout, existingLayout.constrainedSize == arguments.constrainedSize && existingLayout.maximumNumberOfLines == arguments.maximumNumberOfLines && existingLayout.truncationType == arguments.truncationType && existingLayout.cutout == arguments.cutout && existingLayout.alignment == arguments.alignment && existingLayout.lineSpacing.isEqual(to: arguments.lineSpacing) {
+            if let existingLayout = existingLayout, existingLayout.constrainedSize == arguments.constrainedSize && existingLayout.maximumNumberOfLines == arguments.maximumNumberOfLines && existingLayout.truncationType == arguments.truncationType && existingLayout.cutout == arguments.cutout && existingLayout.explicitAlignment == arguments.alignment && existingLayout.lineSpacing.isEqual(to: arguments.lineSpacing) {
                 let stringMatch: Bool
                 
                 var colorMatch: Bool = true
diff --git a/submodules/Display/Display/Toolbar.swift b/submodules/Display/Source/Toolbar.swift
similarity index 100%
rename from submodules/Display/Display/Toolbar.swift
rename to submodules/Display/Source/Toolbar.swift
diff --git a/submodules/Display/Display/ToolbarNode.swift b/submodules/Display/Source/ToolbarNode.swift
similarity index 100%
rename from submodules/Display/Display/ToolbarNode.swift
rename to submodules/Display/Source/ToolbarNode.swift
diff --git a/submodules/Display/Display/TooltipController.swift b/submodules/Display/Source/TooltipController.swift
similarity index 100%
rename from submodules/Display/Display/TooltipController.swift
rename to submodules/Display/Source/TooltipController.swift
diff --git a/submodules/Display/Display/TooltipControllerNode.swift b/submodules/Display/Source/TooltipControllerNode.swift
similarity index 100%
rename from submodules/Display/Display/TooltipControllerNode.swift
rename to submodules/Display/Source/TooltipControllerNode.swift
diff --git a/submodules/Display/Display/TransformImageArguments.swift b/submodules/Display/Source/TransformImageArguments.swift
similarity index 100%
rename from submodules/Display/Display/TransformImageArguments.swift
rename to submodules/Display/Source/TransformImageArguments.swift
diff --git a/submodules/Display/Display/TransformImageNode.swift b/submodules/Display/Source/TransformImageNode.swift
similarity index 100%
rename from submodules/Display/Display/TransformImageNode.swift
rename to submodules/Display/Source/TransformImageNode.swift
diff --git a/submodules/Display/Display/UIKitUtils.swift b/submodules/Display/Source/UIKitUtils.swift
similarity index 95%
rename from submodules/Display/Display/UIKitUtils.swift
rename to submodules/Display/Source/UIKitUtils.swift
index a8ad19277a..19ad82264e 100644
--- a/submodules/Display/Display/UIKitUtils.swift
+++ b/submodules/Display/Source/UIKitUtils.swift
@@ -1,4 +1,31 @@
 import UIKit
+import UIKitRuntimeUtils
+
+public extension UIView {
+    static func animationDurationFactor() -> Double {
+        return animationDurationFactorImpl()
+    }
+}
+
+public func makeSpringAnimation(_ keyPath: String) -> CABasicAnimation {
+    return makeSpringAnimationImpl(keyPath)
+}
+
+public func makeSpringBounceAnimation(_ keyPath: String, _ initialVelocity: CGFloat, _ damping: CGFloat) -> CABasicAnimation {
+    return makeSpringBounceAnimationImpl(keyPath, initialVelocity, damping)
+}
+
+public func springAnimationValueAt(_ animation: CABasicAnimation, _ t: CGFloat) -> CGFloat {
+    return springAnimationValueAtImpl(animation, t)
+}
+
+public func makeCustomZoomBlurEffect() -> UIBlurEffect? {
+    return makeCustomZoomBlurEffectImpl()
+}
+
+public func applySmoothRoundedCorners(_ layer: CALayer) {
+    applySmoothRoundedCornersImpl(layer)
+}
 
 public func dumpViews(_ view: UIView) {
     dumpViews(view, indent: "")
diff --git a/submodules/Display/Display/UITracingLayerView.swift b/submodules/Display/Source/UITracingLayerView.swift
similarity index 87%
rename from submodules/Display/Display/UITracingLayerView.swift
rename to submodules/Display/Source/UITracingLayerView.swift
index 8a68530dea..f056baaa08 100644
--- a/submodules/Display/Display/UITracingLayerView.swift
+++ b/submodules/Display/Source/UITracingLayerView.swift
@@ -17,10 +17,6 @@ open class UITracingLayerView: UIView {
         }
     }
     
-    override open class var layerClass: AnyClass {
-        return CATracingLayer.self
-    }
-    
     override open func layoutSubviews() {
         super.layoutSubviews()
         
diff --git a/submodules/Display/Source/UniversalMasterController.swift b/submodules/Display/Source/UniversalMasterController.swift
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/submodules/Display/Display/UniversalTapRecognizer.swift b/submodules/Display/Source/UniversalTapRecognizer.swift
similarity index 100%
rename from submodules/Display/Display/UniversalTapRecognizer.swift
rename to submodules/Display/Source/UniversalTapRecognizer.swift
diff --git a/submodules/Display/Display/ViewController.swift b/submodules/Display/Source/ViewController.swift
similarity index 98%
rename from submodules/Display/Display/ViewController.swift
rename to submodules/Display/Source/ViewController.swift
index 2b5a41b898..06fdcddc18 100644
--- a/submodules/Display/Display/ViewController.swift
+++ b/submodules/Display/Source/ViewController.swift
@@ -67,6 +67,12 @@ public enum ViewControllerNavigationPresentation {
     case modalInLargeLayout
 }
 
+public enum TabBarItemContextActionType {
+    case none
+    case always
+    case whenActive
+}
+
 @objc open class ViewController: UIViewController, ContainableController {
     private var validLayout: ContainerViewLayout?
     public var currentlyAppliedLayout: ContainerViewLayout? {
@@ -435,9 +441,6 @@ public enum ViewControllerNavigationPresentation {
     }
     
     open func displayNodeDidLoad() {
-        if let layer = self.displayNode.layer as? CATracingLayer {
-            layer.setTraceableInfo(CATracingLayerInfo(shouldBeAdjustedToInverseTransform: false, userData: self.displayNode.layer, tracingTag: WindowTracingTags.keyboard, disableChildrenTracingTags: 0))
-        }
         self.updateScrollToTopView()
         if let backgroundColor = self.displayNode.backgroundColor, backgroundColor.alpha.isEqual(to: 1.0) {
             self.blocksBackgroundWhenInOverlay = true
@@ -628,10 +631,13 @@ public enum ViewControllerNavigationPresentation {
     open func toolbarActionSelected(action: ToolbarActionOption) {
     }
     
-    open var hasTabBarItemContextAction: Bool = false
+    open var tabBarItemContextActionType: TabBarItemContextActionType = .none
     
     open func tabBarItemContextAction(sourceNode: ContextExtractedContentContainingNode, gesture: ContextGesture) {
     }
+    
+    open func tabBarItemSwipeAction(direction: TabBarItemSwipeDirection) {
+    }
 }
 
 func traceIsOpaque(layer: CALayer, rect: CGRect) -> Bool {
diff --git a/submodules/Display/Display/ViewControllerPreviewing.swift b/submodules/Display/Source/ViewControllerPreviewing.swift
similarity index 100%
rename from submodules/Display/Display/ViewControllerPreviewing.swift
rename to submodules/Display/Source/ViewControllerPreviewing.swift
diff --git a/submodules/Display/Display/ViewControllerTracingNode.swift b/submodules/Display/Source/ViewControllerTracingNode.swift
similarity index 100%
rename from submodules/Display/Display/ViewControllerTracingNode.swift
rename to submodules/Display/Source/ViewControllerTracingNode.swift
diff --git a/submodules/Display/Display/VolumeControlStatusBar.swift b/submodules/Display/Source/VolumeControlStatusBar.swift
similarity index 98%
rename from submodules/Display/Display/VolumeControlStatusBar.swift
rename to submodules/Display/Source/VolumeControlStatusBar.swift
index 35501ba9d5..e498d4bda0 100644
--- a/submodules/Display/Display/VolumeControlStatusBar.swift
+++ b/submodules/Display/Source/VolumeControlStatusBar.swift
@@ -133,18 +133,15 @@ final class VolumeControlStatusBarNode: ASDisplayNode {
         self.outlineNode = ASImageNode()
         self.outlineNode.isLayerBacked = true
         self.outlineNode.displaysAsynchronously = false
-        self.outlineNode.displayWithoutProcessing = true
         
         self.backgroundNode = ASImageNode()
         self.backgroundNode.isLayerBacked = true
         self.backgroundNode.displaysAsynchronously = false
-        self.backgroundNode.displayWithoutProcessing = true
         self.backgroundNode.image = generateStretchableFilledCircleImage(diameter: 4.0, color: UIColor(rgb: 0xc5c5c5))
         
         self.foregroundNode = ASImageNode()
         self.foregroundNode.isLayerBacked = true
         self.foregroundNode.displaysAsynchronously = false
-        self.foregroundNode.displayWithoutProcessing = true
         self.foregroundNode.image = generateStretchableFilledCircleImage(diameter: 4.0, color: .black)
         
         self.foregroundClippingNode = ASDisplayNode()
@@ -154,7 +151,6 @@ final class VolumeControlStatusBarNode: ASDisplayNode {
         self.iconNode = ASImageNode()
         self.iconNode.isLayerBacked = true
         self.iconNode.displaysAsynchronously = false
-        self.iconNode.displayWithoutProcessing = true
         
         super.init()
         
diff --git a/submodules/Display/Display/WallpaperBackgroundNode.swift b/submodules/Display/Source/WallpaperBackgroundNode.swift
similarity index 100%
rename from submodules/Display/Display/WallpaperBackgroundNode.swift
rename to submodules/Display/Source/WallpaperBackgroundNode.swift
diff --git a/submodules/Display/Display/WindowContent.swift b/submodules/Display/Source/WindowContent.swift
similarity index 99%
rename from submodules/Display/Display/WindowContent.swift
rename to submodules/Display/Source/WindowContent.swift
index cbf67d23e9..ba17a06b9a 100644
--- a/submodules/Display/Display/WindowContent.swift
+++ b/submodules/Display/Source/WindowContent.swift
@@ -204,11 +204,6 @@ public final class WindowHostView {
     }
 }
 
-public struct WindowTracingTags {
-    public static let statusBar: Int32 = 1 << 0
-    public static let keyboard: Int32 = 1 << 1
-}
-
 public protocol WindowHost {
     func forEachController(_ f: (ContainableController) -> Void)
     func present(_ controller: ContainableController, on level: PresentationSurfaceLevel, blockInteraction: Bool, completion: @escaping () -> Void)
@@ -366,10 +361,6 @@ public class Window1 {
             self?.updateSize(size, duration: duration)
         }
         
-        self.hostView.eventView.layer.setInvalidateTracingSublayers { [weak self] in
-            self?.invalidateTracingStatusBars()
-        }
-        
         self.hostView.layoutSubviews = { [weak self] in
             self?.layoutSubviews(force: false)
         }
diff --git a/submodules/Display/Display/WindowCoveringView.swift b/submodules/Display/Source/WindowCoveringView.swift
similarity index 100%
rename from submodules/Display/Display/WindowCoveringView.swift
rename to submodules/Display/Source/WindowCoveringView.swift
diff --git a/submodules/Display/Display/WindowInputAccessoryHeightProvider.swift b/submodules/Display/Source/WindowInputAccessoryHeightProvider.swift
similarity index 100%
rename from submodules/Display/Display/WindowInputAccessoryHeightProvider.swift
rename to submodules/Display/Source/WindowInputAccessoryHeightProvider.swift
diff --git a/submodules/Display/Display/WindowPanRecognizer.swift b/submodules/Display/Source/WindowPanRecognizer.swift
similarity index 100%
rename from submodules/Display/Display/WindowPanRecognizer.swift
rename to submodules/Display/Source/WindowPanRecognizer.swift
diff --git a/submodules/Emoji/BUILD b/submodules/Emoji/BUILD
new file mode 100644
index 0000000000..9b5e934bcf
--- /dev/null
+++ b/submodules/Emoji/BUILD
@@ -0,0 +1,12 @@
+load("@build_bazel_rules_swift//swift:swift.bzl", "swift_library")
+
+swift_library(
+    name = "Emoji",
+    module_name = "Emoji",
+    srcs = glob([
+        "Sources/**/*.swift",
+    ]),
+    visibility = [
+        "//visibility:public",
+    ],
+)
diff --git a/submodules/Emoji/Info.plist b/submodules/Emoji/Info.plist
deleted file mode 100644
index e1fe4cfb7b..0000000000
--- a/submodules/Emoji/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/Emoji/Sources/Emoji.h b/submodules/Emoji/Sources/Emoji.h
deleted file mode 100644
index 5e70ebcc00..0000000000
--- a/submodules/Emoji/Sources/Emoji.h
+++ /dev/null
@@ -1,19 +0,0 @@
-//
-//  Emoji.h
-//  Emoji
-//
-//  Created by Peter on 8/15/19.
-//  Copyright © 2019 Telegram Messenger LLP. All rights reserved.
-//
-
-#import <UIKit/UIKit.h>
-
-//! Project version number for Emoji.
-FOUNDATION_EXPORT double EmojiVersionNumber;
-
-//! Project version string for Emoji.
-FOUNDATION_EXPORT const unsigned char EmojiVersionString[];
-
-// In this header, you should import all the public headers of your framework using statements like #import <Emoji/PublicHeader.h>
-
-
diff --git a/submodules/EncryptionKeyVisualization/BUCK b/submodules/EncryptionKeyVisualization/BUCK
index 8fa948603e..72ecc6e1db 100644
--- a/submodules/EncryptionKeyVisualization/BUCK
+++ b/submodules/EncryptionKeyVisualization/BUCK
@@ -4,17 +4,11 @@ static_library(
     name = "EncryptionKeyVisualization",
     srcs = glob([
         "Sources/*.swift",
-        "Sources/*.m",
     ]),
-    headers = glob([
-        "Sources/*.h",
-    ], exclude = ["Sources/EncryptionKeyVisualization.h"]),
-    exported_headers = glob([
-        "Sources/*.h",
-    ], exclude = ["Sources/EncryptionKeyVisualization.h"]),
     deps = [
     	"//submodules/TelegramCore:TelegramCore#shared",
         "//submodules/SyncCore:SyncCore#shared",
+        "//submodules/EncryptionKeyVisualization/Impl:EncryptionKeyVisualizationImpl",
     ],
     frameworks = [
         "$SDKROOT/System/Library/Frameworks/Foundation.framework",
diff --git a/submodules/EncryptionKeyVisualization/BUILD b/submodules/EncryptionKeyVisualization/BUILD
new file mode 100644
index 0000000000..6717c60e4f
--- /dev/null
+++ b/submodules/EncryptionKeyVisualization/BUILD
@@ -0,0 +1,17 @@
+load("@build_bazel_rules_swift//swift:swift.bzl", "swift_library")
+
+swift_library(
+    name = "EncryptionKeyVisualization",
+    module_name = "EncryptionKeyVisualization",
+    srcs = glob([
+        "Sources/**/*.swift",
+    ]),
+    deps = [
+        "//submodules/TelegramCore:TelegramCore",
+        "//submodules/SyncCore:SyncCore",
+    	"//submodules/EncryptionKeyVisualization/Impl:EncryptionKeyVisualizationImpl",
+    ],
+    visibility = [
+        "//visibility:public",
+    ],
+)
diff --git a/submodules/EncryptionKeyVisualization/Impl/BUCK b/submodules/EncryptionKeyVisualization/Impl/BUCK
new file mode 100644
index 0000000000..19d1462ea0
--- /dev/null
+++ b/submodules/EncryptionKeyVisualization/Impl/BUCK
@@ -0,0 +1,18 @@
+load("//Config:buck_rule_macros.bzl", "static_library")
+
+static_library(
+    name = "EncryptionKeyVisualizationImpl",
+    srcs = glob([
+        "Sources/*.m",
+    ]),
+    headers = glob([
+        "Sources/*.h",
+    ]),
+    exported_headers = glob([
+        "PublicHeaders/**/*.h",
+    ]),
+    frameworks = [
+        "$SDKROOT/System/Library/Frameworks/Foundation.framework",
+        "$SDKROOT/System/Library/Frameworks/UIKit.framework",
+    ],
+)
diff --git a/submodules/EncryptionKeyVisualization/Impl/BUILD b/submodules/EncryptionKeyVisualization/Impl/BUILD
new file mode 100644
index 0000000000..c4c7874874
--- /dev/null
+++ b/submodules/EncryptionKeyVisualization/Impl/BUILD
@@ -0,0 +1,22 @@
+
+objc_library(
+    name = "EncryptionKeyVisualizationImpl",
+    enable_modules = True,
+    module_name = "EncryptionKeyVisualizationImpl",
+    srcs = glob([
+        "Sources/**/*.m",
+        "Sources/**/*.h",
+    ]),
+    hdrs = glob([
+        "PublicHeaders/**/*.h",
+    ]),
+    includes = [
+        "PublicHeaders",
+    ],
+    sdk_frameworks = [
+        "Foundation",
+    ],
+    visibility = [
+        "//visibility:public",
+    ],
+)
diff --git a/submodules/EncryptionKeyVisualization/Impl/PublicHeaders/EncryptionKeyVisualizationImpl/EncryptionKeyVisualization.h b/submodules/EncryptionKeyVisualization/Impl/PublicHeaders/EncryptionKeyVisualizationImpl/EncryptionKeyVisualization.h
new file mode 100644
index 0000000000..12ed60d6cb
--- /dev/null
+++ b/submodules/EncryptionKeyVisualization/Impl/PublicHeaders/EncryptionKeyVisualizationImpl/EncryptionKeyVisualization.h
@@ -0,0 +1,5 @@
+#import <UIKit/UIKit.h>
+
+#import <EncryptionKeyVisualizationImpl/SecretChatKeyVisualization.h>
+
+
diff --git a/submodules/EncryptionKeyVisualization/Sources/SecretChatKeyVisualization.h b/submodules/EncryptionKeyVisualization/Impl/PublicHeaders/EncryptionKeyVisualizationImpl/SecretChatKeyVisualization.h
similarity index 100%
rename from submodules/EncryptionKeyVisualization/Sources/SecretChatKeyVisualization.h
rename to submodules/EncryptionKeyVisualization/Impl/PublicHeaders/EncryptionKeyVisualizationImpl/SecretChatKeyVisualization.h
diff --git a/submodules/EncryptionKeyVisualization/Sources/SecretChatKeyVisualization.m b/submodules/EncryptionKeyVisualization/Impl/Sources/SecretChatKeyVisualization.m
similarity index 98%
rename from submodules/EncryptionKeyVisualization/Sources/SecretChatKeyVisualization.m
rename to submodules/EncryptionKeyVisualization/Impl/Sources/SecretChatKeyVisualization.m
index 50d100e6f9..466ded7470 100644
--- a/submodules/EncryptionKeyVisualization/Sources/SecretChatKeyVisualization.m
+++ b/submodules/EncryptionKeyVisualization/Impl/Sources/SecretChatKeyVisualization.m
@@ -1,4 +1,4 @@
-#import "SecretChatKeyVisualization.h"
+#import <EncryptionKeyVisualizationImpl/SecretChatKeyVisualization.h>
 
 #import <objc/runtime.h>
 
diff --git a/submodules/EncryptionKeyVisualization/Info.plist b/submodules/EncryptionKeyVisualization/Info.plist
deleted file mode 100644
index e1fe4cfb7b..0000000000
--- a/submodules/EncryptionKeyVisualization/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/EncryptionKeyVisualization/Sources/EncryptionKeyVisualization.h b/submodules/EncryptionKeyVisualization/Sources/EncryptionKeyVisualization.h
deleted file mode 100644
index f4cfd58533..0000000000
--- a/submodules/EncryptionKeyVisualization/Sources/EncryptionKeyVisualization.h
+++ /dev/null
@@ -1,11 +0,0 @@
-#import <UIKit/UIKit.h>
-
-//! Project version number for EncryptionKeyVisualization.
-FOUNDATION_EXPORT double EncryptionKeyVisualizationVersionNumber;
-
-//! Project version string for EncryptionKeyVisualization.
-FOUNDATION_EXPORT const unsigned char EncryptionKeyVisualizationVersionString[];
-
-#import <EncryptionKeyVisualization/SecretChatKeyVisualization.h>
-
-
diff --git a/submodules/EncryptionKeyVisualization/Sources/SecretChatKeyVisualization.swift b/submodules/EncryptionKeyVisualization/Sources/SecretChatKeyVisualization.swift
index cf974f1843..90a83ea5a9 100644
--- a/submodules/EncryptionKeyVisualization/Sources/SecretChatKeyVisualization.swift
+++ b/submodules/EncryptionKeyVisualization/Sources/SecretChatKeyVisualization.swift
@@ -1,6 +1,8 @@
 import Foundation
+import UIKit
 import TelegramCore
 import SyncCore
+import EncryptionKeyVisualizationImpl
 
 public func secretChatKeyImage(_ fingerprint: SecretChatKeyFingerprint, size: CGSize) -> UIImage? {
     let keySignatureData = fingerprint.sha1.data()
diff --git a/submodules/EncryptionProvider/BUCK b/submodules/EncryptionProvider/BUCK
index d05c62c62f..c99c089695 100644
--- a/submodules/EncryptionProvider/BUCK
+++ b/submodules/EncryptionProvider/BUCK
@@ -6,10 +6,10 @@ static_library(
         "Sources/**/*.m",
     ]),
     headers = glob([
-        "Sources/**/*.h",
+        "PublicHeaders/**/*.h",
     ]),
     exported_headers = glob([
-        "Sources/**/*.h",
+        "PublicHeaders/**/*.h",
     ]),
     deps = [
     ],
diff --git a/submodules/EncryptionProvider/BUILD b/submodules/EncryptionProvider/BUILD
new file mode 100644
index 0000000000..7b876fc0d7
--- /dev/null
+++ b/submodules/EncryptionProvider/BUILD
@@ -0,0 +1,18 @@
+
+objc_library(
+    name = "EncryptionProvider",
+    enable_modules = True,
+    module_name = "EncryptionProvider",
+    srcs = glob([
+        "Sources/**/*.m",
+    ]),
+    hdrs = glob([
+        "PublicHeaders/**/*.h",
+    ]),
+    includes = [
+        "PublicHeaders",
+    ],
+    deps = [
+    ],
+    visibility = ["//visibility:public"],
+)
diff --git a/submodules/EncryptionProvider/Sources/EncryptionProvider.h b/submodules/EncryptionProvider/PublicHeaders/EncryptionProvider/EncryptionProvider.h
similarity index 100%
rename from submodules/EncryptionProvider/Sources/EncryptionProvider.h
rename to submodules/EncryptionProvider/PublicHeaders/EncryptionProvider/EncryptionProvider.h
diff --git a/submodules/FFMpegBinding/BUCK b/submodules/FFMpegBinding/BUCK
new file mode 100644
index 0000000000..b011e6c299
--- /dev/null
+++ b/submodules/FFMpegBinding/BUCK
@@ -0,0 +1,20 @@
+load("//Config:buck_rule_macros.bzl", "static_library")
+
+static_library(
+    name = "FFMpegBinding",
+    srcs = glob([
+        "Sources/*.m",
+    ]),
+    headers = glob([
+        "Sources/*.h",
+    ]),
+    exported_headers = glob([
+        "Public/**/*.h",
+    ]),
+    deps = [
+        "//submodules/ffmpeg:ffmpeg",
+    ],
+    frameworks = [
+        "$SDKROOT/System/Library/Frameworks/Foundation.framework",
+    ],
+)
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/FFMpeg/FFMpegAVCodec.h b/submodules/FFMpegBinding/Public/FFMpegBinding/FFMpegAVCodec.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/FFMpegAVCodec.h
rename to submodules/FFMpegBinding/Public/FFMpegBinding/FFMpegAVCodec.h
diff --git a/submodules/ffmpeg/FFMpeg/FFMpegAVCodecContext.h b/submodules/FFMpegBinding/Public/FFMpegBinding/FFMpegAVCodecContext.h
similarity index 89%
rename from submodules/ffmpeg/FFMpeg/FFMpegAVCodecContext.h
rename to submodules/FFMpegBinding/Public/FFMpegBinding/FFMpegAVCodecContext.h
index 3bc227a3aa..92a2c78481 100644
--- a/submodules/ffmpeg/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/FFMpeg/FFMpegAVFormatContext.h b/submodules/FFMpegBinding/Public/FFMpegBinding/FFMpegAVFormatContext.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/FFMpegAVFormatContext.h
rename to submodules/FFMpegBinding/Public/FFMpegBinding/FFMpegAVFormatContext.h
diff --git a/submodules/ffmpeg/FFMpeg/FFMpegAVFrame.h b/submodules/FFMpegBinding/Public/FFMpegBinding/FFMpegAVFrame.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/FFMpegAVFrame.h
rename to submodules/FFMpegBinding/Public/FFMpegBinding/FFMpegAVFrame.h
diff --git a/submodules/ffmpeg/FFMpeg/FFMpegAVIOContext.h b/submodules/FFMpegBinding/Public/FFMpegBinding/FFMpegAVIOContext.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/FFMpegAVIOContext.h
rename to submodules/FFMpegBinding/Public/FFMpegBinding/FFMpegAVIOContext.h
diff --git a/submodules/ffmpeg/FFMpeg/FFMpegAVSampleFormat.h b/submodules/FFMpegBinding/Public/FFMpegBinding/FFMpegAVSampleFormat.h
similarity index 100%
rename from submodules/ffmpeg/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/FFMpeg/FFMpegGlobals.h b/submodules/FFMpegBinding/Public/FFMpegBinding/FFMpegGlobals.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/FFMpegGlobals.h
rename to submodules/FFMpegBinding/Public/FFMpegBinding/FFMpegGlobals.h
diff --git a/submodules/ffmpeg/FFMpeg/FFMpegPacket.h b/submodules/FFMpegBinding/Public/FFMpegBinding/FFMpegPacket.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/FFMpegPacket.h
rename to submodules/FFMpegBinding/Public/FFMpegBinding/FFMpegPacket.h
diff --git a/submodules/ffmpeg/FFMpeg/FFMpegRemuxer.h b/submodules/FFMpegBinding/Public/FFMpegBinding/FFMpegRemuxer.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/FFMpegRemuxer.h
rename to submodules/FFMpegBinding/Public/FFMpegBinding/FFMpegRemuxer.h
diff --git a/submodules/ffmpeg/FFMpeg/FFMpegSWResample.h b/submodules/FFMpegBinding/Public/FFMpegBinding/FFMpegSWResample.h
similarity index 92%
rename from submodules/ffmpeg/FFMpeg/FFMpegSWResample.h
rename to submodules/FFMpegBinding/Public/FFMpegBinding/FFMpegSWResample.h
index 2228f2bd8c..3b56a9c8ad 100644
--- a/submodules/ffmpeg/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/FFMpeg/FFMpegAVCodec.m b/submodules/FFMpegBinding/Sources/FFMpegAVCodec.m
similarity index 93%
rename from submodules/ffmpeg/FFMpeg/FFMpegAVCodec.m
rename to submodules/FFMpegBinding/Sources/FFMpegAVCodec.m
index 86cab534a2..857462cfec 100644
--- a/submodules/ffmpeg/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/FFMpeg/FFMpegAVCodecContext.m b/submodules/FFMpegBinding/Sources/FFMpegAVCodecContext.m
similarity index 89%
rename from submodules/ffmpeg/FFMpeg/FFMpegAVCodecContext.m
rename to submodules/FFMpegBinding/Sources/FFMpegAVCodecContext.m
index 5d7ff9f9f6..5f63c84f80 100644
--- a/submodules/ffmpeg/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/FFMpeg/FFMpegAVFormatContext.m b/submodules/FFMpegBinding/Sources/FFMpegAVFormatContext.m
similarity index 96%
rename from submodules/ffmpeg/FFMpeg/FFMpegAVFormatContext.m
rename to submodules/FFMpegBinding/Sources/FFMpegAVFormatContext.m
index 45b732b4ec..5d91d6b080 100644
--- a/submodules/ffmpeg/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/FFMpeg/FFMpegAVFrame.m b/submodules/FFMpegBinding/Sources/FFMpegAVFrame.m
similarity index 95%
rename from submodules/ffmpeg/FFMpeg/FFMpegAVFrame.m
rename to submodules/FFMpegBinding/Sources/FFMpegAVFrame.m
index fd1fcb203a..2598869967 100644
--- a/submodules/ffmpeg/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/FFMpeg/FFMpegAVIOContext.m b/submodules/FFMpegBinding/Sources/FFMpegAVIOContext.m
similarity index 96%
rename from submodules/ffmpeg/FFMpeg/FFMpegAVIOContext.m
rename to submodules/FFMpegBinding/Sources/FFMpegAVIOContext.m
index cdc46664f0..8f76b54667 100644
--- a/submodules/ffmpeg/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/FFMpeg/FFMpegGlobals.m b/submodules/FFMpegBinding/Sources/FFMpegGlobals.m
similarity index 84%
rename from submodules/ffmpeg/FFMpeg/FFMpegGlobals.m
rename to submodules/FFMpegBinding/Sources/FFMpegGlobals.m
index c507fff969..8729f8a3a9 100644
--- a/submodules/ffmpeg/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/FFMpeg/FFMpegPacket.m b/submodules/FFMpegBinding/Sources/FFMpegPacket.m
similarity index 91%
rename from submodules/ffmpeg/FFMpeg/FFMpegPacket.m
rename to submodules/FFMpegBinding/Sources/FFMpegPacket.m
index 902348ea8d..bf647d2370 100644
--- a/submodules/ffmpeg/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/FFMpeg/FFMpegRemuxer.m b/submodules/FFMpegBinding/Sources/FFMpegRemuxer.m
similarity index 99%
rename from submodules/ffmpeg/FFMpeg/FFMpegRemuxer.m
rename to submodules/FFMpegBinding/Sources/FFMpegRemuxer.m
index 7fcb91ecdf..b25f557222 100644
--- a/submodules/ffmpeg/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/FFMpeg/FFMpegSWResample.m b/submodules/FFMpegBinding/Sources/FFMpegSWResample.m
similarity index 97%
rename from submodules/ffmpeg/FFMpeg/FFMpegSWResample.m
rename to submodules/FFMpegBinding/Sources/FFMpegSWResample.m
index 6faf60755f..3afe624447 100644
--- a/submodules/ffmpeg/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/BUCK b/submodules/FastBlur/BUCK
new file mode 100644
index 0000000000..5e2cc7b602
--- /dev/null
+++ b/submodules/FastBlur/BUCK
@@ -0,0 +1,19 @@
+load("//Config:buck_rule_macros.bzl", "static_library")
+
+static_library(
+    name = "FastBlur",
+    srcs = glob([
+        "Sources/*.m",
+    ]),
+    headers = glob([
+        "Sources/*.h",
+    ]),
+    exported_headers = glob([
+        "PublicHeaders/**/*.h",
+    ]),
+    deps = [
+    ],
+    frameworks = [
+        "$SDKROOT/System/Library/Frameworks/Foundation.framework",
+    ],
+)
diff --git a/submodules/FastBlur/BUILD b/submodules/FastBlur/BUILD
new file mode 100644
index 0000000000..839f88d8c1
--- /dev/null
+++ b/submodules/FastBlur/BUILD
@@ -0,0 +1,23 @@
+
+objc_library(
+    name = "FastBlur",
+    enable_modules = True,
+    module_name = "FastBlur",
+    srcs = glob([
+        "Sources/*.m",
+    ]),
+    hdrs = glob([
+        "PublicHeaders/**/*.h",
+    ]),
+    includes = [
+        "PublicHeaders",
+    ],
+    sdk_frameworks = [
+      "Foundation",
+      "UIKit",
+      "Accelerate",
+    ],
+    visibility = [
+        "//visibility:public",
+    ],
+)
diff --git a/submodules/ImageBlur/Sources/ApplyScreenshotEffect.h b/submodules/FastBlur/PublicHeaders/FastBlur/ApplyScreenshotEffect.h
similarity index 100%
rename from submodules/ImageBlur/Sources/ApplyScreenshotEffect.h
rename to submodules/FastBlur/PublicHeaders/FastBlur/ApplyScreenshotEffect.h
diff --git a/submodules/ImageBlur/Sources/FastBlur.h b/submodules/FastBlur/PublicHeaders/FastBlur/FastBlur.h
similarity index 91%
rename from submodules/ImageBlur/Sources/FastBlur.h
rename to submodules/FastBlur/PublicHeaders/FastBlur/FastBlur.h
index 1a06dcc567..55830298bc 100644
--- a/submodules/ImageBlur/Sources/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/ImageBlur/Sources/ApplyScreenshotEffect.m b/submodules/FastBlur/Sources/ApplyScreenshotEffect.m
similarity index 99%
rename from submodules/ImageBlur/Sources/ApplyScreenshotEffect.m
rename to submodules/FastBlur/Sources/ApplyScreenshotEffect.m
index 8cfd8109b5..6ab0275e44 100644
--- a/submodules/ImageBlur/Sources/ApplyScreenshotEffect.m
+++ b/submodules/FastBlur/Sources/ApplyScreenshotEffect.m
@@ -1,4 +1,4 @@
-#import "ApplyScreenshotEffect.h"
+#import <FastBlur/ApplyScreenshotEffect.h>
 
 #import <Accelerate/Accelerate.h>
 #import <float.h>
diff --git a/submodules/ImageBlur/Sources/FastBlur.m b/submodules/FastBlur/Sources/FastBlur.m
similarity index 99%
rename from submodules/ImageBlur/Sources/FastBlur.m
rename to submodules/FastBlur/Sources/FastBlur.m
index 106e50b545..2c7849384f 100644
--- a/submodules/ImageBlur/Sources/FastBlur.m
+++ b/submodules/FastBlur/Sources/FastBlur.m
@@ -1,4 +1,4 @@
-#import "FastBlur.h"
+#import <FastBlur/FastBlur.h>
 
 #import <Accelerate/Accelerate.h>
 
diff --git a/submodules/GZip/BUILD b/submodules/GZip/BUILD
new file mode 100644
index 0000000000..b94e8bfd2d
--- /dev/null
+++ b/submodules/GZip/BUILD
@@ -0,0 +1,18 @@
+
+objc_library(
+    name = "GZip",
+    enable_modules = True,
+    module_name = "GZip",
+    srcs = glob([
+        "Sources/**/*.m",
+    ]),
+    hdrs = glob([
+        "Sources/**/*.h",
+    ]),
+    sdk_dylibs = [
+        "libz",
+    ],
+    visibility = [
+        "//visibility:public",
+    ],
+)
diff --git a/submodules/GZip/Info.plist b/submodules/GZip/Info.plist
deleted file mode 100644
index e1fe4cfb7b..0000000000
--- a/submodules/GZip/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/GalleryUI/BUILD b/submodules/GalleryUI/BUILD
new file mode 100644
index 0000000000..ad5f85f26d
--- /dev/null
+++ b/submodules/GalleryUI/BUILD
@@ -0,0 +1,34 @@
+load("@build_bazel_rules_swift//swift:swift.bzl", "swift_library")
+
+swift_library(
+    name = "GalleryUI",
+    module_name = "GalleryUI",
+    srcs = glob([
+		"Sources/**/*.swift",
+    ]),
+    deps = [
+        "//submodules/SSignalKit/SwiftSignalKit:SwiftSignalKit",
+        "//submodules/AsyncDisplayKit:AsyncDisplayKit",
+        "//submodules/Display:Display",
+        "//submodules/Postbox:Postbox",
+        "//submodules/TelegramCore:TelegramCore",
+        "//submodules/SyncCore:SyncCore",
+        "//submodules/TelegramPresentationData:TelegramPresentationData",
+        "//submodules/TextFormat:TextFormat",
+        "//submodules/AccountContext:AccountContext",
+        "//submodules/TelegramUniversalVideoContent:TelegramUniversalVideoContent",
+        "//submodules/WebsiteType:WebsiteType",
+        "//submodules/ScreenCaptureDetection:ScreenCaptureDetection",
+        "//submodules/OpenInExternalAppUI:OpenInExternalAppUI",
+        "//submodules/ShareController:ShareController",
+        "//submodules/SwipeToDismissGesture:SwipeToDismissGesture",
+        "//submodules/CheckNode:CheckNode",
+        "//submodules/AppBundle:AppBundle",
+        "//submodules/StickerPackPreviewUI:StickerPackPreviewUI",
+        "//submodules/OverlayStatusController:OverlayStatusController",
+        "//submodules/PresentationDataUtils:PresentationDataUtils",
+    ],
+    visibility = [
+        "//visibility:public",
+    ],
+)
diff --git a/submodules/GalleryUI/Info.plist b/submodules/GalleryUI/Info.plist
deleted file mode 100644
index e1fe4cfb7b..0000000000
--- a/submodules/GalleryUI/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/GalleryUI/Sources/GalleryPagerNode.swift b/submodules/GalleryUI/Sources/GalleryPagerNode.swift
index edae0ad81f..d07e240f34 100644
--- a/submodules/GalleryUI/Sources/GalleryPagerNode.swift
+++ b/submodules/GalleryUI/Sources/GalleryPagerNode.swift
@@ -5,7 +5,9 @@ import Display
 import SwiftSignalKit
 import Postbox
 
-private let edgeWidth: CGFloat = 44.0
+private func edgeWidth(width: CGFloat) -> CGFloat {
+    return min(44.0, floor(width / 6.0))
+}
 
 private let leftFadeImage = generateImage(CGSize(width: 64.0, height: 1.0), opaque: false, rotatedContext: { size, context in
     let bounds = CGRect(origin: CGPoint(), size: size)
@@ -153,11 +155,11 @@ public final class GalleryPagerNode: ASDisplayNode, UIScrollViewDelegate, UIGest
             let size = strongSelf.bounds
             
             var highlightedSide: Bool?
-            if point.x < edgeWidth && strongSelf.canGoToPreviousItem() {
+            if point.x < edgeWidth(width: size.width) && strongSelf.canGoToPreviousItem() {
                 if strongSelf.items.count > 1 {
                     highlightedSide = false
                 }
-            } else if point.x > size.width - edgeWidth && strongSelf.canGoToNextItem() {
+            } else if point.x > size.width - edgeWidth(width: size.width) && strongSelf.canGoToNextItem() {
                 if strongSelf.items.count > 1 {
                     highlightedSide = true
                 }
@@ -180,11 +182,11 @@ public final class GalleryPagerNode: ASDisplayNode, UIScrollViewDelegate, UIGest
             
             var highlightedSide: Bool?
             if let point = point {
-                if point.x < edgeWidth && strongSelf.canGoToPreviousItem() {
+                if point.x < edgeWidth(width: size.width) && strongSelf.canGoToPreviousItem() {
                     if strongSelf.items.count > 1 {
                         highlightedSide = false
                     }
-                } else if point.x > size.width - edgeWidth && strongSelf.canGoToNextItem() {
+                } else if point.x > size.width - edgeWidth(width: size.width) && strongSelf.canGoToNextItem() {
                     if strongSelf.items.count > 1 {
                         highlightedSide = true
                     }
@@ -233,9 +235,9 @@ public final class GalleryPagerNode: ASDisplayNode, UIScrollViewDelegate, UIGest
             if let (gesture, location) = recognizer.lastRecognizedGestureAndLocation {
                 if case .tap = gesture {
                     let size = self.bounds.size
-                    if location.x < edgeWidth && self.canGoToPreviousItem() {
+                    if location.x < edgeWidth(width: size.width) && self.canGoToPreviousItem() {
                         self.goToPreviousItem()
-                    } else if location.x > size.width - edgeWidth && self.canGoToNextItem() {
+                    } else if location.x > size.width - edgeWidth(width: size.width) && self.canGoToNextItem() {
                         self.goToNextItem()
                     }
                 }
diff --git a/submodules/GalleryUI/Sources/GalleryUI.h b/submodules/GalleryUI/Sources/GalleryUI.h
deleted file mode 100644
index 96745aa2f0..0000000000
--- a/submodules/GalleryUI/Sources/GalleryUI.h
+++ /dev/null
@@ -1,19 +0,0 @@
-//
-//  GalleryUI.h
-//  GalleryUI
-//
-//  Created by Peter on 8/11/19.
-//  Copyright © 2019 Telegram Messenger LLP. All rights reserved.
-//
-
-#import <UIKit/UIKit.h>
-
-//! Project version number for GalleryUI.
-FOUNDATION_EXPORT double GalleryUIVersionNumber;
-
-//! Project version string for GalleryUI.
-FOUNDATION_EXPORT const unsigned char GalleryUIVersionString[];
-
-// In this header, you should import all the public headers of your framework using statements like #import <GalleryUI/PublicHeader.h>
-
-
diff --git a/submodules/GameUI/BUILD b/submodules/GameUI/BUILD
new file mode 100644
index 0000000000..95d7034d1b
--- /dev/null
+++ b/submodules/GameUI/BUILD
@@ -0,0 +1,23 @@
+load("@build_bazel_rules_swift//swift:swift.bzl", "swift_library")
+
+swift_library(
+    name = "GameUI",
+    module_name = "GameUI",
+    srcs = glob([
+		"Sources/**/*.swift",
+    ]),
+    deps = [
+        "//submodules/SSignalKit/SwiftSignalKit:SwiftSignalKit",
+        "//submodules/AsyncDisplayKit:AsyncDisplayKit",
+        "//submodules/Display:Display",
+        "//submodules/Postbox:Postbox",
+        "//submodules/TelegramCore:TelegramCore",
+        "//submodules/SyncCore:SyncCore",
+        "//submodules/TelegramPresentationData:TelegramPresentationData",
+        "//submodules/AccountContext:AccountContext",
+        "//submodules/ShareController:ShareController",
+    ],
+    visibility = [
+        "//visibility:public",
+    ],
+)
diff --git a/submodules/GameUI/Info.plist b/submodules/GameUI/Info.plist
deleted file mode 100644
index e1fe4cfb7b..0000000000
--- a/submodules/GameUI/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/GameUI/Sources/GameUI.h b/submodules/GameUI/Sources/GameUI.h
deleted file mode 100644
index 18da9568d0..0000000000
--- a/submodules/GameUI/Sources/GameUI.h
+++ /dev/null
@@ -1,19 +0,0 @@
-//
-//  GameUI.h
-//  GameUI
-//
-//  Created by Peter on 8/11/19.
-//  Copyright © 2019 Telegram Messenger LLP. All rights reserved.
-//
-
-#import <UIKit/UIKit.h>
-
-//! Project version number for GameUI.
-FOUNDATION_EXPORT double GameUIVersionNumber;
-
-//! Project version string for GameUI.
-FOUNDATION_EXPORT const unsigned char GameUIVersionString[];
-
-// In this header, you should import all the public headers of your framework using statements like #import <GameUI/PublicHeader.h>
-
-
diff --git a/submodules/Geocoding/BUILD b/submodules/Geocoding/BUILD
new file mode 100644
index 0000000000..d03fe14734
--- /dev/null
+++ b/submodules/Geocoding/BUILD
@@ -0,0 +1,15 @@
+load("@build_bazel_rules_swift//swift:swift.bzl", "swift_library")
+
+swift_library(
+    name = "Geocoding",
+    module_name = "Geocoding",
+    srcs = glob([
+		"Sources/**/*.swift",
+    ]),
+    deps = [
+	    "//submodules/SSignalKit/SwiftSignalKit:SwiftSignalKit",
+    ],
+    visibility = [
+        "//visibility:public",
+    ],
+)
diff --git a/submodules/Geocoding/Info.plist b/submodules/Geocoding/Info.plist
deleted file mode 100644
index e1fe4cfb7b..0000000000
--- a/submodules/Geocoding/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/Geocoding/Sources/Geocoding.h b/submodules/Geocoding/Sources/Geocoding.h
deleted file mode 100644
index d49cdcfd42..0000000000
--- a/submodules/Geocoding/Sources/Geocoding.h
+++ /dev/null
@@ -1,19 +0,0 @@
-//
-//  Geocoding.h
-//  Geocoding
-//
-//  Created by Peter on 8/15/19.
-//  Copyright © 2019 Telegram Messenger LLP. All rights reserved.
-//
-
-#import <UIKit/UIKit.h>
-
-//! Project version number for Geocoding.
-FOUNDATION_EXPORT double GeocodingVersionNumber;
-
-//! Project version string for Geocoding.
-FOUNDATION_EXPORT const unsigned char GeocodingVersionString[];
-
-// In this header, you should import all the public headers of your framework using statements like #import <Geocoding/PublicHeader.h>
-
-
diff --git a/submodules/GlassButtonNode/BUILD b/submodules/GlassButtonNode/BUILD
new file mode 100644
index 0000000000..7a35f60ab4
--- /dev/null
+++ b/submodules/GlassButtonNode/BUILD
@@ -0,0 +1,16 @@
+load("@build_bazel_rules_swift//swift:swift.bzl", "swift_library")
+
+swift_library(
+    name = "GlassButtonNode",
+    module_name = "GlassButtonNode",
+    srcs = glob([
+        "Sources/**/*.swift",
+    ]),
+    deps = [
+        "//submodules/AsyncDisplayKit:AsyncDisplayKit",
+    	"//submodules/Display:Display",
+    ],
+    visibility = [
+        "//visibility:public",
+    ],
+)
diff --git a/submodules/GlassButtonNode/Sources/GlassButtonNode.swift b/submodules/GlassButtonNode/Sources/GlassButtonNode.swift
index f9fd932c6a..285964e124 100644
--- a/submodules/GlassButtonNode/Sources/GlassButtonNode.swift
+++ b/submodules/GlassButtonNode/Sources/GlassButtonNode.swift
@@ -72,7 +72,7 @@ public final class GlassButtonNode: HighlightTrackingButtonNode {
     
     private let blurView: UIVisualEffectView
     private let iconNode: ASImageNode
-    private var labelNode: ASTextNode?
+    private var labelNode: ImmediateTextNode?
     
     public init(icon: UIImage, label: String?) {
         let blurView = UIVisualEffectView(effect: UIBlurEffect(style: .light))
@@ -90,7 +90,7 @@ public final class GlassButtonNode: HighlightTrackingButtonNode {
         self.filledImage = generateEmptyButtonImage(icon: icon, strokeColor: nil, fillColor: invertedFill, knockout: true, buttonSize: largeButtonSize)
         
         if let label = label {
-            let labelNode = ASTextNode()
+            let labelNode = ImmediateTextNode()
             let labelFont: UIFont
             if let image = regularImage, image.size.width < 70.0 {
                 labelFont = smallLabelFont
@@ -165,7 +165,7 @@ public final class GlassButtonNode: HighlightTrackingButtonNode {
         self.iconNode.frame = self.bounds
         
         if let labelNode = self.labelNode {
-            let labelSize = labelNode.measure(CGSize(width: 200.0, height: 100.0))
+            let labelSize = labelNode.updateLayout(CGSize(width: 200.0, height: 100.0))
             let offset: CGFloat
             if size.width < 70.0 {
                 offset = 65.0
diff --git a/submodules/GraphCore/BUILD b/submodules/GraphCore/BUILD
new file mode 100644
index 0000000000..10c347161d
--- /dev/null
+++ b/submodules/GraphCore/BUILD
@@ -0,0 +1,15 @@
+load("@build_bazel_rules_swift//swift:swift.bzl", "swift_library")
+
+swift_library(
+    name = "GraphCore",
+    module_name = "GraphCore",
+    srcs = glob([
+        "Sources/**/*.swift",
+    ]),
+    deps = [
+        "//submodules/Display:Display",
+    ],
+    visibility = [
+        "//visibility:public",
+    ],
+)
diff --git a/submodules/GraphUI/BUILD b/submodules/GraphUI/BUILD
new file mode 100644
index 0000000000..c815a189db
--- /dev/null
+++ b/submodules/GraphUI/BUILD
@@ -0,0 +1,27 @@
+load("@build_bazel_rules_swift//swift:swift.bzl", "swift_library")
+
+swift_library(
+    name = "GraphUI",
+    module_name = "GraphUI",
+    srcs = glob([
+        "Sources/**/*.swift",
+    ]),
+    deps = [
+        "//submodules/SSignalKit/SwiftSignalKit:SwiftSignalKit",
+        "//submodules/AsyncDisplayKit:AsyncDisplayKit",
+        "//submodules/Display:Display",
+        "//submodules/Postbox:Postbox",
+        "//submodules/TelegramCore:TelegramCore",
+        "//submodules/SyncCore:SyncCore",
+        "//submodules/TelegramPresentationData:TelegramPresentationData",
+        "//submodules/TelegramUIPreferences:TelegramUIPreferences",
+        "//submodules/AccountContext:AccountContext",
+        "//submodules/TelegramStringFormatting:TelegramStringFormatting",
+        "//submodules/PresentationDataUtils:PresentationDataUtils",
+        "//submodules/AppBundle:AppBundle",
+        "//submodules/GraphCore:GraphCore",
+    ],
+    visibility = [
+        "//visibility:public",
+    ],
+)
diff --git a/submodules/GridMessageSelectionNode/BUILD b/submodules/GridMessageSelectionNode/BUILD
new file mode 100644
index 0000000000..1d24313555
--- /dev/null
+++ b/submodules/GridMessageSelectionNode/BUILD
@@ -0,0 +1,18 @@
+load("@build_bazel_rules_swift//swift:swift.bzl", "swift_library")
+
+swift_library(
+    name = "GridMessageSelectionNode",
+    module_name = "GridMessageSelectionNode",
+    srcs = glob([
+		"Sources/**/*.swift",
+    ]),
+    deps = [
+        "//submodules/AsyncDisplayKit:AsyncDisplayKit",
+        "//submodules/Display:Display",
+        "//submodules/TelegramPresentationData:TelegramPresentationData",
+        "//submodules/CheckNode:CheckNode",
+    ],
+    visibility = [
+        "//visibility:public",
+    ],
+)
diff --git a/submodules/GridMessageSelectionNode/Info.plist b/submodules/GridMessageSelectionNode/Info.plist
deleted file mode 100644
index e1fe4cfb7b..0000000000
--- a/submodules/GridMessageSelectionNode/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/GridMessageSelectionNode/Sources/GridMessageSelectionNode.h b/submodules/GridMessageSelectionNode/Sources/GridMessageSelectionNode.h
deleted file mode 100644
index 7bc2834b05..0000000000
--- a/submodules/GridMessageSelectionNode/Sources/GridMessageSelectionNode.h
+++ /dev/null
@@ -1,19 +0,0 @@
-//
-//  GridMessageSelectionNode.h
-//  GridMessageSelectionNode
-//
-//  Created by Peter on 8/17/19.
-//  Copyright © 2019 Telegram Messenger LLP. All rights reserved.
-//
-
-#import <UIKit/UIKit.h>
-
-//! Project version number for GridMessageSelectionNode.
-FOUNDATION_EXPORT double GridMessageSelectionNodeVersionNumber;
-
-//! Project version string for GridMessageSelectionNode.
-FOUNDATION_EXPORT const unsigned char GridMessageSelectionNodeVersionString[];
-
-// In this header, you should import all the public headers of your framework using statements like #import <GridMessageSelectionNode/PublicHeader.h>
-
-
diff --git a/submodules/HashtagSearchUI/BUILD b/submodules/HashtagSearchUI/BUILD
new file mode 100644
index 0000000000..0384121b97
--- /dev/null
+++ b/submodules/HashtagSearchUI/BUILD
@@ -0,0 +1,25 @@
+load("@build_bazel_rules_swift//swift:swift.bzl", "swift_library")
+
+swift_library(
+    name = "HashtagSearchUI",
+    module_name = "HashtagSearchUI",
+    srcs = glob([
+		"Sources/**/*.swift",
+    ]),
+    deps = [
+        "//submodules/SSignalKit/SwiftSignalKit:SwiftSignalKit",
+        "//submodules/AsyncDisplayKit:AsyncDisplayKit",
+        "//submodules/Display:Display",
+        "//submodules/Postbox:Postbox",
+        "//submodules/TelegramCore:TelegramCore",
+        "//submodules/SyncCore:SyncCore",
+        "//submodules/TelegramPresentationData:TelegramPresentationData",
+        "//submodules/AccountContext:AccountContext",
+        "//submodules/TelegramBaseController:TelegramBaseController",
+        "//submodules/ChatListUI:ChatListUI",
+        "//submodules/SegmentedControlNode:SegmentedControlNode",
+    ],
+    visibility = [
+        "//visibility:public",
+    ],
+)
diff --git a/submodules/HashtagSearchUI/Info.plist b/submodules/HashtagSearchUI/Info.plist
deleted file mode 100644
index e1fe4cfb7b..0000000000
--- a/submodules/HashtagSearchUI/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/HashtagSearchUI/Sources/HashtagSearchController.swift b/submodules/HashtagSearchUI/Sources/HashtagSearchController.swift
index f9675922f4..3ada19008a 100644
--- a/submodules/HashtagSearchUI/Sources/HashtagSearchController.swift
+++ b/submodules/HashtagSearchUI/Sources/HashtagSearchController.swift
@@ -51,6 +51,7 @@ public final class HashtagSearchController: TelegramBaseController {
         }, peerSelected: { peer in
         }, disabledPeerSelected: { _ in
         }, togglePeerSelected: { _ in
+        }, additionalCategorySelected: { _ in
         }, messageSelected: { [weak self] peer, message, _ in
             if let strongSelf = self {
                 strongSelf.openMessageFromSearchDisposable.set((storedMessageFromSearchPeer(account: strongSelf.context.account, peer: peer) |> deliverOnMainQueue).start(next: { actualPeerId in
diff --git a/submodules/HashtagSearchUI/Sources/HashtagSearchUI.h b/submodules/HashtagSearchUI/Sources/HashtagSearchUI.h
deleted file mode 100644
index c5be233f9a..0000000000
--- a/submodules/HashtagSearchUI/Sources/HashtagSearchUI.h
+++ /dev/null
@@ -1,19 +0,0 @@
-//
-//  HashtagSearchUI.h
-//  HashtagSearchUI
-//
-//  Created by Peter on 8/14/19.
-//  Copyright © 2019 Telegram Messenger LLP. All rights reserved.
-//
-
-#import <UIKit/UIKit.h>
-
-//! Project version number for HashtagSearchUI.
-FOUNDATION_EXPORT double HashtagSearchUIVersionNumber;
-
-//! Project version string for HashtagSearchUI.
-FOUNDATION_EXPORT const unsigned char HashtagSearchUIVersionString[];
-
-// In this header, you should import all the public headers of your framework using statements like #import <HashtagSearchUI/PublicHeader.h>
-
-
diff --git a/submodules/HexColor/BUILD b/submodules/HexColor/BUILD
new file mode 100644
index 0000000000..faf074d046
--- /dev/null
+++ b/submodules/HexColor/BUILD
@@ -0,0 +1,15 @@
+load("@build_bazel_rules_swift//swift:swift.bzl", "swift_library")
+
+swift_library(
+    name = "HexColor",
+    module_name = "HexColor",
+    srcs = glob([
+		"Sources/**/*.swift",
+    ]),
+    deps = [
+	    "//submodules/TextFormat:TextFormat",
+    ],
+    visibility = [
+        "//visibility:public",
+    ],
+)
diff --git a/submodules/HexColor/Info.plist b/submodules/HexColor/Info.plist
deleted file mode 100644
index e1fe4cfb7b..0000000000
--- a/submodules/HexColor/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/HexColor/Sources/HexColor.h b/submodules/HexColor/Sources/HexColor.h
deleted file mode 100644
index add4edae03..0000000000
--- a/submodules/HexColor/Sources/HexColor.h
+++ /dev/null
@@ -1,19 +0,0 @@
-//
-//  HexColor.h
-//  HexColor
-//
-//  Created by Peter on 8/17/19.
-//  Copyright © 2019 Telegram Messenger LLP. All rights reserved.
-//
-
-#import <UIKit/UIKit.h>
-
-//! Project version number for HexColor.
-FOUNDATION_EXPORT double HexColorVersionNumber;
-
-//! Project version string for HexColor.
-FOUNDATION_EXPORT const unsigned char HexColorVersionString[];
-
-// In this header, you should import all the public headers of your framework using statements like #import <HexColor/PublicHeader.h>
-
-
diff --git a/submodules/HockeySDK-iOS/.gitattributes b/submodules/HockeySDK-iOS/.gitattributes
deleted file mode 100644
index 854d90babf..0000000000
--- a/submodules/HockeySDK-iOS/.gitattributes
+++ /dev/null
@@ -1 +0,0 @@
-*.pbxproj merge=union
\ No newline at end of file
diff --git a/submodules/HockeySDK-iOS/.gitignore b/submodules/HockeySDK-iOS/.gitignore
deleted file mode 100644
index db0ab09450..0000000000
--- a/submodules/HockeySDK-iOS/.gitignore
+++ /dev/null
@@ -1,25 +0,0 @@
-fastlane/README.md
-fastlane/report.xml
-fastlane/test_output/*
-*.pbxuser
-!default.pbxuser
-*.mode1v3
-!default.mode1v3
-*.mode2v3
-!default.mode2v3
-*.perspectivev3
-!default.perspectivev3
-xcuserdata
-*.xccheckout
-*.xcscmblueprint
-*.moved-aside
-DerivedData
-*.hmap
-*.ipa
-*.xcuserstate
-.DS_Store
-*.dSYM
-*.dSYM.zip
-*.ipa
-*/xcuserdata/*
-HockeySDK-iOS.xcodeproj/*
diff --git a/submodules/HockeySDK-iOS/BUCK b/submodules/HockeySDK-iOS/BUCK
deleted file mode 100644
index 582118aa4b..0000000000
--- a/submodules/HockeySDK-iOS/BUCK
+++ /dev/null
@@ -1,60 +0,0 @@
-load("//Config:buck_rule_macros.bzl", "static_library")
-
-prebuilt_apple_framework(
-    name = "CrashReporter",
-    framework = "Vendor/CrashReporter.framework",
-    preferred_linkage = "static",
-)
-
-static_library(
-    name = "HockeySDK",
-    srcs = glob([
-        "Classes/*.m",
-        "Classes/*.mm",
-    ]),
-    headers = glob([
-        "Classes/*.h",
-    ]),
-    exported_headers = [
-        "Classes/HockeySDKFeatureConfig.h",
-        "Classes/HockeySDKEnums.h",
-        "Classes/HockeySDKNullability.h",
-        "Classes/BITAlertAction.h",
-
-        "Classes/BITHockeyManager.h",
-
-        "Classes/BITHockeyAttachment.h",
-
-        "Classes/BITHockeyBaseManager.h",
-        "Classes/BITCrashManager.h",
-        "Classes/BITCrashAttachment.h",
-        "Classes/BITCrashManagerDelegate.h",
-        "Classes/BITCrashDetails.h",
-        "Classes/BITCrashMetaData.h",
-
-        "Classes/BITAuthenticator.h",
-
-        "Classes/BITUpdateManager.h",
-        "Classes/BITUpdateManagerDelegate.h",
-        "Classes/BITUpdateViewController.h",
-        "Classes/BITHockeyBaseViewController.h",
-        "Classes/BITHockeyManagerDelegate.h",
-    ],
-    compiler_flags = [
-        '-DBITHOCKEY_VERSION=@\"5.1.2\"',
-        '-DBITHOCKEY_C_VERSION="5.1.2"',
-        '-DBITHOCKEY_C_BUILD="108"',
-        "-DHOCKEYSDK_FEATURE_CRASH_REPORTER=1",
-        "-DHOCKEYSDK_FEATURE_UPDATES=1",
-        "-DHOCKEYSDK_FEATURE_FEEDBACK=0",
-        "-DHOCKEYSDK_FEATURE_AUTHENTICATOR=1",
-        "-DHOCKEYSDK_FEATURE_METRICS=0",
-    ],
-    deps = [
-        ":CrashReporter",
-    ],
-    frameworks = [
-        "$SDKROOT/System/Library/Frameworks/Foundation.framework",
-        "$SDKROOT/System/Library/Frameworks/UIKit.framework",
-    ],
-)
diff --git a/submodules/HockeySDK-iOS/Classes/BITActivityIndicatorButton.h b/submodules/HockeySDK-iOS/Classes/BITActivityIndicatorButton.h
deleted file mode 100644
index 2c633222c9..0000000000
--- a/submodules/HockeySDK-iOS/Classes/BITActivityIndicatorButton.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Copyright (c) 2012-2014 HockeyApp, Bit Stadium GmbH.
- * All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person
- * obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without
- * restriction, including without limitation the rights to use,
- * copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following
- * conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
- * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#import <UIKit/UIKit.h>
-
-@interface BITActivityIndicatorButton : UIButton
-
-- (void)setShowsActivityIndicator:(BOOL)showsIndicator;
-
-@end
diff --git a/submodules/HockeySDK-iOS/Classes/BITActivityIndicatorButton.m b/submodules/HockeySDK-iOS/Classes/BITActivityIndicatorButton.m
deleted file mode 100644
index 6a731bb434..0000000000
--- a/submodules/HockeySDK-iOS/Classes/BITActivityIndicatorButton.m
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
- * Copyright (c) 2012-2014 HockeyApp, Bit Stadium GmbH.
- * All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person
- * obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without
- * restriction, including without limitation the rights to use,
- * copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following
- * conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
- * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#import "HockeySDK.h"
-
-#if HOCKEYSDK_FEATURE_FEEDBACK
-
-#import "BITActivityIndicatorButton.h"
-
-@interface BITActivityIndicatorButton()
-
-@property (nonatomic, strong) UIActivityIndicatorView *indicator;
-@property (nonatomic) BOOL indicatorVisible;
-
-@end
-
-@implementation BITActivityIndicatorButton
-
-- (void)setShowsActivityIndicator:(BOOL)showsIndicator {
-  if (self.indicatorVisible == showsIndicator){
-    return;
-  }
-  
-  if (!self.indicator){
-    self.indicator = [[UIActivityIndicatorView alloc] initWithFrame:self.bounds];
-    [self addSubview:self.indicator];
-    [self.indicator setColor:[UIColor blackColor]];
-  }
-  
-  self.indicatorVisible = showsIndicator;
-  
-  if (showsIndicator){
-    [self.indicator startAnimating];
-    self.indicator.alpha = 1;
-    self.layer.borderWidth = 1;
-    self.layer.borderColor = [UIColor lightGrayColor].CGColor;
-    self.layer.cornerRadius = 5;
-    self.imageView.image = nil;
-  } else {
-    [self.indicator stopAnimating];
-    self.layer.cornerRadius = 0;
-    self.indicator.alpha = 0;
-    self.layer.borderWidth = 0;
-
-  }
-  
-}
-
-- (void)layoutSubviews {
-  [super layoutSubviews];
-  
-  [self.indicator setFrame:self.bounds];
-  
-}
-
-
-@end
-
-#endif /* HOCKEYSDK_FEATURE_FEEDBACK */
diff --git a/submodules/HockeySDK-iOS/Classes/BITAlertAction.h b/submodules/HockeySDK-iOS/Classes/BITAlertAction.h
deleted file mode 100644
index caf1277f5c..0000000000
--- a/submodules/HockeySDK-iOS/Classes/BITAlertAction.h
+++ /dev/null
@@ -1,9 +0,0 @@
-#import <UIKit/UIKit.h>
-
-@interface BITAlertAction : UIAlertAction
-
-+ (UIAlertAction * _Nonnull)actionWithTitle:(nullable NSString *)title style:(UIAlertActionStyle)style handler:(void (^_Nullable)(UIAlertAction *_Nonnull))handler;
-
-- (void)invokeAction;
-
-@end
diff --git a/submodules/HockeySDK-iOS/Classes/BITAlertAction.m b/submodules/HockeySDK-iOS/Classes/BITAlertAction.m
deleted file mode 100644
index d689a5a960..0000000000
--- a/submodules/HockeySDK-iOS/Classes/BITAlertAction.m
+++ /dev/null
@@ -1,23 +0,0 @@
-#import "BITAlertAction.h"
-
-@interface BITAlertAction ()
-
-@property (nonatomic, copy) void (^storedHandler)(UIAlertAction * _Nonnull);
-
-@end
-
-@implementation BITAlertAction
-
-+ (UIAlertAction *)actionWithTitle:(nullable NSString *)title style:(UIAlertActionStyle)style handler:(void (^)(UIAlertAction *_Nonnull))handler {
-  BITAlertAction *action = [super actionWithTitle:title style:style handler:handler];
-  action.storedHandler = handler;
-  return action;
-}
-
-- (void)invokeAction {
-  if (self.storedHandler) {
-    self.storedHandler(self);
-  }
-}
-
-@end
diff --git a/submodules/HockeySDK-iOS/Classes/BITAppStoreHeader.h b/submodules/HockeySDK-iOS/Classes/BITAppStoreHeader.h
deleted file mode 100644
index c0b5e8f955..0000000000
--- a/submodules/HockeySDK-iOS/Classes/BITAppStoreHeader.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Author: Andreas Linde <mail@andreaslinde.de>
- *         Peter Steinberger
- *
- * Copyright (c) 2012-2014 HockeyApp, Bit Stadium GmbH.
- * Copyright (c) 2011-2012 Peter Steinberger.
- * All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person
- * obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without
- * restriction, including without limitation the rights to use,
- * copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following
- * conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
- * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
- */
-
-
-#import <UIKit/UIKit.h>
-
-@interface BITAppStoreHeader : UIView
-
-@property (nonatomic, copy) NSString *headerText;
-@property (nonatomic, copy) NSString *subHeaderText;
-@property (nonatomic, strong) UIImage *iconImage;
-
-@end
diff --git a/submodules/HockeySDK-iOS/Classes/BITAppStoreHeader.m b/submodules/HockeySDK-iOS/Classes/BITAppStoreHeader.m
deleted file mode 100644
index 54e72abf76..0000000000
--- a/submodules/HockeySDK-iOS/Classes/BITAppStoreHeader.m
+++ /dev/null
@@ -1,150 +0,0 @@
-/*
- * Author: Andreas Linde <mail@andreaslinde.de>
- *         Peter Steinberger
- *
- * Copyright (c) 2012-2014 HockeyApp, Bit Stadium GmbH.
- * Copyright (c) 2011-2012 Peter Steinberger.
- * All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person
- * obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without
- * restriction, including without limitation the rights to use,
- * copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following
- * conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
- * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#import "HockeySDK.h"
-
-#if HOCKEYSDK_FEATURE_UPDATES
-
-#import "BITAppStoreHeader.h"
-#import "BITHockeyHelper.h"
-#import "HockeySDKPrivate.h"
-
-#define kDarkGrayColor  BIT_RGBCOLOR(186, 186, 186)
-#define kWhiteBackgroundColorDefault  BIT_RGBCOLOR(245, 245, 245)
-#define kWhiteBackgroundColorOS7  BIT_RGBCOLOR(255, 255, 255)
-#define kImageHeight 72
-#define kImageBorderRadiusiOS7 16.5
-#define kImageLeftMargin 14
-#define kImageTopMargin 12
-#define kTextRow kImageTopMargin*2 + kImageHeight
-
-@interface BITAppStoreHeader ()
-
-@property (nonatomic, strong) UILabel *headerLabelView;
-@property (nonatomic, strong) UILabel *middleLabelView;
-
-@end
-
-@implementation BITAppStoreHeader
-
-
-#pragma mark - NSObject
-
-- (instancetype)initWithFrame:(CGRect)frame {
-  if ((self = [super initWithFrame:frame])) {
-    self.autoresizingMask = UIViewAutoresizingFlexibleWidth;
-    self.backgroundColor = kWhiteBackgroundColorDefault;
-  }
-  return self;
-}
-
-
-#pragma mark - UIView
-
-- (void)drawRect:(CGRect)rect {
-  CGRect bounds = self.bounds;
-
-  // draw the line
-  CGContextRef ctx = UIGraphicsGetCurrentContext();
-  CGContextSetLineWidth(ctx, 1.0);
-  CGContextSetStrokeColorWithColor(ctx, kDarkGrayColor.CGColor);
-  CGContextMoveToPoint(ctx, 0, CGRectGetMaxY(bounds));
-  CGContextAddLineToPoint( ctx, CGRectGetMaxX(bounds), CGRectGetMaxY(bounds));
-  CGContextStrokePath(ctx);
-  
-  // icon
-  [self.iconImage drawAtPoint:CGPointMake(kImageLeftMargin, kImageTopMargin)];
-  
-  [super drawRect:rect];
-}
-
-
-- (void)layoutSubviews {
-  self.backgroundColor = kWhiteBackgroundColorOS7;
-
-  [super layoutSubviews];
-  
-  CGFloat globalWidth = self.frame.size.width;
-  
-  // draw header name
-  UIColor *mainTextColor = BIT_RGBCOLOR(61, 61, 61);
-  UIColor *secondaryTextColor = BIT_RGBCOLOR(100, 100, 100);
-  UIFont *mainFont = [UIFont boldSystemFontOfSize:15];
-  UIFont *secondaryFont = [UIFont systemFontOfSize:10];
-  
-  if (!self.headerLabelView) self.headerLabelView = [[UILabel alloc] init];
-  [self.headerLabelView setFont:mainFont];
-  [self.headerLabelView setFrame:CGRectMake(kTextRow, kImageTopMargin, globalWidth-kTextRow, 20)];
-  [self.headerLabelView setTextColor:mainTextColor];
-  [self.headerLabelView setBackgroundColor:[UIColor clearColor]];
-  [self.headerLabelView setText:self.headerText];
-  [self addSubview:self.headerLabelView];
-  
-  // middle
-  if (!self.middleLabelView) self.middleLabelView = [[UILabel alloc] init];
-  [self.middleLabelView setFont:secondaryFont];
-  [self.middleLabelView setFrame:CGRectMake(kTextRow, kImageTopMargin + 17, globalWidth-kTextRow, 20)];
-  [self.middleLabelView setTextColor:secondaryTextColor];
-  [self.middleLabelView setBackgroundColor:[UIColor clearColor]];
-  [self.middleLabelView setText:self.subHeaderText];
-  [self addSubview:self.middleLabelView];
-}
-
-
-#pragma mark - Properties
-
-- (void)setHeaderText:(NSString *)anHeaderText {
-  if (_headerText != anHeaderText) {
-    _headerText = [anHeaderText copy];
-    [self setNeedsDisplay];
-  }
-}
-
-- (void)setSubHeaderText:(NSString *)aSubHeaderText {
-  if (_subHeaderText != aSubHeaderText) {
-    _subHeaderText = [aSubHeaderText copy];
-    [self setNeedsDisplay];
-  }
-}
-
-- (void)setIconImage:(UIImage *)anIconImage {
-  if (_iconImage != anIconImage) {
-    
-    // scale, make borders and reflection
-    _iconImage = bit_imageToFitSize(anIconImage, CGSizeMake(kImageHeight, kImageHeight), YES);
-    _iconImage = bit_roundedCornerImage(_iconImage, kImageBorderRadiusiOS7, 0.0);
-    
-    [self setNeedsDisplay];
-  }
-}
-
-@end
-
-#endif /* HOCKEYSDK_FEATURE_UPDATES */
diff --git a/submodules/HockeySDK-iOS/Classes/BITAppVersionMetaInfo.h b/submodules/HockeySDK-iOS/Classes/BITAppVersionMetaInfo.h
deleted file mode 100644
index 2143e02a72..0000000000
--- a/submodules/HockeySDK-iOS/Classes/BITAppVersionMetaInfo.h
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Author: Peter Steinberger
- *         Andreas Linde
- *
- * Copyright (c) 2012-2014 HockeyApp, Bit Stadium GmbH.
- * Copyright (c) 2011 Andreas Linde, Peter Steinberger.
- * All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person
- * obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without
- * restriction, including without limitation the rights to use,
- * copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following
- * conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
- * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#import <Foundation/Foundation.h>
-
-@interface BITAppVersionMetaInfo : NSObject {
-}
-@property (nonatomic, copy) NSString *name;
-@property (nonatomic, copy) NSString *version;
-@property (nonatomic, copy) NSString *shortVersion;
-@property (nonatomic, copy) NSString *minOSVersion;
-@property (nonatomic, copy) NSString *notes;
-@property (nonatomic, copy) NSDate *date;
-@property (nonatomic, copy) NSNumber *size;
-@property (nonatomic, copy) NSNumber *mandatory;
-@property (nonatomic, copy) NSNumber *versionID;
-@property (nonatomic, copy) NSDictionary *uuids;
-
-- (NSString *)nameAndVersionString;
-- (NSString *)versionString;
-- (NSString *)dateString;
-- (NSString *)sizeInMB;
-- (NSString *)notesOrEmptyString;
-- (void)setDateWithTimestamp:(NSTimeInterval)timestamp;
-- (BOOL)isValid;
-- (BOOL)hasUUID:(NSString *)uuid;
-- (BOOL)isEqualToAppVersionMetaInfo:(BITAppVersionMetaInfo *)anAppVersionMetaInfo;
-
-+ (BITAppVersionMetaInfo *)appVersionMetaInfoFromDict:(NSDictionary *)dict;
-
-@end
diff --git a/submodules/HockeySDK-iOS/Classes/BITAppVersionMetaInfo.m b/submodules/HockeySDK-iOS/Classes/BITAppVersionMetaInfo.m
deleted file mode 100644
index 9320ed5092..0000000000
--- a/submodules/HockeySDK-iOS/Classes/BITAppVersionMetaInfo.m
+++ /dev/null
@@ -1,228 +0,0 @@
-/*
- * Author: Peter Steinberger
- *         Andreas Linde
- *
- * Copyright (c) 2012-2014 HockeyApp, Bit Stadium GmbH.
- * Copyright (c) 2011 Andreas Linde, Peter Steinberger.
- * All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person
- * obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without
- * restriction, including without limitation the rights to use,
- * copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following
- * conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
- * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#import "BITAppVersionMetaInfo.h"
-#import "HockeySDKPrivate.h"
-
-
-@implementation BITAppVersionMetaInfo
-
-
-#pragma mark - Static
-
-+ (BITAppVersionMetaInfo *)appVersionMetaInfoFromDict:(NSDictionary *)dict {
-  BITAppVersionMetaInfo *appVersionMetaInfo = [[[self class] alloc] init];
-  
-  if ([dict isKindOfClass:[NSDictionary class]]) {
-    appVersionMetaInfo.name = [dict objectForKey:@"title"];
-    appVersionMetaInfo.version = [dict objectForKey:@"version"];
-    appVersionMetaInfo.shortVersion = [dict objectForKey:@"shortversion"];
-    appVersionMetaInfo.minOSVersion = [dict objectForKey:@"minimum_os_version"];
-    [appVersionMetaInfo setDateWithTimestamp:[[dict objectForKey:@"timestamp"] doubleValue]];
-    appVersionMetaInfo.size = [dict objectForKey:@"appsize"];
-    appVersionMetaInfo.notes = [dict objectForKey:@"notes"];
-    appVersionMetaInfo.mandatory = [dict objectForKey:@"mandatory"];
-    appVersionMetaInfo.versionID = [dict objectForKey:@"id"];
-    appVersionMetaInfo.uuids = [dict objectForKey:@"uuids"];
-  }
-  
-  return appVersionMetaInfo;
-}
-
-
-#pragma mark - NSObject
-
-- (BOOL)isEqual:(id)other {
-  if (other == self)
-    return YES;
-  if (!other || ![other isKindOfClass:[self class]])
-    return NO;
-  return [self isEqualToAppVersionMetaInfo:other];
-}
-
-- (BOOL)isEqualComparingString:(NSString *)stringA withString:(NSString *)stringB {
-  if ([stringA isKindOfClass:[NSString class]] && [stringB isKindOfClass:[NSString class]]) {
-    return [stringA isEqualToString:stringB];
-  }
-
-  return NO;
-}
-
-- (BOOL)isEqualComparingNumber:(NSNumber *)numberA withNumber:(NSNumber *)numberB {
-  if ([numberA isKindOfClass:[NSNumber class]] && [numberB isKindOfClass:[NSNumber class]]) {
-    return [numberA isEqualToNumber:numberB];
-  }
-
-  return NO;
-}
-
-- (BOOL)isEqualComparingDate:(NSDate *)dateA withDate:(NSDate *)dateB {
-  if ([dateA isKindOfClass:[NSDate class]] && [dateB isKindOfClass:[NSDate class]]) {
-    return [dateA isEqualToDate:dateB];
-  }
-
-  return NO;
-}
-
-- (BOOL)isEqualComparingDictionary:(NSDictionary *)dictA withDate:(NSDictionary *)dictB {
-  if ([dictA isKindOfClass:[NSDictionary class]] && [dictB isKindOfClass:[NSDictionary class]]) {
-    return [dictA isEqualToDictionary:dictB];
-  }
-  
-  return NO;
-}
-
-- (BOOL)isEqualToAppVersionMetaInfo:(BITAppVersionMetaInfo *)anAppVersionMetaInfo {
-  if (self == anAppVersionMetaInfo)
-    return YES;
-  if (![self isEqualComparingString:self.name withString:anAppVersionMetaInfo.name])
-    return NO;
-  if (![self isEqualComparingString:self.version withString:anAppVersionMetaInfo.version])
-    return NO;
-  if (![self isEqualComparingString:self.shortVersion withString:anAppVersionMetaInfo.shortVersion])
-    return NO;
-  if (![self isEqualComparingString:self.minOSVersion withString:anAppVersionMetaInfo.minOSVersion])
-    return NO;
-  if (![self isEqualComparingString:self.notes withString:anAppVersionMetaInfo.notes])
-    return NO;
-  if (![self isEqualComparingDate:self.date withDate:anAppVersionMetaInfo.date])
-    return NO;
-  if (![self isEqualComparingNumber:self.size withNumber:anAppVersionMetaInfo.size])
-    return NO;
-  if (![self isEqualComparingNumber:self.mandatory withNumber:anAppVersionMetaInfo.mandatory])
-    return NO;
-  if (![self isEqualComparingDictionary:self.uuids withDate:anAppVersionMetaInfo.uuids])
-    return NO;
-  return YES;
-}
-
-
-#pragma mark - NSCoder
-
-- (void)encodeWithCoder:(NSCoder *)encoder {
-  [encoder encodeObject:self.name forKey:@"name"];
-  [encoder encodeObject:self.version forKey:@"version"];
-  [encoder encodeObject:self.shortVersion forKey:@"shortVersion"];
-  [encoder encodeObject:self.minOSVersion forKey:@"minOSVersion"];
-  [encoder encodeObject:self.notes forKey:@"notes"];
-  [encoder encodeObject:self.date forKey:@"date"];
-  [encoder encodeObject:self.size forKey:@"size"];
-  [encoder encodeObject:self.mandatory forKey:@"mandatory"];
-  [encoder encodeObject:self.versionID forKey:@"versionID"];
-  [encoder encodeObject:self.uuids forKey:@"uuids"];
-}
-
-- (instancetype)initWithCoder:(NSCoder *)decoder {
-  if ((self = [super init])) {
-    self.name = [decoder decodeObjectForKey:@"name"];
-    self.version = [decoder decodeObjectForKey:@"version"];
-    self.shortVersion = [decoder decodeObjectForKey:@"shortVersion"];
-    self.minOSVersion = [decoder decodeObjectForKey:@"minOSVersion"];
-    self.notes = [decoder decodeObjectForKey:@"notes"];
-    self.date = [decoder decodeObjectForKey:@"date"];
-    self.size = [decoder decodeObjectForKey:@"size"];
-    self.mandatory = [decoder decodeObjectForKey:@"mandatory"];
-    self.versionID = [decoder decodeObjectForKey:@"versionID"];
-    self.uuids = [decoder decodeObjectForKey:@"uuids"];
-  }
-  return self;
-}
-
-
-#pragma mark - Properties
-
-- (NSString *)nameAndVersionString {
-  NSString *appNameAndVersion = [NSString stringWithFormat:@"%@ %@", self.name, [self versionString]];
-  return appNameAndVersion;
-}
-
-- (NSString *)versionString {
-  NSString *shortString = ([self.shortVersion respondsToSelector:@selector(length)] && [self.shortVersion length]) ? [NSString stringWithFormat:@"%@", self.shortVersion] : @"";
-  NSString *versionString = [shortString length] ? [NSString stringWithFormat:@" (%@)", self.version] : self.version;
-  return [NSString stringWithFormat:@"%@ %@%@", BITHockeyLocalizedString(@"Version"), shortString, versionString];
-}
-
-- (NSString *)dateString {
-  NSDateFormatter *formatter = [[NSDateFormatter alloc] init];
-  [formatter setDateStyle:NSDateFormatterMediumStyle];
-  
-  return [formatter stringFromDate:self.date];
-}
-
-- (NSString *)sizeInMB {
-  if ([self.size isKindOfClass: [NSNumber class]] && [self.size doubleValue] > 0) {
-    double appSizeInMB = [self.size doubleValue]/(1024*1024);
-    NSString *appSizeString = [NSString stringWithFormat:@"%.1f MB", appSizeInMB];
-    return appSizeString;
-  }
-  
-  return @"0 MB";
-}
-
-- (void)setDateWithTimestamp:(NSTimeInterval)timestamp {
-  if (timestamp != 0) {
-    NSDate *appDate = [NSDate dateWithTimeIntervalSince1970:timestamp];
-    self.date = appDate;
-  } else {
-    self.date = nil;
-  }
-}
-
-- (NSString *)notesOrEmptyString {
-  if (self.notes) {
-    return self.notes;
-  }else {
-    return [NSString string];
-  }
-}
-
-
-// A valid app needs at least following properties: name, version, date
-- (BOOL)isValid {
-  BOOL valid = [self.name length] && [self.version length] && self.date;  
-  return valid;
-}
-
-- (BOOL)hasUUID:(NSString *)uuid {
-  if (!uuid) return NO;
-  if (!self.uuids) return NO;
-  
-  __block BOOL hasUUID = NO;
-  
-  [self.uuids enumerateKeysAndObjectsUsingBlock:^(id __unused key, id obj, BOOL *stop){
-    if (obj && [uuid compare:obj] == NSOrderedSame) {
-      hasUUID = YES;
-      *stop = YES;
-    }
-  }];
-  
-  return hasUUID;
-}
-@end
diff --git a/submodules/HockeySDK-iOS/Classes/BITApplication.h b/submodules/HockeySDK-iOS/Classes/BITApplication.h
deleted file mode 100755
index 6a03147e2d..0000000000
--- a/submodules/HockeySDK-iOS/Classes/BITApplication.h
+++ /dev/null
@@ -1,12 +0,0 @@
-#import "BITTelemetryObject.h"
-
-@interface BITApplication : BITTelemetryObject <NSCoding>
-
-@property (nonatomic, copy) NSString *version;
-@property (nonatomic, copy) NSString *build;
-@property (nonatomic, copy) NSString *typeId;
-
-- (instancetype)initWithCoder:(NSCoder *)coder;
-- (void)encodeWithCoder:(NSCoder *)coder;
-
-@end
diff --git a/submodules/HockeySDK-iOS/Classes/BITApplication.m b/submodules/HockeySDK-iOS/Classes/BITApplication.m
deleted file mode 100755
index e3104f3616..0000000000
--- a/submodules/HockeySDK-iOS/Classes/BITApplication.m
+++ /dev/null
@@ -1,44 +0,0 @@
-#import "BITApplication.h"
-
-/// Data contract class for type Application.
-@implementation BITApplication
-
-///
-/// Adds all members of this class to a dictionary
-///
-- (NSDictionary *)serializeToDictionary {
-    NSMutableDictionary *dict = [super serializeToDictionary].mutableCopy;
-    if (self.version != nil) {
-        [dict setObject:self.version forKey:@"ai.application.ver"];
-    }
-    if (self.build != nil) {
-        [dict setObject:self.build forKey:@"ai.application.build"];
-    }
-    if (self.typeId != nil) {
-        [dict setObject:self.typeId forKey:@"ai.application.typeId"];
-    }
-  return dict;
-}
-
-#pragma mark - NSCoding
-
-- (instancetype)initWithCoder:(NSCoder *)coder {
-  self = [super initWithCoder:coder];
-  if (self) {
-    _version = [coder decodeObjectForKey:@"self.version"];
-    _build = [coder decodeObjectForKey:@"self.build"];
-    _typeId = [coder decodeObjectForKey:@"self.typeId"];
-  }
-
-  return self;
-}
-
-- (void)encodeWithCoder:(NSCoder *)coder {
-  [super encodeWithCoder:coder];
-  [coder encodeObject:self.version forKey:@"self.version"];
-  [coder encodeObject:self.build forKey:@"self.build"];
-  [coder encodeObject:self.typeId forKey:@"self.typeId"];
-}
-
-
-@end
diff --git a/submodules/HockeySDK-iOS/Classes/BITArrowImageAnnotation.h b/submodules/HockeySDK-iOS/Classes/BITArrowImageAnnotation.h
deleted file mode 100644
index feeca7613b..0000000000
--- a/submodules/HockeySDK-iOS/Classes/BITArrowImageAnnotation.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Author: Moritz Haarmann <post@moritzhaarmann.de>
- *
- * Copyright (c) 2012-2014 HockeyApp, Bit Stadium GmbH.
- * All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person
- * obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without
- * restriction, including without limitation the rights to use,
- * copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following
- * conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
- * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#import "BITImageAnnotation.h"
-
-@interface BITArrowImageAnnotation : BITImageAnnotation
-
-@end
diff --git a/submodules/HockeySDK-iOS/Classes/BITArrowImageAnnotation.m b/submodules/HockeySDK-iOS/Classes/BITArrowImageAnnotation.m
deleted file mode 100644
index d74a76cf10..0000000000
--- a/submodules/HockeySDK-iOS/Classes/BITArrowImageAnnotation.m
+++ /dev/null
@@ -1,215 +0,0 @@
-/*
- * Author: Moritz Haarmann <post@moritzhaarmann.de>
- *
- * Copyright (c) 2012-2014 HockeyApp, Bit Stadium GmbH.
- * All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person
- * obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without
- * restriction, including without limitation the rights to use,
- * copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following
- * conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
- * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#import "HockeySDK.h"
-
-#if HOCKEYSDK_FEATURE_FEEDBACK
-
-#import "BITArrowImageAnnotation.h"
-#import <tgmath.h>
-
-#define kArrowPointCount 7
-
-
-@interface BITArrowImageAnnotation()
-
-@property (nonatomic, strong) CAShapeLayer *shapeLayer;
-@property (nonatomic, strong) CAShapeLayer *strokeLayer;
-
-@end
-
-@implementation BITArrowImageAnnotation
-
-- (instancetype)initWithFrame:(CGRect)frame {
-  self = [super initWithFrame:frame];
-  if (self) {
-    self.shapeLayer = [CAShapeLayer layer];
-    self.shapeLayer.strokeColor = [UIColor whiteColor].CGColor;
-    self.shapeLayer.lineWidth = 5;
-    self.shapeLayer.fillColor = [UIColor redColor].CGColor;
-    
-    self.strokeLayer = [CAShapeLayer layer];
-    self.strokeLayer.strokeColor = [UIColor redColor].CGColor;
-    self.strokeLayer.lineWidth = 10;
-    self.strokeLayer.fillColor = [UIColor clearColor].CGColor;
-    [self.layer addSublayer:self.strokeLayer];
-
-    [self.layer addSublayer:self.shapeLayer];
-
-    
-  }
-  return self;
-}
-
-- (void)buildShape {
-  CGFloat baseWidth = MAX(self.frame.size.width, self.frame.size.height);
-  CGFloat topHeight = MAX(baseWidth / 3,10);
-
-  
-  CGFloat lineWidth = MAX(baseWidth / 10,3);
-  CGFloat startX, startY, endX, endY;
-  
-  CGRect boundRect = CGRectInset(self.bounds, 0, 0);
-  CGFloat arrowLength= sqrt(pow(CGRectGetWidth(boundRect), (CGFloat)2) + pow(CGRectGetHeight(boundRect), (CGFloat)2));
-  if (0 < arrowLength && arrowLength < 30){
-
-    CGFloat factor = 30 / arrowLength;
-    
-    boundRect = CGRectApplyAffineTransform(boundRect, CGAffineTransformMakeScale(factor,factor));
-  }
-  
-  if ( self.movedDelta.width < 0){
-    startX = CGRectGetMinX(boundRect);
-    endX =  CGRectGetMaxX(boundRect);
-  } else {
-    startX = CGRectGetMaxX(boundRect);
-    endX = CGRectGetMinX(boundRect);
-
-  }
-  
-  if ( self.movedDelta.height < 0){
-    startY = CGRectGetMinY(boundRect);
-    endY =  CGRectGetMaxY(boundRect);
-  } else {
-    startY = CGRectGetMaxY(boundRect);
-    endY =  CGRectGetMinY(boundRect);
-    
-  }
-  
-  
-  if (fabs(CGRectGetWidth(boundRect)) < 30 || fabs(CGRectGetHeight(boundRect)) < 30){
-    CGFloat smallerOne = MIN(fabs(CGRectGetHeight(boundRect)), fabs(CGRectGetWidth(boundRect)));
-    
-    CGFloat factor = smallerOne / 30;
-    
-    CGRectApplyAffineTransform(boundRect, CGAffineTransformMakeScale(factor,factor));
-  }
-  
-  UIBezierPath *path = [self bezierPathWithArrowFromPoint:CGPointMake(endX, endY) toPoint:CGPointMake(startX, startY) tailWidth:lineWidth headWidth:topHeight headLength:topHeight];
-  
-  self.shapeLayer.path = path.CGPath;
-  self.strokeLayer.path = path.CGPath;
-  [CATransaction begin];
-  [CATransaction setAnimationDuration:0];
-  self.strokeLayer.lineWidth = lineWidth / (CGFloat)1.5;
-  self.shapeLayer.lineWidth = lineWidth / 3;
-
-  [CATransaction commit];
-
-}
-
-
-- (UIBezierPath *)bezierPathWithArrowFromPoint:(CGPoint)startPoint
-                                           toPoint:(CGPoint)endPoint
-                                         tailWidth:(CGFloat)tailWidth
-                                         headWidth:(CGFloat)headWidth
-                                        headLength:(CGFloat)headLength {
-  CGFloat length = hypot(endPoint.x - startPoint.x, endPoint.y - startPoint.y);
-  
-  CGPoint points[kArrowPointCount];
-  [self getAxisAlignedArrowPoints:points
-                            forLength:length
-                            tailWidth:tailWidth
-                            headWidth:headWidth
-                           headLength:headLength];
-  
-  CGAffineTransform transform = [self transformForStartPoint:startPoint
-                                                        endPoint:endPoint
-                                                          length:length];
-  
-  CGMutablePathRef cgPath = CGPathCreateMutable();
-  CGPathAddLines(cgPath, &transform, points, sizeof points / sizeof *points);
-  CGPathCloseSubpath(cgPath);
-  
-  UIBezierPath *uiPath = [UIBezierPath bezierPathWithCGPath:cgPath];
-  CGPathRelease(cgPath);
-  return uiPath;
-}
-
-- (void)getAxisAlignedArrowPoints:(CGPoint[kArrowPointCount])points
-                            forLength:(CGFloat)length
-                            tailWidth:(CGFloat)tailWidth
-                            headWidth:(CGFloat)headWidth
-                           headLength:(CGFloat)headLength {
-  CGFloat tailLength = length - headLength;
-  points[0] = CGPointMake(0, tailWidth / 2);
-  points[1] = CGPointMake(tailLength, tailWidth / 2);
-  points[2] = CGPointMake(tailLength, headWidth / 2);
-  points[3] = CGPointMake(length, 0);
-  points[4] = CGPointMake(tailLength, -headWidth / 2);
-  points[5] = CGPointMake(tailLength, -tailWidth / 2);
-  points[6] = CGPointMake(0, -tailWidth / 2);
-}
-
-+ (CGAffineTransform)dqd_transformForStartPoint:(CGPoint)startPoint
-                                       endPoint:(CGPoint)endPoint
-                                         length:(CGFloat)length {
-  CGFloat cosine = (endPoint.x - startPoint.x) / length;
-  CGFloat sine = (endPoint.y - startPoint.y) / length;
-  return (CGAffineTransform){ cosine, sine, -sine, cosine, startPoint.x, startPoint.y };
-}
-
-- (CGAffineTransform)transformForStartPoint:(CGPoint)startPoint
-                                       endPoint:(CGPoint)endPoint
-                                         length:(CGFloat)length {
-  if (CGPointEqualToPoint(startPoint, CGPointZero) && (length == 0)) {
-    return CGAffineTransformIdentity;
-  }
-  
-  CGFloat cosine = (endPoint.x - startPoint.x) / length;
-  CGFloat sine = (endPoint.y - startPoint.y) / length;
-  return (CGAffineTransform){ cosine, sine, -sine, cosine, startPoint.x, startPoint.y };
-}
-
-#pragma mark - UIView 
-
-- (UIView *)hitTest:(CGPoint)point withEvent:(UIEvent *) __unused event {
-
-  CGPathRef strokePath = CGPathCreateCopyByStrokingPath(self.shapeLayer.path, NULL, fmax(90.0f, self.shapeLayer.lineWidth), kCGLineCapRound,kCGLineJoinMiter,0);
-  
-  BOOL containsPoint = CGPathContainsPoint(strokePath, NULL, point, NO);
-  
-  CGPathRelease(strokePath);
-  
-  if (containsPoint){
-    return self;
-  } else {
-    return nil;
-  }
-
-}
-
-- (void)layoutSubviews{
-  [super layoutSubviews];
-  
-  [self buildShape];
-}
-
-@end
-
-#endif /* HOCKEYSDK_FEATURE_FEEDBACK */
diff --git a/submodules/HockeySDK-iOS/Classes/BITAttributedLabel.h b/submodules/HockeySDK-iOS/Classes/BITAttributedLabel.h
deleted file mode 100644
index 720aaf37ef..0000000000
--- a/submodules/HockeySDK-iOS/Classes/BITAttributedLabel.h
+++ /dev/null
@@ -1,681 +0,0 @@
-// TTTAttributedLabel.h
-//
-// Copyright (c) 2011 Mattt Thompson (http://mattt.me)
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-#import <UIKit/UIKit.h>
-#import <CoreText/CoreText.h>
-
-//! Project version number for BITAttributedLabel.
-FOUNDATION_EXPORT double BITAttributedLabelVersionNumber;
-
-//! Project version string for BITAttributedLabel.
-FOUNDATION_EXPORT const unsigned char BITAttributedLabelVersionString[];
-
-@class BITAttributedLabelLink;
-
-/**
- Vertical alignment for text in a label whose bounds are larger than its text bounds
- */
-typedef NS_ENUM(NSInteger, BITAttributedLabelVerticalAlignment) {
-  BITAttributedLabelVerticalAlignmentCenter   = 0,
-  BITAttributedLabelVerticalAlignmentTop      = 1,
-  BITAttributedLabelVerticalAlignmentBottom   = 2,
-};
-
-/**
- Determines whether the text to which this attribute applies has a strikeout drawn through itself.
- */
-extern NSString * const kBITStrikeOutAttributeName;
-
-/**
- The background fill color. Value must be a `CGColorRef`. Default value is `nil` (no fill).
- */
-extern NSString * const kBITBackgroundFillColorAttributeName;
-
-/**
- The padding for the background fill. Value must be a `UIEdgeInsets`. Default value is `UIEdgeInsetsZero` (no padding).
- */
-extern NSString * const kBITBackgroundFillPaddingAttributeName;
-
-/**
- The background stroke color. Value must be a `CGColorRef`. Default value is `nil` (no stroke).
- */
-extern NSString * const kBITBackgroundStrokeColorAttributeName;
-
-/**
- The background stroke line width. Value must be an `NSNumber`. Default value is `1.0f`.
- */
-extern NSString * const kBITBackgroundLineWidthAttributeName;
-
-/**
- The background corner radius. Value must be an `NSNumber`. Default value is `5.0f`.
- */
-extern NSString * const kBITBackgroundCornerRadiusAttributeName;
-
-@protocol BITAttributedLabelDelegate;
-
-// Override UILabel @property to accept both NSString and NSAttributedString
-@protocol BITAttributedLabel <NSObject>
-@property (nonatomic, copy) IBInspectable id text;
-@end
-
-IB_DESIGNABLE
-
-/**
- `BITAttributedLabel` is a drop-in replacement for `UILabel` that supports `NSAttributedString`, as well as automatically-detected and manually-added links to URLs, addresses, phone numbers, and dates.
-
- ## Differences Between `BITAttributedLabel` and `UILabel`
-
- For the most part, `BITAttributedLabel` behaves just like `UILabel`. The following are notable exceptions, in which `BITAttributedLabel` may act differently:
-
- - `text` - This property now takes an `id` type argument, which can either be a kind of `NSString` or `NSAttributedString` (mutable or immutable in both cases)
- - `attributedText` - Do not set this property directly. Instead, pass an `NSAttributedString` to `text`.
- - `lineBreakMode` - This property displays only the first line when the value is `UILineBreakModeHeadTruncation`, `UILineBreakModeTailTruncation`, or `UILineBreakModeMiddleTruncation`
- - `adjustsFontsizeToFitWidth` - Supported in iOS 5 and greater, this property is effective for any value of `numberOfLines` greater than zero. In iOS 4, setting `numberOfLines` to a value greater than 1 with `adjustsFontSizeToFitWidth` set to `YES` may cause `sizeToFit` to execute indefinitely.
- - `baselineAdjustment` - This property has no affect.
- - `textAlignment` - This property does not support justified alignment.
- - `NSTextAttachment` - This string attribute is not supported.
-
- Any properties affecting text or paragraph styling, such as `firstLineIndent` will only apply when text is set with an `NSString`. If the text is set with an `NSAttributedString`, these properties will not apply.
-
- ### NSCoding
-
- `BITAttributedLabel`, like `UILabel`, conforms to `NSCoding`. However, if the build target is set to less than iOS 6.0, `linkAttributes` and `activeLinkAttributes` will not be encoded or decoded. This is due to an runtime exception thrown when attempting to copy non-object CoreText values in dictionaries.
-
- @warning Any properties changed on the label after setting the text will not be reflected until a subsequent call to `setText:` or `setText:afterInheritingLabelAttributesAndConfiguringWithBlock:`. This is to say, order of operations matters in this case. For example, if the label text color is originally black when the text is set, changing the text color to red will have no effect on the display of the label until the text is set once again.
-
- @bug Setting `attributedText` directly is not recommended, as it may cause a crash when attempting to access any links previously set. Instead, call `setText:`, passing an `NSAttributedString`.
- */
-@interface BITAttributedLabel : UILabel <BITAttributedLabel, UIGestureRecognizerDelegate>
-
-/**
- * The designated initializers are @c initWithFrame: and @c initWithCoder:.
- * init will not properly initialize many required properties and other configuration.
- */
-- (instancetype) init NS_UNAVAILABLE;
-
-///-----------------------------
-/// @name Accessing the Delegate
-///-----------------------------
-
-/**
- The receiver's delegate.
-
- @discussion A `BITAttributedLabel` delegate responds to messages sent by tapping on links in the label. You can use the delegate to respond to links referencing a URL, address, phone number, date, or date with a specified time zone and duration.
- */
-@property (nonatomic, unsafe_unretained) IBOutlet id <BITAttributedLabelDelegate> delegate;
-
-///--------------------------------------------
-/// @name Detecting, Accessing, & Styling Links
-///--------------------------------------------
-
-/**
- A bitmask of `NSTextCheckingType` which are used to automatically detect links in the label text.
-
- @warning You must specify `enabledTextCheckingTypes` before setting the `text`, with either `setText:` or `setText:afterInheritingLabelAttributesAndConfiguringWithBlock:`.
- */
-@property (nonatomic, assign) NSTextCheckingTypes enabledTextCheckingTypes;
-
-/**
- An array of `NSTextCheckingResult` objects for links detected or manually added to the label text.
- */
-@property (readonly, nonatomic, strong) NSArray *links;
-
-/**
- A dictionary containing the default `NSAttributedString` attributes to be applied to links detected or manually added to the label text. The default link style is blue and underlined.
-
- @warning You must specify `linkAttributes` before setting autodecting or manually-adding links for these attributes to be applied.
- */
-@property (nonatomic, strong) NSDictionary *linkAttributes;
-
-/**
- A dictionary containing the default `NSAttributedString` attributes to be applied to links when they are in the active state. If `nil` or an empty `NSDictionary`, active links will not be styled. The default active link style is red and underlined.
- */
-@property (nonatomic, strong) NSDictionary *activeLinkAttributes;
-
-/**
- A dictionary containing the default `NSAttributedString` attributes to be applied to links when they are in the inactive state, which is triggered by a change in `tintColor` in iOS 7 and later. If `nil` or an empty `NSDictionary`, inactive links will not be styled. The default inactive link style is gray and unadorned.
- */
-@property (nonatomic, strong) NSDictionary *inactiveLinkAttributes;
-
-/**
- The edge inset for the background of a link. The default value is `{0, -1, 0, -1}`.
- */
-@property (nonatomic, assign) UIEdgeInsets linkBackgroundEdgeInset;
-
-/**
- Indicates if links will be detected within an extended area around the touch
- to emulate the link detection behaviour of UIWebView.
- Default value is NO. Enabling this may adversely impact performance.
- */
-@property (nonatomic, assign) BOOL extendsLinkTouchArea;
-
-///---------------------------------------
-/// @name Acccessing Text Style Attributes
-///---------------------------------------
-
-/**
- The shadow blur radius for the label. A value of 0 indicates no blur, while larger values produce correspondingly larger blurring. This value must not be negative. The default value is 0.
- */
-@property (nonatomic, assign) IBInspectable CGFloat shadowRadius;
-
-/**
- The shadow blur radius for the label when the label's `highlighted` property is `YES`. A value of 0 indicates no blur, while larger values produce correspondingly larger blurring. This value must not be negative. The default value is 0.
- */
-@property (nonatomic, assign) IBInspectable CGFloat highlightedShadowRadius;
-/**
- The shadow offset for the label when the label's `highlighted` property is `YES`. A size of {0, 0} indicates no offset, with positive values extending down and to the right. The default size is {0, 0}.
- */
-@property (nonatomic, assign) IBInspectable CGSize highlightedShadowOffset;
-/**
- The shadow color for the label when the label's `highlighted` property is `YES`. The default value is `nil` (no shadow color).
- */
-@property (nonatomic, strong) IBInspectable UIColor *highlightedShadowColor;
-
-/**
- The amount to kern the next character. Default is standard kerning. If this attribute is set to 0.0, no kerning is done at all.
- */
-@property (nonatomic, assign) IBInspectable CGFloat kern;
-
-///--------------------------------------------
-/// @name Acccessing Paragraph Style Attributes
-///--------------------------------------------
-
-/**
- The distance, in points, from the leading margin of a frame to the beginning of the
- paragraph's first line. This value is always nonnegative, and is 0.0 by default.
- This applies to the full text, rather than any specific paragraph metrics.
- */
-@property (nonatomic, assign) IBInspectable CGFloat firstLineIndent;
-
-/**
- The space in points added between lines within the paragraph. This value is always nonnegative and is 0.0 by default.
- */
-@property (nonatomic, assign) IBInspectable CGFloat lineSpacing;
-
-/**
- The minimum line height within the paragraph. If the value is 0.0, the minimum line height is set to the line height of the `font`. 0.0 by default.
- */
-@property (nonatomic, assign) IBInspectable CGFloat minimumLineHeight;
-
-/**
- The maximum line height within the paragraph. If the value is 0.0, the maximum line height is set to the line height of the `font`. 0.0 by default.
- */
-@property (nonatomic, assign) IBInspectable CGFloat maximumLineHeight;
-
-/**
- The line height multiple. This value is 1.0 by default.
- */
-@property (nonatomic, assign) IBInspectable CGFloat lineHeightMultiple;
-
-/**
- The distance, in points, from the margin to the text container. This value is `UIEdgeInsetsZero` by default.
- sizeThatFits: will have its returned size increased by these margins.
- drawTextInRect: will inset all drawn text by these margins.
- */
-@property (nonatomic, assign) IBInspectable UIEdgeInsets textInsets;
-
-/**
- The vertical text alignment for the label, for when the frame size is greater than the text rect size. The vertical alignment is `BITAttributedLabelVerticalAlignmentCenter` by default.
- */
-@property (nonatomic, assign) BITAttributedLabelVerticalAlignment verticalAlignment;
-
-///--------------------------------------------
-/// @name Accessing Truncation Token Appearance
-///--------------------------------------------
-
-/**
- The attributed string to apply to the truncation token at the end of a truncated line.
- */
-@property (nonatomic, strong) IBInspectable NSAttributedString *attributedTruncationToken;
-
-///--------------------------
-/// @name Long press gestures
-///--------------------------
-
-/**
- *  The long-press gesture recognizer used internally by the label.
- */
-@property (nonatomic, strong, readonly) UILongPressGestureRecognizer *longPressGestureRecognizer;
-
-///--------------------------------------------
-/// @name Calculating Size of Attributed String
-///--------------------------------------------
-
-/**
- Calculate and return the size that best fits an attributed string, given the specified constraints on size and number of lines.
-
- @param attributedString The attributed string.
- @param size The maximum dimensions used to calculate size.
- @param numberOfLines The maximum number of lines in the text to draw, if the constraining size cannot accomodate the full attributed string.
-
- @return The size that fits the attributed string within the specified constraints.
- */
-+ (CGSize)sizeThatFitsAttributedString:(NSAttributedString *)attributedString
-                       withConstraints:(CGSize)size
-                limitedToNumberOfLines:(NSUInteger)numberOfLines;
-
-///----------------------------------
-/// @name Setting the Text Attributes
-///----------------------------------
-
-/**
- Sets the text displayed by the label.
-
- @param text An `NSString` or `NSAttributedString` object to be displayed by the label. If the specified text is an `NSString`, the label will display the text like a `UILabel`, inheriting the text styles of the label. If the specified text is an `NSAttributedString`, the label text styles will be overridden by the styles specified in the attributed string.
-
- @discussion This method overrides `UILabel -setText:` to accept both `NSString` and `NSAttributedString` objects. This string is `nil` by default.
- */
-- (void)setText:(id)text;
-
-/**
- Sets the text displayed by the label, after configuring an attributed string containing the text attributes inherited from the label in a block.
-
- @param text An `NSString` or `NSAttributedString` object to be displayed by the label.
- @param block A block object that returns an `NSMutableAttributedString` object and takes a single argument, which is an `NSMutableAttributedString` object with the text from the first parameter, and the text attributes inherited from the label text styles. For example, if you specified the `font` of the label to be `[UIFont boldSystemFontOfSize:14]` and `textColor` to be `[UIColor redColor]`, the `NSAttributedString` argument of the block would be contain the `NSAttributedString` attribute equivalents of those properties. In this block, you can set further attributes on particular ranges.
-
- @discussion This string is `nil` by default.
- */
-- (void)setText:(id)text
-afterInheritingLabelAttributesAndConfiguringWithBlock:(NSMutableAttributedString *(^)(NSMutableAttributedString *mutableAttributedString))block;
-
-///------------------------------------
-/// @name Accessing the Text Attributes
-///------------------------------------
-
-/**
- A copy of the label's current attributedText. This returns `nil` if an attributed string has never been set on the label.
-
- @warning Do not set this property directly. Instead, set @c text to an @c NSAttributedString.
- */
-@property (readwrite, nonatomic, copy) NSAttributedString *attributedText;
-
-///-------------------
-/// @name Adding Links
-///-------------------
-
-/**
- Adds a link. You can customize an individual link's appearance and accessibility value by creating your own @c BITAttributedLabelLink and passing it to this method. The other methods for adding links will use the label's default attributes.
-
- @warning Modifying the link's attribute dictionaries must be done before calling this method.
-
- @param link A @c BITAttributedLabelLink object.
- */
-- (void)addLink:(BITAttributedLabelLink *)link;
-
-/**
- Adds a link to an @c NSTextCheckingResult.
-
- @param result An @c NSTextCheckingResult representing the link's location and type.
-
- @return The newly added link object.
- */
-- (BITAttributedLabelLink *)addLinkWithTextCheckingResult:(NSTextCheckingResult *)result;
-
-/**
- Adds a link to an @c NSTextCheckingResult.
-
- @param result An @c NSTextCheckingResult representing the link's location and type.
- @param attributes The attributes to be added to the text in the range of the specified link. If set, the label's @c activeAttributes and @c inactiveAttributes will be applied to the link. If `nil`, no attributes are added to the link.
-
- @return The newly added link object.
- */
-- (BITAttributedLabelLink *)addLinkWithTextCheckingResult:(NSTextCheckingResult *)result
-                                               attributes:(NSDictionary *)attributes;
-
-/**
- Adds a link to a URL for a specified range in the label text.
-
- @param url The url to be linked to
- @param range The range in the label text of the link. The range must not exceed the bounds of the receiver.
-
- @return The newly added link object.
- */
-- (BITAttributedLabelLink *)addLinkToURL:(NSURL *)url
-                               withRange:(NSRange)range;
-
-/**
- Adds a link to an address for a specified range in the label text.
-
- @param addressComponents A dictionary of address components for the address to be linked to
- @param range The range in the label text of the link. The range must not exceed the bounds of the receiver.
-
- @discussion The address component dictionary keys are described in `NSTextCheckingResult`'s "Keys for Address Components."
-
- @return The newly added link object.
- */
-- (BITAttributedLabelLink *)addLinkToAddress:(NSDictionary *)addressComponents
-                                   withRange:(NSRange)range;
-
-/**
- Adds a link to a phone number for a specified range in the label text.
-
- @param phoneNumber The phone number to be linked to.
- @param range The range in the label text of the link. The range must not exceed the bounds of the receiver.
-
- @return The newly added link object.
- */
-- (BITAttributedLabelLink *)addLinkToPhoneNumber:(NSString *)phoneNumber
-                                       withRange:(NSRange)range;
-
-/**
- Adds a link to a date for a specified range in the label text.
-
- @param date The date to be linked to.
- @param range The range in the label text of the link. The range must not exceed the bounds of the receiver.
-
- @return The newly added link object.
- */
-- (BITAttributedLabelLink *)addLinkToDate:(NSDate *)date
-                                withRange:(NSRange)range;
-
-/**
- Adds a link to a date with a particular time zone and duration for a specified range in the label text.
-
- @param date The date to be linked to.
- @param timeZone The time zone of the specified date.
- @param duration The duration, in seconds from the specified date.
- @param range The range in the label text of the link. The range must not exceed the bounds of the receiver.
-
- @return The newly added link object.
- */
-- (BITAttributedLabelLink *)addLinkToDate:(NSDate *)date
-                                 timeZone:(NSTimeZone *)timeZone
-                                 duration:(NSTimeInterval)duration
-                                withRange:(NSRange)range;
-
-/**
- Adds a link to transit information for a specified range in the label text.
-
- @param components A dictionary containing the transit components. The currently supported keys are `NSTextCheckingAirlineKey` and `NSTextCheckingFlightKey`.
- @param range The range in the label text of the link. The range must not exceed the bounds of the receiver.
-
- @return The newly added link object.
- */
-- (BITAttributedLabelLink *)addLinkToTransitInformation:(NSDictionary *)components
-                                              withRange:(NSRange)range;
-
-/**
- Returns whether an @c NSTextCheckingResult is found at the give point.
-
- @discussion This can be used together with @c UITapGestureRecognizer to tap interactions with overlapping views.
-
- @param point The point inside the label.
- */
-- (BOOL)containslinkAtPoint:(CGPoint)point;
-
-/**
- Returns the @c BITAttributedLabelLink at the give point if it exists.
-
- @discussion This can be used together with @c UIViewControllerPreviewingDelegate to peek into links.
-
- @param point The point inside the label.
- */
-- (BITAttributedLabelLink *)linkAtPoint:(CGPoint)point;
-
-@end
-
-/**
- The `BITAttributedLabelDelegate` protocol defines the messages sent to an attributed label delegate when links are tapped. All of the methods of this protocol are optional.
- */
-@protocol BITAttributedLabelDelegate <NSObject>
-
-///-----------------------------------
-/// @name Responding to Link Selection
-///-----------------------------------
-@optional
-
-/**
- Tells the delegate that the user did select a link to a URL.
-
- @param label The label whose link was selected.
- @param url The URL for the selected link.
- */
-- (void)attributedLabel:(BITAttributedLabel *)label
-   didSelectLinkWithURL:(NSURL *)url;
-
-/**
- Tells the delegate that the user did select a link to an address.
-
- @param label The label whose link was selected.
- @param addressComponents The components of the address for the selected link.
- */
-- (void)attributedLabel:(BITAttributedLabel *)label
-didSelectLinkWithAddress:(NSDictionary *)addressComponents;
-
-/**
- Tells the delegate that the user did select a link to a phone number.
-
- @param label The label whose link was selected.
- @param phoneNumber The phone number for the selected link.
- */
-- (void)attributedLabel:(BITAttributedLabel *)label
-didSelectLinkWithPhoneNumber:(NSString *)phoneNumber;
-
-/**
- Tells the delegate that the user did select a link to a date.
-
- @param label The label whose link was selected.
- @param date The datefor the selected link.
- */
-- (void)attributedLabel:(BITAttributedLabel *)label
-  didSelectLinkWithDate:(NSDate *)date;
-
-/**
- Tells the delegate that the user did select a link to a date with a time zone and duration.
-
- @param label The label whose link was selected.
- @param date The date for the selected link.
- @param timeZone The time zone of the date for the selected link.
- @param duration The duration, in seconds from the date for the selected link.
- */
-- (void)attributedLabel:(BITAttributedLabel *)label
-  didSelectLinkWithDate:(NSDate *)date
-               timeZone:(NSTimeZone *)timeZone
-               duration:(NSTimeInterval)duration;
-
-/**
- Tells the delegate that the user did select a link to transit information
-
- @param label The label whose link was selected.
- @param components A dictionary containing the transit components. The currently supported keys are `NSTextCheckingAirlineKey` and `NSTextCheckingFlightKey`.
- */
-- (void)attributedLabel:(BITAttributedLabel *)label
-didSelectLinkWithTransitInformation:(NSDictionary *)components;
-
-/**
- Tells the delegate that the user did select a link to a text checking result.
-
- @discussion This method is called if no other delegate method was called, which can occur by either now implementing the method in `BITAttributedLabelDelegate` corresponding to a particular link, or the link was added by passing an instance of a custom `NSTextCheckingResult` subclass into `-addLinkWithTextCheckingResult:`.
-
- @param label The label whose link was selected.
- @param result The custom text checking result.
- */
-- (void)attributedLabel:(BITAttributedLabel *)label
-didSelectLinkWithTextCheckingResult:(NSTextCheckingResult *)result;
-
-///---------------------------------
-/// @name Responding to Long Presses
-///---------------------------------
-
-/**
- *  Long-press delegate methods include the CGPoint tapped within the label's coordinate space.
- *  This may be useful on iPad to present a popover from a specific origin point.
- */
-
-/**
- Tells the delegate that the user long-pressed a link to a URL.
-
- @param label The label whose link was long pressed.
- @param url The URL for the link.
- @param point the point pressed, in the label's coordinate space
- */
-- (void)attributedLabel:(BITAttributedLabel *)label
-didLongPressLinkWithURL:(NSURL *)url
-                atPoint:(CGPoint)point;
-
-/**
- Tells the delegate that the user long-pressed a link to an address.
-
- @param label The label whose link was long pressed.
- @param addressComponents The components of the address for the link.
- @param point the point pressed, in the label's coordinate space
- */
-- (void)attributedLabel:(BITAttributedLabel *)label
-didLongPressLinkWithAddress:(NSDictionary *)addressComponents
-                atPoint:(CGPoint)point;
-
-/**
- Tells the delegate that the user long-pressed a link to a phone number.
-
- @param label The label whose link was long pressed.
- @param phoneNumber The phone number for the link.
- @param point the point pressed, in the label's coordinate space
- */
-- (void)attributedLabel:(BITAttributedLabel *)label
-didLongPressLinkWithPhoneNumber:(NSString *)phoneNumber
-                atPoint:(CGPoint)point;
-
-
-/**
- Tells the delegate that the user long-pressed a link to a date.
-
- @param label The label whose link was long pressed.
- @param date The date for the selected link.
- @param point the point pressed, in the label's coordinate space
- */
-- (void)attributedLabel:(BITAttributedLabel *)label
-didLongPressLinkWithDate:(NSDate *)date
-                atPoint:(CGPoint)point;
-
-
-/**
- Tells the delegate that the user long-pressed a link to a date with a time zone and duration.
-
- @param label The label whose link was long pressed.
- @param date The date for the link.
- @param timeZone The time zone of the date for the link.
- @param duration The duration, in seconds from the date for the link.
- @param point the point pressed, in the label's coordinate space
- */
-- (void)attributedLabel:(BITAttributedLabel *)label
-didLongPressLinkWithDate:(NSDate *)date
-               timeZone:(NSTimeZone *)timeZone
-               duration:(NSTimeInterval)duration
-                atPoint:(CGPoint)point;
-
-
-/**
- Tells the delegate that the user long-pressed a link to transit information.
-
- @param label The label whose link was long pressed.
- @param components A dictionary containing the transit components. The currently supported keys are `NSTextCheckingAirlineKey` and `NSTextCheckingFlightKey`.
- @param point the point pressed, in the label's coordinate space
- */
-- (void)attributedLabel:(BITAttributedLabel *)label
-didLongPressLinkWithTransitInformation:(NSDictionary *)components
-                atPoint:(CGPoint)point;
-
-/**
- Tells the delegate that the user long-pressed a link to a text checking result.
-
- @discussion Similar to `-attributedLabel:didSelectLinkWithTextCheckingResult:`, this method is called if a link is long pressed and the delegate does not implement the method corresponding to this type of link.
-
- @param label The label whose link was long pressed.
- @param result The custom text checking result.
- @param point the point pressed, in the label's coordinate space
- */
-- (void)attributedLabel:(BITAttributedLabel *)label
-didLongPressLinkWithTextCheckingResult:(NSTextCheckingResult *)result
-                atPoint:(CGPoint)point;
-
-@end
-
-@interface BITAttributedLabelLink : NSObject <NSCoding>
-
-typedef void (^BITAttributedLabelLinkBlock) (BITAttributedLabel *, BITAttributedLabelLink *);
-
-/**
- An `NSTextCheckingResult` representing the link's location and type.
- */
-@property (readonly, nonatomic, strong) NSTextCheckingResult *result;
-
-/**
- A dictionary containing the @c NSAttributedString attributes to be applied to the link.
- */
-@property (readonly, nonatomic, copy) NSDictionary *attributes;
-
-/**
- A dictionary containing the @c NSAttributedString attributes to be applied to the link when it is in the active state.
- */
-@property (readonly, nonatomic, copy) NSDictionary *activeAttributes;
-
-/**
- A dictionary containing the @c NSAttributedString attributes to be applied to the link when it is in the inactive state, which is triggered by a change in `tintColor` in iOS 7 and later.
- */
-@property (readonly, nonatomic, copy) NSDictionary *inactiveAttributes;
-
-/**
- Additional information about a link for VoiceOver users. Has default values if the link's @c result is @c NSTextCheckingTypeLink, @c NSTextCheckingTypePhoneNumber, or @c NSTextCheckingTypeDate.
- */
-@property (nonatomic, copy) NSString *accessibilityValue;
-
-/**
- A block called when this link is tapped.
- If non-nil, tapping on this link will call this block instead of the
- @c BITAttributedLabelDelegate tap methods, which will not be called for this link.
- */
-@property (nonatomic, copy) BITAttributedLabelLinkBlock linkTapBlock;
-
-/**
- A block called when this link is long-pressed.
- If non-nil, long pressing on this link will call this block instead of the
- @c BITAttributedLabelDelegate long press methods, which will not be called for this link.
- */
-@property (nonatomic, copy) BITAttributedLabelLinkBlock linkLongPressBlock;
-
-/**
- Initializes a link using the attribute dictionaries specified.
-
- @param attributes         The @c attributes property for the link.
- @param activeAttributes   The @c activeAttributes property for the link.
- @param inactiveAttributes The @c inactiveAttributes property for the link.
- @param result             An @c NSTextCheckingResult representing the link's location and type.
-
- @return The initialized link object.
- */
-- (instancetype)initWithAttributes:(NSDictionary *)attributes
-                  activeAttributes:(NSDictionary *)activeAttributes
-                inactiveAttributes:(NSDictionary *)inactiveAttributes
-                textCheckingResult:(NSTextCheckingResult *)result;
-
-/**
- Initializes a link using the attribute dictionaries set on a specified label.
-
- @param label  The attributed label from which to inherit attribute dictionaries.
- @param result An @c NSTextCheckingResult representing the link's location and type.
-
- @return The initialized link object.
- */
-- (instancetype)initWithAttributesFromLabel:(BITAttributedLabel*)label
-                         textCheckingResult:(NSTextCheckingResult *)result;
-
-@end
diff --git a/submodules/HockeySDK-iOS/Classes/BITAttributedLabel.m b/submodules/HockeySDK-iOS/Classes/BITAttributedLabel.m
deleted file mode 100644
index 0e48cea48b..0000000000
--- a/submodules/HockeySDK-iOS/Classes/BITAttributedLabel.m
+++ /dev/null
@@ -1,1850 +0,0 @@
-// TTTAttributedLabel.m
-//
-// Copyright (c) 2011 Mattt Thompson (http://mattt.me)
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-#import "HockeySDK.h"
-
-#if HOCKEYSDK_FEATURE_FEEDBACK
-
-#import "BITAttributedLabel.h"
-
-#import <QuartzCore/QuartzCore.h>
-#import <Availability.h>
-#import <objc/runtime.h>
-
-#define kBITLineBreakWordWrapTextWidthScalingFactor (M_PI / M_E)
-
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
-#pragma clang diagnostic ignored "-Wunused-variable"
-#pragma clang diagnostic ignored "-Wunused-parameter"
-#pragma clang diagnostic ignored "-Wcast-qual"
-#pragma clang diagnostic ignored "-Wdouble-promotion"
-#pragma clang diagnostic ignored "-Wdirect-ivar-access"
-#pragma clang diagnostic ignored "-Wnullable-to-nonnull-conversion"
-#pragma clang diagnostic ignored "-Wvla"
-
-static CGFloat const BITFLOAT_MAX = 100000;
-
-NSString * const kBITStrikeOutAttributeName = @"BITStrikeOutAttribute";
-NSString * const kBITBackgroundFillColorAttributeName = @"BITBackgroundFillColor";
-NSString * const kBITBackgroundFillPaddingAttributeName = @"BITBackgroundFillPadding";
-NSString * const kBITBackgroundStrokeColorAttributeName = @"BITBackgroundStrokeColor";
-NSString * const kBITBackgroundLineWidthAttributeName = @"BITBackgroundLineWidth";
-NSString * const kBITBackgroundCornerRadiusAttributeName = @"BITBackgroundCornerRadius";
-
-static const NSTextAlignment BITTextAlignmentLeft = NSTextAlignmentLeft;
-static const NSTextAlignment BITTextAlignmentCenter = NSTextAlignmentCenter;
-static const NSTextAlignment BITTextAlignmentRight = NSTextAlignmentRight;
-static const NSTextAlignment BITTextAlignmentJustified = NSTextAlignmentJustified;
-static const NSTextAlignment BITTextAlignmentNatural = NSTextAlignmentNatural;
-
-static const NSLineBreakMode BITLineBreakByWordWrapping = NSLineBreakByWordWrapping;
-static const NSLineBreakMode BITLineBreakByCharWrapping = NSLineBreakByCharWrapping;
-static const NSLineBreakMode BITLineBreakByClipping = NSLineBreakByClipping;
-static const NSLineBreakMode BITLineBreakByTruncatingHead = NSLineBreakByTruncatingHead;
-static const NSLineBreakMode BITLineBreakByTruncatingMiddle = NSLineBreakByTruncatingMiddle;
-static const NSLineBreakMode BITLineBreakByTruncatingTail = NSLineBreakByTruncatingTail;
-
-typedef NSTextAlignment BITTextAlignment;
-typedef NSLineBreakMode BITLineBreakMode;
-
-
-static inline CGFLOAT_TYPE CGFloat_ceil(CGFLOAT_TYPE cgfloat) {
-#if CGFLOAT_IS_DOUBLE
-    return ceil(cgfloat);
-#else
-    return ceilf(cgfloat);
-#endif
-}
-
-static inline CGFLOAT_TYPE CGFloat_floor(CGFLOAT_TYPE cgfloat) {
-#if CGFLOAT_IS_DOUBLE
-    return floor(cgfloat);
-#else
-    return floorf(cgfloat);
-#endif
-}
-
-static inline CGFLOAT_TYPE CGFloat_round(CGFLOAT_TYPE cgfloat) {
-#if CGFLOAT_IS_DOUBLE
-    return round(cgfloat);
-#else
-    return roundf(cgfloat);
-#endif
-}
-
-static inline CGFLOAT_TYPE CGFloat_sqrt(CGFLOAT_TYPE cgfloat) {
-#if CGFLOAT_IS_DOUBLE
-    return sqrt(cgfloat);
-#else
-    return sqrtf(cgfloat);
-#endif
-}
-
-static inline CGFloat BITFlushFactorForTextAlignment(NSTextAlignment textAlignment) {
-    switch (textAlignment) {
-        case BITTextAlignmentCenter:
-            return 0.5f;
-        case BITTextAlignmentRight:
-            return 1.0f;
-        case BITTextAlignmentLeft:
-        default:
-            return 0.0f;
-    }
-}
-
-static inline NSDictionary * NSAttributedStringAttributesFromLabel(BITAttributedLabel *label) {
-    NSMutableDictionary *mutableAttributes = [NSMutableDictionary dictionary];
-
-    [mutableAttributes setObject:label.font forKey:(NSString *)kCTFontAttributeName];
-    [mutableAttributes setObject:label.textColor forKey:(NSString *)kCTForegroundColorAttributeName];
-    [mutableAttributes setObject:@(label.kern) forKey:(NSString *)kCTKernAttributeName];
-
-    NSMutableParagraphStyle *paragraphStyle = [[NSMutableParagraphStyle alloc] init];
-    paragraphStyle.alignment = label.textAlignment;
-    paragraphStyle.lineSpacing = label.lineSpacing;
-    paragraphStyle.minimumLineHeight = label.minimumLineHeight > 0 ? label.minimumLineHeight : label.font.lineHeight * label.lineHeightMultiple;
-    paragraphStyle.maximumLineHeight = label.maximumLineHeight > 0 ? label.maximumLineHeight : label.font.lineHeight * label.lineHeightMultiple;
-    paragraphStyle.lineHeightMultiple = label.lineHeightMultiple;
-    paragraphStyle.firstLineHeadIndent = label.firstLineIndent;
-
-    if (label.numberOfLines == 1) {
-        paragraphStyle.lineBreakMode = label.lineBreakMode;
-    } else {
-        paragraphStyle.lineBreakMode = NSLineBreakByWordWrapping;
-    }
-
-    [mutableAttributes setObject:paragraphStyle forKey:(NSString *)kCTParagraphStyleAttributeName];
-
-    return [NSDictionary dictionaryWithDictionary:mutableAttributes];
-}
-
-static inline CGColorRef CGColorRefFromColor(id color);
-static inline NSDictionary * convertNSAttributedStringAttributesToCTAttributes(NSDictionary *attributes);
-
-static inline NSAttributedString * NSAttributedStringByScalingFontSize(NSAttributedString *attributedString, CGFloat scale) {
-    NSMutableAttributedString *mutableAttributedString = [attributedString mutableCopy];
-    [mutableAttributedString enumerateAttribute:(NSString *)kCTFontAttributeName inRange:NSMakeRange(0, [mutableAttributedString length]) options:0 usingBlock:^(id value, NSRange range, BOOL * __unused stop) {
-        UIFont *font = (UIFont *)value;
-        if (font) {
-            NSString *fontName;
-            CGFloat pointSize;
-
-            if ([font isKindOfClass:[UIFont class]]) {
-                fontName = font.fontName;
-                pointSize = font.pointSize;
-            } else {
-                fontName = (NSString *)CFBridgingRelease(CTFontCopyName((__bridge CTFontRef)font, kCTFontPostScriptNameKey));
-                pointSize = CTFontGetSize((__bridge CTFontRef)font);
-            }
-
-            [mutableAttributedString removeAttribute:(NSString *)kCTFontAttributeName range:range];
-            CTFontRef fontRef = CTFontCreateWithName((__bridge CFStringRef)fontName, CGFloat_floor(pointSize * scale), NULL);
-            [mutableAttributedString addAttribute:(NSString *)kCTFontAttributeName value:(__bridge id)fontRef range:range];
-            CFRelease(fontRef);
-        }
-    }];
-
-    return mutableAttributedString;
-}
-
-static inline NSAttributedString * NSAttributedStringBySettingColorFromContext(NSAttributedString *attributedString, UIColor *color) {
-    if (!color) {
-        return attributedString;
-    }
-
-    NSMutableAttributedString *mutableAttributedString = [attributedString mutableCopy];
-    [mutableAttributedString enumerateAttribute:(NSString *)kCTForegroundColorFromContextAttributeName inRange:NSMakeRange(0, [mutableAttributedString length]) options:0 usingBlock:^(id value, NSRange range, __unused BOOL *stop) {
-        BOOL usesColorFromContext = (BOOL)value;
-        if (usesColorFromContext) {
-            [mutableAttributedString setAttributes:[NSDictionary dictionaryWithObject:color forKey:(NSString *)kCTForegroundColorAttributeName] range:range];
-            [mutableAttributedString removeAttribute:(NSString *)kCTForegroundColorFromContextAttributeName range:range];
-        }
-    }];
-
-    return mutableAttributedString;
-}
-
-static inline CGSize CTFramesetterSuggestFrameSizeForAttributedStringWithConstraints(CTFramesetterRef framesetter, NSAttributedString *attributedString, CGSize size, NSUInteger numberOfLines) {
-    CFRange rangeToSize = CFRangeMake(0, (CFIndex)[attributedString length]);
-    CGSize constraints = CGSizeMake(size.width, BITFLOAT_MAX);
-
-    if (numberOfLines == 1) {
-        // If there is one line, the size that fits is the full width of the line
-        constraints = CGSizeMake(BITFLOAT_MAX, BITFLOAT_MAX);
-    } else if (numberOfLines > 0) {
-        // If the line count of the label more than 1, limit the range to size to the number of lines that have been set
-        CGMutablePathRef path = CGPathCreateMutable();
-        CGPathAddRect(path, NULL, CGRectMake(0.0f, 0.0f, constraints.width, BITFLOAT_MAX));
-        CTFrameRef frame = CTFramesetterCreateFrame(framesetter, CFRangeMake(0, 0), path, NULL);
-        CFArrayRef lines = CTFrameGetLines(frame);
-
-        if (CFArrayGetCount(lines) > 0) {
-            NSInteger lastVisibleLineIndex = MIN((CFIndex)numberOfLines, CFArrayGetCount(lines)) - 1;
-            CTLineRef lastVisibleLine = CFArrayGetValueAtIndex(lines, lastVisibleLineIndex);
-
-            CFRange rangeToLayout = CTLineGetStringRange(lastVisibleLine);
-            rangeToSize = CFRangeMake(0, rangeToLayout.location + rangeToLayout.length);
-        }
-
-        CFRelease(frame);
-        CGPathRelease(path);
-    }
-
-    CGSize suggestedSize = CTFramesetterSuggestFrameSizeWithConstraints(framesetter, rangeToSize, NULL, constraints, NULL);
-
-    return CGSizeMake(CGFloat_ceil(suggestedSize.width), CGFloat_ceil(suggestedSize.height));
-}
-
-@interface BITAccessibilityElement : UIAccessibilityElement
-@property (nonatomic, weak) UIView *superview;
-@property (nonatomic, assign) CGRect boundingRect;
-@end
-
-@implementation BITAccessibilityElement
-
-- (CGRect)accessibilityFrame {
-    return UIAccessibilityConvertFrameToScreenCoordinates(self.boundingRect, self.superview);
-}
-
-@end
-
-@interface BITAttributedLabel ()
-@property (readwrite, nonatomic, copy) NSAttributedString *inactiveAttributedText;
-@property (readwrite, nonatomic, copy) NSAttributedString *renderedAttributedText;
-@property (readwrite, atomic, strong) NSDataDetector *dataDetector;
-@property (readwrite, nonatomic, strong) NSArray *linkModels;
-@property (readwrite, nonatomic, strong) BITAttributedLabelLink *activeLink;
-@property (readwrite, nonatomic, strong) NSArray *accessibilityElements;
-
-- (void) longPressGestureDidFire:(UILongPressGestureRecognizer *)sender;
-@end
-
-@implementation BITAttributedLabel {
-@private
-    BOOL _needsFramesetter;
-    CTFramesetterRef _framesetter;
-    CTFramesetterRef _highlightFramesetter;
-}
-
-@dynamic text;
-@synthesize attributedText = _attributedText;
-
-#ifndef kCFCoreFoundationVersionNumber_iOS_7_0
-#define kCFCoreFoundationVersionNumber_iOS_7_0 847.2
-#endif
-
-+ (void)load {
-    static dispatch_once_t onceToken;
-    dispatch_once(&onceToken, ^{
-        if (kCFCoreFoundationVersionNumber < kCFCoreFoundationVersionNumber_iOS_7_0) {
-            Class class = [self class];
-            Class superclass = class_getSuperclass(class);
-
-            NSArray *strings = @[
-                                 NSStringFromSelector(@selector(isAccessibilityElement)),
-                                 NSStringFromSelector(@selector(accessibilityElementCount)),
-                                 NSStringFromSelector(@selector(accessibilityElementAtIndex:)),
-                                 NSStringFromSelector(@selector(indexOfAccessibilityElement:)),
-                                 ];
-
-            for (NSString *string in strings) {
-                SEL selector = NSSelectorFromString(string);
-                IMP superImplementation = class_getMethodImplementation(superclass, selector);
-                Method method = class_getInstanceMethod(class, selector);
-                const char *types = method_getTypeEncoding(method);
-                class_replaceMethod(class, selector, superImplementation, types);
-            }
-        }
-    });
-}
-
-- (instancetype)initWithFrame:(CGRect)frame {
-    self = [super initWithFrame:frame];
-    if (!self) {
-        return nil;
-    }
-
-    [self commonInit];
-
-    return self;
-}
-
-- (void)commonInit {
-    self.userInteractionEnabled = YES;
-#if !TARGET_OS_TV
-    self.multipleTouchEnabled = NO;
-#endif
-
-    self.textInsets = UIEdgeInsetsZero;
-    self.lineHeightMultiple = 1.0f;
-
-    self.linkModels = [NSArray array];
-
-    self.linkBackgroundEdgeInset = UIEdgeInsetsMake(0.0f, -1.0f, 0.0f, -1.0f);
-
-    NSMutableDictionary *mutableLinkAttributes = [NSMutableDictionary dictionary];
-    [mutableLinkAttributes setObject:[NSNumber numberWithBool:YES] forKey:(NSString *)kCTUnderlineStyleAttributeName];
-
-    NSMutableDictionary *mutableActiveLinkAttributes = [NSMutableDictionary dictionary];
-    [mutableActiveLinkAttributes setObject:[NSNumber numberWithBool:NO] forKey:(NSString *)kCTUnderlineStyleAttributeName];
-
-    NSMutableDictionary *mutableInactiveLinkAttributes = [NSMutableDictionary dictionary];
-    [mutableInactiveLinkAttributes setObject:[NSNumber numberWithBool:NO] forKey:(NSString *)kCTUnderlineStyleAttributeName];
-
-    if ([NSMutableParagraphStyle class]) {
-        [mutableLinkAttributes setObject:[UIColor blueColor] forKey:(NSString *)kCTForegroundColorAttributeName];
-        [mutableActiveLinkAttributes setObject:[UIColor redColor] forKey:(NSString *)kCTForegroundColorAttributeName];
-        [mutableInactiveLinkAttributes setObject:[UIColor grayColor] forKey:(NSString *)kCTForegroundColorAttributeName];
-    } else {
-        [mutableLinkAttributes setObject:(__bridge id)[[UIColor blueColor] CGColor] forKey:(NSString *)kCTForegroundColorAttributeName];
-        [mutableActiveLinkAttributes setObject:(__bridge id)[[UIColor redColor] CGColor] forKey:(NSString *)kCTForegroundColorAttributeName];
-        [mutableInactiveLinkAttributes setObject:(__bridge id)[[UIColor grayColor] CGColor] forKey:(NSString *)kCTForegroundColorAttributeName];
-    }
-
-    self.linkAttributes = [NSDictionary dictionaryWithDictionary:mutableLinkAttributes];
-    self.activeLinkAttributes = [NSDictionary dictionaryWithDictionary:mutableActiveLinkAttributes];
-    self.inactiveLinkAttributes = [NSDictionary dictionaryWithDictionary:mutableInactiveLinkAttributes];
-    _extendsLinkTouchArea = NO;
-    _longPressGestureRecognizer = [[UILongPressGestureRecognizer alloc] initWithTarget:self
-                                                                                action:@selector(longPressGestureDidFire:)];
-    self.longPressGestureRecognizer.delegate = self;
-    [self addGestureRecognizer:self.longPressGestureRecognizer];
-}
-
-- (void)dealloc {
-    if (_framesetter) {
-        CFRelease(_framesetter);
-    }
-
-    if (_highlightFramesetter) {
-        CFRelease(_highlightFramesetter);
-    }
-
-    if (_longPressGestureRecognizer) {
-        [self removeGestureRecognizer:_longPressGestureRecognizer];
-    }
-}
-
-#pragma mark -
-
-+ (CGSize)sizeThatFitsAttributedString:(NSAttributedString *)attributedString
-                       withConstraints:(CGSize)size
-                limitedToNumberOfLines:(NSUInteger)numberOfLines
-{
-    if (!attributedString || attributedString.length == 0) {
-        return CGSizeZero;
-    }
-
-    CTFramesetterRef framesetter = CTFramesetterCreateWithAttributedString((__bridge CFAttributedStringRef)attributedString);
-
-    CGSize calculatedSize = CTFramesetterSuggestFrameSizeForAttributedStringWithConstraints(framesetter, attributedString, size, numberOfLines);
-
-    CFRelease(framesetter);
-
-    return calculatedSize;
-}
-
-#pragma mark -
-
-- (void)setAttributedText:(NSAttributedString *)text {
-    if ([text isEqualToAttributedString:_attributedText]) {
-        return;
-    }
-
-    _attributedText = [text copy];
-
-    [self setNeedsFramesetter];
-    [self setNeedsDisplay];
-
-    if ([self respondsToSelector:@selector(invalidateIntrinsicContentSize)]) {
-        [self invalidateIntrinsicContentSize];
-    }
-
-    [super setText:[self.attributedText string]];
-}
-
-- (NSAttributedString *)renderedAttributedText {
-    if (!_renderedAttributedText) {
-        NSMutableAttributedString *fullString = [[NSMutableAttributedString alloc] initWithAttributedString:self.attributedText];
-
-        if (self.attributedTruncationToken) {
-            [fullString appendAttributedString:self.attributedTruncationToken];
-        }
-
-        NSAttributedString *string = [[NSAttributedString alloc] initWithAttributedString:fullString];
-        self.renderedAttributedText = NSAttributedStringBySettingColorFromContext(string, self.textColor);
-    }
-
-    return _renderedAttributedText;
-}
-
-- (NSArray *) links {
-    return [_linkModels valueForKey:@"result"];
-}
-
-- (void)setLinkModels:(NSArray *)linkModels {
-    _linkModels = linkModels;
-
-    self.accessibilityElements = nil;
-}
-
-- (void)setNeedsFramesetter {
-    // Reset the rendered attributed text so it has a chance to regenerate
-    self.renderedAttributedText = nil;
-
-    _needsFramesetter = YES;
-}
-
-- (CTFramesetterRef)framesetter {
-    if (_needsFramesetter) {
-        @synchronized(self) {
-            CTFramesetterRef framesetter = CTFramesetterCreateWithAttributedString((__bridge CFAttributedStringRef)self.renderedAttributedText);
-            [self setFramesetter:framesetter];
-            [self setHighlightFramesetter:nil];
-            _needsFramesetter = NO;
-
-            if (framesetter) {
-                CFRelease(framesetter);
-            }
-        }
-    }
-
-    return _framesetter;
-}
-
-- (void)setFramesetter:(CTFramesetterRef)framesetter {
-    if (framesetter) {
-        CFRetain(framesetter);
-    }
-
-    if (_framesetter) {
-        CFRelease(_framesetter);
-    }
-
-    _framesetter = framesetter;
-}
-
-- (CTFramesetterRef)highlightFramesetter {
-    return _highlightFramesetter;
-}
-
-- (void)setHighlightFramesetter:(CTFramesetterRef)highlightFramesetter {
-    if (highlightFramesetter) {
-        CFRetain(highlightFramesetter);
-    }
-
-    if (_highlightFramesetter) {
-        CFRelease(_highlightFramesetter);
-    }
-
-    _highlightFramesetter = highlightFramesetter;
-}
-
-#pragma mark -
-
-- (void)setEnabledTextCheckingTypes:(NSTextCheckingTypes)enabledTextCheckingTypes {
-    if (self.enabledTextCheckingTypes == enabledTextCheckingTypes) {
-        return;
-    }
-
-    _enabledTextCheckingTypes = enabledTextCheckingTypes;
-
-    // one detector instance per type (combination), fast reuse e.g. in cells
-    static NSMutableDictionary *dataDetectorsByType = nil;
-
-    if (!dataDetectorsByType) {
-        dataDetectorsByType = [NSMutableDictionary dictionary];
-    }
-
-    if (enabledTextCheckingTypes) {
-        if (![dataDetectorsByType objectForKey:@(enabledTextCheckingTypes)]) {
-            NSDataDetector *detector = [NSDataDetector dataDetectorWithTypes:enabledTextCheckingTypes
-                                                                       error:nil];
-            if (detector) {
-                [dataDetectorsByType setObject:detector forKey:@(enabledTextCheckingTypes)];
-            }
-        }
-        self.dataDetector = [dataDetectorsByType objectForKey:@(enabledTextCheckingTypes)];
-    } else {
-        self.dataDetector = nil;
-    }
-}
-
-- (void)addLink:(BITAttributedLabelLink *)link {
-    [self addLinks:@[link]];
-}
-
-- (void)addLinks:(NSArray *)links {
-    NSMutableArray *mutableLinkModels = [NSMutableArray arrayWithArray:self.linkModels];
-
-    NSMutableAttributedString *mutableAttributedString = [self.attributedText mutableCopy];
-
-    for (BITAttributedLabelLink *link in links) {
-        if (link.attributes) {
-            [mutableAttributedString addAttributes:link.attributes range:link.result.range];
-        }
-    }
-
-    self.attributedText = mutableAttributedString;
-    [self setNeedsDisplay];
-
-    [mutableLinkModels addObjectsFromArray:links];
-
-    self.linkModels = [NSArray arrayWithArray:mutableLinkModels];
-}
-
-- (BITAttributedLabelLink *)addLinkWithTextCheckingResult:(NSTextCheckingResult *)result
-                                               attributes:(NSDictionary *)attributes
-{
-    return [self addLinksWithTextCheckingResults:@[result] attributes:attributes].firstObject;
-}
-
-- (NSArray *)addLinksWithTextCheckingResults:(NSArray *)results
-                                  attributes:(NSDictionary *)attributes
-{
-    NSMutableArray *links = [NSMutableArray array];
-
-    for (NSTextCheckingResult *result in results) {
-        NSDictionary *activeAttributes = attributes ? self.activeLinkAttributes : nil;
-        NSDictionary *inactiveAttributes = attributes ? self.inactiveLinkAttributes : nil;
-
-        BITAttributedLabelLink *link = [[BITAttributedLabelLink alloc] initWithAttributes:attributes
-                                                                         activeAttributes:activeAttributes
-                                                                       inactiveAttributes:inactiveAttributes
-                                                                       textCheckingResult:result];
-
-        [links addObject:link];
-    }
-
-    [self addLinks:links];
-
-    return links;
-}
-
-- (BITAttributedLabelLink *)addLinkWithTextCheckingResult:(NSTextCheckingResult *)result {
-    return [self addLinkWithTextCheckingResult:result attributes:self.linkAttributes];
-}
-
-- (BITAttributedLabelLink *)addLinkToURL:(NSURL *)url
-                               withRange:(NSRange)range
-{
-    return [self addLinkWithTextCheckingResult:[NSTextCheckingResult linkCheckingResultWithRange:range URL:url]];
-}
-
-- (BITAttributedLabelLink *)addLinkToAddress:(NSDictionary *)addressComponents
-                                   withRange:(NSRange)range
-{
-    return [self addLinkWithTextCheckingResult:[NSTextCheckingResult addressCheckingResultWithRange:range components:addressComponents]];
-}
-
-- (BITAttributedLabelLink *)addLinkToPhoneNumber:(NSString *)phoneNumber
-                                       withRange:(NSRange)range
-{
-    return [self addLinkWithTextCheckingResult:[NSTextCheckingResult phoneNumberCheckingResultWithRange:range phoneNumber:phoneNumber]];
-}
-
-- (BITAttributedLabelLink *)addLinkToDate:(NSDate *)date
-                                withRange:(NSRange)range
-{
-    return [self addLinkWithTextCheckingResult:[NSTextCheckingResult dateCheckingResultWithRange:range date:date]];
-}
-
-- (BITAttributedLabelLink *)addLinkToDate:(NSDate *)date
-                                 timeZone:(NSTimeZone *)timeZone
-                                 duration:(NSTimeInterval)duration
-                                withRange:(NSRange)range
-{
-    return [self addLinkWithTextCheckingResult:[NSTextCheckingResult dateCheckingResultWithRange:range date:date timeZone:timeZone duration:duration]];
-}
-
-- (BITAttributedLabelLink *)addLinkToTransitInformation:(NSDictionary *)components
-                                              withRange:(NSRange)range
-{
-    return [self addLinkWithTextCheckingResult:[NSTextCheckingResult transitInformationCheckingResultWithRange:range components:components]];
-}
-
-#pragma mark -
-
-- (BOOL)containslinkAtPoint:(CGPoint)point {
-    return [self linkAtPoint:point] != nil;
-}
-
-- (BITAttributedLabelLink *)linkAtPoint:(CGPoint)point {
-
-    // Stop quickly if none of the points to be tested are in the bounds.
-    if (!CGRectContainsPoint(CGRectInset(self.bounds, -15.f, -15.f), point) || self.links.count == 0) {
-        return nil;
-    }
-
-    BITAttributedLabelLink *result = [self linkAtCharacterIndex:[self characterIndexAtPoint:point]];
-
-    if (!result && self.extendsLinkTouchArea) {
-        result = [self linkAtRadius:2.5f aroundPoint:point]
-        ?: [self linkAtRadius:5.f aroundPoint:point]
-        ?: [self linkAtRadius:7.5f aroundPoint:point]
-        ?: [self linkAtRadius:12.5f aroundPoint:point]
-        ?: [self linkAtRadius:15.f aroundPoint:point];
-    }
-
-    return result;
-}
-
-- (BITAttributedLabelLink *)linkAtRadius:(const CGFloat)radius aroundPoint:(CGPoint)point {
-    const CGFloat diagonal = CGFloat_sqrt(2 * radius * radius);
-    const CGPoint deltas[] = {
-        CGPointMake(0, -radius), CGPointMake(0, radius), // Above and below
-        CGPointMake(-radius, 0), CGPointMake(radius, 0), // Beside
-        CGPointMake(-diagonal, -diagonal), CGPointMake(-diagonal, diagonal),
-        CGPointMake(diagonal, diagonal), CGPointMake(diagonal, -diagonal) // Diagonal
-    };
-    const size_t count = sizeof(deltas) / sizeof(CGPoint);
-
-    BITAttributedLabelLink *link = nil;
-
-    for (NSUInteger i = 0; i < count && link.result == nil; i ++) {
-        CGPoint currentPoint = CGPointMake(point.x + deltas[i].x, point.y + deltas[i].y);
-        link = [self linkAtCharacterIndex:[self characterIndexAtPoint:currentPoint]];
-    }
-
-    return link;
-}
-
-- (BITAttributedLabelLink *)linkAtCharacterIndex:(CFIndex)idx {
-    // Do not enumerate if the index is outside of the bounds of the text.
-    if (!NSLocationInRange((NSUInteger)idx, NSMakeRange(0, self.attributedText.length))) {
-        return nil;
-    }
-
-    NSEnumerator *enumerator = [self.linkModels reverseObjectEnumerator];
-    BITAttributedLabelLink *link = nil;
-    while ((link = [enumerator nextObject])) {
-        if (NSLocationInRange((NSUInteger)idx, link.result.range)) {
-            return link;
-        }
-    }
-
-    return nil;
-}
-
-- (CFIndex)characterIndexAtPoint:(CGPoint)p {
-    if (!CGRectContainsPoint(self.bounds, p)) {
-        return NSNotFound;
-    }
-
-    CGRect textRect = [self textRectForBounds:self.bounds limitedToNumberOfLines:self.numberOfLines];
-    if (!CGRectContainsPoint(textRect, p)) {
-        return NSNotFound;
-    }
-
-    // Offset tap coordinates by textRect origin to make them relative to the origin of frame
-    p = CGPointMake(p.x - textRect.origin.x, p.y - textRect.origin.y);
-    // Convert tap coordinates (start at top left) to CT coordinates (start at bottom left)
-    p = CGPointMake(p.x, textRect.size.height - p.y);
-
-    CGMutablePathRef path = CGPathCreateMutable();
-    CGPathAddRect(path, NULL, textRect);
-    CTFrameRef frame = CTFramesetterCreateFrame([self framesetter], CFRangeMake(0, (CFIndex)[self.attributedText length]), path, NULL);
-    if (frame == NULL) {
-        CGPathRelease(path);
-        return NSNotFound;
-    }
-
-    CFArrayRef lines = CTFrameGetLines(frame);
-    NSInteger numberOfLines = self.numberOfLines > 0 ? MIN(self.numberOfLines, CFArrayGetCount(lines)) : CFArrayGetCount(lines);
-    if (numberOfLines == 0) {
-        CFRelease(frame);
-        CGPathRelease(path);
-        return NSNotFound;
-    }
-
-    CFIndex idx = NSNotFound;
-
-    CGPoint lineOrigins[numberOfLines];
-    CTFrameGetLineOrigins(frame, CFRangeMake(0, numberOfLines), lineOrigins);
-
-    for (CFIndex lineIndex = 0; lineIndex < numberOfLines; lineIndex++) {
-        CGPoint lineOrigin = lineOrigins[lineIndex];
-        CTLineRef line = CFArrayGetValueAtIndex(lines, lineIndex);
-
-        // Get bounding information of line
-        CGFloat ascent = 0.0f, descent = 0.0f, leading = 0.0f;
-        CGFloat width = (CGFloat)CTLineGetTypographicBounds(line, &ascent, &descent, &leading);
-        CGFloat yMin = (CGFloat)floor(lineOrigin.y - descent);
-        CGFloat yMax = (CGFloat)ceil(lineOrigin.y + ascent);
-
-        // Apply penOffset using flushFactor for horizontal alignment to set lineOrigin since this is the horizontal offset from drawFramesetter
-        CGFloat flushFactor = BITFlushFactorForTextAlignment(self.textAlignment);
-        CGFloat penOffset = (CGFloat)CTLineGetPenOffsetForFlush(line, flushFactor, textRect.size.width);
-        lineOrigin.x = penOffset;
-
-        // Check if we've already passed the line
-        if (p.y > yMax) {
-            break;
-        }
-        // Check if the point is within this line vertically
-        if (p.y >= yMin) {
-            // Check if the point is within this line horizontally
-            if (p.x >= lineOrigin.x && p.x <= lineOrigin.x + width) {
-                // Convert CT coordinates to line-relative coordinates
-                CGPoint relativePoint = CGPointMake(p.x - lineOrigin.x, p.y - lineOrigin.y);
-                idx = CTLineGetStringIndexForPosition(line, relativePoint);
-                break;
-            }
-        }
-    }
-
-    CFRelease(frame);
-    CGPathRelease(path);
-
-    return idx;
-}
-
-- (CGRect)boundingRectForCharacterRange:(NSRange)range {
-    NSMutableAttributedString *mutableAttributedString = [self.attributedText mutableCopy];
-
-    NSTextStorage *textStorage = [[NSTextStorage alloc] initWithAttributedString:mutableAttributedString];
-
-    NSLayoutManager *layoutManager = [[NSLayoutManager alloc] init];
-    [textStorage addLayoutManager:layoutManager];
-
-    NSTextContainer *textContainer = [[NSTextContainer alloc] initWithSize:self.bounds.size];
-    [layoutManager addTextContainer:textContainer];
-
-    NSRange glyphRange;
-    [layoutManager characterRangeForGlyphRange:range actualGlyphRange:&glyphRange];
-
-    return [layoutManager boundingRectForGlyphRange:glyphRange inTextContainer:textContainer];
-}
-
-- (void)drawFramesetter:(CTFramesetterRef)framesetter
-       attributedString:(NSAttributedString *)attributedString
-              textRange:(CFRange)textRange
-                 inRect:(CGRect)rect
-                context:(CGContextRef)c
-{
-    CGMutablePathRef path = CGPathCreateMutable();
-    CGPathAddRect(path, NULL, rect);
-    CTFrameRef frame = CTFramesetterCreateFrame(framesetter, textRange, path, NULL);
-
-    [self drawBackground:frame inRect:rect context:c];
-
-    CFArrayRef lines = CTFrameGetLines(frame);
-    NSInteger numberOfLines = self.numberOfLines > 0 ? MIN(self.numberOfLines, CFArrayGetCount(lines)) : CFArrayGetCount(lines);
-    BOOL truncateLastLine = (self.lineBreakMode == BITLineBreakByTruncatingHead || self.lineBreakMode == BITLineBreakByTruncatingMiddle || self.lineBreakMode == BITLineBreakByTruncatingTail);
-
-    CGPoint lineOrigins[numberOfLines];
-    CTFrameGetLineOrigins(frame, CFRangeMake(0, numberOfLines), lineOrigins);
-
-    for (CFIndex lineIndex = 0; lineIndex < numberOfLines; lineIndex++) {
-        CGPoint lineOrigin = lineOrigins[lineIndex];
-        CGContextSetTextPosition(c, lineOrigin.x, lineOrigin.y);
-        CTLineRef line = CFArrayGetValueAtIndex(lines, lineIndex);
-
-        CGFloat descent = 0.0f;
-        CTLineGetTypographicBounds((CTLineRef)line, NULL, &descent, NULL);
-
-        // Adjust pen offset for flush depending on text alignment
-        CGFloat flushFactor = BITFlushFactorForTextAlignment(self.textAlignment);
-
-        if (lineIndex == numberOfLines - 1 && truncateLastLine) {
-            // Check if the range of text in the last line reaches the end of the full attributed string
-            CFRange lastLineRange = CTLineGetStringRange(line);
-
-            if (!(lastLineRange.length == 0 && lastLineRange.location == 0) && lastLineRange.location + lastLineRange.length < textRange.location + textRange.length) {
-                // Get correct truncationType and attribute position
-                CTLineTruncationType truncationType;
-                CFIndex truncationAttributePosition = lastLineRange.location;
-                BITLineBreakMode lineBreakMode = self.lineBreakMode;
-
-                // Multiple lines, only use UILineBreakModeTailTruncation
-                if (numberOfLines != 1) {
-                    lineBreakMode = BITLineBreakByTruncatingTail;
-                }
-
-                switch (lineBreakMode) {
-                    case BITLineBreakByTruncatingHead:
-                        truncationType = kCTLineTruncationStart;
-                        break;
-                    case BITLineBreakByTruncatingMiddle:
-                        truncationType = kCTLineTruncationMiddle;
-                        truncationAttributePosition += (lastLineRange.length / 2);
-                        break;
-                    case BITLineBreakByTruncatingTail:
-                    default:
-                        truncationType = kCTLineTruncationEnd;
-                        truncationAttributePosition += (lastLineRange.length - 1);
-                        break;
-                }
-
-                NSAttributedString *attributedTruncationString = self.attributedTruncationToken;
-                if (!attributedTruncationString) {
-                    NSString *truncationTokenString = @"\u2026"; // Unicode Character 'HORIZONTAL ELLIPSIS' (U+2026)
-
-                    NSDictionary *truncationTokenStringAttributes = truncationTokenStringAttributes = [attributedString attributesAtIndex:(NSUInteger)truncationAttributePosition effectiveRange:NULL];
-
-                    attributedTruncationString = [[NSAttributedString alloc] initWithString:truncationTokenString attributes:truncationTokenStringAttributes];
-                }
-                CTLineRef truncationToken = CTLineCreateWithAttributedString((__bridge CFAttributedStringRef)attributedTruncationString);
-
-                // Append truncationToken to the string
-                // because if string isn't too long, CT won't add the truncationToken on its own.
-                // There is no chance of a double truncationToken because CT only adds the
-                // token if it removes characters (and the one we add will go first)
-                NSMutableAttributedString *truncationString = [[NSMutableAttributedString alloc] initWithAttributedString:
-                                                               [attributedString attributedSubstringFromRange:
-                                                                NSMakeRange((NSUInteger)lastLineRange.location,
-                                                                            (NSUInteger)lastLineRange.length)]];
-                if (lastLineRange.length > 0) {
-                    // Remove any newline at the end (we don't want newline space between the text and the truncation token). There can only be one, because the second would be on the next line.
-                    unichar lastCharacter = [[truncationString string] characterAtIndex:(NSUInteger)(lastLineRange.length - 1)];
-                    if ([[NSCharacterSet newlineCharacterSet] characterIsMember:lastCharacter]) {
-                        [truncationString deleteCharactersInRange:NSMakeRange((NSUInteger)(lastLineRange.length - 1), 1)];
-                    }
-                }
-                [truncationString appendAttributedString:attributedTruncationString];
-                CTLineRef truncationLine = CTLineCreateWithAttributedString((__bridge CFAttributedStringRef)truncationString);
-
-                // Truncate the line in case it is too long.
-                CTLineRef truncatedLine = CTLineCreateTruncatedLine(truncationLine, rect.size.width, truncationType, truncationToken);
-                if (!truncatedLine) {
-                    // If the line is not as wide as the truncationToken, truncatedLine is NULL
-                    truncatedLine = CFRetain(truncationToken);
-                }
-
-                CGFloat penOffset = (CGFloat)CTLineGetPenOffsetForFlush(truncatedLine, flushFactor, rect.size.width);
-                CGContextSetTextPosition(c, penOffset, lineOrigin.y - descent - self.font.descender);
-
-                CTLineDraw(truncatedLine, c);
-
-                NSRange linkRange;
-                if ([attributedTruncationString attribute:NSLinkAttributeName atIndex:0 effectiveRange:&linkRange]) {
-                    NSRange tokenRange = [truncationString.string rangeOfString:attributedTruncationString.string];
-                    NSRange tokenLinkRange = NSMakeRange((NSUInteger)(lastLineRange.location+lastLineRange.length)-tokenRange.length, (NSUInteger)tokenRange.length);
-
-                    [self addLinkToURL:[attributedTruncationString attribute:NSLinkAttributeName atIndex:0 effectiveRange:&linkRange] withRange:tokenLinkRange];
-                }
-
-                CFRelease(truncatedLine);
-                CFRelease(truncationLine);
-                CFRelease(truncationToken);
-            } else {
-                CGFloat penOffset = (CGFloat)CTLineGetPenOffsetForFlush(line, flushFactor, rect.size.width);
-                CGContextSetTextPosition(c, penOffset, lineOrigin.y - descent - self.font.descender);
-                CTLineDraw(line, c);
-            }
-        } else {
-            CGFloat penOffset = (CGFloat)CTLineGetPenOffsetForFlush(line, flushFactor, rect.size.width);
-            CGContextSetTextPosition(c, penOffset, lineOrigin.y - descent - self.font.descender);
-            CTLineDraw(line, c);
-        }
-    }
-
-    [self drawStrike:frame inRect:rect context:c];
-
-    CFRelease(frame);
-    CGPathRelease(path);
-}
-
-- (void)drawBackground:(CTFrameRef)frame
-                inRect:(CGRect)rect
-               context:(CGContextRef)c
-{
-    NSArray *lines = (__bridge NSArray *)CTFrameGetLines(frame);
-    CGPoint origins[[lines count]];
-    CTFrameGetLineOrigins(frame, CFRangeMake(0, 0), origins);
-
-    CFIndex lineIndex = 0;
-    for (id line in lines) {
-        CGFloat ascent = 0.0f, descent = 0.0f, leading = 0.0f;
-        CGFloat width = (CGFloat)CTLineGetTypographicBounds((__bridge CTLineRef)line, &ascent, &descent, &leading) ;
-
-        for (id glyphRun in (__bridge NSArray *)CTLineGetGlyphRuns((__bridge CTLineRef)line)) {
-            NSDictionary *attributes = (__bridge NSDictionary *)CTRunGetAttributes((__bridge CTRunRef) glyphRun);
-            CGColorRef strokeColor = CGColorRefFromColor([attributes objectForKey:kBITBackgroundStrokeColorAttributeName]);
-            CGColorRef fillColor = CGColorRefFromColor([attributes objectForKey:kBITBackgroundFillColorAttributeName]);
-            UIEdgeInsets fillPadding = [[attributes objectForKey:kBITBackgroundFillPaddingAttributeName] UIEdgeInsetsValue];
-            CGFloat cornerRadius = [[attributes objectForKey:kBITBackgroundCornerRadiusAttributeName] floatValue];
-            CGFloat lineWidth = [[attributes objectForKey:kBITBackgroundLineWidthAttributeName] floatValue];
-
-            if (strokeColor || fillColor) {
-                CGRect runBounds = CGRectZero;
-                CGFloat runAscent = 0.0f;
-                CGFloat runDescent = 0.0f;
-
-                runBounds.size.width = (CGFloat)CTRunGetTypographicBounds((__bridge CTRunRef)glyphRun, CFRangeMake(0, 0), &runAscent, &runDescent, NULL) + fillPadding.left + fillPadding.right;
-                runBounds.size.height = runAscent + runDescent + fillPadding.top + fillPadding.bottom;
-
-                CGFloat xOffset = 0.0f;
-                CFRange glyphRange = CTRunGetStringRange((__bridge CTRunRef)glyphRun);
-                switch (CTRunGetStatus((__bridge CTRunRef)glyphRun)) {
-                    case kCTRunStatusRightToLeft:
-                        xOffset = CTLineGetOffsetForStringIndex((__bridge CTLineRef)line, glyphRange.location + glyphRange.length, NULL);
-                        break;
-                    default:
-                        xOffset = CTLineGetOffsetForStringIndex((__bridge CTLineRef)line, glyphRange.location, NULL);
-                        break;
-                }
-
-                runBounds.origin.x = origins[lineIndex].x + rect.origin.x + xOffset - fillPadding.left - rect.origin.x;
-                runBounds.origin.y = origins[lineIndex].y + rect.origin.y - fillPadding.bottom - rect.origin.y;
-                runBounds.origin.y -= runDescent;
-
-                // Don't draw higlightedLinkBackground too far to the right
-                if (CGRectGetWidth(runBounds) > width) {
-                    runBounds.size.width = width;
-                }
-
-                CGPathRef path = [[UIBezierPath bezierPathWithRoundedRect:CGRectInset(UIEdgeInsetsInsetRect(runBounds, self.linkBackgroundEdgeInset), lineWidth, lineWidth) cornerRadius:cornerRadius] CGPath];
-
-                CGContextSetLineJoin(c, kCGLineJoinRound);
-
-                if (fillColor) {
-                    CGContextSetFillColorWithColor(c, fillColor);
-                    CGContextAddPath(c, path);
-                    CGContextFillPath(c);
-                }
-
-                if (strokeColor) {
-                    CGContextSetStrokeColorWithColor(c, strokeColor);
-                    CGContextAddPath(c, path);
-                    CGContextStrokePath(c);
-                }
-            }
-        }
-
-        lineIndex++;
-    }
-}
-
-- (void)drawStrike:(CTFrameRef)frame
-            inRect:(__unused CGRect)rect
-           context:(CGContextRef)c
-{
-    NSArray *lines = (__bridge NSArray *)CTFrameGetLines(frame);
-    CGPoint origins[[lines count]];
-    CTFrameGetLineOrigins(frame, CFRangeMake(0, 0), origins);
-
-    CFIndex lineIndex = 0;
-    for (id line in lines) {
-        CGFloat ascent = 0.0f, descent = 0.0f, leading = 0.0f;
-        CGFloat width = (CGFloat)CTLineGetTypographicBounds((__bridge CTLineRef)line, &ascent, &descent, &leading) ;
-
-        for (id glyphRun in (__bridge NSArray *)CTLineGetGlyphRuns((__bridge CTLineRef)line)) {
-            NSDictionary *attributes = (__bridge NSDictionary *)CTRunGetAttributes((__bridge CTRunRef) glyphRun);
-            BOOL strikeOut = [[attributes objectForKey:kBITStrikeOutAttributeName] boolValue];
-            NSInteger superscriptStyle = [[attributes objectForKey:(id)kCTSuperscriptAttributeName] integerValue];
-
-            if (strikeOut) {
-                CGRect runBounds = CGRectZero;
-                CGFloat runAscent = 0.0f;
-                CGFloat runDescent = 0.0f;
-
-                runBounds.size.width = (CGFloat)CTRunGetTypographicBounds((__bridge CTRunRef)glyphRun, CFRangeMake(0, 0), &runAscent, &runDescent, NULL);
-                runBounds.size.height = runAscent + runDescent;
-
-                CGFloat xOffset = 0.0f;
-                CFRange glyphRange = CTRunGetStringRange((__bridge CTRunRef)glyphRun);
-                switch (CTRunGetStatus((__bridge CTRunRef)glyphRun)) {
-                    case kCTRunStatusRightToLeft:
-                        xOffset = CTLineGetOffsetForStringIndex((__bridge CTLineRef)line, glyphRange.location + glyphRange.length, NULL);
-                        break;
-                    default:
-                        xOffset = CTLineGetOffsetForStringIndex((__bridge CTLineRef)line, glyphRange.location, NULL);
-                        break;
-                }
-                runBounds.origin.x = origins[lineIndex].x + xOffset;
-                runBounds.origin.y = origins[lineIndex].y;
-                runBounds.origin.y -= runDescent;
-
-                // Don't draw strikeout too far to the right
-                if (CGRectGetWidth(runBounds) > width) {
-                    runBounds.size.width = width;
-                }
-
-                switch (superscriptStyle) {
-                    case 1:
-                        runBounds.origin.y -= runAscent * 0.47f;
-                        break;
-                    case -1:
-                        runBounds.origin.y += runAscent * 0.25f;
-                        break;
-                    default:
-                        break;
-                }
-
-                // Use text color, or default to black
-                id color = [attributes objectForKey:(id)kCTForegroundColorAttributeName];
-                if (color) {
-                    CGContextSetStrokeColorWithColor(c, CGColorRefFromColor(color));
-                } else {
-                    CGContextSetGrayStrokeColor(c, 0.0f, 1.0);
-                }
-
-                CTFontRef font = CTFontCreateWithName((__bridge CFStringRef)self.font.fontName, self.font.pointSize, NULL);
-                CGContextSetLineWidth(c, CTFontGetUnderlineThickness(font));
-                CFRelease(font);
-
-                CGFloat y = CGFloat_round(runBounds.origin.y + runBounds.size.height / 2.0f);
-                CGContextMoveToPoint(c, runBounds.origin.x, y);
-                CGContextAddLineToPoint(c, runBounds.origin.x + runBounds.size.width, y);
-
-                CGContextStrokePath(c);
-            }
-        }
-
-        lineIndex++;
-    }
-}
-
-#pragma mark - BITAttributedLabel
-
-- (void)setText:(id)text {
-    NSParameterAssert(!text || [text isKindOfClass:[NSAttributedString class]] || [text isKindOfClass:[NSString class]]);
-
-    if ([text isKindOfClass:[NSString class]]) {
-        [self setText:text afterInheritingLabelAttributesAndConfiguringWithBlock:nil];
-        return;
-    }
-
-    self.attributedText = text;
-    self.activeLink = nil;
-
-    self.linkModels = [NSArray array];
-    if (text && self.attributedText && self.enabledTextCheckingTypes) {
-        __weak __typeof(self)weakSelf = self;
-        dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
-            __strong __typeof(weakSelf)strongSelf = weakSelf;
-
-            NSDataDetector *dataDetector = strongSelf.dataDetector;
-            if (dataDetector && [dataDetector respondsToSelector:@selector(matchesInString:options:range:)]) {
-                NSArray *results = [dataDetector matchesInString:[(NSAttributedString *)text string] options:0 range:NSMakeRange(0, [(NSAttributedString *)text length])];
-                if ([results count] > 0) {
-                    dispatch_async(dispatch_get_main_queue(), ^{
-                        if ([[strongSelf.attributedText string] isEqualToString:[(NSAttributedString *)text string]]) {
-                            [strongSelf addLinksWithTextCheckingResults:results attributes:strongSelf.linkAttributes];
-                        }
-                    });
-                }
-            }
-        });
-    }
-
-    [self.attributedText enumerateAttribute:NSLinkAttributeName inRange:NSMakeRange(0, self.attributedText.length) options:0 usingBlock:^(id value, NSRange range, __unused BOOL *stop) {
-        if (value) {
-            NSURL *URL = [value isKindOfClass:[NSString class]] ? [NSURL URLWithString:value] : value;
-            [self addLinkToURL:URL withRange:range];
-        }
-    }];
-}
-
-- (void)setText:(id)text
-afterInheritingLabelAttributesAndConfiguringWithBlock:(NSMutableAttributedString * (^)(NSMutableAttributedString *mutableAttributedString))block
-{
-    NSMutableAttributedString *mutableAttributedString = nil;
-    if ([text isKindOfClass:[NSString class]]) {
-        mutableAttributedString = [[NSMutableAttributedString alloc] initWithString:text attributes:NSAttributedStringAttributesFromLabel(self)];
-    } else {
-        mutableAttributedString = [[NSMutableAttributedString alloc] initWithAttributedString:text];
-        [mutableAttributedString addAttributes:NSAttributedStringAttributesFromLabel(self) range:NSMakeRange(0, [mutableAttributedString length])];
-    }
-
-    if (block) {
-        mutableAttributedString = block(mutableAttributedString);
-    }
-
-    [self setText:mutableAttributedString];
-}
-
-- (void)setActiveLink:(BITAttributedLabelLink *)activeLink {
-    _activeLink = activeLink;
-
-    NSDictionary *activeAttributes = activeLink.activeAttributes ?: self.activeLinkAttributes;
-
-    if (_activeLink && activeAttributes.count > 0) {
-        if (!self.inactiveAttributedText) {
-            self.inactiveAttributedText = [self.attributedText copy];
-        }
-
-        NSMutableAttributedString *mutableAttributedString = [self.inactiveAttributedText mutableCopy];
-        if (self.activeLink.result.range.length > 0 && NSLocationInRange(NSMaxRange(self.activeLink.result.range) - 1, NSMakeRange(0, [self.inactiveAttributedText length]))) {
-            [mutableAttributedString addAttributes:activeAttributes range:self.activeLink.result.range];
-        }
-
-        self.attributedText = mutableAttributedString;
-        [self setNeedsDisplay];
-
-        [CATransaction flush];
-    } else if (self.inactiveAttributedText) {
-        self.attributedText = self.inactiveAttributedText;
-        self.inactiveAttributedText = nil;
-
-        [self setNeedsDisplay];
-    }
-}
-
-- (void)setLinkAttributes:(NSDictionary *)linkAttributes {
-    _linkAttributes = convertNSAttributedStringAttributesToCTAttributes(linkAttributes);
-}
-
-- (void)setActiveLinkAttributes:(NSDictionary *)activeLinkAttributes {
-    _activeLinkAttributes = convertNSAttributedStringAttributesToCTAttributes(activeLinkAttributes);
-}
-
-- (void)setInactiveLinkAttributes:(NSDictionary *)inactiveLinkAttributes {
-    _inactiveLinkAttributes = convertNSAttributedStringAttributesToCTAttributes(inactiveLinkAttributes);
-}
-
-#pragma mark - UILabel
-
-- (void)setHighlighted:(BOOL)highlighted {
-    [super setHighlighted:highlighted];
-    [self setNeedsDisplay];
-}
-
-// Fixes crash when loading from a UIStoryboard
-- (UIColor *)textColor {
-    UIColor *color = [super textColor];
-    if (!color) {
-        color = [UIColor blackColor];
-    }
-
-    return color;
-}
-
-- (void)setTextColor:(UIColor *)textColor {
-    UIColor *oldTextColor = self.textColor;
-    [super setTextColor:textColor];
-
-    // Redraw to allow any ColorFromContext attributes a chance to update
-    if (textColor != oldTextColor) {
-        [self setNeedsFramesetter];
-        [self setNeedsDisplay];
-    }
-}
-
-- (CGRect)textRectForBounds:(CGRect)bounds
-     limitedToNumberOfLines:(NSInteger)numberOfLines
-{
-    bounds = UIEdgeInsetsInsetRect(bounds, self.textInsets);
-    if (!self.attributedText) {
-        return [super textRectForBounds:bounds limitedToNumberOfLines:numberOfLines];
-    }
-
-    CGRect textRect = bounds;
-
-    // Calculate height with a minimum of double the font pointSize, to ensure that CTFramesetterSuggestFrameSizeWithConstraints doesn't return CGSizeZero, as it would if textRect height is insufficient.
-    textRect.size.height = MAX(self.font.lineHeight * MAX(2, numberOfLines), bounds.size.height);
-
-    // Adjust the text to be in the center vertically, if the text size is smaller than bounds
-    CGSize textSize = CTFramesetterSuggestFrameSizeWithConstraints([self framesetter], CFRangeMake(0, (CFIndex)[self.attributedText length]), NULL, textRect.size, NULL);
-    textSize = CGSizeMake(CGFloat_ceil(textSize.width), CGFloat_ceil(textSize.height)); // Fix for iOS 4, CTFramesetterSuggestFrameSizeWithConstraints sometimes returns fractional sizes
-
-    if (textSize.height < bounds.size.height) {
-        CGFloat yOffset = 0.0f;
-        switch (self.verticalAlignment) {
-            case BITAttributedLabelVerticalAlignmentCenter:
-                yOffset = CGFloat_floor((bounds.size.height - textSize.height) / 2.0f);
-                break;
-            case BITAttributedLabelVerticalAlignmentBottom:
-                yOffset = bounds.size.height - textSize.height;
-                break;
-            case BITAttributedLabelVerticalAlignmentTop:
-            default:
-                break;
-        }
-
-        textRect.origin.y += yOffset;
-    }
-
-    return textRect;
-}
-
-- (void)drawTextInRect:(CGRect)rect {
-    CGRect insetRect = UIEdgeInsetsInsetRect(rect, self.textInsets);
-    if (!self.attributedText) {
-        [super drawTextInRect:insetRect];
-        return;
-    }
-
-    NSAttributedString *originalAttributedText = nil;
-
-    // Adjust the font size to fit width, if necessarry
-    if (self.adjustsFontSizeToFitWidth && self.numberOfLines > 0) {
-        // Framesetter could still be working with a resized version of the text;
-        // need to reset so we start from the original font size.
-        // See #393.
-        [self setNeedsFramesetter];
-        [self setNeedsDisplay];
-
-        if ([self respondsToSelector:@selector(invalidateIntrinsicContentSize)]) {
-            [self invalidateIntrinsicContentSize];
-        }
-
-        // Use infinite width to find the max width, which will be compared to availableWidth if needed.
-        CGSize maxSize = (self.numberOfLines > 1) ? CGSizeMake(BITFLOAT_MAX, BITFLOAT_MAX) : CGSizeZero;
-
-        CGFloat textWidth = [self sizeThatFits:maxSize].width;
-        CGFloat availableWidth = self.frame.size.width * self.numberOfLines;
-        if (self.numberOfLines > 1 && self.lineBreakMode == BITLineBreakByWordWrapping) {
-            textWidth *= kBITLineBreakWordWrapTextWidthScalingFactor;
-        }
-
-        if (textWidth > availableWidth && textWidth > 0.0f) {
-            originalAttributedText = [self.attributedText copy];
-
-            CGFloat scaleFactor = availableWidth / textWidth;
-            if ([self respondsToSelector:@selector(minimumScaleFactor)] && self.minimumScaleFactor > scaleFactor) {
-                scaleFactor = self.minimumScaleFactor;
-            }
-
-            self.attributedText = NSAttributedStringByScalingFontSize(self.attributedText, scaleFactor);
-        }
-    }
-
-    CGContextRef c = UIGraphicsGetCurrentContext();
-    CGContextSaveGState(c);
-    {
-        CGContextSetTextMatrix(c, CGAffineTransformIdentity);
-
-        // Inverts the CTM to match iOS coordinates (otherwise text draws upside-down; Mac OS's system is different)
-        CGContextTranslateCTM(c, 0.0f, insetRect.size.height);
-        CGContextScaleCTM(c, 1.0f, -1.0f);
-
-        CFRange textRange = CFRangeMake(0, (CFIndex)[self.attributedText length]);
-
-        // First, get the text rect (which takes vertical centering into account)
-        CGRect textRect = [self textRectForBounds:rect limitedToNumberOfLines:self.numberOfLines];
-
-        // CoreText draws its text aligned to the bottom, so we move the CTM here to take our vertical offsets into account
-        CGContextTranslateCTM(c, insetRect.origin.x, insetRect.size.height - textRect.origin.y - textRect.size.height);
-
-        // Second, trace the shadow before the actual text, if we have one
-        if (self.shadowColor && !self.highlighted) {
-            CGContextSetShadowWithColor(c, self.shadowOffset, self.shadowRadius, [self.shadowColor CGColor]);
-        } else if (self.highlightedShadowColor) {
-            CGContextSetShadowWithColor(c, self.highlightedShadowOffset, self.highlightedShadowRadius, [self.highlightedShadowColor CGColor]);
-        }
-
-        // Finally, draw the text or highlighted text itself (on top of the shadow, if there is one)
-        if (self.highlightedTextColor && self.highlighted) {
-            NSMutableAttributedString *highlightAttributedString = [self.renderedAttributedText mutableCopy];
-            [highlightAttributedString addAttribute:(__bridge NSString *)kCTForegroundColorAttributeName value:(id)[self.highlightedTextColor CGColor] range:NSMakeRange(0, highlightAttributedString.length)];
-
-            if (![self highlightFramesetter]) {
-                CTFramesetterRef highlightFramesetter = CTFramesetterCreateWithAttributedString((__bridge CFAttributedStringRef)highlightAttributedString);
-                [self setHighlightFramesetter:highlightFramesetter];
-                CFRelease(highlightFramesetter);
-            }
-
-            [self drawFramesetter:[self highlightFramesetter] attributedString:highlightAttributedString textRange:textRange inRect:textRect context:c];
-        } else {
-            [self drawFramesetter:[self framesetter] attributedString:self.renderedAttributedText textRange:textRange inRect:textRect context:c];
-        }
-
-        // If we adjusted the font size, set it back to its original size
-        if (originalAttributedText) {
-            // Use ivar directly to avoid clearing out framesetter and renderedAttributedText
-            _attributedText = originalAttributedText;
-        }
-    }
-    CGContextRestoreGState(c);
-}
-
-#pragma mark - UIAccessibilityElement
-
-- (BOOL)isAccessibilityElement {
-    return NO;
-}
-
-- (NSInteger)accessibilityElementCount {
-    return (NSInteger)[[self accessibilityElements] count];
-}
-
-- (id)accessibilityElementAtIndex:(NSInteger)index {
-    return [[self accessibilityElements] objectAtIndex:(NSUInteger)index];
-}
-
-- (NSInteger)indexOfAccessibilityElement:(id)element {
-    return (NSInteger)[[self accessibilityElements] indexOfObject:element];
-}
-
-- (NSArray *)accessibilityElements {
-    if (!_accessibilityElements) {
-        @synchronized(self) {
-            NSMutableArray *mutableAccessibilityItems = [NSMutableArray array];
-
-            for (BITAttributedLabelLink *link in self.linkModels) {
-
-                if (link.result.range.location == NSNotFound) {
-                    continue;
-                }
-
-                NSString *sourceText = [self.text isKindOfClass:[NSString class]] ? self.text : [(NSAttributedString *)self.text string];
-
-                NSString *accessibilityLabel = [sourceText substringWithRange:link.result.range];
-                NSString *accessibilityValue = link.accessibilityValue;
-
-                if (accessibilityLabel) {
-                    BITAccessibilityElement *linkElement = [[BITAccessibilityElement alloc] initWithAccessibilityContainer:self];
-                    linkElement.accessibilityTraits = UIAccessibilityTraitLink;
-                    linkElement.boundingRect = [self boundingRectForCharacterRange:link.result.range];
-                    linkElement.superview = self;
-                    linkElement.accessibilityLabel = accessibilityLabel;
-
-                    if (![accessibilityLabel isEqualToString:accessibilityValue]) {
-                        linkElement.accessibilityValue = accessibilityValue;
-                    }
-
-                    [mutableAccessibilityItems addObject:linkElement];
-                }
-            }
-
-            BITAccessibilityElement *baseElement = [[BITAccessibilityElement alloc] initWithAccessibilityContainer:self];
-            baseElement.accessibilityLabel = [super accessibilityLabel];
-            baseElement.accessibilityHint = [super accessibilityHint];
-            baseElement.accessibilityValue = [super accessibilityValue];
-            baseElement.boundingRect = self.bounds;
-            baseElement.superview = self;
-            baseElement.accessibilityTraits = [super accessibilityTraits];
-
-            [mutableAccessibilityItems addObject:baseElement];
-
-            self.accessibilityElements = [NSArray arrayWithArray:mutableAccessibilityItems];
-        }
-    }
-
-    return _accessibilityElements;
-}
-
-#pragma mark - UIView
-
-- (CGSize)sizeThatFits:(CGSize)size {
-    if (!self.attributedText) {
-        return [super sizeThatFits:size];
-    } else {
-        NSAttributedString *string = [self renderedAttributedText];
-
-        CGSize labelSize = CTFramesetterSuggestFrameSizeForAttributedStringWithConstraints([self framesetter], string, size, (NSUInteger)self.numberOfLines);
-        labelSize.width += self.textInsets.left + self.textInsets.right;
-        labelSize.height += self.textInsets.top + self.textInsets.bottom;
-
-        return labelSize;
-    }
-}
-
-- (CGSize)intrinsicContentSize {
-    // There's an implicit width from the original UILabel implementation
-    return [self sizeThatFits:[super intrinsicContentSize]];
-}
-
-- (void)tintColorDidChange {
-    if (!self.inactiveLinkAttributes || [self.inactiveLinkAttributes count] == 0) {
-        return;
-    }
-
-    BOOL isInactive = (self.tintAdjustmentMode == UIViewTintAdjustmentModeDimmed);
-
-    NSMutableAttributedString *mutableAttributedString = [self.attributedText mutableCopy];
-    for (BITAttributedLabelLink *link in self.linkModels) {
-        NSDictionary *attributesToRemove = isInactive ? link.attributes : link.inactiveAttributes;
-        NSDictionary *attributesToAdd = isInactive ? link.inactiveAttributes : link.attributes;
-
-        [attributesToRemove enumerateKeysAndObjectsUsingBlock:^(NSString *name, __unused id value, __unused BOOL *stop) {
-            if (NSMaxRange(link.result.range) <= mutableAttributedString.length) {
-                [mutableAttributedString removeAttribute:name range:link.result.range];
-            }
-        }];
-
-        if (attributesToAdd) {
-            if (NSMaxRange(link.result.range) <= mutableAttributedString.length) {
-                [mutableAttributedString addAttributes:attributesToAdd range:link.result.range];
-            }
-        }
-    }
-
-    self.attributedText = mutableAttributedString;
-
-    [self setNeedsDisplay];
-}
-
-- (UIView *)hitTest:(CGPoint)point
-          withEvent:(UIEvent *)event
-{
-    if (![self linkAtPoint:point] || !self.userInteractionEnabled || self.hidden || self.alpha < 0.01) {
-        return [super hitTest:point withEvent:event];
-    }
-
-    return self;
-}
-
-#pragma mark - UIResponder
-
-- (BOOL)canBecomeFirstResponder {
-    return YES;
-}
-
-- (BOOL)canPerformAction:(SEL)action
-              withSender:(__unused id)sender
-{
-#if !TARGET_OS_TV
-    return (action == @selector(copy:));
-#else
-    return NO;
-#endif
-}
-
-- (void)touchesBegan:(NSSet *)touches
-           withEvent:(UIEvent *)event
-{
-    UITouch *touch = [touches anyObject];
-
-    self.activeLink = [self linkAtPoint:[touch locationInView:self]];
-
-    if (!self.activeLink) {
-        [super touchesBegan:touches withEvent:event];
-    }
-}
-
-- (void)touchesMoved:(NSSet *)touches
-           withEvent:(UIEvent *)event
-{
-    if (self.activeLink) {
-        UITouch *touch = [touches anyObject];
-
-        if (self.activeLink != [self linkAtPoint:[touch locationInView:self]]) {
-            self.activeLink = nil;
-        }
-    } else {
-        [super touchesMoved:touches withEvent:event];
-    }
-}
-
-- (void)touchesEnded:(NSSet *)touches
-           withEvent:(UIEvent *)event
-{
-    if (self.activeLink) {
-        if (self.activeLink.linkTapBlock) {
-            self.activeLink.linkTapBlock(self, self.activeLink);
-            self.activeLink = nil;
-            return;
-        }
-
-        NSTextCheckingResult *result = self.activeLink.result;
-        self.activeLink = nil;
-
-        switch (result.resultType) {
-            case NSTextCheckingTypeLink:
-                if ([self.delegate respondsToSelector:@selector(attributedLabel:didSelectLinkWithURL:)]) {
-                    [self.delegate attributedLabel:self didSelectLinkWithURL:result.URL];
-                    return;
-                }
-                break;
-            case NSTextCheckingTypeAddress:
-                if ([self.delegate respondsToSelector:@selector(attributedLabel:didSelectLinkWithAddress:)]) {
-                    [self.delegate attributedLabel:self didSelectLinkWithAddress:result.addressComponents];
-                    return;
-                }
-                break;
-            case NSTextCheckingTypePhoneNumber:
-                if ([self.delegate respondsToSelector:@selector(attributedLabel:didSelectLinkWithPhoneNumber:)]) {
-                    [self.delegate attributedLabel:self didSelectLinkWithPhoneNumber:result.phoneNumber];
-                    return;
-                }
-                break;
-            case NSTextCheckingTypeDate:
-                if (result.timeZone && [self.delegate respondsToSelector:@selector(attributedLabel:didSelectLinkWithDate:timeZone:duration:)]) {
-                    [self.delegate attributedLabel:self didSelectLinkWithDate:result.date timeZone:result.timeZone duration:result.duration];
-                    return;
-                } else if ([self.delegate respondsToSelector:@selector(attributedLabel:didSelectLinkWithDate:)]) {
-                    [self.delegate attributedLabel:self didSelectLinkWithDate:result.date];
-                    return;
-                }
-                break;
-            case NSTextCheckingTypeTransitInformation:
-                if ([self.delegate respondsToSelector:@selector(attributedLabel:didSelectLinkWithTransitInformation:)]) {
-                    [self.delegate attributedLabel:self didSelectLinkWithTransitInformation:result.components];
-                    return;
-                }
-            default:
-                break;
-        }
-
-        // Fallback to `attributedLabel:didSelectLinkWithTextCheckingResult:` if no other delegate method matched.
-        if ([self.delegate respondsToSelector:@selector(attributedLabel:didSelectLinkWithTextCheckingResult:)]) {
-            [self.delegate attributedLabel:self didSelectLinkWithTextCheckingResult:result];
-        }
-    } else {
-        [super touchesEnded:touches withEvent:event];
-    }
-}
-
-- (void)touchesCancelled:(NSSet *)touches
-               withEvent:(UIEvent *)event
-{
-    if (self.activeLink) {
-        self.activeLink = nil;
-    } else {
-        [super touchesCancelled:touches withEvent:event];
-    }
-}
-
-#pragma mark - UIGestureRecognizerDelegate
-
-- (BOOL)gestureRecognizer:(UIGestureRecognizer *)gestureRecognizer shouldReceiveTouch:(UITouch *)touch {
-    return [self containslinkAtPoint:[touch locationInView:self]];
-}
-
-#pragma mark - UILongPressGestureRecognizer
-
-- (void)longPressGestureDidFire:(UILongPressGestureRecognizer *)sender {
-    switch (sender.state) {
-        case UIGestureRecognizerStateBegan: {
-            CGPoint touchPoint = [sender locationInView:self];
-            BITAttributedLabelLink *link = [self linkAtPoint:touchPoint];
-
-            if (link) {
-                if (link.linkLongPressBlock) {
-                    link.linkLongPressBlock(self, link);
-                    return;
-                }
-
-                NSTextCheckingResult *result = link.result;
-
-                if (!result) {
-                    return;
-                }
-
-                switch (result.resultType) {
-                    case NSTextCheckingTypeLink:
-                        if ([self.delegate respondsToSelector:@selector(attributedLabel:didLongPressLinkWithURL:atPoint:)]) {
-                            [self.delegate attributedLabel:self didLongPressLinkWithURL:result.URL atPoint:touchPoint];
-                            return;
-                        }
-                        break;
-                    case NSTextCheckingTypeAddress:
-                        if ([self.delegate respondsToSelector:@selector(attributedLabel:didLongPressLinkWithAddress:atPoint:)]) {
-                            [self.delegate attributedLabel:self didLongPressLinkWithAddress:result.addressComponents atPoint:touchPoint];
-                            return;
-                        }
-                        break;
-                    case NSTextCheckingTypePhoneNumber:
-                        if ([self.delegate respondsToSelector:@selector(attributedLabel:didLongPressLinkWithPhoneNumber:atPoint:)]) {
-                            [self.delegate attributedLabel:self didLongPressLinkWithPhoneNumber:result.phoneNumber atPoint:touchPoint];
-                            return;
-                        }
-                        break;
-                    case NSTextCheckingTypeDate:
-                        if (result.timeZone && [self.delegate respondsToSelector:@selector(attributedLabel:didLongPressLinkWithDate:timeZone:duration:atPoint:)]) {
-                            [self.delegate attributedLabel:self didLongPressLinkWithDate:result.date timeZone:result.timeZone duration:result.duration atPoint:touchPoint];
-                            return;
-                        } else if ([self.delegate respondsToSelector:@selector(attributedLabel:didLongPressLinkWithDate:atPoint:)]) {
-                            [self.delegate attributedLabel:self didLongPressLinkWithDate:result.date atPoint:touchPoint];
-                            return;
-                        }
-                        break;
-                    case NSTextCheckingTypeTransitInformation:
-                        if ([self.delegate respondsToSelector:@selector(attributedLabel:didLongPressLinkWithTransitInformation:atPoint:)]) {
-                            [self.delegate attributedLabel:self didLongPressLinkWithTransitInformation:result.components atPoint:touchPoint];
-                            return;
-                        }
-                    default:
-                        break;
-                }
-
-                // Fallback to `attributedLabel:didLongPressLinkWithTextCheckingResult:atPoint:` if no other delegate method matched.
-                if ([self.delegate respondsToSelector:@selector(attributedLabel:didLongPressLinkWithTextCheckingResult:atPoint:)]) {
-                    [self.delegate attributedLabel:self didLongPressLinkWithTextCheckingResult:result atPoint:touchPoint];
-                }
-            }
-            break;
-        }
-        default:
-            break;
-    }
-}
-
-#if !TARGET_OS_TV
-#pragma mark - UIResponderStandardEditActions
-
-- (void)copy:(__unused id)sender {
-    [[UIPasteboard generalPasteboard] setString:self.text];
-}
-#endif
-
-#pragma mark - NSCoding
-
-- (void)encodeWithCoder:(NSCoder *)coder {
-    [super encodeWithCoder:coder];
-
-    [coder encodeObject:@(self.enabledTextCheckingTypes) forKey:NSStringFromSelector(@selector(enabledTextCheckingTypes))];
-
-    [coder encodeObject:self.linkModels forKey:NSStringFromSelector(@selector(linkModels))];
-    if ([NSMutableParagraphStyle class]) {
-        [coder encodeObject:self.linkAttributes forKey:NSStringFromSelector(@selector(linkAttributes))];
-        [coder encodeObject:self.activeLinkAttributes forKey:NSStringFromSelector(@selector(activeLinkAttributes))];
-        [coder encodeObject:self.inactiveLinkAttributes forKey:NSStringFromSelector(@selector(inactiveLinkAttributes))];
-    }
-    [coder encodeObject:@(self.shadowRadius) forKey:NSStringFromSelector(@selector(shadowRadius))];
-    [coder encodeObject:@(self.highlightedShadowRadius) forKey:NSStringFromSelector(@selector(highlightedShadowRadius))];
-    [coder encodeCGSize:self.highlightedShadowOffset forKey:NSStringFromSelector(@selector(highlightedShadowOffset))];
-    [coder encodeObject:self.highlightedShadowColor forKey:NSStringFromSelector(@selector(highlightedShadowColor))];
-    [coder encodeObject:@(self.kern) forKey:NSStringFromSelector(@selector(kern))];
-    [coder encodeObject:@(self.firstLineIndent) forKey:NSStringFromSelector(@selector(firstLineIndent))];
-    [coder encodeObject:@(self.lineSpacing) forKey:NSStringFromSelector(@selector(lineSpacing))];
-    [coder encodeObject:@(self.lineHeightMultiple) forKey:NSStringFromSelector(@selector(lineHeightMultiple))];
-    [coder encodeUIEdgeInsets:self.textInsets forKey:NSStringFromSelector(@selector(textInsets))];
-    [coder encodeInteger:self.verticalAlignment forKey:NSStringFromSelector(@selector(verticalAlignment))];
-
-    [coder encodeObject:self.attributedTruncationToken forKey:NSStringFromSelector(@selector(attributedTruncationToken))];
-
-    [coder encodeObject:NSStringFromUIEdgeInsets(self.linkBackgroundEdgeInset) forKey:NSStringFromSelector(@selector(linkBackgroundEdgeInset))];
-    [coder encodeObject:self.attributedText forKey:NSStringFromSelector(@selector(attributedText))];
-    [coder encodeObject:self.text forKey:NSStringFromSelector(@selector(text))];
-}
-
-- (id)initWithCoder:(NSCoder *)coder {
-    self = [super initWithCoder:coder];
-    if (!self) {
-        return nil;
-    }
-
-    [self commonInit];
-
-    if ([coder containsValueForKey:NSStringFromSelector(@selector(enabledTextCheckingTypes))]) {
-        self.enabledTextCheckingTypes = [[coder decodeObjectForKey:NSStringFromSelector(@selector(enabledTextCheckingTypes))] unsignedLongLongValue];
-    }
-
-    if ([NSMutableParagraphStyle class]) {
-        if ([coder containsValueForKey:NSStringFromSelector(@selector(linkAttributes))]) {
-            self.linkAttributes = [coder decodeObjectForKey:NSStringFromSelector(@selector(linkAttributes))];
-        }
-
-        if ([coder containsValueForKey:NSStringFromSelector(@selector(activeLinkAttributes))]) {
-            self.activeLinkAttributes = [coder decodeObjectForKey:NSStringFromSelector(@selector(activeLinkAttributes))];
-        }
-
-        if ([coder containsValueForKey:NSStringFromSelector(@selector(inactiveLinkAttributes))]) {
-            self.inactiveLinkAttributes = [coder decodeObjectForKey:NSStringFromSelector(@selector(inactiveLinkAttributes))];
-        }
-    }
-
-    if ([coder containsValueForKey:NSStringFromSelector(@selector(links))]) {
-        NSArray *oldLinks = [coder decodeObjectForKey:NSStringFromSelector(@selector(links))];
-        [self addLinksWithTextCheckingResults:oldLinks attributes:nil];
-    }
-
-    if ([coder containsValueForKey:NSStringFromSelector(@selector(linkModels))]) {
-        self.linkModels = [coder decodeObjectForKey:NSStringFromSelector(@selector(linkModels))];
-    }
-
-    if ([coder containsValueForKey:NSStringFromSelector(@selector(shadowRadius))]) {
-        self.shadowRadius = [[coder decodeObjectForKey:NSStringFromSelector(@selector(shadowRadius))] floatValue];
-    }
-
-    if ([coder containsValueForKey:NSStringFromSelector(@selector(highlightedShadowRadius))]) {
-        self.highlightedShadowRadius = [[coder decodeObjectForKey:NSStringFromSelector(@selector(highlightedShadowRadius))] floatValue];
-    }
-
-    if ([coder containsValueForKey:NSStringFromSelector(@selector(highlightedShadowOffset))]) {
-        self.highlightedShadowOffset = [coder decodeCGSizeForKey:NSStringFromSelector(@selector(highlightedShadowOffset))];
-    }
-
-    if ([coder containsValueForKey:NSStringFromSelector(@selector(highlightedShadowColor))]) {
-        self.highlightedShadowColor = [coder decodeObjectForKey:NSStringFromSelector(@selector(highlightedShadowColor))];
-    }
-
-    if ([coder containsValueForKey:NSStringFromSelector(@selector(kern))]) {
-        self.kern = [[coder decodeObjectForKey:NSStringFromSelector(@selector(kern))] floatValue];
-    }
-
-    if ([coder containsValueForKey:NSStringFromSelector(@selector(firstLineIndent))]) {
-        self.firstLineIndent = [[coder decodeObjectForKey:NSStringFromSelector(@selector(firstLineIndent))] floatValue];
-    }
-
-    if ([coder containsValueForKey:NSStringFromSelector(@selector(lineSpacing))]) {
-        self.lineSpacing = [[coder decodeObjectForKey:NSStringFromSelector(@selector(lineSpacing))] floatValue];
-    }
-
-    if ([coder containsValueForKey:NSStringFromSelector(@selector(minimumLineHeight))]) {
-        self.minimumLineHeight = [[coder decodeObjectForKey:NSStringFromSelector(@selector(minimumLineHeight))] floatValue];
-    }
-
-    if ([coder containsValueForKey:NSStringFromSelector(@selector(maximumLineHeight))]) {
-        self.maximumLineHeight = [[coder decodeObjectForKey:NSStringFromSelector(@selector(maximumLineHeight))] floatValue];
-    }
-
-    if ([coder containsValueForKey:NSStringFromSelector(@selector(lineHeightMultiple))]) {
-        self.lineHeightMultiple = [[coder decodeObjectForKey:NSStringFromSelector(@selector(lineHeightMultiple))] floatValue];
-    }
-
-    if ([coder containsValueForKey:NSStringFromSelector(@selector(textInsets))]) {
-        self.textInsets = [coder decodeUIEdgeInsetsForKey:NSStringFromSelector(@selector(textInsets))];
-    }
-
-    if ([coder containsValueForKey:NSStringFromSelector(@selector(verticalAlignment))]) {
-        self.verticalAlignment = [coder decodeIntegerForKey:NSStringFromSelector(@selector(verticalAlignment))];
-    }
-
-    if ([coder containsValueForKey:NSStringFromSelector(@selector(attributedTruncationToken))]) {
-        self.attributedTruncationToken = [coder decodeObjectForKey:NSStringFromSelector(@selector(attributedTruncationToken))];
-    }
-
-    if ([coder containsValueForKey:NSStringFromSelector(@selector(linkBackgroundEdgeInset))]) {
-        self.linkBackgroundEdgeInset = UIEdgeInsetsFromString([coder decodeObjectForKey:NSStringFromSelector(@selector(linkBackgroundEdgeInset))]);
-    }
-
-    if ([coder containsValueForKey:NSStringFromSelector(@selector(attributedText))]) {
-        self.attributedText = [coder decodeObjectForKey:NSStringFromSelector(@selector(attributedText))];
-    } else {
-        self.text = super.text;
-    }
-
-    return self;
-}
-
-@end
-
-#pragma mark - BITAttributedLabelLink
-
-@implementation BITAttributedLabelLink
-
-- (instancetype)initWithAttributes:(NSDictionary *)attributes
-                  activeAttributes:(NSDictionary *)activeAttributes
-                inactiveAttributes:(NSDictionary *)inactiveAttributes
-                textCheckingResult:(NSTextCheckingResult *)result {
-
-    if ((self = [super init])) {
-        _result = result;
-        _attributes = [attributes copy];
-        _activeAttributes = [activeAttributes copy];
-        _inactiveAttributes = [inactiveAttributes copy];
-    }
-
-    return self;
-}
-
-- (instancetype)initWithAttributesFromLabel:(BITAttributedLabel*)label
-                         textCheckingResult:(NSTextCheckingResult *)result {
-
-    return [self initWithAttributes:label.linkAttributes
-                   activeAttributes:label.activeLinkAttributes
-                 inactiveAttributes:label.inactiveLinkAttributes
-                 textCheckingResult:result];
-}
-
-#pragma mark - Accessibility
-
-- (NSString *) accessibilityValue {
-    if ([_accessibilityValue length] == 0) {
-        switch (self.result.resultType) {
-            case NSTextCheckingTypeLink:
-                _accessibilityValue = self.result.URL.absoluteString;
-                break;
-            case NSTextCheckingTypePhoneNumber:
-                _accessibilityValue = self.result.phoneNumber;
-                break;
-            case NSTextCheckingTypeDate:
-                _accessibilityValue = [NSDateFormatter localizedStringFromDate:self.result.date
-                                                                     dateStyle:NSDateFormatterLongStyle
-                                                                     timeStyle:NSDateFormatterLongStyle];
-                break;
-            default:
-                break;
-        }
-    }
-
-    return _accessibilityValue;
-}
-
-#pragma mark - NSCoding
-
-- (void)encodeWithCoder:(NSCoder *)aCoder {
-    [aCoder encodeObject:self.result forKey:NSStringFromSelector(@selector(result))];
-    [aCoder encodeObject:self.attributes forKey:NSStringFromSelector(@selector(attributes))];
-    [aCoder encodeObject:self.activeAttributes forKey:NSStringFromSelector(@selector(activeAttributes))];
-    [aCoder encodeObject:self.inactiveAttributes forKey:NSStringFromSelector(@selector(inactiveAttributes))];
-    [aCoder encodeObject:self.accessibilityValue forKey:NSStringFromSelector(@selector(accessibilityValue))];
-}
-
-- (id)initWithCoder:(NSCoder *)aDecoder {
-    if ((self = [super init])) {
-        _result = [aDecoder decodeObjectForKey:NSStringFromSelector(@selector(result))];
-        _attributes = [aDecoder decodeObjectForKey:NSStringFromSelector(@selector(attributes))];
-        _activeAttributes = [aDecoder decodeObjectForKey:NSStringFromSelector(@selector(activeAttributes))];
-        _inactiveAttributes = [aDecoder decodeObjectForKey:NSStringFromSelector(@selector(inactiveAttributes))];
-        self.accessibilityValue = [aDecoder decodeObjectForKey:NSStringFromSelector(@selector(accessibilityValue))];
-    }
-
-    return self;
-}
-
-@end
-
-#pragma mark -
-
-static inline CGColorRef CGColorRefFromColor(id color) {
-    return [color isKindOfClass:[UIColor class]] ? [color CGColor] : (__bridge CGColorRef)color;
-}
-
-static inline CTFontRef CTFontRefFromUIFont(UIFont * font) {
-    CTFontRef ctfont = CTFontCreateWithName((__bridge CFStringRef)font.fontName, font.pointSize, NULL);
-    return CFAutorelease(ctfont);
-}
-
-static inline NSDictionary * convertNSAttributedStringAttributesToCTAttributes(NSDictionary *attributes) {
-    if (!attributes) return nil;
-    
-    NSMutableDictionary *mutableAttributes = [NSMutableDictionary dictionary];
-    
-    NSDictionary *NSToCTAttributeNamesMap = @{
-                                              NSFontAttributeName:            (NSString *)kCTFontAttributeName,
-                                              NSBackgroundColorAttributeName: (NSString *)kBITBackgroundFillColorAttributeName,
-                                              NSForegroundColorAttributeName: (NSString *)kCTForegroundColorAttributeName,
-                                              NSUnderlineColorAttributeName:  (NSString *)kCTUnderlineColorAttributeName,
-                                              NSUnderlineStyleAttributeName:  (NSString *)kCTUnderlineStyleAttributeName,
-                                              NSStrokeWidthAttributeName:     (NSString *)kCTStrokeWidthAttributeName,
-                                              NSStrokeColorAttributeName:     (NSString *)kCTStrokeWidthAttributeName,
-                                              NSKernAttributeName:            (NSString *)kCTKernAttributeName,
-                                              NSLigatureAttributeName:        (NSString *)kCTLigatureAttributeName
-                                              };
-    
-    [attributes enumerateKeysAndObjectsUsingBlock:^(id key, id value, BOOL *stop) {
-        key = [NSToCTAttributeNamesMap objectForKey:key] ? : key;
-        
-        if (![NSMutableParagraphStyle class]) {
-            if ([value isKindOfClass:[UIFont class]]) {
-                value = (__bridge id)CTFontRefFromUIFont(value);
-            } else if ([value isKindOfClass:[UIColor class]]) {
-                value = (__bridge id)((UIColor *)value).CGColor;
-            }
-        }
-        
-        [mutableAttributes setObject:value forKey:key];
-    }];
-    
-    return [NSDictionary dictionaryWithDictionary:mutableAttributes];
-}
-
-#pragma clang diagnostic pop
-
-#endif
diff --git a/submodules/HockeySDK-iOS/Classes/BITAuthenticationViewController.h b/submodules/HockeySDK-iOS/Classes/BITAuthenticationViewController.h
deleted file mode 100644
index 2eac237f18..0000000000
--- a/submodules/HockeySDK-iOS/Classes/BITAuthenticationViewController.h
+++ /dev/null
@@ -1,94 +0,0 @@
-/*
- * Author: Stephan Diederich
- *
- * Copyright (c) 2013-2014 HockeyApp, Bit Stadium GmbH.
- * All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person
- * obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without
- * restriction, including without limitation the rights to use,
- * copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following
- * conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
- * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#import <UIKit/UIKit.h>
-@protocol BITAuthenticationViewControllerDelegate;
-@class BITAuthenticator;
-@class BITHockeyAppClient;
-
-/**
- *  View controller handling user interaction for `BITAuthenticator`
- */
-@interface BITAuthenticationViewController : UITableViewController
-
-- (instancetype) initWithDelegate:(id<BITAuthenticationViewControllerDelegate>) delegate;
-
-/**
- *  can be set to YES to show an additional button + description text
- *  and allowing to login via external website/UDID.
- *  if this is set to yes, no further email/password options are shown
- *
- *  defaults to NO
- */
-@property (nonatomic, assign) BOOL showsLoginViaWebButton;
-
-/**
- *  Description shown on top of view. Should tell why this view 
- *  was presented and what's next.
- */
-@property (nonatomic, copy) NSString* tableViewTitle;
-
-/**
- *	can be set to YES to also require the users password
- *
- *  defaults to NO
- */
-@property (nonatomic, assign) BOOL requirePassword;
-
-@property (nonatomic, weak) id<BITAuthenticationViewControllerDelegate> delegate;
-
-/**
- *  allows to pre-fill the email-addy
- */
-@property (nonatomic, copy) NSString* email;
-@end
-
-/**
- *  BITAuthenticationViewController protocol
- */
-@protocol BITAuthenticationViewControllerDelegate<NSObject>
-
-- (void) authenticationViewControllerDidTapWebButton:(UIViewController*) viewController;
-
-/**
- *	called when the user wants to login
- *
- *	@param	viewController	the delegating view controller
- *	@param	email	the content of the email-field
- *	@param	password	the content of the password-field (if existent)
- *  @param  completion Must be called by the delegate once the auth-task completed
- *                     This view controller shows an activity-indicator in between and blocks
- *                     the UI. if succeeded is NO, it shows an alertView presenting the error
- *                     given by the completion block
- */
-- (void) authenticationViewController:(UIViewController*) viewController
-        handleAuthenticationWithEmail:(NSString*) email
-                             password:(NSString*) password
-                           completion:(void(^)(BOOL succeeded, NSError *error)) completion;
-
-@end
diff --git a/submodules/HockeySDK-iOS/Classes/BITAuthenticationViewController.m b/submodules/HockeySDK-iOS/Classes/BITAuthenticationViewController.m
deleted file mode 100644
index bcf765683a..0000000000
--- a/submodules/HockeySDK-iOS/Classes/BITAuthenticationViewController.m
+++ /dev/null
@@ -1,321 +0,0 @@
-/*
- * Author: Stephan Diederich
- *
- * Copyright (c) 2013-2014 HockeyApp, Bit Stadium GmbH.
- * All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person
- * obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without
- * restriction, including without limitation the rights to use,
- * copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following
- * conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
- * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#import "HockeySDK.h"
-
-#if HOCKEYSDK_FEATURE_AUTHENTICATOR
-
-#import "BITAuthenticationViewController.h"
-#import "BITAuthenticator_Private.h"
-#import "HockeySDKPrivate.h"
-#import "BITHockeyHelper.h"
-#import "BITHockeyAppClient.h"
-#import <tgmath.h>
-
-@interface BITAuthenticationViewController ()<UITextFieldDelegate>
-
-@property (nonatomic, weak) UITextField *emailField;
-@property (nonatomic, copy) NSString *password;
-
-@end
-
-@implementation BITAuthenticationViewController
-
-- (instancetype) initWithDelegate:(id<BITAuthenticationViewControllerDelegate>)delegate {
-  self = [super initWithStyle:UITableViewStyleGrouped];
-  if (self) {
-    self.title = BITHockeyLocalizedString(@"HockeyAuthenticatorViewControllerTitle");
-    _delegate = delegate;
-  }
-  return self;
-}
-
-#pragma mark - view lifecycle
-
-- (void)viewDidLoad {
-  [super viewDidLoad];
-  
-  [self.tableView setScrollEnabled:NO];
-  
-  [self updateWebLoginButton];
-}
-
-- (void)viewWillAppear:(BOOL)animated {
-  [super viewWillAppear:animated];
-  
-  [self updateBarButtons];
-  
-  self.navigationItem.rightBarButtonItem.enabled = [self allRequiredFieldsEntered];
-}
-
-#pragma mark - Property overrides
-
-- (void) updateBarButtons {
-  if(self.showsLoginViaWebButton) {
-    self.navigationItem.rightBarButtonItem = nil;
-  } else {
-    self.navigationItem.rightBarButtonItem = [[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemDone
-                                                                                           target:self
-                                                                                           action:@selector(saveAction:)];
-  }
-}
-
-- (void)setShowsLoginViaWebButton:(BOOL)showsLoginViaWebButton {
-  if(_showsLoginViaWebButton != showsLoginViaWebButton) {
-    _showsLoginViaWebButton = showsLoginViaWebButton;
-    if(self.isViewLoaded) {
-      [self.tableView reloadData];
-      [self updateBarButtons];
-      [self updateWebLoginButton];
-    }
-  }
-}
-
-- (void) updateWebLoginButton {
-  if(self.showsLoginViaWebButton) {
-    static const CGFloat kFooterHeight = 60.0;
-    UIView *containerView = [[UIView alloc] initWithFrame:CGRectMake(0, 0,
-                                                                     CGRectGetWidth(self.tableView.bounds),
-                                                                     kFooterHeight)];
-    UIButton *button = [UIButton buttonWithType:kBITButtonTypeSystem];
-    [button setTitle:BITHockeyLocalizedString(@"HockeyAuthenticationViewControllerWebLoginButtonTitle") forState:UIControlStateNormal];
-    CGSize buttonSize = [button sizeThatFits:CGSizeMake(CGRectGetWidth(self.tableView.bounds),
-                                                        kFooterHeight)];
-    button.frame = CGRectMake(floor((CGRectGetWidth(containerView.bounds) - buttonSize.width) / (CGFloat)2.0),
-                              floor((kFooterHeight - buttonSize.height) / (CGFloat)2.0),
-                              buttonSize.width,
-                              buttonSize.height);
-    button.autoresizingMask = UIViewAutoresizingFlexibleBottomMargin | UIViewAutoresizingFlexibleTopMargin | UIViewAutoresizingFlexibleLeftMargin | UIViewAutoresizingFlexibleRightMargin;
-    if ([UIButton instancesRespondToSelector:(NSSelectorFromString(@"setTintColor:"))]) {
-      [button setTitleColor:BIT_RGBCOLOR(0, 122, 255) forState:UIControlStateNormal];
-    }
-    [containerView addSubview:button];
-    [button addTarget:self
-               action:@selector(handleWebLoginButton:)
-     forControlEvents:UIControlEventTouchUpInside];
-    self.tableView.tableFooterView = containerView;
-  } else {
-    self.tableView.tableFooterView = nil;
-  }
-}
-
-- (IBAction) handleWebLoginButton:(id) __unused sender {
-  [self.delegate authenticationViewControllerDidTapWebButton:self];
-}
-
-- (void)setEmail:(NSString *)email {
-  _email = email;
-  if(self.isViewLoaded) {
-    self.emailField.text = email;
-  }
-}
-
-- (void)setTableViewTitle:(NSString *)viewDescription {
-  _tableViewTitle = [viewDescription copy];
-  if(self.isViewLoaded) {
-    [self.tableView reloadData];
-  }
-}
-#pragma mark - UIViewController Rotation
-
--(UIInterfaceOrientationMask)supportedInterfaceOrientations {
-  return UIInterfaceOrientationMaskAll;
-}
-
-#pragma mark - Private methods
-- (BOOL)allRequiredFieldsEntered {
-  if (self.requirePassword && [self.password length] == 0)
-    return NO;
-  
-  if (![self.email length] || !bit_validateEmail(self.email))
-    return NO;
-  
-  return YES;
-}
-
-#pragma mark - Table view data source
-
-- (NSInteger)numberOfSectionsInTableView:(UITableView *) __unused tableView {
-  return 2;
-}
-
-- (NSInteger)tableView:(UITableView *) __unused tableView numberOfRowsInSection:(NSInteger)section {
-  if (section == 0) return 0;
-  
-  if(self.showsLoginViaWebButton) {
-    return 0;
-  } else {
-    NSInteger rows = 1;
-    
-    if ([self requirePassword]) rows ++;
-    
-    return rows;
-  }
-}
-
-- (NSString *)tableView:(UITableView *) __unused tableView titleForFooterInSection:(NSInteger)section {
-  if (section == 0) {
-    return self.tableViewTitle;
-  }
-  
-  return nil;
-}
-
-- (UITableViewCell *)tableView:(UITableView *) __unused tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath {
-  static NSString *CellIdentifier = @"InputCell";
-  
-  UITableViewCell *cell = [self.tableView dequeueReusableCellWithIdentifier:CellIdentifier];
-  if (cell == nil) {
-    cell = [[UITableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:CellIdentifier];
-    
-    cell.accessoryType = UITableViewCellAccessoryNone;
-    cell.selectionStyle = UITableViewCellSelectionStyleNone;
-    cell.backgroundColor = [UIColor whiteColor];
-    
-    UITextField *textField = [[UITextField alloc] initWithFrame:CGRectMake(130, 11, self.view.frame.size.width - 130 - 25, 24)];
-    if (UI_USER_INTERFACE_IDIOM() != UIUserInterfaceIdiomPad) {
-      textField.autoresizingMask = UIViewAutoresizingFlexibleWidth;
-    }
-    textField.adjustsFontSizeToFitWidth = YES;
-    textField.textColor = [UIColor blackColor];
-    textField.backgroundColor = [UIColor lightGrayColor];
-    
-    if (0 == [indexPath row]) {
-      textField.placeholder = BITHockeyLocalizedString(@"HockeyAuthenticationViewControllerEmailPlaceholder");
-      textField.accessibilityHint = BITHockeyLocalizedString(@"HockeyAccessibilityHintRequired");
-      textField.text = self.email;
-      self.emailField = textField;
-      
-      textField.keyboardType = UIKeyboardTypeEmailAddress;
-      if ([self requirePassword])
-        textField.returnKeyType = UIReturnKeyNext;
-      else
-        textField.returnKeyType = UIReturnKeyDone;
-      
-      [textField addTarget:self action:@selector(userEmailEntered:) forControlEvents:UIControlEventEditingChanged];
-      [textField becomeFirstResponder];
-    } else {
-      textField.placeholder = BITHockeyLocalizedString(@"HockeyAuthenticationViewControllerPasswordPlaceholder");
-      textField.text = self.password;
-      
-      textField.keyboardType = UIKeyboardTypeDefault;
-      textField.returnKeyType = UIReturnKeyDone;
-      textField.secureTextEntry = YES;
-      [textField addTarget:self action:@selector(userPasswordEntered:) forControlEvents:UIControlEventEditingChanged];
-    }
-    
-    textField.backgroundColor = [UIColor whiteColor];
-    textField.autocorrectionType = UITextAutocorrectionTypeNo;
-    textField.autocapitalizationType = UITextAutocapitalizationTypeNone;
-    textField.textAlignment = NSTextAlignmentLeft;
-    textField.delegate = self;
-    textField.tag = indexPath.row;
-    
-    textField.clearButtonMode = UITextFieldViewModeWhileEditing;
-    [textField setEnabled: YES];
-    
-    [cell addSubview:textField];
-  }
-  
-  if (0 == [indexPath row]) {
-    cell.textLabel.text = BITHockeyLocalizedString(@"HockeyAuthenticationViewControllerEmailDescription");
-  } else {
-    cell.textLabel.text = BITHockeyLocalizedString(@"HockeyAuthenticationViewControllerPasswordDescription");
-  }
-  
-  return cell;
-}
-
-
-- (void)userEmailEntered:(id)sender {
-  self.email = [(UITextField *)sender text];
-  
-  self.navigationItem.rightBarButtonItem.enabled = [self allRequiredFieldsEntered];
-}
-
-- (void)userPasswordEntered:(id)sender {
-  self.password = [(UITextField *)sender text];
-  
-  self.navigationItem.rightBarButtonItem.enabled = [self allRequiredFieldsEntered];
-}
-
-#pragma mark - UITextFieldDelegate
-
-- (BOOL)textFieldShouldReturn:(UITextField *)textField {
-  NSInteger nextTag = textField.tag + 1;
-  
-  UIResponder* nextResponder = [self.view viewWithTag:nextTag];
-  if (nextResponder) {
-    [nextResponder becomeFirstResponder];
-  } else {
-    if ([self allRequiredFieldsEntered]) {
-      if ([textField isFirstResponder])
-        [textField resignFirstResponder];
-      
-      [self saveAction:nil];
-    }
-  }
-  return NO;
-}
-
-#pragma mark - Actions
-- (void)saveAction:(id) __unused sender {
-  [self setLoginUIEnabled:NO];
-  
-  __weak typeof(self) weakSelf = self;
-  [self.delegate authenticationViewController:self
-                handleAuthenticationWithEmail:self.email
-                                     password:self.password
-                                   completion:^(BOOL succeeded, NSError *error) {
-                                     if(succeeded) {
-                                       //controller should dismiss us shortly..
-                                     } else {
-                                       dispatch_async(dispatch_get_main_queue(), ^{
-                                         UIAlertController *alertController = [UIAlertController alertControllerWithTitle:nil
-                                                                                                                  message:error.localizedDescription
-                                                                                                           preferredStyle:UIAlertControllerStyleAlert];
-                                         UIAlertAction *okAction = [BITAlertAction actionWithTitle:BITHockeyLocalizedString(@"OK")
-                                                                                            style:UIAlertActionStyleCancel
-                                                                                          handler:^(UIAlertAction __unused *action) {}];
-                                         [alertController addAction:okAction];
-                                         [self presentViewController:alertController animated:YES completion:nil];
-                                         typeof(self) strongSelf = weakSelf;
-                                         [strongSelf setLoginUIEnabled:YES];
-                                       });
-                                     }
-                                   }];
-}
-
-- (void) setLoginUIEnabled:(BOOL) enabled {
-  self.navigationItem.rightBarButtonItem.enabled = enabled;
-  self.tableView.userInteractionEnabled = enabled;
-}
-
-@end
-
-#endif  /* HOCKEYSDK_FEATURE_AUTHENTICATOR */
diff --git a/submodules/HockeySDK-iOS/Classes/BITAuthenticator.h b/submodules/HockeySDK-iOS/Classes/BITAuthenticator.h
deleted file mode 100644
index a1eaac1ad6..0000000000
--- a/submodules/HockeySDK-iOS/Classes/BITAuthenticator.h
+++ /dev/null
@@ -1,385 +0,0 @@
-/*
- * Author: Stephan Diederich, Andreas Linde
- *
- * Copyright (c) 2013-2014 HockeyApp, Bit Stadium GmbH.
- * All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person
- * obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without
- * restriction, including without limitation the rights to use,
- * copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following
- * conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
- * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#import <Foundation/Foundation.h>
-
-#import "BITHockeyBaseManager.h"
-
-/**
- * Identification Types
- */
-typedef NS_ENUM(NSUInteger, BITAuthenticatorIdentificationType) {
-  /**
-   * Assigns this app an anonymous user id.
-   * <br/><br/>
-   * The user will not be asked anything and an anonymous ID will be generated.
-   * This helps identifying this installation being unique but HockeyApp won't be able
-   * to identify who actually is running this installation and on which device
-   * the app is installed.
-   */
-  BITAuthenticatorIdentificationTypeAnonymous,
-  /**
-   * Ask for the HockeyApp account email
-   * <br/><br/>
-   * This will present a user interface requesting the user to provide their
-   * HockeyApp user email address.
-   * <br/><br/>
-   * The provided email address has to match an email address of a registered
-   * HockeyApp user who is a member or tester of the app
-   */
-  BITAuthenticatorIdentificationTypeHockeyAppEmail,
-  /**
-   * Ask for the HockeyApp account by email and password
-   * <br/><br/>
-   * This will present a user interface requesting the user to provide their
-   * HockeyApp user credentials.
-   * <br/><br/>
-   * The provided user account has to match a registered HockeyApp user who is
-   * a member or tester of the app
-   */
-  BITAuthenticatorIdentificationTypeHockeyAppUser,
-  /**
-   * Identifies the current device
-   * <br/><br/>
-   * This will open the HockeyApp web page on the device in Safari and request the user
-   * to submit the device's unique identifier to the app. If the web page session is not aware
-   * of the current devices UDID, it will request the user to install the HockeyApp web clip
-   * which will provide the UDID to users session in the browser.
-   * <br/><br/>
-   * This requires the app to register an URL scheme. See the linked property and methods
-   * for further documentation on this.
-   */
-  BITAuthenticatorIdentificationTypeDevice,
-  /**
-   * Ask for the HockeyApp account email.
-   * <br/><br/>
-   * This will present a user interface requesting the user to start a Safari based
-   * flow to login to HockeyApp (if not already logged in) and to share the hockeyapp
-   * account's email.
-   * <br/><br/>
-   * If restrictApplicationUsage is enabled, the provided user account has to match a
-   * registered HockeyApp user who is a member or tester of the app.
-   * For identification purpose any HockeyApp user is allowed.
-   */
-  BITAuthenticatorIdentificationTypeWebAuth,
-};
-
-/**
- * Restriction enforcement styles
- *
- * Specifies how often the Authenticator checks if the user is allowed to use
- * this app.
- */
-typedef NS_ENUM(NSUInteger, BITAuthenticatorAppRestrictionEnforcementFrequency) {
-  /**
-   * Checks if the user is allowed to use the app at the first time a version is started
-   */
-  BITAuthenticatorAppRestrictionEnforcementOnFirstLaunch,
-  /**
-   * Checks if the user is allowed to use the app every time the app becomes active
-   */
-  BITAuthenticatorAppRestrictionEnforcementOnAppActive,
-};
-
-@protocol BITAuthenticatorDelegate;
-
-
-/**
- * Identify and authenticate users of Ad-Hoc or Enterprise builds
- *
- * `BITAuthenticator` serves 2 purposes:
- *
- * 1. Identifying who is running your Ad-Hoc or Enterprise builds
- *    `BITAuthenticator` provides an identifier for the rest of the HockeySDK
- *    to work with, e.g. in-app update checks and crash reports.
- *
- * 2. Optional regular checking if an identified user is still allowed
- *    to run this application. The `BITAuthenticator` can be used to make
- *    sure only users who are testers of your app are allowed to run it.
- *
- * This module automatically disables itself when running in an App Store build by default!
- *
- * @warning It is mandatory to call `authenticateInstallation` somewhen after calling
- * `[[BITHockeyManager sharedHockeyManager] startManager]` or fully customize the identification
- * and validation workflow yourself.
- * If your app shows a modal view on startup, make sure to call `authenticateInstallation`
- * either once your modal view is fully presented (e.g. its `viewDidLoad:` method is processed)
- * or once your modal view is dismissed.
- */
-@interface BITAuthenticator : BITHockeyBaseManager
-
-#pragma mark - Configuration
-
-
-///-----------------------------------------------------------------------------
-/// @name Configuration
-///-----------------------------------------------------------------------------
-
-
-/**
- * Defines the identification mechanism to be used
- *
- * _Default_: `BITAuthenticatorIdentificationTypeAnonymous`
- *
- * @see BITAuthenticatorIdentificationType
- */
-@property (nonatomic, assign) BITAuthenticatorIdentificationType identificationType;
-
-
-/**
- * Enables or disables checking if the user is allowed to run this app
- *
- * If disabled, the Authenticator never validates, besides initial identification,
- * if the user is allowed to run this application.
- *
- * If enabled, the Authenticator checks depending on `restrictionEnforcementFrequency`
- * if the user is allowed to use this application.
- *
- * Enabling this property and setting `identificationType` to `BITAuthenticatorIdentificationTypeHockeyAppEmail`,
- * `BITAuthenticatorIdentificationTypeHockeyAppUser` or `BITAuthenticatorIdentificationTypeWebAuth` also allows
- * to remove access for users by removing them from the app's users list on HockeyApp.
- *
- *  _Default_: `NO`
- *
- * @warning if `identificationType` is set to `BITAuthenticatorIdentificationTypeAnonymous`,
- *          this property has no effect.
- *
- * @see BITAuthenticatorIdentificationType
- * @see restrictionEnforcementFrequency
- */
-@property (nonatomic, assign) BOOL restrictApplicationUsage;
-
-/**
- * Defines how often the BITAuthenticator checks if the user is allowed
- * to run this application
- *
- * This requires `restrictApplicationUsage` to be enabled.
- *
- * _Default_: `BITAuthenticatorAppRestrictionEnforcementOnFirstLaunch`
- *
- * @see BITAuthenticatorAppRestrictionEnforcementFrequency
- * @see restrictApplicationUsage
- */
-@property (nonatomic, assign) BITAuthenticatorAppRestrictionEnforcementFrequency restrictionEnforcementFrequency;
-
-/**
- * The authentication secret from HockeyApp. To find the right secret, 
- * click on your app on the HockeyApp dashboard, then on Show next to 
- * "Secret:".
- *
- * This is only needed if `identificationType` is set to `BITAuthenticatorIdentificationTypeHockeyAppEmail`
- *
- * @see identificationType
- */
-@property (nonatomic, copy) NSString *authenticationSecret;
-
-
-#pragma mark - Device based identification
-
-///-----------------------------------------------------------------------------
-/// @name Device based identification
-///-----------------------------------------------------------------------------
-
-
-/**
- * The baseURL of the webpage the user is redirected to if `identificationType` is
- * set to `BITAuthenticatorIdentificationTypeDevice`; defaults to https://rink.hockeyapp.net.
- *
- * @see identificationType
- */
-@property (nonatomic, strong) NSURL *webpageURL;
-
-/**
- * URL to query the device's id via external webpage
- * Built with the baseURL set in `webpageURL`.
- */
-- (NSURL*) deviceAuthenticationURL;
-
-/**
- * The url-scheme used to identify via `BITAuthenticatorIdentificationTypeDevice`
- *
- * Please make sure that the URL scheme is unique and not shared with other apps.
- *
- * If set to nil, the default scheme is used which is `ha<APP_ID>`.
- *
- * @see identificationType
- * @see handleOpenURL:sourceApplication:annotation:
- */
-@property (nonatomic, copy) NSString *urlScheme;
-
-/**
- Should be used by the app-delegate to forward handle application:openURL:sourceApplication:annotation: calls.
- 
- This is required if `identificationType` is set to `BITAuthenticatorIdentificationTypeDevice`.
- Your app needs to implement the default `ha<APP_ID>` URL scheme or register its own scheme
- via `urlScheme`.
- BITAuthenticator checks if the given URL is actually meant to be parsed by it and will
- return NO if it doesn't think so. It does this by checking the 'host'-part of the URL to be 'authorize', as well
- as checking the protocol part.
- Please make sure that if you're using a custom URL scheme, it does _not_ conflict with BITAuthenticator's.
- If BITAuthenticator thinks the URL was meant to be an authorization URL, but could not find a valid token, it will
- reset the stored identification token and state.
- 
- Sample usage (in AppDelegate):
- 
-    - (BOOL)application:(UIApplication *)application
-                openURL:(NSURL *)url
-      sourceApplication:(NSString *)sourceApplication annotation:(id)annotation {
-      if ([[BITHockeyManager sharedHockeyManager].authenticator handleOpenURL:url
-                                                            sourceApplication:sourceApplication
-                                                                   annotation:annotation]) {
-        return YES;
-      } else {
-        //do your own URL handling, return appropriate value
-      }
-      return NO;
-    }
- 
- @param url Param `url` that was passed to the app
- @param sourceApplication Param `sourceApplication` that was passed to the app
- @param annotation Param `annotation` that was passed to the app
- 
- @return YES if the URL request was handled, NO if the URL could not be handled/identified.
- 
- @see identificationType
- @see urlScheme
- */
-- (BOOL) handleOpenURL:(NSURL *) url
-     sourceApplication:(NSString *) sourceApplication
-            annotation:(id) annotation;
-
-#pragma mark - Authentication
-
-///-----------------------------------------------------------------------------
-/// @name Authentication
-///-----------------------------------------------------------------------------
-
-/**
- * Invoked automatic identification and validation
- *
- * If the `BITAuthenticator` is in automatic mode this will initiate identifying
- * the current user according to the type specified in `identificationType` and
- * validate if the identified user is allowed to run this application.
- *
- * If the user is not yet identified it will present a modal view asking the user to
- * provide the required information.
- *
- * If your app provides it's own startup modal screen, e.g. a guide or a login, then
- * you might either call this method once that UI is fully presented or once
- * the user e.g. did actually login already.
- *
- * @warning You need to call this method in your code even if automatic mode is enabled!
- *
- * @see identificationType
- */
-- (void) authenticateInstallation;
-
-/**
- * Identifies the user according to the type specified in `identificationType`.
- *
- * If the `BITAuthenticator` is in manual mode, it's your responsibility to call
- * this method. Depending on the `identificationType`, this method
- * might present a viewController to let the user enter his/her credentials.
- *
- * If the Authenticator is in auto-mode, this is called by the authenticator itself
- * once needed.
- *
- * @see identificationType
- * @see authenticateInstallation
- * @see validateWithCompletion:
- *
- * @param completion Block being executed once identification completed. Be sure to properly dispatch code to the main queue if necessary.
- */
-- (void) identifyWithCompletion:(void(^)(BOOL identified, NSError *error)) completion;
-
-/**
- * Returns YES if this app is identified according to the setting in `identificationType`.
- *
- * Since the identification process is done asynchronously (contacting the server),
- * you need to observe the value change via KVO.
- *
- * @see identificationType
- */
-@property (nonatomic, assign, readonly, getter = isIdentified) BOOL identified;
-
-/**
- * Validates if the identified user is allowed to run this application. This checks
- * with the HockeyApp backend and calls the completion-block once completed.
- *
- * If the `BITAuthenticator` is in manual mode, it's your responsibility to call
- * this method. If the application is not yet identified, validation is not possible
- * and the completion-block is called with an error set.
- *
- * If the `BITAuthenticator` is in auto-mode, this is called by the authenticator itself
- * once needed.
- *
- * @see identificationType
- * @see authenticateInstallation
- * @see identifyWithCompletion:
- *
- * @param completion Block being executed once validation completed. Be sure to properly dispatch code to the main queue if necessary.
- */
-- (void) validateWithCompletion:(void(^)(BOOL validated, NSError *error)) completion;
-
-/**
- * Indicates if this installation is validated.
- */
-@property (nonatomic, assign, readonly, getter = isValidated) BOOL validated;
-
-/**
- * Removes all previously stored authentication tokens, UDIDs, etc.
- */
-- (void) cleanupInternalStorage;
-
-/**
- * Returns different values depending on `identificationType`. This can be used 
- * by the application to identify the user.
- *
- * @see identificationType
- */
-- (NSString*) publicInstallationIdentifier;
-@end
-
-#pragma mark - Protocol
-
-/**
- * `BITAuthenticator` protocol
- */
-@protocol BITAuthenticatorDelegate <NSObject>
-
-@optional
-/**
- * If the authentication (or validation) needs to identify the user,
- * this delegate method is called with the viewController that we'll present.
- *
- * @param authenticator `BITAuthenticator` object
- * @param viewController `UIViewController` used to identify the user
- *
- */
-- (void) authenticator:(BITAuthenticator *)authenticator willShowAuthenticationController:(UIViewController*) viewController;
-@end
diff --git a/submodules/HockeySDK-iOS/Classes/BITAuthenticator.m b/submodules/HockeySDK-iOS/Classes/BITAuthenticator.m
deleted file mode 100644
index f197219992..0000000000
--- a/submodules/HockeySDK-iOS/Classes/BITAuthenticator.m
+++ /dev/null
@@ -1,990 +0,0 @@
-/*
- * Author: Stephan Diederich
- *
- * Copyright (c) 2013-2014 HockeyApp, Bit Stadium GmbH.
- * All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person
- * obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without
- * restriction, including without limitation the rights to use,
- * copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following
- * conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
- * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
- */
-
-
-#import "HockeySDK.h"
-
-#if HOCKEYSDK_FEATURE_AUTHENTICATOR
-
-#import "HockeySDKPrivate.h"
-#import "BITAuthenticator_Private.h"
-#import "BITAuthenticationViewController.h"
-#import "BITHockeyAppClient.h"
-#import "BITHockeyHelper.h"
-#import "BITHockeyHelper+Application.h"
-#import "BITHockeyBaseManagerPrivate.h"
-
-#include <sys/stat.h>
-
-static NSString *const kBITAuthenticatorUUIDKey = @"BITAuthenticatorUUIDKey";
-static NSString *const kBITAuthenticatorIdentifierKey = @"BITAuthenticatorIdentifierKey";
-static NSString *const kBITAuthenticatorIdentifierTypeKey = @"BITAuthenticatorIdentifierTypeKey";
-static NSString *const kBITAuthenticatorLastAuthenticatedVersionKey = @"BITAuthenticatorLastAuthenticatedVersionKey";
-static NSString *const kBITAuthenticatorUserEmailKey = @"BITAuthenticatorUserEmailKey";
-
-//deprecated
-static NSString *const kBITAuthenticatorAuthTokenKey = @"BITAuthenticatorAuthTokenKey";
-static NSString *const kBITAuthenticatorAuthTokenTypeKey = @"BITAuthenticatorAuthTokenTypeKey";
-
-typedef unsigned int bit_uint32;
-static unsigned char kBITPNGHeader[8] = {137, 80, 78, 71, 13, 10, 26, 10};
-static unsigned char kBITPNGEndChunk[4] = {0x49, 0x45, 0x4e, 0x44};
-
-
-@interface BITAuthenticator()
-
-@property (nonatomic, assign) BOOL isSetup;
-
-@property (nonatomic, strong) id appDidBecomeActiveObserver;
-@property (nonatomic, strong) id appDidEnterBackgroundObserver;
-@property (nonatomic, strong) UIViewController *authenticationController;
-
-@end
-
-
-@implementation BITAuthenticator
-
-- (instancetype)initWithAppIdentifier:(NSString *)appIdentifier appEnvironment:(BITEnvironment)environment {
-  self = [super initWithAppIdentifier:appIdentifier appEnvironment:environment];
-  if (self) {
-    _webpageURL = [NSURL URLWithString:@"https://rink.hockeyapp.net/"];
-    
-    _identificationType = BITAuthenticatorIdentificationTypeAnonymous;
-    _isSetup = NO;
-    _restrictApplicationUsage = NO;
-    _restrictionEnforcementFrequency = BITAuthenticatorAppRestrictionEnforcementOnFirstLaunch;
-  }
-  return self;
-}
-
-- (void)dealloc {
-  [self unregisterObservers];
-}
-
-#pragma mark - BITHockeyBaseManager overrides
-
-- (void)startManager {
-  //disabled in TestFlight and the AppStore
-  if (self.appEnvironment != BITEnvironmentOther) { return; }
-  
-  self.isSetup = YES;
-}
-
-#pragma mark -
-
-- (void)authenticateInstallation {
-  //disabled in TestFlight and the AppStore
-  if (self.appEnvironment != BITEnvironmentOther) { return; }
-  
-  // make sure this is called after startManager so all modules are fully setup
-  if (!self.isSetup) {
-    [NSObject cancelPreviousPerformRequestsWithTarget:self selector:@selector(authenticateInstallation) object:nil];
-    [self performSelector:@selector(authenticateInstallation) withObject:nil afterDelay:0.1];
-  } else {
-    switch ([BITHockeyHelper applicationState]) {
-      case BITApplicationStateActive:
-        [self authenticate];
-        break;
-      case BITApplicationStateBackground:
-      case BITApplicationStateInactive:
-      case BITApplicationStateUnknown:
-        // do nothing, wait for active state
-        break;
-    }
-  }
-  [self registerObservers];
-}
-
-- (void)authenticate {
-  [self identifyWithCompletion:^(BOOL identified, NSError *error) {
-    if (identified) {
-      if ([self needsValidation]) {
-        [self validate];
-      } else {
-        [self dismissAuthenticationControllerAnimated:YES completion:nil];
-      }
-    } else {
-      BITHockeyLogError(@"Failed to identify. Error: %@", error);
-    }
-  }];
-}
-
-#pragma mark - Identification
-
-- (void)identifyWithCompletion:(void (^)(BOOL identified, NSError *))completion {
-  if (self.authenticationController) {
-    BITHockeyLogDebug(@"Authentication controller already visible. Ignoring identify request");
-    if (completion) { completion(NO, nil); }
-    return;
-  }
-  //first check if the stored identification type matches the one currently configured
-  NSString *storedTypeString = [self stringValueFromKeychainForKey:kBITAuthenticatorIdentifierTypeKey];
-  NSString *configuredTypeString = [self.class stringForIdentificationType:self.identificationType];
-  if (storedTypeString && ![storedTypeString isEqualToString:configuredTypeString]) {
-    BITHockeyLogDebug(@"Identification type mismatch for stored auth-token. Resetting.");
-    [self storeInstallationIdentifier:nil withType:BITAuthenticatorIdentificationTypeAnonymous];
-  }
-  
-  NSString *identification = [self installationIdentifier];
-  
-  if (identification) {
-    self.identified = YES;
-    if (completion) { completion(YES, nil); }
-    return;
-  }
-  
-  [self processFullSizeImage];
-  if (self.identified) {
-    if (completion) { completion(YES, nil); }
-    return;
-  }
-  
-  //it's not identified yet, do it now
-  BITAuthenticationViewController *viewController = nil;
-  switch (self.identificationType) {
-    case BITAuthenticatorIdentificationTypeAnonymous:
-      [self storeInstallationIdentifier:bit_UUID() withType:BITAuthenticatorIdentificationTypeAnonymous];
-      self.identified = YES;
-      if (completion) { completion(YES, nil); }
-      return;
-    case BITAuthenticatorIdentificationTypeHockeyAppUser:
-      viewController = [[BITAuthenticationViewController alloc] initWithDelegate:self];
-      viewController.requirePassword = YES;
-      viewController.tableViewTitle = BITHockeyLocalizedString(@"HockeyAuthenticationViewControllerDataEmailAndPasswordDescription");
-      break;
-    case BITAuthenticatorIdentificationTypeDevice:
-      viewController = [[BITAuthenticationViewController alloc] initWithDelegate:self];
-      viewController.requirePassword = NO;
-      viewController.showsLoginViaWebButton = YES;
-      viewController.tableViewTitle = BITHockeyLocalizedString(@"HockeyAuthenticationViewControllerWebUDIDLoginDescription");
-      break;
-    case BITAuthenticatorIdentificationTypeWebAuth:
-      viewController = [[BITAuthenticationViewController alloc] initWithDelegate:self];
-      viewController.requirePassword = NO;
-      viewController.showsLoginViaWebButton = YES;
-      viewController.tableViewTitle = BITHockeyLocalizedString(@"HockeyAuthenticationViewControllerWebAuthLoginDescription");
-      break;
-    case BITAuthenticatorIdentificationTypeHockeyAppEmail:
-      if (nil == self.authenticationSecret) {
-        NSError *error = [NSError errorWithDomain:kBITAuthenticatorErrorDomain
-                                             code:BITAuthenticatorAuthorizationSecretMissing
-                                         userInfo:@{NSLocalizedDescriptionKey:@"For email identification, the authentication secret must be set"}];
-        if (completion) { completion(NO, error); }
-        return;
-      }
-      viewController = [[BITAuthenticationViewController alloc] initWithDelegate:self];
-      viewController.requirePassword = NO;
-      viewController.tableViewTitle = BITHockeyLocalizedString(@"HockeyAuthenticationViewControllerDataEmailDescription");
-      break;
-  }
-  id strongDelegate = self.delegate;
-  if ([strongDelegate respondsToSelector:@selector(authenticator:willShowAuthenticationController:)]) {
-    [strongDelegate authenticator:self willShowAuthenticationController:viewController];
-  }
-  
-  NSAssert(viewController, @"ViewController should've been created");
-  
-  viewController.email = [self stringValueFromKeychainForKey:kBITAuthenticatorUserEmailKey];
-  self.authenticationController = viewController;
-  self.identificationCompletion = completion;
-  dispatch_async(dispatch_get_main_queue(), ^{
-    [self showView:viewController];
-  });
-}
-
-#pragma mark - Validation
-
-- (BOOL)needsValidation {
-  if (BITAuthenticatorIdentificationTypeAnonymous == self.identificationType) {
-    return NO;
-  }
-  if (NO == self.restrictApplicationUsage) {
-    return NO;
-  }
-  if (self.restrictionEnforcementFrequency == BITAuthenticatorAppRestrictionEnforcementOnFirstLaunch &&
-      ![self.executableUUID isEqualToString:self.lastAuthenticatedVersion]) {
-    return YES;
-  }
-  if (NO == self.isValidated && self.restrictionEnforcementFrequency == BITAuthenticatorAppRestrictionEnforcementOnAppActive) {
-    return YES;
-  }
-  return NO;
-}
-
-- (void)validate {
-  [self validateWithCompletion:^(BOOL validated, NSError *error) {
-    dispatch_async(dispatch_get_main_queue(), ^{
-      if (validated) {
-        [self dismissAuthenticationControllerAnimated:YES completion:nil];
-      } else {
-        BITHockeyLogError(@"Validation failed with error: %@", error);
-        __weak typeof(self) weakSelf = self;
-
-        UIAlertController *alertController = [UIAlertController alertControllerWithTitle:nil
-                                                                                 message:error.localizedDescription
-                                                                          preferredStyle:UIAlertControllerStyleAlert];
-        UIAlertAction *okAction = [BITAlertAction actionWithTitle:BITHockeyLocalizedString(@"HockeyOK")
-                                                           style:UIAlertActionStyleDefault
-                                                         handler:^(UIAlertAction __unused *action) {
-                                                           typeof(self) strongSelf = weakSelf;
-                                                           [strongSelf validate];
-                                                         }];
-
-        [alertController addAction:okAction];
-        [self showAlertController:alertController];
-      }
-    });
-  }];
-}
-
-- (void)validateWithCompletion:(void (^)(BOOL validated, NSError *))completion {
-  BOOL requirementsFulfilled = YES;
-  NSError *error = nil;
-  switch (self.identificationType) {
-    case BITAuthenticatorIdentificationTypeAnonymous: {
-      error = [NSError errorWithDomain:kBITAuthenticatorErrorDomain
-                                  code:BITAuthenticatorErrorUnknown
-                              userInfo:@{NSLocalizedDescriptionKey:@"Anonymous users can't be validated"}];
-      requirementsFulfilled = NO;
-      break;
-    }
-    case BITAuthenticatorIdentificationTypeHockeyAppEmail:
-      if (nil == self.authenticationSecret) {
-        error = [NSError errorWithDomain:kBITAuthenticatorErrorDomain
-                                    code:BITAuthenticatorAuthorizationSecretMissing
-                                userInfo:@{NSLocalizedDescriptionKey:@"For email validation, the authentication secret must be set"}];
-        requirementsFulfilled = NO;
-        break;
-      }
-      //no break
-    case BITAuthenticatorIdentificationTypeDevice:
-    case BITAuthenticatorIdentificationTypeHockeyAppUser:
-    case BITAuthenticatorIdentificationTypeWebAuth:
-      if (nil == self.installationIdentifier) {
-        error = [NSError errorWithDomain:kBITAuthenticatorErrorDomain
-                                    code:BITAuthenticatorNotIdentified
-                                userInfo:@{NSLocalizedDescriptionKey:@"Make sure to identify the installation first"}];
-        requirementsFulfilled = NO;
-      }
-      break;
-  }
-  if (NO == requirementsFulfilled) {
-    if (completion) {
-      completion(NO, error);
-    }
-    return;
-  }
-  
-  NSString *validationPath = [NSString stringWithFormat:@"api/3/apps/%@/identity/validate", self.encodedAppIdentifier];
-  
-  __weak typeof(self) weakSelf = self;
-  NSURLRequest *request = [self.hockeyAppClient requestWithMethod:@"GET" path:validationPath parameters:[self validationParameters]];
-
-  NSURLSessionConfiguration *sessionConfiguration = [NSURLSessionConfiguration defaultSessionConfiguration];
-  __block NSURLSession *session = [NSURLSession sessionWithConfiguration:sessionConfiguration];
-
-  NSURLSessionDataTask *task = [session dataTaskWithRequest:request
-                                          completionHandler:^(NSData *data, NSURLResponse __unused *response, NSError *innerError) {
-                                            typeof(self) strongSelf = weakSelf;
-
-                                            [session finishTasksAndInvalidate];
-
-                                            [strongSelf handleValidationResponseWithData:data error:innerError completion:completion];
-                                          }];
-  [task resume];
-}
-
-- (void)handleValidationResponseWithData:(NSData *)responseData error:(NSError *)error completion:(void (^)(BOOL validated, NSError *))completion {
-  if (nil == responseData) {
-    NSDictionary *userInfo = @{NSLocalizedDescriptionKey:BITHockeyLocalizedString(@"HockeyAuthenticationFailedAuthenticate")};
-    if (error) {
-      NSMutableDictionary *dict = [userInfo mutableCopy];
-      dict[NSUnderlyingErrorKey] = error;
-      userInfo = dict;
-    }
-    NSError *localError = [NSError errorWithDomain:kBITAuthenticatorErrorDomain
-                                         code:BITAuthenticatorNetworkError
-                                     userInfo:userInfo];
-    self.validated = NO;
-    if (completion) { completion(NO, localError); }
-  } else {
-    NSError *validationParseError = nil;
-    BOOL valid = [self.class isValidationResponseValid:responseData error:&validationParseError];
-    self.validated = valid;
-    if (valid) {
-      [self setLastAuthenticatedVersion:self.executableUUID];
-    }
-    if (completion) { completion(valid, validationParseError); }
-  }
-}
-
-- (NSDictionary *)validationParameters {
-  NSParameterAssert(self.installationIdentifier);
-  NSParameterAssert(self.installationIdentifierParameterString);
-  
-  NSString *installString = bit_appAnonID(NO);
-  if (installString) {
-    return @{self.installationIdentifierParameterString:self.installationIdentifier, @"install_string":installString};
-  }
-  
-  return @{self.installationIdentifierParameterString:self.installationIdentifier};
-}
-
-+ (BOOL)isValidationResponseValid:(id)response error:(NSError *__autoreleasing *)error {
-  NSParameterAssert(response);
-  
-  NSError *jsonParseError = nil;
-  id jsonObject = [NSJSONSerialization JSONObjectWithData:response
-                                                  options:0
-                                                    error:&jsonParseError];
-  if (nil == jsonObject) {
-    if (error) {
-      *error = [NSError errorWithDomain:kBITAuthenticatorErrorDomain
-                                   code:BITAuthenticatorAPIServerReturnedInvalidResponse
-                               userInfo:@{NSLocalizedDescriptionKey:BITHockeyLocalizedString(@"HockeyAuthenticationFailedAuthenticate")}];
-    }
-    return NO;
-  }
-  if (![jsonObject isKindOfClass:[NSDictionary class]]) {
-    if (error) {
-      *error = [NSError errorWithDomain:kBITAuthenticatorErrorDomain
-                                   code:BITAuthenticatorAPIServerReturnedInvalidResponse
-                               userInfo:@{NSLocalizedDescriptionKey:BITHockeyLocalizedString(@"HockeyAuthenticationFailedAuthenticate")}];
-    }
-    return NO;
-  }
-  
-  NSString *status = jsonObject[@"status"];
-  if ([status isEqualToString:@"not authorized"]) {
-    if (error) {
-      *error = [NSError errorWithDomain:kBITAuthenticatorErrorDomain
-                                   code:BITAuthenticatorNotAuthorized
-                               userInfo:@{NSLocalizedDescriptionKey:BITHockeyLocalizedString(@"HockeyAuthenticationNotMember")}];
-    }
-    return NO;
-  } else if ([status isEqualToString:@"not found"]) {
-    if (error) {
-      *error = [NSError errorWithDomain:kBITAuthenticatorErrorDomain
-                                   code:BITAuthenticatorUnknownApplicationID
-                               userInfo:@{NSLocalizedDescriptionKey:BITHockeyLocalizedString(@"HockeyAuthenticationContactDeveloper")}];
-    }
-    return NO;
-  } else if ([status isEqualToString:@"validated"]) {
-    return YES;
-  } else {
-    if (error) {
-      *error = [NSError errorWithDomain:kBITAuthenticatorErrorDomain
-                                   code:BITAuthenticatorAPIServerReturnedInvalidResponse
-                               userInfo:@{NSLocalizedDescriptionKey:BITHockeyLocalizedString(@"HockeyAuthenticationFailedAuthenticate")}];
-    }
-    return NO;
-  }
-}
-
-#pragma mark - AuthenticationViewController Helper
-
-/**
- * This method has to be called on the main queue
- */
-- (void)dismissAuthenticationControllerAnimated:(BOOL)animated completion:(void (^)(void))completion {
-  if (!self.authenticationController) { return; }
-  UIViewController *presentingViewController = [self.authenticationController presentingViewController];
-  
-  // If there is no presenting view controller just remove view
-  if (presentingViewController) {
-    [self.authenticationController dismissViewControllerAnimated:animated completion:completion];
-  } else {
-    [self.authenticationController.navigationController.view removeFromSuperview];
-    if (completion) {
-      completion();
-    }
-  }
-  self.authenticationController = nil;
-}
-
-#pragma mark - AuthenticationViewControllerDelegate
-
-- (void)authenticationViewController:(UIViewController *)viewController
-       handleAuthenticationWithEmail:(NSString *)email
-                            password:(NSString *)password
-                          completion:(void (^)(BOOL, NSError *))completion {
-  
-  NSParameterAssert(email && email.length);
-  NSParameterAssert(self.identificationType == BITAuthenticatorIdentificationTypeHockeyAppEmail || (password && password.length));
-  
-  // Trim whitespace from email in case the user has added a whitespace at the end of the email address. This shouldn't
-  // happen if devs use our UI but we've had 1-2 support tickets where the email contained whitespace at the end and
-  // verification failed because of that.
-  email = [email stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceAndNewlineCharacterSet]];
-  
-  NSURLRequest *request = [self requestForAuthenticationEmail:email password:password];
-  
-  [self authenticationViewController:viewController handleAuthenticationWithEmail:email request:request completion:completion];
-}
-
-- (void)authenticationViewController:(UIViewController *) __unused viewController
-       handleAuthenticationWithEmail:(NSString *)email
-                             request:(NSURLRequest *)request
-                          completion:(void (^)(BOOL, NSError *))completion {
-  
-  __weak typeof(self) weakSelf = self;
-  NSURLSessionConfiguration *sessionConfiguration = [NSURLSessionConfiguration defaultSessionConfiguration];
-  __block NSURLSession *session = [NSURLSession sessionWithConfiguration:sessionConfiguration];
-
-  NSURLSessionDataTask *task = [session dataTaskWithRequest:request
-                                          completionHandler:^(NSData *data, NSURLResponse *response, NSError __unused *error) {
-                                            typeof(self) strongSelf = weakSelf;
-                                            NSHTTPURLResponse *httpResponse = (NSHTTPURLResponse *)response;
-
-                                            [session finishTasksAndInvalidate];
-
-                                            [strongSelf handleAuthenticationWithResponse:httpResponse email:email data:data completion:completion];
-                                          }];
-  [task resume];
-}
-
-- (void)authenticationViewControllerDidTapWebButton:(UIViewController *) __unused viewController {
-  NSURL *url = [self deviceAuthenticationURL];
-  if (url) {
-    [[UIApplication sharedApplication] openURL:url];
-  }
-}
-
-#pragma mark - Networking
-
-- (void)handleAuthenticationWithResponse:(NSHTTPURLResponse *)response email:(NSString *)email data:(NSData *)data completion:(void (^)(BOOL, NSError *))completion {
-  NSError *authParseError = nil;
-  NSString *authToken = [self.class authenticationTokenFromURLResponse:response
-                                                                  data:data
-                                                                 error:&authParseError];
-  BOOL identified;
-  if (authToken) {
-    identified = YES;
-    [self storeInstallationIdentifier:authToken withType:self.identificationType];
-    dispatch_async(dispatch_get_main_queue(), ^{
-      [self dismissAuthenticationControllerAnimated:YES completion:nil];
-    });
-    BOOL success = [self addStringValueToKeychain:email forKey:kBITAuthenticatorUserEmailKey];
-    if (!success) {
-      [self alertOnFailureStoringTokenInKeychain];
-    }
-  } else {
-    identified = NO;
-  }
-  self.identified = identified;
-  if (completion) { completion(identified, authParseError); }
-  if (self.identificationCompletion) {
-    self.identificationCompletion(identified, authParseError);
-    self.identificationCompletion = nil;
-  }
-}
-
-- (NSURLRequest *)requestForAuthenticationEmail:(NSString *)email password:(NSString *)password {
-  NSString *authenticationPath = [self authenticationPath];
-  NSMutableDictionary *params = [NSMutableDictionary dictionary];
-  
-  NSString *installString = bit_appAnonID(NO);
-  if (installString) {
-    params[@"install_string"] = installString;
-  }
-  
-  if (BITAuthenticatorIdentificationTypeHockeyAppEmail == self.identificationType) {
-    NSString *authCode = BITHockeyMD5([NSString stringWithFormat:@"%@%@",
-                                       self.authenticationSecret ?: @"",
-                                       email ?: @""]);
-    
-    params[@"email"] = email ?: @"";
-    params[@"authcode"] = authCode.lowercaseString;
-  }
-  
-  NSMutableURLRequest *request = [self.hockeyAppClient requestWithMethod:@"POST"
-                                                                    path:authenticationPath
-                                                              parameters:params];
-  if (BITAuthenticatorIdentificationTypeHockeyAppUser == self.identificationType) {
-    NSString *authStr = [NSString stringWithFormat:@"%@:%@", email, password];
-    NSData *authData = [authStr dataUsingEncoding:NSUTF8StringEncoding];
-    NSString *authValue = [NSString stringWithFormat:@"Basic %@", [authData base64EncodedStringWithOptions:0]];
-    [request setValue:authValue forHTTPHeaderField:@"Authorization"];
-  }
-  
-  return request;
-}
-
-- (NSString *)authenticationPath {
-  if (BITAuthenticatorIdentificationTypeHockeyAppUser == self.identificationType) {
-    return [NSString stringWithFormat:@"api/3/apps/%@/identity/authorize", self.encodedAppIdentifier];
-  } else {
-    return [NSString stringWithFormat:@"api/3/apps/%@/identity/check", self.encodedAppIdentifier];
-  }
-}
-
-+ (NSString *)authenticationTokenFromURLResponse:(NSHTTPURLResponse *)urlResponse data:(NSData *)data error:(NSError *__autoreleasing *)error {
-  if (nil == urlResponse) {
-    if (error) {
-      *error = [NSError errorWithDomain:kBITAuthenticatorErrorDomain
-                                   code:BITAuthenticatorAPIServerReturnedInvalidResponse
-                               userInfo:@{NSLocalizedDescriptionKey:BITHockeyLocalizedString(@"HockeyAuthenticationFailedAuthenticate")}];
-    }
-    return nil;
-  }
-  
-  switch (urlResponse.statusCode) {
-    case 401:
-      if (error) {
-        *error = [NSError errorWithDomain:kBITAuthenticatorErrorDomain
-                                     code:BITAuthenticatorNotAuthorized
-                                 userInfo:@{
-                                            NSLocalizedDescriptionKey:BITHockeyLocalizedString(@"HockeyAuthenticationWrongEmailPassword")
-                                            }];
-      }
-      break;
-    case 200:
-    case 404:
-      //Do nothing, handled below
-      break;
-    default:
-      if (error) {
-        *error = [NSError errorWithDomain:kBITAuthenticatorErrorDomain
-                                     code:BITAuthenticatorAPIServerReturnedInvalidResponse
-                                 userInfo:@{NSLocalizedDescriptionKey:BITHockeyLocalizedString(@"HockeyAuthenticationFailedAuthenticate")}];
-        
-      }
-      break;
-  }
-  if (200 != urlResponse.statusCode && 404 != urlResponse.statusCode) {
-    //make sure we have an error created if user wanted to have one
-    NSParameterAssert(nil == error || *error);
-    return nil;
-  }
-  
-  NSError *jsonParseError = nil;
-  id jsonObject = [NSJSONSerialization JSONObjectWithData:data
-                                                  options:0
-                                                    error:&jsonParseError];
-  //no json or unexpected json
-  if (nil == jsonObject || ![jsonObject isKindOfClass:[NSDictionary class]]) {
-    if (error) {
-      NSDictionary *userInfo = @{NSLocalizedDescriptionKey:BITHockeyLocalizedString(@"HockeyAuthenticationFailedAuthenticate")};
-      if (jsonParseError) {
-        NSMutableDictionary *userInfoMutable = [userInfo mutableCopy];
-        userInfoMutable[NSUnderlyingErrorKey] = jsonParseError;
-        userInfo = userInfoMutable;
-      }
-      *error = [NSError errorWithDomain:kBITAuthenticatorErrorDomain
-                                   code:BITAuthenticatorAPIServerReturnedInvalidResponse
-                               userInfo:userInfo];
-    }
-    return nil;
-  }
-  
-  NSString *status = jsonObject[@"status"];
-  NSString *authToken = nil;
-  if ([status isEqualToString:@"identified"]) {
-    authToken = jsonObject[@"iuid"];
-  } else if ([status isEqualToString:@"authorized"]) {
-    authToken = jsonObject[@"auid"];
-  } else if ([status isEqualToString:@"not authorized"]) {
-    if (error) {
-      *error = [NSError errorWithDomain:kBITAuthenticatorErrorDomain
-                                   code:BITAuthenticatorNotAuthorized
-                               userInfo:@{NSLocalizedDescriptionKey:BITHockeyLocalizedString(@"HockeyAuthenticationNotMember")}];
-      
-    }
-  }
-  //if no error is set yet, but error parameter is given, return a generic error
-  if (nil == authToken && error && nil == *error) {
-    *error = [NSError errorWithDomain:kBITAuthenticatorErrorDomain
-                                 code:BITAuthenticatorAPIServerReturnedInvalidResponse
-                             userInfo:@{NSLocalizedDescriptionKey:BITHockeyLocalizedString(@"HockeyAuthenticationFailedAuthenticate")}];
-  }
-  return authToken;
-}
-
-- (NSURL *)deviceAuthenticationURL {
-  NSString *whatParameter = nil;
-  switch (self.identificationType) {
-    case BITAuthenticatorIdentificationTypeWebAuth:
-      whatParameter = @"email";
-      break;
-    case BITAuthenticatorIdentificationTypeDevice:
-      whatParameter = @"udid";
-      break;
-    case BITAuthenticatorIdentificationTypeAnonymous:
-    case BITAuthenticatorIdentificationTypeHockeyAppEmail:
-    case BITAuthenticatorIdentificationTypeHockeyAppUser:
-      return nil;
-  }
-  NSURL *url = [self.webpageURL URLByAppendingPathComponent:[NSString stringWithFormat:@"apps/%@/authorize", self.encodedAppIdentifier]];
-  NSParameterAssert(whatParameter && url.absoluteString);
-  url = [NSURL URLWithString:[NSString stringWithFormat:@"%@?what=%@", url.absoluteString, whatParameter]];
-  return url;
-}
-
-- (BOOL)handleOpenURL:(NSURL *)url
-    sourceApplication:(NSString *) __unused sourceApplication
-           annotation:(id)annotation {
-  //check if this URL was meant for us, if not return NO so the user can
-  //handle it
-  NSString *const kAuthorizationHost = @"authorize";
-  NSString *urlScheme = self.urlScheme ?: [NSString stringWithFormat:@"ha%@", self.appIdentifier];
-  if (!([[url scheme] isEqualToString:urlScheme] && [[url host] isEqualToString:kAuthorizationHost])) {
-    BITHockeyLogWarning(@"WARNING: URL scheme for authentication doesn't match!");
-    return NO;
-  }
-  
-  NSString *installationIdentifier = nil;
-  NSString *localizedErrorDescription = nil;
-  switch (self.identificationType) {
-    case BITAuthenticatorIdentificationTypeWebAuth: {
-      NSString *email = nil;
-      [self.class email:&email andIUID:&installationIdentifier fromOpenURL:url];
-      if (email) {
-        BOOL success = [self addStringValueToKeychain:email forKey:kBITAuthenticatorUserEmailKey];
-        if (!success) {
-          [self alertOnFailureStoringTokenInKeychain];
-        }
-      } else {
-        BITHockeyLogDebug(@"No email found in URL: %@", url);
-      }
-      localizedErrorDescription = @"Failed to retrieve parameters from URL.";
-      break;
-    }
-    case BITAuthenticatorIdentificationTypeDevice: {
-      installationIdentifier = [self.class UDIDFromOpenURL:url annotation:annotation];
-      localizedErrorDescription = @"Failed to retrieve UDID from URL.";
-      break;
-    }
-    case BITAuthenticatorIdentificationTypeHockeyAppEmail:
-    case BITAuthenticatorIdentificationTypeAnonymous:
-    case BITAuthenticatorIdentificationTypeHockeyAppUser:
-      return NO;
-  }
-  
-  if (installationIdentifier) {
-    BITHockeyLogDebug(@"Authentication succeeded.");
-    if (NO == self.restrictApplicationUsage) {
-      [self dismissAuthenticationControllerAnimated:YES completion:nil];
-    }
-    [self storeInstallationIdentifier:installationIdentifier withType:self.identificationType];
-    self.identified = YES;
-    if (self.identificationCompletion) {
-      self.identificationCompletion(YES, nil);
-      self.identificationCompletion = nil;
-    }
-  } else {
-    //reset token
-    BITHockeyLogDebug(@"Resetting authentication token");
-    [self storeInstallationIdentifier:nil withType:self.identificationType];
-    self.identified = NO;
-    if (self.identificationCompletion) {
-      NSError *error = [NSError errorWithDomain:kBITAuthenticatorErrorDomain
-                                           code:BITAuthenticatorErrorUnknown
-                                       userInfo:@{NSLocalizedDescriptionKey:localizedErrorDescription}];
-      self.identificationCompletion(NO, error);
-      self.identificationCompletion = nil;
-    }
-  }
-  return YES;
-}
-
-+ (NSString *)UDIDFromOpenURL:(NSURL *)url annotation:(id) __unused annotation {
-  NSString *query = [url query];
-  NSString *udid = nil;
-  //there should actually only one
-  static NSString *const UDIDQuerySpecifier = @"udid";
-  for (NSString *queryComponents in [query componentsSeparatedByString:@"&"]) {
-    NSArray *parameterComponents = [queryComponents componentsSeparatedByString:@"="];
-    if (2 == parameterComponents.count && [parameterComponents[0] isEqualToString:UDIDQuerySpecifier]) {
-      udid = parameterComponents[1];
-      break;
-    }
-  }
-  return udid;
-}
-
-+ (void)email:(NSString *__autoreleasing *)email andIUID:(NSString *__autoreleasing *)iuid fromOpenURL:(NSURL *)url {
-  NSString *query = [url query];
-  //there should actually only one
-  static NSString *const EmailQuerySpecifier = @"email";
-  static NSString *const IUIDQuerySpecifier = @"iuid";
-  for (NSString *queryComponents in [query componentsSeparatedByString:@"&"]) {
-    NSArray *parameterComponents = [queryComponents componentsSeparatedByString:@"="];
-    if (email && 2 == parameterComponents.count && [parameterComponents[0] isEqualToString:EmailQuerySpecifier]) {
-      *email = parameterComponents[1];
-    } else if (iuid && 2 == parameterComponents.count && [parameterComponents[0] isEqualToString:IUIDQuerySpecifier]) {
-      *iuid = parameterComponents[1];
-    }
-  }
-}
-
-#pragma mark - Private helpers
-
-- (void)alertOnFailureStoringTokenInKeychain {
-  if ([BITHockeyHelper applicationState] != BITApplicationStateActive) {
-    return;
-  }
-  
-  BITHockeyLogError(@"[HockeySDK] ERROR: The authentication token could not be stored due to a keychain error. This is most likely a signing or keychain entitlement issue!");
-}
-
-- (void)cleanupInternalStorage {
-  [self removeKeyFromKeychain:kBITAuthenticatorIdentifierTypeKey];
-  [self removeKeyFromKeychain:kBITAuthenticatorIdentifierKey];
-  [self removeKeyFromKeychain:kBITAuthenticatorUUIDKey];
-  [self removeKeyFromKeychain:kBITAuthenticatorUserEmailKey];
-  [self setLastAuthenticatedVersion:nil];
-  self.identified = NO;
-  self.validated = NO;
-  
-  //cleanup values stored from 3.5 Beta1..Beta3
-  [self removeKeyFromKeychain:kBITAuthenticatorAuthTokenKey];
-  [self removeKeyFromKeychain:kBITAuthenticatorAuthTokenTypeKey];
-}
-
-- (void)processFullSizeImage {
-#ifdef BIT_INTERNAL_DEBUG
-  NSString* path = [[NSBundle mainBundle] pathForResource:@"iTunesArtwork" ofType:@"png"];
-#else
-  NSString *path = [[[NSBundle mainBundle] bundlePath] stringByAppendingString:@"/../iTunesArtwork"];
-#endif
-  
-  struct stat fs;
-  int fd = open([path UTF8String], O_RDONLY, 0);
-  if (fstat(fd, &fs) < 0) {
-    // File not found
-    close(fd);
-    return;
-  }
-  
-  BITHockeyLogDebug(@"Processing full size image for possible authentication");
-  
-  unsigned char *buffer, *source;
-  source = (unsigned char *)malloc((unsigned long)fs.st_size);
-  if (read(fd, source, (unsigned long)fs.st_size) != fs.st_size) {
-    close(fd);
-    // Couldn't read file
-    free(source);
-    return;
-  }
-  
-  if ((fs.st_size < 20) || (memcmp(source, kBITPNGHeader, 8))) {
-    // Not a PNG
-    free(source);
-    return;
-  }
-  
-  buffer = source + 8;
-  
-  NSString *result = nil;
-  bit_uint32 length;
-  unsigned char *name;
-  unsigned char *data;
-  int chunk_index = 0;
-  long long bytes_left = fs.st_size - 8;
-  do {
-    memcpy(&length, buffer, 4);
-    length = ntohl(length);
-    
-    buffer += 4;
-    name = (unsigned char *)malloc(5);
-    name[4] = 0;
-    memcpy(name, buffer, 4);
-    
-    buffer += 4;
-    data = (unsigned char *)malloc(length + 1);
-    
-    if (bytes_left >= length) {
-      memcpy(data, buffer, length);
-      
-      buffer += length;
-      buffer += 4;
-      if (!strcmp((const char *)name, "tEXt")) {
-        data[length] = 0;
-        NSString *key = [NSString stringWithCString:(char *)data encoding:NSUTF8StringEncoding];
-        
-        if ([key isEqualToString:@"Data"]) {
-          result = [NSString stringWithCString:(char *)(data + key.length + 1) encoding:NSUTF8StringEncoding];
-        }
-      }
-      
-      if (!memcmp(name, kBITPNGEndChunk, 4)) {
-        chunk_index = 128;
-      }
-    }
-    
-    free(data);
-    free(name);
-    
-    bytes_left -= (length + 3 * 4);
-  } while ((chunk_index++ < 128) && (bytes_left > 8));
-  
-  free(source);
-  
-  if (result) {
-    BITHockeyLogDebug(@"Authenticating using full size image information: %@", result);
-    [self handleOpenURL:[NSURL URLWithString:result] sourceApplication:nil annotation:nil];
-  } else {
-    BITHockeyLogDebug(@"No authentication information found");
-  }
-}
-
-#pragma mark - NSNotification
-
-- (void)registerObservers {
-  __weak typeof(self) weakSelf = self;
-  if (nil == self.appDidBecomeActiveObserver) {
-    self.appDidBecomeActiveObserver = [[NSNotificationCenter defaultCenter] addObserverForName:UIApplicationDidBecomeActiveNotification
-                                                                                        object:nil
-                                                                                         queue:NSOperationQueue.mainQueue
-                                                                                    usingBlock:^(NSNotification *note) {
-                                                                                      typeof(self) strongSelf = weakSelf;
-                                                                                      [strongSelf applicationDidBecomeActive:note];
-                                                                                    }];
-  }
-  if (nil == self.appDidEnterBackgroundObserver) {
-    self.appDidEnterBackgroundObserver = [[NSNotificationCenter defaultCenter] addObserverForName:UIApplicationDidEnterBackgroundNotification
-                                                                                           object:nil
-                                                                                            queue:NSOperationQueue.mainQueue
-                                                                                       usingBlock:^(NSNotification *note) {
-                                                                                         typeof(self) strongSelf = weakSelf;
-                                                                                         [strongSelf applicationDidEnterBackground:note];
-                                                                                       }];
-  }
-}
-
-- (void)unregisterObservers {
-  if (self.appDidBecomeActiveObserver) {
-    [[NSNotificationCenter defaultCenter] removeObserver:self.appDidBecomeActiveObserver];
-    self.appDidBecomeActiveObserver = nil;
-  }
-  if (self.appDidEnterBackgroundObserver) {
-    [[NSNotificationCenter defaultCenter] removeObserver:self.appDidEnterBackgroundObserver];
-    self.appDidEnterBackgroundObserver = nil;
-  }
-}
-
-#pragma mark - Property overrides
-
-- (void)storeInstallationIdentifier:(NSString *)installationIdentifier withType:(BITAuthenticatorIdentificationType)type {
-  if (nil == installationIdentifier) {
-    [self removeKeyFromKeychain:kBITAuthenticatorIdentifierKey];
-    [self removeKeyFromKeychain:kBITAuthenticatorIdentifierTypeKey];
-  } else {
-    BOOL success1 = [self addStringValueToKeychainForThisDeviceOnly:installationIdentifier
-                                                             forKey:kBITAuthenticatorIdentifierKey];
-    BOOL success2 = [self addStringValueToKeychainForThisDeviceOnly:[self.class stringForIdentificationType:type]
-                                                             forKey:kBITAuthenticatorIdentifierTypeKey];
-    if (!success1 || !success2) {
-      [self alertOnFailureStoringTokenInKeychain];
-    }
-  }
-}
-
-- (NSString *)installationIdentifier {
-  NSString *identifier = [self stringValueFromKeychainForKey:kBITAuthenticatorIdentifierKey];
-  return identifier;
-}
-
-- (void)setLastAuthenticatedVersion:(NSString *)lastAuthenticatedVersion {
-  NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
-  if (nil == lastAuthenticatedVersion) {
-    [defaults removeObjectForKey:kBITAuthenticatorLastAuthenticatedVersionKey];
-  } else {
-    [defaults setObject:lastAuthenticatedVersion
-                 forKey:kBITAuthenticatorLastAuthenticatedVersionKey];
-  }
-}
-
-- (NSString *)lastAuthenticatedVersion {
-  return [[NSUserDefaults standardUserDefaults] objectForKey:kBITAuthenticatorLastAuthenticatedVersionKey];
-}
-
-- (NSString *)installationIdentifierParameterString {
-  switch (self.identificationType) {
-    case BITAuthenticatorIdentificationTypeHockeyAppEmail:
-    case BITAuthenticatorIdentificationTypeWebAuth:
-      return @"iuid";
-    case BITAuthenticatorIdentificationTypeHockeyAppUser:
-      return @"auid";
-    case BITAuthenticatorIdentificationTypeDevice:
-      return @"udid";
-    case BITAuthenticatorIdentificationTypeAnonymous:
-      return @"uuid";
-  }
-}
-
-+ (NSString *)stringForIdentificationType:(BITAuthenticatorIdentificationType)identificationType {
-  switch (identificationType) {
-    case BITAuthenticatorIdentificationTypeHockeyAppEmail:
-      return @"iuid";
-    case BITAuthenticatorIdentificationTypeWebAuth:
-      return @"webAuth";
-    case BITAuthenticatorIdentificationTypeHockeyAppUser:
-      return @"auid";
-    case BITAuthenticatorIdentificationTypeDevice:
-      return @"udid";
-    case BITAuthenticatorIdentificationTypeAnonymous:
-      return @"uuid";
-  }
-}
-
-- (void)setIdentificationType:(BITAuthenticatorIdentificationType)identificationType {
-  if (_identificationType != identificationType) {
-    _identificationType = identificationType;
-    self.identified = NO;
-    self.validated = NO;
-  }
-}
-
-- (NSString *)publicInstallationIdentifier {
-  switch (self.identificationType) {
-    case BITAuthenticatorIdentificationTypeHockeyAppEmail:
-    case BITAuthenticatorIdentificationTypeHockeyAppUser:
-    case BITAuthenticatorIdentificationTypeWebAuth:
-      return [self stringValueFromKeychainForKey:kBITAuthenticatorUserEmailKey];
-    case BITAuthenticatorIdentificationTypeAnonymous:
-    case BITAuthenticatorIdentificationTypeDevice:
-      return [self stringValueFromKeychainForKey:kBITAuthenticatorIdentifierKey];
-  }
-}
-
-#pragma mark - Application Lifecycle
-
-- (void)applicationDidBecomeActive:(NSNotification *) __unused note {
-  [self authenticate];
-}
-
-- (void)applicationDidEnterBackground:(NSNotification *) __unused note {
-  if (BITAuthenticatorAppRestrictionEnforcementOnAppActive == self.restrictionEnforcementFrequency) {
-    self.validated = NO;
-  }
-}
-
-@end
-
-#endif  /* HOCKEYSDK_FEATURE_AUTHENTICATOR */
diff --git a/submodules/HockeySDK-iOS/Classes/BITAuthenticator_Private.h b/submodules/HockeySDK-iOS/Classes/BITAuthenticator_Private.h
deleted file mode 100644
index b0a97ea5b8..0000000000
--- a/submodules/HockeySDK-iOS/Classes/BITAuthenticator_Private.h
+++ /dev/null
@@ -1,105 +0,0 @@
-/*
- * Author: Stephan Diederich
- *
- * Copyright (c) 2013-2014 HockeyApp, Bit Stadium GmbH.
- * All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person
- * obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without
- * restriction, including without limitation the rights to use,
- * copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following
- * conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
- * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
- */
-
-
-#import "HockeySDK.h"
-
-#if HOCKEYSDK_FEATURE_AUTHENTICATOR
-
-#import "BITAuthenticationViewController.h"
-
-@class BITHockeyAppClient;
-
-@interface BITAuthenticator ()<BITAuthenticationViewControllerDelegate>
-
-/**
- Delegate that can be used to do any last minute configurations on the
- presented viewController.
- 
- The delegate is automatically set by using `[BITHockeyManager setDelegate:]`. You
- should not need to set this delegate individually.
- 
- @see `[BITHockeyManager setDelegate:]`
- @see BITAuthenticatorDelegate
- */
-@property (nonatomic, weak) id<BITAuthenticatorDelegate> delegate;
-
-/**
- * must be set
- */
-@property (nonatomic, strong) BITHockeyAppClient *hockeyAppClient;
-
-#pragma mark -
-/**
- *  holds the identifier of the last version that was authenticated
- *  only used if validation is set BITAuthenticatorValidationTypeOnFirstLaunch
- */
-@property (nonatomic, copy) NSString *lastAuthenticatedVersion;
-
-/**
- *  returns the type of the string stored in installationIdentifierParameterString
- */
-@property (nonatomic, copy, readonly) NSString *installationIdentifierParameterString;
-
-/**
- *  returns the string used to identify this app against the HockeyApp backend.
- */
-@property (nonatomic, copy, readonly) NSString *installationIdentifier;
-
-/**
- * method registered as observer for applicationDidEnterBackground events
- *
- * @param note NSNotification
- */
-- (void) applicationDidEnterBackground:(NSNotification*) note;
-
-/**
- * method registered as observer for applicationsDidBecomeActive events
- *
- * @param note NSNotification
- */
-- (void) applicationDidBecomeActive:(NSNotification*) note;
-
-@property (nonatomic, copy) void(^identificationCompletion)(BOOL identified, NSError* error);
-
-#pragma mark - Overrides
-@property (nonatomic, assign, readwrite, getter = isIdentified) BOOL identified;
-@property (nonatomic, assign, readwrite, getter = isValidated) BOOL validated;
-
-#pragma mark - Testing
-- (void) storeInstallationIdentifier:(NSString*) identifier withType:(BITAuthenticatorIdentificationType) type;
-- (void)validateWithCompletion:(void (^)(BOOL validated, NSError *))completion;
-- (void)authenticationViewController:(UIViewController *)viewController
-       handleAuthenticationWithEmail:(NSString *)email
-                             request:(NSURLRequest *)request
-                          completion:(void (^)(BOOL, NSError *))completion;
-- (BOOL) needsValidation;
-- (void) authenticate;
-@end
-
-#endif /* HOCKEYSDK_FEATURE_AUTHENTICATOR */
diff --git a/submodules/HockeySDK-iOS/Classes/BITBase.h b/submodules/HockeySDK-iOS/Classes/BITBase.h
deleted file mode 100644
index 4cc3cdc0c8..0000000000
--- a/submodules/HockeySDK-iOS/Classes/BITBase.h
+++ /dev/null
@@ -1,13 +0,0 @@
-#import "BITTelemetryObject.h"
-#import "BITTelemetryData.h"
-
-@interface BITBase : BITTelemetryData <NSCoding>
-
-@property (nonatomic, copy) NSString *baseType;
-
-- (instancetype)initWithCoder:(NSCoder *)coder;
-
-- (void)encodeWithCoder:(NSCoder *)coder;
-
-
-@end
diff --git a/submodules/HockeySDK-iOS/Classes/BITBase.m b/submodules/HockeySDK-iOS/Classes/BITBase.m
deleted file mode 100644
index efb54b7e26..0000000000
--- a/submodules/HockeySDK-iOS/Classes/BITBase.m
+++ /dev/null
@@ -1,34 +0,0 @@
-#import "BITBase.h"
-
-/// Data contract class for type Base.
-@implementation BITBase
-
-///
-/// Adds all members of this class to a dictionary
-/// @returns dictionary to which the members of this class will be added.
-///
-- (NSDictionary *)serializeToDictionary {
-    NSMutableDictionary *dict = [super serializeToDictionary].mutableCopy;
-    if (self.baseType != nil) {
-        [dict setObject:self.baseType forKey:@"baseType"];
-    }
-    return dict;
-}
-
-#pragma mark - NSCoding
-
-- (instancetype)initWithCoder:(NSCoder *)coder {
-  self = [super initWithCoder:coder];
-  if(self) {
-    _baseType = [coder decodeObjectForKey:@"self.baseType"];
-  }
-
-  return self;
-}
-
-- (void)encodeWithCoder:(NSCoder *)coder {
-  [super encodeWithCoder:coder];
-  [coder encodeObject:self.baseType forKey:@"self.baseType"];
-}
-
-@end
diff --git a/submodules/HockeySDK-iOS/Classes/BITBlurImageAnnotation.h b/submodules/HockeySDK-iOS/Classes/BITBlurImageAnnotation.h
deleted file mode 100644
index cb5a1f3ecc..0000000000
--- a/submodules/HockeySDK-iOS/Classes/BITBlurImageAnnotation.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Author: Moritz Haarmann <post@moritzhaarmann.de>
- *
- * Copyright (c) 2012-2014 HockeyApp, Bit Stadium GmbH.
- * All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person
- * obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without
- * restriction, including without limitation the rights to use,
- * copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following
- * conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
- * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#import "BITImageAnnotation.h"
-
-@interface BITBlurImageAnnotation : BITImageAnnotation
-
-@end
diff --git a/submodules/HockeySDK-iOS/Classes/BITBlurImageAnnotation.m b/submodules/HockeySDK-iOS/Classes/BITBlurImageAnnotation.m
deleted file mode 100644
index 9b1fd3f941..0000000000
--- a/submodules/HockeySDK-iOS/Classes/BITBlurImageAnnotation.m
+++ /dev/null
@@ -1,109 +0,0 @@
-/*
- * Author: Moritz Haarmann <post@moritzhaarmann.de>
- *
- * Copyright (c) 2012-2014 HockeyApp, Bit Stadium GmbH.
- * All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person
- * obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without
- * restriction, including without limitation the rights to use,
- * copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following
- * conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
- * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#import "HockeySDK.h"
-
-#if HOCKEYSDK_FEATURE_FEEDBACK
-
-#import "BITBlurImageAnnotation.h"
-
-@interface BITBlurImageAnnotation()
-
-@property (nonatomic, strong) CALayer* imageLayer;
-@property (nonatomic, strong) UIImage* scaledImage;
-@property (nonatomic, strong) CALayer* selectedLayer;
-
-
-@end
-
-@implementation BITBlurImageAnnotation
-
-- (instancetype)initWithFrame:(CGRect)frame {
-    self = [super initWithFrame:frame];
-    if (self) {
-      self.clipsToBounds = YES;
-      self.imageLayer = [CALayer layer];
-      [self.layer addSublayer:self.imageLayer];
-      
-      self.selectedLayer = [CALayer layer];
-      [self.layer insertSublayer:self.selectedLayer above:self.imageLayer];
-      
-      self.selectedLayer.backgroundColor = [[UIColor redColor] colorWithAlphaComponent:0.5].CGColor;
-      self.selectedLayer.opacity = 0.6f;
-      self.clipsToBounds = YES;
-    }
-    return self;
-}
-
-- (void)setSourceImage:(UIImage *)sourceImage {
-  CGSize size = CGSizeMake(sourceImage.size.width/30, sourceImage.size.height/30);
-  
-  UIGraphicsBeginImageContext(size);
-  
-  [sourceImage drawInRect:CGRectMake(0, 0, size.width, size.height)];
-  self.scaledImage = UIGraphicsGetImageFromCurrentImageContext();
-  self.imageLayer.shouldRasterize = YES;
-  self.imageLayer.rasterizationScale = 1;
-  self.imageLayer.magnificationFilter = kCAFilterNearest;
-  self.imageLayer.contents = (id)self.scaledImage.CGImage;
-  
-  UIGraphicsEndImageContext();
-}
-
-- (void)setSelected:(BOOL)selected {
-  super.selected = selected;
-  
-  if (selected){
-    self.selectedLayer.opacity = 0.6f;
-  } else {
-    self.selectedLayer.opacity = 0.0f;
-  }
-}
-
-- (void)layoutSubviews {
-  [super layoutSubviews];
-  
-  [CATransaction begin];
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wcast-qual"
-  [CATransaction setValue:(id)kCFBooleanTrue forKey:kCATransactionDisableActions];
-#pragma clang diagnostic pop
-  self.imageLayer.frame = self.imageFrame;
-  self.imageLayer.masksToBounds = YES;
-  
-  self.selectedLayer.frame= self.bounds;
-  [CATransaction commit];
-}
-
-- (BOOL)resizable {
-  return YES;
-}
-
-@end
-
-#endif /* HOCKEYSDK_FEATURE_FEEDBACK */
diff --git a/submodules/HockeySDK-iOS/Classes/BITCategoryContainer.h b/submodules/HockeySDK-iOS/Classes/BITCategoryContainer.h
deleted file mode 100644
index 97b25740cd..0000000000
--- a/submodules/HockeySDK-iOS/Classes/BITCategoryContainer.h
+++ /dev/null
@@ -1,17 +0,0 @@
-#import <Foundation/Foundation.h>
-#import "HockeySDKFeatureConfig.h"
-
-#if HOCKEYSDK_FEATURE_METRICS
-
-#import "HockeySDKNullability.h"
-NS_ASSUME_NONNULL_BEGIN
-
-@interface BITCategoryContainer : NSObject
-
-+ (void)activateCategory;
-
-@end
-
-NS_ASSUME_NONNULL_END
-
-#endif /* HOCKEYSDK_FEATURE_METRICS */
diff --git a/submodules/HockeySDK-iOS/Classes/BITCategoryContainer.m b/submodules/HockeySDK-iOS/Classes/BITCategoryContainer.m
deleted file mode 100644
index 81f23e97f2..0000000000
--- a/submodules/HockeySDK-iOS/Classes/BITCategoryContainer.m
+++ /dev/null
@@ -1,144 +0,0 @@
-#import "BITCategoryContainer.h"
-#import "HockeySDKFeatureConfig.h"
-#import <objc/runtime.h>
-
-#if HOCKEYSDK_FEATURE_METRICS
-
-@implementation BITCategoryContainer
-
-+ (void)activateCategory {
-
-}
-
-@end
-
-
-#pragma mark - GZIP library
-
-
-//
-//  GZIP.m
-//
-//  Version 1.0.3
-//
-//  Created by Nick Lockwood on 03/06/2012.
-//  Copyright (C) 2012 Charcoal Design
-//
-//  Distributed under the permissive zlib License
-//  Get the latest version from here:
-//
-//  https://github.com/nicklockwood/GZIP
-//
-//  This software is provided 'as-is', without any express or implied
-//  warranty.  In no event will the authors be held liable for any damages
-//  arising from the use of this software.
-//
-//  Permission is granted to anyone to use this software for any purpose,
-//  including commercial applications, and to alter it and redistribute it
-//  freely, subject to the following restrictions:
-//
-//  1. The origin of this software must not be misrepresented; you must not
-//  claim that you wrote the original software. If you use this software
-//  in a product, an acknowledgment in the product documentation would be
-//  appreciated but is not required.
-//
-//  2. Altered source versions must be plainly marked as such, and must not be
-//  misrepresented as being the original software.
-//
-//  3. This notice may not be removed or altered from any source distribution.
-//
-
-#import <zlib.h>
-
-static const NSUInteger ChunkSize = 16384;
-
-@implementation NSData (BITGZIP)
-
-- (NSData *)bit_gzippedDataWithCompressionLevel:(float)level
-{
-  if ([self length])
-  {
-    z_stream stream;
-    stream.zalloc = Z_NULL;
-    stream.zfree = Z_NULL;
-    stream.opaque = Z_NULL;
-    stream.avail_in = (uint)[self length];
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wcast-qual"
-    stream.next_in = (Bytef *)[self bytes];
-#pragma clang diagnostic pop
-    stream.total_out = 0;
-    stream.avail_out = 0;
-    
-    int compression = (level < 0.0f)? Z_DEFAULT_COMPRESSION: (int)(roundf(level * 9));
-    if (deflateInit2(&stream, compression, Z_DEFLATED, 31, 8, Z_DEFAULT_STRATEGY) == Z_OK)
-    {
-      NSMutableData *data = [NSMutableData dataWithLength:ChunkSize];
-      while (stream.avail_out == 0)
-      {
-        if (stream.total_out >= [data length])
-        {
-          data.length += ChunkSize;
-        }
-        stream.next_out = (uint8_t *)[data mutableBytes] + stream.total_out;
-        stream.avail_out = (uInt)([data length] - stream.total_out);
-        deflate(&stream, Z_FINISH);
-      }
-      deflateEnd(&stream);
-      data.length = stream.total_out;
-      return data;
-    }
-  }
-  return nil;
-}
-
-- (NSData *)bit_gzippedData
-{
-  return [self bit_gzippedDataWithCompressionLevel:-1.0f];
-}
-
-- (NSData *)bit_gunzippedData
-{
-  if ([self length])
-  {
-    z_stream stream;
-    stream.zalloc = Z_NULL;
-    stream.zfree = Z_NULL;
-    stream.avail_in = (uint)[self length];
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wcast-qual"
-    stream.next_in = (Bytef *)[self bytes];
-#pragma clang diagnostic pop
-    stream.total_out = 0;
-    stream.avail_out = 0;
-    
-    NSMutableData *data = [NSMutableData dataWithLength:(NSUInteger)([self length] * 1.5)];
-    if (inflateInit2(&stream, 47) == Z_OK)
-    {
-      int status = Z_OK;
-      while (status == Z_OK)
-      {
-        if (stream.total_out >= [data length])
-        {
-          data.length += [self length] / 2;
-        }
-        stream.next_out = (uint8_t *)[data mutableBytes] + stream.total_out;
-        stream.avail_out = (uInt)([data length] - stream.total_out);
-        status = inflate (&stream, Z_SYNC_FLUSH);
-      }
-      if (inflateEnd(&stream) == Z_OK)
-      {
-        if (status == Z_STREAM_END)
-        {
-          data.length = stream.total_out;
-          return data;
-        }
-      }
-    }
-  }
-  return nil;
-}
-
-@end
-
-#endif /* HOCKEYSDK_FEATURE_METRICS */
diff --git a/submodules/HockeySDK-iOS/Classes/BITChannel.h b/submodules/HockeySDK-iOS/Classes/BITChannel.h
deleted file mode 100644
index 3e4e5cbe77..0000000000
--- a/submodules/HockeySDK-iOS/Classes/BITChannel.h
+++ /dev/null
@@ -1,47 +0,0 @@
-#import <Foundation/Foundation.h>
-#import "HockeySDKFeatureConfig.h"
-
-#if HOCKEYSDK_FEATURE_METRICS
-
-@class BITConfiguration;
-@class BITTelemetryData;
-@class BITTelemetryContext;
-@class BITPersistence;
-
-#import "HockeySDKNullability.h"
-NS_ASSUME_NONNULL_BEGIN
-
-/**
- * Buffer of telemtry events, will be written to disk. Make sure the buffer is used in a threadsafe way.
- */
-FOUNDATION_EXPORT char *_Nullable BITTelemetryEventBuffer;
-
-/**
- *  Items get queued before they are persisted and sent out as a batch. This class managed the queue, and forwards the batch
- *  to the persistence layer once the max batch count has been reached.
- */
-@interface BITChannel : NSObject
-
-
-/**
- *  Initializes a new BITChannel instance.
- *
- *  @param telemetryContext the context used to add context values to the metrics payload
- *  @param persistence the persistence used to save metrics after the queue gets flushed
- *
- *  @return the telemetry context
- */
-- (instancetype)initWithTelemetryContext:(BITTelemetryContext *)telemetryContext persistence:(BITPersistence *) persistence;
-
-/**
- *  Reset BITSafeJsonEventsString so we can start appending JSON dictionaries.
- *
- *  @param item The telemetry object, which should be processed
- */
-- (void)enqueueTelemetryItem:(BITTelemetryData *)item;
-
-@end
-
-NS_ASSUME_NONNULL_END
-
-#endif /* HOCKEYSDK_FEATURE_METRICS */
diff --git a/submodules/HockeySDK-iOS/Classes/BITChannel.m b/submodules/HockeySDK-iOS/Classes/BITChannel.m
deleted file mode 100644
index af43b50b36..0000000000
--- a/submodules/HockeySDK-iOS/Classes/BITChannel.m
+++ /dev/null
@@ -1,505 +0,0 @@
-#import "HockeySDKFeatureConfig.h"
-
-#if HOCKEYSDK_FEATURE_METRICS
-
-#import "HockeySDKPrivate.h"
-#import "BITHockeyManager.h"
-#import "BITChannelPrivate.h"
-#import "BITHockeyHelper.h"
-#import "BITHockeyHelper+Application.h"
-#import "BITTelemetryContext.h"
-#import "BITTelemetryData.h"
-#import "BITEnvelope.h"
-#import "BITData.h"
-#import "BITDevice.h"
-#import "BITPersistencePrivate.h"
-#import "BITSender.h"
-#import <stdatomic.h>
-
-
-static char *const BITDataItemsOperationsQueue = "net.hockeyapp.senderQueue";
-char *BITTelemetryEventBuffer;
-
-NSString *const BITChannelBlockedNotification = @"BITChannelBlockedNotification";
-
-static NSInteger const BITDefaultMaxBatchSize  = 50;
-static NSInteger const BITDefaultBatchInterval = 15;
-static NSInteger const BITSchemaVersion = 2;
-
-static NSInteger const BITDebugMaxBatchSize = 5;
-static NSInteger const BITDebugBatchInterval = 3;
-
-typedef _Atomic(char*) atomic_charptr;
-
-NS_ASSUME_NONNULL_BEGIN
-
-@interface BITChannel ()
-
-@property (nonatomic, weak, nullable) id appDidEnterBackgroundObserver;
-
-@end
-
-@implementation BITChannel
-
-@synthesize persistence = _persistence;
-@synthesize channelBlocked = _channelBlocked;
-
-#pragma mark - Initialisation
-
-- (instancetype)init {
-  if ((self = [super init])) {
-    bit_resetEventBuffer(&BITTelemetryEventBuffer);
-    _dataItemCount = 0;
-    if (bit_isDebuggerAttached()) {
-      _maxBatchSize = BITDebugMaxBatchSize;
-      _batchInterval = BITDebugBatchInterval;
-    } else {
-      _maxBatchSize = BITDefaultMaxBatchSize;
-      _batchInterval = BITDefaultBatchInterval;
-    }
-    dispatch_queue_t serialQueue = dispatch_queue_create(BITDataItemsOperationsQueue, DISPATCH_QUEUE_SERIAL);
-    _dataItemsOperations = serialQueue;
-    
-    [self registerObservers];
-  }
-  return self;
-}
-
-- (instancetype)initWithTelemetryContext:(BITTelemetryContext *)telemetryContext persistence:(BITPersistence *)persistence {
-  if ((self = [self init])) {
-    _telemetryContext = telemetryContext;
-    _persistence = persistence;
-  }
-  return self;
-}
-
-- (void)dealloc {
-  [self unregisterObservers];
-  [self invalidateTimer];
-}
-
-#pragma mark - Observers
-
-- (void) registerObservers {
-  NSNotificationCenter *center = [NSNotificationCenter defaultCenter];
-  __weak typeof(self) weakSelf = self;
-  
-  if (nil == self.appDidEnterBackgroundObserver) {
-    void (^notificationBlock)(NSNotification *note) = ^(NSNotification __unused *note) {
-      typeof(self) strongSelf = weakSelf;
-      if ([strongSelf timerIsRunning]) {
-        
-        /**
-         * From the documentation for applicationDidEnterBackground:
-         * It's likely any background tasks you start in applicationDidEnterBackground: will not run until after that method exits,
-         * you should request additional background execution time before starting those tasks. In other words,
-         * first call beginBackgroundTaskWithExpirationHandler: and then run the task on a dispatch queue or secondary thread.
-         */
-        UIApplication *application = [UIApplication sharedApplication];
-        [strongSelf persistDataItemQueueWithBackgroundTask: application];
-      }
-    };
-    self.appDidEnterBackgroundObserver = [center addObserverForName:UIApplicationDidEnterBackgroundNotification
-                                                             object:nil
-                                                              queue:NSOperationQueue.mainQueue
-                                                         usingBlock:notificationBlock];
-  }
-}
-
-- (void) unregisterObservers {
-  NSNotificationCenter *center = [NSNotificationCenter defaultCenter];
-  id appDidEnterBackgroundObserver = self.appDidEnterBackgroundObserver;
-  if (appDidEnterBackgroundObserver) {
-    [center removeObserver:appDidEnterBackgroundObserver];
-    self.appDidEnterBackgroundObserver = nil;
-  }
-}
-
-#pragma mark - Queue management
-
-- (BOOL)isQueueBusy {
-  if (!self.channelBlocked) {
-    BOOL persistenceBusy = ![self.persistence isFreeSpaceAvailable];
-    if (persistenceBusy) {
-      self.channelBlocked = YES;
-      [self sendBlockingChannelNotification];
-    }
-  }
-  return self.channelBlocked;
-}
-
-- (void)persistDataItemQueue:(char **)eventBuffer {
-  [self invalidateTimer];
-  
-  // Make sure string (which points to BITTelemetryEventBuffer) is not changed.
-  char *previousBuffer = NULL;
-  char *newEmptyString = strdup("");
-  do {
-    previousBuffer = *eventBuffer;
-    
-    // This swaps pointers and makes sure eventBuffer now has the balue of newEmptyString.
-    if (atomic_compare_exchange_strong((atomic_charptr *)eventBuffer, &previousBuffer, newEmptyString)) {
-      @synchronized(self) {
-        self.dataItemCount = 0;
-      }
-      break;
-    }
-  } while(true);
-  
-  // Nothing to persist, freeing memory and existing.
-  if (!previousBuffer || strlen(previousBuffer) == 0) {
-    free(previousBuffer);
-    return;
-  }
-  
-  // Persist the data
-  NSData *bundle = [NSData dataWithBytes:previousBuffer length:strlen(previousBuffer)];
-  [self.persistence persistBundle:bundle];
-  free(previousBuffer);
-  
-  // Reset both, the async-signal-safe and item counter.
-  [self resetQueue];
-}
-
-- (void)persistDataItemQueueWithBackgroundTask:(UIApplication *)application {
-  __weak typeof(self) weakSelf = self;
-  dispatch_async(self.dataItemsOperations, ^{
-    typeof(self) strongSelf = weakSelf;
-    [strongSelf persistDataItemQueue:&BITTelemetryEventBuffer];
-  });
-  [self createBackgroundTaskWhileDataIsSending:application withWaitingGroup:nil];
-}
-
-- (void)createBackgroundTaskWhileDataIsSending:(UIApplication *)application
-                              withWaitingGroup:(nullable dispatch_group_t)group {
-  if (application == nil) {
-    return;
-  }
-  
-  // Queues needs for waiting consistently.
-  NSArray *queues = @[
-                      self.dataItemsOperations,           // For enqueue
-                      self.persistence.persistenceQueue,  // For persist
-                      dispatch_get_main_queue()           // For notification
-                      ];
-
-  // Tracking for sender activity.
-  // BITPersistenceSuccessNotification - start sending
-  // BITSenderFinishSendingDataNotification - finish sending
-  __block dispatch_group_t senderGroup = dispatch_group_create();
-  __block NSInteger senderCounter = 0;
-  __block id persistenceSuccessObserver = [[NSNotificationCenter defaultCenter]
-      addObserverForName:BITPersistenceSuccessNotification
-                  object:nil
-                   queue:nil
-              usingBlock:^(__unused NSNotification *notification) {
-                dispatch_group_enter(senderGroup);
-                senderCounter++;
-                if (persistenceSuccessObserver) {
-                  [[NSNotificationCenter defaultCenter] removeObserver:persistenceSuccessObserver];
-                  persistenceSuccessObserver = nil;
-                }
-              }];
-  __block id senderFinishSendingDataObserver = [[NSNotificationCenter defaultCenter]
-      addObserverForName:BITSenderFinishSendingDataNotification
-                  object:nil
-                   queue:nil
-              usingBlock:^(__unused NSNotification *notification) {
-                if (senderCounter > 0) {
-                  dispatch_group_leave(senderGroup);
-                  senderCounter--;
-                }
-                if (senderFinishSendingDataObserver) {
-                  [[NSNotificationCenter defaultCenter] removeObserver:senderFinishSendingDataObserver];
-                  senderFinishSendingDataObserver = nil;
-                }
-              }];
-
-  BITHockeyLogVerbose(@"BITChannel: Start background task");
-  __block UIBackgroundTaskIdentifier backgroundTask = [application beginBackgroundTaskWithExpirationHandler:^{
-    BITHockeyLogVerbose(@"BITChannel: Background task is expired");
-    [application endBackgroundTask:backgroundTask];
-    backgroundTask = UIBackgroundTaskInvalid;
-  }];
-  __block NSUInteger i = 0;
-  __block __weak void (^weakWaitBlock)(void);
-  void (^waitBlock)(void);
-  weakWaitBlock = waitBlock = ^{
-    if (i < queues.count) {
-      dispatch_queue_t queue = [queues objectAtIndex:i++];
-      BITHockeyLogVerbose(@"BITChannel: Waiting queue: %@", [[NSString alloc] initWithUTF8String:dispatch_queue_get_label(queue)]);
-      dispatch_async(queue, weakWaitBlock);
-    } else {
-      BITHockeyLogVerbose(@"BITChannel: Waiting sender");
-      dispatch_group_notify(senderGroup, dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
-        if (backgroundTask != UIBackgroundTaskInvalid) {
-          BITHockeyLogVerbose(@"BITChannel: Cancel background task");
-          [application endBackgroundTask:backgroundTask];
-          backgroundTask = UIBackgroundTaskInvalid;
-        }
-      });
-    }
-  };
-  if (group != nil) {
-    BITHockeyLogVerbose(@"BITChannel: Waiting group");
-    dispatch_group_notify((dispatch_group_t)group, dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), waitBlock);
-  } else {
-    waitBlock();
-  }
-}
-
-// Resets the event buffer and count of events in the queue.
-- (void)resetQueue {
-  @synchronized (self) {
-    bit_resetEventBuffer(&BITTelemetryEventBuffer);
-    self.dataItemCount = 0;
-  }
-}
-
-#pragma mark - Adding to queue
-
-- (void)enqueueTelemetryItem:(BITTelemetryData *)item {
-  [self enqueueTelemetryItem:item completionHandler:nil];
-}
-
-- (void)enqueueTelemetryItem:(BITTelemetryData *)item completionHandler:(nullable void (^)(void))completionHandler {
-  if (!item) {
-    
-    // Item is nil: Do not enqueue item and abort operation.
-    BITHockeyLogWarning(@"WARNING: TelemetryItem was nil.");
-    if(completionHandler) {
-      completionHandler();
-    }
-    return;
-  }
-  
-  // First assigning self to weakSelf and then assigning this to strongSelf in the block is not very intuitive, this
-  // blog post explains it very well: https://dhoerl.wordpress.com/2013/04/23/i-finally-figured-out-weakself-and-strongself/
-  __weak typeof(self) weakSelf = self;
-  dispatch_async(self.dataItemsOperations, ^{
-    
-    typeof(self) strongSelf = weakSelf;
-    if (strongSelf.isQueueBusy) {
-      
-      // Case 1: Channel is in blocked state: Trigger sender, start timer to check after again after a while and abort operation.
-      BITHockeyLogDebug(@"INFO: The channel is saturated. %@ was dropped.", item.debugDescription);
-      if (![strongSelf timerIsRunning]) {
-        [strongSelf startTimer];
-      }
-      
-      if(completionHandler) {
-        completionHandler();
-      }
-      
-      return;
-    }
-    
-    // Should be outside of @synchronized block!
-    BOOL applicationIsInBackground = ([BITHockeyHelper applicationState] == BITApplicationStateBackground);
-    
-    // Enqueue item.
-    @synchronized(self) {
-      NSDictionary *dict = [strongSelf dictionaryForTelemetryData:item];
-      [strongSelf appendDictionaryToEventBuffer:dict];
-      
-      // If the app is running in the background.
-      if (strongSelf.dataItemCount >= strongSelf.maxBatchSize || applicationIsInBackground) {
-        
-        // Case 2: Max batch count has been reached or the app is running in the background, so write queue to disk and delete all items.
-        [strongSelf persistDataItemQueue:&BITTelemetryEventBuffer];
-      } else if (strongSelf.dataItemCount > 0) {
-        
-        // Case 3: It is the first item, let's start the timer.
-        if (![strongSelf timerIsRunning]) {
-          [strongSelf startTimer];
-        }
-      }
-      
-      if(completionHandler) {
-        completionHandler();
-      }
-    }
-  });
-}
-
-#pragma mark - Envelope telemerty items
-
-- (NSDictionary *)dictionaryForTelemetryData:(BITTelemetryData *) telemetryData {
-  
-  BITEnvelope *envelope = [self envelopeForTelemetryData:telemetryData];
-  NSDictionary *dict = [envelope serializeToDictionary];
-  return dict;
-}
-
-- (BITEnvelope *)envelopeForTelemetryData:(BITTelemetryData *)telemetryData {
-  telemetryData.version = @(BITSchemaVersion);
-  
-  BITData *data = [BITData new];
-  data.baseData = telemetryData;
-  data.baseType = telemetryData.dataTypeName;
-  
-  BITEnvelope *envelope = [BITEnvelope new];
-  envelope.time = bit_utcDateString([NSDate date]);
-  envelope.iKey = self.telemetryContext.appIdentifier;
-  
-  envelope.tags = self.telemetryContext.contextDictionary;
-  envelope.data = data;
-  envelope.name = telemetryData.envelopeTypeName;
-  
-  return envelope;
-}
-
-#pragma mark - Serialization Helper
-
-- (NSString *)serializeDictionaryToJSONString:(NSDictionary *)dictionary {
-  NSError *error;
-  NSData *data = [NSJSONSerialization dataWithJSONObject:dictionary options:(NSJSONWritingOptions)0 error:&error];
-  if (!data) {
-    BITHockeyLogError(@"ERROR: JSONSerialization error: %@", error.localizedDescription);
-    return @"{}";
-  } else {
-    return (NSString *)[[NSString alloc] initWithData:data encoding:NSUTF8StringEncoding];
-  }
-}
-
-#pragma mark JSON Stream
-
-- (void)appendDictionaryToEventBuffer:(NSDictionary *)dictionary {
-  if (dictionary) {
-    NSString *string = [self serializeDictionaryToJSONString:dictionary];
-    
-    // Since we can't persist every event right away, we write it to a simple C string.
-    // This can then be written to disk by a signal handler in case of a crash.
-    @synchronized (self) {
-      bit_appendStringToEventBuffer(string, &BITTelemetryEventBuffer);
-      self.dataItemCount += 1;
-    }
-    
-    BITHockeyLogVerbose(@"VERBOSE: Appended data to buffer:\n%@", string);
-  }
-}
-
-void bit_appendStringToEventBuffer(NSString *string, char **eventBuffer) {
-  if (eventBuffer == NULL) {
-    return;
-  }
-  
-  if (!string) {
-    return;
-  }
-  
-  if (*eventBuffer == NULL || strlen(*eventBuffer) == 0) {
-    bit_resetEventBuffer(eventBuffer);
-  }
-  
-  if (string.length == 0) {
-    return;
-  }
-  
-  do {
-    char *newBuffer = NULL;
-    char *previousBuffer = *eventBuffer;
-    
-    // Concatenate old string with new JSON string and add a comma.
-    asprintf(&newBuffer, "%s%.*s\n", previousBuffer, (int)MIN(string.length, (NSUInteger)INT_MAX), string.UTF8String);
-    
-    // Compare newBuffer and previousBuffer. If they point to the same address, we are safe to use them.
-    if (atomic_compare_exchange_strong((atomic_charptr *)eventBuffer, &previousBuffer, newBuffer)) {
- 
-      // Free the intermediate pointer.
-      free(previousBuffer);
-      return;
-    } else {
-      
-      // newBuffer has been changed by another thread.
-      free(newBuffer);
-    }
-  } while (true);
-}
-
-void bit_resetEventBuffer(char **eventBuffer) {
-  if (!eventBuffer) {
-    return;
-  }
-  
-  char *prevString = NULL;
-  char *newEmptyString = strdup("");
-  do {
-    prevString = *eventBuffer;
-    
-    // Compare pointers to strings to make sure we are still threadsafe!
-    if (atomic_compare_exchange_strong((atomic_charptr *)eventBuffer, &prevString, newEmptyString)) {
-      free(prevString);
-      return;
-    }
-  } while(true);
-}
-
-#pragma mark - Batching
-
-- (NSUInteger)maxBatchSize {
-  if(_maxBatchSize <= 0){
-    return BITDefaultMaxBatchSize;
-  }
-  return _maxBatchSize;
-}
-
-- (void)invalidateTimer {
-  @synchronized(self) {
-    if (self.timerSource != nil) {
-      dispatch_source_cancel((dispatch_source_t)self.timerSource);
-      self.timerSource = nil;
-    }
-  }
-}
-
--(BOOL)timerIsRunning {
-  @synchronized(self) {
-    return self.timerSource != nil;
-  }
-}
-
-- (void)startTimer {
-  @synchronized(self) {
-
-    // Reset timer, if it is already running.
-    [self invalidateTimer];
-    
-    dispatch_source_t timerSource = dispatch_source_create(DISPATCH_SOURCE_TYPE_TIMER, 0, 0, self.dataItemsOperations);
-    dispatch_source_set_timer(timerSource, dispatch_walltime(NULL, NSEC_PER_SEC * self.batchInterval), 1ull * NSEC_PER_SEC, 1ull * NSEC_PER_SEC);
-    __weak typeof(self) weakSelf = self;
-    dispatch_source_set_event_handler(timerSource, ^{
-      typeof(self) strongSelf = weakSelf;
-      if (strongSelf) {
-        if (strongSelf.dataItemCount > 0) {
-          [strongSelf persistDataItemQueue:&BITTelemetryEventBuffer];
-        } else {
-          strongSelf.channelBlocked = NO;
-        }
-        [strongSelf invalidateTimer];
-      }
-    });
-    dispatch_resume(timerSource);
-    self.timerSource = timerSource;
-  }
-}
-
-/**
- * Send a BITHockeyBlockingChannelNotification to the main thread to notify observers that channel can't enqueue new items.
- * This is typically used to trigger sending.
- */
-- (void)sendBlockingChannelNotification {
-  dispatch_async(dispatch_get_main_queue(), ^{
-    BITHockeyLogDebug(@"Sending notification: %@", BITChannelBlockedNotification);
-    [[NSNotificationCenter defaultCenter] postNotificationName:BITChannelBlockedNotification
-                                                        object:nil
-                                                      userInfo:nil];
-  });
-}
-
-@end
-
-NS_ASSUME_NONNULL_END
-
-#endif /* HOCKEYSDK_FEATURE_METRICS */
-
diff --git a/submodules/HockeySDK-iOS/Classes/BITChannelPrivate.h b/submodules/HockeySDK-iOS/Classes/BITChannelPrivate.h
deleted file mode 100644
index 97c836f709..0000000000
--- a/submodules/HockeySDK-iOS/Classes/BITChannelPrivate.h
+++ /dev/null
@@ -1,125 +0,0 @@
-#import <Foundation/Foundation.h>
-#import <UIKit/UIKit.h>
-#import "HockeySDKFeatureConfig.h"
-
-#if HOCKEYSDK_FEATURE_METRICS
-
-@class BITTelemetryData;
-@class BITTelemetryContext;
-@class BITPersistence;
-
-#import "BITChannel.h"
-
-#import "HockeySDKNullability.h"
-NS_ASSUME_NONNULL_BEGIN
-
-@interface BITChannel ()
-
-/**
- * Notification that will be send on the main thread to notifiy observers that channel can't enqueue new items.
- * This is typically used to trigger sending to the server.
- */
-FOUNDATION_EXPORT NSString *const BITChannelBlockedNotification;
-
-/**
- *  Telemetry context used by the channel to create the payload (testing).
- */
-@property (nonatomic, strong) BITTelemetryContext *telemetryContext;
-
-/**
- *  Persistence instance for storing files after the queue gets flushed (testing).
- */
-@property (nonatomic, strong) BITPersistence *persistence;
-
-/*
- * Threshold for sending data to the server. Default batch size for debugging is 150, for release
- * configuration, the batch size is 5.
- *
- * Default: 50
- *
- * @warning: We advice to not set the batch size below 5 events.
- */
-@property (nonatomic) NSUInteger maxBatchSize;
-
-/*
- * Interval for sending data to the server in seconds.
- *
- * Default: 15
- */
-@property (nonatomic, assign) NSInteger batchInterval;
-
-/**
- *  A timer source which is used to flush the queue after a cretain time.
- */
-@property (nonatomic, strong, nullable) dispatch_source_t timerSource;
-
-/**
- *  A queue which makes array operations thread safe.
- */
-@property (nonatomic, strong) dispatch_queue_t dataItemsOperations;
-
-/**
- *  An integer value that keeps tracks of the number of data items added to the JSON Stream string.
- */
-@property (nonatomic, assign) NSUInteger dataItemCount;
-
-/**
- *  Indicates that channel is currently in a blocked state.
- */
-@property BOOL channelBlocked;
-
-/**
- *  Manually trigger the BITChannel to persist all items currently in its data item queue.
- */
-- (void)persistDataItemQueue:(char *_Nullable*_Nullable)eventBuffer;
-
-/**
- *  Create background task for queues and group.
- */
-- (void)createBackgroundTaskWhileDataIsSending:(UIApplication *)application
-                              withWaitingGroup:(nullable dispatch_group_t)group;
-
-/**
- *  Adds the specified dictionary to the JSON Stream string.
- *
- *  @param dictionary the dictionary object which is to be added to the JSON Stream queue string.
- */
-- (void)appendDictionaryToEventBuffer:(NSDictionary *)dictionary;
-
-/**
- *  A C function that serializes a given dictionary to JSON and appends it to a char string
- *
- *  @param string The C string which the dictionary's JSON representation will be appended to.
- */
-void bit_appendStringToEventBuffer(NSString *string, char *__nonnull*__nonnull eventBuffer);
-
-/**
- *  Reset the event buffer so we can start appending JSON dictionaries.
- *
- *  @param eventBuffer The string that will be reset.
- */
-void bit_resetEventBuffer(char *__nonnull*__nonnull eventBuffer);
-
-/**
- *  A method which indicates whether the telemetry pipeline is busy and no new data should be enqueued.
- *  Currently, we drop telemetry data if this returns YES.
- *  This depends on defaultMaxBatchCount and defaultBatchInterval.
- *
- *  @return Returns yes if currently no new data should be enqueued on the channel.
- */
-- (BOOL)isQueueBusy;
-
-/**
- * Enqueue a telemetry item. This is for testing purposes where we actually use the completion handler.
- *
- * @param completionHandler The completion handler that will be called after enqueuing a BITTelemetryData object.
- *
- * @discussion intended for testing purposes.
- */
-- (void)enqueueTelemetryItem:(BITTelemetryData *)item completionHandler:(nullable void (^)(void))completionHandler;
-
-@end
-
-NS_ASSUME_NONNULL_END
-
-#endif /* HOCKEYSDK_FEATURE_METRICS */
diff --git a/submodules/HockeySDK-iOS/Classes/BITCrashAttachment.h b/submodules/HockeySDK-iOS/Classes/BITCrashAttachment.h
deleted file mode 100644
index 9f7d4273c0..0000000000
--- a/submodules/HockeySDK-iOS/Classes/BITCrashAttachment.h
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Author: Andreas Linde <mail@andreaslinde.de>
- *
- * Copyright (c) 2014 HockeyApp, Bit Stadium GmbH.
- * All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person
- * obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without
- * restriction, including without limitation the rights to use,
- * copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following
- * conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
- * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#import "BITHockeyAttachment.h"
-
-/**
- Deprecated: Provides support to add binary attachments to crash reports
- 
- This class is not needed any longer and exists for compatibility purposes with
- HockeySDK-iOS 3.5.5.
- 
- It is a subclass of `BITHockeyAttachment` which only provides an initializer
- that is compatible with the one of HockeySDK-iOS 3.5.5.
- 
- This is used by `[BITCrashManagerDelegate attachmentForCrashManager:]`
- 
- @see BITHockeyAttachment
- */
-@interface BITCrashAttachment : BITHockeyAttachment
-
-/**
- Create an BITCrashAttachment instance with a given filename and NSData object
- 
- @param filename            The filename the attachment should get
- @param crashAttachmentData The attachment data as NSData
- @param contentType         The content type of your data as MIME type
- 
- @return An instance of BITCrashAttachment
- */
-- (instancetype)initWithFilename:(NSString *)filename
-             crashAttachmentData:(NSData *)crashAttachmentData
-                     contentType:(NSString *)contentType;
-
-@end
diff --git a/submodules/HockeySDK-iOS/Classes/BITCrashAttachment.m b/submodules/HockeySDK-iOS/Classes/BITCrashAttachment.m
deleted file mode 100644
index f4f408d25d..0000000000
--- a/submodules/HockeySDK-iOS/Classes/BITCrashAttachment.m
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Author: Andreas Linde <mail@andreaslinde.de>
- *
- * Copyright (c) 2014 HockeyApp, Bit Stadium GmbH.
- * All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person
- * obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without
- * restriction, including without limitation the rights to use,
- * copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following
- * conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
- * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#import "HockeySDK.h"
-
-#if HOCKEYSDK_FEATURE_CRASH_REPORTER
-
-#import "BITCrashAttachment.h"
-
-@implementation BITCrashAttachment
-
-- (instancetype)initWithFilename:(NSString *)filename
-             crashAttachmentData:(NSData *)crashAttachmentData
-                     contentType:(NSString *)contentType
-{
-  self = [super initWithFilename:filename hockeyAttachmentData:crashAttachmentData contentType:contentType];
-  
-  return self;
-}
-
-@end
-
-#endif
diff --git a/submodules/HockeySDK-iOS/Classes/BITCrashCXXExceptionHandler.h b/submodules/HockeySDK-iOS/Classes/BITCrashCXXExceptionHandler.h
deleted file mode 100644
index 9efc2d2292..0000000000
--- a/submodules/HockeySDK-iOS/Classes/BITCrashCXXExceptionHandler.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Author: Gwynne Raskind <gwraskin@microsoft.com>
- *
- * Copyright (c) 2015 HockeyApp, Bit Stadium GmbH.
- * All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person
- * obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without
- * restriction, including without limitation the rights to use,
- * copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following
- * conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
- * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#import <Foundation/Foundation.h>
-#import "HockeySDKNullability.h"
-
-typedef struct {
-    const void * __nullable exception;
-    const char * __nullable exception_type_name;
-    const char * __nullable exception_message;
-    uint32_t exception_frames_count;
-    const uintptr_t * __nonnull exception_frames;
-} BITCrashUncaughtCXXExceptionInfo;
-
-typedef void (*BITCrashUncaughtCXXExceptionHandler)(
-    const BITCrashUncaughtCXXExceptionInfo * __nonnull info
-);
-
-@interface BITCrashUncaughtCXXExceptionHandlerManager : NSObject
-
-+ (void)addCXXExceptionHandler:(nonnull BITCrashUncaughtCXXExceptionHandler)handler;
-+ (void)removeCXXExceptionHandler:(nonnull BITCrashUncaughtCXXExceptionHandler)handler;
-
-@end
diff --git a/submodules/HockeySDK-iOS/Classes/BITCrashCXXExceptionHandler.mm b/submodules/HockeySDK-iOS/Classes/BITCrashCXXExceptionHandler.mm
deleted file mode 100644
index 233ab5ea27..0000000000
--- a/submodules/HockeySDK-iOS/Classes/BITCrashCXXExceptionHandler.mm
+++ /dev/null
@@ -1,247 +0,0 @@
-/*
- * Author: Gwynne Raskind <gwraskin@microsoft.com>
- *
- * Copyright (c) 2015 HockeyApp, Bit Stadium GmbH.
- * All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person
- * obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without
- * restriction, including without limitation the rights to use,
- * copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following
- * conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
- * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#import "HockeySDK.h"
-
-#if HOCKEYSDK_FEATURE_CRASH_REPORTER
-
-#import "BITCrashCXXExceptionHandler.h"
-#import <vector>
-#import <cxxabi.h>
-#import <exception>
-#import <stdexcept>
-#import <typeinfo>
-#import <string>
-#import <pthread.h>
-#import <dlfcn.h>
-#import <execinfo.h>
-#import <libkern/OSAtomic.h>
-
-typedef std::vector<BITCrashUncaughtCXXExceptionHandler> BITCrashUncaughtCXXExceptionHandlerList;
-typedef struct
-{
-    void *exception_object;
-    uintptr_t call_stack[128];
-    uint32_t num_frames;
-} BITCrashCXXExceptionTSInfo;
-
-static bool _BITCrashIsOurTerminateHandlerInstalled = false;
-static std::terminate_handler _BITCrashOriginalTerminateHandler = nullptr;
-static BITCrashUncaughtCXXExceptionHandlerList _BITCrashUncaughtExceptionHandlerList;
-// We are ignoring warnings about OSSpinLock being deprecated because a replacement API
-// for this was introduced only in iOS 10.0.
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
-static OSSpinLock _BITCrashCXXExceptionHandlingLock = OS_SPINLOCK_INIT;
-#pragma clang diagnostic pop
-static pthread_key_t _BITCrashCXXExceptionInfoTSDKey = 0;
-
-@implementation BITCrashUncaughtCXXExceptionHandlerManager
-
-extern "C" void __attribute__((noreturn)) __cxa_throw(void *exception_object, std::type_info *tinfo, void (*dest)(void *))
-{
-  // Purposely do not take a lock in this function. The aim is to be as fast as
-  // possible. While we could really use some of the info set up by the real
-  // __cxa_throw, if we call through we never get control back - the function is
-  // noreturn and jumps to landing pads. Most of the stuff in __cxxabiv1 also
-  // won't work yet. We therefore have to do these checks by hand.
-
-  // The technique for distinguishing Objective-C exceptions is based on the
-  // implementation of objc_exception_throw(). It's weird, but it's fast. The
-  // explicit symbol load and NULL checks should guard against the
-  // implementation changing in a future version. (Or not existing in an earlier
-  // version).
-  
-  typedef void (*cxa_throw_func)(void *, std::type_info *, void (*)(void *)) __attribute__((noreturn));
-  static dispatch_once_t predicate = 0;
-  static cxa_throw_func __original__cxa_throw = nullptr;
-  static const void **__real_objc_ehtype_vtable = nullptr;
-
-  dispatch_once(&predicate, ^ {
-    __original__cxa_throw = reinterpret_cast<cxa_throw_func>(dlsym(RTLD_NEXT, "__cxa_throw"));
-    __real_objc_ehtype_vtable = reinterpret_cast<const void **>(dlsym(RTLD_DEFAULT, "objc_ehtype_vtable"));
-  });
-  
-  // Actually check for Objective-C exceptions.
-  if (tinfo && __real_objc_ehtype_vtable && // Guard from an ABI change
-      *reinterpret_cast<void **>(tinfo) == __real_objc_ehtype_vtable + 2) {
-    goto callthrough;
-  }
-  
-  // Any other exception that came here has to be C++, since Objective-C is the
-  // only (known) runtime that hijacks the C++ ABI this way. We need to save off
-  // a backtrace.
-  // Invariant: If the terminate handler is installed, the TSD key must also be
-  // initialized.
-  if (_BITCrashIsOurTerminateHandlerInstalled) {
-    BITCrashCXXExceptionTSInfo *info = static_cast<BITCrashCXXExceptionTSInfo *>(pthread_getspecific(_BITCrashCXXExceptionInfoTSDKey));
-      
-    if (!info) {
-      info = reinterpret_cast<BITCrashCXXExceptionTSInfo *>(calloc(1, sizeof(BITCrashCXXExceptionTSInfo)));
-      pthread_setspecific(_BITCrashCXXExceptionInfoTSDKey, info);
-    }
-    info->exception_object = exception_object;
-    // XXX: All significant time in this call is spent right here.
-    info->num_frames = backtrace(reinterpret_cast<void **>(&info->call_stack[0]), sizeof(info->call_stack) / sizeof(info->call_stack[0]));
-  }
-  
-callthrough:
-  if (__original__cxa_throw) {
-    __original__cxa_throw(exception_object, tinfo, dest);
-  } else {
-    abort();
-  }
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wunreachable-code"
-  __builtin_unreachable();
-#pragma clang diagnostic pop
-}
-
-__attribute__((always_inline))
-static inline void BITCrashIterateExceptionHandlers_unlocked(const BITCrashUncaughtCXXExceptionInfo &info)
-{
-  for (const auto &handler : _BITCrashUncaughtExceptionHandlerList) {
-    handler(&info);
-  }
-}
-
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
-static void BITCrashUncaughtCXXTerminateHandler(void)
-{
-  BITCrashUncaughtCXXExceptionInfo info = {
-    .exception = nullptr,
-    .exception_type_name = nullptr,
-    .exception_message = nullptr,
-    .exception_frames_count = 0,
-    .exception_frames = nullptr,
-  };
-  auto p = std::current_exception();
-  
-  OSSpinLockLock(&_BITCrashCXXExceptionHandlingLock); {
-    if (p) { // explicit operator bool
-      info.exception = reinterpret_cast<const void *>(&p);
-      info.exception_type_name = __cxxabiv1::__cxa_current_exception_type()->name();
-      
-      BITCrashCXXExceptionTSInfo *recorded_info = reinterpret_cast<BITCrashCXXExceptionTSInfo *>(pthread_getspecific(_BITCrashCXXExceptionInfoTSDKey));
-      
-      if (recorded_info) {
-        info.exception_frames_count = recorded_info->num_frames - 1;
-        info.exception_frames = &recorded_info->call_stack[1];
-      } else {
-        // There's no backtrace, grab this function's trace instead. Probably
-        // means the exception came from a dynamically loaded library.
-        void *frames[128] = { nullptr };
-      
-        info.exception_frames_count = backtrace(&frames[0], sizeof(frames) / sizeof(frames[0])) - 1;
-        info.exception_frames = reinterpret_cast<uintptr_t *>(&frames[1]);
-      }
-      
-      try {
-        std::rethrow_exception(p);
-      } catch (const std::exception &e) { // C++ exception.
-        info.exception_message = e.what();
-        BITCrashIterateExceptionHandlers_unlocked(info);
-      } catch (const std::exception *e) { // C++ exception by pointer.
-        info.exception_message = e->what();
-        BITCrashIterateExceptionHandlers_unlocked(info);
-      } catch (const std::string &e) { // C++ string as exception.
-        info.exception_message = e.c_str();
-        BITCrashIterateExceptionHandlers_unlocked(info);
-      } catch (const std::string *e) { // C++ string pointer as exception.
-        info.exception_message = e->c_str();
-        BITCrashIterateExceptionHandlers_unlocked(info);
-      } catch (const char *e) { // Plain string as exception.
-        info.exception_message = e;
-        BITCrashIterateExceptionHandlers_unlocked(info);
-      } catch (id __unused e) { // Objective-C exception. Pass it on to Foundation.
-        OSSpinLockUnlock(&_BITCrashCXXExceptionHandlingLock);
-        if (_BITCrashOriginalTerminateHandler != nullptr) {
-          _BITCrashOriginalTerminateHandler();
-        }
-        return;
-      } catch (...) { // Any other kind of exception. No message.
-        BITCrashIterateExceptionHandlers_unlocked(info);
-      }
-    }
-  } OSSpinLockUnlock(&_BITCrashCXXExceptionHandlingLock); // In case terminate is called reentrantly by pasing it on
-
-  if (_BITCrashOriginalTerminateHandler != nullptr) {
-    _BITCrashOriginalTerminateHandler();
-  } else {
-    abort();
-  }
-}
-
-+ (void)addCXXExceptionHandler:(BITCrashUncaughtCXXExceptionHandler)handler
-{
-  static dispatch_once_t key_predicate = 0;
-  
-  // This only EVER has to be done once, since we don't delete the TSD later
-  // (there's no reason to delete it).
-  dispatch_once(&key_predicate, ^ {
-    pthread_key_create(&_BITCrashCXXExceptionInfoTSDKey, free);
-  });
-
-  OSSpinLockLock(&_BITCrashCXXExceptionHandlingLock); {
-    if (!_BITCrashIsOurTerminateHandlerInstalled) {
-      _BITCrashOriginalTerminateHandler = std::set_terminate(BITCrashUncaughtCXXTerminateHandler);
-      _BITCrashIsOurTerminateHandlerInstalled = true;
-    }
-    _BITCrashUncaughtExceptionHandlerList.push_back(handler);
-  } OSSpinLockUnlock(&_BITCrashCXXExceptionHandlingLock);
-}
-
-+ (void)removeCXXExceptionHandler:(BITCrashUncaughtCXXExceptionHandler)handler
-{
-  OSSpinLockLock(&_BITCrashCXXExceptionHandlingLock); {
-    auto i = std::find(_BITCrashUncaughtExceptionHandlerList.begin(), _BITCrashUncaughtExceptionHandlerList.end(), handler);
-  
-    if (i != _BITCrashUncaughtExceptionHandlerList.end()) {
-      _BITCrashUncaughtExceptionHandlerList.erase(i);
-    }
-
-    if (_BITCrashIsOurTerminateHandlerInstalled) {
-      if (_BITCrashUncaughtExceptionHandlerList.empty()) {
-        std::terminate_handler previous_handler = std::set_terminate(_BITCrashOriginalTerminateHandler);
-        
-        if (previous_handler != BITCrashUncaughtCXXTerminateHandler) {
-          std::set_terminate(previous_handler);
-        } else {
-          _BITCrashIsOurTerminateHandlerInstalled = false;
-          _BITCrashOriginalTerminateHandler = nullptr;
-        }
-      }
-    }
-  } OSSpinLockUnlock(&_BITCrashCXXExceptionHandlingLock);
-}
-#pragma clang diagnostic pop
-
-@end
-
-#endif /* HOCKEYSDK_FEATURE_CRASH_REPORTER */
diff --git a/submodules/HockeySDK-iOS/Classes/BITCrashDetails.h b/submodules/HockeySDK-iOS/Classes/BITCrashDetails.h
deleted file mode 100644
index be2d62fa3a..0000000000
--- a/submodules/HockeySDK-iOS/Classes/BITCrashDetails.h
+++ /dev/null
@@ -1,123 +0,0 @@
-/*
- * Author: Andreas Linde <mail@andreaslinde.de>
- *
- * Copyright (c) 2012-2014 HockeyApp, Bit Stadium GmbH.
- * All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person
- * obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without
- * restriction, including without limitation the rights to use,
- * copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following
- * conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
- * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#import <Foundation/Foundation.h>
-
-/**
- *  Provides details about the crash that occurred in the previous app session
- */
-@interface BITCrashDetails : NSObject
-
-/**
- *  UUID for the crash report
- */
-@property (nonatomic, readonly, copy) NSString *incidentIdentifier;
-
-/**
- *  UUID for the app installation on the device
- */
-@property (nonatomic, readonly, copy) NSString *reporterKey;
-
-/**
- *  Signal that caused the crash
- */
-@property (nonatomic, readonly, copy) NSString *signal;
-
-/**
- *  Exception name that triggered the crash, nil if the crash was not caused by an exception
- */
-@property (nonatomic, readonly, copy) NSString *exceptionName;
-
-/**
- *  Exception reason, nil if the crash was not caused by an exception
- */
-@property (nonatomic, readonly, copy) NSString *exceptionReason;
-
-/**
- *  Date and time the app started, nil if unknown
- */
-@property (nonatomic, readonly, strong) NSDate *appStartTime;
-
-/**
- *  Date and time the crash occurred, nil if unknown
- */
-@property (nonatomic, readonly, strong) NSDate *crashTime;
-
-/**
- *  Operation System version string the app was running on when it crashed.
- */
-@property (nonatomic, readonly, copy) NSString *osVersion;
-
-/**
- *  Operation System build string the app was running on when it crashed
- *
- *  This may be unavailable.
- */
-@property (nonatomic, readonly, copy) NSString *osBuild;
-
-/**
- *  CFBundleShortVersionString value of the app that crashed
- *
- *  Can be `nil` if the crash was captured with an older version of the SDK
- *  or if the app doesn't set the value.
- */
-@property (nonatomic, readonly, copy) NSString *appVersion;
-
-/**
- *  CFBundleVersion value of the app that crashed
- */
-@property (nonatomic, readonly, copy) NSString *appBuild;
-
-/**
- *  Identifier of the app process that crashed
- */
-@property (nonatomic, readonly, assign) NSUInteger appProcessIdentifier;
-
-/**
- Indicates if the app was killed while being in foreground from the iOS
- 
- If `[BITCrashManager enableAppNotTerminatingCleanlyDetection]` is enabled, use this on startup
- to check if the app starts the first time after it was killed by iOS in the previous session.
- 
- This can happen if it consumed too much memory or the watchdog killed the app because it
- took too long to startup or blocks the main thread for too long, or other reasons. See Apple
- documentation: https://developer.apple.com/library/ios/qa/qa1693/_index.html
- 
- See `[BITCrashManager enableAppNotTerminatingCleanlyDetection]` for more details about which kind of kills can be detected.
- 
- @warning This property only has a correct value, once `[BITHockeyManager startManager]` was
- invoked! In addition, it is automatically disabled while a debugger session is active!
- 
- @see `[BITCrashManager enableAppNotTerminatingCleanlyDetection]`
- @see `[BITCrashManager didReceiveMemoryWarningInLastSession]`
- 
- @return YES if the details represent an app kill instead of a crash
- */
-- (BOOL)isAppKill;
-
-@end
diff --git a/submodules/HockeySDK-iOS/Classes/BITCrashDetails.m b/submodules/HockeySDK-iOS/Classes/BITCrashDetails.m
deleted file mode 100644
index b9fa38f6bb..0000000000
--- a/submodules/HockeySDK-iOS/Classes/BITCrashDetails.m
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * Author: Andreas Linde <mail@andreaslinde.de>
- *
- * Copyright (c) 2012-2014 HockeyApp, Bit Stadium GmbH.
- * All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person
- * obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without
- * restriction, including without limitation the rights to use,
- * copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following
- * conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
- * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#import "HockeySDK.h"
-
-#if HOCKEYSDK_FEATURE_CRASH_REPORTER
-
-#import "BITCrashDetails.h"
-#import "BITCrashDetailsPrivate.h"
-
-NSString *const kBITCrashKillSignal = @"SIGKILL";
-
-@implementation BITCrashDetails
-
-- (instancetype)initWithIncidentIdentifier:(NSString *)incidentIdentifier
-                               reporterKey:(NSString *)reporterKey
-                                    signal:(NSString *)signal
-                             exceptionName:(NSString *)exceptionName
-                           exceptionReason:(NSString *)exceptionReason
-                              appStartTime:(NSDate *)appStartTime
-                                 crashTime:(NSDate *)crashTime
-                                 osVersion:(NSString *)osVersion
-                                   osBuild:(NSString *)osBuild
-                                appVersion:(NSString *)appVersion
-                                  appBuild:(NSString *)appBuild
-                      appProcessIdentifier:(NSUInteger)appProcessIdentifier
-{
-  if ((self = [super init])) {
-    _incidentIdentifier = incidentIdentifier;
-    _reporterKey = reporterKey;
-    _signal = signal;
-    _exceptionName = exceptionName;
-    _exceptionReason = exceptionReason;
-    _appStartTime = appStartTime;
-    _crashTime = crashTime;
-    _osVersion = osVersion;
-    _osBuild = osBuild;
-    _appVersion = appVersion;
-    _appBuild = appBuild;
-    _appProcessIdentifier = appProcessIdentifier;
-  }
-  return self;
-}
-
-- (BOOL)isAppKill {
-  BOOL result = NO;
-  
-  if (self.signal && [[self.signal uppercaseString] isEqualToString:kBITCrashKillSignal])
-    result = YES;
-  
-  return result;
-}
-
-@end
-
-#endif /* HOCKEYSDK_FEATURE_CRASH_REPORTER */
diff --git a/submodules/HockeySDK-iOS/Classes/BITCrashDetailsPrivate.h b/submodules/HockeySDK-iOS/Classes/BITCrashDetailsPrivate.h
deleted file mode 100644
index 48b3061344..0000000000
--- a/submodules/HockeySDK-iOS/Classes/BITCrashDetailsPrivate.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Author: Andreas Linde <mail@andreaslinde.de>
- *
- * Copyright (c) 2012-2014 HockeyApp, Bit Stadium GmbH.
- * All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person
- * obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without
- * restriction, including without limitation the rights to use,
- * copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following
- * conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
- * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
- */
-
-extern NSString *const kBITCrashKillSignal;
-
-@interface BITCrashDetails () {
-  
-}
-
-- (instancetype)initWithIncidentIdentifier:(NSString *)incidentIdentifier
-                               reporterKey:(NSString *)reporterKey
-                                    signal:(NSString *)signal
-                             exceptionName:(NSString *)exceptionName
-                           exceptionReason:(NSString *)exceptionReason
-                              appStartTime:(NSDate *)appStartTime
-                                 crashTime:(NSDate *)crashTime
-                                 osVersion:(NSString *)osVersion
-                                   osBuild:(NSString *)osBuild
-                                appVersion:(NSString *)appVersion
-                                  appBuild:(NSString *)appBuild
-                      appProcessIdentifier:(NSUInteger)appProcessIdentifier;
-
-@end
diff --git a/submodules/HockeySDK-iOS/Classes/BITCrashManager.h b/submodules/HockeySDK-iOS/Classes/BITCrashManager.h
deleted file mode 100644
index 69e7500f80..0000000000
--- a/submodules/HockeySDK-iOS/Classes/BITCrashManager.h
+++ /dev/null
@@ -1,441 +0,0 @@
-/*
- * Author: Andreas Linde <mail@andreaslinde.de>
- *         Kent Sutherland
- *
- * Copyright (c) 2012-2014 HockeyApp, Bit Stadium GmbH.
- * Copyright (c) 2011 Andreas Linde & Kent Sutherland.
- * All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person
- * obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without
- * restriction, including without limitation the rights to use,
- * copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following
- * conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
- * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#import <Foundation/Foundation.h>
-
-#import "BITHockeyBaseManager.h"
-
-@class BITCrashDetails;
-@class BITCrashMetaData;
-
-
-/**
- * Custom block that handles the alert that prompts the user whether they want to send crash reports
- */
-typedef void(^BITCustomAlertViewHandler)(void);
-
-
-/**
- * Crash Manager status
- */
-typedef NS_ENUM(NSUInteger, BITCrashManagerStatus) {
-  /**
-   *	Crash reporting is disabled
-   */
-  BITCrashManagerStatusDisabled = 0,
-  /**
-   *	User is asked each time before sending
-   */
-  BITCrashManagerStatusAlwaysAsk = 1,
-  /**
-   *	Each crash report is send automatically
-   */
-  BITCrashManagerStatusAutoSend = 2
-};
-
-
-/**
- * Prototype of a callback function used to execute additional user code. Called upon completion of crash
- * handling, after the crash report has been written to disk.
- *
- * @param context The API client's supplied context value.
- *
- * @see `BITCrashManagerCallbacks`
- * @see `[BITCrashManager setCrashCallbacks:]`
- */
-typedef void (*BITCrashManagerPostCrashSignalCallback)(void *context);
-
-/**
- * This structure contains callbacks supported by `BITCrashManager` to allow the host application to perform
- * additional tasks prior to program termination after a crash has occurred.
- *
- * @see `BITCrashManagerPostCrashSignalCallback`
- * @see `[BITCrashManager setCrashCallbacks:]`
- */
-typedef struct BITCrashManagerCallbacks {
-  /** An arbitrary user-supplied context value. This value may be NULL. */
-  void *context;
-  
-  /**
-   * The callback used to report caught signal information.
-   */
-  BITCrashManagerPostCrashSignalCallback handleSignal;
-} BITCrashManagerCallbacks;
-
-
-/**
- * Crash Manager alert user input
- */
-typedef NS_ENUM(NSUInteger, BITCrashManagerUserInput) {
-  /**
-   *  User chose not to send the crash report
-   */
-  BITCrashManagerUserInputDontSend = 0,
-  /**
-   *  User wants the crash report to be sent
-   */
-  BITCrashManagerUserInputSend = 1,
-  /**
-   *  User chose to always send crash reports
-   */
-  BITCrashManagerUserInputAlwaysSend = 2
-  
-};
-
-
-@protocol BITCrashManagerDelegate;
-
-/**
- The crash reporting module.
- 
- This is the HockeySDK module for handling crash reports, including when distributed via the App Store.
- As a foundation it is using the open source, reliable and async-safe crash reporting framework
- [PLCrashReporter](https://code.google.com/p/plcrashreporter/).
- 
- This module works as a wrapper around the underlying crash reporting framework and provides functionality to
- detect new crashes, queues them if networking is not available, present a user interface to approve sending
- the reports to the HockeyApp servers and more.
- 
- It also provides options to add additional meta information to each crash report, like `userName`, `userEmail`
- via `BITHockeyManagerDelegate` protocol, and additional textual log information via `BITCrashManagerDelegate`
- protocol and a way to detect startup crashes so you can adjust your startup process to get these crash reports
- too and delay your app initialization.
- 
- Crashes are send the next time the app starts. If `crashManagerStatus` is set to `BITCrashManagerStatusAutoSend`,
- crashes will be send without any user interaction, otherwise an alert will appear allowing the users to decide
- whether they want to send the report or not. This module is not sending the reports right when the crash happens
- deliberately, because if is not safe to implement such a mechanism while being async-safe (any Objective-C code
- is _NOT_ async-safe!) and not causing more danger like a deadlock of the device, than helping. We found that users
- do start the app again because most don't know what happened, and you will get by far most of the reports.
- 
- Sending the reports on startup is done asynchronously (non-blocking). This is the only safe way to ensure
- that the app won't be possibly killed by the iOS watchdog process, because startup could take too long
- and the app could not react to any user input when network conditions are bad or connectivity might be
- very slow.
- 
- It is possible to check upon startup if the app crashed before using `didCrashInLastSession` and also how much
- time passed between the app launch and the crash using `timeIntervalCrashInLastSessionOccurred`. This allows you
- to add additional code to your app delaying the app start until the crash has been successfully send if the crash
- occurred within a critical startup timeframe, e.g. after 10 seconds. The `BITCrashManagerDelegate` protocol provides
- various delegates to inform the app about it's current status so you can continue the remaining app startup setup
- after sending has been completed. The documentation contains a guide
- [How to handle Crashes on startup](HowTo-Handle-Crashes-On-Startup) with an example on how to do that.
- 
- More background information on this topic can be found in the following blog post by Landon Fuller, the
- developer of [PLCrashReporter](https://www.plcrashreporter.org), about writing reliable and
- safe crash reporting: [Reliable Crash Reporting](http://goo.gl/WvTBR)
- 
- @warning If you start the app with the Xcode debugger attached, detecting crashes will _NOT_ be enabled!
- */
-
-@interface BITCrashManager : BITHockeyBaseManager
-
-
-///-----------------------------------------------------------------------------
-/// @name Configuration
-///-----------------------------------------------------------------------------
-
-/** Set the default status of the Crash Manager
- 
- Defines if the crash reporting feature should be disabled, ask the user before
- sending each crash report or send crash reports automatically without
- asking.
- 
- The default value is `BITCrashManagerStatusAlwaysAsk`. The user can switch to
- `BITCrashManagerStatusAutoSend` by choosing "Always" in the dialog (since 
- `showAlwaysButton` default is _YES_).
- 
- The current value is always stored in User Defaults with the key
- `BITCrashManagerStatus`.
- 
- If you intend to implement a user setting to let them enable or disable
- crash reporting, this delegate should be used to return that value. You also
- have to make sure the new value is stored in the UserDefaults with the key
- `BITCrashManagerStatus`.
- 
- @see BITCrashManagerStatus
- @see showAlwaysButton
- */
-@property (nonatomic, assign) BITCrashManagerStatus crashManagerStatus;
-
-
-/**
- *  Trap fatal signals via a Mach exception server.
- *
- *  By default the SDK is using the safe and proven in-process BSD Signals for catching crashes.
- *  This option provides an option to enable catching fatal signals via a Mach exception server
- *  instead.
- *
- *  We strongly advice _NOT_ to enable Mach exception handler in release versions of your apps!
- *
- *  Default: _NO_
- *
- * @warning The Mach exception handler executes in-process, and will interfere with debuggers when
- *  they attempt to suspend all active threads (which will include the Mach exception handler).
- *  Mach-based handling should _NOT_ be used when a debugger is attached. The SDK will not
- *  enabled catching exceptions if the app is started with the debugger running. If you attach
- *  the debugger during runtime, this may cause issues the Mach exception handler is enabled!
- * @see isDebuggerAttached
- */
-@property (nonatomic, assign, getter=isMachExceptionHandlerEnabled) BOOL enableMachExceptionHandler;
-
-
-/**
- *  Enable on device symbolication for system symbols
- *
- *  By default, the SDK does not symbolicate on the device, since this can
- *  take a few seconds at each crash. Also note that symbolication on the
- *  device might not be able to retrieve all symbols.
- *
- *  Enable if you want to analyze crashes on unreleased OS versions.
- *
- *  Default: _NO_
- */
-@property (nonatomic, assign, getter=isOnDeviceSymbolicationEnabled) BOOL enableOnDeviceSymbolication;
-
-
-/**
- *  EXPERIMENTAL: Enable heuristics to detect the app not terminating cleanly
- *
- *  This allows it to get a crash report if the app got killed while being in the foreground
- *  because of one of the following reasons:
- *
- *  - The main thread was blocked for too long
- *  - The app took too long to start up
- *  - The app tried to allocate too much memory. If iOS did send a memory warning before killing the app because of this reason, `didReceiveMemoryWarningInLastSession` returns `YES`.
- *  - Permitted background duration if main thread is running in an endless loop
- *  - App failed to resume in time if main thread is running in an endless loop
- *  - If `enableMachExceptionHandler` is not activated, crashed due to stack overflow will also be reported
- *
- *  The following kills can _NOT_ be detected:
- *
- *  - Terminating the app takes too long
- *  - Permitted background duration too long for all other cases
- *  - App failed to resume in time for all other cases
- *  - possibly more cases
- *
- *  Crash reports triggered by this mechanisms do _NOT_ contain any stack traces since the time of the kill
- *  cannot be intercepted and hence no stack trace of the time of the kill event can't be gathered.
- *
- *  The heuristic is implemented as follows:
- *  If the app never gets a `UIApplicationDidEnterBackgroundNotification` or `UIApplicationWillTerminateNotification`
- *  notification, PLCrashReporter doesn't detect a crash itself, and the app starts up again, it is assumed that
- *  the app got either killed by iOS while being in foreground or a crash occurred that couldn't be detected.
- *
- *  Default: _NO_
- *
- * @warning This is a heuristic and it _MAY_ report false positives! It has been tested with iOS 6.1 and iOS 7.
- * Depending on Apple changing notification events, new iOS version may cause more false positives!
- *
- * @see lastSessionCrashDetails
- * @see didReceiveMemoryWarningInLastSession
- * @see `BITCrashManagerDelegate considerAppNotTerminatedCleanlyReportForCrashManager:`
- * @see [Apple Technical Note TN2151](https://developer.apple.com/library/ios/technotes/tn2151/_index.html)
- * @see [Apple Technical Q&A QA1693](https://developer.apple.com/library/ios/qa/qa1693/_index.html)
- */
-@property (nonatomic, assign, getter = isAppNotTerminatingCleanlyDetectionEnabled) BOOL enableAppNotTerminatingCleanlyDetection;
-
-
-/**
- * Set the callbacks that will be executed prior to program termination after a crash has occurred
- *
- * PLCrashReporter provides support for executing an application specified function in the context
- * of the crash reporter's signal handler, after the crash report has been written to disk.
- *
- * Writing code intended for execution inside of a signal handler is exceptionally difficult, and is _NOT_ recommended!
- *
- * _Program Flow and Signal Handlers_
- *
- * When the signal handler is called the normal flow of the program is interrupted, and your program is an unknown state. Locks may be held, the heap may be corrupt (or in the process of being updated), and your signal handler may invoke a function that was being executed at the time of the signal. This may result in deadlocks, data corruption, and program termination.
- *
- * _Async-Safe Functions_
- *
- * A subset of functions are defined to be async-safe by the OS, and are safely callable from within a signal handler. If you do implement a custom post-crash handler, it must be async-safe. A table of POSIX-defined async-safe functions and additional information is available from the [CERT programming guide - SIG30-C](https://www.securecoding.cert.org/confluence/display/seccode/SIG30-C.+Call+only+asynchronous-safe+functions+within+signal+handlers).
- *
- * Most notably, the Objective-C runtime itself is not async-safe, and Objective-C may not be used within a signal handler.
- *
- * Documentation taken from PLCrashReporter: https://www.plcrashreporter.org/documentation/api/v1.2-rc2/async_safety.html
- *
- * @see BITCrashManagerPostCrashSignalCallback
- * @see BITCrashManagerCallbacks
- *
- * @param callbacks A pointer to an initialized PLCrashReporterCallback structure, see https://www.plcrashreporter.org/documentation/api/v1.2-rc2/struct_p_l_crash_reporter_callbacks.html
- */
-- (void)setCrashCallbacks: (BITCrashManagerCallbacks *) callbacks;
-
-
-/**
- Flag that determines if an "Always" option should be shown
- 
- If enabled the crash reporting alert will also present an "Always" option, so
- the user doesn't have to approve every single crash over and over again.
- 
- If If `crashManagerStatus` is set to `BITCrashManagerStatusAutoSend`, this property
- has no effect, since no alert will be presented.
-
- Default: _YES_
- 
- @see crashManagerStatus
- */
-@property (nonatomic, assign, getter=shouldShowAlwaysButton) BOOL showAlwaysButton;
-
-
-///-----------------------------------------------------------------------------
-/// @name Crash Meta Information
-///-----------------------------------------------------------------------------
-
-/**
- Indicates if the app crash in the previous session
-
- Use this on startup, to check if the app starts the first time after it crashed
- previously. You can use this also to disable specific events, like asking
- the user to rate your app.
- 
- @warning This property only has a correct value, once `[BITHockeyManager startManager]` was
- invoked!
- 
- @see lastSessionCrashDetails
- */
-@property (nonatomic, readonly) BOOL didCrashInLastSession;
-
-/**
- Provides an interface to pass user input from a custom alert to a crash report
- 
- @param userInput Defines the users action wether to send, always send, or not to send the crash report.
- @param userProvidedMetaData The content of this optional BITCrashMetaData instance will be attached to the crash report and allows to ask the user for e.g. additional comments or info.
- 
- @return Returns YES if the input is a valid option and successfully triggered further processing of the crash report
- 
- @see BITCrashManagerUserInput
- @see BITCrashMetaData
- */
-- (BOOL)handleUserInput:(BITCrashManagerUserInput)userInput withUserProvidedMetaData:(BITCrashMetaData *)userProvidedMetaData;
-
-/**
- Lets you set a custom block which handles showing a custom UI and asking the user
- whether they want to send the crash report.
- 
- This replaces the default alert the SDK would show!
- 
- You can use this to present any kind of user interface which asks the user for additional information,
- e.g. what they did in the app before the app crashed.
- 
- In addition to this you should always ask your users if they agree to send crash reports, send them
- always or not and return the result when calling `handleUserInput:withUserProvidedCrashDescription`.
- 
- @param alertViewHandler A block that is responsible for loading, presenting and and dismissing your custom user interface which prompts the user if they want to send crash reports. The block is also responsible for triggering further processing of the crash reports.
- 
- @warning This is not available when compiled for Watch OS!
- 
- @warning Block needs to call the `[BITCrashManager handleUserInput:withUserProvidedMetaData:]` method!
- 
- @warning This needs to be set before calling `[BITHockeyManager startManager]`!
- */
-- (void)setAlertViewHandler:(BITCustomAlertViewHandler)alertViewHandler;
-
-/**
- * Provides details about the crash that occurred in the last app session
- */
-@property (nonatomic, readonly) BITCrashDetails *lastSessionCrashDetails;
-
-
-/**
- Indicates if the app did receive a low memory warning in the last session
- 
- It may happen that low memory warning where send but couldn't be logged, since iOS
- killed the app before updating the flag in the filesystem did complete.
- 
- This property may be true in case of low memory kills, but it doesn't have to be! Apps
- can also be killed without the app ever receiving a low memory warning.
- 
- Also the app could have received a low memory warning, but the reason for being killed was
- actually different.
- 
- @warning This property only has a correct value, once `[BITHockeyManager startManager]` was
- invoked!
- 
- @see enableAppNotTerminatingCleanlyDetection
- @see lastSessionCrashDetails
- */
-@property (nonatomic, readonly) BOOL didReceiveMemoryWarningInLastSession;
-
-
-/**
- Provides the time between startup and crash in seconds
- 
- Use this in together with `didCrashInLastSession` to detect if the app crashed very
- early after startup. This can be used to delay app initialization until the crash
- report has been sent to the server or if you want to do any other actions like
- cleaning up some cache data etc.
- 
- Note that sending a crash reports starts as early as 1.5 seconds after the application
- did finish launching!
- 
- The `BITCrashManagerDelegate` protocol provides some delegates to inform if sending
- a crash report was finished successfully, ended in error or was cancelled by the user.
- 
- *Default*: _-1_
- @see didCrashInLastSession
- @see BITCrashManagerDelegate
- */
-@property (nonatomic, readonly) NSTimeInterval timeIntervalCrashInLastSessionOccurred;
-
-
-///-----------------------------------------------------------------------------
-/// @name Helper
-///-----------------------------------------------------------------------------
-
-/**
- *  Detect if a debugger is attached to the app process
- *
- *  This is only invoked once on app startup and can not detect if the debugger is being
- *  attached during runtime!
- *
- *  @return BOOL if the debugger is attached on app startup
- */
-- (BOOL)isDebuggerAttached;
-
-
-/**
- * Lets the app crash for easy testing of the SDK
- *
- * The best way to use this is to trigger the crash with a button action.
- *
- * Make sure not to let the app crash in `applicationDidFinishLaunching` or any other
- * startup method! Since otherwise the app would crash before the SDK could process it.
- *
- * Note that our SDK provides support for handling crashes that happen early on startup.
- * Check the documentation for more information on how to use this.
- *
- * If the SDK detects an App Store environment, it will _NOT_ cause the app to crash!
- */
-- (void)generateTestCrash;
-
-@end
diff --git a/submodules/HockeySDK-iOS/Classes/BITCrashManager.m b/submodules/HockeySDK-iOS/Classes/BITCrashManager.m
deleted file mode 100644
index 6b60dcc00a..0000000000
--- a/submodules/HockeySDK-iOS/Classes/BITCrashManager.m
+++ /dev/null
@@ -1,1713 +0,0 @@
-/*
- * Author: Andreas Linde <mail@andreaslinde.de>
- *         Kent Sutherland
- *
- * Copyright (c) 2012-2014 HockeyApp, Bit Stadium GmbH.
- * Copyright (c) 2011 Andreas Linde & Kent Sutherland.
- * All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person
- * obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without
- * restriction, including without limitation the rights to use,
- * copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following
- * conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
- * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#import "HockeySDKFeatureConfig.h"
-
-#if HOCKEYSDK_FEATURE_CRASH_REPORTER
-
-#import <SystemConfiguration/SystemConfiguration.h>
-#import <UIKit/UIKit.h>
-
-#import "HockeySDKPrivate.h"
-#import "BITHockeyHelper.h"
-#import "BITHockeyHelper+Application.h"
-#import "BITHockeyAppClient.h"
-
-#import "BITCrashManager.h"
-#import "BITCrashManagerPrivate.h"
-#import "BITCrashAttachment.h"
-#import "BITHockeyBaseManagerPrivate.h"
-#import "BITCrashReportTextFormatter.h"
-#import "BITCrashDetailsPrivate.h"
-#import "BITCrashCXXExceptionHandler.h"
-
-#if HOCKEYSDK_FEATURE_METRICS
-#import "BITMetricsManagerPrivate.h"
-#import "BITChannel.h"
-#import "BITPersistencePrivate.h"
-#endif
-
-#include <sys/sysctl.h>
-
-// stores the set of crashreports that have been approved but aren't sent yet
-#define kBITCrashApprovedReports @"HockeySDKCrashApprovedReports"
-
-// keys for meta information associated to each crash
-#define kBITCrashMetaUserName @"BITCrashMetaUserName"
-#define kBITCrashMetaUserEmail @"BITCrashMetaUserEmail"
-#define kBITCrashMetaUserID @"BITCrashMetaUserID"
-#define kBITCrashMetaApplicationLog @"BITCrashMetaApplicationLog"
-#define kBITCrashMetaAttachment @"BITCrashMetaAttachment"
-
-// internal keys
-static NSString *const KBITAttachmentDictIndex = @"index";
-static NSString *const KBITAttachmentDictAttachment = @"attachment";
-
-static NSString *const kBITCrashManagerStatus = @"BITCrashManagerStatus";
-
-static NSString *const kBITAppWentIntoBackgroundSafely = @"BITAppWentIntoBackgroundSafely";
-static NSString *const kBITAppDidReceiveLowMemoryNotification = @"BITAppDidReceiveLowMemoryNotification";
-static NSString *const kBITAppMarketingVersion = @"BITAppMarketingVersion";
-static NSString *const kBITAppVersion = @"BITAppVersion";
-static NSString *const kBITAppOSVersion = @"BITAppOSVersion";
-static NSString *const kBITAppOSBuild = @"BITAppOSBuild";
-static NSString *const kBITAppUUIDs = @"BITAppUUIDs";
-
-static NSString *const kBITFakeCrashUUID = @"BITFakeCrashUUID";
-static NSString *const kBITFakeCrashAppMarketingVersion = @"BITFakeCrashAppMarketingVersion";
-static NSString *const kBITFakeCrashAppVersion = @"BITFakeCrashAppVersion";
-static NSString *const kBITFakeCrashAppBundleIdentifier = @"BITFakeCrashAppBundleIdentifier";
-static NSString *const kBITFakeCrashOSVersion = @"BITFakeCrashOSVersion";
-static NSString *const kBITFakeCrashDeviceModel = @"BITFakeCrashDeviceModel";
-static NSString *const kBITFakeCrashAppBinaryUUID = @"BITFakeCrashAppBinaryUUID";
-static NSString *const kBITFakeCrashReport = @"BITFakeCrashAppString";
-
-// We need BIT_UNUSED macro to make sure there aren't any warnings when building
-// HockeySDK Distribution scheme. Since several configurations are build in this scheme
-// and different features can be turned on and off we can't just use __unused attribute.
-#if HOCKEYSDK_FEATURE_METRICS
-static char const *BITSaveEventsFilePath;
-#define BIT_UNUSED
-#else
-#define BIT_UNUSED __unused
-#endif
-
-static BITCrashManagerCallbacks bitCrashCallbacks = {
-  .context = NULL,
-  .handleSignal = NULL
-};
-
-#if HOCKEYSDK_FEATURE_METRICS
-static void bit_save_events_callback(siginfo_t __unused *info, ucontext_t __unused *uap, void __unused *context) {
-  
-  // Do not flush metrics queue if queue is empty (metrics module disabled) to not freeze the app
-  if (!BITTelemetryEventBuffer) {
-    return;
-  }
-  
-  // Try to get a file descriptor with our pre-filled path
-  int fd = open(BITSaveEventsFilePath, O_WRONLY | O_CREAT | O_TRUNC, 0644);
-  if (fd < 0) {
-    return;
-  }
-  
-  size_t len = strlen(BITTelemetryEventBuffer);
-  if (len > 0) {
-    // Simply write the whole string to disk
-    write(fd, BITTelemetryEventBuffer, len);
-  }
-  close(fd);
-}
-#endif
-
-// Proxy implementation for PLCrashReporter to keep our interface stable while this can change
-static void plcr_post_crash_callback (BIT_UNUSED siginfo_t *info, BIT_UNUSED ucontext_t *uap, void *context) {
-#if HOCKEYSDK_FEATURE_METRICS
-  bit_save_events_callback(info, uap, context);
-#endif
-  if (bitCrashCallbacks.handleSignal != NULL) {
-    bitCrashCallbacks.handleSignal(context);
-  }
-}
-
-static PLCrashReporterCallbacks plCrashCallbacks = {
-  .version = 0,
-  .context = NULL,
-  .handleSignal = plcr_post_crash_callback
-};
-
-// Temporary class until PLCR catches up
-// We trick PLCR with an Objective-C exception.
-//
-// This code provides us access to the C++ exception message, including a correct stack trace.
-//
-@interface BITCrashCXXExceptionWrapperException : NSException
-
-- (instancetype)initWithCXXExceptionInfo:(const BITCrashUncaughtCXXExceptionInfo *)info;
-
-@property (nonatomic, readonly) const BITCrashUncaughtCXXExceptionInfo *info;
-
-@end
-
-@implementation BITCrashCXXExceptionWrapperException
-
-- (instancetype)initWithCXXExceptionInfo:(const BITCrashUncaughtCXXExceptionInfo *)info {
-  extern char* __cxa_demangle(const char* mangled_name, char* output_buffer, size_t* length, int* status);
-  char *demangled_name = &__cxa_demangle ? __cxa_demangle(info->exception_type_name ?: "", NULL, NULL, NULL) : NULL;
-  
-  if ((self = [super
-               initWithName:(NSString *)[NSString stringWithUTF8String:demangled_name ?: info->exception_type_name ?: ""]
-               reason:[NSString stringWithUTF8String:info->exception_message ?: ""]
-               userInfo:nil])) {
-    _info = info;
-  }
-  return self;
-}
-
-- (NSArray *)callStackReturnAddresses {
-  NSMutableArray *cxxFrames = [NSMutableArray arrayWithCapacity:self.info->exception_frames_count];
-  
-  for (uint32_t i = 0; i < self.info->exception_frames_count; ++i) {
-    [cxxFrames addObject:[NSNumber numberWithUnsignedLongLong:self.info->exception_frames[i]]];
-  }
-  return cxxFrames;
-}
-
-@end
-
-
-// C++ Exception Handler
-__attribute__((noreturn)) static void uncaught_cxx_exception_handler(const BITCrashUncaughtCXXExceptionInfo *info) {
-  // This relies on a LOT of sneaky internal knowledge of how PLCR works and should not be considered a long-term solution.
-  NSGetUncaughtExceptionHandler()([[BITCrashCXXExceptionWrapperException alloc] initWithCXXExceptionInfo:info]);
-  abort();
-}
-
-@interface BITCrashManager ()
-
-@property (nonatomic, strong) NSMutableDictionary *approvedCrashReports;
-@property (nonatomic, strong) NSMutableArray *crashFiles;
-@property (nonatomic, copy) NSString *settingsFile;
-@property (nonatomic, copy) NSString *analyzerInProgressFile;
-@property (nonatomic) BOOL crashIdenticalCurrentVersion;
-@property (nonatomic) BOOL sendingInProgress;
-@property (nonatomic) BOOL isSetup;
-@property (nonatomic) BOOL didLogLowMemoryWarning;
-@property (nonatomic, weak) id appDidBecomeActiveObserver;
-@property (nonatomic, weak) id appWillTerminateObserver;
-@property (nonatomic, weak) id appDidEnterBackgroundObserver;
-@property (nonatomic, weak) id appWillEnterForegroundObserver;
-@property (nonatomic, weak) id appDidReceiveLowMemoryWarningObserver;
-@property (nonatomic, weak) id networkDidBecomeReachableObserver;
-
-// Redeclare BITCrashManager properties with readwrite attribute
-@property (nonatomic, readwrite) NSTimeInterval timeIntervalCrashInLastSessionOccurred;
-@property (nonatomic, readwrite) BITCrashDetails *lastSessionCrashDetails;
-@property (nonatomic, readwrite) BOOL didCrashInLastSession;
-@property (nonatomic, readwrite) BOOL didReceiveMemoryWarningInLastSession;
-
-@end
-
-@implementation BITCrashManager
-
-- (instancetype)initWithAppIdentifier:(NSString *)appIdentifier appEnvironment:(BITEnvironment)environment hockeyAppClient:(BITHockeyAppClient *)hockeyAppClient {
-  if ((self = [super initWithAppIdentifier:appIdentifier appEnvironment:environment])) {
-    _delegate = nil;
-    _isSetup = NO;
-    
-    _hockeyAppClient = hockeyAppClient;
-    
-    _showAlwaysButton = YES;
-    _alertViewHandler = nil;
-    
-    _plCrashReporter = nil;
-    _exceptionHandler = nil;
-    
-    _crashIdenticalCurrentVersion = YES;
-    
-    _didCrashInLastSession = NO;
-    _timeIntervalCrashInLastSessionOccurred = -1;
-    _didLogLowMemoryWarning = NO;
-    
-    _approvedCrashReports = [[NSMutableDictionary alloc] init];
-    
-    _fileManager = [[NSFileManager alloc] init];
-    _crashFiles = [[NSMutableArray alloc] init];
-    
-    _crashManagerStatus = BITCrashManagerStatusAlwaysAsk;
-    
-    if ([[NSUserDefaults standardUserDefaults] stringForKey:kBITCrashManagerStatus]) {
-      _crashManagerStatus = (BITCrashManagerStatus)[[NSUserDefaults standardUserDefaults] integerForKey:kBITCrashManagerStatus];
-    } else {
-      // migrate previous setting if available
-      if ([[NSUserDefaults standardUserDefaults] boolForKey:@"BITCrashAutomaticallySendReports"]) {
-        _crashManagerStatus = BITCrashManagerStatusAutoSend;
-        [[NSUserDefaults standardUserDefaults] removeObjectForKey:@"BITCrashAutomaticallySendReports"];
-      }
-      [[NSUserDefaults standardUserDefaults] setInteger:_crashManagerStatus forKey:kBITCrashManagerStatus];
-    }
-    
-    _crashesDir = bit_settingsDir();
-    _settingsFile = [_crashesDir stringByAppendingPathComponent:BITHOCKEY_CRASH_SETTINGS];
-    _analyzerInProgressFile = [_crashesDir stringByAppendingPathComponent:BITHOCKEY_CRASH_ANALYZER];
-    
-    
-    if (!BITHockeyBundle() && !bit_isRunningInAppExtension()) {
-      BITHockeyLogWarning(@"[HockeySDK] WARNING: %@ is missing, will send reports automatically!", BITHOCKEYSDK_BUNDLE);
-    }
-  }
-  return self;
-}
-
-
-- (void) dealloc {
-  [self unregisterObservers];
-}
-
-
-- (void)setCrashManagerStatus:(BITCrashManagerStatus)crashManagerStatus {
-  _crashManagerStatus = crashManagerStatus;
-  
-  [[NSUserDefaults standardUserDefaults] setInteger:crashManagerStatus forKey:kBITCrashManagerStatus];
-}
-
-- (void)setServerURL:(NSString *)serverURL {
-  if ([serverURL isEqualToString:super.serverURL]) { return; }
-  
-  super.serverURL = serverURL;
-  self.hockeyAppClient = [[BITHockeyAppClient alloc] initWithBaseURL:[NSURL URLWithString:serverURL]];
-}
-
-#pragma mark - Private
-
-/**
- * Save all settings
- *
- * This saves the list of approved crash reports
- */
-- (void)saveSettings {
-  NSError *error = nil;
-  
-  NSMutableDictionary *rootObj = [NSMutableDictionary dictionaryWithCapacity:2];
-  if (self.approvedCrashReports && [self.approvedCrashReports count] > 0) {
-    [rootObj setObject:self.approvedCrashReports forKey:kBITCrashApprovedReports];
-  }
-  
-  NSData *plist = [NSPropertyListSerialization dataWithPropertyList:(id)rootObj format:NSPropertyListBinaryFormat_v1_0 options:0 error:&error];
-  
-  if (plist) {
-    [plist writeToFile:self.settingsFile atomically:YES];
-  } else {
-    BITHockeyLogError(@"ERROR: Writing settings. %@", [error description]);
-  }
-}
-
-/**
- * Load all settings
- *
- * This contains the list of approved crash reports
- */
-- (void)loadSettings {
-  NSError *error = nil;
-  NSPropertyListFormat format;
-  
-  if (![self.fileManager fileExistsAtPath:self.settingsFile])
-    return;
-  
-  NSData *plist = [NSData dataWithContentsOfFile:self.settingsFile];
-  if (plist) {
-    NSDictionary *rootObj = (NSDictionary *)[NSPropertyListSerialization
-                                             propertyListWithData:plist
-                                             options:NSPropertyListMutableContainersAndLeaves
-                                             format:&format
-                                             error:&error];
-    
-    if ([rootObj objectForKey:kBITCrashApprovedReports])
-      [self.approvedCrashReports setDictionary:(NSDictionary *)[rootObj objectForKey:kBITCrashApprovedReports]];
-  } else {
-    BITHockeyLogError(@"ERROR: Reading crash manager settings.");
-  }
-}
-
-
-/**
- * Remove a cached crash report
- *
- *  @param filename The base filename of the crash report
- */
-- (void)cleanCrashReportWithFilename:(NSString *)filename {
-  if (!filename) return;
-  
-  NSError *error = NULL;
-  
-  [self.fileManager removeItemAtPath:filename error:&error];
-  [self.fileManager removeItemAtPath:[filename stringByAppendingString:@".data"] error:&error];
-  [self.fileManager removeItemAtPath:[filename stringByAppendingString:@".meta"] error:&error];
-  [self.fileManager removeItemAtPath:[filename stringByAppendingString:@".desc"] error:&error];
-  
-  NSString *cacheFilename = [filename lastPathComponent];
-  [self removeKeyFromKeychain:[NSString stringWithFormat:@"%@.%@", cacheFilename, kBITCrashMetaUserName]];
-  [self removeKeyFromKeychain:[NSString stringWithFormat:@"%@.%@", cacheFilename, kBITCrashMetaUserEmail]];
-  [self removeKeyFromKeychain:[NSString stringWithFormat:@"%@.%@", cacheFilename, kBITCrashMetaUserID]];
-  
-  [self.crashFiles removeObject:filename];
-  [self.approvedCrashReports removeObjectForKey:filename];
-  
-  [self saveSettings];
-}
-
-/**
- *	 Remove all crash reports and stored meta data for each from the file system and keychain
- *
- * This is currently only used as a helper method for tests
- */
-- (void)cleanCrashReports {
-  for (NSUInteger i=0; i < [self.crashFiles count]; i++) {
-    [self cleanCrashReportWithFilename:[self.crashFiles objectAtIndex:i]];
-  }
-}
-
-- (BOOL)persistAttachment:(BITHockeyAttachment *)attachment withFilename:(NSString *)filename {
-  NSString *attachmentFilename = [filename stringByAppendingString:@".data"];
-  NSMutableData *data = [[NSMutableData alloc] init];
-  NSKeyedArchiver *archiver = [[NSKeyedArchiver alloc] initForWritingWithMutableData:data];
-  
-  [archiver encodeObject:attachment forKey:kBITCrashMetaAttachment];
-  
-  [archiver finishEncoding];
-  
-  return [data writeToFile:attachmentFilename atomically:YES];
-}
-
-- (void)persistUserProvidedMetaData:(BITCrashMetaData *)userProvidedMetaData {
-  if (!userProvidedMetaData) return;
-  
-  if (userProvidedMetaData.userProvidedDescription && [userProvidedMetaData.userProvidedDescription length] > 0) {
-    NSError *error;
-    [userProvidedMetaData.userProvidedDescription writeToFile:[NSString stringWithFormat:@"%@.desc", [self.crashesDir stringByAppendingPathComponent: self.lastCrashFilename]] atomically:YES encoding:NSUTF8StringEncoding error:&error];
-  }
-  
-  if (userProvidedMetaData.userName && [userProvidedMetaData.userName length] > 0) {
-    [self addStringValueToKeychain:userProvidedMetaData.userName forKey:[NSString stringWithFormat:@"%@.%@", self.lastCrashFilename, kBITCrashMetaUserName]];
-    
-  }
-  
-  if (userProvidedMetaData.userEmail && [userProvidedMetaData.userEmail length] > 0) {
-    [self addStringValueToKeychain:userProvidedMetaData.userEmail forKey:[NSString stringWithFormat:@"%@.%@", self.lastCrashFilename, kBITCrashMetaUserEmail]];
-  }
-  
-  if (userProvidedMetaData.userID && [userProvidedMetaData.userID length] > 0) {
-    [self addStringValueToKeychain:userProvidedMetaData.userID forKey:[NSString stringWithFormat:@"%@.%@", self.lastCrashFilename, kBITCrashMetaUserID]];
-    
-  }
-}
-
-/**
- *  Read the attachment data from the stored file
- *
- *  @param filename The crash report file path
- *
- *  @return an BITHockeyAttachment instance or nil
- */
-- (BITHockeyAttachment *)attachmentForCrashReport:(NSString *)filename {
-  NSString *attachmentFilename = [filename stringByAppendingString:@".data"];
-  
-  if (![self.fileManager fileExistsAtPath:attachmentFilename])
-    return nil;
-  
-  
-  NSData *codedData = [[NSData alloc] initWithContentsOfFile:attachmentFilename];
-  if (!codedData)
-    return nil;
-  
-  NSKeyedUnarchiver *unarchiver = nil;
-  
-  @try {
-    unarchiver = [[NSKeyedUnarchiver alloc] initForReadingWithData:codedData];
-  }
-  @catch (NSException __unused *exception) {
-    return nil;
-  }
-  
-  if ([unarchiver containsValueForKey:kBITCrashMetaAttachment]) {
-    BITHockeyAttachment *attachment = [unarchiver decodeObjectForKey:kBITCrashMetaAttachment];
-    return attachment;
-  }
-  
-  return nil;
-}
-
-/**
- *	 Extract all app specific UUIDs from the crash reports
- *
- * This allows us to send the UUIDs in the XML construct to the server, so the server does not need to parse the crash report for this data.
- * The app specific UUIDs help to identify which dSYMs are needed to symbolicate this crash report.
- *
- *	@param	report The crash report from PLCrashReporter
- *
- *	@return XML structure with the app specific UUIDs
- */
-- (NSString *) extractAppUUIDs:(BITPLCrashReport *)report {
-  NSMutableString *uuidString = [NSMutableString string];
-  NSArray *uuidArray = [BITCrashReportTextFormatter arrayOfAppUUIDsForCrashReport:report];
-  
-  for (NSDictionary *element in uuidArray) {
-    if ([element objectForKey:kBITBinaryImageKeyType] && [element objectForKey:kBITBinaryImageKeyArch] && [element objectForKey:kBITBinaryImageKeyUUID]) {
-      [uuidString appendFormat:@"<uuid type=\"%@\" arch=\"%@\">%@</uuid>",
-       [element objectForKey:kBITBinaryImageKeyType],
-       [element objectForKey:kBITBinaryImageKeyArch],
-       [element objectForKey:kBITBinaryImageKeyUUID]
-       ];
-    }
-  }
-  
-  return uuidString;
-}
-
-- (void) registerObservers {
-  __weak typeof(self) weakSelf = self;
-  
-  if(nil == self.appDidBecomeActiveObserver) {
-    NSNotificationName name = UIApplicationDidBecomeActiveNotification;
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wpartial-availability"
-    if (bit_isRunningInAppExtension() && &NSExtensionHostDidBecomeActiveNotification != NULL) {
-      name = NSExtensionHostDidBecomeActiveNotification;
-    }
-#pragma clang diagnostic pop
-    self.appDidBecomeActiveObserver = [[NSNotificationCenter defaultCenter] addObserverForName:name
-                                                                                        object:nil
-                                                                                         queue:NSOperationQueue.mainQueue
-                                                                                    usingBlock:^(NSNotification __unused *note) {
-                                                                                      typeof(self) strongSelf = weakSelf;
-                                                                                      [strongSelf triggerDelayedProcessing];
-                                                                                    }];
-  }
-  
-  if(nil == self.networkDidBecomeReachableObserver) {
-    self.networkDidBecomeReachableObserver = [[NSNotificationCenter defaultCenter] addObserverForName:BITHockeyNetworkDidBecomeReachableNotification
-                                                                                               object:nil
-                                                                                                queue:NSOperationQueue.mainQueue
-                                                                                           usingBlock:^(NSNotification __unused *note) {
-                                                                                             typeof(self) strongSelf = weakSelf;
-                                                                                             [strongSelf triggerDelayedProcessing];
-                                                                                           }];
-  }
-  
-  if (nil ==  self.appWillTerminateObserver) {
-    self.appWillTerminateObserver = [[NSNotificationCenter defaultCenter] addObserverForName:UIApplicationWillTerminateNotification
-                                                                                      object:nil
-                                                                                       queue:NSOperationQueue.mainQueue
-                                                                                  usingBlock:^(NSNotification __unused *note) {
-                                                                                    typeof(self) strongSelf = weakSelf;
-                                                                                    [strongSelf leavingAppSafely];
-                                                                                  }];
-  }
-  
-  if (nil ==  self.appDidEnterBackgroundObserver) {
-    NSNotificationName name = UIApplicationDidEnterBackgroundNotification;
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wpartial-availability"
-    if (bit_isRunningInAppExtension() && &NSExtensionHostDidEnterBackgroundNotification != NULL) {
-      name = NSExtensionHostDidEnterBackgroundNotification;
-    }
-#pragma clang diagnostic pop
-    self.appDidEnterBackgroundObserver = [[NSNotificationCenter defaultCenter] addObserverForName:name
-                                                                                           object:nil
-                                                                                            queue:NSOperationQueue.mainQueue
-                                                                                       usingBlock:^(NSNotification __unused *note) {
-                                                                                         typeof(self) strongSelf = weakSelf;
-                                                                                         [strongSelf leavingAppSafely];
-                                                                                       }];
-  }
-  
-  if (nil == self.appWillEnterForegroundObserver) {
-    NSNotificationName name = UIApplicationWillEnterForegroundNotification;
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wpartial-availability"
-    if (bit_isRunningInAppExtension() && &NSExtensionHostWillEnterForegroundNotification != NULL) {
-      name = NSExtensionHostWillEnterForegroundNotification;
-    }
-#pragma clang diagnostic pop
-    self.appWillEnterForegroundObserver = [[NSNotificationCenter defaultCenter] addObserverForName:name
-                                                                                            object:nil
-                                                                                             queue:NSOperationQueue.mainQueue
-                                                                                        usingBlock:^(NSNotification __unused *note) {
-                                                                                          typeof(self) strongSelf = weakSelf;
-                                                                                          [strongSelf appEnteredForeground];
-                                                                                        }];
-  }
-  
-  if (nil == self.appDidReceiveLowMemoryWarningObserver) {
-    if (bit_isRunningInAppExtension()) {
-      static dispatch_once_t onceToken;
-      dispatch_once(&onceToken, ^{
-        dispatch_source_t source = dispatch_source_create(DISPATCH_SOURCE_TYPE_MEMORYPRESSURE, 0, DISPATCH_MEMORYPRESSURE_WARN|DISPATCH_MEMORYPRESSURE_CRITICAL, dispatch_get_main_queue());
-        dispatch_source_set_event_handler(source, ^{
-          if (!self.didLogLowMemoryWarning) {
-            [[NSUserDefaults standardUserDefaults] setBool:YES forKey:kBITAppDidReceiveLowMemoryNotification];
-            self.didLogLowMemoryWarning = YES;
-          }
-        });
-        dispatch_resume(source);
-      });
-    } else {
-      self.appDidReceiveLowMemoryWarningObserver = [[NSNotificationCenter defaultCenter] addObserverForName:UIApplicationDidReceiveMemoryWarningNotification
-                                                                                                     object:nil
-                                                                                                      queue:NSOperationQueue.mainQueue
-                                                                                                 usingBlock:^(NSNotification __unused *note) {
-                                                                                                   // we only need to log this once
-                                                                                                   if (!self.didLogLowMemoryWarning) {
-                                                                                                     [[NSUserDefaults standardUserDefaults] setBool:YES forKey:kBITAppDidReceiveLowMemoryNotification];
-                                                                                                     self.didLogLowMemoryWarning = YES;
-
-                                                                                                   }
-                                                                                                 }];
-    }
-  }
-}
-
-- (void) unregisterObservers {
-  [self unregisterObserver:self.appDidBecomeActiveObserver];
-  [self unregisterObserver:self.appWillTerminateObserver];
-  [self unregisterObserver:self.appDidEnterBackgroundObserver];
-  [self unregisterObserver:self.appWillEnterForegroundObserver];
-  [self unregisterObserver:self.appDidReceiveLowMemoryWarningObserver];
-  
-  [self unregisterObserver:self.networkDidBecomeReachableObserver];
-}
-
-- (void) unregisterObserver:(id)observer {
-  if (observer) {
-    [[NSNotificationCenter defaultCenter] removeObserver:observer];
-    observer = nil;
-  }
-}
-
-- (void)leavingAppSafely {
-  if (self.isAppNotTerminatingCleanlyDetectionEnabled) {
-    [[NSUserDefaults standardUserDefaults] setBool:YES forKey:kBITAppWentIntoBackgroundSafely];
-  }
-}
-
-- (void)appEnteredForeground {
-  // we disable kill detection while the debugger is running, since we'd get only false positives if the app is terminated by the user using the debugger
-  if (self.isDebuggerAttached) {
-    [[NSUserDefaults standardUserDefaults] setBool:YES forKey:kBITAppWentIntoBackgroundSafely];
-  } else if (self.isAppNotTerminatingCleanlyDetectionEnabled) {
-    [[NSUserDefaults standardUserDefaults] setBool:NO forKey:kBITAppWentIntoBackgroundSafely];
-    
-    static dispatch_once_t predAppData;
-    
-    dispatch_once(&predAppData, ^{
-      id marketingVersion = [[NSBundle mainBundle] objectForInfoDictionaryKey:@"CFBundleShortVersionString"];
-      if (marketingVersion && [marketingVersion isKindOfClass:[NSString class]])
-        [[NSUserDefaults standardUserDefaults] setObject:marketingVersion forKey:kBITAppMarketingVersion];
-      
-      id bundleVersion = [[NSBundle mainBundle] objectForInfoDictionaryKey:@"CFBundleVersion"];
-      if (bundleVersion && [bundleVersion isKindOfClass:[NSString class]])
-        [[NSUserDefaults standardUserDefaults] setObject:bundleVersion forKey:kBITAppVersion];
-      
-      [[NSUserDefaults standardUserDefaults] setObject:[[UIDevice currentDevice] systemVersion] forKey:kBITAppOSVersion];
-      [[NSUserDefaults standardUserDefaults] setObject:[self osBuild] forKey:kBITAppOSBuild];
-      
-      NSString *uuidString =[NSString stringWithFormat:@"<uuid type=\"app\" arch=\"%@\">%@</uuid>",
-                             [self deviceArchitecture],
-                             [self executableUUID]
-                             ];
-      
-      [[NSUserDefaults standardUserDefaults] setObject:uuidString forKey:kBITAppUUIDs];
-    });
-  }
-}
-
-- (NSString *)deviceArchitecture {
-  NSString *archName = @"???";
-  
-  size_t size;
-  cpu_type_t type;
-  cpu_subtype_t subtype;
-  size = sizeof(type);
-  if (sysctlbyname("hw.cputype", &type, &size, NULL, 0))
-    return archName;
-  
-  size = sizeof(subtype);
-  if (sysctlbyname("hw.cpusubtype", &subtype, &size, NULL, 0))
-    return archName;
-  
-  archName = [BITCrashReportTextFormatter bit_archNameFromCPUType:type subType:subtype] ?: @"???";
-  
-  return archName;
-}
-
-- (NSString *)osBuild {
-  size_t size;
-  sysctlbyname("kern.osversion", NULL, &size, NULL, 0);
-  char *answer = (char*)malloc(size);
-  if (answer == NULL)
-    return nil;
-  sysctlbyname("kern.osversion", answer, &size, NULL, 0);
-  NSString *osBuild = [NSString stringWithCString:answer encoding: NSUTF8StringEncoding];
-  free(answer);
-  return osBuild;
-}
-
-/**
- *	 Get the userID from the delegate which should be stored with the crash report
- *
- *	@return The userID value
- */
-- (NSString *)userIDForCrashReport {
-  NSString *userID;
-#if HOCKEYSDK_FEATURE_AUTHENTICATOR
-  // if we have an identification from BITAuthenticator, use this as a default.
-  if ((
-       self.installationIdentificationType == BITAuthenticatorIdentificationTypeAnonymous ||
-       self.installationIdentificationType == BITAuthenticatorIdentificationTypeDevice
-       ) &&
-      self.installationIdentification) {
-    userID = self.installationIdentification;
-  }
-#endif
-  
-  // first check the global keychain storage
-  NSString *userIdFromKeychain = [self stringValueFromKeychainForKey:kBITHockeyMetaUserID];
-  if (userIdFromKeychain) {
-    userID = userIdFromKeychain;
-  }
-  id strongDelegate = [BITHockeyManager sharedHockeyManager].delegate;
-  if ([strongDelegate respondsToSelector:@selector(userIDForHockeyManager:componentManager:)]) {
-    userID = [strongDelegate userIDForHockeyManager:[BITHockeyManager sharedHockeyManager] componentManager:self];
-  }
-  return userID  ?: @"";
-}
-
-/**
- *	 Get the userName from the delegate which should be stored with the crash report
- *
- *	@return The userName value
- */
-- (NSString *)userNameForCrashReport {
-  // first check the global keychain storage
-  NSString *username = [self stringValueFromKeychainForKey:kBITHockeyMetaUserName] ?: @"";
-  id strongDelegate = [BITHockeyManager sharedHockeyManager].delegate;
-  if ([strongDelegate respondsToSelector:@selector(userNameForHockeyManager:componentManager:)]) {
-    username = [strongDelegate userNameForHockeyManager:[BITHockeyManager sharedHockeyManager] componentManager:self] ?: @"";
-  }
-  return username;
-}
-
-/**
- *	 Get the userEmail from the delegate which should be stored with the crash report
- *
- *	@return The userEmail value
- */
-- (NSString *)userEmailForCrashReport {
-  // first check the global keychain storage
-  NSString *useremail = [self stringValueFromKeychainForKey:kBITHockeyMetaUserEmail] ?: @"";
-  
-#if HOCKEYSDK_FEATURE_AUTHENTICATOR
-  // if we have an identification from BITAuthenticator, use this as a default.
-  if ((
-       self.installationIdentificationType == BITAuthenticatorIdentificationTypeHockeyAppEmail ||
-       self.installationIdentificationType == BITAuthenticatorIdentificationTypeHockeyAppUser ||
-       self.installationIdentificationType == BITAuthenticatorIdentificationTypeWebAuth
-       ) &&
-      self.installationIdentification) {
-    useremail = self.installationIdentification;
-  }
-#endif
-  id strongDelegate = [BITHockeyManager sharedHockeyManager].delegate;
-  if ([strongDelegate respondsToSelector:@selector(userEmailForHockeyManager:componentManager:)]) {
-    useremail = [strongDelegate userEmailForHockeyManager:[BITHockeyManager sharedHockeyManager] componentManager:self] ?: @"";
-  }
-  return useremail;
-}
-
-#pragma mark - CrashCallbacks
-
-/**
- *  Set the callback for PLCrashReporter
- *
- *  @param callbacks BITCrashManagerCallbacks instance
- */
-- (void)setCrashCallbacks:(BITCrashManagerCallbacks *)callbacks {
-  if (!callbacks) return;
-  if (self.isSetup) {
-    BITHockeyLogWarning(@"WARNING: CrashCallbacks need to be configured before calling startManager!");
-  }
-  
-  // set our proxy callback struct
-  bitCrashCallbacks.context = callbacks->context;
-  bitCrashCallbacks.handleSignal = callbacks->handleSignal;
-  
-  // set the PLCrashReporterCallbacks struct
-  plCrashCallbacks.context = callbacks->context;
-}
-
-#if HOCKEYSDK_FEATURE_METRICS
-- (void)configDefaultCrashCallback {
-  BITMetricsManager *metricsManager = [BITHockeyManager sharedHockeyManager].metricsManager;
-  BITPersistence *persistence = metricsManager.persistence;
-  BITSaveEventsFilePath = strdup([persistence fileURLForType:BITPersistenceTypeTelemetry].UTF8String);
-}
-#endif
-
-#pragma mark - Public
-
-- (void)setAlertViewHandler:(BITCustomAlertViewHandler)alertViewHandler{
-  _alertViewHandler = alertViewHandler;
-}
-
-
-- (BOOL)isDebuggerAttached {
-  return bit_isDebuggerAttached();
-}
-
-
-- (void)generateTestCrash {
-  if (self.appEnvironment != BITEnvironmentAppStore) {
-    
-    if ([self isDebuggerAttached]) {
-      BITHockeyLogWarning(@"[HockeySDK] WARNING: The debugger is attached. The following crash cannot be detected by the SDK!");
-    }
-    
-    __builtin_trap();
-  }
-}
-
-/**
- *  Write a meta file for a new crash report
- *
- *  @param filename the crash reports temp filename
- */
-- (void)storeMetaDataForCrashReportFilename:(NSString *)filename {
-  BITHockeyLogVerbose(@"VERBOSE: Storing meta data for crash report with filename %@", filename);
-  NSError *error = NULL;
-  NSMutableDictionary *metaDict = [NSMutableDictionary dictionaryWithCapacity:4];
-  NSString *applicationLog = @"";
-  
-  [self addStringValueToKeychain:[self userNameForCrashReport] forKey:[NSString stringWithFormat:@"%@.%@", filename, kBITCrashMetaUserName]];
-  [self addStringValueToKeychain:[self userEmailForCrashReport] forKey:[NSString stringWithFormat:@"%@.%@", filename, kBITCrashMetaUserEmail]];
-  [self addStringValueToKeychain:[self userIDForCrashReport] forKey:[NSString stringWithFormat:@"%@.%@", filename, kBITCrashMetaUserID]];
-  id strongDelegate = self.delegate;
-  if ([strongDelegate respondsToSelector:@selector(applicationLogForCrashManager:)]) {
-    applicationLog = [strongDelegate applicationLogForCrashManager:self] ?: @"";
-  }
-  [metaDict setObject:applicationLog forKey:kBITCrashMetaApplicationLog];
-  
-  if ([strongDelegate respondsToSelector:@selector(attachmentForCrashManager:)]) {
-    BITHockeyLogVerbose(@"VERBOSE: Processing attachment for crash report with filename %@", filename);
-    BITHockeyAttachment *attachment = [strongDelegate attachmentForCrashManager:self];
-    
-    if (attachment && attachment.hockeyAttachmentData) {
-      BOOL success = [self persistAttachment:attachment withFilename:[self.crashesDir stringByAppendingPathComponent: filename]];
-      if (!success) {
-        BITHockeyLogError(@"ERROR: Persisting the crash attachment failed");
-      } else {
-        BITHockeyLogVerbose(@"VERBOSE: Crash attachment successfully persisted.");
-      }
-    } else {
-      BITHockeyLogDebug(@"INFO: Crash attachment was nil");
-    }
-  }
-  
-  NSData *plist = [NSPropertyListSerialization dataWithPropertyList:(id)metaDict
-                                                             format:NSPropertyListBinaryFormat_v1_0
-                                                            options:0
-                                                              error:&error];
-  if (plist) {
-    BOOL success = [plist writeToFile:[self.crashesDir stringByAppendingPathComponent:(NSString *)[filename stringByAppendingPathExtension:@"meta"]] atomically:YES];
-    if (!success) {
-      BITHockeyLogError(@"ERROR: Writing crash meta data failed.");
-    }
-  } else {
-    BITHockeyLogError(@"ERROR: Writing crash meta data failed. %@", error);
-  }
-  BITHockeyLogVerbose(@"VERBOSE: Storing crash meta data finished.");
-}
-
-- (BOOL)handleUserInput:(BITCrashManagerUserInput)userInput withUserProvidedMetaData:(BITCrashMetaData *)userProvidedMetaData {
-  id strongDelegate = self.delegate;
-  switch (userInput) {
-    case BITCrashManagerUserInputDontSend:
-      if ([strongDelegate respondsToSelector:@selector(crashManagerWillCancelSendingCrashReport:)]) {
-        [strongDelegate crashManagerWillCancelSendingCrashReport:self];
-      }
-      
-      if (self.lastCrashFilename)
-        [self cleanCrashReportWithFilename:[self.crashesDir stringByAppendingPathComponent: self.lastCrashFilename]];
-      
-      return YES;
-      
-    case BITCrashManagerUserInputSend:
-      if (userProvidedMetaData)
-        [self persistUserProvidedMetaData:userProvidedMetaData];
-      
-      [self approveLatestCrashReport];
-      [self sendNextCrashReport];
-      return YES;
-      
-    case BITCrashManagerUserInputAlwaysSend:
-      self.crashManagerStatus = BITCrashManagerStatusAutoSend;
-      [[NSUserDefaults standardUserDefaults] setInteger:self.crashManagerStatus forKey:kBITCrashManagerStatus];
-      
-      if ([strongDelegate respondsToSelector:@selector(crashManagerWillSendCrashReportsAlways:)]) {
-        [strongDelegate crashManagerWillSendCrashReportsAlways:self];
-      }
-      
-      if (userProvidedMetaData)
-        [self persistUserProvidedMetaData:userProvidedMetaData];
-      
-      [self approveLatestCrashReport];
-      [self sendNextCrashReport];
-      return YES;
-      
-    default:
-      return NO;
-  }
-  
-}
-
-#pragma mark - PLCrashReporter
-
-/**
- *	 Process new crash reports provided by PLCrashReporter
- *
- * Parse the new crash report and gather additional meta data from the app which will be stored along the crash report
- */
-- (void) handleCrashReport {
-  BITHockeyLogVerbose(@"VERBOSE: Handling crash report");
-  NSError *error = NULL;
-  
-  if (!self.plCrashReporter) return;
-  
-  // check if the next call ran successfully the last time
-  if (![self.fileManager fileExistsAtPath:self.analyzerInProgressFile]) {
-    // mark the start of the routine
-    [self.fileManager createFileAtPath:self.analyzerInProgressFile contents:nil attributes:nil];
-    BITHockeyLogVerbose(@"VERBOSE: AnalyzerInProgress file created");
-    
-    [self saveSettings];
-    
-    // Try loading the crash report
-    NSData *crashData = [[NSData alloc] initWithData:[self.plCrashReporter loadPendingCrashReportDataAndReturnError: &error]];
-    
-    NSString *cacheFilename = [NSString stringWithFormat: @"%.0f", [NSDate timeIntervalSinceReferenceDate]];
-    self.lastCrashFilename = cacheFilename;
-    
-    if (crashData == nil) {
-      BITHockeyLogError(@"ERROR: Could not load crash report: %@", error);
-    } else {
-      // get the startup timestamp from the crash report, and the file timestamp to calculate the timeinterval when the crash happened after startup
-      BITPLCrashReport *report = [[BITPLCrashReport alloc] initWithData:crashData error:&error];
-      
-      if (report == nil) {
-        BITHockeyLogWarning(@"WARNING: Could not parse crash report");
-      } else {
-        NSDate *appStartTime = nil;
-        NSDate *appCrashTime = nil;
-        if ([report.processInfo respondsToSelector:@selector(processStartTime)]) {
-          if (report.systemInfo.timestamp && report.processInfo.processStartTime) {
-            appStartTime = report.processInfo.processStartTime;
-            appCrashTime =report.systemInfo.timestamp;
-            self.timeIntervalCrashInLastSessionOccurred = [report.systemInfo.timestamp timeIntervalSinceDate:report.processInfo.processStartTime];
-          }
-        }
-        
-        [crashData writeToFile:[self.crashesDir stringByAppendingPathComponent: cacheFilename] atomically:YES];
-        
-        NSString *incidentIdentifier = @"???";
-        if (report.uuidRef != NULL) {
-          incidentIdentifier = (NSString *) CFBridgingRelease(CFUUIDCreateString(NULL, report.uuidRef));
-        }
-        
-        NSString *reporterKey = bit_appAnonID(NO) ?: @"";
-        
-        self.lastSessionCrashDetails = [[BITCrashDetails alloc] initWithIncidentIdentifier:incidentIdentifier
-                                                                               reporterKey:reporterKey
-                                                                                    signal:report.signalInfo.name
-                                                                             exceptionName:report.exceptionInfo.exceptionName
-                                                                           exceptionReason:report.exceptionInfo.exceptionReason
-                                                                              appStartTime:appStartTime
-                                                                                 crashTime:appCrashTime
-                                                                                 osVersion:report.systemInfo.operatingSystemVersion
-                                                                                   osBuild:report.systemInfo.operatingSystemBuild
-                                                                                appVersion:report.applicationInfo.applicationMarketingVersion
-                                                                                  appBuild:report.applicationInfo.applicationVersion
-                                                                      appProcessIdentifier:report.processInfo.processID
-                                        ];
-        
-        // fetch and store the meta data after setting _lastSessionCrashDetails, so the property can be used in the protocol methods
-        [self storeMetaDataForCrashReportFilename:cacheFilename];
-      }
-    }
-  } else {
-    BITHockeyLogWarning(@"WARNING: AnalyzerInProgress file found, handling crash report skipped");
-  }
-  
-  // Purge the report
-  // mark the end of the routine
-  if ([self.fileManager fileExistsAtPath:self.analyzerInProgressFile]) {
-    [self.fileManager removeItemAtPath:self.analyzerInProgressFile error:&error];
-  }
-  
-  [self saveSettings];
-  
-  [self.plCrashReporter purgePendingCrashReport];
-}
-
-/**
- Get the filename of the first not approved crash report
- 
- @return NSString Filename of the first found not approved crash report
- */
-- (NSString *)firstNotApprovedCrashReport {
-  if ((!self.approvedCrashReports || [self.approvedCrashReports count] == 0) && [self.crashFiles count] > 0) {
-    return [self.crashFiles objectAtIndex:0];
-  }
-  
-  for (NSUInteger i=0; i < [self.crashFiles count]; i++) {
-    NSString *filename = [self.crashFiles objectAtIndex:i];
-    
-    if (![self.approvedCrashReports objectForKey:filename]) return filename;
-  }
-  
-  return nil;
-}
-
-/**
- *	Check if there are any new crash reports that are not yet processed
- *
- *	@return	`YES` if there is at least one new crash report found, `NO` otherwise
- */
-- (BOOL)hasPendingCrashReport {
-  if (self.crashManagerStatus == BITCrashManagerStatusDisabled) return NO;
-  
-  if ([self.fileManager fileExistsAtPath:self.crashesDir]) {
-    NSError *error = NULL;
-    
-    NSArray *dirArray = [self.fileManager contentsOfDirectoryAtPath:self.crashesDir error:&error];
-    
-    for (NSString *file in dirArray) {
-      NSString *filePath = [self.crashesDir stringByAppendingPathComponent:file];
-      
-      NSDictionary *fileAttributes = [self.fileManager attributesOfItemAtPath:filePath error:&error];
-      if ([[fileAttributes objectForKey:NSFileType] isEqualToString:NSFileTypeRegular] &&
-          [[fileAttributes objectForKey:NSFileSize] intValue] > 0 &&
-          ![file hasSuffix:@".DS_Store"] &&
-          ![file hasSuffix:@".analyzer"] &&
-          ![file hasSuffix:@".plist"] &&
-          ![file hasSuffix:@".data"] &&
-          ![file hasSuffix:@".meta"] &&
-          ![file hasSuffix:@".desc"]) {
-        [self.crashFiles addObject:filePath];
-      }
-    }
-  }
-  
-  if ([self.crashFiles count] > 0) {
-    BITHockeyLogDebug(@"INFO: %lu pending crash reports found.", (unsigned long)[self.crashFiles count]);
-    return YES;
-  } else {
-    if (self.didCrashInLastSession) {
-      id strongDelegate = self.delegate;
-      if ([strongDelegate respondsToSelector:@selector(crashManagerWillCancelSendingCrashReport:)]) {
-        [strongDelegate crashManagerWillCancelSendingCrashReport:self];
-      }
-      
-      self.didCrashInLastSession = NO;
-    }
-    
-    return NO;
-  }
-}
-
-
-#pragma mark - Crash Report Processing
-
-// store the latest crash report as user approved, so if it fails it will retry automatically
-- (void)approveLatestCrashReport {
-  [self.approvedCrashReports setObject:[NSNumber numberWithBool:YES] forKey:[self.crashesDir stringByAppendingPathComponent: self.lastCrashFilename]];
-  [self saveSettings];
-}
-
-- (void)triggerDelayedProcessing {
-  BITHockeyLogVerbose(@"VERBOSE: Triggering delayed crash processing.");
-  [NSObject cancelPreviousPerformRequestsWithTarget:self selector:@selector(invokeDelayedProcessing) object:nil];
-  [self performSelector:@selector(invokeDelayedProcessing) withObject:nil afterDelay:0.5];
-}
-
-/**
- * Delayed startup processing for everything that does not to be done in the app startup runloop
- *
- * - Checks if there is another exception handler installed that may block ours
- * - Present UI if the user has to approve new crash reports
- * - Send pending approved crash reports
- */
-- (void)invokeDelayedProcessing {
-#if !defined (HOCKEYSDK_CONFIGURATION_ReleaseCrashOnlyExtensions)
-  if (!bit_isRunningInAppExtension() && [BITHockeyHelper applicationState] != BITApplicationStateActive) {
-    return;
-  }
-#endif
-  
-  BITHockeyLogDebug(@"INFO: Start delayed CrashManager processing");
-  
-  // was our own exception handler successfully added?
-  if (self.exceptionHandler) {
-    // get the current top level error handler
-    NSUncaughtExceptionHandler *currentHandler = NSGetUncaughtExceptionHandler();
-    
-    // If the top level error handler differs from our own, then at least another one was added.
-    // This could cause exception crashes not to be reported to HockeyApp. See log message for details.
-    if (self.exceptionHandler != currentHandler) {
-      BITHockeyLogWarning(@"[HockeySDK] WARNING: Another exception handler was added. If this invokes any kind of exit() after processing the exception, which causes any subsequent error handler not to be invoked, these crashes will NOT be reported to HockeyApp!");
-    }
-  }
-  
-  if (!self.sendingInProgress && [self hasPendingCrashReport]) {
-    self.sendingInProgress = YES;
-    
-    NSString *notApprovedReportFilename = [self firstNotApprovedCrashReport];
-    
-    // this can happen in case there is a non approved crash report but it didn't happen in the previous app session
-    if (notApprovedReportFilename && !self.lastCrashFilename) {
-      self.lastCrashFilename = [notApprovedReportFilename lastPathComponent];
-    }
-    
-    if (!BITHockeyBundle() || bit_isRunningInAppExtension()) {
-      [self approveLatestCrashReport];
-      [self sendNextCrashReport];
-      
-#if !defined (HOCKEYSDK_CONFIGURATION_ReleaseCrashOnlyExtensions)
-      
-    } else if (self.crashManagerStatus != BITCrashManagerStatusAutoSend && notApprovedReportFilename) {
-      id strongDelegate = self.delegate;
-      if ([strongDelegate respondsToSelector:@selector(crashManagerWillShowSubmitCrashReportAlert:)]) {
-        [strongDelegate crashManagerWillShowSubmitCrashReportAlert:self];
-      }
-      
-      NSString *appName = bit_appName(BITHockeyLocalizedString(@"HockeyAppNamePlaceholder"));
-      NSString *alertDescription = [NSString stringWithFormat:BITHockeyLocalizedString(@"CrashDataFoundAnonymousDescription"), appName];
-      
-      // the crash report is not anonymous any more if username or useremail are not nil
-      NSString *userid = [self userIDForCrashReport];
-      NSString *username = [self userNameForCrashReport];
-      NSString *useremail = [self userEmailForCrashReport];
-      
-      if ((userid && [userid length] > 0) ||
-          (username && [username length] > 0) ||
-          (useremail && [useremail length] > 0)) {
-        alertDescription = [NSString stringWithFormat:BITHockeyLocalizedString(@"CrashDataFoundDescription"), appName];
-      }
-      
-      if (self.alertViewHandler) {
-        self.alertViewHandler();
-      } else {
-        __weak typeof(self) weakSelf = self;
-        UIAlertController *alertController = [UIAlertController alertControllerWithTitle:[NSString stringWithFormat:BITHockeyLocalizedString(@"CrashDataFoundTitle"), appName]
-                                                                                 message:alertDescription
-                                                                          preferredStyle:UIAlertControllerStyleAlert];
-        UIAlertAction *cancelAction = [BITAlertAction actionWithTitle:BITHockeyLocalizedString(@"CrashDontSendReport")
-                                                               style:UIAlertActionStyleCancel
-                                                             handler:^(UIAlertAction __unused *action) {
-                                                               typeof(self) strongSelf = weakSelf;
-                                                               [strongSelf handleUserInput:BITCrashManagerUserInputDontSend withUserProvidedMetaData:nil];
-                                                             }];
-        [alertController addAction:cancelAction];
-        UIAlertAction *sendAction = [BITAlertAction actionWithTitle:BITHockeyLocalizedString(@"CrashSendReport")
-                                                             style:UIAlertActionStyleDefault
-                                                           handler:^(UIAlertAction __unused *action) {
-                                                             typeof(self) strongSelf = weakSelf;
-                                                             [strongSelf handleUserInput:BITCrashManagerUserInputSend withUserProvidedMetaData:nil];
-                                                           }];
-        [alertController addAction:sendAction];
-        if (self.shouldShowAlwaysButton) {
-          UIAlertAction *alwaysSendAction = [BITAlertAction actionWithTitle:BITHockeyLocalizedString(@"CrashSendReportAlways")
-                                                                     style:UIAlertActionStyleDefault
-                                                                   handler:^(UIAlertAction __unused *action) {
-                                                                     typeof(self) strongSelf = weakSelf;
-                                                                     [strongSelf handleUserInput:BITCrashManagerUserInputAlwaysSend withUserProvidedMetaData:nil];
-                                                                   }];
-          
-          [alertController addAction:alwaysSendAction];
-        }
-        
-        [self showAlertController:alertController];
-      }
-#endif /* !defined (HOCKEYSDK_CONFIGURATION_ReleaseCrashOnlyExtensions) */
-      
-    } else {
-      [self approveLatestCrashReport];
-      [self sendNextCrashReport];
-    }
-  }
-}
-
-/**
- *	 Main startup sequence initializing PLCrashReporter if it wasn't disabled
- */
-- (void)startManager {
-  if (self.crashManagerStatus == BITCrashManagerStatusDisabled) return;
-  
-  [self registerObservers];
-  
-  [self loadSettings];
-  
-  if (!self.isSetup) {
-    static dispatch_once_t plcrPredicate;
-    dispatch_once(&plcrPredicate, ^{
-      /* Configure our reporter */
-      
-      PLCrashReporterSignalHandlerType signalHandlerType = PLCrashReporterSignalHandlerTypeBSD;
-      if (self.isMachExceptionHandlerEnabled) {
-        signalHandlerType = PLCrashReporterSignalHandlerTypeMach;
-      }
-      
-      PLCrashReporterSymbolicationStrategy symbolicationStrategy = PLCrashReporterSymbolicationStrategyNone;
-      if (self.isOnDeviceSymbolicationEnabled) {
-        symbolicationStrategy = PLCrashReporterSymbolicationStrategyAll;
-      }
-      
-      BITPLCrashReporterConfig *config = [[BITPLCrashReporterConfig alloc] initWithSignalHandlerType: signalHandlerType
-                                                                               symbolicationStrategy: symbolicationStrategy];
-      self.plCrashReporter = [[BITPLCrashReporter alloc] initWithConfiguration: config];
-      
-      // Check if we previously crashed
-      if ([self.plCrashReporter hasPendingCrashReport]) {
-        self.didCrashInLastSession = YES;
-        [self handleCrashReport];
-      }
-      
-      // The actual signal and mach handlers are only registered when invoking `enableCrashReporterAndReturnError`
-      // So it is safe enough to only disable the following part when a debugger is attached no matter which
-      // signal handler type is set
-      // We only check for this if we are not in the App Store environment
-      
-      BOOL debuggerIsAttached = NO;
-      if (self.appEnvironment != BITEnvironmentAppStore) {
-        if ([self isDebuggerAttached]) {
-          debuggerIsAttached = YES;
-          BITHockeyLogWarning(@"[HockeySDK] WARNING: Detecting crashes is NOT enabled due to running the app with a debugger attached.");
-        }
-      }
-      
-      if (!debuggerIsAttached) {
-        // Multiple exception handlers can be set, but we can only query the top level error handler (uncaught exception handler).
-        //
-        // To check if PLCrashReporter's error handler is successfully added, we compare the top
-        // level one that is set before and the one after PLCrashReporter sets up its own.
-        //
-        // With delayed processing we can then check if another error handler was set up afterwards
-        // and can show a debug warning log message, that the dev has to make sure the "newer" error handler
-        // doesn't exit the process itself, because then all subsequent handlers would never be invoked.
-        //
-        // Note: ANY error handler setup BEFORE HockeySDK initialization will not be processed!
-        
-        // get the current top level error handler
-        NSUncaughtExceptionHandler *initialHandler = NSGetUncaughtExceptionHandler();
-        
-        // PLCrashReporter may only be initialized once. So make sure the developer
-        // can't break this
-        NSError *error = NULL;
-        
-#if HOCKEYSDK_FEATURE_METRICS
-        [self configDefaultCrashCallback];
-#endif
-        // Set plCrashReporter callback which contains our default callback and potentially user defined callbacks
-        [self.plCrashReporter setCrashCallbacks:&plCrashCallbacks];
-        
-        // Enable the Crash Reporter
-        if (![self.plCrashReporter enableCrashReporterAndReturnError: &error])
-          BITHockeyLogError(@"[HockeySDK] ERROR: Could not enable crash reporter: %@", [error localizedDescription]);
-        
-        // get the new current top level error handler, which should now be the one from PLCrashReporter
-        NSUncaughtExceptionHandler *currentHandler = NSGetUncaughtExceptionHandler();
-        
-        // do we have a new top level error handler? then we were successful
-        if (currentHandler && currentHandler != initialHandler) {
-          self.exceptionHandler = currentHandler;
-          
-          BITHockeyLogDebug(@"INFO: Exception handler successfully initialized.");
-        } else {
-          
-          // If we're running in a Xamarin Environment, the exception handler will be the one by the xamarin runtime, not ours.
-          // In other cases, this should never happen, theoretically only if NSSetUncaugtExceptionHandler() has some internal issues
-          BITHockeyLogError(@"[HockeySDK] ERROR: Exception handler could not be set. Make sure there is no other exception handler set up!");
-          BITHockeyLogError(@"[HockeySDK] ERROR: If you are using the HockeySDK-Xamarin, this is expected behavior and you can ignore this message");
-        }
-        
-        // Add the C++ uncaught exception handler, which is currently not handled by PLCrashReporter internally
-        [BITCrashUncaughtCXXExceptionHandlerManager addCXXExceptionHandler:uncaught_cxx_exception_handler];
-      }
-      self.isSetup = YES;
-    });
-  }
-  
-  if ([[NSUserDefaults standardUserDefaults] valueForKey:kBITAppDidReceiveLowMemoryNotification])
-    self.didReceiveMemoryWarningInLastSession = [[NSUserDefaults standardUserDefaults] boolForKey:kBITAppDidReceiveLowMemoryNotification];
-  
-  if (!self.didCrashInLastSession && self.isAppNotTerminatingCleanlyDetectionEnabled) {
-    BOOL didAppSwitchToBackgroundSafely = YES;
-    
-    if ([[NSUserDefaults standardUserDefaults] valueForKey:kBITAppWentIntoBackgroundSafely])
-      didAppSwitchToBackgroundSafely = [[NSUserDefaults standardUserDefaults] boolForKey:kBITAppWentIntoBackgroundSafely];
-    
-    if (!didAppSwitchToBackgroundSafely) {
-      BOOL considerReport = YES;
-      id strongDelegate = self.delegate;
-      if ([strongDelegate respondsToSelector:@selector(considerAppNotTerminatedCleanlyReportForCrashManager:)]) {
-        considerReport = [strongDelegate considerAppNotTerminatedCleanlyReportForCrashManager:self];
-      }
-      
-      if (considerReport) {
-        BITHockeyLogVerbose(@"INFO: App kill detected, creating crash report.");
-        [self createCrashReportForAppKill];
-        
-        self.didCrashInLastSession = YES;
-      }
-    }
-  }
-  
-#if !defined (HOCKEYSDK_CONFIGURATION_ReleaseCrashOnlyExtensions)
-  if ([BITHockeyHelper applicationState] != BITApplicationStateActive) {
-    [self appEnteredForeground];
-  }
-#else
-  [self appEnteredForeground];
-#endif
-  
-  [[NSUserDefaults standardUserDefaults] setBool:NO forKey:kBITAppDidReceiveLowMemoryNotification];
-  
-  [self triggerDelayedProcessing];
-  BITHockeyLogVerbose(@"VERBOSE: CrashManager startManager has finished.");
-}
-
-/**
- *  Creates a fake crash report because the app was killed while being in foreground
- */
-- (void)createCrashReportForAppKill {
-  NSString *fakeReportUUID = bit_UUID();
-  NSString *fakeReporterKey = bit_appAnonID(NO) ?: @"???";
-  
-  NSString *fakeReportAppMarketingVersion = [[NSUserDefaults standardUserDefaults] objectForKey:kBITAppMarketingVersion];
-  
-  NSString *fakeReportAppVersion = [[NSUserDefaults standardUserDefaults] objectForKey:kBITAppVersion];
-  if (!fakeReportAppVersion)
-    return;
-  
-  NSString *fakeReportOSVersion = [[NSUserDefaults standardUserDefaults] objectForKey:kBITAppOSVersion] ?: [[UIDevice currentDevice] systemVersion];
-  
-  NSString *fakeReportOSVersionString = fakeReportOSVersion;
-  NSString *fakeReportOSBuild = [[NSUserDefaults standardUserDefaults] objectForKey:kBITAppOSBuild] ?: [self osBuild];
-  if (fakeReportOSBuild) {
-    fakeReportOSVersionString = [NSString stringWithFormat:@"%@ (%@)", fakeReportOSVersion, fakeReportOSBuild];
-  }
-  
-  NSString *fakeReportAppBundleIdentifier = [[NSBundle mainBundle] objectForInfoDictionaryKey:@"CFBundleIdentifier"];
-  NSString *fakeReportDeviceModel = [self getDevicePlatform] ?: @"Unknown";
-  NSString *fakeReportAppUUIDs = [[NSUserDefaults standardUserDefaults] objectForKey:kBITAppUUIDs] ?: @"";
-  
-  NSString *fakeSignalName = kBITCrashKillSignal;
-  
-  NSMutableString *fakeReportString = [NSMutableString string];
-  
-  [fakeReportString appendFormat:@"Incident Identifier: %@\n", fakeReportUUID];
-  [fakeReportString appendFormat:@"CrashReporter Key:   %@\n", fakeReporterKey];
-  [fakeReportString appendFormat:@"Hardware Model:      %@\n", fakeReportDeviceModel];
-  [fakeReportString appendFormat:@"Identifier:      %@\n", fakeReportAppBundleIdentifier];
-  
-  NSString *fakeReportAppVersionString = fakeReportAppMarketingVersion ? [NSString stringWithFormat:@"%@ (%@)", fakeReportAppMarketingVersion, fakeReportAppVersion] : fakeReportAppVersion;
-  
-  [fakeReportString appendFormat:@"Version:         %@\n", fakeReportAppVersionString];
-  [fakeReportString appendString:@"Code Type:       ARM\n"];
-  [fakeReportString appendString:@"\n"];
-  
-  NSLocale *enUSPOSIXLocale = [[NSLocale alloc] initWithLocaleIdentifier:@"en_US_POSIX"];
-  NSDateFormatter *rfc3339Formatter = [[NSDateFormatter alloc] init];
-  [rfc3339Formatter setLocale:enUSPOSIXLocale];
-  [rfc3339Formatter setDateFormat:@"yyyy'-'MM'-'dd'T'HH':'mm':'ss'Z'"];
-  [rfc3339Formatter setTimeZone:[NSTimeZone timeZoneForSecondsFromGMT:0]];
-  NSString *fakeCrashTimestamp = [rfc3339Formatter stringFromDate:[NSDate date]];
-  
-  // we use the current date, since we don't know when the kill actually happened
-  [fakeReportString appendFormat:@"Date/Time:       %@\n", fakeCrashTimestamp];
-  [fakeReportString appendFormat:@"OS Version:      %@\n", fakeReportOSVersionString];
-  [fakeReportString appendString:@"Report Version:  104\n"];
-  [fakeReportString appendString:@"\n"];
-  [fakeReportString appendFormat:@"Exception Type:  %@\n", fakeSignalName];
-  [fakeReportString appendString:@"Exception Codes: 00000020 at 0x8badf00d\n"];
-  [fakeReportString appendString:@"\n"];
-  [fakeReportString appendString:@"Application Specific Information:\n"];
-  [fakeReportString appendString:@"The application did not terminate cleanly but no crash occured."];
-  if (self.didReceiveMemoryWarningInLastSession) {
-    [fakeReportString appendString:@" The app received at least one Low Memory Warning."];
-  }
-  [fakeReportString appendString:@"\n\n"];
-  
-  NSString *fakeReportFilename = [NSString stringWithFormat: @"%.0f", [NSDate timeIntervalSinceReferenceDate]];
-  
-  NSError *error = nil;
-  
-  NSMutableDictionary *rootObj = [NSMutableDictionary dictionaryWithCapacity:2];
-  [rootObj setObject:fakeReportUUID forKey:kBITFakeCrashUUID];
-  if (fakeReportAppMarketingVersion)
-    [rootObj setObject:fakeReportAppMarketingVersion forKey:kBITFakeCrashAppMarketingVersion];
-  [rootObj setObject:fakeReportAppVersion forKey:kBITFakeCrashAppVersion];
-  [rootObj setObject:fakeReportAppBundleIdentifier forKey:kBITFakeCrashAppBundleIdentifier];
-  [rootObj setObject:fakeReportOSVersion forKey:kBITFakeCrashOSVersion];
-  [rootObj setObject:fakeReportDeviceModel forKey:kBITFakeCrashDeviceModel];
-  [rootObj setObject:fakeReportAppUUIDs forKey:kBITFakeCrashAppBinaryUUID];
-  [rootObj setObject:fakeReportString forKey:kBITFakeCrashReport];
-  
-  self.lastSessionCrashDetails = [[BITCrashDetails alloc] initWithIncidentIdentifier:fakeReportUUID
-                                                                         reporterKey:fakeReporterKey
-                                                                              signal:fakeSignalName
-                                                                       exceptionName:nil
-                                                                     exceptionReason:nil
-                                                                        appStartTime:nil
-                                                                           crashTime:nil
-                                                                           osVersion:fakeReportOSVersion
-                                                                             osBuild:fakeReportOSBuild
-                                                                          appVersion:fakeReportAppMarketingVersion
-                                                                            appBuild:fakeReportAppVersion
-                                                                appProcessIdentifier:[[NSProcessInfo processInfo] processIdentifier]
-                                  ];
-  
-  NSData *plist = [NSPropertyListSerialization dataWithPropertyList:(id)rootObj
-                                                             format:NSPropertyListBinaryFormat_v1_0
-                                                            options:0
-                                                              error:&error];
-  if (plist) {
-    if ([plist writeToFile:[self.crashesDir stringByAppendingPathComponent:(NSString *)[fakeReportFilename stringByAppendingPathExtension:@"fake"]] atomically:YES]) {
-      [self storeMetaDataForCrashReportFilename:fakeReportFilename];
-    }
-  } else {
-    BITHockeyLogError(@"ERROR: Writing fake crash report. %@", [error description]);
-  }
-}
-
-/**
- *	 Send all approved crash reports
- *
- * Gathers all collected data and constructs the XML structure and starts the sending process
- */
-- (void)sendNextCrashReport {
-  NSError *error = NULL;
-  
-  self.crashIdenticalCurrentVersion = NO;
-  
-  if ([self.crashFiles count] == 0)
-    return;
-  
-  NSString *crashXML = nil;
-  BITHockeyAttachment *attachment = nil;
-  
-  // we start sending always with the oldest pending one
-  NSString *filename = [self.crashFiles objectAtIndex:0];
-  NSString *attachmentFilename = filename;
-  NSString *cacheFilename = [filename lastPathComponent];
-  NSData *crashData = [NSData dataWithContentsOfFile:filename];
-  
-  if ([crashData length] > 0) {
-    BITPLCrashReport *report = nil;
-    NSString *crashUUID = @"";
-    NSString *installString = nil;
-    NSString *crashLogString = nil;
-    NSString *appBundleIdentifier = nil;
-    NSString *appBundleMarketingVersion = nil;
-    NSString *appBundleVersion = nil;
-    NSString *osVersion = nil;
-    NSString *deviceModel = nil;
-    NSString *appBinaryUUIDs = nil;
-    NSString *metaFilename = nil;
-    
-    NSPropertyListFormat format;
-    
-    if ([[cacheFilename pathExtension] isEqualToString:@"fake"]) {
-      NSDictionary *fakeReportDict = (NSDictionary *)[NSPropertyListSerialization
-                                                      propertyListWithData:crashData
-                                                      options:NSPropertyListMutableContainersAndLeaves
-                                                      format:&format
-                                                      error:&error];
-      
-      crashLogString = [fakeReportDict objectForKey:kBITFakeCrashReport];
-      crashUUID = [fakeReportDict objectForKey:kBITFakeCrashUUID];
-      appBundleIdentifier = [fakeReportDict objectForKey:kBITFakeCrashAppBundleIdentifier];
-      appBundleMarketingVersion = [fakeReportDict objectForKey:kBITFakeCrashAppMarketingVersion] ?: @"";
-      appBundleVersion = [fakeReportDict objectForKey:kBITFakeCrashAppVersion];
-      appBinaryUUIDs = [fakeReportDict objectForKey:kBITFakeCrashAppBinaryUUID];
-      deviceModel = [fakeReportDict objectForKey:kBITFakeCrashDeviceModel];
-      osVersion = [fakeReportDict objectForKey:kBITFakeCrashOSVersion];
-      
-      metaFilename = [cacheFilename stringByReplacingOccurrencesOfString:@".fake" withString:@".meta"];
-      attachmentFilename = [attachmentFilename stringByReplacingOccurrencesOfString:@".fake" withString:@""];
-      
-      if ([appBundleVersion compare:(NSString *)[[NSBundle mainBundle] objectForInfoDictionaryKey:@"CFBundleVersion"]] == NSOrderedSame) {
-        self.crashIdenticalCurrentVersion = YES;
-      }
-      
-    } else {
-      report = [[BITPLCrashReport alloc] initWithData:crashData error:&error];
-    }
-    
-    if (report == nil && crashLogString == nil) {
-      BITHockeyLogWarning(@"WARNING: Could not parse crash report");
-      // we cannot do anything with this report, so delete it
-      [self cleanCrashReportWithFilename:filename];
-      // we don't continue with the next report here, even if there are to prevent calling sendCrashReports from itself again
-      // the next crash will be automatically send on the next app start/becoming active event
-      return;
-    }
-    
-    installString = bit_appAnonID(NO) ?: @"";
-    
-    if (report) {
-      if (report.uuidRef != NULL) {
-        crashUUID = (NSString *) CFBridgingRelease(CFUUIDCreateString(NULL, report.uuidRef));
-      }
-      metaFilename = [cacheFilename stringByAppendingPathExtension:@"meta"];
-      crashLogString = [BITCrashReportTextFormatter stringValueForCrashReport:report crashReporterKey:installString];
-      appBundleIdentifier = report.applicationInfo.applicationIdentifier;
-      appBundleMarketingVersion = report.applicationInfo.applicationMarketingVersion ?: @"";
-      appBundleVersion = report.applicationInfo.applicationVersion;
-      osVersion = report.systemInfo.operatingSystemVersion;
-      deviceModel = [self getDevicePlatform];
-      appBinaryUUIDs = [self extractAppUUIDs:report];
-      if ([report.applicationInfo.applicationVersion compare:(NSString *)[[NSBundle mainBundle] objectForInfoDictionaryKey:@"CFBundleVersion"]] == NSOrderedSame) {
-        self.crashIdenticalCurrentVersion = YES;
-      }
-    }
-    
-    if ([report.applicationInfo.applicationVersion compare:(NSString *)[[NSBundle mainBundle] objectForInfoDictionaryKey:@"CFBundleVersion"]] == NSOrderedSame) {
-      self.crashIdenticalCurrentVersion = YES;
-    }
-    
-    NSString *username = @"";
-    NSString *useremail = @"";
-    NSString *userid = @"";
-    NSString *applicationLog = @"";
-    NSString *description = @"";
-    
-    NSData *plist = [NSData dataWithContentsOfFile:[self.crashesDir stringByAppendingPathComponent:metaFilename]];
-    if (plist) {
-      NSDictionary *metaDict = (NSDictionary *)[NSPropertyListSerialization
-                                                propertyListWithData:plist
-                                                options:NSPropertyListMutableContainersAndLeaves
-                                                format:&format
-                                                error:&error];
-      
-      username = [self stringValueFromKeychainForKey:[NSString stringWithFormat:@"%@.%@", attachmentFilename.lastPathComponent, kBITCrashMetaUserName]] ?: @"";
-      useremail = [self stringValueFromKeychainForKey:[NSString stringWithFormat:@"%@.%@", attachmentFilename.lastPathComponent, kBITCrashMetaUserEmail]] ?: @"";
-      userid = [self stringValueFromKeychainForKey:[NSString stringWithFormat:@"%@.%@", attachmentFilename.lastPathComponent, kBITCrashMetaUserID]] ?: @"";
-      applicationLog = [metaDict objectForKey:kBITCrashMetaApplicationLog] ?: @"";
-      description = [NSString stringWithContentsOfFile:[NSString stringWithFormat:@"%@.desc", [self.crashesDir stringByAppendingPathComponent: cacheFilename]] encoding:NSUTF8StringEncoding error:&error];
-      attachment = [self attachmentForCrashReport:attachmentFilename];
-    } else {
-      BITHockeyLogError(@"ERROR: Reading crash meta data. %@", error);
-    }
-    
-    if ([applicationLog length] > 0) {
-      if ([description length] > 0) {
-        description = [NSString stringWithFormat:@"%@\n\nLog:\n%@", description, applicationLog];
-      } else {
-        description = [NSString stringWithFormat:@"Log:\n%@", applicationLog];
-      }
-    }
-    
-    crashXML = [NSString stringWithFormat:@"<crashes><crash><applicationname><![CDATA[%@]]></applicationname><uuids>%@</uuids><bundleidentifier>%@</bundleidentifier><systemversion>%@</systemversion><platform>%@</platform><senderversion>%@</senderversion><versionstring>%@</versionstring><version>%@</version><uuid>%@</uuid><log><![CDATA[%@]]></log><userid>%@</userid><username>%@</username><contact>%@</contact><installstring>%@</installstring><description><![CDATA[%@]]></description></crash></crashes>",
-                [[NSBundle mainBundle] objectForInfoDictionaryKey:@"CFBundleExecutable"],
-                appBinaryUUIDs,
-                appBundleIdentifier,
-                osVersion,
-                deviceModel,
-                [[NSBundle mainBundle] objectForInfoDictionaryKey:@"CFBundleVersion"],
-                appBundleMarketingVersion,
-                appBundleVersion,
-                crashUUID,
-                [crashLogString stringByReplacingOccurrencesOfString:@"]]>" withString:@"]]" @"]]><![CDATA[" @">" options:NSLiteralSearch range:NSMakeRange(0,crashLogString.length)],
-                userid,
-                username,
-                useremail,
-                installString,
-                [description stringByReplacingOccurrencesOfString:@"]]>" withString:@"]]" @"]]><![CDATA[" @">" options:NSLiteralSearch range:NSMakeRange(0,description.length)]];
-    
-    BITHockeyLogDebug(@"INFO: Sending crash reports:\n%@", crashXML);
-    [self sendCrashReportWithFilename:filename xml:crashXML attachment:attachment];
-  } else {
-    // we cannot do anything with this report, so delete it
-    [self cleanCrashReportWithFilename:filename];
-  }
-}
-
-#pragma mark - Networking
-
-- (NSData *)postBodyWithXML:(NSString *)xml attachment:(BITHockeyAttachment *)attachment boundary:(NSString *)boundary {
-  NSMutableData *postBody =  [NSMutableData data];
-  
-  //  [postBody appendData:[[NSString stringWithFormat:@"\r\n"] dataUsingEncoding:NSUTF8StringEncoding]];
-  [postBody appendData:[BITHockeyAppClient dataWithPostValue:BITHOCKEY_NAME
-                                                      forKey:@"sdk"
-                                                    boundary:boundary]];
-  
-  [postBody appendData:[BITHockeyAppClient dataWithPostValue:BITHOCKEY_VERSION
-                                                      forKey:@"sdk_version"
-                                                    boundary:boundary]];
-  
-  [postBody appendData:[BITHockeyAppClient dataWithPostValue:@"no"
-                                                      forKey:@"feedbackEnabled"
-                                                    boundary:boundary]];
-  
-  [postBody appendData:[BITHockeyAppClient dataWithPostValue:[xml dataUsingEncoding:NSUTF8StringEncoding]
-                                                      forKey:@"xml"
-                                                 contentType:@"text/xml"
-                                                    boundary:boundary
-                                                    filename:@"crash.xml"]];
-  
-  if (attachment && attachment.hockeyAttachmentData) {
-    NSString *attachmentFilename = attachment.filename;
-    if (!attachmentFilename) {
-      attachmentFilename = @"Attachment_0";
-    }
-    [postBody appendData:[BITHockeyAppClient dataWithPostValue:attachment.hockeyAttachmentData
-                                                        forKey:@"attachment0"
-                                                   contentType:attachment.contentType
-                                                      boundary:boundary
-                                                      filename:attachmentFilename]];
-  }
-  
-  [postBody appendData:(NSData *)[[NSString stringWithFormat:@"\r\n--%@--\r\n", boundary] dataUsingEncoding:NSUTF8StringEncoding]];
-  
-  return postBody;
-}
-
-- (NSMutableURLRequest *)requestWithBoundary:(NSString *)boundary {
-  NSString *postCrashPath = [NSString stringWithFormat:@"api/2/apps/%@/crashes", self.encodedAppIdentifier];
-  
-  NSMutableURLRequest *request = [self.hockeyAppClient requestWithMethod:@"POST"
-                                                                    path:postCrashPath
-                                                              parameters:nil];
-  
-  [request setCachePolicy: NSURLRequestReloadIgnoringLocalCacheData];
-  [request setValue:@"HockeySDK/iOS" forHTTPHeaderField:@"User-Agent"];
-  [request setValue:@"gzip" forHTTPHeaderField:@"Accept-Encoding"];
-  
-  NSString *contentType = [NSString stringWithFormat:@"multipart/form-data; boundary=%@", boundary];
-  [request setValue:contentType forHTTPHeaderField:@"Content-type"];
-  
-  return request;
-}
-
-// process upload response
-- (void)processUploadResultWithFilename:(NSString *)filename responseData:(NSData *)responseData statusCode:(NSInteger)statusCode error:(NSError *)error {
-  __block NSError *theError = error;
-  
-  dispatch_async(dispatch_get_main_queue(), ^{
-    self.sendingInProgress = NO;
-    id strongDelegate = self.delegate;
-    if (nil == theError) {
-      if (nil == responseData || [responseData length] == 0) {
-        theError = [NSError errorWithDomain:kBITCrashErrorDomain
-                                       code:BITCrashAPIReceivedEmptyResponse
-                                   userInfo:@{
-                                              NSLocalizedDescriptionKey: @"Sending failed with an empty response!"
-                                              }
-                    ];
-      } else if (statusCode >= 200 && statusCode < 400) {
-        [self cleanCrashReportWithFilename:filename];
-        
-        // HockeyApp uses PList XML format
-        NSMutableDictionary *response = [NSPropertyListSerialization propertyListWithData:responseData
-                                                                                  options:NSPropertyListMutableContainersAndLeaves
-                                                                                   format:nil
-                                                                                    error:&theError];
-        BITHockeyLogDebug(@"INFO: Received API response: %@", response);
-        if ([strongDelegate respondsToSelector:@selector(crashManagerDidFinishSendingCrashReport:)]) {
-          [strongDelegate crashManagerDidFinishSendingCrashReport:self];
-        }
-        
-        // only if sending the crash report went successfully, continue with the next one (if there are more)
-        [self sendNextCrashReport];
-      } else if (statusCode == 400) {
-        [self cleanCrashReportWithFilename:filename];
-        
-        theError = [NSError errorWithDomain:kBITCrashErrorDomain
-                                       code:BITCrashAPIAppVersionRejected
-                                   userInfo:@{
-                                              NSLocalizedDescriptionKey: @"The server rejected receiving crash reports for this app version!"
-                                              }
-                    ];
-      } else {
-        theError = [NSError errorWithDomain:kBITCrashErrorDomain
-                                       code:BITCrashAPIErrorWithStatusCode
-                                   userInfo:@{
-                                              NSLocalizedDescriptionKey: [NSString stringWithFormat:@"Sending failed with status code: %li", (long)statusCode]
-                                              }
-                    ];
-      }
-    }
-    
-    if (theError) {
-      if ([strongDelegate respondsToSelector:@selector(crashManager:didFailWithError:)]) {
-        [strongDelegate crashManager:self didFailWithError:theError];
-      }
-      
-      BITHockeyLogError(@"ERROR: %@", [theError localizedDescription]);
-    }
-  });
-}
-
-/**
- *	 Send the XML data to the server
- *
- * Wraps the XML structure into a POST body and starts sending the data asynchronously
- *
- *	@param	xml	The XML data that needs to be send to the server
- */
-- (void)sendCrashReportWithFilename:(NSString *)filename xml:(NSString*)xml attachment:(BITHockeyAttachment *)attachment {
-  NSURLSessionConfiguration *sessionConfiguration = [NSURLSessionConfiguration defaultSessionConfiguration];
-  __block NSURLSession *session = [NSURLSession sessionWithConfiguration:sessionConfiguration];
-  
-  NSURLRequest *request = [self requestWithBoundary:kBITHockeyAppClientBoundary];
-  NSData *data = [self postBodyWithXML:xml attachment:attachment boundary:kBITHockeyAppClientBoundary];
-  
-  if (request && data) {
-    __weak typeof (self) weakSelf = self;
-    NSURLSessionUploadTask *uploadTask = [session uploadTaskWithRequest:request
-                                                               fromData:data
-                                                      completionHandler:^(NSData *responseData, NSURLResponse *response, NSError *error) {
-                                                        typeof (self) strongSelf = weakSelf;
-                                                        
-                                                        [session finishTasksAndInvalidate];
-                                                        
-                                                        NSHTTPURLResponse *httpResponse = (NSHTTPURLResponse*) response;
-                                                        NSInteger statusCode = [httpResponse statusCode];
-                                                        [strongSelf processUploadResultWithFilename:filename responseData:responseData statusCode:statusCode error:error];
-                                                      }];
-    
-    [uploadTask resume];
-  }
-  id strongDelegate = self.delegate;
-  if ([strongDelegate respondsToSelector:@selector(crashManagerWillSendCrashReport:)]) {
-    [strongDelegate crashManagerWillSendCrashReport:self];
-  }
-  
-  BITHockeyLogDebug(@"INFO: Sending crash reports started.");
-}
-
-- (NSTimeInterval)timeintervalCrashInLastSessionOccured {
-  return self.timeIntervalCrashInLastSessionOccurred;
-}
-
-@end
-
-#endif /* HOCKEYSDK_FEATURE_CRASH_REPORTER */
-
diff --git a/submodules/HockeySDK-iOS/Classes/BITCrashManagerDelegate.h b/submodules/HockeySDK-iOS/Classes/BITCrashManagerDelegate.h
deleted file mode 100644
index 786ead9d22..0000000000
--- a/submodules/HockeySDK-iOS/Classes/BITCrashManagerDelegate.h
+++ /dev/null
@@ -1,155 +0,0 @@
-/*
- * Author: Andreas Linde <mail@andreaslinde.de>
- *
- * Copyright (c) 2012-2014 HockeyApp, Bit Stadium GmbH.
- * All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person
- * obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without
- * restriction, including without limitation the rights to use,
- * copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following
- * conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
- * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#import <Foundation/Foundation.h>
-
-@class BITCrashManager;
-@class BITHockeyAttachment;
-
-/**
- The `BITCrashManagerDelegate` formal protocol defines methods further configuring
- the behaviour of `BITCrashManager`.
- */
-
-@protocol BITCrashManagerDelegate <NSObject>
-
-@optional
-
-
-///-----------------------------------------------------------------------------
-/// @name Additional meta data
-///-----------------------------------------------------------------------------
-
-/** Return any log string based data the crash report being processed should contain
-
- @param crashManager The `BITCrashManager` instance invoking this delegate
- @see attachmentForCrashManager:
- @see BITHockeyManagerDelegate userNameForHockeyManager:componentManager:
- @see BITHockeyManagerDelegate userEmailForHockeyManager:componentManager:
- */
--(NSString *)applicationLogForCrashManager:(BITCrashManager *)crashManager;
-
-
-/** Return a BITHockeyAttachment object providing an NSData object the crash report
- being processed should contain
- 
- Please limit your attachments to reasonable files to avoid high traffic costs for your users.
- 
- Example implementation:
- 
-     - (BITHockeyAttachment *)attachmentForCrashManager:(BITCrashManager *)crashManager {
-       NSData *data = [NSData dataWithContentsOfURL:@"mydatafile"];
- 
-       BITHockeyAttachment *attachment = [[BITHockeyAttachment alloc] initWithFilename:@"myfile.data"
-                                                                  hockeyAttachmentData:data
-                                                                           contentType:@"'application/octet-stream"];
-       return attachment;
-     }
- 
- @param crashManager The `BITCrashManager` instance invoking this delegate
- @see BITHockeyAttachment
- @see applicationLogForCrashManager:
- @see BITHockeyManagerDelegate userNameForHockeyManager:componentManager:
- @see BITHockeyManagerDelegate userEmailForHockeyManager:componentManager:
- */
--(BITHockeyAttachment *)attachmentForCrashManager:(BITCrashManager *)crashManager;
-
-
-
-///-----------------------------------------------------------------------------
-/// @name Alert
-///-----------------------------------------------------------------------------
-
-/** Invoked before the user is asked to send a crash report, so you can do additional actions.
- E.g. to make sure not to ask the user for an app rating :)
- 
- @param crashManager The `BITCrashManager` instance invoking this delegate
- */
--(void)crashManagerWillShowSubmitCrashReportAlert:(BITCrashManager *)crashManager;
-
-
-/** Invoked after the user did choose _NOT_ to send a crash in the alert
- 
- @param crashManager The `BITCrashManager` instance invoking this delegate
- */
--(void)crashManagerWillCancelSendingCrashReport:(BITCrashManager *)crashManager;
-
-
-/** Invoked after the user did choose to send crashes always in the alert
- 
- @param crashManager The `BITCrashManager` instance invoking this delegate
- */
--(void)crashManagerWillSendCrashReportsAlways:(BITCrashManager *)crashManager;
-
-
-///-----------------------------------------------------------------------------
-/// @name Networking
-///-----------------------------------------------------------------------------
-
-/** Invoked right before sending crash reports will start
- 
- @param crashManager The `BITCrashManager` instance invoking this delegate
- */
-- (void)crashManagerWillSendCrashReport:(BITCrashManager *)crashManager;
-
-/** Invoked after sending crash reports failed
- 
- @param crashManager The `BITCrashManager` instance invoking this delegate
- @param error The error returned from the NSURLSession call or `kBITCrashErrorDomain`
- with reason of type `BITCrashErrorReason`.
- */
-- (void)crashManager:(BITCrashManager *)crashManager didFailWithError:(NSError *)error;
-
-/** Invoked after sending crash reports succeeded
- 
- @param crashManager The `BITCrashManager` instance invoking this delegate
- */
-- (void)crashManagerDidFinishSendingCrashReport:(BITCrashManager *)crashManager;
-
-///-----------------------------------------------------------------------------
-/// @name Experimental
-///-----------------------------------------------------------------------------
-
-/** Define if a report should be considered as a crash report
- 
- Due to the risk, that these reports may be false positives, this delegates allows the
- developer to influence which reports detected by the heuristic should actually be reported.
- 
- The developer can use the following property to get more information about the crash scenario:
- - `[BITCrashManager didReceiveMemoryWarningInLastSession]`: Did the app receive a low memory warning
- 
- This allows only reports to be considered where at least one low memory warning notification was
- received by the app to reduce to possibility of having false positives.
- 
- @param crashManager The `BITCrashManager` instance invoking this delegate
- @return `YES` if the heuristic based detected report should be reported, otherwise `NO`
- @see `[BITCrashManager didReceiveMemoryWarningInLastSession]`
- */
--(BOOL)considerAppNotTerminatedCleanlyReportForCrashManager:(BITCrashManager *)crashManager;
-
-@end
diff --git a/submodules/HockeySDK-iOS/Classes/BITCrashManagerPrivate.h b/submodules/HockeySDK-iOS/Classes/BITCrashManagerPrivate.h
deleted file mode 100644
index 0add0c801d..0000000000
--- a/submodules/HockeySDK-iOS/Classes/BITCrashManagerPrivate.h
+++ /dev/null
@@ -1,113 +0,0 @@
-/*
- * Author: Andreas Linde <mail@andreaslinde.de>
- *
- * Copyright (c) 2013-2014 HockeyApp, Bit Stadium GmbH.
- * All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person
- * obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without
- * restriction, including without limitation the rights to use,
- * copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following
- * conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
- * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
- */
-
-
-#import "HockeySDK.h"
-
-#if HOCKEYSDK_FEATURE_CRASH_REPORTER
-
-#import <CrashReporter/CrashReporter.h>
-
-@class BITHockeyAppClient;
-
-@interface BITCrashManager () {
-}
-
-
-///-----------------------------------------------------------------------------
-/// @name Delegate
-///-----------------------------------------------------------------------------
-
-/**
- Sets the optional `BITCrashManagerDelegate` delegate.
- 
- The delegate is automatically set by using `[BITHockeyManager setDelegate:]`. You
- should not need to set this delegate individually.
- 
- @see `[BITHockeyManager setDelegate:]`
- */
-@property (nonatomic, weak) id delegate;
-
-/**
- * must be set
- */
-@property (nonatomic, strong) BITHockeyAppClient *hockeyAppClient;
-
-@property (nonatomic) NSUncaughtExceptionHandler *exceptionHandler;
-
-@property (nonatomic, strong) NSFileManager *fileManager;
-
-@property (nonatomic, strong) BITPLCrashReporter *plCrashReporter;
-
-@property (nonatomic) NSString *lastCrashFilename;
-
-@property (nonatomic, copy, setter = setAlertViewHandler:) BITCustomAlertViewHandler alertViewHandler;
-
-@property (nonatomic, copy) NSString *crashesDir;
-
-#if HOCKEYSDK_FEATURE_AUTHENTICATOR
-
-// Only set via BITAuthenticator
-@property (nonatomic, copy) NSString *installationIdentification;
-
-// Only set via BITAuthenticator
-@property (nonatomic) BITAuthenticatorIdentificationType installationIdentificationType;
-
-// Only set via BITAuthenticator
-@property (nonatomic) BOOL installationIdentified;
-
-#endif /* HOCKEYSDK_FEATURE_AUTHENTICATOR */
-
-- (instancetype)initWithAppIdentifier:(NSString *)appIdentifier appEnvironment:(BITEnvironment)environment hockeyAppClient:(BITHockeyAppClient *)hockeyAppClient NS_DESIGNATED_INITIALIZER;
-
-- (void)cleanCrashReports;
-
-- (NSString *)userIDForCrashReport;
-- (NSString *)userEmailForCrashReport;
-- (NSString *)userNameForCrashReport;
-
-- (void)handleCrashReport;
-- (BOOL)hasPendingCrashReport;
-- (NSString *)firstNotApprovedCrashReport;
-
-- (void)persistUserProvidedMetaData:(BITCrashMetaData *)userProvidedMetaData;
-- (BOOL)persistAttachment:(BITHockeyAttachment *)attachment withFilename:(NSString *)filename;
-
-- (BITHockeyAttachment *)attachmentForCrashReport:(NSString *)filename;
-
-- (void)invokeDelayedProcessing;
-- (void)sendNextCrashReport;
-
-- (void)setLastCrashFilename:(NSString *)lastCrashFilename;
-
-- (void)leavingAppSafely;
-
-@end
-
-
-#endif /* HOCKEYSDK_FEATURE_CRASH_REPORTER */
diff --git a/submodules/HockeySDK-iOS/Classes/BITCrashMetaData.h b/submodules/HockeySDK-iOS/Classes/BITCrashMetaData.h
deleted file mode 100644
index 10508b5794..0000000000
--- a/submodules/HockeySDK-iOS/Classes/BITCrashMetaData.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Author: Andreas Linde <mail@andreaslinde.de>
- *
- * Copyright (c) 2012-2014 HockeyApp, Bit Stadium GmbH.
- * All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person
- * obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without
- * restriction, including without limitation the rights to use,
- * copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following
- * conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
- * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#import <Foundation/Foundation.h>
-
-
-/**
- *  This class provides properties that can be attached to a crash report via a custom alert view flow
- */
-@interface BITCrashMetaData : NSObject
-
-/**
- *  User provided description that should be attached to the crash report as plain text
- */
-@property (nonatomic, copy) NSString *userProvidedDescription;
-
-/**
- *  User name that should be attached to the crash report
- */
-@property (nonatomic, copy) NSString *userName;
-
-/**
- *  User email that should be attached to the crash report
- */
-@property (nonatomic, copy) NSString *userEmail;
-
-/**
- *  User ID that should be attached to the crash report
- */
-@property (nonatomic, copy) NSString *userID;
-
-@end
diff --git a/submodules/HockeySDK-iOS/Classes/BITCrashMetaData.m b/submodules/HockeySDK-iOS/Classes/BITCrashMetaData.m
deleted file mode 100644
index 2ec133dd65..0000000000
--- a/submodules/HockeySDK-iOS/Classes/BITCrashMetaData.m
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Author: Andreas Linde <mail@andreaslinde.de>
- *
- * Copyright (c) 2012-2014 HockeyApp, Bit Stadium GmbH.
- * All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person
- * obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without
- * restriction, including without limitation the rights to use,
- * copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following
- * conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
- * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#import "HockeySDK.h"
-
-#if HOCKEYSDK_FEATURE_CRASH_REPORTER
-
-#import "BITCrashMetaData.h"
-
-@implementation BITCrashMetaData
-
-@end
-
-#endif
diff --git a/submodules/HockeySDK-iOS/Classes/BITCrashReportTextFormatter.h b/submodules/HockeySDK-iOS/Classes/BITCrashReportTextFormatter.h
deleted file mode 100644
index c75d93c67f..0000000000
--- a/submodules/HockeySDK-iOS/Classes/BITCrashReportTextFormatter.h
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- * Authors:
- *  Landon Fuller <landonf@plausiblelabs.com>
- *  Damian Morris <damian@moso.com.au>
- *  Andreas Linde <mail@andreaslinde.de>
- *
- * Copyright (c) 2008-2013 Plausible Labs Cooperative, Inc.
- * Copyright (c) 2010 MOSO Corporation, Pty Ltd.
- * Copyright (c) 2012-2014 HockeyApp, Bit Stadium GmbH.
- * All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person
- * obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without
- * restriction, including without limitation the rights to use,
- * copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following
- * conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
- * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
- */
-
-
-#import <Foundation/Foundation.h>
-
-@class PLCrashReport;
-
-
-// Dictionary keys for array elements returned by arrayOfAppUUIDsForCrashReport:
-#ifndef kBITBinaryImageKeyUUID
-#define kBITBinaryImageKeyUUID @"uuid"
-#define kBITBinaryImageKeyArch @"arch"
-#define kBITBinaryImageKeyType @"type"
-#endif
-
-
-/**
- *  HockeySDK Crash Reporter error domain
- */
-typedef NS_ENUM (NSInteger, BITBinaryImageType) {
-  /**
-   *  App binary
-   */
-  BITBinaryImageTypeAppBinary,
-  /**
-   *  App provided framework
-   */
-  BITBinaryImageTypeAppFramework,
-  /**
-   *  Image not related to the app
-   */
-  BITBinaryImageTypeOther
-};
-
-
-@interface BITCrashReportTextFormatter : NSObject {
-}
-
-+ (NSString *)stringValueForCrashReport:(PLCrashReport *)report crashReporterKey:(NSString *)crashReporterKey;
-+ (NSArray *)arrayOfAppUUIDsForCrashReport:(PLCrashReport *)report;
-+ (NSString *)bit_archNameFromCPUType:(uint64_t)cpuType subType:(uint64_t)subType;
-+ (BITBinaryImageType)bit_imageTypeForImagePath:(NSString *)imagePath processPath:(NSString *)processPath;
-
-@end
diff --git a/submodules/HockeySDK-iOS/Classes/BITCrashReportTextFormatter.m b/submodules/HockeySDK-iOS/Classes/BITCrashReportTextFormatter.m
deleted file mode 100644
index 4c896802e6..0000000000
--- a/submodules/HockeySDK-iOS/Classes/BITCrashReportTextFormatter.m
+++ /dev/null
@@ -1,928 +0,0 @@
-/*
- * Authors:
- *  Landon Fuller <landonf@plausiblelabs.com>
- *  Damian Morris <damian@moso.com.au>
- *  Andreas Linde <mail@andreaslinde.de>
- *
- * Copyright (c) 2008-2013 Plausible Labs Cooperative, Inc.
- * Copyright (c) 2010 MOSO Corporation, Pty Ltd.
- * Copyright (c) 2012-2014 HockeyApp, Bit Stadium GmbH.
- * All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person
- * obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without
- * restriction, including without limitation the rights to use,
- * copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following
- * conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
- * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#import "HockeySDK.h"
-#import "HockeySDKPrivate.h"
-
-#if HOCKEYSDK_FEATURE_CRASH_REPORTER
-
-#import <CrashReporter/CrashReporter.h>
-
-#import <mach-o/dyld.h>
-#import <mach-o/getsect.h>
-#import <mach-o/ldsyms.h>
-#import <dlfcn.h>
-#import <Availability.h>
-
-#if defined(__OBJC2__)
-#define SEL_NAME_SECT "__objc_methname"
-#else
-#define SEL_NAME_SECT "__cstring"
-#endif
-
-#import "BITCrashReportTextFormatter.h"
-
-/*
- * XXX: The ARM64 CPU type, and ARM_V7S and ARM_V8 Mach-O CPU subtypes are not
- * defined in the Mac OS X 10.8 headers.
- */
-#ifndef CPU_SUBTYPE_ARM_V7S
-# define CPU_SUBTYPE_ARM_V7S 11
-#endif
-
-#ifndef CPU_TYPE_ARM64
-#define CPU_TYPE_ARM64 (CPU_TYPE_ARM | CPU_ARCH_ABI64)
-#endif
-
-#ifndef CPU_SUBTYPE_ARM_V8
-# define CPU_SUBTYPE_ARM_V8 13
-#endif
-
-/**
- * Sort PLCrashReportBinaryImageInfo instances by their starting address.
- */
-static NSInteger bit_binaryImageSort(id binary1, id binary2, void *__unused context) {
-  uint64_t addr1 = [binary1 imageBaseAddress];
-  uint64_t addr2 = [binary2 imageBaseAddress];
-  
-  if (addr1 < addr2)
-    return NSOrderedAscending;
-  else if (addr1 > addr2)
-    return NSOrderedDescending;
-  else
-    return NSOrderedSame;
-}
-
-/**
- * Validates that the given @a string terminates prior to @a limit.
- */
-static const char *safer_string_read (const char *string, const char *limit) {
-  const char *p = string;
-  do {
-    if (p >= limit || p+1 >= limit) {
-      return NULL;
-    }
-    p++;
-  } while (*p != '\0');
-  
-  return string;
-}
-
-/*
- * The relativeAddress should be `<ecx/rsi/r1/x1 ...> - <image base>`, extracted from the crash report's thread
- * and binary image list.
- *
- * For the (architecture-specific) registers to attempt, see:
- *  http://sealiesoftware.com/blog/archive/2008/09/22/objc_explain_So_you_crashed_in_objc_msgSend.html
- */
-static const char *findSEL (const char *imageName, NSString *imageUUID, uint64_t relativeAddress) {
-  unsigned int images_count = _dyld_image_count();
-  for (unsigned int i = 0; i < images_count; ++i) {
-    intptr_t slide = _dyld_get_image_vmaddr_slide(i);
-    const struct mach_header *header = _dyld_get_image_header(i);
-    const struct mach_header_64 *header64 = (const struct mach_header_64 *) header;
-    const char *name = _dyld_get_image_name(i);
-    
-    /* Image disappeared? */
-    if (name == NULL || header == NULL)
-      continue;
-    
-    /* Check if this is the correct image. If we were being even more careful, we'd check the LC_UUID */
-    if (strcmp(name, imageName) != 0)
-      continue;
-
-    /* Determine whether this is a 64-bit or 32-bit Mach-O file */
-    BOOL m64 = NO;
-    if (header->magic == MH_MAGIC_64)
-      m64 = YES;
-
-    NSString *uuidString = nil;
-    const uint8_t *command;
-    uint32_t	ncmds;
-    
-    if (m64) {
-      command = (const uint8_t *)(header64 + 1);
-      ncmds = header64->ncmds;
-    } else {
-      command = (const uint8_t *)(header + 1);
-      ncmds = header->ncmds;
-    }
-    for (uint32_t idx = 0; idx < ncmds; ++idx) {
-      const struct load_command *load_command = (const struct load_command *)command;
-      if (load_command->cmd == LC_UUID) {
-        const struct uuid_command *uuid_command = (const struct uuid_command *)command;
-        const uint8_t *uuid = uuid_command->uuid;
-        uuidString = [[NSString stringWithFormat:@"%02X%02X%02X%02X%02X%02X%02X%02X%02X%02X%02X%02X%02X%02X%02X%02X",
-                       uuid[0], uuid[1], uuid[2], uuid[3],
-                       uuid[4], uuid[5], uuid[6], uuid[7],
-                       uuid[8], uuid[9], uuid[10], uuid[11],
-                       uuid[12], uuid[13], uuid[14], uuid[15]]
-                      lowercaseString];
-        break;
-      } else {
-        command += load_command->cmdsize;
-      }
-    }
-
-    // Check if this is the correct image by comparing the UUIDs
-    if (!uuidString || ![uuidString isEqualToString:imageUUID])
-      continue;
-        
-    /* Fetch the __objc_methname section */
-    const char *methname_sect;
-    uint64_t methname_sect_size;
-    if (m64) {
-      methname_sect = getsectdatafromheader_64(header64, SEG_TEXT, SEL_NAME_SECT, &methname_sect_size);
-    } else {
-      uint32_t meth_size_32;
-      methname_sect = getsectdatafromheader(header, SEG_TEXT, SEL_NAME_SECT, &meth_size_32);
-      methname_sect_size = meth_size_32;
-    }
-    
-    /* Apply the slide, as per getsectdatafromheader(3) */
-    methname_sect += slide;
-    
-    if (methname_sect == NULL) {
-      return NULL;
-    }
-    
-    /* Calculate the target address within this image, and verify that it is within __objc_methname */
-    const char *target = ((const char *)header) + relativeAddress;
-    const char *limit = methname_sect + methname_sect_size;
-    if (target < methname_sect || target >= limit) {
-      return NULL;
-    }
-    
-    /* Read the actual method name */
-    return safer_string_read(target, limit);
-  }
-  
-  return NULL;
-}
-
-/**
- * Formats PLCrashReport data as human-readable text.
- */
-@implementation BITCrashReportTextFormatter
-
-static NSString *const BITXamarinStackTraceDelimiter = @"Xamarin Exception Stack:";
-
-/**
- * Formats the provided @a report as human-readable text in the given @a textFormat, and return
- * the formatted result as a string.
- *
- * @param report The report to format.
- * @param crashReporterKey The crash reporter key.
- *
- * @return Returns the formatted result on success, or nil if an error occurs.
- */
-+ (NSString *)stringValueForCrashReport:(BITPLCrashReport *)report crashReporterKey:(NSString *)crashReporterKey {
-	NSMutableString* text = [NSMutableString string];
-	boolean_t lp64 = true; // quiesce GCC uninitialized value warning
-  
-	/* Header */
-	
-  /* Map to apple style OS name */
-  NSString *osName;
-  switch (report.systemInfo.operatingSystem) {
-    case PLCrashReportOperatingSystemMacOSX:
-      osName = @"Mac OS X";
-      break;
-    case PLCrashReportOperatingSystemiPhoneOS:
-      osName = @"iPhone OS";
-      break;
-    case PLCrashReportOperatingSystemiPhoneSimulator:
-      osName = @"Mac OS X";
-      break;
-    default:
-      osName = [NSString stringWithFormat: @"Unknown (%d)", report.systemInfo.operatingSystem];
-      break;
-  }
-  
-  /* Map to Apple-style code type, and mark whether architecture is LP64 (64-bit) */
-  NSString *codeType = nil;
-  {
-    /* Attempt to derive the code type from the binary images */
-    for (BITPLCrashReportBinaryImageInfo *image in report.images) {
-      /* Skip images with no specified type */
-      if (image.codeType == nil)
-        continue;
-      
-      /* Skip unknown encodings */
-      if (image.codeType.typeEncoding != PLCrashReportProcessorTypeEncodingMach)
-        continue;
-      
-      switch (image.codeType.type) {
-        case CPU_TYPE_ARM:
-          codeType = @"ARM";
-          lp64 = false;
-          break;
-          
-        case CPU_TYPE_ARM64:
-          codeType = @"ARM-64";
-          lp64 = true;
-          break;
-          
-        case CPU_TYPE_X86:
-          codeType = @"X86";
-          lp64 = false;
-          break;
-          
-        case CPU_TYPE_X86_64:
-          codeType = @"X86-64";
-          lp64 = true;
-          break;
-          
-        case CPU_TYPE_POWERPC:
-          codeType = @"PPC";
-          lp64 = false;
-          break;
-          
-        default:
-          // Do nothing, handled below.
-          break;
-      }
-      
-      /* Stop immediately if code type was discovered */
-      if (codeType != nil)
-        break;
-    }
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
-    /* If we were unable to determine the code type, fall back on the legacy architecture value. */
-    if (codeType == nil) {
-      switch (report.systemInfo.architecture) {
-        case PLCrashReportArchitectureARMv6:
-        case PLCrashReportArchitectureARMv7:
-          codeType = @"ARM";
-          lp64 = false;
-          break;
-        case PLCrashReportArchitectureX86_32:
-          codeType = @"X86";
-          lp64 = false;
-          break;
-        case PLCrashReportArchitectureX86_64:
-          codeType = @"X86-64";
-          lp64 = true;
-          break;
-        case PLCrashReportArchitecturePPC:
-          codeType = @"PPC";
-          lp64 = false;
-          break;
-        default:
-          codeType = [NSString stringWithFormat: @"Unknown (%d)", report.systemInfo.architecture];
-          lp64 = true;
-          break;
-      }
-    }
-#pragma GCC diagnostic pop
-  }
-  
-  {
-    NSString *reporterKey = @"???";
-    if (crashReporterKey && [crashReporterKey length] > 0)
-      reporterKey = crashReporterKey;
-    
-    NSString *hardwareModel = @"???";
-    if (report.hasMachineInfo && report.machineInfo.modelName != nil)
-      hardwareModel = report.machineInfo.modelName;
-    
-    NSString *incidentIdentifier = @"???";
-    if (report.uuidRef != NULL) {
-      incidentIdentifier = (NSString *) CFBridgingRelease(CFUUIDCreateString(NULL, report.uuidRef));
-    }
-    
-    [text appendFormat: @"Incident Identifier: %@\n", incidentIdentifier];
-    [text appendFormat: @"CrashReporter Key:   %@\n", reporterKey];
-    [text appendFormat: @"Hardware Model:      %@\n", hardwareModel];
-  }
-  
-  /* Application and process info */
-  {
-    NSString *unknownString = @"???";
-    
-    NSString *processName = unknownString;
-    NSString *processId = unknownString;
-    NSString *processPath = unknownString;
-    NSString *parentProcessName = unknownString;
-    NSString *parentProcessId = unknownString;
-    
-    /* Process information was not available in earlier crash report versions */
-    if (report.hasProcessInfo) {
-      /* Process Name */
-      if (report.processInfo.processName != nil)
-        processName = report.processInfo.processName;
-      
-      /* PID */
-      processId = [@(report.processInfo.processID) stringValue];
-      
-      /* Process Path */
-      if (report.processInfo.processPath != nil) {
-        processPath = report.processInfo.processPath;
-        
-        /* Remove username from the path */
-#if TARGET_OS_SIMULATOR
-        processPath = [self anonymizedPathFromPath:processPath];
-#endif
-      }
-      
-      /* Parent Process Name */
-      if (report.processInfo.parentProcessName != nil)
-        parentProcessName = report.processInfo.parentProcessName;
-      
-      /* Parent Process ID */
-      parentProcessId = [@(report.processInfo.parentProcessID) stringValue];
-    }
-    
-    [text appendFormat: @"Process:         %@ [%@]\n", processName, processId];
-    [text appendFormat: @"Path:            %@\n", processPath];
-    [text appendFormat: @"Identifier:      %@\n", report.applicationInfo.applicationIdentifier];
-
-    NSString *marketingVersion = report.applicationInfo.applicationMarketingVersion;
-    NSString *appVersion = report.applicationInfo.applicationVersion;
-    NSString *versionString = marketingVersion ? [NSString stringWithFormat:@"%@ (%@)", marketingVersion, appVersion] : appVersion;
-    
-    [text appendFormat: @"Version:         %@\n", versionString];
-    [text appendFormat: @"Code Type:       %@\n", codeType];
-    [text appendFormat: @"Parent Process:  %@ [%@]\n", parentProcessName, parentProcessId];
-  }
-  
-  [text appendString: @"\n"];
-  
-  NSString *xamarinTrace;
-  NSString *exceptionReason;
-  
-  /* System info */
-  {
-    NSString *osBuild = @"???";
-    if (report.systemInfo.operatingSystemBuild != nil)
-      osBuild = report.systemInfo.operatingSystemBuild;
-    
-    NSLocale *enUSPOSIXLocale = [[NSLocale alloc] initWithLocaleIdentifier:@"en_US_POSIX"];
-    NSDateFormatter *rfc3339Formatter = [[NSDateFormatter alloc] init];
-    [rfc3339Formatter setLocale:enUSPOSIXLocale];
-    [rfc3339Formatter setDateFormat:@"yyyy'-'MM'-'dd'T'HH':'mm':'ss'Z'"];
-    [rfc3339Formatter setTimeZone:[NSTimeZone timeZoneForSecondsFromGMT:0]];
-    
-    [text appendFormat: @"Date/Time:       %@\n", [rfc3339Formatter stringFromDate:report.systemInfo.timestamp]];
-    if ([report.processInfo respondsToSelector:@selector(processStartTime)]) {
-      if (report.systemInfo.timestamp && report.processInfo.processStartTime) {
-        [text appendFormat: @"Launch Time:     %@\n", [rfc3339Formatter stringFromDate:report.processInfo.processStartTime]];
-      }
-    }
-    [text appendFormat: @"OS Version:      %@ %@ (%@)\n", osName, report.systemInfo.operatingSystemVersion, osBuild];
-    
-    // Check if exception data contains xamarin stacktrace in order to determine report version
-    if (report.hasExceptionInfo) {
-      exceptionReason = report.exceptionInfo.exceptionReason;
-      NSInteger xamarinTracePosition = [exceptionReason rangeOfString:BITXamarinStackTraceDelimiter].location;
-      if (xamarinTracePosition != NSNotFound) {
-        xamarinTrace = [exceptionReason substringFromIndex:xamarinTracePosition];
-        xamarinTrace = [xamarinTrace stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceAndNewlineCharacterSet]];
-        xamarinTrace = [xamarinTrace stringByReplacingOccurrencesOfString:@"<---\n\n--->" withString:@"<---\n--->"];
-        exceptionReason = [exceptionReason substringToIndex:xamarinTracePosition];
-        exceptionReason = [exceptionReason stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceAndNewlineCharacterSet]];
-      }
-    }
-    NSString *reportVersion = (xamarinTrace) ? @"104-Xamarin" : @"104";
-    [text appendFormat: @"Report Version:  %@\n", reportVersion];
-  }
-  
-  [text appendString: @"\n"];
-  
-  /* Exception code */
-  [text appendFormat: @"Exception Type:  %@\n", report.signalInfo.name];
-  [text appendFormat: @"Exception Codes: %@ at 0x%" PRIx64 "\n", report.signalInfo.code, report.signalInfo.address];
-  
-  for (BITPLCrashReportThreadInfo *thread in report.threads) {
-    if (thread.crashed) {
-      [text appendFormat: @"Crashed Thread:  %ld\n", (long) thread.threadNumber];
-      break;
-    }
-  }
-  
-  [text appendString: @"\n"];
-  
-  BITPLCrashReportThreadInfo *crashed_thread = nil;
-  for (BITPLCrashReportThreadInfo *thread in report.threads) {
-    if (thread.crashed) {
-      crashed_thread = thread;
-      break;
-    }
-  }
-  
-  /* Uncaught Exception */
-  if (report.hasExceptionInfo) {
-    [text appendFormat: @"Application Specific Information:\n"];
-    [text appendFormat: @"*** Terminating app due to uncaught exception '%@', reason: '%@'\n",
-    report.exceptionInfo.exceptionName, exceptionReason];
-    [text appendString: @"\n"];
-    
-    /* Xamarin Exception */
-    if (xamarinTrace) {
-      [text appendFormat:@"%@\n", xamarinTrace];
-      [text appendString: @"\n"];
-    }
-    
-  } else if (crashed_thread != nil) {
-    // try to find the selector in case this was a crash in obj_msgSend
-    // we search this whether the crash happened in obj_msgSend or not since we don't have the symbol!
-    
-    NSString *foundSelector = nil;
-
-    // search the registers value for the current arch
-#if TARGET_OS_SIMULATOR
-    if (lp64) {
-      foundSelector = [[self class] selectorForRegisterWithName:@"rsi" ofThread:crashed_thread report:report];
-      if (foundSelector == NULL)
-        foundSelector = [[self class] selectorForRegisterWithName:@"rdx" ofThread:crashed_thread report:report];
-    } else {
-      foundSelector = [[self class] selectorForRegisterWithName:@"ecx" ofThread:crashed_thread report:report];
-    }
-#else
-    if (lp64) {
-      foundSelector = [[self class] selectorForRegisterWithName:@"x1" ofThread:crashed_thread report:report];
-    } else {
-      foundSelector = [[self class] selectorForRegisterWithName:@"r1" ofThread:crashed_thread report:report];
-      if (foundSelector == NULL)
-        foundSelector = [[self class] selectorForRegisterWithName:@"r2" ofThread:crashed_thread report:report];
-    }
-#endif
-    
-    if (foundSelector) {
-      [text appendFormat: @"Application Specific Information:\n"];
-      [text appendFormat: @"Selector name found in current argument registers: %@\n", foundSelector];
-      [text appendString: @"\n"];
-    }
-  }
-  
-  /* If an exception stack trace is available, output an Apple-compatible backtrace. */
-  if (report.exceptionInfo != nil && report.exceptionInfo.stackFrames != nil && [report.exceptionInfo.stackFrames count] > 0) {
-    BITPLCrashReportExceptionInfo *exception = report.exceptionInfo;
-    
-    /* Create the header. */
-    [text appendString: @"Last Exception Backtrace:\n"];
-    
-    /* Write out the frames. In raw reports, Apple writes this out as a simple list of PCs. In the minimally
-     * post-processed report, Apple writes this out as full frame entries. We use the latter format. */
-    for (NSUInteger frame_idx = 0; frame_idx < [exception.stackFrames count]; frame_idx++) {
-      BITPLCrashReportStackFrameInfo *frameInfo = exception.stackFrames[frame_idx];
-      [text appendString: [[self class] bit_formatStackFrame: frameInfo frameIndex: frame_idx report: report lp64: lp64]];
-    }
-    [text appendString: @"\n"];
-  }
-  
-  /* Threads */
-  NSInteger maxThreadNum = 0;
-  for (BITPLCrashReportThreadInfo *thread in report.threads) {
-    if (thread.crashed) {
-      [text appendFormat: @"Thread %ld Crashed:\n", (long) thread.threadNumber];
-    } else {
-      [text appendFormat: @"Thread %ld:\n", (long) thread.threadNumber];
-    }
-    for (NSUInteger frame_idx = 0; frame_idx < [thread.stackFrames count]; frame_idx++) {
-      BITPLCrashReportStackFrameInfo *frameInfo = thread.stackFrames[frame_idx];
-      [text appendString:[[self class] bit_formatStackFrame:frameInfo frameIndex:frame_idx report:report lp64:lp64]];
-    }
-    [text appendString: @"\n"];
-    
-    /* Track the highest thread number */
-    maxThreadNum = MAX(maxThreadNum, thread.threadNumber);
-  }
-  
-  /* Registers */
-  if (crashed_thread != nil) {
-    [text appendFormat: @"Thread %ld crashed with %@ Thread State:\n", (long) crashed_thread.threadNumber, codeType];
-    
-    int regColumn = 0;
-    for (BITPLCrashReportRegisterInfo *reg in crashed_thread.registers) {
-      NSString *reg_fmt;
-      
-      /* Use 32-bit or 64-bit fixed width format for the register values */
-      if (lp64)
-        reg_fmt = @"%6s: 0x%016" PRIx64 " ";
-      else
-        reg_fmt = @"%6s: 0x%08" PRIx64 " ";
-      
-      /* Remap register names to match Apple's crash reports */
-      NSString *regName = reg.registerName;
-      if (report.machineInfo != nil && report.machineInfo.processorInfo.typeEncoding == PLCrashReportProcessorTypeEncodingMach) {
-        BITPLCrashReportProcessorInfo *pinfo = report.machineInfo.processorInfo;
-        cpu_type_t arch_type = (cpu_type_t)(pinfo.type & ~CPU_ARCH_MASK);
-        
-        /* Apple uses 'ip' rather than 'r12' on ARM */
-        if (arch_type == CPU_TYPE_ARM && [regName isEqual: @"r12"]) {
-          regName = @"ip";
-        }
-      }
-      [text appendFormat: reg_fmt, [regName UTF8String], reg.registerValue];
-      
-      regColumn++;
-      if (regColumn == 4) {
-        [text appendString: @"\n"];
-        regColumn = 0;
-      }
-    }
-    
-    if (regColumn != 0)
-      [text appendString: @"\n"];
-    
-    [text appendString: @"\n"];
-  }
-  
-  /* Images. The iPhone crash report format sorts these in ascending order, by the base address */
-  [text appendString: @"Binary Images:\n"];
-  NSMutableArray *addedImagesBaseAddresses = @[].mutableCopy;
-  for (BITPLCrashReportBinaryImageInfo *imageInfo in [report.images sortedArrayUsingFunction: bit_binaryImageSort context: nil]) {
-    // Make sure we don't add duplicates
-    if ([addedImagesBaseAddresses containsObject:@(imageInfo.imageBaseAddress)]) {
-      continue;
-    } else {
-      [addedImagesBaseAddresses addObject:@(imageInfo.imageBaseAddress)];
-    }
-    
-    NSString *uuid;
-    /* Fetch the UUID if it exists */
-    if (imageInfo.hasImageUUID)
-      uuid = imageInfo.imageUUID;
-    else
-      uuid = @"???";
-    
-    /* Determine the architecture string */
-    NSString *archName = [[self class] bit_archNameFromImageInfo:imageInfo];
-    
-    /* Determine if this is the main executable or an app specific framework*/
-    NSString *binaryDesignator = @" ";
-    BITBinaryImageType imageType = [[self class] bit_imageTypeForImagePath:imageInfo.imageName
-                                                               processPath:report.processInfo.processPath];
-    if (imageType != BITBinaryImageTypeOther) {
-        binaryDesignator = @"+";
-    }
-    
-    /* base_address - terminating_address [designator]file_name arch <uuid> file_path */
-    NSString *fmt = nil;
-    if (lp64) {
-      fmt = @"%18#" PRIx64 " - %18#" PRIx64 " %@%@ %@  <%@> %@\n";
-    } else {
-      fmt = @"%10#" PRIx64 " - %10#" PRIx64 " %@%@ %@  <%@> %@\n";
-    }
-    
-    /* Remove username from the image path */
-    NSString *imageName = @"";
-    if (imageInfo.imageName && [imageInfo.imageName length] > 0) {
-#if TARGET_OS_SIMULATOR
-      imageName = [imageInfo.imageName stringByAbbreviatingWithTildeInPath];
-#else
-      imageName = imageInfo.imageName;
-#endif
-    }
-#if TARGET_OS_SIMULATOR
-    imageName = [self anonymizedPathFromPath:imageName];
-#endif
-    [text appendFormat: fmt,
-     imageInfo.imageBaseAddress,
-     imageInfo.imageBaseAddress + (MAX(1U, imageInfo.imageSize) - 1), // The Apple format uses an inclusive range
-     binaryDesignator,
-     [imageInfo.imageName lastPathComponent],
-     archName,
-     uuid,
-     imageName];
-  }
-  
-  
-  return text;
-}
-
-/**
- *  Return the selector string of a given register name
- *
- *  @param regName The name of the register to use for getting the address
- *  @param thread  The crashed thread
- *  @param report  The crash report.
- *
- *  @return The selector as a C string or NULL if no selector was found
- */
-+ (NSString *)selectorForRegisterWithName:(NSString *)regName ofThread:(BITPLCrashReportThreadInfo *)thread report:(BITPLCrashReport *)report {
-  // get the address for the register
-  uint64_t regAddress = 0;
-  
-  for (BITPLCrashReportRegisterInfo *reg in thread.registers) {
-    if ([reg.registerName isEqualToString:regName]) {
-      regAddress = reg.registerValue;
-      break;
-    }
-  }
-  
-  if (regAddress == 0)
-    return nil;
-  
-  BITPLCrashReportBinaryImageInfo *imageForRegAddress = [report imageForAddress:regAddress];
-  if (imageForRegAddress) {
-    // get the SEL
-    const char *foundSelector = findSEL([imageForRegAddress.imageName UTF8String], imageForRegAddress.imageUUID, regAddress - (uint64_t)imageForRegAddress.imageBaseAddress);
-    
-    if (foundSelector != NULL) {
-      return [NSString stringWithUTF8String:foundSelector];
-    }
-  }
-    
-  return nil;
-}
-
-
-/**
- * Returns an array of app UUIDs and their architecture
- * As a dictionary for each element
- *
- * @param report The report to format.
- *
- * @return Returns the formatted result on success, or nil if an error occurs.
- */
-+ (NSArray *)arrayOfAppUUIDsForCrashReport:(BITPLCrashReport *)report {
-	NSMutableArray* appUUIDs = [NSMutableArray array];
-  
-  /* Images. The iPhone crash report format sorts these in ascending order, by the base address */
-  for (BITPLCrashReportBinaryImageInfo *imageInfo in [report.images sortedArrayUsingFunction: bit_binaryImageSort context: nil]) {
-    NSString *uuid;
-    /* Fetch the UUID if it exists */
-    uuid = imageInfo.hasImageUUID ? imageInfo.imageUUID : @"???";
-    
-    /* Determine the architecture string */
-    NSString *archName = [[self class] bit_archNameFromImageInfo:imageInfo];
-
-    /* Determine if this is the app executable or app specific framework */
-    BITBinaryImageType imageType = [[self class] bit_imageTypeForImagePath:imageInfo.imageName
-                                                               processPath:report.processInfo.processPath];
-    if (imageType != BITBinaryImageTypeOther) {
-      NSString *imageTypeString;
-
-      if (imageType == BITBinaryImageTypeAppBinary) {
-        imageTypeString = @"app";
-      } else {
-        imageTypeString = @"framework";
-      }
-      
-      [appUUIDs addObject:@{kBITBinaryImageKeyUUID: uuid,
-                            kBITBinaryImageKeyArch: archName,
-                            kBITBinaryImageKeyType: imageTypeString}
-       ];
-    }
-  }
-  
-  return appUUIDs;
-}
-
-/* Determine if in binary image is the app executable or app specific framework */
-+ (BITBinaryImageType)bit_imageTypeForImagePath:(NSString *)imagePath processPath:(NSString *)processPath {
-  if (!imagePath || !processPath) {
-    return BITBinaryImageTypeOther;
-  }
-  BITBinaryImageType imageType = BITBinaryImageTypeOther;
-  
-  NSString *standardizedImagePath = [[imagePath stringByStandardizingPath] lowercaseString];
-  NSString *lowercaseImagePath = [imagePath lowercaseString];
-  NSString *lowercaseProcessPath = [processPath lowercaseString];
-  
-  NSRange appRange = [standardizedImagePath rangeOfString: @".app/"];
-  
-  // Exclude iOS swift dylibs. These are provided as part of the app binary by Xcode for now, but we never get a dSYM for those.
-  NSRange swiftLibRange = [standardizedImagePath rangeOfString:@"frameworks/libswift"];
-  BOOL dylibSuffix = [standardizedImagePath hasSuffix:@".dylib"];
-  
-  if (appRange.location != NSNotFound && !(swiftLibRange.location != NSNotFound && dylibSuffix)) {
-    NSString *appBundleContentsPath = [standardizedImagePath substringToIndex:appRange.location + 5];
-    
-    if ([standardizedImagePath isEqual: lowercaseProcessPath] ||
-        // Fix issue with iOS 8 `stringByStandardizingPath` removing leading `/private` path (when not running in the debugger or simulator only)
-        [lowercaseImagePath hasPrefix:lowercaseProcessPath]) {
-      imageType = BITBinaryImageTypeAppBinary;
-    } else if ([standardizedImagePath hasPrefix:appBundleContentsPath] ||
-                // Fix issue with iOS 8 `stringByStandardizingPath` removing leading `/private` path (when not running in the debugger or simulator only)
-               [lowercaseImagePath hasPrefix:appBundleContentsPath]) {
-      imageType = BITBinaryImageTypeAppFramework;
-    }
-  }
-  
-  return imageType;
-}
-
-+ (NSString *)bit_archNameFromImageInfo:(BITPLCrashReportBinaryImageInfo *)imageInfo
-{
-  NSString *archName = @"???";
-  if (imageInfo.codeType != nil && imageInfo.codeType.typeEncoding == PLCrashReportProcessorTypeEncodingMach) {
-    archName = [BITCrashReportTextFormatter bit_archNameFromCPUType:imageInfo.codeType.type subType:imageInfo.codeType.subtype];
-  }
-  
-  return archName;
-}
-
-+ (NSString *)bit_archNameFromCPUType:(uint64_t)cpuType subType:(uint64_t)subType {
-  NSString *archName = @"???";
-  switch (cpuType) {
-    case CPU_TYPE_ARM:
-      /* Apple includes subtype for ARM binaries. */
-      switch (subType) {
-        case CPU_SUBTYPE_ARM_V6:
-          archName = @"armv6";
-          break;
-          
-        case CPU_SUBTYPE_ARM_V7:
-          archName = @"armv7";
-          break;
-          
-        case CPU_SUBTYPE_ARM_V7S:
-          archName = @"armv7s";
-          break;
-          
-        default:
-          archName = @"arm-unknown";
-          break;
-      }
-      break;
-      
-    case CPU_TYPE_ARM64:
-      /* Apple includes subtype for ARM64 binaries. */
-      switch (subType) {
-        case CPU_SUBTYPE_ARM_ALL:
-          archName = @"arm64";
-          break;
-          
-        case CPU_SUBTYPE_ARM_V8:
-          archName = @"arm64";
-          break;
-          
-        default:
-          archName = @"arm64-unknown";
-          break;
-      }
-      break;
-      
-    case CPU_TYPE_X86:
-      archName = @"i386";
-      break;
-      
-    case CPU_TYPE_X86_64:
-      archName = @"x86_64";
-      break;
-      
-    case CPU_TYPE_POWERPC:
-      archName = @"powerpc";
-      break;
-      
-    default:
-      // Use the default archName value (initialized above).
-      break;
-  }
-
-  return archName;
-}
-
-
-/**
- * Format a stack frame for display in a thread backtrace.
- *
- * @param frameInfo The stack frame to format
- * @param frameIndex The frame's index
- * @param report The report from which this frame was acquired.
- * @param lp64 If YES, the report was generated by an LP64 system.
- *
- * @return Returns a formatted frame line.
- */
-+ (NSString *)bit_formatStackFrame: (BITPLCrashReportStackFrameInfo *) frameInfo
-                        frameIndex: (NSUInteger) frameIndex
-                            report: (BITPLCrashReport *) report
-                              lp64: (boolean_t) lp64
-{
-  /* Base image address containing instrumentation pointer, offset of the IP from that base
-   * address, and the associated image name */
-  uint64_t baseAddress = 0x0;
-  uint64_t pcOffset = 0x0;
-  NSString *imageName = @"\?\?\?";
-  NSString *symbolString = nil;
-  
-  BITPLCrashReportBinaryImageInfo *imageInfo = [report imageForAddress: frameInfo.instructionPointer];
-  if (imageInfo != nil) {
-    imageName = [imageInfo.imageName lastPathComponent];
-    baseAddress = imageInfo.imageBaseAddress;
-    pcOffset = frameInfo.instructionPointer - imageInfo.imageBaseAddress;
-  }
-  
-  /* Make sure UTF8/16 characters are handled correctly */
-  NSInteger offset = 0;
-  NSUInteger index = 0;
-  for (index = 0; index < [imageName length]; index++) {
-    NSRange range = [imageName rangeOfComposedCharacterSequenceAtIndex:index];
-    if (range.length > 1) {
-      offset += range.length - 1;
-      index += range.length - 1;
-    }
-    if (index > 32) {
-      imageName = [NSString stringWithFormat:@"%@... ", [imageName substringToIndex:index - 1]];
-      index += 3;
-      break;
-    }
-  }
-  if (index-offset < 36) {
-    imageName = [imageName stringByPaddingToLength:(NSUInteger)(36 + offset) withString:@" " startingAtIndex:0];
-  }
-  
-  /* If symbol info is available, the format used in Apple's reports is Sym + OffsetFromSym. Otherwise,
-   * the format used is imageBaseAddress + offsetToIP */
-  BITBinaryImageType imageType = [[self class] bit_imageTypeForImagePath:imageInfo.imageName
-                                                             processPath:report.processInfo.processPath];
-  if (frameInfo.symbolInfo != nil && imageType == BITBinaryImageTypeOther) {
-    NSString *symbolName = frameInfo.symbolInfo.symbolName;
-    
-    /* Apple strips the _ symbol prefix in their reports. Only OS X makes use of an
-     * underscore symbol prefix by default. */
-    if ([symbolName rangeOfString: @"_"].location == 0 && [symbolName length] > 1) {
-      switch (report.systemInfo.operatingSystem) {
-        case PLCrashReportOperatingSystemMacOSX:
-        case PLCrashReportOperatingSystemiPhoneOS:
-        case PLCrashReportOperatingSystemiPhoneSimulator:
-          symbolName = [symbolName substringFromIndex: 1];
-          break;
-          
-        default:
-          BITHockeyLogDebug(@"Symbol prefix rules are unknown for this OS!");
-          break;
-      }
-    }
-    
-    
-    uint64_t symOffset = frameInfo.instructionPointer - frameInfo.symbolInfo.startAddress;
-    symbolString = [NSString stringWithFormat: @"%@ + %" PRId64, symbolName, symOffset];
-  } else {
-    symbolString = [NSString stringWithFormat: @"0x%" PRIx64 " + %" PRId64, baseAddress, pcOffset];
-  }
-  
-  /* Note that width specifiers are ignored for %@, but work for C strings.
-   * UTF-8 is not correctly handled with %s (it depends on the system encoding), but
-   * UTF-16 is supported via %S, so we use it here */
-  return [NSString stringWithFormat: @"%-4ld%-35S 0x%0*" PRIx64 " %@\n",
-          (long) frameIndex,
-          (const uint16_t *)[imageName cStringUsingEncoding: NSUTF16StringEncoding],
-          lp64 ? 16 : 8, frameInfo.instructionPointer,
-          symbolString];
-}
-
-/**
- *  Remove the user's name from a crash's process path.
- *  This is only necessary when sending crashes from the simulator as the path
- *  then contains the username of the Mac the simulator is running on.
- *
- *  @param path A string containing the username.
- *
- *  @return An anonymized string where the real username is replaced by "USER"
- */
-+ (NSString *)anonymizedPathFromPath:(NSString *)path {
-  
-  NSString *anonymizedProcessPath = [NSString string];
-  
-  if (([path length] > 0) && [path hasPrefix:@"/Users/"]) {
-    NSError *error = nil;
-    NSRegularExpression *regex = [NSRegularExpression regularExpressionWithPattern:@"(/Users/[^/]+/)" options:0 error:&error];
-    anonymizedProcessPath = [regex stringByReplacingMatchesInString:path options:0 range:NSMakeRange(0, [path length]) withTemplate:@"/Users/USER/"];
-    if (error) {
-      BITHockeyLogError(@"ERROR: String replacing failed - %@", error.localizedDescription);
-    }
-  }
-  else if(([path length] > 0) && (![path containsString:@"Users"])) {
-    return path;
-  }
-  return anonymizedProcessPath;
-}
-
-@end
-
-#endif /* HOCKEYSDK_FEATURE_CRASH_REPORTER */
diff --git a/submodules/HockeySDK-iOS/Classes/BITCrashReportTextFormatterPrivate.h b/submodules/HockeySDK-iOS/Classes/BITCrashReportTextFormatterPrivate.h
deleted file mode 100644
index 5b53c4f231..0000000000
--- a/submodules/HockeySDK-iOS/Classes/BITCrashReportTextFormatterPrivate.h
+++ /dev/null
@@ -1,20 +0,0 @@
-//
-//  BITCrashReportTextFormatterPrivate.h
-//  HockeySDK
-//
-//  Created by Lukas Spieß on 27/01/16.
-//
-//
-
-#import "BITCrashReportTextFormatter.h"
-
-#ifndef BITCrashReportTextFormatterPrivate_h
-#define BITCrashReportTextFormatterPrivate_h
-
-@interface BITCrashReportTextFormatter ()
-
-+ (NSString *)anonymizedPathFromPath:(NSString *)path;
-
-@end
-
-#endif /* BITCrashReportTextFormatterPrivate_h */
diff --git a/submodules/HockeySDK-iOS/Classes/BITData.h b/submodules/HockeySDK-iOS/Classes/BITData.h
deleted file mode 100644
index 05147d6b95..0000000000
--- a/submodules/HockeySDK-iOS/Classes/BITData.h
+++ /dev/null
@@ -1,13 +0,0 @@
-#import "BITBase.h"
-@class BITTelemetryData;
-
-@interface BITData : BITBase <NSCoding>
-
-@property (nonatomic, strong) BITTelemetryData *baseData;
-
-- (instancetype)initWithCoder:(NSCoder *)coder;
-
-- (void)encodeWithCoder:(NSCoder *)coder;
-
-
-@end
diff --git a/submodules/HockeySDK-iOS/Classes/BITData.m b/submodules/HockeySDK-iOS/Classes/BITData.m
deleted file mode 100644
index 958e6ac9aa..0000000000
--- a/submodules/HockeySDK-iOS/Classes/BITData.m
+++ /dev/null
@@ -1,39 +0,0 @@
-#import "BITData.h"
-#import "BITHockeyLogger.h"
-
-/// Data contract class for type Data.
-@implementation BITData
-
-///
-/// Adds all members of this class to a dictionary
-/// @returns dictionary to which the members of this class will be added.
-///
-- (NSDictionary *)serializeToDictionary {
-    NSMutableDictionary *dict = [super serializeToDictionary].mutableCopy;
-    NSDictionary *baseDataDict = [self.baseData serializeToDictionary];
-    if ([NSJSONSerialization isValidJSONObject:baseDataDict]) {
-        [dict setObject:baseDataDict forKey:@"baseData"];
-    } else {
-        BITHockeyLogError(@"[HockeySDK] Some of the telemetry data was not NSJSONSerialization compatible and could not be serialized!");
-    }
-    return dict;
-}
-
-#pragma mark - NSCoding
-
-- (instancetype)initWithCoder:(NSCoder *)coder {
-  self = [super initWithCoder:coder];
-  if(self) {
-    _baseData = [coder decodeObjectForKey:@"self.baseData"];
-  }
-
-  return self;
-}
-
-- (void)encodeWithCoder:(NSCoder *)coder {
-  [super encodeWithCoder:coder];
-  [coder encodeObject:self.baseData forKey:@"self.baseData"];
-}
-
-
-@end
diff --git a/submodules/HockeySDK-iOS/Classes/BITDevice.h b/submodules/HockeySDK-iOS/Classes/BITDevice.h
deleted file mode 100755
index 95fa4d52af..0000000000
--- a/submodules/HockeySDK-iOS/Classes/BITDevice.h
+++ /dev/null
@@ -1,27 +0,0 @@
-#import "BITTelemetryObject.h"
-
-@interface BITDevice : BITTelemetryObject <NSCoding>
-
-@property (nonatomic, copy) NSString *deviceId;
-@property (nonatomic, copy) NSString *ip;
-@property (nonatomic, copy) NSString *language;
-@property (nonatomic, copy) NSString *locale;
-@property (nonatomic, copy) NSString *machineName;
-@property (nonatomic, copy) NSString *model;
-@property (nonatomic, copy) NSString *network;
-@property (nonatomic, copy) NSString *networkName;
-@property (nonatomic, copy) NSString *oemName;
-@property (nonatomic, copy) NSString *os;
-@property (nonatomic, copy) NSString *osVersion;
-@property (nonatomic, copy) NSString *roleInstance;
-@property (nonatomic, copy) NSString *roleName;
-@property (nonatomic, copy) NSString *screenResolution;
-@property (nonatomic, copy) NSString *type;
-@property (nonatomic, copy) NSString *vmName;
-
-- (instancetype)initWithCoder:(NSCoder *)coder;
-
-- (void)encodeWithCoder:(NSCoder *)coder;
-
-
-@end
diff --git a/submodules/HockeySDK-iOS/Classes/BITDevice.m b/submodules/HockeySDK-iOS/Classes/BITDevice.m
deleted file mode 100755
index 54eb987a74..0000000000
--- a/submodules/HockeySDK-iOS/Classes/BITDevice.m
+++ /dev/null
@@ -1,110 +0,0 @@
-#import "BITDevice.h"
-
-/// Data contract class for type Device.
-@implementation BITDevice
-
-///
-/// Adds all members of this class to a dictionary
-/// @returns dictionary to which the members of this class will be added.
-///
-- (NSDictionary *)serializeToDictionary {
-    NSMutableDictionary *dict = [super serializeToDictionary].mutableCopy;
-    if (self.deviceId != nil) {
-        [dict setObject:self.deviceId forKey:@"ai.device.id"];
-    }
-    if (self.ip != nil) {
-        [dict setObject:self.ip forKey:@"ai.device.ip"];
-    }
-    if (self.language != nil) {
-        [dict setObject:self.language forKey:@"ai.device.language"];
-    }
-    if (self.locale != nil) {
-        [dict setObject:self.locale forKey:@"ai.device.locale"];
-    }
-    if (self.model != nil) {
-        [dict setObject:self.model forKey:@"ai.device.model"];
-    }
-    if (self.network != nil) {
-        [dict setObject:self.network forKey:@"ai.device.network"];
-    }
-    if(self.networkName != nil) {
-        [dict setObject:self.networkName forKey:@"ai.device.networkName"];
-    }
-    if (self.oemName != nil) {
-        [dict setObject:self.oemName forKey:@"ai.device.oemName"];
-    }
-    if (self.os != nil) {
-        [dict setObject:self.os forKey:@"ai.device.os"];
-    }
-    if (self.osVersion != nil) {
-        [dict setObject:self.osVersion forKey:@"ai.device.osVersion"];
-    }
-    if (self.roleInstance != nil) {
-        [dict setObject:self.roleInstance forKey:@"ai.device.roleInstance"];
-    }
-    if (self.roleName != nil) {
-        [dict setObject:self.roleName forKey:@"ai.device.roleName"];
-    }
-    if (self.screenResolution != nil) {
-        [dict setObject:self.screenResolution forKey:@"ai.device.screenResolution"];
-    }
-    if (self.type != nil) {
-        [dict setObject:self.type forKey:@"ai.device.type"];
-    }
-    if (self.machineName != nil) {
-        [dict setObject:self.machineName forKey:@"ai.device.machineName"];
-    }
-    if(self.vmName != nil) {
-        [dict setObject:self.vmName forKey:@"ai.device.vmName"];
-    }
-  return dict;
-}
-
-#pragma mark - NSCoding
-
-- (instancetype)initWithCoder:(NSCoder *)coder {
-  self = [super init];
-  if(self) {
-    _deviceId = [coder decodeObjectForKey:@"self.deviceId"];
-    _ip = [coder decodeObjectForKey:@"self.ip"];
-    _language = [coder decodeObjectForKey:@"self.language"];
-    _locale = [coder decodeObjectForKey:@"self.locale"];
-    _model = [coder decodeObjectForKey:@"self.model"];
-    _network = [coder decodeObjectForKey:@"self.network"];
-    _oemName = [coder decodeObjectForKey:@"self.oemName"];
-    _os = [coder decodeObjectForKey:@"self.os"];
-    _osVersion = [coder decodeObjectForKey:@"self.osVersion"];
-    _roleInstance = [coder decodeObjectForKey:@"self.roleInstance"];
-    _roleName = [coder decodeObjectForKey:@"self.roleName"];
-    _screenResolution = [coder decodeObjectForKey:@"self.screenResolution"];
-    _type = [coder decodeObjectForKey:@"self.type"];
-    _machineName = [coder decodeObjectForKey:@"self.machineName"];
-    _networkName = [coder decodeObjectForKey:@"self.networkName"];
-    _vmName = [coder decodeObjectForKey:@"self.vmName"];
-  }
-
-  return self;
-}
-
-- (void)encodeWithCoder:(NSCoder *)coder {
-  [super encodeWithCoder:coder];
-  [coder encodeObject:self.deviceId forKey:@"self.deviceId"];
-  [coder encodeObject:self.ip forKey:@"self.ip"];
-  [coder encodeObject:self.language forKey:@"self.language"];
-  [coder encodeObject:self.locale forKey:@"self.locale"];
-  [coder encodeObject:self.model forKey:@"self.model"];
-  [coder encodeObject:self.network forKey:@"self.network"];
-  [coder encodeObject:self.networkName forKey:@"self.networkName"];
-  [coder encodeObject:self.oemName forKey:@"self.oemName"];
-  [coder encodeObject:self.os forKey:@"self.os"];
-  [coder encodeObject:self.osVersion forKey:@"self.osVersion"];
-  [coder encodeObject:self.roleInstance forKey:@"self.roleInstance"];
-  [coder encodeObject:self.roleName forKey:@"self.roleName"];
-  [coder encodeObject:self.screenResolution forKey:@"self.screenResolution"];
-  [coder encodeObject:self.type forKey:@"self.type"];
-  [coder encodeObject:self.machineName forKey:@"self.machineName"];
-  [coder encodeObject:self.vmName forKey:@"self.vmName"];
-}
-
-
-@end
diff --git a/submodules/HockeySDK-iOS/Classes/BITDomain.h b/submodules/HockeySDK-iOS/Classes/BITDomain.h
deleted file mode 100644
index c20cd5a71f..0000000000
--- a/submodules/HockeySDK-iOS/Classes/BITDomain.h
+++ /dev/null
@@ -1,5 +0,0 @@
-#import "BITTelemetryData.h"
-
-@interface BITDomain : BITTelemetryData <NSCoding>
-
-@end
diff --git a/submodules/HockeySDK-iOS/Classes/BITDomain.m b/submodules/HockeySDK-iOS/Classes/BITDomain.m
deleted file mode 100644
index d1d743af04..0000000000
--- a/submodules/HockeySDK-iOS/Classes/BITDomain.m
+++ /dev/null
@@ -1,45 +0,0 @@
-#import "BITDomain.h"
-/// Data contract class for type Domain.
-@implementation BITDomain
-@synthesize envelopeTypeName = _envelopeTypeName;
-@synthesize dataTypeName = _dataTypeName;
-@synthesize properties = _properties;
-
-/// Initializes a new instance of the class.
-- (instancetype)init {
-    if ((self = [super init])) {
-        _envelopeTypeName = @"Microsoft.ApplicationInsights.Domain";
-        _dataTypeName = @"Domain";
-    }
-    return self;
-}
-
-///
-/// Adds all members of this class to a dictionary
-/// @returns dictionary to which the members of this class will be added.
-///
-- (NSDictionary *)serializeToDictionary {
-    NSMutableDictionary *dict = [super serializeToDictionary].mutableCopy;
-    return dict;
-}
-
-#pragma mark - NSCoding
-
-- (instancetype)initWithCoder:(NSCoder *)coder {
-  self = [super initWithCoder:coder];
-  if(self) {
-    _envelopeTypeName = (NSString *)[coder decodeObjectForKey:@"_envelopeTypeName"];
-    _dataTypeName = (NSString *)[coder decodeObjectForKey:@"_dataTypeName"];
-  }
-
-  return self;
-}
-
-- (void)encodeWithCoder:(NSCoder *)coder {
-  [super encodeWithCoder:coder];
-  [coder encodeObject:self.envelopeTypeName forKey:@"_envelopeTypeName"];
-  [coder encodeObject:self.dataTypeName forKey:@"_dataTypeName"];
-}
-
-
-@end
diff --git a/submodules/HockeySDK-iOS/Classes/BITEnvelope.h b/submodules/HockeySDK-iOS/Classes/BITEnvelope.h
deleted file mode 100644
index 5237132215..0000000000
--- a/submodules/HockeySDK-iOS/Classes/BITEnvelope.h
+++ /dev/null
@@ -1,23 +0,0 @@
-#import "BITTelemetryObject.h"
-@class BITBase;
-
-@interface BITEnvelope : BITTelemetryObject <NSCoding>
-
-@property (nonatomic, copy) NSNumber *version;
-@property (nonatomic, copy) NSString *name;
-@property (nonatomic, copy) NSString *time;
-@property (nonatomic, copy) NSNumber *sampleRate;
-@property (nonatomic, copy) NSString *seq;
-@property (nonatomic, copy) NSString *iKey;
-@property (nonatomic, copy) NSNumber *flags;
-@property (nonatomic, copy) NSString *deviceId;
-@property (nonatomic, copy) NSString *os;
-@property (nonatomic, copy) NSString *osVer;
-@property (nonatomic, copy) NSString *appId;
-@property (nonatomic, copy) NSString *appVer;
-@property (nonatomic, copy) NSString *userId;
-@property (nonatomic, strong) NSDictionary *tags;
-@property (nonatomic, strong) BITBase *data;
-
-
-@end
diff --git a/submodules/HockeySDK-iOS/Classes/BITEnvelope.m b/submodules/HockeySDK-iOS/Classes/BITEnvelope.m
deleted file mode 100644
index b833f58f89..0000000000
--- a/submodules/HockeySDK-iOS/Classes/BITEnvelope.m
+++ /dev/null
@@ -1,120 +0,0 @@
-#import "BITEnvelope.h"
-#import "BITData.h"
-#import "BITHockeyLogger.h"
-
-/// Data contract class for type Envelope.
-@implementation BITEnvelope
-
-/// Initializes a new instance of the class.
-- (instancetype)init {
-  if((self = [super init])) {
-    _version = @1;
-    _sampleRate = @100.0;
-    _tags = [NSDictionary dictionary];
-  }
-  return self;
-}
-
-///
-/// Adds all members of this class to a dictionary
-/// @returns dictionary to which the members of this class will be added.
-///
-- (NSDictionary *)serializeToDictionary {
-  NSMutableDictionary *dict = [super serializeToDictionary].mutableCopy;
-  if(self.version != nil) {
-    [dict setObject:self.version forKey:@"ver"];
-  }
-  if(self.name != nil) {
-    [dict setObject:self.name forKey:@"name"];
-  }
-  if(self.time != nil) {
-    [dict setObject:self.time forKey:@"time"];
-  }
-  if(self.sampleRate != nil) {
-    [dict setObject:self.sampleRate forKey:@"sampleRate"];
-  }
-  if(self.seq != nil) {
-    [dict setObject:self.seq forKey:@"seq"];
-  }
-  if(self.iKey != nil) {
-    [dict setObject:self.iKey forKey:@"iKey"];
-  }
-  if(self.flags != nil) {
-    [dict setObject:self.flags forKey:@"flags"];
-  }
-  if(self.deviceId != nil) {
-    [dict setObject:self.deviceId forKey:@"deviceId"];
-  }
-  if(self.os != nil) {
-    [dict setObject:self.os forKey:@"os"];
-  }
-  if(self.osVer != nil) {
-    [dict setObject:self.osVer forKey:@"osVer"];
-  }
-  if(self.appId != nil) {
-    [dict setObject:self.appId forKey:@"appId"];
-  }
-  if(self.appVer != nil) {
-    [dict setObject:self.appVer forKey:@"appVer"];
-  }
-  if(self.userId != nil) {
-    [dict setObject:self.userId forKey:@"userId"];
-  }
-  if(self.tags != nil) {
-    [dict setObject:self.tags forKey:@"tags"];
-  }
-    
-  NSDictionary *dataDict = [self.data serializeToDictionary];
-  if ([NSJSONSerialization isValidJSONObject:dataDict]) {
-    [dict setObject:dataDict forKey:@"data"];
-  } else {
-    BITHockeyLogError(@"[HockeySDK] Some of the telemetry data was not NSJSONSerialization compatible and could not be serialized!");
-  }
-  return dict;
-}
-
-#pragma mark - NSCoding
-
-- (instancetype)initWithCoder:(NSCoder *)coder {
-  self = [super init];
-  if(self) {
-    _version = [coder decodeObjectForKey:@"self.version"];
-    _name = [coder decodeObjectForKey:@"self.name"];
-    _time = [coder decodeObjectForKey:@"self.time"];
-    _sampleRate = [coder decodeObjectForKey:@"self.sampleRate"];
-    _seq = [coder decodeObjectForKey:@"self.seq"];
-    _iKey = [coder decodeObjectForKey:@"self.iKey"];
-    _flags = [coder decodeObjectForKey:@"self.flags"];
-    _deviceId = [coder decodeObjectForKey:@"self.deviceId"];
-    _os = [coder decodeObjectForKey:@"self.os"];
-    _osVer = [coder decodeObjectForKey:@"self.osVer"];
-    _appId = [coder decodeObjectForKey:@"self.appId"];
-    _appVer = [coder decodeObjectForKey:@"self.appVer"];
-    _userId = [coder decodeObjectForKey:@"self.userId"];
-    _tags = [coder decodeObjectForKey:@"self.tags"];
-    _data = [coder decodeObjectForKey:@"self.data"];
-  }
-
-  return self;
-}
-
-- (void)encodeWithCoder:(NSCoder *)coder {
-  [coder encodeObject:self.version forKey:@"self.version"];
-  [coder encodeObject:self.name forKey:@"self.name"];
-  [coder encodeObject:self.time forKey:@"self.time"];
-  [coder encodeObject:self.sampleRate forKey:@"self.sampleRate"];
-  [coder encodeObject:self.seq forKey:@"self.seq"];
-  [coder encodeObject:self.iKey forKey:@"self.iKey"];
-  [coder encodeObject:self.flags forKey:@"self.flags"];
-  [coder encodeObject:self.deviceId forKey:@"self.deviceId"];
-  [coder encodeObject:self.os forKey:@"self.os"];
-  [coder encodeObject:self.osVer forKey:@"self.osVer"];
-  [coder encodeObject:self.appId forKey:@"self.appId"];
-  [coder encodeObject:self.appVer forKey:@"self.appVer"];
-  [coder encodeObject:self.userId forKey:@"self.userId"];
-  [coder encodeObject:self.tags forKey:@"self.tags"];
-  [coder encodeObject:self.data forKey:@"self.data"];
-}
-
-
-@end
diff --git a/submodules/HockeySDK-iOS/Classes/BITEventData.h b/submodules/HockeySDK-iOS/Classes/BITEventData.h
deleted file mode 100644
index 50bb133330..0000000000
--- a/submodules/HockeySDK-iOS/Classes/BITEventData.h
+++ /dev/null
@@ -1,9 +0,0 @@
-#import "BITDomain.h"
-
-@interface BITEventData : BITDomain <NSCoding>
-
-@property (nonatomic, copy, readonly) NSString *envelopeTypeName;
-@property (nonatomic, copy, readonly) NSString *dataTypeName;
-@property (nonatomic, strong) NSDictionary *measurements;
-
-@end
diff --git a/submodules/HockeySDK-iOS/Classes/BITEventData.m b/submodules/HockeySDK-iOS/Classes/BITEventData.m
deleted file mode 100644
index b5ef6f07c9..0000000000
--- a/submodules/HockeySDK-iOS/Classes/BITEventData.m
+++ /dev/null
@@ -1,66 +0,0 @@
-#import "BITEventData.h"
-
-/// Data contract class for type EventData.
-@implementation BITEventData
-@synthesize envelopeTypeName = _envelopeTypeName;
-@synthesize dataTypeName = _dataTypeName;
-@synthesize version = _version;
-@synthesize properties = _properties;
-@synthesize measurements = _measurements;
-
-/// Initializes a new instance of the class.
-- (instancetype)init {
-  if ((self = [super init])) {
-    _envelopeTypeName = @"Microsoft.ApplicationInsights.Event";
-    _dataTypeName = @"EventData";
-    _version = @2;
-    _properties = [NSDictionary new];
-    _measurements = [NSDictionary new];
-  }
-  return self;
-}
-
-///
-/// Adds all members of this class to a dictionary
-/// @returns dictionary to which the members of this class will be added.
-///
-- (NSDictionary *)serializeToDictionary {
-  NSMutableDictionary *dict = [super serializeToDictionary].mutableCopy;
-  if (self.name != nil) {
-    [dict setObject:self.name forKey:@"name"];
-  }
-  if (self.properties !=nil) {
-    [dict setObject:self.properties forKey:@"properties"];
-  }
-  if (self.measurements) {
-    [dict setObject:self.measurements forKey:@"measurements"];
-  }
-  
-  return dict;
-}
-
-#pragma mark - NSCoding
-
-- (instancetype)initWithCoder:(NSCoder *)coder {
-  self = [super initWithCoder:coder];
-  if(self) {
-    _envelopeTypeName = [coder decodeObjectForKey:@"self.envelopeTypeName"];
-    _dataTypeName = [coder decodeObjectForKey:@"self.dataTypeName"];
-    _version = (NSNumber *)[coder decodeObjectForKey:@"self.version"];
-    _properties = (NSDictionary *)[coder decodeObjectForKey:@"self.properties"];
-    _measurements = [coder decodeObjectForKey:@"self.measurements"];
-  }
-  return self;
-}
-
-- (void)encodeWithCoder:(NSCoder *)coder {
-  [super encodeWithCoder:coder];
-  [coder encodeObject:self.envelopeTypeName forKey:@"self.envelopeTypeName"];
-  [coder encodeObject:self.dataTypeName forKey:@"self.dataTypeName"];
-  [coder encodeObject:self.version forKey:@"self.version"];
-  [coder encodeObject:self.properties forKey:@"self.properties"];
-  [coder encodeObject:self.measurements forKey:@"self.measurements"];
-}
-
-
-@end
diff --git a/submodules/HockeySDK-iOS/Classes/BITFeedbackActivity.h b/submodules/HockeySDK-iOS/Classes/BITFeedbackActivity.h
deleted file mode 100644
index 44c08a985c..0000000000
--- a/submodules/HockeySDK-iOS/Classes/BITFeedbackActivity.h
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- * Author: Andreas Linde <mail@andreaslinde.de>
- *
- * Copyright (c) 2012-2014 HockeyApp, Bit Stadium GmbH.
- * All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person
- * obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without
- * restriction, including without limitation the rights to use,
- * copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following
- * conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
- * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#import <UIKit/UIKit.h>
-
-#import "BITFeedbackComposeViewControllerDelegate.h"
-
-/**
- UIActivity subclass allowing to use the feedback interface to share content with the developer
-
- This activity can be added into an UIActivityViewController and it will use the activity data
- objects to prefill the content of `BITFeedbackComposeViewController`.
- 
- This can be useful if you present some data that users can not only share but also
- report back to the developer because they have some problems, e.g. webcams not working
- any more.
- 
- The activity provide a default title and image that can be further customized
- via `customActivityImage` and `customActivityTitle`.
-
- */
-
-@interface BITFeedbackActivity : UIActivity <BITFeedbackComposeViewControllerDelegate>
-
-///-----------------------------------------------------------------------------
-/// @name BITFeedbackActivity customisation
-///-----------------------------------------------------------------------------
-
-
-/**
- Define the image shown when using `BITFeedbackActivity`
- 
- If not set a default icon is being used.
- 
- @see customActivityTitle
- */
-@property (nonatomic, strong) UIImage *customActivityImage;
-
-
-/**
- Define the title shown when using `BITFeedbackActivity`
- 
- If not set, a default string is shown by using the apps name
- and adding the localized string "Feedback" to it.
- 
- @see customActivityImage
- */
-@property (nonatomic, copy) NSString *customActivityTitle;
-
-@end
diff --git a/submodules/HockeySDK-iOS/Classes/BITFeedbackActivity.m b/submodules/HockeySDK-iOS/Classes/BITFeedbackActivity.m
deleted file mode 100644
index 08e1775062..0000000000
--- a/submodules/HockeySDK-iOS/Classes/BITFeedbackActivity.m
+++ /dev/null
@@ -1,150 +0,0 @@
-/*
- * Author: Andreas Linde <mail@andreaslinde.de>
- *
- * Copyright (c) 2012-2014 HockeyApp, Bit Stadium GmbH.
- * All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person
- * obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without
- * restriction, including without limitation the rights to use,
- * copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following
- * conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
- * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#import "HockeySDK.h"
-
-#if HOCKEYSDK_FEATURE_FEEDBACK
-
-#import "HockeySDKPrivate.h"
-
-#import "BITFeedbackActivity.h"
-
-#import "BITHockeyHelper.h"
-#import "BITFeedbackManagerPrivate.h"
-
-#import "BITHockeyBaseManagerPrivate.h"
-#import "BITHockeyAttachment.h"
-
-
-@interface BITFeedbackActivity()
-
-@property (nonatomic, strong) NSMutableArray *items;
-@property (nonatomic, strong, readwrite) UIViewController *activityViewController;
-
-@end
-
-
-@implementation BITFeedbackActivity
-
-@synthesize activityViewController = _activityViewController;
-
-#pragma mark - NSObject
-
-- (instancetype)init {
-  if ((self = [super init])) {
-    _customActivityImage = nil;
-    _customActivityTitle = nil;
-    
-    _items = [NSMutableArray array];
-  }
-  
-  return self;
-}
-
-
-
-#pragma mark - UIActivity
-
-- (NSString *)activityType {
-  return @"UIActivityTypePostToHockeySDKFeedback";
-}
-
-- (NSString *)activityTitle {
-  if (self.customActivityTitle)
-    return self.customActivityTitle;
-  
-  NSString *appName = bit_appName(BITHockeyLocalizedString(@"HockeyFeedbackActivityAppPlaceholder"));
-  
-  return [NSString stringWithFormat:BITHockeyLocalizedString(@"HockeyFeedbackActivityButtonTitle"), appName];
-}
-
-- (UIImage *)activityImage {
-  if (self.customActivityImage)
-    return self.customActivityImage;
-
-  return bit_imageNamed(@"feedbackActivity.png", BITHOCKEYSDK_BUNDLE);
-}
-
-
-- (BOOL)canPerformWithActivityItems:(NSArray *)activityItems {
-  if ([BITHockeyManager sharedHockeyManager].disableFeedbackManager) return NO;
-
-  for (UIActivityItemProvider *item in activityItems) {
-    if ([item isKindOfClass:[NSString class]]) {
-      return YES;
-    } else if ([item isKindOfClass:[UIImage class]]) {
-      return YES;
-    } else if ([item isKindOfClass:[NSData class]]) {
-      return YES;
-    } else if ([item isKindOfClass:[BITHockeyAttachment class]]) {
-      return YES;
-    } else if ([item isKindOfClass:[NSURL class]]) {
-      return YES;
-    }
-  }
-  return NO;
-}
-
-- (void)prepareWithActivityItems:(NSArray *)activityItems {
-  for (id item in activityItems) {
-    if ([item isKindOfClass:[NSString class]] ||
-        [item isKindOfClass:[UIImage class]] ||
-        [item isKindOfClass:[NSData class]] ||
-        [item isKindOfClass:[BITHockeyAttachment class]] ||
-        [item isKindOfClass:[NSURL class]]) {
-      [self.items addObject:item];
-    } else {
-      BITHockeyLogWarning(@"WARNING: Unknown item type %@", item);
-    }
-  }
-}
-
-- (UIViewController *)activityViewController {
-  if (!_activityViewController) {
-    // TODO: return compose controller with activity content added
-    BITFeedbackManager *manager = [BITHockeyManager sharedHockeyManager].feedbackManager;
-    
-    BITFeedbackComposeViewController *composeViewController = [manager feedbackComposeViewController];
-    composeViewController.delegate = self;
-    [composeViewController prepareWithItems:self.items];
-    
-    _activityViewController = [manager customNavigationControllerWithRootViewController:composeViewController
-                                                                      presentationStyle:UIModalPresentationFormSheet];
-    _activityViewController.modalTransitionStyle = UIModalTransitionStyleCrossDissolve;
-  }
-  return _activityViewController;
-}
-
-- (void)feedbackComposeViewController:(BITFeedbackComposeViewController *) __unused composeViewController didFinishWithResult:(BITFeedbackComposeResult)composeResult {
-  [self activityDidFinish:composeResult == BITFeedbackComposeResultSubmitted];
-}
-
-
-@end
-
-#endif /* HOCKEYSDK_FEATURE_FEEDBACK */
diff --git a/submodules/HockeySDK-iOS/Classes/BITFeedbackComposeViewController.h b/submodules/HockeySDK-iOS/Classes/BITFeedbackComposeViewController.h
deleted file mode 100644
index ec58531894..0000000000
--- a/submodules/HockeySDK-iOS/Classes/BITFeedbackComposeViewController.h
+++ /dev/null
@@ -1,97 +0,0 @@
-/*
- * Author: Andreas Linde <mail@andreaslinde.de>
- *
- * Copyright (c) 2012-2014 HockeyApp, Bit Stadium GmbH.
- * All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person
- * obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without
- * restriction, including without limitation the rights to use,
- * copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following
- * conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
- * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
- */
-
-
-#import <UIKit/UIKit.h>
-
-#import "BITFeedbackComposeViewControllerDelegate.h"
-
-/**
- View controller allowing the user to write and send new feedback
- 
- To add this view controller to your own app and push it onto a navigation stack,
- don't create the instance yourself, but use the following code to get a correct instance:
- 
-     [[BITHockeyManager sharedHockeyManager].feedbackManager feedbackComposeViewController]
- 
- To show it modally, use the following code instead:
- 
-     [[BITHockeyManager sharedHockeyManager].feedbackManager showFeedbackComposeView]
-
- */
-
-@interface BITFeedbackComposeViewController : UIViewController <UITextViewDelegate>
-
-
-///-----------------------------------------------------------------------------
-/// @name Delegate
-///-----------------------------------------------------------------------------
-
-
-/**
- Sets the `BITFeedbackComposeViewControllerDelegate` delegate.
-
- The delegate is automatically set by using `[BITHockeyManager setDelegate:]`. You
- should not need to set this delegate individually.
- 
- @see [BITHockeyManager setDelegate:]
- */
-@property (nonatomic, weak) id<BITFeedbackComposeViewControllerDelegate> delegate;
-
-
-///-----------------------------------------------------------------------------
-/// @name Presetting content
-///-----------------------------------------------------------------------------
-
-
-/**
- Don't show the option to add images from the photo library
- 
- This is helpful if your application is landscape only, since the system UI for
- selecting an image from the photo library is portrait only
- */
-@property (nonatomic) BOOL hideImageAttachmentButton;
-
-/**
- An array of data objects that should be used to prefill the compose view content
- 
- The following data object classes are currently supported:
- - NSString
- - NSURL
- - UIImage
- - NSData
- - `BITHockeyAttachment`
- 
- These are automatically concatenated to one text string, while any images and NSData
- objects are added as attachments to the feedback.
- 
- @param items Array of data objects to prefill the feedback text message.
- */
-- (void)prepareWithItems:(NSArray *)items;
-
-@end
diff --git a/submodules/HockeySDK-iOS/Classes/BITFeedbackComposeViewController.m b/submodules/HockeySDK-iOS/Classes/BITFeedbackComposeViewController.m
deleted file mode 100644
index 49dfc46699..0000000000
--- a/submodules/HockeySDK-iOS/Classes/BITFeedbackComposeViewController.m
+++ /dev/null
@@ -1,690 +0,0 @@
-/*
- * Author: Andreas Linde <mail@andreaslinde.de>
- *
- * Copyright (c) 2012-2014 HockeyApp, Bit Stadium GmbH.
- * All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person
- * obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without
- * restriction, including without limitation the rights to use,
- * copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following
- * conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
- * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
- */
-
-
-#import "HockeySDK.h"
-
-#if HOCKEYSDK_FEATURE_FEEDBACK
-
-#import "HockeySDKPrivate.h"
-
-#import "BITFeedbackManagerPrivate.h"
-#import "BITFeedbackMessageAttachment.h"
-#import "BITFeedbackComposeViewController.h"
-#import "BITFeedbackUserDataViewController.h"
-
-#import "BITHockeyBaseManagerPrivate.h"
-
-#import "BITHockeyHelper.h"
-
-#import "BITImageAnnotationViewController.h"
-#import "BITHockeyAttachment.h"
-
-@interface BITFeedbackComposeViewController () <BITFeedbackUserDataDelegate, UIImagePickerControllerDelegate, UINavigationControllerDelegate, UIActionSheetDelegate, BITImageAnnotationDelegate> {
-}
-
-@property (nonatomic, weak) BITFeedbackManager *manager;
-@property (nonatomic, strong) UITextView *textView;
-@property (nonatomic, strong) UIView *contentViewContainer;
-@property (nonatomic, strong) UIScrollView *attachmentScrollView;
-@property (nonatomic, strong) NSMutableArray *attachmentScrollViewImageViews;
-
-@property (nonatomic, strong) UIButton *addPhotoButton;
-
-@property (nonatomic, copy) NSString *text;
-
-@property (nonatomic, strong) NSMutableArray *attachments;
-@property (nonatomic, strong) NSMutableArray *imageAttachments;
-
-@property (nonatomic, strong) UIView *textAccessoryView;
-@property (nonatomic) NSInteger selectedAttachmentIndex;
-@property (nonatomic, strong) UITapGestureRecognizer *tapRecognizer;
-
-@property (nonatomic) BOOL blockUserDataScreen;
-@property (nonatomic) BOOL actionSheetVisible;
-
-/**
- * Workaround for UIImagePickerController bug.
- * The statusBar shows up when the UIImagePickerController opens.
- * The status bar does not disappear again when the UIImagePickerController is dismissed.
- * Therefore store the state when UIImagePickerController is shown and restore when viewWillAppear gets called.
- */
-@property (nonatomic, strong) NSNumber *isStatusBarHiddenBeforeShowingPhotoPicker;
-
-@end
-
-
-@implementation BITFeedbackComposeViewController
-
-
-#pragma mark - NSObject
-
-- (instancetype)init {
-  self = [super init];
-  if (self) {
-    _blockUserDataScreen = NO;
-    _actionSheetVisible = NO;
-    _delegate = nil;
-    _manager = [BITHockeyManager sharedHockeyManager].feedbackManager;
-    _attachments = [NSMutableArray new];
-    _imageAttachments = [NSMutableArray new];
-    _attachmentScrollViewImageViews = [NSMutableArray new];
-    _tapRecognizer = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(scrollViewTapped:)];
-    [_attachmentScrollView addGestureRecognizer:self.tapRecognizer];
-    
-    _text = nil;
-  }
-  
-  return self;
-}
-
-
-#pragma mark - Public
-
-- (void)prepareWithItems:(NSArray *)items {
-  for (id item in items) {
-    if ([item isKindOfClass:[NSString class]]) {
-      self.text = [(self.text ? self.text : @"") stringByAppendingFormat:@"%@%@", (self.text ? @" " : @""), item];
-    } else if ([item isKindOfClass:[NSURL class]]) {
-      self.text = [(self.text ? self.text : @"") stringByAppendingFormat:@"%@%@", (self.text ? @" " : @""), [(NSURL *)item absoluteString]];
-    } else if ([item isKindOfClass:[UIImage class]]) {
-      UIImage *image = item;
-      BITFeedbackMessageAttachment *attachment = [BITFeedbackMessageAttachment attachmentWithData:UIImageJPEGRepresentation(image, (CGFloat)0.7) contentType:@"image/jpeg"];
-      attachment.originalFilename = [NSString stringWithFormat:@"Image_%li.jpg", (unsigned long)[self.attachments count]];
-      [self.attachments addObject:attachment];
-      [self.imageAttachments addObject:attachment];
-    } else if ([item isKindOfClass:[NSData class]]) {
-      BITFeedbackMessageAttachment *attachment = [BITFeedbackMessageAttachment attachmentWithData:item contentType:@"application/octet-stream"];
-      attachment.originalFilename = [NSString stringWithFormat:@"Attachment_%li.data", (unsigned long)[self.attachments count]];
-      [self.attachments addObject:attachment];
-    } else if ([item isKindOfClass:[BITHockeyAttachment class]]) {
-      BITHockeyAttachment *sourceAttachment = (BITHockeyAttachment *)item;
-      
-      if (!sourceAttachment.hockeyAttachmentData) {
-        BITHockeyLogDebug(@"BITHockeyAttachment instance doesn't contain any data.");
-        continue;
-      }
-      
-      NSString *filename = [NSString stringWithFormat:@"Attachment_%li.data", (unsigned long)[self.attachments count]];
-      if (sourceAttachment.filename) {
-        filename = sourceAttachment.filename;
-      }
-      
-      BITFeedbackMessageAttachment *attachment = [BITFeedbackMessageAttachment attachmentWithData:sourceAttachment.hockeyAttachmentData contentType:sourceAttachment.contentType];
-      attachment.originalFilename = filename;
-      [self.attachments addObject:attachment];
-    } else {
-      BITHockeyLogWarning(@"WARNING: Unknown item type %@", item);
-    }
-  }
-}
-
-
-#pragma mark - Keyboard
-
-- (void)keyboardWasShown:(NSNotification*)aNotification {
-  NSDictionary* info = [aNotification userInfo];
-  CGSize kbSize = [[info objectForKey:UIKeyboardFrameBeginUserInfoKey] CGRectValue].size;
-  
-  BOOL isPortraitOrientation = UIInterfaceOrientationIsPortrait([[UIApplication sharedApplication] statusBarOrientation]);
-  
-  CGRect frame = CGRectMake(0, 0, self.view.frame.size.width, self.view.frame.size.height);
-  if (UI_USER_INTERFACE_IDIOM() != UIUserInterfaceIdiomPad) {
-    frame.size.height -= kbSize.height;
-  } else {
-    CGSize windowSize = [[UIScreen mainScreen] bounds].size;
-    CGFloat windowHeight = windowSize.height - 20;
-    CGFloat navBarHeight = self.navigationController.navigationBar.frame.size.height;
-    
-    if (isPortraitOrientation) {
-      frame.size.height = windowHeight - navBarHeight - kbSize.height;
-    } else {
-      windowHeight = windowSize.height - 20;
-      CGFloat modalGap = 0.0;
-      if (windowHeight - kbSize.height < self.view.bounds.size.height) {
-        modalGap = 30;
-      } else {
-        modalGap = (windowHeight - self.view.bounds.size.height) / 2;
-      }
-      frame.size.height = windowSize.height - navBarHeight - modalGap - kbSize.height;
-    }
-  }
-  [self.contentViewContainer setFrame:frame];
-  
-  [self performSelector:@selector(refreshAttachmentScrollview) withObject:nil afterDelay:0.0];
-}
-
-- (void)keyboardWillBeHidden:(NSNotification*) __unused aNotification {
-  CGRect frame = CGRectMake(0, 0, self.view.frame.size.width, self.view.frame.size.height);
-  [self.contentViewContainer setFrame:frame];
-}
-
-
-#pragma mark - View lifecycle
-
-- (void)viewDidLoad {
-  [super viewDidLoad];
-  
-  self.title = BITHockeyLocalizedString(@"HockeyFeedbackComposeTitle");
-  self.view.backgroundColor = [UIColor whiteColor];
-  
-  // Do any additional setup after loading the view.
-  self.navigationItem.leftBarButtonItem = [[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemCancel
-                                                                                        target:self
-                                                                                        action:@selector(dismissAction:)];
-  self.navigationItem.rightBarButtonItem = [[UIBarButtonItem alloc] initWithTitle:BITHockeyLocalizedString(@"HockeyFeedbackComposeSend")
-                                                                            style:UIBarButtonItemStyleDone
-                                                                           target:self
-                                                                           action:@selector(sendAction:)];
-
-  // Container that contains both the textfield and eventually the photo scroll view on the right side
-  self.contentViewContainer = [[UIView alloc] initWithFrame:self.view.bounds];
-  self.contentViewContainer.autoresizingMask = UIViewAutoresizingFlexibleWidth|UIViewAutoresizingFlexibleHeight;
-  
-  [self.view addSubview:self.contentViewContainer];
-  
-  // message input textfield
-  self.textView = [[UITextView alloc] initWithFrame:self.view.bounds];
-  self.textView.font = [UIFont systemFontOfSize:17];
-  self.textView.delegate = self;
-  self.textView.backgroundColor = [UIColor whiteColor];
-  self.textView.returnKeyType = UIReturnKeyDefault;
-  self.textView.autoresizingMask = UIViewAutoresizingFlexibleWidth|UIViewAutoresizingFlexibleHeight;
-  self.textView.accessibilityHint = BITHockeyLocalizedString(@"HockeyAccessibilityHintRequired");
-  
-  [self.contentViewContainer addSubview:self.textView];
-  
-  // Add Photo Button + Container that's displayed above the keyboard.
-  if([BITHockeyHelper isPhotoAccessPossible]) {
-    self.textAccessoryView = [[UIView alloc] initWithFrame:CGRectMake(0, 0, CGRectGetWidth(self.view.frame), 44)];
-    self.textAccessoryView.backgroundColor = [UIColor colorWithRed:(CGFloat)0.9 green:(CGFloat)0.9 blue:(CGFloat)0.9 alpha:(CGFloat)1.0];
-    
-    self.addPhotoButton = [UIButton buttonWithType:UIButtonTypeCustom];
-    [self.addPhotoButton setTitle:BITHockeyLocalizedString(@"HockeyFeedbackComposeAttachmentAddImage") forState:UIControlStateNormal];
-    [self.addPhotoButton setTitleColor:[UIColor darkGrayColor] forState:UIControlStateNormal];
-    [self.addPhotoButton setTitleColor:[UIColor lightGrayColor] forState:UIControlStateDisabled];
-    self.addPhotoButton.frame = CGRectMake(0, 0, CGRectGetWidth(self.view.frame), 44);
-    [self.addPhotoButton addTarget:self action:@selector(addPhotoAction:) forControlEvents:UIControlEventTouchUpInside];
-    self.addPhotoButton.autoresizingMask = UIViewAutoresizingFlexibleLeftMargin|UIViewAutoresizingFlexibleRightMargin;
-    [self.textAccessoryView addSubview:self.addPhotoButton];
-  }
-  
-  
-  
-  if (!self.hideImageAttachmentButton) {
-    self.textView.inputAccessoryView = self.textAccessoryView;
-  }
-  
-  // This could be a subclass, yet
-  self.attachmentScrollView = [[UIScrollView alloc] initWithFrame:CGRectZero];
-  self.attachmentScrollView.scrollEnabled = YES;
-  self.attachmentScrollView.bounces = YES;
-  self.attachmentScrollView.autoresizesSubviews = NO;
-  self.attachmentScrollView.autoresizingMask = UIViewAutoresizingFlexibleHeight|UIViewAutoresizingFlexibleRightMargin;
-#if __IPHONE_OS_VERSION_MAX_ALLOWED >= __IPHONE_11_0
-  if (@available(iOS 11.0, *)) {
-    self.attachmentScrollView.contentInsetAdjustmentBehavior = UIScrollViewContentInsetAdjustmentAlways;
-  }
-#endif
-  [self.contentViewContainer addSubview:self.attachmentScrollView];
-}
-
-- (void)viewWillAppear:(BOOL)animated {
-  [[NSNotificationCenter defaultCenter] addObserver:self
-                                           selector:@selector(keyboardWasShown:)
-                                               name:UIKeyboardDidShowNotification object:nil];
-  
-  [[NSNotificationCenter defaultCenter] addObserver:self
-                                           selector:@selector(keyboardWillBeHidden:)
-                                               name:UIKeyboardWillHideNotification object:nil];
-  
-  self.manager.currentFeedbackComposeViewController = self;
-  
-  [super viewWillAppear:animated];
-  
-  if (self.text && self.textView.text.length == 0) {
-    self.textView.text = self.text;
-  }
-  
-  if (self.isStatusBarHiddenBeforeShowingPhotoPicker) {
-      [self setNeedsStatusBarAppearanceUpdate];
-  }
-  
-  self.isStatusBarHiddenBeforeShowingPhotoPicker = nil;
-  
-  [self updateBarButtonState];
-}
-
-- (BOOL)prefersStatusBarHidden {
-  if (self.isStatusBarHiddenBeforeShowingPhotoPicker) {
-    return self.isStatusBarHiddenBeforeShowingPhotoPicker.boolValue;
-  }
-  
-  return [super prefersStatusBarHidden];
-}
-
-- (void)viewDidAppear:(BOOL)animated {
-  [super viewDidAppear:animated];
-  BITFeedbackManager *strongManager = self.manager;
-  if ([strongManager askManualUserDataAvailable] &&
-      ([strongManager requireManualUserDataMissing] ||
-       ![strongManager didAskUserData])
-      ) {
-    if (!self.blockUserDataScreen)
-      [self setUserDataAction];
-  } else {
-    // Invoke delayed to fix iOS 7 iPad landscape bug, where this view will be moved if not called delayed
-    [self.textView performSelector:@selector(becomeFirstResponder) withObject:nil afterDelay:0.0];
-    [self refreshAttachmentScrollview];
-  }
-}
-
-- (void)viewWillDisappear:(BOOL)animated {
-  [[NSNotificationCenter defaultCenter] removeObserver:self name:UIKeyboardDidShowNotification object:nil];
-  [[NSNotificationCenter defaultCenter] removeObserver:self name:UIKeyboardWillHideNotification object:nil];
-  
-  self.manager.currentFeedbackComposeViewController = nil;
-  
-  [super viewWillDisappear:animated];
-}
-
-- (void)viewDidDisappear:(BOOL)animated {
-  [super viewDidDisappear:animated];
-}
-
-- (void)refreshAttachmentScrollview {
-  CGFloat scrollViewWidth = 0;
-  
-  if (self.imageAttachments.count){
-    scrollViewWidth = 100;
-  }
-  
-  CGRect textViewFrame = self.textView.frame;
-  
-  CGRect scrollViewFrame = self.attachmentScrollView.frame;
-  
-  BOOL alreadySetup = CGRectGetWidth(scrollViewFrame) > 0;
-  
-  if (alreadySetup && self.imageAttachments.count == 0) {
-    textViewFrame.size.width += 100;
-    self.textView.frame = textViewFrame;
-    scrollViewFrame.size.width = 0;
-    self.attachmentScrollView.frame = scrollViewFrame;
-    return;
-  }
-  
-  if (!alreadySetup) {
-    CGSize tempTextViewSize = CGSizeMake(self.contentViewContainer.frame.size.width, self.contentViewContainer.frame.size.height);
-    textViewFrame.size = tempTextViewSize;
-    textViewFrame.size.width -= scrollViewWidth;
-    // height has to be identical to the textview!
-    scrollViewFrame = CGRectMake(CGRectGetMaxX(textViewFrame), self.view.frame.origin.y, scrollViewWidth, CGRectGetHeight(self.textView.bounds));
-    self.textView.frame = textViewFrame;
-    self.attachmentScrollView.frame = scrollViewFrame;
-    self.attachmentScrollView.contentInset = self.textView.contentInset;
-  }
-  
-  if (self.imageAttachments.count > self.attachmentScrollViewImageViews.count){
-    NSInteger numberOfViewsToCreate = self.imageAttachments.count - self.attachmentScrollViewImageViews.count;
-    for (int i = 0; i <numberOfViewsToCreate; i++) {
-      UIButton *newImageButton = [UIButton buttonWithType:UIButtonTypeCustom];
-      [newImageButton addTarget:self action:@selector(imageButtonAction:) forControlEvents:UIControlEventTouchUpInside];
-      [self.attachmentScrollViewImageViews addObject:newImageButton];
-      [self.attachmentScrollView addSubview:newImageButton];
-    }
-  }
-  
-  int index = 0;
-  
-  CGFloat currentYOffset = 0.0;
-  
-  NSEnumerator *reverseAttachments = self.imageAttachments.reverseObjectEnumerator;
-  
-  for (BITFeedbackMessageAttachment *attachment in reverseAttachments.allObjects){
-    UIButton *imageButton = self.attachmentScrollViewImageViews[index];
-    
-    UIImage *image = [attachment thumbnailWithSize:CGSizeMake(100, 100)];
-    
-    // determine the factor by which we scale..
-    CGFloat scaleFactor = CGRectGetWidth(self.attachmentScrollView.frame) / image.size.width;
-    
-    CGFloat height = image.size.height * scaleFactor;
-    
-    imageButton.frame = CGRectInset(CGRectMake(0, currentYOffset, scaleFactor * image.size.width, height), 10, 10);
-    
-    currentYOffset += height;
-    
-    [imageButton setImage:image forState:UIControlStateNormal];
-    index++;
-  }
-  
-  [self.attachmentScrollView setContentSize:CGSizeMake(CGRectGetWidth(self.attachmentScrollView.frame), currentYOffset)];
-  
-  [self updateBarButtonState];
-}
-
-- (void)updateBarButtonState {
-  if (self.textView.text.length > 0 ) {
-    self.navigationItem.rightBarButtonItem.enabled = YES;
-  } else {
-    self.navigationItem.rightBarButtonItem.enabled = NO;
-  }
-  
-  if(self.addPhotoButton) {
-    if (self.imageAttachments.count > 2){
-      [self.addPhotoButton setEnabled:NO];
-    } else {
-      [self.addPhotoButton setEnabled:YES];
-    }
-  }
-}
-
-- (void)removeAttachmentScrollView {
-  CGRect frame = self.attachmentScrollView.frame;
-  frame.size.width = 0;
-  self.attachmentScrollView.frame = frame;
-  
-  frame = self.textView.frame;
-  frame.size.width += 100;
-  self.textView.frame = frame;
-}
-
-
-#pragma mark - UIViewController Rotation
-
-- (UIInterfaceOrientationMask)supportedInterfaceOrientations{
-  return UIInterfaceOrientationMaskAll;
-}
-
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-implementations"
-- (void)didRotateFromInterfaceOrientation:(UIInterfaceOrientation) __unused fromInterfaceOrientation {
-  [self removeAttachmentScrollView];
-  
-  [self refreshAttachmentScrollview];
-}
-#pragma clang diagnostic pop
-
-#pragma mark - Private methods
-
-- (void)setUserDataAction {
-  BITFeedbackUserDataViewController *userController = [[BITFeedbackUserDataViewController alloc] initWithStyle:UITableViewStyleGrouped];
-  userController.delegate = self;
-  
-  UINavigationController *navController = [self.manager customNavigationControllerWithRootViewController:userController
-                                                                                       presentationStyle:UIModalPresentationFormSheet];
-  
-  [self presentViewController:navController animated:YES completion:nil];
-}
-
-#pragma mark - Actions
-
-- (void)dismissAction:(id) __unused sender {
-  for (BITFeedbackMessageAttachment *attachment in self.attachments){
-    [attachment deleteContents];
-  }
-  
-  [self dismissWithResult:BITFeedbackComposeResultCancelled];
-}
-
-- (void)sendAction:(id) __unused sender {
-  if ([self.textView isFirstResponder])
-    [self.textView resignFirstResponder];
-  
-  NSString *text = self.textView.text;
-  
-  [self.manager submitMessageWithText:text andAttachments:self.attachments];
-  
-  [self dismissWithResult:BITFeedbackComposeResultSubmitted];
-}
-
-- (void)dismissWithResult:(BITFeedbackComposeResult) result {
-  id strongDelegate = self.delegate;
-  if([strongDelegate respondsToSelector:@selector(feedbackComposeViewController:didFinishWithResult:)]) {
-    [strongDelegate feedbackComposeViewController:self didFinishWithResult:result];
-  } else {
-    [self dismissViewControllerAnimated:YES completion:nil];
-  }
-}
-
-- (void)addPhotoAction:(id) __unused sender {
-  if (self.actionSheetVisible) return;
-  
-  self.isStatusBarHiddenBeforeShowingPhotoPicker = @([[UIApplication sharedApplication] isStatusBarHidden]);
-  
-  // add photo.
-  UIImagePickerController *pickerController = [[UIImagePickerController alloc] init];
-  pickerController.sourceType = UIImagePickerControllerSourceTypePhotoLibrary;
-  pickerController.delegate = self;
-  pickerController.editing = NO;
-  pickerController.navigationBar.barStyle = self.manager.barStyle;
-  [self presentViewController:pickerController animated:YES completion:nil];
-}
-
-- (void)scrollViewTapped:(id) __unused unused {
-  UIMenuController *menuController = [UIMenuController sharedMenuController];
-  [menuController setTargetRect:CGRectMake([self.tapRecognizer locationInView:self.view].x, [self.tapRecognizer locationInView:self.view].x, 1, 1) inView:self.view];
-  [menuController setMenuVisible:YES animated:YES];
-}
-
-- (void)paste:(id) __unused sender {
-  
-}
-
-#pragma mark - UIImagePickerControllerDelegate
-
-- (void)imagePickerController:(UIImagePickerController *)picker didFinishPickingMediaWithInfo:(NSDictionary *)info {
-  UIImage *pickedImage = info[UIImagePickerControllerOriginalImage];
-  
-  if (pickedImage){
-    NSData *imageData = UIImageJPEGRepresentation(pickedImage, (CGFloat)0.7);
-    BITFeedbackMessageAttachment *newAttachment = [BITFeedbackMessageAttachment attachmentWithData:imageData contentType:@"image/jpeg"];
-    NSURL *imagePath = [info objectForKey:@"UIImagePickerControllerReferenceURL"];
-    NSString *imageName = [imagePath lastPathComponent];
-    newAttachment.originalFilename = imageName;
-    [self.attachments addObject:newAttachment];
-    [self.imageAttachments addObject:newAttachment];
-  }
-  
-  [picker dismissViewControllerAnimated:YES completion:nil];
-}
-
-- (void)imagePickerControllerDidCancel:(UIImagePickerController *)picker {
-  [picker dismissViewControllerAnimated:YES completion:nil];
-}
-
-- (void)imageButtonAction:(UIButton *)sender {
-  // determine the index of the feedback
-  NSInteger index = [self.attachmentScrollViewImageViews indexOfObject:sender];
-  
-  self.selectedAttachmentIndex = (self.attachmentScrollViewImageViews.count - index - 1);
-  /* We won't use this for now until we have a more robust solution for displaying UIAlertController
-   // requires iOS 8
-   id uialertcontrollerClass = NSClassFromString(@"UIAlertController");
-   if (uialertcontrollerClass) {
-   __weak typeof(self) weakSelf = self;
-   
-   UIAlertController *alertController = [UIAlertController alertControllerWithTitle:nil
-   message:nil
-   preferredStyle:UIAlertControllerStyleActionSheet];
-   
-   
-   UIAlertAction *cancelAction = [BITAlertAction actionWithTitle:BITHockeyLocalizedString(@"HockeyFeedbackComposeAttachmentCancel")
-   style:UIAlertActionStyleCancel
-   handler:^(UIAlertAction * action) {
-   typeof(self) strongSelf = weakSelf;
-   [strongSelf cancelAction];
-   _actionSheetVisible = NO;
-   }];
-   
-   [alertController addAction:cancelAction];
-   
-   UIAlertAction *editAction = [BITAlertAction actionWithTitle:BITHockeyLocalizedString(@"HockeyFeedbackComposeAttachmentEdit")
-   style:UIAlertActionStyleDefault
-   handler:^(UIAlertAction * action) {
-   typeof(self) strongSelf = weakSelf;
-   [strongSelf editAction];
-   _actionSheetVisible = NO;
-   }];
-   
-   [alertController addAction:editAction];
-   
-   UIAlertAction *deleteAction = [BITAlertAction actionWithTitle:BITHockeyLocalizedString(@"HockeyFeedbackComposeAttachmentDelete")
-   style:UIAlertActionStyleDestructive
-   handler:^(UIAlertAction * action) {
-   typeof(self) strongSelf = weakSelf;
-   [strongSelf deleteAction];
-   _actionSheetVisible = NO;
-   }];
-   
-   [alertController addAction:deleteAction];
-   
-   [self presentViewController:alertController animated:YES completion:nil];
-   } else {
-   */
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
-  UIActionSheet *actionSheet = [[UIActionSheet alloc] initWithTitle: nil
-                                                           delegate: self
-                                                  cancelButtonTitle: BITHockeyLocalizedString(@"HockeyFeedbackComposeAttachmentCancel")
-                                             destructiveButtonTitle: BITHockeyLocalizedString(@"HockeyFeedbackComposeAttachmentDelete")
-                                                  otherButtonTitles: BITHockeyLocalizedString(@"HockeyFeedbackComposeAttachmentEdit"), nil];
-  
-  [actionSheet showFromRect: sender.frame inView: self.attachmentScrollView animated: YES];
-#pragma clang diagnostic push
-  /*}*/
-  
-  self.actionSheetVisible = YES;
-  if ((UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad) || ([[NSProcessInfo processInfo] isOperatingSystemAtLeastVersion:(NSOperatingSystemVersion){9,0,0}])) {
-    [self.textView resignFirstResponder];
-  }
-}
-
-
-#pragma mark - BITFeedbackUserDataDelegate
-
-- (void)userDataUpdateCancelled {
-  self.blockUserDataScreen = YES;
-  
-  if ([self.manager requireManualUserDataMissing]) {
-    if ([self.navigationController respondsToSelector:@selector(dismissViewControllerAnimated:completion:)]) {
-      [self.navigationController dismissViewControllerAnimated:YES
-                                                    completion:^(void) {
-                                                      [self dismissViewControllerAnimated:YES completion:nil];
-                                                    }];
-    } else {
-      [self dismissViewControllerAnimated:YES completion:nil];
-      [self performSelector:@selector(dismissAction:) withObject:nil afterDelay:0.4];
-    }
-  } else {
-    [self.navigationController dismissViewControllerAnimated:YES completion:nil];
-  }
-}
-
-- (void)userDataUpdateFinished {
-  [self.manager saveMessages];
-  
-  [self.navigationController dismissViewControllerAnimated:YES completion:nil];
-}
-
-
-#pragma mark - UITextViewDelegate
-
-- (void)textViewDidChange:(UITextView *) __unused textView {
-  [self updateBarButtonState];
-}
-
-
-#pragma mark - UIActionSheet Delegate
-
-- (void)deleteAction {
-  if (self.selectedAttachmentIndex != NSNotFound){
-    UIButton *imageButton = self.attachmentScrollViewImageViews[self.selectedAttachmentIndex];
-    BITFeedbackMessageAttachment *attachment = self.imageAttachments[self.selectedAttachmentIndex];
-    [attachment deleteContents]; // mandatory call to delete the files associated.
-    [self.imageAttachments removeObject:attachment];
-    [self.attachments removeObject:attachment];
-    [imageButton removeFromSuperview];
-    [self.attachmentScrollViewImageViews removeObject:imageButton];
-  }
-  self.selectedAttachmentIndex = NSNotFound;
-  
-  [self refreshAttachmentScrollview];
-  
-  if ((UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad) || ([[NSProcessInfo processInfo] respondsToSelector:@selector(isOperatingSystemAtLeastVersion:)] && [[NSProcessInfo processInfo] isOperatingSystemAtLeastVersion:(NSOperatingSystemVersion){9,0,0}])) {
-    [self.textView becomeFirstResponder];
-  }
-}
-
-- (void)editAction {
-  if (self.selectedAttachmentIndex != NSNotFound){
-    BITFeedbackMessageAttachment *attachment = self.imageAttachments[self.selectedAttachmentIndex];
-    BITImageAnnotationViewController *annotationEditor = [[BITImageAnnotationViewController alloc ] init];
-    annotationEditor.delegate = self;
-    UINavigationController *navController = [self.manager customNavigationControllerWithRootViewController:annotationEditor presentationStyle:UIModalPresentationFullScreen];
-    annotationEditor.image = attachment.imageRepresentation;
-    [self presentViewController:navController animated:YES completion:nil];
-  }
-}
-
-- (void)cancelAction {
-  if ((UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad) || ([[NSProcessInfo processInfo] respondsToSelector:@selector(isOperatingSystemAtLeastVersion:)] && [[NSProcessInfo processInfo] isOperatingSystemAtLeastVersion:(NSOperatingSystemVersion){9,0,0}])) {
-    [self.textView becomeFirstResponder];
-  }
-}
-
-- (void)actionSheet:(UIActionSheet *)actionSheet didDismissWithButtonIndex:(NSInteger)buttonIndex {
-  if (buttonIndex == [actionSheet destructiveButtonIndex]) {
-    [self deleteAction];
-  } else if (buttonIndex != [actionSheet cancelButtonIndex]) {
-    [self editAction];
-  } else {
-    [self cancelAction];
-  }
-  self.actionSheetVisible = NO;
-}
-
-
-#pragma mark - Image Annotation Delegate
-
-- (void)annotationController:(BITImageAnnotationViewController *) __unused annotationController didFinishWithImage:(UIImage *)image {
-  if (self.selectedAttachmentIndex != NSNotFound){
-    BITFeedbackMessageAttachment *attachment = self.imageAttachments[self.selectedAttachmentIndex];
-    [attachment replaceData:UIImageJPEGRepresentation(image, (CGFloat)0.7)];
-  }
-  
-  self.selectedAttachmentIndex = NSNotFound;
-}
-
-- (void)annotationControllerDidCancel:(BITImageAnnotationViewController *) __unused annotationController {
-  self.selectedAttachmentIndex = NSNotFound;
-}
-
-@end
-
-#endif /* HOCKEYSDK_FEATURE_FEEDBACK */
diff --git a/submodules/HockeySDK-iOS/Classes/BITFeedbackComposeViewControllerDelegate.h b/submodules/HockeySDK-iOS/Classes/BITFeedbackComposeViewControllerDelegate.h
deleted file mode 100644
index 99bac6cf84..0000000000
--- a/submodules/HockeySDK-iOS/Classes/BITFeedbackComposeViewControllerDelegate.h
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- * Author: Andreas Linde <mail@andreaslinde.de>
- *
- * Copyright (c) 2012-2014 HockeyApp, Bit Stadium GmbH.
- * All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person
- * obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without
- * restriction, including without limitation the rights to use,
- * copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following
- * conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
- * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#import <Foundation/Foundation.h>
-
-#import "HockeySDKNullability.h"
-NS_ASSUME_NONNULL_BEGIN
-
-/**
- *  The users action when composing a message
- */
-typedef NS_ENUM(NSUInteger, BITFeedbackComposeResult) {
-  /**
-   *  user hit cancel
-   */
-  BITFeedbackComposeResultCancelled,
-  /**
-   *  user hit submit
-   */
-  BITFeedbackComposeResultSubmitted,
-};
-
-@class BITFeedbackComposeViewController;
-
-/**
- * The `BITFeedbackComposeViewControllerDelegate` formal protocol defines methods further configuring
- * the behaviour of `BITFeedbackComposeViewController`.
- */
-
-@protocol BITFeedbackComposeViewControllerDelegate <NSObject>
-
-@optional
-
-///-----------------------------------------------------------------------------
-/// @name View Controller Management
-///-----------------------------------------------------------------------------
-
-/**
- * Invoked once the compose screen is finished via send or cancel
- *
- * If this is implemented, it's the responsibility of this method to dismiss the presented
- * `BITFeedbackComposeViewController`
- *
- * @param composeViewController The `BITFeedbackComposeViewController` instance invoking this delegate
- * @param composeResult The user action the lead to closing the compose view
- */
-- (void)feedbackComposeViewController:(BITFeedbackComposeViewController *)composeViewController
-                  didFinishWithResult:(BITFeedbackComposeResult) composeResult;
-@end
-
-NS_ASSUME_NONNULL_END
diff --git a/submodules/HockeySDK-iOS/Classes/BITFeedbackListViewCell.h b/submodules/HockeySDK-iOS/Classes/BITFeedbackListViewCell.h
deleted file mode 100644
index f8947a50ec..0000000000
--- a/submodules/HockeySDK-iOS/Classes/BITFeedbackListViewCell.h
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * Author: Andreas Linde <mail@andreaslinde.de>
- *
- * Copyright (c) 2012-2014 HockeyApp, Bit Stadium GmbH.
- * All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person
- * obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without
- * restriction, including without limitation the rights to use,
- * copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following
- * conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
- * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
- */
-
-
-#import <UIKit/UIKit.h>
-#import "BITFeedbackMessage.h"
-#import "BITAttributedLabel.h"
-
-@class BITFeedbackMessageAttachment;
-
-@protocol BITFeedbackListViewCellDelegate <NSObject>
-
-- (void)listCell:(id)cell didSelectAttachment:(BITFeedbackMessageAttachment *)attachment;
-
-@end
-
-/**
- * Cell background style
- */
-typedef NS_ENUM(NSUInteger, BITFeedbackListViewCellBackgroundStyle) {
-  /**
-   * For even rows
-   */
-  BITFeedbackListViewCellBackgroundStyleNormal = 0,
-  /**
-   * For uneven rows
-   */
-  BITFeedbackListViewCellBackgroundStyleAlternate = 1
-};
-
-
-@interface BITFeedbackListViewCell : UITableViewCell
-
-@property (nonatomic, strong) BITFeedbackMessage *message;
-
-@property (nonatomic) BITFeedbackListViewCellBackgroundStyle backgroundStyle;
-
-@property (nonatomic, strong) BITAttributedLabel *labelText;
-
-@property (nonatomic, weak) id<BITFeedbackListViewCellDelegate> delegate;
-
-+ (CGFloat) heightForRowWithMessage:(BITFeedbackMessage *)message tableViewWidth:(CGFloat)width;
-
-- (void)setAttachments:(NSArray *)attachments;
-
-@end
diff --git a/submodules/HockeySDK-iOS/Classes/BITFeedbackListViewCell.m b/submodules/HockeySDK-iOS/Classes/BITFeedbackListViewCell.m
deleted file mode 100644
index 59d661ad37..0000000000
--- a/submodules/HockeySDK-iOS/Classes/BITFeedbackListViewCell.m
+++ /dev/null
@@ -1,362 +0,0 @@
-/*
- * Author: Andreas Linde <mail@andreaslinde.de>
- *
- * Copyright (c) 2012-2014 HockeyApp, Bit Stadium GmbH.
- * All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person
- * obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without
- * restriction, including without limitation the rights to use,
- * copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following
- * conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
- * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#import "HockeySDK.h"
-
-#if HOCKEYSDK_FEATURE_FEEDBACK
-
-#import "HockeySDKPrivate.h"
-
-#import "BITFeedbackListViewCell.h"
-#import "BITFeedbackMessageAttachment.h"
-#import "BITActivityIndicatorButton.h"
-#import "BITFeedbackManagerPrivate.h"
-
-#import <tgmath.h>
-
-#define BACKGROUNDCOLOR_DEFAULT_OS7 BIT_RGBCOLOR(255, 255, 255)
-#define BACKGROUNDCOLOR_ALTERNATE_OS7 BIT_RGBCOLOR(255, 255, 255)
-
-#define TEXTCOLOR_TITLE BIT_RGBCOLOR(75, 75, 75)
-
-#define TEXTCOLOR_DEFAULT BIT_RGBCOLOR(25, 25, 25)
-#define TEXTCOLOR_PENDING BIT_RGBCOLOR(75, 75, 75)
-
-#define TITLE_FONTSIZE 12
-#define TEXT_FONTSIZE 15
-
-#define FRAME_SIDE_BORDER 10
-#define FRAME_TOP_BORDER 8
-#define FRAME_BOTTOM_BORDER 5
-
-#define LABEL_TITLE_Y 3
-#define LABEL_TITLE_HEIGHT 15
-
-#define LABEL_TEXT_Y 25
-
-#define ATTACHMENT_SIZE 45
-
-
-@interface BITFeedbackListViewCell ()
-
-@property (nonatomic, strong) NSDateFormatter *dateFormatter;
-@property (nonatomic, strong) NSDateFormatter *timeFormatter;
-
-@property (nonatomic, strong) UILabel *labelTitle;
-
-@property (nonatomic, strong) NSMutableArray *attachmentViews;
-
-@property (nonatomic, strong) UIView *accessoryBackgroundView;
-
-@property (nonatomic, strong) id updateAttachmentNotification;
-
-@end
-
-
-@implementation BITFeedbackListViewCell
-
-
-- (instancetype)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reuseIdentifier {
-  self = [super initWithStyle:style reuseIdentifier:reuseIdentifier];
-  if (self) {
-    // Initialization code
-    _backgroundStyle = BITFeedbackListViewCellBackgroundStyleNormal;
-    
-    _message = nil;
-    
-    _dateFormatter = [[NSDateFormatter alloc] init];
-    [_dateFormatter setTimeStyle:NSDateFormatterNoStyle];
-    [_dateFormatter setDateStyle:NSDateFormatterMediumStyle];
-    [_dateFormatter setLocale:[NSLocale currentLocale]];
-    [_dateFormatter setDoesRelativeDateFormatting:YES];
-    
-    _timeFormatter = [[NSDateFormatter alloc] init];
-    [_timeFormatter setTimeStyle:NSDateFormatterShortStyle];
-    [_timeFormatter setDateStyle:NSDateFormatterNoStyle];
-    [_timeFormatter setLocale:[NSLocale currentLocale]];
-    [_timeFormatter setDoesRelativeDateFormatting:YES];
-    
-    _labelTitle = [[UILabel alloc] init];
-    _labelTitle.font = [UIFont systemFontOfSize:TITLE_FONTSIZE];
-    
-    _labelText = [[BITAttributedLabel alloc] initWithFrame:CGRectZero];
-    _labelText.font = [UIFont systemFontOfSize:TEXT_FONTSIZE];
-    _labelText.numberOfLines = 0;
-    _labelText.textAlignment = NSTextAlignmentLeft;
-    _labelText.enabledTextCheckingTypes = UIDataDetectorTypeAll;
-    
-    _attachmentViews = [NSMutableArray new];
-    [self registerObservers];
-  }
-  return self;
-}
-
-- (void)dealloc {
-  [self unregisterObservers];
-}
-
-
-#pragma mark - Private
-
-- (void) registerObservers {
-  __weak typeof(self) weakSelf = self;
-  if (nil == self.updateAttachmentNotification) {
-    self.updateAttachmentNotification = [[NSNotificationCenter defaultCenter] addObserverForName:kBITFeedbackUpdateAttachmentThumbnail
-                                                                                    object:nil
-                                                                                     queue:NSOperationQueue.mainQueue
-                                                                                usingBlock:^(NSNotification *note) {
-                                                                                  typeof(self) strongSelf = weakSelf;
-                                                                                  [strongSelf updateAttachmentFromNotification:note];
-                                                                                }];
-  }
-}
-
-- (void) unregisterObservers {
-  if (self.updateAttachmentNotification) {
-    [[NSNotificationCenter defaultCenter] removeObserver:self.updateAttachmentNotification];
-    self.updateAttachmentNotification = nil;
-  }
-}
-
-- (void) updateAttachmentFromNotification:(NSNotification *)note {
-  if (!self.message) return;
-  if (!self.message.attachments) return;
-  if (self.message.attachments.count == 0) return;
-  if (!note.object) return;
-  if (![note.object isKindOfClass:[BITFeedbackMessageAttachment class]]) return;
-  
-  BITFeedbackMessageAttachment *attachment = (BITFeedbackMessageAttachment *)note.object;
-  if (![self.message.attachments containsObject:attachment]) return;
-  
-  // The attachment is part of the message used for this cell, so lets update it.
-  [self setAttachments:self.message.previewableAttachments];
-  [self setNeedsLayout];
-}
-
-- (UIColor *)backgroundColor {
-  
-  if (self.backgroundStyle == BITFeedbackListViewCellBackgroundStyleNormal) {
-    return BACKGROUNDCOLOR_DEFAULT_OS7;
-  } else {
-    return BACKGROUNDCOLOR_ALTERNATE_OS7;
-  }
-}
-
-- (BOOL)isSameDayWithDate1:(NSDate*)date1 date2:(NSDate*)date2 {
-  NSCalendar* calendar = [NSCalendar currentCalendar];
-  
-  unsigned unitFlags = NSCalendarUnitYear | NSCalendarUnitMonth |  NSCalendarUnitDay;
-  
-  NSDateComponents *dateComponent1 = [calendar components:unitFlags fromDate:date1];
-  NSDateComponents *dateComponent2 = [calendar components:unitFlags fromDate:date2];
-  
-  return ([dateComponent1 day] == [dateComponent2 day] &&
-          [dateComponent1 month] == [dateComponent2 month] &&
-          [dateComponent1 year]  == [dateComponent2 year]);
-}
-
-
-#pragma mark - Layout
-
-+ (CGFloat) heightForRowWithMessage:(BITFeedbackMessage *)message tableViewWidth:(CGFloat)width {
-  
-  CGFloat baseHeight = [self heightForTextInRowWithMessage:message tableViewWidth:width];
-  
-  CGFloat attachmentsPerRow = floor(width / (FRAME_SIDE_BORDER + ATTACHMENT_SIZE));
-  
-  CGFloat calculatedHeight = baseHeight + (FRAME_TOP_BORDER + ATTACHMENT_SIZE) * ceil([message previewableAttachments].count / attachmentsPerRow);
-  
-  return ceil(calculatedHeight);
-}
-
-
-
-+ (CGFloat) heightForTextInRowWithMessage:(BITFeedbackMessage *)message tableViewWidth:(CGFloat)width {
-  CGFloat calculatedHeight;
-  
-  if ([message.text respondsToSelector:@selector(boundingRectWithSize:options:attributes:context:)]) {
-    CGRect calculatedRect = [message.text boundingRectWithSize:CGSizeMake(width - (2 * FRAME_SIDE_BORDER), CGFLOAT_MAX)
-                                                       options:NSStringDrawingUsesLineFragmentOrigin | NSStringDrawingUsesFontLeading
-                                                    attributes:@{NSFontAttributeName:[UIFont systemFontOfSize:TEXT_FONTSIZE]}
-                                                       context:nil];
-    calculatedHeight = calculatedRect.size.height + FRAME_TOP_BORDER + LABEL_TEXT_Y + FRAME_BOTTOM_BORDER;
-    
-    // added to make space for the images.
-    
-    
-  } else {
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
-    calculatedHeight = [message.text sizeWithFont:[UIFont systemFontOfSize:TEXT_FONTSIZE]
-                                constrainedToSize:CGSizeMake(width - (2 * FRAME_SIDE_BORDER), CGFLOAT_MAX)
-                        ].height + FRAME_TOP_BORDER + LABEL_TEXT_Y + FRAME_BOTTOM_BORDER;
-    
-#pragma clang diagnostic pop
-  }
-  
-  return ceil(calculatedHeight);
-}
-
-- (void)setAttachments:(NSArray *)attachments {
-  for (UIView *view in self.attachmentViews){
-    [view removeFromSuperview];
-  }
-  
-  [self.attachmentViews removeAllObjects];
-  
-  for (BITFeedbackMessageAttachment *attachment in attachments){
-    if (attachment.localURL || attachment.sourceURL) {
-      BITActivityIndicatorButton *imageView = [BITActivityIndicatorButton buttonWithType:UIButtonTypeCustom];
-    
-      if (attachment.localURL){
-        [imageView setImage:[attachment thumbnailWithSize:CGSizeMake(ATTACHMENT_SIZE, ATTACHMENT_SIZE)] forState:UIControlStateNormal];
-        [imageView setShowsActivityIndicator:NO];
-      } else {
-        [imageView setImage:nil forState:UIControlStateNormal];
-        [imageView setShowsActivityIndicator:YES];
-      }
-      [imageView setContentMode:UIViewContentModeScaleAspectFit];
-      [imageView addTarget:self action:@selector(imageButtonPressed:) forControlEvents:UIControlEventTouchUpInside];
-      
-      [self.attachmentViews addObject:imageView];
-    }
-  }
-}
-
-
-- (void)layoutSubviews {
-  if (!self.accessoryBackgroundView){
-    self.accessoryBackgroundView = [[UIView alloc] initWithFrame:CGRectMake(0, 2, self.frame.size.width * 2, self.frame.size.height - 2)];
-    self.accessoryBackgroundView.autoresizingMask = UIViewAutoresizingFlexibleHeight;
-    self.accessoryBackgroundView.clipsToBounds = YES;
-    
-    // colors
-    self.accessoryBackgroundView.backgroundColor = [self backgroundColor];
-  }
-  
-  if (self.accessoryBackgroundView.superview){
-    [self.accessoryBackgroundView removeFromSuperview];
-  }
-  self.contentView.backgroundColor = [self backgroundColor];
-  self.labelTitle.backgroundColor = [self backgroundColor];
-  self.labelText.backgroundColor = [self backgroundColor];
-  
-  self.labelTitle.textColor = TEXTCOLOR_TITLE;
-  if (self.message.status == BITFeedbackMessageStatusSendPending || self.message.status == BITFeedbackMessageStatusSendInProgress) {
-    [self.labelText setTextColor:TEXTCOLOR_PENDING];
-  } else {
-    [self.labelText setTextColor:TEXTCOLOR_DEFAULT];
-  }
-  
-  // background for deletion accessory view
-  
-  
-  // header
-  NSString *dateString = @"";
-  if (self.message.status == BITFeedbackMessageStatusSendPending || self.message.status == BITFeedbackMessageStatusSendInProgress) {
-    dateString = BITHockeyLocalizedString(@"Pending");
-  } else if (self.message.date) {
-    if ([self isSameDayWithDate1:[NSDate date] date2:self.message.date]) {
-      dateString = [self.timeFormatter stringFromDate:self.message.date];
-    } else {
-      dateString = [self.dateFormatter stringFromDate:self.message.date];
-    }
-  }
-  [self.labelTitle setText:dateString];
-  [self.labelTitle setFrame:CGRectMake(FRAME_SIDE_BORDER, FRAME_TOP_BORDER + LABEL_TITLE_Y, self.frame.size.width - (2 * FRAME_SIDE_BORDER), LABEL_TITLE_HEIGHT)];
-  
-  if (self.message.userMessage) {
-    self.labelTitle.textAlignment = NSTextAlignmentRight;
-    self.labelText.textAlignment = NSTextAlignmentRight;
-  } else {
-    self.labelTitle.textAlignment = NSTextAlignmentLeft;
-    self.labelText.textAlignment = NSTextAlignmentLeft;
-  }
-  
-  [self addSubview:self.labelTitle];
-  
-  // text
-  [self.labelText setText:self.message.text];
-  CGSize sizeForTextLabel = CGSizeMake(self.frame.size.width - (2 * FRAME_SIDE_BORDER),
-                                       [[self class] heightForTextInRowWithMessage:self.message tableViewWidth:self.frame.size.width] - LABEL_TEXT_Y - FRAME_BOTTOM_BORDER);
-  
-  [self.labelText setFrame:CGRectMake(FRAME_SIDE_BORDER, LABEL_TEXT_Y, sizeForTextLabel.width, sizeForTextLabel.height)];
-  
-  [self addSubview:self.labelText];
-  
-  CGFloat baseOffsetOfText = CGRectGetMaxY(self.labelText.frame);
-  
-  
-  int i = 0;
-  
-  CGFloat attachmentsPerRow = floor(self.frame.size.width / (FRAME_SIDE_BORDER + ATTACHMENT_SIZE));
-  
-  for (BITActivityIndicatorButton *imageButton in self.attachmentViews) {
-    imageButton.contentMode = UIViewContentModeScaleAspectFit;
-    imageButton.imageView.contentMode = UIViewContentModeScaleAspectFill;
-    
-    if (!self.message.userMessage) {
-      imageButton.frame = CGRectMake(FRAME_SIDE_BORDER + (FRAME_SIDE_BORDER + ATTACHMENT_SIZE) * (i%(int)attachmentsPerRow) , floor(i/attachmentsPerRow)*(FRAME_SIDE_BORDER + ATTACHMENT_SIZE) + baseOffsetOfText , ATTACHMENT_SIZE, ATTACHMENT_SIZE);
-    } else {
-      imageButton.frame = CGRectMake(self.frame.size.width - FRAME_SIDE_BORDER - ATTACHMENT_SIZE -  ((FRAME_SIDE_BORDER + ATTACHMENT_SIZE) *  (i%(int)attachmentsPerRow) ), floor(i/attachmentsPerRow)*(FRAME_SIDE_BORDER + ATTACHMENT_SIZE) + baseOffsetOfText , ATTACHMENT_SIZE, ATTACHMENT_SIZE);
-    }
-    
-    if (!imageButton.superview) {
-      if (self.accessoryBackgroundView.superview) {
-        [self insertSubview:imageButton aboveSubview:self.accessoryBackgroundView];
-      } else {
-        [self addSubview:imageButton];
-      }
-    }
-    
-    i++;
-  }
-  
-  [super layoutSubviews];
-}
-
-- (void)imageButtonPressed:(id)sender {
-  id strongDelegate = self.delegate;
-  if ([strongDelegate respondsToSelector:@selector(listCell:didSelectAttachment:)]) {
-    NSUInteger index = [self.attachmentViews indexOfObject:sender];
-    if (index != NSNotFound && [self.message previewableAttachments].count > index) {
-      BITFeedbackMessageAttachment *attachment = [self.message previewableAttachments][index];
-      [strongDelegate listCell:self didSelectAttachment:attachment];
-    }
-  }
-}
-
-- (NSString *)accessibilityLabel {
-  NSString *messageTime = [self.labelTitle accessibilityLabel];
-  NSString *messageText = [self.labelText accessibilityLabel];
-  return [NSString stringWithFormat:@"%@, %@", messageTime, messageText];
-}
-
-@end
-
-#endif /* HOCKEYSDK_FEATURE_FEEDBACK */
diff --git a/submodules/HockeySDK-iOS/Classes/BITFeedbackListViewController.h b/submodules/HockeySDK-iOS/Classes/BITFeedbackListViewController.h
deleted file mode 100644
index 62fd91d518..0000000000
--- a/submodules/HockeySDK-iOS/Classes/BITFeedbackListViewController.h
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Author: Andreas Linde <mail@andreaslinde.de>
- *
- * Copyright (c) 2012-2014 HockeyApp, Bit Stadium GmbH.
- * All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person
- * obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without
- * restriction, including without limitation the rights to use,
- * copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following
- * conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
- * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
- */
-
-
-#import <UIKit/UIKit.h>
-#import <QuickLook/QuickLook.h>
-
-#import "BITHockeyBaseViewController.h"
-
-/**
- View controller providing a default interface to manage feedback
-
- The message list interface contains options to locally delete single messages
- by swiping over them, or deleting all messages. This will not delete the messages
- on the server though!
- 
- It is also integrates actions to invoke the user interface to compose a new messages,
- reload the list content from the server and changing the users name or email if these
- are allowed to be set.
- 
- To add this view controller to your own app and push it onto a navigation stack,
- don't create the instance yourself, but use the following code to get a correct instance:
- 
-     [[BITHockeyManager sharedHockeyManager].feedbackManager feedbackListViewController:NO]
- 
- To show it modally, use the following code instead:
-
-     [[BITHockeyManager sharedHockeyManager].feedbackManager feedbackListViewController:YES]
- 
- This ensures that the presentation on iOS 6 and iOS 7 will use the current design on each OS Version.
- */
-
-@interface BITFeedbackListViewController : BITHockeyBaseViewController <UITableViewDelegate, UITableViewDataSource, UIActionSheetDelegate, QLPreviewControllerDataSource> {
-}
-
-@end
diff --git a/submodules/HockeySDK-iOS/Classes/BITFeedbackListViewController.m b/submodules/HockeySDK-iOS/Classes/BITFeedbackListViewController.m
deleted file mode 100644
index 14a1dcbc98..0000000000
--- a/submodules/HockeySDK-iOS/Classes/BITFeedbackListViewController.m
+++ /dev/null
@@ -1,804 +0,0 @@
-/*
- * Author: Andreas Linde <mail@andreaslinde.de>
- *
- * Copyright (c) 2012-2014 HockeyApp, Bit Stadium GmbH.
- * All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person
- * obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without
- * restriction, including without limitation the rights to use,
- * copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following
- * conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
- * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
- */
-
-
-#import "HockeySDK.h"
-
-#if HOCKEYSDK_FEATURE_FEEDBACK
-
-#import "HockeySDKPrivate.h"
-
-#import "BITFeedbackManagerPrivate.h"
-#import "BITFeedbackManager.h"
-#import "BITFeedbackListViewController.h"
-#import "BITFeedbackListViewCell.h"
-#import "BITFeedbackComposeViewController.h"
-#import "BITFeedbackUserDataViewController.h"
-#import "BITFeedbackMessage.h"
-#import "BITFeedbackMessageAttachment.h"
-#import "BITAttributedLabel.h"
-
-#import "BITHockeyBaseManagerPrivate.h"
-
-#import "BITHockeyHelper.h"
-#import <QuartzCore/QuartzCore.h>
-#import <QuickLook/QuickLook.h>
-
-#define DEFAULT_TEXTCOLOR BIT_RGBCOLOR(75, 75, 75)
-
-#define BORDER_COLOR BIT_RGBCOLOR(215, 215, 215)
-
-
-@interface BITFeedbackListViewController () <BITFeedbackUserDataDelegate, BITFeedbackComposeViewControllerDelegate, BITAttributedLabelDelegate, BITFeedbackListViewCellDelegate>
-
-@property (nonatomic, weak) BITFeedbackManager *manager;
-@property (nonatomic, strong) NSDateFormatter *lastUpdateDateFormatter;
-@property (nonatomic) BOOL userDataComposeFlow;
-@property (nonatomic, strong) NSArray *cachedPreviewItems;
-@property (nonatomic, strong) NSOperationQueue *thumbnailQueue;
-@property (nonatomic) NSInteger deleteButtonSection;
-@property (nonatomic) NSInteger userButtonSection;
-@property (nonatomic) NSInteger numberOfSectionsBeforeRotation;
-@property (nonatomic) NSInteger numberOfMessagesBeforeRotation;
-
-@end
-
-
-@implementation BITFeedbackListViewController
-
-- (instancetype)initWithStyle:(UITableViewStyle)style {
-  if ((self = [super initWithStyle:style])) {
-    _manager = [BITHockeyManager sharedHockeyManager].feedbackManager;
-    
-    _deleteButtonSection = -1;
-    self.userButtonSection = -1;
-    _userDataComposeFlow = NO;
-    
-    _numberOfSectionsBeforeRotation = -1;
-    _numberOfMessagesBeforeRotation = -1;
-    
-    
-    _lastUpdateDateFormatter = [[NSDateFormatter alloc] init];
-		[_lastUpdateDateFormatter setDateStyle:NSDateFormatterShortStyle];
-		[_lastUpdateDateFormatter setTimeStyle:NSDateFormatterShortStyle];
-		_lastUpdateDateFormatter.locale = [NSLocale currentLocale];
-    
-    _thumbnailQueue = [NSOperationQueue new];
-  }
-  return self;
-}
-
-
-- (void)dealloc {
-  [[NSNotificationCenter defaultCenter] removeObserver:self name:BITHockeyFeedbackMessagesLoadingStarted object:nil];
-  [[NSNotificationCenter defaultCenter] removeObserver:self name:BITHockeyFeedbackMessagesLoadingFinished object:nil];
-  
-  [NSObject cancelPreviousPerformRequestsWithTarget:self selector:@selector(showDelayedUserDataViewController) object:nil];
-}
-
-
-#pragma mark - View lifecycle
-
-- (void)viewDidLoad {
-  [super viewDidLoad];
-  
-  [[NSNotificationCenter defaultCenter] addObserver:self
-                                           selector:@selector(startLoadingIndicator)
-                                               name:BITHockeyFeedbackMessagesLoadingStarted
-                                             object:nil];
-  
-  [[NSNotificationCenter defaultCenter] addObserver:self
-                                           selector:@selector(updateList)
-                                               name:BITHockeyFeedbackMessagesLoadingFinished
-                                             object:nil];
-  
-  self.title = BITHockeyLocalizedString(@"HockeyFeedbackListTitle");
-  
-  self.tableView.delegate = self;
-  self.tableView.dataSource = self;
-  self.tableView.separatorStyle = UITableViewCellSeparatorStyleNone;
-  [self.tableView setAutoresizingMask:UIViewAutoresizingFlexibleHeight | UIViewAutoresizingFlexibleWidth];
-
-  if ([UIRefreshControl class]) {
-    self.refreshControl = [[UIRefreshControl alloc] init];
-    [self.refreshControl addTarget:self action:@selector(reloadList) forControlEvents:UIControlEventValueChanged];
-  } else {
-    self.navigationItem.rightBarButtonItem = [[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemRefresh
-                                                                                           target:self
-                                                                                           action:@selector(reloadList)];
-  }
-}
-
-- (void)startLoadingIndicator {
-  if ([UIRefreshControl class]) {
-    [self.refreshControl beginRefreshing];
-  } else {
-    self.navigationItem.rightBarButtonItem.enabled = NO;
-  }
-}
-
-- (void)stopLoadingIndicator {
-  if ([UIRefreshControl class]) {
-    [self.refreshControl endRefreshing];
-  } else {
-    self.navigationItem.rightBarButtonItem.enabled = YES;
-  }
-}
-
-- (BOOL)isRefreshingWithNewControl {
-  if ([UIRefreshControl class]) {
-    return [self.refreshControl isRefreshing];
-  }
-  return NO;
-}
-
-- (void)reloadList {
-  [self startLoadingIndicator];
-  
-  [self.manager updateMessagesList];
-}
-
-- (void)updateList {
-  dispatch_async(dispatch_get_main_queue(), ^{
-    CGSize contentSize = self.tableView.contentSize;
-    CGPoint contentOffset = self.tableView.contentOffset;
-    
-    [self refreshPreviewItems];
-    [self.tableView reloadData];
-    
-    if (contentSize.height > 0 &&
-        self.tableView.contentSize.height > self.tableView.frame.size.height &&
-        self.tableView.contentSize.height > contentSize.height &&
-        ![self isRefreshingWithNewControl])
-      [self.tableView setContentOffset:CGPointMake(contentOffset.x, self.tableView.contentSize.height - contentSize.height + contentOffset.y) animated:NO];
-    
-    [self stopLoadingIndicator];
-    
-    [self.tableView flashScrollIndicators];
-  });
-}
-
-- (void)viewDidAppear:(BOOL)animated {
-  if (self.userDataComposeFlow) {
-    self.userDataComposeFlow = NO;
-  }
-  BITFeedbackManager *strongManager = self.manager;
-  strongManager.currentFeedbackListViewController = self;
-  
-  [strongManager updateMessagesListIfRequired];
-  
-  if ([strongManager numberOfMessages] == 0 &&
-      [strongManager askManualUserDataAvailable] &&
-      [strongManager requireManualUserDataMissing] &&
-      ![strongManager didAskUserData]
-      ) {
-    self.userDataComposeFlow = YES;
-    
-    if ([strongManager showFirstRequiredPresentationModal]) {
-      [self setUserDataAction:nil];
-    } else {
-      // In case of presenting the feedback in a UIPopoverController it appears
-      // that the animation is not yet finished (though it should) and pushing
-      // the user data view on top of the navigation stack right away will
-      // cause the following warning to appear in the console:
-      // "nested push animation can result in corrupted navigation bar"
-      [self performSelector:@selector(showDelayedUserDataViewController) withObject:nil afterDelay:0.0];
-    }
-  } else {
-    [self.tableView reloadData];
-  }
-  
-  [super viewDidAppear:animated];
-}
-
-- (void)viewWillDisappear:(BOOL)animated {
-  self.manager.currentFeedbackListViewController = nil;
-  
-  [super viewWillDisappear:animated];
-}
-
-
-#pragma mark - Private methods
-
-- (void)showDelayedUserDataViewController {
-  BITFeedbackUserDataViewController *userController = [[BITFeedbackUserDataViewController alloc] initWithStyle:UITableViewStyleGrouped];
-  userController.delegate = self;
-  
-  [self.navigationController pushViewController:userController animated:YES];
-}
-
-- (void)setUserDataAction:(id) __unused sender {
-  BITFeedbackUserDataViewController *userController = [[BITFeedbackUserDataViewController alloc] initWithStyle:UITableViewStyleGrouped];
-  userController.delegate = self;
-  
-  UINavigationController *navController = [self.manager customNavigationControllerWithRootViewController:userController
-                                                                                       presentationStyle:UIModalPresentationFormSheet];
-  
-  [self presentViewController:navController animated:YES completion:nil];
-}
-
-- (void)newFeedbackAction:(id) __unused sender {
-  BITFeedbackManager *strongManager = self.manager;
-  BITFeedbackComposeViewController *composeController = [strongManager feedbackComposeViewController];
-  
-  UINavigationController *navController = [strongManager customNavigationControllerWithRootViewController:composeController
-                                                                                       presentationStyle:UIModalPresentationFormSheet];
-  
-  [self presentViewController:navController animated:YES completion:nil];
-}
-
-- (void)deleteAllMessages {
-  [self.manager deleteAllMessages];
-  [self refreshPreviewItems];
-  
-  [self.tableView reloadData];
-}
-
-- (void)deleteAllMessagesAction:(id) __unused sender {
-  NSString *title = BITHockeyLocalizedString(@"HockeyFeedbackListButtonDeleteAllMessages");
-  NSString *message = BITHockeyLocalizedString(@"HockeyFeedbackListDeleteAllTitle");
-  UIAlertControllerStyle controllerStyle = UIAlertControllerStyleAlert;
-  if (UI_USER_INTERFACE_IDIOM() != UIUserInterfaceIdiomPad) {
-    controllerStyle = UIAlertControllerStyleActionSheet;
-    title = BITHockeyLocalizedString(@"HockeyFeedbackListDeleteAllTitle");
-    message = nil;
-  }
-  __weak typeof(self) weakSelf = self;
-  UIAlertController *alertController = [UIAlertController alertControllerWithTitle:title
-                                                                           message:message
-                                                                    preferredStyle:controllerStyle];
-  UIAlertAction* cancelAction = [BITAlertAction actionWithTitle:BITHockeyLocalizedString(@"HockeyFeedbackListDeleteAllCancel")
-                                                         style:UIAlertActionStyleCancel
-                                                       handler:^(UIAlertAction __unused *action) {}];
-  [alertController addAction:cancelAction];
-  UIAlertAction* deleteAction = [BITAlertAction actionWithTitle:BITHockeyLocalizedString(@"HockeyFeedbackListDeleteAllDelete")
-                                                         style:UIAlertActionStyleDestructive
-                                                       handler:^(UIAlertAction __unused *action) {
-                                                         typeof(self) strongSelf = weakSelf;
-                                                         [strongSelf deleteAllMessages];
-                                                       }];
-  [alertController addAction:deleteAction];
-  [self presentViewController:alertController animated:YES completion:nil];
-}
-
-- (UIView*) viewForShowingActionSheetOnPhone {
-  //find the topmost presented view controller
-  //and use its view
-  UIViewController* topMostPresentedViewController = self.view.window.rootViewController;
-  while(topMostPresentedViewController.presentedViewController) {
-    topMostPresentedViewController = topMostPresentedViewController.presentedViewController;
-  }
-  UIView* view = topMostPresentedViewController.view;
-  
-  if(nil == view) {
-    //hope for the best. Should work
-    //on simple view(controller) hierarchies
-    view = self.view;
-  }
-  
-  return view;
-}
-
-#pragma mark - BITFeedbackUserDataDelegate
-
--(void)userDataUpdateCancelled {
-  if (self.userDataComposeFlow) {
-    if ([self.manager showFirstRequiredPresentationModal]) {
-      __weak typeof(self) weakSelf = self;
-      [self dismissViewControllerAnimated:YES completion:^(void){
-        typeof(self) strongSelf = weakSelf;
-        [strongSelf.tableView reloadData];
-      }];
-    } else {
-      [self.navigationController popToViewController:self animated:YES];
-    }
-  } else {
-    [self dismissViewControllerAnimated:YES completion:^(void){}];
-  }
-}
-
--(void)userDataUpdateFinished {
-  BITFeedbackManager *strongManager = self.manager;
-  [strongManager saveMessages];
-  [self refreshPreviewItems];
-  
-  if (self.userDataComposeFlow) {
-    if ([strongManager showFirstRequiredPresentationModal]) {
-      __weak typeof(self) weakSelf = self;
-      [self dismissViewControllerAnimated:YES completion:^(void){
-        typeof(self) strongSelf = weakSelf;
-        [strongSelf newFeedbackAction:nil];
-      }];
-    } else {
-      BITFeedbackComposeViewController *composeController = [[BITFeedbackComposeViewController alloc] init];
-      composeController.delegate = self;
-      
-      [self.navigationController pushViewController:composeController animated:YES];
-    }
-  } else {
-    [self dismissViewControllerAnimated:YES completion:^(void){}];
-  }
-}
-
-
-#pragma mark - BITFeedbackComposeViewControllerDelegate
-
-- (void)feedbackComposeViewController:(BITFeedbackComposeViewController *)composeViewController
-                  didFinishWithResult:(BITFeedbackComposeResult)composeResult {
-  BITFeedbackManager *strongManager = self.manager;
-  if (self.userDataComposeFlow) {
-    if ([strongManager showFirstRequiredPresentationModal]) {
-      __weak typeof(self) weakSelf = self;
-      [self dismissViewControllerAnimated:YES completion:^(void){
-        typeof(self) strongSelf = weakSelf;
-        [strongSelf.tableView reloadData];
-      }];
-    } else {
-      [self.navigationController popToViewController:self animated:YES];
-    }
-  } else {
-    [self dismissViewControllerAnimated:YES completion:^(void){}];
-  }
-  id strongDelegate = strongManager.delegate;
-  if ([strongDelegate respondsToSelector:@selector(feedbackComposeViewController:didFinishWithResult:)]) {
-    [strongDelegate feedbackComposeViewController:composeViewController didFinishWithResult:composeResult];
-  }
-}
-
-
-#pragma mark - UIViewController Rotation
-
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-implementations"
-- (void)willRotateToInterfaceOrientation:(UIInterfaceOrientation)toInterfaceOrientation duration:(NSTimeInterval)duration {
-  self.numberOfSectionsBeforeRotation = [self numberOfSectionsInTableView:self.tableView];
-  self.numberOfMessagesBeforeRotation = [self.manager numberOfMessages];
-  [self.tableView reloadData];
-  [self.tableView beginUpdates];
-  [self.tableView endUpdates];
-  
-  self.numberOfSectionsBeforeRotation = -1;
-  self.numberOfMessagesBeforeRotation = -1;
-  [self.tableView reloadData];
-  
-  [super willRotateToInterfaceOrientation:toInterfaceOrientation duration:duration];
-}
-#pragma clang diagnostic pop
-
-- (UIInterfaceOrientationMask)supportedInterfaceOrientations{
-  return UIInterfaceOrientationMaskAll;
-}
-
-#pragma mark - Table view data source
-
-- (NSInteger)numberOfSectionsInTableView:(UITableView *) __unused tableView {
-  if (self.numberOfSectionsBeforeRotation >= 0)
-    return self.numberOfSectionsBeforeRotation;
-  
-  NSInteger sections = 2;
-  self.deleteButtonSection = -1;
-  self.userButtonSection = -1;
-  BITFeedbackManager *strongManager = self.manager;
-  if ([strongManager isManualUserDataAvailable] || [strongManager didAskUserData]) {
-    self.userButtonSection = sections;
-    sections++;
-  }
-  
-  if ([strongManager numberOfMessages] > 0) {
-    self.deleteButtonSection = sections;
-    sections++;
-  }
-  
-  return sections;
-}
-
-- (NSInteger)tableView:(UITableView *) __unused tableView numberOfRowsInSection:(NSInteger)section {
-  if (section == 1) {
-    if (self.numberOfMessagesBeforeRotation >= 0)
-      return self.numberOfMessagesBeforeRotation;
-    return [self.manager numberOfMessages];
-  } else {
-    return 1;
-  }
-}
-
-- (CGFloat)tableView:(UITableView *)tableView heightForHeaderInSection:(NSInteger)section {
-  if (section == 0) {
-    return 30;
-  }
-  return [super tableView:tableView heightForHeaderInSection:section];
-}
-
-- (UIView *)tableView:(UITableView *)tableView viewForHeaderInSection:(NSInteger)section {
-  if (section == 0) {
-    BITFeedbackManager *strongManager = self.manager;
-    UIView *containerView = [[UIView alloc] initWithFrame:CGRectMake(0, 0, self.view.frame.size.width, 30.0)];
-    UILabel *textLabel = [[UILabel alloc] initWithFrame:CGRectMake(16.0, 5.0, self.view.frame.size.width - (CGFloat)32.0, 25.0)];
-    textLabel.text = [NSString stringWithFormat:BITHockeyLocalizedString(@"HockeyFeedbackListLastUpdated"),
-                      [strongManager lastCheck] ? [self.lastUpdateDateFormatter stringFromDate:[strongManager lastCheck]] : BITHockeyLocalizedString(@"HockeyFeedbackListNeverUpdated")];
-    textLabel.font = [UIFont systemFontOfSize:10];
-    textLabel.textColor = DEFAULT_TEXTCOLOR;
-    [containerView addSubview:textLabel];
-    
-    return containerView;
-  }
-  
-  return [super tableView:tableView viewForHeaderInSection:section];
-}
-
-- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath {
-  static NSString *CellIdentifier = @"MessageCell";
-  static NSString *LastUpdateIdentifier = @"LastUpdateCell";
-  static NSString *ButtonTopIdentifier = @"ButtonTopCell";
-  static NSString *ButtonBottomIdentifier = @"ButtonBottomCell";
-  static NSString *ButtonDeleteIdentifier = @"ButtonDeleteCell";
-  BITFeedbackManager *strongManager = self.manager;
-  if (indexPath.section == 0 && indexPath.row == 1) {
-    UITableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:LastUpdateIdentifier];
-    
-    if (!cell) {
-      cell = [[UITableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:LastUpdateIdentifier];
-      cell.textLabel.font = [UIFont systemFontOfSize:10];
-      cell.textLabel.textColor = DEFAULT_TEXTCOLOR;
-      cell.accessoryType = UITableViewCellAccessoryNone;
-      cell.selectionStyle = UITableViewCellSelectionStyleNone;
-      cell.textLabel.textAlignment = NSTextAlignmentCenter;
-    }
-    cell.textLabel.accessibilityTraits = UIAccessibilityTraitStaticText;
-    cell.textLabel.text = [NSString stringWithFormat:BITHockeyLocalizedString(@"HockeyFeedbackListLastUpdated"),
-                           [strongManager lastCheck] ? [self.lastUpdateDateFormatter stringFromDate:[strongManager lastCheck]] : BITHockeyLocalizedString(@"HockeyFeedbackListNeverUpdated")];
-    
-    return cell;
-  } else if (indexPath.section == 0 || indexPath.section >= 2) {
-    UITableViewCell *cell = nil;
-    
-    NSString *identifier = nil;
-    if (indexPath.section == 0) {
-      identifier = ButtonTopIdentifier;
-    } else if (indexPath.section == self.userButtonSection) {
-      identifier = ButtonBottomIdentifier;
-    } else {
-      identifier = ButtonDeleteIdentifier;
-    }
-    
-    cell = [tableView dequeueReusableCellWithIdentifier:identifier];
-    
-    if (!cell) {
-      cell = [[UITableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:identifier];
-      
-      cell.textLabel.font = [UIFont systemFontOfSize:14];
-      cell.textLabel.numberOfLines = 0;
-      cell.accessoryType = UITableViewCellAccessoryNone;
-      cell.selectionStyle = UITableViewCellSelectionStyleGray;
-    }
-    
-    // Set accessibilityTraits to UIAccessibilityTraitNone to make sure we're not setting the trait to an incorrect type for recycled cells.
-    cell.textLabel.accessibilityTraits = UIAccessibilityTraitNone;
-    
-    // button
-    NSString *titleString = nil;
-    
-    UIColor *titleColor = BIT_RGBCOLOR(35, 111, 251);
-    if ([self.view respondsToSelector:@selector(tintColor)]){
-      titleColor = self.view.tintColor;
-    }
-    if (indexPath.section == 0) {
-      cell.textLabel.accessibilityTraits = UIAccessibilityTraitButton;
-      if ([strongManager numberOfMessages] == 0) {
-        titleString = BITHockeyLocalizedString(@"HockeyFeedbackListButtonWriteFeedback");
-      } else {
-        titleString = BITHockeyLocalizedString(@"HockeyFeedbackListButtonWriteResponse");
-      }
-    } else if (indexPath.section == self.userButtonSection) {
-      if ([strongManager requireUserName] == BITFeedbackUserDataElementRequired ||
-          ([strongManager requireUserName] == BITFeedbackUserDataElementOptional && [strongManager userName] != nil)
-          ) {
-        cell.textLabel.accessibilityTraits = UIAccessibilityTraitStaticText;
-        titleString = [NSString stringWithFormat:BITHockeyLocalizedString(@"HockeyFeedbackListButtonUserDataWithName"), [strongManager userName] ?: @"-"];
-      } else if ([strongManager requireUserEmail] == BITFeedbackUserDataElementRequired ||
-                 ([strongManager requireUserEmail] == BITFeedbackUserDataElementOptional && [strongManager userEmail] != nil)
-                 ) {
-        cell.textLabel.accessibilityTraits = UIAccessibilityTraitStaticText;
-        titleString = [NSString stringWithFormat:BITHockeyLocalizedString(@"HockeyFeedbackListButtonUserDataWithEmail"), [strongManager userEmail] ?: @"-"];
-      } else if ([strongManager requireUserName] == BITFeedbackUserDataElementOptional) {
-        cell.textLabel.accessibilityTraits = UIAccessibilityTraitButton;
-        titleString = BITHockeyLocalizedString(@"HockeyFeedbackListButtonUserDataSetName");
-      } else {
-        cell.textLabel.accessibilityTraits = UIAccessibilityTraitButton;
-        titleString = BITHockeyLocalizedString(@"HockeyFeedbackListButtonUserDataSetEmail");
-      }
-    } else {
-      cell.textLabel.accessibilityTraits = UIAccessibilityTraitButton;
-      titleString = BITHockeyLocalizedString(@"HockeyFeedbackListButtonDeleteAllMessages");
-      titleColor = BIT_RGBCOLOR(251, 35, 35);
-    }
-
-    cell.textLabel.text = titleString;
-    cell.textLabel.textColor = titleColor;
-
-    return cell;
-  } else {
-    BITFeedbackListViewCell *cell = [tableView dequeueReusableCellWithIdentifier:CellIdentifier];
-    
-    if (!cell) {
-      cell = [[BITFeedbackListViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:CellIdentifier];
-      cell.accessoryType = UITableViewCellAccessoryNone;
-      cell.selectionStyle = UITableViewCellSelectionStyleNone;
-    }
-    
-    if (indexPath.row == 0 || indexPath.row % 2 == 0) {
-      cell.backgroundStyle = BITFeedbackListViewCellBackgroundStyleAlternate;
-    } else {
-      cell.backgroundStyle = BITFeedbackListViewCellBackgroundStyleNormal;
-    }
-
-    BITFeedbackMessage *message = [strongManager messageAtIndex:indexPath.row];
-    cell.message = message;
-    cell.labelText.delegate = self;
-    cell.labelText.userInteractionEnabled = YES;
-    cell.delegate = self;
-    [cell setAttachments:message.previewableAttachments];
-    
-    for (BITFeedbackMessageAttachment *attachment in message.attachments){
-      if (attachment.needsLoadingFromURL && !attachment.isLoading){
-        attachment.isLoading = YES;
-        NSMutableURLRequest *request = [NSMutableURLRequest requestWithURL:(NSURL *)[NSURL URLWithString:attachment.sourceURL]];
-        __weak typeof (self) weakSelf = self;
-        NSURLSessionConfiguration *sessionConfiguration = [NSURLSessionConfiguration defaultSessionConfiguration];
-        __block NSURLSession *session = [NSURLSession sessionWithConfiguration:sessionConfiguration];
-
-        NSURLSessionDataTask *task = [session dataTaskWithRequest:request
-                                                completionHandler: ^(NSData *data, NSURLResponse __unused *response, NSError *error) {
-                                                  typeof (self) strongSelf = weakSelf;
-
-                                                  [session finishTasksAndInvalidate];
-
-                                                  [strongSelf handleResponseForAttachment:attachment responseData:data error:error];
-                                                }];
-        [task resume];
-      }
-    }
-
-    if (indexPath.row != 0) {
-      UIView *lineView1 = [[UIView alloc] initWithFrame:CGRectMake(0, 0, cell.frame.size.width, 1)];
-      lineView1.backgroundColor = BORDER_COLOR;
-      lineView1.autoresizingMask = UIViewAutoresizingFlexibleWidth;
-      [cell addSubview:lineView1];
-    }
-    
-    return cell;
-  }
-}
-
-- (void)handleResponseForAttachment:(BITFeedbackMessageAttachment *)attachment responseData:(NSData *)responseData error:(NSError *) __unused error {
-  attachment.isLoading = NO;
-  if (responseData.length) {
-    dispatch_async(dispatch_get_main_queue(), ^{
-      [attachment replaceData:responseData];
-      [[NSNotificationCenter defaultCenter] postNotificationName:kBITFeedbackUpdateAttachmentThumbnail object:attachment];
-      [[BITHockeyManager sharedHockeyManager].feedbackManager saveMessages];
-      [self.tableView reloadData];
-    });
-  }
-}
-
-
-- (BOOL)tableView:(UITableView *) __unused tableView canEditRowAtIndexPath:(NSIndexPath *)indexPath {
-  if (indexPath.section == 1)
-    return YES;
-  
-  return NO;
-}
-
-- (void)tableView:(UITableView *)tableView commitEditingStyle:(UITableViewCellEditingStyle)editingStyle forRowAtIndexPath:(NSIndexPath *)indexPath {
-  if (editingStyle == UITableViewCellEditingStyleDelete) {
-    BITFeedbackManager *strongManager = self.manager;
-    BITFeedbackMessage *message = [strongManager messageAtIndex:indexPath.row];
-    BOOL messageHasAttachments = ([message attachments].count > 0);
-    
-    if ([strongManager deleteMessageAtIndex:indexPath.row]) {
-      if ([strongManager numberOfMessages] > 0) {
-        [tableView deleteRowsAtIndexPaths:@[indexPath] withRowAnimation:UITableViewRowAnimationAutomatic];
-      } else {
-        [tableView reloadData];
-      }
-      
-      if (messageHasAttachments) {
-        [self refreshPreviewItems];
-      }
-    }
-  }
-}
-
-
-#pragma mark - Table view delegate
-
-- (CGFloat)tableView:(UITableView *) __unused tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath {
-  if (indexPath.section == 0 ) {
-    return 44;
-  }
-  if (indexPath.section >= 2) {
-    return 44;
-  }
-  
-  BITFeedbackMessage *message = [self.manager messageAtIndex:indexPath.row];
-  if (!message) return 44;
-  
-  return [BITFeedbackListViewCell heightForRowWithMessage:message tableViewWidth:self.view.frame.size.width];
-}
-
-- (void)tableView:(UITableView *) __unused tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath {
-  if (indexPath.section == 0) {
-    [self newFeedbackAction:self];
-  } else if (indexPath.section == self.userButtonSection) {
-    [self setUserDataAction:self];
-  } else if (indexPath.section == self.deleteButtonSection) {
-    [self deleteAllMessagesAction:self];
-  }
-}
-
-#pragma mark - BITAttributedLabelDelegate
-
-- (void)attributedLabel:(BITAttributedLabel *) __unused label didSelectLinkWithURL:(NSURL *)url {
-  UIAlertControllerStyle controllerStyle = UIAlertControllerStyleAlert;
-  if (UI_USER_INTERFACE_IDIOM() != UIUserInterfaceIdiomPad) {
-    controllerStyle = UIAlertControllerStyleActionSheet;
-  }
-  UIAlertController *linkAction = [UIAlertController alertControllerWithTitle:[url absoluteString]
-                                                                      message:nil
-                                                               preferredStyle:controllerStyle];
-  UIAlertAction* cancelAction = [BITAlertAction actionWithTitle:BITHockeyLocalizedString(@"HockeyFeedbackListLinkActionCancel")
-                                                         style:UIAlertActionStyleCancel
-                                                       handler:^(UIAlertAction __unused *action) {}];
-  [linkAction addAction:cancelAction];
-  UIAlertAction* openAction = [BITAlertAction actionWithTitle:BITHockeyLocalizedString(@"HockeyFeedbackListLinkActionOpen")
-                                                       style:UIAlertActionStyleDefault
-                                                     handler:^(UIAlertAction __unused *action) {
-                                                       [[UIApplication sharedApplication] openURL:(NSURL*)[NSURL URLWithString:(NSString*)[url absoluteString]]];
-                                                     }];
-  [linkAction addAction:openAction];
-  UIAlertAction* copyAction = [BITAlertAction actionWithTitle:BITHockeyLocalizedString(@"HockeyFeedbackListLinkActionCopy")
-                                                       style:UIAlertActionStyleDefault
-                                                     handler:^(UIAlertAction __unused *action) {
-                                                       UIPasteboard *pasteboard = [UIPasteboard generalPasteboard];
-                                                       pasteboard.URL = [NSURL URLWithString:(NSString*)[url absoluteString]];
-                                                     }];
-  [linkAction addAction:copyAction];
-  [self presentViewController:linkAction animated:YES completion:nil];
-}
-
-#pragma mark - UIActionSheetDelegate
-
-- (void)actionSheet:(UIActionSheet *)actionSheet didDismissWithButtonIndex:(NSInteger)buttonIndex {
-  if (buttonIndex == actionSheet.cancelButtonIndex) {
-    return;
-  }
-  
-  if ([actionSheet tag] == 0) {
-    if (buttonIndex == [actionSheet destructiveButtonIndex]) {
-      [self deleteAllMessages];
-    }
-  } else {
-    if (buttonIndex == [actionSheet firstOtherButtonIndex]) {
-      [[UIApplication sharedApplication] openURL:(NSURL *)[NSURL URLWithString:actionSheet.title]];
-    } else {
-      UIPasteboard *pasteboard = [UIPasteboard generalPasteboard];
-      pasteboard.URL = [NSURL URLWithString:actionSheet.title];
-    }
-  }
-}
-
-#pragma mark - ListViewCellDelegate
-
-- (void)listCell:(id) __unused cell didSelectAttachment:(BITFeedbackMessageAttachment *)attachment {
-  if (!self.cachedPreviewItems){
-    [self refreshPreviewItems];
-  }
-  
-  QLPreviewController *previewController = [[QLPreviewController alloc] init];
-  previewController.dataSource = self;
-  
-  [self presentViewController:previewController animated:YES completion:nil];
-  
-  if (self.cachedPreviewItems.count > [self.cachedPreviewItems indexOfObject:attachment]) {
-    [previewController setCurrentPreviewItemIndex:[self.cachedPreviewItems indexOfObject:attachment]];
-  }
-}
-
-- (void)refreshPreviewItems {
-  self.cachedPreviewItems = nil;
-  NSMutableArray *collectedAttachments = [NSMutableArray new];
-  BITFeedbackManager *strongManager = self.manager;
-  for (uint i = 0; i < strongManager.numberOfMessages; i++) {
-    BITFeedbackMessage *message = [strongManager messageAtIndex:i];
-    [collectedAttachments addObjectsFromArray:message.previewableAttachments];
-  }
-  
-  self.cachedPreviewItems = collectedAttachments;
-}
-
-- (NSInteger)numberOfPreviewItemsInPreviewController:(QLPreviewController *) __unused controller {
-  return self.cachedPreviewItems.count;
-}
-
-- (id <QLPreviewItem>)previewController:(QLPreviewController *)controller previewItemAtIndex:(NSInteger)index {
-  if (index >= 0) {
-    __weak QLPreviewController* blockController = controller;
-    BITFeedbackMessageAttachment *attachment = self.cachedPreviewItems[index];
-    
-    if (attachment.needsLoadingFromURL && !attachment.isLoading) {
-      attachment.isLoading = YES;
-      NSMutableURLRequest *request = [NSMutableURLRequest requestWithURL:(NSURL *)[NSURL URLWithString:attachment.sourceURL]];
-      
-      __weak typeof (self) weakSelf = self;
-      NSURLSessionConfiguration *sessionConfiguration = [NSURLSessionConfiguration defaultSessionConfiguration];
-      __block NSURLSession *session = [NSURLSession sessionWithConfiguration:sessionConfiguration];
-
-      NSURLSessionDataTask *task = [session dataTaskWithRequest:request
-                                              completionHandler: ^(NSData *data, NSURLResponse __unused *response, NSError __unused *error) {
-                                                dispatch_async(dispatch_get_main_queue(), ^{
-                                                  typeof (self) strongSelf = weakSelf;
-
-                                                  [session finishTasksAndInvalidate];
-
-                                                  [strongSelf previewController:blockController updateAttachment:attachment data:data];
-                                                });
-                                              }];
-      [task resume];
-      return attachment;
-    } else {
-      return self.cachedPreviewItems[index];
-    }
-  }
-  
-  return [self placeholder];
-}
-
-- (void)previewController:(QLPreviewController *)controller updateAttachment:(BITFeedbackMessageAttachment *)attachment data:( NSData *)data {
-  attachment.isLoading = NO;
-  if (data.length) {
-    [attachment replaceData:data];
-    [controller reloadData];
-    
-    [[BITHockeyManager sharedHockeyManager].feedbackManager saveMessages];
-  } else {
-    [controller reloadData];
-  }
-}
-
-- (BITFeedbackMessageAttachment *)placeholder {
-  UIImage *placeholderImage = bit_imageNamed(@"FeedbackPlaceHolder", BITHOCKEYSDK_BUNDLE);
-
-  BITFeedbackMessageAttachment *placeholder = [BITFeedbackMessageAttachment attachmentWithData:UIImageJPEGRepresentation(placeholderImage, (CGFloat)0.7) contentType:@"image/jpeg"];
-  
-  return placeholder;
-}
-
-@end
-
-#endif /* HOCKEYSDK_FEATURE_FEEDBACK */
diff --git a/submodules/HockeySDK-iOS/Classes/BITFeedbackManager.h b/submodules/HockeySDK-iOS/Classes/BITFeedbackManager.h
deleted file mode 100644
index 507788df71..0000000000
--- a/submodules/HockeySDK-iOS/Classes/BITFeedbackManager.h
+++ /dev/null
@@ -1,365 +0,0 @@
-/*
- * Author: Andreas Linde <mail@andreaslinde.de>
- *
- * Copyright (c) 2012-2014 HockeyApp, Bit Stadium GmbH.
- * All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person
- * obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without
- * restriction, including without limitation the rights to use,
- * copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following
- * conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
- * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
- */
-
-
-#import <Foundation/Foundation.h>
-
-#import "BITHockeyBaseManager.h"
-#import "BITFeedbackListViewController.h"
-#import "BITFeedbackComposeViewController.h"
-
-#import "HockeySDKNullability.h"
-NS_ASSUME_NONNULL_BEGIN
-
-// Notification message which tells that loading messages finished
-#define BITHockeyFeedbackMessagesLoadingStarted @"BITHockeyFeedbackMessagesLoadingStarted"
-
-// Notification message which tells that loading messages finished
-#define BITHockeyFeedbackMessagesLoadingFinished @"BITHockeyFeedbackMessagesLoadingFinished"
-
-
-/**
- *  Defines behavior of the user data field
- */
-typedef NS_ENUM(NSInteger, BITFeedbackUserDataElement) {
-  /**
-   *  don't ask for this user data element at all
-   */
-  BITFeedbackUserDataElementDontShow = 0,
-  /**
-   *  the user may provide it, but does not have to
-   */
-  BITFeedbackUserDataElementOptional = 1,
-  /**
-   *  the user has to provide this to continue
-   */
-  BITFeedbackUserDataElementRequired = 2
-};
-
-/**
- *  Available modes for opening the feedback compose interface with a screenshot attached
- */
-typedef NS_ENUM(NSInteger, BITFeedbackObservationMode) {
-  /**
-   *  No SDK provided trigger is active.
-   */
-  BITFeedbackObservationNone = 0,
-  /**
-   *  Triggers when the user takes a screenshot. This will grab the latest image from the camera roll. Requires iOS 7 or later!
-   */
-  BITFeedbackObservationModeOnScreenshot = 1,
-  /**
-   *  Triggers when the user taps with three fingers on the screen. Captures a screenshot and attaches it to the composer.
-   */
-  BITFeedbackObservationModeThreeFingerTap = 2,
-  /**
-   * Allows both BITFeedbackObservationModeOnScreenshot and BITFeedbackObservationModeThreeFingerTap at the same time.
-   */
-   BITFeedbackObservationModeAll = 3
-};
-
-
-@class BITFeedbackMessage;
-@protocol BITFeedbackManagerDelegate;
-
-/**
- The feedback module.
- 
- This is the HockeySDK module for letting your users communicate directly with you via
- the app and an integrated user interface. It provides a single threaded
- discussion with a user running your app.
- 
- You should never create your own instance of `BITFeedbackManager` but use the one provided
- by the `[BITHockeyManager sharedHockeyManager]`:
- 
-     [BITHockeyManager sharedHockeyManager].feedbackManager
-
- The user interface provides a list view that can be presented modally using
- `[BITFeedbackManager showFeedbackListView]` or adding
- `[BITFeedbackManager feedbackListViewController:]` to push onto a navigation stack.
- This list integrates all features to load new messages, write new messages, view messages
- and ask the user for additional (optional) data like name and email.
- 
- If the user provides the email address, all responses from the server will also be sent
- to the user via email and the user is also able to respond directly via email, too.
- 
- The message list interface also contains options to locally delete single messages
- by swiping over them, or deleting all messages. This will not delete the messages
- on the server, though!
- 
- It also integrates actions to invoke the user interface to compose a new message,
- reload the list content from the server and change the users name or email if these
- are allowed to be set.
- 
- It is also possible to invoke the user interface to compose a new message in your
- own code, by calling `[BITFeedbackManager showFeedbackComposeView]` modally or adding
- `[BITFeedbackManager feedbackComposeViewController]` to push onto a navigation stack.
- 
- If new messages are written while the device is offline, the SDK automatically retries to
- send them once the app starts again or gets active again, or if the notification
- `BITHockeyNetworkDidBecomeReachableNotification` is fired.
- 
- A third option is to include the `BITFeedbackActivity` into an UIActivityViewController.
- This can be useful if you present some data that users can not only share but also
- report back to the developer because they have some problems, e.g. webcams not working
- any more. The activity provides a default title and image that can also be customized.
-
- New messages are automatically loaded on startup, when the app becomes active again
- or when the notification `BITHockeyNetworkDidBecomeReachableNotification` is fired. This
- only happens if the user ever did initiate a conversation by writing the first
- feedback message. The app developer has to fire this notification to trigger another retry
- when it detects the device having network access again. The SDK only retries automatically
- when the app becomes active again.
- 
- Implementing the `BITFeedbackManagerDelegate` protocol will notify your app when a new
- message was received from the server. The `BITFeedbackComposeViewControllerDelegate`
- protocol informs your app about events related to sending feedback messages.
- 
- */
-
-@interface BITFeedbackManager : BITHockeyBaseManager
-
-///-----------------------------------------------------------------------------
-/// @name General settings
-///-----------------------------------------------------------------------------
-
-
-/**
- Define if a name has to be provided by the user when providing feedback
-
- - `BITFeedbackUserDataElementDontShow`: Don't ask for this user data element at all
- - `BITFeedbackUserDataElementOptional`: The user may provide it, but does not have to
- - `BITFeedbackUserDataElementRequired`: The user has to provide this to continue
-
- The default value is `BITFeedbackUserDataElementOptional`.
-
- @warning If you provide a non nil value for the `BITFeedbackManager` class via
- `[BITHockeyManagerDelegate userNameForHockeyManager:componentManager:]` then this
- property will automatically be set to `BITFeedbackUserDataElementDontShow`
-
- @see BITFeedbackUserDataElement
- @see requireUserEmail
- @see `[BITHockeyManagerDelegate userNameForHockeyManager:componentManager:]`
- */
-@property (nonatomic, readwrite) BITFeedbackUserDataElement requireUserName;
-
-
-/**
- Define if an email address has to be provided by the user when providing feedback
- 
- If the user provides the email address, all responses from the server will also be send
- to the user via email and the user is also able to respond directly via email too.
-
- - `BITFeedbackUserDataElementDontShow`: Don't ask for this user data element at all
- - `BITFeedbackUserDataElementOptional`: The user may provide it, but does not have to
- - `BITFeedbackUserDataElementRequired`: The user has to provide this to continue
- 
- The default value is `BITFeedbackUserDataElementOptional`.
-
- @warning If you provide a non nil value for the `BITFeedbackManager` class via
- `[BITHockeyManagerDelegate userEmailForHockeyManager:componentManager:]` then this
- property will automatically be set to `BITFeedbackUserDataElementDontShow`
- 
- @see BITFeedbackUserDataElement
- @see requireUserName
- @see `[BITHockeyManagerDelegate userEmailForHockeyManager:componentManager:]`
- */
-@property (nonatomic, readwrite) BITFeedbackUserDataElement requireUserEmail;
-
-
-/**
- Indicates if an alert should be shown when new messages have arrived
- 
- This lets the user view the new feedback by choosing the appropriate option
- in the alert sheet, and the `BITFeedbackListViewController` will be shown.
- 
- The alert is only shown, if the newest message didn't originate from the current user.
- This requires the users email address to be present! The optional userid property
- cannot be used, because users could also answer via email and then this information
- is not available.
- 
- Default is `YES`
- @see feedbackListViewController:
- @see requireUserEmail
- @see `[BITHockeyManagerDelegate userEmailForHockeyManager:componentManager:]`
- */
-@property (nonatomic, readwrite) BOOL showAlertOnIncomingMessages;
-
-
-/**
- Define the trigger that opens the feedback composer and attaches a screenshot
- 
- The following modes are available:
- 
- - `BITFeedbackObservationNone`: No SDK based trigger is active. You can implement your
-   own trigger and then call `[[BITHockeyManager sharedHockeyManager].feedbackManager showFeedbackComposeViewWithGeneratedScreenshot];` to handle your custom events
-   that should trigger this.
- - `BITFeedbackObservationModeOnScreenshot`: Triggers when the user takes a screenshot.
-    This will grab the latest image from the camera roll. It also requires to add a NSPhotoLibraryUsageDescription to your app's Info.plist.
- - `BITFeedbackObservationModeThreeFingerTap`: Triggers when the user taps on the screen with three fingers. Takes a screenshot and attaches it to the composer. It also requires to add a NSPhotoLibraryUsageDescription to your app's Info.plist.
- 
- Default is `BITFeedbackObservationNone`.
- If BITFeedbackManger was disabled, setting a new value will be ignored.
- @see `[BITHockeyManager disableFeedbackManager]`
- 
- @see showFeedbackComposeViewWithGeneratedScreenshot
- */
-@property (nonatomic, readwrite) BITFeedbackObservationMode feedbackObservationMode;
-
-/**
- Don't show the option to add images from the photo library
- 
- This is helpful if your application is landscape only, since the system UI for
- selecting an image from the photo library is portrait only
- 
- This setting is used for all feedback compose views that are created by the
- `BITFeedbackManager`. If you invoke your own `BITFeedbackComposeViewController`,
- then set the appropriate property on the view controller directl!.
- */
-@property (nonatomic) BOOL feedbackComposeHideImageAttachmentButton;
-
-
-///-----------------------------------------------------------------------------
-/// @name User Interface
-///-----------------------------------------------------------------------------
-
-
-/**
- Indicates if a forced user data UI presentation is shown modal
- 
- If `requireUserName` and/or `requireUserEmail` are enabled, the first presentation
- of `feedbackListViewController:` and subsequent `feedbackComposeViewController:`
- will automatically present a UI that lets the user provide this data and compose
- a message. By default this is shown (since SDK 3.1) as a modal sheet.
- 
- If you want the SDK to push this UI onto the navigation stack in this specific scenario,
- then change the property to `NO`.
- 
- @warning If you are presenting the `BITFeedbackListViewController` in a popover, this property should not be changed!
- 
- Default is `YES`
- @see requireUserName
- @see requireUserEmail
- @see showFeedbackComposeView
- @see feedbackComposeViewController
- @see showFeedbackListView
- @see feedbackListViewController:
- */
-@property (nonatomic, readwrite) BOOL showFirstRequiredPresentationModal;
-
-
-/**
- Return a screenshot UIImage instance from the current visible screen
-
- @return UIImage instance containing a screenshot of the current screen
- */
-- (UIImage *)screenshot;
-
-
-/**
- Present the modal feedback list user interface.
- 
- @warning This methods needs to be called on the main thread!
- */
-- (void)showFeedbackListView;
-
-
-/**
- Create an feedback list view
- 
- @param modal Return a view ready for modal presentation with integrated navigation bar
- @return `BITFeedbackListViewController` The feedback list view controller,
- e.g. to push it onto a navigation stack.
- */
-- (BITFeedbackListViewController *)feedbackListViewController:(BOOL)modal;
-
-
-/**
- Present the modal feedback compose message user interface.
- 
- @warning This methods needs to be called on the main thread!
- */
-- (void)showFeedbackComposeView;
-
-/**
- Present the modal feedback compose message user interface with the items given. 
- 
- All NSString-Content in the array will be concatenated and result in the message,
- while all UIImage and NSData-instances will be turned into attachments.
- 
- Alternatively you can implement the `preparedItemsForFeedbackManager:` delegate method
- and call `showFeedbackComposeView` instead. If you use both, the items from the delegate method
- and the items passed with this method will be combined.
- 
- @param items an NSArray with objects that should be attached
- @see `[BITFeedbackComposeViewController prepareWithItems:]`
- @see `BITFeedbackManagerDelegate preparedItemsForFeedbackManager:`
- @warning This methods needs to be called on the main thread!
- */
-- (void)showFeedbackComposeViewWithPreparedItems:(nullable NSArray *)items;
-
-/**
- Presents a modal feedback compose interface with a screenshot attached which is taken at the time of calling this method.
- 
- This should be used when your own trigger fires. The following code should be used:
- 
-     [[BITHockeyManager sharedHockeyManager].feedbackManager showFeedbackComposeViewWithGeneratedScreenshot];
- 
- @see feedbackObservationMode
- @warning This methods needs to be called on the main thread!
- */
-- (void)showFeedbackComposeViewWithGeneratedScreenshot;
-
-
-/**
- Create a feedback compose view
-
- This method also adds items from `feedbackComposerPreparedItems` and
- the `preparedItemsForFeedbackManager:` delegate methods to the instance of
- `BITFeedbackComposeViewController` that will be returned.
- 
- Example to show a modal feedback compose UI with prefilled text
-     
-     BITFeedbackComposeViewController *feedbackCompose = [[BITHockeyManager sharedHockeyManager].feedbackManager feedbackComposeViewController];
-     
-     [feedbackCompose prepareWithItems:
-         @[@"Adding some example default text and also adding a link.",
-         [NSURL URLWithString:@"http://hockeayyp.net/"]]];
- 
-     UINavigationController *navController = [[UINavigationController alloc] initWithRootViewController:feedbackCompose];
-     navController.modalPresentationStyle = UIModalPresentationFormSheet;
-     [self presentViewController:navController animated:YES completion:nil];
-
- @return `BITFeedbackComposeViewController` The compose feedback view controller,
- e.g. to push it onto a navigation stack.
- */
-- (BITFeedbackComposeViewController *)feedbackComposeViewController;
-
-@end
-
-NS_ASSUME_NONNULL_END
diff --git a/submodules/HockeySDK-iOS/Classes/BITFeedbackManager.m b/submodules/HockeySDK-iOS/Classes/BITFeedbackManager.m
deleted file mode 100644
index 04f7d16bd6..0000000000
--- a/submodules/HockeySDK-iOS/Classes/BITFeedbackManager.m
+++ /dev/null
@@ -1,1302 +0,0 @@
-/*
- * Author: Andreas Linde <mail@andreaslinde.de>
- *
- * Copyright (c) 2012-2016 HockeyApp, Bit Stadium GmbH.
- * All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person
- * obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without
- * restriction, including without limitation the rights to use,
- * copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following
- * conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
- * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
- */
-
-
-#import "HockeySDK.h"
-
-#if HOCKEYSDK_FEATURE_FEEDBACK
-
-#import <Photos/Photos.h>
-
-#import "HockeySDKPrivate.h"
-
-#import "BITFeedbackManager.h"
-#import "BITFeedbackMessageAttachment.h"
-#import "BITFeedbackManagerPrivate.h"
-#import "BITHockeyBaseManagerPrivate.h"
-
-#import "HockeySDKNullability.h"
-#import "BITHockeyHelper.h"
-#import "BITHockeyHelper+Application.h"
-#import "BITHockeyAppClient.h"
-
-#define kBITFeedbackUserDataAsked   @"HockeyFeedbackUserDataAsked"
-#define kBITFeedbackDateOfLastCheck  @"HockeyFeedbackDateOfLastCheck"
-#define kBITFeedbackMessages        @"HockeyFeedbackMessages"
-#define kBITFeedbackToken           @"HockeyFeedbackToken"
-#define kBITFeedbackUserID          @"HockeyFeedbackuserID"
-#define kBITFeedbackName            @"HockeyFeedbackName"
-#define kBITFeedbackEmail           @"HockeyFeedbackEmail"
-#define kBITFeedbackLastMessageID   @"HockeyFeedbackLastMessageID"
-#define kBITFeedbackAppID           @"HockeyFeedbackAppID"
-
-NSString *const kBITFeedbackUpdateAttachmentThumbnail = @"BITFeedbackUpdateAttachmentThumbnail";
-
-typedef void (^BITLatestImageFetchCompletionBlock)(UIImage *_Nonnull latestImage);
-
-@interface BITFeedbackManager () <UIGestureRecognizerDelegate>
-
-@property (nonatomic, strong) NSFileManager *fileManager;
-@property (nonatomic, copy) NSString *settingsFile;
-@property (nonatomic, weak) id appDidBecomeActiveObserver;
-@property (nonatomic, weak) id appDidEnterBackgroundObserver;
-@property (nonatomic, weak) id networkDidBecomeReachableObserver;
-@property (nonatomic) BOOL incomingMessagesAlertShowing;
-@property (nonatomic) BOOL didEnterBackgroundState;
-@property (nonatomic) BOOL networkRequestInProgress;
-@property (nonatomic) BITFeedbackObservationMode observationMode;
-
-@end
-
-@implementation BITFeedbackManager
-
-#pragma mark - Initialization
-
-- (instancetype)init {
-  if ((self = [super init])) {
-    _currentFeedbackListViewController = nil;
-    _currentFeedbackComposeViewController = nil;
-    _didAskUserData = NO;
-
-    _requireUserName = BITFeedbackUserDataElementOptional;
-    _requireUserEmail = BITFeedbackUserDataElementOptional;
-    _showAlertOnIncomingMessages = YES;
-    _showFirstRequiredPresentationModal = YES;
-
-    _disableFeedbackManager = NO;
-    _networkRequestInProgress = NO;
-    _incomingMessagesAlertShowing = NO;
-    _lastCheck = nil;
-    _token = nil;
-    _lastMessageID = nil;
-
-    self.feedbackList = [NSMutableArray array];
-
-    _fileManager = [[NSFileManager alloc] init];
-
-    _settingsFile = [bit_settingsDir() stringByAppendingPathComponent:BITHOCKEY_FEEDBACK_SETTINGS];
-
-    _userID = nil;
-    _userName = nil;
-    _userEmail = nil;
-  }
-  return self;
-}
-
-- (void)dealloc {
-  [self unregisterObservers];
-}
-
-- (void)didBecomeActiveActions {
-  if ([self isFeedbackManagerDisabled]) return;
-  if (!self.didEnterBackgroundState) return;
-
-  self.didEnterBackgroundState = NO;
-
-  if ([self.feedbackList count] == 0) {
-    [self loadMessages];
-  } else {
-    [self updateAppDefinedUserData];
-  }
-
-  if ([self allowFetchingNewMessages]) {
-    [self updateMessagesList];
-  }
-}
-
-- (void)didEnterBackgroundActions {
-  self.didEnterBackgroundState = NO;
-
-  if ([BITHockeyHelper applicationState] == BITApplicationStateBackground) {
-    self.didEnterBackgroundState = YES;
-  }
-}
-
-#pragma mark - Observers
-
-- (void)registerObservers {
-  __weak typeof(self) weakSelf = self;
-  if (nil == self.appDidEnterBackgroundObserver) {
-    self.appDidEnterBackgroundObserver = [[NSNotificationCenter defaultCenter] addObserverForName:UIApplicationDidEnterBackgroundNotification
-                                                                                       object:nil
-                                                                                        queue:NSOperationQueue.mainQueue
-                                                                                   usingBlock:^(NSNotification __unused *note) {
-                                                                                       typeof(self) strongSelf = weakSelf;
-                                                                                       [strongSelf didEnterBackgroundActions];
-                                                                                   }];
-  }
-  if (nil == self.appDidBecomeActiveObserver) {
-    self.appDidBecomeActiveObserver = [[NSNotificationCenter defaultCenter] addObserverForName:UIApplicationDidBecomeActiveNotification
-                                                                                    object:nil
-                                                                                     queue:NSOperationQueue.mainQueue
-                                                                                usingBlock:^(NSNotification __unused *note) {
-                                                                                    typeof(self) strongSelf = weakSelf;
-                                                                                    [strongSelf didBecomeActiveActions];
-                                                                                }];
-  }
-  if (nil == self.networkDidBecomeReachableObserver) {
-    self.networkDidBecomeReachableObserver = [[NSNotificationCenter defaultCenter] addObserverForName:BITHockeyNetworkDidBecomeReachableNotification
-                                                                                           object:nil
-                                                                                            queue:NSOperationQueue.mainQueue
-                                                                                       usingBlock:^(NSNotification __unused *note) {
-                                                                                           typeof(self) strongSelf = weakSelf;
-                                                                                           [strongSelf didBecomeActiveActions];
-                                                                                       }];
-  }
-}
-
-- (void)unregisterObservers {
-  id strongDidEnterBackgroundObserver = self.appDidEnterBackgroundObserver;
-  id strongDidBecomeActiveObserver = self.appDidBecomeActiveObserver;
-  id strongNetworkDidBecomeReachableObserver = self.networkDidBecomeReachableObserver;
-  if (strongDidEnterBackgroundObserver) {
-    [[NSNotificationCenter defaultCenter] removeObserver:strongDidEnterBackgroundObserver];
-    self.appDidEnterBackgroundObserver = nil;
-  }
-  if (strongDidBecomeActiveObserver) {
-    [[NSNotificationCenter defaultCenter] removeObserver:strongDidBecomeActiveObserver];
-    self.appDidBecomeActiveObserver = nil;
-  }
-  if (strongNetworkDidBecomeReachableObserver) {
-    [[NSNotificationCenter defaultCenter] removeObserver:strongNetworkDidBecomeReachableObserver];
-    self.networkDidBecomeReachableObserver = nil;
-  }
-}
-
-#pragma mark - Private methods
-
-- (NSString *)uuidString {
-  CFUUIDRef theToken = CFUUIDCreate(NULL);
-  NSString *stringUUID = (__bridge_transfer NSString *) CFUUIDCreateString(NULL, theToken);
-  CFRelease(theToken);
-
-  return stringUUID;
-}
-
-- (NSString *)uuidAsLowerCaseAndShortened {
-  return [[[self uuidString] lowercaseString] stringByReplacingOccurrencesOfString:@"-" withString:@""];
-}
-
-#pragma mark - Feedback Modal UI
-
-- (UIImage *)screenshot {
-  return bit_screenshot();
-}
-
-- (BITFeedbackListViewController *)feedbackListViewController:(BOOL)modal {
-  return [[BITFeedbackListViewController alloc] initWithStyle:UITableViewStyleGrouped modal:modal];
-}
-
-- (void)showFeedbackListView {
-  if (self.currentFeedbackListViewController) {
-    BITHockeyLogDebug(@"INFO: update view already visible, aborting");
-    return;
-  }
-  dispatch_async(dispatch_get_main_queue(), ^{
-      [self showView:[self feedbackListViewController:YES]];
-  });
-}
-
-
-- (BITFeedbackComposeViewController *)feedbackComposeViewController {
-  BITFeedbackComposeViewController *composeViewController = [[BITFeedbackComposeViewController alloc] init];
-
-  NSArray *preparedItems = [NSArray array];
-  id strongDelegate = self.delegate;
-  if ([strongDelegate respondsToSelector:@selector(preparedItemsForFeedbackManager:)]) {
-    preparedItems = [preparedItems arrayByAddingObjectsFromArray:(NSArray *)[strongDelegate preparedItemsForFeedbackManager:self]];
-  }
-
-  [composeViewController prepareWithItems:preparedItems];
-  [composeViewController setHideImageAttachmentButton:self.feedbackComposeHideImageAttachmentButton];
-
-  // by default set the delegate to be identical to the one of BITFeedbackManager
-  [composeViewController setDelegate:strongDelegate];
-  return composeViewController;
-}
-
-- (void)showFeedbackComposeView {
-  [self showFeedbackComposeViewWithPreparedItems:nil];
-}
-
-- (void)showFeedbackComposeViewWithPreparedItems:(NSArray *)items {
-  if (self.currentFeedbackComposeViewController) {
-    BITHockeyLogDebug(@"INFO: Feedback view already visible, aborting");
-    return;
-  }
-  BITFeedbackComposeViewController *composeView = [self feedbackComposeViewController];
-  [composeView prepareWithItems:items];
-  dispatch_async(dispatch_get_main_queue(), ^{
-      [self showView:composeView];
-  });
-}
-
-- (void)showFeedbackComposeViewWithGeneratedScreenshot {
-  UIImage *screenshot = bit_screenshot();
-  [self showFeedbackComposeViewWithPreparedItems:@[screenshot]];
-}
-
-#pragma mark - Manager Control
-
-- (void)startManager {
-  if ([self isFeedbackManagerDisabled]) return;
-
-  [self registerObservers];
-
-  [self isiOS10PhotoPolicySet];
-
-  // we are already delayed, so the notification already came in and this won't invoked twice
-  switch ([BITHockeyHelper applicationState]) {
-    case BITApplicationStateActive:
-      // we did startup, so yes we are coming from background
-      self.didEnterBackgroundState = YES;
-
-      [self didBecomeActiveActions];
-      break;
-    case BITApplicationStateBackground:
-    case BITApplicationStateInactive:
-    case BITApplicationStateUnknown:
-      // do nothing, wait for active state
-      break;
-  }
-}
-
-- (BOOL)allowFetchingNewMessages {
-  BOOL fetchNewMessages = YES;
-  id strongDelegate = [BITHockeyManager sharedHockeyManager].delegate;
-  if ([strongDelegate respondsToSelector:@selector(allowAutomaticFetchingForNewFeedbackForManager:)]) {
-    fetchNewMessages = [strongDelegate allowAutomaticFetchingForNewFeedbackForManager:self];
-  }
-  return fetchNewMessages;
-}
-
-- (void)updateMessagesList {
-  if (self.networkRequestInProgress) return;
-
-  NSArray *pendingMessages = [self messagesWithStatus:BITFeedbackMessageStatusSendPending];
-  if ([pendingMessages count] > 0) {
-    [self submitPendingMessages];
-  } else {
-    [self fetchMessageUpdates];
-  }
-}
-
-- (void)updateMessagesListIfRequired {
-  double now = [[NSDate date] timeIntervalSince1970];
-  if ((now - [self.lastCheck timeIntervalSince1970] > 30)) {
-    [self updateMessagesList];
-  }
-}
-
-- (BOOL)updateUserIDUsingKeychainAndDelegate {
-  BOOL availableViaDelegate = NO;
-
-  NSString *userID = [self stringValueFromKeychainForKey:kBITHockeyMetaUserID];
-  id strongDelegate = [BITHockeyManager sharedHockeyManager].delegate;
-  if ([strongDelegate respondsToSelector:@selector(userIDForHockeyManager:componentManager:)]) {
-    userID = [strongDelegate userIDForHockeyManager:[BITHockeyManager sharedHockeyManager] componentManager:self];
-  }
-
-  if (userID) {
-    availableViaDelegate = YES;
-    self.userID = userID;
-  }
-
-  return availableViaDelegate;
-}
-
-- (BOOL)updateUserNameUsingKeychainAndDelegate {
-  BOOL availableViaDelegate = NO;
-
-  NSString *userName = [self stringValueFromKeychainForKey:kBITHockeyMetaUserName];
-  id strongDelegate = [BITHockeyManager sharedHockeyManager].delegate;
-  if ([strongDelegate respondsToSelector:@selector(userNameForHockeyManager:componentManager:)]) {
-    userName = [strongDelegate userNameForHockeyManager:[BITHockeyManager sharedHockeyManager] componentManager:self];
-  }
-
-  if (userName) {
-    availableViaDelegate = YES;
-    self.userName = userName;
-    self.requireUserName = BITFeedbackUserDataElementDontShow;
-  }
-
-  return availableViaDelegate;
-}
-
-- (BOOL)updateUserEmailUsingKeychainAndDelegate {
-  BOOL availableViaDelegate = NO;
-
-  NSString *userEmail = [self stringValueFromKeychainForKey:kBITHockeyMetaUserEmail];
-  id strongDelegate = [BITHockeyManager sharedHockeyManager].delegate;
-  if ([strongDelegate respondsToSelector:@selector(userEmailForHockeyManager:componentManager:)]) {
-    userEmail = [strongDelegate userEmailForHockeyManager:[BITHockeyManager sharedHockeyManager] componentManager:self];
-  }
-
-  if (userEmail) {
-    availableViaDelegate = YES;
-    self.userEmail = userEmail;
-    self.requireUserEmail = BITFeedbackUserDataElementDontShow;
-  }
-
-  return availableViaDelegate;
-}
-
-- (void)updateAppDefinedUserData {
-  [self updateUserIDUsingKeychainAndDelegate];
-  [self updateUserNameUsingKeychainAndDelegate];
-  [self updateUserEmailUsingKeychainAndDelegate];
-
-  // if both values are shown via the delegates, we never ever did ask and will never ever ask for user data
-  if (self.requireUserName == BITFeedbackUserDataElementDontShow &&
-          self.requireUserEmail == BITFeedbackUserDataElementDontShow) {
-    self.didAskUserData = NO;
-  }
-}
-
-- (BOOL)isiOS10PhotoPolicySet {
-  BOOL isiOS10PhotoPolicySet = [BITHockeyHelper isPhotoAccessPossible];
-  if (bit_isDebuggerAttached()) {
-    if (!isiOS10PhotoPolicySet) {
-      BITHockeyLogWarning(@"You are using HockeyApp's Feedback feature in iOS 10 or later. iOS 10 requires you to add the usage strings to your app's info.plist. "
-              @"Attaching screenshots to feedback is disabled. Please add the String for NSPhotoLibraryUsageDescription to your info.plist to enable screenshot attachments.");
-    }
-  }
-  return isiOS10PhotoPolicySet;
-}
-
-#pragma mark - Local Storage
-
-- (void)loadMessages {
-  BOOL userIDViaDelegate = [self updateUserIDUsingKeychainAndDelegate];
-  BOOL userNameViaDelegate = [self updateUserNameUsingKeychainAndDelegate];
-  BOOL userEmailViaDelegate = [self updateUserEmailUsingKeychainAndDelegate];
-
-  if (![self.fileManager fileExistsAtPath:self.settingsFile])
-    return;
-
-  NSData *codedData = [[NSData alloc] initWithContentsOfFile:self.settingsFile];
-  if (codedData == nil) return;
-
-  NSKeyedUnarchiver *unarchiver = nil;
-
-  @try {
-    unarchiver = [[NSKeyedUnarchiver alloc] initForReadingWithData:codedData];
-  }
-  @catch (NSException __unused *exception) {
-    return;
-  }
-
-  if (!userIDViaDelegate) {
-    if ([unarchiver containsValueForKey:kBITFeedbackUserID]) {
-      self.userID = [unarchiver decodeObjectForKey:kBITFeedbackUserID];
-      [self addStringValueToKeychain:self.userID forKey:kBITFeedbackUserID];
-    }
-    self.userID = [self stringValueFromKeychainForKey:kBITFeedbackUserID];
-  }
-
-  if (!userNameViaDelegate) {
-    if ([unarchiver containsValueForKey:kBITFeedbackName]) {
-      self.userName = [unarchiver decodeObjectForKey:kBITFeedbackName];
-      [self addStringValueToKeychain:self.userName forKey:kBITFeedbackName];
-    }
-    self.userName = [self stringValueFromKeychainForKey:kBITFeedbackName];
-  }
-
-  if (!userEmailViaDelegate) {
-    if ([unarchiver containsValueForKey:kBITFeedbackEmail]) {
-      self.userEmail = [unarchiver decodeObjectForKey:kBITFeedbackEmail];
-      [self addStringValueToKeychain:self.userEmail forKey:kBITFeedbackEmail];
-    }
-    self.userEmail = [self stringValueFromKeychainForKey:kBITFeedbackEmail];
-  }
-
-  if ([unarchiver containsValueForKey:kBITFeedbackUserDataAsked])
-    self.didAskUserData = YES;
-
-  if ([unarchiver containsValueForKey:kBITFeedbackToken]) {
-    self.token = [unarchiver decodeObjectForKey:kBITFeedbackToken];
-    [self addStringValueToKeychain:self.token forKey:kBITFeedbackToken];
-  }
-  self.token = [self stringValueFromKeychainForKey:kBITFeedbackToken];
-
-  if ([unarchiver containsValueForKey:kBITFeedbackAppID]) {
-    NSString *appID = [unarchiver decodeObjectForKey:kBITFeedbackAppID];
-
-    // the stored thread is from another application identifier, so clear the token
-    // which will cause the new posts to create a new thread on the server for the
-    // current app identifier
-    if ([appID compare:self.appIdentifier] != NSOrderedSame) {
-      self.token = nil;
-    }
-  }
-
-  if ([self shouldForceNewThread]) {
-    self.token = nil;
-  }
-
-  if ([unarchiver containsValueForKey:kBITFeedbackDateOfLastCheck])
-    self.lastCheck = [unarchiver decodeObjectForKey:kBITFeedbackDateOfLastCheck];
-
-  if ([unarchiver containsValueForKey:kBITFeedbackLastMessageID])
-    self.lastMessageID = [unarchiver decodeObjectForKey:kBITFeedbackLastMessageID];
-
-  if ([unarchiver containsValueForKey:kBITFeedbackMessages]) {
-    [self.feedbackList setArray:(NSArray *)[unarchiver decodeObjectForKey:kBITFeedbackMessages]];
-
-    [self sortFeedbackList];
-
-    // inform the UI to update its data in case the list is already showing
-    [[NSNotificationCenter defaultCenter] postNotificationName:BITHockeyFeedbackMessagesLoadingFinished object:nil];
-  }
-
-  [unarchiver finishDecoding];
-
-  if (!self.lastCheck) {
-    self.lastCheck = [NSDate distantPast];
-  }
-}
-
-
-- (void)saveMessages {
-  [self sortFeedbackList];
-
-  NSMutableData *data = [[NSMutableData alloc] init];
-  NSKeyedArchiver *archiver = [[NSKeyedArchiver alloc] initForWritingWithMutableData:data];
-
-  if (self.didAskUserData)
-    [archiver encodeObject:[NSNumber numberWithBool:YES] forKey:kBITFeedbackUserDataAsked];
-
-  if (self.token)
-    [self addStringValueToKeychain:self.token forKey:kBITFeedbackToken];
-
-  if (self.appIdentifier)
-    [archiver encodeObject:self.appIdentifier forKey:kBITFeedbackAppID];
-
-  if (self.userID)
-    [self addStringValueToKeychain:self.userID forKey:kBITFeedbackUserID];
-
-  if (self.userName)
-    [self addStringValueToKeychain:self.userName forKey:kBITFeedbackName];
-
-  if (self.userEmail)
-    [self addStringValueToKeychain:self.userEmail forKey:kBITFeedbackEmail];
-
-  if (self.lastCheck)
-    [archiver encodeObject:self.lastCheck forKey:kBITFeedbackDateOfLastCheck];
-
-  if (self.lastMessageID)
-    [archiver encodeObject:self.lastMessageID forKey:kBITFeedbackLastMessageID];
-
-  [archiver encodeObject:self.feedbackList forKey:kBITFeedbackMessages];
-
-  [archiver finishEncoding];
-  [data writeToFile:self.settingsFile atomically:YES];
-}
-
-
-- (void)updateDidAskUserData {
-  if (!self.didAskUserData) {
-    self.didAskUserData = YES;
-
-    [self saveMessages];
-  }
-}
-
-#pragma mark - Messages
-
-- (void)sortFeedbackList {
-  [self.feedbackList sortUsingComparator:^(BITFeedbackMessage *obj1, BITFeedbackMessage *obj2) {
-      NSDate *date1 = [obj1 date];
-      NSDate *date2 = [obj2 date];
-
-      // not send, in conflict and send in progress messages on top, sorted by date
-      // read and unread on bottom, sorted by date
-      // archived on the very bottom
-
-      if ([obj1 status] >= BITFeedbackMessageStatusSendInProgress && [obj2 status] < BITFeedbackMessageStatusSendInProgress) {
-        return NSOrderedDescending;
-      } else if ([obj1 status] < BITFeedbackMessageStatusSendInProgress && [obj2 status] >= BITFeedbackMessageStatusSendInProgress) {
-        return NSOrderedAscending;
-      } else if ([obj1 status] == BITFeedbackMessageStatusArchived && [obj2 status] < BITFeedbackMessageStatusArchived) {
-        return NSOrderedDescending;
-      } else if ([obj1 status] < BITFeedbackMessageStatusArchived && [obj2 status] == BITFeedbackMessageStatusArchived) {
-        return NSOrderedAscending;
-      } else {
-        return (NSInteger) [date2 compare:date1];
-      }
-  }];
-}
-
-- (NSUInteger)numberOfMessages {
-  return [self.feedbackList count];
-}
-
-- (BITFeedbackMessage *)messageAtIndex:(NSUInteger)index {
-  if ([self.feedbackList count] > index) {
-    return [self.feedbackList objectAtIndex:index];
-  }
-
-  return nil;
-}
-
-- (BITFeedbackMessage *)messageWithID:(NSNumber *)messageID {
-  __block BITFeedbackMessage *message = nil;
-
-  [self.feedbackList enumerateObjectsUsingBlock:^(BITFeedbackMessage *objMessage, NSUInteger __unused messagesIdx, BOOL *stop) {
-      if ([[objMessage identifier] isEqualToNumber:messageID]) {
-        message = objMessage;
-        *stop = YES;
-      }
-  }];
-
-  return message;
-}
-
-- (NSArray *)messagesWithStatus:(BITFeedbackMessageStatus)status {
-  NSMutableArray *resultMessages = [[NSMutableArray alloc] initWithCapacity:[self.feedbackList count]];
-
-  [self.feedbackList enumerateObjectsUsingBlock:^(BITFeedbackMessage *objMessage, NSUInteger __unused messagesIdx, BOOL __unused *stop) {
-      if ([objMessage status] == status) {
-        [resultMessages addObject:objMessage];
-      }
-  }];
-
-  return [NSArray arrayWithArray:resultMessages];;
-}
-
-- (BITFeedbackMessage *)lastMessageHavingID {
-  __block BITFeedbackMessage *message = nil;
-
-
-  // Note: the logic here is slightly different than in our mac SDK, as self.feedbackList is sorted in different order.
-  // Compare the implementation of - (void)sortFeedbackList; in both SDKs.
-  [self.feedbackList enumerateObjectsUsingBlock:^(BITFeedbackMessage *objMessage, NSUInteger __unused messagesIdx, BOOL *stop) {
-      if ([[objMessage identifier] integerValue] != 0) {
-        message = objMessage;
-        *stop = YES;
-      }
-  }];
-
-  return message;
-}
-
-- (void)markSendInProgressMessagesAsPending {
-  // make sure message that may have not been send successfully, get back into the right state to be send again
-  [self.feedbackList enumerateObjectsUsingBlock:^(id objMessage, NSUInteger __unused messagesIdx, BOOL __unused *stop) {
-      if ([(BITFeedbackMessage *) objMessage status] == BITFeedbackMessageStatusSendInProgress)
-        [(BITFeedbackMessage *) objMessage setStatus:BITFeedbackMessageStatusSendPending];
-  }];
-}
-
-- (void)markSendInProgressMessagesAsInConflict {
-  // make sure message that may have not been send successfully, get back into the right state to be send again
-  [self.feedbackList enumerateObjectsUsingBlock:^(id objMessage, NSUInteger __unused messagesIdx, BOOL __unused *stop) {
-      if ([(BITFeedbackMessage *) objMessage status] == BITFeedbackMessageStatusSendInProgress)
-        [(BITFeedbackMessage *) objMessage setStatus:BITFeedbackMessageStatusInConflict];
-  }];
-}
-
-- (void)updateLastMessageID {
-  BITFeedbackMessage *lastMessageHavingID = [self lastMessageHavingID];
-  if (lastMessageHavingID) {
-    if (!self.lastMessageID || [self.lastMessageID compare:[lastMessageHavingID identifier]] != NSOrderedSame)
-      self.lastMessageID = [lastMessageHavingID identifier];
-  }
-}
-
-- (BOOL)deleteMessageAtIndex:(NSUInteger)index {
-  if (self.feedbackList && [self.feedbackList count] > index && [self.feedbackList objectAtIndex:index]) {
-    BITFeedbackMessage *message = self.feedbackList[index];
-    [message deleteContents];
-    [self.feedbackList removeObjectAtIndex:index];
-
-    [self saveMessages];
-    return YES;
-  }
-
-  return NO;
-}
-
-- (void)deleteAllMessages {
-  [self.feedbackList removeAllObjects];
-
-  [self saveMessages];
-}
-
-- (BOOL)shouldForceNewThread {
-  id strongDelegate = self.delegate;
-  if (strongDelegate && [strongDelegate respondsToSelector:@selector(forceNewFeedbackThreadForFeedbackManager:)]) {
-    return [strongDelegate forceNewFeedbackThreadForFeedbackManager:self];
-  } else {
-    return NO;
-  }
-}
-
-
-#pragma mark - User
-
-- (BOOL)askManualUserDataAvailable {
-  [self updateAppDefinedUserData];
-
-  if (self.requireUserName == BITFeedbackUserDataElementDontShow &&
-          self.requireUserEmail == BITFeedbackUserDataElementDontShow)
-    return NO;
-
-  return YES;
-}
-
-- (BOOL)requireManualUserDataMissing {
-  [self updateAppDefinedUserData];
-
-  if (self.requireUserName == BITFeedbackUserDataElementRequired && !self.userName)
-    return YES;
-
-  if (self.requireUserEmail == BITFeedbackUserDataElementRequired && !self.userEmail)
-    return YES;
-
-  return NO;
-}
-
-- (BOOL)isManualUserDataAvailable {
-  [self updateAppDefinedUserData];
-
-  if ((self.requireUserName != BITFeedbackUserDataElementDontShow && self.userName) ||
-          (self.requireUserEmail != BITFeedbackUserDataElementDontShow && self.userEmail))
-    return YES;
-
-  return NO;
-}
-
-
-#pragma mark - Networking
-
-- (void)updateMessageListFromResponse:(NSDictionary *)jsonDictionary {
-  if (!jsonDictionary) {
-    // nil is used when the server returns 404, so we need to mark all existing threads as archives and delete the discussion token
-
-    NSArray *messagesSendInProgress = [self messagesWithStatus:BITFeedbackMessageStatusSendInProgress];
-    NSInteger pendingMessagesCount = [messagesSendInProgress count] + [[self messagesWithStatus:BITFeedbackMessageStatusSendPending] count];
-
-    [self markSendInProgressMessagesAsPending];
-
-    [self.feedbackList enumerateObjectsUsingBlock:^(id objMessage, NSUInteger __unused messagesIdx, BOOL __unused *stop) {
-        if ([(BITFeedbackMessage *) objMessage status] != BITFeedbackMessageStatusSendPending)
-          [(BITFeedbackMessage *) objMessage setStatus:BITFeedbackMessageStatusArchived];
-    }];
-
-    if ([self token]) {
-      self.token = nil;
-    }
-
-    NSInteger pendingMessagesCountAfterProcessing = [[self messagesWithStatus:BITFeedbackMessageStatusSendPending] count];
-
-    [self saveMessages];
-
-    // check if this request was successful and we have more messages pending and continue if positive
-    if (pendingMessagesCount > pendingMessagesCountAfterProcessing && pendingMessagesCountAfterProcessing > 0) {
-      [self performSelector:@selector(submitPendingMessages) withObject:nil afterDelay:0.1];
-    }
-
-    return;
-  }
-
-  NSDictionary *feedback = [jsonDictionary objectForKey:@"feedback"];
-  NSString *token = [jsonDictionary objectForKey:@"token"];
-  NSDictionary *feedbackObject = [jsonDictionary objectForKey:@"feedback"];
-  if (feedback && token && feedbackObject) {
-    if ([self shouldForceNewThread]) {
-      self.token = nil;
-    } else {
-      // update the thread token, which is not available until the 1st message was successfully sent
-      self.token = token;
-    }
-
-    self.lastCheck = [NSDate date];
-
-    // add all new messages
-    NSArray *feedMessages = [feedbackObject objectForKey:@"messages"];
-
-    // get the message that was currently sent if available
-    NSArray *messagesSendInProgress = [self messagesWithStatus:BITFeedbackMessageStatusSendInProgress];
-
-    NSInteger pendingMessagesCount = [messagesSendInProgress count] + [[self messagesWithStatus:BITFeedbackMessageStatusSendPending] count];
-
-    __block BOOL newMessage = NO;
-    NSMutableSet *returnedMessageIDs = [[NSMutableSet alloc] init];
-
-    [feedMessages enumerateObjectsUsingBlock:^(id objMessage, NSUInteger __unused messagesIdx, BOOL __unused *stop) {
-        if ([(NSDictionary *) objMessage objectForKey:@"id"]) {
-          NSNumber *messageID = [(NSDictionary *) objMessage objectForKey:@"id"];
-          [returnedMessageIDs addObject:messageID];
-
-          BITFeedbackMessage *thisMessage = [self messageWithID:messageID];
-          if (!thisMessage) {
-            // check if this is a message that was sent right now
-            __block BITFeedbackMessage *matchingSendInProgressOrInConflictMessage = nil;
-
-            // TODO: match messages in state conflict
-
-            [messagesSendInProgress enumerateObjectsUsingBlock:^(id objSendInProgressMessage, NSUInteger __unused messagesSendInProgressIdx, BOOL *stop2) {
-                if ([[(NSDictionary *) objMessage objectForKey:@"token"] isEqualToString:[(BITFeedbackMessage *) objSendInProgressMessage token]]) {
-                  matchingSendInProgressOrInConflictMessage = objSendInProgressMessage;
-                  *stop2 = YES;
-                }
-            }];
-
-            if (matchingSendInProgressOrInConflictMessage) {
-              matchingSendInProgressOrInConflictMessage.date = [self parseRFC3339Date:[(NSDictionary *) objMessage objectForKey:@"created_at"]];
-              matchingSendInProgressOrInConflictMessage.identifier = messageID;
-              matchingSendInProgressOrInConflictMessage.status = BITFeedbackMessageStatusRead;
-              NSArray *feedbackAttachments = [(NSDictionary *) objMessage objectForKey:@"attachments"];
-              if (matchingSendInProgressOrInConflictMessage.attachments.count == feedbackAttachments.count) {
-                int attachmentIndex = 0;
-                for (BITFeedbackMessageAttachment *attachment in matchingSendInProgressOrInConflictMessage.attachments) {
-                  attachment.identifier = feedbackAttachments[attachmentIndex][@"id"];
-                  attachment.sourceURL = feedbackAttachments[attachmentIndex][@"url"];
-                  attachmentIndex++;
-                }
-              }
-            } else {
-              if ([(NSDictionary *) objMessage objectForKey:@"clean_text"] || [(NSDictionary *) objMessage objectForKey:@"text"] || [(NSDictionary *) objMessage objectForKey:@"attachments"]) {
-                BITFeedbackMessage *message = [[BITFeedbackMessage alloc] init];
-                message.text = [(NSDictionary *) objMessage objectForKey:@"clean_text"] ?: [(NSDictionary *) objMessage objectForKey:@"text"] ?: @"";
-                message.name = [(NSDictionary *) objMessage objectForKey:@"name"] ?: @"";
-                message.email = [(NSDictionary *) objMessage objectForKey:@"email"] ?: @"";
-
-                message.date = [self parseRFC3339Date:[(NSDictionary *) objMessage objectForKey:@"created_at"]] ?: [NSDate date];
-                message.identifier = [(NSDictionary *) objMessage objectForKey:@"id"];
-                message.status = BITFeedbackMessageStatusUnread;
-
-                for (NSDictionary *attachmentData in objMessage[@"attachments"]) {
-                  BITFeedbackMessageAttachment *newAttachment = [BITFeedbackMessageAttachment new];
-                  newAttachment.originalFilename = attachmentData[@"file_name"];
-                  newAttachment.identifier = attachmentData[@"id"];
-                  newAttachment.sourceURL = attachmentData[@"url"];
-                  newAttachment.contentType = attachmentData[@"content_type"];
-                  [message addAttachmentsObject:newAttachment];
-                }
-
-                [self.feedbackList addObject:message];
-
-                newMessage = YES;
-              }
-            }
-          } else {
-            // we should never get any messages back that are already stored locally,
-            // since we add the last_message_id to the request
-          }
-        }
-    }];
-
-    [self markSendInProgressMessagesAsPending];
-
-    [self sortFeedbackList];
-    [self updateLastMessageID];
-
-    // we got a new incoming message, trigger user notification system
-    if (newMessage) {
-      // check if the latest message is from the users own email address, then don't show an alert since they answered using their own email
-      BOOL latestMessageFromUser = NO;
-
-      BITFeedbackMessage *latestMessage = [self lastMessageHavingID];
-      if (self.userEmail && latestMessage.email && [self.userEmail compare:latestMessage.email] == NSOrderedSame)
-        latestMessageFromUser = YES;
-      id strongDelegate = self.delegate;
-      if (!latestMessageFromUser) {
-        if ([strongDelegate respondsToSelector:@selector(feedbackManagerDidReceiveNewFeedback:)]) {
-          [strongDelegate feedbackManagerDidReceiveNewFeedback:self];
-        }
-
-        if (self.showAlertOnIncomingMessages && !self.currentFeedbackListViewController && !self.currentFeedbackComposeViewController) {
-          dispatch_async(dispatch_get_main_queue(), ^{
-            UIAlertController *alertController = [UIAlertController alertControllerWithTitle:BITHockeyLocalizedString(@"HockeyFeedbackNewMessageTitle")
-                                                                                     message:BITHockeyLocalizedString(@"HockeyFeedbackNewMessageText")
-                                                                              preferredStyle:UIAlertControllerStyleAlert];
-            UIAlertAction *cancelAction = [BITAlertAction actionWithTitle:BITHockeyLocalizedString(@"HockeyFeedbackIgnore")
-                                                                   style:UIAlertActionStyleCancel
-                                                                 handler:nil];
-            UIAlertAction *showAction = [BITAlertAction actionWithTitle:BITHockeyLocalizedString(@"HockeyFeedbackShow")
-                                                                 style:UIAlertActionStyleDefault
-                                                               handler:^(UIAlertAction __unused * __nonnull action) {
-                                                                 [self showFeedbackListView];
-                                                               }];
-            [alertController addAction:cancelAction];
-            [alertController addAction:showAction];
-
-            [self showAlertController:alertController];
-            self.incomingMessagesAlertShowing = YES;
-          });
-        }
-      }
-    }
-
-    NSInteger pendingMessagesCountAfterProcessing = [[self messagesWithStatus:BITFeedbackMessageStatusSendPending] count];
-
-    // check if this request was successful and we have more messages pending and continue if positive
-    if (pendingMessagesCount > pendingMessagesCountAfterProcessing && pendingMessagesCountAfterProcessing > 0) {
-      [self performSelector:@selector(submitPendingMessages) withObject:nil afterDelay:0.1];
-    }
-
-  } else {
-    [self markSendInProgressMessagesAsPending];
-  }
-
-  [self saveMessages];
-
-  return;
-}
-
-
-- (void)sendNetworkRequestWithHTTPMethod:(NSString *)httpMethod withMessage:(BITFeedbackMessage *)message completionHandler:(void (^)(NSError *error))completionHandler {
-  NSString *boundary = @"----FOO";
-
-  self.networkRequestInProgress = YES;
-  // inform the UI to update its data in case the list is already showing
-  [[NSNotificationCenter defaultCenter] postNotificationName:BITHockeyFeedbackMessagesLoadingStarted object:nil];
-
-  NSString *tokenParameter = @"";
-  if ([self token]) {
-    tokenParameter = [NSString stringWithFormat:@"/%@", [self token]];
-  }
-  NSMutableString *parameter = [NSMutableString stringWithFormat:@"api/2/apps/%@/feedback%@", [self encodedAppIdentifier], tokenParameter];
-
-  NSString *lastMessageID = @"";
-  if (!self.lastMessageID) {
-    [self updateLastMessageID];
-  }
-  if (self.lastMessageID) {
-    lastMessageID = [NSString stringWithFormat:@"&last_message_id=%li", (long) [self.lastMessageID integerValue]];
-  }
-
-  [parameter appendFormat:@"?format=json&bundle_version=%@&sdk=%@&sdk_version=%@%@",
-                          bit_URLEncodedString([[NSBundle mainBundle] objectForInfoDictionaryKey:@"CFBundleVersion"]),
-                  BITHOCKEY_NAME,
-                  BITHOCKEY_VERSION,
-                          lastMessageID
-  ];
-
-  // build request & send
-  NSString *url = [NSString stringWithFormat:@"%@%@", self.serverURL, parameter];
-  BITHockeyLogDebug(@"INFO: sending api request to %@", url);
-
-  NSMutableURLRequest *request = [NSMutableURLRequest requestWithURL:(NSURL *)[NSURL URLWithString:url] cachePolicy:1 timeoutInterval:10.0];
-  [request setHTTPMethod:httpMethod];
-  [request setValue:@"Hockey/iOS" forHTTPHeaderField:@"User-Agent"];
-  [request setValue:@"gzip" forHTTPHeaderField:@"Accept-Encoding"];
-
-  if (message) {
-    NSString *contentType = [NSString stringWithFormat:@"multipart/form-data; boundary=%@", boundary];
-    [request setValue:contentType forHTTPHeaderField:@"Content-type"];
-
-    NSMutableData *postBody = [NSMutableData data];
-
-    [postBody appendData:[BITHockeyAppClient dataWithPostValue:@"Apple" forKey:@"oem" boundary:boundary]];
-    [postBody appendData:[BITHockeyAppClient dataWithPostValue:[[UIDevice currentDevice] systemVersion] forKey:@"os_version" boundary:boundary]];
-    [postBody appendData:[BITHockeyAppClient dataWithPostValue:[self getDevicePlatform] forKey:@"model" boundary:boundary]];
-    [postBody appendData:[BITHockeyAppClient dataWithPostValue:[[[NSBundle mainBundle] preferredLocalizations] objectAtIndex:0] forKey:@"lang" boundary:boundary]];
-    [postBody appendData:[BITHockeyAppClient dataWithPostValue:[[NSBundle mainBundle] objectForInfoDictionaryKey:@"CFBundleVersion"] forKey:@"bundle_version" boundary:boundary]];
-    [postBody appendData:[BITHockeyAppClient dataWithPostValue:[message text] forKey:@"text" boundary:boundary]];
-    [postBody appendData:[BITHockeyAppClient dataWithPostValue:[message token] forKey:@"message_token" boundary:boundary]];
-
-    NSString *installString = bit_appAnonID(NO);
-    if (installString) {
-      [postBody appendData:[BITHockeyAppClient dataWithPostValue:installString forKey:@"install_string" boundary:boundary]];
-    }
-
-    if (self.userID) {
-      [postBody appendData:[BITHockeyAppClient dataWithPostValue:self.userID forKey:@"user_string" boundary:boundary]];
-    }
-    if (self.userName) {
-      [postBody appendData:[BITHockeyAppClient dataWithPostValue:self.userName forKey:@"name" boundary:boundary]];
-    }
-    if (self.userEmail) {
-      [postBody appendData:[BITHockeyAppClient dataWithPostValue:self.userEmail forKey:@"email" boundary:boundary]];
-    }
-
-
-    NSInteger photoIndex = 0;
-
-    for (BITFeedbackMessageAttachment *attachment in message.attachments) {
-      NSString *key = [NSString stringWithFormat:@"attachment%ld", (long) photoIndex];
-
-      NSString *filename = attachment.originalFilename;
-
-      if (!filename) {
-        filename = [NSString stringWithFormat:@"Attachment %ld", (long) photoIndex];
-      }
-
-      [postBody appendData:[BITHockeyAppClient dataWithPostValue:attachment.data forKey:key contentType:attachment.contentType boundary:boundary filename:filename]];
-
-      photoIndex++;
-    }
-
-    [postBody appendData:(NSData *)[[NSString stringWithFormat:@"--%@--\r\n", boundary] dataUsingEncoding:NSUTF8StringEncoding]];
-
-
-    [request setHTTPBody:postBody];
-  }
-  __weak typeof(self) weakSelf = self;
-  NSURLSessionConfiguration *sessionConfiguration = [NSURLSessionConfiguration defaultSessionConfiguration];
-  __block NSURLSession *session = [NSURLSession sessionWithConfiguration:sessionConfiguration];
-
-  NSURLSessionDataTask *task = [session dataTaskWithRequest:request
-                                          completionHandler:^(NSData *data, NSURLResponse *response, NSError *error) {
-                                            typeof(self) strongSelf = weakSelf;
-
-                                            [session finishTasksAndInvalidate];
-
-                                            [strongSelf handleFeedbackMessageResponse:response data:data error:error completion:completionHandler];
-                                          }];
-  [task resume];
-
-}
-
-- (void)handleFeedbackMessageResponse:(NSURLResponse *)response data:(NSData *)responseData error:(NSError *)error completion:(void (^)(NSError *error))completionHandler {
-  self.networkRequestInProgress = NO;
-
-  if (error) {
-    [self reportError:error];
-    [self markSendInProgressMessagesAsPending];
-    if (completionHandler) {
-      completionHandler(error);
-    }
-  } else {
-    NSInteger statusCode = [(NSHTTPURLResponse *) response statusCode];
-    if (statusCode == 404) {
-      // thread has been deleted, we archive it
-      [self updateMessageListFromResponse:nil];
-    } else if (statusCode == 409) {
-      // we submitted a message that is already on the server, mark it as being in conflict and resolve it with another fetch
-
-      if (!self.token) {
-        // set the token to the first message token, since this is identical
-        __block NSString *token = nil;
-
-        [self.feedbackList enumerateObjectsUsingBlock:^(id objMessage, NSUInteger __unused messagesIdx, BOOL *stop) {
-            if ([(BITFeedbackMessage *) objMessage status] == BITFeedbackMessageStatusSendInProgress) {
-              token = [(BITFeedbackMessage *) objMessage token];
-              *stop = YES;
-            }
-        }];
-
-        if (token) {
-          self.token = token;
-        }
-      }
-
-      [self markSendInProgressMessagesAsInConflict];
-      [self saveMessages];
-      [self performSelector:@selector(fetchMessageUpdates) withObject:nil afterDelay:0.2];
-    } else if ([responseData length]) {
-      NSString *responseString = [[NSString alloc] initWithBytes:[responseData bytes] length:[responseData length] encoding:NSUTF8StringEncoding];
-      BITHockeyLogDebug(@"INFO: Received API response: %@", responseString);
-
-      if (responseString && [responseString dataUsingEncoding:NSUTF8StringEncoding]) {
-        NSError *localError = NULL;
-
-        NSDictionary *feedDict = (NSDictionary *) [NSJSONSerialization JSONObjectWithData:(NSData *)[responseString dataUsingEncoding:NSUTF8StringEncoding] options:0 error:&localError];
-
-        // server returned empty response?
-        if (localError) {
-          [self reportError:localError];
-        } else if (![feedDict count]) {
-          [self reportError:[NSError errorWithDomain:kBITFeedbackErrorDomain
-                                                code:BITFeedbackAPIServerReturnedEmptyResponse
-                                            userInfo:[NSDictionary dictionaryWithObjectsAndKeys:@"Server returned empty response.", NSLocalizedDescriptionKey, nil]]];
-        } else {
-          BITHockeyLogDebug(@"INFO: Received API response: %@", responseString);
-          NSString *status = [feedDict objectForKey:@"status"];
-          if ([status compare:@"success"] != NSOrderedSame) {
-            [self reportError:[NSError errorWithDomain:kBITFeedbackErrorDomain
-                                                  code:BITFeedbackAPIServerReturnedInvalidStatus
-                                              userInfo:[NSDictionary dictionaryWithObjectsAndKeys:@"Server returned invalid status.", NSLocalizedDescriptionKey, nil]]];
-          } else {
-            [self updateMessageListFromResponse:feedDict];
-          }
-        }
-      }
-    }
-
-    [self markSendInProgressMessagesAsPending];
-    if (completionHandler) {
-      completionHandler(error);
-    }
-  }
-}
-
-- (void)fetchMessageUpdates {
-  if ([self.feedbackList count] == 0 && !self.token) {
-    // inform the UI to update its data in case the list is already showing
-    [[NSNotificationCenter defaultCenter] postNotificationName:BITHockeyFeedbackMessagesLoadingFinished object:nil];
-
-    return;
-  }
-
-  [self sendNetworkRequestWithHTTPMethod:@"GET"
-                             withMessage:nil
-                       completionHandler:^(NSError __unused *error) {
-                           // inform the UI to update its data in case the list is already showing
-                           [[NSNotificationCenter defaultCenter] postNotificationName:BITHockeyFeedbackMessagesLoadingFinished object:nil];
-                       }];
-}
-
-- (void)submitPendingMessages {
-  if (self.networkRequestInProgress) {
-    [[self class] cancelPreviousPerformRequestsWithTarget:self selector:@selector(submitPendingMessages) object:nil];
-    [self performSelector:@selector(submitPendingMessages) withObject:nil afterDelay:2.0];
-    return;
-  }
-
-  // app defined user data may have changed, update it
-  [self updateAppDefinedUserData];
-  [self saveMessages];
-
-  NSArray *pendingMessages = [self messagesWithStatus:BITFeedbackMessageStatusSendPending];
-
-  if ([pendingMessages count] > 0) {
-    // we send one message at a time
-    BITFeedbackMessage *messageToSend = pendingMessages[0];
-
-    [messageToSend setStatus:BITFeedbackMessageStatusSendInProgress];
-    if (self.userID)
-      [messageToSend setUserID:self.userID];
-    if (self.userName)
-      [messageToSend setName:self.userName];
-    if (self.userEmail)
-      [messageToSend setEmail:self.userEmail];
-
-    NSString *httpMethod = @"POST";
-    if ([self token]) {
-      httpMethod = @"PUT";
-    }
-
-    [self sendNetworkRequestWithHTTPMethod:httpMethod
-                               withMessage:messageToSend
-                         completionHandler:^(NSError *error) {
-                             if (error) {
-                               [self markSendInProgressMessagesAsPending];
-                               [self saveMessages];
-                             }
-
-                             // inform the UI to update its data in case the list is already showing
-                             [[NSNotificationCenter defaultCenter] postNotificationName:BITHockeyFeedbackMessagesLoadingFinished object:nil];
-                         }];
-  }
-}
-
-- (void)submitMessageWithText:(NSString *)text andAttachments:(NSArray *)attachments {
-  BITFeedbackMessage *message = [[BITFeedbackMessage alloc] init];
-  message.text = text;
-  [message setStatus:BITFeedbackMessageStatusSendPending];
-  [message setToken:[self uuidAsLowerCaseAndShortened]];
-  [message setAttachments:attachments];
-  [message setUserMessage:YES];
-
-  [self.feedbackList addObject:message];
-
-  [self submitPendingMessages];
-}
-
-#pragma mark - Observation Handling
-
-- (void)setFeedbackObservationMode:(BITFeedbackObservationMode)feedbackObservationMode {
-  //Ignore if feedback manager is disabled
-  if ([self isFeedbackManagerDisabled]) return;
-
-  if (feedbackObservationMode != _feedbackObservationMode) {
-    _feedbackObservationMode = feedbackObservationMode;
-
-    // Reset the other observation modes.
-    if (feedbackObservationMode == BITFeedbackObservationNone) {
-      if (self.observationModeOnScreenshotEnabled) {
-        [self setObservationModeOnScreenshotEnabled:NO];
-      }
-      if (self.observationModeThreeFingerTapEnabled) {
-        [self setObservationModeThreeFingerTapEnabled:NO];
-      }
-      BITHockeyLogVerbose(@"Set feedbackObservationMode to BITFeedbackObservationNone");
-    }
-
-    if (feedbackObservationMode == BITFeedbackObservationModeOnScreenshot) {
-      [self setObservationModeOnScreenshotEnabled:YES];
-      if (self.observationModeThreeFingerTapEnabled) {
-        [self setObservationModeThreeFingerTapEnabled:NO];
-      }
-    }
-
-    if (feedbackObservationMode == BITFeedbackObservationModeThreeFingerTap) {
-      [self setObservationModeThreeFingerTapEnabled:YES];
-      if (self.observationModeOnScreenshotEnabled) {
-        [self setObservationModeOnScreenshotEnabled:NO];
-      }
-    }
-
-    if (feedbackObservationMode == BITFeedbackObservationModeAll) {
-      [self setObservationModeOnScreenshotEnabled:YES];
-      [self setObservationModeThreeFingerTapEnabled:YES];
-    }
-  }
-}
-
-- (void)setObservationModeOnScreenshotEnabled:(BOOL)observationModeOnScreenshotEnabled {
-  // Enable/disable screenshot notification
-  if (observationModeOnScreenshotEnabled) {
-    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(screenshotNotificationReceived:) name:UIApplicationUserDidTakeScreenshotNotification object:nil];
-    BITHockeyLogVerbose(@"Added observer for UIApplocationUserDidTakeScreenshotNotification.");
-  } else {
-    [[NSNotificationCenter defaultCenter] removeObserver:self name:UIApplicationUserDidTakeScreenshotNotification object:nil];
-    BITHockeyLogVerbose(@"Removed observer for UIApplocationUserDidTakeScreenshotNotification.");
-  }
-
-  _observationModeOnScreenshotEnabled = observationModeOnScreenshotEnabled;
-
-  BITHockeyLogVerbose(@"Enabled BITFeedbackObservationModeOnScreenshot.");
-}
-
-- (void)setObservationModeThreeFingerTapEnabled:(BOOL)observationModeThreeFingerTapEnabled {
-  _observationModeThreeFingerTapEnabled = observationModeThreeFingerTapEnabled;
-
-  if (observationModeThreeFingerTapEnabled) {
-    if (!self.tapRecognizer) {
-      self.tapRecognizer = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(screenshotTripleTap:)];
-      self.tapRecognizer.numberOfTouchesRequired = 3;
-      self.tapRecognizer.delegate = self;
-
-      dispatch_async(dispatch_get_main_queue(), ^{
-          if (self.tapRecognizer) {
-            [[UIApplication sharedApplication].keyWindow addGestureRecognizer:self.tapRecognizer];
-          }
-      });
-    }
-
-    BITHockeyLogVerbose(@"Enabled BITFeedbackObservationModeThreeFingerTap.");
-  } else {
-    [[[UIApplication sharedApplication] keyWindow] removeGestureRecognizer:self.tapRecognizer];
-    self.tapRecognizer = nil;
-    BITHockeyLogVerbose(@"Disabled BITFeedbackObservationModeThreeFingerTap.");
-  }
-}
-
-- (void)screenshotNotificationReceived:(NSNotification *) __unused notification {
-  // Don't do anything if FeedbackManager was disabled.
-  if ([self isFeedbackManagerDisabled]) return;
-
-  double amountOfSeconds = 1.5;
-  dispatch_time_t delayTime = dispatch_time(DISPATCH_TIME_NOW, (int64_t) (amountOfSeconds * NSEC_PER_SEC));
-
-  dispatch_after(delayTime, dispatch_get_main_queue(), ^{
-      [self extractLastPictureFromLibraryAndLaunchFeedback];
-  });
-}
-
-- (void)extractLastPictureFromLibraryAndLaunchFeedback {
-  [self requestLatestImageWithCompletionHandler:^(UIImage *latestImage) {
-      [self showFeedbackComposeViewWithPreparedItems:@[latestImage]];
-  }];
-}
-
-- (void)requestLatestImageWithCompletionHandler:(BITLatestImageFetchCompletionBlock)completionHandler {
-  if (!completionHandler) {return;}
-
-  // Safeguard in case the dev hasn't set the NSPhotoLibraryUsageDescription in their Info.plist
-  if (![self isiOS10PhotoPolicySet]) {return;}
-
-  [self fetchLatestImageUsingPhotoLibraryWithCompletionHandler:completionHandler];
-}
-
-- (void)fetchLatestImageUsingPhotoLibraryWithCompletionHandler:(BITLatestImageFetchCompletionBlock)completionHandler {
-  // Safeguard in case the dev hasn't set the NSPhotoLibraryUsageDescription in their Info.plist
-  if (![self isiOS10PhotoPolicySet]) {return;}
-
-  [PHPhotoLibrary requestAuthorization:^(PHAuthorizationStatus status) {
-      switch (status) {
-        case PHAuthorizationStatusDenied:
-        case PHAuthorizationStatusRestricted:
-          BITHockeyLogDebug(@"INFO: The latest image could not be fetched, no permissions.");
-          break;
-
-        case PHAuthorizationStatusAuthorized:
-          [self loadLatestImageAssetWithCompletionHandler:completionHandler];
-          break;
-        case PHAuthorizationStatusNotDetermined:
-          BITHockeyLogDebug(@"INFO: The Photo Library authorization status is undetermined. This should not happen.");
-          break;
-      }
-  }];
-}
-
-- (void)loadLatestImageAssetWithCompletionHandler:(BITLatestImageFetchCompletionBlock)completionHandler {
-
-  // Safeguard in case the dev hasn't set the NSPhotoLibraryUsageDescription in their Info.plist
-  if (![self isiOS10PhotoPolicySet]) {return;}
-
-  PHImageManager *imageManager = PHImageManager.defaultManager;
-
-  PHFetchOptions *fetchOptions = [PHFetchOptions new];
-  fetchOptions.sortDescriptors = @[[NSSortDescriptor sortDescriptorWithKey:@"creationDate" ascending:YES]];
-
-  PHFetchResult *fetchResult = [PHAsset fetchAssetsWithMediaType:PHAssetMediaTypeImage options:fetchOptions];
-
-  if (fetchResult.count > 0) {
-    PHAsset *latestImageAsset = (PHAsset *) fetchResult.lastObject;
-    if (latestImageAsset) {
-      PHImageRequestOptions *options = [PHImageRequestOptions new];
-      options.version = PHImageRequestOptionsVersionOriginal;
-      options.deliveryMode = PHImageRequestOptionsDeliveryModeHighQualityFormat;
-      options.resizeMode = PHImageRequestOptionsResizeModeNone;
-
-      [imageManager requestImageDataForAsset:latestImageAsset options:options resultHandler:^(NSData *_Nullable imageData, NSString *_Nullable __unused dataUTI, UIImageOrientation __unused orientation, NSDictionary *_Nullable __unused info) {
-          if (imageData) {
-            completionHandler((UIImage *)[UIImage imageWithData:(NSData *)imageData]);
-          } else {
-            BITHockeyLogDebug(@"INFO: The latest image could not be fetched, requested image data was empty.");
-          }
-      }];
-    }
-  } else {
-    BITHockeyLogDebug(@"INFO: The latest image could not be fetched, the fetch result was empty.");
-  }
-}
-
-- (void)screenshotTripleTap:(UITapGestureRecognizer *)tapRecognizer {
-  // Don't do anything if FeedbackManager was disabled.
-  if ([self isFeedbackManagerDisabled]) return;
-
-  if (tapRecognizer.state == UIGestureRecognizerStateRecognized) {
-    [self showFeedbackComposeViewWithGeneratedScreenshot];
-  }
-}
-
-- (BOOL)gestureRecognizer:(UIGestureRecognizer *) __unused gestureRecognizer shouldRecognizeSimultaneouslyWithGestureRecognizer:(UIGestureRecognizer *) __unused otherGestureRecognizer {
-  return YES;
-}
-
-@end
-
-
-#endif /* HOCKEYSDK_FEATURE_FEEDBACK */
diff --git a/submodules/HockeySDK-iOS/Classes/BITFeedbackManagerDelegate.h b/submodules/HockeySDK-iOS/Classes/BITFeedbackManagerDelegate.h
deleted file mode 100644
index 9afb889462..0000000000
--- a/submodules/HockeySDK-iOS/Classes/BITFeedbackManagerDelegate.h
+++ /dev/null
@@ -1,97 +0,0 @@
-/*
- * Authors: Stephan Diederich, Benjamin Scholtysik
- *
- * Copyright (c) 2013-2016 HockeyApp, Bit Stadium GmbH.
- * All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person
- * obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without
- * restriction, including without limitation the rights to use,
- * copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following
- * conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
- * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#import <Foundation/Foundation.h>
-#import "BITFeedbackComposeViewControllerDelegate.h"
-
-#import "HockeySDKNullability.h"
-NS_ASSUME_NONNULL_BEGIN
-
-@class BITFeedbackManager;
-
-/**
- *	Delegate protocol which is notified about changes in the feedbackManager
- *  @TODO 
- *    * move shouldShowUpdateAlert from feedbackManager here
- */
-@protocol BITFeedbackManagerDelegate <NSObject, BITFeedbackComposeViewControllerDelegate>
-
-@optional
-
-/**
- *  Can be implemented to control wether the feedback manager should automatically
- *  fetch for new messages on app startup or when becoming active.
- *
- *  By default the SDK fetches on app startup or when the app is becoming active again
- *  if there are already messages existing or pending on the device.
- *
- *  You could disable it e.g. depending on available mobile network/WLAN connection
- *  or let it fetch less frequently.
- *
- *	@param	feedbackManager	The feedbackManager which did detect the new messages
- */
-- (BOOL)allowAutomaticFetchingForNewFeedbackForManager:(BITFeedbackManager *)feedbackManager;
-
-
-/**
- *	can be implemented to know when new feedback from the server arrived
- *
- *	@param	feedbackManager	The feedbackManager which did detect the new messages
- */
-- (void)feedbackManagerDidReceiveNewFeedback:(BITFeedbackManager *)feedbackManager;
-
-
-/**
- *  This optional method can be implemented to provide items to prefill
- *  the FeedbackComposeMessage user interface with the given items.
- *
- *  If the user sends the feedback message, these items will be attached to that message.
- *
- *  All NSString-Content in the array will be concatenated and result in the message,
- *  while all UIImage and NSData-instances will be turned into attachments.
- *
- *  @param feedbackManager The BITFeedbackManager instance that will handle sending the feedback.
- *
- *  @return An array containing the items to be attached to the feedback message
- *  @see `[BITFeedbackComposeViewController prepareWithItems:]
- */
-- (nullable NSArray *)preparedItemsForFeedbackManager:(BITFeedbackManager *)feedbackManager;
-
-/**
- *  Indicates if a new thread should be created for each new feedback message
- *
- *  Setting it to `YES` will force a new thread whenever a new message is sent as
- *  opposed to the default resume thread behaviour.
- *  
- *  @return A BOOL indicating if each feedback message should be sent as a new thread.
- */
-- (BOOL)forceNewFeedbackThreadForFeedbackManager:(BITFeedbackManager *)feedbackManager;
-
-@end
-
-NS_ASSUME_NONNULL_END
diff --git a/submodules/HockeySDK-iOS/Classes/BITFeedbackManagerPrivate.h b/submodules/HockeySDK-iOS/Classes/BITFeedbackManagerPrivate.h
deleted file mode 100644
index ab4bbe1935..0000000000
--- a/submodules/HockeySDK-iOS/Classes/BITFeedbackManagerPrivate.h
+++ /dev/null
@@ -1,133 +0,0 @@
-/*
- * Author: Andreas Linde <mail@andreaslinde.de>
- *         Kent Sutherland
- *
- * Copyright (c) 2012-2014 HockeyApp, Bit Stadium GmbH.
- * Copyright (c) 2011 Andreas Linde & Kent Sutherland.
- * All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person
- * obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without
- * restriction, including without limitation the rights to use,
- * copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following
- * conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
- * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#if HOCKEYSDK_FEATURE_FEEDBACK
-
-extern NSString *const kBITFeedbackUpdateAttachmentThumbnail;
-
-#import "BITFeedbackMessage.h"
-
-@class UITapGestureRecognizer;
-
-@interface BITFeedbackManager () {
-}
-
-
-///-----------------------------------------------------------------------------
-/// @name Delegate
-///-----------------------------------------------------------------------------
-
-/**
- Sets the `BITFeedbackManagerDelegate` delegate.
- 
- Can be set to be notified when new feedback is received from the server.
- 
- The delegate is automatically set by using `[BITHockeyManager setDelegate:]`. You
- should not need to set this delegate individually.
- 
- @see `[BITHockeyManager setDelegate:]`
- */
-@property (nonatomic, weak) id<BITFeedbackManagerDelegate> delegate;
-
-
-@property (nonatomic, strong) NSMutableArray *feedbackList;
-@property (nonatomic, copy) NSString *token;
-
-
-// used by BITHockeyManager if disable status is changed
-@property (nonatomic, getter = isFeedbackManagerDisabled) BOOL disableFeedbackManager;
-// TapRecognizer used in case feedback observation mode is BITFeedbackObservationModeThreeFingerTap is set.
-@property(nonatomic, strong) UITapGestureRecognizer *tapRecognizer;
-@property(nonatomic) BOOL observationModeOnScreenshotEnabled;
-@property(nonatomic) BOOL observationModeThreeFingerTapEnabled;
-
-
-@property (nonatomic, strong) BITFeedbackListViewController *currentFeedbackListViewController;
-@property (nonatomic, strong) BITFeedbackComposeViewController *currentFeedbackComposeViewController;
-@property (nonatomic) BOOL didAskUserData;
-
-@property (nonatomic, strong) NSDate *lastCheck;
-
-@property (nonatomic, strong) NSNumber *lastMessageID;
-
-@property (nonatomic, copy) NSString *userID;
-@property (nonatomic, copy) NSString *userName;
-@property (nonatomic, copy) NSString *userEmail;
-
-
-
-// Fetch user meta data
-- (BOOL)updateUserIDUsingKeychainAndDelegate;
-- (BOOL)updateUserNameUsingKeychainAndDelegate;
-- (BOOL)updateUserEmailUsingKeychainAndDelegate;
-
-// check if the user wants to influence when fetching of new messages may be done
-- (BOOL)allowFetchingNewMessages;
-
-// load new messages from the server
-- (void)updateMessagesList;
-
-// load new messages from the server if the last request is too long ago
-- (void)updateMessagesListIfRequired;
-
-- (NSUInteger)numberOfMessages;
-- (BITFeedbackMessage *)messageAtIndex:(NSUInteger)index;
-
-- (void)submitMessageWithText:(NSString *)text andAttachments:(NSArray *)photos;
-- (void)submitPendingMessages;
-
-// Returns YES if manual user data can be entered, required or optional
-- (BOOL)askManualUserDataAvailable;
-
-// Returns YES if required user data is missing?
-- (BOOL)requireManualUserDataMissing;
-
-// Returns YES if user data is available and can be edited
-- (BOOL)isManualUserDataAvailable;
-
-// used in the user data screen
-- (void)updateDidAskUserData;
-
-
-- (BITFeedbackMessage *)messageWithID:(NSNumber *)messageID;
-
-- (NSArray *)messagesWithStatus:(BITFeedbackMessageStatus)status;
-
-- (void)saveMessages;
-
-- (void)fetchMessageUpdates;
-- (void)updateMessageListFromResponse:(NSDictionary *)jsonDictionary;
-
-- (BOOL)deleteMessageAtIndex:(NSUInteger)index;
-- (void)deleteAllMessages;
-
-@end
-
-#endif /* HOCKEYSDK_FEATURE_FEEDBACK */
diff --git a/submodules/HockeySDK-iOS/Classes/BITFeedbackMessage.h b/submodules/HockeySDK-iOS/Classes/BITFeedbackMessage.h
deleted file mode 100644
index c33caa983d..0000000000
--- a/submodules/HockeySDK-iOS/Classes/BITFeedbackMessage.h
+++ /dev/null
@@ -1,102 +0,0 @@
-/*
- * Author: Andreas Linde <mail@andreaslinde.de>
- *
- * Copyright (c) 2012-2014 HockeyApp, Bit Stadium GmbH.
- * All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person
- * obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without
- * restriction, including without limitation the rights to use,
- * copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following
- * conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
- * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
- */
-
-
-#import <Foundation/Foundation.h>
-
-@class BITFeedbackMessageAttachment;
-
-/**
- *  Status for each feedback message
- */
-typedef NS_ENUM(NSInteger, BITFeedbackMessageStatus) {
-  /**
-   *  default and new messages from SDK per default
-   */
-  BITFeedbackMessageStatusSendPending = 0,
-  /**
-   *  message is in conflict, happens if the message is already stored on the server and tried sending it again
-   */
-  BITFeedbackMessageStatusInConflict = 1,
-  /**
-   *  sending of message is in progress
-   */
-  BITFeedbackMessageStatusSendInProgress = 2,
-  /**
-   *  new messages from server
-   */
-  BITFeedbackMessageStatusUnread = 3,
-  /**
-   *  messages from server once read and new local messages once successful send from SDK
-   */
-  BITFeedbackMessageStatusRead = 4,
-  /**
-   *  message is archived, happens if the thread is deleted from the server
-   */
-  BITFeedbackMessageStatusArchived = 5
-};
-
-/**
- *  An individual feedback message
- */
-@interface BITFeedbackMessage : NSObject {
-}
-
-@property (nonatomic, copy) NSString *text;
-@property (nonatomic, copy) NSString *userID;
-@property (nonatomic, copy) NSString *name;
-@property (nonatomic, copy) NSString *email;
-@property (nonatomic, copy) NSDate *date;
-@property (nonatomic, copy) NSNumber *identifier;
-@property (nonatomic, copy) NSString *token;
-@property (nonatomic, strong) NSArray *attachments;
-@property (nonatomic) BITFeedbackMessageStatus status;
-@property (nonatomic) BOOL userMessage;
-
-/** 
- Delete local cached attachment data
- 
- @warning This method must be called before a feedback message is deleted.
- */
-- (void)deleteContents;
-
-/**
- Add an attachment to a message
- 
- @param object BITFeedbackMessageAttachment instance representing the attachment that should be added
- */
-- (void)addAttachmentsObject:(BITFeedbackMessageAttachment *)object;
-
-/**
- Return the attachments that can be viewed
- 
- @return NSArray containing the attachment objects that can be previewed
- */
-- (NSArray *)previewableAttachments;
-
-@end
diff --git a/submodules/HockeySDK-iOS/Classes/BITFeedbackMessage.m b/submodules/HockeySDK-iOS/Classes/BITFeedbackMessage.m
deleted file mode 100644
index e0c05c4055..0000000000
--- a/submodules/HockeySDK-iOS/Classes/BITFeedbackMessage.m
+++ /dev/null
@@ -1,120 +0,0 @@
-/*
- * Author: Andreas Linde <mail@andreaslinde.de>
- *
- * Copyright (c) 2012-2014 HockeyApp, Bit Stadium GmbH.
- * All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person
- * obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without
- * restriction, including without limitation the rights to use,
- * copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following
- * conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
- * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
- */
-
-
-#import "HockeySDK.h"
-
-#if HOCKEYSDK_FEATURE_FEEDBACK
-
-#import "BITFeedbackMessage.h"
-#import "BITFeedbackMessageAttachment.h"
-
-@implementation BITFeedbackMessage
-
-
-#pragma mark - NSObject
-
-- (instancetype) init {
-  if ((self = [super init])) {
-    _text = nil;
-    _userID = nil;
-    _name = nil;
-    _email = nil;
-    _date = [[NSDate alloc] init];
-    _token = nil;
-    _attachments = nil;
-    _identifier = [[NSNumber alloc] initWithInteger:0];
-    _status = BITFeedbackMessageStatusSendPending;
-    _userMessage = NO;
-  }
-  return self;
-}
-
-
-#pragma mark - NSCoder
-
-- (void)encodeWithCoder:(NSCoder *)encoder {
-  [encoder encodeObject:self.text forKey:@"text"];
-  [encoder encodeObject:self.userID forKey:@"userID"];
-  [encoder encodeObject:self.name forKey:@"name"];
-  [encoder encodeObject:self.email forKey:@"email"];
-  [encoder encodeObject:self.date forKey:@"date"];
-  [encoder encodeObject:self.identifier forKey:@"id"];
-  [encoder encodeObject:self.attachments forKey:@"attachments"];
-  [encoder encodeInteger:self.status forKey:@"status"];
-  [encoder encodeBool:self.userMessage forKey:@"userMessage"];
-  [encoder encodeObject:self.token forKey:@"token"];
-}
-
-- (instancetype)initWithCoder:(NSCoder *)decoder {
-  if ((self = [self init])) {
-    self.text = [decoder decodeObjectForKey:@"text"];
-    self.userID = [decoder decodeObjectForKey:@"userID"];
-    self.name = [decoder decodeObjectForKey:@"name"];
-    self.email = [decoder decodeObjectForKey:@"email"];
-    self.date = [decoder decodeObjectForKey:@"date"];
-    self.identifier = [decoder decodeObjectForKey:@"id"];
-    self.attachments = [decoder decodeObjectForKey:@"attachments"];
-    self.status = (BITFeedbackMessageStatus)[decoder decodeIntegerForKey:@"status"];
-    self.userMessage = [decoder decodeBoolForKey:@"userMessage"];
-    self.token = [decoder decodeObjectForKey:@"token"];
-  }
-  return self;
-}
-
-#pragma mark - Deletion
-
-- (void)deleteContents {
-  for (BITFeedbackMessageAttachment *attachment in self.attachments){
-    [attachment deleteContents];
-  }
-}
-
-- (NSArray *)previewableAttachments {
-  NSMutableArray *returnArray = [NSMutableArray new];
-  
-  for (BITFeedbackMessageAttachment *attachment in self.attachments){
-    if ([QLPreviewController canPreviewItem:attachment ]){
-      [returnArray addObject:attachment];
-    }
-  }
-  
-  return returnArray;
-}
-
-- (void)addAttachmentsObject:(BITFeedbackMessageAttachment *)object{
-  if (!self.attachments){
-    self.attachments = [NSArray array];
-  }
-  self.attachments = [self.attachments arrayByAddingObject:object];
-}
-
-
-@end
-
-#endif /* HOCKEYSDK_FEATURE_FEEDBACK */
diff --git a/submodules/HockeySDK-iOS/Classes/BITFeedbackMessageAttachment.h b/submodules/HockeySDK-iOS/Classes/BITFeedbackMessageAttachment.h
deleted file mode 100644
index bdfaec0085..0000000000
--- a/submodules/HockeySDK-iOS/Classes/BITFeedbackMessageAttachment.h
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * Author: Moritz Haarmann <post@moritzhaarmann.de>
- *
- * Copyright (c) 2012-2014 HockeyApp, Bit Stadium GmbH.
- * All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person
- * obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without
- * restriction, including without limitation the rights to use,
- * copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following
- * conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
- * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#import <Foundation/Foundation.h>
-#import <UIKit/UIKit.h>
-#import <QuickLook/QuickLook.h>
-
-/**
- * An individual feedback message attachment
- */
-@interface BITFeedbackMessageAttachment : NSObject<NSCoding, QLPreviewItem>
-
-@property (nonatomic, copy) NSNumber *identifier;
-@property (nonatomic, copy) NSString *originalFilename;
-@property (nonatomic, copy) NSString *contentType;
-@property (nonatomic, copy) NSString *sourceURL;
-@property (nonatomic) BOOL isLoading;
-@property (nonatomic, readonly) NSData *data;
-
-
-@property (nonatomic, readonly) UIImage *imageRepresentation;
-
-
-+ (BITFeedbackMessageAttachment *)attachmentWithData:(NSData *)data contentType:(NSString *)contentType;
-
-- (UIImage *)thumbnailWithSize:(CGSize)size;
-
-- (void)replaceData:(NSData *)data;
-
-- (void)deleteContents;
-
-- (BOOL)needsLoadingFromURL;
-
-- (BOOL)isImage;
-
-- (NSURL *)localURL;
-
-/**
- Used to determine whether QuickLook can preview this file or not. If not, we don't download it.
- */ 
-- (NSString*)possibleFilename;
-
-@end
diff --git a/submodules/HockeySDK-iOS/Classes/BITFeedbackMessageAttachment.m b/submodules/HockeySDK-iOS/Classes/BITFeedbackMessageAttachment.m
deleted file mode 100644
index 1ea27ed79d..0000000000
--- a/submodules/HockeySDK-iOS/Classes/BITFeedbackMessageAttachment.m
+++ /dev/null
@@ -1,269 +0,0 @@
-/*
- * Author: Moritz Haarmann <post@moritzhaarmann.de>
- *
- * Copyright (c) 2012-2014 HockeyApp, Bit Stadium GmbH.
- * All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person
- * obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without
- * restriction, including without limitation the rights to use,
- * copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following
- * conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
- * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
- */
-
-
-#import "HockeySDK.h"
-
-#if HOCKEYSDK_FEATURE_FEEDBACK
-
-#import "BITFeedbackMessageAttachment.h"
-#import "BITHockeyHelper.h"
-#import "HockeySDKPrivate.h"
-#import <MobileCoreServices/MobileCoreServices.h>
-
-#define kCacheFolderName @"attachments"
-
-@interface BITFeedbackMessageAttachment()
-
-@property (nonatomic, strong) NSMutableDictionary *thumbnailRepresentations;
-@property (nonatomic, strong) NSData *internalData;
-@property (nonatomic, copy) NSString *filename;
-@property (nonatomic, copy) NSString *tempFilename;
-@property (nonatomic, copy) NSString *cachePath;
-@property (nonatomic, strong) NSFileManager *fm;
-
-@end
-
-@implementation BITFeedbackMessageAttachment
-
-+ (BITFeedbackMessageAttachment *)attachmentWithData:(NSData *)data contentType:(NSString *)contentType {
-  
-  static NSDateFormatter *formatter;
-  
-  if(!formatter) {
-    formatter = [NSDateFormatter new];
-    formatter.dateStyle = NSDateFormatterShortStyle;
-    formatter.timeStyle = NSDateFormatterShortStyle;
-  }
-  
-  BITFeedbackMessageAttachment *newAttachment = [BITFeedbackMessageAttachment new];
-  newAttachment.contentType = contentType;
-  newAttachment.data = data;
-  newAttachment.originalFilename = [NSString stringWithFormat:@"Attachment: %@", [formatter stringFromDate:[NSDate date]]];
-
-  return newAttachment;
-}
-
-- (instancetype)init {
-  if ((self = [super init])) {
-    _isLoading = NO;
-    _thumbnailRepresentations = [NSMutableDictionary new];
-    
-    _fm = [[NSFileManager alloc] init];
-    _cachePath = [bit_settingsDir() stringByAppendingPathComponent:kCacheFolderName];
-    
-    BOOL isDirectory;
-    
-    if (![_fm fileExistsAtPath:_cachePath isDirectory:&isDirectory]){
-      [_fm createDirectoryAtPath:_cachePath withIntermediateDirectories:YES attributes:nil error:nil];
-    }
-    
-  }
-  return self;
-}
-
-- (void)setData:(NSData *)data {
-  self.internalData = data;
-  self.filename = [self possibleFilename];
-  [self.internalData writeToFile:self.filename atomically:YES];
-}
-
-- (NSData *)data {
-  if (!self.internalData && self.filename) {
-    self.internalData = [NSData dataWithContentsOfFile:self.filename];
-  }
-  
-  if (self.internalData) {
-    return self.internalData;
-  }
-  
-  return [NSData data];
-}
-
-- (void)replaceData:(NSData *)data {
-  self.data = data;
-  self.thumbnailRepresentations = [NSMutableDictionary new];
-}
-
-- (BOOL)needsLoadingFromURL {
-  return (self.sourceURL && ![self.fm fileExistsAtPath:(NSString *)[self.localURL path]]);
-}
-
-- (BOOL)isImage {
-  return ([self.contentType rangeOfString:@"image"].location != NSNotFound);
-}
-
-- (NSURL *)localURL {
-  if (self.filename && [self.fm fileExistsAtPath:self.filename]) {
-    return [NSURL fileURLWithPath:self.filename];
-  }
-  
-  return [NSURL URLWithString:@""];
-}
-
-
-#pragma mark NSCoding
-
-- (void)encodeWithCoder:(NSCoder *)aCoder {
-  [aCoder encodeObject:self.contentType forKey:@"contentType"];
-  [aCoder encodeObject:self.filename forKey:@"filename"];
-  [aCoder encodeObject:self.originalFilename forKey:@"originalFilename"];
-  [aCoder encodeObject:self.sourceURL forKey:@"url"];
-}
-
-- (instancetype)initWithCoder:(NSCoder *)aDecoder {
-  if ((self = [self init])) {
-    self.contentType = [aDecoder decodeObjectForKey:@"contentType"];
-    self.filename = [aDecoder decodeObjectForKey:@"filename"];
-    self.thumbnailRepresentations = [NSMutableDictionary new];
-    self.originalFilename = [aDecoder decodeObjectForKey:@"originalFilename"];
-    self.sourceURL = [aDecoder decodeObjectForKey:@"url"];
-  }
-  
-  return self;
-}
-
-
-#pragma mark - Thumbnails / Image Representation
-
-- (UIImage *)imageRepresentation {
-  if ([self.contentType rangeOfString:@"image"].location != NSNotFound && self.filename ) {
-    return [UIImage imageWithData:self.data];
-  } else {
-    // Create a Icon ..
-    UIDocumentInteractionController* docController = [[UIDocumentInteractionController alloc] init];
-    docController.name = self.originalFilename;
-    NSArray* icons = docController.icons;
-    if (icons.count){
-      return icons[0];
-    } else {
-      return nil;
-    }
-  }
-}
-
-- (UIImage *)thumbnailWithSize:(CGSize)size {
-  id<NSCopying> cacheKey = [NSValue valueWithCGSize:size];
-  
-  if (!self.thumbnailRepresentations[cacheKey]) {
-    UIImage *image = self.imageRepresentation;
-    // consider the scale.
-    if (!image) {
-      return nil;
-    }
-    
-    CGFloat scale = [UIScreen mainScreen].scale;
-    
-    if (scale != image.scale) {
-      
-      CGSize scaledSize = CGSizeApplyAffineTransform(size, CGAffineTransformMakeScale(scale, scale));
-      UIImage *thumbnail = bit_imageToFitSize(image, scaledSize, YES) ;
-      
-      UIImage *scaledThumbnail = [UIImage imageWithCGImage:(CGImageRef)thumbnail.CGImage scale:scale orientation:thumbnail.imageOrientation];
-      if (thumbnail) {
-        [self.thumbnailRepresentations setObject:scaledThumbnail forKey:cacheKey];
-      }
-      
-    } else {
-      UIImage *thumbnail = bit_imageToFitSize(image, size, YES) ;
-      
-      [self.thumbnailRepresentations setObject:thumbnail forKey:cacheKey];
-      
-    }
-    
-  }
-  
-  return self.thumbnailRepresentations[cacheKey];
-}
-
-
-#pragma mark - Persistence Helpers
-
-- (void)setFilename:(NSString *)filename {
-  if (filename) {
-    filename = [self.cachePath stringByAppendingPathComponent:[filename lastPathComponent]];
-  }
-  _filename = filename;
-}
-
-- (NSString *)possibleFilename {
-  if (self.tempFilename) {
-    return self.tempFilename;
-  }
-  
-  NSString *uniqueString = bit_UUID();
-  self.tempFilename = [self.cachePath stringByAppendingPathComponent:uniqueString];
-  
-  // File extension that suits the Content type.
-  
-  CFStringRef mimeType = (__bridge CFStringRef)self.contentType;
-  if (mimeType) {
-    CFStringRef uti = UTTypeCreatePreferredIdentifierForTag(kUTTagClassMIMEType, mimeType, NULL);
-    CFStringRef extension = UTTypeCopyPreferredTagWithClass(uti, kUTTagClassFilenameExtension);
-    if (extension) {
-      self.tempFilename = [self.tempFilename stringByAppendingPathExtension:(__bridge NSString *)(extension)];
-      CFRelease(extension);
-    }
-    if (uti) {
-      CFRelease(uti);
-    }
-  }
-  
-  return self.tempFilename;
-}
-
-- (void)deleteContents {
-  if (self.filename) {
-    [self.fm removeItemAtPath:self.filename error:nil];
-    self.filename = nil;
-  }
-}
-
-
-#pragma mark - QLPreviewItem
-
-- (NSString *)previewItemTitle {
-  return self.originalFilename;
-}
-
-- (NSURL *)previewItemURL {
-  if (self.localURL){
-    return self.localURL;
-  } else if (self.sourceURL) {
-    NSString *filename = self.possibleFilename;
-    if (filename) {
-      return [NSURL fileURLWithPath:filename];
-    }
-  }
-  
-  return [NSURL URLWithString:(NSString *)[[NSBundle mainBundle] pathForResource:@"FeedbackPlaceholder" ofType:@"png"]];
-}
-
-@end
-
-#endif /* HOCKEYSDK_FEATURE_FEEDBACK */
diff --git a/submodules/HockeySDK-iOS/Classes/BITFeedbackUserDataViewController.h b/submodules/HockeySDK-iOS/Classes/BITFeedbackUserDataViewController.h
deleted file mode 100644
index 84128d086d..0000000000
--- a/submodules/HockeySDK-iOS/Classes/BITFeedbackUserDataViewController.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Author: Andreas Linde <mail@andreaslinde.de>
- *
- * Copyright (c) 2012-2014 HockeyApp, Bit Stadium GmbH.
- * All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person
- * obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without
- * restriction, including without limitation the rights to use,
- * copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following
- * conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
- * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
- */
-
-
-#import <UIKit/UIKit.h>
-
-@protocol BITFeedbackUserDataDelegate;
-
-@interface BITFeedbackUserDataViewController : UITableViewController <UITextFieldDelegate>
-
-@property (nonatomic, weak) id <BITFeedbackUserDataDelegate> delegate;
-
-@end
-
-///////////////////////////////////////////////////////////////////////////////////////////////////
-@protocol BITFeedbackUserDataDelegate <NSObject>
-
-@required
-
-// cancel action is invoked
-- (void)userDataUpdateCancelled;
-
-// save action is invoked and all required data available
-- (void)userDataUpdateFinished;
-
-@end
diff --git a/submodules/HockeySDK-iOS/Classes/BITFeedbackUserDataViewController.m b/submodules/HockeySDK-iOS/Classes/BITFeedbackUserDataViewController.m
deleted file mode 100644
index 4b49a7e1ee..0000000000
--- a/submodules/HockeySDK-iOS/Classes/BITFeedbackUserDataViewController.m
+++ /dev/null
@@ -1,266 +0,0 @@
-/*
- * Author: Andreas Linde <mail@andreaslinde.de>
- *
- * Copyright (c) 2012-2014 HockeyApp, Bit Stadium GmbH.
- * All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person
- * obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without
- * restriction, including without limitation the rights to use,
- * copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following
- * conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
- * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
- */
-
-
-#import "HockeySDK.h"
-
-#if HOCKEYSDK_FEATURE_FEEDBACK
-
-#import "HockeySDKPrivate.h"
-#import "BITHockeyHelper.h"
-
-#import "BITFeedbackUserDataViewController.h"
-#import "BITFeedbackManagerPrivate.h"
-
-@interface BITFeedbackUserDataViewController () {
-}
-
-@property (nonatomic, weak) BITFeedbackManager *manager;
-
-@property (nonatomic, copy) NSString *name;
-@property (nonatomic, copy) NSString *email;
-@end
-
-
-@implementation BITFeedbackUserDataViewController
-
-
-- (instancetype)initWithStyle:(UITableViewStyle)style {
-  self = [super initWithStyle:style];
-  if (self) {
-    _delegate = nil;
-    
-    _manager = [BITHockeyManager sharedHockeyManager].feedbackManager;
-    _name = @"";
-    _email = @"";
-  }
-  return self;
-}
-
-- (void)viewDidLoad {
-  [super viewDidLoad];
-
-  self.title = BITHockeyLocalizedString(@"HockeyFeedbackUserDataTitle");
-  
-  [self.tableView setScrollEnabled:NO];
-}
-
-- (void)viewWillAppear:(BOOL)animated {
-  [super viewWillAppear:animated];
-
-  // Do any additional setup after loading the view.
-  self.navigationItem.leftBarButtonItem = [[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemCancel
-                                                                                        target:self
-                                                                                        action:@selector(dismissAction:)];
-  
-  self.navigationItem.rightBarButtonItem = [[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemSave
-                                                                                         target:self
-                                                                                         action:@selector(saveAction:)];
-
-  BITFeedbackManager *strongManager = self.manager;
-  if ([strongManager userName])
-    self.name = [strongManager userName];
-
-  if ([strongManager userEmail])
-    self.email = [strongManager userEmail];
-  
-  [strongManager updateDidAskUserData];
-  
-  self.navigationItem.rightBarButtonItem.enabled = [self allRequiredFieldsEntered];
-}
-
-#pragma mark - UIViewController Rotation
-
-- (UIInterfaceOrientationMask)supportedInterfaceOrientations{
-  return UIInterfaceOrientationMaskAll;
-}
-
-#pragma mark - Private methods
-- (BOOL)allRequiredFieldsEntered {
-  BITFeedbackManager *strongManager = self.manager;
-  if ([strongManager requireUserName] == BITFeedbackUserDataElementRequired && [self.name length] == 0)
-    return NO;
-
-  if ([strongManager requireUserEmail] == BITFeedbackUserDataElementRequired && [self.email length] == 0)
-    return NO;
-
-  if ([self.email length] > 0 && !bit_validateEmail(self.email))
-    return NO;
-  
-  return YES;
-}
-
-- (void)userNameEntered:(id)sender {
-  self.name = [(UITextField *)sender text];
-  
-  self.navigationItem.rightBarButtonItem.enabled = [self allRequiredFieldsEntered];
-}
-
-- (void)userEmailEntered:(id)sender {
-  self.email = [(UITextField *)sender text];
-
-  self.navigationItem.rightBarButtonItem.enabled = [self allRequiredFieldsEntered];
-}
-
-- (void)dismissAction:(id) __unused sender {
-  [self.delegate userDataUpdateCancelled];
-}
-
-- (void)saveAction:(id) __unused sender {
-  BITFeedbackManager *strongManager = self.manager;
-  if ([strongManager requireUserName]) {
-    [strongManager setUserName:self.name];
-  }
-  
-  if ([strongManager requireUserEmail]) {
-    [strongManager setUserEmail:self.email];
-  }
-  
-  [self.delegate userDataUpdateFinished];
-}
-
-#pragma mark - Table view data source
-
-- (NSInteger)numberOfSectionsInTableView:(UITableView *) __unused tableView {
-  return 1;
-}
-
-- (NSInteger)tableView:(UITableView *) __unused tableView numberOfRowsInSection:(NSInteger) __unused section {
-  NSInteger rows = 0;
-  BITFeedbackManager *strongManager = self.manager;
-  if ([strongManager requireUserName] != BITFeedbackUserDataElementDontShow)
-    rows ++;
-
-  if ([strongManager requireUserEmail] != BITFeedbackUserDataElementDontShow)
-    rows ++;
-
-  return rows;
-}
-
-- (NSString *)tableView:(UITableView *) __unused tableView titleForFooterInSection:(NSInteger)section {
-  if (section == 0) {
-    return BITHockeyLocalizedString(@"HockeyFeedbackUserDataDescription");
-  }
-  
-  return nil;
-}
-
-- (UITableViewCell *)tableView:(UITableView *) __unused tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath {
-  static NSString *CellIdentifier = @"InputCell";
-  BITFeedbackManager *strongManager = self.manager;
-  UITableViewCell *cell = [self.tableView dequeueReusableCellWithIdentifier:CellIdentifier];
-  if (cell == nil) {
-    cell = [[UITableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:CellIdentifier];
-
-    cell.accessoryType = UITableViewCellAccessoryNone;
-    cell.selectionStyle = UITableViewCellSelectionStyleNone;
-    cell.backgroundColor = [UIColor whiteColor];
-    
-    UITextField *textField = [[UITextField alloc] initWithFrame:CGRectMake(110, 11, self.view.frame.size.width - 110 - 35, 24)];
-    if (UI_USER_INTERFACE_IDIOM() != UIUserInterfaceIdiomPad) {
-      textField.autoresizingMask = UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleTopMargin | UIViewAutoresizingFlexibleBottomMargin;
-    }
-    textField.adjustsFontSizeToFitWidth = YES;
-    textField.textColor = [UIColor blackColor];
-    textField.backgroundColor = [UIColor lightGrayColor];
-
-    if ([indexPath row] == 0 && [strongManager requireUserName] != BITFeedbackUserDataElementDontShow) {
-      textField.placeholder = BITHockeyLocalizedString(@"HockeyFeedbackUserDataNamePlaceHolder");
-      textField.text = self.name;
-      if (strongManager.requireUserName == BITFeedbackUserDataElementRequired) {
-        textField.accessibilityHint = BITHockeyLocalizedString(@"HockeyAccessibilityHintRequired");
-      }
-      
-      textField.keyboardType = UIKeyboardTypeDefault;
-      if ([strongManager requireUserEmail])
-        textField.returnKeyType = UIReturnKeyNext;
-      else
-        textField.returnKeyType = UIReturnKeyDone;
-      textField.autocapitalizationType = UITextAutocapitalizationTypeWords;
-      [textField addTarget:self action:@selector(userNameEntered:) forControlEvents:UIControlEventEditingChanged];
-      [textField becomeFirstResponder];
-    } else {
-      textField.placeholder = BITHockeyLocalizedString(@"HockeyFeedbackUserDataEmailPlaceholder");
-      textField.text = self.email;
-      if (strongManager.requireUserEmail == BITFeedbackUserDataElementRequired) {
-        textField.accessibilityHint = BITHockeyLocalizedString(@"HockeyAccessibilityHintRequired");
-      }
-      
-      textField.keyboardType = UIKeyboardTypeEmailAddress;
-      textField.returnKeyType = UIReturnKeyDone;
-      textField.autocapitalizationType = UITextAutocapitalizationTypeNone;
-      [textField addTarget:self action:@selector(userEmailEntered:) forControlEvents:UIControlEventEditingChanged];
-      if (![strongManager requireUserName])
-        [textField becomeFirstResponder];
-    } 
-    
-    textField.backgroundColor = [UIColor whiteColor];
-    textField.autocorrectionType = UITextAutocorrectionTypeNo;
-    textField.textAlignment = NSTextAlignmentLeft;
-    textField.delegate = self;
-    textField.tag = indexPath.row;
-    
-    textField.clearButtonMode = UITextFieldViewModeWhileEditing;
-    [textField setEnabled: YES];
-    
-    [cell addSubview:textField];
-  }
-  
-  if ([indexPath row] == 0 && [strongManager requireUserName] != BITFeedbackUserDataElementDontShow) {
-    cell.textLabel.text = BITHockeyLocalizedString(@"HockeyFeedbackUserDataName");
-  } else {
-    cell.textLabel.text = BITHockeyLocalizedString(@"HockeyFeedbackUserDataEmail");
-  }
-  
-  return cell;    
-}
-
-
-#pragma mark - UITextFieldDelegate
-
-- (BOOL)textFieldShouldReturn:(UITextField *)textField {
-  NSInteger nextTag = textField.tag + 1;
-  
-  UIResponder* nextResponder = [self.view viewWithTag:nextTag];
-  if (nextResponder) {
-    [nextResponder becomeFirstResponder];
-  } else {
-    if ([self allRequiredFieldsEntered]) {
-      if ([textField isFirstResponder])
-        [textField resignFirstResponder];
-      
-      [self saveAction:nil];
-    }
-  }
-  return NO; 
-}
-
-
-@end
-
-#endif /* HOCKEYSDK_FEATURE_FEEDBACK */
diff --git a/submodules/HockeySDK-iOS/Classes/BITGZIP.h b/submodules/HockeySDK-iOS/Classes/BITGZIP.h
deleted file mode 100644
index dba000867f..0000000000
--- a/submodules/HockeySDK-iOS/Classes/BITGZIP.h
+++ /dev/null
@@ -1,46 +0,0 @@
-//
-//  GZIP.h
-//
-//  Version 1.0.3
-//
-//  Created by Nick Lockwood on 03/06/2012.
-//  Copyright (C) 2012 Charcoal Design
-//
-//  Distributed under the permissive zlib License
-//  Get the latest version from here:
-//
-//  https://github.com/nicklockwood/GZIP
-//
-//  This software is provided 'as-is', without any express or implied
-//  warranty.  In no event will the authors be held liable for any damages
-//  arising from the use of this software.
-//
-//  Permission is granted to anyone to use this software for any purpose,
-//  including commercial applications, and to alter it and redistribute it
-//  freely, subject to the following restrictions:
-//
-//  1. The origin of this software must not be misrepresented; you must not
-//  claim that you wrote the original software. If you use this software
-//  in a product, an acknowledgment in the product documentation would be
-//  appreciated but is not required.
-//
-//  2. Altered source versions must be plainly marked as such, and must not be
-//  misrepresented as being the original software.
-//
-//  3. This notice may not be removed or altered from any source distribution.
-//
-
-#import <Foundation/Foundation.h>
-
-#import "HockeySDKNullability.h"
-NS_ASSUME_NONNULL_BEGIN
-
-@interface NSData (BITGZIP)
-
-- (nullable NSData *)bit_gzippedDataWithCompressionLevel:(float)level;
-- (nullable NSData *)bit_gzippedData;
-- (nullable NSData *)bit_gunzippedData;
-
-@end
-
-NS_ASSUME_NONNULL_END
diff --git a/submodules/HockeySDK-iOS/Classes/BITHockeyAppClient.h b/submodules/HockeySDK-iOS/Classes/BITHockeyAppClient.h
deleted file mode 100644
index 2cd677b10c..0000000000
--- a/submodules/HockeySDK-iOS/Classes/BITHockeyAppClient.h
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- * Author: Stephan Diederich
- *
- * Copyright (c) 2013-2014 HockeyApp, Bit Stadium GmbH.
- * All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person
- * obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without
- * restriction, including without limitation the rights to use,
- * copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following
- * conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
- * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#import <Foundation/Foundation.h>
-
-extern NSString * const kBITHockeyAppClientBoundary;
-
-/**
- *  Generic Hockey API client
- */
-@interface BITHockeyAppClient : NSObject
-
-/**
- *	designated initializer
- *
- *	@param	baseURL	the baseURL of the HockeyApp instance
- */
-- (instancetype) initWithBaseURL:(NSURL*) baseURL;
-
-/**
- *	baseURL to which relative paths are appended
- */
-@property (nonatomic, strong) NSURL *baseURL;
-
-/**
- *	creates an NRURLRequest for the given method and path by using
- *  the internally stored baseURL.
- *
- *	@param	method	the HTTPMethod to check, must not be nil
- *	@param	params	parameters for the request (only supported for GET and POST for now)
- *	@param	path	path to append to baseURL. can be nil in which case "/" is appended
- *
- *	@return	an NSMutableURLRequest for further configuration
- */
-- (NSMutableURLRequest *) requestWithMethod:(NSString*) method
-                                       path:(NSString *) path
-                                 parameters:(NSDictionary *) params;
-
-/**
- *	Access to the internal operation queue
- */
-@property (nonatomic, strong) NSOperationQueue *operationQueue;
-
-#pragma mark - Helpers
-/**
- *	create a post body from the given value, key and boundary. This is a convenience call to 
- *  dataWithPostValue:forKey:contentType:boundary and aimed at NSString-content.
- *
- *	@param	value	-
- *	@param	key	-
- *	@param	boundary	-
- *
- *	@return	NSData instance configured to be attached on a (post) URLRequest
- */
-+ (NSData *)dataWithPostValue:(NSString *)value forKey:(NSString *)key boundary:(NSString *) boundary;
-
-/**
- *	create a post body from the given value, key and boundary and content type.
- *
- *	@param	value	-
- *	@param	key	-
- *@param contentType -
- *	@param	boundary	-
- *	@param	filename	-
- *
- *	@return	NSData instance configured to be attached on a (post) URLRequest
- */
-+ (NSData *)dataWithPostValue:(NSData *)value forKey:(NSString *)key contentType:(NSString *)contentType boundary:(NSString *) boundary filename:(NSString *)filename;
-
-@end
diff --git a/submodules/HockeySDK-iOS/Classes/BITHockeyAppClient.m b/submodules/HockeySDK-iOS/Classes/BITHockeyAppClient.m
deleted file mode 100644
index 6da7df4b60..0000000000
--- a/submodules/HockeySDK-iOS/Classes/BITHockeyAppClient.m
+++ /dev/null
@@ -1,130 +0,0 @@
-/*
- * Author: Stephan Diederich
- *
- * Copyright (c) 2013-2014 HockeyApp, Bit Stadium GmbH.
- * All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person
- * obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without
- * restriction, including without limitation the rights to use,
- * copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following
- * conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
- * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
- */
-#import "BITHockeyAppClient.h"
-
-NSString * const kBITHockeyAppClientBoundary = @"----FOO";
-
-@implementation BITHockeyAppClient
-
-- (instancetype)initWithBaseURL:(NSURL *)baseURL {
-  self = [super init];
-  if ( self ) {
-    NSParameterAssert(baseURL);
-    _baseURL = baseURL;
-  }
-  return self;
-}
-
-#pragma mark - Networking
-- (NSMutableURLRequest *) requestWithMethod:(NSString*) method
-                                       path:(NSString *) path
-                                 parameters:(NSDictionary *)params {
-  NSParameterAssert(self.baseURL);
-  NSParameterAssert(method);
-  NSParameterAssert(params == nil || [method isEqualToString:@"POST"] || [method isEqualToString:@"GET"]);
-  path = path ? : @"";
-  
-  NSURL *endpoint = [self.baseURL URLByAppendingPathComponent:path];
-  NSMutableURLRequest *request = [NSMutableURLRequest requestWithURL:endpoint];
-  request.HTTPMethod = method;
-  
-  if (params) {
-    if ([method isEqualToString:@"GET"]) {
-      NSString *absoluteURLString = [endpoint absoluteString];
-      //either path already has parameters, or not
-      NSString *appenderFormat = [path rangeOfString:@"?"].location == NSNotFound ? @"?%@" : @"&%@";
-      
-      endpoint = [NSURL URLWithString:[absoluteURLString stringByAppendingFormat:appenderFormat,
-                                       [self.class queryStringFromParameters:params withEncoding:NSUTF8StringEncoding]]];
-      [request setURL:endpoint];
-    } else {
-      //TODO: this is crap. Boundary must be the same as the one in appendData
-      //unify this!
-      NSString *contentType = [NSString stringWithFormat:@"multipart/form-data; boundary=%@", kBITHockeyAppClientBoundary];
-      [request setValue:contentType forHTTPHeaderField:@"Content-type"];
-      
-      NSMutableData *postBody = [NSMutableData data];
-      [params enumerateKeysAndObjectsUsingBlock:^(NSString *key, NSString *value, BOOL __unused *stop) {
-        [postBody appendData:[[self class] dataWithPostValue:value forKey:key boundary:kBITHockeyAppClientBoundary]];
-      }];
-      
-      [postBody appendData:(NSData *)[[NSString stringWithFormat:@"--%@--\r\n", kBITHockeyAppClientBoundary] dataUsingEncoding:NSUTF8StringEncoding]];
-      
-      [request setHTTPBody:postBody];
-    }
-  }
-  
-  return request;
-}
-
-+ (NSData *)dataWithPostValue:(NSString *)value forKey:(NSString *)key boundary:(NSString *) boundary {
-  return [self dataWithPostValue:[value dataUsingEncoding:NSUTF8StringEncoding] forKey:key contentType:@"text" boundary:boundary filename:nil];
-}
-
-+ (NSData *)dataWithPostValue:(NSData *)value forKey:(NSString *)key contentType:(NSString *)contentType boundary:(NSString *) boundary filename:(NSString *)filename {
-  NSMutableData *postBody = [NSMutableData data];
-  
-  [postBody appendData:(NSData *)[[NSString stringWithFormat:@"--%@\r\n", boundary] dataUsingEncoding:NSUTF8StringEncoding]];
-  
-  // There's certainly a better way to check if we are supposed to send binary data here. 
-  if (filename){
-    [postBody appendData:(NSData *)[[NSString stringWithFormat:@"Content-Disposition: form-data; name=\"%@\"; filename=\"%@\"\r\n", key, filename] dataUsingEncoding:NSUTF8StringEncoding]];
-    [postBody appendData:(NSData *)[[NSString stringWithFormat:@"Content-Type: %@\r\n", contentType] dataUsingEncoding:NSUTF8StringEncoding]];
-    [postBody appendData:(NSData *)[[NSString stringWithFormat:@"Content-Transfer-Encoding: binary\r\n\r\n"] dataUsingEncoding:NSUTF8StringEncoding]];
-  } else {
-    [postBody appendData:(NSData *)[[NSString stringWithFormat:@"Content-Disposition: form-data; name=\"%@\"\r\n", key] dataUsingEncoding:NSUTF8StringEncoding]];
-    [postBody appendData:(NSData *)[[NSString stringWithFormat:@"Content-Type: %@\r\n\r\n", contentType] dataUsingEncoding:NSUTF8StringEncoding]];
-  }
-  
-  [postBody appendData:value];
-  [postBody appendData:(NSData *)[@"\r\n" dataUsingEncoding:NSUTF8StringEncoding]];
-  
-  return postBody;
-}
-
-
-+ (NSString *) queryStringFromParameters:(NSDictionary *) params withEncoding:(NSStringEncoding) __unused encoding {
-  NSMutableString *queryString = [NSMutableString new];
-  [params enumerateKeysAndObjectsUsingBlock:^(NSString* key, NSString* value, BOOL __unused *stop) {
-    NSAssert([key isKindOfClass:[NSString class]], @"Query parameters can only be string-string pairs");
-    NSAssert([value isKindOfClass:[NSString class]], @"Query parameters can only be string-string pairs");
-    
-    [queryString appendFormat:queryString.length ? @"&%@=%@" : @"%@=%@", key, value];
-  }];
-  return queryString;
-}
-
-- (NSOperationQueue *)operationQueue {
-  if(nil == _operationQueue) {
-    _operationQueue = [[NSOperationQueue alloc] init];
-    _operationQueue.maxConcurrentOperationCount = 1;
-  }
-  return _operationQueue;
-}
-
-@end
diff --git a/submodules/HockeySDK-iOS/Classes/BITHockeyAttachment.h b/submodules/HockeySDK-iOS/Classes/BITHockeyAttachment.h
deleted file mode 100644
index ec6cd02df4..0000000000
--- a/submodules/HockeySDK-iOS/Classes/BITHockeyAttachment.h
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * Author: Andreas Linde <mail@andreaslinde.de>
- *
- * Copyright (c) 2014 HockeyApp, Bit Stadium GmbH.
- * All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person
- * obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without
- * restriction, including without limitation the rights to use,
- * copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following
- * conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
- * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#import <Foundation/Foundation.h>
-
-/**
- Provides support to add binary attachments to crash reports and feedback messages
- 
- This is used by `[BITCrashManagerDelegate attachmentForCrashManager:]`,
- `[BITFeedbackComposeViewController prepareWithItems:]` and
- `[BITFeedbackManager showFeedbackComposeViewWithPreparedItems:]`
- */
-@interface BITHockeyAttachment : NSObject<NSCoding>
-
-/**
- The filename the attachment should get
- */
-@property (nonatomic, readonly, copy) NSString *filename;
-
-/**
- The attachment data as NSData object
- */
-@property (nonatomic, readonly, strong) NSData *hockeyAttachmentData;
-
-/**
- The content type of your data as MIME type
- */
-@property (nonatomic, readonly, copy) NSString *contentType;
-
-/**
- Create an BITHockeyAttachment instance with a given filename and NSData object
- 
- @param filename             The filename the attachment should get. If nil will get a automatically generated filename
- @param hockeyAttachmentData The attachment data as NSData. The instance will be ignore if this is set to nil!
- @param contentType          The content type of your data as MIME type. If nil will be set to "application/octet-stream"
- 
- @return An instance of BITHockeyAttachment.
- */
-- (instancetype)initWithFilename:(NSString *)filename
-            hockeyAttachmentData:(NSData *)hockeyAttachmentData
-                     contentType:(NSString *)contentType;
-
-@end
diff --git a/submodules/HockeySDK-iOS/Classes/BITHockeyAttachment.m b/submodules/HockeySDK-iOS/Classes/BITHockeyAttachment.m
deleted file mode 100644
index 283f267785..0000000000
--- a/submodules/HockeySDK-iOS/Classes/BITHockeyAttachment.m
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * Author: Andreas Linde <mail@andreaslinde.de>
- *
- * Copyright (c) 2014 HockeyApp, Bit Stadium GmbH.
- * All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person
- * obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without
- * restriction, including without limitation the rights to use,
- * copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following
- * conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
- * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#import "HockeySDK.h"
-
-#if HOCKEYSDK_FEATURE_CRASH_REPORTER || HOCKEYSDK_FEATURE_FEEDBACK
-
-#import "BITHockeyAttachment.h"
-
-@implementation BITHockeyAttachment
-
-- (instancetype)initWithFilename:(NSString *)filename
-            hockeyAttachmentData:(NSData *)hockeyAttachmentData
-                     contentType:(NSString *)contentType
-{
-  if ((self = [super init])) {
-    _filename = filename;
-
-    _hockeyAttachmentData = hockeyAttachmentData;
-    
-    if (contentType) {
-      _contentType = contentType;
-    } else {
-      _contentType = @"application/octet-stream";
-    }
-
-  }
-  
-  return self;
-}
-
-
-#pragma mark - NSCoder
-
-- (void)encodeWithCoder:(NSCoder *)encoder {
-  if (self.filename) {
-    [encoder encodeObject:self.filename forKey:@"filename"];
-  }
-  if (self.hockeyAttachmentData) {
-    [encoder encodeObject:self.hockeyAttachmentData forKey:@"data"];
-  }
-  [encoder encodeObject:self.contentType forKey:@"contentType"];
-}
-
-- (instancetype)initWithCoder:(NSCoder *)decoder {
-  if ((self = [super init])) {
-    _filename = [decoder decodeObjectForKey:@"filename"];
-    _hockeyAttachmentData = [decoder decodeObjectForKey:@"data"];
-    _contentType = [decoder decodeObjectForKey:@"contentType"];
-  }
-  return self;
-}
-
-@end
-
-#endif /* HOCKEYSDK_FEATURE_CRASH_REPORTER || HOCKEYSDK_FEATURE_FEEDBACK */
diff --git a/submodules/HockeySDK-iOS/Classes/BITHockeyBaseManager.h b/submodules/HockeySDK-iOS/Classes/BITHockeyBaseManager.h
deleted file mode 100644
index 20da0b8c18..0000000000
--- a/submodules/HockeySDK-iOS/Classes/BITHockeyBaseManager.h
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
- * Author: Andreas Linde <mail@andreaslinde.de>
- *
- * Copyright (c) 2012-2014 HockeyApp, Bit Stadium GmbH.
- * All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person
- * obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without
- * restriction, including without limitation the rights to use,
- * copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following
- * conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
- * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#import <Foundation/Foundation.h>
-#import <UIKit/UIKit.h>
-
-
-/**
- The internal superclass for all component managers
- 
- */
-
-@interface BITHockeyBaseManager : NSObject
-
-///-----------------------------------------------------------------------------
-/// @name Modules
-///-----------------------------------------------------------------------------
-
-
-/**
- Defines the server URL to send data to or request data from
- 
- By default this is set to the HockeyApp servers and there rarely should be a
- need to modify that.
- */
-@property (nonatomic, copy) NSString *serverURL;
-
-
-///-----------------------------------------------------------------------------
-/// @name User Interface
-///-----------------------------------------------------------------------------
-
-/**
- The UIBarStyle of the update user interface navigation bar.
- 
- Default is UIBarStyleBlackOpaque
- @see navigationBarTintColor
- */
-@property (nonatomic, assign) UIBarStyle barStyle;
-
-/**
- The navigationbar tint color of the update user interface navigation bar.
- 
- The navigationBarTintColor is used by default, you can either overwrite it `navigationBarTintColor`
- or define another `barStyle` instead.
- 
- Default is RGB(25, 25, 25)
- @see barStyle
- */
-@property (nonatomic, strong) UIColor *navigationBarTintColor;
-
-/**
- The UIModalPresentationStyle for showing the update user interface when invoked
- with the update alert.
- */
-@property (nonatomic, assign) UIModalPresentationStyle modalPresentationStyle;
-
-+ (void)setPresentAlert:(void (^)(UIAlertController *))presentAlert;
-+ (void)setPresentView:(void (^)(UIViewController *))presentView;
-
-@end
diff --git a/submodules/HockeySDK-iOS/Classes/BITHockeyBaseManager.m b/submodules/HockeySDK-iOS/Classes/BITHockeyBaseManager.m
deleted file mode 100644
index 03b70b80cf..0000000000
--- a/submodules/HockeySDK-iOS/Classes/BITHockeyBaseManager.m
+++ /dev/null
@@ -1,372 +0,0 @@
-/*
- * Author: Andreas Linde <mail@andreaslinde.de>
- *
- * Copyright (c) 2012-2014 HockeyApp, Bit Stadium GmbH.
- * All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person
- * obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without
- * restriction, including without limitation the rights to use,
- * copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following
- * conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
- * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#import "HockeySDK.h"
-#import "HockeySDKPrivate.h"
-
-#import "BITHockeyHelper.h"
-
-#import "BITHockeyBaseManager.h"
-#import "BITHockeyBaseManagerPrivate.h"
-#if HOCKEYSDK_FEATURE_AUTHENTICATOR || HOCKEYSDK_FEATURE_UPDATES || HOCKEYSDK_FEATURE_FEEDBACK
-#import "BITHockeyBaseViewController.h"
-#endif
-
-#import "BITKeychainUtils.h"
-
-#import <sys/sysctl.h>
-#import <mach-o/dyld.h>
-#import <mach-o/loader.h>
-
-// We need BIT_UNUSED macro to make sure there aren't any warnings when building
-// HockeySDK Distribution scheme. Since several configurations are build in this scheme
-// and different features can be turned on and off we can't just use __unused attribute.
-#if !defined (HOCKEYSDK_CONFIGURATION_ReleaseCrashOnlyExtensions)
-#if HOCKEYSDK_FEATURE_AUTHENTICATOR || HOCKEYSDK_FEATURE_UPDATES || HOCKEYSDK_FEATURE_FEEDBACK
-#define BIT_UNUSED
-#else
-#define BIT_UNUSED __unused
-#endif
-#endif
-
-@interface BITHockeyBaseManager ()
-
-@property (nonatomic, strong) UINavigationController *navController;
-@property (nonatomic, strong) NSDateFormatter *rfc3339Formatter;
-
-@end
-
-static void (^_presentAlert)(UIAlertController *) = nil;
-static void (^_presentView)(UIViewController *) = nil;
-
-@implementation BITHockeyBaseManager
-
-- (instancetype)init {
-  if ((self = [super init])) {
-    _serverURL = BITHOCKEYSDK_URL;
-    _barStyle = UIBarStyleDefault;
-    _modalPresentationStyle = UIModalPresentationFormSheet;
-    
-    NSLocale *enUSPOSIXLocale = [[NSLocale alloc] initWithLocaleIdentifier:@"en_US_POSIX"];
-    _rfc3339Formatter = [[NSDateFormatter alloc] init];
-    [_rfc3339Formatter setLocale:enUSPOSIXLocale];
-    [_rfc3339Formatter setDateFormat:@"yyyy'-'MM'-'dd'T'HH':'mm':'ss'Z'"];
-    [_rfc3339Formatter setTimeZone:[NSTimeZone timeZoneForSecondsFromGMT:0]];
-  }
-  return self;
-}
-
-- (instancetype)initWithAppIdentifier:(NSString *)appIdentifier appEnvironment:(BITEnvironment)environment {
-  if ((self = [self init])) {
-    _appIdentifier = appIdentifier;
-    _appEnvironment = environment;
-  }
-  return self;
-}
-
-
-#pragma mark - Private
-
-- (void)reportError:(NSError *)error {
-  BITHockeyLogError(@"ERROR: %@", [error localizedDescription]);
-}
-
-- (NSString *)encodedAppIdentifier {
-  return bit_encodeAppIdentifier(self.appIdentifier);
-}
-
-- (NSString *)getDevicePlatform {
-  size_t size;
-  sysctlbyname("hw.machine", NULL, &size, NULL, 0);
-  char *answer = (char*)malloc(size);
-  if (answer == NULL)
-    return @"";
-  sysctlbyname("hw.machine", answer, &size, NULL, 0);
-  NSString *platform = [NSString stringWithCString:answer encoding: NSUTF8StringEncoding];
-  free(answer);
-  return platform;
-}
-
-- (NSString *)executableUUID {
-  const struct mach_header *executableHeader = NULL;
-  for (uint32_t i = 0; i < _dyld_image_count(); i++) {
-    const struct mach_header *header = _dyld_get_image_header(i);
-    if (header->filetype == MH_EXECUTE) {
-      executableHeader = header;
-      break;
-    }
-  }
-  
-  if (!executableHeader)
-    return @"";
-  
-  BOOL is64bit = executableHeader->magic == MH_MAGIC_64 || executableHeader->magic == MH_CIGAM_64;
-  uintptr_t cursor = (uintptr_t)executableHeader + (is64bit ? sizeof(struct mach_header_64) : sizeof(struct mach_header));
-  const struct segment_command *segmentCommand = NULL;
-  for (uint32_t i = 0; i < executableHeader->ncmds; i++, cursor += segmentCommand->cmdsize) {
-    segmentCommand = (struct segment_command *)cursor;
-    if (segmentCommand->cmd == LC_UUID) {
-      const struct uuid_command *uuidCommand = (const struct uuid_command *)segmentCommand;
-      const uint8_t *uuid = uuidCommand->uuid;
-      return [[NSString stringWithFormat:@"%02X%02X%02X%02X%02X%02X%02X%02X%02X%02X%02X%02X%02X%02X%02X%02X",
-               uuid[0], uuid[1], uuid[2], uuid[3],
-               uuid[4], uuid[5], uuid[6], uuid[7],
-               uuid[8], uuid[9], uuid[10], uuid[11],
-               uuid[12], uuid[13], uuid[14], uuid[15]]
-              lowercaseString];
-    }
-  }
-  
-  return @"";
-}
-
-#if !defined (HOCKEYSDK_CONFIGURATION_ReleaseCrashOnlyExtensions)
-- (UIWindow *)findVisibleWindow {
-  UIWindow *visibleWindow = [UIApplication sharedApplication].keyWindow;
-  
-  if (!(visibleWindow.hidden)) {
-    return visibleWindow;
-  }
-  
-  // if the rootViewController property (available >= iOS 4.0) of the main window is set, we present the modal view controller on top of the rootViewController
-  NSArray *windows = [[UIApplication sharedApplication] windows];
-  for (UIWindow *window in windows) {
-    if (!window.hidden && !visibleWindow) {
-      visibleWindow = window;
-    }
-    if ([UIWindow instancesRespondToSelector:@selector(rootViewController)]) {
-      if (!(window.hidden) && ([window rootViewController])) {
-        visibleWindow = window;
-        BITHockeyLogDebug(@"INFO: UIWindow with rootViewController found: %@", visibleWindow);
-        break;
-      }
-    }
-  }
-  
-  return visibleWindow;
-}
-
-/**
- * Provide a custom UINavigationController with customized appearance settings
- *
- * @param viewController The root viewController
- * @param modalPresentationStyle The modal presentation style
- *
- * @return A UINavigationController
- */
-- (UINavigationController *)customNavigationControllerWithRootViewController:(UIViewController *)viewController presentationStyle:(UIModalPresentationStyle)modalPresentationStyle {
-  UINavigationController *navController = [[UINavigationController alloc] initWithRootViewController:viewController];
-  navController.navigationBar.barStyle = self.barStyle;
-  if (self.navigationBarTintColor) {
-    navController.navigationBar.tintColor = self.navigationBarTintColor;
-  } else {
-    // in case of iOS 7 we overwrite the tint color on the navigation bar
-    if ([UIWindow instancesRespondToSelector:NSSelectorFromString(@"tintColor")]) {
-      [navController.navigationBar setTintColor:BIT_RGBCOLOR(0, 122, 255)];
-    }
-  }
-  navController.modalPresentationStyle = modalPresentationStyle;
-  
-  return navController;
-}
-
-- (UIViewController *)visibleWindowRootViewController {
-  UIViewController *parentViewController = nil;
-  id strongDelegate = [BITHockeyManager sharedHockeyManager].delegate;
-  if ([strongDelegate respondsToSelector:@selector(viewControllerForHockeyManager:componentManager:)]) {
-    parentViewController = [strongDelegate viewControllerForHockeyManager:[BITHockeyManager sharedHockeyManager] componentManager:self];
-  }
-  
-  UIWindow *visibleWindow = [self findVisibleWindow];
-  
-  if (parentViewController == nil) {
-    parentViewController = [visibleWindow rootViewController];
-  }
-  
-  // use topmost modal view
-  while (parentViewController.presentedViewController) {
-    parentViewController = parentViewController.presentedViewController;
-  }
-  
-  // special addition to get rootViewController from three20 which has it's own controller handling
-  if (NSClassFromString(@"TTNavigator")) {
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Warc-performSelector-leaks"
-    UIViewController *ttParentViewController = nil;
-    ttParentViewController = [[NSClassFromString(@"TTNavigator") performSelector:(NSSelectorFromString(@"navigator"))] visibleViewController];
-    if (ttParentViewController)
-      parentViewController = ttParentViewController;
-#pragma clang diagnostic pop
-  }
-  
-  return parentViewController;
-}
-
-- (void)showAlertController:(UIViewController *)alertController {
-  
-  // always execute this on the main thread
-  dispatch_async(dispatch_get_main_queue(), ^{
-    if (_presentAlert) {
-      _presentAlert(alertController);
-    } else {
-      UIViewController *parentViewController = [self visibleWindowRootViewController];
-      
-      // as per documentation this only works if called from within viewWillAppear: or viewDidAppear:
-      // in tests this also worked fine on iOS 6 and 7 but not on iOS 5 so we are still trying this
-      if ([parentViewController isKindOfClass:NSClassFromString(@"UIAlertController")] || [parentViewController isBeingPresented]) {
-        BITHockeyLogWarning(@"WARNING: There is already a view controller being presented onto the parentViewController. Delaying presenting the new view controller by 0.5s.");
-        [self performSelector:@selector(showAlertController:) withObject:alertController afterDelay:0.5];
-        return;
-      }
-      
-      if (parentViewController) {
-        [parentViewController presentViewController:alertController animated:YES completion:nil];
-      }
-    }
-  });
-}
-
-- (void)showView:(UIViewController *)viewController {
-  if (_presentView) {
-    _presentView(viewController);
-    return;
-  }
-  
-  // if we compile Crash only, then BITHockeyBaseViewController is not included
-  // in the headers and will cause a warning with the modulemap file
-#if HOCKEYSDK_FEATURE_AUTHENTICATOR || HOCKEYSDK_FEATURE_UPDATES || HOCKEYSDK_FEATURE_FEEDBACK
-    UIViewController *parentViewController = [self visibleWindowRootViewController];
-    
-    // as per documentation this only works if called from within viewWillAppear: or viewDidAppear:
-    // in tests this also worked fine on iOS 6 and 7 but not on iOS 5 so we are still trying this
-    if ([parentViewController isBeingPresented]) {
-      BITHockeyLogDebug(@"INFO: There is already a view controller being presented onto the parentViewController. Delaying presenting the new view controller by 0.5s.");
-      [self performSelector:@selector(showView:) withObject:viewController afterDelay:0.5];
-      return;
-    }
-    
-    if (self.navController != nil) self.navController = nil;
-    
-    self.navController = [self customNavigationControllerWithRootViewController:viewController presentationStyle:self.modalPresentationStyle];
-    
-    if (parentViewController) {
-      self.navController.modalTransitionStyle = UIModalTransitionStyleCoverVertical;
-      
-      // page sheet for the iPad
-      if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad) {
-        self.navController.modalPresentationStyle = UIModalPresentationFormSheet;
-      }
-      
-      if ([viewController isKindOfClass:[BITHockeyBaseViewController class]])
-        [(BITHockeyBaseViewController *)viewController setModalAnimated:YES];
-      
-      [parentViewController presentViewController:self.navController animated:YES completion:nil];
-    } else {
-      // if not, we add a subview to the window. A bit hacky but should work in most circumstances.
-      // Also, we don't get a nice animation for free, but hey, this is for beta not production users ;)
-      UIWindow *visibleWindow = [self findVisibleWindow];
-      
-      BITHockeyLogDebug(@"INFO: No rootViewController found, using UIWindow-approach: %@", visibleWindow);
-      if ([viewController isKindOfClass:[BITHockeyBaseViewController class]])
-        [(BITHockeyBaseViewController *)viewController setModalAnimated:NO];
-      [visibleWindow addSubview:self.navController.view];
-    }
-#endif /* HOCKEYSDK_FEATURE_AUTHENTICATOR || HOCKEYSDK_FEATURE_UPDATES || HOCKEYSDK_FEATURE_FEEDBACK */
-}
-#endif // HOCKEYSDK_CONFIGURATION_ReleaseCrashOnlyExtensions && HOCKEYSDK_CONFIGURATION_RelaseCrashOnlyWatchOS
-
-
-- (BOOL)addStringValueToKeychain:(NSString *)stringValue forKey:(NSString *)key {
-	if (!key || !stringValue)
-		return NO;
-  
-  NSError *error = nil;
-  return [BITKeychainUtils storeUsername:key
-                             andPassword:stringValue
-                          forServiceName:bit_keychainHockeySDKServiceName()
-                          updateExisting:YES
-                                   error:&error];
-}
-
-- (BOOL)addStringValueToKeychainForThisDeviceOnly:(NSString *)stringValue forKey:(NSString *)key {
-	if (!key || !stringValue)
-		return NO;
-  
-  NSError *error = nil;
-  return [BITKeychainUtils storeUsername:key
-                             andPassword:stringValue
-                          forServiceName:bit_keychainHockeySDKServiceName()
-                          updateExisting:YES
-                           accessibility:kSecAttrAccessibleAfterFirstUnlockThisDeviceOnly
-                                   error:&error];
-}
-
-- (NSString *)stringValueFromKeychainForKey:(NSString *)key {
-	if (!key)
-		return nil;
-  
-  NSError *error = nil;
-  return [BITKeychainUtils getPasswordForUsername:key
-                                   andServiceName:bit_keychainHockeySDKServiceName()
-                                            error:&error];
-}
-
-- (BOOL)removeKeyFromKeychain:(NSString *)key {
-  NSError *error = nil;
-  return [BITKeychainUtils deleteItemForUsername:key
-                                  andServiceName:bit_keychainHockeySDKServiceName()
-                                           error:&error];
-}
-
-
-#pragma mark - Manager Control
-
-- (void)startManager {
-}
-
-#pragma mark - Helpers
-
-- (NSDate *)parseRFC3339Date:(NSString *)dateString {
-  NSDate *date = nil;
-  NSError *error = nil; 
-  if (![self.rfc3339Formatter getObjectValue:&date forString:dateString range:nil error:&error]) {
-    BITHockeyLogWarning(@"WARNING: Invalid date '%@' string: %@", dateString, error);
-  }
-  
-  return date;
-}
-
-+ (void)setPresentAlert:(void (^)(UIAlertController *))presentAlert {
-  _presentAlert = [presentAlert copy];
-}
-
-+ (void)setPresentView:(void (^)(UIViewController *))presentView {
-  _presentView = [presentView copy];
-}
-
-@end
diff --git a/submodules/HockeySDK-iOS/Classes/BITHockeyBaseManagerPrivate.h b/submodules/HockeySDK-iOS/Classes/BITHockeyBaseManagerPrivate.h
deleted file mode 100644
index 2ddf12d92e..0000000000
--- a/submodules/HockeySDK-iOS/Classes/BITHockeyBaseManagerPrivate.h
+++ /dev/null
@@ -1,94 +0,0 @@
-/*
- * Author: Andreas Linde <mail@andreaslinde.de>
- *
- * Copyright (c) 2012-2014 HockeyApp, Bit Stadium GmbH.
- * All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person
- * obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without
- * restriction, including without limitation the rights to use,
- * copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following
- * conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
- * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#import <Foundation/Foundation.h>
-#import <UIKit/UIKit.h>
-#import "BITHockeyManager.h"
-
-@class BITHockeyBaseManager;
-@class BITHockeyBaseViewController;
-
-@interface BITHockeyBaseManager()
-
-@property (nonatomic, copy) NSString *appIdentifier;
-
-@property (nonatomic, assign, readonly) BITEnvironment appEnvironment;
-
-- (instancetype)initWithAppIdentifier:(NSString *)appIdentifier appEnvironment:(BITEnvironment)environment;
-
-- (void)startManager;
-
-/** 
- * by default, just logs the message
- *
- * can be overridden by subclasses to do their own error handling,
- * e.g. to show UI
- *
- * @param error NSError
- */
-- (void)reportError:(NSError *)error;
-
-/** url encoded version of the appIdentifier
- 
- where appIdentifier is either the value this object was initialized with,
- or the main bundles CFBundleIdentifier if appIdentifier is nil
- */
-- (NSString *)encodedAppIdentifier;
-
-// device / application helpers
-- (NSString *)getDevicePlatform;
-- (NSString *)executableUUID;
-
-#if !defined (HOCKEYSDK_CONFIGURATION_ReleaseCrashOnlyExtensions)
-// UI helpers
-- (UIWindow *)findVisibleWindow;
-- (UINavigationController *)customNavigationControllerWithRootViewController:(UIViewController *)viewController presentationStyle:(UIModalPresentationStyle)presentationStyle;
-
-/**
- *  Present an UIAlertController on the visible root UIViewController.
- *
- *  Uses `visibleWindowRootViewController` to find a controller on which to present the UIAlertController on.
- *  This method is always dispatched on the main queue.
- *
- *  @param alertController The UIAlertController to be presented.
- */
-- (void)showAlertController:(UIViewController *)alertController;
-
-- (void)showView:(UIViewController *)viewController;
-#endif
-
-// Date helpers
-- (NSDate *)parseRFC3339Date:(NSString *)dateString;
-
-// keychain helpers
-- (BOOL)addStringValueToKeychain:(NSString *)stringValue forKey:(NSString *)key;
-- (BOOL)addStringValueToKeychainForThisDeviceOnly:(NSString *)stringValue forKey:(NSString *)key;
-- (NSString *)stringValueFromKeychainForKey:(NSString *)key;
-- (BOOL)removeKeyFromKeychain:(NSString *)key;
-
-@end
diff --git a/submodules/HockeySDK-iOS/Classes/BITHockeyBaseViewController.h b/submodules/HockeySDK-iOS/Classes/BITHockeyBaseViewController.h
deleted file mode 100644
index d7701036be..0000000000
--- a/submodules/HockeySDK-iOS/Classes/BITHockeyBaseViewController.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Author: Andreas Linde <mail@andreaslinde.de>
- *
- * Copyright (c) 2012-2014 HockeyApp, Bit Stadium GmbH.
- * All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person
- * obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without
- * restriction, including without limitation the rights to use,
- * copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following
- * conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
- * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#import <UIKit/UIKit.h>
-
-@interface BITHockeyBaseViewController : UITableViewController
-
-@property (nonatomic, readwrite) BOOL modalAnimated;
-
-- (instancetype)initWithModalStyle:(BOOL)modal;
-- (instancetype)initWithStyle:(UITableViewStyle)style modal:(BOOL)modal;
-
-@end
diff --git a/submodules/HockeySDK-iOS/Classes/BITHockeyBaseViewController.m b/submodules/HockeySDK-iOS/Classes/BITHockeyBaseViewController.m
deleted file mode 100644
index 1632c342ce..0000000000
--- a/submodules/HockeySDK-iOS/Classes/BITHockeyBaseViewController.m
+++ /dev/null
@@ -1,109 +0,0 @@
-/*
- * Author: Andreas Linde <mail@andreaslinde.de>
- *
- * Copyright (c) 2012-2014 HockeyApp, Bit Stadium GmbH.
- * All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person
- * obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without
- * restriction, including without limitation the rights to use,
- * copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following
- * conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
- * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#import "HockeySDK.h"
-
-#if HOCKEYSDK_FEATURE_AUTHENTICATOR || HOCKEYSDK_FEATURE_UPDATES || HOCKEYSDK_FEATURE_FEEDBACK
-
-#import "BITHockeyBaseViewController.h"
-#import "HockeySDKPrivate.h"
-
-@interface BITHockeyBaseViewController ()
-
-@property (nonatomic) BOOL modal;
-
-@end
-
-@implementation BITHockeyBaseViewController
-
-
-- (instancetype)initWithStyle:(UITableViewStyle)style {
-  self = [super initWithStyle:style];
-  if (self) {
-    _modalAnimated = YES;
-    _modal = NO;
-  }
-  return self;
-}
-
-- (instancetype)initWithStyle:(UITableViewStyle)style modal:(BOOL)modal {
-  self = [self initWithStyle:style];
-  if (self) {
-    _modal = modal;
-    
-    //might be better in viewDidLoad, but to workaround rdar://12214613 and as it doesn't
-    //hurt, we do it here
-    if (_modal) {
-      self.navigationItem.leftBarButtonItem = [[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemDone
-                                                                                            target:self
-                                                                                            action:@selector(onDismissModal:)];
-    }
-  }
-  return self;
-}
-
-- (instancetype)initWithModalStyle:(BOOL)modal {
-  self = [self initWithStyle:UITableViewStylePlain modal:modal];
-  return self;
-}
-
-
-#pragma mark - View lifecycle
-
-- (void)onDismissModal:(id) __unused sender {
-  if (self.modal) {
-    UIViewController *presentingViewController = [self presentingViewController];
-    
-    // If there is no presenting view controller just remove view
-    if (presentingViewController && self.modalAnimated) {
-      [presentingViewController dismissViewControllerAnimated:YES completion:nil];
-    } else {
-      [self.navigationController.view removeFromSuperview];
-    }
-  } else {
-    [self.navigationController popViewControllerAnimated:YES];
-  }
-}
-
-
-#pragma mark - Rotation
-
--(UIInterfaceOrientationMask)supportedInterfaceOrientations {
-  if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPhone) {
-    return (UIInterfaceOrientationMaskPortrait | UIInterfaceOrientationMaskLandscape);
-  } else {
-    return UIInterfaceOrientationMaskAll;
-  }
-}
-
-#pragma mark - Modal presentation
-
-
-@end
-
-#endif /* HOCKEYSDK_FEATURE_AUTHENTICATOR || HOCKEYSDK_FEATURE_UPDATES || HOCKEYSDK_FEATURE_FEEDBACK */
diff --git a/submodules/HockeySDK-iOS/Classes/BITHockeyHelper+Application.h b/submodules/HockeySDK-iOS/Classes/BITHockeyHelper+Application.h
deleted file mode 100644
index e7397ba63a..0000000000
--- a/submodules/HockeySDK-iOS/Classes/BITHockeyHelper+Application.h
+++ /dev/null
@@ -1,48 +0,0 @@
-#import <Foundation/Foundation.h>
-#import <UIKit/UIKit.h>
-
-#import "BITHockeyHelper.h"
-/*
- * Workaround for exporting symbols from category object files.
- */
-extern NSString *BITHockeyHelperApplicationCategory;
-
-/**
- *  App states
- */
-typedef NS_ENUM(NSInteger, BITApplicationState) {
-  
-  /**
-   * Application is active.
-   */
-  BITApplicationStateActive = UIApplicationStateActive,
-  
-  /**
-   * Application is inactive.
-   */
-  BITApplicationStateInactive = UIApplicationStateInactive,
-  
-  /**
-   * Application is in background.
-   */
-  BITApplicationStateBackground = UIApplicationStateBackground,
-  
-  /**
-   * Application state can't be determined.
-   */
-  BITApplicationStateUnknown
-};
-
-@interface BITHockeyHelper (Application)
-
-/**
- * Get current application state.
- *
- * @return Current state of the application or BITApplicationStateUnknown while the state can't be determined.
- *
- * @discussion The application state may not be available everywhere. Application extensions doesn't have it for instance,
- * in that case the BITApplicationStateUnknown value is returned.
- */
-+ (BITApplicationState)applicationState;
-
-@end
diff --git a/submodules/HockeySDK-iOS/Classes/BITHockeyHelper+Application.m b/submodules/HockeySDK-iOS/Classes/BITHockeyHelper+Application.m
deleted file mode 100644
index 1a31bc2e9d..0000000000
--- a/submodules/HockeySDK-iOS/Classes/BITHockeyHelper+Application.m
+++ /dev/null
@@ -1,43 +0,0 @@
-#import "BITHockeyHelper+Application.h"
-
-/*
- * Workaround for exporting symbols from category object files.
- */
-NSString *BITHockeyHelperApplicationCategory;
-
-@implementation BITHockeyHelper (Application)
-
-+ (BITApplicationState)applicationState {
-  
-  // App extensions must not access sharedApplication.
-  if (!bit_isRunningInAppExtension()) {
-    
-    __block BITApplicationState state;
-    dispatch_block_t block = ^{
-      state = (BITApplicationState)[[self class] sharedAppState];
-    };
-    
-    if ([NSThread isMainThread]) {
-      block();
-    } else {
-      dispatch_sync(dispatch_get_main_queue(), block);
-    }
-    
-    return state;
-  }
-  return BITApplicationStateUnknown;
-}
-
-+ (UIApplication *)sharedApplication {
-  
-  // Compute selector at runtime for more discretion.
-  SEL sharedAppSel = NSSelectorFromString(@"sharedApplication");
-  return ((UIApplication * (*)(id, SEL))[[UIApplication class] methodForSelector:sharedAppSel])([UIApplication class],
-                                                                                                sharedAppSel);
-}
-
-+ (UIApplicationState)sharedAppState {
-  return [[[[self class] sharedApplication] valueForKey:@"applicationState"] longValue];
-}
-
-@end
diff --git a/submodules/HockeySDK-iOS/Classes/BITHockeyHelper.h b/submodules/HockeySDK-iOS/Classes/BITHockeyHelper.h
deleted file mode 100644
index e25f0d4a76..0000000000
--- a/submodules/HockeySDK-iOS/Classes/BITHockeyHelper.h
+++ /dev/null
@@ -1,109 +0,0 @@
-/*
- * Author: Andreas Linde <mail@andreaslinde.de>
- *
- * Copyright (c) 2012-2014 HockeyApp, Bit Stadium GmbH.
- * All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person
- * obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without
- * restriction, including without limitation the rights to use,
- * copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following
- * conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
- * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#import <Foundation/Foundation.h>
-#import <UIKit/UIKit.h>
-#import "HockeySDKEnums.h"
-
-@interface BITHockeyHelper : NSObject
-
-FOUNDATION_EXPORT NSString *const kBITExcludeApplicationSupportFromBackup;
-
-+ (BOOL)isURLSessionSupported;
-
-/*
- * Checks if the privacy description for iOS 10+ has been set in info plist.
- * @return YES for < iOS 10. YES/NO in iOS 10+ if NSPhotoLibraryUsageDescription is present in the app's Info.plist.
- */
-+ (BOOL)isPhotoAccessPossible;
-
-@end
-
-NSString *bit_settingsDir(void);
-
-BOOL bit_validateEmail(NSString *email);
-NSString *bit_keychainHockeySDKServiceName(void);
-
-/* Fix bug where Application Support was excluded from backup. */
-void bit_fixBackupAttributeForURL(NSURL *directoryURL);
-
-NSComparisonResult bit_versionCompare(NSString *stringA, NSString *stringB);
-NSString *bit_mainBundleIdentifier(void);
-NSString *bit_encodeAppIdentifier(NSString *inputString);
-NSString *bit_appIdentifierToGuid(NSString *appIdentifier);
-NSString *bit_appName(NSString *placeHolderString);
-NSString *bit_UUID(void);
-NSString *bit_appAnonID(BOOL forceNewAnonID);
-BOOL bit_isPreiOS10Environment(void);
-BOOL bit_isAppStoreReceiptSandbox(void);
-BOOL bit_hasEmbeddedMobileProvision(void);
-BITEnvironment bit_currentAppEnvironment(void);
-BOOL bit_isRunningInAppExtension(void);
-
-/**
- * Check if the debugger is attached
- *
- * Taken from https://github.com/plausiblelabs/plcrashreporter/blob/2dd862ce049e6f43feb355308dfc710f3af54c4d/Source/Crash%20Demo/main.m#L96
- *
- * @return `YES` if the debugger is attached to the current process, `NO` otherwise
- */
-BOOL bit_isDebuggerAttached(void);
-
-/* NSString helpers */
-NSString *bit_URLEncodedString(NSString *inputString);
-
-/* Context helpers */
-NSString *bit_utcDateString(NSDate *date);
-NSString *bit_devicePlatform(void);
-NSString *bit_devicePlatform(void);
-NSString *bit_deviceType(void);
-NSString *bit_osVersionBuild(void);
-NSString *bit_osName(void);
-NSString *bit_deviceLocale(void);
-NSString *bit_deviceLanguage(void);
-NSString *bit_screenSize(void);
-NSString *bit_sdkVersion(void);
-NSString *bit_appVersion(void);
-
-#if !defined (HOCKEYSDK_CONFIGURATION_ReleaseCrashOnly) && !defined (HOCKEYSDK_CONFIGURATION_ReleaseCrashOnlyExtensions)
-/* AppIcon helper */
-NSString *bit_validAppIconStringFromIcons(NSBundle *resourceBundle, NSArray *icons);
-NSString *bit_validAppIconFilename(NSBundle *bundle, NSBundle *resourceBundle);
-
-/* UIImage helpers */
-UIImage *bit_roundedCornerImage(UIImage *inputImage, CGFloat cornerSize, NSInteger borderSize);
-UIImage *bit_imageToFitSize(UIImage *inputImage, CGSize fitSize, BOOL honorScaleFactor);
-UIImage *bit_reflectedImageWithHeight(UIImage *inputImage, NSUInteger height, CGFloat fromAlpha, CGFloat toAlpha);
-
-UIImage *bit_newWithContentsOfResolutionIndependentFile(NSString * path);
-UIImage *bit_imageWithContentsOfResolutionIndependentFile(NSString * path);
-UIImage *bit_imageNamed(NSString *imageName, NSString *bundleName);
-UIImage *bit_screenshot(void);
-UIImage *bit_appIcon(void);
-
-#endif
diff --git a/submodules/HockeySDK-iOS/Classes/BITHockeyHelper.m b/submodules/HockeySDK-iOS/Classes/BITHockeyHelper.m
deleted file mode 100644
index f9b9052904..0000000000
--- a/submodules/HockeySDK-iOS/Classes/BITHockeyHelper.m
+++ /dev/null
@@ -1,1038 +0,0 @@
-/*
- * Author: Andreas Linde <mail@andreaslinde.de>
- *
- * Copyright (c) 2012-2014 HockeyApp, Bit Stadium GmbH.
- * All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person
- * obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without
- * restriction, including without limitation the rights to use,
- * copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following
- * conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
- * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
- */
-
-
-#import "BITHockeyHelper+Application.h"
-#import "BITKeychainUtils.h"
-#import "HockeySDK.h"
-#import "HockeySDKPrivate.h"
-#if !defined (HOCKEYSDK_CONFIGURATION_ReleaseCrashOnly) && !defined (HOCKEYSDK_CONFIGURATION_ReleaseCrashOnlyExtensions)
-#import <QuartzCore/QuartzCore.h>
-#endif
-
-#import <tgmath.h>
-#import <sys/sysctl.h>
-
-static NSString *const kBITUtcDateFormatter = @"utcDateFormatter";
-NSString *const kBITExcludeApplicationSupportFromBackup = @"kBITExcludeApplicationSupportFromBackup";
-
-@implementation BITHockeyHelper
-
-/**
- * @discussion
- * Workaround for exporting symbols from category object files.
- * See article https://medium.com/ios-os-x-development/categories-in-static-libraries-78e41f8ddb96#.aedfl1kl0
- */
-__attribute__((used)) static void importCategories() {
-  [NSString stringWithFormat:@"%@", BITHockeyHelperApplicationCategory];
-}
-
-+ (BOOL)isURLSessionSupported {
-  id nsurlsessionClass = NSClassFromString(@"NSURLSessionUploadTask");
-  BOOL isUrlSessionSupported = (nsurlsessionClass && !bit_isRunningInAppExtension());
-  return isUrlSessionSupported;
-}
-
-+ (BOOL)isPhotoAccessPossible {
-  if(bit_isPreiOS10Environment()) {
-    return YES;
-  }
-  else {
-    NSString *privacyDescription = [[NSBundle mainBundle] objectForInfoDictionaryKey:@"NSPhotoLibraryUsageDescription"];
-    BOOL privacyStringSet = (privacyDescription != nil) && (privacyDescription.length > 0);
-    
-    return privacyStringSet;
-  }
-}
-
-@end
-
-typedef struct {
-  uint8_t       info_version;
-  const char    bit_version[16];
-  const char    bit_build[16];
-} bit_info_t;
-
-
-#pragma mark - Helpers
-
-NSString *bit_settingsDir(void) {
-  static NSString *settingsDir = nil;
-  static dispatch_once_t predSettingsDir;
-  
-  dispatch_once(&predSettingsDir, ^{
-    NSFileManager *fileManager = [[NSFileManager alloc] init];
-    
-    // temporary directory for crashes grabbed from PLCrashReporter
-    NSArray *paths = NSSearchPathForDirectoriesInDomains(NSCachesDirectory, NSUserDomainMask, YES);
-    settingsDir = [[paths objectAtIndex:0] stringByAppendingPathComponent:BITHOCKEY_IDENTIFIER];
-    
-    if (![fileManager fileExistsAtPath:settingsDir]) {
-      NSDictionary *attributes = [NSDictionary dictionaryWithObject: [NSNumber numberWithUnsignedLong: 0755] forKey: NSFilePosixPermissions];
-      NSError *theError = NULL;
-      
-      [fileManager createDirectoryAtPath:settingsDir withIntermediateDirectories: YES attributes: attributes error: &theError];
-    }
-  });
-  
-  return settingsDir;
-}
-
-BOOL bit_validateEmail(NSString *email) {
-  NSString *emailRegex =
-  @"(?:[a-z0-9!#$%\\&'*+/=?\\^_`{|}~-]+(?:\\.[a-z0-9!#$%\\&'*+/=?\\^_`{|}"
-  @"~-]+)*|\"(?:[\\x01-\\x08\\x0b\\x0c\\x0e-\\x1f\\x21\\x23-\\x5b\\x5d-\\"
-  @"x7f]|\\\\[\\x01-\\x09\\x0b\\x0c\\x0e-\\x7f])*\")@(?:(?:[a-z0-9](?:[a-"
-  @"z0-9-]*[a-z0-9])?\\.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?|\\[(?:(?:25[0-5"
-  @"]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-"
-  @"9][0-9]?|[a-z0-9-]*[a-z0-9]:(?:[\\x01-\\x08\\x0b\\x0c\\x0e-\\x1f\\x21"
-  @"-\\x5a\\x53-\\x7f]|\\\\[\\x01-\\x09\\x0b\\x0c\\x0e-\\x7f])+)\\])";
-  NSPredicate *emailTest = [NSPredicate predicateWithFormat:@"SELF MATCHES[c] %@", emailRegex];
-  
-  return [emailTest evaluateWithObject:email];
-}
-
-NSString *bit_keychainHockeySDKServiceName(void) {
-  static NSString *serviceName = nil;
-  static dispatch_once_t predServiceName;
-  
-  dispatch_once(&predServiceName, ^{
-    serviceName = [NSString stringWithFormat:@"%@.HockeySDK", bit_mainBundleIdentifier()];
-  });
-  
-  return serviceName;
-}
-
-NSComparisonResult bit_versionCompare(NSString *stringA, NSString *stringB) {
-  // Extract plain version number from self
-  NSString *plainSelf = stringA;
-  NSRange letterRange = [plainSelf rangeOfCharacterFromSet: [NSCharacterSet letterCharacterSet]];
-  if (letterRange.length)
-    plainSelf = [plainSelf substringToIndex: letterRange.location];
-  
-  // Extract plain version number from other
-  NSString *plainOther = stringB;
-  letterRange = [plainOther rangeOfCharacterFromSet: [NSCharacterSet letterCharacterSet]];
-  if (letterRange.length)
-    plainOther = [plainOther substringToIndex: letterRange.location];
-  
-  // Compare plain versions
-  NSComparisonResult result = [plainSelf compare:plainOther options:NSNumericSearch];
-  
-  // If plain versions are equal, compare full versions
-  if (result == NSOrderedSame)
-    result = [stringA compare:stringB options:NSNumericSearch];
-  
-  // Done
-  return result;
-}
-
-#pragma mark Exclude from backup fix
-
-void bit_fixBackupAttributeForURL(NSURL *directoryURL) {
-  
-  BOOL shouldExcludeAppSupportDirFromBackup = [[NSUserDefaults standardUserDefaults] boolForKey:kBITExcludeApplicationSupportFromBackup];
-  if (shouldExcludeAppSupportDirFromBackup) {
-    return;
-  }
-  
-  if (directoryURL) {
-    dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
-      NSError *getResourceError = nil;
-      NSNumber *appSupportDirExcludedValue;
-      if ([directoryURL getResourceValue:&appSupportDirExcludedValue forKey:NSURLIsExcludedFromBackupKey error:&getResourceError] && appSupportDirExcludedValue) {
-        NSError *setResourceError = nil;
-        if(![directoryURL setResourceValue:@NO forKey:NSURLIsExcludedFromBackupKey error:&setResourceError]) {
-          BITHockeyLogError(@"ERROR: Error while setting resource value: %@", setResourceError.localizedDescription);
-        }
-      } else {
-        BITHockeyLogError(@"ERROR: Error while retrieving resource value: %@", getResourceError.localizedDescription);
-      }
-    });
-  }
-}
-
-#pragma mark Identifiers
-
-NSString *bit_mainBundleIdentifier(void) {
-  return [[NSBundle mainBundle] objectForInfoDictionaryKey:@"CFBundleIdentifier"];
-}
-
-NSString *bit_encodeAppIdentifier(NSString *inputString) {
-  return (inputString ? bit_URLEncodedString(inputString) : bit_URLEncodedString(bit_mainBundleIdentifier()));
-}
-
-NSString *bit_appIdentifierToGuid(NSString *appIdentifier) {
-  NSMutableString *guid;
-  NSString *cleanAppId = [appIdentifier stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceCharacterSet]];
-  if(cleanAppId && cleanAppId.length == 32) {
-    // Insert dashes so that DC will accept th appidentifier (as a replacement for iKey)
-    guid = [NSMutableString stringWithString:cleanAppId];
-    [guid insertString:@"-" atIndex:20];
-    [guid insertString:@"-" atIndex:16];
-    [guid insertString:@"-" atIndex:12];
-    [guid insertString:@"-" atIndex:8];
-  }
-  return [guid copy];
-}
-
-NSString *bit_appName(NSString *placeHolderString) {
-  NSString *appName = [[[NSBundle mainBundle] localizedInfoDictionary] objectForKey:@"CFBundleDisplayName"];
-  if (!appName)
-    appName = [[NSBundle mainBundle] objectForInfoDictionaryKey:@"CFBundleDisplayName"];
-  if (!appName)
-    appName = [[[NSBundle mainBundle] localizedInfoDictionary] objectForKey:@"CFBundleName"];
-  if (!appName)
-    appName = [[NSBundle mainBundle] objectForInfoDictionaryKey:@"CFBundleName"] ?: placeHolderString;
-  
-  return appName;
-}
-
-NSString *bit_UUID(void) {
-  return [[NSUUID UUID] UUIDString];
-}
-
-NSString *bit_appAnonID(BOOL forceNewAnonID) {
-  static NSString *appAnonID = nil;
-  static dispatch_once_t predAppAnonID;
-  __block NSError *error = nil;
-  NSString *appAnonIDKey = @"appAnonID";
-  
-  if (forceNewAnonID) {
-    appAnonID = bit_UUID();
-    // store this UUID in the keychain (on this device only) so we can be sure to always have the same ID upon app startups
-    if (appAnonID) {
-      // add to keychain in a background thread, since we got reports that storing to the keychain may take several seconds sometimes and cause the app to be killed
-      // and we don't care about the result anyway
-      dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_LOW, 0), ^{
-        [BITKeychainUtils storeUsername:appAnonIDKey
-                            andPassword:appAnonID
-                         forServiceName:bit_keychainHockeySDKServiceName()
-                         updateExisting:YES
-                          accessibility:kSecAttrAccessibleAlwaysThisDeviceOnly
-                                  error:&error];
-      });
-    }
-  } else {
-    dispatch_once(&predAppAnonID, ^{
-      // first check if we already have an install string in the keychain
-      appAnonID = [BITKeychainUtils getPasswordForUsername:appAnonIDKey andServiceName:bit_keychainHockeySDKServiceName() error:&error];
-      
-      if (!appAnonID) {
-        appAnonID = bit_UUID();
-        // store this UUID in the keychain (on this device only) so we can be sure to always have the same ID upon app startups
-        if (appAnonID) {
-          // add to keychain in a background thread, since we got reports that storing to the keychain may take several seconds sometimes and cause the app to be killed
-          // and we don't care about the result anyway
-          dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_LOW, 0), ^{
-            [BITKeychainUtils storeUsername:appAnonIDKey
-                                andPassword:appAnonID
-                             forServiceName:bit_keychainHockeySDKServiceName()
-                             updateExisting:YES
-                              accessibility:kSecAttrAccessibleAlwaysThisDeviceOnly
-                                      error:&error];
-          });
-        }
-      }
-    });
-  }
-  
-  return appAnonID;
-}
-
-#pragma mark Environment detection
-
-BOOL bit_isPreiOS10Environment(void) {
-  static BOOL isPreOS10Environment = YES;
-  static dispatch_once_t checkOS10;
-  
-  dispatch_once(&checkOS10, ^{
-    // NSFoundationVersionNumber_iOS_9_MAX = 1299
-    // We hardcode this, so compiling with iOS 7 is possible while still being able to detect the correct environment
-    
-    // runtime check according to
-    // https://developer.apple.com/library/prerelease/ios/documentation/UserExperience/Conceptual/TransitionGuide/SupportingEarlieriOS.html
-    if (floor(NSFoundationVersionNumber) <= 1299.00) {
-      isPreOS10Environment = YES;
-    } else {
-      isPreOS10Environment = NO;
-    }
-  });
-  
-  return isPreOS10Environment;
-}
-
-
-BOOL bit_isAppStoreReceiptSandbox(void) {
-#if TARGET_OS_SIMULATOR
-  return NO;
-#else
-  if (![NSBundle.mainBundle respondsToSelector:@selector(appStoreReceiptURL)]) {
-    return NO;
-  }
-  NSURL *appStoreReceiptURL = NSBundle.mainBundle.appStoreReceiptURL;
-  NSString *appStoreReceiptLastComponent = appStoreReceiptURL.lastPathComponent;
-  
-  BOOL isSandboxReceipt = [appStoreReceiptLastComponent isEqualToString:@"sandboxReceipt"];
-  return isSandboxReceipt;
-#endif
-}
-
-BOOL bit_hasEmbeddedMobileProvision(void) {
-  BOOL hasEmbeddedMobileProvision = !![[NSBundle mainBundle] pathForResource:@"embedded" ofType:@"mobileprovision"];
-  return hasEmbeddedMobileProvision;
-}
-
-BITEnvironment bit_currentAppEnvironment(void) {
-#if TARGET_OS_SIMULATOR
-  return BITEnvironmentOther;
-#else
-  
-  // MobilePovision profiles are a clear indicator for Ad-Hoc distribution
-  if (bit_hasEmbeddedMobileProvision()) {
-    return BITEnvironmentOther;
-  }
-  
-  if (bit_isAppStoreReceiptSandbox()) {
-    return BITEnvironmentTestFlight;
-  }
-  
-  return BITEnvironmentAppStore;
-#endif
-}
-
-BOOL bit_isRunningInAppExtension(void) {
-  static BOOL isRunningInAppExtension = NO;
-  static dispatch_once_t checkAppExtension;
-  
-  dispatch_once(&checkAppExtension, ^{
-    isRunningInAppExtension = ([[[NSBundle mainBundle] executablePath] rangeOfString:@".appex/"].location != NSNotFound);
-  });
-  
-  return isRunningInAppExtension;
-}
-
-BOOL bit_isDebuggerAttached(void) {
-  static BOOL debuggerIsAttached = NO;
-  
-  static dispatch_once_t debuggerPredicate;
-  dispatch_once(&debuggerPredicate, ^{
-    struct kinfo_proc info;
-    size_t info_size = sizeof(info);
-    int name[4];
-    
-    name[0] = CTL_KERN;
-    name[1] = KERN_PROC;
-    name[2] = KERN_PROC_PID;
-    name[3] = getpid();
-    
-    if (sysctl(name, 4, &info, &info_size, NULL, 0) == -1) {
-      BITHockeyLogError(@"[HockeySDK] ERROR: Checking for a running debugger via sysctl() failed.");
-      debuggerIsAttached = false;
-    }
-    
-    if (!debuggerIsAttached && (info.kp_proc.p_flag & P_TRACED) != 0)
-      debuggerIsAttached = true;
-  });
-  
-  return debuggerIsAttached;
-}
-
-#pragma mark NSString helpers
-
-NSString *bit_URLEncodedString(NSString *inputString) {
-  return [inputString stringByAddingPercentEncodingWithAllowedCharacters:[NSCharacterSet characterSetWithCharactersInString:@"!*'();:@&=+$,/?%#[] {}"].invertedSet];
-}
-
-#pragma mark Context helpers
-
-// Return ISO 8601 string representation of the date
-NSString *bit_utcDateString(NSDate *date){
-  static NSDateFormatter *dateFormatter;
-  
-  static dispatch_once_t dateFormatterToken;
-  dispatch_once(&dateFormatterToken, ^{
-    NSLocale *enUSPOSIXLocale = [[NSLocale alloc] initWithLocaleIdentifier:@"en_US_POSIX"];
-    dateFormatter = [NSDateFormatter new];
-    dateFormatter.locale = enUSPOSIXLocale;
-    dateFormatter.dateFormat = @"yyyy-MM-dd'T'HH:mm:ss.SSS'Z'";
-    dateFormatter.timeZone = [NSTimeZone timeZoneForSecondsFromGMT:0];
-  });
-  
-  NSString *dateString = [dateFormatter stringFromDate:date];
-  
-  return dateString;
-}
-
-NSString *bit_devicePlatform(void) {
-  
-  size_t size;
-  sysctlbyname("hw.machine", NULL, &size, NULL, 0);
-  char *answer = (char*)malloc(size);
-  if (answer == NULL)
-    return @"";
-  sysctlbyname("hw.machine", answer, &size, NULL, 0);
-  NSString *platform = [NSString stringWithCString:answer encoding: NSUTF8StringEncoding];
-  free(answer);
-  return platform;
-}
-
-NSString *bit_deviceType(void){
-  
-  UIUserInterfaceIdiom idiom = [UIDevice currentDevice].userInterfaceIdiom;
-  
-  switch (idiom) {
-    case UIUserInterfaceIdiomPad:
-      return @"Tablet";
-    case UIUserInterfaceIdiomPhone:
-      return @"Phone";
-    default:
-      return @"Unknown";
-  }
-}
-
-NSString *bit_osVersionBuild(void) {
-  void *result = NULL;
-  size_t result_len = 0;
-  int ret;
-  
-  /* If our buffer is too small after allocation, loop until it succeeds -- the requested destination size
-   * may change after each iteration. */
-  do {
-    /* Fetch the expected length */
-    if ((ret = sysctlbyname("kern.osversion", NULL, &result_len, NULL, 0)) == -1) {
-      break;
-    }
-    
-    /* Allocate the destination buffer */
-    if (result != NULL) {
-      free(result);
-    }
-    result = malloc(result_len);
-    
-    /* Fetch the value */
-    ret = sysctlbyname("kern.osversion", result, &result_len, NULL, 0);
-  } while (ret == -1 && errno == ENOMEM);
-  
-  /* Handle failure */
-  if (ret == -1) {
-    int saved_errno = errno;
-    
-    if (result != NULL) {
-      free(result);
-    }
-    
-    errno = saved_errno;
-    return NULL;
-  }
-  
-  NSString *osBuild = [NSString stringWithCString:result encoding:NSUTF8StringEncoding];
-  free(result);
-  
-  NSString *osVersion = [[UIDevice currentDevice] systemVersion];
-  
-  return [NSString stringWithFormat:@"%@ (%@)", osVersion, osBuild];
-}
-
-NSString *bit_osName(void){
-  return [[UIDevice currentDevice] systemName];
-}
-
-NSString *bit_deviceLocale(void) {
-  NSLocale *locale = [NSLocale currentLocale];
-  return [locale objectForKey:NSLocaleIdentifier];
-}
-
-NSString *bit_deviceLanguage(void) {
-  return [[NSBundle mainBundle] preferredLocalizations][0];
-}
-
-NSString *bit_screenSize(void){
-  CGFloat scale = [UIScreen mainScreen].scale;
-  CGSize screenSize = [UIScreen mainScreen].bounds.size;
-  return [NSString stringWithFormat:@"%dx%d",(int)(screenSize.height * scale), (int)(screenSize.width * scale)];
-}
-
-NSString *bit_sdkVersion(void){
-  return [NSString stringWithFormat:@"ios:%@", [NSString stringWithUTF8String:BITHOCKEY_C_VERSION]];
-}
-
-NSString *bit_appVersion(void){
-  NSString *build = [[NSBundle mainBundle] infoDictionary][@"CFBundleVersion"];
-  NSString *version = [[NSBundle mainBundle] infoDictionary][@"CFBundleShortVersionString"];
-  
-  if(version){
-    return [NSString stringWithFormat:@"%@ (%@)", version, build];
-  }else{
-    return build;
-  }
-}
-
-#if !defined (HOCKEYSDK_CONFIGURATION_ReleaseCrashOnly) && !defined (HOCKEYSDK_CONFIGURATION_ReleaseCrashOnlyExtensions)
-
-#pragma mark AppIcon helpers
-
-/**
- Find a valid app icon filename that points to a proper app icon image
- 
- @param icons NSArray with app icon filenames
- 
- @return NSString with the valid app icon or nil if none found
- */
-NSString *bit_validAppIconStringFromIcons(NSBundle *resourceBundle, NSArray *icons) {
-  if (!icons) return nil;
-  if (![icons isKindOfClass:[NSArray class]]) return nil;
-  
-  BOOL useHighResIcon = NO;
-  BOOL useiPadIcon = NO;
-  if ([UIScreen mainScreen].scale >= (CGFloat) 2.0) useHighResIcon = YES;
-  if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad) useiPadIcon = YES;
-  
-  NSString *currentBestMatch = nil;
-  CGFloat currentBestMatchHeight = 0;
-  CGFloat bestMatchHeight = 0;
-  
-  bestMatchHeight = useiPadIcon ? (useHighResIcon ? 152 : 76) : 120;
-  
-  for(NSString *icon in icons) {
-    // Don't use imageNamed, otherwise unit tests won't find the fixture icon
-    // and using imageWithContentsOfFile doesn't load @2x files with absolut paths (required in tests)
-    
-    
-    NSMutableArray *iconFilenameVariants = [NSMutableArray new];
-    
-    [iconFilenameVariants addObject:icon];
-    [iconFilenameVariants addObject:[NSString stringWithFormat:@"%@@2x", icon]];
-    [iconFilenameVariants addObject:[icon stringByDeletingPathExtension]];
-    [iconFilenameVariants addObject:[NSString stringWithFormat:@"%@@2x", [icon stringByDeletingPathExtension]]];
-    
-    for (NSString *iconFilename in iconFilenameVariants) {
-      // this call already covers "~ipad" files
-      NSString *iconPath = [resourceBundle pathForResource:iconFilename ofType:@"png"];
-      
-      if (!iconPath && (icon.pathExtension.length > 0)) {
-        iconPath = [resourceBundle pathForResource:iconFilename ofType:icon.pathExtension];
-      }
-      // We still haven't managed to get a path to the app icon, just using a placeholder now.
-      if(!iconPath) {
-        iconPath = [resourceBundle pathForResource:@"AppIconPlaceHolder" ofType:@"png"];
-      }
-      
-      NSData *imgData = [[NSData alloc] initWithContentsOfFile:iconPath];
-      
-      UIImage *iconImage = [[UIImage alloc] initWithData:imgData];
-      
-      if (iconImage) {
-        if (iconImage.size.height == bestMatchHeight) {
-          return iconFilename;
-        } else if (iconImage.size.height < bestMatchHeight &&
-                   iconImage.size.height > currentBestMatchHeight) {
-          currentBestMatchHeight = iconImage.size.height;
-          currentBestMatch = iconFilename;
-        }
-      }
-    }
-  }
-  
-  return currentBestMatch;
-}
-
-NSString *bit_validAppIconFilename(NSBundle *bundle, NSBundle *resourceBundle) {
-  NSString *iconFilename = nil;
-  NSArray *icons = nil;
-  
-  icons = [bundle objectForInfoDictionaryKey:@"CFBundleIconFiles"];
-  iconFilename = bit_validAppIconStringFromIcons(resourceBundle, icons);
-  
-  if (!iconFilename) {
-    icons = [bundle objectForInfoDictionaryKey:@"CFBundleIcons"];
-    if (icons && [icons isKindOfClass:[NSDictionary class]]) {
-      icons = [icons valueForKeyPath:@"CFBundlePrimaryIcon.CFBundleIconFiles"];
-    }
-    iconFilename = bit_validAppIconStringFromIcons(resourceBundle, icons);
-  }
-  
-  // we test iPad structure anyway and use it if we find a result and don't have another one yet
-  if (!iconFilename && (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad)) {
-    icons = [bundle objectForInfoDictionaryKey:@"CFBundleIcons~ipad"];
-    if (icons && [icons isKindOfClass:[NSDictionary class]]) {
-      icons = [icons valueForKeyPath:@"CFBundlePrimaryIcon.CFBundleIconFiles"];
-    }
-    NSString *iPadIconFilename = bit_validAppIconStringFromIcons(resourceBundle, icons);
-    iconFilename = iPadIconFilename;
-  }
-  
-  if (!iconFilename) {
-    NSString *tempFilename = [bundle objectForInfoDictionaryKey:@"CFBundleIconFile"];
-    if (tempFilename) {
-      iconFilename = bit_validAppIconStringFromIcons(resourceBundle, @[tempFilename]);
-    }
-  }
-  
-  if (!iconFilename) {
-    iconFilename = bit_validAppIconStringFromIcons(resourceBundle, @[@"Icon.png"]);
-  }
-  
-  return iconFilename;
-}
-
-#pragma mark UIImage private helpers
-
-static void bit_addRoundedRectToPath(CGRect rect, CGContextRef context, CGFloat ovalWidth, CGFloat ovalHeight);
-static CGContextRef bit_MyOpenBitmapContext(int pixelsWide, int pixelsHigh);
-static CGImageRef bit_CreateGradientImage(int pixelsWide, int pixelsHigh, CGFloat fromAlpha, CGFloat toAlpha);
-static BOOL bit_hasAlpha(UIImage *inputImage);
-UIImage *bit_imageWithAlpha(UIImage *inputImage);
-UIImage *bit_addGlossToImage(UIImage *inputImage);
-
-// Adds a rectangular path to the given context and rounds its corners by the given extents
-// Original author: Björn Sållarp. Used with permission. See: http://blog.sallarp.com/iphone-uiimage-round-corners/
-void bit_addRoundedRectToPath(CGRect rect, CGContextRef context, CGFloat ovalWidth, CGFloat ovalHeight) {
-  if (ovalWidth == 0 || ovalHeight == 0) {
-    CGContextAddRect(context, rect);
-    return;
-  }
-  CGContextSaveGState(context);
-  CGContextTranslateCTM(context, CGRectGetMinX(rect), CGRectGetMinY(rect));
-  CGContextScaleCTM(context, ovalWidth, ovalHeight);
-  CGFloat fw = CGRectGetWidth(rect) / ovalWidth;
-  CGFloat fh = CGRectGetHeight(rect) / ovalHeight;
-  CGContextMoveToPoint(context, fw, fh/2);
-  CGContextAddArcToPoint(context, fw, fh, fw/2, fh, 1);
-  CGContextAddArcToPoint(context, 0, fh, 0, fh/2, 1);
-  CGContextAddArcToPoint(context, 0, 0, fw/2, 0, 1);
-  CGContextAddArcToPoint(context, fw, 0, fw, fh/2, 1);
-  CGContextClosePath(context);
-  CGContextRestoreGState(context);
-}
-
-CGImageRef bit_CreateGradientImage(int pixelsWide, int pixelsHigh, CGFloat fromAlpha, CGFloat toAlpha) {
-  CGImageRef theCGImage = NULL;
-  
-  // gradient is always black-white and the mask must be in the gray colorspace
-  CGColorSpaceRef colorSpace = CGColorSpaceCreateDeviceGray();
-  
-  // create the bitmap context
-  CGContextRef gradientBitmapContext = CGBitmapContextCreate(NULL, pixelsWide, pixelsHigh,
-                                                             8, 0, colorSpace, (CGBitmapInfo)kCGImageAlphaNone);
-  
-  // define the start and end grayscale values (with the alpha, even though
-  // our bitmap context doesn't support alpha the gradient requires it)
-  CGFloat colors[] = {toAlpha, 1.0, fromAlpha, 1.0};
-  
-  // create the CGGradient and then release the gray color space
-  CGGradientRef grayScaleGradient = CGGradientCreateWithColorComponents(colorSpace, colors, NULL, 2);
-  CGColorSpaceRelease(colorSpace);
-  
-  // create the start and end points for the gradient vector (straight down)
-  CGPoint gradientEndPoint = CGPointZero;
-  CGPoint gradientStartPoint = CGPointMake(0, pixelsHigh);
-  
-  // draw the gradient into the gray bitmap context
-  CGContextDrawLinearGradient(gradientBitmapContext, grayScaleGradient, gradientStartPoint,
-                              gradientEndPoint, kCGGradientDrawsAfterEndLocation);
-  CGGradientRelease(grayScaleGradient);
-  
-  // convert the context into a CGImageRef and release the context
-  theCGImage = CGBitmapContextCreateImage(gradientBitmapContext);
-  CGContextRelease(gradientBitmapContext);
-  
-  // return the imageref containing the gradient
-  return theCGImage;
-}
-
-CGContextRef bit_MyOpenBitmapContext(int pixelsWide, int pixelsHigh) {
-  CGSize size = CGSizeMake(pixelsWide, pixelsHigh);
-  UIGraphicsBeginImageContextWithOptions(size, NO, 0.0);
-  
-  return UIGraphicsGetCurrentContext();
-}
-
-
-// Returns true if the image has an alpha layer
-BOOL bit_hasAlpha(UIImage *inputImage) {
-  CGImageAlphaInfo alpha = CGImageGetAlphaInfo(inputImage.CGImage);
-  return (alpha == kCGImageAlphaFirst ||
-          alpha == kCGImageAlphaLast ||
-          alpha == kCGImageAlphaPremultipliedFirst ||
-          alpha == kCGImageAlphaPremultipliedLast);
-}
-
-// Returns a copy of the given image, adding an alpha channel if it doesn't already have one
-UIImage *bit_imageWithAlpha(UIImage *inputImage) {
-  if (bit_hasAlpha(inputImage)) {
-    return inputImage;
-  }
-  
-  CGImageRef imageRef = inputImage.CGImage;
-  size_t width = (size_t)(CGImageGetWidth(imageRef) * inputImage.scale);
-  size_t height = (size_t)(CGImageGetHeight(imageRef) * inputImage.scale);
-  
-  // The bitsPerComponent and bitmapInfo values are hard-coded to prevent an "unsupported parameter combination" error
-  CGContextRef offscreenContext = CGBitmapContextCreate(NULL,
-                                                        width,
-                                                        height,
-                                                        8,
-                                                        0,
-                                                        CGImageGetColorSpace(imageRef),
-                                                        kCGBitmapByteOrderDefault | kCGImageAlphaPremultipliedFirst);
-  
-  // Draw the image into the context and retrieve the new image, which will now have an alpha layer
-  CGContextDrawImage(offscreenContext, CGRectMake(0, 0, width, height), imageRef);
-  CGImageRef imageRefWithAlpha = CGBitmapContextCreateImage(offscreenContext);
-  UIImage *imageWithAlpha = [UIImage imageWithCGImage:imageRefWithAlpha];
-  
-  // Clean up
-  CGContextRelease(offscreenContext);
-  CGImageRelease(imageRefWithAlpha);
-  
-  return imageWithAlpha;
-}
-
-UIImage *bit_addGlossToImage(UIImage *inputImage) {
-  UIGraphicsBeginImageContextWithOptions(inputImage.size, NO, 0.0);
-  
-  [inputImage drawAtPoint:CGPointZero];
-  UIImage *iconGradient = bit_imageNamed(@"IconGradient.png", BITHOCKEYSDK_BUNDLE);
-  [iconGradient drawInRect:CGRectMake(0, 0, inputImage.size.width, inputImage.size.height) blendMode:kCGBlendModeNormal alpha:0.5];
-  
-  UIImage *result = UIGraphicsGetImageFromCurrentImageContext();
-  UIGraphicsEndImageContext();
-  
-  return result;
-}
-
-#pragma mark UIImage helpers
-
-UIImage *bit_imageToFitSize(UIImage *inputImage, CGSize fitSize, BOOL honorScaleFactor) {
-  
-  if (!inputImage){
-    return nil;
-  }
-  
-  CGFloat imageScaleFactor = 1.0;
-  if (honorScaleFactor) {
-    if ([inputImage respondsToSelector:@selector(scale)]) {
-      imageScaleFactor = [inputImage scale];
-    }
-  }
-  
-  CGFloat sourceWidth = [inputImage size].width * imageScaleFactor;
-  CGFloat sourceHeight = [inputImage size].height * imageScaleFactor;
-  CGFloat targetWidth = fitSize.width;
-  CGFloat targetHeight = fitSize.height;
-  
-  // Calculate aspect ratios
-  CGFloat sourceRatio = sourceWidth / sourceHeight;
-  CGFloat targetRatio = targetWidth / targetHeight;
-  
-  // Determine what side of the source image to use for proportional scaling
-  BOOL scaleWidth = (sourceRatio <= targetRatio);
-  // Deal with the case of just scaling proportionally to fit, without cropping
-  scaleWidth = !scaleWidth;
-  
-  // Proportionally scale source image
-  CGFloat scalingFactor, scaledWidth, scaledHeight;
-  if (scaleWidth) {
-    scalingFactor = ((CGFloat)1.0) / sourceRatio;
-    scaledWidth = targetWidth;
-    scaledHeight = round(targetWidth * scalingFactor);
-  } else {
-    scalingFactor = sourceRatio;
-    scaledWidth = round(targetHeight * scalingFactor);
-    scaledHeight = targetHeight;
-  }
-  
-  // Calculate compositing rectangles
-  CGRect sourceRect, destRect;
-  sourceRect = CGRectMake(0, 0, sourceWidth, sourceHeight);
-  destRect = CGRectMake(0, 0, scaledWidth, scaledHeight);
-  
-  // Create appropriately modified image.
-  UIImage *image = nil;
-  UIGraphicsBeginImageContextWithOptions(destRect.size, NO, honorScaleFactor ? 0.0 : 1.0); // 0.0 for scale means "correct scale for device's main screen".
-  CGImageRef sourceImg = CGImageCreateWithImageInRect([inputImage CGImage], sourceRect); // cropping happens here.
-  image = [UIImage imageWithCGImage:sourceImg scale:0.0 orientation:inputImage.imageOrientation]; // create cropped UIImage.
-  [image drawInRect:destRect]; // the actual scaling happens here, and orientation is taken care of automatically.
-  CGImageRelease(sourceImg);
-  image = UIGraphicsGetImageFromCurrentImageContext();
-  UIGraphicsEndImageContext();
-  
-  if (!image) {
-    // Try older method.
-    CGColorSpaceRef colorSpace = CGColorSpaceCreateDeviceRGB();
-    CGContextRef context = CGBitmapContextCreate(NULL,  (size_t)scaledWidth, (size_t)scaledHeight, 8, (size_t)(fitSize.width * 4),
-                                                 colorSpace, (CGBitmapInfo)kCGImageAlphaPremultipliedLast);
-    sourceImg = CGImageCreateWithImageInRect([inputImage CGImage], sourceRect);
-    CGContextDrawImage(context, destRect, sourceImg);
-    CGImageRelease(sourceImg);
-    CGImageRef finalImage = CGBitmapContextCreateImage(context);
-    CGContextRelease(context);
-    CGColorSpaceRelease(colorSpace);
-    image = [UIImage imageWithCGImage:finalImage];
-    CGImageRelease(finalImage);
-  }
-  
-  return image;
-}
-
-
-UIImage *bit_reflectedImageWithHeight(UIImage *inputImage, NSUInteger height, CGFloat fromAlpha, CGFloat toAlpha) {
-  if(height == 0)
-    return nil;
-  
-  // create a bitmap graphics context the size of the image
-  CGContextRef mainViewContentContext = bit_MyOpenBitmapContext((int)inputImage.size.width, (int)height);
-  
-  // create a 2 bit CGImage containing a gradient that will be used for masking the
-  // main view content to create the 'fade' of the reflection.  The CGImageCreateWithMask
-  // function will stretch the bitmap image as required, so we can create a 1 pixel wide gradient
-  CGImageRef gradientMaskImage = bit_CreateGradientImage(1, (int)height, fromAlpha, toAlpha);
-  
-  // create an image by masking the bitmap of the mainView content with the gradient view
-  // then release the  pre-masked content bitmap and the gradient bitmap
-  CGContextClipToMask(mainViewContentContext, CGRectMake(0.0, 0.0, inputImage.size.width, height), gradientMaskImage);
-  CGImageRelease(gradientMaskImage);
-  
-  // draw the image into the bitmap context
-  CGContextDrawImage(mainViewContentContext, CGRectMake(0, 0, inputImage.size.width, inputImage.size.height), inputImage.CGImage);
-  
-  // convert the finished reflection image to a UIImage
-  UIImage *theImage = UIGraphicsGetImageFromCurrentImageContext(); // returns autoreleased
-  UIGraphicsEndImageContext();
-  
-  return theImage;
-}
-
-
-UIImage *bit_newWithContentsOfResolutionIndependentFile(NSString * path) {
-  if ([UIScreen instancesRespondToSelector:@selector(scale)] && (int)[[UIScreen mainScreen] scale] == 2.0) {
-    NSString *path2x = [[path stringByDeletingLastPathComponent]
-                        stringByAppendingPathComponent:[NSString stringWithFormat:@"%@@2x.%@",
-                                                        [[path lastPathComponent] stringByDeletingPathExtension],
-                                                        [path pathExtension]]];
-    
-    if ([[NSFileManager defaultManager] fileExistsAtPath:path2x]) {
-      return [[UIImage alloc] initWithContentsOfFile:path2x];
-    }
-  }
-  
-  return [[UIImage alloc] initWithContentsOfFile:path];
-}
-
-
-UIImage *bit_imageWithContentsOfResolutionIndependentFile(NSString *path) {
-  return bit_newWithContentsOfResolutionIndependentFile(path);
-}
-
-
-UIImage *bit_imageNamed(NSString *imageName, NSString *bundleName) {
-  NSString *resourcePath = [[NSBundle bundleForClass:[BITHockeyManager class]] resourcePath];
-  NSString *bundlePath = [resourcePath stringByAppendingPathComponent:bundleName];
-  NSString *imagePath = [bundlePath stringByAppendingPathComponent:imageName];
-  return bit_imageWithContentsOfResolutionIndependentFile(imagePath);
-}
-
-
-
-// Creates a copy of this image with rounded corners
-// If borderSize is non-zero, a transparent border of the given size will also be added
-// Original author: Björn Sållarp. Used with permission. See: http://blog.sallarp.com/iphone-uiimage-round-corners/
-UIImage *bit_roundedCornerImage(UIImage *inputImage, CGFloat cornerSize, NSInteger borderSize) {
-  // If the image does not have an alpha layer, add one
-  
-  UIImage *roundedImage = nil;
-  UIGraphicsBeginImageContextWithOptions(inputImage.size, NO, 0.0); // 0.0 for scale means "correct scale for device's main screen".
-  CGImageRef sourceImg = CGImageCreateWithImageInRect([inputImage CGImage], CGRectMake(0, 0, inputImage.size.width * inputImage.scale, inputImage.size.height * inputImage.scale)); // cropping happens here.
-  
-  // Create a clipping path with rounded corners
-  CGContextRef context = UIGraphicsGetCurrentContext();
-  CGContextBeginPath(context);
-  bit_addRoundedRectToPath(CGRectMake(borderSize, borderSize, inputImage.size.width - borderSize * 2, inputImage.size.height - borderSize * 2), context, cornerSize, cornerSize);
-  CGContextClosePath(context);
-  CGContextClip(context);
-  
-  roundedImage = [UIImage imageWithCGImage:sourceImg scale:0.0 orientation:inputImage.imageOrientation]; // create cropped UIImage.
-  [roundedImage drawInRect:CGRectMake(0, 0, inputImage.size.width, inputImage.size.height)]; // the actual scaling happens here, and orientation is taken care of automatically.
-  CGImageRelease(sourceImg);
-  roundedImage = UIGraphicsGetImageFromCurrentImageContext();
-  UIGraphicsEndImageContext();
-  
-  if (!roundedImage) {
-    // Try older method.
-    UIImage *image = bit_imageWithAlpha(inputImage);
-    
-    // Build a context that's the same dimensions as the new size
-    context = CGBitmapContextCreate(NULL,
-                                    (size_t)image.size.width,
-                                    (size_t)image.size.height,
-                                    CGImageGetBitsPerComponent(image.CGImage),
-                                    0,
-                                    CGImageGetColorSpace(image.CGImage),
-                                    CGImageGetBitmapInfo(image.CGImage));
-    
-    // Create a clipping path with rounded corners
-    CGContextBeginPath(context);
-    bit_addRoundedRectToPath(CGRectMake(borderSize, borderSize, image.size.width - borderSize * 2, image.size.height - borderSize * 2), context, cornerSize, cornerSize);
-    CGContextClosePath(context);
-    CGContextClip(context);
-    
-    // Draw the image to the context; the clipping path will make anything outside the rounded rect transparent
-    CGContextDrawImage(context, CGRectMake(0, 0, image.size.width, image.size.height), image.CGImage);
-    
-    // Create a CGImage from the context
-    CGImageRef clippedImage = CGBitmapContextCreateImage(context);
-    CGContextRelease(context);
-    
-    // Create a UIImage from the CGImage
-    roundedImage = [UIImage imageWithCGImage:clippedImage];
-    CGImageRelease(clippedImage);
-  }
-  
-  return roundedImage;
-}
-
-UIImage *bit_appIcon() {
-  NSString *iconString = [NSString string];
-  NSArray *icons = [[NSBundle mainBundle] objectForInfoDictionaryKey:@"CFBundleIconFiles"];
-  if (!icons) {
-    icons = [[NSBundle mainBundle] objectForInfoDictionaryKey:@"CFBundleIcons"];
-    if ((icons) && ([icons isKindOfClass:[NSDictionary class]])) {
-      icons = [icons valueForKeyPath:@"CFBundlePrimaryIcon.CFBundleIconFiles"];
-    }
-    
-    if (!icons) {
-      iconString = [[NSBundle mainBundle] objectForInfoDictionaryKey:@"CFBundleIconFile"];
-      if (!iconString) {
-        iconString = @"Icon.png";
-      }
-    }
-  }
-  
-  if (icons) {
-    BOOL useHighResIcon = NO;
-    if ([UIScreen mainScreen].scale >= 2) useHighResIcon = YES;
-    
-    for(NSString *icon in icons) {
-      iconString = icon;
-      UIImage *iconImage = [UIImage imageNamed:icon];
-      
-      if (iconImage.size.height == 57 && !useHighResIcon) {
-        // found!
-        break;
-      }
-      if (iconImage.size.height == 114 && useHighResIcon) {
-        // found!
-        break;
-      }
-    }
-  }
-  
-  BOOL addGloss = YES;
-  NSNumber *prerendered = [[NSBundle mainBundle] objectForInfoDictionaryKey:@"UIPrerenderedIcon"];
-  if (prerendered) {
-    addGloss = ![prerendered boolValue];
-  }
-  
-  if (addGloss) {
-    return bit_addGlossToImage([UIImage imageNamed:iconString]);
-  } else {
-    return [UIImage imageNamed:iconString];
-  }
-}
-
-UIImage *bit_screenshot(void) {
-  // Create a graphics context with the target size
-  CGSize imageSize = [[UIScreen mainScreen] bounds].size;
-  BOOL isLandscapeLeft = [UIApplication sharedApplication].statusBarOrientation == UIInterfaceOrientationLandscapeLeft;
-  BOOL isLandscapeRight = [UIApplication sharedApplication].statusBarOrientation == UIInterfaceOrientationLandscapeRight;
-  BOOL isUpsideDown = [UIApplication sharedApplication].statusBarOrientation == UIInterfaceOrientationPortraitUpsideDown;
-  
-  BOOL needsRotation = NO;
-  
-  if ((isLandscapeLeft ||isLandscapeRight) && imageSize.height > imageSize.width) {
-    needsRotation = YES;
-    CGFloat temp = imageSize.width;
-    imageSize.width = imageSize.height;
-    imageSize.height = temp;
-  }
-  
-  UIGraphicsBeginImageContextWithOptions(imageSize, YES, 0);
-  
-  CGContextRef context = UIGraphicsGetCurrentContext();
-  
-  // Iterate over every window from back to front
-  //NSInteger count = 0;
-  for (UIWindow *window in [[UIApplication sharedApplication] windows])  {
-    if (![window respondsToSelector:@selector(screen)] || [window screen] == [UIScreen mainScreen]) {
-      // -renderInContext: renders in the coordinate space of the layer,
-      // so we must first apply the layer's geometry to the graphics context
-      CGContextSaveGState(context);
-      
-      // Center the context around the window's anchor point
-      CGContextTranslateCTM(context, [window center].x, [window center].y);
-      
-      // Apply the window's transform about the anchor point
-      CGContextConcatCTM(context, [window transform]);
-      
-      // Offset by the portion of the bounds left of and above the anchor point
-      CGContextTranslateCTM(context,
-                            -[window bounds].size.width * [[window layer] anchorPoint].x,
-                            -[window bounds].size.height * [[window layer] anchorPoint].y);
-      
-      if (needsRotation) {
-        if (isLandscapeLeft) {
-          CGContextConcatCTM(context, CGAffineTransformRotate(CGAffineTransformMakeTranslation( imageSize.width, 0), (CGFloat)M_PI_2));
-        } else if (isLandscapeRight) {
-          CGContextConcatCTM(context, CGAffineTransformRotate(CGAffineTransformMakeTranslation( 0, imageSize.height), 3 * (CGFloat)M_PI_2));
-        }
-      } else if (isUpsideDown) {
-        CGContextConcatCTM(context, CGAffineTransformRotate(CGAffineTransformMakeTranslation( imageSize.width, imageSize.height), (CGFloat)M_PI));
-      }
-      
-      if ([window respondsToSelector:@selector(drawViewHierarchyInRect:afterScreenUpdates:)]) {
-        [window drawViewHierarchyInRect:window.bounds afterScreenUpdates:NO];
-      } else {
-        // Render the layer hierarchy to the current context
-        [[window layer] renderInContext:context];
-      }
-      
-      // Restore the context
-      CGContextRestoreGState(context);
-    }
-  }
-  
-  // Retrieve the screenshot image
-  UIImage *image = UIGraphicsGetImageFromCurrentImageContext();
-  
-  UIGraphicsEndImageContext();
-  
-  return image;
-}
-
-#endif /* HOCKEYSDK_CONFIGURATION_ReleaseCrashOnly && HOCKEYSDK_CONFIGURATION_ReleaseCrashOnlyExtensions */
diff --git a/submodules/HockeySDK-iOS/Classes/BITHockeyLogger.h b/submodules/HockeySDK-iOS/Classes/BITHockeyLogger.h
deleted file mode 100644
index 83a7169673..0000000000
--- a/submodules/HockeySDK-iOS/Classes/BITHockeyLogger.h
+++ /dev/null
@@ -1,21 +0,0 @@
-// Adapted from 0xced’s post at http://stackoverflow.com/questions/34732814/how-should-i-handle-logs-in-an-objective-c-library/34732815#34732815
-
-#import <Foundation/Foundation.h>
-#import "HockeySDKEnums.h"
-
-#define BITHockeyLog(_level, _message) [BITHockeyLogger logMessage:_message level:_level file:__FILE__ function:__PRETTY_FUNCTION__ line:__LINE__]
-
-#define BITHockeyLogError(format, ...)   BITHockeyLog(BITLogLevelError,   (^{ return [NSString stringWithFormat:(format), ##__VA_ARGS__]; }))
-#define BITHockeyLogWarning(format, ...) BITHockeyLog(BITLogLevelWarning, (^{ return [NSString stringWithFormat:(format), ##__VA_ARGS__]; }))
-#define BITHockeyLogDebug(format, ...)   BITHockeyLog(BITLogLevelDebug,   (^{ return [NSString stringWithFormat:(format), ##__VA_ARGS__]; }))
-#define BITHockeyLogVerbose(format, ...) BITHockeyLog(BITLogLevelVerbose, (^{ return [NSString stringWithFormat:(format), ##__VA_ARGS__]; }))
-
-@interface BITHockeyLogger : NSObject
-
-+ (BITLogLevel)currentLogLevel;
-+ (void)setCurrentLogLevel:(BITLogLevel)currentLogLevel;
-+ (void)setLogHandler:(BITLogHandler)logHandler;
-
-+ (void)logMessage:(BITLogMessageProvider)messageProvider level:(BITLogLevel)loglevel file:(const char *)file function:(const char *)function line:(uint)line;
-
-@end
diff --git a/submodules/HockeySDK-iOS/Classes/BITHockeyLogger.m b/submodules/HockeySDK-iOS/Classes/BITHockeyLogger.m
deleted file mode 100644
index 1a39c23dd3..0000000000
--- a/submodules/HockeySDK-iOS/Classes/BITHockeyLogger.m
+++ /dev/null
@@ -1,42 +0,0 @@
-#import "BITHockeyLoggerPrivate.h"
-#import "HockeySDK.h"
-
-@implementation BITHockeyLogger
-
-static BITLogLevel _currentLogLevel = BITLogLevelWarning;
-static BITLogHandler currentLogHandler;
-
-BITLogHandler const defaultLogHandler = ^(BITLogMessageProvider messageProvider, BITLogLevel logLevel, const char __unused *file, const char *function, uint line) {
-  if (messageProvider) {
-    if (_currentLogLevel < logLevel) {
-      return;
-    }
-    NSString *functionString = [NSString stringWithUTF8String:function];
-    NSLog((@"[HockeySDK] %@/%d %@"), functionString, line, messageProvider());
-  }
-};
-
-
-+ (void)initialize {
-  currentLogHandler = defaultLogHandler;
-}
-
-+ (BITLogLevel)currentLogLevel {
-  return _currentLogLevel;
-}
-
-+ (void)setCurrentLogLevel:(BITLogLevel)currentLogLevel {
-  _currentLogLevel = currentLogLevel;
-}
-
-+ (void)setLogHandler:(BITLogHandler)logHandler {
-  currentLogHandler = logHandler;
-}
-
-+ (void)logMessage:(BITLogMessageProvider)messageProvider level:(BITLogLevel)loglevel file:(const char *)file function:(const char *)function line:(uint)line {
-  if (currentLogHandler) {
-    currentLogHandler(messageProvider, loglevel, file, function, line);
-  }
-}
-
-@end
diff --git a/submodules/HockeySDK-iOS/Classes/BITHockeyLoggerPrivate.h b/submodules/HockeySDK-iOS/Classes/BITHockeyLoggerPrivate.h
deleted file mode 100644
index 279cd11384..0000000000
--- a/submodules/HockeySDK-iOS/Classes/BITHockeyLoggerPrivate.h
+++ /dev/null
@@ -1,3 +0,0 @@
-#import "BITHockeyLogger.h"
-
-FOUNDATION_EXPORT BITLogHandler const defaultLogHandler;
diff --git a/submodules/HockeySDK-iOS/Classes/BITHockeyManager.h b/submodules/HockeySDK-iOS/Classes/BITHockeyManager.h
deleted file mode 100644
index 1060a1f298..0000000000
--- a/submodules/HockeySDK-iOS/Classes/BITHockeyManager.h
+++ /dev/null
@@ -1,618 +0,0 @@
-/*
- * Author: Andreas Linde <mail@andreaslinde.de>
- *         Kent Sutherland
- *
- * Copyright (c) 2012-2014 HockeyApp, Bit Stadium GmbH.
- * All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person
- * obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without
- * restriction, including without limitation the rights to use,
- * copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following
- * conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
- * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#import <Foundation/Foundation.h>
-#import <UIKit/UIKit.h>
-
-#import "HockeySDKFeatureConfig.h"
-#import "HockeySDKEnums.h"
-
-@protocol BITHockeyManagerDelegate;
-
-@class BITHockeyBaseManager;
-#if HOCKEYSDK_FEATURE_CRASH_REPORTER
-@class BITCrashManager;
-#endif
-#if HOCKEYSDK_FEATURE_UPDATES
-@class BITUpdateManager;
-#endif
-#if HOCKEYSDK_FEATURE_STORE_UPDATES
-@class BITStoreUpdateManager;
-#endif
-#if HOCKEYSDK_FEATURE_FEEDBACK
-@class BITFeedbackManager;
-#endif
-#if HOCKEYSDK_FEATURE_AUTHENTICATOR
-@class BITAuthenticator;
-#endif
-#if HOCKEYSDK_FEATURE_METRICS
-@class BITMetricsManager;
-#endif
-
-/** 
- The HockeySDK manager. Responsible for setup and management of all components
- 
- This is the principal SDK class. It represents the entry point for the HockeySDK. The main promises of the class are initializing the SDK modules, providing access to global properties and to all modules. Initialization is divided into several distinct phases:
- 
- 1. Setup the [HockeyApp](http://hockeyapp.net/) app identifier and the optional delegate: This is the least required information on setting up the SDK and using it. It does some simple validation of the app identifier and checks if the app is running from the App Store or not.
- 2. Provides access to the SDK modules `BITCrashManager`, `BITUpdateManager`, and `BITFeedbackManager`. This way all modules can be further configured to personal needs, if the defaults don't fit the requirements.
- 3. Configure each module.
- 4. Start up all modules.
- 
- The SDK is optimized to defer everything possible to a later time while making sure e.g. crashes on startup can also be caught and each module executes other code with a delay some seconds. This ensures that applicationDidFinishLaunching will process as fast as possible and the SDK will not block the startup sequence resulting in a possible kill by the watchdog process.
-
- All modules do **NOT** show any user interface if the module is not activated or not integrated.
- `BITCrashManager`: Shows an alert on startup asking the user if he/she agrees on sending the crash report, if `[BITCrashManager crashManagerStatus]` is set to `BITCrashManagerStatusAlwaysAsk` (default)
- `BITUpdateManager`: Is automatically deactivated when the SDK detects it is running from a build distributed via the App Store. Otherwise if it is not deactivated manually, it will show an alert after startup informing the user about a pending update, if one is available. If the user then decides to view the update another screen is presented with further details and an option to install the update.
- `BITFeedbackManager`: If this module is deactivated or the user interface is nowhere added into the app, this module will not do anything. It will not fetch the server for data or show any user interface. If it is integrated, activated, and the user already used it to provide feedback, it will show an alert after startup if a new answer has been received from the server with the option to view it.
- 
- Example:
- 
-    [[BITHockeyManager sharedHockeyManager]
-      configureWithIdentifier:@"<AppIdentifierFromHockeyApp>"
-                     delegate:nil];
-    [[BITHockeyManager sharedHockeyManager] startManager];
- 
- @warning The SDK is **NOT** thread safe and has to be set up on the main thread!
- 
- @warning Most properties of all components require to be set **BEFORE** calling`startManager`!
-
- */
-
-#import "HockeySDKNullability.h"
-NS_ASSUME_NONNULL_BEGIN
-
-@interface BITHockeyManager: NSObject
-
-#pragma mark - Public Methods
-
-///-----------------------------------------------------------------------------
-/// @name Initialization
-///-----------------------------------------------------------------------------
-
-/**
- Returns a shared BITHockeyManager object
- 
- @return A singleton BITHockeyManager instance ready use
- */
-+ (BITHockeyManager *)sharedHockeyManager;
-
-
-/**
- Initializes the manager with a particular app identifier
- 
- Initialize the manager with a HockeyApp app identifier.
- 
-    [[BITHockeyManager sharedHockeyManager]
-      configureWithIdentifier:@"<AppIdentifierFromHockeyApp>"];
- 
- @see configureWithIdentifier:delegate:
- @see configureWithBetaIdentifier:liveIdentifier:delegate:
- @see startManager
- @param appIdentifier The app identifier that should be used.
- */
-- (void)configureWithIdentifier:(NSString *)appIdentifier;
-
-
-/**
- Initializes the manager with a particular app identifier and delegate
- 
- Initialize the manager with a HockeyApp app identifier and assign the class that
- implements the optional protocols `BITHockeyManagerDelegate`, `BITCrashManagerDelegate` or
- `BITUpdateManagerDelegate`.
- 
-    [[BITHockeyManager sharedHockeyManager]
-      configureWithIdentifier:@"<AppIdentifierFromHockeyApp>"
-                     delegate:nil];
-
- @see configureWithIdentifier:
- @see configureWithBetaIdentifier:liveIdentifier:delegate:
- @see startManager
- @see BITHockeyManagerDelegate
- @see BITCrashManagerDelegate
- @see BITUpdateManagerDelegate
- @see BITFeedbackManagerDelegate
- @param appIdentifier The app identifier that should be used.
- @param delegate `nil` or the class implementing the option protocols
- */
-- (void)configureWithIdentifier:(NSString *)appIdentifier delegate:(nullable id<BITHockeyManagerDelegate>)delegate;
-
-
-/**
- Initializes the manager with an app identifier for beta, one for live usage and delegate
- 
- Initialize the manager with different HockeyApp app identifiers for beta and live usage.
- All modules will automatically detect if the app is running in the App Store and use
- the live app identifier for that. In all other cases it will use the beta app identifier.
- And also assign the class that implements the optional protocols `BITHockeyManagerDelegate`,
- `BITCrashManagerDelegate` or `BITUpdateManagerDelegate`
- 
-    [[BITHockeyManager sharedHockeyManager]
-      configureWithBetaIdentifier:@"<AppIdentifierForBetaAppFromHockeyApp>"
-                   liveIdentifier:@"<AppIdentifierForLiveAppFromHockeyApp>"
-                         delegate:nil];
-
- We recommend using one app entry on HockeyApp for your beta versions and another one for
- your live versions. The reason is that you will have way more beta versions than live
- versions, but on the other side get way more crash reports on the live version. Separating
- them into two different app entries makes it easier to work with the data. In addition
- you will likely end up having the same version number for a beta and live version which
- would mix different data into the same version. Also the live version does not require
- you to upload any IPA files, uploading only the dSYM package for crash reporting is
- just fine.
-
- @see configureWithIdentifier:
- @see configureWithIdentifier:delegate:
- @see startManager
- @see BITHockeyManagerDelegate
- @see BITCrashManagerDelegate
- @see BITUpdateManagerDelegate
- @see BITFeedbackManagerDelegate
- @param betaIdentifier The app identifier for the _non_ app store (beta) configurations
- @param liveIdentifier The app identifier for the app store configurations.
- @param delegate `nil` or the class implementing the optional protocols
- */
-- (void)configureWithBetaIdentifier:(NSString *)betaIdentifier liveIdentifier:(NSString *)liveIdentifier delegate:(nullable id<BITHockeyManagerDelegate>)delegate;
-
-
-/**
- Starts the manager and runs all modules
- 
- Call this after configuring the manager and setting up all modules.
- 
- @see configureWithIdentifier:delegate:
- @see configureWithBetaIdentifier:liveIdentifier:delegate:
- */
-- (void)startManager;
-
-#pragma mark - Public Properties
-
-///-----------------------------------------------------------------------------
-/// @name Modules
-///-----------------------------------------------------------------------------
-
-
-/**
- Set the delegate
- 
- Defines the class that implements the optional protocol `BITHockeyManagerDelegate`.
- 
- The delegate will automatically be propagated to all components. There is no need to set the delegate
- for each component individually.
- 
- @warning This property needs to be set before calling `startManager`
- 
- @see BITHockeyManagerDelegate
- @see BITCrashManagerDelegate
- @see BITUpdateManagerDelegate
- @see BITFeedbackManagerDelegate
- */
-@property (nonatomic, weak, nullable) id<BITHockeyManagerDelegate> delegate;
-
-
-/**
- Defines the server URL to send data to or request data from
- 
- By default this is set to the HockeyApp servers and there rarely should be a
- need to modify that.
- Please be aware that the URL for `BITMetricsManager` needs to be set separately
- as this class uses a different endpoint!
- 
- @warning This property needs to be set before calling `startManager`
- */
-@property (nonatomic, copy) NSString *serverURL;
-
-
-#if HOCKEYSDK_FEATURE_CRASH_REPORTER
-
-/**
- Reference to the initialized BITCrashManager module
-
- Returns the BITCrashManager instance initialized by BITHockeyManager
- 
- @see configureWithIdentifier:delegate:
- @see configureWithBetaIdentifier:liveIdentifier:delegate:
- @see startManager
- @see disableCrashManager
- */
-@property (nonatomic, strong, readonly) BITCrashManager *crashManager;
-
-
-/**
- Flag the determines whether the Crash Manager should be disabled
- 
- If this flag is enabled, then crash reporting is disabled and no crashes will
- be send.
- 
- Please note that the Crash Manager instance will be initialized anyway, but crash report
- handling (signal and uncaught exception handlers) will **not** be registered.
-
- @warning This property needs to be set before calling `startManager`
-
- *Default*: _NO_
- @see crashManager
- */
-@property (nonatomic, getter = isCrashManagerDisabled) BOOL disableCrashManager;
-
-#endif
-
-
-#if HOCKEYSDK_FEATURE_UPDATES
-
-/**
- Reference to the initialized BITUpdateManager module
- 
- Returns the BITUpdateManager instance initialized by BITHockeyManager
- 
- @see configureWithIdentifier:delegate:
- @see configureWithBetaIdentifier:liveIdentifier:delegate:
- @see startManager
- @see disableUpdateManager
- */
-@property (nonatomic, strong, readonly) BITUpdateManager *updateManager;
-
-
-/**
- Flag the determines whether the Update Manager should be disabled
- 
- If this flag is enabled, then checking for updates and submitting beta usage
- analytics will be turned off!
- 
- Please note that the Update Manager instance will be initialized anyway!
- 
- @warning This property needs to be set before calling `startManager`
-
- *Default*: _NO_
- @see updateManager
- */
-@property (nonatomic, getter = isUpdateManagerDisabled) BOOL disableUpdateManager;
-
-#endif
-
-
-#if HOCKEYSDK_FEATURE_STORE_UPDATES
-
-/**
- Reference to the initialized BITStoreUpdateManager module
- 
- Returns the BITStoreUpdateManager instance initialized by BITHockeyManager
- 
- @see configureWithIdentifier:delegate:
- @see configureWithBetaIdentifier:liveIdentifier:delegate:
- @see startManager
- @see enableStoreUpdateManager
- */
-@property (nonatomic, strong, readonly) BITStoreUpdateManager *storeUpdateManager;
-
-
-/**
- Flag the determines whether the App Store Update Manager should be enabled
- 
- If this flag is enabled, then checking for updates when the app runs from the
- app store will be turned on!
- 
- Please note that the Store Update Manager instance will be initialized anyway!
-
- @warning This property needs to be set before calling `startManager`
-
- *Default*: _NO_
- @see storeUpdateManager
- */
-@property (nonatomic, getter = isStoreUpdateManagerEnabled) BOOL enableStoreUpdateManager;
-
-#endif
-
-
-#if HOCKEYSDK_FEATURE_FEEDBACK
-
-/**
- Reference to the initialized BITFeedbackManager module
- 
- Returns the BITFeedbackManager instance initialized by BITHockeyManager
- 
- @see configureWithIdentifier:delegate:
- @see configureWithBetaIdentifier:liveIdentifier:delegate:
- @see startManager
- @see disableFeedbackManager
- */
-@property (nonatomic, strong, readonly) BITFeedbackManager *feedbackManager;
-
-
-/**
- Flag the determines whether the Feedback Manager should be disabled
- 
- If this flag is enabled, then letting the user give feedback and
- get responses will be turned off!
- 
- Please note that the Feedback Manager instance will be initialized anyway!
-
- @warning This property needs to be set before calling `startManager`
-
- *Default*: _NO_
- @see feedbackManager
- */
-@property (nonatomic, getter = isFeedbackManagerDisabled) BOOL disableFeedbackManager;
-
-#endif
-
-
-#if HOCKEYSDK_FEATURE_AUTHENTICATOR
-
-/**
- Reference to the initialized BITAuthenticator module
- 
- Returns the BITAuthenticator instance initialized by BITHockeyManager
- 
- @see configureWithIdentifier:delegate:
- @see configureWithBetaIdentifier:liveIdentifier:delegate:
- @see startManager
- */
-@property (nonatomic, strong, readonly) BITAuthenticator *authenticator;
-
-#endif
-
-#if HOCKEYSDK_FEATURE_METRICS
-
-/**
- Reference to the initialized BITMetricsManager module
- 
- Returns the BITMetricsManager instance initialized by BITHockeyManager
- */
-@property (nonatomic, strong, readonly) BITMetricsManager *metricsManager;
-
-/**
- Flag the determines whether the BITMetricsManager should be disabled
- 
- If this flag is enabled, then sending metrics data such as sessions and users 
- will be turned off!
- 
- Please note that the BITMetricsManager instance will be initialized anyway!
-  
- *Default*: _NO_
- @see metricsManager
- */
-@property (nonatomic, getter = isMetricsManagerDisabled) BOOL disableMetricsManager;
-
-#endif
-
-///-----------------------------------------------------------------------------
-/// @name Environment
-///-----------------------------------------------------------------------------
-
-
-/**
- Enum that indicates what kind of environment the application is installed and running in.
- 
- This property can be used to disable or enable specific funtionality 
- only when specific conditions are met.
- That could mean for example, to only enable debug UI elements 
- when the app has been installed over HockeyApp but not in the AppStore.
- 
- The underlying enum type at the moment only specifies values for the AppStore,
- TestFlight and Other. Other summarizes several different distribution methods
- and we might define additional specifc values for other environments in the future.
- 
- @see BITEnvironment
- */
-@property (nonatomic, readonly) BITEnvironment appEnvironment;
-
-
-/**
- Returns the app installation specific anonymous UUID
- 
- The value returned by this method is unique and persisted per app installation
- in the keychain.  It is also being used in crash reports as `CrashReporter Key`
- and internally when sending crash reports and feedback messages.
- 
- This is not identical to the `[ASIdentifierManager advertisingIdentifier]` or
- the `[UIDevice identifierForVendor]`!
- */
-@property (nonatomic, readonly, copy) NSString *installString;
-
-
-/**
- Disable tracking the installation of an app on a device
- 
- This will cause the app to generate a new `installString` value every time the
- app is cold started.
- 
- This property is only considered in App Store Environment, since it would otherwise
- affect the `BITUpdateManager` and `BITAuthenticator` functionalities!
- 
- @warning This property needs to be set before calling `startManager`
- 
- *Default*: _NO_
- */
-@property (nonatomic, getter=isInstallTrackingDisabled) BOOL disableInstallTracking;
-
-///-----------------------------------------------------------------------------
-/// @name Debug Logging
-///-----------------------------------------------------------------------------
-
-/**
- This property is used indicate the amount of verboseness and severity for which
- you want to see log messages in the console.
- */
-@property (nonatomic, assign) BITLogLevel logLevel;
-
-/**
- Flag that determines whether additional logging output should be generated
- by the manager and all modules.
- 
- This is ignored if the app is running in the App Store and reverts to the
- default value in that case.
- 
- @warning This property needs to be set before calling `startManager`
- 
- *Default*: _NO_
- */
-@property (nonatomic, assign, getter=isDebugLogEnabled) BOOL debugLogEnabled DEPRECATED_MSG_ATTRIBUTE("Use logLevel instead!");
-
-/**
- Set a custom block that handles all the log messages that are emitted from the SDK.
-
- You can use this to reroute the messages that would normally be logged by `NSLog();`
- to your own custom logging framework.
-
- An example of how to do this with NSLogger:
- 
- ```
- [[BITHockeyManager sharedHockeyManager] setLogHandler:^(BITLogMessageProvider messageProvider, BITLogLevel logLevel, const char *file, const char *function, uint line) {
-    LogMessageRawF(file, (int)line, function, @"HockeySDK", (int)logLevel-1, messageProvider());
- }];
- ```
-
- or with CocoaLumberjack:
- 
- ```
- [[BITHockeyManager sharedHockeyManager] setLogHandler:^(BITLogMessageProvider messageProvider, BITLogLevel logLevel, const char *file, const char *function, uint line) {
-    [DDLog log:YES message:messageProvider() level:ddLogLevel flag:(DDLogFlag)(1 << (logLevel-1)) context:<#CocoaLumberjackContext#> file:file function:function line:line tag:nil];
- }];
- ```
- 
- @param logHandler The block of type BITLogHandler that will process all logged messages.
- */
-- (void)setLogHandler:(BITLogHandler)logHandler;
-
-
-///-----------------------------------------------------------------------------
-/// @name Integration test
-///-----------------------------------------------------------------------------
-
-/**
- Pings the server with the HockeyApp app identifiers used for initialization
- 
- Call this method once for debugging purposes to test if your SDK setup code
- reaches the server successfully.
- 
- Once invoked, check the apps page on HockeyApp for a verification.
- 
- If you setup the SDK with a beta and live identifier, a call to both app IDs will be done.
-
- This call is ignored if the app is running in the App Store!.
- */
-- (void)testIdentifier;
-
-
-///-----------------------------------------------------------------------------
-/// @name Additional meta data
-///-----------------------------------------------------------------------------
-
-/** Set the userid that should used in the SDK components
- 
- Right now this is used by the `BITCrashManager` to attach to a crash report.
- `BITFeedbackManager` uses it too for assigning the user to a discussion thread.
-
- The value can be set at any time and will be stored in the keychain on the current
- device only! To delete the value from the keychain set the value to `nil`.
- 
- This property is optional and can be used as an alternative to the delegate. If you
- want to define specific data for each component, use the delegate instead which does
- overwrite the values set by this property.
- 
- @warning When returning a non nil value, crash reports are not anonymous any more
- and the crash alerts will not show the word "anonymous"!
- 
- @warning This property needs to be set before calling `startManager` to be considered
- for being added to crash reports as meta data.
-
- @see userName
- @see userEmail
- @see `[BITHockeyManagerDelegate userIDForHockeyManager:componentManager:]`
- */
-@property (nonatomic, copy, nullable) NSString *userID;
-
-
-/** Set the user name that should used in the SDK components
- 
- Right now this is used by the `BITCrashManager` to attach to a crash report.
- `BITFeedbackManager` uses it too for assigning the user to a discussion thread.
- 
- The value can be set at any time and will be stored in the keychain on the current
- device only! To delete the value from the keychain set the value to `nil`.
- 
- This property is optional and can be used as an alternative to the delegate. If you
- want to define specific data for each component, use the delegate instead which does
- overwrite the values set by this property.
-
- @warning When returning a non nil value, crash reports are not anonymous any more
- and the crash alerts will not show the word "anonymous"!
-
- @warning This property needs to be set before calling `startManager` to be considered
- for being added to crash reports as meta data.
-
- @see userID
- @see userEmail
- @see `[BITHockeyManagerDelegate userNameForHockeyManager:componentManager:]`
- */
-@property (nonatomic, copy, nullable) NSString *userName;
-
-
-/** Set the users email address that should used in the SDK components
- 
- Right now this is used by the `BITCrashManager` to attach to a crash report.
- `BITFeedbackManager` uses it too for assigning the user to a discussion thread.
- 
- The value can be set at any time and will be stored in the keychain on the current
- device only! To delete the value from the keychain set the value to `nil`.
- 
- This property is optional and can be used as an alternative to the delegate. If you
- want to define specific data for each component, use the delegate instead which does
- overwrite the values set by this property.
- 
- @warning When returning a non nil value, crash reports are not anonymous any more
- and the crash alerts will not show the word "anonymous"!
- 
- @warning This property needs to be set before calling `startManager` to be considered
- for being added to crash reports as meta data.
-
- @see userID
- @see userName
- @see [BITHockeyManagerDelegate userEmailForHockeyManager:componentManager:]
- */
-@property (nonatomic, copy, nullable) NSString *userEmail;
-
-
-///-----------------------------------------------------------------------------
-/// @name SDK meta data
-///-----------------------------------------------------------------------------
-
-/**
- Returns the SDK Version (CFBundleShortVersionString).
- */
-- (NSString *)version;
-
-/**
- Returns the SDK Build (CFBundleVersion) as a string.
- */
-- (NSString *)build;
-
-@end
-
-NS_ASSUME_NONNULL_END
diff --git a/submodules/HockeySDK-iOS/Classes/BITHockeyManager.m b/submodules/HockeySDK-iOS/Classes/BITHockeyManager.m
deleted file mode 100644
index 2a81056fad..0000000000
--- a/submodules/HockeySDK-iOS/Classes/BITHockeyManager.m
+++ /dev/null
@@ -1,750 +0,0 @@
-/*
- * Author: Andreas Linde <mail@andreaslinde.de>
- *         Kent Sutherland
- *
- * Copyright (c) 2012-2014 HockeyApp, Bit Stadium GmbH.
- * All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person
- * obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without
- * restriction, including without limitation the rights to use,
- * copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following
- * conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
- * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#import "HockeySDK.h"
-#import "HockeySDKPrivate.h"
-
-#if HOCKEYSDK_FEATURE_CRASH_REPORTER || HOCKEYSDK_FEATURE_FEEDBACK || HOCKEYSDK_FEATURE_UPDATES || HOCKEYSDK_FEATURE_AUTHENTICATOR || HOCKEYSDK_FEATURE_STORE_UPDATES || HOCKEYSDK_FEATURE_METRICS
-#import "BITHockeyBaseManagerPrivate.h"
-#endif
-
-#import "BITHockeyHelper.h"
-#import "BITHockeyAppClient.h"
-#import "BITKeychainUtils.h"
-
-#include <stdint.h>
-
-typedef struct {
-  uint8_t       info_version;
-  const char    hockey_version[16];
-  const char    hockey_build[16];
-} bitstadium_info_t;
-
-#if HOCKEYSDK_FEATURE_CRASH_REPORTER
-#import "BITCrashManagerPrivate.h"
-#endif /* HOCKEYSDK_FEATURE_CRASH_REPORTER */
-
-#if HOCKEYSDK_FEATURE_UPDATES
-#import "BITUpdateManagerPrivate.h"
-#endif /* HOCKEYSDK_FEATURE_UPDATES */
-
-#if HOCKEYSDK_FEATURE_STORE_UPDATES
-#import "BITStoreUpdateManagerPrivate.h"
-#endif /* HOCKEYSDK_FEATURE_STORE_UPDATES */
-
-#if HOCKEYSDK_FEATURE_FEEDBACK
-#import "BITFeedbackManagerPrivate.h"
-#endif /* HOCKEYSDK_FEATURE_FEEDBACK */
-
-#if HOCKEYSDK_FEATURE_AUTHENTICATOR
-#import "BITAuthenticator_Private.h"
-#endif /* HOCKEYSDK_FEATURE_AUTHENTICATOR */
-
-#if HOCKEYSDK_FEATURE_METRICS
-#import "BITMetricsManagerPrivate.h"
-#import "BITCategoryContainer.h"
-#endif /* HOCKEYSDK_FEATURE_METRICS */
-
-@interface BITHockeyManager ()
-
-- (BOOL)shouldUseLiveIdentifier;
-
-@property (nonatomic, copy) NSString *appIdentifier;
-@property (nonatomic, copy) NSString *liveIdentifier;
-@property (nonatomic) BOOL validAppIdentifier;
-@property (nonatomic) BOOL startManagerIsInvoked;
-@property (nonatomic) BOOL startUpdateManagerIsInvoked;
-@property (nonatomic) BOOL managersInitialized;
-@property (nonatomic, strong) BITHockeyAppClient *hockeyAppClient;
-
-// Redeclare BITHockeyManager properties with readwrite attribute.
-@property (nonatomic, readwrite, copy) NSString *installString;
-
-#if HOCKEYSDK_FEATURE_CRASH_REPORTER
-@property (nonatomic, strong, readwrite) BITCrashManager *crashManager;
-#endif
-
-#if HOCKEYSDK_FEATURE_UPDATES
-@property (nonatomic, strong, readwrite) BITUpdateManager *updateManager;
-#endif
-
-#if HOCKEYSDK_FEATURE_STORE_UPDATES
-@property (nonatomic, strong, readwrite) BITStoreUpdateManager *storeUpdateManager;
-#endif
-
-#if HOCKEYSDK_FEATURE_FEEDBACK
-@property (nonatomic, strong, readwrite) BITFeedbackManager *feedbackManager;
-#endif
-
-#if HOCKEYSDK_FEATURE_AUTHENTICATOR
-@property (nonatomic, strong, readwrite) BITAuthenticator *authenticator;
-#endif
-
-#if HOCKEYSDK_FEATURE_METRICS
-@property (nonatomic, strong, readwrite) BITMetricsManager *metricsManager;
-#endif
-
-
-@end
-
-
-@implementation BITHockeyManager
-
-#pragma mark - Private Class Methods
-
-- (BOOL)checkValidityOfAppIdentifier:(NSString *)identifier {
-  BOOL result = NO;
-  
-  if (identifier) {
-    NSCharacterSet *hexSet = [NSCharacterSet characterSetWithCharactersInString:@"0123456789abcdef"];
-    NSCharacterSet *inStringSet = [NSCharacterSet characterSetWithCharactersInString:identifier];
-    result = ([identifier length] == 32) && ([hexSet isSupersetOfSet:inStringSet]);
-  }
-  
-  return result;
-}
-
-- (void)logInvalidIdentifier:(NSString *)environment {
-  if (self.appEnvironment != BITEnvironmentAppStore) {
-    if ([environment isEqualToString:@"liveIdentifier"]) {
-      BITHockeyLogWarning(@"[HockeySDK] WARNING: The liveIdentifier is invalid! The SDK will be disabled when deployed to the App Store without setting a valid app identifier!");
-    } else {
-      BITHockeyLogError(@"[HockeySDK] ERROR: The %@ is invalid! Please use the HockeyApp app identifier you find on the apps website on HockeyApp! The SDK is disabled!", environment);
-    }
-  }
-}
-
-#pragma mark - Public Class Methods
-
-+ (BITHockeyManager *)sharedHockeyManager {
-  static BITHockeyManager *sharedInstance = nil;
-  static dispatch_once_t pred;
-  
-  dispatch_once(&pred, ^{
-    sharedInstance = [BITHockeyManager alloc];
-    sharedInstance = [sharedInstance init];
-  });
-  
-  return sharedInstance;
-}
-
-- (instancetype)init {
-  if ((self = [super init])) {
-    _serverURL = BITHOCKEYSDK_URL;
-    _delegate = nil;
-    _managersInitialized = NO;
-    
-    _hockeyAppClient = nil;
-    
-#if HOCKEYSDK_FEATURE_CRASH_REPORTER
-    _disableCrashManager = NO;
-#endif
-#if HOCKEYSDK_FEATURE_METRICS
-    _disableMetricsManager = NO;
-#endif
-#if HOCKEYSDK_FEATURE_FEEDBACK
-    _disableFeedbackManager = NO;
-#endif
-#if HOCKEYSDK_FEATURE_UPDATES
-    _disableUpdateManager = NO;
-#endif
-#if HOCKEYSDK_FEATURE_STORE_UPDATES
-    _enableStoreUpdateManager = NO;
-#endif
-    
-    _appEnvironment = bit_currentAppEnvironment();
-    _startManagerIsInvoked = NO;
-    _startUpdateManagerIsInvoked = NO;
-    
-    _liveIdentifier = nil;
-    _installString = bit_appAnonID(NO);
-    _disableInstallTracking = NO;
-    
-    [self performSelector:@selector(validateStartManagerIsInvoked) withObject:nil afterDelay:0.0];
-  }
-  return self;
-}
-
-- (void)dealloc {
-#if HOCKEYSDK_FEATURE_AUTHENTICATOR
-  // start Authenticator
-  if (self.appEnvironment != BITEnvironmentAppStore) {
-    [self.authenticator removeObserver:self forKeyPath:@"identified"];
-  }
-#endif
-}
-
-
-#pragma mark - Public Instance Methods (Configuration)
-
-- (void)configureWithIdentifier:(NSString *)appIdentifier {
-  self.appIdentifier = [appIdentifier copy];
-  
-  [self initializeModules];
-}
-
-- (void)configureWithIdentifier:(NSString *)appIdentifier delegate:(id<BITHockeyManagerDelegate>)delegate {
-  self.delegate = delegate;
-  self.appIdentifier = [appIdentifier copy];
-  
-  [self initializeModules];
-}
-
-- (void)configureWithBetaIdentifier:(NSString *)betaIdentifier liveIdentifier:(NSString *)liveIdentifier delegate:(id<BITHockeyManagerDelegate>)delegate {
-  self.delegate = delegate;
-
-  // check the live identifier now, because otherwise invalid identifier would only be logged when the app is already in the store
-  if (![self checkValidityOfAppIdentifier:liveIdentifier]) {
-    [self logInvalidIdentifier:@"liveIdentifier"];
-    self.liveIdentifier = [liveIdentifier copy];
-  }
-
-  if ([self shouldUseLiveIdentifier]) {
-    self.appIdentifier = [liveIdentifier copy];
-  }
-  else {
-    self.appIdentifier = [betaIdentifier copy];
-  }
-  
-  [self initializeModules];
-}
-
-- (void)startManager {
-  if (!self.validAppIdentifier) return;
-  if (self.startManagerIsInvoked) {
-    BITHockeyLogWarning(@"[HockeySDK] Warning: startManager should only be invoked once! This call is ignored.");
-    return;
-  }
-  
-  // Fix bug where Application Support directory was encluded from backup
-  NSFileManager *fileManager = [NSFileManager defaultManager];
-  NSURL *appSupportURL = [[fileManager URLsForDirectory:NSApplicationSupportDirectory inDomains:NSUserDomainMask] lastObject];
-  bit_fixBackupAttributeForURL(appSupportURL);
-  
-  if (![self isSetUpOnMainThread]) return;
-  
-  if ((self.appEnvironment == BITEnvironmentAppStore) && [self isInstallTrackingDisabled]) {
-    self.installString = bit_appAnonID(YES);
-  }
-
-  BITHockeyLogDebug(@"INFO: Starting HockeyManager");
-  self.startManagerIsInvoked = YES;
-  
-#if HOCKEYSDK_FEATURE_CRASH_REPORTER
-  // start CrashManager
-  if (![self isCrashManagerDisabled]) {
-    BITHockeyLogDebug(@"INFO: Start CrashManager");
-    
-#if HOCKEYSDK_FEATURE_AUTHENTICATOR
-    if (self.authenticator) {
-      [self.crashManager setInstallationIdentification:[self.authenticator publicInstallationIdentifier]];
-      [self.crashManager setInstallationIdentificationType:[self.authenticator identificationType]];
-      [self.crashManager setInstallationIdentified:[self.authenticator isIdentified]];
-    }
-#endif
-
-    [self.crashManager startManager];
-  }
-#endif /* HOCKEYSDK_FEATURE_CRASH_REPORTER */
-
-#if HOCKEYSDK_FEATURE_METRICS
-  // start MetricsManager
-  if (!self.isMetricsManagerDisabled) {
-    BITHockeyLogDebug(@"INFO: Start MetricsManager");
-    [self.metricsManager startManager];
-    [BITCategoryContainer activateCategory];
-  }
-#endif /* HOCKEYSDK_FEATURE_METRICS */
-
-  // App Extensions can only use BITCrashManager and BITMetricsManager, so ignore all others automatically
-  if (bit_isRunningInAppExtension()) {
-    return;
-  }
-  
-#if HOCKEYSDK_FEATURE_STORE_UPDATES
-  // start StoreUpdateManager
-  if ([self isStoreUpdateManagerEnabled]) {
-    BITHockeyLogDebug(@"INFO: Start StoreUpdateManager");
-    if (self.serverURL) {
-      [self.storeUpdateManager setServerURL:self.serverURL];
-    }
-    [self.storeUpdateManager performSelector:@selector(startManager) withObject:nil afterDelay:0.5];
-  }
-#endif /* HOCKEYSDK_FEATURE_STORE_UPDATES */
-
-#if HOCKEYSDK_FEATURE_FEEDBACK
-  // start FeedbackManager
-  if (![self isFeedbackManagerDisabled]) {
-    BITHockeyLogDebug(@"INFO: Start FeedbackManager");
-    if (self.serverURL) {
-      [self.feedbackManager setServerURL:self.serverURL];
-    }
-    [self.feedbackManager performSelector:@selector(startManager) withObject:nil afterDelay:1.0];
-  }
-#endif /* HOCKEYSDK_FEATURE_FEEDBACK */
-  
-#if HOCKEYSDK_FEATURE_AUTHENTICATOR
-  // start Authenticator
-  if (self.appEnvironment != BITEnvironmentAppStore) {
-    // hook into manager with kvo!
-    [self.authenticator addObserver:self forKeyPath:@"identified" options:0 context:nil];
-    
-    BITHockeyLogDebug(@"INFO: Start Authenticator");
-    if (self.serverURL) {
-      [self.authenticator setServerURL:self.serverURL];
-    }
-    [self.authenticator performSelector:@selector(startManager) withObject:nil afterDelay:0.5];
-  }
-#endif /* HOCKEYSDK_FEATURE_AUTHENTICATOR */
-  
-#if HOCKEYSDK_FEATURE_UPDATES
-  BOOL isIdentified = NO;
-
-#if HOCKEYSDK_FEATURE_AUTHENTICATOR
-  if (self.appEnvironment != BITEnvironmentAppStore)
-    isIdentified = [self.authenticator isIdentified];
-#endif /* HOCKEYSDK_FEATURE_AUTHENTICATOR */
-
-  // Setup UpdateManager
-  if (![self isUpdateManagerDisabled] && isIdentified) {
-    [self invokeStartUpdateManager];
-  }
-#endif /* HOCKEYSDK_FEATURE_UPDATES */
-}
-
-#if HOCKEYSDK_FEATURE_UPDATES
-- (void)setDisableUpdateManager:(BOOL)disableUpdateManager {
-  if (self.updateManager) {
-    [self.updateManager setDisableUpdateManager:disableUpdateManager];
-  }
-  _disableUpdateManager = disableUpdateManager;
-}
-#endif /* HOCKEYSDK_FEATURE_UPDATES */
-
-
-#if HOCKEYSDK_FEATURE_STORE_UPDATES
-- (void)setEnableStoreUpdateManager:(BOOL)enableStoreUpdateManager {
-  if (self.storeUpdateManager) {
-    [self.storeUpdateManager setEnableStoreUpdateManager:enableStoreUpdateManager];
-  }
-  _enableStoreUpdateManager = enableStoreUpdateManager;
-}
-#endif /* HOCKEYSDK_FEATURE_STORE_UPDATES */
-
-
-#if HOCKEYSDK_FEATURE_FEEDBACK
-- (void)setDisableFeedbackManager:(BOOL)disableFeedbackManager {
-  if (self.feedbackManager) {
-    [self.feedbackManager setDisableFeedbackManager:disableFeedbackManager];
-  }
-  _disableFeedbackManager = disableFeedbackManager;
-}
-#endif /* HOCKEYSDK_FEATURE_FEEDBACK */
-
-#if HOCKEYSDK_FEATURE_METRICS
-- (void)setDisableMetricsManager:(BOOL)disableMetricsManager {
-  if (self.metricsManager) {
-    self.metricsManager.disabled = disableMetricsManager;
-  }
-  _disableMetricsManager = disableMetricsManager;
-}
-#endif /* HOCKEYSDK_FEATURE_METRICS */
-
-- (void)setServerURL:(NSString *)aServerURL {
-  // ensure url ends with a trailing slash
-  if (![aServerURL hasSuffix:@"/"]) {
-    aServerURL = [NSString stringWithFormat:@"%@/", aServerURL];
-  }
-  
-  if (self.serverURL != aServerURL) {
-    _serverURL = [aServerURL copy];
-    
-    if (self.hockeyAppClient) {
-      self.hockeyAppClient.baseURL = [NSURL URLWithString:self.serverURL ?: BITHOCKEYSDK_URL];
-    }
-  }
-}
-
-
-- (void)setDelegate:(id<BITHockeyManagerDelegate>)delegate {
-  if (self.appEnvironment != BITEnvironmentAppStore) {
-    if (self.startManagerIsInvoked) {
-      BITHockeyLogError(@"[HockeySDK] ERROR: The `delegate` property has to be set before calling [[BITHockeyManager sharedHockeyManager] startManager] !");
-    }
-  }
-
-  if (_delegate != delegate) {
-    _delegate = delegate;
-    id<BITHockeyManagerDelegate> currentDelegate = _delegate;
-    
-#if HOCKEYSDK_FEATURE_CRASH_REPORTER
-    if (self.crashManager) {
-      self.crashManager.delegate = currentDelegate;
-    }
-#endif /* HOCKEYSDK_FEATURE_CRASH_REPORTER */
-    
-#if HOCKEYSDK_FEATURE_UPDATES
-    if (self.updateManager) {
-      self.updateManager.delegate = currentDelegate;
-    }
-#endif /* HOCKEYSDK_FEATURE_UPDATES */
-    
-#if HOCKEYSDK_FEATURE_FEEDBACK
-    if (self.feedbackManager) {
-      self.feedbackManager.delegate = currentDelegate;
-    }
-#endif /* HOCKEYSDK_FEATURE_FEEDBACK */
-    
-#if HOCKEYSDK_FEATURE_STORE_UPDATES
-    if (self.storeUpdateManager) {
-      self.storeUpdateManager.delegate = currentDelegate;
-    }
-#endif /* HOCKEYSDK_FEATURE_STORE_UPDATES */
-
-#if HOCKEYSDK_FEATURE_AUTHENTICATOR
-    if (self.authenticator) {
-      self.authenticator.delegate = currentDelegate;
-    }
-#endif /* HOCKEYSDK_FEATURE_AUTHENTICATOR */
-  }
-}
-
-- (void)setDebugLogEnabled:(BOOL)debugLogEnabled {
-  _debugLogEnabled = debugLogEnabled;
-  if (debugLogEnabled) {
-    self.logLevel = BITLogLevelDebug;
-  } else {
-    self.logLevel = BITLogLevelWarning;
-  }
-}
-
-- (BITLogLevel)logLevel {
-  return BITHockeyLogger.currentLogLevel;
-}
-
-- (void)setLogLevel:(BITLogLevel)logLevel {
-  BITHockeyLogger.currentLogLevel = logLevel;
-}
-
-- (void)setLogHandler:(BITLogHandler)logHandler {
-  [BITHockeyLogger setLogHandler:logHandler];
-}
-
-- (void)modifyKeychainUserValue:(NSString *)value forKey:(NSString *)key {
-  NSError *error = nil;
-  BOOL success = YES;
-  NSString *updateType = @"update";
-  
-  if (value) {
-    success = [BITKeychainUtils storeUsername:key
-                                  andPassword:value
-                               forServiceName:bit_keychainHockeySDKServiceName()
-                               updateExisting:YES
-                                accessibility:kSecAttrAccessibleAlwaysThisDeviceOnly
-                                        error:&error];
-  } else {
-    updateType = @"delete";
-    if ([BITKeychainUtils getPasswordForUsername:key
-                                  andServiceName:bit_keychainHockeySDKServiceName()
-                                           error:&error]) {
-      success = [BITKeychainUtils deleteItemForUsername:key
-                                         andServiceName:bit_keychainHockeySDKServiceName()
-                                                  error:&error];
-    }
-  }
-  
-  if (!success) {
-    NSString *errorDescription = [error description] ?: @"";
-    BITHockeyLogError(@"ERROR: Couldn't %@ key %@ in the keychain. %@", updateType, key, errorDescription);
-  }
-}
-
-- (void)setUserID:(NSString *)userID {
-  // always set it, since nil value will trigger removal of the keychain entry
-  _userID = userID;
-  
-  [self modifyKeychainUserValue:userID forKey:kBITHockeyMetaUserID];
-}
-
-- (void)setUserName:(NSString *)userName {
-  // always set it, since nil value will trigger removal of the keychain entry
-  _userName = userName;
-  
-  [self modifyKeychainUserValue:userName forKey:kBITHockeyMetaUserName];
-}
-
-- (void)setUserEmail:(NSString *)userEmail {
-  // always set it, since nil value will trigger removal of the keychain entry
-  _userEmail = userEmail;
-  
-  [self modifyKeychainUserValue:userEmail forKey:kBITHockeyMetaUserEmail];
-}
-
-- (void)testIdentifier {
-  if (!self.appIdentifier || (self.appEnvironment == BITEnvironmentAppStore)) {
-    return;
-  }
-  
-  NSDate *now = [NSDate date];
-  NSString *timeString = [NSString stringWithFormat:@"%.0f", [now timeIntervalSince1970]];
-  [self pingServerForIntegrationStartWorkflowWithTimeString:timeString appIdentifier:self.appIdentifier];
-  
-  if (self.liveIdentifier) {
-    [self pingServerForIntegrationStartWorkflowWithTimeString:timeString appIdentifier:self.liveIdentifier];
-  }
-}
-
-
-- (NSString *)version {
-  return (NSString *)[NSString stringWithUTF8String:BITHOCKEY_C_VERSION];
-}
-
-- (NSString *)build {
-  return (NSString *)[NSString stringWithUTF8String:BITHOCKEY_C_BUILD];
-}
-
-
-#pragma mark - KVO
-
-#if HOCKEYSDK_FEATURE_UPDATES
-- (void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(NSDictionary *) __unused change context:(void *) __unused context {
-  if ([keyPath isEqualToString:@"identified"] &&
-      [object valueForKey:@"isIdentified"] ) {
-    if (self.appEnvironment != BITEnvironmentAppStore) {
-      BOOL identified = [(NSNumber *)[object valueForKey:@"isIdentified"] boolValue];
-      if (identified && ![self isUpdateManagerDisabled]) {
-        [self invokeStartUpdateManager];
-      }
-    }
-  }
-}
-#endif /* HOCKEYSDK_FEATURE_UPDATES */
-
-
-#pragma mark - Private Instance Methods
-
-- (BITHockeyAppClient *)hockeyAppClient {
-  if (!_hockeyAppClient) {
-    _hockeyAppClient = [[BITHockeyAppClient alloc] initWithBaseURL:[NSURL URLWithString:self.serverURL]];
-  }
-  return _hockeyAppClient;
-}
-
-- (NSString *)integrationFlowTimeString {
-  NSString *timeString = [[NSBundle mainBundle] objectForInfoDictionaryKey:BITHOCKEY_INTEGRATIONFLOW_TIMESTAMP];
-  
-  return timeString;
-}
-
-- (BOOL)integrationFlowStartedWithTimeString:(NSString *)timeString {
-  if (timeString == nil || (self.appEnvironment == BITEnvironmentAppStore)) {
-    return NO;
-  }
-  
-  NSDateFormatter *dateFormatter = [[NSDateFormatter alloc] init];
-  NSLocale *enUSPOSIXLocale = [[NSLocale alloc] initWithLocaleIdentifier:@"en_US_POSIX"];
-  [dateFormatter setLocale:enUSPOSIXLocale];
-  [dateFormatter setDateFormat:@"yyyy-MM-dd'T'HH:mm:ssZ"];
-  NSDate *integrationFlowStartDate = [dateFormatter dateFromString:timeString];
-  
-  if (integrationFlowStartDate && [integrationFlowStartDate timeIntervalSince1970] > [[NSDate date] timeIntervalSince1970] - (60 * 10) ) {
-    return YES;
-  }
-  
-  return NO;
-}
-
-- (void)pingServerForIntegrationStartWorkflowWithTimeString:(NSString *)timeString appIdentifier:(NSString *)appIdentifier {
-  if (!appIdentifier || (self.appEnvironment == BITEnvironmentAppStore)) {
-    return;
-  }
-  
-  NSString *integrationPath = [NSString stringWithFormat:@"api/3/apps/%@/integration", bit_encodeAppIdentifier(appIdentifier)];
-  
-  BITHockeyLogDebug(@"INFO: Sending integration workflow ping to %@", integrationPath);
-  
-  NSDictionary *params = @{@"timestamp": timeString,
-                           @"sdk": BITHOCKEY_NAME,
-                           @"sdk_version": BITHOCKEY_VERSION,
-                           @"bundle_version": (id)[[NSBundle mainBundle] objectForInfoDictionaryKey:@"CFBundleVersion"]
-                           };
-  
-  NSURLSessionConfiguration *sessionConfiguration = [NSURLSessionConfiguration defaultSessionConfiguration];
-  __block NSURLSession *session = [NSURLSession sessionWithConfiguration:sessionConfiguration];
-  NSURLRequest *request = [[self hockeyAppClient] requestWithMethod:@"POST" path:integrationPath parameters:params];
-  NSURLSessionDataTask *task = [session dataTaskWithRequest:request
-                                          completionHandler: ^(NSData * __unused data, NSURLResponse *response, NSError * __unused error) {
-                                            [session finishTasksAndInvalidate];
-
-                                            NSHTTPURLResponse *httpResponse = (NSHTTPURLResponse*) response;
-                                            [self logPingMessageForStatusCode:httpResponse.statusCode];
-                                          }];
-  [task resume];
-
-}
-
-- (void)logPingMessageForStatusCode:(NSInteger)statusCode {
-  switch (statusCode) {
-    case 400:
-      BITHockeyLogError(@"ERROR: App ID not found");
-      break;
-    case 201:
-      BITHockeyLogDebug(@"INFO: Ping accepted.");
-      break;
-    case 200:
-      BITHockeyLogDebug(@"INFO: Ping accepted. Server already knows.");
-      break;
-    default:
-      BITHockeyLogError(@"ERROR: Unknown error");
-      break;
-  }
-}
-
-- (void)validateStartManagerIsInvoked {
-  if (self.validAppIdentifier && (self.appEnvironment != BITEnvironmentAppStore)) {
-    if (!self.startManagerIsInvoked) {
-      BITHockeyLogError(@"[HockeySDK] ERROR: You did not call [[BITHockeyManager sharedHockeyManager] startManager] to startup the HockeySDK! Please do so after setting up all properties. The SDK is NOT running.");
-    }
-  }
-}
-
-#if HOCKEYSDK_FEATURE_UPDATES
-- (void)invokeStartUpdateManager {
-  if (self.startUpdateManagerIsInvoked) return;
-  
-  self.startUpdateManagerIsInvoked = YES;
-  BITHockeyLogDebug(@"INFO: Start UpdateManager");
-  if (self.serverURL) {
-    [self.updateManager setServerURL:self.serverURL];
-  }
-#if HOCKEYSDK_FEATURE_AUTHENTICATOR
-  if (self.authenticator) {
-    [self.updateManager setInstallationIdentification:[self.authenticator installationIdentifier]];
-    [self.updateManager setInstallationIdentificationType:[self.authenticator installationIdentifierParameterString]];
-    [self.updateManager setInstallationIdentified:[self.authenticator isIdentified]];
-  }
-#endif
-  [self.updateManager performSelector:@selector(startManager) withObject:nil afterDelay:0.5];
-}
-#endif /* HOCKEYSDK_FEATURE_UPDATES */
-
-- (BOOL)isSetUpOnMainThread {
-  NSString *errorString = @"ERROR: HockeySDK has to be setup on the main thread!";
-  
-  if (!NSThread.isMainThread) {
-    if (self.appEnvironment == BITEnvironmentAppStore) {
-      BITHockeyLogError(@"%@", errorString);
-    } else {
-      BITHockeyLogError(@"%@", errorString);
-      NSAssert(NSThread.isMainThread, errorString);
-    }
-    
-    return NO;
-  }
-  
-  return YES;
-}
-
-- (BOOL)shouldUseLiveIdentifier {
-  BOOL delegateResult = NO;
-  id<BITHockeyManagerDelegate> currentDelegate = self.delegate;
-  if ([currentDelegate respondsToSelector:@selector(shouldUseLiveIdentifierForHockeyManager:)]) {
-    delegateResult = [currentDelegate shouldUseLiveIdentifierForHockeyManager:self];
-  }
-
-  return (delegateResult) || (self.appEnvironment == BITEnvironmentAppStore);
-}
-
-- (void)initializeModules {
-  if (self.managersInitialized) {
-    BITHockeyLogWarning(@"[HockeySDK] Warning: The SDK should only be initialized once! This call is ignored.");
-    return;
-  }
-  
-  self.validAppIdentifier = [self checkValidityOfAppIdentifier:self.appIdentifier];
-  
-  if (![self isSetUpOnMainThread]) return;
-  
-  self.startManagerIsInvoked = NO;
-  
-  if (self.validAppIdentifier) {
-    id<BITHockeyManagerDelegate> currentDelegate = self.delegate;
-
-#if HOCKEYSDK_FEATURE_CRASH_REPORTER
-    BITHockeyLogDebug(@"INFO: Setup CrashManager");
-    self.crashManager = [[BITCrashManager alloc] initWithAppIdentifier:self.appIdentifier
-                                                    appEnvironment:self.appEnvironment
-                                                   hockeyAppClient:[self hockeyAppClient]];
-    self.crashManager.delegate = currentDelegate;
-#endif /* HOCKEYSDK_FEATURE_CRASH_REPORTER */
-    
-#if HOCKEYSDK_FEATURE_UPDATES
-    BITHockeyLogDebug(@"INFO: Setup UpdateManager");
-    self.updateManager = [[BITUpdateManager alloc] initWithAppIdentifier:self.appIdentifier appEnvironment:self.appEnvironment];
-    self.updateManager.delegate = currentDelegate;
-#endif /* HOCKEYSDK_FEATURE_UPDATES */
-
-#if HOCKEYSDK_FEATURE_STORE_UPDATES
-    BITHockeyLogDebug(@"INFO: Setup StoreUpdateManager");
-    self.storeUpdateManager = [[BITStoreUpdateManager alloc] initWithAppIdentifier:self.appIdentifier appEnvironment:self.appEnvironment];
-    self.storeUpdateManager.delegate = currentDelegate;
-#endif /* HOCKEYSDK_FEATURE_STORE_UPDATES */
-    
-#if HOCKEYSDK_FEATURE_FEEDBACK
-    BITHockeyLogDebug(@"INFO: Setup FeedbackManager");
-    self.feedbackManager = [[BITFeedbackManager alloc] initWithAppIdentifier:self.appIdentifier appEnvironment:self.appEnvironment];
-    self.feedbackManager.delegate = currentDelegate;
-#endif /* HOCKEYSDK_FEATURE_FEEDBACK */
-
-#if HOCKEYSDK_FEATURE_AUTHENTICATOR
-    BITHockeyLogDebug(@"INFO: Setup Authenticator");
-    self.authenticator = [[BITAuthenticator alloc] initWithAppIdentifier:self.appIdentifier appEnvironment:self.appEnvironment];
-    self.authenticator.hockeyAppClient = [self hockeyAppClient];
-    self.authenticator.delegate = currentDelegate;
-#endif /* HOCKEYSDK_FEATURE_AUTHENTICATOR */
-    
-#if HOCKEYSDK_FEATURE_METRICS
-    BITHockeyLogDebug(@"INFO: Setup MetricsManager");
-    NSString *iKey = bit_appIdentifierToGuid(self.appIdentifier);
-    self.metricsManager = [[BITMetricsManager alloc] initWithAppIdentifier:iKey appEnvironment:self.appEnvironment];
-#endif /* HOCKEYSDK_FEATURE_METRICS */
-
-    if (self.appEnvironment != BITEnvironmentAppStore) {
-      NSString *integrationFlowTime = [self integrationFlowTimeString];
-      if (integrationFlowTime && [self integrationFlowStartedWithTimeString:integrationFlowTime]) {
-        [self pingServerForIntegrationStartWorkflowWithTimeString:integrationFlowTime appIdentifier:self.appIdentifier];
-      }
-    }
-    self.managersInitialized = YES;
-  } else {
-    [self logInvalidIdentifier:@"app identifier"];
-  }
-}
-
-@end
diff --git a/submodules/HockeySDK-iOS/Classes/BITHockeyManagerDelegate.h b/submodules/HockeySDK-iOS/Classes/BITHockeyManagerDelegate.h
deleted file mode 100644
index a95b546890..0000000000
--- a/submodules/HockeySDK-iOS/Classes/BITHockeyManagerDelegate.h
+++ /dev/null
@@ -1,230 +0,0 @@
-/*
- * Author: Andreas Linde <mail@andreaslinde.de>
- *
- * Copyright (c) 2012-2014 HockeyApp, Bit Stadium GmbH.
- * All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person
- * obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without
- * restriction, including without limitation the rights to use,
- * copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following
- * conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
- * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#import <Foundation/Foundation.h>
-#import "HockeySDKFeatureConfig.h"
-
-#if HOCKEYSDK_FEATURE_CRASH_REPORTER
-#import "BITCrashManagerDelegate.h"
-#endif
-
-#if HOCKEYSDK_FEATURE_UPDATES
-#import "BITUpdateManagerDelegate.h"
-#endif
-
-#if HOCKEYSDK_FEATURE_FEEDBACK
-//#import "BITFeedbackManagerDelegate.h"
-#endif
-
-#if HOCKEYSDK_FEATURE_AUTHENTICATOR
-//#import "BITAuthenticator.h"
-#endif
-
-@class BITHockeyManager;
-@class BITHockeyBaseManager;
-
-/**
- The `BITHockeyManagerDelegate` formal protocol defines methods further configuring
-  the behaviour of `BITHockeyManager`, as well as the delegate of the modules it manages.
- */
-
-@protocol BITHockeyManagerDelegate <NSObject
-#if HOCKEYSDK_FEATURE_CRASH_REPORTER
-  , BITCrashManagerDelegate
-#endif
-#if HOCKEYSDK_FEATURE_UPDATES
-  , BITUpdateManagerDelegate
-#endif
-#if HOCKEYSDK_FEATURE_FEEDBACK
-  //, BITFeedbackManagerDelegate
-#endif
-#if HOCKEYSDK_FEATURE_AUTHENTICATOR
-  //, BITAuthenticatorDelegate
-#endif
-  >
-
-@optional
-
-
-///-----------------------------------------------------------------------------
-/// @name App Identifier usage
-///-----------------------------------------------------------------------------
-
-/**
- Implement to force the usage of the live identifier
- 
- This is useful if you are e.g. distributing an enterprise app inside your company
- and want to use the `liveIdentifier` for that even though it is not running from
- the App Store.
- 
- Example:
- 
-     - (BOOL)shouldUseLiveIdentifierForHockeyManager:(BITHockeyManager *)hockeyManager {
-     #ifdef (CONFIGURATION_AppStore)
-       return YES;
-     #endif
-       return NO;
-     }
- 
- @param hockeyManager BITHockeyManager instance
- */
-- (BOOL)shouldUseLiveIdentifierForHockeyManager:(BITHockeyManager *)hockeyManager;
-
-
-///-----------------------------------------------------------------------------
-/// @name UI presentation
-///-----------------------------------------------------------------------------
-
-
-// optional parent view controller for the feedback screen when invoked via the alert view, default is the root UIWindow instance
-/**
- Return a custom parent view controller for presenting modal sheets
- 
- By default the SDK is using the root UIWindow instance to present any required
- view controllers. Overwrite this if this doesn't result in a satisfying
- behavior or if you want to define any other parent view controller.
- 
- @param hockeyManager The `BITHockeyManager` HockeyManager instance invoking this delegate
- @param componentManager The `BITHockeyBaseManager` component instance invoking this delegate, can be `BITCrashManager` or `BITFeedbackManager`
- */
-- (UIViewController *)viewControllerForHockeyManager:(BITHockeyManager *)hockeyManager componentManager:(BITHockeyBaseManager *)componentManager;
-
-
-///-----------------------------------------------------------------------------
-/// @name Additional meta data
-///-----------------------------------------------------------------------------
-
-
-/** Return the userid that should used in the SDK components
- 
- Right now this is used by the `BITCrashManager` to attach to a crash report.
- `BITFeedbackManager` uses it too for assigning the user to a discussion thread.
- 
- In addition, if this returns not nil for `BITFeedbackManager` the user will
- not be asked for any user details by the component, including userName or userEmail.
- 
- You can find out the component requesting the userID like this:
- 
-    - (NSString *)userIDForHockeyManager:(BITHockeyManager *)hockeyManager componentManager:(BITHockeyBaseManager *)componentManager {
-      if (componentManager == hockeyManager.feedbackManager) {
-        return UserIDForFeedback;
-      } else if (componentManager == hockeyManager.crashManager) {
-        return UserIDForCrashReports;
-      } else {
-        return nil;
-      }
-    }
- 
- For crash reports, this delegate is invoked on the startup after the crash!
- 
- Alternatively you can also use `[BITHockeyManager userID]` which will cache the value in the keychain.
-
- @warning When returning a non nil value for the `BITCrashManager` component, crash reports
- are not anonymous any more and the crash alerts will not show the word "anonymous"!
- 
- @param hockeyManager The `BITHockeyManager` HockeyManager instance invoking this delegate
- @param componentManager The `BITHockeyBaseManager` component instance invoking this delegate, can be `BITCrashManager` or `BITFeedbackManager`
- @see userNameForHockeyManager:componentManager:
- @see userEmailForHockeyManager:componentManager:
- @see [BITHockeyManager userID]
- */
-- (NSString *)userIDForHockeyManager:(BITHockeyManager *)hockeyManager componentManager:(BITHockeyBaseManager *)componentManager;
-
-
-/** Return the user name that should used in the SDK components
- 
- Right now this is used by the `BITCrashManager` to attach to a crash report.
- `BITFeedbackManager` uses it too for assigning the user to a discussion thread.
- 
- In addition, if this returns not nil for `BITFeedbackManager` the user will
- not be asked for any user details by the component, including userName or userEmail.
- 
- You can find out the component requesting the user name like this:
- 
-    - (NSString *)userNameForHockeyManager:(BITHockeyManager *)hockeyManager componentManager:(BITHockeyBaseManager *)componentManager {
-      if (componentManager == hockeyManager.feedbackManager) {
-        return UserNameForFeedback;
-      } else if (componentManager == hockeyManager.crashManager) {
-        return UserNameForCrashReports;
-      } else {
-        return nil;
-      }
- }
-
- For crash reports, this delegate is invoked on the startup after the crash!
- 
- Alternatively you can also use `[BITHockeyManager userName]` which will cache the value in the keychain.
- 
- @warning When returning a non nil value for the `BITCrashManager` component, crash reports
- are not anonymous any more and the crash alerts will not show the word "anonymous"!
-
- @param hockeyManager The `BITHockeyManager` HockeyManager instance invoking this delegate
- @param componentManager The `BITHockeyBaseManager` component instance invoking this delegate, can be `BITCrashManager` or `BITFeedbackManager`
- @see userIDForHockeyManager:componentManager:
- @see userEmailForHockeyManager:componentManager:
- @see [BITHockeyManager userName]
- */
-- (NSString *)userNameForHockeyManager:(BITHockeyManager *)hockeyManager componentManager:(BITHockeyBaseManager *)componentManager;
-
-
-/** Return the users email address that should used in the SDK components
- 
- Right now this is used by the `BITCrashManager` to attach to a crash report.
- `BITFeedbackManager` uses it too for assigning the user to a discussion thread.
- 
- In addition, if this returns not nil for `BITFeedbackManager` the user will
- not be asked for any user details by the component, including userName or userEmail.
- 
- You can find out the component requesting the user email like this:
- 
-    - (NSString *)userEmailForHockeyManager:(BITHockeyManager *)hockeyManager componentManager:(BITHockeyBaseManager *)componentManager {
-      if (componentManager == hockeyManager.feedbackManager) {
-        return UserEmailForFeedback;
-      } else if (componentManager == hockeyManager.crashManager) {
-        return UserEmailForCrashReports;
-       } else {
-        return nil;
-       }
-    }
- 
- For crash reports, this delegate is invoked on the startup after the crash!
- 
- Alternatively you can also use `[BITHockeyManager userEmail]` which will cache the value in the keychain.
- 
- @warning When returning a non nil value for the `BITCrashManager` component, crash reports
- are not anonymous any more and the crash alerts will not show the word "anonymous"!
-
- @param hockeyManager The `BITHockeyManager` HockeyManager instance invoking this delegate
- @param componentManager The `BITHockeyBaseManager` component instance invoking this delegate, can be `BITCrashManager` or `BITFeedbackManager`
- @see userIDForHockeyManager:componentManager:
- @see userNameForHockeyManager:componentManager:
- @see [BITHockeyManager userEmail]
- */
-- (NSString *)userEmailForHockeyManager:(BITHockeyManager *)hockeyManager componentManager:(BITHockeyBaseManager *)componentManager;
-
-@end
diff --git a/submodules/HockeySDK-iOS/Classes/BITImageAnnotation.h b/submodules/HockeySDK-iOS/Classes/BITImageAnnotation.h
deleted file mode 100644
index c6788e41f8..0000000000
--- a/submodules/HockeySDK-iOS/Classes/BITImageAnnotation.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Author: Moritz Haarmann <post@moritzhaarmann.de>
- *
- * Copyright (c) 2012-2014 HockeyApp, Bit Stadium GmbH.
- * All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person
- * obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without
- * restriction, including without limitation the rights to use,
- * copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following
- * conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
- * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#import <UIKit/UIKit.h>
-
-@interface BITImageAnnotation : UIView
-
-@property (nonatomic, getter=isSelected) BOOL selected;
-@property (nonatomic) CGSize movedDelta;
-@property (nonatomic, weak) UIImage *sourceImage;
-@property (nonatomic) CGRect imageFrame;
-
-- (BOOL)resizable;
-
-@end
diff --git a/submodules/HockeySDK-iOS/Classes/BITImageAnnotation.m b/submodules/HockeySDK-iOS/Classes/BITImageAnnotation.m
deleted file mode 100644
index d7bc699471..0000000000
--- a/submodules/HockeySDK-iOS/Classes/BITImageAnnotation.m
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Author: Moritz Haarmann <post@moritzhaarmann.de>
- *
- * Copyright (c) 2012-2014 HockeyApp, Bit Stadium GmbH.
- * All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person
- * obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without
- * restriction, including without limitation the rights to use,
- * copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following
- * conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
- * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#import "HockeySDK.h"
-
-#if HOCKEYSDK_FEATURE_FEEDBACK
-
-#import "BITImageAnnotation.h"
-
-@implementation BITImageAnnotation
-
--(BOOL)resizable {
-  return NO;
-}
-
-@end
-
-#endif
diff --git a/submodules/HockeySDK-iOS/Classes/BITImageAnnotationViewController.h b/submodules/HockeySDK-iOS/Classes/BITImageAnnotationViewController.h
deleted file mode 100644
index 026968ceb3..0000000000
--- a/submodules/HockeySDK-iOS/Classes/BITImageAnnotationViewController.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Author: Moritz Haarmann <post@moritzhaarmann.de>
- *
- * Copyright (c) 2012-2014 HockeyApp, Bit Stadium GmbH.
- * All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person
- * obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without
- * restriction, including without limitation the rights to use,
- * copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following
- * conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
- * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#import <UIKit/UIKit.h>
-
-@class BITImageAnnotationViewController;
-
-@protocol BITImageAnnotationDelegate <NSObject>
-
-- (void)annotationControllerDidCancel:(BITImageAnnotationViewController *)annotationController;
-- (void)annotationController:(BITImageAnnotationViewController *)annotationController didFinishWithImage:(UIImage *)image;
-
-@end
-
-@interface BITImageAnnotationViewController : UIViewController
-
-@property (nonatomic, strong) UIImage *image;
-@property (nonatomic, weak) id<BITImageAnnotationDelegate> delegate;
-
-@end
diff --git a/submodules/HockeySDK-iOS/Classes/BITImageAnnotationViewController.m b/submodules/HockeySDK-iOS/Classes/BITImageAnnotationViewController.m
deleted file mode 100644
index f8d95972b3..0000000000
--- a/submodules/HockeySDK-iOS/Classes/BITImageAnnotationViewController.m
+++ /dev/null
@@ -1,415 +0,0 @@
-/*
- * Author: Moritz Haarmann <post@moritzhaarmann.de>
- *
- * Copyright (c) 2012-2014 HockeyApp, Bit Stadium GmbH.
- * All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person
- * obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without
- * restriction, including without limitation the rights to use,
- * copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following
- * conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
- * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#import "HockeySDK.h"
-
-#if HOCKEYSDK_FEATURE_FEEDBACK
-
-#import "BITImageAnnotationViewController.h"
-#import "BITImageAnnotation.h"
-#import "BITRectangleImageAnnotation.h"
-#import "BITArrowImageAnnotation.h"
-#import "BITBlurImageAnnotation.h"
-#import "BITHockeyHelper.h"
-#import "HockeySDKPrivate.h"
-
-typedef NS_ENUM(NSInteger, BITImageAnnotationViewControllerInteractionMode) {
-  BITImageAnnotationViewControllerInteractionModeNone,
-  BITImageAnnotationViewControllerInteractionModeDraw,
-  BITImageAnnotationViewControllerInteractionModeMove
-};
-
-@interface BITImageAnnotationViewController ()
-
-@property (nonatomic, strong) UIImageView *imageView;
-@property (nonatomic, strong) UISegmentedControl *editingControls;
-@property (nonatomic, strong) NSMutableArray *objects;
-
-@property (nonatomic, strong) UITapGestureRecognizer *tapRecognizer;
-@property (nonatomic, strong) UIPanGestureRecognizer *panRecognizer;
-@property (nonatomic, strong) UIPinchGestureRecognizer *pinchRecognizer;
-
-@property (nonatomic) CGFloat scaleFactor;
-
-@property (nonatomic) CGPoint panStart;
-@property (nonatomic,strong) BITImageAnnotation *currentAnnotation;
-
-@property (nonatomic) BITImageAnnotationViewControllerInteractionMode currentInteraction;
-
-@property (nonatomic) CGRect pinchStartingFrame;
-
-@end
-
-@implementation BITImageAnnotationViewController
-
-#pragma mark - UIViewController
-
-- (void)viewDidLoad {
-  [super viewDidLoad];
-  
-  self.view.backgroundColor = [UIColor groupTableViewBackgroundColor];
-  
-  NSArray *icons = @[@"Arrow.png",@"Rectangle.png", @"Blur.png"];
-  
-  self.editingControls = [[UISegmentedControl alloc] initWithItems:@[@"Rectangle", @"Arrow", @"Blur"]];
-  int i=0;
-  for (NSString *imageName in icons){
-    [self.editingControls setImage:bit_imageNamed(imageName, BITHOCKEYSDK_BUNDLE) forSegmentAtIndex:i++];
-  }
-  
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
-  [self.editingControls setSegmentedControlStyle:UISegmentedControlStyleBar];
-#pragma clang diagnostic pop
-  
-  self.navigationItem.titleView = self.editingControls;
-  
-  self.objects = [NSMutableArray new];
-  
-  [self.editingControls addTarget:self action:@selector(editingAction:) forControlEvents:UIControlEventTouchUpInside];
-  [self.editingControls setSelectedSegmentIndex:0];
-  
-  self.imageView = [[UIImageView alloc] initWithFrame:self.view.bounds];
-  
-  self.imageView.clipsToBounds = YES;
-  
-  self.imageView.image = self.image;
-  self.imageView.contentMode = UIViewContentModeScaleToFill;
-  
-  self.view.frame = UIScreen.mainScreen.bounds;
-  
-  [self.view addSubview:self.imageView];
-  // Erm.
-  self.imageView.frame = [UIScreen mainScreen].bounds;
-  
-  self.panRecognizer = [[UIPanGestureRecognizer alloc] initWithTarget:self action:@selector(panned:)];
-  self.pinchRecognizer = [[UIPinchGestureRecognizer alloc] initWithTarget:self action:@selector(pinched:)];
-  self.tapRecognizer = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(tapped:)];
-  
-  [self.imageView addGestureRecognizer:self.pinchRecognizer];
-  [self.imageView addGestureRecognizer:self.panRecognizer];
-  [self.view addGestureRecognizer:self.tapRecognizer];
-  
-  self.imageView.userInteractionEnabled = YES;
-  
-  self.navigationItem.leftBarButtonItem = [[UIBarButtonItem alloc ] initWithImage:bit_imageNamed(@"Cancel.png", BITHOCKEYSDK_BUNDLE) landscapeImagePhone:bit_imageNamed(@"Cancel.png", BITHOCKEYSDK_BUNDLE) style:UIBarButtonItemStylePlain target:self action:@selector(discard:)];
-  self.navigationItem.rightBarButtonItem = [[UIBarButtonItem alloc ] initWithImage:bit_imageNamed(@"Ok.png", BITHOCKEYSDK_BUNDLE) landscapeImagePhone:bit_imageNamed(@"Ok.png", BITHOCKEYSDK_BUNDLE) style:UIBarButtonItemStylePlain target:self action:@selector(save:)];
-  
-  self.view.autoresizesSubviews = NO;
-}
-
-
-- (void)viewWillAppear:(BOOL)animated {
-  [super viewWillAppear:animated];
-  
-  [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(orientationDidChange:) name:UIDeviceOrientationDidChangeNotification object:nil];
-  
-  [self fitImageViewFrame];
-  
-}
-
-- (void)viewWillDisappear:(BOOL)animated {
-  [super viewWillDisappear:animated];
-  
-  [[NSNotificationCenter defaultCenter] removeObserver:self name:UIDeviceOrientationDidChangeNotification object:nil];
-}
-
-- (BOOL)prefersStatusBarHidden {
-  return self.navigationController.navigationBarHidden || self.navigationController.navigationBar.alpha == 0;
-}
-
-- (void)orientationDidChange:(NSNotification *) __unused notification {
-  [self fitImageViewFrame];
-}
-
-
-- (void)fitImageViewFrame {
-  
-  CGSize size = [UIScreen mainScreen].bounds.size;
-  if (UIInterfaceOrientationIsLandscape([UIApplication sharedApplication].statusBarOrientation) && size.height > size.width){
-    size = CGSizeMake(size.height, size.width);
-  }
-  
-  CGFloat heightScaleFactor = size.height / self.image.size.height;
-  CGFloat widthScaleFactor =  size.width / self.image.size.width;
-  
-  CGFloat factor = MIN(heightScaleFactor, widthScaleFactor);
-  self.scaleFactor = factor;
-  CGSize scaledImageSize = CGSizeMake(self.image.size.width * factor, self.image.size.height * factor);
-  
-  CGRect baseFrame = CGRectMake(self.view.frame.size.width/2 - scaledImageSize.width/2, self.view.frame.size.height/2 -  scaledImageSize.height/2, scaledImageSize.width, scaledImageSize.height);
-  
-  self.imageView.frame = baseFrame;
-}
-
-- (void)editingAction:(id) __unused sender {
-  
-}
-
-- (BITImageAnnotation *)annotationForCurrentMode {
-  if (self.editingControls.selectedSegmentIndex == 0){
-    return [[BITArrowImageAnnotation alloc] initWithFrame:CGRectZero];
-  } else if(self.editingControls.selectedSegmentIndex==1){
-    return [[BITRectangleImageAnnotation alloc] initWithFrame:CGRectZero];
-  } else {
-    return [[BITBlurImageAnnotation alloc] initWithFrame:CGRectZero];
-  }
-}
-
-#pragma mark - Actions
-
-- (void)discard:(id) __unused sender {
-  [self.delegate annotationControllerDidCancel:self];
-  [self dismissViewControllerAnimated:YES completion:nil];
-}
-
-- (void)save:(id) __unused sender {
-  UIImage *image = [self extractImage];
-  [self.delegate annotationController:self didFinishWithImage:image];
-  [self dismissViewControllerAnimated:YES completion:nil];
-}
-
-- (UIImage *)extractImage {
-  UIGraphicsBeginImageContextWithOptions(self.image.size, YES, 0.0);
-  CGContextRef ctx = UIGraphicsGetCurrentContext();
-  [self.image drawInRect:CGRectMake(0, 0, self.image.size.width, self.image.size.height)];
-  CGContextScaleCTM(ctx,((CGFloat)1.0)/self.scaleFactor,((CGFloat)1.0)/self.scaleFactor);
-  
-  // Drawing all the annotations onto the final image.
-  for (BITImageAnnotation *annotation in self.objects){
-    CGContextTranslateCTM(ctx, annotation.frame.origin.x, annotation.frame.origin.y);
-    [annotation.layer renderInContext:ctx];
-    CGContextTranslateCTM(ctx,-1 * annotation.frame.origin.x,-1 *  annotation.frame.origin.y);
-  }
-  
-  UIImage *renderedImageOfMyself = UIGraphicsGetImageFromCurrentImageContext();
-  UIGraphicsEndImageContext();
-  return renderedImageOfMyself;
-}
-
-#pragma mark - UIGestureRecognizers
-
-- (void)panned:(UIPanGestureRecognizer *)gestureRecognizer {
-  BITImageAnnotation *annotationAtLocation = (BITImageAnnotation *)[self.view hitTest:[gestureRecognizer locationInView:self.view] withEvent:nil];
-  
-  if (![annotationAtLocation isKindOfClass:[BITImageAnnotation class]]){
-    annotationAtLocation = nil;
-  }
-  
-  // determine the interaction mode if none is set so far.
-  
-  if (self.currentInteraction == BITImageAnnotationViewControllerInteractionModeNone){
-    if (annotationAtLocation){
-      self.currentInteraction = BITImageAnnotationViewControllerInteractionModeMove;
-    } else if ([self canDrawNewAnnotation]){
-      self.currentInteraction = BITImageAnnotationViewControllerInteractionModeDraw;
-    }
-  }
-  
-  if (self.currentInteraction == BITImageAnnotationViewControllerInteractionModeNone){
-    return;
-  }
-  
-  
-  if (self.currentInteraction == BITImageAnnotationViewControllerInteractionModeDraw){
-    if (gestureRecognizer.state == UIGestureRecognizerStateBegan){
-      self.currentAnnotation = [self annotationForCurrentMode];
-      [self.objects addObject:self.currentAnnotation];
-      self.currentAnnotation.sourceImage = self.image;
-      
-      if (self.imageView.subviews.count > 0 && [self.currentAnnotation isKindOfClass:[BITBlurImageAnnotation class]]){
-        [self.imageView insertSubview:self.currentAnnotation belowSubview:[self firstAnnotationThatIsNotBlur]];
-      } else {
-        [self.imageView addSubview:self.currentAnnotation];
-      }
-      
-      self.panStart = [gestureRecognizer locationInView:self.imageView];
-      
-    } else if (gestureRecognizer.state == UIGestureRecognizerStateChanged){
-      CGPoint bla = [gestureRecognizer locationInView:self.imageView];
-      self.currentAnnotation.frame = CGRectMake(self.panStart.x, self.panStart.y, bla.x - self.panStart.x, bla.y - self.panStart.y);
-      self.currentAnnotation.movedDelta = CGSizeMake(bla.x - self.panStart.x, bla.y - self.panStart.y);
-      self.currentAnnotation.imageFrame = [self.view convertRect:self.imageView.frame toView:self.currentAnnotation];
-      [self.currentAnnotation setNeedsLayout];
-      [self.currentAnnotation layoutIfNeeded];
-    } else {
-      [self.currentAnnotation setSelected:NO];
-      self.currentAnnotation = nil;
-      self.currentInteraction = BITImageAnnotationViewControllerInteractionModeNone;
-    }
-  } else if (self.currentInteraction == BITImageAnnotationViewControllerInteractionModeMove){
-    if (gestureRecognizer.state == UIGestureRecognizerStateBegan){
-      // find and possibly move an existing annotation.
-      
-      
-      if ([self.objects indexOfObject:annotationAtLocation] != NSNotFound){
-        self.currentAnnotation = annotationAtLocation;
-        [annotationAtLocation setSelected:YES];
-      }
-      
-      
-    } else if (gestureRecognizer.state == UIGestureRecognizerStateChanged && self.currentAnnotation){
-      CGPoint delta = [gestureRecognizer translationInView:self.view];
-      
-      CGRect annotationFrame = self.currentAnnotation.frame;
-      annotationFrame.origin.x += delta.x;
-      annotationFrame.origin.y += delta.y;
-      self.currentAnnotation.frame = annotationFrame;
-      self.currentAnnotation.imageFrame = [self.view convertRect:self.imageView.frame toView:self.currentAnnotation];
-      
-      [self.currentAnnotation setNeedsLayout];
-      [self.currentAnnotation layoutIfNeeded];
-      
-      [gestureRecognizer setTranslation:CGPointZero inView:self.view];
-      
-    } else {
-      [self.currentAnnotation setSelected:NO];
-      self.currentAnnotation = nil;
-      self.currentInteraction = BITImageAnnotationViewControllerInteractionModeNone;
-    }
-  }
-}
-
-- (void)pinched:(UIPinchGestureRecognizer *)gestureRecognizer {
-  if (gestureRecognizer.state == UIGestureRecognizerStateBegan){
-    // try to figure out which view we are talking about.
-    BITImageAnnotation *candidate = nil;
-    BOOL validView = YES;
-    
-    for (uint i = 0; i < gestureRecognizer.numberOfTouches; i++){
-      BITImageAnnotation *newCandidate = (BITImageAnnotation *)[self.view hitTest:[gestureRecognizer locationOfTouch:i inView:self.view] withEvent:nil];
-      
-      if (![newCandidate isKindOfClass:[BITImageAnnotation class]]){
-        newCandidate = nil;
-      }
-      
-      if (candidate == nil){
-        candidate = newCandidate;
-      } else if (candidate != newCandidate){
-        validView = NO;
-        break;
-      }
-    }
-    
-    if (validView && [candidate resizable]){
-      self.currentAnnotation = candidate;
-      self.pinchStartingFrame = self.currentAnnotation.frame;
-      [self.currentAnnotation setSelected:YES];
-    }
-    
-  } else if (gestureRecognizer.state == UIGestureRecognizerStateChanged && self.currentAnnotation && gestureRecognizer.numberOfTouches>1){
-    CGRect newFrame= (self.pinchStartingFrame);
-    
-    // upper point?
-    CGPoint point1 = [gestureRecognizer locationOfTouch:0 inView:self.view];
-    CGPoint point2 = [gestureRecognizer locationOfTouch:1 inView:self.view];
-    
-    
-    newFrame.origin.x = point1.x;
-    newFrame.origin.y = point1.y;
-    
-    newFrame.origin.x = (point1.x > point2.x) ? point2.x : point1.x;
-    newFrame.origin.y = (point1.y > point2.y) ? point2.y : point1.y;
-    
-    newFrame.size.width = (point1.x > point2.x) ? point1.x - point2.x : point2.x - point1.x;
-    newFrame.size.height = (point1.y > point2.y) ? point1.y - point2.y : point2.y - point1.y;
-    
-    
-    self.currentAnnotation.frame = newFrame;
-    self.currentAnnotation.imageFrame = [self.view convertRect:self.imageView.frame toView:self.currentAnnotation];
-  } else {
-    [self.currentAnnotation setSelected:NO];
-    self.currentAnnotation = nil;
-  }
-}
-
-- (void)tapped:(UIGestureRecognizer *) __unused tapRecognizer {
-  
-  // TODO: remove pre-iOS 8 code.
-  
-  // This toggles the nav and status bar. Since iOS7 and pre-iOS7 behave weirdly different,
-  // this might look rather hacky, but hiding the navbar under iOS6 leads to some ugly
-  // animation effect which is avoided by simply hiding the navbar setting it's alpha to 0. // moritzh
-  
-  if (self.navigationController.navigationBar.alpha == 0 || self.navigationController.navigationBarHidden ){
-    
-    [UIView animateWithDuration:0.35 animations:^{
-      [self.navigationController setNavigationBarHidden:NO animated:NO];
-      
-      if ([self respondsToSelector:@selector(prefersStatusBarHidden)]) {
-        [self setNeedsStatusBarAppearanceUpdate];
-      } else {
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
-        [[UIApplication sharedApplication] setStatusBarHidden:NO];
-#pragma clang diagnostic pop
-      }
-      
-    } completion:^(BOOL __unused finished) {
-      [self fitImageViewFrame];
-      
-    }];
-  } else {
-    [UIView animateWithDuration:0.35 animations:^{
-      [self.navigationController setNavigationBarHidden:YES animated:NO];
-      
-      if ([self respondsToSelector:@selector(prefersStatusBarHidden)]) {
-        [self setNeedsStatusBarAppearanceUpdate];
-      } else {
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
-        [[UIApplication sharedApplication] setStatusBarHidden:YES];
-#pragma clang diagnostic pop
-      }
-      
-    } completion:^(BOOL __unused finished) {
-      [self fitImageViewFrame];
-      
-    }];
-  }
-  
-}
-
-#pragma mark - Helpers
-
-- (UIView *)firstAnnotationThatIsNotBlur {
-  for (BITImageAnnotation *annotation in self.imageView.subviews){
-    if (![annotation isKindOfClass:[BITBlurImageAnnotation class]]){
-      return annotation;
-    }
-  }
-  
-  return self.imageView;
-}
-
-- (BOOL)canDrawNewAnnotation {
-  return [self.editingControls selectedSegmentIndex] != UISegmentedControlNoSegment;
-}
-@end
-
-#endif /* HOCKEYSDK_FEATURE_FEEDBACK */
diff --git a/submodules/HockeySDK-iOS/Classes/BITInternal.h b/submodules/HockeySDK-iOS/Classes/BITInternal.h
deleted file mode 100644
index 9cbe2efde1..0000000000
--- a/submodules/HockeySDK-iOS/Classes/BITInternal.h
+++ /dev/null
@@ -1,8 +0,0 @@
-#import "BITTelemetryObject.h"
-
-@interface BITInternal : BITTelemetryObject <NSCoding>
-
-@property (nonatomic, copy) NSString *sdkVersion;
-@property (nonatomic, copy) NSString *agentVersion;
-
-@end
diff --git a/submodules/HockeySDK-iOS/Classes/BITInternal.m b/submodules/HockeySDK-iOS/Classes/BITInternal.m
deleted file mode 100644
index ed4d46e4a2..0000000000
--- a/submodules/HockeySDK-iOS/Classes/BITInternal.m
+++ /dev/null
@@ -1,39 +0,0 @@
-#import "BITInternal.h"
-
-/// Data contract class for type Internal.
-@implementation BITInternal
-
-///
-/// Adds all members of this class to a dictionary
-/// @returns dictionary to which the members of this class will be added.
-///
-- (NSDictionary *)serializeToDictionary {
-    NSMutableDictionary *dict = [super serializeToDictionary].mutableCopy;
-    if (self.sdkVersion != nil) {
-        [dict setObject:self.sdkVersion forKey:@"ai.internal.sdkVersion"];
-    }
-    if (self.agentVersion != nil) {
-        [dict setObject:self.agentVersion forKey:@"ai.internal.agentVersion"];
-    }
-    return dict;
-}
-
-#pragma mark - NSCoding
-
-- (instancetype)initWithCoder:(NSCoder *)coder {
-  self = [super init];
-  if(self) {
-    _sdkVersion = [coder decodeObjectForKey:@"self.sdkVersion"];
-    _agentVersion = [coder decodeObjectForKey:@"self.agentVersion"];
-  }
-
-  return self;
-}
-
-- (void)encodeWithCoder:(NSCoder *)coder {
-  [coder encodeObject:self.sdkVersion forKey:@"self.sdkVersion"];
-  [coder encodeObject:self.agentVersion forKey:@"self.agentVersion"];
-}
-
-
-@end
diff --git a/submodules/HockeySDK-iOS/Classes/BITKeychainUtils.h b/submodules/HockeySDK-iOS/Classes/BITKeychainUtils.h
deleted file mode 100644
index b7d7981166..0000000000
--- a/submodules/HockeySDK-iOS/Classes/BITKeychainUtils.h
+++ /dev/null
@@ -1,44 +0,0 @@
-//
-//  SFHFKeychainUtils.h
-//
-//  Created by Buzz Andersen on 10/20/08.
-//  Based partly on code by Jonathan Wight, Jon Crosby, and Mike Malone.
-//  Copyright 2008 Sci-Fi Hi-Fi. All rights reserved.
-//
-//  Permission is hereby granted, free of charge, to any person
-//  obtaining a copy of this software and associated documentation
-//  files (the "Software"), to deal in the Software without
-//  restriction, including without limitation the rights to use,
-//  copy, modify, merge, publish, distribute, sublicense, and/or sell
-//  copies of the Software, and to permit persons to whom the
-//  Software is furnished to do so, subject to the following
-//  conditions:
-//
-//  The above copyright notice and this permission notice shall be
-//  included in all copies or substantial portions of the Software.
-//
-//  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-//  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
-//  OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-//  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
-//  HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-//  WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-//  FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-//  OTHER DEALINGS IN THE SOFTWARE.
-//
-
-#import <UIKit/UIKit.h>
-
-
-@interface BITKeychainUtils : NSObject {
-  
-}
-
-+ (NSString *) getPasswordForUsername: (NSString *) username andServiceName: (NSString *) serviceName error: (NSError **) error;
-//uses the default kSecAttrAccessibleWhenUnlocked
-+ (BOOL) storeUsername: (NSString *) username andPassword: (NSString *) password forServiceName: (NSString *) serviceName updateExisting: (BOOL) updateExisting error: (NSError **) error;
-+ (BOOL) storeUsername: (NSString *) username andPassword: (NSString *) password forServiceName: (NSString *) serviceName updateExisting: (BOOL) updateExisting accessibility:(CFTypeRef) accessibility error: (NSError **) error;
-+ (BOOL) deleteItemForUsername: (NSString *) username andServiceName: (NSString *) serviceName error: (NSError **) error;
-+ (BOOL) purgeItemsForServiceName:(NSString *) serviceName error: (NSError **) error;
-
-@end
diff --git a/submodules/HockeySDK-iOS/Classes/BITKeychainUtils.m b/submodules/HockeySDK-iOS/Classes/BITKeychainUtils.m
deleted file mode 100644
index 9ec9eddb98..0000000000
--- a/submodules/HockeySDK-iOS/Classes/BITKeychainUtils.m
+++ /dev/null
@@ -1,313 +0,0 @@
-//
-//  SFHFKeychainUtils.m
-//
-//  Created by Buzz Andersen on 10/20/08.
-//  Based partly on code by Jonathan Wight, Jon Crosby, and Mike Malone.
-//  Copyright 2008 Sci-Fi Hi-Fi. All rights reserved.
-//
-//  Permission is hereby granted, free of charge, to any person
-//  obtaining a copy of this software and associated documentation
-//  files (the "Software"), to deal in the Software without
-//  restriction, including without limitation the rights to use,
-//  copy, modify, merge, publish, distribute, sublicense, and/or sell
-//  copies of the Software, and to permit persons to whom the
-//  Software is furnished to do so, subject to the following
-//  conditions:
-//
-//  The above copyright notice and this permission notice shall be
-//  included in all copies or substantial portions of the Software.
-//
-//  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-//  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
-//  OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-//  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
-//  HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-//  WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-//  FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-//  OTHER DEALINGS IN THE SOFTWARE.
-//
-
-#import "BITKeychainUtils.h"
-#import <Security/Security.h>
-
-static NSString *BITKeychainUtilsErrorDomain = @"BITKeychainUtilsErrorDomain";
-
-@implementation BITKeychainUtils
-
-+ (NSString *) getPasswordForUsername: (NSString *) username andServiceName: (NSString *) serviceName error: (NSError *__autoreleasing *) error {
-	if (!username || !serviceName) {
-		if (error != nil) {
-			*error = [NSError errorWithDomain: BITKeychainUtilsErrorDomain code: -2000 userInfo: nil];
-		}
-		return nil;
-	}
-	
-	if (error != nil) {
-		*error = nil;
-	}
-  
-	// Set up a query dictionary with the base query attributes: item type (generic), username, and service
-	
-	NSArray *keys = [[NSArray alloc] initWithObjects: (__bridge_transfer NSString *) kSecClass, kSecAttrAccount, kSecAttrService, nil];
-	NSArray *objects = [[NSArray alloc] initWithObjects: (__bridge_transfer NSString *) kSecClassGenericPassword, username, serviceName, nil];
-	
-	NSMutableDictionary *query = [[NSMutableDictionary alloc] initWithObjects: objects forKeys: keys];
-	
-	// First do a query for attributes, in case we already have a Keychain item with no password data set.
-	// One likely way such an incorrect item could have come about is due to the previous (incorrect)
-	// version of this code (which set the password as a generic attribute instead of password data).
-	
-	NSMutableDictionary *attributeQuery = [query mutableCopy];
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wcast-qual"
-	[attributeQuery setObject: (id) kCFBooleanTrue forKey:(__bridge_transfer id) kSecReturnAttributes];
-#pragma clang diagnostic pop
-  CFTypeRef attrResult = NULL;
-	OSStatus status = SecItemCopyMatching((__bridge CFDictionaryRef) attributeQuery, &attrResult);
-//  NSDictionary *attributeResult = (__bridge_transfer NSDictionary *)attrResult;
-  if (attrResult)
-    CFRelease(attrResult);
-  
-	if (status != noErr) {
-		// No existing item found--simply return nil for the password
-		if (error != nil && status != errSecItemNotFound) {
-			//Only return an error if a real exception happened--not simply for "not found."
-			*error = [NSError errorWithDomain: BITKeychainUtilsErrorDomain code: status userInfo: nil];
-		}
-		
-		return nil;
-	}
-	
-	// We have an existing item, now query for the password data associated with it.
-	
-	NSMutableDictionary *passwordQuery = [query mutableCopy];
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wcast-qual"
-	[passwordQuery setObject: (id) kCFBooleanTrue forKey: (__bridge_transfer id) kSecReturnData];
-#pragma clang diagnostic pop
-  CFTypeRef resData = NULL;
-	status = SecItemCopyMatching((__bridge CFDictionaryRef) passwordQuery, (CFTypeRef *) &resData);
-	NSData *resultData = (__bridge_transfer NSData *)resData;
-	
-	if (status != noErr) {
-		if (status == errSecItemNotFound) {
-			// We found attributes for the item previously, but no password now, so return a special error.
-			// Users of this API will probably want to detect this error and prompt the user to
-			// re-enter their credentials.  When you attempt to store the re-entered credentials
-			// using storeUsername:andPassword:forServiceName:updateExisting:error
-			// the old, incorrect entry will be deleted and a new one with a properly encrypted
-			// password will be added.
-			if (error != nil) {
-				*error = [NSError errorWithDomain: BITKeychainUtilsErrorDomain code: -1999 userInfo: nil];
-			}
-		}
-		else {
-			// Something else went wrong. Simply return the normal Keychain API error code.
-			if (error != nil) {
-				*error = [NSError errorWithDomain: BITKeychainUtilsErrorDomain code: status userInfo: nil];
-			}
-		}
-		
-		return nil;
-	}
-  
-	NSString *password = nil;
-  
-	if (resultData) {
-		password = [[NSString alloc] initWithData: resultData encoding: NSUTF8StringEncoding];
-	}
-	else {
-		// There is an existing item, but we weren't able to get password data for it for some reason,
-		// Possibly as a result of an item being incorrectly entered by the previous code.
-		// Set the -1999 error so the code above us can prompt the user again.
-		if (error != nil) {
-			*error = [NSError errorWithDomain: BITKeychainUtilsErrorDomain code: -1999 userInfo: nil];
-		}
-	}
-  
-	return password;
-}
-
-+ (BOOL) storeUsername: (NSString *) username andPassword: (NSString *) password forServiceName: (NSString *) serviceName updateExisting: (BOOL) updateExisting error: (NSError *__autoreleasing *) error {
-  return [self storeUsername:username andPassword:password forServiceName:serviceName updateExisting:updateExisting accessibility:kSecAttrAccessibleAlways error:error];
-}
-
-+ (BOOL) storeUsername: (NSString *) username andPassword: (NSString *) password forServiceName: (NSString *) serviceName updateExisting: (BOOL) updateExisting accessibility:(CFTypeRef) accessibility error: (NSError *__autoreleasing *) error
-{
-	if (!username || !password || !serviceName)
-  {
-		if (error != nil)
-    {
-			*error = [NSError errorWithDomain: BITKeychainUtilsErrorDomain code: -2000 userInfo: nil];
-		}
-		return NO;
-	}
-	
-	// See if we already have a password entered for these credentials.
-	NSError *getError = nil;
-	NSString *existingPassword = [BITKeychainUtils getPasswordForUsername: username andServiceName: serviceName error:&getError];
-  
-	if ([getError code] == -1999)
-  {
-		// There is an existing entry without a password properly stored (possibly as a result of the previous incorrect version of this code.
-		// Delete the existing item before moving on entering a correct one.
-    
-		getError = nil;
-		
-		[self deleteItemForUsername: username andServiceName: serviceName error: &getError];
-    
-		if ([getError code] != noErr)
-    {
-			if (error != nil)
-      {
-				*error = getError;
-			}
-			return NO;
-		}
-	}
-	else if ([getError code] != noErr)
-  {
-		if (error != nil)
-    {
-			*error = getError;
-		}
-		return NO;
-	}
-	
-	if (error != nil)
-  {
-		*error = nil;
-	}
-	
-	OSStatus status = noErr;
-  
-	if (existingPassword)
-  {
-		// We have an existing, properly entered item with a password.
-		// Update the existing item.
-		
-		if (![existingPassword isEqualToString:password] && updateExisting)
-    {
-			//Only update if we're allowed to update existing.  If not, simply do nothing.
-			
-			NSArray *keys = [[NSArray alloc] initWithObjects: (__bridge_transfer NSString *) kSecClass,
-                       kSecAttrService,
-                       kSecAttrLabel,
-                       kSecAttrAccount,
-                       kSecAttrAccessible,
-                       nil];
-			
-			NSArray *objects = [[NSArray alloc] initWithObjects: (__bridge_transfer NSString *) kSecClassGenericPassword,
-                          serviceName,
-                          serviceName,
-                          username,
-                          accessibility,
-                          nil];
-			
-			NSDictionary *query = [[NSDictionary alloc] initWithObjects: objects forKeys: keys];
-			
-			status = SecItemUpdate((__bridge CFDictionaryRef) query, (__bridge CFDictionaryRef) [NSDictionary dictionaryWithObject: (NSData *)[password dataUsingEncoding: NSUTF8StringEncoding] forKey: (__bridge_transfer NSString *) kSecValueData]);
-		}
-	}
-	else
-  {
-		// No existing entry (or an existing, improperly entered, and therefore now
-		// deleted, entry).  Create a new entry.
-		
-		NSArray *keys = [[NSArray alloc] initWithObjects: (__bridge_transfer NSString *) kSecClass,
-                     kSecAttrService,
-                     kSecAttrLabel,
-                     kSecAttrAccount,
-                     kSecValueData,
-                     kSecAttrAccessible,
-                     nil];
-		
-		NSArray *objects = [[NSArray alloc] initWithObjects: (__bridge_transfer NSString *) kSecClassGenericPassword,
-                        serviceName,
-                        serviceName,
-                        username,
-                        [password dataUsingEncoding: NSUTF8StringEncoding],
-                        accessibility,
-                        nil];
-		
-		NSDictionary *query = [[NSDictionary alloc] initWithObjects: objects forKeys: keys];
-    
-		status = SecItemAdd((__bridge CFDictionaryRef) query, NULL);
-	}
-	
-	if (error != nil && status != noErr)
-  {
-		// Something went wrong with adding the new item. Return the Keychain error code.
-		*error = [NSError errorWithDomain: BITKeychainUtilsErrorDomain code: status userInfo: nil];
-    
-    return NO;
-	}
-  
-  return YES;
-}
-
-+ (BOOL) deleteItemForUsername: (NSString *) username andServiceName: (NSString *) serviceName error: (NSError *__autoreleasing *) error
-{
-	if (!username || !serviceName)
-  {
-		if (error != nil)
-    {
-			*error = [NSError errorWithDomain: BITKeychainUtilsErrorDomain code: -2000 userInfo: nil];
-		}
-		return NO;
-	}
-	
-	if (error != nil)
-  {
-		*error = nil;
-	}
-  
-	NSArray *keys = [[NSArray alloc] initWithObjects: (__bridge_transfer NSString *) kSecClass, kSecAttrAccount, kSecAttrService, kSecReturnAttributes, nil];
-	NSArray *objects = [[NSArray alloc] initWithObjects: (__bridge_transfer NSString *) kSecClassGenericPassword, username, serviceName, kCFBooleanTrue, nil];
-	
-	NSDictionary *query = [[NSDictionary alloc] initWithObjects: objects forKeys: keys];
-	
-	OSStatus status = SecItemDelete((__bridge CFDictionaryRef) query);
-	
-	if (error != nil && status != noErr)
-  {
-		*error = [NSError errorWithDomain: BITKeychainUtilsErrorDomain code: status userInfo: nil];
-    
-    return NO;
-	}
-  
-  return YES;
-}
-
-+ (BOOL) purgeItemsForServiceName:(NSString *) serviceName error: (NSError *__autoreleasing *) error {
-  if (!serviceName)
-  {
-		if (error != nil)
-    {
-			*error = [NSError errorWithDomain: BITKeychainUtilsErrorDomain code: -2000 userInfo: nil];
-		}
-		return NO;
-	}
-	
-	if (error != nil)
-  {
-		*error = nil;
-	}
-  
-  NSMutableDictionary *searchData = [NSMutableDictionary new];
-  [searchData setObject:(__bridge id)kSecClassGenericPassword forKey:(__bridge id)kSecClass];
-  [searchData setObject:serviceName forKey:(__bridge id)kSecAttrService];
-  
-  OSStatus status = SecItemDelete((__bridge CFDictionaryRef)searchData);
-  
-	if (error != nil && status != noErr)
-  {
-		*error = [NSError errorWithDomain: BITKeychainUtilsErrorDomain code: status userInfo: nil];
-    
-    return NO;
-	}
-  
-  return YES;
-}
-
-@end
diff --git a/submodules/HockeySDK-iOS/Classes/BITMetricsManager.h b/submodules/HockeySDK-iOS/Classes/BITMetricsManager.h
deleted file mode 100644
index 6d5e3f2d5f..0000000000
--- a/submodules/HockeySDK-iOS/Classes/BITMetricsManager.h
+++ /dev/null
@@ -1,60 +0,0 @@
-#import "HockeySDKFeatureConfig.h"
-
-#if HOCKEYSDK_FEATURE_METRICS
-
-#import <Foundation/Foundation.h>
-#import "BITHockeyBaseManager.h"
-
-#import "HockeySDKNullability.h"
-NS_ASSUME_NONNULL_BEGIN
-
-/**
- The metrics module.
- 
- This is the HockeySDK module that handles users, sessions and events tracking.
- 
- Unless disabled, this module automatically tracks users and session of your app to give you
- better insights about how your app is being used.
- Users are tracked in a completely anonymous way without collecting any personally identifiable
- information.
- 
- Before starting to track events, ask yourself the questions that you want to get answers to.
- For instance, you might be interested in business, performance/quality or user experience aspects.
- Name your events in a meaningful way and keep in mind that you will use these names 
- when searching for events in the HockeyApp web portal.
- 
- It is your reponsibility to not collect personal information as part of the events tracking or get
- prior consent from your users as necessary.
- */
-@interface BITMetricsManager : BITHockeyBaseManager
-
-/**
- *  A property indicating whether the BITMetricsManager instance is disabled.
- */
-@property (nonatomic, assign) BOOL disabled;
-
-/**
- *  This method allows to track an event that happened in your app.
- *  Remember to choose meaningful event names to have the best experience when diagnosing your app
- *  in the HockeyApp web portal.
- *
- *  @param eventName The event's name as a string.
- */
-- (void)trackEventWithName:(nonnull NSString *)eventName;
-
-/**
- *  This method allows to track an event that happened in your app.
- *  Remember to choose meaningful event names to have the best experience when diagnosing your app
- *  in the web portal.
- *
- *  @param eventName the name of the event, which should be tracked.
- *  @param properties key value pairs with additional info about the event.
- *  @param measurements key value pairs, which contain custom metrics.
- */
-- (void)trackEventWithName:(nonnull NSString *)eventName properties:(nullable NSDictionary<NSString *, NSString *> *)properties measurements:(nullable NSDictionary<NSString *, NSNumber *> *)measurements;
-
-@end
-
-NS_ASSUME_NONNULL_END
-
-#endif /* HOCKEYSDK_FEATURE_METRICS */
diff --git a/submodules/HockeySDK-iOS/Classes/BITMetricsManager.m b/submodules/HockeySDK-iOS/Classes/BITMetricsManager.m
deleted file mode 100644
index d7dbeeecc5..0000000000
--- a/submodules/HockeySDK-iOS/Classes/BITMetricsManager.m
+++ /dev/null
@@ -1,291 +0,0 @@
-#import "HockeySDK.h"
-
-#if HOCKEYSDK_FEATURE_METRICS
-
-#import "BITMetricsManager.h"
-#import "BITTelemetryContext.h"
-#import "BITMetricsManagerPrivate.h"
-#import "BITHockeyHelper.h"
-#import "BITHockeyHelper+Application.h"
-#import "HockeySDKPrivate.h"
-#import "BITChannelPrivate.h"
-#import "BITEventData.h"
-#import "BITSession.h"
-#import "BITSessionState.h"
-#import "BITSessionStateData.h"
-#import "BITPersistencePrivate.h"
-#import "BITHockeyBaseManagerPrivate.h"
-#import "BITSender.h"
-
-NSString *const kBITApplicationWasLaunched = @"BITApplicationWasLaunched";
-
-static char *const kBITMetricsEventQueue = "net.hockeyapp.telemetryEventQueue";
-
-static NSString *const kBITSessionFileType = @"plist";
-static NSString *const kBITApplicationDidEnterBackgroundTime = @"BITApplicationDidEnterBackgroundTime";
-
-static NSString *const BITMetricsBaseURLString = @"https://gate.hockeyapp.net/";
-static NSString *const BITMetricsURLPathString = @"v2/track";
-
-@interface BITMetricsManager ()
-
-@property (nonatomic, strong) id<NSObject> appWillEnterForegroundObserver;
-@property (nonatomic, strong) id<NSObject> appDidEnterBackgroundObserver;
-
-@end
-
-@implementation BITMetricsManager
-
-@synthesize channel = _channel;
-@synthesize telemetryContext = _telemetryContext;
-@synthesize persistence = _persistence;
-@synthesize serverURL = _serverURL;
-@synthesize userDefaults = _userDefaults;
-
-#pragma mark - Create & start instance
-
-- (instancetype)init {
-  if ((self = [super init])) {
-    _disabled = NO;
-    _metricsEventQueue = dispatch_queue_create(kBITMetricsEventQueue, DISPATCH_QUEUE_CONCURRENT);
-    _appBackgroundTimeBeforeSessionExpires = 20;
-    _serverURL = [NSString stringWithFormat:@"%@%@", BITMetricsBaseURLString, BITMetricsURLPathString];
-  }
-  return self;
-}
-
-- (instancetype)initWithChannel:(BITChannel *)channel telemetryContext:(BITTelemetryContext *)telemetryContext persistence:(BITPersistence *)persistence userDefaults:(NSUserDefaults *)userDefaults {
-  if ((self = [self init])) {
-    _channel = channel;
-    _telemetryContext = telemetryContext;
-    _persistence = persistence;
-    _userDefaults = userDefaults;
-  }
-  return self;
-}
-
-- (void)startManager {
-  self.sender = [[BITSender alloc] initWithPersistence:self.persistence serverURL:(NSURL *)[NSURL URLWithString:self.serverURL]];
-  [self.sender sendSavedDataAsync];
-  [self startNewSessionWithId:bit_UUID()];
-  [self registerObservers];
-}
-
-#pragma mark - Configuration
-
-- (void)setDisabled:(BOOL)disabled {
-  if (_disabled == disabled) { return; }
-    _disabled = disabled;
-  if (disabled) {
-    [self unregisterObservers];
-  } else {
-    [self startManager];
-  }
-}
-
-#pragma mark - Sessions
-
-- (void)registerObservers {
-  NSNotificationCenter *center = [NSNotificationCenter defaultCenter];
-  __weak typeof(self) weakSelf = self;
-
-  if (nil == self.appDidEnterBackgroundObserver) {
-    self.appDidEnterBackgroundObserver =
-        [center addObserverForName:UIApplicationDidEnterBackgroundNotification
-                            object:nil
-                             queue:NSOperationQueue.mainQueue
-                        usingBlock:^(NSNotification __unused *note) {
-                          typeof(self) strongSelf = weakSelf;
-                          [strongSelf updateDidEnterBackgroundTime];
-                        }];
-  }
-  if (nil == self.appWillEnterForegroundObserver) {
-    self.appWillEnterForegroundObserver =
-        [center addObserverForName:UIApplicationWillEnterForegroundNotification
-                            object:nil
-                             queue:NSOperationQueue.mainQueue
-                        usingBlock:^(NSNotification __unused *note) {
-                          typeof(self) strongSelf = weakSelf;
-                          [strongSelf startNewSessionIfNeeded];
-                        }];
-  }
-}
-
-- (void)unregisterObservers {
-  NSNotificationCenter *center = [NSNotificationCenter defaultCenter];
-  id appDidEnterBackgroundObserver = self.appDidEnterBackgroundObserver;
-  if(appDidEnterBackgroundObserver) {
-    [center removeObserver:appDidEnterBackgroundObserver];
-    self.appDidEnterBackgroundObserver = nil;
-  }
-  id appWillEnterForegroundObserver = self.appWillEnterForegroundObserver;
-  if(appWillEnterForegroundObserver) {
-    [center removeObserver:appWillEnterForegroundObserver];
-    self.appWillEnterForegroundObserver = nil;
-  }
-}
-
-- (void)updateDidEnterBackgroundTime {
-  [self.userDefaults setDouble:[[NSDate date] timeIntervalSince1970] forKey:kBITApplicationDidEnterBackgroundTime];
-}
-
-- (void)startNewSessionIfNeeded {
-  double appDidEnterBackgroundTime = [self.userDefaults doubleForKey:kBITApplicationDidEnterBackgroundTime];
-  // Add safeguard in case this returns a negative value
-  if(appDidEnterBackgroundTime < 0) {
-    appDidEnterBackgroundTime = 0;
-    [self.userDefaults setDouble:0 forKey:kBITApplicationDidEnterBackgroundTime];
-  }
-  double timeSinceLastBackground = [[NSDate date] timeIntervalSince1970] - appDidEnterBackgroundTime;
-  if (timeSinceLastBackground > self.appBackgroundTimeBeforeSessionExpires) {
-    [self startNewSessionWithId:bit_UUID()];
-  }
-}
-
-- (void)startNewSessionWithId:(NSString *)sessionId {
-  BITSession *newSession = [self createNewSessionWithId:sessionId];
-  [self.telemetryContext setSessionId:newSession.sessionId];
-  [self.telemetryContext setIsFirstSession:newSession.isFirst];
-  [self.telemetryContext setIsNewSession:newSession.isNew];
-  [self trackSessionWithState:BITSessionState_start];
-}
-
-- (BITSession *)createNewSessionWithId:(NSString *)sessionId {
-  BITSession *session = [BITSession new];
-  session.sessionId = sessionId;
-  session.isNew = @"true";
-
-  if (![self.userDefaults boolForKey:kBITApplicationWasLaunched]) {
-    session.isFirst = @"true";
-    [self.userDefaults setBool:YES forKey:kBITApplicationWasLaunched];
-  } else {
-    session.isFirst = @"false";
-  }
-  return session;
-}
-
-#pragma mark - Track telemetry
-
-#pragma mark Sessions
-
-- (void)trackSessionWithState:(BITSessionState)state {
-  if (self.disabled) {
-    BITHockeyLogDebug(@"INFO: BITMetricsManager is disabled, therefore this tracking call was ignored.");
-    return;
-  }
-  BITSessionStateData *sessionStateData = [BITSessionStateData new];
-  sessionStateData.state = state;
-  [self.channel enqueueTelemetryItem:sessionStateData];
-}
-
-#pragma mark Events
-
-- (void)trackEventWithName:(nonnull NSString *)eventName {
-  if (!eventName) {
-    return;
-  }
-  if (self.disabled) {
-    BITHockeyLogDebug(@"INFO: BITMetricsManager is disabled, therefore this tracking call was ignored.");
-    return;
-  }
-  
-  __weak typeof(self) weakSelf = self;
-  dispatch_group_t group = dispatch_group_create();
-  dispatch_group_async(group, self.metricsEventQueue, ^{
-    typeof(self) strongSelf = weakSelf;
-    BITEventData *eventData = [BITEventData new];
-    [eventData setName:eventName];
-    [strongSelf trackDataItem:eventData];
-  });
-  
-  // If the app is running in the background.
-  UIApplication *application = [UIApplication sharedApplication];
-  BOOL applicationIsInBackground = ([BITHockeyHelper applicationState] == BITApplicationStateBackground);
-  if (applicationIsInBackground) {
-    [self.channel createBackgroundTaskWhileDataIsSending:application withWaitingGroup:group];
-  }
-}
-
-- (void)trackEventWithName:(nonnull NSString *)eventName
-                properties:(nullable NSDictionary<NSString *, NSString *> *)properties
-              measurements:(nullable NSDictionary<NSString *, NSNumber *> *)measurements {
-  if (!eventName) {
-    return;
-  }
-  if (self.disabled) {
-    BITHockeyLogDebug(@"INFO: BITMetricsManager is disabled, therefore this tracking call was ignored.");
-    return;
-  }
-
-  __weak typeof(self) weakSelf = self;
-  dispatch_group_t group = dispatch_group_create();
-  dispatch_group_async(group, self.metricsEventQueue, ^{
-    typeof(self) strongSelf = weakSelf;
-    BITEventData *eventData = [BITEventData new];
-    [eventData setName:eventName];
-    [eventData setProperties:(NSDictionary *)properties];
-    [eventData setMeasurements:measurements];
-    [strongSelf trackDataItem:eventData];
-  });
-  
-  // If the app is running in the background.
-  UIApplication *application = [UIApplication sharedApplication];
-  BOOL applicationIsInBackground = ([BITHockeyHelper applicationState] == BITApplicationStateBackground);
-  if (applicationIsInBackground) {
-    [self.channel createBackgroundTaskWhileDataIsSending:application withWaitingGroup:group];
-  }
-}
-
-#pragma mark Track DataItem
-
-- (void)trackDataItem:(BITTelemetryData *)dataItem {
-  if (self.disabled) {
-    BITHockeyLogDebug(@"INFO: BITMetricsManager is disabled, therefore this tracking call was ignored.");
-    return;
-  }
-  
-  BITHockeyLogDebug(@"INFO: Enqueue telemetry item: %@", dataItem.name);
-  [self.channel enqueueTelemetryItem:dataItem];
-}
-
-#pragma mark - Custom getter
-
-- (BITChannel *)channel {
-  @synchronized(self) {
-    if (!_channel) {
-      _channel = [[BITChannel alloc] initWithTelemetryContext:self.telemetryContext persistence:self.persistence];
-    }
-    return _channel;
-  }
-}
-
-- (BITTelemetryContext *)telemetryContext {
-  @synchronized(self) {
-    if (!_telemetryContext) {
-      _telemetryContext = [[BITTelemetryContext alloc] initWithAppIdentifier:self.appIdentifier persistence:self.persistence];
-    }
-    return _telemetryContext;
-  }
-}
-
-- (BITPersistence *)persistence {
-  @synchronized(self) {
-    if (!_persistence) {
-      _persistence = [BITPersistence new];
-    }
-    return _persistence;
-  }
-}
-
-- (NSUserDefaults *)userDefaults {
-  @synchronized(self) {
-    if (!_userDefaults) {
-      _userDefaults = [NSUserDefaults standardUserDefaults];
-    }
-    return _userDefaults;
-  }
-}
-
-@end
-
-#endif /* HOCKEYSDK_FEATURE_METRICS */
diff --git a/submodules/HockeySDK-iOS/Classes/BITMetricsManagerPrivate.h b/submodules/HockeySDK-iOS/Classes/BITMetricsManagerPrivate.h
deleted file mode 100644
index cee0f9ae76..0000000000
--- a/submodules/HockeySDK-iOS/Classes/BITMetricsManagerPrivate.h
+++ /dev/null
@@ -1,125 +0,0 @@
-#import "HockeySDKFeatureConfig.h"
-
-#if HOCKEYSDK_FEATURE_METRICS
-
-#import "BITMetricsManager.h"
-#import "BITSessionState.h"
-
-@class BITChannel;
-@class BITTelemetryContext;
-@class BITSession;
-@class BITPersistence;
-@class BITSender;
-
-#import "HockeySDKNullability.h"
-NS_ASSUME_NONNULL_BEGIN
-
-FOUNDATION_EXPORT NSString *const kBITApplicationWasLaunched;
-
-@interface BITMetricsManager()
-
-/**
- *  Create a new BITMetricsManager instance by passing the channel, the telemetry context, and persistence instance to use 
- for processing metrics. This method can be used for dependency injection.
- */
-- (instancetype)initWithChannel:(BITChannel *)channel
-               telemetryContext:(BITTelemetryContext *)telemetryContext
-                    persistence:(BITPersistence *)persistence
-                   userDefaults:(NSUserDefaults *)userDefaults;
-
-/**
- *  The user defaults object used to store meta data.
- */
-@property (nonatomic, strong, readonly) NSUserDefaults *userDefaults;
-
-/**
- *  A channel for collecting new events before storing and sending them.
- */
-@property (nonatomic, strong, readonly) BITPersistence *persistence;
-
-/**
- *  A channel for collecting new events before storing and sending them.
- */
-@property (nonatomic, strong, readonly) BITChannel *channel;
-
-/**
- *  A telemetry context which is used to add meta info to events, before they're sent out.
- */
-@property (nonatomic, strong, readonly) BITTelemetryContext *telemetryContext;
-
-/**
- *  A concurrent queue which creates and processes telemetry items.
- */
-@property (nonatomic, strong, readonly) dispatch_queue_t metricsEventQueue;
-
-/**
- *  Sender instance to send out telemetry data.
- */
-@property (nonatomic, strong) BITSender *sender;
-
-///-----------------------------------------------------------------------------
-/// @name Session Management
-///-----------------------------------------------------------------------------
-
-/**
- *  The Interval an app has to be in the background until the current session gets renewed.
- */
-@property (nonatomic, assign) NSUInteger appBackgroundTimeBeforeSessionExpires;
-
-/**
- *  Registers manager for several notifications, which influence the session state.
- */
-- (void)registerObservers;
-
-/**
- *  Unregisters manager for several notifications, which influence the session state.
- */
-- (void)unregisterObservers;
-
-/**
- *  Stores the current date before app is sent to background.
- *
- *  @see appBackgroundTimeBeforeSessionExpires
- *  @see startNewSessionIfNeeded
- */
-- (void)updateDidEnterBackgroundTime;
-
-/**
- *  Determines whether the current session needs to be renewed or not.
- *
- *  @see appBackgroundTimeBeforeSessionExpires
- *  @see updateDidEnterBackgroundTime
- */
-- (void)startNewSessionIfNeeded;
-
-/**
- *  Creates a new session, updates the session context and sends it to the channel.
- *
- *  @param sessionId the id for the new session
- */
-- (void)startNewSessionWithId:(NSString *)sessionId;
-
-/**
- *  Creates a new session and stores it to NSUserDefaults.
- *
- *  @param sessionId the id for the new session
- *  @return the newly created session
- */
-- (BITSession *)createNewSessionWithId:(NSString *)sessionId;
-
-///-----------------------------------------------------------------------------
-/// @name Track telemetry data
-///-----------------------------------------------------------------------------
-
-/**
- *  Creates and enqueues a session event for the given state.
- *
- *  @param state value that determines whether the session started or ended
- */
-- (void)trackSessionWithState:(BITSessionState)state;
-
-@end
-
-NS_ASSUME_NONNULL_END
-
-#endif /* HOCKEYSDK_FEATURE_METRICS */
diff --git a/submodules/HockeySDK-iOS/Classes/BITPersistence.h b/submodules/HockeySDK-iOS/Classes/BITPersistence.h
deleted file mode 100644
index dd2ac4f158..0000000000
--- a/submodules/HockeySDK-iOS/Classes/BITPersistence.h
+++ /dev/null
@@ -1,9 +0,0 @@
-#import <Foundation/Foundation.h>
-
-/**
- * A simple class that handles serialisation and deserialisation of bundles of data.
- */
-@interface BITPersistence : NSObject
-
-@end
-
diff --git a/submodules/HockeySDK-iOS/Classes/BITPersistence.m b/submodules/HockeySDK-iOS/Classes/BITPersistence.m
deleted file mode 100644
index cd3646af81..0000000000
--- a/submodules/HockeySDK-iOS/Classes/BITPersistence.m
+++ /dev/null
@@ -1,305 +0,0 @@
-#import "HockeySDK.h"
-
-#if HOCKEYSDK_FEATURE_METRICS
-
-#import "BITPersistence.h"
-#import "BITPersistencePrivate.h"
-#import "HockeySDKPrivate.h"
-#import "BITHockeyHelper.h"
-
-NSString *const BITPersistenceSuccessNotification = @"BITHockeyPersistenceSuccessNotification";
-
-static NSString *const kBITTelemetry = @"Telemetry";
-static NSString *const kBITMetaData = @"MetaData";
-static NSString *const kBITFileBaseString = @"hockey-app-bundle-";
-static NSString *const kBITFileBaseStringMeta = @"metadata";
-
-static NSString *const kBITHockeyDirectory = @"com.microsoft.HockeyApp";
-static NSString *const kBITTelemetryDirectory = @"Telemetry";
-static NSString *const kBITMetaDataDirectory = @"MetaData";
-
-static char const *kBITPersistenceQueueString = "com.microsoft.HockeyApp.persistenceQueue";
-static NSUInteger const BITDefaultFileCount = 50;
-
-@interface BITPersistence ()
-
-@property (nonatomic) BOOL directorySetupComplete;
-
-@end
-
-@implementation BITPersistence
-
-#pragma mark - Public
-
-- (instancetype)init {
-  self = [super init];
-  if (self) {
-    _persistenceQueue = dispatch_queue_create(kBITPersistenceQueueString, DISPATCH_QUEUE_SERIAL); //TODO several queues?
-    _requestedBundlePaths = [NSMutableArray new];
-    _maxFileCount = BITDefaultFileCount;
-
-    // Evantually, there will be old files on disk, the flag will be updated before the first event gets created
-    _directorySetupComplete = NO; //will be set to true in createDirectoryStructureIfNeeded
-
-    [self createDirectoryStructureIfNeeded];
-  }
-  return self;
-}
-
-/**
- * Saves the Bundle using NSKeyedArchiver and NSData's writeToFile:atomically
- * Sends out a BITHockeyPersistenceSuccessNotification in case of success
- */
-- (void)persistBundle:(NSData *)bundle {
-  //TODO send out a fail notification?
-  NSString *fileURL = [self fileURLForType:BITPersistenceTypeTelemetry];
-
-  if (bundle) {
-    __weak typeof(self) weakSelf = self;
-    dispatch_async(self.persistenceQueue, ^{
-      typeof(self) strongSelf = weakSelf;
-      BOOL success = [bundle writeToFile:fileURL atomically:YES];
-      if (success) {
-        BITHockeyLogDebug(@"INFO: Wrote bundle to %@", fileURL);
-        [strongSelf sendBundleSavedNotification];
-      }
-      else {
-        BITHockeyLogError(@"Error writing bundle to %@", fileURL);
-      }
-    });
-  }
-  else {
-    BITHockeyLogWarning(@"WARNING: Unable to write %@ as provided bundle was null", fileURL);
-  }
-}
-
-- (void)persistMetaData:(NSDictionary *)metaData {
-  NSString *fileURL = [self fileURLForType:BITPersistenceTypeMetaData];
-  //TODO send out a notification, too?!
-  dispatch_async(self.persistenceQueue, ^{
-    [NSKeyedArchiver archiveRootObject:metaData toFile:fileURL];
-  });
-}
-
-- (BOOL)isFreeSpaceAvailable {
-  NSArray *files = [self persistedFilesForType:BITPersistenceTypeTelemetry];
-  return files.count < self.maxFileCount;
-}
-
-- (NSString *)requestNextFilePath {
-  __block NSString *path = nil;
-  __weak typeof(self) weakSelf = self;
-  dispatch_sync(self.persistenceQueue, ^() {
-    typeof(self) strongSelf = weakSelf;
-
-    path = [strongSelf nextURLOfType:BITPersistenceTypeTelemetry];
-
-    if (path) {
-      [self.requestedBundlePaths addObject:path];
-    }
-  });
-  return path;
-}
-
-- (NSDictionary *)metaData {
-  NSString *filePath = [self fileURLForType:BITPersistenceTypeMetaData];
-  NSObject *bundle = [self bundleAtFilePath:filePath withFileBaseString:kBITFileBaseStringMeta];
-  if ([bundle isKindOfClass:NSDictionary.class]) {
-    return (NSDictionary *) bundle;
-  }
-  BITHockeyLogDebug(@"INFO: The context meta data file could not be loaded.");
-  return [NSDictionary dictionary];
-}
-
-- (NSObject *)bundleAtFilePath:(NSString *)filePath withFileBaseString:(NSString *)filebaseString {
-  id bundle = nil;
-  if (filePath && [filePath rangeOfString:filebaseString].location != NSNotFound) {
-    bundle = [NSKeyedUnarchiver unarchiveObjectWithFile:filePath];
-  }
-  return bundle;
-}
-
-- (NSData *)dataAtFilePath:(NSString *)path {
-  NSData *data = nil;
-  if (path && [path rangeOfString:kBITFileBaseString].location != NSNotFound) {
-    data = [NSData dataWithContentsOfFile:path];
-  }
-  return data;
-}
-
-/**
- * Deletes a file at the given path.
- *
- * @param path The path to look for a file and delete it.
- */
-- (void)deleteFileAtPath:(NSString *)path {
-  __weak typeof(self) weakSelf = self;
-  dispatch_sync(self.persistenceQueue, ^() {
-    typeof(self) strongSelf = weakSelf;
-    if ([path rangeOfString:kBITFileBaseString].location != NSNotFound) {
-      NSError *error = nil;
-      if (![[NSFileManager defaultManager] removeItemAtPath:path error:&error]) {
-        BITHockeyLogError(@"Error deleting file at path %@", path);
-      }
-      else {
-        BITHockeyLogDebug(@"INFO: Successfully deleted file at path %@", path);
-        [strongSelf.requestedBundlePaths removeObject:path];
-      }
-    } else {
-      BITHockeyLogDebug(@"INFO: Empty path, nothing to delete");
-    }
-  });
-
-}
-
-- (void)giveBackRequestedFilePath:(NSString *)filePath {
-  __weak typeof(self) weakSelf = self;
-  dispatch_async(self.persistenceQueue, ^() {
-    typeof(self) strongSelf = weakSelf;
-
-    [strongSelf.requestedBundlePaths removeObject:filePath];
-  });
-}
-
-#pragma mark - Private
-
-- (nullable NSString *)fileURLForType:(BITPersistenceType)type {
-
-  NSString *fileName = nil;
-  NSString *filePath;
-
-  switch (type) {
-    case BITPersistenceTypeMetaData: {
-      fileName = kBITFileBaseStringMeta;
-      filePath = [self.appHockeySDKDirectoryPath stringByAppendingPathComponent:kBITMetaDataDirectory];
-      break;
-    };
-    case BITPersistenceTypeTelemetry: {
-      NSString *uuid = bit_UUID();
-      fileName = [NSString stringWithFormat:@"%@%@", kBITFileBaseString, uuid];
-      filePath = [self.appHockeySDKDirectoryPath stringByAppendingPathComponent:kBITTelemetryDirectory];
-      break;
-    };
-  }
-
-  filePath = [filePath stringByAppendingPathComponent:fileName];
-
-  return filePath;
-}
-
-/**
- * Create directory structure if necessary and exclude it from iCloud backup
- */
-- (void)createDirectoryStructureIfNeeded {
-  // Using the local variable looks unnecessary but it actually silences a static analyzer warning.
-  NSString *appHockeySDKDirectoryPath = [self appHockeySDKDirectoryPath];
-  NSURL *appURL = [NSURL fileURLWithPath:appHockeySDKDirectoryPath];
-  NSFileManager *fileManager = [NSFileManager defaultManager];
-  if (appURL) {
-    NSError *error = nil;
-    
-    // Create HockeySDK folder if needed
-    if (![fileManager createDirectoryAtURL:appURL withIntermediateDirectories:YES attributes:nil error:&error]) {
-      BITHockeyLogError(@"ERROR: %@", error.localizedDescription);
-      return;
-    }
-    
-    // Create metadata subfolder
-    NSURL *metaDataURL = [appURL URLByAppendingPathComponent:kBITMetaDataDirectory];
-    if (![fileManager createDirectoryAtURL:metaDataURL withIntermediateDirectories:YES attributes:nil error:&error]) {
-      BITHockeyLogError(@"ERROR: %@", error.localizedDescription);
-      return;
-    }
-    
-    // Create telemetry subfolder
-    
-    //NOTE: createDirectoryAtURL:withIntermediateDirectories:attributes:error
-    //will return YES if the directory already exists and won't override anything.
-    //No need to check if the directory already exists.
-    NSURL *telemetryURL = [appURL URLByAppendingPathComponent:kBITTelemetryDirectory];
-    if (![fileManager createDirectoryAtURL:telemetryURL withIntermediateDirectories:YES attributes:nil error:&error]) {
-      BITHockeyLogError(@"ERROR: %@", error.localizedDescription);
-      return;
-    }
-    
-    //Exclude HockeySDK folder from backup
-    if (![appURL setResourceValue:@YES
-                           forKey:NSURLIsExcludedFromBackupKey
-                            error:&error]) {
-      BITHockeyLogError(@"ERROR: Error excluding %@ from backup %@", appURL.lastPathComponent, error.localizedDescription);
-    } else {
-      BITHockeyLogDebug(@"INFO: Exclude %@ from backup", appURL);
-    }
-    
-    self.directorySetupComplete = YES;
-  }
-}
-
-/**
- * @returns the URL to the next file depending on the specified type. If there's no file, return nil.
- */
-- (NSString *)nextURLOfType:(BITPersistenceType)type {
-  NSArray<NSURL *> *fileNames = [self persistedFilesForType:type];
-  if (fileNames && fileNames.count > 0) {
-    for (NSURL *filename in fileNames) {
-      NSString *absolutePath = filename.path;
-      if (![self.requestedBundlePaths containsObject:absolutePath]) {
-        return absolutePath;
-      }
-    }
-  }
-  return nil;
-}
-
-- (NSArray *)persistedFilesForType: (BITPersistenceType)type {
-  NSString *directoryPath = [self folderPathForType:type];
-  NSError *error = nil;
-  NSArray<NSURL *> *fileNames = [[NSFileManager defaultManager] contentsOfDirectoryAtURL:[NSURL fileURLWithPath:directoryPath]
-                                                              includingPropertiesForKeys:@[NSURLNameKey]
-                                                                                 options:NSDirectoryEnumerationSkipsHiddenFiles
-                                                                                   error:&error];
-  return fileNames;
-}
-
-- (NSString *)folderPathForType:(BITPersistenceType)type {
-  NSString *subFolder = @"";
-  switch (type) {
-    case BITPersistenceTypeTelemetry: {
-      subFolder = kBITTelemetryDirectory;
-      break;
-    }
-    case BITPersistenceTypeMetaData: {
-      subFolder = kBITMetaDataDirectory;
-      break;
-    }
-  }
-  return [self.appHockeySDKDirectoryPath stringByAppendingPathComponent:subFolder];
-}
-
-/**
- * Send a BITHockeyPersistenceSuccessNotification to the main thread to notify observers that we have successfully saved a file
- * This is typically used to trigger sending.
- */
-- (void)sendBundleSavedNotification {
-  dispatch_async(dispatch_get_main_queue(), ^{
-    BITHockeyLogDebug(@"Sending notification: %@", BITPersistenceSuccessNotification);
-    [[NSNotificationCenter defaultCenter] postNotificationName:BITPersistenceSuccessNotification
-                                                        object:nil
-                                                      userInfo:nil];
-  });
-}
-
-- (NSString *)appHockeySDKDirectoryPath {
-  if (!_appHockeySDKDirectoryPath) {
-    NSString *appSupportPath = [[NSSearchPathForDirectoriesInDomains(NSApplicationSupportDirectory, NSUserDomainMask, YES) lastObject] stringByStandardizingPath];
-    if (appSupportPath) {
-      _appHockeySDKDirectoryPath = [appSupportPath stringByAppendingPathComponent:kBITHockeyDirectory];
-    }
-  }
-  return _appHockeySDKDirectoryPath;
-}
-
-@end
-
-#endif /* HOCKEYSDK_FEATURE_METRICS */
-
diff --git a/submodules/HockeySDK-iOS/Classes/BITPersistencePrivate.h b/submodules/HockeySDK-iOS/Classes/BITPersistencePrivate.h
deleted file mode 100644
index 9bba4df43e..0000000000
--- a/submodules/HockeySDK-iOS/Classes/BITPersistencePrivate.h
+++ /dev/null
@@ -1,144 +0,0 @@
-#import "HockeySDKFeatureConfig.h"
-
-#if HOCKEYSDK_FEATURE_METRICS
-
-#import "BITPersistence.h"
-
-#import "HockeySDKNullability.h"
-NS_ASSUME_NONNULL_BEGIN
-
-@interface BITPersistence ()
-
-/**
- * The BITPersistenceType determines if we have a bundle of meta data or telemetry that we want to safe.
- */
-typedef NS_ENUM(NSInteger, BITPersistenceType) {
-    BITPersistenceTypeTelemetry = 0,
-    BITPersistenceTypeMetaData = 1
-};
-
-/**
- * Notification that will be send on the main thread to notifiy observers of a successfully saved bundle.
- * This is typically used to trigger sending to the server.
- */
-FOUNDATION_EXPORT NSString *const BITPersistenceSuccessNotification;
-
-///-----------------------------------------------------------------------------
-/// @name Save/delete bundle of data
-///-----------------------------------------------------------------------------
-
-/**
- *  A queue which makes file system operations thread safe.
- */
-@property (nonatomic, strong) dispatch_queue_t persistenceQueue;
-
-/**
- *  Determines how many telemetry files can be on disk at a time.
- */
-@property (nonatomic, assign) NSUInteger maxFileCount;
-
-@property (nonatomic, copy) NSString *appHockeySDKDirectoryPath;
-
-/**
- *  An array with all file paths, that have been requested by the sender. If the sender
- *  triggers a delete, the appropriate path should also be removed here. We keep to
- *  track of requested bundles to make sure that bundles don't get sent twice at the same
- *  time by differend http operations.
- */
-@property (nonatomic, strong) NSMutableArray *requestedBundlePaths;
-
-/**
- *  Saves the bundle to disk.
- *
- *  @param bundle            the bundle, which should be saved to disk
- */
-- (void)persistBundle:(NSData *)bundle;
-
-/**
- *  Saves the given dictionary to the session Ids file.
- *
- *  @param metaData a dictionary consisting of unix timestamps and session ids
- */
-- (void)persistMetaData:(NSDictionary *)metaData;
-
-/**
- *  Deletes the file for the given path.
- *
- *  @param path the path of the file, which should be deleted
- */
-- (void)deleteFileAtPath:(NSString *)path;
-
-/**
- *  Determines whether the persistence layer is able to write more files to disk.
- *
- *  @return YES if the maxFileCount has not been reached, yet (otherwise NO).
- */
-- (BOOL)isFreeSpaceAvailable;
-
-///-----------------------------------------------------------------------------
-/// @name Get a bundle of saved data
-///-----------------------------------------------------------------------------
-
-/**
- *  Returns the path for the next item to send. The requested path is reserved as long
- *  as leaveUpRequestedPath: gets called.
- *
- *  @see giveBackRequestedPath:
- *
- *  @return the path of the item, which should be sent next
- */
-- (nullable NSString *)requestNextFilePath;
-
-/**
- *  Release a requested path. This method should be called after sending a file failed.
- *
- *  @param filePath The path that should be available for sending again.
- */
-- (void)giveBackRequestedFilePath:(NSString *)filePath;
-
-/**
- *  Return the json data for a given path
- *
- *  @param filePath The path of the file
- *
- *  @return a data object which contains telemetry data in json representation
- */
-- (nullable NSData *)dataAtFilePath:(NSString *)filePath;
-
-/**
- *  Returns the content of the session Ids file.
- *
- *  @return return a dictionary containing all session Ids
- */
-- (NSDictionary *)metaData;
-
-///-----------------------------------------------------------------------------
-/// @name Getting a path
-///-----------------------------------------------------------------------------
-
-/**
- *  Returns a folder path for items of a given type.
- *  @param type The type
- *  @return a folder path for items of a given type
- */
-- (NSString *)folderPathForType:(BITPersistenceType)type;
-
-///-----------------------------------------------------------------------------
-/// @name Getting a path
-///-----------------------------------------------------------------------------
-
-/**
- * Creates the path for a file
- * The filename includes the timestamp.
- *
- * @param type The type that you want the fileURL for
-*/
-- (nullable NSString *)fileURLForType:(BITPersistenceType)type;
-
-- (void)createDirectoryStructureIfNeeded;
-
-#endif /* HOCKEYSDK_FEATURE_METRICS */
-
-@end
-
-NS_ASSUME_NONNULL_END
diff --git a/submodules/HockeySDK-iOS/Classes/BITRectangleImageAnnotation.h b/submodules/HockeySDK-iOS/Classes/BITRectangleImageAnnotation.h
deleted file mode 100644
index 024957998a..0000000000
--- a/submodules/HockeySDK-iOS/Classes/BITRectangleImageAnnotation.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Author: Moritz Haarmann <post@moritzhaarmann.de>
- *
- * Copyright (c) 2012-2014 HockeyApp, Bit Stadium GmbH.
- * All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person
- * obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without
- * restriction, including without limitation the rights to use,
- * copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following
- * conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
- * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#import "BITImageAnnotation.h"
-
-@interface BITRectangleImageAnnotation : BITImageAnnotation
-
-@end
diff --git a/submodules/HockeySDK-iOS/Classes/BITRectangleImageAnnotation.m b/submodules/HockeySDK-iOS/Classes/BITRectangleImageAnnotation.m
deleted file mode 100644
index ed20737dc7..0000000000
--- a/submodules/HockeySDK-iOS/Classes/BITRectangleImageAnnotation.m
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
- * Author: Moritz Haarmann <post@moritzhaarmann.de>
- *
- * Copyright (c) 2012-2014 HockeyApp, Bit Stadium GmbH.
- * All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person
- * obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without
- * restriction, including without limitation the rights to use,
- * copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following
- * conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
- * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#import "HockeySDK.h"
-
-#if HOCKEYSDK_FEATURE_FEEDBACK
-
-#import "BITRectangleImageAnnotation.h"
-
-@interface BITRectangleImageAnnotation()
-
-@property (nonatomic, strong) CAShapeLayer *shapeLayer;
-@property (nonatomic, strong) CAShapeLayer *strokeLayer;
-
-@end
-
-@implementation BITRectangleImageAnnotation
-
-- (instancetype)initWithFrame:(CGRect)frame {
-    self = [super initWithFrame:frame];
-    if (self) {
-      self.shapeLayer = [CAShapeLayer layer];
-      self.shapeLayer.strokeColor = [UIColor redColor].CGColor;
-      self.shapeLayer.lineWidth = 5;
-      self.shapeLayer.fillColor = [UIColor clearColor].CGColor;
-      
-      self.strokeLayer = [CAShapeLayer layer];
-      self.strokeLayer.strokeColor = [UIColor whiteColor].CGColor;
-      self.strokeLayer.lineWidth = 10;
-      self.strokeLayer.fillColor = [UIColor clearColor].CGColor;
-      [self.layer addSublayer:self.strokeLayer];
-
-      [self.layer addSublayer:self.shapeLayer];
-    
-    }
-    return self;
-}
-
-- (void)layoutSubviews {
-  [super layoutSubviews];
-  
-  self.shapeLayer.frame = self.bounds;
-  self.shapeLayer.path = [UIBezierPath bezierPathWithRoundedRect:self.bounds cornerRadius:10].CGPath;
-  
-  
-  self.strokeLayer.frame = self.bounds;
-  self.strokeLayer.path = [UIBezierPath bezierPathWithRoundedRect:self.bounds cornerRadius:10].CGPath;
-  
-  CGFloat lineWidth = MAX(self.frame.size.width / 10,10);
-  
-  [CATransaction begin];
-  [CATransaction setAnimationDuration:0];
-  self.strokeLayer.lineWidth = lineWidth/(CGFloat)1.5;
-  self.shapeLayer.lineWidth = lineWidth /(CGFloat)3.0;
-  
-  [CATransaction commit];
-}
-
-- (BOOL)resizable {
-  return YES;
-}
-
-
-@end
-
-#endif /* HOCKEYSDK_FEATURE_FEEDBACK */
diff --git a/submodules/HockeySDK-iOS/Classes/BITSender.h b/submodules/HockeySDK-iOS/Classes/BITSender.h
deleted file mode 100644
index 8ebe6e81d4..0000000000
--- a/submodules/HockeySDK-iOS/Classes/BITSender.h
+++ /dev/null
@@ -1,129 +0,0 @@
-#import <Foundation/Foundation.h>
-#import "HockeySDK.h"
-
-#if HOCKEYSDK_FEATURE_METRICS
-
-@class BITPersistence;
-
-#import "HockeySDKNullability.h"
-NS_ASSUME_NONNULL_BEGIN
-
-/**
- * Utility class that's responsible for sending a bundle of data to the server
- */
-@interface BITSender : NSObject
-
-/**
- * Notification that will be send on the main thread to notifiy observers of finish sending data.
- */
-FOUNDATION_EXPORT NSString *const BITSenderFinishSendingDataNotification;
-
-///-----------------------------------------------------------------------------
-/// @name Initialize instance
-///-----------------------------------------------------------------------------
-
-/**
- *  Initializes a sender instance with a given persistence object.
- *
- *  @param persistence used for loading files before sending them out
- *  @param serverURL the endpoint URL for telemetry data
- *  @return an initialized sender instance
- */
-- (instancetype)initWithPersistence:(BITPersistence *)persistence serverURL:(NSURL *)serverURL;
-
-/**
- *  A queue which is used to handle completion blocks.
- */
-@property (nonatomic, strong) dispatch_queue_t senderTasksQueue;
-
-/**
- *  The endpoint url of the telemetry server.
- */
-@property (nonatomic, copy) NSString *endpointPath;
-
-/**
- *  The max number of request that can run at a time.
- */
-@property (nonatomic, assign) NSUInteger maxRequestCount;
-
-/**
- *  The number of requests that are currently running.
- */
-@property (atomic, assign) NSUInteger runningRequestsCount;
-
-/**
- *	BaseURL to which relative paths are appended.
- */
-@property (nonatomic, strong, readonly) NSURL *serverURL;
-
-/**
- *  The persistence instance used for loading files before sending them out.
- */
-@property (nonatomic, strong, readonly) BITPersistence *persistence;
-
-///-----------------------------------------------------------------------------
-/// @name Sending data
-///-----------------------------------------------------------------------------
-
-/**
- *  Creates a request for the given data and forwards that in order to send it out.
- *
- *  @param data the telemetry data which should be sent
- *  @param filePath a reference of filePath to the file which should be sent (needed to delete it after sending)
- */
-- (void)sendData:(NSData *)data withFilePath:(NSString * )filePath;
-
-/**
- *  Triggers sending the saved data on a background thread. Does nothing if nothing has been persisted, yet. This method should be called on app start.
- */
-- (void)sendSavedDataAsync;
-
-/**
- *  Triggers sending the saved data.
- */
-- (void)sendSavedData;
-
-/**
- *  Creates a HTTP operation/session task and puts it to the queue.
- *
- *  @param request a request for sending a data object to the telemetry server
- *  @param path path to the file which should be sent
- */
-- (void)sendRequest:(NSURLRequest *)request filePath:(NSString *)path;
-
-/**
- *  Deletes or unblocks sent file according to the given response code.
- *
- *  @param statusCode the status code of the response
- *  @param responseData the data of the response
- *  @param filePath the path of the file which content has been sent to the server
- *  @param error an error object sent from the server
- */
-- (void)handleResponseWithStatusCode:(NSInteger)statusCode responseData:(NSData *)responseData filePath:(NSString *)filePath error:(NSError *)error;
-
-///-----------------------------------------------------------------------------
-/// @name Helper
-///-----------------------------------------------------------------------------
-
-/**
- *  Returns a request for sending data to the telemetry sender.
- *
- *  @param data the data which should be sent
- *
- *  @return a request which contains the given data
- */
-- (NSURLRequest *)requestForData:(NSData *)data;
-
-/**
- *  Returns if data should be deleted based on a given status code.
- *
- *  @param statusCode the status code which is part of the response object
- *
- *  @return YES if data should be deleted, NO if the payload should be sent at a later time again.
- */
-- (BOOL)shouldDeleteDataWithStatusCode:(NSInteger)statusCode;
-
-@end
-NS_ASSUME_NONNULL_END
-
-#endif /* HOCKEYSDK_FEATURE_METRICS */
diff --git a/submodules/HockeySDK-iOS/Classes/BITSender.m b/submodules/HockeySDK-iOS/Classes/BITSender.m
deleted file mode 100644
index 0b6627cd50..0000000000
--- a/submodules/HockeySDK-iOS/Classes/BITSender.m
+++ /dev/null
@@ -1,209 +0,0 @@
-#import "BITSender.h"
-
-#if HOCKEYSDK_FEATURE_METRICS
-
-#import "BITPersistencePrivate.h"
-#import "BITChannelPrivate.h"
-#import "BITGZIP.h"
-#import "HockeySDKPrivate.h"
-#import "BITHockeyHelper.h"
-
-NSString *const BITSenderFinishSendingDataNotification = @"BITSenderFinishSendingDataNotification";
-
-static char const *kBITSenderTasksQueueString = "net.hockeyapp.sender.tasksQueue";
-static NSUInteger const BITDefaultRequestLimit = 10;
-
-@interface BITSender ()
-
-@property (nonatomic, strong) NSURLSession *session;
-
-@property (nonatomic, weak, nullable) id persistenceSuccessObserver;
-@property (nonatomic, weak, nullable) id channelBlockedObserver;
-
-@end
-
-@implementation BITSender
-
-@synthesize runningRequestsCount = _runningRequestsCount;
-@synthesize persistence = _persistence;
-
-#pragma mark - Initialize instance
-
-- (instancetype)initWithPersistence:(nonnull BITPersistence *)persistence serverURL:(nonnull NSURL *)serverURL {
-  if ((self = [super init])) {
-    _senderTasksQueue = dispatch_queue_create(kBITSenderTasksQueueString, DISPATCH_QUEUE_CONCURRENT);
-    _maxRequestCount = BITDefaultRequestLimit;
-    _serverURL = serverURL;
-    _persistence = persistence;
-    [self registerObservers];
-  }
-  return self;
-}
-
-- (void)dealloc {
-  [self unregisterObservers];
-}
-
-#pragma mark - Handle persistence events
-
-- (void)registerObservers {
-  NSNotificationCenter *center = [NSNotificationCenter defaultCenter];
-  __weak typeof(self) weakSelf = self;
-
-  if (nil == self.persistenceSuccessObserver) {
-    self.persistenceSuccessObserver =
-        [center addObserverForName:BITPersistenceSuccessNotification
-                            object:nil
-                             queue:nil
-                        usingBlock:^(NSNotification __unused *notification) {
-                          typeof(self) strongSelf = weakSelf;
-                          [strongSelf sendSavedDataAsync];
-                        }];
-  }
-  if (nil == self.channelBlockedObserver) {
-    self.channelBlockedObserver =
-        [center addObserverForName:BITChannelBlockedNotification
-                            object:nil
-                             queue:nil
-                        usingBlock:^(NSNotification __unused *notification) {
-                          typeof(self) strongSelf = weakSelf;
-                          [strongSelf sendSavedDataAsync];
-                        }];
-  }
-}
-
-- (void)unregisterObservers {
-  NSNotificationCenter *center = [NSNotificationCenter defaultCenter];
-  id persistenceSuccessObserver = self.persistenceSuccessObserver;
-  if(persistenceSuccessObserver) {
-    [center removeObserver:persistenceSuccessObserver];
-    self.persistenceSuccessObserver = nil;
-  }
-  id channelBlockedObserver = self.channelBlockedObserver;
-  if(channelBlockedObserver) {
-    [center removeObserver:channelBlockedObserver];
-    self.channelBlockedObserver = nil;
-  }
-}
-
-#pragma mark - Sending
-
-- (void)sendSavedDataAsync {
-  dispatch_async(self.senderTasksQueue, ^{
-    [self sendSavedData];
-  });
-}
-
-- (void)sendSavedData {
-  @synchronized(self) {
-    if (self.runningRequestsCount < self.maxRequestCount) {
-      self.runningRequestsCount++;
-      BITHockeyLogDebug(@"INFO: Create new sender thread. Current count is %ld", (long) self.runningRequestsCount);
-    } else {
-      return;
-    }
-  }
-
-  NSString *filePath = [self.persistence requestNextFilePath];
-  NSData *data = [self.persistence dataAtFilePath:filePath];
-  [self sendData:data withFilePath:filePath];
-}
-
-- (void)sendData:(nonnull NSData *)data withFilePath:(nonnull NSString *)filePath {
-  if (data && data.length > 0) {
-    NSData *gzippedData = [data bit_gzippedData];
-    NSURLRequest *request = [self requestForData:gzippedData];
-
-    BITHockeyLogVerbose(@"VERBOSE: Sending data:\n%@", [[NSString alloc] initWithData:data encoding:kCFStringEncodingUTF8]);
-    [self sendRequest:request filePath:filePath];
-  } else {
-    self.runningRequestsCount--;
-    BITHockeyLogDebug(@"INFO: Close sender thread due empty package. Current count is %ld", (long) self.runningRequestsCount);
-  }
-}
-
-- (void)sendRequest:(nonnull NSURLRequest *)request filePath:(nonnull NSString *)path {
-  if (!path || !request) {
-    return;
-  }
-  NSURLSession *session = self.session;
-  NSURLSessionDataTask *task = [session dataTaskWithRequest:request
-                                          completionHandler:^(NSData *data, NSURLResponse *response, NSError *error) {
-                                            NSHTTPURLResponse *httpResponse = (NSHTTPURLResponse *) response;
-                                            NSInteger statusCode = httpResponse.statusCode;
-                                            [self handleResponseWithStatusCode:statusCode responseData:data filePath:path error:error];
-                                          }];
-  [task resume];
-}
-
-- (void)handleResponseWithStatusCode:(NSInteger)statusCode responseData:(nonnull NSData *)responseData filePath:(nonnull NSString *)filePath error:(nonnull NSError *)error {
-  self.runningRequestsCount--;
-  BITHockeyLogDebug(@"INFO: Close sender thread due incoming response. Current count is %ld", (long) self.runningRequestsCount);
-
-  if (responseData && (responseData.length > 0) && [self shouldDeleteDataWithStatusCode:statusCode]) {
-    //we delete data that was either sent successfully or if we have a non-recoverable error
-    BITHockeyLogDebug(@"INFO: Sent data with status code: %ld", (long) statusCode);
-    BITHockeyLogDebug(@"INFO: Response data:\n%@", [NSJSONSerialization JSONObjectWithData:responseData options:0 error:nil]);
-    [self.persistence deleteFileAtPath:filePath];
-    [self sendSavedData];
-  } else {
-    BITHockeyLogError(@"ERROR: Sending telemetry data failed");
-    BITHockeyLogError(@"Error description: %@", error.localizedDescription);
-    [self.persistence giveBackRequestedFilePath:filePath];
-  }
-  
-  if (self.runningRequestsCount == 0) {
-    [self sendSenderFinishSendingDataNotification];
-  }
-}
-
-- (void)sendSenderFinishSendingDataNotification {
-  dispatch_async(dispatch_get_main_queue(), ^{
-    BITHockeyLogDebug(@"Sending notification: %@", BITSenderFinishSendingDataNotification);
-    [[NSNotificationCenter defaultCenter] postNotificationName:BITSenderFinishSendingDataNotification
-                                                        object:nil
-                                                      userInfo:nil];
-  });
-}
-
-#pragma mark - Helper
-
-- (NSURLRequest *)requestForData:(nonnull NSData *)data {
-
-  NSMutableURLRequest *request = [NSMutableURLRequest requestWithURL:self.serverURL];
-  request.HTTPMethod = @"POST";
-
-  request.HTTPBody = data;
-  request.cachePolicy = NSURLRequestReloadIgnoringLocalCacheData;
-
-  NSDictionary<NSString *,NSString *> *headers = @{@"Charset" : @"UTF-8",
-      @"Content-Encoding" : @"gzip",
-      @"Content-Type" : @"application/x-json-stream",
-      @"Accept-Encoding" : @"gzip"};
-  [request setAllHTTPHeaderFields:headers];
-
-  return request;
-}
-
-//some status codes represent recoverable error codes
-//we try sending again some point later
-- (BOOL)shouldDeleteDataWithStatusCode:(NSInteger)statusCode {
-  NSArray<NSNumber *> *recoverableStatusCodes = @[@429, @408, @500, @503, @511];
-
-  return ![recoverableStatusCodes containsObject:@(statusCode)];
-}
-
-#pragma mark - Getter/Setter
-
-- (NSURLSession *)session {
-  if (!_session) {
-    NSURLSessionConfiguration *sessionConfiguration = [NSURLSessionConfiguration defaultSessionConfiguration];
-    _session = [NSURLSession sessionWithConfiguration:sessionConfiguration];
-  }
-  return _session;
-}
-
-@end
-
-#endif /* HOCKEYSDK_FEATURE_METRICS */
-
diff --git a/submodules/HockeySDK-iOS/Classes/BITSession.h b/submodules/HockeySDK-iOS/Classes/BITSession.h
deleted file mode 100644
index 04843ee2d3..0000000000
--- a/submodules/HockeySDK-iOS/Classes/BITSession.h
+++ /dev/null
@@ -1,9 +0,0 @@
-#import "BITTelemetryObject.h"
-
-@interface BITSession : BITTelemetryObject <NSCoding>
-
-@property (nonatomic, copy) NSString *sessionId;
-@property (nonatomic, copy) NSString *isFirst;
-@property (nonatomic, copy) NSString *isNew;
-
-@end
diff --git a/submodules/HockeySDK-iOS/Classes/BITSession.m b/submodules/HockeySDK-iOS/Classes/BITSession.m
deleted file mode 100644
index e8871bdd38..0000000000
--- a/submodules/HockeySDK-iOS/Classes/BITSession.m
+++ /dev/null
@@ -1,45 +0,0 @@
-#import "BITSession.h"
-
-/// Data contract class for type Session.
-@implementation BITSession
-
-///
-/// Adds all members of this class to a dictionary
-/// @returns dictionary to which the members of this class will be added.
-///
-- (NSDictionary *)serializeToDictionary {
-  NSMutableDictionary *dict = [super serializeToDictionary].mutableCopy;
-  if (self.sessionId != nil) {
-    [dict setObject:self.sessionId forKey:@"ai.session.id"];
-  }
-  if (self.isFirst != nil) {
-    [dict setObject:self.isFirst forKey:@"ai.session.isFirst"];
-  }
-  if (self.isNew != nil) {
-    [dict setObject:self.isNew forKey:@"ai.session.isNew"];
-  }
-  return dict;
-}
-
-#pragma mark - NSCoding
-
-- (instancetype)initWithCoder:(NSCoder *)coder {
-  self = [super initWithCoder:coder];
-  if(self) {
-    _sessionId = [coder decodeObjectForKey:@"self.sessionId"];
-    _isFirst = [coder decodeObjectForKey:@"self.isFirst"];
-    _isNew = [coder decodeObjectForKey:@"self.isNew"];
-  }
-  
-  return self;
-}
-
-- (void)encodeWithCoder:(NSCoder *)coder {
-  [super encodeWithCoder:coder];
-  [coder encodeObject:self.sessionId forKey:@"self.sessionId"];
-  [coder encodeObject:self.isFirst forKey:@"self.isFirst"];
-  [coder encodeObject:self.isNew forKey:@"self.isNew"];
-}
-
-
-@end
diff --git a/submodules/HockeySDK-iOS/Classes/BITSessionState.h b/submodules/HockeySDK-iOS/Classes/BITSessionState.h
deleted file mode 100755
index 10c9368b53..0000000000
--- a/submodules/HockeySDK-iOS/Classes/BITSessionState.h
+++ /dev/null
@@ -1,8 +0,0 @@
-#import <Foundation/Foundation.h>
-/// Enum class for type SessionState.
-typedef NS_ENUM(NSInteger, BITSessionState) {
-  BITSessionState_start = 0,
-  
-  BITSessionState_end = 1,
-  
-};
diff --git a/submodules/HockeySDK-iOS/Classes/BITSessionStateData.h b/submodules/HockeySDK-iOS/Classes/BITSessionStateData.h
deleted file mode 100755
index 63192c92f8..0000000000
--- a/submodules/HockeySDK-iOS/Classes/BITSessionStateData.h
+++ /dev/null
@@ -1,10 +0,0 @@
-#import "BITDomain.h"
-#import "BITSessionState.h"
-
-@interface BITSessionStateData : BITDomain <NSCoding>
-
-@property (nonatomic, copy, readonly) NSString *envelopeTypeName;
-@property (nonatomic, copy, readonly) NSString *dataTypeName;
-@property (nonatomic, assign) BITSessionState state;
-
-@end
diff --git a/submodules/HockeySDK-iOS/Classes/BITSessionStateData.m b/submodules/HockeySDK-iOS/Classes/BITSessionStateData.m
deleted file mode 100755
index ee755f25b7..0000000000
--- a/submodules/HockeySDK-iOS/Classes/BITSessionStateData.m
+++ /dev/null
@@ -1,49 +0,0 @@
-#import "BITSessionStateData.h"
-
-/// Data contract class for type SessionStateData.
-@implementation BITSessionStateData
-@synthesize envelopeTypeName = _envelopeTypeName;
-@synthesize dataTypeName = _dataTypeName;
-@synthesize version = _version;
-
-/// Initializes a new instance of the class.
-- (instancetype)init {
-  if((self = [super init])) {
-    _envelopeTypeName = @"Microsoft.ApplicationInsights.SessionState";
-    _dataTypeName = @"SessionStateData";
-    _version = @2;
-    _state = BITSessionState_start;
-  }
-  return self;
-}
-
-///
-/// Adds all members of this class to a dictionary
-/// @returns dictionary to which the members of this class will be added.
-///
-- (NSDictionary *)serializeToDictionary {
-  NSMutableDictionary *dict = [super serializeToDictionary].mutableCopy;
-  [dict setObject:[NSNumber numberWithInt:(int)self.state] forKey:@"state"];
-  return dict;
-}
-
-#pragma mark - NSCoding
-
-- (instancetype)initWithCoder:(NSCoder *)coder {
-  self = [super initWithCoder:coder];
-  if(self) {
-    _envelopeTypeName =[coder decodeObjectForKey:@"envelopeTypeName"];
-    _dataTypeName = [coder decodeObjectForKey:@"dataTypeName"];
-    _state = (BITSessionState)[coder decodeIntForKey:@"self.state"];
-  }
-  return self;
-}
-
-- (void)encodeWithCoder:(NSCoder *)coder {
-  [super encodeWithCoder:coder];
-  [coder encodeObject:self.envelopeTypeName forKey:@"envelopeTypeName"];
-  [coder encodeObject:self.dataTypeName forKey:@"dataTypeName"];
-  [coder encodeInt:self.state forKey:@"self.state"];
-}
-
-@end
diff --git a/submodules/HockeySDK-iOS/Classes/BITStoreButton.h b/submodules/HockeySDK-iOS/Classes/BITStoreButton.h
deleted file mode 100644
index d44f3bb216..0000000000
--- a/submodules/HockeySDK-iOS/Classes/BITStoreButton.h
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- * Author: Andreas Linde <mail@andreaslinde.de>
- *         Peter Steinberger
- *
- * Copyright (c) 2012-2014 HockeyApp, Bit Stadium GmbH.
- * Copyright (c) 2011-2012 Peter Steinberger.
- * All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person
- * obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without
- * restriction, including without limitation the rights to use,
- * copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following
- * conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
- * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
- */
-
-
-#import <UIKit/UIKit.h>
-
-// defines a button action set (data container)
-@interface BITStoreButtonData : NSObject
-
-+ (id)dataWithLabel:(NSString*)aLabel enabled:(BOOL)flag;
-
-@property (nonatomic, copy) NSString *label;
-@property (nonatomic, assign, getter=isEnabled) BOOL enabled;
-
-@end
-
-
-@class BITStoreButton;
-@protocol BITStoreButtonDelegate
-- (void)storeButtonFired:(BITStoreButton *)button;
-@end
-
-/**
- * Button style depending on the iOS version
- */
-typedef NS_ENUM(NSUInteger, BITStoreButtonStyle) {
-  /**
-   * Draw buttons in the iOS 7 style
-   */
-  BITStoreButtonStyleOS7 = 0
-};
-
-
-// Simulate the Payment Button from the AppStore
-// The interface is flexible, so there is now fixed order
-@interface BITStoreButton : UIButton
-
-- (instancetype)initWithFrame:(CGRect)frame;
-- (instancetype)initWithPadding:(CGPoint)padding style:(BITStoreButtonStyle)style;
-
-// action delegate
-@property (nonatomic, weak) id<BITStoreButtonDelegate> buttonDelegate;
-
-// change the button layer
-@property (nonatomic, strong) BITStoreButtonData *buttonData;
-- (void)setButtonData:(BITStoreButtonData *)aButtonData animated:(BOOL)animated;
-
-// align helper
-@property (nonatomic, assign) CGPoint customPadding;
-
-// align helper
-@property (nonatomic, assign) BITStoreButtonStyle style;
-
-
-- (void)alignToSuperview;
-
-@end
diff --git a/submodules/HockeySDK-iOS/Classes/BITStoreButton.m b/submodules/HockeySDK-iOS/Classes/BITStoreButton.m
deleted file mode 100644
index 8ac67a3e22..0000000000
--- a/submodules/HockeySDK-iOS/Classes/BITStoreButton.m
+++ /dev/null
@@ -1,266 +0,0 @@
-/*
- * Author: Andreas Linde <mail@andreaslinde.de>
- *         Peter Steinberger
- *
- * Copyright (c) 2012-2014 HockeyApp, Bit Stadium GmbH.
- * Copyright (c) 2011-2012 Peter Steinberger.
- * All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person
- * obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without
- * restriction, including without limitation the rights to use,
- * copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following
- * conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
- * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#import "HockeySDK.h"
-
-#if HOCKEYSDK_FEATURE_UPDATES
-
-#import "BITStoreButton.h"
-#import "HockeySDKPrivate.h"
-#import <QuartzCore/QuartzCore.h>
-
-#define BIT_MIN_HEIGHT 25.0
-#define BIT_MAX_WIDTH 120.0
-#define BIT_PADDING 12.0
-#define kDefaultButtonAnimationTime 0.25
-
-
-@implementation BITStoreButtonData
-
-#pragma mark - NSObject
-
-- (instancetype)initWithLabel:(NSString*)aLabel enabled:(BOOL)flag {
-  if ((self = [super init])) {
-    self.label = aLabel;
-    self.enabled = flag;
-  }
-  return self;
-}
-
-+ (id)dataWithLabel:(NSString*)aLabel enabled:(BOOL)flag {
-  return [[[self class] alloc] initWithLabel:aLabel enabled:flag];
-}
-
-@end
-
-@interface BITStoreButton ()
-
-@property (nonatomic, strong) CALayer *defaultBorderLayer;
-@property (nonatomic, strong) CALayer *inActiveBorderLayer;
-
-@end
-
-@implementation BITStoreButton
-
-#pragma mark - private
-
-- (void)buttonPressed:(id) __unused sender {
-  [self.buttonDelegate storeButtonFired:self];
-}
-
-- (void)animationDidStop:(NSString *) __unused animationID finished:(NSNumber *)finished context:(void *) __unused context {
-  // show text again, but only if animation did finish (or else another animation is on the way)
-  if ([finished boolValue]) {
-    [self setTitle:self.buttonData.label forState:UIControlStateNormal];
-  }
-}
-
-- (void)updateButtonAnimated:(BOOL)animated {
-  if (animated) {
-    // hide text, then start animation
-    [self setTitle:@"" forState:UIControlStateNormal];
-    [UIView beginAnimations:@"storeButtonUpdate" context:nil];
-    [UIView setAnimationBeginsFromCurrentState:YES];
-    [UIView setAnimationDuration:kDefaultButtonAnimationTime];
-    [UIView setAnimationDelegate:self];
-    [UIView setAnimationDidStopSelector:@selector(animationDidStop:finished:context:)];
-  } else {
-    [self setTitle:self.buttonData.label forState:UIControlStateNormal];
-  }
-  
-  self.enabled = self.buttonData.isEnabled;
-  
-  // show white or gray text, depending on the state
-  if (self.buttonData.isEnabled) {
-    [self setTitleColor:BIT_RGBCOLOR(35, 111, 251) forState:UIControlStateNormal];
-    [self.defaultBorderLayer setHidden:NO];
-    [self.inActiveBorderLayer setHidden:YES];
-  } else {
-    [self setTitleColor:BIT_RGBCOLOR(148, 150, 151) forState:UIControlStateNormal];
-    if (self.style == BITStoreButtonStyleOS7) {
-      [self.defaultBorderLayer setHidden:YES];
-      [self.inActiveBorderLayer setHidden:NO];
-    }
-  }
-  
-  // calculate optimal new size
-  CGSize sizeThatFits = [self sizeThatFits:CGSizeZero];
-  
-  // move sublayer (can't be animated explcitely)
-  for (CALayer *aLayer in self.layer.sublayers) {
-    [CATransaction begin];
-    
-    if (animated) {
-      [CATransaction setAnimationDuration:kDefaultButtonAnimationTime];
-      [CATransaction setAnimationTimingFunction:[CAMediaTimingFunction functionWithName:kCAMediaTimingFunctionEaseInEaseOut]];
-    } else {
-      // frame is calculated and explicitly animated. so we absolutely need kCATransactionDisableActions
-      [CATransaction setValue:[NSNumber numberWithBool:YES] forKey:kCATransactionDisableActions];
-    }
-    
-    CGRect newFrame = aLayer.frame;
-    newFrame.size.width = sizeThatFits.width;
-    aLayer.frame = newFrame;
-    
-    [CATransaction commit];
-	}
-  
-  // set outer frame changes
-  self.titleEdgeInsets = UIEdgeInsetsMake(2.0, self.titleEdgeInsets.left, 0.0, 0.0);
-  [self alignToSuperview];
-  
-  if (animated) {
-    [UIView commitAnimations];
-  }
-}
-
-- (void)alignToSuperview {
-  [self sizeToFit];
-  if (self.superview) {
-    CGRect cr = self.frame;
-    cr.origin.y = self.customPadding.y;
-    cr.origin.x = self.superview.frame.size.width - cr.size.width - self.customPadding.x * 2;
-    self.frame = cr;
-  }
-}
-
-
-#pragma mark - NSObject
-
-- (instancetype)initWithFrame:(CGRect)frame {
-  if ((self = [super initWithFrame:frame])) {
-		self.layer.needsDisplayOnBoundsChange = YES;
-    
-    // setup title label
-    [self.titleLabel setFont:[UIFont boldSystemFontOfSize:13.0]];
-    
-    // register for touch events
-		[self addTarget:self action:@selector(buttonPressed:) forControlEvents:UIControlEventTouchUpInside];
-    
-    [self bringSubviewToFront:(UILabel *)self.titleLabel];
-  }
-  return self;
-}
-
-- (instancetype)initWithPadding:(CGPoint)padding style:(BITStoreButtonStyle)style {
-  CGRect frame = CGRectMake(0, 0, 40, BIT_MIN_HEIGHT);
-  if ((self = [self initWithFrame:frame])) {
-    _customPadding = padding;
-    _style = style;
-
-    // border layers for more sex!
-    _defaultBorderLayer = [CALayer layer];
-      _defaultBorderLayer.borderColor = [BIT_RGBCOLOR(35, 111, 251) CGColor];
-    _defaultBorderLayer.borderWidth = 1.0;
-		_defaultBorderLayer.frame = CGRectMake(0.0, 0.0, CGRectGetWidth(frame), CGRectGetHeight(frame));
-		_defaultBorderLayer.cornerRadius = 2.5;
-		_defaultBorderLayer.needsDisplayOnBoundsChange = YES;
-    [self.layer addSublayer:_defaultBorderLayer];
-    
-    if (style == BITStoreButtonStyleOS7) {
-      _inActiveBorderLayer = [CALayer layer];
-      _inActiveBorderLayer.borderColor = [BIT_RGBCOLOR(148, 150, 151) CGColor];
-      _inActiveBorderLayer.borderWidth = 1.0;
-      _inActiveBorderLayer.frame = CGRectMake(0.0, 0.0, CGRectGetWidth(frame), CGRectGetHeight(frame));
-      _inActiveBorderLayer.cornerRadius = 2.5;
-      _inActiveBorderLayer.needsDisplayOnBoundsChange = YES;
-      [self.layer addSublayer:_inActiveBorderLayer];
-      [_inActiveBorderLayer setHidden:YES];
-    }
-    
-    [self bringSubviewToFront:(UILabel *)self.titleLabel];
-  }
-  return self;
-}
-
-
-
-#pragma mark - UIView
-
-- (CGSize)sizeThatFits:(CGSize) __unused size {
-  CGSize constr = (CGSize){.height = self.frame.size.height, .width = BIT_MAX_WIDTH};
-  CGSize newSize;
-  
-  if ([self.buttonData.label respondsToSelector:@selector(boundingRectWithSize:options:attributes:context:)]) {
-    CGRect calculatedRect = [self.buttonData.label boundingRectWithSize:constr
-                                                                options:NSStringDrawingUsesFontLeading
-                                                             attributes:@{NSFontAttributeName:(id)self.titleLabel.font}
-                                                                context:nil];
-    newSize = calculatedRect.size;
-  } else {
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
-    newSize = [self.buttonData.label sizeWithFont:self.titleLabel.font
-                                constrainedToSize:constr
-                                    lineBreakMode:NSLineBreakByTruncatingMiddle];
-#pragma clang diagnostic pop
-  }
-  
-  CGFloat newWidth = newSize.width + ((CGFloat)BIT_PADDING * 2);
-  CGFloat newHeight = (CGFloat)BIT_MIN_HEIGHT > newSize.height ? (CGFloat)BIT_MIN_HEIGHT : newSize.height;
-  
-  CGSize sizeThatFits = CGSizeMake(newWidth, newHeight);
-  return sizeThatFits;
-}
-
-- (void)setFrame:(CGRect)aRect {
-  [super setFrame:aRect];
-  
-  // copy frame changes to sublayers (but watch out for NaN's)
-  for (CALayer *aLayer in self.layer.sublayers) {
-    CGRect rect = aLayer.frame;
-    rect.size.width = self.frame.size.width;
-    rect.size.height = self.frame.size.height;
-    aLayer.frame = rect;
-    [aLayer layoutIfNeeded];
-  }
-}
-
-
-#pragma mark - Properties
-
-- (void)setButtonData:(BITStoreButtonData *)aButtonData {
-  [self setButtonData:aButtonData animated:NO];
-}
-
-- (void)setButtonData:(BITStoreButtonData *)aButtonData animated:(BOOL)animated {
-  if (self.buttonData != aButtonData) {
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdirect-ivar-access"
-    _buttonData = aButtonData;
-#pragma clang diagnostic pop
-  }
-  
-  [self updateButtonAnimated:animated];
-}
-
-@end
-
-#endif /* HOCKEYSDK_FEATURE_UPDATES */
diff --git a/submodules/HockeySDK-iOS/Classes/BITStoreUpdateManager.h b/submodules/HockeySDK-iOS/Classes/BITStoreUpdateManager.h
deleted file mode 100644
index b7b01d0233..0000000000
--- a/submodules/HockeySDK-iOS/Classes/BITStoreUpdateManager.h
+++ /dev/null
@@ -1,186 +0,0 @@
-/*
- * Author: Andreas Linde <mail@andreaslinde.de>
- *
- * Copyright (c) 2013-2014 HockeyApp, Bit Stadium GmbH.
- * All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person
- * obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without
- * restriction, including without limitation the rights to use,
- * copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following
- * conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
- * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
- */
-
-
-#import <UIKit/UIKit.h>
-#import "BITHockeyBaseManager.h"
-
-
-/**
- *  Defines the update check intervals
- */
-typedef NS_ENUM(NSInteger, BITStoreUpdateSetting) {
-  /**
-   *  Check every day
-   */
-  BITStoreUpdateCheckDaily = 0,
-  /**
-   *  Check every week
-   */
-  BITStoreUpdateCheckWeekly = 1,
-  /**
-   *  Check manually
-   */
-  BITStoreUpdateCheckManually = 2
-};
-
-@protocol BITStoreUpdateManagerDelegate;
-
-/**
- The store update manager module.
- 
- This is the HockeySDK module for handling app updates when having your app released in the App Store.
- By default the module uses the current users locale to define the app store to check for updates. You
- can modify this using the `countryCode` property. See the property documentation for details on its usage.
- 
- When an update is detected, this module will show an alert asking the user if he/she wants to update or
- ignore this version. If update was chosen, it will open the apps page in the app store app.
-
- You need to enable this module using `[BITHockeyManager enableStoreUpdateManager]` if you want to use this
- feature. By default this module is disabled!
-  
- When this module is enabled and **NOT** running in an App Store build/environment, it won't do any checks!
- 
- The `BITStoreUpdateManagerDelegate` protocol informs the app about new detected app versions.
- 
- @warning This module can **NOT** check if the current device and OS version match the minimum requirements of
- the new app version!
- 
- */
-
-@interface BITStoreUpdateManager : BITHockeyBaseManager
-
-///-----------------------------------------------------------------------------
-/// @name Update Checking
-///-----------------------------------------------------------------------------
-
-/**
- When to check for new updates.
- 
- Defines when a the SDK should check if there is a new update available on the
- server. This must be assigned one of the following, see `BITStoreUpdateSetting`:
- 
- - `BITStoreUpdateCheckDaily`: Once a day
- - `BITStoreUpdateCheckWeekly`: Once a week
- - `BITStoreUpdateCheckManually`: Manually
- 
- **Default**: BITStoreUpdateCheckWeekly
- 
- @warning When setting this to `BITStoreUpdateCheckManually` you need to either
- invoke the update checking process yourself with `checkForUpdate` somehow, e.g. by
- proving an update check button for the user or integrating the Update View into your
- user interface.
- @see BITStoreUpdateSetting
- @see countryCode
- @see checkForUpdateOnLaunch
- @see checkForUpdate
- */
-@property (nonatomic, assign) BITStoreUpdateSetting updateSetting;
-
-
-/**
- Defines the store country the app is always available in, otherwise uses the users locale
- 
- If this value is not defined, then it uses the device country if the current locale.
- 
- If you are pre-defining a country and are releasing a new version on a specific date,
- it can happen that users get an alert but the update is not yet available in their country!
- 
- But if a user downloaded the app from another appstore than the locale is set and the app is not
- available in the locales app store, then the user will never receive an update notification!
- 
- More information about possible country codes is available here: http://en.wikipedia.org/wiki/ISO_3166-1_alpha-2
- 
- @see updateSetting
- @see checkForUpdateOnLaunch
- @see checkForUpdate
- */
-@property (nonatomic, copy) NSString *countryCode;
-
-
-/**
- Flag that determines whether the automatic update checks should be done.
- 
- If this is enabled the update checks will be performed automatically depending on the
- `updateSetting` property. If this is disabled the `updateSetting` property will have
- no effect, and checking for updates is totally up to be done by yourself.
- 
- *Default*: _YES_
-
- @warning When setting this to `NO` you need to invoke update checks yourself!
- @see updateSetting
- @see countryCode
- @see checkForUpdate
- */
-@property (nonatomic, assign, getter=isCheckingForUpdateOnLaunch) BOOL checkForUpdateOnLaunch;
-
-
-///-----------------------------------------------------------------------------
-/// @name User Interface
-///-----------------------------------------------------------------------------
-
-
-/**
- Flag that determines if the integrated update alert should be used
- 
- If enabled, the integrated UIAlert based update notification will be used to inform
- the user about a new update being available in the App Store.
- 
- If disabled, you need to implement the `BITStoreUpdateManagerDelegate` protocol with
- the method `[BITStoreUpdateManagerDelegate detectedUpdateFromStoreUpdateManager:newVersion:storeURL:]`
- to be notified about new version and proceed yourself.
- The manager will consider this identical to an `Ignore` user action using the alert
- and not inform about this particular version any more, unless the app is updated
- and this very same version shows up at a later time again as a new version.
- 
- *Default*: _YES_
- 
- @warning If the HockeySDKResources bundle is missing in the application package, then the internal
- update alert is also disabled and be treated identical to manually disabling this
- property.
- @see updateSetting
- */
-@property (nonatomic, assign, getter=isUpdateUIEnabled) BOOL updateUIEnabled;
-
-///-----------------------------------------------------------------------------
-/// @name Manual update checking
-///-----------------------------------------------------------------------------
-
-/**
- Check for an update
- 
- Call this to trigger a check if there is a new update available on the HockeyApp servers.
- 
- @see updateSetting
- @see countryCode
- @see checkForUpdateOnLaunch
- */
-- (void)checkForUpdate;
-
-
-@end
diff --git a/submodules/HockeySDK-iOS/Classes/BITStoreUpdateManager.m b/submodules/HockeySDK-iOS/Classes/BITStoreUpdateManager.m
deleted file mode 100644
index 52b9a4e885..0000000000
--- a/submodules/HockeySDK-iOS/Classes/BITStoreUpdateManager.m
+++ /dev/null
@@ -1,504 +0,0 @@
-/*
- * Author: Andreas Linde <mail@andreaslinde.de>
- *
- * Copyright (c) 2013-2014 HockeyApp, Bit Stadium GmbH.
- * All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person
- * obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without
- * restriction, including without limitation the rights to use,
- * copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following
- * conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
- * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#import "HockeySDK.h"
-
-#if HOCKEYSDK_FEATURE_STORE_UPDATES
-
-#import <sys/sysctl.h>
-
-#import "HockeySDKPrivate.h"
-#import "BITHockeyHelper.h"
-#import "BITHockeyHelper+Application.h"
-
-#import "BITHockeyBaseManagerPrivate.h"
-#import "BITStoreUpdateManagerPrivate.h"
-
-@interface BITStoreUpdateManager ()
-
-@property (nonatomic, copy) NSString *latestStoreVersion;
-@property (nonatomic, copy) NSString *appStoreURLString;
-@property (nonatomic, copy) NSString *currentUUID;
-@property (nonatomic) BOOL updateAlertShowing;
-@property (nonatomic) BOOL lastCheckFailed;
-@property (nonatomic, weak) id appDidBecomeActiveObserver;
-@property (nonatomic, weak) id networkDidBecomeReachableObserver;
-
-@end
-
-@implementation BITStoreUpdateManager
-
-#pragma mark - private
-
-- (void)reportError:(NSError *)error {
-  BITHockeyLogError(@"ERROR: %@", [error localizedDescription]);
-  self.lastCheckFailed = YES;
-}
-
-
-- (void)didBecomeActiveActions {
-  if ([self shouldCancelProcessing]) return;
-  
-  if ([self isCheckingForUpdateOnLaunch] && [self shouldAutoCheckForUpdates]) {
-    [self performSelector:@selector(checkForUpdateDelayed) withObject:nil afterDelay:1.0];
-  }
-}
-
-#pragma mark - Observers
-
-- (void) registerObservers {
-  __weak typeof(self) weakSelf = self;
-  if(nil == self.appDidBecomeActiveObserver) {
-    self.appDidBecomeActiveObserver = [[NSNotificationCenter defaultCenter] addObserverForName:UIApplicationDidBecomeActiveNotification
-                                                                                    object:nil
-                                                                                     queue:NSOperationQueue.mainQueue
-                                                                                usingBlock:^(NSNotification __unused *note) {
-                                                                                  typeof(self) strongSelf = weakSelf;
-                                                                                  [strongSelf didBecomeActiveActions];
-                                                                                }];
-  }
-  if(nil == self.networkDidBecomeReachableObserver) {
-    self.networkDidBecomeReachableObserver = [[NSNotificationCenter defaultCenter] addObserverForName:BITHockeyNetworkDidBecomeReachableNotification
-                                                                                     object:nil
-                                                                                      queue:NSOperationQueue.mainQueue
-                                                                                 usingBlock:^(NSNotification __unused *note) {
-                                                                                   typeof(self) strongSelf = weakSelf;
-                                                                                   [strongSelf didBecomeActiveActions];
-                                                                                 }];
-  }
-}
-
-- (void) unregisterObservers {
-  id strongAppDidBecomeActiveObserver = self.appDidBecomeActiveObserver;
-  id strongNetworkDidBecomeReachableObserver = self.networkDidBecomeReachableObserver;
-  if(strongAppDidBecomeActiveObserver) {
-    [[NSNotificationCenter defaultCenter] removeObserver:strongAppDidBecomeActiveObserver];
-    self.appDidBecomeActiveObserver = nil;
-  }
-  if(strongNetworkDidBecomeReachableObserver) {
-    [[NSNotificationCenter defaultCenter] removeObserver:strongNetworkDidBecomeReachableObserver];
-    self.networkDidBecomeReachableObserver = nil;
-  }
-}
-
-
-#pragma mark - Init
-
-- (instancetype)init {
-  if ((self = [super init])) {
-    _checkInProgress = NO;
-    _updateAvailable = NO;
-    _lastCheckFailed = NO;
-    _enableStoreUpdateManager = NO;
-    _updateAlertShowing = NO;
-    _updateUIEnabled = YES;
-    _latestStoreVersion = nil;
-    _appStoreURLString = nil;
-    _currentUUID = [[self executableUUID] copy];
-    _countryCode = nil;
-    
-    _mainBundle = [NSBundle mainBundle];
-    _currentLocale = [NSLocale currentLocale];
-    _userDefaults = [NSUserDefaults standardUserDefaults];
-    
-    // set defaults
-    self.checkForUpdateOnLaunch = YES;
-    self.updateSetting = BITStoreUpdateCheckWeekly;
-
-    if (!BITHockeyBundle()) {
-      BITHockeyLogWarning(@"[HockeySDK] WARNING: %@ is missing, built in UI is deactivated!", BITHOCKEYSDK_BUNDLE);
-    }
-  }
-  return self;
-}
-
-- (void)dealloc {
-  [self unregisterObservers];
-}
-
-
-#pragma mark - Version
-
-- (NSString *)lastStoreVersion {
-  NSString *versionString = nil;
-  
-  if ([self.userDefaults objectForKey:kBITStoreUpdateLastStoreVersion]) {
-    // get the last saved version string from the app store
-    versionString = [self.userDefaults objectForKey:kBITStoreUpdateLastStoreVersion];
-  }
-  
-  // if there is a UUID saved which doesn't match the current binary UUID
-  // then there is possibly a newer version in the store
-  NSString *lastSavedUUID = nil;
-  if ([self.userDefaults objectForKey:kBITStoreUpdateLastUUID]) {
-    lastSavedUUID = [self.userDefaults objectForKey:kBITStoreUpdateLastUUID];
-
-    if (lastSavedUUID && [lastSavedUUID length] > 0 && ![lastSavedUUID isEqualToString:self.currentUUID]) {
-      // the UUIDs don't match, store the new one
-      [self.userDefaults setObject:self.currentUUID forKey:kBITStoreUpdateLastUUID];
-      
-      if (versionString) {
-        // a new version has been installed, reset everything
-        // so we set versionString to nil to simulate that this is the very run
-        [self.userDefaults removeObjectForKey:kBITStoreUpdateLastStoreVersion];
-        versionString = nil;
-      }
-    }
-  }
-  
-  return versionString;
-}
-
-- (BOOL)hasNewVersion:(NSDictionary *)dictionary {
-  self.lastCheckFailed = YES;
-  
-  NSString *lastStoreVersion = [self lastStoreVersion];
-  
-  if ([[dictionary objectForKey:@"results"] isKindOfClass:[NSArray class]] &&
-      [(NSArray *)[dictionary objectForKey:@"results"] count] > 0 ) {
-    self.lastCheckFailed = NO;
-
-    self.latestStoreVersion = [(NSDictionary *)[(NSArray *)[dictionary objectForKey:@"results"] objectAtIndex:0] objectForKey:@"version"];
-    self.appStoreURLString = [(NSDictionary *)[(NSArray *)[dictionary objectForKey:@"results"] objectAtIndex:0] objectForKey:@"trackViewUrl"];
-    
-    NSString *ignoredVersion = nil;
-    if ([self.userDefaults objectForKey:kBITStoreUpdateIgnoreVersion]) {
-      ignoredVersion = [self.userDefaults objectForKey:kBITStoreUpdateIgnoreVersion];
-      BITHockeyLogDebug(@"INFO: Ignored version: %@", ignoredVersion);
-    }
-    
-    if (!self.latestStoreVersion || !self.appStoreURLString) {
-      return NO;
-    } else if (ignoredVersion && [ignoredVersion isEqualToString:self.latestStoreVersion]) {
-      return NO;
-    } else if (!lastStoreVersion) {
-      // this is the very first time we get a valid response and
-      // set the reference of the store result to be equal to the current installed version
-      // even though the current installed version could be older than the one in the app store
-      // but this ensures that we never have false alerts, since the version string in
-      // iTunes Connect doesn't have to match CFBundleVersion or CFBundleShortVersionString
-      // and even if it matches it is hard/impossible to 100% determine which one it is,
-      // since they could change at any time
-      [self.userDefaults setObject:self.currentUUID forKey:kBITStoreUpdateLastUUID];
-      [self.userDefaults setObject:self.latestStoreVersion forKey:kBITStoreUpdateLastStoreVersion];
-      return NO;
-    } else {
-      BITHockeyLogDebug(@"INFO: Compare new version string %@ with %@", self.latestStoreVersion, lastStoreVersion);
-      
-      NSComparisonResult comparisonResult = bit_versionCompare(self.latestStoreVersion, lastStoreVersion);
-      
-      if (comparisonResult == NSOrderedDescending) {
-        return YES;
-      } else {
-        return NO;
-      }
-
-    }
-  }
-  
-  return NO;
-}
-
-
-#pragma mark - Time
-
-- (BOOL)shouldAutoCheckForUpdates {
-  BOOL checkForUpdate = NO;
-  
-  switch (self.updateSetting) {
-    case BITStoreUpdateCheckDaily: {
-      NSTimeInterval dateDiff = fabs([self.lastCheck timeIntervalSinceNow]);
-      if (dateDiff != 0)
-        dateDiff = dateDiff / (60*60*24);
-      
-      checkForUpdate = (dateDiff >= 1);
-      break;
-    }
-    case BITStoreUpdateCheckWeekly: {
-      NSTimeInterval dateDiff = fabs([self.lastCheck timeIntervalSinceNow]);
-      if (dateDiff != 0)
-        dateDiff = dateDiff / (60*60*24);
-      
-      checkForUpdate = (dateDiff >= 7);
-      break;
-    }
-    case BITStoreUpdateCheckManually:
-      checkForUpdate = NO;
-      break;
-    default:
-      break;
-  }
-  
-  return checkForUpdate;
-}
-
-
-#pragma mark - Private
-
-- (BOOL)shouldCancelProcessing {
-  if (self.appEnvironment != BITEnvironmentAppStore) {
-    BITHockeyLogWarning(@"WARNING: StoreUpdateManager is cancelled because it's not running in an AppStore environment");
-    return YES;
-  }
-  
-  if (![self isStoreUpdateManagerEnabled]) {
-    return YES;
-  }
-  
-  return NO;
-}
-
-
-- (BOOL)processStoreResponseWithString:(NSString *)responseString {
-  if (!responseString) return NO;
-  
-  NSData *data = [responseString dataUsingEncoding:NSUTF8StringEncoding];
-  
-  NSError *error = nil;
-  NSDictionary *json = (NSDictionary *)[NSJSONSerialization JSONObjectWithData:data options:0 error:&error];
-  
-  if (error) {
-    BITHockeyLogError(@"ERROR: Invalid JSON string. %@", [error localizedDescription]);
-    return NO;
-  }
-  
-  // remember that we just checked the server
-  self.lastCheck = [NSDate date];
-  
-  self.updateAvailable = [self hasNewVersion:json];
-  
-  BITHockeyLogDebug(@"INFO: Update available: %i", self.updateAvailable);
-  
-  if (self.lastCheckFailed) {
-    BITHockeyLogError(@"ERROR: Last check failed");
-    return NO;
-  }
-  
-  if ([self isUpdateAvailable]) {
-    id strongDelegate = self.delegate;
-    if ([strongDelegate respondsToSelector:@selector(detectedUpdateFromStoreUpdateManager:newVersion:storeURL:)]) {
-      [strongDelegate detectedUpdateFromStoreUpdateManager:self newVersion:self.latestStoreVersion storeURL:[NSURL URLWithString:self.appStoreURLString]];
-    }
-    
-    if (self.updateUIEnabled && BITHockeyBundle()) {
-      [self showUpdateAlert];
-    } else {
-      // Ignore this version
-      [self.userDefaults setObject:self.latestStoreVersion forKey:kBITStoreUpdateIgnoreVersion];
-    }
-  }
-  
-  return YES;
-}
-
-
-#pragma mark - Update Check
-
-- (void)checkForUpdateManual:(BOOL)manual {
-  if ([self shouldCancelProcessing]) return;
-
-  if (self.isCheckInProgress) return;
-  self.checkInProgress = YES;
-  
-  // do we need to update?
-  if (!manual && ![self shouldAutoCheckForUpdates]) {
-    BITHockeyLogDebug(@"INFO: Update check not needed right now");
-    self.checkInProgress = NO;
-    return;
-  }
-  
-  NSString *country = @"";
-  if (self.countryCode) {
-    country = [NSString stringWithFormat:@"&country=%@", self.countryCode];
-  } else {
-    // if the local is by any chance the systemLocale, it could happen that the NSLocaleCountryCode returns nil!
-    if ([(NSDictionary *)self.currentLocale objectForKey:NSLocaleCountryCode]) {
-      country = [NSString stringWithFormat:@"&country=%@", [(NSDictionary *)self.currentLocale objectForKey:NSLocaleCountryCode]];
-    } else {
-      // don't check, just to be save
-      BITHockeyLogError(@"ERROR: Locale returned nil, can't determine the store to use!");
-      self.checkInProgress = NO;
-      return;
-    }
-  }
-  
-  NSString *appBundleIdentifier = [self.mainBundle objectForInfoDictionaryKey:@"CFBundleIdentifier"];
-  
-  NSString *url = [NSString stringWithFormat:@"https://itunes.apple.com/lookup?bundleId=%@%@",
-                   bit_URLEncodedString(appBundleIdentifier),
-                   country];
-  
-  BITHockeyLogDebug(@"INFO: Sending request to %@", url);
-  
-  NSMutableURLRequest *request = [NSMutableURLRequest requestWithURL:(NSURL *)[NSURL URLWithString:url] cachePolicy:1 timeoutInterval:10.0];
-  [request setHTTPMethod:@"GET"];
-  [request setValue:@"gzip" forHTTPHeaderField:@"Accept-Encoding"];
-  
-  __weak typeof (self) weakSelf = self;
-  NSURLSessionConfiguration *sessionConfiguration = [NSURLSessionConfiguration defaultSessionConfiguration];
-  __block NSURLSession *session = [NSURLSession sessionWithConfiguration:sessionConfiguration];
-
-  NSURLSessionDataTask *task = [session dataTaskWithRequest:request
-                                          completionHandler: ^(NSData *data, NSURLResponse __unused *response, NSError *error) {
-                                            typeof (self) strongSelf = weakSelf;
-
-                                            [session finishTasksAndInvalidate];
-
-                                            [strongSelf handleResponeWithData:data error:error];
-                                          }];
-  [task resume];
-}
-
-- (void)handleResponeWithData:(NSData *)responseData error:(NSError *)error{
-  self.checkInProgress = NO;
-  
-  if (error) {
-    [self reportError:error];
-  } else if ([responseData length]) {
-    NSString *responseString = [[NSString alloc] initWithBytes:[responseData bytes] length:[responseData length] encoding: NSUTF8StringEncoding];
-    BITHockeyLogWarning(@"INFO: Received API response: %@", responseString);
-    
-    if (!responseString || ![responseString dataUsingEncoding:NSUTF8StringEncoding]) {
-      return;
-    }
-    
-    [self processStoreResponseWithString:responseString];
-  }
-}
-
-- (void)checkForUpdateDelayed {
-  [self checkForUpdateManual:NO];
-}
-
-- (void)checkForUpdate {
-  [self checkForUpdateManual:YES];
-}
-
-
-// begin the startup process
-- (void)startManager {
-  if ([self shouldCancelProcessing]) return;
-  
-  BITHockeyLogDebug(@"INFO: Start UpdateManager");
-
-  if ([self.userDefaults objectForKey:kBITStoreUpdateDateOfLastCheck]) {
-    self.lastCheck = [self.userDefaults objectForKey:kBITStoreUpdateDateOfLastCheck];
-  }
-  
-  if (!self.lastCheck) {
-    self.lastCheck = [NSDate distantPast];
-  }
-  
-  [self registerObservers];
-  
-  // we are already delayed, so the notification already came in and this won't invoked twice
-  switch ([BITHockeyHelper applicationState]) {
-    case BITApplicationStateActive:
-      [self didBecomeActiveActions];
-      break;
-    case BITApplicationStateBackground:
-    case BITApplicationStateInactive:
-    case BITApplicationStateUnknown:
-      // do nothing, wait for active state
-      break;
-  }
-}
-
-
-#pragma mark - Alert
-
-- (void)showUpdateAlert {
-  dispatch_async(dispatch_get_main_queue(), ^{
-  if (!self.updateAlertShowing) {
-    NSString *versionString = [NSString stringWithFormat:@"%@ %@", BITHockeyLocalizedString(@"Version"), self.latestStoreVersion];
-    __weak typeof(self) weakSelf = self;
-
-    UIAlertController *alertController = [UIAlertController alertControllerWithTitle:BITHockeyLocalizedString(@"UpdateAvailable")
-                                                                             message:[NSString stringWithFormat:BITHockeyLocalizedString(@"UpdateAlertTextWithAppVersion"), versionString]
-                                                                      preferredStyle:UIAlertControllerStyleAlert];
-    UIAlertAction *ignoreAction = [BITAlertAction actionWithTitle:BITHockeyLocalizedString(@"Ignore")
-                                                           style:UIAlertActionStyleCancel
-                                                         handler:^(UIAlertAction __unused *action) {
-                                                           typeof(self) strongSelf = weakSelf;
-                                                           [strongSelf ignoreAction];
-                                                         }];
-    [alertController addAction:ignoreAction];
-    UIAlertAction *remindAction = [BITAlertAction actionWithTitle:BITHockeyLocalizedString(@"Remind Me")
-                                                           style:UIAlertActionStyleDefault
-                                                         handler:^(UIAlertAction __unused *action) {
-                                                           typeof(self) strongSelf = weakSelf;
-                                                           [strongSelf remindAction];
-                                                         }];
-    [alertController addAction:remindAction];
-    UIAlertAction *showAction = [BITAlertAction actionWithTitle:BITHockeyLocalizedString(@"Show")
-                                                         style:UIAlertActionStyleDefault
-                                                       handler:^(UIAlertAction __unused *action) {
-                                                         typeof(self) strongSelf = weakSelf;
-                                                         [strongSelf showAction];
-                                                       }];
-    [alertController addAction:showAction];
-    [self showAlertController:alertController];
-    self.updateAlertShowing = YES;
-  }
-  });
-}
-
-
-#pragma mark - Properties
-
-- (void)setLastCheck:(NSDate *)aLastCheck {
-  if (_lastCheck != aLastCheck) {
-    _lastCheck = aLastCheck;
-    
-    [self.userDefaults setObject:self.lastCheck forKey:kBITStoreUpdateDateOfLastCheck];
-  }
-}
-
-- (void)ignoreAction {
-  self.updateAlertShowing = NO;
-  [self.userDefaults setObject:self.latestStoreVersion forKey:kBITStoreUpdateIgnoreVersion];
-}
-
-- (void)remindAction {
-  self.updateAlertShowing = NO;
-}
-
-- (void)showAction {
-  self.updateAlertShowing = NO;
-  [self.userDefaults setObject:self.latestStoreVersion forKey:kBITStoreUpdateIgnoreVersion];
-  
-  if (self.appStoreURLString) {
-    [[UIApplication sharedApplication] openURL:(NSURL *)[NSURL URLWithString:self.appStoreURLString]];
-  } else {
-    BITHockeyLogWarning(@"WARNING: The app store page couldn't be opened, since we did not get a valid URL from the store API.");
-  }
-}
-
-@end
-
-#endif /* HOCKEYSDK_FEATURE_STORE_UPDATES */
diff --git a/submodules/HockeySDK-iOS/Classes/BITStoreUpdateManagerDelegate.h b/submodules/HockeySDK-iOS/Classes/BITStoreUpdateManagerDelegate.h
deleted file mode 100644
index 0d629dc0d5..0000000000
--- a/submodules/HockeySDK-iOS/Classes/BITStoreUpdateManagerDelegate.h
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Author: Andreas Linde <mail@andreaslinde.de>
- *
- * Copyright (c) 2013-2014 HockeyApp, Bit Stadium GmbH.
- * All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person
- * obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without
- * restriction, including without limitation the rights to use,
- * copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following
- * conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
- * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#import <Foundation/Foundation.h>
-
-@class BITStoreUpdateManager;
-
-/**
- The `BITStoreUpdateManagerDelegate` formal protocol defines methods for
- more interaction with `BITStoreUpdateManager`.
- */
-
-@protocol BITStoreUpdateManagerDelegate <NSObject>
-
-@optional
-
-
-///-----------------------------------------------------------------------------
-/// @name Update information
-///-----------------------------------------------------------------------------
-
-/** Informs which new version has been reported to be available
- 
- @warning If this is invoked with a simulated new version, the storeURL could be _NIL_ if the current builds
- bundle identifier is different to the bundle identifier used in the app store build.
- @param storeUpdateManager The `BITStoreUpdateManager` instance invoking this delegate
- @param newVersion The new version string reported by the App Store
- @param storeURL The App Store URL for this app that could be invoked to let them perform the update.
- */
--(void)detectedUpdateFromStoreUpdateManager:(BITStoreUpdateManager *)storeUpdateManager newVersion:(NSString *)newVersion storeURL:(NSURL *)storeURL;
-
-
-
-@end
diff --git a/submodules/HockeySDK-iOS/Classes/BITStoreUpdateManagerPrivate.h b/submodules/HockeySDK-iOS/Classes/BITStoreUpdateManagerPrivate.h
deleted file mode 100644
index 156913c514..0000000000
--- a/submodules/HockeySDK-iOS/Classes/BITStoreUpdateManagerPrivate.h
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * Author: Andreas Linde <mail@andreaslinde.de>
- *         Peter Steinberger
- *
- * Copyright (c) 2012-2014 HockeyApp, Bit Stadium GmbH.
- * Copyright (c) 2011 Andreas Linde.
- * All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person
- * obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without
- * restriction, including without limitation the rights to use,
- * copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following
- * conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
- * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
- */
-
-
-#if HOCKEYSDK_FEATURE_STORE_UPDATES
-
-@interface BITStoreUpdateManager () {
-}
-
-///-----------------------------------------------------------------------------
-/// @name Delegate
-///-----------------------------------------------------------------------------
-
-/**
- Sets the optional `BITStoreUpdateManagerDelegate` delegate.
- */
-@property (nonatomic, weak) id delegate;
-
-
-// is an update available?
-@property (nonatomic, assign, getter=isUpdateAvailable) BOOL updateAvailable;
-
-// are we currently checking for updates?
-@property (nonatomic, assign, getter=isCheckInProgress) BOOL checkInProgress;
-
-@property (nonatomic, strong) NSDate *lastCheck;
-
-// used by BITHockeyManager if disable status is changed
-@property (nonatomic, getter = isStoreUpdateManagerEnabled) BOOL enableStoreUpdateManager;
-
-#pragma mark - For Testing
-
-@property (nonatomic, strong) NSBundle *mainBundle;
-@property (nonatomic, strong) NSLocale *currentLocale;
-@property (nonatomic, strong) NSUserDefaults *userDefaults;
-
-- (BOOL)shouldAutoCheckForUpdates;
-- (BOOL)hasNewVersion:(NSDictionary *)dictionary;
-- (BOOL)processStoreResponseWithString:(NSString *)responseString;
-- (void)checkForUpdateDelayed;
-
-@end
-
-#endif /* HOCKEYSDK_FEATURE_STORE_UPDATES */
diff --git a/submodules/HockeySDK-iOS/Classes/BITTelemetryContext.h b/submodules/HockeySDK-iOS/Classes/BITTelemetryContext.h
deleted file mode 100644
index 31ef5ba742..0000000000
--- a/submodules/HockeySDK-iOS/Classes/BITTelemetryContext.h
+++ /dev/null
@@ -1,106 +0,0 @@
-#import "HockeySDKFeatureConfig.h"
-
-#if HOCKEYSDK_FEATURE_METRICS
-
-#import <Foundation/Foundation.h>
-#import "BITApplication.h"
-#import "BITDevice.h"
-#import "BITInternal.h"
-#import "BITUser.h"
-#import "BITSession.h"
-
-@class BITPersistence;
-
-#import "HockeySDKNullability.h"
-NS_ASSUME_NONNULL_BEGIN
-
-/**
- *  Context object which contains information about the device, user, session etc.
- */
-@interface BITTelemetryContext : NSObject
-
-///-----------------------------------------------------------------------------
-/// @name Initialisation
-///-----------------------------------------------------------------------------
-
-/**
- *  The persistence instance used to save/load metadata.
- */
-@property(nonatomic, strong) BITPersistence *persistence;
-
-/**
- *  The instrumentation key of the app.
- */
-@property(nonatomic, copy) NSString *appIdentifier;
-
-/**
- *  A queue which makes array operations thread safe.
- */
-@property (nonatomic, strong) dispatch_queue_t operationsQueue;
-
-/**
- *  The application context.
- */
-@property(nonatomic, strong, readonly) BITApplication *application;
-
-/**
- *  The device context.
- */
-@property (nonatomic, strong, readonly)BITDevice *device;
-
-/**
- *  The session context.
- */
-@property (nonatomic, strong, readonly)BITSession *session;
-
-/**
- *  The user context.
- */
-@property (nonatomic, strong, readonly)BITUser *user;
-
-/**
- *  The internal context.
- */
-@property (nonatomic, strong, readonly)BITInternal *internal;
-
-/**
- *  Initializes a telemetry context.
- *
- *  @param appIdentifier the appIdentifier of the app
- *  @param persistence the persistence used to save and load metadata
- *
- *  @return the telemetry context
- */
-- (instancetype)initWithAppIdentifier:(NSString *)appIdentifier persistence:(BITPersistence *)persistence;
-
-///-----------------------------------------------------------------------------
-/// @name Helper
-///-----------------------------------------------------------------------------
-
-/**
- *  A dictionary which holds static tag fields for the purpose of caching
- */
-@property (nonatomic, strong) NSDictionary *tags;
-
-/**
- *  Returns context objects as dictionary.
- *
- *  @return a dictionary containing all context fields
- */
-- (NSDictionary *)contextDictionary;
-
-///-----------------------------------------------------------------------------
-/// @name Getter/Setter
-///-----------------------------------------------------------------------------
-
-- (void)setSessionId:(NSString *)sessionId;
-
-- (void)setIsFirstSession:(NSString *)isFirstSession;
-
-- (void)setIsNewSession:(NSString *)isNewSession;
-
-@end
-
-NS_ASSUME_NONNULL_END
-
-#endif /* HOCKEYSDK_FEATURE_METRICS */
diff --git a/submodules/HockeySDK-iOS/Classes/BITTelemetryContext.m b/submodules/HockeySDK-iOS/Classes/BITTelemetryContext.m
deleted file mode 100644
index b0119268a5..0000000000
--- a/submodules/HockeySDK-iOS/Classes/BITTelemetryContext.m
+++ /dev/null
@@ -1,380 +0,0 @@
-#import <Foundation/Foundation.h>
-#import "BITTelemetryContext.h"
-
-#if HOCKEYSDK_FEATURE_METRICS
-
-#import "BITMetricsManagerPrivate.h"
-#import "BITHockeyHelper.h"
-#import "BITPersistence.h"
-#import "BITPersistencePrivate.h"
-
-static NSString *const kBITUserMetaData = @"BITUserMetaData";
-
-static char *const BITContextOperationsQueue = "net.hockeyapp.telemetryContextQueue";
-
-@implementation BITTelemetryContext
-
-@synthesize appIdentifier = _appIdentifier;
-@synthesize persistence = _persistence;
-
-#pragma mark - Initialisation
-
--(instancetype)init {
-  
-  if((self = [super init])) {
-    _operationsQueue = dispatch_queue_create(BITContextOperationsQueue, DISPATCH_QUEUE_CONCURRENT);
-  }
-  return self;
-}
-      
-- (instancetype)initWithAppIdentifier:(NSString *)appIdentifier persistence:(BITPersistence *)persistence {
-  
-  if ((self = [self init])) {
-    _persistence = persistence;
-    _appIdentifier = appIdentifier;
-    BITDevice *deviceContext = [BITDevice new];
-    deviceContext.model = bit_devicePlatform();
-    deviceContext.type = bit_deviceType();
-    deviceContext.osVersion = bit_osVersionBuild();
-    deviceContext.os = bit_osName();
-    deviceContext.deviceId = bit_appAnonID(NO);
-    deviceContext.locale = bit_deviceLocale();
-    deviceContext.language = bit_deviceLanguage();
-    deviceContext.screenResolution = bit_screenSize();
-    deviceContext.oemName = @"Apple";
-    
-    BITInternal *internalContext = [BITInternal new];
-    internalContext.sdkVersion = bit_sdkVersion();
-    
-    BITApplication *applicationContext = [BITApplication new];
-    applicationContext.version = bit_appVersion();
-    
-    BITUser *userContext = [self loadUser];
-    if (!userContext) {
-      userContext = [self newUser];
-      [self saveUser:userContext];
-    }
-
-    BITSession *sessionContext = [BITSession new];
-    
-    _application = applicationContext;
-    _device = deviceContext;
-    _user = userContext;
-    _internal = internalContext;
-    _session = sessionContext;
-    _tags = [self tags];
-  }
-  return self;
-}
-
-- (void)dealloc {
-  [[NSNotificationCenter defaultCenter] removeObserver:self];
-}
-
-#pragma mark - User
-
-- (BITUser *)newUser {
-  return ({
-    BITUser *user = [BITUser new];
-    user.userId = bit_appAnonID(NO);
-    user;
-  });
-}
-
-- (void)saveUser:(BITUser *)user{
-  NSDictionary *userMetaData = @{kBITUserMetaData : user};
-  [self.persistence persistMetaData:userMetaData];
-}
-
-- (nullable BITUser *)loadUser{
-  NSDictionary *metaData =[self.persistence metaData];
-  BITUser *user = [metaData objectForKey:kBITUserMetaData];
-  return user;
-}
-
-#pragma mark - Network
-
-#pragma mark - Getter/Setter properties
-
-- (NSString *)appIdentifier {
-  __block NSString *tmp;
-  dispatch_sync(self.operationsQueue, ^{
-    tmp = self->_appIdentifier;
-  });
-  return tmp;
-}
-
-- (void)setAppIdentifier:(NSString *)appIdentifier {
-  NSString* tmp = [appIdentifier copy];
-  dispatch_barrier_async(self.operationsQueue, ^{
-    self->_appIdentifier = tmp;
-  });
-}
-
-- (NSString *)screenResolution {
-  __block NSString *tmp;
-  dispatch_sync(self.operationsQueue, ^{
-    tmp = self.device.screenResolution;
-  });
-  return tmp;
-}
-
-- (void)setScreenResolution:(NSString *)screenResolution {
-  NSString* tmp = [screenResolution copy];
-  dispatch_barrier_async(self.operationsQueue, ^{
-    self.device.screenResolution = tmp;
-  });
-}
-
-- (NSString *)appVersion {
-  __block NSString *tmp;
-  dispatch_sync(self.operationsQueue, ^{
-    tmp = self.application.version;
-  });
-  return tmp;
-}
-
-- (void)setAppVersion:(NSString *)appVersion {
-  NSString* tmp = [appVersion copy];
-  dispatch_barrier_async(self.operationsQueue, ^{
-    self.application.version = tmp;
-  });
-}
-
-- (NSString *)anonymousUserId {
-  __block NSString *tmp;
-  dispatch_sync(self.operationsQueue, ^{
-    tmp = self.user.userId;
-  });
-  return tmp;
-}
-
-- (void)setAnonymousUserId:(NSString *)userId {
-  NSString* tmp = [userId copy];
-  dispatch_barrier_async(self.operationsQueue, ^{
-    self.user.userId = tmp;
-  });
-}
-
-- (NSString *)anonymousUserAquisitionDate {
-  __block NSString *tmp;
-  dispatch_sync(self.operationsQueue, ^{
-    tmp = self.user.anonUserAcquisitionDate;
-  });
-  return tmp;
-}
-
-- (void)setAnonymousUserAquisitionDate:(NSString *)anonymousUserAquisitionDate {
-  NSString* tmp = [anonymousUserAquisitionDate copy];
-  dispatch_barrier_async(self.operationsQueue, ^{
-    self.user.anonUserAcquisitionDate = tmp;
-  });
-}
-
-- (NSString *)sdkVersion {
-  __block NSString *tmp;
-  dispatch_sync(self.operationsQueue, ^{
-    tmp = self.internal.sdkVersion;
-  });
-  return tmp;
-}
-
-- (void)setSdkVersion:(NSString *)sdkVersion {
-  NSString* tmp = [sdkVersion copy];
-  dispatch_barrier_async(self.operationsQueue, ^{
-    self.internal.sdkVersion = tmp;
-  });
-}
-
-- (NSString *)sessionId {
-  __block NSString *tmp;
-  dispatch_sync(self.operationsQueue, ^{
-    tmp = self.session.sessionId;
-  });
-  return tmp;
-}
-
-- (void)setSessionId:(NSString *)sessionId {
-  NSString* tmp = [sessionId copy];
-  dispatch_barrier_async(self.operationsQueue, ^{
-    self.session.sessionId = tmp;
-  });
-}
-
-- (NSString *)isFirstSession {
-  __block NSString *tmp;
-  dispatch_sync(self.operationsQueue, ^{
-    tmp = self.session.isFirst;
-  });
-  return tmp;
-}
-
-- (void)setIsFirstSession:(NSString *)isFirstSession {
-  NSString* tmp = [isFirstSession copy];
-  dispatch_barrier_async(self.operationsQueue, ^{
-    self.session.isFirst = tmp;
-  });
-}
-
-- (NSString *)isNewSession {
-  __block NSString *tmp;
-  dispatch_sync(self.operationsQueue, ^{
-    tmp = self.session.isNew;
-  });
-  return tmp;
-}
-
-- (void)setIsNewSession:(NSString *)isNewSession {
-  NSString* tmp = [isNewSession copy];
-  dispatch_barrier_async(self.operationsQueue, ^{
-    self.session.isNew = tmp;
-  });
-}
-
-- (NSString *)osVersion {
-  __block NSString *tmp;
-  dispatch_sync(self.operationsQueue, ^{
-    tmp = self.device.osVersion;
-  });
-  return tmp;
-}
-
-- (void)setOsVersion:(NSString *)osVersion {
-  NSString* tmp = [osVersion copy];
-  dispatch_barrier_async(self.operationsQueue, ^{
-    self.device.osVersion = tmp;
-  });
-}
-
-- (NSString *)osName {
-  __block NSString *tmp;
-  dispatch_sync(self.operationsQueue, ^{
-    tmp = self.device.os;
-  });
-  return tmp;
-}
-
-- (void)setOsName:(NSString *)osName {
-  NSString* tmp = [osName copy];
-  dispatch_barrier_async(self.operationsQueue, ^{
-    self.device.os = tmp;
-  });
-}
-
-- (NSString *)deviceModel {
-  __block NSString *tmp;
-  dispatch_sync(self.operationsQueue, ^{
-    tmp = self.device.model;
-  });
-  return tmp;
-}
-
-- (void)setDeviceModel:(NSString *)deviceModel {
-  NSString* tmp = [deviceModel copy];
-  dispatch_barrier_async(self.operationsQueue, ^{
-    self.device.model = tmp;
-  });
-}
-
-- (NSString *)deviceOemName {
-  __block NSString *tmp;
-  dispatch_sync(self.operationsQueue, ^{
-    tmp = self.device.oemName;
-  });
-  return tmp;
-}
-
-- (void)setDeviceOemName:(NSString *)oemName {
-  NSString* tmp = [oemName copy];
-  dispatch_barrier_async(self.operationsQueue, ^{
-    self.device.oemName = tmp;
-  });
-}
-
-- (NSString *)osLocale {
-  __block NSString *tmp;
-  dispatch_sync(self.operationsQueue, ^{
-    tmp = self.device.locale;
-  });
-  return tmp;
-}
-
-- (void)setOsLocale:(NSString *)osLocale {
-  NSString* tmp = [osLocale copy];
-  dispatch_barrier_async(self.operationsQueue, ^{
-    self.device.locale = tmp;
-  });
-}
-
-- (NSString *)osLanguage {
-  __block NSString *tmp;
-  dispatch_sync(self.operationsQueue, ^{
-    tmp = self.device.language;
-  });
-  return tmp;
-}
-
-- (void)setOsLanguage:(NSString *)osLanguage {
-  NSString* tmp = [osLanguage copy];
-  dispatch_barrier_async(self.operationsQueue, ^{
-    self.device.language = tmp;
-  });
-}
-
-- (NSString *)deviceId {
-  __block NSString *tmp;
-  dispatch_sync(self.operationsQueue, ^{
-    tmp = self.device.deviceId;
-  });
-  return tmp;
-}
-
-- (void)setDeviceId:(NSString *)deviceId {
-  NSString* tmp = [deviceId copy];
-  dispatch_barrier_async(self.operationsQueue, ^{
-    self.device.deviceId = tmp;
-  });
-}
-
-- (NSString *)deviceType {
-  __block NSString *tmp;
-  dispatch_sync(self.operationsQueue, ^{
-    tmp = self.device.type;
-  });
-  return tmp;
-}
-
-- (void)setDeviceType:(NSString *)deviceType {
-  NSString* tmp = [deviceType copy];
-  dispatch_barrier_async(self.operationsQueue, ^{
-    self.device.type = tmp;
-  });
-}
-
-#pragma mark - Custom getter
-#pragma mark - Helper
-
-- (NSDictionary *)contextDictionary {
-  __block NSMutableDictionary *tmp = [NSMutableDictionary new];
-  dispatch_sync(self.operationsQueue, ^{
-    [tmp addEntriesFromDictionary:self.tags];
-    [tmp addEntriesFromDictionary:[self.session serializeToDictionary]];
-    [tmp addEntriesFromDictionary:[self.user serializeToDictionary]];
-  });
-  return tmp;
-}
-
-- (NSDictionary *)tags {
-  if(!_tags){
-    NSMutableDictionary *tags = [self.application serializeToDictionary].mutableCopy;
-    [tags addEntriesFromDictionary:[self.application serializeToDictionary]];
-    [tags addEntriesFromDictionary:[self.internal serializeToDictionary]];
-    [tags addEntriesFromDictionary:[self.device serializeToDictionary]];
-    _tags = tags;
-  }
-  return _tags;
-}
-
-@end
-
-#endif /* HOCKEYSDK_FEATURE_METRICS */
diff --git a/submodules/HockeySDK-iOS/Classes/BITTelemetryData.h b/submodules/HockeySDK-iOS/Classes/BITTelemetryData.h
deleted file mode 100644
index 50539a1074..0000000000
--- a/submodules/HockeySDK-iOS/Classes/BITTelemetryData.h
+++ /dev/null
@@ -1,18 +0,0 @@
-#import "BITTelemetryObject.h"
-
-#import "HockeySDKNullability.h"
-NS_ASSUME_NONNULL_BEGIN
-
-///Data contract class for type BITTelemetryData.
-@interface BITTelemetryData : BITTelemetryObject <NSCoding>
-
-@property (nonatomic, readonly, copy) NSString *envelopeTypeName;
-@property (nonatomic, readonly, copy) NSString *dataTypeName;
-
-@property (nonatomic, copy) NSNumber *version;
-@property (nonatomic, copy) NSString *name;
-@property (nonatomic, strong) NSDictionary *properties;
-
-@end
-
-NS_ASSUME_NONNULL_END
diff --git a/submodules/HockeySDK-iOS/Classes/BITTelemetryData.m b/submodules/HockeySDK-iOS/Classes/BITTelemetryData.m
deleted file mode 100644
index 285ff321f5..0000000000
--- a/submodules/HockeySDK-iOS/Classes/BITTelemetryData.m
+++ /dev/null
@@ -1,33 +0,0 @@
-#import "BITTelemetryData.h"
-
-@implementation BITTelemetryData
-
-- (NSDictionary *)serializeToDictionary {
-  NSMutableDictionary *dict = [super serializeToDictionary].mutableCopy;
-  if (self.version != nil) {
-    [dict setObject:self.version forKey:@"ver"];
-  }
-  
-  return dict;	
-}
-
-#pragma mark - NSCoding
-
-- (instancetype)initWithCoder:(NSCoder *)coder {
-  self = [super initWithCoder:coder];
-  if(self) {
-    _version = (NSNumber *)[coder decodeObjectForKey:@"self.version"];
-    _name = (NSString *)[coder decodeObjectForKey:@"self.name"];
-    _properties = (NSDictionary *)[coder decodeObjectForKey:@"self.properties"];
-  }
-  return self;
-}
-
-- (void)encodeWithCoder:(NSCoder *)coder {
-  [super encodeWithCoder:coder];
-  [coder encodeObject:self.version forKey:@"self.version"];
-  [coder encodeObject:self.name forKey:@"self.name"];
-  [coder encodeObject:self.properties forKey:@"self.properties"];
-}
-
-@end
diff --git a/submodules/HockeySDK-iOS/Classes/BITTelemetryObject.h b/submodules/HockeySDK-iOS/Classes/BITTelemetryObject.h
deleted file mode 100644
index 09b1dda154..0000000000
--- a/submodules/HockeySDK-iOS/Classes/BITTelemetryObject.h
+++ /dev/null
@@ -1,8 +0,0 @@
-#import <Foundation/Foundation.h>
-
-
-@interface BITTelemetryObject : NSObject <NSCoding>
-
-- (NSDictionary *)serializeToDictionary;
-
-@end
diff --git a/submodules/HockeySDK-iOS/Classes/BITTelemetryObject.m b/submodules/HockeySDK-iOS/Classes/BITTelemetryObject.m
deleted file mode 100644
index c996738696..0000000000
--- a/submodules/HockeySDK-iOS/Classes/BITTelemetryObject.m
+++ /dev/null
@@ -1,18 +0,0 @@
-#import "BITTelemetryObject.h"
-
-@implementation BITTelemetryObject
-
-// empty implementation for the base class
-- (NSDictionary *)serializeToDictionary{
-  return [NSDictionary dictionary];
-}
-
-- (void)encodeWithCoder:(NSCoder *) __unused coder {
-}
-
-- (instancetype)initWithCoder:(NSCoder *) __unused coder {
-  return [super init];
-}
-
-
-@end
diff --git a/submodules/HockeySDK-iOS/Classes/BITUpdateManager.h b/submodules/HockeySDK-iOS/Classes/BITUpdateManager.h
deleted file mode 100644
index c39cf714ff..0000000000
--- a/submodules/HockeySDK-iOS/Classes/BITUpdateManager.h
+++ /dev/null
@@ -1,238 +0,0 @@
-/*
- * Author: Andreas Linde <mail@andreaslinde.de>
- *         Peter Steinberger
- *
- * Copyright (c) 2012-2014 HockeyApp, Bit Stadium GmbH.
- * Copyright (c) 2011 Andreas Linde.
- * All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person
- * obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without
- * restriction, including without limitation the rights to use,
- * copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following
- * conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
- * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
- */
-
-
-#import "BITHockeyBaseManager.h"
-
-
-/**
- *  Update check interval
- */
-typedef NS_ENUM (NSUInteger, BITUpdateSetting) {
-  /**
-   *  On every startup or or when the app comes to the foreground
-   */
-  BITUpdateCheckStartup = 0,
-  /**
-   *  Once a day
-   */
-  BITUpdateCheckDaily = 1,
-  /**
-   *  Manually
-   */
-  BITUpdateCheckManually = 2
-};
-
-@protocol BITUpdateManagerDelegate;
-
-@class BITAppVersionMetaInfo;
-@class BITUpdateViewController;
-
-/**
- The update manager module.
- 
- This is the HockeySDK module for handling app updates when using Ad-Hoc or Enterprise provisioning profiles.
- This module handles version updates, presents update and version information in an App Store like user interface,
- collects usage information and provides additional authorization options when using Ad-Hoc provisioning profiles.
- 
- By default, this module automatically disables itself when running in an App Store build!
- 
- The protocol `BITUpdateManagerDelegate` provides delegates to inform about events and adjust a few behaviors.
- 
- To use the server side restriction feature, to provide updates only to specific users, you need to setup the
- `BITAuthenticator` class. This allows the update request to tell the server which user is using the app on the
- current device and then let the server decide which updates the device may see.
- 
- */
-
-@interface BITUpdateManager : BITHockeyBaseManager
-
-///-----------------------------------------------------------------------------
-/// @name Update Checking
-///-----------------------------------------------------------------------------
-
-// see HockeyUpdateSetting-enum. Will be saved in user defaults.
-// default value: HockeyUpdateCheckStartup
-/**
- When to check for new updates.
- 
- Defines when the SDK should check if there is a new update available on the
- server. This must be assigned one of the following, see `BITUpdateSetting`:
- 
- - `BITUpdateCheckStartup`: On every startup or or when the app comes to the foreground
- - `BITUpdateCheckDaily`: Once a day
- - `BITUpdateCheckManually`: Manually
- 
- When running the app from the App Store, this setting is ignored.
-
- **Default**: BITUpdateCheckStartup
- 
- @warning When setting this to `BITUpdateCheckManually` you need to either
- invoke the update checking process yourself with `checkForUpdate` somehow, e.g. by
- proving an update check button for the user or integrating the Update View into your
- user interface.
- @see BITUpdateSetting
- @see checkForUpdateOnLaunch
- @see checkForUpdate
- */
-@property (nonatomic, assign) BITUpdateSetting updateSetting;
-
-
-/**
- Flag that determines whether the automatic update checks should be done.
- 
- If this is enabled the update checks will be performed automatically depending on the
- `updateSetting` property. If this is disabled the `updateSetting` property will have
- no effect, and checking for updates is totally up to be done by yourself.
- 
- When running the app from the App Store, this setting is ignored.
-
- *Default*: _YES_
-
- @warning When setting this to `NO` you need to invoke update checks yourself!
- @see updateSetting
- @see checkForUpdate
- */
-@property (nonatomic, assign, getter=isCheckForUpdateOnLaunch) BOOL checkForUpdateOnLaunch;
-
-
-// manually start an update check
-/**
- Check for an update
- 
- Call this to trigger a check if there is a new update available on the HockeyApp servers.
- 
- When running the app from the App Store, this method call is ignored.
-
- @see updateSetting
- @see checkForUpdateOnLaunch
- */
-- (void)checkForUpdate;
-
-
-///-----------------------------------------------------------------------------
-/// @name Update Notification
-///-----------------------------------------------------------------------------
-
-/**
- Flag that determines if update alerts should be repeatedly shown
- 
- If enabled the update alert shows on every startup and whenever the app becomes active,
- until the update is installed.
- If disabled the update alert is only shown once ever and it is up to you to provide an
- alternate way for the user to navigate to the update UI or update in another way.
- 
- When running the app from the App Store, this setting is ignored.
-
- *Default*: _YES_
- */
-@property (nonatomic, assign) BOOL alwaysShowUpdateReminder;
-
-
-/**
- Flag that determines if the update alert should show a direct install option
- 
- If enabled the update alert shows an additional option which allows to invoke the update
- installation process directly instead of viewing the update UI first.
- By default the alert only shows a `Show` and `Ignore` option.
- 
- When running the app from the App Store, this setting is ignored.
-
- *Default*: _NO_
- */
-@property (nonatomic, assign, getter=isShowingDirectInstallOption) BOOL showDirectInstallOption;
-
-
-///-----------------------------------------------------------------------------
-/// @name Expiry
-///-----------------------------------------------------------------------------
-
-/**
- Expiry date of the current app version
- 
- If set, the app will get unusable at the given date by presenting a blocking view on
- top of the apps UI so that no interaction is possible. To present a custom UI, check
- the documentation of the 
- `[BITUpdateManagerDelegate shouldDisplayExpiryAlertForUpdateManager:]` delegate.
- 
- Once the expiry date is reached, the app will no longer check for updates or
- send any usage data to the server!
- 
- When running the app from the App Store, this setting is ignored.
- 
- *Default*: nil
- @see disableUpdateCheckOptionWhenExpired
- @see [BITUpdateManagerDelegate shouldDisplayExpiryAlertForUpdateManager:]
- @see [BITUpdateManagerDelegate didDisplayExpiryAlertForUpdateManager:]
- @warning This only works when using Ad-Hoc provisioning profiles!
- */
-@property (nonatomic, strong) NSDate *expiryDate;
-
-/**
- Disable the update check button from expiry screen or alerts
-
- If do not want your users to be able to check for updates once a version is expired,
- then enable this property.
- 
- If this is not enabled, the users will be able to check for updates and install them
- if any is available for the current device.
-
- *Default*: NO
- @see expiryDate
- @see [BITUpdateManagerDelegate shouldDisplayExpiryAlertForUpdateManager:]
- @see [BITUpdateManagerDelegate didDisplayExpiryAlertForUpdateManager:]
- @warning This only works when using Ad-Hoc provisioning profiles!
-*/
-@property (nonatomic) BOOL disableUpdateCheckOptionWhenExpired;
-
-
-///-----------------------------------------------------------------------------
-/// @name User Interface
-///-----------------------------------------------------------------------------
-
-
-/**
- Present the modal update user interface.
- 
- @warning Make sure to call this method from the main thread!
- */
-- (void)showUpdateView;
-
-
-/**
- Create an update view
-
- @param modal Return a view which is ready for modal presentation with an integrated navigation bar
- @return BITUpdateViewController The update user interface view controller,
- e.g. to push it onto a navigation stack.
- */
-- (BITUpdateViewController *)hockeyViewController:(BOOL)modal;
-
-@end
diff --git a/submodules/HockeySDK-iOS/Classes/BITUpdateManager.m b/submodules/HockeySDK-iOS/Classes/BITUpdateManager.m
deleted file mode 100644
index 5516eb2173..0000000000
--- a/submodules/HockeySDK-iOS/Classes/BITUpdateManager.m
+++ /dev/null
@@ -1,1152 +0,0 @@
-/*
- * Author: Andreas Linde <mail@andreaslinde.de>
- *         Peter Steinberger
- *
- * Copyright (c) 2012-2014 HockeyApp, Bit Stadium GmbH.
- * Copyright (c) 2011 Andreas Linde.
- * All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person
- * obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without
- * restriction, including without limitation the rights to use,
- * copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following
- * conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
- * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#import "HockeySDK.h"
-
-#if HOCKEYSDK_FEATURE_UPDATES
-
-#import <sys/sysctl.h>
-
-#import "HockeySDKPrivate.h"
-#import "BITHockeyHelper.h"
-#import "BITHockeyHelper+Application.h"
-
-#import "BITHockeyBaseManagerPrivate.h"
-#import "BITUpdateManagerPrivate.h"
-#import "BITUpdateViewControllerPrivate.h"
-#import "BITAppVersionMetaInfo.h"
-
-#if HOCKEYSDK_FEATURE_CRASH_REPORTER
-#import "BITCrashManagerPrivate.h"
-#endif
-
-typedef NS_ENUM(NSInteger, BITUpdateAlertViewTag) {
-  BITUpdateAlertViewTagDefaultUpdate = 0,
-  BITUpdateAlertViewTagNeverEndingAlertView = 1,
-  BITUpdateAlertViewTagMandatoryUpdate = 2,
-};
-
-@interface BITUpdateManager ()
-
-@property (nonatomic, copy) NSString *currentAppVersion;
-@property (nonatomic) BOOL dataFound;
-@property (nonatomic) BOOL showFeedback;
-@property (nonatomic) BOOL updateAlertShowing;
-@property (nonatomic) BOOL lastCheckFailed;
-@property (nonatomic, strong) NSFileManager *fileManager;
-@property (nonatomic, copy) NSString *updateDir;
-@property (nonatomic, copy) NSString *usageDataFile;
-@property (nonatomic, weak) id appDidBecomeActiveObserver;
-@property (nonatomic, weak) id appDidEnterBackgroundObserver;
-@property (nonatomic, weak) id networkDidBecomeReachableObserver;
-@property (nonatomic) BOOL didStartUpdateProcess;
-@property (nonatomic) BOOL didEnterBackgroundState;
-@property (nonatomic) BOOL firstStartAfterInstall;
-@property (nonatomic, strong) NSNumber *versionID;
-@property (nonatomic, copy) NSString *versionUUID;
-@property (nonatomic, copy) NSString *uuid;
-@property (nonatomic, copy) NSString *blockingScreenMessage;
-@property (nonatomic, strong) NSDate *lastUpdateCheckFromBlockingScreen;
-
-@end
-
-@implementation BITUpdateManager
-
-
-#pragma mark - private
-
-- (void)reportError:(NSError *)error {
-  BITHockeyLogError(@"ERROR: %@", [error localizedDescription]);
-  self.lastCheckFailed = YES;
-  
-  // only show error if we enable that
-  if (self.showFeedback) {
-    UIAlertController *alertController = [UIAlertController alertControllerWithTitle:BITHockeyLocalizedString(@"An Error Occurred")
-                                                                             message:[error localizedDescription]
-                                                                      preferredStyle:UIAlertControllerStyleAlert];
-    UIAlertAction *okAction = [BITAlertAction actionWithTitle:BITHockeyLocalizedString(@"OK")
-                                                       style:UIAlertActionStyleDefault
-                                                     handler:^(UIAlertAction __unused *action) {}];
-    [alertController addAction:okAction];
-    [self showAlertController:alertController];
-    self.showFeedback = NO;
-  }
-}
-
-
-- (void)didBecomeActiveActions {
-  if ([self isUpdateManagerDisabled]) return;
-  
-  // this is a special iOS 8 case for handling the case that the app is not moved to background
-  // once the users accepts the iOS install alert button. Without this, the install process doesn't start.
-  //
-  // Important: The iOS dialog offers the user to deny installation, we can't find out which button
-  // was tapped, so we assume the user agreed
-  if (self.didStartUpdateProcess) {
-    self.didStartUpdateProcess = NO;    
-    id strongDelegate = self.delegate;
-    if ([strongDelegate respondsToSelector:@selector(updateManagerWillExitApp:)]) {
-      [strongDelegate updateManagerWillExitApp:self];
-    }
-    
-#if HOCKEYSDK_FEATURE_CRASH_REPORTER
-    [[BITHockeyManager sharedHockeyManager].crashManager leavingAppSafely];
-#endif
-    
-    // for now we simply exit the app, later SDK versions might optionally show an alert with localized text
-    // describing the user to press the home button to start the update process
-    exit(0);
-  }
-  
-  if (!self.didEnterBackgroundState) return;
-  
-  self.didEnterBackgroundState = NO;
-  
-  [self checkExpiryDateReached];
-  if ([self expiryDateReached]) return;
-  
-  [self startUsage];
-
-  if ([self isCheckForUpdateOnLaunch] && [self shouldCheckForUpdates]) {
-    [self checkForUpdate];
-  }
-}
-
-- (void)didEnterBackgroundActions {
-  self.didEnterBackgroundState = NO;
-  
-  if ([BITHockeyHelper applicationState] == BITApplicationStateBackground) {
-    self.didEnterBackgroundState = YES;
-  }
-}
-
-
-#pragma mark - Observers
-- (void) registerObservers {
-  __weak typeof(self) weakSelf = self;
-  if(nil == self.appDidEnterBackgroundObserver) {
-    self.appDidEnterBackgroundObserver = [[NSNotificationCenter defaultCenter] addObserverForName:UIApplicationDidEnterBackgroundNotification
-                                                                                    object:nil
-                                                                                     queue:NSOperationQueue.mainQueue
-                                                                                usingBlock:^(NSNotification __unused *note) {
-                                                                                  typeof(self) strongSelf = weakSelf;
-                                                                                  [strongSelf didEnterBackgroundActions];
-                                                                                }];
-  }
-  if(nil == self.appDidBecomeActiveObserver) {
-    self.appDidBecomeActiveObserver = [[NSNotificationCenter defaultCenter] addObserverForName:UIApplicationDidBecomeActiveNotification
-                                                                                     object:nil
-                                                                                      queue:NSOperationQueue.mainQueue
-                                                                                 usingBlock:^(NSNotification __unused *note) {
-                                                                                   typeof(self) strongSelf = weakSelf;
-                                                                                   [strongSelf didBecomeActiveActions];
-                                                                                 }];
-  }
-  if(nil == self.networkDidBecomeReachableObserver) {
-    self.networkDidBecomeReachableObserver = [[NSNotificationCenter defaultCenter] addObserverForName:BITHockeyNetworkDidBecomeReachableNotification
-                                                                                     object:nil
-                                                                                      queue:NSOperationQueue.mainQueue
-                                                                                 usingBlock:^(NSNotification __unused *note) {
-                                                                                   typeof(self) strongSelf = weakSelf;
-                                                                                   [strongSelf didBecomeActiveActions];
-                                                                                 }];
-  }
-}
-
-- (void) unregisterObservers {
-  id strongDidEnterBackgroundObserver = self.appDidEnterBackgroundObserver;
-  id strongDidBecomeActiveObserver = self.appDidBecomeActiveObserver;
-  id strongNetworkDidBecomeReachableObserver = self.networkDidBecomeReachableObserver;
-  if(strongDidEnterBackgroundObserver) {
-    [[NSNotificationCenter defaultCenter] removeObserver:strongDidEnterBackgroundObserver];
-    self.appDidEnterBackgroundObserver = nil;
-  }
-  if(strongDidBecomeActiveObserver) {
-    [[NSNotificationCenter defaultCenter] removeObserver:strongDidBecomeActiveObserver];
-    self.appDidBecomeActiveObserver = nil;
-  }
-  if(strongNetworkDidBecomeReachableObserver) {
-    [[NSNotificationCenter defaultCenter] removeObserver:strongNetworkDidBecomeReachableObserver];
-    self.networkDidBecomeReachableObserver = nil;
-  }
-}
-
-
-#pragma mark - Expiry
-
-- (BOOL)expiryDateReached {
-  if (self.appEnvironment != BITEnvironmentOther) return NO;
-  
-  if (self.expiryDate) {
-    NSDate *currentDate = [NSDate date];
-    if ([currentDate compare:self.expiryDate] != NSOrderedAscending)
-      return YES;
-  }
-  
-  return NO;
-}
-
-- (void)checkExpiryDateReached {
-  if (![self expiryDateReached]) return;
-  
-  BOOL shouldShowDefaultAlert = YES;
-  id strongDelegate = self.delegate;
-  if ([strongDelegate respondsToSelector:@selector(shouldDisplayExpiryAlertForUpdateManager:)]) {
-    shouldShowDefaultAlert = [strongDelegate shouldDisplayExpiryAlertForUpdateManager:self];
-  }
-  
-  if (shouldShowDefaultAlert) {
-    NSString *appName = bit_appName(BITHockeyLocalizedString(@"Telegram"));
-    if (!self.blockingScreenMessage)
-      self.blockingScreenMessage = [NSString stringWithFormat:BITHockeyLocalizedString(@"Update expired"), appName];
-    [self showBlockingScreen:self.blockingScreenMessage image:@"authorize_denied.png"];
-
-    if ([strongDelegate respondsToSelector:@selector(didDisplayExpiryAlertForUpdateManager:)]) {
-      [strongDelegate didDisplayExpiryAlertForUpdateManager:self];
-    }
-    
-    // the UI is now blocked, make sure we don't add our UI on top of it over and over again
-    [self unregisterObservers];
-  }
-}
-
-#pragma mark - Usage
-
-- (void)loadAppVersionUsageData {
-  self.currentAppVersionUsageTime = @0;
-  
-  if ([self expiryDateReached]) return;
-  
-  BOOL newVersion = NO;
-  
-  if (![[NSUserDefaults standardUserDefaults] valueForKey:kBITUpdateUsageTimeForUUID]) {
-    newVersion = YES;
-  } else {
-    if ([(NSString *)[[NSUserDefaults standardUserDefaults] valueForKey:kBITUpdateUsageTimeForUUID] compare:self.uuid] != NSOrderedSame) {
-      newVersion = YES;
-    }
-  }
-  
-  if (newVersion) {
-    [[NSUserDefaults standardUserDefaults] setObject:[NSNumber numberWithDouble:[[NSDate date] timeIntervalSinceReferenceDate]] forKey:kBITUpdateDateOfVersionInstallation];
-    [[NSUserDefaults standardUserDefaults] setObject:self.uuid forKey:kBITUpdateUsageTimeForUUID];
-    [self storeUsageTimeForCurrentVersion:[NSNumber numberWithDouble:0]];
-  } else {
-    if (![self.fileManager fileExistsAtPath:self.usageDataFile])
-      return;
-    
-    NSData *codedData = [[NSData alloc] initWithContentsOfFile:self.usageDataFile];
-    if (codedData == nil) return;
-    
-    NSKeyedUnarchiver *unarchiver = nil;
-    
-    @try {
-      unarchiver = [[NSKeyedUnarchiver alloc] initForReadingWithData:codedData];
-    }
-    @catch (NSException __unused *exception) {
-      return;
-    }
-    
-    if ([unarchiver containsValueForKey:kBITUpdateUsageTimeOfCurrentVersion]) {
-      self.currentAppVersionUsageTime = [unarchiver decodeObjectForKey:kBITUpdateUsageTimeOfCurrentVersion];
-    }
-    
-    [unarchiver finishDecoding];
-  }
-}
-
-- (void)startUsage {
-  if ([self expiryDateReached]) return;
-  
-  self.usageStartTimestamp = [NSDate date];
-}
-
-- (void)stopUsage {
-  if (self.appEnvironment != BITEnvironmentOther) return;
-  if ([self expiryDateReached]) return;
-  
-  double timeDifference = [[NSDate date] timeIntervalSinceReferenceDate] - [self.usageStartTimestamp timeIntervalSinceReferenceDate];
-  double previousTimeDifference = [self.currentAppVersionUsageTime doubleValue];
-  
-  [self storeUsageTimeForCurrentVersion:[NSNumber numberWithDouble:previousTimeDifference + timeDifference]];
-}
-
-- (void) storeUsageTimeForCurrentVersion:(NSNumber *)usageTime {
-  if (self.appEnvironment != BITEnvironmentOther) return;
-  
-  NSMutableData *data = [[NSMutableData alloc] init];
-  NSKeyedArchiver *archiver = [[NSKeyedArchiver alloc] initForWritingWithMutableData:data];
-  
-  [archiver encodeObject:usageTime forKey:kBITUpdateUsageTimeOfCurrentVersion];
-  
-  [archiver finishEncoding];
-  [data writeToFile:self.usageDataFile atomically:YES];
-  
-  self.currentAppVersionUsageTime = usageTime;
-}
-
-- (NSString *)currentUsageString {
-  double currentUsageTime = [self.currentAppVersionUsageTime doubleValue];
-  
-  if (currentUsageTime > 0) {
-    // round (up) to 1 minute
-    return [NSString stringWithFormat:@"%.0f", ceil(currentUsageTime / 60.0)*60];
-  } else {
-    return @"0";
-  }
-}
-
-- (NSString *)installationDateString {
-  NSDateFormatter *formatter = [[NSDateFormatter alloc] init];
-  [formatter setDateFormat:@"MM/dd/yyyy"];
-  double installationTimeStamp = [[NSUserDefaults standardUserDefaults] doubleForKey:kBITUpdateDateOfVersionInstallation];
-  if (installationTimeStamp == 0.0) {
-    return [formatter stringFromDate:[NSDate date]];
-  } else {
-    return [formatter stringFromDate:[NSDate dateWithTimeIntervalSinceReferenceDate:installationTimeStamp]];
-  }
-}
-
-
-#pragma mark - Cache
-
-- (void)checkUpdateAvailable {
-  // check if there is an update available
-  NSComparisonResult comparisonResult = bit_versionCompare(self.newestAppVersion.version, self.currentAppVersion);
-  
-  if (comparisonResult == NSOrderedDescending) {
-    self.updateAvailable = YES;
-  } else if (comparisonResult == NSOrderedSame) {
-    // compare using the binary UUID and stored version id
-    self.updateAvailable = NO;
-    if (self.firstStartAfterInstall) {
-      if ([self.newestAppVersion hasUUID:self.uuid]) {
-        self.versionUUID = [self.uuid copy];
-        self.versionID = [self.newestAppVersion.versionID copy];
-        [self saveAppCache];
-      } else {
-        [self.appVersions enumerateObjectsUsingBlock:^(id obj, NSUInteger idx, BOOL *stop) {
-          if (idx > 0 && [obj isKindOfClass:[BITAppVersionMetaInfo class]]) {
-            NSComparisonResult compareVersions = bit_versionCompare([(BITAppVersionMetaInfo *)obj version], self.currentAppVersion);
-            BOOL uuidFound = [(BITAppVersionMetaInfo *)obj hasUUID:self.uuid];
-
-            if (uuidFound) {
-              self.versionUUID = [self.uuid copy];
-              self.versionID = [[(BITAppVersionMetaInfo *)obj versionID] copy];
-              [self saveAppCache];
-              
-              self.updateAvailable = YES;
-            }
-
-            if (compareVersions != NSOrderedSame || uuidFound) {
-              *stop = YES;
-            }
-          }
-        }];
-      }
-    } else {
-      if ([self.newestAppVersion.versionID compare:self.versionID] == NSOrderedDescending)
-        self.updateAvailable = YES;
-    }
-  }
-}
-
-- (void)loadAppCache {
-  self.firstStartAfterInstall = NO;
-  self.versionUUID = [[NSUserDefaults standardUserDefaults] objectForKey:kBITUpdateInstalledUUID];
-  if (!self.versionUUID) {
-    self.firstStartAfterInstall = YES;
-  } else {
-    if ([self.uuid compare:self.versionUUID] != NSOrderedSame)
-      self.firstStartAfterInstall = YES;
-  }
-  self.versionID = [[NSUserDefaults standardUserDefaults] objectForKey:kBITUpdateInstalledVersionID];
-  self.companyName = [[NSUserDefaults standardUserDefaults] objectForKey:kBITUpdateCurrentCompanyName];
-  
-  NSData *savedHockeyData = [[NSUserDefaults standardUserDefaults] objectForKey:kBITUpdateArrayOfLastCheck];
-  NSArray *savedHockeyCheck = nil;
-  if (savedHockeyData) {
-    savedHockeyCheck = [NSKeyedUnarchiver unarchiveObjectWithData:savedHockeyData];
-  }
-  if (savedHockeyCheck) {
-    self.appVersions = [NSArray arrayWithArray:savedHockeyCheck];
-    [self checkUpdateAvailable];
-  } else {
-    self.appVersions = nil;
-  }
-}
-
-- (void)saveAppCache {
-  if (self.companyName) {
-    [[NSUserDefaults standardUserDefaults] setObject:self.companyName forKey:kBITUpdateCurrentCompanyName];
-  }
-  if (self.versionUUID) {
-    [[NSUserDefaults standardUserDefaults] setObject:self.versionUUID forKey:kBITUpdateInstalledUUID];
-  }
-  if (self.versionID) {
-    [[NSUserDefaults standardUserDefaults] setObject:self.versionID forKey:kBITUpdateInstalledVersionID];
-  }
-  NSData *data = [NSKeyedArchiver archivedDataWithRootObject:self.appVersions];
-  [[NSUserDefaults standardUserDefaults] setObject:data forKey:kBITUpdateArrayOfLastCheck];
-}
-
-
-#pragma mark - Init
-
-- (instancetype)init {
-  if ((self = [super init])) {
-    _delegate = nil;
-    _expiryDate = nil;
-    _checkInProgress = NO;
-    _dataFound = NO;
-    _updateAvailable = NO;
-    _lastCheckFailed = NO;
-    _currentAppVersion = [[NSBundle mainBundle] objectForInfoDictionaryKey:@"CFBundleVersion"];
-    _blockingView = nil;
-    _lastCheck = nil;
-    _uuid = [[self executableUUID] copy];
-    _versionUUID = nil;
-    _versionID = nil;
-    _sendUsageData = YES;
-    _disableUpdateManager = NO;
-    _firstStartAfterInstall = NO;
-    _companyName = nil;
-    _currentAppVersionUsageTime = @0;
-    
-    // set defaults
-    _showDirectInstallOption = NO;
-    _alwaysShowUpdateReminder = YES;
-    _checkForUpdateOnLaunch = YES;
-    _updateSetting = BITUpdateCheckStartup;
-    
-    if ([[NSUserDefaults standardUserDefaults] objectForKey:kBITUpdateDateOfLastCheck]) {
-      // we did write something else in the past, so for compatibility reasons do this
-      id tempLastCheck = [[NSUserDefaults standardUserDefaults] objectForKey:kBITUpdateDateOfLastCheck];
-      if ([tempLastCheck isKindOfClass:[NSDate class]]) {
-        _lastCheck = tempLastCheck;
-      }
-    }
-    
-    if (!_lastCheck) {
-      _lastCheck = [NSDate distantPast];
-    }
-    
-    if (!BITHockeyBundle()) {
-      BITHockeyLogWarning(@"[HockeySDK] WARNING: %@ is missing, make sure it is added!", BITHOCKEYSDK_BUNDLE);
-    }
-    
-    _fileManager = [[NSFileManager alloc] init];
-    
-    _usageDataFile = [bit_settingsDir() stringByAppendingPathComponent:BITHOCKEY_USAGE_DATA];
-    
-    [self loadAppCache];
-    
-    _installationIdentification = [self stringValueFromKeychainForKey:kBITUpdateInstallationIdentification];
-    
-    [self loadAppVersionUsageData];
-    [self startUsage];
-
-    NSNotificationCenter *dnc = [NSNotificationCenter defaultCenter];
-    [dnc addObserver:self selector:@selector(stopUsage) name:UIApplicationWillTerminateNotification object:nil];
-    [dnc addObserver:self selector:@selector(stopUsage) name:UIApplicationWillResignActiveNotification object:nil];
-  }
-  return self;
-}
-
-- (void)dealloc {
-  [self unregisterObservers];
-  [[NSNotificationCenter defaultCenter] removeObserver:self name:UIApplicationWillTerminateNotification object:nil];
-  [[NSNotificationCenter defaultCenter] removeObserver:self name:UIApplicationWillResignActiveNotification object:nil];
-}
-
-
-#pragma mark - BetaUpdateUI
-
-- (BITUpdateViewController *)hockeyViewController:(BOOL)modal {
-  if (self.appEnvironment != BITEnvironmentOther) {
-    BITHockeyLogWarning(@"[HockeySDK] This should not be called from an app store build!");
-    // return an empty view controller instead
-    BITHockeyBaseViewController *blankViewController = [[BITHockeyBaseViewController alloc] initWithModalStyle:modal];
-    return (BITUpdateViewController *)blankViewController;
-  }
-  return [[BITUpdateViewController alloc] initWithModalStyle:modal];
-}
-
-- (void)showUpdateView {
-  if (self.appEnvironment != BITEnvironmentOther) {
-    BITHockeyLogWarning(@"[HockeySDK] This should not be called from an app store build!");
-    return;
-  }
-  
-  if (self.currentHockeyViewController) {
-    BITHockeyLogDebug(@"INFO: Update view already visible, aborting");
-    return;
-  }
-    
-  BITUpdateViewController *updateViewController = [self hockeyViewController:YES];
-  if ([self hasNewerMandatoryVersion] || [self expiryDateReached]) {
-    [updateViewController setMandatoryUpdate: YES];
-  }
-  dispatch_async(dispatch_get_main_queue(), ^{
-    [self showView:updateViewController];
-  });
-}
-
-
-- (void)showCheckForUpdateAlert {
-  if (self.appEnvironment != BITEnvironmentOther) return;
-  if ([self isUpdateManagerDisabled]) return;
-  id strongDelegate = self.delegate;
-  if ([strongDelegate respondsToSelector:@selector(shouldDisplayUpdateAlertForUpdateManager:forShortVersion:forVersion:)] &&
-      ![strongDelegate shouldDisplayUpdateAlertForUpdateManager:self forShortVersion:[self.newestAppVersion shortVersion] forVersion:[self.newestAppVersion version]]) {
-    return;
-  }
-
-  if (!self.updateAlertShowing) {
-    NSString *title = BITHockeyLocalizedString(@"Update Available");
-    NSString *message = [NSString stringWithFormat:BITHockeyLocalizedString(@"UpdateAlertMandatoryTextWithAppVersion"), [self.newestAppVersion nameAndVersionString]];
-    if ([self hasNewerMandatoryVersion]) {
-      __weak typeof(self) weakSelf = self;
-      UIAlertController *alertController = [UIAlertController alertControllerWithTitle:title
-                                                                               message:message
-                                                                        preferredStyle:UIAlertControllerStyleAlert];
-      UIAlertAction *showAction = [BITAlertAction actionWithTitle:BITHockeyLocalizedString(@"Show")
-                                                           style:UIAlertActionStyleDefault
-                                                         handler:^(UIAlertAction __unused *action) {
-                                                           typeof(self) strongSelf = weakSelf;
-                                                           self.updateAlertShowing = NO;
-                                                           if (strongSelf.blockingView) {
-                                                             [strongSelf.blockingView removeFromSuperview];
-                                                           }
-                                                           [strongSelf showUpdateView];
-                                                         }];
-      [alertController addAction:showAction];
-      UIAlertAction *installAction = [BITAlertAction actionWithTitle:BITHockeyLocalizedString(@"Install")
-                                                              style:UIAlertActionStyleDefault
-                                                            handler:^(UIAlertAction __unused *action) {
-                                                              typeof(self) strongSelf = weakSelf;
-                                                              self.updateAlertShowing = NO;
-                                                                (void)[strongSelf initiateAppDownload];
-                                                            }];
-      [alertController addAction:installAction];
-      [self showAlertController:alertController];
-      self.updateAlertShowing = YES;
-    } else {
-      message = [NSString stringWithFormat:BITHockeyLocalizedString(@"An update is available"), [self.newestAppVersion nameAndVersionString]];
-      __weak typeof(self) weakSelf = self;
-      
-      UIAlertController *alertController = [UIAlertController alertControllerWithTitle:title
-                                                                               message:message
-                                                                        preferredStyle:UIAlertControllerStyleAlert];
-      UIAlertAction *ignoreAction = [BITAlertAction actionWithTitle:BITHockeyLocalizedString(@"Ignore")
-                                                             style:UIAlertActionStyleCancel
-                                                           handler:^(UIAlertAction __unused *action) {
-                                                             typeof(self) strongSelf = weakSelf;
-                                                             self.updateAlertShowing = NO;
-                                                             if ([strongSelf expiryDateReached] && !strongSelf.blockingView) {
-                                                               [strongSelf alertFallback:self.blockingScreenMessage];
-                                                             }
-                                                       }];
-      [alertController addAction:ignoreAction];
-      UIAlertAction *showAction = [BITAlertAction actionWithTitle:BITHockeyLocalizedString(@"Show")
-                                                           style:UIAlertActionStyleDefault
-                                                         handler:^(UIAlertAction __unused *action) {
-                                                           typeof(self) strongSelf = weakSelf;
-                                                           self.updateAlertShowing = NO;
-                                                           if (strongSelf.blockingView) {
-                                                             [strongSelf.blockingView removeFromSuperview];
-                                                           }
-                                                           [strongSelf showUpdateView];
-                                                         }];
-      [alertController addAction:showAction];
-      if (self.isShowingDirectInstallOption) {
-        UIAlertAction *installAction = [BITAlertAction actionWithTitle:BITHockeyLocalizedString(@"Install")
-                                                                style:UIAlertActionStyleDefault
-                                                              handler:^(UIAlertAction __unused *action) {
-                                                                typeof(self) strongSelf = weakSelf;
-                                                                self.updateAlertShowing = NO;
-                                                                (void)[strongSelf initiateAppDownload];
-                                                              }];
-        [alertController addAction:installAction];
-      }
-      [self showAlertController:alertController ];
-      self.updateAlertShowing = YES;
-    }
-  }
-}
-
-
-// open an authorization screen
-- (void)showBlockingScreen:(NSString *)message image:(NSString *)image {
-  self.blockingView = nil;
-  
-  UIWindow *visibleWindow = [self findVisibleWindow];
-  if (visibleWindow == nil) {
-    [self alertFallback:message];
-    return;
-  }
-  
-  CGRect frame = [visibleWindow frame];
-  
-  self.blockingView = [[UIView alloc] initWithFrame:frame];
-  UIImageView *backgroundView = [[UIImageView alloc] initWithImage:bit_imageNamed(@"bg.png", BITHOCKEYSDK_BUNDLE)];
-  backgroundView.contentMode = UIViewContentModeScaleAspectFill;
-  backgroundView.frame = frame;
-  [self.blockingView addSubview:backgroundView];
-  
-  if (image != nil) {
-    UIImageView *imageView = [[UIImageView alloc] initWithImage:bit_imageNamed(image, BITHOCKEYSDK_BUNDLE)];
-    imageView.contentMode = UIViewContentModeCenter;
-    imageView.frame = frame;
-    [self.blockingView addSubview:imageView];
-  }
-  
-  if (!self.disableUpdateCheckOptionWhenExpired) {
-    UIButton *checkForUpdateButton = [UIButton buttonWithType:kBITButtonTypeSystem];
-    checkForUpdateButton.frame = CGRectMake((frame.size.width - 140) / (CGFloat)2.0, frame.size.height - 100, 140, 25);
-    [checkForUpdateButton setTitle:BITHockeyLocalizedString(@"Check") forState:UIControlStateNormal];
-    [checkForUpdateButton addTarget:self
-                             action:@selector(checkForUpdateForExpiredVersion)
-                   forControlEvents:UIControlEventTouchUpInside];
-    [self.blockingView addSubview:checkForUpdateButton];
-  }
-  
-  if (message != nil) {
-    frame.origin.x = 20;
-    frame.origin.y = frame.size.height - 180;
-    frame.size.width -= 40;
-    frame.size.height = 70;
-    
-    UILabel *label = [[UILabel alloc] initWithFrame:frame];
-    label.text = message;
-    label.textAlignment = NSTextAlignmentCenter;
-    label.numberOfLines = 3;
-    label.adjustsFontSizeToFitWidth = YES;
-    label.backgroundColor = [UIColor clearColor];
-    
-    [self.blockingView addSubview:label];
-  }
-  
-  [visibleWindow addSubview:self.blockingView];
-}
-
-- (void)checkForUpdateForExpiredVersion {
-  if (!self.checkInProgress) {
-    
-    if (!self.lastUpdateCheckFromBlockingScreen ||
-        fabs([NSDate timeIntervalSinceReferenceDate] - [self.lastUpdateCheckFromBlockingScreen timeIntervalSinceReferenceDate]) > 60) {
-      self.lastUpdateCheckFromBlockingScreen = [NSDate date];
-      [self checkForUpdateShowFeedback:NO];
-    }
-  }
-}
-
-// nag the user with neverending alerts if we cannot find out the window for presenting the covering sheet
-- (void)alertFallback:(NSString *)message {
-  __weak typeof(self) weakSelf = self;
-  UIAlertController *alertController = [UIAlertController alertControllerWithTitle:nil
-                                                                           message:message
-                                                                    preferredStyle:UIAlertControllerStyleAlert];
-  UIAlertAction *okAction = [BITAlertAction actionWithTitle:BITHockeyLocalizedString(@"OK")
-                                                     style:UIAlertActionStyleDefault
-                                                   handler:^(UIAlertAction __unused *action) {
-                                                     typeof(self) strongSelf = weakSelf;
-                                                     [strongSelf alertFallback:self.blockingScreenMessage];
-                                                   }];
-  [alertController addAction:okAction];
-  if (!self.disableUpdateCheckOptionWhenExpired && [message isEqualToString:self.blockingScreenMessage]) {
-    UIAlertAction *checkAction = [BITAlertAction actionWithTitle:BITHockeyLocalizedString(@"Check")
-                                                          style:UIAlertActionStyleDefault
-                                                        handler:^(UIAlertAction __unused *action) {
-                                                          typeof(self) strongSelf = weakSelf;
-                                                          [strongSelf checkForUpdateForExpiredVersion];
-                                                        }];
-    [alertController addAction:checkAction];
-  }
-  [self showAlertController:alertController];
-}
-
-#pragma mark - RequestComments
-
-- (BOOL)shouldCheckForUpdates {
-  BOOL checkForUpdate = NO;
-  
-  switch (self.updateSetting) {
-    case BITUpdateCheckStartup:
-      checkForUpdate = YES;
-      break;
-    case BITUpdateCheckDaily: {
-      NSTimeInterval dateDiff = fabs([self.lastCheck timeIntervalSinceNow]);
-      if (dateDiff != 0)
-        dateDiff = dateDiff / (60*60*24);
-      
-      checkForUpdate = (dateDiff >= 1);
-      break;
-    }
-    case BITUpdateCheckManually:
-      checkForUpdate = NO;
-      break;
-  }
-  
-  return checkForUpdate;
-}
-
-- (void)checkForUpdate {
-  if ((self.appEnvironment == BITEnvironmentOther) && ![self isUpdateManagerDisabled]) {
-    if ([self expiryDateReached]) return;
-    if (![self installationIdentified]) return;
-    
-    if (self.isUpdateAvailable && [self hasNewerMandatoryVersion]) {
-      [self showCheckForUpdateAlert];
-    }
-    
-    [self checkForUpdateShowFeedback:NO];
-  }
-}
-
-- (void)checkForUpdateShowFeedback:(BOOL)feedback {
-  if (self.appEnvironment != BITEnvironmentOther) return;
-  if (self.isCheckInProgress) return;
-  
-  self.showFeedback = feedback;
-  self.checkInProgress = YES;
-  
-  // do we need to update?
-  if (!self.currentHockeyViewController && ![self shouldCheckForUpdates] && self.updateSetting != BITUpdateCheckManually) {
-    BITHockeyLogDebug(@"INFO: Update not needed right now");
-    self.checkInProgress = NO;
-    return;
-  }
-  
-  NSURLRequest *request = [self requestForUpdateCheck];
-  NSURLSessionConfiguration *sessionConfiguration = [NSURLSessionConfiguration defaultSessionConfiguration];
-  NSURLSession *session = [NSURLSession sessionWithConfiguration:sessionConfiguration delegate:(id<NSURLSessionDelegate>)self delegateQueue:nil];
-
-  NSURLSessionDataTask *sessionTask = [session dataTaskWithRequest:request];
-  if (!sessionTask) {
-    self.checkInProgress = NO;
-    [self reportError:[NSError errorWithDomain:kBITUpdateErrorDomain
-                                          code:BITUpdateAPIClientCannotCreateConnection
-                                      userInfo:@{NSLocalizedDescriptionKey : @"Url Connection could not be created."}]];
-  } else {
-    [sessionTask resume];
-  }
-}
-
-- (NSURLRequest *)requestForUpdateCheck {
-  NSString *path = [NSString stringWithFormat:@"api/2/apps/%@", self.appIdentifier];
-  NSString *urlEncodedPath = [path stringByAddingPercentEncodingWithAllowedCharacters:[NSCharacterSet URLPathAllowedCharacterSet]];
-  
-  NSMutableString *parameters = [NSMutableString stringWithFormat:@"?format=json&extended=true&sdk=%@&sdk_version=%@&uuid=%@",
-                                 BITHOCKEY_NAME,
-                                 BITHOCKEY_VERSION,
-                                 self.uuid];
-  
-  // add installationIdentificationType and installationIdentifier if available
-  if (self.installationIdentification && self.installationIdentificationType) {
-    [parameters appendFormat:@"&%@=%@",
-     self.installationIdentificationType,
-     self.installationIdentification
-     ];
-  }
-  
-  // add additional statistics if user didn't disable flag
-  if (self.sendUsageData) {
-    [parameters appendFormat:@"&app_version=%@&os=iOS&os_version=%@&device=%@&lang=%@&first_start_at=%@&usage_time=%@",
-     [[NSBundle mainBundle] objectForInfoDictionaryKey:@"CFBundleVersion"],
-     [[UIDevice currentDevice] systemVersion],
-     [self getDevicePlatform],
-     [[[NSBundle mainBundle] preferredLocalizations] objectAtIndex:0],
-     [self installationDateString],
-     [self currentUsageString]
-     ];
-  }
-  NSString *urlEncodedParameters = [parameters stringByAddingPercentEncodingWithAllowedCharacters:[NSCharacterSet URLQueryAllowedCharacterSet]];
-  
-  // build request & send
-  NSString *url = [NSString stringWithFormat:@"%@%@%@", self.serverURL, urlEncodedPath, urlEncodedParameters];
-  BITHockeyLogDebug(@"INFO: Sending api request to %@", url);
-  
-  NSMutableURLRequest *request = [NSMutableURLRequest requestWithURL:(NSURL *)[NSURL URLWithString:url]
-                                                         cachePolicy:NSURLRequestReloadIgnoringLocalCacheData
-                                                     timeoutInterval:10.0];
-  [request setHTTPMethod:@"GET"];
-  [request setValue:@"Hockey/iOS" forHTTPHeaderField:@"User-Agent"];
-  [request setValue:@"gzip" forHTTPHeaderField:@"Accept-Encoding"];
-  
-  return request;
-}
-
-- (BOOL)initiateAppDownload {
-  if (self.appEnvironment != BITEnvironmentOther) return NO;
-  
-  if (!self.isUpdateAvailable) {
-    BITHockeyLogWarning(@"WARNING: No update available. Aborting.");
-    return NO;
-  }
-  
-#if TARGET_OS_SIMULATOR
-
-  UIAlertController *alertController = [UIAlertController alertControllerWithTitle:BITHockeyLocalizedString(@"Warning")
-                                                                           message:BITHockeyLocalizedString(@"UpdateSimulatorMessage")
-                                                                    preferredStyle:UIAlertControllerStyleAlert];
-  UIAlertAction *okAction = [BITAlertAction actionWithTitle:BITHockeyLocalizedString(@"OK")
-                                                     style:UIAlertActionStyleDefault
-                                                   handler:^(UIAlertAction __unused *action) {}];
-  [alertController addAction:okAction];
-  [self showAlertController:alertController];
-  return NO;
-
-#else
-  
-  NSString *extraParameter = [NSString string];
-  if (self.sendUsageData && self.installationIdentification && self.installationIdentificationType) {
-    extraParameter = [NSString stringWithFormat:@"&%@=%@",
-                      bit_URLEncodedString(self.installationIdentificationType),
-                      bit_URLEncodedString(self.installationIdentification)
-                      ];
-  }
-  
-  NSString *hockeyAPIURL = [NSString stringWithFormat:@"%@api/2/apps/%@/app_versions/%@?format=plist%@", self.serverURL, [self encodedAppIdentifier], [self.newestAppVersion.versionID stringValue], extraParameter];
-  NSString *iOSUpdateURL = [NSString stringWithFormat:@"itms-services://?action=download-manifest&url=%@", bit_URLEncodedString(hockeyAPIURL)];
-
-  // Notify delegate of update intent before placing the call
-  id stronDelegate = self.delegate;
-  if ([stronDelegate respondsToSelector:@selector(willStartDownloadAndUpdate:)]) {
-    [stronDelegate willStartDownloadAndUpdate:self];
-  }
-
-  BITHockeyLogDebug(@"INFO: API Server Call: %@, calling iOS with %@", hockeyAPIURL, iOSUpdateURL);
-  BOOL success = [[UIApplication sharedApplication] openURL:(NSURL*)[NSURL URLWithString:iOSUpdateURL]];
-  BITHockeyLogDebug(@"INFO: System returned: %d", success);
-  
-  self.didStartUpdateProcess = success;
-  
-  return success;
-
-#endif /* TARGET_OS_SIMULATOR */
-}
-
-
-// begin the startup process
-- (void)startManager {
-  if (self.appEnvironment == BITEnvironmentOther) {
-    if ([self isUpdateManagerDisabled]) return;
-    
-    BITHockeyLogDebug(@"INFO: Starting UpdateManager");
-    id strongDelegate = self.delegate;
-    if ([strongDelegate respondsToSelector:@selector(updateManagerShouldSendUsageData:)]) {
-      self.sendUsageData = [strongDelegate updateManagerShouldSendUsageData:self];
-    }
-    
-    [self checkExpiryDateReached];
-    if (![self expiryDateReached]) {
-      if ([self isCheckForUpdateOnLaunch] && [self shouldCheckForUpdates]) {
-        if ([BITHockeyHelper applicationState] != BITApplicationStateActive) return;
-        
-        [self performSelector:@selector(checkForUpdate) withObject:nil afterDelay:1.0];
-      }
-    }
-  }
-  [self registerObservers];
-}
-
-#pragma mark - Handle responses
-
-- (void)handleError:(NSError *)error {
-  self.receivedData = nil;
-  self.checkInProgress = NO;
-  if ([self expiryDateReached]) {
-    if (!self.blockingView) {
-      [self alertFallback:self.blockingScreenMessage];
-    }
-  } else {
-    [self reportError:error];
-  }
-}
-
-- (void)finishLoading {
-  {
-    self.checkInProgress = NO;
-    
-    if ([self.receivedData length]) {
-      NSString *responseString = [[NSString alloc] initWithBytes:[self.receivedData bytes] length:[self.receivedData length] encoding: NSUTF8StringEncoding];
-      BITHockeyLogDebug(@"INFO: Received API response: %@", responseString);
-      
-      if (!responseString || ![responseString dataUsingEncoding:NSUTF8StringEncoding]) {
-        self.receivedData = nil;
-        return;
-      }
-      
-      NSError *error = nil;
-      NSDictionary *json = (NSDictionary *)[NSJSONSerialization JSONObjectWithData:(NSData *)[responseString dataUsingEncoding:NSUTF8StringEncoding] options:0 error:&error];
-      
-      self.companyName = (([[json valueForKey:@"company"] isKindOfClass:[NSString class]]) ? [json valueForKey:@"company"] : nil);
-      
-      if (self.appEnvironment == BITEnvironmentOther) {
-        NSArray *feedArray = (NSArray *)[json valueForKey:@"versions"];
-        
-        // remember that we just checked the server
-        self.lastCheck = [NSDate date];
-        
-        // server returned empty response?
-        if (![feedArray count]) {
-          BITHockeyLogDebug(@"WARNING: No versions available for download on HockeyApp.");
-          self.receivedData = nil;
-          return;
-        } else {
-          self.lastCheckFailed = NO;
-        }
-        
-        
-        NSString *currentAppCacheVersion = [[self newestAppVersion].version copy];
-        
-        // clear cache and reload with new data
-        NSMutableArray *tmpAppVersions = [NSMutableArray arrayWithCapacity:[feedArray count]];
-        for (NSDictionary *dict in feedArray) {
-          BITAppVersionMetaInfo *appVersionMetaInfo = [BITAppVersionMetaInfo appVersionMetaInfoFromDict:dict];
-          if ([appVersionMetaInfo isValid]) {
-            // check if minOSVersion is set and this device qualifies
-            BOOL deviceOSVersionQualifies = YES;
-            if ([appVersionMetaInfo minOSVersion] && ![[appVersionMetaInfo minOSVersion] isKindOfClass:[NSNull class]]) {
-              NSComparisonResult comparisonResult = bit_versionCompare(appVersionMetaInfo.minOSVersion, [[UIDevice currentDevice] systemVersion]);
-              if (comparisonResult == NSOrderedDescending) {
-                deviceOSVersionQualifies = NO;
-              }
-            }
-            
-            if (deviceOSVersionQualifies)
-              [tmpAppVersions addObject:appVersionMetaInfo];
-          } else {
-            [self reportError:[NSError errorWithDomain:kBITUpdateErrorDomain
-                                                  code:BITUpdateAPIServerReturnedInvalidData
-                                              userInfo:[NSDictionary dictionaryWithObjectsAndKeys:@"Invalid data received from server.", NSLocalizedDescriptionKey, nil]]];
-          }
-        }
-        // only set if different!
-        if (![self.appVersions isEqualToArray:tmpAppVersions]) {
-          self.appVersions = [tmpAppVersions copy];
-        }
-        [self saveAppCache];
-        
-        [self checkUpdateAvailable];
-        BOOL newVersionDiffersFromCachedVersion = ![self.newestAppVersion.version isEqualToString:currentAppCacheVersion];
-        
-        // show alert if we are on the latest & greatest
-        if (self.showFeedback && !self.isUpdateAvailable) {
-          // use currentVersionString, as version still may differ (e.g. server: 1.2, client: 1.3)
-          NSString *versionString = [self currentAppVersion];
-          NSString *shortVersionString = [[NSBundle mainBundle] objectForInfoDictionaryKey:@"CFBundleShortVersionString"];
-          shortVersionString = shortVersionString ? [NSString stringWithFormat:@"%@ ", shortVersionString] : @"";
-          versionString = [shortVersionString length] ? [NSString stringWithFormat:@"(%@)", versionString] : versionString;
-          NSString *currentVersionString = [NSString stringWithFormat:@"%@ %@ %@%@", self.newestAppVersion.name, BITHockeyLocalizedString(@"Version"), shortVersionString, versionString];
-          NSString *alertMsg = [NSString stringWithFormat:BITHockeyLocalizedString(@"UpdateNoUpdateAvailableMessage"), currentVersionString];
-          __weak typeof(self) weakSelf = self;
-          UIAlertController *alertController = [UIAlertController alertControllerWithTitle:BITHockeyLocalizedString(@"UpdateNoUpdateAvailableTitle")
-                                                                                   message:alertMsg
-                                                                            preferredStyle:UIAlertControllerStyleAlert];
-          UIAlertAction *okAction = [BITAlertAction actionWithTitle:BITHockeyLocalizedString(@"HockeyOK")
-                                                             style:UIAlertActionStyleDefault
-                                                           handler:^(UIAlertAction __unused *action) {
-                                                             typeof(self) strongSelf = weakSelf;
-                                                             self.updateAlertShowing = NO;
-                                                             if ([strongSelf expiryDateReached] && !strongSelf.blockingView) {
-                                                               [strongSelf alertFallback:self.blockingScreenMessage];
-                                                             }
-                                                           }];
-          [alertController addAction:okAction];
-          [self showAlertController:alertController];
-        }
-        
-        if (self.isUpdateAvailable && (self.alwaysShowUpdateReminder || newVersionDiffersFromCachedVersion || [self hasNewerMandatoryVersion])) {
-          if (self.updateAvailable && !self.currentHockeyViewController) {
-            [self showCheckForUpdateAlert];
-          }
-        }
-        self.showFeedback = NO;
-      }
-    } else if (![self expiryDateReached]) {
-      [self reportError:[NSError errorWithDomain:kBITUpdateErrorDomain
-                                            code:BITUpdateAPIServerReturnedEmptyResponse
-                                        userInfo:[NSDictionary dictionaryWithObjectsAndKeys:@"Server returned an empty response.", NSLocalizedDescriptionKey, nil]]];
-    }
-    
-    if (!self.updateAlertShowing && [self expiryDateReached] && !self.blockingView) {
-      [self alertFallback:self.blockingScreenMessage];
-    }
-    
-    self.receivedData = nil;
-  }
-}
-
-#pragma mark - NSURLSession
-
-- (void)URLSession:(NSURLSession *)session task:(NSURLSessionTask *) __unused task didCompleteWithError:(NSError *)error {
-  
-  dispatch_async(dispatch_get_main_queue(), ^{
-    [session finishTasksAndInvalidate];
-    
-    if(error){
-      [self handleError:error];
-    }else{
-      [self finishLoading];
-    }
-  });
-}
-
-- (void)URLSession:(NSURLSession *) __unused session dataTask:(NSURLSessionDataTask *) __unused dataTask didReceiveData:(NSData *)data {
-  [self.receivedData appendData:data];
-}
-
-- (void)URLSession:(NSURLSession *) __unused session dataTask:(NSURLSessionDataTask *)dataTask didReceiveResponse:(NSURLResponse *)response completionHandler:(void (^)(NSURLSessionResponseDisposition disposition))completionHandler {
-  
-  if ([response respondsToSelector:@selector(statusCode)]) {
-    NSInteger statusCode = [((NSHTTPURLResponse *)response) statusCode];
-    if (statusCode == 404) {
-      [dataTask cancel];
-      NSString *errorStr = [NSString stringWithFormat:@"Hockey API received HTTP Status Code %ld", (long)statusCode];
-      [self reportError:[NSError errorWithDomain:kBITUpdateErrorDomain
-                                            code:BITUpdateAPIServerReturnedInvalidStatus
-                                        userInfo:[NSDictionary dictionaryWithObjectsAndKeys:errorStr, NSLocalizedDescriptionKey, nil]]];
-      if (completionHandler) { completionHandler(NSURLSessionResponseCancel); }
-      return;
-    }
-    if (completionHandler) { completionHandler(NSURLSessionResponseAllow);}
-  }
-  
-  self.receivedData = [NSMutableData data];
-  [self.receivedData setLength:0];
-}
-
-- (void)URLSession:(NSURLSession *) __unused session task:(NSURLSessionTask *) __unused task willPerformHTTPRedirection:(NSHTTPURLResponse *)response newRequest:(NSURLRequest *)request completionHandler:(void (^)(NSURLRequest *))completionHandler {
-  NSURLRequest *newRequest = request;
-  if (response) {
-    newRequest = nil;
-  }
-  if (completionHandler) { completionHandler(newRequest); }
-}
-
-- (BOOL)hasNewerMandatoryVersion {
-  BOOL result = NO;
-  
-  for (BITAppVersionMetaInfo *appVersion in self.appVersions) {
-    if ([appVersion.version isEqualToString:self.currentAppVersion] || bit_versionCompare(appVersion.version, self.currentAppVersion) == NSOrderedAscending) {
-      break;
-    }
-    
-    if ([appVersion.mandatory boolValue]) {
-      result = YES;
-    }
-  }
-  
-  return result;
-}
-
-#pragma mark - Properties
-
-- (void)setCurrentHockeyViewController:(BITUpdateViewController *)aCurrentHockeyViewController {
-  if (_currentHockeyViewController != aCurrentHockeyViewController) {
-    _currentHockeyViewController = aCurrentHockeyViewController;
-    //HockeySDKLog(@"active hockey view controller: %@", aCurrentHockeyViewController);
-  }
-}
-
-- (NSString *)currentAppVersion {
-  return _currentAppVersion;
-}
-
-- (void)setLastCheck:(NSDate *)aLastCheck {
-  if (_lastCheck != aLastCheck) {
-    _lastCheck = [aLastCheck copy];
-    
-    [[NSUserDefaults standardUserDefaults] setObject:_lastCheck forKey:kBITUpdateDateOfLastCheck];
-  }
-}
-
-- (void)setAppVersions:(NSArray *)anAppVersions {
-  if (_appVersions != anAppVersions || !_appVersions) {
-    [self willChangeValueForKey:@"appVersions"];
-    
-    // populate with default values (if empty)
-    if (![anAppVersions count]) {
-      BITAppVersionMetaInfo *defaultApp = [[BITAppVersionMetaInfo alloc] init];
-      defaultApp.name = bit_appName(BITHockeyLocalizedString(@"HockeyAppNamePlaceholder"));
-      defaultApp.version = self.currentAppVersion;
-      defaultApp.shortVersion = [[NSBundle mainBundle] objectForInfoDictionaryKey:@"CFBundleShortVersionString"];
-      _appVersions = [NSArray arrayWithObject:defaultApp];
-    } else {
-      _appVersions = [anAppVersions copy];
-    }      
-    [self didChangeValueForKey:@"appVersions"];
-  }
-}
-
-- (BITAppVersionMetaInfo *)newestAppVersion {
-  BITAppVersionMetaInfo *appVersion = [self.appVersions objectAtIndex:0];
-  return appVersion;
-}
-
-- (void)setBlockingView:(UIView *)anBlockingView {
-  if (_blockingView != anBlockingView) {
-    [_blockingView removeFromSuperview];
-    _blockingView = anBlockingView;
-  }
-}
-
-- (void)setInstallationIdentificationType:(NSString *)installationIdentificationType {
-  if (![_installationIdentificationType isEqualToString:installationIdentificationType]) {
-    // we already use "uuid" in our requests for providing the binary UUID to the server
-    // so we need to stick to "udid" even when BITAuthenticator is providing a plain uuid
-    if ([installationIdentificationType isEqualToString:@"uuid"]) {
-      _installationIdentificationType = @"udid";
-    } else {
-      _installationIdentificationType = installationIdentificationType;
-    }
-  }
-}
-
-- (void)setInstallationIdentification:(NSString *)installationIdentification {
-  if (![_installationIdentification isEqualToString:installationIdentification]) {
-    if (installationIdentification) {
-      [self addStringValueToKeychain:installationIdentification forKey:kBITUpdateInstallationIdentification];
-    } else {
-      [self removeKeyFromKeychain:kBITUpdateInstallationIdentification];
-    }
-    _installationIdentification = installationIdentification;
-    
-    // we need to reset the usage time, because the user/device may have changed
-    [self storeUsageTimeForCurrentVersion:[NSNumber numberWithDouble:0]];
-    self.usageStartTimestamp = [NSDate date];
-  }
-}
-
-@end
-
-#endif /* HOCKEYSDK_FEATURE_UPDATES */
diff --git a/submodules/HockeySDK-iOS/Classes/BITUpdateManagerDelegate.h b/submodules/HockeySDK-iOS/Classes/BITUpdateManagerDelegate.h
deleted file mode 100644
index 80c1506138..0000000000
--- a/submodules/HockeySDK-iOS/Classes/BITUpdateManagerDelegate.h
+++ /dev/null
@@ -1,160 +0,0 @@
-/*
- * Author: Andreas Linde <mail@andreaslinde.de>
- *
- * Copyright (c) 2012-2014 HockeyApp, Bit Stadium GmbH.
- * All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person
- * obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without
- * restriction, including without limitation the rights to use,
- * copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following
- * conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
- * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#import <Foundation/Foundation.h>
-
-@class BITUpdateManager;
-
-/**
- The `BITUpdateManagerDelegate` formal protocol defines methods further configuring
- the behaviour of `BITUpdateManager`. 
- */
-
-@protocol BITUpdateManagerDelegate <NSObject>
-
-@optional
-
-///-----------------------------------------------------------------------------
-/// @name Update
-///-----------------------------------------------------------------------------
-
-/**
- Return if update alert should be shown
-
- If you want to display your own user interface when there is an update available,
- implement this method, present your user interface and return _NO_. In this case
- it is your responsibility to call `BITUpdateManager showUpdateView`
-
- Note: This delegate will be invoked on startup and every time the app becomes
- active again!
-
- When returning _YES_ the default blocking UI will be shown.
-
- When running the app from the App Store, this delegate is ignored.
-
- @param updateManager The `BITUpdateManager` instance invoking this delegate
- @param shortVersion The latest available version
- @param version The latest available version
- */
-- (BOOL)shouldDisplayUpdateAlertForUpdateManager:(BITUpdateManager *)updateManager forShortVersion:(NSString *)shortVersion forVersion:(NSString *)version;
-
-///-----------------------------------------------------------------------------
-/// @name Expiry
-///-----------------------------------------------------------------------------
-
-/**
- Return if expiry alert should be shown if date is reached
- 
- If you want to display your own user interface when the expiry date is reached,
- implement this method, present your user interface and return _NO_. In this case
- it is your responsibility to make the app unusable!
- 
- Note: This delegate will be invoked on startup and every time the app becomes
- active again!
- 
- When returning _YES_ the default blocking UI will be shown.
- 
- When running the app from the App Store, this delegate is ignored.
- 
- @param updateManager The `BITUpdateManager` instance invoking this delegate
- @see [BITUpdateManager expiryDate]
- @see [BITUpdateManagerDelegate didDisplayExpiryAlertForUpdateManager:]
- */
-- (BOOL)shouldDisplayExpiryAlertForUpdateManager:(BITUpdateManager *)updateManager;
-
-
-/**
- Invoked once a default expiry alert is shown
- 
- Once expiry date is reached and the default blocking UI is shown,
- this delegate method is invoked to provide you the possibility to do any
- desired additional processing.
- 
- @param updateManager The `BITUpdateManager` instance invoking this delegate
- @see [BITUpdateManager expiryDate]
- @see [BITUpdateManagerDelegate shouldDisplayExpiryAlertForUpdateManager:]
- */
-- (void)didDisplayExpiryAlertForUpdateManager:(BITUpdateManager *)updateManager;
-
-
-///-----------------------------------------------------------------------------
-/// @name Privacy
-///-----------------------------------------------------------------------------
-
-/** Return NO if usage data should not be send
- 
- The update  module send usage data by default, if the application is _NOT_
- running in an App Store version. Implement this delegate and
- return NO if you want to disable this.
- 
- If you intend to implement a user setting to let them enable or disable
- sending usage data, this delegate should be used to return that value.
- 
- Usage data contains the following information:
- - App Version
- - iOS Version
- - Device type
- - Language
- - Installation timestamp
- - Usage time
-
- @param updateManager The `BITUpdateManager` instance invoking this delegate
- @warning When setting this to `NO`, you will _NOT_ know if this user is actually testing!
- */
-- (BOOL)updateManagerShouldSendUsageData:(BITUpdateManager *)updateManager;
-
-
-///-----------------------------------------------------------------------------
-/// @name Privacy
-///-----------------------------------------------------------------------------
-
-/** Implement this method to be notified before an update starts.
- 
- The update manager will send this delegate message _just_ before the system
- call to update the application is placed, but after the user has already chosen
- to install the update.
- 
- There is no guarantee that the update will actually start after this delegate
- message is sent.
-
- @param updateManager The `BITUpdateManager` instance invoking this delegate
- */
-- (BOOL)willStartDownloadAndUpdate:(BITUpdateManager *)updateManager;
-
-/**
- Invoked right before the app will exit to allow app update to start (>= iOS8 only)
- 
- The iOS installation mechanism only starts if the app the should be updated is currently
- not running. On all iOS versions up to iOS 7, the system did automatically exit the app
- in these cases. Since iOS 8 this isn't done any longer.
- 
- @param updateManager The `BITUpdateManager` instance invoking this delegate
- */
-- (void)updateManagerWillExitApp:(BITUpdateManager *)updateManager;
-
-@end
diff --git a/submodules/HockeySDK-iOS/Classes/BITUpdateManagerPrivate.h b/submodules/HockeySDK-iOS/Classes/BITUpdateManagerPrivate.h
deleted file mode 100644
index f578247a0a..0000000000
--- a/submodules/HockeySDK-iOS/Classes/BITUpdateManagerPrivate.h
+++ /dev/null
@@ -1,110 +0,0 @@
-/*
- * Author: Andreas Linde <mail@andreaslinde.de>
- *         Peter Steinberger
- *
- * Copyright (c) 2012-2014 HockeyApp, Bit Stadium GmbH.
- * Copyright (c) 2011 Andreas Linde.
- * All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person
- * obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without
- * restriction, including without limitation the rights to use,
- * copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following
- * conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
- * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
- */
-
-
-#import "HockeySDK.h"
-
-#if HOCKEYSDK_FEATURE_UPDATES
-
-/** TODO:
-  * if during startup the auth-state is pending, we get never rid of the nag-alertview
- */
-@interface BITUpdateManager ()
-
-///-----------------------------------------------------------------------------
-/// @name Delegate
-///-----------------------------------------------------------------------------
-
-/**
- Sets the `BITUpdateManagerDelegate` delegate.
- 
- The delegate is automatically set by using `[BITHockeyManager setDelegate:]`. You
- should not need to set this delegate individually.
- 
- @see `[BITHockeyManager setDelegate:]`
- */
-@property (nonatomic, weak) id delegate;
-
-
-// is an update available?
-@property (nonatomic, assign, getter=isUpdateAvailable) BOOL updateAvailable;
-
-// are we currently checking for updates?
-@property (nonatomic, assign, getter=isCheckInProgress) BOOL checkInProgress;
-
-@property (nonatomic, strong) NSMutableData *receivedData;
-
-@property (nonatomic, copy) NSDate *lastCheck;
-
-// get array of all available versions
-@property (nonatomic, copy) NSArray *appVersions;
-
-@property (nonatomic, strong) NSNumber *currentAppVersionUsageTime;
-
-@property (nonatomic, copy) NSDate *usageStartTimestamp;
-
-@property (nonatomic, strong) UIView *blockingView;
-
-@property (nonatomic, copy) NSString *companyName;
-
-@property (nonatomic, copy) NSString *installationIdentification;
-
-@property (nonatomic, copy) NSString *installationIdentificationType;
-
-@property (nonatomic) BOOL installationIdentified;
-
-// used by BITHockeyManager if disable status is changed
-@property (nonatomic, getter = isUpdateManagerDisabled) BOOL disableUpdateManager;
-
-// checks for update, informs the user (error, no update found, etc)
-- (void)checkForUpdateShowFeedback:(BOOL)feedback;
-
-- (NSURLRequest *)requestForUpdateCheck;
-
-// initiates app-download call. displays an system UIAlertController
-- (BOOL)initiateAppDownload;
-
-// get/set current active hockey view controller
-@property (nonatomic, strong) BITUpdateViewController *currentHockeyViewController;
-
-@property(nonatomic) BOOL sendUsageData;
-
-// convenience method to get current running version string
-- (NSString *)currentAppVersion;
-
-// get newest app version
-- (BITAppVersionMetaInfo *)newestAppVersion;
-
-// check if there is any newer version mandatory
-- (BOOL)hasNewerMandatoryVersion;
-
-@end
-
-#endif /* HOCKEYSDK_FEATURE_UPDATES */
diff --git a/submodules/HockeySDK-iOS/Classes/BITUpdateViewController.h b/submodules/HockeySDK-iOS/Classes/BITUpdateViewController.h
deleted file mode 100644
index e36f318270..0000000000
--- a/submodules/HockeySDK-iOS/Classes/BITUpdateViewController.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Author: Andreas Linde <mail@andreaslinde.de>
- *         Peter Steinberger
- *
- * Copyright (c) 2012-2014 HockeyApp, Bit Stadium GmbH.
- * Copyright (c) 2011 Andreas Linde, Peter Steinberger.
- * All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person
- * obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without
- * restriction, including without limitation the rights to use,
- * copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following
- * conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
- * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#import <UIKit/UIKit.h>
-
-#import "BITHockeyBaseViewController.h"
-
-
-@interface BITUpdateViewController : BITHockeyBaseViewController 
-@end
diff --git a/submodules/HockeySDK-iOS/Classes/BITUpdateViewController.m b/submodules/HockeySDK-iOS/Classes/BITUpdateViewController.m
deleted file mode 100644
index f480a7a15b..0000000000
--- a/submodules/HockeySDK-iOS/Classes/BITUpdateViewController.m
+++ /dev/null
@@ -1,540 +0,0 @@
-/*
- * Author: Andreas Linde <mail@andreaslinde.de>
- *         Peter Steinberger
- *
- * Copyright (c) 2012-2014 HockeyApp, Bit Stadium GmbH.
- * Copyright (c) 2011 Andreas Linde, Peter Steinberger.
- * All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person
- * obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without
- * restriction, including without limitation the rights to use,
- * copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following
- * conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
- * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#import "HockeySDK.h"
-
-#if HOCKEYSDK_FEATURE_UPDATES
-
-#import "HockeySDKPrivate.h"
-#import <QuartzCore/QuartzCore.h>
-#import "BITHockeyHelper.h"
-#import "BITAppVersionMetaInfo.h"
-#import "BITAppStoreHeader.h"
-#import "BITWebTableViewCell.h"
-#import "BITStoreButton.h"
-
-#import "BITUpdateManagerPrivate.h"
-#import "BITUpdateViewControllerPrivate.h"
-#import "BITHockeyBaseManagerPrivate.h"
-
-
-#define kWebCellIdentifier @"PSWebTableViewCell"
-#define kAppStoreViewHeight 99
-
-@interface BITUpdateViewController ()
-
-@property (nonatomic) BOOL kvoRegistered;
-@property (nonatomic) BOOL showAllVersions;
-@property (nonatomic, strong) BITAppStoreHeader *appStoreHeader;
-@property (nonatomic, strong) BITStoreButton *appStoreButton;
-@property (nonatomic, strong) id popOverController;
-@property (nonatomic, strong) NSMutableArray *cells;
-@property (nonatomic) BITEnvironment appEnvironment;
-
-@end
-
-@implementation BITUpdateViewController
-
-#pragma mark - Private
-
-- (UIColor *)backgroundColor {
-  return BIT_RGBCOLOR(255, 255, 255);
-}
-
-- (void)restoreStoreButtonStateAnimated:(BOOL)animated {
-  if (self.appEnvironment == BITEnvironmentAppStore) {
-    [self setAppStoreButtonState:AppStoreButtonStateOffline animated:animated];
-  } else if ([self.updateManager isUpdateAvailable]) {
-    [self setAppStoreButtonState:AppStoreButtonStateUpdate animated:animated];
-  } else {
-    [self setAppStoreButtonState:AppStoreButtonStateCheck animated:animated];
-  }
-}
-
-- (void)updateAppStoreHeader {
-  BITUpdateManager *strongManager = self.updateManager;
-  BITAppVersionMetaInfo *appVersion = strongManager.newestAppVersion;
-  self.appStoreHeader.headerText = appVersion.name;
-  self.appStoreHeader.subHeaderText = strongManager.companyName;
-}
-
-- (void)appDidBecomeActive {
-  if (self.appStoreButtonState == AppStoreButtonStateInstalling) {
-    [self setAppStoreButtonState:AppStoreButtonStateUpdate animated:YES];
-  } else if (![self.updateManager isCheckInProgress]) {
-    [self restoreStoreButtonStateAnimated:YES];
-  }
-}
-
-- (UIImage *)addGlossToImage:(UIImage *)image {
-  UIGraphicsBeginImageContextWithOptions(image.size, NO, 0.0);
-  
-  [image drawAtPoint:CGPointZero];
-  UIImage *iconGradient = bit_imageNamed(@"IconGradient.png", BITHOCKEYSDK_BUNDLE);
-  [iconGradient drawInRect:CGRectMake(0, 0, image.size.width, image.size.height) blendMode:kCGBlendModeNormal alpha:0.5];
-  
-  UIImage *result = UIGraphicsGetImageFromCurrentImageContext();
-  UIGraphicsEndImageContext();
-  
-  return result;
-}
-
-#define kMinPreviousVersionButtonHeight 50
-- (void)realignPreviousVersionButton {
-  
-  // manually collect actual table height size
-  NSUInteger tableViewContentHeight = 0;
-  for (int i=0; i < [self tableView:self.tableView numberOfRowsInSection:0]; i++) {
-    tableViewContentHeight += [self tableView:self.tableView heightForRowAtIndexPath:[NSIndexPath indexPathForRow:i inSection:0]];
-  }
-  tableViewContentHeight += self.tableView.tableHeaderView.frame.size.height;
-  tableViewContentHeight += self.navigationController.navigationBar.frame.size.height;
-  tableViewContentHeight += [UIApplication sharedApplication].statusBarFrame.size.height;
-  
-  NSUInteger footerViewSize = kMinPreviousVersionButtonHeight;
-  NSUInteger frameHeight = (NSUInteger)self.view.frame.size.height;
-  if(tableViewContentHeight < frameHeight && (frameHeight - tableViewContentHeight > 100)) {
-    footerViewSize = frameHeight - tableViewContentHeight;
-  }
-  
-  // update footer view
-  if(self.tableView.tableFooterView) {
-    CGRect frame = self.tableView.tableFooterView.frame;
-    frame.size.height = footerViewSize;
-    self.tableView.tableFooterView.frame = frame;
-  }
-}
-
-- (void)changePreviousVersionButtonBackground:(id)sender {
-  [(UIButton *)sender setBackgroundColor:BIT_RGBCOLOR(245, 245, 245)];
-}
-
-- (void)changePreviousVersionButtonBackgroundHighlighted:(id)sender {
-  [(UIButton *)sender setBackgroundColor:BIT_RGBCOLOR(245, 245, 245)];
-}
-
-- (UIImage *)gradientButtonHighlightImage {
-  CGFloat width = 10;
-  CGFloat height = 70;
-  
-  CGSize size = CGSizeMake(width, height);
-  UIGraphicsBeginImageContextWithOptions(size, NO, 0);
-  CGContextRef context = UIGraphicsGetCurrentContext();
-  
-  CGColorSpaceRef colorspace = CGColorSpaceCreateDeviceRGB();
-  
-  NSArray *colors = [NSArray arrayWithObjects:(id)BIT_RGBCOLOR(69, 127, 247).CGColor, (id)BIT_RGBCOLOR(58, 68, 233).CGColor, nil];
-  CGGradientRef gradient = CGGradientCreateWithColors(CGColorGetColorSpace((__bridge CGColorRef)[colors objectAtIndex:0]), (__bridge CFArrayRef)colors, (CGFloat[2]){0, 1});
-  CGPoint top = CGPointMake(width / 2, 0);
-  CGPoint bottom = CGPointMake(width / 2, height);
-  CGContextDrawLinearGradient(context, gradient, top, bottom, 0);
-  
-  UIImage *theImage = UIGraphicsGetImageFromCurrentImageContext();
-  
-  CGGradientRelease(gradient);
-  CGColorSpaceRelease(colorspace);
-  UIGraphicsEndImageContext();
-  
-  return theImage;
-}
-
-- (void)showHidePreviousVersionsButton {
-  BOOL multipleVersionButtonNeeded = [self.updateManager.appVersions count] > 1 && !self.showAllVersions;
-  
-  if(multipleVersionButtonNeeded) {
-    // align at the bottom if tableview is small
-    UIView *footerView = [[UIView alloc] initWithFrame:CGRectMake(0, 0, self.view.frame.size.width, kMinPreviousVersionButtonHeight)];
-    footerView.autoresizingMask = UIViewAutoresizingFlexibleWidth;
-    footerView.backgroundColor = BIT_RGBCOLOR(245, 245, 245);
-    UIView *lineView1 = [[UIView alloc] initWithFrame:CGRectMake(0, 0, self.view.frame.size.width, 1)];
-    lineView1.backgroundColor = BIT_RGBCOLOR(214, 214, 214);
-    lineView1.autoresizingMask = UIViewAutoresizingFlexibleWidth;
-    [footerView addSubview:lineView1];
-    UIView *lineView2 = [[UIView alloc] initWithFrame:CGRectMake(0, 1, self.view.frame.size.width, 1)];
-    lineView2.backgroundColor = BIT_RGBCOLOR(221, 221, 221);
-    lineView2.autoresizingMask = UIViewAutoresizingFlexibleWidth;
-    [footerView addSubview:lineView2];
-    UIView *lineView3 = [[UIView alloc] initWithFrame:CGRectMake(0, 1, self.view.frame.size.width, 1)];
-    lineView3.backgroundColor = BIT_RGBCOLOR(255, 255, 255);
-    lineView3.autoresizingMask = UIViewAutoresizingFlexibleWidth;
-    [footerView addSubview:lineView3];
-    UIButton *footerButton = [UIButton buttonWithType:UIButtonTypeCustom];
-    //footerButton.layer.shadowOffset = CGSizeMake(-2, 2);
-    footerButton.layer.shadowColor = [[UIColor blackColor] CGColor];
-    footerButton.layer.shadowRadius = 2.0;
-    footerButton.titleLabel.font = [UIFont boldSystemFontOfSize:14];
-    [footerButton setTitle:BITHockeyLocalizedString(@"UpdateShowPreviousVersions") forState:UIControlStateNormal];
-    [footerButton setTitleColor:BIT_RGBCOLOR(61, 61, 61) forState:UIControlStateNormal];
-    [footerButton setTitleColor:[UIColor whiteColor] forState:UIControlStateHighlighted];
-    [footerButton setBackgroundImage:[self gradientButtonHighlightImage] forState:UIControlStateHighlighted];
-    footerButton.autoresizingMask = UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleTopMargin;
-    [footerButton addTarget:self action:@selector(showPreviousVersionAction) forControlEvents:UIControlEventTouchUpInside];
-    footerButton.frame = CGRectMake(0, kMinPreviousVersionButtonHeight-44, self.view.frame.size.width, 44);
-    footerButton.backgroundColor = BIT_RGBCOLOR(245, 245, 245);
-    [footerView addSubview:footerButton];
-    self.tableView.tableFooterView = footerView;
-    [self realignPreviousVersionButton];
-  } else {
-    self.tableView.tableFooterView = nil;
-    self.tableView.backgroundColor = [self backgroundColor];
-  }
-}
-
-- (void)configureWebCell:(BITWebTableViewCell *)cell forAppVersion:(BITAppVersionMetaInfo *)appVersion {
-  // create web view for a version
-  NSMutableString *dateAndSizeString = [NSMutableString string];
-  if (appVersion.date) {
-    [dateAndSizeString appendString:[appVersion dateString]];
-  }
-  if (appVersion.size) {
-    if ([dateAndSizeString length]) {
-      [dateAndSizeString appendString:@" - "];
-    }
-    [dateAndSizeString appendString:appVersion.sizeInMB];
-  }
-  
-  NSString *installed = @"";
-  BITUpdateManager *strongManager = self.updateManager;
-  if ([appVersion.version isEqualToString:[strongManager currentAppVersion]]) {
-    installed = [NSString stringWithFormat:@"<span style=\"float:right;\"><b>%@</b></span>", BITHockeyLocalizedString(@"UpdateInstalled")];
-  }
-  
-  if ([appVersion isEqual:strongManager.newestAppVersion]) {
-    if ([appVersion.notes length] > 0) {
-      cell.webViewContent = [NSString stringWithFormat:@"<p><b>%@</b>%@<br/><small>%@</small></p><p>%@</p>", [appVersion versionString], installed, dateAndSizeString, appVersion.notes];
-    } else {
-      cell.webViewContent = [NSString stringWithFormat:@"<div style=\"min-height:130px;vertical-align:middle;text-align:center;\">%@</div>", BITHockeyLocalizedString(@"UpdateNoReleaseNotesAvailable")];
-    }
-  } else {
-    cell.webViewContent = [NSString stringWithFormat:@"<p><b>%@</b>%@<br/><small>%@</small></p><p>%@</p>", [appVersion versionString], installed, dateAndSizeString, [appVersion notesOrEmptyString]];
-  }
-  cell.cellBackgroundColor = [self backgroundColor];
-  [cell addWebView];
-  // hack
-  cell.textLabel.text = @"";
-  
-  [cell addObserver:self forKeyPath:@"webViewSize" options:0 context:nil];
-}
-
-
-#pragma mark - Init
-
-- (instancetype)initWithStyle:(UITableViewStyle) __unused style {
-  if ((self = [super initWithStyle:UITableViewStylePlain])) {
-    self.updateManager = [BITHockeyManager sharedHockeyManager].updateManager ;
-    self.appEnvironment = [BITHockeyManager sharedHockeyManager].appEnvironment;
-    
-    self.title = BITHockeyLocalizedString(@"UpdateScreenTitle");
-    
-    self.cells = [[NSMutableArray alloc] initWithCapacity:5];
-    self.popOverController = nil;
-  }
-  return self;
-}
-
-- (void)dealloc {
-  [[NSNotificationCenter defaultCenter] removeObserver:self];
-  BITUpdateManager *strongManager = self.updateManager;
-  // test if KVO's are registered. if class is destroyed before it was shown(viewDidLoad) no KVOs are registered.
-  if (self.kvoRegistered) {
-    [strongManager removeObserver:self forKeyPath:@"checkInProgress"];
-    [strongManager removeObserver:self forKeyPath:@"isUpdateURLOffline"];
-    [strongManager removeObserver:self forKeyPath:@"updateAvailable"];
-    [strongManager removeObserver:self forKeyPath:@"appVersions"];
-    self.kvoRegistered = NO;
-  }
-  
-  for (UITableViewCell *cell in self.cells) {
-    [cell removeObserver:self forKeyPath:@"webViewSize"];
-  }
-  
-}
-
-
-#pragma mark - View lifecycle
-
-- (void)viewDidLoad {
-  [super viewDidLoad];
-  
-  // add notifications only to loaded view
-  NSNotificationCenter *dnc = [NSNotificationCenter defaultCenter];
-  [dnc addObserver:self selector:@selector(appDidBecomeActive) name:UIApplicationDidBecomeActiveNotification object:nil];
-
-  // hook into manager with kvo!
-  BITUpdateManager *strongManager = self.updateManager;
-  [strongManager addObserver:self forKeyPath:@"checkInProgress" options:0 context:nil];
-  [strongManager addObserver:self forKeyPath:@"isUpdateURLOffline" options:0 context:nil];
-  [strongManager addObserver:self forKeyPath:@"updateAvailable" options:0 context:nil];
-  [strongManager addObserver:self forKeyPath:@"appVersions" options:0 context:nil];
-  self.kvoRegistered = YES;
-  
-  self.tableView.backgroundColor = BIT_RGBCOLOR(245, 245, 245);
-  self.tableView.separatorStyle = UITableViewCellSeparatorStyleNone;
-  
-  UIView *topView = [[UIView alloc] initWithFrame:CGRectMake(0, -(600-kAppStoreViewHeight), self.view.frame.size.width, 600)];
-  topView.autoresizingMask = UIViewAutoresizingFlexibleWidth;
-  topView.backgroundColor = BIT_RGBCOLOR(245, 245, 245);
-  [self.tableView addSubview:topView];
-  
-  self.appStoreHeader = [[BITAppStoreHeader alloc] initWithFrame:CGRectMake(0, 0, self.view.frame.size.width, kAppStoreViewHeight)];
-  [self updateAppStoreHeader];
-  
-  NSString *iconFilename = bit_validAppIconFilename([NSBundle mainBundle], [NSBundle mainBundle]);
-  if (iconFilename) {
-    self.appStoreHeader.iconImage = [UIImage imageNamed:iconFilename];
-  }
-  
-  self.tableView.tableHeaderView = self.appStoreHeader;
-  
-  BITStoreButton *storeButton = [[BITStoreButton alloc] initWithPadding:CGPointMake(5, 58) style:BITStoreButtonStyleOS7];
-  storeButton.autoresizingMask = UIViewAutoresizingFlexibleLeftMargin;
-  storeButton.buttonDelegate = self;
-  [self.tableView.tableHeaderView addSubview:storeButton];
-  storeButton.buttonData = [BITStoreButtonData dataWithLabel:@"" enabled:NO];
-  [storeButton alignToSuperview];
-  self.appStoreButton = storeButton;
-  self.appStoreButtonState = AppStoreButtonStateCheck;
-}
-
-- (void)viewWillAppear:(BOOL)animated {
-  if (self.appEnvironment != BITEnvironmentOther) {
-    self.appStoreButtonState = AppStoreButtonStateOffline;
-  } else if (self.mandatoryUpdate) {
-    self.navigationItem.leftBarButtonItem = nil;
-  }
-  self.updateManager.currentHockeyViewController = self;
-  [super viewWillAppear:animated];
-  [self redrawTableView];
-}
-
-- (void)viewWillDisappear:(BOOL)animated {
-  self.updateManager.currentHockeyViewController = nil;
-  //if the popover is still visible, dismiss it
-  [self.popOverController dismissPopoverAnimated:YES];
-  [super viewWillDisappear:animated];
-}
-
-- (void)redrawTableView {
-  [self restoreStoreButtonStateAnimated:NO];
-  [self updateAppStoreHeader];
-  
-  // clean up and remove any pending observers
-  for (UITableViewCell *cell in self.cells) {
-    [cell removeObserver:self forKeyPath:@"webViewSize"];
-  }
-  [self.cells removeAllObjects];
-  
-  int i = 0;
-  BOOL breakAfterThisAppVersion = NO;
-  BITUpdateManager *stronManager = self.updateManager;
-  for (BITAppVersionMetaInfo *appVersion in stronManager.appVersions) {
-    i++;
-    
-    // only show the newer version of the app by default, if we don't show all versions
-    if (!self.showAllVersions) {
-      if ([appVersion.version isEqualToString:[stronManager currentAppVersion]]) {
-        if (i == 1) {
-          breakAfterThisAppVersion = YES;
-        } else {
-          break;
-        }
-      }
-    }
-
-    BITWebTableViewCell *cell = [self webCellWithAppVersion:appVersion];
-    [self.cells addObject:cell];
-    
-    if (breakAfterThisAppVersion) break;
-  }
-  
-  [self.tableView reloadData];
-  [self showHidePreviousVersionsButton];
-}
-
-- (BITWebTableViewCell *)webCellWithAppVersion:(BITAppVersionMetaInfo *)appVersion {
-  BITWebTableViewCell *cell = [[BITWebTableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:kWebCellIdentifier];
-  [self configureWebCell:cell forAppVersion:appVersion];
-  return cell;
-}
-
-- (void)showPreviousVersionAction {
-  self.showAllVersions = YES;
-  BOOL showAllPending = NO;
-  BITUpdateManager *strongManager = self.updateManager;
-  for (BITAppVersionMetaInfo *appVersion in strongManager.appVersions) {
-    if (!showAllPending) {
-      if ([appVersion.version isEqualToString:[strongManager currentAppVersion]]) {
-        showAllPending = YES;
-        if (appVersion == strongManager.newestAppVersion) {
-          continue; // skip this version already if it the latest version is the installed one
-        }
-      } else {
-        continue; // skip already shown
-      }
-    }
-
-    [self.cells addObject:[self webCellWithAppVersion:appVersion]];
-  }
-  [self.tableView reloadData];
-  [self showHidePreviousVersionsButton];
-}
-
-
-#pragma mark - Table view data source
-
-- (NSInteger)numberOfSectionsInTableView:(UITableView *) __unused tableView {
-  return 1;
-}
-
-- (CGFloat)tableView:(UITableView *) __unused tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath {
-  CGFloat rowHeight = 0;
-  
-  if ([self.cells count] > (NSUInteger)indexPath.row) {
-    BITWebTableViewCell *cell = [self.cells objectAtIndex:indexPath.row];
-    rowHeight = cell.webViewSize.height;
-  }
-  
-  if ([self.updateManager.appVersions count] > 1 && !self.showAllVersions) {
-    self.tableView.backgroundColor = BIT_RGBCOLOR(245, 245, 245);
-  }
-  
-  if (rowHeight == 0) {
-    rowHeight = indexPath.row == 0 ? 250 : 44; // fill screen on startup
-    self.tableView.backgroundColor = [self backgroundColor];
-  }
-  
-  return rowHeight;
-}
-
-- (NSInteger)tableView:(UITableView *) __unused tableView numberOfRowsInSection:(NSInteger) __unused section {
-  NSInteger cellCount = [self.cells count];
-  return cellCount;
-}
-
-
-#pragma mark - KVO
-
-- (void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id) __unused object change:(NSDictionary *) __unused change context:(void *) __unused context {
-  // only make changes if we are visible
-  if(self.view.window) {
-    if ([keyPath isEqualToString:@"webViewSize"]) {
-      [self.tableView reloadData];
-      [self realignPreviousVersionButton];
-    } else if ([keyPath isEqualToString:@"checkInProgress"]) {
-      if (self.updateManager.isCheckInProgress) {
-        [self setAppStoreButtonState:AppStoreButtonStateSearching animated:YES];
-      }else {
-        [self restoreStoreButtonStateAnimated:YES];
-      }
-    } else if ([keyPath isEqualToString:@"isUpdateURLOffline"]) {
-      [self restoreStoreButtonStateAnimated:YES];
-    } else if ([keyPath isEqualToString:@"updateAvailable"]) {
-      [self restoreStoreButtonStateAnimated:YES];
-    } else if ([keyPath isEqualToString:@"appVersions"]) {
-      [self redrawTableView];
-    }
-  }
-}
-
-// Customize the appearance of table view cells.
-- (UITableViewCell *)tableView:(UITableView *) __unused tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath {
-  if ([self.cells count] > (NSUInteger)indexPath.row) {
-    return [self.cells objectAtIndex:indexPath.row];
-  } else {
-    BITHockeyLogWarning(@"Warning: cells_ and indexPath do not match? forgot calling redrawTableView? Returning empty UITableViewCell");
-    return [UITableViewCell new];
-
-  }
-}
-
-
-#pragma mark - Rotation
-
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-implementations"
-- (void)willAnimateRotationToInterfaceOrientation:(UIInterfaceOrientation) __unused interfaceOrientation duration:(NSTimeInterval) __unused duration {
-  // update all cells
-  [self.cells makeObjectsPerformSelector:@selector(addWebView)];
-}
-#pragma clang diagnostic pop
-
-#pragma mark - PSAppStoreHeaderDelegate
-
-- (void)setAppStoreButtonState:(AppStoreButtonState)anAppStoreButtonState {
-  [self setAppStoreButtonState:anAppStoreButtonState animated:NO];
-}
-
-- (void)setAppStoreButtonState:(AppStoreButtonState)anAppStoreButtonState animated:(BOOL)animated {
-
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdirect-ivar-access"
-  _appStoreButtonState = anAppStoreButtonState;
-#pragma clang diagnostic pop
-  
-  switch (anAppStoreButtonState) {
-    case AppStoreButtonStateOffline:
-      [self.appStoreButton setButtonData:[BITStoreButtonData dataWithLabel:BITHockeyLocalizedString(@"UpdateButtonOffline") enabled:NO] animated:animated];
-      break;
-    case AppStoreButtonStateCheck:
-      [self.appStoreButton setButtonData:[BITStoreButtonData dataWithLabel:BITHockeyLocalizedString(@"UpdateButtonCheck") enabled:YES] animated:animated];
-      break;
-    case AppStoreButtonStateSearching:
-      [self.appStoreButton setButtonData:[BITStoreButtonData dataWithLabel:BITHockeyLocalizedString(@"UpdateButtonSearching") enabled:NO] animated:animated];
-      break;
-    case AppStoreButtonStateUpdate:
-      [self.appStoreButton setButtonData:[BITStoreButtonData dataWithLabel:BITHockeyLocalizedString(@"Update") enabled:YES] animated:animated];
-      break;
-    case AppStoreButtonStateInstalling:
-      [self.appStoreButton setButtonData:[BITStoreButtonData dataWithLabel:BITHockeyLocalizedString(@"Installing") enabled:NO] animated:animated];
-      break;
-    default:
-      break;
-  }
-}
-
-- (void)storeButtonFired:(BITStoreButton *) __unused button {
-  BITUpdateManager *strongManager = self.updateManager;
-  switch (self.appStoreButtonState) {
-    case AppStoreButtonStateCheck:
-      [strongManager checkForUpdateShowFeedback:YES];
-      break;
-    case AppStoreButtonStateUpdate:
-      if ([strongManager initiateAppDownload]) {
-        [self setAppStoreButtonState:AppStoreButtonStateInstalling animated:YES];
-      };
-      break;
-    default:
-      break;
-  }
-}
-
-@end
-
-#endif /* HOCKEYSDK_FEATURE_UPDATES */
diff --git a/submodules/HockeySDK-iOS/Classes/BITUpdateViewControllerPrivate.h b/submodules/HockeySDK-iOS/Classes/BITUpdateViewControllerPrivate.h
deleted file mode 100644
index 26747a8288..0000000000
--- a/submodules/HockeySDK-iOS/Classes/BITUpdateViewControllerPrivate.h
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * Author: Andreas Linde <mail@andreaslinde.de>
- *         Peter Steinberger
- *
- * Copyright (c) 2012-2014 HockeyApp, Bit Stadium GmbH.
- * Copyright (c) 2011 Andreas Linde, Peter Steinberger.
- * All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person
- * obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without
- * restriction, including without limitation the rights to use,
- * copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following
- * conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
- * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#import "HockeySDK.h"
-
-#if HOCKEYSDK_FEATURE_UPDATES
-
-#import "BITStoreButton.h"
-
-/**
- *  Button states
- */
-typedef NS_ENUM(NSUInteger, AppStoreButtonState) {
-	/**
-	 *  Offline
-	 */
-	AppStoreButtonStateOffline,
-	/**
-	 *  Check
-	 */
-	AppStoreButtonStateCheck,
-	/**
-	 *  Searching
-	 */
-	AppStoreButtonStateSearching,
-	/**
-	 *  Update
-	 */
-	AppStoreButtonStateUpdate,
-	/**
-	 *  Installing
-	 */
-	AppStoreButtonStateInstalling
-};
-
-
-@class BITUpdateManager;
-
-@protocol PSStoreButtonDelegate;
-
-@interface BITUpdateViewController() <BITStoreButtonDelegate> {
-}
-
-@property (nonatomic, weak) BITUpdateManager *updateManager;
-
-@property (nonatomic, readwrite) BOOL mandatoryUpdate;
-
-@property (nonatomic, assign) AppStoreButtonState appStoreButtonState;
-
-@end
-
-#endif /* HOCKEYSDK_FEATURE_UPDATES */
diff --git a/submodules/HockeySDK-iOS/Classes/BITUser.h b/submodules/HockeySDK-iOS/Classes/BITUser.h
deleted file mode 100755
index 12450aa078..0000000000
--- a/submodules/HockeySDK-iOS/Classes/BITUser.h
+++ /dev/null
@@ -1,16 +0,0 @@
-#import "BITTelemetryObject.h"
-
-@interface BITUser : BITTelemetryObject <NSCoding>
-
-@property (nonatomic, copy) NSString *accountAcquisitionDate;
-@property (nonatomic, copy) NSString *accountId;
-@property (nonatomic, copy) NSString *userAgent;
-@property (nonatomic, copy) NSString *userId;
-@property (nonatomic, copy) NSString *storeRegion;
-@property (nonatomic, copy) NSString *authUserId;
-@property (nonatomic, copy) NSString *anonUserAcquisitionDate;
-@property (nonatomic, copy) NSString *authUserAcquisitionDate;
-
-- (BOOL)isEqualToUser:(BITUser *)aUser;
-
-@end
diff --git a/submodules/HockeySDK-iOS/Classes/BITUser.m b/submodules/HockeySDK-iOS/Classes/BITUser.m
deleted file mode 100755
index 17effc3412..0000000000
--- a/submodules/HockeySDK-iOS/Classes/BITUser.m
+++ /dev/null
@@ -1,106 +0,0 @@
-#import "BITUser.h"
-
-/// Data contract class for type User.
-@implementation BITUser
-
-///
-/// Adds all members of this class to a dictionary
-/// @returns dictionary to which the members of this class will be added.
-///
-- (NSDictionary *)serializeToDictionary {
-    NSMutableDictionary *dict = [super serializeToDictionary].mutableCopy;
-    if (self.accountAcquisitionDate != nil) {
-        [dict setObject:self.accountAcquisitionDate forKey:@"ai.user.accountAcquisitionDate"];
-    }
-    if (self.accountId != nil) {
-        [dict setObject:self.accountId forKey:@"ai.user.accountId"];
-    }
-    if (self.userAgent != nil) {
-        [dict setObject:self.userAgent forKey:@"ai.user.userAgent"];
-    }
-    if (self.userId != nil) {
-        [dict setObject:self.userId forKey:@"ai.user.id"];
-    }
-    if(self.storeRegion != nil) {
-        [dict setObject:self.storeRegion forKey:@"ai.user.storeRegion"];
-    }
-    if(self.authUserId != nil) {
-        [dict setObject:self.authUserId forKey:@"ai.user.authUserId"];
-    }
-    if(self.anonUserAcquisitionDate != nil) {
-        [dict setObject:self.anonUserAcquisitionDate forKey:@"ai.user.anonUserAcquisitionDate"];
-    }
-    if(self.authUserAcquisitionDate != nil) {
-        [dict setObject:self.authUserAcquisitionDate forKey:@"ai.user.authUserAcquisitionDate"];
-    }
-  return dict;
-}
-
-#pragma mark - NSCoding
-
-- (instancetype)initWithCoder:(NSCoder *)coder {
-  self = [super initWithCoder:coder];
-  if(self) {
-    _accountAcquisitionDate = [coder decodeObjectForKey:@"self.accountAcquisitionDate"];
-    _accountId = [coder decodeObjectForKey:@"self.accountId"];
-    _userAgent = [coder decodeObjectForKey:@"self.userAgent"];
-    _userId = [coder decodeObjectForKey:@"self.userId"];
-    _storeRegion = [coder decodeObjectForKey:@"self.storeRegion"];
-    _authUserId = [coder decodeObjectForKey:@"self.authUserId"];
-    _anonUserAcquisitionDate = [coder decodeObjectForKey:@"self.anonUserAcquisitionDate"];
-    _authUserAcquisitionDate = [coder decodeObjectForKey:@"self.authUserAcquisitionDate"];
-  }
-
-  return self;
-}
-
-- (void)encodeWithCoder:(NSCoder *)coder {
-  [super encodeWithCoder:coder];
-  [coder encodeObject:self.accountAcquisitionDate forKey:@"self.accountAcquisitionDate"];
-  [coder encodeObject:self.accountId forKey:@"self.accountId"];
-  [coder encodeObject:self.userAgent forKey:@"self.userAgent"];
-  [coder encodeObject:self.userId forKey:@"self.userId"];
-  [coder encodeObject:self.storeRegion forKey:@"self.storeRegion"];
-  [coder encodeObject:self.authUserId forKey:@"self.authUserId"];
-  [coder encodeObject:self.anonUserAcquisitionDate forKey:@"self.anonUserAcquisitionDate"];
-  [coder encodeObject:self.authUserAcquisitionDate forKey:@"self.authUserAcquisitionDate"];
-}
-
-#pragma mark - Compare
-
-- (BOOL)isEqualToUser:(BITUser *)aUser {
-  if (aUser == self) {
-    return YES;
-  }
-  if (!aUser || ![aUser isKindOfClass:[self class]]) {
-    return NO;
-  }
-  if (![self.userId isEqualToString: aUser.userId]) {
-    return NO;
-  }
-  if(![self.authUserId isEqualToString: aUser.authUserId]) {
-    return NO;
-  }
-  if (![self.accountId isEqualToString: aUser.accountId]) {
-    return NO;
-  }
-  if(![self.anonUserAcquisitionDate isEqualToString: aUser.anonUserAcquisitionDate]) {
-    return NO;
-  }
-  if(![self.authUserAcquisitionDate isEqualToString: aUser.authUserAcquisitionDate]) {
-    return NO;
-  }
-  if (![self.accountAcquisitionDate isEqualToString: aUser.accountAcquisitionDate]) {
-    return NO;
-  }
-  if (![self.userAgent isEqualToString: aUser.userAgent]) {
-    return NO;
-  }
-  if(![self.storeRegion isEqualToString: aUser.storeRegion]) {
-    return NO;
-  }
-
-  return YES;
-}
-
-@end
diff --git a/submodules/HockeySDK-iOS/Classes/BITWebTableViewCell.h b/submodules/HockeySDK-iOS/Classes/BITWebTableViewCell.h
deleted file mode 100644
index c1706d2fdb..0000000000
--- a/submodules/HockeySDK-iOS/Classes/BITWebTableViewCell.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Author: Andreas Linde <mail@andreaslinde.de>
- *         Peter Steinberger
- *
- * Copyright (c) 2012-2014 HockeyApp, Bit Stadium GmbH.
- * Copyright (c) 2011-2012 Peter Steinberger.
- * All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person
- * obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without
- * restriction, including without limitation the rights to use,
- * copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following
- * conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
- * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
- */
-
-
-#import <Foundation/Foundation.h>
-#import <UIKit/UIKit.h>
-
-@interface BITWebTableViewCell : UITableViewCell <UIWebViewDelegate>
-
-@property (nonatomic, strong) UIWebView *webView;
-@property (nonatomic, copy) NSString *webViewContent;
-@property (nonatomic, assign) CGSize webViewSize;
-@property (nonatomic, strong) UIColor *cellBackgroundColor;
-
-- (void)addWebView;
-
-@end
diff --git a/submodules/HockeySDK-iOS/Classes/BITWebTableViewCell.m b/submodules/HockeySDK-iOS/Classes/BITWebTableViewCell.m
deleted file mode 100644
index a7dc7c810f..0000000000
--- a/submodules/HockeySDK-iOS/Classes/BITWebTableViewCell.m
+++ /dev/null
@@ -1,199 +0,0 @@
-/*
- * Author: Andreas Linde <mail@andreaslinde.de>
- *         Peter Steinberger
- *
- * Copyright (c) 2012-2014 HockeyApp, Bit Stadium GmbH.
- * Copyright (c) 2011-2012 Peter Steinberger.
- * All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person
- * obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without
- * restriction, including without limitation the rights to use,
- * copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following
- * conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
- * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#import "HockeySDK.h"
-
-#if HOCKEYSDK_FEATURE_UPDATES
-
-#import "BITWebTableViewCell.h"
-
-@implementation BITWebTableViewCell
-
-static NSString* BITWebTableViewCellHtmlTemplate = @"\
-<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Strict//EN\" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd\">\
-<html xmlns=\"http://www.w3.org/1999/xhtml\">\
-<head>\
-<style type=\"text/css\">\
-body { font: 13px 'Helvetica Neue', Helvetica; color:#626262; word-wrap:break-word; padding:8px;} ul {padding-left: 18px;}\
-</style>\
-<meta name=\"viewport\" content=\"user-scalable=no width=%@\" /></head>\
-<body>\
-%@\
-</body>\
-</html>\
-";
-
-
-#pragma mark - private
-
-- (void)addWebView {
-  if(self.webViewContent) {
-    CGRect webViewRect = CGRectMake(0, 0, self.frame.size.width, self.frame.size.height);
-    if(!self.webView) {
-      self.webView = [[UIWebView alloc] initWithFrame:webViewRect];
-      [self addSubview:self.webView];
-      self.webView.hidden = YES;
-      self.webView.backgroundColor = self.cellBackgroundColor;
-      self.webView.opaque = NO;
-      self.webView.delegate = self;
-      self.webView.autoresizingMask = UIViewAutoresizingFlexibleWidth;
-      
-      for(UIView* subView in self.webView.subviews){
-        if([subView isKindOfClass:[UIScrollView class]]){
-          // disable scrolling
-          UIScrollView *sv = (UIScrollView *)subView;
-          sv.scrollEnabled = NO;
-          sv.bounces = NO;
-          
-          // hide shadow
-          for (UIView* shadowView in [subView subviews]) {
-            if ([shadowView isKindOfClass:[UIImageView class]]) {
-              shadowView.hidden = YES;
-            }
-          }
-        }
-      }
-    }
-    else
-      self.webView.frame = webViewRect;
-    
-    NSString *deviceWidth = [NSString stringWithFormat:@"%.0f", (double)CGRectGetWidth(self.bounds)];
-    
-    //HockeySDKLog(@"%@\n%@\%@", PSWebTableViewCellHtmlTemplate, deviceWidth, self.webViewContent);
-    NSString *contentHtml = [NSString stringWithFormat:BITWebTableViewCellHtmlTemplate, deviceWidth, self.webViewContent];
-    [self.webView loadHTMLString:contentHtml baseURL:[NSURL URLWithString:@"about:blank"]];
-  }
-}
-
-- (void)showWebView {
-  self.webView.hidden = NO;
-  self.textLabel.text = @"";
-  [self setNeedsDisplay];
-}
-
-
-- (void)removeWebView {
-  if(self.webView) {
-    self.webView.delegate = nil;
-    [self.webView resignFirstResponder];
-    [self.webView removeFromSuperview];
-  }
-  self.webView = nil;
-  [self setNeedsDisplay];
-}
-
-
-- (void)setWebViewContent:(NSString *)aWebViewContent {
-  if (_webViewContent != aWebViewContent) {
-    _webViewContent = aWebViewContent;
-    
-    // add basic accessibility (prevents "snarfed from ivar layout") logs
-    self.accessibilityLabel = aWebViewContent;
-  }
-}
-
-
-#pragma mark - NSObject
-
-- (instancetype)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reuseIdentifier {
-  if((self = [super initWithStyle:style reuseIdentifier:reuseIdentifier])) {
-    self.cellBackgroundColor = [UIColor clearColor];
-  }
-  return self;
-}
-
-- (void)dealloc {
-  [self removeWebView];
-}
-
-
-#pragma mark - UIView
-
-- (void)setFrame:(CGRect)aFrame {
-  BOOL needChange = !CGRectEqualToRect(aFrame, self.frame);
-  [super setFrame:aFrame];
-  
-  if (needChange) {
-    [self addWebView];
-  }
-}
-
-
-#pragma mark - UITableViewCell
-
-- (void)prepareForReuse {
-	[self removeWebView];
-  self.webViewContent = nil;
-	[super prepareForReuse];
-}
-
-
-#pragma mark - UIWebViewDelegate
-
-- (BOOL)webView:(UIWebView *) __unused webView shouldStartLoadWithRequest:(NSURLRequest *)request navigationType:(UIWebViewNavigationType)navigationType {
-  switch (navigationType) {
-    case UIWebViewNavigationTypeLinkClicked:
-      [self openURL:request.URL];
-      return NO;
-    case UIWebViewNavigationTypeOther:
-      return YES;
-    case UIWebViewNavigationTypeBackForward:
-    case UIWebViewNavigationTypeFormResubmitted:
-    case UIWebViewNavigationTypeFormSubmitted:
-    case UIWebViewNavigationTypeReload:
-      return NO;
-  }
-}
-
-- (void)webViewDidFinishLoad:(UIWebView *) __unused webView {
-  if(self.webViewContent)
-    [self showWebView];
-  
-  CGRect frame = self.webView.frame;
-  frame.size.height = 1;
-  self.webView.frame = frame;
-  CGSize fittingSize = [self.webView sizeThatFits:CGSizeZero];
-  frame.size = fittingSize;
-  self.webView.frame = frame;
-  
-  // sizeThatFits is not reliable - use javascript for optimal height
-  NSString *output = [self.webView stringByEvaluatingJavaScriptFromString:@"document.body.scrollHeight;"];
-  self.webViewSize = CGSizeMake(fittingSize.width, [output integerValue]);
-}
-
-#pragma mark - Helper
-
-- (void)openURL:(NSURL *)URL {
-  [[UIApplication sharedApplication] openURL:URL];
-}
-
-@end
-
-#endif /* HOCKEYSDK_FEATURE_UPDATES */
diff --git a/submodules/HockeySDK-iOS/Classes/HockeySDK.h b/submodules/HockeySDK-iOS/Classes/HockeySDK.h
deleted file mode 100644
index 0c0f2c76be..0000000000
--- a/submodules/HockeySDK-iOS/Classes/HockeySDK.h
+++ /dev/null
@@ -1,97 +0,0 @@
-/*
- * Author: Andreas Linde <mail@andreaslinde.de>
- *
- * Copyright (c) 2012-2014 HockeyApp, Bit Stadium GmbH.
- * Copyright (c) 2011 Andreas Linde.
- * All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person
- * obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without
- * restriction, including without limitation the rights to use,
- * copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following
- * conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
- * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#import <Foundation/Foundation.h>
-
-
-#if !defined (TARGET_OS_IOS) // Defined starting in iOS 9
-#define TARGET_OS_IOS 1
-#endif
-
-
-#import "HockeySDKFeatureConfig.h"
-#import "HockeySDKEnums.h"
-#import "HockeySDKNullability.h"
-#import "BITAlertAction.h"
-
-#import "BITHockeyManager.h"
-#import "BITHockeyManagerDelegate.h"
-
-#if HOCKEYSDK_FEATURE_CRASH_REPORTER || HOCKEYSDK_FEATURE_FEEDBACK
-#import "BITHockeyAttachment.h"
-#endif
-
-#if HOCKEYSDK_FEATURE_CRASH_REPORTER
-#import "BITCrashManager.h"
-#import "BITCrashAttachment.h"
-#import "BITCrashManagerDelegate.h"
-#import "BITCrashDetails.h"
-#import "BITCrashMetaData.h"
-#endif /* HOCKEYSDK_FEATURE_CRASH_REPORTER */
-
-#if HOCKEYSDK_FEATURE_UPDATES
-#import "BITUpdateManager.h"
-#import "BITUpdateManagerDelegate.h"
-#import "BITUpdateViewController.h"
-#endif /* HOCKEYSDK_FEATURE_UPDATES */
-
-#if HOCKEYSDK_FEATURE_STORE_UPDATES
-#import "BITStoreUpdateManager.h"
-#import "BITStoreUpdateManagerDelegate.h"
-#endif /* HOCKEYSDK_FEATURE_STORE_UPDATES */
-
-#if HOCKEYSDK_FEATURE_FEEDBACK
-#import "BITFeedbackManager.h"
-#import "BITFeedbackManagerDelegate.h"
-#import "BITFeedbackActivity.h"
-#import "BITFeedbackComposeViewController.h"
-#import "BITFeedbackComposeViewControllerDelegate.h"
-#import "BITFeedbackListViewController.h"
-#endif /* HOCKEYSDK_FEATURE_FEEDBACK */
-
-#if HOCKEYSDK_FEATURE_AUTHENTICATOR
-#import "BITAuthenticator.h"
-#endif /* HOCKEYSDK_FEATURE_AUTHENTICATOR */
-
-#if HOCKEYSDK_FEATURE_METRICS
-#import "BITMetricsManager.h"
-#endif /* HOCKEYSDK_FEATURE_METRICS */
-
-// Notification message which HockeyManager is listening to, to retry requesting updated from the server.
-// This can be used by app developers to trigger additional points where the HockeySDK can try sending
-// pending crash reports or feedback messages.
-// By default the SDK retries sending pending data only when the app becomes active.
-#define BITHockeyNetworkDidBecomeReachableNotification @"BITHockeyNetworkDidBecomeReachable"
-
-extern NSString *const kBITCrashErrorDomain;
-extern NSString *const kBITUpdateErrorDomain;
-extern NSString *const kBITFeedbackErrorDomain;
-extern NSString *const kBITAuthenticatorErrorDomain;
-extern NSString *const __attribute__((unused)) kBITHockeyErrorDomain;
-
diff --git a/submodules/HockeySDK-iOS/Classes/HockeySDKEnums.h b/submodules/HockeySDK-iOS/Classes/HockeySDKEnums.h
deleted file mode 100644
index 9caa3dbcda..0000000000
--- a/submodules/HockeySDK-iOS/Classes/HockeySDKEnums.h
+++ /dev/null
@@ -1,187 +0,0 @@
-//
-//  HockeySDKEnums.h
-//  HockeySDK
-//
-//  Created by Lukas Spieß on 08/10/15.
-//
-//
-
-#ifndef HockeySDK_HockeyEnums_h
-#define HockeySDK_HockeyEnums_h
-
-/**
- *  HockeySDK Log Levels
- */
-typedef NS_ENUM(NSUInteger, BITLogLevel) {
-  /**
-   *  Logging is disabled
-   */
-  BITLogLevelNone = 0,
-  /**
-   *  Only errors will be logged
-   */
-  BITLogLevelError = 1,
-  /**
-   *  Errors and warnings will be logged
-   */
-  BITLogLevelWarning = 2,
-  /**
-   *  Debug information will be logged
-   */
-  BITLogLevelDebug = 3,
-  /**
-   *  Logging will be very chatty
-   */
-  BITLogLevelVerbose = 4
-};
-
-typedef NSString *(^BITLogMessageProvider)(void);
-typedef void (^BITLogHandler)(BITLogMessageProvider messageProvider, BITLogLevel logLevel, const char *file, const char *function, uint line);
-
-/**
- *  HockeySDK App environment
- */
-typedef NS_ENUM(NSInteger, BITEnvironment) {
-  /**
-   *  App has been downloaded from the AppStore
-   */
-  BITEnvironmentAppStore = 0,
-  /**
-   *  App has been downloaded from TestFlight
-   */
-  BITEnvironmentTestFlight = 1,
-  /**
-   *  App has been installed by some other mechanism.
-   *  This could be Ad-Hoc, Enterprise, etc.
-   */
-  BITEnvironmentOther = 99
-};
-
-/**
- *  HockeySDK Crash Reporter error domain
- */
-typedef NS_ENUM (NSInteger, BITCrashErrorReason) {
-  /**
-   *  Unknown error
-   */
-  BITCrashErrorUnknown,
-  /**
-   *  API Server rejected app version
-   */
-  BITCrashAPIAppVersionRejected,
-  /**
-   *  API Server returned empty response
-   */
-  BITCrashAPIReceivedEmptyResponse,
-  /**
-   *  Connection error with status code
-   */
-  BITCrashAPIErrorWithStatusCode
-};
-
-/**
- *  HockeySDK Update error domain
- */
-typedef NS_ENUM (NSInteger, BITUpdateErrorReason) {
-  /**
-   *  Unknown error
-   */
-  BITUpdateErrorUnknown,
-  /**
-   *  API Server returned invalid status
-   */
-  BITUpdateAPIServerReturnedInvalidStatus,
-  /**
-   *  API Server returned invalid data
-   */
-  BITUpdateAPIServerReturnedInvalidData,
-  /**
-   *  API Server returned empty response
-   */
-  BITUpdateAPIServerReturnedEmptyResponse,
-  /**
-   *  Authorization secret missing
-   */
-  BITUpdateAPIClientAuthorizationMissingSecret,
-  /**
-   *  No internet connection
-   */
-  BITUpdateAPIClientCannotCreateConnection
-};
-
-/**
- *  HockeySDK Feedback error domain
- */
-typedef NS_ENUM(NSInteger, BITFeedbackErrorReason) {
-  /**
-   *  Unknown error
-   */
-  BITFeedbackErrorUnknown,
-  /**
-   *  API Server returned invalid status
-   */
-  BITFeedbackAPIServerReturnedInvalidStatus,
-  /**
-   *  API Server returned invalid data
-   */
-  BITFeedbackAPIServerReturnedInvalidData,
-  /**
-   *  API Server returned empty response
-   */
-  BITFeedbackAPIServerReturnedEmptyResponse,
-  /**
-   *  Authorization secret missing
-   */
-  BITFeedbackAPIClientAuthorizationMissingSecret,
-  /**
-   *  No internet connection
-   */
-  BITFeedbackAPIClientCannotCreateConnection
-};
-
-/**
- *  HockeySDK Authenticator error domain
- */
-typedef NS_ENUM(NSInteger, BITAuthenticatorReason) {
-  /**
-   *  Unknown error
-   */
-  BITAuthenticatorErrorUnknown,
-  /**
-   *  Network error
-   */
-  BITAuthenticatorNetworkError,
-  
-  /**
-   *  API Server returned invalid response
-   */
-  BITAuthenticatorAPIServerReturnedInvalidResponse,
-  /**
-   *  Not Authorized
-   */
-  BITAuthenticatorNotAuthorized,
-  /**
-   *  Unknown Application ID (configuration error)
-   */
-  BITAuthenticatorUnknownApplicationID,
-  /**
-   *  Authorization secret missing
-   */
-  BITAuthenticatorAuthorizationSecretMissing,
-  /**
-   *  Not yet identified
-   */
-  BITAuthenticatorNotIdentified,
-};
-
-/**
- *  HockeySDK global error domain
- */
-typedef NS_ENUM(NSInteger, BITHockeyErrorReason) {
-  /**
-   *  Unknown error
-   */
-  BITHockeyErrorUnknown
-};
-
-#endif /* HockeySDK_HockeyEnums_h */
diff --git a/submodules/HockeySDK-iOS/Classes/HockeySDKFeatureConfig.h b/submodules/HockeySDK-iOS/Classes/HockeySDKFeatureConfig.h
deleted file mode 100644
index 6808e6721c..0000000000
--- a/submodules/HockeySDK-iOS/Classes/HockeySDKFeatureConfig.h
+++ /dev/null
@@ -1,97 +0,0 @@
-/*
- * Author: Andreas Linde <mail@andreaslinde.de>
- *
- * Copyright (c) 2013-2014 HockeyApp, Bit Stadium GmbH.
- * All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person
- * obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without
- * restriction, including without limitation the rights to use,
- * copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following
- * conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
- * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
- */
-
-/**
- * This is the template feature config that is used for debug builds and during development. 
- * For the Distribution target, we are using separate configs that will be copied over in our build script.
- */
-
-
-#ifndef HockeySDK_HockeySDKFeatureConfig_h
-#define HockeySDK_HockeySDKFeatureConfig_h
-
-/**
- * If true, include support for handling crash reports
- *
- * _Default_: Enabled
- */
-#ifndef HOCKEYSDK_FEATURE_CRASH_REPORTER
-#    define HOCKEYSDK_FEATURE_CRASH_REPORTER 1
-#endif /* HOCKEYSDK_FEATURE_CRASH_REPORTER */
-
-
-/**
- * If true, include support for managing user feedback
- *
- * _Default_: Enabled
- */
-#ifndef HOCKEYSDK_FEATURE_FEEDBACK
-#    define HOCKEYSDK_FEATURE_FEEDBACK 0
-#endif /* HOCKEYSDK_FEATURE_FEEDBACK */
-
-
-/**
- * If true, include support for informing the user about new updates pending in the App Store
- *
- * _Default_: Enabled
- */
-#ifndef HOCKEYSDK_FEATURE_STORE_UPDATES
-#    define HOCKEYSDK_FEATURE_STORE_UPDATES 0
-#endif /* HOCKEYSDK_FEATURE_STORE_UPDATES */
-
-
-/**
- * If true, include support for authentication installations for Ad-Hoc and Enterprise builds
- *
- * _Default_: Enabled
- */
-#ifndef HOCKEYSDK_FEATURE_AUTHENTICATOR
-#    define HOCKEYSDK_FEATURE_AUTHENTICATOR 1
-#endif /* HOCKEYSDK_FEATURE_AUTHENTICATOR */
-
-
-/**
- * If true, include support for handling in-app updates for Ad-Hoc and Enterprise builds
- *
- * _Default_: Enabled
- */
-#ifndef HOCKEYSDK_FEATURE_UPDATES
-#    define HOCKEYSDK_FEATURE_UPDATES 1
-#endif /* HOCKEYSDK_FEATURE_UPDATES */
-
-
-/**
- * If true, include support for auto collecting metrics data such as sessions and user
- *
- * _Default_: Enabled
- */
-#ifndef HOCKEYSDK_FEATURE_METRICS
-#    define HOCKEYSDK_FEATURE_METRICS 0
-#endif /* HOCKEYSDK_FEATURE_METRICS */
-
-#endif /* HockeySDK_HockeySDKFeatureConfig_h */
diff --git a/submodules/HockeySDK-iOS/Classes/HockeySDKNullability.h b/submodules/HockeySDK-iOS/Classes/HockeySDKNullability.h
deleted file mode 100644
index f98032296a..0000000000
--- a/submodules/HockeySDK-iOS/Classes/HockeySDKNullability.h
+++ /dev/null
@@ -1,35 +0,0 @@
-//
-//  HockeyNullability.h
-//  HockeySDK
-//
-//  Created by Andreas Linde on 12/06/15.
-//
-//
-
-#ifndef HockeySDK_HockeyNullability_h
-#define HockeySDK_HockeyNullability_h
-
-// Define nullability fallback for backwards compatibility
-#if !__has_feature(nullability)
-#define NS_ASSUME_NONNULL_BEGIN
-#define NS_ASSUME_NONNULL_END
-#define nullable
-#define nonnull
-#define null_unspecified
-#define null_resettable
-#define _Nullable
-#define _Nonnull
-#define __nullable
-#define __nonnull
-#define __null_unspecified
-#endif
-
-// Fallback for convenience syntax which might not be available in older SDKs
-#ifndef NS_ASSUME_NONNULL_BEGIN
-#define NS_ASSUME_NONNULL_BEGIN _Pragma("clang assume_nonnull begin")
-#endif
-#ifndef NS_ASSUME_NONNULL_END
-#define NS_ASSUME_NONNULL_END _Pragma("clang assume_nonnull end")
-#endif
-
-#endif /* HockeySDK_HockeyNullability_h */
diff --git a/submodules/HockeySDK-iOS/Classes/HockeySDKPrivate.h b/submodules/HockeySDK-iOS/Classes/HockeySDKPrivate.h
deleted file mode 100644
index 800c6f71ae..0000000000
--- a/submodules/HockeySDK-iOS/Classes/HockeySDKPrivate.h
+++ /dev/null
@@ -1,97 +0,0 @@
-/*
- * Author: Andreas Linde <mail@andreaslinde.de>
- *         Kent Sutherland
- *
- * Copyright (c) 2012-2013 HockeyApp, Bit Stadium GmbH.
- * Copyright (c) 2011 Andreas Linde & Kent Sutherland.
- * All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person
- * obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without
- * restriction, including without limitation the rights to use,
- * copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following
- * conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
- * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
- */
-
-
-#import <Foundation/Foundation.h>
-#import "BITHockeyLogger.h"
-
-#ifndef HockeySDK_HockeySDKPrivate_h
-#define HockeySDK_HockeySDKPrivate_h
-
-#define BITHOCKEY_NAME @"HockeySDK"
-#define BITHOCKEY_IDENTIFIER @"net.hockeyapp.sdk.ios"
-#define BITHOCKEY_CRASH_SETTINGS @"BITCrashManager.plist"
-#define BITHOCKEY_CRASH_ANALYZER @"BITCrashManager.analyzer"
-
-#define BITHOCKEY_FEEDBACK_SETTINGS @"BITFeedbackManager.plist"
-
-#define BITHOCKEY_USAGE_DATA @"BITUpdateManager.plist"
-
-#define kBITHockeyMetaUserName  @"BITHockeyMetaUserName"
-#define kBITHockeyMetaUserEmail @"BITHockeyMetaUserEmail"
-#define kBITHockeyMetaUserID    @"BITHockeyMetaUserID"
-
-#define kBITUpdateInstalledUUID              @"BITUpdateInstalledUUID"
-#define kBITUpdateInstalledVersionID         @"BITUpdateInstalledVersionID"
-#define kBITUpdateCurrentCompanyName         @"BITUpdateCurrentCompanyName"
-#define kBITUpdateArrayOfLastCheck           @"BITUpdateArrayOfLastCheck"
-#define kBITUpdateDateOfLastCheck            @"BITUpdateDateOfLastCheck"
-#define kBITUpdateDateOfVersionInstallation  @"BITUpdateDateOfVersionInstallation"
-#define kBITUpdateUsageTimeOfCurrentVersion  @"BITUpdateUsageTimeOfCurrentVersion"
-#define kBITUpdateUsageTimeForUUID           @"BITUpdateUsageTimeForUUID"
-#define kBITUpdateInstallationIdentification @"BITUpdateInstallationIdentification"
-
-#define kBITStoreUpdateDateOfLastCheck       @"BITStoreUpdateDateOfLastCheck"
-#define kBITStoreUpdateLastStoreVersion      @"BITStoreUpdateLastStoreVersion"
-#define kBITStoreUpdateLastUUID              @"BITStoreUpdateLastUUID"
-#define kBITStoreUpdateIgnoreVersion         @"BITStoreUpdateIgnoredVersion"
-
-#define BITHOCKEY_INTEGRATIONFLOW_TIMESTAMP  @"BITIntegrationFlowStartTimestamp"
-
-#define BITHOCKEYSDK_BUNDLE @"HockeySDKResources.bundle"
-#define BITHOCKEYSDK_URL @"https://sdk.hockeyapp.net/"
-
-#define BIT_RGBCOLOR(r,g,b) [UIColor colorWithRed:(CGFloat)((r)/255.0) green:(CGFloat)((g)/255.0) blue:(CGFloat)((b)/255.0) alpha:(CGFloat)1]
-
-NSBundle *BITHockeyBundle(void);
-NSString *BITHockeyLocalizedString(NSString *stringToken);
-NSString *BITHockeyMD5(NSString *str);
-
-#ifndef __IPHONE_11_0
-#define __IPHONE_11_0    110000
-#endif
-
-#ifndef TARGET_OS_SIMULATOR
-
-  #ifdef TARGET_IPHONE_SIMULATOR
-
-    #define TARGET_OS_SIMULATOR TARGET_IPHONE_SIMULATOR
-
-  #else
-
-    #define TARGET_OS_SIMULATOR 0
-
-  #endif /* TARGET_IPHONE_SIMULATOR */
-
-#endif /* TARGET_OS_SIMULATOR */
-
-#define kBITButtonTypeSystem                UIButtonTypeSystem
-
-#endif /* HockeySDK_HockeySDKPrivate_h */
diff --git a/submodules/HockeySDK-iOS/Classes/HockeySDKPrivate.m b/submodules/HockeySDK-iOS/Classes/HockeySDKPrivate.m
deleted file mode 100644
index 9cc90e5b2d..0000000000
--- a/submodules/HockeySDK-iOS/Classes/HockeySDKPrivate.m
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- * Author: Andreas Linde <mail@andreaslinde.de>
- *
- * Copyright (c) 2012-2014 HockeyApp, Bit Stadium GmbH.
- * Copyright (c) 2011 Andreas Linde.
- * All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person
- * obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without
- * restriction, including without limitation the rights to use,
- * copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following
- * conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
- * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#import "HockeySDK.h"
-#import "HockeySDKPrivate.h"
-#include <CommonCrypto/CommonDigest.h>
-
-NSString *const kBITCrashErrorDomain = @"BITCrashReporterErrorDomain";
-NSString *const kBITUpdateErrorDomain = @"BITUpdaterErrorDomain";
-NSString *const kBITFeedbackErrorDomain = @"BITFeedbackErrorDomain";
-NSString *const kBITHockeyErrorDomain = @"BITHockeyErrorDomain";
-NSString *const kBITAuthenticatorErrorDomain = @"BITAuthenticatorErrorDomain";
-
-// Load the framework bundle.
-NSBundle *BITHockeyBundle(void) {
-  static NSBundle *bundle = nil;
-  static dispatch_once_t predicate;
-  dispatch_once(&predicate, ^{
-    NSString* mainBundlePath = [[NSBundle bundleForClass:[BITHockeyManager class]] resourcePath];
-    NSString* frameworkBundlePath = [mainBundlePath stringByAppendingPathComponent:BITHOCKEYSDK_BUNDLE];
-    bundle = [NSBundle bundleWithPath:frameworkBundlePath];
-  });
-  return bundle;
-}
-
-NSString *BITHockeyLocalizedString(NSString *stringToken) {
-  if (!stringToken) return @"";
-  
-  NSString *appSpecificLocalizationString = NSLocalizedString(stringToken, @"");
-  if (appSpecificLocalizationString && ![stringToken isEqualToString:appSpecificLocalizationString]) {
-    return appSpecificLocalizationString;
-  } else if (BITHockeyBundle()) {
-    NSString *bundleSpecificLocalizationString = NSLocalizedStringFromTableInBundle(stringToken, @"HockeySDK", BITHockeyBundle(), @"");
-    if (bundleSpecificLocalizationString)
-      return bundleSpecificLocalizationString;
-    return stringToken;
-  } else {
-    return stringToken;
-  }
-}
-
-NSString *BITHockeyMD5(NSString *str) {
-  NSData *utf8Bytes = [str dataUsingEncoding:NSUTF8StringEncoding];
-  unsigned char result[CC_MD5_DIGEST_LENGTH] = {0};
-  CC_MD5( utf8Bytes.bytes, (CC_LONG)utf8Bytes.length, result );
-  return [NSString
-          stringWithFormat: @"%02X%02X%02X%02X%02X%02X%02X%02X%02X%02X%02X%02X%02X%02X%02X%02X",
-          result[0], result[1],
-          result[2], result[3],
-          result[4], result[5],
-          result[6], result[7],
-          result[8], result[9],
-          result[10], result[11],
-          result[12], result[13],
-          result[14], result[15]
-          ];
-}
diff --git a/submodules/HockeySDK-iOS/Documentation/Guides/App Versioning.md b/submodules/HockeySDK-iOS/Documentation/Guides/App Versioning.md
deleted file mode 100644
index f404d6a834..0000000000
--- a/submodules/HockeySDK-iOS/Documentation/Guides/App Versioning.md	
+++ /dev/null
@@ -1,45 +0,0 @@
-## Introduction
-
-We suggest to handle beta and release versions in two separate *apps* on HockeyApp with their own bundle identifier (e.g. by adding "beta" to the bundle identifier), so
-
-* both apps can run on the same device or computer at the same time without interfering,
-* release versions do not appear on the beta download pages, and
-* easier analysis of crash reports and user feedback.
-
-We propose the following method to set version numbers in your beta versions:
-
-* Use both `Bundle Version` and `Bundle Version String, short` in your Info.plist.
-* "Bundle Version" should contain a sequential build number, e.g. 1, 2, 3.
-* "Bundle Version String, short" should contain the target official version number, e.g. 1.0.
-
-## HowTo
-
-The recommended way to do versioning of your app versions is as follows:
-
-- Each version gets an ongoing `build` number which increases by `1` for every version as `CFBundleVersion` in `Info.plist`
-- Additionally `CFBundleShortVersionString` in `Info.plist` will contain you target public version number as a string like `1.0.0`
-
-This ensures that each app version is uniquely identifiable, and that live and beta version numbers never ever collide.
-
-This is how to set it up with Xcode 4:
-
-1. Pick `File | New`, choose `Other` and `Configuration Settings File`, this gets you a new .xcconfig file.
-2. Name it `buildnumber.xcconfig`
-3. Add one line with this content: `BUILD_NUMBER = 1`
-4. Then click on the project on the upper left in the file browser (the same place where you get to build settings), click on the project again in the second-to-left panel, and click on the Info tab at the top of the inner panel.
-5.  There, you can choose `Based on Configuration File` for each of your targets for each of your configurations (debug, release, etc.)
-6. Select your target
-7. Select the `Summary` tab
-8. For `Build` enter the value: `${BUILD_NUMBER}`
-9. Select the `Build Phases` tab
-10. Select `Add Build Phase`
-11. Choose `Add Run Script`
-12. Add the following content:
-
-        if [ "$CONFIGURATION" == "AdHoc_Distribution" ]
-             then /usr/bin/perl -pe 's/(BUILD_NUMBER = )(\d+)/$1.($2+1)/eg' -i buildnumber.xcconfig
-        fi
-13. Change `AdHoc_Distribution` to the actual name of the Xcode configuration(s) you wnat the build number to be increased.
-
-    *Note:* Configuration names should not contain spaces!
-14. If you want to increase the build number before the build actuallry starts, just drag it up
\ No newline at end of file
diff --git a/submodules/HockeySDK-iOS/Documentation/Guides/Changelog.md b/submodules/HockeySDK-iOS/Documentation/Guides/Changelog.md
deleted file mode 100644
index 64aa7af548..0000000000
--- a/submodules/HockeySDK-iOS/Documentation/Guides/Changelog.md
+++ /dev/null
@@ -1,1072 +0,0 @@
-## 5.1.2
-
-- [IMPROVEMENT] This release uses Xcode 9.2 to compile the SDK. [#502](https://github.com/bitstadium/HockeySDK-iOS/pull/503)
-- [BUGFIX] Fix warnings when integrating the SDK as source in Xcode 9. [#501](https://github.com/bitstadium/HockeySDK-iOS/pull/501)
-- [BUGFIX] Fix a potential memory leak in `BITChannel`. [#500](https://github.com/bitstadium/HockeySDK-iOS/pull/500)
-- [BUGFIX] Version 5.1.X broke support for app extension. We're sorry about this and we've updated our test matrix to make sure this does not happen again. [#499](https://github.com/bitstadium/HockeySDK-iOS/pull/499)
-- [BUGFIX] Fix a bug in the Feedback UI when Feedback was shown in landscape. [#498](https://github.com/bitstadium/HockeySDK-iOS/pull/498)
-
-## 5.1.1
-
-- [BUGFIX] Fixes a critical bug that would cause apps to freeze when calling `trackEvent` in UIApplicationDelegate callbacks. [#492](https://github.com/bitstadium/HockeySDK-iOS/pull/493)
-- [BUGFIX] Fix a critical bug in the crashonly variant of the SDK. [#49](https://github.com/bitstadium/HockeySDK-iOS/pull/494)
-
-## 5.1.0
-
-- [FEATURE] Add Turkish localization thanks to [Ozgur](https://github.com/ozgur).[#478](https://github.com/bitstadium/HockeySDK-iOS/pull/478) 
-- [FEATURE] Add support to detect low memory and OS kill heuristics for extensions. Thx to [Dave Weston](https://github.com/dtweston) for this! [#470](https://github.com/bitstadium/HockeySDK-iOS/pull/470) 
-- [IMPROVEMENT] Support tracking events in the background. [#475](https://github.com/bitstadium/HockeySDK-iOS/pull/475)
-- [FIX] Improvements around thread-safety and concurrency for Metrics. [#471](https://github.com/bitstadium/HockeySDK-iOS/pull/471) [#479](https://github.com/bitstadium/HockeySDK-iOS/pull/479)
-- [FIX] Fix runtime warnings of Xcode 9's main thread checker tool. [#484](https://github.com/bitstadium/HockeySDK-iOS/pull/484)
-- [FIX] Fix caching of previews for attachments to Feedback. [#487](https://github.com/bitstadium/HockeySDK-iOS/pull/487)
-
-## 5.0.0
-
-- [IMPROVEMENT] Use `UIAlertController` in Feedback instead of `UIAlertView`. [#460](https://github.com/bitstadium/HockeySDK-iOS/pull/460)
-- [BUGFIX] Fix bugs in the Feedback UI on iOS 11. [#459](https://github.com/bitstadium/HockeySDK-iOS/pull/459)
-
-## 5.0.0-beta.2
-
-- [FEATURE] Added support for Metrics in app extensions. [#449](https://github.com/bitstadium/HockeySDK-iOS/pull/449)
-- [FEATURE] User Metrics can now be enabled after it was disabled [#451)(https://github.com/bitstadium/HockeySDK-iOS/pull/451)
-- [IMPROVEMENT] Don't use `UIAlertView` but `UIAlertController`.[#446](https://github.com/bitstadium/HockeySDK-iOS/pull/446)
-- [IMPROVEMENT] `BITAttributedLabel` is now based on `TTTAttributedLabel` 2.0. [#450](https://github.com/bitstadium/HockeySDK-iOS/pull/450)
-- [BUGFIX] Fix a bug in `BITAuthenticator`. [#447](https://github.com/bitstadium/HockeySDK-iOS/pull/447)
-- [BUGFIX] Fix for a bug in `BITImageAnnotation`. [#453](https://github.com/bitstadium/HockeySDK-iOS/pull/453)
-
-## 5.0.0-beta.1
-
-This version drops support for iOS 7. There is not other breaking change at this point.
-
-- [IMPROVEMENT] The code has been cleaned up as we have decided to drop support for iOS 7.
-- [IMPROVEMENT] `properties` of type `NSString` now use the `copy` attribute.
-- [BUGFIX] The logic that makes sure that the for HockeySDK-iOS is excluded from backups was changed to make sure it doesn't block app launch [#443](https://github.com/bitstadium/HockeySDK-iOS/pull/443).  
-
-## 4.1.6
-
-- [BUGFIX] Fixed a string in the Italian translation [#430](https://github.com/bitstadium/HockeySDK-iOS/pull/430).
-- [BUGFIX] Fix bug that prevented images that were attached to Feedback from loading [#428](https://github.com/bitstadium/HockeySDK-iOS/pull/428) – thx to [Zoltan](https://github.com/Xperion-meszaroz) for the contribution.
-- [IMPROVEMENT] Improved the accessibility of the Feedback UI, it now uses the proper accessibility traits.
-- [IMPROVEMENT] The crash-only flavor of the SDK now doesn't contain the Metrics feature.
-- [IMPROVEMENT] The SDK can be compiled using Xcode 9 [#423](https://github.com/bitstadium/HockeySDK-iOS/pull/423) – thx to [Stephan](https://github.com/diederich) and [Piet](https://github.com/pietbrauer) for the contribution!
-- [IMPROVEMENT] Metrics info will be send to the backend every time the application goes from foreground to background [#429](https://github.com/bitstadium/HockeySDK-iOS/pull/429) - thx to [Ivan](https://github.com/MatkovIvan) for the contribution.
-- [IMPROVEMENT] Our README.md now use gender-neutral language [#427](https://github.com/bitstadium/HockeySDK-iOS/pull/427).
-
-## 4.1.5
-
-This release officially drops the support for iOS 6.
-
-- [BUGFIX] Remove the dependency for AssetLibrary for the default subspec in our podspec [#403](https://github.com/bitstadium/HockeySDK-iOS/pull/403). Thanks to [@tschob](https://github.com/tschob) for the pointer.
-- [BUGFIX] A couple of visual bugs have been fixed [#404](https://github.com/bitstadium/HockeySDK-iOS/pull/404) thanks to [@dweston](https://github.com/dtweston).
-- [IMPROVEMENT] We have improved accessibility of our feedback UI [#409](https://github.com/bitstadium/HockeySDK-iOS/pull/409) with help by [@erychagov](https://github.com/erychagov).
-
-## 4.1.4
-
-- [IMPROVEMENT] Test targets won't be build in the run phase of the framework, which makes it possible to build individual configurations when using Carthage. Thanks a lot @wiedem for your contribution! [394](https://github.com/bitstadium/HockeySDK-iOS/pull/394)
-- [IMPROVEMENT] We've reverted to a build based on PLCrashReporter 1.2.1 as 1.3 comes with unintended namespace collisions in some edge cases that result in worse crash reporting than you were used to.
-- [BUGFIX] Fixes a crash on iOS 9 when attaching data to feedback [#395](https://github.com/bitstadium/HockeySDK-iOS/issues/395)
-- [BUGFIX] Disabling the `BITFeedbackManager` now disables the various `BITFeedbackObservationModes`. [#390](https://github.com/bitstadium/HockeySDK-iOS/pull/390)
-
-## 4.1.3
-
-- [NEW] Added `forceNewFeedbackThreadForFeedbackManager:`-callback to `BITFeedbackManagerDelegate` to force a new feedback thread for each new feedback.
-- [NEW] Norwegian (Bokmal) localization
-- [NEW] Persian (Farsi) localization
-- [BUGFIX] Fix analyzer warning in `BITChannelManagerTests`
-- [BUGFIX] Add check for nil in `BITChannel`.
-
-## 4.1.2
-
-- [NEW] New `shouldDisplayUpdateAlertForUpdateManager`-API [#339](https://github.com/bitstadium/HockeySDK-iOS/pull/339) to make the moment of appearance for custom update UI even more customizable. 
-- [IMPROVEMENT] Fix static analyzer warnings. [#351](https://github.com/bitstadium/HockeySDK-iOS/pull/351)
-- [IMPROVEMENT] Internal structure of embedded frameworks changed [#352](https://github.com/bitstadium/HockeySDK-iOS/pull/352)
-- [IMPROVEMENT] Upgrade to PLCrashReporter 1.3
-- [BUGFIX] Enable bitcode in all configurations [#344](https://github.com/bitstadium/HockeySDK-iOS/pull/344)
-- [BUGFIX] Fixed anonymisation of binary paths when running in the simulator [#347](https://github.com/bitstadium/HockeySDK-iOS/pull/347)
-- - [BUGFIX] Rename configurations to not break Carthage integration [#353](https://github.com/bitstadium/HockeySDK-iOS/pull/353)
-
-## 4.1.1
-
-**Attention** Due to changes in iOS 10, it is now necessary to include the `NSPhotoLibraryUsageDescription` in your app's Info.plist file if you want to use HockeySDK's Feedback feature. Since using the feature without the plist key present could lead to an App Store rejection, our default CocoaPods configuration does not include the Feedback feature anymore.
-If you want to continue to use it, use this in your `Podfile`:
-
-```ruby
-pod "HockeySDK", :subspecs => ['AllFeaturesLib']
-```
-
-Additionally, we now also provide a new flavor in our binary distribution. To use all features, including Feedback, use `HockeySDK.embeddedframework` from the `HockeySDKAllFeatures` folder.
-
-- [NEW] The property `userDescription` on `BITCrashMetaData` had to be renamed to `userProvidedeDescription` to provide a name clash with Apple Private API
-- [IMPROVEMENT] Warn if the Feedback feature is being used without `NSPhotoLibraryUsageDescription` being present
-- [IMPROVEMENT] Updated Chinese translations
-- [IMPROVEMENT] Set web view baseURL to `about:blank` to improve security
-- [BUGFIX] Fix an issue in the telemetry channel that could be triggered in multi-threaded environments
-- [BUGFIX] Fix several small layout issues by updating to a newer version of TTTAttributedLabel
-- [BUGFIX] Fix app icons with unusual filenames not showing in the in-app update prompt
-
-## 4.1.0
-
-- Includes improvements from 4.0.2 release of the SDK.
-- [NEW] Additional API to track an event with properties and measurements.
-
-## 4.1.0-beta.2
-
-- [BUGFIX] Fixes an issue where the whole app's Application Support directory was accidentally excluded from backups.
-This SDK release explicitly includes the Application Support directory into backups. If you want to opt-out of this fix and keep the Application Directory's backup flag untouched, add the following line above the SDK setup code:
-
-  - Objective-C:
-        ```objc
-        [[NSUserDefaults standardUserDefaults] setBool:YES forKey:@"BITExcludeApplicationSupportFromBackup"];
-        ```
-
-  - Swift:
-        ```swift
-        NSUserDefaults.standardUserDefaults().setBool(true, forKey: "BITExcludeApplicationSupportFromBackup")
-        ```
-
-- [NEW] Add more fine-grained log levels
-- [NEW] Add ability to connect existing logging framework
-- [BUGFIX] Make CrashManager property `serverURL` individual setable
-- [BUGFIX] Properly dispatch `dismissViewController` call to main queue
-- [BUGFIX] Fixes an issue that prevented preparedItemsForFeedbackManager: delegate method from working
-
-## Version 4.1.0-beta.1
-
-- [IMPROVEMENT] Prevent User Metrics from being sent if `BITMetricsManager` has been disabled.
-
-## Version 4.1.0-alpha.2
-
-- [BUGFIX] Fix different bugs in the events sending pipeline
-
-## Version 4.1.0-alpha.1
-
-- [NEW] Add ability to track custom events
-- [IMPROVEMENT] Events are always persisted, even if the app crashes
-- [IMPROVEMENT] Allow disabling `BITMetricsManager` at any time
-- [BUGFIX] Server URL is now properly customizable
-- [BUGFIX] Fix memory leak in networking code
-- [IMPROVEMENT] Optimize tests and always build test target
-- [IMPROVEMENT] Reuse `NSURLSession` object
-- [IMPROVEMENT] Under the hood improvements and cleanup
-
-## Version 4.0.2
-
-- [BUGFIX] Add Bitcode marker back to simulator slices. This is necessary because otherwise `lipo` apparently strips the Bitcode sections from the merged library completely. As a side effect, this unfortunately breaks compatibility with Xcode 6. [#310](https://github.com/bitstadium/HockeySDK-iOS/pull/310)
-- [IMPROVEMENT] Improve error detection and logging during crash processing in case the app is sent to the background while crash processing hasn't finished.[#311](https://github.com/bitstadium/HockeySDK-iOS/pull/311)
-
-## Version 4.0.1
-
-- [BUGFIX] Fixes an issue where the whole app's Application Support directory was accidentally excluded from backups.
-This SDK release explicitly includes the Application Support directory into backups. If you want to opt-out of this fix and keep the Application Directory's backup flag untouched, add the following line above the SDK setup code:
-
-  - Objective-C:
-        ```objc
-        [[NSUserDefaults standardUserDefaults] setBool:YES forKey:@"kBITExcludeApplicationSupportFromBackup"];
-        ```
-
-  - Swift:
-        ```swift
-        NSUserDefaults.standardUserDefaults().setBool(true, forKey: "kBITExcludeApplicationSupportFromBackup")
-        ```
-
-- [BUGFIX] Fixes an issue that prevented preparedItemsForFeedbackManager: delegate method from working
-
-## Version 4.0.0
-
-- [NEW] Added official Carthage support
-- [NEW] Added `preparedItemsForFeedbackManager:` method in `BITFeedbackManagerDelegate` to allow to provide items with every possible method of showing the feedback compose dialog.
-- [UPDATE] Our CrashOnly binary now includes User Metrics which enables crash free users statistics
-- [UPDATE] Deprecate `feedbackComposerPreparedItems` property in favor of the new delegate method.
-- [IMPROVEMENT] Prefix GZIP category on NSData to prevent symbol collisions
-- [BUGFIX] Add minor UI bug when adding arrow annotation to feedback image
-
-## Version 4.0.0-beta.1
-
-- [NEW] User Metrics including users and sessions data is now in public beta
-
-## Version 4.0.0-alpha.2
-
-- [UPDATE] Include changes from HockeySDK 3.8.6
-
-## Version 4.0.0-alpha.1
-
-- [NEW] Added `BITMetricsManager` to track users and sessions
-- [UPDATE] Remove previously deprecated UpdateManagerDelegate method `-viewControllerForUpdateManager:`
-- [UPDATE] Remove previously deprecated CrashManagerDelegate methods `-userNameForCrashManager:` and `-userEmailForCrashManager:`
-- [UPDATE] Remove previously deprecated property `appStoreEnvironment`
-- [UPDATE] Remove previously deprecated misspelled `timeintervalCrashInLastSessionOccured` property
-- [UPDATE] Remove previously deprecated misspelled `BITFeedbackListViewCellPresentatationStyle` enum
-
-## Version 3.8.6
-
-- [UPDATE] Some minor refactoring
-- [BUGFIX] Fix crash in `BITCrashReportTextFormatter` in cases where processPath is unexpectedly nil
-- [BUGFIX] Fix bug where feedback image could only be added once
-- [BUGFIX] Fix URL encoding bug in BITUpdateManager
-- [BUGFIX] Include username, email, etc. in `appNotTerminatingCleanly` reports
-- [BUGFIX] Fix NSURLSession memory leak in Swift apps
-- [BUGFIX] Fix issue preventing attachment from being included when sending non-clean termination report
-- [IMPROVEMENT] Anonymize binary path in crash report
-- [IMPROVEMENT] Support escaping of additional characters (URL encoding)
-- [IMPROVEMENT] Support Bundle Identifiers which contain whitespaces
-
-## Version 3.8.5
-
-- [UPDATE] Some minor improvements to our documentation
-- [BUGFIX] Fix a crash where `appStoreReceiptURL` was accidentally accessed on iOS 6
-- [BUGFIX] Fix a warning when implementing `BITHockeyManagerDelegate`
-
-## Version 3.8.4
-
-- [BUGFIX] Fix a missing header in the `HockeySDK.h` umbrella
-- [BUGFIX] Fix several type comparison warnings
-
-## Version 3.8.3
-
-- [NEW] Adds new `appEnvironment` property to indicate the environment the app is running in. This replaces the old `isAppStoreEnvironment` which is now deprecated. We can now differentiate between apps installed via TestFlight or the AppStore
-- [NEW] Distributed zip file now also contains our documentation
-- [UPDATE] Prevent issues with duplicate symbols from PLCrashReporter
-- [UPDATE] Remove several typos in our documentation and improve instructions for use in extensions
-- [UPDATE] Add additional nil-checks before calling blocks
-- [UPDATE] Minor code readability improvements
-- [BUGFIX] `BITFeedbackManager`: Fix Feedback Annotations not working on iPhones running iOS 9
-- [BUGFIX] Switch back to using UIAlertView to prevent several issues. We will add a more robust solution which uses UIAlertController in a future update.
-- [BUGFIX] Fix several small issues in our CrashOnly builds
-- [BUGFIX] Minor fixes for memory leaks
-- [BUGFIX] Fix crashes because completion blocks were not properly dispatched on the main thread
-
-## Version 3.8.2
-
-- [UPDATE] Added support for Xcode 6.x 
-- [UPDATE] Requires iOS 7 or later as base SDK, deployment target iOS 6 or later
-- [UPDATE] Updated PLCrashReporter build to exclude Bitcode in Simulator slices
-
-## Version 3.8.1
-
-- [UPDATE] Updated PLCrashReporter build using Xcode 7 (7A220)
-
-## Version 3.8
-
-- [NEW] Added Bitcode support
-- [UPDATE] Requires Xcode 7 or later
-- [UPDATE] Requires iOS 9 or later as base SDK, deployment target iOS 6 or later
-- [UPDATE] Updated PLCrashReporter build using Xcode 7
-- [UPDATE] Use `UIAlertController` when available
-- [UPDATE] Added full support for `NSURLSession`
-- [UPDATE] Removed statusbar adjustment code (which isn't needed any longer)
-- [UPDATE] Removed kBITTextLabel... defines and use NSText.. instead
-- [UPDATE] Removed a few `#if __IPHONE_OS_VERSION_MAX_ALLOWED > __IPHONE_6_1` since iOS 7 or later is now required as base SDK
-- [BUGFIX] `BITFeedbackManager`: Fixed feedback compose view rotation issue
-- [BUGFIX] `BITFeedbackManager`: Fixed `Add Image` button not always presented centered
-- [BUGFIX] Additional minor fixes
-
-## Version 3.8-RC.1
-
-- [UPDATE] Added full support for `NSURLSession`
-- [BUGFIX] `BITFeedbackManager`: Fixed feedback compose view rotation issue
-- [BUGFIX] `BITFeedbackManager`: Fixed `Add Image` button not always presented centered
-- [BUGFIX] Additional minor fixes
-
-## Version 3.8-Beta.1
-
-- [NEW] Added Bitcode support
-- [UPDATE] Requires Xcode 7 or later
-- [UPDATE] Requires iOS 7 or later as base SDK
-- [UPDATE] Silenced deprecation warnings for `NSURLConnection` calls, these will be refactored in a future update
-- [UPDATE] Removed statusbar adjustment code (which isn't needed any longer)
-- [UPDATE] Removed kBITTextLabel... defines and use NSText.. instead
-- [UPDATE] Removed a few `#if __IPHONE_OS_VERSION_MAX_ALLOWED > __IPHONE_6_1` since iOS 7 or later is now required as base SDK
-- [UPDATE] Use `UIAlertController` when available
-
-## Version 3.7.3
-
-- [BUGFIX] `BITCrashManager`: Updated PLCrashReporter build created with Xcode 6.4 to solve a duplicate symbol error some users are experiencing
-- [BUGFIX] `BITUpdateManager`: Fixed updating an app not triggering a crash report if `enableAppNotTerminatingCleanlyDetection` is enabled
-- [BUGFIX] Additional minor fixes
-
-## Version 3.7.2
-
-- [BUGFIX] `BITCrashManager`: Added workaround for a bug observed in iOS 9 beta's dyld triggering an infinite loop on startup
-- [BUGFIX] `BITFeedbackManager`: Fixed a crash in the feedback UI that can occur when rotating the device while data is being loaded
-- [BUGFIX] Fixed `Info.plist` entries in `HockeySDKResources.bundle` which cause Xcode 7 to show an error when uploading an app to iTunes Connect
-- [BUGFIX] Additional minor fixes
-
-## Version 3.7.1
-
-- [BUGFIX] `CocoaPods`: Fixes the default podspec with binary distribution
-- [BUGFIX] `CocoaPods`: Changes `HockeySDK-Source` to use non configurable approach, since we couldn't make it work reliably in all scenarios
-
-## Version 3.7.0
-
-- [NEW] Simplified installation process. If support for modules is enabled in the target project (default for most projects), it’s no longer necessary to add the frameworks manually
-- [NEW] `CocoaPods`: Default pod uses binary distribution and offers crash only build as a subspec
-- [NEW] `CocoaPods`: New `HockeySDK-Source` pod integrates via source code and offers feature set customization via subspecs. Note: We do not support building with Xcode 7 yet!
-- [NEW] `BITCrashManager`: Added support for unhandled C++ exceptions (requires to link `libc++`)
-- [NEW] `BITCrashManager`: Sending crash reports via `NSURLSession` whenever possible
-- [NEW] `BITCrashManager`: Added process ID to `BITCrashDetails`
-- [NEW] `BITCrashManager`: Added `CFBundleShortVersionString` value to crash reports
-- [NEW] `BITFeedbackManager`: "Add Image" button in feedback compose view can now be hidden using `feedbackComposeHideImageAttachmentButton` property
-- [NEW] `BITFeedbackManagerDelegate`: Added `allowAutomaticFetchingForNewFeedbackForManager:` to define if the SDK should fetch new messages on app startup and when the app is coming into foreground. 
-- [NEW] Added disableInstallTracking property to disable installation tracking (AppStore only).
-- [UPDATE] Restructured installation documentation
-- [BUGFIX] `BITCrashManager`: Fixed offline issue showing crash alert over and over again with unsent crash reports
-- [BUGFIX] `BITFeedbackManager`: Improved screenshot handling on slow devices
-- [BUGFIX] `BITStoreUpdateManager`: Delegate property wasn't propagated correctly
-- [BUGFIX] Fixed various compiler warnings & other improvements
-
-## Version 3.6.4
-
-- [BUGFIX] Fixed a build issue
-
-## Version 3.6.3
-
-- [NEW] `BITCrashManager`: Added launch time to crash reports
-- [NEW] `BITFeedbackManager`: Added support for setting tintColor for feedback list buttons
-- [NEW] `BITFeedbackManager`: Added `feedbackComposerPreparedItems` to pre-fill feedback compose UI message with given items
-- [NEW] `BITUpdateManagerDelegate`: Added `willStartDownloadAndUpdate` to be notified before beta update starts
-- [UPDATE] Improved CocoaPods support to allow building as a native iOS 8 framework
-- [UPDATE] Keychain is now accessed with `kSecAttrAccessibleAlwaysThisDeviceOnly` to support apps that are running in the background and the device is still locked
-- [UPDATE] Reduced file size of images in `HockeySDKResources.bundle` by 63%
-- [UPDATE] `BITCrashManager`: `timeintervalCrashInLastSessionOccured` property is deprecated due to typo, use `timeIntervalCrashInLastSessionOccurred` instead
-- [UPDATE] `BITFeedbackManager`: `BITFeedbackListViewCellPresentatationStyle` is deprecated due to a typo, use `BITFeedbackListViewCellPresentationStyle` instead
-- [UPDATE] `BITAuthenticator`: Use NSLog instead of an UIAlertView in case of keychain issues
-- [BUGFIX] `BITCrashManager`: Fixed issue with `appNotTerminatingCleanlyDetection` for some scenarios
-- [BUGFIX] `BITFeedbackManager`: Fixed a crash when deleting feedback attachments
-- [BUGFIX] `BITFeedbackManager`: Fixed a crash related to viewing attachments
-- [BUGFIX] `BITFeedbackManager`: Fixed landscape screenshot issues in iOS 8
-- [BUGFIX] `BITFeedbackManager`: Fixed various issues in feedback compose UI
-- [BUGFIX] `BITFeedbackManager`: Fixed loading issues for attachments in feedback UI
-- [BUGFIX] `BITFeedbackManager`: Fixed statusbar issues and the image attachment picker with apps not showing a status bar
-- [BUGFIX] Removed a header file from the crash only build that is not needed
-- [BUGFIX] Fixed various typos in documentation, properties
-- [BUGFIX] Fixed various compiler warnings
-- [BUGFIX] Various additional fixes
-
-## Version 3.6.2
-
-- [UPDATE] Store anonymous UUID asynchronously into the keychain to work around rare keychain blocking behavior
-- [UPDATE] `BITCrashManager`: Improved detecting app specific binary images in crash report for improved crash grouping on the server
-- [UPDATE] `BITUpdateManager`: Added new `updateManagerWillExitApp` delegate method
-- [UPDATE] `BITUpdateManager`: Don't save any file when app was installed from App Store
-- [BUGFIX] `BITCrashManager`: Fixed issues with sending crash reports for apps with xml tags in the app name
-- [BUGFIX] `BITFeedbackManager`: Fixed screenshot trigger issue not always fetching the last taken image
-- [BUGFIX] `BITFeedbackManager`: Fixed compose view issue with predefined text
-- [BUGFIX] Fixed a warning when integrating the binary framework for only crash reporting
-- [BUGFIX] Fixed compiler warnings
-- [BUGFIX] Various additional fixes
-
-## Version 3.6.1
-
-- [BUGFIX] Fixed feedback compose view to correctly show the text in landscape on iOS 8
-
-## Version 3.6
-
-- [NEW] `BITCrashManager`: Added support for iOS 8 Extensions
-- [NEW] `BITCrashManager`: Option to add a custom UI flow before sending a crash report, e.g. to ask users for more details (see `setAlertViewHandler:`)
-- [NEW] `BITCrashManager`: Provide details on a crash report (see `lastSessionCrashDetails` and `BITCrashDetails`)
-- [NEW] `BITCrashManager`: Experimental support for detecting app kills triggered by iOS while the app is in foreground (see `enableAppNotTerminatingCleanlyDetection`)
-- [NEW] `BITCrashManager`: Added `didReceiveMemoryWarningInLastSession` which indicates if the last app session did get a memory warning by iOS
-- [NEW] `BITFeedbackManager`: Attach and annotate images and screenshots
-- [NEW] `BITFeedbackManager`: Attach any binary data to compose message view (see `showFeedbackComposeViewWithPreparedItems:`)
-- [NEW] `BITFeedbackManager`: Show a compose message with a screenshot image attached using predefined triggers (see `feedbackObservationMode`) or your own custom triggers (see `showFeedbackComposeViewWithGeneratedScreenshot`)
-- [NEW] Minimum iOS Deployment version is now iOS 6.0
-- [NEW] Requires to link additional frameworks: `AssetLibrary`, `MobileCoreServices`, `QuickLook`
-- [UPDATE] `BITCrashManager`: Updated `setCrashCallbacks` handling now using `BITCrashManagerCallbacks` instead of `PLCrashReporterCallbacks` (which is no longer public)
-- [UPDATE] `BITCrashManager`: Crash reports are now sent individually if there are multiple pending
-- [UPDATE] `BITUpdateManager`: Improved algorithm for fetching an optimal sized app icon for the Update View
-- [UPDATE] `BITUpdateManager`: Properly consider paragraphs in release notes when presenting them in the Update view
-- [UPDATE] Property `delegate` in all components is now private. Set the delegate on `BITHockeyManager` only!
-- [UPDATE] Removed support for Atlassian JMC
-- [BUGFIX] Various additional fixes
-<br /><br/>
-
-## Version 3.6.0 Beta 2
-
-- [NEW] `BITFeedbackManager`: Screenshot feature is now part of the public API
-- [UPDATE] `BITFeedbackManager`: Various improvements for the screenshot feature
-- [UPDATE] `BITFeedbackManager`: Added `BITHockeyAttachment` for more customizable attachments to feedback (`content-type`, `filename`)
-- [UPDATE] `BITUpdateManager`: Improved algorithm for fetching an optimal sized app icon for the Update View
-- [UPDATE] `BITUpdateManager`: Properly consider paragraphs in releases notes when presenting them in the Update View
-- [UPDATE] `BITCrashManager`: Updated PLCrashReporter to version 1.2
-- [UPDATE] `BITCrashManager`: Added `osVersion` and `osBuild` properties to `BITCrashDetails`
-- [BUGFIX] `BITCrashManager`: Use correct filename for crash report attachments
-- [UPDATE] Property `delegate` in all components is now private. Set the delegate on `BITHockeyManager` only!
-- [BUGFIX] Various additional fixes
-<br /><br/>
-
-## Version 3.6.0 Beta 1
-
-- [NEW] Minimum iOS Deployment version is now iOS 6.0
-- [NEW] Requires to link additional frameworks: `AssetLibrary`, `MobileCoreServices`, `QuickLook`
-- [NEW] `BITFeedbackManager`: Attach and annotate images and screenshots
-- [NEW] `BITFeedbackManager`: Attach any binary data to compose message view (see `showFeedbackComposeViewWithPreparedItems:`)
-- [NEW] `BITFeedbackManager`: Show a compose message with a screenshot image attached using predefined triggers (see `feedbackObservationMode`) or your own custom triggers (see `showFeedbackComposeViewWithGeneratedScreenshot`)
-- [NEW] `BITCrashManager`: Option to add a custom UI flow before sending a crash report, e.g. to ask users for more details (see `setAlertViewHandler:`)
-- [NEW] `BITCrashManager`: Provide details on a crash report (see `lastSessionCrashDetails`)
-- [NEW] `BITCrashManager`: Experimental support for detecting app kills triggered by iOS while the app is in foreground (see `enableAppNotTerminatingCleanlyDetection`)
-- [NEW] `BITCrashManager`: Added `didReceiveMemoryWarningInLastSession` which indicates if the last app session did get a memory warning by iOS
-- [UPDATE] `BITCrashManager`: Updated `setCrashCallbacks` handling now using `BITCrashManagerCallbacks` instead of `PLCrashReporterCallbacks` (which is no longer public)
-- [UPDATE] `BITCrashManager`: Crash reports are now send individually if there are multiple pending
-- [UPDATE] Removed support for Atlassian JMC
-- [BUGFIX] Fixed an incorrect submission warning about referencing non-public selector `attachmentData`
-<br /><br/>
-
-## Version 3.5.7
-
-- [UPDATE] Easy Swift integration for binary distribution (No Objective-C bridging header required)
-- [UPDATE] `BITAuthenticator`: Improved keychain handling
-- [UPDATE] `BITUpdateManager`: Improved iOS 8 In-App-Update process handling
-- [BUGFIX] `BITUpdateManager`: Fixed layout issue for resizable iOS layout
-- [BUGFIX] Fixed an iTunes Connect warning for `attachmentData` property
-<br /><br/>
-
-## Version 3.5.6
-
-- [UPDATE] `BITCrashManager`: Updated PLCrashReporter to version 1.2
-- [UPDATE] `BITUpdateManager`: Improved algorithm to find the optimal app icon
-- [BUGFIX] `BITAuthenticator`: Fixed problem with authorization and iOS 8
-- [BUGFIX] Fixed a problem with integration test and iOS 8 
-<br /><br/>
-
-## Version 3.5.5
-
-- [NEW] `BITCrashManager`: Added support for adding a binary attachment to crash reports
-- [NEW] `BITCrashManager`: Integrated PLCrashReporter 1.2 RC5 (with 2 more fixes)
-- [BUGFIX] `BITUpdateManager`: Fixed problem with `checkForUpdate` when `updateSetting` is set to `BITUpdateCheckManually`
-- [BUGFIX] `BITAuthenticator`: Fixed keychain warning alert showing app on launch if keychain is locked
-- [BUGFIX] `BITAuthenticator`: Fixed a possible assertion problem with auto-authentication (when using custom SDK builds without assertions being disabled)
-- [BUGFIX] `BITAuthenticator`: Added user email to crash report for beta builds if BITAuthenticator is set to BITAuthenticatorIdentificationTypeWebAuth
-- [BUGFIX] Fixed more analyzer warnings
-<br /><br/>
-
-## Version 3.5.4
-
-- [BUGFIX] Fix a possible crash before sending the crash report when the selector could not be found
-- [BUGFIX] Fix a memory leak in keychain handling
-<br /><br/>
-
-## Version 3.5.3
-
-- [NEW] Crash Reports now provide the selector name e.g. for crashes in `objc_MsgSend`
-- [NEW] Add setter for global `userID`, `userName`, `userEmail`. Can be used instead of the delegates.
-- [UPDATE] On device symbolication is now optional, disabled by default
-- [BUGFIX] Fix for automatic authentication not always working correctly
-- [BUGFIX] `BITFeedbackComposeViewControllerDelegate` now also works for compose view controller used by the feedback list view
-- [BUGFIX] Fix typos in documentation
-<br /><br/>
-
-## Version 3.5.2
-
-- [UPDATE] Make sure a log message appears in the console if the SDK is not setup on the main thread
-- [BUGFIX] Fix usage time always being send as `0` instead of sending the actual usage time
-- [BUGFIX] Fix "Install" button in the mandatory update alert not working and forcing users to use the "show" button and then install from the update view instead
-- [BUGFIX] Fix possible unused function warnings
-- [BUGFIX] Fix two warnings when `-Wshorten-64-to-32` is set.
-- [BUGFIX] Fix typos in documentation
-<br /><br/>
-
-## Version 3.5.1
-
-- General
-
-  - [NEW] Add new initialize to make the configuration easier: `[BITHockeyManager configureWithIdentifier:]`
-  - [NEW] Add `[BITHockeyManager testIdentifier]` to check if the SDK reaches the server. The result is shown on the HockeyApp website on success.
-  - [UPDATE] `delegate` can now also be defined using the property directly (instead of using the configureWith methods)
-  - [UPDATE] Use system provided Base64 encoding implementation
-  - [UPDATE] Improved logic to choose the right `UIWindow` instance for dialogs
-  - [BUGFIX] Fix compile issues when excluding all modules but crash reporting
-  - [BUGFIX] Fix warning on implicit conversion from `CGImageAlphaInfo` to `CGBitmapInfo`
-  - [BUGFIX] Fix warnings for implicit conversions of `UITextAlignment` and `UILineBreakMode`
-  - [BUGFIX] Various additional smaller bug fixes
-	<br /><br/>
-
-- Crash Reporting
-
-  - [NEW] Integrated PLCrashReporter 1.2 RC 2
-  - [NEW] Add `generateTestCrash` method to more quickly test the crash reporting (automatically disabled in App Store environment!)
-  - [NEW] Add PLCR header files to the public headers in the framework
-  - [NEW] Add the option to define callbacks that will be executed prior to program termination after a crash has occurred. Callback code has to be async-safe!
-  - [UPDATE] Change the default of `showAlwaysButton` property to `YES`
-  - [BUGFIX] Always format date and timestamps in crash report in `en_US_POSIX` locale.
-	<br /><br/>
-  
-- Feedback
-
-  - [UPDATE] Use only one activity view controller per UIActivity
-  - [BUGFIX] Fix delete button appearance in feedback list view on iOS 7 when swiping a feedback message
-  - [BUGFIX] Comply to -[UIActivity activityDidFinish:] requirements
-  - [BUGFIX] Use non-deprecated delegate method for `BITFeedbackActivity`
-	<br /><br/>
-
-- Ad-Hoc/Enterprise Authentication
-
-  - [NEW] Automatic authorization when app was installed over the air. This still requires to call `[BITAuthenticator authenticateInstallation];` after calling `startManager`!
-  - [UPDATE] Set the tintColor in the auth view and modal views navigation controller on iOS 7
-  - [UPDATE] Show an alert if the authentication token could not be stored into the keychain
-  - [UPDATE] Use UTF8 encoding for auth data
-  - [UPDATE] Replace email placeholder texts
-  - [BUGFIX] Make sure the authentication window is always correctly dismissed
-  - [BUGFIX] Fixed memory issues
-	<br /><br/>
-
-- Ad-Hoc/Enterprise Updates
-
-  - [NEW] Provide alert option to show mandatory update details
-  - [NEW] Add button to expired page (and alert) that lets the user check for a new version (can be disabled using `disableUpdateCheckOptionWhenExpired`)
-  - [UPDATE] Usage metrics are now stored in an independent file instead of using `NSUserDefaults`
-	<br /><br/>
-	
-
-## Version 3.5.0
-
-- General
-
-  - [NEW] Added support for iOS 7
-  - [NEW] Added support for arm64 architecture
-  - [NEW] Added `BITStoreUpdateManager` for alerting the user of available App Store updates (disabled by default)
-  - [NEW] Added `BITAuthenticator` class for authorizing installations (Ad-Hoc/Enterprise builds only!)
-  - [NEW] Added support for apps starting in the background
-  - [NEW] Added possibility to build custom frameworks including/excluding specific modules from the static library (see `HockeySDKFeatureConfig.h`)
-  - [NEW] Added public access to the anonymous UUID that the SDK generates per app installation
-  - [NEW] Added possibility to overwrite SDK specific localization strings in the apps localization files
-  - [UPDATE] Updated localizations provided by [Wordcrafts.de](http://wordcrafts.de):
-	Chinese, Dutch, English, French, German, Hungarian, Italian, Japanese, Portuguese, Brazilian-Portuguese, Romanian, Russian, Spanish
-  - [UPDATE] User related data is now stored in the keychain instead of property files
-  - [UPDATE] SDK documentation improvements
-  - [BUGFIX] Fixed multiple compiler warnings
-  - [BUGFIX] Various UI updates and fixes
-  <br /><br/>
-
-- Crash Reporting
-
-  - [NEW] Integrated PLCrashReporter 1.2 beta 3
-  - [NEW] Added optional support for Mach exceptions
-  - [NEW] Added support for arm64
-  - [UPDATE] PLCrashReporter build with `BIT` namespace to avoid collisions
-  - [UPDATE] Crash reporting is automatically disabled when the app is invoked with the debugger!
-  - [UPDATE] Automatically add the users UDID or email to crash reports in Ad-Hoc/Enterprise builds if they are provided by BITAuthenticator
-	<br /><br/>
-
-- Feedback
-
-  - [NEW] New protocol to inform about incoming feedback messages, see `BITFeedbackManagerDelegate`
-  - [UPDATE] Added method in `BITFeedbackComposeViewControllerDelegate` to let the app know if the user submitted a new message or cancelled it
-	<br /><br/>
-
-- App Store Updates
-
-  - [NEW] Inform user when a new version is available in the App Store (optional, disabled by default)
-	<br /><br/>
-
-
-- Ad-Hoc/Enterprise Authentication
-
-  - [NEW] `BITAuthenticator` identifies app installations, automatically disabled in App Store environments
-  - [NEW] `BITAuthenticator` can identify the user through:
-    - The email address of their HockeyApp account
-    - Login with their HockeyApp account (does not work with Facebook accounts!)
-    - Installation of the HockeyApp web-clip to provide the UDID (requires the app to handle URL callbacks)
-    - Web based login with their HockeyApp account
-  - [NEW] `BITAuthenticator` can require the authorization:
-    - Never
-    - On first app version launch
-    - Whenever the app comes into foreground (requires the device to have a working internet connection)
-  - [NEW] Option to customize the authentication flow
-  - [NEW] Possibility to use an existing URL scheme
-	<br /><br/>
-
-- Ad-Hoc/Enterprise Updates
-
-  - [UPDATE] Removed delegate for getting the UDID, please migrate to the new `BITAuthenticator`
-  - [NEW] In-app updates are now only offered if the device matches the minimum OS version requirement
-	<br /><br/>
-
----
-
-## Version 3.5.0 RC 3
-
-- General
-
-  - [NEW] Added public access to the anonymous UUID that the SDK generates per app installation
-  - [NEW] Added possibility to overwrite SDK specific localization strings in the apps localization files
-  - [UPDATE] Podspec updates
-  - [BUGFIX] Fixed memory leaks
-  - [BUGFIX] Various minor bugfixes
-  <br /><br/>
-
-- Crash Reporting
-
-  - [UPDATE] Integrated PLCrashReporter 1.2 beta 3
-  - [BUGFIX] Fixed crash if minimum OS version isn't provided
-  - [BUGFIX] Update private C function to use BIT namespace
-  <br /><br/>
-  
-- Feedback
-
-  - [BUGFIX] Fixed some layout issues in the user info screen
-  <br /><br/>
-
-- Ad-Hoc/Enterprise Updates
-
-  - [BUGFIX] Fixed update view controller not showing updated content after using the check button
-  - [BUGFIX] Fixed usage value being reset on every app cold start
-  <br /><br/>
-
-- Ad-Hoc/Enterprise Authentication
-
-  - [NEW] Added web based user authentication
-  - [UPDATE] IMPORTANT: You need to call `[[BITHockeyManager sharedHockeyManager].authenticator authenticateInstallation];` yourself after startup when the authentication and/or verification should be performed and when it is safe to present a modal view controller!
-  - [UPDATE] Removed `automaticMode`. You now need to call `authenticateInstallation` when it is safe to do so or handle the complete process yourself.
-  <br /><br/>
-
-## Version 3.5.0 RC 2
-
-- General
-
-  - [BUGFIX] Remove assertions from release build
-	<br /><br/>
-	
-- Ad-Hoc/Enterprise Updates
-
-  - [BUGFIX] Add new iOS 7 icon sizes detection and adjust corner radius
-	<br /><br/>
-
-## Version 3.5.0 RC 1
-
-- General
-
-  - [UPDATE] Documentation improvements nearly everywhere
-	<br /><br/>
-
-- Crash Reporting
-
-  - [UPDATE] Integrated PLCrashReporter 1.2 beta 2
-  - [UPDATE] 64 bit crash reports now contain the correct architecture string
-  - [UPDATE] Automatically add the users UDID or email to crash reports in Ad-Hoc/Enterprise builds if they are provided by BITAuthenticator
-  - [BUGFIX] Fixed userName, userEmail and userID not being added to crash reports
-	<br /><br/>
-
-- App Store Updates
-
-  - [UPDATE] Changed default update check interval to weekly
-	<br /><br/>
-
-- Ad-Hoc/Enterprise Authentication
-
-  - [NEW] Redesigned API for easier usage and more flexibility (please check the documentation!)
-  - [NEW] Added option to customize the authentication flow
-  - [NEW] Added option to provide a custom parentViewController for presenting the UI
-  - [NEW] Added possibility to use an existing URL scheme
-  - [BUGFIX] Fixed authentication UI appearing after updating apps without changing the authentication settings
-	<br /><br/>
-
-- Ad-Hoc/Enterprise Updates
-
-  - [UPDATE] Don't add icon gloss to icons when running on iOS 7
-  - [BUGFIX] Fixed a few iOS 7 related UI problems in the update view
-	<br /><br/>
-
-
-## Version 3.5.0 Beta 3
-
-- Feedback
-
-  - [BUGFIX] Fix a layout issue with the compose feedback UI on the iPad with iOS 7 in landscape orientation
-	<br /><br/>
-
-- Ad-Hoc/Enterprise Authentication
-
-  - [BUGFIX] Fix a possible crash in iOS 5
-	<br /><br/>
-
-
-## Version 3.5.0 Beta 2
-
-- General
-
-  - [NEW] Added support for apps starting in the background
-  - [UPDATE] Added updated CocoaSpec
-  - [BUGFIX] Various documentation improvements
-	<br /><br/>
-
-- Ad-Hoc/Enterprise Authentication
-
-  - [BUGFIX] Fix duplicate count of installations
-	<br /><br/>
-
-- Ad-Hoc/Enterprise Updates
-
-  - [BUGFIX] Update view not showing any versions
-  - [BUGFIX] Fix a crash presenting the update view on iOS 5 and iOS 6
-	<br /><br/>
-
-
-## Version 3.5.0 Beta 1
-
-- General
-
-  - [NEW] Added support for iOS 7
-  - [NEW] Added experimental support for arm64 architecture
-  - [NEW] Added `BITStoreUpdateManager` for alerting the user of available App Store updates (disabled by default)
-  - [NEW] Added `BITAuthenticator` class for authorizing installations (Ad-Hoc/Enterprise builds only!)
-  - [NEW] Added possibility to build custom frameworks including/excluding specific modules from the static library (see `HockeySDKFeatureConfig.h`)
-  - [UPDATE] User related data is now stored in the keychain instead of property files
-  - [UPDATE] SDK documentation improvements
-  - [BUGFIX] Fixed multiple compiler warnings
-  - [BUGFIX] Fixed a few UI glitches, e.g. adjusting status bar style
-	<br /><br/>
-
-- Crash Reporting
-
-  - [NEW] Integrated PLCrashReporter 1.2 beta 1
-  - [NEW] Added optional support for Mach exceptions
-  - [NEW] Experimental support for arm64 (will be tested and improved once devices are available)
-  - [UPDATE] PLCrashReporter build with `BIT` namespace to avoid collisions
-  - [UPDATE] Crash reporting is automatically disabled when the app is invoked with the debugger!
-	<br /><br/>
-
-- Feedback
-
-  - [NEW] New protocol to inform about incoming feedback messages, see `BITFeedbackManagerDelegate`
-  - [UPDATE] Added method in `BITFeedbackComposeViewControllerDelegate` to let the app know if the user submitted a new message or cancelled it
-	<br /><br/>
-
-- App Store Updates
-
-  - [NEW] Inform user when a new version is available in the App Store (optional, disabled by default)
-	<br /><br/>
-
-- Ad-Hoc/Enterprise Updates and Authentication
-
-  - [UPDATE] Removed delegate for getting the UDID, please migrate to the new `BITAuthenticator`
-  - [NEW] In-app updates are now only offered if the device matches the minimum OS version requirement
-  - [NEW] `BITAuthenticator` identifies app installations, automatically disabled in App Store environments
-  - [NEW] `BITAuthenticator` can identify the user through:
-    - The email address of his/her HockeyApp account
-    - Login with his/her HockeyApp account (does not work with Facebook accounts!)
-    - Installation of the HockeyApp web-clip to provide the UDID (requires the app to handle URL callbacks)
-  - [NEW] `BITAuthenticator` can require the authorization:
-    - Never
-    - Optionally, i.e. the user can skip the dialog
-    - On first app version launch
-    - Whenever the app comes into foreground (requires the device to have a working internet connection)
-	<br /><br/>
-
-
-## Version 3.0.0
-
-- General
-
-	- [NEW] Added new Feedback module
-	- [NEW] Minimum iOS Deployment version is now iOS 5.0
-	- [NEW] Migrated to use ARC
-	- [NEW] Added localizations provided by [Wordcrafts.de](http://wordcrafts.de):
-	Chinese, English, French, German, Italian, Japanese, Portuguese, Brazilian-Portuguese, Russian, Spanish
-	- [NEW] Added Romanian, Hungarian localization
-	- [UPDATE] Updated integration and migration documentation
-      - [Installation & Setup](http://www.hockeyapp.net/help/sdk/ios/3.0.0/docs/docs/Guide-Installation-Setup.html) (Recommended)
-      - [Installation & Setup Advanced](http://www.hockeyapp.net/help/sdk/ios/3.0.0/docs/docs/Guide-Installation-Setup-Advanced.html) (Using Git submodule and Xcode sub-project)
-      - [Migration from previous SDK Versions](http://www.hockeyapp.net/help/sdk/ios/3.0.0/docs/docs/Guide-Migration-Kits.html)
-	- [UPDATE] Using embedded.framework for binary distribution containing everything needed in one package
-	- [UPDATE] Improved Xcode project setup to only use one static library
-	- [UPDATE] Providing build settings as `HockeySDK.xcconfig` file for easier setup
-	- [UPDATE] Remove `-ObjC` from `Other Linker Flags`, since the SDK doesn't need it anymore
-	- [UPDATE] Improved documentation
-	- [UPDATE] Excluded binary UUID check from simulator builds, so unit test targets will work. But functionality based on binary UUID cannot be tested in the simulator, e.g. update without changing build version.
-	- [BUGFIX] Fixed some new compiler warnings
-	- [BUGFIX] Fixed some missing new lines at EOF
-	- [BUGFIX] Make sure sure JSON serialization doesn't crash if the string is nil
-	- [BUGFIX] Various additional minor fixes
-	<br /><br/>
-
-- Crash Reporting
-
-	- [NEW] Added anonymous device ID to crash reports
-	- [UPDATE] The following delegates in `BITCrashManagerDelegate` moved to `BITHockeyManagerDelegate`:
-	- `- (NSString *)userNameForCrashManager:(BITCrashManager *)crashManager;` is now `- (NSString *)userNameForHockeyManager:(BITHockeyManager *)hockeyManager componentManager:(BITHockeyBaseManager *)componentManager;`
-	- `- (NSString *)userEmailForCrashManager:(BITCrashManager *)crashManager;` is now `- (NSString *)userEmailForHockeyManager:(BITHockeyManager *)hockeyManager componentManager:(BITHockeyBaseManager *)componentManager;`
-	- [BUGFIX] Moved calculation of time interval between startup and crash further up in the code, so delegates can use this information e.g. to add it into a log file
-	- [BUGFIX] If a crash was detected but could not be read (if handling crashes on startup is implemented), the delegate is still called
-	- [BUGFIX] Timestamp in crash report is now always UTC in en_US locale
-	- [BUGFIX] Make sure crash reports incident identifier and key don't have special [] chars and some value
-	<br /><br/>
-
-- Feedback
-
-	- [NEW] User feedback interface for direct communication with your users
-	- [NEW] iOS 6 UIActivity component for integrating feedback
-	- [NEW] When first opening the feedback list view, user details and show compose screen are automatically shown
-	<br /><br/>
-
-- Updating
-
-	- [NEW] Support for In-App updates without changing `CFBundleVersion`
-	- [UPDATE] Update UI modified to be more iOS 6 alike
-	- [UPDATE] Update UI shows the company name next to the app name if defined in the backend
-	- [UPDATE] Updated integration and migration documentation: [Installation & Setup](http://www.hockeyapp.net/help/sdk/ios/3.0.0/docs/docs/Guide-Installation-Setup.html) (Recommended), [Installation & Setup Advanced](http://www.hockeyapp.net/help/sdk/ios/3.0.0/docs/docs/Guide-Installation-Setup-Advanced.html) (Using Git submodule and Xcode sub-project), [Migration from previous SDK Versions](http://www.hockeyapp.net/help/sdk/ios/3.0.0/docs/docs/Guide-Migration-Kits.html)
-      		
-	- [BUGFIX] Fixed a problem showing the update UI animated if there TTNavigator class is present even though not being used
-
----
-
-### Version 3.0.0 RC 1
-
-- General:
-
-    - [NEW] Added localizations provided by [Wordcrafts.de](http://wordcrafts.de):
-      Chinese, English, French, German, Italian, Japanese, Portuguese, Brazilian-Portuguese, Russian, Spanish
-    - [NEW] Added Romanian localization
-    - [UPDATE] Documentation improvements
-    - [UPDATE] Exclude binary UUID check from simulator builds, so unit test targets will work. But functionality based on binary UUID cannot be tested in the simulator, e.g. update without changing build version.
-    - [BUGFIX] Cocoapods bugfix for preprocessor definitions
-    - [BUGFIX] Various additional minor fixes
-
-- Feedback:
-
-    - [UPDATE] Only push user details screen automatically onto the list view once
-    - [BUGFIX] Show proper missing user name or email instead of showing `(null)` in a button
-    - [BUGFIX] Various fixes to changing the `requireUserEmail` and `requireUserName` values
-
-    
-### Version 3.0.0b5
-
-- General:
-
-    - [NEW] Remove `-ObjC` from `Other Linker Flags`, since the SDK doesn't need it
-    - [NEW] Update localizations (german, croatian)
-    - [BUGFIX] Fix some new compiler warnings
-    - [BUGFIX] Fix some missing new lines at EOF
-    - [BUGFIX] Make sure sure JSON serialization doesn't crash if the string is nil
-
-- Crash Reporting:
-
-    - [NEW] Add anonymous device ID to crash reports
-    - [BUGFIX] Move calculation of time interval between startup and crash further up in the code, so delegates can use this information e.g. to add it into a log file
-    - [BUGFIX] Call delegate also if a crash was detected but could not be read (if handling crashes on startup is implemented)
-    - [BUGFIX] Format timestamp in crash report to be always UTC in en_US locale
-    - [BUGFIX] Make sure crash reports incident identifier and key don't have special [] chars and some value
-
-- Feedback:
-
-    - [NEW] Ask user details and show compose screen automatically on first opening feedback list view
-    - [BUGFIX] Fix some users own messages re-appearing after deleting them
-    - [BUGFIX] Problems displaying feedback list view in a navigation hierarchy
-
-- Updating:
-
-    - [BUGFIX] Fix a problem showing the update UI animated if there TTNavigator class is present even though not being used
-    
-### Version 3.0.0b4
-
-- Crash Reporting:
-
-    - [BUGFIX] Fix a crash if `username`, `useremail` or `userid` delegate method returns `nil` and trying to send a crash report
-
-- Feedback:
-
-    - [BUGFIX] Fix user data UI not always being presented as a form sheet on the iPad
-    
-- Updating:
-
-    - [BUGFIX] Fix a problem showing the update UI animated if there TTNavigator class is present even though not being used
-    
-### Version 3.0.0b3
-
-- General:
-
-    - [BUGFIX] Exchange some more prefixes of TTTAttributedLabel class that have been missed out
-    - [BUGFIX] Fix some new compiler warnings
-
-- Crash Reporting:
-
-    - [BUGFIX] Format timestamp in crash report to be always UTC in en_US locale
-
-### Version 3.0.0b2
-
-- General:
-
-    - [BUGFIX] Add missing header files to the binary distribution
-    - [BUGFIX] Add missing new lines of two header files
-    
-### Version 3.0.0b1
-
-- General:
-
-    - [NEW] Feedback component
-    - [NEW] Minimum iOS Deployment version is now iOS 5.0
-    - [NEW] Migrated to use ARC
-    - [UPDATE] Improved Xcode project setup to only use one static library
-    - [UPDATE] Providing build settings as `HockeySDK.xcconfig` file for easier setup
-    - [UPDATE] Using embedded.framework for binary distribution containing everything needed in one package
-    
-- Feedback:
-
-    - [NEW] User feedback interface for direct communication with your users
-    - [NEW] iOS 6 UIActivity component for integrating feedback
-
-- Updating:
-
-    - [NEW] Support for In-App updates without changing `CFBundleVersion`
-    - [UPDATE] Update UI modified to be more iOS 6 alike
-    - [UPDATE] Update UI shows the company name next to the app name if defined in the backend
-
-
-## Version 2.5.5
-
-- General:
-
-    - [BUGFIX] Fix some new compiler warnings
-
-- Crash Reporting:
-
-    - [NEW] Add anonymous device ID to crash reports
-    - [BUGFIX] Move calculation of time interval between startup and crash further up in the code, so delegates can use this information e.g. to add it into a log file
-    - [BUGFIX] Call delegate also if a crash was detected but could not be read (if handling crashes on startup is implemented)
-    - [BUGFIX] Format timestamp in crash report to be always UTC in en_US locale
-    - [BUGFIX] Make sure crash reports incident identifier and key don't have special [] chars and some value
-
-- Updating:
-
-    - [BUGFIX] Fix a problem showing the update UI animated if there TTNavigator class is present even though not being used
-
-## Version 2.5.4
-
-- General:
-
-    - Declared as final release, since everything in 2.5.4b3 is working as expected
-
-### Version 2.5.4b3
-
-- General:
-
-    - [NEW] Atlassian JMC support disabled (Use subproject integration if you want it)
-
-### Version 2.5.4b2
-
-- Crash Reporting:
-
-    - [UPDATE] Migrate pre v2.5 auto send user setting
-    - [BUGFIX] The alert option 'Auto Send' did not persist correctly
-
-- Updating:
-
-    - [BUGFIX] Authorization option did not persist correctly and caused authorization to re-appear on every cold app start
-
-### Version 2.5.4b1
-
-- General:
-
-    - [NEW] JMC support is removed from binary distribution, requires the compiler preprocessor definition `JIRA_MOBILE_CONNECT_SUPPORT_ENABLED=1` to be linked. Enabled when using the subproject
-    - [BUGFIX] Fix compiler warnings when using Cocoapods
-
-- Updating:
-
-    - [BUGFIX] `expiryDate` property not working correctly
-
-## Version 2.5.3
-
-- General:
-
-    - [BUGFIX] Fix checking validity of live identifier not working correctly
-
-## Version 2.5.2
-
-- General:
-
-    - Declared as final release, since everything in 2.5.2b2 is working as expected
-
-### Version 2.5.2b2
-
-- General:
-
-    - [NEW] Added support for armv7s architecture
-
-- Updating:
-
-    - [BUGFIX] Fix update checks not done when the app becomes active again
-
-
-### Version 2.5.2b1
-
-- General:
-
-    - [NEW] Replace categories with C functions, so the `Other Linker Flag` `-ObjC` and `-all_load` won't not be needed for integration
-	- [BUGFIX] Some code style fixes and missing new lines in headers at EOF
-
-- Crash Reporting:
-
-    - [NEW] PLCrashReporter framework now linked into the HockeySDK framework, so that won't be needed to be added separately any more
-    - [NEW] Add some error handler detection to optionally notify the developer of multiple handlers that could cause crashes not to be reported to HockeyApp
-    - [NEW] Show an error in the console if an older version of PLCrashReporter is linked
-    - [NEW] Make sure the app doesn't crash if the developer forgot to delete the old PLCrashReporter version and the framework search path is still pointing to it
-
-- Updating:
-
-    - [BUGFIX] Fix disabling usage tracking and expiry check not working if `checkForUpdateOnLaunch` is set to NO
-    - [BUGFIX] `disableUpdateManager` wasn't working correctly
-    - [BUGFIX] If the server doesn't return any app versions, don't handle this as an error, but show a warning in the console when `debugLogging` is enabled
-
-## Version 2.5.1
-
-- General:
-
-	- [BUGFIX] Typo in delegate `shouldUseLiveIdentifier` of `BITHockeyManagerDelegate`
-	- [BUGFIX] Default updateManager delegate wasn't set
-
-- Crash Reporting:
-
-	- [BUGFIX] Crash when developer sends the notification `BITHockeyNetworkDidBecomeReachableNotification`
-
-
-## Version 2.5
-
-- General:
-
-	- [NEW] Unified SDK for accessing HockeyApp on iOS
-
-		- Requires iOS 4.0 or newer
-
-		- Replaces the previous separate SDKs for iOS: HockeyKit and QuincyKit.
-		
-		  The previous SDKs are still available and are still working. But future
-		  HockeyApp features will only be integrated in this new unified SDK.
-
-		- Integration either as framework or Xcode subproject using the sourcecode
-		
-		  Check out [Installation & Setup](Guide-Installation-Setup)
-
-	- [NEW] Cleaned up public interfaces and internal processing all across the SDK
-
-	- [NEW] [AppleDoc](http://gentlebytes.com/appledoc/) based documentation and HowTos
-	
-		This allows the documentation to be generated into HTML or DocSet.
-
-- Crash Reporting:
-
-	- [NEW] Workflow to handle crashes that happen on startup.
-	
-		Check out [How to handle crashes on startup](HowTo-Handle-Crashes-On-Startup) for more details.
-
-	- [NEW] Symbolicate iOS calls async-safe on the device
-
-	- [NEW] Single property/option to deactivate, require user to agree submitting and autosubmit
-		
-		E.g. implement a settings screen with the three options and set
-		`[BITCrashManager crashManagerStatus]` to the desired user value.
-
-	- [UPDATED] Updated [PLCrashReporter](https://code.google.com/p/plcrashreporter/) with updates and bugfixes (source available on [GitHub](https://github.com/bitstadium/PLCrashReporter))
-
-	- [REMOVED] Feedback for Crash Groups Status
-		
-		Please keep using QuincyKit for now if you want this feature. This feature needs to be
-		redesigned on SDK and server side to be more efficient and easier to use.
-
-- Updating:
-
-	- [NEW] Expire beta versions with a given date
-
-	- [REMOVED] Settings screen
-
-		If you want users to be able not to send analytics data, implement the
-		`[BITUpdateManagerDelegate updateManagerShouldSendUsageData:]` delegate and return
-		the value depending on what the user defines in your settings UI.
diff --git a/submodules/HockeySDK-iOS/Documentation/Guides/Crash Reporting Not Working.md b/submodules/HockeySDK-iOS/Documentation/Guides/Crash Reporting Not Working.md
deleted file mode 100644
index 5ed8718983..0000000000
--- a/submodules/HockeySDK-iOS/Documentation/Guides/Crash Reporting Not Working.md	
+++ /dev/null
@@ -1,26 +0,0 @@
-## Crash Reporting is not working
-
-This is a checklist to help find the issue if crashes do not appear in HockeyApp or the dialog asking if crashes should be send doesn't appear:
-
-
-1. Check if the `BETA_IDENTIFIER` or `LIVE_IDENTIFIER` matches the App ID in HockeyApp.
-
-2. Check if CFBundleIdentifier in your Info.plist matches the Bundle Identifier of the app in HockeyApp. HockeyApp accepts crashes only if both the App ID and the Bundle Identifier equal their corresponding values in your plist and source code.
-
-3. Unless you have set `[BITCrashManager setCrashManagerStatus:]` to `BITCrashManagerStatusAutoSend`: If your app crashes and you start it again, is the alert shown which asks the user to send the crash report? If not, please crash your app again, then connect the debugger and set a break point in `BITCrashManager.m`, method `startManager` to see why the alert is not shown.
-
-4. Enable the debug logging option and check the output if the Crash Manager gets `Setup`, `Started`, returns no error message and sending the crash report to the server results in no error:
-
-        [[BITHockeyManager shareHockeyManager] setDebugLogEnabled: YES];
-    
-
-5. Make sure Xcode debugger is not attached while causing the app to crash
-
-6. Are you trying to catch "out of memory crashes"? This is _NOT_ possible! Out of memory crashes are actually kills by the watchdog process. Whenever you kill a process, there is no crash happening. The crash reports for those that you see on iTunes Connect, are arbitrary reports written by the watchdog process that did the kill. So they only system that can provide information about these, is iOS itself.
-
-7. If you are using `#ifdef (CONFIGURATION_something)`, make sure that the `something` string matches the exact name of your Xcode build configuration. Spaces are not allowed!
-
-8. Remove or at least disable any other exception handler or crash reporting framework.
-
-9. If it still does not work, please [contact us](http://support.hockeyapp.net/discussion/new).
-
diff --git a/submodules/HockeySDK-iOS/Documentation/Guides/Installation & Setup.md b/submodules/HockeySDK-iOS/Documentation/Guides/Installation & Setup.md
deleted file mode 100644
index 2ca0440c4c..0000000000
--- a/submodules/HockeySDK-iOS/Documentation/Guides/Installation & Setup.md	
+++ /dev/null
@@ -1,883 +0,0 @@
- [![Build Status](https://www.bitrise.io/app/30bf519f6bd0a5e2/status.svg?token=RKqHc7-ojjLiEFds53d-ZA&branch=master)](https://www.bitrise.io/app/30bf519f6bd0a5e2)
-[![Carthage compatible](https://img.shields.io/badge/Carthage-compatible-4BC51D.svg?style=flat)](https://github.com/Carthage/Carthage)
-[![Version](http://cocoapod-badges.herokuapp.com/v/HockeySDK/badge.png)](http://cocoadocs.org/docsets/HockeySDK)
- [![Slack Status](https://slack.hockeyapp.net/badge.svg)](https://slack.hockeyapp.net)
- 
-## Version 5.1.2
-
-- [Changelog](http://www.hockeyapp.net/help/sdk/ios/5.1.2/docs/docs/Changelog.html)
-
-**NOTE** If your are using the binary integration of our SDK, make sure that the `HockeySDKResources.bundle` inside the `HockeySDK.embeddedframework`-folder has been added to your application.
-
-### Feedback and iOS 10
-**4.1.1 and later of the HockeySDK remove the Feedback feature from the default version of the SDK.**
-The reason for this is that iOS 10 requires developers to add a usage string to their Info.plist in case they include the photos framework in their app. If this string is missing, the app will be rejected when submitting the app to the app store. As HockeyApp's Feedback feature includes a dependency to the photos framework. This means that if you include HockeyApp into your app, adding the usage string would be a requirement even for developers who don't use the Feedback feature. If you don't use Feedback in your app, simply upgrade HockeySDK to version 4.1.1 or newer. If you are using Feedback, please have a look at the [Feedback section](#feedback).
-
-
-We **strongly** suggest upgrading to version 4.1.1 or a later version of the SDK. Not specifying the usage description string and using previous versions of the HockeySDK-iOS will cause the app to crash at runtime as soon as the user taps the "attach image"-button or in case you have enabled `BITFeedbackObservationModeOnScreenshot`.
-
-If you are using an older version of the SDK, you must add a `NSPhotoLibraryUsageDescription` to your `Info.plist` to avoid a AppStore rejection during upload of your app (please have a look at the [Feedback section](#feedback)).
-
-## Introduction
-
-HockeySDK-iOS implements support for using HockeyApp in your iOS applications.
-
-The following features are currently supported:
-
-1. **Collect crash reports:** If your app crashes, a crash log with the same format as from the Apple Crash Reporter is written to the device's storage. If the user starts the app again, they are asked to submit the crash report to HockeyApp. This works for both beta and live apps, i.e. those submitted to the App Store.
-
-2. **User Metrics:** Understand user behavior to improve your app. Track usage through daily and monthly active users, monitor crash impacted users, as well as customer engagement through session count.You can now track **Custom Events** in your app, understand user actions and see the aggregates on the HockeyApp portal.
-
-3. **Update Ad-Hoc / Enterprise apps:** The app will check with HockeyApp if a new version for your Ad-Hoc or Enterprise build is available. If yes, it will show an alert view to the user and let them see the release notes, the version history and start the installation process right away. 
-
-4. **Update notification for app store:** The app will check if a new version for your app store release is available. If yes, it will show an alert view to the user and let them open your app in the App Store app. (Disabled by default!)
-
-5. **Feedback:** Collect feedback from your users from within your app and communicate directly with them using the HockeyApp backend.
-
-6. **Authenticate:** Identify and authenticate users of Ad-Hoc or Enterprise builds
-
-This document contains the following sections:
-
-1. [Requirements](#requirements)
-2. [Setup](#setup)
-3. [Advanced Setup](#advancedsetup) 
-  1. [Linking System Frameworks manually](#linkmanually)   
-  2. [CocoaPods](#cocoapods)
-  3. [Carthage](#carthage)
-  4. [iOS Extensions](#extensions)
-  5. [WatchKit 1 Extensions](#watchkit)
-  6. [Crash Reporting](#crashreporting)
-  7. [User Metrics](#user-metrics)
-  8. [Feedback](#feedback)
-  9. [Store Updates](#storeupdates)
-  10. [In-App-Updates (Beta & Enterprise only)](#betaupdates)
-  11. [Debug information](#debug)
-4. [Documentation](#documentation)
-5. [Troubleshooting](#troubleshooting)
-6. [Contributing](#contributing)
-  1. [Development Environment](#developmentenvironment)
-  2. [Code of Conduct](#codeofconduct)
-  3. [Contributor License](#contributorlicense)
-7. [Contact](#contact)
-
-<a id="requirements"></a> 
-## 1. Requirements
-
-1. We assume that you already have a project in Xcode and that this project is opened in Xcode 8 or later.
-2. The SDK supports iOS 8.0 and later.
-
-<a id="setup"></a>
-## 2. Setup
-
-We recommend integration of our binary into your Xcode project to setup HockeySDK for your iOS app. You can also use our interactive SDK integration wizard in <a href="http://hockeyapp.net/mac/">HockeyApp for Mac</a> which covers all the steps from below. For other ways to setup the SDK, see [Advanced Setup](#advancedsetup).
-
-### 2.1 Obtain an App Identifier
-
-Please see the "[How to create a new app](http://support.hockeyapp.net/kb/about-general-faq/how-to-create-a-new-app)" tutorial. This will provide you with an HockeyApp specific App Identifier to be used to initialize the SDK.
-
-### 2.2 Download the SDK
-
-1. Download the latest [HockeySDK-iOS](http://www.hockeyapp.net/releases/) framework which is provided as a zip-File.
-2. Unzip the file and you will see a folder called `HockeySDK-iOS`. (Make sure not to use 3rd party unzip tools!)
-
-### 2.3 Copy the SDK into your projects directory in Finder
-
-From our experience, 3rd-party libraries usually reside inside a subdirectory (let's call our subdirectory `Vendor`), so if you don't have your project organized with a subdirectory for libraries, now would be a great start for it. To continue our example,  create a folder called `Vendor` inside your project directory and move the unzipped `HockeySDK-iOS`-folder into it. 
-
-The SDK comes in four flavors:
-
-  * Default SDK without Feedback: `HockeySDK.embeddedframework`
-  * Full featured SDK with Feedback: `HockeySDK.embeddedframework` in the subfolder `HockeySDKAllFeatures`. 
-  * Crash reporting only: `HockeySDK.framework` in the subfolder `HockeySDKCrashOnly`.
-  * Crash reporting only for extensions: `HockeySDK.framework` in the subfolder `HockeySDKCrashOnlyExtension` (which is required to be used for extensions).
-  
-Our examples will use the **default** SDK (`HockeySDK.embeddedframework`).
-
-<a id="setupxcode"></a>
-
-### 2.4 Add the SDK to the project in Xcode
-
-> We recommend using Xcode's group-feature to create a group for 3rd-party-libraries similar to the structure of our files on disk. For example, similar to the file structure in 2.3 above, our projects have a group called `Vendor`.
-	
-1. Make sure the `Project Navigator` is visible (⌘+1).
-2. Drag & drop `HockeySDK.embeddedframework` from your `Finder` to the `Vendor` group in `Xcode` using the `Project Navigator` on the left side.
-3. An overlay will appear. Select `Create groups` and set the checkmark for your target. Then click `Finish`.
-
-<a id="modifycode"></a>
-### 2.5 Modify Code 
-
-**Objective-C**
-
-1. Open your `AppDelegate.m` file.
-2. Add the following line at the top of the file below your own `import` statements:
-
-  ```objc
-  @import HockeySDK;
-  ```
-
-3. Search for the method `application:didFinishLaunchingWithOptions:`
-4. Add the following lines to setup and start the HockeyApp SDK:
-
-  ```objc
-  [[BITHockeyManager sharedHockeyManager] configureWithIdentifier:@"APP_IDENTIFIER"];
-  // Do some additional configuration if needed here
-  [[BITHockeyManager sharedHockeyManager] startManager];
-  [[BITHockeyManager sharedHockeyManager].authenticator authenticateInstallation]; // This line is obsolete in the crash only builds
-  ```
-
-**Swift**
-
-1. Open your `AppDelegate.swift` file.
-2. Add the following line at the top of the file below your own import statements:
-
-  ```swift
-  import HockeySDK
-  ```
-
-3. Search for the method 
-
-  ```swift
-  func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey: Any]?) -> Bool
-  ```
-
-4. Add the following lines to setup and start the HockeyApp SDK:
-
-  ```swift
-  BITHockeyManager.shared().configure(withIdentifier: "APP_IDENTIFIER")
-  BITHockeyManager.shared().start()
-  BITHockeyManager.shared().authenticator.authenticateInstallation() // This line is obsolete in the crash only builds
-
-  ```
-
-
-*Note:* The SDK is optimized to defer everything possible to a later time while making sure e.g. crashes on start-up can also be caught and each module executes other code with a delay some seconds. This ensures that `applicationDidFinishLaunching` will process as fast as possible and the SDK will not block the start-up sequence resulting in a possible kill by the watchdog process.
-
-
-**Congratulation, now you're all set to use HockeySDK!**
-
-<a id="advancedsetup"></a> 
-## 3. Advanced Setup
-
-<a id="linkmanually"></a>
-### 3.1 Linking System Frameworks manually
-
-If you are working with an older project which doesn't support clang modules yet or you for some reason turned off the `Enable Modules (C and Objective-C` and `Link Frameworks Automatically` options in Xcode, you have to manually link some system frameworks:
-
-1. Select your project in the `Project Navigator` (⌘+1).
-2. Select your app target.
-3. Select the tab `Build Phases`.
-4. Expand `Link Binary With Libraries`.
-5. Add the following system frameworks, if they are missing:
-  1. Default SDK: 
-    + `CoreText`
-    + `CoreGraphics`
-    + `Foundation`
-    + `MobileCoreServices`
-    + `QuartzCore`
-    + `QuickLook`
-    + `Security`
-    + `SystemConfiguration`
-    + `UIKit`
-    + `libc++`
-    + `libz`
-  2. SDK with all features:
-    + `CoreText`
-    + `CoreGraphics`
-    + `Foundation`
-    + `MobileCoreServices`
-    + `QuartzCore`
-    + `QuickLook`
-    + `Photos`
-    + `Security`
-    + `SystemConfiguration`
-    + `UIKit`
-    + `libc++`
-    + `libz`
-  3. Crash reporting only:
-    + `Foundation`
-    + `Security`
-    + `SystemConfiguration`
-    + `UIKit`
-    + `libc++`
-  4. Crash reporting only for extensions:
-    + `Foundation`
-    + `Security`
-    + `SystemConfiguration`
-    + `libc++`
-
-Note that not using clang modules also means that you can't use the `@import` syntax mentioned in the [Modify Code](#modify) section but have to stick to the old `#import <HockeySDK/HockeySDK.h>` imports.
-
-<a id="cocoapods"></a>
-### 3.2 CocoaPods
-
-[CocoaPods](http://cocoapods.org) is a dependency manager for Objective-C, which automates and simplifies the process of using 3rd-party libraries like HockeySDK in your projects. To learn how to setup CocoaPods for your project, visit the [official CocoaPods website](http://cocoapods.org/).
-
-**Podfile**
-
-```ruby
-platform :ios, '8.0'
-pod "HockeySDK"
-```
-
-#### 3.2.1 Binary Distribution Options
-
-The default and recommended distribution is a binary (static library) and a resource bundle with translations and images for all SDK features.
-
-```ruby
-platform :ios, '8.0'
-pod "HockeySDK"
-```
-
-Will integrate the *default* configuration of the SDK, with all features except the Feedback feature.
-
-For the SDK with all features, including Feedback, add
-
-```ruby
-pod "HockeySDK", :subspecs => ['AllFeaturesLib']
-```
-to your podfile.
-
-To add the variant that only includes crash reporting, use
-
-```ruby
-pod "HockeySDK", :subspecs => ['CrashOnlyLib']
-```
-
-Or you can use the Crash Reporting build only for extensions by using the following line in your `Podfile`:
-
-```ruby
-pod "HockeySDK", :subspecs => ['CrashOnlyExtensionsLib']
-```
-
-#### 3.2.2 Source Integration Options
-
-Alternatively, you can integrate the SDK by source if you want to do modifications or want a different feature set. The following entry will integrate the SDK:
-
-```ruby
-pod "HockeySDK-Source"
-```
-
-<a id="carthage"></a>
-### 3.3 Carthage
-
-[Carthage](https://github.com/Carthage/Carthage) is an alternative way to add frameworks to your app. For general information about how to use Carthage, please follow their [documentation](https://github.com/Carthage/Carthage#adding-frameworks-to-an-application).
-
-To add HockeySDK to your project, simply put this line into your `Cartfile`:
-
-`github "bitstadium/HockeySDK-iOS"`
-
-and then follow the steps described in the [Carthage documentation](https://github.com/Carthage/Carthage#if-youre-building-for-ios-tvos-or-watchos).
-
-This will integrate the **full-featured SDK** so you must include the `NSPhotoLibraryUsageDescription` and read the [feedback section](#feedback). If you want to include any other version of the SDK, version 4.1.4 added the ability to do that. You need to specify the configuration that you want to use
-
-#### Version without Feedback
-
-`carthage build --platform iOS --configuration ReleaseDefault HockeySDK-iOS`
-
-#### Crash-only version
-
-`carthage build --platform iOS --configuration ReleaseCrashOnly HockeySDK-iOS`
-
-### Crash-only extension
-
-`carthage build --platform iOS --configuration ReleaseCrashOnlyExtension HockeySDK-iOS`
-
-<a id="extensions"></a>
-### 3.4 iOS Extensions
-
-The following points need to be considered to use the HockeySDK SDK with iOS Extensions:
-
-1. Each extension is required to use the same values for version (`CFBundleShortVersionString`) and build number (`CFBundleVersion`) as the main app uses. (This is required only if you are using the same `APP_IDENTIFIER` for your app and extensions).
-2. You need to make sure the SDK setup code is only invoked **once**. Since there is no `applicationDidFinishLaunching:` equivalent and `viewDidLoad` can run multiple times, you need to use a setup like the following example:
-
-**Objective-C**
-
-  ```objc
-  static BOOL didSetupHockeySDK = NO;
-
-  @interface TodayViewController () <NCWidgetProviding>
-
-  @end
-
-  @implementation TodayViewController
-
-  + (void)viewDidLoad {
-    [super viewDidLoad];
-    if (!didSetupHockeySDK) {
-      [[BITHockeyManager sharedHockeyManager] configureWithIdentifier:@"APP_IDENTIFIER"];
-      [[BITHockeyManager sharedHockeyManager] startManager];
-      didSetupHockeySDK = YES;
-    }
-  }
-  ```
-
-  **Swift**
-
-  ```swift
-  class TodayViewController: UIViewController, NCWidgetProviding {
-
-    static var didSetupHockeySDK = false;
-
-    override func viewDidLoad() {
-      super.viewDidLoad()
-      if !TodayViewController.didSetupHockeySDK {
-        BITHockeyManager.shared().configure(withIdentifier: "APP_IDENTIFIER")
-        BITHockeyManager.shared().start()
-        TodayViewController.didSetupHockeySDK = true
-      }
-    }
-  }
-  ```
-
-3. The binary distribution provides a special framework build in the `HockeySDKCrashOnly` or `HockeySDKCrashOnlyExtension` folder of the distribution zip file, which only contains crash reporting functionality (also automatic sending crash reports only).
-
-<a id="watchkit"></a>
-### 3.5 WatchKit 1 Extensions
-
-The following points need to be considered to use HockeySDK with WatchKit 1 Extensions:
-
-1. WatchKit extensions don't use regular `UIViewControllers` but rather `WKInterfaceController` subclasses. These have a different lifecycle than you might be used to.
-
-  To make sure that the HockeySDK is only instantiated once in the WatchKit extension's lifecycle we recommend using a helper class similar to this:
-
-  **Objective-C**
-
-  ```objc
-  @import Foundation;
-  
-  @interface BITWatchSDKSetup : NSObject
-  
-  * (void)setupHockeySDKIfNeeded;
-  
-  @end
-  ```
-
-  ```objc
-  #import "BITWatchSDKSetup.h"
-  @import HockeySDK
-  
-  static BOOL hockeySDKIsSetup = NO;
-  
-  @implementation BITWatchSDKSetup
-  
-  * (void)setupHockeySDKIfNeeded {
-    if (!hockeySDKIsSetup) {
-      [[BITHockeyManager sharedHockeyManager] configureWithIdentifier:@"APP_IDENTIFIER"];
-      [[BITHockeyManager sharedHockeyManager] startManager];
-      hockeySDKIsSetup = YES;
-    }
-  }
-  
-  @end
-  ```
-
-  **Swift**
-
-  ```swift
-  import HockeySDK
-
-  class BITWatchSDKSetup {
-
-    static var hockeySDKIsSetup = false;
-
-    static func setupHockeySDKIfNeeded() {
-      if !BITWatchSDKSetup.hockeySDKIsSetup {
-        BITHockeyManager.shared().configure(withIdentifier: "APP_IDENTIFIER")
-        BITHockeyManager.shared().start()
-        BITWatchSDKSetup.hockeySDKIsSetup = true;
-      }
-    }
-  }
-  ```
-
-
-  Then, in each of your WKInterfaceControllers where you want to use the HockeySDK, you should do this:
-
-  **Objective-C**
-
-  ```objc
-  #import "InterfaceController.h"
-  @import HockeySDK
-  #import "BITWatchSDKSetup.h"
-  
-  @implementation InterfaceController
-  
-  + (void)awakeWithContext:(id)context {
-    [super awakeWithContext:context];
-    [BITWatchSDKSetup setupHockeySDKIfNeeded];
-  }
-  
-  + (void)willActivate {
-    [super willActivate];
-  }
-  
-  + (void)didDeactivate {
-    [super didDeactivate];
-  }
-  
-  @end
-  ```
-
-  **Swift**
-
-  ```swift
-  class InterfaceController: WKInterfaceController {
-
-    override func awake(withContext context: Any?) {
-      super.awake(withContext: context)
-      BITWatchSDKSetup.setupHockeySDKIfNeeded()
-    }
-
-    override func willActivate() {
-      super.willActivate()
-    }
-
-    override func didDeactivate() {
-      super.didDeactivate()
-    }
-
-  }
-  ```
-2. The binary distribution provides a special framework build in the `HockeySDKCrashOnly` or `HockeySDKCrashOnlyExtension` folder of the distribution zip file, which only contains crash reporting functionality (also automatic sending crash reports only).
-
-<a name="crashreporting"></a>
-### 3.6 Crash Reporting
-
-The following options only show some of the possibilities to interact and fine-tune the crash reporting feature. For more please check the full documentation of the `BITCrashManager` class in our [documentation](#documentation).
-
-#### 3.6.1 Disable Crash Reporting
-The HockeySDK enables crash reporting **per default**. Crashes will be immediately sent to the server the next time the app is launched.
-
-To provide you with the best crash reporting, we are using a build of [PLCrashReporter]("https://github.com/plausiblelabs/plcrashreporter") based on [Version 1.2.1 / Commit 356901d7f3ca3d46fbc8640f469304e2b755e461]("https://github.com/plausiblelabs/plcrashreporter/commit/356901d7f3ca3d46fbc8640f469304e2b755e461").
-
-This feature can be disabled as follows:
-
-**Objective-C**
-
-```objc
-[[BITHockeyManager sharedHockeyManager] configureWithIdentifier:@"APP_IDENTIFIER"];
-
-[[BITHockeyManager sharedHockeyManager] setDisableCrashManager: YES]; //disable crash reporting
-
-[[BITHockeyManager sharedHockeyManager] startManager];
-```
-
-**Swift**
-
-```swift
-BITHockeyManager.shared().configure(withIdentifier: "APP_IDENTIFIER")
-BITHockeyManager.shared().isCrashManagerDisabled = true
-BITHockeyManager.shared().start()
-```
-#### 3.6.2 Auto send crash reports
-
-Crashes are send the next time the app starts. If `crashManagerStatus` is set to `BITCrashManagerStatusAutoSend`, crashes will be send without any user interaction, otherwise an alert will appear allowing the users to decide whether they want to send the report or not.
-
-**Objective-C**
-
-```objc
-[[BITHockeyManager sharedHockeyManager] configureWithIdentifier:@"APP_IDENTIFIER"];
-
-[[BITHockeyManager sharedHockeyManager].crashManager setCrashManagerStatus: BITCrashManagerStatusAutoSend];
-
-[[BITHockeyManager sharedHockeyManager] startManager];
-```
-
-**Swift**
-
-```swift
-BITHockeyManager.shared().configure(withIdentifier: "APP_IDENTIFIER")
-BITHockeyManager.shared().crashManager.crashManagerStatus = BITCrashManagerStatus.autoSend
-BITHockeyManager.shared().start()
-```
-
-The SDK is not sending the reports right when the crash happens deliberately, because if is not safe to implement such a mechanism while being async-safe (any Objective-C code is _NOT_ async-safe!) and not causing more danger like a deadlock of the device, than helping. We found that users do start the app again because most don't know what happened, and you will get by far most of the reports.
-
-Sending the reports on start-up is done asynchronously (non-blocking). This is the only safe way to ensure that the app won't be possibly killed by the iOS watchdog process, because start-up could take too long and the app could not react to any user input when network conditions are bad or connectivity might be very slow.
-
-#### 3.6.3 Mach Exception Handling
-
-By default the SDK is using the safe and proven in-process BSD Signals for catching crashes. This option provides an option to enable catching fatal signals via a Mach exception server instead.
-
-We strongly advise _NOT_ to enable Mach exception handler in release versions of your apps!
-
-*Warning:* The Mach exception handler executes in-process, and will interfere with debuggers when they attempt to suspend all active threads (which will include the Mach exception handler). Mach-based handling should _NOT_ be used when a debugger is attached. The SDK will not enable catching exceptions if the app is started with the debugger running. If you attach the debugger during runtime, this may cause issues the Mach exception handler is enabled!
-
-**Objective-C**
-
-```objc
-[[BITHockeyManager sharedHockeyManager] configureWithIdentifier:@"APP_IDENTIFIER"];
-
-[[BITHockeyManager sharedHockeyManager].crashManager setEnableMachExceptionHandler: YES];
-
-[[BITHockeyManager sharedHockeyManager] startManager];
-```
-
-**Swift**
-
-```swift
-BITHockeyManager.shared().configure(withIdentifier: "APP_IDENTIFIER")
-BITHockeyManager.shared().crashManager.isMachExceptionHandlerEnabled = true
-BITHockeyManager.shared().start()
-```
-
-#### 3.6.4 Attach additional data
-
-The `BITHockeyManagerDelegate` protocol provides methods to add additional data to a crash report:
-
-1. UserID:
-
-**Objective-C**
-
-`- (NSString *)userIDForHockeyManager:(BITHockeyManager *)hockeyManager componentManager:(BITHockeyBaseManager *)componentManager;`
-
-**Swift**
-
-`optional public func userID(for hockeyManager: BITHockeyManager!, componentManager: BITHockeyBaseManager!) -> String!`
-
-2. UserName:
-
-**Objective-C**
-
-`- (NSString *)userNameForHockeyManager:(BITHockeyManager *)hockeyManager componentManager:(BITHockeyBaseManager *)componentManager;`
-
-**Swift**
-
-`optional public func userName(for hockeyManager: BITHockeyManager!, componentManager: BITHockeyBaseManager!) -> String!`
-
-3. UserEmail:
-
-**Objective-C**
-
-`- (NSString *)userEmailForHockeyManager:(BITHockeyManager *)hockeyManager componentManager:(BITHockeyBaseManager *)componentManager;`
-
-**Swift**
-
-`optional public func userEmail(for hockeyManager: BITHockeyManager!, componentManager: BITHockeyBaseManager!) -> String!`
-
-The `BITCrashManagerDelegate` protocol (which is automatically included in `BITHockeyManagerDelegate`) provides methods to add more crash specific data to a crash report:
-
-1. Text attachments: 
-
-**Objective-C**
-
-`-(NSString *)applicationLogForCrashManager:(BITCrashManager *)crashManager`
-
-**Swift**
-
-`optional public func applicationLog(for crashManager: BITCrashManager!) -> String!`
-
-  Check the following tutorial for an example on how to add CocoaLumberjack log data: [How to Add Application Specific Log Data on iOS or OS X](http://support.hockeyapp.net/kb/client-integration-ios-mac-os-x/how-to-add-application-specific-log-data-on-ios-or-os-x)
-2. Binary attachments: 
-
-**Objective-C**
-
-`-(BITHockeyAttachment *)attachmentForCrashManager:(BITCrashManager *)crashManager`
-
-**Swift**
-
-`optional public func attachment(for crashManager: BITCrashManager!) -> BITHockeyAttachment!`
-
-Make sure to implement the protocol
-
-**Objective-C**
-
-```objc
-@interface YourAppDelegate () <BITHockeyManagerDelegate> {}
-
-@end
-```
-
-**Swift**
-
-```swift
-class YourAppDelegate: BITHockeyManagerDelegate {
-
-}
-```
-
-and set the delegate:
-
-**Objective-C**
-
-```objc
-[[BITHockeyManager sharedHockeyManager] configureWithIdentifier:@"APP_IDENTIFIER"];
-
-[[BITHockeyManager sharedHockeyManager] setDelegate: self];
-
-[[BITHockeyManager sharedHockeyManager] startManager];
-```
-
-**Swift**
-
-```swift
-BITHockeyManager.shared().configure(withIdentifier: "APP_IDENTIFIER")
-BITHockeyManager.shared().delegate = self
-BITHockeyManager.shared().start()
-```
-
-<a name="user-metrics"></a>
-### 3.7 User Metrics
-
-HockeyApp automatically provides you with nice, intelligible, and informative metrics about how your app is used and by whom. 
-
-- **Sessions**: A new session is tracked by the SDK whenever the containing app is restarted (this refers to a 'cold start', i.e., when the app has not already been in memory prior to being launched) or whenever it becomes active again after having been in the background for 20 seconds or more.
-- **Users**: The SDK anonymously tracks the users of your app by creating a random UUID that is then securely stored in the iOS keychain. This anonymous ID is stored in the keychain, as of iOS 10, it no longer persists across re-installations.
-- **Custom Events**: With HockeySDK 4.1.0 and later, you can now track Custom Events in your app, understand user actions and see the aggregates on the HockeyApp portal.
-- **Batching & offline behavior**: The SDK batches up to 50 events or waits for 15s and then persist and send the events, whichever comes first. So for sessions, this might actually mean we send 1 single event per batch. If you are sending Custom Events, it can be 1 session event plus X of your Custom Events (up to 50 events per batch total). In case the device is offline, up to 300 events are stored until the SDK starts to drop new events.
-
-Just in case you want to opt-out of the automatic collection of anonymous users and sessions statistics, there is a way to turn this functionality off at any time:
-
-**Objective-C**
-
-```objc
-[BITHockeyManager sharedHockeyManager].disableMetricsManager = YES;
-```
-
-**Swift**
-
-```swift
-BITHockeyManager.shared().isMetricsManagerDisabled = true
-```
-
-#### 3.7.1 Custom Events
-
-By tracking custom events, you can now get insight into how your customers use your app, understand their behavior and answer important business or user experience questions while improving your app.
-
-- Before starting to track events, ask yourself the questions that you want to get answers to. For instance, you might be interested in business, performance/quality or user experience aspects.
-- Name your events in a meaningful way and keep in mind that you will use these names when searching for events in the HockeyApp web portal. It is your responsibility to not collect personal information as part of the events tracking.
-
-**Objective-C**
-
-```objc
-BITMetricsManager *metricsManager = [BITHockeyManager sharedHockeyManager].metricsManager;
-
-[metricsManager trackEventWithName:eventName]
-```
-
-**Swift**
-
-```swift
-let metricsManager = BITHockeyManager.shared().metricsManager
-
-metricsManager.trackEvent(withName: eventName)
-```
-
-**Limitations**
-
-- Accepted characters for tracking events are: [a-zA-Z0-9_. -]. If you use other than the accepted characters, your events will not show up in the HockeyApp web portal.
-- There is currently a limit of 300 unique event names per app per week.
-- There is _no_ limit on the number of times an event can happen.
-
-#### 3.7.2 Attaching custom properties and measurements to a custom event
-
-It's possible to attach properties and/or measurements to a custom event. There is one limitation to attaching properties and measurements. They currently don't show up in the HockeyApp dashboard but you have to link your app to Application Insights to be able to query them. Please have a look at [our blog post](https://www.hockeyapp.net/blog/2016/08/30/custom-events-public-preview.html) to find out how to do that. 
-
-- Properties have to be a string.
-- Measurements have to be of a numeric type.
-
-**Objective-C**
-
-```objc
-BITMetricsManager *metricsManager = [BITHockeyManager sharedHockeyManager].metricsManager;
-
-NSDictionary *myProperties = @{@"Property 1" : @"Something",
-                               @"Property 2" : @"Other thing",
-                               @"Property 3" : @"Totally different thing"};
-NSDictionary *myMeasurements = @{@"Measurement 1" : @1,
-                                 @"Measurement 2" : @2.34,
-                                 @"Measurement 3" : @2000000};
-
-[metricsManager trackEventWithName:eventName properties:myProperties measurements:myMeasurements]
-```
-
-**Swift**
-
-```swift
-let myProperties = ["Property 1": "Something", "Property 2": "Other thing", "Property 3" : "Totally different thing."]
-let myMeasurements = ["Measurement 1": 1, "Measurement 2": 2.3, "Measurement 3" : 30000]
-      
-let metricsManager = BITHockeyManager.shared().metricsManager
-metricsManager.trackEvent(withName: eventName, properties: myProperties, measurements: myMeasurements)
-```
-
-<a name="feedback"></a>
-### 3.8 Feedback
-
-As of HockeySDK 4.1.1, Feedback is no longer part of the default SDK. To use feedback in your app, integrate the SDK with all features as follows:
-
-#### 3.8.1 Integrate the full-featured SDK.
-
-If you're integrating the binary yourself, use the `HockeySDK.embeddedframework` in the subfolder `HockeySDKAllFeatures`. If you're using CocoaPods, use
-
-```ruby
-pod "HockeySDK", :subspecs => ['AllFeaturesLib']
-```
-
-in your podfile.
-
-`BITFeedbackManager` lets your users communicate directly with you via the app and an integrated user interface. It provides a single threaded discussion with a user running your app. This feature is only enabled if you integrate the actual view controllers into your app.
- 
-You should never create your own instance of `BITFeedbackManager` but use the one provided by the `[BITHockeyManager sharedHockeyManager]`:
-
-**Objective-C**
-
-```objc
-[BITHockeyManager sharedHockeyManager].feedbackManager
-```
-
-**Swift**
-
-```swift
-BITHockeyManager.shared().feedbackManager
-```
-
-Please check the [documentation](#documentation) of the `BITFeedbackManager` and `BITFeedbackManagerDelegate` classes on more information on how to leverage this feature.
-
-#### 3.8.2 Add the NSPhotoLibraryUsageDescription to your Info.plist.
-
-As of iOS 10, developers have to add UsageDescription-strings before using system frameworks with privacy features (read more on this in [Apple's own documentation](https://developer.apple.com/library/prerelease/content/releasenotes/General/WhatsNewIniOS/Articles/iOS10.html#//apple_ref/doc/uid/TP40017084-SW3)). To make allow users to attach photos to feedback, add the `NSPhotoLibraryUsageDescription` to your `Info.plist` and provide a description. Make sure to localize your description as described in [Apple's documentation about localizing Info.plist strings](https://developer.apple.com/library/ios/documentation/General/Reference/InfoPlistKeyReference/Articles/AboutInformationPropertyListFiles.html).
-
-If the value is missing from your `Info.plist`, the SDK will disable attaching photos to feedback and disable the creation of a new feedback item in case of a screenshot. 
-
-
-<a name="storeupdates"></a>
-### 3.9 Store Updates
-
-This is the HockeySDK module for handling app updates when having your app released in the App Store.
-
-When an update is detected, this module will show an alert asking the user if he/she wants to update or ignore this version. If the update was chosen, it will open the apps page in the app store app.
-
-By default this module is **NOT** enabled! To enable it use the following code:
-
-**Objective-C**
-
-```objc
-[[BITHockeyManager sharedHockeyManager] configureWithIdentifier:@"APP_IDENTIFIER"];
-
-[[BITHockeyManager sharedHockeyManager] setEnableStoreUpdateManager: YES];
-
-[[BITHockeyManager sharedHockeyManager] startManager];
-```
-
-**Swift**
-
-```swift
-BITHockeyManager.shared().configure(withIdentifier: "APP_IDENTIFIER")
-BITHockeyManager.shared().isStoreUpdateManagerEnabled = true
-BITHockeyManager.shared().start()
-```
-
-When this module is enabled and **NOT** running in an App Store build/environment, it won't do any checks!
-
-Please check the [documentation](#documentation) of the `BITStoreUpdateManager` class on more information on how to leverage this feature and know about its limits.
-
-<a name="betaupdates"></a>
-### 3.10 In-App-Updates (Beta & Enterprise only)
-
-The following options only show some of the possibilities to interact and fine-tune the update feature when using Ad-Hoc or Enterprise provisioning profiles. For more please check the full documentation of the `BITUpdateManager` class in our [documentation](#documentation).
-
-The feature handles version updates, presents the update and version information in a App Store like user interface, collects usage information and provides additional authorization options when using Ad-Hoc provisioning profiles.
-
-This module automatically disables itself when running in an App Store build by default!
-
-This feature can be disabled manually as follows:
-
-**Objective-C**
-
-```objc
-[[BITHockeyManager sharedHockeyManager] configureWithIdentifier:@"APP_IDENTIFIER"];
-
-[[BITHockeyManager sharedHockeyManager] setDisableUpdateManager: YES]; //disable auto updating
-
-[[BITHockeyManager sharedHockeyManager] startManager];
-```
-
-**Swift**
-
-```swift
-BITHockeyManager.shared().configure(withIdentifier: "APP_IDENTIFIER")
-BITHockeyManager.shared().isUpdateManagerDisabled = true
-BITHockeyManager.shared().start()
-```
-
-Please note that the SDK expects your CFBundleVersion values to always increase and never reset to detect a new update.
-
-If you want to see beta analytics, use the beta distribution feature with in-app updates, restrict versions to specific users, or want to know who is actually testing your app, you need to follow the instructions on our guide [Authenticating Users on iOS](http://support.hockeyapp.net/kb/client-integration-ios-mac-os-x/authenticating-users-on-ios)
-
-<a id="debug"></a>
-### 3.11 Debug information
-
-To check if data is send properly to HockeyApp and also see some additional SDK debug log data in the console, add the following line before `startManager`:
-
-```objc
-[[BITHockeyManager sharedHockeyManager] configureWithIdentifier:@"APP_IDENTIFIER"];
-
-[BITHockeyManager sharedHockeyManager].logLevel = BITLogLevelDebug;
-
-[[BITHockeyManager sharedHockeyManager] startManager];
-```
-
-<a id="documentation"></a>
-## 4. Documentation
-
-Our documentation can be found on [HockeyApp](http://hockeyapp.net/help/sdk/ios/5.1.2/index.html).
-
-<a id="troubleshooting"></a>
-## 5.Troubleshooting
-
-### Linker warnings
-
-  Make sure that all mentioned frameworks and libraries are linked
-
-### iTunes Connect rejection
-
-  Make sure none of the following files are copied into your app bundle, check under app target, `Build Phases`, `Copy Bundle Resources` or in the `.app` bundle after building:
-
-  - `HockeySDK.framework` (except if you build a dynamic framework version of the SDK yourself!)
-  - `de.bitstadium.HockeySDK-iOS-5.1.2.docset`
-
-### Features are not working as expected
-
-  Enable debug output to the console to see additional information from the SDK initializing the modules,  sending and receiving network requests and more by adding the following code before calling `startManager`:
-
-  `[BITHockeyManager sharedHockeyManager].logLevel = BITLogLevelDebug;`
-
-### Wrong strings or "Missing HockeySDKResources.bundle" error
-
-1. Please check if the `HockeySDKResources.bundle` is added to your app bundle. Use Finder to inspect your `.app` bundle to see if the bundle is added.
-    
-2. If it is missing, please check if the resources bundle is mentioned in your app target's `Copy Bundle Resources` build step in the `Build Phases` tab. Add the resource bundle manually if necessary.  
-
-3. Make a clean build and try again.
-    
-![Screenshot_2015-12-22_01.07.27.png](https://support.hockeyapp.net/help/assets/0e9d2eb58de8355363b89bd491d6fcf4c14f596e/normal/Screenshot_2015-12-22_01.07.27.png)
-    
-<a id="contributing"></a>
-## 6. Contributing
-
-We're looking forward to your contributions via pull requests on our [GitHub repository](https://github.com/bitstadium/HockeySDK-iOS).
-
-<a id="developmentenvironment"></a>
-### 6.1 Development environment
-
-* A Mac running the latest version of macOS.
-* Get the latest Xcode from the Mac App Store.
-* [Jazzy](https://github.com/realm/jazzy) to generate documentation.
-* [CocoaPods](https://cocoapods.org/) to test integration with CocoaPods.
-* [Carthage](https://github.com/Carthage/Carthage) to test integration with Carthage.
-
-<a id="codeofconduct"></a>
-### 6.2 Code of Conduct
-
-This project has adopted the [Microsoft Open Source Code of Conduct](https://opensource.microsoft.com/codeofconduct/). For more information see the [Code of Conduct FAQ](https://opensource.microsoft.com/codeofconduct/faq/) or contact [opencode@microsoft.com](mailto:opencode@microsoft.com) with any additional questions or comments.
-
-<a id="contributorlicense"></a>
-### 6.3 Contributor License
-
-You must sign a [Contributor License Agreement](https://cla.microsoft.com/) before submitting your pull request. To complete the Contributor License Agreement (CLA), you will need to submit a request via the [form](https://cla.microsoft.com/) and then electronically sign the CLA when you receive the email containing the link to the document. You need to sign the CLA only once to cover submission to any Microsoft OSS project. 
-
-<a id="contact"></a>
-## 7. Contact
-
-If you have further questions or are running into trouble that cannot be resolved by any of the steps here, feel free to open [a GitHub issue](https://github.com/bitstadium/HockeySDK-iOS/issues), contact us at [support@hockeyapp.net](mailto:support@hockeyapp.net) or join our [Slack](https://slack.hockeyapp.net).
diff --git a/submodules/HockeySDK-iOS/Documentation/Guides/Migration Kits.md b/submodules/HockeySDK-iOS/Documentation/Guides/Migration Kits.md
deleted file mode 100644
index d8e474e936..0000000000
--- a/submodules/HockeySDK-iOS/Documentation/Guides/Migration Kits.md	
+++ /dev/null
@@ -1,189 +0,0 @@
-## Introduction
-
-This guide will help you migrate from QuincyKit, HockeyKit or an older version of HockeySDK-iOS to the latest release of the unified HockeySDK for iOS.
-
-First of all we will cleanup the obsolete installation files and then convert your existing code to the new API calls.
-
-## Cleanup
-
-First of all you should remove all files from prior versions of either QuincyKit, HockeyKit or HockeySDK-iOS. If you not sure which files you added, here are a few easy steps for each SDK.
-
-### QuincyKit
-
-In Xcode open the `Project Navigator` (⌘+1). In the search field at the bottom enter "Quincy". QuincyKit is installed, if search finds the following files:
-
-* BWQuincyManager.h
-* BWQuincyManager.m
-* Quincy.bundle
-
-Delete them all ("Move to Trash"). Or if you have them grouped into a folder (for example Vendor/QuincyKit) delete the folder.
-
-### HockeyKit
-
-In Xcode open the `Project Navigator` (⌘+1). In the search field at the bottom enter "Hockey". HockeyKit is installed, if search finds for example:
-
-* BWHockeyManager.h
-* Hockey.bundle
-
-All of them should be in one folder/group in Xcode. Remove that folder.
-
-### HockeySDK-iOS before v2.5
-
-In Xcode open the `Project Navigator` (⌘+1). In the search field at the bottom enter "CNSHockeyManager". If search returns any results you have the first release of our unified SDK added to your project. Even if you added it as a git submodule we would suggest you remove it first. 
-
-### HockeySDK-iOS v2.5.x
-
-In Xcode open the `Project Navigator` (⌘+1). In the search field at the bottom enter `HockeySDK.framework`. If search returns any results you have the first release of our unified SDK added to your project. Even if you added it as a git submodule we would suggest you remove it first. Repeat the same for `CrashReporter.framework` and `HockeySDKResources.bundle`.
-
-### HockeySDK-iOS v3.0.x
-
-In Xcode open the `Project Navigator` (⌘+1). In the search field at the bottom enter `HockeySDK.embeddedFramework`. If search returns any results you have the first release of our unified SDK added to your project. Even if you added it as a git submodule we would suggest you remove it first.
-
-### Final Steps
-
-Search again in the `Project Navigator` (⌘+1) for "CrashReporter.framework". You shouldn't get any results now. If not, remove the CrashReporter.framework from your project.
-
-## Installation
-
-Follow the steps in our installation guide for either [Installation with binary framework distribution](http://support.hockeyapp.net/kb/client-integration/hockeyapp-for-ios-hockeysdk#framework) (Recommended) or [Installation as a subproject](http://support.hockeyapp.net/kb/client-integration/hockeyapp-for-ios-hockeysdk#subproject)
-
-After you finished the steps for either of the installation procedures, we have to migrate your existing code.
-
-## Setup
-
-### QuincyKit / HockeyKit
-
-In your application delegate (for example `AppDelegate.m`) search for the following lines:
-
-	```objc
-    [[BWQuincyManager sharedQuincyManager] setAppIdentifier:@"0123456789abcdef"];
-    
-    [[BWHockeyManager sharedHockeyManager] setAppIdentifier:@"0123456789abcdef"];
-    [[BWHockeyManager sharedHockeyManager] setUpdateURL:@"https://rink.hockeyapp.net/"];
-	```
-
-If you use (as recommended) different identifiers for beta and store distribution some lines may be wrapped with compiler macros like this:
-
-	```objc
-    #if defined (CONFIGURATION_Beta)
-      [[BWQuincyManager sharedQuincyManager] setAppIdentifier:@"BETA_IDENTIFIER"];
-    #endif
-
-    #if defined (CONFIGURATION_Distribution)
-      [[BWQuincyManager sharedQuincyManager] setAppIdentifier:@"LIVE_IDENTIFIER"];
-    #endif
-	```
-
-For now comment out all lines with either `[BWQuincyManager sharedQuincyManager]` or `[BWHockeyManager sharedHockeyManager]`. 
-
-Open the header file of your application delegate (for example `AppDelegate.m`) or just press ^ + ⌘ + ↑ there should be a line like this (AppDelegate should match the name of the file)
-
-	```objc
-    @interface AppDelegate : NSObject <UIApplicationDelegate, UITabBarControllerDelegate, BWHockeyManagerDelegate> {  
-	```
-
-Remove the `BWHockeyManagerDelegate`. Also look for the following line: 
-  
-	```objc
-    #import "BWHockeyManager.h"
-	```
-
-And remove it too. (This line may have a #if macro around it, remove that too)
-
-Now follow the steps described in our [setup guide](http://support.hockeyapp.net/kb/client-integration/hockeyapp-for-ios-hockeysdk#setup) The values for `LIVE_IDENTIFIER` and `BETA_IDENTIFIER` are used in the setup guide.
-
-After you have finished the setup guide make sure everything works as expected and then delete the out commented lines from above.
-
-### HockeySDK-iOS before 2.5
-
-In your application delegate (for example `AppDelegate.m`) search for the following lines:
-
-	```objc
-    [[CNSHockeyManager sharedHockeyManager] configureWithBetaIdentifier:BETA_IDENTIFIER 
-                                                       liveIdentifier:LIVE_IDENTIFIER
-                                                             delegate:self];
-	```
-
-For now comment out all lines with `[CNSHockeyManager sharedHockeyManager]`. Open the header file of your application delegate by pressing ^ + ⌘ + ↑. There should be a line like this: 
-
-	```objc
-    @interface AppDelegate : NSObject <UIApplicationDelegate, CNSHockeyManagerDelegate> {
-	```
-
-Remove `CNSHockeyManagerDelegate`, also look for this line:
-
-	```objc
-    #import "CNSHockeyManager.h"
-	```
-
-And remove that too. 
-
-Now follow the steps described in our [setup guide](http://support.hockeyapp.net/kb/client-integration/hockeyapp-for-ios-hockeysdk#setup) The values for `LIVE_IDENTIFIER` and `BETA_IDENTIFIER` are used in the setup guide.
-
-After you have finished the setup guide make sure everything works as expected and then delete the out commented lines from above.
-
-### HockeySDK-iOS 2.5.x
-
-There are no changes to the SDK setup code required. Some delegates methods are deprecated and should be replaced as soon as feasible.
-
-The following delegates in `BITCrashManagerDelegate` moved to `BITHockeyManagerDelegate`:
-
-- `- (NSString *)userNameForCrashManager:(BITCrashManager *)crashManager;` is now `- (NSString *)userNameForHockeyManager:(BITHockeyManager *)hockeyManager componentManager:(BITHockeyBaseManager *)componentManager;`
-- `- (NSString *)userEmailForCrashManager:(BITCrashManager *)crashManager;` is now `- (NSString *)userEmailForHockeyManager:(BITHockeyManager *)hockeyManager componentManager:(BITHockeyBaseManager *)componentManager;`
-
-### HockeySDK-iOS 3.0.x
-
-Instead of implementing the individual protocols in your app delegate, you can now simply add `BITHockeyManagerDelegate` alone, e.g.:
-
-	```objc
-    @interface BITAppDelegate () <BITHockeyManagerDelegate> {}
-
-    @end
-	```
-
-The delegate `-(NSString *)customDeviceIdentifierForUpdateManager:(BITUpdateManager *)updateManager` has been removed. To identify the installation please use the new `BITAuthenticator` class.
-
-### HockeySDK-iOS 3.5.x
-
-If you are using `PLCrashReporterCallbacks`, you now have to use `BITCrashManagerCallbacks` instead. This `struct` doesn't contain `version` any longer, so you have to remove that. Otherwise everything is the same.
-
-If you did set the delegate per component, e.g. `[[BITHockeyManager sharedHockeyManager].crashManager setDelegate:self]`, you need to remove these and set the delegate this way only: `[[BITHockeyManager sharedHockeyManager] setDelegate:self]`. This will propagate the delegate to all SDK components. Make sure to set it before calling `startManager`!
-
-In addition you need to make sure all of these frameworks are linked:
-
-- `AssetsLibrary`
-- `CoreText`
-- `CoreGraphics`
-- `Foundation`
-- `MobileCoreServices`
-- `QuartzCore`
-- `QuickLook`
-- `Security`
-- `SystemConfiguration`
-- `UIKit`
-
-### HockeySDK-iOS 3.7.x
-
-You need to make sure all of these frameworks are linked:
-
-- `AssetsLibrary`
-- `CoreText`
-- `CoreGraphics`
-- `Foundation`
-- `MobileCoreServices`
-- `QuartzCore`
-- `QuickLook`
-- `Security`
-- `SystemConfiguration`
-- `UIKit`
-- `libc++`
-
-## Troubleshooting
-
-### ld: warning: directory not found for option '....QuincyKit.....'
-
-This warning means there is still a `Framework Search Path` pointing to the folder of the old SDK. Open the `Project Navigator` (⌘+1) and go to the tab `Build Settings`. In the search field enter the name of the folder mentioned in the warning (for example "QuincyKit") . If the search finds something in `Framework Search Paths` you should double click that entry and remove the line which points to the old folder.
-
-## Advanced Migration
-
-If you used any optional API calls, for example adding a custom description to a crash report, migrating those would exceed the scope of this guide. Please have a look at the [API documentation](http://hockeyapp.net/releases/). 
diff --git a/submodules/HockeySDK-iOS/Documentation/Guides/Set Custom AlertViewHandler.md b/submodules/HockeySDK-iOS/Documentation/Guides/Set Custom AlertViewHandler.md
deleted file mode 100644
index b11ea780ea..0000000000
--- a/submodules/HockeySDK-iOS/Documentation/Guides/Set Custom AlertViewHandler.md	
+++ /dev/null
@@ -1,133 +0,0 @@
-## Introduction
-
-HockeySDK lets the user decide wether to send a crash report or lets the developer send crash reports automatically without user interaction. In addition it is possible to attach more data like logs, a binary, or the users name, email or a user ID if this is already known.
-
-Starting with HockeySDK version 3.6 it is possible to customize this even further and implement your own flow to e.g. ask the user for more details about what happened or his name and email address if your app doesn't know that yet.
-
-The following example shows how this could be implemented. We'll present a custom UIAlertView asking the user for more details and attaching that to the crash report.
-
-## HowTo
-
-1. Setup the SDK
-2. Configure HockeySDK to use your custom alertview handler using the `[[BITHockeyManager sharedHockeyManager].crashManager setAlertViewHandler:(BITCustomAlertViewHandler)alertViewHandler;` method in your AppDelegate.
-3. Implement your handler in a way that it calls `[[BITHockeyManager sharedHockeyManager].crashManagerhandleUserInput:(BITCrashManagerUserInput)userInput withUserProvidedMetaData:(BITCrashMetaData *)userProvidedMetaData]` with the input provided by the user.
-4. Dismiss your custom view.
-
-## Example
-
-**Objective-C**
-
-```objc
-@interface BITAppDelegate () <UIAlertViewDelegate>
-@end
-
-
-@implementation BITAppDelegate
-
-- (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions {
-	[self.window makeKeyAndVisible];
-
-	[[BITHockeyManager sharedHockeyManager] configureWithIdentifier:@"<>"
-															delegate:nil];
-	
-	// optionally enable logging to get more information about states.
-	[BITHockeyManager sharedHockeyManager].debugLogEnabled = YES;
-
-	[[BITHockeyManager sharedHockeyManager].crashManager setAlertViewHandler:^(){
-	NSString *exceptionReason = [[BITHockeyManager sharedHockeyManager].crashManager lastSessionCrashDetails].exceptionReason;
-	UIAlertView *customAlertView = [[UIAlertView alloc] initWithTitle: @"Oh no! The App crashed"
-																message: nil
-																delegate: self
-													cancelButtonTitle: @"Don't send"
-													otherButtonTitles: @"Send", @"Always send", nil];
-	if (exceptionReason) {
-		customAlertView.message = @"We would like to send a crash report to the developers. Please enter a short description of what happened:";
-		customAlertView.alertViewStyle = UIAlertViewStylePlainTextInput;
-	} else {
-		customAlertView.message = @"We would like to send a crash report to the developers";
-	}
-	
-	[customAlertView show];
-	}];
-
-	[[BITHockeyManager sharedHockeyManager].authenticator authenticateInstallation];
-
-	return YES;
-}
-
-- (void)alertView:(UIAlertView *)alertView didDismissWithButtonIndex:(NSInteger)buttonIndex {
-	BITCrashMetaData *crashMetaData = [BITCrashMetaData new];
-	if (alertView.alertViewStyle != UIAlertViewStyleDefault) {
-		crashMetaData.userDescription = [alertView textFieldAtIndex:0].text;
-	}
-	switch (buttonIndex) {
-		case 0:
-			[[BITHockeyManager sharedHockeyManager].crashManager handleUserInput:BITCrashManagerUserInputDontSend withUserProvidedMetaData:nil];
-			break;
-		case 1:
-			[[BITHockeyManager sharedHockeyManager].crashManager handleUserInput:BITCrashManagerUserInputSend withUserProvidedMetaData:crashMetaData];
-			break;
-		case 2:
-			[[BITHockeyManager sharedHockeyManager].crashManager handleUserInput:BITCrashManagerUserInputAlwaysSend withUserProvidedMetaData:crashMetaData];
-			break;
-	}
-}
-
-@end
-```
-
-**Swift**
-
-```swift
-import UIKit
-import HockeySDK
-
-@UIApplicationMain
-class AppDelegate: UIResponder, UIApplicationDelegate, UIAlertViewDelegate {
-
-  var window: UIWindow?
-
-  func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey: Any]?) -> Bool {
-    window?.makeKeyAndVisible()
-
-    BITHockeyManager.shared().configure(withIdentifier: "APP_IDENTIFIER")
-    // optionally enable logging to get more information about states.
-    BITHockeyManager.shared().logLevel = BITLogLevel.verbose
-
-    BITHockeyManager.shared().crashManager.setAlertViewHandler {
-      let exceptionReason = BITHockeyManager.shared().crashManager.lastSessionCrashDetails.exceptionReason
-      let customAlertView = UIAlertView.init(title: "Oh no! The App crashed",
-                                       message: "The App crashed",
-                                       delegate: self,
-                                       cancelButtonTitle: "Don't send",
-                                       otherButtonTitles: "Send", "Always send")
-      if (exceptionReason != nil) {
-        customAlertView.message = "We would like to send a crash report to the developers. Please enter a short description of what happened:"
-        customAlertView.alertViewStyle = UIAlertViewStyle.plainTextInput;
-      } else {
-        customAlertView.message = "We would like to send a crash report to the developers"
-      }
-      customAlertView.show()
-    }
-
-    return true
-  }
-
-  func alertView(_ alertView: UIAlertView, didDismissWithButtonIndex buttonIndex: Int) {
-    let crashMetaData = BITCrashMetaData();
-    if (alertView.alertViewStyle != UIAlertViewStyle.default) {
-      crashMetaData.userProvidedDescription = alertView.textField(at: 0)?.text
-    }
-    switch (buttonIndex) {
-    case 0:
-      BITHockeyManager.shared().crashManager.handle(BITCrashManagerUserInput.dontSend, withUserProvidedMetaData: nil)
-    case 1:
-      BITHockeyManager.shared().crashManager.handle(BITCrashManagerUserInput.send, withUserProvidedMetaData: crashMetaData)
-    case 2:
-      BITHockeyManager.shared().crashManager.handle(BITCrashManagerUserInput.alwaysSend, withUserProvidedMetaData: crashMetaData)
-    }
-  }
-}
-```
-
-
diff --git a/submodules/HockeySDK-iOS/Documentation/Guides/Upload Symbols.md b/submodules/HockeySDK-iOS/Documentation/Guides/Upload Symbols.md
deleted file mode 100644
index 8b474a0710..0000000000
--- a/submodules/HockeySDK-iOS/Documentation/Guides/Upload Symbols.md	
+++ /dev/null
@@ -1,25 +0,0 @@
-## Introduction
-
-Mac and iOS crash reports show the stack traces for all running threads of your app of the time a crash occurred. But the stack traces only contain memory addresses and don't show class names, methods, file names and line numbers that are needed to understand them.
-
-To get these memory addresses translated you need to upload a dSYM package to the server, which contains all information required to make this happen. The symbolication process will then check the binary images section of the crash report and grab the UUID of the binary that caused the crash. Next it will get the UUID of the dSYM package to make sure they are identical and process the data if so.
-
-**WARNING:** Every time you are doing a build, the app binary and the dSYM will get a new unique UUID, no matter if you changed the code or not. So make sure to archive all your binaries and dSYMs that you are using for beta or app store builds!
-This will also apply when using Bitcode. Then, Apple will use your uploaded build and re-compile it on their end. Whenever this happens, this also changes the UUID and requires you to download the newly generated dSYM from Apple and upload it to HockeyApp.
-
-## HowTo
-
-Once you have your app ready for beta testing or even to submit it to the App Store, you need to upload the `.dSYM` bundle to HockeyApp to enable symbolication. If you have built your app with Xcode, menu `Product` > `Archive`, you can find the `.dSYM` as follows:
-
-1. Chose `Window` > `Organizer` in Xcode.
-2. Select the tab Archives.
-3. Select your app in the left sidebar.
-4. Right-click on the latest archive and select `Show in Finder`.
-5. Right-click the `.xcarchive` in Finder and select `Show Package Contents`.
-6. You should see a folder named dSYMs which contains your dSYM bundle. If you use Safari, just drag this file from Finder and drop it on to the corresponding drop zone in HockeyApp. If you use another browser, copy the file to a different location, then right-click it and choose Compress `YourApp.dSYM`. The file will be compressed as a .zip file. Drag & drop this file to HockeyApp. 
-
-## Mac Desktop Uploader
-
-As an alternative, you can use our [HockeyApp for Mac](http://hockeyapp.net/releases/mac/) app to upload the complete archive in one step.
-
-Also check out the guide on [how to upload to HockeyApp from Mac OS X](http://support.hockeyapp.net/kb/client-integration-ios-mac-os-x/how-to-upload-to-hockeyapp-from-mac-os-x).
\ No newline at end of file
diff --git a/submodules/HockeySDK-iOS/Documentation/HockeySDK/.jazzy.yaml b/submodules/HockeySDK-iOS/Documentation/HockeySDK/.jazzy.yaml
deleted file mode 100644
index 5e5c34f9c8..0000000000
--- a/submodules/HockeySDK-iOS/Documentation/HockeySDK/.jazzy.yaml
+++ /dev/null
@@ -1,39 +0,0 @@
-objc: true
-clean: true
-sdk: iphonesimulator
-
-theme: ../Themes/apple
-
-module: HockeySDK
-module_version: 5.1.2
-author: Microsoft Corp
-author_url: https://www.microsoft.com
-
-readme: ../../README.md
-documentation: ../Guides/*.md
-custom_categories:
-  - name: Guides
-    children:
-    - Installation & Setup
-    - Migration Kits
-  - name: How To
-    children:
-    - App Versioning
-    - Set Custom AlertViewHandler
-    - Upload Symbols
-  - name: Troubleshooting
-    children:
-    - Crash Reporting Not Working
-  - name: Release Notes
-    children:
-    - Changelog
-
-umbrella_header: ../../Classes/HockeySDK.h
-
-root_url: https://support.hockeyapp.net/kb/api
-github_url: https://github.com/bitstadium/HockeySDK-iOS/
-github_file_prefix: "https://github.com/bitstadium/HockeySDK-iOS/"
-
-skip_undocumented: true
-
-output: Generated/
diff --git a/submodules/HockeySDK-iOS/Documentation/Themes/apple/assets/css/highlight.css.scss b/submodules/HockeySDK-iOS/Documentation/Themes/apple/assets/css/highlight.css.scss
deleted file mode 100755
index 7bc1f2911f..0000000000
--- a/submodules/HockeySDK-iOS/Documentation/Themes/apple/assets/css/highlight.css.scss
+++ /dev/null
@@ -1,63 +0,0 @@
-/* Credit to https://gist.github.com/wataru420/2048287 */
-
-.highlight {
-  .c { color: #999988; font-style: italic } /* Comment */
-  .err { color: #a61717; background-color: #e3d2d2 } /* Error */
-  .k { color: #000000; font-weight: bold } /* Keyword */
-  .o { color: #000000; font-weight: bold } /* Operator */
-  .cm { color: #999988; font-style: italic } /* Comment.Multiline */
-  .cp { color: #999999; font-weight: bold } /* Comment.Preproc */
-  .c1 { color: #999988; font-style: italic } /* Comment.Single */
-  .cs { color: #999999; font-weight: bold; font-style: italic } /* Comment.Special */
-  .gd { color: #000000; background-color: #ffdddd } /* Generic.Deleted */
-  .gd .x { color: #000000; background-color: #ffaaaa } /* Generic.Deleted.Specific */
-  .ge { color: #000000; font-style: italic } /* Generic.Emph */
-  .gr { color: #aa0000 } /* Generic.Error */
-  .gh { color: #999999 } /* Generic.Heading */
-  .gi { color: #000000; background-color: #ddffdd } /* Generic.Inserted */
-  .gi .x { color: #000000; background-color: #aaffaa } /* Generic.Inserted.Specific */
-  .go { color: #888888 } /* Generic.Output */
-  .gp { color: #555555 } /* Generic.Prompt */
-  .gs { font-weight: bold } /* Generic.Strong */
-  .gu { color: #aaaaaa } /* Generic.Subheading */
-  .gt { color: #aa0000 } /* Generic.Traceback */
-  .kc { color: #000000; font-weight: bold } /* Keyword.Constant */
-  .kd { color: #000000; font-weight: bold } /* Keyword.Declaration */
-  .kp { color: #000000; font-weight: bold } /* Keyword.Pseudo */
-  .kr { color: #000000; font-weight: bold } /* Keyword.Reserved */
-  .kt { color: #445588; } /* Keyword.Type */
-  .m { color: #009999 } /* Literal.Number */
-  .s { color: #d14 } /* Literal.String */
-  .na { color: #008080 } /* Name.Attribute */
-  .nb { color: #0086B3 } /* Name.Builtin */
-  .nc { color: #445588; font-weight: bold } /* Name.Class */
-  .no { color: #008080 } /* Name.Constant */
-  .ni { color: #800080 } /* Name.Entity */
-  .ne { color: #990000; font-weight: bold } /* Name.Exception */
-  .nf { color: #990000; } /* Name.Function */
-  .nn { color: #555555 } /* Name.Namespace */
-  .nt { color: #000080 } /* Name.Tag */
-  .nv { color: #008080 } /* Name.Variable */
-  .ow { color: #000000; font-weight: bold } /* Operator.Word */
-  .w { color: #bbbbbb } /* Text.Whitespace */
-  .mf { color: #009999 } /* Literal.Number.Float */
-  .mh { color: #009999 } /* Literal.Number.Hex */
-  .mi { color: #009999 } /* Literal.Number.Integer */
-  .mo { color: #009999 } /* Literal.Number.Oct */
-  .sb { color: #d14 } /* Literal.String.Backtick */
-  .sc { color: #d14 } /* Literal.String.Char */
-  .sd { color: #d14 } /* Literal.String.Doc */
-  .s2 { color: #d14 } /* Literal.String.Double */
-  .se { color: #d14 } /* Literal.String.Escape */
-  .sh { color: #d14 } /* Literal.String.Heredoc */
-  .si { color: #d14 } /* Literal.String.Interpol */
-  .sx { color: #d14 } /* Literal.String.Other */
-  .sr { color: #009926 } /* Literal.String.Regex */
-  .s1 { color: #d14 } /* Literal.String.Single */
-  .ss { color: #990073 } /* Literal.String.Symbol */
-  .bp { color: #999999 } /* Name.Builtin.Pseudo */
-  .vc { color: #008080 } /* Name.Variable.Class */
-  .vg { color: #008080 } /* Name.Variable.Global */
-  .vi { color: #008080 } /* Name.Variable.Instance */
-  .il { color: #009999 } /* Literal.Number.Integer.Long */
-}
diff --git a/submodules/HockeySDK-iOS/Documentation/Themes/apple/assets/css/jazzy.css.scss b/submodules/HockeySDK-iOS/Documentation/Themes/apple/assets/css/jazzy.css.scss
deleted file mode 100755
index 2cc89840ea..0000000000
--- a/submodules/HockeySDK-iOS/Documentation/Themes/apple/assets/css/jazzy.css.scss
+++ /dev/null
@@ -1,480 +0,0 @@
-////////////////////////////////
-// Constants
-////////////////////////////////
-
-$bg_color: #414141;
-$doc_coverage_color: #999;
-$code_color: #777;
-$code_bg_color: #eee;
-$link_color: #0088cc;
-$white_color: #fff;
-$light_gray_bg_color: #f2f2f2;
-$declaration_bg_color: #f9f9f9;
-$sidebar_bg_color: #f9f9f9;
-$declaration_title_language_color: #4b8afb;
-
-$sidebar_width: 230px;
-$content_wrapper_width: 980px;
-$content_top_offset: 70px;
-$content_body_margin: 16px;
-$content_body_left_offset: $sidebar_width + $content_body_margin;
-$header_height: 26px;
-$breadcrumb_padding_top: 17px;
-
-$code_font: 0.95em Menlo, monospace;
-
-$gray_border: 1px solid #e2e2e2;
-$declaration_language_border: 5px solid #cde9f4;
-
-$aside_color: #aaa;
-$aside_border: 5px solid lighten($aside_color, 20%);
-$aside_warning_color: #ff0000;
-$aside_warning_border: 5px solid lighten($aside_warning_color, 20%);
-
-////////////////////////////////
-// Reset
-////////////////////////////////
-
-html, body, div, span, h1, h3, h4, p, a, code, em, img, ul, li, table, tbody, tr, td {
-  background: transparent;
-  border: 0;
-  margin: 0;
-  outline: 0;
-  padding: 0;
-  vertical-align: baseline;
-}
-
-////////////////////////////////
-// Global
-////////////////////////////////
-
-body {
-  background-color: $light_gray_bg_color;
-  font-family: Helvetica, freesans, Arial, sans-serif;
-  font-size: 14px;
-  -webkit-font-smoothing: subpixel-antialiased;
-  word-wrap: break-word;
-}
-
-// Headers
-
-h1, h2, h3 {
-  margin-top: 0.8em;
-  margin-bottom: 0.3em;
-  font-weight: 100;
-  color: black;
-}
-h1 {
-  font-size: 2.5em;
-}
-h2 {
-  font-size: 2em;
-  border-bottom: $gray_border;
-}
-h4 {
-  font-size: 13px;
-  line-height: 1.5;
-  margin-top: 21px;
-}
-h5 {
-  font-size: 1.1em;
-}
-h6 {
-  font-size: 1.1em;
-  color: $code_color;
-}
-.section-name {
-  color: rgba(128,128,128,1);
-  display: block;
-  font-family: Helvetica;
-  font-size: 22px;
-  font-weight: 100;
-  margin-bottom: 15px;
-}
-
-// Code
-
-pre, code {
-  font: $code_font;
-  color: $code_color;
-  word-wrap: normal;
-}
-p code, li code {
-  background-color: $code_bg_color;
-  padding: 2px 4px;
-  border-radius: 4px;
-}
-
-// Links
-
-a {
-  color: $link_color;
-  text-decoration: none;
-}
-
-// Lists
-
-ul {
-  padding-left: 15px;
-}
-li {
-  line-height: 1.8em;
-}
-
-// Images
-
-img {
-  max-width: 100%;
-}
-
-// Blockquotes
-
-blockquote {
-  margin-left: 0;
-  padding: 0 10px;
-  border-left: 4px solid #ccc;
-}
-
-// General Content Wrapper
-
-.content-wrapper {
-  margin: 0 auto;
-  width: $content_wrapper_width;
-}
-
-////////////////////////////////
-// Header & Top Breadcrumbs
-////////////////////////////////
-
-header {
-  font-size: 0.85em;
-  line-height: $header_height;
-  background-color: $bg_color;
-  position: fixed;
-  width: 100%;
-  z-index: 1;
-  img {
-    padding-right: 6px;
-    vertical-align: -4px;
-    height: 16px;
-  }
-  a {
-    color: $white_color;
-  }
-  p {
-    float: left;
-    color: $doc_coverage_color;
-  }
-  .header-right {
-    float: right;
-    margin-left: 16px;
-  }
-}
-
-#breadcrumbs {
-  background-color: $light_gray_bg_color;
-  height: $content_top_offset - $header_height - $breadcrumb_padding_top;
-  padding-top: $breadcrumb_padding_top;
-  position: fixed;
-  width: 100%;
-  z-index: 1;
-  margin-top: $header_height;
-  #carat {
-    height: 10px;
-    margin: 0 5px;
-  }
-}
-
-////////////////////////////////
-// Side Navigation
-////////////////////////////////
-
-.sidebar {
-  background-color: $sidebar_bg_color;
-  border: $gray_border;
-  overflow-y: auto;
-  overflow-x: hidden;
-  position: fixed;
-  top: $content_top_offset;
-  bottom: 0;
-  width: $sidebar_width;
-  word-wrap: normal;
-}
-
-.nav-groups {
-  list-style-type: none;
-  background: $white_color;
-  padding-left: 0;
-}
-
-.nav-group-name {
-  border-bottom: $gray_border;
-  font-size: 1.1em;
-  font-weight: 100;
-  padding: 15px 0 15px 20px;
-  > a {
-    color: #333;
-  }
-}
-
-.nav-group-tasks {
-  margin-top: 5px;
-}
-
-.nav-group-task {
-  font-size: 0.9em;
-  list-style-type: none;
-  white-space: nowrap;
-  a {
-    color: #888;
-  }
-}
-
-////////////////////////////////
-// Main Content
-////////////////////////////////
-
-.main-content {
-  background-color: $white_color;
-  border: $gray_border;
-  margin-left: $content_body_left_offset;
-  position: absolute;
-  overflow: hidden;
-  padding-bottom: 60px;
-  top: $content_top_offset;
-  width: $content_wrapper_width - $content_body_left_offset;
-  p, a, code, em, ul, table, blockquote {
-    margin-bottom: 1em;
-  }
-  p {
-    line-height: 1.8em;
-  }
-  section {
-    .section:first-child {
-      margin-top: 0;
-      padding-top: 0;
-    }
-
-    .task-group-section .task-group:first-of-type {
-      padding-top: 10px;
-
-      .section-name {
-        padding-top: 15px;
-      }
-    }
-  }
-}
-
-.section {
-  padding: 0 25px;
-}
-
-.highlight {
-  background-color: $code_bg_color;
-  padding: 10px 12px;
-  border: $gray_border;
-  border-radius: 4px;
-  overflow-x: auto;
-}
-
-.declaration .highlight {
-  overflow-x: initial; // This allows the scrollbar to show up inside declarations
-  padding: 0 40px 40px 0;
-  margin-bottom: -25px;
-  background-color: transparent;
-  border: none;
-}
-
-.section-name {
-  margin: 0;
-  margin-left: 18px;
-}
-
-.task-group-section {
-  padding-left: 6px;
-  border-top: $gray_border;
-}
-
-.task-group {
-  padding-top: 0px;
-}
-
-.task-name-container {
-  a[name] {
-    &:before {
-      content: "";
-      display: block;
-      padding-top: $content_top_offset;
-      margin: -$content_top_offset 0 0;
-    }
-  }
-}
-
-.item {
-  padding-top: 8px;
-  width: 100%;
-  list-style-type: none;
-  a[name] {
-    &:before {
-      content: "";
-      display: block;
-      padding-top: $content_top_offset;
-      margin: -$content_top_offset 0 0;
-    }
-  }
-  code {
-    background-color: transparent;
-    padding: 0;
-  }
-  .token {
-    padding-left: 3px;
-    margin-left: 15px;
-    font-size: 11.9px;
-  }
-  .declaration-note {
-    font-size: .85em;
-    color: rgba(128,128,128,1);
-    font-style: italic;
-  }
-}
-
-.pointer-container {
-  border-bottom: $gray_border;
-  left: -23px;
-  padding-bottom: 13px;
-  position: relative;
-  width: 110%;
-}
-
-.pointer {
-  background: $declaration_bg_color;
-  border-left: $gray_border;
-  border-top: $gray_border;
-  height: 12px;
-  left: 21px;
-  top: -7px;
-  -webkit-transform: rotate(45deg);
-  -moz-transform: rotate(45deg);
-  -o-transform: rotate(45deg);
-  transform: rotate(45deg);
-  position: absolute;
-  width: 12px;
-}
-
-.height-container {
-  display: none;
-  left: -25px;
-  padding: 0 25px;
-  position: relative;
-  width: 100%;
-  overflow: hidden;
-  .section {
-    background: $declaration_bg_color;
-    border-bottom: $gray_border;
-    left: -25px;
-    position: relative;
-    width: 100%;
-    padding-top: 10px;
-    padding-bottom: 5px;
-  }
-}
-
-.aside, .language {
-  padding: 6px 12px;
-  margin: 12px 0;
-  border-left: $aside_border;
-  overflow-y: hidden;
-  .aside-title {
-    font-size: 9px;
-    letter-spacing: 2px;
-    text-transform: uppercase;
-    padding-bottom: 0;
-    margin: 0;
-    color: $aside_color;
-    -webkit-user-select: none;
-  }
-  p:last-child {
-    margin-bottom: 0;
-  }
-}
-
-.language {
-  border-left: $declaration_language_border;
-  .aside-title {
-    color: $declaration_title_language_color;
-  }
-}
-
-.aside-warning {
-  border-left: $aside_warning_border;
-  .aside-title {
-    color: $aside_warning_color;
-  }
-}
-
-.graybox {
-  border-collapse: collapse;
-  width: 100%;
-  p {
-    margin: 0;
-    word-break: break-word;
-    min-width: 50px;
-  }
-  td {
-    border: $gray_border;
-    padding: 5px 25px 5px 10px;
-    vertical-align: middle;
-  }
-  tr td:first-of-type {
-    text-align: right;
-    padding: 7px;
-    vertical-align: top;
-    word-break: normal;
-    width: 40px;
-  }
-}
-
-.slightly-smaller {
-  font-size: 0.9em;
-}
-
-#footer {
-  position: absolute;
-  bottom: 10px;
-  margin-left: 25px;
-  p {
-    margin: 0;
-    color: #aaa;
-    font-size: 0.8em;
-  }
-}
-
-////////////////////////////////
-// Dash
-////////////////////////////////
-
-html.dash {
-  header, #breadcrumbs, .sidebar {
-    display: none;
-  }
-  .main-content {
-    width: $content_wrapper_width;
-    margin-left: 0;
-    border: none;
-    width: 100%;
-    top: 0;
-    padding-bottom: 0;
-  }
-  .height-container {
-    display: block;
-  }
-  .item .token {
-    margin-left: 0;
-  }
-  .content-wrapper {
-    width: auto;
-  }
-  #footer {
-    position: static;
-  }
-}
diff --git a/submodules/HockeySDK-iOS/Documentation/Themes/apple/assets/img/carat.png b/submodules/HockeySDK-iOS/Documentation/Themes/apple/assets/img/carat.png
deleted file mode 100755
index 29d2f7fd49..0000000000
Binary files a/submodules/HockeySDK-iOS/Documentation/Themes/apple/assets/img/carat.png and /dev/null differ
diff --git a/submodules/HockeySDK-iOS/Documentation/Themes/apple/assets/img/dash.png b/submodules/HockeySDK-iOS/Documentation/Themes/apple/assets/img/dash.png
deleted file mode 100755
index 6f694c7a01..0000000000
Binary files a/submodules/HockeySDK-iOS/Documentation/Themes/apple/assets/img/dash.png and /dev/null differ
diff --git a/submodules/HockeySDK-iOS/Documentation/Themes/apple/assets/img/gh.png b/submodules/HockeySDK-iOS/Documentation/Themes/apple/assets/img/gh.png
deleted file mode 100755
index 628da97c70..0000000000
Binary files a/submodules/HockeySDK-iOS/Documentation/Themes/apple/assets/img/gh.png and /dev/null differ
diff --git a/submodules/HockeySDK-iOS/Documentation/Themes/apple/assets/js/jazzy.js b/submodules/HockeySDK-iOS/Documentation/Themes/apple/assets/js/jazzy.js
deleted file mode 100755
index 4ff9455b6b..0000000000
--- a/submodules/HockeySDK-iOS/Documentation/Themes/apple/assets/js/jazzy.js
+++ /dev/null
@@ -1,40 +0,0 @@
-window.jazzy = {'docset': false}
-if (typeof window.dash != 'undefined') {
-  document.documentElement.className += ' dash'
-  window.jazzy.docset = true
-}
-if (navigator.userAgent.match(/xcode/i)) {
-  document.documentElement.className += ' xcode'
-  window.jazzy.docset = true
-}
-
-// On doc load, toggle the URL hash discussion if present
-$(document).ready(function() {
-  if (!window.jazzy.docset) {
-    var linkToHash = $('a[href="' + window.location.hash +'"]');
-    linkToHash.trigger("click");
-  }
-});
-
-// On token click, toggle its discussion and animate token.marginLeft
-$(".token").click(function(event) {
-  if (window.jazzy.docset) {
-    return;
-  }
-  var link = $(this);
-  var animationDuration = 300;
-  var tokenOffset = "15px";
-  var original = link.css('marginLeft') == tokenOffset;
-  link.animate({'margin-left':original ? "0px" : tokenOffset}, animationDuration);
-  $content = link.parent().parent().next();
-  $content.slideToggle(animationDuration);
-
-  // Keeps the document from jumping to the hash.
-  var href = $(this).attr('href');
-  if (history.pushState) {
-    history.pushState({}, '', href);
-  } else {
-    location.hash = href;
-  }
-  event.preventDefault();
-});
diff --git a/submodules/HockeySDK-iOS/Documentation/Themes/apple/assets/js/jquery.min.js b/submodules/HockeySDK-iOS/Documentation/Themes/apple/assets/js/jquery.min.js
deleted file mode 100755
index ab28a24729..0000000000
--- a/submodules/HockeySDK-iOS/Documentation/Themes/apple/assets/js/jquery.min.js
+++ /dev/null
@@ -1,4 +0,0 @@
-/*! jQuery v1.11.1 | (c) 2005, 2014 jQuery Foundation, Inc. | jquery.org/license */
-!function(a,b){"object"==typeof module&&"object"==typeof module.exports?module.exports=a.document?b(a,!0):function(a){if(!a.document)throw new Error("jQuery requires a window with a document");return b(a)}:b(a)}("undefined"!=typeof window?window:this,function(a,b){var c=[],d=c.slice,e=c.concat,f=c.push,g=c.indexOf,h={},i=h.toString,j=h.hasOwnProperty,k={},l="1.11.1",m=function(a,b){return new m.fn.init(a,b)},n=/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g,o=/^-ms-/,p=/-([\da-z])/gi,q=function(a,b){return b.toUpperCase()};m.fn=m.prototype={jquery:l,constructor:m,selector:"",length:0,toArray:function(){return d.call(this)},get:function(a){return null!=a?0>a?this[a+this.length]:this[a]:d.call(this)},pushStack:function(a){var b=m.merge(this.constructor(),a);return b.prevObject=this,b.context=this.context,b},each:function(a,b){return m.each(this,a,b)},map:function(a){return this.pushStack(m.map(this,function(b,c){return a.call(b,c,b)}))},slice:function(){return this.pushStack(d.apply(this,arguments))},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},eq:function(a){var b=this.length,c=+a+(0>a?b:0);return this.pushStack(c>=0&&b>c?[this[c]]:[])},end:function(){return this.prevObject||this.constructor(null)},push:f,sort:c.sort,splice:c.splice},m.extend=m.fn.extend=function(){var a,b,c,d,e,f,g=arguments[0]||{},h=1,i=arguments.length,j=!1;for("boolean"==typeof g&&(j=g,g=arguments[h]||{},h++),"object"==typeof g||m.isFunction(g)||(g={}),h===i&&(g=this,h--);i>h;h++)if(null!=(e=arguments[h]))for(d in e)a=g[d],c=e[d],g!==c&&(j&&c&&(m.isPlainObject(c)||(b=m.isArray(c)))?(b?(b=!1,f=a&&m.isArray(a)?a:[]):f=a&&m.isPlainObject(a)?a:{},g[d]=m.extend(j,f,c)):void 0!==c&&(g[d]=c));return g},m.extend({expando:"jQuery"+(l+Math.random()).replace(/\D/g,""),isReady:!0,error:function(a){throw new Error(a)},noop:function(){},isFunction:function(a){return"function"===m.type(a)},isArray:Array.isArray||function(a){return"array"===m.type(a)},isWindow:function(a){return null!=a&&a==a.window},isNumeric:function(a){return!m.isArray(a)&&a-parseFloat(a)>=0},isEmptyObject:function(a){var b;for(b in a)return!1;return!0},isPlainObject:function(a){var b;if(!a||"object"!==m.type(a)||a.nodeType||m.isWindow(a))return!1;try{if(a.constructor&&!j.call(a,"constructor")&&!j.call(a.constructor.prototype,"isPrototypeOf"))return!1}catch(c){return!1}if(k.ownLast)for(b in a)return j.call(a,b);for(b in a);return void 0===b||j.call(a,b)},type:function(a){return null==a?a+"":"object"==typeof a||"function"==typeof a?h[i.call(a)]||"object":typeof a},globalEval:function(b){b&&m.trim(b)&&(a.execScript||function(b){a.eval.call(a,b)})(b)},camelCase:function(a){return a.replace(o,"ms-").replace(p,q)},nodeName:function(a,b){return a.nodeName&&a.nodeName.toLowerCase()===b.toLowerCase()},each:function(a,b,c){var d,e=0,f=a.length,g=r(a);if(c){if(g){for(;f>e;e++)if(d=b.apply(a[e],c),d===!1)break}else for(e in a)if(d=b.apply(a[e],c),d===!1)break}else if(g){for(;f>e;e++)if(d=b.call(a[e],e,a[e]),d===!1)break}else for(e in a)if(d=b.call(a[e],e,a[e]),d===!1)break;return a},trim:function(a){return null==a?"":(a+"").replace(n,"")},makeArray:function(a,b){var c=b||[];return null!=a&&(r(Object(a))?m.merge(c,"string"==typeof a?[a]:a):f.call(c,a)),c},inArray:function(a,b,c){var d;if(b){if(g)return g.call(b,a,c);for(d=b.length,c=c?0>c?Math.max(0,d+c):c:0;d>c;c++)if(c in b&&b[c]===a)return c}return-1},merge:function(a,b){var c=+b.length,d=0,e=a.length;while(c>d)a[e++]=b[d++];if(c!==c)while(void 0!==b[d])a[e++]=b[d++];return a.length=e,a},grep:function(a,b,c){for(var d,e=[],f=0,g=a.length,h=!c;g>f;f++)d=!b(a[f],f),d!==h&&e.push(a[f]);return e},map:function(a,b,c){var d,f=0,g=a.length,h=r(a),i=[];if(h)for(;g>f;f++)d=b(a[f],f,c),null!=d&&i.push(d);else for(f in a)d=b(a[f],f,c),null!=d&&i.push(d);return e.apply([],i)},guid:1,proxy:function(a,b){var c,e,f;return"string"==typeof b&&(f=a[b],b=a,a=f),m.isFunction(a)?(c=d.call(arguments,2),e=function(){return a.apply(b||this,c.concat(d.call(arguments)))},e.guid=a.guid=a.guid||m.guid++,e):void 0},now:function(){return+new Date},support:k}),m.each("Boolean Number String Function Array Date RegExp Object Error".split(" "),function(a,b){h["[object "+b+"]"]=b.toLowerCase()});function r(a){var b=a.length,c=m.type(a);return"function"===c||m.isWindow(a)?!1:1===a.nodeType&&b?!0:"array"===c||0===b||"number"==typeof b&&b>0&&b-1 in a}var s=function(a){var b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u="sizzle"+-new Date,v=a.document,w=0,x=0,y=gb(),z=gb(),A=gb(),B=function(a,b){return a===b&&(l=!0),0},C="undefined",D=1<<31,E={}.hasOwnProperty,F=[],G=F.pop,H=F.push,I=F.push,J=F.slice,K=F.indexOf||function(a){for(var b=0,c=this.length;c>b;b++)if(this[b]===a)return b;return-1},L="checked|selected|async|autofocus|autoplay|controls|defer|disabled|hidden|ismap|loop|multiple|open|readonly|required|scoped",M="[\\x20\\t\\r\\n\\f]",N="(?:\\\\.|[\\w-]|[^\\x00-\\xa0])+",O=N.replace("w","w#"),P="\\["+M+"*("+N+")(?:"+M+"*([*^$|!~]?=)"+M+"*(?:'((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\"|("+O+"))|)"+M+"*\\]",Q=":("+N+")(?:\\((('((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\")|((?:\\\\.|[^\\\\()[\\]]|"+P+")*)|.*)\\)|)",R=new RegExp("^"+M+"+|((?:^|[^\\\\])(?:\\\\.)*)"+M+"+$","g"),S=new RegExp("^"+M+"*,"+M+"*"),T=new RegExp("^"+M+"*([>+~]|"+M+")"+M+"*"),U=new RegExp("="+M+"*([^\\]'\"]*?)"+M+"*\\]","g"),V=new RegExp(Q),W=new RegExp("^"+O+"$"),X={ID:new RegExp("^#("+N+")"),CLASS:new RegExp("^\\.("+N+")"),TAG:new RegExp("^("+N.replace("w","w*")+")"),ATTR:new RegExp("^"+P),PSEUDO:new RegExp("^"+Q),CHILD:new RegExp("^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\("+M+"*(even|odd|(([+-]|)(\\d*)n|)"+M+"*(?:([+-]|)"+M+"*(\\d+)|))"+M+"*\\)|)","i"),bool:new RegExp("^(?:"+L+")$","i"),needsContext:new RegExp("^"+M+"*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\("+M+"*((?:-\\d)?\\d*)"+M+"*\\)|)(?=[^-]|$)","i")},Y=/^(?:input|select|textarea|button)$/i,Z=/^h\d$/i,$=/^[^{]+\{\s*\[native \w/,_=/^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,ab=/[+~]/,bb=/'|\\/g,cb=new RegExp("\\\\([\\da-f]{1,6}"+M+"?|("+M+")|.)","ig"),db=function(a,b,c){var d="0x"+b-65536;return d!==d||c?b:0>d?String.fromCharCode(d+65536):String.fromCharCode(d>>10|55296,1023&d|56320)};try{I.apply(F=J.call(v.childNodes),v.childNodes),F[v.childNodes.length].nodeType}catch(eb){I={apply:F.length?function(a,b){H.apply(a,J.call(b))}:function(a,b){var c=a.length,d=0;while(a[c++]=b[d++]);a.length=c-1}}}function fb(a,b,d,e){var f,h,j,k,l,o,r,s,w,x;if((b?b.ownerDocument||b:v)!==n&&m(b),b=b||n,d=d||[],!a||"string"!=typeof a)return d;if(1!==(k=b.nodeType)&&9!==k)return[];if(p&&!e){if(f=_.exec(a))if(j=f[1]){if(9===k){if(h=b.getElementById(j),!h||!h.parentNode)return d;if(h.id===j)return d.push(h),d}else if(b.ownerDocument&&(h=b.ownerDocument.getElementById(j))&&t(b,h)&&h.id===j)return d.push(h),d}else{if(f[2])return I.apply(d,b.getElementsByTagName(a)),d;if((j=f[3])&&c.getElementsByClassName&&b.getElementsByClassName)return I.apply(d,b.getElementsByClassName(j)),d}if(c.qsa&&(!q||!q.test(a))){if(s=r=u,w=b,x=9===k&&a,1===k&&"object"!==b.nodeName.toLowerCase()){o=g(a),(r=b.getAttribute("id"))?s=r.replace(bb,"\\$&"):b.setAttribute("id",s),s="[id='"+s+"'] ",l=o.length;while(l--)o[l]=s+qb(o[l]);w=ab.test(a)&&ob(b.parentNode)||b,x=o.join(",")}if(x)try{return I.apply(d,w.querySelectorAll(x)),d}catch(y){}finally{r||b.removeAttribute("id")}}}return i(a.replace(R,"$1"),b,d,e)}function gb(){var a=[];function b(c,e){return a.push(c+" ")>d.cacheLength&&delete b[a.shift()],b[c+" "]=e}return b}function hb(a){return a[u]=!0,a}function ib(a){var b=n.createElement("div");try{return!!a(b)}catch(c){return!1}finally{b.parentNode&&b.parentNode.removeChild(b),b=null}}function jb(a,b){var c=a.split("|"),e=a.length;while(e--)d.attrHandle[c[e]]=b}function kb(a,b){var c=b&&a,d=c&&1===a.nodeType&&1===b.nodeType&&(~b.sourceIndex||D)-(~a.sourceIndex||D);if(d)return d;if(c)while(c=c.nextSibling)if(c===b)return-1;return a?1:-1}function lb(a){return function(b){var c=b.nodeName.toLowerCase();return"input"===c&&b.type===a}}function mb(a){return function(b){var c=b.nodeName.toLowerCase();return("input"===c||"button"===c)&&b.type===a}}function nb(a){return hb(function(b){return b=+b,hb(function(c,d){var e,f=a([],c.length,b),g=f.length;while(g--)c[e=f[g]]&&(c[e]=!(d[e]=c[e]))})})}function ob(a){return a&&typeof a.getElementsByTagName!==C&&a}c=fb.support={},f=fb.isXML=function(a){var b=a&&(a.ownerDocument||a).documentElement;return b?"HTML"!==b.nodeName:!1},m=fb.setDocument=function(a){var b,e=a?a.ownerDocument||a:v,g=e.defaultView;return e!==n&&9===e.nodeType&&e.documentElement?(n=e,o=e.documentElement,p=!f(e),g&&g!==g.top&&(g.addEventListener?g.addEventListener("unload",function(){m()},!1):g.attachEvent&&g.attachEvent("onunload",function(){m()})),c.attributes=ib(function(a){return a.className="i",!a.getAttribute("className")}),c.getElementsByTagName=ib(function(a){return a.appendChild(e.createComment("")),!a.getElementsByTagName("*").length}),c.getElementsByClassName=$.test(e.getElementsByClassName)&&ib(function(a){return a.innerHTML="<div class='a'></div><div class='a i'></div>",a.firstChild.className="i",2===a.getElementsByClassName("i").length}),c.getById=ib(function(a){return o.appendChild(a).id=u,!e.getElementsByName||!e.getElementsByName(u).length}),c.getById?(d.find.ID=function(a,b){if(typeof b.getElementById!==C&&p){var c=b.getElementById(a);return c&&c.parentNode?[c]:[]}},d.filter.ID=function(a){var b=a.replace(cb,db);return function(a){return a.getAttribute("id")===b}}):(delete d.find.ID,d.filter.ID=function(a){var b=a.replace(cb,db);return function(a){var c=typeof a.getAttributeNode!==C&&a.getAttributeNode("id");return c&&c.value===b}}),d.find.TAG=c.getElementsByTagName?function(a,b){return typeof b.getElementsByTagName!==C?b.getElementsByTagName(a):void 0}:function(a,b){var c,d=[],e=0,f=b.getElementsByTagName(a);if("*"===a){while(c=f[e++])1===c.nodeType&&d.push(c);return d}return f},d.find.CLASS=c.getElementsByClassName&&function(a,b){return typeof b.getElementsByClassName!==C&&p?b.getElementsByClassName(a):void 0},r=[],q=[],(c.qsa=$.test(e.querySelectorAll))&&(ib(function(a){a.innerHTML="<select msallowclip=''><option selected=''></option></select>",a.querySelectorAll("[msallowclip^='']").length&&q.push("[*^$]="+M+"*(?:''|\"\")"),a.querySelectorAll("[selected]").length||q.push("\\["+M+"*(?:value|"+L+")"),a.querySelectorAll(":checked").length||q.push(":checked")}),ib(function(a){var b=e.createElement("input");b.setAttribute("type","hidden"),a.appendChild(b).setAttribute("name","D"),a.querySelectorAll("[name=d]").length&&q.push("name"+M+"*[*^$|!~]?="),a.querySelectorAll(":enabled").length||q.push(":enabled",":disabled"),a.querySelectorAll("*,:x"),q.push(",.*:")})),(c.matchesSelector=$.test(s=o.matches||o.webkitMatchesSelector||o.mozMatchesSelector||o.oMatchesSelector||o.msMatchesSelector))&&ib(function(a){c.disconnectedMatch=s.call(a,"div"),s.call(a,"[s!='']:x"),r.push("!=",Q)}),q=q.length&&new RegExp(q.join("|")),r=r.length&&new RegExp(r.join("|")),b=$.test(o.compareDocumentPosition),t=b||$.test(o.contains)?function(a,b){var c=9===a.nodeType?a.documentElement:a,d=b&&b.parentNode;return a===d||!(!d||1!==d.nodeType||!(c.contains?c.contains(d):a.compareDocumentPosition&&16&a.compareDocumentPosition(d)))}:function(a,b){if(b)while(b=b.parentNode)if(b===a)return!0;return!1},B=b?function(a,b){if(a===b)return l=!0,0;var d=!a.compareDocumentPosition-!b.compareDocumentPosition;return d?d:(d=(a.ownerDocument||a)===(b.ownerDocument||b)?a.compareDocumentPosition(b):1,1&d||!c.sortDetached&&b.compareDocumentPosition(a)===d?a===e||a.ownerDocument===v&&t(v,a)?-1:b===e||b.ownerDocument===v&&t(v,b)?1:k?K.call(k,a)-K.call(k,b):0:4&d?-1:1)}:function(a,b){if(a===b)return l=!0,0;var c,d=0,f=a.parentNode,g=b.parentNode,h=[a],i=[b];if(!f||!g)return a===e?-1:b===e?1:f?-1:g?1:k?K.call(k,a)-K.call(k,b):0;if(f===g)return kb(a,b);c=a;while(c=c.parentNode)h.unshift(c);c=b;while(c=c.parentNode)i.unshift(c);while(h[d]===i[d])d++;return d?kb(h[d],i[d]):h[d]===v?-1:i[d]===v?1:0},e):n},fb.matches=function(a,b){return fb(a,null,null,b)},fb.matchesSelector=function(a,b){if((a.ownerDocument||a)!==n&&m(a),b=b.replace(U,"='$1']"),!(!c.matchesSelector||!p||r&&r.test(b)||q&&q.test(b)))try{var d=s.call(a,b);if(d||c.disconnectedMatch||a.document&&11!==a.document.nodeType)return d}catch(e){}return fb(b,n,null,[a]).length>0},fb.contains=function(a,b){return(a.ownerDocument||a)!==n&&m(a),t(a,b)},fb.attr=function(a,b){(a.ownerDocument||a)!==n&&m(a);var e=d.attrHandle[b.toLowerCase()],f=e&&E.call(d.attrHandle,b.toLowerCase())?e(a,b,!p):void 0;return void 0!==f?f:c.attributes||!p?a.getAttribute(b):(f=a.getAttributeNode(b))&&f.specified?f.value:null},fb.error=function(a){throw new Error("Syntax error, unrecognized expression: "+a)},fb.uniqueSort=function(a){var b,d=[],e=0,f=0;if(l=!c.detectDuplicates,k=!c.sortStable&&a.slice(0),a.sort(B),l){while(b=a[f++])b===a[f]&&(e=d.push(f));while(e--)a.splice(d[e],1)}return k=null,a},e=fb.getText=function(a){var b,c="",d=0,f=a.nodeType;if(f){if(1===f||9===f||11===f){if("string"==typeof a.textContent)return a.textContent;for(a=a.firstChild;a;a=a.nextSibling)c+=e(a)}else if(3===f||4===f)return a.nodeValue}else while(b=a[d++])c+=e(b);return c},d=fb.selectors={cacheLength:50,createPseudo:hb,match:X,attrHandle:{},find:{},relative:{">":{dir:"parentNode",first:!0}," ":{dir:"parentNode"},"+":{dir:"previousSibling",first:!0},"~":{dir:"previousSibling"}},preFilter:{ATTR:function(a){return a[1]=a[1].replace(cb,db),a[3]=(a[3]||a[4]||a[5]||"").replace(cb,db),"~="===a[2]&&(a[3]=" "+a[3]+" "),a.slice(0,4)},CHILD:function(a){return a[1]=a[1].toLowerCase(),"nth"===a[1].slice(0,3)?(a[3]||fb.error(a[0]),a[4]=+(a[4]?a[5]+(a[6]||1):2*("even"===a[3]||"odd"===a[3])),a[5]=+(a[7]+a[8]||"odd"===a[3])):a[3]&&fb.error(a[0]),a},PSEUDO:function(a){var b,c=!a[6]&&a[2];return X.CHILD.test(a[0])?null:(a[3]?a[2]=a[4]||a[5]||"":c&&V.test(c)&&(b=g(c,!0))&&(b=c.indexOf(")",c.length-b)-c.length)&&(a[0]=a[0].slice(0,b),a[2]=c.slice(0,b)),a.slice(0,3))}},filter:{TAG:function(a){var b=a.replace(cb,db).toLowerCase();return"*"===a?function(){return!0}:function(a){return a.nodeName&&a.nodeName.toLowerCase()===b}},CLASS:function(a){var b=y[a+" "];return b||(b=new RegExp("(^|"+M+")"+a+"("+M+"|$)"))&&y(a,function(a){return b.test("string"==typeof a.className&&a.className||typeof a.getAttribute!==C&&a.getAttribute("class")||"")})},ATTR:function(a,b,c){return function(d){var e=fb.attr(d,a);return null==e?"!="===b:b?(e+="","="===b?e===c:"!="===b?e!==c:"^="===b?c&&0===e.indexOf(c):"*="===b?c&&e.indexOf(c)>-1:"$="===b?c&&e.slice(-c.length)===c:"~="===b?(" "+e+" ").indexOf(c)>-1:"|="===b?e===c||e.slice(0,c.length+1)===c+"-":!1):!0}},CHILD:function(a,b,c,d,e){var f="nth"!==a.slice(0,3),g="last"!==a.slice(-4),h="of-type"===b;return 1===d&&0===e?function(a){return!!a.parentNode}:function(b,c,i){var j,k,l,m,n,o,p=f!==g?"nextSibling":"previousSibling",q=b.parentNode,r=h&&b.nodeName.toLowerCase(),s=!i&&!h;if(q){if(f){while(p){l=b;while(l=l[p])if(h?l.nodeName.toLowerCase()===r:1===l.nodeType)return!1;o=p="only"===a&&!o&&"nextSibling"}return!0}if(o=[g?q.firstChild:q.lastChild],g&&s){k=q[u]||(q[u]={}),j=k[a]||[],n=j[0]===w&&j[1],m=j[0]===w&&j[2],l=n&&q.childNodes[n];while(l=++n&&l&&l[p]||(m=n=0)||o.pop())if(1===l.nodeType&&++m&&l===b){k[a]=[w,n,m];break}}else if(s&&(j=(b[u]||(b[u]={}))[a])&&j[0]===w)m=j[1];else while(l=++n&&l&&l[p]||(m=n=0)||o.pop())if((h?l.nodeName.toLowerCase()===r:1===l.nodeType)&&++m&&(s&&((l[u]||(l[u]={}))[a]=[w,m]),l===b))break;return m-=e,m===d||m%d===0&&m/d>=0}}},PSEUDO:function(a,b){var c,e=d.pseudos[a]||d.setFilters[a.toLowerCase()]||fb.error("unsupported pseudo: "+a);return e[u]?e(b):e.length>1?(c=[a,a,"",b],d.setFilters.hasOwnProperty(a.toLowerCase())?hb(function(a,c){var d,f=e(a,b),g=f.length;while(g--)d=K.call(a,f[g]),a[d]=!(c[d]=f[g])}):function(a){return e(a,0,c)}):e}},pseudos:{not:hb(function(a){var b=[],c=[],d=h(a.replace(R,"$1"));return d[u]?hb(function(a,b,c,e){var f,g=d(a,null,e,[]),h=a.length;while(h--)(f=g[h])&&(a[h]=!(b[h]=f))}):function(a,e,f){return b[0]=a,d(b,null,f,c),!c.pop()}}),has:hb(function(a){return function(b){return fb(a,b).length>0}}),contains:hb(function(a){return function(b){return(b.textContent||b.innerText||e(b)).indexOf(a)>-1}}),lang:hb(function(a){return W.test(a||"")||fb.error("unsupported lang: "+a),a=a.replace(cb,db).toLowerCase(),function(b){var c;do if(c=p?b.lang:b.getAttribute("xml:lang")||b.getAttribute("lang"))return c=c.toLowerCase(),c===a||0===c.indexOf(a+"-");while((b=b.parentNode)&&1===b.nodeType);return!1}}),target:function(b){var c=a.location&&a.location.hash;return c&&c.slice(1)===b.id},root:function(a){return a===o},focus:function(a){return a===n.activeElement&&(!n.hasFocus||n.hasFocus())&&!!(a.type||a.href||~a.tabIndex)},enabled:function(a){return a.disabled===!1},disabled:function(a){return a.disabled===!0},checked:function(a){var b=a.nodeName.toLowerCase();return"input"===b&&!!a.checked||"option"===b&&!!a.selected},selected:function(a){return a.parentNode&&a.parentNode.selectedIndex,a.selected===!0},empty:function(a){for(a=a.firstChild;a;a=a.nextSibling)if(a.nodeType<6)return!1;return!0},parent:function(a){return!d.pseudos.empty(a)},header:function(a){return Z.test(a.nodeName)},input:function(a){return Y.test(a.nodeName)},button:function(a){var b=a.nodeName.toLowerCase();return"input"===b&&"button"===a.type||"button"===b},text:function(a){var b;return"input"===a.nodeName.toLowerCase()&&"text"===a.type&&(null==(b=a.getAttribute("type"))||"text"===b.toLowerCase())},first:nb(function(){return[0]}),last:nb(function(a,b){return[b-1]}),eq:nb(function(a,b,c){return[0>c?c+b:c]}),even:nb(function(a,b){for(var c=0;b>c;c+=2)a.push(c);return a}),odd:nb(function(a,b){for(var c=1;b>c;c+=2)a.push(c);return a}),lt:nb(function(a,b,c){for(var d=0>c?c+b:c;--d>=0;)a.push(d);return a}),gt:nb(function(a,b,c){for(var d=0>c?c+b:c;++d<b;)a.push(d);return a})}},d.pseudos.nth=d.pseudos.eq;for(b in{radio:!0,checkbox:!0,file:!0,password:!0,image:!0})d.pseudos[b]=lb(b);for(b in{submit:!0,reset:!0})d.pseudos[b]=mb(b);function pb(){}pb.prototype=d.filters=d.pseudos,d.setFilters=new pb,g=fb.tokenize=function(a,b){var c,e,f,g,h,i,j,k=z[a+" "];if(k)return b?0:k.slice(0);h=a,i=[],j=d.preFilter;while(h){(!c||(e=S.exec(h)))&&(e&&(h=h.slice(e[0].length)||h),i.push(f=[])),c=!1,(e=T.exec(h))&&(c=e.shift(),f.push({value:c,type:e[0].replace(R," ")}),h=h.slice(c.length));for(g in d.filter)!(e=X[g].exec(h))||j[g]&&!(e=j[g](e))||(c=e.shift(),f.push({value:c,type:g,matches:e}),h=h.slice(c.length));if(!c)break}return b?h.length:h?fb.error(a):z(a,i).slice(0)};function qb(a){for(var b=0,c=a.length,d="";c>b;b++)d+=a[b].value;return d}function rb(a,b,c){var d=b.dir,e=c&&"parentNode"===d,f=x++;return b.first?function(b,c,f){while(b=b[d])if(1===b.nodeType||e)return a(b,c,f)}:function(b,c,g){var h,i,j=[w,f];if(g){while(b=b[d])if((1===b.nodeType||e)&&a(b,c,g))return!0}else while(b=b[d])if(1===b.nodeType||e){if(i=b[u]||(b[u]={}),(h=i[d])&&h[0]===w&&h[1]===f)return j[2]=h[2];if(i[d]=j,j[2]=a(b,c,g))return!0}}}function sb(a){return a.length>1?function(b,c,d){var e=a.length;while(e--)if(!a[e](b,c,d))return!1;return!0}:a[0]}function tb(a,b,c){for(var d=0,e=b.length;e>d;d++)fb(a,b[d],c);return c}function ub(a,b,c,d,e){for(var f,g=[],h=0,i=a.length,j=null!=b;i>h;h++)(f=a[h])&&(!c||c(f,d,e))&&(g.push(f),j&&b.push(h));return g}function vb(a,b,c,d,e,f){return d&&!d[u]&&(d=vb(d)),e&&!e[u]&&(e=vb(e,f)),hb(function(f,g,h,i){var j,k,l,m=[],n=[],o=g.length,p=f||tb(b||"*",h.nodeType?[h]:h,[]),q=!a||!f&&b?p:ub(p,m,a,h,i),r=c?e||(f?a:o||d)?[]:g:q;if(c&&c(q,r,h,i),d){j=ub(r,n),d(j,[],h,i),k=j.length;while(k--)(l=j[k])&&(r[n[k]]=!(q[n[k]]=l))}if(f){if(e||a){if(e){j=[],k=r.length;while(k--)(l=r[k])&&j.push(q[k]=l);e(null,r=[],j,i)}k=r.length;while(k--)(l=r[k])&&(j=e?K.call(f,l):m[k])>-1&&(f[j]=!(g[j]=l))}}else r=ub(r===g?r.splice(o,r.length):r),e?e(null,g,r,i):I.apply(g,r)})}function wb(a){for(var b,c,e,f=a.length,g=d.relative[a[0].type],h=g||d.relative[" "],i=g?1:0,k=rb(function(a){return a===b},h,!0),l=rb(function(a){return K.call(b,a)>-1},h,!0),m=[function(a,c,d){return!g&&(d||c!==j)||((b=c).nodeType?k(a,c,d):l(a,c,d))}];f>i;i++)if(c=d.relative[a[i].type])m=[rb(sb(m),c)];else{if(c=d.filter[a[i].type].apply(null,a[i].matches),c[u]){for(e=++i;f>e;e++)if(d.relative[a[e].type])break;return vb(i>1&&sb(m),i>1&&qb(a.slice(0,i-1).concat({value:" "===a[i-2].type?"*":""})).replace(R,"$1"),c,e>i&&wb(a.slice(i,e)),f>e&&wb(a=a.slice(e)),f>e&&qb(a))}m.push(c)}return sb(m)}function xb(a,b){var c=b.length>0,e=a.length>0,f=function(f,g,h,i,k){var l,m,o,p=0,q="0",r=f&&[],s=[],t=j,u=f||e&&d.find.TAG("*",k),v=w+=null==t?1:Math.random()||.1,x=u.length;for(k&&(j=g!==n&&g);q!==x&&null!=(l=u[q]);q++){if(e&&l){m=0;while(o=a[m++])if(o(l,g,h)){i.push(l);break}k&&(w=v)}c&&((l=!o&&l)&&p--,f&&r.push(l))}if(p+=q,c&&q!==p){m=0;while(o=b[m++])o(r,s,g,h);if(f){if(p>0)while(q--)r[q]||s[q]||(s[q]=G.call(i));s=ub(s)}I.apply(i,s),k&&!f&&s.length>0&&p+b.length>1&&fb.uniqueSort(i)}return k&&(w=v,j=t),r};return c?hb(f):f}return h=fb.compile=function(a,b){var c,d=[],e=[],f=A[a+" "];if(!f){b||(b=g(a)),c=b.length;while(c--)f=wb(b[c]),f[u]?d.push(f):e.push(f);f=A(a,xb(e,d)),f.selector=a}return f},i=fb.select=function(a,b,e,f){var i,j,k,l,m,n="function"==typeof a&&a,o=!f&&g(a=n.selector||a);if(e=e||[],1===o.length){if(j=o[0]=o[0].slice(0),j.length>2&&"ID"===(k=j[0]).type&&c.getById&&9===b.nodeType&&p&&d.relative[j[1].type]){if(b=(d.find.ID(k.matches[0].replace(cb,db),b)||[])[0],!b)return e;n&&(b=b.parentNode),a=a.slice(j.shift().value.length)}i=X.needsContext.test(a)?0:j.length;while(i--){if(k=j[i],d.relative[l=k.type])break;if((m=d.find[l])&&(f=m(k.matches[0].replace(cb,db),ab.test(j[0].type)&&ob(b.parentNode)||b))){if(j.splice(i,1),a=f.length&&qb(j),!a)return I.apply(e,f),e;break}}}return(n||h(a,o))(f,b,!p,e,ab.test(a)&&ob(b.parentNode)||b),e},c.sortStable=u.split("").sort(B).join("")===u,c.detectDuplicates=!!l,m(),c.sortDetached=ib(function(a){return 1&a.compareDocumentPosition(n.createElement("div"))}),ib(function(a){return a.innerHTML="<a href='#'></a>","#"===a.firstChild.getAttribute("href")})||jb("type|href|height|width",function(a,b,c){return c?void 0:a.getAttribute(b,"type"===b.toLowerCase()?1:2)}),c.attributes&&ib(function(a){return a.innerHTML="<input/>",a.firstChild.setAttribute("value",""),""===a.firstChild.getAttribute("value")})||jb("value",function(a,b,c){return c||"input"!==a.nodeName.toLowerCase()?void 0:a.defaultValue}),ib(function(a){return null==a.getAttribute("disabled")})||jb(L,function(a,b,c){var d;return c?void 0:a[b]===!0?b.toLowerCase():(d=a.getAttributeNode(b))&&d.specified?d.value:null}),fb}(a);m.find=s,m.expr=s.selectors,m.expr[":"]=m.expr.pseudos,m.unique=s.uniqueSort,m.text=s.getText,m.isXMLDoc=s.isXML,m.contains=s.contains;var t=m.expr.match.needsContext,u=/^<(\w+)\s*\/?>(?:<\/\1>|)$/,v=/^.[^:#\[\.,]*$/;function w(a,b,c){if(m.isFunction(b))return m.grep(a,function(a,d){return!!b.call(a,d,a)!==c});if(b.nodeType)return m.grep(a,function(a){return a===b!==c});if("string"==typeof b){if(v.test(b))return m.filter(b,a,c);b=m.filter(b,a)}return m.grep(a,function(a){return m.inArray(a,b)>=0!==c})}m.filter=function(a,b,c){var d=b[0];return c&&(a=":not("+a+")"),1===b.length&&1===d.nodeType?m.find.matchesSelector(d,a)?[d]:[]:m.find.matches(a,m.grep(b,function(a){return 1===a.nodeType}))},m.fn.extend({find:function(a){var b,c=[],d=this,e=d.length;if("string"!=typeof a)return this.pushStack(m(a).filter(function(){for(b=0;e>b;b++)if(m.contains(d[b],this))return!0}));for(b=0;e>b;b++)m.find(a,d[b],c);return c=this.pushStack(e>1?m.unique(c):c),c.selector=this.selector?this.selector+" "+a:a,c},filter:function(a){return this.pushStack(w(this,a||[],!1))},not:function(a){return this.pushStack(w(this,a||[],!0))},is:function(a){return!!w(this,"string"==typeof a&&t.test(a)?m(a):a||[],!1).length}});var x,y=a.document,z=/^(?:\s*(<[\w\W]+>)[^>]*|#([\w-]*))$/,A=m.fn.init=function(a,b){var c,d;if(!a)return this;if("string"==typeof a){if(c="<"===a.charAt(0)&&">"===a.charAt(a.length-1)&&a.length>=3?[null,a,null]:z.exec(a),!c||!c[1]&&b)return!b||b.jquery?(b||x).find(a):this.constructor(b).find(a);if(c[1]){if(b=b instanceof m?b[0]:b,m.merge(this,m.parseHTML(c[1],b&&b.nodeType?b.ownerDocument||b:y,!0)),u.test(c[1])&&m.isPlainObject(b))for(c in b)m.isFunction(this[c])?this[c](b[c]):this.attr(c,b[c]);return this}if(d=y.getElementById(c[2]),d&&d.parentNode){if(d.id!==c[2])return x.find(a);this.length=1,this[0]=d}return this.context=y,this.selector=a,this}return a.nodeType?(this.context=this[0]=a,this.length=1,this):m.isFunction(a)?"undefined"!=typeof x.ready?x.ready(a):a(m):(void 0!==a.selector&&(this.selector=a.selector,this.context=a.context),m.makeArray(a,this))};A.prototype=m.fn,x=m(y);var B=/^(?:parents|prev(?:Until|All))/,C={children:!0,contents:!0,next:!0,prev:!0};m.extend({dir:function(a,b,c){var d=[],e=a[b];while(e&&9!==e.nodeType&&(void 0===c||1!==e.nodeType||!m(e).is(c)))1===e.nodeType&&d.push(e),e=e[b];return d},sibling:function(a,b){for(var c=[];a;a=a.nextSibling)1===a.nodeType&&a!==b&&c.push(a);return c}}),m.fn.extend({has:function(a){var b,c=m(a,this),d=c.length;return this.filter(function(){for(b=0;d>b;b++)if(m.contains(this,c[b]))return!0})},closest:function(a,b){for(var c,d=0,e=this.length,f=[],g=t.test(a)||"string"!=typeof a?m(a,b||this.context):0;e>d;d++)for(c=this[d];c&&c!==b;c=c.parentNode)if(c.nodeType<11&&(g?g.index(c)>-1:1===c.nodeType&&m.find.matchesSelector(c,a))){f.push(c);break}return this.pushStack(f.length>1?m.unique(f):f)},index:function(a){return a?"string"==typeof a?m.inArray(this[0],m(a)):m.inArray(a.jquery?a[0]:a,this):this[0]&&this[0].parentNode?this.first().prevAll().length:-1},add:function(a,b){return this.pushStack(m.unique(m.merge(this.get(),m(a,b))))},addBack:function(a){return this.add(null==a?this.prevObject:this.prevObject.filter(a))}});function D(a,b){do a=a[b];while(a&&1!==a.nodeType);return a}m.each({parent:function(a){var b=a.parentNode;return b&&11!==b.nodeType?b:null},parents:function(a){return m.dir(a,"parentNode")},parentsUntil:function(a,b,c){return m.dir(a,"parentNode",c)},next:function(a){return D(a,"nextSibling")},prev:function(a){return D(a,"previousSibling")},nextAll:function(a){return m.dir(a,"nextSibling")},prevAll:function(a){return m.dir(a,"previousSibling")},nextUntil:function(a,b,c){return m.dir(a,"nextSibling",c)},prevUntil:function(a,b,c){return m.dir(a,"previousSibling",c)},siblings:function(a){return m.sibling((a.parentNode||{}).firstChild,a)},children:function(a){return m.sibling(a.firstChild)},contents:function(a){return m.nodeName(a,"iframe")?a.contentDocument||a.contentWindow.document:m.merge([],a.childNodes)}},function(a,b){m.fn[a]=function(c,d){var e=m.map(this,b,c);return"Until"!==a.slice(-5)&&(d=c),d&&"string"==typeof d&&(e=m.filter(d,e)),this.length>1&&(C[a]||(e=m.unique(e)),B.test(a)&&(e=e.reverse())),this.pushStack(e)}});var E=/\S+/g,F={};function G(a){var b=F[a]={};return m.each(a.match(E)||[],function(a,c){b[c]=!0}),b}m.Callbacks=function(a){a="string"==typeof a?F[a]||G(a):m.extend({},a);var b,c,d,e,f,g,h=[],i=!a.once&&[],j=function(l){for(c=a.memory&&l,d=!0,f=g||0,g=0,e=h.length,b=!0;h&&e>f;f++)if(h[f].apply(l[0],l[1])===!1&&a.stopOnFalse){c=!1;break}b=!1,h&&(i?i.length&&j(i.shift()):c?h=[]:k.disable())},k={add:function(){if(h){var d=h.length;!function f(b){m.each(b,function(b,c){var d=m.type(c);"function"===d?a.unique&&k.has(c)||h.push(c):c&&c.length&&"string"!==d&&f(c)})}(arguments),b?e=h.length:c&&(g=d,j(c))}return this},remove:function(){return h&&m.each(arguments,function(a,c){var d;while((d=m.inArray(c,h,d))>-1)h.splice(d,1),b&&(e>=d&&e--,f>=d&&f--)}),this},has:function(a){return a?m.inArray(a,h)>-1:!(!h||!h.length)},empty:function(){return h=[],e=0,this},disable:function(){return h=i=c=void 0,this},disabled:function(){return!h},lock:function(){return i=void 0,c||k.disable(),this},locked:function(){return!i},fireWith:function(a,c){return!h||d&&!i||(c=c||[],c=[a,c.slice?c.slice():c],b?i.push(c):j(c)),this},fire:function(){return k.fireWith(this,arguments),this},fired:function(){return!!d}};return k},m.extend({Deferred:function(a){var b=[["resolve","done",m.Callbacks("once memory"),"resolved"],["reject","fail",m.Callbacks("once memory"),"rejected"],["notify","progress",m.Callbacks("memory")]],c="pending",d={state:function(){return c},always:function(){return e.done(arguments).fail(arguments),this},then:function(){var a=arguments;return m.Deferred(function(c){m.each(b,function(b,f){var g=m.isFunction(a[b])&&a[b];e[f[1]](function(){var a=g&&g.apply(this,arguments);a&&m.isFunction(a.promise)?a.promise().done(c.resolve).fail(c.reject).progress(c.notify):c[f[0]+"With"](this===d?c.promise():this,g?[a]:arguments)})}),a=null}).promise()},promise:function(a){return null!=a?m.extend(a,d):d}},e={};return d.pipe=d.then,m.each(b,function(a,f){var g=f[2],h=f[3];d[f[1]]=g.add,h&&g.add(function(){c=h},b[1^a][2].disable,b[2][2].lock),e[f[0]]=function(){return e[f[0]+"With"](this===e?d:this,arguments),this},e[f[0]+"With"]=g.fireWith}),d.promise(e),a&&a.call(e,e),e},when:function(a){var b=0,c=d.call(arguments),e=c.length,f=1!==e||a&&m.isFunction(a.promise)?e:0,g=1===f?a:m.Deferred(),h=function(a,b,c){return function(e){b[a]=this,c[a]=arguments.length>1?d.call(arguments):e,c===i?g.notifyWith(b,c):--f||g.resolveWith(b,c)}},i,j,k;if(e>1)for(i=new Array(e),j=new Array(e),k=new Array(e);e>b;b++)c[b]&&m.isFunction(c[b].promise)?c[b].promise().done(h(b,k,c)).fail(g.reject).progress(h(b,j,i)):--f;return f||g.resolveWith(k,c),g.promise()}});var H;m.fn.ready=function(a){return m.ready.promise().done(a),this},m.extend({isReady:!1,readyWait:1,holdReady:function(a){a?m.readyWait++:m.ready(!0)},ready:function(a){if(a===!0?!--m.readyWait:!m.isReady){if(!y.body)return setTimeout(m.ready);m.isReady=!0,a!==!0&&--m.readyWait>0||(H.resolveWith(y,[m]),m.fn.triggerHandler&&(m(y).triggerHandler("ready"),m(y).off("ready")))}}});function I(){y.addEventListener?(y.removeEventListener("DOMContentLoaded",J,!1),a.removeEventListener("load",J,!1)):(y.detachEvent("onreadystatechange",J),a.detachEvent("onload",J))}function J(){(y.addEventListener||"load"===event.type||"complete"===y.readyState)&&(I(),m.ready())}m.ready.promise=function(b){if(!H)if(H=m.Deferred(),"complete"===y.readyState)setTimeout(m.ready);else if(y.addEventListener)y.addEventListener("DOMContentLoaded",J,!1),a.addEventListener("load",J,!1);else{y.attachEvent("onreadystatechange",J),a.attachEvent("onload",J);var c=!1;try{c=null==a.frameElement&&y.documentElement}catch(d){}c&&c.doScroll&&!function e(){if(!m.isReady){try{c.doScroll("left")}catch(a){return setTimeout(e,50)}I(),m.ready()}}()}return H.promise(b)};var K="undefined",L;for(L in m(k))break;k.ownLast="0"!==L,k.inlineBlockNeedsLayout=!1,m(function(){var a,b,c,d;c=y.getElementsByTagName("body")[0],c&&c.style&&(b=y.createElement("div"),d=y.createElement("div"),d.style.cssText="position:absolute;border:0;width:0;height:0;top:0;left:-9999px",c.appendChild(d).appendChild(b),typeof b.style.zoom!==K&&(b.style.cssText="display:inline;margin:0;border:0;padding:1px;width:1px;zoom:1",k.inlineBlockNeedsLayout=a=3===b.offsetWidth,a&&(c.style.zoom=1)),c.removeChild(d))}),function(){var a=y.createElement("div");if(null==k.deleteExpando){k.deleteExpando=!0;try{delete a.test}catch(b){k.deleteExpando=!1}}a=null}(),m.acceptData=function(a){var b=m.noData[(a.nodeName+" ").toLowerCase()],c=+a.nodeType||1;return 1!==c&&9!==c?!1:!b||b!==!0&&a.getAttribute("classid")===b};var M=/^(?:\{[\w\W]*\}|\[[\w\W]*\])$/,N=/([A-Z])/g;function O(a,b,c){if(void 0===c&&1===a.nodeType){var d="data-"+b.replace(N,"-$1").toLowerCase();if(c=a.getAttribute(d),"string"==typeof c){try{c="true"===c?!0:"false"===c?!1:"null"===c?null:+c+""===c?+c:M.test(c)?m.parseJSON(c):c}catch(e){}m.data(a,b,c)}else c=void 0}return c}function P(a){var b;for(b in a)if(("data"!==b||!m.isEmptyObject(a[b]))&&"toJSON"!==b)return!1;return!0}function Q(a,b,d,e){if(m.acceptData(a)){var f,g,h=m.expando,i=a.nodeType,j=i?m.cache:a,k=i?a[h]:a[h]&&h;
-if(k&&j[k]&&(e||j[k].data)||void 0!==d||"string"!=typeof b)return k||(k=i?a[h]=c.pop()||m.guid++:h),j[k]||(j[k]=i?{}:{toJSON:m.noop}),("object"==typeof b||"function"==typeof b)&&(e?j[k]=m.extend(j[k],b):j[k].data=m.extend(j[k].data,b)),g=j[k],e||(g.data||(g.data={}),g=g.data),void 0!==d&&(g[m.camelCase(b)]=d),"string"==typeof b?(f=g[b],null==f&&(f=g[m.camelCase(b)])):f=g,f}}function R(a,b,c){if(m.acceptData(a)){var d,e,f=a.nodeType,g=f?m.cache:a,h=f?a[m.expando]:m.expando;if(g[h]){if(b&&(d=c?g[h]:g[h].data)){m.isArray(b)?b=b.concat(m.map(b,m.camelCase)):b in d?b=[b]:(b=m.camelCase(b),b=b in d?[b]:b.split(" ")),e=b.length;while(e--)delete d[b[e]];if(c?!P(d):!m.isEmptyObject(d))return}(c||(delete g[h].data,P(g[h])))&&(f?m.cleanData([a],!0):k.deleteExpando||g!=g.window?delete g[h]:g[h]=null)}}}m.extend({cache:{},noData:{"applet ":!0,"embed ":!0,"object ":"clsid:D27CDB6E-AE6D-11cf-96B8-444553540000"},hasData:function(a){return a=a.nodeType?m.cache[a[m.expando]]:a[m.expando],!!a&&!P(a)},data:function(a,b,c){return Q(a,b,c)},removeData:function(a,b){return R(a,b)},_data:function(a,b,c){return Q(a,b,c,!0)},_removeData:function(a,b){return R(a,b,!0)}}),m.fn.extend({data:function(a,b){var c,d,e,f=this[0],g=f&&f.attributes;if(void 0===a){if(this.length&&(e=m.data(f),1===f.nodeType&&!m._data(f,"parsedAttrs"))){c=g.length;while(c--)g[c]&&(d=g[c].name,0===d.indexOf("data-")&&(d=m.camelCase(d.slice(5)),O(f,d,e[d])));m._data(f,"parsedAttrs",!0)}return e}return"object"==typeof a?this.each(function(){m.data(this,a)}):arguments.length>1?this.each(function(){m.data(this,a,b)}):f?O(f,a,m.data(f,a)):void 0},removeData:function(a){return this.each(function(){m.removeData(this,a)})}}),m.extend({queue:function(a,b,c){var d;return a?(b=(b||"fx")+"queue",d=m._data(a,b),c&&(!d||m.isArray(c)?d=m._data(a,b,m.makeArray(c)):d.push(c)),d||[]):void 0},dequeue:function(a,b){b=b||"fx";var c=m.queue(a,b),d=c.length,e=c.shift(),f=m._queueHooks(a,b),g=function(){m.dequeue(a,b)};"inprogress"===e&&(e=c.shift(),d--),e&&("fx"===b&&c.unshift("inprogress"),delete f.stop,e.call(a,g,f)),!d&&f&&f.empty.fire()},_queueHooks:function(a,b){var c=b+"queueHooks";return m._data(a,c)||m._data(a,c,{empty:m.Callbacks("once memory").add(function(){m._removeData(a,b+"queue"),m._removeData(a,c)})})}}),m.fn.extend({queue:function(a,b){var c=2;return"string"!=typeof a&&(b=a,a="fx",c--),arguments.length<c?m.queue(this[0],a):void 0===b?this:this.each(function(){var c=m.queue(this,a,b);m._queueHooks(this,a),"fx"===a&&"inprogress"!==c[0]&&m.dequeue(this,a)})},dequeue:function(a){return this.each(function(){m.dequeue(this,a)})},clearQueue:function(a){return this.queue(a||"fx",[])},promise:function(a,b){var c,d=1,e=m.Deferred(),f=this,g=this.length,h=function(){--d||e.resolveWith(f,[f])};"string"!=typeof a&&(b=a,a=void 0),a=a||"fx";while(g--)c=m._data(f[g],a+"queueHooks"),c&&c.empty&&(d++,c.empty.add(h));return h(),e.promise(b)}});var S=/[+-]?(?:\d*\.|)\d+(?:[eE][+-]?\d+|)/.source,T=["Top","Right","Bottom","Left"],U=function(a,b){return a=b||a,"none"===m.css(a,"display")||!m.contains(a.ownerDocument,a)},V=m.access=function(a,b,c,d,e,f,g){var h=0,i=a.length,j=null==c;if("object"===m.type(c)){e=!0;for(h in c)m.access(a,b,h,c[h],!0,f,g)}else if(void 0!==d&&(e=!0,m.isFunction(d)||(g=!0),j&&(g?(b.call(a,d),b=null):(j=b,b=function(a,b,c){return j.call(m(a),c)})),b))for(;i>h;h++)b(a[h],c,g?d:d.call(a[h],h,b(a[h],c)));return e?a:j?b.call(a):i?b(a[0],c):f},W=/^(?:checkbox|radio)$/i;!function(){var a=y.createElement("input"),b=y.createElement("div"),c=y.createDocumentFragment();if(b.innerHTML="  <link/><table></table><a href='/a'>a</a><input type='checkbox'/>",k.leadingWhitespace=3===b.firstChild.nodeType,k.tbody=!b.getElementsByTagName("tbody").length,k.htmlSerialize=!!b.getElementsByTagName("link").length,k.html5Clone="<:nav></:nav>"!==y.createElement("nav").cloneNode(!0).outerHTML,a.type="checkbox",a.checked=!0,c.appendChild(a),k.appendChecked=a.checked,b.innerHTML="<textarea>x</textarea>",k.noCloneChecked=!!b.cloneNode(!0).lastChild.defaultValue,c.appendChild(b),b.innerHTML="<input type='radio' checked='checked' name='t'/>",k.checkClone=b.cloneNode(!0).cloneNode(!0).lastChild.checked,k.noCloneEvent=!0,b.attachEvent&&(b.attachEvent("onclick",function(){k.noCloneEvent=!1}),b.cloneNode(!0).click()),null==k.deleteExpando){k.deleteExpando=!0;try{delete b.test}catch(d){k.deleteExpando=!1}}}(),function(){var b,c,d=y.createElement("div");for(b in{submit:!0,change:!0,focusin:!0})c="on"+b,(k[b+"Bubbles"]=c in a)||(d.setAttribute(c,"t"),k[b+"Bubbles"]=d.attributes[c].expando===!1);d=null}();var X=/^(?:input|select|textarea)$/i,Y=/^key/,Z=/^(?:mouse|pointer|contextmenu)|click/,$=/^(?:focusinfocus|focusoutblur)$/,_=/^([^.]*)(?:\.(.+)|)$/;function ab(){return!0}function bb(){return!1}function cb(){try{return y.activeElement}catch(a){}}m.event={global:{},add:function(a,b,c,d,e){var f,g,h,i,j,k,l,n,o,p,q,r=m._data(a);if(r){c.handler&&(i=c,c=i.handler,e=i.selector),c.guid||(c.guid=m.guid++),(g=r.events)||(g=r.events={}),(k=r.handle)||(k=r.handle=function(a){return typeof m===K||a&&m.event.triggered===a.type?void 0:m.event.dispatch.apply(k.elem,arguments)},k.elem=a),b=(b||"").match(E)||[""],h=b.length;while(h--)f=_.exec(b[h])||[],o=q=f[1],p=(f[2]||"").split(".").sort(),o&&(j=m.event.special[o]||{},o=(e?j.delegateType:j.bindType)||o,j=m.event.special[o]||{},l=m.extend({type:o,origType:q,data:d,handler:c,guid:c.guid,selector:e,needsContext:e&&m.expr.match.needsContext.test(e),namespace:p.join(".")},i),(n=g[o])||(n=g[o]=[],n.delegateCount=0,j.setup&&j.setup.call(a,d,p,k)!==!1||(a.addEventListener?a.addEventListener(o,k,!1):a.attachEvent&&a.attachEvent("on"+o,k))),j.add&&(j.add.call(a,l),l.handler.guid||(l.handler.guid=c.guid)),e?n.splice(n.delegateCount++,0,l):n.push(l),m.event.global[o]=!0);a=null}},remove:function(a,b,c,d,e){var f,g,h,i,j,k,l,n,o,p,q,r=m.hasData(a)&&m._data(a);if(r&&(k=r.events)){b=(b||"").match(E)||[""],j=b.length;while(j--)if(h=_.exec(b[j])||[],o=q=h[1],p=(h[2]||"").split(".").sort(),o){l=m.event.special[o]||{},o=(d?l.delegateType:l.bindType)||o,n=k[o]||[],h=h[2]&&new RegExp("(^|\\.)"+p.join("\\.(?:.*\\.|)")+"(\\.|$)"),i=f=n.length;while(f--)g=n[f],!e&&q!==g.origType||c&&c.guid!==g.guid||h&&!h.test(g.namespace)||d&&d!==g.selector&&("**"!==d||!g.selector)||(n.splice(f,1),g.selector&&n.delegateCount--,l.remove&&l.remove.call(a,g));i&&!n.length&&(l.teardown&&l.teardown.call(a,p,r.handle)!==!1||m.removeEvent(a,o,r.handle),delete k[o])}else for(o in k)m.event.remove(a,o+b[j],c,d,!0);m.isEmptyObject(k)&&(delete r.handle,m._removeData(a,"events"))}},trigger:function(b,c,d,e){var f,g,h,i,k,l,n,o=[d||y],p=j.call(b,"type")?b.type:b,q=j.call(b,"namespace")?b.namespace.split("."):[];if(h=l=d=d||y,3!==d.nodeType&&8!==d.nodeType&&!$.test(p+m.event.triggered)&&(p.indexOf(".")>=0&&(q=p.split("."),p=q.shift(),q.sort()),g=p.indexOf(":")<0&&"on"+p,b=b[m.expando]?b:new m.Event(p,"object"==typeof b&&b),b.isTrigger=e?2:3,b.namespace=q.join("."),b.namespace_re=b.namespace?new RegExp("(^|\\.)"+q.join("\\.(?:.*\\.|)")+"(\\.|$)"):null,b.result=void 0,b.target||(b.target=d),c=null==c?[b]:m.makeArray(c,[b]),k=m.event.special[p]||{},e||!k.trigger||k.trigger.apply(d,c)!==!1)){if(!e&&!k.noBubble&&!m.isWindow(d)){for(i=k.delegateType||p,$.test(i+p)||(h=h.parentNode);h;h=h.parentNode)o.push(h),l=h;l===(d.ownerDocument||y)&&o.push(l.defaultView||l.parentWindow||a)}n=0;while((h=o[n++])&&!b.isPropagationStopped())b.type=n>1?i:k.bindType||p,f=(m._data(h,"events")||{})[b.type]&&m._data(h,"handle"),f&&f.apply(h,c),f=g&&h[g],f&&f.apply&&m.acceptData(h)&&(b.result=f.apply(h,c),b.result===!1&&b.preventDefault());if(b.type=p,!e&&!b.isDefaultPrevented()&&(!k._default||k._default.apply(o.pop(),c)===!1)&&m.acceptData(d)&&g&&d[p]&&!m.isWindow(d)){l=d[g],l&&(d[g]=null),m.event.triggered=p;try{d[p]()}catch(r){}m.event.triggered=void 0,l&&(d[g]=l)}return b.result}},dispatch:function(a){a=m.event.fix(a);var b,c,e,f,g,h=[],i=d.call(arguments),j=(m._data(this,"events")||{})[a.type]||[],k=m.event.special[a.type]||{};if(i[0]=a,a.delegateTarget=this,!k.preDispatch||k.preDispatch.call(this,a)!==!1){h=m.event.handlers.call(this,a,j),b=0;while((f=h[b++])&&!a.isPropagationStopped()){a.currentTarget=f.elem,g=0;while((e=f.handlers[g++])&&!a.isImmediatePropagationStopped())(!a.namespace_re||a.namespace_re.test(e.namespace))&&(a.handleObj=e,a.data=e.data,c=((m.event.special[e.origType]||{}).handle||e.handler).apply(f.elem,i),void 0!==c&&(a.result=c)===!1&&(a.preventDefault(),a.stopPropagation()))}return k.postDispatch&&k.postDispatch.call(this,a),a.result}},handlers:function(a,b){var c,d,e,f,g=[],h=b.delegateCount,i=a.target;if(h&&i.nodeType&&(!a.button||"click"!==a.type))for(;i!=this;i=i.parentNode||this)if(1===i.nodeType&&(i.disabled!==!0||"click"!==a.type)){for(e=[],f=0;h>f;f++)d=b[f],c=d.selector+" ",void 0===e[c]&&(e[c]=d.needsContext?m(c,this).index(i)>=0:m.find(c,this,null,[i]).length),e[c]&&e.push(d);e.length&&g.push({elem:i,handlers:e})}return h<b.length&&g.push({elem:this,handlers:b.slice(h)}),g},fix:function(a){if(a[m.expando])return a;var b,c,d,e=a.type,f=a,g=this.fixHooks[e];g||(this.fixHooks[e]=g=Z.test(e)?this.mouseHooks:Y.test(e)?this.keyHooks:{}),d=g.props?this.props.concat(g.props):this.props,a=new m.Event(f),b=d.length;while(b--)c=d[b],a[c]=f[c];return a.target||(a.target=f.srcElement||y),3===a.target.nodeType&&(a.target=a.target.parentNode),a.metaKey=!!a.metaKey,g.filter?g.filter(a,f):a},props:"altKey bubbles cancelable ctrlKey currentTarget eventPhase metaKey relatedTarget shiftKey target timeStamp view which".split(" "),fixHooks:{},keyHooks:{props:"char charCode key keyCode".split(" "),filter:function(a,b){return null==a.which&&(a.which=null!=b.charCode?b.charCode:b.keyCode),a}},mouseHooks:{props:"button buttons clientX clientY fromElement offsetX offsetY pageX pageY screenX screenY toElement".split(" "),filter:function(a,b){var c,d,e,f=b.button,g=b.fromElement;return null==a.pageX&&null!=b.clientX&&(d=a.target.ownerDocument||y,e=d.documentElement,c=d.body,a.pageX=b.clientX+(e&&e.scrollLeft||c&&c.scrollLeft||0)-(e&&e.clientLeft||c&&c.clientLeft||0),a.pageY=b.clientY+(e&&e.scrollTop||c&&c.scrollTop||0)-(e&&e.clientTop||c&&c.clientTop||0)),!a.relatedTarget&&g&&(a.relatedTarget=g===a.target?b.toElement:g),a.which||void 0===f||(a.which=1&f?1:2&f?3:4&f?2:0),a}},special:{load:{noBubble:!0},focus:{trigger:function(){if(this!==cb()&&this.focus)try{return this.focus(),!1}catch(a){}},delegateType:"focusin"},blur:{trigger:function(){return this===cb()&&this.blur?(this.blur(),!1):void 0},delegateType:"focusout"},click:{trigger:function(){return m.nodeName(this,"input")&&"checkbox"===this.type&&this.click?(this.click(),!1):void 0},_default:function(a){return m.nodeName(a.target,"a")}},beforeunload:{postDispatch:function(a){void 0!==a.result&&a.originalEvent&&(a.originalEvent.returnValue=a.result)}}},simulate:function(a,b,c,d){var e=m.extend(new m.Event,c,{type:a,isSimulated:!0,originalEvent:{}});d?m.event.trigger(e,null,b):m.event.dispatch.call(b,e),e.isDefaultPrevented()&&c.preventDefault()}},m.removeEvent=y.removeEventListener?function(a,b,c){a.removeEventListener&&a.removeEventListener(b,c,!1)}:function(a,b,c){var d="on"+b;a.detachEvent&&(typeof a[d]===K&&(a[d]=null),a.detachEvent(d,c))},m.Event=function(a,b){return this instanceof m.Event?(a&&a.type?(this.originalEvent=a,this.type=a.type,this.isDefaultPrevented=a.defaultPrevented||void 0===a.defaultPrevented&&a.returnValue===!1?ab:bb):this.type=a,b&&m.extend(this,b),this.timeStamp=a&&a.timeStamp||m.now(),void(this[m.expando]=!0)):new m.Event(a,b)},m.Event.prototype={isDefaultPrevented:bb,isPropagationStopped:bb,isImmediatePropagationStopped:bb,preventDefault:function(){var a=this.originalEvent;this.isDefaultPrevented=ab,a&&(a.preventDefault?a.preventDefault():a.returnValue=!1)},stopPropagation:function(){var a=this.originalEvent;this.isPropagationStopped=ab,a&&(a.stopPropagation&&a.stopPropagation(),a.cancelBubble=!0)},stopImmediatePropagation:function(){var a=this.originalEvent;this.isImmediatePropagationStopped=ab,a&&a.stopImmediatePropagation&&a.stopImmediatePropagation(),this.stopPropagation()}},m.each({mouseenter:"mouseover",mouseleave:"mouseout",pointerenter:"pointerover",pointerleave:"pointerout"},function(a,b){m.event.special[a]={delegateType:b,bindType:b,handle:function(a){var c,d=this,e=a.relatedTarget,f=a.handleObj;return(!e||e!==d&&!m.contains(d,e))&&(a.type=f.origType,c=f.handler.apply(this,arguments),a.type=b),c}}}),k.submitBubbles||(m.event.special.submit={setup:function(){return m.nodeName(this,"form")?!1:void m.event.add(this,"click._submit keypress._submit",function(a){var b=a.target,c=m.nodeName(b,"input")||m.nodeName(b,"button")?b.form:void 0;c&&!m._data(c,"submitBubbles")&&(m.event.add(c,"submit._submit",function(a){a._submit_bubble=!0}),m._data(c,"submitBubbles",!0))})},postDispatch:function(a){a._submit_bubble&&(delete a._submit_bubble,this.parentNode&&!a.isTrigger&&m.event.simulate("submit",this.parentNode,a,!0))},teardown:function(){return m.nodeName(this,"form")?!1:void m.event.remove(this,"._submit")}}),k.changeBubbles||(m.event.special.change={setup:function(){return X.test(this.nodeName)?(("checkbox"===this.type||"radio"===this.type)&&(m.event.add(this,"propertychange._change",function(a){"checked"===a.originalEvent.propertyName&&(this._just_changed=!0)}),m.event.add(this,"click._change",function(a){this._just_changed&&!a.isTrigger&&(this._just_changed=!1),m.event.simulate("change",this,a,!0)})),!1):void m.event.add(this,"beforeactivate._change",function(a){var b=a.target;X.test(b.nodeName)&&!m._data(b,"changeBubbles")&&(m.event.add(b,"change._change",function(a){!this.parentNode||a.isSimulated||a.isTrigger||m.event.simulate("change",this.parentNode,a,!0)}),m._data(b,"changeBubbles",!0))})},handle:function(a){var b=a.target;return this!==b||a.isSimulated||a.isTrigger||"radio"!==b.type&&"checkbox"!==b.type?a.handleObj.handler.apply(this,arguments):void 0},teardown:function(){return m.event.remove(this,"._change"),!X.test(this.nodeName)}}),k.focusinBubbles||m.each({focus:"focusin",blur:"focusout"},function(a,b){var c=function(a){m.event.simulate(b,a.target,m.event.fix(a),!0)};m.event.special[b]={setup:function(){var d=this.ownerDocument||this,e=m._data(d,b);e||d.addEventListener(a,c,!0),m._data(d,b,(e||0)+1)},teardown:function(){var d=this.ownerDocument||this,e=m._data(d,b)-1;e?m._data(d,b,e):(d.removeEventListener(a,c,!0),m._removeData(d,b))}}}),m.fn.extend({on:function(a,b,c,d,e){var f,g;if("object"==typeof a){"string"!=typeof b&&(c=c||b,b=void 0);for(f in a)this.on(f,b,c,a[f],e);return this}if(null==c&&null==d?(d=b,c=b=void 0):null==d&&("string"==typeof b?(d=c,c=void 0):(d=c,c=b,b=void 0)),d===!1)d=bb;else if(!d)return this;return 1===e&&(g=d,d=function(a){return m().off(a),g.apply(this,arguments)},d.guid=g.guid||(g.guid=m.guid++)),this.each(function(){m.event.add(this,a,d,c,b)})},one:function(a,b,c,d){return this.on(a,b,c,d,1)},off:function(a,b,c){var d,e;if(a&&a.preventDefault&&a.handleObj)return d=a.handleObj,m(a.delegateTarget).off(d.namespace?d.origType+"."+d.namespace:d.origType,d.selector,d.handler),this;if("object"==typeof a){for(e in a)this.off(e,b,a[e]);return this}return(b===!1||"function"==typeof b)&&(c=b,b=void 0),c===!1&&(c=bb),this.each(function(){m.event.remove(this,a,c,b)})},trigger:function(a,b){return this.each(function(){m.event.trigger(a,b,this)})},triggerHandler:function(a,b){var c=this[0];return c?m.event.trigger(a,b,c,!0):void 0}});function db(a){var b=eb.split("|"),c=a.createDocumentFragment();if(c.createElement)while(b.length)c.createElement(b.pop());return c}var eb="abbr|article|aside|audio|bdi|canvas|data|datalist|details|figcaption|figure|footer|header|hgroup|mark|meter|nav|output|progress|section|summary|time|video",fb=/ jQuery\d+="(?:null|\d+)"/g,gb=new RegExp("<(?:"+eb+")[\\s/>]","i"),hb=/^\s+/,ib=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/gi,jb=/<([\w:]+)/,kb=/<tbody/i,lb=/<|&#?\w+;/,mb=/<(?:script|style|link)/i,nb=/checked\s*(?:[^=]|=\s*.checked.)/i,ob=/^$|\/(?:java|ecma)script/i,pb=/^true\/(.*)/,qb=/^\s*<!(?:\[CDATA\[|--)|(?:\]\]|--)>\s*$/g,rb={option:[1,"<select multiple='multiple'>","</select>"],legend:[1,"<fieldset>","</fieldset>"],area:[1,"<map>","</map>"],param:[1,"<object>","</object>"],thead:[1,"<table>","</table>"],tr:[2,"<table><tbody>","</tbody></table>"],col:[2,"<table><tbody></tbody><colgroup>","</colgroup></table>"],td:[3,"<table><tbody><tr>","</tr></tbody></table>"],_default:k.htmlSerialize?[0,"",""]:[1,"X<div>","</div>"]},sb=db(y),tb=sb.appendChild(y.createElement("div"));rb.optgroup=rb.option,rb.tbody=rb.tfoot=rb.colgroup=rb.caption=rb.thead,rb.th=rb.td;function ub(a,b){var c,d,e=0,f=typeof a.getElementsByTagName!==K?a.getElementsByTagName(b||"*"):typeof a.querySelectorAll!==K?a.querySelectorAll(b||"*"):void 0;if(!f)for(f=[],c=a.childNodes||a;null!=(d=c[e]);e++)!b||m.nodeName(d,b)?f.push(d):m.merge(f,ub(d,b));return void 0===b||b&&m.nodeName(a,b)?m.merge([a],f):f}function vb(a){W.test(a.type)&&(a.defaultChecked=a.checked)}function wb(a,b){return m.nodeName(a,"table")&&m.nodeName(11!==b.nodeType?b:b.firstChild,"tr")?a.getElementsByTagName("tbody")[0]||a.appendChild(a.ownerDocument.createElement("tbody")):a}function xb(a){return a.type=(null!==m.find.attr(a,"type"))+"/"+a.type,a}function yb(a){var b=pb.exec(a.type);return b?a.type=b[1]:a.removeAttribute("type"),a}function zb(a,b){for(var c,d=0;null!=(c=a[d]);d++)m._data(c,"globalEval",!b||m._data(b[d],"globalEval"))}function Ab(a,b){if(1===b.nodeType&&m.hasData(a)){var c,d,e,f=m._data(a),g=m._data(b,f),h=f.events;if(h){delete g.handle,g.events={};for(c in h)for(d=0,e=h[c].length;e>d;d++)m.event.add(b,c,h[c][d])}g.data&&(g.data=m.extend({},g.data))}}function Bb(a,b){var c,d,e;if(1===b.nodeType){if(c=b.nodeName.toLowerCase(),!k.noCloneEvent&&b[m.expando]){e=m._data(b);for(d in e.events)m.removeEvent(b,d,e.handle);b.removeAttribute(m.expando)}"script"===c&&b.text!==a.text?(xb(b).text=a.text,yb(b)):"object"===c?(b.parentNode&&(b.outerHTML=a.outerHTML),k.html5Clone&&a.innerHTML&&!m.trim(b.innerHTML)&&(b.innerHTML=a.innerHTML)):"input"===c&&W.test(a.type)?(b.defaultChecked=b.checked=a.checked,b.value!==a.value&&(b.value=a.value)):"option"===c?b.defaultSelected=b.selected=a.defaultSelected:("input"===c||"textarea"===c)&&(b.defaultValue=a.defaultValue)}}m.extend({clone:function(a,b,c){var d,e,f,g,h,i=m.contains(a.ownerDocument,a);if(k.html5Clone||m.isXMLDoc(a)||!gb.test("<"+a.nodeName+">")?f=a.cloneNode(!0):(tb.innerHTML=a.outerHTML,tb.removeChild(f=tb.firstChild)),!(k.noCloneEvent&&k.noCloneChecked||1!==a.nodeType&&11!==a.nodeType||m.isXMLDoc(a)))for(d=ub(f),h=ub(a),g=0;null!=(e=h[g]);++g)d[g]&&Bb(e,d[g]);if(b)if(c)for(h=h||ub(a),d=d||ub(f),g=0;null!=(e=h[g]);g++)Ab(e,d[g]);else Ab(a,f);return d=ub(f,"script"),d.length>0&&zb(d,!i&&ub(a,"script")),d=h=e=null,f},buildFragment:function(a,b,c,d){for(var e,f,g,h,i,j,l,n=a.length,o=db(b),p=[],q=0;n>q;q++)if(f=a[q],f||0===f)if("object"===m.type(f))m.merge(p,f.nodeType?[f]:f);else if(lb.test(f)){h=h||o.appendChild(b.createElement("div")),i=(jb.exec(f)||["",""])[1].toLowerCase(),l=rb[i]||rb._default,h.innerHTML=l[1]+f.replace(ib,"<$1></$2>")+l[2],e=l[0];while(e--)h=h.lastChild;if(!k.leadingWhitespace&&hb.test(f)&&p.push(b.createTextNode(hb.exec(f)[0])),!k.tbody){f="table"!==i||kb.test(f)?"<table>"!==l[1]||kb.test(f)?0:h:h.firstChild,e=f&&f.childNodes.length;while(e--)m.nodeName(j=f.childNodes[e],"tbody")&&!j.childNodes.length&&f.removeChild(j)}m.merge(p,h.childNodes),h.textContent="";while(h.firstChild)h.removeChild(h.firstChild);h=o.lastChild}else p.push(b.createTextNode(f));h&&o.removeChild(h),k.appendChecked||m.grep(ub(p,"input"),vb),q=0;while(f=p[q++])if((!d||-1===m.inArray(f,d))&&(g=m.contains(f.ownerDocument,f),h=ub(o.appendChild(f),"script"),g&&zb(h),c)){e=0;while(f=h[e++])ob.test(f.type||"")&&c.push(f)}return h=null,o},cleanData:function(a,b){for(var d,e,f,g,h=0,i=m.expando,j=m.cache,l=k.deleteExpando,n=m.event.special;null!=(d=a[h]);h++)if((b||m.acceptData(d))&&(f=d[i],g=f&&j[f])){if(g.events)for(e in g.events)n[e]?m.event.remove(d,e):m.removeEvent(d,e,g.handle);j[f]&&(delete j[f],l?delete d[i]:typeof d.removeAttribute!==K?d.removeAttribute(i):d[i]=null,c.push(f))}}}),m.fn.extend({text:function(a){return V(this,function(a){return void 0===a?m.text(this):this.empty().append((this[0]&&this[0].ownerDocument||y).createTextNode(a))},null,a,arguments.length)},append:function(){return this.domManip(arguments,function(a){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var b=wb(this,a);b.appendChild(a)}})},prepend:function(){return this.domManip(arguments,function(a){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var b=wb(this,a);b.insertBefore(a,b.firstChild)}})},before:function(){return this.domManip(arguments,function(a){this.parentNode&&this.parentNode.insertBefore(a,this)})},after:function(){return this.domManip(arguments,function(a){this.parentNode&&this.parentNode.insertBefore(a,this.nextSibling)})},remove:function(a,b){for(var c,d=a?m.filter(a,this):this,e=0;null!=(c=d[e]);e++)b||1!==c.nodeType||m.cleanData(ub(c)),c.parentNode&&(b&&m.contains(c.ownerDocument,c)&&zb(ub(c,"script")),c.parentNode.removeChild(c));return this},empty:function(){for(var a,b=0;null!=(a=this[b]);b++){1===a.nodeType&&m.cleanData(ub(a,!1));while(a.firstChild)a.removeChild(a.firstChild);a.options&&m.nodeName(a,"select")&&(a.options.length=0)}return this},clone:function(a,b){return a=null==a?!1:a,b=null==b?a:b,this.map(function(){return m.clone(this,a,b)})},html:function(a){return V(this,function(a){var b=this[0]||{},c=0,d=this.length;if(void 0===a)return 1===b.nodeType?b.innerHTML.replace(fb,""):void 0;if(!("string"!=typeof a||mb.test(a)||!k.htmlSerialize&&gb.test(a)||!k.leadingWhitespace&&hb.test(a)||rb[(jb.exec(a)||["",""])[1].toLowerCase()])){a=a.replace(ib,"<$1></$2>");try{for(;d>c;c++)b=this[c]||{},1===b.nodeType&&(m.cleanData(ub(b,!1)),b.innerHTML=a);b=0}catch(e){}}b&&this.empty().append(a)},null,a,arguments.length)},replaceWith:function(){var a=arguments[0];return this.domManip(arguments,function(b){a=this.parentNode,m.cleanData(ub(this)),a&&a.replaceChild(b,this)}),a&&(a.length||a.nodeType)?this:this.remove()},detach:function(a){return this.remove(a,!0)},domManip:function(a,b){a=e.apply([],a);var c,d,f,g,h,i,j=0,l=this.length,n=this,o=l-1,p=a[0],q=m.isFunction(p);if(q||l>1&&"string"==typeof p&&!k.checkClone&&nb.test(p))return this.each(function(c){var d=n.eq(c);q&&(a[0]=p.call(this,c,d.html())),d.domManip(a,b)});if(l&&(i=m.buildFragment(a,this[0].ownerDocument,!1,this),c=i.firstChild,1===i.childNodes.length&&(i=c),c)){for(g=m.map(ub(i,"script"),xb),f=g.length;l>j;j++)d=i,j!==o&&(d=m.clone(d,!0,!0),f&&m.merge(g,ub(d,"script"))),b.call(this[j],d,j);if(f)for(h=g[g.length-1].ownerDocument,m.map(g,yb),j=0;f>j;j++)d=g[j],ob.test(d.type||"")&&!m._data(d,"globalEval")&&m.contains(h,d)&&(d.src?m._evalUrl&&m._evalUrl(d.src):m.globalEval((d.text||d.textContent||d.innerHTML||"").replace(qb,"")));i=c=null}return this}}),m.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(a,b){m.fn[a]=function(a){for(var c,d=0,e=[],g=m(a),h=g.length-1;h>=d;d++)c=d===h?this:this.clone(!0),m(g[d])[b](c),f.apply(e,c.get());return this.pushStack(e)}});var Cb,Db={};function Eb(b,c){var d,e=m(c.createElement(b)).appendTo(c.body),f=a.getDefaultComputedStyle&&(d=a.getDefaultComputedStyle(e[0]))?d.display:m.css(e[0],"display");return e.detach(),f}function Fb(a){var b=y,c=Db[a];return c||(c=Eb(a,b),"none"!==c&&c||(Cb=(Cb||m("<iframe frameborder='0' width='0' height='0'/>")).appendTo(b.documentElement),b=(Cb[0].contentWindow||Cb[0].contentDocument).document,b.write(),b.close(),c=Eb(a,b),Cb.detach()),Db[a]=c),c}!function(){var a;k.shrinkWrapBlocks=function(){if(null!=a)return a;a=!1;var b,c,d;return c=y.getElementsByTagName("body")[0],c&&c.style?(b=y.createElement("div"),d=y.createElement("div"),d.style.cssText="position:absolute;border:0;width:0;height:0;top:0;left:-9999px",c.appendChild(d).appendChild(b),typeof b.style.zoom!==K&&(b.style.cssText="-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box;display:block;margin:0;border:0;padding:1px;width:1px;zoom:1",b.appendChild(y.createElement("div")).style.width="5px",a=3!==b.offsetWidth),c.removeChild(d),a):void 0}}();var Gb=/^margin/,Hb=new RegExp("^("+S+")(?!px)[a-z%]+$","i"),Ib,Jb,Kb=/^(top|right|bottom|left)$/;a.getComputedStyle?(Ib=function(a){return a.ownerDocument.defaultView.getComputedStyle(a,null)},Jb=function(a,b,c){var d,e,f,g,h=a.style;return c=c||Ib(a),g=c?c.getPropertyValue(b)||c[b]:void 0,c&&(""!==g||m.contains(a.ownerDocument,a)||(g=m.style(a,b)),Hb.test(g)&&Gb.test(b)&&(d=h.width,e=h.minWidth,f=h.maxWidth,h.minWidth=h.maxWidth=h.width=g,g=c.width,h.width=d,h.minWidth=e,h.maxWidth=f)),void 0===g?g:g+""}):y.documentElement.currentStyle&&(Ib=function(a){return a.currentStyle},Jb=function(a,b,c){var d,e,f,g,h=a.style;return c=c||Ib(a),g=c?c[b]:void 0,null==g&&h&&h[b]&&(g=h[b]),Hb.test(g)&&!Kb.test(b)&&(d=h.left,e=a.runtimeStyle,f=e&&e.left,f&&(e.left=a.currentStyle.left),h.left="fontSize"===b?"1em":g,g=h.pixelLeft+"px",h.left=d,f&&(e.left=f)),void 0===g?g:g+""||"auto"});function Lb(a,b){return{get:function(){var c=a();if(null!=c)return c?void delete this.get:(this.get=b).apply(this,arguments)}}}!function(){var b,c,d,e,f,g,h;if(b=y.createElement("div"),b.innerHTML="  <link/><table></table><a href='/a'>a</a><input type='checkbox'/>",d=b.getElementsByTagName("a")[0],c=d&&d.style){c.cssText="float:left;opacity:.5",k.opacity="0.5"===c.opacity,k.cssFloat=!!c.cssFloat,b.style.backgroundClip="content-box",b.cloneNode(!0).style.backgroundClip="",k.clearCloneStyle="content-box"===b.style.backgroundClip,k.boxSizing=""===c.boxSizing||""===c.MozBoxSizing||""===c.WebkitBoxSizing,m.extend(k,{reliableHiddenOffsets:function(){return null==g&&i(),g},boxSizingReliable:function(){return null==f&&i(),f},pixelPosition:function(){return null==e&&i(),e},reliableMarginRight:function(){return null==h&&i(),h}});function i(){var b,c,d,i;c=y.getElementsByTagName("body")[0],c&&c.style&&(b=y.createElement("div"),d=y.createElement("div"),d.style.cssText="position:absolute;border:0;width:0;height:0;top:0;left:-9999px",c.appendChild(d).appendChild(b),b.style.cssText="-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;display:block;margin-top:1%;top:1%;border:1px;padding:1px;width:4px;position:absolute",e=f=!1,h=!0,a.getComputedStyle&&(e="1%"!==(a.getComputedStyle(b,null)||{}).top,f="4px"===(a.getComputedStyle(b,null)||{width:"4px"}).width,i=b.appendChild(y.createElement("div")),i.style.cssText=b.style.cssText="-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box;display:block;margin:0;border:0;padding:0",i.style.marginRight=i.style.width="0",b.style.width="1px",h=!parseFloat((a.getComputedStyle(i,null)||{}).marginRight)),b.innerHTML="<table><tr><td></td><td>t</td></tr></table>",i=b.getElementsByTagName("td"),i[0].style.cssText="margin:0;border:0;padding:0;display:none",g=0===i[0].offsetHeight,g&&(i[0].style.display="",i[1].style.display="none",g=0===i[0].offsetHeight),c.removeChild(d))}}}(),m.swap=function(a,b,c,d){var e,f,g={};for(f in b)g[f]=a.style[f],a.style[f]=b[f];e=c.apply(a,d||[]);for(f in b)a.style[f]=g[f];return e};var Mb=/alpha\([^)]*\)/i,Nb=/opacity\s*=\s*([^)]*)/,Ob=/^(none|table(?!-c[ea]).+)/,Pb=new RegExp("^("+S+")(.*)$","i"),Qb=new RegExp("^([+-])=("+S+")","i"),Rb={position:"absolute",visibility:"hidden",display:"block"},Sb={letterSpacing:"0",fontWeight:"400"},Tb=["Webkit","O","Moz","ms"];function Ub(a,b){if(b in a)return b;var c=b.charAt(0).toUpperCase()+b.slice(1),d=b,e=Tb.length;while(e--)if(b=Tb[e]+c,b in a)return b;return d}function Vb(a,b){for(var c,d,e,f=[],g=0,h=a.length;h>g;g++)d=a[g],d.style&&(f[g]=m._data(d,"olddisplay"),c=d.style.display,b?(f[g]||"none"!==c||(d.style.display=""),""===d.style.display&&U(d)&&(f[g]=m._data(d,"olddisplay",Fb(d.nodeName)))):(e=U(d),(c&&"none"!==c||!e)&&m._data(d,"olddisplay",e?c:m.css(d,"display"))));for(g=0;h>g;g++)d=a[g],d.style&&(b&&"none"!==d.style.display&&""!==d.style.display||(d.style.display=b?f[g]||"":"none"));return a}function Wb(a,b,c){var d=Pb.exec(b);return d?Math.max(0,d[1]-(c||0))+(d[2]||"px"):b}function Xb(a,b,c,d,e){for(var f=c===(d?"border":"content")?4:"width"===b?1:0,g=0;4>f;f+=2)"margin"===c&&(g+=m.css(a,c+T[f],!0,e)),d?("content"===c&&(g-=m.css(a,"padding"+T[f],!0,e)),"margin"!==c&&(g-=m.css(a,"border"+T[f]+"Width",!0,e))):(g+=m.css(a,"padding"+T[f],!0,e),"padding"!==c&&(g+=m.css(a,"border"+T[f]+"Width",!0,e)));return g}function Yb(a,b,c){var d=!0,e="width"===b?a.offsetWidth:a.offsetHeight,f=Ib(a),g=k.boxSizing&&"border-box"===m.css(a,"boxSizing",!1,f);if(0>=e||null==e){if(e=Jb(a,b,f),(0>e||null==e)&&(e=a.style[b]),Hb.test(e))return e;d=g&&(k.boxSizingReliable()||e===a.style[b]),e=parseFloat(e)||0}return e+Xb(a,b,c||(g?"border":"content"),d,f)+"px"}m.extend({cssHooks:{opacity:{get:function(a,b){if(b){var c=Jb(a,"opacity");return""===c?"1":c}}}},cssNumber:{columnCount:!0,fillOpacity:!0,flexGrow:!0,flexShrink:!0,fontWeight:!0,lineHeight:!0,opacity:!0,order:!0,orphans:!0,widows:!0,zIndex:!0,zoom:!0},cssProps:{"float":k.cssFloat?"cssFloat":"styleFloat"},style:function(a,b,c,d){if(a&&3!==a.nodeType&&8!==a.nodeType&&a.style){var e,f,g,h=m.camelCase(b),i=a.style;if(b=m.cssProps[h]||(m.cssProps[h]=Ub(i,h)),g=m.cssHooks[b]||m.cssHooks[h],void 0===c)return g&&"get"in g&&void 0!==(e=g.get(a,!1,d))?e:i[b];if(f=typeof c,"string"===f&&(e=Qb.exec(c))&&(c=(e[1]+1)*e[2]+parseFloat(m.css(a,b)),f="number"),null!=c&&c===c&&("number"!==f||m.cssNumber[h]||(c+="px"),k.clearCloneStyle||""!==c||0!==b.indexOf("background")||(i[b]="inherit"),!(g&&"set"in g&&void 0===(c=g.set(a,c,d)))))try{i[b]=c}catch(j){}}},css:function(a,b,c,d){var e,f,g,h=m.camelCase(b);return b=m.cssProps[h]||(m.cssProps[h]=Ub(a.style,h)),g=m.cssHooks[b]||m.cssHooks[h],g&&"get"in g&&(f=g.get(a,!0,c)),void 0===f&&(f=Jb(a,b,d)),"normal"===f&&b in Sb&&(f=Sb[b]),""===c||c?(e=parseFloat(f),c===!0||m.isNumeric(e)?e||0:f):f}}),m.each(["height","width"],function(a,b){m.cssHooks[b]={get:function(a,c,d){return c?Ob.test(m.css(a,"display"))&&0===a.offsetWidth?m.swap(a,Rb,function(){return Yb(a,b,d)}):Yb(a,b,d):void 0},set:function(a,c,d){var e=d&&Ib(a);return Wb(a,c,d?Xb(a,b,d,k.boxSizing&&"border-box"===m.css(a,"boxSizing",!1,e),e):0)}}}),k.opacity||(m.cssHooks.opacity={get:function(a,b){return Nb.test((b&&a.currentStyle?a.currentStyle.filter:a.style.filter)||"")?.01*parseFloat(RegExp.$1)+"":b?"1":""},set:function(a,b){var c=a.style,d=a.currentStyle,e=m.isNumeric(b)?"alpha(opacity="+100*b+")":"",f=d&&d.filter||c.filter||"";c.zoom=1,(b>=1||""===b)&&""===m.trim(f.replace(Mb,""))&&c.removeAttribute&&(c.removeAttribute("filter"),""===b||d&&!d.filter)||(c.filter=Mb.test(f)?f.replace(Mb,e):f+" "+e)}}),m.cssHooks.marginRight=Lb(k.reliableMarginRight,function(a,b){return b?m.swap(a,{display:"inline-block"},Jb,[a,"marginRight"]):void 0}),m.each({margin:"",padding:"",border:"Width"},function(a,b){m.cssHooks[a+b]={expand:function(c){for(var d=0,e={},f="string"==typeof c?c.split(" "):[c];4>d;d++)e[a+T[d]+b]=f[d]||f[d-2]||f[0];return e}},Gb.test(a)||(m.cssHooks[a+b].set=Wb)}),m.fn.extend({css:function(a,b){return V(this,function(a,b,c){var d,e,f={},g=0;if(m.isArray(b)){for(d=Ib(a),e=b.length;e>g;g++)f[b[g]]=m.css(a,b[g],!1,d);return f}return void 0!==c?m.style(a,b,c):m.css(a,b)},a,b,arguments.length>1)},show:function(){return Vb(this,!0)},hide:function(){return Vb(this)},toggle:function(a){return"boolean"==typeof a?a?this.show():this.hide():this.each(function(){U(this)?m(this).show():m(this).hide()})}});function Zb(a,b,c,d,e){return new Zb.prototype.init(a,b,c,d,e)}m.Tween=Zb,Zb.prototype={constructor:Zb,init:function(a,b,c,d,e,f){this.elem=a,this.prop=c,this.easing=e||"swing",this.options=b,this.start=this.now=this.cur(),this.end=d,this.unit=f||(m.cssNumber[c]?"":"px")
-},cur:function(){var a=Zb.propHooks[this.prop];return a&&a.get?a.get(this):Zb.propHooks._default.get(this)},run:function(a){var b,c=Zb.propHooks[this.prop];return this.pos=b=this.options.duration?m.easing[this.easing](a,this.options.duration*a,0,1,this.options.duration):a,this.now=(this.end-this.start)*b+this.start,this.options.step&&this.options.step.call(this.elem,this.now,this),c&&c.set?c.set(this):Zb.propHooks._default.set(this),this}},Zb.prototype.init.prototype=Zb.prototype,Zb.propHooks={_default:{get:function(a){var b;return null==a.elem[a.prop]||a.elem.style&&null!=a.elem.style[a.prop]?(b=m.css(a.elem,a.prop,""),b&&"auto"!==b?b:0):a.elem[a.prop]},set:function(a){m.fx.step[a.prop]?m.fx.step[a.prop](a):a.elem.style&&(null!=a.elem.style[m.cssProps[a.prop]]||m.cssHooks[a.prop])?m.style(a.elem,a.prop,a.now+a.unit):a.elem[a.prop]=a.now}}},Zb.propHooks.scrollTop=Zb.propHooks.scrollLeft={set:function(a){a.elem.nodeType&&a.elem.parentNode&&(a.elem[a.prop]=a.now)}},m.easing={linear:function(a){return a},swing:function(a){return.5-Math.cos(a*Math.PI)/2}},m.fx=Zb.prototype.init,m.fx.step={};var $b,_b,ac=/^(?:toggle|show|hide)$/,bc=new RegExp("^(?:([+-])=|)("+S+")([a-z%]*)$","i"),cc=/queueHooks$/,dc=[ic],ec={"*":[function(a,b){var c=this.createTween(a,b),d=c.cur(),e=bc.exec(b),f=e&&e[3]||(m.cssNumber[a]?"":"px"),g=(m.cssNumber[a]||"px"!==f&&+d)&&bc.exec(m.css(c.elem,a)),h=1,i=20;if(g&&g[3]!==f){f=f||g[3],e=e||[],g=+d||1;do h=h||".5",g/=h,m.style(c.elem,a,g+f);while(h!==(h=c.cur()/d)&&1!==h&&--i)}return e&&(g=c.start=+g||+d||0,c.unit=f,c.end=e[1]?g+(e[1]+1)*e[2]:+e[2]),c}]};function fc(){return setTimeout(function(){$b=void 0}),$b=m.now()}function gc(a,b){var c,d={height:a},e=0;for(b=b?1:0;4>e;e+=2-b)c=T[e],d["margin"+c]=d["padding"+c]=a;return b&&(d.opacity=d.width=a),d}function hc(a,b,c){for(var d,e=(ec[b]||[]).concat(ec["*"]),f=0,g=e.length;g>f;f++)if(d=e[f].call(c,b,a))return d}function ic(a,b,c){var d,e,f,g,h,i,j,l,n=this,o={},p=a.style,q=a.nodeType&&U(a),r=m._data(a,"fxshow");c.queue||(h=m._queueHooks(a,"fx"),null==h.unqueued&&(h.unqueued=0,i=h.empty.fire,h.empty.fire=function(){h.unqueued||i()}),h.unqueued++,n.always(function(){n.always(function(){h.unqueued--,m.queue(a,"fx").length||h.empty.fire()})})),1===a.nodeType&&("height"in b||"width"in b)&&(c.overflow=[p.overflow,p.overflowX,p.overflowY],j=m.css(a,"display"),l="none"===j?m._data(a,"olddisplay")||Fb(a.nodeName):j,"inline"===l&&"none"===m.css(a,"float")&&(k.inlineBlockNeedsLayout&&"inline"!==Fb(a.nodeName)?p.zoom=1:p.display="inline-block")),c.overflow&&(p.overflow="hidden",k.shrinkWrapBlocks()||n.always(function(){p.overflow=c.overflow[0],p.overflowX=c.overflow[1],p.overflowY=c.overflow[2]}));for(d in b)if(e=b[d],ac.exec(e)){if(delete b[d],f=f||"toggle"===e,e===(q?"hide":"show")){if("show"!==e||!r||void 0===r[d])continue;q=!0}o[d]=r&&r[d]||m.style(a,d)}else j=void 0;if(m.isEmptyObject(o))"inline"===("none"===j?Fb(a.nodeName):j)&&(p.display=j);else{r?"hidden"in r&&(q=r.hidden):r=m._data(a,"fxshow",{}),f&&(r.hidden=!q),q?m(a).show():n.done(function(){m(a).hide()}),n.done(function(){var b;m._removeData(a,"fxshow");for(b in o)m.style(a,b,o[b])});for(d in o)g=hc(q?r[d]:0,d,n),d in r||(r[d]=g.start,q&&(g.end=g.start,g.start="width"===d||"height"===d?1:0))}}function jc(a,b){var c,d,e,f,g;for(c in a)if(d=m.camelCase(c),e=b[d],f=a[c],m.isArray(f)&&(e=f[1],f=a[c]=f[0]),c!==d&&(a[d]=f,delete a[c]),g=m.cssHooks[d],g&&"expand"in g){f=g.expand(f),delete a[d];for(c in f)c in a||(a[c]=f[c],b[c]=e)}else b[d]=e}function kc(a,b,c){var d,e,f=0,g=dc.length,h=m.Deferred().always(function(){delete i.elem}),i=function(){if(e)return!1;for(var b=$b||fc(),c=Math.max(0,j.startTime+j.duration-b),d=c/j.duration||0,f=1-d,g=0,i=j.tweens.length;i>g;g++)j.tweens[g].run(f);return h.notifyWith(a,[j,f,c]),1>f&&i?c:(h.resolveWith(a,[j]),!1)},j=h.promise({elem:a,props:m.extend({},b),opts:m.extend(!0,{specialEasing:{}},c),originalProperties:b,originalOptions:c,startTime:$b||fc(),duration:c.duration,tweens:[],createTween:function(b,c){var d=m.Tween(a,j.opts,b,c,j.opts.specialEasing[b]||j.opts.easing);return j.tweens.push(d),d},stop:function(b){var c=0,d=b?j.tweens.length:0;if(e)return this;for(e=!0;d>c;c++)j.tweens[c].run(1);return b?h.resolveWith(a,[j,b]):h.rejectWith(a,[j,b]),this}}),k=j.props;for(jc(k,j.opts.specialEasing);g>f;f++)if(d=dc[f].call(j,a,k,j.opts))return d;return m.map(k,hc,j),m.isFunction(j.opts.start)&&j.opts.start.call(a,j),m.fx.timer(m.extend(i,{elem:a,anim:j,queue:j.opts.queue})),j.progress(j.opts.progress).done(j.opts.done,j.opts.complete).fail(j.opts.fail).always(j.opts.always)}m.Animation=m.extend(kc,{tweener:function(a,b){m.isFunction(a)?(b=a,a=["*"]):a=a.split(" ");for(var c,d=0,e=a.length;e>d;d++)c=a[d],ec[c]=ec[c]||[],ec[c].unshift(b)},prefilter:function(a,b){b?dc.unshift(a):dc.push(a)}}),m.speed=function(a,b,c){var d=a&&"object"==typeof a?m.extend({},a):{complete:c||!c&&b||m.isFunction(a)&&a,duration:a,easing:c&&b||b&&!m.isFunction(b)&&b};return d.duration=m.fx.off?0:"number"==typeof d.duration?d.duration:d.duration in m.fx.speeds?m.fx.speeds[d.duration]:m.fx.speeds._default,(null==d.queue||d.queue===!0)&&(d.queue="fx"),d.old=d.complete,d.complete=function(){m.isFunction(d.old)&&d.old.call(this),d.queue&&m.dequeue(this,d.queue)},d},m.fn.extend({fadeTo:function(a,b,c,d){return this.filter(U).css("opacity",0).show().end().animate({opacity:b},a,c,d)},animate:function(a,b,c,d){var e=m.isEmptyObject(a),f=m.speed(b,c,d),g=function(){var b=kc(this,m.extend({},a),f);(e||m._data(this,"finish"))&&b.stop(!0)};return g.finish=g,e||f.queue===!1?this.each(g):this.queue(f.queue,g)},stop:function(a,b,c){var d=function(a){var b=a.stop;delete a.stop,b(c)};return"string"!=typeof a&&(c=b,b=a,a=void 0),b&&a!==!1&&this.queue(a||"fx",[]),this.each(function(){var b=!0,e=null!=a&&a+"queueHooks",f=m.timers,g=m._data(this);if(e)g[e]&&g[e].stop&&d(g[e]);else for(e in g)g[e]&&g[e].stop&&cc.test(e)&&d(g[e]);for(e=f.length;e--;)f[e].elem!==this||null!=a&&f[e].queue!==a||(f[e].anim.stop(c),b=!1,f.splice(e,1));(b||!c)&&m.dequeue(this,a)})},finish:function(a){return a!==!1&&(a=a||"fx"),this.each(function(){var b,c=m._data(this),d=c[a+"queue"],e=c[a+"queueHooks"],f=m.timers,g=d?d.length:0;for(c.finish=!0,m.queue(this,a,[]),e&&e.stop&&e.stop.call(this,!0),b=f.length;b--;)f[b].elem===this&&f[b].queue===a&&(f[b].anim.stop(!0),f.splice(b,1));for(b=0;g>b;b++)d[b]&&d[b].finish&&d[b].finish.call(this);delete c.finish})}}),m.each(["toggle","show","hide"],function(a,b){var c=m.fn[b];m.fn[b]=function(a,d,e){return null==a||"boolean"==typeof a?c.apply(this,arguments):this.animate(gc(b,!0),a,d,e)}}),m.each({slideDown:gc("show"),slideUp:gc("hide"),slideToggle:gc("toggle"),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"},fadeToggle:{opacity:"toggle"}},function(a,b){m.fn[a]=function(a,c,d){return this.animate(b,a,c,d)}}),m.timers=[],m.fx.tick=function(){var a,b=m.timers,c=0;for($b=m.now();c<b.length;c++)a=b[c],a()||b[c]!==a||b.splice(c--,1);b.length||m.fx.stop(),$b=void 0},m.fx.timer=function(a){m.timers.push(a),a()?m.fx.start():m.timers.pop()},m.fx.interval=13,m.fx.start=function(){_b||(_b=setInterval(m.fx.tick,m.fx.interval))},m.fx.stop=function(){clearInterval(_b),_b=null},m.fx.speeds={slow:600,fast:200,_default:400},m.fn.delay=function(a,b){return a=m.fx?m.fx.speeds[a]||a:a,b=b||"fx",this.queue(b,function(b,c){var d=setTimeout(b,a);c.stop=function(){clearTimeout(d)}})},function(){var a,b,c,d,e;b=y.createElement("div"),b.setAttribute("className","t"),b.innerHTML="  <link/><table></table><a href='/a'>a</a><input type='checkbox'/>",d=b.getElementsByTagName("a")[0],c=y.createElement("select"),e=c.appendChild(y.createElement("option")),a=b.getElementsByTagName("input")[0],d.style.cssText="top:1px",k.getSetAttribute="t"!==b.className,k.style=/top/.test(d.getAttribute("style")),k.hrefNormalized="/a"===d.getAttribute("href"),k.checkOn=!!a.value,k.optSelected=e.selected,k.enctype=!!y.createElement("form").enctype,c.disabled=!0,k.optDisabled=!e.disabled,a=y.createElement("input"),a.setAttribute("value",""),k.input=""===a.getAttribute("value"),a.value="t",a.setAttribute("type","radio"),k.radioValue="t"===a.value}();var lc=/\r/g;m.fn.extend({val:function(a){var b,c,d,e=this[0];{if(arguments.length)return d=m.isFunction(a),this.each(function(c){var e;1===this.nodeType&&(e=d?a.call(this,c,m(this).val()):a,null==e?e="":"number"==typeof e?e+="":m.isArray(e)&&(e=m.map(e,function(a){return null==a?"":a+""})),b=m.valHooks[this.type]||m.valHooks[this.nodeName.toLowerCase()],b&&"set"in b&&void 0!==b.set(this,e,"value")||(this.value=e))});if(e)return b=m.valHooks[e.type]||m.valHooks[e.nodeName.toLowerCase()],b&&"get"in b&&void 0!==(c=b.get(e,"value"))?c:(c=e.value,"string"==typeof c?c.replace(lc,""):null==c?"":c)}}}),m.extend({valHooks:{option:{get:function(a){var b=m.find.attr(a,"value");return null!=b?b:m.trim(m.text(a))}},select:{get:function(a){for(var b,c,d=a.options,e=a.selectedIndex,f="select-one"===a.type||0>e,g=f?null:[],h=f?e+1:d.length,i=0>e?h:f?e:0;h>i;i++)if(c=d[i],!(!c.selected&&i!==e||(k.optDisabled?c.disabled:null!==c.getAttribute("disabled"))||c.parentNode.disabled&&m.nodeName(c.parentNode,"optgroup"))){if(b=m(c).val(),f)return b;g.push(b)}return g},set:function(a,b){var c,d,e=a.options,f=m.makeArray(b),g=e.length;while(g--)if(d=e[g],m.inArray(m.valHooks.option.get(d),f)>=0)try{d.selected=c=!0}catch(h){d.scrollHeight}else d.selected=!1;return c||(a.selectedIndex=-1),e}}}}),m.each(["radio","checkbox"],function(){m.valHooks[this]={set:function(a,b){return m.isArray(b)?a.checked=m.inArray(m(a).val(),b)>=0:void 0}},k.checkOn||(m.valHooks[this].get=function(a){return null===a.getAttribute("value")?"on":a.value})});var mc,nc,oc=m.expr.attrHandle,pc=/^(?:checked|selected)$/i,qc=k.getSetAttribute,rc=k.input;m.fn.extend({attr:function(a,b){return V(this,m.attr,a,b,arguments.length>1)},removeAttr:function(a){return this.each(function(){m.removeAttr(this,a)})}}),m.extend({attr:function(a,b,c){var d,e,f=a.nodeType;if(a&&3!==f&&8!==f&&2!==f)return typeof a.getAttribute===K?m.prop(a,b,c):(1===f&&m.isXMLDoc(a)||(b=b.toLowerCase(),d=m.attrHooks[b]||(m.expr.match.bool.test(b)?nc:mc)),void 0===c?d&&"get"in d&&null!==(e=d.get(a,b))?e:(e=m.find.attr(a,b),null==e?void 0:e):null!==c?d&&"set"in d&&void 0!==(e=d.set(a,c,b))?e:(a.setAttribute(b,c+""),c):void m.removeAttr(a,b))},removeAttr:function(a,b){var c,d,e=0,f=b&&b.match(E);if(f&&1===a.nodeType)while(c=f[e++])d=m.propFix[c]||c,m.expr.match.bool.test(c)?rc&&qc||!pc.test(c)?a[d]=!1:a[m.camelCase("default-"+c)]=a[d]=!1:m.attr(a,c,""),a.removeAttribute(qc?c:d)},attrHooks:{type:{set:function(a,b){if(!k.radioValue&&"radio"===b&&m.nodeName(a,"input")){var c=a.value;return a.setAttribute("type",b),c&&(a.value=c),b}}}}}),nc={set:function(a,b,c){return b===!1?m.removeAttr(a,c):rc&&qc||!pc.test(c)?a.setAttribute(!qc&&m.propFix[c]||c,c):a[m.camelCase("default-"+c)]=a[c]=!0,c}},m.each(m.expr.match.bool.source.match(/\w+/g),function(a,b){var c=oc[b]||m.find.attr;oc[b]=rc&&qc||!pc.test(b)?function(a,b,d){var e,f;return d||(f=oc[b],oc[b]=e,e=null!=c(a,b,d)?b.toLowerCase():null,oc[b]=f),e}:function(a,b,c){return c?void 0:a[m.camelCase("default-"+b)]?b.toLowerCase():null}}),rc&&qc||(m.attrHooks.value={set:function(a,b,c){return m.nodeName(a,"input")?void(a.defaultValue=b):mc&&mc.set(a,b,c)}}),qc||(mc={set:function(a,b,c){var d=a.getAttributeNode(c);return d||a.setAttributeNode(d=a.ownerDocument.createAttribute(c)),d.value=b+="","value"===c||b===a.getAttribute(c)?b:void 0}},oc.id=oc.name=oc.coords=function(a,b,c){var d;return c?void 0:(d=a.getAttributeNode(b))&&""!==d.value?d.value:null},m.valHooks.button={get:function(a,b){var c=a.getAttributeNode(b);return c&&c.specified?c.value:void 0},set:mc.set},m.attrHooks.contenteditable={set:function(a,b,c){mc.set(a,""===b?!1:b,c)}},m.each(["width","height"],function(a,b){m.attrHooks[b]={set:function(a,c){return""===c?(a.setAttribute(b,"auto"),c):void 0}}})),k.style||(m.attrHooks.style={get:function(a){return a.style.cssText||void 0},set:function(a,b){return a.style.cssText=b+""}});var sc=/^(?:input|select|textarea|button|object)$/i,tc=/^(?:a|area)$/i;m.fn.extend({prop:function(a,b){return V(this,m.prop,a,b,arguments.length>1)},removeProp:function(a){return a=m.propFix[a]||a,this.each(function(){try{this[a]=void 0,delete this[a]}catch(b){}})}}),m.extend({propFix:{"for":"htmlFor","class":"className"},prop:function(a,b,c){var d,e,f,g=a.nodeType;if(a&&3!==g&&8!==g&&2!==g)return f=1!==g||!m.isXMLDoc(a),f&&(b=m.propFix[b]||b,e=m.propHooks[b]),void 0!==c?e&&"set"in e&&void 0!==(d=e.set(a,c,b))?d:a[b]=c:e&&"get"in e&&null!==(d=e.get(a,b))?d:a[b]},propHooks:{tabIndex:{get:function(a){var b=m.find.attr(a,"tabindex");return b?parseInt(b,10):sc.test(a.nodeName)||tc.test(a.nodeName)&&a.href?0:-1}}}}),k.hrefNormalized||m.each(["href","src"],function(a,b){m.propHooks[b]={get:function(a){return a.getAttribute(b,4)}}}),k.optSelected||(m.propHooks.selected={get:function(a){var b=a.parentNode;return b&&(b.selectedIndex,b.parentNode&&b.parentNode.selectedIndex),null}}),m.each(["tabIndex","readOnly","maxLength","cellSpacing","cellPadding","rowSpan","colSpan","useMap","frameBorder","contentEditable"],function(){m.propFix[this.toLowerCase()]=this}),k.enctype||(m.propFix.enctype="encoding");var uc=/[\t\r\n\f]/g;m.fn.extend({addClass:function(a){var b,c,d,e,f,g,h=0,i=this.length,j="string"==typeof a&&a;if(m.isFunction(a))return this.each(function(b){m(this).addClass(a.call(this,b,this.className))});if(j)for(b=(a||"").match(E)||[];i>h;h++)if(c=this[h],d=1===c.nodeType&&(c.className?(" "+c.className+" ").replace(uc," "):" ")){f=0;while(e=b[f++])d.indexOf(" "+e+" ")<0&&(d+=e+" ");g=m.trim(d),c.className!==g&&(c.className=g)}return this},removeClass:function(a){var b,c,d,e,f,g,h=0,i=this.length,j=0===arguments.length||"string"==typeof a&&a;if(m.isFunction(a))return this.each(function(b){m(this).removeClass(a.call(this,b,this.className))});if(j)for(b=(a||"").match(E)||[];i>h;h++)if(c=this[h],d=1===c.nodeType&&(c.className?(" "+c.className+" ").replace(uc," "):"")){f=0;while(e=b[f++])while(d.indexOf(" "+e+" ")>=0)d=d.replace(" "+e+" "," ");g=a?m.trim(d):"",c.className!==g&&(c.className=g)}return this},toggleClass:function(a,b){var c=typeof a;return"boolean"==typeof b&&"string"===c?b?this.addClass(a):this.removeClass(a):this.each(m.isFunction(a)?function(c){m(this).toggleClass(a.call(this,c,this.className,b),b)}:function(){if("string"===c){var b,d=0,e=m(this),f=a.match(E)||[];while(b=f[d++])e.hasClass(b)?e.removeClass(b):e.addClass(b)}else(c===K||"boolean"===c)&&(this.className&&m._data(this,"__className__",this.className),this.className=this.className||a===!1?"":m._data(this,"__className__")||"")})},hasClass:function(a){for(var b=" "+a+" ",c=0,d=this.length;d>c;c++)if(1===this[c].nodeType&&(" "+this[c].className+" ").replace(uc," ").indexOf(b)>=0)return!0;return!1}}),m.each("blur focus focusin focusout load resize scroll unload click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select submit keydown keypress keyup error contextmenu".split(" "),function(a,b){m.fn[b]=function(a,c){return arguments.length>0?this.on(b,null,a,c):this.trigger(b)}}),m.fn.extend({hover:function(a,b){return this.mouseenter(a).mouseleave(b||a)},bind:function(a,b,c){return this.on(a,null,b,c)},unbind:function(a,b){return this.off(a,null,b)},delegate:function(a,b,c,d){return this.on(b,a,c,d)},undelegate:function(a,b,c){return 1===arguments.length?this.off(a,"**"):this.off(b,a||"**",c)}});var vc=m.now(),wc=/\?/,xc=/(,)|(\[|{)|(}|])|"(?:[^"\\\r\n]|\\["\\\/bfnrt]|\\u[\da-fA-F]{4})*"\s*:?|true|false|null|-?(?!0\d)\d+(?:\.\d+|)(?:[eE][+-]?\d+|)/g;m.parseJSON=function(b){if(a.JSON&&a.JSON.parse)return a.JSON.parse(b+"");var c,d=null,e=m.trim(b+"");return e&&!m.trim(e.replace(xc,function(a,b,e,f){return c&&b&&(d=0),0===d?a:(c=e||b,d+=!f-!e,"")}))?Function("return "+e)():m.error("Invalid JSON: "+b)},m.parseXML=function(b){var c,d;if(!b||"string"!=typeof b)return null;try{a.DOMParser?(d=new DOMParser,c=d.parseFromString(b,"text/xml")):(c=new ActiveXObject("Microsoft.XMLDOM"),c.async="false",c.loadXML(b))}catch(e){c=void 0}return c&&c.documentElement&&!c.getElementsByTagName("parsererror").length||m.error("Invalid XML: "+b),c};var yc,zc,Ac=/#.*$/,Bc=/([?&])_=[^&]*/,Cc=/^(.*?):[ \t]*([^\r\n]*)\r?$/gm,Dc=/^(?:about|app|app-storage|.+-extension|file|res|widget):$/,Ec=/^(?:GET|HEAD)$/,Fc=/^\/\//,Gc=/^([\w.+-]+:)(?:\/\/(?:[^\/?#]*@|)([^\/?#:]*)(?::(\d+)|)|)/,Hc={},Ic={},Jc="*/".concat("*");try{zc=location.href}catch(Kc){zc=y.createElement("a"),zc.href="",zc=zc.href}yc=Gc.exec(zc.toLowerCase())||[];function Lc(a){return function(b,c){"string"!=typeof b&&(c=b,b="*");var d,e=0,f=b.toLowerCase().match(E)||[];if(m.isFunction(c))while(d=f[e++])"+"===d.charAt(0)?(d=d.slice(1)||"*",(a[d]=a[d]||[]).unshift(c)):(a[d]=a[d]||[]).push(c)}}function Mc(a,b,c,d){var e={},f=a===Ic;function g(h){var i;return e[h]=!0,m.each(a[h]||[],function(a,h){var j=h(b,c,d);return"string"!=typeof j||f||e[j]?f?!(i=j):void 0:(b.dataTypes.unshift(j),g(j),!1)}),i}return g(b.dataTypes[0])||!e["*"]&&g("*")}function Nc(a,b){var c,d,e=m.ajaxSettings.flatOptions||{};for(d in b)void 0!==b[d]&&((e[d]?a:c||(c={}))[d]=b[d]);return c&&m.extend(!0,a,c),a}function Oc(a,b,c){var d,e,f,g,h=a.contents,i=a.dataTypes;while("*"===i[0])i.shift(),void 0===e&&(e=a.mimeType||b.getResponseHeader("Content-Type"));if(e)for(g in h)if(h[g]&&h[g].test(e)){i.unshift(g);break}if(i[0]in c)f=i[0];else{for(g in c){if(!i[0]||a.converters[g+" "+i[0]]){f=g;break}d||(d=g)}f=f||d}return f?(f!==i[0]&&i.unshift(f),c[f]):void 0}function Pc(a,b,c,d){var e,f,g,h,i,j={},k=a.dataTypes.slice();if(k[1])for(g in a.converters)j[g.toLowerCase()]=a.converters[g];f=k.shift();while(f)if(a.responseFields[f]&&(c[a.responseFields[f]]=b),!i&&d&&a.dataFilter&&(b=a.dataFilter(b,a.dataType)),i=f,f=k.shift())if("*"===f)f=i;else if("*"!==i&&i!==f){if(g=j[i+" "+f]||j["* "+f],!g)for(e in j)if(h=e.split(" "),h[1]===f&&(g=j[i+" "+h[0]]||j["* "+h[0]])){g===!0?g=j[e]:j[e]!==!0&&(f=h[0],k.unshift(h[1]));break}if(g!==!0)if(g&&a["throws"])b=g(b);else try{b=g(b)}catch(l){return{state:"parsererror",error:g?l:"No conversion from "+i+" to "+f}}}return{state:"success",data:b}}m.extend({active:0,lastModified:{},etag:{},ajaxSettings:{url:zc,type:"GET",isLocal:Dc.test(yc[1]),global:!0,processData:!0,async:!0,contentType:"application/x-www-form-urlencoded; charset=UTF-8",accepts:{"*":Jc,text:"text/plain",html:"text/html",xml:"application/xml, text/xml",json:"application/json, text/javascript"},contents:{xml:/xml/,html:/html/,json:/json/},responseFields:{xml:"responseXML",text:"responseText",json:"responseJSON"},converters:{"* text":String,"text html":!0,"text json":m.parseJSON,"text xml":m.parseXML},flatOptions:{url:!0,context:!0}},ajaxSetup:function(a,b){return b?Nc(Nc(a,m.ajaxSettings),b):Nc(m.ajaxSettings,a)},ajaxPrefilter:Lc(Hc),ajaxTransport:Lc(Ic),ajax:function(a,b){"object"==typeof a&&(b=a,a=void 0),b=b||{};var c,d,e,f,g,h,i,j,k=m.ajaxSetup({},b),l=k.context||k,n=k.context&&(l.nodeType||l.jquery)?m(l):m.event,o=m.Deferred(),p=m.Callbacks("once memory"),q=k.statusCode||{},r={},s={},t=0,u="canceled",v={readyState:0,getResponseHeader:function(a){var b;if(2===t){if(!j){j={};while(b=Cc.exec(f))j[b[1].toLowerCase()]=b[2]}b=j[a.toLowerCase()]}return null==b?null:b},getAllResponseHeaders:function(){return 2===t?f:null},setRequestHeader:function(a,b){var c=a.toLowerCase();return t||(a=s[c]=s[c]||a,r[a]=b),this},overrideMimeType:function(a){return t||(k.mimeType=a),this},statusCode:function(a){var b;if(a)if(2>t)for(b in a)q[b]=[q[b],a[b]];else v.always(a[v.status]);return this},abort:function(a){var b=a||u;return i&&i.abort(b),x(0,b),this}};if(o.promise(v).complete=p.add,v.success=v.done,v.error=v.fail,k.url=((a||k.url||zc)+"").replace(Ac,"").replace(Fc,yc[1]+"//"),k.type=b.method||b.type||k.method||k.type,k.dataTypes=m.trim(k.dataType||"*").toLowerCase().match(E)||[""],null==k.crossDomain&&(c=Gc.exec(k.url.toLowerCase()),k.crossDomain=!(!c||c[1]===yc[1]&&c[2]===yc[2]&&(c[3]||("http:"===c[1]?"80":"443"))===(yc[3]||("http:"===yc[1]?"80":"443")))),k.data&&k.processData&&"string"!=typeof k.data&&(k.data=m.param(k.data,k.traditional)),Mc(Hc,k,b,v),2===t)return v;h=k.global,h&&0===m.active++&&m.event.trigger("ajaxStart"),k.type=k.type.toUpperCase(),k.hasContent=!Ec.test(k.type),e=k.url,k.hasContent||(k.data&&(e=k.url+=(wc.test(e)?"&":"?")+k.data,delete k.data),k.cache===!1&&(k.url=Bc.test(e)?e.replace(Bc,"$1_="+vc++):e+(wc.test(e)?"&":"?")+"_="+vc++)),k.ifModified&&(m.lastModified[e]&&v.setRequestHeader("If-Modified-Since",m.lastModified[e]),m.etag[e]&&v.setRequestHeader("If-None-Match",m.etag[e])),(k.data&&k.hasContent&&k.contentType!==!1||b.contentType)&&v.setRequestHeader("Content-Type",k.contentType),v.setRequestHeader("Accept",k.dataTypes[0]&&k.accepts[k.dataTypes[0]]?k.accepts[k.dataTypes[0]]+("*"!==k.dataTypes[0]?", "+Jc+"; q=0.01":""):k.accepts["*"]);for(d in k.headers)v.setRequestHeader(d,k.headers[d]);if(k.beforeSend&&(k.beforeSend.call(l,v,k)===!1||2===t))return v.abort();u="abort";for(d in{success:1,error:1,complete:1})v[d](k[d]);if(i=Mc(Ic,k,b,v)){v.readyState=1,h&&n.trigger("ajaxSend",[v,k]),k.async&&k.timeout>0&&(g=setTimeout(function(){v.abort("timeout")},k.timeout));try{t=1,i.send(r,x)}catch(w){if(!(2>t))throw w;x(-1,w)}}else x(-1,"No Transport");function x(a,b,c,d){var j,r,s,u,w,x=b;2!==t&&(t=2,g&&clearTimeout(g),i=void 0,f=d||"",v.readyState=a>0?4:0,j=a>=200&&300>a||304===a,c&&(u=Oc(k,v,c)),u=Pc(k,u,v,j),j?(k.ifModified&&(w=v.getResponseHeader("Last-Modified"),w&&(m.lastModified[e]=w),w=v.getResponseHeader("etag"),w&&(m.etag[e]=w)),204===a||"HEAD"===k.type?x="nocontent":304===a?x="notmodified":(x=u.state,r=u.data,s=u.error,j=!s)):(s=x,(a||!x)&&(x="error",0>a&&(a=0))),v.status=a,v.statusText=(b||x)+"",j?o.resolveWith(l,[r,x,v]):o.rejectWith(l,[v,x,s]),v.statusCode(q),q=void 0,h&&n.trigger(j?"ajaxSuccess":"ajaxError",[v,k,j?r:s]),p.fireWith(l,[v,x]),h&&(n.trigger("ajaxComplete",[v,k]),--m.active||m.event.trigger("ajaxStop")))}return v},getJSON:function(a,b,c){return m.get(a,b,c,"json")},getScript:function(a,b){return m.get(a,void 0,b,"script")}}),m.each(["get","post"],function(a,b){m[b]=function(a,c,d,e){return m.isFunction(c)&&(e=e||d,d=c,c=void 0),m.ajax({url:a,type:b,dataType:e,data:c,success:d})}}),m.each(["ajaxStart","ajaxStop","ajaxComplete","ajaxError","ajaxSuccess","ajaxSend"],function(a,b){m.fn[b]=function(a){return this.on(b,a)}}),m._evalUrl=function(a){return m.ajax({url:a,type:"GET",dataType:"script",async:!1,global:!1,"throws":!0})},m.fn.extend({wrapAll:function(a){if(m.isFunction(a))return this.each(function(b){m(this).wrapAll(a.call(this,b))});if(this[0]){var b=m(a,this[0].ownerDocument).eq(0).clone(!0);this[0].parentNode&&b.insertBefore(this[0]),b.map(function(){var a=this;while(a.firstChild&&1===a.firstChild.nodeType)a=a.firstChild;return a}).append(this)}return this},wrapInner:function(a){return this.each(m.isFunction(a)?function(b){m(this).wrapInner(a.call(this,b))}:function(){var b=m(this),c=b.contents();c.length?c.wrapAll(a):b.append(a)})},wrap:function(a){var b=m.isFunction(a);return this.each(function(c){m(this).wrapAll(b?a.call(this,c):a)})},unwrap:function(){return this.parent().each(function(){m.nodeName(this,"body")||m(this).replaceWith(this.childNodes)}).end()}}),m.expr.filters.hidden=function(a){return a.offsetWidth<=0&&a.offsetHeight<=0||!k.reliableHiddenOffsets()&&"none"===(a.style&&a.style.display||m.css(a,"display"))},m.expr.filters.visible=function(a){return!m.expr.filters.hidden(a)};var Qc=/%20/g,Rc=/\[\]$/,Sc=/\r?\n/g,Tc=/^(?:submit|button|image|reset|file)$/i,Uc=/^(?:input|select|textarea|keygen)/i;function Vc(a,b,c,d){var e;if(m.isArray(b))m.each(b,function(b,e){c||Rc.test(a)?d(a,e):Vc(a+"["+("object"==typeof e?b:"")+"]",e,c,d)});else if(c||"object"!==m.type(b))d(a,b);else for(e in b)Vc(a+"["+e+"]",b[e],c,d)}m.param=function(a,b){var c,d=[],e=function(a,b){b=m.isFunction(b)?b():null==b?"":b,d[d.length]=encodeURIComponent(a)+"="+encodeURIComponent(b)};if(void 0===b&&(b=m.ajaxSettings&&m.ajaxSettings.traditional),m.isArray(a)||a.jquery&&!m.isPlainObject(a))m.each(a,function(){e(this.name,this.value)});else for(c in a)Vc(c,a[c],b,e);return d.join("&").replace(Qc,"+")},m.fn.extend({serialize:function(){return m.param(this.serializeArray())},serializeArray:function(){return this.map(function(){var a=m.prop(this,"elements");return a?m.makeArray(a):this}).filter(function(){var a=this.type;return this.name&&!m(this).is(":disabled")&&Uc.test(this.nodeName)&&!Tc.test(a)&&(this.checked||!W.test(a))}).map(function(a,b){var c=m(this).val();return null==c?null:m.isArray(c)?m.map(c,function(a){return{name:b.name,value:a.replace(Sc,"\r\n")}}):{name:b.name,value:c.replace(Sc,"\r\n")}}).get()}}),m.ajaxSettings.xhr=void 0!==a.ActiveXObject?function(){return!this.isLocal&&/^(get|post|head|put|delete|options)$/i.test(this.type)&&Zc()||$c()}:Zc;var Wc=0,Xc={},Yc=m.ajaxSettings.xhr();a.ActiveXObject&&m(a).on("unload",function(){for(var a in Xc)Xc[a](void 0,!0)}),k.cors=!!Yc&&"withCredentials"in Yc,Yc=k.ajax=!!Yc,Yc&&m.ajaxTransport(function(a){if(!a.crossDomain||k.cors){var b;return{send:function(c,d){var e,f=a.xhr(),g=++Wc;if(f.open(a.type,a.url,a.async,a.username,a.password),a.xhrFields)for(e in a.xhrFields)f[e]=a.xhrFields[e];a.mimeType&&f.overrideMimeType&&f.overrideMimeType(a.mimeType),a.crossDomain||c["X-Requested-With"]||(c["X-Requested-With"]="XMLHttpRequest");for(e in c)void 0!==c[e]&&f.setRequestHeader(e,c[e]+"");f.send(a.hasContent&&a.data||null),b=function(c,e){var h,i,j;if(b&&(e||4===f.readyState))if(delete Xc[g],b=void 0,f.onreadystatechange=m.noop,e)4!==f.readyState&&f.abort();else{j={},h=f.status,"string"==typeof f.responseText&&(j.text=f.responseText);try{i=f.statusText}catch(k){i=""}h||!a.isLocal||a.crossDomain?1223===h&&(h=204):h=j.text?200:404}j&&d(h,i,j,f.getAllResponseHeaders())},a.async?4===f.readyState?setTimeout(b):f.onreadystatechange=Xc[g]=b:b()},abort:function(){b&&b(void 0,!0)}}}});function Zc(){try{return new a.XMLHttpRequest}catch(b){}}function $c(){try{return new a.ActiveXObject("Microsoft.XMLHTTP")}catch(b){}}m.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/(?:java|ecma)script/},converters:{"text script":function(a){return m.globalEval(a),a}}}),m.ajaxPrefilter("script",function(a){void 0===a.cache&&(a.cache=!1),a.crossDomain&&(a.type="GET",a.global=!1)}),m.ajaxTransport("script",function(a){if(a.crossDomain){var b,c=y.head||m("head")[0]||y.documentElement;return{send:function(d,e){b=y.createElement("script"),b.async=!0,a.scriptCharset&&(b.charset=a.scriptCharset),b.src=a.url,b.onload=b.onreadystatechange=function(a,c){(c||!b.readyState||/loaded|complete/.test(b.readyState))&&(b.onload=b.onreadystatechange=null,b.parentNode&&b.parentNode.removeChild(b),b=null,c||e(200,"success"))},c.insertBefore(b,c.firstChild)},abort:function(){b&&b.onload(void 0,!0)}}}});var _c=[],ad=/(=)\?(?=&|$)|\?\?/;m.ajaxSetup({jsonp:"callback",jsonpCallback:function(){var a=_c.pop()||m.expando+"_"+vc++;return this[a]=!0,a}}),m.ajaxPrefilter("json jsonp",function(b,c,d){var e,f,g,h=b.jsonp!==!1&&(ad.test(b.url)?"url":"string"==typeof b.data&&!(b.contentType||"").indexOf("application/x-www-form-urlencoded")&&ad.test(b.data)&&"data");return h||"jsonp"===b.dataTypes[0]?(e=b.jsonpCallback=m.isFunction(b.jsonpCallback)?b.jsonpCallback():b.jsonpCallback,h?b[h]=b[h].replace(ad,"$1"+e):b.jsonp!==!1&&(b.url+=(wc.test(b.url)?"&":"?")+b.jsonp+"="+e),b.converters["script json"]=function(){return g||m.error(e+" was not called"),g[0]},b.dataTypes[0]="json",f=a[e],a[e]=function(){g=arguments},d.always(function(){a[e]=f,b[e]&&(b.jsonpCallback=c.jsonpCallback,_c.push(e)),g&&m.isFunction(f)&&f(g[0]),g=f=void 0}),"script"):void 0}),m.parseHTML=function(a,b,c){if(!a||"string"!=typeof a)return null;"boolean"==typeof b&&(c=b,b=!1),b=b||y;var d=u.exec(a),e=!c&&[];return d?[b.createElement(d[1])]:(d=m.buildFragment([a],b,e),e&&e.length&&m(e).remove(),m.merge([],d.childNodes))};var bd=m.fn.load;m.fn.load=function(a,b,c){if("string"!=typeof a&&bd)return bd.apply(this,arguments);var d,e,f,g=this,h=a.indexOf(" ");return h>=0&&(d=m.trim(a.slice(h,a.length)),a=a.slice(0,h)),m.isFunction(b)?(c=b,b=void 0):b&&"object"==typeof b&&(f="POST"),g.length>0&&m.ajax({url:a,type:f,dataType:"html",data:b}).done(function(a){e=arguments,g.html(d?m("<div>").append(m.parseHTML(a)).find(d):a)}).complete(c&&function(a,b){g.each(c,e||[a.responseText,b,a])}),this},m.expr.filters.animated=function(a){return m.grep(m.timers,function(b){return a===b.elem}).length};var cd=a.document.documentElement;function dd(a){return m.isWindow(a)?a:9===a.nodeType?a.defaultView||a.parentWindow:!1}m.offset={setOffset:function(a,b,c){var d,e,f,g,h,i,j,k=m.css(a,"position"),l=m(a),n={};"static"===k&&(a.style.position="relative"),h=l.offset(),f=m.css(a,"top"),i=m.css(a,"left"),j=("absolute"===k||"fixed"===k)&&m.inArray("auto",[f,i])>-1,j?(d=l.position(),g=d.top,e=d.left):(g=parseFloat(f)||0,e=parseFloat(i)||0),m.isFunction(b)&&(b=b.call(a,c,h)),null!=b.top&&(n.top=b.top-h.top+g),null!=b.left&&(n.left=b.left-h.left+e),"using"in b?b.using.call(a,n):l.css(n)}},m.fn.extend({offset:function(a){if(arguments.length)return void 0===a?this:this.each(function(b){m.offset.setOffset(this,a,b)});var b,c,d={top:0,left:0},e=this[0],f=e&&e.ownerDocument;if(f)return b=f.documentElement,m.contains(b,e)?(typeof e.getBoundingClientRect!==K&&(d=e.getBoundingClientRect()),c=dd(f),{top:d.top+(c.pageYOffset||b.scrollTop)-(b.clientTop||0),left:d.left+(c.pageXOffset||b.scrollLeft)-(b.clientLeft||0)}):d},position:function(){if(this[0]){var a,b,c={top:0,left:0},d=this[0];return"fixed"===m.css(d,"position")?b=d.getBoundingClientRect():(a=this.offsetParent(),b=this.offset(),m.nodeName(a[0],"html")||(c=a.offset()),c.top+=m.css(a[0],"borderTopWidth",!0),c.left+=m.css(a[0],"borderLeftWidth",!0)),{top:b.top-c.top-m.css(d,"marginTop",!0),left:b.left-c.left-m.css(d,"marginLeft",!0)}}},offsetParent:function(){return this.map(function(){var a=this.offsetParent||cd;while(a&&!m.nodeName(a,"html")&&"static"===m.css(a,"position"))a=a.offsetParent;return a||cd})}}),m.each({scrollLeft:"pageXOffset",scrollTop:"pageYOffset"},function(a,b){var c=/Y/.test(b);m.fn[a]=function(d){return V(this,function(a,d,e){var f=dd(a);return void 0===e?f?b in f?f[b]:f.document.documentElement[d]:a[d]:void(f?f.scrollTo(c?m(f).scrollLeft():e,c?e:m(f).scrollTop()):a[d]=e)},a,d,arguments.length,null)}}),m.each(["top","left"],function(a,b){m.cssHooks[b]=Lb(k.pixelPosition,function(a,c){return c?(c=Jb(a,b),Hb.test(c)?m(a).position()[b]+"px":c):void 0})}),m.each({Height:"height",Width:"width"},function(a,b){m.each({padding:"inner"+a,content:b,"":"outer"+a},function(c,d){m.fn[d]=function(d,e){var f=arguments.length&&(c||"boolean"!=typeof d),g=c||(d===!0||e===!0?"margin":"border");return V(this,function(b,c,d){var e;return m.isWindow(b)?b.document.documentElement["client"+a]:9===b.nodeType?(e=b.documentElement,Math.max(b.body["scroll"+a],e["scroll"+a],b.body["offset"+a],e["offset"+a],e["client"+a])):void 0===d?m.css(b,c,g):m.style(b,c,d,g)},b,f?d:void 0,f,null)}})}),m.fn.size=function(){return this.length},m.fn.andSelf=m.fn.addBack,"function"==typeof define&&define.amd&&define("jquery",[],function(){return m});var ed=a.jQuery,fd=a.$;return m.noConflict=function(b){return a.$===m&&(a.$=fd),b&&a.jQuery===m&&(a.jQuery=ed),m},typeof b===K&&(a.jQuery=a.$=m),m});
diff --git a/submodules/HockeySDK-iOS/Documentation/Themes/apple/templates/doc.mustache b/submodules/HockeySDK-iOS/Documentation/Themes/apple/templates/doc.mustache
deleted file mode 100755
index 140b59cf8b..0000000000
--- a/submodules/HockeySDK-iOS/Documentation/Themes/apple/templates/doc.mustache
+++ /dev/null
@@ -1,47 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-  <head>
-    <title>{{name}} {{kind}} Reference</title>
-    <link rel="stylesheet" type="text/css" href="{{path_to_root}}css/jazzy.css" />
-    <link rel="stylesheet" type="text/css" href="{{path_to_root}}css/highlight.css" />
-    <meta charset='utf-8'>
-    <script src="{{path_to_root}}js/jquery.min.js" defer></script>
-    <script src="{{path_to_root}}js/jazzy.js" defer></script>
-    {{{custom_head}}}
-  </head>
-  <body>
-    {{#dash_type}}
-    <a name="//apple_ref/{{language_stub}}/{{dash_type}}/{{name}}" class="dashAnchor"></a>
-    {{/dash_type}}
-    <a title="{{name}} {{kind}} Reference"></a>
-    {{> header}}
-    <div class="content-wrapper">
-      <p id="breadcrumbs">
-        <a href="{{path_to_root}}index.html">{{module_name}} Reference</a>
-        <img id="carat" src="{{path_to_root}}img/carat.png" />
-        {{name}} {{kind}} Reference
-      </p>
-    </div>
-    <div class="content-wrapper">
-      {{> nav}}
-      <article class="main-content">
-        <section>
-          <section class="section">
-            {{^hide_name}}<h1>{{name}}</h1>{{/hide_name}}
-            {{#declaration}}
-              <div class="declaration">
-                <div class="language">
-                  {{{declaration}}}
-                </div>
-              </div>
-            {{/declaration}}
-            {{{overview}}}
-          </section>
-          {{> tasks}}
-        </section>
-        {{> footer}}
-      </article>
-    </div>
-  </body>
-</div>
-</html>
diff --git a/submodules/HockeySDK-iOS/Documentation/Themes/apple/templates/footer.mustache b/submodules/HockeySDK-iOS/Documentation/Themes/apple/templates/footer.mustache
deleted file mode 100755
index b4ff3a2779..0000000000
--- a/submodules/HockeySDK-iOS/Documentation/Themes/apple/templates/footer.mustache
+++ /dev/null
@@ -1,4 +0,0 @@
-<section id="footer">
-  {{{copyright}}}
-  <p>Generated by <a class="link" href="https://github.com/realm/jazzy" target="_blank" rel="external">jazzy ♪♫ v{{jazzy_version}}</a>, a <a class="link" href="http://realm.io" target="_blank" rel="external">Realm</a> project.</p>
-</section>
diff --git a/submodules/HockeySDK-iOS/Documentation/Themes/apple/templates/header.mustache b/submodules/HockeySDK-iOS/Documentation/Themes/apple/templates/header.mustache
deleted file mode 100755
index 282cebfba9..0000000000
--- a/submodules/HockeySDK-iOS/Documentation/Themes/apple/templates/header.mustache
+++ /dev/null
@@ -1,11 +0,0 @@
-<header>
-  <div class="content-wrapper">
-    <p><a href="{{path_to_root}}index.html">{{module_name}} Docs</a>{{#doc_coverage}} ({{doc_coverage}}% documented){{/doc_coverage}}</p>
-    {{#github_url}}
-    <p class="header-right"><a href="{{github_url}}"><img src="{{path_to_root}}img/gh.png"/>View on GitHub</a></p>
-    {{/github_url}}
-    {{#dash_url}}
-    <p class="header-right"><a href="{{dash_url}}"><img src="{{path_to_root}}img/dash.png"/>Install in Dash</a></p>
-    {{/dash_url}}
-  </div>
-</header>
diff --git a/submodules/HockeySDK-iOS/Documentation/Themes/apple/templates/nav.mustache b/submodules/HockeySDK-iOS/Documentation/Themes/apple/templates/nav.mustache
deleted file mode 100755
index 9bd7eb2675..0000000000
--- a/submodules/HockeySDK-iOS/Documentation/Themes/apple/templates/nav.mustache
+++ /dev/null
@@ -1,16 +0,0 @@
-<nav class="sidebar">
-  <ul class="nav-groups">
-    {{#structure}}
-    <li class="nav-group-name">
-      <a href="{{path_to_root}}{{section}}.html">{{section}}</a>
-      <ul class="nav-group-tasks">
-        {{#children}}
-        <li class="nav-group-task">
-          <a href="{{path_to_root}}{{url}}">{{name}}</a>
-        </li>
-        {{/children}}
-      </ul>
-    </li>
-    {{/structure}}
-  </ul>
-</nav>
diff --git a/submodules/HockeySDK-iOS/Documentation/Themes/apple/templates/parameter.mustache b/submodules/HockeySDK-iOS/Documentation/Themes/apple/templates/parameter.mustache
deleted file mode 100755
index 6fa329d72e..0000000000
--- a/submodules/HockeySDK-iOS/Documentation/Themes/apple/templates/parameter.mustache
+++ /dev/null
@@ -1,12 +0,0 @@
-<tr>
-  <td>
-    <code>
-    <em>{{name}}</em>
-    </code>
-  </td>
-  <td>
-    <div>
-      {{{discussion}}}
-    </div>
-  </td>
-</tr>
diff --git a/submodules/HockeySDK-iOS/Documentation/Themes/apple/templates/task.mustache b/submodules/HockeySDK-iOS/Documentation/Themes/apple/templates/task.mustache
deleted file mode 100755
index 0dec828276..0000000000
--- a/submodules/HockeySDK-iOS/Documentation/Themes/apple/templates/task.mustache
+++ /dev/null
@@ -1,92 +0,0 @@
-<div class="task-group">
-  {{#name}}
-  <div class="task-name-container">
-    <a name="/{{uid}}"></a>
-    <a name="//apple_ref/{{language_stub}}/Section/{{name}}" class="dashAnchor"></a>
-    <a href="#/{{uid}}">
-      <h3 class="section-name">{{name}}</h3>
-    </a>
-  </div>
-  {{/name}}
-  <ul>
-    {{#items}}
-    <li class="item">
-      <div>
-        <code>
-        <a name="/{{usr}}"></a>
-        <a name="//apple_ref/{{language_stub}}/{{dash_type}}/{{name}}" class="dashAnchor"></a>
-        <a class="token" href="#/{{usr}}">{{name}}</a>
-        </code>
-        {{#default_impl_abstract}}
-          <span class="declaration-note">
-            Default implementation
-          </span>
-        {{/default_impl_abstract}}
-        {{#from_protocol_extension}}
-          <span class="declaration-note">
-            Extension method
-          </span>
-        {{/from_protocol_extension}}
-      </div>
-      <div class="height-container">
-        <div class="pointer-container"></div>
-        <section class="section">
-          <div class="pointer"></div>
-          {{#abstract}}
-          <div class="abstract">
-            {{{abstract}}}
-            {{#url}}
-            <a href="{{{path_to_root}}}{{{url}}}" class="slightly-smaller">See more</a>
-            {{/url}}
-          </div>
-          {{/abstract}}
-          {{#default_impl_abstract}}
-          <h4>Default Implementation</h4>
-          <div class="default_impl abstract">
-            {{{default_impl_abstract}}}
-          </div>
-          {{/default_impl_abstract}}
-          {{#declaration}}
-          <div class="declaration">
-            <h4>Declaration</h4>
-            <div class="language">
-              <p class="aside-title">{{language}}</p>
-              {{{declaration}}}
-            </div>
-            {{#other_language_declaration}}
-            <div class="language">
-              <p class="aside-title">Swift</p>
-              {{{other_language_declaration}}}
-            </div>
-            {{/other_language_declaration}}
-          </div>
-          {{/declaration}}
-          {{#parameters.count}}
-          <div>
-            <h4>Parameters</h4>
-            <table class="graybox">
-              <tbody>
-                {{#parameters}}
-                {{> parameter}}
-                {{/parameters}}
-              </tbody>
-            </table>
-          </div>
-          {{/parameters.count}}
-          {{#return}}
-          <div>
-            <h4>Return Value</h4>
-            {{{return}}}
-          </div>
-          {{/return}}
-          {{#github_token_url}}
-          <div class="slightly-smaller">
-            <a href="{{{github_token_url}}}">Show on GitHub</a>
-          </div>
-          {{/github_token_url}}
-        </section>
-      </div>
-    </li>
-    {{/items}}
-  </ul>
-</div>
diff --git a/submodules/HockeySDK-iOS/Documentation/Themes/apple/templates/tasks.mustache b/submodules/HockeySDK-iOS/Documentation/Themes/apple/templates/tasks.mustache
deleted file mode 100755
index f97bb437f3..0000000000
--- a/submodules/HockeySDK-iOS/Documentation/Themes/apple/templates/tasks.mustache
+++ /dev/null
@@ -1,7 +0,0 @@
-{{#tasks.count}}
-<section class="section task-group-section">
-  {{#tasks}}
-  {{> task}}
-  {{/tasks}}
-</section>
-{{/tasks.count}}
diff --git a/submodules/HockeySDK-iOS/HockeySDK-Source.podspec b/submodules/HockeySDK-iOS/HockeySDK-Source.podspec
deleted file mode 100644
index ae63f81b6c..0000000000
--- a/submodules/HockeySDK-iOS/HockeySDK-Source.podspec
+++ /dev/null
@@ -1,33 +0,0 @@
-Pod::Spec.new do |s|
-  s.name              = 'HockeySDK-Source'
-  s.version           = '5.1.2'
-
-  s.summary           = 'Collect live crash reports, get feedback from your users, distribute your betas, and analyze your test coverage with HockeyApp.'
-  s.description       = <<-DESC
-                        HockeyApp is a service to distribute beta apps, collect crash reports and
-                        communicate with your app's users.
-                        
-                        It improves the testing process dramatically and can be used for both beta
-                        and App Store builds.
-                        DESC
-
-  s.homepage          = 'http://hockeyapp.net/'
-  s.documentation_url = "http://hockeyapp.net/help/sdk/ios/#{s.version}/"
-
-  s.license           = 'MIT'
-  s.author            = { 'Microsoft' => 'support@hockeyapp.net' }
-  s.source            = { :git => 'https://github.com/bitstadium/HockeySDK-iOS.git', :tag => s.version.to_s }
-
-  s.platform          = :ios, '8.0'
-  s.source_files      = 'Classes'
-  s.requires_arc      = true
-  
-  s.frameworks              = 'CoreGraphics', 'CoreTelephony', 'CoreText', 'MobileCoreServices', 'Photos', 'QuartzCore', 'QuickLook', 'Security', 'SystemConfiguration', 'UIKit'
-  s.libraries = 'c++', 'z'
-  s.vendored_frameworks = 'Vendor/CrashReporter.framework'
-  s.pod_target_xcconfig     = {'GCC_PREPROCESSOR_DEFINITIONS' => %{$(inherited) BITHOCKEY_VERSION="@\\"#{s.version}\\"" BITHOCKEY_C_VERSION="\\"#{s.version}\\"" BITHOCKEY_BUILD="@\\"108\\"" BITHOCKEY_C_BUILD="\\"108\\""} }
-  s.resource_bundle         = { 'HockeySDKResources' => ['Resources/*.png', 'Resources/*.lproj'] }
-  s.preserve_paths          = 'Resources', 'Support'
-  s.private_header_files  = 'Classes/*Private.h'
-
-end
diff --git a/submodules/HockeySDK-iOS/HockeySDK.podspec b/submodules/HockeySDK-iOS/HockeySDK.podspec
deleted file mode 100644
index 99227a97f3..0000000000
--- a/submodules/HockeySDK-iOS/HockeySDK.podspec
+++ /dev/null
@@ -1,66 +0,0 @@
-Pod::Spec.new do |s|
-  s.name              = 'HockeySDK'
-  s.version           = '5.1.2'
-
-  s.summary           = 'Collect live crash reports, get feedback from your users, distribute your betas, and analyze your test coverage with HockeyApp.'
-  s.description       = <<-DESC
-                        HockeyApp is a service to distribute beta apps, collect crash reports and
-                        communicate with your app's users.
-                        
-                        It improves the testing process dramatically and can be used for both beta
-                        and App Store builds.
-                        DESC
-
-  s.homepage          = 'http://hockeyapp.net/'
-  s.documentation_url = "http://hockeyapp.net/help/sdk/ios/#{s.version}/"
-
-  s.license           = { :type => 'MIT', :file => 'HockeySDK-iOS/LICENSE' }
-  s.author            = { 'Microsoft' => 'support@hockeyapp.net' }
-
-  s.platform          = :ios, '8.0'
-  s.requires_arc      = true
-  
-  s.preserve_path = 'HockeySDK-iOS/README.md'
-
-  s.source = { :http => "https://github.com/bitstadium/HockeySDK-iOS/releases/download/#{s.version}/HockeySDK-iOS-#{s.version}.zip" }
-
-  s.frameworks = 'Foundation', 'Security', 'SystemConfiguration'
-  s.libraries = 'c++'
-
-  s.default_subspec   = 'DefaultLib'
-  
-  s.subspec 'CrashOnlyLib' do |ss|
-    ss.frameworks = 'UIKit'
-    ss.libraries = 'z'
-    ss.resource_bundle = { 'HockeySDKResources' => ['HockeySDK-iOS/HockeySDK.embeddedframework/HockeySDKResources.bundle/*.lproj'] }
-    ss.vendored_frameworks = 'HockeySDK-iOS/HockeySDKCrashOnly/HockeySDK.framework'
-  end
-
-  s.subspec 'CrashOnlyExtensionsLib' do |ss|
-    ss.vendored_frameworks = 'HockeySDK-iOS/HockeySDKCrashOnlyExtension/HockeySDK.framework'
-  end
-
-  s.subspec 'DefaultLib' do |ss|
-    ss.resource_bundle = { 'HockeySDKResources' => ['HockeySDK-iOS/HockeySDK.embeddedframework/HockeySDKResources.bundle/*.png', 'HockeySDK-iOS/HockeySDK.embeddedframework/HockeySDKResources.bundle/*.lproj'] }
-
-    ss.frameworks = 'CoreGraphics', 'CoreText', 'CoreTelephony', 'MobileCoreServices', 'QuartzCore', 'QuickLook', 'UIKit'
-    ss.libraries = 'z'
-    ss.vendored_frameworks = 'HockeySDK-iOS/HockeySDK.embeddedframework/HockeySDK.framework'
-  end
-
-  s.subspec 'AllFeaturesLib' do |ss|
-    ss.resource_bundle = { 'HockeySDKResources' => ['HockeySDK-iOS/HockeySDKAllFeatures/HockeySDK.embeddedframework/HockeySDKResources.bundle/*.png', 'HockeySDK-iOS/HockeySDKAllFeatures/HockeySDK.embeddedframework/HockeySDKResources.bundle/*.lproj'] }
-
-    ss.frameworks = 'CoreGraphics', 'CoreText', 'CoreTelephony', 'MobileCoreServices', 'Photos', 'QuartzCore', 'QuickLook', 'UIKit'
-    ss.libraries = 'z'
-    ss.vendored_frameworks = 'HockeySDK-iOS/HockeySDKAllFeatures/HockeySDK.embeddedframework/HockeySDK.framework'
-  end
-
-  s.subspec 'FeedbackOnlyLib' do |ss|
-    ss.resource_bundle = { 'HockeySDKResources' => ['HockeySDK-iOS/HockeySDKFeedbackOnly/HockeySDK.embeddedframework/HockeySDKResources.bundle/*.png', 'HockeySDK-iOS/HockeySDKFeedbackOnly/HockeySDK.embeddedframework/HockeySDKResources.bundle/*.lproj'] }
-
-    ss.frameworks = 'CoreGraphics', 'CoreText', 'CoreTelephony', 'MobileCoreServices', 'Photos', 'QuartzCore', 'QuickLook', 'UIKit'
-    ss.vendored_frameworks = 'HockeySDK-iOS/HockeySDKFeedbackOnly/HockeySDK.embeddedframework/HockeySDK.framework'
-  end
-
-end
diff --git a/submodules/HockeySDK-iOS/LICENSE b/submodules/HockeySDK-iOS/LICENSE
deleted file mode 100644
index 2d08500b42..0000000000
--- a/submodules/HockeySDK-iOS/LICENSE
+++ /dev/null
@@ -1,152 +0,0 @@
-## Licenses
-
-The Hockey SDK is provided under the following license:
-
-    The MIT License
-    Copyright (c) Microsoft Corporation.
-    All rights reserved.
-	
-    Permission is hereby granted, free of charge, to any person
-    obtaining a copy of this software and associated documentation
-    files (the "Software"), to deal in the Software without
-    restriction, including without limitation the rights to use,
-    copy, modify, merge, publish, distribute, sublicense, and/or sell
-    copies of the Software, and to permit persons to whom the
-    Software is furnished to do so, subject to the following
-    conditions:
-
-    The above copyright notice and this permission notice shall be
-    included in all copies or substantial portions of the Software.
-	
-    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-    EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
-    OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-    NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
-    HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-    WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-    FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-    OTHER DEALINGS IN THE SOFTWARE.
-
-Except as noted below, PLCrashReporter 
-is provided under the following license:
-
-    Copyright (c) 2008 - 2015 Plausible Labs Cooperative, Inc.
-    Copyright (c) 2012 - 2015 HockeyApp, Bit Stadium GmbH.
-    All rights reserved.
-
-    Permission is hereby granted, free of charge, to any person
-    obtaining a copy of this software and associated documentation
-    files (the "Software"), to deal in the Software without
-    restriction, including without limitation the rights to use,
-    copy, modify, merge, publish, distribute, sublicense, and/or sell
-    copies of the Software, and to permit persons to whom the
-    Software is furnished to do so, subject to the following
-    conditions:
-
-    The above copyright notice and this permission notice shall be
-    included in all copies or substantial portions of the Software.
-
-    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-    EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
-    OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-    NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
-    HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-    WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-    FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-    OTHER DEALINGS IN THE SOFTWARE.
-
-The protobuf-c library, as well as the PLCrashLogWriterEncoding.c
-file are licensed as follows:
-
-    Copyright 2008, Dave Benson.
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with
-    the License. You may obtain a copy of the License
-    at http://www.apache.org/licenses/LICENSE-2.0 Unless
-    required by applicable law or agreed to in writing,
-    software distributed under the License is distributed on
-    an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-    KIND, either express or implied. See the License for the
-    specific language governing permissions and limitations
-    under the License.
-
-TTTAttributedLabel is licensed as follows:
-
-    Copyright (c) 2011 Mattt Thompson (http://mattt.me/)
-    
-    Permission is hereby granted, free of charge, to any person
-    obtaining a copy of this software and associated documentation
-    files (the "Software"), to deal in the Software without
-    restriction, including without limitation the rights to use,
-    copy, modify, merge, publish, distribute, sublicense, and/or sell
-    copies of the Software, and to permit persons to whom the
-    Software is furnished to do so, subject to the following
-    conditions:
-
-    The above copyright notice and this permission notice shall be
-    included in all copies or substantial portions of the Software.
-
-    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-    EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
-    OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-    NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
-    HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-    WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-    FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-    OTHER DEALINGS IN THE SOFTWARE.
-
-SFHFKeychainUtils is licensed as follows:
-
-    Created by Buzz Andersen on 10/20/08.
-    Based partly on code by Jonathan Wight, Jon Crosby, and Mike Malone.
-    Copyright 2008 Sci-Fi Hi-Fi. All rights reserved.
-    
-    Permission is hereby granted, free of charge, to any person
-    obtaining a copy of this software and associated documentation
-    files (the "Software"), to deal in the Software without
-    restriction, including without limitation the rights to use,
-    copy, modify, merge, publish, distribute, sublicense, and/or sell
-    copies of the Software, and to permit persons to whom the
-    Software is furnished to do so, subject to the following
-    conditions:
-
-    The above copyright notice and this permission notice shall be
-    included in all copies or substantial portions of the Software.
-
-    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-    EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
-    OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-    NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
-    HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-    WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-    FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-    OTHER DEALINGS IN THE SOFTWARE.
-
-GZIP is licensed as follow:
-    
-    Created by Nick Lockwood on 03/06/2012.
-    Copyright (C) 2012 Charcoal Design
-    
-    Distributed under the permissive zlib License
-    Get the latest version from here:
-    
-    https://github.com/nicklockwood/GZIP
-    
-    This software is provided 'as-is', without any express or implied
-    warranty.  In no event will the authors be held liable for any damages
-    arising from the use of this software.
-    
-    Permission is granted to anyone to use this software for any purpose,
-    including commercial applications, and to alter it and redistribute it
-    freely, subject to the following restrictions:
-    
-    1. The origin of this software must not be misrepresented; you must not
-    claim that you wrote the original software. If you use this software
-    in a product, an acknowledgment in the product documentation would be
-    appreciated but is not required.
-    
-    2. Altered source versions must be plainly marked as such, and must not be
-    misrepresented as being the original software.
-    
-    3. This notice may not be removed or altered from any source distribution.
\ No newline at end of file
diff --git a/submodules/HockeySDK-iOS/README.md b/submodules/HockeySDK-iOS/README.md
deleted file mode 100644
index 82aeed89a9..0000000000
--- a/submodules/HockeySDK-iOS/README.md
+++ /dev/null
@@ -1,56 +0,0 @@
-[![Build Status](https://www.bitrise.io/app/30bf519f6bd0a5e2/status.svg?token=RKqHc7-ojjLiEFds53d-ZA&branch=master)](https://www.bitrise.io/app/30bf519f6bd0a5e2)
-[![Carthage compatible](https://img.shields.io/badge/Carthage-compatible-4BC51D.svg?style=flat)](https://github.com/Carthage/Carthage)
-[![Version](http://cocoapod-badges.herokuapp.com/v/HockeySDK/badge.png)](http://cocoadocs.org/docsets/HockeySDK)
-[![Slack Status](https://slack.hockeyapp.net/badge.svg)](https://slack.hockeyapp.net)
-
-## Version 5.1.2
-
-HockeySDK-iOS implements support for using HockeyApp in your iOS applications.
-
-The following features are currently supported:
-
-1. **Crash Reporting:** If your app crashes, a crash log with the same format as from the Apple Crash Reporter is written to the device's storage. If the user starts the app again, they are asked to submit the crash report to HockeyApp. This works for both beta and live apps, i.e., those submitted to the App Store.
-
-2. **User Metrics:** Understand user behavior to improve your app. Track usage through daily and monthly active users, monitor crash impacted users, as well as customer engagement through session count. You can now track **Custom Events** in your app, understand user actions and see the aggregates on the HockeyApp portal.
-
-3. **Update Ad-Hoc / Enterprise apps:** The app will check with HockeyApp if a new version for your Ad-Hoc or Enterprise build is available. If yes, it will show an alert view to the user and let them see the release notes, the version history and start the installation process right away. 
-
-4. **Update notification for app store:** The app will check if a new version for your app store release is available. If yes, it will show an alert view to the user and let them open your app in the App Store app. (Disabled by default!)
-
-5. **Feedback:** Collect feedback from your users from within your app and communicate directly with them using the HockeyApp backend.
-
-6. **Authenticate:** Identify and authenticate users of Ad-Hoc or Enterprise builds
-
-## 1. Setup
-
-It is super easy to use HockeyApp in your iOS app. Have a look at our [documentation](https://www.hockeyapp.net/help/sdk/ios/5.1.2/index.html) and onboard your app within minutes.
-
-## 2. Documentation
-
-Please visit [our landing page](https://www.hockeyapp.net/help/sdk/ios/5.1.2/index.html) as a starting point for all of our documentation.
-
-Please check out our [changelog](http://www.hockeyapp.net/help/sdk/ios/5.1.2/changelog.html), as well as our [troubleshooting section](https://www.hockeyapp.net/help/sdk/ios/5.1.2/installation--setup.html#troubleshooting).
-
-## 3. Contributing
-
-We're looking forward to your contributions via pull requests.
-
-### 3.1 Development environment
-
-* A Mac running the latest version of OS X.
-* Get the latest Xcode from the Mac App Store.
-* [Jazzy](https://github.com/realm/jazzy) to generate documentation.
-* [CocoaPods](https://cocoapods.org/) to test integration with CocoaPods.
-* [Carthage](https://github.com/Carthage/Carthage) to test integration with Carthage.
-
-### 3.2 Code of Conduct
-
-This project has adopted the [Microsoft Open Source Code of Conduct](https://opensource.microsoft.com/codeofconduct/). For more information see the [Code of Conduct FAQ](https://opensource.microsoft.com/codeofconduct/faq/) or contact [opencode@microsoft.com](mailto:opencode@microsoft.com) with any additional questions or comments.
-
-### 3.3 Contributor License
-
-You must sign a [Contributor License Agreement](https://cla.microsoft.com/) before submitting your pull request. To complete the Contributor License Agreement (CLA), you will need to submit a request via the [form](https://cla.microsoft.com/) and then electronically sign the CLA when you receive the email containing the link to the document. You need to sign the CLA only once to cover submission to any Microsoft OSS project. 
-
-## 4. Contact
-
-If you have further questions or are running into trouble that cannot be resolved by any of the steps [in our troubleshooting section](https://www.hockeyapp.net/help/sdk/ios/5.1.2/installation--setup.html#troubleshooting), feel free to open an issue here, contact us at [support@hockeyapp.net](mailto:support@hockeyapp.net) or join our [Slack](https://slack.hockeyapp.net).
diff --git a/submodules/HockeySDK-iOS/Resources/AppIconPlaceHolder.png b/submodules/HockeySDK-iOS/Resources/AppIconPlaceHolder.png
deleted file mode 100644
index 02831a38fd..0000000000
Binary files a/submodules/HockeySDK-iOS/Resources/AppIconPlaceHolder.png and /dev/null differ
diff --git a/submodules/HockeySDK-iOS/Resources/Arrow.png b/submodules/HockeySDK-iOS/Resources/Arrow.png
deleted file mode 100644
index 1510ffb26e..0000000000
Binary files a/submodules/HockeySDK-iOS/Resources/Arrow.png and /dev/null differ
diff --git a/submodules/HockeySDK-iOS/Resources/Arrow@2x.png b/submodules/HockeySDK-iOS/Resources/Arrow@2x.png
deleted file mode 100644
index 5621688fa3..0000000000
Binary files a/submodules/HockeySDK-iOS/Resources/Arrow@2x.png and /dev/null differ
diff --git a/submodules/HockeySDK-iOS/Resources/Arrow@3x.png b/submodules/HockeySDK-iOS/Resources/Arrow@3x.png
deleted file mode 100644
index 2ef52abae4..0000000000
Binary files a/submodules/HockeySDK-iOS/Resources/Arrow@3x.png and /dev/null differ
diff --git a/submodules/HockeySDK-iOS/Resources/Blur.png b/submodules/HockeySDK-iOS/Resources/Blur.png
deleted file mode 100644
index 835b74e10c..0000000000
Binary files a/submodules/HockeySDK-iOS/Resources/Blur.png and /dev/null differ
diff --git a/submodules/HockeySDK-iOS/Resources/Blur@2x.png b/submodules/HockeySDK-iOS/Resources/Blur@2x.png
deleted file mode 100644
index 91fcf36464..0000000000
Binary files a/submodules/HockeySDK-iOS/Resources/Blur@2x.png and /dev/null differ
diff --git a/submodules/HockeySDK-iOS/Resources/Blur@3x.png b/submodules/HockeySDK-iOS/Resources/Blur@3x.png
deleted file mode 100644
index ce25230585..0000000000
Binary files a/submodules/HockeySDK-iOS/Resources/Blur@3x.png and /dev/null differ
diff --git a/submodules/HockeySDK-iOS/Resources/Cancel.png b/submodules/HockeySDK-iOS/Resources/Cancel.png
deleted file mode 100644
index d71926b49f..0000000000
Binary files a/submodules/HockeySDK-iOS/Resources/Cancel.png and /dev/null differ
diff --git a/submodules/HockeySDK-iOS/Resources/Cancel@2x.png b/submodules/HockeySDK-iOS/Resources/Cancel@2x.png
deleted file mode 100644
index 79991bd922..0000000000
Binary files a/submodules/HockeySDK-iOS/Resources/Cancel@2x.png and /dev/null differ
diff --git a/submodules/HockeySDK-iOS/Resources/Cancel@3x.png b/submodules/HockeySDK-iOS/Resources/Cancel@3x.png
deleted file mode 100644
index 60f979c325..0000000000
Binary files a/submodules/HockeySDK-iOS/Resources/Cancel@3x.png and /dev/null differ
diff --git a/submodules/HockeySDK-iOS/Resources/FeedbackPlaceholder.png b/submodules/HockeySDK-iOS/Resources/FeedbackPlaceholder.png
deleted file mode 100644
index 4f09d36195..0000000000
Binary files a/submodules/HockeySDK-iOS/Resources/FeedbackPlaceholder.png and /dev/null differ
diff --git a/submodules/HockeySDK-iOS/Resources/HockeySDK-Info.plist b/submodules/HockeySDK-iOS/Resources/HockeySDK-Info.plist
deleted file mode 100644
index 72c47b256d..0000000000
--- a/submodules/HockeySDK-iOS/Resources/HockeySDK-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>English</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>BNDL</string>
-	<key>CFBundleShortVersionString</key>
-	<string>${VERSION_STRING}</string>
-	<key>CFBundleSignature</key>
-	<string>????</string>
-	<key>CFBundleVersion</key>
-	<string>${BUILD_NUMBER}</string>
-	<key>NSHumanReadableCopyright</key>
-	<string>Copyright © HockeyApp, Bit Stadium GmbH. All rights reserved.</string>
-</dict>
-</plist>
diff --git a/submodules/HockeySDK-iOS/Resources/IconGradient.png b/submodules/HockeySDK-iOS/Resources/IconGradient.png
deleted file mode 100644
index e7080b884d..0000000000
Binary files a/submodules/HockeySDK-iOS/Resources/IconGradient.png and /dev/null differ
diff --git a/submodules/HockeySDK-iOS/Resources/IconGradient@2x.png b/submodules/HockeySDK-iOS/Resources/IconGradient@2x.png
deleted file mode 100644
index 34f28049d4..0000000000
Binary files a/submodules/HockeySDK-iOS/Resources/IconGradient@2x.png and /dev/null differ
diff --git a/submodules/HockeySDK-iOS/Resources/Ok.png b/submodules/HockeySDK-iOS/Resources/Ok.png
deleted file mode 100644
index 4f657ee5c3..0000000000
Binary files a/submodules/HockeySDK-iOS/Resources/Ok.png and /dev/null differ
diff --git a/submodules/HockeySDK-iOS/Resources/Ok@2x.png b/submodules/HockeySDK-iOS/Resources/Ok@2x.png
deleted file mode 100644
index 64bb178d9c..0000000000
Binary files a/submodules/HockeySDK-iOS/Resources/Ok@2x.png and /dev/null differ
diff --git a/submodules/HockeySDK-iOS/Resources/Ok@3x.png b/submodules/HockeySDK-iOS/Resources/Ok@3x.png
deleted file mode 100644
index 042d3fd550..0000000000
Binary files a/submodules/HockeySDK-iOS/Resources/Ok@3x.png and /dev/null differ
diff --git a/submodules/HockeySDK-iOS/Resources/Rectangle.png b/submodules/HockeySDK-iOS/Resources/Rectangle.png
deleted file mode 100644
index af0b1ba948..0000000000
Binary files a/submodules/HockeySDK-iOS/Resources/Rectangle.png and /dev/null differ
diff --git a/submodules/HockeySDK-iOS/Resources/Rectangle@2x.png b/submodules/HockeySDK-iOS/Resources/Rectangle@2x.png
deleted file mode 100644
index 23819fd46e..0000000000
Binary files a/submodules/HockeySDK-iOS/Resources/Rectangle@2x.png and /dev/null differ
diff --git a/submodules/HockeySDK-iOS/Resources/Rectangle@3x.png b/submodules/HockeySDK-iOS/Resources/Rectangle@3x.png
deleted file mode 100644
index 65138ac4fb..0000000000
Binary files a/submodules/HockeySDK-iOS/Resources/Rectangle@3x.png and /dev/null differ
diff --git a/submodules/HockeySDK-iOS/Resources/authorize_denied.png b/submodules/HockeySDK-iOS/Resources/authorize_denied.png
deleted file mode 100644
index 4aed19ae14..0000000000
Binary files a/submodules/HockeySDK-iOS/Resources/authorize_denied.png and /dev/null differ
diff --git a/submodules/HockeySDK-iOS/Resources/authorize_denied@2x.png b/submodules/HockeySDK-iOS/Resources/authorize_denied@2x.png
deleted file mode 100644
index 1f5eed40ec..0000000000
Binary files a/submodules/HockeySDK-iOS/Resources/authorize_denied@2x.png and /dev/null differ
diff --git a/submodules/HockeySDK-iOS/Resources/authorize_denied@3x.png b/submodules/HockeySDK-iOS/Resources/authorize_denied@3x.png
deleted file mode 100644
index 7a09de9aa5..0000000000
Binary files a/submodules/HockeySDK-iOS/Resources/authorize_denied@3x.png and /dev/null differ
diff --git a/submodules/HockeySDK-iOS/Resources/bg.png b/submodules/HockeySDK-iOS/Resources/bg.png
deleted file mode 100644
index 2f9358611b..0000000000
Binary files a/submodules/HockeySDK-iOS/Resources/bg.png and /dev/null differ
diff --git a/submodules/HockeySDK-iOS/Resources/buttonRoundedDelete.png b/submodules/HockeySDK-iOS/Resources/buttonRoundedDelete.png
deleted file mode 100644
index 339bb51782..0000000000
Binary files a/submodules/HockeySDK-iOS/Resources/buttonRoundedDelete.png and /dev/null differ
diff --git a/submodules/HockeySDK-iOS/Resources/buttonRoundedDelete@2x.png b/submodules/HockeySDK-iOS/Resources/buttonRoundedDelete@2x.png
deleted file mode 100644
index 5bb10e0f58..0000000000
Binary files a/submodules/HockeySDK-iOS/Resources/buttonRoundedDelete@2x.png and /dev/null differ
diff --git a/submodules/HockeySDK-iOS/Resources/buttonRoundedDeleteHighlighted.png b/submodules/HockeySDK-iOS/Resources/buttonRoundedDeleteHighlighted.png
deleted file mode 100644
index 1994e7ad7e..0000000000
Binary files a/submodules/HockeySDK-iOS/Resources/buttonRoundedDeleteHighlighted.png and /dev/null differ
diff --git a/submodules/HockeySDK-iOS/Resources/buttonRoundedDeleteHighlighted@2x.png b/submodules/HockeySDK-iOS/Resources/buttonRoundedDeleteHighlighted@2x.png
deleted file mode 100644
index 8cb6b2ecb7..0000000000
Binary files a/submodules/HockeySDK-iOS/Resources/buttonRoundedDeleteHighlighted@2x.png and /dev/null differ
diff --git a/submodules/HockeySDK-iOS/Resources/buttonRoundedRegular.png b/submodules/HockeySDK-iOS/Resources/buttonRoundedRegular.png
deleted file mode 100644
index 680a7e4b10..0000000000
Binary files a/submodules/HockeySDK-iOS/Resources/buttonRoundedRegular.png and /dev/null differ
diff --git a/submodules/HockeySDK-iOS/Resources/buttonRoundedRegular@2x.png b/submodules/HockeySDK-iOS/Resources/buttonRoundedRegular@2x.png
deleted file mode 100644
index 4704643698..0000000000
Binary files a/submodules/HockeySDK-iOS/Resources/buttonRoundedRegular@2x.png and /dev/null differ
diff --git a/submodules/HockeySDK-iOS/Resources/buttonRoundedRegularHighlighted.png b/submodules/HockeySDK-iOS/Resources/buttonRoundedRegularHighlighted.png
deleted file mode 100644
index da667c4e8e..0000000000
Binary files a/submodules/HockeySDK-iOS/Resources/buttonRoundedRegularHighlighted.png and /dev/null differ
diff --git a/submodules/HockeySDK-iOS/Resources/buttonRoundedRegularHighlighted@2x.png b/submodules/HockeySDK-iOS/Resources/buttonRoundedRegularHighlighted@2x.png
deleted file mode 100644
index 47b937ffdd..0000000000
Binary files a/submodules/HockeySDK-iOS/Resources/buttonRoundedRegularHighlighted@2x.png and /dev/null differ
diff --git a/submodules/HockeySDK-iOS/Resources/de.lproj/HockeySDK.strings b/submodules/HockeySDK-iOS/Resources/de.lproj/HockeySDK.strings
deleted file mode 100644
index 800819a9ce..0000000000
--- a/submodules/HockeySDK-iOS/Resources/de.lproj/HockeySDK.strings
+++ /dev/null
@@ -1,279 +0,0 @@
-/*
- Localization provided by Wordcrafts
- The Mac OS X and iOS localization experts.
- http://www.wordcrafts.de
- */
-
-
-/* General */
-
-/* For dialogs yes buttons */
-"HockeyYes" = "Ja";
-
-/* For dialogs no buttons */
-"HockeyNo" = "Nein";
-
-/* For dialogs ok buttons */
-"HockeyOK" = "OK";
-
-/* Replacement for app name, if it could not be detected */
-"HockeyAppNamePlaceholder" = "Diese App";
-
-/* Crash */
-
-
-/* Crash dialog */
-
-/* Title showing in the alert box when crash report data has been found */
-"CrashDataFoundTitle" = "%@ wurde unerwartet beendet.";
-
-/* Description explaining that crash data has been found and ask the user if the data might be uploaded to the developers server */
-"CrashDataFoundAnonymousDescription" = "Möchten Sie einen Bericht mit anonymisierten Daten senden, sodass wir das Problem beheben können?";
-
-/* Description explaining that crash data has been found and ask the user if the non anonymous data might be uplaoded to the developers server */
-"CrashDataFoundDescription" = "Möchten Sie einen Bericht senden, sodass wir das Problem beheben können?";
-
-/* Alert box button if the users wants to send crash data always automatically */
-"CrashSendReportAlways" = "Immer senden";
-
-/* Alert box button to send the crash report once */
-"CrashSendReport" = "Bericht senden";
-
-/* Alert box button to decline sending the report */
-"CrashDontSendReport" = "Nicht senden";
-
-/* Text showing in a processing box that the crash data is being uploaded to the server */
-"CrashReportSending" = "Senden …";
-
-
-/* Update */
-
-
-/* Update Alert view */
-
-/* Update available */
-"UpdateAvailable" = "Update verfügbar";
-
-"UpdateAlertTextWithAppVersion" = "%@ ist verfügbar.";
-
-"UpdateAlertMandatoryTextWithAppVersion" = "%@ ist verfügbar. Dies ist ein verpflichtendes Update!";
-
-"UpdateIgnore" = "Ignorieren";
-
-"UpdateShow" = "Anzeigen";
-
-"UpdateInstall" = "Installieren";
-
-"UpdateRemindMe" = "Erinnerung";
-
-
-/* Update Details */
-
-"UpdateScreenTitle" = "Aktualisieren";
-
-"UpdateButtonCheck" = "PRÜFEN";
-
-"UpdateButtonSearching" = "PRÜFEN";
-
-"UpdateButtonUpdate" = "UPDATE";
-
-"UpdateButtonInstalling" = "INSTALLIEREN";
-
-"UpdateButtonOffline" = "OFFLINE";
-
-"UpdateInstalled" = "INSTALLIERT";
-
-"UpdateVersion" = "Version";
-
-"UpdateShowPreviousVersions" = "Vorherige Versionen anzeigen …";
-
-"UpdateNoUpdateAvailableTitle" = "Kein Update verfügbar";
-
-"UpdateNoUpdateAvailableMessage" = "%@ ist die derzeit aktuellste Version";
-
-"UpdateError" = "Fehler";
-
-"UpdateWarning" = "Achtung";
-
-"UpdateNoReleaseNotesAvailable" = "Keine Versionshinweise verfügbar.";
-
-
-/* Update Authorization  */
-
-"UpdateAuthorizationProgress" = "Autorisieren …";
-
-"UpdateAuthorizationOffline" = "Internetverbindung erforderlich.";
-
-"UpdateAuthorizationDenied" = "Autorisierung abgelehnt. Bitte wenden Sie sich an den Entwickler.";
-
-
-/* Update Expiry  */
-
-"UpdateExpired" = "%@ ist abgelaufen und kann nicht mehr verwendet werden.";
-
-
-/* Update Simulator Warning */
-
-"UpdateSimulatorMessage" = "Hockey Update funktioniert im Simulator nicht.\nDas URL-Schema „itms-services://” ist zwar implementiert, hat aber keine Funktion.";
-
-
-/* Feedback */
-
-
-/* New Message Alert */
-
-/* Alert Title */
-"HockeyFeedbackNewMessageTitle" = "Neue Feedback-Antwort";
-
-/* Alert Text */
-"HockeyFeedbackNewMessageText" = "Es liegt eine neue Antwort auf Ihr Feedback vor. Möchten Sie die Antwort lesen?";
-
-/* Alert Ignore Button */
-"HockeyFeedbackIgnore" = "Ignorieren";
-
-/* Alert Show Button */
-"HockeyFeedbackShow" = "Anzeigen";
-
-
-/* List View */
-
-/* Title */
-"HockeyFeedbackListTitle" = "Feedback";
-
-/* Last Updated */
-"HockeyFeedbackListLastUpdated" = "Letztes Update: %@";
-
-/* Never Updated */
-"HockeyFeedbackListNeverUpdated" = "Noch nie";
-
-/* Provide Feedback Button Title */
-"HockeyFeedbackListButtonWriteFeedback" = "Feedback senden";
-
-/* Add a Response Button Title */
-"HockeyFeedbackListButtonWriteResponse" = "Antworten";
-
-/* User Data Set Name Button Title */
-"HockeyFeedbackListButtonUserDataSetName" = "Namen eingeben";
-
-/* User Data Set Email Button Title */
-"HockeyFeedbackListButtonUserDataSetEmail" = "E-Mail-Adresse eingeben";
-
-/* User Data With Name Button Title */
-"HockeyFeedbackListButtonUserDataWithName" = "Name: %@";
-
-/* User Data With Email Button Title */
-"HockeyFeedbackListButtonUserDataWithEmail" = "E-Mail: %@";
-
-/* Button title for deleting all local messages*/
-"HockeyFeedbackListButtonDeleteAllMessages" = "Alle Mitteilungen löschen";
-
-/* Message pending to be send */
-"HockeyFeedbackListMessagePending" = "Versand ausstehend";
-
-
-/* Delete All Messages Action Sheet / Alert View */
-
-/* Title for the Action Sheet */
-"HockeyFeedbackListDeleteAllTitle" = "Diese Aktion löscht alle auf diesem Gerät befindlichen HockeyApp-Mitteilungen.";
-
-/* Button Title to perform delete action */
-"HockeyFeedbackListDeleteAllDelete" = "Löschen";
-
-/* Button Title to cancel delete action */
-"HockeyFeedbackListDeleteAllCancel" = "Abbrechen";
-
-
-/* Open Link In Safari Action Sheet / Alert View */
-
-/* Button Title to cancel */
-"HockeyFeedbackListLinkActionCancel" = "Abbrechen";
-
-/* Button Title to Open the Link */
-"HockeyFeedbackListLinkActionOpen" = "Öffnen";
-
-/* Button Title to Copy the Link */
-"HockeyFeedbackListLinkActionCopy" = "Kopieren";
-
-
-/* UIActivity */
-
-/* Activity Sharing Button Title, App Name will be inserted */
-"HockeyFeedbackActivityButtonTitle" = "Feedback zu %@";
-
-/* if there can no app name be found, use this instead for HockeyFeedbackActivityButtonTitle */
-"HockeyFeedbackActivityAppPlaceholder" = "App";
-
-
-/* Compose Message */
-
-/* Title */
-"HockeyFeedbackComposeTitle" = "Neues Feedback";
-
-/* Send button */
-"HockeyFeedbackComposeSend" = "Senden";
-
-/* Add Image button for attachment actions */
-"HockeyFeedbackComposeAttachmentAddImage" = "Bild hinzufügen";
-
-/* Edit button for attachment actions */
-"HockeyFeedbackComposeAttachmentEdit" = "Bild bearbeiten";
-
-/* Delete button for attachment actions */
-"HockeyFeedbackComposeAttachmentDelete" = "Bild löschen";
-
-/* Cancel button for attachment actions */
-"HockeyFeedbackComposeAttachmentCancel" = "Abbrechen";
-
-
-/* Set User Data */
-
-/* Title */
-"HockeyFeedbackUserDataTitle" = "Meine Infos";
-
-/* Description On What Should Be Entered */
-"HockeyFeedbackUserDataDescription" = "Bitte geben Sie vor Verfassen Ihres Feedbacks Ihre Daten ein.";
-
-/* Name Field */
-"HockeyFeedbackUserDataName" = "Name";
-
-/* Name Placeholder */
-"HockeyFeedbackUserDataNamePlaceHolder" = "Max Mustermann";
-
-/* Email Field */
-"HockeyFeedbackUserDataEmail" = "E-Mail";
-
-/* Email Placeholder */
-"HockeyFeedbackUserDataEmailPlaceholder" = "email@beispiel.de";
-
-
-/* Authenticator */
-
-/* View Controller Title*/
-"HockeyAuthenticatorViewControllerTitle" = "HockeyApp";
-
-/* BITAuthenticatorAuthTypeUDIDProvider */
-"HockeyAuthenticationViewControllerWebUDIDLoginDescription" = "Der Entwickler hat die UDID dieses Geräts angefordert. Unten tippen, um die HockeyApp Website zu öffnen und den Zugriff darauf zu erlauben.";
-"HockeyAuthenticationViewControllerWebLoginButtonTitle" = "HockeyApp öffnen";
-
-/* BITAuthenticatorIdentificationTypeWebAuth */
-"HockeyAuthenticationViewControllerWebAuthLoginDescription" = "Der Entwickler hat die die E-Mail-Adresse Ihres HockeyApp-Accounts angefordert. Unten tippen, um die HockeyApp Website zu öffnen und den Zugriff darauf zu erlauben.";
-
-/* BITAuthenticatorAuthTypeEmail and BITAuthenticatorAuthTypeEmailAndPassword */
-"HockeyAuthenticationViewControllerDataEmailAndPasswordDescription" = "Geben Sie die E-Mail-Adresse und das Kennwort Ihres HockeyApp-Accounts ein, um Zugriff auf diese App zu erhalten.";
-"HockeyAuthenticationViewControllerDataEmailDescription" = "Geben Sie die E-Mail-Adresse Ihres HockeyApp-Accounts ein, um Zugriff auf diese App zu erhalten.";
-"HockeyAuthenticationViewControllerEmailPlaceholder" = "email@beispiel.de";
-"HockeyAuthenticationViewControllerPasswordPlaceholder" = "Erforderlich";
-"HockeyAuthenticationViewControllerEmailDescription" = "E-Mail";
-"HockeyAuthenticationViewControllerPasswordDescription" = "Kennwort";
-
-/* Error presented to the user if authentication failed because of networking issues */
-"HockeyAuthenticationViewControllerNetworkError" = "Die Autorisierung ist fehlgeschlagen, da Ihr Gerät anscheinend nicht mit dem Internet verbunden ist. Bitte erneut versuchen.";
-
-"HockeyAuthenticationFailedAuthenticate" = "Autorisierung fehlgeschlagen. Bitte erneut versuchen oder an den Entwickler dieser App wenden.";
-"HockeyAuthenticationNotMember" = "Sie sind nicht berechtigt, diese App zu nutzen. Bitte wenden Sie sich an den Entwickler dieser App.";
-"HockeyAuthenticationContactDeveloper" = "Autorisierungsfehler. Bitte wenden Sie sich an den Entwickler dieser App.";
-"HockeyAuthenticationWrongEmailPassword" = "E-Mail-Adresse oder Kennwort sind nicht korrekt. Bitte Eingaben prüfen und erneut versuchen.";
-"HockeyAuthenticationAuthSecretMissing" = "Das HockeyApp „Authorization Secret“ wurde nicht hinterlegt. Bitte wenden Sie sich an den Entwickler dieser App.";
-
-/* Accessibility strings */
-"HockeyAccessibilityHintRequired" = "Erforderlich";
diff --git a/submodules/HockeySDK-iOS/Resources/en.lproj/HockeySDK.strings b/submodules/HockeySDK-iOS/Resources/en.lproj/HockeySDK.strings
deleted file mode 100644
index a5a9734935..0000000000
--- a/submodules/HockeySDK-iOS/Resources/en.lproj/HockeySDK.strings
+++ /dev/null
@@ -1,279 +0,0 @@
-/*
- Localization provided by Wordcrafts
- The Mac OS X and iOS localization experts.
- http://www.wordcrafts.de
- */
-
-
-/* General */
-
-/* For dialogs yes buttons */
-"HockeyYes" = "Yes";
-
-/* For dialogs no buttons */
-"HockeyNo" = "No";
-
-/* For dialogs ok buttons */
-"HockeyOK" = "OK";
-
-/* Replacement for app name, if it could not be detected */
-"HockeyAppNamePlaceholder" = "This app";
-
-/* Crash */
-
-
-/* Crash dialog */
-
-/* Title showing in the alert box when crash report data has been found */
-"CrashDataFoundTitle" = "%@ Unexpectedly Quit";
-
-/* Description explaining that crash data has been found and ask the user if the data might be uploaded to the developers server */
-"CrashDataFoundAnonymousDescription" = "Would you like to send an anonymous report so we can fix the problem?";
-
-/* Description explaining that crash data has been found and ask the user if the non anonymous data might be uplaoded to the developers server */
-"CrashDataFoundDescription" = "Would you like to send a report so we can fix the problem?";
-
-/* Alert box button if the users wants to send crash data always automatically */
-"CrashSendReportAlways" = "Always Send";
-
-/* Alert box button to send the crash report once */
-"CrashSendReport" = "Send Report";
-
-/* Alert box button to decline sending the report */
-"CrashDontSendReport" = "Don't Send";
-
-/* Text showing in a processing box that the crash data is being uploaded to the server */
-"CrashReportSending" = "Sending…";
-
-
-/* Update */
-
-
-/* Update Alert view */
-
-/* Update available */
-"UpdateAvailable" = "Update available";
-
-"UpdateAlertTextWithAppVersion" = "%@ is available.";
-
-"UpdateAlertMandatoryTextWithAppVersion" = "%@ is available and is a mandatory update!";
-
-"UpdateIgnore" = "Ignore";
-
-"UpdateShow" = "Show";
-
-"UpdateInstall" = "Install";
-
-"UpdateRemindMe" = "Remind me";
-
-
-/* Update Details */
-
-"UpdateScreenTitle" = "Update";
-
-"UpdateButtonCheck" = "CHECK";
-
-"UpdateButtonSearching" = "CHECKING";
-
-"UpdateButtonUpdate" = "UPDATE";
-
-"UpdateButtonInstalling" = "INSTALLING";
-
-"UpdateButtonOffline" = "OFFLINE";
-
-"UpdateInstalled" = "INSTALLED";
-
-"UpdateVersion" = "Version";
-
-"UpdateShowPreviousVersions" = "Show previous versions...";
-
-"UpdateNoUpdateAvailableTitle" = "No Update Available";
-
-"UpdateNoUpdateAvailableMessage" = "%@ is already the latest version.";
-
-"UpdateError" = "Error";
-
-"UpdateWarning" = "Warning";
-
-"UpdateNoReleaseNotesAvailable" = "No release notes available.";
-
-
-/* Update Authorization  */
-
-"UpdateAuthorizationProgress" = "Authorizing...";
-
-"UpdateAuthorizationOffline" = "Internet connection required!";
-
-"UpdateAuthorizationDenied" = "Authorizing denied. Please contact the developer.";
-
-
-/* Update Expiry  */
-
-"UpdateExpired" = "%@ is expired and can not be used any longer.";
-
-
-/* Update Simulator Warning */
-
-"UpdateSimulatorMessage" = "Hockey Update does not work in the Simulator.\nThe itms-services:// url scheme is implemented but nonfunctional.";
-
-
-/* Feedback */
-
-
-/* New Message Alert */
-
-/* Alert Title */
-"HockeyFeedbackNewMessageTitle" = "New Feedback Response";
-
-/* Alert Text */
-"HockeyFeedbackNewMessageText" = "A new response to your feedback is available. Would you like to view it?";
-
-/* Alert Ignore Button */
-"HockeyFeedbackIgnore" = "Ignore";
-
-/* Alert Show Button */
-"HockeyFeedbackShow" = "Show";
-
-
-/* List View */
-
-/* Title */
-"HockeyFeedbackListTitle" = "Feedback";
-
-/* Last Updated */
-"HockeyFeedbackListLastUpdated" = "Last Updated: %@";
-
-/* Never Updated */
-"HockeyFeedbackListNeverUpdated" = "Never";
-
-/* Provide Feedback Button Title */
-"HockeyFeedbackListButtonWriteFeedback" = "Provide Feedback";
-
-/* Add a Response Button Title */
-"HockeyFeedbackListButtonWriteResponse" = "Add a Response";
-
-/* User Data Set Name Button Title */
-"HockeyFeedbackListButtonUserDataSetName" = "Set Your Name";
-
-/* User Data Set Email Button Title */
-"HockeyFeedbackListButtonUserDataSetEmail" = "Set Your Email";
-
-/* User Data With Name Button Title */
-"HockeyFeedbackListButtonUserDataWithName" = "Name: %@";
-
-/* User Data With Email Button Title */
-"HockeyFeedbackListButtonUserDataWithEmail" = "Email: %@";
-
-/* Button title for deleting all local messages*/
-"HockeyFeedbackListButtonDeleteAllMessages" = "Delete All Messages";
-
-/* Message pending to be send */
-"HockeyFeedbackListMessagePending" = "Pending";
-
-
-/* Delete All Messages Action Sheet / Alert View */
-
-/* Title for the Action Sheet */
-"HockeyFeedbackListDeleteAllTitle" = "This will delete all messages on this device.";
-
-/* Button Title to perform delete action */
-"HockeyFeedbackListDeleteAllDelete" = "Delete";
-
-/* Button Title to cancel delete action */
-"HockeyFeedbackListDeleteAllCancel" = "Cancel";
-
-
-/* Open Link In Safari Action Sheet / Alert View */
-
-/* Button Title to cancel */
-"HockeyFeedbackListLinkActionCancel" = "Cancel";
-
-/* Button Title to Open the Link */
-"HockeyFeedbackListLinkActionOpen" = "Open";
-
-/* Button Title to Copy the Link */
-"HockeyFeedbackListLinkActionCopy" = "Copy";
-
-
-/* UIActivity */
-
-/* Activity Sharing Button Title, App Name will be inserted */
-"HockeyFeedbackActivityButtonTitle" = "%@ Feedback";
-
-/* if there can no app name be found, use this instead for HockeyFeedbackActivityButtonTitle */
-"HockeyFeedbackActivityAppPlaceholder" = "App";
-
-
-/* Compose Message */
-
-/* Title */
-"HockeyFeedbackComposeTitle" = "New Feedback";
-
-/* Send button */
-"HockeyFeedbackComposeSend" = "Send";
-
-/* Add Image button for attachment actions */
-"HockeyFeedbackComposeAttachmentAddImage" = "Add Image";
-
-/* Edit button for attachment actions */
-"HockeyFeedbackComposeAttachmentEdit" = "Edit Image";
-
-/* Delete button for attachment actions */
-"HockeyFeedbackComposeAttachmentDelete" = "Delete Image";
-
-/* Cancel button for attachment actions */
-"HockeyFeedbackComposeAttachmentCancel" = "Cancel";
-
-
-/* Set User Data */
-
-/* Title */
-"HockeyFeedbackUserDataTitle" = "My Info";
-
-/* Description On What Should Be Entered */
-"HockeyFeedbackUserDataDescription" = "Please provide your information before writing your feedback.";
-
-/* Name Field */
-"HockeyFeedbackUserDataName" = "Name";
-
-/* Name Placeholder */
-"HockeyFeedbackUserDataNamePlaceHolder" = "John Doe";
-
-/* Email Field */
-"HockeyFeedbackUserDataEmail" = "Email";
-
-/* Email Placeholder */
-"HockeyFeedbackUserDataEmailPlaceholder" = "email@example.com";
-
-
-/* Authenticator */
-
-/* View Controller Title*/
-"HockeyAuthenticatorViewControllerTitle" = "HockeyApp";
-
-/* BITAuthenticatorAuthTypeUDIDProvider */
-"HockeyAuthenticationViewControllerWebUDIDLoginDescription" = "The developer has requested this device's UDID. Tap below to open the HockeyApp website and authorize access.";
-"HockeyAuthenticationViewControllerWebLoginButtonTitle" = "Open HockeyApp";
-
-/* BITAuthenticatorIdentificationTypeWebAuth */
-"HockeyAuthenticationViewControllerWebAuthLoginDescription" = "The developer has requested your HockeyApp account's email address. Tap below to open the HockeyApp website and authorize access.";
-
-/* BITAuthenticatorAuthTypeEmail and BITAuthenticatorAuthTypeEmailAndPassword */
-"HockeyAuthenticationViewControllerDataEmailAndPasswordDescription" = "Please enter your HockeyApp account's email address and password to authorize access to this app.";
-"HockeyAuthenticationViewControllerDataEmailDescription" = "Please enter your HockeyApp account's email address to authorize access to this app.";
-"HockeyAuthenticationViewControllerEmailPlaceholder" = "email@example.com";
-"HockeyAuthenticationViewControllerPasswordPlaceholder" = "Required";
-"HockeyAuthenticationViewControllerEmailDescription" = "Email";
-"HockeyAuthenticationViewControllerPasswordDescription" = "Password";
-
-/* Error presented to the user if authentication failed because of networking issues */
-"HockeyAuthenticationViewControllerNetworkError" = "Failed to authorize because your device appears to be disconnected from the Internet. Please try again.";
-
-"HockeyAuthenticationFailedAuthenticate" = "Failed to authorize. Please try again or contact the developer of this app.";
-"HockeyAuthenticationNotMember" = "You are not authorized to use this app. Please contact the developer of this app.";
-"HockeyAuthenticationContactDeveloper" = "Authorization error. Please contact the developer of this app.";
-"HockeyAuthenticationWrongEmailPassword" = "You have entered an invalid email or password. Please check your input and try again.";
-"HockeyAuthenticationAuthSecretMissing" = "The HockeySDK authorization secret has not been set. Please contact the developer of this app.";
-
-/* Accessibility strings */
-"HockeyAccessibilityHintRequired" = "Required";
diff --git a/submodules/HockeySDK-iOS/Resources/es.lproj/HockeySDK.strings b/submodules/HockeySDK-iOS/Resources/es.lproj/HockeySDK.strings
deleted file mode 100644
index 254a778a71..0000000000
--- a/submodules/HockeySDK-iOS/Resources/es.lproj/HockeySDK.strings
+++ /dev/null
@@ -1,279 +0,0 @@
-/*
- Localization provided by Wordcrafts
- The Mac OS X and iOS localization experts.
- http://www.wordcrafts.de
- */
-
-
-/* General */
-
-/* For dialogs yes buttons */
-"HockeyYes" = "Sí";
-
-/* For dialogs no buttons */
-"HockeyNo" = "No enviar";
-
-/* For dialogs ok buttons */
-"HockeyOK" = "Aceptar";
-
-/* Replacement for app name, if it could not be detected */
-"HockeyAppNamePlaceholder" = "Esta aplicación";
-
-/* Crash */
-
-
-/* Crash dialog */
-
-/* Title showing in the alert box when crash report data has been found */
-"CrashDataFoundTitle" = "%@ se ha cerrado inesperadamente";
-
-/* Description explaining that crash data has been found and ask the user if the data might be uploaded to the developers server */
-"CrashDataFoundAnonymousDescription" = "¿Desea enviar un informe anónimo para ayudarnos a solucionar el problema?";
-
-/* Description explaining that crash data has been found and ask the user if the non anonymous data might be uplaoded to the developers server */
-"CrashDataFoundDescription" = "¿Desea enviar un informe para ayudarnos a solucionar el problema?";
-
-/* Alert box button if the users wants to send crash data always automatically */
-"CrashSendReportAlways" = "Enviarlo siempre";
-
-/* Alert box button to send the crash report once */
-"CrashSendReport" = "Enviar informe";
-
-/* Alert box button to decline sending the report */
-"CrashDontSendReport" = "No enviar";
-
-/* Text showing in a processing box that the crash data is being uploaded to the server */
-"CrashReportSending" = "Enviando…";
-
-
-/* Update */
-
-
-/* Update Alert view */
-
-/* Update available */
-"UpdateAvailable" = "Actualización disponible";
-
-"UpdateAlertTextWithAppVersion" = "%@ disponible.";
-
-"UpdateAlertMandatoryTextWithAppVersion" = "%@ está disponible, y es una actualización obligatoria.";
-
-"UpdateIgnore" = "Ignorar";
-
-"UpdateShow" = "Mostrar";
-
-"UpdateInstall" = "Instalar";
-
-"UpdateRemindMe" = "Recordar";
-
-
-/* Update Details */
-
-"UpdateScreenTitle" = "Actualización";
-
-"UpdateButtonCheck" = "COMPROBAR";
-
-"UpdateButtonSearching" = "COMPROBANDO";
-
-"UpdateButtonUpdate" = "ACTUALIZAR";
-
-"UpdateButtonInstalling" = "INSTALANDO";
-
-"UpdateButtonOffline" = "SIN CONEXIÓN";
-
-"UpdateInstalled" = "INSTALADO";
-
-"UpdateVersion" = "Versión";
-
-"UpdateShowPreviousVersions" = "Mostrar versiones anteriores...";
-
-"UpdateNoUpdateAvailableTitle" = "No hay actualizaciones disponibles";
-
-"UpdateNoUpdateAvailableMessage" = "%@ es la versión más reciente.";
-
-"UpdateError" = "Error";
-
-"UpdateWarning" = "Advertencia";
-
-"UpdateNoReleaseNotesAvailable" = "No hay notas para esta versión.";
-
-
-/* Update Authorization  */
-
-"UpdateAuthorizationProgress" = "Autorizando...";
-
-"UpdateAuthorizationOffline" = "Se requiere conexión a Internet.";
-
-"UpdateAuthorizationDenied" = "Se ha denegado la autorización. Contacte con el desarrollador.";
-
-
-/* Update Expiry  */
-
-"UpdateExpired" = "%@ ha caducado y ya no puede usarse.";
-
-
-/* Update Simulator Warning */
-
-"UpdateSimulatorMessage" = "Las actualizaciones de Hockey no funcionan en el Simulador.\nEl esquema URL itms-services:// está implementado pero no funciona.";
-
-
-/* Feedback */
-
-
-/* New Message Alert */
-
-/* Alert Title */
-"HockeyFeedbackNewMessageTitle" = "Nueva respuesta al mensaje";
-
-/* Alert Text */
-"HockeyFeedbackNewMessageText" = "Hay una nueva respuesta a su mensaje. ¿Desea verla?";
-
-/* Alert Ignore Button */
-"HockeyFeedbackIgnore" = "Ignorar";
-
-/* Alert Show Button */
-"HockeyFeedbackShow" = "Mostrar";
-
-
-/* List View */
-
-/* Title */
-"HockeyFeedbackListTitle" = "Mensajes";
-
-/* Last Updated */
-"HockeyFeedbackListLastUpdated" = "Última actualización: %@";
-
-/* Never Updated */
-"HockeyFeedbackListNeverUpdated" = "Nunca";
-
-/* Provide Feedback Button Title */
-"HockeyFeedbackListButtonWriteFeedback" = "Dejar un mensaje";
-
-/* Add a Response Button Title */
-"HockeyFeedbackListButtonWriteResponse" = "Añadir una respuesta";
-
-/* User Data Set Name Button Title */
-"HockeyFeedbackListButtonUserDataSetName" = "Introduzca su nombre";
-
-/* User Data Set Email Button Title */
-"HockeyFeedbackListButtonUserDataSetEmail" = "Introduzca su correo";
-
-/* User Data With Name Button Title */
-"HockeyFeedbackListButtonUserDataWithName" = "Nombre: %@";
-
-/* User Data With Email Button Title */
-"HockeyFeedbackListButtonUserDataWithEmail" = "Correo: %@";
-
-/* Button title for deleting all local messages*/
-"HockeyFeedbackListButtonDeleteAllMessages" = "Eliminar todos los mensajes";
-
-/* Message pending to be send */
-"HockeyFeedbackListMessagePending" = "Pendiente";
-
-
-/* Delete All Messages Action Sheet / Alert View */
-
-/* Title for the Action Sheet */
-"HockeyFeedbackListDeleteAllTitle" = "Se eliminarán todos los mensajes en este dispositivo.";
-
-/* Button Title to perform delete action */
-"HockeyFeedbackListDeleteAllDelete" = "Eliminar";
-
-/* Button Title to cancel delete action */
-"HockeyFeedbackListDeleteAllCancel" = "Cancelar";
-
-
-/* Open Link In Safari Action Sheet / Alert View */
-
-/* Button Title to cancel */
-"HockeyFeedbackListLinkActionCancel" = "Cancelar";
-
-/* Button Title to Open the Link */
-"HockeyFeedbackListLinkActionOpen" = "Abrir";
-
-/* Button Title to Copy the Link */
-"HockeyFeedbackListLinkActionCopy" = "Copiar";
-
-
-/* UIActivity */
-
-/* Activity Sharing Button Title, App Name will be inserted */
-"HockeyFeedbackActivityButtonTitle" = "Comentar %@";
-
-/* if there can no app name be found, use this instead for HockeyFeedbackActivityButtonTitle */
-"HockeyFeedbackActivityAppPlaceholder" = "Aplicación";
-
-
-/* Compose Message */
-
-/* Title */
-"HockeyFeedbackComposeTitle" = "Nuevo mensaje";
-
-/* Send button */
-"HockeyFeedbackComposeSend" = "Enviar";
-
-/* Add Image button for attachment actions */
-"HockeyFeedbackComposeAttachmentAddImage" = "Añadir imagen";
-
-/* Edit button for attachment actions */
-"HockeyFeedbackComposeAttachmentEdit" = "Editar imagen";
-
-/* Delete button for attachment actions */
-"HockeyFeedbackComposeAttachmentDelete" = "Eliminar imagen";
-
-/* Cancel button for attachment actions */
-"HockeyFeedbackComposeAttachmentCancel" = "Cancelar";
-
-
-/* Set User Data */
-
-/* Title */
-"HockeyFeedbackUserDataTitle" = "Mis datos";
-
-/* Description On What Should Be Entered */
-"HockeyFeedbackUserDataDescription" = "Indique sus datos antes de escribir el mensaje.";
-
-/* Name Field */
-"HockeyFeedbackUserDataName" = "Nombre";
-
-/* Name Placeholder */
-"HockeyFeedbackUserDataNamePlaceHolder" = "Juan García";
-
-/* Email Field */
-"HockeyFeedbackUserDataEmail" = "Correo";
-
-/* Email Placeholder */
-"HockeyFeedbackUserDataEmailPlaceholder" = "correo@ejemplo.com";
-
-
-/* Authenticator */
-
-/* View Controller Title*/
-"HockeyAuthenticatorViewControllerTitle" = "HockeyApp";
-
-/* BITAuthenticatorAuthTypeUDIDProvider */
-"HockeyAuthenticationViewControllerWebUDIDLoginDescription" = "El desarrollador ha solicitado el UDID de este dispositivo. Toque a continuación para abrir la web de HockeyApp y autorizar el acceso.";
-"HockeyAuthenticationViewControllerWebLoginButtonTitle" = "Abrir HockeyApp";
-
-/* BITAuthenticatorIdentificationTypeWebAuth */
-"HockeyAuthenticationViewControllerWebAuthLoginDescription" = "El desarrollador ha solicitado el correo de su cuenta de HockeyApp. Toque a continuación para abrir la web de HockeyApp y autorizar el acceso.";
-
-/* BITAuthenticatorAuthTypeEmail and BITAuthenticatorAuthTypeEmailAndPassword */
-"HockeyAuthenticationViewControllerDataEmailAndPasswordDescription" = "Escriba el correo y contraseña de su cuenta de HockeyApp para autorizar el acceso a esta app.";
-"HockeyAuthenticationViewControllerDataEmailDescription" = "Escriba el correo de su cuenta de HockeyApp para autorizar el acceso a esta app.";
-"HockeyAuthenticationViewControllerEmailPlaceholder" = "correo@ejemplo.com";
-"HockeyAuthenticationViewControllerPasswordPlaceholder" = "Obligatorio";
-"HockeyAuthenticationViewControllerEmailDescription" = "Correo";
-"HockeyAuthenticationViewControllerPasswordDescription" = "Contraseña";
-
-/* Error presented to the user if authentication failed because of networking issues */
-"HockeyAuthenticationViewControllerNetworkError" = "No se ha podido realizar la autorización porque su dispositivo parece no estar conectado a Internet. Vuelva a intentarlo.";
-
-"HockeyAuthenticationFailedAuthenticate" = "Error de autorización. Vuelva a intentarlo o póngase en contacto con el desarrollador de la app.";
-"HockeyAuthenticationNotMember" = "No tiene autorización para usar esta app. Póngase en contacto con el desarrollador de la app.";
-"HockeyAuthenticationContactDeveloper" = "Error de autorización. Póngase en contacto con el desarrollador de la app.";
-"HockeyAuthenticationWrongEmailPassword" = "Ha escrito un correo o contraseña incorrectos. Compruébelos y vuelva a intentarlo.";
-"HockeyAuthenticationAuthSecretMissing" = "El “authorization secret” de HockeySDK no está definido. Póngase en contacto con el desarrollador de la app.";
-
-/* Accessibility strings */
-"HockeyAccessibilityHintRequired" = "Obligatorio";
diff --git a/submodules/HockeySDK-iOS/Resources/fa.lproj/HockeySDK.strings b/submodules/HockeySDK-iOS/Resources/fa.lproj/HockeySDK.strings
deleted file mode 100644
index db92f58e4b..0000000000
--- a/submodules/HockeySDK-iOS/Resources/fa.lproj/HockeySDK.strings
+++ /dev/null
@@ -1,279 +0,0 @@
-/*
- Localization provided by MasihTak under MIT license
- The Mac OS X and iOS localization experts.
- https://masihtak.com
- */
-
-
-/* General */
-
-/* For dialogs yes buttons */
-"HockeyYes" = "بله";
-
-/* For dialogs no buttons */
-"HockeyNo" = "خیر";
-
-/* For dialogs ok buttons */
-"HockeyOK" = "قبول";
-
-/* Replacement for app name, if it could not be detected */
-"HockeyAppNamePlaceholder" = "این برنامه";
-
-/* Crash */
-
-
-/* Crash dialog */
-
-/* Title showing in the alert box when crash report data has been found */
-+"CrashDataFoundTitle" = "%@ ترک غیر منتظره";
-
-/* Description explaining that crash data has been found and ask the user if the data might be uploaded to the developers server */
-"CrashDataFoundAnonymousDescription" = "آیا می خواهید یک گزارش ناشناس ارسال کنید بنابراین ما میتوانیم مشکل را حل بکنم؟";
-
-/* Description explaining that crash data has been found and ask the user if the non anonymous data might be uplaoded to the developers server */
-"CrashDataFoundDescription" = "آیا می خواهید یک گزارش به ما ارسال کنید بنابراین ما میتوانیم مشکل را حل بکنیم؟";
-
-/* Alert box button if the users wants to send crash data always automatically */
-"CrashSendReportAlways" = "همیشه ارسال کن";
-
-/* Alert box button to send the crash report once */
-"CrashSendReport" = "ارسال گزارش";
-
-/* Alert box button to decline sending the report */
-"CrashDontSendReport" = "ارسال نکن";
-
-/* Text showing in a processing box that the crash data is being uploaded to the server */
-"CrashReportSending" = "... درحال ارسال";
-
-
-/* Update */
-
-
-/* Update Alert view */
-
-/* Update available */
-"UpdateAvailable" = "به روز رسانی در دسترس است";
-
-"UpdateAlertTextWithAppVersion" = "%@ در دسترس است.";
-
-"UpdateAlertMandatoryTextWithAppVersion" = "%@ در دسترس است و یک به روز رسانی الزامی است!";
-
-"UpdateIgnore" = "نادیده گرفتن";
-
-"UpdateShow" = "نمایش";
-
-"UpdateInstall" = "نصب";
-
-"UpdateRemindMe" = "به من یادآوری کن";
-
-
-/* Update Details */
-
-"UpdateScreenTitle" = "به روز رسانی";
-
-"UpdateButtonCheck" = "بررسی";
-
-"UpdateButtonSearching" = "درحال بررسی";
-
-"UpdateButtonUpdate" = "به روز رسانی";
-
-"UpdateButtonInstalling" = "درحال نصب";
-
-"UpdateButtonOffline" = "آفلاین";
-
-"UpdateInstalled" = "نصب شده";
-
-"UpdateVersion" = "نسخه";
-
-"UpdateShowPreviousVersions" = "... نمایش نسخه های قبلی";
-
-"UpdateNoUpdateAvailableTitle" = "هیچ به روز رسانی در دسترس نیست";
-
-"UpdateNoUpdateAvailableMessage" = "%@ در حال حاضر آخرین نسخه است.";
-
-"UpdateError" = "خطا";
-
-"UpdateWarning" = "هشدار";
-
-"UpdateNoReleaseNotesAvailable" = "هیچ یادداشتی برای این انتشار موجود نیست.";
-
-
-/* Update Authorization  */
-
-"UpdateAuthorizationProgress" = "... درحال گرفتن اجازه";
-
-"UpdateAuthorizationOffline" = "اتصال به اینترنت مورد نیاز است!";
-
-"UpdateAuthorizationDenied" = "اجازه داده نشد. لطفا با توسعه دهنده تماس بگیرید.";
-
-
-/* Update Expiry  */
-
-"UpdateExpired" = "%@ منقضی شده است و دیگر نمی تواند اسفاده شود.";
-
-
-/* Update Simulator Warning */
-
-"UpdateSimulatorMessage" = "به روز رسانی Hockey در شبیه ساز کار نمی کند.\nموارد خدمات:// url طرح اجرا شده اما غیر کاربردی است.";
-
-
-/* Feedback */
-
-
-/* New Message Alert */
-
-/* Alert Title */
-"HockeyFeedbackNewMessageTitle" = "پاسخ جدید بازخورد";
-
-/* Alert Text */
-"HockeyFeedbackNewMessageText" = "یک پاسخ جدید برای بازخورد شما موجود است. آیا می خواهید آن را مشاهده کنید؟";
-
-/* Alert Ignore Button */
-"HockeyFeedbackIgnore" = "نادیده گرفتن";
-
-/* Alert Show Button */
-"HockeyFeedbackShow" = "نمایش";
-
-
-/* List View */
-
-/* Title */
-"HockeyFeedbackListTitle" = "بازخورد";
-
-/* Last Updated */
-"HockeyFeedbackListLastUpdated" = "آخرین به روز رسانی: %@";
-
-/* Never Updated */
-"HockeyFeedbackListNeverUpdated" = "هرگز";
-
-/* Provide Feedback Button Title */
-"HockeyFeedbackListButtonWriteFeedback" = "ارائه بازخورد";
-
-/* Add a Response Button Title */
-"HockeyFeedbackListButtonWriteResponse" = "اضافه کردن پاسخ";
-
-/* User Data Set Name Button Title */
-"HockeyFeedbackListButtonUserDataSetName" = "نام خود را وارد کنید";
-
-/* User Data Set Email Button Title */
-"HockeyFeedbackListButtonUserDataSetEmail" = "آدرس پست الکترونیکی خود را وارد کنید";
-
-/* User Data With Name Button Title */
-"HockeyFeedbackListButtonUserDataWithName" = "نام: %@";
-
-/* User Data With Email Button Title */
-"HockeyFeedbackListButtonUserDataWithEmail" = "پست الکترونیک: %@";
-
-/* Button title for deleting all local messages*/
-"HockeyFeedbackListButtonDeleteAllMessages" = "حذف تمام پیام ها";
-
-/* Message pending to be send */
-"HockeyFeedbackListMessagePending" = "در انتظار";
-
-
-/* Delete All Messages Action Sheet / Alert View */
-
-/* Title for the Action Sheet */
-"HockeyFeedbackListDeleteAllTitle" = "این تمام پیام ها را در این دستگاه پاک می کند.";
-
-/* Button Title to perform delete action */
-"HockeyFeedbackListDeleteAllDelete" = "حذف";
-
-/* Button Title to cancel delete action */
-"HockeyFeedbackListDeleteAllCancel" = "انصراف";
-
-
-/* Open Link In Safari Action Sheet / Alert View */
-
-/* Button Title to cancel */
-"HockeyFeedbackListLinkActionCancel" = "انصراف";
-
-/* Button Title to Open the Link */
-"HockeyFeedbackListLinkActionOpen" = "باز کردن";
-
-/* Button Title to Copy the Link */
-"HockeyFeedbackListLinkActionCopy" = "کپی";
-
-
-/* UIActivity */
-
-/* Activity Sharing Button Title, App Name will be inserted */
-"HockeyFeedbackActivityButtonTitle" = "%@ بازخورد";
-
-/* if there can no app name be found, use this instead for HockeyFeedbackActivityButtonTitle */
-"HockeyFeedbackActivityAppPlaceholder" = "برنامه";
-
-
-/* Compose Message */
-
-/* Title */
-"HockeyFeedbackComposeTitle" = "بازخورد جدید";
-
-/* Send button */
-"HockeyFeedbackComposeSend" = "ارسال";
-
-/* Add Image button for attachment actions */
-"HockeyFeedbackComposeAttachmentAddImage" = "اضافه کردن تصویر";
-
-/* Edit button for attachment actions */
-"HockeyFeedbackComposeAttachmentEdit" = "ویرایش تصویر";
-
-/* Delete button for attachment actions */
-"HockeyFeedbackComposeAttachmentDelete" = "حذف تصویر";
-
-/* Cancel button for attachment actions */
-"HockeyFeedbackComposeAttachmentCancel" = "انصراف";
-
-
-/* Set User Data */
-
-/* Title */
-"HockeyFeedbackUserDataTitle" = "اطلاعات من";
-
-/* Description On What Should Be Entered */
-"HockeyFeedbackUserDataDescription" = "لطفا قبل از نوشتن بازخورد اطلاعات خود را ارائه دهید.";
-
-/* Name Field */
-"HockeyFeedbackUserDataName" = "نام";
-
-/* Name Placeholder */
-"HockeyFeedbackUserDataNamePlaceHolder" = "Masih Abjadi";
-
-/* Email Field */
-"HockeyFeedbackUserDataEmail" = "پست الکترونیک";
-
-/* Email Placeholder */
-"HockeyFeedbackUserDataEmailPlaceholder" = "email@example.com";
-
-
-/* Authenticator */
-
-/* View Controller Title*/
-"HockeyAuthenticatorViewControllerTitle" = "HockeyApp";
-
-/* BITAuthenticatorAuthTypeUDIDProvider */
-"HockeyAuthenticationViewControllerWebUDIDLoginDescription" = "توسعه دهنده UDID این دستگاه را درخواست کرده است.برای باز کردن وب سایت HockeyApp و گرفتن اجازه دسترسی در پایین ضربه بزنید.";
-"HockeyAuthenticationViewControllerWebLoginButtonTitle" = "باز کردن HockeyApp";
-
-/* BITAuthenticatorIdentificationTypeWebAuth */
-"HockeyAuthenticationViewControllerWebAuthLoginDescription" = "توسعه دهنده آدرس پست الکترونیکی حساب HockeyApp شما را درخواست کرده است. برای باز کردن وب سایت HockeyApp و گرفتن اجازه دسترسی در پایین ضربه بزنید.";
-
-/* BITAuthenticatorAuthTypeEmail and BITAuthenticatorAuthTypeEmailAndPassword */
-"HockeyAuthenticationViewControllerDataEmailAndPasswordDescription" = "برای اجازه دسترسی به این برنامه لطفا آدرس  پست الکترونیکی و رمز عبور حساب HockeyApp خود را وارد کنید.";
-"HockeyAuthenticationViewControllerDataEmailDescription" = "برای اجازه دسترسی به این برنامه لطفا آدرس  پست الکترونیکی حساب HockeyApp خود را وارد کنید.";
-"HockeyAuthenticationViewControllerEmailPlaceholder" = "email@example.com";
-"HockeyAuthenticationViewControllerPasswordPlaceholder" = "مورد نیاز";
-"HockeyAuthenticationViewControllerEmailDescription" = "پست الکترونیک";
-"HockeyAuthenticationViewControllerPasswordDescription" = "رمز عبور";
-
-/* Error presented to the user if authentication failed because of networking issues */
-"HockeyAuthenticationViewControllerNetworkError" = "اجازه داده نشد چون به نظر می رسد دستگاه شما از اینترنت قطع شده است. لطفا دوباره امتحان کنید.";
-
-"HockeyAuthenticationFailedAuthenticate" = "تأیید نشد. لطفا دوباره امتحان کنید و یا با توسعه دهنده این برنامه تماس بگیرید.";
-"HockeyAuthenticationNotMember" = "شما مجاز به استفاده از این برنامه نیستید. لطفا با توسعه دهنده این برنامه تماس بگیرید.";
-"HockeyAuthenticationContactDeveloper" = "خطای مجوز. لطفا با توسعه دهنده این برنامه تماس بگیرید.";
-"HockeyAuthenticationWrongEmailPassword" = "شما یک پست الکترونیک و یا رمز عبور نامعتبر وارد کرده اید. لطفا ورودی های خود را بررسی و دوباره امتحان کنید.";
-"HockeyAuthenticationAuthSecretMissing" = "مجوز مخفی HockeySDK تنظیم نشده است. لطفا با توسعه دهنده این برنامه تماس بگیرید.";
-
-/* Accessibility strings */
-"HockeyAccessibilityHintRequired" = "مورد نیاز";
diff --git a/submodules/HockeySDK-iOS/Resources/feedbackActivity.png b/submodules/HockeySDK-iOS/Resources/feedbackActivity.png
deleted file mode 100644
index bdbef48949..0000000000
Binary files a/submodules/HockeySDK-iOS/Resources/feedbackActivity.png and /dev/null differ
diff --git a/submodules/HockeySDK-iOS/Resources/feedbackActivity@2x.png b/submodules/HockeySDK-iOS/Resources/feedbackActivity@2x.png
deleted file mode 100644
index 26a308da61..0000000000
Binary files a/submodules/HockeySDK-iOS/Resources/feedbackActivity@2x.png and /dev/null differ
diff --git a/submodules/HockeySDK-iOS/Resources/feedbackActivity@2x~ipad.png b/submodules/HockeySDK-iOS/Resources/feedbackActivity@2x~ipad.png
deleted file mode 100644
index c010e96a7c..0000000000
Binary files a/submodules/HockeySDK-iOS/Resources/feedbackActivity@2x~ipad.png and /dev/null differ
diff --git a/submodules/HockeySDK-iOS/Resources/feedbackActivity@3x.png b/submodules/HockeySDK-iOS/Resources/feedbackActivity@3x.png
deleted file mode 100644
index 7e44a4d76a..0000000000
Binary files a/submodules/HockeySDK-iOS/Resources/feedbackActivity@3x.png and /dev/null differ
diff --git a/submodules/HockeySDK-iOS/Resources/feedbackActivity~ipad.png b/submodules/HockeySDK-iOS/Resources/feedbackActivity~ipad.png
deleted file mode 100644
index 96cf7ca0c5..0000000000
Binary files a/submodules/HockeySDK-iOS/Resources/feedbackActivity~ipad.png and /dev/null differ
diff --git a/submodules/HockeySDK-iOS/Resources/fr.lproj/HockeySDK.strings b/submodules/HockeySDK-iOS/Resources/fr.lproj/HockeySDK.strings
deleted file mode 100644
index d6fbf03160..0000000000
--- a/submodules/HockeySDK-iOS/Resources/fr.lproj/HockeySDK.strings
+++ /dev/null
@@ -1,279 +0,0 @@
-/*
- Localization provided by Wordcrafts
- The Mac OS X and iOS localization experts.
- http://www.wordcrafts.de
- */
-
-
-/* General */
-
-/* For dialogs yes buttons */
-"HockeyYes" = "Oui";
-
-/* For dialogs no buttons */
-"HockeyNo" = "Non";
-
-/* For dialogs ok buttons */
-"HockeyOK" = "OK";
-
-/* Replacement for app name, if it could not be detected */
-"HockeyAppNamePlaceholder" = "Cette application";
-
-/* Crash */
-
-
-/* Crash dialog */
-
-/* Title showing in the alert box when crash report data has been found */
-"CrashDataFoundTitle" = "%@ a quitté inopinément.";
-
-/* Description explaining that crash data has been found and ask the user if the data might be uploaded to the developers server */
-"CrashDataFoundAnonymousDescription" = "Voulez-vous envoyer un rapport anonyme pour nous aider à corriger le problème ?";
-
-/* Description explaining that crash data has been found and ask the user if the non anonymous data might be uplaoded to the developers server */
-"CrashDataFoundDescription" = "Voulez-vous envoyer un rapport pour nous aider à corriger le problème ?";
-
-/* Alert box button if the users wants to send crash data always automatically */
-"CrashSendReportAlways" = "Toujours envoyer";
-
-/* Alert box button to send the crash report once */
-"CrashSendReport" = "Envoyer";
-
-/* Alert box button to decline sending the report */
-"CrashDontSendReport" = "Ne pas envoyer";
-
-/* Text showing in a processing box that the crash data is being uploaded to the server */
-"CrashReportSending" = "Envoi…";
-
-
-/* Update */
-
-
-/* Update Alert view */
-
-/* Update available */
-"UpdateAvailable" = "Mise à jour disponible";
-
-"UpdateAlertTextWithAppVersion" = "%@ est disponible.";
-
-"UpdateAlertMandatoryTextWithAppVersion" = "%@ est disponible. Cette mise à jour est obligatoire !";
-
-"UpdateIgnore" = "Ignorer";
-
-"UpdateShow" = "Afficher";
-
-"UpdateInstall" = "Installer";
-
-"UpdateRemindMe" = "M'avertir";
-
-
-/* Update Details */
-
-"UpdateScreenTitle" = "Mise à jour";
-
-"UpdateButtonCheck" = "RECHERCHER";
-
-"UpdateButtonSearching" = "RECHERCHE";
-
-"UpdateButtonUpdate" = "METTRE À JOUR";
-
-"UpdateButtonInstalling" = "INSTALLATION";
-
-"UpdateButtonOffline" = "HORS LIGNE";
-
-"UpdateInstalled" = "INSTALLÉ";
-
-"UpdateVersion" = "Version";
-
-"UpdateShowPreviousVersions" = "Afficher les versions précédentes…";
-
-"UpdateNoUpdateAvailableTitle" = "Aucune mise à jour disponible";
-
-"UpdateNoUpdateAvailableMessage" = "%@ est la dernière version.";
-
-"UpdateError" = "Erreur";
-
-"UpdateWarning" = "Avertissement";
-
-"UpdateNoReleaseNotesAvailable" = "Aucune note de version.";
-
-
-/* Update Authorization  */
-
-"UpdateAuthorizationProgress" = "Autorisation…";
-
-"UpdateAuthorizationOffline" = "Connexion Internet requise !";
-
-"UpdateAuthorizationDenied" = "Autorisation refusée. Contactez le développeur.";
-
-
-/* Update Expiry  */
-
-"UpdateExpired" = "%@ a expiré et n'est plus utilisable.";
-
-
-/* Update Simulator Warning */
-
-"UpdateSimulatorMessage" = "Le service de mise à jour Hockey ne fonctionne pas dans le simulateur.\nLe modèle d'URL itms-services:// est implémenté mais n'est pas encore opérationnel.";
-
-
-/* Feedback */
-
-
-/* New Message Alert */
-
-/* Alert Title */
-"HockeyFeedbackNewMessageTitle" = "Nouvelle réponse au commentaire";
-
-/* Alert Text */
-"HockeyFeedbackNewMessageText" = "Une nouvelle réponse à votre commentaire est disponible. Voulez-vous la consulter ?";
-
-/* Alert Ignore Button */
-"HockeyFeedbackIgnore" = "Ignorer";
-
-/* Alert Show Button */
-"HockeyFeedbackShow" = "Afficher";
-
-
-/* List View */
-
-/* Title */
-"HockeyFeedbackListTitle" = "Commentaires";
-
-/* Last Updated */
-"HockeyFeedbackListLastUpdated" = "Dernière mise à jour : %@";
-
-/* Never Updated */
-"HockeyFeedbackListNeverUpdated" = "Jamais";
-
-/* Provide Feedback Button Title */
-"HockeyFeedbackListButtonWriteFeedback" = "Émettre un commentaire";
-
-/* Add a Response Button Title */
-"HockeyFeedbackListButtonWriteResponse" = "Répondre";
-
-/* User Data Set Name Button Title */
-"HockeyFeedbackListButtonUserDataSetName" = "Spécifier votre nom";
-
-/* User Data Set Email Button Title */
-"HockeyFeedbackListButtonUserDataSetEmail" = "Spécifier votre adresse";
-
-/* User Data With Name Button Title */
-"HockeyFeedbackListButtonUserDataWithName" = "Nom : %@";
-
-/* User Data With Email Button Title */
-"HockeyFeedbackListButtonUserDataWithEmail" = "Adresse : %@";
-
-/* Button title for deleting all local messages*/
-"HockeyFeedbackListButtonDeleteAllMessages" = "Supprimer les messages";
-
-/* Message pending to be send */
-"HockeyFeedbackListMessagePending" = "En attente";
-
-
-/* Delete All Messages Action Sheet / Alert View */
-
-/* Title for the Action Sheet */
-"HockeyFeedbackListDeleteAllTitle" = "Ceci supprime tous les messages présents sur l'appareil.";
-
-/* Button Title to perform delete action */
-"HockeyFeedbackListDeleteAllDelete" = "Supprimer";
-
-/* Button Title to cancel delete action */
-"HockeyFeedbackListDeleteAllCancel" = "Annuler";
-
-
-/* Open Link In Safari Action Sheet / Alert View */
-
-/* Button Title to cancel */
-"HockeyFeedbackListLinkActionCancel" = "Annuler";
-
-/* Button Title to Open the Link */
-"HockeyFeedbackListLinkActionOpen" = "Ouvrir";
-
-/* Button Title to Copy the Link */
-"HockeyFeedbackListLinkActionCopy" = "Copier";
-
-
-/* UIActivity */
-
-/* Activity Sharing Button Title, App Name will be inserted */
-"HockeyFeedbackActivityButtonTitle" = "Commentaire sur %@";
-
-/* if there can no app name be found, use this instead for HockeyFeedbackActivityButtonTitle */
-"HockeyFeedbackActivityAppPlaceholder" = "Application";
-
-
-/* Compose Message */
-
-/* Title */
-"HockeyFeedbackComposeTitle" = "Commentaire";
-
-/* Send button */
-"HockeyFeedbackComposeSend" = "Envoyer";
-
-/* Add Image button for attachment actions */
-"HockeyFeedbackComposeAttachmentAddImage" = "Ajouter une image";
-
-/* Edit button for attachment actions */
-"HockeyFeedbackComposeAttachmentEdit" = "Modifier l’image";
-
-/* Delete button for attachment actions */
-"HockeyFeedbackComposeAttachmentDelete" = "Supprimer l’image";
-
-/* Cancel button for attachment actions */
-"HockeyFeedbackComposeAttachmentCancel" = "Annuler";
-
-
-/* Set User Data */
-
-/* Title */
-"HockeyFeedbackUserDataTitle" = "Mes infos";
-
-/* Description On What Should Be Entered */
-"HockeyFeedbackUserDataDescription" = "Merci de fournir vos informations avant de rédiger votre commentaire.";
-
-/* Name Field */
-"HockeyFeedbackUserDataName" = "Nom";
-
-/* Name Placeholder */
-"HockeyFeedbackUserDataNamePlaceHolder" = "Jean Dubois";
-
-/* Email Field */
-"HockeyFeedbackUserDataEmail" = "Adresse";
-
-/* Email Placeholder */
-"HockeyFeedbackUserDataEmailPlaceholder" = "email@exemple.com";
-
-
-/* Authenticator */
-
-/* View Controller Title*/
-"HockeyAuthenticatorViewControllerTitle" = "HockeyApp";
-
-/* BITAuthenticatorAuthTypeUDIDProvider */
-"HockeyAuthenticationViewControllerWebUDIDLoginDescription" = "Le développeur a demandé l'identifiant unique de l'appareil. Touchez ci-dessous pour accéder au site Web de HockeyApp et autoriser l'accès.";
-"HockeyAuthenticationViewControllerWebLoginButtonTitle" = "Ouvrir HockeyApp";
-
-/* BITAuthenticatorIdentificationTypeWebAuth */
-"HockeyAuthenticationViewControllerWebAuthLoginDescription" = "Le développeur a demandé l'adresse électronique de votre compte HockeyApp. Touchez ci-dessous pour accéder au site Web de HockeyApp et autoriser l'accès.";
-
-/* BITAuthenticatorAuthTypeEmail and BITAuthenticatorAuthTypeEmailAndPassword */
-"HockeyAuthenticationViewControllerDataEmailAndPasswordDescription" = "Saisissez l'adresse électronique et le mot de passe de votre compte HockeyApp pour autoriser l'accès à cette application.";
-"HockeyAuthenticationViewControllerDataEmailDescription" = "Saisissez l'adresse électronique de votre compte HockeyApp pour autoriser l'accès à cette application.";
-"HockeyAuthenticationViewControllerEmailPlaceholder" = "email@exemple.com";
-"HockeyAuthenticationViewControllerPasswordPlaceholder" = "Requis";
-"HockeyAuthenticationViewControllerEmailDescription" = "Adresse";
-"HockeyAuthenticationViewControllerPasswordDescription" = "Mot de passe";
-
-/* Error presented to the user if authentication failed because of networking issues */
-"HockeyAuthenticationViewControllerNetworkError" = "Échec de l'autorisation. Votre appareil semble déconnecté d'Internet. Réessayez.";
-
-"HockeyAuthenticationFailedAuthenticate" = "Échec de l'autorisation. Réessayez ou contactez le développeur de l'application.";
-"HockeyAuthenticationNotMember" = "Vous n'êtes pas autorisé à utiliser cette application. Contactez le développeur de l'application.";
-"HockeyAuthenticationContactDeveloper" = "Erreur d'autorisation. Contactez le développeur de l'application.";
-"HockeyAuthenticationWrongEmailPassword" = "L'adresse électronique ou le mot de passe sont incorrects. Vérifiez votre saisie et réessayez.";
-"HockeyAuthenticationAuthSecretMissing" = "« HockeySDK authorization secret » non défini. Contactez le développeur de l'application.";
-
-/* Accessibility strings */
-"HockeyAccessibilityHintRequired" = "Requis";
diff --git a/submodules/HockeySDK-iOS/Resources/hr.lproj/HockeySDK.strings b/submodules/HockeySDK-iOS/Resources/hr.lproj/HockeySDK.strings
deleted file mode 100644
index 5c57d1bd6c..0000000000
--- a/submodules/HockeySDK-iOS/Resources/hr.lproj/HockeySDK.strings
+++ /dev/null
@@ -1,280 +0,0 @@
-/*
- Localization provided by Wordcrafts
- The Mac OS X and iOS localization experts.
- http://www.wordcrafts.de
- */
-
-
-/* General */
-
-/* For dialogs yes buttons */
-"HockeyYes" = "Da";
-
-/* For dialogs no buttons */
-"HockeyNo" = "Ne";
-
-/* For dialogs ok buttons */
-"HockeyOK" = "U redu";
-
-/* Replacement for app name, if it could not be detected */
-"HockeyAppNamePlaceholder" = "Ova aplikacija";
-
-/* Crash */
-
-
-/* Crash dialog */
-
-/* Title showing in the alert box when crash report data has been found */
-"CrashDataFoundTitle" = "%@ Neočekivani Završetak";
-
-/* Description explaining that crash data has been found and ask the user if the data might be uploaded to the developers server */
-"CrashDataFoundAnonymousDescription" = "Želite li poslati anonimno izviješće da možemo riješiti problem?";
-
-/* Description explaining that crash data has been found and ask the user if the non anonymous data might be uplaoded to the developers server */
-"CrashDataFoundDescription" = "Želite li poslati izviješće da možemo riješiti problem?";
-
-/* Alert box button if the users wants to send crash data always automatically */
-"CrashSendReportAlways" = "Uvijek Šalji";
-
-/* Alert box button to send the crash report once */
-"CrashSendReport" = "Pošalji Izvijeće";
-
-/* Alert box button to decline sending the report */
-"CrashDontSendReport" = "Ne Šalji";
-
-/* Text showing in a processing box that the crash data is being uploaded to the server */
-"CrashReportSending" = "Slanje…";
-
-
-/* Update */
-
-
-/* Update Alert view */
-
-/* Update available */
-"UpdateAvailable" = "Ažuriranje je dostupno";
-
-"UpdateAlertTextWithAppVersion" = "%@ je dostupna.";
-
-"UpdateAlertMandatoryTextWithAppVersion" = "%@ je dostupna i obavezno je ažuriranje!";
-
-"UpdateIgnore" = "Zanemari";
-
-"UpdateShow" = "Prikaz";
-
-"UpdateInstall" = "Instaliraj";
-
-"UpdateRemindMe" = "Podsjeti me";
-
-
-/* Update Details */
-
-"UpdateScreenTitle" = "Ažuriranje";
-
-"UpdateButtonCheck" = "PROVJERA";
-
-"UpdateButtonSearching" = "PROVJERA";
-
-"UpdateButtonUpdate" = "AŽURIRANJE";
-
-"UpdateButtonInstalling" = "INSTALIRANJE";
-
-"UpdateButtonOffline" = "VAN MREŽE";
-
-"UpdateInstalled" = "INSTALIRANO";
-
-"UpdateVersion" = "Verzija";
-
-"UpdateShowPreviousVersions" = "Prikaz prethodnih verzija...";
-
-"UpdateNoUpdateAvailableTitle" = "Ažuriranja nisu dostupna";
-
-"UpdateNoUpdateAvailableMessage" = "%@ je već najnovija verzija.";
-
-"UpdateError" = "Greška";
-
-"UpdateWarning" = "Upozorenje";
-
-"UpdateNoReleaseNotesAvailable" = "Nisu dostupne bilješke izdanja.";
-
-
-/* Update Authorization  */
-
-"UpdateAuthorizationProgress" = "Autorizacija...";
-
-"UpdateAuthorizationOffline" = "Potrebna je internetska veza!";
-
-"UpdateAuthorizationDenied" = "Autorizacija je odbijena. Molimo obratite se razvojnom programeru.";
-
-
-/* Update Expiry  */
-
-"UpdateExpired" = "%@ je isteklo i ne može se više koristiti.";
-
-
-/* Update Simulator Warning */
-
-"UpdateSimulatorMessage" = "Hockey ažuriranje ne radi u Simulatoru.\nThe itms-services:// url scheme is implemented but nonfunctional.";
-
-
-/* Feedback */
-
-
-/* New Message Alert */
-
-/* Alert Title */
-"HockeyFeedbackNewMessageTitle" = "Novi Odgovor na Povratnu Informaciju";
-
-/* Alert Text */
-"HockeyFeedbackNewMessageText" = "Dostupan je novi odgovor na Vašu povratnu informaciju. Želite li ga pogledati?";
-
-/* Alert Ignore Button */
-"HockeyFeedbackIgnore" = "Zanemari";
-
-/* Alert Show Button */
-"HockeyFeedbackShow" = "Prikaži";
-
-
-/* List View */
-
-/* Title */
-"HockeyFeedbackListTitle" = "Povratna Informacija";
-
-/* Last Updated */
-"HockeyFeedbackListLastUpdated" = "Zadnje Ažuriranje: %@";
-
-/* Never Updated */
-"HockeyFeedbackListNeverUpdated" = "Nikada";
-
-/* Provide Feedback Button Title */
-"HockeyFeedbackListButtonWriteFeedback" = "Osigurajte Povratnu Informaciju";
-
-/* Add a Response Button Title */
-"HockeyFeedbackListButtonWriteResponse" = "Dodaj Odgovor";
-
-/* User Data Set Name Button Title */
-"HockeyFeedbackListButtonUserDataSetName" = "Postavite Vaše Ime";
-
-/* User Data Set Email Button Title */
-"HockeyFeedbackListButtonUserDataSetEmail" = "Postavite Vaš E-mail";
-
-/* User Data With Name Button Title */
-"HockeyFeedbackListButtonUserDataWithName" = "Ime: %@";
-
-/* User Data With Email Button Title */
-"HockeyFeedbackListButtonUserDataWithEmail" = "E-mail:  %@";
-
-/* Button title for deleting all local messages*/
-"HockeyFeedbackListButtonDeleteAllMessages" = "Obriši Sve Poruke";
-
-/* Message pending to be send */
-"HockeyFeedbackListMessagePending" = "Čekanje";
-
-
-/* Delete All Messages Action Sheet / Alert View */
-
-/* Title for the Action Sheet */
-"HockeyFeedbackListDeleteAllTitle" = "Ovo će obrisati sve poruke na ovom uređaju.";
-
-/* Button Title to perform delete action */
-"HockeyFeedbackListDeleteAllDelete" = "Obriši";
-
-/* Button Title to cancel delete action */
-"HockeyFeedbackListDeleteAllCancel" = "Prekid";
-
-
-/* Open Link In Safari Action Sheet / Alert View */
-
-/* Button Title to cancel */
-"HockeyFeedbackListLinkActionCancel" = "Prekid";
-
-/* Button Title to Open the Link */
-"HockeyFeedbackListLinkActionOpen" = "Otvori";
-
-/* Button Title to Copy the Link */
-"HockeyFeedbackListLinkActionCopy" = "Kopiraj";
-
-
-/* UIActivity */
-
-/* Activity Sharing Button Title, App Name will be inserted */
-"HockeyFeedbackActivityButtonTitle" = "%@ Povratna Informacija";
-
-/* if there can no app name be found, use this instead for HockeyFeedbackActivityButtonTitle */
-"HockeyFeedbackActivityAppPlaceholder" = "Aplikacija";
-
-
-/* Compose Message */
-
-/* Title */
-"HockeyFeedbackComposeTitle" = "Nova Povratna Informacija";
-
-/* Send button */
-"HockeyFeedbackComposeSend" = "Šalji";
-
-/* Add Image button for attachment actions */
-"HockeyFeedbackComposeAttachmentAddImage" = "Add Image";
-
-/* Edit button for attachment actions */
-"HockeyFeedbackComposeAttachmentEdit" = "Edit Image";
-
-/* Delete button for attachment actions */
-"HockeyFeedbackComposeAttachmentDelete" = "Delete Image";
-
-/* Cancel button for attachment actions */
-"HockeyFeedbackComposeAttachmentCancel" = "Prekid";
-
-
-/* Set User Data */
-
-/* Title */
-"HockeyFeedbackUserDataTitle" = "Moj Info";
-
-/* Description On What Should Be Entered */
-"HockeyFeedbackUserDataDescription" = "Prije pisanja povratne informacije navedite svoje podatke.";
-
-/* Name Field */
-"HockeyFeedbackUserDataName" = "Ime";
-
-/* Name Placeholder */
-"HockeyFeedbackUserDataNamePlaceHolder" = "Ivan Horvat";
-
-/* Email Field */
-"HockeyFeedbackUserDataEmail" = "E-mail";
-
-/* Email Placeholder */
-"HockeyFeedbackUserDataEmailPlaceholder" = "email@primjer.com";
-
-
-/* Authenticator */
-
-/* View Controller Title*/
-"HockeyAuthenticatorViewControllerTitle" = "HockeyApp";
-
-/* BITAuthenticatorAuthTypeUDIDProvider */
-"HockeyAuthenticationViewControllerWebUDIDLoginDescription" = "Razvojni programer je zatražio UDID Vašeg uređaja. Dodirnite ispod kako biste otvorili HockeyApp web stranicu i autorizirali pristup.";
-"HockeyAuthenticationViewControllerWebLoginButtonTitle" = "Otvori HockeyApp";
-
-/* BITAuthenticatorIdentificationTypeWebAuth */
-"HockeyAuthenticationViewControllerWebAuthLoginDescription" = "Razvojni programer je zatražio e-mail adresu Vašeg HockeyApp računa. Dodirnite ispod kako biste otvorili HockeyApp web stranicu i autorizirali pristup.";
-
-/* BITAuthenticatorAuthTypeEmail and BITAuthenticatorAuthTypeEmailAndPassword */
-"HockeyAuthenticationViewControllerDataEmailAndPasswordDescription" = "Unesite molimo Vas e-mail adresu i lozinku Vašeg HockeyApp računa kako biste autorizirali pristup ovoj aplikaciji.";
-"HockeyAuthenticationViewControllerDataEmailDescription" = "Molimo Vas unesite e-mail adresu Vašeg HockeyApp računa za autorizaciju pristupa aplikaciji.";
-"HockeyAuthenticationViewControllerEmailPlaceholder" = "email@primjer.com";
-"HockeyAuthenticationViewControllerPasswordPlaceholder" = "Obavezno";
-"HockeyAuthenticationViewControllerEmailDescription" = "E-mail";
-"HockeyAuthenticationViewControllerPasswordDescription" = "Lozinka";
-
-/* Error presented to the user if authentication failed because of networking issues */
-"HockeyAuthenticationViewControllerNetworkError" = "Autorizacija nije uspjela. Vaš uređaj nema pristup internetu. Molimo Vas pokušajte iznova.";
-
-
-"HockeyAuthenticationFailedAuthenticate" = "Autorizacija nije uspjela. Molimo Vas pokušajte iznova ili kontaktirajte razvojnog programera ove aplikacije.";
-"HockeyAuthenticationNotMember" = "Vi niste autorizirani za korištenje ove aplikacije. Molimo Vas kontaktirajte razvojnog programera ove aplikacije.";
-"HockeyAuthenticationContactDeveloper" = "Pogreška u autoriziranju. Molimo Vas kontaktirajte razvojnog programera ove aplikacije.";
-"HockeyAuthenticationWrongEmailPassword" = "E-mail adresa ili lozinka koju ste unijeli nije ispravna. Molimo Vas provjerite Vaš unos i pokušajte iznova.";
-"HockeyAuthenticationAuthSecretMissing" = "HockeySDK \"authorization secret\" nije postavljen. Molimo Vas kontaktirajte razvojnog programera ove aplikacije.";
-
-/* Accessibility strings */
-"HockeyAccessibilityHintRequired" = "Obavezno";
diff --git a/submodules/HockeySDK-iOS/Resources/hu.lproj/HockeySDK.strings b/submodules/HockeySDK-iOS/Resources/hu.lproj/HockeySDK.strings
deleted file mode 100644
index df4db2a9f5..0000000000
--- a/submodules/HockeySDK-iOS/Resources/hu.lproj/HockeySDK.strings
+++ /dev/null
@@ -1,279 +0,0 @@
-/*
- Localization provided by Wordcrafts
- The Mac OS X and iOS localization experts.
- http://www.wordcrafts.de
- */
-
-
-/* General */
-
-/* For dialogs yes buttons */
-"HockeyYes" = "Igen";
-
-/* For dialogs no buttons */
-"HockeyNo" = "Nem";
-
-/* For dialogs ok buttons */
-"HockeyOK" = "OK";
-
-/* Replacement for app name, if it could not be detected */
-"HockeyAppNamePlaceholder" = "Az alkalmazás";
-
-/* Crash */
-
-
-/* Crash dialog */
-
-/* Title showing in the alert box when crash report data has been found */
-"CrashDataFoundTitle" = "%@ váratlanul kilépett";
-
-/* Description explaining that crash data has been found and ask the user if the data might be uploaded to the developers server */
-"CrashDataFoundAnonymousDescription" = "Szeretne hibajelentést küldeni, hogy javíthassuk a problémát? A küldés névtelenül történik.";
-
-/* Description explaining that crash data has been found and ask the user if the non anonymous data might be uplaoded to the developers server */
-"CrashDataFoundDescription" = "Szeretne hibajelentést küldeni, hogy javíthassuk a problémát?";
-
-/* Alert box button if the users wants to send crash data always automatically */
-"CrashSendReportAlways" = "Mindig küldjön";
-
-/* Alert box button to send the crash report once */
-"CrashSendReport" = "Jelentés küldése";
-
-/* Alert box button to decline sending the report */
-"CrashDontSendReport" = "Ne küldjön";
-
-/* Text showing in a processing box that the crash data is being uploaded to the server */
-"CrashReportSending" = "Küldés…";
-
-
-/* Update */
-
-
-/* Update Alert view */
-
-/* Update available */
-"UpdateAvailable" = "Frissítés elérhető";
-
-"UpdateAlertTextWithAppVersion" = "%@ elérhető.";
-
-"UpdateAlertMandatoryTextWithAppVersion" = "%@ elérhető, és szükséges frissíteni!";
-
-"UpdateIgnore" = "Most nem";
-
-"UpdateShow" = "Megjelenítés";
-
-"UpdateInstall" = "Telepítés";
-
-"UpdateRemindMe" = "Emlékeztessen később";
-
-
-/* Update Details */
-
-"UpdateScreenTitle" = "Frissítés";
-
-"UpdateButtonCheck" = "ELLENŐRZÉS";
-
-"UpdateButtonSearching" = "KERESÉS";
-
-"UpdateButtonUpdate" = "FRISSÍTÉS";
-
-"UpdateButtonInstalling" = "TELEPÍTÉS";
-
-"UpdateButtonOffline" = "NINCS KAPCSOLAT";
-
-"UpdateInstalled" = "TELEPÍTVE";
-
-"UpdateVersion" = "verzió";
-
-"UpdateShowPreviousVersions" = "Korábbi verziók megtekintése…";
-
-"UpdateNoUpdateAvailableTitle" = "Nincs elérhető frissítés";
-
-"UpdateNoUpdateAvailableMessage" = "%@ már a legfrissebb verzió.";
-
-"UpdateError" = "Hiba";
-
-"UpdateWarning" = "Figyelmeztetés";
-
-"UpdateNoReleaseNotesAvailable" = "Nem elérhető a változások listája.";
-
-
-/* Update Authorization  */
-
-"UpdateAuthorizationProgress" = "Engedélyezés…";
-
-"UpdateAuthorizationOffline" = "Internetkapcsolat szükséges!";
-
-"UpdateAuthorizationDenied" = "Engedélyezés megtagadva. Lépjen kapcsolatba a fejlesztővel.";
-
-
-/* Update Expiry  */
-
-"UpdateExpired" = "%@ érvényessége lejárt, és már nem használható.";
-
-
-/* Update Simulator Warning */
-
-"UpdateSimulatorMessage" = "A Hockey Update nem használható a szimulátorban.\nAz itms-services:// URL séma elérhető, de nem működőképes.";
-
-
-/* Feedback */
-
-
-/* New Message Alert */
-
-/* Alert Title */
-"HockeyFeedbackNewMessageTitle" = "Új válasz";
-
-/* Alert Text */
-"HockeyFeedbackNewMessageText" = "Új válasz érkezett az Ön visszajelzésére. Kívánja most megtekinteni?";
-
-/* Alert Ignore Button */
-"HockeyFeedbackIgnore" = "Most nem";
-
-/* Alert Show Button */
-"HockeyFeedbackShow" = "Megtekintés";
-
-
-/* List View */
-
-/* Title */
-"HockeyFeedbackListTitle" = "Visszajelzés";
-
-/* Last Updated */
-"HockeyFeedbackListLastUpdated" = "Utolsó frissítés: %@";
-
-/* Never Updated */
-"HockeyFeedbackListNeverUpdated" = "Soha";
-
-/* Provide Feedback Button Title */
-"HockeyFeedbackListButtonWriteFeedback" = "Visszajelzés küldése";
-
-/* Add a Response Button Title */
-"HockeyFeedbackListButtonWriteResponse" = "Válasz küldése";
-
-/* User Data Set Name Button Title */
-"HockeyFeedbackListButtonUserDataSetName" = "Adja meg a nevét";
-
-/* User Data Set Email Button Title */
-"HockeyFeedbackListButtonUserDataSetEmail" = "Adja meg az e-mail címét";
-
-/* User Data With Name Button Title */
-"HockeyFeedbackListButtonUserDataWithName" = "Név: %@";
-
-/* User Data With Email Button Title */
-"HockeyFeedbackListButtonUserDataWithEmail" = "E-mail: %@";
-
-/* Button title for deleting all local messages*/
-"HockeyFeedbackListButtonDeleteAllMessages" = "Összes üzenet törlése";
-
-/* Message pending to be send */
-"HockeyFeedbackListMessagePending" = "Folyamatban";
-
-
-/* Delete All Messages Action Sheet / Alert View */
-
-/* Title for the Action Sheet */
-"HockeyFeedbackListDeleteAllTitle" = "Minden üzenet törlődni fog erről az eszközről.";
-
-/* Button Title to perform delete action */
-"HockeyFeedbackListDeleteAllDelete" = "Törlés";
-
-/* Button Title to cancel delete action */
-"HockeyFeedbackListDeleteAllCancel" = "Mégsem";
-
-
-/* Open Link In Safari Action Sheet / Alert View */
-
-/* Button Title to cancel */
-"HockeyFeedbackListLinkActionCancel" = "Mégsem";
-
-/* Button Title to Open the Link */
-"HockeyFeedbackListLinkActionOpen" = "Megnyitás";
-
-/* Button Title to Copy the Link */
-"HockeyFeedbackListLinkActionCopy" = "Másolás";
-
-
-/* UIActivity */
-
-/* Activity Sharing Button Title, App Name will be inserted */
-"HockeyFeedbackActivityButtonTitle" = "Visszajelzés: %@";
-
-/* if there can no app name be found, use this instead for HockeyFeedbackActivityButtonTitle */
-"HockeyFeedbackActivityAppPlaceholder" = "az alkalmazásról";
-
-
-/* Compose Message */
-
-/* Title */
-"HockeyFeedbackComposeTitle" = "Új visszajelzés";
-
-/* Send button */
-"HockeyFeedbackComposeSend" = "Küldés";
-
-/* Add Image button for attachment actions */
-"HockeyFeedbackComposeAttachmentAddImage" = "Fotó hozzáadása";
-
-/* Edit button for attachment actions */
-"HockeyFeedbackComposeAttachmentEdit" = "Fotó szerkesztése";
-
-/* Delete button for attachment actions */
-"HockeyFeedbackComposeAttachmentDelete" = "Fotó törlése";
-
-/* Cancel button for attachment actions */
-"HockeyFeedbackComposeAttachmentCancel" = "Mégsem";
-
-
-/* Set User Data */
-
-/* Title */
-"HockeyFeedbackUserDataTitle" = "Felhasználói adatok";
-
-/* Description On What Should Be Entered */
-"HockeyFeedbackUserDataDescription" = "Kérjük, adja meg néhány adatát, mielőtt megírja a visszajelzést.";
-
-/* Name Field */
-"HockeyFeedbackUserDataName" = "Név";
-
-/* Name Placeholder */
-"HockeyFeedbackUserDataNamePlaceHolder" = "Gipsz Jakab";
-
-/* Email Field */
-"HockeyFeedbackUserDataEmail" = "E-mail";
-
-/* Email Placeholder */
-"HockeyFeedbackUserDataEmailPlaceholder" = "email@example.com";
-
-
-/* Authenticator */
-
-/* View Controller Title*/
-"HockeyAuthenticatorViewControllerTitle" = "HockeyApp";
-
-/* BITAuthenticatorAuthTypeUDIDProvider */
-"HockeyAuthenticationViewControllerWebUDIDLoginDescription" = "A fejlesztő szeretné hozzáférni készüléke UDID azonosítójához. Kattintással nyissa meg a HockeyApp weblapot és engedélyezze a hozzáférést.";
-"HockeyAuthenticationViewControllerWebLoginButtonTitle" = "HockeyApp megnyitása";
-
-/* BITAuthenticatorIdentificationTypeWebAuth */
-"HockeyAuthenticationViewControllerWebAuthLoginDescription" = "A fejlesztő szeretné hozzáférni a HockeyApp fiókjának e-mail címéhez. Kattintással nyissa meg a HockeyApp weblapot és engedélyezze a hozzáférést.";
-
-/* BITAuthenticatorAuthTypeEmail and BITAuthenticatorAuthTypeEmailAndPassword */
-"HockeyAuthenticationViewControllerDataEmailAndPasswordDescription" = "Kérjük, adja meg HockeyApp fiókjához tartozó e-mail címét és jelszavát az alkalmazáshoz történő hozzáférés engedélyezéséhez.";
-"HockeyAuthenticationViewControllerDataEmailDescription" = "Kérjük, adja meg HockeyApp fiókjához tartozó e-mail címét az alkalmazáshoz történő hozzáférés engedélyezéséhez.";
-"HockeyAuthenticationViewControllerEmailPlaceholder" = "email@example.com";
-"HockeyAuthenticationViewControllerPasswordPlaceholder" = "Szükséges mező";
-"HockeyAuthenticationViewControllerEmailDescription" = "E-mail";
-"HockeyAuthenticationViewControllerPasswordDescription" = "Jelszó";
-
-/* Error presented to the user if authentication failed because of networking issues */
-"HockeyAuthenticationViewControllerNetworkError" = "A hitelesítés sikertelen, mert készüléke nem csatlakozik az internethez. Kérjük, próbálja meg később újra.";
-
-"HockeyAuthenticationFailedAuthenticate" = "A hitelesítés sikertelen. Kérjük, próbálja meg később újra vagy lépjen kapcsolatba az alkalmazás fejlesztőjével.";
-"HockeyAuthenticationNotMember" = "Nem jogosult az alkalmazás használatára. Kérjük, lépjen kapcsolatba az alkalmazás fejlesztőjével.";
-"HockeyAuthenticationContactDeveloper" = "Hitelesítési hiba. Kérjük, lépjen kapcsolatba az alkalmazás fejlesztőjével.";
-"HockeyAuthenticationWrongEmailPassword" = "Érvénytelen e-mail címet vagy jelszót adott meg. Kérjük, ellenőrizze a bevitelt és adja meg az adatokat újra.";
-"HockeyAuthenticationAuthSecretMissing" = "A HockeySDK \"authorization secret\" még nincs beállítva. Kérjük, lépjen kapcsolatba az alkalmazás fejlesztőjével.";
-
-/* Accessibility strings */
-"HockeyAccessibilityHintRequired" = "Szükséges mező";
diff --git a/submodules/HockeySDK-iOS/Resources/iconCamera.png b/submodules/HockeySDK-iOS/Resources/iconCamera.png
deleted file mode 100644
index 80eecd09d2..0000000000
Binary files a/submodules/HockeySDK-iOS/Resources/iconCamera.png and /dev/null differ
diff --git a/submodules/HockeySDK-iOS/Resources/iconCamera@2x.png b/submodules/HockeySDK-iOS/Resources/iconCamera@2x.png
deleted file mode 100644
index 8ca9597dd3..0000000000
Binary files a/submodules/HockeySDK-iOS/Resources/iconCamera@2x.png and /dev/null differ
diff --git a/submodules/HockeySDK-iOS/Resources/it.lproj/HockeySDK.strings b/submodules/HockeySDK-iOS/Resources/it.lproj/HockeySDK.strings
deleted file mode 100644
index 6dc3e30a50..0000000000
--- a/submodules/HockeySDK-iOS/Resources/it.lproj/HockeySDK.strings
+++ /dev/null
@@ -1,279 +0,0 @@
-/*
- Localization provided by Wordcrafts
- The Mac OS X and iOS localization experts.
- http://www.wordcrafts.de
- */
-
-
-/* General */
-
-/* For dialogs yes buttons */
-"HockeyYes" = "Sì";
-
-/* For dialogs no buttons */
-"HockeyNo" = "No";
-
-/* For dialogs ok buttons */
-"HockeyOK" = "OK";
-
-/* Replacement for app name, if it could not be detected */
-"HockeyAppNamePlaceholder" = "Questa app";
-
-/* Crash */
-
-
-/* Crash dialog */
-
-/* Title showing in the alert box when crash report data has been found */
-"CrashDataFoundTitle" = "%@ si è chiusa inaspettatamente";
-
-/* Description explaining that crash data has been found and ask the user if the data might be uploaded to the developers server */
-"CrashDataFoundAnonymousDescription" = "Vuoi inviare un report anonimo per aiutarci a risolvere il problema?";
-
-/* Description explaining that crash data has been found and ask the user if the non anonymous data might be uplaoded to the developers server */
-"CrashDataFoundDescription" = "Vuoi inviare un report con i dettagli del crash per aiutarci a risolvere il problema?";
-
-/* Alert box button if the users wants to send crash data always automatically */
-"CrashSendReportAlways" = "Invia sempre";
-
-/* Alert box button to send the crash report once */
-"CrashSendReport" = "Invia";
-
-/* Alert box button to decline sending the report */
-"CrashDontSendReport" = "Non inviare";
-
-/* Text showing in a processing box that the crash data is being uploaded to the server */
-"CrashReportSending" = "Invio...";
-
-
-/* Update */
-
-
-/* Update Alert view */
-
-/* Update available */
-"UpdateAvailable" = "Nuovo aggiornamento";
-
-"UpdateAlertTextWithAppVersion" = "È disponibile %@.";
-
-"UpdateAlertMandatoryTextWithAppVersion" = "È disponibile %@ ed è un aggiornamento obbligatorio!";
-
-"UpdateIgnore" = "Ignora";
-
-"UpdateShow" = "Visualizza";
-
-"UpdateInstall" = "Installa";
-
-"UpdateRemindMe" = "Ricordamelo";
-
-
-/* Update Details */
-
-"UpdateScreenTitle" = "Aggiornamento";
-
-"UpdateButtonCheck" = "VERIFICA";
-
-"UpdateButtonSearching" = "VERIFICO";
-
-"UpdateButtonUpdate" = "AGGIORNA";
-
-"UpdateButtonInstalling" = "INSTALLO";
-
-"UpdateButtonOffline" = "OFFLINE";
-
-"UpdateInstalled" = "INSTALLATO";
-
-"UpdateVersion" = "Versione";
-
-"UpdateShowPreviousVersions" = "Visualizzo versioni precedenti...";
-
-"UpdateNoUpdateAvailableTitle" = "Non sono disponibili aggiornamenti";
-
-"UpdateNoUpdateAvailableMessage" = "%@ è già la versione attuale.";
-
-"UpdateError" = "Errore";
-
-"UpdateWarning" = "Avviso";
-
-"UpdateNoReleaseNotesAvailable" = "Non sono disponibili note sulla release.";
-
-
-/* Update Authorization  */
-
-"UpdateAuthorizationProgress" = "Autorizzazione...";
-
-"UpdateAuthorizationOffline" = "È necessario un collegamento a Internet!";
-
-"UpdateAuthorizationDenied" = "Autorizzazione negata. Contattare lo sviluppatore.";
-
-
-/* Update Expiry  */
-
-"UpdateExpired" = "%@ è scaduta e non può più essere utilizzata.";
-
-
-/* Update Simulator Warning */
-
-"UpdateSimulatorMessage" = "L'aggiornamento di Hockey non funziona nel Simulator.\nLo schema url tms-services:// è implementato ma non è funzionante.";
-
-
-/* Feedback */
-
-
-/* New Message Alert */
-
-/* Alert Title */
-"HockeyFeedbackNewMessageTitle" = "Nuova risposta a un commento";
-
-/* Alert Text */
-"HockeyFeedbackNewMessageText" = "C'è una nuova risposta al tuo commento. Vuoi visualizzarla?";
-
-/* Alert Ignore Button */
-"HockeyFeedbackIgnore" = "Ignora";
-
-/* Alert Show Button */
-"HockeyFeedbackShow" = "Visualizza";
-
-
-/* List View */
-
-/* Title */
-"HockeyFeedbackListTitle" = "Commento";
-
-/* Last Updated */
-"HockeyFeedbackListLastUpdated" = "Ultimo aggiornamento: %@";
-
-/* Never Updated */
-"HockeyFeedbackListNeverUpdated" = "Mai";
-
-/* Provide Feedback Button Title */
-"HockeyFeedbackListButtonWriteFeedback" = "Commenta";
-
-/* Add a Response Button Title */
-"HockeyFeedbackListButtonWriteResponse" = "Aggiungi una risposta";
-
-/* User Data Set Name Button Title */
-"HockeyFeedbackListButtonUserDataSetName" = "Imposta il tuo nome";
-
-/* User Data Set Email Button Title */
-"HockeyFeedbackListButtonUserDataSetEmail" = "Imposta la tua e-mail";
-
-/* User Data With Name Button Title */
-"HockeyFeedbackListButtonUserDataWithName" = "Nome: %@";
-
-/* User Data With Email Button Title */
-"HockeyFeedbackListButtonUserDataWithEmail" = "E-mail: %@";
-
-/* Button title for deleting all local messages*/
-"HockeyFeedbackListButtonDeleteAllMessages" = "Cancella tutti i messagi";
-
-/* Message pending to be send */
-"HockeyFeedbackListMessagePending" = "In attesa";
-
-
-/* Delete All Messages Action Sheet / Alert View */
-
-/* Title for the Action Sheet */
-"HockeyFeedbackListDeleteAllTitle" = "Tutti i messaggi presenti sul dispositivo saranno cancellati.";
-
-/* Button Title to perform delete action */
-"HockeyFeedbackListDeleteAllDelete" = "Cancella";
-
-/* Button Title to cancel delete action */
-"HockeyFeedbackListDeleteAllCancel" = "Annulla";
-
-
-/* Open Link In Safari Action Sheet / Alert View */
-
-/* Button Title to cancel */
-"HockeyFeedbackListLinkActionCancel" = "Annulla";
-
-/* Button Title to Open the Link */
-"HockeyFeedbackListLinkActionOpen" = "Apri";
-
-/* Button Title to Copy the Link */
-"HockeyFeedbackListLinkActionCopy" = "Copia";
-
-
-/* UIActivity */
-
-/* Activity Sharing Button Title, App Name will be inserted */
-"HockeyFeedbackActivityButtonTitle" = "Commento su %@ ";
-
-/* if there can no app name be found, use this instead for HockeyFeedbackActivityButtonTitle */
-"HockeyFeedbackActivityAppPlaceholder" = "App";
-
-
-/* Compose Message */
-
-/* Title */
-"HockeyFeedbackComposeTitle" = "Nuovo commento";
-
-/* Send button */
-"HockeyFeedbackComposeSend" = "Invia";
-
-/* Add Image button for attachment actions */
-"HockeyFeedbackComposeAttachmentAddImage" = "Aggiungi immagine";
-
-/* Edit button for attachment actions */
-"HockeyFeedbackComposeAttachmentEdit" = "Modifica immagine";
-
-/* Delete button for attachment actions */
-"HockeyFeedbackComposeAttachmentDelete" = "Elimina immagine";
-
-/* Cancel button for attachment actions */
-"HockeyFeedbackComposeAttachmentCancel" = "Annulla";
-
-
-/* Set User Data */
-
-/* Title */
-"HockeyFeedbackUserDataTitle" = "Le mie info";
-
-/* Description On What Should Be Entered */
-"HockeyFeedbackUserDataDescription" = "Prima di scrivere il commento inserisci i tuoi dati.";
-
-/* Name Field */
-"HockeyFeedbackUserDataName" = "Nome";
-
-/* Name Placeholder */
-"HockeyFeedbackUserDataNamePlaceHolder" = "Mario Rossi";
-
-/* Email Field */
-"HockeyFeedbackUserDataEmail" = "E-mail";
-
-/* Email Placeholder */
-"HockeyFeedbackUserDataEmailPlaceholder" = "email@esempio.com";
-
-
-/* Authenticator */
-
-/* View Controller Title*/
-"HockeyAuthenticatorViewControllerTitle" = "HockeyApp";
-
-/* BITAuthenticatorAuthTypeUDIDProvider */
-"HockeyAuthenticationViewControllerWebUDIDLoginDescription" = "Lo sviluppatore ha richiesto l'UDID di questo dispositivo. Tocca in basso per aprire il sito di HockeyApp e autorizza l'accesso.";
-"HockeyAuthenticationViewControllerWebLoginButtonTitle" = "Apri HockeyApp";
-
-/* BITAuthenticatorIdentificationTypeWebAuth */
-"HockeyAuthenticationViewControllerWebAuthLoginDescription" = "Lo sviluppatore ha richiesto l'indirizzo e-mail del tuo account HockeyApp. Tocca in basso per aprire il sito di HockeyApp e autorizza l'accesso.";
-
-/* BITAuthenticatorAuthTypeEmail and BITAuthenticatorAuthTypeEmailAndPassword */
-"HockeyAuthenticationViewControllerDataEmailAndPasswordDescription" = "Inserisci l'indirizzo e-mail e la password del tuo account HockeyApp per autorizzare l'accesso a questa app.";
-"HockeyAuthenticationViewControllerDataEmailDescription" = "Inserisci l'indirizzo e-mail del tuo account HockeyApp per autorizzare l'accesso a questa app.";
-"HockeyAuthenticationViewControllerEmailPlaceholder" = "email@esempio.com";
-"HockeyAuthenticationViewControllerPasswordPlaceholder" = "Richiesto";
-"HockeyAuthenticationViewControllerEmailDescription" = "E-mail";
-"HockeyAuthenticationViewControllerPasswordDescription" = "Password";
-
-/* Error presented to the user if authentication failed because of networking issues */
-"HockeyAuthenticationViewControllerNetworkError" = "Autorizzazione non riuscita. Pare che il dispositivo non sia connesso a Internet. Riprova.";
-
-"HockeyAuthenticationFailedAuthenticate" = "Autorizzazione non riuscita. Riprova o contatta lo sviluppatore di questa app.";
-"HockeyAuthenticationNotMember" = "Non sei autorizzato a usare questa app. Contatta lo sviluppatore di questa app.";
-"HockeyAuthenticationContactDeveloper" = "Errore di autorizzazione. Contatta lo sviluppatore di questa app.";
-"HockeyAuthenticationWrongEmailPassword" = "L'indirizzo e-mail o la password non sono corretti. Controlla i dati inseriti e riprova.";
-"HockeyAuthenticationAuthSecretMissing" = "Non è stato impostato l'\"authorization secret\" HockeySDK. Contatta lo sviluppatore di questa app.";
-
-/* Accessibility strings */
-"HockeyAccessibilityHintRequired" = "Richiesto";
diff --git a/submodules/HockeySDK-iOS/Resources/ja.lproj/HockeySDK.strings b/submodules/HockeySDK-iOS/Resources/ja.lproj/HockeySDK.strings
deleted file mode 100644
index fe76bd9a21..0000000000
--- a/submodules/HockeySDK-iOS/Resources/ja.lproj/HockeySDK.strings
+++ /dev/null
@@ -1,279 +0,0 @@
-/*
- Localization provided by Wordcrafts
- The Mac OS X and iOS localization experts.
- http://www.wordcrafts.de
- */
-
-
-/* General */
-
-/* For dialogs yes buttons */
-"HockeyYes" = "はい";
-
-/* For dialogs no buttons */
-"HockeyNo" = "いいえ";
-
-/* For dialogs ok buttons */
-"HockeyOK" = "OK";
-
-/* Replacement for app name, if it could not be detected */
-"HockeyAppNamePlaceholder" = "このApp";
-
-/* Crash */
-
-
-/* Crash dialog */
-
-/* Title showing in the alert box when crash report data has been found */
-"CrashDataFoundTitle" = "%@が予期しない理由で終了";
-
-/* Description explaining that crash data has been found and ask the user if the data might be uploaded to the developers server */
-"CrashDataFoundAnonymousDescription" = "問題が修正できるよう、匿名のレポートを送信しますか。";
-
-/* Description explaining that crash data has been found and ask the user if the non anonymous data might be uplaoded to the developers server */
-"CrashDataFoundDescription" = "問題が修正できるよう、レポートを送信しますか。";
-
-/* Alert box button if the users wants to send crash data always automatically */
-"CrashSendReportAlways" = "常に送信";
-
-/* Alert box button to send the crash report once */
-"CrashSendReport" = "レポートを送信";
-
-/* Alert box button to decline sending the report */
-"CrashDontSendReport" = "送信しない";
-
-/* Text showing in a processing box that the crash data is being uploaded to the server */
-"CrashReportSending" = "送信中…";
-
-
-/* Update */
-
-
-/* Update Alert view */
-
-/* Update available */
-"UpdateAvailable" = "アップデートあり";
-
-"UpdateAlertTextWithAppVersion" = "%@が入手できます。";
-
-"UpdateAlertMandatoryTextWithAppVersion" = "必須アップデート%@が利用可能です！";
-
-"UpdateIgnore" = "無視";
-
-"UpdateShow" = "表示";
-
-"UpdateInstall" = "インストール";
-
-"UpdateRemindMe" = "後で通知";
-
-
-/* Update Details */
-
-"UpdateScreenTitle" = "アップデート";
-
-"UpdateButtonCheck" = "確認";
-
-"UpdateButtonSearching" = "確認中";
-
-"UpdateButtonUpdate" = "アップデート";
-
-"UpdateButtonInstalling" = "インストール中";
-
-"UpdateButtonOffline" = "オフライン";
-
-"UpdateInstalled" = "インストール済み";
-
-"UpdateVersion" = "バージョン";
-
-"UpdateShowPreviousVersions" = "前のバージョンを表示…";
-
-"UpdateNoUpdateAvailableTitle" = "アップデートなし";
-
-"UpdateNoUpdateAvailableMessage" = "%@は現在入手できる最新バージョンです。";
-
-"UpdateError" = "エラー";
-
-"UpdateWarning" = "警告";
-
-"UpdateNoReleaseNotesAvailable" = "リリースノートがありません。";
-
-
-/* Update Authorization  */
-
-"UpdateAuthorizationProgress" = "認証中…";
-
-"UpdateAuthorizationOffline" = "インターネット接続が必要です！";
-
-"UpdateAuthorizationDenied" = "認証が拒否されました。デベロッパに連絡してください。";
-
-
-/* Update Expiry  */
-
-"UpdateExpired" = "%@の有効期限が切れたため、これ以上使用できません。";
-
-
-/* Update Simulator Warning */
-
-"UpdateSimulatorMessage" = "HockeyのアップデートはSimulatorでは作動しません。\nitms-services:// のURL方式は実装されていますが、機能しません。";
-
-
-/* Feedback */
-
-
-/* New Message Alert */
-
-/* Alert Title */
-"HockeyFeedbackNewMessageTitle" = "新規フィードバックの応答";
-
-/* Alert Text */
-"HockeyFeedbackNewMessageText" = "フィードバックに対する新しい応答があります。表示しますか。";
-
-/* Alert Ignore Button */
-"HockeyFeedbackIgnore" = "無視";
-
-/* Alert Show Button */
-"HockeyFeedbackShow" = "表示";
-
-
-/* List View */
-
-/* Title */
-"HockeyFeedbackListTitle" = "フィードバック";
-
-/* Last Updated */
-"HockeyFeedbackListLastUpdated" = "前回のアップデート：%@";
-
-/* Never Updated */
-"HockeyFeedbackListNeverUpdated" = "しない";
-
-/* Provide Feedback Button Title */
-"HockeyFeedbackListButtonWriteFeedback" = "フィードバックを送信";
-
-/* Add a Response Button Title */
-"HockeyFeedbackListButtonWriteResponse" = "応答を追加";
-
-/* User Data Set Name Button Title */
-"HockeyFeedbackListButtonUserDataSetName" = "名前を設定";
-
-/* User Data Set Email Button Title */
-"HockeyFeedbackListButtonUserDataSetEmail" = "メールを設定";
-
-/* User Data With Name Button Title */
-"HockeyFeedbackListButtonUserDataWithName" = "名前：%@";
-
-/* User Data With Email Button Title */
-"HockeyFeedbackListButtonUserDataWithEmail" = "メール：%@";
-
-/* Button title for deleting all local messages*/
-"HockeyFeedbackListButtonDeleteAllMessages" = "すべてのメッセージを削除";
-
-/* Message pending to be send */
-"HockeyFeedbackListMessagePending" = "保留中";
-
-
-/* Delete All Messages Action Sheet / Alert View */
-
-/* Title for the Action Sheet */
-"HockeyFeedbackListDeleteAllTitle" = "この操作はこのデバイスのメッセージすべてを削除します。";
-
-/* Button Title to perform delete action */
-"HockeyFeedbackListDeleteAllDelete" = "消去";
-
-/* Button Title to cancel delete action */
-"HockeyFeedbackListDeleteAllCancel" = "キャンセル";
-
-
-/* Open Link In Safari Action Sheet / Alert View */
-
-/* Button Title to cancel */
-"HockeyFeedbackListLinkActionCancel" = "キャンセル";
-
-/* Button Title to Open the Link */
-"HockeyFeedbackListLinkActionOpen" = "開く";
-
-/* Button Title to Copy the Link */
-"HockeyFeedbackListLinkActionCopy" = "コピー";
-
-
-/* UIActivity */
-
-/* Activity Sharing Button Title, App Name will be inserted */
-"HockeyFeedbackActivityButtonTitle" = "%@フィードバック";
-
-/* if there can no app name be found, use this instead for HockeyFeedbackActivityButtonTitle */
-"HockeyFeedbackActivityAppPlaceholder" = "App";
-
-
-/* Compose Message */
-
-/* Title */
-"HockeyFeedbackComposeTitle" = "新規フィードバック";
-
-/* Send button */
-"HockeyFeedbackComposeSend" = "送信";
-
-/* Add Image button for attachment actions */
-"HockeyFeedbackComposeAttachmentAddImage" = "イメージを追加";
-
-/* Edit button for attachment actions */
-"HockeyFeedbackComposeAttachmentEdit" = "イメージを編集";
-
-/* Delete button for attachment actions */
-"HockeyFeedbackComposeAttachmentDelete" = "イメージを削除";
-
-/* Cancel button for attachment actions */
-"HockeyFeedbackComposeAttachmentCancel" = "キャンセル";
-
-
-/* Set User Data */
-
-/* Title */
-"HockeyFeedbackUserDataTitle" = "自分の情報";
-
-/* Description On What Should Be Entered */
-"HockeyFeedbackUserDataDescription" = "フィードバックを記入する前に情報を入力してください。";
-
-/* Name Field */
-"HockeyFeedbackUserDataName" = "名前";
-
-/* Name Placeholder */
-"HockeyFeedbackUserDataNamePlaceHolder" = "Hiromi Sato";
-
-/* Email Field */
-"HockeyFeedbackUserDataEmail" = "メール";
-
-/* Email Placeholder */
-"HockeyFeedbackUserDataEmailPlaceholder" = "email@example.com";
-
-
-/* Authenticator */
-
-/* View Controller Title*/
-"HockeyAuthenticatorViewControllerTitle" = "HockeyApp";
-
-/* BITAuthenticatorAuthTypeUDIDProvider */
-"HockeyAuthenticationViewControllerWebUDIDLoginDescription" = "デベロッパからこのデバイスのUDIDを要求されています。以下をタップしてHockeyAppウェブサイトを開き、アクセスを認証してください。";
-"HockeyAuthenticationViewControllerWebLoginButtonTitle" = "HockeyAppを開く";
-
-/* BITAuthenticatorIdentificationTypeWebAuth */
-"HockeyAuthenticationViewControllerWebAuthLoginDescription" = "デベロッパからHockeyAppアカウントのメールアドレスを要求されています。以下をタップしてHockeyAppウェブサイトを開き、アクセスを認証してください。";
-
-/* BITAuthenticatorAuthTypeEmail and BITAuthenticatorAuthTypeEmailAndPassword */
-"HockeyAuthenticationViewControllerDataEmailAndPasswordDescription" = "HockeyAppアカウントのメールアドレスとパスワードを入力し、このAppへのアクセスを認証してください。";
-"HockeyAuthenticationViewControllerDataEmailDescription" = "HockeyAppアカウントのメールアドレスを入力し、このAppへのアクセスを認証してください。";
-"HockeyAuthenticationViewControllerEmailPlaceholder" = "email@example.com";
-"HockeyAuthenticationViewControllerPasswordPlaceholder" = "必須";
-"HockeyAuthenticationViewControllerEmailDescription" = "メール";
-"HockeyAuthenticationViewControllerPasswordDescription" = "パスワード";
-
-/* Error presented to the user if authentication failed because of networking issues */
-"HockeyAuthenticationViewControllerNetworkError" = "デバイスがインターネットに接続されていないため、認証できません。やり直してください。";
-
-"HockeyAuthenticationFailedAuthenticate" = "認証できませんでした。やり直すか、このAppのデベロッパに連絡してください。";
-"HockeyAuthenticationNotMember" = "このAppの使用を認証されていません。このAppのデベロッパに連絡してください。";
-"HockeyAuthenticationContactDeveloper" = "認証エラー。このAppのデベロッパに連絡してください。";
-"HockeyAuthenticationWrongEmailPassword" = "無効なメールアドレスまたはパスワードが入力されました。入力を確認し、やり直してください。";
-"HockeyAuthenticationAuthSecretMissing" = "HockeySDK “authorization secret” が設定されていません。このAppのデベロッパに連絡してください。";
-
-/* Accessibility strings */
-"HockeyAccessibilityHintRequired" = "必填";
diff --git a/submodules/HockeySDK-iOS/Resources/ja.lproj/Symbol-Blue_on_White.png b/submodules/HockeySDK-iOS/Resources/ja.lproj/Symbol-Blue_on_White.png
deleted file mode 100644
index dbf8880dbd..0000000000
Binary files a/submodules/HockeySDK-iOS/Resources/ja.lproj/Symbol-Blue_on_White.png and /dev/null differ
diff --git a/submodules/HockeySDK-iOS/Resources/nb.lproj/HockeySDK.strings b/submodules/HockeySDK-iOS/Resources/nb.lproj/HockeySDK.strings
deleted file mode 100644
index 71aa51f2c8..0000000000
--- a/submodules/HockeySDK-iOS/Resources/nb.lproj/HockeySDK.strings
+++ /dev/null
@@ -1,279 +0,0 @@
-/*
- Localization provided by Wordcrafts
- The Mac OS X and iOS localization experts.
- http://www.wordcrafts.de
- */
-
-
-/* General */
-
-/* For dialogs yes buttons */
-"HockeyYes" = "Ja";
-
-/* For dialogs no buttons */
-"HockeyNo" = "Nei";
-
-/* For dialogs ok buttons */
-"HockeyOK" = "OK";
-
-/* Replacement for app name, if it could not be detected */
-"HockeyAppNamePlaceholder" = "Denne appen";
-
-/* Crash */
-
-
-/* Crash dialog */
-
-/* Title showing in the alert box when crash report data has been found */
-"CrashDataFoundTitle" = "%@ avsluttet uventet";
-
-/* Description explaining that crash data has been found and ask the user if the data might be uploaded to the developers server */
-"CrashDataFoundAnonymousDescription" = "Ønsker du å sende en anonym rapport til utvikleren for å bistå i å løse problemet?";
-
-/* Description explaining that crash data has been found and ask the user if the non anonymous data might be uplaoded to the developers server */
-"CrashDataFoundDescription" = "Ønsker du å sende en rapport til utvikleren for å bistå i å løse problemet?";
-
-/* Alert box button if the users wants to send crash data always automatically */
-"CrashSendReportAlways" = "Alltid send";
-
-/* Alert box button to send the crash report once */
-"CrashSendReport" = "Send rapport";
-
-/* Alert box button to decline sending the report */
-"CrashDontSendReport" = "Ikke send";
-
-/* Text showing in a processing box that the crash data is being uploaded to the server */
-"CrashReportSending" = "Sender…";
-
-
-/* Update */
-
-
-/* Update Alert view */
-
-/* Update available */
-"UpdateAvailable" = "En oppdatering er tilgjengelig";
-
-"UpdateAlertTextWithAppVersion" = "%@ er tilgjengelig.";
-
-"UpdateAlertMandatoryTextWithAppVersion" = "%@ er tilgjengelig som en påkrevd oppdatering!";
-
-"UpdateIgnore" = "Ignorer";
-
-"UpdateShow" = "Vis";
-
-"UpdateInstall" = "Installer";
-
-"UpdateRemindMe" = "Minn meg på";
-
-
-/* Update Details */
-
-"UpdateScreenTitle" = "Oppdater";
-
-"UpdateButtonCheck" = "KONTROLLER";
-
-"UpdateButtonSearching" = "KONTROLLERER";
-
-"UpdateButtonUpdate" = "OPPDATERER";
-
-"UpdateButtonInstalling" = "INSTALLERER";
-
-"UpdateButtonOffline" = "FRAKOBLET";
-
-"UpdateInstalled" = "INSTALLERT";
-
-"UpdateVersion" = "Versjon";
-
-"UpdateShowPreviousVersions" = "Vis tidligere versjoner...";
-
-"UpdateNoUpdateAvailableTitle" = "Ingen oppdateringer tilgjengelig";
-
-"UpdateNoUpdateAvailableMessage" = "%@ er nyeste versjon.";
-
-"UpdateError" = "Feil";
-
-"UpdateWarning" = "Advarsel";
-
-"UpdateNoReleaseNotesAvailable" = "Ingen tilgjengelige utgivelsesnotater.";
-
-
-/* Update Authorization  */
-
-"UpdateAuthorizationProgress" = "Autoriserer...";
-
-"UpdateAuthorizationOffline" = "Oppkobling til Internett er påkrevd!";
-
-"UpdateAuthorizationDenied" = "Autorisering avslått. Vennligst kontakt utvikleren.";
-
-
-/* Update Expiry  */
-
-"UpdateExpired" = "%@ har utløpt og kan ikke lengre benyttes.";
-
-
-/* Update Simulator Warning */
-
-"UpdateSimulatorMessage" = "Hockey Update vil ikke fungere i simulator.\nItms-services:// url-oppsettet er implementert, men ikke fungerende.";
-
-
-/* Feedback */
-
-
-/* New Message Alert */
-
-/* Alert Title */
-"HockeyFeedbackNewMessageTitle" = "Nytt svar på tilbakemelding";
-
-/* Alert Text */
-"HockeyFeedbackNewMessageText" = "Et nytt svar på din tilbakemelding er tilgjengelig, ønsker du å lese?";
-
-/* Alert Ignore Button */
-"HockeyFeedbackIgnore" = "Ignorer";
-
-/* Alert Show Button */
-"HockeyFeedbackShow" = "Vis";
-
-
-/* List View */
-
-/* Title */
-"HockeyFeedbackListTitle" = "Tilbakemelding";
-
-/* Last Updated */
-"HockeyFeedbackListLastUpdated" = "Sist oppdatert: %@";
-
-/* Never Updated */
-"HockeyFeedbackListNeverUpdated" = "Aldri";
-
-/* Provide Feedback Button Title */
-"HockeyFeedbackListButtonWriteFeedback" = "Gi tilbakemelding";
-
-/* Add a Response Button Title */
-"HockeyFeedbackListButtonWriteResponse" = "Nytt svar";
-
-/* User Data Set Name Button Title */
-"HockeyFeedbackListButtonUserDataSetName" = "Oppgi navn";
-
-/* User Data Set Email Button Title */
-"HockeyFeedbackListButtonUserDataSetEmail" = "Oppgi e-post";
-
-/* User Data With Name Button Title */
-"HockeyFeedbackListButtonUserDataWithName" = "Navn: %@";
-
-/* User Data With Email Button Title */
-"HockeyFeedbackListButtonUserDataWithEmail" = "E-post: %@";
-
-/* Button title for deleting all local messages*/
-"HockeyFeedbackListButtonDeleteAllMessages" = "Slett alle meldinger";
-
-/* Message pending to be send */
-"HockeyFeedbackListMessagePending" = "Venter";
-
-
-/* Delete All Messages Action Sheet / Alert View */
-
-/* Title for the Action Sheet */
-"HockeyFeedbackListDeleteAllTitle" = "Slett alle meldinger på denne enheten.";
-
-/* Button Title to perform delete action */
-"HockeyFeedbackListDeleteAllDelete" = "Slett";
-
-/* Button Title to cancel delete action */
-"HockeyFeedbackListDeleteAllCancel" = "Avbryt";
-
-
-/* Open Link In Safari Action Sheet / Alert View */
-
-/* Button Title to cancel */
-"HockeyFeedbackListLinkActionCancel" = "Avbryt";
-
-/* Button Title to Open the Link */
-"HockeyFeedbackListLinkActionOpen" = "Åpne";
-
-/* Button Title to Copy the Link */
-"HockeyFeedbackListLinkActionCopy" = "Kopier";
-
-
-/* UIActivity */
-
-/* Activity Sharing Button Title, App Name will be inserted */
-"HockeyFeedbackActivityButtonTitle" = "%@ tilbakemelding";
-
-/* if there can no app name be found, use this instead for HockeyFeedbackActivityButtonTitle */
-"HockeyFeedbackActivityAppPlaceholder" = "App";
-
-
-/* Compose Message */
-
-/* Title */
-"HockeyFeedbackComposeTitle" = "Ny tilbakemelding";
-
-/* Send button */
-"HockeyFeedbackComposeSend" = "Send";
-
-/* Add Image button for attachment actions */
-"HockeyFeedbackComposeAttachmentAddImage" = "Legg til bilde";
-
-/* Edit button for attachment actions */
-"HockeyFeedbackComposeAttachmentEdit" = "Rediger bilde";
-
-/* Delete button for attachment actions */
-"HockeyFeedbackComposeAttachmentDelete" = "Fjern bilde";
-
-/* Cancel button for attachment actions */
-"HockeyFeedbackComposeAttachmentCancel" = "Avbryt";
-
-
-/* Set User Data */
-
-/* Title */
-"HockeyFeedbackUserDataTitle" = "Min informasjon";
-
-/* Description On What Should Be Entered */
-"HockeyFeedbackUserDataDescription" = "Du må fylle inn din informasjon før tilbakemelding kan sendes.";
-
-/* Name Field */
-"HockeyFeedbackUserDataName" = "Navn";
-
-/* Name Placeholder */
-"HockeyFeedbackUserDataNamePlaceHolder" = "Ola Nordmann";
-
-/* Email Field */
-"HockeyFeedbackUserDataEmail" = "E-post";
-
-/* Email Placeholder */
-"HockeyFeedbackUserDataEmailPlaceholder" = "epost@eksempel.no";
-
-
-/* Authenticator */
-
-/* View Controller Title*/
-"HockeyAuthenticatorViewControllerTitle" = "HockeyApp";
-
-/* BITAuthenticatorAuthTypeUDIDProvider */
-"HockeyAuthenticationViewControllerWebUDIDLoginDescription" = "Utvikleren har spurt om denne enheten sin UDID. Trykk for å gå til HockeyApp-hjemmesiden og godkjenn tilgang.";
-"HockeyAuthenticationViewControllerWebLoginButtonTitle" = "Åpne HockeyApp";
-
-/* BITAuthenticatorIdentificationTypeWebAuth */
-"HockeyAuthenticationViewControllerWebAuthLoginDescription" = "Utvikleren har spurt om din e-postadresse. Trykk for å gå til HockeyApp-hjemmesiden og godkjenn tilgang.";
-
-/* BITAuthenticatorAuthTypeEmail and BITAuthenticatorAuthTypeEmailAndPassword */
-"HockeyAuthenticationViewControllerDataEmailAndPasswordDescription" = "Vennligst oppgi din e-postadresse og passord registrert på HockeyApp for å få tilgang til appen.";
-"HockeyAuthenticationViewControllerDataEmailDescription" = "Vennligst oppgi din e-postadresse registrert på HockeyApp for å få tilgang til appen.";
-"HockeyAuthenticationViewControllerEmailPlaceholder" = "epost@eksempel.no";
-"HockeyAuthenticationViewControllerPasswordPlaceholder" = "Påkrevd";
-"HockeyAuthenticationViewControllerEmailDescription" = "E-post";
-"HockeyAuthenticationViewControllerPasswordDescription" = "Passord";
-
-/* Error presented to the user if authentication failed because of networking issues */
-"HockeyAuthenticationViewControllerNetworkError" = "Autentisering mislykket på grunn av manglende oppkobling til Internett, vennligst prøv igjen.";
-
-"HockeyAuthenticationFailedAuthenticate" = "Autentisering mislykket, vennligst kontakt utvikleren av appen.";
-"HockeyAuthenticationNotMember" = "Du har ikke godkjent tilgang til denne appen, vennligst kontakt utvikleren.";
-"HockeyAuthenticationContactDeveloper" = "Autentiseringsfeil, vennligst kontakt utvikleren av appen.";
-"HockeyAuthenticationWrongEmailPassword" = "Du har ikke oppgitt en gyldig e-postadresse eller passord, kontroller opplysningene og prøv igjen.";
-"HockeyAuthenticationAuthSecretMissing" = "HockeySDKet mangler autentiseringshemmelighet, vennligst kontakt utvikleren av appen.";
-
-/* Accessibility strings */
-"HockeyAccessibilityHintRequired" = "Påkrevd";
diff --git a/submodules/HockeySDK-iOS/Resources/nl.lproj/HockeySDK.strings b/submodules/HockeySDK-iOS/Resources/nl.lproj/HockeySDK.strings
deleted file mode 100644
index 9c92f67ed9..0000000000
--- a/submodules/HockeySDK-iOS/Resources/nl.lproj/HockeySDK.strings
+++ /dev/null
@@ -1,279 +0,0 @@
-/*
- Localization provided by Wordcrafts
- The Mac OS X and iOS localization experts.
- http://www.wordcrafts.de
- */
-
-
-/* General */
-
-/* For dialogs yes buttons */
-"HockeyYes" = "Ja";
-
-/* For dialogs no buttons */
-"HockeyNo" = "Nee";
-
-/* For dialogs ok buttons */
-"HockeyOK" = "OK";
-
-/* Replacement for app name, if it could not be detected */
-"HockeyAppNamePlaceholder" = "Deze app";
-
-/* Crash */
-
-
-/* Crash dialog */
-
-/* Title showing in the alert box when crash report data has been found */
-"CrashDataFoundTitle" = "%@ is onverwacht gestopt";
-
-/* Description explaining that crash data has been found and ask the user if the data might be uploaded to the developers server */
-"CrashDataFoundAnonymousDescription" = "Wilt u een anoniem rapport versturen zodat we het probleem kunnen oplossen?";
-
-/* Description explaining that crash data has been found and ask the user if the non anonymous data might be uplaoded to the developers server */
-"CrashDataFoundDescription" = "Wilt u een rapport versturen zodat we het probleem kunnen oplossen?";
-
-/* Alert box button if the users wants to send crash data always automatically */
-"CrashSendReportAlways" = "Verstuur altijd";
-
-/* Alert box button to send the crash report once */
-"CrashSendReport" = "Verstuur rapport";
-
-/* Alert box button to decline sending the report */
-"CrashDontSendReport" = "Verstuur niet";
-
-/* Text showing in a processing box that the crash data is being uploaded to the server */
-"CrashReportSending" = "Versturen…";
-
-
-/* Update */
-
-
-/* Update Alert view */
-
-/* Update available */
-"UpdateAvailable" = "Update beschikbaar";
-
-"UpdateAlertTextWithAppVersion" = "%@ is beschikbaar.";
-
-"UpdateAlertMandatoryTextWithAppVersion" = "%@ is beschikbaar en is een verplichte update!";
-
-"UpdateIgnore" = "Negeer";
-
-"UpdateShow" = "Toon";
-
-"UpdateInstall" = "Installeer";
-
-"UpdateRemindMe" = "Herinner me";
-
-
-/* Update Details */
-
-"UpdateScreenTitle" = "Update";
-
-"UpdateButtonCheck" = "CONTROLEER";
-
-"UpdateButtonSearching" = "CONTROLEREN";
-
-"UpdateButtonUpdate" = "WERK BIJ";
-
-"UpdateButtonInstalling" = "INSTALLEREN";
-
-"UpdateButtonOffline" = "OFFLINE";
-
-"UpdateInstalled" = "GEÏNSTALLEERD";
-
-"UpdateVersion" = "Versie";
-
-"UpdateShowPreviousVersions" = "Toon vorige versies...";
-
-"UpdateNoUpdateAvailableTitle" = "Geen update beschikbaar";
-
-"UpdateNoUpdateAvailableMessage" = "%@ is al de nieuwste versie.";
-
-"UpdateError" = "Fout";
-
-"UpdateWarning" = "Waarschuwing";
-
-"UpdateNoReleaseNotesAvailable" = "Geen versiebeschrijvingen beschikbaar.";
-
-
-/* Update Authorization  */
-
-"UpdateAuthorizationProgress" = "Identiteit controleren...";
-
-"UpdateAuthorizationOffline" = "Internetverbinding vereist!";
-
-"UpdateAuthorizationDenied" = "Identiteitscontrole geweigerd. Neem contact op met de ontwikkelaar.";
-
-
-/* Update Expiry  */
-
-"UpdateExpired" = "%@ is verlopen en kan niet langer worden gebruikt.";
-
-
-/* Update Simulator Warning */
-
-"UpdateSimulatorMessage" = "Hockey Update werkt niet in de Simulator.\nHet URL-schema voor itms-voorzieningen:// is geïmplementeerd maar niet functioneel.";
-
-
-/* Feedback */
-
-
-/* New Message Alert */
-
-/* Alert Title */
-"HockeyFeedbackNewMessageTitle" = "Nieuwe reactie op feedback";
-
-/* Alert Text */
-"HockeyFeedbackNewMessageText" = "Er is een nieuwe reactie op uw feedback. Wilt u deze bekijken?";
-
-/* Alert Ignore Button */
-"HockeyFeedbackIgnore" = "Negeer";
-
-/* Alert Show Button */
-"HockeyFeedbackShow" = "Toon";
-
-
-/* List View */
-
-/* Title */
-"HockeyFeedbackListTitle" = "Feedback";
-
-/* Last Updated */
-"HockeyFeedbackListLastUpdated" = "Laatst bijgewerkt: %@";
-
-/* Never Updated */
-"HockeyFeedbackListNeverUpdated" = "Nooit";
-
-/* Provide Feedback Button Title */
-"HockeyFeedbackListButtonWriteFeedback" = "Stuur feedback";
-
-/* Add a Response Button Title */
-"HockeyFeedbackListButtonWriteResponse" = "Voeg een reactie toe";
-
-/* User Data Set Name Button Title */
-"HockeyFeedbackListButtonUserDataSetName" = "Stel uw naam in";
-
-/* User Data Set Email Button Title */
-"HockeyFeedbackListButtonUserDataSetEmail" = "Stel uw e-mail in";
-
-/* User Data With Name Button Title */
-"HockeyFeedbackListButtonUserDataWithName" = "Naam: %@";
-
-/* User Data With Email Button Title */
-"HockeyFeedbackListButtonUserDataWithEmail" = "E-mail: %@";
-
-/* Button title for deleting all local messages*/
-"HockeyFeedbackListButtonDeleteAllMessages" = "Verwijder alle berichten";
-
-/* Message pending to be send */
-"HockeyFeedbackListMessagePending" = "In wachtrij";
-
-
-/* Delete All Messages Action Sheet / Alert View */
-
-/* Title for the Action Sheet */
-"HockeyFeedbackListDeleteAllTitle" = "Dit verwijdert alle berichten op dit apparaat.";
-
-/* Button Title to perform delete action */
-"HockeyFeedbackListDeleteAllDelete" = "Verwijder";
-
-/* Button Title to cancel delete action */
-"HockeyFeedbackListDeleteAllCancel" = "Annuleer";
-
-
-/* Open Link In Safari Action Sheet / Alert View */
-
-/* Button Title to cancel */
-"HockeyFeedbackListLinkActionCancel" = "Annuleer";
-
-/* Button Title to Open the Link */
-"HockeyFeedbackListLinkActionOpen" = "Open";
-
-/* Button Title to Copy the Link */
-"HockeyFeedbackListLinkActionCopy" = "Kopieer";
-
-
-/* UIActivity */
-
-/* Activity Sharing Button Title, App Name will be inserted */
-"HockeyFeedbackActivityButtonTitle" = "Feedback over %@";
-
-/* if there can no app name be found, use this instead for HockeyFeedbackActivityButtonTitle */
-"HockeyFeedbackActivityAppPlaceholder" = "App";
-
-
-/* Compose Message */
-
-/* Title */
-"HockeyFeedbackComposeTitle" = "Nieuwe feedback";
-
-/* Send button */
-"HockeyFeedbackComposeSend" = "Verstuur";
-
-/* Add Image button for attachment actions */
-"HockeyFeedbackComposeAttachmentAddImage" = "Voeg afbeelding toe";
-
-/* Edit button for attachment actions */
-"HockeyFeedbackComposeAttachmentEdit" = "Wijzig afbeelding";
-
-/* Delete button for attachment actions */
-"HockeyFeedbackComposeAttachmentDelete" = "Verwijder afbeelding";
-
-/* Cancel button for attachment actions */
-"HockeyFeedbackComposeAttachmentCancel" = "Annuleer";
-
-
-/* Set User Data */
-
-/* Title */
-"HockeyFeedbackUserDataTitle" = "Mijn info";
-
-/* Description On What Should Be Entered */
-"HockeyFeedbackUserDataDescription" = "Geef uw gegevens op alvorens uw feedback te schrijven.";
-
-/* Name Field */
-"HockeyFeedbackUserDataName" = "Naam";
-
-/* Name Placeholder */
-"HockeyFeedbackUserDataNamePlaceHolder" = "Jan Smit";
-
-/* Email Field */
-"HockeyFeedbackUserDataEmail" = "E-mail";
-
-/* Email Placeholder */
-"HockeyFeedbackUserDataEmailPlaceholder" = "e-mail@voorbeeld.com";
-
-
-/* Authenticator */
-
-/* View Controller Title*/
-"HockeyAuthenticatorViewControllerTitle" = "HockeyApp";
-
-/* BITAuthenticatorAuthTypeUDIDProvider */
-"HockeyAuthenticationViewControllerWebUDIDLoginDescription" = "De ontwikkelaar heeft de UDID van dit apparaat gevraagd. Tik hieronder om de website van HockeyApp te openen en toegang te verlenen.";
-"HockeyAuthenticationViewControllerWebLoginButtonTitle" = "Open HockeyApp";
-
-/* BITAuthenticatorIdentificationTypeWebAuth */
-"HockeyAuthenticationViewControllerWebAuthLoginDescription" = "De ontwikkelaar heeft het e-mailadres van uw HockeyApp-account gevraagd. Tik hieronder om de website van HockeyApp te openen en toegang te verlenen.";
-
-/* BITAuthenticatorAuthTypeEmail and BITAuthenticatorAuthTypeEmailAndPassword */
-"HockeyAuthenticationViewControllerDataEmailAndPasswordDescription" = "Voer het e-mailadres en wachtwoord van uw HockeyApp-account in om toegang tot deze app te verlenen.";
-"HockeyAuthenticationViewControllerDataEmailDescription" = "Voer het e-mailadres van uw HockeyApp-account in om toegang tot deze app te verlenen.";
-"HockeyAuthenticationViewControllerEmailPlaceholder" = "mail@voorbeeld.com";
-"HockeyAuthenticationViewControllerPasswordPlaceholder" = "Verplicht";
-"HockeyAuthenticationViewControllerEmailDescription" = "E-mail";
-"HockeyAuthenticationViewControllerPasswordDescription" = "Wachtwoord";
-
-/* Error presented to the user if authentication failed because of networking issues */
-"HockeyAuthenticationViewControllerNetworkError" = "Identiteitscontrole mislukt omdat uw apparaat niet is verbonden met het internet. Probeer opnieuw.";
-
-"HockeyAuthenticationFailedAuthenticate" = "Identiteitscontrole mislukt. Probeer opnieuw of neem contact op met de ontwikkelaar van deze app.";
-"HockeyAuthenticationNotMember" = "U bent niet gemachtigd om deze app te gebruiken. Neem contact op met de ontwikkelaar van deze app.";
-"HockeyAuthenticationContactDeveloper" = "Fout bij identiteitscontrole. Neem contact op met de ontwikkelaar van deze app.";
-"HockeyAuthenticationWrongEmailPassword" = "U hebt een ongeldig e-mailadres of wachtwoord ingevoerd. Controleer uw gegevens en probeer opnieuw.";
-"HockeyAuthenticationAuthSecretMissing" = "Het 'Authorization secret' van HockeySDK is nog niet ingesteld. Neem contact op met de ontwikkelaar van deze app.";
-
-/* Accessibility strings */
-"HockeyAccessibilityHintRequired" = "Verplicht";
diff --git a/submodules/HockeySDK-iOS/Resources/pt-PT.lproj/HockeySDK.strings b/submodules/HockeySDK-iOS/Resources/pt-PT.lproj/HockeySDK.strings
deleted file mode 100644
index 1f1edcf007..0000000000
--- a/submodules/HockeySDK-iOS/Resources/pt-PT.lproj/HockeySDK.strings
+++ /dev/null
@@ -1,279 +0,0 @@
-/*
- Localization provided by Wordcrafts
- The Mac OS X and iOS localization experts.
- http://www.wordcrafts.de
- */
-
-
-/* General */
-
-/* For dialogs yes buttons */
-"HockeyYes" = "Sim";
-
-/* For dialogs no buttons */
-"HockeyNo" = "Não";
-
-/* For dialogs ok buttons */
-"HockeyOK" = "OK";
-
-/* Replacement for app name, if it could not be detected */
-"HockeyAppNamePlaceholder" = "Esta aplicação";
-
-/* Crash */
-
-
-/* Crash dialog */
-
-/* Title showing in the alert box when crash report data has been found */
-"CrashDataFoundTitle" = "%@ fechou inesperadamente";
-
-/* Description explaining that crash data has been found and ask the user if the data might be uploaded to the developers server */
-"CrashDataFoundAnonymousDescription" = "Pretende enviar um relatório anónimo para que possamos resolver o problema?";
-
-/* Description explaining that crash data has been found and ask the user if the non anonymous data might be uplaoded to the developers server */
-"CrashDataFoundDescription" = "Pretende enviar um relatório para que possamos resolver o problema?";
-
-/* Alert box button if the users wants to send crash data always automatically */
-"CrashSendReportAlways" = "Enviar sempre";
-
-/* Alert box button to send the crash report once */
-"CrashSendReport" = "Enviar relatório";
-
-/* Alert box button to decline sending the report */
-"CrashDontSendReport" = "Não enviar";
-
-/* Text showing in a processing box that the crash data is being uploaded to the server */
-"CrashReportSending" = "A enviar...";
-
-
-/* Update */
-
-
-/* Update Alert view */
-
-/* Update available */
-"UpdateAvailable" = "Actualização disponível";
-
-"UpdateAlertTextWithAppVersion" = "%@ está disponível.";
-
-"UpdateAlertMandatoryTextWithAppVersion" = "%@ está disponível e é uma actualização obrigatória!";
-
-"UpdateIgnore" = "Ignorar";
-
-"UpdateShow" = "Mostrar";
-
-"UpdateInstall" = "Instalar";
-
-"UpdateRemindMe" = "Lembrar-me";
-
-
-/* Update Details */
-
-"UpdateScreenTitle" = "Actualização";
-
-"UpdateButtonCheck" = "VERIFICAR";
-
-"UpdateButtonSearching" = "A VERIFICAR";
-
-"UpdateButtonUpdate" = "ACTUALIZAR";
-
-"UpdateButtonInstalling" = "A INSTALAR";
-
-"UpdateButtonOffline" = "OFFLINE";
-
-"UpdateInstalled" = "INSTALADO";
-
-"UpdateVersion" = "Versão";
-
-"UpdateShowPreviousVersions" = "Mostrar versões anteriores...";
-
-"UpdateNoUpdateAvailableTitle" = "Nenhuma actualização disponível";
-
-"UpdateNoUpdateAvailableMessage" = "%@ é a mais recente.";
-
-"UpdateError" = "Erro";
-
-"UpdateWarning" = "Aviso";
-
-"UpdateNoReleaseNotesAvailable" = "Nenhuma nota de lançamento disponível.";
-
-
-/* Update Authorization  */
-
-"UpdateAuthorizationProgress" = "A autorizar...";
-
-"UpdateAuthorizationOffline" = "É necessária uma ligação à Internet!";
-
-"UpdateAuthorizationDenied" = "Autorização negada. Contacte o programador.";
-
-
-/* Update Expiry  */
-
-"UpdateExpired" = "%@ expirou e já não pode ser utilizada.";
-
-
-/* Update Simulator Warning */
-
-"UpdateSimulatorMessage" = "A actualização do Hockey não funciona com o Simulador.\nO url scheme itms-services:// está implementado mas não funciona.";
-
-
-/* Feedback */
-
-
-/* New Message Alert */
-
-/* Alert Title */
-"HockeyFeedbackNewMessageTitle" = "Nova resposta a comentário";
-
-/* Alert Text */
-"HockeyFeedbackNewMessageText" = "Está disponível uma nova resposta ao seu comentário. Pretende vê-la?";
-
-/* Alert Ignore Button */
-"HockeyFeedbackIgnore" = "Ignorar";
-
-/* Alert Show Button */
-"HockeyFeedbackShow" = "Mostrar";
-
-
-/* List View */
-
-/* Title */
-"HockeyFeedbackListTitle" = "Comentário";
-
-/* Last Updated */
-"HockeyFeedbackListLastUpdated" = "Última actualização: %@";
-
-/* Never Updated */
-"HockeyFeedbackListNeverUpdated" = "Nunca";
-
-/* Provide Feedback Button Title */
-"HockeyFeedbackListButtonWriteFeedback" = "Fornecer comentário";
-
-/* Add a Response Button Title */
-"HockeyFeedbackListButtonWriteResponse" = "Adicionar uma resposta";
-
-/* User Data Set Name Button Title */
-"HockeyFeedbackListButtonUserDataSetName" = "Definir nome";
-
-/* User Data Set Email Button Title */
-"HockeyFeedbackListButtonUserDataSetEmail" = "Definir e-mail";
-
-/* User Data With Name Button Title */
-"HockeyFeedbackListButtonUserDataWithName" = "Nome: %@";
-
-/* User Data With Email Button Title */
-"HockeyFeedbackListButtonUserDataWithEmail" = "E-mail: %@";
-
-/* Button title for deleting all local messages*/
-"HockeyFeedbackListButtonDeleteAllMessages" = "Eliminar todas as mensagens";
-
-/* Message pending to be send */
-"HockeyFeedbackListMessagePending" = "Pendente";
-
-
-/* Delete All Messages Action Sheet / Alert View */
-
-/* Title for the Action Sheet */
-"HockeyFeedbackListDeleteAllTitle" = "Todas as mensagens do dispositivo serão eliminadas.";
-
-/* Button Title to perform delete action */
-"HockeyFeedbackListDeleteAllDelete" = "Eliminar";
-
-/* Button Title to cancel delete action */
-"HockeyFeedbackListDeleteAllCancel" = "Cancelar";
-
-
-/* Open Link In Safari Action Sheet / Alert View */
-
-/* Button Title to cancel */
-"HockeyFeedbackListLinkActionCancel" = "Cancelar";
-
-/* Button Title to Open the Link */
-"HockeyFeedbackListLinkActionOpen" = "Abrir";
-
-/* Button Title to Copy the Link */
-"HockeyFeedbackListLinkActionCopy" = "Copiar";
-
-
-/* UIActivity */
-
-/* Activity Sharing Button Title, App Name will be inserted */
-"HockeyFeedbackActivityButtonTitle" = "Comentário de %@";
-
-/* if there can no app name be found, use this instead for HockeyFeedbackActivityButtonTitle */
-"HockeyFeedbackActivityAppPlaceholder" = "Aplicação";
-
-
-/* Compose Message */
-
-/* Title */
-"HockeyFeedbackComposeTitle" = "Novo comentário";
-
-/* Send button */
-"HockeyFeedbackComposeSend" = "Enviar";
-
-/* Add Image button for attachment actions */
-"HockeyFeedbackComposeAttachmentAddImage" = "Adicionar imagem";
-
-/* Edit button for attachment actions */
-"HockeyFeedbackComposeAttachmentEdit" = "Editar imagem";
-
-/* Delete button for attachment actions */
-"HockeyFeedbackComposeAttachmentDelete" = "Apagar imagem";
-
-/* Cancel button for attachment actions */
-"HockeyFeedbackComposeAttachmentCancel" = "Cancelar";
-
-
-/* Set User Data */
-
-/* Title */
-"HockeyFeedbackUserDataTitle" = "Os meus dados";
-
-/* Description On What Should Be Entered */
-"HockeyFeedbackUserDataDescription" = "Forneça os seus dados antes de escrever o comentário.";
-
-/* Name Field */
-"HockeyFeedbackUserDataName" = "Nome";
-
-/* Name Placeholder */
-"HockeyFeedbackUserDataNamePlaceHolder" = "João Silva";
-
-/* Email Field */
-"HockeyFeedbackUserDataEmail" = "E-mail";
-
-/* Email Placeholder */
-"HockeyFeedbackUserDataEmailPlaceholder" = "email@exemplo.com";
-
-
-/* Authenticator */
-
-/* View Controller Title*/
-"HockeyAuthenticatorViewControllerTitle" = "HockeyApp";
-
-/* BITAuthenticatorAuthTypeUDIDProvider */
-"HockeyAuthenticationViewControllerWebUDIDLoginDescription" = "O programador solicitou o UDID deste dispositivo. Toque em baixo para abrir o website do HockeyApp e autorizar o acesso.";
-"HockeyAuthenticationViewControllerWebLoginButtonTitle" = "Abrir o HockeyApp";
-
-/* BITAuthenticatorIdentificationTypeWebAuth */
-"HockeyAuthenticationViewControllerWebAuthLoginDescription" = "O programador solicitou o endereço de e-mail e a palavra-passe da sua conta HockeyApp. Toque em baixo para abrir o website do HockeyApp e autorizar o acesso.";
-
-/* BITAuthenticatorAuthTypeEmail and BITAuthenticatorAuthTypeEmailAndPassword */
-"HockeyAuthenticationViewControllerDataEmailAndPasswordDescription" = "Introduza o endereço de e-mail e a palavra-passe da sua conta HockeyApp para autorizar o acesso a esta aplicação.";
-"HockeyAuthenticationViewControllerDataEmailDescription" = "Introduza o endereço de e-mail da sua conta HockeyApp para autorizar o acesso a esta aplicação.";
-"HockeyAuthenticationViewControllerEmailPlaceholder" = "email@exemplo.com";
-"HockeyAuthenticationViewControllerPasswordPlaceholder" = "Necessário";
-"HockeyAuthenticationViewControllerEmailDescription" = "E-mail";
-"HockeyAuthenticationViewControllerPasswordDescription" = "Palavra-passe";
-
-/* Error presented to the user if authentication failed because of networking issues */
-"HockeyAuthenticationViewControllerNetworkError" = "Falha ao autorizar porque provavelmente o dispositivo não tem ligação à Internet. Tente novamente.";
-
-"HockeyAuthenticationFailedAuthenticate" = "Falha ao autorizar. Tente novamente ou contacte o programador desta aplicação.";
-"HockeyAuthenticationNotMember" = "Não está autorizado a utilizar esta aplicação. Contacte o programador desta aplicação.";
-"HockeyAuthenticationContactDeveloper" = "Erro de autorização. Contacte o programador desta aplicação.";
-"HockeyAuthenticationWrongEmailPassword" = "Introduziu um e-mail ou palavra-passe inválida. Verifique e tente novamente.";
-"HockeyAuthenticationAuthSecretMissing" = "O \"authorization secret\" do HockeySDK não foi definido. Contacte o programador desta aplicação.";
-
-/* Accessibility strings */
-"HockeyAccessibilityHintRequired" = "Necessário";
diff --git a/submodules/HockeySDK-iOS/Resources/pt.lproj/HockeySDK.strings b/submodules/HockeySDK-iOS/Resources/pt.lproj/HockeySDK.strings
deleted file mode 100644
index 0f3141aa09..0000000000
--- a/submodules/HockeySDK-iOS/Resources/pt.lproj/HockeySDK.strings
+++ /dev/null
@@ -1,279 +0,0 @@
-/*
- Localization provided by Wordcrafts
- The Mac OS X and iOS localization experts.
- http://www.wordcrafts.de
- */
-
-
-/* General */
-
-/* For dialogs yes buttons */
-"HockeyYes" = "Sim";
-
-/* For dialogs no buttons */
-"HockeyNo" = "Não";
-
-/* For dialogs ok buttons */
-"HockeyOK" = "OK";
-
-/* Replacement for app name, if it could not be detected */
-"HockeyAppNamePlaceholder" = "Este app";
-
-/* Crash */
-
-
-/* Crash dialog */
-
-/* Title showing in the alert box when crash report data has been found */
-"CrashDataFoundTitle" = "%@ fechou repentinamente";
-
-/* Description explaining that crash data has been found and ask the user if the data might be uploaded to the developers server */
-"CrashDataFoundAnonymousDescription" = "Gostaria de enviar um relatório anônimo para que possamos resolver o problema?";
-
-/* Description explaining that crash data has been found and ask the user if the non anonymous data might be uplaoded to the developers server */
-"CrashDataFoundDescription" = "Gostaria de enviar um relatório para que possamos resolver o problema?";
-
-/* Alert box button if the users wants to send crash data always automatically */
-"CrashSendReportAlways" = "Sempre enviar";
-
-/* Alert box button to send the crash report once */
-"CrashSendReport" = "Enviar relatório";
-
-/* Alert box button to decline sending the report */
-"CrashDontSendReport" = "Não enviar";
-
-/* Text showing in a processing box that the crash data is being uploaded to the server */
-"CrashReportSending" = "Enviando…";
-
-
-/* Update */
-
-
-/* Update Alert view */
-
-/* Update available */
-"UpdateAvailable" = "Atualização disponível";
-
-"UpdateAlertTextWithAppVersion" = "%@ está disponível.";
-
-"UpdateAlertMandatoryTextWithAppVersion" = "%@ está disponível e é uma atualização obrigatória.";
-
-"UpdateIgnore" = "Ignorar";
-
-"UpdateShow" = "Exibir";
-
-"UpdateInstall" = "Instalar";
-
-"UpdateRemindMe" = "Lembrar";
-
-
-/* Update Details */
-
-"UpdateScreenTitle" = "Atualizar";
-
-"UpdateButtonCheck" = "VERIFICAR";
-
-"UpdateButtonSearching" = "VERIFICANDO";
-
-"UpdateButtonUpdate" = "ATUALIZAR";
-
-"UpdateButtonInstalling" = "INSTALANDO";
-
-"UpdateButtonOffline" = "OFFLINE";
-
-"UpdateInstalled" = "INSTALADO";
-
-"UpdateVersion" = "Versão";
-
-"UpdateShowPreviousVersions" = "Mostrar versões anteriores...";
-
-"UpdateNoUpdateAvailableTitle" = "Não há atualização disponível";
-
-"UpdateNoUpdateAvailableMessage" = "%@ já é a versão mais recente.";
-
-"UpdateError" = "Erro";
-
-"UpdateWarning" = "Aviso";
-
-"UpdateNoReleaseNotesAvailable" = "Não há notas de versão disponíveis.";
-
-
-/* Update Authorization  */
-
-"UpdateAuthorizationProgress" = "Autorizando...";
-
-"UpdateAuthorizationOffline" = "É necessário ter conexão à internet.";
-
-"UpdateAuthorizationDenied" = "Autorização recusada. Entre em contato com o desenvolvedor.";
-
-
-/* Update Expiry  */
-
-"UpdateExpired" = "%@ expirou e não pode mais ser usado.";
-
-
-/* Update Simulator Warning */
-
-"UpdateSimulatorMessage" = "A atualização do Hockey não funciona no simulador.\nO protocolo itms-services:// está implementado, mas não funcional.";
-
-
-/* Feedback */
-
-
-/* New Message Alert */
-
-/* Alert Title */
-"HockeyFeedbackNewMessageTitle" = "Nova resposta de feedback";
-
-/* Alert Text */
-"HockeyFeedbackNewMessageText" = "Uma nova resposta a seu feedback está disponível. Gostaria de vê-la?";
-
-/* Alert Ignore Button */
-"HockeyFeedbackIgnore" = "Ignorar";
-
-/* Alert Show Button */
-"HockeyFeedbackShow" = "Exibir";
-
-
-/* List View */
-
-/* Title */
-"HockeyFeedbackListTitle" = "Feedback";
-
-/* Last Updated */
-"HockeyFeedbackListLastUpdated" = "Atualizado em: %@";
-
-/* Never Updated */
-"HockeyFeedbackListNeverUpdated" = "Nunca";
-
-/* Provide Feedback Button Title */
-"HockeyFeedbackListButtonWriteFeedback" = "Fornecer feedback";
-
-/* Add a Response Button Title */
-"HockeyFeedbackListButtonWriteResponse" = "Adicionar uma resposta";
-
-/* User Data Set Name Button Title */
-"HockeyFeedbackListButtonUserDataSetName" = "Informe seu nome";
-
-/* User Data Set Email Button Title */
-"HockeyFeedbackListButtonUserDataSetEmail" = "Informe seu e-mail";
-
-/* User Data With Name Button Title */
-"HockeyFeedbackListButtonUserDataWithName" = "Nome: %@";
-
-/* User Data With Email Button Title */
-"HockeyFeedbackListButtonUserDataWithEmail" = "E-mail: %@";
-
-/* Button title for deleting all local messages*/
-"HockeyFeedbackListButtonDeleteAllMessages" = "Excluir todas as mensagens";
-
-/* Message pending to be send */
-"HockeyFeedbackListMessagePending" = "Pendente";
-
-
-/* Delete All Messages Action Sheet / Alert View */
-
-/* Title for the Action Sheet */
-"HockeyFeedbackListDeleteAllTitle" = "Todas as mensagens serão excluídas deste dispositivo.";
-
-/* Button Title to perform delete action */
-"HockeyFeedbackListDeleteAllDelete" = "Excluir";
-
-/* Button Title to cancel delete action */
-"HockeyFeedbackListDeleteAllCancel" = "Cancelar";
-
-
-/* Open Link In Safari Action Sheet / Alert View */
-
-/* Button Title to cancel */
-"HockeyFeedbackListLinkActionCancel" = "Cancelar";
-
-/* Button Title to Open the Link */
-"HockeyFeedbackListLinkActionOpen" = "Abrir";
-
-/* Button Title to Copy the Link */
-"HockeyFeedbackListLinkActionCopy" = "Copiar";
-
-
-/* UIActivity */
-
-/* Activity Sharing Button Title, App Name will be inserted */
-"HockeyFeedbackActivityButtonTitle" = "Feedback para %@";
-
-/* if there can no app name be found, use this instead for HockeyFeedbackActivityButtonTitle */
-"HockeyFeedbackActivityAppPlaceholder" = "App";
-
-
-/* Compose Message */
-
-/* Title */
-"HockeyFeedbackComposeTitle" = "Novo feedback";
-
-/* Send button */
-"HockeyFeedbackComposeSend" = "Enviar";
-
-/* Add Image button for attachment actions */
-"HockeyFeedbackComposeAttachmentAddImage" = "Adicionar imagem";
-
-/* Edit button for attachment actions */
-"HockeyFeedbackComposeAttachmentEdit" = "Editar imagem";
-
-/* Delete button for attachment actions */
-"HockeyFeedbackComposeAttachmentDelete" = "Excluir imagem";
-
-/* Cancel button for attachment actions */
-"HockeyFeedbackComposeAttachmentCancel" = "Cancelar";
-
-
-/* Set User Data */
-
-/* Title */
-"HockeyFeedbackUserDataTitle" = "Meus dados";
-
-/* Description On What Should Be Entered */
-"HockeyFeedbackUserDataDescription" = "Informe seus dados antes de redigir o feedback.";
-
-/* Name Field */
-"HockeyFeedbackUserDataName" = "Nome";
-
-/* Name Placeholder */
-"HockeyFeedbackUserDataNamePlaceHolder" = "José da Silva";
-
-/* Email Field */
-"HockeyFeedbackUserDataEmail" = "E-mail";
-
-/* Email Placeholder */
-"HockeyFeedbackUserDataEmailPlaceholder" = "email@exemplo.com";
-
-
-/* Authenticator */
-
-/* View Controller Title*/
-"HockeyAuthenticatorViewControllerTitle" = "HockeyApp";
-
-/* BITAuthenticatorAuthTypeUDIDProvider */
-"HockeyAuthenticationViewControllerWebUDIDLoginDescription" = "O desenvolvedor solicitou a UDID deste dispositivo. Toque abaixo para abrir o site do HockeyApp e autorizar o acesso.";
-"HockeyAuthenticationViewControllerWebLoginButtonTitle" = "Abrir HockeyApp";
-
-/* BITAuthenticatorIdentificationTypeWebAuth */
-"HockeyAuthenticationViewControllerWebAuthLoginDescription" = "O desenvolvedor solicitou o endereço de e-mail de sua conta do HockeyApp. Toque abaixo para abrir o site do HockeyApp e autorizar o acesso.";
-
-/* BITAuthenticatorAuthTypeEmail and BITAuthenticatorAuthTypeEmailAndPassword */
-"HockeyAuthenticationViewControllerDataEmailAndPasswordDescription" = "Informe seu e-mail e senha da conta do HockeyApp para autorizar o acesso a este aplicativo.";
-"HockeyAuthenticationViewControllerDataEmailDescription" = "Informe seu e-mail da conta do HockeyApp para autorizar o acesso a este aplicativo.";
-"HockeyAuthenticationViewControllerEmailPlaceholder" = "email@exemplo.com";
-"HockeyAuthenticationViewControllerPasswordPlaceholder" = "Necessário";
-"HockeyAuthenticationViewControllerEmailDescription" = "E-mail";
-"HockeyAuthenticationViewControllerPasswordDescription" = "Senha";
-
-/* Error presented to the user if authentication failed because of networking issues */
-"HockeyAuthenticationViewControllerNetworkError" = "Não foi possível autorizar porque seu dispositivo parece estar desconectado da Internet. Tente novamente.";
-
-"HockeyAuthenticationFailedAuthenticate" = "Falha ao autorizar. Tente novamente ou contate o desenvolvedor deste aplicativo.";
-"HockeyAuthenticationNotMember" = "Você não tem autorização para usar este aplicativo. Contate o desenvolvedor deste aplicativo.";
-"HockeyAuthenticationContactDeveloper" = "Erro de autorização. Contate o desenvolvedor deste aplicativo.";
-"HockeyAuthenticationWrongEmailPassword" = "Você informou um e-mail ou senha inválidos. Verifique os dados e tente  novamente.";
-"HockeyAuthenticationAuthSecretMissing" = "O “authorization secret” do HockeySDK não foi definido. Contate o desenvolvedor deste aplicativo.";
-
-/* Accessibility strings */
-"HockeyAccessibilityHintRequired" = "Necessário";
diff --git a/submodules/HockeySDK-iOS/Resources/ru.lproj/HockeySDK.strings b/submodules/HockeySDK-iOS/Resources/ru.lproj/HockeySDK.strings
deleted file mode 100644
index 518b9fe167..0000000000
--- a/submodules/HockeySDK-iOS/Resources/ru.lproj/HockeySDK.strings
+++ /dev/null
@@ -1,279 +0,0 @@
-/*
- Localization provided by Wordcrafts
- The Mac OS X and iOS localization experts.
- http://www.wordcrafts.de
- */
-
-
-/* General */
-
-/* For dialogs yes buttons */
-"HockeyYes" = "Да";
-
-/* For dialogs no buttons */
-"HockeyNo" = "Нет";
-
-/* For dialogs ok buttons */
-"HockeyOK" = "OK";
-
-/* Replacement for app name, if it could not be detected */
-"HockeyAppNamePlaceholder" = "Эта программа";
-
-/* Crash */
-
-
-/* Crash dialog */
-
-/* Title showing in the alert box when crash report data has been found */
-"CrashDataFoundTitle" = "Неожиданное завершение %@";
-
-/* Description explaining that crash data has been found and ask the user if the data might be uploaded to the developers server */
-"CrashDataFoundAnonymousDescription" = "Пошлете анонимный отчет, чтобы мы могли исправить эту ошибку?";
-
-/* Description explaining that crash data has been found and ask the user if the non anonymous data might be uplaoded to the developers server */
-"CrashDataFoundDescription" = "Пошлете отчет, чтобы мы могли исправить эту ошибку?";
-
-/* Alert box button if the users wants to send crash data always automatically */
-"CrashSendReportAlways" = "Отправлять всегда";
-
-/* Alert box button to send the crash report once */
-"CrashSendReport" = "Отправить отчет";
-
-/* Alert box button to decline sending the report */
-"CrashDontSendReport" = "Не отправлять";
-
-/* Text showing in a processing box that the crash data is being uploaded to the server */
-"CrashReportSending" = "Отправка...";
-
-
-/* Update */
-
-
-/* Update Alert view */
-
-/* Update available */
-"UpdateAvailable" = "Имеется обновление";
-
-"UpdateAlertTextWithAppVersion" = " Доступно: %@.";
-
-"UpdateAlertMandatoryTextWithAppVersion" = "Доступно обязательное обновление %@!";
-
-"UpdateIgnore" = "Игнорировать";
-
-"UpdateShow" = "Показать";
-
-"UpdateInstall" = "Установить";
-
-"UpdateRemindMe" = "Напомнить";
-
-
-/* Update Details */
-
-"UpdateScreenTitle" = "Обновление";
-
-"UpdateButtonCheck" = "ПРОВЕРИТЬ";
-
-"UpdateButtonSearching" = "ПРОВЕРКА";
-
-"UpdateButtonUpdate" = "ОБНОВИТЬ";
-
-"UpdateButtonInstalling" = "УСТАНОВКА";
-
-"UpdateButtonOffline" = "ОФЛАЙН";
-
-"UpdateInstalled" = "УСТАНОВЛЕНО";
-
-"UpdateVersion" = "Версия";
-
-"UpdateShowPreviousVersions" = "Показать предыдущие версии...";
-
-"UpdateNoUpdateAvailableTitle" = "Нет обновлений";
-
-"UpdateNoUpdateAvailableMessage" = "%@: самая новая версия.";
-
-"UpdateError" = "Ошибка";
-
-"UpdateWarning" = "Предупреждение";
-
-"UpdateNoReleaseNotesAvailable" = "Нет комментариев по этой версии.";
-
-
-/* Update Authorization  */
-
-"UpdateAuthorizationProgress" = "Авторизация...";
-
-"UpdateAuthorizationOffline" = "Нужно подключить Интернет!";
-
-"UpdateAuthorizationDenied" = "Отказано в авторизации. Свяжитесь с разработчиком.";
-
-
-/* Update Expiry  */
-
-"UpdateExpired" = "Срок использования %@ истек, использование прекращено.";
-
-
-/* Update Simulator Warning */
-
-"UpdateSimulatorMessage" = "Hockey Update не работает в Simulator.\nСхема itms-services:// url применена, но не работает.";
-
-
-/* Feedback */
-
-
-/* New Message Alert */
-
-/* Alert Title */
-"HockeyFeedbackNewMessageTitle" = "Новый ответ на отклик";
-
-/* Alert Text */
-"HockeyFeedbackNewMessageText" = "Поступил новый ответ на ваш отклик. Просмотреть его?";
-
-/* Alert Ignore Button */
-"HockeyFeedbackIgnore" = "Игнорировать";
-
-/* Alert Show Button */
-"HockeyFeedbackShow" = "Показать";
-
-
-/* List View */
-
-/* Title */
-"HockeyFeedbackListTitle" = "Отклик";
-
-/* Last Updated */
-"HockeyFeedbackListLastUpdated" = "Последнее обновление: %@";
-
-/* Never Updated */
-"HockeyFeedbackListNeverUpdated" = "Не было";
-
-/* Provide Feedback Button Title */
-"HockeyFeedbackListButtonWriteFeedback" = "Написать отклик";
-
-/* Add a Response Button Title */
-"HockeyFeedbackListButtonWriteResponse" = "Добавить ответ";
-
-/* User Data Set Name Button Title */
-"HockeyFeedbackListButtonUserDataSetName" = "Ввести ваше имя";
-
-/* User Data Set Email Button Title */
-"HockeyFeedbackListButtonUserDataSetEmail" = "Ввести ваш email";
-
-/* User Data With Name Button Title */
-"HockeyFeedbackListButtonUserDataWithName" = "Имя: %@";
-
-/* User Data With Email Button Title */
-"HockeyFeedbackListButtonUserDataWithEmail" = "Email: %@";
-
-/* Button title for deleting all local messages*/
-"HockeyFeedbackListButtonDeleteAllMessages" = "Удалить все сообщения";
-
-/* Message pending to be send */
-"HockeyFeedbackListMessagePending" = "Ожидание";
-
-
-/* Delete All Messages Action Sheet / Alert View */
-
-/* Title for the Action Sheet */
-"HockeyFeedbackListDeleteAllTitle" = "Этим действием будут стерты все сообщения на этом устройстве.";
-
-/* Button Title to perform delete action */
-"HockeyFeedbackListDeleteAllDelete" = "Удалить";
-
-/* Button Title to cancel delete action */
-"HockeyFeedbackListDeleteAllCancel" = "Отменить";
-
-
-/* Open Link In Safari Action Sheet / Alert View */
-
-/* Button Title to cancel */
-"HockeyFeedbackListLinkActionCancel" = "Отменить";
-
-/* Button Title to Open the Link */
-"HockeyFeedbackListLinkActionOpen" = "Открыть";
-
-/* Button Title to Copy the Link */
-"HockeyFeedbackListLinkActionCopy" = "Копировать";
-
-
-/* UIActivity */
-
-/* Activity Sharing Button Title, App Name will be inserted */
-"HockeyFeedbackActivityButtonTitle" = "Отклик на %@";
-
-/* if there can no app name be found, use this instead for HockeyFeedbackActivityButtonTitle */
-"HockeyFeedbackActivityAppPlaceholder" = "Программа";
-
-
-/* Compose Message */
-
-/* Title */
-"HockeyFeedbackComposeTitle" = "Новый";
-
-/* Send button */
-"HockeyFeedbackComposeSend" = "Отправить";
-
-/* Add Image button for attachment actions */
-"HockeyFeedbackComposeAttachmentAddImage" = "Добавить фото";
-
-/* Edit button for attachment actions */
-"HockeyFeedbackComposeAttachmentEdit" = "Изменить фото";
-
-/* Delete button for attachment actions */
-"HockeyFeedbackComposeAttachmentDelete" = "Удалить фото";
-
-/* Cancel button for attachment actions */
-"HockeyFeedbackComposeAttachmentCancel" = "Отменить";
-
-
-/* Set User Data */
-
-/* Title */
-"HockeyFeedbackUserDataTitle" = "Мои данные";
-
-/* Description On What Should Be Entered */
-"HockeyFeedbackUserDataDescription" = "Перед отправкой отклика необходимо ввести ваши личные данные.";
-
-/* Name Field */
-"HockeyFeedbackUserDataName" = "Имя";
-
-/* Name Placeholder */
-"HockeyFeedbackUserDataNamePlaceHolder" = "Имя";
-
-/* Email Field */
-"HockeyFeedbackUserDataEmail" = "Email";
-
-/* Email Placeholder */
-"HockeyFeedbackUserDataEmailPlaceholder" = "email@example.com";
-
-
-/* Authenticator */
-
-/* View Controller Title*/
-"HockeyAuthenticatorViewControllerTitle" = "HockeyApp";
-
-/* BITAuthenticatorAuthTypeUDIDProvider */
-"HockeyAuthenticationViewControllerWebUDIDLoginDescription" = "Разработчик запросил UDID этого устройства. Нажмите на ссылку ниже, чтобы открыть сайт HockeyApp и авторизовать доступ.";
-"HockeyAuthenticationViewControllerWebLoginButtonTitle" = "Открыть HockeyApp";
-
-/* BITAuthenticatorIdentificationTypeWebAuth */
-"HockeyAuthenticationViewControllerWebAuthLoginDescription" = "Разработчик запросил email аккаунта HockeyApp. Нажмите на ссылку внизу, чтобы попасть на сайт HockeyApp и авторизовать доступ.";
-
-/* BITAuthenticatorAuthTypeEmail and BITAuthenticatorAuthTypeEmailAndPassword */
-"HockeyAuthenticationViewControllerDataEmailAndPasswordDescription" = "Введите email и пароль аккаунта HockeyApp, чтобы авторизовать доступ к этому приложению.";
-"HockeyAuthenticationViewControllerDataEmailDescription" = "Введите email аккаунта HockeyApp, чтобы авторизовать доступ к этому приложению.";
-"HockeyAuthenticationViewControllerEmailPlaceholder" = "email@example.com";
-"HockeyAuthenticationViewControllerPasswordPlaceholder" = "Обязательное поле";
-"HockeyAuthenticationViewControllerEmailDescription" = "Email";
-"HockeyAuthenticationViewControllerPasswordDescription" = "Пароль";
-
-/* Error presented to the user if authentication failed because of networking issues */
-"HockeyAuthenticationViewControllerNetworkError" = "Не удалось авторизоваться, так как ваше устройство не подключено к интернету. Попробуйте еще раз ";
-
-"HockeyAuthenticationFailedAuthenticate" = "Авторизация не удалась. Попробуйте еще раз или свяжитесь с разработчиком приложения.";
-"HockeyAuthenticationNotMember" = "У вас нет разрешения использовать это приложение. Обратитесь к разработчику приложения.";
-"HockeyAuthenticationContactDeveloper" = "Ошибка авторизации. Свяжитесь с разработчиком приложения.";
-"HockeyAuthenticationWrongEmailPassword" = "Вы ввели неверный email или пароль. Проверьте его правильность и попробуйте еще раз.";
-"HockeyAuthenticationAuthSecretMissing" = "HockeySDK authorization secret не настроен. Свяжитесь с разработчиком приложения.";
-
-/* Accessibility strings */
-"HockeyAccessibilityHintRequired" = "Обязательное поле";
diff --git a/submodules/HockeySDK-iOS/Resources/tr.lproj/HockeySDK.strings b/submodules/HockeySDK-iOS/Resources/tr.lproj/HockeySDK.strings
deleted file mode 100644
index e7fdb030cd..0000000000
--- a/submodules/HockeySDK-iOS/Resources/tr.lproj/HockeySDK.strings
+++ /dev/null
@@ -1,279 +0,0 @@
-/*
- Localization provided by Wordcrafts
- The Mac OS X and iOS localization experts.
- http://www.wordcrafts.de
- */
-
-
-/* General */
-
-/* For dialogs yes buttons */
-"HockeyYes" = "Evet";
-
-/* For dialogs no buttons */
-"HockeyNo" = "Hayır";
-
-/* For dialogs ok buttons */
-"HockeyOK" = "Tamam";
-
-/* Replacement for app name, if it could not be detected */
-"HockeyAppNamePlaceholder" = "Bu uygulama";
-
-/* Crash */
-
-
-/* Crash dialog */
-
-/* Title showing in the alert box when crash report data has been found */
-"CrashDataFoundTitle" = "%@ Beklenmedik Şekilde Kapandı";
-
-/* Description explaining that crash data has been found and ask the user if the data might be uploaded to the developers server */
-"CrashDataFoundAnonymousDescription" = "Sorunu çözmemize yardımcı olması için hata raporu göndermek ister misiniz?";
-
-/* Description explaining that crash data has been found and ask the user if the non anonymous data might be uplaoded to the developers server */
-"CrashDataFoundDescription" = "Sorunu çözmemize yardımcı olması için hata raporu göndermek ister misiniz?";
-
-/* Alert box button if the users wants to send crash data always automatically */
-"CrashSendReportAlways" = "Her Zaman Gönder";
-
-/* Alert box button to send the crash report once */
-"CrashSendReport" = "Gönder";
-
-/* Alert box button to decline sending the report */
-"CrashDontSendReport" = "Gönderme";
-
-/* Text showing in a processing box that the crash data is being uploaded to the server */
-"CrashReportSending" = "Gönderiliyor...";
-
-
-/* Update */
-
-
-/* Update Alert view */
-
-/* Update available */
-"UpdateAvailable" = "Yeni sürüm mevcut";
-
-"UpdateAlertTextWithAppVersion" = "%@ sürümü mevcut.";
-
-"UpdateAlertMandatoryTextWithAppVersion" = "%@ sürümü mevcut ve bu zorunlu bir güncelleme!";
-
-"UpdateIgnore" = "Kapat";
-
-"UpdateShow" = "Show";
-
-"UpdateInstall" = "Yükle";
-
-"UpdateRemindMe" = "Bana Hatırlat";
-
-
-/* Update Details */
-
-"UpdateScreenTitle" = "Güncelle";
-
-"UpdateButtonCheck" = "KONTROL ET";
-
-"UpdateButtonSearching" = "KONTROL EDILIYOR";
-
-"UpdateButtonUpdate" = "GÜNCELLE";
-
-"UpdateButtonInstalling" = "YÜKLENİYOR";
-
-"UpdateButtonOffline" = "ÇEVRİMDIŞI";
-
-"UpdateInstalled" = "YÜKLENDİ";
-
-"UpdateVersion" = "Sürüm";
-
-"UpdateShowPreviousVersions" = "Eski sürümleri göster...";
-
-"UpdateNoUpdateAvailableTitle" = "Yeni sürüm yok";
-
-"UpdateNoUpdateAvailableMessage" = "%@ zaten en güncel sürüm.";
-
-"UpdateError" = "Hata";
-
-"UpdateWarning" = "Uyarı";
-
-"UpdateNoReleaseNotesAvailable" = "Sürüm notu mevcut değil.";
-
-
-/* Update Authorization  */
-
-"UpdateAuthorizationProgress" = "Yetkilendiriliyor...";
-
-"UpdateAuthorizationOffline" = "İnternet bağlantısı gerekli!";
-
-"UpdateAuthorizationDenied" = "Yetkilendirme başarısız oldu. Lütfen yazılımcı ile görüşün.";
-
-
-/* Update Expiry  */
-
-"UpdateExpired" = "%@ sürümünün süresi doldu, bu yüzden artık kullanılamaz.";
-
-
-/* Update Simulator Warning */
-
-"UpdateSimulatorMessage" = "Hockey Update simülatörde çalışmaz.\nThe itms-services:// url scheme is implemented but nonfunctional.";
-
-
-/* Feedback */
-
-
-/* New Message Alert */
-
-/* Alert Title */
-"HockeyFeedbackNewMessageTitle" = "Geri Bildirim Cevabı";
-
-/* Alert Text */
-"HockeyFeedbackNewMessageText" = "Verdiğiniz geri bildirime cevap var. Görmek ister misiniz?";
-
-/* Alert Ignore Button */
-"HockeyFeedbackIgnore" = "Kapat";
-
-/* Alert Show Button */
-"HockeyFeedbackShow" = "Göster";
-
-
-/* List View */
-
-/* Title */
-"HockeyFeedbackListTitle" = "Geri Bildirim";
-
-/* Last Updated */
-"HockeyFeedbackListLastUpdated" = "Son güncellenme tarihi: %@";
-
-/* Never Updated */
-"HockeyFeedbackListNeverUpdated" = "Asla";
-
-/* Provide Feedback Button Title */
-"HockeyFeedbackListButtonWriteFeedback" = "Geri bildirimde bulun";
-
-/* Add a Response Button Title */
-"HockeyFeedbackListButtonWriteResponse" = "Cevap Yaz";
-
-/* User Data Set Name Button Title */
-"HockeyFeedbackListButtonUserDataSetName" = "Adınız ve soyadınız";
-
-/* User Data Set Email Button Title */
-"HockeyFeedbackListButtonUserDataSetEmail" = "E-posta adresiniz";
-
-/* User Data With Name Button Title */
-"HockeyFeedbackListButtonUserDataWithName" = "İsim: %@";
-
-/* User Data With Email Button Title */
-"HockeyFeedbackListButtonUserDataWithEmail" = "E-posta: %@";
-
-/* Button title for deleting all local messages*/
-"HockeyFeedbackListButtonDeleteAllMessages" = "Bütün Mesajları Sil";
-
-/* Message pending to be send */
-"HockeyFeedbackListMessagePending" = "Gönderiliyor";
-
-
-/* Delete All Messages Action Sheet / Alert View */
-
-/* Title for the Action Sheet */
-"HockeyFeedbackListDeleteAllTitle" = "Bu cihazdaki bütün geri bildirim mesajları silinecek.";
-
-/* Button Title to perform delete action */
-"HockeyFeedbackListDeleteAllDelete" = "Sil";
-
-/* Button Title to cancel delete action */
-"HockeyFeedbackListDeleteAllCancel" = "Vazgeç";
-
-
-/* Open Link In Safari Action Sheet / Alert View */
-
-/* Button Title to cancel */
-"HockeyFeedbackListLinkActionCancel" = "Vazgeç";
-
-/* Button Title to Open the Link */
-"HockeyFeedbackListLinkActionOpen" = "Aç";
-
-/* Button Title to Copy the Link */
-"HockeyFeedbackListLinkActionCopy" = "Kopyala";
-
-
-/* UIActivity */
-
-/* Activity Sharing Button Title, App Name will be inserted */
-"HockeyFeedbackActivityButtonTitle" = "%@ Geri Bildirim";
-
-/* if there can no app name be found, use this instead for HockeyFeedbackActivityButtonTitle */
-"HockeyFeedbackActivityAppPlaceholder" = "Uygulama";
-
-
-/* Compose Message */
-
-/* Title */
-"HockeyFeedbackComposeTitle" = "Geri Bildirim";
-
-/* Send button */
-"HockeyFeedbackComposeSend" = "Gönder";
-
-/* Add Image button for attachment actions */
-"HockeyFeedbackComposeAttachmentAddImage" = "Resim Ekle";
-
-/* Edit button for attachment actions */
-"HockeyFeedbackComposeAttachmentEdit" = "Resmi Düzenle";
-
-/* Delete button for attachment actions */
-"HockeyFeedbackComposeAttachmentDelete" = "Resmi Sil";
-
-/* Cancel button for attachment actions */
-"HockeyFeedbackComposeAttachmentCancel" = "Vazgeç";
-
-
-/* Set User Data */
-
-/* Title */
-"HockeyFeedbackUserDataTitle" = "Bilgilerim";
-
-/* Description On What Should Be Entered */
-"HockeyFeedbackUserDataDescription" = "Geri bildirimde bulunmadan önce lütfen profil bilgilerinizi giriniz.";
-
-/* Name Field */
-"HockeyFeedbackUserDataName" = "İsim";
-
-/* Name Placeholder */
-"HockeyFeedbackUserDataNamePlaceHolder" = "John Doe";
-
-/* Email Field */
-"HockeyFeedbackUserDataEmail" = "E-posta";
-
-/* Email Placeholder */
-"HockeyFeedbackUserDataEmailPlaceholder" = "email@example.com";
-
-
-/* Authenticator */
-
-/* View Controller Title*/
-"HockeyAuthenticatorViewControllerTitle" = "HockeyApp";
-
-/* BITAuthenticatorAuthTypeUDIDProvider */
-"HockeyAuthenticationViewControllerWebUDIDLoginDescription" = "Yazılımcı bu cihazın UDID bilgisini talep etti. HockeyApp uygulamasına gitmek ve yetki vermek için aşağıdaki butona/linke basınız.";
-"HockeyAuthenticationViewControllerWebLoginButtonTitle" = "HockeyApp Uygulamasını Aç";
-
-/* BITAuthenticatorIdentificationTypeWebAuth */
-"HockeyAuthenticationViewControllerWebAuthLoginDescription" = "Yazılımcı HockeyApp hesabınızın e-posta adresini talep etti. HockeyApp uygulamasına gitmek ve yetki vermek için aşağıdaki butona/linke basınız.";
-
-/* BITAuthenticatorAuthTypeEmail and BITAuthenticatorAuthTypeEmailAndPassword */
-"HockeyAuthenticationViewControllerDataEmailAndPasswordDescription" = "Bu uygulamaya yetki vermek için lütfen HockeyApp e-posta adresinizi ve parolanızı giriniz.";
-"HockeyAuthenticationViewControllerDataEmailDescription" = "Bu uygulamaya yetki vermek için lütfen HockeyApp e-posta adresinizi giriniz.";
-"HockeyAuthenticationViewControllerEmailPlaceholder" = "email@example.com";
-"HockeyAuthenticationViewControllerPasswordPlaceholder" = "Zorunlu alan";
-"HockeyAuthenticationViewControllerEmailDescription" = "E-posta";
-"HockeyAuthenticationViewControllerPasswordDescription" = "Parola";
-
-/* Error presented to the user if authentication failed because of networking issues */
-"HockeyAuthenticationViewControllerNetworkError" = "İnternete bağlı olmadığınız için yetkilendirme işlemi başarısız oldu. Lütfen tekrar deneyiniz.";
-
-"HockeyAuthenticationFailedAuthenticate" = "Yetkilendirme işlemi başarısız oldu. Lütfen uygulamanın sorumlusuyla görüşünüz.";
-"HockeyAuthenticationNotMember" = "Bu uygulamayı kullanmak için yetkiniz yok. Lütfen uygulamanın sorumlusu ile görüşünüz.";
-"HockeyAuthenticationContactDeveloper" = "Yetkilendirme hatası. Lütfen uygulamanın sorumlusu ile görüşünüz..";
-"HockeyAuthenticationWrongEmailPassword" = "Hatalı e-posta ya da parola girdiniz. Lütfen kontrol edip tekrar deneyiniz.";
-"HockeyAuthenticationAuthSecretMissing" = "The HockeySDK yetkilendirme anahtarı belirlenmedi. Lütfen uygulamanın sorumlusu ile görüşünüz.";
-
-/* Accessibility strings */
-"HockeyAccessibilityHintRequired" = "Zorunlu";
diff --git a/submodules/HockeySDK-iOS/Resources/zh-Hans.lproj/HockeySDK.strings b/submodules/HockeySDK-iOS/Resources/zh-Hans.lproj/HockeySDK.strings
deleted file mode 100644
index 582a4ab90a..0000000000
--- a/submodules/HockeySDK-iOS/Resources/zh-Hans.lproj/HockeySDK.strings
+++ /dev/null
@@ -1,279 +0,0 @@
-/*
- Localization provided by Wordcrafts
- The Mac OS X and iOS localization experts.
- http://www.wordcrafts.de
- */
-
-
-/* General */
-
-/* For dialogs yes buttons */
-"HockeyYes" = "是";
-
-/* For dialogs no buttons */
-"HockeyNo" = "无";
-
-/* For dialogs ok buttons */
-"HockeyOK" = "确定";
-
-/* Replacement for app name, if it could not be detected */
-"HockeyAppNamePlaceholder" = "这个 app";
-
-/* Crash */
-
-
-/* Crash dialog */
-
-/* Title showing in the alert box when crash report data has been found */
-"CrashDataFoundTitle" = "%@ 意外退出";
-
-/* Description explaining that crash data has been found and ask the user if the data might be uploaded to the developers server */
-"CrashDataFoundAnonymousDescription" = "你想要发送一个匿名报告来帮助我们解决这个问题吗？";
-
-/* Description explaining that crash data has been found and ask the user if the non anonymous data might be uplaoded to the developers server */
-"CrashDataFoundDescription" = "你想要发送一个报告来帮助我们解决这个问题吗？";
-
-/* Alert box button if the users wants to send crash data always automatically */
-"CrashSendReportAlways" = "总是发送";
-
-/* Alert box button to send the crash report once */
-"CrashSendReport" = "发送报告";
-
-/* Alert box button to decline sending the report */
-"CrashDontSendReport" = "不发送";
-
-/* Text showing in a processing box that the crash data is being uploaded to the server */
-"CrashReportSending" = "正在发送...";
-
-
-/* Update */
-
-
-/* Update Alert view */
-
-/* Update available */
-"UpdateAvailable" = "更新已推出";
-
-"UpdateAlertTextWithAppVersion" = "%@ 已可用。";
-
-"UpdateAlertMandatoryTextWithAppVersion" = "%@ 已可用，并且是一个强制更新。";
-
-"UpdateIgnore" = "忽略";
-
-"UpdateShow" = "显示";
-
-"UpdateInstall" = "安装";
-
-"UpdateRemindMe" = "提醒我";
-
-
-/* Update Details */
-
-"UpdateScreenTitle" = "更新";
-
-"UpdateButtonCheck" = "检查";
-
-"UpdateButtonSearching" = "正在检查";
-
-"UpdateButtonUpdate" = "更新";
-
-"UpdateButtonInstalling" = "正在安装";
-
-"UpdateButtonOffline" = "离线";
-
-"UpdateInstalled" = "已安装";
-
-"UpdateVersion" = "版本";
-
-"UpdateShowPreviousVersions" = "显示之前版本...";
-
-"UpdateNoUpdateAvailableTitle" = "无可用更新";
-
-"UpdateNoUpdateAvailableMessage" = "%@是最新版本。";
-
-"UpdateError" = "错误";
-
-"UpdateWarning" = "警告";
-
-"UpdateNoReleaseNotesAvailable" = "无版本说明。";
-
-
-/* Update Authorization  */
-
-"UpdateAuthorizationProgress" = "授权中...";
-
-"UpdateAuthorizationOffline" = "需要网络连接！";
-
-"UpdateAuthorizationDenied" = "授权被拒绝。请与开发人员联系。";
-
-
-/* Update Expiry  */
-
-"UpdateExpired" = "%@ 已过期，所以无法使用。";
-
-
-/* Update Simulator Warning */
-
-"UpdateSimulatorMessage" = "Hockey 更新无法在仿真器中进行。\n虽然 itms-services:// URL Scheme已实现，但无法正常工作。";
-
-
-/* Feedback */
-
-
-/* New Message Alert */
-
-/* Alert Title */
-"HockeyFeedbackNewMessageTitle" = "新的反馈回复";
-
-/* Alert Text */
-"HockeyFeedbackNewMessageText" = "你的意见反馈已有一个新的回复，想查看它吗？";
-
-/* Alert Ignore Button */
-"HockeyFeedbackIgnore" = "忽略";
-
-/* Alert Show Button */
-"HockeyFeedbackShow" = "显示";
-
-
-/* List View */
-
-/* Title */
-"HockeyFeedbackListTitle" = "意见反馈";
-
-/* Last Updated */
-"HockeyFeedbackListLastUpdated" = "上次更新: %@";
-
-/* Never Updated */
-"HockeyFeedbackListNeverUpdated" = "从不";
-
-/* Provide Feedback Button Title */
-"HockeyFeedbackListButtonWriteFeedback" = "提供意见反馈";
-
-/* Add a Response Button Title */
-"HockeyFeedbackListButtonWriteResponse" = "添加一个响应";
-
-/* User Data Set Name Button Title */
-"HockeyFeedbackListButtonUserDataSetName" = "设置你的姓名";
-
-/* User Data Set Email Button Title */
-"HockeyFeedbackListButtonUserDataSetEmail" = "设置你的邮件";
-
-/* User Data With Name Button Title */
-"HockeyFeedbackListButtonUserDataWithName" = "姓名: %@";
-
-/* User Data With Email Button Title */
-"HockeyFeedbackListButtonUserDataWithEmail" = "邮件: %@";
-
-/* Button title for deleting all local messages*/
-"HockeyFeedbackListButtonDeleteAllMessages" = "删除全部信息";
-
-/* Message pending to be send */
-"HockeyFeedbackListMessagePending" = "待定";
-
-
-/* Delete All Messages Action Sheet / Alert View */
-
-/* Title for the Action Sheet */
-"HockeyFeedbackListDeleteAllTitle" = "这将会删除此设备上的所有信息。";
-
-/* Button Title to perform delete action */
-"HockeyFeedbackListDeleteAllDelete" = "删除";
-
-/* Button Title to cancel delete action */
-"HockeyFeedbackListDeleteAllCancel" = "取消";
-
-
-/* Open Link In Safari Action Sheet / Alert View */
-
-/* Button Title to cancel */
-"HockeyFeedbackListLinkActionCancel" = "取消";
-
-/* Button Title to Open the Link */
-"HockeyFeedbackListLinkActionOpen" = "打开";
-
-/* Button Title to Copy the Link */
-"HockeyFeedbackListLinkActionCopy" = "拷贝";
-
-
-/* UIActivity */
-
-/* Activity Sharing Button Title, App Name will be inserted */
-"HockeyFeedbackActivityButtonTitle" = "%@ 意见反馈";
-
-/* if there can no app name be found, use this instead for HockeyFeedbackActivityButtonTitle */
-"HockeyFeedbackActivityAppPlaceholder" = "App";
-
-
-/* Compose Message */
-
-/* Title */
-"HockeyFeedbackComposeTitle" = "新的意见反馈";
-
-/* Send button */
-"HockeyFeedbackComposeSend" = "发送";
-
-/* Add Image button for attachment actions */
-"HockeyFeedbackComposeAttachmentAddImage" = "添加图像";
-
-/* Edit button for attachment actions */
-"HockeyFeedbackComposeAttachmentEdit" = "编辑图像";
-
-/* Delete button for attachment actions */
-"HockeyFeedbackComposeAttachmentDelete" = "删除图像";
-
-/* Cancel button for attachment actions */
-"HockeyFeedbackComposeAttachmentCancel" = "取消";
-
-
-/* Set User Data */
-
-/* Title */
-"HockeyFeedbackUserDataTitle" = "我的信息";
-
-/* Description On What Should Be Entered */
-"HockeyFeedbackUserDataDescription" = "请提供你的信息，再写入意见反馈。";
-
-/* Name Field */
-"HockeyFeedbackUserDataName" = "姓名";
-
-/* Name Placeholder */
-"HockeyFeedbackUserDataNamePlaceHolder" = "姓名";
-
-/* Email Field */
-"HockeyFeedbackUserDataEmail" = "邮件";
-
-/* Email Placeholder */
-"HockeyFeedbackUserDataEmailPlaceholder" = "email@example.com";
-
-
-/* Authenticator */
-
-/* View Controller Title*/
-"HockeyAuthenticatorViewControllerTitle" = "HockeyApp";
-
-/* BITAuthenticatorAuthTypeUDIDProvider */
-"HockeyAuthenticationViewControllerWebUDIDLoginDescription" = "开发人员已经要求该设备的 UDID。点击下面来打开 HockeyApp 网站并授权访问。";
-"HockeyAuthenticationViewControllerWebLoginButtonTitle" = "打开 HockeyApp";
-
-/* BITAuthenticatorIdentificationTypeWebAuth */
-"HockeyAuthenticationViewControllerWebAuthLoginDescription" = "开发人员已经要求你的 HockeyApp 帐户的电子邮件。点击下面来打开 HockeyApp 网站并授权访问。";
-
-/* BITAuthenticatorAuthTypeEmail and BITAuthenticatorAuthTypeEmailAndPassword */
-"HockeyAuthenticationViewControllerDataEmailAndPasswordDescription" = "请输入你的 HockeyApp 帐户的电子邮件和密码来授权访问这个 app。";
-"HockeyAuthenticationViewControllerDataEmailDescription" = "请输入你的 HockeyApp 帐户的电子邮件来授权访问这个 app。";
-"HockeyAuthenticationViewControllerEmailPlaceholder" = "email@example.com";
-"HockeyAuthenticationViewControllerPasswordPlaceholder" = "必填";
-"HockeyAuthenticationViewControllerEmailDescription" = "邮件";
-"HockeyAuthenticationViewControllerPasswordDescription" = "密码";
-
-/* Error presented to the user if authentication failed because of networking issues */
-"HockeyAuthenticationViewControllerNetworkError" = "你设备的 Internet 连接似乎已断开，导致授权失败。请再试一次。";
-
-"HockeyAuthenticationFailedAuthenticate" = "授权错误。请再试一次或联系这个 app 的开发人员。";
-"HockeyAuthenticationNotMember" = "你未获授权使用这个程序。请联系这个 app 的开发人员。";
-"HockeyAuthenticationContactDeveloper" = "授权错误。请联系这个 app 开发人员。";
-"HockeyAuthenticationWrongEmailPassword" = "你输入了一个无效的电子邮件或密码，请检查后再试一次。";
-"HockeyAuthenticationAuthSecretMissing" = "尚未设置 HockeySDK  authorization secret。请联系这个 app 的开发人员。";
-
-/* Accessibility strings */
-"HockeyAccessibilityHintRequired" = "必填";
diff --git a/submodules/HockeySDK-iOS/Support/HockeySDK Framework/Info.plist b/submodules/HockeySDK-iOS/Support/HockeySDK Framework/Info.plist
deleted file mode 100644
index 1c0fe47b80..0000000000
--- a/submodules/HockeySDK-iOS/Support/HockeySDK Framework/Info.plist	
+++ /dev/null
@@ -1,26 +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>${VERSION_STRING}</string>
-	<key>CFBundleSignature</key>
-	<string>????</string>
-	<key>CFBundleVersion</key>
-	<string>$(BUILD_NUMBER)</string>
-	<key>NSPrincipalClass</key>
-	<string></string>
-</dict>
-</plist>
diff --git a/submodules/HockeySDK-iOS/Support/HockeySDK FrameworkTests/Info.plist b/submodules/HockeySDK-iOS/Support/HockeySDK FrameworkTests/Info.plist
deleted file mode 100644
index ba72822e87..0000000000
--- a/submodules/HockeySDK-iOS/Support/HockeySDK FrameworkTests/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>BNDL</string>
-	<key>CFBundleShortVersionString</key>
-	<string>1.0</string>
-	<key>CFBundleSignature</key>
-	<string>????</string>
-	<key>CFBundleVersion</key>
-	<string>1</string>
-</dict>
-</plist>
diff --git a/submodules/HockeySDK-iOS/Support/HockeySDKBase.xcconfig b/submodules/HockeySDK-iOS/Support/HockeySDKBase.xcconfig
deleted file mode 100644
index b915fd0f12..0000000000
--- a/submodules/HockeySDK-iOS/Support/HockeySDKBase.xcconfig
+++ /dev/null
@@ -1,74 +0,0 @@
-BUILD_NUMBER = 108
-VERSION_STRING = 5.1.2
-GCC_PREPROCESSOR_DEFINITIONS = $(inherited) $(HOCKEYSDK_GCC_PREPROCESSOR_DEFINITIONS) HOCKEYSDK_CONFIGURATION_$(CONFIGURATION) BITHOCKEY_VERSION="@\""$(VERSION_STRING)"\"" BITHOCKEY_BUILD="@\""$(BUILD_NUMBER)"\"" BITHOCKEY_C_VERSION="\""$(VERSION_STRING)"\"" BITHOCKEY_C_BUILD="\""$(BUILD_NUMBER)"\""
-BIT_ARM_ARCHS = armv7 armv7s arm64
-BIT_SIM_ARCHS = x86_64 i386
-ARCHS[sdk=iphoneos*] = $(BIT_ARM_ARCHS)
-ARCHS[sdk=iphonesimulator*] = $(BIT_SIM_ARCHS)
-VALID_ARCHS[sdk=iphoneos*] = $(BIT_ARM_ARCHS)
-VALID_ARCHS[sdk=iphonesimulator*] = $(BIT_SIM_ARCHS)
-OTHER_CFLAGS = $(HOCKEYSDK_WARNING_FLAGS)
-OTHER_CFLAGS[sdk=iphoneos9.*] = $(HOCKEYSDK_WARNING_FLAGS) -fembed-bitcode
-OTHER_CFLAGS[sdk=iphonesimulator9.*] = $(HOCKEYSDK_WARNING_FLAGS) -fembed-bitcode-marker
-OTHER_CFLAGS[sdk=iphoneos10.*] = $(HOCKEYSDK_WARNING_FLAGS) -fembed-bitcode
-OTHER_CFLAGS[sdk=iphonesimulator10.*] = $(HOCKEYSDK_WARNING_FLAGS) -fembed-bitcode-marker
-OTHER_CFLAGS[sdk=iphoneos11.*] = $(HOCKEYSDK_WARNING_FLAGS) -fembed-bitcode
-OTHER_CFLAGS[sdk=iphonesimulator11.*] = $(HOCKEYSDK_WARNING_FLAGS) -fembed-bitcode-marker
-OTHER_LDFLAGS=$(inherited) -framework CrashReporter -framework CoreTelephony -framework CoreText -framework CoreGraphics -framework Foundation -framework MobileCoreServices -framework Photos -framework QuartzCore -framework QuickLook -framework Security -framework SystemConfiguration -framework UIKit -lc++ -lz
-HOCKEYSDK_DOCSET_NAME=HockeySDK-iOS
-HOCKEYSDK_GCC_PREPROCESSOR_DEFINITIONS=$(inherited) $(XCODEBUILD_GCC_PREPROCESSOR_DEFINITIONS)
-HOCKEYSDK_WARNING_FLAGS = -Wshorten-64-to-32 -Wall
-WARNING_CFLAGS = -Weverything -Wno-objc-missing-property-synthesis -Wno-float-equal -Wno-pedantic -Wno-padded -Wno-sign-conversion -Wno-c++98-compat -Wno-c++98-compat-pedantic -Wno-auto-import -Wno-assign-enum -Wno-exit-time-destructors -Wno-global-constructors -Wno-cast-align -Wno-reserved-id-macro -Wno-disabled-macro-expansion -Wno-objc-interface-ivars -Wno-documentation-unknown-command -Wno-covered-switch-default -Wno-switch-enum -Wno-format-nonliteral 
-
-// These are all partially (but not completely?) independent of WARNING_CFLAGS
-// and need to be specified explicitly.
-GCC_WARN_ABOUT_MISSING_FIELD_INITIALIZERS = YES
-GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES
-GCC_WARN_ABOUT_RETURN_TYPE = YES
-GCC_WARN_NON_VIRTUAL_DESTRUCTOR = YES
-GCC_WARN_HIDDEN_VIRTUAL_FUNCTIONS = YES
-GCC_WARN_INITIALIZER_NOT_FULLY_BRACKETED = YES
-GCC_WARN_MISSING_PARENTHESES = YES
-GCC_WARN_CHECK_SWITCH_STATEMENTS = YES
-GCC_WARN_UNUSED_FUNCTION = YES
-GCC_WARN_UNUSED_LABEL = YES
-GCC_WARN_UNUSED_PARAMETER = YES
-GCC_WARN_UNUSED_VARIABLE = YES
-GCC_WARN_UNUSED_VALUE = YES
-GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE
-GCC_WARN_UNKNOWN_PRAGMAS = YES
-GCC_WARN_SHADOW = YES
-GCC_WARN_FOUR_CHARACTER_CONSTANTS = YES
-GCC_WARN_64_TO_32_BIT_CONVERSION = YES
-GCC_WARN_ABOUT_MISSING_NEWLINE = YES
-GCC_WARN_UNDECLARED_SELECTOR = YES
-GCC_WARN_ABOUT_INVALID_OFFSETOF_MACRO = YES
-CLANG_WARN__EXIT_TIME_DESTRUCTORS = YES
-CLANG_WARN_EMPTY_BODY = YES
-CLANG_WARN_CONSTANT_CONVERSION = YES
-CLANG_WARN_INT_CONVERSION = YES
-CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR
-CLANG_WARN_IMPLICIT_SIGN_CONVERSION = YES
-CLANG_WARN_CXX0X_EXTENSIONS = YES
-CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES
-CLANG_WARN_OBJC_EXPLICIT_OWNERSHIP_TYPE = YES
-CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES
-CLANG_WARN_OBJC_REPEATED_USE_OF_WEAK = YES
-CLANG_WARN_UNREACHABLE_CODE = YES
-CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR
-CLANG_WARN__DUPLICATE_METHOD_MATCH = YES
-CLANG_WARN_ENUM_CONVERSION = YES
-CLANG_WARN_BOOL_CONVERSION = YES
-CLANG_WARN_SUSPICIOUS_IMPLICIT_CONVERSION = YES
-
-// Enable extra analyze modes
-CLANG_ANALYZER_SECURITY_FLOATLOOPCOUNTER = YES
-CLANG_ANALYZER_SECURITY_INSECUREAPI_RAND = YES
-CLANG_ANALYZER_SECURITY_INSECUREAPI_STRCPY = YES
-CLANG_ANALYZER_NONNULL = YES
-
-// Enable warnings-are-errors for all modes. Don't do this just yet.
-GCC_TREAT_WARNINGS_AS_ERRORS = NO
-
-// Code coverage has to be disabled for Carthage to work with Xcode 9.
-CLANG_ENABLE_CODE_COVERAGE = NO
diff --git a/submodules/HockeySDK-iOS/Support/HockeySDKCrashOnlyConfig.h b/submodules/HockeySDK-iOS/Support/HockeySDKCrashOnlyConfig.h
deleted file mode 100644
index c8c7034608..0000000000
--- a/submodules/HockeySDK-iOS/Support/HockeySDKCrashOnlyConfig.h
+++ /dev/null
@@ -1,99 +0,0 @@
-/*
- * Author: Andreas Linde <mail@andreaslinde.de>
- *
- * Copyright (c) 2013-2014 HockeyApp, Bit Stadium GmbH.
- * All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person
- * obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without
- * restriction, including without limitation the rights to use,
- * copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following
- * conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
- * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
- */
-
-/*
- * This file is only used by the binary framework target when building
- * and creating the crash reporting only framework
- *
- * Attention: Do not include this into your projects yourself!
- */
- 
-#ifndef HockeySDK_HockeySDKFeatureConfig_h
-#define HockeySDK_HockeySDKFeatureConfig_h
-
-
-/**
- * If true, include support for handling crash reports
- *
- * _Default_: Enabled
- */
-#ifndef HOCKEYSDK_FEATURE_CRASH_REPORTER
-#    define HOCKEYSDK_FEATURE_CRASH_REPORTER 1
-#endif /* HOCKEYSDK_FEATURE_CRASH_REPORTER */
-
-
-/**
- * If true, include support for managing user feedback
- *
- * _Default_: Enabled
- */
-#ifndef HOCKEYSDK_FEATURE_FEEDBACK
-#    define HOCKEYSDK_FEATURE_FEEDBACK 0
-#endif /* HOCKEYSDK_FEATURE_FEEDBACK */
-
-
-/**
- * If true, include support for informing the user about new updates pending in the App Store
- *
- * _Default_: Enabled
- */
-#ifndef HOCKEYSDK_FEATURE_STORE_UPDATES
-#    define HOCKEYSDK_FEATURE_STORE_UPDATES 0
-#endif /* HOCKEYSDK_FEATURE_STORE_UPDATES */
-
-
-/**
- * If true, include support for authentication installations for Ad-Hoc and Enterprise builds
- *
- * _Default_: Enabled
- */
-#ifndef HOCKEYSDK_FEATURE_AUTHENTICATOR
-#    define HOCKEYSDK_FEATURE_AUTHENTICATOR 0
-#endif /* HOCKEYSDK_FEATURE_AUTHENTICATOR */
-
-
-/**
- * If true, include support for handling in-app updates for Ad-Hoc and Enterprise builds
- *
- * _Default_: Enabled
- */
-#ifndef HOCKEYSDK_FEATURE_UPDATES
-#    define HOCKEYSDK_FEATURE_UPDATES 0
-#endif /* HOCKEYSDK_FEATURE_UPDATES */
-
-
-/**
- * If true, include support for auto collecting metrics data such as sessions and user
- *
- * _Default_: Enabled
- */
-#ifndef HOCKEYSDK_FEATURE_METRICS
-#    define HOCKEYSDK_FEATURE_METRICS 0
-#endif /* HOCKEYSDK_FEATURE_METRICS */
-
-#endif /* HockeySDK_HockeySDKFeatureConfig_h */
diff --git a/submodules/HockeySDK-iOS/Support/HockeySDKCrashOnlyExtensionConfig.h b/submodules/HockeySDK-iOS/Support/HockeySDKCrashOnlyExtensionConfig.h
deleted file mode 100644
index c8c7034608..0000000000
--- a/submodules/HockeySDK-iOS/Support/HockeySDKCrashOnlyExtensionConfig.h
+++ /dev/null
@@ -1,99 +0,0 @@
-/*
- * Author: Andreas Linde <mail@andreaslinde.de>
- *
- * Copyright (c) 2013-2014 HockeyApp, Bit Stadium GmbH.
- * All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person
- * obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without
- * restriction, including without limitation the rights to use,
- * copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following
- * conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
- * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
- */
-
-/*
- * This file is only used by the binary framework target when building
- * and creating the crash reporting only framework
- *
- * Attention: Do not include this into your projects yourself!
- */
- 
-#ifndef HockeySDK_HockeySDKFeatureConfig_h
-#define HockeySDK_HockeySDKFeatureConfig_h
-
-
-/**
- * If true, include support for handling crash reports
- *
- * _Default_: Enabled
- */
-#ifndef HOCKEYSDK_FEATURE_CRASH_REPORTER
-#    define HOCKEYSDK_FEATURE_CRASH_REPORTER 1
-#endif /* HOCKEYSDK_FEATURE_CRASH_REPORTER */
-
-
-/**
- * If true, include support for managing user feedback
- *
- * _Default_: Enabled
- */
-#ifndef HOCKEYSDK_FEATURE_FEEDBACK
-#    define HOCKEYSDK_FEATURE_FEEDBACK 0
-#endif /* HOCKEYSDK_FEATURE_FEEDBACK */
-
-
-/**
- * If true, include support for informing the user about new updates pending in the App Store
- *
- * _Default_: Enabled
- */
-#ifndef HOCKEYSDK_FEATURE_STORE_UPDATES
-#    define HOCKEYSDK_FEATURE_STORE_UPDATES 0
-#endif /* HOCKEYSDK_FEATURE_STORE_UPDATES */
-
-
-/**
- * If true, include support for authentication installations for Ad-Hoc and Enterprise builds
- *
- * _Default_: Enabled
- */
-#ifndef HOCKEYSDK_FEATURE_AUTHENTICATOR
-#    define HOCKEYSDK_FEATURE_AUTHENTICATOR 0
-#endif /* HOCKEYSDK_FEATURE_AUTHENTICATOR */
-
-
-/**
- * If true, include support for handling in-app updates for Ad-Hoc and Enterprise builds
- *
- * _Default_: Enabled
- */
-#ifndef HOCKEYSDK_FEATURE_UPDATES
-#    define HOCKEYSDK_FEATURE_UPDATES 0
-#endif /* HOCKEYSDK_FEATURE_UPDATES */
-
-
-/**
- * If true, include support for auto collecting metrics data such as sessions and user
- *
- * _Default_: Enabled
- */
-#ifndef HOCKEYSDK_FEATURE_METRICS
-#    define HOCKEYSDK_FEATURE_METRICS 0
-#endif /* HOCKEYSDK_FEATURE_METRICS */
-
-#endif /* HockeySDK_HockeySDKFeatureConfig_h */
diff --git a/submodules/HockeySDK-iOS/Support/HockeySDKDistribution.sh b/submodules/HockeySDK-iOS/Support/HockeySDKDistribution.sh
deleted file mode 100755
index 69e49b3cb5..0000000000
--- a/submodules/HockeySDK-iOS/Support/HockeySDKDistribution.sh
+++ /dev/null
@@ -1,285 +0,0 @@
-#!/bin/sh
-
-# Default config
-# Sets the target folders and the final framework product.
-FMK_NAME=HockeySDK
-FMK_RESOURCE_BUNDLE=HockeySDKResources
-FMK_iOS8_NAME="HockeySDK Framework"
-
-# Documentation
-HOCKEYSDK_DOCSET_VERSION_NAME="de.bitstadium.${HOCKEYSDK_DOCSET_NAME}-${VERSION_STRING}"
-
-# Install dir will be the final output to the framework.
-# The following line creates it in the root folder of the current project.
-PRODUCTS_DIR=${SRCROOT}/../Products
-ZIP_FOLDER=HockeySDK-iOS
-TEMP_DIR=${PRODUCTS_DIR}/${ZIP_FOLDER}
-INSTALL_DIR=${TEMP_DIR}/${FMK_NAME}.framework
-ALL_FEATURES_INSTALL_DIR=${TEMP_DIR}/HockeySDKAllFeatures/${FMK_NAME}.framework
-FEEDBACK_ONLY_INSTALL_DIR=${TEMP_DIR}/HockeySDKFeedbackOnly/${FMK_NAME}.framework
-
-# Working dir will be deleted after the framework creation.
-WRK_DIR=build
-DEVICE_DIR=${WRK_DIR}/ReleaseDefault-iphoneos
-SIMULATOR_DIR=${WRK_DIR}/ReleaseDefault-iphonesimulator
-DEVICE_DIR_ALL_FEATURES=${WRK_DIR}/Release-iphoneos
-SIMULATOR_DIR_ALL_FEATURES=${WRK_DIR}/Release-iphonesimulator
-DEVICE_CRASH_ONLY_DIR=${WRK_DIR}/ReleaseCrashOnly-iphoneos
-SIMULATOR_CRASH_ONLY_DIR=${WRK_DIR}/ReleaseCrashOnly-iphonesimulator
-DEVICE_EXTENSIONS_CRASH_ONLY_DIR=${WRK_DIR}/ReleaseCrashOnlyExtensions-iphoneos
-SIMULATOR_EXTENSIONS_CRASH_ONLY_DIR=${WRK_DIR}/ReleaseCrashOnlyExtensions-iphonesimulator
-DEVICE_WATCH_CRASH_ONLY_DIR=${WRK_DIR}/ReleaseCrashOnlyWatchOS-iphoneos
-SIMULATOR_WATCH_CRASH_ONLY_DIR=${WRK_DIR}/ReleaseCrashOnlyWatchOS-iphonesimulator
-DEVICE_DIR_ONLY_FEEDBACK=${WRK_DIR}/ReleaseFeedbackOnly-iphoneos
-SIMULATOR_DIR_ONLY_FEEDBACK=${WRK_DIR}/ReleaseFeedbackOnly-iphonesimulator
-
-# //////////////////////////////
-# Building the  SDK with all features except the Feedback Feature
-# //////////////////////////////
-
-# Building both architectures.
-xcodebuild -project "HockeySDK.xcodeproj" -configuration "ReleaseDefault" -target "${FMK_NAME}" -sdk iphoneos
-xcodebuild -project "HockeySDK.xcodeproj" -configuration "ReleaseDefault" -target "${FMK_NAME}" -sdk iphonesimulator
-
-# Cleaning the oldest.
-if [ -d "${TEMP_DIR}" ]
-then
-rm -rf "${TEMP_DIR}"
-fi
-
-# Creates and renews the final product folder.
-mkdir -p "${INSTALL_DIR}"
-mkdir -p "${INSTALL_DIR}/Headers"
-mkdir -p "${INSTALL_DIR}/Modules"
-
-# Copy the swift import file
-cp -f "${SRCROOT}/module_default.modulemap" "${INSTALL_DIR}/Modules/module.modulemap"
-
-# Copies the headers and resources files to the final product folder.
-cp -R "${SRCROOT}/${DEVICE_DIR}/include/HockeySDK/BITAuthenticator.h" "${INSTALL_DIR}/Headers/"
-cp -R "${SRCROOT}/${DEVICE_DIR}/include/HockeySDK/BITCrashAttachment.h" "${INSTALL_DIR}/Headers/"
-cp -R "${SRCROOT}/${DEVICE_DIR}/include/HockeySDK/BITCrashDetails.h" "${INSTALL_DIR}/Headers/"
-cp -R "${SRCROOT}/${DEVICE_DIR}/include/HockeySDK/BITCrashManager.h" "${INSTALL_DIR}/Headers/"
-cp -R "${SRCROOT}/${DEVICE_DIR}/include/HockeySDK/BITCrashManagerDelegate.h" "${INSTALL_DIR}/Headers/"
-cp -R "${SRCROOT}/${DEVICE_DIR}/include/HockeySDK/BITCrashMetaData.h" "${INSTALL_DIR}/Headers/"
-cp -R "${SRCROOT}/${DEVICE_DIR}/include/HockeySDK/BITHockeyAttachment.h" "${INSTALL_DIR}/Headers/"
-cp -R "${SRCROOT}/${DEVICE_DIR}/include/HockeySDK/BITHockeyBaseManager.h" "${INSTALL_DIR}/Headers/"
-cp -R "${SRCROOT}/${DEVICE_DIR}/include/HockeySDK/BITHockeyBaseViewController.h" "${INSTALL_DIR}/Headers/"
-cp -R "${SRCROOT}/${DEVICE_DIR}/include/HockeySDK/BITHockeyManager.h" "${INSTALL_DIR}/Headers/"
-cp -R "${SRCROOT}/${DEVICE_DIR}/include/HockeySDK/BITHockeyManagerDelegate.h" "${INSTALL_DIR}/Headers/"
-cp -R "${SRCROOT}/${DEVICE_DIR}/include/HockeySDK/BITMetricsManager.h" "${INSTALL_DIR}/Headers/"
-cp -R "${SRCROOT}/${DEVICE_DIR}/include/HockeySDK/BITStoreUpdateManager.h" "${INSTALL_DIR}/Headers/"
-cp -R "${SRCROOT}/${DEVICE_DIR}/include/HockeySDK/BITStoreUpdateManagerDelegate.h" "${INSTALL_DIR}/Headers/"
-cp -R "${SRCROOT}/${DEVICE_DIR}/include/HockeySDK/BITUpdateManager.h" "${INSTALL_DIR}/Headers/"
-cp -R "${SRCROOT}/${DEVICE_DIR}/include/HockeySDK/BITUpdateManagerDelegate.h" "${INSTALL_DIR}/Headers/"
-cp -R "${SRCROOT}/${DEVICE_DIR}/include/HockeySDK/BITUpdateViewController.h" "${INSTALL_DIR}/Headers/"
-cp -R "${SRCROOT}/${DEVICE_DIR}/include/HockeySDK/HockeySDK.h" "${INSTALL_DIR}/Headers/"
-cp -R "${SRCROOT}/${DEVICE_DIR}/include/HockeySDK/HockeySDKEnums.h" "${INSTALL_DIR}/Headers/"
-cp -R "${SRCROOT}/${DEVICE_DIR}/include/HockeySDK/HockeySDKFeatureConfig.h" "${INSTALL_DIR}/Headers/"
-cp -R "${SRCROOT}/${DEVICE_DIR}/include/HockeySDK/HockeySDKNullability.h" "${INSTALL_DIR}/Headers/"
-
-# Copy the patched feature header
-cp -f "${SRCROOT}/HockeySDKFeatureConfigDefault.h" "${INSTALL_DIR}/Headers/HockeySDKFeatureConfig.h"
-
-# Uses the Lipo Tool to merge both binary files (i386 + armv6/armv7) into one Universal final product.
-lipo -create "${DEVICE_DIR}/lib${FMK_NAME}.a" "${SIMULATOR_DIR}/lib${FMK_NAME}.a" -output "${INSTALL_DIR}/${FMK_NAME}"
-
-# Combine the CrashReporter static library into a new Hockey static library file if they are not already present and copy the public headers too
-if [ -z $(otool -L "${INSTALL_DIR}/${FMK_NAME}" | grep 'libCrashReporter') ]
-then
-libtool -static -o "${INSTALL_DIR}/${FMK_NAME}" "${INSTALL_DIR}/${FMK_NAME}" "${SRCROOT}/../Vendor/CrashReporter.framework/Versions/A/CrashReporter"
-fi
-
-# build embeddedframework folder and move framework into it
-mkdir "${INSTALL_DIR}/../${FMK_NAME}.embeddedframework"
-mv "${INSTALL_DIR}" "${INSTALL_DIR}/../${FMK_NAME}.embeddedframework/${FMK_NAME}.framework"
-mv "${DEVICE_DIR}/${FMK_RESOURCE_BUNDLE}.bundle" "${TEMP_DIR}/${FMK_NAME}.embeddedframework/"
-
-rm -r "${WRK_DIR}"
-
-# //////////////////////////////
-# Building the full featured SDK
-# //////////////////////////////
-
-# Building both architectures.
-xcodebuild -project "HockeySDK.xcodeproj" -configuration "Release" -target "${FMK_NAME}" -sdk iphoneos
-xcodebuild -project "HockeySDK.xcodeproj" -configuration "Release" -target "${FMK_NAME}" -sdk iphonesimulator
-
-# Creates and renews the final product folder.
-mkdir -p "${ALL_FEATURES_INSTALL_DIR}"
-mkdir -p "${ALL_FEATURES_INSTALL_DIR}/Headers"
-mkdir -p "${ALL_FEATURES_INSTALL_DIR}/Modules"
-
-# Copy the swift import file
-cp -f "${SRCROOT}/module_allfeatures.modulemap" "${ALL_FEATURES_INSTALL_DIR}/Modules/module.modulemap"
-
-# Copies the headers and resources files to the final product folder.
-cp -R "${DEVICE_DIR_ALL_FEATURES}/include/HockeySDK/" "${ALL_FEATURES_INSTALL_DIR}/Headers/"
-
-# Use the Lipo Tool to merge both binary files (i386/x86_64 + armv7/armv7s/arm64) into one Universal final product.
-lipo -create "${DEVICE_DIR_ALL_FEATURES}/lib${FMK_NAME}.a" "${SIMULATOR_DIR_ALL_FEATURES}/lib${FMK_NAME}.a" -output "${ALL_FEATURES_INSTALL_DIR}/${FMK_NAME}"
-
-# Combine the CrashReporter static library into a new Hockey static library file if they are not already present and copy the public headers too
-if [ -z $(otool -L "${ALL_FEATURES_INSTALL_DIR}/${FMK_NAME}" | grep 'libCrashReporter') ]
-then
-libtool -static -o "${ALL_FEATURES_INSTALL_DIR}/${FMK_NAME}" "${ALL_FEATURES_INSTALL_DIR}/${FMK_NAME}" "${SRCROOT}/../Vendor/CrashReporter.framework/Versions/A/CrashReporter"
-fi
-
-# build embeddedframework folder and move framework into it
-mkdir "${ALL_FEATURES_INSTALL_DIR}/../${FMK_NAME}.embeddedframework"
-mv "${ALL_FEATURES_INSTALL_DIR}/" "${ALL_FEATURES_INSTALL_DIR}/../${FMK_NAME}.embeddedframework/${FMK_NAME}.framework"
-mv "${DEVICE_DIR_ALL_FEATURES}/${FMK_RESOURCE_BUNDLE}.bundle" "${TEMP_DIR}/HockeySDKAllFeatures/${FMK_NAME}.embeddedframework/"
-
-# do some cleanup
-rm -r "${WRK_DIR}"
-
-# /////////////////////////////////////////////
-# Building the crash only SDK without resources
-# /////////////////////////////////////////////
-
-# Building both architectures.
-xcodebuild -project "HockeySDK.xcodeproj" -configuration "ReleaseCrashOnly" -target "${FMK_NAME}" -sdk iphoneos
-xcodebuild -project "HockeySDK.xcodeproj" -configuration "ReleaseCrashOnly" -target "${FMK_NAME}" -sdk iphonesimulator
-
-# Creates and renews the final product folder.
-mkdir -p "${INSTALL_DIR}"
-mkdir -p "${INSTALL_DIR}/Headers"
-mkdir -p "${INSTALL_DIR}/Modules"
-
-# Copy the swift import file
-cp -f "${SRCROOT}/module_crashonly.modulemap" "${INSTALL_DIR}/Modules/module.modulemap"
-
-# Copies the headers without the resources files to the final product folder.
-cp -R "${SRCROOT}/${DEVICE_CRASH_ONLY_DIR}"/include/HockeySDK/BITCrash*.h "${INSTALL_DIR}/Headers/"
-cp -R "${SRCROOT}/${DEVICE_CRASH_ONLY_DIR}/include/HockeySDK/BITHockeyAttachment.h" "${INSTALL_DIR}/Headers/"
-cp -R "${SRCROOT}/${DEVICE_CRASH_ONLY_DIR}/include/HockeySDK/BITHockeyBaseManager.h" "${INSTALL_DIR}/Headers/"
-cp -R "${SRCROOT}/${DEVICE_CRASH_ONLY_DIR}/include/HockeySDK/BITHockeyManager.h" "${INSTALL_DIR}/Headers/"
-cp -R "${SRCROOT}/${DEVICE_CRASH_ONLY_DIR}/include/HockeySDK/BITHockeyManagerDelegate.h" "${INSTALL_DIR}/Headers/"
-cp -R "${SRCROOT}/${DEVICE_CRASH_ONLY_DIR}/include/HockeySDK/HockeySDK.h" "${INSTALL_DIR}/Headers/"
-cp -R "${SRCROOT}/${DEVICE_CRASH_ONLY_DIR}/include/HockeySDK/HockeySDKNullability.h" "${INSTALL_DIR}/Headers/"
-cp -R "${SRCROOT}/${DEVICE_CRASH_ONLY_DIR}/include/HockeySDK/HockeySDKEnums.h" "${INSTALL_DIR}/Headers/"
-
-# Copy the patched feature header
-cp -f "${SRCROOT}/HockeySDKCrashOnlyConfig.h" "${INSTALL_DIR}/Headers/HockeySDKFeatureConfig.h"
-
-# Uses the Lipo Tool to merge both binary files (i386/x86_64 + armv7/armv7s/arm64) into one Universal final product.
-lipo -create "${SRCROOT}/${DEVICE_CRASH_ONLY_DIR}/lib${FMK_NAME}.a" "${SRCROOT}/${SIMULATOR_CRASH_ONLY_DIR}/lib${FMK_NAME}.a" -output "${INSTALL_DIR}/${FMK_NAME}"
-
-# Combine the CrashReporter static library into a new Hockey static library file if they are not already present and copy the public headers too
-if [ -z $(otool -L "${INSTALL_DIR}/${FMK_NAME}" | grep 'libCrashReporter') ]
-then
-libtool -static -o "${INSTALL_DIR}/${FMK_NAME}" "${INSTALL_DIR}/${FMK_NAME}" "${SRCROOT}/../Vendor/CrashReporter.framework/Versions/A/CrashReporter"
-fi
-
-# Move the crash reporting only framework into a new folder
-mkdir "${INSTALL_DIR}/../${FMK_NAME}CrashOnly"
-mv "${INSTALL_DIR}" "${INSTALL_DIR}/../${FMK_NAME}CrashOnly/${FMK_NAME}.framework"
-
-rm -r "${WRK_DIR}"
-
-# ////////////////////////////////////////////////////////
-# Building the extensions crash only SDK without resources
-# ////////////////////////////////////////////////////////
-
-# Building both architectures.
-xcodebuild -project "HockeySDK.xcodeproj" -configuration "ReleaseCrashOnlyExtensions" -target "${FMK_NAME}" -sdk iphoneos
-xcodebuild -project "HockeySDK.xcodeproj" -configuration "ReleaseCrashOnlyExtensions" -target "${FMK_NAME}" -sdk iphonesimulator
-
-# Creates and renews the final product folder.
-mkdir -p "${INSTALL_DIR}"
-mkdir -p "${INSTALL_DIR}/Headers"
-mkdir -p "${INSTALL_DIR}/Modules"
-
-# Copy the swift import file
-cp -f "${SRCROOT}/module_crashonly.modulemap" "${INSTALL_DIR}/Modules/module.modulemap"
-
-# Copies the headers without the resources files to the final product folder.
-cp -R "${SRCROOT}/${DEVICE_EXTENSIONS_CRASH_ONLY_DIR}"/include/HockeySDK/BITCrash*.h "${INSTALL_DIR}/Headers/"
-cp -R "${SRCROOT}/${DEVICE_EXTENSIONS_CRASH_ONLY_DIR}/include/HockeySDK/BITHockeyAttachment.h" "${INSTALL_DIR}/Headers/"
-cp -R "${SRCROOT}/${DEVICE_EXTENSIONS_CRASH_ONLY_DIR}/include/HockeySDK/BITHockeyBaseManager.h" "${INSTALL_DIR}/Headers/"
-cp -R "${SRCROOT}/${DEVICE_EXTENSIONS_CRASH_ONLY_DIR}/include/HockeySDK/BITHockeyManager.h" "${INSTALL_DIR}/Headers/"
-cp -R "${SRCROOT}/${DEVICE_EXTENSIONS_CRASH_ONLY_DIR}/include/HockeySDK/BITHockeyManagerDelegate.h" "${INSTALL_DIR}/Headers/"
-cp -R "${SRCROOT}/${DEVICE_EXTENSIONS_CRASH_ONLY_DIR}/include/HockeySDK/HockeySDK.h" "${INSTALL_DIR}/Headers/"
-cp -R "${SRCROOT}/${DEVICE_EXTENSIONS_CRASH_ONLY_DIR}/include/HockeySDK/HockeySDKNullability.h" "${INSTALL_DIR}/Headers/"
-cp -R "${SRCROOT}/${DEVICE_EXTENSIONS_CRASH_ONLY_DIR}/include/HockeySDK/HockeySDKEnums.h" "${INSTALL_DIR}/Headers/"
-
-# Copy the patched feature header
-cp -f "${SRCROOT}/HockeySDKCrashOnlyExtensionConfig.h" "${INSTALL_DIR}/Headers/HockeySDKFeatureConfig.h"
-
-# Uses the Lipo Tool to merge both binary files (i386/x86_64 + armv7/armv7s/arm64) into one Universal final product.
-lipo -create "${SRCROOT}/${DEVICE_EXTENSIONS_CRASH_ONLY_DIR}/lib${FMK_NAME}.a" "${SRCROOT}/${SIMULATOR_EXTENSIONS_CRASH_ONLY_DIR}/lib${FMK_NAME}.a" -output "${INSTALL_DIR}/${FMK_NAME}"
-
-# Combine the CrashReporter static library into a new Hockey static library file if they are not already present and copy the public headers too
-if [ -z $(otool -L "${INSTALL_DIR}/${FMK_NAME}" | grep 'libCrashReporter') ]
-then
-libtool -static -o "${INSTALL_DIR}/${FMK_NAME}" "${INSTALL_DIR}/${FMK_NAME}" "${SRCROOT}/../Vendor/CrashReporter.framework/Versions/A/CrashReporter"
-fi
-
-# Move the crash reporting only framework into a new folder
-mkdir "${INSTALL_DIR}/../${FMK_NAME}CrashOnlyExtension"
-mv "${INSTALL_DIR}" "${INSTALL_DIR}/../${FMK_NAME}CrashOnlyExtension/${FMK_NAME}.framework"
-
-rm -r "${WRK_DIR}"
-
-# //////////////////////////////
-# Building the Feedback-Only SDK
-# //////////////////////////////
-
-# Building both architectures.
-xcodebuild -project "HockeySDK.xcodeproj" -configuration "ReleaseFeedbackOnly" -target "${FMK_NAME}" -sdk iphoneos
-xcodebuild -project "HockeySDK.xcodeproj" -configuration "ReleaseFeedbackOnly" -target "${FMK_NAME}" -sdk iphonesimulator
-
-# Creates and renews the final product folder.
-mkdir -p "${FEEDBACK_ONLY_INSTALL_DIR}"
-mkdir -p "${FEEDBACK_ONLY_INSTALL_DIR}/Headers"
-mkdir -p "${FEEDBACK_ONLY_INSTALL_DIR}/Modules"
-
-# Copy the swift import file
-cp -f "${SRCROOT}/module_feedbackonly.modulemap" "${FEEDBACK_ONLY_INSTALL_DIR}/Modules/module.modulemap"
-
-# Copies the headers and resources files to the final product folder.
-cp -R "${SRCROOT}/${DEVICE_DIR_ONLY_FEEDBACK}"/include/HockeySDK/BITFeedback*.h "${FEEDBACK_ONLY_INSTALL_DIR}/Headers/"
-cp -R "${SRCROOT}/${DEVICE_DIR_ONLY_FEEDBACK}/include/HockeySDK/BITHockeyAttachment.h" "${FEEDBACK_ONLY_INSTALL_DIR}/Headers/"
-cp -R "${SRCROOT}/${DEVICE_DIR_ONLY_FEEDBACK}/include/HockeySDK/BITHockeyBaseManager.h" "${FEEDBACK_ONLY_INSTALL_DIR}/Headers/"
-cp -R "${SRCROOT}/${DEVICE_DIR_ONLY_FEEDBACK}/include/HockeySDK/BITHockeyBaseViewController.h" "${FEEDBACK_ONLY_INSTALL_DIR}/Headers/"
-cp -R "${SRCROOT}/${DEVICE_DIR_ONLY_FEEDBACK}/include/HockeySDK/BITHockeyManager.h" "${FEEDBACK_ONLY_INSTALL_DIR}/Headers/"
-cp -R "${SRCROOT}/${DEVICE_DIR_ONLY_FEEDBACK}/include/HockeySDK/BITHockeyManagerDelegate.h" "${FEEDBACK_ONLY_INSTALL_DIR}/Headers/"
-cp -R "${SRCROOT}/${DEVICE_DIR_ONLY_FEEDBACK}/include/HockeySDK/HockeySDK.h" "${FEEDBACK_ONLY_INSTALL_DIR}/Headers/"
-cp -R "${SRCROOT}/${DEVICE_DIR_ONLY_FEEDBACK}/include/HockeySDK/HockeySDKEnums.h" "${FEEDBACK_ONLY_INSTALL_DIR}/Headers/"
-cp -R "${SRCROOT}/${DEVICE_DIR_ONLY_FEEDBACK}/include/HockeySDK/HockeySDKFeatureConfig.h" "${FEEDBACK_ONLY_INSTALL_DIR}/Headers/"
-cp -R "${SRCROOT}/${DEVICE_DIR_ONLY_FEEDBACK}/include/HockeySDK/HockeySDKNullability.h" "${FEEDBACK_ONLY_INSTALL_DIR}/Headers/"
-
-# Copy the patched feature header
-cp -f "${SRCROOT}/HockeySDKFeedbackOnlyConfig.h" "${FEEDBACK_ONLY_INSTALL_DIR}/Headers/HockeySDKFeatureConfig.h"
-
-# Use the Lipo Tool to merge both binary files (i386/x86_64 + armv7/armv7s/arm64) into one Universal final product.
-lipo -create "${DEVICE_DIR_ONLY_FEEDBACK}/lib${FMK_NAME}.a" "${SIMULATOR_DIR_ONLY_FEEDBACK}/lib${FMK_NAME}.a" -output "${FEEDBACK_ONLY_INSTALL_DIR}/${FMK_NAME}"
-
-# build embeddedframework folder and move framework into it
-mkdir "${FEEDBACK_ONLY_INSTALL_DIR}/../${FMK_NAME}.embeddedframework"
-mv "${FEEDBACK_ONLY_INSTALL_DIR}/" "${FEEDBACK_ONLY_INSTALL_DIR}/../${FMK_NAME}.embeddedframework/${FMK_NAME}.framework"
-mv "${DEVICE_DIR_ONLY_FEEDBACK}/${FMK_RESOURCE_BUNDLE}.bundle" "${TEMP_DIR}/HockeySDKFeedbackOnly/${FMK_NAME}.embeddedframework/"
-
-# do some cleanup
-rm -r "${WRK_DIR}"
-
-# //////////////////////////////
-# Final steps: move documentation and create zip-file
-# //////////////////////////////
-
-# copy license, changelog, documentation, integration json
-cp -f "${SRCROOT}/../Documentation/Guides/Changelog.md" "${TEMP_DIR}/CHANGELOG"
-cp -f "${SRCROOT}/../Documentation/Guides/Installation & Setup.md" "${TEMP_DIR}/README.md"
-cp -f "${SRCROOT}/../LICENSE" "${TEMP_DIR}"
-cp -R "${SRCROOT}/../Documentation/HockeySDK/Generated/docsets/HockeySDK.docset" "${TEMP_DIR}"
-mv "${TEMP_DIR}/HockeySDK.docset" "${TEMP_DIR}/${HOCKEYSDK_DOCSET_VERSION_NAME}.docset"
-
-# build zip
-cd "${PRODUCTS_DIR}"
-rm -f "${FMK_NAME}-iOS-${VERSION_STRING}.zip"
-zip -yr "${FMK_NAME}-iOS-${VERSION_STRING}.zip" "${ZIP_FOLDER}" -x \*/.*
-
-cd "${ZIP_FOLDER}"
-rm -f "${FMK_NAME}-iOS-documentation-${VERSION_STRING}.zip"
-zip -yr "${FMK_NAME}-iOS-documentation-${VERSION_STRING}.zip" "${HOCKEYSDK_DOCSET_VERSION_NAME}.docset" -x \*/.*
-mv "${FMK_NAME}-iOS-documentation-${VERSION_STRING}.zip" "../"
diff --git a/submodules/HockeySDK-iOS/Support/HockeySDKFeatureConfigDefault.h b/submodules/HockeySDK-iOS/Support/HockeySDKFeatureConfigDefault.h
deleted file mode 100644
index b80d901e18..0000000000
--- a/submodules/HockeySDK-iOS/Support/HockeySDKFeatureConfigDefault.h
+++ /dev/null
@@ -1,97 +0,0 @@
-/*
- * Author: Andreas Linde <mail@andreaslinde.de>
- *
- * Copyright (c) 2013-2014 HockeyApp, Bit Stadium GmbH.
- * All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person
- * obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without
- * restriction, including without limitation the rights to use,
- * copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following
- * conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
- * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
- */
-
-/**
- * This is the template feature config that is used for debug builds and during development. 
- * For the Distribution target, we are using separate configs that will be copied over in our build script.
- */
-
-
-#ifndef HockeySDK_HockeySDKFeatureConfig_h
-#define HockeySDK_HockeySDKFeatureConfig_h
-
-/**
- * If true, include support for handling crash reports
- *
- * _Default_: Enabled
- */
-#ifndef HOCKEYSDK_FEATURE_CRASH_REPORTER
-#    define HOCKEYSDK_FEATURE_CRASH_REPORTER 1
-#endif /* HOCKEYSDK_FEATURE_CRASH_REPORTER */
-
-
-/**
- * If true, include support for managing user feedback
- *
- * _Default_: Enabled
- */
-#ifndef HOCKEYSDK_FEATURE_FEEDBACK
-#    define HOCKEYSDK_FEATURE_FEEDBACK 0
-#endif /* HOCKEYSDK_FEATURE_FEEDBACK */
-
-
-/**
- * If true, include support for informing the user about new updates pending in the App Store
- *
- * _Default_: Enabled
- */
-#ifndef HOCKEYSDK_FEATURE_STORE_UPDATES
-#    define HOCKEYSDK_FEATURE_STORE_UPDATES 1
-#endif /* HOCKEYSDK_FEATURE_STORE_UPDATES */
-
-
-/**
- * If true, include support for authentication installations for Ad-Hoc and Enterprise builds
- *
- * _Default_: Enabled
- */
-#ifndef HOCKEYSDK_FEATURE_AUTHENTICATOR
-#    define HOCKEYSDK_FEATURE_AUTHENTICATOR 1
-#endif /* HOCKEYSDK_FEATURE_AUTHENTICATOR */
-
-
-/**
- * If true, include support for handling in-app updates for Ad-Hoc and Enterprise builds
- *
- * _Default_: Enabled
- */
-#ifndef HOCKEYSDK_FEATURE_UPDATES
-#    define HOCKEYSDK_FEATURE_UPDATES 1
-#endif /* HOCKEYSDK_FEATURE_UPDATES */
-
-
-/**
- * If true, include support for auto collecting metrics data such as sessions and user
- *
- * _Default_: Enabled
- */
-#ifndef HOCKEYSDK_FEATURE_METRICS
-#    define HOCKEYSDK_FEATURE_METRICS 1
-#endif /* HOCKEYSDK_FEATURE_METRICS */
-
-#endif /* HockeySDK_HockeySDKFeatureConfig_h */
diff --git a/submodules/HockeySDK-iOS/Support/HockeySDKFeedbackOnlyConfig.h b/submodules/HockeySDK-iOS/Support/HockeySDKFeedbackOnlyConfig.h
deleted file mode 100644
index 2c8e3ceda4..0000000000
--- a/submodules/HockeySDK-iOS/Support/HockeySDKFeedbackOnlyConfig.h
+++ /dev/null
@@ -1,99 +0,0 @@
-/*
- * Author: Andreas Linde <mail@andreaslinde.de>
- *
- * Copyright (c) 2013-2014 HockeyApp, Bit Stadium GmbH.
- * All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person
- * obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without
- * restriction, including without limitation the rights to use,
- * copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following
- * conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
- * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
- */
-
-/*
- * This file is only used by the binary framework target when building
- * and creating the crash reporting only framework
- *
- * Attention: Do not include this into your projects yourself!
- */
- 
-#ifndef HockeySDK_HockeySDKFeatureConfig_h
-#define HockeySDK_HockeySDKFeatureConfig_h
-
-
-/**
- * If true, include support for handling crash reports
- *
- * _Default_: Enabled
- */
-#ifndef HOCKEYSDK_FEATURE_CRASH_REPORTER
-#    define HOCKEYSDK_FEATURE_CRASH_REPORTER 0
-#endif /* HOCKEYSDK_FEATURE_CRASH_REPORTER */
-
-
-/**
- * If true, include support for managing user feedback
- *
- * _Default_: Enabled
- */
-#ifndef HOCKEYSDK_FEATURE_FEEDBACK
-#    define HOCKEYSDK_FEATURE_FEEDBACK 1
-#endif /* HOCKEYSDK_FEATURE_FEEDBACK */
-
-
-/**
- * If true, include support for informing the user about new updates pending in the App Store
- *
- * _Default_: Enabled
- */
-#ifndef HOCKEYSDK_FEATURE_STORE_UPDATES
-#    define HOCKEYSDK_FEATURE_STORE_UPDATES 0
-#endif /* HOCKEYSDK_FEATURE_STORE_UPDATES */
-
-
-/**
- * If true, include support for authentication installations for Ad-Hoc and Enterprise builds
- *
- * _Default_: Enabled
- */
-#ifndef HOCKEYSDK_FEATURE_AUTHENTICATOR
-#    define HOCKEYSDK_FEATURE_AUTHENTICATOR 0
-#endif /* HOCKEYSDK_FEATURE_AUTHENTICATOR */
-
-
-/**
- * If true, include support for handling in-app updates for Ad-Hoc and Enterprise builds
- *
- * _Default_: Enabled
- */
-#ifndef HOCKEYSDK_FEATURE_UPDATES
-#    define HOCKEYSDK_FEATURE_UPDATES 0
-#endif /* HOCKEYSDK_FEATURE_UPDATES */
-
-
-/**
- * If true, include support for auto collecting metrics data such as sessions and user
- *
- * _Default_: Enabled
- */
-#ifndef HOCKEYSDK_FEATURE_METRICS
-#    define HOCKEYSDK_FEATURE_METRICS 0
-#endif /* HOCKEYSDK_FEATURE_METRICS */
-
-#endif /* HockeySDK_HockeySDKFeatureConfig_h */
diff --git a/submodules/HockeySDK-iOS/Support/HockeySDKTest.xcconfig b/submodules/HockeySDK-iOS/Support/HockeySDKTest.xcconfig
deleted file mode 100644
index aeeee6a3ca..0000000000
--- a/submodules/HockeySDK-iOS/Support/HockeySDKTest.xcconfig
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "HockeySDKBase.xcconfig"
-
-WARNING_CFLAGS = -Wno-partial-availability
diff --git a/submodules/HockeySDK-iOS/Support/HockeySDKTests/BITApplicationTests.m b/submodules/HockeySDK-iOS/Support/HockeySDKTests/BITApplicationTests.m
deleted file mode 100644
index 19bec913f7..0000000000
--- a/submodules/HockeySDK-iOS/Support/HockeySDKTests/BITApplicationTests.m
+++ /dev/null
@@ -1,33 +0,0 @@
-#import <XCTest/XCTest.h>
-#import "BITApplication.h"
-
-@interface BITApplicationTests : XCTestCase
-
-@end
-
-@implementation BITApplicationTests
-
-- (void)testverPropertyWorksAsExpected {
-    NSString *expected = @"Test string";
-    BITApplication *item = [BITApplication new];
-    item.version = expected;
-    NSString *actual = item.version;
-    XCTAssertTrue([actual isEqualToString:expected]);
-    
-    expected = @"Other string";
-    item.version = expected;
-    actual = item.version;
-    XCTAssertTrue([actual isEqualToString:expected]);
-}
-
-- (void)testSerialize {
-    BITApplication *item = [BITApplication new];
-    item.version = @"Test string";
-    item.build = @"Test build";
-    item.typeId = @"Test typeId";
-    NSDictionary *actual = [item serializeToDictionary];
-    NSDictionary *expected = @{@"ai.application.ver":@"Test string", @"ai.application.build":@"Test build", @"ai.application.typeId":@"Test typeId"};
-    XCTAssertTrue([actual isEqualToDictionary:expected]);
-}
-
-@end
diff --git a/submodules/HockeySDK-iOS/Support/HockeySDKTests/BITAuthenticatorTests.m b/submodules/HockeySDK-iOS/Support/HockeySDKTests/BITAuthenticatorTests.m
deleted file mode 100644
index 85702a3f5f..0000000000
--- a/submodules/HockeySDK-iOS/Support/HockeySDKTests/BITAuthenticatorTests.m
+++ /dev/null
@@ -1,294 +0,0 @@
-//
-//  BITAuthenticatorTests.m
-//  HockeySDK
-//
-//  Created by Andreas Linde on 13.03.13.
-//
-//
-
-#import <XCTest/XCTest.h>
-#import <OCMock/OCMock.h>
-
-#import <OCHamcrestIOS/OCHamcrestIOS.h>
-#import <OCMockitoIOS/OCMockitoIOS.h>
-
-#import "HockeySDK.h"
-#import "HockeySDKPrivate.h"
-#import "BITHockeyHelper.h"
-#import "BITAuthenticator_Private.h"
-#import "BITHockeyBaseManagerPrivate.h"
-#import "BITTestHelper.h"
-#import "BITHockeyAppClient.h"
-
-@interface MyDevice : NSObject
-- (NSString*) uniqueIdentifier;
-@end
-@implementation MyDevice
-- (NSString*) uniqueIdentifier {return @"reallyUnique";}
-@end
-
-@interface MyDeviceWithIdentifierForVendor : MyDevice
-@property (copy) NSUUID *identifierForVendor;
-@end
-@implementation MyDeviceWithIdentifierForVendor
-
-- (instancetype)init {
-  self = [super init];
-  if( self ) {
-    _identifierForVendor = [NSUUID UUID];
-  }
-  return self;
-}
-
-@end
-
-static void *kInstallationIdentification = &kInstallationIdentification;
-
-@interface BITAuthenticatorTests : XCTestCase
-
-@property(nonatomic, strong) BITAuthenticator *sut;
-
-@end
-
-@implementation BITAuthenticatorTests
-
-- (void)setUp {
-  [super setUp];
-  
-  self.sut = [[BITAuthenticator alloc] initWithAppIdentifier:nil appEnvironment:BITEnvironmentOther];
-}
-
-- (void)tearDown {
-  [self.sut cleanupInternalStorage];
-  self.sut = nil;
-  
-  [super tearDown];
-}
-
-#pragma mark - Setup helpers
-- (NSDictionary *)jsonFromFixture:(NSString *)fixture {
-  NSString *dataString = [BITTestHelper jsonFixture:fixture];
-  
-  NSData *data = [dataString dataUsingEncoding:NSUTF8StringEncoding];
-  NSError *error = nil;
-  NSDictionary *json = (NSDictionary *)[NSJSONSerialization JSONObjectWithData:data options:0 error:&error];
-  
-  return json;
-}
-
-#pragma mark - Setup Tests
-- (void) testThatItInstantiates {
-  XCTAssertNotNil(self.sut, @"Should be there");
-}
-
-#pragma mark - Persistence Tests
-- (void) testThatLastAuthenticatedVersionIsPersisted {
-  self.sut.lastAuthenticatedVersion = @"1.2.1";
-  self.sut = [[BITAuthenticator alloc] initWithAppIdentifier:nil appEnvironment:BITEnvironmentAppStore];
-  assertThat(self.sut.lastAuthenticatedVersion, equalTo(@"1.2.1"));
-}
-
-- (void) testThatCleanupWorks {
-  self.sut.lastAuthenticatedVersion = @"1.2";
-  self.sut.identified = YES;
-  self.sut.validated = YES;
-  
-  [self.sut cleanupInternalStorage];
-  
-  assertThat(self.sut.lastAuthenticatedVersion, equalTo(nil));
-  assertThat(self.sut.installationIdentifier, equalTo(nil));
-  assertThatBool(self.sut.isIdentified, isFalse());
-  assertThatBool(self.sut.isValidated, isFalse());
-}
-
-#pragma mark - Initial defaults
-- (void) testDefaultValues {
-  assertThatBool(self.sut.restrictApplicationUsage, isFalse());
-  assertThatBool(self.sut.isIdentified, isFalse());
-  assertThatBool(self.sut.isValidated, isFalse());
-  assertThat(self.sut.authenticationSecret, equalTo(nil));
-  assertThat(self.sut.installationIdentifier, equalTo(nil));
-  assertThat(self.sut.installationIdentifierParameterString, equalTo(@"uuid"));
-}
-
-#pragma mark - General identification tests
-- (void) testThatIsDoesntShowMoreThanOneAuthenticationController {
-  id delegateMock = mockProtocol(@protocol(BITAuthenticatorDelegate));
-  self.sut.delegate = delegateMock;
-  self.sut.identificationType = BITAuthenticatorIdentificationTypeDevice;
-  
-  [self.sut identifyWithCompletion:nil];
-  [self.sut identifyWithCompletion:nil];
-  [self.sut identifyWithCompletion:nil];
-  
-  [verifyCount(delegateMock, times(1)) authenticator:self.sut willShowAuthenticationController:(id)anything()];
-}
-
-- (void) testThatChangingIdentificationTypeResetsIdentifiedFlag {
-  self.sut.identified = YES;
-  self.sut.identificationType = BITAuthenticatorIdentificationTypeHockeyAppUser;
-  assertThatBool(self.sut.identified, isFalse());
-}
-
-- (void) testThatAfterChangingIdentificationTypeIdentificationIsRedone {
-  [self.sut storeInstallationIdentifier:@"meh" withType:BITAuthenticatorIdentificationTypeHockeyAppEmail];
-  self.sut.identified = YES;
-  self.sut.identificationType = BITAuthenticatorIdentificationTypeHockeyAppUser;
-  [self.sut identifyWithCompletion:nil];
-  assertThatBool(self.sut.identified, isFalse());
-  assertThat(self.sut.installationIdentifier, nilValue());
-}
-
-- (void) testThatIdentifyingAnAlreadyIdentifiedInstanceDoesNothing {
-  id delegateMock = mockProtocol(@protocol(BITAuthenticatorDelegate));
-  self.sut.delegate = delegateMock;
-  
-  self.sut.identificationType = BITAuthenticatorIdentificationTypeHockeyAppEmail;
-  [self.sut storeInstallationIdentifier:@"meh" withType:BITAuthenticatorIdentificationTypeHockeyAppEmail];
-  self.sut.identified = YES;
-  
-  [self.sut identifyWithCompletion:nil];
-  
-  [verifyCount(delegateMock, never()) authenticator:self.sut willShowAuthenticationController:(id)anything()];
-}
-
-
-#pragma mark - Anonymous identification type
-- (void) testAnonymousIdentification {
-  self.sut.identificationType = BITAuthenticatorIdentificationTypeAnonymous;
-  assertThatBool(self.sut.isIdentified, isFalse());
-  [self.sut identifyWithCompletion:^(BOOL identified, NSError *error) {
-    assertThatBool(identified, isTrue());
-    assertThat(error, equalTo(nil));
-  }];
-  assertThatBool(self.sut.isIdentified, isTrue());
-  assertThat(self.sut.installationIdentifier, notNilValue());
-}
-
-//anoynmous users can't be validated
-- (void) testAnonymousValidation {
-  self.sut.identificationType = BITAuthenticatorIdentificationTypeAnonymous;
-  assertThatBool(self.sut.isValidated, isFalse());
-  [self.sut validateWithCompletion:^(BOOL __unused validated, NSError *error) {
-    assertThatBool(self.sut.validated, isFalse());
-    assertThat(error, notNilValue());
-  }];
-  assertThatBool(self.sut.isValidated, isFalse());
-}
-
-#pragma mark - Device identification type
-- (void) testDeviceIdentificationShowsViewController {
-  self.sut.identificationType = BITAuthenticatorIdentificationTypeDevice;
-  id delegateMock = mockProtocol(@protocol(BITAuthenticatorDelegate));
-  self.sut.delegate = delegateMock;
-
-  [self.sut identifyWithCompletion:nil];
-  
-  [verifyCount(delegateMock, times(1)) authenticator:self.sut willShowAuthenticationController:(id)anything()];
-}
-#pragma mark - Web auth identification type
-- (void) testWebAuthIdentificationShowsViewController {
-  self.sut.identificationType = BITAuthenticatorIdentificationTypeWebAuth;
-  id delegateMock = mockProtocol(@protocol(BITAuthenticatorDelegate));
-  self.sut.delegate = delegateMock;
-  
-  [self.sut identifyWithCompletion:nil];
-  
-  [verifyCount(delegateMock, times(1)) authenticator:self.sut willShowAuthenticationController:(id)anything()];
-}
-
-#pragma mark - Email identification type
-- (void) testEmailIdentificationFailsWithMissingSecret {
-  self.sut.identificationType = BITAuthenticatorIdentificationTypeHockeyAppEmail;
-  [self.sut identifyWithCompletion:^(BOOL identified, NSError *error) {
-    assertThatBool(identified, isFalse());
-    assertThat(error, notNilValue());
-  }];
-}
-
-- (void) testEmailIdentificationShowsViewController {
-  self.sut.identificationType = BITAuthenticatorIdentificationTypeHockeyAppEmail;
-  self.sut.authenticationSecret = @"mySecret";
-  id delegateMock = mockProtocol(@protocol(BITAuthenticatorDelegate));
-  self.sut.delegate = delegateMock;
-  
-  [self.sut identifyWithCompletion:nil];
-  
-  [verifyCount(delegateMock, times(1)) authenticator:self.sut willShowAuthenticationController:(id)anything()];
-}
-
-- (void) testEmailValidationFailsWithMissingSecret {
-  self.sut.identificationType = BITAuthenticatorIdentificationTypeHockeyAppEmail;
-  [self.sut validateWithCompletion:^(BOOL validated, NSError *error) {
-    assertThatBool(validated, isFalse());
-    assertThat(error, notNilValue());
-  }];
-}
-
-#pragma mark - User identification type
-- (void) testUserIdentificationShowsViewController {
-  self.sut.identificationType = BITAuthenticatorIdentificationTypeHockeyAppUser;
-  id delegateMock = mockProtocol(@protocol(BITAuthenticatorDelegate));
-  self.sut.delegate = delegateMock;
-  
-  [self.sut identifyWithCompletion:nil];
-  
-  [verifyCount(delegateMock, times(1)) authenticator:self.sut willShowAuthenticationController:(id)anything()];
-}
-
-
-#pragma mark - Generic validation tests
-- (void) testThatValidationFailsIfNotIdentified {
-  self.sut.identified = NO;
-  self.sut.identificationType = BITAuthenticatorIdentificationTypeHockeyAppUser;
-  [self.sut validateWithCompletion:^(BOOL validated, NSError *error) {
-    assertThatBool(validated, isFalse());
-    assertThatLong(error.code, equalToLong(BITAuthenticatorNotIdentified));
-  }];
-}
-
-#pragma mark - Authentication
-- (void) testThatEnabledRestrictionTriggersValidation {
-  id mockAuthenticator = OCMPartialMock(self.sut);
-  self.sut.authenticationSecret = @"sekret";
-  self.sut.restrictApplicationUsage = YES;
-  self.sut.identificationType = BITAuthenticatorIdentificationTypeHockeyAppEmail;
-  [self.sut storeInstallationIdentifier:@"asd" withType:BITAuthenticatorIdentificationTypeHockeyAppEmail];
-  
-  
-  OCMExpect([mockAuthenticator validateWithCompletion:(id)anything()]);
-  [self.sut authenticate];
-  OCMVerifyAll(mockAuthenticator);
-}
-
-#pragma mark - Lifetime checks
-- (void) testThatValidationTriggersOnDidBecomeActive {
-  id delegateMock = mockProtocol(@protocol(BITAuthenticatorDelegate));
-  self.sut.delegate = delegateMock;
-  self.sut.identificationType = BITAuthenticatorIdentificationTypeDevice;
-  self.sut.restrictApplicationUsage = YES;
-  
-  [self.sut applicationDidBecomeActive:nil];
-  
-  [verify(delegateMock) authenticator:self.sut willShowAuthenticationController:(id)anything()];
-}
-
-#pragma mark - Validation helper checks
-- (void) testThatValidationTriggersOnNewVersion {
-  self.sut.restrictApplicationUsage = YES;
-  self.sut.restrictionEnforcementFrequency = BITAuthenticatorAppRestrictionEnforcementOnFirstLaunch;
-  self.sut.identificationType = BITAuthenticatorIdentificationTypeDevice;
-  self.sut.validated = YES;
-  self.sut.lastAuthenticatedVersion = @"111xxx";
-  assertThatBool(self.sut.needsValidation, isTrue());
-}
-
-- (void) testThatValidationDoesNotTriggerOnSameVersion {
-  self.sut.restrictApplicationUsage = YES;
-  self.sut.restrictionEnforcementFrequency = BITAuthenticatorAppRestrictionEnforcementOnFirstLaunch;
-  self.sut.validated = YES;
-  self.sut.lastAuthenticatedVersion = self.sut.executableUUID;
-  assertThatBool(self.sut.needsValidation, isFalse());
-}
-
-@end
diff --git a/submodules/HockeySDK-iOS/Support/HockeySDKTests/BITBaseTests.m b/submodules/HockeySDK-iOS/Support/HockeySDKTests/BITBaseTests.m
deleted file mode 100644
index 84fc2fee6d..0000000000
--- a/submodules/HockeySDK-iOS/Support/HockeySDKTests/BITBaseTests.m
+++ /dev/null
@@ -1,31 +0,0 @@
-#import <XCTest/XCTest.h>
-#import "BITBase.h"
-
-@interface BITBaseTests : XCTestCase
-
-@end
-
-@implementation BITBaseTests
-
-- (void)testbase_typePropertyWorksAsExpected {
-    NSString *expected = @"Test string";
-    BITBase *item = [BITBase new];
-    item.baseType = expected;
-    NSString *actual = item.baseType;
-    XCTAssertTrue([actual isEqualToString:expected]);
-    
-    expected = @"Other string";
-    item.baseType = expected;
-    actual = item.baseType;
-    XCTAssertTrue([actual isEqualToString:expected]);
-}
-
-- (void)testSerialize {
-    BITBase *item = [BITBase new];
-    item.baseType = @"Test string";
-    NSDictionary *actual = [item serializeToDictionary];
-    NSDictionary *expected = @{@"baseType":@"Test string"};
-    XCTAssertTrue([actual isEqualToDictionary:expected]);
-}
-
-@end
diff --git a/submodules/HockeySDK-iOS/Support/HockeySDKTests/BITChannelTests.m b/submodules/HockeySDK-iOS/Support/HockeySDKTests/BITChannelTests.m
deleted file mode 100644
index b6e1c6f63a..0000000000
--- a/submodules/HockeySDK-iOS/Support/HockeySDKTests/BITChannelTests.m
+++ /dev/null
@@ -1,159 +0,0 @@
-#import <XCTest/XCTest.h>
-
-#import <OCHamcrestIOS/OCHamcrestIOS.h>
-#import <OCMockitoIOS/OCMockitoIOS.h>
-
-#import <OCMock/OCMock.h>
-
-#import "BITPersistencePrivate.h"
-#import "BITChannelPrivate.h"
-#import "BITTelemetryContext.h"
-#import "BITPersistence.h"
-#import "BITEnvelope.h"
-#import "BITTelemetryData.h"
-
-@interface BITChannelTests : XCTestCase
-
-@property(nonatomic, strong) BITChannel *sut;
-@property(nonatomic, strong) BITPersistence *mockPersistence;
-
-@end
-
-@implementation BITChannelTests
-
-- (void)setUp {
-  [super setUp];
-  self.mockPersistence = OCMPartialMock([[BITPersistence alloc] init]);
-  BITTelemetryContext *mockContext = mock(BITTelemetryContext.class);
-  
-  self.sut = [[BITChannel alloc]initWithTelemetryContext:mockContext persistence:self.mockPersistence];
-  bit_resetEventBuffer(&BITTelemetryEventBuffer);
-}
-
-#pragma mark - Setup Tests
-
-- (void)testNewInstanceWasInitialisedCorrectly {
-  XCTAssertNotNil([BITChannel new]);
-  XCTAssertNotNil(self.sut.dataItemsOperations);
-}
-
-#pragma mark - Queue management
-
-- (void)testEnqueueEnvelopeWithOneEnvelopeAndJSONStream {
-  self.sut = OCMPartialMock(self.sut);
-  self.sut.maxBatchSize = 3;
-  BITTelemetryData *testData = [BITTelemetryData new];
-  
-  __weak XCTestExpectation *expectation = [self expectationWithDescription:@"Enqueued a telemetry item."];
-  
-  [self.sut enqueueTelemetryItem:testData completionHandler:^{
-    assertThatUnsignedInteger(self.sut.dataItemCount, equalToUnsignedInteger(1));
-    XCTAssertTrue(strlen(BITTelemetryEventBuffer) > 0);
-    
-    [expectation fulfill];
-  }];
-
-  [self waitForExpectationsWithTimeout:5.0
-                               handler:^(NSError *_Nullable error) {
-                                 if (error) {
-                                   XCTFail(@"Expectation Failed with error: %@", error);
-                                 }
-                               }];
-}
-
-- (void)testEnqueueEnvelopeWithMultipleEnvelopesAndJSONStream {
-  self.sut = OCMPartialMock(self.sut);
-  self.sut.maxBatchSize = 3;
-  
-  BITTelemetryData *testData = [BITTelemetryData new];
-  
-  assertThatUnsignedInteger(self.sut.dataItemCount, equalToUnsignedInteger(0));
-  
-  __weak XCTestExpectation *expectation = [self expectationWithDescription:@"Enqueued a telemetry item."];
-  
-  [self.sut enqueueTelemetryItem:testData completionHandler:^{
-    assertThatUnsignedInteger(self.sut.dataItemCount, equalToUnsignedInteger(1));
-    XCTAssertTrue(strlen(BITTelemetryEventBuffer) > 0);
-    [expectation fulfill];
-  }];
-  
-  [self waitForExpectationsWithTimeout:5.0
-                               handler:^(NSError *_Nullable error) {
-                                 if (error) {
-                                   XCTFail(@"Expectation Failed with error: %@", error);
-                                 }
-                               }];
-  
-  expectation = [self expectationWithDescription:@"Enqueued a second telemetry item."];
-
-  [self.sut enqueueTelemetryItem:testData completionHandler:^{
-    assertThatUnsignedInteger(self.sut.dataItemCount, equalToUnsignedInteger(2));
-    XCTAssertTrue(strlen(BITTelemetryEventBuffer) > 0);
-    [expectation fulfill];
-  }];
-  
-  [self waitForExpectationsWithTimeout:5.0
-                               handler:^(NSError *_Nullable error) {
-                                 if (error) {
-                                   XCTFail(@"Expectation Failed with error: %@", error);
-                                 }
-                               }];
-  
-  expectation = [self expectationWithDescription:@"Enqueued a third telemetry item."];
-  
-  [self.sut enqueueTelemetryItem:testData completionHandler:^{
-    assertThatUnsignedInteger(self.sut.dataItemCount, equalToUnsignedInteger(0));
-    XCTAssertTrue(strcmp(BITTelemetryEventBuffer, "") == 0);
-    [expectation fulfill];
-  }];
-  
-  [self waitForExpectationsWithTimeout:5.0
-                               handler:^(NSError *_Nullable error) {
-                                 if (error) {
-                                   XCTFail(@"Expectation Failed with error: %@", error);
-                                 }
-                               }];
-}
-
-#pragma mark - Safe JSON Stream Tests
-
-- (void)testAppendStringToEventBuffer {
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wnonnull"
-  bit_appendStringToEventBuffer(nil, 0);
-#pragma clang diagnostic pop
-  XCTAssertEqual(strcmp(BITTelemetryEventBuffer,""), 0);
-  
-  bit_resetEventBuffer(&BITTelemetryEventBuffer);
-
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wnonnull"
-  bit_appendStringToEventBuffer(nil, &BITTelemetryEventBuffer);
-#pragma clang diagnostic pop
-  XCTAssertEqual(strcmp(BITTelemetryEventBuffer,""), 0);
-  
-  bit_appendStringToEventBuffer(@"", &BITTelemetryEventBuffer);
-  XCTAssertEqual(strcmp(BITTelemetryEventBuffer,""), 0);
-  
-  bit_appendStringToEventBuffer(@"{\"Key1\":\"Value1\"}", &BITTelemetryEventBuffer);
-  XCTAssertEqual(strcmp(BITTelemetryEventBuffer,"{\"Key1\":\"Value1\"}\n"), 0);
-}
-
-- (void)testResetSafeJsonStream {
-  bit_resetEventBuffer(&BITTelemetryEventBuffer);
-  XCTAssertEqual(strcmp(BITTelemetryEventBuffer,""), 0);
-  
-  bit_resetEventBuffer(&BITTelemetryEventBuffer);
-
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wnonnull"
-  bit_resetEventBuffer(nil);
-#pragma clang diagnostic pop
-  XCTAssertEqual(strcmp(BITTelemetryEventBuffer,""), 0);
-  
-  BITTelemetryEventBuffer = strdup("test string");
-  bit_resetEventBuffer(&BITTelemetryEventBuffer);
-  XCTAssertEqual(strcmp(BITTelemetryEventBuffer,""), 0);
-}
-
-@end
diff --git a/submodules/HockeySDK-iOS/Support/HockeySDKTests/BITCrashManagerTests.m b/submodules/HockeySDK-iOS/Support/HockeySDKTests/BITCrashManagerTests.m
deleted file mode 100644
index 737dc15d9b..0000000000
--- a/submodules/HockeySDK-iOS/Support/HockeySDKTests/BITCrashManagerTests.m
+++ /dev/null
@@ -1,382 +0,0 @@
-//
-//  BITCrashManagerTests.m
-//  HockeySDK
-//
-//  Created by Andreas Linde on 25.09.13.
-//
-//
-
-#import <XCTest/XCTest.h>
-
-#import <OCHamcrestIOS/OCHamcrestIOS.h>
-#import <OCMockitoIOS/OCMockitoIOS.h>
-
-#import "HockeySDK.h"
-#import "HockeySDKPrivate.h"
-#import "BITCrashManager.h"
-#import "BITCrashManagerPrivate.h"
-#import "BITHockeyBaseManagerPrivate.h"
-
-#import "BITPersistence.h"
-
-#import "BITTestHelper.h"
-#import "BITHockeyAppClient.h"
-
-
-static NSString *const kBITCrashMetaAttachment = @"BITCrashMetaAttachment";
-
-@interface BITCrashManagerTests : XCTestCase
-
-@property BITCrashManager *sut;
-@property BOOL startManagerInitialized;
-
-@end
-
-
-@implementation BITCrashManagerTests {
-
-}
-
-- (void)setUp {
-  [super setUp];
-  
-  self.startManagerInitialized = NO;
-  self.sut = [[BITCrashManager alloc] initWithAppIdentifier:nil appEnvironment:BITEnvironmentOther hockeyAppClient:[[BITHockeyAppClient alloc] initWithBaseURL:[NSURL URLWithString: BITHOCKEYSDK_URL]]];
-}
-
-- (void)tearDown {
-  [self.sut cleanCrashReports];
-  [super tearDown];
-}
-
-#pragma mark - Private
-
-- (void)startManager {
-  [self.sut startManager];
-  [NSObject cancelPreviousPerformRequestsWithTarget:self.sut selector:@selector(invokeDelayedProcessing) object:nil];
-  self.startManagerInitialized = YES;
-}
-
-- (void)startManagerDisabled {
-  self.sut.crashManagerStatus = BITCrashManagerStatusDisabled;
-  if (self.startManagerInitialized) return;
-  [self startManager];
-}
-
-- (void)startManagerAutoSend {
-  // Set mocks to prevent errors in `-configDefaultCrashCallback`
-  id metricsManagerMock = mock([BITMetricsManager class]);
-  [given([metricsManagerMock persistence]) willReturn:[[BITPersistence alloc] init]];
-  [[BITHockeyManager sharedHockeyManager] setValue:metricsManagerMock forKey:@"metricsManager"];
-  
-  self.sut.crashManagerStatus = BITCrashManagerStatusAutoSend;
-  if (self.startManagerInitialized) return;
-  [self startManager];
-}
-
-#pragma mark - Setup Tests
-
-- (void)testThatItInstantiates {
-  XCTAssertNotNil(self.sut, @"Should be there");
-}
-
-#pragma mark - Getter/Setter tests
-
-- (void)testSetServerURL {
-  BITHockeyAppClient *client = self.sut.hockeyAppClient;
-  NSURL *hockeyDefaultURL = [NSURL URLWithString:BITHOCKEYSDK_URL];
-  XCTAssertEqualObjects(self.sut.hockeyAppClient.baseURL, hockeyDefaultURL);
-  
-  [self.sut setServerURL:BITHOCKEYSDK_URL];
-  XCTAssertEqual(self.sut.hockeyAppClient, client, @"HockeyAppClient should stay the same when setting same URL again");
-  XCTAssertEqualObjects(self.sut.hockeyAppClient.baseURL, hockeyDefaultURL);
-  
-  NSString *testURLString = @"http://example.com";
-  [self.sut setServerURL:testURLString];
-  XCTAssertNotEqual(self.sut.hockeyAppClient, client, @"Should have created a new instance of BITHockeyAppClient");
-  XCTAssertEqualObjects(self.sut.hockeyAppClient.baseURL, [NSURL URLWithString:testURLString]);
-}
-
-#pragma mark - Persistence tests
-
-- (void)testPersistUserProvidedMetaData {
-  NSString *tempCrashName = @"tempCrash";
-  [self.sut setLastCrashFilename:tempCrashName];
-  
-  BITCrashMetaData *metaData = [BITCrashMetaData new];
-  [metaData setUserProvidedDescription:@"Test string"];
-  [self.sut persistUserProvidedMetaData:metaData];
-  
-  NSError *error;
-  NSString *description = [NSString stringWithContentsOfFile:[NSString stringWithFormat:@"%@.desc", [[self.sut crashesDir] stringByAppendingPathComponent: tempCrashName]] encoding:NSUTF8StringEncoding error:&error];
-  assertThat(description, equalTo(@"Test string"));
-}
-
-- (void)testPersistAttachment {
-  NSString *filename = @"TestAttachment";
-  NSData *data = [[NSData alloc] initWithBase64EncodedString:@"TestData" options:0];
-
-  NSString* type = @"text/plain";
-  
-  BITHockeyAttachment *originalAttachment = [[BITHockeyAttachment alloc] initWithFilename:filename hockeyAttachmentData:data contentType:type];
-  NSString *attachmentFilename = [[self.sut crashesDir] stringByAppendingPathComponent:@"testAttachment"];
-  
-  [self.sut persistAttachment:originalAttachment withFilename:attachmentFilename];
-  
-  BITHockeyAttachment *decodedAttachment = [self.sut attachmentForCrashReport:attachmentFilename];
-  
-  assertThat(decodedAttachment.filename, equalTo(filename));
-  assertThat(decodedAttachment.hockeyAttachmentData, equalTo(data));
-  assertThat(decodedAttachment.contentType, equalTo(type));
-}
-
-#pragma mark - Helper
-
-- (void)testUserIDForCrashReport {
-  BITHockeyManager *hm = [BITHockeyManager sharedHockeyManager];
-  id delegateMock = mockProtocol(@protocol(BITHockeyManagerDelegate));
-  hm.delegate = delegateMock;
-  self.sut.delegate = delegateMock;
-  
-  NSString *result = [self.sut userIDForCrashReport];
-  
-  assertThat(result, notNilValue());
-  
-  [verifyCount(delegateMock, times(1)) userIDForHockeyManager:hm componentManager:self.sut];
-}
-
-- (void)testUserNameForCrashReport {
-  BITHockeyManager *hm = [BITHockeyManager sharedHockeyManager];
-  id delegateMock = mockProtocol(@protocol(BITHockeyManagerDelegate));
-  hm.delegate = delegateMock;
-  self.sut.delegate = delegateMock;
-  
-  NSString *result = [self.sut userNameForCrashReport];
-  
-  assertThat(result, notNilValue());
-  
-  [verifyCount(delegateMock, times(1)) userNameForHockeyManager:hm componentManager:self.sut];
-}
-
-- (void)testUserEmailForCrashReport {
-  BITHockeyManager *hm = [BITHockeyManager sharedHockeyManager];
-  id delegateMock = mockProtocol(@protocol(BITHockeyManagerDelegate));
-  hm.delegate = delegateMock;
-  self.sut.delegate = delegateMock;
-  
-  NSString *result = [self.sut userEmailForCrashReport];
-  
-  assertThat(result, notNilValue());
-  
-  [verifyCount(delegateMock, times(1)) userEmailForHockeyManager:hm componentManager:self.sut];
-}
-
-#pragma mark - Handle User Input
-
-- (void)testHandleUserInputDontSend {
-  id <BITCrashManagerDelegate> delegateMock = mockProtocol(@protocol(BITCrashManagerDelegate));
-  self.sut.delegate = delegateMock;
-  
-  assertThatBool([self.sut handleUserInput:BITCrashManagerUserInputDontSend withUserProvidedMetaData:nil], isTrue());
-  
-  [verify(delegateMock) crashManagerWillCancelSendingCrashReport:self.sut];
-  
-}
-
-- (void)testHandleUserInputSend {
-  assertThatBool([self.sut handleUserInput:BITCrashManagerUserInputSend withUserProvidedMetaData:nil], isTrue());
-}
-
-- (void)testHandleUserInputAlwaysSend {
-  id <BITCrashManagerDelegate> delegateMock = mockProtocol(@protocol(BITCrashManagerDelegate));
-  self.sut.delegate = delegateMock;
-  NSUserDefaults *mockUserDefaults = mock([NSUserDefaults class]);
-  
-  //Test if CrashManagerStatus is unset
-  [given([mockUserDefaults integerForKey:@"BITCrashManagerStatus"]) willReturn:nil];
-  
-  //Test if method runs through
-  assertThatBool([self.sut handleUserInput:BITCrashManagerUserInputAlwaysSend withUserProvidedMetaData:nil], isTrue());
-  
-  //Test if correct CrashManagerStatus is now set
-  [given([mockUserDefaults integerForKey:@"BITCrashManagerStauts"]) willReturnInt:BITCrashManagerStatusAutoSend];
-  
-  //Verify that delegate method has been called
-  [verify(delegateMock) crashManagerWillSendCrashReportsAlways:self.sut];
-  
-}
-
-- (void)testHandleUserInputWithInvalidInput {
-  assertThatBool([self.sut handleUserInput:3 withUserProvidedMetaData:nil], isFalse());
-}
-
-#pragma mark - Debugger
-/**
- * The test is currently disabled because it fails for unknown reasons when being run using xcodebuild.
- * This occurs for example on our current CI solution. Will be reenabled as soon as we find a fix.
-*/
-#ifndef CI
-/**
- *  We are running this usually witin Xcode
- *  TODO: what to do if we do run this e.g. on Jenkins or Xcode bots ?
- */
-- (void)testIsDebuggerAttached {
-  assertThatBool([self.sut isDebuggerAttached], isTrue());
-}
-#endif
-
-#pragma mark - Helper
-
-- (void)testHasPendingCrashReportWithNoFiles {
-  self.sut.crashManagerStatus = BITCrashManagerStatusAutoSend;
-  assertThatBool([self.sut hasPendingCrashReport], isFalse());
-}
-
-- (void)testFirstNotApprovedCrashReportWithNoFiles {
-  self.sut.crashManagerStatus = BITCrashManagerStatusAutoSend;
-  assertThat([self.sut firstNotApprovedCrashReport], equalTo(nil));
-}
-
-
-#pragma mark - StartManager
-
-- (void)testStartManagerWithModuleDisabled {
-  [self startManagerDisabled];
-  
-  assertThat(self.sut.plCrashReporter, equalTo(nil));
-}
-
-- (void)testStartManagerWithAutoSend {
-  // since PLCR is only initialized once ever, we need to pack all tests that rely on a PLCR instance
-  // in this test method. Ugly but otherwise this would require a major redesign of BITCrashManager
-  // which we can't do at this moment
-  // This also limits us not being able to test various scenarios having a custom exception handler
-  // which would require us to run without a debugger anyway and which would also require a redesign
-  // to make this better testable with unit tests
-  
-  id delegateMock = mockProtocol(@protocol(BITCrashManagerDelegate));
-  self.sut.delegate = delegateMock;
-
-  [self startManagerAutoSend];
-  
-  assertThat(self.sut.plCrashReporter, notNilValue());
-  
-  // When running from the debugger this is always nil and not the exception handler from PLCR
-  NSUncaughtExceptionHandler *currentHandler = NSGetUncaughtExceptionHandler();
-  
-  BOOL result = (self.sut.exceptionHandler == currentHandler);
-  
-  assertThatBool(result, isTrue());
-  
-  // No files at startup
-  assertThatBool([self.sut hasPendingCrashReport], isFalse());
-  assertThat([self.sut firstNotApprovedCrashReport], equalTo(nil));
-  
-  [self.sut invokeDelayedProcessing];
-  
-  // handle a new empty crash report
-  assertThatBool([BITTestHelper copyFixtureCrashReportWithFileName:@"live_report_empty"], isTrue());
-  
-  [self.sut handleCrashReport];
-  
-  // we should have 0 pending crash report
-  assertThatBool([self.sut hasPendingCrashReport], isFalse());
-  assertThat([self.sut firstNotApprovedCrashReport], equalTo(nil));
-  
-  [self.sut cleanCrashReports];
-  
-  // handle a new signal crash report
-  assertThatBool([BITTestHelper copyFixtureCrashReportWithFileName:@"live_report_signal"], isTrue());
-  
-  [self.sut handleCrashReport];
-
-  // this old report doesn't have a marketing version present
-  assertThat(self.sut.lastSessionCrashDetails.appVersion, equalTo(nil));
-
-  [verifyCount(delegateMock, times(1)) applicationLogForCrashManager:self.sut];
-  [verifyCount(delegateMock, times(1)) attachmentForCrashManager:self.sut];
-  
-  // we should have now 1 pending crash report
-  assertThatBool([self.sut hasPendingCrashReport], isTrue());
-  assertThat([self.sut firstNotApprovedCrashReport], notNilValue());
-  
-  // this is currently sending blindly, needs refactoring to test properly
-  [self.sut sendNextCrashReport];
-  [verifyCount(delegateMock, times(1)) crashManagerWillSendCrashReport:self.sut];
-  
-  [self.sut cleanCrashReports];
-
-  // handle a new signal crash report
-  assertThatBool([BITTestHelper copyFixtureCrashReportWithFileName:@"live_report_exception"], isTrue());
-  
-  [self.sut handleCrashReport];
-  
-  // this old report doesn't have a marketing version present
-  assertThat(self.sut.lastSessionCrashDetails.appVersion, equalTo(nil));
-  
-  [verifyCount(delegateMock, times(1)) applicationLogForCrashManager:self.sut];
-  [verifyCount(delegateMock, times(1)) attachmentForCrashManager:self.sut];
-  
-  // we should have now 1 pending crash report
-  assertThatBool([self.sut hasPendingCrashReport], isTrue());
-  assertThat([self.sut firstNotApprovedCrashReport], notNilValue());
-  
-  [self.sut cleanCrashReports];
-  
-  // handle a new signal crash report
-  assertThatBool([BITTestHelper copyFixtureCrashReportWithFileName:@"live_report_signal_marketing"], isTrue());
-  
-  [self.sut handleCrashReport];
-  
-  // this old report doesn't have a marketing version present
-  assertThat(self.sut.lastSessionCrashDetails.appVersion, notNilValue());
-  
-  [verifyCount(delegateMock, times(1)) applicationLogForCrashManager:self.sut];
-  [verifyCount(delegateMock, times(1)) attachmentForCrashManager:self.sut];
-  
-  // we should have now 1 pending crash report
-  assertThatBool([self.sut hasPendingCrashReport], isTrue());
-  assertThat([self.sut firstNotApprovedCrashReport], notNilValue());
-  
-  // this is currently sending blindly, needs refactoring to test properly
-  [self.sut sendNextCrashReport];
-  [verifyCount(delegateMock, times(1)) crashManagerWillSendCrashReport:self.sut];
-  
-  [self.sut cleanCrashReports];
-  
-  // handle a new signal crash report
-  assertThatBool([BITTestHelper copyFixtureCrashReportWithFileName:@"live_report_exception_marketing"], isTrue());
-  
-  [self.sut handleCrashReport];
-  
-  // this old report doesn't have a marketing version present
-  assertThat(self.sut.lastSessionCrashDetails.appVersion, notNilValue());
-  
-  [verifyCount(delegateMock, times(1)) applicationLogForCrashManager:self.sut];
-  [verifyCount(delegateMock, times(1)) attachmentForCrashManager:self.sut];
-  
-  // we should have now 1 pending crash report
-  assertThatBool([self.sut hasPendingCrashReport], isTrue());
-  assertThat([self.sut firstNotApprovedCrashReport], notNilValue());
-  
-  [self.sut cleanCrashReports];
-  
-  // handle a new xamarin crash report
-  assertThatBool([BITTestHelper copyFixtureCrashReportWithFileName:@"live_report_xamarin"], isTrue());
-  
-  [self.sut handleCrashReport];
-  
-  // this old report doesn't have a marketing version present
-  assertThat(self.sut.lastSessionCrashDetails.appVersion, notNilValue());
-  
-  [verifyCount(delegateMock, times(1)) applicationLogForCrashManager:self.sut];
-  [verifyCount(delegateMock, times(1)) attachmentForCrashManager:self.sut];
-  
-  // we should have now 1 pending crash report
-  assertThatBool([self.sut hasPendingCrashReport], isTrue());
-  assertThat([self.sut firstNotApprovedCrashReport], notNilValue());
-  
-  [self.sut cleanCrashReports];
-}
-
-@end
diff --git a/submodules/HockeySDK-iOS/Support/HockeySDKTests/BITCrashReportTextFormatterTests.m b/submodules/HockeySDK-iOS/Support/HockeySDKTests/BITCrashReportTextFormatterTests.m
deleted file mode 100644
index 4584f3bc31..0000000000
--- a/submodules/HockeySDK-iOS/Support/HockeySDKTests/BITCrashReportTextFormatterTests.m
+++ /dev/null
@@ -1,283 +0,0 @@
-//
-//  BITCrashReportTextFormatterTests.m
-//  HockeySDK
-//
-//  Created by Andreas Linde on 27.11.14.
-//
-//
-
-#import <XCTest/XCTest.h>
-
-#import <OCHamcrestIOS/OCHamcrestIOS.h>
-#import <OCMockitoIOS/OCMockitoIOS.h>
-
-#import <CrashReporter/CrashReporter.h>
-#import "BITCrashReportTextFormatter.h"
-
-#import "BITTestHelper.h"
-#import "BITCrashReportTextFormatterPrivate.h"
-
-@interface BITCrashReportTextFormatterTests : XCTestCase
-
-@end
-
-@implementation BITCrashReportTextFormatterTests
-
-- (void)setUp {
-  [super setUp];
-  // Put setup code here. This method is called before the invocation of each test method in the class.
-}
-
-- (void)tearDown {  
-  [super tearDown];
-}
-
-- (void)testOSXImages {
-  NSString *processPath = nil;
-  NSString *appBundlePath = nil;
-  
-  appBundlePath = @"/Applications/MyTestApp.App";
-
-  // Test with default OS X app path
-  processPath = [appBundlePath stringByAppendingString:@"/Contents/MacOS/MyApp"];
-  [self testOSXNonAppSpecificImagesForProcessPath:processPath];
-  [self assertIsOtherWithImagePath:processPath processPath:nil];
-  [self assertIsOtherWithImagePath:nil processPath:processPath];
-  [self assertIsAppBinaryWithImagePath:processPath processPath:processPath];
-  
-  // Test with OS X LoginItems app helper path
-  processPath = [appBundlePath stringByAppendingString:@"/Contents/Library/LoginItems/net.hockeyapp.helper.app/Contents/MacOS/Helper"];
-  [self testOSXNonAppSpecificImagesForProcessPath:processPath];
-  [self assertIsOtherWithImagePath:processPath processPath:nil];
-  [self assertIsOtherWithImagePath:nil processPath:processPath];
-  [self assertIsAppBinaryWithImagePath:processPath processPath:processPath];
-  
-  // Test with OS X app in Resources folder
-  processPath = @"/Applications/MyTestApp.App/Contents/Resources/Helper";
-  [self testOSXNonAppSpecificImagesForProcessPath:processPath];
-  [self assertIsOtherWithImagePath:processPath processPath:nil];
-  [self assertIsOtherWithImagePath:nil processPath:processPath];
-  [self assertIsAppBinaryWithImagePath:processPath processPath:processPath];
-}
-
-- (void)testiOSImages {
-  NSString *processPath = nil;
-  NSString *appBundlePath = nil;
-    
-  appBundlePath = @"/private/var/mobile/Containers/Bundle/Application/9107B4E2-CD8C-486E-A3B2-82A5B818F2A0/MyApp.app";
-  
-  // Test with iOS App
-  processPath = [appBundlePath stringByAppendingString:@"/MyApp"];
-  [self testiOSNonAppSpecificImagesForProcessPath:processPath];
-  [self assertIsOtherWithImagePath:processPath processPath:nil];
-  [self assertIsOtherWithImagePath:nil processPath:processPath];
-  [self assertIsAppBinaryWithImagePath:processPath processPath:processPath];
-  [self testiOSAppFrameworkAtProcessPath:processPath appBundlePath:appBundlePath];
-  
-
-  // Test with iOS App Extension
-  processPath = [appBundlePath stringByAppendingString:@"/Plugins/MyAppExtension.appex/MyAppExtension"];
-  [self testiOSNonAppSpecificImagesForProcessPath:processPath];
-  [self assertIsOtherWithImagePath:processPath processPath:nil];
-  [self assertIsOtherWithImagePath:nil processPath:processPath];
-  [self assertIsAppBinaryWithImagePath:processPath processPath:processPath];
-  [self testiOSAppFrameworkAtProcessPath:processPath appBundlePath:appBundlePath];
-}
-
-
-#pragma mark - Test Helper
-
-- (void)assertIsAppFrameworkWithFrameworkPath:(NSString *)frameworkPath processPath:(NSString *)processPath {
-  BITBinaryImageType imageType = [BITCrashReportTextFormatter bit_imageTypeForImagePath:frameworkPath
-                                                                            processPath:processPath];
-  XCTAssertEqual(imageType, BITBinaryImageTypeAppFramework, @"Test framework %@ with process %@", frameworkPath, processPath);
-}
-
-- (void)assertIsAppBinaryWithImagePath:(NSString *)imagePath processPath:(NSString *)processPath {
-  BITBinaryImageType imageType = [BITCrashReportTextFormatter bit_imageTypeForImagePath:imagePath
-                                                                            processPath:processPath];
-  XCTAssertEqual(imageType, BITBinaryImageTypeAppBinary, @"Test app %@ with process %@", imagePath, processPath);
-}
-
-- (void)assertIsSwiftFrameworkWithFrameworkPath:(NSString *)swiftFrameworkPath processPath:(NSString *)processPath {
-  BITBinaryImageType imageType = [BITCrashReportTextFormatter bit_imageTypeForImagePath:swiftFrameworkPath
-                                                                            processPath:processPath];
-  XCTAssertEqual(imageType, BITBinaryImageTypeOther, @"Test swift image %@ with process %@", swiftFrameworkPath, processPath);
-}
-
-- (void)assertIsOtherWithImagePath:(NSString *)imagePath processPath:(NSString *)processPath {
-  BITBinaryImageType imageType = [BITCrashReportTextFormatter bit_imageTypeForImagePath:imagePath
-                                                                            processPath:processPath];
-  XCTAssertEqual(imageType, BITBinaryImageTypeOther, @"Test other image %@ with process %@", imagePath, processPath);
-}
-
-#pragma mark - OS X Test Helper
-
-- (void)testOSXAppFrameworkAtProcessPath:(NSString *)processPath appBundlePath:(NSString *)appBundlePath {
-  NSString *frameworkPath = [appBundlePath stringByAppendingString:@"/Contents/Frameworks/MyFrameworkLib.framework/Versions/A/MyFrameworkLib"];
-  [self assertIsAppFrameworkWithFrameworkPath:frameworkPath processPath:processPath];
-
-  frameworkPath = [appBundlePath stringByAppendingString:@"/Contents/Frameworks/libSwiftMyLib.framework/Versions/A/libSwiftMyLib"];
-  [self assertIsAppFrameworkWithFrameworkPath:frameworkPath processPath:processPath];
-
-  NSMutableArray *swiftFrameworkPaths = [NSMutableArray new];
-  [swiftFrameworkPaths addObject:[appBundlePath stringByAppendingString:@"/Contents/Frameworks/libswiftCore.dylib"]];
-  [swiftFrameworkPaths addObject:[appBundlePath stringByAppendingString:@"/Contents/Frameworks/libswiftDarwin.dylib"]];
-  [swiftFrameworkPaths addObject:[appBundlePath stringByAppendingString:@"/Contents/Frameworks/libswiftDispatch.dylib"]];
-  [swiftFrameworkPaths addObject:[appBundlePath stringByAppendingString:@"/Contents/Frameworks/libswiftFoundation.dylib"]];
-  [swiftFrameworkPaths addObject:[appBundlePath stringByAppendingString:@"/Contents/Frameworks/libswiftObjectiveC.dylib"]];
-  [swiftFrameworkPaths addObject:[appBundlePath stringByAppendingString:@"/Contents/Frameworks/libswiftSecurity.dylib"]];
-  [swiftFrameworkPaths addObject:[appBundlePath stringByAppendingString:@"/Contents/Frameworks/libswiftCoreGraphics.dylib"]];
-  
-  for (NSString *swiftFrameworkPath in swiftFrameworkPaths) {
-    [self assertIsSwiftFrameworkWithFrameworkPath:swiftFrameworkPath processPath:processPath];
-  }
-}
-
-- (void)testOSXNonAppSpecificImagesForProcessPath:(NSString *)processPath {
-  // system test paths
-  NSMutableArray *nonAppSpecificImagePaths = [NSMutableArray new];
-
-  // OS X frameworks
-  [nonAppSpecificImagePaths addObject:@"cl_kernels"];
-  [nonAppSpecificImagePaths addObject:@""];
-  [nonAppSpecificImagePaths addObject:@"???"];
-  [nonAppSpecificImagePaths addObject:@"/System/Library/Frameworks/CFNetwork.framework/Versions/A/CFNetwork"];
-  [nonAppSpecificImagePaths addObject:@"/usr/lib/system/libsystem_platform.dylib"];
-  [nonAppSpecificImagePaths addObject:@"/System/Library/Frameworks/Accelerate.framework/Versions/A/Frameworks/vecLib.framework/Versions/A/vecLib"];
-  [nonAppSpecificImagePaths addObject:@"/System/Library/PrivateFrameworks/Sharing.framework/Versions/A/Sharing"];
-  [nonAppSpecificImagePaths addObject:@"/usr/lib/libbsm.0.dylib"];
-  
-  for (NSString *imagePath in nonAppSpecificImagePaths) {
-    [self assertIsOtherWithImagePath:imagePath processPath:processPath];
-  }
-}
-
-
-#pragma mark - iOS Test Helper
-
-- (void)testiOSAppFrameworkAtProcessPath:(NSString *)processPath appBundlePath:(NSString *)appBundlePath {
-  NSString *frameworkPath = [appBundlePath stringByAppendingString:@"/Frameworks/MyFrameworkLib.framework/MyFrameworkLib"];
-  [self assertIsAppFrameworkWithFrameworkPath:frameworkPath processPath:processPath];
-
-  
-  frameworkPath = [appBundlePath stringByAppendingString:@"/Frameworks/libSwiftMyLib.framework/libSwiftMyLib"];
-  [self assertIsAppFrameworkWithFrameworkPath:frameworkPath processPath:processPath];
-
-  NSMutableArray *swiftFrameworkPaths = [NSMutableArray new];
-  [swiftFrameworkPaths addObject:[appBundlePath stringByAppendingString:@"/Frameworks/libswiftCore.dylib"]];
-  [swiftFrameworkPaths addObject:[appBundlePath stringByAppendingString:@"/Frameworks/libswiftDarwin.dylib"]];
-  [swiftFrameworkPaths addObject:[appBundlePath stringByAppendingString:@"/Frameworks/libswiftDispatch.dylib"]];
-  [swiftFrameworkPaths addObject:[appBundlePath stringByAppendingString:@"/Frameworks/libswiftFoundation.dylib"]];
-  [swiftFrameworkPaths addObject:[appBundlePath stringByAppendingString:@"/Frameworks/libswiftObjectiveC.dylib"]];
-  [swiftFrameworkPaths addObject:[appBundlePath stringByAppendingString:@"/Frameworks/libswiftSecurity.dylib"]];
-  [swiftFrameworkPaths addObject:[appBundlePath stringByAppendingString:@"/Frameworks/libswiftCoreGraphics.dylib"]];
-  
-  for (NSString *swiftFrameworkPath in swiftFrameworkPaths) {
-    [self assertIsSwiftFrameworkWithFrameworkPath:swiftFrameworkPath processPath:processPath];
-  }
-}
-
-- (void)testiOSNonAppSpecificImagesForProcessPath:(NSString *)processPath {
-  // system test paths
-  NSMutableArray *nonAppSpecificImagePaths = [NSMutableArray new];
-  
-  // iOS frameworks
-  [nonAppSpecificImagePaths addObject:@"/System/Library/AccessibilityBundles/AccessibilitySettingsLoader.bundle/AccessibilitySettingsLoader"];
-  [nonAppSpecificImagePaths addObject:@"/System/Library/Frameworks/AVFoundation.framework/AVFoundation"];
-  [nonAppSpecificImagePaths addObject:@"/System/Library/Frameworks/AVFoundation.framework/libAVFAudio.dylib"];
-  [nonAppSpecificImagePaths addObject:@"/System/Library/PrivateFrameworks/AOSNotification.framework/AOSNotification"];
-  [nonAppSpecificImagePaths addObject:@"/System/Library/PrivateFrameworks/Accessibility.framework/Frameworks/AccessibilityUI.framework/AccessibilityUI"];
-  [nonAppSpecificImagePaths addObject:@"/System/Library/PrivateFrameworks/Accessibility.framework/Frameworks/AccessibilityUIUtilities.framework/AccessibilityUIUtilities"];
-  [nonAppSpecificImagePaths addObject:@"/usr/lib/libAXSafeCategoryBundle.dylib"];
-  [nonAppSpecificImagePaths addObject:@"/usr/lib/libAXSpeechManager.dylib"];
-  [nonAppSpecificImagePaths addObject:@"/usr/lib/libAccessibility.dylib"];
-  [nonAppSpecificImagePaths addObject:@"/usr/lib/system/libcache.dylib"];
-  [nonAppSpecificImagePaths addObject:@"/usr/lib/system/libcommonCrypto.dylib"];
-  [nonAppSpecificImagePaths addObject:@"/usr/lib/system/libcompiler_rt.dylib"];
-  
-  // iOS Jailbreak libraries
-  [nonAppSpecificImagePaths addObject:@"/Library/MobileSubstrate/MobileSubstrate.dylib"];
-  [nonAppSpecificImagePaths addObject:@"/Library/MobileSubstrate/DynamicLibraries/WeeLoader.dylib"];
-  [nonAppSpecificImagePaths addObject:@"/Library/Frameworks/CydiaSubstrate.framework/Libraries/SubstrateLoader.dylib"];
-  [nonAppSpecificImagePaths addObject:@"/Library/Frameworks/CydiaSubstrate.framework/CydiaSubstrate"];
-  [nonAppSpecificImagePaths addObject:@"/Library/MobileSubstrate/DynamicLibraries/WinterBoard.dylib"];
-  
-  for (NSString *imagePath in nonAppSpecificImagePaths) {
-    [self assertIsOtherWithImagePath:imagePath processPath:processPath];
-  }
-}
-
-- (void)testSignalReport {
-  NSData *crashData = [BITTestHelper dataOfFixtureCrashReportWithFileName:@"live_report_signal"];
-  assertThat(crashData, notNilValue());
-  
-  NSError *error = nil;
-  BITPLCrashReport *report = [[BITPLCrashReport alloc] initWithData:crashData error:&error];
-  
-  NSString *crashLogString = [BITCrashReportTextFormatter stringValueForCrashReport:report crashReporterKey:@""];
-
-  assertThat(crashLogString, notNilValue());
-
-  crashData = [BITTestHelper dataOfFixtureCrashReportWithFileName:@"live_report_signal_marketing"];
-  assertThat(crashData, notNilValue());
-  
-  report = [[BITPLCrashReport alloc] initWithData:crashData error:&error];
-  
-  crashLogString = [BITCrashReportTextFormatter stringValueForCrashReport:report crashReporterKey:@""];
-  
-  assertThat(crashLogString, notNilValue());
-}
-
-- (void)testExceptionReport {
-  NSData *crashData = [BITTestHelper dataOfFixtureCrashReportWithFileName:@"live_report_exception"];
-  assertThat(crashData, notNilValue());
-  
-  NSError *error = nil;
-  BITPLCrashReport *report = [[BITPLCrashReport alloc] initWithData:crashData error:&error];
-  
-  NSString *crashLogString = [BITCrashReportTextFormatter stringValueForCrashReport:report crashReporterKey:@""];
-  
-  assertThat(crashLogString, notNilValue());
-
-  crashData = [BITTestHelper dataOfFixtureCrashReportWithFileName:@"live_report_exception_marketing"];
-  assertThat(crashData, notNilValue());
-  
-  report = [[BITPLCrashReport alloc] initWithData:crashData error:&error];
-  
-  crashLogString = [BITCrashReportTextFormatter stringValueForCrashReport:report crashReporterKey:@""];
-  
-  assertThat(crashLogString, notNilValue());
-}
-
-- (void)testXamarinReport {
-  NSData *crashData = [BITTestHelper dataOfFixtureCrashReportWithFileName:@"live_report_xamarin"];
-  assertThat(crashData, notNilValue());
-  
-  NSError *error = nil;
-  BITPLCrashReport *report = [[BITPLCrashReport alloc] initWithData:crashData error:&error];
-  
-  NSString *filePath = [[NSBundle bundleForClass:self.class] pathForResource:@"log_report_xamarin" ofType:@""];
-  NSString *expected = [NSString stringWithContentsOfFile:filePath encoding:NSUTF8StringEncoding error:nil];
-  
-  NSString *actual = [BITCrashReportTextFormatter stringValueForCrashReport:report crashReporterKey:@""];
-  
-  assertThat(expected, equalTo(actual));
-}
-
-- (void)testAnonymizedPathFromPath {
-  NSString *testPath = @"/var/containers/Bundle/Application/2A0B0E6F-0BF2-419D-A699-FCDF8ADECD8C/Puppet.app/Puppet";
-  NSString *expected = testPath;
-  NSString *actual = [BITCrashReportTextFormatter anonymizedPathFromPath:testPath];
-  assertThat(actual, equalTo(expected));
-  
-  testPath = @"/Users/sampleuser/Library/Developer/CoreSimulator/Devices/B8321AD0-C30B-41BD-BA54-5A7759CEC4CD/data/Containers/Bundle/Application/8CC7B5B5-7841-45C4-BAC2-6AA1B944A5E1/Puppet.app/Puppet";
-  expected = @"/Users/USER/Library/Developer/CoreSimulator/Devices/B8321AD0-C30B-41BD-BA54-5A7759CEC4CD/data/Containers/Bundle/Application/8CC7B5B5-7841-45C4-BAC2-6AA1B944A5E1/Puppet.app/Puppet";
-  actual = [BITCrashReportTextFormatter anonymizedPathFromPath:testPath];
-  assertThat(actual, equalTo(expected));
-  XCTAssertFalse([actual containsString:@"sampleuser"]);
-  XCTAssertTrue([actual hasPrefix:@"/Users/USER/"]);
-
-}
-
-@end
diff --git a/submodules/HockeySDK-iOS/Support/HockeySDKTests/BITDataTests.m b/submodules/HockeySDK-iOS/Support/HockeySDKTests/BITDataTests.m
deleted file mode 100644
index 06280f155c..0000000000
--- a/submodules/HockeySDK-iOS/Support/HockeySDKTests/BITDataTests.m
+++ /dev/null
@@ -1,31 +0,0 @@
-#import <XCTest/XCTest.h>
-#import "BITData.h"
-
-@interface BITDataTests : XCTestCase
-
-@end
-
-@implementation BITDataTests
-
-- (void)testbase_dataPropertyWorksAsExpected {
-    BITTelemetryData *expected = [BITTelemetryData new];
-    BITData *item = [BITData new];
-    item.baseData = expected;
-    BITTelemetryData *actual = item.baseData;
-    XCTAssertTrue(actual == expected);
-    
-    expected = [BITTelemetryData new];
-    item.baseData = expected;
-    actual = item.baseData;
-    XCTAssertTrue(actual == expected);
-}
-
-- (void)testSerialize {
-    BITData *item = [BITData new];
-    item.baseData = [BITTelemetryData new];
-    NSDictionary *actual = [item serializeToDictionary];
-    NSDictionary *expected = @{@"baseData":@{}};
-    XCTAssertTrue([actual isEqualToDictionary:expected]);
-}
-
-@end
diff --git a/submodules/HockeySDK-iOS/Support/HockeySDKTests/BITDeviceTests.m b/submodules/HockeySDK-iOS/Support/HockeySDKTests/BITDeviceTests.m
deleted file mode 100644
index d8befe4fd9..0000000000
--- a/submodules/HockeySDK-iOS/Support/HockeySDKTests/BITDeviceTests.m
+++ /dev/null
@@ -1,215 +0,0 @@
-#import <XCTest/XCTest.h>
-#import "BITDevice.h"
-
-@interface BITDeviceTests : XCTestCase
-
-@end
-
-@implementation BITDeviceTests
-
-- (void)testidPropertyWorksAsExpected {
-    NSString *expected = @"Test string";
-    BITDevice *item = [BITDevice new];
-    item.deviceId = expected;
-    NSString *actual = item.deviceId;
-    XCTAssertTrue([actual isEqualToString:expected]);
-    
-    expected = @"Other string";
-    item.deviceId = expected;
-    actual = item.deviceId;
-    XCTAssertTrue([actual isEqualToString:expected]);
-}
-
-- (void)testipPropertyWorksAsExpected {
-    NSString *expected = @"Test string";
-    BITDevice *item = [BITDevice new];
-    item.ip = expected;
-    NSString *actual = item.ip;
-    XCTAssertTrue([actual isEqualToString:expected]);
-    
-    expected = @"Other string";
-    item.ip = expected;
-    actual = item.ip;
-    XCTAssertTrue([actual isEqualToString:expected]);
-}
-
-- (void)testlanguagePropertyWorksAsExpected {
-    NSString *expected = @"Test string";
-    BITDevice *item = [BITDevice new];
-    item.language = expected;
-    NSString *actual = item.language;
-    XCTAssertTrue([actual isEqualToString:expected]);
-    
-    expected = @"Other string";
-    item.language = expected;
-    actual = item.language;
-    XCTAssertTrue([actual isEqualToString:expected]);
-}
-
-- (void)testlocalePropertyWorksAsExpected {
-    NSString *expected = @"Test string";
-    BITDevice *item = [BITDevice new];
-    item.locale = expected;
-    NSString *actual = item.locale;
-    XCTAssertTrue([actual isEqualToString:expected]);
-    
-    expected = @"Other string";
-    item.locale = expected;
-    actual = item.locale;
-    XCTAssertTrue([actual isEqualToString:expected]);
-}
-
-- (void)testmodelPropertyWorksAsExpected {
-    NSString *expected = @"Test string";
-    BITDevice *item = [BITDevice new];
-    item.model = expected;
-    NSString *actual = item.model;
-    XCTAssertTrue([actual isEqualToString:expected]);
-    
-    expected = @"Other string";
-    item.model = expected;
-    actual = item.model;
-    XCTAssertTrue([actual isEqualToString:expected]);
-}
-
-- (void)testnetworkPropertyWorksAsExpected {
-    NSString *expected = @"Test string";
-    BITDevice *item = [BITDevice new];
-    item.network = expected;
-    NSString *actual = item.network;
-    XCTAssertTrue([actual isEqualToString:expected]);
-    
-    expected = @"Other string";
-    item.network = expected;
-    actual = item.network;
-    XCTAssertTrue([actual isEqualToString:expected]);
-}
-
-- (void)testoem_namePropertyWorksAsExpected {
-    NSString *expected = @"Test string";
-    BITDevice *item = [BITDevice new];
-    item.oemName = expected;
-    NSString *actual = item.oemName;
-    XCTAssertTrue([actual isEqualToString:expected]);
-    
-    expected = @"Other string";
-    item.oemName = expected;
-    actual = item.oemName;
-    XCTAssertTrue([actual isEqualToString:expected]);
-}
-
-- (void)testosPropertyWorksAsExpected {
-    NSString *expected = @"Test string";
-    BITDevice *item = [BITDevice new];
-    item.os = expected;
-    NSString *actual = item.os;
-    XCTAssertTrue([actual isEqualToString:expected]);
-    
-    expected = @"Other string";
-    item.os = expected;
-    actual = item.os;
-    XCTAssertTrue([actual isEqualToString:expected]);
-}
-
-- (void)testos_versionPropertyWorksAsExpected {
-    NSString *expected = @"Test string";
-    BITDevice *item = [BITDevice new];
-    item.osVersion = expected;
-    NSString *actual = item.osVersion;
-    XCTAssertTrue([actual isEqualToString:expected]);
-    
-    expected = @"Other string";
-    item.osVersion = expected;
-    actual = item.osVersion;
-    XCTAssertTrue([actual isEqualToString:expected]);
-}
-
-- (void)testrole_instancePropertyWorksAsExpected {
-    NSString *expected = @"Test string";
-    BITDevice *item = [BITDevice new];
-    item.roleInstance = expected;
-    NSString *actual = item.roleInstance;
-    XCTAssertTrue([actual isEqualToString:expected]);
-    
-    expected = @"Other string";
-    item.roleInstance = expected;
-    actual = item.roleInstance;
-    XCTAssertTrue([actual isEqualToString:expected]);
-}
-
-- (void)testrole_namePropertyWorksAsExpected {
-    NSString *expected = @"Test string";
-    BITDevice *item = [BITDevice new];
-    item.roleName = expected;
-    NSString *actual = item.roleName;
-    XCTAssertTrue([actual isEqualToString:expected]);
-    
-    expected = @"Other string";
-    item.roleName = expected;
-    actual = item.roleName;
-    XCTAssertTrue([actual isEqualToString:expected]);
-}
-
-- (void)testscreen_resolutionPropertyWorksAsExpected {
-    NSString *expected = @"Test string";
-    BITDevice *item = [BITDevice new];
-    item.screenResolution = expected;
-    NSString *actual = item.screenResolution;
-    XCTAssertTrue([actual isEqualToString:expected]);
-    
-    expected = @"Other string";
-    item.screenResolution = expected;
-    actual = item.screenResolution;
-    XCTAssertTrue([actual isEqualToString:expected]);
-}
-
-- (void)testtypePropertyWorksAsExpected {
-    NSString *expected = @"Test string";
-    BITDevice *item = [BITDevice new];
-    item.type = expected;
-    NSString *actual = item.type;
-    XCTAssertTrue([actual isEqualToString:expected]);
-    
-    expected = @"Other string";
-    item.type = expected;
-    actual = item.type;
-    XCTAssertTrue([actual isEqualToString:expected]);
-}
-
-- (void)testvm_namePropertyWorksAsExpected {
-    NSString *expected = @"Test string";
-    BITDevice *item = [BITDevice new];
-    item.machineName = expected;
-    NSString *actual = item.machineName;
-    XCTAssertTrue([actual isEqualToString:expected]);
-    
-    expected = @"Other string";
-    item.machineName = expected;
-    actual = item.machineName;
-    XCTAssertTrue([actual isEqualToString:expected]);
-}
-
-- (void)testSerialize {
-    BITDevice *item = [BITDevice new];
-    item.deviceId = @"Test string";
-    item.ip = @"Test string";
-    item.language = @"Test string";
-    item.locale = @"Test string";
-    item.model = @"Test string";
-    item.network = @"Test string";
-    item.networkName = @"Test networkName";
-    item.oemName = @"Test string";
-    item.os = @"Test string";
-    item.osVersion = @"Test string";
-    item.roleInstance = @"Test string";
-    item.roleName = @"Test string";
-    item.screenResolution = @"Test string";
-    item.type = @"Test string";
-    item.machineName = @"Test string";
-    item.vmName = @"Test vmName";
-    NSDictionary *actual = [item serializeToDictionary];
-    NSDictionary *expected = @{@"ai.device.id":@"Test string", @"ai.device.ip":@"Test string", @"ai.device.language":@"Test string", @"ai.device.locale":@"Test string", @"ai.device.model":@"Test string", @"ai.device.network":@"Test string", @"ai.device.networkName":@"Test networkName", @"ai.device.oemName":@"Test string", @"ai.device.os":@"Test string", @"ai.device.osVersion":@"Test string", @"ai.device.roleInstance":@"Test string", @"ai.device.roleName":@"Test string", @"ai.device.screenResolution":@"Test string", @"ai.device.type":@"Test string", @"ai.device.machineName":@"Test string", @"ai.device.vmName":@"Test vmName"};
-    XCTAssertTrue([actual isEqualToDictionary:expected]);
-}
-
-@end
diff --git a/submodules/HockeySDK-iOS/Support/HockeySDKTests/BITDomainTests.m b/submodules/HockeySDK-iOS/Support/HockeySDKTests/BITDomainTests.m
deleted file mode 100644
index 56959ccdf3..0000000000
--- a/submodules/HockeySDK-iOS/Support/HockeySDKTests/BITDomainTests.m
+++ /dev/null
@@ -1,17 +0,0 @@
-#import <XCTest/XCTest.h>
-#import "BITDomain.h"
-
-@interface BITDomainTests : XCTestCase
-
-@end
-
-@implementation BITDomainTests
-
-- (void)testSerialize {
-    BITDomain *item = [BITDomain new];
-    NSDictionary *actual = [item serializeToDictionary];
-    NSDictionary *expected = @{};
-    XCTAssertTrue([actual isEqualToDictionary:expected]);
-}
-
-@end
diff --git a/submodules/HockeySDK-iOS/Support/HockeySDKTests/BITFeedbackManagerTests.m b/submodules/HockeySDK-iOS/Support/HockeySDKTests/BITFeedbackManagerTests.m
deleted file mode 100644
index 18cfc54576..0000000000
--- a/submodules/HockeySDK-iOS/Support/HockeySDKTests/BITFeedbackManagerTests.m
+++ /dev/null
@@ -1,360 +0,0 @@
-//
-//  BITFeedbackManagerTests.m
-//  HockeySDK
-//
-//  Created by Andreas Linde on 24.03.14.
-//
-//
-
-#import <XCTest/XCTest.h>
-
-#import <OCHamcrestIOS/OCHamcrestIOS.h>
-#import <OCMockitoIOS/OCMockitoIOS.h>
-
-#import "HockeySDK.h"
-
-#if HOCKEYSDK_FEATURE_FEEDBACK
-
-#import "HockeySDKPrivate.h"
-#import "BITFeedbackManager.h"
-#import "BITFeedbackManagerPrivate.h"
-#import "BITHockeyBaseManager.h"
-#import "BITHockeyBaseManagerPrivate.h"
-
-#import "BITTestHelper.h"
-
-@interface BITFeedbackManagerTests : XCTestCase
-
-@property BITFeedbackManager *sut;
-
-@end
-
-@implementation BITFeedbackManagerTests
-
-- (void)setUp {
-  [super setUp];
-
-  BITHockeyManager *hm = [BITHockeyManager sharedHockeyManager];
-  hm.delegate = nil;
-  self.sut = [[BITFeedbackManager alloc] initWithAppIdentifier:nil appEnvironment:BITEnvironmentOther];
-  self.sut.delegate = nil;
-}
-
-- (void)tearDown {
-  [self.sut removeKeyFromKeychain:kBITHockeyMetaUserID];
-  [self.sut removeKeyFromKeychain:kBITHockeyMetaUserName];
-  [self.sut removeKeyFromKeychain:kBITHockeyMetaUserEmail];
-
-  self.sut = nil;
-  
-  [super tearDown];
-}
-
-#pragma mark - Private
-
-- (void)startManager {
-  [self.sut startManager];
-}
-
-#pragma mark - Setup Tests
-
-- (void)testSetup {
-  XCTAssertNotNil(self.sut);
-  XCTAssertTrue([self.sut feedbackObservationMode] == BITFeedbackObservationNone);
-  XCTAssertNil(self.sut.tapRecognizer);
-  XCTAssertFalse([self.sut isFeedbackManagerDisabled]);
-  XCTAssertFalse([self.sut observationModeOnScreenshotEnabled]);
-  XCTAssertFalse([self.sut observationModeThreeFingerTapEnabled]);
-  XCTAssertNil([self.sut userEmail]);
-  XCTAssertNil([self.sut userID]);
-  XCTAssertNil([self.sut userName]);
-  XCTAssertNil([self.sut lastMessageID]);
-  XCTAssertNil([self.sut lastCheck]);
-  XCTAssertFalse([self.sut didAskUserData]);
-}
-
-#pragma mark - User Metadata
-
-- (void)testUpdateUserIDWithNoDataPresent {
-  BITHockeyManager *hm = [BITHockeyManager sharedHockeyManager];
-  id delegateMock = mockProtocol(@protocol(BITHockeyManagerDelegate));
-  hm.delegate = delegateMock;
-  self.sut.delegate = delegateMock;
-  
-  BOOL dataAvailable = [self.sut updateUserIDUsingKeychainAndDelegate];
-  
-  assertThatBool(dataAvailable, isFalse());
-  assertThat(self.sut.userID, nilValue());
-  
-  [verifyCount(delegateMock, times(1)) userIDForHockeyManager:hm componentManager:self.sut];
-}
-
-- (void)testUpdateUserIDWithDelegateReturningData {
-  BITHockeyManager *hm = [BITHockeyManager sharedHockeyManager];
-  NSObject <BITHockeyManagerDelegate> *classMock = mockObjectAndProtocol([NSObject class], @protocol(BITHockeyManagerDelegate));
-  [given([classMock userIDForHockeyManager:hm componentManager:self.sut]) willReturn:@"test"];
-  hm.delegate = classMock;
-  self.sut.delegate = classMock;
-  
-  BOOL dataAvailable = [self.sut updateUserIDUsingKeychainAndDelegate];
-  
-  assertThatBool(dataAvailable, isTrue());
-  assertThat(self.sut.userID, equalTo(@"test"));
-  
-  [verifyCount(classMock, times(1)) userIDForHockeyManager:hm componentManager:self.sut];
-}
-
-- (void)testUpdateUserIDWithValueInKeychain {
-  [self.sut addStringValueToKeychain:@"test" forKey:kBITHockeyMetaUserID];
-  
-  BOOL dataAvailable = [self.sut updateUserIDUsingKeychainAndDelegate];
-  
-  assertThatBool(dataAvailable, isTrue());
-  assertThat(self.sut.userID, equalTo(@"test"));
-}
-
-- (void)testUpdateUserIDWithGlobalSetter {
-  BITHockeyManager *hm = [BITHockeyManager sharedHockeyManager];
-  [hm setUserID:@"test"];
-  
-  BOOL dataAvailable = [self.sut updateUserIDUsingKeychainAndDelegate];
-  
-  assertThatBool(dataAvailable, isTrue());
-  assertThat(self.sut.userID, equalTo(@"test"));
-}
-
-
-- (void)testUpdateUserNameWithNoDataPresent {
-  BITHockeyManager *hm = [BITHockeyManager sharedHockeyManager];
-  id delegateMock = mockProtocol(@protocol(BITHockeyManagerDelegate));
-  hm.delegate = delegateMock;
-  self.sut.delegate = delegateMock;
-  
-  BOOL dataAvailable = [self.sut updateUserNameUsingKeychainAndDelegate];
-  
-  assertThatBool(dataAvailable, isFalse());
-  assertThat(self.sut.userName, nilValue());
-  
-  [verifyCount(delegateMock, times(1)) userNameForHockeyManager:hm componentManager:self.sut];
-}
-
-- (void)testUpdateUserNameWithDelegateReturningData {
-  BITHockeyManager *hm = [BITHockeyManager sharedHockeyManager];
-  NSObject <BITHockeyManagerDelegate> *classMock = mockObjectAndProtocol([NSObject class], @protocol(BITHockeyManagerDelegate));
-  [given([classMock userNameForHockeyManager:hm componentManager:self.sut]) willReturn:@"test"];
-  hm.delegate = classMock;
-  self.sut.delegate = classMock;
-  
-  BOOL dataAvailable = [self.sut updateUserNameUsingKeychainAndDelegate];
-  
-  assertThatBool(dataAvailable, isTrue());
-  assertThat(self.sut.userName, equalTo(@"test"));
-  
-  [verifyCount(classMock, times(1)) userNameForHockeyManager:hm componentManager:self.sut];
-}
-
-- (void)testUpdateUserNameWithValueInKeychain {
-  [self.sut addStringValueToKeychain:@"test" forKey:kBITHockeyMetaUserName];
-  
-  BOOL dataAvailable = [self.sut updateUserNameUsingKeychainAndDelegate];
-  
-  assertThatBool(dataAvailable, isTrue());
-  assertThat(self.sut.userName, equalTo(@"test"));
-}
-
-- (void)testUpdateUserNameWithGlobalSetter {
-  BITHockeyManager *hm = [BITHockeyManager sharedHockeyManager];
-  [hm setUserName:@"test"];
-  
-  BOOL dataAvailable = [self.sut updateUserNameUsingKeychainAndDelegate];
-  
-  assertThatBool(dataAvailable, isTrue());
-  assertThat(self.sut.userName, equalTo(@"test"));
-}
-
-
-- (void)testUpdateUserEmailWithNoDataPresent {
-  BITHockeyManager *hm = [BITHockeyManager sharedHockeyManager];
-  id delegateMock = mockProtocol(@protocol(BITHockeyManagerDelegate));
-  hm.delegate = delegateMock;
-  self.sut.delegate = delegateMock;
-  
-  BOOL dataAvailable = [self.sut updateUserEmailUsingKeychainAndDelegate];
-  
-  assertThatBool(dataAvailable, isFalse());
-  assertThat(self.sut.userEmail, nilValue());
-  
-  [verifyCount(delegateMock, times(1)) userEmailForHockeyManager:hm componentManager:self.sut];
-}
-
-- (void)testUpdateUserEmailWithDelegateReturningData {
-  BITHockeyManager *hm = [BITHockeyManager sharedHockeyManager];
-  NSObject <BITHockeyManagerDelegate> *classMock = mockObjectAndProtocol([NSObject class], @protocol(BITHockeyManagerDelegate));
-  [given([classMock userEmailForHockeyManager:hm componentManager:self.sut]) willReturn:@"test"];
-  hm.delegate = classMock;
-  self.sut.delegate = classMock;
-  
-  BOOL dataAvailable = [self.sut updateUserEmailUsingKeychainAndDelegate];
-  
-  assertThatBool(dataAvailable, isTrue());
-  assertThat(self.sut.userEmail, equalTo(@"test"));
-  
-  [verifyCount(classMock, times(1)) userEmailForHockeyManager:hm componentManager:self.sut];
-}
-
-- (void)testUpdateUserEmailWithValueInKeychain {
-  [self.sut addStringValueToKeychain:@"test" forKey:kBITHockeyMetaUserEmail];
-  
-  BOOL dataAvailable = [self.sut updateUserEmailUsingKeychainAndDelegate];
-  
-  assertThatBool(dataAvailable, isTrue());
-  assertThat(self.sut.userEmail, equalTo(@"test"));
-}
-
-- (void)testUpdateUserEmailWithGlobalSetter {
-  BITHockeyManager *hm = [BITHockeyManager sharedHockeyManager];
-  [hm setUserEmail:@"test"];
-  
-  BOOL dataAvailable = [self.sut updateUserEmailUsingKeychainAndDelegate];
-  
-  assertThatBool(dataAvailable, isTrue());
-  assertThat(self.sut.userEmail, equalTo(@"test"));
-}
-
-- (void)testAllowFetchingNewMessages {
-    BOOL fetchMessages = NO;
-
-    // check the default
-    fetchMessages = [self.sut allowFetchingNewMessages];
-    
-    assertThatBool(fetchMessages, isTrue());
-    
-    // check the delegate is implemented and returns NO
-    BITHockeyManager *hm = [BITHockeyManager sharedHockeyManager];
-    NSObject <BITHockeyManagerDelegate> *classMock = mockObjectAndProtocol([NSObject class], @protocol(BITHockeyManagerDelegate));
-    [given([classMock allowAutomaticFetchingForNewFeedbackForManager:self.sut]) willReturn:@NO];
-    hm.delegate = classMock;
-    self.sut.delegate = classMock;
-    
-    fetchMessages = [self.sut allowFetchingNewMessages];
-    
-    assertThatBool(fetchMessages, isFalse());
-    
-    [verifyCount(classMock, times(1)) allowAutomaticFetchingForNewFeedbackForManager:self.sut];
-}
-
-- (void)testFeedbackObservationModeDefault {
-  XCTAssertTrue(self.sut.feedbackObservationMode == BITFeedbackObservationNone);
-  XCTAssertFalse(self.sut.observationModeOnScreenshotEnabled);
-  XCTAssertFalse(self.sut.observationModeThreeFingerTapEnabled);
-  XCTAssertNil(self.sut.tapRecognizer);
-}
-
-- (void)testSetFeedbackObservationMode {
-  [self.sut setFeedbackObservationMode:BITFeedbackObservationModeOnScreenshot];
-  XCTAssertTrue(self.sut.observationModeOnScreenshotEnabled);
-  XCTAssertFalse(self.sut.observationModeThreeFingerTapEnabled);
-  XCTAssertNil(self.sut.tapRecognizer);
-  XCTAssertTrue(self.sut.feedbackObservationMode == BITFeedbackObservationModeOnScreenshot);
-
-  [self.sut setFeedbackObservationMode:BITFeedbackObservationNone];
-  XCTAssertFalse(self.sut.observationModeOnScreenshotEnabled);
-  XCTAssertFalse(self.sut.observationModeThreeFingerTapEnabled);
-  XCTAssertNil(self.sut.tapRecognizer);
-  XCTAssertTrue(self.sut.feedbackObservationMode == BITFeedbackObservationNone);
-  
-  [self.sut setFeedbackObservationMode:BITFeedbackObservationModeThreeFingerTap];
-  XCTAssertFalse(self.sut.observationModeOnScreenshotEnabled);
-  XCTAssertTrue(self.sut.observationModeThreeFingerTapEnabled);
-  XCTAssertNotNil(self.sut.tapRecognizer);
-  XCTAssertTrue(self.sut.feedbackObservationMode == BITFeedbackObservationModeThreeFingerTap);
-  
-  [self.sut setFeedbackObservationMode:BITFeedbackObservationNone];
-  XCTAssertFalse(self.sut.observationModeOnScreenshotEnabled);
-  XCTAssertFalse(self.sut.observationModeThreeFingerTapEnabled);
-  XCTAssertNil(self.sut.tapRecognizer);
-  XCTAssertTrue(self.sut.feedbackObservationMode == BITFeedbackObservationNone);
-  
-  [self.sut setFeedbackObservationMode:BITFeedbackObservationModeThreeFingerTap];
-  XCTAssertFalse(self.sut.observationModeOnScreenshotEnabled);
-  XCTAssertTrue(self.sut.observationModeThreeFingerTapEnabled);
-  XCTAssertNotNil(self.sut.tapRecognizer);
-  XCTAssertTrue(self.sut.feedbackObservationMode == BITFeedbackObservationModeThreeFingerTap);
-
-  [self.sut setFeedbackObservationMode:BITFeedbackObservationModeOnScreenshot];
-  XCTAssertTrue(self.sut.observationModeOnScreenshotEnabled);
-  XCTAssertFalse(self.sut.observationModeThreeFingerTapEnabled);
-  XCTAssertNil(self.sut.tapRecognizer);
-  XCTAssertTrue(self.sut.feedbackObservationMode == BITFeedbackObservationModeOnScreenshot);
-
-  [self.sut setFeedbackObservationMode:BITFeedbackObservationModeThreeFingerTap];
-  XCTAssertFalse(self.sut.observationModeOnScreenshotEnabled);
-  XCTAssertTrue(self.sut.observationModeThreeFingerTapEnabled);
-  XCTAssertNotNil(self.sut.tapRecognizer);
-  XCTAssertTrue(self.sut.feedbackObservationMode == BITFeedbackObservationModeThreeFingerTap);
-
-  [self.sut setFeedbackObservationMode:BITFeedbackObservationNone];
-  XCTAssertFalse(self.sut.observationModeOnScreenshotEnabled);
-  XCTAssertFalse(self.sut.observationModeThreeFingerTapEnabled);
-  XCTAssertNil(self.sut.tapRecognizer);
-  XCTAssertTrue(self.sut.feedbackObservationMode == BITFeedbackObservationNone);
-
-  [self.sut setFeedbackObservationMode:BITFeedbackObservationModeAll];
-  XCTAssertTrue(self.sut.observationModeOnScreenshotEnabled);
-  XCTAssertTrue(self.sut.observationModeThreeFingerTapEnabled);
-  XCTAssertNotNil(self.sut.tapRecognizer);
-  XCTAssertTrue(self.sut.feedbackObservationMode == BITFeedbackObservationModeAll);
-
-  [self.sut setFeedbackObservationMode:BITFeedbackObservationModeThreeFingerTap];
-  XCTAssertFalse(self.sut.observationModeOnScreenshotEnabled);
-  XCTAssertTrue(self.sut.observationModeThreeFingerTapEnabled);
-  XCTAssertNotNil(self.sut.tapRecognizer);
-  XCTAssertTrue(self.sut.feedbackObservationMode == BITFeedbackObservationModeThreeFingerTap);
-
-  [self.sut setFeedbackObservationMode:BITFeedbackObservationModeAll];
-  XCTAssertTrue(self.sut.observationModeOnScreenshotEnabled);
-  XCTAssertTrue(self.sut.observationModeThreeFingerTapEnabled);
-  XCTAssertNotNil(self.sut.tapRecognizer);
-  XCTAssertTrue(self.sut.feedbackObservationMode == BITFeedbackObservationModeAll);
-
-  [self.sut setFeedbackObservationMode:BITFeedbackObservationModeOnScreenshot];
-  XCTAssertTrue(self.sut.observationModeOnScreenshotEnabled);
-  XCTAssertFalse(self.sut.observationModeThreeFingerTapEnabled);
-  XCTAssertNil(self.sut.tapRecognizer);
-  XCTAssertTrue(self.sut.feedbackObservationMode == BITFeedbackObservationModeOnScreenshot);
-
-  [self.sut setFeedbackObservationMode:BITFeedbackObservationModeThreeFingerTap];
-  XCTAssertFalse(self.sut.observationModeOnScreenshotEnabled);
-  XCTAssertTrue(self.sut.observationModeThreeFingerTapEnabled);
-  XCTAssertNotNil(self.sut.tapRecognizer);
-  XCTAssertTrue(self.sut.feedbackObservationMode == BITFeedbackObservationModeThreeFingerTap);
-
-
-}
-
-#pragma mark - FeedbackManagerDelegate Tests
-
-- (void)testFeedbackComposeViewController {
-  UIImage *sampleImage1 = [UIImage new];
-  NSData *sampleData1 = [NSData data];
-  
-  self.sut.feedbackComposeHideImageAttachmentButton = YES;
-  XCTAssertTrue(self.sut.feedbackComposeHideImageAttachmentButton);
-
-  id<BITFeedbackManagerDelegate> mockDelegate = mockProtocol(@protocol(BITFeedbackManagerDelegate));
-  [given([mockDelegate preparedItemsForFeedbackManager:self.sut]) willReturn:@[sampleImage1, sampleData1]];
-  self.sut.delegate = mockDelegate;
-  
-  BITFeedbackComposeViewController *composeViewController = [self.sut feedbackComposeViewController];
-  NSArray *attachments = [composeViewController performSelector:@selector(attachments)];
-  XCTAssertEqual(attachments.count, (NSUInteger)2);
-  
-  XCTAssertTrue(composeViewController.hideImageAttachmentButton);
-  id stronDelegate = composeViewController.delegate;
-  XCTAssertEqual(stronDelegate, mockDelegate);
-}
-
-@end
-
-#endif /* HOCKEYSDK_FEATURE_FEEDBACK */
-
diff --git a/submodules/HockeySDK-iOS/Support/HockeySDKTests/BITHockeyAppClientTests.m b/submodules/HockeySDK-iOS/Support/HockeySDKTests/BITHockeyAppClientTests.m
deleted file mode 100644
index 5e0dbd5368..0000000000
--- a/submodules/HockeySDK-iOS/Support/HockeySDKTests/BITHockeyAppClientTests.m
+++ /dev/null
@@ -1,103 +0,0 @@
-//
-//  BITHockeyAppClientTests.m
-//  HockeySDK
-//
-//  Created by Stephan Diederich on 06.09.13.
-//
-//
-
-#import <XCTest/XCTest.h>
-
-#import <OCHamcrestIOS/OCHamcrestIOS.h>
-#import <OCMockitoIOS/OCMockitoIOS.h>
-
-#import "HockeySDK.h"
-#import "BITHockeyAppClient.h"
-#import "BITTestHelper.h"
-
-@interface BITHockeyAppClientTests : XCTestCase
-
-@property(nonatomic, strong) BITHockeyAppClient *sut;
-
-@end
-
-@implementation BITHockeyAppClientTests
-
-- (void)setUp {
-  [super setUp];
-  
-  self.sut = [[BITHockeyAppClient alloc] initWithBaseURL:[NSURL URLWithString:@"http://bitbaseurl.com"]];
-}
-
-- (void)tearDown {
-  self.sut = nil;
-  [super tearDown];
-}
-
-#pragma mark - Setup helpers
-- (NSDictionary *)jsonFromFixture:(NSString *)fixture {
-  NSString *dataString = [BITTestHelper jsonFixture:fixture];
-  
-  NSData *data = [dataString dataUsingEncoding:NSUTF8StringEncoding];
-  NSError *error = nil;
-  NSDictionary *json = (NSDictionary *)[NSJSONSerialization JSONObjectWithData:data options:0 error:&error];
-  
-  return json;
-}
-
-#pragma mark - Setup Tests
-- (void) testThatItInstantiates {
-  XCTAssertNotNil(self.sut, @"Should be there");
-}
-
-#pragma mark - Networking base tests
-- (void) testThatURLRequestHasBaseURLSet {
-  self.sut.baseURL = [NSURL URLWithString:@"http://myserver.com"];
-  NSMutableURLRequest *request = [self.sut requestWithMethod:@"GET" path:nil parameters:nil];
-  assertThat(request.URL, equalTo([NSURL URLWithString:@"http://myserver.com/"]));
-}
-
-- (void) testThatURLRequestHasPathAppended {
-  self.sut.baseURL = [NSURL URLWithString:@"http://myserver.com"];
-  NSMutableURLRequest *request = [self.sut requestWithMethod:@"GET" path:@"projects" parameters:nil];
-  assertThat(request.URL, equalTo([NSURL URLWithString:@"http://myserver.com/projects"]));
-}
-
-- (void) testThatURLRequestHasMethodSet {
-  NSMutableURLRequest *request = [self.sut requestWithMethod:@"POST" path:nil parameters:nil];
-  
-  assertThat(request.HTTPMethod, equalTo(@"POST"));
-}
-
-- (void) testThatURLRequestHasParametersInGetAppended {
-  NSDictionary *parameters = @{
-                               @"email" : @"peter@pan.de",
-                               @"push" : @"pop",
-                               };
-  NSMutableURLRequest *request = [self.sut requestWithMethod:@"GET"
-                                                    path:@"something"
-                                              parameters:parameters];
-  NSURL *url = request.URL;
-  NSString *params = [url query];
-  NSArray *paramPairs = [params componentsSeparatedByString:@"&"];
-  assertThat(paramPairs, hasCountOf(2));
-  
-  NSMutableDictionary *dict = [NSMutableDictionary new];
-  for(NSString *paramPair in paramPairs) {
-    NSArray *a = [paramPair componentsSeparatedByString:@"="];
-    assertThat(a, hasCountOf(2));
-    dict[a[0]] = a[1];
-  }
-  assertThat(dict, equalTo(parameters));
-}
-
-- (void) testThatURLRequestHasParametersInPostInTheBody {
-  //pending
-}
-
-#pragma mark - Completion Tests
-- (void) testThatCompletionIsCalled {
-  //TODO
-}
-
-@end
diff --git a/submodules/HockeySDK-iOS/Support/HockeySDKTests/BITHockeyHelperTests.m b/submodules/HockeySDK-iOS/Support/HockeySDKTests/BITHockeyHelperTests.m
deleted file mode 100644
index 9b05407494..0000000000
--- a/submodules/HockeySDK-iOS/Support/HockeySDKTests/BITHockeyHelperTests.m
+++ /dev/null
@@ -1,326 +0,0 @@
-//
-//  BITHockeyHelperTests.m
-//  HockeySDK
-//
-//  Created by Andreas Linde on 25.09.13.
-//
-//
-
-#import <XCTest/XCTest.h>
-
-#import <OCHamcrestIOS/OCHamcrestIOS.h>
-#import <OCMockitoIOS/OCMockitoIOS.h>
-
-#import "HockeySDK.h"
-#import "BITHockeyHelper.h"
-#import "BITKeychainUtils.h"
-
-
-@interface BITHockeyHelperTests : XCTestCase
-
-@end
-
-@implementation BITHockeyHelperTests
-
-
-- (void)setUp {
-  [super setUp];
-  // Put setup code here; it will be run once, before the first test case.
-}
-
-- (void)tearDown {
-  // Tear-down code here.
-  [super tearDown];
-   [[NSUserDefaults standardUserDefaults] removeObjectForKey:kBITExcludeApplicationSupportFromBackup];
-}
-
-- (void)testURLEncodedString {
-  assertThat(bit_URLEncodedString(@"123 {Test, b0c10b1}"), equalTo(@"123%20%7BTest%2C%20b0c10b1%7D"));
-  assertThat(bit_URLEncodedString(@"7902c5a8ecee4b17a758880253090569"), equalTo(@"7902c5a8ecee4b17a758880253090569"));
-  assertThat(bit_URLEncodedString(@"udid"), equalTo(@"udid"));
-  assertThat(bit_URLEncodedString(@"983024C8-A861-4649-89BC-4D92896269A4"), equalTo(@"983024C8-A861-4649-89BC-4D92896269A4"));
-  assertThat(bit_URLEncodedString(@"16"), equalTo(@"16"));
-  assertThat(bit_URLEncodedString(@"9.0"), equalTo(@"9.0"));
-  assertThat(bit_URLEncodedString(@"x86_64"), equalTo(@"x86_64"));
-  assertThat(bit_URLEncodedString(@"en"), equalTo(@"en"));
-  assertThat(bit_URLEncodedString(@"09/10/2015"), equalTo(@"09%2F10%2F2015"));
-  assertThat(bit_URLEncodedString(@"https://sdk.hockeyapp.net/api/2/apps/fd51a3647d651add2171dd59d3b6e5ec/app_versions/21?format=plist&udid=82610469-C064-412D-AEAC-F453EB506726"), equalTo(@"https%3A%2F%2Fsdk.hockeyapp.net%2Fapi%2F2%2Fapps%2Ffd51a3647d651add2171dd59d3b6e5ec%2Fapp_versions%2F21%3Fformat%3Dplist%26udid%3D82610469-C064-412D-AEAC-F453EB506726"));
-  assertThat(bit_URLEncodedString(@"net.hockeyapp.sdk"), equalTo(@"net.hockeyapp.sdk"));
-}
-
-- (void)testValidateEmail {
-  BOOL result = NO;
-  
-  // valid email
-  result = bit_validateEmail(@"mail@test.com");
-  assertThatBool(result, isTrue());
-  
-  // invalid emails
-  
-  result = bit_validateEmail(@"mail@test");
-  assertThatBool(result, isFalse());
-
-  result = bit_validateEmail(@"mail@.com");
-  assertThatBool(result, isFalse());
-
-  result = bit_validateEmail(@"mail.com");
-  assertThatBool(result, isFalse());
-
-}
-
-- (void)testAppName {
-  NSString *resultString = bit_appName(@"Placeholder");
-  assertThatBool([resultString isEqualToString:@"Placeholder"], isTrue());
-}
-
-- (void)testUUID {
-  NSString *resultString = bit_UUID();
-  assertThat(resultString, notNilValue());
-  assertThatInteger((NSInteger)[resultString length], equalToInteger(36));
-}
-
-- (void)testAppAnonID {
-  // clean keychain cache
-  NSError *error = NULL;
-  [BITKeychainUtils deleteItemForUsername:@"appAnonID"
-                           andServiceName:bit_keychainHockeySDKServiceName()
-                                    error:&error];
-  
-  NSString *resultString = bit_appAnonID(NO);
-  assertThat(resultString, notNilValue());
-  assertThatInteger((NSInteger)[resultString length], equalToInteger(36));
-}
-
-- (void)testValidAppIconFilename {
-  NSString *resultString = nil;
-  NSBundle *mockBundle = mock([NSBundle class]);
-  NSBundle *resourceBundle = [NSBundle bundleForClass:self.class];
-  
-  // CFBundleIcons contains exotic dictionary filenames
-  NSString *exoticValidIconPath = @"AppIcon.exotic";
-  NSString *exoticValidIconPath2x = @"AppIcon.exotic@2x";
-  [given([mockBundle objectForInfoDictionaryKey:@"CFBundleIconFiles"]) willReturn:@[@"invalidFilename.png"]];
-  [given([mockBundle objectForInfoDictionaryKey:@"CFBundleIcons"]) willReturn:@{@"CFBundlePrimaryIcon":@{@"CFBundleIconFiles":@[exoticValidIconPath, exoticValidIconPath2x]}}];
-  [given([mockBundle objectForInfoDictionaryKey:@"CFBundleIcons~ipad"]) willReturn:nil];
-  [given([mockBundle objectForInfoDictionaryKey:@"CFBundleIconFile"]) willReturn:nil];
-  
-  //resultString = bit_validAppIconFilename(mockBundle, resourceBundle);
-  //assertThat(resultString, equalTo(exoticValidIconPath2x));
-  
-  // Regular icon names
-  NSString *validIconPath = @"AppIcon";
-  NSString *validIconPath2x = @"AppIcon@2x";
-  NSString *expected = ([UIScreen mainScreen].scale >= 2.0) ? validIconPath2x : validIconPath;
-
-  
-  // No valid icons defined at all
-  [given([mockBundle objectForInfoDictionaryKey:@"CFBundleIconFiles"]) willReturn:nil];
-  [given([mockBundle objectForInfoDictionaryKey:@"CFBundleIcons"]) willReturn:nil];
-  [given([mockBundle objectForInfoDictionaryKey:@"CFBundleIcons~ipad"]) willReturn:nil];
-  [given([mockBundle objectForInfoDictionaryKey:@"CFBundleIconFile"]) willReturn:@"invalidFilename.png"];
-  
-  resultString = bit_validAppIconFilename(mockBundle, resourceBundle);
-  assertThat(resultString, equalTo(@"Icon"));
-  
-  // CFBundleIconFiles contains valid filenames
-  [given([mockBundle objectForInfoDictionaryKey:@"CFBundleIconFiles"]) willReturn:@[validIconPath, validIconPath2x]];
-  [given([mockBundle objectForInfoDictionaryKey:@"CFBundleIcons"]) willReturn:nil];
-  [given([mockBundle objectForInfoDictionaryKey:@"CFBundleIcons~ipad"]) willReturn:nil];
-  [given([mockBundle objectForInfoDictionaryKey:@"CFBundleIconFile"]) willReturn:nil];
-
-  resultString = bit_validAppIconFilename(mockBundle, resourceBundle);
-  
-  assertThat(resultString, equalTo(expected));
-  
-  // CFBundleIcons contains valid dictionary filenames
-  [given([mockBundle objectForInfoDictionaryKey:@"CFBundleIconFiles"]) willReturn:@[@"invalidFilename.png"]];
-  [given([mockBundle objectForInfoDictionaryKey:@"CFBundleIcons"]) willReturn:@{@"CFBundlePrimaryIcon":@{@"CFBundleIconFiles":@[validIconPath, validIconPath2x]}}];
-  [given([mockBundle objectForInfoDictionaryKey:@"CFBundleIcons~ipad"]) willReturn:nil];
-  [given([mockBundle objectForInfoDictionaryKey:@"CFBundleIconFile"]) willReturn:nil];
-  
-  // CFBundleIcons contains valid ipad dictionary and valid default dictionary filenames
-  [given([mockBundle objectForInfoDictionaryKey:@"CFBundleIconFiles"]) willReturn:@[@"invalidFilename.png"]];
-  [given([mockBundle objectForInfoDictionaryKey:@"CFBundleIcons"]) willReturn:@{@"CFBundlePrimaryIcon":@{@"CFBundleIconFiles":@[validIconPath, validIconPath2x]}}];
-  [given([mockBundle objectForInfoDictionaryKey:@"CFBundleIcons~ipad"]) willReturn:@{@"CFBundlePrimaryIcon":@{@"CFBundleIconFiles":@[validIconPath, validIconPath2x]}}];
-  [given([mockBundle objectForInfoDictionaryKey:@"CFBundleIconFile"]) willReturn:nil];
-
-  resultString = bit_validAppIconFilename(mockBundle, resourceBundle);
-  assertThat(resultString, equalTo(expected));
-
-  // CFBundleIcons contains valid filenames
-  [given([mockBundle objectForInfoDictionaryKey:@"CFBundleIconFiles"]) willReturn:@[@"invalidFilename.png"]];
-  [given([mockBundle objectForInfoDictionaryKey:@"CFBundleIcons"]) willReturn:@[validIconPath, validIconPath2x]];
-  [given([mockBundle objectForInfoDictionaryKey:@"CFBundleIcons~ipad"]) willReturn:nil];
-  [given([mockBundle objectForInfoDictionaryKey:@"CFBundleIconFile"]) willReturn:nil];
-
-  resultString = bit_validAppIconFilename(mockBundle, resourceBundle);
-  assertThat(resultString, equalTo(expected));
-
-  // CFBundleIcon contains valid filename
-  [given([mockBundle objectForInfoDictionaryKey:@"CFBundleIconFiles"]) willReturn:@[@"invalidFilename.png"]];
-  [given([mockBundle objectForInfoDictionaryKey:@"CFBundleIcons"]) willReturn:nil];
-  [given([mockBundle objectForInfoDictionaryKey:@"CFBundleIcons~ipad"]) willReturn:nil];
-  [given([mockBundle objectForInfoDictionaryKey:@"CFBundleIconFile"]) willReturn:validIconPath];
-  
-  resultString = bit_validAppIconFilename(mockBundle, resourceBundle);
-  assertThat(resultString, equalTo(expected));
-}
-
-#ifndef CI
-- (void)testValidAppIconFilenamePerformance {
-  NSBundle *mockBundle = mock([NSBundle class]);
-  NSBundle *resourceBundle = [NSBundle bundleForClass:self.class];
-  
-  NSString *validIconPath2x = @"AppIcon@2x";
-  
-  [given([mockBundle objectForInfoDictionaryKey:@"CFBundleIconFiles"]) willReturn:nil];
-  [given([mockBundle objectForInfoDictionaryKey:@"CFBundleIcons"]) willReturn:nil];
-  [given([mockBundle objectForInfoDictionaryKey:@"CFBundleIcons~ipad"]) willReturn:nil];
-  [given([mockBundle objectForInfoDictionaryKey:@"CFBundleIconFile"]) willReturn:validIconPath2x];
-  
-  [self measureBlock:^{
-    for (int i = 0; i < 1000; i++) {
-      __unused NSString *resultString = bit_validAppIconFilename(mockBundle, resourceBundle);
-    }
-  }];
-}
-#endif
-
-- (void)testDevicePlattform {
-  NSString *resultString = bit_devicePlatform();
-  assertThat(resultString, notNilValue());
-}
-
-- (void)testDeviceModel {
-  NSString *resultString = bit_devicePlatform();
-  assertThat(resultString, notNilValue());
-}
-
-- (void)testOsVersion {
-  NSString *resultString = bit_osVersionBuild();
-  assertThat(resultString, notNilValue());
-  assertThatFloat([resultString floatValue], greaterThan(@(0.0)));
-}
-
-- (void)testOsName {
-  NSString *resultString = bit_osName();
-  assertThat(resultString, notNilValue());
-  assertThatInteger((NSInteger)[resultString length], greaterThan(@(0)));
-}
-
-- (void)testDeviceType {
-  NSString *resultString = bit_deviceType();
-  assertThat(resultString, notNilValue());
-  NSArray *typesArray = @[@"Phone", @"Tablet", @"Unknown"];
-  assertThat(typesArray, hasItem(resultString));
-}
-
-- (void)testSdkVersion {
-  NSString *resultString = bit_sdkVersion();
-  assertThat(resultString, notNilValue());
-  assertThatInteger((NSInteger)[resultString length], greaterThan(@(0)));
-}
-
-- (void)testUtcDateString{
-  NSDate *testDate = [NSDate dateWithTimeIntervalSince1970:0];
-  NSString *utcDateString = bit_utcDateString(testDate);
-  
-  assertThat(utcDateString, equalTo(@"1970-01-01T00:00:00.000Z"));
-}
-
-#ifndef CI
-- (void)testUtcDateStringPerformane {
-  [self measureBlock:^{
-    for (int i = 0; i < 100; i++) {
-      NSDate *testDate = [NSDate dateWithTimeIntervalSince1970:0];
-      bit_utcDateString(testDate);
-    }
-  }];
-}
-#endif
-
-- (void)testConvertAppIdToGuidWorks {
-	NSString *myAppID = @"    ca2aba1482cb9458a67b917930b202c8      ";
-	NSString *expected = @"ca2aba14-82cb-9458-a67b-917930b202c8";
-	
-	// Test
-	NSString *result = bit_appIdentifierToGuid(myAppID);
-	
-	// Verify
-	assertThat(result, equalTo(expected));
-}
-
-- (void)testConvertInvalidAppIdToGuidReturnsNil {
-	NSString *myAppID = @"ca2aba1482cb9458a6";
-	
-	// Test
-	NSString *result = bit_appIdentifierToGuid(myAppID);
-	
-	// Verify
-  assertThat(result, nilValue());
-}
-
-- (void)testBackupFixRemovesExcludeAttribute {
-  
-  // Setup: Attribute is set and NSUSerDefaults DON'T contain kBITExcludeApplicationSupportFromBackup == YES
-  NSURL *testAppSupportURL = [self createBackupExcludedTestDirectoryForURL];
-  XCTAssertNotNil(testAppSupportURL);
-  XCTAssertTrue([self excludeAttributeIsSetForURL:testAppSupportURL]);
-  
-  // Test
-  bit_fixBackupAttributeForURL(testAppSupportURL);
-  
-  // Verify
-  XCTAssertFalse([self excludeAttributeIsSetForURL:testAppSupportURL]);
-}
-
-- (void)testBackupFixIgnoresRemovalOfExcludeAttributeUserDefaultsContainKey {
-  
-  // Setup: Attribute is set and NSUSerDefaults DO contain kBITExcludeApplicationSupportFromBackup == YES
-  [[NSUserDefaults standardUserDefaults] setBool:YES forKey:kBITExcludeApplicationSupportFromBackup];
-  NSURL *testAppSupportURL = [self createBackupExcludedTestDirectoryForURL];
-  XCTAssertNotNil(testAppSupportURL);
-  XCTAssertTrue([self excludeAttributeIsSetForURL:testAppSupportURL]);
-  
-  // Test
-  bit_fixBackupAttributeForURL(testAppSupportURL);
-  
-  // Verify
-  XCTAssertTrue([self excludeAttributeIsSetForURL:testAppSupportURL]);
-}
-
-#pragma mark - Test Helper
-
-- (NSURL *)createBackupExcludedTestDirectoryForURL{
-  NSString *testDirectory = @"HockeyTest";
-  NSFileManager *fileManager = [NSFileManager defaultManager];
-  
-  NSURL *testAppSupportURL = [[[fileManager URLsForDirectory:NSApplicationSupportDirectory inDomains:NSUserDomainMask] lastObject] URLByAppendingPathComponent:testDirectory];
-  if ([fileManager createDirectoryAtURL:testAppSupportURL withIntermediateDirectories:YES attributes:nil error:nil]) {
-    if ([testAppSupportURL setResourceValue:@YES
-                           forKey:NSURLIsExcludedFromBackupKey
-                            error:nil]) {
-      return testAppSupportURL;
-    }
-  }
-  return nil;
-}
-
-- (BOOL)excludeAttributeIsSetForURL:(NSURL *)directoryURL {
-  __block BOOL result = NO;
-  XCTestExpectation *expectation = [self expectationWithDescription:@"wait"];
-  dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
-    NSError *getResourceError = nil;
-    NSNumber *appSupportDirExcludedValue;
-    if ([directoryURL getResourceValue:&appSupportDirExcludedValue forKey:NSURLIsExcludedFromBackupKey error:&getResourceError] && appSupportDirExcludedValue) {
-      if ([appSupportDirExcludedValue isEqualToValue:@YES]) {
-        result = YES;
-      }
-    }
-    [expectation fulfill];
-  });
-  [self waitForExpectationsWithTimeout:5 handler:nil];
-  return result;
-}
-
-@end
diff --git a/submodules/HockeySDK-iOS/Support/HockeySDKTests/BITHockeyLoggerTests.m b/submodules/HockeySDK-iOS/Support/HockeySDKTests/BITHockeyLoggerTests.m
deleted file mode 100644
index 9df13886e1..0000000000
--- a/submodules/HockeySDK-iOS/Support/HockeySDKTests/BITHockeyLoggerTests.m
+++ /dev/null
@@ -1,184 +0,0 @@
-#import <XCTest/XCTest.h>
-#import <OCMock/OCMock.h>
-#import "BITHockeyLoggerPrivate.h"
-
-static char *const testFile = "Filename";
-static char *const testFunction = "Function name";
-static uint const testLine = 42;
-
-@interface BITHockeyLoggerTests : XCTestCase
-
-@end
-
-@implementation BITHockeyLoggerTests
-
-// Set default log handler after every test to avoid interferences
-- (void)tearDown {
-  [BITHockeyLogger setLogHandler:defaultLogHandler];
-  [super tearDown];
-}
-
-- (void)testInitialLogLevel {
-  XCTAssertEqual([BITHockeyLogger currentLogLevel], BITLogLevelWarning);
-}
-
-- (void)testSetCurrentLogLevel {
-  [BITHockeyLogger setCurrentLogLevel:BITLogLevelNone];
-  XCTAssertEqual([BITHockeyLogger currentLogLevel], BITLogLevelNone);
-}
-
-- (void)testSetLogHandler {
-  XCTestExpectation *expectation = [self expectationWithDescription:@"Expected logHandler to be called"];
-  BITLogHandler testLogHandler = ^(BITLogMessageProvider __unused messageProvider, BITLogLevel __unused logLevel, const char __unused *file, const char __unused *function, uint __unused line) {
-    [expectation fulfill];
-  };
-
-  [BITHockeyLogger setLogHandler:testLogHandler];
-
-  [BITHockeyLogger logMessage:^{ return @"Test"; } level:BITLogLevelError file:testFile function:testFunction line:testLine];
-
-  [self waitForExpectationsWithTimeout:0 handler:nil];
-}
-
-#pragma mark - Test Default LogHandler
-
-- (void)testLogLevelNone {
-  [BITHockeyLogger setCurrentLogLevel:BITLogLevelNone];
-
-  [BITHockeyLogger logMessage:^NSString * {
-    XCTFail(@"This should not be called");
-    return nil;
-  } level:BITLogLevelError file:testFile function:testFunction line:testLine];
-  
-  [BITHockeyLogger logMessage:^NSString * {
-    XCTFail(@"This should not be called");
-    return nil;
-  } level:BITLogLevelWarning file:testFile function:testFunction line:testLine];
-  
-  [BITHockeyLogger logMessage:^NSString * {
-    XCTFail(@"This should not be called");
-    return nil;
-  } level:BITLogLevelDebug file:testFile function:testFunction line:testLine];
-  
-  [BITHockeyLogger logMessage:^NSString * {
-    XCTFail(@"This should not be called");
-    return nil;
-  } level:BITLogLevelVerbose file:testFile function:testFunction line:testLine];
-}
-
-- (void)testLogLevelError {
-  XCTestExpectation *expectation = [self expectationWithDescription:@"An error message should have been logged"];
-  [BITHockeyLogger setCurrentLogLevel:BITLogLevelError];
-  
-  [BITHockeyLogger logMessage:^NSString * {
-    [expectation fulfill];
-    return nil;
-  } level:BITLogLevelError file:testFile function:testFunction line:testLine];
-  [self waitForExpectationsWithTimeout:0 handler:nil];
-  
-  [BITHockeyLogger logMessage:^NSString * {
-    XCTFail(@"This should not be called");
-    return nil;
-  } level:BITLogLevelWarning file:testFile function:testFunction line:testLine];
-  
-  [BITHockeyLogger logMessage:^NSString * {
-    XCTFail(@"This should not be called");
-    return nil;
-  } level:BITLogLevelDebug file:testFile function:testFunction line:testLine];
-  
-  [BITHockeyLogger logMessage:^NSString * {
-    XCTFail(@"This should not be called");
-    return nil;
-  } level:BITLogLevelVerbose file:testFile function:testFunction line:testLine];
-}
-
-- (void)testLogLevelWarning {
-  [BITHockeyLogger setCurrentLogLevel:BITLogLevelWarning];
-
-  XCTestExpectation *expectation1 = [self expectationWithDescription:@"An error message should have been logged"];
-  [BITHockeyLogger logMessage:^NSString * {
-    [expectation1 fulfill];
-    return nil;
-  } level:BITLogLevelError file:testFile function:testFunction line:testLine];
-  [self waitForExpectationsWithTimeout:0 handler:nil];
-  
-  XCTestExpectation *expectation2 = [self expectationWithDescription:@"A warning message should have been logged"];
-  [BITHockeyLogger logMessage:^NSString * {
-    [expectation2 fulfill];
-    return nil;
-  } level:BITLogLevelWarning file:testFile function:testFunction line:testLine];
-  [self waitForExpectationsWithTimeout:0 handler:nil];
-  
-  [BITHockeyLogger logMessage:^NSString * {
-    XCTFail(@"This should not be called");
-    return nil;
-  } level:BITLogLevelDebug file:testFile function:testFunction line:testLine];
-
-  [BITHockeyLogger logMessage:^NSString * {
-    XCTFail(@"This should not be called");
-    return nil;
-  } level:BITLogLevelVerbose file:testFile function:testFunction line:testLine];
-}
-
-- (void)testLogLevelDebug {
-  [BITHockeyLogger setCurrentLogLevel:BITLogLevelDebug];
-  
-  XCTestExpectation *expectation1 = [self expectationWithDescription:@"An error message should have been logged"];
-  [BITHockeyLogger logMessage:^NSString * {
-    [expectation1 fulfill];
-    return nil;
-  } level:BITLogLevelError file:testFile function:testFunction line:testLine];
-  [self waitForExpectationsWithTimeout:0 handler:nil];
-  
-  XCTestExpectation *expectation2 = [self expectationWithDescription:@"A warning message should have been logged"];
-  [BITHockeyLogger logMessage:^NSString * {
-    [expectation2 fulfill];
-    return nil;
-  } level:BITLogLevelWarning file:testFile function:testFunction line:testLine];
-  [self waitForExpectationsWithTimeout:0 handler:nil];
-
-  XCTestExpectation *expectation3 = [self expectationWithDescription:@"A debug message should have been logged"];
-  [BITHockeyLogger logMessage:^NSString * {
-    [expectation3 fulfill];
-    return nil;
-  } level:BITLogLevelDebug file:testFile function:testFunction line:testLine];
-  [self waitForExpectationsWithTimeout:0 handler:nil];
-
-  [BITHockeyLogger logMessage:^NSString * {
-    XCTFail(@"This should not be called");
-    return nil;
-  } level:BITLogLevelVerbose file:testFile function:testFunction line:testLine];
-}
-
-- (void)testLogLevelVerbose {
-  [BITHockeyLogger setCurrentLogLevel:BITLogLevelVerbose];
-  
-  XCTestExpectation *expectation1 = [self expectationWithDescription:@"An error message should have been logged"];
-  [BITHockeyLogger logMessage:^NSString * {
-    [expectation1 fulfill];
-    return nil;
-  } level:BITLogLevelError file:testFile function:testFunction line:testLine];
-  [self waitForExpectationsWithTimeout:0 handler:nil];
-  
-  XCTestExpectation *expectation2 = [self expectationWithDescription:@"A warning message should have been logged"];
-  [BITHockeyLogger logMessage:^NSString * {
-    [expectation2 fulfill];
-    return nil;
-  } level:BITLogLevelWarning file:testFile function:testFunction line:testLine];
-  [self waitForExpectationsWithTimeout:0 handler:nil];
-
-  XCTestExpectation *expectation3 = [self expectationWithDescription:@"A debug message should have been logged"];
-  [BITHockeyLogger logMessage:^NSString * {
-    [expectation3 fulfill];
-    return nil;
-  } level:BITLogLevelDebug file:testFile function:testFunction line:testLine];
-  [self waitForExpectationsWithTimeout:0 handler:nil];
-
-  XCTestExpectation *expectation4 = [self expectationWithDescription:@"A verbose message should have been logged"];
-  [BITHockeyLogger logMessage:^NSString * {
-    [expectation4 fulfill];
-    return nil;
-  } level:BITLogLevelVerbose file:testFile function:testFunction line:testLine];
-  [self waitForExpectationsWithTimeout:0 handler:nil];
-}
-@end
diff --git a/submodules/HockeySDK-iOS/Support/HockeySDKTests/BITInternalTests.m b/submodules/HockeySDK-iOS/Support/HockeySDKTests/BITInternalTests.m
deleted file mode 100644
index 0faf952ff5..0000000000
--- a/submodules/HockeySDK-iOS/Support/HockeySDKTests/BITInternalTests.m
+++ /dev/null
@@ -1,45 +0,0 @@
-#import <XCTest/XCTest.h>
-#import "BITInternal.h"
-
-@interface BITInternalTests : XCTestCase
-
-@end
-
-@implementation BITInternalTests
-
-- (void)testsdk_versionPropertyWorksAsExpected {
-    NSString *expected = @"Test string";
-    BITInternal *item = [BITInternal new];
-    item.sdkVersion = expected;
-    NSString *actual = item.sdkVersion;
-    XCTAssertTrue([actual isEqualToString:expected]);
-    
-    expected = @"Other string";
-    item.sdkVersion = expected;
-    actual = item.sdkVersion;
-    XCTAssertTrue([actual isEqualToString:expected]);
-}
-
-- (void)testagent_versionPropertyWorksAsExpected {
-    NSString *expected = @"Test string";
-    BITInternal *item = [BITInternal new];
-    item.agentVersion = expected;
-    NSString *actual = item.agentVersion;
-    XCTAssertTrue([actual isEqualToString:expected]);
-    
-    expected = @"Other string";
-    item.agentVersion = expected;
-    actual = item.agentVersion;
-    XCTAssertTrue([actual isEqualToString:expected]);
-}
-
-- (void)testSerialize {
-    BITInternal *item = [BITInternal new];
-    item.sdkVersion = @"Test string";
-    item.agentVersion = @"Test string";
-    NSDictionary *actual = [item serializeToDictionary];
-    NSDictionary *expected = @{@"ai.internal.sdkVersion":@"Test string", @"ai.internal.agentVersion":@"Test string"};
-    XCTAssertTrue([actual isEqualToDictionary:expected]);
-}
-
-@end
diff --git a/submodules/HockeySDK-iOS/Support/HockeySDKTests/BITKeychainUtilsTests.m b/submodules/HockeySDK-iOS/Support/HockeySDKTests/BITKeychainUtilsTests.m
deleted file mode 100644
index 6ab74f0bdb..0000000000
--- a/submodules/HockeySDK-iOS/Support/HockeySDKTests/BITKeychainUtilsTests.m
+++ /dev/null
@@ -1,80 +0,0 @@
-//
-//  BITKeychainUtilsTests.m
-//  HockeySDK
-//
-//  Created by Stephan Diederich on 23.09.13.
-//
-//
-
-#import <XCTest/XCTest.h>
-
-#import <OCHamcrestIOS/OCHamcrestIOS.h>
-#import <OCMockitoIOS/OCMockitoIOS.h>
-
-#import "HockeySDK.h"
-#import "BITKeychainUtils.h"
-
-@interface BITKeychainUtilsTests : XCTestCase {
-
-}
-@end
-
-
-@implementation BITKeychainUtilsTests
-- (void)setUp {
-  [super setUp];
-  
-  // Set-up code here.
-}
-
-- (void)tearDown {
-  // Tear-down code here.
-  [super tearDown];
-}
-
-- (void)testThatBITKeychainHelperStoresAndRetrievesPassword {
-  [BITKeychainUtils deleteItemForUsername:@"Peter" andServiceName:@"Test" error:nil];
-  BOOL success =   [BITKeychainUtils storeUsername:@"Peter"
-                                       andPassword:@"Pan"
-                                    forServiceName:@"Test"
-                                    updateExisting:YES
-                                             error:nil];
-  assertThatBool(success, isTrue());
-  NSString *pass = [BITKeychainUtils getPasswordForUsername:@"Peter"
-                                             andServiceName:@"Test"
-                                                      error:NULL];
-  assertThat(pass, equalTo(@"Pan"));
-}
-
-- (void)testThatBITKeychainHelperStoresAndRetrievesPasswordThisDeviceOnly {
-  [BITKeychainUtils deleteItemForUsername:@"Peter" andServiceName:@"Test" error:nil];
-  BOOL success =   [BITKeychainUtils storeUsername:@"Peter"
-                                       andPassword:@"PanThisDeviceOnly"
-                                    forServiceName:@"Test"
-                                    updateExisting:YES
-                                     accessibility:kSecAttrAccessibleAlwaysThisDeviceOnly
-                                             error:nil];
-  assertThatBool(success, isTrue());
-  NSString *pass = [BITKeychainUtils getPasswordForUsername:@"Peter"
-                                             andServiceName:@"Test"
-                                                      error:NULL];
-  assertThat(pass, equalTo(@"PanThisDeviceOnly"));
-}
-
-- (void)testThatBITKeychainHelperRemovesAStoredPassword {
-  [BITKeychainUtils deleteItemForUsername:@"Peter" andServiceName:@"Test" error:nil];
-  [BITKeychainUtils storeUsername:@"Peter"
-                      andPassword:@"Pan"
-                   forServiceName:@"Test"
-                   updateExisting:YES
-                            error:nil];
-  BOOL success = [BITKeychainUtils deleteItemForUsername:@"Peter" andServiceName:@"Test" error:nil];
-  assertThatBool(success, isTrue());
-  
-  NSString *pass = [BITKeychainUtils getPasswordForUsername:@"Peter"
-                                             andServiceName:@"Test"
-                                                      error:NULL];
-  assertThat(pass, equalTo(nil));
-}
-
-@end
diff --git a/submodules/HockeySDK-iOS/Support/HockeySDKTests/BITMetricsManagerTests.m b/submodules/HockeySDK-iOS/Support/HockeySDKTests/BITMetricsManagerTests.m
deleted file mode 100644
index 8db7dbbe59..0000000000
--- a/submodules/HockeySDK-iOS/Support/HockeySDKTests/BITMetricsManagerTests.m
+++ /dev/null
@@ -1,207 +0,0 @@
-#import <XCTest/XCTest.h>
-#import <OCMock/OCMock.h>
-#import "BITTestsDependencyInjection.h"
-#import "BITMetricsManager.h"
-#import "BITMetricsManagerPrivate.h"
-#import "BITHockeyBaseManagerPrivate.h"
-#import "BITSession.h"
-#import "BITChannelPrivate.h"
-#import "BITTelemetryContext.h"
-#import "BITSessionStateData.h"
-
-#import <OCHamcrestIOS/OCHamcrestIOS.h>
-#import <OCMockitoIOS/OCMockitoIOS.h>
-
-@interface BITMetricsManagerTests : BITTestsDependencyInjection
-
-@property (strong) BITMetricsManager *sut;
-
-@end
-
-@implementation BITMetricsManagerTests
-
-- (void)setUp {
-  [super setUp];
-  // Put setup code here. This method is called before the invocation of each test method in the class.
-}
-
-- (void)tearDown {
-  [super tearDown];
-}
-
-- (void)testMetricsManagerGetsInstantiated {
-  self.sut = [BITMetricsManager new];
-  XCTAssertNotNil(self.sut, @"Should not be nil.");
-}
-
-- (void)testDependenciesAreCreatedCorrectly {
-  self.sut = [BITMetricsManager new];
-  
-  BITPersistence *persistence = self.sut.persistence;
-  XCTAssertNotNil(persistence);
-  
-  BITTelemetryContext *context = self.sut.telemetryContext;
-  XCTAssertNotNil(persistence);
-  XCTAssertEqualObjects(persistence, context.persistence);
-  
-  BITChannel *channel = self.sut.channel;
-  XCTAssertNotNil(persistence);
-  XCTAssertEqualObjects(persistence, channel.persistence);
-  XCTAssertEqualObjects(context, channel.telemetryContext);
-}
-
-- (void)testNewSessionIsCreatedCorrectly {
-  NSUserDefaults *testUserDefaults = [NSUserDefaults new];
-  [testUserDefaults setBool:NO forKey:kBITApplicationWasLaunched];
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wnonnull"
-  self.sut = [[BITMetricsManager alloc] initWithChannel:nil telemetryContext:nil persistence:nil userDefaults:testUserDefaults];
-#pragma clang diagnostic pop
-  NSString *testSessionId1 = @"12345";
-  NSString *testSessionId2 = @"67890";
-  
-  // First session
-  BITSession *actualSession1 = [self.sut createNewSessionWithId:testSessionId1];
-  XCTAssertEqualObjects(actualSession1.sessionId, testSessionId1);
-  XCTAssertEqualObjects(actualSession1.isNew, @"true");
-  XCTAssertEqualObjects(actualSession1.isFirst, @"true");
-  
-  // Next sessions
-  BITSession *actualSession2 = [self.sut createNewSessionWithId:testSessionId2];
-  XCTAssertEqualObjects(actualSession2.sessionId, testSessionId2);
-  XCTAssertEqualObjects(actualSession2.isNew, @"true");
-  XCTAssertEqualObjects(actualSession2.isFirst, @"false");
-}
-
-- (void)testRegisterObserversOnStart {
-  self.mockNotificationCenter = mock(NSNotificationCenter.class);
-  self.sut = [BITMetricsManager new];
-  [self.sut startManager];
-  
-  // 1 for BITMetricsManager + 1 for BITChannel
-  [verifyCount((id)self.mockNotificationCenter, times(2)) addObserverForName:UIApplicationDidEnterBackgroundNotification object:nil queue:NSOperationQueue.mainQueue usingBlock:(id)anything()];
-  [verify((id)self.mockNotificationCenter) addObserverForName:UIApplicationWillEnterForegroundNotification object:nil queue:NSOperationQueue.mainQueue usingBlock:(id)anything()];
-}
-
-- (void)testTrackSessionEnqueuesObject {
-  BITChannel *channel = [BITChannel new];
-  id mockChannel = OCMPartialMock(channel);
-  
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wnonnull"
-  self.sut = [[BITMetricsManager alloc] initWithChannel:mockChannel telemetryContext:nil persistence:nil userDefaults:nil];
-#pragma clang diagnostic pop
-  
-  OCMExpect([mockChannel enqueueTelemetryItem:[OCMArg checkWithBlock:^BOOL(NSObject *value)
-                                               {
-                                                 return [value isKindOfClass:[BITSessionStateData class]];
-                                               }]]);
-  [self.sut trackSessionWithState:BITSessionState_start];
-  OCMVerifyAll(mockChannel);
-}
-
-- (void)testNewSessionUpdatesSessionContext {
-  BITTelemetryContext *context = [BITTelemetryContext new];
-  id mockContext = OCMPartialMock(context);
-  NSUserDefaults *testUserDefaults = [NSUserDefaults new];
-  [testUserDefaults setBool:NO forKey:kBITApplicationWasLaunched];
-  
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wnonnull"
-  self.sut = [[BITMetricsManager alloc] initWithChannel:nil telemetryContext:mockContext persistence:nil userDefaults:testUserDefaults];
-#pragma clang diagnostic pop
-  
-  NSString *testSessionId = @"sessionId";
-  
-  OCMExpect([mockContext setSessionId:testSessionId]);
-  OCMExpect([mockContext setIsNewSession:@"true"]);
-  OCMExpect([mockContext setIsFirstSession:@"true"]);
-  
-  [self.sut startNewSessionWithId:testSessionId];
-  OCMVerifyAll(mockContext);
-}
-
-- (void)testNewSessionCreated {
-  NSUserDefaults *testUserDefaults = [NSUserDefaults new];
-  BITTelemetryContext *context = [BITTelemetryContext new];
-  
-  BITChannel *channel = [BITChannel new];
-  id mockChannel = OCMPartialMock(channel);
-  
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wnonnull"
-  self.sut = [[BITMetricsManager alloc] initWithChannel:mockChannel telemetryContext:context persistence:nil userDefaults:testUserDefaults];
-#pragma clang diagnostic pop
-
-  int sessionStartCount = 0;
-  int sessionNotRenewedCount = 0;
-  
-  for(int i = 0; i < 100; i++) {
-    double randomOffset = (i%2 == 0) ? arc4random_uniform(1000 - 20 + 1) + 20 : arc4random_uniform(19 - 0 + 1) + 0;
-    double backgroundtime = [[NSDate date] timeIntervalSince1970] - randomOffset;
-    [testUserDefaults setDouble:backgroundtime forKey:@"BITApplicationDidEnterBackgroundTime"];
-    
-    [self.sut startNewSessionIfNeeded];
-    
-    NSLog(@"Test iteration %i", i);
-
-    
-    if(randomOffset >= 20.0) {
-      NSLog(@"Calling OCMVerify for %f", randomOffset);
-      OCMVerify([mockChannel enqueueTelemetryItem:anything()]);
-      sessionStartCount +=1;
-    }
-    else {
-      NSLog(@"Calling OCMReject for %f", randomOffset);
-      // we cant OCMReject for the mockChannel as it will fail because enqueueTelemetryItem has been invoked before for all
-      // randomOffset >= 20.
-      sessionNotRenewedCount +=1;
-    }
-  }
-  
-  // Ac we can't use OCMReject, at least verify the counts of the cases.
-  XCTAssertEqual(sessionStartCount, 50);
-  XCTAssertEqual(sessionNotRenewedCount, 50);
-}
-
-- (void)testNewSessionNeverCreated {
-  NSUserDefaults *testUserDefaults = [NSUserDefaults new];
-  BITTelemetryContext *context = [BITTelemetryContext new];
-  
-  BITChannel *channel = [BITChannel new];
-  id mockChannel = OCMPartialMock(channel);
-  
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wnonnull"
-  self.sut = [[BITMetricsManager alloc] initWithChannel:mockChannel telemetryContext:context persistence:nil userDefaults:testUserDefaults];
-#pragma clang diagnostic pop
-  
-  int sessionStartCount = 0;
-  int sessionNotRenewedCount = 0;
-  for(int i = 0; i < 100; i++) {
-    double randomOffset = (i%2 == 0) ? arc4random_uniform(19 - 0 + 1) + 0 : arc4random_uniform(19 - 0 + 1) + 0;
-    double backgroundtime = [[NSDate date] timeIntervalSince1970] - randomOffset;
-    [testUserDefaults setDouble:backgroundtime forKey:@"BITApplicationDidEnterBackgroundTime"];
-    
-    [self.sut startNewSessionIfNeeded];
-    
-    NSLog(@"Test iteration %i", i);
-    
-    if(randomOffset >= 20.0) {
-      NSLog(@"Calling OCMVerify for %f", randomOffset);
-      OCMVerify([mockChannel enqueueTelemetryItem:anything()]);
-      sessionStartCount +=1;
-    }
-    else {
-      NSLog(@"Calling OCMReject for %f", randomOffset);
-      OCMReject([mockChannel enqueueTelemetryItem:anything()]);
-      sessionNotRenewedCount +=1;
-    }
-  }
-  
-  XCTAssertEqual(sessionStartCount, 0);
-  XCTAssertEqual(sessionNotRenewedCount, 100);
-}
-
-
-@end
diff --git a/submodules/HockeySDK-iOS/Support/HockeySDKTests/BITPersistenceTests.m b/submodules/HockeySDK-iOS/Support/HockeySDKTests/BITPersistenceTests.m
deleted file mode 100644
index c06dc93a86..0000000000
--- a/submodules/HockeySDK-iOS/Support/HockeySDKTests/BITPersistenceTests.m
+++ /dev/null
@@ -1,114 +0,0 @@
-#import <XCTest/XCTest.h>
-#import <OCMock/OCMock.h>
-#import "BITTestsDependencyInjection.h"
-#import "BITPersistence.h"
-#import "BITPersistencePrivate.h"
-
-#import <OCHamcrestIOS/OCHamcrestIOS.h>
-#import <OCMockitoIOS/OCMockitoIOS.h>
-
-@interface BITPersistenceTests : BITTestsDependencyInjection
-
-@property (strong) BITPersistence *sut;
-
-@end
-
-@implementation BITPersistenceTests
-
-- (void)setUp {
-  [super setUp];
-  self.sut = [BITPersistence new];
-}
-
-- (void)tearDown {
-  [super tearDown];
-}
-
-- (void)testPersistenceSetupWorks {
-  XCTAssertNotNil(self.sut, @"Should not be nil.");
-  XCTAssertNotNil(self.sut.requestedBundlePaths, @"Should not be nil");
-  XCTAssertNotNil(self.sut.persistenceQueue, @"Should not be nil");
-  BOOL spaceAvailable = [self.sut isFreeSpaceAvailable];
-  XCTAssertTrue(spaceAvailable);
-  XCTAssertTrue(self.sut.maxFileCount == 50);
-}
-
-- (void)testSuccessNotificationIsSent {
-  id observerMock = [OCMockObject observerMock];
-  [self.mockNotificationCenter addMockObserver:observerMock name:@"BITHockeyPersistenceSuccessNotification" object:nil];
-
-  NSData *testData = [NSKeyedArchiver archivedDataWithRootObject:@{@"key1" : @"value1", @"key2" : @"value2"}];
-  [self.sut persistBundle:testData];
-
-  [observerMock verify];
-
-  [self.mockNotificationCenter removeObserver:observerMock];
-}
-
-- (void)testCreateDirectoryStructureIfNeeded {
-  // Setup
-  NSFileManager *fileManager = [NSFileManager defaultManager];
-  NSString *appSupportPath = [NSSearchPathForDirectoriesInDomains(NSApplicationSupportDirectory, NSUserDomainMask, YES) lastObject];
-  NSString *path = self.sut.appHockeySDKDirectoryPath;
-  
-  NSError *fileRemovalError = nil;
-  [fileManager removeItemAtPath:path error:&fileRemovalError];
-
-  NSError *getResourceError = nil;
-  NSNumber *resourveValue = nil;
-  XCTAssertTrue([[NSURL fileURLWithPath:appSupportPath] setResourceValue:@NO
-                                                    forKey:NSURLIsExcludedFromBackupKey
-                                                     error:&getResourceError]);
-  
-  // Assert
-  XCTAssertNil(fileRemovalError);
-  XCTAssertFalse([fileManager fileExistsAtPath:path]);
-  
-  // Act
-  [self.sut createDirectoryStructureIfNeeded];
-  
-  // Verify
-  BOOL isDirectory = NO;
-  [fileManager fileExistsAtPath:path isDirectory:&isDirectory];
-  
-  XCTAssertTrue(isDirectory);
-  
-  // Flag stays @NO on Application Support directory
-  getResourceError = nil;
-  resourveValue = nil;
-  [[NSURL fileURLWithPath:appSupportPath] getResourceValue:&resourveValue
-                                          forKey:NSURLIsExcludedFromBackupKey
-                                           error:&getResourceError];
-  XCTAssertNil(getResourceError);
-  XCTAssertEqual(resourveValue, @NO);
-  
-  // Flag is set to @YES on our custom subdirectory
-  getResourceError = nil;
-  resourveValue = nil;
-  [[NSURL fileURLWithPath:path] getResourceValue:&resourveValue
-                                          forKey:NSURLIsExcludedFromBackupKey
-                                           error:&getResourceError];
-  XCTAssertNil(getResourceError);
-  XCTAssertEqual(resourveValue, @YES);
-  
-  // TODO: Check subdirectories have been created
-}
-
-- (void)testFolderPathForType {
-  NSString *path = [self.sut folderPathForType:BITPersistenceTypeTelemetry];
-  XCTAssertFalse([path rangeOfString:@"com.microsoft.HockeyApp/Telemetry"].location == NSNotFound);
-  path = [self.sut folderPathForType:BITPersistenceTypeMetaData];
-  XCTAssertFalse([path rangeOfString:@"com.microsoft.HockeyApp/MetaData"].location == NSNotFound);
-}
-
-- (void)testFileUrlForType {
-  NSString *path = [self.sut fileURLForType:BITPersistenceTypeTelemetry];
-  XCTAssertFalse([path rangeOfString:@"com.microsoft.HockeyApp/Telemetry/hockey-app-bundle-"].location == NSNotFound);
-  path = [self.sut fileURLForType:BITPersistenceTypeMetaData];
-  XCTAssertFalse([path rangeOfString:@"com.microsoft.HockeyApp/MetaData/metadata"].location == NSNotFound);
-}
-
-
-
-
-@end
diff --git a/submodules/HockeySDK-iOS/Support/HockeySDKTests/BITSenderTests.m b/submodules/HockeySDK-iOS/Support/HockeySDKTests/BITSenderTests.m
deleted file mode 100644
index abfd186524..0000000000
--- a/submodules/HockeySDK-iOS/Support/HockeySDKTests/BITSenderTests.m
+++ /dev/null
@@ -1,166 +0,0 @@
-#import <XCTest/XCTest.h>
-
-#import <OCHamcrestIOS/OCHamcrestIOS.h>
-#import <OCMockitoIOS/OCMockitoIOS.h>
-
-#import <OCMock/OCMock.h>
-#import "BITEnvelope.h"
-#import "BITSender.h"
-#import "BITPersistencePrivate.h"
-#import "BITHockeyHelper.h"
-#import "BITTestsDependencyInjection.h"
-
-@interface BITSender ()
-
-@property (nonatomic, strong) NSURLSession *session;
-
-@end
-
-@interface BITSenderTests : BITTestsDependencyInjection
-
-@property(nonatomic, strong) BITSender *sut;
-@property(nonatomic, strong) BITPersistence *mockPersistence;
-@property(nonatomic, strong) NSURL *testServerURL;
-
-@end
-
-@implementation BITSenderTests
-
-- (void)setUp {
-  [super setUp];
-  self.testServerURL = [NSURL URLWithString:@"http://test.com"];
-  self.sut = [self newSender];
-}
-
-- (void)tearDown {
-  self.sut = nil;
-  [super tearDown];
-}
-
-- (BITSender *)newSender {
-  self.mockPersistence = mock(BITPersistence.class);
-  return [[BITSender alloc]initWithPersistence:self.mockPersistence serverURL:[self.testServerURL copy]];
-}
-
-- (void)testThatItInstantiatesCorrectly {
-  XCTAssertNotNil(self.sut);
-  XCTAssertNotNil(self.sut.senderTasksQueue);
-  XCTAssertEqualObjects(self.sut.persistence, self.mockPersistence);
-  XCTAssertEqualObjects(self.sut.serverURL, self.testServerURL);
-}
-
-- (void)testRequestContainsDataItem {
-  BITEnvelope *testItem = [BITEnvelope new];
-  NSData *expectedBodyData = [NSJSONSerialization dataWithJSONObject:[testItem serializeToDictionary]
-                                                              options:0
-                                                                error:nil];
-  NSURLRequest *testRequest = [self.sut requestForData:expectedBodyData];
-  
-  XCTAssertNotNil(testRequest);
-  XCTAssertEqualObjects(testRequest.HTTPBody, expectedBodyData);
-}
-
-- (void)testSendDataVerifyDataIsGzipped {
-  self.sut = OCMPartialMock(self.sut);
-  NSString *testFilePath = @"path/to/file";
-  NSData *testData = [@"test" dataUsingEncoding:NSUTF8StringEncoding];
-  
-  [self.sut sendData:testData withFilePath:testFilePath];
-  
-  OCMVerify([self.sut sendRequest:[OCMArg checkWithBlock:^BOOL(id obj) {
-    NSMutableURLRequest *request = (NSMutableURLRequest *)obj;
-    NSData *data = request.HTTPBody;
-    if (data) {
-      // Test if first two bytes of data are the gzip header
-      static const uint16_t GZIP_SIGNATURE = OSSwapBigToHostConstInt16(0x1f8b);
-      UInt16 firstBytes = 0;
-      [data getBytes:&firstBytes range:NSMakeRange(0, 2)];
-      if ((data.length > sizeof(uint16_t)) && (firstBytes == GZIP_SIGNATURE)) {
-        return YES;
-      }
-    }
-    return NO;
-  }] filePath:testFilePath]);
-}
-
-- (void)testSendRequest {
-  
-  // Setup
-  self.sut = OCMPartialMock(self.sut);
-  NSString *testFilePath = @"path/to/file";
-  NSURLRequest *testRequest = [NSURLRequest new];
-  id session = mock(NSURLSession.class);
-  id task = mock(NSURLSessionDataTask.class);
-  OCMStub([session dataTaskWithRequest:testRequest completionHandler:anything()]).andReturn(task);
-  OCMStub([self.sut session]).andReturn(session);
-  
-  // Test
-  [self.sut sendRequest:testRequest filePath:testFilePath];
-  
-  // Verify
-  OCMVerify([self.sut session]);
-  OCMVerify([session dataTaskWithRequest:testRequest completionHandler:anything()]);
-  OCMVerify([task resume]);
-}
-
-- (void)testDeleteDataWithStatusCodeWorks {
-  for(NSInteger statusCode = 100; statusCode <= 510; statusCode++){
-    if((statusCode == 429) || (statusCode == 408) || (statusCode == 500) || (statusCode == 503) || (statusCode == 511)) {
-      XCTAssertTrue([self.sut shouldDeleteDataWithStatusCode:statusCode] == NO);
-    }else{
-      XCTAssertTrue([self.sut shouldDeleteDataWithStatusCode:statusCode] == YES);
-    }
-  }
-}
-
-- (void)testRegisterObserversOnInit {
-  self.mockNotificationCenter = mock(NSNotificationCenter.class);
-  self.sut = [[BITSender alloc]initWithPersistence:self.mockPersistence serverURL:self.testServerURL];
-  
-  [verify((id)self.mockNotificationCenter) addObserverForName:BITPersistenceSuccessNotification object:nil queue:nil usingBlock:(id)anything()];
-}
-
-- (void)testFilesGetDeletedOnPositiveOrUnrecoverableStatusCodes {
-
-  // Setup
-  self.sut = OCMPartialMock(self.sut);
-  NSInteger testStatusCode = 999;
-  OCMStub([self.sut shouldDeleteDataWithStatusCode:testStatusCode]).andReturn(YES);
-  self.sut.runningRequestsCount = 8;
-  NSData *testData = [@"test" dataUsingEncoding:NSUTF8StringEncoding];
-  NSString *testFilePath = @"path/to/file";
-  
-  // Stub `sendSavedData` method so there won't be already a new running request when our test request finishes
-  // Otherwise `runningRequestsCount` will already have been decreased by one and been increased by one again.
-  OCMStub([self.sut sendSavedData]).andDo(nil);
-  
-  // Test
-  [self.sut handleResponseWithStatusCode:testStatusCode responseData:testData filePath:testFilePath error:[NSError errorWithDomain:@"Network error" code:503 userInfo:nil]];
-  
-  // Verify
-  [verify(self.mockPersistence) deleteFileAtPath:testFilePath];
-  XCTAssertTrue(self.sut.runningRequestsCount == 7);
-}
-
-- (void)testFilesGetUnblockedOnRecoverableErrorCodes {
-  
-  // Setup
-  self.sut = OCMPartialMock(self.sut);
-  NSInteger testStatusCode = 999;
-  OCMStub([self.sut shouldDeleteDataWithStatusCode:testStatusCode]).andReturn(NO);
-  self.sut.runningRequestsCount = 8;
-  NSData *testData = [@"test" dataUsingEncoding:NSUTF8StringEncoding];
-  NSString *testFilePath = @"path/to/file";
-  
-  // Test
-  [self.sut handleResponseWithStatusCode:testStatusCode
-                        responseData:testData
-                            filePath:testFilePath
-                               error:[NSError errorWithDomain:@"Network error" code:503 userInfo:nil]];
-  
-  // Verify
-  [verify(self.mockPersistence) giveBackRequestedFilePath:testFilePath];
-  XCTAssertTrue(self.sut.runningRequestsCount == 7);
-}
-
-@end
diff --git a/submodules/HockeySDK-iOS/Support/HockeySDKTests/BITSessionTests.m b/submodules/HockeySDK-iOS/Support/HockeySDKTests/BITSessionTests.m
deleted file mode 100644
index 7c5a102eef..0000000000
--- a/submodules/HockeySDK-iOS/Support/HockeySDKTests/BITSessionTests.m
+++ /dev/null
@@ -1,59 +0,0 @@
-#import <XCTest/XCTest.h>
-#import "BITSession.h"
-
-@interface BITSessionTests : XCTestCase
-
-@end
-
-@implementation BITSessionTests
-
-- (void)testidPropertyWorksAsExpected {
-    NSString *expected = @"Test string";
-    BITSession *item = [BITSession new];
-    item.sessionId = expected;
-    NSString *actual = item.sessionId;
-    XCTAssertTrue([actual isEqualToString:expected]);
-    
-    expected = @"Other string";
-    item.sessionId = expected;
-    actual = item.sessionId;
-    XCTAssertTrue([actual isEqualToString:expected]);
-}
-
-- (void)testis_firstPropertyWorksAsExpected {
-    NSString *expected = @"Test string";
-    BITSession *item = [BITSession new];
-    item.isFirst = expected;
-    NSString *actual = item.isFirst;
-    XCTAssertTrue([actual isEqualToString:expected]);
-    
-    expected = @"Other string";
-    item.isFirst = expected;
-    actual = item.isFirst;
-    XCTAssertTrue([actual isEqualToString:expected]);
-}
-
-- (void)testis_newPropertyWorksAsExpected {
-    NSString *expected = @"Test string";
-    BITSession *item = [BITSession new];
-    item.isNew = expected;
-    NSString *actual = item.isNew;
-    XCTAssertTrue([actual isEqualToString:expected]);
-    
-    expected = @"Other string";
-    item.isNew = expected;
-    actual = item.isNew;
-    XCTAssertTrue([actual isEqualToString:expected]);
-}
-
-- (void)testSerialize {
-    BITSession *item = [BITSession new];
-    item.sessionId = @"Test string";
-    item.isFirst = @"Test string";
-    item.isNew = @"Test string";
-    NSDictionary *actual = [item serializeToDictionary];
-    NSDictionary *expected = @{@"ai.session.id":@"Test string", @"ai.session.isFirst":@"Test string", @"ai.session.isNew":@"Test string"};
-    XCTAssertTrue([actual isEqualToDictionary:expected]);
-}
-
-@end
diff --git a/submodules/HockeySDK-iOS/Support/HockeySDKTests/BITStoreUpdateManagerTests.m b/submodules/HockeySDK-iOS/Support/HockeySDKTests/BITStoreUpdateManagerTests.m
deleted file mode 100644
index b81a762569..0000000000
--- a/submodules/HockeySDK-iOS/Support/HockeySDKTests/BITStoreUpdateManagerTests.m
+++ /dev/null
@@ -1,311 +0,0 @@
-//
-//  BITStoreUpdateManagerTests.m
-//  HockeySDK
-//
-//  Created by Andreas Linde on 13.03.13.
-//
-//
-
-#import <XCTest/XCTest.h>
-
-#import <OCHamcrestIOS/OCHamcrestIOS.h>
-#import <OCMockitoIOS/OCMockitoIOS.h>
-
-#import "HockeySDK.h"
-#import "BITStoreUpdateManager.h"
-#import "BITStoreUpdateManagerPrivate.h"
-#import "BITHockeyBaseManager.h"
-#import "BITHockeyBaseManagerPrivate.h"
-
-#import "BITTestHelper.h"
-
-
-@interface BITStoreUpdateManagerTests : XCTestCase
-
-@property(nonatomic, strong) BITStoreUpdateManager *storeUpdateManager;
-
-@end
-
-
-@implementation BITStoreUpdateManagerTests
-
-- (void)setUp {
-  [super setUp];
-  
-  // Set-up code here.
-  self.storeUpdateManager = [[BITStoreUpdateManager alloc] initWithAppIdentifier:nil appEnvironment:BITEnvironmentAppStore];
-}
-
-- (void)tearDown {
-  // Tear-down code here.
-  self.storeUpdateManager = nil;
-  
-  [super tearDown];
-}
-
-
-#pragma mark - Private
-
-- (NSDictionary *)jsonFromFixture:(NSString *)fixture {
-  NSString *dataString = [BITTestHelper jsonFixture:fixture];
-  
-  if (!dataString) return nil;
-  
-  NSData *data = [dataString dataUsingEncoding:NSUTF8StringEncoding];
-  NSError *error = nil;
-  NSDictionary *json = (NSDictionary *)[NSJSONSerialization JSONObjectWithData:data options:0 error:&error];
-  
-  return json;
-}
-
-- (void)startManager {
-  self.storeUpdateManager.enableStoreUpdateManager = YES;
-  [self.storeUpdateManager startManager];
-  [NSObject cancelPreviousPerformRequestsWithTarget:self.storeUpdateManager selector:@selector(checkForUpdateDelayed) object:nil];
-}
-
-
-#pragma mark - Time
-
-- (void)testUpdateCheckDailyFirstTimeEver {
-  NSUserDefaults *mockUserDefaults = mock([NSUserDefaults class]);
-  self.storeUpdateManager.userDefaults = mockUserDefaults;
-  
-  [self startManager];
-  
-  BOOL result = [self.storeUpdateManager shouldAutoCheckForUpdates];
-  
-  XCTAssertTrue(result, @"Checking daily first time ever");
-}
-
-- (void)testUpdateCheckDailyFirstTimeTodayLastCheckPreviousDay {
-  NSUserDefaults *mockUserDefaults = mock([NSUserDefaults class]);
-  [given([mockUserDefaults objectForKey:@"BITStoreUpdateDateOfLastCheck"]) willReturn:[NSDate dateWithTimeIntervalSinceNow:-(60*60*24)]];
-  self.storeUpdateManager.userDefaults = mockUserDefaults;
-  self.storeUpdateManager.updateSetting = BITStoreUpdateCheckDaily;
-  
-  [self startManager];
-  
-  BOOL result = [self.storeUpdateManager shouldAutoCheckForUpdates];
-  
-  XCTAssertTrue(result, @"Checking daily first time today with last check done previous day");
-}
-
-- (void)testUpdateCheckDailySecondTimeOfTheDay {
-  NSUserDefaults *mockUserDefaults = mock([NSUserDefaults class]);
-  self.storeUpdateManager.userDefaults = mockUserDefaults;
-  self.storeUpdateManager.lastCheck = [NSDate date];
-  
-  [self startManager];
-  
-  BOOL result = [self.storeUpdateManager shouldAutoCheckForUpdates];
-  
-  XCTAssertFalse(result, @"Checking daily second time of the day");
-}
-
-- (void)testUpdateCheckWeeklyFirstTimeEver {
-  NSUserDefaults *mockUserDefaults = mock([NSUserDefaults class]);
-  self.storeUpdateManager.userDefaults = mockUserDefaults;
-  self.storeUpdateManager.updateSetting = BITStoreUpdateCheckWeekly;
-  
-  [self startManager];
-  
-  BOOL result = [self.storeUpdateManager shouldAutoCheckForUpdates];
-  
-  XCTAssertTrue(result, @"Checking weekly first time ever");
-}
-
-- (void)testUpdateCheckWeeklyFirstTimeTodayLastCheckPreviousWeek {
-  NSUserDefaults *mockUserDefaults = mock([NSUserDefaults class]);
-  [given([mockUserDefaults objectForKey:@"BITStoreUpdateDateOfLastCheck"]) willReturn:[NSDate dateWithTimeIntervalSinceNow:-(60*60*24*7)]];
-  self.storeUpdateManager.userDefaults = mockUserDefaults;
-  self.storeUpdateManager.updateSetting = BITStoreUpdateCheckWeekly;
-  
-  [self startManager];
-  
-  BOOL result = [self.storeUpdateManager shouldAutoCheckForUpdates];
-  
-  XCTAssertTrue(result, @"Checking weekly first time after one week");
-}
-
-- (void)testUpdateCheckWeeklyFirstTimeFiveDaysAfterPreviousCheck {
-  NSUserDefaults *mockUserDefaults = mock([NSUserDefaults class]);
-  [given([mockUserDefaults objectForKey:@"BITStoreUpdateDateOfLastCheck"]) willReturn:[NSDate dateWithTimeIntervalSinceNow:-(60*60*24*5)]];
-  self.storeUpdateManager.userDefaults = mockUserDefaults;
-  self.storeUpdateManager.updateSetting = BITStoreUpdateCheckWeekly;
-  
-  [self startManager];
-  
-  BOOL result = [self.storeUpdateManager shouldAutoCheckForUpdates];
-  
-  XCTAssertFalse(result, @"Checking weekly first time five days after previous check");
-}
-
-- (void)testUpdateCheckManuallyFirstTimeEver {
-  NSUserDefaults *mockUserDefaults = mock([NSUserDefaults class]);
-  self.storeUpdateManager.userDefaults = mockUserDefaults;
-  self.storeUpdateManager.updateSetting = BITStoreUpdateCheckManually;
-  
-  [self startManager];
-  
-  BOOL result = [self.storeUpdateManager shouldAutoCheckForUpdates];
-  
-  XCTAssertFalse(result, @"Checking manually first time ever");
-}
-
-- (void)testUpdateCheckManuallyFirstTimeTodayLastCheckDonePreviousDay {
-  NSUserDefaults *mockUserDefaults = mock([NSUserDefaults class]);
-  [given([mockUserDefaults objectForKey:@"BITStoreUpdateDateOfLastCheck"]) willReturn:[NSDate dateWithTimeIntervalSinceNow:-(60*60*24)]];
-  self.storeUpdateManager.userDefaults = mockUserDefaults;
-  self.storeUpdateManager.updateSetting = BITStoreUpdateCheckManually;
-  
-  [self startManager];
-  
-  BOOL result = [self.storeUpdateManager shouldAutoCheckForUpdates];
-  
-  XCTAssertFalse(result, @"Checking manually first time ever");
-}
-
-
-#pragma mark - JSON Response Processing
-
-- (void)testProcessStoreResponseWithEmptyData {
-  BOOL result = [self.storeUpdateManager processStoreResponseWithString:nil];
-  
-  XCTAssertFalse(result, @"Empty data was handled correctly");
-}
-
-- (void)testProcessStoreResponseWithInvalidData {
-  NSString *invalidString = @"8a@c&)if";
-  BOOL result = [self.storeUpdateManager processStoreResponseWithString:invalidString];
-  
-  XCTAssertFalse(result, @"Invalid JSON data was handled correctly");
-}
-
-- (void)testProcessStoreResponseWithUnknownBundleIdentifier {
-  NSString *dataString = [BITTestHelper jsonFixture:@"StoreBundleIdentifierUnknown"];
-  BOOL result = [self.storeUpdateManager processStoreResponseWithString:dataString];
-  
-  XCTAssertFalse(result, @"Valid but empty json data was handled correctly");
-}
-
-- (void)testProcessStoreResponseWithKnownBundleIdentifier {
-  NSString *dataString = [BITTestHelper jsonFixture:@"StoreBundleIdentifierKnown"];
-  BOOL result = [self.storeUpdateManager processStoreResponseWithString:dataString];
-
-  XCTAssertTrue(result, @"Valid and correct JSON data was handled correctly");
-}
-
-
-#pragma mark - Last version
-
-#pragma mark - Version compare
-
-- (void)testFirstStartHasNewVersionReturnsFalseWithFirstCheck {
-  NSUserDefaults *mockUserDefaults = mock([NSUserDefaults class]);
-  self.storeUpdateManager.userDefaults = mockUserDefaults;
-  
-  [self startManager];
-
-  NSDictionary *json = [self jsonFromFixture:@"StoreBundleIdentifierKnown"];
-
-  BOOL result = [self.storeUpdateManager hasNewVersion:json];
-  
-  XCTAssertFalse(result, @"There is no udpate available");
-}
-
-- (void)testFirstStartHasNewVersionReturnsFalseWithSameVersion {
-  NSUserDefaults *mockUserDefaults = mock([NSUserDefaults class]);
-  [given([mockUserDefaults objectForKey:@"BITStoreUpdateLastStoreVersion"]) willReturn:@"4.1.2"];
-  [given([mockUserDefaults objectForKey:@"BITStoreUpdateLastUUID"]) willReturn:@""];
-  self.storeUpdateManager.userDefaults = mockUserDefaults;
-  
-  [self startManager];
-  
-  NSDictionary *json = [self jsonFromFixture:@"StoreBundleIdentifierKnown"];
-  
-  BOOL result = [self.storeUpdateManager hasNewVersion:json];
-  
-  XCTAssertFalse(result, @"There is no udpate available");
-}
-
-
-- (void)testFirstStartHasNewVersionReturnsFalseWithSameVersionButDifferentUUID {
-  NSUserDefaults *mockUserDefaults = mock([NSUserDefaults class]);
-  [given([mockUserDefaults objectForKey:@"BITStoreUpdateLastStoreVersion"]) willReturn:@"4.1.2"];
-  [given([mockUserDefaults objectForKey:@"BITStoreUpdateLastUUID"]) willReturn:@"1"];
-  self.storeUpdateManager.userDefaults = mockUserDefaults;
-  
-  [self startManager];
-  
-  NSDictionary *json = [self jsonFromFixture:@"StoreBundleIdentifierKnown"];
-  
-  BOOL result = [self.storeUpdateManager hasNewVersion:json];
-  
-  XCTAssertFalse(result, @"There is no udpate available");
-}
-
-- (void)testFirstStartHasNewVersionReturnsTrue {
-  NSUserDefaults *mockUserDefaults = mock([NSUserDefaults class]);
-  [given([mockUserDefaults objectForKey:@"BITStoreUpdateLastStoreVersion"]) willReturn:@"4.1.1"];
-  [given([mockUserDefaults objectForKey:@"BITStoreUpdateLastUUID"]) willReturn:@""];
-  self.storeUpdateManager.userDefaults = mockUserDefaults;
-  
-  [self startManager];
-  
-  NSDictionary *json = [self jsonFromFixture:@"StoreBundleIdentifierKnown"];
-  
-  BOOL result = [self.storeUpdateManager hasNewVersion:json];
-  
-  XCTAssertTrue(result, @"There is an udpate available");
-}
-
-
-- (void)testFirstStartHasNewVersionReturnsFalseBecauseWeHaveANewerVersionInstalled {
-  NSUserDefaults *mockUserDefaults = mock([NSUserDefaults class]);
-  [given([mockUserDefaults objectForKey:@"BITStoreUpdateLastStoreVersion"]) willReturn:@"4.1.3"];
-  [given([mockUserDefaults objectForKey:@"BITStoreUpdateLastUUID"]) willReturn:@""];
-  self.storeUpdateManager.userDefaults = mockUserDefaults;
-  
-  [self startManager];
-  
-  NSDictionary *json = [self jsonFromFixture:@"StoreBundleIdentifierKnown"];
-  
-  BOOL result = [self.storeUpdateManager hasNewVersion:json];
-  
-  XCTAssertFalse(result, @"There is no udpate available");
-}
-
-- (void)testReportedVersionIsBeingIgnored {
-  NSUserDefaults *mockUserDefaults = mock([NSUserDefaults class]);
-  [given([mockUserDefaults objectForKey:@"BITStoreUpdateLastStoreVersion"]) willReturn:@"4.1.1"];
-  [given([mockUserDefaults objectForKey:@"BITStoreUpdateLastUUID"]) willReturn:@""];
-  [given([mockUserDefaults objectForKey:@"BITStoreUpdateIgnoredVersion"]) willReturn:@"4.1.2"];
-  self.storeUpdateManager.userDefaults = mockUserDefaults;
-  
-  [self startManager];
-  
-  NSDictionary *json = [self jsonFromFixture:@"StoreBundleIdentifierKnown"];
-  
-  BOOL result = [self.storeUpdateManager hasNewVersion:json];
-  
-  XCTAssertFalse(result, @"The newer version is being ignored");
-}
-
-- (void)testReportedVersionIsNewerThanTheIgnoredVersion {
-  NSUserDefaults *mockUserDefaults = mock([NSUserDefaults class]);
-  [given([mockUserDefaults objectForKey:@"BITStoreUpdateLastStoreVersion"]) willReturn:@"4.1.1"];
-  [given([mockUserDefaults objectForKey:@"BITStoreUpdateLastUUID"]) willReturn:@""];
-  [given([mockUserDefaults objectForKey:@"BITStoreUpdateIgnoredVersion"]) willReturn:@"4.1.1"];
-  self.storeUpdateManager.userDefaults = mockUserDefaults;
-  
-  [self startManager];
-  
-  NSDictionary *json = [self jsonFromFixture:@"StoreBundleIdentifierKnown"];
-  
-  BOOL result = [self.storeUpdateManager hasNewVersion:json];
-  
-  XCTAssertTrue(result, @"The newer version is not ignored");
-}
-
-@end
diff --git a/submodules/HockeySDK-iOS/Support/HockeySDKTests/BITTelemetryContextTests.m b/submodules/HockeySDK-iOS/Support/HockeySDKTests/BITTelemetryContextTests.m
deleted file mode 100644
index 890c728231..0000000000
--- a/submodules/HockeySDK-iOS/Support/HockeySDKTests/BITTelemetryContextTests.m
+++ /dev/null
@@ -1,71 +0,0 @@
-#import <XCTest/XCTest.h>
-
-#import <OCHamcrestIOS/OCHamcrestIOS.h>
-#import <OCMockitoIOS/OCMockitoIOS.h>
-
-#import "BITTelemetryContext.h"
-#import "BITPersistencePrivate.h"
-#import "BITApplication.h"
-#import "BITDevice.h"
-#import "BITInternal.h"
-#import "BITUser.h"
-#import "BITSession.h"
-
-@interface BITTelemetryContextTests : XCTestCase
-
-@property(nonatomic, strong) BITTelemetryContext *sut;
-@property(nonatomic, strong) BITPersistence *mockPersistence;
-
-@end
-
-@implementation BITTelemetryContextTests
-
-- (void)setUp {
-  [super setUp];
-  
-  [self initDependencies];
-}
-
-- (void)tearDown {
-  [super tearDown];
-}
-
-- (void)testThatContextObjectsNotNil {
-  XCTAssertNotNil(self.sut.device);
-  XCTAssertNotNil(self.sut.internal);
-  XCTAssertNotNil(self.sut.application);
-  XCTAssertNotNil(self.sut.session);
-  XCTAssertNotNil(self.sut.user);
-  XCTAssertNotNil(self.sut.appIdentifier);
-}
-
-- (void)testUserMetaDataGetsLoadedOnInit {
-  [self initDependencies];
-  
-  [verify(self.mockPersistence) metaData];
-}
-
-#ifndef CI
-- (void)testContextDictionaryPerformance {
-  [self measureBlock:^{
-    for (int i = 0; i < 1000; ++i) {
-      [self.sut contextDictionary];
-    }
-  }];
-}
-#endif
-
-#pragma mark - Setup helpers
-
-- (void)initDependencies {
-  self.mockPersistence = mock(BITPersistence.class);
-  self.sut = [[BITTelemetryContext alloc] initWithAppIdentifier:@"123" persistence:self.mockPersistence];
-}
-
--(void)wait {
-  // Setters use dispatch_barrier_async so we have to wait a bit for the value change
-  [[NSRunLoop currentRunLoop] runUntilDate:[NSDate dateWithTimeIntervalSinceNow:0.001]];
-}
-
-@end
-
diff --git a/submodules/HockeySDK-iOS/Support/HockeySDKTests/BITTestHelper.h b/submodules/HockeySDK-iOS/Support/HockeySDKTests/BITTestHelper.h
deleted file mode 100644
index 5b8f4a3502..0000000000
--- a/submodules/HockeySDK-iOS/Support/HockeySDKTests/BITTestHelper.h
+++ /dev/null
@@ -1,10 +0,0 @@
-#import <Foundation/Foundation.h>
-
-@interface BITTestHelper : NSObject
-
-+ (id)jsonFixture:(NSString *)fixture;
-+ (BOOL)createTempDirectory:(NSString *)directory;
-+ (BOOL)copyFixtureCrashReportWithFileName:(NSString *)filename;
-+ (NSData *)dataOfFixtureCrashReportWithFileName:(NSString *)filename;
-
-@end
diff --git a/submodules/HockeySDK-iOS/Support/HockeySDKTests/BITTestHelper.m b/submodules/HockeySDK-iOS/Support/HockeySDKTests/BITTestHelper.m
deleted file mode 100644
index c1fe8455e2..0000000000
--- a/submodules/HockeySDK-iOS/Support/HockeySDKTests/BITTestHelper.m
+++ /dev/null
@@ -1,80 +0,0 @@
-#import "BITTestHelper.h"
-#import "HockeySDKPrivate.h"
-
-@implementation BITTestHelper
-
-// loads test fixture from json file
-// http://blog.roberthoglund.com/2010/12/ios-unit-testing-loading-bundle.html
-+ (NSString *)jsonFixture:(NSString *)fixture {
-	NSString *path = [[NSBundle bundleForClass:self.class] pathForResource:fixture ofType:@"json"];
-
-	NSError *error = nil;
-  NSString *content = [NSString stringWithContentsOfFile:path encoding:NSUTF8StringEncoding error:&error];
-
-  return content;
-}
-
-+ (BOOL)createTempDirectory:(NSString *)directory {
-  NSFileManager *fm = [[NSFileManager alloc] init];
-  
-  if (![fm fileExistsAtPath:directory]) {
-    NSDictionary *attributes = [NSDictionary dictionaryWithObject: [NSNumber numberWithUnsignedLong: 0755] forKey: NSFilePosixPermissions];
-    NSError *theError = NULL;
-    
-    [fm createDirectoryAtPath:directory withIntermediateDirectories:YES attributes:attributes error:&theError];
-    if (theError)
-      return NO;
-  }
-  
-  return YES;
-}
-
-+ (BOOL)copyFixtureCrashReportWithFileName:(NSString *)filename {
-  NSFileManager *fm = [[NSFileManager alloc] init];
-
-  // the bundle identifier when running with unit tets is "otest"
-  const char *progname = getprogname();
-  if (progname == NULL) {
-    return NO;
-  }
-  
-  NSString *bundleIdentifierPathString = [NSString stringWithUTF8String: progname];
-
-  NSArray *paths = NSSearchPathForDirectoriesInDomains(NSCachesDirectory, NSUserDomainMask, YES);
-  
-  // create the PLCR cache dir
-  NSString *plcrRootCrashesDir = [[paths objectAtIndex:0] stringByAppendingPathComponent:@"com.plausiblelabs.crashreporter.data"];
-  if (![BITTestHelper createTempDirectory:plcrRootCrashesDir])
-    return NO;
-  
-  NSString *plcrCrashesDir = [plcrRootCrashesDir stringByAppendingPathComponent:bundleIdentifierPathString];
-  if (![BITTestHelper createTempDirectory:plcrCrashesDir])
-    return NO;
-  
-	NSString *filePath = [[NSBundle bundleForClass:self.class] pathForResource:filename ofType:@"plcrash"];
-  NSError *theError = NULL;
-  
-  if (!filePath) return NO;
-  [fm copyItemAtPath:filePath toPath:[plcrCrashesDir stringByAppendingPathComponent:@"live_report.plcrash"] error:&theError];
-  
-  if (theError)
-    return NO;
-  else
-    return YES;
-}
-
-+ (NSData *)dataOfFixtureCrashReportWithFileName:(NSString *)filename {
-  // the bundle identifier when running with unit tets is "otest"
-  const char *progname = getprogname();
-  if (progname == NULL) {
-    return nil;
-  }
-
-  NSString *filePath = [[NSBundle bundleForClass:self.class] pathForResource:filename ofType:@"plcrash"];
-  
-  if (!filePath) return nil;
-  NSData *data = [NSData dataWithContentsOfFile:filePath];
-  return data;
-}
-
-@end
diff --git a/submodules/HockeySDK-iOS/Support/HockeySDKTests/BITTestsDependencyInjection.h b/submodules/HockeySDK-iOS/Support/HockeySDKTests/BITTestsDependencyInjection.h
deleted file mode 100644
index c44ee1f2b9..0000000000
--- a/submodules/HockeySDK-iOS/Support/HockeySDKTests/BITTestsDependencyInjection.h
+++ /dev/null
@@ -1,11 +0,0 @@
-#import <XCTest/XCTest.h>
-
-#import <OCHamcrestIOS/OCHamcrestIOS.h>
-#import <OCMockitoIOS/OCMockitoIOS.h>
-
-@interface BITTestsDependencyInjection : XCTestCase
-
-- (void)setMockNotificationCenter:(id)mockNotificationCenter;
-- (id)mockNotificationCenter;
-
-@end
diff --git a/submodules/HockeySDK-iOS/Support/HockeySDKTests/BITTestsDependencyInjection.m b/submodules/HockeySDK-iOS/Support/HockeySDKTests/BITTestsDependencyInjection.m
deleted file mode 100644
index 655bdf698d..0000000000
--- a/submodules/HockeySDK-iOS/Support/HockeySDKTests/BITTestsDependencyInjection.m
+++ /dev/null
@@ -1,29 +0,0 @@
-#import "BITTestsDependencyInjection.h"
-#import <OCMock/OCMock.h>
-
-static id testNotificationCenter;
-static id mockCenter;
-
-@implementation BITTestsDependencyInjection
-
-- (void)setUp {
-  [self setMockNotificationCenter:OCMPartialMock([NSNotificationCenter new])];
-}
-
-- (void)tearDown {
-  [super tearDown];
-}
-
-# pragma mark - Helper
-
-- (void)setMockNotificationCenter:(id)mockNotificationCenter {
-  mockCenter = OCMClassMock([NSNotificationCenter class]);
-  OCMStub([mockCenter defaultCenter]).andReturn(mockNotificationCenter);
-  testNotificationCenter = mockNotificationCenter;
-}
-
-- (id)mockNotificationCenter {
-  return testNotificationCenter;
-}
-
-@end
diff --git a/submodules/HockeySDK-iOS/Support/HockeySDKTests/BITUpdateManagerTests.m b/submodules/HockeySDK-iOS/Support/HockeySDKTests/BITUpdateManagerTests.m
deleted file mode 100644
index 250b1bf08a..0000000000
--- a/submodules/HockeySDK-iOS/Support/HockeySDKTests/BITUpdateManagerTests.m
+++ /dev/null
@@ -1,75 +0,0 @@
-#import <XCTest/XCTest.h>
-#import <OCMock/OCMock.h>
-
-#import "BITUpdateManagerPrivate.h"
-#import "BITHockeyBaseManagerPrivate.h"
-
-@interface BITUpdateManagerTests : XCTestCase
-
-@property (nonatomic, strong) BITUpdateManager *sut;
-
-@end
-
-@implementation BITUpdateManagerTests
-
-- (void)setUp {
-  [super setUp];
-  self.sut = [[BITUpdateManager alloc] initWithAppIdentifier:@"testIdentifier" appEnvironment:BITEnvironmentOther];
-}
-
-- (void)testRequestForUpdateCheck {
-  // Given
-  id mainBundleMock = OCMPartialMock([NSBundle mainBundle]);
-  OCMStub([mainBundleMock objectForInfoDictionaryKey:@"CFBundleVersion"]).andReturn(@"123 {Something, c0f42b3}");
-  
-  id mockBundle = OCMClassMock(NSBundle.class);
-  OCMStub([mockBundle mainBundle]).andReturn(mainBundleMock);
-  
-  NSString *testInstallationIdentificationType = @"SomeInstallationIdentificationType";
-  NSString *testInstallationIdentification = @"SpecificInstallationIdentification";
-  self.sut.installationIdentificationType = testInstallationIdentificationType;
-  self.sut.installationIdentification = testInstallationIdentification;
-  
-  
-  NSURLRequest *request = [self.sut requestForUpdateCheck];
-  
-  XCTAssertTrue(self.sut.sendUsageData);
-  
-  // Test HTTP header
-  XCTAssertEqualObjects(request.HTTPMethod, @"GET");
-  XCTAssertEqualObjects([request valueForHTTPHeaderField:@"User-Agent"], @"Hockey/iOS");
-  XCTAssertEqualObjects([request valueForHTTPHeaderField:@"Accept-Encoding"], @"gzip");
-  
-  XCTAssertEqual(request.cachePolicy, NSURLRequestReloadIgnoringCacheData);
-  XCTAssertEqual(request.timeoutInterval, 10.0);
-  
-  // Test URL parts
-  XCTAssertEqualObjects(request.URL.host, @"sdk.hockeyapp.net");
-  XCTAssertEqualObjects(request.URL.path, @"/api/2/apps/testIdentifier");
-
-  NSString *identificationString = [NSString stringWithFormat:@"%@=%@", testInstallationIdentificationType, testInstallationIdentification];
-  XCTAssertTrue([request.URL.query containsString:identificationString]);
-  
-  // Test identification and usage not present
-  self.sut.installationIdentificationType = nil;
-  self.sut.installationIdentification = nil;
-  self.sut.sendUsageData = NO;
-  
-  request = [self.sut requestForUpdateCheck];
-  
-  XCTAssertFalse([request.URL.query containsString:@"app_version="]);
-  XCTAssertFalse([request.URL.query containsString:@"os=iOS"]);
-  XCTAssertFalse([request.URL.query containsString:@"os_version="]);
-  XCTAssertFalse([request.URL.query containsString:@"device="]);
-  XCTAssertFalse([request.URL.query containsString:@"lang="]);
-  XCTAssertFalse([request.URL.query containsString:@"first_start_at="]);
-  XCTAssertFalse([request.URL.query containsString:@"usage_time="]);
-  XCTAssertFalse([request.URL.query containsString:identificationString]);
-  
-  // Test URL encoding
-  NSString *requestUrlString = request.URL.absoluteString;
-  NSCharacterSet *characterSet = [NSCharacterSet characterSetWithCharactersInString:@" {}"];
-  XCTAssertEqual([requestUrlString rangeOfCharacterFromSet:characterSet].location, NSNotFound, "URL should not contain unencoded characters");
-}
-
-@end
diff --git a/submodules/HockeySDK-iOS/Support/HockeySDKTests/BITUserTests.m b/submodules/HockeySDK-iOS/Support/HockeySDKTests/BITUserTests.m
deleted file mode 100644
index da9bc84ec0..0000000000
--- a/submodules/HockeySDK-iOS/Support/HockeySDKTests/BITUserTests.m
+++ /dev/null
@@ -1,77 +0,0 @@
-#import <XCTest/XCTest.h>
-#import "BITUser.h"
-
-@interface BITUserTests : XCTestCase
-
-@end
-
-@implementation BITUserTests
-
-- (void)testaccount_acquisition_datePropertyWorksAsExpected {
-    NSString *expected = @"Test string";
-    BITUser *item = [BITUser new];
-    item.accountAcquisitionDate = expected;
-    NSString *actual = item.accountAcquisitionDate;
-    XCTAssertTrue([actual isEqualToString:expected]);
-    
-    expected = @"Other string";
-    item.accountAcquisitionDate = expected;
-    actual = item.accountAcquisitionDate;
-    XCTAssertTrue([actual isEqualToString:expected]);
-}
-
-- (void)testaccount_idPropertyWorksAsExpected {
-    NSString *expected = @"Test string";
-    BITUser *item = [BITUser new];
-    item.accountId = expected;
-    NSString *actual = item.accountId;
-    XCTAssertTrue([actual isEqualToString:expected]);
-    
-    expected = @"Other string";
-    item.accountId = expected;
-    actual = item.accountId;
-    XCTAssertTrue([actual isEqualToString:expected]);
-}
-
-- (void)testuser_agentPropertyWorksAsExpected {
-    NSString *expected = @"Test string";
-    BITUser *item = [BITUser new];
-    item.userAgent = expected;
-    NSString *actual = item.userAgent;
-    XCTAssertTrue([actual isEqualToString:expected]);
-    
-    expected = @"Other string";
-    item.userAgent = expected;
-    actual = item.userAgent;
-    XCTAssertTrue([actual isEqualToString:expected]);
-}
-
-- (void)testidPropertyWorksAsExpected {
-    NSString *expected = @"Test string";
-    BITUser *item = [BITUser new];
-    item.userId = expected;
-    NSString *actual = item.userId;
-    XCTAssertTrue([actual isEqualToString:expected]);
-    
-    expected = @"Other string";
-    item.userId = expected;
-    actual = item.userId;
-    XCTAssertTrue([actual isEqualToString:expected]);
-}
-
-- (void)testSerialize {
-    BITUser *item = [BITUser new];
-    item.accountAcquisitionDate = @"Test string";
-    item.accountId = @"Test string";
-    item.userAgent = @"Test string";
-    item.userId = @"Test string";
-    item.storeRegion = @"Test region";
-    item.authUserId = @"Test authUserId";
-    item.anonUserAcquisitionDate = @"Test anonUserAcquisitionDate";
-    item.authUserAcquisitionDate = @"Test authUserAcquisitionDate";
-    NSDictionary *actual = [item serializeToDictionary];
-    NSDictionary *expected = @{@"ai.user.accountAcquisitionDate":@"Test string", @"ai.user.accountId":@"Test string", @"ai.user.userAgent":@"Test string", @"ai.user.id":@"Test string", @"ai.user.storeRegion":@"Test region", @"ai.user.authUserId":@"Test authUserId", @"ai.user.anonUserAcquisitionDate":@"Test anonUserAcquisitionDate", @"ai.user.authUserAcquisitionDate":@"Test authUserAcquisitionDate"};
-    XCTAssertTrue([actual isEqualToDictionary:expected]);
-}
-
-@end
diff --git a/submodules/HockeySDK-iOS/Support/HockeySDKTests/Fixtures/AppIcon.exotic.png b/submodules/HockeySDK-iOS/Support/HockeySDKTests/Fixtures/AppIcon.exotic.png
deleted file mode 100644
index 5473e5e8de..0000000000
Binary files a/submodules/HockeySDK-iOS/Support/HockeySDKTests/Fixtures/AppIcon.exotic.png and /dev/null differ
diff --git a/submodules/HockeySDK-iOS/Support/HockeySDKTests/Fixtures/AppIcon.exotic@2x.png b/submodules/HockeySDK-iOS/Support/HockeySDKTests/Fixtures/AppIcon.exotic@2x.png
deleted file mode 100644
index d79b85f577..0000000000
Binary files a/submodules/HockeySDK-iOS/Support/HockeySDKTests/Fixtures/AppIcon.exotic@2x.png and /dev/null differ
diff --git a/submodules/HockeySDK-iOS/Support/HockeySDKTests/Fixtures/AppIcon.png b/submodules/HockeySDK-iOS/Support/HockeySDKTests/Fixtures/AppIcon.png
deleted file mode 100644
index 5473e5e8de..0000000000
Binary files a/submodules/HockeySDK-iOS/Support/HockeySDKTests/Fixtures/AppIcon.png and /dev/null differ
diff --git a/submodules/HockeySDK-iOS/Support/HockeySDKTests/Fixtures/AppIcon@2x.png b/submodules/HockeySDK-iOS/Support/HockeySDKTests/Fixtures/AppIcon@2x.png
deleted file mode 100644
index d79b85f577..0000000000
Binary files a/submodules/HockeySDK-iOS/Support/HockeySDKTests/Fixtures/AppIcon@2x.png and /dev/null differ
diff --git a/submodules/HockeySDK-iOS/Support/HockeySDKTests/Fixtures/Icon.png b/submodules/HockeySDK-iOS/Support/HockeySDKTests/Fixtures/Icon.png
deleted file mode 100644
index 5473e5e8de..0000000000
Binary files a/submodules/HockeySDK-iOS/Support/HockeySDKTests/Fixtures/Icon.png and /dev/null differ
diff --git a/submodules/HockeySDK-iOS/Support/HockeySDKTests/Fixtures/StoreBundleIdentifierKnown.json b/submodules/HockeySDK-iOS/Support/HockeySDKTests/Fixtures/StoreBundleIdentifierKnown.json
deleted file mode 100644
index 0746107cde..0000000000
--- a/submodules/HockeySDK-iOS/Support/HockeySDKTests/Fixtures/StoreBundleIdentifierKnown.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "resultCount":1,
-  "results": [
-              {"kind":"software", "features":["iosUniversal"], "supportedDevices":["all"], "isGameCenterEnabled":false,
-              "screenshotUrls":["http://a354.phobos.apple.com/us/r1000/111/Purple/v4/7c/8a/ee/7c8aeeaf-5daa-de29-b4da-35ba051c53b4/mzl.iwzvkijg.png", "http://a1774.phobos.apple.com/us/r1000/107/Purple/v4/6a/59/a3/6a59a3ca-0235-b0db-75bd-0eca8fdfbf9b/mzl.opdtqzgj.png", "http://a1627.phobos.apple.com/us/r1000/116/Purple/v4/c3/e6/d9/c3e6d96c-b8d4-872b-bce9-bdf4a35bfe49/mzl.zdmdddyh.png", "http://a1594.phobos.apple.com/us/r1000/073/Purple/v4/e8/18/aa/e818aaa1-9d72-6ff6-823d-4e9d07ae5c65/mzl.qkqmxuhu.png", "http://a349.phobos.apple.com/us/r1000/075/Purple/v4/39/76/d7/3976d725-2ca3-04a3-74ab-f5a991c2b779/mzl.wyygagaj.png"],
-              "ipadScreenshotUrls":["http://a844.phobos.apple.com/us/r1000/081/Purple/v4/29/90/75/2990756f-e818-6b3e-7d79-1358c83ff2cf/mzl.bwbdcvif.1024x1024-65.jpg", "http://a834.phobos.apple.com/us/r1000/115/Purple/v4/55/a2/e9/55a2e923-61a9-0453-7637-4832de432f74/mzl.zlruoazd.1024x1024-65.jpg", "http://a1757.phobos.apple.com/us/r1000/101/Purple/v4/a5/2a/62/a52a627e-41b4-91b2-9c4d-526d602bf00e/mzl.qekglwsg.1024x1024-65.jpg", "http://a1812.phobos.apple.com/us/r1000/063/Purple/v4/39/80/39/398039db-7184-b623-97b6-988753aea1b0/mzl.scddwowl.1024x1024-65.jpg", "http://a1219.phobos.apple.com/us/r1000/081/Purple/v4/17/76/6b/17766b98-8100-fda3-8263-a88c06d4a6c0/mzl.oauotukf.1024x1024-65.jpg"], "artworkUrl60":"http://a147.phobos.apple.com/us/r1000/095/Purple/v4/e0/44/72/e04472f7-6807-b114-e971-c1d602805298/Icon.png", "artworkUrl512":"http://a1921.phobos.apple.com/us/r1000/118/Purple/v4/2b/d6/85/2bd68583-090f-a513-d3f6-a47ea2175a0c/temp..mkgsmtvp.png", "artistViewUrl":"https://itunes.apple.com/us/artist/andreas-linde/id292957656?uo=4", "artistId":292957656, "artistName":"Andreas Linde", "price":3.99, "version":"4.1.2",
-              "description":"## Apple Rewind 2011 Germany: Best iPad travel app ##\n\nTravel the world from wherever you are and watch webcams worldwide with an elegant, friendly, and intuitive user interface.\n\nWorldView+ puts the world into your pocket or onto your couch! Watch over 20,000 webcams from all over the world and get additional information for each place such as current weather or Wikipedia articles.\n\nPress Quotes:\n\"Want to check the weather in Covent Garden, or indeed see the pyramids? WorldView opens your eyes.\" - The Times Online\n\"It's an ideal toy for tourists wishing to get a sense of the weather at their destinations, or for armchair travelers stuck in their work cubicles.\" - USA Today Online\n\"If you like webcams, you'll really enjoy WorldView's features and design.\" - TUAW\n\nFeature Overview:\n- Save your favorite webcams and even group them into your own collections\n- iCloud support! Automatically syncs your favorites.\n- Add additional webcams manually\n- View images in fullscreen with the best image quality provided by the webcam\n- WorldView+ automatically updates the image as soon as most webcams provide them\n- Share webcams and images on Twitter, Facebook, and via email\n\nFind webcams:\n- Type in text and search or select any of the suggested locations\n- Search using map, tap and hold on a place to search around a specific spot\n- Watch webcams near your current location\n- Get lucky and view random webcams\n- Browse a list of new, recently viewed, and featured webcams\n- All webcams listed in http://webcams.travel/ are available\n\nMore than just webcams:\n- Current weather information near the webcams location\n- Wikipedia articles around the webcams location\n- View webcam locations on a map\n- View daylight images\n- Get a live video stream when possible\n- See a timelapse video of selected webcams\n- Visit the webcam's website on webcams.travel\n\nAdd more yourself:\n- Easily add webcams not listed in webcams.travel\n\n\nWorldView+ \u2013 browse and discover the world like never before.\n\n\nTechnical info:\n- Manually added webcams support password protection via HTTP basic authorization\n- Supports most webcam types providing images via JPG and PNG and video streams using Motion-JPEG\n- Auto updating images is technically not possible for all webcams, currently supported for more than 9,000\n- Live video streams are available for more than 900 webcams, audio is not supported\n- Timelapse videos are provided by webcams.travel for about 50 webcams as of now\n\n\nIf there are any questions or problems, please visit our support forum at http://support.worldviewmobileapp.com/. This will allow us to help sort out any issues you may be experiencing. Thanks and happy WorldViewing!", "currency":"USD", "genres":["Travel", "Weather"], "genreIds":["6003", "6001"], "releaseDate":"2008-12-04T10:31:45Z", "sellerName":"Andreas Linde", "bundleId":"de.buzzworks.WorldViewLive", "trackId":297063830, "trackName":"WorldView+", "primaryGenreName":"Travel", "primaryGenreId":6003,
-              "releaseNotes":"- Improvements to iCloud sync\n- Improved swedish & croatian localizations\n- Fix import bookmarks from WorldView by webcams.travel (Requires version 4.1.2 of both apps)\n- Improved handling of corrupted iCloud data. (Can require second app start to fix it)\n- Improved stability\n- Various minor improvements", "formattedPrice":"$3.99", "wrapperType":"software", "trackCensoredName":"WorldView+", "languageCodesISO2A":["SV", "ZH", "DE", "EN", "ES", "FI", "FR", "HR", "JA", "NL", "PL", "PT", "RU"], "fileSizeBytes":"4374716", "sellerUrl":"http://www.worldviewmobileapp.com/", "contentAdvisoryRating":"4+", "averageUserRatingForCurrentVersion":4.5, "userRatingCountForCurrentVersion":4, "artworkUrl100":"http://a1921.phobos.apple.com/us/r1000/118/Purple/v4/2b/d6/85/2bd68583-090f-a513-d3f6-a47ea2175a0c/temp..mkgsmtvp.png", "trackViewUrl":"https://itunes.apple.com/us/app/worldview+/id297063830?mt=8&uo=4", "trackContentRating":"4+", "averageUserRating":3.5, "userRatingCount":569}]
-}
\ No newline at end of file
diff --git a/submodules/HockeySDK-iOS/Support/HockeySDKTests/Fixtures/StoreBundleIdentifierUnknown.json b/submodules/HockeySDK-iOS/Support/HockeySDKTests/Fixtures/StoreBundleIdentifierUnknown.json
deleted file mode 100644
index 608cfbe369..0000000000
--- a/submodules/HockeySDK-iOS/Support/HockeySDKTests/Fixtures/StoreBundleIdentifierUnknown.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "resultCount":0,
-  "results": []
-}
\ No newline at end of file
diff --git a/submodules/HockeySDK-iOS/Support/HockeySDKTests/Fixtures/live_report_exception.plcrash b/submodules/HockeySDK-iOS/Support/HockeySDKTests/Fixtures/live_report_exception.plcrash
deleted file mode 100644
index ab8d7d94ea..0000000000
Binary files a/submodules/HockeySDK-iOS/Support/HockeySDKTests/Fixtures/live_report_exception.plcrash and /dev/null differ
diff --git a/submodules/HockeySDK-iOS/Support/HockeySDKTests/Fixtures/live_report_exception_marketing.plcrash b/submodules/HockeySDK-iOS/Support/HockeySDKTests/Fixtures/live_report_exception_marketing.plcrash
deleted file mode 100644
index fcfd6bed18..0000000000
Binary files a/submodules/HockeySDK-iOS/Support/HockeySDKTests/Fixtures/live_report_exception_marketing.plcrash and /dev/null differ
diff --git a/submodules/HockeySDK-iOS/Support/HockeySDKTests/Fixtures/live_report_signal.plcrash b/submodules/HockeySDK-iOS/Support/HockeySDKTests/Fixtures/live_report_signal.plcrash
deleted file mode 100644
index d0b9c41ed7..0000000000
Binary files a/submodules/HockeySDK-iOS/Support/HockeySDKTests/Fixtures/live_report_signal.plcrash and /dev/null differ
diff --git a/submodules/HockeySDK-iOS/Support/HockeySDKTests/Fixtures/live_report_signal_marketing.plcrash b/submodules/HockeySDK-iOS/Support/HockeySDKTests/Fixtures/live_report_signal_marketing.plcrash
deleted file mode 100644
index a9e9a14002..0000000000
Binary files a/submodules/HockeySDK-iOS/Support/HockeySDKTests/Fixtures/live_report_signal_marketing.plcrash and /dev/null differ
diff --git a/submodules/HockeySDK-iOS/Support/HockeySDKTests/Fixtures/live_report_xamarin.plcrash b/submodules/HockeySDK-iOS/Support/HockeySDKTests/Fixtures/live_report_xamarin.plcrash
deleted file mode 100644
index f79046941a..0000000000
Binary files a/submodules/HockeySDK-iOS/Support/HockeySDKTests/Fixtures/live_report_xamarin.plcrash and /dev/null differ
diff --git a/submodules/HockeySDK-iOS/Support/HockeySDKTests/Fixtures/log_report_xamarin b/submodules/HockeySDK-iOS/Support/HockeySDKTests/Fixtures/log_report_xamarin
deleted file mode 100644
index 01fb19ddf5..0000000000
--- a/submodules/HockeySDK-iOS/Support/HockeySDKTests/Fixtures/log_report_xamarin
+++ /dev/null
@@ -1,739 +0,0 @@
-Incident Identifier: DA408E79-F7FA-41A0-9749-2DEDBFF6B834
-CrashReporter Key:   ???
-Hardware Model:      x86_64
-Process:         HockeySDKXamarin [4438]
-Path:            /Users/USER/Library/Developer/CoreSimulator/Devices/4E8A1839-B2A5-4C6E-9262-C603E709A19A/data/Containers/Bundle/Application/B06486E3-9435-4242-A6E8-A274E829B046/HockeySDKXamarinDemo.iOS.app/HockeySDKXamarinDemo.iOS
-Identifier:      com.microsoft.ios.XamarinBugbashDemo
-Version:         1.0 (1)
-Code Type:       X86
-Parent Process:  launchd_sim [4266]
-
-Date/Time:       2016-04-21T20:09:40Z
-Launch Time:     2016-04-21T20:09:37Z
-OS Version:      Mac OS X 9.3 (15E65)
-Report Version:  104-Xamarin
-
-Exception Type:  SIGABRT
-Exception Codes: #0 at 0x9c54572
-Crashed Thread:  0
-
-Application Specific Information:
-*** Terminating app due to uncaught exception 'System.AggregateException', reason: 'System.AggregateException: This is an aggregate exception with 2 inner exceptions. ---> HockeySDKXamarinDemo.TestHockeyAppException: This is the first basic exception.'
-
-Xamarin Exception Stack:
-  at HockeySDKXamarinDemo.TestPage.ThrowAggregateException (System.Object sender, System.EventArgs e) [0x0000d] in /Users/myUser/Documents/Workspace/HockeySDK-XamarinDemo/HockeySDK-XamarinDemo/TestPage.cs:105 
-  --- End of inner exception stack trace ---
-  at HockeySDKXamarinDemo.TestPage.ThrowAggregateException (System.Object sender, System.EventArgs e) [0x00043] in /Users/myUser/Documents/Workspace/HockeySDK-XamarinDemo/HockeySDK-XamarinDemo/TestPage.cs:121 
-  at Xamarin.Forms.Button.Xamarin.Forms.IButtonController.SendClicked () <0x1b149c08 + 0x00054> in <filename unknown>:0 
-  at Xamarin.Forms.Platform.iOS.ButtonRenderer.OnButtonTouchUpInside (System.Object sender, System.EventArgs eventArgs) <0x1b149bd8 + 0x00028> in <filename unknown>:0 
-  at UIKit.UIControlEventProxy.Activated () [0x00007] in /Users/builder/data/lanes/3051/5f11db87/source/maccore/src/UIKit/UIControl.cs:37 
-  at (wrapper managed-to-native) UIKit.UIApplication:UIApplicationMain (int,string[],intptr,intptr)
-  at UIKit.UIApplication.Main (System.String[] args, IntPtr principal, IntPtr delegate) [0x00005] in /Users/builder/data/lanes/3051/5f11db87/source/maccore/src/UIKit/UIApplication.cs:77 
-  at UIKit.UIApplication.Main (System.String[] args, System.String principalClassName, System.String delegateClassName) [0x0001c] in /Users/builder/data/lanes/3051/5f11db87/source/maccore/src/UIKit/UIApplication.cs:60 
-  at HockeySDKXamarinDemo.Application.Main (System.String[] args) [0x00008] in /Users/myUser/Documents/Workspace/HockeySDK-XamarinDemo/iOS/Main.cs:17 
----> (Inner Exception #0) HockeySDKXamarinDemo.TestHockeyAppException: This is the first basic exception.
-  at HockeySDKXamarinDemo.TestPage.ThrowAggregateException (System.Object sender, System.EventArgs e) [0x0000d] in /Users/myUser/Documents/Workspace/HockeySDK-XamarinDemo/HockeySDK-XamarinDemo/TestPage.cs:105 <---
----> (Inner Exception #1) HockeySDKXamarinDemo.TestHockeyAppException: This is the second basic exception.
-  at HockeySDKXamarinDemo.TestPage.ThrowAggregateException (System.Object sender, System.EventArgs e) [0x00028] in /Users/myUser/Documents/Workspace/HockeySDK-XamarinDemo/HockeySDK-XamarinDemo/TestPage.cs:114 <---
-
-Last Exception Backtrace:
-0   CoreFoundation                       0x09098478 0x8f31000 + 1471608
-1   libobjc.A.dylib                      0x0943be02 0x9437000 + 19970
-2   CoreFoundation                       0x090980b1 0x8f31000 + 1470641
-3   ???                                  0x1b14cfe8 0x0 + 0
-4   ???                                  0x1b14a870 0x0 + 0
-5   ???                                  0x1b14a6e8 0x0 + 0
-6   ???                                  0x1b14a6c0 0x0 + 0
-7   ???                                  0x1b14a61e 0x0 + 0
-8   libmonosgen-2.0.dylib                0x08aeee81 0x8ae1000 + 56961
-9   libmonosgen-2.0.dylib                0x08c9e0af 0x8ae1000 + 1822895
-10  libmonosgen-2.0.dylib                0x08ca272c 0x8ae1000 + 1840940
-11  libmonosgen-2.0.dylib                0x08ca3695 0x8ae1000 + 1844885
-12  libmonosgen-2.0.dylib                0x08ca32a6 0x8ae1000 + 1843878
-13  libmonosgen-2.0.dylib                0x08b91c7e 0x8ae1000 + 724094
-14  libmonosgen-2.0.dylib                0x08b90c59 0x8ae1000 + 719961
-15  libmonosgen-2.0.dylib                0x08be05be 0x8ae1000 + 1045950
-16  ???                                  0x170b7f57 0x0 + 0
-17  ???                                  0x1b149c5d 0x0 + 0
-18  ???                                  0x1b149c01 0x0 + 0
-19  ???                                  0x1b149bbd 0x0 + 0
-20  ???                                  0x18c63e80 0x0 + 0
-21  libmonosgen-2.0.dylib                0x08aeee81 0x8ae1000 + 56961
-22  libmonosgen-2.0.dylib                0x08c9e0af 0x8ae1000 + 1822895
-23  HockeySDKXamarinDemo.iOS             0x001d0529 0xfb000 + 873769
-24  HockeySDKXamarinDemo.iOS             0x001e1baa 0xfb000 + 945066
-25  libobjc.A.dylib                      0x094500b5 0x9437000 + 102581
-26  UIKit                                0x013aee38 0x1383000 + 179768
-27  UIKit                                0x013aedb7 0x1383000 + 179639
-28  UIKit                                0x01552f3b 0x1383000 + 1900347
-29  UIKit                                0x015532d4 0x1383000 + 1901268
-30  UIKit                                0x015522c1 0x1383000 + 1897153
-31  UIKit                                0x0142f52e 0x1383000 + 705838
-32  UIKit                                0x014305cc 0x1383000 + 710092
-33  UIKit                                0x013d1be8 0x1383000 + 322536
-34  UIKit                                0x19aed369 0x19ad7000 + 90985
-35  UIKit                                0x013a6769 0x1383000 + 145257
-36  CoreFoundation                       0x08faae5f 0x8f31000 + 499295
-37  CoreFoundation                       0x08fa0aeb 0x8f31000 + 457451
-38  CoreFoundation                       0x08f9ff08 0x8f31000 + 454408
-39  CoreFoundation                       0x08f9f846 0x8f31000 + 452678
-40  CoreFoundation                       0x08f9f65b 0x8f31000 + 452187
-41  GraphicsServices                     0x0a22b664 0xa21d000 + 58980
-42  GraphicsServices                     0x0a22b4a1 0xa21d000 + 58529
-43  UIKit                                0x013aceb9 0x1383000 + 171705
-44  ???                                  0x1908d9b8 0x0 + 0
-45  ???                                  0x1908d8a4 0x0 + 0
-46  ???                                  0x1908c6a0 0x0 + 0
-47  ???                                  0x1908c534 0x0 + 0
-48  ???                                  0x1908c5ec 0x0 + 0
-49  libmonosgen-2.0.dylib                0x08aeee81 0x8ae1000 + 56961
-50  libmonosgen-2.0.dylib                0x08c9e0af 0x8ae1000 + 1822895
-51  libmonosgen-2.0.dylib                0x08ca2f71 0x8ae1000 + 1843057
-52  libmonosgen-2.0.dylib                0x08ca2d35 0x8ae1000 + 1842485
-53  libmonosgen-2.0.dylib                0x08b5ac8d 0x8ae1000 + 498829
-54  HockeySDKXamarinDemo.iOS             0x002cf470 0xfb000 + 1918064
-55  HockeySDKXamarinDemo.iOS             0x00218f51 0xfb000 + 1171281
-56  libdyld.dylib                        0x09915a25 0x9913000 + 10789
-
-Thread 0 Crashed:
-0   libsystem_kernel.dylib               0x09c54572 0x9c39000 + 111986
-1   libsystem_c.dylib                    0x099bc65d 0x995e000 + 386653
-2   HockeySDKXamarinDemo.iOS             0x0028a845 0xfb000 + 1636421
-3   CoreFoundation                       0x090988ce 0x8f31000 + 1472718
-4   libobjc.A.dylib                      0x0943c0ae 0x9437000 + 20654
-5   HockeySDKXamarinDemo.iOS             0x0027515c 0xfb000 + 1548636
-6   libc++abi.dylib                      0x09425d0d 0x9407000 + 126221
-7   libc++abi.dylib                      0x0942572b 0x9407000 + 124715
-8   libobjc.A.dylib                      0x0943bf23 0x9437000 + 20259
-9   CoreFoundation                       0x090980b1 0x8f31000 + 1470641
-10  ???                                  0x1b14cfe8 0x0 + 0
-11  ???                                  0x1b14a870 0x0 + 0
-12  ???                                  0x1b14a6e8 0x0 + 0
-13  ???                                  0x1b14a6c0 0x0 + 0
-14  ???                                  0x1b14a61e 0x0 + 0
-15  libmonosgen-2.0.dylib                0x08aeee81 0x8ae1000 + 56961
-16  libmonosgen-2.0.dylib                0x08c9e0af 0x8ae1000 + 1822895
-17  libmonosgen-2.0.dylib                0x08ca272c 0x8ae1000 + 1840940
-18  libmonosgen-2.0.dylib                0x08ca3695 0x8ae1000 + 1844885
-19  libmonosgen-2.0.dylib                0x08ca32a6 0x8ae1000 + 1843878
-20  libmonosgen-2.0.dylib                0x08b91c7e 0x8ae1000 + 724094
-21  libmonosgen-2.0.dylib                0x08b90c59 0x8ae1000 + 719961
-22  libmonosgen-2.0.dylib                0x08be05be 0x8ae1000 + 1045950
-23  ???                                  0x170b7f57 0x0 + 0
-24  ???                                  0x1b149c5d 0x0 + 0
-25  ???                                  0x1b149c01 0x0 + 0
-26  ???                                  0x1b149bbd 0x0 + 0
-27  ???                                  0x18c63e80 0x0 + 0
-28  libmonosgen-2.0.dylib                0x08aeee81 0x8ae1000 + 56961
-29  libmonosgen-2.0.dylib                0x08c9e0af 0x8ae1000 + 1822895
-30  HockeySDKXamarinDemo.iOS             0x001d0529 0xfb000 + 873769
-31  HockeySDKXamarinDemo.iOS             0x001e1baa 0xfb000 + 945066
-32  libobjc.A.dylib                      0x094500b5 0x9437000 + 102581
-33  UIKit                                0x013aee38 0x1383000 + 179768
-34  UIKit                                0x013aedb7 0x1383000 + 179639
-35  UIKit                                0x01552f3b 0x1383000 + 1900347
-36  UIKit                                0x015532d4 0x1383000 + 1901268
-37  UIKit                                0x015522c1 0x1383000 + 1897153
-38  UIKit                                0x0142f52e 0x1383000 + 705838
-39  UIKit                                0x014305cc 0x1383000 + 710092
-40  UIKit                                0x013d1be8 0x1383000 + 322536
-41  UIKit                                0x19aed369 0x19ad7000 + 90985
-42  UIKit                                0x013a6769 0x1383000 + 145257
-43  CoreFoundation                       0x08faae5f 0x8f31000 + 499295
-44  CoreFoundation                       0x08fa0aeb 0x8f31000 + 457451
-45  CoreFoundation                       0x08f9ff08 0x8f31000 + 454408
-46  CoreFoundation                       0x08f9f846 0x8f31000 + 452678
-47  CoreFoundation                       0x08f9f65b 0x8f31000 + 452187
-48  GraphicsServices                     0x0a22b664 0xa21d000 + 58980
-49  GraphicsServices                     0x0a22b4a1 0xa21d000 + 58529
-50  UIKit                                0x013aceb9 0x1383000 + 171705
-51  ???                                  0x1908d9b8 0x0 + 0
-52  ???                                  0x1908d8a4 0x0 + 0
-53  ???                                  0x1908c6a0 0x0 + 0
-54  ???                                  0x1908c534 0x0 + 0
-55  ???                                  0x1908c5ec 0x0 + 0
-56  libmonosgen-2.0.dylib                0x08aeee81 0x8ae1000 + 56961
-57  libmonosgen-2.0.dylib                0x08c9e0af 0x8ae1000 + 1822895
-58  libmonosgen-2.0.dylib                0x08ca2f71 0x8ae1000 + 1843057
-59  libmonosgen-2.0.dylib                0x08ca2d35 0x8ae1000 + 1842485
-60  libmonosgen-2.0.dylib                0x08b5ac8d 0x8ae1000 + 498829
-61  HockeySDKXamarinDemo.iOS             0x002cf470 0xfb000 + 1918064
-62  HockeySDKXamarinDemo.iOS             0x00218f51 0xfb000 + 1171281
-63  libdyld.dylib                        0x09915a25 0x9913000 + 10789
-
-Thread 1:
-0   libsystem_kernel.dylib               0x09c557de 0x9c39000 + 116702
-1   libdispatch.dylib                    0x098df2e3 0x98d1000 + 58083
-
-Thread 2:
-0   libsystem_kernel.dylib               0x09c54d5e 0x9c39000 + 114014
-1   libsystem_pthread.dylib              0x09c16f56 0x9c16000 + 3926
-
-Thread 3:
-0   libsystem_kernel.dylib               0x09c54d5e 0x9c39000 + 114014
-1   libsystem_pthread.dylib              0x09c16f56 0x9c16000 + 3926
-
-Thread 4:
-0   libsystem_kernel.dylib               0x09c54d5e 0x9c39000 + 114014
-1   libsystem_pthread.dylib              0x09c16f56 0x9c16000 + 3926
-
-Thread 5:
-0   libsystem_kernel.dylib               0x09c54d5e 0x9c39000 + 114014
-1   libsystem_pthread.dylib              0x09c16f56 0x9c16000 + 3926
-
-Thread 6:
-0   libsystem_kernel.dylib               0x09c54d5e 0x9c39000 + 114014
-1   libsystem_pthread.dylib              0x09c16f56 0x9c16000 + 3926
-
-Thread 7:
-0   libsystem_kernel.dylib               0x09c4d49a 0x9c39000 + 83098
-1   CoreFoundation                       0x08fa0d16 0x8f31000 + 458006
-2   CoreFoundation                       0x08fa00f6 0x8f31000 + 454902
-3   CoreFoundation                       0x08f9f846 0x8f31000 + 452678
-4   CoreFoundation                       0x08f9f65b 0x8f31000 + 452187
-5   Foundation                           0x00f96ce2 0xf2d000 + 433378
-6   Foundation                           0x0103ddcf 0xf2d000 + 1117647
-7   HockeySDKXamarinDemo.iOS             0x00137a42 0xfb000 + 248386
-8   Foundation                           0x00f94eda 0xf2d000 + 425690
-9   Foundation                           0x0104a2dc 0xf2d000 + 1168092
-10  libsystem_pthread.dylib              0x09c19780 0x9c16000 + 14208
-11  libsystem_pthread.dylib              0x09c196f6 0x9c16000 + 14070
-12  libsystem_pthread.dylib              0x09c16f7a 0x9c16000 + 3962
-
-Thread 8:
-0   libsystem_kernel.dylib               0x09c54726 0x9c39000 + 112422
-1   libsystem_pthread.dylib              0x09c19780 0x9c16000 + 14208
-2   libsystem_pthread.dylib              0x09c196f6 0x9c16000 + 14070
-3   libsystem_pthread.dylib              0x09c16f7a 0x9c16000 + 3962
-
-Thread 9:
-0   libsystem_kernel.dylib               0x09c543ea 0x9c39000 + 111594
-1   libsystem_pthread.dylib              0x09c1c276 0x9c16000 + 25206
-2   libmonosgen-2.0.dylib                0x08cfabf2 0x8ae1000 + 2202610
-3   libsystem_pthread.dylib              0x09c19780 0x9c16000 + 14208
-4   libsystem_pthread.dylib              0x09c196f6 0x9c16000 + 14070
-5   libsystem_pthread.dylib              0x09c16f7a 0x9c16000 + 3962
-
-Thread 10:
-0   libsystem_kernel.dylib               0x09c4d4d6 0x9c39000 + 83158
-1   libmonosgen-2.0.dylib                0x08c9bdea 0x8ae1000 + 1813994
-2   libmonosgen-2.0.dylib                0x08c7557f 0x8ae1000 + 1656191
-3   libmonosgen-2.0.dylib                0x08d253f0 0x8ae1000 + 2376688
-4   libsystem_pthread.dylib              0x09c19780 0x9c16000 + 14208
-5   libsystem_pthread.dylib              0x09c196f6 0x9c16000 + 14070
-6   libsystem_pthread.dylib              0x09c16f7a 0x9c16000 + 3962
-
-Thread 11:
-0   libsystem_kernel.dylib               0x09c547ce 0x9c39000 + 112590
-1   libsystem_c.dylib                    0x099dbb4d 0x995e000 + 514893
-2   HockeySDKXamarinDemo.iOS             0x002b600d 0xfb000 + 1814541
-3   libsystem_pthread.dylib              0x09c19780 0x9c16000 + 14208
-4   libsystem_pthread.dylib              0x09c196f6 0x9c16000 + 14070
-5   libsystem_pthread.dylib              0x09c16f7a 0x9c16000 + 3962
-
-Thread 12:
-0   libsystem_kernel.dylib               0x09c543ea 0x9c39000 + 111594
-1   libsystem_pthread.dylib              0x09c1c276 0x9c16000 + 25206
-2   libmonosgen-2.0.dylib                0x08d0058c 0x8ae1000 + 2225548
-3   libmonosgen-2.0.dylib                0x08d00638 0x8ae1000 + 2225720
-4   libmonosgen-2.0.dylib                0x08d0fe5c 0x8ae1000 + 2289244
-5   libmonosgen-2.0.dylib                0x08c71397 0x8ae1000 + 1639319
-6   ???                                  0x1b04bf88 0x0 + 0
-7   ???                                  0x1b04bdf4 0x0 + 0
-8   ???                                  0x1b04bc40 0x0 + 0
-9   ???                                  0x1b04ad1a 0x0 + 0
-10  ???                                  0x1b04a1f7 0x0 + 0
-11  ???                                  0x1b049ef3 0x0 + 0
-12  ???                                  0x1b049988 0x0 + 0
-13  ???                                  0x1b0498f8 0x0 + 0
-14  ???                                  0x1b049864 0x0 + 0
-15  ???                                  0x18c63e80 0x0 + 0
-16  libmonosgen-2.0.dylib                0x08aeee81 0x8ae1000 + 56961
-17  libmonosgen-2.0.dylib                0x08c9e0af 0x8ae1000 + 1822895
-18  libmonosgen-2.0.dylib                0x08ca272c 0x8ae1000 + 1840940
-19  libmonosgen-2.0.dylib                0x08c75606 0x8ae1000 + 1656326
-20  libmonosgen-2.0.dylib                0x08d253f0 0x8ae1000 + 2376688
-21  libsystem_pthread.dylib              0x09c19780 0x9c16000 + 14208
-22  libsystem_pthread.dylib              0x09c196f6 0x9c16000 + 14070
-23  libsystem_pthread.dylib              0x09c16f7a 0x9c16000 + 3962
-
-Thread 13:
-0   libsystem_kernel.dylib               0x09c543ea 0x9c39000 + 111594
-1   libsystem_pthread.dylib              0x09c1c276 0x9c16000 + 25206
-2   libmonosgen-2.0.dylib                0x08d0058c 0x8ae1000 + 2225548
-3   libmonosgen-2.0.dylib                0x08d00638 0x8ae1000 + 2225720
-4   libmonosgen-2.0.dylib                0x08d0fe5c 0x8ae1000 + 2289244
-5   libmonosgen-2.0.dylib                0x08c9ce84 0x8ae1000 + 1818244
-6   ???                                  0x1b04ea70 0x0 + 0
-7   ???                                  0x1b04e8f0 0x0 + 0
-8   ???                                  0x1b04e874 0x0 + 0
-9   ???                                  0x1b04c3b8 0x0 + 0
-10  ???                                  0x1b04b5d4 0x0 + 0
-11  ???                                  0x1b04a574 0x0 + 0
-12  ???                                  0x1b04a428 0x0 + 0
-13  ???                                  0x1b04a328 0x0 + 0
-14  ???                                  0x1b04a1f7 0x0 + 0
-15  ???                                  0x1b049ef3 0x0 + 0
-16  ???                                  0x1b049988 0x0 + 0
-17  ???                                  0x1b0498f8 0x0 + 0
-18  ???                                  0x1b049864 0x0 + 0
-19  ???                                  0x18c63e80 0x0 + 0
-20  libmonosgen-2.0.dylib                0x08aeee81 0x8ae1000 + 56961
-21  libmonosgen-2.0.dylib                0x08c9e0af 0x8ae1000 + 1822895
-22  libmonosgen-2.0.dylib                0x08ca272c 0x8ae1000 + 1840940
-23  libmonosgen-2.0.dylib                0x08c75606 0x8ae1000 + 1656326
-24  libmonosgen-2.0.dylib                0x08d253f0 0x8ae1000 + 2376688
-25  libsystem_pthread.dylib              0x09c19780 0x9c16000 + 14208
-26  libsystem_pthread.dylib              0x09c196f6 0x9c16000 + 14070
-27  libsystem_pthread.dylib              0x09c16f7a 0x9c16000 + 3962
-
-Thread 14:
-0   libsystem_kernel.dylib               0x09c547ce 0x9c39000 + 112590
-1   libmonosgen-2.0.dylib                0x08d11a87 0x8ae1000 + 2296455
-2   libmonosgen-2.0.dylib                0x08c78900 0x8ae1000 + 1669376
-3   libmonosgen-2.0.dylib                0x08c7557f 0x8ae1000 + 1656191
-4   libmonosgen-2.0.dylib                0x08d253f0 0x8ae1000 + 2376688
-5   libsystem_pthread.dylib              0x09c19780 0x9c16000 + 14208
-6   libsystem_pthread.dylib              0x09c196f6 0x9c16000 + 14070
-7   libsystem_pthread.dylib              0x09c16f7a 0x9c16000 + 3962
-
-Thread 15:
-0   libsystem_kernel.dylib               0x09c543ea 0x9c39000 + 111594
-1   libsystem_pthread.dylib              0x09c1dd0b 0x9c16000 + 32011
-2   libmonosgen-2.0.dylib                0x08d1a5f7 0x8ae1000 + 2332151
-3   libmonosgen-2.0.dylib                0x08c79341 0x8ae1000 + 1672001
-4   libmonosgen-2.0.dylib                0x08c7557f 0x8ae1000 + 1656191
-5   libmonosgen-2.0.dylib                0x08d253f0 0x8ae1000 + 2376688
-6   libsystem_pthread.dylib              0x09c19780 0x9c16000 + 14208
-7   libsystem_pthread.dylib              0x09c196f6 0x9c16000 + 14070
-8   libsystem_pthread.dylib              0x09c16f7a 0x9c16000 + 3962
-
-Thread 16:
-0   libsystem_kernel.dylib               0x09c543ea 0x9c39000 + 111594
-1   libsystem_pthread.dylib              0x09c1dd0b 0x9c16000 + 32011
-2   libmonosgen-2.0.dylib                0x08d1a5f7 0x8ae1000 + 2332151
-3   libmonosgen-2.0.dylib                0x08c79341 0x8ae1000 + 1672001
-4   libmonosgen-2.0.dylib                0x08c7557f 0x8ae1000 + 1656191
-5   libmonosgen-2.0.dylib                0x08d253f0 0x8ae1000 + 2376688
-6   libsystem_pthread.dylib              0x09c19780 0x9c16000 + 14208
-7   libsystem_pthread.dylib              0x09c196f6 0x9c16000 + 14070
-8   libsystem_pthread.dylib              0x09c16f7a 0x9c16000 + 3962
-
-Thread 17:
-0   libsystem_kernel.dylib               0x09c4d49a 0x9c39000 + 83098
-1   CoreFoundation                       0x08fa0d16 0x8f31000 + 458006
-2   CoreFoundation                       0x08fa00f6 0x8f31000 + 454902
-3   CoreFoundation                       0x08f9f846 0x8f31000 + 452678
-4   CoreFoundation                       0x08f9f65b 0x8f31000 + 452187
-5   CFNetwork                            0x06366036 0x62ad000 + 757814
-6   Foundation                           0x00f94eda 0xf2d000 + 425690
-7   Foundation                           0x0104a2dc 0xf2d000 + 1168092
-8   libsystem_pthread.dylib              0x09c19780 0x9c16000 + 14208
-9   libsystem_pthread.dylib              0x09c196f6 0x9c16000 + 14070
-10  libsystem_pthread.dylib              0x09c16f7a 0x9c16000 + 3962
-
-Thread 18:
-0   libsystem_kernel.dylib               0x09c4d49a 0x9c39000 + 83098
-1   CoreFoundation                       0x08fa0d16 0x8f31000 + 458006
-2   CoreFoundation                       0x08fa00f6 0x8f31000 + 454902
-3   CoreFoundation                       0x08f9f846 0x8f31000 + 452678
-4   CoreFoundation                       0x08f9f65b 0x8f31000 + 452187
-5   WebCore                              0x0ed4c890 0xde27000 + 15882384
-6   libsystem_pthread.dylib              0x09c19780 0x9c16000 + 14208
-7   libsystem_pthread.dylib              0x09c196f6 0x9c16000 + 14070
-8   libsystem_pthread.dylib              0x09c16f7a 0x9c16000 + 3962
-
-Thread 0 crashed with X86 Thread State:
-   eip: 0x09c54572    ebp: 0xbff01e08    esp: 0xbff01dec    eax: 0x00000000 
-   edx: 0x00000000    ecx: 0xbff01dec    ebx: 0x090985a1    esi: 0x00000006 
-   edi: 0x09c21000 eflags: 0x00000286 trapno: 0x00000084     cs: 0x0000000b 
-    ds: 0x00000023     es: 0x00000023     fs: 0x00000000     gs: 0x0000000f 
-
-Binary Images:
-   0xfb000 -   0x334fff +HockeySDKXamarinDemo.iOS i386  <1dba02b7fe2738d3b50c31bc4eff9a55> /Users/USER/Library/Developer/CoreSimulator/Devices/4E8A1839-B2A5-4C6E-9262-C603E709A19A/data/Containers/Bundle/Application/B06486E3-9435-4242-A6E8-A274E829B046/HockeySDKXamarinDemo.iOS.app/HockeySDKXamarinDemo.iOS
-  0x5ac000 -   0x602fff +libc++.1.dylib i386  <cb4e9c7840bb32bb96e18cfee416ce01> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/usr/lib/libc++.1.dylib
-  0x651000 -   0x8befff +MediaPlayer i386  <92cda4e23d443ff9aff9ebb686f1baf7> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/Frameworks/MediaPlayer.framework/MediaPlayer
-  0xa3c000 -   0xa8bfff +SystemConfiguration i386  <70b26f869d31349587074ede7f19cc18> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/Frameworks/SystemConfiguration.framework/SystemConfiguration
-  0xab3000 -   0xc56fff +QuartzCore i386  <7275b1d853d5398f9f3ca7665171acd4> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/Frameworks/QuartzCore.framework/QuartzCore
-  0xcfc000 -   0xcfdfff +Twitter i386  <74bf67d8549e3a8a9be620d3a3574aa7> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/Frameworks/Twitter.framework/Twitter
-  0xd03000 -   0xd3efff +Accounts i386  <3684b97325f83fcf934342defe59fd67> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/Frameworks/Accounts.framework/Accounts
-  0xd68000 -   0xd68fff +AdSupport i386  <1a701197888035329d760a6d88be1e5d> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/Frameworks/AdSupport.framework/AdSupport
-  0xd6d000 -   0xe60fff +AddressBookUI i386  <2d0637c918633052943d1b11c9e25cef> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/Frameworks/AddressBookUI.framework/AddressBookUI
-  0xf06000 -   0xf1bfff +AssetsLibrary i386  <6abd2fed6f9b37e2a80055ce34d68ac6> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/Frameworks/AssetsLibrary.framework/AssetsLibrary
-  0xf2d000 -  0x11eefff +Foundation i386  <fc0bdc7aedc9335cbf944fa00378f2b5> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/Frameworks/Foundation.framework/Foundation
- 0x1383000 -  0x21e9fff +UIKit i386  <03a08f69524d3d45a4edc2cfa98a0d46> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/Frameworks/UIKit.framework/UIKit
- 0x28ce000 -  0x2a77fff +AVFoundation i386  <8428b1e4c27c3d48a01adfe5ee63b154> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/Frameworks/AVFoundation.framework/AVFoundation
- 0x2bc0000 -  0x2bc0fff +Accelerate i386  <f80628e8c3d53517b0aba04f9cc3569c> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/Frameworks/Accelerate.framework/Accelerate
- 0x2bc3000 -  0x2c45fff +AddressBook i386  <18b09ea93326382aafb36727a8f45328> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/Frameworks/AddressBook.framework/AddressBook
- 0x2c8f000 -  0x2fb7fff +AudioToolbox i386  <bb234c4430f6302aa134faf1be84034f> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/Frameworks/AudioToolbox.framework/AudioToolbox
- 0x30c9000 -  0x3149fff +SafariServices i386  <c190ac1f9ee33e788efb2aa23589a27d> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/Frameworks/SafariServices.framework/SafariServices
- 0x319a000 -  0x3393fff +CoreImage i386  <6bed84c0d46d3655982e1f9a11cbe5a7> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/Frameworks/CoreImage.framework/CoreImage
- 0x34b8000 -  0x351efff +MultipeerConnectivity i386  <090c941efadc35e189b594bcaef8149e> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/Frameworks/MultipeerConnectivity.framework/MultipeerConnectivity
- 0x3543000 -  0x3566fff +CoreBluetooth i386  <8939dec1971f3d68bd12be35cb00c766> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/Frameworks/CoreBluetooth.framework/CoreBluetooth
- 0x357d000 -  0x3836fff +CoreData i386  <2948afa28d7132b394f3f8765de0d892> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/Frameworks/CoreData.framework/CoreData
- 0x3919000 -  0x3f3dfff +CoreGraphics i386  <c3ce8e03cbc33711b3e356ac74d6e49c> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/Frameworks/CoreGraphics.framework/CoreGraphics
- 0x3fdd000 -  0x3fddfff +GameKit i386  <d41de40f34d6371aa1ae723e51418736> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/Frameworks/GameKit.framework/GameKit
- 0x3fe1000 -  0x4076fff +CoreMedia i386  <3c2a62645a5638859546f5ff39eb818f> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/Frameworks/CoreMedia.framework/CoreMedia
- 0x40d2000 -  0x41e1fff +CoreMotion i386  <8d722185801e395c9090826b15c3e8f0> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/Frameworks/CoreMotion.framework/CoreMotion
- 0x420d000 -  0x433ffff +CoreText i386  <5fb6c672d2773563b9ad0e9dc637b51d> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/Frameworks/CoreText.framework/CoreText
- 0x43d3000 -  0x443efff +CoreLocation i386  <57a960eae5c03216a3ed8bfe893a47cc> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/Frameworks/CoreLocation.framework/CoreLocation
- 0x4459000 -  0x4475fff +CoreVideo i386  <5b0228216f513efba8081d84a4cddfb3> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/Frameworks/CoreVideo.framework/CoreVideo
- 0x448a000 -  0x4534fff +EventKit i386  <0cc00b19e78f380691196c019d01072b> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/Frameworks/EventKit.framework/EventKit
- 0x4599000 -  0x45cdfff +GLKit i386  <cbde7b731afd304bbcd628508dc38daf> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/Frameworks/GLKit.framework/GLKit
- 0x45f1000 -  0x4607fff +GameController i386  <5ef0b542bcdc3f79b1d917aa87b3d2d6> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/Frameworks/GameController.framework/GameController
- 0x4613000 -  0x497bfff +ImageIO i386  <c98113248a2c3df39b599fa4828c0c45> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/Frameworks/ImageIO.framework/ImageIO
- 0x4a27000 -  0x4bfffff +MapKit i386  <f7cc9ceb48803952b847e98d9ca44b75> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/Frameworks/MapKit.framework/MapKit
- 0x4cec000 -  0x52f0fff +JavaScriptCore i386  <fd74720b6b61356d94df096ae8e1f7f4> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/Frameworks/JavaScriptCore.framework/JavaScriptCore
- 0x544d000 -  0x5453fff +MediaAccessibility i386  <2515ffd07cdb3bd499a3edfad5e2f7d8> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/Frameworks/MediaAccessibility.framework/MediaAccessibility
- 0x545f000 -  0x554afff +MobileCoreServices i386  <a10de80e6cb836feba3c3459a5521026> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/Frameworks/MobileCoreServices.framework/MobileCoreServices
- 0x55c0000 -  0x56bdfff +MessageUI i386  <5ec30e2f32cc3cedb2d3e8dd25c6e68c> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/Frameworks/MessageUI.framework/MessageUI
- 0x575a000 -  0x5765fff +OpenGLES i386  <bc028747dbd237c98e3665021a5939a5> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/Frameworks/OpenGLES.framework/OpenGLES
- 0x5771000 -  0x57e7fff +Security i386  <8a7618989dda3d9ab59614a9a165671e> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/Frameworks/Security.framework/Security
- 0x5834000 -  0x59a1fff +SpriteKit i386  <95830f0dbe58392e93dc2093051444c6> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/Frameworks/SpriteKit.framework/SpriteKit
- 0x5a0c000 -  0x5a29fff +StoreKit i386  <f4ff732894463795afb02533a87fe1bc> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/Frameworks/StoreKit.framework/StoreKit
- 0x5a46000 -  0x5af3fff +Social i386  <d2ec30629a003ca68114989733c02868> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/Frameworks/Social.framework/Social
- 0x5b60000 -  0x5b95fff +CoreMIDI i386  <f9694805a6b9381ea3d8a4dc314a19a4> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/Frameworks/CoreMIDI.framework/CoreMIDI
- 0x5bb7000 -  0x5c30fff +CoreTelephony i386  <845a12cbe9613b338e4f3afe9adeafb2> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/Frameworks/CoreTelephony.framework/CoreTelephony
- 0x5c8b000 -  0x5e49fff +EventKitUI i386  <fd8474965c6f3b7e93cf8d886aeaffa2> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/Frameworks/EventKitUI.framework/EventKitUI
- 0x5f34000 -  0x5f48fff +ExternalAccessory i386  <978b1982a39d33fd994eb45017aa7701> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/Frameworks/ExternalAccessory.framework/ExternalAccessory
- 0x5f5e000 -  0x5f67fff +NewsstandKit i386  <011115c881513fa0896b7952fe644197> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/Frameworks/NewsstandKit.framework/NewsstandKit
- 0x5f70000 -  0x60bdfff +PassKit i386  <af7751341d0234c18cd5a24200ac02dc> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/Frameworks/PassKit.framework/PassKit
- 0x619d000 -  0x61dffff +iAd i386  <b4681583f35c35749ebed1c702cd0398> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/Frameworks/iAd.framework/iAd
- 0x620f000 -  0x626ffff +QuickLook i386  <e5e737859f45321cba2c54e81f318dc4> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/Frameworks/QuickLook.framework/QuickLook
- 0x62ad000 -  0x6556fff +CFNetwork i386  <9e89620b09f13b62a586f0afa7a77b0e> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/Frameworks/CFNetwork.framework/CFNetwork
- 0x66f7000 -  0x674dfff +AVKit i386  <8d76f7ed7615350f84e1b7b3dfeb0fe3> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/Frameworks/AVKit.framework/AVKit
- 0x6783000 -  0x6bf9fff +ModelIO i386  <21229f36186c3fb49c8d5cb86332ff4a> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/Frameworks/ModelIO.framework/ModelIO
- 0x6c42000 -  0x6c5dfff +ReplayKit i386  <cd6f08427e26340594656447fd0446b0> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/Frameworks/ReplayKit.framework/ReplayKit
- 0x6c71000 -  0x6c7bfff +LocalAuthentication i386  <2ca44e7fc1a933a2b5235fc14a211e91> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/Frameworks/LocalAuthentication.framework/LocalAuthentication
- 0x6c84000 -  0x6d50fff +CloudKit i386  <a6dec332f69037e68b99219c5c1e3f9e> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/Frameworks/CloudKit.framework/CloudKit
- 0x6dcb000 -  0x6e63fff +Contacts i386  <a8f760046c6e3426b91832498c5f6db8> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/Frameworks/Contacts.framework/Contacts
- 0x6ef6000 -  0x6f4cfff +WatchKit i386  <4a362e7fb7643247978ba597a2c1ef37> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/Frameworks/WatchKit.framework/WatchKit
- 0x6f92000 -  0x704cfff +HomeKit i386  <823ec5f7dc6d32e8b7f08be1394d8796> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/Frameworks/HomeKit.framework/HomeKit
- 0x70be000 -  0x7101fff +CoreSpotlight i386  <5f6f46872b903c81b208091ce1e09d5f> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/Frameworks/CoreSpotlight.framework/CoreSpotlight
- 0x7138000 -  0x7163fff +GameplayKit i386  <d260a342271f3e5ca7c57d38341297be> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/Frameworks/GameplayKit.framework/GameplayKit
- 0x7183000 -  0x722afff +HealthKit i386  <2f5c002641a73acb81087d20b9c60bfc> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/Frameworks/HealthKit.framework/HealthKit
- 0x72a0000 -  0x73e8fff +NetworkExtension i386  <82c6526b9c683d579f4180c44d847c3c> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/Frameworks/NetworkExtension.framework/NetworkExtension
- 0x7485000 -  0x7557fff +Photos i386  <ca850992c022380ab250fa3edcd95571> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/Frameworks/Photos.framework/Photos
- 0x75c9000 -  0x789cfff +SceneKit i386  <2132467c4c22357c8306f404257482c0> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/Frameworks/SceneKit.framework/SceneKit
- 0x79ce000 -  0x7cdffff +WebKit i386  <288309b11c7f357091f33c7ae0769674> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/Frameworks/WebKit.framework/WebKit
- 0x7fd5000 -  0x7fe4fff +NotificationCenter i386  <cc5175f535943919ba7ea9f8cb56f38c> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/Frameworks/NotificationCenter.framework/NotificationCenter
- 0x7ff5000 -  0x84b8fff +PhotosUI i386  <c42250815c5539768f70c86d30b31e25> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/Frameworks/PhotosUI.framework/PhotosUI
- 0x8767000 -  0x87a7fff +WatchConnectivity i386  <65d3c55f30bf3606b97e7d2f4ef900b8> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/Frameworks/WatchConnectivity.framework/WatchConnectivity
- 0x87cb000 -  0x88eafff +ContactsUI i386  <72d63d113fde322bb2fb4b09e55e99a6> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/Frameworks/ContactsUI.framework/ContactsUI
- 0x899c000 -  0x899ffff +PushKit i386  <c96882b711ac376a83d382163c089711> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/Frameworks/PushKit.framework/PushKit
- 0x89a6000 -  0x89bcfff +HealthKitUI i386  <4ac9463ef46638dea02837b32db2cc61> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/Frameworks/HealthKitUI.framework/HealthKitUI
- 0x89ce000 -  0x89dcfff +libz.1.dylib i386  <6fc251c2888d31028fa3c3556e088d25> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/usr/lib/libz.1.dylib
- 0x89e2000 -  0x8ad3fff +libiconv.2.dylib i386  <7aa359977f6731b2b4c25575a8f8a5f0> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/usr/lib/libiconv.2.dylib
- 0x8ae1000 -  0x8de7fff +libmonosgen-2.0.dylib i386  <ba4bff708be7390eaab96da7f8caa069> /Users/USER/Library/Developer/CoreSimulator/Devices/4E8A1839-B2A5-4C6E-9262-C603E709A19A/data/Containers/Bundle/Application/B06486E3-9435-4242-A6E8-A274E829B046/HockeySDKXamarinDemo.iOS.app/libmonosgen-2.0.dylib
- 0x8eea000 -  0x8f15fff +libmono-profiler-log.dylib i386  <a994b213b2213bd2b48d8ba5bcd063fe> /Users/USER/Library/Developer/CoreSimulator/Devices/4E8A1839-B2A5-4C6E-9262-C603E709A19A/data/Containers/Bundle/Application/B06486E3-9435-4242-A6E8-A274E829B046/HockeySDKXamarinDemo.iOS.app/libmono-profiler-log.dylib
- 0x8f2a000 -  0x8f2bfff +libSystem.dylib i386  <01eb7426130a3c20a18e4d9c4bf01988> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/usr/lib/libSystem.dylib
- 0x8f31000 -  0x92c1fff +CoreFoundation i386  <f4035e8702a637ec8bfb4ae09fc21f2b> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/Frameworks/CoreFoundation.framework/CoreFoundation
- 0x9407000 -  0x942afff +libc++abi.dylib i386  <85f7eb07fc8f3546928c47674d32fae8> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/usr/lib/libc++abi.dylib
- 0x9437000 -  0x9795fff +libobjc.A.dylib i386  <3e06280b8d383982b6e335a2a1cc05b0> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/usr/lib/libobjc.A.dylib
- 0x9813000 -  0x9817fff +libcache.dylib i386  <e4511ffaf788306b8b53667d606a2511> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/usr/lib/system/libcache.dylib
- 0x981d000 -  0x9828fff +libcommonCrypto.dylib i386  <f51f053bc2f83296815b3e109b5ebc49> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/usr/lib/system/libcommonCrypto.dylib
- 0x9835000 -  0x983afff +libcompiler_rt.dylib i386  <667119b7594b34b894f60969a0e27abb> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/usr/lib/system/libcompiler_rt.dylib
- 0x9845000 -  0x984dfff +libcopyfile.dylib i386  <ef6b543365143b18b4904530721b7411> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/usr/lib/system/libcopyfile.dylib
- 0x9854000 -  0x98bbfff +libcorecrypto.dylib i386  <7424144e48c23ed79141814d9d85acc8> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/usr/lib/system/libcorecrypto.dylib
- 0x98d1000 -  0x98f4fff +libdispatch.dylib i386  <415b82b061b83e878afb815d041c1648> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/usr/lib/system/libdispatch.dylib
- 0x9913000 -  0x9915fff +libdyld.dylib i386  <482f46fd73d8398597cba0ae1c8b7f5a> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/usr/lib/system/libdyld.dylib
- 0x991b000 -  0x991bfff +liblaunch.dylib i386  <7acade16610b379089eabb1dca61e4e9> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/usr/lib/system/liblaunch.dylib
- 0x9921000 -  0x9926fff +libmacho.dylib i386  <d4eae7fb0310396daeb0e4ede0854855> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/usr/lib/system/libmacho.dylib
- 0x992c000 -  0x992dfff +libremovefile.dylib i386  <310ff1cdfd02396ea027df6747b641f7> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/usr/lib/system/libremovefile.dylib
- 0x9933000 -  0x994cfff +libsystem_asl.dylib i386  <e59c8e1479843942a1de31bfe6920b09> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/usr/lib/system/libsystem_asl.dylib
- 0x9958000 -  0x9959fff +libsystem_blocks.dylib i386  <4e5d60d7bcde37f4af612c78b9e71d48> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/usr/lib/system/libsystem_blocks.dylib
- 0x995e000 -  0x99e4fff +libsystem_c.dylib i386  <e785fdce773f3ef5a0272587d734e2e5> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/usr/lib/system/libsystem_c.dylib
- 0x9a08000 -  0x9a0afff +libsystem_configuration.dylib i386  <6619f27c23ea30fda6fd323a4537445d> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/usr/lib/system/libsystem_configuration.dylib
- 0x9a11000 -  0x9a15fff +libsystem_containermanager.dylib i386  <ff1e9296526b3e818d925be5699732e3> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/usr/lib/system/libsystem_containermanager.dylib
- 0x9a1c000 -  0x9a1efff +libsystem_coreservices.dylib i386  <96937d969cdb33e7949d1dc28d4e3c68> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/usr/lib/system/libsystem_coreservices.dylib
- 0x9a24000 -  0x9a3bfff +libsystem_coretls.dylib i386  <bcce1b9fa21237af946a6ff33522b126> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/usr/lib/system/libsystem_coretls.dylib
- 0x9a45000 -  0x9a4dfff +libsystem_dnssd.dylib i386  <eff4c11b35923ff986e2e754e81edb48> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/usr/lib/system/libsystem_dnssd.dylib
- 0x9a54000 -  0x9a77fff +libsystem_info.dylib i386  <2aedc9033a0a3723b9b82b1b6f3c8bd8> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/usr/lib/system/libsystem_info.dylib
- 0x9a88000 -  0x9a8afff +libsystem_sim_kernel.dylib i386  <ad702135fcfe309d86f6f7a5ba791d7d> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/usr/lib/system/libsystem_sim_kernel.dylib
- 0x9a92000 -  0x9ac2fff +libsystem_m.dylib i386  <c6ee8b0e164132b38737c79f65b30152> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/usr/lib/system/libsystem_m.dylib
- 0x9aca000 -  0x9ae3fff +libsystem_malloc.dylib i386  <2589538eca343a03921063e30e91943b> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/usr/lib/system/libsystem_malloc.dylib
- 0x9aec000 -  0x9b50fff +libsystem_network.dylib i386  <8193e67f0bf939b59c51155d3106b1b8> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/usr/lib/system/libsystem_network.dylib
- 0x9b7f000 -  0x9b89fff +libsystem_notify.dylib i386  <eed2eed9c3a93133ba03270d8be6f170> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/usr/lib/system/libsystem_notify.dylib
- 0x9b91000 -  0x9b93fff +libsystem_sim_platform.dylib i386  <fa47bcb8aaea3f5fa7692c0590edcb3c> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/usr/lib/system/libsystem_sim_platform.dylib
- 0x9b99000 -  0x9b99fff +libsystem_sim_pthread.dylib i386  <a52f81725e7430e5835014aa8f6f4e63> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/usr/lib/system/libsystem_sim_pthread.dylib
- 0x9b9f000 -  0x9ba2fff +libsystem_sandbox.dylib i386  <28cf0728acc93313b7e0eeafdb58126d> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/usr/lib/system/libsystem_sandbox.dylib
- 0x9ba9000 -  0x9bbafff +libsystem_trace.dylib i386  <93af6a2aada4383e9127a41d68d0f610> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/usr/lib/system/libsystem_trace.dylib
- 0x9bc7000 -  0x9bcefff +libunwind.dylib i386  <0b0023d190d5360587f2f919cd1a5ced> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/usr/lib/system/libunwind.dylib
- 0x9bd5000 -  0x9bfcfff +libxpc.dylib i386  <6f98a9dab46e3a2b88d492f1ec77477f> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/usr/lib/system/libxpc.dylib
- 0x9c16000 -  0x9c1efff  libsystem_pthread.dylib i386  <80f0637e42be3c9da57801f1017c73a2> /usr/lib/system/libsystem_pthread.dylib
- 0x9c2a000 -  0x9c30fff  libsystem_platform.dylib i386  <d75f49003dea3197aabc278596c080ce> /usr/lib/system/libsystem_platform.dylib
- 0x9c39000 -  0x9c5afff  libsystem_kernel.dylib i386  <dbeb1ffdfb1a3551954224c7b480527d> /usr/lib/system/libsystem_kernel.dylib
- 0x9c6f000 -  0x9c74fff +TCC i386  <9f81db1143cd36f282b04de019bebd09> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/PrivateFrameworks/TCC.framework/TCC
- 0x9c7c000 -  0x9c8efff +ProtocolBuffer i386  <6652b7183c293627b1dc488028969065> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/PrivateFrameworks/ProtocolBuffer.framework/ProtocolBuffer
- 0x9c9e000 -  0x9cbcfff +MediaServices i386  <3f78aeefe4e6364c9e4212925b237189> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/PrivateFrameworks/MediaServices.framework/MediaServices
- 0x9cd7000 -  0x9dc3fff +ManagedConfiguration i386  <632a1bf151a5329889cf88b2e5a0585c> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/PrivateFrameworks/ManagedConfiguration.framework/ManagedConfiguration
- 0x9e50000 -  0x9e9efff +iTunesStore i386  <43f3170c684435fa924495ec38892de8> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/PrivateFrameworks/iTunesStore.framework/iTunesStore
- 0x9ed8000 -  0xa0f0fff +libicucore.A.dylib i386  <7dd549393da23724a28d0fde060435de> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/usr/lib/libicucore.A.dylib
- 0xa19f000 -  0xa1d9fff +Celestial i386  <b5da6937cfe13a95a1c8aed23b49f9d6> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/PrivateFrameworks/Celestial.framework/Celestial
- 0xa21d000 -  0xa233fff +GraphicsServices i386  <a9fb32c783da3b9994cde89255daca7a> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/PrivateFrameworks/GraphicsServices.framework/GraphicsServices
- 0xa248000 -  0xa276fff +SpringBoardServices i386  <ef427925816f3d018aaccaab1895422d> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/PrivateFrameworks/SpringBoardServices.framework/SpringBoardServices
- 0xa2a1000 -  0xa2edfff +AppSupport i386  <dfc2d989005d3771830ba774a14a03bc> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/PrivateFrameworks/AppSupport.framework/AppSupport
- 0xa320000 -  0xa50cfff +MusicLibrary i386  <95214c702603305cb88d30635ff85778> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/PrivateFrameworks/MusicLibrary.framework/MusicLibrary
- 0xa5e5000 -  0xa6e5fff +libsqlite3.dylib i386  <eb9056ca486b38f19ee0a8b2732bdae4> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/usr/lib/libsqlite3.dylib
- 0xa6fa000 -  0xa85efff +StoreServices i386  <6100199722293b54aca0d9fd09774f6e> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/PrivateFrameworks/StoreServices.framework/StoreServices
- 0xa96c000 -  0xa984fff +libMobileGestalt.dylib i386  <dec064cc5067306a97288fa9919c001e> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/usr/lib/libMobileGestalt.dylib
- 0xa9ab000 -  0xaa2afff +MediaRemote i386  <623db3ae79ac38878458b26959d3d99a> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/PrivateFrameworks/MediaRemote.framework/MediaRemote
- 0xaa94000 -  0xaaedfff +HomeSharing i386  <0817e0fe09a0347e8629fc500993520a> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/PrivateFrameworks/HomeSharing.framework/HomeSharing
- 0xab28000 -  0xab39fff +libbsm.0.dylib i386  <e23948cfa79138b99e97f204b6251e7e> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/usr/lib/libbsm.0.dylib
- 0xab41000 -  0xab62fff +libextension.dylib i386  <bc48b17dc74539e884872ba7f409939a> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/usr/lib/libextension.dylib
- 0xab7e000 -  0xabacfff +libarchive.2.dylib i386  <df9a2bb926aa368192cac9ee60f2cee5> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/usr/lib/libarchive.2.dylib
- 0xabb7000 -  0xacabfff +libxml2.2.dylib i386  <e770ab64747731b594a39b4bd11a6adf> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/usr/lib/libxml2.2.dylib
- 0xacda000 -  0xad40fff +IOKit i386  <db0fd4f3fdb536d4b3a9664b18901ba8> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/Frameworks/IOKit.framework/Versions/A/IOKit
- 0xad6e000 -  0xad8bfff +libCRFSuite.dylib i386  <f00a16f02f0031debf1b93dabca65b0e> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/usr/lib/libCRFSuite.dylib
- 0xad96000 -  0xad97fff +liblangid.dylib i386  <79adc033941036c2b4576f7ae0b74bbb> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/usr/lib/liblangid.dylib
- 0xad9c000 -  0xada9fff +libbz2.1.0.dylib i386  <b96dad0ffedf3ec0b940a2b0af9cc8e8> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/usr/lib/libbz2.1.0.dylib
- 0xadaf000 -  0xadc9fff +liblzma.5.dylib i386  <2978b08e174b3103ba8fa980b1dee1b0> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/usr/lib/liblzma.5.dylib
- 0xadd1000 -  0xb32cfff +vImage i386  <6fc9d5ba927f34058f6cc14194348182> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/Frameworks/Accelerate.framework/Frameworks/vImage.framework/vImage
- 0xb37f000 -  0xb37ffff +vecLib i386  <0a41e9615df83db6867229f305020db8> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/Frameworks/Accelerate.framework/Frameworks/vecLib.framework/vecLib
- 0xb382000 -  0xb4c0fff +libvDSP.dylib i386  <a22d86a1002c30deb6f0ccdc6b95c1ef> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/Frameworks/Accelerate.framework/Frameworks/vecLib.framework/libvDSP.dylib
- 0xb4ce000 -  0xb8a8fff +libLAPACK.dylib i386  <80e141a454dc37cd84cb6f6eb8e502da> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/Frameworks/Accelerate.framework/Frameworks/vecLib.framework/libLAPACK.dylib
- 0xb8d2000 -  0xba2bfff +libBLAS.dylib i386  <0d301c9654c83d29990d73201c306a1f> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/Frameworks/Accelerate.framework/Frameworks/vecLib.framework/libBLAS.dylib
- 0xba44000 -  0xbae6fff +libvMisc.dylib i386  <6f67ef6e60da3772bbacd050474ad03c> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/Frameworks/Accelerate.framework/Frameworks/vecLib.framework/libvMisc.dylib
- 0xbaf0000 -  0xbb07fff +libLinearAlgebra.dylib i386  <9b0dff204c09356a9fca887b901e0e82> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/Frameworks/Accelerate.framework/Frameworks/vecLib.framework/libLinearAlgebra.dylib
- 0xbb10000 -  0xbb28fff +libSparseBLAS.dylib i386  <c44e4d614eb936e6b2d215b86bef04ac> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/Frameworks/Accelerate.framework/Frameworks/vecLib.framework/libSparseBLAS.dylib
- 0xbb30000 -  0xbb56fff +BackBoardServices i386  <d295e58dd8f7336eaebeebead1aef90e> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/PrivateFrameworks/BackBoardServices.framework/BackBoardServices
- 0xbb7d000 -  0xbb89fff +AssertionServices i386  <eadc8d399f1b33c29e6fb0a9a58941f6> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/PrivateFrameworks/AssertionServices.framework/AssertionServices
- 0xbb9a000 -  0xbbf2fff +BaseBoard i386  <6894551185583ce6ad574c65f6d3991a> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/PrivateFrameworks/BaseBoard.framework/BaseBoard
- 0xbc3a000 -  0xbc7bfff +AppleJPEG i386  <81d9e856bc3a388bb4de1b683c3222e6> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/PrivateFrameworks/AppleJPEG.framework/AppleJPEG
- 0xbc87000 -  0xbcacfff +PersistentConnection i386  <4a61884fe29a38ddabc61cefe275bf6b> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/PrivateFrameworks/PersistentConnection.framework/PersistentConnection
- 0xbccb000 -  0xbcd0fff +DataMigration i386  <ea61199ccefd3d2c8c36faaf53a11ea8> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/PrivateFrameworks/DataMigration.framework/DataMigration
- 0xbcd9000 -  0xbcdcfff +OAuth i386  <584040803b7938ee8789c2c3463ca2f2> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/PrivateFrameworks/OAuth.framework/OAuth
- 0xbce2000 -  0xbcedfff +UserNotificationServices i386  <d84ce27b6a4831cdab2055cd8baa8142> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/PrivateFrameworks/UserNotificationServices.framework/UserNotificationServices
- 0xbcfd000 -  0xbd3afff +FrontBoardServices i386  <7980f6a6e5ea3bfc91c03f88acc236f6> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/PrivateFrameworks/FrontBoardServices.framework/FrontBoardServices
- 0xbd77000 -  0xbd8dfff +libcompression.dylib i386  <17bf7c90de5331bea52554a0b97cee87> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/usr/lib/libcompression.dylib
- 0xbd94000 -  0xbda1fff +CommonUtilities i386  <e729a08a684b3ba3ab50675128c8b02a> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/PrivateFrameworks/CommonUtilities.framework/CommonUtilities
- 0xbdac000 -  0xbdb2fff +libcupolicy.dylib i386  <21c98908ea69369fafd0bc06ac9d80d1> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/usr/lib/libcupolicy.dylib
- 0xbdbc000 -  0xbdf2fff +libTelephonyUtilDynamic.dylib i386  <26589462f0af3ee78e53b668b7679a9e> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/usr/lib/libTelephonyUtilDynamic.dylib
- 0xbe2d000 -  0xbe50fff +AuthKit i386  <d836ff3ef8573e50bd3e22d0c6cd34a0> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/PrivateFrameworks/AuthKit.framework/AuthKit
- 0xbe6d000 -  0xbebdfff +CoreAudio i386  <e98afc48a42d346ab53a2b9c57deb02b> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/Frameworks/CoreAudio.framework/CoreAudio
- 0xbede000 -  0xc203fff +VideoToolbox i386  <0b6eb01e87cd3a44a746e1c99aa51264> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/Frameworks/VideoToolbox.framework/VideoToolbox
- 0xc27b000 -  0xc57cfff +MediaToolbox i386  <2555c6a5d6e93fe589bff0a07e0ac112> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/Frameworks/MediaToolbox.framework/MediaToolbox
- 0xc669000 -  0xc673fff +libGFXShared.dylib i386  <190164b50fd53fd9896c0d6d57515287> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/Frameworks/OpenGLES.framework/libGFXShared.dylib
- 0xc67a000 -  0xc6c0fff +libGLImage.dylib i386  <49f156e090893290be25472611095dea> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/Frameworks/OpenGLES.framework/libGLImage.dylib
- 0xc6ca000 -  0xc6ccfff +libCVMSPluginSupport.dylib i386  <bfd0d0ad503435eb8889fe944ad98df7> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/Frameworks/OpenGLES.framework/libCVMSPluginSupport.dylib
- 0xc6d2000 -  0xc6dafff +libCoreVMClient.dylib i386  <aa88ae17f38b3f13afc062a745fd0888> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/Frameworks/OpenGLES.framework/libCoreVMClient.dylib
- 0xc6e2000 -  0xd47ffff +libLLVMContainer.dylib i386  <6ffc07158eef333a988e1c1e95a9e057> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/Frameworks/OpenGLES.framework/libLLVMContainer.dylib
- 0xd775000 -  0xd778fff +SimulatorClient i386  <543fe3e81bdc391d8ffb036e5a733cb9> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/PrivateFrameworks/SimulatorClient.framework/SimulatorClient
- 0xd77f000 -  0xd77ffff +FontServices i386  <ed766e8b851932e48986f22bc36239d5> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/PrivateFrameworks/FontServices.framework/FontServices
- 0xd784000 -  0xd86afff +libFontParser.dylib i386  <6380e000b5f0357180ab6d1a727116bb> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/PrivateFrameworks/FontServices.framework/libFontParser.dylib
- 0xd8fc000 -  0xd9f0fff +UIFoundation i386  <902d8b8ca8353c729c43ae5afaef0cc7> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/PrivateFrameworks/UIFoundation.framework/UIFoundation
- 0xda4c000 -  0xdb15fff +CoreUI i386  <4a3498741ae03a9e91126c49a777b0c7> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/PrivateFrameworks/CoreUI.framework/CoreUI
- 0xdbc2000 -  0xdbd2fff +MobileAsset i386  <0e29a78de71631e296a9d0c632bf5a59> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/PrivateFrameworks/MobileAsset.framework/MobileAsset
- 0xdbe0000 -  0xdc07fff +DictionaryServices i386  <be4e525ebf00337fbd8a07bfef16d73c> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/PrivateFrameworks/DictionaryServices.framework/DictionaryServices
- 0xdc28000 -  0xdc5ffff +TextInput i386  <ad52e4b83fb7358a8572f0a57f78b8de> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/PrivateFrameworks/TextInput.framework/TextInput
- 0xdc91000 -  0xdd82fff +WebKitLegacy i386  <0df0e7f8ce4e385db47a54a17e695b64> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/PrivateFrameworks/WebKitLegacy.framework/WebKitLegacy
- 0xde27000 -  0xef20fff +WebCore i386  <81b3a4de21ed3474bdbe5d42daeaa715> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/PrivateFrameworks/WebCore.framework/WebCore
- 0xf6e9000 -  0xf7c7fff +ProofReader i386  <524e2348ac6b3c7381ef3f71e0c55d5d> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/PrivateFrameworks/ProofReader.framework/ProofReader
- 0xf7f1000 -  0xf7fefff +libAccessibility.dylib i386  <7bb37f94b1103858a2c2fb0357235494> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/usr/lib/libAccessibility.dylib
- 0xf811000 -  0xf86dfff +PhysicsKit i386  <335c85e566e53068b1adf8ba4399afff> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/PrivateFrameworks/PhysicsKit.framework/PhysicsKit
- 0xf893000 -  0xfccafff +FaceCore i386  <c8f224456dc13826bc4ef23bf8e9182e> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/PrivateFrameworks/FaceCore.framework/FaceCore
- 0xfedf000 -  0xff46fff +ColorSync i386  <dece51230d0f3a9b9d45d53e0b3fb526> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/PrivateFrameworks/ColorSync.framework/ColorSync
- 0xff66000 -  0xff6afff +AggregateDictionary i386  <d8187c0ba4033b67bfc24e1a00b3e8d4> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/PrivateFrameworks/AggregateDictionary.framework/AggregateDictionary
- 0xff72000 -  0xff9cfff +libxslt.1.dylib i386  <89a8ed51dd2c37f68f0e9a72a205e018> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/usr/lib/libxslt.1.dylib
- 0xffa9000 -  0xffc0fff +libmarisa.dylib i386  <795e862e9d123710b8caf0611ffc5787> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/usr/lib/libmarisa.dylib
- 0xffcd000 - 0x1005efff +LanguageModeling i386  <831a38488f5a3d17acf99a60bf1c9f1c> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/PrivateFrameworks/LanguageModeling.framework/LanguageModeling
-0x10071000 - 0x10084fff +libcmph.dylib i386  <82cce122fb2b3438b28477699d522082> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/usr/lib/libcmph.dylib
-0x1008d000 - 0x10093fff +DAAPKit i386  <4c46062db6253b8e9c72275dc1131e06> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/PrivateFrameworks/DAAPKit.framework/DAAPKit
-0x1009f000 - 0x1011cfff +libAVFAudio.dylib i386  <fa6423e25f473b3ba4fa3a38b5dd32a7> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/Frameworks/AVFoundation.framework/libAVFAudio.dylib
-0x1016b000 - 0x10178fff +IntlPreferences i386  <3d59ec9d79f63b338389543ec0fa9f8c> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/PrivateFrameworks/IntlPreferences.framework/IntlPreferences
-0x10184000 - 0x10186fff +BTLEAudioController i386  <656c0cca354432758bd6f7d7a0e736b1> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/PrivateFrameworks/BTLEAudioController.framework/BTLEAudioController
-0x1018c000 - 0x101b7fff +AccountsUI i386  <3de3e23e3d1b350da43f3bf45853ebe2> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/PrivateFrameworks/AccountsUI.framework/AccountsUI
-0x101d2000 - 0x101f0fff +PlugInKit i386  <26f9018a62ff364d8f98cb24e95a2916> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/PrivateFrameworks/PlugInKit.framework/PlugInKit
-0x10206000 - 0x102dbfff +CorePDF i386  <55ffc177ba173125b9f64030d838a0a5> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/PrivateFrameworks/CorePDF.framework/CorePDF
-0x1033e000 - 0x1035cfff +CertInfo i386  <551ad80325273ad08ec4ae3d66012215> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/PrivateFrameworks/CertInfo.framework/CertInfo
-0x10371000 - 0x10377fff +CertUI i386  <673efc24a79a3605ad91a5ad88a43102> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/PrivateFrameworks/CertUI.framework/CertUI
-0x10380000 - 0x1046ffff +Preferences i386  <3313a8a3c71538cc9fac3cbc762fa4b9> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/PrivateFrameworks/Preferences.framework/Preferences
-0x104fe000 - 0x10523fff +ProtectedCloudStorage i386  <9822fc66a48d3a268d7442f83f138e99> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/PrivateFrameworks/ProtectedCloudStorage.framework/ProtectedCloudStorage
-0x1053e000 - 0x10573fff +NanoRegistry i386  <679e182471be3f449c60d84c2aaaab1b> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/PrivateFrameworks/NanoRegistry.framework/NanoRegistry
-0x1059a000 - 0x105a2fff +MobileIcons i386  <6d1905c6fcaf3780a4fb213c40b08bc0> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/PrivateFrameworks/MobileIcons.framework/MobileIcons
-0x105ac000 - 0x105b3fff +BluetoothManager i386  <ae56bc230df23d63b31388e823d9fe19> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/PrivateFrameworks/BluetoothManager.framework/BluetoothManager
-0x105bd000 - 0x105c1fff +libheimdal-asn1.dylib i386  <7df87f5623353f6eafa27f76c44ddba7> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/usr/lib/libheimdal-asn1.dylib
-0x105c8000 - 0x105c9fff +DiagnosticLogCollection i386  <a4291fb577d23d18b010c60ec052c2f5> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/PrivateFrameworks/DiagnosticLogCollection.framework/DiagnosticLogCollection
-0x105cf000 - 0x10659fff +IDS i386  <27aa22207ecf317ea1c2f90b98579312> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/PrivateFrameworks/IDS.framework/IDS
-0x1067e000 - 0x106eefff +IMFoundation i386  <102c05bc22533a20afee28ad340d7f05> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/PrivateFrameworks/IMFoundation.framework/IMFoundation
-0x10726000 - 0x10757fff +libtidy.A.dylib i386  <f80990fab318314aa981acea7876d091> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/usr/lib/libtidy.A.dylib
-0x10765000 - 0x10766fff +Marco i386  <b519490c012f39a3a6fe320a377d2336> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/PrivateFrameworks/Marco.framework/Marco
-0x1076c000 - 0x1079afff +IDSFoundation i386  <97c9c8205b2d3209a389120ce53a1339> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/PrivateFrameworks/IDSFoundation.framework/IDSFoundation
-0x107bb000 - 0x10cedfff +GeoServices i386  <7b27c4af92cd3d97b1925ac6eca125bc> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/PrivateFrameworks/GeoServices.framework/GeoServices
-0x10fa2000 - 0x10fb2fff +CacheDelete i386  <051769437e823bf9bfe68ec719f4f3a5> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/PrivateFrameworks/CacheDelete.framework/CacheDelete
-0x10fbe000 - 0x10fe7fff +DataAccessExpress i386  <b9096595461b35aa98fcefe109ee2720> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/PrivateFrameworks/DataAccessExpress.framework/DataAccessExpress
-0x11005000 - 0x11010fff +MobileBluetooth i386  <c1382192986135cf9c2a5bc06eaa35b3> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/PrivateFrameworks/MobileBluetooth.framework/MobileBluetooth
-0x1101a000 - 0x11023fff +DCIMServices i386  <473be4f0ffc43e4a8e926909eacf2abd> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/PrivateFrameworks/DCIMServices.framework/DCIMServices
-0x11032000 - 0x113cdfff +PhotoLibraryServices i386  <7a67cb917f3e3870a94408d49d7b1966> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/PrivateFrameworks/PhotoLibraryServices.framework/PhotoLibraryServices
-0x115a5000 - 0x115cbfff +AssetsLibraryServices i386  <3cc2b12c575e3a968c2c876cb4f00c30> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/PrivateFrameworks/AssetsLibraryServices.framework/AssetsLibraryServices
-0x115ee000 - 0x115f8fff +UserManagement i386  <850a888a7e8b3acfb9e8ab8dd8fe4b96> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/PrivateFrameworks/UserManagement.framework/UserManagement
-0x11603000 - 0x11701fff +CloudPhotoLibrary i386  <db291c973a8232e5bd07bd2af4fdb351> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/PrivateFrameworks/CloudPhotoLibrary.framework/CloudPhotoLibrary
-0x11775000 - 0x117f5fff +MMCS i386  <d583df096ca43d999a4db554c26cd946> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/PrivateFrameworks/MMCS.framework/MMCS
-0x11827000 - 0x1182dfff +AssetCacheServices i386  <c6a9b9179b313b97a422fce3d21e06c1> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/PrivateFrameworks/AssetCacheServices.framework/AssetCacheServices
-0x11838000 - 0x11864fff +ChunkingLibrary i386  <72a94f12654c36419e6eb7c3e7b100d0> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/PrivateFrameworks/ChunkingLibrary.framework/ChunkingLibrary
-0x11871000 - 0x11878fff +CloudPhotoServices i386  <0442c813d67831a1b7f77232b1a7193b> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/PrivateFrameworks/CloudPhotoServices.framework/CloudPhotoServices
-0x11880000 - 0x1197efff +CameraKit i386  <341ae457e5633f8ea2e0c0ea68b34793> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/PrivateFrameworks/CameraKit.framework/CameraKit
-0x11a12000 - 0x11a57fff +AppleAccount i386  <ebb2d4ac54003dd1b5d4fca987c4eb23> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/PrivateFrameworks/AppleAccount.framework/AppleAccount
-0x11a8f000 - 0x11aaafff +PhotosFormats i386  <bfb7e6835672393dbce1e889a30c15af> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/PrivateFrameworks/PhotosFormats.framework/PhotosFormats
-0x11abf000 - 0x11b03fff +ContentIndex i386  <d345b388ca12345fae7f8fa1c313296d> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/PrivateFrameworks/ContentIndex.framework/ContentIndex
-0x11b22000 - 0x11c78fff +CoreMediaStream i386  <80263281a8f930358db2847520a19377> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/PrivateFrameworks/CoreMediaStream.framework/CoreMediaStream
-0x11d0b000 - 0x11d27fff +MediaStream i386  <ffe6bf4e185532ce8ec4c90e8e8042cf> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/PrivateFrameworks/MediaStream.framework/MediaStream
-0x11d42000 - 0x11d43fff +AppleIDSSOAuthentication i386  <a8cd177464d036c798201bb40a81e5fa> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/PrivateFrameworks/AppleIDSSOAuthentication.framework/AppleIDSSOAuthentication
-0x11d49000 - 0x11db7fff +AccountsDaemon i386  <457b2c95dadd3701a170b32433c27d9c> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/PrivateFrameworks/AccountsDaemon.framework/AccountsDaemon
-0x11de8000 - 0x11decfff +AOSNotification i386  <6f311ee8e9483d989d577d65d1f4fac1> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/PrivateFrameworks/AOSNotification.framework/AOSNotification
-0x11df4000 - 0x11e05fff +MailServices i386  <d2939505fdaf310285b3f992afb8b71d> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/PrivateFrameworks/MailServices.framework/MailServices
-0x11e18000 - 0x11e2ffff +ApplePushService i386  <77c5f3bc1d8a3b0fa627ded739fe775a> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/PrivateFrameworks/ApplePushService.framework/ApplePushService
-0x11e44000 - 0x11e70fff +GSS i386  <237542822ca735d9bc1cd52f07c02179> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/Frameworks/GSS.framework/GSS
-0x11e8a000 - 0x11f00fff +Heimdal i386  <4089d052c0dd346b9d74ba33c909553c> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/PrivateFrameworks/Heimdal.framework/Heimdal
-0x11f27000 - 0x11f45fff +libresolv.9.dylib i386  <55621c48edf33625af2933735a990f54> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/usr/lib/libresolv.9.dylib
-0x11f4f000 - 0x11f51fff +CommonAuth i386  <a0a769dc9cc13ca695dbbdbb4a53786a> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/PrivateFrameworks/CommonAuth.framework/CommonAuth
-0x11f57000 - 0x11f60fff +FMCoreLite i386  <e167db30d14d34fcb0eca68cb5ab4553> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/PrivateFrameworks/FMCoreLite.framework/FMCoreLite
-0x11f6c000 - 0x11fbafff +MIME i386  <c36aa8bd250735108700691baa7fe38d> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/PrivateFrameworks/MIME.framework/MIME
-0x11fe8000 - 0x11febfff +MessageSupport i386  <c1c10b452ec33f7488984a1ae9cc36a1> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/PrivateFrameworks/MessageSupport.framework/MessageSupport
-0x11ff3000 - 0x12169fff +MobileSpotlightIndex i386  <324f331a8a1e399181676d9cf764f5d4> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/PrivateFrameworks/MobileSpotlightIndex.framework/MobileSpotlightIndex
-0x121a5000 - 0x12441fff +libmecabra.dylib i386  <fbad9effd3fb32ca88503d11fe5e5db1> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/usr/lib/libmecabra.dylib
-0x12494000 - 0x12499fff +ConstantClasses i386  <45898ef821633299ab47aeddb2da05e0> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/PrivateFrameworks/ConstantClasses.framework/ConstantClasses
-0x124a1000 - 0x124abfff +libChineseTokenizer.dylib i386  <e15d22c535ff3b28bc52a99289b185c5> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/usr/lib/libChineseTokenizer.dylib
-0x124ba000 - 0x124c1fff +XPCKit i386  <70bacfaee7a93396adaaf6ec8143c1c7> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/PrivateFrameworks/XPCKit.framework/XPCKit
-0x124cb000 - 0x124cffff +CommunicationsFilter i386  <198f64fd6014354aa13b753e24b6381a> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/PrivateFrameworks/CommunicationsFilter.framework/CommunicationsFilter
-0x124d5000 - 0x124f7fff +vCard i386  <30fa4411ce413407bb7c44c38f5d53c2> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/PrivateFrameworks/vCard.framework/vCard
-0x1251b000 - 0x12546fff +ContactsFoundation i386  <84e62d184cfd3e3186689db5dc06e3ad> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/PrivateFrameworks/ContactsFoundation.framework/ContactsFoundation
-0x12576000 - 0x1257bfff +ParsecSubscriptionServiceSupport i386  <38ebdbf7b10230789abaa387c12db24b> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/PrivateFrameworks/ParsecSubscriptionServiceSupport.framework/ParsecSubscriptionServiceSupport
-0x12583000 - 0x125affff +SafariSafeBrowsing i386  <c28729b5697738618c02a84f6f7c7284> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/PrivateFrameworks/SafariSafeBrowsing.framework/SafariSafeBrowsing
-0x125d9000 - 0x12645fff +TelephonyUtilities i386  <1b052b44317f3ab88f4d3a582488ec2c> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/PrivateFrameworks/TelephonyUtilities.framework/TelephonyUtilities
-0x12691000 - 0x126c9fff +WebBookmarks i386  <b132e6af6ffe308ebb62aa357780885d> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/PrivateFrameworks/WebBookmarks.framework/WebBookmarks
-0x126e7000 - 0x12727fff +WebUI i386  <bd8f1412425938a2898773d962ac62a7> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/PrivateFrameworks/WebUI.framework/WebUI
-0x12751000 - 0x12754fff +IncomingCallFilter i386  <488351a558a23c228cf0aad9a17145b9> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/PrivateFrameworks/IncomingCallFilter.framework/IncomingCallFilter
-0x1275a000 - 0x12905fff +SafariShared i386  <ce3cc868a342384dbc7552de10236a6a> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/PrivateFrameworks/SafariShared.framework/SafariShared
-0x129d5000 - 0x129dbfff +SharedUtils i386  <d471837a286934fb88f0862176fa0510> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/Frameworks/LocalAuthentication.framework/Support/SharedUtils.framework/SharedUtils
-0x129e4000 - 0x129e4fff +LegacyHandle i386  <1df1205c09363d859c180202fc1f1c37> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/PrivateFrameworks/GameKitServices.framework/Frameworks/LegacyHandle.framework/LegacyHandle
-0x129e9000 - 0x12a1bfff +ICE i386  <46baa222d4253060b6e22d8a6672678d> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/PrivateFrameworks/GameKitServices.framework/Frameworks/ICE.framework/ICE
-0x12a25000 - 0x12a36fff +ViceroyTrace i386  <663455e8fa6d3b8baaf4d2855c6f36c1> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/PrivateFrameworks/GameKitServices.framework/Frameworks/ViceroyTrace.framework/ViceroyTrace
-0x12a43000 - 0x12a4efff +SimpleKeyExchange i386  <45bbb92376803b389430d95adf348521> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/PrivateFrameworks/GameKitServices.framework/Frameworks/SimpleKeyExchange.framework/SimpleKeyExchange
-0x12a59000 - 0x12a5afff +snatmap i386  <e4c66d2f694e3949a63ef1c72ceb8c1a> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/PrivateFrameworks/GameKitServices.framework/Frameworks/snatmap.framework/snatmap
-0x12a5f000 - 0x12a5ffff +GameCenter i386  <c73c4ad760fc3f2d9420d4411c3ea497> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/PrivateFrameworks/GameCenter.framework/GameCenter
-0x12a63000 - 0x12a74fff +Jet i386  <255de1ab59143f9ea6855388df79f38d> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/PrivateFrameworks/Jet.framework/Jet
-0x12a88000 - 0x12ab5fff +OpenAL i386  <c009f48abd723e63a2ab792bc9ce8425> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/Frameworks/OpenAL.framework/OpenAL
-0x12ac5000 - 0x12b02fff +Metal i386  <c718ea2f19113f3e857519a43f3705f8> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/Frameworks/Metal.framework/Metal
-0x12b5a000 - 0x12b5dfff +libCoreFSCache.dylib i386  <ab19e7e48f083bc0bbc82294162fd3bd> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/Frameworks/OpenGLES.framework/libCoreFSCache.dylib
-0x12b63000 - 0x12c25fff +GameCenterFoundation i386  <e774a56d528e3618a6c740082d2041f4> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/PrivateFrameworks/GameCenterFoundation.framework/GameCenterFoundation
-0x12cba000 - 0x12d20fff +GameCenterUI i386  <af609ce7af293095a7ccf31422bb677c> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/PrivateFrameworks/GameCenterUI.framework/GameCenterUI
-0x12d78000 - 0x12d89fff +LegacyGameKit i386  <433c4c8967af34329beea87c660be2ab> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/PrivateFrameworks/LegacyGameKit.framework/LegacyGameKit
-0x12d94000 - 0x12db1fff +AuthKitUI i386  <5eb696ab69aa3b7f9e54530c5a14e2fa> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/PrivateFrameworks/AuthKitUI.framework/AuthKitUI
-0x12dc6000 - 0x12e5bfff +GameKitServices i386  <57824352c5ff3323a9d23c32fafb188c> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/PrivateFrameworks/GameKitServices.framework/GameKitServices
-0x12e91000 - 0x12eebfff +RemoteUI i386  <3d04b49bf231372a87ec2c7d3b6618aa> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/PrivateFrameworks/RemoteUI.framework/RemoteUI
-0x12f17000 - 0x13073fff +AVConference i386  <9d899960c8ce358c867be77af123eca8> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/PrivateFrameworks/GameKitServices.framework/Frameworks/AVConference.framework/AVConference
-0x130f4000 - 0x13125fff +FTServices i386  <e1899d1605c0316fa08b41d98f8d9070> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/PrivateFrameworks/FTServices.framework/FTServices
-0x13136000 - 0x13184fff +AppleAccountUI i386  <938b0c4b4ee936168b33e19031730f14> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/PrivateFrameworks/AppleAccountUI.framework/AppleAccountUI
-0x131b9000 - 0x131cdfff +CoreCDPUI i386  <b5bec5ed9c8032df8c943d368235c4b0> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/PrivateFrameworks/CoreCDPUI.framework/CoreCDPUI
-0x131de000 - 0x131e6fff +FindMyDevice i386  <32136844b32b3ceab6137efa60b7c35f> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/PrivateFrameworks/FindMyDevice.framework/FindMyDevice
-0x131f0000 - 0x13245fff +DataAccess i386  <289b074999583a4eb656119f3b8b171a> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/PrivateFrameworks/DataAccess.framework/DataAccess
-0x13273000 - 0x133adfff +Message i386  <099bc053188936df989ce6791c3c3a7e> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/PrivateFrameworks/Message.framework/Message
-0x1345e000 - 0x134c8fff +IMAP i386  <2e93e23df18333eb8258b95ac7d6990c> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/PrivateFrameworks/Message.framework/MailServices/IMAP.framework/IMAP
-0x134fd000 - 0x13508fff +CoreCDP i386  <c6a97395e8873cbeadb98a794d90582b> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/PrivateFrameworks/CoreCDP.framework/CoreCDP
-0x13514000 - 0x1351cfff +CloudServices i386  <089e79911b493197b07568c6ef0e60ce> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/PrivateFrameworks/CloudServices.framework/CloudServices
-0x13525000 - 0x1355dfff +ContactsAutocomplete i386  <8cfd8227dc5034e2808906e2af8c747e> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/PrivateFrameworks/ContactsAutocomplete.framework/ContactsAutocomplete
-0x13592000 - 0x13623fff +CalendarDatabase i386  <d28ff48ffc2331b3b6c70288a683020b> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/PrivateFrameworks/CalendarDatabase.framework/CalendarDatabase
-0x13676000 - 0x13682fff +CoreRecents i386  <cbff39bdb98c33569859298da13a21e6> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/PrivateFrameworks/CoreRecents.framework/CoreRecents
-0x13690000 - 0x13692fff +FTClientServices i386  <97f9affd76e33d41a773573336629894> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/PrivateFrameworks/FTClientServices.framework/FTClientServices
-0x13698000 - 0x136e9fff +CalendarFoundation i386  <28b6418e2e8b309cbea6903702b96eac> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/PrivateFrameworks/CalendarFoundation.framework/CalendarFoundation
-0x1371e000 - 0x13756fff +iCalendar i386  <ddd7689174ad3b958091e3430017a440> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/PrivateFrameworks/iCalendar.framework/iCalendar
-0x13776000 - 0x137b2fff +CalendarDaemon i386  <944b57afeba33efd964163151330654c> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/PrivateFrameworks/CalendarDaemon.framework/CalendarDaemon
-0x137de000 - 0x13f6cfff +VectorKit i386  <421500eab3ee39aea3e8b0752348b999> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/PrivateFrameworks/VectorKit.framework/VectorKit
-0x1419e000 - 0x141d4fff +Bom i386  <02d75f0db1463a7ea018f09fb64d4ca3> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/PrivateFrameworks/Bom.framework/Bom
-0x141e4000 - 0x1424dfff +CoreDAV i386  <d6c2fc9b5dfc37389e0b5382db186c11> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/PrivateFrameworks/CoreDAV.framework/CoreDAV
-0x14299000 - 0x142dffff +Notes i386  <2bee920b627c3e66840586e32bb02953> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/PrivateFrameworks/Notes.framework/Notes
-0x1430a000 - 0x14319fff +QuickLookThumbnailing i386  <8c16e7e1911a3190bef6f408354172ca> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/PrivateFrameworks/QuickLookThumbnailing.framework/QuickLookThumbnailing
-0x14328000 - 0x14342fff +GenerationalStorage i386  <731c669aa6813ed2b48593ef24483741> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/PrivateFrameworks/GenerationalStorage.framework/GenerationalStorage
-0x14353000 - 0x1436efff +SiriTasks i386  <602644ff973e3379a5daad41f4f2be7b> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/PrivateFrameworks/SiriTasks.framework/SiriTasks
-0x14389000 - 0x1441ffff +PhotoEditSupport i386  <f4a71128e8023d5fb341577c796cf50a> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/PrivateFrameworks/PhotoEditSupport.framework/PhotoEditSupport
-0x14463000 - 0x1447cfff +iPhotoMigrationSupport i386  <de34f24e3fe733008cdfbf340f23e397> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/PrivateFrameworks/iPhotoMigrationSupport.framework/iPhotoMigrationSupport
-0x1448c000 - 0x14569fff +PhotoLibrary i386  <30079e4de5c53695ab6bf6a64760973e> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/PrivateFrameworks/PhotoLibrary.framework/PhotoLibrary
-0x145fa000 - 0x1464bfff +SAObjects i386  <c9967b0134b533a59626c0a67509d400> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/PrivateFrameworks/SAObjects.framework/SAObjects
-0x147c1000 - 0x1481dfff +AssistantServices i386  <cbffb83965c83814822607653bd6ebb9> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/PrivateFrameworks/AssistantServices.framework/AssistantServices
-0x1486a000 - 0x14890fff +VoiceServices i386  <8b539be5df5334c4b2eed922a046576a> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/PrivateFrameworks/VoiceServices.framework/VoiceServices
-0x148b2000 - 0x148c5fff +ImageCapture i386  <aaba304516563a59b9107853b8e07628> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/PrivateFrameworks/ImageCapture.framework/ImageCapture
-0x148d7000 - 0x148fffff +CalendarUIKit i386  <74ac7219edd83479a1b50aba417fd7b7> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/PrivateFrameworks/CalendarUIKit.framework/CalendarUIKit
-0x14914000 - 0x14935fff +DataDetectorsCore i386  <040a793256eb39aba198001a6707736b> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/PrivateFrameworks/DataDetectorsCore.framework/DataDetectorsCore
-0x1494c000 - 0x1495dfff +IAP i386  <7b0428386c1f3a55b8b4279690459103> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/PrivateFrameworks/IAP.framework/IAP
-0x14971000 - 0x14a4cfff +PassKitCore i386  <870b53cd467735cb9e8649b9ad3ce298> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/PrivateFrameworks/PassKitCore.framework/PassKitCore
-0x14aed000 - 0x14af8fff +BridgePreferences i386  <17329d68e6ad39de9b0a1ef523a678ed> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/PrivateFrameworks/BridgePreferences.framework/BridgePreferences
-0x14b04000 - 0x14b3efff +SpringBoardUIServices i386  <a8d177525be93818bdacee6bb9ca827f> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/PrivateFrameworks/SpringBoardUIServices.framework/SpringBoardUIServices
-0x14b69000 - 0x14b72fff +MobileInstallation i386  <4bac0abc8bfd312fa7dcd57efb5db18c> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/PrivateFrameworks/MobileInstallation.framework/MobileInstallation
-0x14b7c000 - 0x14ba0fff +ToneLibrary i386  <e72ceadef7403fc094e77a790cdfb521> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/PrivateFrameworks/ToneLibrary.framework/ToneLibrary
-0x14bbb000 - 0x14bcafff +NanoPreferencesSync i386  <af45e00efc5e3ef8bd20802e001d8340> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/PrivateFrameworks/NanoPreferencesSync.framework/NanoPreferencesSync
-0x14bd8000 - 0x14be1fff +NanoGlanceSettings i386  <3000ab36df283e7380ad55bdcea21043> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/PrivateFrameworks/NanoGlanceSettings.framework/NanoGlanceSettings
-0x14bec000 - 0x14c25fff +PBBridgeSupport i386  <cf37777cd2d9327581dc1efa275ea546> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/PrivateFrameworks/PBBridgeSupport.framework/PBBridgeSupport
-0x14c4d000 - 0x14cdffff +BulletinBoard i386  <20caae5f4a4e3d168c28fc89aa7839f5> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/PrivateFrameworks/BulletinBoard.framework/BulletinBoard
-0x14d48000 - 0x14d53fff +AppConduit i386  <918e0c4ca685386687b27fdf6dcc9ebe> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/PrivateFrameworks/AppConduit.framework/AppConduit
-0x14d5f000 - 0x14d62fff +MobileSystemServices i386  <ecca0f645ed33f62b57a97ce8d88bafd> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/PrivateFrameworks/MobileSystemServices.framework/MobileSystemServices
-0x14d69000 - 0x14d70fff +CoreTime i386  <bc943edd19693c70a090326721631321> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/PrivateFrameworks/CoreTime.framework/CoreTime
-0x14d7a000 - 0x14d86fff +NotificationsUI i386  <ef16f900f7f13461930a426053f86023> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/PrivateFrameworks/NotificationsUI.framework/NotificationsUI
-0x14d96000 - 0x14dfafff +SpringBoardFoundation i386  <41931015e3ce304a8c26ea0a76b4716c> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/PrivateFrameworks/SpringBoardFoundation.framework/SpringBoardFoundation
-0x14e3f000 - 0x14e8ffff +TelephonyUI i386  <a3c95557eaf63f7b8ab44a1f0ce95051> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/PrivateFrameworks/TelephonyUI.framework/TelephonyUI
-0x14eb8000 - 0x14ebdfff +ProgressUI i386  <9dba094c05243ea58aa6493560bedbb4> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/PrivateFrameworks/ProgressUI.framework/ProgressUI
-0x14ec4000 - 0x14ecbfff +BaseBoardUI i386  <172978fae72c3f6faa368d06a2f89a0e> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/PrivateFrameworks/BaseBoardUI.framework/BaseBoardUI
-0x14ed5000 - 0x14edcfff +iAdServices i386  <5176024e69e9362b94aa88b136d1b94c> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/PrivateFrameworks/iAdServices.framework/iAdServices
-0x14ee3000 - 0x14eeafff +AITTarget i386  <006a2f37665a3613851135b0212a07ee> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/PrivateFrameworks/AITTarget.framework/AITTarget
-0x14ef3000 - 0x14f1efff +Pegasus i386  <be8a1597f7733922ba9423a82425d05f> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/PrivateFrameworks/Pegasus.framework/Pegasus
-0x14f3e000 - 0x14f5cfff +SpringBoardUI i386  <98ce6eac818e3713973af2384a9ead57> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/PrivateFrameworks/SpringBoardUI.framework/SpringBoardUI
-0x14f7b000 - 0x14fa2fff +Network i386  <1409e1fa4e553bdc9eafa086149b4578> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/PrivateFrameworks/Network.framework/Network
-0x14fc1000 - 0x14fc3fff +CaptiveNetwork i386  <171ee077efff33bf897f823eb2ff97c6> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/PrivateFrameworks/CaptiveNetwork.framework/CaptiveNetwork
-0x14fca000 - 0x14fd2fff +libnetwork.dylib i386  <f035e9348298325ca4d6521c4ec064ee> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/usr/lib/libnetwork.dylib
-0x16dbb000 - 0x16e04fff +UIAutomation i386  <7b78cf34d0d836fcb48e192c68ec9771> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/Developer/Library/PrivateFrameworks/UIAutomation.framework/UIAutomation
-0x16e28000 - 0x16e5efff +AXRuntime i386  <1aad3d5d6b673d24ba5b1883b150238e> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/PrivateFrameworks/AXRuntime.framework/AXRuntime
-0x16e82000 - 0x16ed2fff +UIAccessibility i386  <901771e31e36345dbb12ab8ef0379d87> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/PrivateFrameworks/UIAccessibility.framework/UIAccessibility
-0x16f0c000 - 0x16f9efff +AccessibilityUtilities i386  <40e239830c723ed2a99f489abcd80769> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/PrivateFrameworks/AccessibilityUtilities.framework/AccessibilityUtilities
-0x17006000 - 0x1702dfff +ScreenReaderCore i386  <32a250c4509534f9b4ec1106e59f8928> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/PrivateFrameworks/ScreenReaderCore.framework/ScreenReaderCore
-0x1704b000 - 0x17053fff +libAXSpeechManager.dylib i386  <53e5c9e65f1333559e1686602e8b1c23> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/usr/lib/libAXSpeechManager.dylib
-0x1705d000 - 0x17064fff +AXMediaUtilities i386  <9672fd346e3b3aaf8795d8f1f78c85e9> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/PrivateFrameworks/Accessibility.framework/Frameworks/AXMediaUtilities.framework/AXMediaUtilities
-0x1706c000 - 0x17073fff +AccessibilityUIUtilities i386  <11df597fc6883f9385b1fc6922528ba0> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/PrivateFrameworks/Accessibility.framework/Frameworks/AccessibilityUIUtilities.framework/AccessibilityUIUtilities
-0x1707c000 - 0x1707dfff +libAXSafeCategoryBundle.dylib i386  <bc09fa6901fa3f8cb7fa31c02952888c> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/usr/lib/libAXSafeCategoryBundle.dylib
-0x17083000 - 0x1709dfff +TextToSpeech i386  <37699504b89436c0a124b30eb5ff7e63> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/PrivateFrameworks/TextToSpeech.framework/TextToSpeech
-0x170ad000 - 0x170aefff +CoreBrightness i386  <6ef8d1e25a71366cae5b47b39fdd55a6> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/PrivateFrameworks/CoreBrightness.framework/CoreBrightness
-0x19939000 - 0x19942fff +libMobileGestaltExtensions.dylib i386  <4db96a403a9631fbabb8d2aa41f70a53> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/usr/lib/libMobileGestaltExtensions.dylib
-0x19961000 - 0x19975fff +libCGInterfaces.dylib i386  <db67c940479a33da8d728d6b7e7e04b5> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/Frameworks/Accelerate.framework/Frameworks/vImage.framework/Libraries/libCGInterfaces.dylib
-0x199ef000 - 0x199f1fff +SpringBoardFoundation i386  <b4f668d18e5a3b9688e33c09fcae6d6b> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/AccessibilityBundles/SpringBoardFoundation.axbundle/SpringBoardFoundation
-0x199f7000 - 0x199f9fff +GeoServices i386  <b2d8f06945c83a319a02fe546f0ab11a> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/AccessibilityBundles/GeoServices.axbundle/GeoServices
-0x19ad7000 - 0x19b84fff +UIKit i386  <8e5bc68aa20c399eb3751718fecc25e5> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/AccessibilityBundles/UIKit.axbundle/UIKit
-0x19c1d000 - 0x19c28fff +libGSFontCache.dylib i386  <ecf57acbbd593bc5ace07a781a3b748d> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/PrivateFrameworks/FontServices.framework/libGSFontCache.dylib
-0x1af68000 - 0x1af91fff +CoreServicesInternal i386  <b8d57130426e38f2b639b91edcbd9316> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/PrivateFrameworks/CoreServicesInternal.framework/CoreServicesInternal
-0x1afb4000 - 0x1b00bfff +CloudDocs i386  <fb8bfbddd39b34b6ba082f0d523cbaf8> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/PrivateFrameworks/CloudDocs.framework/CloudDocs
-0x1b293000 - 0x1b2a4fff +WebCore i386  <45c5108ed463303f8758fcaf2ad702f4> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/AccessibilityBundles/WebCore.axbundle/WebCore
-0x1b2b4000 - 0x1b2b7fff +PhotosFramework i386  <369d2bc7c8123accb22faf0fd12fa583> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/AccessibilityBundles/PhotosFramework.axbundle/PhotosFramework
-0x1b2be000 - 0x1b2c3fff +AddressBookUIFramework i386  <49cec4e0c19d3c778ee1629289455700> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/AccessibilityBundles/AddressBookUIFramework.axbundle/AddressBookUIFramework
-0x1b2d0000 - 0x1b2d4fff +SafariServices i386  <41ec46a64b7f329caf0f6bf10cff71cd> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/AccessibilityBundles/SafariServices.axbundle/SafariServices
-0x1b2dd000 - 0x1b2ddfff +iTunesStoreFramework i386  <2128c8910fe73963a5412c0c22a586df> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/AccessibilityBundles/iTunesStoreFramework.axbundle/iTunesStoreFramework
-0x1b2e3000 - 0x1b2edfff +PassKitFramework i386  <b9281a9332d93c2e850a4dc2c373c316> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/AccessibilityBundles/PassKitFramework.axbundle/PassKitFramework
-0x1b300000 - 0x1b301fff +WatchKit i386  <7452cd004c8c37e3871b1dd629b3c611> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/AccessibilityBundles/WatchKit.axbundle/WatchKit
-0x1b306000 - 0x1b307fff +AccountsUI i386  <7c23106695ae3cbbbf01f64fc81d1650> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/AccessibilityBundles/AccountsUI.axbundle/AccountsUI
-0x1b30e000 - 0x1b312fff +TelephonyUIFramework i386  <7ccf6f129cb333c0aa182e7d6df90a4f> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/AccessibilityBundles/TelephonyUIFramework.axbundle/TelephonyUIFramework
-0x1b31b000 - 0x1b31dfff +SpriteKit i386  <6bcddd6244423c209f3f23df48ac9c83> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/AccessibilityBundles/SpriteKit.axbundle/SpriteKit
-0x1b324000 - 0x1b326fff +PhotoLibraryServices i386  <8180ae6a1e2732e697d4726a8cd4c24d> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/AccessibilityBundles/PhotoLibraryServices.axbundle/PhotoLibraryServices
-0x1b32e000 - 0x1b330fff +WebKit i386  <7946b2859432334b8d4671a73529057c> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/AccessibilityBundles/WebKit.axbundle/WebKit
-0x1b337000 - 0x1b33afff +Pegasus i386  <ed9e5d8dd7f73f92b5fbcfd0f53f841e> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/AccessibilityBundles/Pegasus.axbundle/Pegasus
-0x1b342000 - 0x1b343fff +SceneKit i386  <5c2e6597d39e39589265241959af5561> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/AccessibilityBundles/SceneKit.axbundle/SceneKit
-0x1b349000 - 0x1b34afff +StoreKitFramework i386  <ff7f3315cd04309cb31c95c7cb0ebcc0> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/AccessibilityBundles/StoreKitFramework.axbundle/StoreKitFramework
-0x1b351000 - 0x1b358fff +PreferencesFramework i386  <c231c88bc2053f78bc0d3bf6a6a756ca> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/AccessibilityBundles/PreferencesFramework.axbundle/PreferencesFramework
-0x1b366000 - 0x1b368fff +SocialFramework i386  <143be97c96213516a80a721a05ce127e> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/AccessibilityBundles/SocialFramework.axbundle/SocialFramework
-0x1b370000 - 0x1b371fff +GameCenterUIFramework i386  <d4fb37306c1b30828f46d3c777869101> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/AccessibilityBundles/GameCenterUIFramework.axbundle/GameCenterUIFramework
-0x1b377000 - 0x1b377fff +iAdFramework i386  <38403cbd04c73211aa434d2999ed8b6a> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/AccessibilityBundles/iAdFramework.axbundle/iAdFramework
-0x1b37c000 - 0x1b384fff +WebKitLegacy i386  <5db1c34c6cd935b1b9ad0edbe37f0308> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/AccessibilityBundles/WebKitLegacy.axbundle/WebKitLegacy
-0x1b390000 - 0x1b391fff +GameKitFramework i386  <62a78a874cb837f5aab57e66c4b33011> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/AccessibilityBundles/GameKitFramework.axbundle/GameKitFramework
-0x1b396000 - 0x1b396fff +TwitterFramework i386  <89612f28a7f13411ad744cbac25c4795> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/AccessibilityBundles/TwitterFramework.axbundle/TwitterFramework
-0x1b39b000 - 0x1b39dfff +RemoteUIFramework i386  <b9dec009bc69330e9886cb18dd242e3b> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/AccessibilityBundles/RemoteUIFramework.axbundle/RemoteUIFramework
-0x1b3a5000 - 0x1b3a6fff +HealthKitUI i386  <6987ac1706ef370cbd1a9780e6dd93c1> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/AccessibilityBundles/HealthKitUI.axbundle/HealthKitUI
-0x1b3ab000 - 0x1b3aefff +SpringBoardUIServices i386  <2a24c5c3a40f35b695136304bed876f5> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/AccessibilityBundles/SpringBoardUIServices.axbundle/SpringBoardUIServices
-0x1b3b4000 - 0x1b3c5fff +EventKitUIFramework i386  <fc05b496d18a3c16aa1c83060baf4f23> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/AccessibilityBundles/EventKitUIFramework.axbundle/EventKitUIFramework
-0x1b3dd000 - 0x1b3e9fff +PhotoLibraryFramework i386  <82677243da2d3bc98518ee91a446a1bd> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/AccessibilityBundles/PhotoLibraryFramework.axbundle/PhotoLibraryFramework
-0x1b3ff000 - 0x1b400fff +CertUIFramework i386  <68d4cf52b2a13df39e76bfce84685e0b> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/AccessibilityBundles/CertUIFramework.axbundle/CertUIFramework
-0x1b406000 - 0x1b411fff +MessageUIFramework i386  <6732851273f831109b67b3f8774fc8a6> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/AccessibilityBundles/MessageUIFramework.axbundle/MessageUIFramework
-0x1b422000 - 0x1b425fff +AVKit i386  <f8629eb01209386f87b14ca30170830f> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/AccessibilityBundles/AVKit.axbundle/AVKit
-0x1b42e000 - 0x1b42ffff +MusicLibrary i386  <2072ac30fbbd338bbd325af5a1dd859e> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/AccessibilityBundles/MusicLibrary.axbundle/MusicLibrary
-0x1b435000 - 0x1b43ffff +MapKitFramework i386  <ed32f762c1bb36b58840f3f97d0f4102> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/AccessibilityBundles/MapKitFramework.axbundle/MapKitFramework
-0x1b452000 - 0x1b45afff +MediaPlayerFramework i386  <0d75ef75339d3bb78cc8fe736e0712ec> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/AccessibilityBundles/MediaPlayerFramework.axbundle/MediaPlayerFramework
-0x1b469000 - 0x1b47dfff +PhotosUIFramework i386  <56f51ab112d4391195e9f9dc2c1d5eee> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/AccessibilityBundles/PhotosUIFramework.axbundle/PhotosUIFramework
-0x1b49b000 - 0x1b4befff +VectorKit i386  <019e87ca22443e1ca95284206c1a8036> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/AccessibilityBundles/VectorKit.axbundle/VectorKit
-0x1b4da000 - 0x1b4e0fff +ContactsUI i386  <911e96e7cfb23200b2d8ced8305fda0c> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/AccessibilityBundles/ContactsUI.axbundle/ContactsUI
-0x1b4ea000 - 0x1b4ebfff +QuickLook i386  <60d83ff3841e38edb3f9d97a96ac5f3d> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/AccessibilityBundles/QuickLook.axbundle/QuickLook
-0x1b4f2000 - 0x1b4fefff +CameraKit i386  <c535cfabd00e3dcfb6e80586fd3cd340> /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/AccessibilityBundles/CameraKit.axbundle/CameraKit
diff --git a/submodules/HockeySDK-iOS/Support/HockeySDKTests/HockeySDKTests-Info.plist b/submodules/HockeySDK-iOS/Support/HockeySDKTests/HockeySDKTests-Info.plist
deleted file mode 100644
index 169b6f710e..0000000000
--- a/submodules/HockeySDK-iOS/Support/HockeySDKTests/HockeySDKTests-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>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>CFBundlePackageType</key>
-	<string>BNDL</string>
-	<key>CFBundleShortVersionString</key>
-	<string>1.0</string>
-	<key>CFBundleSignature</key>
-	<string>????</string>
-	<key>CFBundleVersion</key>
-	<string>1</string>
-</dict>
-</plist>
diff --git a/submodules/HockeySDK-iOS/Support/HockeySDKTests/Vendor/Licenses.txt b/submodules/HockeySDK-iOS/Support/HockeySDKTests/Vendor/Licenses.txt
deleted file mode 100644
index 278b056e29..0000000000
--- a/submodules/HockeySDK-iOS/Support/HockeySDKTests/Vendor/Licenses.txt
+++ /dev/null
@@ -1,47 +0,0 @@
-License for OCHamcrest.framework:
-
-OCHamcrest
-Copyright 2014 hamcrest.org
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
-
-Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. 
-
-Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
-
-Neither the name of Hamcrest nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
-
-License for OCMockito.framework:
-
-OCMockito
-Copyright (c) 2014 Jonathan M. Reid
-All rights reserved.
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
------
-TPDWeakProxy:
-Copyright (c) 2013 Tetherpad
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-
-
-License for OCMock:
-
-Copyright (c) 2004-2015 Erik Doernenburg and contributors
-Licensed under the Apache License, Version 2.0 (the "License"); you may not use these files except in compliance with the License. You may obtain a copy of the License at
-   http://www.apache.org/licenses/LICENSE-2.0
-Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.
\ No newline at end of file
diff --git a/submodules/HockeySDK-iOS/Support/HockeySDKTests/Vendor/OCHamcrestIOS.framework/Headers b/submodules/HockeySDK-iOS/Support/HockeySDKTests/Vendor/OCHamcrestIOS.framework/Headers
deleted file mode 120000
index a177d2a6b9..0000000000
--- a/submodules/HockeySDK-iOS/Support/HockeySDKTests/Vendor/OCHamcrestIOS.framework/Headers
+++ /dev/null
@@ -1 +0,0 @@
-Versions/Current/Headers
\ No newline at end of file
diff --git a/submodules/HockeySDK-iOS/Support/HockeySDKTests/Vendor/OCHamcrestIOS.framework/OCHamcrestIOS b/submodules/HockeySDK-iOS/Support/HockeySDKTests/Vendor/OCHamcrestIOS.framework/OCHamcrestIOS
deleted file mode 120000
index d03098854b..0000000000
--- a/submodules/HockeySDK-iOS/Support/HockeySDKTests/Vendor/OCHamcrestIOS.framework/OCHamcrestIOS
+++ /dev/null
@@ -1 +0,0 @@
-Versions/Current/OCHamcrestIOS
\ No newline at end of file
diff --git a/submodules/HockeySDK-iOS/Support/HockeySDKTests/Vendor/OCHamcrestIOS.framework/Resources b/submodules/HockeySDK-iOS/Support/HockeySDKTests/Vendor/OCHamcrestIOS.framework/Resources
deleted file mode 120000
index 953ee36f3b..0000000000
--- a/submodules/HockeySDK-iOS/Support/HockeySDKTests/Vendor/OCHamcrestIOS.framework/Resources
+++ /dev/null
@@ -1 +0,0 @@
-Versions/Current/Resources
\ No newline at end of file
diff --git a/submodules/HockeySDK-iOS/Support/HockeySDKTests/Vendor/OCHamcrestIOS.framework/Versions/A/Headers/HCAllOf.h b/submodules/HockeySDK-iOS/Support/HockeySDKTests/Vendor/OCHamcrestIOS.framework/Versions/A/Headers/HCAllOf.h
deleted file mode 100644
index 9cefcbeb0d..0000000000
--- a/submodules/HockeySDK-iOS/Support/HockeySDKTests/Vendor/OCHamcrestIOS.framework/Versions/A/Headers/HCAllOf.h
+++ /dev/null
@@ -1,59 +0,0 @@
-//  OCHamcrest by Jon Reid, http://qualitycoding.org/about/
-//  Copyright 2016 hamcrest.org. See LICENSE.txt
-
-#import <OCHamcrestIOS/HCDiagnosingMatcher.h>
-
-
-/*!
- * @abstract Calculates the logical conjunction of multiple matchers.
- * @discussion Evaluation is shortcut, so subsequent matchers are not called if an earlier matcher
- * returns <code>NO</code>.
- */
-@interface HCAllOf : HCDiagnosingMatcher
-
-- (instancetype)initWithMatchers:(NSArray *)matchers;
-
-@end
-
-
-FOUNDATION_EXPORT id HC_allOfIn(NSArray *matchers);
-
-#ifndef HC_DISABLE_SHORT_SYNTAX
-/*!
- * @abstract Creates a matcher that matches when the examined object matches <b>all</b> of the
- * specified matchers.
- * @param matchers An array of matchers. Any element that is not a matcher is implicitly wrapped in
- * an <em>equalTo</em> matcher to check for equality.
- * @discussion
- * <b>Example</b><br />
- * <pre>assertThat(\@"myValue", allOfIn(\@[startsWith(\@"my"), containsSubstring(\@"Val")]))</pre>
- *
- * <b>Name Clash</b><br />
- * In the event of a name clash, <code>#define HC_DISABLE_SHORT_SYNTAX</code> and use the synonym
- * HC_allOfIn instead.
- */
-static inline id allOfIn(NSArray *matchers)
-{
-    return HC_allOfIn(matchers);
-}
-#endif
-
-
-FOUNDATION_EXPORT id HC_allOf(id matchers, ...) NS_REQUIRES_NIL_TERMINATION;
-
-#ifndef HC_DISABLE_SHORT_SYNTAX
-/*!
- * @abstract Creates a matcher that matches when the examined object matches <b>all</b> of the
- * specified matchers.
- * @param matchers... A comma-separated list of matchers ending with <code>nil</code>. Any argument
- * that is not a matcher is implicitly wrapped in an <em>equalTo</em> matcher to check for equality.
- * @discussion
- * <b>Example</b><br />
- * <pre>assertThat(\@"myValue", allOf(startsWith(\@"my"), containsSubstring(\@"Val"), nil))</pre>
- *
- * <b>Name Clash</b><br />
- * In the event of a name clash, <code>#define HC_DISABLE_SHORT_SYNTAX</code> and use the synonym
- * HC_allOf instead.
- */
-#define allOf(matchers...) HC_allOf(matchers)
-#endif
diff --git a/submodules/HockeySDK-iOS/Support/HockeySDKTests/Vendor/OCHamcrestIOS.framework/Versions/A/Headers/HCAnyOf.h b/submodules/HockeySDK-iOS/Support/HockeySDKTests/Vendor/OCHamcrestIOS.framework/Versions/A/Headers/HCAnyOf.h
deleted file mode 100644
index b6e8ece1aa..0000000000
--- a/submodules/HockeySDK-iOS/Support/HockeySDKTests/Vendor/OCHamcrestIOS.framework/Versions/A/Headers/HCAnyOf.h
+++ /dev/null
@@ -1,57 +0,0 @@
-//  OCHamcrest by Jon Reid, http://qualitycoding.org/about/
-//  Copyright 2016 hamcrest.org. See LICENSE.txt
-
-#import <OCHamcrestIOS/HCBaseMatcher.h>
-
-
-/*!
- * @abstract Calculates the logical disjunction of multiple matchers.
- * @discussion Evaluation is shortcut, so subsequent matchers are not called if an earlier matcher
- * returns <code>NO</code>.
- */
-@interface HCAnyOf : HCBaseMatcher
-
-- (instancetype)initWithMatchers:(NSArray *)matchers;
-
-@end
-
-FOUNDATION_EXPORT id HC_anyOfIn(NSArray *matchers);
-
-#ifndef HC_DISABLE_SHORT_SYNTAX
-/*!
- * @abstract Creates a matcher that matches when the examined object matches <b>any</b> of the
- * specified matchers.
- * @param matchers An array of matchers. Any element that is not a matcher is implicitly wrapped in
- * an <em>equalTo</em> matcher to check for equality.
- * @discussion
- * <b>Example</b><br />
- * <pre>assertThat(\@"myValue", allOf(\@[startsWith(\@"foo"), containsSubstring(\@"Val")]))</pre>
- *
- * <b>Name Clash</b><br />
- * In the event of a name clash, <code>#define HC_DISABLE_SHORT_SYNTAX</code> and use the synonym
- * HC_anyOf instead.
- */
-static inline id anyOfIn(NSArray *matchers)
-{
-    return HC_anyOfIn(matchers);
-}
-#endif
-
-FOUNDATION_EXPORT id HC_anyOf(id matchers, ...) NS_REQUIRES_NIL_TERMINATION;
-
-#ifndef HC_DISABLE_SHORT_SYNTAX
-/*!
- * @abstract Creates a matcher that matches when the examined object matches <b>any</b> of the
- * specified matchers.
- * @param matchers... A comma-separated list of matchers ending with <code>nil</code>. Any argument
- * that is not a matcher is implicitly wrapped in an <em>equalTo</em> matcher to check for equality.
- * @discussion
- * <b>Example</b><br />
- * <pre>assertThat(\@"myValue", allOf(startsWith(\@"foo"), containsSubstring(\@"Val"), nil))</pre>
- *
- * <b>Name Clash</b><br />
- * In the event of a name clash, <code>#define HC_DISABLE_SHORT_SYNTAX</code> and use the synonym
- * HC_anyOf instead.
- */
-#define anyOf(matchers...) HC_anyOf(matchers)
-#endif
diff --git a/submodules/HockeySDK-iOS/Support/HockeySDKTests/Vendor/OCHamcrestIOS.framework/Versions/A/Headers/HCArgumentCaptor.h b/submodules/HockeySDK-iOS/Support/HockeySDKTests/Vendor/OCHamcrestIOS.framework/Versions/A/Headers/HCArgumentCaptor.h
deleted file mode 100644
index 3e0fdc5478..0000000000
--- a/submodules/HockeySDK-iOS/Support/HockeySDKTests/Vendor/OCHamcrestIOS.framework/Versions/A/Headers/HCArgumentCaptor.h
+++ /dev/null
@@ -1,40 +0,0 @@
-//  OCHamcrest by Jon Reid, http://qualitycoding.org/about/
-//  Copyright 2016 hamcrest.org. See LICENSE.txt
-
-#import <OCHamcrestIOS/HCIsAnything.h>
-
-
-/*!
- * @abstract Matches anything, capturing all values.
- * @discussion This matcher captures all values it was given to match, and always evaluates to
- * <code>YES</code>. Use it to capture argument values for further assertions.
- *
- * Unlike other matchers, this matcher is not idempotent. It should be created outside of any
- * expression so that it can be queried for the items it captured.
- */
-@interface HCArgumentCaptor : HCIsAnything
-
-/*!
- * @abstract Returns the captured value.
- * @discussion If <code>-matches:</code> was called more than once then this property returns the
- * last captured value.
- *
- * If <code>-matches:</code> was never invoked and so no value was captured, this property returns
- * <code>nil</code>. But if <code>nil</code> was captured, this property returns NSNull.
- */
-@property (nonatomic, readonly) id value;
-
-/*!
- * @abstract Returns all captured values.
- * @discussion Returns an array containing all captured values, in the order in which they were
- * captured. <code>nil</code> values are converted to NSNull.
- */
-@property (nonatomic, readonly) NSArray *allValues;
-
-/*!
- * @abstract Determines whether subsequent matched values are captured.
- * @discussion <code>YES</code> by default.
- */
-@property (nonatomic, assign) BOOL captureEnabled;
-
-@end
diff --git a/submodules/HockeySDK-iOS/Support/HockeySDKTests/Vendor/OCHamcrestIOS.framework/Versions/A/Headers/HCAssertThat.h b/submodules/HockeySDK-iOS/Support/HockeySDKTests/Vendor/OCHamcrestIOS.framework/Versions/A/Headers/HCAssertThat.h
deleted file mode 100644
index 40f913927b..0000000000
--- a/submodules/HockeySDK-iOS/Support/HockeySDKTests/Vendor/OCHamcrestIOS.framework/Versions/A/Headers/HCAssertThat.h
+++ /dev/null
@@ -1,92 +0,0 @@
-//  OCHamcrest by Jon Reid, http://qualitycoding.org/about/
-//  Copyright 2016 hamcrest.org. See LICENSE.txt
-
-#import <Foundation/Foundation.h>
-
-@protocol HCMatcher;
-
-/*!
- * @header
- * Assertion macros for using matchers in testing frameworks.
- * Unmet assertions are reported to the HCTestFailureReporterChain.
- */
-
-
-FOUNDATION_EXPORT void HC_assertThatWithLocation(id testCase, id actual, id <HCMatcher> matcher,
-                                                 const char *fileName, int lineNumber);
-
-#define HC_assertThat(actual, matcher)  \
-    HC_assertThatWithLocation(self, actual, matcher, __FILE__, __LINE__)
-
-#ifndef HC_DISABLE_SHORT_SYNTAX
-/*!
- * @abstract assertThat(actual, matcher) -
- * Asserts that actual value satisfies matcher.
- * @param actual The object to evaluate as the actual value.
- * @param matcher The matcher to satisfy as the expected condition.
- * @discussion assertThat passes the actual value to the matcher for evaluation. If the matcher is
- * not satisfied, it is reported to the HCTestFailureReporterChain.
- *
- * Use assertThat in test case methods. It's designed to integrate with XCTest and other testing
- * frameworks where individual tests are executed as methods.
- *
- * <b>Name Clash</b><br />
- * In the event of a name clash, <code>#define HC_DISABLE_SHORT_SYNTAX</code> and use the synonym
- * HC_assertThat instead.
- */
-#define assertThat(actual, matcher) HC_assertThat(actual, matcher)
-#endif
-
-
-typedef id (^HCFutureValue)();
-
-FOUNDATION_EXPORT void HC_assertWithTimeoutAndLocation(id testCase, NSTimeInterval timeout,
-        HCFutureValue actualBlock, id <HCMatcher> matcher,
-        const char *fileName, int lineNumber);
-
-#define HC_assertWithTimeout(timeout, actualBlock, matcher)  \
-    HC_assertWithTimeoutAndLocation(self, timeout, actualBlock, matcher, __FILE__, __LINE__)
-
-#define HC_thatEventually(actual) ^{ return actual; }
-
-#ifndef HC_DISABLE_SHORT_SYNTAX
-/*!
- * @abstract assertWithTimeout(timeout, actualBlock, matcher) -
- * Asserts that a value provided by a block will satisfy matcher within the specified time.
- * @param timeout Maximum time to wait for passing behavior, specified in seconds.
- * @param actualBlock A block providing the object to repeatedly evaluate as the actual value.
- * @param matcher The matcher to satisfy as the expected condition.
- * @discussion <em>assertWithTimeout</em> polls a value provided by a block to asynchronously
- * satisfy the matcher. The block is evaluated repeatedly for an actual value, which is passed to
- * the matcher for evaluation. If the matcher is not satisfied within the timeout, it is reported to
- * the HCTestFailureReporterChain.
- *
- * An easy way of providing the <em>actualBlock</em> is to use the macro <code>thatEventually</code>.
- *
- * <b>Name Clash</b><br />
- * In the event of a name clash, <code>#define HC_DISABLE_SHORT_SYNTAX</code> and use the synonym
- * HC_assertWithTimeout instead.
-*/
-#define assertWithTimeout(timeout, actualBlock, matcher) HC_assertWithTimeout(timeout, actualBlock, matcher)
-
-
-/*!
- * @abstract thatEventually(actual) -
- * Evaluates actual value at future time.
- * @param actual The object to evaluate as the actual value.
- * @discussion Wraps <em>actual</em> in a block so that it can be repeatedly evaluated by
- * <code>assertWithTimeout</code>.
- *
- * <b>Name Clash</b><br />
- * In the event of a name clash, <code>#define HC_DISABLE_SHORT_SYNTAX</code> and use the synonym
- * HC_thatEventually instead.
- */
-#define thatEventually(actual) HC_thatEventually(actual)
-#endif
-
-
-/*!
- * @abstract "Expected <matcher description>, but <mismatch description>"
- * @discussion Helper function to let you describe mismatches the way <tt>assertThat</tt> does.
- */
-FOUNDATION_EXPORT NSString *HCDescribeMismatch(id <HCMatcher> matcher, id actual);
diff --git a/submodules/HockeySDK-iOS/Support/HockeySDKTests/Vendor/OCHamcrestIOS.framework/Versions/A/Headers/HCBaseDescription.h b/submodules/HockeySDK-iOS/Support/HockeySDKTests/Vendor/OCHamcrestIOS.framework/Versions/A/Headers/HCBaseDescription.h
deleted file mode 100644
index d9ed7247f4..0000000000
--- a/submodules/HockeySDK-iOS/Support/HockeySDKTests/Vendor/OCHamcrestIOS.framework/Versions/A/Headers/HCBaseDescription.h
+++ /dev/null
@@ -1,25 +0,0 @@
-//  OCHamcrest by Jon Reid, http://qualitycoding.org/about/
-//  Copyright 2016 hamcrest.org. See LICENSE.txt
-
-#import <Foundation/Foundation.h>
-#import <OCHamcrestIOS/HCDescription.h>
-
-
-/*!
- * @abstract Base class for all HCDescription implementations.
- */
-@interface HCBaseDescription : NSObject <HCDescription>
-@end
-
-
-/*!
- * @abstract Methods that must be provided by subclasses of HCBaseDescription.
- */
-@interface HCBaseDescription (SubclassResponsibility)
-
-/*!
- * @abstract Appends the specified string to the description.
- */
-- (void)append:(NSString *)str;
-
-@end
diff --git a/submodules/HockeySDK-iOS/Support/HockeySDKTests/Vendor/OCHamcrestIOS.framework/Versions/A/Headers/HCBaseMatcher.h b/submodules/HockeySDK-iOS/Support/HockeySDKTests/Vendor/OCHamcrestIOS.framework/Versions/A/Headers/HCBaseMatcher.h
deleted file mode 100644
index c02c8b34c9..0000000000
--- a/submodules/HockeySDK-iOS/Support/HockeySDKTests/Vendor/OCHamcrestIOS.framework/Versions/A/Headers/HCBaseMatcher.h
+++ /dev/null
@@ -1,21 +0,0 @@
-//  OCHamcrest by Jon Reid, http://qualitycoding.org/about/
-//  Copyright 2016 hamcrest.org. See LICENSE.txt
-
-#import <Foundation/Foundation.h>
-#import <OCHamcrestIOS/HCMatcher.h>
-
-#define HC_ABSTRACT_METHOD [self subclassResponsibility:_cmd]
-
-
-/*!
- * @abstract Base class for all HCMatcher implementations.
- * @discussion Simple matchers can just subclass HCBaseMatcher and implement <code>-matches:</code>
- * and <code>-describeTo:</code>. But if the matching algorithm has several "no match" paths,
- * consider subclassing HCDiagnosingMatcher instead.
- */
-@interface HCBaseMatcher : NSObject <HCMatcher, NSCopying>
-
-/*! @abstract Raises exception that command (a pseudo-abstract method) is not implemented. */
-- (void)subclassResponsibility:(SEL)command;
-
-@end
diff --git a/submodules/HockeySDK-iOS/Support/HockeySDKTests/Vendor/OCHamcrestIOS.framework/Versions/A/Headers/HCClassMatcher.h b/submodules/HockeySDK-iOS/Support/HockeySDKTests/Vendor/OCHamcrestIOS.framework/Versions/A/Headers/HCClassMatcher.h
deleted file mode 100644
index fbee57f7a1..0000000000
--- a/submodules/HockeySDK-iOS/Support/HockeySDKTests/Vendor/OCHamcrestIOS.framework/Versions/A/Headers/HCClassMatcher.h
+++ /dev/null
@@ -1,13 +0,0 @@
-//  OCHamcrest by Jon Reid, http://qualitycoding.org/about/
-//  Copyright 2016 hamcrest.org. See LICENSE.txt
-
-#import <OCHamcrestIOS/HCBaseMatcher.h>
-
-
-@interface HCClassMatcher : HCBaseMatcher
-
-@property (nonatomic, strong, readonly) Class theClass;
-
-- (instancetype)initWithClass:(Class)aClass;
-
-@end
diff --git a/submodules/HockeySDK-iOS/Support/HockeySDKTests/Vendor/OCHamcrestIOS.framework/Versions/A/Headers/HCCollect.h b/submodules/HockeySDK-iOS/Support/HockeySDKTests/Vendor/OCHamcrestIOS.framework/Versions/A/Headers/HCCollect.h
deleted file mode 100644
index 06786524aa..0000000000
--- a/submodules/HockeySDK-iOS/Support/HockeySDKTests/Vendor/OCHamcrestIOS.framework/Versions/A/Headers/HCCollect.h
+++ /dev/null
@@ -1,20 +0,0 @@
-//  OCHamcrest by Jon Reid, http://qualitycoding.org/about/
-//  Copyright 2016 hamcrest.org. See LICENSE.txt
-
-#import <Foundation/Foundation.h>
-
-#import <stdarg.h>
-
-
-/*!
- * @abstract Returns an array of values from a variable-length comma-separated list terminated
- * by <code>nil</code>.
- */
-FOUNDATION_EXPORT NSArray * HCCollectItems(id item, va_list args);
-
-/*!
- * @abstract Returns an array of matchers from a mixed array of items and matchers.
- * @discussion Each item is wrapped in HCWrapInMatcher to transform non-matcher items into equality
- * matchers.
- */
-FOUNDATION_EXPORT NSArray * HCWrapIntoMatchers(NSArray *items);
diff --git a/submodules/HockeySDK-iOS/Support/HockeySDKTests/Vendor/OCHamcrestIOS.framework/Versions/A/Headers/HCConformsToProtocol.h b/submodules/HockeySDK-iOS/Support/HockeySDKTests/Vendor/OCHamcrestIOS.framework/Versions/A/Headers/HCConformsToProtocol.h
deleted file mode 100644
index c04b51eafc..0000000000
--- a/submodules/HockeySDK-iOS/Support/HockeySDKTests/Vendor/OCHamcrestIOS.framework/Versions/A/Headers/HCConformsToProtocol.h
+++ /dev/null
@@ -1,37 +0,0 @@
-//  OCHamcrest by Jon Reid, http://qualitycoding.org/about/
-//  Copyright 2016 hamcrest.org. See LICENSE.txt
-//  Contribution by Todd Farrell
-
-#import <OCHamcrestIOS/HCBaseMatcher.h>
-
-
-/*!
- * @abstract Matches objects that conform to specified protocol.
- */
-@interface HCConformsToProtocol : HCBaseMatcher
-
-- (instancetype)initWithProtocol:(Protocol *)protocol;
-
-@end
-
-
-FOUNDATION_EXPORT id HC_conformsTo(Protocol *aProtocol);
-
-#ifndef HC_DISABLE_SHORT_SYNTAX
-/*!
- * @abstract Creates a matcher that matches when the examined object conforms to the specified
- * protocol.
- * @param aProtocol The protocol to compare against as the expected protocol.
- * @discussion
- * <b>Example</b><br />
- * <pre>assertThat(myObject, conformsTo(\@protocol(NSCoding))</pre>
- *
- * <b>Name Clash</b><br />
- * In the event of a name clash, <code>#define HC_DISABLE_SHORT_SYNTAX</code> and use the synonym
- * HC_conformsTo instead.
- */
-static inline id conformsTo(Protocol *aProtocol)
-{
-    return HC_conformsTo(aProtocol);
-}
-#endif
diff --git a/submodules/HockeySDK-iOS/Support/HockeySDKTests/Vendor/OCHamcrestIOS.framework/Versions/A/Headers/HCDescribedAs.h b/submodules/HockeySDK-iOS/Support/HockeySDKTests/Vendor/OCHamcrestIOS.framework/Versions/A/Headers/HCDescribedAs.h
deleted file mode 100644
index 7004ae253d..0000000000
--- a/submodules/HockeySDK-iOS/Support/HockeySDKTests/Vendor/OCHamcrestIOS.framework/Versions/A/Headers/HCDescribedAs.h
+++ /dev/null
@@ -1,36 +0,0 @@
-//  OCHamcrest by Jon Reid, http://qualitycoding.org/about/
-//  Copyright 2016 hamcrest.org. See LICENSE.txt
-
-#import <OCHamcrestIOS/HCBaseMatcher.h>
-
-
-/*!
- * @abstract Provides a custom description to another matcher.
- */
-@interface HCDescribedAs : HCBaseMatcher
-
-- (instancetype)initWithDescription:(NSString *)description
-                         forMatcher:(id <HCMatcher>)matcher
-                         overValues:(NSArray *)templateValues;
-
-@end
-
-
-FOUNDATION_EXPORT id HC_describedAs(NSString *description, id <HCMatcher> matcher, ...) NS_REQUIRES_NIL_TERMINATION;
-
-#ifndef HC_DISABLE_SHORT_SYNTAX
-/*!
- * @abstract Wraps an existing matcher, overriding its description with that specified. All other
- * functions are delegated to the decorated matcher, including its mismatch description.
- * @param description The new description for the wrapped matcher.
- * @param matcher The matcher to wrap, followed by a comma-separated list of substitution
- * values ending with <code>nil</code>.
- * @discussion The description may contain substitution placeholders %0, %1, etc. These will be
- * replaced by any values that follow the matcher.
- *
- * <b>Name Clash</b><br />
- * In the event of a name clash, <code>#define HC_DISABLE_SHORT_SYNTAX</code> and use the synonym
- * HC_describedAs instead.
- */
-#define describedAs(description, matcher, ...) HC_describedAs(description, matcher, ##__VA_ARGS__)
-#endif
diff --git a/submodules/HockeySDK-iOS/Support/HockeySDKTests/Vendor/OCHamcrestIOS.framework/Versions/A/Headers/HCDescription.h b/submodules/HockeySDK-iOS/Support/HockeySDKTests/Vendor/OCHamcrestIOS.framework/Versions/A/Headers/HCDescription.h
deleted file mode 100644
index e2a4775a0e..0000000000
--- a/submodules/HockeySDK-iOS/Support/HockeySDKTests/Vendor/OCHamcrestIOS.framework/Versions/A/Headers/HCDescription.h
+++ /dev/null
@@ -1,35 +0,0 @@
-//  OCHamcrest by Jon Reid, http://qualitycoding.org/about/
-//  Copyright 2016 hamcrest.org. See LICENSE.txt
-
-#import <Foundation/Foundation.h>
-
-
-/*!
- * @abstract A description of an HCMatcher.
- * @discussion An HCMatcher will describe itself to a description which can later be used for reporting.
- */
-@protocol HCDescription <NSObject>
-
-/*!
- * @abstract Appends some plain text to the description.
- * @return <code>self</code>, for chaining.
- */
-- (id <HCDescription>)appendText:(NSString *)text;
-
-/*!
- * @abstract Appends description of specified value to description.
- * @discussion If the value implements the HCSelfDescribing protocol, then it will be used.
- * @return <code>self</code>, for chaining.
- */
-- (id <HCDescription>)appendDescriptionOf:(id)value;
-
-/*!
- * @abstract Appends a list of objects to the description.
- * @return <code>self</code>, for chaining.
- */
-- (id <HCDescription>)appendList:(NSArray *)values
-                          start:(NSString *)start
-                      separator:(NSString *)separator
-                            end:(NSString *)end;
-
-@end
diff --git a/submodules/HockeySDK-iOS/Support/HockeySDKTests/Vendor/OCHamcrestIOS.framework/Versions/A/Headers/HCDiagnosingMatcher.h b/submodules/HockeySDK-iOS/Support/HockeySDKTests/Vendor/OCHamcrestIOS.framework/Versions/A/Headers/HCDiagnosingMatcher.h
deleted file mode 100644
index cf1793fc7d..0000000000
--- a/submodules/HockeySDK-iOS/Support/HockeySDKTests/Vendor/OCHamcrestIOS.framework/Versions/A/Headers/HCDiagnosingMatcher.h
+++ /dev/null
@@ -1,15 +0,0 @@
-//  OCHamcrest by Jon Reid, http://qualitycoding.org/about/
-//  Copyright 2016 hamcrest.org. See LICENSE.txt
-
-#import <OCHamcrestIOS/HCBaseMatcher.h>
-
-
-/*!
- * @abstract Base class for matchers that generate mismatch descriptions during the matching.
- * @discussion Some matching algorithms have several "no match" paths. It helps to make the mismatch
- * description as precise as possible, but we don't want to have to repeat the matching logic to do
- * so. For such matchers, subclass HCDiagnosingMatcher and implement HCMatcher's
- * <code>-matches:describingMismatchTo:</code>.
-*/
-@interface HCDiagnosingMatcher : HCBaseMatcher
-@end
diff --git a/submodules/HockeySDK-iOS/Support/HockeySDKTests/Vendor/OCHamcrestIOS.framework/Versions/A/Headers/HCEvery.h b/submodules/HockeySDK-iOS/Support/HockeySDKTests/Vendor/OCHamcrestIOS.framework/Versions/A/Headers/HCEvery.h
deleted file mode 100644
index e98a6ceb82..0000000000
--- a/submodules/HockeySDK-iOS/Support/HockeySDKTests/Vendor/OCHamcrestIOS.framework/Versions/A/Headers/HCEvery.h
+++ /dev/null
@@ -1,40 +0,0 @@
-//  OCHamcrest by Jon Reid, http://qualitycoding.org/about/
-//  Copyright 2016 hamcrest.org. See LICENSE.txt
-
-#import <OCHamcrestIOS/HCDiagnosingMatcher.h>
-
-
-/*!
- * @abstract Matches if every item in a collection satisfies a nested matcher.
- */
-@interface HCEvery : HCDiagnosingMatcher
-
-@property (nonatomic, strong, readonly) id <HCMatcher> matcher;
-
-- (instancetype)initWithMatcher:(id <HCMatcher>)matcher;
-
-@end
-
-
-FOUNDATION_EXPORT id HC_everyItem(id <HCMatcher> itemMatcher);
-
-#ifndef HC_DISABLE_SHORT_SYNTAX
-/*!
- * @abstract Creates a matcher for collections that matches when the examined collection's items are
- * all matched by the specified matcher.
- * @param itemMatcher The matcher to apply to every item provided by the examined collection.
- * @discussion This matcher works on any collection that conforms to the NSFastEnumeration protocol,
- * performing a single pass.
- *
- * <b>Example</b><br />
- * <pre>assertThat(\@[\@"bar", \@"baz"], everyItem(startsWith(\@"ba")))</pre>
- *
- * <b>Name Clash</b><br />
- * In the event of a name clash, <code>#define HC_DISABLE_SHORT_SYNTAX</code> and use the synonym
- * HC_everyItem instead.
- */
-static inline id everyItem(id <HCMatcher> itemMatcher)
-{
-    return HC_everyItem(itemMatcher);
-}
-#endif
diff --git a/submodules/HockeySDK-iOS/Support/HockeySDKTests/Vendor/OCHamcrestIOS.framework/Versions/A/Headers/HCHasCount.h b/submodules/HockeySDK-iOS/Support/HockeySDKTests/Vendor/OCHamcrestIOS.framework/Versions/A/Headers/HCHasCount.h
deleted file mode 100644
index 531545c3e2..0000000000
--- a/submodules/HockeySDK-iOS/Support/HockeySDKTests/Vendor/OCHamcrestIOS.framework/Versions/A/Headers/HCHasCount.h
+++ /dev/null
@@ -1,58 +0,0 @@
-//  OCHamcrest by Jon Reid, http://qualitycoding.org/about/
-//  Copyright 2016 hamcrest.org. See LICENSE.txt
-
-#import <OCHamcrestIOS/HCBaseMatcher.h>
-
-
-/*!
- * @abstract Matches if collection size satisfies a nested matcher.
- */
-@interface HCHasCount : HCBaseMatcher
-
-- (instancetype)initWithMatcher:(id <HCMatcher>)countMatcher;
-
-@end
-
-
-FOUNDATION_EXPORT id HC_hasCount(id <HCMatcher> countMatcher);
-
-#ifndef HC_DISABLE_SHORT_SYNTAX
-/*!
- * @abstract Creates a matcher that matches when the examined object's <code>-count</code> method
- * returns a value that satisfies the specified matcher.
- * @param countMatcher A matcher for the count of an examined collection.
- * @discussion
- * <b>Example</b><br />
- * <pre>assertThat(\@[\@"foo", \@"bar"], hasCount(equalTo(@2)))</pre>
- *
- * <b>Name Clash</b><br />
- * In the event of a name clash, <code>#define HC_DISABLE_SHORT_SYNTAX</code> and use the synonym
- * HC_hasCount instead.
- */
-static inline id hasCount(id <HCMatcher> countMatcher)
-{
-    return HC_hasCount(countMatcher);
-}
-#endif
-
-
-FOUNDATION_EXPORT id HC_hasCountOf(NSUInteger count);
-
-#ifndef HC_DISABLE_SHORT_SYNTAX
-/*!
- * @abstract Creates a matcher that matches when the examined object's <code>-count</code> method
- * returns a value that equals the specified value.
- * @param value Value to compare against as the expected count.
- * @discussion
- * <b>Example</b><br />
- * <pre>assertThat(\@[\@"foo", \@"bar"], hasCountOf(2))</pre>
- *
- * <b>Name Clash</b><br />
- * In the event of a name clash, <code>#define HC_DISABLE_SHORT_SYNTAX</code> and use the synonym
- * HC_hasCountOf instead.
- */
-static inline id hasCountOf(NSUInteger value)
-{
-    return HC_hasCountOf(value);
-}
-#endif
diff --git a/submodules/HockeySDK-iOS/Support/HockeySDKTests/Vendor/OCHamcrestIOS.framework/Versions/A/Headers/HCHasDescription.h b/submodules/HockeySDK-iOS/Support/HockeySDKTests/Vendor/OCHamcrestIOS.framework/Versions/A/Headers/HCHasDescription.h
deleted file mode 100644
index d58a48b9b3..0000000000
--- a/submodules/HockeySDK-iOS/Support/HockeySDKTests/Vendor/OCHamcrestIOS.framework/Versions/A/Headers/HCHasDescription.h
+++ /dev/null
@@ -1,40 +0,0 @@
-//  OCHamcrest by Jon Reid, http://qualitycoding.org/about/
-//  Copyright 2016 hamcrest.org. See LICENSE.txt
-
-#import <OCHamcrestIOS/HCInvocationMatcher.h>
-
-
-/*!
- * @abstract Matches objects whose description satisfies a nested matcher.
- */
-@interface HCHasDescription : HCInvocationMatcher
-
-- (instancetype)initWithDescription:(id <HCMatcher>)descriptionMatcher;
-
-@end
-
-
-FOUNDATION_EXPORT id HC_hasDescription(id descriptionMatcher);
-
-#ifndef HC_DISABLE_SHORT_SYNTAX
-/*!
- * @abstract Creates a matcher that matches when the examined object's <code>-description</code>
- * satisfies the specified matcher.
- * @param descriptionMatcher The matcher used to verify the description result, or an expected value
- * for <em>equalTo</em> matching.
- * @discussion If <em>descriptionMatcher</em> is not a matcher, it is implicitly wrapped in
- * an <em>equalTo</em> matcher to check for equality.
- *
- * <b>Examples</b><br />
- * <pre>assertThat(myObject, hasDescription(equalTo(\@"foo"))</pre>
- * <pre>assertThat(myObject, hasDescription(\@"foo"))</pre>
- *
- * <b>Name Clash</b><br />
- * In the event of a name clash, <code>#define HC_DISABLE_SHORT_SYNTAX</code> and use the synonym
- * HC_hasDescription instead.
- */
-static inline id hasDescription(id descriptionMatcher)
-{
-    return HC_hasDescription(descriptionMatcher);
-}
-#endif
diff --git a/submodules/HockeySDK-iOS/Support/HockeySDKTests/Vendor/OCHamcrestIOS.framework/Versions/A/Headers/HCHasProperty.h b/submodules/HockeySDK-iOS/Support/HockeySDKTests/Vendor/OCHamcrestIOS.framework/Versions/A/Headers/HCHasProperty.h
deleted file mode 100644
index 158ed47a18..0000000000
--- a/submodules/HockeySDK-iOS/Support/HockeySDKTests/Vendor/OCHamcrestIOS.framework/Versions/A/Headers/HCHasProperty.h
+++ /dev/null
@@ -1,42 +0,0 @@
-//  OCHamcrest by Jon Reid, http://qualitycoding.org/about/
-//  Copyright 2016 hamcrest.org. See LICENSE.txt
-//  Contribution by Justin Shacklette
-
-#import <OCHamcrestIOS/HCDiagnosingMatcher.h>
-
-
-/*!
- * @abstract Matches objects whose "property" (or simple method) satisfies a nested matcher.
- */
-@interface HCHasProperty : HCDiagnosingMatcher
-
-- (instancetype)initWithProperty:(NSString *)propertyName value:(id <HCMatcher>)valueMatcher;
-
-@end
-
-
-FOUNDATION_EXPORT id HC_hasProperty(NSString *propertyName, id valueMatcher);
-
-#ifndef HC_DISABLE_SHORT_SYNTAX
-/*!
- * @abstract Creates a matcher that matches when the examined object has an instance method with the
- * specified name whose return value satisfies the specified matcher.
- * @param propertyName The name of an instance method without arguments that returns an object.
- * @param valueMatcher The matcher to satisfy for the return value, or an expected value for
- * <em>equalTo</em> matching.
- * @discussion Note: While this matcher factory is called "hasProperty", it applies to the return
- * values of any instance methods without arguments, not just properties.
- *
- * <b>Examples</b><br />
- * <pre>assertThat(person, hasProperty(\@"firstName", equalTo(\@"Joe")))</pre>
- * <pre>assertThat(person, hasProperty(\@"firstName", \@"Joe"))</pre>
- *
- * <b>Name Clash</b><br />
- * In the event of a name clash, <code>#define HC_DISABLE_SHORT_SYNTAX</code> and use the synonym
- * HC_hasProperty instead.
- */
-static inline id hasProperty(NSString *propertyName, id valueMatcher)
-{
-    return HC_hasProperty(propertyName, valueMatcher);
-}
-#endif
diff --git a/submodules/HockeySDK-iOS/Support/HockeySDKTests/Vendor/OCHamcrestIOS.framework/Versions/A/Headers/HCInvocationMatcher.h b/submodules/HockeySDK-iOS/Support/HockeySDKTests/Vendor/OCHamcrestIOS.framework/Versions/A/Headers/HCInvocationMatcher.h
deleted file mode 100644
index ea5cbfcbac..0000000000
--- a/submodules/HockeySDK-iOS/Support/HockeySDKTests/Vendor/OCHamcrestIOS.framework/Versions/A/Headers/HCInvocationMatcher.h
+++ /dev/null
@@ -1,40 +0,0 @@
-//  OCHamcrest by Jon Reid, http://qualitycoding.org/about/
-//  Copyright 2016 hamcrest.org. See LICENSE.txt
-
-#import <OCHamcrestIOS/HCBaseMatcher.h>
-
-
-/*!
- * @abstract Supporting class for matching a feature of an object.
- * @discussion Tests whether the result of passing the specified invocation to the value satisfies
- * the specified matcher.
- */
-@interface HCInvocationMatcher : HCBaseMatcher
-{
-    NSInvocation *_invocation;
-    id <HCMatcher> _subMatcher;
-}
-
-/*!
- * @abstract Determines whether a mismatch will be described in short form.
- * @discussion Default is long form, which describes the object, the name of the invocation, and the
- * sub-matcher's mismatch diagnosis. Short form only has the sub-matcher's mismatch diagnosis.
- */
-@property (nonatomic, assign) BOOL shortMismatchDescription;
-
-/*!
- * @abstract Initializes a newly allocated HCInvocationMatcher with an invocation and a matcher.
- */
-- (instancetype)initWithInvocation:(NSInvocation *)anInvocation matching:(id <HCMatcher>)aMatcher;
-
-/*!
- * @abstract Invokes stored invocation on the specified item and returns the result.
- */
-- (id)invokeOn:(id)item;
-
-/*!
- * @abstract Returns string representation of the invocation's selector.
- */
-- (NSString *)stringFromSelector;
-
-@end
diff --git a/submodules/HockeySDK-iOS/Support/HockeySDKTests/Vendor/OCHamcrestIOS.framework/Versions/A/Headers/HCIs.h b/submodules/HockeySDK-iOS/Support/HockeySDKTests/Vendor/OCHamcrestIOS.framework/Versions/A/Headers/HCIs.h
deleted file mode 100644
index 73071180fe..0000000000
--- a/submodules/HockeySDK-iOS/Support/HockeySDKTests/Vendor/OCHamcrestIOS.framework/Versions/A/Headers/HCIs.h
+++ /dev/null
@@ -1,50 +0,0 @@
-//  OCHamcrest by Jon Reid, http://qualitycoding.org/about/
-//  Copyright 2016 hamcrest.org. See LICENSE.txt
-
-#import <OCHamcrestIOS/HCBaseMatcher.h>
-
-
-/*!
- * @abstract Decorates another matcher.
- */
-@interface HCIs : HCBaseMatcher
-
-- (instancetype)initWithMatcher:(id <HCMatcher>)matcher;
-
-@end
-
-
-FOUNDATION_EXPORT id HC_is(id value);
-
-#ifndef HC_DISABLE_SHORT_SYNTAX
-/*!
- * @abstract Wraps an existing matcher, or provides a shortcut to the frequently
- * used <code>is(equalTo(x))</code>.
- * @param value The matcher to satisfy, or an expected value for <em>equalTo</em> matching.
- * @discussion
- * If <em>value</em>is a matcher, its behavior is retained, but the test may be slightly more
- * expressive. For example:
- * <ul>
- *   <li><code>assertThat(\@(value), equalTo(\@5))</code></li>
- *   <li><code>assertThat(\@(value), is(equalTo(\@5)))</code></li>
- * </ul>
- *
- * If <em>value</em>is not a matcher, it is wrapped in an <em>equalTo</em> matcher. This makes the
- * following statements equivalent:
- * <ul>
- *   <li><code>assertThat(cheese, equalTo(smelly))</code></li>
- *   <li><code>assertThat(cheese, is(equalTo(smelly)))</code></li>
- *   <li><code>assertThat(cheese, is(smelly))</code></li>
- * </ul>
- *
- * Choose the style that makes your expression most readable. This will vary depending on context.
- *
- * <b>Name Clash</b><br />
- * In the event of a name clash, <code>#define HC_DISABLE_SHORT_SYNTAX</code> and use the synonym
- * HC_is instead.
- */
-static inline id is(id value)
-{
-    return HC_is(value);
-}
-#endif
diff --git a/submodules/HockeySDK-iOS/Support/HockeySDKTests/Vendor/OCHamcrestIOS.framework/Versions/A/Headers/HCIsAnything.h b/submodules/HockeySDK-iOS/Support/HockeySDKTests/Vendor/OCHamcrestIOS.framework/Versions/A/Headers/HCIsAnything.h
deleted file mode 100644
index 3c1d8985f0..0000000000
--- a/submodules/HockeySDK-iOS/Support/HockeySDKTests/Vendor/OCHamcrestIOS.framework/Versions/A/Headers/HCIsAnything.h
+++ /dev/null
@@ -1,51 +0,0 @@
-//  OCHamcrest by Jon Reid, http://qualitycoding.org/about/
-//  Copyright 2016 hamcrest.org. See LICENSE.txt
-
-#import <OCHamcrestIOS/HCBaseMatcher.h>
-
-
-/*!
- * @abstract Matches anything.
- */
-@interface HCIsAnything : HCBaseMatcher
-
-- (instancetype)init;
-- (instancetype)initWithDescription:(NSString *)description;
-
-@end
-
-
-FOUNDATION_EXPORT id HC_anything(void);
-
-#ifndef HC_DISABLE_SHORT_SYNTAX
-/*!
- * @abstract Creates a matcher that always matches, regardless of the examined object.
- * @discussion
- * <b>Name Clash</b><br />
- * In the event of a name clash, <code>#define HC_DISABLE_SHORT_SYNTAX</code> and use the synonym
- * HC_anything instead.
- */
-static inline id anything(void)
-{
-    return HC_anything();
-}
-#endif
-
-
-FOUNDATION_EXPORT id HC_anythingWithDescription(NSString *description);
-
-#ifndef HC_DISABLE_SHORT_SYNTAX
-/*!
- * @abstract Creates a matcher that matches anything, regardless of the examined object, but
- * describes itself with the specified NSString.
- * @param description A meaningful string used to describe this matcher.
- * @discussion
- * <b>Name Clash</b><br />
- * In the event of a name clash, <code>#define HC_DISABLE_SHORT_SYNTAX</code> and use the synonym
- * HC_anything instead.
- */
-static inline id anythingWithDescription(NSString *description)
-{
-    return HC_anythingWithDescription(description);
-}
-#endif
diff --git a/submodules/HockeySDK-iOS/Support/HockeySDKTests/Vendor/OCHamcrestIOS.framework/Versions/A/Headers/HCIsCloseTo.h b/submodules/HockeySDK-iOS/Support/HockeySDKTests/Vendor/OCHamcrestIOS.framework/Versions/A/Headers/HCIsCloseTo.h
deleted file mode 100644
index e3c8d4951e..0000000000
--- a/submodules/HockeySDK-iOS/Support/HockeySDKTests/Vendor/OCHamcrestIOS.framework/Versions/A/Headers/HCIsCloseTo.h
+++ /dev/null
@@ -1,38 +0,0 @@
-//  OCHamcrest by Jon Reid, http://qualitycoding.org/about/
-//  Copyright 2016 hamcrest.org. See LICENSE.txt
-
-#import <OCHamcrestIOS/HCBaseMatcher.h>
-
-
-/*!
- * @abstract Matchers numbers close to a value, within a delta range.
- */
-@interface HCIsCloseTo : HCBaseMatcher
-
-- (instancetype)initWithValue:(double)value delta:(double)delta;
-
-@end
-
-
-FOUNDATION_EXPORT id HC_closeTo(double value, double delta);
-
-#ifndef HC_DISABLE_SHORT_SYNTAX
-/*!
- * @abstract Creates a matcher for NSNumbers that matches when the examined number is close to the
- * specified value, within the specified delta.
- * @param value The expected value of matching numbers.
- * @param delta The delta within which matches will be allowed.
- * @discussion Invokes <code>-doubleValue</code> on the examined number to get its value.
- *
- * <b>Example</b><br />
- * <pre>assertThat(\@1.03, closeTo(1.0, 0.03)</pre>
- *
- * <b>Name Clash</b><br />
- * In the event of a name clash, <code>#define HC_DISABLE_SHORT_SYNTAX</code> and use the synonym
- * HC_closeTo instead.
- */
-static inline id closeTo(double value, double delta)
-{
-    return HC_closeTo(value, delta);
-}
-#endif
diff --git a/submodules/HockeySDK-iOS/Support/HockeySDKTests/Vendor/OCHamcrestIOS.framework/Versions/A/Headers/HCIsCollectionContaining.h b/submodules/HockeySDK-iOS/Support/HockeySDKTests/Vendor/OCHamcrestIOS.framework/Versions/A/Headers/HCIsCollectionContaining.h
deleted file mode 100644
index 7f55bd1c2f..0000000000
--- a/submodules/HockeySDK-iOS/Support/HockeySDKTests/Vendor/OCHamcrestIOS.framework/Versions/A/Headers/HCIsCollectionContaining.h
+++ /dev/null
@@ -1,90 +0,0 @@
-//  OCHamcrest by Jon Reid, http://qualitycoding.org/about/
-//  Copyright 2016 hamcrest.org. See LICENSE.txt
-
-#import <OCHamcrestIOS/HCDiagnosingMatcher.h>
-
-
-/*!
- * @abstract Matches if any item in a collection satisfies a nested matcher.
- */
-@interface HCIsCollectionContaining : HCDiagnosingMatcher
-
-- (instancetype)initWithMatcher:(id <HCMatcher>)elementMatcher;
-
-@end
-
-
-FOUNDATION_EXPORT id HC_hasItem(id itemMatcher);
-
-#ifndef HC_DISABLE_SHORT_SYNTAX
-/*!
- * @abstract hasItem(itemMatcher) -
- * Creates a matcher for collections that matches when at least one item in the examined collection
- * satisfies the specified matcher.
- * @param itemMatcher The matcher to apply to collection elements, or an expected value
- * for <em>equalTo</em> matching.
- * @discussion This matcher works on any collection that conforms to the NSFastEnumeration protocol,
- * performing a single pass.
- *
- * If <em>itemMatcher</em> is not a matcher, it is implicitly wrapped in an <em>equalTo</em> matcher
- * to check for equality.
- *
- * <b>Example</b><br />
- * <pre>assertThat(\@[\@1, \@2, \@3], hasItem(equalTo(\@2)))</pre>
- *
- * <pre>assertThat(\@[\@1, \@2, \@3], hasItem(\@2))</pre>
- *
- * <b>Name Clash</b><br />
- * In the event of a name clash, <code>#define HC_DISABLE_SHORT_SYNTAX</code> and use the synonym
- * HC_hasItem instead.
- */
-#define hasItem HC_hasItem
-#endif
-
-
-FOUNDATION_EXPORT id HC_hasItemsIn(NSArray *itemMatchers);
-
-#ifndef HC_DISABLE_SHORT_SYNTAX
-/*!
- * @abstract Creates a matcher for collections that matches when all specified matchers are
- * satisfied by any item in the examined collection.
- * @param itemMatchers An array of matchers. Any element that is not a matcher is implicitly wrapped
- * in an <em>equalTo</em> matcher to check for equality.
- * @discussion This matcher works on any collection that conforms to the NSFastEnumeration protocol,
- * performing one pass for each matcher.
- *
- * <b>Example</b><br />
- * <pre>assertThat(\@[\@"foo", \@"bar", \@"baz"], hasItems(\@[endsWith(\@"z"), endsWith(\@"o")]))</pre>
- *
- * <b>Name Clash</b><br />
- * In the event of a name clash, <code>#define HC_DISABLE_SHORT_SYNTAX</code> and use the synonym
- * HC_hasItemsIn instead.
- */
-static inline id hasItemsIn(NSArray *itemMatchers)
-{
-    return HC_hasItemsIn(itemMatchers);
-}
-#endif
-
-
-FOUNDATION_EXPORT id HC_hasItems(id itemMatchers, ...) NS_REQUIRES_NIL_TERMINATION;
-
-#ifndef HC_DISABLE_SHORT_SYNTAX
-/*!
- * @abstract Creates a matcher for collections that matches when all specified matchers are
- * satisfied by any item in the examined collection.
- * @param itemMatchers... A comma-separated list of matchers ending with <code>nil</code>.
- * Any argument that is not a matcher is implicitly wrapped in an <em>equalTo</em> matcher to check
- * for equality.
- * @discussion This matcher works on any collection that conforms to the NSFastEnumeration protocol,
- * performing one pass for each matcher.
- *
- * <b>Example</b><br />
- * <pre>assertThat(\@[\@"foo", \@"bar", \@"baz"], hasItems(endsWith(\@"z"), endsWith(\@"o"), nil))</pre>
- *
- * <b>Name Clash</b><br />
- * In the event of a name clash, <code>#define HC_DISABLE_SHORT_SYNTAX</code> and use the synonym
- * HC_hasItems instead.
- */
-#define hasItems(itemMatchers...) HC_hasItems(itemMatchers)
-#endif
diff --git a/submodules/HockeySDK-iOS/Support/HockeySDKTests/Vendor/OCHamcrestIOS.framework/Versions/A/Headers/HCIsCollectionContainingInAnyOrder.h b/submodules/HockeySDK-iOS/Support/HockeySDKTests/Vendor/OCHamcrestIOS.framework/Versions/A/Headers/HCIsCollectionContainingInAnyOrder.h
deleted file mode 100644
index e52487c915..0000000000
--- a/submodules/HockeySDK-iOS/Support/HockeySDKTests/Vendor/OCHamcrestIOS.framework/Versions/A/Headers/HCIsCollectionContainingInAnyOrder.h
+++ /dev/null
@@ -1,74 +0,0 @@
-//  OCHamcrest by Jon Reid, http://qualitycoding.org/about/
-//  Copyright 2016 hamcrest.org. See LICENSE.txt
-
-#import <OCHamcrestIOS/HCDiagnosingMatcher.h>
-
-
-/*!
- * @abstract Matches if every item in a collection, in any order, satisfy a list of nested matchers.
- */
-@interface HCIsCollectionContainingInAnyOrder : HCDiagnosingMatcher
-
-- (instancetype)initWithMatchers:(NSArray *)itemMatchers;
-
-@end
-
-
-FOUNDATION_EXPORT id HC_containsInAnyOrderIn(NSArray *itemMatchers);
-
-#ifndef HC_DISABLE_SHORT_SYNTAX
-/*!
- * @abstract Creates an order-agnostic matcher for collections that matches when each item in the
- * examined collection satisfies one matcher anywhere in the specified list of matchers.
- * @param itemMatchers An array of matchers. Any element that is not a matcher is implicitly wrapped
- * in an <em>equalTo</em> matcher to check for equality.
- * @discussion This matcher works on any collection that conforms to the NSFastEnumeration protocol,
- * performing a single pass. For a positive match, the examined collection must be of the same
- * length as the specified list of matchers.
- *
- * Note: Each matcher in the specified list will only be used once during a given examination, so
- * be careful when specifying matchers that may be satisfied by more than one entry in an examined
- * collection.
- *
- * <b>Examples</b><br />
- * <pre>assertThat(\@[\@"foo", \@"bar"], containsInAnyOrderIn(\@[equalTo(\@"bar"), equalTo(\@"foo")]))</pre>
- * <pre>assertThat(\@[\@"foo", \@"bar"], containsInAnyOrderIn(@[\@"bar", \@"foo"]))</pre>
- *
- * <b>Name Clash</b><br />
- * In the event of a name clash, <code>#define HC_DISABLE_SHORT_SYNTAX</code> and use the synonym
- * HC_containsInAnyOrderIn instead.
- */
-static inline id containsInAnyOrderIn(NSArray *itemMatchers)
-{
-    return HC_containsInAnyOrderIn(itemMatchers);
-}
-#endif
-
-
-FOUNDATION_EXPORT id HC_containsInAnyOrder(id itemMatchers, ...) NS_REQUIRES_NIL_TERMINATION;
-
-#ifndef HC_DISABLE_SHORT_SYNTAX
-/*!
- * @abstract Creates an order-agnostic matcher for collections that matches when each item in the
- * examined collection satisfies one matcher anywhere in the specified list of matchers.
- * @param itemMatchers... A comma-separated list of matchers ending with <code>nil</code>.
- * Any argument that is not a matcher is implicitly wrapped in an <em>equalTo</em> matcher to check
- * for equality.
- * @discussion This matcher works on any collection that conforms to the NSFastEnumeration protocol,
- * performing a single pass. For a positive match, the examined collection must be of the same
- * length as the specified list of matchers.
- *
- * Note: Each matcher in the specified list will only be used once during a given examination, so
- * be careful when specifying matchers that may be satisfied by more than one entry in an examined
- * collection.
- *
- * <b>Examples</b><br />
- * <pre>assertThat(\@[\@"foo", \@"bar"], containsInAnyOrder(equalTo(\@"bar"), equalTo(\@"foo"), nil))</pre>
- * <pre>assertThat(\@[\@"foo", \@"bar"], containsInAnyOrder(\@"bar", \@"foo", nil))</pre>
- *
- * <b>Name Clash</b><br />
- * In the event of a name clash, <code>#define HC_DISABLE_SHORT_SYNTAX</code> and use the synonym
- * HC_containsInAnyOrder instead.
- */
-#define containsInAnyOrder(itemMatchers...) HC_containsInAnyOrder(itemMatchers)
-#endif
diff --git a/submodules/HockeySDK-iOS/Support/HockeySDKTests/Vendor/OCHamcrestIOS.framework/Versions/A/Headers/HCIsCollectionContainingInOrder.h b/submodules/HockeySDK-iOS/Support/HockeySDKTests/Vendor/OCHamcrestIOS.framework/Versions/A/Headers/HCIsCollectionContainingInOrder.h
deleted file mode 100644
index be22dcf7ed..0000000000
--- a/submodules/HockeySDK-iOS/Support/HockeySDKTests/Vendor/OCHamcrestIOS.framework/Versions/A/Headers/HCIsCollectionContainingInOrder.h
+++ /dev/null
@@ -1,66 +0,0 @@
-//  OCHamcrest by Jon Reid, http://qualitycoding.org/about/
-//  Copyright 2016 hamcrest.org. See LICENSE.txt
-
-#import <OCHamcrestIOS/HCDiagnosingMatcher.h>
-
-
-/*!
- * @abstract Matches if every item in a collection satisfies a list of nested matchers, in order.
- */
-@interface HCIsCollectionContainingInOrder : HCDiagnosingMatcher
-
-- (instancetype)initWithMatchers:(NSArray *)itemMatchers;
-
-@end
-
-
-FOUNDATION_EXPORT id HC_containsIn(NSArray *itemMatchers);
-
-#ifndef HC_DISABLE_SHORT_SYNTAX
-/*!
- * @abstract Creates a matcher for collections that matches when each item in the examined
- * collection satisfies the corresponding matcher in the specified list of matchers.
- * @param itemMatchers An array of matchers. Any element that is not a matcher is implicitly wrapped
- * in an <em>equalTo</em> matcher to check for equality.
- * @discussion This matcher works on any collection that conforms to the NSFastEnumeration protocol,
- * performing a single pass. For a positive match, the examined collection must be of the same
- * length as the specified list of matchers.
- *
- * <b>Examples</b><br />
- * <pre>assertThat(\@[\@"foo", \@"bar"], containsIn(\@[equalTo(\@"foo"), equalTo(\@"bar")]))</pre>
- * <pre>assertThat(\@[\@"foo", \@"bar"], containsIn(\@[\@"foo", \@"bar"]))</pre>
- *
- * <b>Name Clash</b><br />
- * In the event of a name clash, <code>#define HC_DISABLE_SHORT_SYNTAX</code> and use the synonym
- * HC_containsIn instead.)
- */
-static inline id containsIn(NSArray *itemMatchers)
-{
-    return HC_containsIn(itemMatchers);
-}
-#endif
-
-
-FOUNDATION_EXPORT id HC_contains(id itemMatchers, ...) NS_REQUIRES_NIL_TERMINATION;
-
-#ifndef HC_DISABLE_SHORT_SYNTAX
-/*!
- * @abstract Creates a matcher for collections that matches when each item in the examined
- * collection satisfies the corresponding matcher in the specified list of matchers.
- * @param itemMatchers... A comma-separated list of matchers ending with <code>nil</code>.
- * Any argument that is not a matcher is implicitly wrapped in an <em>equalTo</em> matcher to check
- * for equality.
- * @discussion This matcher works on any collection that conforms to the NSFastEnumeration protocol,
- * performing a single pass. For a positive match, the examined collection must be of the same
- * length as the specified list of matchers.
- *
- * <b>Examples</b><br />
- * <pre>assertThat(\@[\@"foo", \@"bar"], contains(equalTo(\@"foo"), equalTo(\@"bar"), nil))</pre>
- * <pre>assertThat(\@[\@"foo", \@"bar"], contains(\@"foo", \@"bar", nil))</pre>
- *
- * <b>Name Clash</b><br />
- * In the event of a name clash, <code>#define HC_DISABLE_SHORT_SYNTAX</code> and use the synonym
- * HC_contains instead.)
- */
-#define contains(itemMatchers...) HC_contains(itemMatchers)
-#endif
diff --git a/submodules/HockeySDK-iOS/Support/HockeySDKTests/Vendor/OCHamcrestIOS.framework/Versions/A/Headers/HCIsCollectionContainingInRelativeOrder.h b/submodules/HockeySDK-iOS/Support/HockeySDKTests/Vendor/OCHamcrestIOS.framework/Versions/A/Headers/HCIsCollectionContainingInRelativeOrder.h
deleted file mode 100644
index dae89fdd13..0000000000
--- a/submodules/HockeySDK-iOS/Support/HockeySDKTests/Vendor/OCHamcrestIOS.framework/Versions/A/Headers/HCIsCollectionContainingInRelativeOrder.h
+++ /dev/null
@@ -1,43 +0,0 @@
-//  OCHamcrest by Jon Reid, http://qualitycoding.org/about/
-//  Copyright 2016 hamcrest.org. See LICENSE.txt
-
-#import <OCHamcrestIOS/HCDiagnosingMatcher.h>
-
-
-/*!
- * @abstract Matches if every item in a collection satisfies a list of nested matchers, in order.
- */
-@interface HCIsCollectionContainingInRelativeOrder : HCDiagnosingMatcher
-
-- (instancetype)initWithMatchers:(NSArray *)itemMatchers;
-
-@end
-
-
-FOUNDATION_EXPORT id HC_containsInRelativeOrder(NSArray *itemMatchers);
-
-#ifndef HC_DISABLE_SHORT_SYNTAX
-/*!
- * @abstract Creates a matcher for collections that matches when the examined collection contains
- * items satisfying the specified list of matchers, in the same relative order.
- * @param itemMatchers Array of matchers that must be satisfied by the items provided by the
- * examined collection in the same relative order.
- * @discussion This matcher works on any collection that conforms to the NSFastEnumeration protocol,
- * performing a single pass.
- *
- * Any element of <em>itemMatchers</em> that is not a matcher is implicitly wrapped in an
- * <em>equalTo</em> matcher to check for equality.
- *
- * <b>Examples</b><br />
- * <pre>assertThat(\@[\@1, \@2, \@3, \@4, \@5], containsInRelativeOrder(equalTo(\@2), equalTo(\@4)))</pre>
- * <pre>assertThat(\@[\@1, \@2, \@3, \@4, \@5], containsInRelativeOrder(\@2, \@4))</pre>
- *
- * <b>Name Clash</b><br />
- * In the event of a name clash, <code>#define HC_DISABLE_SHORT_SYNTAX</code> and use the synonym
- * HC_containsInRelativeOrder instead.
- */
-static inline id containsInRelativeOrder(NSArray *itemMatchers)
-{
-    return HC_containsInRelativeOrder(itemMatchers);
-}
-#endif
diff --git a/submodules/HockeySDK-iOS/Support/HockeySDKTests/Vendor/OCHamcrestIOS.framework/Versions/A/Headers/HCIsCollectionOnlyContaining.h b/submodules/HockeySDK-iOS/Support/HockeySDKTests/Vendor/OCHamcrestIOS.framework/Versions/A/Headers/HCIsCollectionOnlyContaining.h
deleted file mode 100644
index 6c28e09344..0000000000
--- a/submodules/HockeySDK-iOS/Support/HockeySDKTests/Vendor/OCHamcrestIOS.framework/Versions/A/Headers/HCIsCollectionOnlyContaining.h
+++ /dev/null
@@ -1,58 +0,0 @@
-//  OCHamcrest by Jon Reid, http://qualitycoding.org/about/
-//  Copyright 2016 hamcrest.org. See LICENSE.txt
-
-#import <OCHamcrestIOS/HCEvery.h>
-
-
-/*!
- * @abstract Matches if every item in a collection satisfies any of the nested matchers.
- */
-@interface HCIsCollectionOnlyContaining : HCEvery
-@end
-
-FOUNDATION_EXPORT id HC_onlyContainsIn(NSArray *itemMatchers);
-
-#ifndef HC_DISABLE_SHORT_SYNTAX
-/*!
- * @abstract Creates a matcher for collections that matches when each item of the examined
- * collection satisfies any of the specified matchers.
- * @param itemMatchers An array of matchers. Any element that is not a matcher is implicitly wrapped
- * in an <em>equalTo</em> matcher to check for equality.
- * @discussion This matcher works on any collection that conforms to the NSFastEnumeration protocol,
- * performing a single pass. Any matcher may match multiple elements.
- *
- * <b>Example</b><br />
- * <pre>assertThat(\@[\@"Jon", \@"John", \@"Bob"], onlyContainsIn(\@[startsWith(\@"Jo"), startsWith(\@("Bo")]))</pre>
- *
- * <b>Name Clash</b><br />
- * In the event of a name clash, <code>#define HC_DISABLE_SHORT_SYNTAX</code> and use the synonym
- * HC_onlyContainsIn instead.
- */
-static inline id onlyContainsIn(NSArray *itemMatchers)
-{
-    return HC_onlyContainsIn(itemMatchers);
-}
-#endif
-
-
-FOUNDATION_EXPORT id HC_onlyContains(id itemMatchers, ...) NS_REQUIRES_NIL_TERMINATION;
-
-#ifndef HC_DISABLE_SHORT_SYNTAX
-/*!
- * @abstract Creates a matcher for collections that matches when each item of the examined
- * collection satisfies any of the specified matchers.
- * @param itemMatchers... A comma-separated list of matchers ending with <code>nil</code>.
- * Any argument that is not a matcher is implicitly wrapped in an <em>equalTo</em> matcher to check for
- * equality.
- * @discussion This matcher works on any collection that conforms to the NSFastEnumeration protocol,
- * performing a single pass. Any matcher may match multiple elements.
- *
- * <b>Example</b><br />
- * <pre>assertThat(\@[\@"Jon", \@"John", \@"Bob"], onlyContains(startsWith(\@"Jo"), startsWith(\@("Bo"), nil))</pre>
- *
- * <b>Name Clash</b><br />
- * In the event of a name clash, <code>#define HC_DISABLE_SHORT_SYNTAX</code> and use the synonym
- * HC_onlyContains instead.
- */
-#define onlyContains(itemMatchers...) HC_onlyContains(itemMatchers)
-#endif
diff --git a/submodules/HockeySDK-iOS/Support/HockeySDKTests/Vendor/OCHamcrestIOS.framework/Versions/A/Headers/HCIsDictionaryContaining.h b/submodules/HockeySDK-iOS/Support/HockeySDKTests/Vendor/OCHamcrestIOS.framework/Versions/A/Headers/HCIsDictionaryContaining.h
deleted file mode 100644
index 4064e44572..0000000000
--- a/submodules/HockeySDK-iOS/Support/HockeySDKTests/Vendor/OCHamcrestIOS.framework/Versions/A/Headers/HCIsDictionaryContaining.h
+++ /dev/null
@@ -1,42 +0,0 @@
-//  OCHamcrest by Jon Reid, http://qualitycoding.org/about/
-//  Copyright 2016 hamcrest.org. See LICENSE.txt
-
-#import <OCHamcrestIOS/HCBaseMatcher.h>
-
-
-/*!
- * @abstract Matches if any entry in a dictionary satisfies the nested pair of matchers.
- */
-@interface HCIsDictionaryContaining : HCBaseMatcher
-
-- (instancetype)initWithKeyMatcher:(id <HCMatcher>)keyMatcher
-                      valueMatcher:(id <HCMatcher>)valueMatcher;
-
-@end
-
-
-FOUNDATION_EXPORT id HC_hasEntry(id keyMatcher, id valueMatcher);
-
-#ifndef HC_DISABLE_SHORT_SYNTAX
-/*!
- * @abstract Creates a matcher for NSDictionaries that matches when the examined dictionary contains
- * at least one entry whose key satisfies the specified <code>keyMatcher</code> <b>and</b> whose
- * value satisfies the specified <code>valueMatcher</code>.
- * @param keyMatcher The matcher to satisfy for the key, or an expected value for <em>equalTo</em> matching.
- * @param valueMatcher The matcher to satisfy for the value, or an expected value for <em>equalTo</em> matching.
- * @discussion Any argument that is not a matcher is implicitly wrapped in an <em>equalTo</em>
- * matcher to check for equality.
- *
- * <b>Examples</b><br />
- * <pre>assertThat(myDictionary, hasEntry(equalTo(\@"foo"), equalTo(\@"bar")))</pre>
- * <pre>assertThat(myDictionary, hasEntry(\@"foo", \@"bar"))</pre>
- *
- * <b>Name Clash</b><br />
- * In the event of a name clash, <code>#define HC_DISABLE_SHORT_SYNTAX</code> and use the synonym
- * HC_hasEntry instead.
- */
-static inline id hasEntry(id keyMatcher, id valueMatcher)
-{
-    return HC_hasEntry(keyMatcher, valueMatcher);
-}
-#endif
diff --git a/submodules/HockeySDK-iOS/Support/HockeySDKTests/Vendor/OCHamcrestIOS.framework/Versions/A/Headers/HCIsDictionaryContainingEntries.h b/submodules/HockeySDK-iOS/Support/HockeySDKTests/Vendor/OCHamcrestIOS.framework/Versions/A/Headers/HCIsDictionaryContainingEntries.h
deleted file mode 100644
index 34d4335c98..0000000000
--- a/submodules/HockeySDK-iOS/Support/HockeySDKTests/Vendor/OCHamcrestIOS.framework/Versions/A/Headers/HCIsDictionaryContainingEntries.h
+++ /dev/null
@@ -1,63 +0,0 @@
-//  OCHamcrest by Jon Reid, http://qualitycoding.org/about/
-//  Copyright 2016 hamcrest.org. See LICENSE.txt
-
-#import <OCHamcrestIOS/HCDiagnosingMatcher.h>
-
-
-/*!
- * @abstract Matches if dictionary contains entries that satisfy the list of keys and value
- * matchers.
- */
-@interface HCIsDictionaryContainingEntries : HCDiagnosingMatcher
-
-- (instancetype)initWithKeys:(NSArray *)keys
-               valueMatchers:(NSArray *)valueMatchers;
-
-@end
-
-FOUNDATION_EXPORT id HC_hasEntriesIn(NSDictionary *valueMatchersForKeys);
-
-#ifndef HC_DISABLE_SHORT_SYNTAX
-/*!
- * @abstract Creates a matcher for NSDictionaries that matches when the examined dictionary contains
- * entries satisfying a dictionary of keys and their value matchers.
- * @param valueMatchersForKeys A dictionary of keys (not matchers) and their value matchers. Any
- * value argument that is not a matcher is implicitly wrapped in an <em>equalTo</em> matcher to
- * check for equality.
- * @discussion
- * <b>Examples</b><br />
- * <pre>assertThat(personDict, hasEntriesIn(\@{\@"firstName": equalTo(\@"Jon"), \@"lastName": equalTo(\@"Reid")}))</pre>
- * <pre>assertThat(personDict, hasEntriesIn(\@{\@"firstName": \@"Jon", \@"lastName": \@"Reid"}))</pre>
- *
- * <b>Name Clash</b><br />
- * In the event of a name clash, <code>#define HC_DISABLE_SHORT_SYNTAX</code> and use the synonym
- * HC_hasEntryIn instead.
- */
-static inline id hasEntriesIn(NSDictionary *valueMatchersForKeys)
-{
-    return HC_hasEntriesIn(valueMatchersForKeys);
-}
-#endif
-
-FOUNDATION_EXPORT id HC_hasEntries(id keysAndValueMatchers, ...) NS_REQUIRES_NIL_TERMINATION;
-
-#ifndef HC_DISABLE_SHORT_SYNTAX
-/*!
- * @abstract Creates a matcher for NSDictionaries that matches when the examined dictionary contains
- * entries satisfying a list of alternating keys and their value matchers.
- * @param keysAndValueMatchers... A key (not a matcher) to look up, followed by a value matcher or
- * an expected value for <em>equalTo</em> matching, in a comma-separated list ending
- * with <code>nil</code>
- * @discussion Note that the keys must be actual keys, not matchers. Any value argument that is not
- * a matcher is implicitly wrapped in an <em>equalTo</em> matcher to check for equality.
- *
- * <b>Examples</b><br />
- * <pre>assertThat(personDict, hasEntries(\@"firstName", equalTo(\@"Jon"), \@"lastName", equalTo(\@"Reid"), nil))</pre>
- * <pre>assertThat(personDict, hasEntries(\@"firstName", \@"Jon", \@"lastName", \@"Reid", nil))</pre>
- *
- * <b>Name Clash</b><br />
- * In the event of a name clash, <code>#define HC_DISABLE_SHORT_SYNTAX</code> and use the synonym
- * HC_hasEntry instead.
- */
-#define hasEntries(keysAndValueMatchers...) HC_hasEntries(keysAndValueMatchers)
-#endif
diff --git a/submodules/HockeySDK-iOS/Support/HockeySDKTests/Vendor/OCHamcrestIOS.framework/Versions/A/Headers/HCIsDictionaryContainingKey.h b/submodules/HockeySDK-iOS/Support/HockeySDKTests/Vendor/OCHamcrestIOS.framework/Versions/A/Headers/HCIsDictionaryContainingKey.h
deleted file mode 100644
index ed6311d706..0000000000
--- a/submodules/HockeySDK-iOS/Support/HockeySDKTests/Vendor/OCHamcrestIOS.framework/Versions/A/Headers/HCIsDictionaryContainingKey.h
+++ /dev/null
@@ -1,39 +0,0 @@
-//  OCHamcrest by Jon Reid, http://qualitycoding.org/about/
-//  Copyright 2016 hamcrest.org. See LICENSE.txt
-
-#import <OCHamcrestIOS/HCBaseMatcher.h>
-
-
-/*!
- * @abstract Matches if any entry in a dictionary has a key satisfying the nested matcher.
- */
-@interface HCIsDictionaryContainingKey : HCBaseMatcher
-
-- (instancetype)initWithKeyMatcher:(id <HCMatcher>)keyMatcher;
-
-@end
-
-
-FOUNDATION_EXPORT id HC_hasKey(id keyMatcher);
-
-#ifndef HC_DISABLE_SHORT_SYNTAX
-/*!
- * @abstract Creates a matcher for NSDictionaries that matches when the examined dictionary contains
- * at least key that satisfies the specified matcher.
- * @param keyMatcher The matcher to satisfy for the key, or an expected value for <em>equalTo</em> matching.
- * @discussion Any argument that is not a matcher is implicitly wrapped in an <em>equalTo</em>
- * matcher to check for equality.
- *
- * <b>Examples</b><br />
- * <pre>assertThat(myDictionary, hasEntry(equalTo(\@"foo")))</pre>
- * <pre>assertThat(myDictionary, hasEntry(\@"foo"))</pre>
- *
- * <b>Name Clash</b><br />
- * In the event of a name clash, <code>#define HC_DISABLE_SHORT_SYNTAX</code> and use the synonym
- * HC_hasKey instead.
- */
-static inline id hasKey(id keyMatcher)
-{
-    return HC_hasKey(keyMatcher);
-}
-#endif
diff --git a/submodules/HockeySDK-iOS/Support/HockeySDKTests/Vendor/OCHamcrestIOS.framework/Versions/A/Headers/HCIsDictionaryContainingValue.h b/submodules/HockeySDK-iOS/Support/HockeySDKTests/Vendor/OCHamcrestIOS.framework/Versions/A/Headers/HCIsDictionaryContainingValue.h
deleted file mode 100644
index cbf4e2b4e5..0000000000
--- a/submodules/HockeySDK-iOS/Support/HockeySDKTests/Vendor/OCHamcrestIOS.framework/Versions/A/Headers/HCIsDictionaryContainingValue.h
+++ /dev/null
@@ -1,41 +0,0 @@
-//  OCHamcrest by Jon Reid, http://qualitycoding.org/about/
-//  Copyright 2016 hamcrest.org. See LICENSE.txt
-
-#import <OCHamcrestIOS/HCBaseMatcher.h>
-
-
-/*!
- * @abstract Matches if any entry in a dictionary has a value satisfying the nested matcher.
- */
-@interface HCIsDictionaryContainingValue : HCBaseMatcher
-
-- (instancetype)initWithValueMatcher:(id <HCMatcher>)valueMatcher;
-
-@end
-
-
-FOUNDATION_EXPORT id HC_hasValue(id valueMatcher);
-
-#ifndef HC_DISABLE_SHORT_SYNTAX
-/*!
- * @abstract Creates a matcher for NSDictionaries that matches when the examined dictionary contains
- * at least value that satisfies the specified matcher.
- * @param valueMatcher The matcher to satisfy for the value, or an expected value for <em>equalTo</em> matching.
- * @discussion This matcher works on any collection that has an <code>-allValues</code> method.
- *
- * Any argument that is not a matcher is implicitly wrapped in an <em>equalTo</em> matcher to check
- * for equality.
- *
- * <b>Examples</b><br />
- * <pre>assertThat(myDictionary, hasValue(equalTo(\@"bar")))</pre>
- * <pre>assertThat(myDictionary, hasValue(\@"bar"))</pre>
- *
- * <b>Name Clash</b><br />
- * In the event of a name clash, <code>#define HC_DISABLE_SHORT_SYNTAX</code> and use the synonym
- * HC_hasValue instead.
- */
-static inline id hasValue(id valueMatcher)
-{
-    return HC_hasValue(valueMatcher);
-}
-#endif
diff --git a/submodules/HockeySDK-iOS/Support/HockeySDKTests/Vendor/OCHamcrestIOS.framework/Versions/A/Headers/HCIsEmptyCollection.h b/submodules/HockeySDK-iOS/Support/HockeySDKTests/Vendor/OCHamcrestIOS.framework/Versions/A/Headers/HCIsEmptyCollection.h
deleted file mode 100644
index 8922faec24..0000000000
--- a/submodules/HockeySDK-iOS/Support/HockeySDKTests/Vendor/OCHamcrestIOS.framework/Versions/A/Headers/HCIsEmptyCollection.h
+++ /dev/null
@@ -1,35 +0,0 @@
-//  OCHamcrest by Jon Reid, http://qualitycoding.org/about/
-//  Copyright 2016 hamcrest.org. See LICENSE.txt
-
-#import <OCHamcrestIOS/HCHasCount.h>
-
-
-/*!
- * @abstract Matches empty collections.
- */
-@interface HCIsEmptyCollection : HCHasCount
-
-- (instancetype)init;
-
-@end
-
-
-FOUNDATION_EXPORT id HC_isEmpty(void);
-
-#ifndef HC_DISABLE_SHORT_SYNTAX
-/*!
- * @abstract Creates a matcher that matches any examined object whose <code>-count</code> method
- * returns zero.
- *
- * <b>Example</b><br />
- * <pre>assertThat(\@[], isEmpty())</pre>
- *
- * <b>Name Clash</b><br />
- * In the event of a name clash, <code>#define HC_DISABLE_SHORT_SYNTAX</code> and use the synonym
- * HC_isEmpty instead.
- */
-static inline id isEmpty(void)
-{
-    return HC_isEmpty();
-}
-#endif
diff --git a/submodules/HockeySDK-iOS/Support/HockeySDKTests/Vendor/OCHamcrestIOS.framework/Versions/A/Headers/HCIsEqual.h b/submodules/HockeySDK-iOS/Support/HockeySDKTests/Vendor/OCHamcrestIOS.framework/Versions/A/Headers/HCIsEqual.h
deleted file mode 100644
index 5c1f15b3ae..0000000000
--- a/submodules/HockeySDK-iOS/Support/HockeySDKTests/Vendor/OCHamcrestIOS.framework/Versions/A/Headers/HCIsEqual.h
+++ /dev/null
@@ -1,36 +0,0 @@
-//  OCHamcrest by Jon Reid, http://qualitycoding.org/about/
-//  Copyright 2016 hamcrest.org. See LICENSE.txt
-
-#import <OCHamcrestIOS/HCBaseMatcher.h>
-
-
-/*!
- * @abstract Is the value equal to another value, as tested by the <code>-isEqual:</code> method?
- */
-@interface HCIsEqual : HCBaseMatcher
-
-- (instancetype)initEqualTo:(id)expectedValue;
-
-@end
-
-
-FOUNDATION_EXPORT id HC_equalTo(id operand);
-
-#ifndef HC_DISABLE_SHORT_SYNTAX
-/*!
- * @abstract Creates a matcher that matches when the examined object is equal to the specified
- * object, as determined by calling the <code>-isEqual:</code> method on the <b>examined</b> object.
- * @param operand The object to compare against as the expected value.
- * @discussion If the specified operand is <code>nil</code>, then the created matcher will match if
- * the examined object itself is <code>nil</code>, or if the examined object's <code>-isEqual:</code>
- * method returns <code>YES</code> when passed a <code>nil</code>.
- *
- * <b>Name Clash</b><br />
- * In the event of a name clash, <code>#define HC_DISABLE_SHORT_SYNTAX</code> and use the synonym
- * HC_equalTo instead.
- */
-static inline id equalTo(id operand)
-{
-    return HC_equalTo(operand);
-}
-#endif
diff --git a/submodules/HockeySDK-iOS/Support/HockeySDKTests/Vendor/OCHamcrestIOS.framework/Versions/A/Headers/HCIsEqualCompressingWhiteSpace.h b/submodules/HockeySDK-iOS/Support/HockeySDKTests/Vendor/OCHamcrestIOS.framework/Versions/A/Headers/HCIsEqualCompressingWhiteSpace.h
deleted file mode 100644
index 948c7a8800..0000000000
--- a/submodules/HockeySDK-iOS/Support/HockeySDKTests/Vendor/OCHamcrestIOS.framework/Versions/A/Headers/HCIsEqualCompressingWhiteSpace.h
+++ /dev/null
@@ -1,41 +0,0 @@
-//  OCHamcrest by Jon Reid, http://qualitycoding.org/about/
-//  Copyright 2016 hamcrest.org. See LICENSE.txt
-
-#import <OCHamcrestIOS/HCBaseMatcher.h>
-
-
-/*!
- * @abstract Tests if a string is equal to another string, when whitespace differences are (mostly) ignored.
- */
-@interface HCIsEqualCompressingWhiteSpace : HCBaseMatcher
-
-- (instancetype)initWithString:(NSString *)string;
-
-@end
-
-
-FOUNDATION_EXPORT id HC_equalToCompressingWhiteSpace(NSString *expectedString);
-
-#ifndef HC_DISABLE_SHORT_SYNTAX
-/*!
- * @abstract Creates a matcher for NSStrings that matches when the examined string is equal to the
- * specified expected string, when whitespace differences are (mostly) ignored.
- * @param expectedString The expected value of matched strings. (Must not be <code>nil</code>.)
- * @discussion To be exact, the following whitespace rules are applied:
- * <ul>
- *   <li>all leading and trailing whitespace of both the <em>expectedString</em> and the examined string are ignored</li>
- *   <li>any remaining whitespace, appearing within either string, is collapsed to a single space before comparison</li>
- * </ul>
- *
- * <b>Example</b><br />
- * <pre>assertThat(\@"   my\tfoo  bar ", equalToCompressingWhiteSpace(\@" my  foo bar"))</pre>
- *
- * <b>Name Clash</b><br />
- * In the event of a name clash, <code>#define HC_DISABLE_SHORT_SYNTAX</code> and use the synonym
- * HC_equalToCompressingWhiteSpace instead.
- */
-static inline id equalToCompressingWhiteSpace(NSString *expectedString)
-{
-    return HC_equalToCompressingWhiteSpace(expectedString);
-}
-#endif
diff --git a/submodules/HockeySDK-iOS/Support/HockeySDKTests/Vendor/OCHamcrestIOS.framework/Versions/A/Headers/HCIsEqualIgnoringCase.h b/submodules/HockeySDK-iOS/Support/HockeySDKTests/Vendor/OCHamcrestIOS.framework/Versions/A/Headers/HCIsEqualIgnoringCase.h
deleted file mode 100644
index a2932784f7..0000000000
--- a/submodules/HockeySDK-iOS/Support/HockeySDKTests/Vendor/OCHamcrestIOS.framework/Versions/A/Headers/HCIsEqualIgnoringCase.h
+++ /dev/null
@@ -1,36 +0,0 @@
-//  OCHamcrest by Jon Reid, http://qualitycoding.org/about/
-//  Copyright 2016 hamcrest.org. See LICENSE.txt
-
-#import <OCHamcrestIOS/HCBaseMatcher.h>
-
-
-/*!
- * @abstract Tests if a string is equal to another string, regardless of the case.
- */
-@interface HCIsEqualIgnoringCase : HCBaseMatcher
-
-- (instancetype)initWithString:(NSString *)string;
-
-@end
-
-
-FOUNDATION_EXPORT id HC_equalToIgnoringCase(NSString *expectedString);
-
-#ifndef HC_DISABLE_SHORT_SYNTAX
-/*!
- * @abstract Creates a matcher for NSStrings that matches when the examined string is equal to the
- * specified expected string, ignoring case differences.
- * @param expectedString The expected value of matched strings. (Must not be <code>nil</code>.)
- * @discussion
- * <b>Example</b><br />
- * <pre>assertThat(\@"Foo", equalToIgnoringCase(\@"FOO"))</pre>
- *
- * <b>Name Clash</b><br />
- * In the event of a name clash, <code>#define HC_DISABLE_SHORT_SYNTAX</code> and use the synonym
- * HC_equalToIgnoringCase instead.
- */
-static inline id equalToIgnoringCase(NSString *expectedString)
-{
-    return HC_equalToIgnoringCase(expectedString);
-}
-#endif
diff --git a/submodules/HockeySDK-iOS/Support/HockeySDKTests/Vendor/OCHamcrestIOS.framework/Versions/A/Headers/HCIsEqualToNumber.h b/submodules/HockeySDK-iOS/Support/HockeySDKTests/Vendor/OCHamcrestIOS.framework/Versions/A/Headers/HCIsEqualToNumber.h
deleted file mode 100644
index 9659d05471..0000000000
--- a/submodules/HockeySDK-iOS/Support/HockeySDKTests/Vendor/OCHamcrestIOS.framework/Versions/A/Headers/HCIsEqualToNumber.h
+++ /dev/null
@@ -1,285 +0,0 @@
-//  OCHamcrest by Jon Reid, http://qualitycoding.org/about/
-//  Copyright 2016 hamcrest.org. See LICENSE.txt
-
-#import <OCHamcrestIOS/HCBaseMatcher.h>
-
-
-FOUNDATION_EXPORT id HC_equalToChar(char value);
-
-#ifndef HC_DISABLE_SHORT_SYNTAX
-/*!
- * @abstract Creates a matcher that matches when the examined object is equal to an NSNumber created
- * from the specified char value.
- * @param value The char value from which to create an NSNumber.
- * @discussion Consider using <code>equalTo(\@(value))</code> instead.
- *
- * <b>Name Clash</b><br />
- * In the event of a name clash, <code>#define HC_DISABLE_SHORT_SYNTAX</code> and use the synonym
- * HC_equalToChar instead.
- */
-static inline id equalToChar(char value)
-{
-    return HC_equalToChar(value);
-}
-#endif
-
-
-FOUNDATION_EXPORT id HC_equalToDouble(double value);
-
-#ifndef HC_DISABLE_SHORT_SYNTAX
-/*!
- * @abstract Creates a matcher that matches when the examined object is equal to an NSNumber created
- * from the specified double value.
- * @param value The double value from which to create an NSNumber.
- * @discussion Consider using <code>equalTo(\@(value))</code> instead.
- *
- * <b>Name Clash</b><br />
- * In the event of a name clash, <code>#define HC_DISABLE_SHORT_SYNTAX</code> and use the synonym
- * HC_equalToDouble instead.
- */
-static inline id equalToDouble(double value)
-{
-    return HC_equalToDouble(value);
-}
-#endif
-
-
-FOUNDATION_EXPORT id HC_equalToFloat(float value);
-
-#ifndef HC_DISABLE_SHORT_SYNTAX
-/*!
- * @abstract Creates a matcher that matches when the examined object is equal to an NSNumber created
- * from the specified float value.
- * @param value The float value from which to create an NSNumber.
- * @discussion Consider using <code>equalTo(\@(value))</code> instead.
- *
- * <b>Name Clash</b><br />
- * In the event of a name clash, <code>#define HC_DISABLE_SHORT_SYNTAX</code> and use the synonym
- * HC_equalToFloat instead.
- */
-static inline id equalToFloat(float value)
-{
-    return HC_equalToFloat(value);
-}
-#endif
-
-
-FOUNDATION_EXPORT id HC_equalToInt(int value);
-
-#ifndef HC_DISABLE_SHORT_SYNTAX
-/*!
- * @abstract Creates a matcher that matches when the examined object is equal to an NSNumber created
- * from the specified int value.
- * @param value The int value from which to create an NSNumber.
- * @discussion Consider using <code>equalTo(\@(value))</code> instead.
- *
- * <b>Name Clash</b><br />
- * In the event of a name clash, <code>#define HC_DISABLE_SHORT_SYNTAX</code> and use the synonym
- * HC_equalToInt instead.
- */
-static inline id equalToInt(int value)
-{
-    return HC_equalToInt(value);
-}
-#endif
-
-
-FOUNDATION_EXPORT id HC_equalToLong(long value);
-
-#ifndef HC_DISABLE_SHORT_SYNTAX
-/*!
- * @abstract Creates a matcher that matches when the examined object is equal to an NSNumber created
- * from the specified long value.
- * @param value The long value from which to create an NSNumber.
- * @discussion Consider using <code>equalTo(\@(value))</code> instead.
- *
- * <b>Name Clash</b><br />
- * In the event of a name clash, <code>#define HC_DISABLE_SHORT_SYNTAX</code> and use the synonym
- * HC_equalToLong instead.
- */
-static inline id equalToLong(long value)
-{
-    return HC_equalToLong(value);
-}
-#endif
-
-
-FOUNDATION_EXPORT id HC_equalToLongLong(long long value);
-
-#ifndef HC_DISABLE_SHORT_SYNTAX
-/*!
- * @abstract Creates a matcher that matches when the examined object is equal to an NSNumber created
- * from the specified long long value.
- * @param value The long long value from which to create an NSNumber.
- * @discussion Consider using <code>equalTo(\@(value))</code> instead.
- *
- * <b>Name Clash</b><br />
- * In the event of a name clash, <code>#define HC_DISABLE_SHORT_SYNTAX</code> and use the synonym
- * HC_equalToLongLong instead.
- */
-static inline id equalToLongLong(long long value)
-{
-    return HC_equalToLongLong(value);
-}
-#endif
-
-
-FOUNDATION_EXPORT id HC_equalToShort(short value);
-
-#ifndef HC_DISABLE_SHORT_SYNTAX
-/*!
- * @abstract Creates a matcher that matches when the examined object is equal to an NSNumber created
- * from the specified short value.
- * @param value The short value from which to create an NSNumber.
- * @discussion Consider using <code>equalTo(\@(value))</code> instead.
- *
- * <b>Name Clash</b><br />
- * In the event of a name clash, <code>#define HC_DISABLE_SHORT_SYNTAX</code> and use the synonym
- * HC_equalToShort instead.
- */
-static inline id equalToShort(short value)
-{
-    return HC_equalToShort(value);
-}
-#endif
-
-
-FOUNDATION_EXPORT id HC_equalToUnsignedChar(unsigned char value);
-
-#ifndef HC_DISABLE_SHORT_SYNTAX
-/*!
- * @abstract equalToUnsignedChar(value) -
- * Creates a matcher that matches when the examined object is equal to an NSNumber created from the
- * specified unsigned char value.
- * @param value The unsigned char value from which to create an NSNumber.
- * @discussion Consider using <code>equalTo(\@(value))</code> instead.
- *
- * <b>Name Clash</b><br />
- * In the event of a name clash, <code>#define HC_DISABLE_SHORT_SYNTAX</code> and use the synonym
- * HC_equalToUnsignedChar instead.
- */
-static inline id equalToUnsignedChar(unsigned char value)
-{
-    return HC_equalToUnsignedChar(value);
-}
-#endif
-
-
-FOUNDATION_EXPORT id HC_equalToUnsignedInt(unsigned int value);
-
-#ifndef HC_DISABLE_SHORT_SYNTAX
-/*!
- * @abstract Creates a matcher that matches when the examined object is equal to an NSNumber created
- * from the specified unsigned int value.
- * @param value  The unsigned int value from which to create an NSNumber.
- * @discussion Consider using <code>equalTo(\@(value))</code> instead.
- *
- * <b>Name Clash</b><br />
- * In the event of a name clash, <code>#define HC_DISABLE_SHORT_SYNTAX</code> and use the synonym
- * HC_equalToUnsignedInt instead.
- */
-static inline id equalToUnsignedInt(unsigned int value)
-{
-    return HC_equalToUnsignedInt(value);
-}
-#endif
-
-
-FOUNDATION_EXPORT id HC_equalToUnsignedLong(unsigned long value);
-
-#ifndef HC_DISABLE_SHORT_SYNTAX
-/*!
- * @abstract Creates a matcher that matches when the examined object is equal to an NSNumber created
- * from the specified unsigned long value.
- * @param value The unsigned long value from which to create an NSNumber.
- * @discussion Consider using <code>equalTo(\@(value))</code> instead.
- *
- * <b>Name Clash</b><br />
- * In the event of a name clash, <code>#define HC_DISABLE_SHORT_SYNTAX</code> and use the synonym
- * HC_equalToUnsignedLong instead.
- */
-static inline id equalToUnsignedLong(unsigned long value)
-{
-    return HC_equalToUnsignedLong(value);
-}
-#endif
-
-
-FOUNDATION_EXPORT id HC_equalToUnsignedLongLong(unsigned long long value);
-
-#ifndef HC_DISABLE_SHORT_SYNTAX
-/*!
- * @abstract Creates a matcher that matches when the examined object is equal to an NSNumber created
- * from the specified unsigned long long value.
- * @param value The unsigned long long value from which to create an NSNumber.
- * @discussion Consider using <code>equalTo(\@(value))</code> instead.
- *
- * <b>Name Clash</b><br />
- * In the event of a name clash, <code>#define HC_DISABLE_SHORT_SYNTAX</code> and use the synonym
- * HC_equalToUnsignedLongLong instead.
- */
-static inline id equalToUnsignedLongLong(unsigned long long value)
-{
-    return HC_equalToUnsignedLongLong(value);
-}
-#endif
-
-
-FOUNDATION_EXPORT id HC_equalToUnsignedShort(unsigned short value);
-
-#ifndef HC_DISABLE_SHORT_SYNTAX
-/*!
- * @abstract Creates a matcher that matches when the examined object is equal to an NSNumber created
- * from the specified unsigned short value.
- * @param value The unsigned short value from which to create an NSNumber.
- * @discussion Consider using <code>equalTo(\@(value))</code> instead.
- *
- * <b>Name Clash</b><br />
- * In the event of a name clash, <code>#define HC_DISABLE_SHORT_SYNTAX</code> and use the synonym
- * HC_equalToUnsignedShort instead.
- */
-static inline id equalToUnsignedShort(unsigned short value)
-{
-    return HC_equalToUnsignedShort(value);
-}
-#endif
-
-
-FOUNDATION_EXPORT id HC_equalToInteger(NSInteger value);
-
-#ifndef HC_DISABLE_SHORT_SYNTAX
-/*!
- * @abstract Creates a matcher that matches when the examined object is equal to an NSNumber created
- * from the specified NSInteger value.
- * @param value The NSInteger value from which to create an NSNumber.
- * @discussion Consider using <code>equalTo(\@(value))</code> instead.
- *
- * <b>Name Clash</b><br />
- * In the event of a name clash, <code>#define HC_DISABLE_SHORT_SYNTAX</code> and use the synonym
- * HC_equalToInteger instead.
- */
-static inline id equalToInteger(NSInteger value)
-{
-    return HC_equalToInteger(value);
-}
-#endif
-
-
-FOUNDATION_EXPORT id HC_equalToUnsignedInteger(NSUInteger value);
-
-#ifndef HC_DISABLE_SHORT_SYNTAX
-/*!
- * @abstract Creates a matcher that matches when the examined object is equal to an NSNumber created
- * from the specified NSUInteger value.
- * @param value The NSUInteger value from which to create an NSNumber.
- * @discussion Consider using <code>equalTo(\@(value))</code> instead.
- *
- * <b>Name Clash</b><br />
- * In the event of a name clash, <code>#define HC_DISABLE_SHORT_SYNTAX</code> and use the synonym
- * HC_equalToUnsignedInteger instead.
- */
-static inline id equalToUnsignedInteger(NSUInteger value)
-{
-    return HC_equalToUnsignedInteger(value);
-}
-#endif
diff --git a/submodules/HockeySDK-iOS/Support/HockeySDKTests/Vendor/OCHamcrestIOS.framework/Versions/A/Headers/HCIsIn.h b/submodules/HockeySDK-iOS/Support/HockeySDKTests/Vendor/OCHamcrestIOS.framework/Versions/A/Headers/HCIsIn.h
deleted file mode 100644
index 8c6cef9d90..0000000000
--- a/submodules/HockeySDK-iOS/Support/HockeySDKTests/Vendor/OCHamcrestIOS.framework/Versions/A/Headers/HCIsIn.h
+++ /dev/null
@@ -1,38 +0,0 @@
-//  OCHamcrest by Jon Reid, http://qualitycoding.org/about/
-//  Copyright 2016 hamcrest.org. See LICENSE.txt
-
-#import <OCHamcrestIOS/HCBaseMatcher.h>
-
-
-/*!
- * @abstract Matches if examined object is contained within the nested collection.
- */
-@interface HCIsIn : HCBaseMatcher
-
-- (instancetype)initWithCollection:(id)collection;
-
-@end
-
-
-FOUNDATION_EXPORT id HC_isIn(id aCollection);
-
-#ifndef HC_DISABLE_SHORT_SYNTAX
-/*!
- * @abstract Creates a matcher that matches when the examined object is found within the specified
- * collection.
- * @param aCollection The collection to search.
- * @discussion Invokes <code>-containsObject:</code> on <em>aCollection</em> to determine if the
- * examined object is an element of the collection.
- *
- * <b>Example</b><br />
- * <pre>assertThat(\@"foo", isIn(\@@[\@"bar", \@"foo"]))</pre>
- *
- * <b>Name Clash</b><br />
- * In the event of a name clash, <code>#define HC_DISABLE_SHORT_SYNTAX</code> and use the synonym
- * HC_isIn instead.
- */
-static inline id isIn(id aCollection)
-{
-    return HC_isIn(aCollection);
-}
-#endif
diff --git a/submodules/HockeySDK-iOS/Support/HockeySDKTests/Vendor/OCHamcrestIOS.framework/Versions/A/Headers/HCIsInstanceOf.h b/submodules/HockeySDK-iOS/Support/HockeySDKTests/Vendor/OCHamcrestIOS.framework/Versions/A/Headers/HCIsInstanceOf.h
deleted file mode 100644
index 837d0c31bd..0000000000
--- a/submodules/HockeySDK-iOS/Support/HockeySDKTests/Vendor/OCHamcrestIOS.framework/Versions/A/Headers/HCIsInstanceOf.h
+++ /dev/null
@@ -1,33 +0,0 @@
-//  OCHamcrest by Jon Reid, http://qualitycoding.org/about/
-//  Copyright 2016 hamcrest.org. See LICENSE.txt
-
-#import <OCHamcrestIOS/HCClassMatcher.h>
-
-
-/*!
- * @abstract Matches objects that are of a given class or any subclass.
- */
-@interface HCIsInstanceOf : HCClassMatcher
-@end
-
-
-FOUNDATION_EXPORT id HC_instanceOf(Class expectedClass);
-
-#ifndef HC_DISABLE_SHORT_SYNTAX
-/*!
- * @abstract Creates a matcher that matches when the examined object is an instance of, or inherits
- * from, the specified class.
- * @param expectedClass The class to compare against as the expected class.
- * @discussion
- * <b>Example</b><br />
- * <pre>assertThat(canoe, instanceOf([Canoe class]))</pre>
- *
- * <b>Name Clash</b><br />
- * In the event of a name clash, <code>#define HC_DISABLE_SHORT_SYNTAX</code> and use the synonym
- * HC_instanceOf instead.
- */
-static inline id instanceOf(Class expectedClass)
-{
-    return HC_instanceOf(expectedClass);
-}
-#endif
diff --git a/submodules/HockeySDK-iOS/Support/HockeySDKTests/Vendor/OCHamcrestIOS.framework/Versions/A/Headers/HCIsNil.h b/submodules/HockeySDK-iOS/Support/HockeySDKTests/Vendor/OCHamcrestIOS.framework/Versions/A/Headers/HCIsNil.h
deleted file mode 100644
index fc24279265..0000000000
--- a/submodules/HockeySDK-iOS/Support/HockeySDKTests/Vendor/OCHamcrestIOS.framework/Versions/A/Headers/HCIsNil.h
+++ /dev/null
@@ -1,51 +0,0 @@
-//  OCHamcrest by Jon Reid, http://qualitycoding.org/about/
-//  Copyright 2016 hamcrest.org. See LICENSE.txt
-
-#import <OCHamcrestIOS/HCBaseMatcher.h>
-
-
-/*!
- * @abstract Is the value nil?
- */
-@interface HCIsNil : HCBaseMatcher
-@end
-
-
-FOUNDATION_EXPORT id HC_nilValue(void);
-
-#ifndef HC_DISABLE_SHORT_SYNTAX
-/*!
- * @abstract Creates a matcher that matches when the examined object is <code>nil</code>.
- * @discussion
- * <b>Example</b><br />
- * <pre>assertThat(myObject, nilValue())</pre>
- *
- * <b>Name Clash</b><br />
- * In the event of a name clash, <code>#define HC_DISABLE_SHORT_SYNTAX</code> and use the synonym
- * HC_nilValue instead.
- */
-static inline id nilValue(void)
-{
-    return HC_nilValue();
-}
-#endif
-
-
-FOUNDATION_EXPORT id HC_notNilValue(void);
-
-#ifndef HC_DISABLE_SHORT_SYNTAX
-/*!
- * @abstract Creates a matcher that matches when the examined object is not <code>nil</code>.
- * @discussion
- * <b>Example</b><br />
- * <pre>assertThat(myObject, notNilValue())</pre>
- *
- * <b>Name Clash</b><br />
- * In the event of a name clash, <code>#define HC_DISABLE_SHORT_SYNTAX</code> and use the synonym
- * HC_notNilValue instead.
- */
-static inline id notNilValue(void)
-{
-    return HC_notNilValue();
-}
-#endif
diff --git a/submodules/HockeySDK-iOS/Support/HockeySDKTests/Vendor/OCHamcrestIOS.framework/Versions/A/Headers/HCIsNot.h b/submodules/HockeySDK-iOS/Support/HockeySDKTests/Vendor/OCHamcrestIOS.framework/Versions/A/Headers/HCIsNot.h
deleted file mode 100644
index f7e900187d..0000000000
--- a/submodules/HockeySDK-iOS/Support/HockeySDKTests/Vendor/OCHamcrestIOS.framework/Versions/A/Headers/HCIsNot.h
+++ /dev/null
@@ -1,39 +0,0 @@
-//  OCHamcrest by Jon Reid, http://qualitycoding.org/about/
-//  Copyright 2016 hamcrest.org. See LICENSE.txt
-
-#import <OCHamcrestIOS/HCBaseMatcher.h>
-
-
-/*!
- * @abstract Calculates the logical negation of a matcher.
- */
-@interface HCIsNot : HCBaseMatcher
-
-- (instancetype)initWithMatcher:(id <HCMatcher>)matcher;
-
-@end
-
-
-FOUNDATION_EXPORT id HC_isNot(id value);
-
-#ifndef HC_DISABLE_SHORT_SYNTAX
-/*!
- * @abstract Creates a matcher that wraps an existing matcher, but inverts the logic by which it
- * will match.
- * @param value The matcher to negate, or an expected value to match for inequality.
- * @discussion If <em>value</em> is not a matcher, it is implicitly wrapped in an <em>equalTo</em>
- * matcher to check for equality, and thus matches for inequality.
- *
- * <b>Examples</b><br />
- * <pre>assertThat(cheese, isNot(equalTo(smelly)))</pre>
- * <pre>assertThat(cheese, isNot(smelly))</pre>
- *
- * <b>Name Clash</b><br />
- * In the event of a name clash, <code>#define HC_DISABLE_SHORT_SYNTAX</code> and use the synonym
- * HC_isNot instead.
- */
-static inline id isNot(id value)
-{
-    return HC_isNot(value);
-}
-#endif
diff --git a/submodules/HockeySDK-iOS/Support/HockeySDKTests/Vendor/OCHamcrestIOS.framework/Versions/A/Headers/HCIsSame.h b/submodules/HockeySDK-iOS/Support/HockeySDKTests/Vendor/OCHamcrestIOS.framework/Versions/A/Headers/HCIsSame.h
deleted file mode 100644
index a2ea2d7334..0000000000
--- a/submodules/HockeySDK-iOS/Support/HockeySDKTests/Vendor/OCHamcrestIOS.framework/Versions/A/Headers/HCIsSame.h
+++ /dev/null
@@ -1,36 +0,0 @@
-//  OCHamcrest by Jon Reid, http://qualitycoding.org/about/
-//  Copyright 2016 hamcrest.org. See LICENSE.txt
-
-#import <OCHamcrestIOS/HCBaseMatcher.h>
-
-
-/*!
- * @abstract Is the value the same object as another value?
- */
-@interface HCIsSame : HCBaseMatcher
-
-- (instancetype)initSameAs:(id)object;
-
-@end
-
-
-FOUNDATION_EXPORT id HC_sameInstance(id expectedInstance);
-
-#ifndef HC_DISABLE_SHORT_SYNTAX
-/*!
- * @abstract Creates a matcher that matches only when the examined object is the same instance as
- * the specified target object.
- * @param expectedInstance The expected instance.
- * @discussion
- * <b>Example</b><br />
- * <pre>assertThat(delegate, sameInstance(expectedDelegate))</pre>
- *
- * <b>Name Clash</b><br />
- * In the event of a name clash, <code>#define HC_DISABLE_SHORT_SYNTAX</code> and use the synonym
- * HC_sameInstance instead.
- */
-static inline id sameInstance(id expectedInstance)
-{
-    return HC_sameInstance(expectedInstance);
-}
-#endif
diff --git a/submodules/HockeySDK-iOS/Support/HockeySDKTests/Vendor/OCHamcrestIOS.framework/Versions/A/Headers/HCIsTrueFalse.h b/submodules/HockeySDK-iOS/Support/HockeySDKTests/Vendor/OCHamcrestIOS.framework/Versions/A/Headers/HCIsTrueFalse.h
deleted file mode 100644
index 8e3bd9dfae..0000000000
--- a/submodules/HockeySDK-iOS/Support/HockeySDKTests/Vendor/OCHamcrestIOS.framework/Versions/A/Headers/HCIsTrueFalse.h
+++ /dev/null
@@ -1,51 +0,0 @@
-//  OCHamcrest by Jon Reid, http://qualitycoding.org/about/
-//  Copyright 2016 hamcrest.org. See LICENSE.txt
-
-#import <OCHamcrestIOS/HCBaseMatcher.h>
-
-
-/*!
- * @abstract Matches true values.
- */
-@interface HCIsTrue : HCBaseMatcher
-@end
-
-/*!
- * @abstract Matches false values.
- */
-@interface HCIsFalse : HCBaseMatcher
-@end
-
-
-FOUNDATION_EXPORT id HC_isTrue(void);
-
-#ifndef HC_DISABLE_SHORT_SYNTAX
-/*!
- * @abstract Creates a matcher that matches when the examined object is an non-zero NSNumber.
- * @discussion
- * <b>Name Clash</b><br />
- * In the event of a name clash, <code>#define HC_DISABLE_SHORT_SYNTAX</code> and use the synonym
- * HC_isTrue instead.
- */
-static inline id isTrue(void)
-{
-    return HC_isTrue();
-}
-#endif
-
-
-FOUNDATION_EXPORT id HC_isFalse(void);
-
-#ifndef HC_DISABLE_SHORT_SYNTAX
-/*!
- * @abstract Creates a matcher that matches when the examined object is NSNumber zero.
- * @discussion
- * <b>Name Clash</b><br />
- * In the event of a name clash, <code>#define HC_DISABLE_SHORT_SYNTAX</code> and use the synonym
- * HC_isFalse instead.
-*/
-static inline id isFalse(void)
-{
-    return HC_isFalse();
-}
-#endif
diff --git a/submodules/HockeySDK-iOS/Support/HockeySDKTests/Vendor/OCHamcrestIOS.framework/Versions/A/Headers/HCIsTypeOf.h b/submodules/HockeySDK-iOS/Support/HockeySDKTests/Vendor/OCHamcrestIOS.framework/Versions/A/Headers/HCIsTypeOf.h
deleted file mode 100644
index 5fedfc1208..0000000000
--- a/submodules/HockeySDK-iOS/Support/HockeySDKTests/Vendor/OCHamcrestIOS.framework/Versions/A/Headers/HCIsTypeOf.h
+++ /dev/null
@@ -1,33 +0,0 @@
-//  OCHamcrest by Jon Reid, http://qualitycoding.org/about/
-//  Copyright 2016 hamcrest.org. See LICENSE.txt
-
-#import <OCHamcrestIOS/HCClassMatcher.h>
-
-
-/*!
- * @abstract Matches objects that are of a given class.
- */
-@interface HCIsTypeOf : HCClassMatcher
-@end
-
-
-FOUNDATION_EXPORT id HC_isA(Class expectedClass);
-
-#ifndef HC_DISABLE_SHORT_SYNTAX
-/*!
- * @abstract Creates a matcher that matches when the examined object is an instance of the specified
- * class, but not of any subclass.
- * @param expectedClass The class to compare against as the expected class.
- * @discussion
- * <b>Example</b><br />
- * <pre>assertThat(canoe, isA([Canoe class]))</pre>
- *
- * <b>Name Clash</b><br />
- * In the event of a name clash, <code>#define HC_DISABLE_SHORT_SYNTAX</code> and use the synonym
- * HC_isA instead.
- */
-static inline id isA(Class expectedClass)
-{
-    return HC_isA(expectedClass);
-}
-#endif
diff --git a/submodules/HockeySDK-iOS/Support/HockeySDKTests/Vendor/OCHamcrestIOS.framework/Versions/A/Headers/HCMatcher.h b/submodules/HockeySDK-iOS/Support/HockeySDKTests/Vendor/OCHamcrestIOS.framework/Versions/A/Headers/HCMatcher.h
deleted file mode 100644
index 74d2609665..0000000000
--- a/submodules/HockeySDK-iOS/Support/HockeySDKTests/Vendor/OCHamcrestIOS.framework/Versions/A/Headers/HCMatcher.h
+++ /dev/null
@@ -1,43 +0,0 @@
-//  OCHamcrest by Jon Reid, http://qualitycoding.org/about/
-//  Copyright 2016 hamcrest.org. See LICENSE.txt
-
-#import "HCSelfDescribing.h"
-
-
-/*!
- * @abstract A matcher over acceptable values.
- * @discussion A matcher is able to describe itself to give feedback when it fails.
- *
- * HCMatcher implementations should not directly implement this protocol. Instead, extend the
- * HCBaseMatcher class, which will ensure that the HCMatcher API can grow to support new features
- * and remain compatible with all HCMatcher implementations.
- */
-@protocol HCMatcher <HCSelfDescribing>
-
-/*!
- * @abstract Evaluates the matcher for argument item.
- * @param item  The object against which the matcher is evaluated.
- * @return <code>YES</code> if item matches, otherwise <code>NO</code>.
- */
-- (BOOL)matches:(id)item;
-
-/*!
- * @abstract Evaluates the matcher for argument item.
- * @param item The object against which the matcher is evaluated.
- * @param mismatchDescription The description to be built or appended to if item does not match.
- * @return <code>YES</code> if item matches, otherwise <code>NO</code>.
- */
-- (BOOL)matches:(id)item describingMismatchTo:(id <HCDescription>)mismatchDescription;
-
-/*!
- * @abstract Generates a description of why the matcher has not accepted the item.
- * @param item The item that the HCMatcher has rejected.
- * @param mismatchDescription The description to be built or appended to.
- * @discussion The description will be part of a larger description of why a matching failed, so it
- * should be concise.
- *
- * This method assumes that <code>matches:item</code> is false, but will not check this.
- */
-- (void)describeMismatchOf:(id)item to:(id <HCDescription>)mismatchDescription;
-
-@end
diff --git a/submodules/HockeySDK-iOS/Support/HockeySDKTests/Vendor/OCHamcrestIOS.framework/Versions/A/Headers/HCNumberAssert.h b/submodules/HockeySDK-iOS/Support/HockeySDKTests/Vendor/OCHamcrestIOS.framework/Versions/A/Headers/HCNumberAssert.h
deleted file mode 100644
index 4fa5fcb95a..0000000000
--- a/submodules/HockeySDK-iOS/Support/HockeySDKTests/Vendor/OCHamcrestIOS.framework/Versions/A/Headers/HCNumberAssert.h
+++ /dev/null
@@ -1,336 +0,0 @@
-//  OCHamcrest by Jon Reid, http://qualitycoding.org/about/
-//  Copyright 2016 hamcrest.org. See LICENSE.txt
-
-#import <Foundation/Foundation.h>
-
-@protocol HCMatcher;
-
-
-FOUNDATION_EXPORT void HC_assertThatBoolWithLocation(id testCase, BOOL actual,
-        id <HCMatcher> matcher, char const *fileName, int lineNumber);
-
-#define HC_assertThatBool(actual, matcher)  \
-    HC_assertThatBoolWithLocation(self, actual, matcher, __FILE__, __LINE__)
-
-#ifndef HC_DISABLE_SHORT_SYNTAX
-/*!
- * @abstract assertThatBool(actual, matcher) -
- * Asserts that BOOL actual value, converted to an NSNumber, satisfies matcher.
- * @param actual The BOOL value to convert to an NSNumber for evaluation.
- * @param matcher The matcher to satisfy as the expected condition.
- * @discussion Consider using <code>assertThat(\@(actual), matcher)</code> instead.
- *
- * <b>Name Clash</b><br />
- * In the event of a name clash, <code>#define HC_DISABLE_SHORT_SYNTAX</code> and use the synonym
- * HC_assertThatBool instead.
- */
-#define assertThatBool(actual, matcher) HC_assertThatBool(actual, matcher)
-#endif
-
-
-FOUNDATION_EXPORT void HC_assertThatCharWithLocation(id testCase, char actual,
-        id <HCMatcher> matcher, char const *fileName, int lineNumber);
-
-#define HC_assertThatChar(actual, matcher)  \
-    HC_assertThatCharWithLocation(self, actual, matcher, __FILE__, __LINE__)
-
-#ifndef HC_DISABLE_SHORT_SYNTAX
-/*!
- * @abstract assertThatChar(actual, matcher) -
- * Asserts that char actual value, converted to an NSNumber, satisfies matcher.
- * @param actual The char value to convert to an NSNumber for evaluation.
- * @param matcher The matcher to satisfy as the expected condition.
- * @discussion Consider using <code>assertThat(\@(actual), matcher)</code> instead.
- *
- * <b>Name Clash</b><br />
- * In the event of a name clash, <code>#define HC_DISABLE_SHORT_SYNTAX</code> and use the synonym
- * HC_assertThatChar instead.
- */
-#define assertThatChar(actual, matcher) HC_assertThatChar(actual, matcher)
-#endif
-
-
-FOUNDATION_EXPORT void HC_assertThatDoubleWithLocation(id testCase, double actual,
-        id <HCMatcher> matcher, char const *fileName, int lineNumber);
-
-#define HC_assertThatDouble(actual, matcher)  \
-    HC_assertThatDoubleWithLocation(self, actual, matcher, __FILE__, __LINE__)
-
-#ifndef HC_DISABLE_SHORT_SYNTAX
-/*!
- * @abstract HC_assertThatDouble(actual, matcher) -
- * Asserts that double actual value, converted to an NSNumber, satisfies matcher.
- * @param actual The double value to convert to an NSNumber for evaluation.
- * @param matcher The matcher to satisfy as the expected condition.
- * @discussion Consider using <code>assertThat(\@(actual), matcher)</code> instead.
- *
- * <b>Name Clash</b><br />
- * In the event of a name clash, <code>#define HC_DISABLE_SHORT_SYNTAX</code> and use the synonym
- * HC_assertThatDouble instead.
- */
-#define assertThatDouble(actual, matcher) HC_assertThatDouble(actual, matcher)
-#endif
-
-
-FOUNDATION_EXPORT void HC_assertThatFloatWithLocation(id testCase, float actual,
-        id <HCMatcher> matcher, char const *fileName, int lineNumber);
-
-#define HC_assertThatFloat(actual, matcher)  \
-    HC_assertThatFloatWithLocation(self, actual, matcher, __FILE__, __LINE__)
-
-#ifndef HC_DISABLE_SHORT_SYNTAX
-/*!
- * @abstract assertThatFloat(actual, matcher) -
- * Asserts that float actual value, converted to an NSNumber, satisfies matcher.
- * @param actual The float value to convert to an NSNumber for evaluation.
- * @param matcher The matcher to satisfy as the expected condition.
- * @discussion Consider using <code>assertThat(\@(actual), matcher)</code> instead.
- *
- * <b>Name Clash</b><br />
- * In the event of a name clash, <code>#define HC_DISABLE_SHORT_SYNTAX</code> and use the synonym
- * HC_assertThatFloat instead.
- */
-#define assertThatFloat(actual, matcher) HC_assertThatFloat(actual, matcher)
-#endif
-
-
-FOUNDATION_EXPORT void HC_assertThatIntWithLocation(id testCase, int actual,
-        id <HCMatcher> matcher, char const *fileName, int lineNumber);
-
-#define HC_assertThatInt(actual, matcher)  \
-    HC_assertThatIntWithLocation(self, actual, matcher, __FILE__, __LINE__)
-
-#ifndef HC_DISABLE_SHORT_SYNTAX
-/*!
- * @abstract assertThatInt(actual, matcher) -
- * Asserts that int actual value, converted to an NSNumber, satisfies matcher.
- * @param actual The int value to convert to an NSNumber for evaluation.
- * @param matcher The matcher to satisfy as the expected condition.
- * @discussion Consider using <code>assertThat(\@(actual), matcher)</code> instead.
- *
- * <b>Name Clash</b><br />
- * In the event of a name clash, <code>#define HC_DISABLE_SHORT_SYNTAX</code> and use the synonym
- * HC_assertThatInt instead.
- */
-#define assertThatInt(actual, matcher) HC_assertThatInt(actual, matcher)
-#endif
-
-
-FOUNDATION_EXPORT void HC_assertThatLongWithLocation(id testCase, long actual,
-        id <HCMatcher> matcher, char const *fileName, int lineNumber);
-
-#define HC_assertThatLong(actual, matcher)  \
-    HC_assertThatLongWithLocation(self, actual, matcher, __FILE__, __LINE__)
-
-#ifndef HC_DISABLE_SHORT_SYNTAX
-/*!
- * @abstract assertThatLong(actual, matcher) -
- * Asserts that long actual value, converted to an NSNumber, satisfies matcher.
- * @param actual The long value to convert to an NSNumber for evaluation.
- * @param matcher The matcher to satisfy as the expected condition.
- * @discussion Consider using <code>assertThat(\@(actual), matcher)</code> instead.
- *
- * <b>Name Clash</b><br />
- * In the event of a name clash, <code>#define HC_DISABLE_SHORT_SYNTAX</code> and use the synonym
- * HC_assertThatLong instead.
- */
-#define assertThatLong(actual, matcher) HC_assertThatLong(actual, matcher)
-#endif
-
-
-FOUNDATION_EXPORT void HC_assertThatLongLongWithLocation(id testCase, long long actual,
-        id <HCMatcher> matcher, char const *fileName, int lineNumber);
-
-#define HC_assertThatLongLong(actual, matcher)  \
-    HC_assertThatLongLongWithLocation(self, actual, matcher, __FILE__, __LINE__)
-
-#ifndef HC_DISABLE_SHORT_SYNTAX
-/*!
- * @abstract assertThatLongLong(actual, matcher) -
- * Asserts that <code>long long</code> actual value, converted to an NSNumber, satisfies matcher.
- * @param actual The long long value to convert to an NSNumber for evaluation.
- * @param matcher The matcher to satisfy as the expected condition.
- * @discussion Consider using <code>assertThat(\@(actual), matcher)</code> instead.
- *
- * <b>Name Clash</b><br />
- * In the event of a name clash, <code>#define HC_DISABLE_SHORT_SYNTAX</code> and use the synonym
- * HC_assertThatLongLong instead.
- */
-#define assertThatLongLong(actual, matcher) HC_assertThatLongLong(actual, matcher)
-#endif
-
-
-FOUNDATION_EXPORT void HC_assertThatShortWithLocation(id testCase, short actual,
-        id <HCMatcher> matcher, char const *fileName, int lineNumber);
-
-#define HC_assertThatShort(actual, matcher)  \
-    HC_assertThatShortWithLocation(self, actual, matcher, __FILE__, __LINE__)
-
-#ifndef HC_DISABLE_SHORT_SYNTAX
-/*!
- * @abstract assertThatShort(actual, matcher) -
- * Asserts that short actual value, converted to an NSNumber, satisfies matcher.
- * @param actual The short value to convert to an NSNumber for evaluation.
- * @param matcher The matcher to satisfy as the expected condition.
- * @discussion Consider using <code>assertThat(\@(actual), matcher)</code> instead.
- *
- * <b>Name Clash</b><br />
- * In the event of a name clash, <code>#define HC_DISABLE_SHORT_SYNTAX</code> and use the synonym
- * HC_assertThatShort instead.
- */
-#define assertThatShort(actual, matcher) HC_assertThatShort(actual, matcher)
-#endif
-
-
-FOUNDATION_EXPORT void HC_assertThatUnsignedCharWithLocation(id testCase, unsigned char actual,
-        id <HCMatcher> matcher, char const *fileName, int lineNumber);
-
-#define HC_assertThatUnsignedChar(actual, matcher)  \
-    HC_assertThatUnsignedCharWithLocation(self, actual, matcher, __FILE__, __LINE__)
-
-#ifndef HC_DISABLE_SHORT_SYNTAX
-/*!
- * @abstract assertThatUnsignedChar(actual, matcher) -
- * Asserts that unsigned char actual value, converted to an NSNumber, satisfies matcher.
- * @param actual The unsigned char value to convert to an NSNumber for evaluation.
- * @param matcher The matcher to satisfy as the expected condition.
- * @discussion Consider using <code>assertThat(\@(actual), matcher)</code> instead.
- *
- * <b>Name Clash</b><br />
- * In the event of a name clash, <code>#define HC_DISABLE_SHORT_SYNTAX</code> and use the synonym
- * HC_assertThatUnsignedChar instead.
- */
-#define assertThatUnsignedChar(actual, matcher) HC_assertThatUnsignedChar(actual, matcher)
-#endif
-
-
-FOUNDATION_EXPORT void HC_assertThatUnsignedIntWithLocation(id testCase, unsigned int actual,
-        id <HCMatcher> matcher, char const *fileName, int lineNumber);
-
-#define HC_assertThatUnsignedInt(actual, matcher)  \
-    HC_assertThatUnsignedIntWithLocation(self, actual, matcher, __FILE__, __LINE__)
-
-#ifndef HC_DISABLE_SHORT_SYNTAX
-/*!
- * @abstract assertThatUnsignedInt(actual, matcher) -
- * Asserts that unsigned int actual value, converted to an NSNumber, satisfies matcher.
- * @param actual The unsigned int value to convert to an NSNumber for evaluation.
- * @param matcher  The matcher to satisfy as the expected condition.
- * @discussion Consider using <code>assertThat(\@(actual), matcher)</code> instead.
- *
- * <b>Name Clash</b><br />
- * In the event of a name clash, <code>#define HC_DISABLE_SHORT_SYNTAX</code> and use the synonym
- * HC_assertThatUnsignedInt instead.
- */
-#define assertThatUnsignedInt(actual, matcher) HC_assertThatUnsignedInt(actual, matcher)
-#endif
-
-
-FOUNDATION_EXPORT void HC_assertThatUnsignedLongWithLocation(id testCase, unsigned long actual,
-        id <HCMatcher> matcher, char const *fileName, int lineNumber);
-
-#define HC_assertThatUnsignedLong(actual, matcher)  \
-    HC_assertThatUnsignedLongWithLocation(self, actual, matcher, __FILE__, __LINE__)
-
-#ifndef HC_DISABLE_SHORT_SYNTAX
-/*!
- * @abstract assertThatUnsignedLong(actual, matcher) -
- * Asserts that unsigned long actual value, converted to an NSNumber, satisfies matcher.
- * @param actual The unsigned long value to convert to an NSNumber for evaluation.
- * @param matcher The matcher to satisfy as the expected condition.
- * @discussion Consider using <code>assertThat(\@(actual), matcher)</code> instead.
- *
- * <b>Name Clash</b><br />
- * In the event of a name clash, <code>#define HC_DISABLE_SHORT_SYNTAX</code> and use the synonym
- * HC_assertThatUnsignedLong instead.
- */
-#define assertThatUnsignedLong(actual, matcher) HC_assertThatUnsignedLong(actual, matcher)
-#endif
-
-
-FOUNDATION_EXPORT void HC_assertThatUnsignedLongLongWithLocation(id testCase, unsigned long long actual,
-        id <HCMatcher> matcher, char const *fileName, int lineNumber);
-
-#define HC_assertThatUnsignedLongLong(actual, matcher)  \
-    HC_assertThatUnsignedLongLongWithLocation(self, actual, matcher, __FILE__, __LINE__)
-
-#ifndef HC_DISABLE_SHORT_SYNTAX
-/*!
- * @abstract assertThatUnsignedLongLong(actual, matcher) -
- * Asserts that unsigned long long actual value, converted to an NSNumber, satisfies matcher.
- * @param actual The unsigned long long value to convert to an NSNumber for evaluation.
- * @param matcher  The matcher to satisfy as the expected condition.
- * @discussion Consider using <code>assertThat(\@(actual), matcher)</code> instead.
- *
- * <b>Name Clash</b><br />
- * In the event of a name clash, <code>#define HC_DISABLE_SHORT_SYNTAX</code> and use the synonym
- * HC_assertThatUnsignedLongLong instead.
- */
-#define assertThatUnsignedLongLong(actual, matcher) HC_assertThatUnsignedLongLong(actual, matcher)
-#endif
-
-
-FOUNDATION_EXPORT void HC_assertThatUnsignedShortWithLocation(id testCase, unsigned short actual,
-        id <HCMatcher> matcher, char const *fileName, int lineNumber);
-
-#define HC_assertThatUnsignedShort(actual, matcher)  \
-    HC_assertThatUnsignedShortWithLocation(self, actual, matcher, __FILE__, __LINE__)
-
-#ifndef HC_DISABLE_SHORT_SYNTAX
-/*!
- * @abstract assertThatUnsignedShort(actual, matcher) -
- * Asserts that unsigned short actual value, converted to an NSNumber, satisfies matcher.
- * @param actual The unsigned short value to convert to an NSNumber for evaluation.
- * @param matcher The matcher to satisfy as the expected condition.
- * @discussion Consider using <code>assertThat(\@(actual), matcher)</code> instead.
- *
- * <b>Name Clash</b><br />
- * In the event of a name clash, <code>#define HC_DISABLE_SHORT_SYNTAX</code> and use the synonym
- * HC_assertThatUnsignedShort instead.
- */
-#define assertThatUnsignedShort(actual, matcher) HC_assertThatUnsignedShort(actual, matcher)
-#endif
-
-
-FOUNDATION_EXPORT void HC_assertThatIntegerWithLocation(id testCase, NSInteger actual,
-        id <HCMatcher> matcher, char const *fileName, int lineNumber);
-
-#define HC_assertThatInteger(actual, matcher)  \
-    HC_assertThatIntegerWithLocation(self, actual, matcher, __FILE__, __LINE__)
-
-#ifndef HC_DISABLE_SHORT_SYNTAX
-/*!
- * @abstract assertThatInteger(actual, matcher) -
- * Asserts that NSInteger actual value, converted to an NSNumber, satisfies matcher.
- * @param actual The NSInteger value to convert to an NSNumber for evaluation.
- * @param matcher The matcher to satisfy as the expected condition.
- * @discussion Consider using <code>assertThat(\@(actual), matcher)</code> instead.
- *
- * <b>Name Clash</b><br />
- * In the event of a name clash, <code>#define HC_DISABLE_SHORT_SYNTAX</code> and use the synonym
- * HC_assertThatInteger instead.
- */
-#define assertThatInteger(actual, matcher) HC_assertThatInteger(actual, matcher)
-#endif
-
-
-FOUNDATION_EXPORT void HC_assertThatUnsignedIntegerWithLocation(id testCase, NSUInteger actual,
-        id <HCMatcher> matcher, char const *fileName, int lineNumber);
-
-#define HC_assertThatUnsignedInteger(actual, matcher)  \
-    HC_assertThatUnsignedIntegerWithLocation(self, actual, matcher, __FILE__, __LINE__)
-
-#ifndef HC_DISABLE_SHORT_SYNTAX
-/*!
- * @abstract assertThatUnsignedInteger(actual, matcher) -
- * Asserts that NSUInteger actual value, converted to an NSNumber, satisfies matcher.
- * @param actual The NSUInteger value to convert to an NSNumber for evaluation.
- * @param matcher The matcher to satisfy as the expected condition.
- * @discussion Consider using <code>assertThat(\@(actual), matcher)</code> instead.
- *
- * <b>Name Clash</b><br />
- * In the event of a name clash, <code>#define HC_DISABLE_SHORT_SYNTAX</code> and use the synonym
- * HC_assertThatUnsignedInteger instead.
- */
-#define assertThatUnsignedInteger(actual, matcher) HC_assertThatUnsignedInteger(actual, matcher)
-#endif
diff --git a/submodules/HockeySDK-iOS/Support/HockeySDKTests/Vendor/OCHamcrestIOS.framework/Versions/A/Headers/HCOrderingComparison.h b/submodules/HockeySDK-iOS/Support/HockeySDKTests/Vendor/OCHamcrestIOS.framework/Versions/A/Headers/HCOrderingComparison.h
deleted file mode 100644
index 572b18a184..0000000000
--- a/submodules/HockeySDK-iOS/Support/HockeySDKTests/Vendor/OCHamcrestIOS.framework/Versions/A/Headers/HCOrderingComparison.h
+++ /dev/null
@@ -1,109 +0,0 @@
-//  OCHamcrest by Jon Reid, http://qualitycoding.org/about/
-//  Copyright 2016 hamcrest.org. See LICENSE.txt
-
-#import <OCHamcrestIOS/HCBaseMatcher.h>
-
-
-/*!
- * @abstract Matches values with <code>-compare:</code>.
- */
-@interface HCOrderingComparison : HCBaseMatcher
-
-- (instancetype)initComparing:(id)expectedValue
-                   minCompare:(NSComparisonResult)min
-                   maxCompare:(NSComparisonResult)max
-        comparisonDescription:(NSString *)comparisonDescription;
-
-@end
-
-
-FOUNDATION_EXPORT id HC_greaterThan(id value);
-
-#ifndef HC_DISABLE_SHORT_SYNTAX
-/*!
- * @abstract Creates a matcher that matches when the examined object is greater than the specified
- * value, as reported by the <code>-compare:</code> method of the <b>examined</b> object.
- * @param value The value which, when passed to the <code>-compare:</code> method of the examined
- * object, should return NSOrderedAscending.
- * @discussion
- * <b>Example</b><br />
- * <pre>assertThat(\@2, greaterThan(\@1))</pre>
- *
- * <b>Name Clash</b><br />
- * In the event of a name clash, <code>#define HC_DISABLE_SHORT_SYNTAX</code> and use the synonym
- * HC_greaterThan instead.
- */
-static inline id greaterThan(id value)
-{
-    return HC_greaterThan(value);
-}
-#endif
-
-
-FOUNDATION_EXPORT id HC_greaterThanOrEqualTo(id value);
-
-#ifndef HC_DISABLE_SHORT_SYNTAX
-/*!
- * @abstract Creates a matcher that matches when the examined object is greater than or equal to the
- * specified value, as reported by the <code>-compare:</code> method of the <b>examined</b> object.
- * @param value The value which, when passed to the <code>-compare:</code> method of the examined
- * object, should return NSOrderedAscending or NSOrderedSame.
- * @discussion
- * <b>Example</b><br />
- * <pre>assertThat(\@1, greaterThanOrEqualTo(\@1))</pre>
- *
- * <b>Name Clash</b><br />
- * In the event of a name clash, <code>#define HC_DISABLE_SHORT_SYNTAX</code> and use the synonym
- * HC_greaterThanOrEqualTo instead.
- */
-static inline id greaterThanOrEqualTo(id value)
-{
-    return HC_greaterThanOrEqualTo(value);
-}
-#endif
-
-
-FOUNDATION_EXPORT id HC_lessThan(id value);
-
-#ifndef HC_DISABLE_SHORT_SYNTAX
-/*!
- * @abstract Creates a matcher that matches when the examined object is less than the specified
- * value, as reported by the <code>-compare:</code> method of the <b>examined</b> object.
- * @param value The value which, when passed to the <code>-compare:</code> method of the examined
- * object, should return NSOrderedDescending.
- * @discussion
- * <b>Example</b><br />
- * <pre>assertThat(\@1, lessThan(\@2))</pre>
- *
- * <b>Name Clash</b><br />
- * In the event of a name clash, <code>#define HC_DISABLE_SHORT_SYNTAX</code> and use the synonym
- * HC_lessThan instead.
- */
-static inline id lessThan(id value)
-{
-    return HC_lessThan(value);
-}
-#endif
-
-
-FOUNDATION_EXPORT id HC_lessThanOrEqualTo(id value);
-
-#ifndef HC_DISABLE_SHORT_SYNTAX
-/*!
- * @abstract Creates a matcher that matches when the examined object is less than or equal to the
- * specified value, as reported by the <code>-compare:</code> method of the <b>examined</b> object.
- * @param value The value which, when passed to the <code>-compare:</code> method of the examined
- * object, should return NSOrderedDescending or NSOrderedSame.
- * @discussion
- * <b>Example</b><br />
- * <pre>assertThat(\@1, lessThanOrEqualTo(\@1))</pre>
- *
- * <b>Name Clash</b><br />
- * In the event of a name clash, <code>#define HC_DISABLE_SHORT_SYNTAX</code> and use the synonym
- * HC_lessThanOrEqualTo instead.
- */
-static inline id lessThanOrEqualTo(id value)
-{
-    return HC_lessThanOrEqualTo(value);
-}
-#endif
diff --git a/submodules/HockeySDK-iOS/Support/HockeySDKTests/Vendor/OCHamcrestIOS.framework/Versions/A/Headers/HCRequireNonNilObject.h b/submodules/HockeySDK-iOS/Support/HockeySDKTests/Vendor/OCHamcrestIOS.framework/Versions/A/Headers/HCRequireNonNilObject.h
deleted file mode 100644
index c638538683..0000000000
--- a/submodules/HockeySDK-iOS/Support/HockeySDKTests/Vendor/OCHamcrestIOS.framework/Versions/A/Headers/HCRequireNonNilObject.h
+++ /dev/null
@@ -1,10 +0,0 @@
-//  OCHamcrest by Jon Reid, http://qualitycoding.org/about/
-//  Copyright 2016 hamcrest.org. See LICENSE.txt
-
-#import <Foundation/Foundation.h>
-
-
-/*!
- * @abstract Throws an NSException if <em>obj</em> is <code>nil</code>.
-*/
-FOUNDATION_EXPORT void HCRequireNonNilObject(id obj);
diff --git a/submodules/HockeySDK-iOS/Support/HockeySDKTests/Vendor/OCHamcrestIOS.framework/Versions/A/Headers/HCSelfDescribing.h b/submodules/HockeySDK-iOS/Support/HockeySDKTests/Vendor/OCHamcrestIOS.framework/Versions/A/Headers/HCSelfDescribing.h
deleted file mode 100644
index 9a18ed9adc..0000000000
--- a/submodules/HockeySDK-iOS/Support/HockeySDKTests/Vendor/OCHamcrestIOS.framework/Versions/A/Headers/HCSelfDescribing.h
+++ /dev/null
@@ -1,22 +0,0 @@
-//  OCHamcrest by Jon Reid, http://qualitycoding.org/about/
-//  Copyright 2016 hamcrest.org. See LICENSE.txt
-
-#import <Foundation/Foundation.h>
-
-#import "HCDescription.h"   // Convenience header
-
-
-/*!
- * @abstract The ability of an object to describe itself.
- */
-@protocol HCSelfDescribing <NSObject>
-
-/*!
- * @abstract Generates a description of the object.
- * @param description The description to be built or appended to.
- * @discussion The description may be part of a description of a larger object of which this is just
- * a component, so it should be worded appropriately.
- */
-- (void)describeTo:(id <HCDescription>)description;
-
-@end
diff --git a/submodules/HockeySDK-iOS/Support/HockeySDKTests/Vendor/OCHamcrestIOS.framework/Versions/A/Headers/HCStringContains.h b/submodules/HockeySDK-iOS/Support/HockeySDKTests/Vendor/OCHamcrestIOS.framework/Versions/A/Headers/HCStringContains.h
deleted file mode 100644
index 3ee9f45ae0..0000000000
--- a/submodules/HockeySDK-iOS/Support/HockeySDKTests/Vendor/OCHamcrestIOS.framework/Versions/A/Headers/HCStringContains.h
+++ /dev/null
@@ -1,35 +0,0 @@
-//  OCHamcrest by Jon Reid, http://qualitycoding.org/about/
-//  Copyright 2016 hamcrest.org. See LICENSE.txt
-
-#import <OCHamcrestIOS/HCSubstringMatcher.h>
-
-
-/*!
- * @abstract Tests if string that contains a substring.
- */
-@interface HCStringContains : HCSubstringMatcher
-@end
-
-
-FOUNDATION_EXPORT id HC_containsSubstring(NSString *substring);
-
-#ifndef HC_DISABLE_SHORT_SYNTAX
-/*!
- * @abstract Creates a matcher that matches when the examined object is a string containing the
- * specified substring anywhere.
- * @param substring The string to search for. (Must not be <code>nil</code>.)
- * @discussion The matcher invokes <code>-rangeOfString:</code> on the examined object, passing the
- * specified <em>substring</em> and matching if it is found.
- *
- * <b>Example</b><br />
- * <pre>assertThat(\@"myStringOfNote", containsSubstring(\@"ring"))</pre>
- *
- * <b>Name Clash</b><br />
- * In the event of a name clash, <code>#define HC_DISABLE_SHORT_SYNTAX</code> and use the synonym
- * HC_containsSubstring instead.
- */
-static inline id containsSubstring(NSString *substring)
-{
-    return HC_containsSubstring(substring);
-}
-#endif
diff --git a/submodules/HockeySDK-iOS/Support/HockeySDKTests/Vendor/OCHamcrestIOS.framework/Versions/A/Headers/HCStringContainsInOrder.h b/submodules/HockeySDK-iOS/Support/HockeySDKTests/Vendor/OCHamcrestIOS.framework/Versions/A/Headers/HCStringContainsInOrder.h
deleted file mode 100644
index e1bcf475fa..0000000000
--- a/submodules/HockeySDK-iOS/Support/HockeySDKTests/Vendor/OCHamcrestIOS.framework/Versions/A/Headers/HCStringContainsInOrder.h
+++ /dev/null
@@ -1,57 +0,0 @@
-//  OCHamcrest by Jon Reid, http://qualitycoding.org/about/
-//  Copyright 2016 hamcrest.org. See LICENSE.txt
-
-#import <OCHamcrestIOS/HCBaseMatcher.h>
-
-
-/*!
- * @abstract Tests if string that contains a list of substrings in relative order.
- */
-@interface HCStringContainsInOrder : HCBaseMatcher
-
-- (instancetype)initWithSubstrings:(NSArray *)substrings;
-
-@end
-
-
-FOUNDATION_EXPORT id HC_stringContainsInOrderIn(NSArray *substrings);
-
-#ifndef HC_DISABLE_SHORT_SYNTAX
-/*!
- * @abstract Creates matcher for NSStrings that matches when the examined string contains all of the
- * specified substrings, considering the order of their appearance.
- * @param substrings An array of strings.
- * @discussion
- * <b>Example</b><br />
- * <pre>assertThat(\@"myfoobarbaz", stringContainsInOrderIn(\@[\@"bar", \@"foo"]))</pre>
- * fails as "foo" occurs before "bar" in the string "myfoobarbaz"
- *
- * <b>Name Clash</b><br />
- * In the event of a name clash, <code>#define HC_DISABLE_SHORT_SYNTAX</code> and use the synonym
- * HC_stringContainsInOrderIn instead.
- */
-static inline id stringContainsInOrderIn(NSArray *substrings)
-{
-    return HC_stringContainsInOrderIn(substrings);
-}
-#endif
-
-
-FOUNDATION_EXPORT id HC_stringContainsInOrder(NSString *substrings, ...) NS_REQUIRES_NIL_TERMINATION;
-
-#ifndef HC_DISABLE_SHORT_SYNTAX
-/*!
- * @abstract Creates matcher for NSStrings that matches when the examined string contains all of the
- * specified substrings, considering the order of their appearance.
- * @param substrings... A comma-separated list of strings, ending with <code>nil</code>.
- * @discussion
- * <b>Example</b><br />
- * <pre>assertThat(\@"myfoobarbaz", stringContainsInOrder(\@"bar", \@"foo", nil))</pre>
- * fails as "foo" occurs before "bar" in the string "myfoobarbaz"
- *
- * <b>Name Clash</b><br />
- * In the event of a name clash, <code>#define HC_DISABLE_SHORT_SYNTAX</code> and use the synonym
- * HC_stringContainsInOrder instead.
- */
-#define stringContainsInOrder(substrings...) HC_stringContainsInOrder(substrings)
-#endif
diff --git a/submodules/HockeySDK-iOS/Support/HockeySDKTests/Vendor/OCHamcrestIOS.framework/Versions/A/Headers/HCStringDescription.h b/submodules/HockeySDK-iOS/Support/HockeySDKTests/Vendor/OCHamcrestIOS.framework/Versions/A/Headers/HCStringDescription.h
deleted file mode 100644
index 79a7cf529d..0000000000
--- a/submodules/HockeySDK-iOS/Support/HockeySDKTests/Vendor/OCHamcrestIOS.framework/Versions/A/Headers/HCStringDescription.h
+++ /dev/null
@@ -1,34 +0,0 @@
-//  OCHamcrest by Jon Reid, http://qualitycoding.org/about/
-//  Copyright 2016 hamcrest.org. See LICENSE.txt
-
-#import <OCHamcrestIOS/HCBaseDescription.h>
-
-@protocol HCSelfDescribing;
-
-
-/*!
- * @abstract An HCDescription that is stored as a string.
- */
-@interface HCStringDescription : HCBaseDescription
-{
-    NSMutableString *accumulator;
-}
-
-/*!
- * @abstract Returns the description of an HCSelfDescribing object as a string.
- * @param selfDescribing The object to be described.
- * @return The description of the object.
- */
-+ (NSString *)stringFrom:(id <HCSelfDescribing>)selfDescribing;
-
-/*!
- * @abstract Creates and returns an empty description.
- */
-+ (instancetype)stringDescription;
-
-/*!
- * @abstract Initializes a newly allocated HCStringDescription that is initially empty.
- */
-- (instancetype)init;
-
-@end
diff --git a/submodules/HockeySDK-iOS/Support/HockeySDKTests/Vendor/OCHamcrestIOS.framework/Versions/A/Headers/HCStringEndsWith.h b/submodules/HockeySDK-iOS/Support/HockeySDKTests/Vendor/OCHamcrestIOS.framework/Versions/A/Headers/HCStringEndsWith.h
deleted file mode 100644
index c58211d7e1..0000000000
--- a/submodules/HockeySDK-iOS/Support/HockeySDKTests/Vendor/OCHamcrestIOS.framework/Versions/A/Headers/HCStringEndsWith.h
+++ /dev/null
@@ -1,36 +0,0 @@
-//  OCHamcrest by Jon Reid, http://qualitycoding.org/about/
-//  Copyright 2016 hamcrest.org. See LICENSE.txt
-
-#import <OCHamcrestIOS/HCSubstringMatcher.h>
-
-
-/*!
- * @abstract Tests if string ends with a substring.
- */
-@interface HCStringEndsWith : HCSubstringMatcher
-@end
-
-
-FOUNDATION_EXPORT id HC_endsWith(NSString *suffix);
-
-#ifndef HC_DISABLE_SHORT_SYNTAX
-/*!
- * @abstract Creates a matcher that matches when the examined object is a string that ends with the
- * specified string.
- * @param suffix The substring that the returned matcher will expect at the end of any examined
- * string. (Must not be <code>nil</code>.)
- * @discussion The matcher invokes <code>-hasSuffix:</code> on the examined object, passing the
- * specified <em>suffix</em>.
- *
- * <b>Example</b><br />
- * <pre>assertThat(\@"myStringOfNote", endsWith(\@"Note"))</pre>
- *
- * <b>Name Clash</b><br />
- * In the event of a name clash, <code>#define HC_DISABLE_SHORT_SYNTAX</code> and use the synonym
- * HC_endsWith instead.
- */
-static inline id endsWith(NSString *suffix)
-{
-    return HC_endsWith(suffix);
-}
-#endif
diff --git a/submodules/HockeySDK-iOS/Support/HockeySDKTests/Vendor/OCHamcrestIOS.framework/Versions/A/Headers/HCStringStartsWith.h b/submodules/HockeySDK-iOS/Support/HockeySDKTests/Vendor/OCHamcrestIOS.framework/Versions/A/Headers/HCStringStartsWith.h
deleted file mode 100644
index 3491b88767..0000000000
--- a/submodules/HockeySDK-iOS/Support/HockeySDKTests/Vendor/OCHamcrestIOS.framework/Versions/A/Headers/HCStringStartsWith.h
+++ /dev/null
@@ -1,36 +0,0 @@
-//  OCHamcrest by Jon Reid, http://qualitycoding.org/about/
-//  Copyright 2016 hamcrest.org. See LICENSE.txt
-
-#import <OCHamcrestIOS/HCSubstringMatcher.h>
-
-
-/*!
- * @abstract Tests string starts with a substring.
- */
-@interface HCStringStartsWith : HCSubstringMatcher
-@end
-
-
-FOUNDATION_EXPORT id HC_startsWith(NSString *prefix);
-
-#ifndef HC_DISABLE_SHORT_SYNTAX
-/*!
- * @abstract Creates a matcher that matches when the examined object is a string that starts with
- * the specified string.
- * @param prefix The substring that the returned matcher will expect at the start of any examined
- * string. (Must not be <code>nil</code>.)
- * @discussion The matcher invokes <code>-hasPrefix:</code> on the examined object, passing the
- * specified <em>prefix</em>.
- *
- * <b>Example</b><br />
- * <pre>assertThat(\@"myStringOfNote", startsWith(\@"my"))</pre>
- *
- * <b>Name Clash</b><br />
- * In the event of a name clash, <code>#define HC_DISABLE_SHORT_SYNTAX</code> and use the synonym
- * HC_startsWith instead.
- */
-static inline id startsWith(NSString *prefix)
-{
-    return HC_startsWith(prefix);
-}
-#endif
diff --git a/submodules/HockeySDK-iOS/Support/HockeySDKTests/Vendor/OCHamcrestIOS.framework/Versions/A/Headers/HCSubstringMatcher.h b/submodules/HockeySDK-iOS/Support/HockeySDKTests/Vendor/OCHamcrestIOS.framework/Versions/A/Headers/HCSubstringMatcher.h
deleted file mode 100644
index 3a2f5d1eea..0000000000
--- a/submodules/HockeySDK-iOS/Support/HockeySDKTests/Vendor/OCHamcrestIOS.framework/Versions/A/Headers/HCSubstringMatcher.h
+++ /dev/null
@@ -1,13 +0,0 @@
-//  OCHamcrest by Jon Reid, http://qualitycoding.org/about/
-//  Copyright 2016 hamcrest.org. See LICENSE.txt
-
-#import <OCHamcrestIOS/HCBaseMatcher.h>
-
-
-@interface HCSubstringMatcher : HCBaseMatcher
-
-@property (nonatomic, copy, readonly) NSString *substring;
-
-- (instancetype)initWithSubstring:(NSString *)substring;
-
-@end
diff --git a/submodules/HockeySDK-iOS/Support/HockeySDKTests/Vendor/OCHamcrestIOS.framework/Versions/A/Headers/HCTestFailure.h b/submodules/HockeySDK-iOS/Support/HockeySDKTests/Vendor/OCHamcrestIOS.framework/Versions/A/Headers/HCTestFailure.h
deleted file mode 100644
index 3a371edd48..0000000000
--- a/submodules/HockeySDK-iOS/Support/HockeySDKTests/Vendor/OCHamcrestIOS.framework/Versions/A/Headers/HCTestFailure.h
+++ /dev/null
@@ -1,38 +0,0 @@
-//  OCHamcrest by Jon Reid, http://qualitycoding.org/about/
-//  Copyright 2016 hamcrest.org. See LICENSE.txt
-
-#import <Foundation/Foundation.h>
-
-
-/*!
- @abstract Test failure location and reason.
- */
-@interface HCTestFailure : NSObject
-
-/*!
- * @abstract Test case used to run test method.
- * @discussion Can be <code>nil</code>.
- *
- * For unmet OCHamcrest assertions, if the assertion was <code>assertThat</code> or
- * <code>assertWithTimeout</code>, <em>testCase</em> will be the test case instance.
- */
-@property (nonatomic, strong, readonly) id testCase;
-
-/*! @abstract File name to report. */
-@property (nonatomic, copy, readonly) NSString *fileName;
-
-/*! @abstract Line number to report. */
-@property (nonatomic, assign, readonly) NSUInteger lineNumber;
-
-/*! @abstract Failure reason to report. */
-@property (nonatomic, strong, readonly) NSString *reason;
-
-/*!
- * @abstract Initializes a newly allocated instance of a test failure.
- */
-- (instancetype)initWithTestCase:(id)testCase
-                        fileName:(NSString *)fileName
-                      lineNumber:(NSUInteger)lineNumber
-                          reason:(NSString *)reason;
-
-@end
diff --git a/submodules/HockeySDK-iOS/Support/HockeySDKTests/Vendor/OCHamcrestIOS.framework/Versions/A/Headers/HCTestFailureReporter.h b/submodules/HockeySDK-iOS/Support/HockeySDKTests/Vendor/OCHamcrestIOS.framework/Versions/A/Headers/HCTestFailureReporter.h
deleted file mode 100644
index 5498e5b081..0000000000
--- a/submodules/HockeySDK-iOS/Support/HockeySDKTests/Vendor/OCHamcrestIOS.framework/Versions/A/Headers/HCTestFailureReporter.h
+++ /dev/null
@@ -1,21 +0,0 @@
-//  OCHamcrest by Jon Reid, http://qualitycoding.org/about/
-//  Copyright 2016 hamcrest.org. See LICENSE.txt
-
-#import <Foundation/Foundation.h>
-
-@class HCTestFailure;
-
-
-/*!
- Chain-of-responsibility for handling test failures.
- */
-@interface HCTestFailureReporter : NSObject
-
-@property (nonatomic, strong) HCTestFailureReporter *successor;
-
-/*!
- Handle test failure at specific location, or pass to successor.
- */
-- (void)handleFailure:(HCTestFailure *)failure;
-
-@end
diff --git a/submodules/HockeySDK-iOS/Support/HockeySDKTests/Vendor/OCHamcrestIOS.framework/Versions/A/Headers/HCTestFailureReporterChain.h b/submodules/HockeySDK-iOS/Support/HockeySDKTests/Vendor/OCHamcrestIOS.framework/Versions/A/Headers/HCTestFailureReporterChain.h
deleted file mode 100644
index 6a8a39e190..0000000000
--- a/submodules/HockeySDK-iOS/Support/HockeySDKTests/Vendor/OCHamcrestIOS.framework/Versions/A/Headers/HCTestFailureReporterChain.h
+++ /dev/null
@@ -1,32 +0,0 @@
-//  OCHamcrest by Jon Reid, http://qualitycoding.org/about/
-//  Copyright 2016 hamcrest.org. See LICENSE.txt
-
-#import <Foundation/Foundation.h>
-
-@class HCTestFailureReporter;
-
-
-/*!
- * @abstract Manage chain-of-responsibility for reporting test failures.
- * @discussion This provides a generic way of reporting test failures without knowing about the
- * underlying test framework. By default, we try XCTest first, then SenTestingKit. If we run out of
- * options, the final catch-all is to throw an NSException describing the test failure.
- */
-@interface HCTestFailureReporterChain : NSObject
-
-/*!
- * @abstract Returns current chain of test failure reporters.
- */
-+ (HCTestFailureReporter *)reporterChain;
-
-/*!
- * @abstract Adds specified test failure reporter to head of chain-of-responsibility.
- */
-+ (void)addReporter:(HCTestFailureReporter *)reporter;
-
-/*!
- * @abstract Resets chain-of-responsibility to default.
- */
-+ (void)reset;
-
-@end
diff --git a/submodules/HockeySDK-iOS/Support/HockeySDKTests/Vendor/OCHamcrestIOS.framework/Versions/A/Headers/HCThrowsException.h b/submodules/HockeySDK-iOS/Support/HockeySDKTests/Vendor/OCHamcrestIOS.framework/Versions/A/Headers/HCThrowsException.h
deleted file mode 100644
index 9bbe7360d1..0000000000
--- a/submodules/HockeySDK-iOS/Support/HockeySDKTests/Vendor/OCHamcrestIOS.framework/Versions/A/Headers/HCThrowsException.h
+++ /dev/null
@@ -1,36 +0,0 @@
-//  OCHamcrest by Jon Reid, http://qualitycoding.org/about/
-//  Copyright 2016 hamcrest.org. See LICENSE.txt
-
-#import <OCHamcrestIOS/HCDiagnosingMatcher.h>
-
-
-/*!
- * @abstract Does executing a block throw an exception which satisfies a nested matcher?
- */
-@interface HCThrowsException : HCDiagnosingMatcher
-
-- (id)initWithExceptionMatcher:(id)exceptionMatcher;
-
-@end
-
-
-FOUNDATION_EXPORT id HC_throwsException(id exceptionMatcher);
-
-#ifndef HC_DISABLE_SHORT_SYNTAX
-/*!
- * @abstract Creates a matcher that matches when the examined object is a block which, when
- * executed, throws an exception satisfying the specified matcher.
- * @param exceptionMatcher The matcher to satisfy when passed the exception.
- * @discussion
- * <b>Example</b><br />
- * <pre>assertThat(^{ [obj somethingBad]; }, throwsException(hasProperty(@"reason", @"EXPECTED REASON")))</pre>
- *
- * <b>Name Clash</b><br />
- * In the event of a name clash, <code>#define HC_DISABLE_SHORT_SYNTAX</code> and use the synonym
- * HC_throwsException instead.
- */
-static inline id throwsException(id exceptionMatcher)
-{
-    return HC_throwsException(exceptionMatcher);
-}
-#endif
diff --git a/submodules/HockeySDK-iOS/Support/HockeySDKTests/Vendor/OCHamcrestIOS.framework/Versions/A/Headers/HCWrapInMatcher.h b/submodules/HockeySDK-iOS/Support/HockeySDKTests/Vendor/OCHamcrestIOS.framework/Versions/A/Headers/HCWrapInMatcher.h
deleted file mode 100644
index 18854bb06e..0000000000
--- a/submodules/HockeySDK-iOS/Support/HockeySDKTests/Vendor/OCHamcrestIOS.framework/Versions/A/Headers/HCWrapInMatcher.h
+++ /dev/null
@@ -1,13 +0,0 @@
-//  OCHamcrest by Jon Reid, http://qualitycoding.org/about/
-//  Copyright 2016 hamcrest.org. See LICENSE.txt
-
-#import <Foundation/Foundation.h>
-
-@protocol HCMatcher;
-
-
-/*!
- * @abstract Wraps argument in a matcher, if necessary.
- * @return The argument as-is if it is already a matcher, otherwise wrapped in an <em>equalTo</em> matcher.
- */
-FOUNDATION_EXPORT id <HCMatcher> HCWrapInMatcher(id matcherOrValue);
diff --git a/submodules/HockeySDK-iOS/Support/HockeySDKTests/Vendor/OCHamcrestIOS.framework/Versions/A/Headers/OCHamcrestIOS.h b/submodules/HockeySDK-iOS/Support/HockeySDKTests/Vendor/OCHamcrestIOS.framework/Versions/A/Headers/OCHamcrestIOS.h
deleted file mode 100644
index 73814a0e1b..0000000000
--- a/submodules/HockeySDK-iOS/Support/HockeySDKTests/Vendor/OCHamcrestIOS.framework/Versions/A/Headers/OCHamcrestIOS.h
+++ /dev/null
@@ -1,54 +0,0 @@
-//  OCHamcrest by Jon Reid, http://qualitycoding.org/about/
-//  Copyright 2016 hamcrest.org. See LICENSE.txt
-
-#import <OCHamcrestIOS/HCAllOf.h>
-#import <OCHamcrestIOS/HCAnyOf.h>
-#import <OCHamcrestIOS/HCArgumentCaptor.h>
-#import <OCHamcrestIOS/HCAssertThat.h>
-#import <OCHamcrestIOS/HCConformsToProtocol.h>
-#import <OCHamcrestIOS/HCDescribedAs.h>
-#import <OCHamcrestIOS/HCEvery.h>
-#import <OCHamcrestIOS/HCHasCount.h>
-#import <OCHamcrestIOS/HCHasDescription.h>
-#import <OCHamcrestIOS/HCHasProperty.h>
-#import <OCHamcrestIOS/HCIs.h>
-#import <OCHamcrestIOS/HCIsAnything.h>
-#import <OCHamcrestIOS/HCIsCloseTo.h>
-#import <OCHamcrestIOS/HCIsCollectionContaining.h>
-#import <OCHamcrestIOS/HCIsCollectionContainingInAnyOrder.h>
-#import <OCHamcrestIOS/HCIsCollectionContainingInOrder.h>
-#import <OCHamcrestIOS/HCIsCollectionContainingInRelativeOrder.h>
-#import <OCHamcrestIOS/HCIsCollectionOnlyContaining.h>
-#import <OCHamcrestIOS/HCIsDictionaryContaining.h>
-#import <OCHamcrestIOS/HCIsDictionaryContainingEntries.h>
-#import <OCHamcrestIOS/HCIsDictionaryContainingKey.h>
-#import <OCHamcrestIOS/HCIsDictionaryContainingValue.h>
-#import <OCHamcrestIOS/HCIsEmptyCollection.h>
-#import <OCHamcrestIOS/HCIsEqual.h>
-#import <OCHamcrestIOS/HCIsEqualIgnoringCase.h>
-#import <OCHamcrestIOS/HCIsEqualCompressingWhiteSpace.h>
-#import <OCHamcrestIOS/HCIsEqualToNumber.h>
-#import <OCHamcrestIOS/HCIsIn.h>
-#import <OCHamcrestIOS/HCIsInstanceOf.h>
-#import <OCHamcrestIOS/HCIsNil.h>
-#import <OCHamcrestIOS/HCIsNot.h>
-#import <OCHamcrestIOS/HCIsSame.h>
-#import <OCHamcrestIOS/HCIsTrueFalse.h>
-#import <OCHamcrestIOS/HCIsTypeOf.h>
-#import <OCHamcrestIOS/HCNumberAssert.h>
-#import <OCHamcrestIOS/HCOrderingComparison.h>
-#import <OCHamcrestIOS/HCStringContains.h>
-#import <OCHamcrestIOS/HCStringContainsInOrder.h>
-#import <OCHamcrestIOS/HCStringEndsWith.h>
-#import <OCHamcrestIOS/HCStringStartsWith.h>
-#import <OCHamcrestIOS/HCTestFailure.h>
-#import <OCHamcrestIOS/HCTestFailureReporter.h>
-#import <OCHamcrestIOS/HCTestFailureReporterChain.h>
-#import <OCHamcrestIOS/HCThrowsException.h>
-
-// Carthage workaround: Include transitive public headers
-#import <OCHamcrestIOS/HCBaseDescription.h>
-#import <OCHamcrestIOS/HCCollect.h>
-#import <OCHamcrestIOS/HCRequireNonNilObject.h>
-#import <OCHamcrestIOS/HCStringDescription.h>
-#import <OCHamcrestIOS/HCWrapInMatcher.h>
diff --git a/submodules/HockeySDK-iOS/Support/HockeySDKTests/Vendor/OCHamcrestIOS.framework/Versions/A/OCHamcrestIOS b/submodules/HockeySDK-iOS/Support/HockeySDKTests/Vendor/OCHamcrestIOS.framework/Versions/A/OCHamcrestIOS
deleted file mode 100644
index 7bbfef8558..0000000000
Binary files a/submodules/HockeySDK-iOS/Support/HockeySDKTests/Vendor/OCHamcrestIOS.framework/Versions/A/OCHamcrestIOS and /dev/null differ
diff --git a/submodules/HockeySDK-iOS/Support/HockeySDKTests/Vendor/OCHamcrestIOS.framework/Versions/A/Resources/Info.plist b/submodules/HockeySDK-iOS/Support/HockeySDKTests/Vendor/OCHamcrestIOS.framework/Versions/A/Resources/Info.plist
deleted file mode 100644
index 510cd7094d..0000000000
--- a/submodules/HockeySDK-iOS/Support/HockeySDKTests/Vendor/OCHamcrestIOS.framework/Versions/A/Resources/Info.plist
+++ /dev/null
@@ -1,46 +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>BuildMachineOSBuild</key>
-	<string>15G31</string>
-	<key>CFBundleDevelopmentRegion</key>
-	<string>English</string>
-	<key>CFBundleExecutable</key>
-	<string>OCHamcrestIOS</string>
-	<key>CFBundleIdentifier</key>
-	<string>org.hamcrest.OCHamcrestIOS</string>
-	<key>CFBundleInfoDictionaryVersion</key>
-	<string>6.0</string>
-	<key>CFBundleName</key>
-	<string>OCHamcrestIOS</string>
-	<key>CFBundlePackageType</key>
-	<string>FMWK</string>
-	<key>CFBundleShortVersionString</key>
-	<string>6.0.0</string>
-	<key>CFBundleSignature</key>
-	<string>????</string>
-	<key>CFBundleSupportedPlatforms</key>
-	<array>
-		<string>MacOSX</string>
-	</array>
-	<key>CFBundleVersion</key>
-	<string>6.0.0</string>
-	<key>DTCompiler</key>
-	<string>com.apple.compilers.llvm.clang.1_0</string>
-	<key>DTPlatformBuild</key>
-	<string>7D1014</string>
-	<key>DTPlatformVersion</key>
-	<string>GM</string>
-	<key>DTSDKBuild</key>
-	<string>15E60</string>
-	<key>DTSDKName</key>
-	<string>macosx10.11</string>
-	<key>DTXcode</key>
-	<string>0731</string>
-	<key>DTXcodeBuild</key>
-	<string>7D1014</string>
-	<key>NSHumanReadableCopyright</key>
-	<string>Copyright © 2016 hamcrest.org</string>
-</dict>
-</plist>
diff --git a/submodules/HockeySDK-iOS/Support/HockeySDKTests/Vendor/OCHamcrestIOS.framework/Versions/Current b/submodules/HockeySDK-iOS/Support/HockeySDKTests/Vendor/OCHamcrestIOS.framework/Versions/Current
deleted file mode 120000
index 8c7e5a667f..0000000000
--- a/submodules/HockeySDK-iOS/Support/HockeySDKTests/Vendor/OCHamcrestIOS.framework/Versions/Current
+++ /dev/null
@@ -1 +0,0 @@
-A
\ No newline at end of file
diff --git a/submodules/HockeySDK-iOS/Support/HockeySDKTests/Vendor/OCMock.framework/Headers/NSNotificationCenter+OCMAdditions.h b/submodules/HockeySDK-iOS/Support/HockeySDKTests/Vendor/OCMock.framework/Headers/NSNotificationCenter+OCMAdditions.h
deleted file mode 100644
index 7d58aabea8..0000000000
--- a/submodules/HockeySDK-iOS/Support/HockeySDKTests/Vendor/OCMock.framework/Headers/NSNotificationCenter+OCMAdditions.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- *  Copyright (c) 2009-2016 Erik Doernenburg and contributors
- *
- *  Licensed under the Apache License, Version 2.0 (the "License"); you may
- *  not use these files except in compliance with the License. You may obtain
- *  a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- *  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- *  License for the specific language governing permissions and limitations
- *  under the License.
- */
-
-#import <Foundation/Foundation.h>
-
-@class OCObserverMockObject;
-
-
-@interface NSNotificationCenter(OCMAdditions)
-
-- (void)addMockObserver:(OCObserverMockObject *)notificationObserver name:(NSString *)notificationName object:(id)notificationSender;
-
-@end
diff --git a/submodules/HockeySDK-iOS/Support/HockeySDKTests/Vendor/OCMock.framework/Headers/OCMArg.h b/submodules/HockeySDK-iOS/Support/HockeySDKTests/Vendor/OCMock.framework/Headers/OCMArg.h
deleted file mode 100644
index 6df735e99e..0000000000
--- a/submodules/HockeySDK-iOS/Support/HockeySDKTests/Vendor/OCMock.framework/Headers/OCMArg.h
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- *  Copyright (c) 2009-2016 Erik Doernenburg and contributors
- *
- *  Licensed under the Apache License, Version 2.0 (the "License"); you may
- *  not use these files except in compliance with the License. You may obtain
- *  a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- *  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- *  License for the specific language governing permissions and limitations
- *  under the License.
- */
-
-#import <Foundation/Foundation.h>
-
-@interface OCMArg : NSObject 
-
-// constraining arguments
-
-+ (id)any;
-+ (SEL)anySelector;
-+ (void *)anyPointer;
-+ (id __autoreleasing *)anyObjectRef;
-+ (id)isNil;
-+ (id)isNotNil;
-+ (id)isEqual:(id)value;
-+ (id)isNotEqual:(id)value;
-+ (id)isKindOfClass:(Class)cls;
-+ (id)checkWithSelector:(SEL)selector onObject:(id)anObject;
-+ (id)checkWithBlock:(BOOL (^)(id obj))block;
-
-// manipulating arguments
-
-+ (id *)setTo:(id)value;
-+ (void *)setToValue:(NSValue *)value;
-+ (id)invokeBlock;
-+ (id)invokeBlockWithArgs:(id)first,... NS_REQUIRES_NIL_TERMINATION;
-
-+ (id)defaultValue;
-
-// internal use only
-
-+ (id)resolveSpecialValues:(NSValue *)value;
-
-@end
-
-#define OCMOCK_ANY [OCMArg any]
-
-#if defined(__GNUC__) && !defined(__STRICT_ANSI__)
-  #define OCMOCK_VALUE(variable) \
-    ({ __typeof__(variable) __v = (variable); [NSValue value:&__v withObjCType:@encode(__typeof__(__v))]; })
-#else
-  #define OCMOCK_VALUE(variable) [NSValue value:&variable withObjCType:@encode(__typeof__(variable))]
-#endif
-
diff --git a/submodules/HockeySDK-iOS/Support/HockeySDKTests/Vendor/OCMock.framework/Headers/OCMConstraint.h b/submodules/HockeySDK-iOS/Support/HockeySDKTests/Vendor/OCMock.framework/Headers/OCMConstraint.h
deleted file mode 100644
index 19fc1a713c..0000000000
--- a/submodules/HockeySDK-iOS/Support/HockeySDKTests/Vendor/OCMock.framework/Headers/OCMConstraint.h
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- *  Copyright (c) 2007-2016 Erik Doernenburg and contributors
- *
- *  Licensed under the Apache License, Version 2.0 (the "License"); you may
- *  not use these files except in compliance with the License. You may obtain
- *  a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- *  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- *  License for the specific language governing permissions and limitations
- *  under the License.
- */
-
-#import <Foundation/Foundation.h>
-
-
-@interface OCMConstraint : NSObject 
-
-+ (instancetype)constraint;
-- (BOOL)evaluate:(id)value;
-
-// if you are looking for any, isNil, etc, they have moved to OCMArg
-
-// try to use [OCMArg checkWith...] instead of the constraintWith... methods below
-
-+ (instancetype)constraintWithSelector:(SEL)aSelector onObject:(id)anObject;
-+ (instancetype)constraintWithSelector:(SEL)aSelector onObject:(id)anObject withValue:(id)aValue;
-
-
-@end
-
-@interface OCMAnyConstraint : OCMConstraint
-@end
-
-@interface OCMIsNilConstraint : OCMConstraint
-@end
-
-@interface OCMIsNotNilConstraint : OCMConstraint
-@end
-
-@interface OCMIsNotEqualConstraint : OCMConstraint
-{
-	@public
-	id testValue;
-}
-
-@end
-
-@interface OCMInvocationConstraint : OCMConstraint
-{
-	@public
-	NSInvocation *invocation;
-}
-
-@end
-
-@interface OCMBlockConstraint : OCMConstraint
-{
-	BOOL (^block)(id);
-}
-
-- (instancetype)initWithConstraintBlock:(BOOL (^)(id))block;
-
-@end
-
-
-#define CONSTRAINT(aSelector) [OCMConstraint constraintWithSelector:aSelector onObject:self]
-#define CONSTRAINTV(aSelector, aValue) [OCMConstraint constraintWithSelector:aSelector onObject:self withValue:(aValue)]
diff --git a/submodules/HockeySDK-iOS/Support/HockeySDKTests/Vendor/OCMock.framework/Headers/OCMFunctions.h b/submodules/HockeySDK-iOS/Support/HockeySDKTests/Vendor/OCMock.framework/Headers/OCMFunctions.h
deleted file mode 100644
index b0c2df353c..0000000000
--- a/submodules/HockeySDK-iOS/Support/HockeySDKTests/Vendor/OCMock.framework/Headers/OCMFunctions.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- *  Copyright (c) 2014-2016 Erik Doernenburg and contributors
- *
- *  Licensed under the Apache License, Version 2.0 (the "License"); you may
- *  not use these files except in compliance with the License. You may obtain
- *  a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- *  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- *  License for the specific language governing permissions and limitations
- *  under the License.
- */
-
-#import <Foundation/Foundation.h>
-
-
-#if defined(__cplusplus)
-#define OCMOCK_EXTERN extern "C"
-#else
-#define OCMOCK_EXTERN extern
-#endif
-
-
-OCMOCK_EXTERN BOOL OCMIsObjectType(const char *objCType);
diff --git a/submodules/HockeySDK-iOS/Support/HockeySDKTests/Vendor/OCMock.framework/Headers/OCMLocation.h b/submodules/HockeySDK-iOS/Support/HockeySDKTests/Vendor/OCMock.framework/Headers/OCMLocation.h
deleted file mode 100644
index 7870c52978..0000000000
--- a/submodules/HockeySDK-iOS/Support/HockeySDKTests/Vendor/OCMock.framework/Headers/OCMLocation.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- *  Copyright (c) 2014-2016 Erik Doernenburg and contributors
- *
- *  Licensed under the Apache License, Version 2.0 (the "License"); you may
- *  not use these files except in compliance with the License. You may obtain
- *  a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- *  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- *  License for the specific language governing permissions and limitations
- *  under the License.
- */
-
-#import <Foundation/Foundation.h>
-#import "OCMFunctions.h"
-
-
-@interface OCMLocation : NSObject
-{
-    id          testCase;
-    NSString    *file;
-    NSUInteger  line;
-}
-
-+ (instancetype)locationWithTestCase:(id)aTestCase file:(NSString *)aFile line:(NSUInteger)aLine;
-
-- (instancetype)initWithTestCase:(id)aTestCase file:(NSString *)aFile line:(NSUInteger)aLine;
-
-- (id)testCase;
-- (NSString *)file;
-- (NSUInteger)line;
-
-@end
-
-OCMOCK_EXTERN OCMLocation *OCMMakeLocation(id testCase, const char *file, int line);
diff --git a/submodules/HockeySDK-iOS/Support/HockeySDKTests/Vendor/OCMock.framework/Headers/OCMMacroState.h b/submodules/HockeySDK-iOS/Support/HockeySDKTests/Vendor/OCMock.framework/Headers/OCMMacroState.h
deleted file mode 100644
index dba41bebdc..0000000000
--- a/submodules/HockeySDK-iOS/Support/HockeySDKTests/Vendor/OCMock.framework/Headers/OCMMacroState.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- *  Copyright (c) 2014-2016 Erik Doernenburg and contributors
- *
- *  Licensed under the Apache License, Version 2.0 (the "License"); you may
- *  not use these files except in compliance with the License. You may obtain
- *  a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- *  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- *  License for the specific language governing permissions and limitations
- *  under the License.
- */
-
-#import <Foundation/Foundation.h>
-
-@class OCMLocation;
-@class OCMRecorder;
-@class OCMStubRecorder;
-@class OCMockObject;
-
-
-@interface OCMMacroState : NSObject
-{
-    OCMRecorder *recorder;
-}
-
-+ (void)beginStubMacro;
-+ (OCMStubRecorder *)endStubMacro;
-
-+ (void)beginExpectMacro;
-+ (OCMStubRecorder *)endExpectMacro;
-
-+ (void)beginRejectMacro;
-+ (OCMStubRecorder *)endRejectMacro;
-
-+ (void)beginVerifyMacroAtLocation:(OCMLocation *)aLocation;
-+ (void)endVerifyMacro;
-
-+ (OCMMacroState *)globalState;
-
-- (OCMRecorder *)recorder;
-
-- (void)switchToClassMethod;
-
-@end
diff --git a/submodules/HockeySDK-iOS/Support/HockeySDKTests/Vendor/OCMock.framework/Headers/OCMRecorder.h b/submodules/HockeySDK-iOS/Support/HockeySDKTests/Vendor/OCMock.framework/Headers/OCMRecorder.h
deleted file mode 100644
index 9670d085f4..0000000000
--- a/submodules/HockeySDK-iOS/Support/HockeySDKTests/Vendor/OCMock.framework/Headers/OCMRecorder.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- *  Copyright (c) 2014-2016 Erik Doernenburg and contributors
- *
- *  Licensed under the Apache License, Version 2.0 (the "License"); you may
- *  not use these files except in compliance with the License. You may obtain
- *  a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- *  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- *  License for the specific language governing permissions and limitations
- *  under the License.
- */
-
-#import <Foundation/Foundation.h>
-
-@class OCMockObject;
-@class OCMInvocationMatcher;
-
-
-@interface OCMRecorder : NSProxy
-{
-    OCMockObject         *mockObject;
-    OCMInvocationMatcher *invocationMatcher;
-}
-
-- (instancetype)init;
-- (instancetype)initWithMockObject:(OCMockObject *)aMockObject;
-
-- (void)setMockObject:(OCMockObject *)aMockObject;
-
-- (OCMInvocationMatcher *)invocationMatcher;
-
-- (id)classMethod;
-- (id)ignoringNonObjectArgs;
-
-@end
diff --git a/submodules/HockeySDK-iOS/Support/HockeySDKTests/Vendor/OCMock.framework/Headers/OCMStubRecorder.h b/submodules/HockeySDK-iOS/Support/HockeySDKTests/Vendor/OCMock.framework/Headers/OCMStubRecorder.h
deleted file mode 100644
index e32029fc22..0000000000
--- a/submodules/HockeySDK-iOS/Support/HockeySDKTests/Vendor/OCMock.framework/Headers/OCMStubRecorder.h
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- *  Copyright (c) 2004-2016 Erik Doernenburg and contributors
- *
- *  Licensed under the Apache License, Version 2.0 (the "License"); you may
- *  not use these files except in compliance with the License. You may obtain
- *  a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- *  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- *  License for the specific language governing permissions and limitations
- *  under the License.
- */
-
-#import <OCMock/OCMRecorder.h>
-#import <OCMock/OCMFunctions.h>
-#import <objc/runtime.h>
-
-@interface OCMStubRecorder : OCMRecorder
-
-- (id)andReturn:(id)anObject;
-- (id)andReturnValue:(NSValue *)aValue;
-- (id)andThrow:(NSException *)anException;
-- (id)andPost:(NSNotification *)aNotification;
-- (id)andCall:(SEL)selector onObject:(id)anObject;
-- (id)andDo:(void (^)(NSInvocation *invocation))block;
-- (id)andForwardToRealObject;
-
-@end
-
-
-@interface OCMStubRecorder (Properties)
-
-#define andReturn(aValue) _andReturn(({                                             \
-  __typeof__(aValue) _val = (aValue);                                               \
-  NSValue *_nsval = [NSValue value:&_val withObjCType:@encode(__typeof__(_val))];   \
-  if (OCMIsObjectType(@encode(__typeof(_val)))) {                                   \
-      objc_setAssociatedObject(_nsval, "OCMAssociatedBoxedValue", *(__unsafe_unretained id *) (void *) &_val, OBJC_ASSOCIATION_RETAIN); \
-  }                                                                                 \
-  _nsval;                                                                           \
-}))
-@property (nonatomic, readonly) OCMStubRecorder *(^ _andReturn)(NSValue *);
-
-#define andThrow(anException) _andThrow(anException)
-@property (nonatomic, readonly) OCMStubRecorder *(^ _andThrow)(NSException *);
-
-#define andPost(aNotification) _andPost(aNotification)
-@property (nonatomic, readonly) OCMStubRecorder *(^ _andPost)(NSNotification *);
-
-#define andCall(anObject, aSelector) _andCall(anObject, aSelector)
-@property (nonatomic, readonly) OCMStubRecorder *(^ _andCall)(id, SEL);
-
-#define andDo(aBlock) _andDo(aBlock)
-@property (nonatomic, readonly) OCMStubRecorder *(^ _andDo)(void (^)(NSInvocation *));
-
-#define andForwardToRealObject() _andForwardToRealObject()
-@property (nonatomic, readonly) OCMStubRecorder *(^ _andForwardToRealObject)(void);
-
-@end
-
-
-
diff --git a/submodules/HockeySDK-iOS/Support/HockeySDKTests/Vendor/OCMock.framework/Headers/OCMock.h b/submodules/HockeySDK-iOS/Support/HockeySDKTests/Vendor/OCMock.framework/Headers/OCMock.h
deleted file mode 100644
index 9d558135bf..0000000000
--- a/submodules/HockeySDK-iOS/Support/HockeySDKTests/Vendor/OCMock.framework/Headers/OCMock.h
+++ /dev/null
@@ -1,113 +0,0 @@
-/*
- *  Copyright (c) 2004-2016 Erik Doernenburg and contributors
- *
- *  Licensed under the Apache License, Version 2.0 (the "License"); you may
- *  not use these files except in compliance with the License. You may obtain
- *  a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- *  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- *  License for the specific language governing permissions and limitations
- *  under the License.
- */
-
-#import <OCMock/OCMockObject.h>
-#import <OCMock/OCMRecorder.h>
-#import <OCMock/OCMStubRecorder.h>
-#import <OCMock/OCMConstraint.h>
-#import <OCMock/OCMArg.h>
-#import <OCMock/OCMLocation.h>
-#import <OCMock/OCMMacroState.h>
-#import <OCMock/NSNotificationCenter+OCMAdditions.h>
-#import <OCMock/OCMFunctions.h>
-
-
-#define OCMClassMock(cls) [OCMockObject niceMockForClass:cls]
-
-#define OCMStrictClassMock(cls) [OCMockObject mockForClass:cls]
-
-#define OCMProtocolMock(protocol) [OCMockObject niceMockForProtocol:protocol]
-
-#define OCMStrictProtocolMock(protocol) [OCMockObject mockForProtocol:protocol]
-
-#define OCMPartialMock(obj) [OCMockObject partialMockForObject:obj]
-
-#define OCMObserverMock() [OCMockObject observerMock]
-
-
-#define OCMStub(invocation) \
-({ \
-    _OCMSilenceWarnings( \
-        [OCMMacroState beginStubMacro]; \
-        OCMStubRecorder *recorder = nil; \
-        @try{ \
-            invocation; \
-        }@finally{ \
-            recorder = [OCMMacroState endStubMacro]; \
-        } \
-        recorder; \
-    ); \
-})
-
-#define OCMExpect(invocation) \
-({ \
-    _OCMSilenceWarnings( \
-        [OCMMacroState beginExpectMacro]; \
-        OCMStubRecorder *recorder = nil; \
-        @try{ \
-            invocation; \
-        }@finally{ \
-            recorder = [OCMMacroState endExpectMacro]; \
-        } \
-        recorder; \
-    ); \
-})
-
-#define OCMReject(invocation) \
-({ \
-    _OCMSilenceWarnings( \
-        [OCMMacroState beginRejectMacro]; \
-        OCMStubRecorder *recorder = nil; \
-        @try{ \
-            invocation; \
-        }@finally{ \
-            recorder = [OCMMacroState endRejectMacro]; \
-        } \
-        recorder; \
-    ); \
-})
-
-#define ClassMethod(invocation) \
-    _OCMSilenceWarnings( \
-        [[OCMMacroState globalState] switchToClassMethod]; \
-        invocation; \
-    );
-
-
-#define OCMVerifyAll(mock) [mock verifyAtLocation:OCMMakeLocation(self, __FILE__, __LINE__)]
-
-#define OCMVerifyAllWithDelay(mock, delay) [mock verifyWithDelay:delay atLocation:OCMMakeLocation(self, __FILE__, __LINE__)]
-
-#define OCMVerify(invocation) \
-({ \
-    _OCMSilenceWarnings( \
-        [OCMMacroState beginVerifyMacroAtLocation:OCMMakeLocation(self, __FILE__, __LINE__)]; \
-        @try{ \
-            invocation; \
-        }@finally{ \
-            [OCMMacroState endVerifyMacro]; \
-        } \
-    ); \
-})
-
-#define _OCMSilenceWarnings(macro) \
-({ \
-    _Pragma("clang diagnostic push") \
-    _Pragma("clang diagnostic ignored \"-Wunused-value\"") \
-    _Pragma("clang diagnostic ignored \"-Wunused-getter-return-value\"") \
-    macro \
-    _Pragma("clang diagnostic pop") \
-})
diff --git a/submodules/HockeySDK-iOS/Support/HockeySDKTests/Vendor/OCMock.framework/Headers/OCMockObject.h b/submodules/HockeySDK-iOS/Support/HockeySDKTests/Vendor/OCMock.framework/Headers/OCMockObject.h
deleted file mode 100644
index 31f7ac41d9..0000000000
--- a/submodules/HockeySDK-iOS/Support/HockeySDKTests/Vendor/OCMock.framework/Headers/OCMockObject.h
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- *  Copyright (c) 2004-2016 Erik Doernenburg and contributors
- *
- *  Licensed under the Apache License, Version 2.0 (the "License"); you may
- *  not use these files except in compliance with the License. You may obtain
- *  a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- *  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- *  License for the specific language governing permissions and limitations
- *  under the License.
- */
-
-#import <Foundation/Foundation.h>
-
-@class OCMLocation;
-@class OCMInvocationStub;
-@class OCMStubRecorder;
-@class OCMInvocationMatcher;
-@class OCMInvocationExpectation;
-
-
-@interface OCMockObject : NSProxy
-{
-	BOOL			isNice;
-	BOOL			expectationOrderMatters;
-	NSMutableArray	*stubs;
-	NSMutableArray	*expectations;
-	NSMutableArray	*exceptions;
-    NSMutableArray  *invocations;
-}
-
-+ (id)mockForClass:(Class)aClass;
-+ (id)mockForProtocol:(Protocol *)aProtocol;
-+ (id)partialMockForObject:(NSObject *)anObject;
-
-+ (id)niceMockForClass:(Class)aClass;
-+ (id)niceMockForProtocol:(Protocol *)aProtocol;
-
-+ (id)observerMock;
-
-- (instancetype)init;
-
-- (void)setExpectationOrderMatters:(BOOL)flag;
-
-- (id)stub;
-- (id)expect;
-- (id)reject;
-
-- (id)verify;
-- (id)verifyAtLocation:(OCMLocation *)location;
-
-- (void)verifyWithDelay:(NSTimeInterval)delay;
-- (void)verifyWithDelay:(NSTimeInterval)delay atLocation:(OCMLocation *)location;
-
-- (void)stopMocking;
-
-// internal use only
-
-- (void)addStub:(OCMInvocationStub *)aStub;
-- (void)addExpectation:(OCMInvocationExpectation *)anExpectation;
-
-- (BOOL)handleInvocation:(NSInvocation *)anInvocation;
-- (void)handleUnRecordedInvocation:(NSInvocation *)anInvocation;
-- (BOOL)handleSelector:(SEL)sel;
-
-- (void)verifyInvocation:(OCMInvocationMatcher *)matcher;
-- (void)verifyInvocation:(OCMInvocationMatcher *)matcher atLocation:(OCMLocation *)location;
-
-@end
-
diff --git a/submodules/HockeySDK-iOS/Support/HockeySDKTests/Vendor/OCMock.framework/Info.plist b/submodules/HockeySDK-iOS/Support/HockeySDKTests/Vendor/OCMock.framework/Info.plist
deleted file mode 100644
index 66c586c6d7..0000000000
Binary files a/submodules/HockeySDK-iOS/Support/HockeySDKTests/Vendor/OCMock.framework/Info.plist and /dev/null differ
diff --git a/submodules/HockeySDK-iOS/Support/HockeySDKTests/Vendor/OCMock.framework/Modules/module.modulemap b/submodules/HockeySDK-iOS/Support/HockeySDKTests/Vendor/OCMock.framework/Modules/module.modulemap
deleted file mode 100644
index 6e98890917..0000000000
--- a/submodules/HockeySDK-iOS/Support/HockeySDKTests/Vendor/OCMock.framework/Modules/module.modulemap
+++ /dev/null
@@ -1,6 +0,0 @@
-framework module OCMock {
-  umbrella header "OCMock.h"
-
-  export *
-  module * { export * }
-}
diff --git a/submodules/HockeySDK-iOS/Support/HockeySDKTests/Vendor/OCMock.framework/OCMock b/submodules/HockeySDK-iOS/Support/HockeySDKTests/Vendor/OCMock.framework/OCMock
deleted file mode 100755
index 914d439c83..0000000000
Binary files a/submodules/HockeySDK-iOS/Support/HockeySDKTests/Vendor/OCMock.framework/OCMock and /dev/null differ
diff --git a/submodules/HockeySDK-iOS/Support/HockeySDKTests/Vendor/OCMock.framework/_CodeSignature/CodeResources b/submodules/HockeySDK-iOS/Support/HockeySDKTests/Vendor/OCMock.framework/_CodeSignature/CodeResources
deleted file mode 100644
index 674fa80992..0000000000
--- a/submodules/HockeySDK-iOS/Support/HockeySDKTests/Vendor/OCMock.framework/_CodeSignature/CodeResources
+++ /dev/null
@@ -1,286 +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>files</key>
-	<dict>
-		<key>Headers/NSNotificationCenter+OCMAdditions.h</key>
-		<data>
-		pFhPKZzX9HM07wFLAmeFF43SG6Q=
-		</data>
-		<key>Headers/OCMArg.h</key>
-		<data>
-		eXH6306vchCAoMs2SOo05ZgYfyE=
-		</data>
-		<key>Headers/OCMConstraint.h</key>
-		<data>
-		FRbc5GvcXMiiCFl1PgW3OvepNYA=
-		</data>
-		<key>Headers/OCMFunctions.h</key>
-		<data>
-		CyzP7WkZ+OOYELFA5WsZaWO5kxg=
-		</data>
-		<key>Headers/OCMLocation.h</key>
-		<data>
-		qjhhruQ18SiTXjsRjKGUD1eCM/g=
-		</data>
-		<key>Headers/OCMMacroState.h</key>
-		<data>
-		qJJTF+b6OeQggRm1gDg8v6UIzpM=
-		</data>
-		<key>Headers/OCMRecorder.h</key>
-		<data>
-		diyYzxk+iLvIqBa+mGMSxgNx5Hs=
-		</data>
-		<key>Headers/OCMStubRecorder.h</key>
-		<data>
-		jk2b9AjWJ1SRj0ju7Uu+U3C3uT8=
-		</data>
-		<key>Headers/OCMock.h</key>
-		<data>
-		93kK1Oj0uYy5eT+GMc5l1IOm+E0=
-		</data>
-		<key>Headers/OCMockObject.h</key>
-		<data>
-		oZEWGlkN3u1F+7KPHoLi3MYbU0k=
-		</data>
-		<key>Info.plist</key>
-		<data>
-		DDVjfbJWFO2giIrM67R4Jq7++Po=
-		</data>
-		<key>Modules/module.modulemap</key>
-		<data>
-		C/zv4wGd+b+kg7T2q31cWmGbPX0=
-		</data>
-	</dict>
-	<key>files2</key>
-	<dict>
-		<key>Headers/NSNotificationCenter+OCMAdditions.h</key>
-		<dict>
-			<key>hash</key>
-			<data>
-			pFhPKZzX9HM07wFLAmeFF43SG6Q=
-			</data>
-			<key>hash2</key>
-			<data>
-			NnTKrGNP4Njk3yKcEvglOeMqccpGA9jHyC1RQu2S0bQ=
-			</data>
-		</dict>
-		<key>Headers/OCMArg.h</key>
-		<dict>
-			<key>hash</key>
-			<data>
-			eXH6306vchCAoMs2SOo05ZgYfyE=
-			</data>
-			<key>hash2</key>
-			<data>
-			FxqsQiA69iuoHCr4qLNLeUjs0O3nrlM1/y8HFUrRbz0=
-			</data>
-		</dict>
-		<key>Headers/OCMConstraint.h</key>
-		<dict>
-			<key>hash</key>
-			<data>
-			FRbc5GvcXMiiCFl1PgW3OvepNYA=
-			</data>
-			<key>hash2</key>
-			<data>
-			0qapY/YQKe0npD4guJXAxrg3PnEIeEK3R+PqW7jEc+A=
-			</data>
-		</dict>
-		<key>Headers/OCMFunctions.h</key>
-		<dict>
-			<key>hash</key>
-			<data>
-			CyzP7WkZ+OOYELFA5WsZaWO5kxg=
-			</data>
-			<key>hash2</key>
-			<data>
-			hBleQ1IlJVlSU7ObC/o8aWPiF4aS3tbjdPPSQX0oFaI=
-			</data>
-		</dict>
-		<key>Headers/OCMLocation.h</key>
-		<dict>
-			<key>hash</key>
-			<data>
-			qjhhruQ18SiTXjsRjKGUD1eCM/g=
-			</data>
-			<key>hash2</key>
-			<data>
-			D0ep+94IDMx4jNTEObjRjXjOa9o5HWtU3kALeNvMrMk=
-			</data>
-		</dict>
-		<key>Headers/OCMMacroState.h</key>
-		<dict>
-			<key>hash</key>
-			<data>
-			qJJTF+b6OeQggRm1gDg8v6UIzpM=
-			</data>
-			<key>hash2</key>
-			<data>
-			rO0jxkQY4xa4ynAHSysMSsK1THpZIjLVGO6JAfyb0p8=
-			</data>
-		</dict>
-		<key>Headers/OCMRecorder.h</key>
-		<dict>
-			<key>hash</key>
-			<data>
-			diyYzxk+iLvIqBa+mGMSxgNx5Hs=
-			</data>
-			<key>hash2</key>
-			<data>
-			Dl5hWJ6yAPLAbm0qYTbZ1Q8WT49qyklAUoxBRUazevU=
-			</data>
-		</dict>
-		<key>Headers/OCMStubRecorder.h</key>
-		<dict>
-			<key>hash</key>
-			<data>
-			jk2b9AjWJ1SRj0ju7Uu+U3C3uT8=
-			</data>
-			<key>hash2</key>
-			<data>
-			tZQFBeJpaclUrRhLP7S8Tkw6To79q4BFCgy956ocR8U=
-			</data>
-		</dict>
-		<key>Headers/OCMock.h</key>
-		<dict>
-			<key>hash</key>
-			<data>
-			93kK1Oj0uYy5eT+GMc5l1IOm+E0=
-			</data>
-			<key>hash2</key>
-			<data>
-			4QEeRNlGEjQ8CTfq7Bl5lcdkpjb35WQvT9VvDQott8Q=
-			</data>
-		</dict>
-		<key>Headers/OCMockObject.h</key>
-		<dict>
-			<key>hash</key>
-			<data>
-			oZEWGlkN3u1F+7KPHoLi3MYbU0k=
-			</data>
-			<key>hash2</key>
-			<data>
-			JIb6/mFaQhSB0mM9ofM5Stqa5aJe7pwiDsuBf9FZV00=
-			</data>
-		</dict>
-		<key>Modules/module.modulemap</key>
-		<dict>
-			<key>hash</key>
-			<data>
-			C/zv4wGd+b+kg7T2q31cWmGbPX0=
-			</data>
-			<key>hash2</key>
-			<data>
-			B5k13RUp+z7jVfSrgRPFafuYH6CF8A6V1qosS2Lm+1k=
-			</data>
-		</dict>
-	</dict>
-	<key>rules</key>
-	<dict>
-		<key>^</key>
-		<true/>
-		<key>^.*\.lproj/</key>
-		<dict>
-			<key>optional</key>
-			<true/>
-			<key>weight</key>
-			<real>1000</real>
-		</dict>
-		<key>^.*\.lproj/locversion.plist$</key>
-		<dict>
-			<key>omit</key>
-			<true/>
-			<key>weight</key>
-			<real>1100</real>
-		</dict>
-		<key>^Base\.lproj/</key>
-		<dict>
-			<key>weight</key>
-			<real>1010</real>
-		</dict>
-		<key>^version.plist$</key>
-		<true/>
-	</dict>
-	<key>rules2</key>
-	<dict>
-		<key>.*\.dSYM($|/)</key>
-		<dict>
-			<key>weight</key>
-			<real>11</real>
-		</dict>
-		<key>^</key>
-		<dict>
-			<key>weight</key>
-			<real>20</real>
-		</dict>
-		<key>^(.*/)?\.DS_Store$</key>
-		<dict>
-			<key>omit</key>
-			<true/>
-			<key>weight</key>
-			<real>2000</real>
-		</dict>
-		<key>^(Frameworks|SharedFrameworks|PlugIns|Plug-ins|XPCServices|Helpers|MacOS|Library/(Automator|Spotlight|LoginItems))/</key>
-		<dict>
-			<key>nested</key>
-			<true/>
-			<key>weight</key>
-			<real>10</real>
-		</dict>
-		<key>^.*</key>
-		<true/>
-		<key>^.*\.lproj/</key>
-		<dict>
-			<key>optional</key>
-			<true/>
-			<key>weight</key>
-			<real>1000</real>
-		</dict>
-		<key>^.*\.lproj/locversion.plist$</key>
-		<dict>
-			<key>omit</key>
-			<true/>
-			<key>weight</key>
-			<real>1100</real>
-		</dict>
-		<key>^Base\.lproj/</key>
-		<dict>
-			<key>weight</key>
-			<real>1010</real>
-		</dict>
-		<key>^Info\.plist$</key>
-		<dict>
-			<key>omit</key>
-			<true/>
-			<key>weight</key>
-			<real>20</real>
-		</dict>
-		<key>^PkgInfo$</key>
-		<dict>
-			<key>omit</key>
-			<true/>
-			<key>weight</key>
-			<real>20</real>
-		</dict>
-		<key>^[^/]+$</key>
-		<dict>
-			<key>nested</key>
-			<true/>
-			<key>weight</key>
-			<real>10</real>
-		</dict>
-		<key>^embedded\.provisionprofile$</key>
-		<dict>
-			<key>weight</key>
-			<real>20</real>
-		</dict>
-		<key>^version\.plist$</key>
-		<dict>
-			<key>weight</key>
-			<real>20</real>
-		</dict>
-	</dict>
-</dict>
-</plist>
diff --git a/submodules/HockeySDK-iOS/Support/HockeySDKTests/Vendor/OCMockitoIOS.framework/Headers b/submodules/HockeySDK-iOS/Support/HockeySDKTests/Vendor/OCMockitoIOS.framework/Headers
deleted file mode 120000
index a177d2a6b9..0000000000
--- a/submodules/HockeySDK-iOS/Support/HockeySDKTests/Vendor/OCMockitoIOS.framework/Headers
+++ /dev/null
@@ -1 +0,0 @@
-Versions/Current/Headers
\ No newline at end of file
diff --git a/submodules/HockeySDK-iOS/Support/HockeySDKTests/Vendor/OCMockitoIOS.framework/OCMockitoIOS b/submodules/HockeySDK-iOS/Support/HockeySDKTests/Vendor/OCMockitoIOS.framework/OCMockitoIOS
deleted file mode 120000
index 9dc2b2dcf0..0000000000
--- a/submodules/HockeySDK-iOS/Support/HockeySDKTests/Vendor/OCMockitoIOS.framework/OCMockitoIOS
+++ /dev/null
@@ -1 +0,0 @@
-Versions/Current/OCMockitoIOS
\ No newline at end of file
diff --git a/submodules/HockeySDK-iOS/Support/HockeySDKTests/Vendor/OCMockitoIOS.framework/Resources b/submodules/HockeySDK-iOS/Support/HockeySDKTests/Vendor/OCMockitoIOS.framework/Resources
deleted file mode 120000
index 953ee36f3b..0000000000
--- a/submodules/HockeySDK-iOS/Support/HockeySDKTests/Vendor/OCMockitoIOS.framework/Resources
+++ /dev/null
@@ -1 +0,0 @@
-Versions/Current/Resources
\ No newline at end of file
diff --git a/submodules/HockeySDK-iOS/Support/HockeySDKTests/Vendor/OCMockitoIOS.framework/Versions/A/Headers/MKTBaseMockObject.h b/submodules/HockeySDK-iOS/Support/HockeySDKTests/Vendor/OCMockitoIOS.framework/Versions/A/Headers/MKTBaseMockObject.h
deleted file mode 100644
index 7225439386..0000000000
--- a/submodules/HockeySDK-iOS/Support/HockeySDKTests/Vendor/OCMockitoIOS.framework/Versions/A/Headers/MKTBaseMockObject.h
+++ /dev/null
@@ -1,13 +0,0 @@
-//  OCMockito by Jon Reid, http://qualitycoding.org/about/
-//  Copyright 2015 Jonathan M. Reid. See LICENSE.txt
-
-#import <Foundation/Foundation.h>
-#import "MKTNonObjectArgumentMatching.h"
-
-
-@interface MKTBaseMockObject : NSProxy <MKTNonObjectArgumentMatching>
-
-- (instancetype)init;
-- (void)mkt_stopMocking;
-
-@end
diff --git a/submodules/HockeySDK-iOS/Support/HockeySDKTests/Vendor/OCMockitoIOS.framework/Versions/A/Headers/MKTClassObjectMock.h b/submodules/HockeySDK-iOS/Support/HockeySDKTests/Vendor/OCMockitoIOS.framework/Versions/A/Headers/MKTClassObjectMock.h
deleted file mode 100644
index 500404cd43..0000000000
--- a/submodules/HockeySDK-iOS/Support/HockeySDKTests/Vendor/OCMockitoIOS.framework/Versions/A/Headers/MKTClassObjectMock.h
+++ /dev/null
@@ -1,15 +0,0 @@
-//  OCMockito by Jon Reid, http://qualitycoding.org/about/
-//  Copyright 2015 Jonathan M. Reid. See LICENSE.txt
-//  Contribution by David Hart
-
-#import "MKTBaseMockObject.h"
-
-
-/*!
- * @abstract Mock object of a given class object.
- */
-@interface MKTClassObjectMock : MKTBaseMockObject
-
-- (instancetype)initWithClass:(Class)aClass;
-
-@end
diff --git a/submodules/HockeySDK-iOS/Support/HockeySDKTests/Vendor/OCMockitoIOS.framework/Versions/A/Headers/MKTNonObjectArgumentMatching.h b/submodules/HockeySDK-iOS/Support/HockeySDKTests/Vendor/OCMockitoIOS.framework/Versions/A/Headers/MKTNonObjectArgumentMatching.h
deleted file mode 100644
index ab71529f6c..0000000000
--- a/submodules/HockeySDK-iOS/Support/HockeySDKTests/Vendor/OCMockitoIOS.framework/Versions/A/Headers/MKTNonObjectArgumentMatching.h
+++ /dev/null
@@ -1,40 +0,0 @@
-//  OCMockito by Jon Reid, http://qualitycoding.org/about/
-//  Copyright 2015 Jonathan M. Reid. See LICENSE.txt
-
-@protocol HCMatcher;
-
-
-/*!
- * @abstract Ability to specify OCHamcrest matchers for non-object arguments.
- */
-@protocol MKTNonObjectArgumentMatching
-
-/*!
- * @abstract Specifies OCHamcrest matcher for a specific argument of a method.
- * @discussion For methods arguments that take objects, just pass the matcher directly as a method
- * call. But for arguments that take non-objects, pass in a dummy value to satisfy the compiler, but
- * call this to override it with the given matcher. Upon verification, the actual argument received
- * will be converted to an object before being checked by the matcher.
- *
- * The argument index is 0-based, so the first argument of a method has index 0.
- *
- * Examples:
- * <pre>[[given([mockFetchedResultsController performFetch:NULL]) withMatcher:anything()] willReturn:\@YES];</pre>
- * This stubs <code>performFetch:</code> to return <code>YES</code> for any NSError ** argument.
- *
- * <pre>[[verify(mockArray) withMatcher:greaterThan(@5]) forArgument:0] removeObjectAtIndex:0];</pre>
- * This verifies that <code>removeObjectAtIndex:</code> was called with an index greater than 5.
- */
-- (id)withMatcher:(id <HCMatcher>)matcher forArgument:(NSUInteger)index;
-
-/*!
- * @abstract Specifies OCHamcrest matcher for the first argument of a method.
- * @discussion Equivalent to <code>withMatcher:matcher forArgument:0</code>.
- *
- * Example:
- * <pre>[[verify(mockArray) withMatcher:greaterThan(\@5)] removeObjectAtIndex:0];</pre>
- * This verifies that <code>removeObjectAtIndex:</code> was called with an index greater than 5.
-*/
-- (id)withMatcher:(id <HCMatcher>)matcher;
-
-@end
diff --git a/submodules/HockeySDK-iOS/Support/HockeySDKTests/Vendor/OCMockitoIOS.framework/Versions/A/Headers/MKTObjectAndProtocolMock.h b/submodules/HockeySDK-iOS/Support/HockeySDKTests/Vendor/OCMockitoIOS.framework/Versions/A/Headers/MKTObjectAndProtocolMock.h
deleted file mode 100644
index f74b8a426e..0000000000
--- a/submodules/HockeySDK-iOS/Support/HockeySDKTests/Vendor/OCMockitoIOS.framework/Versions/A/Headers/MKTObjectAndProtocolMock.h
+++ /dev/null
@@ -1,15 +0,0 @@
-//  OCMockito by Jon Reid, http://qualitycoding.org/about/
-//  Copyright 2015 Jonathan M. Reid. See LICENSE.txt
-//  Contribution by Kevin Lundberg
-
-#import "MKTProtocolMock.h"
-
-
-/*!
- * @abstract Mock object of a given class that also implements a given protocol.
- */
-@interface MKTObjectAndProtocolMock : MKTProtocolMock
-
-- (instancetype)initWithClass:(Class)aClass protocol:(Protocol *)protocol;
-
-@end
diff --git a/submodules/HockeySDK-iOS/Support/HockeySDKTests/Vendor/OCMockitoIOS.framework/Versions/A/Headers/MKTObjectMock.h b/submodules/HockeySDK-iOS/Support/HockeySDKTests/Vendor/OCMockitoIOS.framework/Versions/A/Headers/MKTObjectMock.h
deleted file mode 100644
index 536e8cc86e..0000000000
--- a/submodules/HockeySDK-iOS/Support/HockeySDKTests/Vendor/OCMockitoIOS.framework/Versions/A/Headers/MKTObjectMock.h
+++ /dev/null
@@ -1,14 +0,0 @@
-//  OCMockito by Jon Reid, http://qualitycoding.org/about/
-//  Copyright 2015 Jonathan M. Reid. See LICENSE.txt
-
-#import "MKTBaseMockObject.h"
-
-
-/*!
- * @abstract Mock object of a given class.
- */
-@interface MKTObjectMock : MKTBaseMockObject
-
-- (instancetype)initWithClass:(Class)aClass;
-
-@end
diff --git a/submodules/HockeySDK-iOS/Support/HockeySDKTests/Vendor/OCMockitoIOS.framework/Versions/A/Headers/MKTOngoingStubbing.h b/submodules/HockeySDK-iOS/Support/HockeySDKTests/Vendor/OCMockitoIOS.framework/Versions/A/Headers/MKTOngoingStubbing.h
deleted file mode 100644
index 4218dc0ef0..0000000000
--- a/submodules/HockeySDK-iOS/Support/HockeySDKTests/Vendor/OCMockitoIOS.framework/Versions/A/Headers/MKTOngoingStubbing.h
+++ /dev/null
@@ -1,146 +0,0 @@
-//  OCMockito by Jon Reid, http://qualitycoding.org/about/
-//  Copyright 2015 Jonathan M. Reid. See LICENSE.txt
-
-#import <Foundation/Foundation.h>
-#import "MKTNonObjectArgumentMatching.h"
-
-@class MKTInvocationContainer;
-
-
-/*!
- * @abstract Methods to invoke on <code>given(methodCall)</code> to stub return values or behaviors.
- * @discussion The methods return <code>self</code> to allow stubbing consecutive calls. The last
- * stub determines the behavior of further consecutive calls.
- */
-@interface MKTOngoingStubbing : NSObject <MKTNonObjectArgumentMatching>
-
-- (instancetype)initWithInvocationContainer:(MKTInvocationContainer *)invocationContainer;
-
-/*!
- * @abstract Sets an object to return when the method is called.
- * @discussion Example:
- * <pre>[given([mock someMethod]) willReturn:@"FOO"];</pre>
- * @return MKTOngoingStubbing object to allow stubbing consecutive calls
- */
-- (MKTOngoingStubbing *)willReturn:(id)object;
-
-/*!
- * @abstract Sets a struct to return when the method is called.
- * @param value Pointer to struct.
- * @param type \@encode() compiler directive called on the struct.
- * @discussion
- * Example:
- * <pre>[given([mock someMethod]) willReturnStruct:&myStruct objCType:\@encode(MyStructType)];</pre>
- * @return MKTOngoingStubbing object to allow stubbing consecutive calls
- */
-- (MKTOngoingStubbing *)willReturnStruct:(const void *)value objCType:(const char *)type;
-
-/*!
- * @abstract Sets a BOOL to return when the method is called.
- * @return MKTOngoingStubbing object to allow stubbing consecutive calls
- */
-- (MKTOngoingStubbing *)willReturnBool:(BOOL)value;
-
-/*!
- * @abstract Sets a char to return when the method is called.
- * @return MKTOngoingStubbing object to allow stubbing consecutive calls
- */
-- (MKTOngoingStubbing *)willReturnChar:(char)value;
-
-/*!
- * @abstract Sets an int to return when the method is called.
- * @return MKTOngoingStubbing object to allow stubbing consecutive calls
- */
-- (MKTOngoingStubbing *)willReturnInt:(int)value;
-
-/*!
- * @abstract Sets a short to return when the method is called.
- * @return MKTOngoingStubbing object to allow stubbing consecutive calls
- */
-- (MKTOngoingStubbing *)willReturnShort:(short)value;
-
-/*!
- * @abstract Sets a long to return when the method is called.
- * @return MKTOngoingStubbing object to allow stubbing consecutive calls
- */
-- (MKTOngoingStubbing *)willReturnLong:(long)value;
-
-/*!
- * @abstract Sets a long long to return when the method is called.
- * @return MKTOngoingStubbing object to allow stubbing consecutive calls
- */
-- (MKTOngoingStubbing *)willReturnLongLong:(long long)value;
-
-/*!
- * @abstract Sets an NSInteger to return when the method is called.
- * @return MKTOngoingStubbing object to allow stubbing consecutive calls
- */
-- (MKTOngoingStubbing *)willReturnInteger:(NSInteger)value;
-
-/*!
- * @abstract Sets an unsigned char to return when the method is called.
- * @return MKTOngoingStubbing object to allow stubbing consecutive calls
- */
-- (MKTOngoingStubbing *)willReturnUnsignedChar:(unsigned char)value;
-
-/*!
- * @abstract Sets an unsigned int to return when the method is called.
- * @return MKTOngoingStubbing object to allow stubbing consecutive calls
- */
-- (MKTOngoingStubbing *)willReturnUnsignedInt:(unsigned int)value;
-
-/*!
- * @abstract Sets an unsigned short to return when the method is called.
- * @return MKTOngoingStubbing object to allow stubbing consecutive calls
- */
-- (MKTOngoingStubbing *)willReturnUnsignedShort:(unsigned short)value;
-
-/*!
- * @abstract Sets an unsigned long to return when the method is called.
- * @return MKTOngoingStubbing object to allow stubbing consecutive calls
- */
-- (MKTOngoingStubbing *)willReturnUnsignedLong:(unsigned long)value;
-
-/*!
- * @abstract Sets an unsigned long long to return when the method is called.
- * @return MKTOngoingStubbing object to allow stubbing consecutive calls
- */
-- (MKTOngoingStubbing *)willReturnUnsignedLongLong:(unsigned long long)value;
-
-/*!
- * @abstract Sets an NSUInteger to return when the method is called.
- * @return MKTOngoingStubbing object to allow stubbing consecutive calls
- */
-- (MKTOngoingStubbing *)willReturnUnsignedInteger:(NSUInteger)value;
-
-/*!
- * @abstract Sets a float to return when the method is called.
- * @return MKTOngoingStubbing object to allow stubbing consecutive calls
- */
-- (MKTOngoingStubbing *)willReturnFloat:(float)value;
-
-/*!
- * @abstract Sets a double to return when the method is called.
- * @return MKTOngoingStubbing object to allow stubbing consecutive calls
- */
-- (MKTOngoingStubbing *)willReturnDouble:(double)value;
-
-/*!
- * @abstract Sets an NSException to be thrown when the method is called.
- * @return MKTOngoingStubbing object to allow stubbing consecutive calls
- * @discussion
- * Example:
- * <pre>[given([mock someMethod]) willThrow:exception];</pre>
- */
-- (MKTOngoingStubbing *)willThrow:(NSException *)exception;
-
-/*!
- * @abstract Sets a block to be executed when the method is called.
- * @discussion The block is evaluated when the method is called. The block can easily access
- * invocation arguments by calling <code>mkt_arguments</code>. Whatever the block returns will be
- * used as the stubbed return value.
- * @return MKTOngoingStubbing object to allow stubbing consecutive calls
- */
-- (MKTOngoingStubbing *)willDo:(id (^)(NSInvocation *))block;
-
-@end
diff --git a/submodules/HockeySDK-iOS/Support/HockeySDKTests/Vendor/OCMockitoIOS.framework/Versions/A/Headers/MKTProtocolMock.h b/submodules/HockeySDK-iOS/Support/HockeySDKTests/Vendor/OCMockitoIOS.framework/Versions/A/Headers/MKTProtocolMock.h
deleted file mode 100644
index 565bfd6542..0000000000
--- a/submodules/HockeySDK-iOS/Support/HockeySDKTests/Vendor/OCMockitoIOS.framework/Versions/A/Headers/MKTProtocolMock.h
+++ /dev/null
@@ -1,17 +0,0 @@
-//  OCMockito by Jon Reid, http://qualitycoding.org/about/
-//  Copyright 2015 Jonathan M. Reid. See LICENSE.txt
-
-#import "MKTBaseMockObject.h"
-
-
-/*!
- * @abstract Mock object implementing a given protocol.
- */
-@interface MKTProtocolMock : MKTBaseMockObject
-
-@property (nonatomic, strong, readonly) Protocol *mockedProtocol;
-
-- (instancetype)initWithProtocol:(Protocol *)aProtocol
-          includeOptionalMethods:(BOOL)includeOptionalMethods;
-
-@end
diff --git a/submodules/HockeySDK-iOS/Support/HockeySDKTests/Vendor/OCMockitoIOS.framework/Versions/A/Headers/NSInvocation+OCMockito.h b/submodules/HockeySDK-iOS/Support/HockeySDKTests/Vendor/OCMockitoIOS.framework/Versions/A/Headers/NSInvocation+OCMockito.h
deleted file mode 100644
index 879a895499..0000000000
--- a/submodules/HockeySDK-iOS/Support/HockeySDKTests/Vendor/OCMockitoIOS.framework/Versions/A/Headers/NSInvocation+OCMockito.h
+++ /dev/null
@@ -1,30 +0,0 @@
-//  OCMockito by Jon Reid, http://qualitycoding.org/about/
-//  Copyright 2015 Jonathan M. Reid. See LICENSE.txt
-
-#import <Foundation/Foundation.h>
-
-/*!
- * @abstract NSInvocation helper methods
- */
-@interface NSInvocation (OCMockito)
-
-/*!
- * @abstract Returns all invocation arguments in an NSArray.
- * @discussion Non-object arguments are boxed as follows:
- * <ul>
- *   <li><code>nil</code>: NSNull</li>
- *   <li>Primitive numeric values: NSNumber</li>
- *   <li>Pointers: NSValue</li>
- *   <li>Selectors: NSString</li>
- *   <li>Structs: NSData</li>
- * </ul>
- */
-- (NSArray *)mkt_arguments;
-
-/*! @abstract Sets invocation return value. */
-- (void)mkt_setReturnValue:(id)returnValue;
-
-/*! @abstract Retains arguments but with weak invocation target to avoid retain cycles. */
-- (void)mkt_retainArgumentsWithWeakTarget;
-
-@end
diff --git a/submodules/HockeySDK-iOS/Support/HockeySDKTests/Vendor/OCMockitoIOS.framework/Versions/A/Headers/OCMockitoIOS.h b/submodules/HockeySDK-iOS/Support/HockeySDKTests/Vendor/OCMockitoIOS.framework/Versions/A/Headers/OCMockitoIOS.h
deleted file mode 100644
index 0cdacf73d3..0000000000
--- a/submodules/HockeySDK-iOS/Support/HockeySDKTests/Vendor/OCMockitoIOS.framework/Versions/A/Headers/OCMockitoIOS.h
+++ /dev/null
@@ -1,352 +0,0 @@
-//  OCMockito by Jon Reid, http://qualitycoding.org/about/
-//  Copyright 2015 Jonathan M. Reid. See LICENSE.txt
-
-#import <Foundation/Foundation.h>
-
-#import "MKTOngoingStubbing.h"
-#import "NSInvocation+OCMockito.h"
-
-@protocol MKTVerificationMode;
-
-
-FOUNDATION_EXPORT id MKTMock(Class classToMock);
-
-#ifndef MKT_DISABLE_SHORT_SYNTAX
-/*!
- * @abstract Creates mock object of given class.
- * @param classToMock The class for which to mock instance methods.
- * @discussion The mock object will handle all instance methods of <code>classToMock</code>. Methods
- * return 0 by default.<br />
- * Use <code>given</code> to stub different return values or behaviors.<br />
- * Use <code>givenVoid</code> to stub behaviors of void methods.
- *
- * <b>Name Clash</b><br />
- * In the event of a name clash, <code>#define MKT_DISABLE_SHORT_SYNTAX</code> and use the synonym
- * MKTMock instead.
- */
-static inline id mock(Class classToMock)
-{
-    return MKTMock(classToMock);
-}
-#endif
-
-
-FOUNDATION_EXPORT id MKTMockClass(Class classToMock);
-
-#ifndef MKT_DISABLE_SHORT_SYNTAX
-/*!
- * @abstract Creates mock class object of given class.
- * @param classToMock The class for which to mock class methods.
- * @discussion The mock object will handle all class methods of <code>classToMock</code>. Methods
- * return 0 by default.<br />
- * Use <code>given</code> to stub different return values or behaviors.<br />
- * Use <code>givenVoid</code> to stub behaviors of void methods.
- *
- * <b>Name Clash</b><br />
- * In the event of a name clash, <code>#define MKT_DISABLE_SHORT_SYNTAX</code> and use the synonym
- * MKTMockClass instead.
- */
-static inline id mockClass(Class classToMock)
-{
-    return MKTMockClass(classToMock);
-}
-#endif
-
-
-FOUNDATION_EXPORT id MKTMockProtocol(Protocol *protocolToMock);
-
-#ifndef MKT_DISABLE_SHORT_SYNTAX
-/*!
- * @abstract Creates mock object of given protocol.
- * @param protocolToMock The protocol to mock.
- * @discussion The mock object will handle all methods of <code>protocolToMock</code>. Methods
- * return 0 by default.<br />
- * Use <code>given</code> to stub different return values or behaviors.<br />
- * Use <code>givenVoid</code> to stub behaviors of void methods.
- *
- * <b>Name Clash</b><br />
- * In the event of a name clash, <code>#define MKT_DISABLE_SHORT_SYNTAX</code> and use the synonym
- * MKTMockProtocol instead.
- */
-static inline id mockProtocol(Protocol *protocolToMock)
-{
-    return MKTMockProtocol(protocolToMock);
-}
-#endif
-
-
-FOUNDATION_EXPORT id MKTMockProtocolWithoutOptionals(Protocol *protocolToMock);
-
-#ifndef MKT_DISABLE_SHORT_SYNTAX
-/*!
- * @abstract Creates mock object of given protocol, but without optional methods.
- * @param protocolToMock The protocol to mock.
- * @discussion The mock object will handle only required methods of <code>protocolToMock</code>. It
- * will <b>not</b> respond to the protocol's optional methods. Methods return 0 by default.<br />
- * Use <code>given</code> to stub different return values or behaviors.<br />
- * Use <code>givenVoid</code> to stub behaviors of void methods.
- *
- * <b>Name Clash</b><br />
- * In the event of a name clash, <code>#define MKT_DISABLE_SHORT_SYNTAX</code> and use the synonym
- * MKTMockProtocolWithoutOptionals instead.
-*/
-static inline id mockProtocolWithoutOptionals(Protocol *protocolToMock)
-{
-    return MKTMockProtocolWithoutOptionals(protocolToMock);
-}
-#endif
-
-
-FOUNDATION_EXPORT id MKTMockObjectAndProtocol(Class classToMock, Protocol *protocolToMock);
-
-#ifndef MKT_DISABLE_SHORT_SYNTAX
-/*!
- * @abstract Creates mock object of given class that also implements given protocol.
- * @param classToMock The class to mock.
- * @param protocolToMock The protocol to mock.
- * @discussion The mock object will handle all instance methods of <code>classToMock</code>, along
- * with all methods of <code>protocolToMock</code>. Methods return 0 by default.<br />
- * Use <code>given</code> to stub different return values or behaviors.<br />
- * Use <code>givenVoid</code> to stub behaviors of void methods.
- *
- * <b>Name Clash</b><br />
- * In the event of a name clash, <code>#define MKT_DISABLE_SHORT_SYNTAX</code> and use the synonym
- * MKTMockObjectAndProtocol instead.
- */
-static inline id mockObjectAndProtocol(Class classToMock, Protocol *protocolToMock)
-{
-    return MKTMockObjectAndProtocol(classToMock, protocolToMock);
-}
-#endif
-
-
-FOUNDATION_EXPORT MKTOngoingStubbing *MKTGivenWithLocation(id testCase, const char *fileName, int lineNumber, ...);
-#define MKTGiven(methodCall) MKTGivenWithLocation(self, __FILE__, __LINE__, methodCall)
-
-#ifndef MKT_DISABLE_SHORT_SYNTAX
-/*!
- * @abstract Stubs a method call.
- * @discussion Creates an MKTOngoingStubbing used for any matching method calls. Call
- * MKTOngoingStubbing methods to define the stub's return value or behavior.
- *
- * Method arguments are matched with specified OCHamcrest matchers. Any argument that is not a
- * matcher is implicitly wrapped in <code>equalTo</code> to match for equality.
- *
- * Example:
- * <pre>[given([mockObject transform:\@"FOO"]) willReturn:\@"BAR"];</pre>
- *
- * <b>Name Clash</b><br />
- * In the event of a name clash, <code>#define MKT_DISABLE_SHORT_SYNTAX</code> and use the synonym
- * MKTGiven instead.
- */
-#define given(methodCall) MKTGiven(methodCall)
-#endif
-
-
-FOUNDATION_EXPORT MKTOngoingStubbing *MKTGivenVoidWithLocation(id testCase, const char *fileName, int lineNumber, void(^methodCallWrapper)());
-#define MKTGivenVoid(methodCall) MKTGivenVoidWithLocation(self, __FILE__, __LINE__, ^{ methodCall; })
-
-#ifndef MKT_DISABLE_SHORT_SYNTAX
-/*!
- * @abstract Stubs a call to a <code>void</code> method.
- * @discussion Creates an MKTOngoingStubbing used for any matching method calls. Call
- * MKTOngoingStubbing methods to define the stub's behavior.
- *
- * Method arguments are matched with specified OCHamcrest matchers. Any argument that is not a
- * matcher is implicitly wrapped in <code>equalTo</code> to match for equality.
- *
- * Example:
- * <pre>[givenVoid([mockObject methodReturningVoid]) willDo:^{ magic(); }];</pre>
- *
- * <b>Name Clash</b><br />
- * In the event of a name clash, <code>#define MKT_DISABLE_SHORT_SYNTAX</code> and use the synonym
- * MKTGiven instead.
- */
-#define givenVoid(methodCall) MKTGivenVoid(methodCall)
-#endif
-
-
-#define MKTStubProperty(instance, property, value)                          \
-    do {                                                                    \
-        [MKTGiven([instance property]) willReturn:value];                   \
-        [MKTGiven([instance valueForKey:@#property]) willReturn:value];     \
-        [MKTGiven([instance valueForKeyPath:@#property]) willReturn:value]; \
-    } while(0)
-
-#ifndef MKT_DISABLE_SHORT_SYNTAX
-/*!
- * @abstract Stubs a property and its related KVO methods to return a given value.
- * @discussion
- * <b>Name Clash</b><br />
- * In the event of a name clash, <code>#define MKT_DISABLE_SHORT_SYNTAX</code> and use the synonym
- * MKTStubProperty instead.
- */
-#define stubProperty(instance, property, value) MKTStubProperty(instance, property, value)
-#endif
-
-
-FOUNDATION_EXPORT id MKTVerifyWithLocation(id mock, id testCase, const char *fileName, int lineNumber);
-#define MKTVerify(mock) MKTVerifyWithLocation(mock, self, __FILE__, __LINE__)
-
-#ifndef MKT_DISABLE_SHORT_SYNTAX
-#undef verify
-/*!
- * @abstract Verifies certain behavior happened once.
- * @discussion Equivalent to <code>verifyCount(mock, times(1))</code>.
- *
- * Method arguments are matched with specified OCHamcrest matchers. Any argument that is
- * not a matcher is implicitly wrapped in <code>equalTo</code> to match for equality.
- *
- * Examples:
- * <pre>[verify(mockObject) someMethod:startsWith(\@"foo")];</pre>
- * <pre>[verify(mockObject) someMethod:\@"bar"];</pre>
- *
- * <b>Name Clash</b><br />
- * In the event of a name clash, <code>#define MKT_DISABLE_SHORT_SYNTAX</code> and use the synonym
- * MKTVerify instead.
- */
-#define verify(mock) MKTVerify(mock)
-#endif
-
-
-FOUNDATION_EXPORT id MKTVerifyCountWithLocation(id mock, id <MKTVerificationMode> mode, id testCase, const char *fileName, int lineNumber);
-#define MKTVerifyCount(mock, mode) MKTVerifyCountWithLocation(mock, mode, self, __FILE__, __LINE__)
-
-#ifndef MKT_DISABLE_SHORT_SYNTAX
-/*!
- * @abstract Verifies certain behavior happened a given number of times.
- * @discussion Method arguments are matched with specified OCHamcrest matchers. Any argument that is
- * not a matcher is implicitly wrapped in <code>equalTo</code> to match for equality.
- * Examples:
- * <pre>[verifyCount(mockObject, times(5)) someMethod:\@"was called five times"];</pre>
- * <pre>[verifyCount(mockObject, never()) someMethod:\@"was never called"];</pre>
- * verifyCount checks that a method was invoked the given number of times, with arguments that
- * match given OCHamcrest matchers. If an argument is not a matcher, it is implicitly wrapped in an
- * <code>equalTo</code> matcher to check for equality.
- *
- * <b>Name Clash</b><br />
- * In the event of a name clash, <code>#define MKT_DISABLE_SHORT_SYNTAX</code> and use the synonym
- * MKTVerifyCount instead.
- */
-#define verifyCount(mock, mode) MKTVerifyCount(mock, mode)
-#endif
-
-
-FOUNDATION_EXPORT id <MKTVerificationMode> MKTTimes(NSUInteger wantedNumberOfInvocations);
-
-#ifndef MKT_DISABLE_SHORT_SYNTAX
-/*!
- * @abstract Creates <code>verifyCount</code> mode verifying an exact number of invocations.
- * @discussion Example:
- * <pre>[verifyCount(mockObject, times(2)) someMethod:\@"some arg"];</pre>
- *
- * <b>Name Clash</b><br />
- * In the event of a name clash, <code>#define MKT_DISABLE_SHORT_SYNTAX</code> and use the synonym
- * MKTTimes instead.
- */
-static inline id <MKTVerificationMode> times(NSUInteger wantedNumberOfInvocations)
-{
-    return MKTTimes(wantedNumberOfInvocations);
-}
-#endif
-
-
-FOUNDATION_EXPORT id <MKTVerificationMode> MKTNever(void);
-
-#ifndef MKT_DISABLE_SHORT_SYNTAX
-/*!
- * @abstract Creates <code>verifyCount</code> mode verifying that an interaction did not happen.
- * @discussion Example:
- * <pre>[verifyCount(mockObject, never()) someMethod:\@"some arg"];</pre>
- *
- * <b>Name Clash</b><br />
- * In the event of a name clash, <code>#define MKT_DISABLE_SHORT_SYNTAX</code> and use the synonym
- * MKTNever instead.
- */
-static inline id <MKTVerificationMode> never(void)
-{
-    return MKTNever();
-}
-#endif
-
-
-FOUNDATION_EXPORT id <MKTVerificationMode> MKTAtLeast(NSUInteger minNumberOfInvocations);
-
-#ifndef MKT_DISABLE_SHORT_SYNTAX
-/*!
- * @abstract Creates <code>verifyCount</code> mode verifying that an interaction happened at least
- * the given number of times.
- * @discussion
- * Example:
- * <pre>[verifyCount(mockObject, atLeast(2)) someMethod:\@"some arg"];</pre>
- *
- * <b>Name Clash</b><br />
- * In the event of a name clash, <code>#define MKT_DISABLE_SHORT_SYNTAX</code> and use the synonym
- * MKTAtLeast instead.
- */
-static inline id <MKTVerificationMode> atLeast(NSUInteger minNumberOfInvocations)
-{
-    return MKTAtLeast(minNumberOfInvocations);
-}
-#endif
-
-
-FOUNDATION_EXPORT id <MKTVerificationMode> MKTAtLeastOnce(void);
-
-#ifndef MKT_DISABLE_SHORT_SYNTAX
-/*!
- * @abstract Creates <code>verifyCount</code> mode verifying that an interaction happened at least
- * once.
- * @discussion Same as <code>atLeast(1)</code>.
- *
- * Example:
- * <pre>[verifyCount(mockObject, atLeastOnce()) someMethod:\@"some arg"];</pre>
- *
- * <b>Name Clash</b><br />
- * In the event of a name clash, <code>#define MKT_DISABLE_SHORT_SYNTAX</code> and use the synonym
- * MKTAtLeastOnce instead.
- */
-static inline id <MKTVerificationMode> atLeastOnce(void)
-{
-    return MKTAtLeastOnce();
-}
-#endif
-
-
-FOUNDATION_EXPORT id <MKTVerificationMode> MKTAtMost(NSUInteger maxNumberOfInvocations);
-
-#ifndef MKT_DISABLE_SHORT_SYNTAX
-/*!
- * @abstract Creates <code>verifyCount</code> mode verifying that an interaction happened at most
- * the given number of times.
- * @discussion
- * Example:
- * <pre>[verifyCount(mockObject, atMost(2)) someMethod:\@"some arg"];</pre>
- *
- * <b>Name Clash</b><br />
- * In the event of a name clash, <code>#define MKT_DISABLE_SHORT_SYNTAX</code> and use the synonym
- * MKTAtLeast instead.
- */
-static inline id <MKTVerificationMode> atMost(NSUInteger maxNumberOfInvocations)
-{
-    return MKTAtMost(maxNumberOfInvocations);
-}
-#endif
-
-
-FOUNDATION_EXPORT void MKTStopMockingWithLocation(id mock, id testCase, const char *fileName, int lineNumber);
-#define MKTStopMocking(mock) MKTStopMockingWithLocation(mock, self, __FILE__, __LINE__)
-
-#ifndef MKT_DISABLE_SHORT_SYNTAX
-/*!
- * @abstract Stops mocking and releases arguments.
- * @discussion Mock objects normally retain all message arguments. This is not a problem for most
- * tests, but can sometimes cause retain cycles. In such cases, call stopMocking to tell the mock
- * to release its arguments, and to stop accepting messages. See StopMockingTests.m for an example.
- *
- * <b>Name Clash</b><br />
- * In the event of a name clash, <code>#define MKT_DISABLE_SHORT_SYNTAX</code> and use the synonym
- * MKTStopMocking instead.
- */
-#define stopMocking(mock) MKTStopMocking(mock)
-#endif
diff --git a/submodules/HockeySDK-iOS/Support/HockeySDKTests/Vendor/OCMockitoIOS.framework/Versions/A/OCMockitoIOS b/submodules/HockeySDK-iOS/Support/HockeySDKTests/Vendor/OCMockitoIOS.framework/Versions/A/OCMockitoIOS
deleted file mode 100644
index 3b475f19d9..0000000000
Binary files a/submodules/HockeySDK-iOS/Support/HockeySDKTests/Vendor/OCMockitoIOS.framework/Versions/A/OCMockitoIOS and /dev/null differ
diff --git a/submodules/HockeySDK-iOS/Support/HockeySDKTests/Vendor/OCMockitoIOS.framework/Versions/A/Resources/Info.plist b/submodules/HockeySDK-iOS/Support/HockeySDKTests/Vendor/OCMockitoIOS.framework/Versions/A/Resources/Info.plist
deleted file mode 100644
index 2790f50085..0000000000
--- a/submodules/HockeySDK-iOS/Support/HockeySDKTests/Vendor/OCMockitoIOS.framework/Versions/A/Resources/Info.plist
+++ /dev/null
@@ -1,46 +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>BuildMachineOSBuild</key>
-	<string>15D21</string>
-	<key>CFBundleDevelopmentRegion</key>
-	<string>English</string>
-	<key>CFBundleExecutable</key>
-	<string>OCMockitoIOS</string>
-	<key>CFBundleIdentifier</key>
-	<string>org.mockito.OCMockitoIOS</string>
-	<key>CFBundleInfoDictionaryVersion</key>
-	<string>6.0</string>
-	<key>CFBundleName</key>
-	<string>OCMockitoIOS</string>
-	<key>CFBundlePackageType</key>
-	<string>FMWK</string>
-	<key>CFBundleShortVersionString</key>
-	<string>3.0.1</string>
-	<key>CFBundleSignature</key>
-	<string>????</string>
-	<key>CFBundleSupportedPlatforms</key>
-	<array>
-		<string>MacOSX</string>
-	</array>
-	<key>CFBundleVersion</key>
-	<string>3.0.1</string>
-	<key>DTCompiler</key>
-	<string>com.apple.compilers.llvm.clang.1_0</string>
-	<key>DTPlatformBuild</key>
-	<string>7C1002</string>
-	<key>DTPlatformVersion</key>
-	<string>GM</string>
-	<key>DTSDKBuild</key>
-	<string>15C43</string>
-	<key>DTSDKName</key>
-	<string>macosx10.11</string>
-	<key>DTXcode</key>
-	<string>0721</string>
-	<key>DTXcodeBuild</key>
-	<string>7C1002</string>
-	<key>NSHumanReadableCopyright</key>
-	<string>Copyright © 2015 Jonathan M. Reid</string>
-</dict>
-</plist>
diff --git a/submodules/HockeySDK-iOS/Support/HockeySDKTests/Vendor/OCMockitoIOS.framework/Versions/Current b/submodules/HockeySDK-iOS/Support/HockeySDKTests/Vendor/OCMockitoIOS.framework/Versions/Current
deleted file mode 120000
index 8c7e5a667f..0000000000
--- a/submodules/HockeySDK-iOS/Support/HockeySDKTests/Vendor/OCMockitoIOS.framework/Versions/Current
+++ /dev/null
@@ -1 +0,0 @@
-A
\ No newline at end of file
diff --git a/submodules/HockeySDK-iOS/Support/HockeySDKTests/en.lproj/InfoPlist.strings b/submodules/HockeySDK-iOS/Support/HockeySDKTests/en.lproj/InfoPlist.strings
deleted file mode 100644
index 477b28ff8f..0000000000
--- a/submodules/HockeySDK-iOS/Support/HockeySDKTests/en.lproj/InfoPlist.strings
+++ /dev/null
@@ -1,2 +0,0 @@
-/* Localized versions of Info.plist keys */
-
diff --git a/submodules/HockeySDK-iOS/Support/allfeatures.xcconfig b/submodules/HockeySDK-iOS/Support/allfeatures.xcconfig
deleted file mode 100644
index 4daba64075..0000000000
--- a/submodules/HockeySDK-iOS/Support/allfeatures.xcconfig
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "HockeySDKBase.xcconfig"
-
-// We don't have to specify usage of the features for the "AllFeatures"-config as the default in the feauture-config-header is "1".
diff --git a/submodules/HockeySDK-iOS/Support/crashonly.xcconfig b/submodules/HockeySDK-iOS/Support/crashonly.xcconfig
deleted file mode 100644
index 3eb3163042..0000000000
--- a/submodules/HockeySDK-iOS/Support/crashonly.xcconfig
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "HockeySDKBase.xcconfig"
-
-GCC_PREPROCESSOR_DEFINITIONS = $(inherited) HOCKEYSDK_CONFIGURATION_$(CONFIGURATION) HOCKEYSDK_FEATURE_CRASH_REPORTER=1 HOCKEYSDK_FEATURE_FEEDBACK=0 HOCKEYSDK_FEATURE_STORE_UPDATES=0 HOCKEYSDK_FEATURE_AUTHENTICATOR=0 HOCKEYSDK_FEATURE_UPDATES=0 HOCKEYSDK_FEATURE_METRICS=0 BITHOCKEY_VERSION="@\""$(VERSION_STRING)"\"" BITHOCKEY_BUILD="@\""$(BUILD_NUMBER)"\"" BITHOCKEY_C_VERSION="\""$(VERSION_STRING)"\"" BITHOCKEY_C_BUILD="\""$(BUILD_NUMBER)"\""
diff --git a/submodules/HockeySDK-iOS/Support/crashonlyextensions.xcconfig b/submodules/HockeySDK-iOS/Support/crashonlyextensions.xcconfig
deleted file mode 100644
index 3eb3163042..0000000000
--- a/submodules/HockeySDK-iOS/Support/crashonlyextensions.xcconfig
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "HockeySDKBase.xcconfig"
-
-GCC_PREPROCESSOR_DEFINITIONS = $(inherited) HOCKEYSDK_CONFIGURATION_$(CONFIGURATION) HOCKEYSDK_FEATURE_CRASH_REPORTER=1 HOCKEYSDK_FEATURE_FEEDBACK=0 HOCKEYSDK_FEATURE_STORE_UPDATES=0 HOCKEYSDK_FEATURE_AUTHENTICATOR=0 HOCKEYSDK_FEATURE_UPDATES=0 HOCKEYSDK_FEATURE_METRICS=0 BITHOCKEY_VERSION="@\""$(VERSION_STRING)"\"" BITHOCKEY_BUILD="@\""$(BUILD_NUMBER)"\"" BITHOCKEY_C_VERSION="\""$(VERSION_STRING)"\"" BITHOCKEY_C_BUILD="\""$(BUILD_NUMBER)"\""
diff --git a/submodules/HockeySDK-iOS/Support/default.xcconfig b/submodules/HockeySDK-iOS/Support/default.xcconfig
deleted file mode 100644
index 39e2a759a6..0000000000
--- a/submodules/HockeySDK-iOS/Support/default.xcconfig
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "HockeySDKBase.xcconfig"
-
-GCC_PREPROCESSOR_DEFINITIONS = $(inherited) HOCKEYSDK_CONFIGURATION_$(CONFIGURATION) HOCKEYSDK_FEATURE_CRASH_REPORTER=1 HOCKEYSDK_FEATURE_FEEDBACK=0 HOCKEYSDK_FEATURE_STORE_UPDATES=1 HOCKEYSDK_FEATURE_AUTHENTICATOR=1 HOCKEYSDK_FEATURE_UPDATES=1 HOCKEYSDK_FEATURE_METRICS=1 BITHOCKEY_VERSION="@\""$(VERSION_STRING)"\"" BITHOCKEY_BUILD="@\""$(BUILD_NUMBER)"\"" BITHOCKEY_C_VERSION="\""$(VERSION_STRING)"\"" BITHOCKEY_C_BUILD="\""$(BUILD_NUMBER)"\""
\ No newline at end of file
diff --git a/submodules/HockeySDK-iOS/Support/feedbackonly.xcconfig b/submodules/HockeySDK-iOS/Support/feedbackonly.xcconfig
deleted file mode 100644
index 8364d323a3..0000000000
--- a/submodules/HockeySDK-iOS/Support/feedbackonly.xcconfig
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "HockeySDKBase.xcconfig"
-
-GCC_PREPROCESSOR_DEFINITIONS = $(inherited) HOCKEYSDK_CONFIGURATION_$(CONFIGURATION) HOCKEYSDK_FEATURE_CRASH_REPORTER=0 HOCKEYSDK_FEATURE_FEEDBACK=1 HOCKEYSDK_FEATURE_STORE_UPDATES=0 HOCKEYSDK_FEATURE_AUTHENTICATOR=0 HOCKEYSDK_FEATURE_UPDATES=0 HOCKEYSDK_FEATURE_METRICS=0 BITHOCKEY_VERSION="@\""$(VERSION_STRING)"\"" BITHOCKEY_BUILD="@\""$(BUILD_NUMBER)"\"" BITHOCKEY_C_VERSION="\""$(VERSION_STRING)"\"" BITHOCKEY_C_BUILD="\""$(BUILD_NUMBER)"\""
diff --git a/submodules/HockeySDK-iOS/Support/module_allfeatures.modulemap b/submodules/HockeySDK-iOS/Support/module_allfeatures.modulemap
deleted file mode 100644
index 71d4449ee6..0000000000
--- a/submodules/HockeySDK-iOS/Support/module_allfeatures.modulemap
+++ /dev/null
@@ -1,20 +0,0 @@
-framework module HockeySDK {
-  umbrella header "HockeySDK.h"
-  
-  export *
-  module * { export * }
-  
-  link framework "CoreTelephony"
-  link framework "CoreText"
-  link framework "CoreGraphics"
-  link framework "Foundation"
-  link framework "MobileCoreServices"
-  link framework "Photos"
-  link framework "QuartzCore"
-  link framework "QuickLook"
-  link framework "Security"
-  link framework "SystemConfiguration"
-  link framework "UIKit"
-  link "c++"
-  link "z"
-}
diff --git a/submodules/HockeySDK-iOS/Support/module_crashonly.modulemap b/submodules/HockeySDK-iOS/Support/module_crashonly.modulemap
deleted file mode 100644
index 99234b42f0..0000000000
--- a/submodules/HockeySDK-iOS/Support/module_crashonly.modulemap
+++ /dev/null
@@ -1,13 +0,0 @@
-framework module HockeySDK {
-  umbrella header "HockeySDK.h"
-  
-  export *
-  module * { export * }
-  
-  link framework "Foundation"
-  link framework "Security"
-  link framework "SystemConfiguration"
-  link framework "UIKit"
-  link "c++"
-  link "z"
-}
diff --git a/submodules/HockeySDK-iOS/Support/module_default.modulemap b/submodules/HockeySDK-iOS/Support/module_default.modulemap
deleted file mode 100644
index 35b5a52e4c..0000000000
--- a/submodules/HockeySDK-iOS/Support/module_default.modulemap
+++ /dev/null
@@ -1,18 +0,0 @@
-framework module HockeySDK {
-  umbrella header "HockeySDK.h"
-  
-  export *
-  module * { export * }
-  
-  link framework "CoreTelephony"
-  link framework "CoreGraphics"
-  link framework "Foundation"
-  link framework "MobileCoreServices"
-  link framework "QuartzCore"
-  link framework "QuickLook"
-  link framework "Security"
-  link framework "SystemConfiguration"
-  link framework "UIKit"
-  link "c++"
-  link "z"
-}
\ No newline at end of file
diff --git a/submodules/HockeySDK-iOS/Support/module_feedbackonly.modulemap b/submodules/HockeySDK-iOS/Support/module_feedbackonly.modulemap
deleted file mode 100644
index ccf2860007..0000000000
--- a/submodules/HockeySDK-iOS/Support/module_feedbackonly.modulemap
+++ /dev/null
@@ -1,17 +0,0 @@
-framework module HockeySDK {
-  umbrella header "HockeySDK.h"
-  
-  export *
-  module * { export * }
-  
-  link framework "CoreTelephony"
-  link framework "CoreText"
-  link framework "CoreGraphics"
-  link framework "Foundation"
-  link framework "MobileCoreServices"
-  link framework "Photos"
-  link framework "QuartzCore"
-  link framework "QuickLook"
-  link framework "Security"
-  link framework "UIKit"
-}
diff --git a/submodules/HockeySDK-iOS/Support/module_telegram.modulemap b/submodules/HockeySDK-iOS/Support/module_telegram.modulemap
deleted file mode 100644
index 99234b42f0..0000000000
--- a/submodules/HockeySDK-iOS/Support/module_telegram.modulemap
+++ /dev/null
@@ -1,13 +0,0 @@
-framework module HockeySDK {
-  umbrella header "HockeySDK.h"
-  
-  export *
-  module * { export * }
-  
-  link framework "Foundation"
-  link framework "Security"
-  link framework "SystemConfiguration"
-  link framework "UIKit"
-  link "c++"
-  link "z"
-}
diff --git a/submodules/HockeySDK-iOS/Support/telegram.xcconfig b/submodules/HockeySDK-iOS/Support/telegram.xcconfig
deleted file mode 100644
index 1fdd6f917b..0000000000
--- a/submodules/HockeySDK-iOS/Support/telegram.xcconfig
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "HockeySDKBase.xcconfig"
-
-GCC_PREPROCESSOR_DEFINITIONS = $(inherited) HOCKEYSDK_CONFIGURATION_$(CONFIGURATION) HOCKEYSDK_FEATURE_CRASH_REPORTER=1 HOCKEYSDK_FEATURE_FEEDBACK=0 HOCKEYSDK_FEATURE_STORE_UPDATES=0 HOCKEYSDK_FEATURE_AUTHENTICATOR=1 HOCKEYSDK_FEATURE_UPDATES=1 HOCKEYSDK_FEATURE_METRICS=0 BITHOCKEY_VERSION="@\""$(VERSION_STRING)"\"" BITHOCKEY_BUILD="@\""$(BUILD_NUMBER)"\"" BITHOCKEY_C_VERSION="\""$(VERSION_STRING)"\"" BITHOCKEY_C_BUILD="\""$(BUILD_NUMBER)"\""
diff --git a/submodules/HockeySDK-iOS/Vendor/CrashReporter.framework/CrashReporter b/submodules/HockeySDK-iOS/Vendor/CrashReporter.framework/CrashReporter
deleted file mode 120000
index 92b400e68b..0000000000
--- a/submodules/HockeySDK-iOS/Vendor/CrashReporter.framework/CrashReporter
+++ /dev/null
@@ -1 +0,0 @@
-Versions/Current/CrashReporter
\ No newline at end of file
diff --git a/submodules/HockeySDK-iOS/Vendor/CrashReporter.framework/Headers b/submodules/HockeySDK-iOS/Vendor/CrashReporter.framework/Headers
deleted file mode 120000
index a177d2a6b9..0000000000
--- a/submodules/HockeySDK-iOS/Vendor/CrashReporter.framework/Headers
+++ /dev/null
@@ -1 +0,0 @@
-Versions/Current/Headers
\ No newline at end of file
diff --git a/submodules/HockeySDK-iOS/Vendor/CrashReporter.framework/Resources b/submodules/HockeySDK-iOS/Vendor/CrashReporter.framework/Resources
deleted file mode 120000
index 953ee36f3b..0000000000
--- a/submodules/HockeySDK-iOS/Vendor/CrashReporter.framework/Resources
+++ /dev/null
@@ -1 +0,0 @@
-Versions/Current/Resources
\ No newline at end of file
diff --git a/submodules/HockeySDK-iOS/Vendor/CrashReporter.framework/Versions/A/CrashReporter b/submodules/HockeySDK-iOS/Vendor/CrashReporter.framework/Versions/A/CrashReporter
deleted file mode 100644
index f3f5c751be..0000000000
Binary files a/submodules/HockeySDK-iOS/Vendor/CrashReporter.framework/Versions/A/CrashReporter and /dev/null differ
diff --git a/submodules/HockeySDK-iOS/Vendor/CrashReporter.framework/Versions/A/Headers/CrashReporter.h b/submodules/HockeySDK-iOS/Vendor/CrashReporter.framework/Versions/A/Headers/CrashReporter.h
deleted file mode 100644
index c654319112..0000000000
--- a/submodules/HockeySDK-iOS/Vendor/CrashReporter.framework/Versions/A/Headers/CrashReporter.h
+++ /dev/null
@@ -1,363 +0,0 @@
-/*
- * Author: Landon Fuller <landonf@plausiblelabs.com>
- *
- * Copyright (c) 2008-2009 Plausible Labs Cooperative, Inc.
- * All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person
- * obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without
- * restriction, including without limitation the rights to use,
- * copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following
- * conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
- * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#import <Foundation/Foundation.h>
-
-#ifdef __APPLE__
-#import <AvailabilityMacros.h>
-#endif
-
-// This must be included before any other PLCrashReporter includes, as
-// it redefines symbol names
-#import "PLCrashNamespace.h"
-
-#import "PLCrashReporter.h"
-#import "PLCrashReport.h"
-#import "PLCrashReportTextFormatter.h"
-
-/**
- * @defgroup functions Crash Reporter Functions Reference
- */
-
-/**
- * @defgroup types Crash Reporter Data Types Reference
- */
-
-/**
- * @defgroup constants Crash Reporter Constants Reference
- */
-
-/**
- * @internal
- * @defgroup plcrash_internal Crash Reporter Internal Documentation
- */
-
-/**
- * @defgroup enums Enumerations
- * @ingroup constants
- */
-
-/**
- * @defgroup globals Global Variables
- * @ingroup constants
- */
-
-/**
- * @defgroup exceptions Exceptions
- * @ingroup constants
- */
-
-/* Exceptions */
-extern NSString *PLCrashReporterException;
-
-/* Error Domain and Codes */
-extern NSString *PLCrashReporterErrorDomain;
-
-/**
- * NSError codes in the Plausible Crash Reporter error domain.
- * @ingroup enums
- */
-typedef enum {
-    /** An unknown error has occured. If this
-     * code is received, it is a bug, and should be reported. */
-    PLCrashReporterErrorUnknown = 0,
-    
-    /** An Mach or POSIX operating system error has occured. The underlying NSError cause may be fetched from the userInfo
-     * dictionary using the NSUnderlyingErrorKey key. */
-    PLCrashReporterErrorOperatingSystem = 1,
-
-    /** The crash report log file is corrupt or invalid */
-    PLCrashReporterErrorCrashReportInvalid = 2,
-
-    /** An attempt to use a resource which was in use at the time in a manner which would have conflicted with the request. */
-    PLCrashReporterErrorResourceBusy = 3
-} PLCrashReporterError;
-
-
-/* Library Imports */
-#import "PLCrashReporter.h"
-#import "PLCrashReport.h"
-#import "PLCrashReportTextFormatter.h"
-
-/**
- * @mainpage Plausible Crash Reporter
- *
- * @section intro_sec Introduction
- *
- * Plausile CrashReporter implements in-process crash reporting on the iPhone and Mac OS X.
- *
- * The following features are supported:
- *
- * - Implemented as an in-process signal handler.
- * - Does not interfer with debugging in gdb..
- * - Handles both uncaught Objective-C exceptions and fatal signals (SIGSEGV, SIGBUS, etc).
- * - Full thread state for all active threads (backtraces, register dumps) is provided.
- *
- * If your application crashes, a crash report will be written. When the application is next run, you may check for a
- * pending crash report, and submit the report to your own HTTP server, send an e-mail, or even introspect the
- * report locally.
- *
- * @section intro_encoding Crash Report Format
- *
- * Crash logs are encoded using <a href="http://code.google.com/p/protobuf/">google protobuf</a>, and may be decoded
- * using the provided PLCrashReport API. Additionally, the include plcrashutil handles conversion of binary crash reports to the 
- * symbolicate-compatible iPhone text format.
- *
- * @section doc_sections Documentation Sections
- * - @subpage example_usage_iphone
- * - @subpage error_handling
- * - @subpage async_safety
- */
-
-/**
- * @page example_usage_iphone Example iPhone Usage
- *
- * @code
- * //
- * // Called to handle a pending crash report.
- * //
- * - (void) handleCrashReport {
- *     PLCrashReporter *crashReporter = [PLCrashReporter sharedReporter];
- *     NSData *crashData;
- *     NSError *error;
- *     
- *     // Try loading the crash report
- *     crashData = [crashReporter loadPendingCrashReportDataAndReturnError: &error];
- *     if (crashData == nil) {
- *         NSLog(@"Could not load crash report: %@", error);
- *         goto finish;
- *     }
- *     
- *     // We could send the report from here, but we'll just print out
- *     // some debugging info instead
- *     PLCrashReport *report = [[[PLCrashReport alloc] initWithData: crashData error: &error] autorelease];
- *     if (report == nil) {
- *         NSLog(@"Could not parse crash report");
- *         goto finish;
- *     }
- *     
- *     NSLog(@"Crashed on %@", report.systemInfo.timestamp);
- *     NSLog(@"Crashed with signal %@ (code %@, address=0x%" PRIx64 ")", report.signalInfo.name,
- *           report.signalInfo.code, report.signalInfo.address);
- *     
- *     // Purge the report
- * finish:
- *     [crashReporter purgePendingCrashReport];
- *     return;
- * }
- * 
- * // from UIApplicationDelegate protocol
- * - (void) applicationDidFinishLaunching: (UIApplication *) application {
- *     PLCrashReporter *crashReporter = [PLCrashReporter sharedReporter];
- *     NSError *error;
- *     
- *     // Check if we previously crashed
- *     if ([crashReporter hasPendingCrashReport])
- *         [self handleCrashReport];
-    
- *     // Enable the Crash Reporter
- *     if (![crashReporter enableCrashReporterAndReturnError: &error])
- *         NSLog(@"Warning: Could not enable crash reporter: %@", error);
- *         
- * }
- * @endcode
- * 
- */
-
-/**
- * @page error_handling Error Handling Programming Guide
- *
- * Where a method may return an error, Plausible Crash Reporter provides access to the underlying
- * cause via an optional NSError argument.
- *
- * All returned errors will be a member of one of the below defined domains, however, new domains and
- * error codes may be added at any time. If you do not wish to report on the error cause, many methods
- * support a simple form that requires no NSError argument.
- *
- * @section error_domains Error Domains, Codes, and User Info
- *
- * @subsection crashreporter_errors Crash Reporter Errors
- *
- * Any errors in Plausible Crash Reporter use the #PLCrashReporterErrorDomain error domain, and and one
- * of the error codes defined in #PLCrashReporterError.
- */
-
-/**
- * @page async_safety Async-Safe Programming Guide
- *
- * Plausible CrashReporter provides support for executing an application specified function in the context of the
- * crash reporter's signal handler, after the crash report has been written to disk. This was a regularly requested
- * feature, and provides the ability to implement application finalization in the event of a crash. However, writing
- * code intended for execution inside of a signal handler is exceptionally difficult, and is not recommended.
- *
- * @section program_flow Program Flow and Signal Handlers
- *
- * When the signal handler is called the normal flow of the program is interrupted, and your program is an unknown
- * state. Locks may be held, the heap may be corrupt (or in the process of being updated), and your signal
- * handler may invoke a function that was being executed at the time of the signal. This may result in deadlocks,
- * data corruption, and program termination.
- *
- * @section functions Async-Safe Functions
- *
- * A subset of functions are defined to be async-safe by the OS, and are safely callable from within a signal handler. If
- * you do implement a custom post-crash handler, it must be async-safe. A table of POSIX-defined async-safe functions
- * and additional information is available from the
- * <a href="https://www.securecoding.cert.org/confluence/display/seccode/SIG30-C.+Call+only+asynchronous-safe+functions+within+signal+handlers">CERT programming guide - SIG30-C</a>
- *
- * Most notably, the Objective-C runtime itself is not async-safe, and Objective-C may not be used within a signal
- * handler.
- *
- * @sa PLCrashReporter::setCrashCallbacks:
- */
-
-/**
- * @page mach_exceptions Mach Exceptions on Mac OS X and iOS
- *
- * PLCrashReporter includes support for monitoring crashes via an in-process Mach exception handler. There are a small
- * number of crash cases that will not be caught with via a POSIX signal handler, but can be caught via a Mach
- * exception handler:
- *
- * - Stack overflow. sigaltstack() is broken in later iOS releases, and even if functional, must be configured
- *   on a per-thread basis.
- * - Internal Apple assertions that call libSystem's __assert. These include compiler-checked constraints
- *   for built-in functions, such as strcpy_chk(). The __abort() implementation actually disables the SIGABRT
- *   signal handler (resetting it to SIG_DFL) prior to to issueing a SIGABRT, bypassing signal-based crash
- *   reporters entirely.
- *
- * Unfortunately, the latter issue (__assert) can not be handled on iOS; trapping abort requires that
- * a Mach exception handler operate out-of-process, which is impossible on iOS. On Mac OS X, this will
- * only be handled once we've implemented fully out-of-process crash excution.
- *
- * On Mac OS X, the Mach exception implementation is fully supported using entirely public API. On iOS,
- * the APIs required are not fully public -- more details on the implications of this for exception handling on
- * iOS may be found in @ref mach_exceptions_ios below. It is worth noting that even where the Mach exception APIs
- * are fully supported, kernel-internal constants, as well
- * as architecture-specific trap information, may be required to fully interpret a Mach exception's root cause.
- *
- * For example, the EXC_SOFTWARE exception is dispatched for four different failure types, using the exception
- * code to differentiate failure types:
- *   - Non-existent system call invoked (SIGSYS)
- *   - Write on a pipe with no reader (SIGPIPE)
- *   - Abort program (SIGABRT -- unused)
- *   - Kill program (SIGKILL)
- *
- * Of those four types, only the constant required to interpret the SIGKILL behavior (EXC_SOFT_SIGNAL) is publicly defined.
- * Of the remaining three failure types, the constant values are kernel implementation-private, defined only in the available
- * kernel sources. On iOS, these sources are unavailable, and while they generally do match the Mac OS X implementation, there
- * are no gaurantees that this is -- or will remain -- the case in the future.
- *
- * Likewise, interpretation of particular fault types requires information regarding the underlying machine traps
- * that triggered the Mach exceptions. For example, a floating point trap on x86/x86-64 will trigger an EXC_ARITHMETIC,
- * with a subcode value containing the value of the FPU status register. Determining the exact FPU cause requires
- * extracting the actual exception flags from status register as per the x86 architecture documentation. The exact format
- * of this subcode value is not actually documented outside the kernel, and may change in future releases.
- *
- * While we have the advantage of access to the x86 kernel sources, the situation on ARM is even less clear. The actual
- * use of the Mach exception codes and subcodes is largely undefined by both headers and publicly available documentation,
- * and the available x86 kernel sources are of little use in interpreting this data.
- *
- * As such, while Mach exceptions may catch some cases that BSD signals can not, they are not a perfect solution,
- * and may also provide less insight into the actual failures that occur. By comparison, the BSD signal interface
- * is both fully defined and architecture independent, with any necessary interpretation of the Mach exception
- * codes handled in-kernel at the time of exception dispatch. It is generally recommended by Apple as the preferred
- * interface, and should generally be preferred by PLCrashReporter API clients.
- *
- * @section mach_exceptions_compatibility Compatibility Issues
- *
- * @subsection Debuggers
- *
- * Enabling in-process Mach exception handlers will conflict with any attached debuggers; the debugger
- * may suspend the processes Mach exception handling thread, which will result in any exception messages
- * sent via the debugger being lost, as the in-process handler will be unable to receive and forward
- * the messages.
- *
- * @subsection Managed Runtimes (Xamarin, Unity)
- *
- * A Mach exception handler may conflict with any managed runtime that registers a BSD signal handler that
- * can safely handle otherwise fatal signals, allowing execution to proceed. This includes products
- * such as Xamarin for iOS.
- *
- * In such a case, PLCrashReporter will write a crash report for non-fatal signals, as there is no
- * immediate mechanism for determining whether a signal handler exists and that it can safely
- * handle the failure. This can result in unexpected delays in application execution, increased I/O to
- * disk, and other undesirable operations.
- *
- * @section mach_exceptions_ios Mach Exceptions on iOS
- *
- * The APIs required for Mach exception handling are not fully public on iOS. After filing a request with
- * Apple DTS to clarify the status of the Mach exception APIs on iOS, and implementing a Mach Exception
- * handler using only supported API, they provided the following guidance:
- *
- *    <em>Our engineers have reviewed your request and have determined that this would be best handled as a bug report,
- *    which you have already filed. There is no documented way of accomplishing this, nor is there a workaround
- *    possible.</em>
- *
- * Due to user request, PLCrashReporter provides an optional implementation of Mach exception handling for both
- * iOS and Mac OS X.
- *
- * This implementation uses only supported API on Mac OS X, and depends on limited undefined API on iOS. The reporter
- * may be excluded entirely at build time by modifying the PLCRASH_FEATURE_MACH_EXCEPTIONS build configuration; it
- * may also be disabled at runtime by configuring the PLCrashReporter instance appropriately via PLCrashReporterConfig.
- *
- * The iOS implementation is implemented almost entirely using public API, and links against no actual private symbols;
- * the use of undocumented functionality is limited to assuming the use of specific msgh_id values (see below
- * for details). As a result, it may be considered perfectly safe to include the Mach Exception code in the
- * standard build, and enable/disable it at runtime.
- *
- * The following issues exist in the iOS implementation:
- *  - The msgh_id values required for an exception reply message are not available from the available
- *    headers and must be hard-coded. This prevents one from safely replying to exception messages, which
- *    means that it is impossible to (correctly) inform the server that an exception has *not* been
- *    handled.
- *
- *    Impact:
- *      This can lead to the process locking up and not dispatching to the host exception handler (eg, Apple's
- *      crash reporter), depending on the behavior of the kernel exception code.
- *
- *  - The mach_* structure/type variants required by MACH_EXCEPTION_CODES are not publicly defined (on Mac OS X,
- *    these are provided by mach_exc.defs). This prevents one from forwarding exception messages to an existing
- *    handler that was registered with a MACH_EXCEPTION_CODES behavior (eg, forwarding is entirely non-functional
- *    on ARM64 devices).
- *
- *    Impact:
- *      This can break forwarding to any task exception handler that registers itself with MACH_EXCEPTION_CODES,
- *      including other handlers registered within the current process, eg, by a managed runtime. This could
- *      also result in misinterpretation of a Mach exception message, in the case where the message format is
- *      modified by Apple to be incompatible with the existing 32-bit format.
- *
- *      This is the case with LLDB; it will register a task exception handler with MACH_EXCEPTION_CODES set. Failure
- *      to correctly forward these exceptions will result in the debugger breaking in interesting ways; for example,
- *      changes to the set of dyld-loaded images are detected by setting a breakpoint on the dyld image registration
- *      funtions, and this functionality will break if the exception is not correctly forwarded.
- *
- * Since Mach exception handling is important for a fully functional crash reporter, we have also filed a radar
- * to request that the API be made public:
- *  Radar: rdar://12939497 RFE: Provide mach_exc.defs for iOS
- *
- * At the time of this writing, the radar remains open/unresolved.
- */
diff --git a/submodules/HockeySDK-iOS/Vendor/CrashReporter.framework/Versions/A/Headers/PLCrashAsyncSignalInfo.h b/submodules/HockeySDK-iOS/Vendor/CrashReporter.framework/Versions/A/Headers/PLCrashAsyncSignalInfo.h
deleted file mode 100644
index 15f12a831b..0000000000
--- a/submodules/HockeySDK-iOS/Vendor/CrashReporter.framework/Versions/A/Headers/PLCrashAsyncSignalInfo.h
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Author: Landon Fuller <landonf@plausiblelabs.com>
- *
- * Copyright (c) 2008-2009 Plausible Labs Cooperative, Inc.
- * All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person
- * obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without
- * restriction, including without limitation the rights to use,
- * copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following
- * conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
- * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#ifndef PLCRASH_ASYNC_SIGNAL_INFO_H
-#define PLCRASH_ASYNC_SIGNAL_INFO_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/**
- * @internal
- *
- * @defgroup plcrash_async_signal_info Signal Information
- * @ingroup plcrash_async
- *
- * Provides mapping of signal number and code to strings.
- *
- * @{
- */
-
-const char *plcrash_async_signal_signame (int signal);
-const char *plcrash_async_signal_sigcode (int signal, int si_code);
-
-/**
- * @} plcrash_async_signal_info
- */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* PLCRASH_ASYNC_SIGNAL_INFO_H */
diff --git a/submodules/HockeySDK-iOS/Vendor/CrashReporter.framework/Versions/A/Headers/PLCrashFeatureConfig.h b/submodules/HockeySDK-iOS/Vendor/CrashReporter.framework/Versions/A/Headers/PLCrashFeatureConfig.h
deleted file mode 100644
index 58351108d4..0000000000
--- a/submodules/HockeySDK-iOS/Vendor/CrashReporter.framework/Versions/A/Headers/PLCrashFeatureConfig.h
+++ /dev/null
@@ -1,108 +0,0 @@
-/*
- * Author: Landon Fuller <landonf@plausible.coop>
- *
- * Copyright (c) 2012-2013 Plausible Labs Cooperative, Inc.
- * All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person
- * obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without
- * restriction, including without limitation the rights to use,
- * copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following
- * conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
- * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#ifndef PLCRASH_FEATURE_CONFIG_H
-#define PLCRASH_FEATURE_CONFIG_H
-
-#include <TargetConditionals.h>
-
-/**
- * @internal
- *
- * Build-time configuration for PLCrashReporter.
- *
- * This is used to automatically enable/disable features on a per-platform and per-configuration
- * basis; it may also be used by third-party vendors to configure a custom build of PLCrashReporter.
- *
- * @defgroup build_config Build Configuration
- * @ingroup constants
- * @{
- */
-
-/*
- * Defaults
- */
-
-/*
- * For release builds, disable unused unwind implementations on targets that do not use them. For non-release
- * builds, we include the unwind implementations to allow testing on a broader range of targets.
- */
-#ifdef PLCF_RELEASE_BUILD
-#  if defined(__arm__)
-#    ifndef PLCRASH_FEATURE_UNWIND_DWARF
-#      define PLCRASH_FEATURE_UNWIND_DWARF 0
-#    endif
-#    ifndef PLCRASH_FEATURE_UNWIND_COMPACT
-#      define PLCRASH_FEATURE_UNWIND_COMPACT 0
-#    endif
-#  endif
-#endif
-
-/*
- * Configuration Flags
- */
-
-
-#ifndef PLCRASH_FEATURE_MACH_EXCEPTIONS
-/**
- * If true, enable Mach exception support. On Mac OS X, the Mach exception implementation is fully supported,
- * using publicly available API. On iOS, the APIs required for a complete implementation are not public. However, a
- * popular commercial crash reporter is now shipping with support for Mach exceptions, which implies that either
- * they've received special dispensation to use private APIs / private structures, they've found another way to do
- * it, or they're just using undocumented functionality and hoping for the best.
- *
- * The exposed surface of undocumented API usage is relatively low, and there has been strong user demand to
- * implement Mach exception handling regardless of concerns over API visiblity. Given this, we've enabled
- * Mach exception handling by default, and provided both build-time and runtime configuration
- * to disable its use.
- *
- * For more information on the potential issues with enabling mach exception support, @sa @ref mach_exceptions.
- */
-#if TARGET_OS_TV
-#    define PLCRASH_FEATURE_MACH_EXCEPTIONS 0
-#else
-#    define PLCRASH_FEATURE_MACH_EXCEPTIONS 1
-#endif
-#endif
-
-#ifndef PLCRASH_FEATURE_UNWIND_DWARF
-/** If true, enable DWARF unwinding support. */
-#    define PLCRASH_FEATURE_UNWIND_DWARF 1
-#endif
-
-
-#ifndef PLCRASH_FEATURE_UNWIND_COMPACT
-/** If true, enable compact unwinding support. */
-#    define PLCRASH_FEATURE_UNWIND_COMPACT 1
-#endif
-
-/**
- * @}
- */
-
-#endif /* PLCRASH_FEATURE_CONFIG_H */
diff --git a/submodules/HockeySDK-iOS/Vendor/CrashReporter.framework/Versions/A/Headers/PLCrashMacros.h b/submodules/HockeySDK-iOS/Vendor/CrashReporter.framework/Versions/A/Headers/PLCrashMacros.h
deleted file mode 100644
index 6629bc4683..0000000000
--- a/submodules/HockeySDK-iOS/Vendor/CrashReporter.framework/Versions/A/Headers/PLCrashMacros.h
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
- * Author: Landon Fuller <landonf@plausiblelabs.com>
- *
- * Copyright (c) 2013 Plausible Labs Cooperative, Inc.
- * All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person
- * obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without
- * restriction, including without limitation the rights to use,
- * copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following
- * conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
- * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#ifndef PLCRASH_CONSTANTS_H
-#define PLCRASH_CONSTANTS_H
-
-#include <assert.h>
-
-#if defined(__cplusplus)
-#   define PLCR_EXPORT extern "C"
-#   define PLCR_C_BEGIN_DECLS extern "C" {
-#   define PLCR_C_END_DECLS }
-#else
-#   define PLCR_EXPORT extern
-#   define PLCR_C_BEGIN_DECLS
-#   define PLCR_C_END_DECLS
-#endif
-
-#if defined(__cplusplus)
-#  if defined(PLCRASHREPORTER_PREFIX)
-     /** @internal Define the plcrash namespace, automatically inserting an inline namespace containing the configured PLCRASHREPORTER_PREFIX, if any. */
-#    define PLCR_CPP_BEGIN_NS namespace plcrash { inline namespace PLCRASHREPORTER_PREFIX {
-
-    /** @internal Close the definition of the `plcrash` namespace (and the PLCRASHREPORTER_PREFIX inline namespace, if any). */
-#    define PLCR_CPP_END_NS }}
-#  else
-#   define PLCR_CPP_BEGIN_NS namespace plcrash {
-#   define PLCR_CPP_END_NS }
-#  endif
-#endif
-
-#ifdef __clang__
-#  define PLCR_PRAGMA_CLANG(_p) _Pragma(_p)
-#else
-#  define PLCR_PRAGMA_CLANG(_p)
-#endif
-
-#if defined(__clang__) || defined(__GNUC__)
-#  define PLCR_UNUSED __attribute__((unused))
-#else
-#  define PLCR_UNUSED
-#endif
-
-#ifdef PLCR_PRIVATE
-/**
- * @internal
- * Static compile-time assertion.
- *
- * @param name The assertion name; must be valid for use within a C identifier.
- * @param cond Assertion condition
- */
-#  define PLCR_ASSERT_STATIC(name, cond) PLCR_ASSERT_STATIC_(name, cond, __LINE__)
-/*
- * C++11 and C11 both provide a static_assert().
- *
- * Otherwise, we have to use typedef-based static assertions.
- */
-#  if (defined(__cplusplus) && __cplusplus >= 201103L) || (!defined(__cplusplus) && defined(__STDC_VERSION__) && __STDC_VERSION__ >= 201112L)
-#    define PLCR_ASSERT_STATIC_(name, cond, line) PLCR_ASSERT_STATIC__(#name, cond)
-#    define PLCR_ASSERT_STATIC__(name, cond) static_assert(cond, #name)
-#  else
-#    define PLCR_ASSERT_STATIC_(name, cond, line) PLCR_ASSERT_STATIC__(name, cond, line)
-#    define PLCR_ASSERT_STATIC__(name, cond, line) typedef int plcf_static_assert_##name##_##line [(cond) ? 1 : -1] PLCR_UNUSED
-#  endif
-#endif /* PLCR_PRIVATE */
-
-#endif /* PLCRASH_CONSTANTS_H */
diff --git a/submodules/HockeySDK-iOS/Vendor/CrashReporter.framework/Versions/A/Headers/PLCrashNamespace.h b/submodules/HockeySDK-iOS/Vendor/CrashReporter.framework/Versions/A/Headers/PLCrashNamespace.h
deleted file mode 100644
index dba0200e5c..0000000000
--- a/submodules/HockeySDK-iOS/Vendor/CrashReporter.framework/Versions/A/Headers/PLCrashNamespace.h
+++ /dev/null
@@ -1,314 +0,0 @@
-/*
- * Author: Landon Fuller <landonf@plausible.coop>
- *
- * Copyright (c) 2012-2013 Plausible Labs Cooperative, Inc.
- * All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person
- * obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without
- * restriction, including without limitation the rights to use,
- * copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following
- * conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
- * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
- */
-
-/*
- * For external library integrators:
- *
- * Set this value to any valid C symbol prefix. This will automatically
- * prepend the given prefix to all external symbols in the library.
- *
- * This may be used to avoid symbol conflicts between multiple libraries
- * that may both incorporate PLCrashReporter.
- */
-#define PLCRASHREPORTER_PREFIX BIT
-
-
-// We need two extra layers of indirection to make CPP substitute
-// the PLCRASHREPORTER_PREFIX define.
-#define PLNS_impl2(prefix, symbol) prefix ## symbol
-#define PLNS_impl(prefix, symbol) PLNS_impl2(prefix, symbol)
-#define PLNS(symbol) PLNS_impl(PLCRASHREPORTER_PREFIX, symbol)
-
-
-/*
- * Rewrite all ObjC/C symbols.
- *
- * For C++ symbol handling, refer to the PLCR_CPP_BEGIN_NS and PLCR_CPP_END_NS
- * macros.
- */
-#ifdef PLCRASHREPORTER_PREFIX
-
-/* Objective-C Classes */
-#define PLCrashMachExceptionServer          PLNS(PLCrashMachExceptionServer)
-#define PLCrashReport                       PLNS(PLCrashReport)
-#define PLCrashReportApplicationInfo        PLNS(PLCrashReportApplicationInfo)
-#define PLCrashReportBinaryImageInfo        PLNS(PLCrashReportBinaryImageInfo)
-#define PLCrashReportExceptionInfo          PLNS(PLCrashReportExceptionInfo)
-#define PLCrashReportMachExceptionInfo      PLNS(PLCrashReportMachExceptionInfo)
-#define PLCrashReportMachineInfo            PLNS(PLCrashReportMachineInfo)
-#define PLCrashReportProcessInfo            PLNS(PLCrashReportProcessInfo)
-#define PLCrashReportProcessorInfo          PLNS(PLCrashReportProcessorInfo)
-#define PLCrashReportRegisterInfo           PLNS(PLCrashReportRegisterInfo)
-#define PLCrashReportSignalInfo             PLNS(PLCrashReportSignalInfo)
-#define PLCrashReportStackFrameInfo         PLNS(PLCrashReportStackFrameInfo)
-#define PLCrashReportSymbolInfo             PLNS(PLCrashReportSymbolInfo)
-#define PLCrashReportSystemInfo             PLNS(PLCrashReportSystemInfo)
-#define PLCrashReportTextFormatter          PLNS(PLCrashReportTextFormatter)
-#define PLCrashReportThreadInfo             PLNS(PLCrashReportThreadInfo)
-#define PLCrashReporter                     PLNS(PLCrashReporter)
-#define PLCrashSignalHandler                PLNS(PLCrashSignalHandler)
-#define PLCrashHostInfo                     PLNS(PLCrashHostInfo)
-#define PLCrashMachExceptionPort            PLNS(PLCrashMachExceptionPort)
-#define PLCrashMachExceptionPortSet         PLNS(PLCrashMachExceptionPortSet)
-#define PLCrashProcessInfo                  PLNS(PLCrashProcessInfo)
-#define PLCrashReporterConfig               PLNS(PLCrashReporterConfig)
-#define PLCrashUncaughtExceptionHandler     PLNS(PLCrashUncaughtExceptionHandler)
-#define PLCrashReportFormatter              PLNS(PLCrashReportFormatter)
-
-/* Public C functions */
-#define PLCrashMachExceptionForward         PLNS(PLCrashMachExceptionForward)
-#define PLCrashSignalHandlerForward         PLNS(PLCrashSignalHandlerForward)
-#define plcrash_signal_handler              PLNS(plcrash_signal_handler)
-
-
-/* Public C global symbols */
-#define PLCrashReporterErrorDomain          PLNS(PLCrashReporterErrorDomain)
-#define PLCrashReportHostArchitecture       PLNS(PLCrashReportHostArchitecture)
-#define PLCrashReportHostOperatingSystem    PLNS(PLCrashReportHostOperatingSystem)
-#define PLCrashReporterException            PLNS(PLCrashReporterException)
-
-/* For backwards compatibility, plcrash_async_byteorder vends C++ methods when included under C++. We have
- * to handle this distinctly from our PLCR_CPP_BEGIN_NS C++ namespacing mechanism. */
-#define plcrash_async_byteorder             PLNS(plcrash_async_byteorder)
-
-/*
- * All private C symbols. Once these are migrated to C++, we'll be able to use the much simpler
- * PLCR_CPP_BEGIN_NS machinery.
- *
- * This list was automatically generated (and can be updated) by setting PLCRASHREPORTER_PREFIX to 'AcmeCo',
- * building the library, and executing the following:
- * nm -g -U <static library> | grep '^[0-9]' | c++filt | grep -v AcmeCo | grep -E '_pl|_PL' | awk '{print $3}' | cut -c 2- | sort | uniq | awk '{print "#define",$1,"PLNS("$1")"}'
- */
-#define PLCRASH_ASYNC_OBJC_ISA_NONPTR_CLASS_MASK PLNS(PLCRASH_ASYNC_OBJC_ISA_NONPTR_CLASS_MASK)
-#define pl_mach_thread_self PLNS(pl_mach_thread_self)
-#define plcrash__architecture__descriptor PLNS(plcrash__architecture__descriptor)
-#define plcrash__architecture__enum_values_by_name PLNS(plcrash__architecture__enum_values_by_name)
-#define plcrash__architecture__enum_values_by_number PLNS(plcrash__architecture__enum_values_by_number)
-#define plcrash__crash_report__application_info__descriptor PLNS(plcrash__crash_report__application_info__descriptor)
-#define plcrash__crash_report__binary_image__descriptor PLNS(plcrash__crash_report__binary_image__descriptor)
-#define plcrash__crash_report__descriptor PLNS(plcrash__crash_report__descriptor)
-#define plcrash__crash_report__exception__descriptor PLNS(plcrash__crash_report__exception__descriptor)
-#define plcrash__crash_report__free_unpacked PLNS(plcrash__crash_report__free_unpacked)
-#define plcrash__crash_report__get_packed_size PLNS(plcrash__crash_report__get_packed_size)
-#define plcrash__crash_report__init PLNS(plcrash__crash_report__init)
-#define plcrash__crash_report__machine_info__descriptor PLNS(plcrash__crash_report__machine_info__descriptor)
-#define plcrash__crash_report__pack PLNS(plcrash__crash_report__pack)
-#define plcrash__crash_report__pack_to_buffer PLNS(plcrash__crash_report__pack_to_buffer)
-#define plcrash__crash_report__process_info__descriptor PLNS(plcrash__crash_report__process_info__descriptor)
-#define plcrash__crash_report__processor__descriptor PLNS(plcrash__crash_report__processor__descriptor)
-#define plcrash__crash_report__processor__type_encoding__descriptor PLNS(plcrash__crash_report__processor__type_encoding__descriptor)
-#define plcrash__crash_report__processor__type_encoding__enum_values_by_name PLNS(plcrash__crash_report__processor__type_encoding__enum_values_by_name)
-#define plcrash__crash_report__processor__type_encoding__enum_values_by_number PLNS(plcrash__crash_report__processor__type_encoding__enum_values_by_number)
-#define plcrash__crash_report__report_info__descriptor PLNS(plcrash__crash_report__report_info__descriptor)
-#define plcrash__crash_report__signal__descriptor PLNS(plcrash__crash_report__signal__descriptor)
-#define plcrash__crash_report__signal__mach_exception__descriptor PLNS(plcrash__crash_report__signal__mach_exception__descriptor)
-#define plcrash__crash_report__symbol__descriptor PLNS(plcrash__crash_report__symbol__descriptor)
-#define plcrash__crash_report__system_info__descriptor PLNS(plcrash__crash_report__system_info__descriptor)
-#define plcrash__crash_report__system_info__operating_system__descriptor PLNS(plcrash__crash_report__system_info__operating_system__descriptor)
-#define plcrash__crash_report__system_info__operating_system__enum_values_by_name PLNS(plcrash__crash_report__system_info__operating_system__enum_values_by_name)
-#define plcrash__crash_report__system_info__operating_system__enum_values_by_number PLNS(plcrash__crash_report__system_info__operating_system__enum_values_by_number)
-#define plcrash__crash_report__thread__descriptor PLNS(plcrash__crash_report__thread__descriptor)
-#define plcrash__crash_report__thread__register_value__descriptor PLNS(plcrash__crash_report__thread__register_value__descriptor)
-#define plcrash__crash_report__thread__stack_frame__descriptor PLNS(plcrash__crash_report__thread__stack_frame__descriptor)
-#define plcrash__crash_report__unpack PLNS(plcrash__crash_report__unpack)
-#define plcrash_async_address_apply_offset PLNS(plcrash_async_address_apply_offset)
-#define plcrash_async_allocator_alloc PLNS(plcrash_async_allocator_alloc)
-#define plcrash_async_allocator_new PLNS(plcrash_async_allocator_new)
-#define plcrash_async_byteorder_big_endian PLNS(plcrash_async_byteorder_big_endian)
-#define plcrash_async_byteorder_direct PLNS(plcrash_async_byteorder_direct)
-#define plcrash_async_byteorder_little_endian PLNS(plcrash_async_byteorder_little_endian)
-#define plcrash_async_byteorder_swapped PLNS(plcrash_async_byteorder_swapped)
-#define plcrash_async_cfe_entry_apply PLNS(plcrash_async_cfe_entry_apply)
-#define plcrash_async_cfe_entry_free PLNS(plcrash_async_cfe_entry_free)
-#define plcrash_async_cfe_entry_init PLNS(plcrash_async_cfe_entry_init)
-#define plcrash_async_cfe_entry_register_count PLNS(plcrash_async_cfe_entry_register_count)
-#define plcrash_async_cfe_entry_register_list PLNS(plcrash_async_cfe_entry_register_list)
-#define plcrash_async_cfe_entry_return_address_register PLNS(plcrash_async_cfe_entry_return_address_register)
-#define plcrash_async_cfe_entry_stack_adjustment PLNS(plcrash_async_cfe_entry_stack_adjustment)
-#define plcrash_async_cfe_entry_stack_offset PLNS(plcrash_async_cfe_entry_stack_offset)
-#define plcrash_async_cfe_entry_type PLNS(plcrash_async_cfe_entry_type)
-#define plcrash_async_cfe_reader_find_pc PLNS(plcrash_async_cfe_reader_find_pc)
-#define plcrash_async_cfe_reader_free PLNS(plcrash_async_cfe_reader_free)
-#define plcrash_async_cfe_reader_init PLNS(plcrash_async_cfe_reader_init)
-#define plcrash_async_cfe_register_decode PLNS(plcrash_async_cfe_register_decode)
-#define plcrash_async_cfe_register_encode PLNS(plcrash_async_cfe_register_encode)
-#define plcrash_async_file_close PLNS(plcrash_async_file_close)
-#define plcrash_async_file_flush PLNS(plcrash_async_file_flush)
-#define plcrash_async_file_init PLNS(plcrash_async_file_init)
-#define plcrash_async_file_write PLNS(plcrash_async_file_write)
-#define plcrash_async_find_symbol PLNS(plcrash_async_find_symbol)
-#define plcrash_async_image_containing_address PLNS(plcrash_async_image_containing_address)
-#define plcrash_async_image_list_next PLNS(plcrash_async_image_list_next)
-#define plcrash_async_image_list_set_reading PLNS(plcrash_async_image_list_set_reading)
-#define plcrash_async_mach_exception_get_siginfo PLNS(plcrash_async_mach_exception_get_siginfo)
-#define plcrash_async_macho_byteorder PLNS(plcrash_async_macho_byteorder)
-#define plcrash_async_macho_contains_address PLNS(plcrash_async_macho_contains_address)
-#define plcrash_async_macho_cpu_subtype PLNS(plcrash_async_macho_cpu_subtype)
-#define plcrash_async_macho_cpu_type PLNS(plcrash_async_macho_cpu_type)
-#define plcrash_async_macho_find_command PLNS(plcrash_async_macho_find_command)
-#define plcrash_async_macho_find_segment_cmd PLNS(plcrash_async_macho_find_segment_cmd)
-#define plcrash_async_macho_find_symbol_by_name PLNS(plcrash_async_macho_find_symbol_by_name)
-#define plcrash_async_macho_find_symbol_by_pc PLNS(plcrash_async_macho_find_symbol_by_pc)
-#define plcrash_async_macho_header PLNS(plcrash_async_macho_header)
-#define plcrash_async_macho_header_size PLNS(plcrash_async_macho_header_size)
-#define plcrash_async_macho_map_section PLNS(plcrash_async_macho_map_section)
-#define plcrash_async_macho_map_segment PLNS(plcrash_async_macho_map_segment)
-#define plcrash_async_macho_mapped_segment_free PLNS(plcrash_async_macho_mapped_segment_free)
-#define plcrash_async_macho_next_command PLNS(plcrash_async_macho_next_command)
-#define plcrash_async_macho_next_command_type PLNS(plcrash_async_macho_next_command_type)
-#define plcrash_async_macho_string_free PLNS(plcrash_async_macho_string_free)
-#define plcrash_async_macho_string_get_length PLNS(plcrash_async_macho_string_get_length)
-#define plcrash_async_macho_string_get_pointer PLNS(plcrash_async_macho_string_get_pointer)
-#define plcrash_async_macho_string_init PLNS(plcrash_async_macho_string_init)
-#define plcrash_async_macho_symtab_reader_free PLNS(plcrash_async_macho_symtab_reader_free)
-#define plcrash_async_macho_symtab_reader_init PLNS(plcrash_async_macho_symtab_reader_init)
-#define plcrash_async_macho_symtab_reader_read PLNS(plcrash_async_macho_symtab_reader_read)
-#define plcrash_async_macho_symtab_reader_symbol_name PLNS(plcrash_async_macho_symtab_reader_symbol_name)
-#define plcrash_async_memcpy PLNS(plcrash_async_memcpy)
-#define plcrash_async_memset PLNS(plcrash_async_memset)
-#define plcrash_async_mobject_base_address PLNS(plcrash_async_mobject_base_address)
-#define plcrash_async_mobject_free PLNS(plcrash_async_mobject_free)
-#define plcrash_async_mobject_init PLNS(plcrash_async_mobject_init)
-#define plcrash_async_mobject_length PLNS(plcrash_async_mobject_length)
-#define plcrash_async_mobject_read_uint16 PLNS(plcrash_async_mobject_read_uint16)
-#define plcrash_async_mobject_read_uint32 PLNS(plcrash_async_mobject_read_uint32)
-#define plcrash_async_mobject_read_uint64 PLNS(plcrash_async_mobject_read_uint64)
-#define plcrash_async_mobject_read_uint8 PLNS(plcrash_async_mobject_read_uint8)
-#define plcrash_async_mobject_remap_address PLNS(plcrash_async_mobject_remap_address)
-#define plcrash_async_mobject_task PLNS(plcrash_async_mobject_task)
-#define plcrash_async_mobject_verify_local_pointer PLNS(plcrash_async_mobject_verify_local_pointer)
-#define plcrash_async_objc_cache_free PLNS(plcrash_async_objc_cache_free)
-#define plcrash_async_objc_cache_init PLNS(plcrash_async_objc_cache_init)
-#define plcrash_async_objc_find_method PLNS(plcrash_async_objc_find_method)
-#define plcrash_async_objc_supports_nonptr_isa PLNS(plcrash_async_objc_supports_nonptr_isa)
-#define plcrash_async_read_addr PLNS(plcrash_async_read_addr)
-#define plcrash_async_signal_sigcode PLNS(plcrash_async_signal_sigcode)
-#define plcrash_async_signal_signame PLNS(plcrash_async_signal_signame)
-#define plcrash_async_strcmp PLNS(plcrash_async_strcmp)
-#define plcrash_async_strerror PLNS(plcrash_async_strerror)
-#define plcrash_async_strncmp PLNS(plcrash_async_strncmp)
-#define plcrash_async_symbol_cache_free PLNS(plcrash_async_symbol_cache_free)
-#define plcrash_async_symbol_cache_init PLNS(plcrash_async_symbol_cache_init)
-#define plcrash_async_task_memcpy PLNS(plcrash_async_task_memcpy)
-#define plcrash_async_task_read_uint16 PLNS(plcrash_async_task_read_uint16)
-#define plcrash_async_task_read_uint32 PLNS(plcrash_async_task_read_uint32)
-#define plcrash_async_task_read_uint64 PLNS(plcrash_async_task_read_uint64)
-#define plcrash_async_task_read_uint8 PLNS(plcrash_async_task_read_uint8)
-#define plcrash_async_thread_state_clear_all_regs PLNS(plcrash_async_thread_state_clear_all_regs)
-#define plcrash_async_thread_state_clear_reg PLNS(plcrash_async_thread_state_clear_reg)
-#define plcrash_async_thread_state_clear_volatile_regs PLNS(plcrash_async_thread_state_clear_volatile_regs)
-#define plcrash_async_thread_state_copy PLNS(plcrash_async_thread_state_copy)
-#define plcrash_async_thread_state_current PLNS(plcrash_async_thread_state_current)
-#define plcrash_async_thread_state_current_stub PLNS(plcrash_async_thread_state_current_stub)
-#define plcrash_async_thread_state_get_greg_size PLNS(plcrash_async_thread_state_get_greg_size)
-#define plcrash_async_thread_state_get_reg PLNS(plcrash_async_thread_state_get_reg)
-#define plcrash_async_thread_state_get_reg_count PLNS(plcrash_async_thread_state_get_reg_count)
-#define plcrash_async_thread_state_get_reg_name PLNS(plcrash_async_thread_state_get_reg_name)
-#define plcrash_async_thread_state_get_stack_direction PLNS(plcrash_async_thread_state_get_stack_direction)
-#define plcrash_async_thread_state_has_reg PLNS(plcrash_async_thread_state_has_reg)
-#define plcrash_async_thread_state_init PLNS(plcrash_async_thread_state_init)
-#define plcrash_async_thread_state_mach_thread_init PLNS(plcrash_async_thread_state_mach_thread_init)
-#define plcrash_async_thread_state_map_dwarf_to_reg PLNS(plcrash_async_thread_state_map_dwarf_to_reg)
-#define plcrash_async_thread_state_map_reg_to_dwarf PLNS(plcrash_async_thread_state_map_reg_to_dwarf)
-#define plcrash_async_thread_state_mcontext_init PLNS(plcrash_async_thread_state_mcontext_init)
-#define plcrash_async_thread_state_set_reg PLNS(plcrash_async_thread_state_set_reg)
-#define plcrash_async_writen PLNS(plcrash_async_writen)
-#define plcrash_log_writer_close PLNS(plcrash_log_writer_close)
-#define plcrash_log_writer_free PLNS(plcrash_log_writer_free)
-#define plcrash_log_writer_init PLNS(plcrash_log_writer_init)
-#define plcrash_log_writer_set_exception PLNS(plcrash_log_writer_set_exception)
-#define plcrash_log_writer_write PLNS(plcrash_log_writer_write)
-#define plcrash_nasync_image_list_append PLNS(plcrash_nasync_image_list_append)
-#define plcrash_nasync_image_list_free PLNS(plcrash_nasync_image_list_free)
-#define plcrash_nasync_image_list_init PLNS(plcrash_nasync_image_list_init)
-#define plcrash_nasync_image_list_remove PLNS(plcrash_nasync_image_list_remove)
-#define plcrash_nasync_macho_free PLNS(plcrash_nasync_macho_free)
-#define plcrash_nasync_macho_init PLNS(plcrash_nasync_macho_init)
-#define plcrash_populate_error PLNS(plcrash_populate_error)
-#define plcrash_populate_mach_error PLNS(plcrash_populate_mach_error)
-#define plcrash_populate_posix_error PLNS(plcrash_populate_posix_error)
-#define plcrash_sysctl_int PLNS(plcrash_sysctl_int)
-#define plcrash_sysctl_string PLNS(plcrash_sysctl_string)
-#define plcrash_sysctl_valid_utf8_bytes PLNS(plcrash_sysctl_valid_utf8_bytes)
-#define plcrash_sysctl_valid_utf8_bytes_max PLNS(plcrash_sysctl_valid_utf8_bytes_max)
-#define plcrash_writer_pack PLNS(plcrash_writer_pack)
-#define plframe_cursor_free PLNS(plframe_cursor_free)
-#define plframe_cursor_get_reg PLNS(plframe_cursor_get_reg)
-#define plframe_cursor_get_regcount PLNS(plframe_cursor_get_regcount)
-#define plframe_cursor_get_regname PLNS(plframe_cursor_get_regname)
-#define plframe_cursor_init PLNS(plframe_cursor_init)
-#define plframe_cursor_next PLNS(plframe_cursor_next)
-#define plframe_cursor_next_with_readers PLNS(plframe_cursor_next_with_readers)
-#define plframe_cursor_read_compact_unwind PLNS(plframe_cursor_read_compact_unwind)
-#define plframe_cursor_read_dwarf_unwind PLNS(plframe_cursor_read_dwarf_unwind)
-#define plframe_cursor_read_frame_ptr PLNS(plframe_cursor_read_frame_ptr)
-#define plframe_cursor_thread_init PLNS(plframe_cursor_thread_init)
-#define plframe_strerror PLNS(plframe_strerror)
-#define plframe_test_thread_spawn PLNS(plframe_test_thread_spawn)
-#define plframe_test_thread_stop PLNS(plframe_test_thread_stop)
-
-#endif
-
-/*
- * The following symbols are exported by the protobuf-c library. When building
- * a shared library, we can hide these as private symbols.
- *
- * However, when building a static library, we can only do so if we use
- * MH_OBJECT "single object prelink". The MH_OBJECT approach allows us to apply
- * symbol hiding/aliasing/etc similar to that supported by dylibs, but because it is
- * seemingly unused within Apple, the use thereof regularly introduces linking bugs
- * and errors in new Xcode releases.
- *
- * Rather than fighting the linker, we use the namespacing machinery to rewrite these
- * symbols, but only when explicitly compiling PLCrashReporter. Since protobuf-c is a library
- * that may be used elsewhere, we don't want to rewrite these symbols if they're used
- * independently by PLCrashReporter API clients.
- */
-#ifdef PLCR_PRIVATE
-   /* If no prefix has been defined, we need to specify our own private prefix */
-#  ifndef PLCRASHREPORTER_PREFIX
-#    define PLCRASHREPORTER_PREFIX PL_
-#  endif
-
-#  define protobuf_c_buffer_simple_append                   PLNS(protobuf_c_buffer_simple_append)
-#  define protobuf_c_default_allocator                      PLNS(protobuf_c_default_allocator)
-#  define protobuf_c_enum_descriptor_get_value              PLNS(protobuf_c_enum_descriptor_get_value)
-#  define protobuf_c_enum_descriptor_get_value_by_name      PLNS(protobuf_c_enum_descriptor_get_value_by_name)
-#  define protobuf_c_message_descriptor_get_field           PLNS(protobuf_c_message_descriptor_get_field)
-#  define protobuf_c_message_descriptor_get_field_by_name   PLNS(protobuf_c_message_descriptor_get_field_by_name)
-#  define protobuf_c_message_free_unpacked                  PLNS(protobuf_c_message_free_unpacked)
-#  define protobuf_c_message_get_packed_size                PLNS(protobuf_c_message_get_packed_size)
-#  define protobuf_c_message_pack                           PLNS(protobuf_c_message_pack)
-#  define protobuf_c_message_pack_to_buffer                 PLNS(protobuf_c_message_pack_to_buffer)
-#  define protobuf_c_message_unpack                         PLNS(protobuf_c_message_unpack)
-#  define protobuf_c_out_of_memory                          PLNS(protobuf_c_out_of_memory)
-#  define protobuf_c_service_descriptor_get_method_by_name  PLNS(protobuf_c_service_descriptor_get_method_by_name)
-#  define protobuf_c_service_destroy                        PLNS(protobuf_c_service_destroy)
-#  define protobuf_c_service_generated_init                 PLNS(protobuf_c_service_generated_init)
-#  define protobuf_c_system_allocator                       PLNS(protobuf_c_system_allocator)
-#endif /* PLCR_PRIVATE */
diff --git a/submodules/HockeySDK-iOS/Vendor/CrashReporter.framework/Versions/A/Headers/PLCrashReport.h b/submodules/HockeySDK-iOS/Vendor/CrashReporter.framework/Versions/A/Headers/PLCrashReport.h
deleted file mode 100644
index a179cd6909..0000000000
--- a/submodules/HockeySDK-iOS/Vendor/CrashReporter.framework/Versions/A/Headers/PLCrashReport.h
+++ /dev/null
@@ -1,200 +0,0 @@
-/*
- * Author: Landon Fuller <landonf@plausiblelabs.com>
- *
- * Copyright (c) 2008-2013 Plausible Labs Cooperative, Inc.
- * All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person
- * obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without
- * restriction, including without limitation the rights to use,
- * copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following
- * conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
- * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#import <Foundation/Foundation.h>
-
-#import "PLCrashReportApplicationInfo.h"
-#import "PLCrashReportBinaryImageInfo.h"
-#import "PLCrashReportExceptionInfo.h"
-#import "PLCrashReportMachineInfo.h"
-#import "PLCrashReportMachExceptionInfo.h"
-#import "PLCrashReportProcessInfo.h"
-#import "PLCrashReportProcessorInfo.h"
-#import "PLCrashReportRegisterInfo.h"
-#import "PLCrashReportSignalInfo.h"
-#import "PLCrashReportStackFrameInfo.h"
-#import "PLCrashReportSymbolInfo.h"
-#import "PLCrashReportSystemInfo.h"
-#import "PLCrashReportThreadInfo.h"
-
-/** 
- * @ingroup constants
- * Crash file magic identifier */
-#define PLCRASH_REPORT_FILE_MAGIC "plcrash"
-
-/** 
- * @ingroup constants
- * Crash format version byte identifier. Will not change outside of the introduction of
- * an entirely new crash log format. */
-#define PLCRASH_REPORT_FILE_VERSION 1
-
-/**
- * @ingroup types
- * Crash log file header format.
- *
- * Crash log files start with 7 byte magic identifier (#PLCRASH_REPORT_FILE_MAGIC),
- * followed by a single unsigned byte version number (#PLCRASH_REPORT_FILE_VERSION).
- * The crash log message format itself is extensible, so this version number will only
- * be incremented in the event of an incompatible encoding or format change.
- */
-struct PLCrashReportFileHeader {
-    /** Crash log magic identifier, not NULL terminated */
-    const char magic[7];
-
-    /** Crash log encoding/format version */
-    const uint8_t version;
-
-    /** File data */
-    const uint8_t data[];
-} __attribute__((packed));
-
-
-/**
- * @internal
- * Private decoder instance variables (used to hide the underlying protobuf parser).
- */
-typedef struct _PLCrashReportDecoder _PLCrashReportDecoder;
-
-@interface PLCrashReport : NSObject {
-@private
-    /** Private implementation variables (used to hide the underlying protobuf parser) */
-    _PLCrashReportDecoder *_decoder;
-
-    /** System info */
-    PLCrashReportSystemInfo *_systemInfo;
-    
-    /** Machine info */
-    PLCrashReportMachineInfo *_machineInfo;
-
-    /** Application info */
-    PLCrashReportApplicationInfo *_applicationInfo;
-    
-    /** Process info */
-    PLCrashReportProcessInfo *_processInfo;
-
-    /** Signal info */
-    PLCrashReportSignalInfo *_signalInfo;
-    
-    /** Mach exception info */
-    PLCrashReportMachExceptionInfo *_machExceptionInfo;
-
-    /** Thread info (PLCrashReportThreadInfo instances) */
-    NSArray *_threads;
-
-    /** Binary images (PLCrashReportBinaryImageInfo instances */
-    NSArray *_images;
-
-    /** Exception information (may be nil) */
-    PLCrashReportExceptionInfo *_exceptionInfo;
-
-    /** Report UUID */
-    CFUUIDRef _uuid;
-}
-
-- (id) initWithData: (NSData *) encodedData error: (NSError **) outError;
-
-- (PLCrashReportBinaryImageInfo *) imageForAddress: (uint64_t) address;
-
-/**
- * System information.
- */
-@property(nonatomic, readonly) PLCrashReportSystemInfo *systemInfo;
-
-/**
- * YES if machine information is available.
- */
-@property(nonatomic, readonly) BOOL hasMachineInfo;
-
-/**
- * Machine information. Only available in later (v1.1+) crash report format versions. If not available,
- * will be nil.
- */
-@property(nonatomic, readonly) PLCrashReportMachineInfo *machineInfo;
-
-/**
- * Application information.
- */
-@property(nonatomic, readonly) PLCrashReportApplicationInfo *applicationInfo;
-
-/**
- * YES if process information is available.
- */
-@property(nonatomic, readonly) BOOL hasProcessInfo;
-
-/**
- * Process information. Only available in later (v1.1+) crash report format versions. If not available,
- * will be nil.
- */
-@property(nonatomic, readonly) PLCrashReportProcessInfo *processInfo;
-
-/**
- * Signal information. This provides the signal and signal code of the fatal signal.
- */
-@property(nonatomic, readonly) PLCrashReportSignalInfo *signalInfo;
-
-/**
- * Mach exception information, if available. This will only be included in the
- * case that encoding crash reporter's exception-based reporting was enabled, and a Mach
- * exception was caught.
- *
- * @warning If Mach exception information is available, the legacy signalInfo property will also be provided; this
- * s required to maintain backwards compatibility with the established API. Note, however, that the signal info may be derived from the
- * Mach exception info by the encoding crash reporter, and thus may not exactly match the kernel exception-to-signal
- * mappings implemented in xnu. As such, when Mach exception info is available, its use should be preferred.
- */
-@property(nonatomic, readonly) PLCrashReportMachExceptionInfo *machExceptionInfo;
-
-/**
- * Thread information. Returns a list of PLCrashReportThreadInfo instances.
- */
-@property(nonatomic, readonly) NSArray *threads;
-
-/**
- * Binary image information. Returns a list of PLCrashReportBinaryImageInfo instances.
- */
-@property(nonatomic, readonly) NSArray *images;
-
-/**
- * YES if exception information is available.
- */
-@property(nonatomic, readonly) BOOL hasExceptionInfo;
-
-/**
- * Exception information. Only available if a crash was caused by an uncaught exception,
- * otherwise nil.
- */
-@property(nonatomic, readonly) PLCrashReportExceptionInfo *exceptionInfo;
-
-/**
- * A client-generated 16-byte UUID. May be used to filter duplicate reports submitted or generated
- * by a single client. Only available in later (v1.2+) crash report format versions. If not available,
- * will be NULL.
- */
-@property(nonatomic, readonly) CFUUIDRef uuidRef;
-
-@end
diff --git a/submodules/HockeySDK-iOS/Vendor/CrashReporter.framework/Versions/A/Headers/PLCrashReportApplicationInfo.h b/submodules/HockeySDK-iOS/Vendor/CrashReporter.framework/Versions/A/Headers/PLCrashReportApplicationInfo.h
deleted file mode 100644
index 47a8706827..0000000000
--- a/submodules/HockeySDK-iOS/Vendor/CrashReporter.framework/Versions/A/Headers/PLCrashReportApplicationInfo.h
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * Author: Landon Fuller <landonf@plausiblelabs.com>
- *
- * Copyright (c) 2008-2009 Plausible Labs Cooperative, Inc.
- * All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person
- * obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without
- * restriction, including without limitation the rights to use,
- * copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following
- * conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
- * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#import <Foundation/Foundation.h>
-
-@interface PLCrashReportApplicationInfo : NSObject {
-@private
-    /** Application identifier */
-    NSString *_applicationIdentifier;
-    
-    /** Application version */
-    NSString *_applicationVersion;
-    
-    /** Application marketing version */
-    NSString *_applicationMarketingVersion;
-}
-
-- (id) initWithApplicationIdentifier: (NSString *) applicationIdentifier 
-                  applicationVersion: (NSString *) applicationVersion
-         applicationMarketingVersion: (NSString *) applicationMarketingVersion;
-
-/**
- * The application identifier. This is usually the application's CFBundleIdentifier value.
- */
-@property(nonatomic, readonly) NSString *applicationIdentifier;
-
-/**
- * The application version. This is usually the application's CFBundleVersion value.
- */
-@property(nonatomic, readonly) NSString *applicationVersion;
-
-/**
- * The application marketing version. This is usually the application's CFBundleShortVersionString value if available. May be nil.
- */
-@property(nonatomic, readonly) NSString *applicationMarketingVersion;
-
-@end
diff --git a/submodules/HockeySDK-iOS/Vendor/CrashReporter.framework/Versions/A/Headers/PLCrashReportBinaryImageInfo.h b/submodules/HockeySDK-iOS/Vendor/CrashReporter.framework/Versions/A/Headers/PLCrashReportBinaryImageInfo.h
deleted file mode 100644
index 339fdbb08f..0000000000
--- a/submodules/HockeySDK-iOS/Vendor/CrashReporter.framework/Versions/A/Headers/PLCrashReportBinaryImageInfo.h
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
- * Author: Landon Fuller <landonf@plausiblelabs.com>
- *
- * Copyright (c) 2008-2009 Plausible Labs Cooperative, Inc.
- * All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person
- * obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without
- * restriction, including without limitation the rights to use,
- * copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following
- * conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
- * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#import <Foundation/Foundation.h>
-#import "PLCrashReportProcessorInfo.h"
-
-@interface PLCrashReportBinaryImageInfo : NSObject {
-@private
-    /** Code type */
-    PLCrashReportProcessorInfo *_processorInfo;
-
-    /** Base image address */
-    uint64_t _baseAddress;
-
-    /** Image segment size */
-    uint64_t _imageSize;
-
-    /** Name of binary image */
-    NSString *_imageName;
-
-    /** If the UUID is available */
-    BOOL _hasImageUUID;
-
-    /** 128-bit object UUID. May be nil. */
-    NSString *_imageUUID;
-}
-
-- (id) initWithCodeType: (PLCrashReportProcessorInfo *) processorInfo
-            baseAddress: (uint64_t) baseAddress 
-                   size: (uint64_t) imageSize
-                   name: (NSString *) imageName
-                   uuid: (NSData *) uuid;
-
-/**
- * Image code type, or nil if unavailable.
- */
-@property(nonatomic, readonly) PLCrashReportProcessorInfo *codeType;
-
-/**
- * Image base address.
- */
-@property(nonatomic, readonly) uint64_t imageBaseAddress;
-
-/**
- * Segment size.
- */
-@property(nonatomic, readonly) uint64_t imageSize;
-
-/**
- * Image name (absolute path)
- */
-@property(nonatomic, readonly) NSString *imageName;
-
-
-/**
- * YES if this image has an associated UUID.
- */
-@property(nonatomic, readonly) BOOL hasImageUUID;
-
-/**
- * 128-bit object UUID (matches Mach-O DWARF dSYM files). May be nil if unavailable.
- */
-@property(nonatomic, readonly) NSString *imageUUID;
-
-@end
diff --git a/submodules/HockeySDK-iOS/Vendor/CrashReporter.framework/Versions/A/Headers/PLCrashReportExceptionInfo.h b/submodules/HockeySDK-iOS/Vendor/CrashReporter.framework/Versions/A/Headers/PLCrashReportExceptionInfo.h
deleted file mode 100644
index 623b1d4e15..0000000000
--- a/submodules/HockeySDK-iOS/Vendor/CrashReporter.framework/Versions/A/Headers/PLCrashReportExceptionInfo.h
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Author: Landon Fuller <landonf@plausiblelabs.com>
- *
- * Copyright (c) 2008-2009 Plausible Labs Cooperative, Inc.
- * All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person
- * obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without
- * restriction, including without limitation the rights to use,
- * copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following
- * conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
- * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#import <Foundation/Foundation.h>
-#import "PLCrashReportThreadInfo.h"
-
-
-@interface PLCrashReportExceptionInfo : NSObject {
-@private
-    /** Name */
-    NSString *_name;
-
-    /** Reason */
-    NSString *_reason;
-
-    /** Ordered list of PLCrashReportStackFrame instances, or nil if unavailable. */
-    NSArray *_stackFrames;
-}
-
-- (id) initWithExceptionName: (NSString *) name reason: (NSString *) reason;
-
-- (id) initWithExceptionName: (NSString *) name 
-                      reason: (NSString *) reason
-                 stackFrames: (NSArray *) stackFrames;
-
-/**
- * The exception name.
- */
-@property(nonatomic, readonly) NSString *exceptionName;
-
-/**
- * The exception reason.
- */
-@property(nonatomic, readonly) NSString *exceptionReason;
-
-/* The exception's original call stack, as an array of PLCrashReportStackFrameInfo instances, or nil if unavailable.
- * This may be preserved across rethrow of an exception, and can be used to determine the original call stack. */
-@property(nonatomic, readonly) NSArray *stackFrames;
-
-@end
diff --git a/submodules/HockeySDK-iOS/Vendor/CrashReporter.framework/Versions/A/Headers/PLCrashReportFormatter.h b/submodules/HockeySDK-iOS/Vendor/CrashReporter.framework/Versions/A/Headers/PLCrashReportFormatter.h
deleted file mode 100644
index 77c2029fd0..0000000000
--- a/submodules/HockeySDK-iOS/Vendor/CrashReporter.framework/Versions/A/Headers/PLCrashReportFormatter.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Author: Landon Fuller <landonf@plausiblelabs.com>
- *
- * Copyright (c) 2008-2013 Plausible Labs Cooperative, Inc.
- * All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person
- * obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without
- * restriction, including without limitation the rights to use,
- * copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following
- * conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
- * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#import <Foundation/Foundation.h>
-
-#import "PLCrashReport.h"
-
-/**
- * A crash report formatter accepts a PLCrashReport instance, formats it according to implementation-specified rules,
- * (such as implementing text output support), and returns the result.
- */
-@protocol PLCrashReportFormatter
-
-/**
- * Format the provided @a report.
- *
- * @param report Report to be formatted.
- * @param outError A pointer to an NSError object variable. If an error occurs, this pointer will contain an error
- * object indicating why the pending crash report could not be formatted. If no error occurs, this parameter will
- * be left unmodified. You may specify nil for this parameter, and no error information will be provided.
- *
- * @return Returns the formatted report data on success, or nil on failure.
- */
-- (NSData *) formatReport: (PLCrashReport *) report error: (NSError **) outError;
-
-@end
diff --git a/submodules/HockeySDK-iOS/Vendor/CrashReporter.framework/Versions/A/Headers/PLCrashReportMachExceptionInfo.h b/submodules/HockeySDK-iOS/Vendor/CrashReporter.framework/Versions/A/Headers/PLCrashReportMachExceptionInfo.h
deleted file mode 100644
index a9d7f7c245..0000000000
--- a/submodules/HockeySDK-iOS/Vendor/CrashReporter.framework/Versions/A/Headers/PLCrashReportMachExceptionInfo.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Author: Landon Fuller <landonf@plausiblelabs.com>
- *
- * Copyright (c) 2013 Plausible Labs Cooperative, Inc.
- * All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person
- * obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without
- * restriction, including without limitation the rights to use,
- * copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following
- * conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
- * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#import <Foundation/Foundation.h>
-
-@interface PLCrashReportMachExceptionInfo : NSObject {
-@private
-    /** The Mach exception type. */
-    uint64_t _type;
-    
-    /** The Mach exception codes, represented as an ordered array of NSNumber instances. */
-    NSArray *_codes;
-}
-
-- (id) initWithType: (uint64_t) type codes: (NSArray *) codes;
-
-/** The Mach exception type. */
-@property(nonatomic, readonly) uint64_t type;
-
-/** The Mach exception codes, represented as an ordered array of 64-bit unsigned NSNumber instances. */
-@property(nonatomic, readonly) NSArray *codes;
-
-@end
diff --git a/submodules/HockeySDK-iOS/Vendor/CrashReporter.framework/Versions/A/Headers/PLCrashReportMachineInfo.h b/submodules/HockeySDK-iOS/Vendor/CrashReporter.framework/Versions/A/Headers/PLCrashReportMachineInfo.h
deleted file mode 100644
index 4d0597c1df..0000000000
--- a/submodules/HockeySDK-iOS/Vendor/CrashReporter.framework/Versions/A/Headers/PLCrashReportMachineInfo.h
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * Author: Landon Fuller <landonf@plausible.coop>
- *
- * Copyright (c) 2008-2013 Plausible Labs Cooperative, Inc.
- * All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person
- * obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without
- * restriction, including without limitation the rights to use,
- * copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following
- * conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
- * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#import <Foundation/Foundation.h>
-
-#import "PLCrashReportProcessorInfo.h"
-
-@interface PLCrashReportMachineInfo : NSObject {
-@private
-    /** The hardware model name (eg, MacBookPro6,1). This may be unavailable, and this property will be nil. */
-    NSString *_modelName;
-    
-    /** The processor type. */
-    PLCrashReportProcessorInfo *_processorInfo;
-    
-    /* The number of actual physical processor cores. */
-    NSUInteger _processorCount;
-    
-    /* The number of logical processors. */
-    NSUInteger _logicalProcessorCount;
-}
-
-- (id) initWithModelName: (NSString *) modelName
-           processorInfo: (PLCrashReportProcessorInfo *) processorInfo
-          processorCount: (NSUInteger) processorCount
-   logicalProcessorCount: (NSUInteger) logicalProcessorCount;
-
-/** The hardware model name (eg, MacBookPro6,1). This may be unavailable, and this property will be nil. */
-@property(nonatomic, readonly) NSString *modelName;
-
-/** The processor type. This will be unavailable in reports generated prior to PLCrashReporter 1.2, in which case this property will be nil. */
-@property(nonatomic, readonly) PLCrashReportProcessorInfo *processorInfo;
-
-/*
- * The number of actual physical processor cores. Note that the number of active processors may be managed by the
- * operating system's power management system, and this value may not reflect the number of active
- * processors at the time of the crash.
- */
-@property(nonatomic, readonly) NSUInteger processorCount;
-
-/*
- * The number of logical processors.  Note that the number of active processors may be managed by the
- * operating system's power management system, and this value may not reflect the number of active
- * processors at the time of the crash.
- */
-@property(nonatomic, readonly) NSUInteger logicalProcessorCount;
-
-@end
diff --git a/submodules/HockeySDK-iOS/Vendor/CrashReporter.framework/Versions/A/Headers/PLCrashReportProcessInfo.h b/submodules/HockeySDK-iOS/Vendor/CrashReporter.framework/Versions/A/Headers/PLCrashReportProcessInfo.h
deleted file mode 100644
index ca683d50da..0000000000
--- a/submodules/HockeySDK-iOS/Vendor/CrashReporter.framework/Versions/A/Headers/PLCrashReportProcessInfo.h
+++ /dev/null
@@ -1,103 +0,0 @@
-/*
- * Author: Damian Morris <damian@moso.com.au>
- *
- * Copyright (c) 2010 MOSO Corporation, Pty Ltd.
- * Copyright (c) 2010-2013 Plausible Labs Cooperative, Inc.
- *
- * All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person
- * obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without
- * restriction, including without limitation the rights to use,
- * copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following
- * conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
- * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#import <Foundation/Foundation.h>
-
-@interface PLCrashReportProcessInfo : NSObject {
-@private
-    /** Process name, or nil if unavailable. */
-    NSString *_processName;
-    
-    /** Process ID */
-    NSUInteger _processID;
-    
-    /** Process path */
-    NSString* _processPath;
-
-    /** Date and time that the crashing process was started. This may be unavailable, and this property
-     * will be nil. */
-    NSDate *_processStartTime;
-
-    /** Parent process name, or nil if unavailable.  */
-    NSString *_parentProcessName;
-    
-    /** Parent process ID */
-    NSUInteger _parentProcessID;
-    
-    /** If false, the process is being run via process-level CPU emulation (such as Rosetta). */
-    BOOL _native;
-}
-
-- (id) initWithProcessName: (NSString *) processName
-                 processID: (NSUInteger) processID
-               processPath: (NSString *) processPath
-          processStartTime: (NSDate *) processStartTime
-         parentProcessName: (NSString *) parentProcessName
-           parentProcessID: (NSUInteger) parentProcessID
-                    native: (BOOL) native;
-
-/**
- * The process name. This value may not be included in the crash report, in which case this property
- * will be nil.
- */
-@property(nonatomic, readonly) NSString *processName;
-
-/**
- * The process ID.
- */
-@property(nonatomic, readonly) NSUInteger processID;
-
-/**
- * The path to the process executable. This value may not be included in the crash report, in which case this property
- * will be nil.
- */
-@property(nonatomic, readonly) NSString *processPath;
-
-/**
- * Date and time that the crashing process was started. This value may not be included in the crash report, in which case this property
- * will be nil.
- */
-@property(nonatomic, readonly) NSDate *processStartTime;
-
-/**
- * The parent process name. This value may not be included in the crash report, in which case this property
- * will be nil.
- */
-@property(nonatomic, readonly) NSString *parentProcessName;
-
-/**
- * The parent process ID.
- */
-@property(nonatomic, readonly) NSUInteger parentProcessID;
-
-/** The process' native execution status. If false, the process is being run via process-level CPU emulation (such as Rosetta). */
-@property(nonatomic, readonly) BOOL native;
-
-@end
diff --git a/submodules/HockeySDK-iOS/Vendor/CrashReporter.framework/Versions/A/Headers/PLCrashReportProcessorInfo.h b/submodules/HockeySDK-iOS/Vendor/CrashReporter.framework/Versions/A/Headers/PLCrashReportProcessorInfo.h
deleted file mode 100644
index 03d570bd4c..0000000000
--- a/submodules/HockeySDK-iOS/Vendor/CrashReporter.framework/Versions/A/Headers/PLCrashReportProcessorInfo.h
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * Author: Landon Fuller <landonf@plausible.coop>
- *
- * Copyright (c) 2008-2013 Plausible Labs Cooperative, Inc.
- * All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person
- * obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without
- * restriction, including without limitation the rights to use,
- * copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following
- * conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
- * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#import <Foundation/Foundation.h>
-#import <mach/machine.h>
-
-/**
- * @ingroup constants
- *
- * The type encodings supported for CPU types and subtypes. Currently only Apple
- * Mach-O defined encodings are supported.
- *
- * @internal
- * These enum values match the protobuf values. Keep them synchronized.
- */
-typedef enum {
-    /** Unknown cpu type encoding. */
-    PLCrashReportProcessorTypeEncodingUnknown = 0,
-
-    /** Apple Mach-defined processor types. */
-    PLCrashReportProcessorTypeEncodingMach = 1
-} PLCrashReportProcessorTypeEncoding;
-
-@interface PLCrashReportProcessorInfo : NSObject {
-@private
-    /** Type encoding */
-    PLCrashReportProcessorTypeEncoding _typeEncoding;
-
-    /** CPU type */
-    uint64_t _type;
-
-    /** CPU subtype */
-    uint64_t _subtype;
-}
-
-- (id) initWithTypeEncoding: (PLCrashReportProcessorTypeEncoding) typeEncoding
-                       type: (uint64_t) type
-                    subtype: (uint64_t) subtype;
-
-/** The CPU type encoding. */
-@property(nonatomic, readonly) PLCrashReportProcessorTypeEncoding typeEncoding;
-
-/** The CPU type. */
-@property(nonatomic, readonly) uint64_t type;
-
-/** The CPU subtype. */
-@property(nonatomic, readonly) uint64_t subtype;
-
-@end
diff --git a/submodules/HockeySDK-iOS/Vendor/CrashReporter.framework/Versions/A/Headers/PLCrashReportRegisterInfo.h b/submodules/HockeySDK-iOS/Vendor/CrashReporter.framework/Versions/A/Headers/PLCrashReportRegisterInfo.h
deleted file mode 100644
index 20b618d747..0000000000
--- a/submodules/HockeySDK-iOS/Vendor/CrashReporter.framework/Versions/A/Headers/PLCrashReportRegisterInfo.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Author: Landon Fuller <landonf@plausible.coop>
- *
- * Copyright (c) 2008-2013 Plausible Labs Cooperative, Inc.
- * All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person
- * obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without
- * restriction, including without limitation the rights to use,
- * copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following
- * conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
- * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#import <Foundation/Foundation.h>
-
-@interface PLCrashReportRegisterInfo : NSObject {
-@private
-    /** Register name */
-    NSString *_registerName;
-    
-    /** Register value */
-    uint64_t _registerValue;
-}
-
-- (id) initWithRegisterName: (NSString *) registerName registerValue: (uint64_t) registerValue;
-
-/**
- * Register name.
- */
-@property(nonatomic, readonly) NSString *registerName;
-
-/**
- * Register value.
- */
-@property(nonatomic, readonly) uint64_t registerValue;
-
-@end
diff --git a/submodules/HockeySDK-iOS/Vendor/CrashReporter.framework/Versions/A/Headers/PLCrashReportSignalInfo.h b/submodules/HockeySDK-iOS/Vendor/CrashReporter.framework/Versions/A/Headers/PLCrashReportSignalInfo.h
deleted file mode 100644
index 2c5c5fe23d..0000000000
--- a/submodules/HockeySDK-iOS/Vendor/CrashReporter.framework/Versions/A/Headers/PLCrashReportSignalInfo.h
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Author: Landon Fuller <landonf@plausiblelabs.com>
- *
- * Copyright (c) 2008-2009 Plausible Labs Cooperative, Inc.
- * All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person
- * obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without
- * restriction, including without limitation the rights to use,
- * copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following
- * conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
- * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#import <Foundation/Foundation.h>
-
-@interface PLCrashReportSignalInfo : NSObject {
-@private
-    /** Signal name */
-    NSString *_name;
-    
-    /** Signal code */
-    NSString *_code;
-
-    /** Fauling instruction or address */
-    uint64_t _address;
-}
-
-- (id) initWithSignalName: (NSString *) name code: (NSString *) code address: (uint64_t) address;
-
-/**
- * The signal name.
- */
-@property(nonatomic, readonly) NSString *name;
-
-/**
- * The signal code.
- */
-@property(nonatomic, readonly) NSString *code;
-
-/**
- * The faulting instruction or address.
- */
-@property(nonatomic, readonly) uint64_t address;
-
-@end
diff --git a/submodules/HockeySDK-iOS/Vendor/CrashReporter.framework/Versions/A/Headers/PLCrashReportStackFrameInfo.h b/submodules/HockeySDK-iOS/Vendor/CrashReporter.framework/Versions/A/Headers/PLCrashReportStackFrameInfo.h
deleted file mode 100644
index 997e762650..0000000000
--- a/submodules/HockeySDK-iOS/Vendor/CrashReporter.framework/Versions/A/Headers/PLCrashReportStackFrameInfo.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Author: Landon Fuller <landonf@plausible.coop>
- *
- * Copyright (c) 2008-2013 Plausible Labs Cooperative, Inc.
- * All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person
- * obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without
- * restriction, including without limitation the rights to use,
- * copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following
- * conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
- * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#import <Foundation/Foundation.h>
-#import "PLCrashReportSymbolInfo.h"
-
-@interface PLCrashReportStackFrameInfo : NSObject {
-@private
-    /** Frame instruction pointer. */
-    uint64_t _instructionPointer;
-
-    /** Symbol information, if available. Otherwise, will be nil. */
-    PLCrashReportSymbolInfo *_symbolInfo;
-}
-
-- (id) initWithInstructionPointer: (uint64_t) instructionPointer symbolInfo: (PLCrashReportSymbolInfo *) symbolInfo;
-
-/**
- * Frame's instruction pointer.
- */
-@property(nonatomic, readonly) uint64_t instructionPointer;
-
-/** Symbol information for this frame.
- * This may be unavailable, and this property will be nil. */
-@property(nonatomic, readonly) PLCrashReportSymbolInfo *symbolInfo;
-
-@end
diff --git a/submodules/HockeySDK-iOS/Vendor/CrashReporter.framework/Versions/A/Headers/PLCrashReportSymbolInfo.h b/submodules/HockeySDK-iOS/Vendor/CrashReporter.framework/Versions/A/Headers/PLCrashReportSymbolInfo.h
deleted file mode 100644
index c6ceb6c109..0000000000
--- a/submodules/HockeySDK-iOS/Vendor/CrashReporter.framework/Versions/A/Headers/PLCrashReportSymbolInfo.h
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Author: Landon Fuller <landonf@plausible.coop>
- *
- * Copyright (c) 2012-2013 Plausible Labs Cooperative, Inc.
- * All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person
- * obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without
- * restriction, including without limitation the rights to use,
- * copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following
- * conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
- * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#import <Foundation/Foundation.h>
-
-@interface PLCrashReportSymbolInfo : NSObject {
-@private
-    /** The symbol name. */
-    NSString *_symbolName;
-    
-    /** The symbol start address. */
-    uint64_t _startAddress;
-    
-    /** The symbol end address, if explicitly defined. Will be 0 if unknown. */
-    uint64_t _endAddress;
-}
-
-- (id) initWithSymbolName: (NSString *) symbolName
-             startAddress: (uint64_t) startAddress
-               endAddress: (uint64_t) endAddress;
-
-/** The symbol name. */
-@property(nonatomic, readonly) NSString *symbolName;
-
-/** The symbol start address. */
-@property(nonatomic, readonly) uint64_t startAddress;
-
-/* The symbol end address, if explicitly defined. This will only be included if the end address is
- * explicitly defined (eg, by DWARF debugging information), will not be derived by best-guess
- * heuristics.
- *
- * If unknown, the address will be 0.
- */
-@property(nonatomic, readonly) uint64_t endAddress;
-
-@end
diff --git a/submodules/HockeySDK-iOS/Vendor/CrashReporter.framework/Versions/A/Headers/PLCrashReportSystemInfo.h b/submodules/HockeySDK-iOS/Vendor/CrashReporter.framework/Versions/A/Headers/PLCrashReportSystemInfo.h
deleted file mode 100644
index 8ec71e637a..0000000000
--- a/submodules/HockeySDK-iOS/Vendor/CrashReporter.framework/Versions/A/Headers/PLCrashReportSystemInfo.h
+++ /dev/null
@@ -1,154 +0,0 @@
-/*
- * Author: Landon Fuller <landonf@plausiblelabs.com>
- *
- * Copyright (c) 2008-2009 Plausible Labs Cooperative, Inc.
- * All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person
- * obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without
- * restriction, including without limitation the rights to use,
- * copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following
- * conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
- * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#import <Foundation/Foundation.h>
-
-/**
- * @ingroup constants
- *
- * Indicates the Operating System under which a Crash Log was generated.
- *
- * @internal
- * These enum values match the protobuf values. Keep them synchronized.
- */
-typedef enum {
-    /** Mac OS X. */
-    PLCrashReportOperatingSystemMacOSX = 0,
-    
-    /** iPhone OS */
-    PLCrashReportOperatingSystemiPhoneOS = 1,
-    
-    /** iPhone Simulator (Mac OS X with additional simulator-specific runtime libraries) */
-    PLCrashReportOperatingSystemiPhoneSimulator = 2,
-    
-    /** Unknown operating system */
-    PLCrashReportOperatingSystemUnknown = 3,
-  
-    /** Apple tvOS */
-    PLCrashReportOperatingSystemAppleTVOS = 4,
-  
-} PLCrashReportOperatingSystem;
-
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdocumentation-deprecated-sync"
-/**
- * @ingroup constants
- *
- * Indicates the architecture under which a Crash Log was generated.
- *
- * @deprecated The architecture value has been deprecated in v1.1 and later crash reports. All new reports
- * will make use of the new PLCrashReportProcessorInfo CPU type encodings.
- *
- * @internal
- * These enum values match the protobuf values. Keep them synchronized.
- */
-typedef enum {
-    /** x86-32. */
-    PLCrashReportArchitectureX86_32 = 0,
-    
-    /** x86-64 */
-    PLCrashReportArchitectureX86_64 = 1,
-
-    /** ARMv6 */
-    PLCrashReportArchitectureARMv6 = 2,
-
-    /**
-     * ARMv6
-     * @deprecated This value has been deprecated in favor of ARM subtype-specific
-     * values.
-     * @sa PLCrashReportArchitectureARMv6
-     */
-    PLCrashReportArchitectureARM = PLCrashReportArchitectureARMv6,
-
-    /** PPC */
-    PLCrashReportArchitecturePPC = 3,
-    
-    /** PPC64 */
-    PLCrashReportArchitecturePPC64 = 4,
-    
-    /** ARMv7 */
-    PLCrashReportArchitectureARMv7 = 5,
-    
-    /** Unknown */
-    PLCrashReportArchitectureUnknown = 6
-} PLCrashReportArchitecture;
-#pragma clang diagnostic pop
-
-extern PLCrashReportOperatingSystem PLCrashReportHostOperatingSystem;
-extern PLCrashReportArchitecture PLCrashReportHostArchitecture;
-
-@interface PLCrashReportSystemInfo : NSObject {
-@private
-    /** Operating system */
-    PLCrashReportOperatingSystem _operatingSystem;
-    
-    /** Operating system version */
-    NSString *_osVersion;
-    
-    /** OS build. May be nil. */
-    NSString *_osBuild;
-    
-    /** Architecture */
-    PLCrashReportArchitecture _architecture;
-    
-    /** Date crash report was generated. May be nil if the date is unknown. */
-    NSDate *_timestamp;
-}
-
-- (id) initWithOperatingSystem: (PLCrashReportOperatingSystem) operatingSystem 
-        operatingSystemVersion: (NSString *) operatingSystemVersion
-                  architecture: (PLCrashReportArchitecture) architecture
-                     timestamp: (NSDate *) timestamp;
-
-- (id) initWithOperatingSystem: (PLCrashReportOperatingSystem) operatingSystem 
-        operatingSystemVersion: (NSString *) operatingSystemVersion
-          operatingSystemBuild: (NSString *) operatingSystemBuild
-                  architecture: (PLCrashReportArchitecture) architecture
-                     timestamp: (NSDate *) timestamp;
-
-/** The operating system. */
-@property(nonatomic, readonly) PLCrashReportOperatingSystem operatingSystem;
-
-/** The operating system's release version. */
-@property(nonatomic, readonly) NSString *operatingSystemVersion;
-
-/** The operating system's build identifier (eg, 10J869). This may be unavailable, and this property will be nil. */
-@property(nonatomic, readonly) NSString *operatingSystemBuild;
-
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdocumentation-deprecated-sync"
-/** Architecture. @deprecated The architecture value has been deprecated in v1.1 and later crash reports. All new reports
- * include the CPU type as part of the crash report's machine info structure, using the PLCrashReportProcessorInfo
- * extensible encoding. */
-@property(nonatomic, readonly) PLCrashReportArchitecture architecture;
-#pragma clang diagnostic pop
-
-/** Date and time that the crash report was generated. This may be unavailable, and this property will be nil. */
-@property(nonatomic, readonly) NSDate *timestamp;
-
-@end
diff --git a/submodules/HockeySDK-iOS/Vendor/CrashReporter.framework/Versions/A/Headers/PLCrashReportTextFormatter.h b/submodules/HockeySDK-iOS/Vendor/CrashReporter.framework/Versions/A/Headers/PLCrashReportTextFormatter.h
deleted file mode 100644
index 2ba7e3503e..0000000000
--- a/submodules/HockeySDK-iOS/Vendor/CrashReporter.framework/Versions/A/Headers/PLCrashReportTextFormatter.h
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * Authors:
- *  Landon Fuller <landonf@plausiblelabs.com>
- *  Damian Morris <damian@moso.com.au>
- *
- * Copyright (c) 2008-2013 Plausible Labs Cooperative, Inc.
- * Copyright (c) 2010 MOSO Corporation, Pty Ltd.
- * All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person
- * obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without
- * restriction, including without limitation the rights to use,
- * copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following
- * conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
- * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
- */
-
-
-#import <Foundation/Foundation.h>
-
-#import "PLCrashReportFormatter.h"
-
-/**
- * Supported text output formats.
- *
- * @ingroup enums
- */
-typedef enum {
-    /** An iOS-compatible crash log text format. Compatible with the crash logs generated by the device and available
-     * through iTunes Connect. */
-    PLCrashReportTextFormatiOS = 0
-} PLCrashReportTextFormat;
-
-
-@interface PLCrashReportTextFormatter : NSObject <PLCrashReportFormatter> {
-@private
-    /** Text output format. */
-    PLCrashReportTextFormat _textFormat;
-
-    /** Encoding to use for string output. */
-    NSStringEncoding _stringEncoding;
-}
-
-+ (NSString *) stringValueForCrashReport: (PLCrashReport *) report withTextFormat: (PLCrashReportTextFormat) textFormat;
-
-- (id) initWithTextFormat: (PLCrashReportTextFormat) textFormat stringEncoding: (NSStringEncoding) stringEncoding;
-
-@end
diff --git a/submodules/HockeySDK-iOS/Vendor/CrashReporter.framework/Versions/A/Headers/PLCrashReportThreadInfo.h b/submodules/HockeySDK-iOS/Vendor/CrashReporter.framework/Versions/A/Headers/PLCrashReportThreadInfo.h
deleted file mode 100644
index 04c8604454..0000000000
--- a/submodules/HockeySDK-iOS/Vendor/CrashReporter.framework/Versions/A/Headers/PLCrashReportThreadInfo.h
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- * Author: Landon Fuller <landonf@plausiblelabs.com>
- *
- * Copyright (c) 2008-2009 Plausible Labs Cooperative, Inc.
- * All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person
- * obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without
- * restriction, including without limitation the rights to use,
- * copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following
- * conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
- * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#import <Foundation/Foundation.h>
-
-#import "PLCrashReportStackFrameInfo.h"
-#import "PLCrashReportRegisterInfo.h"
-
-@interface PLCrashReportThreadInfo : NSObject {
-@private
-    /** The thread number. Should be unique within a given crash log. */
-    NSInteger _threadNumber;
-
-    /** Ordered list of PLCrashReportStackFrame instances */
-    NSArray *_stackFrames;
-
-    /** YES if this thread crashed. */
-    BOOL _crashed;
-
-    /** List of PLCrashReportRegister instances. Will be empty if _crashed is NO. */
-    NSArray *_registers;
-}
-
-- (id) initWithThreadNumber: (NSInteger) threadNumber
-                stackFrames: (NSArray *) stackFrames
-                    crashed: (BOOL) crashed
-                  registers: (NSArray *) registers;
-
-/**
- * Application thread number.
- */
-@property(nonatomic, readonly) NSInteger threadNumber;
-
-/**
- * Thread backtrace. Provides an array of PLCrashReportStackFrameInfo instances.
- * The array is ordered, last callee to first.
- */
-@property(nonatomic, readonly) NSArray *stackFrames;
-
-/**
- * If this thread crashed, set to YES.
- */
-@property(nonatomic, readonly) BOOL crashed;
-
-/**
- * State of the general purpose and related registers, as a list of
- * PLCrashReportRegister instances. If this thead did not crash (crashed returns NO),
- * this list will be empty.
- */
-@property(nonatomic, readonly) NSArray *registers;
-
-@end
diff --git a/submodules/HockeySDK-iOS/Vendor/CrashReporter.framework/Versions/A/Headers/PLCrashReporter.h b/submodules/HockeySDK-iOS/Vendor/CrashReporter.framework/Versions/A/Headers/PLCrashReporter.h
deleted file mode 100644
index 68bf5a0f62..0000000000
--- a/submodules/HockeySDK-iOS/Vendor/CrashReporter.framework/Versions/A/Headers/PLCrashReporter.h
+++ /dev/null
@@ -1,138 +0,0 @@
-/*
- * Author: Landon Fuller <landonf@plausiblelabs.com>
- *
- * Copyright (c) 2008-2009 Plausible Labs Cooperative, Inc.
- * All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person
- * obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without
- * restriction, including without limitation the rights to use,
- * copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following
- * conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
- * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#import <Foundation/Foundation.h>
-#import <mach/mach.h>
-
-#import "PLCrashReporterConfig.h"
-
-@class PLCrashMachExceptionServer;
-@class PLCrashMachExceptionPortSet;
-
-/**
- * @ingroup functions
- *
- * Prototype of a callback function used to execute additional user code with signal information as provided
- * by PLCrashReporter. Called upon completion of crash handling, after the crash report has been written to disk.
- *
- * @param info The signal info.
- * @param uap The crash's threads context.
- * @param context The API client's supplied context value.
- *
- * @sa async_satefy
- * @ref async_safety
- * @sa PLCrashReporter::setPostCrashCallbacks:
- */
-typedef void (*PLCrashReporterPostCrashSignalCallback)(siginfo_t *info, ucontext_t *uap, void *context);
-
-/**
- * @ingroup types
- *
- * This structure contains callbacks supported by PLCrashReporter to allow the host application to perform
- * additional tasks prior to program termination after a crash has occured.
- *
- * @sa async_satefy
- * @ref async_safety
- */
-typedef struct PLCrashReporterCallbacks {
-    /** The version number of this structure. If not one of the defined version numbers for this type, the behavior
-     * is undefined. The current version of this structure is 0. */
-    uint16_t version;
-    
-    /** An arbitrary user-supplied context value. This value may be NULL. */
-    void *context;
-
-    /**
-     * The callback used to report caught signal information. In version 0 of this structure, all crashes will be
-     * reported via this function.
-     *
-     * @warning When using PLCrashReporterSignalHandlerTypeMach, the siginfo_t argument to this function will be derived
-     * from the Mach exception data, and may be incorrect, or may otherwise not match the expected data as provided via
-     * PLCrashReporterSignalHandlerTypeBSD. In addition, the provided ucontext_t value will be zero-initialized, and will
-     * not provide valid thread state.
-     *
-     * This callback will be deprecated in favor of a Mach-compatible replacement in a future release; support is maintained
-     * here to allow clients that rely on post-crash callbacks without thread state to make use of Mach exceptions.
-     */
-    PLCrashReporterPostCrashSignalCallback handleSignal;
-} PLCrashReporterCallbacks;
-
-@interface PLCrashReporter : NSObject {
-@private
-    /** Reporter configuration */
-    PLCrashReporterConfig *_config;
-
-    /** YES if the crash reporter has been enabled */
-    BOOL _enabled;
-    
-#if PLCRASH_FEATURE_MACH_EXCEPTIONS
-    /** The backing Mach exception server, if any. Nil if the reporter has not been enabled, or if
-     * the configured signal handler type is not PLCrashReporterSignalHandlerTypeMach. */
-    PLCrashMachExceptionServer *_machServer;
-    
-    /** Previously registered Mach exception ports, if any. */
-    PLCrashMachExceptionPortSet *_previousMachPorts;
-#endif /* PLCRASH_FEATURE_MACH_EXCEPTIONS */
-
-    /** Application identifier */
-    NSString *_applicationIdentifier;
-
-    /** Application version */
-    NSString *_applicationVersion;
-    
-    /** Application marketing version */
-    NSString *_applicationMarketingVersion;
-
-    /** Path to the crash reporter internal data directory */
-    NSString *_crashReportDirectory;
-}
-
-+ (PLCrashReporter *) sharedReporter;
-
-- (instancetype) initWithConfiguration: (PLCrashReporterConfig *) config;
-
-- (BOOL) hasPendingCrashReport;
-
-- (NSData *) loadPendingCrashReportData;
-- (NSData *) loadPendingCrashReportDataAndReturnError: (NSError **) outError;
-
-- (NSData *) generateLiveReportWithThread: (thread_t) thread;
-- (NSData *) generateLiveReportWithThread: (thread_t) thread error: (NSError **) outError;
-
-- (NSData *) generateLiveReport;
-- (NSData *) generateLiveReportAndReturnError: (NSError **) outError;
-
-- (BOOL) purgePendingCrashReport;
-- (BOOL) purgePendingCrashReportAndReturnError: (NSError **) outError;
-
-- (BOOL) enableCrashReporter;
-- (BOOL) enableCrashReporterAndReturnError: (NSError **) outError;
-
-- (void) setCrashCallbacks: (PLCrashReporterCallbacks *) callbacks;
-
-@end
diff --git a/submodules/HockeySDK-iOS/Vendor/CrashReporter.framework/Versions/A/Headers/PLCrashReporterConfig.h b/submodules/HockeySDK-iOS/Vendor/CrashReporter.framework/Versions/A/Headers/PLCrashReporterConfig.h
deleted file mode 100644
index 15c3a24b98..0000000000
--- a/submodules/HockeySDK-iOS/Vendor/CrashReporter.framework/Versions/A/Headers/PLCrashReporterConfig.h
+++ /dev/null
@@ -1,178 +0,0 @@
-/*
- * Author: Landon Fuller <landonf@plausible.coop>
- *
- * Copyright (c) 2013 Plausible Labs Cooperative, Inc.
- * All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person
- * obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without
- * restriction, including without limitation the rights to use,
- * copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following
- * conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
- * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#import <Foundation/Foundation.h>
-#import "PLCrashFeatureConfig.h"
-
-/**
- * @ingroup enums
- * Supported mechanisms for trapping and handling crashes.
- */
-typedef NS_ENUM(NSUInteger, PLCrashReporterSignalHandlerType) {
-    /**
-     * Trap fatal signals via a sigaction(2)-registered BSD signal handler.
-     *
-     * PLCrashReporter's signal handler will supersede previously registered handlers; existing
-     * handlers will not be called. This behavior may be modified in a future release, and should
-     * not be relied upon as a mechanism to prevent existing signal handlers from being called.
-     *
-     * There are some limitations to signal-based crash handling on Mac OS X and iOS; specifically:
-     *
-     * - On Mac OS X, stack overflows will only be handled on the thread on which
-     *   the crash reporter was initialized. This should generally be the main thread.
-     * - On iOS 6.0 and later, any stack overflows will not be handled due to sigaltstack() being
-     *   non-functional on the device. (see rdar://13002712 - SA_ONSTACK/sigaltstack() ignored on iOS).
-     * - Some exit paths in Apple's Libc will deregister a signal handler before firing SIGABRT, resulting
-     *   in the signal handler never being called (see rdar://14313497 - ___abort() disables SIGABRT signal
-     *   handlers prior to raising SIGABRT).  These __abort()-based checks are:
-     *     - Implemented for unsafe memcpy/strcpy/snprintf C functions.
-     *     - Only enabled when operating on a fixed-width target buffer (in which case the
-     *       compiler rewrites the function calls to the built-in variants, and provides the fixed-width length as an argument).
-     *     - Only trigger in the case that the source data exceeds the size of the fixed width target
-     *       buffer, and the maximum length argument either isn't supplied by the caller (eg, when using strcpy),
-     *       or a too-long argument is supplied (eg, strncpy with a length argument longer than the target buffer),
-     *       AND that argument can't be checked at compile-time.
-     */
-    PLCrashReporterSignalHandlerTypeBSD = 0,
-
-#if PLCRASH_FEATURE_MACH_EXCEPTIONS
-    /**
-     * Trap fatal signals via a Mach exception server.
-     *
-     * If any existing Mach exception server has been registered for the task, exceptions will be forwarded to that
-     * exception handler. Should the exceptions be handled by an existing handler, no report will be generated
-     * by PLCrashReporter.
-     *
-     * @par Mac OS X
-     *
-     * On Mac OS X, the Mach exception implementation is fully supported, using publicly available API -- note,
-     * however, that some kernel-internal constants, as well as architecture-specific trap information,
-     * may be required to fully interpret a Mach exception's root cause.
-     *
-     * @par iOS
-     *
-     * On iOS, the APIs required for a complete implementation are not fully public.
-     *
-     * The exposed surface of undocumented API usage is relatively low, and there has been strong user demand to
-     * implement Mach exception handling regardless of concerns over API visiblity. Given this, we've included
-     * Mach exception handling as an optional feature, with both build-time and runtime configuration
-     * to disable its inclusion or use, respectively.
-     *
-     * @par Debugger Incompatibility
-     *
-     * The Mach exception handler executes in-process, and will interfere with debuggers when they attempt to
-     * suspend all active threads (which will include the Mach exception handler). Mach-based handling
-     * should not be used when a debugger is attached.
-     *
-     * @par More Details
-     *
-     * For more information, refer to @ref mach_exceptions.
-     */
-    PLCrashReporterSignalHandlerTypeMach = 1
-#endif /* PLCRASH_FEATURE_MACH_EXCEPTIONS */
-};
-
-/**
- * @ingroup enums
- * Supported mechanisms for performing local symbolication.
- *
- * Local symbolication is performed using inexact heuristics and symbol data available at runtime; it may
- * return information that is incorrect. This may still be useful in the case where DWARF data is unavailable
- * for a given build; in that case, it can provide function and method names (though not line numbers) for a
- * crash report that may otherwise be unusable.
- *
- * Note, however, this comes at the cost of a significant increase in code that must run within the critical
- * crash reporting section, where failures may result in crash reports being corrupted or left unwritten. In
- * addition, some of the provided symbolication strategies rely on knowledge of runtime internals that may
- * change in future iOS releases. Given that DWARF symbolication data will <em>always</em> be more accurate, and
- * the risks inherent in executing considerably more code at crash time, it is strongly recommended that local
- * symbolication only be enabled for non-release builds.
- *
- * Multiple symbolication strategies may be enabled, in which case a best-match heuristic will be applied to the
- * results.
- */
-typedef NS_OPTIONS(NSUInteger, PLCrashReporterSymbolicationStrategy) {
-    /** No symbolication. */
-    PLCrashReporterSymbolicationStrategyNone = 0,
-
-    /**
-     * Use the standard binary symbol table. On iOS, this alone will return
-     * incomplete results, as most symbols are rewritten to the common '\<redacted>' string.
-     */
-    PLCrashReporterSymbolicationStrategySymbolTable = 1 << 0,
-
-    /**
-     * Use Objective-C metadata to find method and class names. This relies on detailed parsing
-     * of the Objective-C runtime data, including undefined flags and other runtime internals. As such,
-     * it may return incorrect data should the runtime be changed incompatibly.
-     */
-    PLCrashReporterSymbolicationStrategyObjC = 1 << 1,
-    
-    /**
-     * Enable all available symbolication strategies.
-     */
-    PLCrashReporterSymbolicationStrategyAll = (PLCrashReporterSymbolicationStrategySymbolTable|PLCrashReporterSymbolicationStrategyObjC)
-};
-
-@interface PLCrashReporterConfig : NSObject {
-@private
-    /** The configured signal handler type. */
-    PLCrashReporterSignalHandlerType _signalHandlerType;
-    
-    /** The configured symbolication strategy. */
-    PLCrashReporterSymbolicationStrategy _symbolicationStrategy;
-  
-   /**
-    * Flag indicating if the uncaughtExceptionHandler should be initialized or not. It usually is, except in a
-    * Xamarin environment.
-    */
-  BOOL _shouldRegisterUncaughtExceptionHandler;
-}
-
-+ (instancetype) defaultConfiguration;
-
-- (instancetype) init;
-- (instancetype) initWithSignalHandlerType: (PLCrashReporterSignalHandlerType) signalHandlerType
-                     symbolicationStrategy: (PLCrashReporterSymbolicationStrategy) symbolicationStrategy;
-
-- (instancetype) initWithSignalHandlerType: (PLCrashReporterSignalHandlerType) signalHandlerType
-                     symbolicationStrategy: (PLCrashReporterSymbolicationStrategy) symbolicationStrategy
-               shouldRegisterUncaughtExceptionHandler: (BOOL) shouldRegisterUncaughtExceptionHandler;
-
-
-/** The configured signal handler type. */
-@property(nonatomic, readonly) PLCrashReporterSignalHandlerType signalHandlerType;
-
-/** The configured symbolication strategy. */
-@property(nonatomic, readonly) PLCrashReporterSymbolicationStrategy symbolicationStrategy;
-
-/** Should PLCrashReporter regiser an uncaught exception handler? This is entended to be used in Xamarin apps */
-@property(nonatomic, readonly) BOOL shouldRegisterUncaughtExceptionHandler;
-
-@end
-
diff --git a/submodules/HockeySDK-iOS/Vendor/CrashReporter.framework/Versions/A/Resources/Info.plist b/submodules/HockeySDK-iOS/Vendor/CrashReporter.framework/Versions/A/Resources/Info.plist
deleted file mode 100644
index a96c0fd6de..0000000000
--- a/submodules/HockeySDK-iOS/Vendor/CrashReporter.framework/Versions/A/Resources/Info.plist
+++ /dev/null
@@ -1,42 +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>BuildMachineOSBuild</key>
-	<string>16G29</string>
-	<key>CFBundleDevelopmentRegion</key>
-	<string>English</string>
-	<key>CFBundleExecutable</key>
-	<string>CrashReporter</string>
-	<key>CFBundleIdentifier</key>
-	<string>coop.plausible.CrashReporter</string>
-	<key>CFBundleInfoDictionaryVersion</key>
-	<string>6.0</string>
-	<key>CFBundleName</key>
-	<string>CrashReporter</string>
-	<key>CFBundlePackageType</key>
-	<string>FMWK</string>
-	<key>CFBundleSignature</key>
-	<string>????</string>
-	<key>CFBundleSupportedPlatforms</key>
-	<array>
-		<string>MacOSX</string>
-	</array>
-	<key>CFBundleVersion</key>
-	<string>1.0</string>
-	<key>DTCompiler</key>
-	<string>com.apple.compilers.llvm.clang.1_0</string>
-	<key>DTPlatformBuild</key>
-	<string>8E3004b</string>
-	<key>DTPlatformVersion</key>
-	<string>GM</string>
-	<key>DTSDKBuild</key>
-	<string>16E185</string>
-	<key>DTSDKName</key>
-	<string>macosx10.12</string>
-	<key>DTXcode</key>
-	<string>0833</string>
-	<key>DTXcodeBuild</key>
-	<string>8E3004b</string>
-</dict>
-</plist>
diff --git a/submodules/HockeySDK-iOS/Vendor/CrashReporter.framework/Versions/Current b/submodules/HockeySDK-iOS/Vendor/CrashReporter.framework/Versions/Current
deleted file mode 120000
index 8c7e5a667f..0000000000
--- a/submodules/HockeySDK-iOS/Vendor/CrashReporter.framework/Versions/Current
+++ /dev/null
@@ -1 +0,0 @@
-A
\ No newline at end of file
diff --git a/submodules/HockeySDK-iOS/Vendor/include/CrashReporter.h b/submodules/HockeySDK-iOS/Vendor/include/CrashReporter.h
deleted file mode 100644
index c654319112..0000000000
--- a/submodules/HockeySDK-iOS/Vendor/include/CrashReporter.h
+++ /dev/null
@@ -1,363 +0,0 @@
-/*
- * Author: Landon Fuller <landonf@plausiblelabs.com>
- *
- * Copyright (c) 2008-2009 Plausible Labs Cooperative, Inc.
- * All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person
- * obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without
- * restriction, including without limitation the rights to use,
- * copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following
- * conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
- * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#import <Foundation/Foundation.h>
-
-#ifdef __APPLE__
-#import <AvailabilityMacros.h>
-#endif
-
-// This must be included before any other PLCrashReporter includes, as
-// it redefines symbol names
-#import "PLCrashNamespace.h"
-
-#import "PLCrashReporter.h"
-#import "PLCrashReport.h"
-#import "PLCrashReportTextFormatter.h"
-
-/**
- * @defgroup functions Crash Reporter Functions Reference
- */
-
-/**
- * @defgroup types Crash Reporter Data Types Reference
- */
-
-/**
- * @defgroup constants Crash Reporter Constants Reference
- */
-
-/**
- * @internal
- * @defgroup plcrash_internal Crash Reporter Internal Documentation
- */
-
-/**
- * @defgroup enums Enumerations
- * @ingroup constants
- */
-
-/**
- * @defgroup globals Global Variables
- * @ingroup constants
- */
-
-/**
- * @defgroup exceptions Exceptions
- * @ingroup constants
- */
-
-/* Exceptions */
-extern NSString *PLCrashReporterException;
-
-/* Error Domain and Codes */
-extern NSString *PLCrashReporterErrorDomain;
-
-/**
- * NSError codes in the Plausible Crash Reporter error domain.
- * @ingroup enums
- */
-typedef enum {
-    /** An unknown error has occured. If this
-     * code is received, it is a bug, and should be reported. */
-    PLCrashReporterErrorUnknown = 0,
-    
-    /** An Mach or POSIX operating system error has occured. The underlying NSError cause may be fetched from the userInfo
-     * dictionary using the NSUnderlyingErrorKey key. */
-    PLCrashReporterErrorOperatingSystem = 1,
-
-    /** The crash report log file is corrupt or invalid */
-    PLCrashReporterErrorCrashReportInvalid = 2,
-
-    /** An attempt to use a resource which was in use at the time in a manner which would have conflicted with the request. */
-    PLCrashReporterErrorResourceBusy = 3
-} PLCrashReporterError;
-
-
-/* Library Imports */
-#import "PLCrashReporter.h"
-#import "PLCrashReport.h"
-#import "PLCrashReportTextFormatter.h"
-
-/**
- * @mainpage Plausible Crash Reporter
- *
- * @section intro_sec Introduction
- *
- * Plausile CrashReporter implements in-process crash reporting on the iPhone and Mac OS X.
- *
- * The following features are supported:
- *
- * - Implemented as an in-process signal handler.
- * - Does not interfer with debugging in gdb..
- * - Handles both uncaught Objective-C exceptions and fatal signals (SIGSEGV, SIGBUS, etc).
- * - Full thread state for all active threads (backtraces, register dumps) is provided.
- *
- * If your application crashes, a crash report will be written. When the application is next run, you may check for a
- * pending crash report, and submit the report to your own HTTP server, send an e-mail, or even introspect the
- * report locally.
- *
- * @section intro_encoding Crash Report Format
- *
- * Crash logs are encoded using <a href="http://code.google.com/p/protobuf/">google protobuf</a>, and may be decoded
- * using the provided PLCrashReport API. Additionally, the include plcrashutil handles conversion of binary crash reports to the 
- * symbolicate-compatible iPhone text format.
- *
- * @section doc_sections Documentation Sections
- * - @subpage example_usage_iphone
- * - @subpage error_handling
- * - @subpage async_safety
- */
-
-/**
- * @page example_usage_iphone Example iPhone Usage
- *
- * @code
- * //
- * // Called to handle a pending crash report.
- * //
- * - (void) handleCrashReport {
- *     PLCrashReporter *crashReporter = [PLCrashReporter sharedReporter];
- *     NSData *crashData;
- *     NSError *error;
- *     
- *     // Try loading the crash report
- *     crashData = [crashReporter loadPendingCrashReportDataAndReturnError: &error];
- *     if (crashData == nil) {
- *         NSLog(@"Could not load crash report: %@", error);
- *         goto finish;
- *     }
- *     
- *     // We could send the report from here, but we'll just print out
- *     // some debugging info instead
- *     PLCrashReport *report = [[[PLCrashReport alloc] initWithData: crashData error: &error] autorelease];
- *     if (report == nil) {
- *         NSLog(@"Could not parse crash report");
- *         goto finish;
- *     }
- *     
- *     NSLog(@"Crashed on %@", report.systemInfo.timestamp);
- *     NSLog(@"Crashed with signal %@ (code %@, address=0x%" PRIx64 ")", report.signalInfo.name,
- *           report.signalInfo.code, report.signalInfo.address);
- *     
- *     // Purge the report
- * finish:
- *     [crashReporter purgePendingCrashReport];
- *     return;
- * }
- * 
- * // from UIApplicationDelegate protocol
- * - (void) applicationDidFinishLaunching: (UIApplication *) application {
- *     PLCrashReporter *crashReporter = [PLCrashReporter sharedReporter];
- *     NSError *error;
- *     
- *     // Check if we previously crashed
- *     if ([crashReporter hasPendingCrashReport])
- *         [self handleCrashReport];
-    
- *     // Enable the Crash Reporter
- *     if (![crashReporter enableCrashReporterAndReturnError: &error])
- *         NSLog(@"Warning: Could not enable crash reporter: %@", error);
- *         
- * }
- * @endcode
- * 
- */
-
-/**
- * @page error_handling Error Handling Programming Guide
- *
- * Where a method may return an error, Plausible Crash Reporter provides access to the underlying
- * cause via an optional NSError argument.
- *
- * All returned errors will be a member of one of the below defined domains, however, new domains and
- * error codes may be added at any time. If you do not wish to report on the error cause, many methods
- * support a simple form that requires no NSError argument.
- *
- * @section error_domains Error Domains, Codes, and User Info
- *
- * @subsection crashreporter_errors Crash Reporter Errors
- *
- * Any errors in Plausible Crash Reporter use the #PLCrashReporterErrorDomain error domain, and and one
- * of the error codes defined in #PLCrashReporterError.
- */
-
-/**
- * @page async_safety Async-Safe Programming Guide
- *
- * Plausible CrashReporter provides support for executing an application specified function in the context of the
- * crash reporter's signal handler, after the crash report has been written to disk. This was a regularly requested
- * feature, and provides the ability to implement application finalization in the event of a crash. However, writing
- * code intended for execution inside of a signal handler is exceptionally difficult, and is not recommended.
- *
- * @section program_flow Program Flow and Signal Handlers
- *
- * When the signal handler is called the normal flow of the program is interrupted, and your program is an unknown
- * state. Locks may be held, the heap may be corrupt (or in the process of being updated), and your signal
- * handler may invoke a function that was being executed at the time of the signal. This may result in deadlocks,
- * data corruption, and program termination.
- *
- * @section functions Async-Safe Functions
- *
- * A subset of functions are defined to be async-safe by the OS, and are safely callable from within a signal handler. If
- * you do implement a custom post-crash handler, it must be async-safe. A table of POSIX-defined async-safe functions
- * and additional information is available from the
- * <a href="https://www.securecoding.cert.org/confluence/display/seccode/SIG30-C.+Call+only+asynchronous-safe+functions+within+signal+handlers">CERT programming guide - SIG30-C</a>
- *
- * Most notably, the Objective-C runtime itself is not async-safe, and Objective-C may not be used within a signal
- * handler.
- *
- * @sa PLCrashReporter::setCrashCallbacks:
- */
-
-/**
- * @page mach_exceptions Mach Exceptions on Mac OS X and iOS
- *
- * PLCrashReporter includes support for monitoring crashes via an in-process Mach exception handler. There are a small
- * number of crash cases that will not be caught with via a POSIX signal handler, but can be caught via a Mach
- * exception handler:
- *
- * - Stack overflow. sigaltstack() is broken in later iOS releases, and even if functional, must be configured
- *   on a per-thread basis.
- * - Internal Apple assertions that call libSystem's __assert. These include compiler-checked constraints
- *   for built-in functions, such as strcpy_chk(). The __abort() implementation actually disables the SIGABRT
- *   signal handler (resetting it to SIG_DFL) prior to to issueing a SIGABRT, bypassing signal-based crash
- *   reporters entirely.
- *
- * Unfortunately, the latter issue (__assert) can not be handled on iOS; trapping abort requires that
- * a Mach exception handler operate out-of-process, which is impossible on iOS. On Mac OS X, this will
- * only be handled once we've implemented fully out-of-process crash excution.
- *
- * On Mac OS X, the Mach exception implementation is fully supported using entirely public API. On iOS,
- * the APIs required are not fully public -- more details on the implications of this for exception handling on
- * iOS may be found in @ref mach_exceptions_ios below. It is worth noting that even where the Mach exception APIs
- * are fully supported, kernel-internal constants, as well
- * as architecture-specific trap information, may be required to fully interpret a Mach exception's root cause.
- *
- * For example, the EXC_SOFTWARE exception is dispatched for four different failure types, using the exception
- * code to differentiate failure types:
- *   - Non-existent system call invoked (SIGSYS)
- *   - Write on a pipe with no reader (SIGPIPE)
- *   - Abort program (SIGABRT -- unused)
- *   - Kill program (SIGKILL)
- *
- * Of those four types, only the constant required to interpret the SIGKILL behavior (EXC_SOFT_SIGNAL) is publicly defined.
- * Of the remaining three failure types, the constant values are kernel implementation-private, defined only in the available
- * kernel sources. On iOS, these sources are unavailable, and while they generally do match the Mac OS X implementation, there
- * are no gaurantees that this is -- or will remain -- the case in the future.
- *
- * Likewise, interpretation of particular fault types requires information regarding the underlying machine traps
- * that triggered the Mach exceptions. For example, a floating point trap on x86/x86-64 will trigger an EXC_ARITHMETIC,
- * with a subcode value containing the value of the FPU status register. Determining the exact FPU cause requires
- * extracting the actual exception flags from status register as per the x86 architecture documentation. The exact format
- * of this subcode value is not actually documented outside the kernel, and may change in future releases.
- *
- * While we have the advantage of access to the x86 kernel sources, the situation on ARM is even less clear. The actual
- * use of the Mach exception codes and subcodes is largely undefined by both headers and publicly available documentation,
- * and the available x86 kernel sources are of little use in interpreting this data.
- *
- * As such, while Mach exceptions may catch some cases that BSD signals can not, they are not a perfect solution,
- * and may also provide less insight into the actual failures that occur. By comparison, the BSD signal interface
- * is both fully defined and architecture independent, with any necessary interpretation of the Mach exception
- * codes handled in-kernel at the time of exception dispatch. It is generally recommended by Apple as the preferred
- * interface, and should generally be preferred by PLCrashReporter API clients.
- *
- * @section mach_exceptions_compatibility Compatibility Issues
- *
- * @subsection Debuggers
- *
- * Enabling in-process Mach exception handlers will conflict with any attached debuggers; the debugger
- * may suspend the processes Mach exception handling thread, which will result in any exception messages
- * sent via the debugger being lost, as the in-process handler will be unable to receive and forward
- * the messages.
- *
- * @subsection Managed Runtimes (Xamarin, Unity)
- *
- * A Mach exception handler may conflict with any managed runtime that registers a BSD signal handler that
- * can safely handle otherwise fatal signals, allowing execution to proceed. This includes products
- * such as Xamarin for iOS.
- *
- * In such a case, PLCrashReporter will write a crash report for non-fatal signals, as there is no
- * immediate mechanism for determining whether a signal handler exists and that it can safely
- * handle the failure. This can result in unexpected delays in application execution, increased I/O to
- * disk, and other undesirable operations.
- *
- * @section mach_exceptions_ios Mach Exceptions on iOS
- *
- * The APIs required for Mach exception handling are not fully public on iOS. After filing a request with
- * Apple DTS to clarify the status of the Mach exception APIs on iOS, and implementing a Mach Exception
- * handler using only supported API, they provided the following guidance:
- *
- *    <em>Our engineers have reviewed your request and have determined that this would be best handled as a bug report,
- *    which you have already filed. There is no documented way of accomplishing this, nor is there a workaround
- *    possible.</em>
- *
- * Due to user request, PLCrashReporter provides an optional implementation of Mach exception handling for both
- * iOS and Mac OS X.
- *
- * This implementation uses only supported API on Mac OS X, and depends on limited undefined API on iOS. The reporter
- * may be excluded entirely at build time by modifying the PLCRASH_FEATURE_MACH_EXCEPTIONS build configuration; it
- * may also be disabled at runtime by configuring the PLCrashReporter instance appropriately via PLCrashReporterConfig.
- *
- * The iOS implementation is implemented almost entirely using public API, and links against no actual private symbols;
- * the use of undocumented functionality is limited to assuming the use of specific msgh_id values (see below
- * for details). As a result, it may be considered perfectly safe to include the Mach Exception code in the
- * standard build, and enable/disable it at runtime.
- *
- * The following issues exist in the iOS implementation:
- *  - The msgh_id values required for an exception reply message are not available from the available
- *    headers and must be hard-coded. This prevents one from safely replying to exception messages, which
- *    means that it is impossible to (correctly) inform the server that an exception has *not* been
- *    handled.
- *
- *    Impact:
- *      This can lead to the process locking up and not dispatching to the host exception handler (eg, Apple's
- *      crash reporter), depending on the behavior of the kernel exception code.
- *
- *  - The mach_* structure/type variants required by MACH_EXCEPTION_CODES are not publicly defined (on Mac OS X,
- *    these are provided by mach_exc.defs). This prevents one from forwarding exception messages to an existing
- *    handler that was registered with a MACH_EXCEPTION_CODES behavior (eg, forwarding is entirely non-functional
- *    on ARM64 devices).
- *
- *    Impact:
- *      This can break forwarding to any task exception handler that registers itself with MACH_EXCEPTION_CODES,
- *      including other handlers registered within the current process, eg, by a managed runtime. This could
- *      also result in misinterpretation of a Mach exception message, in the case where the message format is
- *      modified by Apple to be incompatible with the existing 32-bit format.
- *
- *      This is the case with LLDB; it will register a task exception handler with MACH_EXCEPTION_CODES set. Failure
- *      to correctly forward these exceptions will result in the debugger breaking in interesting ways; for example,
- *      changes to the set of dyld-loaded images are detected by setting a breakpoint on the dyld image registration
- *      funtions, and this functionality will break if the exception is not correctly forwarded.
- *
- * Since Mach exception handling is important for a fully functional crash reporter, we have also filed a radar
- * to request that the API be made public:
- *  Radar: rdar://12939497 RFE: Provide mach_exc.defs for iOS
- *
- * At the time of this writing, the radar remains open/unresolved.
- */
diff --git a/submodules/HockeySDK-iOS/Vendor/include/PLCrashAsyncSignalInfo.h b/submodules/HockeySDK-iOS/Vendor/include/PLCrashAsyncSignalInfo.h
deleted file mode 100644
index 15f12a831b..0000000000
--- a/submodules/HockeySDK-iOS/Vendor/include/PLCrashAsyncSignalInfo.h
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Author: Landon Fuller <landonf@plausiblelabs.com>
- *
- * Copyright (c) 2008-2009 Plausible Labs Cooperative, Inc.
- * All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person
- * obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without
- * restriction, including without limitation the rights to use,
- * copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following
- * conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
- * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#ifndef PLCRASH_ASYNC_SIGNAL_INFO_H
-#define PLCRASH_ASYNC_SIGNAL_INFO_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/**
- * @internal
- *
- * @defgroup plcrash_async_signal_info Signal Information
- * @ingroup plcrash_async
- *
- * Provides mapping of signal number and code to strings.
- *
- * @{
- */
-
-const char *plcrash_async_signal_signame (int signal);
-const char *plcrash_async_signal_sigcode (int signal, int si_code);
-
-/**
- * @} plcrash_async_signal_info
- */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* PLCRASH_ASYNC_SIGNAL_INFO_H */
diff --git a/submodules/HockeySDK-iOS/Vendor/include/PLCrashFeatureConfig.h b/submodules/HockeySDK-iOS/Vendor/include/PLCrashFeatureConfig.h
deleted file mode 100644
index 58351108d4..0000000000
--- a/submodules/HockeySDK-iOS/Vendor/include/PLCrashFeatureConfig.h
+++ /dev/null
@@ -1,108 +0,0 @@
-/*
- * Author: Landon Fuller <landonf@plausible.coop>
- *
- * Copyright (c) 2012-2013 Plausible Labs Cooperative, Inc.
- * All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person
- * obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without
- * restriction, including without limitation the rights to use,
- * copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following
- * conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
- * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#ifndef PLCRASH_FEATURE_CONFIG_H
-#define PLCRASH_FEATURE_CONFIG_H
-
-#include <TargetConditionals.h>
-
-/**
- * @internal
- *
- * Build-time configuration for PLCrashReporter.
- *
- * This is used to automatically enable/disable features on a per-platform and per-configuration
- * basis; it may also be used by third-party vendors to configure a custom build of PLCrashReporter.
- *
- * @defgroup build_config Build Configuration
- * @ingroup constants
- * @{
- */
-
-/*
- * Defaults
- */
-
-/*
- * For release builds, disable unused unwind implementations on targets that do not use them. For non-release
- * builds, we include the unwind implementations to allow testing on a broader range of targets.
- */
-#ifdef PLCF_RELEASE_BUILD
-#  if defined(__arm__)
-#    ifndef PLCRASH_FEATURE_UNWIND_DWARF
-#      define PLCRASH_FEATURE_UNWIND_DWARF 0
-#    endif
-#    ifndef PLCRASH_FEATURE_UNWIND_COMPACT
-#      define PLCRASH_FEATURE_UNWIND_COMPACT 0
-#    endif
-#  endif
-#endif
-
-/*
- * Configuration Flags
- */
-
-
-#ifndef PLCRASH_FEATURE_MACH_EXCEPTIONS
-/**
- * If true, enable Mach exception support. On Mac OS X, the Mach exception implementation is fully supported,
- * using publicly available API. On iOS, the APIs required for a complete implementation are not public. However, a
- * popular commercial crash reporter is now shipping with support for Mach exceptions, which implies that either
- * they've received special dispensation to use private APIs / private structures, they've found another way to do
- * it, or they're just using undocumented functionality and hoping for the best.
- *
- * The exposed surface of undocumented API usage is relatively low, and there has been strong user demand to
- * implement Mach exception handling regardless of concerns over API visiblity. Given this, we've enabled
- * Mach exception handling by default, and provided both build-time and runtime configuration
- * to disable its use.
- *
- * For more information on the potential issues with enabling mach exception support, @sa @ref mach_exceptions.
- */
-#if TARGET_OS_TV
-#    define PLCRASH_FEATURE_MACH_EXCEPTIONS 0
-#else
-#    define PLCRASH_FEATURE_MACH_EXCEPTIONS 1
-#endif
-#endif
-
-#ifndef PLCRASH_FEATURE_UNWIND_DWARF
-/** If true, enable DWARF unwinding support. */
-#    define PLCRASH_FEATURE_UNWIND_DWARF 1
-#endif
-
-
-#ifndef PLCRASH_FEATURE_UNWIND_COMPACT
-/** If true, enable compact unwinding support. */
-#    define PLCRASH_FEATURE_UNWIND_COMPACT 1
-#endif
-
-/**
- * @}
- */
-
-#endif /* PLCRASH_FEATURE_CONFIG_H */
diff --git a/submodules/HockeySDK-iOS/Vendor/include/PLCrashMacros.h b/submodules/HockeySDK-iOS/Vendor/include/PLCrashMacros.h
deleted file mode 100644
index 6629bc4683..0000000000
--- a/submodules/HockeySDK-iOS/Vendor/include/PLCrashMacros.h
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
- * Author: Landon Fuller <landonf@plausiblelabs.com>
- *
- * Copyright (c) 2013 Plausible Labs Cooperative, Inc.
- * All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person
- * obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without
- * restriction, including without limitation the rights to use,
- * copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following
- * conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
- * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#ifndef PLCRASH_CONSTANTS_H
-#define PLCRASH_CONSTANTS_H
-
-#include <assert.h>
-
-#if defined(__cplusplus)
-#   define PLCR_EXPORT extern "C"
-#   define PLCR_C_BEGIN_DECLS extern "C" {
-#   define PLCR_C_END_DECLS }
-#else
-#   define PLCR_EXPORT extern
-#   define PLCR_C_BEGIN_DECLS
-#   define PLCR_C_END_DECLS
-#endif
-
-#if defined(__cplusplus)
-#  if defined(PLCRASHREPORTER_PREFIX)
-     /** @internal Define the plcrash namespace, automatically inserting an inline namespace containing the configured PLCRASHREPORTER_PREFIX, if any. */
-#    define PLCR_CPP_BEGIN_NS namespace plcrash { inline namespace PLCRASHREPORTER_PREFIX {
-
-    /** @internal Close the definition of the `plcrash` namespace (and the PLCRASHREPORTER_PREFIX inline namespace, if any). */
-#    define PLCR_CPP_END_NS }}
-#  else
-#   define PLCR_CPP_BEGIN_NS namespace plcrash {
-#   define PLCR_CPP_END_NS }
-#  endif
-#endif
-
-#ifdef __clang__
-#  define PLCR_PRAGMA_CLANG(_p) _Pragma(_p)
-#else
-#  define PLCR_PRAGMA_CLANG(_p)
-#endif
-
-#if defined(__clang__) || defined(__GNUC__)
-#  define PLCR_UNUSED __attribute__((unused))
-#else
-#  define PLCR_UNUSED
-#endif
-
-#ifdef PLCR_PRIVATE
-/**
- * @internal
- * Static compile-time assertion.
- *
- * @param name The assertion name; must be valid for use within a C identifier.
- * @param cond Assertion condition
- */
-#  define PLCR_ASSERT_STATIC(name, cond) PLCR_ASSERT_STATIC_(name, cond, __LINE__)
-/*
- * C++11 and C11 both provide a static_assert().
- *
- * Otherwise, we have to use typedef-based static assertions.
- */
-#  if (defined(__cplusplus) && __cplusplus >= 201103L) || (!defined(__cplusplus) && defined(__STDC_VERSION__) && __STDC_VERSION__ >= 201112L)
-#    define PLCR_ASSERT_STATIC_(name, cond, line) PLCR_ASSERT_STATIC__(#name, cond)
-#    define PLCR_ASSERT_STATIC__(name, cond) static_assert(cond, #name)
-#  else
-#    define PLCR_ASSERT_STATIC_(name, cond, line) PLCR_ASSERT_STATIC__(name, cond, line)
-#    define PLCR_ASSERT_STATIC__(name, cond, line) typedef int plcf_static_assert_##name##_##line [(cond) ? 1 : -1] PLCR_UNUSED
-#  endif
-#endif /* PLCR_PRIVATE */
-
-#endif /* PLCRASH_CONSTANTS_H */
diff --git a/submodules/HockeySDK-iOS/Vendor/include/PLCrashNamespace.h b/submodules/HockeySDK-iOS/Vendor/include/PLCrashNamespace.h
deleted file mode 100644
index dba0200e5c..0000000000
--- a/submodules/HockeySDK-iOS/Vendor/include/PLCrashNamespace.h
+++ /dev/null
@@ -1,314 +0,0 @@
-/*
- * Author: Landon Fuller <landonf@plausible.coop>
- *
- * Copyright (c) 2012-2013 Plausible Labs Cooperative, Inc.
- * All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person
- * obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without
- * restriction, including without limitation the rights to use,
- * copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following
- * conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
- * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
- */
-
-/*
- * For external library integrators:
- *
- * Set this value to any valid C symbol prefix. This will automatically
- * prepend the given prefix to all external symbols in the library.
- *
- * This may be used to avoid symbol conflicts between multiple libraries
- * that may both incorporate PLCrashReporter.
- */
-#define PLCRASHREPORTER_PREFIX BIT
-
-
-// We need two extra layers of indirection to make CPP substitute
-// the PLCRASHREPORTER_PREFIX define.
-#define PLNS_impl2(prefix, symbol) prefix ## symbol
-#define PLNS_impl(prefix, symbol) PLNS_impl2(prefix, symbol)
-#define PLNS(symbol) PLNS_impl(PLCRASHREPORTER_PREFIX, symbol)
-
-
-/*
- * Rewrite all ObjC/C symbols.
- *
- * For C++ symbol handling, refer to the PLCR_CPP_BEGIN_NS and PLCR_CPP_END_NS
- * macros.
- */
-#ifdef PLCRASHREPORTER_PREFIX
-
-/* Objective-C Classes */
-#define PLCrashMachExceptionServer          PLNS(PLCrashMachExceptionServer)
-#define PLCrashReport                       PLNS(PLCrashReport)
-#define PLCrashReportApplicationInfo        PLNS(PLCrashReportApplicationInfo)
-#define PLCrashReportBinaryImageInfo        PLNS(PLCrashReportBinaryImageInfo)
-#define PLCrashReportExceptionInfo          PLNS(PLCrashReportExceptionInfo)
-#define PLCrashReportMachExceptionInfo      PLNS(PLCrashReportMachExceptionInfo)
-#define PLCrashReportMachineInfo            PLNS(PLCrashReportMachineInfo)
-#define PLCrashReportProcessInfo            PLNS(PLCrashReportProcessInfo)
-#define PLCrashReportProcessorInfo          PLNS(PLCrashReportProcessorInfo)
-#define PLCrashReportRegisterInfo           PLNS(PLCrashReportRegisterInfo)
-#define PLCrashReportSignalInfo             PLNS(PLCrashReportSignalInfo)
-#define PLCrashReportStackFrameInfo         PLNS(PLCrashReportStackFrameInfo)
-#define PLCrashReportSymbolInfo             PLNS(PLCrashReportSymbolInfo)
-#define PLCrashReportSystemInfo             PLNS(PLCrashReportSystemInfo)
-#define PLCrashReportTextFormatter          PLNS(PLCrashReportTextFormatter)
-#define PLCrashReportThreadInfo             PLNS(PLCrashReportThreadInfo)
-#define PLCrashReporter                     PLNS(PLCrashReporter)
-#define PLCrashSignalHandler                PLNS(PLCrashSignalHandler)
-#define PLCrashHostInfo                     PLNS(PLCrashHostInfo)
-#define PLCrashMachExceptionPort            PLNS(PLCrashMachExceptionPort)
-#define PLCrashMachExceptionPortSet         PLNS(PLCrashMachExceptionPortSet)
-#define PLCrashProcessInfo                  PLNS(PLCrashProcessInfo)
-#define PLCrashReporterConfig               PLNS(PLCrashReporterConfig)
-#define PLCrashUncaughtExceptionHandler     PLNS(PLCrashUncaughtExceptionHandler)
-#define PLCrashReportFormatter              PLNS(PLCrashReportFormatter)
-
-/* Public C functions */
-#define PLCrashMachExceptionForward         PLNS(PLCrashMachExceptionForward)
-#define PLCrashSignalHandlerForward         PLNS(PLCrashSignalHandlerForward)
-#define plcrash_signal_handler              PLNS(plcrash_signal_handler)
-
-
-/* Public C global symbols */
-#define PLCrashReporterErrorDomain          PLNS(PLCrashReporterErrorDomain)
-#define PLCrashReportHostArchitecture       PLNS(PLCrashReportHostArchitecture)
-#define PLCrashReportHostOperatingSystem    PLNS(PLCrashReportHostOperatingSystem)
-#define PLCrashReporterException            PLNS(PLCrashReporterException)
-
-/* For backwards compatibility, plcrash_async_byteorder vends C++ methods when included under C++. We have
- * to handle this distinctly from our PLCR_CPP_BEGIN_NS C++ namespacing mechanism. */
-#define plcrash_async_byteorder             PLNS(plcrash_async_byteorder)
-
-/*
- * All private C symbols. Once these are migrated to C++, we'll be able to use the much simpler
- * PLCR_CPP_BEGIN_NS machinery.
- *
- * This list was automatically generated (and can be updated) by setting PLCRASHREPORTER_PREFIX to 'AcmeCo',
- * building the library, and executing the following:
- * nm -g -U <static library> | grep '^[0-9]' | c++filt | grep -v AcmeCo | grep -E '_pl|_PL' | awk '{print $3}' | cut -c 2- | sort | uniq | awk '{print "#define",$1,"PLNS("$1")"}'
- */
-#define PLCRASH_ASYNC_OBJC_ISA_NONPTR_CLASS_MASK PLNS(PLCRASH_ASYNC_OBJC_ISA_NONPTR_CLASS_MASK)
-#define pl_mach_thread_self PLNS(pl_mach_thread_self)
-#define plcrash__architecture__descriptor PLNS(plcrash__architecture__descriptor)
-#define plcrash__architecture__enum_values_by_name PLNS(plcrash__architecture__enum_values_by_name)
-#define plcrash__architecture__enum_values_by_number PLNS(plcrash__architecture__enum_values_by_number)
-#define plcrash__crash_report__application_info__descriptor PLNS(plcrash__crash_report__application_info__descriptor)
-#define plcrash__crash_report__binary_image__descriptor PLNS(plcrash__crash_report__binary_image__descriptor)
-#define plcrash__crash_report__descriptor PLNS(plcrash__crash_report__descriptor)
-#define plcrash__crash_report__exception__descriptor PLNS(plcrash__crash_report__exception__descriptor)
-#define plcrash__crash_report__free_unpacked PLNS(plcrash__crash_report__free_unpacked)
-#define plcrash__crash_report__get_packed_size PLNS(plcrash__crash_report__get_packed_size)
-#define plcrash__crash_report__init PLNS(plcrash__crash_report__init)
-#define plcrash__crash_report__machine_info__descriptor PLNS(plcrash__crash_report__machine_info__descriptor)
-#define plcrash__crash_report__pack PLNS(plcrash__crash_report__pack)
-#define plcrash__crash_report__pack_to_buffer PLNS(plcrash__crash_report__pack_to_buffer)
-#define plcrash__crash_report__process_info__descriptor PLNS(plcrash__crash_report__process_info__descriptor)
-#define plcrash__crash_report__processor__descriptor PLNS(plcrash__crash_report__processor__descriptor)
-#define plcrash__crash_report__processor__type_encoding__descriptor PLNS(plcrash__crash_report__processor__type_encoding__descriptor)
-#define plcrash__crash_report__processor__type_encoding__enum_values_by_name PLNS(plcrash__crash_report__processor__type_encoding__enum_values_by_name)
-#define plcrash__crash_report__processor__type_encoding__enum_values_by_number PLNS(plcrash__crash_report__processor__type_encoding__enum_values_by_number)
-#define plcrash__crash_report__report_info__descriptor PLNS(plcrash__crash_report__report_info__descriptor)
-#define plcrash__crash_report__signal__descriptor PLNS(plcrash__crash_report__signal__descriptor)
-#define plcrash__crash_report__signal__mach_exception__descriptor PLNS(plcrash__crash_report__signal__mach_exception__descriptor)
-#define plcrash__crash_report__symbol__descriptor PLNS(plcrash__crash_report__symbol__descriptor)
-#define plcrash__crash_report__system_info__descriptor PLNS(plcrash__crash_report__system_info__descriptor)
-#define plcrash__crash_report__system_info__operating_system__descriptor PLNS(plcrash__crash_report__system_info__operating_system__descriptor)
-#define plcrash__crash_report__system_info__operating_system__enum_values_by_name PLNS(plcrash__crash_report__system_info__operating_system__enum_values_by_name)
-#define plcrash__crash_report__system_info__operating_system__enum_values_by_number PLNS(plcrash__crash_report__system_info__operating_system__enum_values_by_number)
-#define plcrash__crash_report__thread__descriptor PLNS(plcrash__crash_report__thread__descriptor)
-#define plcrash__crash_report__thread__register_value__descriptor PLNS(plcrash__crash_report__thread__register_value__descriptor)
-#define plcrash__crash_report__thread__stack_frame__descriptor PLNS(plcrash__crash_report__thread__stack_frame__descriptor)
-#define plcrash__crash_report__unpack PLNS(plcrash__crash_report__unpack)
-#define plcrash_async_address_apply_offset PLNS(plcrash_async_address_apply_offset)
-#define plcrash_async_allocator_alloc PLNS(plcrash_async_allocator_alloc)
-#define plcrash_async_allocator_new PLNS(plcrash_async_allocator_new)
-#define plcrash_async_byteorder_big_endian PLNS(plcrash_async_byteorder_big_endian)
-#define plcrash_async_byteorder_direct PLNS(plcrash_async_byteorder_direct)
-#define plcrash_async_byteorder_little_endian PLNS(plcrash_async_byteorder_little_endian)
-#define plcrash_async_byteorder_swapped PLNS(plcrash_async_byteorder_swapped)
-#define plcrash_async_cfe_entry_apply PLNS(plcrash_async_cfe_entry_apply)
-#define plcrash_async_cfe_entry_free PLNS(plcrash_async_cfe_entry_free)
-#define plcrash_async_cfe_entry_init PLNS(plcrash_async_cfe_entry_init)
-#define plcrash_async_cfe_entry_register_count PLNS(plcrash_async_cfe_entry_register_count)
-#define plcrash_async_cfe_entry_register_list PLNS(plcrash_async_cfe_entry_register_list)
-#define plcrash_async_cfe_entry_return_address_register PLNS(plcrash_async_cfe_entry_return_address_register)
-#define plcrash_async_cfe_entry_stack_adjustment PLNS(plcrash_async_cfe_entry_stack_adjustment)
-#define plcrash_async_cfe_entry_stack_offset PLNS(plcrash_async_cfe_entry_stack_offset)
-#define plcrash_async_cfe_entry_type PLNS(plcrash_async_cfe_entry_type)
-#define plcrash_async_cfe_reader_find_pc PLNS(plcrash_async_cfe_reader_find_pc)
-#define plcrash_async_cfe_reader_free PLNS(plcrash_async_cfe_reader_free)
-#define plcrash_async_cfe_reader_init PLNS(plcrash_async_cfe_reader_init)
-#define plcrash_async_cfe_register_decode PLNS(plcrash_async_cfe_register_decode)
-#define plcrash_async_cfe_register_encode PLNS(plcrash_async_cfe_register_encode)
-#define plcrash_async_file_close PLNS(plcrash_async_file_close)
-#define plcrash_async_file_flush PLNS(plcrash_async_file_flush)
-#define plcrash_async_file_init PLNS(plcrash_async_file_init)
-#define plcrash_async_file_write PLNS(plcrash_async_file_write)
-#define plcrash_async_find_symbol PLNS(plcrash_async_find_symbol)
-#define plcrash_async_image_containing_address PLNS(plcrash_async_image_containing_address)
-#define plcrash_async_image_list_next PLNS(plcrash_async_image_list_next)
-#define plcrash_async_image_list_set_reading PLNS(plcrash_async_image_list_set_reading)
-#define plcrash_async_mach_exception_get_siginfo PLNS(plcrash_async_mach_exception_get_siginfo)
-#define plcrash_async_macho_byteorder PLNS(plcrash_async_macho_byteorder)
-#define plcrash_async_macho_contains_address PLNS(plcrash_async_macho_contains_address)
-#define plcrash_async_macho_cpu_subtype PLNS(plcrash_async_macho_cpu_subtype)
-#define plcrash_async_macho_cpu_type PLNS(plcrash_async_macho_cpu_type)
-#define plcrash_async_macho_find_command PLNS(plcrash_async_macho_find_command)
-#define plcrash_async_macho_find_segment_cmd PLNS(plcrash_async_macho_find_segment_cmd)
-#define plcrash_async_macho_find_symbol_by_name PLNS(plcrash_async_macho_find_symbol_by_name)
-#define plcrash_async_macho_find_symbol_by_pc PLNS(plcrash_async_macho_find_symbol_by_pc)
-#define plcrash_async_macho_header PLNS(plcrash_async_macho_header)
-#define plcrash_async_macho_header_size PLNS(plcrash_async_macho_header_size)
-#define plcrash_async_macho_map_section PLNS(plcrash_async_macho_map_section)
-#define plcrash_async_macho_map_segment PLNS(plcrash_async_macho_map_segment)
-#define plcrash_async_macho_mapped_segment_free PLNS(plcrash_async_macho_mapped_segment_free)
-#define plcrash_async_macho_next_command PLNS(plcrash_async_macho_next_command)
-#define plcrash_async_macho_next_command_type PLNS(plcrash_async_macho_next_command_type)
-#define plcrash_async_macho_string_free PLNS(plcrash_async_macho_string_free)
-#define plcrash_async_macho_string_get_length PLNS(plcrash_async_macho_string_get_length)
-#define plcrash_async_macho_string_get_pointer PLNS(plcrash_async_macho_string_get_pointer)
-#define plcrash_async_macho_string_init PLNS(plcrash_async_macho_string_init)
-#define plcrash_async_macho_symtab_reader_free PLNS(plcrash_async_macho_symtab_reader_free)
-#define plcrash_async_macho_symtab_reader_init PLNS(plcrash_async_macho_symtab_reader_init)
-#define plcrash_async_macho_symtab_reader_read PLNS(plcrash_async_macho_symtab_reader_read)
-#define plcrash_async_macho_symtab_reader_symbol_name PLNS(plcrash_async_macho_symtab_reader_symbol_name)
-#define plcrash_async_memcpy PLNS(plcrash_async_memcpy)
-#define plcrash_async_memset PLNS(plcrash_async_memset)
-#define plcrash_async_mobject_base_address PLNS(plcrash_async_mobject_base_address)
-#define plcrash_async_mobject_free PLNS(plcrash_async_mobject_free)
-#define plcrash_async_mobject_init PLNS(plcrash_async_mobject_init)
-#define plcrash_async_mobject_length PLNS(plcrash_async_mobject_length)
-#define plcrash_async_mobject_read_uint16 PLNS(plcrash_async_mobject_read_uint16)
-#define plcrash_async_mobject_read_uint32 PLNS(plcrash_async_mobject_read_uint32)
-#define plcrash_async_mobject_read_uint64 PLNS(plcrash_async_mobject_read_uint64)
-#define plcrash_async_mobject_read_uint8 PLNS(plcrash_async_mobject_read_uint8)
-#define plcrash_async_mobject_remap_address PLNS(plcrash_async_mobject_remap_address)
-#define plcrash_async_mobject_task PLNS(plcrash_async_mobject_task)
-#define plcrash_async_mobject_verify_local_pointer PLNS(plcrash_async_mobject_verify_local_pointer)
-#define plcrash_async_objc_cache_free PLNS(plcrash_async_objc_cache_free)
-#define plcrash_async_objc_cache_init PLNS(plcrash_async_objc_cache_init)
-#define plcrash_async_objc_find_method PLNS(plcrash_async_objc_find_method)
-#define plcrash_async_objc_supports_nonptr_isa PLNS(plcrash_async_objc_supports_nonptr_isa)
-#define plcrash_async_read_addr PLNS(plcrash_async_read_addr)
-#define plcrash_async_signal_sigcode PLNS(plcrash_async_signal_sigcode)
-#define plcrash_async_signal_signame PLNS(plcrash_async_signal_signame)
-#define plcrash_async_strcmp PLNS(plcrash_async_strcmp)
-#define plcrash_async_strerror PLNS(plcrash_async_strerror)
-#define plcrash_async_strncmp PLNS(plcrash_async_strncmp)
-#define plcrash_async_symbol_cache_free PLNS(plcrash_async_symbol_cache_free)
-#define plcrash_async_symbol_cache_init PLNS(plcrash_async_symbol_cache_init)
-#define plcrash_async_task_memcpy PLNS(plcrash_async_task_memcpy)
-#define plcrash_async_task_read_uint16 PLNS(plcrash_async_task_read_uint16)
-#define plcrash_async_task_read_uint32 PLNS(plcrash_async_task_read_uint32)
-#define plcrash_async_task_read_uint64 PLNS(plcrash_async_task_read_uint64)
-#define plcrash_async_task_read_uint8 PLNS(plcrash_async_task_read_uint8)
-#define plcrash_async_thread_state_clear_all_regs PLNS(plcrash_async_thread_state_clear_all_regs)
-#define plcrash_async_thread_state_clear_reg PLNS(plcrash_async_thread_state_clear_reg)
-#define plcrash_async_thread_state_clear_volatile_regs PLNS(plcrash_async_thread_state_clear_volatile_regs)
-#define plcrash_async_thread_state_copy PLNS(plcrash_async_thread_state_copy)
-#define plcrash_async_thread_state_current PLNS(plcrash_async_thread_state_current)
-#define plcrash_async_thread_state_current_stub PLNS(plcrash_async_thread_state_current_stub)
-#define plcrash_async_thread_state_get_greg_size PLNS(plcrash_async_thread_state_get_greg_size)
-#define plcrash_async_thread_state_get_reg PLNS(plcrash_async_thread_state_get_reg)
-#define plcrash_async_thread_state_get_reg_count PLNS(plcrash_async_thread_state_get_reg_count)
-#define plcrash_async_thread_state_get_reg_name PLNS(plcrash_async_thread_state_get_reg_name)
-#define plcrash_async_thread_state_get_stack_direction PLNS(plcrash_async_thread_state_get_stack_direction)
-#define plcrash_async_thread_state_has_reg PLNS(plcrash_async_thread_state_has_reg)
-#define plcrash_async_thread_state_init PLNS(plcrash_async_thread_state_init)
-#define plcrash_async_thread_state_mach_thread_init PLNS(plcrash_async_thread_state_mach_thread_init)
-#define plcrash_async_thread_state_map_dwarf_to_reg PLNS(plcrash_async_thread_state_map_dwarf_to_reg)
-#define plcrash_async_thread_state_map_reg_to_dwarf PLNS(plcrash_async_thread_state_map_reg_to_dwarf)
-#define plcrash_async_thread_state_mcontext_init PLNS(plcrash_async_thread_state_mcontext_init)
-#define plcrash_async_thread_state_set_reg PLNS(plcrash_async_thread_state_set_reg)
-#define plcrash_async_writen PLNS(plcrash_async_writen)
-#define plcrash_log_writer_close PLNS(plcrash_log_writer_close)
-#define plcrash_log_writer_free PLNS(plcrash_log_writer_free)
-#define plcrash_log_writer_init PLNS(plcrash_log_writer_init)
-#define plcrash_log_writer_set_exception PLNS(plcrash_log_writer_set_exception)
-#define plcrash_log_writer_write PLNS(plcrash_log_writer_write)
-#define plcrash_nasync_image_list_append PLNS(plcrash_nasync_image_list_append)
-#define plcrash_nasync_image_list_free PLNS(plcrash_nasync_image_list_free)
-#define plcrash_nasync_image_list_init PLNS(plcrash_nasync_image_list_init)
-#define plcrash_nasync_image_list_remove PLNS(plcrash_nasync_image_list_remove)
-#define plcrash_nasync_macho_free PLNS(plcrash_nasync_macho_free)
-#define plcrash_nasync_macho_init PLNS(plcrash_nasync_macho_init)
-#define plcrash_populate_error PLNS(plcrash_populate_error)
-#define plcrash_populate_mach_error PLNS(plcrash_populate_mach_error)
-#define plcrash_populate_posix_error PLNS(plcrash_populate_posix_error)
-#define plcrash_sysctl_int PLNS(plcrash_sysctl_int)
-#define plcrash_sysctl_string PLNS(plcrash_sysctl_string)
-#define plcrash_sysctl_valid_utf8_bytes PLNS(plcrash_sysctl_valid_utf8_bytes)
-#define plcrash_sysctl_valid_utf8_bytes_max PLNS(plcrash_sysctl_valid_utf8_bytes_max)
-#define plcrash_writer_pack PLNS(plcrash_writer_pack)
-#define plframe_cursor_free PLNS(plframe_cursor_free)
-#define plframe_cursor_get_reg PLNS(plframe_cursor_get_reg)
-#define plframe_cursor_get_regcount PLNS(plframe_cursor_get_regcount)
-#define plframe_cursor_get_regname PLNS(plframe_cursor_get_regname)
-#define plframe_cursor_init PLNS(plframe_cursor_init)
-#define plframe_cursor_next PLNS(plframe_cursor_next)
-#define plframe_cursor_next_with_readers PLNS(plframe_cursor_next_with_readers)
-#define plframe_cursor_read_compact_unwind PLNS(plframe_cursor_read_compact_unwind)
-#define plframe_cursor_read_dwarf_unwind PLNS(plframe_cursor_read_dwarf_unwind)
-#define plframe_cursor_read_frame_ptr PLNS(plframe_cursor_read_frame_ptr)
-#define plframe_cursor_thread_init PLNS(plframe_cursor_thread_init)
-#define plframe_strerror PLNS(plframe_strerror)
-#define plframe_test_thread_spawn PLNS(plframe_test_thread_spawn)
-#define plframe_test_thread_stop PLNS(plframe_test_thread_stop)
-
-#endif
-
-/*
- * The following symbols are exported by the protobuf-c library. When building
- * a shared library, we can hide these as private symbols.
- *
- * However, when building a static library, we can only do so if we use
- * MH_OBJECT "single object prelink". The MH_OBJECT approach allows us to apply
- * symbol hiding/aliasing/etc similar to that supported by dylibs, but because it is
- * seemingly unused within Apple, the use thereof regularly introduces linking bugs
- * and errors in new Xcode releases.
- *
- * Rather than fighting the linker, we use the namespacing machinery to rewrite these
- * symbols, but only when explicitly compiling PLCrashReporter. Since protobuf-c is a library
- * that may be used elsewhere, we don't want to rewrite these symbols if they're used
- * independently by PLCrashReporter API clients.
- */
-#ifdef PLCR_PRIVATE
-   /* If no prefix has been defined, we need to specify our own private prefix */
-#  ifndef PLCRASHREPORTER_PREFIX
-#    define PLCRASHREPORTER_PREFIX PL_
-#  endif
-
-#  define protobuf_c_buffer_simple_append                   PLNS(protobuf_c_buffer_simple_append)
-#  define protobuf_c_default_allocator                      PLNS(protobuf_c_default_allocator)
-#  define protobuf_c_enum_descriptor_get_value              PLNS(protobuf_c_enum_descriptor_get_value)
-#  define protobuf_c_enum_descriptor_get_value_by_name      PLNS(protobuf_c_enum_descriptor_get_value_by_name)
-#  define protobuf_c_message_descriptor_get_field           PLNS(protobuf_c_message_descriptor_get_field)
-#  define protobuf_c_message_descriptor_get_field_by_name   PLNS(protobuf_c_message_descriptor_get_field_by_name)
-#  define protobuf_c_message_free_unpacked                  PLNS(protobuf_c_message_free_unpacked)
-#  define protobuf_c_message_get_packed_size                PLNS(protobuf_c_message_get_packed_size)
-#  define protobuf_c_message_pack                           PLNS(protobuf_c_message_pack)
-#  define protobuf_c_message_pack_to_buffer                 PLNS(protobuf_c_message_pack_to_buffer)
-#  define protobuf_c_message_unpack                         PLNS(protobuf_c_message_unpack)
-#  define protobuf_c_out_of_memory                          PLNS(protobuf_c_out_of_memory)
-#  define protobuf_c_service_descriptor_get_method_by_name  PLNS(protobuf_c_service_descriptor_get_method_by_name)
-#  define protobuf_c_service_destroy                        PLNS(protobuf_c_service_destroy)
-#  define protobuf_c_service_generated_init                 PLNS(protobuf_c_service_generated_init)
-#  define protobuf_c_system_allocator                       PLNS(protobuf_c_system_allocator)
-#endif /* PLCR_PRIVATE */
diff --git a/submodules/HockeySDK-iOS/Vendor/include/PLCrashReport.h b/submodules/HockeySDK-iOS/Vendor/include/PLCrashReport.h
deleted file mode 100644
index a179cd6909..0000000000
--- a/submodules/HockeySDK-iOS/Vendor/include/PLCrashReport.h
+++ /dev/null
@@ -1,200 +0,0 @@
-/*
- * Author: Landon Fuller <landonf@plausiblelabs.com>
- *
- * Copyright (c) 2008-2013 Plausible Labs Cooperative, Inc.
- * All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person
- * obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without
- * restriction, including without limitation the rights to use,
- * copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following
- * conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
- * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#import <Foundation/Foundation.h>
-
-#import "PLCrashReportApplicationInfo.h"
-#import "PLCrashReportBinaryImageInfo.h"
-#import "PLCrashReportExceptionInfo.h"
-#import "PLCrashReportMachineInfo.h"
-#import "PLCrashReportMachExceptionInfo.h"
-#import "PLCrashReportProcessInfo.h"
-#import "PLCrashReportProcessorInfo.h"
-#import "PLCrashReportRegisterInfo.h"
-#import "PLCrashReportSignalInfo.h"
-#import "PLCrashReportStackFrameInfo.h"
-#import "PLCrashReportSymbolInfo.h"
-#import "PLCrashReportSystemInfo.h"
-#import "PLCrashReportThreadInfo.h"
-
-/** 
- * @ingroup constants
- * Crash file magic identifier */
-#define PLCRASH_REPORT_FILE_MAGIC "plcrash"
-
-/** 
- * @ingroup constants
- * Crash format version byte identifier. Will not change outside of the introduction of
- * an entirely new crash log format. */
-#define PLCRASH_REPORT_FILE_VERSION 1
-
-/**
- * @ingroup types
- * Crash log file header format.
- *
- * Crash log files start with 7 byte magic identifier (#PLCRASH_REPORT_FILE_MAGIC),
- * followed by a single unsigned byte version number (#PLCRASH_REPORT_FILE_VERSION).
- * The crash log message format itself is extensible, so this version number will only
- * be incremented in the event of an incompatible encoding or format change.
- */
-struct PLCrashReportFileHeader {
-    /** Crash log magic identifier, not NULL terminated */
-    const char magic[7];
-
-    /** Crash log encoding/format version */
-    const uint8_t version;
-
-    /** File data */
-    const uint8_t data[];
-} __attribute__((packed));
-
-
-/**
- * @internal
- * Private decoder instance variables (used to hide the underlying protobuf parser).
- */
-typedef struct _PLCrashReportDecoder _PLCrashReportDecoder;
-
-@interface PLCrashReport : NSObject {
-@private
-    /** Private implementation variables (used to hide the underlying protobuf parser) */
-    _PLCrashReportDecoder *_decoder;
-
-    /** System info */
-    PLCrashReportSystemInfo *_systemInfo;
-    
-    /** Machine info */
-    PLCrashReportMachineInfo *_machineInfo;
-
-    /** Application info */
-    PLCrashReportApplicationInfo *_applicationInfo;
-    
-    /** Process info */
-    PLCrashReportProcessInfo *_processInfo;
-
-    /** Signal info */
-    PLCrashReportSignalInfo *_signalInfo;
-    
-    /** Mach exception info */
-    PLCrashReportMachExceptionInfo *_machExceptionInfo;
-
-    /** Thread info (PLCrashReportThreadInfo instances) */
-    NSArray *_threads;
-
-    /** Binary images (PLCrashReportBinaryImageInfo instances */
-    NSArray *_images;
-
-    /** Exception information (may be nil) */
-    PLCrashReportExceptionInfo *_exceptionInfo;
-
-    /** Report UUID */
-    CFUUIDRef _uuid;
-}
-
-- (id) initWithData: (NSData *) encodedData error: (NSError **) outError;
-
-- (PLCrashReportBinaryImageInfo *) imageForAddress: (uint64_t) address;
-
-/**
- * System information.
- */
-@property(nonatomic, readonly) PLCrashReportSystemInfo *systemInfo;
-
-/**
- * YES if machine information is available.
- */
-@property(nonatomic, readonly) BOOL hasMachineInfo;
-
-/**
- * Machine information. Only available in later (v1.1+) crash report format versions. If not available,
- * will be nil.
- */
-@property(nonatomic, readonly) PLCrashReportMachineInfo *machineInfo;
-
-/**
- * Application information.
- */
-@property(nonatomic, readonly) PLCrashReportApplicationInfo *applicationInfo;
-
-/**
- * YES if process information is available.
- */
-@property(nonatomic, readonly) BOOL hasProcessInfo;
-
-/**
- * Process information. Only available in later (v1.1+) crash report format versions. If not available,
- * will be nil.
- */
-@property(nonatomic, readonly) PLCrashReportProcessInfo *processInfo;
-
-/**
- * Signal information. This provides the signal and signal code of the fatal signal.
- */
-@property(nonatomic, readonly) PLCrashReportSignalInfo *signalInfo;
-
-/**
- * Mach exception information, if available. This will only be included in the
- * case that encoding crash reporter's exception-based reporting was enabled, and a Mach
- * exception was caught.
- *
- * @warning If Mach exception information is available, the legacy signalInfo property will also be provided; this
- * s required to maintain backwards compatibility with the established API. Note, however, that the signal info may be derived from the
- * Mach exception info by the encoding crash reporter, and thus may not exactly match the kernel exception-to-signal
- * mappings implemented in xnu. As such, when Mach exception info is available, its use should be preferred.
- */
-@property(nonatomic, readonly) PLCrashReportMachExceptionInfo *machExceptionInfo;
-
-/**
- * Thread information. Returns a list of PLCrashReportThreadInfo instances.
- */
-@property(nonatomic, readonly) NSArray *threads;
-
-/**
- * Binary image information. Returns a list of PLCrashReportBinaryImageInfo instances.
- */
-@property(nonatomic, readonly) NSArray *images;
-
-/**
- * YES if exception information is available.
- */
-@property(nonatomic, readonly) BOOL hasExceptionInfo;
-
-/**
- * Exception information. Only available if a crash was caused by an uncaught exception,
- * otherwise nil.
- */
-@property(nonatomic, readonly) PLCrashReportExceptionInfo *exceptionInfo;
-
-/**
- * A client-generated 16-byte UUID. May be used to filter duplicate reports submitted or generated
- * by a single client. Only available in later (v1.2+) crash report format versions. If not available,
- * will be NULL.
- */
-@property(nonatomic, readonly) CFUUIDRef uuidRef;
-
-@end
diff --git a/submodules/HockeySDK-iOS/Vendor/include/PLCrashReportApplicationInfo.h b/submodules/HockeySDK-iOS/Vendor/include/PLCrashReportApplicationInfo.h
deleted file mode 100644
index 47a8706827..0000000000
--- a/submodules/HockeySDK-iOS/Vendor/include/PLCrashReportApplicationInfo.h
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * Author: Landon Fuller <landonf@plausiblelabs.com>
- *
- * Copyright (c) 2008-2009 Plausible Labs Cooperative, Inc.
- * All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person
- * obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without
- * restriction, including without limitation the rights to use,
- * copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following
- * conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
- * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#import <Foundation/Foundation.h>
-
-@interface PLCrashReportApplicationInfo : NSObject {
-@private
-    /** Application identifier */
-    NSString *_applicationIdentifier;
-    
-    /** Application version */
-    NSString *_applicationVersion;
-    
-    /** Application marketing version */
-    NSString *_applicationMarketingVersion;
-}
-
-- (id) initWithApplicationIdentifier: (NSString *) applicationIdentifier 
-                  applicationVersion: (NSString *) applicationVersion
-         applicationMarketingVersion: (NSString *) applicationMarketingVersion;
-
-/**
- * The application identifier. This is usually the application's CFBundleIdentifier value.
- */
-@property(nonatomic, readonly) NSString *applicationIdentifier;
-
-/**
- * The application version. This is usually the application's CFBundleVersion value.
- */
-@property(nonatomic, readonly) NSString *applicationVersion;
-
-/**
- * The application marketing version. This is usually the application's CFBundleShortVersionString value if available. May be nil.
- */
-@property(nonatomic, readonly) NSString *applicationMarketingVersion;
-
-@end
diff --git a/submodules/HockeySDK-iOS/Vendor/include/PLCrashReportBinaryImageInfo.h b/submodules/HockeySDK-iOS/Vendor/include/PLCrashReportBinaryImageInfo.h
deleted file mode 100644
index 339fdbb08f..0000000000
--- a/submodules/HockeySDK-iOS/Vendor/include/PLCrashReportBinaryImageInfo.h
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
- * Author: Landon Fuller <landonf@plausiblelabs.com>
- *
- * Copyright (c) 2008-2009 Plausible Labs Cooperative, Inc.
- * All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person
- * obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without
- * restriction, including without limitation the rights to use,
- * copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following
- * conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
- * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#import <Foundation/Foundation.h>
-#import "PLCrashReportProcessorInfo.h"
-
-@interface PLCrashReportBinaryImageInfo : NSObject {
-@private
-    /** Code type */
-    PLCrashReportProcessorInfo *_processorInfo;
-
-    /** Base image address */
-    uint64_t _baseAddress;
-
-    /** Image segment size */
-    uint64_t _imageSize;
-
-    /** Name of binary image */
-    NSString *_imageName;
-
-    /** If the UUID is available */
-    BOOL _hasImageUUID;
-
-    /** 128-bit object UUID. May be nil. */
-    NSString *_imageUUID;
-}
-
-- (id) initWithCodeType: (PLCrashReportProcessorInfo *) processorInfo
-            baseAddress: (uint64_t) baseAddress 
-                   size: (uint64_t) imageSize
-                   name: (NSString *) imageName
-                   uuid: (NSData *) uuid;
-
-/**
- * Image code type, or nil if unavailable.
- */
-@property(nonatomic, readonly) PLCrashReportProcessorInfo *codeType;
-
-/**
- * Image base address.
- */
-@property(nonatomic, readonly) uint64_t imageBaseAddress;
-
-/**
- * Segment size.
- */
-@property(nonatomic, readonly) uint64_t imageSize;
-
-/**
- * Image name (absolute path)
- */
-@property(nonatomic, readonly) NSString *imageName;
-
-
-/**
- * YES if this image has an associated UUID.
- */
-@property(nonatomic, readonly) BOOL hasImageUUID;
-
-/**
- * 128-bit object UUID (matches Mach-O DWARF dSYM files). May be nil if unavailable.
- */
-@property(nonatomic, readonly) NSString *imageUUID;
-
-@end
diff --git a/submodules/HockeySDK-iOS/Vendor/include/PLCrashReportExceptionInfo.h b/submodules/HockeySDK-iOS/Vendor/include/PLCrashReportExceptionInfo.h
deleted file mode 100644
index 623b1d4e15..0000000000
--- a/submodules/HockeySDK-iOS/Vendor/include/PLCrashReportExceptionInfo.h
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Author: Landon Fuller <landonf@plausiblelabs.com>
- *
- * Copyright (c) 2008-2009 Plausible Labs Cooperative, Inc.
- * All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person
- * obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without
- * restriction, including without limitation the rights to use,
- * copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following
- * conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
- * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#import <Foundation/Foundation.h>
-#import "PLCrashReportThreadInfo.h"
-
-
-@interface PLCrashReportExceptionInfo : NSObject {
-@private
-    /** Name */
-    NSString *_name;
-
-    /** Reason */
-    NSString *_reason;
-
-    /** Ordered list of PLCrashReportStackFrame instances, or nil if unavailable. */
-    NSArray *_stackFrames;
-}
-
-- (id) initWithExceptionName: (NSString *) name reason: (NSString *) reason;
-
-- (id) initWithExceptionName: (NSString *) name 
-                      reason: (NSString *) reason
-                 stackFrames: (NSArray *) stackFrames;
-
-/**
- * The exception name.
- */
-@property(nonatomic, readonly) NSString *exceptionName;
-
-/**
- * The exception reason.
- */
-@property(nonatomic, readonly) NSString *exceptionReason;
-
-/* The exception's original call stack, as an array of PLCrashReportStackFrameInfo instances, or nil if unavailable.
- * This may be preserved across rethrow of an exception, and can be used to determine the original call stack. */
-@property(nonatomic, readonly) NSArray *stackFrames;
-
-@end
diff --git a/submodules/HockeySDK-iOS/Vendor/include/PLCrashReportFormatter.h b/submodules/HockeySDK-iOS/Vendor/include/PLCrashReportFormatter.h
deleted file mode 100644
index 77c2029fd0..0000000000
--- a/submodules/HockeySDK-iOS/Vendor/include/PLCrashReportFormatter.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Author: Landon Fuller <landonf@plausiblelabs.com>
- *
- * Copyright (c) 2008-2013 Plausible Labs Cooperative, Inc.
- * All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person
- * obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without
- * restriction, including without limitation the rights to use,
- * copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following
- * conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
- * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#import <Foundation/Foundation.h>
-
-#import "PLCrashReport.h"
-
-/**
- * A crash report formatter accepts a PLCrashReport instance, formats it according to implementation-specified rules,
- * (such as implementing text output support), and returns the result.
- */
-@protocol PLCrashReportFormatter
-
-/**
- * Format the provided @a report.
- *
- * @param report Report to be formatted.
- * @param outError A pointer to an NSError object variable. If an error occurs, this pointer will contain an error
- * object indicating why the pending crash report could not be formatted. If no error occurs, this parameter will
- * be left unmodified. You may specify nil for this parameter, and no error information will be provided.
- *
- * @return Returns the formatted report data on success, or nil on failure.
- */
-- (NSData *) formatReport: (PLCrashReport *) report error: (NSError **) outError;
-
-@end
diff --git a/submodules/HockeySDK-iOS/Vendor/include/PLCrashReportMachExceptionInfo.h b/submodules/HockeySDK-iOS/Vendor/include/PLCrashReportMachExceptionInfo.h
deleted file mode 100644
index a9d7f7c245..0000000000
--- a/submodules/HockeySDK-iOS/Vendor/include/PLCrashReportMachExceptionInfo.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Author: Landon Fuller <landonf@plausiblelabs.com>
- *
- * Copyright (c) 2013 Plausible Labs Cooperative, Inc.
- * All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person
- * obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without
- * restriction, including without limitation the rights to use,
- * copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following
- * conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
- * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#import <Foundation/Foundation.h>
-
-@interface PLCrashReportMachExceptionInfo : NSObject {
-@private
-    /** The Mach exception type. */
-    uint64_t _type;
-    
-    /** The Mach exception codes, represented as an ordered array of NSNumber instances. */
-    NSArray *_codes;
-}
-
-- (id) initWithType: (uint64_t) type codes: (NSArray *) codes;
-
-/** The Mach exception type. */
-@property(nonatomic, readonly) uint64_t type;
-
-/** The Mach exception codes, represented as an ordered array of 64-bit unsigned NSNumber instances. */
-@property(nonatomic, readonly) NSArray *codes;
-
-@end
diff --git a/submodules/HockeySDK-iOS/Vendor/include/PLCrashReportMachineInfo.h b/submodules/HockeySDK-iOS/Vendor/include/PLCrashReportMachineInfo.h
deleted file mode 100644
index 4d0597c1df..0000000000
--- a/submodules/HockeySDK-iOS/Vendor/include/PLCrashReportMachineInfo.h
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * Author: Landon Fuller <landonf@plausible.coop>
- *
- * Copyright (c) 2008-2013 Plausible Labs Cooperative, Inc.
- * All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person
- * obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without
- * restriction, including without limitation the rights to use,
- * copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following
- * conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
- * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#import <Foundation/Foundation.h>
-
-#import "PLCrashReportProcessorInfo.h"
-
-@interface PLCrashReportMachineInfo : NSObject {
-@private
-    /** The hardware model name (eg, MacBookPro6,1). This may be unavailable, and this property will be nil. */
-    NSString *_modelName;
-    
-    /** The processor type. */
-    PLCrashReportProcessorInfo *_processorInfo;
-    
-    /* The number of actual physical processor cores. */
-    NSUInteger _processorCount;
-    
-    /* The number of logical processors. */
-    NSUInteger _logicalProcessorCount;
-}
-
-- (id) initWithModelName: (NSString *) modelName
-           processorInfo: (PLCrashReportProcessorInfo *) processorInfo
-          processorCount: (NSUInteger) processorCount
-   logicalProcessorCount: (NSUInteger) logicalProcessorCount;
-
-/** The hardware model name (eg, MacBookPro6,1). This may be unavailable, and this property will be nil. */
-@property(nonatomic, readonly) NSString *modelName;
-
-/** The processor type. This will be unavailable in reports generated prior to PLCrashReporter 1.2, in which case this property will be nil. */
-@property(nonatomic, readonly) PLCrashReportProcessorInfo *processorInfo;
-
-/*
- * The number of actual physical processor cores. Note that the number of active processors may be managed by the
- * operating system's power management system, and this value may not reflect the number of active
- * processors at the time of the crash.
- */
-@property(nonatomic, readonly) NSUInteger processorCount;
-
-/*
- * The number of logical processors.  Note that the number of active processors may be managed by the
- * operating system's power management system, and this value may not reflect the number of active
- * processors at the time of the crash.
- */
-@property(nonatomic, readonly) NSUInteger logicalProcessorCount;
-
-@end
diff --git a/submodules/HockeySDK-iOS/Vendor/include/PLCrashReportProcessInfo.h b/submodules/HockeySDK-iOS/Vendor/include/PLCrashReportProcessInfo.h
deleted file mode 100644
index ca683d50da..0000000000
--- a/submodules/HockeySDK-iOS/Vendor/include/PLCrashReportProcessInfo.h
+++ /dev/null
@@ -1,103 +0,0 @@
-/*
- * Author: Damian Morris <damian@moso.com.au>
- *
- * Copyright (c) 2010 MOSO Corporation, Pty Ltd.
- * Copyright (c) 2010-2013 Plausible Labs Cooperative, Inc.
- *
- * All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person
- * obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without
- * restriction, including without limitation the rights to use,
- * copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following
- * conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
- * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#import <Foundation/Foundation.h>
-
-@interface PLCrashReportProcessInfo : NSObject {
-@private
-    /** Process name, or nil if unavailable. */
-    NSString *_processName;
-    
-    /** Process ID */
-    NSUInteger _processID;
-    
-    /** Process path */
-    NSString* _processPath;
-
-    /** Date and time that the crashing process was started. This may be unavailable, and this property
-     * will be nil. */
-    NSDate *_processStartTime;
-
-    /** Parent process name, or nil if unavailable.  */
-    NSString *_parentProcessName;
-    
-    /** Parent process ID */
-    NSUInteger _parentProcessID;
-    
-    /** If false, the process is being run via process-level CPU emulation (such as Rosetta). */
-    BOOL _native;
-}
-
-- (id) initWithProcessName: (NSString *) processName
-                 processID: (NSUInteger) processID
-               processPath: (NSString *) processPath
-          processStartTime: (NSDate *) processStartTime
-         parentProcessName: (NSString *) parentProcessName
-           parentProcessID: (NSUInteger) parentProcessID
-                    native: (BOOL) native;
-
-/**
- * The process name. This value may not be included in the crash report, in which case this property
- * will be nil.
- */
-@property(nonatomic, readonly) NSString *processName;
-
-/**
- * The process ID.
- */
-@property(nonatomic, readonly) NSUInteger processID;
-
-/**
- * The path to the process executable. This value may not be included in the crash report, in which case this property
- * will be nil.
- */
-@property(nonatomic, readonly) NSString *processPath;
-
-/**
- * Date and time that the crashing process was started. This value may not be included in the crash report, in which case this property
- * will be nil.
- */
-@property(nonatomic, readonly) NSDate *processStartTime;
-
-/**
- * The parent process name. This value may not be included in the crash report, in which case this property
- * will be nil.
- */
-@property(nonatomic, readonly) NSString *parentProcessName;
-
-/**
- * The parent process ID.
- */
-@property(nonatomic, readonly) NSUInteger parentProcessID;
-
-/** The process' native execution status. If false, the process is being run via process-level CPU emulation (such as Rosetta). */
-@property(nonatomic, readonly) BOOL native;
-
-@end
diff --git a/submodules/HockeySDK-iOS/Vendor/include/PLCrashReportProcessorInfo.h b/submodules/HockeySDK-iOS/Vendor/include/PLCrashReportProcessorInfo.h
deleted file mode 100644
index 03d570bd4c..0000000000
--- a/submodules/HockeySDK-iOS/Vendor/include/PLCrashReportProcessorInfo.h
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * Author: Landon Fuller <landonf@plausible.coop>
- *
- * Copyright (c) 2008-2013 Plausible Labs Cooperative, Inc.
- * All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person
- * obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without
- * restriction, including without limitation the rights to use,
- * copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following
- * conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
- * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#import <Foundation/Foundation.h>
-#import <mach/machine.h>
-
-/**
- * @ingroup constants
- *
- * The type encodings supported for CPU types and subtypes. Currently only Apple
- * Mach-O defined encodings are supported.
- *
- * @internal
- * These enum values match the protobuf values. Keep them synchronized.
- */
-typedef enum {
-    /** Unknown cpu type encoding. */
-    PLCrashReportProcessorTypeEncodingUnknown = 0,
-
-    /** Apple Mach-defined processor types. */
-    PLCrashReportProcessorTypeEncodingMach = 1
-} PLCrashReportProcessorTypeEncoding;
-
-@interface PLCrashReportProcessorInfo : NSObject {
-@private
-    /** Type encoding */
-    PLCrashReportProcessorTypeEncoding _typeEncoding;
-
-    /** CPU type */
-    uint64_t _type;
-
-    /** CPU subtype */
-    uint64_t _subtype;
-}
-
-- (id) initWithTypeEncoding: (PLCrashReportProcessorTypeEncoding) typeEncoding
-                       type: (uint64_t) type
-                    subtype: (uint64_t) subtype;
-
-/** The CPU type encoding. */
-@property(nonatomic, readonly) PLCrashReportProcessorTypeEncoding typeEncoding;
-
-/** The CPU type. */
-@property(nonatomic, readonly) uint64_t type;
-
-/** The CPU subtype. */
-@property(nonatomic, readonly) uint64_t subtype;
-
-@end
diff --git a/submodules/HockeySDK-iOS/Vendor/include/PLCrashReportRegisterInfo.h b/submodules/HockeySDK-iOS/Vendor/include/PLCrashReportRegisterInfo.h
deleted file mode 100644
index 20b618d747..0000000000
--- a/submodules/HockeySDK-iOS/Vendor/include/PLCrashReportRegisterInfo.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Author: Landon Fuller <landonf@plausible.coop>
- *
- * Copyright (c) 2008-2013 Plausible Labs Cooperative, Inc.
- * All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person
- * obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without
- * restriction, including without limitation the rights to use,
- * copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following
- * conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
- * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#import <Foundation/Foundation.h>
-
-@interface PLCrashReportRegisterInfo : NSObject {
-@private
-    /** Register name */
-    NSString *_registerName;
-    
-    /** Register value */
-    uint64_t _registerValue;
-}
-
-- (id) initWithRegisterName: (NSString *) registerName registerValue: (uint64_t) registerValue;
-
-/**
- * Register name.
- */
-@property(nonatomic, readonly) NSString *registerName;
-
-/**
- * Register value.
- */
-@property(nonatomic, readonly) uint64_t registerValue;
-
-@end
diff --git a/submodules/HockeySDK-iOS/Vendor/include/PLCrashReportSignalInfo.h b/submodules/HockeySDK-iOS/Vendor/include/PLCrashReportSignalInfo.h
deleted file mode 100644
index 2c5c5fe23d..0000000000
--- a/submodules/HockeySDK-iOS/Vendor/include/PLCrashReportSignalInfo.h
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Author: Landon Fuller <landonf@plausiblelabs.com>
- *
- * Copyright (c) 2008-2009 Plausible Labs Cooperative, Inc.
- * All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person
- * obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without
- * restriction, including without limitation the rights to use,
- * copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following
- * conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
- * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#import <Foundation/Foundation.h>
-
-@interface PLCrashReportSignalInfo : NSObject {
-@private
-    /** Signal name */
-    NSString *_name;
-    
-    /** Signal code */
-    NSString *_code;
-
-    /** Fauling instruction or address */
-    uint64_t _address;
-}
-
-- (id) initWithSignalName: (NSString *) name code: (NSString *) code address: (uint64_t) address;
-
-/**
- * The signal name.
- */
-@property(nonatomic, readonly) NSString *name;
-
-/**
- * The signal code.
- */
-@property(nonatomic, readonly) NSString *code;
-
-/**
- * The faulting instruction or address.
- */
-@property(nonatomic, readonly) uint64_t address;
-
-@end
diff --git a/submodules/HockeySDK-iOS/Vendor/include/PLCrashReportStackFrameInfo.h b/submodules/HockeySDK-iOS/Vendor/include/PLCrashReportStackFrameInfo.h
deleted file mode 100644
index 997e762650..0000000000
--- a/submodules/HockeySDK-iOS/Vendor/include/PLCrashReportStackFrameInfo.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Author: Landon Fuller <landonf@plausible.coop>
- *
- * Copyright (c) 2008-2013 Plausible Labs Cooperative, Inc.
- * All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person
- * obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without
- * restriction, including without limitation the rights to use,
- * copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following
- * conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
- * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#import <Foundation/Foundation.h>
-#import "PLCrashReportSymbolInfo.h"
-
-@interface PLCrashReportStackFrameInfo : NSObject {
-@private
-    /** Frame instruction pointer. */
-    uint64_t _instructionPointer;
-
-    /** Symbol information, if available. Otherwise, will be nil. */
-    PLCrashReportSymbolInfo *_symbolInfo;
-}
-
-- (id) initWithInstructionPointer: (uint64_t) instructionPointer symbolInfo: (PLCrashReportSymbolInfo *) symbolInfo;
-
-/**
- * Frame's instruction pointer.
- */
-@property(nonatomic, readonly) uint64_t instructionPointer;
-
-/** Symbol information for this frame.
- * This may be unavailable, and this property will be nil. */
-@property(nonatomic, readonly) PLCrashReportSymbolInfo *symbolInfo;
-
-@end
diff --git a/submodules/HockeySDK-iOS/Vendor/include/PLCrashReportSymbolInfo.h b/submodules/HockeySDK-iOS/Vendor/include/PLCrashReportSymbolInfo.h
deleted file mode 100644
index c6ceb6c109..0000000000
--- a/submodules/HockeySDK-iOS/Vendor/include/PLCrashReportSymbolInfo.h
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Author: Landon Fuller <landonf@plausible.coop>
- *
- * Copyright (c) 2012-2013 Plausible Labs Cooperative, Inc.
- * All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person
- * obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without
- * restriction, including without limitation the rights to use,
- * copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following
- * conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
- * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#import <Foundation/Foundation.h>
-
-@interface PLCrashReportSymbolInfo : NSObject {
-@private
-    /** The symbol name. */
-    NSString *_symbolName;
-    
-    /** The symbol start address. */
-    uint64_t _startAddress;
-    
-    /** The symbol end address, if explicitly defined. Will be 0 if unknown. */
-    uint64_t _endAddress;
-}
-
-- (id) initWithSymbolName: (NSString *) symbolName
-             startAddress: (uint64_t) startAddress
-               endAddress: (uint64_t) endAddress;
-
-/** The symbol name. */
-@property(nonatomic, readonly) NSString *symbolName;
-
-/** The symbol start address. */
-@property(nonatomic, readonly) uint64_t startAddress;
-
-/* The symbol end address, if explicitly defined. This will only be included if the end address is
- * explicitly defined (eg, by DWARF debugging information), will not be derived by best-guess
- * heuristics.
- *
- * If unknown, the address will be 0.
- */
-@property(nonatomic, readonly) uint64_t endAddress;
-
-@end
diff --git a/submodules/HockeySDK-iOS/Vendor/include/PLCrashReportSystemInfo.h b/submodules/HockeySDK-iOS/Vendor/include/PLCrashReportSystemInfo.h
deleted file mode 100644
index 8ec71e637a..0000000000
--- a/submodules/HockeySDK-iOS/Vendor/include/PLCrashReportSystemInfo.h
+++ /dev/null
@@ -1,154 +0,0 @@
-/*
- * Author: Landon Fuller <landonf@plausiblelabs.com>
- *
- * Copyright (c) 2008-2009 Plausible Labs Cooperative, Inc.
- * All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person
- * obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without
- * restriction, including without limitation the rights to use,
- * copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following
- * conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
- * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#import <Foundation/Foundation.h>
-
-/**
- * @ingroup constants
- *
- * Indicates the Operating System under which a Crash Log was generated.
- *
- * @internal
- * These enum values match the protobuf values. Keep them synchronized.
- */
-typedef enum {
-    /** Mac OS X. */
-    PLCrashReportOperatingSystemMacOSX = 0,
-    
-    /** iPhone OS */
-    PLCrashReportOperatingSystemiPhoneOS = 1,
-    
-    /** iPhone Simulator (Mac OS X with additional simulator-specific runtime libraries) */
-    PLCrashReportOperatingSystemiPhoneSimulator = 2,
-    
-    /** Unknown operating system */
-    PLCrashReportOperatingSystemUnknown = 3,
-  
-    /** Apple tvOS */
-    PLCrashReportOperatingSystemAppleTVOS = 4,
-  
-} PLCrashReportOperatingSystem;
-
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdocumentation-deprecated-sync"
-/**
- * @ingroup constants
- *
- * Indicates the architecture under which a Crash Log was generated.
- *
- * @deprecated The architecture value has been deprecated in v1.1 and later crash reports. All new reports
- * will make use of the new PLCrashReportProcessorInfo CPU type encodings.
- *
- * @internal
- * These enum values match the protobuf values. Keep them synchronized.
- */
-typedef enum {
-    /** x86-32. */
-    PLCrashReportArchitectureX86_32 = 0,
-    
-    /** x86-64 */
-    PLCrashReportArchitectureX86_64 = 1,
-
-    /** ARMv6 */
-    PLCrashReportArchitectureARMv6 = 2,
-
-    /**
-     * ARMv6
-     * @deprecated This value has been deprecated in favor of ARM subtype-specific
-     * values.
-     * @sa PLCrashReportArchitectureARMv6
-     */
-    PLCrashReportArchitectureARM = PLCrashReportArchitectureARMv6,
-
-    /** PPC */
-    PLCrashReportArchitecturePPC = 3,
-    
-    /** PPC64 */
-    PLCrashReportArchitecturePPC64 = 4,
-    
-    /** ARMv7 */
-    PLCrashReportArchitectureARMv7 = 5,
-    
-    /** Unknown */
-    PLCrashReportArchitectureUnknown = 6
-} PLCrashReportArchitecture;
-#pragma clang diagnostic pop
-
-extern PLCrashReportOperatingSystem PLCrashReportHostOperatingSystem;
-extern PLCrashReportArchitecture PLCrashReportHostArchitecture;
-
-@interface PLCrashReportSystemInfo : NSObject {
-@private
-    /** Operating system */
-    PLCrashReportOperatingSystem _operatingSystem;
-    
-    /** Operating system version */
-    NSString *_osVersion;
-    
-    /** OS build. May be nil. */
-    NSString *_osBuild;
-    
-    /** Architecture */
-    PLCrashReportArchitecture _architecture;
-    
-    /** Date crash report was generated. May be nil if the date is unknown. */
-    NSDate *_timestamp;
-}
-
-- (id) initWithOperatingSystem: (PLCrashReportOperatingSystem) operatingSystem 
-        operatingSystemVersion: (NSString *) operatingSystemVersion
-                  architecture: (PLCrashReportArchitecture) architecture
-                     timestamp: (NSDate *) timestamp;
-
-- (id) initWithOperatingSystem: (PLCrashReportOperatingSystem) operatingSystem 
-        operatingSystemVersion: (NSString *) operatingSystemVersion
-          operatingSystemBuild: (NSString *) operatingSystemBuild
-                  architecture: (PLCrashReportArchitecture) architecture
-                     timestamp: (NSDate *) timestamp;
-
-/** The operating system. */
-@property(nonatomic, readonly) PLCrashReportOperatingSystem operatingSystem;
-
-/** The operating system's release version. */
-@property(nonatomic, readonly) NSString *operatingSystemVersion;
-
-/** The operating system's build identifier (eg, 10J869). This may be unavailable, and this property will be nil. */
-@property(nonatomic, readonly) NSString *operatingSystemBuild;
-
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdocumentation-deprecated-sync"
-/** Architecture. @deprecated The architecture value has been deprecated in v1.1 and later crash reports. All new reports
- * include the CPU type as part of the crash report's machine info structure, using the PLCrashReportProcessorInfo
- * extensible encoding. */
-@property(nonatomic, readonly) PLCrashReportArchitecture architecture;
-#pragma clang diagnostic pop
-
-/** Date and time that the crash report was generated. This may be unavailable, and this property will be nil. */
-@property(nonatomic, readonly) NSDate *timestamp;
-
-@end
diff --git a/submodules/HockeySDK-iOS/Vendor/include/PLCrashReportTextFormatter.h b/submodules/HockeySDK-iOS/Vendor/include/PLCrashReportTextFormatter.h
deleted file mode 100644
index 2ba7e3503e..0000000000
--- a/submodules/HockeySDK-iOS/Vendor/include/PLCrashReportTextFormatter.h
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * Authors:
- *  Landon Fuller <landonf@plausiblelabs.com>
- *  Damian Morris <damian@moso.com.au>
- *
- * Copyright (c) 2008-2013 Plausible Labs Cooperative, Inc.
- * Copyright (c) 2010 MOSO Corporation, Pty Ltd.
- * All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person
- * obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without
- * restriction, including without limitation the rights to use,
- * copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following
- * conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
- * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
- */
-
-
-#import <Foundation/Foundation.h>
-
-#import "PLCrashReportFormatter.h"
-
-/**
- * Supported text output formats.
- *
- * @ingroup enums
- */
-typedef enum {
-    /** An iOS-compatible crash log text format. Compatible with the crash logs generated by the device and available
-     * through iTunes Connect. */
-    PLCrashReportTextFormatiOS = 0
-} PLCrashReportTextFormat;
-
-
-@interface PLCrashReportTextFormatter : NSObject <PLCrashReportFormatter> {
-@private
-    /** Text output format. */
-    PLCrashReportTextFormat _textFormat;
-
-    /** Encoding to use for string output. */
-    NSStringEncoding _stringEncoding;
-}
-
-+ (NSString *) stringValueForCrashReport: (PLCrashReport *) report withTextFormat: (PLCrashReportTextFormat) textFormat;
-
-- (id) initWithTextFormat: (PLCrashReportTextFormat) textFormat stringEncoding: (NSStringEncoding) stringEncoding;
-
-@end
diff --git a/submodules/HockeySDK-iOS/Vendor/include/PLCrashReportThreadInfo.h b/submodules/HockeySDK-iOS/Vendor/include/PLCrashReportThreadInfo.h
deleted file mode 100644
index 04c8604454..0000000000
--- a/submodules/HockeySDK-iOS/Vendor/include/PLCrashReportThreadInfo.h
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- * Author: Landon Fuller <landonf@plausiblelabs.com>
- *
- * Copyright (c) 2008-2009 Plausible Labs Cooperative, Inc.
- * All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person
- * obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without
- * restriction, including without limitation the rights to use,
- * copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following
- * conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
- * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#import <Foundation/Foundation.h>
-
-#import "PLCrashReportStackFrameInfo.h"
-#import "PLCrashReportRegisterInfo.h"
-
-@interface PLCrashReportThreadInfo : NSObject {
-@private
-    /** The thread number. Should be unique within a given crash log. */
-    NSInteger _threadNumber;
-
-    /** Ordered list of PLCrashReportStackFrame instances */
-    NSArray *_stackFrames;
-
-    /** YES if this thread crashed. */
-    BOOL _crashed;
-
-    /** List of PLCrashReportRegister instances. Will be empty if _crashed is NO. */
-    NSArray *_registers;
-}
-
-- (id) initWithThreadNumber: (NSInteger) threadNumber
-                stackFrames: (NSArray *) stackFrames
-                    crashed: (BOOL) crashed
-                  registers: (NSArray *) registers;
-
-/**
- * Application thread number.
- */
-@property(nonatomic, readonly) NSInteger threadNumber;
-
-/**
- * Thread backtrace. Provides an array of PLCrashReportStackFrameInfo instances.
- * The array is ordered, last callee to first.
- */
-@property(nonatomic, readonly) NSArray *stackFrames;
-
-/**
- * If this thread crashed, set to YES.
- */
-@property(nonatomic, readonly) BOOL crashed;
-
-/**
- * State of the general purpose and related registers, as a list of
- * PLCrashReportRegister instances. If this thead did not crash (crashed returns NO),
- * this list will be empty.
- */
-@property(nonatomic, readonly) NSArray *registers;
-
-@end
diff --git a/submodules/HockeySDK-iOS/Vendor/include/PLCrashReporter.h b/submodules/HockeySDK-iOS/Vendor/include/PLCrashReporter.h
deleted file mode 100644
index 68bf5a0f62..0000000000
--- a/submodules/HockeySDK-iOS/Vendor/include/PLCrashReporter.h
+++ /dev/null
@@ -1,138 +0,0 @@
-/*
- * Author: Landon Fuller <landonf@plausiblelabs.com>
- *
- * Copyright (c) 2008-2009 Plausible Labs Cooperative, Inc.
- * All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person
- * obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without
- * restriction, including without limitation the rights to use,
- * copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following
- * conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
- * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#import <Foundation/Foundation.h>
-#import <mach/mach.h>
-
-#import "PLCrashReporterConfig.h"
-
-@class PLCrashMachExceptionServer;
-@class PLCrashMachExceptionPortSet;
-
-/**
- * @ingroup functions
- *
- * Prototype of a callback function used to execute additional user code with signal information as provided
- * by PLCrashReporter. Called upon completion of crash handling, after the crash report has been written to disk.
- *
- * @param info The signal info.
- * @param uap The crash's threads context.
- * @param context The API client's supplied context value.
- *
- * @sa async_satefy
- * @ref async_safety
- * @sa PLCrashReporter::setPostCrashCallbacks:
- */
-typedef void (*PLCrashReporterPostCrashSignalCallback)(siginfo_t *info, ucontext_t *uap, void *context);
-
-/**
- * @ingroup types
- *
- * This structure contains callbacks supported by PLCrashReporter to allow the host application to perform
- * additional tasks prior to program termination after a crash has occured.
- *
- * @sa async_satefy
- * @ref async_safety
- */
-typedef struct PLCrashReporterCallbacks {
-    /** The version number of this structure. If not one of the defined version numbers for this type, the behavior
-     * is undefined. The current version of this structure is 0. */
-    uint16_t version;
-    
-    /** An arbitrary user-supplied context value. This value may be NULL. */
-    void *context;
-
-    /**
-     * The callback used to report caught signal information. In version 0 of this structure, all crashes will be
-     * reported via this function.
-     *
-     * @warning When using PLCrashReporterSignalHandlerTypeMach, the siginfo_t argument to this function will be derived
-     * from the Mach exception data, and may be incorrect, or may otherwise not match the expected data as provided via
-     * PLCrashReporterSignalHandlerTypeBSD. In addition, the provided ucontext_t value will be zero-initialized, and will
-     * not provide valid thread state.
-     *
-     * This callback will be deprecated in favor of a Mach-compatible replacement in a future release; support is maintained
-     * here to allow clients that rely on post-crash callbacks without thread state to make use of Mach exceptions.
-     */
-    PLCrashReporterPostCrashSignalCallback handleSignal;
-} PLCrashReporterCallbacks;
-
-@interface PLCrashReporter : NSObject {
-@private
-    /** Reporter configuration */
-    PLCrashReporterConfig *_config;
-
-    /** YES if the crash reporter has been enabled */
-    BOOL _enabled;
-    
-#if PLCRASH_FEATURE_MACH_EXCEPTIONS
-    /** The backing Mach exception server, if any. Nil if the reporter has not been enabled, or if
-     * the configured signal handler type is not PLCrashReporterSignalHandlerTypeMach. */
-    PLCrashMachExceptionServer *_machServer;
-    
-    /** Previously registered Mach exception ports, if any. */
-    PLCrashMachExceptionPortSet *_previousMachPorts;
-#endif /* PLCRASH_FEATURE_MACH_EXCEPTIONS */
-
-    /** Application identifier */
-    NSString *_applicationIdentifier;
-
-    /** Application version */
-    NSString *_applicationVersion;
-    
-    /** Application marketing version */
-    NSString *_applicationMarketingVersion;
-
-    /** Path to the crash reporter internal data directory */
-    NSString *_crashReportDirectory;
-}
-
-+ (PLCrashReporter *) sharedReporter;
-
-- (instancetype) initWithConfiguration: (PLCrashReporterConfig *) config;
-
-- (BOOL) hasPendingCrashReport;
-
-- (NSData *) loadPendingCrashReportData;
-- (NSData *) loadPendingCrashReportDataAndReturnError: (NSError **) outError;
-
-- (NSData *) generateLiveReportWithThread: (thread_t) thread;
-- (NSData *) generateLiveReportWithThread: (thread_t) thread error: (NSError **) outError;
-
-- (NSData *) generateLiveReport;
-- (NSData *) generateLiveReportAndReturnError: (NSError **) outError;
-
-- (BOOL) purgePendingCrashReport;
-- (BOOL) purgePendingCrashReportAndReturnError: (NSError **) outError;
-
-- (BOOL) enableCrashReporter;
-- (BOOL) enableCrashReporterAndReturnError: (NSError **) outError;
-
-- (void) setCrashCallbacks: (PLCrashReporterCallbacks *) callbacks;
-
-@end
diff --git a/submodules/HockeySDK-iOS/Vendor/include/PLCrashReporterConfig.h b/submodules/HockeySDK-iOS/Vendor/include/PLCrashReporterConfig.h
deleted file mode 100644
index 15c3a24b98..0000000000
--- a/submodules/HockeySDK-iOS/Vendor/include/PLCrashReporterConfig.h
+++ /dev/null
@@ -1,178 +0,0 @@
-/*
- * Author: Landon Fuller <landonf@plausible.coop>
- *
- * Copyright (c) 2013 Plausible Labs Cooperative, Inc.
- * All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person
- * obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without
- * restriction, including without limitation the rights to use,
- * copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following
- * conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
- * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#import <Foundation/Foundation.h>
-#import "PLCrashFeatureConfig.h"
-
-/**
- * @ingroup enums
- * Supported mechanisms for trapping and handling crashes.
- */
-typedef NS_ENUM(NSUInteger, PLCrashReporterSignalHandlerType) {
-    /**
-     * Trap fatal signals via a sigaction(2)-registered BSD signal handler.
-     *
-     * PLCrashReporter's signal handler will supersede previously registered handlers; existing
-     * handlers will not be called. This behavior may be modified in a future release, and should
-     * not be relied upon as a mechanism to prevent existing signal handlers from being called.
-     *
-     * There are some limitations to signal-based crash handling on Mac OS X and iOS; specifically:
-     *
-     * - On Mac OS X, stack overflows will only be handled on the thread on which
-     *   the crash reporter was initialized. This should generally be the main thread.
-     * - On iOS 6.0 and later, any stack overflows will not be handled due to sigaltstack() being
-     *   non-functional on the device. (see rdar://13002712 - SA_ONSTACK/sigaltstack() ignored on iOS).
-     * - Some exit paths in Apple's Libc will deregister a signal handler before firing SIGABRT, resulting
-     *   in the signal handler never being called (see rdar://14313497 - ___abort() disables SIGABRT signal
-     *   handlers prior to raising SIGABRT).  These __abort()-based checks are:
-     *     - Implemented for unsafe memcpy/strcpy/snprintf C functions.
-     *     - Only enabled when operating on a fixed-width target buffer (in which case the
-     *       compiler rewrites the function calls to the built-in variants, and provides the fixed-width length as an argument).
-     *     - Only trigger in the case that the source data exceeds the size of the fixed width target
-     *       buffer, and the maximum length argument either isn't supplied by the caller (eg, when using strcpy),
-     *       or a too-long argument is supplied (eg, strncpy with a length argument longer than the target buffer),
-     *       AND that argument can't be checked at compile-time.
-     */
-    PLCrashReporterSignalHandlerTypeBSD = 0,
-
-#if PLCRASH_FEATURE_MACH_EXCEPTIONS
-    /**
-     * Trap fatal signals via a Mach exception server.
-     *
-     * If any existing Mach exception server has been registered for the task, exceptions will be forwarded to that
-     * exception handler. Should the exceptions be handled by an existing handler, no report will be generated
-     * by PLCrashReporter.
-     *
-     * @par Mac OS X
-     *
-     * On Mac OS X, the Mach exception implementation is fully supported, using publicly available API -- note,
-     * however, that some kernel-internal constants, as well as architecture-specific trap information,
-     * may be required to fully interpret a Mach exception's root cause.
-     *
-     * @par iOS
-     *
-     * On iOS, the APIs required for a complete implementation are not fully public.
-     *
-     * The exposed surface of undocumented API usage is relatively low, and there has been strong user demand to
-     * implement Mach exception handling regardless of concerns over API visiblity. Given this, we've included
-     * Mach exception handling as an optional feature, with both build-time and runtime configuration
-     * to disable its inclusion or use, respectively.
-     *
-     * @par Debugger Incompatibility
-     *
-     * The Mach exception handler executes in-process, and will interfere with debuggers when they attempt to
-     * suspend all active threads (which will include the Mach exception handler). Mach-based handling
-     * should not be used when a debugger is attached.
-     *
-     * @par More Details
-     *
-     * For more information, refer to @ref mach_exceptions.
-     */
-    PLCrashReporterSignalHandlerTypeMach = 1
-#endif /* PLCRASH_FEATURE_MACH_EXCEPTIONS */
-};
-
-/**
- * @ingroup enums
- * Supported mechanisms for performing local symbolication.
- *
- * Local symbolication is performed using inexact heuristics and symbol data available at runtime; it may
- * return information that is incorrect. This may still be useful in the case where DWARF data is unavailable
- * for a given build; in that case, it can provide function and method names (though not line numbers) for a
- * crash report that may otherwise be unusable.
- *
- * Note, however, this comes at the cost of a significant increase in code that must run within the critical
- * crash reporting section, where failures may result in crash reports being corrupted or left unwritten. In
- * addition, some of the provided symbolication strategies rely on knowledge of runtime internals that may
- * change in future iOS releases. Given that DWARF symbolication data will <em>always</em> be more accurate, and
- * the risks inherent in executing considerably more code at crash time, it is strongly recommended that local
- * symbolication only be enabled for non-release builds.
- *
- * Multiple symbolication strategies may be enabled, in which case a best-match heuristic will be applied to the
- * results.
- */
-typedef NS_OPTIONS(NSUInteger, PLCrashReporterSymbolicationStrategy) {
-    /** No symbolication. */
-    PLCrashReporterSymbolicationStrategyNone = 0,
-
-    /**
-     * Use the standard binary symbol table. On iOS, this alone will return
-     * incomplete results, as most symbols are rewritten to the common '\<redacted>' string.
-     */
-    PLCrashReporterSymbolicationStrategySymbolTable = 1 << 0,
-
-    /**
-     * Use Objective-C metadata to find method and class names. This relies on detailed parsing
-     * of the Objective-C runtime data, including undefined flags and other runtime internals. As such,
-     * it may return incorrect data should the runtime be changed incompatibly.
-     */
-    PLCrashReporterSymbolicationStrategyObjC = 1 << 1,
-    
-    /**
-     * Enable all available symbolication strategies.
-     */
-    PLCrashReporterSymbolicationStrategyAll = (PLCrashReporterSymbolicationStrategySymbolTable|PLCrashReporterSymbolicationStrategyObjC)
-};
-
-@interface PLCrashReporterConfig : NSObject {
-@private
-    /** The configured signal handler type. */
-    PLCrashReporterSignalHandlerType _signalHandlerType;
-    
-    /** The configured symbolication strategy. */
-    PLCrashReporterSymbolicationStrategy _symbolicationStrategy;
-  
-   /**
-    * Flag indicating if the uncaughtExceptionHandler should be initialized or not. It usually is, except in a
-    * Xamarin environment.
-    */
-  BOOL _shouldRegisterUncaughtExceptionHandler;
-}
-
-+ (instancetype) defaultConfiguration;
-
-- (instancetype) init;
-- (instancetype) initWithSignalHandlerType: (PLCrashReporterSignalHandlerType) signalHandlerType
-                     symbolicationStrategy: (PLCrashReporterSymbolicationStrategy) symbolicationStrategy;
-
-- (instancetype) initWithSignalHandlerType: (PLCrashReporterSignalHandlerType) signalHandlerType
-                     symbolicationStrategy: (PLCrashReporterSymbolicationStrategy) symbolicationStrategy
-               shouldRegisterUncaughtExceptionHandler: (BOOL) shouldRegisterUncaughtExceptionHandler;
-
-
-/** The configured signal handler type. */
-@property(nonatomic, readonly) PLCrashReporterSignalHandlerType signalHandlerType;
-
-/** The configured symbolication strategy. */
-@property(nonatomic, readonly) PLCrashReporterSymbolicationStrategy symbolicationStrategy;
-
-/** Should PLCrashReporter regiser an uncaught exception handler? This is entended to be used in Xamarin apps */
-@property(nonatomic, readonly) BOOL shouldRegisterUncaughtExceptionHandler;
-
-@end
-
diff --git a/submodules/HockeySDK-iOS/Vendor/libCrashReporter.a b/submodules/HockeySDK-iOS/Vendor/libCrashReporter.a
deleted file mode 100644
index f3f5c751be..0000000000
Binary files a/submodules/HockeySDK-iOS/Vendor/libCrashReporter.a and /dev/null differ
diff --git a/submodules/HorizontalPeerItem/BUILD b/submodules/HorizontalPeerItem/BUILD
new file mode 100644
index 0000000000..2e07cf9c20
--- /dev/null
+++ b/submodules/HorizontalPeerItem/BUILD
@@ -0,0 +1,26 @@
+load("@build_bazel_rules_swift//swift:swift.bzl", "swift_library")
+
+swift_library(
+    name = "HorizontalPeerItem",
+    module_name = "HorizontalPeerItem",
+    srcs = glob([
+		"Sources/**/*.swift",
+    ]),
+    deps = [
+	    "//submodules/SSignalKit/SwiftSignalKit:SwiftSignalKit",
+        "//submodules/Postbox:Postbox",
+        "//submodules/TelegramCore:TelegramCore",
+        "//submodules/SyncCore:SyncCore",
+        "//submodules/AsyncDisplayKit:AsyncDisplayKit",
+        "//submodules/Display:Display",
+        "//submodules/TelegramPresentationData:TelegramPresentationData",
+        "//submodules/SelectablePeerNode:SelectablePeerNode",
+        "//submodules/PeerOnlineMarkerNode:PeerOnlineMarkerNode",
+        "//submodules/TelegramStringFormatting:TelegramStringFormatting",
+        "//submodules/ContextUI:ContextUI",
+        "//submodules/AccountContext:AccountContext",
+    ],
+    visibility = [
+        "//visibility:public",
+    ],
+)
diff --git a/submodules/ImageBlur/BUCK b/submodules/ImageBlur/BUCK
index 48d65a2fb9..092d53065b 100644
--- a/submodules/ImageBlur/BUCK
+++ b/submodules/ImageBlur/BUCK
@@ -4,14 +4,10 @@ static_library(
     name = "ImageBlur",
     srcs = glob([
         "Sources/**/*.swift",
-        "Sources/*.m",
     ]),
-    headers = glob([
-        "Sources/*.h",
-    ], exclude = ["Sources/ImageBlur.h"]),
-    exported_headers = glob([
-        "Sources/*.h",
-    ], exclude = ["Sources/ImageBlur.h"]),
+    deps = [
+        "//submodules/FastBlur:FastBlur",
+    ],
     frameworks = [
         "$SDKROOT/System/Library/Frameworks/Foundation.framework",
         "$SDKROOT/System/Library/Frameworks/UIKit.framework",
diff --git a/submodules/ImageBlur/BUILD b/submodules/ImageBlur/BUILD
new file mode 100644
index 0000000000..bb486d2964
--- /dev/null
+++ b/submodules/ImageBlur/BUILD
@@ -0,0 +1,15 @@
+load("@build_bazel_rules_swift//swift:swift.bzl", "swift_library")
+
+swift_library(
+    name = "ImageBlur",
+    module_name = "ImageBlur",
+    srcs = glob([
+		"Sources/**/*.swift",
+    ]),
+    deps = [
+	    "//submodules/FastBlur:FastBlur",
+    ],
+    visibility = [
+        "//visibility:public",
+    ],
+)
diff --git a/submodules/ImageBlur/Info.plist b/submodules/ImageBlur/Info.plist
deleted file mode 100644
index e1fe4cfb7b..0000000000
--- a/submodules/ImageBlur/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/ImageBlur/Sources/ImageBlur.h b/submodules/ImageBlur/Sources/ImageBlur.h
deleted file mode 100644
index c70dd7a483..0000000000
--- a/submodules/ImageBlur/Sources/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/ImageCompression/BUILD b/submodules/ImageCompression/BUILD
new file mode 100644
index 0000000000..5c95cf7b22
--- /dev/null
+++ b/submodules/ImageCompression/BUILD
@@ -0,0 +1,12 @@
+load("@build_bazel_rules_swift//swift:swift.bzl", "swift_library")
+
+swift_library(
+    name = "ImageCompression",
+    module_name = "ImageCompression",
+    srcs = glob([
+		"Sources/**/*.swift",
+    ]),
+    visibility = [
+        "//visibility:public",
+    ],
+)
diff --git a/submodules/ImageCompression/Info.plist b/submodules/ImageCompression/Info.plist
deleted file mode 100644
index e1fe4cfb7b..0000000000
--- a/submodules/ImageCompression/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/ImageCompression/Sources/ImageCompression.h b/submodules/ImageCompression/Sources/ImageCompression.h
deleted file mode 100644
index b0c98db10b..0000000000
--- a/submodules/ImageCompression/Sources/ImageCompression.h
+++ /dev/null
@@ -1,19 +0,0 @@
-//
-//  ImageCompression.h
-//  ImageCompression
-//
-//  Created by Peter on 8/12/19.
-//  Copyright © 2019 Telegram Messenger LLP. All rights reserved.
-//
-
-#import <UIKit/UIKit.h>
-
-//! Project version number for ImageCompression.
-FOUNDATION_EXPORT double ImageCompressionVersionNumber;
-
-//! Project version string for ImageCompression.
-FOUNDATION_EXPORT const unsigned char ImageCompressionVersionString[];
-
-// In this header, you should import all the public headers of your framework using statements like #import <ImageCompression/PublicHeader.h>
-
-
diff --git a/submodules/ImageTransparency/BUILD b/submodules/ImageTransparency/BUILD
new file mode 100644
index 0000000000..acae43de49
--- /dev/null
+++ b/submodules/ImageTransparency/BUILD
@@ -0,0 +1,15 @@
+load("@build_bazel_rules_swift//swift:swift.bzl", "swift_library")
+
+swift_library(
+    name = "ImageTransparency",
+    module_name = "ImageTransparency",
+    srcs = glob([
+		"Sources/**/*.swift",
+    ]),
+    deps = [
+    	"//submodules/Display:Display",
+    ],
+    visibility = [
+        "//visibility:public",
+    ],
+)
diff --git a/submodules/ImageTransparency/Info.plist b/submodules/ImageTransparency/Info.plist
deleted file mode 100644
index e1fe4cfb7b..0000000000
--- a/submodules/ImageTransparency/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/ImageTransparency/Sources/ImageTransparency.h b/submodules/ImageTransparency/Sources/ImageTransparency.h
deleted file mode 100644
index 074d3cbba7..0000000000
--- a/submodules/ImageTransparency/Sources/ImageTransparency.h
+++ /dev/null
@@ -1,19 +0,0 @@
-//
-//  ImageTransparency.h
-//  ImageTransparency
-//
-//  Created by Peter on 8/10/19.
-//  Copyright © 2019 Telegram Messenger LLP. All rights reserved.
-//
-
-#import <UIKit/UIKit.h>
-
-//! Project version number for ImageTransparency.
-FOUNDATION_EXPORT double ImageTransparencyVersionNumber;
-
-//! Project version string for ImageTransparency.
-FOUNDATION_EXPORT const unsigned char ImageTransparencyVersionString[];
-
-// In this header, you should import all the public headers of your framework using statements like #import <ImageTransparency/PublicHeader.h>
-
-
diff --git a/submodules/InstantPageCache/BUILD b/submodules/InstantPageCache/BUILD
new file mode 100644
index 0000000000..3294de3829
--- /dev/null
+++ b/submodules/InstantPageCache/BUILD
@@ -0,0 +1,20 @@
+load("@build_bazel_rules_swift//swift:swift.bzl", "swift_library")
+
+swift_library(
+    name = "InstantPageCache",
+    module_name = "InstantPageCache",
+    srcs = glob([
+		"Sources/**/*.swift",
+    ]),
+    deps = [
+        "//submodules/TelegramCore:TelegramCore",
+        "//submodules/SyncCore:SyncCore",
+        "//submodules/Postbox:Postbox",
+        "//submodules/SSignalKit/SwiftSignalKit:SwiftSignalKit",
+        "//submodules/TelegramUIPreferences:TelegramUIPreferences",
+        "//submodules/PersistentStringHash:PersistentStringHash",
+    ],
+    visibility = [
+        "//visibility:public",
+    ],
+)
diff --git a/submodules/InstantPageCache/Info.plist b/submodules/InstantPageCache/Info.plist
deleted file mode 100644
index e1fe4cfb7b..0000000000
--- a/submodules/InstantPageCache/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/InstantPageCache/Sources/InstantPageCache.h b/submodules/InstantPageCache/Sources/InstantPageCache.h
deleted file mode 100644
index 370730c351..0000000000
--- a/submodules/InstantPageCache/Sources/InstantPageCache.h
+++ /dev/null
@@ -1,19 +0,0 @@
-//
-//  InstantPageCache.h
-//  InstantPageCache
-//
-//  Created by Peter on 8/17/19.
-//  Copyright © 2019 Telegram Messenger LLP. All rights reserved.
-//
-
-#import <UIKit/UIKit.h>
-
-//! Project version number for InstantPageCache.
-FOUNDATION_EXPORT double InstantPageCacheVersionNumber;
-
-//! Project version string for InstantPageCache.
-FOUNDATION_EXPORT const unsigned char InstantPageCacheVersionString[];
-
-// In this header, you should import all the public headers of your framework using statements like #import <InstantPageCache/PublicHeader.h>
-
-
diff --git a/submodules/InstantPageUI/BUILD b/submodules/InstantPageUI/BUILD
new file mode 100644
index 0000000000..feb816ea5e
--- /dev/null
+++ b/submodules/InstantPageUI/BUILD
@@ -0,0 +1,29 @@
+load("@build_bazel_rules_swift//swift:swift.bzl", "swift_library")
+
+swift_library(
+    name = "InstantPageUI",
+    module_name = "InstantPageUI",
+    srcs = glob([
+		"Sources/**/*.swift",
+    ]),
+    deps = [
+        "//submodules/SSignalKit/SwiftSignalKit:SwiftSignalKit",
+        "//submodules/AsyncDisplayKit:AsyncDisplayKit",
+        "//submodules/Display:Display",
+        "//submodules/Postbox:Postbox",
+        "//submodules/TelegramCore:TelegramCore",
+        "//submodules/SyncCore:SyncCore",
+        "//submodules/TelegramPresentationData:TelegramPresentationData",
+        "//submodules/TelegramUIPreferences:TelegramUIPreferences",
+        "//submodules/GalleryUI:GalleryUI",
+        "//submodules/MusicAlbumArtResources:MusicAlbumArtResources",
+        "//submodules/LiveLocationPositionNode:LiveLocationPositionNode",
+        "//submodules/MosaicLayout:MosaicLayout",
+        "//submodules/LocationUI:LocationUI",
+        "//submodules/AppBundle:AppBundle",
+        "//submodules/LocationResources:LocationResources",
+    ],
+    visibility = [
+        "//visibility:public",
+    ],
+)
diff --git a/submodules/InstantPageUI/Info.plist b/submodules/InstantPageUI/Info.plist
deleted file mode 100644
index e1fe4cfb7b..0000000000
--- a/submodules/InstantPageUI/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/InstantPageUI/Sources/InstantPageUI.h b/submodules/InstantPageUI/Sources/InstantPageUI.h
deleted file mode 100644
index 5ac61c2c82..0000000000
--- a/submodules/InstantPageUI/Sources/InstantPageUI.h
+++ /dev/null
@@ -1,19 +0,0 @@
-//
-//  InstantPageUI.h
-//  InstantPageUI
-//
-//  Created by Peter on 8/12/19.
-//  Copyright © 2019 Telegram Messenger LLP. All rights reserved.
-//
-
-#import <UIKit/UIKit.h>
-
-//! Project version number for InstantPageUI.
-FOUNDATION_EXPORT double InstantPageUIVersionNumber;
-
-//! Project version string for InstantPageUI.
-FOUNDATION_EXPORT const unsigned char InstantPageUIVersionString[];
-
-// In this header, you should import all the public headers of your framework using statements like #import <InstantPageUI/PublicHeader.h>
-
-
diff --git a/submodules/ItemListAddressItem/BUILD b/submodules/ItemListAddressItem/BUILD
new file mode 100644
index 0000000000..76423972ee
--- /dev/null
+++ b/submodules/ItemListAddressItem/BUILD
@@ -0,0 +1,23 @@
+load("@build_bazel_rules_swift//swift:swift.bzl", "swift_library")
+
+swift_library(
+    name = "ItemListAddressItem",
+    module_name = "ItemListAddressItem",
+    srcs = glob([
+		"Sources/**/*.swift",
+    ]),
+    deps = [
+        "//submodules/SSignalKit/SwiftSignalKit:SwiftSignalKit",
+        "//submodules/AsyncDisplayKit:AsyncDisplayKit",
+        "//submodules/Display:Display",
+        "//submodules/TelegramPresentationData:TelegramPresentationData",
+        "//submodules/ItemListUI:ItemListUI",
+        "//submodules/AccountContext:AccountContext",
+        "//submodules/TextFormat:TextFormat",
+        "//submodules/AppBundle:AppBundle",
+        "//submodules/PresentationDataUtils:PresentationDataUtils",
+    ],
+    visibility = [
+        "//visibility:public",
+    ],
+)
diff --git a/submodules/ItemListAddressItem/Info.plist b/submodules/ItemListAddressItem/Info.plist
deleted file mode 100644
index e1fe4cfb7b..0000000000
--- a/submodules/ItemListAddressItem/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/ItemListAddressItem/Sources/ItemListAddressItem.h b/submodules/ItemListAddressItem/Sources/ItemListAddressItem.h
deleted file mode 100644
index 154d3fd620..0000000000
--- a/submodules/ItemListAddressItem/Sources/ItemListAddressItem.h
+++ /dev/null
@@ -1,19 +0,0 @@
-//
-//  ItemListAddressItem.h
-//  ItemListAddressItem
-//
-//  Created by Peter on 8/15/19.
-//  Copyright © 2019 Telegram Messenger LLP. All rights reserved.
-//
-
-#import <UIKit/UIKit.h>
-
-//! Project version number for ItemListAddressItem.
-FOUNDATION_EXPORT double ItemListAddressItemVersionNumber;
-
-//! Project version string for ItemListAddressItem.
-FOUNDATION_EXPORT const unsigned char ItemListAddressItemVersionString[];
-
-// In this header, you should import all the public headers of your framework using statements like #import <ItemListAddressItem/PublicHeader.h>
-
-
diff --git a/submodules/ItemListAvatarAndNameInfoItem/BUILD b/submodules/ItemListAvatarAndNameInfoItem/BUILD
new file mode 100644
index 0000000000..85e56c9a4d
--- /dev/null
+++ b/submodules/ItemListAvatarAndNameInfoItem/BUILD
@@ -0,0 +1,30 @@
+load("@build_bazel_rules_swift//swift:swift.bzl", "swift_library")
+
+swift_library(
+    name = "ItemListAvatarAndNameInfoItem",
+    module_name = "ItemListAvatarAndNameInfoItem",
+    srcs = glob([
+		"Sources/**/*.swift",
+    ]),
+    deps = [
+        "//submodules/SSignalKit/SwiftSignalKit:SwiftSignalKit",
+        "//submodules/AsyncDisplayKit:AsyncDisplayKit",
+        "//submodules/Display:Display",
+        "//submodules/Postbox:Postbox",
+        "//submodules/TelegramCore:TelegramCore",
+        "//submodules/SyncCore:SyncCore",
+        "//submodules/TelegramPresentationData:TelegramPresentationData",
+        "//submodules/PeerPresenceStatusManager:PeerPresenceStatusManager",
+        "//submodules/TelegramStringFormatting:TelegramStringFormatting",
+        "//submodules/AvatarNode:AvatarNode",
+        "//submodules/ActivityIndicator:ActivityIndicator",
+        "//submodules/ItemListUI:ItemListUI",
+        "//submodules/AppBundle:AppBundle",
+        "//submodules/PresentationDataUtils:PresentationDataUtils",
+        "//submodules/PhoneNumberFormat:PhoneNumberFormat",
+        "//submodules/AccountContext:AccountContext",
+    ],
+    visibility = [
+        "//visibility:public",
+    ],
+)
diff --git a/submodules/ItemListAvatarAndNameInfoItem/Info.plist b/submodules/ItemListAvatarAndNameInfoItem/Info.plist
deleted file mode 100644
index e1fe4cfb7b..0000000000
--- a/submodules/ItemListAvatarAndNameInfoItem/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/ItemListAvatarAndNameInfoItem/Sources/ItemListAvatarAndNameInfoItem.h b/submodules/ItemListAvatarAndNameInfoItem/Sources/ItemListAvatarAndNameInfoItem.h
deleted file mode 100644
index 9335e2fb22..0000000000
--- a/submodules/ItemListAvatarAndNameInfoItem/Sources/ItemListAvatarAndNameInfoItem.h
+++ /dev/null
@@ -1,19 +0,0 @@
-//
-//  ItemListAvatarAndNameInfoItem.h
-//  ItemListAvatarAndNameInfoItem
-//
-//  Created by Peter on 8/15/19.
-//  Copyright © 2019 Telegram Messenger LLP. All rights reserved.
-//
-
-#import <UIKit/UIKit.h>
-
-//! Project version number for ItemListAvatarAndNameInfoItem.
-FOUNDATION_EXPORT double ItemListAvatarAndNameInfoItemVersionNumber;
-
-//! Project version string for ItemListAvatarAndNameInfoItem.
-FOUNDATION_EXPORT const unsigned char ItemListAvatarAndNameInfoItemVersionString[];
-
-// In this header, you should import all the public headers of your framework using statements like #import <ItemListAvatarAndNameInfoItem/PublicHeader.h>
-
-
diff --git a/submodules/ItemListPeerActionItem/BUILD b/submodules/ItemListPeerActionItem/BUILD
new file mode 100644
index 0000000000..76e9eece2a
--- /dev/null
+++ b/submodules/ItemListPeerActionItem/BUILD
@@ -0,0 +1,20 @@
+load("@build_bazel_rules_swift//swift:swift.bzl", "swift_library")
+
+swift_library(
+    name = "ItemListPeerActionItem",
+    module_name = "ItemListPeerActionItem",
+    srcs = glob([
+		"Sources/**/*.swift",
+    ]),
+    deps = [
+        "//submodules/SSignalKit/SwiftSignalKit:SwiftSignalKit",
+        "//submodules/AsyncDisplayKit:AsyncDisplayKit",
+        "//submodules/Display:Display",
+        "//submodules/TelegramPresentationData:TelegramPresentationData",
+        "//submodules/ItemListUI:ItemListUI",
+        "//submodules/PresentationDataUtils:PresentationDataUtils",
+    ],
+    visibility = [
+        "//visibility:public",
+    ],
+)
diff --git a/submodules/ItemListPeerActionItem/Info.plist b/submodules/ItemListPeerActionItem/Info.plist
deleted file mode 100644
index e1fe4cfb7b..0000000000
--- a/submodules/ItemListPeerActionItem/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/ItemListPeerActionItem/Sources/ItemListPeerActionItem.h b/submodules/ItemListPeerActionItem/Sources/ItemListPeerActionItem.h
deleted file mode 100644
index 7cc56b137b..0000000000
--- a/submodules/ItemListPeerActionItem/Sources/ItemListPeerActionItem.h
+++ /dev/null
@@ -1,19 +0,0 @@
-//
-//  ItemListPeerActionItem.h
-//  ItemListPeerActionItem
-//
-//  Created by Peter on 8/15/19.
-//  Copyright © 2019 Telegram Messenger LLP. All rights reserved.
-//
-
-#import <UIKit/UIKit.h>
-
-//! Project version number for ItemListPeerActionItem.
-FOUNDATION_EXPORT double ItemListPeerActionItemVersionNumber;
-
-//! Project version string for ItemListPeerActionItem.
-FOUNDATION_EXPORT const unsigned char ItemListPeerActionItemVersionString[];
-
-// In this header, you should import all the public headers of your framework using statements like #import <ItemListPeerActionItem/PublicHeader.h>
-
-
diff --git a/submodules/ItemListPeerItem/BUILD b/submodules/ItemListPeerItem/BUILD
new file mode 100644
index 0000000000..804ffb8a2f
--- /dev/null
+++ b/submodules/ItemListPeerItem/BUILD
@@ -0,0 +1,29 @@
+load("@build_bazel_rules_swift//swift:swift.bzl", "swift_library")
+
+swift_library(
+    name = "ItemListPeerItem",
+    module_name = "ItemListPeerItem",
+    srcs = glob([
+		"Sources/**/*.swift",
+    ]),
+    deps = [
+        "//submodules/SSignalKit/SwiftSignalKit:SwiftSignalKit",
+        "//submodules/AsyncDisplayKit:AsyncDisplayKit",
+        "//submodules/Display:Display",
+        "//submodules/Postbox:Postbox",
+        "//submodules/TelegramCore:TelegramCore",
+        "//submodules/SyncCore:SyncCore",
+        "//submodules/AvatarNode:AvatarNode",
+        "//submodules/TelegramPresentationData:TelegramPresentationData",
+        "//submodules/TelegramStringFormatting:TelegramStringFormatting",
+        "//submodules/PeerPresenceStatusManager:PeerPresenceStatusManager",
+        "//submodules/ItemListUI:ItemListUI",
+        "//submodules/TelegramUIPreferences:TelegramUIPreferences",
+        "//submodules/ContextUI:ContextUI",
+        "//submodules/PresentationDataUtils:PresentationDataUtils",
+        "//submodules/AccountContext:AccountContext",
+    ],
+    visibility = [
+        "//visibility:public",
+    ],
+)
diff --git a/submodules/ItemListPeerItem/Info.plist b/submodules/ItemListPeerItem/Info.plist
deleted file mode 100644
index e1fe4cfb7b..0000000000
--- a/submodules/ItemListPeerItem/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/ItemListPeerItem/Sources/ItemListPeerItem.h b/submodules/ItemListPeerItem/Sources/ItemListPeerItem.h
deleted file mode 100644
index 9f6b2332df..0000000000
--- a/submodules/ItemListPeerItem/Sources/ItemListPeerItem.h
+++ /dev/null
@@ -1,19 +0,0 @@
-//
-//  ItemListPeerItem.h
-//  ItemListPeerItem
-//
-//  Created by Peter on 8/13/19.
-//  Copyright © 2019 Telegram Messenger LLP. All rights reserved.
-//
-
-#import <UIKit/UIKit.h>
-
-//! Project version number for ItemListPeerItem.
-FOUNDATION_EXPORT double ItemListPeerItemVersionNumber;
-
-//! Project version string for ItemListPeerItem.
-FOUNDATION_EXPORT const unsigned char ItemListPeerItemVersionString[];
-
-// In this header, you should import all the public headers of your framework using statements like #import <ItemListPeerItem/PublicHeader.h>
-
-
diff --git a/submodules/ItemListStickerPackItem/BUILD b/submodules/ItemListStickerPackItem/BUILD
new file mode 100644
index 0000000000..a53501ed9c
--- /dev/null
+++ b/submodules/ItemListStickerPackItem/BUILD
@@ -0,0 +1,26 @@
+load("@build_bazel_rules_swift//swift:swift.bzl", "swift_library")
+
+swift_library(
+    name = "ItemListStickerPackItem",
+    module_name = "ItemListStickerPackItem",
+    srcs = glob([
+		"Sources/**/*.swift",
+    ]),
+    deps = [
+        "//submodules/SSignalKit/SwiftSignalKit:SwiftSignalKit",
+        "//submodules/AsyncDisplayKit:AsyncDisplayKit",
+        "//submodules/Display:Display",
+        "//submodules/Postbox:Postbox",
+        "//submodules/TelegramCore:TelegramCore",
+        "//submodules/SyncCore:SyncCore",
+        "//submodules/TelegramPresentationData:TelegramPresentationData",
+        "//submodules/ItemListUI:ItemListUI",
+        "//submodules/StickerResources:StickerResources",
+        "//submodules/AnimatedStickerNode:AnimatedStickerNode",
+        "//submodules/TelegramAnimatedStickerNode:TelegramAnimatedStickerNode",
+        "//submodules/PresentationDataUtils:PresentationDataUtils",
+    ],
+    visibility = [
+        "//visibility:public",
+    ],
+)
diff --git a/submodules/ItemListStickerPackItem/Info.plist b/submodules/ItemListStickerPackItem/Info.plist
deleted file mode 100644
index e1fe4cfb7b..0000000000
--- a/submodules/ItemListStickerPackItem/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/ItemListStickerPackItem/Sources/ItemListStickerPackItem.h b/submodules/ItemListStickerPackItem/Sources/ItemListStickerPackItem.h
deleted file mode 100644
index 706ef2a41d..0000000000
--- a/submodules/ItemListStickerPackItem/Sources/ItemListStickerPackItem.h
+++ /dev/null
@@ -1,19 +0,0 @@
-//
-//  ItemListStickerPackItem.h
-//  ItemListStickerPackItem
-//
-//  Created by Peter on 8/15/19.
-//  Copyright © 2019 Telegram Messenger LLP. All rights reserved.
-//
-
-#import <UIKit/UIKit.h>
-
-//! Project version number for ItemListStickerPackItem.
-FOUNDATION_EXPORT double ItemListStickerPackItemVersionNumber;
-
-//! Project version string for ItemListStickerPackItem.
-FOUNDATION_EXPORT const unsigned char ItemListStickerPackItemVersionString[];
-
-// In this header, you should import all the public headers of your framework using statements like #import <ItemListStickerPackItem/PublicHeader.h>
-
-
diff --git a/submodules/ItemListUI/BUILD b/submodules/ItemListUI/BUILD
new file mode 100644
index 0000000000..68433a99c3
--- /dev/null
+++ b/submodules/ItemListUI/BUILD
@@ -0,0 +1,29 @@
+load("@build_bazel_rules_swift//swift:swift.bzl", "swift_library")
+
+swift_library(
+    name = "ItemListUI",
+    module_name = "ItemListUI",
+    srcs = glob([
+		"Sources/**/*.swift",
+    ]),
+    deps = [
+        "//submodules/SSignalKit/SwiftSignalKit:SwiftSignalKit",
+        "//submodules/AsyncDisplayKit:AsyncDisplayKit",
+        "//submodules/Display:Display",
+        "//submodules/TelegramPresentationData:TelegramPresentationData",
+        "//submodules/MergeLists:MergeLists",
+        "//submodules/TextFormat:TextFormat",
+        "//submodules/Markdown:Markdown",
+        "//submodules/ProgressNavigationButtonNode:ProgressNavigationButtonNode",
+        "//submodules/SwitchNode:SwitchNode",
+        "//submodules/AnimatedStickerNode:AnimatedStickerNode",
+        "//submodules/TelegramAnimatedStickerNode:TelegramAnimatedStickerNode",
+        "//submodules/CheckNode:CheckNode",
+        "//submodules/SegmentedControlNode:SegmentedControlNode",
+        "//submodules/AccountContext:AccountContext",
+        "//submodules/AnimationUI:AnimationUI",
+    ],
+    visibility = [
+        "//visibility:public",
+    ],
+)
diff --git a/submodules/ItemListUI/Info.plist b/submodules/ItemListUI/Info.plist
deleted file mode 100644
index e1fe4cfb7b..0000000000
--- a/submodules/ItemListUI/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/ItemListUI/Sources/ItemListMaskAccessory.swift b/submodules/ItemListUI/Sources/ItemListMaskAccessory.swift
index 8d6f0c3862..11300794df 100644
--- a/submodules/ItemListUI/Sources/ItemListMaskAccessory.swift
+++ b/submodules/ItemListUI/Sources/ItemListMaskAccessory.swift
@@ -1,6 +1,7 @@
 import Foundation
 import UIKit
 import Display
+import AsyncDisplayKit
 
 final class ItemListMaskAccessoryItem: ListViewAccessoryItem {
     private let sectionId: Int32
diff --git a/submodules/ItemListUI/Sources/ItemListUI.h b/submodules/ItemListUI/Sources/ItemListUI.h
deleted file mode 100644
index 6bea7bc2a3..0000000000
--- a/submodules/ItemListUI/Sources/ItemListUI.h
+++ /dev/null
@@ -1,19 +0,0 @@
-//
-//  ItemListUI.h
-//  ItemListUI
-//
-//  Created by Peter on 8/1/19.
-//  Copyright © 2019 Telegram Messenger LLP. All rights reserved.
-//
-
-#import <UIKit/UIKit.h>
-
-//! Project version number for ItemListUI.
-FOUNDATION_EXPORT double ItemListUIVersionNumber;
-
-//! Project version string for ItemListUI.
-FOUNDATION_EXPORT const unsigned char ItemListUIVersionString[];
-
-// In this header, you should import all the public headers of your framework using statements like #import <ItemListUI/PublicHeader.h>
-
-
diff --git a/submodules/ItemListUI/Sources/Items/ItemListEditableItem.swift b/submodules/ItemListUI/Sources/Items/ItemListEditableItem.swift
index dc6f9a1a6f..b95d244833 100644
--- a/submodules/ItemListUI/Sources/Items/ItemListEditableItem.swift
+++ b/submodules/ItemListUI/Sources/Items/ItemListEditableItem.swift
@@ -91,6 +91,7 @@ open class ItemListRevealOptionsItemNode: ListViewItemNode, UIGestureRecognizerD
         
         let recognizer = ItemListRevealOptionsGestureRecognizer(target: self, action: #selector(self.revealGesture(_:)))
         self.recognizer = recognizer
+        recognizer.delegate = self
         recognizer.allowAnyDirection = self.allowAnyDirection
         self.view.addGestureRecognizer(recognizer)
         
@@ -100,6 +101,16 @@ open class ItemListRevealOptionsItemNode: ListViewItemNode, UIGestureRecognizerD
         self.view.addGestureRecognizer(tapRecognizer)
         
         self.view.disablesInteractiveTransitionGestureRecognizer = self.allowAnyDirection
+        
+        self.view.disablesInteractiveTransitionGestureRecognizerNow = { [weak self] in
+            guard let strongSelf = self else {
+                return false
+            }
+            if !strongSelf.revealOffset.isZero {
+                return true
+            }
+            return false
+        }
     }
     
     open func setRevealOptions(_ options: (left: [ItemListRevealOption], right: [ItemListRevealOption])) {
diff --git a/submodules/ItemListUI/Sources/Items/ItemListSingleLineInputItem.swift b/submodules/ItemListUI/Sources/Items/ItemListSingleLineInputItem.swift
index 5b8028f7a9..adadacfda0 100644
--- a/submodules/ItemListUI/Sources/Items/ItemListSingleLineInputItem.swift
+++ b/submodules/ItemListUI/Sources/Items/ItemListSingleLineInputItem.swift
@@ -38,6 +38,7 @@ public class ItemListSingleLineInputItem: ListViewItem, ItemListItem {
     let returnKeyType: UIReturnKeyType
     let spacing: CGFloat
     let clearType: ItemListSingleLineInputClearType
+    let maxLength: Int
     let enabled: Bool
     public let sectionId: ItemListSectionId
     let action: () -> Void
@@ -45,9 +46,10 @@ public class ItemListSingleLineInputItem: ListViewItem, ItemListItem {
     let shouldUpdateText: (String) -> Bool
     let processPaste: ((String) -> String)?
     let updatedFocus: ((Bool) -> Void)?
+    let cleared: (() -> Void)?
     public let tag: ItemListItemTag?
     
-    public init(presentationData: ItemListPresentationData, title: NSAttributedString, text: String, placeholder: String, type: ItemListSingleLineInputItemType = .regular(capitalization: true, autocorrection: true), returnKeyType: UIReturnKeyType = .`default`, spacing: CGFloat = 0.0, clearType: ItemListSingleLineInputClearType = .none, enabled: Bool = true, tag: ItemListItemTag? = nil, sectionId: ItemListSectionId, textUpdated: @escaping (String) -> Void, shouldUpdateText: @escaping (String) -> Bool = { _ in return true }, processPaste: ((String) -> String)? = nil, updatedFocus: ((Bool) -> Void)? = nil, action: @escaping () -> Void) {
+    public init(presentationData: ItemListPresentationData, title: NSAttributedString, text: String, placeholder: String, type: ItemListSingleLineInputItemType = .regular(capitalization: true, autocorrection: true), returnKeyType: UIReturnKeyType = .`default`, spacing: CGFloat = 0.0, clearType: ItemListSingleLineInputClearType = .none, maxLength: Int = 0, enabled: Bool = true, tag: ItemListItemTag? = nil, sectionId: ItemListSectionId, textUpdated: @escaping (String) -> Void, shouldUpdateText: @escaping (String) -> Bool = { _ in return true }, processPaste: ((String) -> String)? = nil, updatedFocus: ((Bool) -> Void)? = nil, action: @escaping () -> Void, cleared: (() -> Void)? = nil) {
         self.presentationData = presentationData
         self.title = title
         self.text = text
@@ -56,6 +58,7 @@ public class ItemListSingleLineInputItem: ListViewItem, ItemListItem {
         self.returnKeyType = returnKeyType
         self.spacing = spacing
         self.clearType = clearType
+        self.maxLength = maxLength
         self.enabled = enabled
         self.tag = tag
         self.sectionId = sectionId
@@ -64,6 +67,7 @@ public class ItemListSingleLineInputItem: ListViewItem, ItemListItem {
         self.processPaste = processPaste
         self.updatedFocus = updatedFocus
         self.action = action
+        self.cleared = cleared
     }
     
     public func nodeConfiguredForParams(async: @escaping (@escaping () -> Void) -> Void, params: ListViewItemLayoutParams, synchronousLoads: Bool, previousItem: ListViewItem?, nextItem: ListViewItem?, completion: @escaping (ListViewItemNode, @escaping () -> (Signal<Void, NoError>?, (ListViewItemApply) -> Void)) -> Void) {
@@ -420,6 +424,7 @@ public class ItemListSingleLineInputItemNode: ListViewItemNode, UITextFieldDeleg
     @objc private func clearButtonPressed() {
         self.textNode.textField.text = ""
         self.textUpdated("")
+        self.item?.cleared?()
     }
     
     private func textUpdated(_ text: String) {
@@ -438,6 +443,9 @@ public class ItemListSingleLineInputItemNode: ListViewItemNode, UITextFieldDeleg
             if !item.shouldUpdateText(newText) {
                 return false
             }
+            if item.maxLength != 0 && newText.count > item.maxLength {
+                return false
+            }
         }
         
         if string.count > 1, let item = self.item, let processPaste = item.processPaste {
diff --git a/submodules/ItemListVenueItem/BUILD b/submodules/ItemListVenueItem/BUILD
new file mode 100644
index 0000000000..f80b0d9376
--- /dev/null
+++ b/submodules/ItemListVenueItem/BUILD
@@ -0,0 +1,25 @@
+load("@build_bazel_rules_swift//swift:swift.bzl", "swift_library")
+
+swift_library(
+    name = "ItemListVenueItem",
+    module_name = "ItemListVenueItem",
+    srcs = glob([
+		"Sources/**/*.swift",
+    ]),
+    deps = [
+        "//submodules/SSignalKit/SwiftSignalKit:SwiftSignalKit",
+        "//submodules/AsyncDisplayKit:AsyncDisplayKit",
+        "//submodules/Display:Display",
+        "//submodules/Postbox:Postbox",
+        "//submodules/TelegramCore:TelegramCore",
+        "//submodules/SyncCore:SyncCore",
+        "//submodules/TelegramPresentationData:TelegramPresentationData",
+        "//submodules/ItemListUI:ItemListUI",
+        "//submodules/TelegramUIPreferences:TelegramUIPreferences",
+        "//submodules/PresentationDataUtils:PresentationDataUtils",
+        "//submodules/LocationResources:LocationResources",
+    ],
+    visibility = [
+        "//visibility:public",
+    ],
+)
diff --git a/submodules/ItemListVenueItem/Info.plist b/submodules/ItemListVenueItem/Info.plist
deleted file mode 100644
index e1fe4cfb7b..0000000000
--- a/submodules/ItemListVenueItem/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/JoinLinkPreviewUI/BUILD b/submodules/JoinLinkPreviewUI/BUILD
new file mode 100644
index 0000000000..cb02124a89
--- /dev/null
+++ b/submodules/JoinLinkPreviewUI/BUILD
@@ -0,0 +1,27 @@
+load("@build_bazel_rules_swift//swift:swift.bzl", "swift_library")
+
+swift_library(
+    name = "JoinLinkPreviewUI",
+    module_name = "JoinLinkPreviewUI",
+    srcs = glob([
+		"Sources/**/*.swift",
+    ]),
+    deps = [
+        "//submodules/SSignalKit/SwiftSignalKit:SwiftSignalKit",
+        "//submodules/AsyncDisplayKit:AsyncDisplayKit",
+        "//submodules/Display:Display",
+        "//submodules/Postbox:Postbox",
+        "//submodules/TelegramCore:TelegramCore",
+        "//submodules/SyncCore:SyncCore",
+        "//submodules/TelegramPresentationData:TelegramPresentationData",
+        "//submodules/AccountContext:AccountContext",
+        "//submodules/AlertUI:AlertUI",
+        "//submodules/PresentationDataUtils:PresentationDataUtils",
+        "//submodules/ShareController:ShareController",
+        "//submodules/SelectablePeerNode:SelectablePeerNode",
+        "//submodules/PeerInfoUI:PeerInfoUI",
+    ],
+    visibility = [
+        "//visibility:public",
+    ],
+)
diff --git a/submodules/JoinLinkPreviewUI/Info.plist b/submodules/JoinLinkPreviewUI/Info.plist
deleted file mode 100644
index e1fe4cfb7b..0000000000
--- a/submodules/JoinLinkPreviewUI/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/JoinLinkPreviewUI/Sources/JoinLinkPreviewUI.h b/submodules/JoinLinkPreviewUI/Sources/JoinLinkPreviewUI.h
deleted file mode 100644
index f18cf93478..0000000000
--- a/submodules/JoinLinkPreviewUI/Sources/JoinLinkPreviewUI.h
+++ /dev/null
@@ -1,19 +0,0 @@
-//
-//  JoinLinkPreviewUI.h
-//  JoinLinkPreviewUI
-//
-//  Created by Peter on 8/15/19.
-//  Copyright © 2019 Telegram Messenger LLP. All rights reserved.
-//
-
-#import <UIKit/UIKit.h>
-
-//! Project version number for JoinLinkPreviewUI.
-FOUNDATION_EXPORT double JoinLinkPreviewUIVersionNumber;
-
-//! Project version string for JoinLinkPreviewUI.
-FOUNDATION_EXPORT const unsigned char JoinLinkPreviewUIVersionString[];
-
-// In this header, you should import all the public headers of your framework using statements like #import <JoinLinkPreviewUI/PublicHeader.h>
-
-
diff --git a/submodules/LanguageLinkPreviewUI/BUILD b/submodules/LanguageLinkPreviewUI/BUILD
new file mode 100644
index 0000000000..78353c0b01
--- /dev/null
+++ b/submodules/LanguageLinkPreviewUI/BUILD
@@ -0,0 +1,27 @@
+load("@build_bazel_rules_swift//swift:swift.bzl", "swift_library")
+
+swift_library(
+    name = "LanguageLinkPreviewUI",
+    module_name = "LanguageLinkPreviewUI",
+    srcs = glob([
+		"Sources/**/*.swift",
+    ]),
+    deps = [
+        "//submodules/SSignalKit/SwiftSignalKit:SwiftSignalKit",
+        "//submodules/AsyncDisplayKit:AsyncDisplayKit",
+        "//submodules/Display:Display",
+        "//submodules/Postbox:Postbox",
+        "//submodules/TelegramCore:TelegramCore",
+        "//submodules/SyncCore:SyncCore",
+        "//submodules/TelegramPresentationData:TelegramPresentationData",
+        "//submodules/AccountContext:AccountContext",
+        "//submodules/TextFormat:TextFormat",
+        "//submodules/Markdown:Markdown",
+        "//submodules/ShareController:ShareController",
+        "//submodules/AlertUI:AlertUI",
+        "//submodules/PresentationDataUtils:PresentationDataUtils",
+    ],
+    visibility = [
+        "//visibility:public",
+    ],
+)
diff --git a/submodules/LanguageLinkPreviewUI/Info.plist b/submodules/LanguageLinkPreviewUI/Info.plist
deleted file mode 100644
index e1fe4cfb7b..0000000000
--- a/submodules/LanguageLinkPreviewUI/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/LanguageLinkPreviewUI/Sources/LanguageLinkPreviewUI.h b/submodules/LanguageLinkPreviewUI/Sources/LanguageLinkPreviewUI.h
deleted file mode 100644
index 83cc65cca4..0000000000
--- a/submodules/LanguageLinkPreviewUI/Sources/LanguageLinkPreviewUI.h
+++ /dev/null
@@ -1,19 +0,0 @@
-//
-//  LanguageLinkPreviewUI.h
-//  LanguageLinkPreviewUI
-//
-//  Created by Peter on 8/15/19.
-//  Copyright © 2019 Telegram Messenger LLP. All rights reserved.
-//
-
-#import <UIKit/UIKit.h>
-
-//! Project version number for LanguageLinkPreviewUI.
-FOUNDATION_EXPORT double LanguageLinkPreviewUIVersionNumber;
-
-//! Project version string for LanguageLinkPreviewUI.
-FOUNDATION_EXPORT const unsigned char LanguageLinkPreviewUIVersionString[];
-
-// In this header, you should import all the public headers of your framework using statements like #import <LanguageLinkPreviewUI/PublicHeader.h>
-
-
diff --git a/submodules/LanguageSuggestionUI/BUILD b/submodules/LanguageSuggestionUI/BUILD
new file mode 100644
index 0000000000..62f2286d0a
--- /dev/null
+++ b/submodules/LanguageSuggestionUI/BUILD
@@ -0,0 +1,22 @@
+load("@build_bazel_rules_swift//swift:swift.bzl", "swift_library")
+
+swift_library(
+    name = "LanguageSuggestionUI",
+    module_name = "LanguageSuggestionUI",
+    srcs = glob([
+		"Sources/**/*.swift",
+    ]),
+    deps = [
+        "//submodules/SSignalKit/SwiftSignalKit:SwiftSignalKit",
+        "//submodules/AsyncDisplayKit:AsyncDisplayKit",
+        "//submodules/Display:Display",
+        "//submodules/TelegramCore:TelegramCore",
+        "//submodules/SyncCore:SyncCore",
+        "//submodules/TelegramPresentationData:TelegramPresentationData",
+        "//submodules/AccountContext:AccountContext",
+        "//submodules/ActivityIndicator:ActivityIndicator",
+    ],
+    visibility = [
+        "//visibility:public",
+    ],
+)
diff --git a/submodules/LanguageSuggestionUI/Info.plist b/submodules/LanguageSuggestionUI/Info.plist
deleted file mode 100644
index e1fe4cfb7b..0000000000
--- a/submodules/LanguageSuggestionUI/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/LanguageSuggestionUI/Sources/LanguageSuggestionUI.h b/submodules/LanguageSuggestionUI/Sources/LanguageSuggestionUI.h
deleted file mode 100644
index 60b73de811..0000000000
--- a/submodules/LanguageSuggestionUI/Sources/LanguageSuggestionUI.h
+++ /dev/null
@@ -1,19 +0,0 @@
-//
-//  LanguageSuggestionUI.h
-//  LanguageSuggestionUI
-//
-//  Created by Peter on 8/13/19.
-//  Copyright © 2019 Telegram Messenger LLP. All rights reserved.
-//
-
-#import <UIKit/UIKit.h>
-
-//! Project version number for LanguageSuggestionUI.
-FOUNDATION_EXPORT double LanguageSuggestionUIVersionNumber;
-
-//! Project version string for LanguageSuggestionUI.
-FOUNDATION_EXPORT const unsigned char LanguageSuggestionUIVersionString[];
-
-// In this header, you should import all the public headers of your framework using statements like #import <LanguageSuggestionUI/PublicHeader.h>
-
-
diff --git a/submodules/LegacyComponents/BUCK b/submodules/LegacyComponents/BUCK
index d3a3ad444d..732e23594b 100644
--- a/submodules/LegacyComponents/BUCK
+++ b/submodules/LegacyComponents/BUCK
@@ -3,7 +3,7 @@ load("//Config:buck_rule_macros.bzl", "static_library")
 apple_resource(
     name = "LegacyComponentsResources",
     dirs = [
-        "LegacyComponents/Resources/LegacyComponentsResources.bundle",
+        "Resources/LegacyComponentsResources.bundle",
     ],
     visibility = ["PUBLIC"],
 )
@@ -11,351 +11,17 @@ apple_resource(
 static_library(
     name = "LegacyComponents",
     srcs = glob([
-        "LegacyComponents/*.m",
-        "LegacyComponents/*.mm",
-        "LegacyComponents/*.c",
-        "LegacyComponents/*.cpp",
+        "Sources/*.m",
+        "Sources/*.mm",
+        "Sources/*.c",
+        "Sources/*.cpp",
     ]),
     headers = glob([
-        "LegacyComponents/*.h",
+        "Sources/*.h",
+    ]),
+    exported_headers = glob([
+        "PublicHeaders/**/*.h",
     ]),
-    exported_headers = [
-        "LegacyComponents/LegacyComponentsGlobals.h",
-        "LegacyComponents/LegacyComponentsContext.h",
-        "LegacyComponents/TGLocalization.h",
-        "LegacyComponents/TGPluralization.h",
-        "LegacyComponents/TGStringUtils.h",
-        "LegacyComponents/TGPhoneUtils.h",
-        "LegacyComponents/NSObject+TGLock.h",
-        "LegacyComponents/RMPhoneFormat.h",
-        "LegacyComponents/NSInputStream+TL.h",
-        "LegacyComponents/TGFont.h",
-        "LegacyComponents/TGImageUtils.h",
-        "LegacyComponents/TGDateUtils.h",
-        "LegacyComponents/Freedom.h",
-        "LegacyComponents/FreedomUIKit.h",
-        "LegacyComponents/TGHacks.h",
-        "LegacyComponents/TGImageBlur.h",
-        "LegacyComponents/UIDevice+PlatformInfo.h",
-        "LegacyComponents/TGObserverProxy.h",
-        "LegacyComponents/TGModernCache.h",
-        "LegacyComponents/TGMemoryImageCache.h",
-        "LegacyComponents/LegacyComponentsAccessChecker.h",
-        "LegacyComponents/TGTimerTarget.h",
-        "LegacyComponents/TGKeyCommand.h",
-        "LegacyComponents/TGKeyCommandController.h",
-        "LegacyComponents/TGWeakDelegate.h",
-        "LegacyComponents/TGCache.h",
-        "LegacyComponents/TGLiveUploadInterface.h",
-        
-        "LegacyComponents/JNWSpringAnimation.h",
-        "LegacyComponents/POPAnimationEvent.h",
-        "LegacyComponents/POPAnimationTracer.h",
-        "LegacyComponents/POPAnimation.h",
-        "LegacyComponents/POPBasicAnimation.h",
-        "LegacyComponents/POPCustomAnimation.h",
-        "LegacyComponents/POPDecayAnimation.h",
-        "LegacyComponents/POPPropertyAnimation.h",
-        "LegacyComponents/POPSpringAnimation.h",
-        "LegacyComponents/POPGeometry.h",
-        "LegacyComponents/POPAnimatableProperty.h",
-
-        "LegacyComponents/lmdb.h",
-        "LegacyComponents/PSLMDBTable.h",
-        "LegacyComponents/PSLMDBKeyValueStore.h",
-        "LegacyComponents/PSLMDBKeyValueReaderWriter.h",
-        "LegacyComponents/PSLMDBKeyValueCursor.h",
-
-        "LegacyComponents/PSCoding.h",
-        "LegacyComponents/PSData.h",
-        "LegacyComponents/PSKeyValueCoder.h",
-        "LegacyComponents/PSKeyValueDecoder.h",
-        "LegacyComponents/PSKeyValueEncoder.h",
-        "LegacyComponents/PSKeyValueReader.h",
-        "LegacyComponents/PSKeyValueStore.h",
-        "LegacyComponents/PSKeyValueWriter.h",
-
-        "LegacyComponents/TGPeerIdAdapter.h",
-        "LegacyComponents/TGUser.h",
-        "LegacyComponents/TGBotInfo.h",
-        "LegacyComponents/TGBotComandInfo.h",
-        "LegacyComponents/TGConversation.h",
-
-        "LegacyComponents/TGModernConversationAssociatedInputPanel.h",
-        "LegacyComponents/TGModernConversationHashtagsAssociatedPanel.h",
-        "LegacyComponents/TGModernConversationMentionsAssociatedPanel.h",
-        "LegacyComponents/TGModernConversationAlphacodeAssociatedPanel.h",
-        "LegacyComponents/TGSuggestionContext.h",
-        "LegacyComponents/TGAlphacode.h",
-
-        "LegacyComponents/TGTextCheckingResult.h",
-        "LegacyComponents/TGChannelBannedRights.h",
-        "LegacyComponents/TGChannelAdminRights.h",
-        "LegacyComponents/TGDatabaseMessageDraft.h",
-        "LegacyComponents/TGMessageGroup.h",
-        "LegacyComponents/TGMessageHole.h",
-        "LegacyComponents/TGMessageViewCountContentProperty.h",
-        "LegacyComponents/TGAuthorSignatureMediaAttachment.h",
-        "LegacyComponents/TGWebDocument.h",
-        "LegacyComponents/TGInvoiceMediaAttachment.h",
-        "LegacyComponents/TGGameMediaAttachment.h",
-        "LegacyComponents/TGViaUserAttachment.h",
-        "LegacyComponents/TGBotContextResultAttachment.h",
-        "LegacyComponents/TGMessageEntity.h",
-        "LegacyComponents/TGMessageEntityBold.h",
-        "LegacyComponents/TGMessageEntityBotCommand.h",
-        "LegacyComponents/TGMessageEntityCode.h",
-        "LegacyComponents/TGMessageEntityEmail.h",
-        "LegacyComponents/TGMessageEntityHashtag.h",
-        "LegacyComponents/TGMessageEntityItalic.h",
-        "LegacyComponents/TGMessageEntityMention.h",
-        "LegacyComponents/TGMessageEntityMentionName.h",
-        "LegacyComponents/TGMessageEntityPre.h",
-        "LegacyComponents/TGMessageEntityTextUrl.h",
-        "LegacyComponents/TGMessageEntityUrl.h",
-        "LegacyComponents/TGMessageEntitiesAttachment.h",
-        "LegacyComponents/TGBotReplyMarkup.h",
-        "LegacyComponents/TGBotReplyMarkupButton.h",
-        "LegacyComponents/TGBotReplyMarkupRow.h",
-        "LegacyComponents/TGReplyMarkupAttachment.h",
-        "LegacyComponents/TGInstantPage.h",
-        "LegacyComponents/TGWebPageMediaAttachment.h",
-        "LegacyComponents/TGAudioMediaAttachment.h",
-        "LegacyComponents/TGAudioWaveform.h",
-        "LegacyComponents/TGStickerPackReference.h",
-        "LegacyComponents/TGDocumentAttributeFilename.h",
-        "LegacyComponents/TGDocumentAttributeImageSize.h",
-        "LegacyComponents/TGDocumentAttributeSticker.h",
-        "LegacyComponents/TGDocumentAttributeVideo.h",
-        "LegacyComponents/TGDocumentAttributeAnimated.h",
-        "LegacyComponents/TGDocumentAttributeAudio.h",
-        "LegacyComponents/TGDocumentMediaAttachment.h",
-        "LegacyComponents/TGUnsupportedMediaAttachment.h",
-        "LegacyComponents/TGForwardedMessageMediaAttachment.h",
-        "LegacyComponents/TGContactMediaAttachment.h",
-        "LegacyComponents/TGVideoInfo.h",
-        "LegacyComponents/TGVideoMediaAttachment.h",
-        "LegacyComponents/TGLocalMessageMetaMediaAttachment.h",
-        "LegacyComponents/TGLocationMediaAttachment.h",
-        "LegacyComponents/TGImageMediaAttachment.h",
-        "LegacyComponents/TGMediaAttachment.h",
-        "LegacyComponents/TGImageInfo.h",
-        "LegacyComponents/TGMediaOriginInfo.h",
-        "LegacyComponents/TGMessage.h",
-        "LegacyComponents/TGStickerPack.h",
-        "LegacyComponents/TGStickerAssociation.h",
-        "LegacyComponents/TGPhotoMaskPosition.h",
-
-        "LegacyComponents/ActionStage.h",
-        "LegacyComponents/ASActor.h",
-        "LegacyComponents/ASHandle.h",
-        "LegacyComponents/ASQueue.h",
-        "LegacyComponents/ASWatcher.h",
-        "LegacyComponents/SGraphListNode.h",
-        "LegacyComponents/SGraphNode.h",
-        "LegacyComponents/SGraphObjectNode.h",
-
-        "LegacyComponents/TGLabel.h",
-        "LegacyComponents/TGToolbarButton.h",
-        "LegacyComponents/UIScrollView+TGHacks.h",
-        "LegacyComponents/TGAnimationBlockDelegate.h",
-        "LegacyComponents/TGBackdropView.h",
-        "LegacyComponents/UIImage+TG.h",
-        "LegacyComponents/TGStaticBackdropAreaData.h",
-        "LegacyComponents/TGStaticBackdropImageData.h",
-        "LegacyComponents/TGImageLuminanceMap.h",
-        "LegacyComponents/TGFullscreenContainerView.h",
-        "LegacyComponents/TGDoubleTapGestureRecognizer.h",
-        "LegacyComponents/TGModernButton.h",
-        "LegacyComponents/TGModernToolbarButton.h",
-        "LegacyComponents/TGModernBackToolbarButton.h",
-        "LegacyComponents/UIControl+HitTestEdgeInsets.h",
-        "LegacyComponents/TGMenuView.h",
-        "LegacyComponents/TGImageView.h",
-        "LegacyComponents/UICollectionView+Utils.h",
-        "LegacyComponents/TGMessageImageViewOverlayView.h",
-        "LegacyComponents/TGLetteredAvatarView.h",
-        "LegacyComponents/TGGradientLabel.h",
-        "LegacyComponents/TGRemoteImageView.h",
-
-        "LegacyComponents/TGProgressSpinnerView.h",
-        "LegacyComponents/TGProgressWindow.h",
-
-        "LegacyComponents/TGMenuSheetController.h",
-        "LegacyComponents/TGMenuSheetButtonItemView.h",
-        "LegacyComponents/TGMenuSheetCollectionView.h",
-        "LegacyComponents/TGMenuSheetItemView.h",
-        "LegacyComponents/TGMenuSheetTitleItemView.h",
-        "LegacyComponents/TGMenuSheetView.h",
-
-        "LegacyComponents/HPGrowingTextView.h",
-        "LegacyComponents/HPTextViewInternal.h",
-        "LegacyComponents/TGInputTextTag.h",
-
-        "LegacyComponents/TGStickerKeyboardTabPanel.h",
-
-        "LegacyComponents/TGItemPreviewController.h",
-        "LegacyComponents/TGItemPreviewView.h",
-        "LegacyComponents/TGItemMenuSheetPreviewView.h",
-
-        "LegacyComponents/TGImageManager.h",
-        "LegacyComponents/TGDataResource.h",
-        "LegacyComponents/TGImageDataSource.h",
-        "LegacyComponents/TGImageManagerTask.h",
-
-        "LegacyComponents/TGRTLScreenEdgePanGestureRecognizer.h",
-        "LegacyComponents/TGNavigationController.h",
-        "LegacyComponents/TGNavigationBar.h",
-        "LegacyComponents/TGViewController.h",
-        "LegacyComponents/TGViewController+TGRecursiveEnumeration.h",
-        "LegacyComponents/TGOverlayController.h",
-        "LegacyComponents/TGOverlayControllerWindow.h",
-
-        "LegacyComponents/TGMediaAssetsLibrary.h",
-        "LegacyComponents/TGMediaAssetsModernLibrary.h",
-        "LegacyComponents/TGMediaAsset.h",
-        "LegacyComponents/TGMediaAssetFetchResult.h",
-        "LegacyComponents/TGMediaAssetFetchResultChange.h",
-        "LegacyComponents/TGMediaAssetGroup.h",
-        "LegacyComponents/TGMediaAssetMoment.h",
-        "LegacyComponents/TGMediaAssetMomentList.h",
-        "LegacyComponents/TGMediaAssetImageSignals.h",
-        "LegacyComponents/TGMediaSelectionContext.h",
-        "LegacyComponents/TGMediaEditingContext.h",
-
-        "LegacyComponents/TGModernGalleryZoomableItemViewContent.h",
-        "LegacyComponents/TGModernGalleryZoomableScrollView.h",
-        "LegacyComponents/TGModernGalleryZoomableScrollViewSwipeGestureRecognizer.h",
-        "LegacyComponents/TGModernGalleryVideoView.h",
-        "LegacyComponents/TGModernGalleryScrollView.h",
-        "LegacyComponents/TGModernGalleryItem.h",
-        "LegacyComponents/TGModernGalleryItemView.h",
-        "LegacyComponents/TGModernGalleryImageItem.h",
-        "LegacyComponents/TGModernGalleryImageItemView.h",
-        "LegacyComponents/TGModernGalleryImageItemImageView.h",
-        "LegacyComponents/TGModernGalleryEditableItemView.h",
-        "LegacyComponents/TGModernGallerySelectableItem.h",
-        "LegacyComponents/TGModernGalleryDefaultFooterAccessoryView.h",
-        "LegacyComponents/TGModernGalleryDefaultFooterView.h",
-        "LegacyComponents/TGModernGalleryDefaultHeaderView.h",
-        "LegacyComponents/TGModernGalleryDefaultInterfaceView.h",
-        "LegacyComponents/TGModernGalleryInterfaceView.h",
-        "LegacyComponents/TGModernGalleryImageItemContainerView.h",
-        "LegacyComponents/TGModernGalleryZoomableItemView.h",
-        "LegacyComponents/TGModernGalleryModel.h",
-        "LegacyComponents/TGModernGalleryTransitionView.h",
-        "LegacyComponents/TGModernGalleryView.h",
-        "LegacyComponents/TGModernGalleryContainerView.h",
-        "LegacyComponents/TGModernGalleryEmbeddedStickersHeaderView.h",
-        "LegacyComponents/TGModernGalleryController.h",
-
-        "LegacyComponents/TGPhotoToolbarView.h",
-        "LegacyComponents/TGMediaPickerGalleryModel.h",
-        "LegacyComponents/TGMediaPickerGalleryInterfaceView.h",
-        "LegacyComponents/TGPhotoEditorController.h",
-        "LegacyComponents/TGMediaAvatarEditorTransition.h",
-
-        "LegacyComponents/TGPhotoEditorUtils.h",
-        "LegacyComponents/PGPhotoEditorValues.h",
-        "LegacyComponents/TGVideoEditAdjustments.h",
-        "LegacyComponents/AVURLAsset+TGMediaItem.h",
-        "LegacyComponents/UIImage+TGMediaEditableItem.h",
-        "LegacyComponents/TGMediaVideoConverter.h",
-        "LegacyComponents/TGGifConverter.h",
-
-        "LegacyComponents/TGPhotoEditorAnimation.h",
-
-        "LegacyComponents/TGPaintingData.h",
-        "LegacyComponents/TGPaintUtils.h",
-        "LegacyComponents/TGPhotoPaintEntity.h",
-        "LegacyComponents/TGPhotoPaintStickerEntity.h",
-        "LegacyComponents/TGPaintUndoManager.h",
-
-        "LegacyComponents/PGCamera.h",
-        "LegacyComponents/PGCameraCaptureSession.h",
-        "LegacyComponents/PGCameraDeviceAngleSampler.h",
-        "LegacyComponents/PGCameraMomentSegment.h",
-        "LegacyComponents/PGCameraMomentSession.h",
-        "LegacyComponents/PGCameraMovieWriter.h",
-        "LegacyComponents/PGCameraShotMetadata.h",
-        "LegacyComponents/PGCameraVolumeButtonHandler.h",
-        "LegacyComponents/TGCameraPreviewView.h",
-        "LegacyComponents/TGCameraMainPhoneView.h",
-        "LegacyComponents/TGCameraMainTabletView.h",
-        "LegacyComponents/TGCameraMainView.h",
-        "LegacyComponents/TGCameraFlashActiveView.h",
-        "LegacyComponents/TGCameraFlashControl.h",
-        "LegacyComponents/TGCameraFlipButton.h",
-        "LegacyComponents/TGCameraInterfaceAssets.h",
-        "LegacyComponents/TGCameraModeControl.h",
-        "LegacyComponents/TGCameraSegmentsView.h",
-        "LegacyComponents/TGCameraShutterButton.h",
-        "LegacyComponents/TGCameraTimeCodeView.h",
-        "LegacyComponents/TGCameraZoomView.h",
-        "LegacyComponents/TGCameraPhotoPreviewController.h",
-        "LegacyComponents/TGCameraController.h",
-        "LegacyComponents/TGCameraCapturedPhoto.h",
-        "LegacyComponents/TGCameraCapturedVideo.h",
-        "LegacyComponents/TGPhotoVideoEditor.h",
-
-        "LegacyComponents/TGModernConversationTitleActivityIndicator.h",
-        "LegacyComponents/TGEmbedPIPButton.h",
-        "LegacyComponents/TGEmbedPIPPullArrowView.h",
-        "LegacyComponents/TGEmbedPlayerState.h",
-        "LegacyComponents/TGAttachmentCameraView.h",
-        "LegacyComponents/TGMediaAvatarMenuMixin.h",
-        "LegacyComponents/TGPassportAttachMenu.h",
-        "LegacyComponents/TGPassportScanController.h",
-        "LegacyComponents/TGPassportOCR.h",
-        "LegacyComponents/TGPassportMRZ.h",
-        "LegacyComponents/TGPassportICloud.h",
-        "LegacyComponents/TGEmbedPlayerView.h",
-        "LegacyComponents/LegacyHTTPRequestOperation.h",
-
-        "LegacyComponents/TGAttachmentCarouselItemView.h",
-        "LegacyComponents/TGMediaAssetsController.h",
-
-        "LegacyComponents/TGLocationVenue.h",
-        "LegacyComponents/TGLocationMapViewController.h",
-        "LegacyComponents/TGLocationPickerController.h",
-        "LegacyComponents/TGLocationViewController.h",
-        "LegacyComponents/TGListsTableView.h",
-        "LegacyComponents/TGSearchBar.h",
-        "LegacyComponents/TGSearchDisplayMixin.h",
-
-        "LegacyComponents/TGPhotoEditorSliderView.h",
-
-        "LegacyComponents/TGClipboardGalleryMixin.h",
-        "LegacyComponents/TGClipboardGalleryPhotoItem.h",
-        "LegacyComponents/TGVideoMessageCaptureController.h",
-        "LegacyComponents/TGModernConversationInputMicButton.h",
-
-        "LegacyComponents/TGLocationPulseView.h",
-        "LegacyComponents/TGLocationWavesView.h",
-        "LegacyComponents/TGLocationLiveElapsedView.h",
-        "LegacyComponents/TGLocationLiveSessionItemView.h",
-
-        "LegacyComponents/TGTooltipView.h",
-
-        "LegacyComponents/TGCheckButtonView.h",
-        "LegacyComponents/TGClipboardMenu.h",
-        "LegacyComponents/TGImagePickerController.h",
-        "LegacyComponents/TGLegacyCameraController.h",
-        "LegacyComponents/TGProxyWindow.h",
-        "LegacyComponents/TGIconSwitchView.h",
-
-        "LegacyComponents/TGModernGalleryEditableItem.h",
-        "LegacyComponents/TGPhotoEditorButton.h",
-
-        "LegacyComponents/TGActionMediaAttachment.h",
-        "LegacyComponents/TGReplyMessageMediaAttachment.h",
-        "LegacyComponents/TGMessageEntityPhone.h",
-        "LegacyComponents/TGMessageEntityCashtag.h",
-        "LegacyComponents/TGPIPAblePlayerView.h",
-        "LegacyComponents/TGEmbedPlayerControls.h",
-
-        "LegacyComponents/TGMediaAssetsUtils.h",
-    ],
     deps = [
         "//submodules/SSignalKit/SSignalKit:SSignalKit",
         "//submodules/AppBundle:AppBundle",
diff --git a/submodules/LegacyComponents/BUILD b/submodules/LegacyComponents/BUILD
new file mode 100644
index 0000000000..c58a789540
--- /dev/null
+++ b/submodules/LegacyComponents/BUILD
@@ -0,0 +1,46 @@
+
+filegroup(
+    name = "LegacyComponentsResources",
+    srcs = glob([
+        "LegacyComponentsResources.bundle/**/*",
+    ], exclude = ["Resources/LegacyComponentsResources.bundle/**/.*"]),
+    visibility = ["//visibility:public"],
+)
+
+objc_library(
+    name = "LegacyComponents",
+    enable_modules = True,
+    module_name = "LegacyComponents",
+    srcs = glob([
+        "Sources/*.m",
+        "Sources/*.mm",
+        "Sources/*.c",
+        "Sources/*.cpp",
+        "Sources/*.h",
+    ]),
+    hdrs = glob([
+        "PublicHeaders/**/*.h",
+    ]),
+    copts = [
+        "-I{}/PublicHeaders/LegacyComponents".format(package_name()),
+    ],
+    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/LegacyDataImport/BUCK b/submodules/LegacyDataImport/BUCK
index 91a8201c15..3ca8359f67 100644
--- a/submodules/LegacyDataImport/BUCK
+++ b/submodules/LegacyDataImport/BUCK
@@ -4,14 +4,7 @@ static_library(
     name = "LegacyDataImport",
     srcs = glob([
         "Sources/**/*.swift",
-        "Sources/*.m",
     ]),
-    headers = glob([
-    	"Sources/*.h",
-    ], exclude = ["Sources/LegacyDataImport.h"]),
-    exported_headers = glob([
-    	"Sources/*.h",
-    ], exclude = ["Sources/LegacyDataImport.h"]),
     deps = [
 	    "//submodules/TelegramCore:TelegramCore#shared",
         "//submodules/SyncCore:SyncCore#shared",
@@ -21,6 +14,7 @@ static_library(
     	"//submodules/TelegramUIPreferences:TelegramUIPreferences",
     	"//submodules/RadialStatusNode:RadialStatusNode",
     	"//submodules/LegacyComponents:LegacyComponents",
+        "//submodules/LegacyDataImport/Impl:LegacyDataImportImpl",
     ],
     frameworks = [
         "$SDKROOT/System/Library/Frameworks/Foundation.framework",
diff --git a/submodules/LegacyDataImport/BUILD b/submodules/LegacyDataImport/BUILD
new file mode 100644
index 0000000000..199ce4f386
--- /dev/null
+++ b/submodules/LegacyDataImport/BUILD
@@ -0,0 +1,23 @@
+load("@build_bazel_rules_swift//swift:swift.bzl", "swift_library")
+
+swift_library(
+    name = "LegacyDataImport",
+    module_name = "LegacyDataImport",
+    srcs = glob([
+        "Sources/**/*.swift",
+    ]),
+    deps = [
+        "//submodules/TelegramCore:TelegramCore",
+        "//submodules/SyncCore:SyncCore",
+        "//submodules/Postbox:Postbox",
+        "//submodules/SSignalKit/SwiftSignalKit:SwiftSignalKit",
+        "//submodules/TelegramNotices:TelegramNotices",
+        "//submodules/TelegramUIPreferences:TelegramUIPreferences",
+        "//submodules/RadialStatusNode:RadialStatusNode",
+        "//submodules/LegacyComponents:LegacyComponents",
+        "//submodules/LegacyDataImport/Impl:LegacyDataImportImpl",
+    ],
+    visibility = [
+        "//visibility:public",
+    ],
+)
diff --git a/submodules/LegacyDataImport/Impl/BUCK b/submodules/LegacyDataImport/Impl/BUCK
new file mode 100644
index 0000000000..4ec9c8c66a
--- /dev/null
+++ b/submodules/LegacyDataImport/Impl/BUCK
@@ -0,0 +1,28 @@
+load("//Config:buck_rule_macros.bzl", "static_library")
+
+static_library(
+    name = "LegacyDataImportImpl",
+    srcs = glob([
+        "Sources/*.m",
+    ]),
+    headers = glob([
+    	"Sources/*.h",
+    ]),
+    exported_headers = glob([
+        "PublicHeaders/**/*.h",
+    ]),
+    deps = [
+	    "//submodules/TelegramCore:TelegramCore#shared",
+        "//submodules/SyncCore:SyncCore#shared",
+	    "//submodules/Postbox:Postbox#shared",
+	    "//submodules/SSignalKit/SwiftSignalKit:SwiftSignalKit#shared",
+    	"//submodules/TelegramNotices:TelegramNotices",
+    	"//submodules/TelegramUIPreferences:TelegramUIPreferences",
+    	"//submodules/RadialStatusNode:RadialStatusNode",
+    	"//submodules/LegacyComponents:LegacyComponents",
+    ],
+    frameworks = [
+        "$SDKROOT/System/Library/Frameworks/Foundation.framework",
+        "$SDKROOT/System/Library/Frameworks/UIKit.framework",
+    ],
+)
diff --git a/submodules/LegacyDataImport/Impl/BUILD b/submodules/LegacyDataImport/Impl/BUILD
new file mode 100644
index 0000000000..4bab57e0ce
--- /dev/null
+++ b/submodules/LegacyDataImport/Impl/BUILD
@@ -0,0 +1,22 @@
+
+objc_library(
+    name = "LegacyDataImportImpl",
+    enable_modules = True,
+    module_name = "LegacyDataImportImpl",
+    srcs = glob([
+        "Sources/**/*.m",
+        "Sources/**/*.h",
+    ]),
+    hdrs = glob([
+        "PublicHeaders/**/*.h",
+    ]),
+    includes = [
+        "PublicHeaders",
+    ],
+    sdk_frameworks = [
+        "Foundation",
+    ],
+    visibility = [
+        "//visibility:public",
+    ],
+)
diff --git a/submodules/LegacyDataImport/Impl/PublicHeaders/LegacyDataImportImpl/LegacyDataImportImpl.h b/submodules/LegacyDataImport/Impl/PublicHeaders/LegacyDataImportImpl/LegacyDataImportImpl.h
new file mode 100644
index 0000000000..7a94876eb4
--- /dev/null
+++ b/submodules/LegacyDataImport/Impl/PublicHeaders/LegacyDataImportImpl/LegacyDataImportImpl.h
@@ -0,0 +1,7 @@
+#import <UIKit/UIKit.h>
+
+#import <LegacyDataImportImpl/TGProxyItem.h>
+#import <LegacyDataImportImpl/TGAutoDownloadPreferences.h>
+#import <LegacyDataImportImpl/TGPresentationAutoNightPreferences.h>
+
+
diff --git a/submodules/LegacyDataImport/Sources/TGAutoDownloadPreferences.h b/submodules/LegacyDataImport/Impl/PublicHeaders/LegacyDataImportImpl/TGAutoDownloadPreferences.h
similarity index 100%
rename from submodules/LegacyDataImport/Sources/TGAutoDownloadPreferences.h
rename to submodules/LegacyDataImport/Impl/PublicHeaders/LegacyDataImportImpl/TGAutoDownloadPreferences.h
diff --git a/submodules/LegacyDataImport/Sources/TGAutoDownloadPreferences.m b/submodules/LegacyDataImport/Impl/PublicHeaders/LegacyDataImportImpl/TGAutoDownloadPreferences.m
similarity index 99%
rename from submodules/LegacyDataImport/Sources/TGAutoDownloadPreferences.m
rename to submodules/LegacyDataImport/Impl/PublicHeaders/LegacyDataImportImpl/TGAutoDownloadPreferences.m
index e84cc90ab2..64c8cca6c7 100644
--- a/submodules/LegacyDataImport/Sources/TGAutoDownloadPreferences.m
+++ b/submodules/LegacyDataImport/Impl/PublicHeaders/LegacyDataImportImpl/TGAutoDownloadPreferences.m
@@ -1,4 +1,4 @@
-#import "TGAutoDownloadPreferences.h"
+#import <LegacyDataImportImpl/TGAutoDownloadPreferences.h>
 
 @implementation TGAutoDownloadPreferences
 
diff --git a/submodules/LegacyDataImport/Sources/TGPresentationAutoNightPreferences.h b/submodules/LegacyDataImport/Impl/PublicHeaders/LegacyDataImportImpl/TGPresentationAutoNightPreferences.h
similarity index 100%
rename from submodules/LegacyDataImport/Sources/TGPresentationAutoNightPreferences.h
rename to submodules/LegacyDataImport/Impl/PublicHeaders/LegacyDataImportImpl/TGPresentationAutoNightPreferences.h
diff --git a/submodules/LegacyDataImport/Sources/TGPresentationAutoNightPreferences.m b/submodules/LegacyDataImport/Impl/PublicHeaders/LegacyDataImportImpl/TGPresentationAutoNightPreferences.m
similarity index 91%
rename from submodules/LegacyDataImport/Sources/TGPresentationAutoNightPreferences.m
rename to submodules/LegacyDataImport/Impl/PublicHeaders/LegacyDataImportImpl/TGPresentationAutoNightPreferences.m
index e125ea54f0..b53b768e38 100644
--- a/submodules/LegacyDataImport/Sources/TGPresentationAutoNightPreferences.m
+++ b/submodules/LegacyDataImport/Impl/PublicHeaders/LegacyDataImportImpl/TGPresentationAutoNightPreferences.m
@@ -1,4 +1,4 @@
-#import "TGPresentationAutoNightPreferences.h"
+#import <LegacyDataImportImpl/TGPresentationAutoNightPreferences.h>
 
 @implementation TGPresentationAutoNightPreferences
 
diff --git a/submodules/LegacyDataImport/Sources/TGProxyItem.h b/submodules/LegacyDataImport/Impl/PublicHeaders/LegacyDataImportImpl/TGProxyItem.h
similarity index 100%
rename from submodules/LegacyDataImport/Sources/TGProxyItem.h
rename to submodules/LegacyDataImport/Impl/PublicHeaders/LegacyDataImportImpl/TGProxyItem.h
diff --git a/submodules/LegacyDataImport/Sources/TGProxyItem.m b/submodules/LegacyDataImport/Impl/PublicHeaders/LegacyDataImportImpl/TGProxyItem.m
similarity index 97%
rename from submodules/LegacyDataImport/Sources/TGProxyItem.m
rename to submodules/LegacyDataImport/Impl/PublicHeaders/LegacyDataImportImpl/TGProxyItem.m
index edc270d3ae..4dfc1d6c93 100644
--- a/submodules/LegacyDataImport/Sources/TGProxyItem.m
+++ b/submodules/LegacyDataImport/Impl/PublicHeaders/LegacyDataImportImpl/TGProxyItem.m
@@ -1,4 +1,4 @@
-#import "TGProxyItem.h"
+#import <LegacyDataImportImpl/TGProxyItem.h>
 
 static bool TGObjectCompare(id obj1, id obj2) {
     if (obj1 == nil && obj2 == nil)
diff --git a/submodules/LegacyDataImport/Impl/Sources/TGAutoDownloadPreferences.m b/submodules/LegacyDataImport/Impl/Sources/TGAutoDownloadPreferences.m
new file mode 100644
index 0000000000..64c8cca6c7
--- /dev/null
+++ b/submodules/LegacyDataImport/Impl/Sources/TGAutoDownloadPreferences.m
@@ -0,0 +1,250 @@
+#import <LegacyDataImportImpl/TGAutoDownloadPreferences.h>
+
+@implementation TGAutoDownloadPreferences
+
+- (instancetype)initWithCoder:(NSCoder *)aDecoder
+{
+    self = [super init];
+    if (self != nil)
+    {
+        _disabled = [aDecoder decodeBoolForKey:@"disabled"];
+        _photos = [aDecoder decodeInt32ForKey:@"photos"];
+        _videos = [aDecoder decodeInt32ForKey:@"videos"];
+        _maximumVideoSize = [aDecoder decodeInt32ForKey:@"maxVideoSize"];
+        _documents = [aDecoder decodeInt32ForKey:@"documents"];
+        _maximumDocumentSize = [aDecoder decodeInt32ForKey:@"maxDocumentSize"];
+        _voiceMessages = [aDecoder decodeInt32ForKey:@"voiceMessages"];
+        _videoMessages = [aDecoder decodeInt32ForKey:@"videoMessages"];
+    }
+    return self;
+}
+
+- (void)encodeWithCoder:(NSCoder *)aCoder
+{
+    [aCoder encodeBool:_disabled forKey:@"disabled"];
+    [aCoder encodeInt32:_photos forKey:@"photos"];
+    [aCoder encodeInt32:_videos forKey:@"videos"];
+    [aCoder encodeInt32:_maximumVideoSize forKey:@"maxVideoSize"];
+    [aCoder encodeInt32:_documents forKey:@"documents"];
+    [aCoder encodeInt32:_maximumDocumentSize forKey:@"maxDocumentSize"];
+    [aCoder encodeInt32:_voiceMessages forKey:@"voiceMessages"];
+    [aCoder encodeInt32:_videoMessages forKey:@"videoMessages"];
+}
+
++ (instancetype)defaultPreferences
+{
+    TGAutoDownloadPreferences *preferences = [[TGAutoDownloadPreferences alloc] init];
+    preferences->_photos = TGAutoDownloadModeAll;
+    preferences->_videos = TGAutoDownloadModeNone;
+    preferences->_maximumVideoSize = 10;
+    preferences->_documents = TGAutoDownloadModeNone;
+    preferences->_maximumDocumentSize = 10;
+    preferences->_voiceMessages = TGAutoDownloadModeAll;
+    preferences->_videoMessages = TGAutoDownloadModeAll;
+    return preferences;
+}
+
++ (instancetype)preferencesWithLegacyDownloadPrivatePhotos:(bool)privatePhotos groupPhotos:(bool)groupPhotos privateVoiceMessages:(bool)privateVoiceMessages groupVoiceMessages:(bool)groupVoiceMessages privateVideoMessages:(bool)privateVideoMessages groupVideoMessages:(bool)groupVideoMessages
+{
+    TGAutoDownloadPreferences *preferences = [[TGAutoDownloadPreferences alloc] init];
+    
+    if (privatePhotos)
+        preferences->_photos |= TGAutoDownloadModeAllPrivateChats;
+    if (groupPhotos)
+        preferences->_photos |= TGAutoDownloadModeAllGroups;
+    
+    if (privateVoiceMessages)
+        preferences->_voiceMessages |= TGAutoDownloadModeAllPrivateChats;
+    if (groupVoiceMessages)
+        preferences->_voiceMessages |= TGAutoDownloadModeAllGroups;
+    
+    if (privateVideoMessages)
+        preferences->_videoMessages |= TGAutoDownloadModeAllPrivateChats;
+    if (groupVideoMessages)
+        preferences->_videoMessages |= TGAutoDownloadModeAllGroups;
+    
+    preferences->_maximumVideoSize = 10;
+    preferences->_maximumDocumentSize = 10;
+    
+    return preferences;
+}
+
+- (instancetype)updateDisabled:(bool)disabled
+{
+    TGAutoDownloadPreferences *preferences = [[TGAutoDownloadPreferences alloc] init];
+    preferences->_disabled = disabled;
+    preferences->_photos = _photos;
+    preferences->_videos = _videos;
+    preferences->_maximumVideoSize = _maximumVideoSize;
+    preferences->_documents = _documents;
+    preferences->_maximumDocumentSize = _maximumDocumentSize;
+    preferences->_voiceMessages = _voiceMessages;
+    preferences->_videoMessages = _videoMessages;
+    return preferences;
+}
+
+- (instancetype)updatePhotosMode:(TGAutoDownloadMode)mode
+{
+    TGAutoDownloadPreferences *preferences = [[TGAutoDownloadPreferences alloc] init];
+    preferences->_photos = mode;
+    preferences->_videos = _videos;
+    preferences->_maximumVideoSize = _maximumVideoSize;
+    preferences->_documents = _documents;
+    preferences->_maximumDocumentSize = _maximumDocumentSize;
+    preferences->_voiceMessages = _voiceMessages;
+    preferences->_videoMessages = _videoMessages;
+    return preferences;
+}
+
+- (instancetype)updateVideosMode:(TGAutoDownloadMode)mode maximumSize:(int32_t)maximumSize
+{
+    TGAutoDownloadPreferences *preferences = [[TGAutoDownloadPreferences alloc] init];
+    preferences->_photos = _photos;
+    preferences->_videos = mode;
+    preferences->_maximumVideoSize = maximumSize;
+    preferences->_documents = _documents;
+    preferences->_maximumDocumentSize = _maximumDocumentSize;
+    preferences->_voiceMessages = _voiceMessages;
+    preferences->_videoMessages = _videoMessages;
+    return preferences;
+}
+
+- (instancetype)updateDocumentsMode:(TGAutoDownloadMode)mode maximumSize:(int32_t)maximumSize
+{
+    TGAutoDownloadPreferences *preferences = [[TGAutoDownloadPreferences alloc] init];
+    preferences->_photos = _photos;
+    preferences->_videos = _videos;
+    preferences->_maximumVideoSize = _maximumVideoSize;
+    preferences->_documents = mode;
+    preferences->_maximumDocumentSize = maximumSize;
+    preferences->_voiceMessages = _voiceMessages;
+    preferences->_videoMessages = _videoMessages;
+    return preferences;
+}
+
+- (instancetype)updateVoiceMessagesMode:(TGAutoDownloadMode)mode
+{
+    TGAutoDownloadPreferences *preferences = [[TGAutoDownloadPreferences alloc] init];
+    preferences->_photos = _photos;
+    preferences->_videos = _videos;
+    preferences->_maximumVideoSize = _maximumVideoSize;
+    preferences->_documents = _documents;
+    preferences->_maximumDocumentSize = _maximumDocumentSize;
+    preferences->_voiceMessages = mode;
+    preferences->_videoMessages = _videoMessages;
+    return preferences;
+}
+
+- (instancetype)updateVideoMessagesMode:(TGAutoDownloadMode)mode
+{
+    TGAutoDownloadPreferences *preferences = [[TGAutoDownloadPreferences alloc] init];
+    preferences->_photos = _photos;
+    preferences->_videos = _videos;
+    preferences->_maximumVideoSize = _maximumVideoSize;
+    preferences->_documents = _documents;
+    preferences->_maximumDocumentSize = _maximumDocumentSize;
+    preferences->_voiceMessages = _voiceMessages;
+    preferences->_videoMessages = mode;
+    return preferences;
+}
+
++ (bool)shouldDownload:(TGAutoDownloadMode)mode inChat:(TGAutoDownloadChat)chat networkType:(TGNetworkType)networkType
+{
+    bool isWiFi = networkType == TGNetworkTypeWiFi;
+    bool isCellular = !isWiFi && networkType != TGNetworkTypeNone;
+    
+    bool shouldDownload = false;
+    switch (chat)
+    {
+        case TGAutoDownloadChatContact:
+            if (isCellular)
+                shouldDownload = (mode & TGAutoDownloadModeCellularContacts) != 0;
+            else if (isWiFi)
+                shouldDownload = (mode & TGAutoDownloadModeWifiContacts) != 0;
+            break;
+            
+        case TGAutoDownloadChatOtherPrivateChat:
+            if (isCellular)
+                shouldDownload = (mode & TGAutoDownloadModeCellularPrivateChats) != 0;
+            else if (isWiFi)
+                shouldDownload = (mode & TGAutoDownloadModeWifiPrivateChats) != 0;
+            break;
+            
+        case TGAutoDownloadChatGroup:
+            if (isCellular)
+                shouldDownload = (mode & TGAutoDownloadModeCellularGroups) != 0;
+            else if (isWiFi)
+                shouldDownload = (mode & TGAutoDownloadModeWifiGroups) != 0;
+            break;
+            
+        case TGAutoDownloadChatChannel:
+            if (isCellular)
+                shouldDownload = (mode & TGAutoDownloadModeCellularChannels) != 0;
+            else if (isWiFi)
+                shouldDownload = (mode & TGAutoDownloadModeWifiChannels) != 0;
+            break;
+            
+        default:
+            break;
+    }
+    return shouldDownload;
+}
+
+- (bool)shouldDownloadPhotoInChat:(TGAutoDownloadChat)chat networkType:(TGNetworkType)networkType
+{
+    if (self.disabled)
+        return false;
+    
+    return [TGAutoDownloadPreferences shouldDownload:_photos inChat:chat networkType:networkType];
+}
+
+- (bool)shouldDownloadVideoInChat:(TGAutoDownloadChat)chat networkType:(TGNetworkType)networkType
+{
+    if (self.disabled)
+        return false;
+    
+    return [TGAutoDownloadPreferences shouldDownload:_videos inChat:chat networkType:networkType];
+}
+
+- (bool)shouldDownloadDocumentInChat:(TGAutoDownloadChat)chat networkType:(TGNetworkType)networkType
+{
+    if (self.disabled)
+        return false;
+    
+    return [TGAutoDownloadPreferences shouldDownload:_documents inChat:chat networkType:networkType];
+}
+
+- (bool)shouldDownloadVoiceMessageInChat:(TGAutoDownloadChat)chat networkType:(TGNetworkType)networkType
+{
+    if (self.disabled)
+        return false;
+    
+    return [TGAutoDownloadPreferences shouldDownload:_voiceMessages inChat:chat networkType:networkType];
+}
+
+- (bool)shouldDownloadVideoMessageInChat:(TGAutoDownloadChat)chat networkType:(TGNetworkType)networkType
+{
+    if (self.disabled)
+        return false;
+    
+    return [TGAutoDownloadPreferences shouldDownload:_videoMessages inChat:chat networkType:networkType];
+}
+
+- (bool)isDefaultPreferences
+{
+    return [self isEqual:[TGAutoDownloadPreferences defaultPreferences]];
+}
+
+- (BOOL)isEqual:(id)object
+{
+    if (object == self)
+        return YES;
+    
+    if (!object || ![object isKindOfClass:[self class]])
+        return NO;
+    
+    TGAutoDownloadPreferences *preferences = (TGAutoDownloadPreferences *)object;
+    return preferences.photos == _photos && preferences.videos == _videos && preferences.documents == _documents && preferences.voiceMessages == _voiceMessages && preferences.videoMessages == _videoMessages && preferences.maximumVideoSize == _maximumVideoSize && preferences.maximumDocumentSize == _maximumDocumentSize && preferences.disabled == _disabled;
+}
+
+@end
diff --git a/submodules/LegacyDataImport/Impl/Sources/TGPresentationAutoNightPreferences.m b/submodules/LegacyDataImport/Impl/Sources/TGPresentationAutoNightPreferences.m
new file mode 100644
index 0000000000..b53b768e38
--- /dev/null
+++ b/submodules/LegacyDataImport/Impl/Sources/TGPresentationAutoNightPreferences.m
@@ -0,0 +1,23 @@
+#import <LegacyDataImportImpl/TGPresentationAutoNightPreferences.h>
+
+@implementation TGPresentationAutoNightPreferences
+
+- (instancetype)initWithCoder:(NSCoder *)aDecoder {
+    self = [super init];
+    if (self != nil) {
+        _mode = [aDecoder decodeInt32ForKey:@"m"];
+        _brightnessThreshold = [aDecoder decodeDoubleForKey:@"b"];
+        _scheduleStart = [aDecoder decodeInt32ForKey:@"ss"];
+        _scheduleEnd = [aDecoder decodeInt32ForKey:@"se"];
+        _latitude = [aDecoder decodeDoubleForKey:@"lat"];
+        _longitude = [aDecoder decodeDoubleForKey:@"lon"];
+        _cachedLocationName = [aDecoder decodeObjectForKey:@"loc"];
+        _preferredPalette = [aDecoder decodeInt32ForKey:@"p"];
+    }
+    return self;
+}
+
+- (void)encodeWithCoder:(NSCoder *)aCoder {
+}
+
+@end
diff --git a/submodules/LegacyDataImport/Impl/Sources/TGProxyItem.m b/submodules/LegacyDataImport/Impl/Sources/TGProxyItem.m
new file mode 100644
index 0000000000..4dfc1d6c93
--- /dev/null
+++ b/submodules/LegacyDataImport/Impl/Sources/TGProxyItem.m
@@ -0,0 +1,73 @@
+#import <LegacyDataImportImpl/TGProxyItem.h>
+
+static bool TGObjectCompare(id obj1, id obj2) {
+    if (obj1 == nil && obj2 == nil)
+        return true;
+    
+    return [obj1 isEqual:obj2];
+}
+
+@implementation TGProxyItem
+
+- (instancetype)initWithServer:(NSString *)server port:(int16_t)port username:(NSString *)username password:(NSString *)password secret:(NSString *)secret
+{
+    self = [super init];
+    if (self != nil)
+    {
+        _server = server;
+        _port = port;
+        _username = username;
+        _password = password;
+        _secret = secret;
+    }
+    return self;
+}
+
+- (instancetype)initWithCoder:(NSCoder *)aDecoder
+{
+    return [self initWithServer:[aDecoder decodeObjectForKey:@"server"] port:(int16_t)[aDecoder decodeInt32ForKey:@"port"] username:[aDecoder decodeObjectForKey:@"user"] password:[aDecoder decodeObjectForKey:@"pass"] secret:[aDecoder decodeObjectForKey:@"secret"]];
+}
+
+- (void)encodeWithCoder:(NSCoder *)aCoder
+{
+    [aCoder encodeObject:_server forKey:@"server"];
+    [aCoder encodeInt32:_port forKey:@"port"];
+    [aCoder encodeObject:_username forKey:@"user"];
+    [aCoder encodeObject:_password forKey:@"pass"];
+    [aCoder encodeObject:_secret forKey:@"secret"];
+}
+
+- (bool)isMTProxy
+{
+    return _secret.length > 0;
+}
+
+- (BOOL)isEqual:(id)object
+{
+    if (object == self)
+        return true;
+    
+    if (!object || ![object isKindOfClass:[self class]])
+        return false;
+    
+    TGProxyItem *proxy = (TGProxyItem *)object;
+    
+    if (![_server isEqualToString:proxy.server])
+        return false;
+        
+    if (_port != proxy.port)
+        return false;
+    
+    if (!TGObjectCompare(_username ?: @"", proxy.username ?: @""))
+        return false;
+    
+    if (!TGObjectCompare(_password ?: @"", proxy.password ?: @""))
+        return false;
+    
+    if (!TGObjectCompare(_secret ?: @"", proxy.secret ?: @""))
+        return false;
+    
+    return true;
+}
+
+@end
diff --git a/submodules/LegacyDataImport/Info.plist b/submodules/LegacyDataImport/Info.plist
deleted file mode 100644
index e1fe4cfb7b..0000000000
--- a/submodules/LegacyDataImport/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/LegacyDataImport/Sources/LegacyDataImport.h b/submodules/LegacyDataImport/Sources/LegacyDataImport.h
deleted file mode 100644
index aae748427c..0000000000
--- a/submodules/LegacyDataImport/Sources/LegacyDataImport.h
+++ /dev/null
@@ -1,13 +0,0 @@
-#import <UIKit/UIKit.h>
-
-//! Project version number for LegacyDataImport.
-FOUNDATION_EXPORT double LegacyDataImportVersionNumber;
-
-//! Project version string for LegacyDataImport.
-FOUNDATION_EXPORT const unsigned char LegacyDataImportVersionString[];
-
-#import <LegacyDataImport/TGProxyItem.h>
-#import <LegacyDataImport/TGAutoDownloadPreferences.h>
-#import <LegacyDataImport/TGPresentationAutoNightPreferences.h>
-
-
diff --git a/submodules/LegacyDataImport/Sources/LegacyDataImport.swift b/submodules/LegacyDataImport/Sources/LegacyDataImport.swift
index 3dd3d393aa..4676e4b16a 100644
--- a/submodules/LegacyDataImport/Sources/LegacyDataImport.swift
+++ b/submodules/LegacyDataImport/Sources/LegacyDataImport.swift
@@ -4,11 +4,8 @@ import TelegramCore
 import SyncCore
 import SwiftSignalKit
 import Postbox
-#if BUCK
 import MtProtoKit
-#else
-import MtProtoKitDynamic
-#endif
+import LegacyDataImportImpl
 
 public enum AccountImportError: Error {
     case generic
diff --git a/submodules/LegacyDataImport/Sources/LegacyPreferencesImport.swift b/submodules/LegacyDataImport/Sources/LegacyPreferencesImport.swift
index 485ccc22cc..d403653fb5 100644
--- a/submodules/LegacyDataImport/Sources/LegacyPreferencesImport.swift
+++ b/submodules/LegacyDataImport/Sources/LegacyPreferencesImport.swift
@@ -4,14 +4,11 @@ import TelegramCore
 import SyncCore
 import SwiftSignalKit
 import Postbox
-#if BUCK
 import MtProtoKit
-#else
-import MtProtoKitDynamic
-#endif
 import TelegramUIPreferences
 import LegacyComponents
 import TelegramNotices
+import LegacyDataImportImpl
 
 @objc(TGPresentationState) private final class TGPresentationState: NSObject, NSCoding {
     let pallete: Int32
diff --git a/submodules/LegacyMediaPickerUI/BUILD b/submodules/LegacyMediaPickerUI/BUILD
new file mode 100644
index 0000000000..4a258f2a6e
--- /dev/null
+++ b/submodules/LegacyMediaPickerUI/BUILD
@@ -0,0 +1,29 @@
+load("@build_bazel_rules_swift//swift:swift.bzl", "swift_library")
+
+swift_library(
+    name = "LegacyMediaPickerUI",
+    module_name = "LegacyMediaPickerUI",
+    srcs = glob([
+        "Sources/**/*.swift",
+    ]),
+    deps = [
+    	"//submodules/SSignalKit/SwiftSignalKit:SwiftSignalKit",
+        "//submodules/AsyncDisplayKit:AsyncDisplayKit",
+        "//submodules/Display:Display",
+        "//submodules/Postbox:Postbox",
+        "//submodules/TelegramCore:TelegramCore",
+        "//submodules/SyncCore:SyncCore",
+        "//submodules/TelegramPresentationData:TelegramPresentationData",
+        "//submodules/AccountContext:AccountContext",
+        "//submodules/LegacyComponents:LegacyComponents",
+        "//submodules/LegacyUI:LegacyUI",
+        "//submodules/MimeTypes:MimeTypes",
+        "//submodules/LocalMediaResources:LocalMediaResources",
+        "//submodules/SearchPeerMembers:SearchPeerMembers",
+        "//submodules/SaveToCameraRoll:SaveToCameraRoll",
+        "//submodules/LegacyMediaPickerUI/LegacyImageProcessors:LegacyImageProcessors",
+    ],
+    visibility = [
+        "//visibility:public",
+    ],
+)
diff --git a/submodules/LegacyMediaPickerUI/Info.plist b/submodules/LegacyMediaPickerUI/Info.plist
deleted file mode 100644
index e1fe4cfb7b..0000000000
--- a/submodules/LegacyMediaPickerUI/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/LegacyMediaPickerUI/LegacyImageProcessors/BUILD b/submodules/LegacyMediaPickerUI/LegacyImageProcessors/BUILD
new file mode 100644
index 0000000000..aa40d0c1a7
--- /dev/null
+++ b/submodules/LegacyMediaPickerUI/LegacyImageProcessors/BUILD
@@ -0,0 +1,26 @@
+
+objc_library(
+    name = "LegacyImageProcessors",
+    enable_modules = True,
+    module_name = "LegacyImageProcessors",
+    srcs = glob([
+        "Sources/**/*.m",
+        "Sources/**/*.h",
+    ]),
+    hdrs = glob([
+        "PublicHeaders/**/*.h",
+    ]),
+    includes = [
+        "PublicHeaders",
+    ],
+    deps = [
+        "//submodules/LegacyComponents:LegacyComponents",
+    ],
+    sdk_frameworks = [
+        "Foundation",
+        "UIKit",
+    ],
+    visibility = [
+        "//visibility:public",
+    ],
+)
diff --git a/submodules/LegacyMediaPickerUI/Sources/LegacyImageProcessors.h b/submodules/LegacyMediaPickerUI/LegacyImageProcessors/PublicHeaders/LegacyImageProcessors/LegacyImageProcessors.h
similarity index 100%
rename from submodules/LegacyMediaPickerUI/Sources/LegacyImageProcessors.h
rename to submodules/LegacyMediaPickerUI/LegacyImageProcessors/PublicHeaders/LegacyImageProcessors/LegacyImageProcessors.h
diff --git a/submodules/LegacyMediaPickerUI/Sources/LegacyImageProcessors.m b/submodules/LegacyMediaPickerUI/LegacyImageProcessors/Sources/LegacyImageProcessors.m
similarity index 96%
rename from submodules/LegacyMediaPickerUI/Sources/LegacyImageProcessors.m
rename to submodules/LegacyMediaPickerUI/LegacyImageProcessors/Sources/LegacyImageProcessors.m
index dab0029030..0bccc41b64 100644
--- a/submodules/LegacyMediaPickerUI/Sources/LegacyImageProcessors.m
+++ b/submodules/LegacyMediaPickerUI/LegacyImageProcessors/Sources/LegacyImageProcessors.m
@@ -1,4 +1,4 @@
-#import "LegacyImageProcessors.h"
+#import <LegacyImageProcessors/LegacyImageProcessors.h>
 
 #import <LegacyComponents/LegacyComponents.h>
 
diff --git a/submodules/LegacyMediaPickerUI/Sources/LegacyMediaPickerUI.h b/submodules/LegacyMediaPickerUI/Sources/LegacyMediaPickerUI.h
deleted file mode 100644
index 24d275b34d..0000000000
--- a/submodules/LegacyMediaPickerUI/Sources/LegacyMediaPickerUI.h
+++ /dev/null
@@ -1,19 +0,0 @@
-//
-//  LegacyMediaPickerUI.h
-//  LegacyMediaPickerUI
-//
-//  Created by Peter on 8/15/19.
-//  Copyright © 2019 Telegram Messenger LLP. All rights reserved.
-//
-
-#import <UIKit/UIKit.h>
-
-//! Project version number for LegacyMediaPickerUI.
-FOUNDATION_EXPORT double LegacyMediaPickerUIVersionNumber;
-
-//! Project version string for LegacyMediaPickerUI.
-FOUNDATION_EXPORT const unsigned char LegacyMediaPickerUIVersionString[];
-
-#import <LegacyMediaPickerUI/LegacyImageProcessors.h>
-
-
diff --git a/submodules/LegacyUI/BUILD b/submodules/LegacyUI/BUILD
new file mode 100644
index 0000000000..e23975b3a9
--- /dev/null
+++ b/submodules/LegacyUI/BUILD
@@ -0,0 +1,25 @@
+load("@build_bazel_rules_swift//swift:swift.bzl", "swift_library")
+
+swift_library(
+    name = "LegacyUI",
+    module_name = "LegacyUI",
+    srcs = glob([
+        "Sources/**/*.swift",
+    ]),
+    deps = [
+    	"//submodules/SSignalKit/SwiftSignalKit:SwiftSignalKit",
+        "//submodules/Postbox:Postbox",
+        "//submodules/TelegramCore:TelegramCore",
+        "//submodules/SyncCore:SyncCore",
+        "//submodules/AsyncDisplayKit:AsyncDisplayKit",
+        "//submodules/Display:Display",
+        "//submodules/AccountContext:AccountContext",
+        "//submodules/TelegramAudio:TelegramAudio",
+        "//submodules/DeviceAccess:DeviceAccess",
+        "//submodules/LegacyComponents:LegacyComponents",
+        "//submodules/StickerResources:StickerResources",
+    ],
+    visibility = [
+        "//visibility:public",
+    ],
+)
diff --git a/submodules/LegacyUI/Info.plist b/submodules/LegacyUI/Info.plist
deleted file mode 100644
index e1fe4cfb7b..0000000000
--- a/submodules/LegacyUI/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/LegacyUI/Sources/LegacyHTTPOperationImpl.swift b/submodules/LegacyUI/Sources/LegacyHTTPOperationImpl.swift
index d157bea528..637d5f6aeb 100644
--- a/submodules/LegacyUI/Sources/LegacyHTTPOperationImpl.swift
+++ b/submodules/LegacyUI/Sources/LegacyHTTPOperationImpl.swift
@@ -1,9 +1,5 @@
 import Foundation
-#if BUCK
 import MtProtoKit
-#else
-import MtProtoKitDynamic
-#endif
 
 import LegacyComponents
 
diff --git a/submodules/LegacyUI/Sources/LegacyUI.h b/submodules/LegacyUI/Sources/LegacyUI.h
deleted file mode 100644
index f42c305222..0000000000
--- a/submodules/LegacyUI/Sources/LegacyUI.h
+++ /dev/null
@@ -1,19 +0,0 @@
-//
-//  LegacyUI.h
-//  LegacyUI
-//
-//  Created by Peter on 8/12/19.
-//  Copyright © 2019 Telegram Messenger LLP. All rights reserved.
-//
-
-#import <UIKit/UIKit.h>
-
-//! Project version number for LegacyUI.
-FOUNDATION_EXPORT double LegacyUIVersionNumber;
-
-//! Project version string for LegacyUI.
-FOUNDATION_EXPORT const unsigned char LegacyUIVersionString[];
-
-// In this header, you should import all the public headers of your framework using statements like #import <LegacyUI/PublicHeader.h>
-
-
diff --git a/submodules/LegacyUI/Sources/TelegramInitializeLegacyComponents.swift b/submodules/LegacyUI/Sources/TelegramInitializeLegacyComponents.swift
index b77631410c..c037184a90 100644
--- a/submodules/LegacyUI/Sources/TelegramInitializeLegacyComponents.swift
+++ b/submodules/LegacyUI/Sources/TelegramInitializeLegacyComponents.swift
@@ -3,11 +3,7 @@ import UIKit
 import TelegramCore
 import SyncCore
 import SwiftSignalKit
-#if BUCK
 import MtProtoKit
-#else
-import MtProtoKitDynamic
-#endif
 import Display
 import TelegramPresentationData
 import DeviceAccess
diff --git a/submodules/LightweightAccountData/BUILD b/submodules/LightweightAccountData/BUILD
new file mode 100644
index 0000000000..2531e648ad
--- /dev/null
+++ b/submodules/LightweightAccountData/BUILD
@@ -0,0 +1,12 @@
+load("@build_bazel_rules_swift//swift:swift.bzl", "swift_library")
+
+swift_library(
+    name = "LightweightAccountData",
+    module_name = "LightweightAccountData",
+    srcs = glob([
+		"Sources/**/*.swift",
+    ]),
+    visibility = [
+        "//visibility:public",
+    ],
+)
diff --git a/submodules/LightweightAccountData/Info.plist b/submodules/LightweightAccountData/Info.plist
deleted file mode 100644
index e1fe4cfb7b..0000000000
--- a/submodules/LightweightAccountData/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/LightweightAccountData/Sources/LightweightAccountData.h b/submodules/LightweightAccountData/Sources/LightweightAccountData.h
deleted file mode 100644
index e3be399fb1..0000000000
--- a/submodules/LightweightAccountData/Sources/LightweightAccountData.h
+++ /dev/null
@@ -1,19 +0,0 @@
-//
-//  LightweightAccountData.h
-//  LightweightAccountData
-//
-//  Created by Peter on 6/15/19.
-//  Copyright © 2019 Telegram LLP. All rights reserved.
-//
-
-#import <UIKit/UIKit.h>
-
-//! Project version number for LightweightAccountData.
-FOUNDATION_EXPORT double LightweightAccountDataVersionNumber;
-
-//! Project version string for LightweightAccountData.
-FOUNDATION_EXPORT const unsigned char LightweightAccountDataVersionString[];
-
-// In this header, you should import all the public headers of your framework using statements like #import <LightweightAccountData/PublicHeader.h>
-
-
diff --git a/submodules/ListSectionHeaderNode/BUILD b/submodules/ListSectionHeaderNode/BUILD
new file mode 100644
index 0000000000..ebfba2dc44
--- /dev/null
+++ b/submodules/ListSectionHeaderNode/BUILD
@@ -0,0 +1,17 @@
+load("@build_bazel_rules_swift//swift:swift.bzl", "swift_library")
+
+swift_library(
+    name = "ListSectionHeaderNode",
+    module_name = "ListSectionHeaderNode",
+    srcs = glob([
+		"Sources/**/*.swift",
+    ]),
+    deps = [
+        "//submodules/AsyncDisplayKit:AsyncDisplayKit",
+        "//submodules/Display:Display",
+        "//submodules/TelegramPresentationData:TelegramPresentationData",
+    ],
+    visibility = [
+        "//visibility:public",
+    ],
+)
diff --git a/submodules/ListSectionHeaderNode/Info.plist b/submodules/ListSectionHeaderNode/Info.plist
deleted file mode 100644
index e1fe4cfb7b..0000000000
--- a/submodules/ListSectionHeaderNode/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/ListSectionHeaderNode/Sources/ListSectionHeaderNode.h b/submodules/ListSectionHeaderNode/Sources/ListSectionHeaderNode.h
deleted file mode 100644
index aa5c6c5a61..0000000000
--- a/submodules/ListSectionHeaderNode/Sources/ListSectionHeaderNode.h
+++ /dev/null
@@ -1,19 +0,0 @@
-//
-//  ListSectionHeaderNode.h
-//  ListSectionHeaderNode
-//
-//  Created by Peter on 8/5/19.
-//  Copyright © 2019 Telegram Messenger LLP. All rights reserved.
-//
-
-#import <UIKit/UIKit.h>
-
-//! Project version number for ListSectionHeaderNode.
-FOUNDATION_EXPORT double ListSectionHeaderNodeVersionNumber;
-
-//! Project version string for ListSectionHeaderNode.
-FOUNDATION_EXPORT const unsigned char ListSectionHeaderNodeVersionString[];
-
-// In this header, you should import all the public headers of your framework using statements like #import <ListSectionHeaderNode/PublicHeader.h>
-
-
diff --git a/submodules/LiveLocationManager/BUILD b/submodules/LiveLocationManager/BUILD
new file mode 100644
index 0000000000..032a450dbd
--- /dev/null
+++ b/submodules/LiveLocationManager/BUILD
@@ -0,0 +1,20 @@
+load("@build_bazel_rules_swift//swift:swift.bzl", "swift_library")
+
+swift_library(
+    name = "LiveLocationManager",
+    module_name = "LiveLocationManager",
+    srcs = glob([
+		"Sources/**/*.swift",
+    ]),
+    deps = [
+        "//submodules/SSignalKit/SwiftSignalKit:SwiftSignalKit",
+        "//submodules/TelegramCore:TelegramCore",
+        "//submodules/SyncCore:SyncCore",
+        "//submodules/Postbox:Postbox",
+        "//submodules/DeviceLocationManager:DeviceLocationManager",
+        "//submodules/AccountContext:AccountContext",
+    ],
+    visibility = [
+        "//visibility:public",
+    ],
+)
diff --git a/submodules/LiveLocationManager/Info.plist b/submodules/LiveLocationManager/Info.plist
deleted file mode 100644
index e1fe4cfb7b..0000000000
--- a/submodules/LiveLocationManager/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/LiveLocationManager/Sources/LiveLocationManager.h b/submodules/LiveLocationManager/Sources/LiveLocationManager.h
deleted file mode 100644
index e679dc36ad..0000000000
--- a/submodules/LiveLocationManager/Sources/LiveLocationManager.h
+++ /dev/null
@@ -1,19 +0,0 @@
-//
-//  LiveLocationManager.h
-//  LiveLocationManager
-//
-//  Created by Peter on 8/4/19.
-//  Copyright © 2019 Telegram Messenger LLP. All rights reserved.
-//
-
-#import <UIKit/UIKit.h>
-
-//! Project version number for LiveLocationManager.
-FOUNDATION_EXPORT double LiveLocationManagerVersionNumber;
-
-//! Project version string for LiveLocationManager.
-FOUNDATION_EXPORT const unsigned char LiveLocationManagerVersionString[];
-
-// In this header, you should import all the public headers of your framework using statements like #import <LiveLocationManager/PublicHeader.h>
-
-
diff --git a/submodules/LiveLocationPositionNode/BUILD b/submodules/LiveLocationPositionNode/BUILD
new file mode 100644
index 0000000000..205acff3d7
--- /dev/null
+++ b/submodules/LiveLocationPositionNode/BUILD
@@ -0,0 +1,24 @@
+load("@build_bazel_rules_swift//swift:swift.bzl", "swift_library")
+
+swift_library(
+    name = "LiveLocationPositionNode",
+    module_name = "LiveLocationPositionNode",
+    srcs = glob([
+		"Sources/**/*.swift",
+    ]),
+    deps = [
+        "//submodules/AsyncDisplayKit:AsyncDisplayKit",
+        "//submodules/Display:Display",
+        "//submodules/Postbox:Postbox",
+        "//submodules/TelegramCore:TelegramCore",
+        "//submodules/SyncCore:SyncCore",
+        "//submodules/TelegramPresentationData:TelegramPresentationData",
+        "//submodules/AvatarNode:AvatarNode",
+        "//submodules/AppBundle:AppBundle",
+        "//submodules/LocationResources:LocationResources",
+        "//submodules/AccountContext:AccountContext",
+    ],
+    visibility = [
+        "//visibility:public",
+    ],
+)
diff --git a/submodules/LiveLocationPositionNode/Info.plist b/submodules/LiveLocationPositionNode/Info.plist
deleted file mode 100644
index e1fe4cfb7b..0000000000
--- a/submodules/LiveLocationPositionNode/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/LiveLocationPositionNode/Sources/LiveLocationPositionNode.h b/submodules/LiveLocationPositionNode/Sources/LiveLocationPositionNode.h
deleted file mode 100644
index 19804edceb..0000000000
--- a/submodules/LiveLocationPositionNode/Sources/LiveLocationPositionNode.h
+++ /dev/null
@@ -1,19 +0,0 @@
-//
-//  LiveLocationPositionNode.h
-//  LiveLocationPositionNode
-//
-//  Created by Peter on 8/12/19.
-//  Copyright © 2019 Telegram Messenger LLP. All rights reserved.
-//
-
-#import <UIKit/UIKit.h>
-
-//! Project version number for LiveLocationPositionNode.
-FOUNDATION_EXPORT double LiveLocationPositionNodeVersionNumber;
-
-//! Project version string for LiveLocationPositionNode.
-FOUNDATION_EXPORT const unsigned char LiveLocationPositionNodeVersionString[];
-
-// In this header, you should import all the public headers of your framework using statements like #import <LiveLocationPositionNode/PublicHeader.h>
-
-
diff --git a/submodules/LiveLocationTimerNode/BUILD b/submodules/LiveLocationTimerNode/BUILD
new file mode 100644
index 0000000000..068104c566
--- /dev/null
+++ b/submodules/LiveLocationTimerNode/BUILD
@@ -0,0 +1,17 @@
+load("@build_bazel_rules_swift//swift:swift.bzl", "swift_library")
+
+swift_library(
+    name = "LiveLocationTimerNode",
+    module_name = "LiveLocationTimerNode",
+    srcs = glob([
+		"Sources/**/*.swift",
+    ]),
+    deps = [
+        "//submodules/AsyncDisplayKit:AsyncDisplayKit",
+        "//submodules/Display:Display",
+        "//submodules/TelegramPresentationData:TelegramPresentationData",
+    ],
+    visibility = [
+        "//visibility:public",
+    ],
+)
diff --git a/submodules/LiveLocationTimerNode/Info.plist b/submodules/LiveLocationTimerNode/Info.plist
deleted file mode 100644
index e1fe4cfb7b..0000000000
--- a/submodules/LiveLocationTimerNode/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/LiveLocationTimerNode/Sources/LiveLocationTimerNode.h b/submodules/LiveLocationTimerNode/Sources/LiveLocationTimerNode.h
deleted file mode 100644
index 278ea3e891..0000000000
--- a/submodules/LiveLocationTimerNode/Sources/LiveLocationTimerNode.h
+++ /dev/null
@@ -1,19 +0,0 @@
-//
-//  LiveLocationTimerNode.h
-//  LiveLocationTimerNode
-//
-//  Created by Peter on 8/4/19.
-//  Copyright © 2019 Telegram Messenger LLP. All rights reserved.
-//
-
-#import <UIKit/UIKit.h>
-
-//! Project version number for LiveLocationTimerNode.
-FOUNDATION_EXPORT double LiveLocationTimerNodeVersionNumber;
-
-//! Project version string for LiveLocationTimerNode.
-FOUNDATION_EXPORT const unsigned char LiveLocationTimerNodeVersionString[];
-
-// In this header, you should import all the public headers of your framework using statements like #import <LiveLocationTimerNode/PublicHeader.h>
-
-
diff --git a/submodules/LocalAuth/BUILD b/submodules/LocalAuth/BUILD
new file mode 100644
index 0000000000..59d5f7737f
--- /dev/null
+++ b/submodules/LocalAuth/BUILD
@@ -0,0 +1,15 @@
+load("@build_bazel_rules_swift//swift:swift.bzl", "swift_library")
+
+swift_library(
+    name = "LocalAuth",
+    module_name = "LocalAuth",
+    srcs = glob([
+        "Sources/**/*.swift",
+    ]),
+    deps = [
+    	"//submodules/SSignalKit/SwiftSignalKit:SwiftSignalKit",
+    ],
+    visibility = [
+        "//visibility:public",
+    ],
+)
diff --git a/submodules/LocalMediaResources/BUILD b/submodules/LocalMediaResources/BUILD
new file mode 100644
index 0000000000..56dbb11ee2
--- /dev/null
+++ b/submodules/LocalMediaResources/BUILD
@@ -0,0 +1,19 @@
+load("@build_bazel_rules_swift//swift:swift.bzl", "swift_library")
+
+swift_library(
+    name = "LocalMediaResources",
+    module_name = "LocalMediaResources",
+    srcs = glob([
+		"Sources/**/*.swift",
+    ]),
+    deps = [
+        "//submodules/SSignalKit/SwiftSignalKit:SwiftSignalKit",
+        "//submodules/Postbox:Postbox",
+        "//submodules/TelegramCore:TelegramCore",
+        "//submodules/SyncCore:SyncCore",
+        "//submodules/ImageCompression:ImageCompression",
+    ],
+    visibility = [
+        "//visibility:public",
+    ],
+)
diff --git a/submodules/LocalMediaResources/Info.plist b/submodules/LocalMediaResources/Info.plist
deleted file mode 100644
index e1fe4cfb7b..0000000000
--- a/submodules/LocalMediaResources/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/LocalMediaResources/Sources/LocalMediaResources.h b/submodules/LocalMediaResources/Sources/LocalMediaResources.h
deleted file mode 100644
index e6a64165d1..0000000000
--- a/submodules/LocalMediaResources/Sources/LocalMediaResources.h
+++ /dev/null
@@ -1,19 +0,0 @@
-//
-//  LocalMediaResources.h
-//  LocalMediaResources
-//
-//  Created by Peter on 8/15/19.
-//  Copyright © 2019 Telegram Messenger LLP. All rights reserved.
-//
-
-#import <UIKit/UIKit.h>
-
-//! Project version number for LocalMediaResources.
-FOUNDATION_EXPORT double LocalMediaResourcesVersionNumber;
-
-//! Project version string for LocalMediaResources.
-FOUNDATION_EXPORT const unsigned char LocalMediaResourcesVersionString[];
-
-// In this header, you should import all the public headers of your framework using statements like #import <LocalMediaResources/PublicHeader.h>
-
-
diff --git a/submodules/LocalizedPeerData/BUILD b/submodules/LocalizedPeerData/BUILD
new file mode 100644
index 0000000000..9d3bb5514a
--- /dev/null
+++ b/submodules/LocalizedPeerData/BUILD
@@ -0,0 +1,20 @@
+load("@build_bazel_rules_swift//swift:swift.bzl", "swift_library")
+
+swift_library(
+    name = "LocalizedPeerData",
+    module_name = "LocalizedPeerData",
+    srcs = glob([
+		"Sources/**/*.swift",
+    ]),
+    deps = [
+        "//submodules/TelegramCore:TelegramCore",
+        "//submodules/SyncCore:SyncCore",
+        "//submodules/Postbox:Postbox",
+        "//submodules/TelegramPresentationData:TelegramPresentationData",
+        "//submodules/TelegramUIPreferences:TelegramUIPreferences",
+        "//submodules/PhoneNumberFormat:PhoneNumberFormat",
+    ],
+    visibility = [
+        "//visibility:public",
+    ],
+)
diff --git a/submodules/LocalizedPeerData/Info.plist b/submodules/LocalizedPeerData/Info.plist
deleted file mode 100644
index e1fe4cfb7b..0000000000
--- a/submodules/LocalizedPeerData/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/LocalizedPeerData/Sources/LocalizedPeerData.h b/submodules/LocalizedPeerData/Sources/LocalizedPeerData.h
deleted file mode 100644
index e848df1d0f..0000000000
--- a/submodules/LocalizedPeerData/Sources/LocalizedPeerData.h
+++ /dev/null
@@ -1,19 +0,0 @@
-//
-//  LocalizedPeerData.h
-//  LocalizedPeerData
-//
-//  Created by Peter on 8/5/19.
-//  Copyright © 2019 Telegram Messenger LLP. All rights reserved.
-//
-
-#import <UIKit/UIKit.h>
-
-//! Project version number for LocalizedPeerData.
-FOUNDATION_EXPORT double LocalizedPeerDataVersionNumber;
-
-//! Project version string for LocalizedPeerData.
-FOUNDATION_EXPORT const unsigned char LocalizedPeerDataVersionString[];
-
-// In this header, you should import all the public headers of your framework using statements like #import <LocalizedPeerData/PublicHeader.h>
-
-
diff --git a/submodules/LocationResources/BUILD b/submodules/LocationResources/BUILD
new file mode 100644
index 0000000000..620e4d22d2
--- /dev/null
+++ b/submodules/LocationResources/BUILD
@@ -0,0 +1,20 @@
+load("@build_bazel_rules_swift//swift:swift.bzl", "swift_library")
+
+swift_library(
+    name = "LocationResources",
+    module_name = "LocationResources",
+    srcs = glob([
+		"Sources/**/*.swift",
+    ]),
+    deps = [
+        "//submodules/TelegramCore:TelegramCore",
+        "//submodules/SyncCore:SyncCore",
+        "//submodules/Postbox:Postbox",
+        "//submodules/SSignalKit/SwiftSignalKit:SwiftSignalKit",
+        "//submodules/Display:Display",
+        "//submodules/AppBundle:AppBundle",
+    ],
+    visibility = [
+        "//visibility:public",
+    ],
+)
diff --git a/submodules/LocationResources/Info.plist b/submodules/LocationResources/Info.plist
deleted file mode 100644
index e1fe4cfb7b..0000000000
--- a/submodules/LocationResources/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/LocationResources/Sources/MediaResources.h b/submodules/LocationResources/Sources/MediaResources.h
deleted file mode 100644
index 4b7c6c71d2..0000000000
--- a/submodules/LocationResources/Sources/MediaResources.h
+++ /dev/null
@@ -1,19 +0,0 @@
-//
-//  MediaResources.h
-//  MediaResources
-//
-//  Created by Peter on 8/2/19.
-//  Copyright © 2019 Telegram Messenger LLP. All rights reserved.
-//
-
-#import <UIKit/UIKit.h>
-
-//! Project version number for MediaResources.
-FOUNDATION_EXPORT double MediaResourcesVersionNumber;
-
-//! Project version string for MediaResources.
-FOUNDATION_EXPORT const unsigned char MediaResourcesVersionString[];
-
-// In this header, you should import all the public headers of your framework using statements like #import <MediaResources/PublicHeader.h>
-
-
diff --git a/submodules/LocationUI/BUILD b/submodules/LocationUI/BUILD
new file mode 100644
index 0000000000..45749a8898
--- /dev/null
+++ b/submodules/LocationUI/BUILD
@@ -0,0 +1,43 @@
+load("@build_bazel_rules_swift//swift:swift.bzl", "swift_library")
+
+swift_library(
+    name = "LocationUI",
+    module_name = "LocationUI",
+    srcs = glob([
+		"Sources/**/*.swift",
+    ]),
+    deps = [
+        "//submodules/SSignalKit/SwiftSignalKit:SwiftSignalKit",
+        "//submodules/AsyncDisplayKit:AsyncDisplayKit",
+        "//submodules/Display:Display",
+        "//submodules/Postbox:Postbox",
+        "//submodules/TelegramCore:TelegramCore",
+        "//submodules/SyncCore:SyncCore",
+        "//submodules/TelegramPresentationData:TelegramPresentationData",
+        "//submodules/LegacyComponents:LegacyComponents",
+        "//submodules/ShareController:ShareController",
+        "//submodules/AccountContext:AccountContext",
+        "//submodules/OpenInExternalAppUI:OpenInExternalAppUI",
+        "//submodules/ItemListUI:ItemListUI",
+        "//submodules/LegacyUI:LegacyUI",
+        "//submodules/AppBundle:AppBundle",
+        "//submodules/TelegramStringFormatting:TelegramStringFormatting",
+        "//submodules/LocationResources:LocationResources",
+        "//submodules/ListSectionHeaderNode:ListSectionHeaderNode",
+        "//submodules/SegmentedControlNode:SegmentedControlNode",
+        "//submodules/Geocoding:Geocoding",
+        "//submodules/ItemListVenueItem:ItemListVenueItem",
+        "//submodules/MergeLists:MergeLists",
+        "//submodules/TelegramUIPreferences:TelegramUIPreferences",
+        "//submodules/SearchBarNode:SearchBarNode",
+        "//submodules/PresentationDataUtils:PresentationDataUtils",
+        "//submodules/DeviceAccess:DeviceAccess",
+        "//submodules/ChatListSearchItemHeader:ChatListSearchItemHeader",
+        "//submodules/PhoneNumberFormat:PhoneNumberFormat",
+        "//submodules/PersistentStringHash:PersistentStringHash",
+        "//submodules/SolidRoundedButtonNode:SolidRoundedButtonNode",
+    ],
+    visibility = [
+        "//visibility:public",
+    ],
+)
diff --git a/submodules/LocationUI/Info.plist b/submodules/LocationUI/Info.plist
deleted file mode 100644
index e1fe4cfb7b..0000000000
--- a/submodules/LocationUI/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/LocationUI/Sources/LocationMapHeaderNode.swift b/submodules/LocationUI/Sources/LocationMapHeaderNode.swift
index 817b6fa7a7..d2eaff4440 100644
--- a/submodules/LocationUI/Sources/LocationMapHeaderNode.swift
+++ b/submodules/LocationUI/Sources/LocationMapHeaderNode.swift
@@ -1,4 +1,6 @@
 import Foundation
+import UIKit
+import AsyncDisplayKit
 import Display
 import TelegramPresentationData
 import AppBundle
diff --git a/submodules/LocationUI/Sources/LocationMapNode.swift b/submodules/LocationUI/Sources/LocationMapNode.swift
index eebbdaa76c..0576883bb4 100644
--- a/submodules/LocationUI/Sources/LocationMapNode.swift
+++ b/submodules/LocationUI/Sources/LocationMapNode.swift
@@ -1,4 +1,6 @@
 import Foundation
+import UIKit
+import AsyncDisplayKit
 import Display
 import SwiftSignalKit
 import MapKit
diff --git a/submodules/LocationUI/Sources/LocationPickerControllerNode.swift b/submodules/LocationUI/Sources/LocationPickerControllerNode.swift
index 64a1d42783..03b0ebcdb3 100644
--- a/submodules/LocationUI/Sources/LocationPickerControllerNode.swift
+++ b/submodules/LocationUI/Sources/LocationPickerControllerNode.swift
@@ -1,5 +1,6 @@
 import Foundation
 import UIKit
+import AsyncDisplayKit
 import Display
 import LegacyComponents
 import TelegramCore
diff --git a/submodules/LocationUI/Sources/LocationUI.h b/submodules/LocationUI/Sources/LocationUI.h
deleted file mode 100644
index 477d4eb9b7..0000000000
--- a/submodules/LocationUI/Sources/LocationUI.h
+++ /dev/null
@@ -1,19 +0,0 @@
-//
-//  LocationUI.h
-//  LocationUI
-//
-//  Created by Peter on 8/12/19.
-//  Copyright © 2019 Telegram Messenger LLP. All rights reserved.
-//
-
-#import <UIKit/UIKit.h>
-
-//! Project version number for LocationUI.
-FOUNDATION_EXPORT double LocationUIVersionNumber;
-
-//! Project version string for LocationUI.
-FOUNDATION_EXPORT const unsigned char LocationUIVersionString[];
-
-// In this header, you should import all the public headers of your framework using statements like #import <LocationUI/PublicHeader.h>
-
-
diff --git a/submodules/MapResourceToAvatarSizes/BUILD b/submodules/MapResourceToAvatarSizes/BUILD
new file mode 100644
index 0000000000..5673928996
--- /dev/null
+++ b/submodules/MapResourceToAvatarSizes/BUILD
@@ -0,0 +1,19 @@
+load("@build_bazel_rules_swift//swift:swift.bzl", "swift_library")
+
+swift_library(
+    name = "MapResourceToAvatarSizes",
+    module_name = "MapResourceToAvatarSizes",
+    srcs = glob([
+		"Sources/**/*.swift",
+    ]),
+    deps = [
+        "//submodules/SSignalKit/SwiftSignalKit:SwiftSignalKit",
+        "//submodules/Postbox:Postbox",
+        "//submodules/TelegramCore:TelegramCore",
+        "//submodules/SyncCore:SyncCore",
+        "//submodules/Display:Display",
+    ],
+    visibility = [
+        "//visibility:public",
+    ],
+)
diff --git a/submodules/MapResourceToAvatarSizes/Info.plist b/submodules/MapResourceToAvatarSizes/Info.plist
deleted file mode 100644
index e1fe4cfb7b..0000000000
--- a/submodules/MapResourceToAvatarSizes/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/MapResourceToAvatarSizes/Sources/MapResourceToAvatarSizes.h b/submodules/MapResourceToAvatarSizes/Sources/MapResourceToAvatarSizes.h
deleted file mode 100644
index ac6e4a60e5..0000000000
--- a/submodules/MapResourceToAvatarSizes/Sources/MapResourceToAvatarSizes.h
+++ /dev/null
@@ -1,19 +0,0 @@
-//
-//  MapResourceToAvatarSizes.h
-//  MapResourceToAvatarSizes
-//
-//  Created by Peter on 8/15/19.
-//  Copyright © 2019 Telegram Messenger LLP. All rights reserved.
-//
-
-#import <UIKit/UIKit.h>
-
-//! Project version number for MapResourceToAvatarSizes.
-FOUNDATION_EXPORT double MapResourceToAvatarSizesVersionNumber;
-
-//! Project version string for MapResourceToAvatarSizes.
-FOUNDATION_EXPORT const unsigned char MapResourceToAvatarSizesVersionString[];
-
-// In this header, you should import all the public headers of your framework using statements like #import <MapResourceToAvatarSizes/PublicHeader.h>
-
-
diff --git a/submodules/Markdown/BUCK b/submodules/Markdown/BUCK
index a7e2e42fc3..8b9ed246b4 100644
--- a/submodules/Markdown/BUCK
+++ b/submodules/Markdown/BUCK
@@ -3,7 +3,7 @@ load("//Config:buck_rule_macros.bzl", "static_library")
 static_library(
     name = "Markdown",
     srcs = glob([
-        "Sources/**/*.swift",
+        "Source/**/*.swift",
     ]),
     deps = [
     ],
diff --git a/submodules/Markdown/BUILD b/submodules/Markdown/BUILD
new file mode 100644
index 0000000000..0faac980c6
--- /dev/null
+++ b/submodules/Markdown/BUILD
@@ -0,0 +1,12 @@
+load("@build_bazel_rules_swift//swift:swift.bzl", "swift_library")
+
+swift_library(
+    name = "Markdown",
+    module_name = "Markdown",
+    srcs = glob([
+        "Source/**/*.swift",
+    ]),
+    visibility = [
+        "//visibility:public",
+    ],
+)
diff --git a/submodules/Markdown/Sources/Markdown.swift b/submodules/Markdown/Source/Markdown.swift
similarity index 100%
rename from submodules/Markdown/Sources/Markdown.swift
rename to submodules/Markdown/Source/Markdown.swift
diff --git a/submodules/MediaPlayer/BUCK b/submodules/MediaPlayer/BUCK
index ca0cbcaf82..e041921605 100644
--- a/submodules/MediaPlayer/BUCK
+++ b/submodules/MediaPlayer/BUCK
@@ -4,14 +4,7 @@ static_library(
     name = "UniversalMediaPlayer",
     srcs = glob([
         "Sources/**/*.swift",
-        "Sources/*.m",
     ]),
-    headers = glob([
-        "Sources/*.h",
-    ], exclude = ["Sources/UniversalMediaPlayer.h"]),
-    exported_headers = glob([
-        "Sources/*.h",
-    ], exclude = ["Sources/UniversalMediaPlayer.h"]),
     deps = [
     	"//submodules/TelegramCore:TelegramCore#shared",
         "//submodules/SyncCore:SyncCore#shared",
@@ -20,7 +13,8 @@ static_library(
         "//submodules/AsyncDisplayKit:AsyncDisplayKit#shared",
         "//submodules/Display:Display#shared",
         "//submodules/TelegramAudio:TelegramAudio",
-        "//submodules/FFMpeg:FFMpeg",
+        "//submodules/FFMpegBinding:FFMpegBinding",
+        "//submodules/RingBuffer:RingBuffer",
     ],
     frameworks = [
         "$SDKROOT/System/Library/Frameworks/Foundation.framework",
diff --git a/submodules/MediaPlayer/BUILD b/submodules/MediaPlayer/BUILD
new file mode 100644
index 0000000000..4b4fe5392c
--- /dev/null
+++ b/submodules/MediaPlayer/BUILD
@@ -0,0 +1,23 @@
+load("@build_bazel_rules_swift//swift:swift.bzl", "swift_library")
+
+swift_library(
+    name = "UniversalMediaPlayer",
+    module_name = "UniversalMediaPlayer",
+    srcs = glob([
+        "Sources/**/*.swift",
+    ]),
+    deps = [
+        "//submodules/TelegramCore:TelegramCore",
+        "//submodules/SyncCore:SyncCore",
+        "//submodules/Postbox:Postbox",
+        "//submodules/SSignalKit/SwiftSignalKit:SwiftSignalKit",
+        "//submodules/AsyncDisplayKit:AsyncDisplayKit",
+        "//submodules/Display:Display",
+        "//submodules/TelegramAudio:TelegramAudio",
+        "//submodules/FFMpegBinding:FFMpegBinding",
+        "//submodules/RingBuffer:RingBuffer",
+    ],
+    visibility = [
+        "//visibility:public",
+    ],
+)
diff --git a/submodules/MediaPlayer/Info.plist b/submodules/MediaPlayer/Info.plist
deleted file mode 100644
index e1fe4cfb7b..0000000000
--- a/submodules/MediaPlayer/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/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/MediaResources/BUILD b/submodules/MediaResources/BUILD
new file mode 100644
index 0000000000..146fc750fd
--- /dev/null
+++ b/submodules/MediaResources/BUILD
@@ -0,0 +1,18 @@
+load("@build_bazel_rules_swift//swift:swift.bzl", "swift_library")
+
+swift_library(
+    name = "MediaResources",
+    module_name = "MediaResources",
+    srcs = glob([
+		"Sources/**/*.swift",
+    ]),
+    deps = [
+        "//submodules/TelegramCore:TelegramCore",
+        "//submodules/SyncCore:SyncCore",
+        "//submodules/Postbox:Postbox",
+        "//submodules/SSignalKit/SwiftSignalKit:SwiftSignalKit",
+    ],
+    visibility = [
+        "//visibility:public",
+    ],
+)
diff --git a/submodules/MediaResources/Info.plist b/submodules/MediaResources/Info.plist
deleted file mode 100644
index e1fe4cfb7b..0000000000
--- a/submodules/MediaResources/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/MediaResources/Sources/MediaResources.h b/submodules/MediaResources/Sources/MediaResources.h
deleted file mode 100644
index 4b7c6c71d2..0000000000
--- a/submodules/MediaResources/Sources/MediaResources.h
+++ /dev/null
@@ -1,19 +0,0 @@
-//
-//  MediaResources.h
-//  MediaResources
-//
-//  Created by Peter on 8/2/19.
-//  Copyright © 2019 Telegram Messenger LLP. All rights reserved.
-//
-
-#import <UIKit/UIKit.h>
-
-//! Project version number for MediaResources.
-FOUNDATION_EXPORT double MediaResourcesVersionNumber;
-
-//! Project version string for MediaResources.
-FOUNDATION_EXPORT const unsigned char MediaResourcesVersionString[];
-
-// In this header, you should import all the public headers of your framework using statements like #import <MediaResources/PublicHeader.h>
-
-
diff --git a/submodules/MergeLists/BUILD b/submodules/MergeLists/BUILD
new file mode 100644
index 0000000000..b19a43d51f
--- /dev/null
+++ b/submodules/MergeLists/BUILD
@@ -0,0 +1,12 @@
+load("@build_bazel_rules_swift//swift:swift.bzl", "swift_library")
+
+swift_library(
+    name = "MergeLists",
+    module_name = "MergeLists",
+    srcs = glob([
+        "Sources/**/*.swift",
+    ]),
+    visibility = [
+        "//visibility:public",
+    ],
+)
diff --git a/submodules/MergeLists/Info.plist b/submodules/MergeLists/Info.plist
deleted file mode 100644
index e1fe4cfb7b..0000000000
--- a/submodules/MergeLists/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/MergeLists/Sources/MergeLists.h b/submodules/MergeLists/Sources/MergeLists.h
deleted file mode 100644
index ab329490db..0000000000
--- a/submodules/MergeLists/Sources/MergeLists.h
+++ /dev/null
@@ -1,19 +0,0 @@
-//
-//  MergeLists.h
-//  MergeLists
-//
-//  Created by Peter on 8/1/19.
-//  Copyright © 2019 Telegram Messenger LLP. All rights reserved.
-//
-
-#import <UIKit/UIKit.h>
-
-//! Project version number for MergeLists.
-FOUNDATION_EXPORT double MergeListsVersionNumber;
-
-//! Project version string for MergeLists.
-FOUNDATION_EXPORT const unsigned char MergeListsVersionString[];
-
-// In this header, you should import all the public headers of your framework using statements like #import <MergeLists/PublicHeader.h>
-
-
diff --git a/submodules/MergeLists/Sources/MergeLists.swift b/submodules/MergeLists/Sources/MergeLists.swift
index 5b366bba3a..4a12a6da54 100644
--- a/submodules/MergeLists/Sources/MergeLists.swift
+++ b/submodules/MergeLists/Sources/MergeLists.swift
@@ -215,15 +215,36 @@ public func mergeListsStableWithUpdates<T>(leftList: [T], rightList: [T], isLess
     for item in rightList {
         rightStableIds.append(getId(item))
     }
-    if Set(leftStableIds) == Set(rightStableIds) && leftStableIds != rightStableIds {
-        /*var i = 0
-        var j = 0
-        while true {
+    if Set(leftStableIds) == Set(rightStableIds) && leftStableIds != rightStableIds && !allUpdated {
+        var updatedItems: [(T, AnyHashable)] = []
+        for i in 0 ..< leftList.count {
             if getId(leftList[i]) != getId(rightList[i]) {
-                
+                removeIndices.append(i)
+            } else {
+                updatedItems.append((leftList[i], getId(leftList[i])))
             }
-        }*/
-        print("order changed")
+        }
+        var i = 0
+        while i < rightList.count {
+            if updatedItems[i].1 != getId(rightList[i]) {
+                updatedItems.insert((rightList[i], getId(rightList[i])), at: i)
+                var previousIndex: Int?
+                for k in 0 ..< leftList.count {
+                    if getId(leftList[k]) == getId(rightList[i]) {
+                        previousIndex = k
+                        break
+                    }
+                }
+                assert(previousIndex != nil)
+                insertItems.append((i, rightList[i], previousIndex))
+            } else {
+                if !isEqual(updatedItems[i].0, rightList[i]) {
+                    updatedIndices.append((i, rightList[i], i))
+                }
+            }
+            i += 1
+        }
+        return (removeIndices, insertItems, updatedIndices)
     }
     
     var currentList = leftList
diff --git a/submodules/MessageReactionListUI/BUILD b/submodules/MessageReactionListUI/BUILD
new file mode 100644
index 0000000000..36ff8e35c1
--- /dev/null
+++ b/submodules/MessageReactionListUI/BUILD
@@ -0,0 +1,24 @@
+load("@build_bazel_rules_swift//swift:swift.bzl", "swift_library")
+
+swift_library(
+    name = "MessageReactionListUI",
+    module_name = "MessageReactionListUI",
+    srcs = glob([
+		"Sources/**/*.swift",
+    ]),
+    deps = [
+        "//submodules/SSignalKit/SwiftSignalKit:SwiftSignalKit",
+        "//submodules/TelegramCore:TelegramCore",
+        "//submodules/SyncCore:SyncCore",
+        "//submodules/Postbox:Postbox",
+        "//submodules/AsyncDisplayKit:AsyncDisplayKit",
+        "//submodules/Display:Display",
+        "//submodules/TelegramPresentationData:TelegramPresentationData",
+        "//submodules/AccountContext:AccountContext",
+        "//submodules/MergeLists:MergeLists",
+        "//submodules/ItemListPeerItem:ItemListPeerItem",
+    ],
+    visibility = [
+        "//visibility:public",
+    ],
+)
diff --git a/submodules/MessageReactionListUI/Info.plist b/submodules/MessageReactionListUI/Info.plist
deleted file mode 100644
index e1fe4cfb7b..0000000000
--- a/submodules/MessageReactionListUI/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/MessageReactionListUI/Sources/MessageReactionListController.swift b/submodules/MessageReactionListUI/Sources/MessageReactionListController.swift
index ff0b9951fe..ba17ca607f 100644
--- a/submodules/MessageReactionListUI/Sources/MessageReactionListController.swift
+++ b/submodules/MessageReactionListUI/Sources/MessageReactionListController.swift
@@ -1,4 +1,6 @@
 import Foundation
+import UIKit
+import AsyncDisplayKit
 import Display
 import AccountContext
 import TelegramPresentationData
diff --git a/submodules/MessageReactionListUI/Sources/MessageReactionListUI.h b/submodules/MessageReactionListUI/Sources/MessageReactionListUI.h
deleted file mode 100644
index 6460ffc97e..0000000000
--- a/submodules/MessageReactionListUI/Sources/MessageReactionListUI.h
+++ /dev/null
@@ -1,19 +0,0 @@
-//
-//  MessageReactionListUI.h
-//  MessageReactionListUI
-//
-//  Created by Peter on 8/27/19.
-//  Copyright © 2019 Telegram Messenger LLP. All rights reserved.
-//
-
-#import <UIKit/UIKit.h>
-
-//! Project version number for MessageReactionListUI.
-FOUNDATION_EXPORT double MessageReactionListUIVersionNumber;
-
-//! Project version string for MessageReactionListUI.
-FOUNDATION_EXPORT const unsigned char MessageReactionListUIVersionString[];
-
-// In this header, you should import all the public headers of your framework using statements like #import <MessageReactionListUI/PublicHeader.h>
-
-
diff --git a/submodules/MimeTypes/BUCK b/submodules/MimeTypes/BUCK
index 8508f813b6..50ea70b1fa 100644
--- a/submodules/MimeTypes/BUCK
+++ b/submodules/MimeTypes/BUCK
@@ -7,10 +7,10 @@ static_library(
     ]),
     headers = glob([
         "Sources/*.h",
-    ], exclude = ["Sources/MimeTypes.h"]),
+    ]),
     exported_headers = glob([
-        "Sources/*.h",
-    ], exclude = ["Sources/MimeTypes.h"]),
+        "PublicHeaders/**/*.h",
+    ]),
     frameworks = [
         "$SDKROOT/System/Library/Frameworks/Foundation.framework",
     ],
diff --git a/submodules/MimeTypes/BUILD b/submodules/MimeTypes/BUILD
new file mode 100644
index 0000000000..cdaaa20685
--- /dev/null
+++ b/submodules/MimeTypes/BUILD
@@ -0,0 +1,22 @@
+
+objc_library(
+    name = "MimeTypes",
+    enable_modules = True,
+    module_name = "MimeTypes",
+    srcs = glob([
+        "Sources/*.m",
+        "Sources/*.h",
+    ]),
+    hdrs = glob([
+        "PublicHeaders/**/*.h",
+    ]),
+    includes = [
+        "PublicHeaders",
+    ],
+    sdk_frameworks = [
+      "Foundation",
+    ],
+    visibility = [
+        "//visibility:public",
+    ],
+)
diff --git a/submodules/MimeTypes/Info.plist b/submodules/MimeTypes/Info.plist
deleted file mode 100644
index e1fe4cfb7b..0000000000
--- a/submodules/MimeTypes/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/MimeTypes/PublicHeaders/MimeTypes/MimeTypes.h b/submodules/MimeTypes/PublicHeaders/MimeTypes/MimeTypes.h
new file mode 100644
index 0000000000..458166eee0
--- /dev/null
+++ b/submodules/MimeTypes/PublicHeaders/MimeTypes/MimeTypes.h
@@ -0,0 +1,5 @@
+#import <UIKit/UIKit.h>
+
+#import <MimeTypes/TGMimeTypeMap.h>
+
+
diff --git a/submodules/MimeTypes/Sources/TGMimeTypeMap.h b/submodules/MimeTypes/PublicHeaders/MimeTypes/TGMimeTypeMap.h
similarity index 100%
rename from submodules/MimeTypes/Sources/TGMimeTypeMap.h
rename to submodules/MimeTypes/PublicHeaders/MimeTypes/TGMimeTypeMap.h
diff --git a/submodules/MimeTypes/Sources/MimeTypes.h b/submodules/MimeTypes/Sources/MimeTypes.h
deleted file mode 100644
index 0384694fcb..0000000000
--- a/submodules/MimeTypes/Sources/MimeTypes.h
+++ /dev/null
@@ -1,11 +0,0 @@
-#import <UIKit/UIKit.h>
-
-//! Project version number for MimeTypes.
-FOUNDATION_EXPORT double MimeTypesVersionNumber;
-
-//! Project version string for MimeTypes.
-FOUNDATION_EXPORT const unsigned char MimeTypesVersionString[];
-
-#import <MimeTypes/TGMimeTypeMap.h>
-
-
diff --git a/submodules/MimeTypes/Sources/TGMimeTypeMap.m b/submodules/MimeTypes/Sources/TGMimeTypeMap.m
index 123d880dd3..89cd7548ef 100644
--- a/submodules/MimeTypes/Sources/TGMimeTypeMap.m
+++ b/submodules/MimeTypes/Sources/TGMimeTypeMap.m
@@ -1,4 +1,4 @@
-#import "TGMimeTypeMap.h"
+#import <MimeTypes/TGMimeTypeMap.h>
 
 static NSDictionary *mimeToExtensionMap = nil;
 static NSDictionary *extensionToMimeMap = nil;
diff --git a/submodules/MonotonicTime/BUCK b/submodules/MonotonicTime/BUCK
index 46904b50fd..efe65d52c5 100644
--- a/submodules/MonotonicTime/BUCK
+++ b/submodules/MonotonicTime/BUCK
@@ -9,7 +9,7 @@ static_library(
         "Sources/**/*.h",
     ]),
     exported_headers = glob([
-        "Sources/**/*.h",
+        "PublicHeaders/**/*.h",
     ]),
     deps = [
     ],
diff --git a/submodules/MonotonicTime/BUILD b/submodules/MonotonicTime/BUILD
new file mode 100644
index 0000000000..545b0a7b88
--- /dev/null
+++ b/submodules/MonotonicTime/BUILD
@@ -0,0 +1,22 @@
+
+objc_library(
+    name = "MonotonicTime",
+    enable_modules = True,
+    module_name = "MonotonicTime",
+    srcs = glob([
+        "Sources/*.m",
+        "Sources/*.h",
+    ]),
+    hdrs = glob([
+        "PublicHeaders/**/*.h",
+    ]),
+    includes = [
+        "PublicHeaders",
+    ],
+    sdk_frameworks = [
+      "Foundation",
+    ],
+    visibility = [
+        "//visibility:public",
+    ],
+)
diff --git a/submodules/MonotonicTime/Sources/DeviceUptime.h b/submodules/MonotonicTime/PublicHeaders/MonotonicTime/DeviceUptime.h
similarity index 100%
rename from submodules/MonotonicTime/Sources/DeviceUptime.h
rename to submodules/MonotonicTime/PublicHeaders/MonotonicTime/DeviceUptime.h
diff --git a/submodules/MonotonicTime/Sources/DeviceUptime.m b/submodules/MonotonicTime/Sources/DeviceUptime.m
index 87b0720092..153ced2e97 100644
--- a/submodules/MonotonicTime/Sources/DeviceUptime.m
+++ b/submodules/MonotonicTime/Sources/DeviceUptime.m
@@ -1,4 +1,4 @@
-#import "DeviceUptime.h"
+#import <MonotonicTime/DeviceUptime.h>
 
 #include <sys/sysctl.h>
 
diff --git a/submodules/MosaicLayout/BUILD b/submodules/MosaicLayout/BUILD
new file mode 100644
index 0000000000..27e18bcc11
--- /dev/null
+++ b/submodules/MosaicLayout/BUILD
@@ -0,0 +1,12 @@
+load("@build_bazel_rules_swift//swift:swift.bzl", "swift_library")
+
+swift_library(
+    name = "MosaicLayout",
+    module_name = "MosaicLayout",
+    srcs = glob([
+		"Sources/**/*.swift",
+    ]),
+    visibility = [
+        "//visibility:public",
+    ],
+)
diff --git a/submodules/MosaicLayout/Info.plist b/submodules/MosaicLayout/Info.plist
deleted file mode 100644
index e1fe4cfb7b..0000000000
--- a/submodules/MosaicLayout/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/MosaicLayout/Sources/MosaicLayout.h b/submodules/MosaicLayout/Sources/MosaicLayout.h
deleted file mode 100644
index ed69843504..0000000000
--- a/submodules/MosaicLayout/Sources/MosaicLayout.h
+++ /dev/null
@@ -1,19 +0,0 @@
-//
-//  MosaicLayout.h
-//  MosaicLayout
-//
-//  Created by Peter on 8/12/19.
-//  Copyright © 2019 Telegram Messenger LLP. All rights reserved.
-//
-
-#import <UIKit/UIKit.h>
-
-//! Project version number for MosaicLayout.
-FOUNDATION_EXPORT double MosaicLayoutVersionNumber;
-
-//! Project version string for MosaicLayout.
-FOUNDATION_EXPORT const unsigned char MosaicLayoutVersionString[];
-
-// In this header, you should import all the public headers of your framework using statements like #import <MosaicLayout/PublicHeader.h>
-
-
diff --git a/submodules/MtProtoKit/BUCK b/submodules/MtProtoKit/BUCK
index c7c41a5081..215e91f784 100644
--- a/submodules/MtProtoKit/BUCK
+++ b/submodules/MtProtoKit/BUCK
@@ -3,79 +3,14 @@ load("//Config:buck_rule_macros.bzl", "static_library", "framework", "glob_map",
 framework(
     name = "MtProtoKit",
     srcs = glob([
-        "*.m",
-        "MtProtoKit/*.m",
-        "thirdparty/AFNetworking/*.m",
-        "thirdparty/AsyncSocket/*.m",
+        "Sources/*.m",
     ]),
-    headers = merge_maps([
-        glob_map(glob([
-            "*.h",
-            "MtProtoKit/*.h",
-            "thirdparty/AFNetworking/*.h",
-            "thirdparty/AsyncSocket/*.h",
-        ])),
+    headers = glob([
+        "Sources/*.h",
+    ]),
+    exported_headers = glob([
+        "PublicHeaders/**/*.h",
     ]),
-    exported_headers = [
-        "MtProtoKit/MTTime.h",
-        "MtProtoKit/MTTimer.h",
-        "MtProtoKit/MTLogging.h",
-        "MtProtoKit/MTEncryption.h",
-        "MtProtoKit/MTInternalId.h",
-        "MtProtoKit/MTQueue.h",
-        "MtProtoKit/MTOutputStream.h",
-        "MtProtoKit/MTInputStream.h",
-        "MtProtoKit/MTSerialization.h",
-        "MtProtoKit/MTExportedAuthorizationData.h",
-        "MtProtoKit/MTRpcError.h",
-        "MtProtoKit/MTKeychain.h",
-        "MtProtoKit/MTFileBasedKeychain.h",
-        "MtProtoKit/MTContext.h",
-        "MtProtoKit/MTTransportScheme.h",
-        "MtProtoKit/MTDatacenterTransferAuthAction.h",
-        "MtProtoKit/MTDatacenterAuthAction.h",
-        "MtProtoKit/MTDatacenterAuthMessageService.h",
-        "MtProtoKit/MTDatacenterAddress.h",
-        "MtProtoKit/MTDatacenterAddressSet.h",
-        "MtProtoKit/MTDatacenterAuthInfo.h",
-        "MtProtoKit/MTDatacenterSaltInfo.h",
-        "MtProtoKit/MTDatacenterAddressListData.h",
-        "MtProtoKit/MTProto.h",
-        "MtProtoKit/MTSessionInfo.h",
-        "MtProtoKit/MTTimeFixContext.h",
-        "MtProtoKit/MTPreparedMessage.h",
-        "MtProtoKit/MTOutgoingMessage.h",
-        "MtProtoKit/MTIncomingMessage.h",
-        "MtProtoKit/MTMessageEncryptionKey.h",
-        "MtProtoKit/MTMessageService.h",
-        "MtProtoKit/MTMessageTransaction.h",
-        "MtProtoKit/MTTimeSyncMessageService.h",
-        "MtProtoKit/MTRequestMessageService.h",
-        "MtProtoKit/MTRequest.h",
-        "MtProtoKit/MTRequestContext.h",
-        "MtProtoKit/MTRequestErrorContext.h",
-        "MtProtoKit/MTDropResponseContext.h",
-        "MtProtoKit/MTApiEnvironment.h",
-        "MtProtoKit/MTResendMessageService.h",
-        "MtProtoKit/MTNetworkAvailability.h",
-        "MtProtoKit/MTTransport.h",
-        "MtProtoKit/MTTransportTransaction.h",
-        "MtProtoKit/MTTcpTransport.h",
-        "MtProtoKit/MTHttpRequestOperation.h",
-        "MTAtomic.h",
-        "MTBag.h",
-        "MTDisposable.h",
-        "MTSubscriber.h",
-        "MTSignal.h",
-        "MTNetworkUsageCalculationInfo.h",
-        "MTNetworkUsageManager.h",
-        "MTBackupAddressSignals.h",
-        "thirdparty/AFNetworking/AFURLConnectionOperation.h",
-        "thirdparty/AFNetworking/AFHTTPRequestOperation.h",
-        "MTProxyConnectivity.h",
-        "MTGzip.h",
-        "MTDatacenterVerificationData.h",
-    ],
     visibility = ["PUBLIC"],
     deps = [
         "//submodules/EncryptionProvider:EncryptionProvider",
diff --git a/submodules/MtProtoKit/BUILD b/submodules/MtProtoKit/BUILD
new file mode 100644
index 0000000000..cdc4b42171
--- /dev/null
+++ b/submodules/MtProtoKit/BUILD
@@ -0,0 +1,27 @@
+
+objc_library(
+    name = "MtProtoKit",
+    enable_modules = True,
+    module_name = "MtProtoKit",
+    srcs = glob([
+        "Sources/*.m",
+        "Sources/*.h",
+    ]),
+    hdrs = glob([
+        "PublicHeaders/**/*.h",
+    ]),
+    includes = [
+        "PublicHeaders",
+    ],
+    deps = [
+        "//submodules/EncryptionProvider:EncryptionProvider",
+    ],
+    sdk_frameworks = [
+        "Foundation",
+        "Security",
+        "SystemConfiguration",
+    ],
+    visibility = [
+        "//visibility:public",
+    ],
+)
diff --git a/submodules/MtProtoKit/MTProtoKit/Info.plist b/submodules/MtProtoKit/MTProtoKit/Info.plist
deleted file mode 100644
index d3de8eefb6..0000000000
--- a/submodules/MtProtoKit/MTProtoKit/Info.plist
+++ /dev/null
@@ -1,26 +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>CFBundleSignature</key>
-	<string>????</string>
-	<key>CFBundleVersion</key>
-	<string>$(CURRENT_PROJECT_VERSION)</string>
-	<key>NSPrincipalClass</key>
-	<string></string>
-</dict>
-</plist>
diff --git a/submodules/MtProtoKit/MTProtoKit/MTKeychain.m b/submodules/MtProtoKit/MTProtoKit/MTKeychain.m
deleted file mode 100644
index 8beaac734d..0000000000
--- a/submodules/MtProtoKit/MTProtoKit/MTKeychain.m
+++ /dev/null
@@ -1,3 +0,0 @@
-
-
-#import "MTKeychain.h"
diff --git a/submodules/MtProtoKit/MTProtoKit/MTRequestErrorContext.m b/submodules/MtProtoKit/MTProtoKit/MTRequestErrorContext.m
deleted file mode 100644
index 1c0cea5193..0000000000
--- a/submodules/MtProtoKit/MTProtoKit/MTRequestErrorContext.m
+++ /dev/null
@@ -1,13 +0,0 @@
-//
-//  MTRequestErrorContext.m
-//  MtProtoKit
-//
-//  Created by Admin on 18/02/2014.
-//  Copyright (c) 2014 Telegram. All rights reserved.
-//
-
-#import "MTRequestErrorContext.h"
-
-@implementation MTRequestErrorContext
-
-@end
diff --git a/submodules/MtProtoKit/thirdparty/AFNetworking/AFHTTPRequestOperation.h b/submodules/MtProtoKit/PublicHeaders/MtProtoKit/AFHTTPRequestOperation.h
similarity index 100%
rename from submodules/MtProtoKit/thirdparty/AFNetworking/AFHTTPRequestOperation.h
rename to submodules/MtProtoKit/PublicHeaders/MtProtoKit/AFHTTPRequestOperation.h
diff --git a/submodules/MtProtoKit/thirdparty/AFNetworking/AFURLConnectionOperation.h b/submodules/MtProtoKit/PublicHeaders/MtProtoKit/AFURLConnectionOperation.h
similarity index 100%
rename from submodules/MtProtoKit/thirdparty/AFNetworking/AFURLConnectionOperation.h
rename to submodules/MtProtoKit/PublicHeaders/MtProtoKit/AFURLConnectionOperation.h
diff --git a/submodules/MtProtoKit/MTProtoKit/MTApiEnvironment.h b/submodules/MtProtoKit/PublicHeaders/MtProtoKit/MTApiEnvironment.h
similarity index 100%
rename from submodules/MtProtoKit/MTProtoKit/MTApiEnvironment.h
rename to submodules/MtProtoKit/PublicHeaders/MtProtoKit/MTApiEnvironment.h
diff --git a/submodules/MtProtoKit/MTAtomic.h b/submodules/MtProtoKit/PublicHeaders/MtProtoKit/MTAtomic.h
similarity index 100%
rename from submodules/MtProtoKit/MTAtomic.h
rename to submodules/MtProtoKit/PublicHeaders/MtProtoKit/MTAtomic.h
diff --git a/submodules/MtProtoKit/MTBackupAddressSignals.h b/submodules/MtProtoKit/PublicHeaders/MtProtoKit/MTBackupAddressSignals.h
similarity index 100%
rename from submodules/MtProtoKit/MTBackupAddressSignals.h
rename to submodules/MtProtoKit/PublicHeaders/MtProtoKit/MTBackupAddressSignals.h
diff --git a/submodules/MtProtoKit/MTBag.h b/submodules/MtProtoKit/PublicHeaders/MtProtoKit/MTBag.h
similarity index 100%
rename from submodules/MtProtoKit/MTBag.h
rename to submodules/MtProtoKit/PublicHeaders/MtProtoKit/MTBag.h
diff --git a/submodules/MtProtoKit/MTProtoKit/MTContext.h b/submodules/MtProtoKit/PublicHeaders/MtProtoKit/MTContext.h
similarity index 100%
rename from submodules/MtProtoKit/MTProtoKit/MTContext.h
rename to submodules/MtProtoKit/PublicHeaders/MtProtoKit/MTContext.h
diff --git a/submodules/MtProtoKit/MTProtoKit/MTDatacenterAddress.h b/submodules/MtProtoKit/PublicHeaders/MtProtoKit/MTDatacenterAddress.h
similarity index 100%
rename from submodules/MtProtoKit/MTProtoKit/MTDatacenterAddress.h
rename to submodules/MtProtoKit/PublicHeaders/MtProtoKit/MTDatacenterAddress.h
diff --git a/submodules/MtProtoKit/MTProtoKit/MTDatacenterAddressListData.h b/submodules/MtProtoKit/PublicHeaders/MtProtoKit/MTDatacenterAddressListData.h
similarity index 100%
rename from submodules/MtProtoKit/MTProtoKit/MTDatacenterAddressListData.h
rename to submodules/MtProtoKit/PublicHeaders/MtProtoKit/MTDatacenterAddressListData.h
diff --git a/submodules/MtProtoKit/MTProtoKit/MTDatacenterAddressSet.h b/submodules/MtProtoKit/PublicHeaders/MtProtoKit/MTDatacenterAddressSet.h
similarity index 100%
rename from submodules/MtProtoKit/MTProtoKit/MTDatacenterAddressSet.h
rename to submodules/MtProtoKit/PublicHeaders/MtProtoKit/MTDatacenterAddressSet.h
diff --git a/submodules/MtProtoKit/MTProtoKit/MTDatacenterAuthAction.h b/submodules/MtProtoKit/PublicHeaders/MtProtoKit/MTDatacenterAuthAction.h
similarity index 100%
rename from submodules/MtProtoKit/MTProtoKit/MTDatacenterAuthAction.h
rename to submodules/MtProtoKit/PublicHeaders/MtProtoKit/MTDatacenterAuthAction.h
diff --git a/submodules/MtProtoKit/MTProtoKit/MTDatacenterAuthInfo.h b/submodules/MtProtoKit/PublicHeaders/MtProtoKit/MTDatacenterAuthInfo.h
similarity index 100%
rename from submodules/MtProtoKit/MTProtoKit/MTDatacenterAuthInfo.h
rename to submodules/MtProtoKit/PublicHeaders/MtProtoKit/MTDatacenterAuthInfo.h
diff --git a/submodules/MtProtoKit/MTProtoKit/MTDatacenterAuthMessageService.h b/submodules/MtProtoKit/PublicHeaders/MtProtoKit/MTDatacenterAuthMessageService.h
similarity index 100%
rename from submodules/MtProtoKit/MTProtoKit/MTDatacenterAuthMessageService.h
rename to submodules/MtProtoKit/PublicHeaders/MtProtoKit/MTDatacenterAuthMessageService.h
diff --git a/submodules/MtProtoKit/MTProtoKit/MTDatacenterSaltInfo.h b/submodules/MtProtoKit/PublicHeaders/MtProtoKit/MTDatacenterSaltInfo.h
similarity index 100%
rename from submodules/MtProtoKit/MTProtoKit/MTDatacenterSaltInfo.h
rename to submodules/MtProtoKit/PublicHeaders/MtProtoKit/MTDatacenterSaltInfo.h
diff --git a/submodules/MtProtoKit/MTProtoKit/MTDatacenterTransferAuthAction.h b/submodules/MtProtoKit/PublicHeaders/MtProtoKit/MTDatacenterTransferAuthAction.h
similarity index 100%
rename from submodules/MtProtoKit/MTProtoKit/MTDatacenterTransferAuthAction.h
rename to submodules/MtProtoKit/PublicHeaders/MtProtoKit/MTDatacenterTransferAuthAction.h
diff --git a/submodules/MtProtoKit/MTDatacenterVerificationData.h b/submodules/MtProtoKit/PublicHeaders/MtProtoKit/MTDatacenterVerificationData.h
similarity index 100%
rename from submodules/MtProtoKit/MTDatacenterVerificationData.h
rename to submodules/MtProtoKit/PublicHeaders/MtProtoKit/MTDatacenterVerificationData.h
diff --git a/submodules/MtProtoKit/MTDisposable.h b/submodules/MtProtoKit/PublicHeaders/MtProtoKit/MTDisposable.h
similarity index 100%
rename from submodules/MtProtoKit/MTDisposable.h
rename to submodules/MtProtoKit/PublicHeaders/MtProtoKit/MTDisposable.h
diff --git a/submodules/MtProtoKit/MTProtoKit/MTDropResponseContext.h b/submodules/MtProtoKit/PublicHeaders/MtProtoKit/MTDropResponseContext.h
similarity index 100%
rename from submodules/MtProtoKit/MTProtoKit/MTDropResponseContext.h
rename to submodules/MtProtoKit/PublicHeaders/MtProtoKit/MTDropResponseContext.h
diff --git a/submodules/MtProtoKit/MTProtoKit/MTEncryption.h b/submodules/MtProtoKit/PublicHeaders/MtProtoKit/MTEncryption.h
similarity index 100%
rename from submodules/MtProtoKit/MTProtoKit/MTEncryption.h
rename to submodules/MtProtoKit/PublicHeaders/MtProtoKit/MTEncryption.h
diff --git a/submodules/MtProtoKit/MTProtoKit/MTExportedAuthorizationData.h b/submodules/MtProtoKit/PublicHeaders/MtProtoKit/MTExportedAuthorizationData.h
similarity index 100%
rename from submodules/MtProtoKit/MTProtoKit/MTExportedAuthorizationData.h
rename to submodules/MtProtoKit/PublicHeaders/MtProtoKit/MTExportedAuthorizationData.h
diff --git a/submodules/MtProtoKit/MTProtoKit/MTFileBasedKeychain.h b/submodules/MtProtoKit/PublicHeaders/MtProtoKit/MTFileBasedKeychain.h
similarity index 100%
rename from submodules/MtProtoKit/MTProtoKit/MTFileBasedKeychain.h
rename to submodules/MtProtoKit/PublicHeaders/MtProtoKit/MTFileBasedKeychain.h
diff --git a/submodules/MtProtoKit/MTGzip.h b/submodules/MtProtoKit/PublicHeaders/MtProtoKit/MTGzip.h
similarity index 100%
rename from submodules/MtProtoKit/MTGzip.h
rename to submodules/MtProtoKit/PublicHeaders/MtProtoKit/MTGzip.h
diff --git a/submodules/MtProtoKit/MTProtoKit/MTHttpRequestOperation.h b/submodules/MtProtoKit/PublicHeaders/MtProtoKit/MTHttpRequestOperation.h
similarity index 100%
rename from submodules/MtProtoKit/MTProtoKit/MTHttpRequestOperation.h
rename to submodules/MtProtoKit/PublicHeaders/MtProtoKit/MTHttpRequestOperation.h
diff --git a/submodules/MtProtoKit/MTProtoKit/MTIncomingMessage.h b/submodules/MtProtoKit/PublicHeaders/MtProtoKit/MTIncomingMessage.h
similarity index 100%
rename from submodules/MtProtoKit/MTProtoKit/MTIncomingMessage.h
rename to submodules/MtProtoKit/PublicHeaders/MtProtoKit/MTIncomingMessage.h
diff --git a/submodules/MtProtoKit/MTProtoKit/MTInputStream.h b/submodules/MtProtoKit/PublicHeaders/MtProtoKit/MTInputStream.h
similarity index 100%
rename from submodules/MtProtoKit/MTProtoKit/MTInputStream.h
rename to submodules/MtProtoKit/PublicHeaders/MtProtoKit/MTInputStream.h
diff --git a/submodules/MtProtoKit/MTProtoKit/MTInternalId.h b/submodules/MtProtoKit/PublicHeaders/MtProtoKit/MTInternalId.h
similarity index 100%
rename from submodules/MtProtoKit/MTProtoKit/MTInternalId.h
rename to submodules/MtProtoKit/PublicHeaders/MtProtoKit/MTInternalId.h
diff --git a/submodules/MtProtoKit/MTProtoKit/MTKeychain.h b/submodules/MtProtoKit/PublicHeaders/MtProtoKit/MTKeychain.h
similarity index 100%
rename from submodules/MtProtoKit/MTProtoKit/MTKeychain.h
rename to submodules/MtProtoKit/PublicHeaders/MtProtoKit/MTKeychain.h
diff --git a/submodules/MtProtoKit/MTProtoKit/MTLogging.h b/submodules/MtProtoKit/PublicHeaders/MtProtoKit/MTLogging.h
similarity index 100%
rename from submodules/MtProtoKit/MTProtoKit/MTLogging.h
rename to submodules/MtProtoKit/PublicHeaders/MtProtoKit/MTLogging.h
diff --git a/submodules/MtProtoKit/MTProtoKit/MTMessageEncryptionKey.h b/submodules/MtProtoKit/PublicHeaders/MtProtoKit/MTMessageEncryptionKey.h
similarity index 100%
rename from submodules/MtProtoKit/MTProtoKit/MTMessageEncryptionKey.h
rename to submodules/MtProtoKit/PublicHeaders/MtProtoKit/MTMessageEncryptionKey.h
diff --git a/submodules/MtProtoKit/MTProtoKit/MTMessageService.h b/submodules/MtProtoKit/PublicHeaders/MtProtoKit/MTMessageService.h
similarity index 100%
rename from submodules/MtProtoKit/MTProtoKit/MTMessageService.h
rename to submodules/MtProtoKit/PublicHeaders/MtProtoKit/MTMessageService.h
diff --git a/submodules/MtProtoKit/MTProtoKit/MTMessageTransaction.h b/submodules/MtProtoKit/PublicHeaders/MtProtoKit/MTMessageTransaction.h
similarity index 100%
rename from submodules/MtProtoKit/MTProtoKit/MTMessageTransaction.h
rename to submodules/MtProtoKit/PublicHeaders/MtProtoKit/MTMessageTransaction.h
diff --git a/submodules/MtProtoKit/MTProtoKit/MTNetworkAvailability.h b/submodules/MtProtoKit/PublicHeaders/MtProtoKit/MTNetworkAvailability.h
similarity index 100%
rename from submodules/MtProtoKit/MTProtoKit/MTNetworkAvailability.h
rename to submodules/MtProtoKit/PublicHeaders/MtProtoKit/MTNetworkAvailability.h
diff --git a/submodules/MtProtoKit/MTNetworkUsageCalculationInfo.h b/submodules/MtProtoKit/PublicHeaders/MtProtoKit/MTNetworkUsageCalculationInfo.h
similarity index 100%
rename from submodules/MtProtoKit/MTNetworkUsageCalculationInfo.h
rename to submodules/MtProtoKit/PublicHeaders/MtProtoKit/MTNetworkUsageCalculationInfo.h
diff --git a/submodules/MtProtoKit/MTNetworkUsageManager.h b/submodules/MtProtoKit/PublicHeaders/MtProtoKit/MTNetworkUsageManager.h
similarity index 100%
rename from submodules/MtProtoKit/MTNetworkUsageManager.h
rename to submodules/MtProtoKit/PublicHeaders/MtProtoKit/MTNetworkUsageManager.h
diff --git a/submodules/MtProtoKit/MTProtoKit/MTOutgoingMessage.h b/submodules/MtProtoKit/PublicHeaders/MtProtoKit/MTOutgoingMessage.h
similarity index 100%
rename from submodules/MtProtoKit/MTProtoKit/MTOutgoingMessage.h
rename to submodules/MtProtoKit/PublicHeaders/MtProtoKit/MTOutgoingMessage.h
diff --git a/submodules/MtProtoKit/MTProtoKit/MTOutputStream.h b/submodules/MtProtoKit/PublicHeaders/MtProtoKit/MTOutputStream.h
similarity index 100%
rename from submodules/MtProtoKit/MTProtoKit/MTOutputStream.h
rename to submodules/MtProtoKit/PublicHeaders/MtProtoKit/MTOutputStream.h
diff --git a/submodules/MtProtoKit/MTProtoKit/MTPreparedMessage.h b/submodules/MtProtoKit/PublicHeaders/MtProtoKit/MTPreparedMessage.h
similarity index 100%
rename from submodules/MtProtoKit/MTProtoKit/MTPreparedMessage.h
rename to submodules/MtProtoKit/PublicHeaders/MtProtoKit/MTPreparedMessage.h
diff --git a/submodules/MtProtoKit/MTProtoKit/MTProto.h b/submodules/MtProtoKit/PublicHeaders/MtProtoKit/MTProto.h
similarity index 100%
rename from submodules/MtProtoKit/MTProtoKit/MTProto.h
rename to submodules/MtProtoKit/PublicHeaders/MtProtoKit/MTProto.h
diff --git a/submodules/MtProtoKit/MTProxyConnectivity.h b/submodules/MtProtoKit/PublicHeaders/MtProtoKit/MTProxyConnectivity.h
similarity index 100%
rename from submodules/MtProtoKit/MTProxyConnectivity.h
rename to submodules/MtProtoKit/PublicHeaders/MtProtoKit/MTProxyConnectivity.h
diff --git a/submodules/MtProtoKit/MTProtoKit/MTQueue.h b/submodules/MtProtoKit/PublicHeaders/MtProtoKit/MTQueue.h
similarity index 100%
rename from submodules/MtProtoKit/MTProtoKit/MTQueue.h
rename to submodules/MtProtoKit/PublicHeaders/MtProtoKit/MTQueue.h
diff --git a/submodules/MtProtoKit/MTProtoKit/MTRequest.h b/submodules/MtProtoKit/PublicHeaders/MtProtoKit/MTRequest.h
similarity index 100%
rename from submodules/MtProtoKit/MTProtoKit/MTRequest.h
rename to submodules/MtProtoKit/PublicHeaders/MtProtoKit/MTRequest.h
diff --git a/submodules/MtProtoKit/MTProtoKit/MTRequestContext.h b/submodules/MtProtoKit/PublicHeaders/MtProtoKit/MTRequestContext.h
similarity index 100%
rename from submodules/MtProtoKit/MTProtoKit/MTRequestContext.h
rename to submodules/MtProtoKit/PublicHeaders/MtProtoKit/MTRequestContext.h
diff --git a/submodules/MtProtoKit/MTProtoKit/MTRequestErrorContext.h b/submodules/MtProtoKit/PublicHeaders/MtProtoKit/MTRequestErrorContext.h
similarity index 100%
rename from submodules/MtProtoKit/MTProtoKit/MTRequestErrorContext.h
rename to submodules/MtProtoKit/PublicHeaders/MtProtoKit/MTRequestErrorContext.h
diff --git a/submodules/MtProtoKit/MTProtoKit/MTRequestMessageService.h b/submodules/MtProtoKit/PublicHeaders/MtProtoKit/MTRequestMessageService.h
similarity index 100%
rename from submodules/MtProtoKit/MTProtoKit/MTRequestMessageService.h
rename to submodules/MtProtoKit/PublicHeaders/MtProtoKit/MTRequestMessageService.h
diff --git a/submodules/MtProtoKit/MTProtoKit/MTResendMessageService.h b/submodules/MtProtoKit/PublicHeaders/MtProtoKit/MTResendMessageService.h
similarity index 100%
rename from submodules/MtProtoKit/MTProtoKit/MTResendMessageService.h
rename to submodules/MtProtoKit/PublicHeaders/MtProtoKit/MTResendMessageService.h
diff --git a/submodules/MtProtoKit/MTProtoKit/MTRpcError.h b/submodules/MtProtoKit/PublicHeaders/MtProtoKit/MTRpcError.h
similarity index 100%
rename from submodules/MtProtoKit/MTProtoKit/MTRpcError.h
rename to submodules/MtProtoKit/PublicHeaders/MtProtoKit/MTRpcError.h
diff --git a/submodules/MtProtoKit/MTProtoKit/MTSerialization.h b/submodules/MtProtoKit/PublicHeaders/MtProtoKit/MTSerialization.h
similarity index 100%
rename from submodules/MtProtoKit/MTProtoKit/MTSerialization.h
rename to submodules/MtProtoKit/PublicHeaders/MtProtoKit/MTSerialization.h
diff --git a/submodules/MtProtoKit/MTProtoKit/MTSessionInfo.h b/submodules/MtProtoKit/PublicHeaders/MtProtoKit/MTSessionInfo.h
similarity index 100%
rename from submodules/MtProtoKit/MTProtoKit/MTSessionInfo.h
rename to submodules/MtProtoKit/PublicHeaders/MtProtoKit/MTSessionInfo.h
diff --git a/submodules/MtProtoKit/MTSignal.h b/submodules/MtProtoKit/PublicHeaders/MtProtoKit/MTSignal.h
similarity index 100%
rename from submodules/MtProtoKit/MTSignal.h
rename to submodules/MtProtoKit/PublicHeaders/MtProtoKit/MTSignal.h
diff --git a/submodules/MtProtoKit/MTSubscriber.h b/submodules/MtProtoKit/PublicHeaders/MtProtoKit/MTSubscriber.h
similarity index 100%
rename from submodules/MtProtoKit/MTSubscriber.h
rename to submodules/MtProtoKit/PublicHeaders/MtProtoKit/MTSubscriber.h
diff --git a/submodules/MtProtoKit/MTProtoKit/MTTcpTransport.h b/submodules/MtProtoKit/PublicHeaders/MtProtoKit/MTTcpTransport.h
similarity index 100%
rename from submodules/MtProtoKit/MTProtoKit/MTTcpTransport.h
rename to submodules/MtProtoKit/PublicHeaders/MtProtoKit/MTTcpTransport.h
diff --git a/submodules/MtProtoKit/MTProtoKit/MTTime.h b/submodules/MtProtoKit/PublicHeaders/MtProtoKit/MTTime.h
similarity index 100%
rename from submodules/MtProtoKit/MTProtoKit/MTTime.h
rename to submodules/MtProtoKit/PublicHeaders/MtProtoKit/MTTime.h
diff --git a/submodules/MtProtoKit/MTProtoKit/MTTimeFixContext.h b/submodules/MtProtoKit/PublicHeaders/MtProtoKit/MTTimeFixContext.h
similarity index 100%
rename from submodules/MtProtoKit/MTProtoKit/MTTimeFixContext.h
rename to submodules/MtProtoKit/PublicHeaders/MtProtoKit/MTTimeFixContext.h
diff --git a/submodules/MtProtoKit/MTProtoKit/MTTimeSyncMessageService.h b/submodules/MtProtoKit/PublicHeaders/MtProtoKit/MTTimeSyncMessageService.h
similarity index 100%
rename from submodules/MtProtoKit/MTProtoKit/MTTimeSyncMessageService.h
rename to submodules/MtProtoKit/PublicHeaders/MtProtoKit/MTTimeSyncMessageService.h
diff --git a/submodules/MtProtoKit/MTProtoKit/MTTimer.h b/submodules/MtProtoKit/PublicHeaders/MtProtoKit/MTTimer.h
similarity index 100%
rename from submodules/MtProtoKit/MTProtoKit/MTTimer.h
rename to submodules/MtProtoKit/PublicHeaders/MtProtoKit/MTTimer.h
diff --git a/submodules/MtProtoKit/MTProtoKit/MTTransport.h b/submodules/MtProtoKit/PublicHeaders/MtProtoKit/MTTransport.h
similarity index 100%
rename from submodules/MtProtoKit/MTProtoKit/MTTransport.h
rename to submodules/MtProtoKit/PublicHeaders/MtProtoKit/MTTransport.h
diff --git a/submodules/MtProtoKit/MTProtoKit/MTTransportScheme.h b/submodules/MtProtoKit/PublicHeaders/MtProtoKit/MTTransportScheme.h
similarity index 100%
rename from submodules/MtProtoKit/MTProtoKit/MTTransportScheme.h
rename to submodules/MtProtoKit/PublicHeaders/MtProtoKit/MTTransportScheme.h
diff --git a/submodules/MtProtoKit/MTProtoKit/MTTransportTransaction.h b/submodules/MtProtoKit/PublicHeaders/MtProtoKit/MTTransportTransaction.h
similarity index 100%
rename from submodules/MtProtoKit/MTProtoKit/MTTransportTransaction.h
rename to submodules/MtProtoKit/PublicHeaders/MtProtoKit/MTTransportTransaction.h
diff --git a/submodules/MtProtoKit/MTProtoKit/MTProtoKit.h b/submodules/MtProtoKit/PublicHeaders/MtProtoKit/MtProtoKit.h
similarity index 80%
rename from submodules/MtProtoKit/MTProtoKit/MTProtoKit.h
rename to submodules/MtProtoKit/PublicHeaders/MtProtoKit/MtProtoKit.h
index a338665c59..4476e380ab 100644
--- a/submodules/MtProtoKit/MTProtoKit/MTProtoKit.h
+++ b/submodules/MtProtoKit/PublicHeaders/MtProtoKit/MtProtoKit.h
@@ -1,76 +1,60 @@
-//
-//  MtProtoKit.h
-//  MtProtoKit
-//
-//  Created by Peter on 13/04/15.
-//  Copyright (c) 2015 Telegram. All rights reserved.
-//
+#import <Foundation/Foundation.h>
 
-#import <UIKit/UIKit.h>
-
-//! Project version number for MtProtoKit.
-FOUNDATION_EXPORT double MtProtoKitVersionNumber;
-
-//! Project version string for MtProtoKit.
-FOUNDATION_EXPORT const unsigned char MtProtoKitVersionString[];
-
-// In this header, you should import all the public headers of your framework using statements like #import <MtProtoKit/PublicHeader.h>
-
-
-#import <MtProtoKit/MTTime.h>
-#import <MtProtoKit/MTTimer.h>
-#import <MtProtoKit/MTLogging.h>
-#import <MtProtoKit/MTEncryption.h>
-#import <MtProtoKit/MTInternalId.h>
-#import <MtProtoKit/MTQueue.h>
-#import <MtProtoKit/MTOutputStream.h>
-#import <MtProtoKit/MTInputStream.h>
-#import <MtProtoKit/MTSerialization.h>
-#import <MtProtoKit/MTExportedAuthorizationData.h>
-#import <MtProtoKit/MTRpcError.h>
-#import <MtProtoKit/MTKeychain.h>
-#import <MtProtoKit/MTFileBasedKeychain.h>
+#import <MtProtoKit/MTDatacenterAuthInfo.h>
+#import <MtProtoKit/AFHTTPRequestOperation.h>
+#import <MtProtoKit/AFURLConnectionOperation.h>
+#import <MtProtoKit/MTApiEnvironment.h>
+#import <MtProtoKit/MTAtomic.h>
+#import <MtProtoKit/MTBackupAddressSignals.h>
+#import <MtProtoKit/MTBag.h>
 #import <MtProtoKit/MTContext.h>
-#import <MtProtoKit/MTTransportScheme.h>
-#import <MtProtoKit/MTDatacenterTransferAuthAction.h>
+#import <MtProtoKit/MTDatacenterAddress.h>
+#import <MtProtoKit/MTDatacenterAddressListData.h>
+#import <MtProtoKit/MTDatacenterAddressSet.h>
 #import <MtProtoKit/MTDatacenterAuthAction.h>
 #import <MtProtoKit/MTDatacenterAuthMessageService.h>
-#import <MtProtoKit/MTDatacenterAddress.h>
-#import <MtProtoKit/MTDatacenterAddressSet.h>
-#import <MtProtoKit/MTDatacenterAuthInfo.h>
 #import <MtProtoKit/MTDatacenterSaltInfo.h>
-#import <MtProtoKit/MTDatacenterAddressListData.h>
-#import <MtProtoKit/MTProto.h>
-#import <MtProtoKit/MTSessionInfo.h>
-#import <MtProtoKit/MTTimeFixContext.h>
-#import <MtProtoKit/MTPreparedMessage.h>
-#import <MtProtoKit/MTOutgoingMessage.h>
+#import <MtProtoKit/MTDatacenterTransferAuthAction.h>
+#import <MtProtoKit/MTDatacenterVerificationData.h>
+#import <MtProtoKit/MTDisposable.h>
+#import <MtProtoKit/MTDropResponseContext.h>
+#import <MtProtoKit/MTEncryption.h>
+#import <MtProtoKit/MTExportedAuthorizationData.h>
+#import <MtProtoKit/MTFileBasedKeychain.h>
+#import <MtProtoKit/MTGzip.h>
+#import <MtProtoKit/MTHttpRequestOperation.h>
 #import <MtProtoKit/MTIncomingMessage.h>
+#import <MtProtoKit/MTInputStream.h>
+#import <MtProtoKit/MTInternalId.h>
+#import <MtProtoKit/MTKeychain.h>
+#import <MtProtoKit/MTLogging.h>
 #import <MtProtoKit/MTMessageEncryptionKey.h>
 #import <MtProtoKit/MTMessageService.h>
 #import <MtProtoKit/MTMessageTransaction.h>
-#import <MtProtoKit/MTTimeSyncMessageService.h>
-#import <MtProtoKit/MTRequestMessageService.h>
+#import <MtProtoKit/MTNetworkAvailability.h>
+#import <MtProtoKit/MTNetworkUsageCalculationInfo.h>
+#import <MtProtoKit/MTNetworkUsageManager.h>
+#import <MtProtoKit/MTOutgoingMessage.h>
+#import <MtProtoKit/MTOutputStream.h>
+#import <MtProtoKit/MTPreparedMessage.h>
+#import <MtProtoKit/MTProto.h>
+#import <MtProtoKit/MTProxyConnectivity.h>
+#import <MtProtoKit/MTQueue.h>
 #import <MtProtoKit/MTRequest.h>
 #import <MtProtoKit/MTRequestContext.h>
 #import <MtProtoKit/MTRequestErrorContext.h>
-#import <MtProtoKit/MTDropResponseContext.h>
-#import <MtProtoKit/MTApiEnvironment.h>
+#import <MtProtoKit/MTRequestMessageService.h>
 #import <MtProtoKit/MTResendMessageService.h>
-#import <MtProtoKit/MTNetworkAvailability.h>
-#import <MtProtoKit/MTTransport.h>
-#import <MtProtoKit/MTTransportTransaction.h>
-#import <MtProtoKit/MTTcpTransport.h>
-#import <MtProtoKit/MTHttpRequestOperation.h>
-#import <MtProtoKit/MTAtomic.h>
-#import <MtProtoKit/MTBag.h>
-#import <MtProtoKit/MTDisposable.h>
-#import <MtProtoKit/MTSubscriber.h>
+#import <MtProtoKit/MTRpcError.h>
+#import <MtProtoKit/MTSerialization.h>
+#import <MtProtoKit/MTSessionInfo.h>
 #import <MtProtoKit/MTSignal.h>
-#import <MtProtoKit/MTNetworkUsageCalculationInfo.h>
-#import <MtProtoKit/MTNetworkUsageManager.h>
-#import <MtProtoKit/MTBackupAddressSignals.h>
-#import <MtProtoKit/AFURLConnectionOperation.h>
-#import <MtProtoKit/AFHTTPRequestOperation.h>
-#import <MtProtoKit/MTProxyConnectivity.h>
-#import <MtProtoKit/MTGzip.h>
+#import <MtProtoKit/MTSubscriber.h>
+#import <MtProtoKit/MTTcpTransport.h>
+#import <MtProtoKit/MTTime.h>
+#import <MtProtoKit/MTTimeFixContext.h>
+#import <MtProtoKit/MTTimer.h>
+#import <MtProtoKit/MTTimeSyncMessageService.h>
+#import <MtProtoKit/MTTransport.h>
+#import <MtProtoKit/MTTransportScheme.h>
+#import <MtProtoKit/MTTransportTransaction.h>
\ No newline at end of file
diff --git a/submodules/MtProtoKit/README.md b/submodules/MtProtoKit/README.md
deleted file mode 100644
index a1c848fdaf..0000000000
--- a/submodules/MtProtoKit/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-MtProtoKit
-==========
-
-Universal MTProto framework for both iOS and OS X
diff --git a/submodules/MtProtoKit/thirdparty/AFNetworking/AFHTTPRequestOperation.m b/submodules/MtProtoKit/Sources/AFHTTPRequestOperation.m
similarity index 99%
rename from submodules/MtProtoKit/thirdparty/AFNetworking/AFHTTPRequestOperation.m
rename to submodules/MtProtoKit/Sources/AFHTTPRequestOperation.m
index 127b7a4eab..212672ae77 100644
--- a/submodules/MtProtoKit/thirdparty/AFNetworking/AFHTTPRequestOperation.m
+++ b/submodules/MtProtoKit/Sources/AFHTTPRequestOperation.m
@@ -20,7 +20,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
-#import "AFHTTPRequestOperation.h"
+#import <MtProtoKit/AFHTTPRequestOperation.h>
 
 static NSString * AFStringFromIndexSet(NSIndexSet *indexSet) {
     NSMutableString *string = [NSMutableString string];
diff --git a/submodules/MtProtoKit/thirdparty/AFNetworking/AFURLConnectionOperation.m b/submodules/MtProtoKit/Sources/AFURLConnectionOperation.m
similarity index 99%
rename from submodules/MtProtoKit/thirdparty/AFNetworking/AFURLConnectionOperation.m
rename to submodules/MtProtoKit/Sources/AFURLConnectionOperation.m
index 5e630e1352..2627816bfd 100644
--- a/submodules/MtProtoKit/thirdparty/AFNetworking/AFURLConnectionOperation.m
+++ b/submodules/MtProtoKit/Sources/AFURLConnectionOperation.m
@@ -20,7 +20,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
-#import "AFURLConnectionOperation.h"
+#import <MtProtoKit/AFURLConnectionOperation.h>
 
 //#import "AFImageRequestOperation.h"
 
diff --git a/submodules/MtProtoKit/thirdparty/AsyncSocket/GCDAsyncSocket.h b/submodules/MtProtoKit/Sources/GCDAsyncSocket.h
similarity index 100%
rename from submodules/MtProtoKit/thirdparty/AsyncSocket/GCDAsyncSocket.h
rename to submodules/MtProtoKit/Sources/GCDAsyncSocket.h
diff --git a/submodules/MtProtoKit/thirdparty/AsyncSocket/GCDAsyncSocket.m b/submodules/MtProtoKit/Sources/GCDAsyncSocket.m
similarity index 99%
rename from submodules/MtProtoKit/thirdparty/AsyncSocket/GCDAsyncSocket.m
rename to submodules/MtProtoKit/Sources/GCDAsyncSocket.m
index 59336b8b96..b3668549b3 100755
--- a/submodules/MtProtoKit/thirdparty/AsyncSocket/GCDAsyncSocket.m
+++ b/submodules/MtProtoKit/Sources/GCDAsyncSocket.m
@@ -10,7 +10,7 @@
 
 #import "GCDAsyncSocket.h"
 
-#import "MTLogging.h"
+#import <MtProtoKit/MTLogging.h>
 
 #if TARGET_OS_IPHONE
 #import <CFNetwork/CFNetwork.h>
@@ -30,8 +30,8 @@
 #import <sys/uio.h>
 #import <unistd.h>
 
-#import "MTNetworkUsageCalculationInfo.h"
-#import "MTNetworkUsageManager.h"
+#import <MtProtoKit/MTNetworkUsageCalculationInfo.h>
+#import <MtProtoKit/MTNetworkUsageManager.h>
 
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wdeprecated-declarations"
diff --git a/submodules/MtProtoKit/MTAes.h b/submodules/MtProtoKit/Sources/MTAes.h
similarity index 100%
rename from submodules/MtProtoKit/MTAes.h
rename to submodules/MtProtoKit/Sources/MTAes.h
diff --git a/submodules/MtProtoKit/MTAes.m b/submodules/MtProtoKit/Sources/MTAes.m
similarity index 99%
rename from submodules/MtProtoKit/MTAes.m
rename to submodules/MtProtoKit/Sources/MTAes.m
index 9aafdabc84..72ad722d58 100644
--- a/submodules/MtProtoKit/MTAes.m
+++ b/submodules/MtProtoKit/Sources/MTAes.m
@@ -162,7 +162,7 @@ void MyAesIgeDecrypt(const void *inBytes, int length, void *outBytes, const void
 }
 
 void MyAesCbcDecrypt(const void *inBytes, int length, void *outBytes, const void *key, int keyLength, void *iv) {
-    int outLength = 0;
+    size_t outLength = 0;
     CCCryptorStatus status = CCCrypt(kCCDecrypt, kCCAlgorithmAES128, 0, key, keyLength, iv, inBytes, length, outBytes, length, &outLength);
     assert(status == kCCSuccess);
     assert(outLength == length);
diff --git a/submodules/MtProtoKit/MTProtoKit/MTApiEnvironment.m b/submodules/MtProtoKit/Sources/MTApiEnvironment.m
similarity index 99%
rename from submodules/MtProtoKit/MTProtoKit/MTApiEnvironment.m
rename to submodules/MtProtoKit/Sources/MTApiEnvironment.m
index 7f700687cb..996f8fa14d 100644
--- a/submodules/MtProtoKit/MTProtoKit/MTApiEnvironment.m
+++ b/submodules/MtProtoKit/Sources/MTApiEnvironment.m
@@ -1,6 +1,4 @@
-
-
-#import "MTApiEnvironment.h"
+#import <MtProtoKit/MTApiEnvironment.h>
 
 #if TARGET_OS_IPHONE
 #   import <UIKit/UIKit.h>
diff --git a/submodules/MtProtoKit/MTAtomic.m b/submodules/MtProtoKit/Sources/MTAtomic.m
similarity index 96%
rename from submodules/MtProtoKit/MTAtomic.m
rename to submodules/MtProtoKit/Sources/MTAtomic.m
index 58ad159e18..72f68f312f 100644
--- a/submodules/MtProtoKit/MTAtomic.m
+++ b/submodules/MtProtoKit/Sources/MTAtomic.m
@@ -1,4 +1,4 @@
-#import "MTAtomic.h"
+#import <MtProtoKit/MTAtomic.h>
 
 #import <libkern/OSAtomic.h>
 
diff --git a/submodules/MtProtoKit/MTBackupAddressSignals.m b/submodules/MtProtoKit/Sources/MTBackupAddressSignals.m
similarity index 99%
rename from submodules/MtProtoKit/MTBackupAddressSignals.m
rename to submodules/MtProtoKit/Sources/MTBackupAddressSignals.m
index 6de20c310f..8eead4103e 100644
--- a/submodules/MtProtoKit/MTBackupAddressSignals.m
+++ b/submodules/MtProtoKit/Sources/MTBackupAddressSignals.m
@@ -1,4 +1,4 @@
-#import "MTBackupAddressSignals.h"
+#import <MtProtoKit/MTBackupAddressSignals.h>
 
 #import <MtProtoKit/MTSignal.h>
 #import <MtProtoKit/MTQueue.h>
diff --git a/submodules/MtProtoKit/MTProtoKit/MTBadMsgNotificationMessage.h b/submodules/MtProtoKit/Sources/MTBadMsgNotificationMessage.h
similarity index 100%
rename from submodules/MtProtoKit/MTProtoKit/MTBadMsgNotificationMessage.h
rename to submodules/MtProtoKit/Sources/MTBadMsgNotificationMessage.h
diff --git a/submodules/MtProtoKit/MTProtoKit/MTBadMsgNotificationMessage.m b/submodules/MtProtoKit/Sources/MTBadMsgNotificationMessage.m
similarity index 100%
rename from submodules/MtProtoKit/MTProtoKit/MTBadMsgNotificationMessage.m
rename to submodules/MtProtoKit/Sources/MTBadMsgNotificationMessage.m
diff --git a/submodules/MtProtoKit/MTBag.m b/submodules/MtProtoKit/Sources/MTBag.m
similarity index 97%
rename from submodules/MtProtoKit/MTBag.m
rename to submodules/MtProtoKit/Sources/MTBag.m
index 44e6c1f434..a6b38ce600 100644
--- a/submodules/MtProtoKit/MTBag.m
+++ b/submodules/MtProtoKit/Sources/MTBag.m
@@ -1,4 +1,4 @@
-#import "MTBag.h"
+#import <MtProtoKit/MTBag.h>
 
 @interface MTBag ()
 {
diff --git a/submodules/MtProtoKit/MTBindingTempAuthKeyContext.h b/submodules/MtProtoKit/Sources/MTBindingTempAuthKeyContext.h
similarity index 100%
rename from submodules/MtProtoKit/MTBindingTempAuthKeyContext.h
rename to submodules/MtProtoKit/Sources/MTBindingTempAuthKeyContext.h
diff --git a/submodules/MtProtoKit/MTBindingTempAuthKeyContext.m b/submodules/MtProtoKit/Sources/MTBindingTempAuthKeyContext.m
similarity index 100%
rename from submodules/MtProtoKit/MTBindingTempAuthKeyContext.m
rename to submodules/MtProtoKit/Sources/MTBindingTempAuthKeyContext.m
diff --git a/submodules/MtProtoKit/MTProtoKit/MTBuffer.h b/submodules/MtProtoKit/Sources/MTBuffer.h
similarity index 100%
rename from submodules/MtProtoKit/MTProtoKit/MTBuffer.h
rename to submodules/MtProtoKit/Sources/MTBuffer.h
diff --git a/submodules/MtProtoKit/MTProtoKit/MTBuffer.m b/submodules/MtProtoKit/Sources/MTBuffer.m
similarity index 100%
rename from submodules/MtProtoKit/MTProtoKit/MTBuffer.m
rename to submodules/MtProtoKit/Sources/MTBuffer.m
diff --git a/submodules/MtProtoKit/MTProtoKit/MTBufferReader.h b/submodules/MtProtoKit/Sources/MTBufferReader.h
similarity index 100%
rename from submodules/MtProtoKit/MTProtoKit/MTBufferReader.h
rename to submodules/MtProtoKit/Sources/MTBufferReader.h
diff --git a/submodules/MtProtoKit/MTProtoKit/MTBufferReader.m b/submodules/MtProtoKit/Sources/MTBufferReader.m
similarity index 100%
rename from submodules/MtProtoKit/MTProtoKit/MTBufferReader.m
rename to submodules/MtProtoKit/Sources/MTBufferReader.m
diff --git a/submodules/MtProtoKit/MTConnectionProbing.h b/submodules/MtProtoKit/Sources/MTConnectionProbing.h
similarity index 100%
rename from submodules/MtProtoKit/MTConnectionProbing.h
rename to submodules/MtProtoKit/Sources/MTConnectionProbing.h
diff --git a/submodules/MtProtoKit/MTConnectionProbing.m b/submodules/MtProtoKit/Sources/MTConnectionProbing.m
similarity index 100%
rename from submodules/MtProtoKit/MTConnectionProbing.m
rename to submodules/MtProtoKit/Sources/MTConnectionProbing.m
diff --git a/submodules/MtProtoKit/MTProtoKit/MTContext.m b/submodules/MtProtoKit/Sources/MTContext.m
similarity index 98%
rename from submodules/MtProtoKit/MTProtoKit/MTContext.m
rename to submodules/MtProtoKit/Sources/MTContext.m
index 6abb56c6a0..506a954d98 100644
--- a/submodules/MtProtoKit/MTProtoKit/MTContext.m
+++ b/submodules/MtProtoKit/Sources/MTContext.m
@@ -1,27 +1,26 @@
-#import "MTContext.h"
+#import <MtProtoKit/MTContext.h>
 
 #import <inttypes.h>
 
-#import "MTLogging.h"
-#import "MTTimer.h"
-#import "MTQueue.h"
-#import "MTKeychain.h"
-
-#import "MTDatacenterAddressSet.h"
-#import "MTDatacenterAddress.h"
-#import "MTDatacenterAuthInfo.h"
-#import "MTDatacenterSaltInfo.h"
-#import "MTSessionInfo.h"
-#import "MTApiEnvironment.h"
+#import <MtProtoKit/MTLogging.h>
+#import <MtProtoKit/MTTimer.h>
+#import <MtProtoKit/MTQueue.h>
+#import <MtProtoKit/MTKeychain.h>
+#import <MtProtoKit/MTDatacenterAddressSet.h>
+#import <MtProtoKit/MTDatacenterAddress.h>
+#import <MtProtoKit/MTDatacenterAuthInfo.h>
+#import <MtProtoKit/MTDatacenterSaltInfo.h>
+#import <MtProtoKit/MTSessionInfo.h>
+#import <MtProtoKit/MTApiEnvironment.h>
 
 #import "MTDiscoverDatacenterAddressAction.h"
-#import "MTDatacenterAuthAction.h"
-#import "MTDatacenterTransferAuthAction.h"
+#import <MtProtoKit/MTDatacenterAuthAction.h>
+#import <MtProtoKit/MTDatacenterTransferAuthAction.h>
 
-#import "MTTransportScheme.h"
-#import "MTTcpTransport.h"
+#import <MtProtoKit/MTTransportScheme.h>
+#import <MtProtoKit/MTTcpTransport.h>
 
-#import "MTApiEnvironment.h"
+#import <MtProtoKit/MTApiEnvironment.h>
 
 #import <libkern/OSAtomic.h>
 
diff --git a/submodules/MtProtoKit/MTDNS.h b/submodules/MtProtoKit/Sources/MTDNS.h
similarity index 100%
rename from submodules/MtProtoKit/MTDNS.h
rename to submodules/MtProtoKit/Sources/MTDNS.h
diff --git a/submodules/MtProtoKit/MTDNS.m b/submodules/MtProtoKit/Sources/MTDNS.m
similarity index 100%
rename from submodules/MtProtoKit/MTDNS.m
rename to submodules/MtProtoKit/Sources/MTDNS.m
diff --git a/submodules/MtProtoKit/MTProtoKit/MTDatacenterAddress.m b/submodules/MtProtoKit/Sources/MTDatacenterAddress.m
similarity index 98%
rename from submodules/MtProtoKit/MTProtoKit/MTDatacenterAddress.m
rename to submodules/MtProtoKit/Sources/MTDatacenterAddress.m
index f15a8762db..c6bb2e052b 100644
--- a/submodules/MtProtoKit/MTProtoKit/MTDatacenterAddress.m
+++ b/submodules/MtProtoKit/Sources/MTDatacenterAddress.m
@@ -1,6 +1,4 @@
-
-
-#import "MTDatacenterAddress.h"
+#import <MtProtoKit/MTDatacenterAddress.h>
 
 #import <netinet/in.h>
 #import <arpa/inet.h>
diff --git a/submodules/MtProtoKit/MTProtoKit/MTDatacenterAddressListData.m b/submodules/MtProtoKit/Sources/MTDatacenterAddressListData.m
similarity index 86%
rename from submodules/MtProtoKit/MTProtoKit/MTDatacenterAddressListData.m
rename to submodules/MtProtoKit/Sources/MTDatacenterAddressListData.m
index 408323af73..1886aae688 100644
--- a/submodules/MtProtoKit/MTProtoKit/MTDatacenterAddressListData.m
+++ b/submodules/MtProtoKit/Sources/MTDatacenterAddressListData.m
@@ -1,4 +1,4 @@
-#import "MTDatacenterAddressListData.h"
+#import <MtProtoKit/MTDatacenterAddressListData.h>
 
 @implementation MTDatacenterAddressListData
 
diff --git a/submodules/MtProtoKit/MTProtoKit/MTDatacenterAddressSet.m b/submodules/MtProtoKit/Sources/MTDatacenterAddressSet.m
similarity index 94%
rename from submodules/MtProtoKit/MTProtoKit/MTDatacenterAddressSet.m
rename to submodules/MtProtoKit/Sources/MTDatacenterAddressSet.m
index f7f21f7bae..4e335c6190 100644
--- a/submodules/MtProtoKit/MTProtoKit/MTDatacenterAddressSet.m
+++ b/submodules/MtProtoKit/Sources/MTDatacenterAddressSet.m
@@ -1,8 +1,6 @@
+#import <MtProtoKit/MTDatacenterAddressSet.h>
 
-
-#import "MTDatacenterAddressSet.h"
-
-#import "MTDatacenterAddress.h"
+#import <MtProtoKit/MTDatacenterAddress.h>
 
 @implementation MTDatacenterAddressSet
 
diff --git a/submodules/MtProtoKit/MTProtoKit/MTDatacenterAuthAction.m b/submodules/MtProtoKit/Sources/MTDatacenterAuthAction.m
similarity index 92%
rename from submodules/MtProtoKit/MTProtoKit/MTDatacenterAuthAction.m
rename to submodules/MtProtoKit/Sources/MTDatacenterAuthAction.m
index b6f38a2a58..3896afcd51 100644
--- a/submodules/MtProtoKit/MTProtoKit/MTDatacenterAuthAction.m
+++ b/submodules/MtProtoKit/Sources/MTDatacenterAuthAction.m
@@ -1,21 +1,17 @@
-#import "MTDatacenterAuthAction.h"
-
-#import "MTLogging.h"
-#import "MTContext.h"
-#import "MTProto.h"
-#import "MTRequest.h"
-#import "MTDatacenterSaltInfo.h"
-#import "MTDatacenterAuthInfo.h"
-#import "MTApiEnvironment.h"
-#import "MTSerialization.h"
-#import "MTDatacenterAddressSet.h"
+#import <MtProtoKit/MTDatacenterAuthAction.h>
 
+#import <MtProtoKit/MTLogging.h>
+#import <MtProtoKit/MTContext.h>
+#import <MtProtoKit/MTProto.h>
+#import <MtProtoKit/MTRequest.h>
+#import <MtProtoKit/MTDatacenterSaltInfo.h>
+#import <MtProtoKit/MTDatacenterAuthInfo.h>
+#import <MtProtoKit/MTApiEnvironment.h>
+#import <MtProtoKit/MTSerialization.h>
+#import <MtProtoKit/MTDatacenterAddressSet.h>
 #import <MtProtoKit/MTSignal.h>
-
-
-#import "MTDatacenterAuthMessageService.h"
-#import "MTRequestMessageService.h"
-
+#import <MtProtoKit/MTDatacenterAuthMessageService.h>
+#import <MtProtoKit/MTRequestMessageService.h>
 #import "MTBuffer.h"
 
 @interface MTDatacenterAuthAction () <MTDatacenterAuthMessageServiceDelegate>
diff --git a/submodules/MtProtoKit/MTProtoKit/MTDatacenterAuthInfo.m b/submodules/MtProtoKit/Sources/MTDatacenterAuthInfo.m
similarity index 98%
rename from submodules/MtProtoKit/MTProtoKit/MTDatacenterAuthInfo.m
rename to submodules/MtProtoKit/Sources/MTDatacenterAuthInfo.m
index 1429ea8d8c..f9959626a9 100644
--- a/submodules/MtProtoKit/MTProtoKit/MTDatacenterAuthInfo.m
+++ b/submodules/MtProtoKit/Sources/MTDatacenterAuthInfo.m
@@ -1,5 +1,5 @@
-#import "MTDatacenterAuthInfo.h"
-#import "MTDatacenterSaltInfo.h"
+#import <MtProtoKit/MTDatacenterAuthInfo.h>
+#import <MtProtoKit/MTDatacenterSaltInfo.h>
 
 @implementation MTDatacenterAuthKey
 
diff --git a/submodules/MtProtoKit/MTProtoKit/MTDatacenterAuthMessageService.m b/submodules/MtProtoKit/Sources/MTDatacenterAuthMessageService.m
similarity index 98%
rename from submodules/MtProtoKit/MTProtoKit/MTDatacenterAuthMessageService.m
rename to submodules/MtProtoKit/Sources/MTDatacenterAuthMessageService.m
index bfd7d919b9..a72758f2a0 100644
--- a/submodules/MtProtoKit/MTProtoKit/MTDatacenterAuthMessageService.m
+++ b/submodules/MtProtoKit/Sources/MTDatacenterAuthMessageService.m
@@ -1,18 +1,18 @@
-#import "MTDatacenterAuthMessageService.h"
+#import <MtProtoKit/MTDatacenterAuthMessageService.h>
 
-#import "MTLogging.h"
-#import "MTContext.h"
-#import "MTProto.h"
-#import "MTSerialization.h"
-#import "MTSessionInfo.h"
-#import "MTIncomingMessage.h"
-#import "MTOutgoingMessage.h"
-#import "MTMessageTransaction.h"
-#import "MTPreparedMessage.h"
-#import "MTDatacenterAuthInfo.h"
-#import "MTDatacenterSaltInfo.h"
+#import <MtProtoKit/MTLogging.h>
+#import <MtProtoKit/MTContext.h>
+#import <MtProtoKit/MTProto.h>
+#import <MtProtoKit/MTSerialization.h>
+#import <MtProtoKit/MTSessionInfo.h>
+#import <MtProtoKit/MTIncomingMessage.h>
+#import <MtProtoKit/MTOutgoingMessage.h>
+#import <MtProtoKit/MTMessageTransaction.h>
+#import <MtProtoKit/MTPreparedMessage.h>
+#import <MtProtoKit/MTDatacenterAuthInfo.h>
+#import <MtProtoKit/MTDatacenterSaltInfo.h>
 #import "MTBuffer.h"
-#import "MTEncryption.h"
+#import <MtProtoKit/MTEncryption.h>
 
 #import "MTInternalMessageParser.h"
 #import "MTServerDhInnerDataMessage.h"
diff --git a/submodules/MtProtoKit/MTProtoKit/MTDatacenterSaltInfo.m b/submodules/MtProtoKit/Sources/MTDatacenterSaltInfo.m
similarity index 96%
rename from submodules/MtProtoKit/MTProtoKit/MTDatacenterSaltInfo.m
rename to submodules/MtProtoKit/Sources/MTDatacenterSaltInfo.m
index 17f2e5d2f8..a67066bc06 100644
--- a/submodules/MtProtoKit/MTProtoKit/MTDatacenterSaltInfo.m
+++ b/submodules/MtProtoKit/Sources/MTDatacenterSaltInfo.m
@@ -1,6 +1,4 @@
-
-
-#import "MTDatacenterSaltInfo.h"
+#import <MtProtoKit/MTDatacenterSaltInfo.h>
 
 @implementation MTDatacenterSaltInfo
 
diff --git a/submodules/MtProtoKit/MTProtoKit/MTDatacenterTransferAuthAction.m b/submodules/MtProtoKit/Sources/MTDatacenterTransferAuthAction.m
similarity index 96%
rename from submodules/MtProtoKit/MTProtoKit/MTDatacenterTransferAuthAction.m
rename to submodules/MtProtoKit/Sources/MTDatacenterTransferAuthAction.m
index b99e921ff2..9cfccea07d 100644
--- a/submodules/MtProtoKit/MTProtoKit/MTDatacenterTransferAuthAction.m
+++ b/submodules/MtProtoKit/Sources/MTDatacenterTransferAuthAction.m
@@ -1,12 +1,12 @@
 
 
-#import "MTDatacenterTransferAuthAction.h"
+#import <MtProtoKit/MTDatacenterTransferAuthAction.h>
 
-#import "MTContext.h"
-#import "MTSerialization.h"
-#import "MTProto.h"
-#import "MTRequestMessageService.h"
-#import "MTRequest.h"
+#import <MtProtoKit/MTContext.h>
+#import <MtProtoKit/MTSerialization.h>
+#import <MtProtoKit/MTProto.h>
+#import <MtProtoKit/MTRequestMessageService.h>
+#import <MtProtoKit/MTRequest.h>
 #import "MTBuffer.h"
 
 @interface MTDatacenterTransferAuthAction () <MTContextChangeListener>
diff --git a/submodules/MtProtoKit/MTDatacenterVerificationData.m b/submodules/MtProtoKit/Sources/MTDatacenterVerificationData.m
similarity index 90%
rename from submodules/MtProtoKit/MTDatacenterVerificationData.m
rename to submodules/MtProtoKit/Sources/MTDatacenterVerificationData.m
index 82dbe5326b..bcfc3b0dd4 100644
--- a/submodules/MtProtoKit/MTDatacenterVerificationData.m
+++ b/submodules/MtProtoKit/Sources/MTDatacenterVerificationData.m
@@ -1,4 +1,4 @@
-#import "MTDatacenterVerificationData.h"
+#import <MtProtoKit/MTDatacenterVerificationData.h>
 
 @implementation MTDatacenterVerificationData
 
diff --git a/submodules/MtProtoKit/MTProtoKit/MTDestroySessionResponseMessage.h b/submodules/MtProtoKit/Sources/MTDestroySessionResponseMessage.h
similarity index 100%
rename from submodules/MtProtoKit/MTProtoKit/MTDestroySessionResponseMessage.h
rename to submodules/MtProtoKit/Sources/MTDestroySessionResponseMessage.h
diff --git a/submodules/MtProtoKit/MTProtoKit/MTDestroySessionResponseMessage.m b/submodules/MtProtoKit/Sources/MTDestroySessionResponseMessage.m
similarity index 100%
rename from submodules/MtProtoKit/MTProtoKit/MTDestroySessionResponseMessage.m
rename to submodules/MtProtoKit/Sources/MTDestroySessionResponseMessage.m
diff --git a/submodules/MtProtoKit/MTDiscoverConnectionSignals.h b/submodules/MtProtoKit/Sources/MTDiscoverConnectionSignals.h
similarity index 100%
rename from submodules/MtProtoKit/MTDiscoverConnectionSignals.h
rename to submodules/MtProtoKit/Sources/MTDiscoverConnectionSignals.h
diff --git a/submodules/MtProtoKit/MTDiscoverConnectionSignals.m b/submodules/MtProtoKit/Sources/MTDiscoverConnectionSignals.m
similarity index 96%
rename from submodules/MtProtoKit/MTDiscoverConnectionSignals.m
rename to submodules/MtProtoKit/Sources/MTDiscoverConnectionSignals.m
index d3c0ae312d..6ad6cc0976 100644
--- a/submodules/MtProtoKit/MTDiscoverConnectionSignals.m
+++ b/submodules/MtProtoKit/Sources/MTDiscoverConnectionSignals.m
@@ -1,19 +1,17 @@
 #import "MTDiscoverConnectionSignals.h"
 
 #import "MTTcpConnection.h"
-#import "MTTransportScheme.h"
-#import "MTTcpTransport.h"
-#import "MTQueue.h"
-
-#import "MTDatacenterAddress.h"
-
-#import "MTDisposable.h"
-#import "MTSignal.h"
-#import "MTAtomic.h"
-#import "MTContext.h"
-#import "MTApiEnvironment.h"
-#import "MTLogging.h"
-#import "MTDatacenterAuthAction.h"
+#import <MtProtoKit/MTTransportScheme.h>
+#import <MtProtoKit/MTTcpTransport.h>
+#import <MtProtoKit/MTQueue.h>
+#import <MtProtoKit/MTDatacenterAddress.h>
+#import <MtProtoKit/MTDisposable.h>
+#import <MtProtoKit/MTSignal.h>
+#import <MtProtoKit/MTAtomic.h>
+#import <MtProtoKit/MTContext.h>
+#import <MtProtoKit/MTApiEnvironment.h>
+#import <MtProtoKit/MTLogging.h>
+#import <MtProtoKit/MTDatacenterAuthAction.h>
 
 #import <netinet/in.h>
 #import <arpa/inet.h>
diff --git a/submodules/MtProtoKit/MTProtoKit/MTDiscoverDatacenterAddressAction.h b/submodules/MtProtoKit/Sources/MTDiscoverDatacenterAddressAction.h
similarity index 100%
rename from submodules/MtProtoKit/MTProtoKit/MTDiscoverDatacenterAddressAction.h
rename to submodules/MtProtoKit/Sources/MTDiscoverDatacenterAddressAction.h
diff --git a/submodules/MtProtoKit/MTProtoKit/MTDiscoverDatacenterAddressAction.m b/submodules/MtProtoKit/Sources/MTDiscoverDatacenterAddressAction.m
similarity index 95%
rename from submodules/MtProtoKit/MTProtoKit/MTDiscoverDatacenterAddressAction.m
rename to submodules/MtProtoKit/Sources/MTDiscoverDatacenterAddressAction.m
index cf238642bc..940d8eb942 100644
--- a/submodules/MtProtoKit/MTProtoKit/MTDiscoverDatacenterAddressAction.m
+++ b/submodules/MtProtoKit/Sources/MTDiscoverDatacenterAddressAction.m
@@ -1,13 +1,11 @@
-
-
 #import "MTDiscoverDatacenterAddressAction.h"
 
-#import "MTContext.h"
-#import "MTSerialization.h"
-#import "MTProto.h"
-#import "MTDatacenterAddressSet.h"
-#import "MTRequestMessageService.h"
-#import "MTRequest.h"
+#import <MtProtoKit/MTContext.h>
+#import <MtProtoKit/MTSerialization.h>
+#import <MtProtoKit/MTProto.h>
+#import <MtProtoKit/MTDatacenterAddressSet.h>
+#import <MtProtoKit/MTRequestMessageService.h>
+#import <MtProtoKit/MTRequest.h>
 
 @interface MTDiscoverDatacenterAddressAction () <MTContextChangeListener>
 {
diff --git a/submodules/MtProtoKit/MTDisposable.m b/submodules/MtProtoKit/Sources/MTDisposable.m
similarity index 99%
rename from submodules/MtProtoKit/MTDisposable.m
rename to submodules/MtProtoKit/Sources/MTDisposable.m
index 356b419a1e..ad89f9e0bd 100644
--- a/submodules/MtProtoKit/MTDisposable.m
+++ b/submodules/MtProtoKit/Sources/MTDisposable.m
@@ -1,4 +1,4 @@
-#import "MTDisposable.h"
+#import <MtProtoKit/MTDisposable.h>
 
 #import <libkern/OSAtomic.h>
 #import <objc/runtime.h>
diff --git a/submodules/MtProtoKit/MTProtoKit/MTDropResponseContext.m b/submodules/MtProtoKit/Sources/MTDropResponseContext.m
similarity index 83%
rename from submodules/MtProtoKit/MTProtoKit/MTDropResponseContext.m
rename to submodules/MtProtoKit/Sources/MTDropResponseContext.m
index 5acc47f077..dfeafa0801 100644
--- a/submodules/MtProtoKit/MTProtoKit/MTDropResponseContext.m
+++ b/submodules/MtProtoKit/Sources/MTDropResponseContext.m
@@ -1,6 +1,4 @@
-
-
-#import "MTDropResponseContext.h"
+#import <MtProtoKit/MTDropResponseContext.h>
 
 @implementation MTDropResponseContext
 
diff --git a/submodules/MtProtoKit/MTProtoKit/MTDropRpcResultMessage.h b/submodules/MtProtoKit/Sources/MTDropRpcResultMessage.h
similarity index 100%
rename from submodules/MtProtoKit/MTProtoKit/MTDropRpcResultMessage.h
rename to submodules/MtProtoKit/Sources/MTDropRpcResultMessage.h
diff --git a/submodules/MtProtoKit/MTProtoKit/MTDropRpcResultMessage.m b/submodules/MtProtoKit/Sources/MTDropRpcResultMessage.m
similarity index 100%
rename from submodules/MtProtoKit/MTProtoKit/MTDropRpcResultMessage.m
rename to submodules/MtProtoKit/Sources/MTDropRpcResultMessage.m
diff --git a/submodules/MtProtoKit/MTProtoKit/MTEncryption.m b/submodules/MtProtoKit/Sources/MTEncryption.m
similarity index 99%
rename from submodules/MtProtoKit/MTProtoKit/MTEncryption.m
rename to submodules/MtProtoKit/Sources/MTEncryption.m
index 9502616682..4df030344c 100644
--- a/submodules/MtProtoKit/MTProtoKit/MTEncryption.m
+++ b/submodules/MtProtoKit/Sources/MTEncryption.m
@@ -1,9 +1,7 @@
+#import <MtProtoKit/MTEncryption.h>
 
-
-#import "MTEncryption.h"
-
-#import "MTLogging.h"
-#import "MTKeychain.h"
+#import <MtProtoKit/MTLogging.h>
+#import <MtProtoKit/MTKeychain.h>
 
 #import <CommonCrypto/CommonCrypto.h>
 #import <CommonCrypto/CommonDigest.h>
@@ -771,7 +769,7 @@ static NSData *decrypt_TL_data(id<EncryptionProvider> provider, unsigned char bu
     if ([context modExpInto:y a:x b:rsaKeyE mod:rsaKeyN]) {
         NSData *yBytes = [context getBin:y];
         unsigned l = 256 - (unsigned)yBytes.length;
-        memset(bytes, 0, l);
+        assert(l >= 0);
         
         [yBytes getBytes:bytes + l length:256 - l];
         
@@ -783,7 +781,7 @@ static NSData *decrypt_TL_data(id<EncryptionProvider> provider, unsigned char bu
         NSData *keyBytes = [[NSData alloc] initWithBytes:bytes length:32];
         
         NSMutableData *decryptedBytes = [[NSMutableData alloc] initWithLength:encryptedBytes.length];
-        MyAesCbcDecrypt(encryptedBytes.bytes, encryptedBytes.length, decryptedBytes.mutableBytes, keyBytes.bytes, keyBytes.length, iv.mutableBytes);
+        MyAesCbcDecrypt(encryptedBytes.bytes, (int)encryptedBytes.length, decryptedBytes.mutableBytes, keyBytes.bytes, (int)keyBytes.length, iv.mutableBytes);
         
         if (decryptedBytes == nil) {
             return nil;
diff --git a/submodules/MtProtoKit/MTProtoKit/MTExportedAuthorizationData.m b/submodules/MtProtoKit/Sources/MTExportedAuthorizationData.m
similarity index 86%
rename from submodules/MtProtoKit/MTProtoKit/MTExportedAuthorizationData.m
rename to submodules/MtProtoKit/Sources/MTExportedAuthorizationData.m
index 939e73b54e..9b4933d791 100644
--- a/submodules/MtProtoKit/MTProtoKit/MTExportedAuthorizationData.m
+++ b/submodules/MtProtoKit/Sources/MTExportedAuthorizationData.m
@@ -1,4 +1,4 @@
-#import "MTExportedAuthorizationData.h"
+#import <MtProtoKit/MTExportedAuthorizationData.h>
 
 @implementation MTExportedAuthorizationData
 
diff --git a/submodules/MtProtoKit/MTProtoKit/MTFileBasedKeychain.m b/submodules/MtProtoKit/Sources/MTFileBasedKeychain.m
similarity index 99%
rename from submodules/MtProtoKit/MTProtoKit/MTFileBasedKeychain.m
rename to submodules/MtProtoKit/Sources/MTFileBasedKeychain.m
index e3987a99e8..abe1a51b03 100644
--- a/submodules/MtProtoKit/MTProtoKit/MTFileBasedKeychain.m
+++ b/submodules/MtProtoKit/Sources/MTFileBasedKeychain.m
@@ -1,6 +1,6 @@
-#import "MTFileBasedKeychain.h"
+#import <MtProtoKit/MTFileBasedKeychain.h>
 
-#import "MTLogging.h"
+#import <MtProtoKit/MTLogging.h>
 
 #import <pthread.h>
 
@@ -10,7 +10,7 @@
 #define TG_SYNCHRONIZED_END(lock) pthread_mutex_unlock(&_TG_SYNCHRONIZED_##lock);
 
 #import <CommonCrypto/CommonCrypto.h>
-#import "MTEncryption.h"
+#import <MtProtoKit/MTEncryption.h>
 
 static TG_SYNCHRONIZED_DEFINE(_keychains) = PTHREAD_MUTEX_INITIALIZER;
 static NSMutableDictionary *keychains()
diff --git a/submodules/MtProtoKit/MTProtoKit/MTFutureSaltsMessage.h b/submodules/MtProtoKit/Sources/MTFutureSaltsMessage.h
similarity index 100%
rename from submodules/MtProtoKit/MTProtoKit/MTFutureSaltsMessage.h
rename to submodules/MtProtoKit/Sources/MTFutureSaltsMessage.h
diff --git a/submodules/MtProtoKit/MTProtoKit/MTFutureSaltsMessage.m b/submodules/MtProtoKit/Sources/MTFutureSaltsMessage.m
similarity index 100%
rename from submodules/MtProtoKit/MTProtoKit/MTFutureSaltsMessage.m
rename to submodules/MtProtoKit/Sources/MTFutureSaltsMessage.m
diff --git a/submodules/MtProtoKit/MTGzip.m b/submodules/MtProtoKit/Sources/MTGzip.m
similarity index 98%
rename from submodules/MtProtoKit/MTGzip.m
rename to submodules/MtProtoKit/Sources/MTGzip.m
index 34737816fa..fa7f1ba182 100644
--- a/submodules/MtProtoKit/MTGzip.m
+++ b/submodules/MtProtoKit/Sources/MTGzip.m
@@ -1,4 +1,4 @@
-#import "MTGzip.h"
+#import <MtProtoKit/MTGzip.h>
 
 #import <zlib.h>
 
diff --git a/submodules/MtProtoKit/MTProtoKit/MTHttpRequestOperation.m b/submodules/MtProtoKit/Sources/MTHttpRequestOperation.m
similarity index 95%
rename from submodules/MtProtoKit/MTProtoKit/MTHttpRequestOperation.m
rename to submodules/MtProtoKit/Sources/MTHttpRequestOperation.m
index 143907175c..22676343a9 100644
--- a/submodules/MtProtoKit/MTProtoKit/MTHttpRequestOperation.m
+++ b/submodules/MtProtoKit/Sources/MTHttpRequestOperation.m
@@ -1,6 +1,6 @@
-#import "MTHttpRequestOperation.h"
+#import <MtProtoKit/MTHttpRequestOperation.h>
 
-#import "../thirdparty/AFNetworking/AFHTTPRequestOperation.h"
+#import <MtProtoKit/AFHTTPRequestOperation.h>
 #import <MtProtoKit/MTDisposable.h>
 #import <MtProtoKit/MTSignal.h>
 
diff --git a/submodules/MtProtoKit/MTProtoKit/MTIncomingMessage.m b/submodules/MtProtoKit/Sources/MTIncomingMessage.m
similarity index 93%
rename from submodules/MtProtoKit/MTProtoKit/MTIncomingMessage.m
rename to submodules/MtProtoKit/Sources/MTIncomingMessage.m
index 03107c07fa..45e7df7ffc 100644
--- a/submodules/MtProtoKit/MTProtoKit/MTIncomingMessage.m
+++ b/submodules/MtProtoKit/Sources/MTIncomingMessage.m
@@ -1,6 +1,4 @@
-
-
-#import "MTIncomingMessage.h"
+#import <MtProtoKit/MTIncomingMessage.h>
 
 @implementation MTIncomingMessage
 
diff --git a/submodules/MtProtoKit/MTProtoKit/MTInputStream.m b/submodules/MtProtoKit/Sources/MTInputStream.m
similarity index 99%
rename from submodules/MtProtoKit/MTProtoKit/MTInputStream.m
rename to submodules/MtProtoKit/Sources/MTInputStream.m
index 0793b43ca0..509427debe 100644
--- a/submodules/MtProtoKit/MTProtoKit/MTInputStream.m
+++ b/submodules/MtProtoKit/Sources/MTInputStream.m
@@ -1,8 +1,7 @@
-
+#import <MtProtoKit/MTInputStream.h>
 
 #import <Foundation/Foundation.h>
-#import "MTLogging.h"
-#import "MTInputStream.h"
+#import <MtProtoKit/MTLogging.h>
 
 #if TARGET_OS_IPHONE
 #   import <endian.h>
diff --git a/submodules/MtProtoKit/MTProtoKit/MTInternalMessageParser.h b/submodules/MtProtoKit/Sources/MTInternalMessageParser.h
similarity index 100%
rename from submodules/MtProtoKit/MTProtoKit/MTInternalMessageParser.h
rename to submodules/MtProtoKit/Sources/MTInternalMessageParser.h
diff --git a/submodules/MtProtoKit/MTProtoKit/MTInternalMessageParser.m b/submodules/MtProtoKit/Sources/MTInternalMessageParser.m
similarity index 99%
rename from submodules/MtProtoKit/MTProtoKit/MTInternalMessageParser.m
rename to submodules/MtProtoKit/Sources/MTInternalMessageParser.m
index 57b831f63c..8523a8a6ba 100644
--- a/submodules/MtProtoKit/MTProtoKit/MTInternalMessageParser.m
+++ b/submodules/MtProtoKit/Sources/MTInternalMessageParser.m
@@ -4,7 +4,7 @@
 
 #import "MTResPqMessage.h"
 #import "MTRpcResultMessage.h"
-#import "MTRpcError.h"
+#import <MtProtoKit/MTRpcError.h>
 #import "MTDropRpcResultMessage.h"
 #import "MTServerDhParamsMessage.h"
 #import "MTServerDhInnerDataMessage.h"
@@ -24,7 +24,7 @@
 #import "MTMsgContainerMessage.h"
 #import "MTFutureSaltsMessage.h"
 
-#import "MTLogging.h"
+#import <MtProtoKit/MTLogging.h>
 
 #import <zlib.h>
 
diff --git a/submodules/MtProtoKit/Sources/MTKeychain.m b/submodules/MtProtoKit/Sources/MTKeychain.m
new file mode 100644
index 0000000000..80660fa86b
--- /dev/null
+++ b/submodules/MtProtoKit/Sources/MTKeychain.m
@@ -0,0 +1 @@
+#import <MtProtoKit/MTKeychain.h>
diff --git a/submodules/MtProtoKit/MTProtoKit/MTLogging.m b/submodules/MtProtoKit/Sources/MTLogging.m
similarity index 96%
rename from submodules/MtProtoKit/MTProtoKit/MTLogging.m
rename to submodules/MtProtoKit/Sources/MTLogging.m
index 18429455a4..ba0948f776 100644
--- a/submodules/MtProtoKit/MTProtoKit/MTLogging.m
+++ b/submodules/MtProtoKit/Sources/MTLogging.m
@@ -1,6 +1,4 @@
-
-
-#import "MTLogging.h"
+#import <MtProtoKit/MTLogging.h>
 
 static void (*loggingFunction)(NSString *, va_list args) = NULL;
 static void (*shortLoggingFunction)(NSString *, va_list args) = NULL;
diff --git a/submodules/MtProtoKit/MTProtoKit/MTMessage.h b/submodules/MtProtoKit/Sources/MTMessage.h
similarity index 100%
rename from submodules/MtProtoKit/MTProtoKit/MTMessage.h
rename to submodules/MtProtoKit/Sources/MTMessage.h
diff --git a/submodules/MtProtoKit/MTProtoKit/MTMessage.m b/submodules/MtProtoKit/Sources/MTMessage.m
similarity index 100%
rename from submodules/MtProtoKit/MTProtoKit/MTMessage.m
rename to submodules/MtProtoKit/Sources/MTMessage.m
diff --git a/submodules/MtProtoKit/MTProtoKit/MTMessageEncryptionKey.m b/submodules/MtProtoKit/Sources/MTMessageEncryptionKey.m
similarity index 98%
rename from submodules/MtProtoKit/MTProtoKit/MTMessageEncryptionKey.m
rename to submodules/MtProtoKit/Sources/MTMessageEncryptionKey.m
index 75c6625d38..2f7caafe6b 100644
--- a/submodules/MtProtoKit/MTProtoKit/MTMessageEncryptionKey.m
+++ b/submodules/MtProtoKit/Sources/MTMessageEncryptionKey.m
@@ -1,8 +1,6 @@
+#import <MtProtoKit/MTMessageEncryptionKey.h>
 
-
-#import "MTMessageEncryptionKey.h"
-
-#import "MTEncryption.h"
+#import <MtProtoKit/MTEncryption.h>
 
 @implementation MTMessageEncryptionKey
 
diff --git a/submodules/MtProtoKit/MTProtoKit/MTMessageTransaction.m b/submodules/MtProtoKit/Sources/MTMessageTransaction.m
similarity index 90%
rename from submodules/MtProtoKit/MTProtoKit/MTMessageTransaction.m
rename to submodules/MtProtoKit/Sources/MTMessageTransaction.m
index 6bbcc6a94e..d48a1c539d 100644
--- a/submodules/MtProtoKit/MTProtoKit/MTMessageTransaction.m
+++ b/submodules/MtProtoKit/Sources/MTMessageTransaction.m
@@ -1,8 +1,6 @@
+#import <MtProtoKit/MTMessageTransaction.h>
 
-
-#import "MTMessageTransaction.h"
-
-#import "MTInternalId.h"
+#import <MtProtoKit/MTInternalId.h>
 
 MTInternalIdClass(MTMessageTransaction)
 
diff --git a/submodules/MtProtoKit/MTProtoKit/MTMsgAllInfoMessage.h b/submodules/MtProtoKit/Sources/MTMsgAllInfoMessage.h
similarity index 100%
rename from submodules/MtProtoKit/MTProtoKit/MTMsgAllInfoMessage.h
rename to submodules/MtProtoKit/Sources/MTMsgAllInfoMessage.h
diff --git a/submodules/MtProtoKit/MTProtoKit/MTMsgAllInfoMessage.m b/submodules/MtProtoKit/Sources/MTMsgAllInfoMessage.m
similarity index 100%
rename from submodules/MtProtoKit/MTProtoKit/MTMsgAllInfoMessage.m
rename to submodules/MtProtoKit/Sources/MTMsgAllInfoMessage.m
diff --git a/submodules/MtProtoKit/MTProtoKit/MTMsgContainerMessage.h b/submodules/MtProtoKit/Sources/MTMsgContainerMessage.h
similarity index 100%
rename from submodules/MtProtoKit/MTProtoKit/MTMsgContainerMessage.h
rename to submodules/MtProtoKit/Sources/MTMsgContainerMessage.h
diff --git a/submodules/MtProtoKit/MTProtoKit/MTMsgContainerMessage.m b/submodules/MtProtoKit/Sources/MTMsgContainerMessage.m
similarity index 100%
rename from submodules/MtProtoKit/MTProtoKit/MTMsgContainerMessage.m
rename to submodules/MtProtoKit/Sources/MTMsgContainerMessage.m
diff --git a/submodules/MtProtoKit/MTProtoKit/MTMsgDetailedInfoMessage.h b/submodules/MtProtoKit/Sources/MTMsgDetailedInfoMessage.h
similarity index 100%
rename from submodules/MtProtoKit/MTProtoKit/MTMsgDetailedInfoMessage.h
rename to submodules/MtProtoKit/Sources/MTMsgDetailedInfoMessage.h
diff --git a/submodules/MtProtoKit/MTProtoKit/MTMsgDetailedInfoMessage.m b/submodules/MtProtoKit/Sources/MTMsgDetailedInfoMessage.m
similarity index 100%
rename from submodules/MtProtoKit/MTProtoKit/MTMsgDetailedInfoMessage.m
rename to submodules/MtProtoKit/Sources/MTMsgDetailedInfoMessage.m
diff --git a/submodules/MtProtoKit/MTProtoKit/MTMsgResendReqMessage.h b/submodules/MtProtoKit/Sources/MTMsgResendReqMessage.h
similarity index 100%
rename from submodules/MtProtoKit/MTProtoKit/MTMsgResendReqMessage.h
rename to submodules/MtProtoKit/Sources/MTMsgResendReqMessage.h
diff --git a/submodules/MtProtoKit/MTProtoKit/MTMsgResendReqMessage.m b/submodules/MtProtoKit/Sources/MTMsgResendReqMessage.m
similarity index 100%
rename from submodules/MtProtoKit/MTProtoKit/MTMsgResendReqMessage.m
rename to submodules/MtProtoKit/Sources/MTMsgResendReqMessage.m
diff --git a/submodules/MtProtoKit/MTProtoKit/MTMsgsAckMessage.h b/submodules/MtProtoKit/Sources/MTMsgsAckMessage.h
similarity index 100%
rename from submodules/MtProtoKit/MTProtoKit/MTMsgsAckMessage.h
rename to submodules/MtProtoKit/Sources/MTMsgsAckMessage.h
diff --git a/submodules/MtProtoKit/MTProtoKit/MTMsgsAckMessage.m b/submodules/MtProtoKit/Sources/MTMsgsAckMessage.m
similarity index 100%
rename from submodules/MtProtoKit/MTProtoKit/MTMsgsAckMessage.m
rename to submodules/MtProtoKit/Sources/MTMsgsAckMessage.m
diff --git a/submodules/MtProtoKit/MTProtoKit/MTMsgsStateInfoMessage.h b/submodules/MtProtoKit/Sources/MTMsgsStateInfoMessage.h
similarity index 100%
rename from submodules/MtProtoKit/MTProtoKit/MTMsgsStateInfoMessage.h
rename to submodules/MtProtoKit/Sources/MTMsgsStateInfoMessage.h
diff --git a/submodules/MtProtoKit/MTProtoKit/MTMsgsStateInfoMessage.m b/submodules/MtProtoKit/Sources/MTMsgsStateInfoMessage.m
similarity index 100%
rename from submodules/MtProtoKit/MTProtoKit/MTMsgsStateInfoMessage.m
rename to submodules/MtProtoKit/Sources/MTMsgsStateInfoMessage.m
diff --git a/submodules/MtProtoKit/MTProtoKit/MTMsgsStateReqMessage.h b/submodules/MtProtoKit/Sources/MTMsgsStateReqMessage.h
similarity index 100%
rename from submodules/MtProtoKit/MTProtoKit/MTMsgsStateReqMessage.h
rename to submodules/MtProtoKit/Sources/MTMsgsStateReqMessage.h
diff --git a/submodules/MtProtoKit/MTProtoKit/MTMsgsStateReqMessage.m b/submodules/MtProtoKit/Sources/MTMsgsStateReqMessage.m
similarity index 100%
rename from submodules/MtProtoKit/MTProtoKit/MTMsgsStateReqMessage.m
rename to submodules/MtProtoKit/Sources/MTMsgsStateReqMessage.m
diff --git a/submodules/MtProtoKit/MTProtoKit/MTNetworkAvailability.m b/submodules/MtProtoKit/Sources/MTNetworkAvailability.m
similarity index 97%
rename from submodules/MtProtoKit/MTProtoKit/MTNetworkAvailability.m
rename to submodules/MtProtoKit/Sources/MTNetworkAvailability.m
index 0b242aa3ca..8e45f15cf3 100644
--- a/submodules/MtProtoKit/MTProtoKit/MTNetworkAvailability.m
+++ b/submodules/MtProtoKit/Sources/MTNetworkAvailability.m
@@ -1,10 +1,8 @@
+#import <MtProtoKit/MTNetworkAvailability.h>
 
-
-#import "MTNetworkAvailability.h"
-
-#import "MTLogging.h"
-#import "MTQueue.h"
-#import "MTTimer.h"
+#import <MtProtoKit/MTLogging.h>
+#import <MtProtoKit/MTQueue.h>
+#import <MtProtoKit/MTTimer.h>
 
 #import <sys/socket.h>
 #import <netinet/in.h>
diff --git a/submodules/MtProtoKit/MTNetworkUsageCalculationInfo.m b/submodules/MtProtoKit/Sources/MTNetworkUsageCalculationInfo.m
similarity index 91%
rename from submodules/MtProtoKit/MTNetworkUsageCalculationInfo.m
rename to submodules/MtProtoKit/Sources/MTNetworkUsageCalculationInfo.m
index 1650e44970..ae7a4cbef4 100644
--- a/submodules/MtProtoKit/MTNetworkUsageCalculationInfo.m
+++ b/submodules/MtProtoKit/Sources/MTNetworkUsageCalculationInfo.m
@@ -1,4 +1,4 @@
-#import "MTNetworkUsageCalculationInfo.h"
+#import <MtProtoKit/MTNetworkUsageCalculationInfo.h>
 
 @implementation MTNetworkUsageCalculationInfo
 
diff --git a/submodules/MtProtoKit/MTNetworkUsageManager.m b/submodules/MtProtoKit/Sources/MTNetworkUsageManager.m
similarity index 99%
rename from submodules/MtProtoKit/MTNetworkUsageManager.m
rename to submodules/MtProtoKit/Sources/MTNetworkUsageManager.m
index 9c0e81ccd9..657fb44cc8 100644
--- a/submodules/MtProtoKit/MTNetworkUsageManager.m
+++ b/submodules/MtProtoKit/Sources/MTNetworkUsageManager.m
@@ -1,4 +1,4 @@
-#import "MTNetworkUsageManager.h"
+#import <MtProtoKit/MTNetworkUsageManager.h>
 
 #include <sys/mman.h>
 #import <libkern/OSAtomic.h>
diff --git a/submodules/MtProtoKit/MTProtoKit/MTNewSessionCreatedMessage.h b/submodules/MtProtoKit/Sources/MTNewSessionCreatedMessage.h
similarity index 100%
rename from submodules/MtProtoKit/MTProtoKit/MTNewSessionCreatedMessage.h
rename to submodules/MtProtoKit/Sources/MTNewSessionCreatedMessage.h
diff --git a/submodules/MtProtoKit/MTProtoKit/MTNewSessionCreatedMessage.m b/submodules/MtProtoKit/Sources/MTNewSessionCreatedMessage.m
similarity index 100%
rename from submodules/MtProtoKit/MTProtoKit/MTNewSessionCreatedMessage.m
rename to submodules/MtProtoKit/Sources/MTNewSessionCreatedMessage.m
diff --git a/submodules/MtProtoKit/MTProtoKit/MTOutgoingMessage.m b/submodules/MtProtoKit/Sources/MTOutgoingMessage.m
similarity index 97%
rename from submodules/MtProtoKit/MTProtoKit/MTOutgoingMessage.m
rename to submodules/MtProtoKit/Sources/MTOutgoingMessage.m
index d0ef4631ac..7e0e2dd741 100644
--- a/submodules/MtProtoKit/MTProtoKit/MTOutgoingMessage.m
+++ b/submodules/MtProtoKit/Sources/MTOutgoingMessage.m
@@ -1,6 +1,4 @@
-
-
-#import "MTOutgoingMessage.h"
+#import <MtProtoKit/MTOutgoingMessage.h>
 
 #import <libkern/OSAtomic.h>
 
diff --git a/submodules/MtProtoKit/MTProtoKit/MTOutputStream.m b/submodules/MtProtoKit/Sources/MTOutputStream.m
similarity index 99%
rename from submodules/MtProtoKit/MTProtoKit/MTOutputStream.m
rename to submodules/MtProtoKit/Sources/MTOutputStream.m
index 4a5f2698c6..dba14a26b7 100644
--- a/submodules/MtProtoKit/MTProtoKit/MTOutputStream.m
+++ b/submodules/MtProtoKit/Sources/MTOutputStream.m
@@ -1,6 +1,4 @@
-
-
-#import "MTOutputStream.h"
+#import <MtProtoKit/MTOutputStream.h>
 
 #if TARGET_OS_IPHONE
 #   import <endian.h>
diff --git a/submodules/MtProtoKit/MTProtoKit/MTPingMessage.h b/submodules/MtProtoKit/Sources/MTPingMessage.h
similarity index 100%
rename from submodules/MtProtoKit/MTProtoKit/MTPingMessage.h
rename to submodules/MtProtoKit/Sources/MTPingMessage.h
diff --git a/submodules/MtProtoKit/MTProtoKit/MTPingMessage.m b/submodules/MtProtoKit/Sources/MTPingMessage.m
similarity index 100%
rename from submodules/MtProtoKit/MTProtoKit/MTPingMessage.m
rename to submodules/MtProtoKit/Sources/MTPingMessage.m
diff --git a/submodules/MtProtoKit/MTProtoKit/MTPongMessage.h b/submodules/MtProtoKit/Sources/MTPongMessage.h
similarity index 100%
rename from submodules/MtProtoKit/MTProtoKit/MTPongMessage.h
rename to submodules/MtProtoKit/Sources/MTPongMessage.h
diff --git a/submodules/MtProtoKit/MTProtoKit/MTPongMessage.m b/submodules/MtProtoKit/Sources/MTPongMessage.m
similarity index 100%
rename from submodules/MtProtoKit/MTProtoKit/MTPongMessage.m
rename to submodules/MtProtoKit/Sources/MTPongMessage.m
diff --git a/submodules/MtProtoKit/MTProtoKit/MTPreparedMessage.m b/submodules/MtProtoKit/Sources/MTPreparedMessage.m
similarity index 93%
rename from submodules/MtProtoKit/MTProtoKit/MTPreparedMessage.m
rename to submodules/MtProtoKit/Sources/MTPreparedMessage.m
index 4f0757a6da..4be8c60b63 100644
--- a/submodules/MtProtoKit/MTProtoKit/MTPreparedMessage.m
+++ b/submodules/MtProtoKit/Sources/MTPreparedMessage.m
@@ -1,8 +1,6 @@
+#import <MtProtoKit/MTPreparedMessage.h>
 
-
-#import "MTPreparedMessage.h"
-
-#import "MTInternalId.h"
+#import <MtProtoKit/MTInternalId.h>
 
 MTInternalIdClass(MTPreparedMessage)
 
diff --git a/submodules/MtProtoKit/MTProtoKit/MTProto.m b/submodules/MtProtoKit/Sources/MTProto.m
similarity index 99%
rename from submodules/MtProtoKit/MTProtoKit/MTProto.m
rename to submodules/MtProtoKit/Sources/MTProto.m
index 6b4f2ce316..7c96b4930f 100644
--- a/submodules/MtProtoKit/MTProtoKit/MTProto.m
+++ b/submodules/MtProtoKit/Sources/MTProto.m
@@ -1,42 +1,38 @@
-
-
-#import "MTProto.h"
+#import <MtProtoKit/MTProto.h>
 
 #import <inttypes.h>
 
-#import "MTLogging.h"
-#import "MTQueue.h"
-#import "MTOutputStream.h"
-#import "MTInputStream.h"
-
-#import "MTContext.h"
-
-#import "MTDatacenterAddress.h"
-#import "MTDatacenterAddressSet.h"
-#import "MTTransportScheme.h"
-#import "MTDatacenterAuthInfo.h"
-#import "MTSessionInfo.h"
-#import "MTDatacenterSaltInfo.h"
-#import "MTTimeFixContext.h"
+#import <MtProtoKit/MTLogging.h>
+#import <MtProtoKit/MTQueue.h>
+#import <MtProtoKit/MTOutputStream.h>
+#import <MtProtoKit/MTInputStream.h>
+#import <MtProtoKit/MTContext.h>
+#import <MtProtoKit/MTDatacenterAddress.h>
+#import <MtProtoKit/MTDatacenterAddressSet.h>
+#import <MtProtoKit/MTTransportScheme.h>
+#import <MtProtoKit/MTDatacenterAuthInfo.h>
+#import <MtProtoKit/MTSessionInfo.h>
+#import <MtProtoKit/MTDatacenterSaltInfo.h>
+#import <MtProtoKit/MTTimeFixContext.h>
 #import "MTBindingTempAuthKeyContext.h"
 
-#import "MTMessageService.h"
-#import "MTMessageTransaction.h"
-#import "MTTimeSyncMessageService.h"
-#import "MTResendMessageService.h"
+#import <MtProtoKit/MTMessageService.h>
+#import <MtProtoKit/MTMessageTransaction.h>
+#import <MtProtoKit/MTTimeSyncMessageService.h>
+#import <MtProtoKit/MTResendMessageService.h>
 
-#import "MTIncomingMessage.h"
-#import "MTOutgoingMessage.h"
-#import "MTPreparedMessage.h"
-#import "MTMessageEncryptionKey.h"
+#import <MtProtoKit/MTIncomingMessage.h>
+#import <MtProtoKit/MTOutgoingMessage.h>
+#import <MtProtoKit/MTPreparedMessage.h>
+#import <MtProtoKit/MTMessageEncryptionKey.h>
 
-#import "MTTransport.h"
-#import "MTTransportTransaction.h"
+#import <MtProtoKit/MTTransport.h>
+#import <MtProtoKit/MTTransportTransaction.h>
 
-#import "MTTcpTransport.h"
+#import <MtProtoKit/MTTcpTransport.h>
 
-#import "MTSerialization.h"
-#import "MTEncryption.h"
+#import <MtProtoKit/MTSerialization.h>
+#import <MtProtoKit/MTEncryption.h>
 
 #import "MTBuffer.h"
 #import "MTInternalMessageParser.h"
@@ -48,13 +44,13 @@
 #import "MTNewSessionCreatedMessage.h"
 #import "MTPongMessage.h"
 #import "MTRpcResultMessage.h"
-#import "MTRpcError.h"
+#import <MtProtoKit/MTRpcError.h>
 
 #import "MTConnectionProbing.h"
 
-#import "MTApiEnvironment.h"
+#import <MtProtoKit/MTApiEnvironment.h>
 
-#import "MTTime.h"
+#import <MtProtoKit/MTTime.h>
 
 #import <MtProtoKit/MTSignal.h>
 #import <MtProtoKit/MTQueue.h>
diff --git a/submodules/MtProtoKit/MTProxyConnectivity.m b/submodules/MtProtoKit/Sources/MTProxyConnectivity.m
similarity index 95%
rename from submodules/MtProtoKit/MTProxyConnectivity.m
rename to submodules/MtProtoKit/Sources/MTProxyConnectivity.m
index dad633abbc..0ac9eb2676 100644
--- a/submodules/MtProtoKit/MTProxyConnectivity.m
+++ b/submodules/MtProtoKit/Sources/MTProxyConnectivity.m
@@ -1,13 +1,13 @@
-#import "MTProxyConnectivity.h"
+#import <MtProtoKit/MTProxyConnectivity.h>
 
-#import "MTSignal.h"
-#import "MTQueue.h"
-#import "MTContext.h"
-#import "MTApiEnvironment.h"
-#import "MTDatacenterAddressSet.h"
-#import "MTDatacenterAddress.h"
+#import <MtProtoKit/MTSignal.h>
+#import <MtProtoKit/MTQueue.h>
+#import <MtProtoKit/MTContext.h>
+#import <MtProtoKit/MTApiEnvironment.h>
+#import <MtProtoKit/MTDatacenterAddressSet.h>
+#import <MtProtoKit/MTDatacenterAddress.h>
 #import "MTTcpConnection.h"
-#import "MTTransportScheme.h"
+#import <MtProtoKit/MTTransportScheme.h>
 #import "MTDiscoverConnectionSignals.h"
 
 @implementation MTProxyConnectivityStatus
diff --git a/submodules/MtProtoKit/MTProtoKit/MTQueue.m b/submodules/MtProtoKit/Sources/MTQueue.m
similarity index 98%
rename from submodules/MtProtoKit/MTProtoKit/MTQueue.m
rename to submodules/MtProtoKit/Sources/MTQueue.m
index cc79357989..89e1915cb4 100644
--- a/submodules/MtProtoKit/MTProtoKit/MTQueue.m
+++ b/submodules/MtProtoKit/Sources/MTQueue.m
@@ -1,6 +1,4 @@
-
-
-#import "MTQueue.h"
+#import <MtProtoKit/MTQueue.h>
 
 @interface MTQueue ()
 {
diff --git a/submodules/MtProtoKit/MTProtoKit/MTRequest.m b/submodules/MtProtoKit/Sources/MTRequest.m
similarity index 94%
rename from submodules/MtProtoKit/MTProtoKit/MTRequest.m
rename to submodules/MtProtoKit/Sources/MTRequest.m
index bb7cd2d86e..bef9245c52 100644
--- a/submodules/MtProtoKit/MTProtoKit/MTRequest.m
+++ b/submodules/MtProtoKit/Sources/MTRequest.m
@@ -1,8 +1,6 @@
+#import <MtProtoKit/MTRequest.h>
 
-
-#import "MTRequest.h"
-
-#import "MTRpcError.h"
+#import <MtProtoKit/MTRpcError.h>
 
 #import <libkern/OSAtomic.h>
 
diff --git a/submodules/MtProtoKit/MTProtoKit/MTRequestContext.m b/submodules/MtProtoKit/Sources/MTRequestContext.m
similarity index 91%
rename from submodules/MtProtoKit/MTProtoKit/MTRequestContext.m
rename to submodules/MtProtoKit/Sources/MTRequestContext.m
index d3be83d166..16c7da24da 100644
--- a/submodules/MtProtoKit/MTProtoKit/MTRequestContext.m
+++ b/submodules/MtProtoKit/Sources/MTRequestContext.m
@@ -1,6 +1,4 @@
-
-
-#import "MTRequestContext.h"
+#import <MtProtoKit/MTRequestContext.h>
 
 @implementation MTRequestContext
 
diff --git a/submodules/MtProtoKit/Sources/MTRequestErrorContext.m b/submodules/MtProtoKit/Sources/MTRequestErrorContext.m
new file mode 100644
index 0000000000..3196930668
--- /dev/null
+++ b/submodules/MtProtoKit/Sources/MTRequestErrorContext.m
@@ -0,0 +1,5 @@
+#import <MtProtoKit/MTRequestErrorContext.h>
+
+@implementation MTRequestErrorContext
+
+@end
diff --git a/submodules/MtProtoKit/MTProtoKit/MTRequestMessageService.m b/submodules/MtProtoKit/Sources/MTRequestMessageService.m
similarity index 98%
rename from submodules/MtProtoKit/MTProtoKit/MTRequestMessageService.m
rename to submodules/MtProtoKit/Sources/MTRequestMessageService.m
index 0720adc1cc..a3cf893d06 100644
--- a/submodules/MtProtoKit/MTProtoKit/MTRequestMessageService.m
+++ b/submodules/MtProtoKit/Sources/MTRequestMessageService.m
@@ -1,29 +1,27 @@
+#import <MtProtoKit/MTRequestMessageService.h>
 
-
-#import "MTRequestMessageService.h"
-
-#import "MTLogging.h"
-#import "MTTime.h"
-#import "MTTimer.h"
-#import "MTContext.h"
-#import "MTSerialization.h"
-#import "MTProto.h"
-#import "MTQueue.h"
-#import "MTMessageTransaction.h"
-#import "MTIncomingMessage.h"
-#import "MTOutgoingMessage.h"
-#import "MTPreparedMessage.h"
-#import "MTRequest.h"
-#import "MTRequestContext.h"
-#import "MTRequestErrorContext.h"
-#import "MTDropResponseContext.h"
-#import "MTApiEnvironment.h"
-#import "MTDatacenterAuthInfo.h"
+#import <MtProtoKit/MTLogging.h>
+#import <MtProtoKit/MTTime.h>
+#import <MtProtoKit/MTTimer.h>
+#import <MtProtoKit/MTContext.h>
+#import <MtProtoKit/MTSerialization.h>
+#import <MtProtoKit/MTProto.h>
+#import <MtProtoKit/MTQueue.h>
+#import <MtProtoKit/MTMessageTransaction.h>
+#import <MtProtoKit/MTIncomingMessage.h>
+#import <MtProtoKit/MTOutgoingMessage.h>
+#import <MtProtoKit/MTPreparedMessage.h>
+#import <MtProtoKit/MTRequest.h>
+#import <MtProtoKit/MTRequestContext.h>
+#import <MtProtoKit/MTRequestErrorContext.h>
+#import <MtProtoKit/MTDropResponseContext.h>
+#import <MtProtoKit/MTApiEnvironment.h>
+#import <MtProtoKit/MTDatacenterAuthInfo.h>
 #import "MTBuffer.h"
 
 #import "MTInternalMessageParser.h"
 #import "MTRpcResultMessage.h"
-#import "MTRpcError.h"
+#import <MtProtoKit/MTRpcError.h>
 #import "MTDropRpcResultMessage.h"
 
 @interface MTRequestMessageService ()
diff --git a/submodules/MtProtoKit/MTProtoKit/MTResPqMessage.h b/submodules/MtProtoKit/Sources/MTResPqMessage.h
similarity index 100%
rename from submodules/MtProtoKit/MTProtoKit/MTResPqMessage.h
rename to submodules/MtProtoKit/Sources/MTResPqMessage.h
diff --git a/submodules/MtProtoKit/MTProtoKit/MTResPqMessage.m b/submodules/MtProtoKit/Sources/MTResPqMessage.m
similarity index 100%
rename from submodules/MtProtoKit/MTProtoKit/MTResPqMessage.m
rename to submodules/MtProtoKit/Sources/MTResPqMessage.m
diff --git a/submodules/MtProtoKit/MTProtoKit/MTResendMessageService.m b/submodules/MtProtoKit/Sources/MTResendMessageService.m
similarity index 93%
rename from submodules/MtProtoKit/MTProtoKit/MTResendMessageService.m
rename to submodules/MtProtoKit/Sources/MTResendMessageService.m
index b876b8caa0..4e515ba39f 100644
--- a/submodules/MtProtoKit/MTProtoKit/MTResendMessageService.m
+++ b/submodules/MtProtoKit/Sources/MTResendMessageService.m
@@ -1,16 +1,14 @@
-
+#import <MtProtoKit/MTResendMessageService.h>
 
 #import <Foundation/Foundation.h>
-#import "MTLogging.h"
-#import "MTResendMessageService.h"
-
-#import "MTProto.h"
-#import "MTContext.h"
-#import "MTSerialization.h"
-#import "MTMessageTransaction.h"
-#import "MTOutgoingMessage.h"
-#import "MTPreparedMessage.h"
-#import "MTIncomingMessage.h"
+#import <MtProtoKit/MTLogging.h>
+#import <MtProtoKit/MTProto.h>
+#import <MtProtoKit/MTContext.h>
+#import <MtProtoKit/MTSerialization.h>
+#import <MtProtoKit/MTMessageTransaction.h>
+#import <MtProtoKit/MTOutgoingMessage.h>
+#import <MtProtoKit/MTPreparedMessage.h>
+#import <MtProtoKit/MTIncomingMessage.h>
 #import "MTBuffer.h"
 #import "MTMsgsStateInfoMessage.h"
 
diff --git a/submodules/MtProtoKit/MTProtoKit/MTRpcError.m b/submodules/MtProtoKit/Sources/MTRpcError.m
similarity index 92%
rename from submodules/MtProtoKit/MTProtoKit/MTRpcError.m
rename to submodules/MtProtoKit/Sources/MTRpcError.m
index 05f3548cd1..8ac0ea02ed 100644
--- a/submodules/MtProtoKit/MTProtoKit/MTRpcError.m
+++ b/submodules/MtProtoKit/Sources/MTRpcError.m
@@ -1,4 +1,4 @@
-#import "MTRpcError.h"
+#import <MtProtoKit/MTRpcError.h>
 
 @implementation MTRpcError
 
diff --git a/submodules/MtProtoKit/MTProtoKit/MTRpcResultMessage.h b/submodules/MtProtoKit/Sources/MTRpcResultMessage.h
similarity index 100%
rename from submodules/MtProtoKit/MTProtoKit/MTRpcResultMessage.h
rename to submodules/MtProtoKit/Sources/MTRpcResultMessage.h
diff --git a/submodules/MtProtoKit/MTProtoKit/MTRpcResultMessage.m b/submodules/MtProtoKit/Sources/MTRpcResultMessage.m
similarity index 100%
rename from submodules/MtProtoKit/MTProtoKit/MTRpcResultMessage.m
rename to submodules/MtProtoKit/Sources/MTRpcResultMessage.m
diff --git a/submodules/MtProtoKit/MTRsa.h b/submodules/MtProtoKit/Sources/MTRsa.h
similarity index 100%
rename from submodules/MtProtoKit/MTRsa.h
rename to submodules/MtProtoKit/Sources/MTRsa.h
diff --git a/submodules/MtProtoKit/MTRsa.m b/submodules/MtProtoKit/Sources/MTRsa.m
similarity index 100%
rename from submodules/MtProtoKit/MTRsa.m
rename to submodules/MtProtoKit/Sources/MTRsa.m
diff --git a/submodules/MtProtoKit/MTProtoKit/MTServerDhInnerDataMessage.h b/submodules/MtProtoKit/Sources/MTServerDhInnerDataMessage.h
similarity index 100%
rename from submodules/MtProtoKit/MTProtoKit/MTServerDhInnerDataMessage.h
rename to submodules/MtProtoKit/Sources/MTServerDhInnerDataMessage.h
diff --git a/submodules/MtProtoKit/MTProtoKit/MTServerDhInnerDataMessage.m b/submodules/MtProtoKit/Sources/MTServerDhInnerDataMessage.m
similarity index 100%
rename from submodules/MtProtoKit/MTProtoKit/MTServerDhInnerDataMessage.m
rename to submodules/MtProtoKit/Sources/MTServerDhInnerDataMessage.m
diff --git a/submodules/MtProtoKit/MTProtoKit/MTServerDhParamsMessage.h b/submodules/MtProtoKit/Sources/MTServerDhParamsMessage.h
similarity index 100%
rename from submodules/MtProtoKit/MTProtoKit/MTServerDhParamsMessage.h
rename to submodules/MtProtoKit/Sources/MTServerDhParamsMessage.h
diff --git a/submodules/MtProtoKit/MTProtoKit/MTServerDhParamsMessage.m b/submodules/MtProtoKit/Sources/MTServerDhParamsMessage.m
similarity index 100%
rename from submodules/MtProtoKit/MTProtoKit/MTServerDhParamsMessage.m
rename to submodules/MtProtoKit/Sources/MTServerDhParamsMessage.m
diff --git a/submodules/MtProtoKit/MTProtoKit/MTSessionInfo.m b/submodules/MtProtoKit/Sources/MTSessionInfo.m
similarity index 98%
rename from submodules/MtProtoKit/MTProtoKit/MTSessionInfo.m
rename to submodules/MtProtoKit/Sources/MTSessionInfo.m
index 8c21f04b21..1691592fa0 100644
--- a/submodules/MtProtoKit/MTProtoKit/MTSessionInfo.m
+++ b/submodules/MtProtoKit/Sources/MTSessionInfo.m
@@ -1,9 +1,7 @@
+#import <MtProtoKit/MTSessionInfo.h>
 
-
-#import "MTSessionInfo.h"
-
-#import "MTLogging.h"
-#import "MTContext.h"
+#import <MtProtoKit/MTLogging.h>
+#import <MtProtoKit/MTContext.h>
 
 @interface MTScheduledMessageConfirmation : NSObject
 
diff --git a/submodules/MtProtoKit/MTProtoKit/MTSetClientDhParamsResponseMessage.h b/submodules/MtProtoKit/Sources/MTSetClientDhParamsResponseMessage.h
similarity index 100%
rename from submodules/MtProtoKit/MTProtoKit/MTSetClientDhParamsResponseMessage.h
rename to submodules/MtProtoKit/Sources/MTSetClientDhParamsResponseMessage.h
diff --git a/submodules/MtProtoKit/MTProtoKit/MTSetClientDhParamsResponseMessage.m b/submodules/MtProtoKit/Sources/MTSetClientDhParamsResponseMessage.m
similarity index 100%
rename from submodules/MtProtoKit/MTProtoKit/MTSetClientDhParamsResponseMessage.m
rename to submodules/MtProtoKit/Sources/MTSetClientDhParamsResponseMessage.m
diff --git a/submodules/MtProtoKit/MTSignal.m b/submodules/MtProtoKit/Sources/MTSignal.m
similarity index 99%
rename from submodules/MtProtoKit/MTSignal.m
rename to submodules/MtProtoKit/Sources/MTSignal.m
index 3f273bf34b..42937568b0 100644
--- a/submodules/MtProtoKit/MTSignal.m
+++ b/submodules/MtProtoKit/Sources/MTSignal.m
@@ -1,10 +1,10 @@
-#import "MTSignal.h"
+#import <MtProtoKit/MTSignal.h>
 
 #import <libkern/OSAtomic.h>
-#import "MTTimer.h"
-#import "MTQueue.h"
-#import "MTAtomic.h"
-#import "MTBag.h"
+#import <MtProtoKit/MTTimer.h>
+#import <MtProtoKit/MTQueue.h>
+#import <MtProtoKit/MTAtomic.h>
+#import <MtProtoKit/MTBag.h>
 
 @interface MTSubscriberDisposable : NSObject <MTDisposable>
 {
diff --git a/submodules/MtProtoKit/MTSubscriber.m b/submodules/MtProtoKit/Sources/MTSubscriber.m
similarity index 98%
rename from submodules/MtProtoKit/MTSubscriber.m
rename to submodules/MtProtoKit/Sources/MTSubscriber.m
index 8f0de8b1f0..a32d7956f8 100644
--- a/submodules/MtProtoKit/MTSubscriber.m
+++ b/submodules/MtProtoKit/Sources/MTSubscriber.m
@@ -1,4 +1,4 @@
-#import "MTSubscriber.h"
+#import <MtProtoKit/MTSubscriber.h>
 
 #import <libkern/OSAtomic.h>
 
diff --git a/submodules/MtProtoKit/MTProtoKit/MTTcpConnection.h b/submodules/MtProtoKit/Sources/MTTcpConnection.h
similarity index 100%
rename from submodules/MtProtoKit/MTProtoKit/MTTcpConnection.h
rename to submodules/MtProtoKit/Sources/MTTcpConnection.h
diff --git a/submodules/MtProtoKit/MTProtoKit/MTTcpConnection.m b/submodules/MtProtoKit/Sources/MTTcpConnection.m
similarity index 99%
rename from submodules/MtProtoKit/MTProtoKit/MTTcpConnection.m
rename to submodules/MtProtoKit/Sources/MTTcpConnection.m
index f173b9660d..51b303dbb9 100644
--- a/submodules/MtProtoKit/MTProtoKit/MTTcpConnection.m
+++ b/submodules/MtProtoKit/Sources/MTTcpConnection.m
@@ -1,8 +1,8 @@
 #import "MTTcpConnection.h"
 
-#import "MTLogging.h"
-#import "MTQueue.h"
-#import "MTTimer.h"
+#import <MtProtoKit/MTLogging.h>
+#import <MtProtoKit/MTQueue.h>
+#import <MtProtoKit/MTTimer.h>
 
 #import "GCDAsyncSocket.h"
 #import <sys/socket.h>
@@ -11,16 +11,16 @@
 #import <CommonCrypto/CommonDigest.h>
 #import <CommonCrypto/CommonHMac.h>
 
-#import "MTInternalId.h"
+#import <MtProtoKit/MTInternalId.h>
 
-#import "MTContext.h"
-#import "MTApiEnvironment.h"
-#import "MTDatacenterAddress.h"
-#import "MTTransportScheme.h"
+#import <MtProtoKit/MTContext.h>
+#import <MtProtoKit/MTApiEnvironment.h>
+#import <MtProtoKit/MTDatacenterAddress.h>
+#import <MtProtoKit/MTTransportScheme.h>
 
 #import "MTAes.h"
-#import "MTEncryption.h"
-#import "MTSignal.h"
+#import <MtProtoKit/MTEncryption.h>
+#import <MtProtoKit/MTSignal.h>
 #import "MTDNS.h"
 
 #import <EncryptionProvider/EncryptionProvider.h>
diff --git a/submodules/MtProtoKit/MTProtoKit/MTTcpConnectionBehaviour.h b/submodules/MtProtoKit/Sources/MTTcpConnectionBehaviour.h
similarity index 100%
rename from submodules/MtProtoKit/MTProtoKit/MTTcpConnectionBehaviour.h
rename to submodules/MtProtoKit/Sources/MTTcpConnectionBehaviour.h
diff --git a/submodules/MtProtoKit/MTProtoKit/MTTcpConnectionBehaviour.m b/submodules/MtProtoKit/Sources/MTTcpConnectionBehaviour.m
similarity index 97%
rename from submodules/MtProtoKit/MTProtoKit/MTTcpConnectionBehaviour.m
rename to submodules/MtProtoKit/Sources/MTTcpConnectionBehaviour.m
index bb86531eea..e975d4c836 100644
--- a/submodules/MtProtoKit/MTProtoKit/MTTcpConnectionBehaviour.m
+++ b/submodules/MtProtoKit/Sources/MTTcpConnectionBehaviour.m
@@ -1,11 +1,9 @@
-
-
 #import <Foundation/Foundation.h>
 
 #import "MTTcpConnectionBehaviour.h"
 
-#import "MTTimer.h"
-#import "MTQueue.h"
+#import <MtProtoKit/MTTimer.h>
+#import <MtProtoKit/MTQueue.h>
 
 @interface MTTcpConnectionBehaviour ()
 {
diff --git a/submodules/MtProtoKit/MTProtoKit/MTTcpTransport.m b/submodules/MtProtoKit/Sources/MTTcpTransport.m
similarity index 98%
rename from submodules/MtProtoKit/MTProtoKit/MTTcpTransport.m
rename to submodules/MtProtoKit/Sources/MTTcpTransport.m
index eed908931b..6b4cc265f1 100644
--- a/submodules/MtProtoKit/MTProtoKit/MTTcpTransport.m
+++ b/submodules/MtProtoKit/Sources/MTTcpTransport.m
@@ -1,30 +1,26 @@
+#import <MtProtoKit/MTTcpTransport.h>
 
-
-#import "MTTcpTransport.h"
-
-#import "MTLogging.h"
-#import "MTQueue.h"
-#import "MTTimer.h"
-#import "MTTime.h"
-
-#import "MTTransportScheme.h"
-#import "MTDatacenterAddressSet.h"
-
-#import "MTTransportTransaction.h"
-#import "MTOutgoingMessage.h"
-#import "MTIncomingMessage.h"
-#import "MTMessageTransaction.h"
-#import "MTPreparedMessage.h"
+#import <MtProtoKit/MTLogging.h>
+#import <MtProtoKit/MTQueue.h>
+#import <MtProtoKit/MTTimer.h>
+#import <MtProtoKit/MTTime.h>
+#import <MtProtoKit/MTTransportScheme.h>
+#import <MtProtoKit/MTDatacenterAddressSet.h>
+#import <MtProtoKit/MTTransportTransaction.h>
+#import <MtProtoKit/MTOutgoingMessage.h>
+#import <MtProtoKit/MTIncomingMessage.h>
+#import <MtProtoKit/MTMessageTransaction.h>
+#import <MtProtoKit/MTPreparedMessage.h>
 
 #import "MTTcpConnection.h"
 #import "MTTcpConnectionBehaviour.h"
 
-#import "MTSerialization.h"
+#import <MtProtoKit/MTSerialization.h>
 #import "MTBuffer.h"
 #import "MTPongMessage.h"
 
-#import "MTContext.h"
-#import "MTApiEnvironment.h"
+#import <MtProtoKit/MTContext.h>
+#import <MtProtoKit/MTApiEnvironment.h>
 
 static const NSTimeInterval MTTcpTransportSleepWatchdogTimeout = 60.0;
 
diff --git a/submodules/MtProtoKit/MTProtoKit/MTTime.m b/submodules/MtProtoKit/Sources/MTTime.m
similarity index 91%
rename from submodules/MtProtoKit/MTProtoKit/MTTime.m
rename to submodules/MtProtoKit/Sources/MTTime.m
index dfdcd92d33..4483d8a392 100644
--- a/submodules/MtProtoKit/MTProtoKit/MTTime.m
+++ b/submodules/MtProtoKit/Sources/MTTime.m
@@ -1,6 +1,4 @@
-
-
-#import "MTTime.h"
+#import <MtProtoKit/MTTime.h>
 
 #import <mach/mach_time.h>
 
diff --git a/submodules/MtProtoKit/MTProtoKit/MTTimeFixContext.m b/submodules/MtProtoKit/Sources/MTTimeFixContext.m
similarity index 92%
rename from submodules/MtProtoKit/MTProtoKit/MTTimeFixContext.m
rename to submodules/MtProtoKit/Sources/MTTimeFixContext.m
index 71f66fcb52..ba5b1afb34 100644
--- a/submodules/MtProtoKit/MTProtoKit/MTTimeFixContext.m
+++ b/submodules/MtProtoKit/Sources/MTTimeFixContext.m
@@ -1,4 +1,4 @@
-#import "MTTimeFixContext.h"
+#import <MtProtoKit/MTTimeFixContext.h>
 
 @implementation MTTimeFixContext
 
diff --git a/submodules/MtProtoKit/MTProtoKit/MTTimeSyncMessageService.m b/submodules/MtProtoKit/Sources/MTTimeSyncMessageService.m
similarity index 94%
rename from submodules/MtProtoKit/MTProtoKit/MTTimeSyncMessageService.m
rename to submodules/MtProtoKit/Sources/MTTimeSyncMessageService.m
index f78e824f2f..6d8919c176 100644
--- a/submodules/MtProtoKit/MTProtoKit/MTTimeSyncMessageService.m
+++ b/submodules/MtProtoKit/Sources/MTTimeSyncMessageService.m
@@ -1,16 +1,14 @@
+#import <MtProtoKit/MTTimeSyncMessageService.h>
 
-
-#import "MTTimeSyncMessageService.h"
-
-#import "MTTime.h"
-#import "MTContext.h"
-#import "MTProto.h"
-#import "MTSerialization.h"
-#import "MTOutgoingMessage.h"
-#import "MTIncomingMessage.h"
-#import "MTPreparedMessage.h"
-#import "MTMessageTransaction.h"
-#import "MTDatacenterSaltInfo.h"
+#import <MtProtoKit/MTTime.h>
+#import <MtProtoKit/MTContext.h>
+#import <MtProtoKit/MTProto.h>
+#import <MtProtoKit/MTSerialization.h>
+#import <MtProtoKit/MTOutgoingMessage.h>
+#import <MtProtoKit/MTIncomingMessage.h>
+#import <MtProtoKit/MTPreparedMessage.h>
+#import <MtProtoKit/MTMessageTransaction.h>
+#import <MtProtoKit/MTDatacenterSaltInfo.h>
 #import "MTBuffer.h"
 #import "MTFutureSaltsMessage.h"
 
diff --git a/submodules/MtProtoKit/MTProtoKit/MTTimer.m b/submodules/MtProtoKit/Sources/MTTimer.m
similarity index 98%
rename from submodules/MtProtoKit/MTProtoKit/MTTimer.m
rename to submodules/MtProtoKit/Sources/MTTimer.m
index 04e1f3e799..d0ce759f68 100644
--- a/submodules/MtProtoKit/MTProtoKit/MTTimer.m
+++ b/submodules/MtProtoKit/Sources/MTTimer.m
@@ -1,6 +1,4 @@
-
-
-#import "MTTimer.h"
+#import <MtProtoKit/MTTimer.h>
 
 @interface MTTimer ()
 
diff --git a/submodules/MtProtoKit/MTProtoKit/MTTransport.m b/submodules/MtProtoKit/Sources/MTTransport.m
similarity index 96%
rename from submodules/MtProtoKit/MTProtoKit/MTTransport.m
rename to submodules/MtProtoKit/Sources/MTTransport.m
index dc6e318815..9752eb6537 100644
--- a/submodules/MtProtoKit/MTProtoKit/MTTransport.m
+++ b/submodules/MtProtoKit/Sources/MTTransport.m
@@ -1,9 +1,7 @@
+#import <MtProtoKit/MTTransport.h>
 
-
-#import "MTTransport.h"
-
-#import "MTContext.h"
-#import "MTNetworkAvailability.h"
+#import <MtProtoKit/MTContext.h>
+#import <MtProtoKit/MTNetworkAvailability.h>
 
 @interface MTTransport () <MTNetworkAvailabilityDelegate>
 {
diff --git a/submodules/MtProtoKit/MTProtoKit/MTTransportScheme.m b/submodules/MtProtoKit/Sources/MTTransportScheme.m
similarity index 89%
rename from submodules/MtProtoKit/MTProtoKit/MTTransportScheme.m
rename to submodules/MtProtoKit/Sources/MTTransportScheme.m
index b52ba2559b..c5ee46126c 100644
--- a/submodules/MtProtoKit/MTProtoKit/MTTransportScheme.m
+++ b/submodules/MtProtoKit/Sources/MTTransportScheme.m
@@ -1,12 +1,10 @@
-#import "MTTransportScheme.h"
+#import <MtProtoKit/MTTransportScheme.h>
 
-#import "MTTransport.h"
-#import "MTDatacenterAddress.h"
-
-#import "MTTcpTransport.h"
-
-#import "MTContext.h"
-#import "MTApiEnvironment.h"
+#import <MtProtoKit/MTTransport.h>
+#import <MtProtoKit/MTDatacenterAddress.h>
+#import <MtProtoKit/MTTcpTransport.h>
+#import <MtProtoKit/MTContext.h>
+#import <MtProtoKit/MTApiEnvironment.h>
 
 @interface MTTransportScheme ()
 {
diff --git a/submodules/MtProtoKit/MTTransportSchemeStats.h b/submodules/MtProtoKit/Sources/MTTransportSchemeStats.h
similarity index 100%
rename from submodules/MtProtoKit/MTTransportSchemeStats.h
rename to submodules/MtProtoKit/Sources/MTTransportSchemeStats.h
diff --git a/submodules/MtProtoKit/MTTransportSchemeStats.m b/submodules/MtProtoKit/Sources/MTTransportSchemeStats.m
similarity index 98%
rename from submodules/MtProtoKit/MTTransportSchemeStats.m
rename to submodules/MtProtoKit/Sources/MTTransportSchemeStats.m
index caa89af580..b2d10b46d9 100644
--- a/submodules/MtProtoKit/MTTransportSchemeStats.m
+++ b/submodules/MtProtoKit/Sources/MTTransportSchemeStats.m
@@ -1,6 +1,6 @@
 #import "MTTransportSchemeStats.h"
 
-#import "MTDatacenterAddress.h"
+#import <MtProtoKit/MTDatacenterAddress.h>
 
 @implementation MTTransportSchemeStats
 
diff --git a/submodules/MtProtoKit/MTProtoKit/MTTransportTransaction.m b/submodules/MtProtoKit/Sources/MTTransportTransaction.m
similarity index 93%
rename from submodules/MtProtoKit/MTProtoKit/MTTransportTransaction.m
rename to submodules/MtProtoKit/Sources/MTTransportTransaction.m
index 93be090960..68ccb67ce0 100644
--- a/submodules/MtProtoKit/MTProtoKit/MTTransportTransaction.m
+++ b/submodules/MtProtoKit/Sources/MTTransportTransaction.m
@@ -1,6 +1,4 @@
-
-
-#import "MTTransportTransaction.h"
+#import <MtProtoKit/MTTransportTransaction.h>
 
 @implementation MTTransportTransaction
 
diff --git a/submodules/MtProtoKit/PingFoundation.h b/submodules/MtProtoKit/Sources/PingFoundation.h
similarity index 100%
rename from submodules/MtProtoKit/PingFoundation.h
rename to submodules/MtProtoKit/Sources/PingFoundation.h
diff --git a/submodules/MtProtoKit/PingFoundation.m b/submodules/MtProtoKit/Sources/PingFoundation.m
similarity index 100%
rename from submodules/MtProtoKit/PingFoundation.m
rename to submodules/MtProtoKit/Sources/PingFoundation.m
diff --git a/submodules/MurMurHash32/BUCK b/submodules/MurMurHash32/BUCK
new file mode 100644
index 0000000000..970767e33a
--- /dev/null
+++ b/submodules/MurMurHash32/BUCK
@@ -0,0 +1,19 @@
+load("//Config:buck_rule_macros.bzl", "static_library")
+
+static_library(
+    name = "MurMurHash32",
+    srcs = glob([
+        "Sources/*.m",
+    ]),
+    headers = glob([
+        "Sources/*.h",
+    ]),
+    exported_headers = glob([
+        "PublicHeaders/**/*.h",
+    ]),
+    deps = [
+    ],
+    frameworks = [
+        "$SDKROOT/System/Library/Frameworks/Foundation.framework",
+    ],
+)
diff --git a/submodules/MurMurHash32/BUILD b/submodules/MurMurHash32/BUILD
new file mode 100644
index 0000000000..6a24f18424
--- /dev/null
+++ b/submodules/MurMurHash32/BUILD
@@ -0,0 +1,21 @@
+
+objc_library(
+    name = "MurMurHash32",
+    enable_modules = True,
+    module_name = "MurMurHash32",
+    srcs = glob([
+        "Sources/*.m",
+    ]),
+    hdrs = glob([
+        "PublicHeaders/**/*.h",
+    ]),
+    includes = [
+        "PublicHeaders",
+    ],
+    sdk_frameworks = [
+      "Foundation",
+    ],
+    visibility = [
+        "//visibility:public",
+    ],
+)
diff --git a/submodules/Postbox/Sources/MurMurHash32.h b/submodules/MurMurHash32/PublicHeaders/MurMurHash32/MurMurHash32.h
similarity index 99%
rename from submodules/Postbox/Sources/MurMurHash32.h
rename to submodules/MurMurHash32/PublicHeaders/MurMurHash32/MurMurHash32.h
index 6b5ab89c3e..fe2840c17b 100644
--- a/submodules/Postbox/Sources/MurMurHash32.h
+++ b/submodules/MurMurHash32/PublicHeaders/MurMurHash32/MurMurHash32.h
@@ -7,6 +7,7 @@
 int32_t murMurHash32(void *bytes, int length);
 int32_t murMurHash32Data(NSData *data);
 int32_t murMurHashString32(const char *s);
+
 NSString *postboxTransformedString(CFStringRef string, bool replaceWithTransliteratedVersion, bool appendTransliteratedVersion);
 
 #endif
diff --git a/submodules/Postbox/Sources/MurMurHash32.m b/submodules/MurMurHash32/Sources/MurMurHash32.m
similarity index 98%
rename from submodules/Postbox/Sources/MurMurHash32.m
rename to submodules/MurMurHash32/Sources/MurMurHash32.m
index 87f695f017..9096171c74 100644
--- a/submodules/Postbox/Sources/MurMurHash32.m
+++ b/submodules/MurMurHash32/Sources/MurMurHash32.m
@@ -1,4 +1,4 @@
-#import "MurMurHash32.h"
+#import <MurMurHash32/MurMurHash32.h>
 
 #include <stdlib.h>
 #include <string.h>
diff --git a/submodules/MusicAlbumArtResources/BUILD b/submodules/MusicAlbumArtResources/BUILD
new file mode 100644
index 0000000000..229ebaec88
--- /dev/null
+++ b/submodules/MusicAlbumArtResources/BUILD
@@ -0,0 +1,19 @@
+load("@build_bazel_rules_swift//swift:swift.bzl", "swift_library")
+
+swift_library(
+    name = "MusicAlbumArtResources",
+    module_name = "MusicAlbumArtResources",
+    srcs = glob([
+		"Sources/**/*.swift",
+    ]),
+    deps = [
+    	"//submodules/TelegramCore:TelegramCore",
+        "//submodules/SyncCore:SyncCore",
+    	"//submodules/Postbox:Postbox",
+        "//submodules/SSignalKit/SwiftSignalKit:SwiftSignalKit",
+        "//submodules/UrlEscaping:UrlEscaping",
+    ],
+    visibility = [
+        "//visibility:public",
+    ],
+)
diff --git a/submodules/MusicAlbumArtResources/Info.plist b/submodules/MusicAlbumArtResources/Info.plist
deleted file mode 100644
index e1fe4cfb7b..0000000000
--- a/submodules/MusicAlbumArtResources/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/MusicAlbumArtResources/Sources/MusicAlbumArtResources.h b/submodules/MusicAlbumArtResources/Sources/MusicAlbumArtResources.h
deleted file mode 100644
index 2bfd4a8539..0000000000
--- a/submodules/MusicAlbumArtResources/Sources/MusicAlbumArtResources.h
+++ /dev/null
@@ -1,19 +0,0 @@
-//
-//  MusicAlbumArtResources.h
-//  MusicAlbumArtResources
-//
-//  Created by Peter on 8/12/19.
-//  Copyright © 2019 Telegram Messenger LLP. All rights reserved.
-//
-
-#import <UIKit/UIKit.h>
-
-//! Project version number for MusicAlbumArtResources.
-FOUNDATION_EXPORT double MusicAlbumArtResourcesVersionNumber;
-
-//! Project version string for MusicAlbumArtResources.
-FOUNDATION_EXPORT const unsigned char MusicAlbumArtResourcesVersionString[];
-
-// In this header, you should import all the public headers of your framework using statements like #import <MusicAlbumArtResources/PublicHeader.h>
-
-
diff --git a/submodules/NetworkLogging/BUCK b/submodules/NetworkLogging/BUCK
new file mode 100644
index 0000000000..4c1c68fe8b
--- /dev/null
+++ b/submodules/NetworkLogging/BUCK
@@ -0,0 +1,20 @@
+load("//Config:buck_rule_macros.bzl", "static_library")
+
+static_library(
+    name = "NetworkLogging",
+    srcs = glob([
+        "Sources/*.m",
+    ]),
+    headers = glob([
+        "Sources/*.h",
+    ]),
+    exported_headers = glob([
+        "PublicHeaders/**/*.h",
+    ]),
+    deps = [
+        "//submodules/MtProtoKit:MtProtoKit#shared",
+    ],
+    frameworks = [
+        "$SDKROOT/System/Library/Frameworks/Foundation.framework",
+    ],
+)
diff --git a/submodules/NetworkLogging/BUILD b/submodules/NetworkLogging/BUILD
new file mode 100644
index 0000000000..9996f41a3c
--- /dev/null
+++ b/submodules/NetworkLogging/BUILD
@@ -0,0 +1,24 @@
+
+objc_library(
+    name = "NetworkLogging",
+    enable_modules = True,
+    module_name = "NetworkLogging",
+    srcs = glob([
+        "Sources/*.m",
+    ]),
+    hdrs = glob([
+        "PublicHeaders/**/*.h",
+    ]),
+    includes = [
+        "PublicHeaders",
+    ],
+    deps = [
+        "//submodules/MtProtoKit:MtProtoKit",
+    ],
+    sdk_frameworks = [
+      "Foundation",
+    ],
+    visibility = [
+        "//visibility:public",
+    ],
+)
diff --git a/submodules/TelegramCore/Sources/NetworkLogging.h b/submodules/NetworkLogging/PublicHeaders/NetworkLogging/NetworkLogging.h
similarity index 100%
rename from submodules/TelegramCore/Sources/NetworkLogging.h
rename to submodules/NetworkLogging/PublicHeaders/NetworkLogging/NetworkLogging.h
diff --git a/submodules/TelegramCore/Sources/NetworkLogging.m b/submodules/NetworkLogging/Sources/NetworkLogging.m
similarity index 93%
rename from submodules/TelegramCore/Sources/NetworkLogging.m
rename to submodules/NetworkLogging/Sources/NetworkLogging.m
index 710c71d5d0..9b84c551de 100644
--- a/submodules/TelegramCore/Sources/NetworkLogging.m
+++ b/submodules/NetworkLogging/Sources/NetworkLogging.m
@@ -1,8 +1,7 @@
-#import "NetworkLogging.h"
+#import <NetworkLogging/NetworkLogging.h>
 
 #import <Foundation/Foundation.h>
-
-#import <MtProtoKit/MtProtoKit.h>
+#import <MtProtoKit/MtLogging.h>
 
 static void (*bridgingTrace)(NSString *, NSString *);
 void setBridgingTraceFunction(void (*f)(NSString *, NSString *)) {
diff --git a/submodules/NotificationMuteSettingsUI/BUILD b/submodules/NotificationMuteSettingsUI/BUILD
new file mode 100644
index 0000000000..d810c8f4bf
--- /dev/null
+++ b/submodules/NotificationMuteSettingsUI/BUILD
@@ -0,0 +1,20 @@
+load("@build_bazel_rules_swift//swift:swift.bzl", "swift_library")
+
+swift_library(
+    name = "NotificationMuteSettingsUI",
+    module_name = "NotificationMuteSettingsUI",
+    srcs = glob([
+		"Sources/**/*.swift",
+    ]),
+    deps = [
+    	"//submodules/Display:Display",
+        "//submodules/Postbox:Postbox",
+        "//submodules/TelegramCore:TelegramCore",
+        "//submodules/SyncCore:SyncCore",
+        "//submodules/TelegramPresentationData:TelegramPresentationData",
+        "//submodules/TelegramStringFormatting:TelegramStringFormatting",
+    ],
+    visibility = [
+        "//visibility:public",
+    ],
+)
diff --git a/submodules/NotificationMuteSettingsUI/Info.plist b/submodules/NotificationMuteSettingsUI/Info.plist
deleted file mode 100644
index e1fe4cfb7b..0000000000
--- a/submodules/NotificationMuteSettingsUI/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/NotificationMuteSettingsUI/Sources/NotificationMuteSettingsUI.h b/submodules/NotificationMuteSettingsUI/Sources/NotificationMuteSettingsUI.h
deleted file mode 100644
index e690a96e31..0000000000
--- a/submodules/NotificationMuteSettingsUI/Sources/NotificationMuteSettingsUI.h
+++ /dev/null
@@ -1,19 +0,0 @@
-//
-//  NotificationMuteSettingsUI.h
-//  NotificationMuteSettingsUI
-//
-//  Created by Peter on 8/15/19.
-//  Copyright © 2019 Telegram Messenger LLP. All rights reserved.
-//
-
-#import <UIKit/UIKit.h>
-
-//! Project version number for NotificationMuteSettingsUI.
-FOUNDATION_EXPORT double NotificationMuteSettingsUIVersionNumber;
-
-//! Project version string for NotificationMuteSettingsUI.
-FOUNDATION_EXPORT const unsigned char NotificationMuteSettingsUIVersionString[];
-
-// In this header, you should import all the public headers of your framework using statements like #import <NotificationMuteSettingsUI/PublicHeader.h>
-
-
diff --git a/submodules/NotificationSoundSelectionUI/BUILD b/submodules/NotificationSoundSelectionUI/BUILD
new file mode 100644
index 0000000000..66f1b43188
--- /dev/null
+++ b/submodules/NotificationSoundSelectionUI/BUILD
@@ -0,0 +1,24 @@
+load("@build_bazel_rules_swift//swift:swift.bzl", "swift_library")
+
+swift_library(
+    name = "NotificationSoundSelectionUI",
+    module_name = "NotificationSoundSelectionUI",
+    srcs = glob([
+		"Sources/**/*.swift",
+    ]),
+    deps = [
+    	"//submodules/SSignalKit/SwiftSignalKit:SwiftSignalKit",
+        "//submodules/Display:Display",
+        "//submodules/Postbox:Postbox",
+        "//submodules/TelegramCore:TelegramCore",
+        "//submodules/SyncCore:SyncCore",
+        "//submodules/TelegramPresentationData:TelegramPresentationData",
+        "//submodules/ItemListUI:ItemListUI",
+        "//submodules/AccountContext:AccountContext",
+        "//submodules/TelegramStringFormatting:TelegramStringFormatting",
+        "//submodules/PresentationDataUtils:PresentationDataUtils",
+    ],
+    visibility = [
+        "//visibility:public",
+    ],
+)
diff --git a/submodules/NotificationSoundSelectionUI/Info.plist b/submodules/NotificationSoundSelectionUI/Info.plist
deleted file mode 100644
index e1fe4cfb7b..0000000000
--- a/submodules/NotificationSoundSelectionUI/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/NotificationSoundSelectionUI/Sources/NotificationSoundSelectionUI.h b/submodules/NotificationSoundSelectionUI/Sources/NotificationSoundSelectionUI.h
deleted file mode 100644
index 42b5c59b45..0000000000
--- a/submodules/NotificationSoundSelectionUI/Sources/NotificationSoundSelectionUI.h
+++ /dev/null
@@ -1,19 +0,0 @@
-//
-//  NotificationSoundSelectionUI.h
-//  NotificationSoundSelectionUI
-//
-//  Created by Peter on 8/15/19.
-//  Copyright © 2019 Telegram Messenger LLP. All rights reserved.
-//
-
-#import <UIKit/UIKit.h>
-
-//! Project version number for NotificationSoundSelectionUI.
-FOUNDATION_EXPORT double NotificationSoundSelectionUIVersionNumber;
-
-//! Project version string for NotificationSoundSelectionUI.
-FOUNDATION_EXPORT const unsigned char NotificationSoundSelectionUIVersionString[];
-
-// In this header, you should import all the public headers of your framework using statements like #import <NotificationSoundSelectionUI/PublicHeader.h>
-
-
diff --git a/submodules/NotificationsPresentationData/BUILD b/submodules/NotificationsPresentationData/BUILD
new file mode 100644
index 0000000000..7bc884bb37
--- /dev/null
+++ b/submodules/NotificationsPresentationData/BUILD
@@ -0,0 +1,12 @@
+load("@build_bazel_rules_swift//swift:swift.bzl", "swift_library")
+
+swift_library(
+    name = "NotificationsPresentationData",
+    module_name = "NotificationsPresentationData",
+    srcs = glob([
+		"Sources/**/*.swift",
+    ]),
+    visibility = [
+        "//visibility:public",
+    ],
+)
diff --git a/submodules/NumberPluralizationForm/BUCK b/submodules/NumberPluralizationForm/BUCK
new file mode 100644
index 0000000000..53a8e7cd9f
--- /dev/null
+++ b/submodules/NumberPluralizationForm/BUCK
@@ -0,0 +1,14 @@
+load("//Config:buck_rule_macros.bzl", "static_library")
+
+static_library(
+    name = "NumberPluralizationForm",
+    srcs = glob([
+        "Sources/*.m",
+    ]),
+    exported_headers = glob([
+        "PublicHeaders/**/*.h",
+    ]),
+    frameworks = [
+        "$SDKROOT/System/Library/Frameworks/Foundation.framework",
+    ],
+)
diff --git a/submodules/NumberPluralizationForm/BUILD b/submodules/NumberPluralizationForm/BUILD
new file mode 100644
index 0000000000..4a690328d0
--- /dev/null
+++ b/submodules/NumberPluralizationForm/BUILD
@@ -0,0 +1,21 @@
+
+objc_library(
+    name = "NumberPluralizationForm",
+    enable_modules = True,
+    module_name = "NumberPluralizationForm",
+    srcs = glob([
+        "Sources/*.m",
+    ]),
+    hdrs = glob([
+        "PublicHeaders/**/*.h",
+    ]),
+    includes = [
+      "PublicHeaders",
+    ],
+    sdk_frameworks = [
+      "Foundation",
+    ],
+    visibility = [
+        "//visibility:public",
+    ],
+)
diff --git a/submodules/StringPluralization/Sources/NumberPluralizationForm.h b/submodules/NumberPluralizationForm/PublicHeaders/NumberPluralizationForm/NumberPluralizationForm.h
similarity index 100%
rename from submodules/StringPluralization/Sources/NumberPluralizationForm.h
rename to submodules/NumberPluralizationForm/PublicHeaders/NumberPluralizationForm/NumberPluralizationForm.h
diff --git a/submodules/StringPluralization/Sources/NumberPluralizationForm.m b/submodules/NumberPluralizationForm/Sources/NumberPluralizationForm.m
similarity index 99%
rename from submodules/StringPluralization/Sources/NumberPluralizationForm.m
rename to submodules/NumberPluralizationForm/Sources/NumberPluralizationForm.m
index 47f33f9224..e79cfc5381 100644
--- a/submodules/StringPluralization/Sources/NumberPluralizationForm.m
+++ b/submodules/NumberPluralizationForm/Sources/NumberPluralizationForm.m
@@ -1,4 +1,4 @@
-#import "NumberPluralizationForm.h"
+#import <NumberPluralizationForm/NumberPluralizationForm.h>
 
 NumberPluralizationForm numberPluralizationForm(unsigned int lc, int n) {
     switch (lc) {
diff --git a/submodules/ObjCRuntimeUtils/BUCK b/submodules/ObjCRuntimeUtils/BUCK
new file mode 100644
index 0000000000..5e8f8d4084
--- /dev/null
+++ b/submodules/ObjCRuntimeUtils/BUCK
@@ -0,0 +1,15 @@
+load("//Config:buck_rule_macros.bzl", "static_library")
+
+static_library(
+    name = "ObjCRuntimeUtils",
+    srcs = glob([
+        "Source/ObjCRuntimeUtils/*.m",
+    ]),
+    exported_headers = glob([
+        "Source/ObjCRuntimeUtils/*.h",
+    ]),
+    frameworks = [
+        "$SDKROOT/System/Library/Frameworks/Foundation.framework",
+        "$SDKROOT/System/Library/Frameworks/UIKit.framework",
+    ],
+)
diff --git a/submodules/ObjCRuntimeUtils/BUILD b/submodules/ObjCRuntimeUtils/BUILD
new file mode 100644
index 0000000000..f692527feb
--- /dev/null
+++ b/submodules/ObjCRuntimeUtils/BUILD
@@ -0,0 +1,22 @@
+
+objc_library(
+    name = "ObjCRuntimeUtils",
+    enable_modules = True,
+    module_name = "ObjCRuntimeUtils",
+    srcs = glob([
+        "Source/ObjCRuntimeUtils/*.m",
+    ]),
+    hdrs = glob([
+        "Source/ObjCRuntimeUtils/*.h",
+    ]),
+    includes = [
+      "Source",
+    ],
+    sdk_frameworks = [
+      "Foundation",
+      "UIKit",
+    ],
+    visibility = [
+        "//visibility:public",
+    ],
+)
diff --git a/submodules/Display/Display/RuntimeUtils.h b/submodules/ObjCRuntimeUtils/Source/ObjCRuntimeUtils/RuntimeUtils.h
similarity index 100%
rename from submodules/Display/Display/RuntimeUtils.h
rename to submodules/ObjCRuntimeUtils/Source/ObjCRuntimeUtils/RuntimeUtils.h
diff --git a/submodules/Display/Display/RuntimeUtils.m b/submodules/ObjCRuntimeUtils/Source/ObjCRuntimeUtils/RuntimeUtils.m
similarity index 100%
rename from submodules/Display/Display/RuntimeUtils.m
rename to submodules/ObjCRuntimeUtils/Source/ObjCRuntimeUtils/RuntimeUtils.m
diff --git a/submodules/OpenInExternalAppUI/BUILD b/submodules/OpenInExternalAppUI/BUILD
new file mode 100644
index 0000000000..11016974a2
--- /dev/null
+++ b/submodules/OpenInExternalAppUI/BUILD
@@ -0,0 +1,25 @@
+load("@build_bazel_rules_swift//swift:swift.bzl", "swift_library")
+
+swift_library(
+    name = "OpenInExternalAppUI",
+    module_name = "OpenInExternalAppUI",
+    srcs = glob([
+		"Sources/**/*.swift",
+    ]),
+    deps = [
+        "//submodules/SSignalKit/SwiftSignalKit:SwiftSignalKit",
+        "//submodules/AsyncDisplayKit:AsyncDisplayKit",
+        "//submodules/Display:Display",
+        "//submodules/Postbox:Postbox",
+        "//submodules/TelegramCore:TelegramCore",
+        "//submodules/SyncCore:SyncCore",
+        "//submodules/AccountContext:AccountContext",
+        "//submodules/TelegramPresentationData:TelegramPresentationData",
+        "//submodules/PhotoResources:PhotoResources",
+        "//submodules/UrlEscaping:UrlEscaping",
+        "//submodules/AppBundle:AppBundle",
+    ],
+    visibility = [
+        "//visibility:public",
+    ],
+)
diff --git a/submodules/OpenInExternalAppUI/Info.plist b/submodules/OpenInExternalAppUI/Info.plist
deleted file mode 100644
index e1fe4cfb7b..0000000000
--- a/submodules/OpenInExternalAppUI/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/OpenInExternalAppUI/Sources/OpenInExternalAppUI.h b/submodules/OpenInExternalAppUI/Sources/OpenInExternalAppUI.h
deleted file mode 100644
index fa78128498..0000000000
--- a/submodules/OpenInExternalAppUI/Sources/OpenInExternalAppUI.h
+++ /dev/null
@@ -1,19 +0,0 @@
-//
-//  OpenInExternalAppUI.h
-//  OpenInExternalAppUI
-//
-//  Created by Peter on 8/12/19.
-//  Copyright © 2019 Telegram Messenger LLP. All rights reserved.
-//
-
-#import <UIKit/UIKit.h>
-
-//! Project version number for OpenInExternalAppUI.
-FOUNDATION_EXPORT double OpenInExternalAppUIVersionNumber;
-
-//! Project version string for OpenInExternalAppUI.
-FOUNDATION_EXPORT const unsigned char OpenInExternalAppUIVersionString[];
-
-// In this header, you should import all the public headers of your framework using statements like #import <OpenInExternalAppUI/PublicHeader.h>
-
-
diff --git a/submodules/OpenSSLEncryptionProvider/BUCK b/submodules/OpenSSLEncryptionProvider/BUCK
index b8582ad887..6c38b32dc0 100644
--- a/submodules/OpenSSLEncryptionProvider/BUCK
+++ b/submodules/OpenSSLEncryptionProvider/BUCK
@@ -9,7 +9,7 @@ static_library(
         "Sources/**/*.h",
     ]),
     exported_headers = glob([
-        "Sources/**/*.h",
+        "PublicHeaders/**/*.h",
     ]),
     deps = [
         "//submodules/EncryptionProvider:EncryptionProvider",
diff --git a/submodules/OpenSSLEncryptionProvider/BUILD b/submodules/OpenSSLEncryptionProvider/BUILD
new file mode 100644
index 0000000000..148b55c089
--- /dev/null
+++ b/submodules/OpenSSLEncryptionProvider/BUILD
@@ -0,0 +1,26 @@
+
+objc_library(
+    name = "OpenSSLEncryptionProvider",
+    enable_modules = True,
+    module_name = "OpenSSLEncryptionProvider",
+    srcs = glob([
+        "Sources/**/*.m",
+        "Sources/**/*.h",
+    ]),
+    hdrs = glob([
+        "PublicHeaders/**/*.h",
+    ]),
+    includes = [
+        "PublicHeaders",
+    ],
+    deps = [
+        "//submodules/EncryptionProvider:EncryptionProvider",
+        "//submodules/openssl:openssl",
+    ],
+    sdk_frameworks = [
+        "Foundation",
+    ],
+    visibility = [
+        "//visibility:public",
+    ],
+)
diff --git a/submodules/OpenSSLEncryptionProvider/Sources/OpenSSLEncryptionProvider.h b/submodules/OpenSSLEncryptionProvider/PublicHeaders/OpenSSLEncryptionProvider/OpenSSLEncryptionProvider.h
similarity index 100%
rename from submodules/OpenSSLEncryptionProvider/Sources/OpenSSLEncryptionProvider.h
rename to submodules/OpenSSLEncryptionProvider/PublicHeaders/OpenSSLEncryptionProvider/OpenSSLEncryptionProvider.h
diff --git a/submodules/OpenSSLEncryptionProvider/Sources/OpenSSLEncryptionProvider.m b/submodules/OpenSSLEncryptionProvider/Sources/OpenSSLEncryptionProvider.m
index 1acb5c69fa..ce2545a570 100644
--- a/submodules/OpenSSLEncryptionProvider/Sources/OpenSSLEncryptionProvider.m
+++ b/submodules/OpenSSLEncryptionProvider/Sources/OpenSSLEncryptionProvider.m
@@ -1,4 +1,4 @@
-#import "OpenSSLEncryptionProvider.h"
+#import <OpenSSLEncryptionProvider/OpenSSLEncryptionProvider.h>
 
 #import <openssl/bn.h>
 #import <openssl/rsa.h>
diff --git a/submodules/Opus/BUCK b/submodules/Opus/BUCK
index 13c082a367..5d0591fb7f 100644
--- a/submodules/Opus/BUCK
+++ b/submodules/Opus/BUCK
@@ -33,7 +33,7 @@ static_library(
         "Sources/**/*.swift",
     ]),
     exported_headers = glob([
-        "Sources/**/*.h",
+        "Public/**/*.h",
     ]),
     deps = [
         ":opus_lib",
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/BUCK b/submodules/OpusBinding/BUCK
index acebbafd3c..165c852e46 100644
--- a/submodules/OpusBinding/BUCK
+++ b/submodules/OpusBinding/BUCK
@@ -9,9 +9,9 @@ static_library(
     headers = {
         "ogg/ogg.h": "Sources/ogg/ogg.h",
         "ogg/os_types.h": "Sources/ogg/os_types.h",
-        "OggOpusReader.h": "Sources/OggOpusReader.h",
-        "TGDataItem.h": "Sources/TGDataItem.h",
-        "TGOggOpusWriter.h": "Sources/TGOggOpusWriter.h",
+        "OggOpusReader.h": "PublicHeaders/OpusBinding/OggOpusReader.h",
+        "TGDataItem.h": "PublicHeaders/OpusBinding/TGDataItem.h",
+        "TGOggOpusWriter.h": "PublicHeaders/OpusBinding/TGOggOpusWriter.h",
         "opusenc/diag_range.h": "Sources/opusenc/diag_range.h",
         "opusenc/opus_header.h": "Sources/opusenc/opus_header.h",
         "opusenc/picture.h": "Sources/opusenc/picture.h",
@@ -19,11 +19,9 @@ static_library(
         "opusfile/internal.h": "Sources/opusfile/internal.h",
         "OpusBinding/opusfile.h": "Sources/opusfile/opusfile.h",
     },
-    exported_headers = [
-        "Sources/TGDataItem.h",
-        "Sources/TGOggOpusWriter.h",
-        "Sources/OggOpusReader.h",
-    ],
+    exported_headers = glob([
+        "PublicHeaders/**/*.h",
+    ]),
     deps = [
         "//submodules/Opus:opus",
     ],
diff --git a/submodules/OpusBinding/BUILD b/submodules/OpusBinding/BUILD
new file mode 100644
index 0000000000..4fe2766388
--- /dev/null
+++ b/submodules/OpusBinding/BUILD
@@ -0,0 +1,31 @@
+
+objc_library(
+    name = "OpusBinding",
+    enable_modules = True,
+    module_name = "OpusBinding",
+    srcs = glob([
+        "Sources/**/*.m",
+        "Sources/**/*.c",
+        "Sources/**/*.h",
+    ]),
+    hdrs = glob([
+        "PublicHeaders/**/*.h",
+    ]),
+    includes = [
+        "PublicHeaders",
+    ],
+    copts = [
+        "-I{}/Sources".format(package_name()),
+        "-I{}/Sources/opusfile".format(package_name()),
+        "-I{}/PublicHeaders/OpusBinding".format(package_name()),
+    ],
+    deps = [
+        "//submodules/Opus:opus",
+    ],
+    sdk_frameworks = [
+        "Foundation",
+    ],
+    visibility = [
+        "//visibility:public",
+    ],
+)
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/OpusBinding/Sources/OggOpusReader.h b/submodules/OpusBinding/PublicHeaders/OpusBinding/OggOpusReader.h
similarity index 100%
rename from submodules/OpusBinding/Sources/OggOpusReader.h
rename to submodules/OpusBinding/PublicHeaders/OpusBinding/OggOpusReader.h
diff --git a/submodules/OpusBinding/PublicHeaders/OpusBinding/OpusBinding.h b/submodules/OpusBinding/PublicHeaders/OpusBinding/OpusBinding.h
new file mode 100644
index 0000000000..30524dbcbd
--- /dev/null
+++ b/submodules/OpusBinding/PublicHeaders/OpusBinding/OpusBinding.h
@@ -0,0 +1,5 @@
+#import <Foundation/Foundation.h>
+
+#import <OpusBinding/OggOpusReader.h>
+#import <OpusBinding/TGDataItem.h>
+#import <OpusBinding/TGOggOpusWriter.h>
\ No newline at end of file
diff --git a/submodules/OpusBinding/Sources/TGDataItem.h b/submodules/OpusBinding/PublicHeaders/OpusBinding/TGDataItem.h
similarity index 100%
rename from submodules/OpusBinding/Sources/TGDataItem.h
rename to submodules/OpusBinding/PublicHeaders/OpusBinding/TGDataItem.h
diff --git a/submodules/OpusBinding/Sources/TGOggOpusWriter.h b/submodules/OpusBinding/PublicHeaders/OpusBinding/TGOggOpusWriter.h
similarity index 100%
rename from submodules/OpusBinding/Sources/TGOggOpusWriter.h
rename to submodules/OpusBinding/PublicHeaders/OpusBinding/TGOggOpusWriter.h
diff --git a/submodules/OpusBinding/Sources/opusfile/internal.h b/submodules/OpusBinding/Sources/opusfile/internal.h
index 2487cf25db..b1109deb90 100644
--- a/submodules/OpusBinding/Sources/opusfile/internal.h
+++ b/submodules/OpusBinding/Sources/opusfile/internal.h
@@ -29,7 +29,7 @@
 # endif
 
 # include <stdlib.h>
-# include <OpusBinding/opusfile.h>
+# include "opusfile.h"
 
 typedef struct OggOpusLink OggOpusLink;
 
diff --git a/submodules/OverlayStatusController/BUCK b/submodules/OverlayStatusController/BUCK
index a148ac0dd5..4345130a54 100644
--- a/submodules/OverlayStatusController/BUCK
+++ b/submodules/OverlayStatusController/BUCK
@@ -12,16 +12,10 @@ static_library(
     name = "OverlayStatusController",
     srcs = glob([
         "Sources/**/*.swift",
-	"Sources/**/*.m",
-    ]),
-    headers = glob([
-        "Sources/**/*.h",
-    ]),
-    exported_headers = glob([
-        "Sources/**/*.h",
     ]),
     deps = [
     	"//submodules/Display:Display#shared",
+        "//submodules/OverlayStatusController/Impl:OverlayStatusControllerImpl",
     ],
     frameworks = [
         "$SDKROOT/System/Library/Frameworks/Foundation.framework",
diff --git a/submodules/OverlayStatusController/BUILD b/submodules/OverlayStatusController/BUILD
new file mode 100644
index 0000000000..e28e643223
--- /dev/null
+++ b/submodules/OverlayStatusController/BUILD
@@ -0,0 +1,24 @@
+load("@build_bazel_rules_swift//swift:swift.bzl", "swift_library")
+
+filegroup(
+    name = "OverlayStatusControllerResources",
+    srcs = glob([
+        "Resources/**/*",
+    ], exclude = ["Resources/**/.*"]),
+    visibility = ["//visibility:public"],
+)
+
+swift_library(
+    name = "OverlayStatusController",
+    module_name = "OverlayStatusController",
+    srcs = glob([
+        "Sources/**/*.swift",
+    ]),
+    deps = [
+        "//submodules/Display:Display",
+        "//submodules/OverlayStatusController/Impl:OverlayStatusControllerImpl"
+    ],
+    visibility = [
+        "//visibility:public",
+    ],
+)
diff --git a/submodules/OverlayStatusController/Impl/BUCK b/submodules/OverlayStatusController/Impl/BUCK
new file mode 100644
index 0000000000..a6b891f28b
--- /dev/null
+++ b/submodules/OverlayStatusController/Impl/BUCK
@@ -0,0 +1,15 @@
+load("//Config:buck_rule_macros.bzl", "static_library")
+
+static_library(
+    name = "OverlayStatusControllerImpl",
+    srcs = glob([
+        "Sources/**/*.m",
+    ]),
+    exported_headers = glob([
+        "Sources/**/*.h",
+    ]),
+    frameworks = [
+        "$SDKROOT/System/Library/Frameworks/Foundation.framework",
+        "$SDKROOT/System/Library/Frameworks/UIKit.framework",
+    ],
+)
diff --git a/submodules/OverlayStatusController/Impl/BUILD b/submodules/OverlayStatusController/Impl/BUILD
new file mode 100644
index 0000000000..7598e00f8a
--- /dev/null
+++ b/submodules/OverlayStatusController/Impl/BUILD
@@ -0,0 +1,17 @@
+
+objc_library(
+    name = "OverlayStatusControllerImpl",
+    module_name = "OverlayStatusControllerImpl",
+    srcs = glob([
+        "Sources/**/*.m",
+    ]),
+    hdrs = glob([
+        "Sources/**/*.h",
+    ]),
+    includes = [
+        "Sources",
+    ],
+    visibility = [
+        "//visibility:public",
+    ],
+)
diff --git a/submodules/OverlayStatusController/Sources/ProgressSpinnerView.h b/submodules/OverlayStatusController/Impl/Sources/OverlayStatusControllerImpl/ProgressSpinnerView.h
similarity index 100%
rename from submodules/OverlayStatusController/Sources/ProgressSpinnerView.h
rename to submodules/OverlayStatusController/Impl/Sources/OverlayStatusControllerImpl/ProgressSpinnerView.h
diff --git a/submodules/OverlayStatusController/Sources/ProgressSpinnerView.m b/submodules/OverlayStatusController/Impl/Sources/OverlayStatusControllerImpl/ProgressSpinnerView.m
similarity index 100%
rename from submodules/OverlayStatusController/Sources/ProgressSpinnerView.m
rename to submodules/OverlayStatusController/Impl/Sources/OverlayStatusControllerImpl/ProgressSpinnerView.m
diff --git a/submodules/OverlayStatusController/Sources/ProgressWindow.h b/submodules/OverlayStatusController/Impl/Sources/OverlayStatusControllerImpl/ProgressWindow.h
similarity index 100%
rename from submodules/OverlayStatusController/Sources/ProgressWindow.h
rename to submodules/OverlayStatusController/Impl/Sources/OverlayStatusControllerImpl/ProgressWindow.h
diff --git a/submodules/OverlayStatusController/Sources/ProgressWindow.m b/submodules/OverlayStatusController/Impl/Sources/OverlayStatusControllerImpl/ProgressWindow.m
similarity index 100%
rename from submodules/OverlayStatusController/Sources/ProgressWindow.m
rename to submodules/OverlayStatusController/Impl/Sources/OverlayStatusControllerImpl/ProgressWindow.m
diff --git a/submodules/OverlayStatusController/Sources/ProxyWindow.h b/submodules/OverlayStatusController/Impl/Sources/OverlayStatusControllerImpl/ProxyWindow.h
similarity index 100%
rename from submodules/OverlayStatusController/Sources/ProxyWindow.h
rename to submodules/OverlayStatusController/Impl/Sources/OverlayStatusControllerImpl/ProxyWindow.h
diff --git a/submodules/OverlayStatusController/Sources/ProxyWindow.m b/submodules/OverlayStatusController/Impl/Sources/OverlayStatusControllerImpl/ProxyWindow.m
similarity index 100%
rename from submodules/OverlayStatusController/Sources/ProxyWindow.m
rename to submodules/OverlayStatusController/Impl/Sources/OverlayStatusControllerImpl/ProxyWindow.m
diff --git a/submodules/OverlayStatusController/Sources/OverlayStatusController.swift b/submodules/OverlayStatusController/Sources/OverlayStatusController.swift
index 7f1bc3e084..3a3011c947 100644
--- a/submodules/OverlayStatusController/Sources/OverlayStatusController.swift
+++ b/submodules/OverlayStatusController/Sources/OverlayStatusController.swift
@@ -2,6 +2,7 @@ import Foundation
 import UIKit
 import Display
 import AppBundle
+import OverlayStatusControllerImpl
 
 public enum OverlayStatusControllerType {
     case loading(cancelled: (() -> Void)?)
diff --git a/submodules/PKCS/BUCK b/submodules/PKCS/BUCK
index b699dbded7..e30546631f 100644
--- a/submodules/PKCS/BUCK
+++ b/submodules/PKCS/BUCK
@@ -9,7 +9,7 @@ static_library(
         "Sources/**/*.h",
     ]),
     exported_headers = glob([
-        "Sources/**/*.h",
+        "PublicHeaders/**/*.h",
     ]),
     deps = [
         "//submodules/openssl:openssl",
diff --git a/submodules/PKCS/BUILD b/submodules/PKCS/BUILD
new file mode 100644
index 0000000000..e1f30e1438
--- /dev/null
+++ b/submodules/PKCS/BUILD
@@ -0,0 +1,25 @@
+
+objc_library(
+    name = "PKCS",
+    enable_modules = True,
+    module_name = "PKCS",
+    srcs = glob([
+        "Sources/**/*.m",
+        "Sources/**/*.h",
+    ]),
+    hdrs = glob([
+        "PublicHeaders/**/*.h",
+    ]),
+    includes = [
+        "PublicHeaders",
+    ],
+    deps = [
+        "//submodules/openssl:openssl",
+    ],
+    sdk_frameworks = [
+        "Foundation",
+    ],
+    visibility = [
+        "//visibility:public",
+    ],
+)
diff --git a/submodules/PKCS/Sources/MTPKCS.h b/submodules/PKCS/PublicHeaders/PKCS/PKCS.h
similarity index 100%
rename from submodules/PKCS/Sources/MTPKCS.h
rename to submodules/PKCS/PublicHeaders/PKCS/PKCS.h
diff --git a/submodules/PKCS/Sources/MTPKCS.m b/submodules/PKCS/Sources/PKCS.m
similarity index 99%
rename from submodules/PKCS/Sources/MTPKCS.m
rename to submodules/PKCS/Sources/PKCS.m
index 100010aa04..a6bdd1f9fc 100644
--- a/submodules/PKCS/Sources/MTPKCS.m
+++ b/submodules/PKCS/Sources/PKCS.m
@@ -1,4 +1,4 @@
-#import "MTPKCS.h"
+#import <PKCS/PKCS.h>
 
 #include <openssl/x509.h>
 #include <openssl/pkcs7.h>
diff --git a/submodules/PasscodeInputFieldNode/BUILD b/submodules/PasscodeInputFieldNode/BUILD
new file mode 100644
index 0000000000..e44fe77ad8
--- /dev/null
+++ b/submodules/PasscodeInputFieldNode/BUILD
@@ -0,0 +1,17 @@
+load("@build_bazel_rules_swift//swift:swift.bzl", "swift_library")
+
+swift_library(
+    name = "PasscodeInputFieldNode",
+    module_name = "PasscodeInputFieldNode",
+    srcs = glob([
+		"Sources/**/*.swift",
+    ]),
+    deps = [
+        "//submodules/SSignalKit/SwiftSignalKit:SwiftSignalKit",
+        "//submodules/AsyncDisplayKit:AsyncDisplayKit",
+        "//submodules/Display:Display",
+    ],
+    visibility = [
+        "//visibility:public",
+    ],
+)
diff --git a/submodules/PasscodeInputFieldNode/Info.plist b/submodules/PasscodeInputFieldNode/Info.plist
deleted file mode 100644
index e1fe4cfb7b..0000000000
--- a/submodules/PasscodeInputFieldNode/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/PasscodeInputFieldNode/Sources/PasscodeInputFieldNode.h b/submodules/PasscodeInputFieldNode/Sources/PasscodeInputFieldNode.h
deleted file mode 100644
index 62f02bccf8..0000000000
--- a/submodules/PasscodeInputFieldNode/Sources/PasscodeInputFieldNode.h
+++ /dev/null
@@ -1,11 +0,0 @@
-#import <UIKit/UIKit.h>
-
-//! Project version number for PasscodeInputFieldNode.
-FOUNDATION_EXPORT double PasscodeInputFieldNodeVersionNumber;
-
-//! Project version string for PasscodeInputFieldNode.
-FOUNDATION_EXPORT const unsigned char PasscodeInputFieldNodeVersionString[];
-
-// In this header, you should import all the public headers of your framework using statements like #import <PasscodeInputFieldNode/PublicHeader.h>
-
-
diff --git a/submodules/PasscodeUI/BUILD b/submodules/PasscodeUI/BUILD
new file mode 100644
index 0000000000..60825d4832
--- /dev/null
+++ b/submodules/PasscodeUI/BUILD
@@ -0,0 +1,30 @@
+load("@build_bazel_rules_swift//swift:swift.bzl", "swift_library")
+
+swift_library(
+    name = "PasscodeUI",
+    module_name = "PasscodeUI",
+    srcs = glob([
+		"Sources/**/*.swift",
+    ]),
+    deps = [
+        "//submodules/SSignalKit/SwiftSignalKit:SwiftSignalKit",
+        "//submodules/AsyncDisplayKit:AsyncDisplayKit",
+        "//submodules/Display:Display",
+        "//submodules/Postbox:Postbox",
+        "//submodules/TelegramCore:TelegramCore",
+        "//submodules/SyncCore:SyncCore",
+        "//submodules/TelegramPresentationData:TelegramPresentationData",
+        "//submodules/TelegramUIPreferences:TelegramUIPreferences",
+        "//submodules/AccountContext:AccountContext",
+        "//submodules/LocalAuth:LocalAuth",
+        "//submodules/LegacyComponents:LegacyComponents",
+        "//submodules/TelegramStringFormatting:TelegramStringFormatting",
+        "//submodules/ImageBlur:ImageBlur",
+        "//submodules/AppBundle:AppBundle",
+        "//submodules/PasscodeInputFieldNode:PasscodeInputFieldNode",
+        "//submodules/MonotonicTime:MonotonicTime",
+    ],
+    visibility = [
+        "//visibility:public",
+    ],
+)
diff --git a/submodules/PasscodeUI/Info.plist b/submodules/PasscodeUI/Info.plist
deleted file mode 100644
index e1fe4cfb7b..0000000000
--- a/submodules/PasscodeUI/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/PasscodeUI/Sources/PasscodeBackground.swift b/submodules/PasscodeUI/Sources/PasscodeBackground.swift
index 4fa29bc85a..41bed65bbe 100644
--- a/submodules/PasscodeUI/Sources/PasscodeBackground.swift
+++ b/submodules/PasscodeUI/Sources/PasscodeBackground.swift
@@ -2,6 +2,7 @@ import Foundation
 import UIKit
 import Display
 import ImageBlur
+import FastBlur
 
 protocol PasscodeBackground {
     var size: CGSize { get }
diff --git a/submodules/PasscodeUI/Sources/PasscodeUI.h b/submodules/PasscodeUI/Sources/PasscodeUI.h
deleted file mode 100644
index aff8b6a225..0000000000
--- a/submodules/PasscodeUI/Sources/PasscodeUI.h
+++ /dev/null
@@ -1,19 +0,0 @@
-//
-//  PasscodeUI.h
-//  PasscodeUI
-//
-//  Created by Peter on 8/13/19.
-//  Copyright © 2019 Telegram Messenger LLP. All rights reserved.
-//
-
-#import <UIKit/UIKit.h>
-
-//! Project version number for PasscodeUI.
-FOUNDATION_EXPORT double PasscodeUIVersionNumber;
-
-//! Project version string for PasscodeUI.
-FOUNDATION_EXPORT const unsigned char PasscodeUIVersionString[];
-
-// In this header, you should import all the public headers of your framework using statements like #import <PasscodeUI/PublicHeader.h>
-
-
diff --git a/submodules/PassportUI/BUILD b/submodules/PassportUI/BUILD
new file mode 100644
index 0000000000..5dae6de27e
--- /dev/null
+++ b/submodules/PassportUI/BUILD
@@ -0,0 +1,34 @@
+load("@build_bazel_rules_swift//swift:swift.bzl", "swift_library")
+
+swift_library(
+    name = "PassportUI",
+    module_name = "PassportUI",
+    srcs = glob([
+		"Sources/**/*.swift",
+    ]),
+    deps = [
+        "//submodules/SSignalKit/SwiftSignalKit:SwiftSignalKit",
+        "//submodules/AsyncDisplayKit:AsyncDisplayKit",
+        "//submodules/Display:Display",
+        "//submodules/Postbox:Postbox",
+        "//submodules/TelegramCore:TelegramCore",
+        "//submodules/SyncCore:SyncCore",
+        "//submodules/TelegramPresentationData:TelegramPresentationData",
+        "//submodules/PhoneInputNode:PhoneInputNode",
+        "//submodules/CountrySelectionUI:CountrySelectionUI",
+        "//submodules/GalleryUI:GalleryUI",
+        "//submodules/LegacyComponents:LegacyComponents",
+        "//submodules/OverlayStatusController:OverlayStatusController",
+        "//submodules/LegacyUI:LegacyUI",
+        "//submodules/ImageCompression:ImageCompression",
+        "//submodules/DateSelectionUI:DateSelectionUI",
+        "//submodules/PasswordSetupUI:PasswordSetupUI",
+        "//submodules/AppBundle:AppBundle",
+        "//submodules/PresentationDataUtils:PresentationDataUtils",
+        "//submodules/Markdown:Markdown",
+        "//submodules/PhoneNumberFormat:PhoneNumberFormat",
+    ],
+    visibility = [
+        "//visibility:public",
+    ],
+)
diff --git a/submodules/PassportUI/Info.plist b/submodules/PassportUI/Info.plist
deleted file mode 100644
index e1fe4cfb7b..0000000000
--- a/submodules/PassportUI/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/PassportUI/Sources/PassportUI.h b/submodules/PassportUI/Sources/PassportUI.h
deleted file mode 100644
index 7031f66464..0000000000
--- a/submodules/PassportUI/Sources/PassportUI.h
+++ /dev/null
@@ -1,19 +0,0 @@
-//
-//  PassportUI.h
-//  PassportUI
-//
-//  Created by Peter on 8/11/19.
-//  Copyright © 2019 Telegram Messenger LLP. All rights reserved.
-//
-
-#import <UIKit/UIKit.h>
-
-//! Project version number for PassportUI.
-FOUNDATION_EXPORT double PassportUIVersionNumber;
-
-//! Project version string for PassportUI.
-FOUNDATION_EXPORT const unsigned char PassportUIVersionString[];
-
-// In this header, you should import all the public headers of your framework using statements like #import <PassportUI/PublicHeader.h>
-
-
diff --git a/submodules/PasswordSetupUI/BUILD b/submodules/PasswordSetupUI/BUILD
new file mode 100644
index 0000000000..048733408a
--- /dev/null
+++ b/submodules/PasswordSetupUI/BUILD
@@ -0,0 +1,46 @@
+load("@build_bazel_rules_swift//swift:swift.bzl", "swift_library")
+
+filegroup(
+    name = "PasswordSetupUIResources",
+    srcs = glob([
+        "Resources/**/*",
+    ], exclude = ["Resources/**/.*"]),
+    visibility = ["//visibility:public"],
+)
+
+filegroup(
+    name = "PasswordSetupUIAssets",
+    srcs = glob(["PasswordSetupUIImages.xcassets/**"]),
+    visibility = ["//visibility:public"],
+)
+
+swift_library(
+    name = "PasswordSetupUI",
+    module_name = "PasswordSetupUI",
+    srcs = glob([
+		"Sources/**/*.swift",
+    ]),
+    deps = [
+        "//submodules/SSignalKit/SwiftSignalKit:SwiftSignalKit",
+        "//submodules/AsyncDisplayKit:AsyncDisplayKit",
+        "//submodules/Display:Display",
+        "//submodules/Postbox:Postbox",
+        "//submodules/TelegramCore:TelegramCore",
+        "//submodules/SyncCore:SyncCore",
+        "//submodules/AccountContext:AccountContext",
+        "//submodules/TelegramPresentationData:TelegramPresentationData",
+        "//submodules/ProgressNavigationButtonNode:ProgressNavigationButtonNode",
+        "//submodules/ActivityIndicator:ActivityIndicator",
+        "//submodules/AlertUI:AlertUI",
+        "//submodules/PresentationDataUtils:PresentationDataUtils",
+        "//submodules/ItemListUI:ItemListUI",
+        "//submodules/AnimatedStickerNode:AnimatedStickerNode",
+        "//submodules/AppBundle:AppBundle",
+        "//submodules/SolidRoundedButtonNode:SolidRoundedButtonNode",
+        "//submodules/OverlayStatusController:OverlayStatusController",
+        "//submodules/rlottie:RLottieBinding",
+    ],
+    visibility = [
+        "//visibility:public",
+    ],
+)
diff --git a/submodules/PasswordSetupUI/Info.plist b/submodules/PasswordSetupUI/Info.plist
deleted file mode 100644
index e1fe4cfb7b..0000000000
--- a/submodules/PasswordSetupUI/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/Pdf/BUILD b/submodules/Pdf/BUILD
new file mode 100644
index 0000000000..cf05f0ebeb
--- /dev/null
+++ b/submodules/Pdf/BUILD
@@ -0,0 +1,15 @@
+load("@build_bazel_rules_swift//swift:swift.bzl", "swift_library")
+
+swift_library(
+    name = "Pdf",
+    module_name = "Pdf",
+    srcs = glob([
+		"Sources/**/*.swift",
+    ]),
+    deps = [
+    	"//submodules/Display:Display",
+    ],
+    visibility = [
+        "//visibility:public",
+    ],
+)
diff --git a/submodules/Pdf/Info.plist b/submodules/Pdf/Info.plist
deleted file mode 100644
index e1fe4cfb7b..0000000000
--- a/submodules/Pdf/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/Pdf/Sources/Pdf.h b/submodules/Pdf/Sources/Pdf.h
deleted file mode 100644
index cc0cc8a96b..0000000000
--- a/submodules/Pdf/Sources/Pdf.h
+++ /dev/null
@@ -1,19 +0,0 @@
-//
-//  Pdf.h
-//  Pdf
-//
-//  Created by Peter on 8/12/19.
-//  Copyright © 2019 Telegram Messenger LLP. All rights reserved.
-//
-
-#import <UIKit/UIKit.h>
-
-//! Project version number for Pdf.
-FOUNDATION_EXPORT double PdfVersionNumber;
-
-//! Project version string for Pdf.
-FOUNDATION_EXPORT const unsigned char PdfVersionString[];
-
-// In this header, you should import all the public headers of your framework using statements like #import <Pdf/PublicHeader.h>
-
-
diff --git a/submodules/PeerAvatarGalleryUI/BUILD b/submodules/PeerAvatarGalleryUI/BUILD
new file mode 100644
index 0000000000..8c8179ca5f
--- /dev/null
+++ b/submodules/PeerAvatarGalleryUI/BUILD
@@ -0,0 +1,29 @@
+load("@build_bazel_rules_swift//swift:swift.bzl", "swift_library")
+
+swift_library(
+    name = "PeerAvatarGalleryUI",
+    module_name = "PeerAvatarGalleryUI",
+    srcs = glob([
+		"Sources/**/*.swift",
+    ]),
+    deps = [
+        "//submodules/SSignalKit/SwiftSignalKit:SwiftSignalKit",
+        "//submodules/AsyncDisplayKit:AsyncDisplayKit",
+        "//submodules/Display:Display",
+        "//submodules/Postbox:Postbox",
+        "//submodules/TelegramCore:TelegramCore",
+        "//submodules/SyncCore:SyncCore",
+    	"//submodules/TelegramPresentationData:TelegramPresentationData",
+        "//submodules/AccountContext:AccountContext",
+        "//submodules/GalleryUI:GalleryUI",
+        "//submodules/TelegramUIPreferences:TelegramUIPreferences",
+        "//submodules/TelegramStringFormatting:TelegramStringFormatting",
+        "//submodules/PhotoResources:PhotoResources",
+        "//submodules/RadialStatusNode:RadialStatusNode",
+        "//submodules/ShareController:ShareController",
+        "//submodules/AppBundle:AppBundle",
+    ],
+    visibility = [
+        "//visibility:public",
+    ],
+)
diff --git a/submodules/PeerAvatarGalleryUI/Info.plist b/submodules/PeerAvatarGalleryUI/Info.plist
deleted file mode 100644
index e1fe4cfb7b..0000000000
--- a/submodules/PeerAvatarGalleryUI/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/PeerAvatarGalleryUI/Sources/AvatarGalleryController.swift b/submodules/PeerAvatarGalleryUI/Sources/AvatarGalleryController.swift
index 1035a78876..3d6d2c85e3 100644
--- a/submodules/PeerAvatarGalleryUI/Sources/AvatarGalleryController.swift
+++ b/submodules/PeerAvatarGalleryUI/Sources/AvatarGalleryController.swift
@@ -474,7 +474,12 @@ public class AvatarGalleryController: ViewController, StandalonePresentableContr
         }
     }
     
-    private func deleteEntry(_ entry: AvatarGalleryEntry) {
+    private func deleteEntry(_ rawEntry: AvatarGalleryEntry) {
+        var entry = rawEntry
+        if case .topImage = entry, !self.entries.isEmpty {
+            entry = self.entries[0]
+        }
+        
         switch entry {
             case .topImage:
                 if self.peer.id == self.context.account.peerId {
diff --git a/submodules/PeerAvatarGalleryUI/Sources/PeerAvatarGalleryUI.h b/submodules/PeerAvatarGalleryUI/Sources/PeerAvatarGalleryUI.h
deleted file mode 100644
index 5a1ba4332b..0000000000
--- a/submodules/PeerAvatarGalleryUI/Sources/PeerAvatarGalleryUI.h
+++ /dev/null
@@ -1,19 +0,0 @@
-//
-//  PeerAvatarGalleryUI.h
-//  PeerAvatarGalleryUI
-//
-//  Created by Peter on 8/15/19.
-//  Copyright © 2019 Telegram Messenger LLP. All rights reserved.
-//
-
-#import <UIKit/UIKit.h>
-
-//! Project version number for PeerAvatarGalleryUI.
-FOUNDATION_EXPORT double PeerAvatarGalleryUIVersionNumber;
-
-//! Project version string for PeerAvatarGalleryUI.
-FOUNDATION_EXPORT const unsigned char PeerAvatarGalleryUIVersionString[];
-
-// In this header, you should import all the public headers of your framework using statements like #import <PeerAvatarGalleryUI/PublicHeader.h>
-
-
diff --git a/submodules/PeerInfoUI/BUILD b/submodules/PeerInfoUI/BUILD
new file mode 100644
index 0000000000..b5c142ca04
--- /dev/null
+++ b/submodules/PeerInfoUI/BUILD
@@ -0,0 +1,73 @@
+load("@build_bazel_rules_swift//swift:swift.bzl", "swift_library")
+
+swift_library(
+    name = "PeerInfoUI",
+    module_name = "PeerInfoUI",
+    srcs = glob([
+		"Sources/**/*.swift",
+    ]),
+    deps = [
+        "//submodules/SSignalKit/SwiftSignalKit:SwiftSignalKit",
+        "//submodules/AsyncDisplayKit:AsyncDisplayKit",
+        "//submodules/Display:Display",
+        "//submodules/Postbox:Postbox",
+        "//submodules/TelegramCore:TelegramCore",
+        "//submodules/SyncCore:SyncCore",
+        "//submodules/TelegramPresentationData:TelegramPresentationData",
+        "//submodules/AccountContext:AccountContext",
+        "//submodules/ItemListUI:ItemListUI",
+        "//submodules/AlertUI:AlertUI",
+        "//submodules/PresentationDataUtils:PresentationDataUtils",
+        "//submodules/ItemListAvatarAndNameInfoItem:ItemListAvatarAndNameInfoItem",
+        "//submodules/UndoUI:UndoUI",
+        "//submodules/TelegramUIPreferences:TelegramUIPreferences",
+        "//submodules/TemporaryCachedPeerDataManager:TemporaryCachedPeerDataManager",
+        "//submodules/ItemListPeerItem:ItemListPeerItem",
+        "//submodules/ItemListPeerActionItem:ItemListPeerActionItem",
+        "//submodules/OverlayStatusController:OverlayStatusController",
+        "//submodules/TelegramStringFormatting:TelegramStringFormatting",
+        "//submodules/SearchUI:SearchUI",
+        "//submodules/MergeLists:MergeLists",
+        "//submodules/TextFormat:TextFormat",
+        "//submodules/LegacyUI:LegacyUI",
+        "//submodules/GalleryUI:GalleryUI",
+        "//submodules/ShareController:ShareController",
+        "//submodules/WebSearchUI:WebSearchUI",
+        "//submodules/SearchBarNode:SearchBarNode",
+        "//submodules/ContactsPeerItem:ContactsPeerItem",
+        "//submodules/PasswordSetupUI:PasswordSetupUI",
+        "//submodules/ActivityIndicator:ActivityIndicator",
+        "//submodules/TelegramPermissionsUI:TelegramPermissionsUI",
+        "//submodules/ProgressNavigationButtonNode:ProgressNavigationButtonNode",
+        "//submodules/TelegramNotices:TelegramNotices",
+        "//submodules/PhotoResources:PhotoResources",
+        "//submodules/MediaResources:MediaResources",
+        "//submodules/LocationResources:LocationResources",
+        "//submodules/Geocoding:Geocoding",
+        "//submodules/LegacyComponents:LegacyComponents",
+        "//submodules/LocationUI:LocationUI",
+        "//submodules/StickerResources:StickerResources",
+        "//submodules/StickerPackPreviewUI:StickerPackPreviewUI",
+        "//submodules/PeerAvatarGalleryUI:PeerAvatarGalleryUI",
+        "//submodules/Emoji:Emoji",
+        "//submodules/ItemListStickerPackItem:ItemListStickerPackItem",
+        "//submodules/NotificationMuteSettingsUI:NotificationMuteSettingsUI",
+        "//submodules/SinglePhoneInputNode:SinglePhoneInputNode",
+        "//submodules/MapResourceToAvatarSizes:MapResourceToAvatarSizes",
+        "//submodules/NotificationSoundSelectionUI:NotificationSoundSelectionUI",
+        "//submodules/EncryptionKeyVisualization:EncryptionKeyVisualization",
+        "//submodules/ItemListAddressItem:ItemListAddressItem",
+        "//submodules/ContactListUI:ContactListUI",
+        "//submodules/ContextUI:ContextUI",
+        "//submodules/AppBundle:AppBundle",
+        "//submodules/Markdown:Markdown",
+        "//submodules/PhoneNumberFormat:PhoneNumberFormat",
+        "//submodules/TelegramIntents:TelegramIntents",
+        "//submodules/SolidRoundedButtonNode:SolidRoundedButtonNode",
+        "//submodules/ChatListSearchItemHeader:ChatListSearchItemHeader",
+        "//submodules/StatisticsUI:StatisticsUI",
+    ],
+    visibility = [
+        "//visibility:public",
+    ],
+)
diff --git a/submodules/PeerInfoUI/Info.plist b/submodules/PeerInfoUI/Info.plist
deleted file mode 100644
index e1fe4cfb7b..0000000000
--- a/submodules/PeerInfoUI/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/PeerInfoUI/Sources/ChannelMembersController.swift b/submodules/PeerInfoUI/Sources/ChannelMembersController.swift
index b6e92ee36f..91978d4998 100644
--- a/submodules/PeerInfoUI/Sources/ChannelMembersController.swift
+++ b/submodules/PeerInfoUI/Sources/ChannelMembersController.swift
@@ -361,9 +361,14 @@ public func channelMembersController(context: AccountContext, peerId: PeerId) ->
             addMembersDisposable.set((contactsController.result
             |> deliverOnMainQueue
             |> castError(AddChannelMemberError.self)
-            |> mapToSignal { [weak contactsController] contacts -> Signal<Never, AddChannelMemberError> in
+            |> mapToSignal { [weak contactsController] result -> Signal<Never, AddChannelMemberError> in
                 contactsController?.displayProgress = true
                 
+                var contacts: [ContactListPeerId] = []
+                if case let .result(peerIdsValue, _) = result {
+                    contacts = peerIdsValue
+                }
+                
                 let signal = context.peerChannelMemberCategoriesContextsManager.addMembers(account: context.account, peerId: peerId, memberIds: contacts.compactMap({ contact -> PeerId? in
                     switch contact {
                         case let .peer(contactId):
diff --git a/submodules/PeerInfoUI/Sources/ChannelVisibilityController.swift b/submodules/PeerInfoUI/Sources/ChannelVisibilityController.swift
index 018c87d2d6..f15b635fcd 100644
--- a/submodules/PeerInfoUI/Sources/ChannelVisibilityController.swift
+++ b/submodules/PeerInfoUI/Sources/ChannelVisibilityController.swift
@@ -1257,10 +1257,16 @@ public func channelVisibilityController(context: AccountContext, peerId: PeerId,
                 let selectionController = context.sharedContext.makeContactMultiselectionController(ContactMultiselectionControllerParams(context: context, mode: .channelCreation, options: []))
                 (controller.navigationController as? NavigationController)?.replaceAllButRootController(selectionController, animated: true)
                 let _ = (selectionController.result
-                |> deliverOnMainQueue).start(next: { [weak selectionController] peerIds in
+                |> deliverOnMainQueue).start(next: { [weak selectionController] result in
                     guard let selectionController = selectionController, let navigationController = selectionController.navigationController as? NavigationController else {
                         return
                     }
+                    
+                    var peerIds: [ContactListPeerId] = []
+                    if case let .result(peerIdsValue, _) = result {
+                        peerIds = peerIdsValue
+                    }
+                    
                     let filteredPeerIds = peerIds.compactMap({ peerId -> PeerId? in
                         if case let .peer(id) = peerId {
                             return id
diff --git a/submodules/PeerInfoUI/Sources/GroupInfoController.swift b/submodules/PeerInfoUI/Sources/GroupInfoController.swift
index c9213f94c9..9578132a8f 100644
--- a/submodules/PeerInfoUI/Sources/GroupInfoController.swift
+++ b/submodules/PeerInfoUI/Sources/GroupInfoController.swift
@@ -1913,7 +1913,12 @@ public func groupInfoController(context: AccountContext, peerId originalPeerId:
                 }
                 if let contactsController = contactsController as? ContactMultiselectionController {
                     selectAddMemberDisposable.set((contactsController.result
-                    |> deliverOnMainQueue).start(next: { [weak contactsController] peers in
+                    |> deliverOnMainQueue).start(next: { [weak contactsController] result in
+                        var peers: [ContactListPeerId] = []
+                        if case let .result(peerIdsValue, _) = result {
+                            peers = peerIdsValue
+                        }
+                        
                         contactsController?.displayProgress = true
                         addMemberDisposable.set((addMembers(peers)
                         |> deliverOnMainQueue).start(error: { error in
diff --git a/submodules/PeerInfoUI/Sources/GroupsInCommonController.swift b/submodules/PeerInfoUI/Sources/GroupsInCommonController.swift
index 3cd3935cc2..70c6a25db9 100644
--- a/submodules/PeerInfoUI/Sources/GroupsInCommonController.swift
+++ b/submodules/PeerInfoUI/Sources/GroupsInCommonController.swift
@@ -1,5 +1,6 @@
 import Foundation
 import UIKit
+import AsyncDisplayKit
 import Display
 import SwiftSignalKit
 import Postbox
diff --git a/submodules/PeerInfoUI/Sources/PeerInfoUI.h b/submodules/PeerInfoUI/Sources/PeerInfoUI.h
deleted file mode 100644
index a54f44d256..0000000000
--- a/submodules/PeerInfoUI/Sources/PeerInfoUI.h
+++ /dev/null
@@ -1,19 +0,0 @@
-//
-//  PeerInfoUI.h
-//  PeerInfoUI
-//
-//  Created by Peter on 8/15/19.
-//  Copyright © 2019 Telegram Messenger LLP. All rights reserved.
-//
-
-#import <UIKit/UIKit.h>
-
-//! Project version number for PeerInfoUI.
-FOUNDATION_EXPORT double PeerInfoUIVersionNumber;
-
-//! Project version string for PeerInfoUI.
-FOUNDATION_EXPORT const unsigned char PeerInfoUIVersionString[];
-
-// In this header, you should import all the public headers of your framework using statements like #import <PeerInfoUI/PublicHeader.h>
-
-
diff --git a/submodules/PeerOnlineMarkerNode/BUILD b/submodules/PeerOnlineMarkerNode/BUILD
new file mode 100644
index 0000000000..d00d4583a4
--- /dev/null
+++ b/submodules/PeerOnlineMarkerNode/BUILD
@@ -0,0 +1,16 @@
+load("@build_bazel_rules_swift//swift:swift.bzl", "swift_library")
+
+swift_library(
+    name = "PeerOnlineMarkerNode",
+    module_name = "PeerOnlineMarkerNode",
+    srcs = glob([
+		"Sources/**/*.swift",
+    ]),
+    deps = [
+        "//submodules/AsyncDisplayKit:AsyncDisplayKit",
+        "//submodules/Display:Display",
+    ],
+    visibility = [
+        "//visibility:public",
+    ],
+)
diff --git a/submodules/PeerOnlineMarkerNode/Info.plist b/submodules/PeerOnlineMarkerNode/Info.plist
deleted file mode 100644
index e1fe4cfb7b..0000000000
--- a/submodules/PeerOnlineMarkerNode/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/PeerOnlineMarkerNode/Sources/PeerOnlineMarkerNode.h b/submodules/PeerOnlineMarkerNode/Sources/PeerOnlineMarkerNode.h
deleted file mode 100644
index a59a27b659..0000000000
--- a/submodules/PeerOnlineMarkerNode/Sources/PeerOnlineMarkerNode.h
+++ /dev/null
@@ -1,19 +0,0 @@
-//
-//  PeerOnlineMarkerNode.h
-//  PeerOnlineMarkerNode
-//
-//  Created by Peter on 8/5/19.
-//  Copyright © 2019 Telegram Messenger LLP. All rights reserved.
-//
-
-#import <UIKit/UIKit.h>
-
-//! Project version number for PeerOnlineMarkerNode.
-FOUNDATION_EXPORT double PeerOnlineMarkerNodeVersionNumber;
-
-//! Project version string for PeerOnlineMarkerNode.
-FOUNDATION_EXPORT const unsigned char PeerOnlineMarkerNodeVersionString[];
-
-// In this header, you should import all the public headers of your framework using statements like #import <PeerOnlineMarkerNode/PublicHeader.h>
-
-
diff --git a/submodules/PeerPresenceStatusManager/BUILD b/submodules/PeerPresenceStatusManager/BUILD
new file mode 100644
index 0000000000..7c2895612e
--- /dev/null
+++ b/submodules/PeerPresenceStatusManager/BUILD
@@ -0,0 +1,18 @@
+load("@build_bazel_rules_swift//swift:swift.bzl", "swift_library")
+
+swift_library(
+    name = "PeerPresenceStatusManager",
+    module_name = "PeerPresenceStatusManager",
+    srcs = glob([
+		"Sources/**/*.swift",
+    ]),
+    deps = [
+        "//submodules/SSignalKit/SwiftSignalKit:SwiftSignalKit",
+        "//submodules/Postbox:Postbox",
+        "//submodules/TelegramCore:TelegramCore",
+        "//submodules/SyncCore:SyncCore",
+    ],
+    visibility = [
+        "//visibility:public",
+    ],
+)
diff --git a/submodules/PeerPresenceStatusManager/Info.plist b/submodules/PeerPresenceStatusManager/Info.plist
deleted file mode 100644
index e1fe4cfb7b..0000000000
--- a/submodules/PeerPresenceStatusManager/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/PeerPresenceStatusManager/Sources/PeerPresenceStatusManager.h b/submodules/PeerPresenceStatusManager/Sources/PeerPresenceStatusManager.h
deleted file mode 100644
index cb0de955db..0000000000
--- a/submodules/PeerPresenceStatusManager/Sources/PeerPresenceStatusManager.h
+++ /dev/null
@@ -1,19 +0,0 @@
-//
-//  PeerPresenceStatusManager.h
-//  PeerPresenceStatusManager
-//
-//  Created by Peter on 8/5/19.
-//  Copyright © 2019 Telegram Messenger LLP. All rights reserved.
-//
-
-#import <UIKit/UIKit.h>
-
-//! Project version number for PeerPresenceStatusManager.
-FOUNDATION_EXPORT double PeerPresenceStatusManagerVersionNumber;
-
-//! Project version string for PeerPresenceStatusManager.
-FOUNDATION_EXPORT const unsigned char PeerPresenceStatusManagerVersionString[];
-
-// In this header, you should import all the public headers of your framework using statements like #import <PeerPresenceStatusManager/PublicHeader.h>
-
-
diff --git a/submodules/PeersNearbyIconNode/BUILD b/submodules/PeersNearbyIconNode/BUILD
new file mode 100644
index 0000000000..3c1dc898a9
--- /dev/null
+++ b/submodules/PeersNearbyIconNode/BUILD
@@ -0,0 +1,18 @@
+load("@build_bazel_rules_swift//swift:swift.bzl", "swift_library")
+
+swift_library(
+    name = "PeersNearbyIconNode",
+    module_name = "PeersNearbyIconNode",
+    srcs = glob([
+		"Sources/**/*.swift",
+    ]),
+    deps = [
+        "//submodules/AsyncDisplayKit:AsyncDisplayKit",
+        "//submodules/Display:Display",
+        "//submodules/TelegramPresentationData:TelegramPresentationData",
+        "//submodules/LegacyComponents:LegacyComponents",
+    ],
+    visibility = [
+        "//visibility:public",
+    ],
+)
diff --git a/submodules/PeersNearbyIconNode/Info.plist b/submodules/PeersNearbyIconNode/Info.plist
deleted file mode 100644
index e1fe4cfb7b..0000000000
--- a/submodules/PeersNearbyIconNode/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/PeersNearbyIconNode/Sources/PeersNearbyIconNode.h b/submodules/PeersNearbyIconNode/Sources/PeersNearbyIconNode.h
deleted file mode 100644
index 4a9219e2a8..0000000000
--- a/submodules/PeersNearbyIconNode/Sources/PeersNearbyIconNode.h
+++ /dev/null
@@ -1,19 +0,0 @@
-//
-//  PeersNearbyIconNode.h
-//  PeersNearbyIconNode
-//
-//  Created by Peter on 8/13/19.
-//  Copyright © 2019 Telegram Messenger LLP. All rights reserved.
-//
-
-#import <UIKit/UIKit.h>
-
-//! Project version number for PeersNearbyIconNode.
-FOUNDATION_EXPORT double PeersNearbyIconNodeVersionNumber;
-
-//! Project version string for PeersNearbyIconNode.
-FOUNDATION_EXPORT const unsigned char PeersNearbyIconNodeVersionString[];
-
-// In this header, you should import all the public headers of your framework using statements like #import <PeersNearbyIconNode/PublicHeader.h>
-
-
diff --git a/submodules/PeersNearbyUI/BUILD b/submodules/PeersNearbyUI/BUILD
new file mode 100644
index 0000000000..507d9c8e97
--- /dev/null
+++ b/submodules/PeersNearbyUI/BUILD
@@ -0,0 +1,37 @@
+load("@build_bazel_rules_swift//swift:swift.bzl", "swift_library")
+
+swift_library(
+    name = "PeersNearbyUI",
+    module_name = "PeersNearbyUI",
+    srcs = glob([
+		"Sources/**/*.swift",
+    ]),
+    deps = [
+        "//submodules/SSignalKit/SwiftSignalKit:SwiftSignalKit",
+        "//submodules/AsyncDisplayKit:AsyncDisplayKit",
+        "//submodules/Display:Display",
+        "//submodules/Postbox:Postbox",
+        "//submodules/TelegramCore:TelegramCore",
+        "//submodules/SyncCore:SyncCore",
+        "//submodules/TelegramPresentationData:TelegramPresentationData",
+        "//submodules/AccountContext:AccountContext",
+        "//submodules/TelegramUIPreferences:TelegramUIPreferences",
+        "//submodules/ItemListUI:ItemListUI",
+        "//submodules/OverlayStatusController:OverlayStatusController",
+        "//submodules/DeviceLocationManager:DeviceLocationManager",
+        "//submodules/AlertUI:AlertUI",
+        "//submodules/PresentationDataUtils:PresentationDataUtils",
+        "//submodules/ItemListPeerItem:ItemListPeerItem",
+        "//submodules/TelegramPermissionsUI:TelegramPermissionsUI",
+        "//submodules/ItemListPeerActionItem:ItemListPeerActionItem",
+        "//submodules/PeersNearbyIconNode:PeersNearbyIconNode",
+        "//submodules/Geocoding:Geocoding",
+        "//submodules/AppBundle:AppBundle",
+        "//submodules/AnimatedStickerNode:AnimatedStickerNode",
+        "//submodules/TelegramStringFormatting:TelegramStringFormatting",
+        "//submodules/TelegramNotices:TelegramNotices",
+    ],
+    visibility = [
+        "//visibility:public",
+    ],
+)
diff --git a/submodules/PeersNearbyUI/Info.plist b/submodules/PeersNearbyUI/Info.plist
deleted file mode 100644
index e1fe4cfb7b..0000000000
--- a/submodules/PeersNearbyUI/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/PeersNearbyUI/Sources/PeersNearbyController.swift b/submodules/PeersNearbyUI/Sources/PeersNearbyController.swift
index 172272a9ec..87bd5d4949 100644
--- a/submodules/PeersNearbyUI/Sources/PeersNearbyController.swift
+++ b/submodules/PeersNearbyUI/Sources/PeersNearbyController.swift
@@ -1,5 +1,6 @@
 import Foundation
 import UIKit
+import AsyncDisplayKit
 import Display
 import SwiftSignalKit
 import Postbox
diff --git a/submodules/PeersNearbyUI/Sources/PeersNearbyUI.h b/submodules/PeersNearbyUI/Sources/PeersNearbyUI.h
deleted file mode 100644
index 923f1b9d1a..0000000000
--- a/submodules/PeersNearbyUI/Sources/PeersNearbyUI.h
+++ /dev/null
@@ -1,19 +0,0 @@
-//
-//  PeersNearbyUI.h
-//  PeersNearbyUI
-//
-//  Created by Peter on 8/15/19.
-//  Copyright © 2019 Telegram Messenger LLP. All rights reserved.
-//
-
-#import <UIKit/UIKit.h>
-
-//! Project version number for PeersNearbyUI.
-FOUNDATION_EXPORT double PeersNearbyUIVersionNumber;
-
-//! Project version string for PeersNearbyUI.
-FOUNDATION_EXPORT const unsigned char PeersNearbyUIVersionString[];
-
-// In this header, you should import all the public headers of your framework using statements like #import <PeersNearbyUI/PublicHeader.h>
-
-
diff --git a/submodules/PersistentStringHash/BUILD b/submodules/PersistentStringHash/BUILD
new file mode 100644
index 0000000000..6ff7160fb5
--- /dev/null
+++ b/submodules/PersistentStringHash/BUILD
@@ -0,0 +1,12 @@
+load("@build_bazel_rules_swift//swift:swift.bzl", "swift_library")
+
+swift_library(
+    name = "PersistentStringHash",
+    module_name = "PersistentStringHash",
+    srcs = glob([
+		"Sources/**/*.swift",
+    ]),
+    visibility = [
+        "//visibility:public",
+    ],
+)
diff --git a/submodules/PersistentStringHash/Info.plist b/submodules/PersistentStringHash/Info.plist
deleted file mode 100644
index e1fe4cfb7b..0000000000
--- a/submodules/PersistentStringHash/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/PersistentStringHash/Sources/PersistentStringHash.h b/submodules/PersistentStringHash/Sources/PersistentStringHash.h
deleted file mode 100644
index 5ddb521e30..0000000000
--- a/submodules/PersistentStringHash/Sources/PersistentStringHash.h
+++ /dev/null
@@ -1,19 +0,0 @@
-//
-//  PersistentStringHash.h
-//  PersistentStringHash
-//
-//  Created by Peter on 8/17/19.
-//  Copyright © 2019 Telegram Messenger LLP. All rights reserved.
-//
-
-#import <UIKit/UIKit.h>
-
-//! Project version number for PersistentStringHash.
-FOUNDATION_EXPORT double PersistentStringHashVersionNumber;
-
-//! Project version string for PersistentStringHash.
-FOUNDATION_EXPORT const unsigned char PersistentStringHashVersionString[];
-
-// In this header, you should import all the public headers of your framework using statements like #import <PersistentStringHash/PublicHeader.h>
-
-
diff --git a/submodules/PhoneInputNode/BUILD b/submodules/PhoneInputNode/BUILD
new file mode 100644
index 0000000000..f16f32df24
--- /dev/null
+++ b/submodules/PhoneInputNode/BUILD
@@ -0,0 +1,18 @@
+load("@build_bazel_rules_swift//swift:swift.bzl", "swift_library")
+
+swift_library(
+    name = "PhoneInputNode",
+    module_name = "PhoneInputNode",
+    srcs = glob([
+		"Sources/**/*.swift",
+    ]),
+    deps = [
+        "//submodules/AsyncDisplayKit:AsyncDisplayKit",
+        "//submodules/Display:Display",
+    	"//submodules/TelegramPresentationData:TelegramPresentationData",
+        "//submodules/PhoneNumberFormat:PhoneNumberFormat",
+    ],
+    visibility = [
+        "//visibility:public",
+    ],
+)
diff --git a/submodules/PhoneInputNode/Info.plist b/submodules/PhoneInputNode/Info.plist
deleted file mode 100644
index e1fe4cfb7b..0000000000
--- a/submodules/PhoneInputNode/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/PhoneInputNode/Sources/PhoneInputNode.h b/submodules/PhoneInputNode/Sources/PhoneInputNode.h
deleted file mode 100644
index 827bb35196..0000000000
--- a/submodules/PhoneInputNode/Sources/PhoneInputNode.h
+++ /dev/null
@@ -1,19 +0,0 @@
-//
-//  PhoneInputNode.h
-//  PhoneInputNode
-//
-//  Created by Peter on 8/11/19.
-//  Copyright © 2019 Telegram Messenger LLP. All rights reserved.
-//
-
-#import <UIKit/UIKit.h>
-
-//! Project version number for PhoneInputNode.
-FOUNDATION_EXPORT double PhoneInputNodeVersionNumber;
-
-//! Project version string for PhoneInputNode.
-FOUNDATION_EXPORT const unsigned char PhoneInputNodeVersionString[];
-
-// In this header, you should import all the public headers of your framework using statements like #import <PhoneInputNode/PublicHeader.h>
-
-
diff --git a/submodules/PhoneNumberFormat/BUCK b/submodules/PhoneNumberFormat/BUCK
index 4b69520b9d..29b61419da 100644
--- a/submodules/PhoneNumberFormat/BUCK
+++ b/submodules/PhoneNumberFormat/BUCK
@@ -4,13 +4,6 @@ static_library(
     name = "PhoneNumberFormat",
     srcs = glob([
         "Sources/**/*.swift",
-        "Sources/**/*.m",
-    ]),
-    headers = glob([
-        "Sources/**/*.h",
-    ]),
-    exported_headers = glob([
-        "Sources/**/*.h",
     ]),
     deps = [
         "//submodules/libphonenumber:libphonenumber",
diff --git a/submodules/PhoneNumberFormat/BUILD b/submodules/PhoneNumberFormat/BUILD
new file mode 100644
index 0000000000..003cc11da5
--- /dev/null
+++ b/submodules/PhoneNumberFormat/BUILD
@@ -0,0 +1,15 @@
+load("@build_bazel_rules_swift//swift:swift.bzl", "swift_library")
+
+swift_library(
+    name = "PhoneNumberFormat",
+    module_name = "PhoneNumberFormat",
+    srcs = glob([
+		"Sources/**/*.swift",
+    ]),
+    deps = [
+        "//submodules/libphonenumber:libphonenumber",
+    ],
+    visibility = [
+        "//visibility:public",
+    ],
+)
diff --git a/submodules/PhoneNumberFormat/Sources/FormatPhoneNumber.h b/submodules/PhoneNumberFormat/Sources/FormatPhoneNumber.h
deleted file mode 100644
index 5ea09e6745..0000000000
--- a/submodules/PhoneNumberFormat/Sources/FormatPhoneNumber.h
+++ /dev/null
@@ -1,12 +0,0 @@
-#import <Foundation/Foundation.h>
-
-NS_ASSUME_NONNULL_BEGIN
-
-@interface FormatPhoneNumber : NSObject
-
-+ (NSString *)cleanInternationalPhone:(NSString *)phone forceInternational:(bool)forceInternational;
-+ (NSString *)formatPhoneNumber:(NSString *)number;
-
-@end
-
-NS_ASSUME_NONNULL_END
diff --git a/submodules/PhoneNumberFormat/Sources/FormatPhoneNumber.m b/submodules/PhoneNumberFormat/Sources/FormatPhoneNumber.m
deleted file mode 100644
index 926270cc1d..0000000000
--- a/submodules/PhoneNumberFormat/Sources/FormatPhoneNumber.m
+++ /dev/null
@@ -1,55 +0,0 @@
-#import "FormatPhoneNumber.h"
-
-#import <libphonenumber/libphonenumber.h>
-
-static NBPhoneNumberUtil *getNBPhoneNumberUtil() {
-    static NBPhoneNumberUtil *value;
-    static dispatch_once_t onceToken;
-    dispatch_once(&onceToken, ^{
-        value = [[NBPhoneNumberUtil alloc] init];
-    });
-    return value;
-}
-
-@implementation FormatPhoneNumber
-
-+ (NSString *)cleanInternationalPhone:(NSString *)phone forceInternational:(bool)forceInternational {
-    if (phone.length == 0) {
-        return @"";
-    }
-    
-    char buf[phone.length];
-    int bufPtr = 0;
-    
-    bool hadPlus = false;
-    int length = (int)phone.length;
-    for (int i = 0; i < length; i++) {
-        unichar c = [phone characterAtIndex:i];
-        if ((c >= '0' && c <= '9') || (c == '+' && !hadPlus)) {
-            buf[bufPtr++] = (char)c;
-            if (c == '+') {
-                hadPlus = true;
-            }
-        }
-    }
-    
-    NSString *result = [[NSString alloc] initWithBytes:buf length:bufPtr encoding:NSUTF8StringEncoding];
-    if (forceInternational && bufPtr != 0 && buf[0] != '+') {
-        result = [[NSString alloc] initWithFormat:@"+%@", result];
-    }
-    return result;
-}
-
-+ (NSString *)formatPhoneNumber:(NSString *)number {
-    NBPhoneNumber *parsed = [getNBPhoneNumberUtil() parse:[@"+" stringByAppendingString:number] defaultRegion:nil error:nil];
-    if (parsed == nil) {
-        return number;
-    }
-    NSString *result = [getNBPhoneNumberUtil() format:parsed numberFormat:NBEPhoneNumberFormatINTERNATIONAL error:nil];
-    if (result == nil) {
-        return number;
-    }
-    return result;
-}
-
-@end
diff --git a/submodules/PhotoResources/BUCK b/submodules/PhotoResources/BUCK
index 488bc20353..5cf1d06502 100644
--- a/submodules/PhotoResources/BUCK
+++ b/submodules/PhotoResources/BUCK
@@ -18,7 +18,7 @@ static_library(
         "//submodules/AccountContext:AccountContext",
         "//submodules/MediaResources:MediaResources",
         "//submodules/TelegramUIPreferences:TelegramUIPreferences",
-        "//submodules/WebP:WebPImage",
+        "//submodules/WebPBinding:WebPBinding",
         "//submodules/AppBundle:AppBundle",
     ],
     frameworks = [
diff --git a/submodules/PhotoResources/BUILD b/submodules/PhotoResources/BUILD
new file mode 100644
index 0000000000..6d3e633ed1
--- /dev/null
+++ b/submodules/PhotoResources/BUILD
@@ -0,0 +1,28 @@
+load("@build_bazel_rules_swift//swift:swift.bzl", "swift_library")
+
+swift_library(
+    name = "PhotoResources",
+    module_name = "PhotoResources",
+    srcs = glob([
+		"Sources/**/*.swift",
+    ]),
+    deps = [
+        "//submodules/TelegramCore:TelegramCore",
+        "//submodules/SyncCore:SyncCore",
+        "//submodules/Postbox:Postbox",
+        "//submodules/SSignalKit/SwiftSignalKit:SwiftSignalKit",
+        "//submodules/Display:Display",
+        "//submodules/ImageTransparency:ImageTransparency",
+        "//submodules/TinyThumbnail:TinyThumbnail",
+        "//submodules/ImageBlur:ImageBlur",
+        "//submodules/Tuples:Tuples",
+        "//submodules/AccountContext:AccountContext",
+        "//submodules/MediaResources:MediaResources",
+        "//submodules/TelegramUIPreferences:TelegramUIPreferences",
+        "//submodules/WebPBinding:WebPBinding",
+        "//submodules/AppBundle:AppBundle",
+    ],
+    visibility = [
+        "//visibility:public",
+    ],
+)
diff --git a/submodules/PhotoResources/Info.plist b/submodules/PhotoResources/Info.plist
deleted file mode 100644
index e1fe4cfb7b..0000000000
--- a/submodules/PhotoResources/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/Sources/PhotoResources.h b/submodules/PhotoResources/Sources/PhotoResources.h
deleted file mode 100644
index 5ce333e0e7..0000000000
--- a/submodules/PhotoResources/Sources/PhotoResources.h
+++ /dev/null
@@ -1,19 +0,0 @@
-//
-//  PhotoResources.h
-//  PhotoResources
-//
-//  Created by Peter on 8/10/19.
-//  Copyright © 2019 Telegram Messenger LLP. All rights reserved.
-//
-
-#import <UIKit/UIKit.h>
-
-//! Project version number for PhotoResources.
-FOUNDATION_EXPORT double PhotoResourcesVersionNumber;
-
-//! Project version string for PhotoResources.
-FOUNDATION_EXPORT const unsigned char PhotoResourcesVersionString[];
-
-// In this header, you should import all the public headers of your framework using statements like #import <PhotoResources/PublicHeader.h>
-
-
diff --git a/submodules/PhotoResources/Sources/PhotoResources.swift b/submodules/PhotoResources/Sources/PhotoResources.swift
index 58dfa52566..60e58770b5 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/PlatformRestrictionMatching/BUILD b/submodules/PlatformRestrictionMatching/BUILD
new file mode 100644
index 0000000000..bc4aa3f64f
--- /dev/null
+++ b/submodules/PlatformRestrictionMatching/BUILD
@@ -0,0 +1,16 @@
+load("@build_bazel_rules_swift//swift:swift.bzl", "swift_library")
+
+swift_library(
+    name = "PlatformRestrictionMatching",
+    module_name = "PlatformRestrictionMatching",
+    srcs = glob([
+        "Sources/**/*.swift",
+    ]),
+    deps = [
+        "//submodules/TelegramCore:TelegramCore",
+        "//submodules/SyncCore:SyncCore",
+    ],
+    visibility = [
+        "//visibility:public",
+    ],
+)
diff --git a/submodules/PlatformRestrictionMatching/Info.plist b/submodules/PlatformRestrictionMatching/Info.plist
deleted file mode 100644
index e1fe4cfb7b..0000000000
--- a/submodules/PlatformRestrictionMatching/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/PlatformRestrictionMatching/Sources/PlatformRestrictionMatching.h b/submodules/PlatformRestrictionMatching/Sources/PlatformRestrictionMatching.h
deleted file mode 100644
index 8cd2d309f1..0000000000
--- a/submodules/PlatformRestrictionMatching/Sources/PlatformRestrictionMatching.h
+++ /dev/null
@@ -1,19 +0,0 @@
-//
-//  PlatformRestrictionMatching.h
-//  PlatformRestrictionMatching
-//
-//  Created by Peter on 8/14/19.
-//  Copyright © 2019 Telegram Messenger LLP. All rights reserved.
-//
-
-#import <UIKit/UIKit.h>
-
-//! Project version number for PlatformRestrictionMatching.
-FOUNDATION_EXPORT double PlatformRestrictionMatchingVersionNumber;
-
-//! Project version string for PlatformRestrictionMatching.
-FOUNDATION_EXPORT const unsigned char PlatformRestrictionMatchingVersionString[];
-
-// In this header, you should import all the public headers of your framework using statements like #import <PlatformRestrictionMatching/PublicHeader.h>
-
-
diff --git a/submodules/Postbox/BUCK b/submodules/Postbox/BUCK
index 5cee7bc9c0..cdfea7881a 100644
--- a/submodules/Postbox/BUCK
+++ b/submodules/Postbox/BUCK
@@ -4,18 +4,13 @@ framework(
     name = "Postbox",
     srcs = glob([
         "Sources/*.swift",
-        "Sources/*.m",
     ]),
-    headers = [
-        "Sources/MurMurHash32.h",
-    ],
-    exported_headers = [
-        "Sources/MurMurHash32.h",
-    ],
     deps = [
     	"//submodules/Crc32:Crc32",
     	"//submodules/SSignalKit/SwiftSignalKit:SwiftSignalKit#shared",
     	"//submodules/sqlcipher:sqlcipher",
+        "//submodules/MurMurHash32:MurMurHash32",
+        "//submodules/StringTransliteration:StringTransliteration",
     ],
     frameworks = [
         "$SDKROOT/System/Library/Frameworks/Foundation.framework",
diff --git a/submodules/Postbox/BUILD b/submodules/Postbox/BUILD
new file mode 100644
index 0000000000..6b5bb10a2d
--- /dev/null
+++ b/submodules/Postbox/BUILD
@@ -0,0 +1,19 @@
+load("@build_bazel_rules_swift//swift:swift.bzl", "swift_library")
+
+swift_library(
+    name = "Postbox",
+    module_name = "Postbox",
+    srcs = glob([
+        "Sources/**/*.swift",
+    ]),
+    deps = [
+        "//submodules/Crc32:Crc32",
+    	"//submodules/SSignalKit/SwiftSignalKit:SwiftSignalKit",
+    	"//submodules/sqlcipher:sqlcipher",
+        "//submodules/MurMurHash32:MurMurHash32",
+        "//submodules/StringTransliteration:StringTransliteration",
+    ],
+    visibility = [
+        "//visibility:public",
+    ],
+)
diff --git a/submodules/Postbox/Sources/ChatListHolesView.swift b/submodules/Postbox/Sources/ChatListHolesView.swift
index a2fd52f789..c1c1d103db 100644
--- a/submodules/Postbox/Sources/ChatListHolesView.swift
+++ b/submodules/Postbox/Sources/ChatListHolesView.swift
@@ -3,6 +3,11 @@ import Foundation
 public struct ChatListHolesEntry: Hashable {
     public let groupId: PeerGroupId
     public let hole: ChatListHole
+    
+    public init(groupId: PeerGroupId, hole: ChatListHole) {
+        self.groupId = groupId
+        self.hole = hole
+    }
 }
 
 final class MutableChatListHolesView {
diff --git a/submodules/Postbox/Sources/ChatListIndexTable.swift b/submodules/Postbox/Sources/ChatListIndexTable.swift
index 1a66b80bd7..93165b6523 100644
--- a/submodules/Postbox/Sources/ChatListIndexTable.swift
+++ b/submodules/Postbox/Sources/ChatListIndexTable.swift
@@ -175,18 +175,18 @@ final class ChatListIndexTable: Table {
         assert(self.updatedPreviousPeerCachedIndices.isEmpty)
     }
     
-    func commitWithTransaction(postbox: Postbox, alteredInitialPeerCombinedReadStates: [PeerId: CombinedPeerReadState], updatedPeers: [(Peer?, Peer)], transactionParticipationInTotalUnreadCountUpdates: (added: Set<PeerId>, removed: Set<PeerId>), updatedRootUnreadState: inout ChatListTotalUnreadState?, updatedGroupTotalUnreadSummaries: inout [PeerGroupId: PeerGroupUnreadCountersCombinedSummary], currentUpdatedGroupSummarySynchronizeOperations: inout [PeerGroupAndNamespace: Bool]) {
+    func commitWithTransaction(postbox: Postbox, alteredInitialPeerCombinedReadStates: [PeerId: CombinedPeerReadState], updatedPeers: [((Peer, Bool)?, (Peer, Bool))], transactionParticipationInTotalUnreadCountUpdates: (added: Set<PeerId>, removed: Set<PeerId>), updatedRootUnreadState: inout ChatListTotalUnreadState?, updatedGroupTotalUnreadSummaries: inout [PeerGroupId: PeerGroupUnreadCountersCombinedSummary], currentUpdatedGroupSummarySynchronizeOperations: inout [PeerGroupAndNamespace: Bool]) {
         var updatedPeerTags: [PeerId: (previous: PeerSummaryCounterTags, updated: PeerSummaryCounterTags)] = [:]
         for (previous, updated) in updatedPeers {
             let previousTags: PeerSummaryCounterTags
-            if let previous = previous {
-                previousTags = postbox.seedConfiguration.peerSummaryCounterTags(previous)
+            if let (previous, previousIsContact) = previous {
+                previousTags = postbox.seedConfiguration.peerSummaryCounterTags(previous, previousIsContact)
             } else {
                 previousTags = []
             }
-            let updatedTags = postbox.seedConfiguration.peerSummaryCounterTags(updated)
+            let updatedTags = postbox.seedConfiguration.peerSummaryCounterTags(updated.0, updated.1)
             if previousTags != updatedTags {
-                updatedPeerTags[updated.id] = (previousTags, updatedTags)
+                updatedPeerTags[updated.0.id] = (previousTags, updatedTags)
             }
         }
         
@@ -348,6 +348,7 @@ final class ChatListIndexTable: Table {
                 guard let peer = postbox.peerTable.get(peerId) else {
                     continue
                 }
+                let isContact = postbox.contactsTable.isContact(peerId: peerId)
                 let notificationPeerId: PeerId = peer.associatedPeerId ?? peerId
                 let initialReadState = alteredInitialPeerCombinedReadStates[peerId] ?? postbox.readStateTable.getCombinedState(peerId)
                 let currentReadState = postbox.readStateTable.getCombinedState(peerId)
@@ -435,7 +436,7 @@ final class ChatListIndexTable: Table {
                     }
                     
                     if var currentTotalRootUnreadState = totalRootUnreadState {
-                        var keptTags: PeerSummaryCounterTags = postbox.seedConfiguration.peerSummaryCounterTags(peer)
+                        var keptTags: PeerSummaryCounterTags = postbox.seedConfiguration.peerSummaryCounterTags(peer, isContact)
                         if let (removedTags, addedTags) = updatedPeerTags[peerId] {
                             keptTags.remove(removedTags)
                             keptTags.remove(addedTags)
@@ -583,6 +584,7 @@ final class ChatListIndexTable: Table {
             guard let combinedState = postbox.readStateTable.getCombinedState(peerId) else {
                 continue
             }
+            let isContact = postbox.contactsTable.isContact(peerId: peerId)
             let notificationPeerId: PeerId = peer.associatedPeerId ?? peerId
             let notificationSettings = postbox.peerNotificationSettingsTable.getEffective(notificationPeerId)
             let inclusion = self.get(peerId: peerId)
@@ -590,7 +592,7 @@ final class ChatListIndexTable: Table {
                 if case .root = groupId {
                     let peerMessageCount = combinedState.count
                     
-                    let summaryTags = postbox.seedConfiguration.peerSummaryCounterTags(peer)
+                    let summaryTags = postbox.seedConfiguration.peerSummaryCounterTags(peer, isContact)
                     for tag in summaryTags {
                         if rootState.absoluteCounters[tag] == nil {
                             rootState.absoluteCounters[tag] = ChatListTotalUnreadCounters(messageCount: 0, chatCount: 0)
diff --git a/submodules/Postbox/Sources/ChatListTable.swift b/submodules/Postbox/Sources/ChatListTable.swift
index 9252022dce..dc3ad0e0a4 100644
--- a/submodules/Postbox/Sources/ChatListTable.swift
+++ b/submodules/Postbox/Sources/ChatListTable.swift
@@ -1,7 +1,7 @@
 import Foundation
 
 enum ChatListOperation {
-    case InsertEntry(ChatListIndex, IntermediateMessage?, CombinedPeerReadState?, PeerChatListEmbeddedInterfaceState?)
+    case InsertEntry(ChatListIndex, MessageIndex?)
     case InsertHole(ChatListHole)
     case RemoveEntry([ChatListIndex])
     case RemoveHoles([ChatListIndex])
@@ -22,15 +22,15 @@ enum ChatListEntryInfo {
 }
 
 enum ChatListIntermediateEntry {
-    case message(ChatListIndex, IntermediateMessage?, PeerChatListEmbeddedInterfaceState?)
+    case message(ChatListIndex, MessageIndex?)
     case hole(ChatListHole)
     
     var index: ChatListIndex {
         switch self {
-            case let .message(index, _, _):
-                return index
-            case let .hole(hole):
-                return ChatListIndex(pinningIndex: nil, messageIndex: hole.index)
+        case let .message(index, _):
+            return index
+        case let .hole(hole):
+            return ChatListIndex(pinningIndex: nil, messageIndex: hole.index)
         }
     }
 }
@@ -78,12 +78,12 @@ private func extractKey(_ key: ValueBoxKey) -> (groupId: PeerGroupId, pinningInd
     )
 }
 
-private func readEntry(groupId: PeerGroupId, messageHistoryTable: MessageHistoryTable, peerChatInterfaceStateTable: PeerChatInterfaceStateTable, key: ValueBoxKey, value: ReadBuffer) -> ChatListIntermediateEntry {
+private func readEntry(groupId: PeerGroupId, key: ValueBoxKey, value: ReadBuffer) -> ChatListIntermediateEntry {
     let (keyGroupId, pinningIndex, messageIndex, type) = extractKey(key)
     assert(groupId == keyGroupId)
     let index = ChatListIndex(pinningIndex: pinningIndex, messageIndex: messageIndex)
     if type == ChatListEntryType.message.rawValue {
-        var message: IntermediateMessage?
+        var messageIndex: MessageIndex?
         if value.length != 0 {
             var idNamespace: Int32 = 0
             value.read(&idNamespace, offset: 0, length: 4)
@@ -92,9 +92,9 @@ private func readEntry(groupId: PeerGroupId, messageHistoryTable: MessageHistory
             var indexTimestamp: Int32 = 0
             value.read(&indexTimestamp, offset: 0, length: 4)
             
-            message = messageHistoryTable.getMessage(MessageIndex(id: MessageId(peerId: index.messageIndex.id.peerId, namespace: idNamespace, id: idId), timestamp: indexTimestamp))
+            messageIndex = MessageIndex(id: MessageId(peerId: index.messageIndex.id.peerId, namespace: idNamespace, id: idId), timestamp: indexTimestamp)
         }
-        return .message(index, message, peerChatInterfaceStateTable.get(index.messageIndex.id.peerId)?.chatListEmbeddedState)
+        return .message(index, messageIndex)
     } else if type == ChatListEntryType.hole.rawValue {
         return .hole(ChatListHole(index: index.messageIndex))
     } else {
@@ -203,9 +203,9 @@ final class ChatListTable: Table {
         var itemIds: [(id: PinnedItemId, rank: Int)] = []
         self.valueBox.range(self.table, start: self.upperBound(groupId: groupId), end: self.key(groupId: groupId, index: ChatListIndex(pinningIndex: UInt16.max - 1, messageIndex: MessageIndex.absoluteUpperBound()), type: .message).successor, values: { key, value in
             let keyIndex = extractKey(key)
-            let entry = readEntry(groupId: groupId, messageHistoryTable: messageHistoryTable, peerChatInterfaceStateTable: peerChatInterfaceStateTable, key: key, value: value)
+            let entry = readEntry(groupId: groupId, key: key, value: value)
             switch entry {
-                case let .message(index, _, _):
+                case let .message(index, _):
                     itemIds.append((.peer(index.messageIndex.id.peerId), Int(keyIndex.pinningIndex ?? 0)))
                 default:
                     break
@@ -255,7 +255,8 @@ final class ChatListTable: Table {
                 if let filterPredicate = filterPredicate {
                     if let peer = postbox.peerTable.get(messageIndex.id.peerId) {
                         let isUnread = postbox.readStateTable.getCombinedState(messageIndex.id.peerId)?.isUnread ?? false
-                        if filterPredicate.includes(peer: peer, notificationSettings: postbox.peerNotificationSettingsTable.getEffective(messageIndex.id.peerId), isUnread: isUnread) {
+                        let isContact = postbox.contactsTable.isContact(peerId: messageIndex.id.peerId)
+                        if filterPredicate.includes(peer: peer, groupId: groupId, notificationSettings: postbox.peerNotificationSettingsTable.getEffective(messageIndex.id.peerId), isUnread: isUnread, isContact: isContact) {
                             passFilter = true
                         } else {
                             passFilter = false
@@ -305,7 +306,7 @@ final class ChatListTable: Table {
                 self.ensureInitialized(groupId: groupId)
             }
             
-            let topMessage = messageHistoryTable.topMessage(peerId)
+            let topMessage = messageHistoryTable.topIndex(peerId: peerId)
             let embeddedChatState = peerChatInterfaceStateTable.get(peerId)?.chatListEmbeddedState
             
             let rawTopMessageIndex: MessageIndex?
@@ -338,7 +339,7 @@ final class ChatListTable: Table {
                     addOperation(.RemoveEntry([currentOrderingIndex]), groupId: currentGroupId, to: &operations)
                 }
                 self.justInsertIndex(groupId: updatedGroupId, index: updatedOrderingIndex, topMessageIndex: rawTopMessageIndex)
-                addOperation(.InsertEntry(updatedOrderingIndex, topMessage, messageHistoryTable.readStateTable.getCombinedState(peerId), embeddedChatState), groupId: updatedGroupId, to: &operations)
+                addOperation(.InsertEntry(updatedOrderingIndex, topMessage), groupId: updatedGroupId, to: &operations)
             } else {
                 if let (currentGroupId, currentOrderingIndex) = currentGroupAndIndex {
                     self.justRemoveMessageIndex(groupId: currentGroupId, index: currentOrderingIndex)
@@ -409,7 +410,7 @@ final class ChatListTable: Table {
         var upper: ChatListIntermediateEntry?
         
         self.valueBox.filteredRange(self.table, start: self.key(groupId: groupId, index: index, type: .message), end: self.lowerBound(groupId: groupId), values: { key, value in
-            let entry = readEntry(groupId: groupId, messageHistoryTable: messageHistoryTable, peerChatInterfaceStateTable: peerChatInterfaceStateTable, key: key, value: value)
+            let entry = readEntry(groupId: groupId, key: key, value: value)
             if let predicate = predicate {
                 if predicate(entry) {
                     lowerEntries.append(entry)
@@ -421,14 +422,14 @@ final class ChatListTable: Table {
                 lowerEntries.append(entry)
                 return .accept
             }
-        }, limit: count / 2 + 1)
-        if lowerEntries.count >= count / 2 + 1 {
+        }, limit: count + 1)
+        if lowerEntries.count >= count + 1 {
             lower = lowerEntries.last
             lowerEntries.removeLast()
         }
         
         self.valueBox.filteredRange(self.table, start: self.key(groupId: groupId, index: index, type: .message).predecessor, end: self.upperBound(groupId: groupId), values: { key, value in
-            let entry = readEntry(groupId: groupId, messageHistoryTable: messageHistoryTable, peerChatInterfaceStateTable: peerChatInterfaceStateTable, key: key, value: value)
+            let entry = readEntry(groupId: groupId, key: key, value: value)
             if let predicate = predicate {
                 if predicate(entry) {
                     upperEntries.append(entry)
@@ -440,42 +441,12 @@ final class ChatListTable: Table {
                 upperEntries.append(entry)
                 return .accept
             }
-        }, limit: count - lowerEntries.count + 1)
-        if upperEntries.count >= count - lowerEntries.count + 1 {
+        }, limit: count + 1)
+        if upperEntries.count >= count + 1 {
             upper = upperEntries.last
             upperEntries.removeLast()
         }
         
-        if lowerEntries.count != 0 && lowerEntries.count + upperEntries.count < count {
-            var additionalLowerEntries: [ChatListIntermediateEntry] = []
-            let startEntryType: ChatListEntryType
-            switch lowerEntries.last! {
-                case .message:
-                    startEntryType = .message
-                case .hole:
-                    startEntryType = .hole
-            }
-            self.valueBox.filteredRange(self.table, start: self.key(groupId: groupId, index: lowerEntries.last!.index, type: startEntryType), end: self.lowerBound(groupId: groupId), values: { key, value in
-                let entry = readEntry(groupId: groupId, messageHistoryTable: messageHistoryTable, peerChatInterfaceStateTable: peerChatInterfaceStateTable, key: key, value: value)
-                if let predicate = predicate {
-                    if predicate(entry) {
-                        additionalLowerEntries.append(entry)
-                        return .accept
-                    } else {
-                        return .skip
-                    }
-                } else {
-                    additionalLowerEntries.append(entry)
-                    return .accept
-                }
-            }, limit: count - lowerEntries.count - upperEntries.count + 1)
-            if additionalLowerEntries.count >= count - lowerEntries.count + upperEntries.count + 1 {
-                lower = additionalLowerEntries.last
-                additionalLowerEntries.removeLast()
-            }
-            lowerEntries.append(contentsOf: additionalLowerEntries)
-        }
-        
         var entries: [ChatListIntermediateEntry] = []
         entries.append(contentsOf: lowerEntries.reversed())
         entries.append(contentsOf: upperEntries)
@@ -548,6 +519,31 @@ final class ChatListTable: Table {
         }
         return result
     }
+
+    func entries(groupId: PeerGroupId, from fromIndex: (ChatListIndex, Bool), to toIndex: (ChatListIndex, Bool), peerChatInterfaceStateTable: PeerChatInterfaceStateTable, count: Int, predicate: ((ChatListIntermediateEntry) -> Bool)?) -> [ChatListIntermediateEntry] {
+        self.ensureInitialized(groupId: groupId)
+        
+        var entries: [ChatListIntermediateEntry] = []
+        let fromKey = self.key(groupId: groupId, index: fromIndex.0, type: fromIndex.1 ? .message : .hole)
+        let toKey = self.key(groupId: groupId, index: toIndex.0, type: toIndex.1 ? .message : .hole)
+        
+        self.valueBox.filteredRange(self.table, start: fromKey, end: toKey, values: { key, value in
+            let entry = readEntry(groupId: groupId, key: key, value: value)
+            if let predicate = predicate {
+                if predicate(entry) {
+                    entries.append(entry)
+                    return .accept
+                } else {
+                    return .skip
+                }
+            } else {
+                entries.append(entry)
+                return .accept
+            }
+        }, limit: count)
+        assert(entries.count <= count)
+        return entries
+    }
     
     func earlierEntries(groupId: PeerGroupId, index: (ChatListIndex, Bool)?, messageHistoryTable: MessageHistoryTable, peerChatInterfaceStateTable: PeerChatInterfaceStateTable, count: Int, predicate: ((ChatListIntermediateEntry) -> Bool)?) -> [ChatListIntermediateEntry] {
         self.ensureInitialized(groupId: groupId)
@@ -561,7 +557,7 @@ final class ChatListTable: Table {
         }
         
         self.valueBox.filteredRange(self.table, start: key, end: self.lowerBound(groupId: groupId), values: { key, value in
-            let entry = readEntry(groupId: groupId, messageHistoryTable: messageHistoryTable, peerChatInterfaceStateTable: peerChatInterfaceStateTable, key: key, value: value)
+            let entry = readEntry(groupId: groupId, key: key, value: value)
             if let predicate = predicate {
                 if predicate(entry) {
                     entries.append(entry)
@@ -625,7 +621,7 @@ final class ChatListTable: Table {
         }
         
         self.valueBox.filteredRange(self.table, start: key, end: self.upperBound(groupId: groupId), values: { key, value in
-            let entry = readEntry(groupId: groupId, messageHistoryTable: messageHistoryTable, peerChatInterfaceStateTable: peerChatInterfaceStateTable, key: key, value: value)
+            let entry = readEntry(groupId: groupId, key: key, value: value)
             if let predicate = predicate {
                 if predicate(entry) {
                     entries.append(entry)
@@ -641,6 +637,25 @@ final class ChatListTable: Table {
         return entries
     }
     
+    func countWithPredicate(groupId: PeerGroupId, predicate: (PeerId) -> Bool) -> Int {
+        var result = 0
+        self.valueBox.filteredRange(self.table, start: self.lowerBound(groupId: groupId), end: self.upperBound(groupId: groupId), keys: { key in
+            let (_, _, messageIndex, type) = extractKey(key)
+            
+            if type == ChatListEntryType.message.rawValue {
+                if predicate(messageIndex.id.peerId) {
+                    result += 1
+                    return .accept
+                } else {
+                    return .skip
+                }
+            } else {
+                return .skip
+            }
+        }, limit: 10000)
+        return result
+    }
+    
     func getStandalone(peerId: PeerId, messageHistoryTable: MessageHistoryTable) -> ChatListIntermediateEntry? {
         let index = self.indexTable.get(peerId: peerId)
         switch index.inclusion {
@@ -650,9 +665,7 @@ final class ChatListTable: Table {
                 break
         }
         if let topMessageIndex = index.topMessageIndex {
-            if let message = messageHistoryTable.getMessage(topMessageIndex) {
-                return ChatListIntermediateEntry.message(ChatListIndex(pinningIndex: nil, messageIndex: topMessageIndex), message, nil)
-            }
+            return ChatListIntermediateEntry.message(ChatListIndex(pinningIndex: nil, messageIndex: topMessageIndex), topMessageIndex)
         }
         return nil
     }
@@ -661,7 +674,7 @@ final class ChatListTable: Table {
         if let (peerGroupId, index) = self.getPeerChatListIndex(peerId: peerId), peerGroupId == groupId {
             let key = self.key(groupId: groupId, index: index, type: .message)
             if let value = self.valueBox.get(self.table, key: key) {
-                return readEntry(groupId: groupId, messageHistoryTable: messageHistoryTable, peerChatInterfaceStateTable: peerChatInterfaceStateTable, key: key, value: value)
+                return readEntry(groupId: groupId, key: key, value: value)
             } else {
                 return nil
             }
@@ -674,7 +687,7 @@ final class ChatListTable: Table {
         if let (peerGroupId, index) = self.getPeerChatListIndex(peerId: peerId) {
             let key = self.key(groupId: peerGroupId, index: index, type: .message)
             if let value = self.valueBox.get(self.table, key: key) {
-                return readEntry(groupId: peerGroupId, messageHistoryTable: messageHistoryTable, peerChatInterfaceStateTable: peerChatInterfaceStateTable, key: key, value: value)
+                return readEntry(groupId: peerGroupId, key: key, value: value)
             } else {
                 return nil
             }
@@ -715,10 +728,7 @@ final class ChatListTable: Table {
     func allPeerIds(groupId: PeerGroupId) -> [PeerId] {
         var peerIds: [PeerId] = []
         self.valueBox.range(self.table, start: self.upperBound(groupId: groupId), end: self.lowerBound(groupId: groupId), keys: { key in
-            let (keyGroupId, pinningIndex, messageIndex, type) = extractKey(key)
-            assert(groupId == keyGroupId)
-            
-            let index = ChatListIndex(pinningIndex: pinningIndex, messageIndex: messageIndex)
+            let (_, _, messageIndex, type) = extractKey(key)
             if type == ChatListEntryType.message.rawValue {
                 peerIds.append(messageIndex.id.peerId)
             }
diff --git a/submodules/Postbox/Sources/ChatListView.swift b/submodules/Postbox/Sources/ChatListView.swift
index aa70142924..c9b32485c6 100644
--- a/submodules/Postbox/Sources/ChatListView.swift
+++ b/submodules/Postbox/Sources/ChatListView.swift
@@ -88,12 +88,12 @@ public struct ChatListGroupReferenceEntry: Equatable {
 }
 
 public enum ChatListEntry: Comparable {
-    case MessageEntry(ChatListIndex, Message?, CombinedPeerReadState?, PeerNotificationSettings?, PeerChatListEmbeddedInterfaceState?, RenderedPeer, PeerPresence?, ChatListMessageTagSummaryInfo, Bool)
+    case MessageEntry(ChatListIndex, Message?, CombinedPeerReadState?, PeerNotificationSettings?, PeerChatListEmbeddedInterfaceState?, RenderedPeer, PeerPresence?, ChatListMessageTagSummaryInfo, Bool, Bool)
     case HoleEntry(ChatListHole)
     
     public var index: ChatListIndex {
         switch self {
-            case let .MessageEntry(index, _, _, _, _, _, _, _, _):
+            case let .MessageEntry(index, _, _, _, _, _, _, _, _, _):
                 return index
             case let .HoleEntry(hole):
                 return ChatListIndex(pinningIndex: nil, messageIndex: hole.index)
@@ -102,9 +102,9 @@ public enum ChatListEntry: Comparable {
 
     public static func ==(lhs: ChatListEntry, rhs: ChatListEntry) -> Bool {
         switch lhs {
-            case let .MessageEntry(lhsIndex, lhsMessage, lhsReadState, lhsSettings, lhsEmbeddedState, lhsPeer, lhsPresence, lhsInfo, lhsHasFailed):
+            case let .MessageEntry(lhsIndex, lhsMessage, lhsReadState, lhsSettings, lhsEmbeddedState, lhsPeer, lhsPresence, lhsInfo, lhsHasFailed, lhsIsContact):
                 switch rhs {
-                    case let .MessageEntry(rhsIndex, rhsMessage, rhsReadState, rhsSettings, rhsEmbeddedState, rhsPeer, rhsPresence, rhsInfo, rhsHasFailed):
+                    case let .MessageEntry(rhsIndex, rhsMessage, rhsReadState, rhsSettings, rhsEmbeddedState, rhsPeer, rhsPresence, rhsInfo, rhsHasFailed, rhsIsContact):
                         if lhsIndex != rhsIndex {
                             return false
                         }
@@ -144,6 +144,9 @@ public enum ChatListEntry: Comparable {
                         if lhsHasFailed != rhsHasFailed {
                             return false
                         }
+                        if lhsIsContact != rhsIsContact {
+                            return false
+                        }
                         return true
                     default:
                         return false
@@ -162,9 +165,9 @@ public enum ChatListEntry: Comparable {
     }
 }
 
-private func processedChatListEntry(_ entry: MutableChatListEntry, cachedDataTable: CachedPeerDataTable, readStateTable: MessageHistoryReadStateTable, messageHistoryTable: MessageHistoryTable) -> MutableChatListEntry {
+/*private func processedChatListEntry(_ entry: MutableChatListEntry, cachedDataTable: CachedPeerDataTable, readStateTable: MessageHistoryReadStateTable, messageHistoryTable: MessageHistoryTable) -> MutableChatListEntry {
     switch entry {
-        case let .IntermediateMessageEntry(index, message, readState, embeddedState):
+        case let .IntermediateMessageEntry(index, messageIndex):
             var updatedMessage = message
             if let message = message, let cachedData = cachedDataTable.get(message.id.peerId), let associatedHistoryMessageId = cachedData.associatedHistoryMessageId, message.id.id == 1 {
                 if let messageIndex = messageHistoryTable.messageHistoryIndexTable.earlierEntries(id: associatedHistoryMessageId, count: 1).first {
@@ -177,17 +180,17 @@ private func processedChatListEntry(_ entry: MutableChatListEntry, cachedDataTab
         default:
             return entry
     }
-}
+}*/
 
 enum MutableChatListEntry: Equatable {
-    case IntermediateMessageEntry(ChatListIndex, IntermediateMessage?, CombinedPeerReadState?, PeerChatListEmbeddedInterfaceState?)
-    case MessageEntry(ChatListIndex, Message?, CombinedPeerReadState?, PeerNotificationSettings?, PeerChatListEmbeddedInterfaceState?, RenderedPeer, PeerPresence?, ChatListMessageTagSummaryInfo, Bool)
+    case IntermediateMessageEntry(index: ChatListIndex, messageIndex: MessageIndex?)
+    case MessageEntry(index: ChatListIndex, message: Message?, readState: CombinedPeerReadState?, notificationSettings: PeerNotificationSettings?, embeddedInterfaceState: PeerChatListEmbeddedInterfaceState?, renderedPeer: RenderedPeer, presence: PeerPresence?, tagSummaryInfo: ChatListMessageTagSummaryInfo, hasFailedMessages: Bool, isContact: Bool)
     case HoleEntry(ChatListHole)
     
     init(_ intermediateEntry: ChatListIntermediateEntry, cachedDataTable: CachedPeerDataTable, readStateTable: MessageHistoryReadStateTable, messageHistoryTable: MessageHistoryTable) {
         switch intermediateEntry {
-            case let .message(index, message, embeddedState):
-                self = processedChatListEntry(.IntermediateMessageEntry(index, message, readStateTable.getCombinedState(index.messageIndex.id.peerId), embeddedState), cachedDataTable: cachedDataTable, readStateTable: readStateTable, messageHistoryTable: messageHistoryTable)
+            case let .message(index, messageIndex):
+                self = .IntermediateMessageEntry(index: index, messageIndex: messageIndex)
             case let .hole(hole):
                 self = .HoleEntry(hole)
         }
@@ -195,9 +198,9 @@ enum MutableChatListEntry: Equatable {
     
     var index: ChatListIndex {
         switch self {
-            case let .IntermediateMessageEntry(index, _, _, _):
-                return index
-            case let .MessageEntry(index, _, _, _, _, _, _, _, _):
+            case let .IntermediateMessageEntry(intermediateMessageEntry):
+                return intermediateMessageEntry.index
+            case let .MessageEntry(index, _, _, _, _, _, _, _, _, _):
                 return index
             case let .HoleEntry(hole):
                 return ChatListIndex(pinningIndex: nil, messageIndex: hole.index)
@@ -251,65 +254,33 @@ private enum ChatListEntryType {
     case groupReference
 }
 
-private func updateMessagePeers(_ message: Message, updatedPeers: [PeerId: Peer]) -> Message? {
-    var updated = false
-    for (peerId, currentPeer) in message.peers {
-        if let updatedPeer = updatedPeers[peerId], !arePeersEqual(currentPeer, updatedPeer) {
-            updated = true
-            break
-        }
-    }
-    if updated {
-        var peers = SimpleDictionary<PeerId, Peer>()
-        for (peerId, currentPeer) in message.peers {
-            if let updatedPeer = updatedPeers[peerId] {
-                peers[peerId] = updatedPeer
-            } else {
-                peers[peerId] = currentPeer
-            }
-        }
-        return Message(stableId: message.stableId, stableVersion: message.stableVersion, id: message.id, globallyUniqueId: message.globallyUniqueId, groupingKey: message.groupingKey, groupInfo: message.groupInfo, timestamp: message.timestamp, flags: message.flags, tags: message.tags, globalTags: message.globalTags, localTags: message.localTags, forwardInfo: message.forwardInfo, author: message.author, text: message.text, attributes: message.attributes, media: message.media, peers: peers, associatedMessages: message.associatedMessages, associatedMessageIds: message.associatedMessageIds)
-    }
-    return nil
-}
-
-private func updatedRenderedPeer(_ renderedPeer: RenderedPeer, updatedPeers: [PeerId: Peer]) -> RenderedPeer? {
-    var updated = false
-    for (peerId, currentPeer) in renderedPeer.peers {
-        if let updatedPeer = updatedPeers[peerId], !arePeersEqual(currentPeer, updatedPeer) {
-            updated = true
-            break
-        }
-    }
-    if updated {
-        var peers = SimpleDictionary<PeerId, Peer>()
-        for (peerId, currentPeer) in renderedPeer.peers {
-            if let updatedPeer = updatedPeers[peerId] {
-                peers[peerId] = updatedPeer
-            } else {
-                peers[peerId] = currentPeer
-            }
-        }
-        return RenderedPeer(peerId: renderedPeer.peerId, peers: peers)
-    }
-    return nil
-}
-
 public struct ChatListFilterPredicate {
     public var includePeerIds: Set<PeerId>
-    public var include: (Peer, PeerNotificationSettings?, Bool) -> Bool
+    public var excludePeerIds: Set<PeerId>
+    public var includeAdditionalPeerGroupIds: [PeerGroupId]
+    public var include: (Peer, PeerNotificationSettings?, Bool, Bool) -> Bool
     
-    public init(includePeerIds: Set<PeerId>, include: @escaping (Peer, PeerNotificationSettings?, Bool) -> Bool) {
+    public init(includePeerIds: Set<PeerId>, excludePeerIds: Set<PeerId>, includeAdditionalPeerGroupIds: [PeerGroupId], include: @escaping (Peer, PeerNotificationSettings?, Bool, Bool) -> Bool) {
         self.includePeerIds = includePeerIds
+        self.excludePeerIds = excludePeerIds
+        self.includeAdditionalPeerGroupIds = includeAdditionalPeerGroupIds
         self.include = include
     }
     
-    func includes(peer: Peer, notificationSettings: PeerNotificationSettings?, isUnread: Bool) -> Bool {
-        if self.includePeerIds.contains(peer.id) {
-            return true
-        } else {
-            return self.include(peer, notificationSettings, isUnread)
+    func includes(peer: Peer, groupId: PeerGroupId, notificationSettings: PeerNotificationSettings?, isUnread: Bool, isContact: Bool) -> Bool {
+        let includePeerId = peer.associatedPeerId ?? peer.id
+        if self.excludePeerIds.contains(includePeerId) {
+            return false
         }
+        if self.includePeerIds.contains(includePeerId) {
+            return true
+        }
+        if groupId != .root {
+            if !self.includeAdditionalPeerGroupIds.contains(groupId) {
+                return false
+            }
+        }
+        return self.include(peer, notificationSettings, isUnread, isContact)
     }
 }
 
@@ -317,49 +288,48 @@ final class MutableChatListView {
     let groupId: PeerGroupId
     let filterPredicate: ChatListFilterPredicate?
     private let summaryComponents: ChatListEntrySummaryComponents
-    fileprivate var additionalItemIds: Set<PeerId>
-    fileprivate var additionalItemEntries: [MutableChatListEntry]
-    fileprivate var additionalMixedItemIds: Set<PeerId>
-    fileprivate var additionalMixedItemEntries: [MutableChatListEntry]
-    fileprivate var earlier: MutableChatListEntry?
-    fileprivate var later: MutableChatListEntry?
-    fileprivate var entries: [MutableChatListEntry]
     fileprivate var groupEntries: [ChatListGroupReferenceEntry]
     private var count: Int
     
+    private let spaces: [ChatListViewSpace]
+    fileprivate var state: ChatListViewState
+    fileprivate var sampledState: ChatListViewSample
+    
     init(postbox: Postbox, groupId: PeerGroupId, filterPredicate: ChatListFilterPredicate?, aroundIndex: ChatListIndex, count: Int, summaryComponents: ChatListEntrySummaryComponents) {
-        let (entries, earlier, later) = postbox.fetchAroundChatEntries(groupId: groupId, index: aroundIndex, count: count, filterPredicate: filterPredicate)
-        
         self.groupId = groupId
         self.filterPredicate = filterPredicate
-        self.earlier = earlier
-        self.entries = entries
-        self.later = later
-        self.count = count
         self.summaryComponents = summaryComponents
-        self.additionalItemEntries = []
-        self.additionalMixedItemEntries = []
-        self.additionalMixedItemIds = Set()
+        
+        var spaces: [ChatListViewSpace] = [
+            .group(groupId: self.groupId, pinned: .notPinned)
+        ]
         if let filterPredicate = self.filterPredicate {
-            self.additionalMixedItemIds.formUnion(filterPredicate.includePeerIds)
-        }
-        for peerId in self.additionalMixedItemIds {
-            if let entry = postbox.chatListTable.getEntry(peerId: peerId, messageHistoryTable: postbox.messageHistoryTable, peerChatInterfaceStateTable: postbox.peerChatInterfaceStateTable) {
-                self.additionalMixedItemEntries.append(MutableChatListEntry(entry, cachedDataTable: postbox.cachedPeerDataTable, readStateTable: postbox.readStateTable, messageHistoryTable: postbox.messageHistoryTable))
+            spaces.append(.group(groupId: self.groupId, pinned: .includePinnedAsUnpinned))
+            for additionalGroupId in filterPredicate.includeAdditionalPeerGroupIds {
+                spaces.append(.group(groupId: additionalGroupId, pinned: .notPinned))
+                spaces.append(.group(groupId: additionalGroupId, pinned: .includePinnedAsUnpinned))
             }
+        } else {
+            spaces.append(.group(groupId: self.groupId, pinned: .includePinned))
         }
+        self.spaces = spaces
+        self.state = ChatListViewState(postbox: postbox, spaces: self.spaces, anchorIndex: aroundIndex, filterPredicate: self.filterPredicate, summaryComponents: self.summaryComponents, halfLimit: count)
+        self.sampledState = self.state.sample(postbox: postbox)
+        
+        self.count = count
+        
         if case .root = groupId, self.filterPredicate == nil {
-            let itemIds = postbox.additionalChatListItemsTable.get()
+            /*let itemIds = postbox.additionalChatListItemsTable.get()
             self.additionalItemIds = Set(itemIds)
             for peerId in itemIds {
                 if let entry = postbox.chatListTable.getStandalone(peerId: peerId, messageHistoryTable: postbox.messageHistoryTable) {
                     self.additionalItemEntries.append(MutableChatListEntry(entry, cachedDataTable: postbox.cachedPeerDataTable, readStateTable: postbox.readStateTable, messageHistoryTable: postbox.messageHistoryTable))
                 }
-            }
+            }*/
             self.groupEntries = []
             self.reloadGroups(postbox: postbox)
         } else {
-            self.additionalItemIds = Set()
+            //self.additionalItemIds = Set()
             self.groupEntries = []
         }
     }
@@ -434,87 +404,31 @@ final class MutableChatListView {
     }
     
     func refreshDueToExternalTransaction(postbox: Postbox) -> Bool {
-        var index = ChatListIndex.absoluteUpperBound
-        if !self.entries.isEmpty && self.later != nil {
-            index = self.entries[self.entries.count / 2].index
-        }
+        var updated = false
+        
+        self.state = ChatListViewState(postbox: postbox, spaces: self.spaces, anchorIndex: .absoluteUpperBound, filterPredicate: self.filterPredicate, summaryComponents: self.summaryComponents, halfLimit: self.count)
+        self.sampledState = self.state.sample(postbox: postbox)
+        updated = true
         
-        let (entries, earlier, later) = postbox.fetchAroundChatEntries(groupId: self.groupId, index: index, count: self.count, filterPredicate: self.filterPredicate)
         let currentGroupEntries = self.groupEntries
         
         self.reloadGroups(postbox: postbox)
         
-        var updated = false
-        
         if self.groupEntries != currentGroupEntries {
             updated = true
         }
         
-        if entries != self.entries || earlier != self.earlier || later != self.later {
-            self.entries = entries
-            self.earlier = earlier
-            self.later = later
-            updated = true
-        }
-        
         return updated
     }
     
     func replay(postbox: Postbox, operations: [PeerGroupId: [ChatListOperation]], updatedPeerNotificationSettings: [PeerId: (PeerNotificationSettings?, PeerNotificationSettings)], updatedPeers: [PeerId: Peer], updatedPeerPresences: [PeerId: PeerPresence], transaction: PostboxTransaction, context: MutableChatListViewReplayContext) -> Bool {
         var hasChanges = false
         
-        if let groupOperations = operations[self.groupId] {
-            for operation in groupOperations {
-                switch operation {
-                case let .InsertEntry(index, message, combinedReadState, embeddedState):
-                    if self.add(.IntermediateMessageEntry(index, message, combinedReadState, embeddedState), postbox: postbox) {
-                        hasChanges = true
-                    }
-                case let .InsertHole(index):
-                    if self.add(.HoleEntry(index), postbox: postbox) {
-                        hasChanges = true
-                    }
-                case let .RemoveEntry(indices):
-                    if self.remove(Set(indices), type: .message, context: context) {
-                        hasChanges = true
-                    }
-                case let .RemoveHoles(indices):
-                    if self.remove(Set(indices), type: .hole, context: context) {
-                        hasChanges = true
-                    }
-                }
-            }
+        if self.state.replay(postbox: postbox, transaction: transaction) {
+            self.sampledState = self.state.sample(postbox: postbox)
+            hasChanges = true
         }
         
-        /*if let filterPredicate = self.filterPredicate, !filterPredicate.includePeerIds.isEmpty {
-            for (groupId, groupOperations) in operations {
-                if groupId == self.groupId {
-                    continue
-                }
-                for operation in groupOperations {
-                    switch operation {
-                    case let .InsertEntry(index, message, combinedReadState, embeddedState):
-                        if filterPredicate.includePeerIds.contains(index.messageIndex.id.peerId) {
-                            if self.add(.IntermediateMessageEntry(index, message, combinedReadState, embeddedState), postbox: postbox) {
-                                hasChanges = true
-                            }
-                        }
-                    case .InsertHole:
-                        break
-                    case let .RemoveEntry(indices):
-                        let updatedIndices = indices.filter { index in
-                            return filterPredicate.includePeerIds.contains(index.messageIndex.id.peerId)
-                        }
-                        if !updatedIndices.isEmpty && self.remove(Set(updatedIndices), type: .message, context: context) {
-                            hasChanges = true
-                        }
-                    case .RemoveHoles:
-                        break
-                    }
-                }
-            }
-        }*/
-        
         if case .root = self.groupId, self.filterPredicate == nil {
             var invalidatedGroups = false
             for (groupId, groupOperations) in operations {
@@ -551,152 +465,9 @@ final class MutableChatListView {
             }
         }
         
-        if !updatedPeerNotificationSettings.isEmpty {
-            if let filterPredicate = self.filterPredicate {
-                for (peerId, settingsChange) in updatedPeerNotificationSettings {
-                    if let peer = postbox.peerTable.get(peerId) {
-                        let isUnread = postbox.readStateTable.getCombinedState(peerId)?.isUnread ?? false
-                        let wasIncluded = filterPredicate.includes(peer: peer, notificationSettings: settingsChange.0, isUnread: isUnread)
-                        let isIncluded = filterPredicate.includes(peer: peer, notificationSettings: settingsChange.1, isUnread: isUnread)
-                        if wasIncluded != isIncluded {
-                            if isIncluded {
-                                let tableEntry: ChatListIntermediateEntry?
-                                if filterPredicate.includePeerIds.contains(peerId) {
-                                    tableEntry = postbox.chatListTable.getEntry(peerId: peerId, messageHistoryTable: postbox.messageHistoryTable, peerChatInterfaceStateTable: postbox.peerChatInterfaceStateTable)
-                                } else {
-                                    tableEntry = postbox.chatListTable.getEntry(groupId: self.groupId, peerId: peerId, messageHistoryTable: postbox.messageHistoryTable, peerChatInterfaceStateTable: postbox.peerChatInterfaceStateTable)
-                                }
-                                if let entry = tableEntry {
-                                    switch entry {
-                                    case let .message(index, message, embeddedState):
-                                        let combinedReadState = postbox.readStateTable.getCombinedState(index.messageIndex.id.peerId)
-                                        if self.add(.IntermediateMessageEntry(entry.index, message, combinedReadState, embeddedState), postbox: postbox) {
-                                            hasChanges = true
-                                        }
-                                    default:
-                                        break
-                                    }
-                                }
-                            } else {
-                                loop: for i in 0 ..< self.entries.count {
-                                    switch self.entries[i] {
-                                    case .MessageEntry(let index, _, _, _, _, _, _, _, _), .IntermediateMessageEntry(let index, _, _, _):
-                                        if index.messageIndex.id.peerId == peerId {
-                                            self.entries.remove(at: i)
-                                            hasChanges = true
-                                            break loop
-                                        }
-                                    default:
-                                        break
-                                    }
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-            
-            for i in 0 ..< self.entries.count {
-                switch self.entries[i] {
-                    case let .MessageEntry(index, message, readState, _, embeddedState, peer, peerPresence, summaryInfo, hasFailed):
-                        var notificationSettingsPeerId = peer.peerId
-                        if let peer = peer.peers[peer.peerId], let associatedPeerId = peer.associatedPeerId {
-                            notificationSettingsPeerId = associatedPeerId
-                        }
-                        if let (_, settings) = updatedPeerNotificationSettings[notificationSettingsPeerId] {
-                            self.entries[i] = .MessageEntry(index, message, readState, settings, embeddedState, peer, peerPresence, summaryInfo, hasFailed)
-                            hasChanges = true
-                        }
-                    default:
-                        continue
-                }
-            }
-        }
+        /*
         
-        if !transaction.updatedFailedMessagePeerIds.isEmpty {
-            for i in 0 ..< self.entries.count {
-                switch self.entries[i] {
-                    case let .MessageEntry(index, message, readState, settings, embeddedState, peer, peerPresence, summaryInfo, previousHasFailed):
-                        if transaction.updatedFailedMessagePeerIds.contains(index.messageIndex.id.peerId) {
-                            let hasFailed = postbox.messageHistoryFailedTable.contains(peerId: index.messageIndex.id.peerId)
-                            if previousHasFailed != hasFailed {
-                                self.entries[i] = .MessageEntry(index, message, readState, settings, embeddedState, peer, peerPresence, summaryInfo, hasFailed)
-                                hasChanges = true
-                            }
-                        }
-                    default:
-                        continue
-                }
-            }
-        }
         
-        if !updatedPeers.isEmpty {
-            for i in 0 ..< self.entries.count {
-                switch self.entries[i] {
-                    case let .MessageEntry(index, message, readState, settings, embeddedState, peer, peerPresence, summaryInfo, hasFailed):
-                        var updatedMessage: Message?
-                        if let message = message {
-                            updatedMessage = updateMessagePeers(message, updatedPeers: updatedPeers)
-                        }
-                        let updatedPeer = updatedRenderedPeer(peer, updatedPeers: updatedPeers)
-                        if updatedMessage != nil || updatedPeer != nil {
-                            self.entries[i] = .MessageEntry(index, updatedMessage ?? message, readState, settings, embeddedState, updatedPeer ?? peer, peerPresence, summaryInfo, hasFailed)
-                            hasChanges = true
-                        }
-                    default:
-                        continue
-                }
-            }
-        }
-        if !updatedPeerPresences.isEmpty {
-            for i in 0 ..< self.entries.count {
-                switch self.entries[i] {
-                    case let .MessageEntry(index, message, readState, settings, embeddedState, peer, _, summaryInfo, hasFailed):
-                        var presencePeerId = peer.peerId
-                        if let peer = peer.peers[peer.peerId], let associatedPeerId = peer.associatedPeerId {
-                            presencePeerId = associatedPeerId
-                        }
-                        if let presence = updatedPeerPresences[presencePeerId] {
-                            self.entries[i] = .MessageEntry(index, message, readState, settings, embeddedState, peer, presence, summaryInfo, hasFailed)
-                            hasChanges = true
-                        }
-                    default:
-                        continue
-                }
-            }
-        }
-        if !transaction.currentUpdatedMessageTagSummaries.isEmpty || !transaction.currentUpdatedMessageActionsSummaries.isEmpty {
-            for i in 0 ..< self.entries.count {
-                switch self.entries[i] {
-                    case let .MessageEntry(index, message, readState, settings, embeddedState, peer, peerPresence, currentSummary, hasFailed):
-                        var updatedTagSummaryCount: Int32?
-                        var updatedActionsSummaryCount: Int32?
-                        
-                        if let tagSummary = self.summaryComponents.tagSummary {
-                            let key = MessageHistoryTagsSummaryKey(tag: tagSummary.tag, peerId: index.messageIndex.id.peerId, namespace: tagSummary.namespace)
-                            if let summary = transaction.currentUpdatedMessageTagSummaries[key] {
-                                updatedTagSummaryCount = summary.count
-                            }
-                        }
-                        
-                        if let actionsSummary = self.summaryComponents.actionsSummary {
-                            let key = PendingMessageActionsSummaryKey(type: actionsSummary.type, peerId: index.messageIndex.id.peerId, namespace: actionsSummary.namespace)
-                            if let count = transaction.currentUpdatedMessageActionsSummaries[key] {
-                                updatedActionsSummaryCount = count
-                            }
-                        }
-                        
-                        if updatedTagSummaryCount != nil || updatedActionsSummaryCount != nil {
-                            let summaryInfo = ChatListMessageTagSummaryInfo(tagSummaryCount: updatedTagSummaryCount ?? currentSummary.tagSummaryCount, actionsSummaryCount: updatedActionsSummaryCount ?? currentSummary.actionsSummaryCount)
-                            
-                            self.entries[i] = .MessageEntry(index, message, readState, settings, embeddedState, peer, peerPresence, summaryInfo, hasFailed)
-                            hasChanges = true
-                        }
-                    default:
-                        continue
-                }
-            }
-        }
         var updateAdditionalItems = false
         if let itemIds = transaction.replacedAdditionalChatListItems {
             self.additionalItemIds = Set(itemIds)
@@ -723,7 +494,7 @@ final class MutableChatListView {
             hasChanges = true
         }
         var updateAdditionalMixedItems = false
-        for peerId in self.additionalMixedItemIds {
+        for peerId in self.additionalMixedItemIds.union(self.additionalMixedPinnedItemIds) {
             if transaction.currentOperationsByPeerId[peerId] != nil {
                 updateAdditionalMixedItems = true
             }
@@ -741,258 +512,39 @@ final class MutableChatListView {
                     self.additionalMixedItemEntries.append(MutableChatListEntry(entry, cachedDataTable: postbox.cachedPeerDataTable, readStateTable: postbox.readStateTable, messageHistoryTable: postbox.messageHistoryTable))
                 }
             }
+            self.additionalMixedPinnedEntries.removeAll()
+            for peerId in self.additionalMixedPinnedItemIds {
+                if let entry = postbox.chatListTable.getEntry(peerId: peerId, messageHistoryTable: postbox.messageHistoryTable, peerChatInterfaceStateTable: postbox.peerChatInterfaceStateTable) {
+                    self.additionalMixedPinnedEntries.append(MutableChatListEntry(entry, cachedDataTable: postbox.cachedPeerDataTable, readStateTable: postbox.readStateTable, messageHistoryTable: postbox.messageHistoryTable))
+                }
+            }
+            
             hasChanges = true
-        }
-        return hasChanges
-    }
-    
-    func add(_ initialEntry: MutableChatListEntry, postbox: Postbox) -> Bool {
-        if let filterPredicate = self.filterPredicate {
-            switch initialEntry {
-            case .IntermediateMessageEntry(let index, _, _, _), .MessageEntry(let index, _, _, _, _, _, _, _, _):
-                if let peer = postbox.peerTable.get(index.messageIndex.id.peerId) {
-                    let isUnread = postbox.readStateTable.getCombinedState(index.messageIndex.id.peerId)?.isUnread ?? false
-                    if !filterPredicate.includes(peer: peer, notificationSettings: postbox.peerNotificationSettingsTable.getEffective(index.messageIndex.id.peerId), isUnread: isUnread) {
-                        return false
-                    }
-                } else {
-                    return false
-                }
-                break
-            default:
-                break
-            }
-        }
-        
-        let entry = processedChatListEntry(initialEntry, cachedDataTable: postbox.cachedPeerDataTable, readStateTable: postbox.readStateTable, messageHistoryTable: postbox.messageHistoryTable)
-        
-        if self.entries.count == 0 {
-            self.entries.append(entry)
-            return true
-        } else {
-            let first = self.entries[self.entries.count - 1]
-            let last = self.entries[0]
-            
-            let next = self.later
-            
-            if entry.index < last.index {
-                if self.earlier == nil || self.earlier!.index < entry.index {
-                    if self.entries.count < self.count {
-                        self.entries.insert(entry, at: 0)
-                    } else {
-                        self.earlier = entry
-                    }
-                    return true
-                } else {
-                    return false
-                }
-            } else if entry.index > first.index {
-                if next != nil && entry.index > next!.index {
-                    if self.later == nil || self.later!.index > entry.index {
-                        if self.entries.count < self.count {
-                            self.entries.append(entry)
-                        } else {
-                            self.later = entry
-                        }
-                        return true
-                    } else {
-                        return false
-                    }
-                } else {
-                    self.entries.append(entry)
-                    if self.entries.count > self.count {
-                        self.earlier = self.entries[0]
-                        self.entries.remove(at: 0)
-                    }
-                    return true
-                }
-            } else if entry != last && entry != first {
-                var i = self.entries.count
-                while i >= 1 {
-                    if self.entries[i - 1].index < entry.index {
-                        break
-                    }
-                    i -= 1
-                }
-                self.entries.insert(entry, at: i)
-                if self.entries.count > self.count {
-                    self.earlier = self.entries[0]
-                    self.entries.remove(at: 0)
-                }
-                return true
-            } else {
-                return false
-            }
-        }
-    }
-    
-    private func remove(_ indices: Set<ChatListIndex>, type: ChatListEntryType, context: MutableChatListViewReplayContext) -> Bool {
-        var hasChanges = false
-        if let earlier = self.earlier, indices.contains(earlier.index) {
-            var match = false
-            switch earlier {
-                case .HoleEntry:
-                    match = type == .hole
-                case .IntermediateMessageEntry, .MessageEntry:
-                    match = type == .message
-                /*case .IntermediateGroupReferenceEntry, .GroupReferenceEntry:
-                    match = type == .groupReference*/
-            }
-            if match {
-                context.invalidEarlier = true
-                hasChanges = true
-            }
-        }
-        
-        if let later = self.later, indices.contains(later.index) {
-            var match = false
-            switch later {
-                case .HoleEntry:
-                    match = type == .hole
-                case .IntermediateMessageEntry, .MessageEntry:
-                    match = type == .message
-                /*case .IntermediateGroupReferenceEntry, .GroupReferenceEntry:
-                    match = type == .groupReference*/
-            }
-            if match {
-                context.invalidLater = true
-                hasChanges = true
-            }
-        }
-        
-        if self.entries.count != 0 {
-            var i = self.entries.count - 1
-            while i >= 0 {
-                if indices.contains(self.entries[i].index) {
-                    var match = false
-                    switch self.entries[i] {
-                        case .HoleEntry:
-                            match = type == .hole
-                        case .IntermediateMessageEntry, .MessageEntry:
-                            match = type == .message
-                        /*case .IntermediateGroupReferenceEntry, .GroupReferenceEntry:
-                            match = type == .groupReference*/
-                    }
-                    if match {
-                        self.entries.remove(at: i)
-                        context.removedEntries = true
-                        hasChanges = true
-                    }
-                }
-                i -= 1
-            }
-        }
-        
+        }*/
         return hasChanges
     }
     
     func complete(postbox: Postbox, context: MutableChatListViewReplayContext) {
-        if context.removedEntries {
-            var addedEntries: [MutableChatListEntry] = []
-            
-            var latestAnchor: ChatListIndex?
-            if let last = self.entries.last {
-                latestAnchor = last.index
-            }
-            
-            if latestAnchor == nil {
-                if let later = self.later {
-                    latestAnchor = later.index
-                }
-            }
-            
-            if let later = self.later {
-                addedEntries += postbox.fetchLaterChatEntries(groupId: self.groupId, index: later.index.predecessor, count: self.count, filterPredicate: filterPredicate)
-            }
-            if let earlier = self.earlier {
-                addedEntries += postbox.fetchEarlierChatEntries(groupId: self.groupId, index: earlier.index.successor, count: self.count, filterPredicate: filterPredicate)
-            }
-            
-            addedEntries += self.entries
-            addedEntries.sort(by: { $0.index < $1.index })
-            var i = addedEntries.count - 1
-            while i >= 1 {
-                if addedEntries[i].index.messageIndex.id == addedEntries[i - 1].index.messageIndex.id {
-                    addedEntries.remove(at: i)
-                }
-                i -= 1
-            }
-            self.entries = []
-            
-            var anchorIndex = addedEntries.count - 1
-            if let latestAnchor = latestAnchor {
-                var i = addedEntries.count - 1
-                while i >= 0 {
-                    if addedEntries[i].index <= latestAnchor {
-                        anchorIndex = i
-                        break
-                    }
-                    i -= 1
-                }
-            }
-            
-            self.later = nil
-            if anchorIndex + 1 < addedEntries.count {
-                self.later = addedEntries[anchorIndex + 1]
-            }
-            
-            i = anchorIndex
-            while i >= 0 && i > anchorIndex - self.count {
-                self.entries.insert(addedEntries[i], at: 0)
-                i -= 1
-            }
-            
-            self.earlier = nil
-            if anchorIndex - self.count >= 0 {
-                self.earlier = addedEntries[anchorIndex - self.count]
-            }
-        } else {
-            if context.invalidEarlier {
-                var earlyId: ChatListIndex?
-                let i = 0
-                if i < self.entries.count {
-                    earlyId = self.entries[i].index
-                }
-                
-                let earlierEntries = postbox.fetchEarlierChatEntries(groupId: self.groupId, index: earlyId, count: 1, filterPredicate: self.filterPredicate)
-                self.earlier = earlierEntries.first
-            }
-            
-            if context.invalidLater {
-                var laterId: ChatListIndex?
-                let i = self.entries.count - 1
-                if i >= 0 {
-                    laterId = self.entries[i].index
-                }
-                
-                let laterEntries = postbox.fetchLaterChatEntries(groupId: self.groupId, index: laterId, count: 1, filterPredicate: self.filterPredicate)
-                self.later = laterEntries.first
-            }
-        }
-    }
-    
-    func firstHole() -> ChatListHole? {
-        for entry in self.entries {
-            if case let .HoleEntry(hole) = entry {
-                return hole
-            }
-        }
         
-        return nil
     }
     
-    private func renderEntry(_ entry: MutableChatListEntry, postbox: Postbox, renderMessage: (IntermediateMessage) -> Message, getPeer: (PeerId) -> Peer?, getPeerNotificationSettings: (PeerId) -> PeerNotificationSettings?, getPeerPresence: (PeerId) -> PeerPresence?) -> MutableChatListEntry? {
+    func firstHole() -> (PeerGroupId, ChatListHole)? {
+        return self.sampledState.hole
+    }
+    
+    /*private func renderEntry(_ entry: MutableChatListEntry, postbox: Postbox, renderMessage: (IntermediateMessage) -> Message, getPeer: (PeerId) -> Peer?, getPeerNotificationSettings: (PeerId) -> PeerNotificationSettings?, getPeerPresence: (PeerId) -> PeerPresence?) -> MutableChatListEntry? {
         switch entry {
-        case let .IntermediateMessageEntry(index, message, combinedReadState, embeddedState):
+        case let .IntermediateMessageEntry(index, messageIndex):
             let renderedMessage: Message?
-            if let message = message {
-                renderedMessage = renderMessage(message)
+            if let messageIndex = messageIndex {
+                renderedMessage = postbox.messageHistoryTable.getMessage(messageIndex).flatMap(renderMessage)
             } else {
                 renderedMessage = nil
             }
             var peers = SimpleDictionary<PeerId, Peer>()
             var notificationSettings: PeerNotificationSettings?
             var presence: PeerPresence?
+            var isContact: Bool = false
             if let peer = getPeer(index.messageIndex.id.peerId) {
                 peers[peer.id] = peer
                 if let associatedPeerId = peer.associatedPeerId {
@@ -1001,9 +553,11 @@ final class MutableChatListView {
                     }
                     notificationSettings = getPeerNotificationSettings(associatedPeerId)
                     presence = getPeerPresence(associatedPeerId)
+                    isContact = postbox.contactsTable.isContact(peerId: associatedPeerId)
                 } else {
                     notificationSettings = getPeerNotificationSettings(index.messageIndex.id.peerId)
                     presence = getPeerPresence(index.messageIndex.id.peerId)
+                    isContact = postbox.contactsTable.isContact(peerId: peer.id)
                 }
             }
             
@@ -1022,14 +576,14 @@ final class MutableChatListView {
                 actionsSummaryCount = postbox.pendingMessageActionsMetadataTable.getCount(.peerNamespaceAction(key.peerId, key.namespace, key.type))
             }
             
-            return .MessageEntry(index, renderedMessage, combinedReadState, notificationSettings, embeddedState, RenderedPeer(peerId: index.messageIndex.id.peerId, peers: peers), presence, ChatListMessageTagSummaryInfo(tagSummaryCount: tagSummaryCount, actionsSummaryCount: actionsSummaryCount), postbox.messageHistoryFailedTable.contains(peerId: index.messageIndex.id.peerId))
+            return .MessageEntry(index: index, message: renderedMessage, readState: postbox.readStateTable.getCombinedState(index.messageIndex.id.peerId), notificationSettings: notificationSettings, embeddedInterfaceState: postbox.peerChatInterfaceStateTable.get(index.messageIndex.id.peerId)?.chatListEmbeddedState, renderedPeer: RenderedPeer(peerId: index.messageIndex.id.peerId, peers: peers), presence: presence, tagSummaryInfo: ChatListMessageTagSummaryInfo(tagSummaryCount: tagSummaryCount, actionsSummaryCount: actionsSummaryCount), hasFailedMessages: postbox.messageHistoryFailedTable.contains(peerId: index.messageIndex.id.peerId), isContact: isContact)
         default:
             return nil
         }
-    }
+    }*/
     
     func render(postbox: Postbox, renderMessage: (IntermediateMessage) -> Message, getPeer: (PeerId) -> Peer?, getPeerNotificationSettings: (PeerId) -> PeerNotificationSettings?, getPeerPresence: (PeerId) -> PeerPresence?) {
-        for i in 0 ..< self.entries.count {
+        /*for i in 0 ..< self.entries.count {
             if let updatedEntry = self.renderEntry(self.entries[i], postbox: postbox, renderMessage: renderMessage, getPeer: getPeer, getPeerNotificationSettings: getPeerNotificationSettings, getPeerPresence: getPeerPresence) {
                 self.entries[i] = updatedEntry
             }
@@ -1044,6 +598,11 @@ final class MutableChatListView {
                 self.additionalMixedItemEntries[i] = updatedEntry
             }
         }
+        for i in 0 ..< self.additionalMixedPinnedEntries.count {
+            if let updatedEntry = self.renderEntry(self.additionalMixedPinnedEntries[i], postbox: postbox, renderMessage: renderMessage, getPeer: getPeer, getPeerNotificationSettings: getPeerNotificationSettings, getPeerPresence: getPeerPresence) {
+                self.additionalMixedPinnedEntries[i] = updatedEntry
+            }
+        }*/
     }
 }
 
@@ -1059,17 +618,17 @@ public final class ChatListView {
         self.groupId = mutableView.groupId
         
         var entries: [ChatListEntry] = []
-        for entry in mutableView.entries {
+        for entry in mutableView.sampledState.entries {
             switch entry {
-            case let .MessageEntry(index, message, combinedReadState, notificationSettings, embeddedState, peer, peerPresence, summaryInfo, hasFailed):
-                entries.append(.MessageEntry(index, message, combinedReadState, notificationSettings, embeddedState, peer, peerPresence, summaryInfo, hasFailed))
+            case let .MessageEntry(index, message, combinedReadState, notificationSettings, embeddedState, peer, peerPresence, summaryInfo, hasFailed, isContact):
+                entries.append(.MessageEntry(index, message, combinedReadState, notificationSettings, embeddedState, peer, peerPresence, summaryInfo, hasFailed, isContact))
             case let .HoleEntry(hole):
                 entries.append(.HoleEntry(hole))
             case .IntermediateMessageEntry:
                 assertionFailure()
             }
         }
-        if !mutableView.additionalMixedItemEntries.isEmpty {
+        /*if !mutableView.additionalMixedItemEntries.isEmpty || !mutableView.additionalMixedPinnedEntries.isEmpty {
             var existingIds = Set<PeerId>()
             for entry in entries {
                 if case let .MessageEntry(messageEntry) = entry {
@@ -1080,8 +639,32 @@ public final class ChatListView {
                 if case let .MessageEntry(messageEntry) = entry {
                     if !existingIds.contains(messageEntry.0.messageIndex.id.peerId) {
                         switch entry {
-                        case let .MessageEntry(index, message, combinedReadState, notificationSettings, embeddedState, peer, peerPresence, summaryInfo, hasFailed):
-                            entries.append(.MessageEntry(index, message, combinedReadState, notificationSettings, embeddedState, peer, peerPresence, summaryInfo, hasFailed))
+                        case let .MessageEntry(index, message, combinedReadState, notificationSettings, embeddedState, peer, peerPresence, summaryInfo, hasFailed, isContact):
+                            if let filterPredicate = mutableView.filterPredicate, let peerValue = peer.peer {
+                                if filterPredicate.includes(peer: peerValue, notificationSettings: notificationSettings, isUnread: combinedReadState?.isUnread ?? false, isContact: isContact, isArchived: true) {
+                                    existingIds.insert(messageEntry.0.messageIndex.id.peerId)
+                                    entries.append(.MessageEntry(ChatListIndex(pinningIndex: nil, messageIndex: index.messageIndex), message, combinedReadState, notificationSettings, embeddedState, peer, peerPresence, summaryInfo, hasFailed, isContact))
+                                }
+                            }
+                        case let .HoleEntry(hole):
+                            entries.append(.HoleEntry(hole))
+                        case .IntermediateMessageEntry:
+                            assertionFailure()
+                        }
+                    }
+                }
+            }
+            for entry in mutableView.additionalMixedPinnedEntries {
+                if case let .MessageEntry(messageEntry) = entry {
+                    if !existingIds.contains(messageEntry.0.messageIndex.id.peerId) {
+                        switch entry {
+                        case let .MessageEntry(index, message, combinedReadState, notificationSettings, embeddedState, peer, peerPresence, summaryInfo, hasFailed, isContact):
+                            if let filterPredicate = mutableView.filterPredicate, let peerValue = peer.peer {
+                                if filterPredicate.includes(peer: peerValue, notificationSettings: notificationSettings, isUnread: combinedReadState?.isUnread ?? false, isContact: isContact, isArchived: false) {
+                                    existingIds.insert(messageEntry.0.messageIndex.id.peerId)
+                                    entries.append(.MessageEntry(ChatListIndex(pinningIndex: nil, messageIndex: index.messageIndex), message, combinedReadState, notificationSettings, embeddedState, peer, peerPresence, summaryInfo, hasFailed, isContact))
+                                }
+                            }
                         case let .HoleEntry(hole):
                             entries.append(.HoleEntry(hole))
                         case .IntermediateMessageEntry:
@@ -1091,27 +674,24 @@ public final class ChatListView {
                 }
             }
             entries.sort()
-        }
-        self.groupEntries = mutableView.groupEntries
+        }*/
         self.entries = entries
-        self.earlierIndex = mutableView.earlier?.index
-        self.laterIndex = mutableView.later?.index
+        self.earlierIndex = mutableView.sampledState.lower?.index
+        self.laterIndex = mutableView.sampledState.upper?.index
+        
+        self.groupEntries = mutableView.groupEntries
         
         var additionalItemEntries: [ChatListEntry] = []
-        for entry in mutableView.additionalItemEntries {
+        /*for entry in mutableView.additionalItemEntries {
             switch entry {
-                case let .MessageEntry(index, message, combinedReadState, notificationSettings, embeddedState, peer, peerPresence, summaryInfo, hasFailed):
-                    additionalItemEntries.append(.MessageEntry(index, message, combinedReadState, notificationSettings, embeddedState, peer, peerPresence, summaryInfo, hasFailed))
+                case let .MessageEntry(index, message, combinedReadState, notificationSettings, embeddedState, peer, peerPresence, summaryInfo, hasFailed, isContact):
+                    additionalItemEntries.append(.MessageEntry(index, message, combinedReadState, notificationSettings, embeddedState, peer, peerPresence, summaryInfo, hasFailed, isContact))
                 case .HoleEntry:
                     assertionFailure()
-                /*case .GroupReferenceEntry:
-                    assertionFailure()*/
                 case .IntermediateMessageEntry:
                     assertionFailure()
-                /*case .IntermediateGroupReferenceEntry:
-                    assertionFailure()*/
             }
-        }
+        }*/
         
         self.additionalItemEntries = additionalItemEntries
     }
diff --git a/submodules/Postbox/Sources/ChatListViewState.swift b/submodules/Postbox/Sources/ChatListViewState.swift
new file mode 100644
index 0000000000..319343ebbb
--- /dev/null
+++ b/submodules/Postbox/Sources/ChatListViewState.swift
@@ -0,0 +1,1056 @@
+
+enum ChatListViewSpacePinned {
+    case notPinned
+    case includePinned
+    case includePinnedAsUnpinned
+    
+    var include: Bool {
+        switch self {
+        case .notPinned:
+            return false
+        case .includePinned, .includePinnedAsUnpinned:
+            return true
+        }
+    }
+}
+
+enum ChatListViewSpace: Hashable {
+    case group(groupId: PeerGroupId, pinned: ChatListViewSpacePinned)
+}
+
+private func mappedChatListFilterPredicate(postbox: Postbox, groupId: PeerGroupId, predicate: ChatListFilterPredicate) -> (ChatListIntermediateEntry) -> Bool {
+    return { entry in
+        switch entry {
+        case let .message(index, _):
+            if let peer = postbox.peerTable.get(index.messageIndex.id.peerId) {
+                let isUnread = postbox.readStateTable.getCombinedState(index.messageIndex.id.peerId)?.isUnread ?? false
+                let notificationsPeerId = peer.notificationSettingsPeerId ?? peer.id
+                let isContact = postbox.contactsTable.isContact(peerId: notificationsPeerId)
+                if predicate.includes(peer: peer, groupId: groupId, notificationSettings: postbox.peerNotificationSettingsTable.getEffective(notificationsPeerId), isUnread: isUnread, isContact: isContact) {
+                    return true
+                } else {
+                    return false
+                }
+            } else {
+                return false
+            }
+        case .hole:
+            return true
+        }
+    }
+}
+
+private func updateMessagePeers(_ message: Message, updatedPeers: [PeerId: Peer]) -> Message? {
+    var updated = false
+    for (peerId, currentPeer) in message.peers {
+        if let updatedPeer = updatedPeers[peerId], !arePeersEqual(currentPeer, updatedPeer) {
+            updated = true
+            break
+        }
+    }
+    if updated {
+        var peers = SimpleDictionary<PeerId, Peer>()
+        for (peerId, currentPeer) in message.peers {
+            if let updatedPeer = updatedPeers[peerId] {
+                peers[peerId] = updatedPeer
+            } else {
+                peers[peerId] = currentPeer
+            }
+        }
+        return Message(stableId: message.stableId, stableVersion: message.stableVersion, id: message.id, globallyUniqueId: message.globallyUniqueId, groupingKey: message.groupingKey, groupInfo: message.groupInfo, timestamp: message.timestamp, flags: message.flags, tags: message.tags, globalTags: message.globalTags, localTags: message.localTags, forwardInfo: message.forwardInfo, author: message.author, text: message.text, attributes: message.attributes, media: message.media, peers: peers, associatedMessages: message.associatedMessages, associatedMessageIds: message.associatedMessageIds)
+    }
+    return nil
+}
+
+private func updatedRenderedPeer(_ renderedPeer: RenderedPeer, updatedPeers: [PeerId: Peer]) -> RenderedPeer? {
+    var updated = false
+    for (peerId, currentPeer) in renderedPeer.peers {
+        if let updatedPeer = updatedPeers[peerId], !arePeersEqual(currentPeer, updatedPeer) {
+            updated = true
+            break
+        }
+    }
+    if updated {
+        var peers = SimpleDictionary<PeerId, Peer>()
+        for (peerId, currentPeer) in renderedPeer.peers {
+            if let updatedPeer = updatedPeers[peerId] {
+                peers[peerId] = updatedPeer
+            } else {
+                peers[peerId] = currentPeer
+            }
+        }
+        return RenderedPeer(peerId: renderedPeer.peerId, peers: peers)
+    }
+    return nil
+}
+
+private final class ChatListViewSpaceState {
+    private let space: ChatListViewSpace
+    private let anchorIndex: MutableChatListEntryIndex
+    private let filterPredicate: ChatListFilterPredicate?
+    private let summaryComponents: ChatListEntrySummaryComponents
+    private let halfLimit: Int
+    
+    var orderedEntries: OrderedChatListViewEntries
+    
+    init(postbox: Postbox, space: ChatListViewSpace, anchorIndex: MutableChatListEntryIndex, filterPredicate: ChatListFilterPredicate?, summaryComponents: ChatListEntrySummaryComponents, halfLimit: Int) {
+        self.space = space
+        self.anchorIndex = anchorIndex
+        self.filterPredicate = filterPredicate
+        self.summaryComponents = summaryComponents
+        self.halfLimit = halfLimit
+        self.orderedEntries = OrderedChatListViewEntries(anchorIndex: anchorIndex.index, lowerOrAtAnchor: [], higherThanAnchor: [])
+        self.fillSpace(postbox: postbox)
+    }
+    
+    private func fillSpace(postbox: Postbox) {
+        switch self.space {
+        case let .group(groupId, pinned):
+            let lowerBound: MutableChatListEntryIndex
+            let upperBound: MutableChatListEntryIndex
+            if pinned.include {
+                upperBound = .absoluteUpperBound
+                lowerBound = MutableChatListEntryIndex(index: ChatListIndex.pinnedLowerBound, isMessage: true)
+            } else {
+                upperBound = MutableChatListEntryIndex(index: ChatListIndex.pinnedLowerBound.predecessor, isMessage: true)
+                lowerBound = .absoluteLowerBound
+            }
+            let resolvedAnchorIndex = min(upperBound, max(self.anchorIndex, lowerBound))
+            
+            var lowerOrAtAnchorMessages: [MutableChatListEntry] = self.orderedEntries.lowerOrAtAnchor.reversed()
+            var higherThanAnchorMessages: [MutableChatListEntry] = self.orderedEntries.higherThanAnchor
+            
+            func mapEntry(_ entry: ChatListIntermediateEntry) -> MutableChatListEntry {
+                switch entry {
+                case let .message(index, messageIndex):
+                    var updatedIndex = index
+                    if case .includePinnedAsUnpinned = pinned {
+                        updatedIndex = ChatListIndex(pinningIndex: nil, messageIndex: index.messageIndex)
+                    }
+                    return .IntermediateMessageEntry(index: updatedIndex, messageIndex: messageIndex)
+                case let .hole(hole):
+                    return .HoleEntry(hole)
+                }
+            }
+            
+            if case .includePinnedAsUnpinned = pinned {
+                if lowerOrAtAnchorMessages.count < self.halfLimit || higherThanAnchorMessages.count < self.halfLimit {
+                    let loadedMessages = postbox.chatListTable.entries(groupId: groupId, from: (ChatListIndex.pinnedLowerBound, true), to: (ChatListIndex.absoluteUpperBound, true), peerChatInterfaceStateTable: postbox.peerChatInterfaceStateTable, count: self.halfLimit * 2, predicate: self.filterPredicate.flatMap { mappedChatListFilterPredicate(postbox: postbox, groupId: groupId, predicate: $0) }).map(mapEntry).sorted(by: { $0.entryIndex < $1.entryIndex })
+                    
+                    if lowerOrAtAnchorMessages.count < self.halfLimit {
+                        var nextLowerIndex: MutableChatListEntryIndex
+                        if let lastMessage = lowerOrAtAnchorMessages.min(by: { $0.entryIndex < $1.entryIndex }) {
+                            nextLowerIndex = lastMessage.entryIndex.predecessor
+                        } else {
+                            nextLowerIndex = min(resolvedAnchorIndex, self.anchorIndex)
+                        }
+                        var loadedLowerMessages = Array(loadedMessages.filter({ $0.entryIndex <= nextLowerIndex }).reversed())
+                        let lowerLimit = self.halfLimit - lowerOrAtAnchorMessages.count
+                        if loadedLowerMessages.count > lowerLimit {
+                            loadedLowerMessages.removeLast(loadedLowerMessages.count - lowerLimit)
+                        }
+                        lowerOrAtAnchorMessages.append(contentsOf: loadedLowerMessages)
+                    }
+                    if higherThanAnchorMessages.count < self.halfLimit {
+                        var nextHigherIndex: MutableChatListEntryIndex
+                        if let lastMessage = higherThanAnchorMessages.max(by: { $0.entryIndex < $1.entryIndex }) {
+                            nextHigherIndex = lastMessage.entryIndex.successor
+                        } else {
+                            nextHigherIndex = max(resolvedAnchorIndex, self.anchorIndex.successor)
+                        }
+                        var loadedHigherMessages = loadedMessages.filter({ $0.entryIndex > nextHigherIndex })
+                        let higherLimit = self.halfLimit - higherThanAnchorMessages.count
+                        if loadedHigherMessages.count > higherLimit {
+                            loadedHigherMessages.removeLast(loadedHigherMessages.count - higherLimit)
+                        }
+                        higherThanAnchorMessages.append(contentsOf: loadedHigherMessages)
+                    }
+                }
+            } else {
+                if lowerOrAtAnchorMessages.count < self.halfLimit {
+                    var nextLowerIndex: MutableChatListEntryIndex
+                    if let lastMessage = lowerOrAtAnchorMessages.min(by: { $0.entryIndex < $1.entryIndex }) {
+                        nextLowerIndex = lastMessage.entryIndex.predecessor
+                    } else {
+                        nextLowerIndex = resolvedAnchorIndex
+                    }
+                    let loadedLowerMessages = postbox.chatListTable.entries(groupId: groupId, from: (nextLowerIndex.index, nextLowerIndex.isMessage), to: (lowerBound.index, lowerBound.isMessage), peerChatInterfaceStateTable: postbox.peerChatInterfaceStateTable, count: self.halfLimit - lowerOrAtAnchorMessages.count, predicate: self.filterPredicate.flatMap { mappedChatListFilterPredicate(postbox: postbox, groupId: groupId, predicate: $0) }).map(mapEntry)
+                    lowerOrAtAnchorMessages.append(contentsOf: loadedLowerMessages)
+                }
+                if higherThanAnchorMessages.count < self.halfLimit {
+                    var nextHigherIndex: MutableChatListEntryIndex
+                    if let lastMessage = higherThanAnchorMessages.max(by: { $0.entryIndex < $1.entryIndex }) {
+                        nextHigherIndex = lastMessage.entryIndex.successor
+                    } else {
+                        nextHigherIndex = resolvedAnchorIndex
+                    }
+                    let loadedHigherMessages = postbox.chatListTable.entries(groupId: groupId, from: (nextHigherIndex.index, nextHigherIndex.isMessage), to: (upperBound.index, upperBound.isMessage), peerChatInterfaceStateTable: postbox.peerChatInterfaceStateTable, count: self.halfLimit - higherThanAnchorMessages.count, predicate: self.filterPredicate.flatMap { mappedChatListFilterPredicate(postbox: postbox, groupId: groupId, predicate: $0) }).map(mapEntry)
+                    higherThanAnchorMessages.append(contentsOf: loadedHigherMessages)
+                }
+            }
+            
+            lowerOrAtAnchorMessages.reverse()
+            
+            assert(lowerOrAtAnchorMessages.count <= self.halfLimit)
+            assert(higherThanAnchorMessages.count <= self.halfLimit)
+            
+            let allIndices = (lowerOrAtAnchorMessages + higherThanAnchorMessages).map { $0.entryIndex }
+            assert(Set(allIndices).count == allIndices.count)
+            assert(allIndices.sorted() == allIndices)
+            
+            let entries = OrderedChatListViewEntries(anchorIndex: self.anchorIndex.index, lowerOrAtAnchor: lowerOrAtAnchorMessages, higherThanAnchor: higherThanAnchorMessages)
+            self.orderedEntries = entries
+        }
+    }
+    
+    func replay(postbox: Postbox, transaction: PostboxTransaction) -> Bool {
+        var hasUpdates = false
+        var hadRemovals = false
+        for (groupId, operations) in transaction.chatListOperations {
+            let matchesSpace: Bool
+            switch self.space {
+            case .group(groupId, _):
+                matchesSpace = true
+            default:
+                matchesSpace = false
+            }
+            if !matchesSpace {
+                continue
+            }
+            
+            inner: for operation in operations {
+                switch operation {
+                case let .InsertEntry(index, messageIndex):
+                    switch self.space {
+                    case let .group(_, pinned) where (index.pinningIndex != nil) == pinned.include:
+                        var updatedIndex = index
+                        if case .includePinnedAsUnpinned = pinned {
+                            updatedIndex = ChatListIndex(pinningIndex: nil, messageIndex: index.messageIndex)
+                        }
+                        if let filterPredicate = self.filterPredicate {
+                            if let peer = postbox.peerTable.get(updatedIndex.messageIndex.id.peerId) {
+                                let notificationsPeerId = peer.notificationSettingsPeerId ?? peer.id
+                                if !filterPredicate.includes(peer: peer, groupId: groupId, notificationSettings: postbox.peerNotificationSettingsTable.getEffective(notificationsPeerId), isUnread: postbox.readStateTable.getCombinedState(peer.id)?.isUnread ?? false, isContact: postbox.contactsTable.isContact(peerId: notificationsPeerId)) {
+                                    continue inner
+                                }
+                            } else {
+                                continue inner
+                            }
+                        }
+                        if self.add(entry: .IntermediateMessageEntry(index: updatedIndex, messageIndex: messageIndex)) {
+                            hasUpdates = true
+                        }
+                    default:
+                        break
+                    }
+                case let .InsertHole(hole):
+                    switch self.space {
+                    case let .group(_, pinned) where !pinned.include:
+                        if self.add(entry: .HoleEntry(hole)) {
+                            hasUpdates = true
+                        }
+                    default:
+                        break
+                    }
+                case let .RemoveEntry(indices):
+                    for index in indices {
+                        var updatedIndex = index
+                        if case .group(_, .includePinnedAsUnpinned) = self.space {
+                            updatedIndex = ChatListIndex(pinningIndex: nil, messageIndex: index.messageIndex)
+                        }
+                        
+                        if self.orderedEntries.remove(index: MutableChatListEntryIndex(index: updatedIndex, isMessage: true)) {
+                            hasUpdates = true
+                            hadRemovals = true
+                        }
+                    }
+                case let .RemoveHoles(indices):
+                    for index in indices {
+                        if self.orderedEntries.remove(index: MutableChatListEntryIndex(index: index, isMessage: false)) {
+                            hasUpdates = true
+                            hadRemovals = true
+                        }
+                    }
+                }
+            }
+        }
+        
+        if !transaction.currentUpdatedPeerNotificationSettings.isEmpty, let filterPredicate = self.filterPredicate, case let .group(groupId, pinned) = self.space {
+            var removeEntryIndices: [MutableChatListEntryIndex] = []
+            let _ = self.orderedEntries.mutableScan { entry in
+                let entryPeer: Peer
+                let entryNotificationsPeerId: PeerId
+                switch entry {
+                case let .MessageEntry(messageEntry):
+                    if let peer = messageEntry.renderedPeer.peer {
+                        entryPeer = peer
+                        entryNotificationsPeerId = peer.notificationSettingsPeerId ?? peer.id
+                    } else {
+                        return nil
+                    }
+                case let .IntermediateMessageEntry(intermediateMessageEntry):
+                    if let peer = postbox.peerTable.get(intermediateMessageEntry.index.messageIndex.id.peerId) {
+                        entryPeer = peer
+                        entryNotificationsPeerId = peer.notificationSettingsPeerId ?? peer.id
+                    } else {
+                        return nil
+                    }
+                case .HoleEntry:
+                    return nil
+                }
+                if let settingsChange = transaction.currentUpdatedPeerNotificationSettings[entryNotificationsPeerId] {
+                    let isUnread = postbox.readStateTable.getCombinedState(entryPeer.id)?.isUnread ?? false
+                    let wasIncluded = filterPredicate.includes(peer: entryPeer, groupId: groupId, notificationSettings: settingsChange.0, isUnread: isUnread, isContact: postbox.contactsTable.isContact(peerId: entryNotificationsPeerId))
+                    let isIncluded = filterPredicate.includes(peer: entryPeer, groupId: groupId, notificationSettings: settingsChange.1, isUnread: isUnread, isContact: postbox.contactsTable.isContact(peerId: entryNotificationsPeerId))
+                    if wasIncluded != isIncluded {
+                        if !isIncluded {
+                            removeEntryIndices.append(entry.entryIndex)
+                        }
+                    }
+                }
+                return nil
+            }
+            if !removeEntryIndices.isEmpty {
+                hasUpdates = true
+                hadRemovals = true
+                for index in removeEntryIndices {
+                    let _ = self.orderedEntries.remove(index: index)
+                }
+            }
+            for (peerId, settingsChange) in transaction.currentUpdatedPeerNotificationSettings {
+                if let mainPeer = postbox.peerTable.get(peerId) {
+                    var peers: [Peer] = [mainPeer]
+                    for associatedId in postbox.reverseAssociatedPeerTable.get(peerId: mainPeer.id) {
+                        if let associatedPeer = postbox.peerTable.get(associatedId) {
+                            peers.append(associatedPeer)
+                        }
+                    }
+                    assert(Set(peers.map { $0.id }).count == peers.count)
+                    
+                    let isUnread = postbox.readStateTable.getCombinedState(peerId)?.isUnread ?? false
+                    let wasIncluded = filterPredicate.includes(peer: mainPeer, groupId: groupId, notificationSettings: settingsChange.0, isUnread: isUnread, isContact: postbox.contactsTable.isContact(peerId: peerId))
+                    let isIncluded = filterPredicate.includes(peer: mainPeer, groupId: groupId, notificationSettings: settingsChange.1, isUnread: isUnread, isContact: postbox.contactsTable.isContact(peerId: peerId))
+                    if wasIncluded != isIncluded {
+                        if isIncluded {
+                            for peer in peers {
+                                let tableEntry = postbox.chatListTable.getEntry(groupId: groupId, peerId: peer.id, messageHistoryTable: postbox.messageHistoryTable, peerChatInterfaceStateTable: postbox.peerChatInterfaceStateTable)
+                                if let entry = tableEntry {
+                                    if pinned.include == (entry.index.pinningIndex != nil) {
+                                        if self.orderedEntries.indicesForPeerId(peer.id) == nil {
+                                            switch entry {
+                                            case let .message(index, messageIndex):
+                                                if self.add(entry: .IntermediateMessageEntry(index: index, messageIndex: messageIndex)) {
+                                                    hasUpdates = true
+                                                }
+                                            default:
+                                                break
+                                            }
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
+        
+        if !transaction.currentUpdatedPeerNotificationSettings.isEmpty {
+            if self.orderedEntries.mutableScan({ entry in
+                switch entry {
+                case let .MessageEntry(messageEntry):
+                    if let peer = messageEntry.renderedPeer.peer {
+                        let notificationsPeerId = peer.notificationSettingsPeerId ?? peer.id
+                        if let (_, updated) = transaction.currentUpdatedPeerNotificationSettings[notificationsPeerId] {
+                            return .MessageEntry(index: messageEntry.index, message: messageEntry.message, readState: messageEntry.readState, notificationSettings: updated, embeddedInterfaceState: messageEntry.embeddedInterfaceState, renderedPeer: messageEntry.renderedPeer, presence: messageEntry.presence, tagSummaryInfo: messageEntry.tagSummaryInfo, hasFailedMessages: messageEntry.hasFailedMessages, isContact: messageEntry.isContact)
+                        } else {
+                            return nil
+                        }
+                    } else {
+                        return nil
+                    }
+                default:
+                    return nil
+                }
+            }) {
+                hasUpdates = true
+            }
+        }
+        
+        if !transaction.updatedFailedMessagePeerIds.isEmpty {
+            if self.orderedEntries.mutableScan({ entry in
+                switch entry {
+                case let .MessageEntry(messageEntry):
+                    if transaction.updatedFailedMessagePeerIds.contains(messageEntry.index.messageIndex.id.peerId) {
+                        return .MessageEntry(index: messageEntry.index, message: messageEntry.message, readState: messageEntry.readState, notificationSettings: messageEntry.notificationSettings, embeddedInterfaceState: messageEntry.embeddedInterfaceState, renderedPeer: messageEntry.renderedPeer, presence: messageEntry.presence, tagSummaryInfo: messageEntry.tagSummaryInfo, hasFailedMessages: postbox.messageHistoryFailedTable.contains(peerId: messageEntry.index.messageIndex.id.peerId), isContact: messageEntry.isContact)
+                    } else {
+                        return nil
+                    }
+                default:
+                    return nil
+                }
+            }) {
+                hasUpdates = true
+            }
+        }
+        
+        if !transaction.currentUpdatedPeers.isEmpty {
+            if self.orderedEntries.mutableScan({ entry in
+                switch entry {
+                case let .MessageEntry(messageEntry):
+                    var updatedMessage: Message?
+                    if let message = messageEntry.message {
+                        updatedMessage = updateMessagePeers(message, updatedPeers: transaction.currentUpdatedPeers)
+                    }
+                    let renderedPeer = updatedRenderedPeer(messageEntry.renderedPeer, updatedPeers: transaction.currentUpdatedPeers)
+                    
+                    if updatedMessage != nil || renderedPeer != nil {
+                        return .MessageEntry(index: messageEntry.index, message: updatedMessage ?? messageEntry.message, readState: messageEntry.readState, notificationSettings: messageEntry.notificationSettings, embeddedInterfaceState: messageEntry.embeddedInterfaceState, renderedPeer: renderedPeer ?? messageEntry.renderedPeer, presence: messageEntry.presence, tagSummaryInfo: messageEntry.tagSummaryInfo, hasFailedMessages: messageEntry.hasFailedMessages, isContact: messageEntry.isContact)
+                    } else {
+                        return nil
+                    }
+                default:
+                    return nil
+                }
+            }) {
+                hasUpdates = true
+            }
+        }
+        
+        if !transaction.currentUpdatedPeerPresences.isEmpty {
+            if self.orderedEntries.mutableScan({ entry in
+                switch entry {
+                case let .MessageEntry(messageEntry):
+                    var presencePeerId = messageEntry.renderedPeer.peerId
+                    if let peer = messageEntry.renderedPeer.peers[messageEntry.renderedPeer.peerId], let associatedPeerId = peer.associatedPeerId {
+                        presencePeerId = associatedPeerId
+                    }
+                    if let presence = transaction.currentUpdatedPeerPresences[presencePeerId] {
+                        return .MessageEntry(index: messageEntry.index, message: messageEntry.message, readState: messageEntry.readState, notificationSettings: messageEntry.notificationSettings, embeddedInterfaceState: messageEntry.embeddedInterfaceState, renderedPeer: messageEntry.renderedPeer, presence: presence, tagSummaryInfo: messageEntry.tagSummaryInfo, hasFailedMessages: messageEntry.hasFailedMessages, isContact: messageEntry.isContact)
+                    } else {
+                        return nil
+                    }
+                default:
+                    return nil
+                }
+            }) {
+                hasUpdates = true
+            }
+        }
+        
+        if !transaction.currentUpdatedMessageTagSummaries.isEmpty || !transaction.currentUpdatedMessageActionsSummaries.isEmpty {
+            if self.orderedEntries.mutableScan({ entry in
+                switch entry {
+                case let .MessageEntry(messageEntry):
+                    var updatedTagSummaryCount: Int32?
+                    var updatedActionsSummaryCount: Int32?
+                    
+                    if let tagSummary = self.summaryComponents.tagSummary {
+                        let key = MessageHistoryTagsSummaryKey(tag: tagSummary.tag, peerId: messageEntry.index.messageIndex.id.peerId, namespace: tagSummary.namespace)
+                        if let summary = transaction.currentUpdatedMessageTagSummaries[key] {
+                            updatedTagSummaryCount = summary.count
+                        }
+                    }
+                    
+                    if let actionsSummary = self.summaryComponents.actionsSummary {
+                        let key = PendingMessageActionsSummaryKey(type: actionsSummary.type, peerId: messageEntry.index.messageIndex.id.peerId, namespace: actionsSummary.namespace)
+                        if let count = transaction.currentUpdatedMessageActionsSummaries[key] {
+                            updatedActionsSummaryCount = count
+                        }
+                    }
+                    
+                    if updatedTagSummaryCount != nil || updatedActionsSummaryCount != nil {
+                        let summaryInfo = ChatListMessageTagSummaryInfo(tagSummaryCount: updatedTagSummaryCount ?? messageEntry.tagSummaryInfo.tagSummaryCount, actionsSummaryCount: updatedActionsSummaryCount ?? messageEntry.tagSummaryInfo.actionsSummaryCount)
+                        
+                        return .MessageEntry(index: messageEntry.index, message: messageEntry.message, readState: messageEntry.readState, notificationSettings: messageEntry.notificationSettings, embeddedInterfaceState: messageEntry.embeddedInterfaceState, renderedPeer: messageEntry.renderedPeer, presence: messageEntry.presence, tagSummaryInfo: summaryInfo, hasFailedMessages: messageEntry.hasFailedMessages, isContact: messageEntry.isContact)
+                    } else {
+                        return nil
+                    }
+                default:
+                    return nil
+                }
+            }) {
+                hasUpdates = true
+            }
+        }
+        
+        if hadRemovals {
+            self.fillSpace(postbox: postbox)
+        }
+        return hasUpdates
+    }
+    
+    private func add(entry: MutableChatListEntry) -> Bool {
+        if self.anchorIndex >= entry.entryIndex {
+            let insertionIndex = binaryInsertionIndex(self.orderedEntries.lowerOrAtAnchor, extract: { $0.entryIndex }, searchItem: entry.entryIndex)
+            
+            if insertionIndex < self.orderedEntries.lowerOrAtAnchor.count {
+                if self.orderedEntries.lowerOrAtAnchor[insertionIndex].entryIndex == entry.entryIndex {
+                    assertionFailure("Inserting an existing index is not allowed")
+                    self.orderedEntries.setLowerOrAtAnchorAtArrayIndex(insertionIndex, to: entry)
+                    return true
+                }
+            }
+            
+            if insertionIndex == 0 && self.orderedEntries.lowerOrAtAnchor.count >= self.halfLimit {
+                return false
+            }
+            self.orderedEntries.insertLowerOrAtAnchorAtArrayIndex(insertionIndex, value: entry)
+            if self.orderedEntries.lowerOrAtAnchor.count > self.halfLimit {
+                self.orderedEntries.removeLowerOrAtAnchorAtArrayIndex(0)
+            }
+            return true
+        } else {
+            let insertionIndex = binaryInsertionIndex(orderedEntries.higherThanAnchor, extract: { $0.entryIndex }, searchItem: entry.entryIndex)
+            
+            if insertionIndex < self.orderedEntries.higherThanAnchor.count {
+                if self.orderedEntries.higherThanAnchor[insertionIndex].entryIndex == entry.entryIndex {
+                    assertionFailure("Inserting an existing index is not allowed")
+                    self.orderedEntries.setHigherThanAnchorAtArrayIndex(insertionIndex, to: entry)
+                    return true
+                }
+            }
+            
+            if insertionIndex == self.orderedEntries.higherThanAnchor.count && self.orderedEntries.higherThanAnchor.count >= self.halfLimit {
+                return false
+            }
+            self.orderedEntries.insertHigherThanAnchorAtArrayIndex(insertionIndex, value: entry)
+            if self.orderedEntries.higherThanAnchor.count > self.halfLimit {
+                self.orderedEntries.removeHigherThanAnchorAtArrayIndex(self.orderedEntries.higherThanAnchor.count - 1)
+            }
+            return true
+        }
+    }
+}
+
+private struct MutableChatListEntryIndex: Hashable, Comparable {
+    var index: ChatListIndex
+    var isMessage: Bool
+    
+    var predecessor: MutableChatListEntryIndex {
+        return MutableChatListEntryIndex(index: self.index.predecessor, isMessage: true)
+    }
+    
+    var successor: MutableChatListEntryIndex {
+        return MutableChatListEntryIndex(index: self.index.successor, isMessage: true)
+    }
+    
+    static let absoluteLowerBound = MutableChatListEntryIndex(index: .absoluteLowerBound, isMessage: true)
+    static let absoluteUpperBound = MutableChatListEntryIndex(index: .absoluteUpperBound, isMessage: true)
+    
+    static func <(lhs: MutableChatListEntryIndex, rhs: MutableChatListEntryIndex) -> Bool {
+        if lhs.index != rhs.index {
+            return lhs.index < rhs.index
+        } else if lhs.isMessage != rhs.isMessage {
+            return lhs.isMessage
+        } else {
+            return false
+        }
+    }
+}
+
+private extension MutableChatListEntry {
+    var messagePeerId: PeerId? {
+        switch self {
+        case let .IntermediateMessageEntry(intermediateMessageEntry):
+            return intermediateMessageEntry.0.messageIndex.id.peerId
+        case let .MessageEntry(messageEntry):
+            return messageEntry.0.messageIndex.id.peerId
+        case .HoleEntry:
+            return nil
+        }
+    }
+    
+    var entryIndex: MutableChatListEntryIndex {
+        switch self {
+        case let .IntermediateMessageEntry(intermediateMessageEntry):
+            return MutableChatListEntryIndex(index: intermediateMessageEntry.index, isMessage: true)
+        case let .MessageEntry(messageEntry):
+            return MutableChatListEntryIndex(index: messageEntry.index, isMessage: true)
+        case let .HoleEntry(hole):
+            return MutableChatListEntryIndex(index: ChatListIndex(pinningIndex: nil, messageIndex: hole.index), isMessage: false)
+        }
+    }
+}
+
+private struct OrderedChatListViewEntries {
+    private let anchorIndex: ChatListIndex
+    
+    private(set) var lowerOrAtAnchor: [MutableChatListEntry]
+    private(set) var higherThanAnchor: [MutableChatListEntry]
+    
+    private(set) var reverseIndices: [PeerId: [MutableChatListEntryIndex]] = [:]
+    
+    fileprivate init(anchorIndex: ChatListIndex, lowerOrAtAnchor: [MutableChatListEntry], higherThanAnchor: [MutableChatListEntry]) {
+        self.anchorIndex = anchorIndex
+        assert(!lowerOrAtAnchor.contains(where: { $0.index > anchorIndex }))
+        assert(!higherThanAnchor.contains(where: { $0.index <= anchorIndex }))
+        
+        self.lowerOrAtAnchor = lowerOrAtAnchor
+        self.higherThanAnchor = higherThanAnchor
+        
+        for entry in lowerOrAtAnchor {
+            if let peerId = entry.messagePeerId {
+                if self.reverseIndices[peerId] == nil {
+                    self.reverseIndices[peerId] = [entry.entryIndex]
+                } else {
+                    self.reverseIndices[peerId]!.append(entry.entryIndex)
+                }
+            }
+        }
+        for entry in higherThanAnchor {
+            if let peerId = entry.messagePeerId {
+                if self.reverseIndices[peerId] == nil {
+                    self.reverseIndices[peerId] = [entry.entryIndex]
+                } else {
+                    self.reverseIndices[peerId]!.append(entry.entryIndex)
+                }
+            }
+        }
+    }
+    
+    mutating func setLowerOrAtAnchorAtArrayIndex(_ index: Int, to value: MutableChatListEntry) {
+        assert(value.index <= self.anchorIndex)
+        
+        let previousIndex = self.lowerOrAtAnchor[index].entryIndex
+        let updatedIndex = value.entryIndex
+        let previousPeerId = self.lowerOrAtAnchor[index].messagePeerId
+        let updatedPeerId = value.messagePeerId
+        
+        self.lowerOrAtAnchor[index] = value
+        
+        if previousPeerId != updatedPeerId {
+            if let previousPeerId = previousPeerId {
+                self.reverseIndices[previousPeerId]?.removeAll(where: { $0 == previousIndex })
+                if let isEmpty = self.reverseIndices[previousPeerId]?.isEmpty, isEmpty {
+                    self.reverseIndices.removeValue(forKey: previousPeerId)
+                }
+            }
+            if let updatedPeerId = updatedPeerId {
+                if self.reverseIndices[updatedPeerId] == nil {
+                    self.reverseIndices[updatedPeerId] = [updatedIndex]
+                } else {
+                    self.reverseIndices[updatedPeerId]!.append(updatedIndex)
+                }
+            }
+        }
+    }
+    
+    mutating func setHigherThanAnchorAtArrayIndex(_ index: Int, to value: MutableChatListEntry) {
+        assert(value.index > self.anchorIndex)
+        
+        let previousIndex = self.higherThanAnchor[index].entryIndex
+        let updatedIndex = value.entryIndex
+        let previousPeerId = self.higherThanAnchor[index].messagePeerId
+        let updatedPeerId = value.messagePeerId
+        
+        self.higherThanAnchor[index] = value
+        
+        if previousPeerId != updatedPeerId {
+            if let previousPeerId = previousPeerId {
+                self.reverseIndices[previousPeerId]?.removeAll(where: { $0 == previousIndex })
+                if let isEmpty = self.reverseIndices[previousPeerId]?.isEmpty, isEmpty {
+                    self.reverseIndices.removeValue(forKey: previousPeerId)
+                }
+            }
+            if let updatedPeerId = updatedPeerId {
+                if self.reverseIndices[updatedPeerId] == nil {
+                    self.reverseIndices[updatedPeerId] = [updatedIndex]
+                } else {
+                    self.reverseIndices[updatedPeerId]!.append(updatedIndex)
+                }
+            }
+        }
+    }
+    
+    mutating func insertLowerOrAtAnchorAtArrayIndex(_ index: Int, value: MutableChatListEntry) {
+        assert(value.index <= self.anchorIndex)
+        self.lowerOrAtAnchor.insert(value, at: index)
+        
+        if let peerId = value.messagePeerId {
+            if self.reverseIndices[peerId] == nil {
+                self.reverseIndices[peerId] = [value.entryIndex]
+            } else {
+                self.reverseIndices[peerId]!.append(value.entryIndex)
+            }
+        }
+    }
+    
+    mutating func insertHigherThanAnchorAtArrayIndex(_ index: Int, value: MutableChatListEntry) {
+        assert(value.index > self.anchorIndex)
+        self.higherThanAnchor.insert(value, at: index)
+        
+        if let peerId = value.messagePeerId {
+            if self.reverseIndices[peerId] == nil {
+                self.reverseIndices[peerId] = [value.entryIndex]
+            } else {
+                self.reverseIndices[peerId]!.append(value.entryIndex)
+            }
+        }
+    }
+    
+    mutating func removeLowerOrAtAnchorAtArrayIndex(_ index: Int) {
+        let previousIndex = self.lowerOrAtAnchor[index].entryIndex
+        if let peerId = self.lowerOrAtAnchor[index].messagePeerId {
+            self.reverseIndices[peerId]?.removeAll(where: { $0 == previousIndex })
+            if let isEmpty = self.reverseIndices[peerId]?.isEmpty, isEmpty {
+                self.reverseIndices.removeValue(forKey: peerId)
+            }
+        }
+        
+        self.lowerOrAtAnchor.remove(at: index)
+    }
+    
+    mutating func removeHigherThanAnchorAtArrayIndex(_ index: Int) {
+        let previousIndex = self.higherThanAnchor[index].entryIndex
+        if let peerId = self.higherThanAnchor[index].messagePeerId {
+            self.reverseIndices[peerId]?.removeAll(where: { $0 == previousIndex })
+            if let isEmpty = self.reverseIndices[peerId]?.isEmpty, isEmpty {
+                self.reverseIndices.removeValue(forKey: peerId)
+            }
+        }
+        
+        self.higherThanAnchor.remove(at: index)
+    }
+    
+    func find(index: MutableChatListEntryIndex) -> MutableChatListEntry? {
+        if let entryIndex = binarySearch(self.lowerOrAtAnchor, extract: { $0.entryIndex }, searchItem: index) {
+            return self.lowerOrAtAnchor[entryIndex]
+        } else if let entryIndex = binarySearch(self.higherThanAnchor, extract: { $0.entryIndex }, searchItem: index) {
+            return self.higherThanAnchor[entryIndex]
+        } else {
+            return nil
+        }
+    }
+    
+    func indicesForPeerId(_ peerId: PeerId) -> [MutableChatListEntryIndex]? {
+        return self.reverseIndices[peerId]
+    }
+    
+    var first: MutableChatListEntry? {
+        return self.lowerOrAtAnchor.first ?? self.higherThanAnchor.first
+    }
+    
+    mutating func mutableScan(_ f: (MutableChatListEntry) -> MutableChatListEntry?) -> Bool {
+        var anyUpdated = false
+        for i in 0 ..< self.lowerOrAtAnchor.count {
+            if let updated = f(self.lowerOrAtAnchor[i]) {
+                self.setLowerOrAtAnchorAtArrayIndex(i, to: updated)
+                anyUpdated = true
+            }
+        }
+        for i in 0 ..< self.higherThanAnchor.count {
+            if let updated = f(self.higherThanAnchor[i]) {
+                self.setHigherThanAnchorAtArrayIndex(i, to: updated)
+                anyUpdated = true
+            }
+        }
+        return anyUpdated
+    }
+    
+    mutating func update(index: MutableChatListEntryIndex, _ f: (MutableChatListEntry) -> MutableChatListEntry?) -> Bool {
+        if let entryIndex = binarySearch(self.lowerOrAtAnchor, extract: { $0.entryIndex }, searchItem: index) {
+            if let updated = f(self.lowerOrAtAnchor[entryIndex]) {
+                assert(updated.index == self.lowerOrAtAnchor[entryIndex].index)
+                self.setLowerOrAtAnchorAtArrayIndex(entryIndex, to: updated)
+                return true
+            }
+        } else if let entryIndex = binarySearch(self.higherThanAnchor, extract: { $0.entryIndex }, searchItem: index) {
+            if let updated = f(self.higherThanAnchor[entryIndex]) {
+                assert(updated.index == self.lowerOrAtAnchor[entryIndex].index)
+                self.setHigherThanAnchorAtArrayIndex(entryIndex, to: updated)
+                return true
+            }
+        }
+        return false
+    }
+    
+    mutating func remove(index: MutableChatListEntryIndex) -> Bool {
+        if let entryIndex = binarySearch(self.lowerOrAtAnchor, extract: { $0.entryIndex }, searchItem: index) {
+            self.removeLowerOrAtAnchorAtArrayIndex(entryIndex)
+            return true
+        } else if let entryIndex = binarySearch(self.higherThanAnchor, extract: { $0.entryIndex }, searchItem: index) {
+            self.removeHigherThanAnchorAtArrayIndex(entryIndex)
+            return true
+        } else {
+            return false
+        }
+    }
+}
+
+final class ChatListViewSample {
+    let entries: [MutableChatListEntry]
+    let lower: MutableChatListEntry?
+    let upper: MutableChatListEntry?
+    let anchorIndex: ChatListIndex
+    let hole: (PeerGroupId, ChatListHole)?
+    
+    fileprivate init(entries: [MutableChatListEntry], lower: MutableChatListEntry?, upper: MutableChatListEntry?, anchorIndex: ChatListIndex, hole: (PeerGroupId, ChatListHole)?) {
+        self.entries = entries
+        self.lower = lower
+        self.upper = upper
+        self.anchorIndex = anchorIndex
+        self.hole = hole
+    }
+}
+
+struct ChatListViewState {
+    private let anchorIndex: MutableChatListEntryIndex
+    private let filterPredicate: ChatListFilterPredicate?
+    private let summaryComponents: ChatListEntrySummaryComponents
+    private let halfLimit: Int
+    private var stateBySpace: [ChatListViewSpace: ChatListViewSpaceState] = [:]
+    
+    init(postbox: Postbox, spaces: [ChatListViewSpace], anchorIndex: ChatListIndex, filterPredicate: ChatListFilterPredicate?, summaryComponents: ChatListEntrySummaryComponents, halfLimit: Int) {
+        self.anchorIndex = MutableChatListEntryIndex(index: anchorIndex, isMessage: true)
+        self.filterPredicate = filterPredicate
+        self.summaryComponents = summaryComponents
+        self.halfLimit = halfLimit
+        
+        for space in spaces {
+            self.stateBySpace[space] = ChatListViewSpaceState(postbox: postbox, space: space, anchorIndex: self.anchorIndex, filterPredicate: self.filterPredicate, summaryComponents: summaryComponents, halfLimit: halfLimit)
+        }
+    }
+    
+    func replay(postbox: Postbox, transaction: PostboxTransaction) -> Bool {
+        var updated = false
+        for (_, state) in self.stateBySpace {
+            if state.replay(postbox: postbox, transaction: transaction) {
+                updated = true
+            }
+        }
+        return updated
+    }
+    
+    private func sampleIndices() -> (lowerOrAtAnchor: [(ChatListViewSpace, Int)], higherThanAnchor: [(ChatListViewSpace, Int)]) {
+        var previousAnchorIndices: [ChatListViewSpace: Int] = [:]
+        var nextAnchorIndices: [ChatListViewSpace: Int] = [:]
+        for (space, state) in self.stateBySpace {
+            previousAnchorIndices[space] = state.orderedEntries.lowerOrAtAnchor.count - 1
+            nextAnchorIndices[space] = 0
+        }
+        
+        var backwardsResult: [(ChatListViewSpace, Int)] = []
+        var backwardsResultIndices: [ChatListIndex] = []
+        var result: [(ChatListViewSpace, Int)] = []
+        var resultIndices: [ChatListIndex] = []
+        
+        while true {
+            var minSpace: ChatListViewSpace?
+            for (space, value) in previousAnchorIndices {
+                if value != -1 {
+                    if let minSpaceValue = minSpace {
+                        if self.stateBySpace[space]!.orderedEntries.lowerOrAtAnchor[value].entryIndex > self.stateBySpace[minSpaceValue]!.orderedEntries.lowerOrAtAnchor[previousAnchorIndices[minSpaceValue]!].entryIndex {
+                            minSpace = space
+                        }
+                    } else {
+                        minSpace = space
+                    }
+                }
+            }
+            if let minSpace = minSpace {
+                backwardsResult.append((minSpace, previousAnchorIndices[minSpace]!))
+                backwardsResultIndices.append(self.stateBySpace[minSpace]!.orderedEntries.lowerOrAtAnchor[previousAnchorIndices[minSpace]!].index)
+                previousAnchorIndices[minSpace]! -= 1
+                if backwardsResult.count == self.halfLimit {
+                    break
+                }
+            }
+            
+            if minSpace == nil {
+                break
+            }
+        }
+        
+        while true {
+            var maxSpace: ChatListViewSpace?
+            for (space, value) in nextAnchorIndices {
+                if value != self.stateBySpace[space]!.orderedEntries.higherThanAnchor.count {
+                    if let maxSpaceValue = maxSpace {
+                        if self.stateBySpace[space]!.orderedEntries.higherThanAnchor[value].entryIndex < self.stateBySpace[maxSpaceValue]!.orderedEntries.higherThanAnchor[nextAnchorIndices[maxSpaceValue]!].entryIndex {
+                            maxSpace = space
+                        }
+                    } else {
+                        maxSpace = space
+                    }
+                }
+            }
+            if let maxSpace = maxSpace {
+                result.append((maxSpace, nextAnchorIndices[maxSpace]!))
+                resultIndices.append(self.stateBySpace[maxSpace]!.orderedEntries.higherThanAnchor[nextAnchorIndices[maxSpace]!].index)
+                nextAnchorIndices[maxSpace]! += 1
+                if result.count == self.halfLimit {
+                    break
+                }
+            }
+            
+            if maxSpace == nil {
+                break
+            }
+        }
+        
+        backwardsResultIndices.reverse()
+        assert(backwardsResultIndices.sorted() == backwardsResultIndices)
+        assert(resultIndices.sorted() == resultIndices)
+        let combinedIndices = (backwardsResultIndices + resultIndices)
+        assert(combinedIndices.sorted() == combinedIndices)
+        
+        return (backwardsResult.reversed(), result)
+    }
+    
+    func sample(postbox: Postbox) -> ChatListViewSample {
+        let combinedSpacesAndIndicesByDirection = self.sampleIndices()
+        
+        var result: [(ChatListViewSpace, MutableChatListEntry)] = []
+        
+        var sampledHoleIndices: [Int] = []
+        var sampledAnchorBoundaryIndex: Int?
+        
+        var sampledHoleChatListIndices = Set<ChatListIndex>()
+        
+        let directions = [combinedSpacesAndIndicesByDirection.lowerOrAtAnchor, combinedSpacesAndIndicesByDirection.higherThanAnchor]
+        for directionIndex in 0 ..< directions.count {
+            outer: for i in 0 ..< directions[directionIndex].count {
+                let (space, listIndex) = directions[directionIndex][i]
+                
+                let entry: MutableChatListEntry
+                if directionIndex == 0 {
+                    entry = self.stateBySpace[space]!.orderedEntries.lowerOrAtAnchor[listIndex]
+                } else {
+                    entry = self.stateBySpace[space]!.orderedEntries.higherThanAnchor[listIndex]
+                }
+                
+                if entry.entryIndex >= self.anchorIndex {
+                    sampledAnchorBoundaryIndex = result.count
+                }
+                
+                switch entry {
+                case let .IntermediateMessageEntry(index, messageIndex):
+                    var peers = SimpleDictionary<PeerId, Peer>()
+                    var notificationsPeerId = index.messageIndex.id.peerId
+                    if let peer = postbox.peerTable.get(index.messageIndex.id.peerId) {
+                        peers[peer.id] = peer
+                        if let notificationSettingsPeerId = peer.notificationSettingsPeerId {
+                            notificationsPeerId = notificationSettingsPeerId
+                        }
+                        if let associatedPeerId = peer.associatedPeerId {
+                            if let associatedPeer = postbox.peerTable.get(associatedPeerId) {
+                                peers[associatedPeer.id] = associatedPeer
+                            }
+                        }
+                    }
+                    let renderedPeer = RenderedPeer(peerId: index.messageIndex.id.peerId, peers: peers)
+                    
+                    var tagSummaryCount: Int32?
+                    var actionsSummaryCount: Int32?
+                    
+                    if let tagSummary = self.summaryComponents.tagSummary {
+                        let key = MessageHistoryTagsSummaryKey(tag: tagSummary.tag, peerId: index.messageIndex.id.peerId, namespace: tagSummary.namespace)
+                        if let summary = postbox.messageHistoryTagsSummaryTable.get(key) {
+                            tagSummaryCount = summary.count
+                        }
+                    }
+                    
+                    if let actionsSummary = self.summaryComponents.actionsSummary {
+                        let key = PendingMessageActionsSummaryKey(type: actionsSummary.type, peerId: index.messageIndex.id.peerId, namespace: actionsSummary.namespace)
+                        actionsSummaryCount = postbox.pendingMessageActionsMetadataTable.getCount(.peerNamespaceAction(key.peerId, key.namespace, key.type))
+                    }
+                    
+                    let tagSummaryInfo = ChatListMessageTagSummaryInfo(tagSummaryCount: tagSummaryCount, actionsSummaryCount: actionsSummaryCount)
+                    
+                    let updatedEntry: MutableChatListEntry = .MessageEntry(index: index, message: messageIndex.flatMap(postbox.messageHistoryTable.getMessage).flatMap(postbox.renderIntermediateMessage), readState: postbox.readStateTable.getCombinedState(index.messageIndex.id.peerId), notificationSettings: postbox.peerNotificationSettingsTable.getEffective(notificationsPeerId), embeddedInterfaceState: postbox.peerChatInterfaceStateTable.get(index.messageIndex.id.peerId)?.chatListEmbeddedState, renderedPeer: renderedPeer, presence: postbox.peerPresenceTable.get(index.messageIndex.id.peerId), tagSummaryInfo: tagSummaryInfo, hasFailedMessages: false, isContact: postbox.contactsTable.isContact(peerId: index.messageIndex.id.peerId))
+                    if directionIndex == 0 {
+                        self.stateBySpace[space]!.orderedEntries.setLowerOrAtAnchorAtArrayIndex(listIndex, to: updatedEntry)
+                    } else {
+                        self.stateBySpace[space]!.orderedEntries.setHigherThanAnchorAtArrayIndex(listIndex, to: updatedEntry)
+                    }
+                    result.append((space, updatedEntry))
+                case .MessageEntry:
+                    result.append((space, entry))
+                case .HoleEntry:
+                    if !sampledHoleChatListIndices.contains(entry.index) {
+                        sampledHoleChatListIndices.insert(entry.index)
+                        sampledHoleIndices.append(result.count)
+                        
+                        result.append((space, entry))
+                    }
+                }
+            }
+        }
+        
+        let allIndices = result.map { $0.1.entryIndex }
+        let allIndicesSorted = allIndices.sorted()
+        for i in 0 ..< allIndicesSorted.count {
+            assert(allIndicesSorted[i] == allIndices[i])
+        }
+        
+        if Set(allIndices).count != allIndices.count {
+            var seenIndices = Set<MutableChatListEntryIndex>()
+            var updatedResult: [(ChatListViewSpace, MutableChatListEntry)] = []
+            for item in result {
+                if !seenIndices.contains(item.1.entryIndex) {
+                    seenIndices.insert(item.1.entryIndex)
+                    updatedResult.append(item)
+                }
+            }
+            result = updatedResult
+            
+            let allIndices = result.map { $0.1.entryIndex }
+            let allIndicesSorted = allIndices.sorted()
+            for i in 0 ..< allIndicesSorted.count {
+                assert(allIndicesSorted[i] == allIndices[i])
+            }
+            assert(Set(allIndices).count == allIndices.count)
+            
+            assert(false)
+        }
+        
+        var sampledHoleIndex: Int?
+        if !sampledHoleIndices.isEmpty {
+            if let sampledAnchorBoundaryIndex = sampledAnchorBoundaryIndex {
+                var found = false
+                for i in 0 ..< sampledHoleIndices.count {
+                    if i >= sampledAnchorBoundaryIndex {
+                        sampledHoleIndex = sampledHoleIndices[i]
+                        found = true
+                        break
+                    }
+                }
+                if !found {
+                    sampledHoleIndex = sampledHoleIndices.first
+                }
+            } else if let index = sampledHoleIndices.first {
+                sampledHoleIndex = index
+            }
+        }
+        
+        var sampledHole: (ChatListViewSpace, ChatListHole)?
+        if let index = sampledHoleIndex {
+            let (space, entry) = result[index]
+            if case let .HoleEntry(hole) = entry {
+                sampledHole = (space, hole)
+            } else {
+                assertionFailure()
+            }
+        }
+        
+        var lower: MutableChatListEntry?
+        if combinedSpacesAndIndicesByDirection.lowerOrAtAnchor.count >= self.halfLimit {
+            lower = result[0].1
+            result.removeFirst()
+        }
+        
+        var upper: MutableChatListEntry?
+        if combinedSpacesAndIndicesByDirection.higherThanAnchor.count >= self.halfLimit {
+            upper = result.last?.1
+            result.removeLast()
+        }
+        
+        return ChatListViewSample(entries: result.map { $0.1 }, lower: lower, upper: upper, anchorIndex: self.anchorIndex.index, hole: sampledHole.flatMap { space, hole in
+            switch space {
+            case let .group(groupId, _):
+                return (groupId, hole)
+            }
+        })
+    }
+}
diff --git a/submodules/Postbox/Sources/Coding.swift b/submodules/Postbox/Sources/Coding.swift
index e25c870781..5e99986f53 100644
--- a/submodules/Postbox/Sources/Coding.swift
+++ b/submodules/Postbox/Sources/Coding.swift
@@ -1,5 +1,5 @@
 import Foundation
-import sqlcipher
+import MurMurHash32
 
 public protocol PostboxCoding {
     init(decoder: PostboxDecoder)
diff --git a/submodules/Postbox/Sources/Config.xcconfig/Postbox.xcconfig b/submodules/Postbox/Sources/Config.xcconfig/Postbox.xcconfig
deleted file mode 100644
index 17c706bde8..0000000000
--- a/submodules/Postbox/Sources/Config.xcconfig/Postbox.xcconfig
+++ /dev/null
@@ -1,2 +0,0 @@
-SWIFT_INCLUDE_PATHS = $(SRCROOT)/Postbox
-MODULEMAP_PRIVATE_FILE = $(SRCROOT)/Postbox/module.private.modulemap
diff --git a/submodules/Postbox/Sources/ContactTable.swift b/submodules/Postbox/Sources/ContactTable.swift
index 57bc082cc3..8be82c6de4 100644
--- a/submodules/Postbox/Sources/ContactTable.swift
+++ b/submodules/Postbox/Sources/ContactTable.swift
@@ -60,6 +60,21 @@ final class ContactTable: Table {
         self.peerIds = nil
     }
     
+    func transactionUpdatedPeers() -> [PeerId: (Bool, Bool)] {
+        var result: [PeerId: (Bool, Bool)] = [:]
+        if let peerIdsBeforeModification = self.peerIdsBeforeModification {
+            if let peerIds = self.peerIds {
+                let removedPeerIds = peerIdsBeforeModification.subtracting(peerIds)
+                let addedPeerIds = peerIds.subtracting(peerIdsBeforeModification)
+                
+                for peerId in removedPeerIds.union(addedPeerIds) {
+                    result[peerId] = (removedPeerIds.contains(peerId), addedPeerIds.contains(peerId))
+                }
+            }
+        }
+        return result
+    }
+    
     override func beforeCommit() {
         if let peerIdsBeforeModification = self.peerIdsBeforeModification {
             if let peerIds = self.peerIds {
diff --git a/submodules/Postbox/Sources/Database.swift b/submodules/Postbox/Sources/Database.swift
index a832a1f52f..d8fdff2ca8 100644
--- a/submodules/Postbox/Sources/Database.swift
+++ b/submodules/Postbox/Sources/Database.swift
@@ -22,6 +22,7 @@
 // THE SOFTWARE.
 //
 
+import Foundation
 import sqlcipher
 
 public final class Database {
diff --git a/submodules/Postbox/Sources/Hash.swift b/submodules/Postbox/Sources/Hash.swift
index 7df219a841..700db35f5d 100644
--- a/submodules/Postbox/Sources/Hash.swift
+++ b/submodules/Postbox/Sources/Hash.swift
@@ -1,5 +1,5 @@
 import Foundation
-import sqlcipher
+import MurMurHash32
 
 public enum HashFunctions {
     public static func murMurHash32(_ s: String) -> Int32 {
diff --git a/submodules/Postbox/Sources/Info.plist b/submodules/Postbox/Sources/Info.plist
deleted file mode 100644
index d3de8eefb6..0000000000
--- a/submodules/Postbox/Sources/Info.plist
+++ /dev/null
@@ -1,26 +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>CFBundleSignature</key>
-	<string>????</string>
-	<key>CFBundleVersion</key>
-	<string>$(CURRENT_PROJECT_VERSION)</string>
-	<key>NSPrincipalClass</key>
-	<string></string>
-</dict>
-</plist>
diff --git a/submodules/Postbox/Sources/IpcNotifier.h b/submodules/Postbox/Sources/IpcNotifier.h
deleted file mode 100644
index a7f65b9b16..0000000000
--- a/submodules/Postbox/Sources/IpcNotifier.h
+++ /dev/null
@@ -1,14 +0,0 @@
-#ifndef IpcNotifier_h
-#define IpcNotifier_h
-
-#import <Foundation/Foundation.h>
-
-@interface RLMNotifier : NSObject
-
-- (instancetype _Nonnull)initWithBasePath:(NSString * _Nonnull)basePath notify:(void (^ _Nonnull)())notify;
-- (void)listen;
-- (void)notifyOtherRealms;
-
-@end
-
-#endif
diff --git a/submodules/Postbox/Sources/IpcNotifier.mm b/submodules/Postbox/Sources/IpcNotifier.mm
deleted file mode 100644
index 62a17a6326..0000000000
--- a/submodules/Postbox/Sources/IpcNotifier.mm
+++ /dev/null
@@ -1,195 +0,0 @@
-#import <sys/event.h>
-#import <sys/stat.h>
-#import <sys/time.h>
-#import <sys/errno.h>
-#import <unistd.h>
-
-#import "IpcNotifier.h"
-
-// Write a byte to a pipe to notify anyone waiting for data on the pipe
-static void notifyFd(int fd) {
-    while (true) {
-        char c = 0;
-        ssize_t ret = write(fd, &c, 1);
-        if (ret == 1) {
-            break;
-        }
-        
-        // If the pipe's buffer is full, we need to read some of the old data in
-        // it to make space. We don't just read in the code waiting for
-        // notifications so that we can notify multiple waiters with a single
-        // write.
-        assert(ret == -1 && errno == EAGAIN);
-        char buff[1024];
-        read(fd, buff, sizeof buff);
-    }
-}
-
-namespace {
-    // A RAII holder for a file descriptor which automatically closes the wrapped fd
-    // when it's deallocated
-    class FdHolder {
-        int fd = -1;
-        void close() {
-            if (fd != -1) {
-                ::close(fd);
-            }
-            fd = -1;
-        }
-        
-        FdHolder& operator=(FdHolder const&) = delete;
-        FdHolder(FdHolder const&) = delete;
-        
-    public:
-        FdHolder() { }
-        ~FdHolder() { close(); }
-        operator int() const { return fd; }
-        
-        FdHolder& operator=(int newFd) {
-            close();
-            fd = newFd;
-            return *this;
-        }
-    };
-}
-
-// Inter-thread and inter-process notifications of changes are done using a
-// named pipe in the filesystem next to the Realm file. Everyone who wants to be
-// notified of commits waits for data to become available on the pipe, and anyone
-// who commits a write transaction writes data to the pipe after releasing the
-// write lock. Note that no one ever actually *reads* from the pipe: the data
-// actually written is meaningless, and trying to read from a pipe from multiple
-// processes at once is fraught with race conditions.
-
-// When a RLMRealm instance is created, we add a CFRunLoopSource to the current
-// thread's runloop. On each cycle of the run loop, the run loop checks each of
-// its sources for work to do, which in the case of CFRunLoopSource is just
-// checking if CFRunLoopSourceSignal has been called since the last time it ran,
-// and if so invokes the function pointer supplied when the source is created,
-// which in our case just invokes `[realm handleExternalChange]`.
-
-// Listening for external changes is done using kqueue() on a background thread.
-// kqueue() lets us efficiently wait until the amount of data which can be read
-// from one or more file descriptors has changed, and tells us which of the file
-// descriptors it was that changed. We use this to wait on both the shared named
-// pipe, and a local anonymous pipe. When data is written to the named pipe, we
-// signal the runloop source and wake up the target runloop, and when data is
-// written to the anonymous pipe the background thread removes the runloop
-// source from the runloop and and shuts down.
-
-@implementation RLMNotifier {
-    // Realm to notify of changes
-    void (^_notify)();
-    // Runloop which notifications are delivered on
-    CFRunLoopRef _runLoop;
-    
-    // Read-write file descriptor for the named pipe which is waited on for
-    // changes and written to when a commit is made
-    FdHolder _notifyFd;
-    // File descriptor for the kqueue
-    FdHolder _kq;
-    // The two ends of an anonymous pipe used to notify the kqueue() thread that
-    // it should be shut down.
-    FdHolder _shutdownReadFd;
-    FdHolder _shutdownWriteFd;
-}
-
-- (instancetype)initWithBasePath:(NSString *)basePath notify:( void (^ _Nonnull)())notify {
-    self = [super init];
-    if (self) {
-        _notify = [notify copy];
-        
-        _kq = kqueue();
-        if (_kq == -1) {
-            return nil;
-        }
-        
-        const char *path = [basePath stringByAppendingString:@"postbox.note"].UTF8String;
-        
-        // Create and open the named pipe
-        int ret = mkfifo(path, 0600);
-        if (ret == -1) {
-            int err = errno;
-            if (err == ENOTSUP) {
-                // Filesystem doesn't support named pipes, so try putting it in tmp instead
-                // Hash collisions are okay here because they just result in doing
-                // extra work, as opposed to correctness problems
-                static NSString *tmpDir = NSTemporaryDirectory();
-                path = [tmpDir stringByAppendingFormat:@"poxtbox_%llu.note", (unsigned long long)[basePath hash]].UTF8String;
-                ret = mkfifo(path, 0600);
-                err = errno;
-            }
-            // the fifo already existing isn't an error
-            if (ret == -1 && err != EEXIST) {
-                return nil;
-            }
-        }
-        
-        _notifyFd = open(path, O_RDWR);
-        if (_notifyFd == -1) {
-            return nil;
-        }
-        
-        // Make writing to the pipe return -1 when the pipe's buffer is full
-        // rather than blocking until there's space available
-        ret = fcntl(_notifyFd, F_SETFL, O_NONBLOCK);
-        if (ret == -1) {
-            return nil;
-        }
-        
-        // Create the anonymous pipe
-        int pipeFd[2];
-        ret = pipe(pipeFd);
-        if (ret == -1) {
-            return nil;
-        }
-        
-        _shutdownReadFd = pipeFd[0];
-        _shutdownWriteFd = pipeFd[1];
-    }
-    return self;
-}
-
-- (void)listen {
-    // Set up the kqueue
-    // EVFILT_READ indicates that we care about data being available to read
-    // on the given file descriptor.
-    // EV_CLEAR makes it wait for the amount of data available to be read to
-    // change rather than just returning when there is any data to read.
-    struct kevent ke[2];
-    EV_SET(&ke[0], _notifyFd, EVFILT_READ, EV_ADD | EV_CLEAR, 0, 0, 0);
-    EV_SET(&ke[1], _shutdownReadFd, EVFILT_READ, EV_ADD | EV_CLEAR, 0, 0, 0);
-    int ret = kevent(_kq, ke, 2, nullptr, 0, nullptr);
-    assert(ret == 0);
-    
-    while (true) {
-        struct kevent event;
-        // Wait for data to become on either fd
-        // Return code is number of bytes available or -1 on error
-        ret = kevent(_kq, nullptr, 0, &event, 1, nullptr);
-        assert(ret >= 0);
-        if (ret == 0) {
-            // Spurious wakeup; just wait again
-            continue;
-        }
-        
-        // Check which file descriptor had activity: if it's the shutdown
-        // pipe, then someone called -stop; otherwise it's the named pipe
-        // and someone committed a write transaction
-        if (event.ident == (uint32_t)_shutdownReadFd) {
-            return;
-        }
-        assert(event.ident == (uint32_t)_notifyFd);
-        
-        _notify();
-    }
-}
-
-- (void)stop {
-    notifyFd(_shutdownWriteFd);
-}
-
-- (void)notifyOtherRealms {
-    notifyFd(_notifyFd);
-}
-@end
diff --git a/submodules/Postbox/Sources/Message.swift b/submodules/Postbox/Sources/Message.swift
index 3968afde45..8e73e9b516 100644
--- a/submodules/Postbox/Sources/Message.swift
+++ b/submodules/Postbox/Sources/Message.swift
@@ -184,10 +184,6 @@ public struct ChatListIndex: Comparable, Hashable {
         return lhs.messageIndex < rhs.messageIndex
     }
     
-    public var hashValue: Int {
-        return self.messageIndex.hashValue
-    }
-    
     public static var absoluteUpperBound: ChatListIndex {
         return ChatListIndex(pinningIndex: 0, messageIndex: MessageIndex.absoluteUpperBound())
     }
@@ -196,6 +192,10 @@ public struct ChatListIndex: Comparable, Hashable {
         return ChatListIndex(pinningIndex: nil, messageIndex: MessageIndex.absoluteLowerBound())
     }
     
+    public static var pinnedLowerBound: ChatListIndex {
+        return ChatListIndex(pinningIndex: UInt16(Int8.max - 1), messageIndex: MessageIndex.absoluteLowerBound())
+    }
+    
     public var predecessor: ChatListIndex {
         return ChatListIndex(pinningIndex: self.pinningIndex, messageIndex: self.messageIndex.predecessor())
     }
diff --git a/submodules/Postbox/Sources/MessageHistoryTable.swift b/submodules/Postbox/Sources/MessageHistoryTable.swift
index f0fb7ca809..cfdda41f95 100644
--- a/submodules/Postbox/Sources/MessageHistoryTable.swift
+++ b/submodules/Postbox/Sources/MessageHistoryTable.swift
@@ -625,7 +625,7 @@ final class MessageHistoryTable: Table {
         return messageIds
     }
     
-    func topMessage(_ peerId: PeerId) -> IntermediateMessage? {
+    func topIndex(peerId: PeerId) -> MessageIndex? {
         var topIndex: MessageIndex?
         for namespace in self.messageHistoryIndexTable.existingNamespaces(peerId: peerId) where self.seedConfiguration.chatMessagesNamespaces.contains(namespace) {
             self.valueBox.range(self.table, start: self.upperBound(peerId: peerId, namespace: namespace), end: self.lowerBound(peerId: peerId, namespace: namespace), keys: { key in
@@ -641,7 +641,11 @@ final class MessageHistoryTable: Table {
             }, limit: 1)
         }
         
-        return topIndex.flatMap(self.getMessage)
+        return topIndex
+    }
+    
+    func topMessage(peerId: PeerId) -> IntermediateMessage? {
+        return self.topIndex(peerId: peerId).flatMap(self.getMessage)
     }
     
     func exists(index: MessageIndex) -> Bool {
diff --git a/submodules/Postbox/Sources/MessageHistoryViewState.swift b/submodules/Postbox/Sources/MessageHistoryViewState.swift
index 731a0d4263..7f46f97daa 100644
--- a/submodules/Postbox/Sources/MessageHistoryViewState.swift
+++ b/submodules/Postbox/Sources/MessageHistoryViewState.swift
@@ -177,7 +177,7 @@ private func binaryIndexOrLower(_ inputArr: [MutableMessageHistoryEntry], _ sear
     return hi
 }
 
-private func sampleEntries(orderedEntriesBySpace: [PeerIdAndNamespace: OrderedHistoryViewEntries], anchor: HistoryViewAnchor, halfLimit: Int) -> (lowerOrAtAnchor:[(PeerIdAndNamespace, Int)], higherThanAnchor: [(PeerIdAndNamespace, Int)]) {
+private func sampleEntries(orderedEntriesBySpace: [PeerIdAndNamespace: OrderedHistoryViewEntries], anchor: HistoryViewAnchor, halfLimit: Int) -> (lowerOrAtAnchor: [(PeerIdAndNamespace, Int)], higherThanAnchor: [(PeerIdAndNamespace, Int)]) {
     var previousAnchorIndices: [PeerIdAndNamespace: Int] = [:]
     var nextAnchorIndices: [PeerIdAndNamespace: Int] = [:]
     for (space, items) in orderedEntriesBySpace {
@@ -1051,7 +1051,7 @@ final class HistoryViewLoadedState {
         
         if let associatedIndices = self.orderedEntriesBySpace[space]!.indicesForAssociatedMessageId(entry.index.id) {
             for associatedIndex in associatedIndices {
-                self.orderedEntriesBySpace[space]!.update(index: associatedIndex, { current in
+                let _ = self.orderedEntriesBySpace[space]!.update(index: associatedIndex, { current in
                     switch current {
                     case .IntermediateMessageEntry:
                         return current
diff --git a/submodules/Postbox/Sources/MutableBasicPeerView.swift b/submodules/Postbox/Sources/MutableBasicPeerView.swift
index 55316f2067..db8f3b1b74 100644
--- a/submodules/Postbox/Sources/MutableBasicPeerView.swift
+++ b/submodules/Postbox/Sources/MutableBasicPeerView.swift
@@ -4,11 +4,15 @@ final class MutableBasicPeerView: MutablePostboxView {
     private let peerId: PeerId
     fileprivate var peer: Peer?
     fileprivate var notificationSettings: PeerNotificationSettings?
+    fileprivate var isContact: Bool
+    fileprivate var groupId: PeerGroupId?
     
     init(postbox: Postbox, peerId: PeerId) {
         self.peerId = peerId
         self.peer = postbox.peerTable.get(peerId)
         self.notificationSettings = postbox.peerNotificationSettingsTable.getEffective(peerId)
+        self.isContact = postbox.contactsTable.isContact(peerId: self.peerId)
+        self.groupId = postbox.chatListIndexTable.get(peerId: peerId).inclusion.groupId
     }
     
     func replay(postbox: Postbox, transaction: PostboxTransaction) -> Bool {
@@ -21,6 +25,20 @@ final class MutableBasicPeerView: MutablePostboxView {
             self.notificationSettings = postbox.peerNotificationSettingsTable.getEffective(peerId)
             updated = true
         }
+        if transaction.replaceContactPeerIds != nil {
+            let isContact = postbox.contactsTable.isContact(peerId: self.peerId)
+            if isContact != self.isContact {
+                self.isContact = isContact
+                updated = true
+            }
+        }
+        if transaction.currentUpdatedChatListInclusions[self.peerId] != nil {
+            let groupId = postbox.chatListIndexTable.get(peerId: peerId).inclusion.groupId
+            if self.groupId != groupId {
+                self.groupId = groupId
+                updated = true
+            }
+        }
         
         return updated
     }
@@ -33,9 +51,13 @@ final class MutableBasicPeerView: MutablePostboxView {
 public final class BasicPeerView: PostboxView {
     public let peer: Peer?
     public let notificationSettings: PeerNotificationSettings?
+    public let isContact: Bool
+    public let groupId: PeerGroupId?
     
     init(_ view: MutableBasicPeerView) {
         self.peer = view.peer
         self.notificationSettings = view.notificationSettings
+        self.isContact = view.isContact
+        self.groupId = view.groupId
     }
 }
diff --git a/submodules/Postbox/Sources/PeerTable.swift b/submodules/Postbox/Sources/PeerTable.swift
index c9dde62fb2..0fb0aa67cc 100644
--- a/submodules/Postbox/Sources/PeerTable.swift
+++ b/submodules/Postbox/Sources/PeerTable.swift
@@ -50,11 +50,12 @@ final class PeerTable: Table {
         assert(self.updatedInitialPeers.isEmpty)
     }
     
-    func transactionUpdatedPeers() -> [(Peer?, Peer)] {
-        var result: [(Peer?, Peer)] = []
+    func transactionUpdatedPeers(contactsTable: ContactTable) -> [((Peer, Bool)?, (Peer, Bool))] {
+        var result: [((Peer, Bool)?, (Peer, Bool))] = []
         for (peerId, initialPeer) in self.updatedInitialPeers {
             if let peer = self.get(peerId) {
-                result.append((initialPeer, peer))
+                let isContact = contactsTable.isContact(peerId: peerId)
+                result.append((initialPeer.flatMap { ($0, isContact) }, (peer, isContact)))
             } else {
                 assertionFailure()
             }
diff --git a/submodules/Postbox/Sources/Postbox.h b/submodules/Postbox/Sources/Postbox.h
deleted file mode 100644
index 4daa6ca180..0000000000
--- a/submodules/Postbox/Sources/Postbox.h
+++ /dev/null
@@ -1,20 +0,0 @@
-//
-//  Postbox.h
-//  Postbox
-//
-//  Created by Peter on 10/06/15.
-//  Copyright (c) 2015 Telegram. All rights reserved.
-//
-
-#import <UIKit/UIKit.h>
-
-//! Project version number for Postbox.
-FOUNDATION_EXPORT double PostboxVersionNumber;
-
-//! Project version string for Postbox.
-FOUNDATION_EXPORT const unsigned char PostboxVersionString[];
-
-// In this header, you should import all the public headers of your framework using statements like #import <Postbox/PublicHeader.h>
-
-#import <Postbox/MurMurHash32.h>
-//#import <Postbox/IpcNotifier.h>
diff --git a/submodules/Postbox/Sources/Postbox.swift b/submodules/Postbox/Sources/Postbox.swift
index 7c837fcf1f..0b7c6f2dab 100644
--- a/submodules/Postbox/Sources/Postbox.swift
+++ b/submodules/Postbox/Sources/Postbox.swift
@@ -763,6 +763,47 @@ public final class Transaction {
         }
     }
     
+    public func getChatCountMatchingPredicate(_ predicate: ChatListFilterPredicate) -> Int {
+        assert(!self.disposed)
+        guard let postbox = self.postbox else {
+            return 0
+        }
+        var includedPeerIds: [PeerId: Bool] = [:]
+        for peerId in predicate.includePeerIds {
+            includedPeerIds[peerId] = false
+        }
+        
+        var count = 0
+        
+        var groupIds: [PeerGroupId] = [.root]
+        groupIds.append(contentsOf: predicate.includeAdditionalPeerGroupIds)
+        for groupId in groupIds {
+            count += postbox.chatListTable.countWithPredicate(groupId: groupId, predicate: { peerId in
+                if let peer = postbox.peerTable.get(peerId) {
+                    let isUnread = postbox.readStateTable.getCombinedState(peerId)?.isUnread ?? false
+                    let notificationsPeerId = peer.notificationSettingsPeerId ?? peerId
+                    let isContact = postbox.contactsTable.isContact(peerId: notificationsPeerId)
+                    if predicate.includes(peer: peer, groupId: groupId, notificationSettings: postbox.peerNotificationSettingsTable.getEffective(notificationsPeerId), isUnread: isUnread, isContact: isContact) {
+                        includedPeerIds[peer.id] = true
+                        return true
+                    } else {
+                        return false
+                    }
+                } else {
+                    return false
+                }
+            })
+        }
+        for (peerId, included) in includedPeerIds {
+            if !included {
+                if postbox.chatListTable.getPeerChatListIndex(peerId: peerId) != nil {
+                    count += 1
+                }
+            }
+        }
+        return count
+    }
+    
     public func legacyGetAccessChallengeData() -> PostboxAccessChallengeData {
         assert(!self.disposed)
         if let postbox = self.postbox {
@@ -1367,9 +1408,9 @@ public final class Postbox {
                 self.messageHistoryMetadataTable.setShouldReindexUnreadCounts(value: true)
                 self.messageHistoryMetadataTable.setShouldReindexUnreadCountsState(value: reindexUnreadVersion)
             }
-            #if DEBUG
+            //#if DEBUG
             self.messageHistoryMetadataTable.setShouldReindexUnreadCounts(value: true)
-            #endif
+            //#endif
             
             if self.messageHistoryMetadataTable.shouldReindexUnreadCounts() {
                 self.groupMessageStatsTable.removeAll()
@@ -1598,7 +1639,7 @@ public final class Postbox {
         switch peerIds {
             case let .associated(_, messageId):
                 if let messageId = messageId, let readState = self.readStateTable.getCombinedState(messageId.peerId), readState.count != 0 {
-                    if let topMessage = self.messageHistoryTable.topMessage(messageId.peerId) {
+                    if let topMessage = self.messageHistoryTable.topMessage(peerId: messageId.peerId) {
                         let _ = self.messageHistoryTable.applyInteractiveMaxReadIndex(postbox: self, messageIndex: topMessage.index, operationsByPeerId: &self.currentOperationsByPeerId, updatedPeerReadStateOperations: &self.currentUpdatedSynchronizeReadStateOperations)
                     }
                 }
@@ -1653,60 +1694,6 @@ public final class Postbox {
         self.synchronizeGroupMessageStatsTable.set(groupId: groupId, namespace: namespace, needsValidation: false, operations: &self.currentUpdatedGroupSummarySynchronizeOperations)
     }
     
-    private func mappedChatListFilterPredicate(_ predicate: ChatListFilterPredicate) -> (ChatListIntermediateEntry) -> Bool {
-        return { entry in
-            switch entry {
-            case let .message(index, _, _):
-                if let peer = self.peerTable.get(index.messageIndex.id.peerId) {
-                    let isUnread = self.readStateTable.getCombinedState(index.messageIndex.id.peerId)?.isUnread ?? false
-                    if predicate.includes(peer: peer, notificationSettings: self.peerNotificationSettingsTable.getEffective(index.messageIndex.id.peerId), isUnread: isUnread) {
-                        return true
-                    } else {
-                        return false
-                    }
-                } else {
-                    return false
-                }
-            case .hole:
-                return true
-            }
-        }
-    }
-    
-    func fetchAroundChatEntries(groupId: PeerGroupId, index: ChatListIndex, count: Int, filterPredicate: ChatListFilterPredicate?) -> (entries: [MutableChatListEntry], earlier: MutableChatListEntry?, later: MutableChatListEntry?) {
-        let mappedPredicate = filterPredicate.flatMap(self.mappedChatListFilterPredicate)
-        let (intermediateEntries, intermediateLower, intermediateUpper) = self.chatListTable.entriesAround(groupId: groupId, index: index, messageHistoryTable: self.messageHistoryTable, peerChatInterfaceStateTable: self.peerChatInterfaceStateTable, count: count, predicate: mappedPredicate)
-        let entries: [MutableChatListEntry] = intermediateEntries.map { entry in
-            return MutableChatListEntry(entry, cachedDataTable: self.cachedPeerDataTable, readStateTable: self.readStateTable, messageHistoryTable: self.messageHistoryTable)
-        }
-        let lower: MutableChatListEntry? = intermediateLower.flatMap { entry in
-            return MutableChatListEntry(entry, cachedDataTable: self.cachedPeerDataTable, readStateTable: self.readStateTable, messageHistoryTable: self.messageHistoryTable)
-        }
-        let upper: MutableChatListEntry? = intermediateUpper.flatMap { entry in
-            return MutableChatListEntry(entry, cachedDataTable: self.cachedPeerDataTable, readStateTable: self.readStateTable, messageHistoryTable: self.messageHistoryTable)
-        }
-        
-        return (entries, lower, upper)
-    }
-    
-    func fetchEarlierChatEntries(groupId: PeerGroupId, index: ChatListIndex?, count: Int, filterPredicate: ChatListFilterPredicate?) -> [MutableChatListEntry] {
-        let mappedPredicate = filterPredicate.flatMap(self.mappedChatListFilterPredicate)
-        let intermediateEntries = self.chatListTable.earlierEntries(groupId: groupId, index: index.flatMap({ ($0, true) }), messageHistoryTable: self.messageHistoryTable, peerChatInterfaceStateTable: self.peerChatInterfaceStateTable, count: count, predicate: mappedPredicate)
-        let entries: [MutableChatListEntry] = intermediateEntries.map { entry in
-            return MutableChatListEntry(entry, cachedDataTable: self.cachedPeerDataTable, readStateTable: self.readStateTable, messageHistoryTable: self.messageHistoryTable)
-        }
-        return entries
-    }
-    
-    func fetchLaterChatEntries(groupId: PeerGroupId, index: ChatListIndex?, count: Int, filterPredicate: ChatListFilterPredicate?) -> [MutableChatListEntry] {
-        let mappedPredicate = filterPredicate.flatMap(self.mappedChatListFilterPredicate)
-        let intermediateEntries = self.chatListTable.laterEntries(groupId: groupId, index: index.flatMap({ ($0, true) }), messageHistoryTable: self.messageHistoryTable, peerChatInterfaceStateTable: self.peerChatInterfaceStateTable, count: count, predicate: mappedPredicate)
-        let entries: [MutableChatListEntry] = intermediateEntries.map { entry in
-            return MutableChatListEntry(entry, cachedDataTable: self.cachedPeerDataTable, readStateTable: self.readStateTable, messageHistoryTable: self.messageHistoryTable)
-        }
-        return entries
-    }
-    
     func renderIntermediateMessage(_ message: IntermediateMessage) -> Message {
         let renderedMessage = self.messageHistoryTable.renderMessage(message, peerTable: self.peerTable)
         
@@ -1738,7 +1725,26 @@ public final class Postbox {
         self.peerChatTopTaggedMessageIdsTable.replay(historyOperationsByPeerId: self.currentOperationsByPeerId)
         
         let alteredInitialPeerCombinedReadStates = self.readStateTable.transactionAlteredInitialPeerCombinedReadStates()
-        let updatedPeers = self.peerTable.transactionUpdatedPeers()
+        var updatedPeers = self.peerTable.transactionUpdatedPeers(contactsTable: self.contactsTable)
+        let updatedContacts = self.contactsTable.transactionUpdatedPeers()
+        if !updatedContacts.isEmpty {
+            var updatedPeerIdToIndex: [PeerId: Int] = [:]
+            var index = 0
+            for (_, peer) in updatedPeers {
+                updatedPeerIdToIndex[peer.0.id] = index
+            }
+            index += 1
+            for (peerId, change) in updatedContacts {
+                if let index = updatedPeerIdToIndex[peerId] {
+                    if let (peer, _) = updatedPeers[index].0 {
+                        updatedPeers[index].0 = (peer, change.0)
+                    }
+                    updatedPeers[index].1 = (updatedPeers[index].1.0, change.1)
+                } else if let peer = self.peerTable.get(peerId) {
+                    updatedPeers.append(((peer, change.0), (peer, change.1)))
+                }
+            }
+        }
         let transactionParticipationInTotalUnreadCountUpdates = self.peerNotificationSettingsTable.transactionParticipationInTotalUnreadCountUpdates(postbox: self)
         self.chatListIndexTable.commitWithTransaction(postbox: self, alteredInitialPeerCombinedReadStates: alteredInitialPeerCombinedReadStates, updatedPeers: updatedPeers, transactionParticipationInTotalUnreadCountUpdates: transactionParticipationInTotalUnreadCountUpdates, updatedRootUnreadState: &self.currentUpdatedTotalUnreadState, updatedGroupTotalUnreadSummaries: &self.currentUpdatedGroupTotalUnreadSummaries, currentUpdatedGroupSummarySynchronizeOperations: &self.currentUpdatedGroupSummarySynchronizeOperations)
         
@@ -3231,7 +3237,7 @@ public final class Postbox {
     
     fileprivate func reindexUnreadCounters() {
         self.groupMessageStatsTable.removeAll()
-        let startTime = CFAbsoluteTimeGetCurrent()
+        let _ = CFAbsoluteTimeGetCurrent()
         let (rootState, summaries) = self.chatListIndexTable.debugReindexUnreadCounts(postbox: self)
         
         self.messageHistoryMetadataTable.setChatListTotalUnreadState(rootState)
diff --git a/submodules/Postbox/Sources/SeedConfiguration.swift b/submodules/Postbox/Sources/SeedConfiguration.swift
index 4f2e8e3644..2ae0cfc1d7 100644
--- a/submodules/Postbox/Sources/SeedConfiguration.swift
+++ b/submodules/Postbox/Sources/SeedConfiguration.swift
@@ -17,13 +17,13 @@ public final class SeedConfiguration {
     public let messageTagsWithSummary: MessageTags
     public let existingGlobalMessageTags: GlobalMessageTags
     public let peerNamespacesRequiringMessageTextIndex: [PeerId.Namespace]
-    public let peerSummaryCounterTags: (Peer) -> PeerSummaryCounterTags
+    public let peerSummaryCounterTags: (Peer, Bool) -> PeerSummaryCounterTags
     public let additionalChatListIndexNamespace: MessageId.Namespace?
     public let messageNamespacesRequiringGroupStatsValidation: Set<MessageId.Namespace>
     public let defaultMessageNamespaceReadStates: [MessageId.Namespace: PeerReadState]
     public let chatMessagesNamespaces: Set<MessageId.Namespace>
     
-    public init(globalMessageIdsPeerIdNamespaces: Set<GlobalMessageIdsNamespace>, initializeChatListWithHole: (topLevel: ChatListHole?, groups: ChatListHole?), messageHoles: [PeerId.Namespace: [MessageId.Namespace: Set<MessageTags>]], existingMessageTags: MessageTags, messageTagsWithSummary: MessageTags, existingGlobalMessageTags: GlobalMessageTags, peerNamespacesRequiringMessageTextIndex: [PeerId.Namespace], peerSummaryCounterTags: @escaping (Peer) -> PeerSummaryCounterTags, additionalChatListIndexNamespace: MessageId.Namespace?, messageNamespacesRequiringGroupStatsValidation: Set<MessageId.Namespace>, defaultMessageNamespaceReadStates: [MessageId.Namespace: PeerReadState], chatMessagesNamespaces: Set<MessageId.Namespace>) {
+    public init(globalMessageIdsPeerIdNamespaces: Set<GlobalMessageIdsNamespace>, initializeChatListWithHole: (topLevel: ChatListHole?, groups: ChatListHole?), messageHoles: [PeerId.Namespace: [MessageId.Namespace: Set<MessageTags>]], existingMessageTags: MessageTags, messageTagsWithSummary: MessageTags, existingGlobalMessageTags: GlobalMessageTags, peerNamespacesRequiringMessageTextIndex: [PeerId.Namespace], peerSummaryCounterTags: @escaping (Peer, Bool) -> PeerSummaryCounterTags, additionalChatListIndexNamespace: MessageId.Namespace?, messageNamespacesRequiringGroupStatsValidation: Set<MessageId.Namespace>, defaultMessageNamespaceReadStates: [MessageId.Namespace: PeerReadState], chatMessagesNamespaces: Set<MessageId.Namespace>) {
         self.globalMessageIdsPeerIdNamespaces = globalMessageIdsPeerIdNamespaces
         self.initializeChatListWithHole = initializeChatListWithHole
         self.messageHoles = messageHoles
diff --git a/submodules/Postbox/Sources/SqliteValueBox.swift b/submodules/Postbox/Sources/SqliteValueBox.swift
index 70b3e5661d..95b4c6a601 100644
--- a/submodules/Postbox/Sources/SqliteValueBox.swift
+++ b/submodules/Postbox/Sources/SqliteValueBox.swift
@@ -221,6 +221,10 @@ public final class SqliteValueBox: ValueBox {
         let _ = try? FileManager.default.createDirectory(atPath: basePath, withIntermediateDirectories: true, attributes: nil)
         let path = basePath + "/db_sqlite"
         
+        #if DEBUG
+        print("Instance \(self) opening sqlite at \(path)")
+        #endif
+        
         #if DEBUG
         let exists = FileManager.default.fileExists(atPath: path)
         postboxLog("Opening \(path), exists: \(exists)")
@@ -1501,13 +1505,55 @@ public final class SqliteValueBox: ValueBox {
     public func filteredRange(_ table: ValueBoxTable, start: ValueBoxKey, end: ValueBoxKey, values: (ValueBoxKey, ReadBuffer) -> ValueBoxFilterResult, limit: Int) {
         var currentStart = start
         var acceptedCount = 0
-        while acceptedCount < limit {
+        while true {
+            if limit > 0 && acceptedCount >= limit {
+                break
+            }
             var hadStop = false
             var lastKey: ValueBoxKey?
             self.range(table, start: currentStart, end: end, values: { key, value in
                 lastKey = key
                 let result = values(key, value)
                 switch result {
+                case .accept:
+                    acceptedCount += 1
+                    if limit > 0 && acceptedCount >= limit {
+                        hadStop = true
+                        return false
+                    } else {
+                        return true
+                    }
+                case .skip:
+                    return true
+                case .stop:
+                    hadStop = true
+                    return false
+                }
+            }, limit: limit)
+            if let lastKey = lastKey {
+                currentStart = lastKey
+            } else {
+                break
+            }
+            if hadStop {
+                break
+            }
+        }
+    }
+    
+    public func filteredRange(_ table: ValueBoxTable, start: ValueBoxKey, end: ValueBoxKey, keys: (ValueBoxKey) -> ValueBoxFilterResult, limit: Int) {
+        var currentStart = start
+        var acceptedCount = 0
+        while true {
+            if limit > 0 && acceptedCount >= limit {
+                break
+            }
+            var hadStop = false
+            var lastKey: ValueBoxKey?
+            self.range(table, start: currentStart, end: end, keys: { key in
+                lastKey = key
+                let result = keys(key)
+                switch result {
                 case .accept:
                     acceptedCount += 1
                     return true
diff --git a/submodules/Postbox/Sources/StringIndexTokens.swift b/submodules/Postbox/Sources/StringIndexTokens.swift
index 6ca16057c8..b69265ae43 100644
--- a/submodules/Postbox/Sources/StringIndexTokens.swift
+++ b/submodules/Postbox/Sources/StringIndexTokens.swift
@@ -1,5 +1,5 @@
 import Foundation
-import sqlcipher
+import StringTransliteration
 
 public enum StringIndexTokenTransliteration {
     case none
diff --git a/submodules/Postbox/Sources/UnreadMessageCountsView.swift b/submodules/Postbox/Sources/UnreadMessageCountsView.swift
index 2f229445fc..7246860341 100644
--- a/submodules/Postbox/Sources/UnreadMessageCountsView.swift
+++ b/submodules/Postbox/Sources/UnreadMessageCountsView.swift
@@ -2,16 +2,19 @@ import Foundation
 
 public enum UnreadMessageCountsItem: Equatable {
     case total(ValueBoxKey?)
+    case totalInGroup(PeerGroupId)
     case peer(PeerId)
 }
 
 private enum MutableUnreadMessageCountsItemEntry {
     case total((ValueBoxKey, PreferencesEntry?)?, ChatListTotalUnreadState)
+    case totalInGroup(PeerGroupId, ChatListTotalUnreadState)
     case peer(PeerId, CombinedPeerReadState?)
 }
 
 public enum UnreadMessageCountsItemEntry {
     case total(PreferencesEntry?, ChatListTotalUnreadState)
+    case totalInGroup(PeerGroupId, ChatListTotalUnreadState)
     case peer(PeerId, CombinedPeerReadState?)
 }
 
@@ -23,6 +26,8 @@ final class MutableUnreadMessageCountsView: MutablePostboxView {
             switch item {
             case let .total(preferencesKey):
                 return .total(preferencesKey.flatMap({ ($0, postbox.preferencesTable.get(key: $0)) }), postbox.messageHistoryMetadataTable.getChatListTotalUnreadState())
+            case let .totalInGroup(groupId):
+                return .totalInGroup(groupId, ChatListTotalUnreadState(absoluteCounters: [:], filteredCounters: [:]))
             case let .peer(peerId):
                 return .peer(peerId, postbox.readStateTable.getCombinedState(peerId))
             }
@@ -57,6 +62,8 @@ final class MutableUnreadMessageCountsView: MutablePostboxView {
                             updated = true
                         }
                     }
+                case let .totalInGroup(groupId, state):
+                    break
                 case let .peer(peerId, _):
                     if transaction.alteredInitialPeerCombinedReadStates[peerId] != nil {
                         self.entries[i] = .peer(peerId, postbox.readStateTable.getCombinedState(peerId))
@@ -82,6 +89,8 @@ public final class UnreadMessageCountsView: PostboxView {
             switch entry {
             case let .total(keyAndValue, state):
                 return .total(keyAndValue?.1, state)
+            case let .totalInGroup(groupId, state):
+                return .totalInGroup(groupId, state)
             case let .peer(peerId, count):
                 return .peer(peerId, count)
             }
@@ -103,7 +112,7 @@ public final class UnreadMessageCountsView: PostboxView {
     public func count(for item: UnreadMessageCountsItem) -> Int32? {
         for entry in self.entries {
             switch entry {
-            case .total:
+            case .total, .totalInGroup:
                 break
             case let .peer(peerId, state):
                 if case .peer(peerId) = item {
diff --git a/submodules/Postbox/Sources/ValueBox.swift b/submodules/Postbox/Sources/ValueBox.swift
index 08396740e6..bdc4010f1f 100644
--- a/submodules/Postbox/Sources/ValueBox.swift
+++ b/submodules/Postbox/Sources/ValueBox.swift
@@ -73,6 +73,7 @@ public protocol ValueBox {
     
     func range(_ table: ValueBoxTable, start: ValueBoxKey, end: ValueBoxKey, values: (ValueBoxKey, ReadBuffer) -> Bool, limit: Int)
     func filteredRange(_ table: ValueBoxTable, start: ValueBoxKey, end: ValueBoxKey, values: (ValueBoxKey, ReadBuffer) -> ValueBoxFilterResult, limit: Int)
+    func filteredRange(_ table: ValueBoxTable, start: ValueBoxKey, end: ValueBoxKey, keys: (ValueBoxKey) -> ValueBoxFilterResult, limit: Int)
     func range(_ table: ValueBoxTable, start: ValueBoxKey, end: ValueBoxKey, keys: (ValueBoxKey) -> Bool, limit: Int)
     func scan(_ table: ValueBoxTable, values: (ValueBoxKey, ReadBuffer) -> Bool)
     func scan(_ table: ValueBoxTable, keys: (ValueBoxKey) -> Bool)
diff --git a/submodules/Postbox/Sources/ViewTracker.swift b/submodules/Postbox/Sources/ViewTracker.swift
index d85a3f8a50..408fd8d842 100644
--- a/submodules/Postbox/Sources/ViewTracker.swift
+++ b/submodules/Postbox/Sources/ViewTracker.swift
@@ -455,7 +455,7 @@ final class ViewTracker {
         
         for (view, _) in self.chatListViews.copyItems() {
             if let hole = view.firstHole() {
-                firstHoles.insert(ChatListHolesEntry(groupId: view.groupId, hole: hole))
+                firstHoles.insert(ChatListHolesEntry(groupId: hole.0, hole: hole.1))
             }
         }
     
diff --git a/submodules/Postbox/Sources/module.private.modulemap b/submodules/Postbox/Sources/module.private.modulemap
deleted file mode 100644
index d1995c7a69..0000000000
--- a/submodules/Postbox/Sources/module.private.modulemap
+++ /dev/null
@@ -1,3 +0,0 @@
-module Postbox.PostboxPrivate {
-    export *
-}
diff --git a/submodules/PresentationDataUtils/BUCK b/submodules/PresentationDataUtils/BUCK
index f5d11c53c9..533f10d829 100644
--- a/submodules/PresentationDataUtils/BUCK
+++ b/submodules/PresentationDataUtils/BUCK
@@ -6,14 +6,14 @@ static_library(
         "Sources/**/*.swift",
     ]),
     deps = [
-	"//submodules/Display:Display#shared",
-	"//submodules/SSignalKit/SwiftSignalKit:SwiftSignalKit#shared",
-	"//submodules/AccountContext:AccountContext",
-	"//submodules/TelegramPresentationData:TelegramPresentationData",
-	"//submodules/AlertUI:AlertUI",
-	"//submodules/ItemListUI:ItemListUI",
-	"//submodules/SolidRoundedButtonNode:SolidRoundedButtonNode",
-    "//submodules/OverlayStatusController:OverlayStatusController",
+    	"//submodules/Display:Display#shared",
+    	"//submodules/SSignalKit/SwiftSignalKit:SwiftSignalKit#shared",
+    	"//submodules/AccountContext:AccountContext",
+    	"//submodules/TelegramPresentationData:TelegramPresentationData",
+    	"//submodules/AlertUI:AlertUI",
+    	"//submodules/ItemListUI:ItemListUI",
+    	"//submodules/SolidRoundedButtonNode:SolidRoundedButtonNode",
+        "//submodules/OverlayStatusController:OverlayStatusController",
     ],
     frameworks = [
         "$SDKROOT/System/Library/Frameworks/Foundation.framework",
diff --git a/submodules/PresentationDataUtils/BUILD b/submodules/PresentationDataUtils/BUILD
new file mode 100644
index 0000000000..022f9f42c3
--- /dev/null
+++ b/submodules/PresentationDataUtils/BUILD
@@ -0,0 +1,22 @@
+load("@build_bazel_rules_swift//swift:swift.bzl", "swift_library")
+
+swift_library(
+    name = "PresentationDataUtils",
+    module_name = "PresentationDataUtils",
+    srcs = glob([
+		"Sources/**/*.swift",
+    ]),
+    deps = [
+        "//submodules/Display:Display",
+        "//submodules/SSignalKit/SwiftSignalKit:SwiftSignalKit",
+        "//submodules/AccountContext:AccountContext",
+        "//submodules/TelegramPresentationData:TelegramPresentationData",
+        "//submodules/AlertUI:AlertUI",
+        "//submodules/ItemListUI:ItemListUI",
+        "//submodules/SolidRoundedButtonNode:SolidRoundedButtonNode",
+        "//submodules/OverlayStatusController:OverlayStatusController",
+    ],
+    visibility = [
+        "//visibility:public",
+    ],
+)
diff --git a/submodules/PresentationDataUtils/Info.plist b/submodules/PresentationDataUtils/Info.plist
deleted file mode 100644
index e1fe4cfb7b..0000000000
--- a/submodules/PresentationDataUtils/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/ProgressNavigationButtonNode/BUILD b/submodules/ProgressNavigationButtonNode/BUILD
new file mode 100644
index 0000000000..ebf9a7e417
--- /dev/null
+++ b/submodules/ProgressNavigationButtonNode/BUILD
@@ -0,0 +1,17 @@
+load("@build_bazel_rules_swift//swift:swift.bzl", "swift_library")
+
+swift_library(
+    name = "ProgressNavigationButtonNode",
+    module_name = "ProgressNavigationButtonNode",
+    srcs = glob([
+        "Sources/**/*.swift",
+    ]),
+    deps = [
+        "//submodules/Display:Display",
+        "//submodules/AsyncDisplayKit:AsyncDisplayKit",
+        "//submodules/ActivityIndicator:ActivityIndicator",
+    ],
+    visibility = [
+        "//visibility:public",
+    ],
+)
diff --git a/submodules/QrCode/BUILD b/submodules/QrCode/BUILD
new file mode 100644
index 0000000000..4cba639671
--- /dev/null
+++ b/submodules/QrCode/BUILD
@@ -0,0 +1,16 @@
+load("@build_bazel_rules_swift//swift:swift.bzl", "swift_library")
+
+swift_library(
+    name = "QrCode",
+    module_name = "QrCode",
+    srcs = glob([
+        "Sources/**/*.swift",
+    ]),
+    deps = [
+        "//submodules/SSignalKit/SwiftSignalKit:SwiftSignalKit",
+        "//submodules/Display:Display",
+    ],
+    visibility = [
+        "//visibility:public",
+    ],
+)
diff --git a/submodules/RMIntro/BUCK b/submodules/RMIntro/BUCK
index b26aaeaad8..b69acbdcdb 100644
--- a/submodules/RMIntro/BUCK
+++ b/submodules/RMIntro/BUCK
@@ -8,10 +8,10 @@ static_library(
     ]),
     headers = glob([
         "Sources/**/*.h",
-    ], exclude = ["Sources/RMIntro.h"]),
+    ]),
     exported_headers = glob([
-        "Sources/**/*.h",
-    ], exclude = ["Sources/RMIntro.h"]),
+        "PublicHeaders/**/*.h",
+    ]),
     deps = [
     	"//submodules/LegacyComponents:LegacyComponents",
     ],
diff --git a/submodules/RMIntro/BUILD b/submodules/RMIntro/BUILD
new file mode 100644
index 0000000000..646805cab6
--- /dev/null
+++ b/submodules/RMIntro/BUILD
@@ -0,0 +1,37 @@
+load("//build-system:unique_directories.bzl", "unique_directories")
+
+private_headers = glob([
+    "Sources/**/*.h",
+])
+
+objc_library(
+    name = "RMIntro",
+    enable_modules = True,
+    module_name = "RMIntro",
+    srcs = glob([
+        "Sources/**/*.m",
+        "Sources/**/*.c",
+    ]) + private_headers,
+    hdrs = glob([
+        "PublicHeaders/**/*.h",
+    ]),
+    includes = [
+        "PublicHeaders",
+    ],
+    copts = [
+        "-I{}/{}".format(package_name(), directory) for directory in unique_directories(private_headers)
+    ] + [
+        "-I{}/PublicHeaders/RMIntro".format(package_name()),
+    ],
+    deps = [
+        "//submodules/LegacyComponents:LegacyComponents",
+    ],
+    sdk_frameworks = [
+        "Foundation",
+        "UIKit",
+        "GLKit",
+    ],
+    visibility = [
+        "//visibility:public",
+    ],
+)
diff --git a/submodules/RMIntro/Info.plist b/submodules/RMIntro/Info.plist
deleted file mode 100644
index e1fe4cfb7b..0000000000
--- a/submodules/RMIntro/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/RMIntro/PublicHeaders/RMIntro/RMIntro.h b/submodules/RMIntro/PublicHeaders/RMIntro/RMIntro.h
new file mode 100644
index 0000000000..dde9a1008c
--- /dev/null
+++ b/submodules/RMIntro/PublicHeaders/RMIntro/RMIntro.h
@@ -0,0 +1,4 @@
+#import <UIKit/UIKit.h>
+
+#import <RMIntro/RMIntroViewController.h>
+
diff --git a/submodules/RMIntro/Sources/platform/ios/RMIntroViewController.h b/submodules/RMIntro/PublicHeaders/RMIntro/RMIntroViewController.h
similarity index 100%
rename from submodules/RMIntro/Sources/platform/ios/RMIntroViewController.h
rename to submodules/RMIntro/PublicHeaders/RMIntro/RMIntroViewController.h
diff --git a/submodules/RMIntro/Sources/RMIntro.h b/submodules/RMIntro/Sources/RMIntro.h
deleted file mode 100644
index 80d982ff62..0000000000
--- a/submodules/RMIntro/Sources/RMIntro.h
+++ /dev/null
@@ -1,10 +0,0 @@
-#import <UIKit/UIKit.h>
-
-//! Project version number for RMIntro.
-FOUNDATION_EXPORT double RMIntroVersionNumber;
-
-//! Project version string for RMIntro.
-FOUNDATION_EXPORT const unsigned char RMIntroVersionString[];
-
-#import <RMIntro/RMIntroViewController.h>
-
diff --git a/submodules/RadialStatusNode/BUILD b/submodules/RadialStatusNode/BUILD
new file mode 100644
index 0000000000..e6c85db366
--- /dev/null
+++ b/submodules/RadialStatusNode/BUILD
@@ -0,0 +1,17 @@
+load("@build_bazel_rules_swift//swift:swift.bzl", "swift_library")
+
+swift_library(
+    name = "RadialStatusNode",
+    module_name = "RadialStatusNode",
+    srcs = glob([
+		"Sources/**/*.swift",
+    ]),
+    deps = [
+        "//submodules/Display:Display",
+        "//submodules/AsyncDisplayKit:AsyncDisplayKit",
+        "//submodules/LegacyComponents:LegacyComponents",
+    ],
+    visibility = [
+        "//visibility:public",
+    ],
+)
diff --git a/submodules/RadialStatusNode/Info.plist b/submodules/RadialStatusNode/Info.plist
deleted file mode 100644
index e1fe4cfb7b..0000000000
--- a/submodules/RadialStatusNode/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/RadialStatusNode/Sources/RadialStatusNode.h b/submodules/RadialStatusNode/Sources/RadialStatusNode.h
deleted file mode 100644
index ddec279dae..0000000000
--- a/submodules/RadialStatusNode/Sources/RadialStatusNode.h
+++ /dev/null
@@ -1,19 +0,0 @@
-//
-//  RadialStatusNode.h
-//  RadialStatusNode
-//
-//  Created by Peter on 8/5/19.
-//  Copyright © 2019 Telegram Messenger LLP. All rights reserved.
-//
-
-#import <UIKit/UIKit.h>
-
-//! Project version number for RadialStatusNode.
-FOUNDATION_EXPORT double RadialStatusNodeVersionNumber;
-
-//! Project version string for RadialStatusNode.
-FOUNDATION_EXPORT const unsigned char RadialStatusNodeVersionString[];
-
-// In this header, you should import all the public headers of your framework using statements like #import <RadialStatusNode/PublicHeader.h>
-
-
diff --git a/submodules/RaiseToListen/BUCK b/submodules/RaiseToListen/BUCK
index b483bcfd14..ae88e727e0 100644
--- a/submodules/RaiseToListen/BUCK
+++ b/submodules/RaiseToListen/BUCK
@@ -3,17 +3,10 @@ load("//Config:buck_rule_macros.bzl", "static_library")
 static_library(
     name = "RaiseToListen",
     srcs = glob([
-        "Sources/*.m",
         "Sources/*.swift",
     ]),
-    headers = glob([
-        "Sources/*.h",
-    ], exclude = ["Sources/RaiseToListen.h"]),
-    exported_headers = glob([
-        "Sources/*.h",
-    ], exclude = ["Sources/RaiseToListen.h"]),
     deps = [
-        "//submodules/DeviceProximity:DeviceProximity",
+        "//submodules/RaiseToListen/Impl:RaiseToListenImpl",
     ],
     frameworks = [
         "$SDKROOT/System/Library/Frameworks/Foundation.framework",
diff --git a/submodules/RaiseToListen/BUILD b/submodules/RaiseToListen/BUILD
new file mode 100644
index 0000000000..5e13c69fdc
--- /dev/null
+++ b/submodules/RaiseToListen/BUILD
@@ -0,0 +1,15 @@
+load("@build_bazel_rules_swift//swift:swift.bzl", "swift_library")
+
+swift_library(
+    name = "RaiseToListen",
+    module_name = "RaiseToListen",
+    srcs = glob([
+        "Sources/**/*.swift",
+    ]),
+    deps = [
+        "//submodules/RaiseToListen/Impl:RaiseToListenImpl",
+    ],
+    visibility = [
+        "//visibility:public",
+    ],
+)
diff --git a/submodules/RaiseToListen/Impl/BUCK b/submodules/RaiseToListen/Impl/BUCK
new file mode 100644
index 0000000000..93e01caeeb
--- /dev/null
+++ b/submodules/RaiseToListen/Impl/BUCK
@@ -0,0 +1,21 @@
+load("//Config:buck_rule_macros.bzl", "static_library")
+
+static_library(
+    name = "RaiseToListenImpl",
+    srcs = glob([
+        "Sources/**/*.m",
+    ]),
+    headers = glob([
+        "Sources/**/*.h",
+    ]),
+    exported_headers = glob([
+        "PublicHeaders/**/*.h",
+    ]),
+    deps = [
+        "//submodules/DeviceProximity:DeviceProximity",
+    ],
+    frameworks = [
+        "$SDKROOT/System/Library/Frameworks/Foundation.framework",
+        "$SDKROOT/System/Library/Frameworks/UIKit.framework",
+    ],
+)
diff --git a/submodules/RaiseToListen/Impl/BUILD b/submodules/RaiseToListen/Impl/BUILD
new file mode 100644
index 0000000000..0ecababba4
--- /dev/null
+++ b/submodules/RaiseToListen/Impl/BUILD
@@ -0,0 +1,26 @@
+
+objc_library(
+    name = "RaiseToListenImpl",
+    enable_modules = True,
+    module_name = "RaiseToListenImpl",
+    srcs = glob([
+        "Sources/**/*.m",
+        "Sources/**/*.h",
+    ]),
+    hdrs = glob([
+        "PublicHeaders/**/*.h",
+    ]),
+    includes = [
+        "PublicHeaders",
+    ],
+    deps = [
+        "//submodules/DeviceProximity:DeviceProximity",
+    ],
+    sdk_frameworks = [
+        "Foundation",
+        "UIKit",
+    ],
+    visibility = [
+        "//visibility:public",
+    ],
+)
diff --git a/submodules/RaiseToListen/Sources/RaiseToListenActivator.h b/submodules/RaiseToListen/Impl/PublicHeaders/RaiseToListenImpl/RaiseToListenActivator.h
similarity index 100%
rename from submodules/RaiseToListen/Sources/RaiseToListenActivator.h
rename to submodules/RaiseToListen/Impl/PublicHeaders/RaiseToListenImpl/RaiseToListenActivator.h
diff --git a/submodules/RaiseToListen/Impl/PublicHeaders/RaiseToListenImpl/RaiseToListenImpl.h b/submodules/RaiseToListen/Impl/PublicHeaders/RaiseToListenImpl/RaiseToListenImpl.h
new file mode 100644
index 0000000000..804710a7e5
--- /dev/null
+++ b/submodules/RaiseToListen/Impl/PublicHeaders/RaiseToListenImpl/RaiseToListenImpl.h
@@ -0,0 +1,5 @@
+#import <UIKit/UIKit.h>
+
+#import <RaiseToListenImpl/RaiseToListenActivator.h>
+
+
diff --git a/submodules/RaiseToListen/Sources/RaiseToListenActivator.m b/submodules/RaiseToListen/Impl/Sources/RaiseToListenActivator.m
similarity index 99%
rename from submodules/RaiseToListen/Sources/RaiseToListenActivator.m
rename to submodules/RaiseToListen/Impl/Sources/RaiseToListenActivator.m
index f26f11fc28..5251e1f80e 100644
--- a/submodules/RaiseToListen/Sources/RaiseToListenActivator.m
+++ b/submodules/RaiseToListen/Impl/Sources/RaiseToListenActivator.m
@@ -1,4 +1,4 @@
-#import "RaiseToListenActivator.h"
+#import <RaiseToListenImpl/RaiseToListenActivator.h>
 
 #import <UIKit/UIKit.h>
 #import <DeviceProximity/DeviceProximity.h>
diff --git a/submodules/RaiseToListen/Info.plist b/submodules/RaiseToListen/Info.plist
deleted file mode 100644
index e1fe4cfb7b..0000000000
--- a/submodules/RaiseToListen/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/RaiseToListen/Sources/RaiseToListen.h b/submodules/RaiseToListen/Sources/RaiseToListen.h
deleted file mode 100644
index 4bae0bc1e3..0000000000
--- a/submodules/RaiseToListen/Sources/RaiseToListen.h
+++ /dev/null
@@ -1,11 +0,0 @@
-#import <UIKit/UIKit.h>
-
-//! Project version number for RaiseToListen.
-FOUNDATION_EXPORT double RaiseToListenVersionNumber;
-
-//! Project version string for RaiseToListen.
-FOUNDATION_EXPORT const unsigned char RaiseToListenVersionString[];
-
-#import <RaiseToListen/RaiseToListenActivator.h>
-
-
diff --git a/submodules/RaiseToListen/Sources/RaiseToListen.swift b/submodules/RaiseToListen/Sources/RaiseToListen.swift
index d92435cd10..bf70869ac5 100644
--- a/submodules/RaiseToListen/Sources/RaiseToListen.swift
+++ b/submodules/RaiseToListen/Sources/RaiseToListen.swift
@@ -1,5 +1,7 @@
 import Foundation
 
+import RaiseToListenImpl
+
 public final class RaiseToListenManager {
     private let activator: RaiseToListenActivator
     
diff --git a/submodules/Reachability/BUCK b/submodules/Reachability/BUCK
new file mode 100644
index 0000000000..341dbb890f
--- /dev/null
+++ b/submodules/Reachability/BUCK
@@ -0,0 +1,18 @@
+load("//Config:buck_rule_macros.bzl", "static_library")
+
+static_library(
+    name = "Reachability",
+    srcs = glob([
+        "Sources/*.m",
+    ]),
+    headers = glob([
+        "Sources/*.h",
+    ]),
+    exported_headers = glob([
+        "PublicHeaders/**/*.h",
+    ]),
+    frameworks = [
+        "$SDKROOT/System/Library/Frameworks/Foundation.framework",
+        "$SDKROOT/System/Library/Frameworks/SystemConfiguration.framework",
+    ],
+)
diff --git a/submodules/Reachability/BUILD b/submodules/Reachability/BUILD
new file mode 100644
index 0000000000..35b3371126
--- /dev/null
+++ b/submodules/Reachability/BUILD
@@ -0,0 +1,22 @@
+
+objc_library(
+    name = "Reachability",
+    enable_modules = True,
+    module_name = "Reachability",
+    srcs = glob([
+        "Sources/*.m",
+    ]),
+    hdrs = glob([
+        "PublicHeaders/**/*.h",
+    ]),
+    includes = [
+        "PublicHeaders",
+    ],
+    sdk_frameworks = [
+      "Foundation",
+      "SystemConfiguration",
+    ],
+    visibility = [
+        "//visibility:public",
+    ],
+)
diff --git a/submodules/TelegramCore/Sources/Reachability.h b/submodules/Reachability/PublicHeaders/Reachability/Reachability.h
similarity index 100%
rename from submodules/TelegramCore/Sources/Reachability.h
rename to submodules/Reachability/PublicHeaders/Reachability/Reachability.h
diff --git a/submodules/TelegramCore/Sources/Reachability.m b/submodules/Reachability/Sources/Reachability.m
similarity index 99%
rename from submodules/TelegramCore/Sources/Reachability.m
rename to submodules/Reachability/Sources/Reachability.m
index be67002fa3..4b3abb5088 100644
--- a/submodules/TelegramCore/Sources/Reachability.m
+++ b/submodules/Reachability/Sources/Reachability.m
@@ -14,7 +14,7 @@
 
 #import <CoreFoundation/CoreFoundation.h>
 
-#import "Reachability.h"
+#import <Reachability/Reachability.h>
 
 #import <pthread.h>
 #import <libkern/OSAtomic.h>
diff --git a/submodules/ReactionSelectionNode/BUILD b/submodules/ReactionSelectionNode/BUILD
new file mode 100644
index 0000000000..1e5ce472f8
--- /dev/null
+++ b/submodules/ReactionSelectionNode/BUILD
@@ -0,0 +1,22 @@
+load("@build_bazel_rules_swift//swift:swift.bzl", "swift_library")
+
+swift_library(
+    name = "ReactionSelectionNode",
+    module_name = "ReactionSelectionNode",
+    srcs = glob([
+		"Sources/**/*.swift",
+    ]),
+    deps = [
+        "//submodules/Postbox:Postbox",
+        "//submodules/TelegramCore:TelegramCore",
+        "//submodules/SyncCore:SyncCore",
+        "//submodules/AsyncDisplayKit:AsyncDisplayKit",
+        "//submodules/Display:Display",
+        "//submodules/AnimatedStickerNode:AnimatedStickerNode",
+        "//submodules/TelegramAnimatedStickerNode:TelegramAnimatedStickerNode",
+        "//submodules/TelegramPresentationData:TelegramPresentationData",
+    ],
+    visibility = [
+        "//visibility:public",
+    ],
+)
diff --git a/submodules/ReactionSelectionNode/Info.plist b/submodules/ReactionSelectionNode/Info.plist
deleted file mode 100644
index e1fe4cfb7b..0000000000
--- a/submodules/ReactionSelectionNode/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/ReactionSelectionNode/Sources/ReactionSelectionNode.h b/submodules/ReactionSelectionNode/Sources/ReactionSelectionNode.h
deleted file mode 100644
index 69ee588b7d..0000000000
--- a/submodules/ReactionSelectionNode/Sources/ReactionSelectionNode.h
+++ /dev/null
@@ -1,19 +0,0 @@
-//
-//  ReactionSelectionNode.h
-//  ReactionSelectionNode
-//
-//  Created by Peter on 8/15/19.
-//  Copyright © 2019 Telegram Messenger LLP. All rights reserved.
-//
-
-#import <UIKit/UIKit.h>
-
-//! Project version number for ReactionSelectionNode.
-FOUNDATION_EXPORT double ReactionSelectionNodeVersionNumber;
-
-//! Project version string for ReactionSelectionNode.
-FOUNDATION_EXPORT const unsigned char ReactionSelectionNodeVersionString[];
-
-// In this header, you should import all the public headers of your framework using statements like #import <ReactionSelectionNode/PublicHeader.h>
-
-
diff --git a/submodules/ReactionSelectionNode/Sources/ReactionSwipeGestureRecognizer.swift b/submodules/ReactionSelectionNode/Sources/ReactionSwipeGestureRecognizer.swift
index 1380aad26f..025a52ce2a 100644
--- a/submodules/ReactionSelectionNode/Sources/ReactionSwipeGestureRecognizer.swift
+++ b/submodules/ReactionSelectionNode/Sources/ReactionSwipeGestureRecognizer.swift
@@ -1,6 +1,7 @@
 import Foundation
 import UIKit
 import Display
+import AsyncDisplayKit
 
 public final class ReactionSwipeGestureRecognizer: UIPanGestureRecognizer {
     private var validatedGesture = false
diff --git a/submodules/RingBuffer/BUCK b/submodules/RingBuffer/BUCK
new file mode 100644
index 0000000000..8896626f86
--- /dev/null
+++ b/submodules/RingBuffer/BUCK
@@ -0,0 +1,19 @@
+load("//Config:buck_rule_macros.bzl", "static_library")
+
+static_library(
+    name = "RingBuffer",
+    srcs = glob([
+        "Sources/*.m",
+    ]),
+    headers = glob([
+        "Sources/*.h",
+    ]),
+    exported_headers = glob([
+        "PublicHeaders/**/*.h",
+    ]),
+    deps = [
+    ],
+    frameworks = [
+        "$SDKROOT/System/Library/Frameworks/Foundation.framework",
+    ],
+)
diff --git a/submodules/RingBuffer/BUILD b/submodules/RingBuffer/BUILD
new file mode 100644
index 0000000000..f9ad619740
--- /dev/null
+++ b/submodules/RingBuffer/BUILD
@@ -0,0 +1,21 @@
+
+objc_library(
+    name = "RingBuffer",
+    enable_modules = True,
+    module_name = "RingBuffer",
+    srcs = glob([
+        "Sources/*.m",
+    ]),
+    hdrs = glob([
+        "PublicHeaders/**/*.h",
+    ]),
+    includes = [
+        "PublicHeaders",
+    ],
+    sdk_frameworks = [
+      "Foundation",
+    ],
+    visibility = [
+        "//visibility:public",
+    ],
+)
diff --git a/submodules/MediaPlayer/Sources/RingBuffer.h b/submodules/RingBuffer/PublicHeaders/RingBuffer/RingBuffer.h
similarity index 100%
rename from submodules/MediaPlayer/Sources/RingBuffer.h
rename to submodules/RingBuffer/PublicHeaders/RingBuffer/RingBuffer.h
diff --git a/submodules/MediaPlayer/Sources/RingBuffer.m b/submodules/RingBuffer/Sources/RingBuffer.m
similarity index 99%
rename from submodules/MediaPlayer/Sources/RingBuffer.m
rename to submodules/RingBuffer/Sources/RingBuffer.m
index 9c6db69b7a..07308f93b3 100644
--- a/submodules/MediaPlayer/Sources/RingBuffer.m
+++ b/submodules/RingBuffer/Sources/RingBuffer.m
@@ -1,4 +1,4 @@
-#import "RingBuffer.h"
+#import <RingBuffer/RingBuffer.h>
 
 #include <mach/mach.h>
 #include <stdio.h>
diff --git a/submodules/SSignalKit/BUILD b/submodules/SSignalKit/BUILD
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/submodules/SSignalKit/SSignalKit/BUCK b/submodules/SSignalKit/SSignalKit/BUCK
index 8d592db616..1fbeb1d9b4 100644
--- a/submodules/SSignalKit/SSignalKit/BUCK
+++ b/submodules/SSignalKit/SSignalKit/BUCK
@@ -3,13 +3,10 @@ load("//Config:buck_rule_macros.bzl", "static_library")
 static_library(
     name = "SSignalKit",
     srcs = glob([
-        "*.m",
-    ]),
-    headers = glob([
-    	"*.h",
+        "Source/SSignalKit/*.m",
     ]),
     exported_headers = glob([
-    	"*.h",
+    	"Source/SSignalKit/*.h",
     ]),
     deps = [
     ],
diff --git a/submodules/SSignalKit/SSignalKit/BUILD b/submodules/SSignalKit/SSignalKit/BUILD
new file mode 100644
index 0000000000..5a980e8242
--- /dev/null
+++ b/submodules/SSignalKit/SSignalKit/BUILD
@@ -0,0 +1,21 @@
+
+objc_library(
+    name = "SSignalKit",
+    enable_modules = True,
+    module_name = "SSignalKit",
+    srcs = glob([
+        "Source/SSignalKit/*.m",
+    ]),
+    hdrs = glob([
+        "Source/SSignalKit/*.h",
+    ]),
+    includes = [
+      "Source",
+    ],
+    sdk_frameworks = [
+      "Foundation",
+    ],
+    visibility = [
+        "//visibility:public",
+    ],
+)
diff --git a/submodules/SSignalKit/SSignalKit/SAtomic.h b/submodules/SSignalKit/SSignalKit/Source/SSignalKit/SAtomic.h
similarity index 100%
rename from submodules/SSignalKit/SSignalKit/SAtomic.h
rename to submodules/SSignalKit/SSignalKit/Source/SSignalKit/SAtomic.h
diff --git a/submodules/SSignalKit/SSignalKit/SAtomic.m b/submodules/SSignalKit/SSignalKit/Source/SSignalKit/SAtomic.m
similarity index 100%
rename from submodules/SSignalKit/SSignalKit/SAtomic.m
rename to submodules/SSignalKit/SSignalKit/Source/SSignalKit/SAtomic.m
diff --git a/submodules/SSignalKit/SSignalKit/SBag.h b/submodules/SSignalKit/SSignalKit/Source/SSignalKit/SBag.h
similarity index 100%
rename from submodules/SSignalKit/SSignalKit/SBag.h
rename to submodules/SSignalKit/SSignalKit/Source/SSignalKit/SBag.h
diff --git a/submodules/SSignalKit/SSignalKit/SBag.m b/submodules/SSignalKit/SSignalKit/Source/SSignalKit/SBag.m
similarity index 100%
rename from submodules/SSignalKit/SSignalKit/SBag.m
rename to submodules/SSignalKit/SSignalKit/Source/SSignalKit/SBag.m
diff --git a/submodules/SSignalKit/SSignalKit/SBlockDisposable.h b/submodules/SSignalKit/SSignalKit/Source/SSignalKit/SBlockDisposable.h
similarity index 100%
rename from submodules/SSignalKit/SSignalKit/SBlockDisposable.h
rename to submodules/SSignalKit/SSignalKit/Source/SSignalKit/SBlockDisposable.h
diff --git a/submodules/SSignalKit/SSignalKit/SBlockDisposable.m b/submodules/SSignalKit/SSignalKit/Source/SSignalKit/SBlockDisposable.m
similarity index 100%
rename from submodules/SSignalKit/SSignalKit/SBlockDisposable.m
rename to submodules/SSignalKit/SSignalKit/Source/SSignalKit/SBlockDisposable.m
diff --git a/submodules/SSignalKit/SSignalKit/SDisposable.h b/submodules/SSignalKit/SSignalKit/Source/SSignalKit/SDisposable.h
similarity index 100%
rename from submodules/SSignalKit/SSignalKit/SDisposable.h
rename to submodules/SSignalKit/SSignalKit/Source/SSignalKit/SDisposable.h
diff --git a/submodules/SSignalKit/SSignalKit/SDisposableSet.h b/submodules/SSignalKit/SSignalKit/Source/SSignalKit/SDisposableSet.h
similarity index 100%
rename from submodules/SSignalKit/SSignalKit/SDisposableSet.h
rename to submodules/SSignalKit/SSignalKit/Source/SSignalKit/SDisposableSet.h
diff --git a/submodules/SSignalKit/SSignalKit/SDisposableSet.m b/submodules/SSignalKit/SSignalKit/Source/SSignalKit/SDisposableSet.m
similarity index 100%
rename from submodules/SSignalKit/SSignalKit/SDisposableSet.m
rename to submodules/SSignalKit/SSignalKit/Source/SSignalKit/SDisposableSet.m
diff --git a/submodules/SSignalKit/SSignalKit/SMetaDisposable.h b/submodules/SSignalKit/SSignalKit/Source/SSignalKit/SMetaDisposable.h
similarity index 100%
rename from submodules/SSignalKit/SSignalKit/SMetaDisposable.h
rename to submodules/SSignalKit/SSignalKit/Source/SSignalKit/SMetaDisposable.h
diff --git a/submodules/SSignalKit/SSignalKit/SMetaDisposable.m b/submodules/SSignalKit/SSignalKit/Source/SSignalKit/SMetaDisposable.m
similarity index 100%
rename from submodules/SSignalKit/SSignalKit/SMetaDisposable.m
rename to submodules/SSignalKit/SSignalKit/Source/SSignalKit/SMetaDisposable.m
diff --git a/submodules/SSignalKit/SSignalKit/SMulticastSignalManager.h b/submodules/SSignalKit/SSignalKit/Source/SSignalKit/SMulticastSignalManager.h
similarity index 100%
rename from submodules/SSignalKit/SSignalKit/SMulticastSignalManager.h
rename to submodules/SSignalKit/SSignalKit/Source/SSignalKit/SMulticastSignalManager.h
diff --git a/submodules/SSignalKit/SSignalKit/SMulticastSignalManager.m b/submodules/SSignalKit/SSignalKit/Source/SSignalKit/SMulticastSignalManager.m
similarity index 100%
rename from submodules/SSignalKit/SSignalKit/SMulticastSignalManager.m
rename to submodules/SSignalKit/SSignalKit/Source/SSignalKit/SMulticastSignalManager.m
diff --git a/submodules/SSignalKit/SSignalKit/SQueue.h b/submodules/SSignalKit/SSignalKit/Source/SSignalKit/SQueue.h
similarity index 100%
rename from submodules/SSignalKit/SSignalKit/SQueue.h
rename to submodules/SSignalKit/SSignalKit/Source/SSignalKit/SQueue.h
diff --git a/submodules/SSignalKit/SSignalKit/SQueue.m b/submodules/SSignalKit/SSignalKit/Source/SSignalKit/SQueue.m
similarity index 100%
rename from submodules/SSignalKit/SSignalKit/SQueue.m
rename to submodules/SSignalKit/SSignalKit/Source/SSignalKit/SQueue.m
diff --git a/submodules/SSignalKit/SSignalKit/SSignal+Accumulate.h b/submodules/SSignalKit/SSignalKit/Source/SSignalKit/SSignal+Accumulate.h
similarity index 100%
rename from submodules/SSignalKit/SSignalKit/SSignal+Accumulate.h
rename to submodules/SSignalKit/SSignalKit/Source/SSignalKit/SSignal+Accumulate.h
diff --git a/submodules/SSignalKit/SSignalKit/SSignal+Accumulate.m b/submodules/SSignalKit/SSignalKit/Source/SSignalKit/SSignal+Accumulate.m
similarity index 100%
rename from submodules/SSignalKit/SSignalKit/SSignal+Accumulate.m
rename to submodules/SSignalKit/SSignalKit/Source/SSignalKit/SSignal+Accumulate.m
diff --git a/submodules/SSignalKit/SSignalKit/SSignal+Catch.h b/submodules/SSignalKit/SSignalKit/Source/SSignalKit/SSignal+Catch.h
similarity index 100%
rename from submodules/SSignalKit/SSignalKit/SSignal+Catch.h
rename to submodules/SSignalKit/SSignalKit/Source/SSignalKit/SSignal+Catch.h
diff --git a/submodules/SSignalKit/SSignalKit/SSignal+Catch.m b/submodules/SSignalKit/SSignalKit/Source/SSignalKit/SSignal+Catch.m
similarity index 100%
rename from submodules/SSignalKit/SSignalKit/SSignal+Catch.m
rename to submodules/SSignalKit/SSignalKit/Source/SSignalKit/SSignal+Catch.m
diff --git a/submodules/SSignalKit/SSignalKit/SSignal+Combine.h b/submodules/SSignalKit/SSignalKit/Source/SSignalKit/SSignal+Combine.h
similarity index 100%
rename from submodules/SSignalKit/SSignalKit/SSignal+Combine.h
rename to submodules/SSignalKit/SSignalKit/Source/SSignalKit/SSignal+Combine.h
diff --git a/submodules/SSignalKit/SSignalKit/SSignal+Combine.m b/submodules/SSignalKit/SSignalKit/Source/SSignalKit/SSignal+Combine.m
similarity index 100%
rename from submodules/SSignalKit/SSignalKit/SSignal+Combine.m
rename to submodules/SSignalKit/SSignalKit/Source/SSignalKit/SSignal+Combine.m
diff --git a/submodules/SSignalKit/SSignalKit/SSignal+Dispatch.h b/submodules/SSignalKit/SSignalKit/Source/SSignalKit/SSignal+Dispatch.h
similarity index 100%
rename from submodules/SSignalKit/SSignalKit/SSignal+Dispatch.h
rename to submodules/SSignalKit/SSignalKit/Source/SSignalKit/SSignal+Dispatch.h
diff --git a/submodules/SSignalKit/SSignalKit/SSignal+Dispatch.m b/submodules/SSignalKit/SSignalKit/Source/SSignalKit/SSignal+Dispatch.m
similarity index 100%
rename from submodules/SSignalKit/SSignalKit/SSignal+Dispatch.m
rename to submodules/SSignalKit/SSignalKit/Source/SSignalKit/SSignal+Dispatch.m
diff --git a/submodules/SSignalKit/SSignalKit/SSignal+Mapping.h b/submodules/SSignalKit/SSignalKit/Source/SSignalKit/SSignal+Mapping.h
similarity index 100%
rename from submodules/SSignalKit/SSignalKit/SSignal+Mapping.h
rename to submodules/SSignalKit/SSignalKit/Source/SSignalKit/SSignal+Mapping.h
diff --git a/submodules/SSignalKit/SSignalKit/SSignal+Mapping.m b/submodules/SSignalKit/SSignalKit/Source/SSignalKit/SSignal+Mapping.m
similarity index 100%
rename from submodules/SSignalKit/SSignalKit/SSignal+Mapping.m
rename to submodules/SSignalKit/SSignalKit/Source/SSignalKit/SSignal+Mapping.m
diff --git a/submodules/SSignalKit/SSignalKit/SSignal+Meta.h b/submodules/SSignalKit/SSignalKit/Source/SSignalKit/SSignal+Meta.h
similarity index 100%
rename from submodules/SSignalKit/SSignalKit/SSignal+Meta.h
rename to submodules/SSignalKit/SSignalKit/Source/SSignalKit/SSignal+Meta.h
diff --git a/submodules/SSignalKit/SSignalKit/SSignal+Meta.m b/submodules/SSignalKit/SSignalKit/Source/SSignalKit/SSignal+Meta.m
similarity index 100%
rename from submodules/SSignalKit/SSignalKit/SSignal+Meta.m
rename to submodules/SSignalKit/SSignalKit/Source/SSignalKit/SSignal+Meta.m
diff --git a/submodules/SSignalKit/SSignalKit/SSignal+Multicast.h b/submodules/SSignalKit/SSignalKit/Source/SSignalKit/SSignal+Multicast.h
similarity index 100%
rename from submodules/SSignalKit/SSignalKit/SSignal+Multicast.h
rename to submodules/SSignalKit/SSignalKit/Source/SSignalKit/SSignal+Multicast.h
diff --git a/submodules/SSignalKit/SSignalKit/SSignal+Multicast.m b/submodules/SSignalKit/SSignalKit/Source/SSignalKit/SSignal+Multicast.m
similarity index 100%
rename from submodules/SSignalKit/SSignalKit/SSignal+Multicast.m
rename to submodules/SSignalKit/SSignalKit/Source/SSignalKit/SSignal+Multicast.m
diff --git a/submodules/SSignalKit/SSignalKit/SSignal+Pipe.h b/submodules/SSignalKit/SSignalKit/Source/SSignalKit/SSignal+Pipe.h
similarity index 100%
rename from submodules/SSignalKit/SSignalKit/SSignal+Pipe.h
rename to submodules/SSignalKit/SSignalKit/Source/SSignalKit/SSignal+Pipe.h
diff --git a/submodules/SSignalKit/SSignalKit/SSignal+Pipe.m b/submodules/SSignalKit/SSignalKit/Source/SSignalKit/SSignal+Pipe.m
similarity index 100%
rename from submodules/SSignalKit/SSignalKit/SSignal+Pipe.m
rename to submodules/SSignalKit/SSignalKit/Source/SSignalKit/SSignal+Pipe.m
diff --git a/submodules/SSignalKit/SSignalKit/SSignal+SideEffects.h b/submodules/SSignalKit/SSignalKit/Source/SSignalKit/SSignal+SideEffects.h
similarity index 100%
rename from submodules/SSignalKit/SSignalKit/SSignal+SideEffects.h
rename to submodules/SSignalKit/SSignalKit/Source/SSignalKit/SSignal+SideEffects.h
diff --git a/submodules/SSignalKit/SSignalKit/SSignal+SideEffects.m b/submodules/SSignalKit/SSignalKit/Source/SSignalKit/SSignal+SideEffects.m
similarity index 100%
rename from submodules/SSignalKit/SSignalKit/SSignal+SideEffects.m
rename to submodules/SSignalKit/SSignalKit/Source/SSignalKit/SSignal+SideEffects.m
diff --git a/submodules/SSignalKit/SSignalKit/SSignal+Single.h b/submodules/SSignalKit/SSignalKit/Source/SSignalKit/SSignal+Single.h
similarity index 100%
rename from submodules/SSignalKit/SSignalKit/SSignal+Single.h
rename to submodules/SSignalKit/SSignalKit/Source/SSignalKit/SSignal+Single.h
diff --git a/submodules/SSignalKit/SSignalKit/SSignal+Single.m b/submodules/SSignalKit/SSignalKit/Source/SSignalKit/SSignal+Single.m
similarity index 100%
rename from submodules/SSignalKit/SSignalKit/SSignal+Single.m
rename to submodules/SSignalKit/SSignalKit/Source/SSignalKit/SSignal+Single.m
diff --git a/submodules/SSignalKit/SSignalKit/SSignal+Take.h b/submodules/SSignalKit/SSignalKit/Source/SSignalKit/SSignal+Take.h
similarity index 100%
rename from submodules/SSignalKit/SSignalKit/SSignal+Take.h
rename to submodules/SSignalKit/SSignalKit/Source/SSignalKit/SSignal+Take.h
diff --git a/submodules/SSignalKit/SSignalKit/SSignal+Take.m b/submodules/SSignalKit/SSignalKit/Source/SSignalKit/SSignal+Take.m
similarity index 100%
rename from submodules/SSignalKit/SSignalKit/SSignal+Take.m
rename to submodules/SSignalKit/SSignalKit/Source/SSignalKit/SSignal+Take.m
diff --git a/submodules/SSignalKit/SSignalKit/SSignal+Timing.h b/submodules/SSignalKit/SSignalKit/Source/SSignalKit/SSignal+Timing.h
similarity index 100%
rename from submodules/SSignalKit/SSignalKit/SSignal+Timing.h
rename to submodules/SSignalKit/SSignalKit/Source/SSignalKit/SSignal+Timing.h
diff --git a/submodules/SSignalKit/SSignalKit/SSignal+Timing.m b/submodules/SSignalKit/SSignalKit/Source/SSignalKit/SSignal+Timing.m
similarity index 100%
rename from submodules/SSignalKit/SSignalKit/SSignal+Timing.m
rename to submodules/SSignalKit/SSignalKit/Source/SSignalKit/SSignal+Timing.m
diff --git a/submodules/SSignalKit/SSignalKit/SSignal.h b/submodules/SSignalKit/SSignalKit/Source/SSignalKit/SSignal.h
similarity index 100%
rename from submodules/SSignalKit/SSignalKit/SSignal.h
rename to submodules/SSignalKit/SSignalKit/Source/SSignalKit/SSignal.h
diff --git a/submodules/SSignalKit/SSignalKit/SSignal.m b/submodules/SSignalKit/SSignalKit/Source/SSignalKit/SSignal.m
similarity index 100%
rename from submodules/SSignalKit/SSignalKit/SSignal.m
rename to submodules/SSignalKit/SSignalKit/Source/SSignalKit/SSignal.m
diff --git a/submodules/SSignalKit/SSignalKit/SSignalKit.h b/submodules/SSignalKit/SSignalKit/Source/SSignalKit/SSignalKit.h
similarity index 100%
rename from submodules/SSignalKit/SSignalKit/SSignalKit.h
rename to submodules/SSignalKit/SSignalKit/Source/SSignalKit/SSignalKit.h
diff --git a/submodules/SSignalKit/SSignalKit/SSubscriber.h b/submodules/SSignalKit/SSignalKit/Source/SSignalKit/SSubscriber.h
similarity index 100%
rename from submodules/SSignalKit/SSignalKit/SSubscriber.h
rename to submodules/SSignalKit/SSignalKit/Source/SSignalKit/SSubscriber.h
diff --git a/submodules/SSignalKit/SSignalKit/SSubscriber.m b/submodules/SSignalKit/SSignalKit/Source/SSignalKit/SSubscriber.m
similarity index 100%
rename from submodules/SSignalKit/SSignalKit/SSubscriber.m
rename to submodules/SSignalKit/SSignalKit/Source/SSignalKit/SSubscriber.m
diff --git a/submodules/SSignalKit/SSignalKit/SThreadPool.h b/submodules/SSignalKit/SSignalKit/Source/SSignalKit/SThreadPool.h
similarity index 100%
rename from submodules/SSignalKit/SSignalKit/SThreadPool.h
rename to submodules/SSignalKit/SSignalKit/Source/SSignalKit/SThreadPool.h
diff --git a/submodules/SSignalKit/SSignalKit/SThreadPool.m b/submodules/SSignalKit/SSignalKit/Source/SSignalKit/SThreadPool.m
similarity index 100%
rename from submodules/SSignalKit/SSignalKit/SThreadPool.m
rename to submodules/SSignalKit/SSignalKit/Source/SSignalKit/SThreadPool.m
diff --git a/submodules/SSignalKit/SSignalKit/SThreadPoolQueue.h b/submodules/SSignalKit/SSignalKit/Source/SSignalKit/SThreadPoolQueue.h
similarity index 100%
rename from submodules/SSignalKit/SSignalKit/SThreadPoolQueue.h
rename to submodules/SSignalKit/SSignalKit/Source/SSignalKit/SThreadPoolQueue.h
diff --git a/submodules/SSignalKit/SSignalKit/SThreadPoolQueue.m b/submodules/SSignalKit/SSignalKit/Source/SSignalKit/SThreadPoolQueue.m
similarity index 100%
rename from submodules/SSignalKit/SSignalKit/SThreadPoolQueue.m
rename to submodules/SSignalKit/SSignalKit/Source/SSignalKit/SThreadPoolQueue.m
diff --git a/submodules/SSignalKit/SSignalKit/SThreadPoolTask.h b/submodules/SSignalKit/SSignalKit/Source/SSignalKit/SThreadPoolTask.h
similarity index 100%
rename from submodules/SSignalKit/SSignalKit/SThreadPoolTask.h
rename to submodules/SSignalKit/SSignalKit/Source/SSignalKit/SThreadPoolTask.h
diff --git a/submodules/SSignalKit/SSignalKit/SThreadPoolTask.m b/submodules/SSignalKit/SSignalKit/Source/SSignalKit/SThreadPoolTask.m
similarity index 100%
rename from submodules/SSignalKit/SSignalKit/SThreadPoolTask.m
rename to submodules/SSignalKit/SSignalKit/Source/SSignalKit/SThreadPoolTask.m
diff --git a/submodules/SSignalKit/SSignalKit/STimer.h b/submodules/SSignalKit/SSignalKit/Source/SSignalKit/STimer.h
similarity index 100%
rename from submodules/SSignalKit/SSignalKit/STimer.h
rename to submodules/SSignalKit/SSignalKit/Source/SSignalKit/STimer.h
diff --git a/submodules/SSignalKit/SSignalKit/STimer.m b/submodules/SSignalKit/SSignalKit/Source/SSignalKit/STimer.m
similarity index 100%
rename from submodules/SSignalKit/SSignalKit/STimer.m
rename to submodules/SSignalKit/SSignalKit/Source/SSignalKit/STimer.m
diff --git a/submodules/SSignalKit/SSignalKit/SVariable.h b/submodules/SSignalKit/SSignalKit/Source/SSignalKit/SVariable.h
similarity index 100%
rename from submodules/SSignalKit/SSignalKit/SVariable.h
rename to submodules/SSignalKit/SSignalKit/Source/SSignalKit/SVariable.h
diff --git a/submodules/SSignalKit/SSignalKit/SVariable.m b/submodules/SSignalKit/SSignalKit/Source/SSignalKit/SVariable.m
similarity index 100%
rename from submodules/SSignalKit/SSignalKit/SVariable.m
rename to submodules/SSignalKit/SSignalKit/Source/SSignalKit/SVariable.m
diff --git a/submodules/SSignalKit/SSignalKitTests/DeallocatingObject.h b/submodules/SSignalKit/SSignalKitTests/DeallocatingObject.h
deleted file mode 100644
index 00f3c9cc8b..0000000000
--- a/submodules/SSignalKit/SSignalKitTests/DeallocatingObject.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#import <Foundation/Foundation.h>
-
-@interface DeallocatingObject : NSObject
-
-- (instancetype)initWithDeallocated:(bool *)deallocated;
-
-@end
diff --git a/submodules/SSignalKit/SSignalKitTests/DeallocatingObject.m b/submodules/SSignalKit/SSignalKitTests/DeallocatingObject.m
deleted file mode 100644
index 38cff658e6..0000000000
--- a/submodules/SSignalKit/SSignalKitTests/DeallocatingObject.m
+++ /dev/null
@@ -1,27 +0,0 @@
-#import "DeallocatingObject.h"
-
-@interface DeallocatingObject ()
-{
-    bool *_deallocated;
-}
-
-@end
-
-@implementation DeallocatingObject
-
-- (instancetype)initWithDeallocated:(bool *)deallocated
-{
-    self = [super init];
-    if (self != nil)
-    {
-        _deallocated = deallocated;
-    }
-    return self;
-}
-
-- (void)dealloc
-{
-    *_deallocated = true;
-}
-
-@end
diff --git a/submodules/SSignalKit/SSignalKitTests/Info.plist b/submodules/SSignalKit/SSignalKitTests/Info.plist
deleted file mode 100644
index ba72822e87..0000000000
--- a/submodules/SSignalKit/SSignalKitTests/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>BNDL</string>
-	<key>CFBundleShortVersionString</key>
-	<string>1.0</string>
-	<key>CFBundleSignature</key>
-	<string>????</string>
-	<key>CFBundleVersion</key>
-	<string>1</string>
-</dict>
-</plist>
diff --git a/submodules/SSignalKit/SSignalKitTests/SDisposableTests.m b/submodules/SSignalKit/SSignalKitTests/SDisposableTests.m
deleted file mode 100644
index 3c71105e4e..0000000000
--- a/submodules/SSignalKit/SSignalKitTests/SDisposableTests.m
+++ /dev/null
@@ -1,318 +0,0 @@
-#if __IPHONE_OS_VERSION_MIN_REQUIRED
-#import <UIKit/UIKit.h>
-#else
-#import <Foundation/Foundation.h>
-#endif
-#import <XCTest/XCTest.h>
-
-#import <libkern/OSAtomic.h>
-
-@import SSignalKit;
-
-#import "DeallocatingObject.h"
-
-@interface SDisposableTests : XCTestCase
-
-@end
-
-@implementation SDisposableTests
-
-- (void)setUp
-{
-    [super setUp];
-}
-
-- (void)tearDown
-{
-    [super tearDown];
-}
-
-- (void)testBlockDisposableDisposed
-{
-    bool deallocated = false;
-    __block bool disposed = false;
-    {
-        DeallocatingObject *object = [[DeallocatingObject alloc] initWithDeallocated:&deallocated];
-        dispatch_block_t block = ^{
-            [object description];
-            disposed = true;
-        };
-        SBlockDisposable *disposable = [[SBlockDisposable alloc] initWithBlock:[block copy]];
-        object = nil;
-        block = nil;
-        [disposable dispose];
-    }
-    
-    XCTAssertTrue(deallocated);
-    XCTAssertTrue(disposed);
-}
-
-- (void)testBlockDisposableNotDisposed
-{
-    bool deallocated = false;
-    __block bool disposed = false;
-    {
-        DeallocatingObject *object = [[DeallocatingObject alloc] initWithDeallocated:&deallocated];
-        dispatch_block_t block = ^{
-            [object description];
-            disposed = true;
-        };
-        SBlockDisposable *disposable = [[SBlockDisposable alloc] initWithBlock:[block copy]];
-        [disposable description];
-    }
-    
-    XCTAssertTrue(deallocated);
-    XCTAssertFalse(disposed);
-}
-
-- (void)testMetaDisposableDisposed
-{
-    bool deallocated = false;
-    __block bool disposed = false;
-    {
-        DeallocatingObject *object = [[DeallocatingObject alloc] initWithDeallocated:&deallocated];
-        dispatch_block_t block = ^{
-            [object description];
-            disposed = true;
-        };
-        SBlockDisposable *blockDisposable = [[SBlockDisposable alloc] initWithBlock:[block copy]];
-        
-        SMetaDisposable *metaDisposable = [[SMetaDisposable alloc] init];
-        [metaDisposable setDisposable:blockDisposable];
-        [metaDisposable dispose];
-    }
-    
-    XCTAssertTrue(deallocated);
-    XCTAssertTrue(disposed);
-}
-
-- (void)testMetaDisposableDisposedMultipleTimes
-{
-    bool deallocated1 = false;
-    __block bool disposed1 = false;
-    bool deallocated2 = false;
-    __block bool disposed2 = false;
-    {
-        DeallocatingObject *object1 = [[DeallocatingObject alloc] initWithDeallocated:&deallocated1];
-        dispatch_block_t block1 = ^{
-            [object1 description];
-            disposed1 = true;
-        };
-        SBlockDisposable *blockDisposable1 = [[SBlockDisposable alloc] initWithBlock:[block1 copy]];
-        
-        DeallocatingObject *object2 = [[DeallocatingObject alloc] initWithDeallocated:&deallocated2];
-        dispatch_block_t block2 = ^{
-            [object2 description];
-            disposed2 = true;
-        };
-        SBlockDisposable *blockDisposable2 = [[SBlockDisposable alloc] initWithBlock:[block2 copy]];
-        
-        SMetaDisposable *metaDisposable = [[SMetaDisposable alloc] init];
-        [metaDisposable setDisposable:blockDisposable1];
-        [metaDisposable setDisposable:blockDisposable2];
-        [metaDisposable dispose];
-    }
-    
-    XCTAssertTrue(deallocated1);
-    XCTAssertTrue(disposed1);
-    XCTAssertTrue(deallocated2);
-    XCTAssertTrue(disposed2);
-}
-
-- (void)testMetaDisposableNotDisposed
-{
-    bool deallocated = false;
-    __block bool disposed = false;
-    {
-        DeallocatingObject *object = [[DeallocatingObject alloc] initWithDeallocated:&deallocated];
-        dispatch_block_t block = ^{
-            [object description];
-            disposed = true;
-        };
-        SBlockDisposable *blockDisposable = [[SBlockDisposable alloc] initWithBlock:[block copy]];
-        
-        SMetaDisposable *metaDisposable = [[SMetaDisposable alloc] init];
-        [metaDisposable setDisposable:blockDisposable];
-    }
-    
-    XCTAssertTrue(deallocated);
-    XCTAssertFalse(disposed);
-}
-
-- (void)testDisposableSetSingleDisposed
-{
-    bool deallocated = false;
-    __block bool disposed = false;
-    {
-        DeallocatingObject *object = [[DeallocatingObject alloc] initWithDeallocated:&deallocated];
-        dispatch_block_t block = ^{
-            [object description];
-            disposed = true;
-        };
-        SBlockDisposable *blockDisposable = [[SBlockDisposable alloc] initWithBlock:[block copy]];
-        
-        SDisposableSet *disposableSet = [[SDisposableSet alloc] init];
-        [disposableSet add:blockDisposable];
-        [disposableSet dispose];
-    }
-    
-    XCTAssertTrue(deallocated);
-    XCTAssertTrue(disposed);
-}
-
-- (void)testDisposableSetMultipleDisposed
-{
-    bool deallocated1 = false;
-    __block bool disposed1 = false;
-    bool deallocated2 = false;
-    __block bool disposed2 = false;
-    {
-        DeallocatingObject *object1 = [[DeallocatingObject alloc] initWithDeallocated:&deallocated1];
-        dispatch_block_t block1 = ^{
-            [object1 description];
-            disposed1 = true;
-        };
-        SBlockDisposable *blockDisposable1 = [[SBlockDisposable alloc] initWithBlock:[block1 copy]];
-        
-        DeallocatingObject *object2 = [[DeallocatingObject alloc] initWithDeallocated:&deallocated2];
-        dispatch_block_t block2 = ^{
-            [object2 description];
-            disposed2 = true;
-        };
-        SBlockDisposable *blockDisposable2 = [[SBlockDisposable alloc] initWithBlock:[block2 copy]];
-        
-        SDisposableSet *disposableSet = [[SDisposableSet alloc] init];
-        [disposableSet add:blockDisposable1];
-        [disposableSet add:blockDisposable2];
-        [disposableSet dispose];
-    }
-    
-    XCTAssertTrue(deallocated1);
-    XCTAssertTrue(disposed1);
-    XCTAssertTrue(deallocated2);
-    XCTAssertTrue(disposed2);
-}
-
-- (void)testDisposableSetSingleNotDisposed
-{
-    bool deallocated = false;
-    __block bool disposed = false;
-    {
-        DeallocatingObject *object = [[DeallocatingObject alloc] initWithDeallocated:&deallocated];
-        dispatch_block_t block = ^{
-            [object description];
-            disposed = true;
-        };
-        SBlockDisposable *blockDisposable = [[SBlockDisposable alloc] initWithBlock:[block copy]];
-        
-        SDisposableSet *disposableSet = [[SDisposableSet alloc] init];
-        [disposableSet add:blockDisposable];
-    }
-    
-    XCTAssertTrue(deallocated);
-    XCTAssertFalse(disposed);
-}
-
-- (void)testDisposableSetMultipleNotDisposed
-{
-    bool deallocated1 = false;
-    __block bool disposed1 = false;
-    bool deallocated2 = false;
-    __block bool disposed2 = false;
-    {
-        DeallocatingObject *object1 = [[DeallocatingObject alloc] initWithDeallocated:&deallocated1];
-        dispatch_block_t block1 = ^{
-            [object1 description];
-            disposed1 = true;
-        };
-        SBlockDisposable *blockDisposable1 = [[SBlockDisposable alloc] initWithBlock:[block1 copy]];
-        
-        DeallocatingObject *object2 = [[DeallocatingObject alloc] initWithDeallocated:&deallocated2];
-        dispatch_block_t block2 = ^{
-            [object2 description];
-            disposed2 = true;
-        };
-        SBlockDisposable *blockDisposable2 = [[SBlockDisposable alloc] initWithBlock:[block2 copy]];
-        
-        SDisposableSet *disposableSet = [[SDisposableSet alloc] init];
-        [disposableSet add:blockDisposable1];
-        [disposableSet add:blockDisposable2];
-    }
-    
-    XCTAssertTrue(deallocated1);
-    XCTAssertFalse(disposed1);
-    XCTAssertTrue(deallocated2);
-    XCTAssertFalse(disposed2);
-}
-
-- (void)testMetaDisposableAlreadyDisposed
-{
-    bool deallocated1 = false;
-    __block bool disposed1 = false;
-    bool deallocated2 = false;
-    __block bool disposed2 = false;
-    
-    @autoreleasepool
-    {
-        DeallocatingObject *object1 = [[DeallocatingObject alloc] initWithDeallocated:&deallocated1];
-        dispatch_block_t block1 = ^{
-            [object1 description];
-            disposed1 = true;
-        };
-        SBlockDisposable *blockDisposable1 = [[SBlockDisposable alloc] initWithBlock:[block1 copy]];
-        
-        DeallocatingObject *object2 = [[DeallocatingObject alloc] initWithDeallocated:&deallocated2];
-        dispatch_block_t block2 = ^{
-            [object2 description];
-            disposed2 = true;
-        };
-        SBlockDisposable *blockDisposable2 = [[SBlockDisposable alloc] initWithBlock:[block2 copy]];
-        
-        SMetaDisposable *metaDisposable = [[SMetaDisposable alloc] init];
-        [metaDisposable setDisposable:blockDisposable1];
-        [metaDisposable dispose];
-        [metaDisposable setDisposable:blockDisposable2];
-    }
-    
-    XCTAssertTrue(deallocated1);
-    XCTAssertTrue(disposed1);
-    XCTAssertTrue(deallocated2);
-    XCTAssertTrue(disposed2);
-}
-
-- (void)testDisposableSetAlreadyDisposed
-{
-    bool deallocated1 = false;
-    __block bool disposed1 = false;
-    bool deallocated2 = false;
-    __block bool disposed2 = false;
-    
-    @autoreleasepool
-    {
-        DeallocatingObject *object1 = [[DeallocatingObject alloc] initWithDeallocated:&deallocated1];
-        dispatch_block_t block1 = ^{
-            [object1 description];
-            disposed1 = true;
-        };
-        SBlockDisposable *blockDisposable1 = [[SBlockDisposable alloc] initWithBlock:[block1 copy]];
-        
-        DeallocatingObject *object2 = [[DeallocatingObject alloc] initWithDeallocated:&deallocated2];
-        dispatch_block_t block2 = ^{
-            [object2 description];
-            disposed2 = true;
-        };
-        SBlockDisposable *blockDisposable2 = [[SBlockDisposable alloc] initWithBlock:[block2 copy]];
-        
-        SMetaDisposable *metaDisposable = [[SMetaDisposable alloc] init];
-        [metaDisposable setDisposable:blockDisposable1];
-        [metaDisposable dispose];
-        [metaDisposable setDisposable:blockDisposable2];
-    }
-    
-    XCTAssertTrue(deallocated1);
-    XCTAssertTrue(disposed1);
-    XCTAssertTrue(deallocated2);
-    XCTAssertTrue(disposed2);
-}
-
-@end
diff --git a/submodules/SSignalKit/SSignalKitTests/SSignalBasicTests.m b/submodules/SSignalKit/SSignalKitTests/SSignalBasicTests.m
deleted file mode 100644
index 56ca98337c..0000000000
--- a/submodules/SSignalKit/SSignalKitTests/SSignalBasicTests.m
+++ /dev/null
@@ -1,764 +0,0 @@
-#if __IPHONE_OS_VERSION_MIN_REQUIRED
-#import <UIKit/UIKit.h>
-#else
-#import <Foundation/Foundation.h>
-#endif
-#import <XCTest/XCTest.h>
-
-@import SSignalKit;
-
-#import "DeallocatingObject.h"
-
-@interface DisposableHolder : NSObject {
-}
-
-@property (nonatomic, strong) id<SDisposable> disposable;
-
-@end
-
-@implementation DisposableHolder
-
-- (instancetype)init {
-    self = [super init];
-    if (self != nil) {
-        _disposable = [[[SSignal single:nil] delay:1.0 onQueue:[SQueue concurrentDefaultQueue]] startWithNext:^(__unused id next){
-            [self description];
-        }];
-    }
-    return self;
-}
-
-- (void)dealloc {
-    [_disposable dispose];
-}
-
-@end
-
-@interface SSignalBasicTests : XCTestCase
-
-@end
-
-@implementation SSignalBasicTests
-
-- (void)setUp
-{
-    [super setUp];
-}
-
-- (void)tearDown
-{
-    [super tearDown];
-}
-
-- (void)testSignalGenerated
-{
-    __block bool deallocated = false;
-    __block bool disposed = false;
-    __block bool generated = false;
-    
-    {
-        DeallocatingObject *object = [[DeallocatingObject alloc] initWithDeallocated:&deallocated];
-        SSignal *signal = [[SSignal alloc] initWithGenerator:^id<SDisposable>(SSubscriber *subscriber)
-        {
-            [subscriber putNext:@1];
-            [object description];
-            
-            return [[SBlockDisposable alloc] initWithBlock:^
-            {
-                [object description];
-                disposed = true;
-            }];
-        }];
-        id<SDisposable> disposable = [signal startWithNext:^(__unused id next)
-        {
-            generated = true;
-            [object description];
-        } error:nil completed:nil];
-        [disposable dispose];
-    }
-    
-    XCTAssertTrue(deallocated);
-    XCTAssertTrue(disposed);
-    XCTAssertTrue(generated);
-}
-
-- (void)testSignalGeneratedCompleted
-{
-    __block bool deallocated = false;
-    __block bool disposed = false;
-    __block bool generated = false;
-    __block bool completed = false;
-    
-    {
-        DeallocatingObject *object = [[DeallocatingObject alloc] initWithDeallocated:&deallocated];
-        SSignal *signal = [[SSignal alloc] initWithGenerator:^id<SDisposable>(SSubscriber *subscriber)
-        {
-            [subscriber putNext:@1];
-            [subscriber putCompletion];
-            [object description];
-            
-            return [[SBlockDisposable alloc] initWithBlock:^
-            {
-                [object description];
-                disposed = true;
-            }];
-        }];
-        id<SDisposable> disposable = [signal startWithNext:^(__unused id next)
-        {
-            [object description];
-            generated = true;
-        } error:nil completed:^
-        {
-            [object description];
-            completed = true;
-        }];
-        [disposable dispose];
-    }
-    
-    XCTAssertTrue(deallocated);
-    XCTAssertTrue(disposed);
-    XCTAssertTrue(generated);
-    XCTAssertTrue(completed);
-}
-
-- (void)testSignalGeneratedError
-{
-    __block bool deallocated = false;
-    __block bool disposed = false;
-    __block bool generated = false;
-    __block bool error = false;
-    
-    {
-        DeallocatingObject *object = [[DeallocatingObject alloc] initWithDeallocated:&deallocated];
-        SSignal *signal = [[SSignal alloc] initWithGenerator:^id<SDisposable>(SSubscriber *subscriber)
-        {
-            [subscriber putNext:@1];
-            [subscriber putError:@1];
-            [object description];
-            
-            return [[SBlockDisposable alloc] initWithBlock:^
-            {
-                [object description];
-                disposed = true;
-            }];
-        }];
-        id<SDisposable> disposable = [signal startWithNext:^(__unused id next)
-        {
-            generated = true;
-        } error:^(__unused id value)
-        {
-            error = true;
-        } completed:nil];
-        [disposable dispose];
-    }
-    
-    XCTAssertTrue(deallocated);
-    XCTAssertTrue(disposed);
-    XCTAssertTrue(generated);
-    XCTAssertTrue(error);
-}
-
-- (void)testMap
-{
-    bool deallocated = false;
-    __block bool disposed = false;
-    __block bool generated = false;
-    
-    {
-        @autoreleasepool
-        {
-            DeallocatingObject *object = [[DeallocatingObject alloc] initWithDeallocated:&deallocated];
-            SSignal *signal = [[[SSignal alloc] initWithGenerator:^id<SDisposable>(SSubscriber *subscriber)
-            {
-                [subscriber putNext:@1];
-                [object description];
-                return [[SBlockDisposable alloc] initWithBlock:^
-                {
-                    [object description];
-                    disposed = true;
-                }];
-            }] map:^id(id value)
-            {
-                [object description];
-                return @([value intValue] * 2);
-            }];
-            
-            id<SDisposable> disposable = [signal startWithNext:^(id value)
-            {
-                generated = [value isEqual:@2];
-            } error:nil completed:nil];
-            [disposable dispose];
-        }
-    }
-    
-    XCTAssertTrue(deallocated);
-    XCTAssertTrue(disposed);
-    XCTAssertTrue(generated);
-}
-
-- (void)testSubscriberDisposal
-{
-    __block bool disposed = false;
-    __block bool generated = false;
-    
-    dispatch_queue_t queue = dispatch_queue_create(NULL, 0);
-    
-    @autoreleasepool
-    {
-        SSignal *signal = [[SSignal alloc] initWithGenerator:^id<SDisposable>(SSubscriber *subscriber)
-        {
-            dispatch_async(queue, ^
-            {
-                usleep(200);
-                [subscriber putNext:@1];
-            });
-            
-            return [[SBlockDisposable alloc] initWithBlock:^
-            {
-                disposed = true;
-            }];
-        }];
-        
-        id<SDisposable> disposable = [signal startWithNext:^(id value)
-        {
-            generated = true;
-        } error:nil completed:nil];
-        NSLog(@"dispose");
-        [disposable dispose];
-    }
-    
-    dispatch_barrier_sync(queue, ^
-    {
-    });
-    
-    XCTAssertTrue(disposed);
-    XCTAssertFalse(generated);
-}
-
-- (void)testThen
-{
-    __block bool generatedFirst = false;
-    __block bool disposedFirst = false;
-    __block bool generatedSecond = false;
-    __block bool disposedSecond = false;
-    __block int result = 0;
-    
-    SSignal *signal = [[SSignal alloc] initWithGenerator:^id<SDisposable>(SSubscriber *subscriber)
-    {
-        generatedFirst = true;
-        [subscriber putNext:@(1)];
-        [subscriber putCompletion];
-        return [[SBlockDisposable alloc] initWithBlock:^
-        {
-            disposedFirst = true;
-        }];
-    }];
-    
-    signal = [signal then:[[SSignal alloc] initWithGenerator:^id<SDisposable>(SSubscriber *subscriber)
-    {
-        generatedSecond = true;
-        [subscriber putNext:@(2)];
-        [subscriber putCompletion];
-        return [[SBlockDisposable alloc] initWithBlock:^
-        {
-            disposedSecond = true;
-        }];
-    }]];
-    
-    [signal startWithNext:^(id next)
-    {
-        result += [next intValue];
-    }];
-    
-    XCTAssertTrue(generatedFirst);
-    XCTAssertTrue(disposedFirst);
-    XCTAssertTrue(generatedSecond);
-    XCTAssertTrue(disposedSecond);
-    XCTAssert(result == 3);
-}
-
-- (void)testSwitchToLatest
-{
-    __block int result = 0;
-    __block bool disposedOne = false;
-    __block bool disposedTwo = false;
-    __block bool disposedThree = false;
-    __block bool completedAll = false;
-    
-    bool deallocatedOne = false;
-    bool deallocatedTwo = false;
-    bool deallocatedThree = false;
-    
-    @autoreleasepool
-    {
-        DeallocatingObject *objectOne = [[DeallocatingObject alloc] initWithDeallocated:&deallocatedOne];
-        DeallocatingObject *objectTwo = [[DeallocatingObject alloc] initWithDeallocated:&deallocatedTwo];
-        DeallocatingObject *objectThree = [[DeallocatingObject alloc] initWithDeallocated:&deallocatedThree];
-
-        SSignal *one = [[SSignal alloc] initWithGenerator:^id<SDisposable>(SSubscriber *subscriber)
-        {
-            [subscriber putNext:@(1)];
-            [subscriber putCompletion];
-            __unused id a0 = [objectOne description];
-            return [[SBlockDisposable alloc] initWithBlock:^
-            {
-                __unused id a0 = [objectOne description];
-                disposedOne = true;
-            }];
-        }];
-        SSignal *two = [[SSignal alloc] initWithGenerator:^id<SDisposable>(SSubscriber *subscriber)
-        {
-            [subscriber putNext:@(2)];
-            [subscriber putCompletion];
-            __unused id a1 = [objectTwo description];
-            return [[SBlockDisposable alloc] initWithBlock:^
-            {
-                __unused id a1 = [objectOne description];
-                disposedTwo = true;
-            }];
-        }];
-        SSignal *three = [[SSignal alloc] initWithGenerator:^id<SDisposable>(SSubscriber *subscriber)
-        {
-            [subscriber putNext:@(3)];
-            [subscriber putCompletion];
-            __unused id a0 = [objectThree description];
-            return [[SBlockDisposable alloc] initWithBlock:^
-            {
-                __unused id a1 = [objectOne description];
-                disposedThree = true;
-            }];
-        }];
-        
-        SSignal *signal = [[[[SSignal single:one] then:[SSignal single:two]] then:[SSignal single:three]] switchToLatest];
-        [signal startWithNext:^(id next)
-        {
-            result += [next intValue];
-        } error:nil completed:^
-        {
-            completedAll = true;
-        }];
-    }
-    
-    XCTAssert(result == 6);
-    XCTAssertTrue(disposedOne);
-    XCTAssertTrue(disposedTwo);
-    XCTAssertTrue(disposedThree);
-    XCTAssertTrue(deallocatedOne);
-    XCTAssertTrue(deallocatedTwo);
-    XCTAssertTrue(deallocatedThree);
-    XCTAssertTrue(completedAll);
-}
-
-- (void)testSwitchToLatestError
-{
-    __block bool errorGenerated = false;
-    
-    SSignal *one = [[SSignal alloc] initWithGenerator:^id<SDisposable>(SSubscriber *subscriber)
-    {
-        [subscriber putError:nil];
-        return nil;
-    }];
-    
-    [one startWithNext:^(__unused id next)
-    {
-        
-    } error:^(__unused id error)
-    {
-        errorGenerated = true;
-    } completed:^
-    {
-        
-    }];
-    
-    XCTAssertTrue(errorGenerated);
-}
-
-- (void)testSwitchToLatestCompleted
-{
-    __block bool completedAll = false;
-    
-    SSignal *one = [[SSignal alloc] initWithGenerator:^id<SDisposable>(SSubscriber *subscriber)
-    {
-        [subscriber putCompletion];
-        return nil;
-    }];
-    
-    [one startWithNext:^(__unused id next)
-    {
-        
-    } error:^(__unused id error)
-    {
-    } completed:^
-    {
-        completedAll = true;
-    }];
-    
-    XCTAssertTrue(completedAll);
-}
-
-- (void)testQueue
-{
-    dispatch_queue_t queue = dispatch_queue_create(NULL, 0);
-    
-    __block bool disposedFirst = false;
-    __block bool disposedSecond = false;
-    __block bool disposedThird = false;
-    __block int result = 0;
-    
-    SSignal *firstSignal = [[SSignal alloc] initWithGenerator:^id<SDisposable>(SSubscriber *subscriber)
-    {
-        dispatch_async(queue, ^
-        {
-            usleep(100);
-            [subscriber putNext:@1];
-            [subscriber putCompletion];
-        });
-        
-        return [[SBlockDisposable alloc] initWithBlock:^
-        {
-            disposedFirst = true;
-        }];
-    }];
-    
-    SSignal *secondSignal = [[SSignal alloc] initWithGenerator:^id<SDisposable>(SSubscriber *subscriber)
-    {
-        dispatch_async(queue, ^
-        {
-            usleep(100);
-            [subscriber putNext:@2];
-            [subscriber putCompletion];
-        });
-        
-        return [[SBlockDisposable alloc] initWithBlock:^
-        {
-            disposedSecond = true;
-        }];
-    }];
-    
-    SSignal *thirdSignal = [[SSignal alloc] initWithGenerator:^id<SDisposable>(SSubscriber *subscriber)
-    {
-        dispatch_async(queue, ^
-        {
-            usleep(100);
-            [subscriber putNext:@3];
-            [subscriber putCompletion];
-        });
-        
-        return [[SBlockDisposable alloc] initWithBlock:^
-        {
-            disposedThird = true;
-        }];
-    }];
-    
-    SSignal *signal = [[[[SSignal single:firstSignal] then:[SSignal single:secondSignal]] then:[SSignal single:thirdSignal]] queue];
-    [signal startWithNext:^(id next)
-    {
-        result += [next intValue];
-    }];
-    
-    usleep(1000);
-    
-    XCTAssertEqual(result, 6);
-    XCTAssertTrue(disposedFirst);
-    XCTAssertTrue(disposedSecond);
-    XCTAssertTrue(disposedThird);
-}
-
-- (void)testQueueInterrupted
-{
-    dispatch_queue_t queue = dispatch_queue_create(NULL, 0);
-    
-    __block bool disposedFirst = false;
-    __block bool disposedSecond = false;
-    __block bool disposedThird = false;
-    __block bool startedThird = false;
-    __block int result = 0;
-    
-    SSignal *firstSignal = [[SSignal alloc] initWithGenerator:^id<SDisposable>(SSubscriber *subscriber)
-    {
-        dispatch_async(queue, ^
-        {
-            usleep(100);
-            [subscriber putNext:@1];
-            [subscriber putCompletion];
-        });
-        
-        return [[SBlockDisposable alloc] initWithBlock:^
-        {
-            disposedFirst = true;
-        }];
-    }];
-    
-    SSignal *secondSignal = [[SSignal alloc] initWithGenerator:^id<SDisposable>(SSubscriber *subscriber)
-    {
-        dispatch_async(queue, ^
-        {
-            usleep(100);
-            [subscriber putNext:@2];
-            [subscriber putError:nil];
-        });
-        
-        return [[SBlockDisposable alloc] initWithBlock:^
-        {
-            disposedSecond = true;
-        }];
-    }];
-    
-    SSignal *thirdSignal = [[SSignal alloc] initWithGenerator:^id<SDisposable>(SSubscriber *subscriber)
-    {
-        startedThird = true;
-        
-        dispatch_async(queue, ^
-        {
-            usleep(100);
-            [subscriber putNext:@3];
-            [subscriber putCompletion];
-        });
-        
-        return [[SBlockDisposable alloc] initWithBlock:^
-        {
-            disposedThird = true;
-        }];
-    }];
-    
-    SSignal *signal = [[[[SSignal single:firstSignal] then:[SSignal single:secondSignal]] then:[SSignal single:thirdSignal]] queue];
-    [signal startWithNext:^(id next)
-    {
-        result += [next intValue];
-    }];
-    
-    usleep(1000);
-    
-    XCTAssertEqual(result, 3);
-    XCTAssertTrue(disposedFirst);
-    XCTAssertTrue(disposedSecond);
-    XCTAssertFalse(startedThird);
-    XCTAssertFalse(disposedThird);
-}
-
-- (void)testQueueDisposed
-{
-    dispatch_queue_t queue = dispatch_queue_create(NULL, 0);
-    
-    __block bool disposedFirst = false;
-    __block bool disposedSecond = false;
-    __block bool disposedThird = false;
-    __block bool startedFirst = false;
-    __block bool startedSecond = false;
-    __block bool startedThird = false;
-    __block int result = 0;
-    
-    SSignal *firstSignal = [[SSignal alloc] initWithGenerator:^id<SDisposable>(SSubscriber *subscriber)
-    {
-        startedFirst = true;
-        
-        __block bool cancelled = false;
-        dispatch_async(queue, ^
-        {
-            if (!cancelled)
-            {
-                usleep(100);
-                [subscriber putNext:@1];
-                [subscriber putCompletion];
-            }
-        });
-        
-        return [[SBlockDisposable alloc] initWithBlock:^
-        {
-            cancelled = true;
-            disposedFirst = true;
-        }];
-    }];
-    
-    SSignal *secondSignal = [[SSignal alloc] initWithGenerator:^id<SDisposable>(SSubscriber *subscriber)
-    {
-        startedSecond = true;
-        
-        __block bool cancelled = false;
-        dispatch_async(queue, ^
-        {
-            if (!cancelled)
-            {
-                usleep(100);
-                [subscriber putNext:@2];
-                [subscriber putError:nil];
-            }
-        });
-        
-        return [[SBlockDisposable alloc] initWithBlock:^
-        {
-            cancelled = true;
-            disposedSecond = true;
-        }];
-    }];
-    
-    SSignal *thirdSignal = [[SSignal alloc] initWithGenerator:^id<SDisposable>(SSubscriber *subscriber)
-    {
-        startedThird = true;
-        
-        dispatch_async(queue, ^
-        {
-            usleep(100);
-            [subscriber putNext:@3];
-            [subscriber putCompletion];
-        });
-        
-        return [[SBlockDisposable alloc] initWithBlock:^
-        {
-            disposedThird = true;
-        }];
-    }];
-    
-    SSignal *signal = [[[[SSignal single:firstSignal] then:[SSignal single:secondSignal]] then:[SSignal single:thirdSignal]] queue];
-    [[signal startWithNext:^(id next)
-    {
-        result += [next intValue];
-    }] dispose];
-    
-    usleep(1000);
-    
-    XCTAssertEqual(result, 0);
-    XCTAssertTrue(disposedFirst);
-    XCTAssertFalse(disposedSecond);
-    XCTAssertFalse(disposedThird);
-    
-    XCTAssertTrue(startedFirst);
-    XCTAssertFalse(startedSecond);
-    XCTAssertFalse(startedThird);
-}
-
-- (void)testRestart
-{
-    SSignal *signal = [[SSignal alloc] initWithGenerator:^id<SDisposable>(SSubscriber *subscriber)
-    {
-        [[SQueue concurrentDefaultQueue] dispatch:^
-        {
-            [subscriber putNext:@1];
-            [subscriber putCompletion];
-        }];
-        
-        return [[SBlockDisposable alloc] initWithBlock:^
-        {
-        }];
-    }];
-    
-    __block int result = 0;
-    
-    [[[signal restart] take:3] startWithNext:^(id next)
-    {
-        result += [next intValue];
-    } error:^(id error) {
-        
-    } completed:^{
-        
-    }];
-    
-    usleep(100 * 1000);
-    
-    XCTAssertEqual(result, 3);
-}
-
-- (void)testPipe
-{
-    SPipe *pipe = [[SPipe alloc] init];
-    
-    __block int result1 = 0;
-    id<SDisposable> disposable1 = [pipe.signalProducer() startWithNext:^(id next)
-    {
-        result1 += [next intValue];
-    }];
-    
-    __block int result2 = 0;
-    id<SDisposable> disposable2 = [pipe.signalProducer() startWithNext:^(id next)
-    {
-        result2 += [next intValue];
-    }];
-    
-    pipe.sink(@1);
-    
-    XCTAssertEqual(result1, 1);
-    XCTAssertEqual(result2, 1);
-    
-    [disposable1 dispose];
-    
-    pipe.sink(@1);
-    
-    XCTAssertEqual(result1, 1);
-    XCTAssertEqual(result2, 2);
-    
-    [disposable2 dispose];
-    
-    pipe.sink(@1);
-    
-    XCTAssertEqual(result1, 1);
-    XCTAssertEqual(result2, 2);
-}
-
-- (void)testDisposableDeadlock {
-    @autoreleasepool {
-        DisposableHolder *holder = [[DisposableHolder alloc] init];
-        holder = nil;
-        sleep(10);
-    }
-}
-
-- (void)testRetryIfNoError {
-    SSignal *s = [[SSignal single:@1] retryIf:^bool(__unused id error) {
-        return true;
-    }];
-    [s startWithNext:^(id next) {
-        XCTAssertEqual(next, @1);
-    }];
-}
-
-- (void)testRetryErrorNoMatch {
-    SSignal *s = [[SSignal fail:@false] retryIf:^bool(id error) {
-        return false;
-    }];
-}
-
-- (void)testRetryErrorMatch {
-    __block counter = 1;
-    SSignal *s = [[[SSignal alloc] initWithGenerator:^id<SDisposable> (SSubscriber *subscriber) {
-        if (counter == 1) {
-            counter++;
-            [subscriber putError:@true];
-        } else {
-            [subscriber putNext:@(counter)];
-        }
-        return nil;
-    }] retryIf:^bool(id error) {
-        return [error boolValue];
-    }];
-    
-    __block int value = 0;
-    [s startWithNext:^(id next) {
-        value = [next intValue];
-    }];
-    
-    XCTAssertEqual(value, 2);
-}
-
-- (void)testRetryErrorFailNoMatch {
-    __block counter = 1;
-    SSignal *s = [[[SSignal alloc] initWithGenerator:^id<SDisposable> (SSubscriber *subscriber) {
-        if (counter == 1) {
-            counter++;
-            [subscriber putError:@true];
-        } else {
-            [subscriber putError:@false];
-        }
-        return nil;
-    }] retryIf:^bool(id error) {
-        return [error boolValue];
-    }];
-    
-    __block bool errorMatches = false;
-    [s startWithNext:nil error:^(id error) {
-        errorMatches = ![error boolValue];
-    } completed:nil];
-    
-    XCTAssert(errorMatches);
-}
-
-@end
diff --git a/submodules/SSignalKit/SSignalKitTests/SSignalPerformanceTests.m b/submodules/SSignalKit/SSignalKitTests/SSignalPerformanceTests.m
deleted file mode 100644
index f5384d75bd..0000000000
--- a/submodules/SSignalKit/SSignalKitTests/SSignalPerformanceTests.m
+++ /dev/null
@@ -1,50 +0,0 @@
-#if __IPHONE_OS_VERSION_MIN_REQUIRED
-#import <UIKit/UIKit.h>
-#else
-#import <Foundation/Foundation.h>
-#endif
-#import <XCTest/XCTest.h>
-
-@import SSignalKit;
-
-@interface SSignalPerformanceTests : XCTestCase
-
-@end
-
-@implementation SSignalPerformanceTests
-
-- (void)setUp
-{
-    [super setUp];
-}
-
-- (void)tearDown
-{
-    [super tearDown];
-}
-
-- (void)testMap
-{
-    [self measureBlock:^
-    {
-        SSignal *signal = [[[SSignal alloc] initWithGenerator:^id<SDisposable>(SSubscriber *subscriber)
-        {
-            [subscriber putNext:@1];
-            [subscriber putCompletion];
-            return nil;
-        }] map:^id (id value)
-        {
-            return value;
-        }];
-        
-        for (int i = 0; i < 100000; i++)
-        {
-            [signal startWithNext:^(__unused id next)
-            {
-                
-            }];
-        }
-    }];
-}
-
-@end
diff --git a/submodules/SSignalKit/SwiftSignalKit/BUCK b/submodules/SSignalKit/SwiftSignalKit/BUCK
index 6b19fa5041..b6e6e39b8c 100644
--- a/submodules/SSignalKit/SwiftSignalKit/BUCK
+++ b/submodules/SSignalKit/SwiftSignalKit/BUCK
@@ -3,10 +3,8 @@ load("//Config:buck_rule_macros.bzl", "framework")
 framework(
     name = "SwiftSignalKit",
     srcs = glob([
-        "*.swift",
+        "Source/**/*.swift",
     ]),
-    deps = [
-    ],
     frameworks = [
         "$SDKROOT/System/Library/Frameworks/Foundation.framework",
     ],
diff --git a/submodules/SSignalKit/SwiftSignalKit/BUILD b/submodules/SSignalKit/SwiftSignalKit/BUILD
new file mode 100644
index 0000000000..16720552fe
--- /dev/null
+++ b/submodules/SSignalKit/SwiftSignalKit/BUILD
@@ -0,0 +1,12 @@
+load("@build_bazel_rules_swift//swift:swift.bzl", "swift_library")
+
+swift_library(
+    name = "SwiftSignalKit",
+    module_name = "SwiftSignalKit",
+    srcs = glob([
+        "Source/**/*.swift",
+    ]),
+    visibility = [
+        "//visibility:public",
+    ],
+)
diff --git a/submodules/SSignalKit/SwiftSignalKit/Info.plist b/submodules/SSignalKit/SwiftSignalKit/Info.plist
deleted file mode 100644
index d3de8eefb6..0000000000
--- a/submodules/SSignalKit/SwiftSignalKit/Info.plist
+++ /dev/null
@@ -1,26 +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>CFBundleSignature</key>
-	<string>????</string>
-	<key>CFBundleVersion</key>
-	<string>$(CURRENT_PROJECT_VERSION)</string>
-	<key>NSPrincipalClass</key>
-	<string></string>
-</dict>
-</plist>
diff --git a/submodules/SSignalKit/SwiftSignalKit/Atomic.swift b/submodules/SSignalKit/SwiftSignalKit/Source/Atomic.swift
similarity index 100%
rename from submodules/SSignalKit/SwiftSignalKit/Atomic.swift
rename to submodules/SSignalKit/SwiftSignalKit/Source/Atomic.swift
diff --git a/submodules/SSignalKit/SwiftSignalKit/Bag.swift b/submodules/SSignalKit/SwiftSignalKit/Source/Bag.swift
similarity index 100%
rename from submodules/SSignalKit/SwiftSignalKit/Bag.swift
rename to submodules/SSignalKit/SwiftSignalKit/Source/Bag.swift
diff --git a/submodules/SSignalKit/SwiftSignalKit/Disposable.swift b/submodules/SSignalKit/SwiftSignalKit/Source/Disposable.swift
similarity index 100%
rename from submodules/SSignalKit/SwiftSignalKit/Disposable.swift
rename to submodules/SSignalKit/SwiftSignalKit/Source/Disposable.swift
diff --git a/submodules/SSignalKit/SwiftSignalKit/Lock.swift b/submodules/SSignalKit/SwiftSignalKit/Source/Lock.swift
similarity index 100%
rename from submodules/SSignalKit/SwiftSignalKit/Lock.swift
rename to submodules/SSignalKit/SwiftSignalKit/Source/Lock.swift
diff --git a/submodules/SSignalKit/SwiftSignalKit/Multicast.swift b/submodules/SSignalKit/SwiftSignalKit/Source/Multicast.swift
similarity index 100%
rename from submodules/SSignalKit/SwiftSignalKit/Multicast.swift
rename to submodules/SSignalKit/SwiftSignalKit/Source/Multicast.swift
diff --git a/submodules/SSignalKit/SwiftSignalKit/Promise.swift b/submodules/SSignalKit/SwiftSignalKit/Source/Promise.swift
similarity index 100%
rename from submodules/SSignalKit/SwiftSignalKit/Promise.swift
rename to submodules/SSignalKit/SwiftSignalKit/Source/Promise.swift
diff --git a/submodules/SSignalKit/SwiftSignalKit/Queue.swift b/submodules/SSignalKit/SwiftSignalKit/Source/Queue.swift
similarity index 100%
rename from submodules/SSignalKit/SwiftSignalKit/Queue.swift
rename to submodules/SSignalKit/SwiftSignalKit/Source/Queue.swift
diff --git a/submodules/SSignalKit/SwiftSignalKit/QueueLocalObject.swift b/submodules/SSignalKit/SwiftSignalKit/Source/QueueLocalObject.swift
similarity index 100%
rename from submodules/SSignalKit/SwiftSignalKit/QueueLocalObject.swift
rename to submodules/SSignalKit/SwiftSignalKit/Source/QueueLocalObject.swift
diff --git a/submodules/SSignalKit/SwiftSignalKit/Signal.swift b/submodules/SSignalKit/SwiftSignalKit/Source/Signal.swift
similarity index 100%
rename from submodules/SSignalKit/SwiftSignalKit/Signal.swift
rename to submodules/SSignalKit/SwiftSignalKit/Source/Signal.swift
diff --git a/submodules/SSignalKit/SwiftSignalKit/Signal_Catch.swift b/submodules/SSignalKit/SwiftSignalKit/Source/Signal_Catch.swift
similarity index 100%
rename from submodules/SSignalKit/SwiftSignalKit/Signal_Catch.swift
rename to submodules/SSignalKit/SwiftSignalKit/Source/Signal_Catch.swift
diff --git a/submodules/SSignalKit/SwiftSignalKit/Signal_Combine.swift b/submodules/SSignalKit/SwiftSignalKit/Source/Signal_Combine.swift
similarity index 100%
rename from submodules/SSignalKit/SwiftSignalKit/Signal_Combine.swift
rename to submodules/SSignalKit/SwiftSignalKit/Source/Signal_Combine.swift
diff --git a/submodules/SSignalKit/SwiftSignalKit/Signal_Dispatch.swift b/submodules/SSignalKit/SwiftSignalKit/Source/Signal_Dispatch.swift
similarity index 100%
rename from submodules/SSignalKit/SwiftSignalKit/Signal_Dispatch.swift
rename to submodules/SSignalKit/SwiftSignalKit/Source/Signal_Dispatch.swift
diff --git a/submodules/SSignalKit/SwiftSignalKit/Signal_Loop.swift b/submodules/SSignalKit/SwiftSignalKit/Source/Signal_Loop.swift
similarity index 100%
rename from submodules/SSignalKit/SwiftSignalKit/Signal_Loop.swift
rename to submodules/SSignalKit/SwiftSignalKit/Source/Signal_Loop.swift
diff --git a/submodules/SSignalKit/SwiftSignalKit/Signal_Mapping.swift b/submodules/SSignalKit/SwiftSignalKit/Source/Signal_Mapping.swift
similarity index 100%
rename from submodules/SSignalKit/SwiftSignalKit/Signal_Mapping.swift
rename to submodules/SSignalKit/SwiftSignalKit/Source/Signal_Mapping.swift
diff --git a/submodules/SSignalKit/SwiftSignalKit/Signal_Materialize.swift b/submodules/SSignalKit/SwiftSignalKit/Source/Signal_Materialize.swift
similarity index 100%
rename from submodules/SSignalKit/SwiftSignalKit/Signal_Materialize.swift
rename to submodules/SSignalKit/SwiftSignalKit/Source/Signal_Materialize.swift
diff --git a/submodules/SSignalKit/SwiftSignalKit/Signal_Merge.swift b/submodules/SSignalKit/SwiftSignalKit/Source/Signal_Merge.swift
similarity index 100%
rename from submodules/SSignalKit/SwiftSignalKit/Signal_Merge.swift
rename to submodules/SSignalKit/SwiftSignalKit/Source/Signal_Merge.swift
diff --git a/submodules/SSignalKit/SwiftSignalKit/Signal_Meta.swift b/submodules/SSignalKit/SwiftSignalKit/Source/Signal_Meta.swift
similarity index 100%
rename from submodules/SSignalKit/SwiftSignalKit/Signal_Meta.swift
rename to submodules/SSignalKit/SwiftSignalKit/Source/Signal_Meta.swift
diff --git a/submodules/SSignalKit/SwiftSignalKit/Signal_Reduce.swift b/submodules/SSignalKit/SwiftSignalKit/Source/Signal_Reduce.swift
similarity index 100%
rename from submodules/SSignalKit/SwiftSignalKit/Signal_Reduce.swift
rename to submodules/SSignalKit/SwiftSignalKit/Source/Signal_Reduce.swift
diff --git a/submodules/SSignalKit/SwiftSignalKit/Signal_SideEffects.swift b/submodules/SSignalKit/SwiftSignalKit/Source/Signal_SideEffects.swift
similarity index 100%
rename from submodules/SSignalKit/SwiftSignalKit/Signal_SideEffects.swift
rename to submodules/SSignalKit/SwiftSignalKit/Source/Signal_SideEffects.swift
diff --git a/submodules/SSignalKit/SwiftSignalKit/Signal_Single.swift b/submodules/SSignalKit/SwiftSignalKit/Source/Signal_Single.swift
similarity index 100%
rename from submodules/SSignalKit/SwiftSignalKit/Signal_Single.swift
rename to submodules/SSignalKit/SwiftSignalKit/Source/Signal_Single.swift
diff --git a/submodules/SSignalKit/SwiftSignalKit/Signal_Take.swift b/submodules/SSignalKit/SwiftSignalKit/Source/Signal_Take.swift
similarity index 100%
rename from submodules/SSignalKit/SwiftSignalKit/Signal_Take.swift
rename to submodules/SSignalKit/SwiftSignalKit/Source/Signal_Take.swift
diff --git a/submodules/SSignalKit/SwiftSignalKit/Signal_Timing.swift b/submodules/SSignalKit/SwiftSignalKit/Source/Signal_Timing.swift
similarity index 100%
rename from submodules/SSignalKit/SwiftSignalKit/Signal_Timing.swift
rename to submodules/SSignalKit/SwiftSignalKit/Source/Signal_Timing.swift
diff --git a/submodules/SSignalKit/SwiftSignalKit/Subscriber.swift b/submodules/SSignalKit/SwiftSignalKit/Source/Subscriber.swift
similarity index 100%
rename from submodules/SSignalKit/SwiftSignalKit/Subscriber.swift
rename to submodules/SSignalKit/SwiftSignalKit/Source/Subscriber.swift
diff --git a/submodules/SSignalKit/SwiftSignalKit/ThreadPool.swift b/submodules/SSignalKit/SwiftSignalKit/Source/ThreadPool.swift
similarity index 100%
rename from submodules/SSignalKit/SwiftSignalKit/ThreadPool.swift
rename to submodules/SSignalKit/SwiftSignalKit/Source/ThreadPool.swift
diff --git a/submodules/SSignalKit/SwiftSignalKit/Timer.swift b/submodules/SSignalKit/SwiftSignalKit/Source/Timer.swift
similarity index 100%
rename from submodules/SSignalKit/SwiftSignalKit/Timer.swift
rename to submodules/SSignalKit/SwiftSignalKit/Source/Timer.swift
diff --git a/submodules/SSignalKit/SwiftSignalKit/ValuePipe.swift b/submodules/SSignalKit/SwiftSignalKit/Source/ValuePipe.swift
similarity index 100%
rename from submodules/SSignalKit/SwiftSignalKit/ValuePipe.swift
rename to submodules/SSignalKit/SwiftSignalKit/Source/ValuePipe.swift
diff --git a/submodules/SSignalKit/SwiftSignalKit/SwiftSignalKit.h b/submodules/SSignalKit/SwiftSignalKit/SwiftSignalKit.h
deleted file mode 100644
index d30da27eb3..0000000000
--- a/submodules/SSignalKit/SwiftSignalKit/SwiftSignalKit.h
+++ /dev/null
@@ -1,23 +0,0 @@
-//
-//  SwiftSignalKit.h
-//  SwiftSignalKit
-//
-//  Created by Peter on 10/06/15.
-//  Copyright (c) 2015 Telegram. All rights reserved.
-//
-
-#if __IPHONE_OS_VERSION_MIN_REQUIRED
-#import <UIKit/UIKit.h>
-#else
-#import <Foundation/Foundation.h>
-#endif
-
-//! Project version number for SwiftSignalKit.
-FOUNDATION_EXPORT double SwiftSignalKitVersionNumber;
-
-//! Project version string for SwiftSignalKit.
-FOUNDATION_EXPORT const unsigned char SwiftSignalKitVersionString[];
-
-// In this header, you should import all the public headers of your framework using statements like #import <SwiftSignalKit/PublicHeader.h>
-
-
diff --git a/submodules/SSignalKit/SwiftSignalKitTests/DeallocatingObject.swift b/submodules/SSignalKit/SwiftSignalKitTests/DeallocatingObject.swift
deleted file mode 100644
index 840ca1075b..0000000000
--- a/submodules/SSignalKit/SwiftSignalKitTests/DeallocatingObject.swift
+++ /dev/null
@@ -1,19 +0,0 @@
-import Foundation
-
-internal class DeallocatingObject : CustomStringConvertible {
-    private var deallocated: UnsafeMutablePointer<Bool>
-    
-    init(deallocated: UnsafeMutablePointer<Bool>) {
-        self.deallocated = deallocated
-    }
-    
-    deinit {
-        self.deallocated.pointee = true
-    }
-    
-    var description: String {
-        get {
-            return ""
-        }
-    }
-}
diff --git a/submodules/SSignalKit/SwiftSignalKitTests/Info.plist b/submodules/SSignalKit/SwiftSignalKitTests/Info.plist
deleted file mode 100644
index ba72822e87..0000000000
--- a/submodules/SSignalKit/SwiftSignalKitTests/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>BNDL</string>
-	<key>CFBundleShortVersionString</key>
-	<string>1.0</string>
-	<key>CFBundleSignature</key>
-	<string>????</string>
-	<key>CFBundleVersion</key>
-	<string>1</string>
-</dict>
-</plist>
diff --git a/submodules/SSignalKit/SwiftSignalKitTests/PerformanceTests.swift b/submodules/SSignalKit/SwiftSignalKitTests/PerformanceTests.swift
deleted file mode 100644
index 824ffcca7c..0000000000
--- a/submodules/SSignalKit/SwiftSignalKitTests/PerformanceTests.swift
+++ /dev/null
@@ -1,167 +0,0 @@
-import UIKit
-import XCTest
-import SwiftSignalKit
-import Foundation
-
-/*final class DisposableLock {
-    private var action: (() -> Void)?
-    private var lock = pthread_mutex_t()
-    
-    init(action: @escaping () -> Void) {
-        self.action = action
-        pthread_mutex_init(&self.lock, nil)
-    }
-    
-    func dispose() {
-        var action: (() -> Void)?
-        pthread_mutex_lock(&self.lock)
-        action = self.action
-        self.action = nil
-        pthread_mutex_unlock(&self.lock)
-        if let action = action {
-            action()
-        }
-    }
-}
-
-final class DisposableSpinLock {
-    private var action: (() -> Void)?
-    private var lock = OSSpinLock()
-    
-    init(action: @escaping () -> Void) {
-        self.action = action
-    }
-    
-    func dispose() {
-        var action: (() -> Void)?
-        OSSpinLockLock(&self.lock)
-        action = self.action
-        self.action = nil
-        OSSpinLockUnlock(&self.lock)
-        if let action = action {
-            action()
-        }
-    }
-}
-
-final class DisposableNoLock {
-    private var action: (() -> Void)?
-    
-    init(action: @escaping () -> Void) {
-        self.action = action
-    }
-    
-    func dispose() {
-        var action: (() -> Void)?
-        action = self.action
-        self.action = nil
-        if let action = action {
-            action()
-        }
-    }
-}
-
-final class DisposableAtomic {
-    private var action: () -> Void
-    private var disposed: Int32 = 0
-    
-    init(action: @escaping () -> Void) {
-        self.action = action
-    }
-    
-    func dispose() {
-        if OSAtomicCompareAndSwap32(0, 1, &self.disposed) {
-            self.action()
-        }
-    }
-}
-
-class PerformanceTests: XCTestCase {
-    override func setUp() {
-        super.setUp()
-    }
-    
-    override func tearDown() {
-        super.tearDown()
-    }
-    
-    func testMeasureLock() {
-        measure {
-            for _ in 0 ..< 1000000 {
-                let disposable = DisposableLock(action: {})
-                disposable.dispose()
-            }
-        }
-    }
-    
-    func testMeasureSpinlock() {
-        measure {
-            for _ in 0 ..< 1000000 {
-                let disposable = DisposableSpinLock(action: {})
-                disposable.dispose()
-            }
-        }
-    }
-    
-    func testMeasureAtomic() {
-        measure {
-            for _ in 0 ..< 1000000 {
-                let disposable = DisposableAtomic(action: {})
-                disposable.dispose()
-            }
-        }
-    }
-    
-    func read(_ idxin: Int, _ size: Int, _ tree: inout [Int: Int], _ reads: inout Set<Int>) -> Int {
-        var idx = idxin
-        var sum = 0
-        while idx <= size {
-            print("read at \(idx)")
-            if let value = tree[idx] {
-                sum += value
-            }
-            reads.insert(idx)
-            idx += (idx & -idx)
-        }
-        return sum
-    }
-    
-    func update(_ idxin: Int, _ val: Int, _ tree: inout [Int: Int], _ updates: inout Set<Int>) {
-        var idx = idxin
-        while (idx > 0) {
-            if let value = tree[idx] {
-                tree[idx] = value + val
-            } else {
-                tree[idx] = val
-            }
-            //print("write at \(idx)")
-            updates.insert(idx)
-            idx -= (idx & -idx)
-        }
-    }
-    
-    func testTree() {
-        let size = 2_000_000
-        var dict: [Int: Int] = [:]
-        
-        var updates = Set<Int>()
-        var index = 0
-        for _ in 1 ..< 100_000 {
-            //update(Int(1 + arc4random_uniform(UInt32(size))), 1, &dict, &updates)
-            update(index, 1, &dict, &updates)
-            index += Int(1 + arc4random_uniform(100))
-        }
-        update(size - 1, 1, &dict, &updates)
-        print("update ops = \(updates.count), tree = \(dict.count) items")
-        
-        var reads = Set<Int>()
-        let sum = read(1, size, &dict, &reads)
-        print("read = \(sum) ops = \(reads.count)")
-        
-        update(99, -2, &dict, &updates)
-        reads.removeAll()
-        let sum2 = read(1, size, &dict, &reads)
-        print("read2 = \(sum2) ops = \(reads.count)")
-    }
-}
-*/
diff --git a/submodules/SSignalKit/SwiftSignalKitTests/SwiftSignalKitBasicTests.swift b/submodules/SSignalKit/SwiftSignalKitTests/SwiftSignalKitBasicTests.swift
deleted file mode 100644
index 9ff9df469d..0000000000
--- a/submodules/SSignalKit/SwiftSignalKitTests/SwiftSignalKitBasicTests.swift
+++ /dev/null
@@ -1,300 +0,0 @@
-import UIKit
-import XCTest
-import SwiftSignalKit
-
-class SwiftSignalKitTests: XCTestCase {
-    override func setUp() {
-        super.setUp()
-    }
-    
-    override func tearDown() {
-        super.tearDown()
-    }
-    
-    func testActionDisposableDisposed() {
-        var deallocated = false
-        var disposed = false
-        if true {
-            var object: DeallocatingObject? = DeallocatingObject(deallocated: &deallocated)
-            let disposable = ActionDisposable(action: { [object] () -> Void in
-                let _ = object.debugDescription
-                disposed = true
-            })
-            object = nil
-            XCTAssertFalse(deallocated, "deallocated != false")
-            disposable.dispose()
-        }
-        
-        XCTAssertTrue(deallocated, "deallocated != true")
-        XCTAssertTrue(disposed, "disposed != true")
-    }
-    
-    func testActionDisposableNotDisposed() {
-        var deallocated = false
-        var disposed = false
-        if true {
-            let object: DeallocatingObject? = DeallocatingObject(deallocated: &deallocated)
-            let _ = ActionDisposable(action: { [object] () -> Void in
-                let _ = object.debugDescription
-                disposed = true
-            })
-        }
-        XCTAssertTrue(deallocated, "deallocated != true")
-        XCTAssertFalse(disposed, "disposed != false")
-    }
-    
-    func testMetaDisposableDisposed() {
-        var deallocated = false
-        var disposed = false
-        if true {
-            let object: DeallocatingObject? = DeallocatingObject(deallocated: &deallocated)
-            let disposable = ActionDisposable(action: { [object] () -> Void in
-                let _ = object.debugDescription
-                disposed = true
-            })
-            
-            let metaDisposable = MetaDisposable()
-            metaDisposable.set(disposable)
-            metaDisposable.dispose()
-        }
-        XCTAssertTrue(deallocated, "deallocated != true")
-        XCTAssertTrue(disposed, "disposed != true")
-    }
-    
-    func testMetaDisposableDisposedMultipleTimes() {
-        var deallocated1 = false
-        var disposed1 = false
-        var deallocated2 = false
-        var disposed2 = false
-        if true {
-            let object1: DeallocatingObject? = DeallocatingObject(deallocated: &deallocated1)
-            let actionDisposable1 = ActionDisposable(action: { [object1] () -> Void in
-                let _ = object1.debugDescription
-                disposed1 = true
-            })
-            
-            let object2: DeallocatingObject? = DeallocatingObject(deallocated: &deallocated2)
-            let actionDisposable2 = ActionDisposable(action: { [object2] () -> Void in
-                let _ = object2.debugDescription
-                disposed2 = true
-            })
-            
-            let metaDisposable = MetaDisposable()
-            metaDisposable.set(actionDisposable1)
-            metaDisposable.set(actionDisposable2)
-            metaDisposable.dispose()
-        }
-        XCTAssertTrue(deallocated1, "deallocated1 != true")
-        XCTAssertTrue(disposed1, "disposed1 != true")
-        XCTAssertTrue(deallocated2, "deallocated2 != true")
-        XCTAssertTrue(disposed2, "disposed2 != true")
-    }
-    
-    func testMetaDisposableNotDisposed() {
-        var deallocated = false
-        var disposed = false
-        if true {
-            let object: DeallocatingObject? = DeallocatingObject(deallocated: &deallocated)
-            let disposable = ActionDisposable(action: { [object] () -> Void in
-                let _ = object.debugDescription
-                disposed = true
-            })
-            
-            let metaDisposable = MetaDisposable()
-            metaDisposable.set(disposable)
-        }
-        XCTAssertTrue(deallocated, "deallocated != true")
-        XCTAssertFalse(disposed, "disposed != false")
-    }
-    
-    func testDisposableSetSingleDisposed() {
-        var deallocated = false
-        var disposed = false
-        if true {
-            let object: DeallocatingObject? = DeallocatingObject(deallocated: &deallocated)
-            let disposable = ActionDisposable(action: { [object] () -> Void in
-                let _ = object.debugDescription
-                disposed = true
-            })
-            
-            let disposableSet = DisposableSet()
-            disposableSet.add(disposable)
-            disposableSet.dispose()
-        }
-        XCTAssertTrue(deallocated, "deallocated != true")
-        XCTAssertTrue(disposed, "disposed != true")
-    }
-    
-    func testDisposableSetMultipleDisposed() {
-        var deallocated1 = false
-        var disposed1 = false
-        var deallocated2 = false
-        var disposed2 = false
-        if true {
-            let object1: DeallocatingObject? = DeallocatingObject(deallocated: &deallocated1)
-            let actionDisposable1 = ActionDisposable(action: { [object1] () -> Void in
-                let _ = object1.debugDescription
-                disposed1 = true
-            })
-            
-            let object2: DeallocatingObject? = DeallocatingObject(deallocated: &deallocated2)
-            let actionDisposable2 = ActionDisposable(action: { [object2] () -> Void in
-                let _ = object2.debugDescription
-                disposed2 = true
-            })
-            
-            let disposableSet = DisposableSet()
-            disposableSet.add(actionDisposable1)
-            disposableSet.add(actionDisposable2)
-            disposableSet.dispose()
-        }
-        XCTAssertTrue(deallocated1, "deallocated1 != true")
-        XCTAssertTrue(disposed1, "disposed1 != true")
-        XCTAssertTrue(deallocated2, "deallocated2 != true")
-        XCTAssertTrue(disposed2, "disposed2 != true")
-    }
-    
-    func testDisposableSetSingleNotDisposed() {
-        var deallocated = false
-        var disposed = false
-        if true {
-            let object: DeallocatingObject? = DeallocatingObject(deallocated: &deallocated)
-            let disposable = ActionDisposable(action: { [object] () -> Void in
-                let _ = object.debugDescription
-                disposed = true
-            })
-            
-            let disposableSet = DisposableSet()
-            disposableSet.add(disposable)
-        }
-        XCTAssertTrue(deallocated, "deallocated != true")
-        XCTAssertFalse(disposed, "disposed != false")
-    }
-    
-    func testDisposableSetMultipleNotDisposed() {
-        var deallocated1 = false
-        var disposed1 = false
-        var deallocated2 = false
-        var disposed2 = false
-        if true {
-            let object1: DeallocatingObject? = DeallocatingObject(deallocated: &deallocated1)
-            let actionDisposable1 = ActionDisposable(action: { [object1] () -> Void in
-                let _ = object1.debugDescription
-                disposed1 = true
-            })
-            
-            let object2: DeallocatingObject? = DeallocatingObject(deallocated: &deallocated2)
-            let actionDisposable2 = ActionDisposable(action: { [object2] () -> Void in
-                let _ = object2.debugDescription
-                disposed2 = true
-            })
-            
-            let disposableSet = DisposableSet()
-            disposableSet.add(actionDisposable1)
-            disposableSet.add(actionDisposable2)
-        }
-        XCTAssertTrue(deallocated1, "deallocated1 != true")
-        XCTAssertFalse(disposed1, "disposed1 != false")
-        XCTAssertTrue(deallocated2, "deallocated2 != true")
-        XCTAssertFalse(disposed2, "disposed2 != false")
-    }
-    
-    func testMetaDisposableAlreadyDisposed() {
-        var deallocated1 = false
-        var disposed1 = false
-        var deallocated2 = false
-        var disposed2 = false
-        if true {
-            let object1: DeallocatingObject? = DeallocatingObject(deallocated: &deallocated1)
-            let actionDisposable1 = ActionDisposable(action: { [object1] () -> Void in
-                let _ = object1.debugDescription
-                disposed1 = true
-            })
-            
-            let object2: DeallocatingObject? = DeallocatingObject(deallocated: &deallocated2)
-            let actionDisposable2 = ActionDisposable(action: { [object2] () -> Void in
-                let _ = object2.debugDescription
-                disposed2 = true
-            })
-            
-            let metaDisposable = MetaDisposable()
-            metaDisposable.set(actionDisposable1)
-            metaDisposable.dispose()
-            metaDisposable.set(actionDisposable2)
-        }
-        XCTAssertTrue(deallocated1, "deallocated1 != true")
-        XCTAssertTrue(disposed1, "disposed1 != true")
-        XCTAssertTrue(deallocated2, "deallocated2 != true")
-        XCTAssertTrue(disposed2, "disposed2 != true")
-    }
-    
-    func testDisposableSetAlreadyDisposed() {
-        var deallocated1 = false
-        var disposed1 = false
-        var deallocated2 = false
-        var disposed2 = false
-        if true {
-            let object1: DeallocatingObject? = DeallocatingObject(deallocated: &deallocated1)
-            let actionDisposable1 = ActionDisposable(action: { [object1] () -> Void in
-                let _ = object1.debugDescription
-                disposed1 = true
-            })
-            
-            let object2: DeallocatingObject? = DeallocatingObject(deallocated: &deallocated2)
-            let actionDisposable2 = ActionDisposable(action: { [object2] () -> Void in
-                let _ = object2.debugDescription
-                disposed2 = true
-            })
-            
-            let disposableSet = DisposableSet()
-            disposableSet.add(actionDisposable1)
-            disposableSet.dispose()
-            disposableSet.add(actionDisposable2)
-        }
-        XCTAssertTrue(deallocated1, "deallocated1 != true")
-        XCTAssertTrue(disposed1, "disposed1 != true")
-        XCTAssertTrue(deallocated2, "deallocated2 != true")
-        XCTAssertTrue(disposed2, "disposed2 != true")
-    }
-    
-    func testDelayed1() {
-        var flag = false
-        let signal = Signal<Signal<Void, NoError>, NoError> { subscriber in
-            Queue.concurrentDefaultQueue().after(0.1, {
-                subscriber.putNext(Signal { susbcriber2 in
-                    return ActionDisposable {
-                        flag = true
-                    }
-                })
-            })
-            
-            return EmptyDisposable
-        } |> switchToLatest
-        
-        let disposable = signal.start()
-        disposable.dispose()
-        
-        usleep(1000000 * 20)
-        
-        XCTAssert(flag == true)
-    }
-    
-    func testSingleDeallocation() {
-        do {
-            let signal: Signal<(Bool, WrapData?, Int), NoError> = .single((true, WrapData(data: Data(count: 1000)), 123))
-            let _ = signal.start()
-        }
-    }
-}
-
-final class WrapData {
-    let data: Data?
-    
-    init(data: Data?) {
-        self.data = data
-    }
-    
-    deinit {
-        print("deinit")
-    }
-}
diff --git a/submodules/SSignalKit/SwiftSignalKitTests/SwiftSignalKitFunctionsTests.swift b/submodules/SSignalKit/SwiftSignalKitTests/SwiftSignalKitFunctionsTests.swift
deleted file mode 100644
index a7c418579d..0000000000
--- a/submodules/SSignalKit/SwiftSignalKitTests/SwiftSignalKitFunctionsTests.swift
+++ /dev/null
@@ -1,733 +0,0 @@
-import UIKit
-import XCTest
-import SwiftSignalKit
-
-func singleSignalInt(_ value: Signal<Int, Void>) -> Signal<Signal<Int, Void>, Void> {
-    return Signal { subscriber in
-        subscriber.putNext(value)
-        subscriber.putCompletion()
-        return EmptyDisposable
-    }
-}
-
-class SwiftSignalKitFunctionsTests: XCTestCase {
-
-    override func setUp() {
-        super.setUp()
-    }
-    
-    override func tearDown() {
-        super.tearDown()
-    }
-    
-    func testSignalGenerated() {
-        var deallocated = false
-        var disposed = false
-        var generated = false
-        
-        if true {
-            var object: DeallocatingObject? = DeallocatingObject(deallocated: &deallocated)
-            let signal = Signal<Int, Void> { [object] subscriber in
-                subscriber.putNext(1)
-                return ActionDisposable {
-                    let _ = object?.description
-                    disposed = true
-                }
-            }
-            
-            let disposable = signal.start(next: { [object] next in
-                generated = true
-                let _ = object?.description
-            })
-            
-            object = nil
-            
-            XCTAssertFalse(deallocated, "deallocated != false")
-            
-            disposable.dispose()
-        }
-        
-        XCTAssertTrue(deallocated, "deallocated != true")
-        XCTAssertTrue(disposed, "disposed != true")
-        XCTAssertTrue(generated, "generated != true")
-    }
-    
-    func testSignalGeneratedCompleted() {
-        var deallocated = false
-        var disposed = false
-        var generated = false
-        var completed = false
-        
-        if true {
-            var object: DeallocatingObject? = DeallocatingObject(deallocated: &deallocated)
-            let signal = Signal<Int, Void> { [object] subscriber in
-                subscriber.putNext(1)
-                subscriber.putCompletion()
-                
-                return ActionDisposable {
-                    let _ = object?.description
-                    disposed = true
-                }
-            }
-            
-            let disposable = signal.start(next: { [object] next in
-                generated = true
-                let _ = object?.description
-            }, completed: { [object]
-                completed = true
-                let _ = object?.description
-            })
-            
-            object = nil
-            
-            XCTAssertFalse(deallocated, "deallocated != false")
-            
-            disposable.dispose()
-        }
-        
-        XCTAssertTrue(deallocated, "deallocated != true")
-        XCTAssertTrue(disposed, "disposed != true")
-        XCTAssertTrue(generated, "generated != true")
-        XCTAssertTrue(completed, "completed != true")
-    }
-    
-    func testSignalGeneratedError() {
-        var deallocated = false
-        var disposed = false
-        var generated = false
-        var completed = false
-        var error = false
-        
-        if true {
-            var object: DeallocatingObject? = DeallocatingObject(deallocated: &deallocated)
-            let signal = Signal<Int, Void> { [object] subscriber in
-                subscriber.putError()
-                subscriber.putNext(1)
-                
-                return ActionDisposable {
-                    let _ = object?.description
-                    disposed = true
-                }
-            }
-            
-            let disposable = signal.start(next: { [object] next in
-                generated = true
-                let _ = object?.description
-            }, error: { [object] _ in
-                error = true
-                let _ = object?.description
-            },
-             completed: { [object]
-                completed = true
-                let _ = object?.description
-            })
-            
-            object = nil
-            
-            XCTAssertFalse(deallocated, "deallocated != false")
-            
-            disposable.dispose()
-        }
-        
-        XCTAssertTrue(deallocated, "deallocated != true")
-        XCTAssertTrue(disposed, "disposed != true")
-        XCTAssertFalse(generated, "generated != false")
-        XCTAssertFalse(completed, "completed != false")
-        XCTAssertTrue(error, "error != true")
-    }
-    
-    func testMap() {
-        var deallocated = false
-        var disposed = false
-        var generated = false
-        
-        if true {
-            var object: DeallocatingObject? = DeallocatingObject(deallocated: &deallocated)
-            var signal = Signal<Int, Void> { [object] subscriber in
-                subscriber.putNext(1)
-                
-                return ActionDisposable {
-                    let _ = object?.description
-                    disposed = true
-                }
-            }
-            signal = signal |> map { $0 * 2}
-            
-            let disposable = signal.start(next: { [object] next in
-                generated = next == 2
-                let _ = object?.description
-            })
-            
-            object = nil
-            
-            XCTAssertFalse(deallocated, "deallocated != false")
-            
-            disposable.dispose()
-        }
-        
-        XCTAssertTrue(deallocated, "deallocated != true")
-        XCTAssertTrue(disposed, "disposed != true")
-        XCTAssertTrue(generated, "generated != true")
-    }
-    
-    func testCatch() {
-        let failingSignal = Signal<Int, Int> { subscriber in
-            subscriber.putNext(1)
-            subscriber.putError(1)
-            return EmptyDisposable
-        }
-        
-        let catchSignal = failingSignal |> `catch` { error in
-            return Signal<Int, Int> { subscriber in
-                subscriber.putNext(error * 2)
-                return EmptyDisposable
-            }
-        }
-        
-        var result = 0
-        let _ = catchSignal.start(next: { next in
-            result += next
-        })
-        
-        XCTAssertTrue(result == 3, "result != 2")
-    }
-    
-    func testSubscriberDisposal() {
-        var disposed = false
-        var generated = false
-        let queue = DispatchQueue(label: "")
-        
-        if true {
-            let signal = Signal<Int, Void> { subscriber in
-                queue.async {
-                    usleep(200)
-                    subscriber.putNext(1)
-                }
-                return ActionDisposable {
-                    disposed = true
-                }
-            }
-            
-            let disposable = signal.start(next: { next in
-                generated = true
-            })
-            disposable.dispose()
-            
-            queue.sync(flags: [.barrier], execute: {})
-            
-            XCTAssertTrue(disposed, "disposed != true")
-            XCTAssertFalse(generated, "generated != false")
-        }
-    }
-    
-    func testThen() {
-        var generatedFirst = false
-        var disposedFirst = false
-        var generatedSecond = false
-        var disposedSecond = false
-        var result = 0
-        
-        var signal = Signal<Int, Void> { subscriber in
-            generatedFirst = true
-            subscriber.putNext(1)
-            subscriber.putCompletion()
-            return ActionDisposable {
-                disposedFirst = true
-            }
-        }
-        
-        signal = signal |> then (Signal<Int, Void> { subscriber in
-            generatedSecond = true
-            subscriber.putNext(2)
-            subscriber.putCompletion()
-            return ActionDisposable {
-                disposedSecond = true
-            }
-        })
-        
-        let _ = signal.start(next: { next in
-            result += next
-        })
-        
-        XCTAssertTrue(generatedFirst, "generatedFirst != true");
-        XCTAssertTrue(disposedFirst, "disposedFirst != true");
-        XCTAssertTrue(generatedSecond, "generatedSecond !+ true");
-        XCTAssertTrue(disposedSecond, "disposedSecond != true");
-        XCTAssertTrue(result == 3, "result != 3");
-    }
-    
-    func testCombineLatest2() {
-        let s1 = Signal<Int, Void> { subscriber in
-            subscriber.putNext(1)
-            subscriber.putCompletion()
-            return EmptyDisposable
-        }
-        let s2 = Signal<Int, Void> { subscriber in
-            subscriber.putNext(2)
-            subscriber.putCompletion()
-            return EmptyDisposable
-        }
-        
-        let signal = combineLatest(s1, s2)
-        
-        var completed = false
-        let _ = signal.start(next: { next in
-            XCTAssert(next.0 == 1 && next.1 == 2, "next != (1, 2)")
-            return
-        }, completed: {
-            completed = true
-        })
-        XCTAssert(completed == true, "completed != true")
-    }
-    
-    func testCombineLatest3() {
-        let s1 = Signal<Int, Void> { subscriber in
-            subscriber.putNext(1)
-            subscriber.putCompletion()
-            return EmptyDisposable
-        }
-        let s2 = Signal<Int, Void> { subscriber in
-            subscriber.putNext(2)
-            subscriber.putCompletion()
-            return EmptyDisposable
-        }
-        let s3 = Signal<Int, Void> { subscriber in
-            subscriber.putNext(3)
-            subscriber.putCompletion()
-            return EmptyDisposable
-        }
-        
-        let signal = combineLatest(s1, s2, s3)
-        
-        var completed = false
-        let _ = signal.start(next: { next in
-            XCTAssert(next.0 == 1 && next.1 == 2 && next.2 == 3, "next != (1, 2, 3)")
-            return
-        }, completed: {
-                completed = true
-        })
-        XCTAssert(completed == true, "completed != true")
-    }
-    
-    func testSingle() {
-        let s1 = single(1, Void.self)
-        let s2 = fail(Int.self, Void())
-        let s3 = complete(Int.self, Void.self)
-        
-        var singleEmitted = false
-        let _ = s1.start(next: { next in
-            singleEmitted = next == 1
-        })
-        XCTAssert(singleEmitted == true, "singleEmitted != true")
-        
-        var errorEmitted = false
-        let _ = s2.start(error: { error in
-            errorEmitted = true
-        })
-        XCTAssert(errorEmitted == true, "errorEmitted != true")
-        
-        var completedEmitted = false
-        let _ = s3.start(completed: {
-            completedEmitted = true
-        })
-        XCTAssert(completedEmitted == true, "errorEmitted != true")
-    }
-    
-    func testSwitchToLatest() {
-        var result: [Int] = []
-        var disposedOne = false
-        var disposedTwo = false
-        var disposedThree = false
-        var completedAll = false
-        
-        var deallocatedOne = false
-        var deallocatedTwo = false
-        var deallocatedThree = false
-        
-        if true {
-            let objectOne: DeallocatingObject? = DeallocatingObject(deallocated: &deallocatedOne)
-            let objectTwo: DeallocatingObject? = DeallocatingObject(deallocated: &deallocatedTwo)
-            let objectThree: DeallocatingObject? = DeallocatingObject(deallocated: &deallocatedThree)
-            
-            let one = Signal<Int, Void> { subscriber in
-                subscriber.putNext(1)
-                subscriber.putCompletion()
-                return ActionDisposable { [objectOne] in
-                    let _ = objectOne?.description
-                    disposedOne = true
-                }
-            }
-            
-            let two = Signal<Int, Void> { subscriber in
-                subscriber.putNext(2)
-                subscriber.putCompletion()
-                return ActionDisposable { [objectTwo] in
-                    let _ = objectTwo?.description
-                    disposedTwo = true
-                }
-            }
-            
-            let three = Signal<Int, Void> { subscriber in
-                subscriber.putNext(3)
-                subscriber.putCompletion()
-                return ActionDisposable { [objectThree] in
-                    let _ = objectThree?.description
-                    disposedThree = true
-                }
-            }
-            
-            let signal = singleSignalInt(one) |> then(singleSignalInt(two)) |> then(singleSignalInt(three)) |> switchToLatest
-            
-            let _ = signal.start(next: { next in
-                result.append(next)
-            }, completed: {
-                completedAll = true
-            })
-        }
-        
-        XCTAssert(result.count == 3 && result[0] == 1 && result[1] == 2 && result[2] == 3, "result != [1, 2, 3]");
-        XCTAssert(disposedOne == true, "disposedOne != true");
-        XCTAssert(disposedTwo == true, "disposedTwo != true");
-        XCTAssert(disposedThree == true, "disposedThree != true");
-        XCTAssert(deallocatedOne == true, "deallocatedOne != true");
-        XCTAssert(deallocatedTwo == true, "deallocatedTwo != true");
-        XCTAssert(deallocatedThree == true, "deallocatedThree != true");
-        XCTAssert(completedAll == true, "completedAll != true");
-    }
-    
-    func testSwitchToLatestError() {
-        var errorGenerated = false
-        
-        let one = Signal<Int, Void> { subscriber in
-            subscriber.putError(Void())
-            return EmptyDisposable
-        }
-        
-        let signal = singleSignalInt(one) |> switchToLatest
-        
-        let _ = signal.start(error: { error in
-            errorGenerated = true
-        })
-        
-        XCTAssert(errorGenerated == true, "errorGenerated != true")
-    }
-    
-    func testQueue() {
-        let q = DispatchQueue(label: "")
-        
-        var disposedOne = false
-        var disposedTwo = false
-        var disposedThree = false
-        var completedAll = false
-        var result: [Int] = []
-        
-        let one = Signal<Int, Void> { subscriber in
-            q.async {
-                subscriber.putNext(1)
-                subscriber.putCompletion()
-            }
-            return ActionDisposable {
-                disposedOne = true
-            }
-        }
-        
-        let two = Signal<Int, Void> { subscriber in
-            q.async {
-                subscriber.putNext(2)
-                subscriber.putCompletion()
-            }
-            return ActionDisposable {
-                disposedTwo = true
-            }
-        }
-        
-        let three = Signal<Int, Void> { subscriber in
-            q.async {
-                subscriber.putNext(3)
-                subscriber.putCompletion()
-            }
-            return ActionDisposable {
-                disposedThree = true
-            }
-        }
-        
-        let signal = singleSignalInt(one) |> then(singleSignalInt(two)) |> then(singleSignalInt(three)) |> queue
-        
-        let _ = signal.start(next: { next in
-            print("next: \(next)")
-            result.append(next)
-        }, completed: {
-            completedAll = true
-        })
-        
-        usleep(1000 * 200)
-        
-        XCTAssert(result.count == 3 && result[0] == 1 && result[1] == 2 && result[2] == 3, "result != [1, 2, 3]");
-        XCTAssert(disposedOne == true, "disposedOne != true");
-        XCTAssert(disposedTwo == true, "disposedTwo != true");
-        XCTAssert(disposedThree == true, "disposedThree != true");
-        XCTAssert(completedAll == true, "completedAll != true");
-    }
-    
-    func testQueueInterrupted() {
-        let q = DispatchQueue(label: "")
-        
-        var disposedOne = false
-        var disposedTwo = false
-        var disposedThree = false
-        var startedThird = false
-        var completedAll = false
-        var result: [Int] = []
-        
-        let one = Signal<Int, Void> { subscriber in
-            q.async {
-                subscriber.putNext(1)
-                subscriber.putCompletion()
-            }
-            return ActionDisposable {
-                disposedOne = true
-            }
-        }
-        
-        let two = Signal<Int, Void> { subscriber in
-            q.async {
-                subscriber.putNext(2)
-                subscriber.putError(Void())
-            }
-            return ActionDisposable {
-                disposedTwo = true
-            }
-        }
-        
-        let three = Signal<Int, Void> { subscriber in
-            startedThird = true
-            q.async {
-                subscriber.putNext(3)
-                subscriber.putCompletion()
-            }
-            return ActionDisposable {
-                disposedThree = true
-            }
-        }
-        
-        let signal = singleSignalInt(one) |> then(singleSignalInt(two)) |> then(singleSignalInt(three)) |> queue
-        
-        let _ = signal.start(next: { next in
-            result.append(next)
-        }, completed: {
-            completedAll = true
-        })
-        
-        usleep(1000 * 200)
-        
-        XCTAssert(result.count == 2 && result[0] == 1 && result[1] == 2, "result != [1, 2]");
-        XCTAssert(disposedOne == true, "disposedOne != true");
-        XCTAssert(disposedTwo == true, "disposedTwo != true");
-        XCTAssert(disposedThree == false, "disposedThree != false");
-        XCTAssert(startedThird == false, "startedThird != false");
-        XCTAssert(completedAll == false, "completedAll != false");
-    }
-    
-    func testQueueDisposed() {
-        let q = DispatchQueue(label: "")
-        
-        var disposedOne = false
-        var disposedTwo = false
-        var disposedThree = false
-        var startedFirst = false
-        var startedSecond = false
-        var startedThird = false
-        var result: [Int] = []
-        
-        let one = Signal<Int, Void> { subscriber in
-            startedFirst = true
-            var cancelled = false
-            q.async {
-                if !cancelled {
-                    usleep(100 * 1000)
-                    subscriber.putNext(1)
-                    subscriber.putCompletion()
-                }
-            }
-            return ActionDisposable {
-                cancelled = true
-                disposedOne = true
-            }
-        }
-        
-        let two = Signal<Int, Void> { subscriber in
-            startedSecond = true
-            var cancelled = false
-            q.async {
-                if !cancelled {
-                    usleep(100 * 1000)
-                    subscriber.putNext(2)
-                    subscriber.putError(Void())
-                }
-            }
-            return ActionDisposable {
-                cancelled = true
-                disposedTwo = true
-            }
-        }
-        
-        let three = Signal<Int, Void> { subscriber in
-            startedThird = true
-            var cancelled = false
-            q.async {
-                if !cancelled {
-                    usleep(100 * 1000)
-                    subscriber.putNext(3)
-                    subscriber.putCompletion()
-                }
-            }
-            return ActionDisposable {
-                cancelled = true
-                disposedThree = true
-            }
-        }
-        
-        let signal = singleSignalInt(one) |> then(singleSignalInt(two)) |> then(singleSignalInt(three)) |> queue
-        
-        signal.start(next: { next in
-            result.append(next)
-        }).dispose()
-        
-        usleep(1000 * 200)
-        
-        XCTAssert(result.count == 0, "result != []");
-        XCTAssert(disposedOne == true, "disposedOne != true");
-        XCTAssert(disposedTwo == false, "disposedTwo != false");
-        XCTAssert(disposedThree == false, "disposedThree != false");
-        XCTAssert(startedFirst == true, "startedFirst != false");
-        XCTAssert(startedSecond == false, "startedSecond != false");
-        XCTAssert(startedThird == false, "startedThird != false");
-    }
-    
-    func testRestart() {
-        let q = DispatchQueue(label: "", attributes: [.concurrent])
-        let signal = Signal<Int, Void> { subscriber in
-            q.async {
-                subscriber.putNext(1)
-                subscriber.putCompletion()
-            }
-            return EmptyDisposable
-        }
-        
-        var result = 0
-        
-        let _ = (signal |> restart |> take(3)).start(next: { next in
-            result += next
-        })
-        
-        usleep(100 * 1000)
-        
-        XCTAssert(result == 3, "result != 3")
-    }
-    
-    func testPipe() {
-        let pipe = ValuePipe<Int>()
-        
-        var result1 = 0
-        let disposable1 = pipe.signal().start(next: { next in
-            result1 += next
-        })
-        
-        var result2 = 0
-        let disposable2 = pipe.signal().start(next: { next in
-            result2 += next
-        })
-        
-        pipe.putNext(1)
-        
-        XCTAssert(result1 == 1, "result1 != 1")
-        XCTAssert(result2 == 1, "result2 != 1")
-        
-        disposable1.dispose()
-        
-        pipe.putNext(1)
-        
-        XCTAssert(result1 == 1, "result1 != 1")
-        XCTAssert(result2 == 2, "result2 != 2")
-        
-        disposable2.dispose()
-        
-        pipe.putNext(1)
-        
-        XCTAssert(result1 == 1, "result1 != 1")
-        XCTAssert(result2 == 2, "result2 != 2")
-    }
-    
-    func testQueueRecursive() {
-        let q = Queue()
-        
-        let signal = Signal<Int, NoError> { subscriber in
-            for _ in 0 ..< 1000 {
-                subscriber.putNext(1)
-            }
-            subscriber.putCompletion()
-            return EmptyDisposable
-        }
-        
-        let queued = signal
-            |> mapToQueue { _ -> Signal<Void, NoError> in
-                return complete(Void.self, NoError.self) |> deliverOn(q)
-            }
-        
-        let _ = queued.start()
-    }
-    
-    func testReduceSignal() {
-        let q = Queue()
-        
-        let signal = Signal<Int, NoError> { subscriber in
-            for i in 0 ..< 1000 {
-                subscriber.putNext(i)
-            }
-            subscriber.putCompletion()
-            return EmptyDisposable
-        }
-        
-        let reduced = signal
-            |> reduceLeft(0, generator: { current, next -> Signal<(Int, Passthrough<Int>), NoError> in
-                return Signal { subscriber in
-                    subscriber.putNext((current + next, Passthrough.Some(current + next)))
-                    subscriber.putCompletion()
-                    return EmptyDisposable
-                } |> deliverOn(q)
-            })
-        
-        var values: [Int] = []
-        let _ = reduced.start(next: { next in
-            values.append(next)
-        })
-        
-        q.sync { }
-        
-        XCTAssert(values.count == 1001, "count \(values.count) != 1001")
-        var previous = 0
-        for i in 0 ..< 1001 {
-            let value: Int
-            if i >= 1000 {
-                value = previous
-            } else {
-                value = previous + i
-                previous = value
-            }
-            previous = value
-            XCTAssert(values[i] == value, "at \(i): \(values[i]) != \(value)")
-        }
-    }
-    
-    func testMainQueueReentrant() {
-        let q = Queue.mainQueue()
-        
-        var a = 1
-        q.async {
-            usleep(150 * 1000)
-            a = 2
-        }
-        
-        XCTAssert(a == 2)
-    }
-}
diff --git a/submodules/SaveToCameraRoll/BUILD b/submodules/SaveToCameraRoll/BUILD
new file mode 100644
index 0000000000..0d13978c85
--- /dev/null
+++ b/submodules/SaveToCameraRoll/BUILD
@@ -0,0 +1,21 @@
+load("@build_bazel_rules_swift//swift:swift.bzl", "swift_library")
+
+swift_library(
+    name = "SaveToCameraRoll",
+    module_name = "SaveToCameraRoll",
+    srcs = glob([
+		"Sources/**/*.swift",
+    ]),
+    deps = [
+        "//submodules/SSignalKit/SwiftSignalKit:SwiftSignalKit",
+        "//submodules/Postbox:Postbox",
+        "//submodules/TelegramCore:TelegramCore",
+        "//submodules/SyncCore:SyncCore",
+        "//submodules/Display:Display",
+        "//submodules/AccountContext:AccountContext",
+        "//submodules/DeviceAccess:DeviceAccess",
+    ],
+    visibility = [
+        "//visibility:public",
+    ],
+)
diff --git a/submodules/SaveToCameraRoll/Info.plist b/submodules/SaveToCameraRoll/Info.plist
deleted file mode 100644
index e1fe4cfb7b..0000000000
--- a/submodules/SaveToCameraRoll/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/SaveToCameraRoll/Sources/SaveToCameraRoll.h b/submodules/SaveToCameraRoll/Sources/SaveToCameraRoll.h
deleted file mode 100644
index aa7306b79e..0000000000
--- a/submodules/SaveToCameraRoll/Sources/SaveToCameraRoll.h
+++ /dev/null
@@ -1,19 +0,0 @@
-//
-//  SaveToCameraRoll.h
-//  SaveToCameraRoll
-//
-//  Created by Peter on 8/5/19.
-//  Copyright © 2019 Telegram Messenger LLP. All rights reserved.
-//
-
-#import <UIKit/UIKit.h>
-
-//! Project version number for SaveToCameraRoll.
-FOUNDATION_EXPORT double SaveToCameraRollVersionNumber;
-
-//! Project version string for SaveToCameraRoll.
-FOUNDATION_EXPORT const unsigned char SaveToCameraRollVersionString[];
-
-// In this header, you should import all the public headers of your framework using statements like #import <SaveToCameraRoll/PublicHeader.h>
-
-
diff --git a/submodules/ScreenCaptureDetection/BUILD b/submodules/ScreenCaptureDetection/BUILD
new file mode 100644
index 0000000000..81af8cfe2a
--- /dev/null
+++ b/submodules/ScreenCaptureDetection/BUILD
@@ -0,0 +1,15 @@
+load("@build_bazel_rules_swift//swift:swift.bzl", "swift_library")
+
+swift_library(
+    name = "ScreenCaptureDetection",
+    module_name = "ScreenCaptureDetection",
+    srcs = glob([
+        "Sources/**/*.swift",
+    ]),
+    deps = [
+    	"//submodules/SSignalKit/SwiftSignalKit:SwiftSignalKit",
+    ],
+    visibility = [
+        "//visibility:public",
+    ],
+)
diff --git a/submodules/ScreenCaptureDetection/Info.plist b/submodules/ScreenCaptureDetection/Info.plist
deleted file mode 100644
index e1fe4cfb7b..0000000000
--- a/submodules/ScreenCaptureDetection/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/ScreenCaptureDetection/Sources/ScreenCaptureDetection.h b/submodules/ScreenCaptureDetection/Sources/ScreenCaptureDetection.h
deleted file mode 100644
index fae383e599..0000000000
--- a/submodules/ScreenCaptureDetection/Sources/ScreenCaptureDetection.h
+++ /dev/null
@@ -1,19 +0,0 @@
-//
-//  ScreenCaptureDetection.h
-//  ScreenCaptureDetection
-//
-//  Created by Peter on 8/12/19.
-//  Copyright © 2019 Telegram Messenger LLP. All rights reserved.
-//
-
-#import <UIKit/UIKit.h>
-
-//! Project version number for ScreenCaptureDetection.
-FOUNDATION_EXPORT double ScreenCaptureDetectionVersionNumber;
-
-//! Project version string for ScreenCaptureDetection.
-FOUNDATION_EXPORT const unsigned char ScreenCaptureDetectionVersionString[];
-
-// In this header, you should import all the public headers of your framework using statements like #import <ScreenCaptureDetection/PublicHeader.h>
-
-
diff --git a/submodules/SearchBarNode/BUILD b/submodules/SearchBarNode/BUILD
new file mode 100644
index 0000000000..1a7e748afb
--- /dev/null
+++ b/submodules/SearchBarNode/BUILD
@@ -0,0 +1,20 @@
+load("@build_bazel_rules_swift//swift:swift.bzl", "swift_library")
+
+swift_library(
+    name = "SearchBarNode",
+    module_name = "SearchBarNode",
+    srcs = glob([
+		"Sources/**/*.swift",
+    ]),
+    deps = [
+        "//submodules/SSignalKit/SwiftSignalKit:SwiftSignalKit",
+        "//submodules/AsyncDisplayKit:AsyncDisplayKit",
+        "//submodules/Display:Display",
+        "//submodules/TelegramPresentationData:TelegramPresentationData",
+        "//submodules/ActivityIndicator:ActivityIndicator",
+        "//submodules/AppBundle:AppBundle",
+    ],
+    visibility = [
+        "//visibility:public",
+    ],
+)
diff --git a/submodules/SearchBarNode/Info.plist b/submodules/SearchBarNode/Info.plist
deleted file mode 100644
index e1fe4cfb7b..0000000000
--- a/submodules/SearchBarNode/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/SearchBarNode/Sources/SearchBarNode.h b/submodules/SearchBarNode/Sources/SearchBarNode.h
deleted file mode 100644
index 4d919473f7..0000000000
--- a/submodules/SearchBarNode/Sources/SearchBarNode.h
+++ /dev/null
@@ -1,19 +0,0 @@
-//
-//  SearchBarNode.h
-//  SearchBarNode
-//
-//  Created by Peter on 8/11/19.
-//  Copyright © 2019 Telegram Messenger LLP. All rights reserved.
-//
-
-#import <UIKit/UIKit.h>
-
-//! Project version number for SearchBarNode.
-FOUNDATION_EXPORT double SearchBarNodeVersionNumber;
-
-//! Project version string for SearchBarNode.
-FOUNDATION_EXPORT const unsigned char SearchBarNodeVersionString[];
-
-// In this header, you should import all the public headers of your framework using statements like #import <SearchBarNode/PublicHeader.h>
-
-
diff --git a/submodules/SearchPeerMembers/BUILD b/submodules/SearchPeerMembers/BUILD
new file mode 100644
index 0000000000..34c37c3b0c
--- /dev/null
+++ b/submodules/SearchPeerMembers/BUILD
@@ -0,0 +1,19 @@
+load("@build_bazel_rules_swift//swift:swift.bzl", "swift_library")
+
+swift_library(
+    name = "SearchPeerMembers",
+    module_name = "SearchPeerMembers",
+    srcs = glob([
+		"Sources/**/*.swift",
+    ]),
+    deps = [
+        "//submodules/SSignalKit/SwiftSignalKit:SwiftSignalKit",
+        "//submodules/Postbox:Postbox",
+        "//submodules/TelegramCore:TelegramCore",
+        "//submodules/SyncCore:SyncCore",
+        "//submodules/AccountContext:AccountContext",
+    ],
+    visibility = [
+        "//visibility:public",
+    ],
+)
diff --git a/submodules/SearchUI/BUILD b/submodules/SearchUI/BUILD
new file mode 100644
index 0000000000..6a7bb45b4c
--- /dev/null
+++ b/submodules/SearchUI/BUILD
@@ -0,0 +1,20 @@
+load("@build_bazel_rules_swift//swift:swift.bzl", "swift_library")
+
+swift_library(
+    name = "SearchUI",
+    module_name = "SearchUI",
+    srcs = glob([
+		"Sources/**/*.swift",
+    ]),
+    deps = [
+        "//submodules/SSignalKit/SwiftSignalKit:SwiftSignalKit",
+        "//submodules/AsyncDisplayKit:AsyncDisplayKit",
+        "//submodules/Display:Display",
+        "//submodules/TelegramPresentationData:TelegramPresentationData",
+        "//submodules/SearchBarNode:SearchBarNode",
+        "//submodules/ChatListSearchItemNode:ChatListSearchItemNode",
+    ],
+    visibility = [
+        "//visibility:public",
+    ],
+)
diff --git a/submodules/SearchUI/Info.plist b/submodules/SearchUI/Info.plist
deleted file mode 100644
index e1fe4cfb7b..0000000000
--- a/submodules/SearchUI/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/SearchUI/Sources/SearchUI.h b/submodules/SearchUI/Sources/SearchUI.h
deleted file mode 100644
index bb46079e7a..0000000000
--- a/submodules/SearchUI/Sources/SearchUI.h
+++ /dev/null
@@ -1,19 +0,0 @@
-//
-//  SearchUI.h
-//  SearchUI
-//
-//  Created by Peter on 8/12/19.
-//  Copyright © 2019 Telegram Messenger LLP. All rights reserved.
-//
-
-#import <UIKit/UIKit.h>
-
-//! Project version number for SearchUI.
-FOUNDATION_EXPORT double SearchUIVersionNumber;
-
-//! Project version string for SearchUI.
-FOUNDATION_EXPORT const unsigned char SearchUIVersionString[];
-
-// In this header, you should import all the public headers of your framework using statements like #import <SearchUI/PublicHeader.h>
-
-
diff --git a/submodules/SegmentedControlNode/BUILD b/submodules/SegmentedControlNode/BUILD
new file mode 100644
index 0000000000..f85e3f63b3
--- /dev/null
+++ b/submodules/SegmentedControlNode/BUILD
@@ -0,0 +1,17 @@
+load("@build_bazel_rules_swift//swift:swift.bzl", "swift_library")
+
+swift_library(
+    name = "SegmentedControlNode",
+    module_name = "SegmentedControlNode",
+    srcs = glob([
+		"Sources/**/*.swift",
+    ]),
+    deps = [
+        "//submodules/AsyncDisplayKit:AsyncDisplayKit",
+        "//submodules/Display:Display",
+        "//submodules/TelegramPresentationData:TelegramPresentationData",
+    ],
+    visibility = [
+        "//visibility:public",
+    ],
+)
diff --git a/submodules/SegmentedControlNode/Info.plist b/submodules/SegmentedControlNode/Info.plist
deleted file mode 100644
index e1fe4cfb7b..0000000000
--- a/submodules/SegmentedControlNode/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/SegmentedControlNode/Sources/SegmentedControlNode.h b/submodules/SegmentedControlNode/Sources/SegmentedControlNode.h
deleted file mode 100644
index a0347abfa0..0000000000
--- a/submodules/SegmentedControlNode/Sources/SegmentedControlNode.h
+++ /dev/null
@@ -1,11 +0,0 @@
-#import <UIKit/UIKit.h>
-
-//! Project version number for SegmentedControlNode.
-FOUNDATION_EXPORT double SegmentedControlNodeVersionNumber;
-
-//! Project version string for SegmentedControlNode.
-FOUNDATION_EXPORT const unsigned char SegmentedControlNodeVersionString[];
-
-// In this header, you should import all the public headers of your framework using statements like #import <SegmentedControlNode/PublicHeader.h>
-
-
diff --git a/submodules/SegmentedControlNode/Sources/SegmentedControlNode.swift b/submodules/SegmentedControlNode/Sources/SegmentedControlNode.swift
index da4106824a..098d323223 100644
--- a/submodules/SegmentedControlNode/Sources/SegmentedControlNode.swift
+++ b/submodules/SegmentedControlNode/Sources/SegmentedControlNode.swift
@@ -315,6 +315,7 @@ public final class SegmentedControlNode: ASDisplayNode, UIGestureRecognizerDeleg
             
             for i in 0 ..< self.itemNodes.count {
                 let itemNode = self.itemNodes[i]
+                let _ = itemNode.measure(itemSize)
                 transition.updateFrame(node: itemNode, frame: CGRect(origin: CGPoint(x: itemSize.width * CGFloat(i), y: (size.height - itemSize.height) / 2.0), size: itemSize))
                 
                 let isSelected = selectedIndex == i
diff --git a/submodules/SelectablePeerNode/BUILD b/submodules/SelectablePeerNode/BUILD
new file mode 100644
index 0000000000..99468377b7
--- /dev/null
+++ b/submodules/SelectablePeerNode/BUILD
@@ -0,0 +1,27 @@
+load("@build_bazel_rules_swift//swift:swift.bzl", "swift_library")
+
+swift_library(
+    name = "SelectablePeerNode",
+    module_name = "SelectablePeerNode",
+    srcs = glob([
+		"Sources/**/*.swift",
+    ]),
+    deps = [
+        "//submodules/SSignalKit/SwiftSignalKit:SwiftSignalKit",
+        "//submodules/Postbox:Postbox",
+        "//submodules/TelegramCore:TelegramCore",
+        "//submodules/SyncCore:SyncCore",
+        "//submodules/AsyncDisplayKit:AsyncDisplayKit",
+        "//submodules/Display:Display",
+        "//submodules/TelegramPresentationData:TelegramPresentationData",
+        "//submodules/PeerOnlineMarkerNode:PeerOnlineMarkerNode",
+        "//submodules/AvatarNode:AvatarNode",
+        "//submodules/LegacyComponents:LegacyComponents",
+        "//submodules/ContextUI:ContextUI",
+        "//submodules/LocalizedPeerData:LocalizedPeerData",
+        "//submodules/AccountContext:AccountContext",
+    ],
+    visibility = [
+        "//visibility:public",
+    ],
+)
diff --git a/submodules/SelectablePeerNode/Info.plist b/submodules/SelectablePeerNode/Info.plist
deleted file mode 100644
index e1fe4cfb7b..0000000000
--- a/submodules/SelectablePeerNode/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/SelectablePeerNode/Sources/SelectablePeerNode.h b/submodules/SelectablePeerNode/Sources/SelectablePeerNode.h
deleted file mode 100644
index 47645060ac..0000000000
--- a/submodules/SelectablePeerNode/Sources/SelectablePeerNode.h
+++ /dev/null
@@ -1,19 +0,0 @@
-//
-//  SelectablePeerNode.h
-//  SelectablePeerNode
-//
-//  Created by Peter on 8/5/19.
-//  Copyright © 2019 Telegram Messenger LLP. All rights reserved.
-//
-
-#import <UIKit/UIKit.h>
-
-//! Project version number for SelectablePeerNode.
-FOUNDATION_EXPORT double SelectablePeerNodeVersionNumber;
-
-//! Project version string for SelectablePeerNode.
-FOUNDATION_EXPORT const unsigned char SelectablePeerNodeVersionString[];
-
-// In this header, you should import all the public headers of your framework using statements like #import <SelectablePeerNode/PublicHeader.h>
-
-
diff --git a/submodules/SelectablePeerNode/Sources/SelectablePeerNode.swift b/submodules/SelectablePeerNode/Sources/SelectablePeerNode.swift
index 56c29fcdf6..6289e28c39 100644
--- a/submodules/SelectablePeerNode/Sources/SelectablePeerNode.swift
+++ b/submodules/SelectablePeerNode/Sources/SelectablePeerNode.swift
@@ -155,7 +155,7 @@ public final class SelectablePeerNode: ASDisplayNode {
                 overrideImage = .deletedIcon
             }
         }
-        self.textNode.maximumNumberOfLines = UInt(numberOfLines)
+        self.textNode.maximumNumberOfLines = numberOfLines
         self.textNode.attributedText = NSAttributedString(string: text, font: textFont, textColor: self.currentSelected ? self.theme.selectedTextColor : defaultColor, paragraphAlignment: .center)
         self.avatarNode.setPeer(context: context, theme: theme, peer: mainPeer, overrideImage: overrideImage, emptyColor: self.theme.avatarPlaceholderColor, synchronousLoad: synchronousLoad)
         
diff --git a/submodules/SemanticStatusNode/BUILD b/submodules/SemanticStatusNode/BUILD
new file mode 100644
index 0000000000..9f6c4667f7
--- /dev/null
+++ b/submodules/SemanticStatusNode/BUILD
@@ -0,0 +1,17 @@
+load("@build_bazel_rules_swift//swift:swift.bzl", "swift_library")
+
+swift_library(
+    name = "SemanticStatusNode",
+    module_name = "SemanticStatusNode",
+    srcs = glob([
+		"Sources/**/*.swift",
+    ]),
+    deps = [
+        "//submodules/Display:Display",
+        "//submodules/AsyncDisplayKit:AsyncDisplayKit",
+        "//submodules/LegacyComponents:LegacyComponents",
+    ],
+    visibility = [
+        "//visibility:public",
+    ],
+)
diff --git a/submodules/SettingsUI/BUILD b/submodules/SettingsUI/BUILD
new file mode 100644
index 0000000000..fa9dc7307a
--- /dev/null
+++ b/submodules/SettingsUI/BUILD
@@ -0,0 +1,94 @@
+load("@build_bazel_rules_swift//swift:swift.bzl", "swift_library")
+
+swift_library(
+    name = "SettingsUI",
+    module_name = "SettingsUI",
+    srcs = glob([
+		"Sources/**/*.swift",
+    ]),
+    deps = [
+        "//submodules/SSignalKit/SwiftSignalKit:SwiftSignalKit",
+        "//submodules/AsyncDisplayKit:AsyncDisplayKit",
+        "//submodules/Display:Display",
+        "//submodules/Postbox:Postbox",
+        "//submodules/TelegramCore:TelegramCore",
+        "//submodules/SyncCore:SyncCore",
+        "//submodules/MtProtoKit:MtProtoKit",
+        "//submodules/TelegramPresentationData:TelegramPresentationData",
+        "//submodules/AccountContext:AccountContext",
+        "//submodules/ActivityIndicator:ActivityIndicator",
+        "//submodules/AlertUI:AlertUI",
+        "//submodules/PresentationDataUtils:PresentationDataUtils",
+        "//submodules/AvatarNode:AvatarNode",
+        "//submodules/CallListUI:CallListUI",
+        "//submodules/ChatListSearchItemNode:ChatListSearchItemNode",
+        "//submodules/ChatListSearchItemHeader:ChatListSearchItemHeader",
+        "//submodules/ChatListUI:ChatListUI",
+        "//submodules/ContactsPeerItem:ContactsPeerItem",
+        "//submodules/CountrySelectionUI:CountrySelectionUI",
+        "//submodules/DeviceAccess:DeviceAccess",
+        "//submodules/DeviceLocationManager:DeviceLocationManager",
+        "//submodules/GalleryUI:GalleryUI",
+        "//submodules/Geocoding:Geocoding",
+        "//submodules/ItemListUI:ItemListUI",
+        "//submodules/ItemListStickerPackItem:ItemListStickerPackItem",
+        "//submodules/ItemListPeerItem:ItemListPeerItem",
+        "//submodules/ItemListPeerActionItem:ItemListPeerActionItem",
+        "//submodules/ItemListAvatarAndNameInfoItem:ItemListAvatarAndNameInfoItem",
+        "//submodules/LegacyComponents:LegacyComponents",
+        "//submodules/LegacyUI:LegacyUI",
+        "//submodules/LegacyMediaPickerUI:LegacyMediaPickerUI",
+        "//submodules/ListSectionHeaderNode:ListSectionHeaderNode",
+        "//submodules/LocalMediaResources:LocalMediaResources",
+        "//submodules/LocalizedPeerData:LocalizedPeerData",
+        "//submodules/LocalAuth:LocalAuth",
+        "//submodules/MapResourceToAvatarSizes:MapResourceToAvatarSizes",
+        "//submodules/MediaResources:MediaResources",
+        "//submodules/MergeLists:MergeLists",
+        "//submodules/NotificationSoundSelectionUI:NotificationSoundSelectionUI",
+        "//submodules/OverlayStatusController:OverlayStatusController",
+        "//submodules/PasswordSetupUI:PasswordSetupUI",
+        "//submodules/PassportUI:PassportUI",
+        "//submodules/PasscodeUI:PasscodeUI",
+        "//submodules/PeerAvatarGalleryUI:PeerAvatarGalleryUI",
+        "//submodules/PhoneInputNode:PhoneInputNode",
+        "//submodules/PhotoResources:PhotoResources",
+        "//submodules/ProgressNavigationButtonNode:ProgressNavigationButtonNode",
+        "//submodules/RadialStatusNode:RadialStatusNode",
+        "//submodules/SearchBarNode:SearchBarNode",
+        "//submodules/SearchUI:SearchUI",
+        "//submodules/ShareController:ShareController",
+        "//submodules/StickerPackPreviewUI:StickerPackPreviewUI",
+        "//submodules/TelegramUIPreferences:TelegramUIPreferences",
+        "//submodules/TelegramStringFormatting:TelegramStringFormatting",
+        "//submodules/TelegramNotices:TelegramNotices",
+        "//submodules/TelegramCallsUI:TelegramCallsUI",
+        "//submodules/TextFormat:TextFormat",
+        "//submodules/MediaPlayer:UniversalMediaPlayer",
+        "//submodules/UrlEscaping:UrlEscaping",
+        "//submodules/WebSearchUI:WebSearchUI",
+        "//submodules/UrlHandling:UrlHandling",
+        "//submodules/HexColor:HexColor",
+        "//submodules/QrCode:QrCode",
+        "//submodules/WallpaperResources:WallpaperResources",
+        "//submodules/AuthorizationUI:AuthorizationUI",
+        "//submodules/InstantPageUI:InstantPageUI",
+        "//submodules/CheckNode:CheckNode",
+        "//submodules/CounterContollerTitleView:CounterContollerTitleView",
+        "//submodules/GridMessageSelectionNode:GridMessageSelectionNode",
+        "//submodules/InstantPageCache:InstantPageCache",
+        "//submodules/AppBundle:AppBundle",
+        "//submodules/ContextUI:ContextUI",
+        "//submodules/WalletUI:WalletUI",
+        "//submodules/Markdown:Markdown",
+        "//submodules/UndoUI:UndoUI",
+        "//submodules/DeleteChatPeerActionSheetItem:DeleteChatPeerActionSheetItem",
+        "//submodules/PhoneNumberFormat:PhoneNumberFormat",
+        "//submodules/OpenInExternalAppUI:OpenInExternalAppUI",
+        "//submodules/AccountUtils:AccountUtils",
+        "//submodules/AuthTransferUI:AuthTransferUI",
+    ],
+    visibility = [
+        "//visibility:public",
+    ],
+)
diff --git a/submodules/SettingsUI/Info.plist b/submodules/SettingsUI/Info.plist
deleted file mode 100644
index e1fe4cfb7b..0000000000
--- a/submodules/SettingsUI/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/SettingsUI/Sources/ChangePhoneNumberIntroController.swift b/submodules/SettingsUI/Sources/ChangePhoneNumberIntroController.swift
index b355085b82..a04360db7b 100644
--- a/submodules/SettingsUI/Sources/ChangePhoneNumberIntroController.swift
+++ b/submodules/SettingsUI/Sources/ChangePhoneNumberIntroController.swift
@@ -69,7 +69,7 @@ private final class ChangePhoneNumberIntroControllerNode: ASDisplayNode {
         let contentHeight: CGFloat = largeScreen ? 420.0 : 400.0
         
         let iconSize = self.iconNode.measure(CGSize(width: 400.0, height: 400.0))
-        let labelSize = self.labelNode.measure(CGSize(width: 295.0, height: CGFloat.greatestFiniteMagnitude))
+        let labelSize = self.labelNode.updateLayout(CGSize(width: 295.0, height: CGFloat.greatestFiniteMagnitude))
         let buttonSize = self.buttonNode.measure(CGSize(width: 295.0, height: CGFloat.greatestFiniteMagnitude))
         
         transition.updateFrame(node: self.iconNode, frame: CGRect(origin: CGPoint(x: floor((layout.size.width - iconSize.width) / 2.0), y: insets.top + floor((availableHeight - contentHeight) / 2.0) + floor(iconSize.height * (largeScreen ? CGFloat(0.2) : CGFloat(0.5)))), size: iconSize))
diff --git a/submodules/SettingsUI/Sources/Data and Storage/ProxyListSettingsController.swift b/submodules/SettingsUI/Sources/Data and Storage/ProxyListSettingsController.swift
index c0424de212..2a16303a93 100644
--- a/submodules/SettingsUI/Sources/Data and Storage/ProxyListSettingsController.swift	
+++ b/submodules/SettingsUI/Sources/Data and Storage/ProxyListSettingsController.swift	
@@ -6,11 +6,7 @@ import Postbox
 import TelegramCore
 import SyncCore
 import TelegramPresentationData
-#if BUCK
 import MtProtoKit
-#else
-import MtProtoKitDynamic
-#endif
 import ItemListUI
 import PresentationDataUtils
 import AccountContext
diff --git a/submodules/SettingsUI/Sources/Data and Storage/ProxyServerSettingsController.swift b/submodules/SettingsUI/Sources/Data and Storage/ProxyServerSettingsController.swift
index 68dcaa32c1..8686fb7d27 100644
--- a/submodules/SettingsUI/Sources/Data and Storage/ProxyServerSettingsController.swift	
+++ b/submodules/SettingsUI/Sources/Data and Storage/ProxyServerSettingsController.swift	
@@ -5,11 +5,7 @@ import SwiftSignalKit
 import Postbox
 import TelegramCore
 import SyncCore
-#if BUCK
 import MtProtoKit
-#else
-import MtProtoKitDynamic
-#endif
 import TelegramPresentationData
 import ItemListUI
 import PresentationDataUtils
diff --git a/submodules/SettingsUI/Sources/DebugController.swift b/submodules/SettingsUI/Sources/DebugController.swift
index e33c1130f8..1cc961b171 100644
--- a/submodules/SettingsUI/Sources/DebugController.swift
+++ b/submodules/SettingsUI/Sources/DebugController.swift
@@ -5,11 +5,7 @@ import SwiftSignalKit
 import Postbox
 import TelegramCore
 import SyncCore
-#if BUCK
 import MtProtoKit
-#else
-import MtProtoKitDynamic
-#endif
 import MessageUI
 import TelegramPresentationData
 import TelegramUIPreferences
@@ -395,6 +391,7 @@ private enum DebugControllerEntry: ItemListNodeEntry {
                 if let context = arguments.context {
                     let _ = (context.account.postbox.transaction { transaction -> Void in
                         transaction.clearItemCacheCollection(collectionId: Namespaces.CachedItemCollection.cachedPollResults)
+                        unmarkChatListFeaturedFiltersAsSeen(transaction: transaction)
                     }).start()
                 }
             })
diff --git a/submodules/SettingsUI/Sources/Notifications/NotificationsAndSounds.swift b/submodules/SettingsUI/Sources/Notifications/NotificationsAndSounds.swift
index f2ece41feb..ac729580db 100644
--- a/submodules/SettingsUI/Sources/Notifications/NotificationsAndSounds.swift
+++ b/submodules/SettingsUI/Sources/Notifications/NotificationsAndSounds.swift
@@ -26,28 +26,22 @@ private struct CounterTagSettings: OptionSet {
     
     init(summaryTags: PeerSummaryCounterTags) {
         var result = CounterTagSettings()
-        if summaryTags.contains(.privateChat) {
-            result.insert(.regularChatsAndPrivateGroups)
+        if summaryTags.contains(.contact) {
+            result.insert(.regularChatsAndGroups)
         }
         if summaryTags.contains(.channel) {
             result.insert(.channels)
         }
-        if summaryTags.contains(.publicGroup) {
-            result.insert(.publicGroups)
-        }
         self = result
     }
     
     func toSumaryTags() -> PeerSummaryCounterTags {
         var result = PeerSummaryCounterTags()
-        if self.contains(.regularChatsAndPrivateGroups) {
-            result.insert(.privateChat)
-            result.insert(.secretChat)
+        if self.contains(.regularChatsAndGroups) {
+            result.insert(.contact)
+            result.insert(.nonContact)
             result.insert(.bot)
-            result.insert(.privateGroup)
-        }
-        if self.contains(.publicGroups) {
-            result.insert(.publicGroup)
+            result.insert(.group)
         }
         if self.contains(.channels) {
             result.insert(.channel)
@@ -55,9 +49,8 @@ private struct CounterTagSettings: OptionSet {
         return result
     }
     
-    static let regularChatsAndPrivateGroups = CounterTagSettings(rawValue: 1 << 0)
-    static let publicGroups = CounterTagSettings(rawValue: 1 << 1)
-    static let channels = CounterTagSettings(rawValue: 1 << 2)
+    static let regularChatsAndGroups = CounterTagSettings(rawValue: 1 << 0)
+    static let channels = CounterTagSettings(rawValue: 1 << 1)
 }
 
 private final class NotificationsAndSoundsArguments {
@@ -154,7 +147,6 @@ public enum NotificationsAndSoundsEntryTag: ItemListItemTag {
     case inAppVibrate
     case inAppPreviews
     case displayNamesOnLockscreen
-    case includePublicGroups
     case includeChannels
     case unreadCountCategory
     case joinedNotifications
@@ -208,7 +200,6 @@ private enum NotificationsAndSoundsEntry: ItemListNodeEntry {
     case displayNamesOnLockscreenInfo(PresentationTheme, String)
     
     case badgeHeader(PresentationTheme, String)
-    case includePublicGroups(PresentationTheme, String, Bool)
     case includeChannels(PresentationTheme, String, Bool)
     case unreadCountCategory(PresentationTheme, String, Bool)
     case unreadCountCategoryInfo(PresentationTheme, String)
@@ -235,7 +226,7 @@ private enum NotificationsAndSoundsEntry: ItemListNodeEntry {
                 return NotificationsAndSoundsSection.inApp.rawValue
             case .displayNamesOnLockscreen, .displayNamesOnLockscreenInfo:
                 return NotificationsAndSoundsSection.displayNamesOnLockscreen.rawValue
-            case .badgeHeader, .includePublicGroups, .includeChannels, .unreadCountCategory, .unreadCountCategoryInfo:
+            case .badgeHeader, .includeChannels, .unreadCountCategory, .unreadCountCategoryInfo:
                 return NotificationsAndSoundsSection.badge.rawValue
             case .joinedNotifications, .joinedNotificationsInfo:
                 return NotificationsAndSoundsSection.joinedNotifications.rawValue
@@ -306,8 +297,6 @@ private enum NotificationsAndSoundsEntry: ItemListNodeEntry {
                 return 28
             case .badgeHeader:
                 return 29
-            case .includePublicGroups:
-                return 31
             case .includeChannels:
                 return 32
             case .unreadCountCategory:
@@ -349,8 +338,6 @@ private enum NotificationsAndSoundsEntry: ItemListNodeEntry {
                 return NotificationsAndSoundsEntryTag.inAppPreviews
             case .displayNamesOnLockscreen:
                 return NotificationsAndSoundsEntryTag.displayNamesOnLockscreen
-            case .includePublicGroups:
-                return NotificationsAndSoundsEntryTag.includePublicGroups
             case .includeChannels:
                 return NotificationsAndSoundsEntryTag.includeChannels
             case .unreadCountCategory:
@@ -546,12 +533,6 @@ private enum NotificationsAndSoundsEntry: ItemListNodeEntry {
                 } else {
                     return false
                 }
-            case let .includePublicGroups(lhsTheme, lhsText, lhsValue):
-                if case let .includePublicGroups(rhsTheme, rhsText, rhsValue) = rhs, lhsTheme === rhsTheme, lhsText == rhsText, lhsValue == rhsValue {
-                    return true
-                } else {
-                    return false
-                }
             case let .includeChannels(lhsTheme, lhsText, lhsValue):
                 if case let .includeChannels(rhsTheme, rhsText, rhsValue) = rhs, lhsTheme === rhsTheme, lhsText == rhsText, lhsValue == rhsValue {
                     return true
@@ -719,10 +700,6 @@ private enum NotificationsAndSoundsEntry: ItemListNodeEntry {
                 })
             case let .badgeHeader(theme, text):
                 return ItemListSectionHeaderItem(presentationData: presentationData, text: text, sectionId: self.section)
-            case let .includePublicGroups(theme, text, value):
-                return ItemListSwitchItem(presentationData: presentationData, title: text, value: value, sectionId: self.section, style: .blocks, updated: { updatedValue in
-                    arguments.updateIncludeTag(.publicGroups, updatedValue)
-                }, tag: self.tag)
             case let .includeChannels(theme, text, value):
                 return ItemListSwitchItem(presentationData: presentationData, title: text, value: value, sectionId: self.section, style: .blocks, updated: { updatedValue in
                     arguments.updateIncludeTag(.channels, updatedValue)
@@ -825,7 +802,6 @@ private func notificationsAndSoundsEntries(authorizationStatus: AccessType, warn
     
     let counterTagSettings = CounterTagSettings(summaryTags: inAppSettings.totalUnreadCountIncludeTags)
     
-    entries.append(.includePublicGroups(presentationData.theme, presentationData.strings.Notifications_Badge_IncludePublicGroups, counterTagSettings.contains(.publicGroups)))
     entries.append(.includeChannels(presentationData.theme, presentationData.strings.Notifications_Badge_IncludeChannels, counterTagSettings.contains(.channels)))
     entries.append(.unreadCountCategory(presentationData.theme, presentationData.strings.Notifications_Badge_CountUnreadMessages, inAppSettings.totalUnreadCountDisplayCategory == .messages))
     entries.append(.unreadCountCategoryInfo(presentationData.theme, inAppSettings.totalUnreadCountDisplayCategory == .chats ? presentationData.strings.Notifications_Badge_CountUnreadMessages_InfoOff : presentationData.strings.Notifications_Badge_CountUnreadMessages_InfoOn))
diff --git a/submodules/SettingsUI/Sources/Privacy and Security/SelectivePrivacySettingsController.swift b/submodules/SettingsUI/Sources/Privacy and Security/SelectivePrivacySettingsController.swift
index 6a28cfb012..1ba0704ebf 100644
--- a/submodules/SettingsUI/Sources/Privacy and Security/SelectivePrivacySettingsController.swift	
+++ b/submodules/SettingsUI/Sources/Privacy and Security/SelectivePrivacySettingsController.swift	
@@ -770,7 +770,12 @@ func selectivePrivacySettingsController(context: AccountContext, kind: Selective
             let controller = context.sharedContext.makeContactMultiselectionController(ContactMultiselectionControllerParams(context: context, mode: .peerSelection(searchChatList: true, searchGroups: true, searchChannels: false), options: []))
             addPeerDisposable.set((controller.result
             |> take(1)
-            |> deliverOnMainQueue).start(next: { [weak controller] peerIds in
+            |> deliverOnMainQueue).start(next: { [weak controller] result in
+                var peerIds: [ContactListPeerId] = []
+                if case let .result(peerIdsValue, _) = result {
+                    peerIds = peerIdsValue
+                }
+                
                 if peerIds.isEmpty {
                     controller?.dismiss()
                     return
diff --git a/submodules/SettingsUI/Sources/Privacy and Security/SelectivePrivacySettingsPeersController.swift b/submodules/SettingsUI/Sources/Privacy and Security/SelectivePrivacySettingsPeersController.swift
index e112201c40..09d8ba35b3 100644
--- a/submodules/SettingsUI/Sources/Privacy and Security/SelectivePrivacySettingsPeersController.swift	
+++ b/submodules/SettingsUI/Sources/Privacy and Security/SelectivePrivacySettingsPeersController.swift	
@@ -293,7 +293,12 @@ public func selectivePrivacyPeersController(context: AccountContext, title: Stri
         let controller = context.sharedContext.makeContactMultiselectionController(ContactMultiselectionControllerParams(context: context, mode: .peerSelection(searchChatList: true, searchGroups: true, searchChannels: false), options: []))
         addPeerDisposable.set((controller.result
         |> take(1)
-        |> deliverOnMainQueue).start(next: { [weak controller] peerIds in
+        |> deliverOnMainQueue).start(next: { [weak controller] result in
+            var peerIds: [ContactListPeerId] = []
+            if case let .result(peerIdsValue, _) = result {
+                peerIds = peerIdsValue
+            }
+            
             let applyPeers: Signal<Void, NoError> = peersPromise.get()
             |> take(1)
             |> mapToSignal { peers -> Signal<[SelectivePrivacyPeer], NoError> in
diff --git a/submodules/SettingsUI/Sources/Search/SettingsSearchableItems.swift b/submodules/SettingsUI/Sources/Search/SettingsSearchableItems.swift
index 43bdedb823..d92d8745dd 100644
--- a/submodules/SettingsUI/Sources/Search/SettingsSearchableItems.swift
+++ b/submodules/SettingsUI/Sources/Search/SettingsSearchableItems.swift
@@ -409,9 +409,6 @@ private func notificationSearchableItems(context: AccountContext, settings: Glob
         SettingsSearchableItem(id: .notifications(16), title: strings.Notifications_DisplayNamesOnLockScreen, alternate: synonyms(strings.SettingsSearch_Synonyms_Notifications_DisplayNamesOnLockScreen), icon: icon, breadcrumbs: [strings.Settings_NotificationsAndSounds], present: { context, _, present in
             presentNotificationSettings(context, present, .displayNamesOnLockscreen)
         }),
-        SettingsSearchableItem(id: .notifications(18), title: strings.Notifications_Badge_IncludePublicGroups, alternate: synonyms(strings.SettingsSearch_Synonyms_Notifications_BadgeIncludeMutedPublicGroups), icon: icon, breadcrumbs: [strings.Settings_NotificationsAndSounds, strings.Notifications_Badge], present: { context, _, present in
-            presentNotificationSettings(context, present, .includePublicGroups)
-        }),
         SettingsSearchableItem(id: .notifications(19), title: strings.Notifications_Badge_IncludeChannels, alternate: synonyms(strings.SettingsSearch_Synonyms_Notifications_BadgeIncludeMutedChannels), icon: icon, breadcrumbs: [strings.Settings_NotificationsAndSounds, strings.Notifications_Badge], present: { context, _, present in
             presentNotificationSettings(context, present, .includeChannels)
         }),
diff --git a/submodules/SettingsUI/Sources/SettingsController.swift b/submodules/SettingsUI/Sources/SettingsController.swift
index 40d1114116..3633efad7e 100644
--- a/submodules/SettingsUI/Sources/SettingsController.swift
+++ b/submodules/SettingsUI/Sources/SettingsController.swift
@@ -114,6 +114,7 @@ private final class SettingsItemArguments {
     let openPhoneNumberChange: () -> Void
     let accountContextAction: (AccountRecordId, ASDisplayNode, ContextGesture?) -> Void
     let openDevices: () -> Void
+    let openFilters: () -> Void
     
     init(
         sharedContext: SharedAccountContext,
@@ -147,7 +148,8 @@ private final class SettingsItemArguments {
         keepPhone: @escaping () -> Void,
         openPhoneNumberChange: @escaping () -> Void,
         accountContextAction: @escaping (AccountRecordId, ASDisplayNode, ContextGesture?) -> Void,
-        openDevices: @escaping () -> Void
+        openDevices: @escaping () -> Void,
+        openFilters: @escaping () -> Void
     ) {
         self.sharedContext = sharedContext
         self.avatarAndNameInfoContext = avatarAndNameInfoContext
@@ -181,6 +183,7 @@ private final class SettingsItemArguments {
         self.openPhoneNumberChange = openPhoneNumberChange
         self.accountContextAction = accountContextAction
         self.openDevices = openDevices
+        self.openFilters = openFilters
     }
 }
 
@@ -211,6 +214,8 @@ private indirect enum SettingsEntry: ItemListNodeEntry {
     
     case devices(PresentationTheme, UIImage?, String, String)
     
+    case filters(PresentationTheme, UIImage?, String, String)
+    
     case savedMessages(PresentationTheme, UIImage?, String)
     case recentCalls(PresentationTheme, UIImage?, String)
     case stickers(PresentationTheme, UIImage?, String, String, [ArchivedStickerPackItem]?)
@@ -240,7 +245,7 @@ private indirect enum SettingsEntry: ItemListNodeEntry {
             return SettingsSection.accounts.rawValue
         case .proxy:
             return SettingsSection.proxy.rawValue
-        case .devices:
+        case .devices, .filters:
             return SettingsSection.media.rawValue
         case .savedMessages, .recentCalls, .stickers:
             return SettingsSection.media.rawValue
@@ -285,30 +290,32 @@ private indirect enum SettingsEntry: ItemListNodeEntry {
             return 1006
         case .devices:
             return 1007
-        case .notificationsAndSounds:
+        case .filters:
             return 1008
-        case .privacyAndSecurity:
+        case .notificationsAndSounds:
             return 1009
-        case .dataAndStorage:
+        case .privacyAndSecurity:
             return 1010
-        case .themes:
+        case .dataAndStorage:
             return 1011
-        case .language:
+        case .themes:
             return 1012
-        case .contentStickers:
+        case .language:
             return 1013
+        case .contentStickers:
+            return 1014
         #if ENABLE_WALLET
         case .wallet:
-            return 1014
+            return 1015
         #endif
         case .passport:
-            return 1015
-        case .watch:
             return 1016
-        case .askAQuestion:
+        case .watch:
             return 1017
-        case .faq:
+        case .askAQuestion:
             return 1018
+        case .faq:
+            return 1019
         }
     }
     
@@ -406,6 +413,12 @@ private indirect enum SettingsEntry: ItemListNodeEntry {
                 } else {
                     return false
                 }
+            case let .filters(lhsTheme, lhsImage, lhsText, lhsValue):
+                if case let .filters(rhsTheme, rhsImage, rhsText, rhsValue) = rhs, lhsTheme === rhsTheme, lhsImage === rhsImage, lhsText == rhsText, lhsValue == rhsValue {
+                    return true
+                } else {
+                    return false
+                }
             case let .savedMessages(lhsTheme, lhsImage, lhsText):
                 if case let .savedMessages(rhsTheme, rhsImage, rhsText) = rhs, lhsTheme === rhsTheme, lhsImage === rhsImage, lhsText == rhsText {
                     return true
@@ -567,6 +580,10 @@ private indirect enum SettingsEntry: ItemListNodeEntry {
                 return ItemListDisclosureItem(presentationData: presentationData, icon: image, title: text, label: value, sectionId: ItemListSectionId(self.section), style: .blocks, action: {
                     arguments.openDevices()
                 })
+            case let .filters(theme, image, text, value):
+                return ItemListDisclosureItem(presentationData: presentationData, icon: image, title: text, label: value, sectionId: ItemListSectionId(self.section), style: .blocks, action: {
+                    arguments.openFilters()
+                })
             case let .savedMessages(theme, image, text):
                 return ItemListDisclosureItem(presentationData: presentationData, icon: image, title: text, label: "", sectionId: ItemListSectionId(self.section), style: .blocks, action: {
                     arguments.openSavedMessages()
@@ -635,7 +652,7 @@ private struct SettingsState: Equatable {
     var isSearching: Bool
 }
 
-private func settingsEntries(account: Account, presentationData: PresentationData, state: SettingsState, view: PeerView, proxySettings: ProxySettings, notifyExceptions: NotificationExceptionsList?, notificationsAuthorizationStatus: AccessType, notificationsWarningSuppressed: Bool, unreadTrendingStickerPacks: Int, archivedPacks: [ArchivedStickerPackItem]?, privacySettings: AccountPrivacySettings?, hasWallet: Bool, hasPassport: Bool, hasWatchApp: Bool, accountsAndPeers: [(Account, Peer, Int32)], inAppNotificationSettings: InAppNotificationSettings, experimentalUISettings: ExperimentalUISettings, displayPhoneNumberConfirmation: Bool, otherSessionCount: Int, enableQRLogin: Bool) -> [SettingsEntry] {
+private func settingsEntries(account: Account, presentationData: PresentationData, state: SettingsState, view: PeerView, proxySettings: ProxySettings, notifyExceptions: NotificationExceptionsList?, notificationsAuthorizationStatus: AccessType, notificationsWarningSuppressed: Bool, unreadTrendingStickerPacks: Int, archivedPacks: [ArchivedStickerPackItem]?, privacySettings: AccountPrivacySettings?, hasWallet: Bool, hasPassport: Bool, hasWatchApp: Bool, accountsAndPeers: [(Account, Peer, Int32)], inAppNotificationSettings: InAppNotificationSettings, experimentalUISettings: ExperimentalUISettings, displayPhoneNumberConfirmation: Bool, otherSessionCount: Int, enableQRLogin: Bool, enableFilters: Bool) -> [SettingsEntry] {
     var entries: [SettingsEntry] = []
     
     if let peer = peerViewMainPeer(view) as? TelegramUser {
@@ -688,6 +705,10 @@ private func settingsEntries(account: Account, presentationData: PresentationDat
         } else {
             entries.append(.devices(presentationData.theme, UIImage(bundleImageName: "Settings/MenuIcons/Sessions")?.precomposed(), presentationData.strings.Settings_Devices, otherSessionCount == 0 ? "" : "\(otherSessionCount + 1)"))
         }
+        if enableFilters {
+            //TODO:localize
+            entries.append(.filters(presentationData.theme, UIImage(bundleImageName: "Settings/MenuIcons/ChatListFilters")?.precomposed(), "Chat Folders", ""))
+        }
         
         let notificationsWarning = shouldDisplayNotificationsPermissionWarning(status: notificationsAuthorizationStatus, suppressed:  notificationsWarningSuppressed)
         entries.append(.notificationsAndSounds(presentationData.theme, PresentationResourcesSettings.notifications, presentationData.strings.Settings_NotificationsAndSounds, notifyExceptions, notificationsWarning))
@@ -749,7 +770,7 @@ private final class SettingsControllerImpl: ItemListController, SettingsControll
         
         super.init(presentationData: ItemListPresentationData(presentationData), updatedPresentationData: updatedPresentationData |> map(ItemListPresentationData.init(_:)), state: state, tabBarItem: tabBarItem)
         
-        self.hasTabBarItemContextAction = true
+        self.tabBarItemContextActionType = .always
         
         self.accountsAndPeersDisposable = (accountsAndPeers
         |> deliverOnMainQueue).start(next: { [weak self] value in
@@ -857,6 +878,7 @@ private final class SettingsControllerImpl: ItemListController, SettingsControll
 
 private final class SettingsTabBarContextExtractedContentSource: ContextExtractedContentSource {
     let keepInPlace: Bool = true
+    let ignoreContentTouches: Bool = true
     
     private let controller: ViewController
     private let sourceNode: ContextExtractedContentContainingNode
@@ -925,6 +947,7 @@ public func settingsController(context: AccountContext, accountManager: AccountM
     let privacySettings = Promise<AccountPrivacySettings?>(nil)
     
     let enableQRLogin = Promise<Bool>()
+    let enableFilters = Promise<Bool>()
 
     let openFaq: (Promise<ResolvedUrl>, String?) -> Void = { resolvedUrl, customAnchor in
         let _ = (contextValue.get()
@@ -1221,17 +1244,28 @@ public func settingsController(context: AccountContext, accountManager: AccountM
             gesture?.cancel()
         }
     }, openDevices: {
-        let _ = (combineLatest(queue: .mainQueue(),
-            activeSessionsContextAndCount.get(),
-            enableQRLogin.get()
-        )
-        |> take(1)).start(next: { activeSessionsContextAndCount, enableQRLogin in
-            let (activeSessionsContext, count, webSessionsContext) = activeSessionsContextAndCount
-            if count == 0 && enableQRLogin {
-                pushControllerImpl?(AuthDataTransferSplashScreen(context: context, activeSessionsContext: activeSessionsContext))
-            } else {
-                pushControllerImpl?(recentSessionsController(context: context, activeSessionsContext: activeSessionsContext, webSessionsContext: webSessionsContext, websitesOnly: false))
-            }
+        let _ = (contextValue.get()
+        |> deliverOnMainQueue
+        |> take(1)).start(next: { context in
+            let _ = (combineLatest(queue: .mainQueue(),
+                activeSessionsContextAndCount.get(),
+                enableQRLogin.get()
+            )
+            |> take(1)).start(next: { activeSessionsContextAndCount, enableQRLogin in
+                let (activeSessionsContext, count, webSessionsContext) = activeSessionsContextAndCount
+                if count == 0 && enableQRLogin {
+                    pushControllerImpl?(AuthDataTransferSplashScreen(context: context, activeSessionsContext: activeSessionsContext))
+                } else {
+                    pushControllerImpl?(recentSessionsController(context: context, activeSessionsContext: activeSessionsContext, webSessionsContext: webSessionsContext, websitesOnly: false))
+                }
+            })
+        })
+    }, openFilters: {
+        let _ = (contextValue.get()
+        |> deliverOnMainQueue
+        |> take(1)).start(next: { context in
+            let controller = chatListFilterPresetListController(context: context, mode: .default)
+            pushControllerImpl?(controller)
         })
     })
     
@@ -1496,7 +1530,21 @@ public func settingsController(context: AccountContext, accountManager: AccountM
     }
     enableQRLogin.set(enableQRLoginSignal)
     
-    let signal = combineLatest(queue: Queue.mainQueue(), contextValue.get(), updatedPresentationData, statePromise.get(), peerView, combineLatest(queue: Queue.mainQueue(), preferences, notifyExceptions.get(), notificationsAuthorizationStatus.get(), notificationsWarningSuppressed.get(), privacySettings.get(), displayPhoneNumberConfirmation.get()), combineLatest(featuredStickerPacks, archivedPacks.get()), combineLatest(hasWallet, hasPassport.get(), hasWatchApp, enableQRLogin.get()), accountsAndPeers.get(), activeSessionsContextAndCount.get())
+    let enableFiltersSignal = contextValue.get()
+    |> mapToSignal { context -> Signal<Bool, NoError> in
+        return context.account.postbox.preferencesView(keys: [PreferencesKeys.appConfiguration])
+        |> map { view -> Bool in
+            guard let appConfiguration = view.values[PreferencesKeys.appConfiguration] as? AppConfiguration else {
+                return false
+            }
+            let configuration = ChatListFilteringConfiguration(appConfiguration: appConfiguration)
+            return configuration.isEnabled
+        }
+        |> distinctUntilChanged
+    }
+    enableFilters.set(enableFiltersSignal)
+    
+    let signal = combineLatest(queue: Queue.mainQueue(), contextValue.get(), updatedPresentationData, statePromise.get(), peerView, combineLatest(queue: Queue.mainQueue(), preferences, notifyExceptions.get(), notificationsAuthorizationStatus.get(), notificationsWarningSuppressed.get(), privacySettings.get(), displayPhoneNumberConfirmation.get()), combineLatest(featuredStickerPacks, archivedPacks.get()), combineLatest(hasWallet, hasPassport.get(), hasWatchApp, enableQRLogin.get(), enableFilters.get()), accountsAndPeers.get(), activeSessionsContextAndCount.get())
     |> map { context, presentationData, state, view, preferencesAndExceptions, featuredAndArchived, hasWalletPassportAndWatch, accountsAndPeers, activeSessionsContextAndCount -> (ItemListControllerState, (ItemListNodeState, Any)) in
         let otherSessionCount = activeSessionsContextAndCount.1
 
@@ -1536,8 +1584,8 @@ public func settingsController(context: AccountContext, accountManager: AccountM
             pushControllerImpl?(c)
         }, getNavigationController: getNavigationControllerImpl, exceptionsList: notifyExceptions.get(), archivedStickerPacks: archivedPacks.get(), privacySettings: privacySettings.get(), hasWallet: hasWallet, activeSessionsContext: activeSessionsContextAndCountSignal |> map { $0.0 } |> distinctUntilChanged(isEqual: { $0 === $1 }), webSessionsContext: activeSessionsContextAndCountSignal |> map { $0.2 } |> distinctUntilChanged(isEqual: { $0 === $1 }))
         
-        let (hasWallet, hasPassport, hasWatchApp, enableQRLogin) = hasWalletPassportAndWatch
-        let listState = ItemListNodeState(presentationData: ItemListPresentationData(presentationData), entries: settingsEntries(account: context.account, presentationData: presentationData, state: state, view: view, proxySettings: proxySettings, notifyExceptions: preferencesAndExceptions.1, notificationsAuthorizationStatus: preferencesAndExceptions.2, notificationsWarningSuppressed: preferencesAndExceptions.3, unreadTrendingStickerPacks: unreadTrendingStickerPacks, archivedPacks: featuredAndArchived.1, privacySettings: preferencesAndExceptions.4, hasWallet: hasWallet, hasPassport: hasPassport, hasWatchApp: hasWatchApp, accountsAndPeers: accountsAndPeers.1, inAppNotificationSettings: inAppNotificationSettings, experimentalUISettings: experimentalUISettings, displayPhoneNumberConfirmation: preferencesAndExceptions.5, otherSessionCount: otherSessionCount, enableQRLogin: enableQRLogin), style: .blocks, searchItem: searchItem, initialScrollToItem: ListViewScrollToItem(index: 0, position: .top(-navigationBarSearchContentHeight), animated: false, curve: .Default(duration: 0.0), directionHint: .Up))
+        let (hasWallet, hasPassport, hasWatchApp, enableQRLogin, enableFilters) = hasWalletPassportAndWatch
+        let listState = ItemListNodeState(presentationData: ItemListPresentationData(presentationData), entries: settingsEntries(account: context.account, presentationData: presentationData, state: state, view: view, proxySettings: proxySettings, notifyExceptions: preferencesAndExceptions.1, notificationsAuthorizationStatus: preferencesAndExceptions.2, notificationsWarningSuppressed: preferencesAndExceptions.3, unreadTrendingStickerPacks: unreadTrendingStickerPacks, archivedPacks: featuredAndArchived.1, privacySettings: preferencesAndExceptions.4, hasWallet: hasWallet, hasPassport: hasPassport, hasWatchApp: hasWatchApp, accountsAndPeers: accountsAndPeers.1, inAppNotificationSettings: inAppNotificationSettings, experimentalUISettings: experimentalUISettings, displayPhoneNumberConfirmation: preferencesAndExceptions.5, otherSessionCount: otherSessionCount, enableQRLogin: enableQRLogin, enableFilters: enableFilters), style: .blocks, searchItem: searchItem, initialScrollToItem: ListViewScrollToItem(index: 0, position: .top(-navigationBarSearchContentHeight), animated: false, curve: .Default(duration: 0.0), directionHint: .Up))
         
         return (controllerState, (listState, arguments))
     }
diff --git a/submodules/SettingsUI/Sources/SettingsUI.h b/submodules/SettingsUI/Sources/SettingsUI.h
deleted file mode 100644
index 899048f6a5..0000000000
--- a/submodules/SettingsUI/Sources/SettingsUI.h
+++ /dev/null
@@ -1,19 +0,0 @@
-//
-//  SettingsUI.h
-//  SettingsUI
-//
-//  Created by Peter on 8/17/19.
-//  Copyright © 2019 Telegram Messenger LLP. All rights reserved.
-//
-
-#import <UIKit/UIKit.h>
-
-//! Project version number for SettingsUI.
-FOUNDATION_EXPORT double SettingsUIVersionNumber;
-
-//! Project version string for SettingsUI.
-FOUNDATION_EXPORT const unsigned char SettingsUIVersionString[];
-
-// In this header, you should import all the public headers of your framework using statements like #import <SettingsUI/PublicHeader.h>
-
-
diff --git a/submodules/SettingsUI/Sources/Text Size/TextSizeSelectionController.swift b/submodules/SettingsUI/Sources/Text Size/TextSizeSelectionController.swift
index 4588afd30c..d42fdb3177 100644
--- a/submodules/SettingsUI/Sources/Text Size/TextSizeSelectionController.swift	
+++ b/submodules/SettingsUI/Sources/Text Size/TextSizeSelectionController.swift	
@@ -213,7 +213,8 @@ private final class TextSizeSelectionControllerNode: ASDisplayNode, UIScrollView
     private func updateChatsLayout(layout: ContainerViewLayout, topInset: CGFloat, transition: ContainedViewLayoutTransition) {
         var items: [ChatListItem] = []
         
-        let interaction = ChatListNodeInteraction(activateSearch: {}, peerSelected: { _ in }, disabledPeerSelected: { _ in }, togglePeerSelected: { _ in }, messageSelected: { _, _, _ in}, groupSelected: { _ in }, addContact: { _ in }, setPeerIdWithRevealedOptions: { _, _ in }, setItemPinned: { _, _ in }, setPeerMuted: { _, _ in }, deletePeer: { _ in }, updatePeerGrouping: { _, _ in }, togglePeerMarkedUnread: { _, _ in}, toggleArchivedFolderHiddenByDefault: {}, activateChatPreview: { _, _, gesture in
+        let interaction = ChatListNodeInteraction(activateSearch: {}, peerSelected: { _ in }, disabledPeerSelected: { _ in }, togglePeerSelected: { _ in }, additionalCategorySelected: { _ in
+        }, messageSelected: { _, _, _ in}, groupSelected: { _ in }, addContact: { _ in }, setPeerIdWithRevealedOptions: { _, _ in }, setItemPinned: { _, _ in }, setPeerMuted: { _, _ in }, deletePeer: { _ in }, updatePeerGrouping: { _, _ in }, togglePeerMarkedUnread: { _, _ in}, toggleArchivedFolderHiddenByDefault: {}, activateChatPreview: { _, _, gesture in
             gesture?.cancel()
         }, present: { _ in })
         let chatListPresentationData = ChatListPresentationData(theme: self.presentationData.theme, fontSize: self.presentationData.listsFontSize, strings: self.presentationData.strings, dateTimeFormat: self.presentationData.dateTimeFormat, nameSortOrder: self.presentationData.nameSortOrder, nameDisplayOrder: self.presentationData.nameDisplayOrder, disableAnimations: true)
diff --git a/submodules/SettingsUI/Sources/Themes/ThemeAccentColorControllerNode.swift b/submodules/SettingsUI/Sources/Themes/ThemeAccentColorControllerNode.swift
index 809fe525a0..932ada446e 100644
--- a/submodules/SettingsUI/Sources/Themes/ThemeAccentColorControllerNode.swift
+++ b/submodules/SettingsUI/Sources/Themes/ThemeAccentColorControllerNode.swift
@@ -766,7 +766,8 @@ final class ThemeAccentColorControllerNode: ASDisplayNode, UIScrollViewDelegate
     private func updateChatsLayout(layout: ContainerViewLayout, topInset: CGFloat, transition: ContainedViewLayoutTransition) {
         var items: [ChatListItem] = []
         
-        let interaction = ChatListNodeInteraction(activateSearch: {}, peerSelected: { _ in }, disabledPeerSelected: { _ in }, togglePeerSelected: { _ in }, messageSelected: { _, _, _ in}, groupSelected: { _ in }, addContact: { _ in }, setPeerIdWithRevealedOptions: { _, _ in }, setItemPinned: { _, _ in }, setPeerMuted: { _, _ in }, deletePeer: { _ in }, updatePeerGrouping: { _, _ in }, togglePeerMarkedUnread: { _, _ in}, toggleArchivedFolderHiddenByDefault: {}, activateChatPreview: { _, _, gesture in
+        let interaction = ChatListNodeInteraction(activateSearch: {}, peerSelected: { _ in }, disabledPeerSelected: { _ in }, togglePeerSelected: { _ in }, additionalCategorySelected: { _ in
+        }, messageSelected: { _, _, _ in}, groupSelected: { _ in }, addContact: { _ in }, setPeerIdWithRevealedOptions: { _, _ in }, setItemPinned: { _, _ in }, setPeerMuted: { _, _ in }, deletePeer: { _ in }, updatePeerGrouping: { _, _ in }, togglePeerMarkedUnread: { _, _ in}, toggleArchivedFolderHiddenByDefault: {}, activateChatPreview: { _, _, gesture in
             gesture?.cancel()
         }, present: { _ in
         })
diff --git a/submodules/SettingsUI/Sources/Themes/ThemeAutoNightSettingsController.swift b/submodules/SettingsUI/Sources/Themes/ThemeAutoNightSettingsController.swift
index 13136e0a15..47581bc752 100644
--- a/submodules/SettingsUI/Sources/Themes/ThemeAutoNightSettingsController.swift
+++ b/submodules/SettingsUI/Sources/Themes/ThemeAutoNightSettingsController.swift
@@ -14,6 +14,7 @@ import AccountContext
 import DeviceLocationManager
 import Geocoding
 import WallpaperResources
+import Sunrise
 
 private enum TriggerMode {
     case system
diff --git a/submodules/SettingsUI/Sources/Themes/ThemePreviewControllerNode.swift b/submodules/SettingsUI/Sources/Themes/ThemePreviewControllerNode.swift
index 631065c3c6..d65a79319f 100644
--- a/submodules/SettingsUI/Sources/Themes/ThemePreviewControllerNode.swift
+++ b/submodules/SettingsUI/Sources/Themes/ThemePreviewControllerNode.swift
@@ -350,7 +350,8 @@ final class ThemePreviewControllerNode: ASDisplayNode, UIScrollViewDelegate {
     private func updateChatsLayout(layout: ContainerViewLayout, topInset: CGFloat, transition: ContainedViewLayoutTransition) {
         var items: [ChatListItem] = []
         
-        let interaction = ChatListNodeInteraction(activateSearch: {}, peerSelected: { _ in }, disabledPeerSelected: { _ in }, togglePeerSelected: { _ in }, messageSelected: { _, _, _ in}, groupSelected: { _ in }, addContact: { _ in }, setPeerIdWithRevealedOptions: { _, _ in }, setItemPinned: { _, _ in }, setPeerMuted: { _, _ in }, deletePeer: { _ in }, updatePeerGrouping: { _, _ in }, togglePeerMarkedUnread: { _, _ in}, toggleArchivedFolderHiddenByDefault: {}, activateChatPreview: { _, _, gesture in
+        let interaction = ChatListNodeInteraction(activateSearch: {}, peerSelected: { _ in }, disabledPeerSelected: { _ in }, togglePeerSelected: { _ in }, additionalCategorySelected: { _ in
+        }, messageSelected: { _, _, _ in}, groupSelected: { _ in }, addContact: { _ in }, setPeerIdWithRevealedOptions: { _, _ in }, setItemPinned: { _, _ in }, setPeerMuted: { _, _ in }, deletePeer: { _ in }, updatePeerGrouping: { _, _ in }, togglePeerMarkedUnread: { _, _ in}, toggleArchivedFolderHiddenByDefault: {}, activateChatPreview: { _, _, gesture in
             gesture?.cancel()
         }, present: { _ in
         })
diff --git a/submodules/SettingsUI/Sources/Themes/ThemeSettingsController.swift b/submodules/SettingsUI/Sources/Themes/ThemeSettingsController.swift
index 6f8357dfba..c881fe3321 100644
--- a/submodules/SettingsUI/Sources/Themes/ThemeSettingsController.swift
+++ b/submodules/SettingsUI/Sources/Themes/ThemeSettingsController.swift
@@ -1,5 +1,6 @@
 import Foundation
 import UIKit
+import AsyncDisplayKit
 import Display
 import SwiftSignalKit
 import Postbox
diff --git a/submodules/ShareController/BUILD b/submodules/ShareController/BUILD
new file mode 100644
index 0000000000..8b8fa4ff0c
--- /dev/null
+++ b/submodules/ShareController/BUILD
@@ -0,0 +1,33 @@
+load("@build_bazel_rules_swift//swift:swift.bzl", "swift_library")
+
+swift_library(
+    name = "ShareController",
+    module_name = "ShareController",
+    srcs = glob([
+		"Sources/**/*.swift",
+    ]),
+    deps = [
+        "//submodules/SSignalKit/SwiftSignalKit:SwiftSignalKit",
+        "//submodules/AsyncDisplayKit:AsyncDisplayKit",
+        "//submodules/Postbox:Postbox",
+        "//submodules/TelegramCore:TelegramCore",
+        "//submodules/SyncCore:SyncCore",
+        "//submodules/SaveToCameraRoll:SaveToCameraRoll",
+        "//submodules/StickerResources:StickerResources",
+        "//submodules/UrlEscaping:UrlEscaping",
+        "//submodules/LocalizedPeerData:LocalizedPeerData",
+        "//submodules/ActionSheetPeerItem:ActionSheetPeerItem",
+        "//submodules/ChatListSearchRecentPeersNode:ChatListSearchRecentPeersNode",
+        "//submodules/PeerPresenceStatusManager:PeerPresenceStatusManager",
+        "//submodules/SelectablePeerNode:SelectablePeerNode",
+        "//submodules/RadialStatusNode:RadialStatusNode",
+        "//submodules/ActivityIndicator:ActivityIndicator",
+        "//submodules/AppBundle:AppBundle",
+        "//submodules/TelegramStringFormatting:TelegramStringFormatting",
+        "//submodules/TelegramIntents:TelegramIntents",
+        "//submodules/AccountContext:AccountContext",
+    ],
+    visibility = [
+        "//visibility:public",
+    ],
+)
diff --git a/submodules/ShareController/Info.plist b/submodules/ShareController/Info.plist
deleted file mode 100644
index e1fe4cfb7b..0000000000
--- a/submodules/ShareController/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/ShareController/Sources/ShareController.h b/submodules/ShareController/Sources/ShareController.h
deleted file mode 100644
index 8e0e68b552..0000000000
--- a/submodules/ShareController/Sources/ShareController.h
+++ /dev/null
@@ -1,19 +0,0 @@
-//
-//  ShareController.h
-//  ShareController
-//
-//  Created by Peter on 8/5/19.
-//  Copyright © 2019 Telegram Messenger LLP. All rights reserved.
-//
-
-#import <UIKit/UIKit.h>
-
-//! Project version number for ShareController.
-FOUNDATION_EXPORT double ShareControllerVersionNumber;
-
-//! Project version string for ShareController.
-FOUNDATION_EXPORT const unsigned char ShareControllerVersionString[];
-
-// In this header, you should import all the public headers of your framework using statements like #import <ShareController/PublicHeader.h>
-
-
diff --git a/submodules/ShareController/Sources/ShareController.swift b/submodules/ShareController/Sources/ShareController.swift
index 80e42a7db5..d2cf2dbc83 100644
--- a/submodules/ShareController/Sources/ShareController.swift
+++ b/submodules/ShareController/Sources/ShareController.swift
@@ -813,7 +813,7 @@ public final class ShareController: ViewController {
             var peers: [RenderedPeer] = []
             for entry in view.0.entries.reversed() {
                 switch entry {
-                    case let .MessageEntry(_, _, _, _, _, renderedPeer, _, _, _):
+                    case let .MessageEntry(_, _, _, _, _, renderedPeer, _, _, _, _):
                         if let peer = renderedPeer.peers[renderedPeer.peerId], peer.id != accountPeer.id, canSendMessagesToPeer(peer) {
                             peers.append(renderedPeer)
                         }
diff --git a/submodules/ShareItems/BUCK b/submodules/ShareItems/BUCK
index 19d6ca2f02..0787170e22 100644
--- a/submodules/ShareItems/BUCK
+++ b/submodules/ShareItems/BUCK
@@ -4,14 +4,7 @@ static_library(
     name = "ShareItems",
     srcs = glob([
         "Sources/**/*.swift",
-        "Sources/*.m",
     ]),
-    headers = glob([
-        "Sources/*.h",
-    ], exclude = ["Sources/ShareItems.h"]),
-    exported_headers = glob([
-        "Sources/*.h",
-    ], exclude = ["Sources/ShareItems.h"]),
     deps = [
         "//submodules/SSignalKit/SwiftSignalKit:SwiftSignalKit#shared",
         "//submodules/Postbox:Postbox#shared",
@@ -25,6 +18,7 @@ static_library(
         "//submodules/AccountContext:AccountContext",
         "//submodules/MimeTypes:MimeTypes",
         "//submodules/PhoneNumberFormat:PhoneNumberFormat",
+        "//submodules/ShareItems/Impl:ShareItemsImpl",
     ],
     frameworks = [
         "$SDKROOT/System/Library/Frameworks/Foundation.framework",
diff --git a/submodules/ShareItems/BUILD b/submodules/ShareItems/BUILD
new file mode 100644
index 0000000000..55ffcf3d8d
--- /dev/null
+++ b/submodules/ShareItems/BUILD
@@ -0,0 +1,25 @@
+load("@build_bazel_rules_swift//swift:swift.bzl", "swift_library")
+
+swift_library(
+    name = "ShareItems",
+    module_name = "ShareItems",
+    srcs = glob([
+        "Sources/**/*.swift",
+    ]),
+    deps = [
+        "//submodules/SSignalKit/SwiftSignalKit:SwiftSignalKit",
+        "//submodules/Postbox:Postbox",
+        "//submodules/TelegramCore:TelegramCore",
+        "//submodules/SyncCore:SyncCore",
+        "//submodules/MtProtoKit:MtProtoKit",
+        "//submodules/Display:Display",
+        "//submodules/LegacyComponents:LegacyComponents",
+        "//submodules/LocalMediaResources:LocalMediaResources",
+        "//submodules/Pdf:Pdf",
+        "//submodules/AccountContext:AccountContext",
+    	"//submodules/ShareItems/Impl:ShareItemsImpl",
+    ],
+    visibility = [
+        "//visibility:public",
+    ],
+)
diff --git a/submodules/ShareItems/Impl/BUCK b/submodules/ShareItems/Impl/BUCK
new file mode 100644
index 0000000000..54d762b8e8
--- /dev/null
+++ b/submodules/ShareItems/Impl/BUCK
@@ -0,0 +1,27 @@
+load("//Config:buck_rule_macros.bzl", "static_library")
+
+static_library(
+    name = "ShareItemsImpl",
+    srcs = glob([
+        "Sources/*.m",
+    ]),
+    headers = glob([
+        "Sources/*.h",
+    ]),
+    exported_headers = glob([
+        "PublicHeaders/**/*.h",
+    ]),
+    deps = [
+        "//submodules/MtProtoKit:MtProtoKit#shared",
+        "//submodules/MimeTypes:MimeTypes",
+        "//submodules/PhoneNumberFormat:PhoneNumberFormat",
+    ],
+    frameworks = [
+        "$SDKROOT/System/Library/Frameworks/Foundation.framework",
+        "$SDKROOT/System/Library/Frameworks/UIKit.framework",
+        "$SDKROOT/System/Library/Frameworks/MobileCoreServices.framework",
+        "$SDKROOT/System/Library/Frameworks/AddressBook.framework",
+        "$SDKROOT/System/Library/Frameworks/AVFoundation.framework",
+        "$SDKROOT/System/Library/Frameworks/PassKit.framework",
+    ],
+)
diff --git a/submodules/ShareItems/Impl/BUILD b/submodules/ShareItems/Impl/BUILD
new file mode 100644
index 0000000000..7d9d422737
--- /dev/null
+++ b/submodules/ShareItems/Impl/BUILD
@@ -0,0 +1,32 @@
+
+objc_library(
+    name = "ShareItemsImpl",
+    enable_modules = True,
+    module_name = "ShareItemsImpl",
+    srcs = glob([
+        "Sources/**/*.m",
+        "Sources/**/*.h",
+    ]),
+    hdrs = glob([
+        "PublicHeaders/**/*.h",
+    ]),
+    includes = [
+        "PublicHeaders",
+    ],
+    deps = [
+        "//submodules/MtProtoKit:MtProtoKit",
+        "//submodules/PhoneNumberFormat:PhoneNumberFormat",
+        "//submodules/MimeTypes:MimeTypes",
+    ],
+    sdk_frameworks = [
+        "Foundation",
+        "UIKit",
+        "MobileCoreServices",
+        "AddressBook",
+        "AVFoundation",
+        "PassKit",
+    ],
+    visibility = [
+        "//visibility:public",
+    ],
+)
diff --git a/submodules/ShareItems/Impl/PublicHeaders/ShareItemsImpl/ShareItems.h b/submodules/ShareItems/Impl/PublicHeaders/ShareItemsImpl/ShareItems.h
new file mode 100644
index 0000000000..42be0efe84
--- /dev/null
+++ b/submodules/ShareItems/Impl/PublicHeaders/ShareItemsImpl/ShareItems.h
@@ -0,0 +1,6 @@
+#import <UIKit/UIKit.h>
+
+#import <ShareItemsImpl/TGItemProviderSignals.h>
+#import <ShareItemsImpl/TGShareLocationSignals.h>
+
+
diff --git a/submodules/ShareItems/Sources/TGItemProviderSignals.h b/submodules/ShareItems/Impl/PublicHeaders/ShareItemsImpl/TGItemProviderSignals.h
similarity index 100%
rename from submodules/ShareItems/Sources/TGItemProviderSignals.h
rename to submodules/ShareItems/Impl/PublicHeaders/ShareItemsImpl/TGItemProviderSignals.h
diff --git a/submodules/ShareItems/Sources/TGShareLocationSignals.h b/submodules/ShareItems/Impl/PublicHeaders/ShareItemsImpl/TGShareLocationSignals.h
similarity index 100%
rename from submodules/ShareItems/Sources/TGShareLocationSignals.h
rename to submodules/ShareItems/Impl/PublicHeaders/ShareItemsImpl/TGShareLocationSignals.h
diff --git a/submodules/ShareItems/Sources/TGItemProviderSignals.m b/submodules/ShareItems/Impl/Sources/TGItemProviderSignals.m
similarity index 99%
rename from submodules/ShareItems/Sources/TGItemProviderSignals.m
rename to submodules/ShareItems/Impl/Sources/TGItemProviderSignals.m
index 6a7ae46a41..bb84fce6aa 100644
--- a/submodules/ShareItems/Sources/TGItemProviderSignals.m
+++ b/submodules/ShareItems/Impl/Sources/TGItemProviderSignals.m
@@ -1,10 +1,6 @@
-#import "TGItemProviderSignals.h"
+#import <ShareItemsImpl/TGItemProviderSignals.h>
 
-#ifdef BUCK
 #import <MTProtoKit/MTProtoKit.h>
-#else
-#import <MTProtoKitDynamic/MTProtoKitDynamic.h>
-#endif
 
 #import <UIKit/UIKit.h>
 #import <MobileCoreServices/MobileCoreServices.h>
@@ -14,8 +10,6 @@
 
 #import <MimeTypes/MimeTypes.h>
 
-#import "TGContactModel.h"
-
 @implementation TGItemProviderSignals
 
 + (NSArray<MTSignal *> *)itemSignalsForInputItems:(NSArray *)inputItems
diff --git a/submodules/ShareItems/Sources/TGShareLocationSignals.m b/submodules/ShareItems/Impl/Sources/TGShareLocationSignals.m
similarity index 99%
rename from submodules/ShareItems/Sources/TGShareLocationSignals.m
rename to submodules/ShareItems/Impl/Sources/TGShareLocationSignals.m
index 84544edba6..7eaf7fe418 100644
--- a/submodules/ShareItems/Sources/TGShareLocationSignals.m
+++ b/submodules/ShareItems/Impl/Sources/TGShareLocationSignals.m
@@ -1,10 +1,6 @@
-#import "TGShareLocationSignals.h"
+#import <ShareItemsImpl/TGShareLocationSignals.h>
 
-#ifdef BUCK
 #import <MTProtoKit/MTProtoKit.h>
-#else
-#import <MTProtoKitDynamic/MTProtoKitDynamic.h>
-#endif
 
 NSString *const TGShareAppleMapsHost = @"maps.apple.com";
 NSString *const TGShareAppleMapsPath = @"/maps";
diff --git a/submodules/ShareItems/Info.plist b/submodules/ShareItems/Info.plist
deleted file mode 100644
index e1fe4cfb7b..0000000000
--- a/submodules/ShareItems/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/ShareItems/Sources/ShareItems.h b/submodules/ShareItems/Sources/ShareItems.h
deleted file mode 100644
index 9dd09adf4d..0000000000
--- a/submodules/ShareItems/Sources/ShareItems.h
+++ /dev/null
@@ -1,13 +0,0 @@
-#import <UIKit/UIKit.h>
-
-//! Project version number for ShareItems.
-FOUNDATION_EXPORT double ShareItemsVersionNumber;
-
-//! Project version string for ShareItems.
-FOUNDATION_EXPORT const unsigned char ShareItemsVersionString[];
-
-#import <ShareItems/TGContactModel.h>
-#import <ShareItems/TGItemProviderSignals.h>
-#import <ShareItems/TGShareLocationSignals.h>
-
-
diff --git a/submodules/ShareItems/Sources/ShareItems.swift b/submodules/ShareItems/Sources/ShareItems.swift
index f87db7d9b3..87f271c800 100644
--- a/submodules/ShareItems/Sources/ShareItems.swift
+++ b/submodules/ShareItems/Sources/ShareItems.swift
@@ -3,17 +3,14 @@ import SwiftSignalKit
 import Postbox
 import TelegramCore
 import SyncCore
-#if BUCK
 import MtProtoKit
-#else
-import MtProtoKitDynamic
-#endif
 import Display
 import AccountContext
 import Pdf
 import LocalMediaResources
 import AVFoundation
 import LegacyComponents
+import ShareItemsImpl
 
 public enum UnpreparedShareItemContent {
     case contact(DeviceContactExtendedData)
diff --git a/submodules/ShareItems/Sources/TGContactModel.h b/submodules/ShareItems/Sources/TGContactModel.h
deleted file mode 100644
index 5218304bd0..0000000000
--- a/submodules/ShareItems/Sources/TGContactModel.h
+++ /dev/null
@@ -1,24 +0,0 @@
-#import <Foundation/Foundation.h>
-
-@interface TGPhoneNumberModel : NSObject
-
-@property (nonatomic, strong, readonly) NSString *phoneNumber;
-@property (nonatomic, strong, readonly) NSString *displayPhoneNumber;
-
-@property (nonatomic, strong, readonly) NSString *label;
-
-- (instancetype)initWithPhoneNumber:(NSString *)string label:(NSString *)label;
-
-@end
-
-
-@interface TGContactModel : NSObject
-
-@property (nonatomic, strong, readonly) NSString *firstName;
-@property (nonatomic, strong, readonly) NSString *lastName;
-
-@property (nonatomic, strong, readonly) NSArray *phoneNumbers;
-
-- (instancetype)initWithFirstName:(NSString *)firstName lastName:(NSString *)lastName phoneNumbers:(NSArray *)phoneNumbers;
-
-@end
diff --git a/submodules/ShareItems/Sources/TGContactModel.m b/submodules/ShareItems/Sources/TGContactModel.m
deleted file mode 100644
index 8a69aad4b1..0000000000
--- a/submodules/ShareItems/Sources/TGContactModel.m
+++ /dev/null
@@ -1,35 +0,0 @@
-#import "TGContactModel.h"
-
-#import <PhoneNumberFormat/PhoneNumberFormat.h>
-
-@implementation TGPhoneNumberModel
-
-- (instancetype)initWithPhoneNumber:(NSString *)phoneNumber label:(NSString *)label
-{
-    self = [super init];
-    if (self != nil)
-    {
-        _phoneNumber = [FormatPhoneNumber cleanInternationalPhone:phoneNumber forceInternational:false];
-        _displayPhoneNumber = [FormatPhoneNumber formatPhoneNumber:_phoneNumber];
-        _label = label;
-    }
-    return self;
-}
-
-@end
-
-@implementation TGContactModel
-
-- (instancetype)initWithFirstName:(NSString *)firstName lastName:(NSString *)lastName phoneNumbers:(NSArray *)phoneNumbers
-{
-    self = [super init];
-    if (self != nil)
-    {
-        _firstName = firstName;
-        _lastName = lastName;
-        _phoneNumbers = phoneNumbers;
-    }
-    return self;
-}
-
-@end
diff --git a/submodules/SinglePhoneInputNode/BUILD b/submodules/SinglePhoneInputNode/BUILD
new file mode 100644
index 0000000000..444fca3d20
--- /dev/null
+++ b/submodules/SinglePhoneInputNode/BUILD
@@ -0,0 +1,18 @@
+load("@build_bazel_rules_swift//swift:swift.bzl", "swift_library")
+
+swift_library(
+    name = "SinglePhoneInputNode",
+    module_name = "SinglePhoneInputNode",
+    srcs = glob([
+		"Sources/**/*.swift",
+    ]),
+    deps = [
+        "//submodules/AsyncDisplayKit:AsyncDisplayKit",
+        "//submodules/Display:Display",
+        "//submodules/TelegramStringFormatting:TelegramStringFormatting",
+        "//submodules/PhoneNumberFormat:PhoneNumberFormat",
+    ],
+    visibility = [
+        "//visibility:public",
+    ],
+)
diff --git a/submodules/SinglePhoneInputNode/Info.plist b/submodules/SinglePhoneInputNode/Info.plist
deleted file mode 100644
index e1fe4cfb7b..0000000000
--- a/submodules/SinglePhoneInputNode/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/SinglePhoneInputNode/Sources/SinglePhoneInputNode.h b/submodules/SinglePhoneInputNode/Sources/SinglePhoneInputNode.h
deleted file mode 100644
index 36afe0ff2c..0000000000
--- a/submodules/SinglePhoneInputNode/Sources/SinglePhoneInputNode.h
+++ /dev/null
@@ -1,19 +0,0 @@
-//
-//  SinglePhoneInputNode.h
-//  SinglePhoneInputNode
-//
-//  Created by Peter on 8/15/19.
-//  Copyright © 2019 Telegram Messenger LLP. All rights reserved.
-//
-
-#import <UIKit/UIKit.h>
-
-//! Project version number for SinglePhoneInputNode.
-FOUNDATION_EXPORT double SinglePhoneInputNodeVersionNumber;
-
-//! Project version string for SinglePhoneInputNode.
-FOUNDATION_EXPORT const unsigned char SinglePhoneInputNodeVersionString[];
-
-// In this header, you should import all the public headers of your framework using statements like #import <SinglePhoneInputNode/PublicHeader.h>
-
-
diff --git a/submodules/SolidRoundedButtonNode/BUILD b/submodules/SolidRoundedButtonNode/BUILD
new file mode 100644
index 0000000000..a22f23414d
--- /dev/null
+++ b/submodules/SolidRoundedButtonNode/BUILD
@@ -0,0 +1,16 @@
+load("@build_bazel_rules_swift//swift:swift.bzl", "swift_library")
+
+swift_library(
+    name = "SolidRoundedButtonNode",
+    module_name = "SolidRoundedButtonNode",
+    srcs = glob([
+        "Sources/**/*.swift",
+    ]),
+    deps = [
+        "//submodules/AsyncDisplayKit:AsyncDisplayKit",
+        "//submodules/Display:Display",
+    ],
+    visibility = [
+        "//visibility:public",
+    ],
+)
diff --git a/submodules/SolidRoundedButtonNode/Info.plist b/submodules/SolidRoundedButtonNode/Info.plist
deleted file mode 100644
index e1fe4cfb7b..0000000000
--- a/submodules/SolidRoundedButtonNode/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/SolidRoundedButtonNode/Sources/SolidRoundedButtonNode.h b/submodules/SolidRoundedButtonNode/Sources/SolidRoundedButtonNode.h
deleted file mode 100644
index d75a53c4b0..0000000000
--- a/submodules/SolidRoundedButtonNode/Sources/SolidRoundedButtonNode.h
+++ /dev/null
@@ -1,19 +0,0 @@
-//
-//  SolidRoundedButtonNode.h
-//  SolidRoundedButtonNode
-//
-//  Created by Peter on 8/13/19.
-//  Copyright © 2019 Telegram Messenger LLP. All rights reserved.
-//
-
-#import <UIKit/UIKit.h>
-
-//! Project version number for SolidRoundedButtonNode.
-FOUNDATION_EXPORT double SolidRoundedButtonNodeVersionNumber;
-
-//! Project version string for SolidRoundedButtonNode.
-FOUNDATION_EXPORT const unsigned char SolidRoundedButtonNodeVersionString[];
-
-// In this header, you should import all the public headers of your framework using statements like #import <SolidRoundedButtonNode/PublicHeader.h>
-
-
diff --git a/submodules/SolidRoundedButtonNode/Sources/SolidRoundedButtonNode.swift b/submodules/SolidRoundedButtonNode/Sources/SolidRoundedButtonNode.swift
index 76bb562165..2bfd0b4880 100644
--- a/submodules/SolidRoundedButtonNode/Sources/SolidRoundedButtonNode.swift
+++ b/submodules/SolidRoundedButtonNode/Sources/SolidRoundedButtonNode.swift
@@ -55,7 +55,6 @@ public final class SolidRoundedButtonNode: ASDisplayNode {
         
         self.buttonBackgroundNode = ASImageNode()
         self.buttonBackgroundNode.isLayerBacked = true
-        self.buttonBackgroundNode.displayWithoutProcessing = true
         self.buttonBackgroundNode.displaysAsynchronously = false
         self.buttonBackgroundNode.image = generateStretchableFilledCircleImage(radius: cornerRadius, color: theme.backgroundColor)
         
@@ -70,7 +69,6 @@ public final class SolidRoundedButtonNode: ASDisplayNode {
         self.subtitleNode.isUserInteractionEnabled = false
         
         self.iconNode = ASImageNode()
-        self.iconNode.displayWithoutProcessing = true
         self.iconNode.displaysAsynchronously = false
         self.iconNode.image = icon
         
diff --git a/submodules/SpotlightSupport/BUILD b/submodules/SpotlightSupport/BUILD
new file mode 100644
index 0000000000..141b5c4b37
--- /dev/null
+++ b/submodules/SpotlightSupport/BUILD
@@ -0,0 +1,19 @@
+load("@build_bazel_rules_swift//swift:swift.bzl", "swift_library")
+
+swift_library(
+    name = "SpotlightSupport",
+    module_name = "SpotlightSupport",
+    srcs = glob([
+		"Sources/**/*.swift",
+    ]),
+    deps = [
+        "//submodules/SSignalKit/SwiftSignalKit:SwiftSignalKit",
+        "//submodules/Postbox:Postbox",
+        "//submodules/SyncCore:SyncCore",
+        "//submodules/TelegramCore:TelegramCore",
+        "//submodules/Display:Display",
+    ],
+    visibility = [
+        "//visibility:public",
+    ],
+)
diff --git a/submodules/StatisticsUI/BUILD b/submodules/StatisticsUI/BUILD
new file mode 100644
index 0000000000..ccee534975
--- /dev/null
+++ b/submodules/StatisticsUI/BUILD
@@ -0,0 +1,31 @@
+load("@build_bazel_rules_swift//swift:swift.bzl", "swift_library")
+
+swift_library(
+    name = "StatisticsUI",
+    module_name = "StatisticsUI",
+    srcs = glob([
+		"Sources/**/*.swift",
+    ]),
+    deps = [
+        "//submodules/SSignalKit/SwiftSignalKit:SwiftSignalKit",
+        "//submodules/AsyncDisplayKit:AsyncDisplayKit",
+        "//submodules/Display:Display",
+        "//submodules/Postbox:Postbox",
+        "//submodules/TelegramCore:TelegramCore",
+        "//submodules/SyncCore:SyncCore",
+        "//submodules/TelegramPresentationData:TelegramPresentationData",
+        "//submodules/TelegramUIPreferences:TelegramUIPreferences",
+        "//submodules/AccountContext:AccountContext",
+        "//submodules/ItemListUI:ItemListUI",
+        "//submodules/AvatarNode:AvatarNode",
+        "//submodules/TelegramStringFormatting:TelegramStringFormatting",
+        "//submodules/AlertUI:AlertUI",
+        "//submodules/PresentationDataUtils:PresentationDataUtils",
+        "//submodules/MergeLists:MergeLists",
+        "//submodules/PhotoResources:PhotoResources",
+        "//submodules/GraphUI:GraphUI",
+    ],
+    visibility = [
+        "//visibility:public",
+    ],
+)
diff --git a/submodules/StatisticsUI/Info.plist b/submodules/StatisticsUI/Info.plist
deleted file mode 100644
index e1fe4cfb7b..0000000000
--- a/submodules/StatisticsUI/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/StatisticsUI/Sources/StatisticsUI.h b/submodules/StatisticsUI/Sources/StatisticsUI.h
deleted file mode 100644
index 89573b3f16..0000000000
--- a/submodules/StatisticsUI/Sources/StatisticsUI.h
+++ /dev/null
@@ -1,19 +0,0 @@
-//
-//  StatisticsUI.h
-//  StatisticsUI
-//
-//  Created by Peter on 8/13/19.
-//  Copyright © 2019 Telegram Messenger LLP. All rights reserved.
-//
-
-#import <UIKit/UIKit.h>
-
-//! Project version number for StatisticsUI.
-FOUNDATION_EXPORT double StatisticsUIVersionNumber;
-
-//! Project version string for StatisticsUI.
-FOUNDATION_EXPORT const unsigned char StatisticsUIVersionString[];
-
-// In this header, you should import all the public headers of your framework using statements like #import <StatisticsUI/PublicHeader.h>
-
-
diff --git a/submodules/StickerPackPreviewUI/BUILD b/submodules/StickerPackPreviewUI/BUILD
new file mode 100644
index 0000000000..0a13100ff6
--- /dev/null
+++ b/submodules/StickerPackPreviewUI/BUILD
@@ -0,0 +1,33 @@
+load("@build_bazel_rules_swift//swift:swift.bzl", "swift_library")
+
+swift_library(
+    name = "StickerPackPreviewUI",
+    module_name = "StickerPackPreviewUI",
+    srcs = glob([
+		"Sources/**/*.swift",
+    ]),
+    deps = [
+        "//submodules/SSignalKit/SwiftSignalKit:SwiftSignalKit",
+        "//submodules/AsyncDisplayKit:AsyncDisplayKit",
+        "//submodules/Display:Display",
+        "//submodules/Postbox:Postbox",
+        "//submodules/TelegramCore:TelegramCore",
+        "//submodules/SyncCore:SyncCore",
+        "//submodules/TelegramPresentationData:TelegramPresentationData",
+        "//submodules/AccountContext:AccountContext",
+        "//submodules/TelegramUIPreferences:TelegramUIPreferences",
+        "//submodules/ShareController:ShareController",
+        "//submodules/StickerResources:StickerResources",
+        "//submodules/AlertUI:AlertUI",
+        "//submodules/PresentationDataUtils:PresentationDataUtils",
+        "//submodules/TextFormat:TextFormat",
+        "//submodules/MergeLists:MergeLists",
+        "//submodules/ActivityIndicator:ActivityIndicator",
+        "//submodules/AnimatedStickerNode:AnimatedStickerNode",
+        "//submodules/TelegramAnimatedStickerNode:TelegramAnimatedStickerNode",
+        "//submodules/ArchivedStickerPacksNotice:ArchivedStickerPacksNotice",
+    ],
+    visibility = [
+        "//visibility:public",
+    ],
+)
diff --git a/submodules/StickerPackPreviewUI/Info.plist b/submodules/StickerPackPreviewUI/Info.plist
deleted file mode 100644
index e1fe4cfb7b..0000000000
--- a/submodules/StickerPackPreviewUI/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/StickerResources/BUCK b/submodules/StickerResources/BUCK
index b5d224ade2..d832be586d 100644
--- a/submodules/StickerResources/BUCK
+++ b/submodules/StickerResources/BUCK
@@ -15,7 +15,7 @@ static_library(
         "//submodules/Tuples:Tuples",
         "//submodules/MediaResources:MediaResources",
         "//submodules/TelegramUIPreferences:TelegramUIPreferences",
-        "//submodules/WebP:WebPImage",
+        "//submodules/WebPBinding:WebPBinding",
     ],
     frameworks = [
         "$SDKROOT/System/Library/Frameworks/Foundation.framework",
diff --git a/submodules/StickerResources/BUILD b/submodules/StickerResources/BUILD
new file mode 100644
index 0000000000..fbc63bf800
--- /dev/null
+++ b/submodules/StickerResources/BUILD
@@ -0,0 +1,24 @@
+load("@build_bazel_rules_swift//swift:swift.bzl", "swift_library")
+
+swift_library(
+    name = "StickerResources",
+    module_name = "StickerResources",
+    srcs = glob([
+		"Sources/**/*.swift",
+    ]),
+    deps = [
+        "//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/WebPBinding:WebPBinding",
+    ],
+    visibility = [
+        "//visibility:public",
+    ],
+)
diff --git a/submodules/StickerResources/Info.plist b/submodules/StickerResources/Info.plist
deleted file mode 100644
index e1fe4cfb7b..0000000000
--- a/submodules/StickerResources/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/StickerResources/Sources/StickerResources.h b/submodules/StickerResources/Sources/StickerResources.h
deleted file mode 100644
index 065427c0c8..0000000000
--- a/submodules/StickerResources/Sources/StickerResources.h
+++ /dev/null
@@ -1,19 +0,0 @@
-//
-//  StickerResources.h
-//  StickerResources
-//
-//  Created by Peter on 8/5/19.
-//  Copyright © 2019 Telegram Messenger LLP. All rights reserved.
-//
-
-#import <UIKit/UIKit.h>
-
-//! Project version number for StickerResources.
-FOUNDATION_EXPORT double StickerResourcesVersionNumber;
-
-//! Project version string for StickerResources.
-FOUNDATION_EXPORT const unsigned char StickerResourcesVersionString[];
-
-// In this header, you should import all the public headers of your framework using statements like #import <StickerResources/PublicHeader.h>
-
-
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/StringPluralization/BUCK b/submodules/StringPluralization/BUCK
index d6965f2c11..74014a41d7 100644
--- a/submodules/StringPluralization/BUCK
+++ b/submodules/StringPluralization/BUCK
@@ -14,6 +14,7 @@ static_library(
     ]),
     deps = [
         "//submodules/AppBundle:AppBundle",
+        "//submodules/NumberPluralizationForm:NumberPluralizationForm",
     ],
     frameworks = [
         "$SDKROOT/System/Library/Frameworks/Foundation.framework",
diff --git a/submodules/StringPluralization/BUILD b/submodules/StringPluralization/BUILD
new file mode 100644
index 0000000000..98fb1d6975
--- /dev/null
+++ b/submodules/StringPluralization/BUILD
@@ -0,0 +1,16 @@
+load("@build_bazel_rules_swift//swift:swift.bzl", "swift_library")
+
+swift_library(
+    name = "StringPluralization",
+    module_name = "StringPluralization",
+    srcs = glob([
+        "Sources/**/*.swift",
+    ]),
+    deps = [
+        "//submodules/NumberPluralizationForm:NumberPluralizationForm",
+        "//submodules/AppBundle:AppBundle",
+    ],
+    visibility = [
+        "//visibility:public",
+    ],
+)
diff --git a/submodules/StringPluralization/Sources/StringPluralization.swift b/submodules/StringPluralization/Sources/StringPluralization.swift
index 1df97f8ec7..5016d05a68 100644
--- a/submodules/StringPluralization/Sources/StringPluralization.swift
+++ b/submodules/StringPluralization/Sources/StringPluralization.swift
@@ -1,4 +1,5 @@
 import Foundation
+import NumberPluralizationForm
 
 public enum PluralizationForm: Int32 {
     case zero = 0
diff --git a/submodules/StringTransliteration/BUCK b/submodules/StringTransliteration/BUCK
new file mode 100644
index 0000000000..a1ce2b1f75
--- /dev/null
+++ b/submodules/StringTransliteration/BUCK
@@ -0,0 +1,19 @@
+load("//Config:buck_rule_macros.bzl", "static_library")
+
+static_library(
+    name = "StringTransliteration",
+    srcs = glob([
+        "Sources/*.m",
+    ]),
+    headers = glob([
+        "Sources/*.h",
+    ]),
+    exported_headers = glob([
+        "PublicHeaders/**/*.h",
+    ]),
+    deps = [
+    ],
+    frameworks = [
+        "$SDKROOT/System/Library/Frameworks/Foundation.framework",
+    ],
+)
diff --git a/submodules/StringTransliteration/BUILD b/submodules/StringTransliteration/BUILD
new file mode 100644
index 0000000000..7f95d12d70
--- /dev/null
+++ b/submodules/StringTransliteration/BUILD
@@ -0,0 +1,21 @@
+
+objc_library(
+    name = "StringTransliteration",
+    enable_modules = True,
+    module_name = "StringTransliteration",
+    srcs = glob([
+        "Source/*.m",
+    ]),
+    hdrs = glob([
+        "PublicHeaders/**/*.h",
+    ]),
+    includes = [
+        "PublicHeaders",
+    ],
+    sdk_frameworks = [
+      "Foundation",
+    ],
+    visibility = [
+        "//visibility:public",
+    ],
+)
diff --git a/submodules/StringTransliteration/PublicHeaders/StringTransliteration/StringTransliteration.h b/submodules/StringTransliteration/PublicHeaders/StringTransliteration/StringTransliteration.h
new file mode 100644
index 0000000000..fb45a0a2fa
--- /dev/null
+++ b/submodules/StringTransliteration/PublicHeaders/StringTransliteration/StringTransliteration.h
@@ -0,0 +1,8 @@
+#ifndef StringTransliteration_h
+#define StringTransliteration_h
+
+#import <Foundation/Foundation.h>
+
+NSString *postboxTransformedString(CFStringRef string, bool replaceWithTransliteratedVersion, bool appendTransliteratedVersion);
+
+#endif
diff --git a/submodules/StringTransliteration/Sources/StringTransliteration.m b/submodules/StringTransliteration/Sources/StringTransliteration.m
new file mode 100644
index 0000000000..70238f4633
--- /dev/null
+++ b/submodules/StringTransliteration/Sources/StringTransliteration.m
@@ -0,0 +1,19 @@
+#import <StringTransliteration/StringTransliteration.h>
+
+NSString *postboxTransformedString(CFStringRef string, bool replaceWithTransliteratedVersion, bool appendTransliteratedVersion) {
+    NSMutableString *mutableString = [[NSMutableString alloc] initWithString:(__bridge NSString * _Nonnull)(string)];
+    CFStringTransform((CFMutableStringRef)mutableString, NULL, kCFStringTransformStripCombiningMarks, false);
+    
+    if (replaceWithTransliteratedVersion || appendTransliteratedVersion) {
+        NSMutableString *transliteratedString = [[NSMutableString alloc] initWithString:mutableString];
+        CFStringTransform((CFMutableStringRef)transliteratedString, NULL, kCFStringTransformToLatin, false);
+        if (replaceWithTransliteratedVersion) {
+            return transliteratedString;
+        } else {
+            [mutableString appendString:@" "];
+            [mutableString appendString:transliteratedString];
+        }
+    }
+    
+    return mutableString;
+}
diff --git a/submodules/Stripe/BUCK b/submodules/Stripe/BUCK
index 1d88f6909f..d2fcfd3501 100644
--- a/submodules/Stripe/BUCK
+++ b/submodules/Stripe/BUCK
@@ -7,33 +7,10 @@ static_library(
     ]),
     headers = glob([
         "Sources/*.h",
-    ], exclude = ["Sources/Stripe.h"]),
-    exported_headers = [
-        "Sources/STPAddress.h",
-        "Sources/STPPaymentCardTextField.h",
-        "Sources/STPAPIClient.h",
-        "Sources/STPAPIClient+ApplePay.h",
-        "Sources/STPAPIResponseDecodable.h",
-        "Sources/STPPaymentConfiguration.h",
-        "Sources/STPCard.h",
-        "Sources/STPCardBrand.h",
-        "Sources/STPCardParams.h",
-        "Sources/STPToken.h",
-        "Sources/STPBankAccount.h",
-        "Sources/STPBankAccountParams.h",
-        "Sources/STPBINRange.h",
-        "Sources/STPCardValidator.h",
-        "Sources/STPCardValidationState.h",
-        "Sources/STPCustomer.h",
-        "Sources/STPFormEncodable.h",
-        "Sources/STPPaymentMethod.h",
-        "Sources/STPPhoneNumberValidator.h",
-        "Sources/STPPostalCodeValidator.h",
-        "Sources/STPSource.h",
-        "Sources/STPBlocks.h",
-        "Sources/StripeError.h",
-        "Sources/STPBackendAPIAdapter.h",
-    ],
+    ]),
+    exported_headers = glob([
+        "PublicHeaders/**/*.h",
+    ]),
     frameworks = [
         "$SDKROOT/System/Library/Frameworks/Foundation.framework",
         "$SDKROOT/System/Library/Frameworks/UIKit.framework",
diff --git a/submodules/Stripe/BUILD b/submodules/Stripe/BUILD
new file mode 100644
index 0000000000..9320c426ea
--- /dev/null
+++ b/submodules/Stripe/BUILD
@@ -0,0 +1,27 @@
+
+objc_library(
+    name = "Stripe",
+    enable_modules = True,
+    module_name = "Stripe",
+    srcs = glob([
+        "Sources/**/*.m",
+        "Sources/**/*.h",
+    ]),
+    hdrs = glob([
+        "PublicHeaders/**/*.h",
+    ]),
+    includes = [
+        "PublicHeaders",
+    ],
+    copts = [
+        "-I{}/PublicHeaders/Stripe".format(package_name()),
+    ],
+    sdk_frameworks = [
+        "Foundation",
+        "UIKit",
+        "PassKit",
+    ],
+    visibility = [
+        "//visibility:public",
+    ],
+)
diff --git a/submodules/Stripe/Info.plist b/submodules/Stripe/Info.plist
deleted file mode 100644
index e1fe4cfb7b..0000000000
--- a/submodules/Stripe/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/Stripe/Sources/STPAPIClient+ApplePay.h b/submodules/Stripe/PublicHeaders/Stripe/STPAPIClient+ApplePay.h
similarity index 100%
rename from submodules/Stripe/Sources/STPAPIClient+ApplePay.h
rename to submodules/Stripe/PublicHeaders/Stripe/STPAPIClient+ApplePay.h
diff --git a/submodules/Stripe/Sources/STPAPIClient.h b/submodules/Stripe/PublicHeaders/Stripe/STPAPIClient.h
similarity index 100%
rename from submodules/Stripe/Sources/STPAPIClient.h
rename to submodules/Stripe/PublicHeaders/Stripe/STPAPIClient.h
diff --git a/submodules/Stripe/Sources/STPAPIResponseDecodable.h b/submodules/Stripe/PublicHeaders/Stripe/STPAPIResponseDecodable.h
similarity index 100%
rename from submodules/Stripe/Sources/STPAPIResponseDecodable.h
rename to submodules/Stripe/PublicHeaders/Stripe/STPAPIResponseDecodable.h
diff --git a/submodules/Stripe/Sources/STPAddress.h b/submodules/Stripe/PublicHeaders/Stripe/STPAddress.h
similarity index 100%
rename from submodules/Stripe/Sources/STPAddress.h
rename to submodules/Stripe/PublicHeaders/Stripe/STPAddress.h
diff --git a/submodules/Stripe/Sources/STPBINRange.h b/submodules/Stripe/PublicHeaders/Stripe/STPBINRange.h
similarity index 100%
rename from submodules/Stripe/Sources/STPBINRange.h
rename to submodules/Stripe/PublicHeaders/Stripe/STPBINRange.h
diff --git a/submodules/Stripe/Sources/STPBackendAPIAdapter.h b/submodules/Stripe/PublicHeaders/Stripe/STPBackendAPIAdapter.h
similarity index 100%
rename from submodules/Stripe/Sources/STPBackendAPIAdapter.h
rename to submodules/Stripe/PublicHeaders/Stripe/STPBackendAPIAdapter.h
diff --git a/submodules/Stripe/Sources/STPBankAccount.h b/submodules/Stripe/PublicHeaders/Stripe/STPBankAccount.h
similarity index 100%
rename from submodules/Stripe/Sources/STPBankAccount.h
rename to submodules/Stripe/PublicHeaders/Stripe/STPBankAccount.h
diff --git a/submodules/Stripe/Sources/STPBankAccountParams.h b/submodules/Stripe/PublicHeaders/Stripe/STPBankAccountParams.h
similarity index 100%
rename from submodules/Stripe/Sources/STPBankAccountParams.h
rename to submodules/Stripe/PublicHeaders/Stripe/STPBankAccountParams.h
diff --git a/submodules/Stripe/Sources/STPBlocks.h b/submodules/Stripe/PublicHeaders/Stripe/STPBlocks.h
similarity index 100%
rename from submodules/Stripe/Sources/STPBlocks.h
rename to submodules/Stripe/PublicHeaders/Stripe/STPBlocks.h
diff --git a/submodules/Stripe/Sources/STPCard.h b/submodules/Stripe/PublicHeaders/Stripe/STPCard.h
similarity index 100%
rename from submodules/Stripe/Sources/STPCard.h
rename to submodules/Stripe/PublicHeaders/Stripe/STPCard.h
diff --git a/submodules/Stripe/Sources/STPCardBrand.h b/submodules/Stripe/PublicHeaders/Stripe/STPCardBrand.h
similarity index 100%
rename from submodules/Stripe/Sources/STPCardBrand.h
rename to submodules/Stripe/PublicHeaders/Stripe/STPCardBrand.h
diff --git a/submodules/Stripe/Sources/STPCardParams.h b/submodules/Stripe/PublicHeaders/Stripe/STPCardParams.h
similarity index 100%
rename from submodules/Stripe/Sources/STPCardParams.h
rename to submodules/Stripe/PublicHeaders/Stripe/STPCardParams.h
diff --git a/submodules/Stripe/Sources/STPCardValidationState.h b/submodules/Stripe/PublicHeaders/Stripe/STPCardValidationState.h
similarity index 100%
rename from submodules/Stripe/Sources/STPCardValidationState.h
rename to submodules/Stripe/PublicHeaders/Stripe/STPCardValidationState.h
diff --git a/submodules/Stripe/Sources/STPCardValidator.h b/submodules/Stripe/PublicHeaders/Stripe/STPCardValidator.h
similarity index 100%
rename from submodules/Stripe/Sources/STPCardValidator.h
rename to submodules/Stripe/PublicHeaders/Stripe/STPCardValidator.h
diff --git a/submodules/Stripe/Sources/STPCustomer.h b/submodules/Stripe/PublicHeaders/Stripe/STPCustomer.h
similarity index 100%
rename from submodules/Stripe/Sources/STPCustomer.h
rename to submodules/Stripe/PublicHeaders/Stripe/STPCustomer.h
diff --git a/submodules/Stripe/Sources/STPFormEncodable.h b/submodules/Stripe/PublicHeaders/Stripe/STPFormEncodable.h
similarity index 100%
rename from submodules/Stripe/Sources/STPFormEncodable.h
rename to submodules/Stripe/PublicHeaders/Stripe/STPFormEncodable.h
diff --git a/submodules/Stripe/Sources/STPPaymentCardTextField.h b/submodules/Stripe/PublicHeaders/Stripe/STPPaymentCardTextField.h
similarity index 100%
rename from submodules/Stripe/Sources/STPPaymentCardTextField.h
rename to submodules/Stripe/PublicHeaders/Stripe/STPPaymentCardTextField.h
diff --git a/submodules/Stripe/Sources/STPPaymentConfiguration.h b/submodules/Stripe/PublicHeaders/Stripe/STPPaymentConfiguration.h
similarity index 100%
rename from submodules/Stripe/Sources/STPPaymentConfiguration.h
rename to submodules/Stripe/PublicHeaders/Stripe/STPPaymentConfiguration.h
diff --git a/submodules/Stripe/Sources/STPPaymentMethod.h b/submodules/Stripe/PublicHeaders/Stripe/STPPaymentMethod.h
similarity index 100%
rename from submodules/Stripe/Sources/STPPaymentMethod.h
rename to submodules/Stripe/PublicHeaders/Stripe/STPPaymentMethod.h
diff --git a/submodules/Stripe/Sources/STPPhoneNumberValidator.h b/submodules/Stripe/PublicHeaders/Stripe/STPPhoneNumberValidator.h
similarity index 100%
rename from submodules/Stripe/Sources/STPPhoneNumberValidator.h
rename to submodules/Stripe/PublicHeaders/Stripe/STPPhoneNumberValidator.h
diff --git a/submodules/Stripe/Sources/STPPostalCodeValidator.h b/submodules/Stripe/PublicHeaders/Stripe/STPPostalCodeValidator.h
similarity index 100%
rename from submodules/Stripe/Sources/STPPostalCodeValidator.h
rename to submodules/Stripe/PublicHeaders/Stripe/STPPostalCodeValidator.h
diff --git a/submodules/Stripe/Sources/STPSource.h b/submodules/Stripe/PublicHeaders/Stripe/STPSource.h
similarity index 100%
rename from submodules/Stripe/Sources/STPSource.h
rename to submodules/Stripe/PublicHeaders/Stripe/STPSource.h
diff --git a/submodules/Stripe/Sources/STPToken.h b/submodules/Stripe/PublicHeaders/Stripe/STPToken.h
similarity index 100%
rename from submodules/Stripe/Sources/STPToken.h
rename to submodules/Stripe/PublicHeaders/Stripe/STPToken.h
diff --git a/submodules/Stripe/Sources/Stripe.h b/submodules/Stripe/PublicHeaders/Stripe/Stripe.h
similarity index 80%
rename from submodules/Stripe/Sources/Stripe.h
rename to submodules/Stripe/PublicHeaders/Stripe/Stripe.h
index 3cac805037..7b2d10cfb4 100644
--- a/submodules/Stripe/Sources/Stripe.h
+++ b/submodules/Stripe/PublicHeaders/Stripe/Stripe.h
@@ -1,11 +1,5 @@
 #import <UIKit/UIKit.h>
 
-//! Project version number for Stripe.
-FOUNDATION_EXPORT double StripeVersionNumber;
-
-//! Project version string for Stripe.
-FOUNDATION_EXPORT const unsigned char StripeVersionString[];
-
 #import <Stripe/STPAddress.h>
 #import <Stripe/STPPaymentCardTextField.h>
 #import <Stripe/STPAPIClient.h>
diff --git a/submodules/Stripe/Sources/StripeError.h b/submodules/Stripe/PublicHeaders/Stripe/StripeError.h
similarity index 100%
rename from submodules/Stripe/Sources/StripeError.h
rename to submodules/Stripe/PublicHeaders/Stripe/StripeError.h
diff --git a/submodules/Sunrise/BUCK b/submodules/Sunrise/BUCK
new file mode 100644
index 0000000000..9c9d4a0fce
--- /dev/null
+++ b/submodules/Sunrise/BUCK
@@ -0,0 +1,19 @@
+load("//Config:buck_rule_macros.bzl", "static_library")
+
+static_library(
+    name = "Sunrise",
+    srcs = glob([
+        "Sources/*.m",
+    ]),
+    headers = glob([
+        "Sources/*.h",
+    ]),
+    exported_headers = glob([
+        "PublicHeaders/**/*.h",
+    ]),
+    deps = [
+    ],
+    frameworks = [
+        "$SDKROOT/System/Library/Frameworks/Foundation.framework",
+    ],
+)
diff --git a/submodules/Sunrise/BUILD b/submodules/Sunrise/BUILD
new file mode 100644
index 0000000000..97779bda4e
--- /dev/null
+++ b/submodules/Sunrise/BUILD
@@ -0,0 +1,21 @@
+
+objc_library(
+    name = "Sunrise",
+    enable_modules = True,
+    module_name = "Sunrise",
+    srcs = glob([
+        "Sources/*.m",
+    ]),
+    hdrs = glob([
+        "PublicHeaders/**/*.h",
+    ]),
+    includes = [
+        "PublicHeaders",
+    ],
+    sdk_frameworks = [
+      "Foundation",
+    ],
+    visibility = [
+        "//visibility:public",
+    ],
+)
diff --git a/submodules/TelegramPresentationData/Sources/EDSunriseSet.h b/submodules/Sunrise/PublicHeaders/Sunrise/EDSunriseSet.h
similarity index 100%
rename from submodules/TelegramPresentationData/Sources/EDSunriseSet.h
rename to submodules/Sunrise/PublicHeaders/Sunrise/EDSunriseSet.h
diff --git a/submodules/TelegramPresentationData/Sources/EDSunriseSet.m b/submodules/Sunrise/Sources/EDSunriseSet.m
similarity index 99%
rename from submodules/TelegramPresentationData/Sources/EDSunriseSet.m
rename to submodules/Sunrise/Sources/EDSunriseSet.m
index 27b4632e0e..7837faa62b 100755
--- a/submodules/TelegramPresentationData/Sources/EDSunriseSet.m
+++ b/submodules/Sunrise/Sources/EDSunriseSet.m
@@ -16,7 +16,7 @@
 //  Released to the public domain by Paul Schlyter, December 1992
 //
 
-#import "EDSunriseSet.h"
+#import <Sunrise/EDSunriseSet.h>
 
 //
 // Defines from sunriset.c
diff --git a/submodules/Svg/BUCK b/submodules/Svg/BUCK
index f8b2a7b112..a3a62ebc99 100644
--- a/submodules/Svg/BUCK
+++ b/submodules/Svg/BUCK
@@ -11,7 +11,7 @@ static_library(
     headers = glob([
         "Sources/**/*.h",
     ]),
-    exported_headers = [
-        "Sources/Svg.h",
-    ],
+    exported_headers = glob([
+        "PublicHeaders/**/*.h",
+    ]),
 )
diff --git a/submodules/Svg/BUILD b/submodules/Svg/BUILD
new file mode 100644
index 0000000000..eba76650f4
--- /dev/null
+++ b/submodules/Svg/BUILD
@@ -0,0 +1,23 @@
+
+objc_library(
+    name = "Svg",
+    enable_modules = True,
+    module_name = "Svg",
+    srcs = glob([
+        "Sources/**/*.m",
+        "Sources/**/*.c",
+        "Sources/**/*.h",
+    ]),
+    hdrs = glob([
+        "PublicHeaders/**/*.h",
+    ]),
+    includes = [
+        "PublicHeaders",
+    ],
+    sdk_frameworks = [
+        "Foundation",
+    ],
+    visibility = [
+        "//visibility:public",
+    ],
+)
diff --git a/submodules/Svg/Sources/Svg.h b/submodules/Svg/PublicHeaders/Svg/Svg.h
similarity index 100%
rename from submodules/Svg/Sources/Svg.h
rename to submodules/Svg/PublicHeaders/Svg/Svg.h
diff --git a/submodules/Svg/Sources/Svg.m b/submodules/Svg/Sources/Svg.m
index def1d2b873..099cb481f0 100755
--- a/submodules/Svg/Sources/Svg.m
+++ b/submodules/Svg/Sources/Svg.m
@@ -1,4 +1,4 @@
-#import "Svg.h"
+#import <Svg/Svg.h>
 
 #import "nanosvg.h"
 
diff --git a/submodules/SwipeToDismissGesture/BUILD b/submodules/SwipeToDismissGesture/BUILD
new file mode 100644
index 0000000000..0e224570ac
--- /dev/null
+++ b/submodules/SwipeToDismissGesture/BUILD
@@ -0,0 +1,12 @@
+load("@build_bazel_rules_swift//swift:swift.bzl", "swift_library")
+
+swift_library(
+    name = "SwipeToDismissGesture",
+    module_name = "SwipeToDismissGesture",
+    srcs = glob([
+        "Sources/**/*.swift",
+    ]),
+    visibility = [
+        "//visibility:public",
+    ],
+)
diff --git a/submodules/SwipeToDismissGesture/Info.plist b/submodules/SwipeToDismissGesture/Info.plist
deleted file mode 100644
index e1fe4cfb7b..0000000000
--- a/submodules/SwipeToDismissGesture/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/SwipeToDismissGesture/Sources/SwipeToDismissGesture.h b/submodules/SwipeToDismissGesture/Sources/SwipeToDismissGesture.h
deleted file mode 100644
index e92fba7d78..0000000000
--- a/submodules/SwipeToDismissGesture/Sources/SwipeToDismissGesture.h
+++ /dev/null
@@ -1,19 +0,0 @@
-//
-//  SwipeToDismissGesture.h
-//  SwipeToDismissGesture
-//
-//  Created by Peter on 8/10/19.
-//  Copyright © 2019 Telegram Messenger LLP. All rights reserved.
-//
-
-#import <UIKit/UIKit.h>
-
-//! Project version number for SwipeToDismissGesture.
-FOUNDATION_EXPORT double SwipeToDismissGestureVersionNumber;
-
-//! Project version string for SwipeToDismissGesture.
-FOUNDATION_EXPORT const unsigned char SwipeToDismissGestureVersionString[];
-
-// In this header, you should import all the public headers of your framework using statements like #import <SwipeToDismissGesture/PublicHeader.h>
-
-
diff --git a/submodules/SwitchNode/BUCK b/submodules/SwitchNode/BUCK
index b23f2eee34..bf28484904 100644
--- a/submodules/SwitchNode/BUCK
+++ b/submodules/SwitchNode/BUCK
@@ -4,14 +4,7 @@ static_library(
     name = "SwitchNode",
     srcs = glob([
         "Sources/**/*.swift",
-        "Sources/*.m",
     ]),
-    headers = glob([
-        "Sources/*.h",
-    ], exclude = ["Sources/TelegramPresentationData.h"]),
-    exported_headers = glob([
-        "Sources/*.h",
-    ], exclude = ["Sources/TelegramPresentationData.h"]),
     deps = [
     	"//submodules/AsyncDisplayKit:AsyncDisplayKit#shared",
 	    "//submodules/Display:Display#shared",
diff --git a/submodules/SwitchNode/BUILD b/submodules/SwitchNode/BUILD
new file mode 100644
index 0000000000..6df0d8776a
--- /dev/null
+++ b/submodules/SwitchNode/BUILD
@@ -0,0 +1,17 @@
+load("@build_bazel_rules_swift//swift:swift.bzl", "swift_library")
+
+swift_library(
+    name = "SwitchNode",
+    module_name = "SwitchNode",
+    srcs = glob([
+        "Sources/**/*.swift",
+    ]),
+    deps = [
+    	"//submodules/AsyncDisplayKit:AsyncDisplayKit",
+	    "//submodules/Display:Display",
+        "//submodules/LegacyComponents:LegacyComponents",
+    ],
+    visibility = [
+        "//visibility:public",
+    ],
+)
diff --git a/submodules/SwitchNode/Info.plist b/submodules/SwitchNode/Info.plist
deleted file mode 100644
index e1fe4cfb7b..0000000000
--- a/submodules/SwitchNode/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/SwitchNode/Sources/SwitchNode.h b/submodules/SwitchNode/Sources/SwitchNode.h
deleted file mode 100644
index 0931e49023..0000000000
--- a/submodules/SwitchNode/Sources/SwitchNode.h
+++ /dev/null
@@ -1,19 +0,0 @@
-//
-//  SwitchNode.h
-//  SwitchNode
-//
-//  Created by Peter on 8/1/19.
-//  Copyright © 2019 Telegram Messenger LLP. All rights reserved.
-//
-
-#import <UIKit/UIKit.h>
-
-//! Project version number for SwitchNode.
-FOUNDATION_EXPORT double SwitchNodeVersionNumber;
-
-//! Project version string for SwitchNode.
-FOUNDATION_EXPORT const unsigned char SwitchNodeVersionString[];
-
-// In this header, you should import all the public headers of your framework using statements like #import <SwitchNode/PublicHeader.h>
-
-
diff --git a/submodules/SyncCore/BUILD b/submodules/SyncCore/BUILD
new file mode 100644
index 0000000000..a157f44704
--- /dev/null
+++ b/submodules/SyncCore/BUILD
@@ -0,0 +1,16 @@
+load("@build_bazel_rules_swift//swift:swift.bzl", "swift_library")
+
+swift_library(
+    name = "SyncCore",
+    module_name = "SyncCore",
+    srcs = glob([
+        "Sources/**/*.swift",
+    ]),
+    deps = [
+        "//submodules/SSignalKit/SwiftSignalKit:SwiftSignalKit",
+        "//submodules/Postbox:Postbox",
+    ],
+    visibility = [
+        "//visibility:public",
+    ],
+)
diff --git a/submodules/SyncCore/Sources/AccountBackupDataAttribute.swift b/submodules/SyncCore/Sources/AccountBackupDataAttribute.swift
index 339147a1d3..e2c90facfa 100644
--- a/submodules/SyncCore/Sources/AccountBackupDataAttribute.swift
+++ b/submodules/SyncCore/Sources/AccountBackupDataAttribute.swift
@@ -1,3 +1,4 @@
+import Foundation
 import Postbox
 
 public struct AccountBackupData: Codable, Equatable {
diff --git a/submodules/SyncCore/Sources/CachedResolvedByNamePeer.swift b/submodules/SyncCore/Sources/CachedResolvedByNamePeer.swift
index b0946c5611..cc358b3c1e 100644
--- a/submodules/SyncCore/Sources/CachedResolvedByNamePeer.swift
+++ b/submodules/SyncCore/Sources/CachedResolvedByNamePeer.swift
@@ -1,3 +1,4 @@
+import Foundation
 import Postbox
 
 public final class CachedResolvedByNamePeer: PostboxCoding {
diff --git a/submodules/SyncCore/Sources/CachedSecureIdConfiguration.swift b/submodules/SyncCore/Sources/CachedSecureIdConfiguration.swift
index e93cf426f2..8d8200bfb9 100644
--- a/submodules/SyncCore/Sources/CachedSecureIdConfiguration.swift
+++ b/submodules/SyncCore/Sources/CachedSecureIdConfiguration.swift
@@ -1,3 +1,4 @@
+import Foundation
 import Postbox
 
 public struct SecureIdConfiguration: PostboxCoding {
diff --git a/submodules/SyncCore/Sources/CloudFileMediaResource.swift b/submodules/SyncCore/Sources/CloudFileMediaResource.swift
index 675c85f58a..6b593e5aa8 100644
--- a/submodules/SyncCore/Sources/CloudFileMediaResource.swift
+++ b/submodules/SyncCore/Sources/CloudFileMediaResource.swift
@@ -1,3 +1,4 @@
+import Foundation
 import Postbox
 
 public struct CloudFileMediaResourceId: MediaResourceId {
diff --git a/submodules/SyncCore/Sources/Namespaces.swift b/submodules/SyncCore/Sources/Namespaces.swift
index 7b384619c8..514197c0e8 100644
--- a/submodules/SyncCore/Sources/Namespaces.swift
+++ b/submodules/SyncCore/Sources/Namespaces.swift
@@ -138,6 +138,7 @@ public struct OperationLogTags {
     public static let SynchronizeRecentlyUsedStickers = PeerOperationLogTag(value: 17)
     public static let SynchronizeAppLogEvents = PeerOperationLogTag(value: 18)
     public static let SynchronizeEmojiKeywords = PeerOperationLogTag(value: 19)
+    public static let SynchronizeChatListFilters = PeerOperationLogTag(value: 20)
 }
 
 public struct LegacyPeerSummaryCounterTags: OptionSet, Sequence, Hashable {
@@ -172,12 +173,19 @@ public struct LegacyPeerSummaryCounterTags: OptionSet, Sequence, Hashable {
 }
 
 public extension PeerSummaryCounterTags {
-    static let privateChat = PeerSummaryCounterTags(rawValue: 1 << 3)
-    static let secretChat = PeerSummaryCounterTags(rawValue: 1 << 4)
-    static let privateGroup = PeerSummaryCounterTags(rawValue: 1 << 5)
-    static let bot = PeerSummaryCounterTags(rawValue: 1 << 6)
-    static let channel = PeerSummaryCounterTags(rawValue: 1 << 7)
-    static let publicGroup = PeerSummaryCounterTags(rawValue: 1 << 8)
+    static let contact = PeerSummaryCounterTags(rawValue: 1 << 3)
+    static let nonContact = PeerSummaryCounterTags(rawValue: 1 << 4)
+    static let group = PeerSummaryCounterTags(rawValue: 1 << 5)
+    static let bot = PeerSummaryCounterTags(rawValue: 1 << 7)
+    static let channel = PeerSummaryCounterTags(rawValue: 1 << 8)
+    
+    static let all: PeerSummaryCounterTags = [
+        .contact,
+        .nonContact,
+        .group,
+        .bot,
+        .channel
+    ]
 }
 
 private enum PreferencesKeyValues: Int32 {
@@ -199,6 +207,7 @@ private enum PreferencesKeyValues: Int32 {
     case contentSettings = 19
     case chatListFilters = 20
     case peersNearby = 21
+    case chatListFiltersFeaturedState = 22
 }
 
 public func applicationSpecificPreferencesKey(_ value: Int32) -> ValueBoxKey {
@@ -321,6 +330,12 @@ public struct PreferencesKeys {
         key.setInt32(0, value: PreferencesKeyValues.peersNearby.rawValue)
         return key
     }()
+    
+    public static let chatListFiltersFeaturedState: ValueBoxKey = {
+        let key = ValueBoxKey(length: 4)
+        key.setInt32(0, value: PreferencesKeyValues.chatListFiltersFeaturedState.rawValue)
+        return key
+    }()
 }
 
 private enum SharedDataKeyValues: Int32 {
diff --git a/submodules/SyncCore/Sources/ProxySettings.swift b/submodules/SyncCore/Sources/ProxySettings.swift
index 6655cad742..468875d45d 100644
--- a/submodules/SyncCore/Sources/ProxySettings.swift
+++ b/submodules/SyncCore/Sources/ProxySettings.swift
@@ -1,3 +1,4 @@
+import Foundation
 import Postbox
 
 public enum ProxyServerConnection: Equatable, Hashable, PostboxCoding {
diff --git a/submodules/SyncCore/Sources/SecretChatOutgoingOperation.swift b/submodules/SyncCore/Sources/SecretChatOutgoingOperation.swift
index 28d3616e32..208617047d 100644
--- a/submodules/SyncCore/Sources/SecretChatOutgoingOperation.swift
+++ b/submodules/SyncCore/Sources/SecretChatOutgoingOperation.swift
@@ -1,3 +1,4 @@
+import Foundation
 import Postbox
 
 private enum SecretChatOutgoingFileValue: Int32 {
diff --git a/submodules/SyncCore/Sources/SecretFileEncryptionKey.swift b/submodules/SyncCore/Sources/SecretFileEncryptionKey.swift
index dfc417237a..5fb17a35f1 100644
--- a/submodules/SyncCore/Sources/SecretFileEncryptionKey.swift
+++ b/submodules/SyncCore/Sources/SecretFileEncryptionKey.swift
@@ -1,3 +1,4 @@
+import Foundation
 import Postbox
 
 public final class SecretFileEncryptionKey: PostboxCoding, Equatable {
diff --git a/submodules/SyncCore/Sources/SecureFileMediaResource.swift b/submodules/SyncCore/Sources/SecureFileMediaResource.swift
index 2c135dfb4b..b55fcbab4d 100644
--- a/submodules/SyncCore/Sources/SecureFileMediaResource.swift
+++ b/submodules/SyncCore/Sources/SecureFileMediaResource.swift
@@ -1,3 +1,4 @@
+import Foundation
 import Postbox
 
 public struct SecureFileMediaResourceId: MediaResourceId {
diff --git a/submodules/SyncCore/Sources/SecureIdFileReference.swift b/submodules/SyncCore/Sources/SecureIdFileReference.swift
index 7ae84288ce..6a8d4a4791 100644
--- a/submodules/SyncCore/Sources/SecureIdFileReference.swift
+++ b/submodules/SyncCore/Sources/SecureIdFileReference.swift
@@ -1,3 +1,4 @@
+import Foundation
 import Postbox
 
 public struct SecureIdFileReference: Equatable {
diff --git a/submodules/SyncCore/Sources/StandaloneAccountTransaction.swift b/submodules/SyncCore/Sources/StandaloneAccountTransaction.swift
index 443881967e..fee9097baa 100644
--- a/submodules/SyncCore/Sources/StandaloneAccountTransaction.swift
+++ b/submodules/SyncCore/Sources/StandaloneAccountTransaction.swift
@@ -18,31 +18,33 @@ public let telegramPostboxSeedConfiguration: SeedConfiguration = {
         globalMessageIdsPeerIdNamespaces.insert(GlobalMessageIdsNamespace(peerIdNamespace: peerIdNamespace, messageIdNamespace: Namespaces.Message.Cloud))
     }
     
-    return SeedConfiguration(globalMessageIdsPeerIdNamespaces: globalMessageIdsPeerIdNamespaces, initializeChatListWithHole: (topLevel: ChatListHole(index: MessageIndex(id: MessageId(peerId: PeerId(namespace: Namespaces.Peer.Empty, id: 0), namespace: Namespaces.Message.Cloud, id: 1), timestamp: Int32.max - 1)), groups: ChatListHole(index: MessageIndex(id: MessageId(peerId: PeerId(namespace: Namespaces.Peer.Empty, id: 0), namespace: Namespaces.Message.Cloud, id: 1), timestamp: Int32.max - 1))), messageHoles: messageHoles, existingMessageTags: MessageTags.all, messageTagsWithSummary: MessageTags.unseenPersonalMessage, existingGlobalMessageTags: GlobalMessageTags.all, peerNamespacesRequiringMessageTextIndex: [Namespaces.Peer.SecretChat], peerSummaryCounterTags: { peer in
+    return SeedConfiguration(globalMessageIdsPeerIdNamespaces: globalMessageIdsPeerIdNamespaces, initializeChatListWithHole: (topLevel: ChatListHole(index: MessageIndex(id: MessageId(peerId: PeerId(namespace: Namespaces.Peer.Empty, id: 0), namespace: Namespaces.Message.Cloud, id: 1), timestamp: Int32.max - 1)), groups: ChatListHole(index: MessageIndex(id: MessageId(peerId: PeerId(namespace: Namespaces.Peer.Empty, id: 0), namespace: Namespaces.Message.Cloud, id: 1), timestamp: Int32.max - 1))), messageHoles: messageHoles, existingMessageTags: MessageTags.all, messageTagsWithSummary: MessageTags.unseenPersonalMessage, existingGlobalMessageTags: GlobalMessageTags.all, peerNamespacesRequiringMessageTextIndex: [Namespaces.Peer.SecretChat], peerSummaryCounterTags: { peer, isContact in
         if let peer = peer as? TelegramUser {
             if peer.botInfo != nil {
                 return .bot
+            } else if isContact {
+                return .contact
             } else {
-                return .privateChat
+                return .nonContact
             }
         } else if let _ = peer as? TelegramGroup {
-            return .privateGroup
+            return .group
         } else if let _ = peer as? TelegramSecretChat {
-            return .secretChat
+            return .nonContact
         } else if let channel = peer as? TelegramChannel {
             switch channel.info {
             case .broadcast:
                 return .channel
             case .group:
                 if channel.username != nil {
-                    return .publicGroup
+                    return .group
                 } else {
-                    return .privateGroup
+                    return .group
                 }
             }
         } else {
             assertionFailure()
-            return .privateChat
+            return .nonContact
         }
     }, additionalChatListIndexNamespace: Namespaces.Message.Cloud, messageNamespacesRequiringGroupStatsValidation: [Namespaces.Message.Cloud], defaultMessageNamespaceReadStates: [Namespaces.Message.Local: .idBased(maxIncomingReadId: 0, maxOutgoingReadId: 0, maxKnownId: 0, count: 0, markedUnread: false)], chatMessagesNamespaces: Set([Namespaces.Message.Cloud, Namespaces.Message.Local, Namespaces.Message.SecretIncoming]))
 }()
diff --git a/submodules/SyncCore/Sources/TelegramMediaFile.swift b/submodules/SyncCore/Sources/TelegramMediaFile.swift
index 072ae24ca0..0283239a5c 100644
--- a/submodules/SyncCore/Sources/TelegramMediaFile.swift
+++ b/submodules/SyncCore/Sources/TelegramMediaFile.swift
@@ -1,3 +1,4 @@
+import Foundation
 import Postbox
 
 private let typeFileName: Int32 = 0
diff --git a/submodules/SyncCore/Sources/TelegramMediaImage.swift b/submodules/SyncCore/Sources/TelegramMediaImage.swift
index 2717009705..cfdef02627 100644
--- a/submodules/SyncCore/Sources/TelegramMediaImage.swift
+++ b/submodules/SyncCore/Sources/TelegramMediaImage.swift
@@ -1,3 +1,4 @@
+import Foundation
 import Postbox
 
 public enum TelegramMediaImageReference: PostboxCoding, Equatable {
diff --git a/submodules/SyncCore/Sources/TelegramMediaPoll.swift b/submodules/SyncCore/Sources/TelegramMediaPoll.swift
index f01ba73c87..3fb4336fa1 100644
--- a/submodules/SyncCore/Sources/TelegramMediaPoll.swift
+++ b/submodules/SyncCore/Sources/TelegramMediaPoll.swift
@@ -1,3 +1,4 @@
+import Foundation
 import Postbox
 
 public struct TelegramMediaPollOption: Equatable, PostboxCoding {
diff --git a/submodules/SyncCore/Sources/TemporaryTwoStepPasswordToken.swift b/submodules/SyncCore/Sources/TemporaryTwoStepPasswordToken.swift
index 00ddcd8b3b..81d327eff3 100644
--- a/submodules/SyncCore/Sources/TemporaryTwoStepPasswordToken.swift
+++ b/submodules/SyncCore/Sources/TemporaryTwoStepPasswordToken.swift
@@ -1,3 +1,4 @@
+import Foundation
 import Postbox
 
 public struct TemporaryTwoStepPasswordToken: PostboxCoding, Equatable {
diff --git a/submodules/SyncCore/Sources/WalletCollection.swift b/submodules/SyncCore/Sources/WalletCollection.swift
index 1a01954871..acfe00e3c2 100644
--- a/submodules/SyncCore/Sources/WalletCollection.swift
+++ b/submodules/SyncCore/Sources/WalletCollection.swift
@@ -1,3 +1,4 @@
+import Foundation
 import Postbox
 
 public struct WalletCollectionItem: Equatable, PostboxCoding {
diff --git a/submodules/TelegramAnimatedStickerNode/BUILD b/submodules/TelegramAnimatedStickerNode/BUILD
new file mode 100644
index 0000000000..0049c24af9
--- /dev/null
+++ b/submodules/TelegramAnimatedStickerNode/BUILD
@@ -0,0 +1,24 @@
+load("@build_bazel_rules_swift//swift:swift.bzl", "swift_library")
+
+swift_library(
+    name = "TelegramAnimatedStickerNode",
+    module_name = "TelegramAnimatedStickerNode",
+    srcs = glob([
+        "Sources/**/*.swift",
+    ]),
+    deps = [
+    	"//submodules/Postbox:Postbox",
+        "//submodules/TelegramCore:TelegramCore",
+        "//submodules/SyncCore:SyncCore",
+        "//submodules/StickerResources:StickerResources",
+        "//submodules/MediaResources:MediaResources",
+        "//submodules/Tuples:Tuples",
+        "//submodules/AnimatedStickerNode:AnimatedStickerNode",
+        "//submodules/rlottie:RLottieBinding",
+        "//submodules/YuvConversion:YuvConversion",
+        "//submodules/GZip:GZip",
+    ],
+    visibility = [
+        "//visibility:public",
+    ],
+)
diff --git a/submodules/TelegramApi/BUILD b/submodules/TelegramApi/BUILD
new file mode 100644
index 0000000000..3d90026e09
--- /dev/null
+++ b/submodules/TelegramApi/BUILD
@@ -0,0 +1,12 @@
+load("@build_bazel_rules_swift//swift:swift.bzl", "swift_library")
+
+swift_library(
+    name = "TelegramApi",
+    module_name = "TelegramApi",
+    srcs = glob([
+        "Sources/**/*.swift",
+    ]),
+    visibility = [
+        "//visibility:public",
+    ],
+)
diff --git a/submodules/TelegramApi/Sources/Api0.swift b/submodules/TelegramApi/Sources/Api0.swift
index 6f4aa318a7..292de4c686 100644
--- a/submodules/TelegramApi/Sources/Api0.swift
+++ b/submodules/TelegramApi/Sources/Api0.swift
@@ -338,6 +338,7 @@ fileprivate let parsers: [Int32 : (BufferReader) -> Any?] = {
     dict[-353862078] = { return Api.contacts.Contacts.parse_contacts($0) }
     dict[-1798033689] = { return Api.ChannelMessagesFilter.parse_channelMessagesFilterEmpty($0) }
     dict[-847783593] = { return Api.ChannelMessagesFilter.parse_channelMessagesFilter($0) }
+    dict[2004110666] = { return Api.DialogFilterSuggested.parse_dialogFilterSuggested($0) }
     dict[326715557] = { return Api.auth.PasswordRecovery.parse_passwordRecovery($0) }
     dict[-1803769784] = { return Api.messages.BotResults.parse_botResults($0) }
     dict[1928391342] = { return Api.InputDocument.parse_inputDocumentEmpty($0) }
@@ -604,7 +605,7 @@ fileprivate let parsers: [Int32 : (BufferReader) -> Any?] = {
     dict[-1551583367] = { return Api.ReceivedNotifyMessage.parse_receivedNotifyMessage($0) }
     dict[-57668565] = { return Api.ChatParticipants.parse_chatParticipantsForbidden($0) }
     dict[1061556205] = { return Api.ChatParticipants.parse_chatParticipants($0) }
-    dict[351868460] = { return Api.DialogFilter.parse_dialogFilter($0) }
+    dict[1687327098] = { return Api.DialogFilter.parse_dialogFilter($0) }
     dict[-1056001329] = { return Api.InputPaymentCredentials.parse_inputPaymentCredentialsSaved($0) }
     dict[873977640] = { return Api.InputPaymentCredentials.parse_inputPaymentCredentials($0) }
     dict[178373535] = { return Api.InputPaymentCredentials.parse_inputPaymentCredentialsApplePay($0) }
@@ -1052,6 +1053,8 @@ public struct Api {
                 _1.serialize(buffer, boxed)
             case let _1 as Api.ChannelMessagesFilter:
                 _1.serialize(buffer, boxed)
+            case let _1 as Api.DialogFilterSuggested:
+                _1.serialize(buffer, boxed)
             case let _1 as Api.auth.PasswordRecovery:
                 _1.serialize(buffer, boxed)
             case let _1 as Api.messages.BotResults:
diff --git a/submodules/TelegramApi/Sources/Api1.swift b/submodules/TelegramApi/Sources/Api1.swift
index 1243d2e7d0..0db24199bf 100644
--- a/submodules/TelegramApi/Sources/Api1.swift
+++ b/submodules/TelegramApi/Sources/Api1.swift
@@ -10298,6 +10298,46 @@ public extension Api {
             }
         }
     
+    }
+    public enum DialogFilterSuggested: TypeConstructorDescription {
+        case dialogFilterSuggested(filter: Api.DialogFilter, description: String)
+    
+    public func serialize(_ buffer: Buffer, _ boxed: Swift.Bool) {
+    switch self {
+                case .dialogFilterSuggested(let filter, let description):
+                    if boxed {
+                        buffer.appendInt32(2004110666)
+                    }
+                    filter.serialize(buffer, true)
+                    serializeString(description, buffer: buffer, boxed: false)
+                    break
+    }
+    }
+    
+    public func descriptionFields() -> (String, [(String, Any)]) {
+        switch self {
+                case .dialogFilterSuggested(let filter, let description):
+                return ("dialogFilterSuggested", [("filter", filter), ("description", description)])
+    }
+    }
+    
+        public static func parse_dialogFilterSuggested(_ reader: BufferReader) -> DialogFilterSuggested? {
+            var _1: Api.DialogFilter?
+            if let signature = reader.readInt32() {
+                _1 = Api.parse(reader, signature: signature) as? Api.DialogFilter
+            }
+            var _2: String?
+            _2 = parseString(reader)
+            let _c1 = _1 != nil
+            let _c2 = _2 != nil
+            if _c1 && _c2 {
+                return Api.DialogFilterSuggested.dialogFilterSuggested(filter: _1!, description: _2!)
+            }
+            else {
+                return nil
+            }
+        }
+    
     }
     public enum InputDocument: TypeConstructorDescription {
         case inputDocumentEmpty
@@ -17236,13 +17276,13 @@ public extension Api {
     
     }
     public enum DialogFilter: TypeConstructorDescription {
-        case dialogFilter(flags: Int32, id: Int32, title: String, includePeers: [Api.InputPeer])
+        case dialogFilter(flags: Int32, id: Int32, title: String, includePeers: [Api.InputPeer], excludePeers: [Api.InputPeer])
     
     public func serialize(_ buffer: Buffer, _ boxed: Swift.Bool) {
     switch self {
-                case .dialogFilter(let flags, let id, let title, let includePeers):
+                case .dialogFilter(let flags, let id, let title, let includePeers, let excludePeers):
                     if boxed {
-                        buffer.appendInt32(351868460)
+                        buffer.appendInt32(1687327098)
                     }
                     serializeInt32(flags, buffer: buffer, boxed: false)
                     serializeInt32(id, buffer: buffer, boxed: false)
@@ -17252,14 +17292,19 @@ public extension Api {
                     for item in includePeers {
                         item.serialize(buffer, true)
                     }
+                    buffer.appendInt32(481674261)
+                    buffer.appendInt32(Int32(excludePeers.count))
+                    for item in excludePeers {
+                        item.serialize(buffer, true)
+                    }
                     break
     }
     }
     
     public func descriptionFields() -> (String, [(String, Any)]) {
         switch self {
-                case .dialogFilter(let flags, let id, let title, let includePeers):
-                return ("dialogFilter", [("flags", flags), ("id", id), ("title", title), ("includePeers", includePeers)])
+                case .dialogFilter(let flags, let id, let title, let includePeers, let excludePeers):
+                return ("dialogFilter", [("flags", flags), ("id", id), ("title", title), ("includePeers", includePeers), ("excludePeers", excludePeers)])
     }
     }
     
@@ -17274,12 +17319,17 @@ public extension Api {
             if let _ = reader.readInt32() {
                 _4 = Api.parseVector(reader, elementSignature: 0, elementType: Api.InputPeer.self)
             }
+            var _5: [Api.InputPeer]?
+            if let _ = reader.readInt32() {
+                _5 = Api.parseVector(reader, elementSignature: 0, elementType: Api.InputPeer.self)
+            }
             let _c1 = _1 != nil
             let _c2 = _2 != nil
             let _c3 = _3 != nil
             let _c4 = _4 != nil
-            if _c1 && _c2 && _c3 && _c4 {
-                return Api.DialogFilter.dialogFilter(flags: _1!, id: _2!, title: _3!, includePeers: _4!)
+            let _c5 = _5 != nil
+            if _c1 && _c2 && _c3 && _c4 && _c5 {
+                return Api.DialogFilter.dialogFilter(flags: _1!, id: _2!, title: _3!, includePeers: _4!, excludePeers: _5!)
             }
             else {
                 return nil
diff --git a/submodules/TelegramApi/Sources/Api3.swift b/submodules/TelegramApi/Sources/Api3.swift
index 6d8b391c5a..30bf7812e2 100644
--- a/submodules/TelegramApi/Sources/Api3.swift
+++ b/submodules/TelegramApi/Sources/Api3.swift
@@ -3229,6 +3229,20 @@ public extension Api {
                     })
                 }
             
+                public static func getSuggestedDialogFilters() -> (FunctionDescription, Buffer, DeserializeFunctionResponse<[Api.DialogFilterSuggested]>) {
+                    let buffer = Buffer()
+                    buffer.appendInt32(-1566780372)
+                    
+                    return (FunctionDescription(name: "messages.getSuggestedDialogFilters", parameters: []), buffer, DeserializeFunctionResponse { (buffer: Buffer) -> [Api.DialogFilterSuggested]? in
+                        let reader = BufferReader(buffer)
+                        var result: [Api.DialogFilterSuggested]?
+                        if let _ = reader.readInt32() {
+                            result = Api.parseVector(reader, elementSignature: 0, elementType: Api.DialogFilterSuggested.self)
+                        }
+                        return result
+                    })
+                }
+            
                 public static func updateDialogFilter(flags: Int32, id: Int32, filter: Api.DialogFilter?) -> (FunctionDescription, Buffer, DeserializeFunctionResponse<Api.Bool>) {
                     let buffer = Buffer()
                     buffer.appendInt32(450142282)
diff --git a/submodules/TelegramAudio/BUILD b/submodules/TelegramAudio/BUILD
new file mode 100644
index 0000000000..8273a42b1d
--- /dev/null
+++ b/submodules/TelegramAudio/BUILD
@@ -0,0 +1,15 @@
+load("@build_bazel_rules_swift//swift:swift.bzl", "swift_library")
+
+swift_library(
+    name = "TelegramAudio",
+    module_name = "TelegramAudio",
+    srcs = glob([
+        "Sources/**/*.swift",
+    ]),
+    deps = [
+        "//submodules/SSignalKit/SwiftSignalKit:SwiftSignalKit",
+    ],
+    visibility = [
+        "//visibility:public",
+    ],
+)
diff --git a/submodules/TelegramAudio/Info.plist b/submodules/TelegramAudio/Info.plist
deleted file mode 100644
index e1fe4cfb7b..0000000000
--- a/submodules/TelegramAudio/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/TelegramAudio/Sources/TelegramAudio.h b/submodules/TelegramAudio/Sources/TelegramAudio.h
deleted file mode 100644
index 3a4f973417..0000000000
--- a/submodules/TelegramAudio/Sources/TelegramAudio.h
+++ /dev/null
@@ -1,8 +0,0 @@
-#import <UIKit/UIKit.h>
-
-//! Project version number for TelegramAudio.
-FOUNDATION_EXPORT double TelegramAudioVersionNumber;
-
-//! Project version string for TelegramAudio.
-FOUNDATION_EXPORT const unsigned char TelegramAudioVersionString[];
-
diff --git a/submodules/TelegramBaseController/BUILD b/submodules/TelegramBaseController/BUILD
new file mode 100644
index 0000000000..db407be8c9
--- /dev/null
+++ b/submodules/TelegramBaseController/BUILD
@@ -0,0 +1,28 @@
+load("@build_bazel_rules_swift//swift:swift.bzl", "swift_library")
+
+swift_library(
+    name = "TelegramBaseController",
+    module_name = "TelegramBaseController",
+    srcs = glob([
+        "Sources/**/*.swift",
+    ]),
+    deps = [
+    	"//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",
+        "//submodules/AccountContext:AccountContext",
+        "//submodules/LegacyComponents:LegacyComponents",
+        "//submodules/OverlayStatusController:OverlayStatusController",
+        "//submodules/PresentationDataUtils:PresentationDataUtils",
+        "//submodules/Markdown:Markdown",
+    ],
+    visibility = [
+        "//visibility:public",
+    ],
+)
diff --git a/submodules/TelegramBaseController/Info.plist b/submodules/TelegramBaseController/Info.plist
deleted file mode 100644
index e1fe4cfb7b..0000000000
--- a/submodules/TelegramBaseController/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/TelegramBaseController/Sources/TelegramBaseController.h b/submodules/TelegramBaseController/Sources/TelegramBaseController.h
deleted file mode 100644
index cc52b070ec..0000000000
--- a/submodules/TelegramBaseController/Sources/TelegramBaseController.h
+++ /dev/null
@@ -1,19 +0,0 @@
-//
-//  TelegramBaseController.h
-//  TelegramBaseController
-//
-//  Created by Peter on 8/3/19.
-//  Copyright © 2019 Telegram Messenger LLP. All rights reserved.
-//
-
-#import <UIKit/UIKit.h>
-
-//! Project version number for TelegramBaseController.
-FOUNDATION_EXPORT double TelegramBaseControllerVersionNumber;
-
-//! Project version string for TelegramBaseController.
-FOUNDATION_EXPORT const unsigned char TelegramBaseControllerVersionString[];
-
-// In this header, you should import all the public headers of your framework using statements like #import <TelegramBaseController/PublicHeader.h>
-
-
diff --git a/submodules/TelegramCallsUI/BUCK b/submodules/TelegramCallsUI/BUCK
index c9b6ee2eb8..afd94c2abb 100644
--- a/submodules/TelegramCallsUI/BUCK
+++ b/submodules/TelegramCallsUI/BUCK
@@ -4,14 +4,7 @@ static_library(
     name = "TelegramCallsUI",
     srcs = glob([
         "Sources/**/*.swift",
-        "Sources/**/*.m",
     ]),
-    headers = glob([
-        "Sources/**/*.h",
-    ], exclude = ["Sources/TelegramCallsUI.h"]),
-    exported_headers = glob([
-        "Sources/**/*.h",
-    ], exclude = ["Sources/TelegramCallsUI.h"]),
     deps = [
         "//submodules/SSignalKit/SwiftSignalKit:SwiftSignalKit#shared",
 	    "//submodules/Display:Display#shared",
@@ -27,6 +20,7 @@ static_library(
         "//submodules/OverlayStatusController:OverlayStatusController",
         "//submodules/AppBundle:AppBundle",
         "//submodules/PresentationDataUtils:PresentationDataUtils",
+        "//submodules/TelegramCallsUI/CallsEmoji:CallsEmoji",
     ],
     frameworks = [
         "$SDKROOT/System/Library/Frameworks/Foundation.framework",
diff --git a/submodules/TelegramCallsUI/BUILD b/submodules/TelegramCallsUI/BUILD
new file mode 100644
index 0000000000..fd4fdc9f2f
--- /dev/null
+++ b/submodules/TelegramCallsUI/BUILD
@@ -0,0 +1,29 @@
+load("@build_bazel_rules_swift//swift:swift.bzl", "swift_library")
+
+swift_library(
+    name = "TelegramCallsUI",
+    module_name = "TelegramCallsUI",
+    srcs = glob([
+        "Sources/**/*.swift",
+    ]),
+    deps = [
+    	"//submodules/SSignalKit/SwiftSignalKit:SwiftSignalKit",
+        "//submodules/Display:Display",
+        "//submodules/TelegramPresentationData:TelegramPresentationData",
+        "//submodules/TelegramUIPreferences:TelegramUIPreferences",
+        "//submodules/PhotoResources:PhotoResources",
+        "//submodules/TelegramNotices:TelegramNotices",
+        "//submodules/MediaPlayer:UniversalMediaPlayer",
+        "//submodules/DeviceAccess:DeviceAccess",
+        "//submodules/TelegramAudio:TelegramAudio",
+        "//submodules/TelegramVoip:TelegramVoip",
+        "//submodules/ItemListUI:ItemListUI",
+        "//submodules/OverlayStatusController:OverlayStatusController",
+        "//submodules/AppBundle:AppBundle",
+        "//submodules/PresentationDataUtils:PresentationDataUtils",
+        "//submodules/TelegramCallsUI/CallsEmoji:CallsEmoji",
+    ],
+    visibility = [
+        "//visibility:public",
+    ],
+)
diff --git a/submodules/TelegramCallsUI/CallsEmoji/BUCK b/submodules/TelegramCallsUI/CallsEmoji/BUCK
new file mode 100644
index 0000000000..7ccbc5c193
--- /dev/null
+++ b/submodules/TelegramCallsUI/CallsEmoji/BUCK
@@ -0,0 +1,19 @@
+load("//Config:buck_rule_macros.bzl", "static_library")
+
+static_library(
+    name = "CallsEmoji",
+    srcs = glob([
+        "Sources/*.m",
+    ]),
+    headers = glob([
+        "Sources/*.h",
+    ]),
+    exported_headers = glob([
+        "PublicHeaders/**/*.h",
+    ]),
+    deps = [
+    ],
+    frameworks = [
+        "$SDKROOT/System/Library/Frameworks/Foundation.framework",
+    ],
+)
diff --git a/submodules/TelegramCallsUI/CallsEmoji/BUILD b/submodules/TelegramCallsUI/CallsEmoji/BUILD
new file mode 100644
index 0000000000..d6a2ce8cdb
--- /dev/null
+++ b/submodules/TelegramCallsUI/CallsEmoji/BUILD
@@ -0,0 +1,21 @@
+
+objc_library(
+    name = "CallsEmoji",
+    enable_modules = True,
+    module_name = "CallsEmoji",
+    srcs = glob([
+        "Sources/*.m",
+    ]),
+    hdrs = glob([
+        "PublicHeaders/**/*.h",
+    ]),
+    includes = [
+        "PublicHeaders",
+    ],
+    sdk_frameworks = [
+      "Foundation",
+    ],
+    visibility = [
+        "//visibility:public",
+    ],
+)
diff --git a/submodules/TelegramCallsUI/Sources/CallsEmoji.h b/submodules/TelegramCallsUI/CallsEmoji/PublicHeaders/CallsEmoji/CallsEmoji.h
similarity index 100%
rename from submodules/TelegramCallsUI/Sources/CallsEmoji.h
rename to submodules/TelegramCallsUI/CallsEmoji/PublicHeaders/CallsEmoji/CallsEmoji.h
diff --git a/submodules/TelegramCallsUI/Sources/CallsEmoji.m b/submodules/TelegramCallsUI/CallsEmoji/Sources/CallsEmoji.m
similarity index 99%
rename from submodules/TelegramCallsUI/Sources/CallsEmoji.m
rename to submodules/TelegramCallsUI/CallsEmoji/Sources/CallsEmoji.m
index e187e5c81d..b196e5d94e 100644
--- a/submodules/TelegramCallsUI/Sources/CallsEmoji.m
+++ b/submodules/TelegramCallsUI/CallsEmoji/Sources/CallsEmoji.m
@@ -1,5 +1,5 @@
 #import <Foundation/Foundation.h>
-#import "CallsEmoji.h"
+#import <CallsEmoji/CallsEmoji.h>
 
 static int32_t positionExtractor(uint8_t *bytes, int32_t i, int32_t count) {
     int offset = i * 8;
diff --git a/submodules/TelegramCallsUI/Info.plist b/submodules/TelegramCallsUI/Info.plist
deleted file mode 100644
index e1fe4cfb7b..0000000000
--- a/submodules/TelegramCallsUI/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/TelegramCallsUI/Sources/CallControllerNode.swift b/submodules/TelegramCallsUI/Sources/CallControllerNode.swift
index 597b11e526..f39121ff9e 100644
--- a/submodules/TelegramCallsUI/Sources/CallControllerNode.swift
+++ b/submodules/TelegramCallsUI/Sources/CallControllerNode.swift
@@ -12,6 +12,7 @@ import TelegramAudio
 import AccountContext
 import LocalizedPeerData
 import PhotoResources
+import CallsEmoji
 
 final class CallControllerNode: ASDisplayNode {
     private let sharedContext: SharedAccountContext
diff --git a/submodules/TelegramCallsUI/Sources/TelegramCallsUI.h b/submodules/TelegramCallsUI/Sources/TelegramCallsUI.h
deleted file mode 100644
index e897dc32a1..0000000000
--- a/submodules/TelegramCallsUI/Sources/TelegramCallsUI.h
+++ /dev/null
@@ -1,19 +0,0 @@
-//
-//  TelegramCallsUI.h
-//  TelegramCallsUI
-//
-//  Created by Peter on 6/13/19.
-//  Copyright © 2019 Telegram LLP. All rights reserved.
-//
-
-#import <UIKit/UIKit.h>
-
-//! Project version number for TelegramCallsUI.
-FOUNDATION_EXPORT double TelegramCallsUIVersionNumber;
-
-//! Project version string for TelegramCallsUI.
-FOUNDATION_EXPORT const unsigned char TelegramCallsUIVersionString[];
-
-#import <TelegramCallsUI/CallsEmoji.h>
-
-
diff --git a/submodules/TelegramCore/BUCK b/submodules/TelegramCore/BUCK
index 181d1aaecf..c54f8b3bd5 100644
--- a/submodules/TelegramCore/BUCK
+++ b/submodules/TelegramCore/BUCK
@@ -4,18 +4,7 @@ framework(
     name = "TelegramCore",
     srcs = glob([
         "Sources/*.swift",
-        "Sources/*.m",
     ]),
-    headers = [
-        "Sources/Crypto.h",
-        "Sources/NetworkLogging.h",
-        "Sources/Reachability.h",
-    ],
-    exported_headers = [
-        "Sources/Crypto.h",
-        "Sources/NetworkLogging.h",
-        "Sources/Reachability.h",
-    ],
     deps = [
         "//submodules/TelegramApi:TelegramApi#shared",
     	"//submodules/MtProtoKit:MtProtoKit#shared",
@@ -24,9 +13,11 @@ framework(
         "//submodules/SyncCore:SyncCore#shared",
         "//submodules/CloudData:CloudData",
         "//submodules/EncryptionProvider:EncryptionProvider",
+        "//submodules/CryptoUtils:CryptoUtils",
+        "//submodules/NetworkLogging:NetworkLogging",
+        "//submodules/Reachability:Reachability",
     ],
     frameworks = [
         "$SDKROOT/System/Library/Frameworks/Foundation.framework",
     ],
 )
-
diff --git a/submodules/TelegramCore/BUILD b/submodules/TelegramCore/BUILD
new file mode 100644
index 0000000000..8d28b82d2e
--- /dev/null
+++ b/submodules/TelegramCore/BUILD
@@ -0,0 +1,24 @@
+load("@build_bazel_rules_swift//swift:swift.bzl", "swift_library")
+
+swift_library(
+    name = "TelegramCore",
+    module_name = "TelegramCore",
+    srcs = glob([
+        "Sources/**/*.swift",
+    ]),
+    deps = [
+        "//submodules/TelegramApi:TelegramApi",
+        "//submodules/MtProtoKit:MtProtoKit",
+        "//submodules/SSignalKit/SwiftSignalKit:SwiftSignalKit",
+        "//submodules/Postbox:Postbox",
+        "//submodules/SyncCore:SyncCore",
+        "//submodules/CloudData:CloudData",
+        "//submodules/EncryptionProvider:EncryptionProvider",
+        "//submodules/CryptoUtils:CryptoUtils",
+        "//submodules/NetworkLogging:NetworkLogging",
+        "//submodules/Reachability:Reachability",
+    ],
+    visibility = [
+        "//visibility:public",
+    ],
+)
diff --git a/submodules/TelegramCore/Sources/AccessSecureId.swift b/submodules/TelegramCore/Sources/AccessSecureId.swift
index 8800f0b254..11bdaadc44 100644
--- a/submodules/TelegramCore/Sources/AccessSecureId.swift
+++ b/submodules/TelegramCore/Sources/AccessSecureId.swift
@@ -2,6 +2,7 @@ import Foundation
 import Postbox
 import MtProtoKit
 import SwiftSignalKit
+import CryptoUtils
 
 private enum GenerateSecureSecretError {
     case generic
diff --git a/submodules/TelegramCore/Sources/Account.swift b/submodules/TelegramCore/Sources/Account.swift
index 990e0a5ff1..be82e24425 100644
--- a/submodules/TelegramCore/Sources/Account.swift
+++ b/submodules/TelegramCore/Sources/Account.swift
@@ -3,7 +3,7 @@ import Postbox
 import SwiftSignalKit
 import MtProtoKit
 import TelegramApi
-
+import CryptoUtils
 import SyncCore
 import EncryptionProvider
 
@@ -1044,7 +1044,7 @@ public class Account {
         self.managedOperationsDisposable.add(managedApplyPendingMessageReactionsActions(postbox: self.postbox, network: self.network, stateManager: self.stateManager).start())
         self.managedOperationsDisposable.add(managedSynchronizeEmojiKeywordsOperations(postbox: self.postbox, network: self.network).start())
         self.managedOperationsDisposable.add(managedApplyPendingScheduledMessagesActions(postbox: self.postbox, network: self.network, stateManager: self.stateManager).start())
-        //self.managedOperationsDisposable.add(managedChatListFilters(postbox: self.postbox, network: self.network).start())
+        self.managedOperationsDisposable.add(managedChatListFilters(postbox: self.postbox, network: self.network).start())
         
         let importantBackgroundOperations: [Signal<AccountRunningImportantTasks, NoError>] = [
             managedSynchronizeChatInputStateOperations(postbox: self.postbox, network: self.network) |> map { $0 ? AccountRunningImportantTasks.other : [] },
diff --git a/submodules/TelegramCore/Sources/AccountIntermediateState.swift b/submodules/TelegramCore/Sources/AccountIntermediateState.swift
index 85ae665380..d3434c8689 100644
--- a/submodules/TelegramCore/Sources/AccountIntermediateState.swift
+++ b/submodules/TelegramCore/Sources/AccountIntermediateState.swift
@@ -97,6 +97,9 @@ enum AccountStateMutationOperation {
     case UpdatePeerChatInclusion(peerId: PeerId, groupId: PeerGroupId, changedGroup: Bool)
     case UpdatePeersNearby([PeerNearby])
     case UpdateTheme(TelegramTheme)
+    case SyncChatListFilters
+    case UpdateChatListFilterOrder(order: [Int32])
+    case UpdateChatListFilter(id: Int32, filter: Api.DialogFilter?)
 }
 
 struct AccountMutableState {
@@ -408,9 +411,21 @@ struct AccountMutableState {
         self.addOperation(.UpdateCall(call))
     }
     
+    mutating func addSyncChatListFilters() {
+        self.addOperation(.SyncChatListFilters)
+    }
+    
+    mutating func addUpdateChatListFilterOrder(order: [Int32]) {
+        self.addOperation(.UpdateChatListFilterOrder(order: order))
+    }
+    
+    mutating func addUpdateChatListFilter(id: Int32, filter: Api.DialogFilter?) {
+        self.addOperation(.UpdateChatListFilter(id: id, filter: filter))
+    }
+    
     mutating func addOperation(_ operation: AccountStateMutationOperation) {
         switch operation {
-            case .DeleteMessages, .DeleteMessagesWithGlobalIds, .EditMessage, .UpdateMessagePoll/*, .UpdateMessageReactions*/, .UpdateMedia, .ReadOutbox, .ReadGroupFeedInbox, .MergePeerPresences, .UpdateSecretChat, .AddSecretMessages, .ReadSecretOutbox, .AddPeerInputActivity, .UpdateCachedPeerData, .UpdatePinnedItemIds, .ReadMessageContents, .UpdateMessageImpressionCount, .UpdateInstalledStickerPacks, .UpdateRecentGifs, .UpdateChatInputState, .UpdateCall, .UpdateLangPack, .UpdateMinAvailableMessage, .UpdatePeerChatUnreadMark, .UpdateIsContact, .UpdatePeerChatInclusion, .UpdatePeersNearby, .UpdateTheme:
+            case .DeleteMessages, .DeleteMessagesWithGlobalIds, .EditMessage, .UpdateMessagePoll/*, .UpdateMessageReactions*/, .UpdateMedia, .ReadOutbox, .ReadGroupFeedInbox, .MergePeerPresences, .UpdateSecretChat, .AddSecretMessages, .ReadSecretOutbox, .AddPeerInputActivity, .UpdateCachedPeerData, .UpdatePinnedItemIds, .ReadMessageContents, .UpdateMessageImpressionCount, .UpdateInstalledStickerPacks, .UpdateRecentGifs, .UpdateChatInputState, .UpdateCall, .UpdateLangPack, .UpdateMinAvailableMessage, .UpdatePeerChatUnreadMark, .UpdateIsContact, .UpdatePeerChatInclusion, .UpdatePeersNearby, .UpdateTheme, .SyncChatListFilters, .UpdateChatListFilterOrder, .UpdateChatListFilter:
                 break
             case let .AddMessages(messages, location):
                 for message in messages {
diff --git a/submodules/TelegramCore/Sources/AccountManager.swift b/submodules/TelegramCore/Sources/AccountManager.swift
index 855e3aa9e2..2ae5a0733b 100644
--- a/submodules/TelegramCore/Sources/AccountManager.swift
+++ b/submodules/TelegramCore/Sources/AccountManager.swift
@@ -155,6 +155,8 @@ private var declaredEncodables: Void = {
     declareEncodable(ChatListFiltersState.self, f: { ChatListFiltersState(decoder: $0) })
     declareEncodable(PeersNearbyState.self, f: { PeersNearbyState(decoder: $0) })
     declareEncodable(TelegramMediaDice.self, f: { TelegramMediaDice(decoder: $0) })
+    declareEncodable(ChatListFiltersFeaturedState.self, f: { ChatListFiltersFeaturedState(decoder: $0) })
+    declareEncodable(SynchronizeChatListFiltersOperation.self, f: { SynchronizeChatListFiltersOperation(decoder: $0) })
     
     return
 }()
diff --git a/submodules/TelegramCore/Sources/AccountStateManagementUtils.swift b/submodules/TelegramCore/Sources/AccountStateManagementUtils.swift
index 6dd6553c6f..0eb6714638 100644
--- a/submodules/TelegramCore/Sources/AccountStateManagementUtils.swift
+++ b/submodules/TelegramCore/Sources/AccountStateManagementUtils.swift
@@ -1320,6 +1320,12 @@ private func finalStateWithUpdatesAndServerTime(postbox: Postbox, network: Netwo
                 }
             case let .updateMessageID(id, randomId):
                 updatedState.updatedOutgoingUniqueMessageIds[randomId] = id
+            case .updateDialogFilters:
+                updatedState.addSyncChatListFilters()
+            case let .updateDialogFilterOrder(order):
+                updatedState.addUpdateChatListFilterOrder(order: order)
+            case let .updateDialogFilter(_, id, filter):
+                updatedState.addUpdateChatListFilter(id: id, filter: filter)
             default:
                 break
         }
@@ -2042,7 +2048,7 @@ private func optimizedOperations(_ operations: [AccountStateMutationOperation])
     var currentAddScheduledMessages: OptimizeAddMessagesState?
     for operation in operations {
         switch operation {
-            case .DeleteMessages, .DeleteMessagesWithGlobalIds, .EditMessage, .UpdateMessagePoll/*, .UpdateMessageReactions*/, .UpdateMedia, .MergeApiChats, .MergeApiUsers, .MergePeerPresences, .UpdatePeer, .ReadInbox, .ReadOutbox, .ReadGroupFeedInbox, .ResetReadState, .ResetIncomingReadState, .UpdatePeerChatUnreadMark, .ResetMessageTagSummary, .UpdateNotificationSettings, .UpdateGlobalNotificationSettings, .UpdateSecretChat, .AddSecretMessages, .ReadSecretOutbox, .AddPeerInputActivity, .UpdateCachedPeerData, .UpdatePinnedItemIds, .ReadMessageContents, .UpdateMessageImpressionCount, .UpdateInstalledStickerPacks, .UpdateRecentGifs, .UpdateChatInputState, .UpdateCall, .UpdateLangPack, .UpdateMinAvailableMessage, .UpdateIsContact, .UpdatePeerChatInclusion, .UpdatePeersNearby, .UpdateTheme:
+            case .DeleteMessages, .DeleteMessagesWithGlobalIds, .EditMessage, .UpdateMessagePoll/*, .UpdateMessageReactions*/, .UpdateMedia, .MergeApiChats, .MergeApiUsers, .MergePeerPresences, .UpdatePeer, .ReadInbox, .ReadOutbox, .ReadGroupFeedInbox, .ResetReadState, .ResetIncomingReadState, .UpdatePeerChatUnreadMark, .ResetMessageTagSummary, .UpdateNotificationSettings, .UpdateGlobalNotificationSettings, .UpdateSecretChat, .AddSecretMessages, .ReadSecretOutbox, .AddPeerInputActivity, .UpdateCachedPeerData, .UpdatePinnedItemIds, .ReadMessageContents, .UpdateMessageImpressionCount, .UpdateInstalledStickerPacks, .UpdateRecentGifs, .UpdateChatInputState, .UpdateCall, .UpdateLangPack, .UpdateMinAvailableMessage, .UpdateIsContact, .UpdatePeerChatInclusion, .UpdatePeersNearby, .UpdateTheme, .SyncChatListFilters, .UpdateChatListFilter, .UpdateChatListFilterOrder:
                 if let currentAddMessages = currentAddMessages, !currentAddMessages.messages.isEmpty {
                     result.append(.AddMessages(currentAddMessages.messages, currentAddMessages.location))
                 }
@@ -2126,6 +2132,7 @@ func replayFinalState(accountManager: AccountManager, postbox: Postbox, accountP
     var updatedThemes: [Int64: TelegramTheme] = [:]
     var delayNotificatonsUntil: Int32?
     var peerActivityTimestamps: [PeerId: Int32] = [:]
+    var syncChatListFilters = false
     
     var holesFromPreviousStateMessageIds: [MessageId] = []
     
@@ -2683,6 +2690,46 @@ func replayFinalState(accountManager: AccountManager, postbox: Postbox, accountP
                 updatedPeersNearby = peersNearby
             case let .UpdateTheme(theme):
                 updatedThemes[theme.id] = theme
+            case .SyncChatListFilters:
+                syncChatListFilters = true
+            case let .UpdateChatListFilterOrder(order):
+                if !syncChatListFilters {
+                    let _ = updateChatListFiltersState(transaction: transaction, { state in
+                        var state = state
+                        if Set(state.filters.map { $0.id }) == Set(order) {
+                            var updatedFilters: [ChatListFilter] = []
+                            for id in order {
+                                if let filter = state.filters.first(where: { $0.id == id }) {
+                                    updatedFilters.append(filter)
+                                } else {
+                                    assertionFailure()
+                                }
+                            }
+                            state.filters = updatedFilters
+                            state.remoteFilters = state.filters
+                        } else {
+                            syncChatListFilters = true
+                        }
+                        return state
+                    })
+                }
+            case let .UpdateChatListFilter(id, filter):
+                if !syncChatListFilters {
+                    let _ = updateChatListFiltersState(transaction: transaction, { state in
+                        var state = state
+                        if let index = state.filters.firstIndex(where: { $0.id == id }) {
+                            if let filter = filter {
+                                state.filters[index] = ChatListFilter(apiFilter: filter)
+                            } else {
+                                state.filters.remove(at: index)
+                            }
+                            state.remoteFilters = state.filters
+                        } else {
+                            syncChatListFilters = true
+                        }
+                        return state
+                    })
+                }
         }
     }
     
@@ -3003,5 +3050,9 @@ func replayFinalState(accountManager: AccountManager, postbox: Postbox, accountP
         }
     }
     
+    if syncChatListFilters {
+        requestChatListFiltersSync(transaction: transaction)
+    }
+    
     return AccountReplayedFinalState(state: finalState, addedIncomingMessageIds: addedIncomingMessageIds, wasScheduledMessageIds: wasScheduledMessageIds, addedSecretMessageIds: addedSecretMessageIds, updatedTypingActivities: updatedTypingActivities, updatedWebpages: updatedWebpages, updatedCalls: updatedCalls, updatedPeersNearby: updatedPeersNearby, isContactUpdates: isContactUpdates, delayNotificatonsUntil: delayNotificatonsUntil)
 }
diff --git a/submodules/TelegramCore/Sources/ChatHistoryPreloadManager.swift b/submodules/TelegramCore/Sources/ChatHistoryPreloadManager.swift
index 0cced57f03..d97da4af1d 100644
--- a/submodules/TelegramCore/Sources/ChatHistoryPreloadManager.swift
+++ b/submodules/TelegramCore/Sources/ChatHistoryPreloadManager.swift
@@ -336,7 +336,7 @@ final class ChatHistoryPreloadManager {
             
             var indices: [(ChatHistoryPreloadIndex, Bool, Bool)] = []
             for entry in view.0.entries {
-                if case let .MessageEntry(index, _, readState, notificationSettings, _, _, _, _, _) = entry {
+                if case let .MessageEntry(index, _, readState, notificationSettings, _, _, _, _, _, _) = entry {
                     var hasUnread = false
                     if let readState = readState {
                         hasUnread = readState.count != 0
diff --git a/submodules/TelegramCore/Sources/ChatListFiltering.swift b/submodules/TelegramCore/Sources/ChatListFiltering.swift
index 08c374d900..fa46a3d743 100644
--- a/submodules/TelegramCore/Sources/ChatListFiltering.swift
+++ b/submodules/TelegramCore/Sources/ChatListFiltering.swift
@@ -5,27 +5,37 @@ import TelegramApi
 
 import SyncCore
 
-public struct ChatListFilterPeerCategories: OptionSet {
+public struct ChatListFilteringConfiguration: Equatable {
+    public let isEnabled: Bool
+    
+    public init(appConfiguration: AppConfiguration) {
+        var isEnabled = false
+        if let data = appConfiguration.data, let value = data["dialog_filters_enabled"] as? Bool, value {
+            isEnabled = true
+        }
+        self.isEnabled = isEnabled
+    }
+}
+
+public struct ChatListFilterPeerCategories: OptionSet, Hashable {
     public var rawValue: Int32
     
     public init(rawValue: Int32) {
         self.rawValue = rawValue
     }
     
-    public static let privateChats = ChatListFilterPeerCategories(rawValue: 1 << 0)
-    public static let secretChats = ChatListFilterPeerCategories(rawValue: 1 << 1)
-    public static let privateGroups = ChatListFilterPeerCategories(rawValue: 1 << 2)
-    public static let bots = ChatListFilterPeerCategories(rawValue: 1 << 3)
-    public static let publicGroups = ChatListFilterPeerCategories(rawValue: 1 << 4)
-    public static let channels = ChatListFilterPeerCategories(rawValue: 1 << 5)
+    public static let contacts = ChatListFilterPeerCategories(rawValue: 1 << 0)
+    public static let nonContacts = ChatListFilterPeerCategories(rawValue: 1 << 1)
+    public static let groups = ChatListFilterPeerCategories(rawValue: 1 << 2)
+    public static let channels = ChatListFilterPeerCategories(rawValue: 1 << 3)
+    public static let bots = ChatListFilterPeerCategories(rawValue: 1 << 4)
     
     public static let all: ChatListFilterPeerCategories = [
-        .privateChats,
-        .secretChats,
-        .privateGroups,
-        .bots,
-        .publicGroups,
-        .channels
+        .contacts,
+        .nonContacts,
+        .groups,
+        .channels,
+        .bots
     ]
 }
 
@@ -36,29 +46,25 @@ private struct ChatListFilterPeerApiCategories: OptionSet {
         self.rawValue = rawValue
     }
     
-    static let privateChats = ChatListFilterPeerApiCategories(rawValue: 1 << 0)
-    static let secretChats = ChatListFilterPeerApiCategories(rawValue: 1 << 1)
-    static let privateGroups = ChatListFilterPeerApiCategories(rawValue: 1 << 2)
-    static let publicGroups = ChatListFilterPeerApiCategories(rawValue: 1 << 3)
-    static let channels = ChatListFilterPeerApiCategories(rawValue: 1 << 4)
-    static let bots = ChatListFilterPeerApiCategories(rawValue: 1 << 5)
+    static let contacts = ChatListFilterPeerApiCategories(rawValue: 1 << 0)
+    static let nonContacts = ChatListFilterPeerApiCategories(rawValue: 1 << 1)
+    static let groups = ChatListFilterPeerApiCategories(rawValue: 1 << 2)
+    static let channels = ChatListFilterPeerApiCategories(rawValue: 1 << 3)
+    static let bots = ChatListFilterPeerApiCategories(rawValue: 1 << 4)
 }
 
 extension ChatListFilterPeerCategories {
     init(apiFlags: Int32) {
         let flags = ChatListFilterPeerApiCategories(rawValue: apiFlags)
         var result: ChatListFilterPeerCategories = []
-        if flags.contains(.privateChats) {
-            result.insert(.privateChats)
+        if flags.contains(.contacts) {
+            result.insert(.contacts)
         }
-        if flags.contains(.secretChats) {
-            result.insert(.secretChats)
+        if flags.contains(.nonContacts) {
+            result.insert(.nonContacts)
         }
-        if flags.contains(.privateGroups) {
-            result.insert(.privateGroups)
-        }
-        if flags.contains(.publicGroups) {
-            result.insert(.publicGroups)
+        if flags.contains(.groups) {
+            result.insert(.groups)
         }
         if flags.contains(.channels) {
             result.insert(.channels)
@@ -71,17 +77,14 @@ extension ChatListFilterPeerCategories {
     
     var apiFlags: Int32 {
         var result: ChatListFilterPeerApiCategories = []
-        if self.contains(.privateChats) {
-            result.insert(.privateChats)
+        if self.contains(.contacts) {
+            result.insert(.contacts)
         }
-        if self.contains(.secretChats) {
-            result.insert(.secretChats)
+        if self.contains(.nonContacts) {
+            result.insert(.nonContacts)
         }
-        if self.contains(.privateGroups) {
-            result.insert(.privateGroups)
-        }
-        if self.contains(.publicGroups) {
-            result.insert(.publicGroups)
+        if self.contains(.groups) {
+            result.insert(.groups)
         }
         if self.contains(.channels) {
             result.insert(.channels)
@@ -93,89 +96,127 @@ extension ChatListFilterPeerCategories {
     }
 }
 
-public struct ChatListFilter: PostboxCoding, Equatable {
-    public var id: Int32
-    public var title: String?
+public struct ChatListFilterData: Equatable, Hashable {
     public var categories: ChatListFilterPeerCategories
     public var excludeMuted: Bool
     public var excludeRead: Bool
+    public var excludeArchived: Bool
     public var includePeers: [PeerId]
+    public var excludePeers: [PeerId]
     
     public init(
-        id: Int32,
-        title: String?,
         categories: ChatListFilterPeerCategories,
         excludeMuted: Bool,
         excludeRead: Bool,
-        includePeers: [PeerId]
+        excludeArchived: Bool,
+        includePeers: [PeerId],
+        excludePeers: [PeerId]
     ) {
-        self.id = id
-        self.title = title
         self.categories = categories
         self.excludeMuted = excludeMuted
         self.excludeRead = excludeRead
+        self.excludeArchived = excludeArchived
         self.includePeers = includePeers
+        self.excludePeers = excludePeers
+    }
+}
+
+public struct ChatListFilter: PostboxCoding, Equatable {
+    public var id: Int32
+    public var title: String
+    public var data: ChatListFilterData
+    
+    public init(
+        id: Int32,
+        title: String,
+        data: ChatListFilterData
+    ) {
+        self.id = id
+        self.title = title
+        self.data = data
     }
     
     public init(decoder: PostboxDecoder) {
         self.id = decoder.decodeInt32ForKey("id", orElse: 0)
-        self.title = decoder.decodeOptionalStringForKey("title")
-        self.categories = ChatListFilterPeerCategories(rawValue: decoder.decodeInt32ForKey("categories", orElse: 0))
-        self.excludeMuted = decoder.decodeInt32ForKey("excludeMuted", orElse: 0) != 0
-        self.excludeRead = decoder.decodeInt32ForKey("excludeRead", orElse: 0) != 0
-        self.includePeers = decoder.decodeInt64ArrayForKey("includePeers").map(PeerId.init)
+        self.title = decoder.decodeStringForKey("title", orElse: "")
+        self.data = ChatListFilterData(
+            categories: ChatListFilterPeerCategories(rawValue: decoder.decodeInt32ForKey("categories", orElse: 0)),
+            excludeMuted: decoder.decodeInt32ForKey("excludeMuted", orElse: 0) != 0,
+            excludeRead: decoder.decodeInt32ForKey("excludeRead", orElse: 0) != 0,
+            excludeArchived: decoder.decodeInt32ForKey("excludeArchived", orElse: 0) != 0,
+            includePeers: decoder.decodeInt64ArrayForKey("includePeers").map(PeerId.init),
+            excludePeers: decoder.decodeInt64ArrayForKey("excludePeers").map(PeerId.init)
+        )
     }
     
     public func encode(_ encoder: PostboxEncoder) {
         encoder.encodeInt32(self.id, forKey: "id")
-        if let title = self.title {
-            encoder.encodeString(title, forKey: "title")
-        } else {
-            encoder.encodeNil(forKey: "title")
-        }
-        encoder.encodeInt32(self.categories.rawValue, forKey: "categories")
-        encoder.encodeInt32(self.excludeMuted ? 1 : 0, forKey: "excludeMuted")
-        encoder.encodeInt32(self.excludeRead ? 1 : 0, forKey: "excludeRead")
-        encoder.encodeInt64Array(self.includePeers.map { $0.toInt64() }, forKey: "includePeers")
+        encoder.encodeString(self.title, forKey: "title")
+        encoder.encodeInt32(self.data.categories.rawValue, forKey: "categories")
+        encoder.encodeInt32(self.data.excludeMuted ? 1 : 0, forKey: "excludeMuted")
+        encoder.encodeInt32(self.data.excludeRead ? 1 : 0, forKey: "excludeRead")
+        encoder.encodeInt32(self.data.excludeArchived ? 1 : 0, forKey: "excludeArchived")
+        encoder.encodeInt64Array(self.data.includePeers.map { $0.toInt64() }, forKey: "includePeers")
+        encoder.encodeInt64Array(self.data.excludePeers.map { $0.toInt64() }, forKey: "excludePeers")
     }
 }
 
 extension ChatListFilter {
     init(apiFilter: Api.DialogFilter) {
         switch apiFilter {
-        case let .dialogFilter(flags, id, title, includePeers):
+        case let .dialogFilter(flags, id, title, includePeers, excludePeers):
             self.init(
                 id: id,
-                title: title.isEmpty ? nil : title,
-                categories: ChatListFilterPeerCategories(apiFlags: flags),
-                excludeMuted: (flags & (1 << 11)) != 0,
-                excludeRead: (flags & (1 << 12)) != 0,
-                includePeers: includePeers.compactMap { peer -> PeerId? in
-                    switch peer {
-                    case let .inputPeerUser(userId, _):
-                        return PeerId(namespace: Namespaces.Peer.CloudUser, id: userId)
-                    case let .inputPeerChat(chatId):
-                        return PeerId(namespace: Namespaces.Peer.CloudGroup, id: chatId)
-                    case let .inputPeerChannel(channelId, _):
-                        return PeerId(namespace: Namespaces.Peer.CloudChannel, id: channelId)
-                    default:
-                        return nil
+                title: title,
+                data: ChatListFilterData(
+                    categories: ChatListFilterPeerCategories(apiFlags: flags),
+                    excludeMuted: (flags & (1 << 11)) != 0,
+                    excludeRead: (flags & (1 << 12)) != 0,
+                    excludeArchived: (flags & (1 << 13)) != 0,
+                    includePeers: includePeers.compactMap { peer -> PeerId? in
+                        switch peer {
+                        case let .inputPeerUser(userId, _):
+                            return PeerId(namespace: Namespaces.Peer.CloudUser, id: userId)
+                        case let .inputPeerChat(chatId):
+                            return PeerId(namespace: Namespaces.Peer.CloudGroup, id: chatId)
+                        case let .inputPeerChannel(channelId, _):
+                            return PeerId(namespace: Namespaces.Peer.CloudChannel, id: channelId)
+                        default:
+                            return nil
+                        }
+                    },
+                    excludePeers: excludePeers.compactMap { peer -> PeerId? in
+                        switch peer {
+                        case let .inputPeerUser(userId, _):
+                            return PeerId(namespace: Namespaces.Peer.CloudUser, id: userId)
+                        case let .inputPeerChat(chatId):
+                            return PeerId(namespace: Namespaces.Peer.CloudGroup, id: chatId)
+                        case let .inputPeerChannel(channelId, _):
+                            return PeerId(namespace: Namespaces.Peer.CloudChannel, id: channelId)
+                        default:
+                            return nil
+                        }
                     }
-                }
+                )
             )
         }
     }
     
     func apiFilter(transaction: Transaction) -> Api.DialogFilter {
         var flags: Int32 = 0
-        if self.excludeMuted {
+        if self.data.excludeMuted {
             flags |= 1 << 11
         }
-        if self.excludeRead {
+        if self.data.excludeRead {
             flags |= 1 << 12
         }
-        flags |= self.categories.apiFlags
-        return .dialogFilter(flags: flags, id: self.id, title: self.title ?? "", includePeers: self.includePeers.compactMap { peerId -> Api.InputPeer? in
+        if self.data.excludeArchived {
+            flags |= 1 << 13
+        }
+        flags |= self.data.categories.apiFlags
+        return .dialogFilter(flags: flags, id: self.id, title: self.title, includePeers: self.data.includePeers.compactMap { peerId -> Api.InputPeer? in
+            return transaction.getPeer(peerId).flatMap(apiInputPeer)
+        }, excludePeers: self.data.excludePeers.compactMap { peerId -> Api.InputPeer? in
             return transaction.getPeer(peerId).flatMap(apiInputPeer)
         })
     }
@@ -185,8 +226,8 @@ public enum RequestUpdateChatListFilterError {
     case generic
 }
 
-public func requestUpdateChatListFilter(account: Account, id: Int32, filter: ChatListFilter?) -> Signal<Never, RequestUpdateChatListFilterError> {
-    return account.postbox.transaction { transaction -> Api.DialogFilter? in
+public func requestUpdateChatListFilter(postbox: Postbox, network: Network, id: Int32, filter: ChatListFilter?) -> Signal<Never, RequestUpdateChatListFilterError> {
+    return postbox.transaction { transaction -> Api.DialogFilter? in
         return filter?.apiFilter(transaction: transaction)
     }
     |> castError(RequestUpdateChatListFilterError.self)
@@ -195,7 +236,7 @@ public func requestUpdateChatListFilter(account: Account, id: Int32, filter: Cha
         if inputFilter != nil {
             flags |= 1 << 0
         }
-        return account.network.request(Api.functions.messages.updateDialogFilter(flags: flags, id: id, filter: inputFilter))
+        return network.request(Api.functions.messages.updateDialogFilter(flags: flags, id: id, filter: inputFilter))
         |> mapError { _ -> RequestUpdateChatListFilterError in
             return .generic
         }
@@ -237,7 +278,7 @@ private func requestChatListFilters(postbox: Postbox, network: Network) -> Signa
                 let filter = ChatListFilter(apiFilter: apiFilter)
                 filters.append(filter)
                 switch apiFilter {
-                case let .dialogFilter(_, _, _, includePeers):
+                case let .dialogFilter(_, _, _, includePeers, excludePeers):
                     for peer in includePeers {
                         var peerId: PeerId?
                         switch peer {
@@ -257,6 +298,25 @@ private func requestChatListFilters(postbox: Postbox, network: Network) -> Signa
                             }
                         }
                     }
+                    for peer in excludePeers {
+                        var peerId: PeerId?
+                        switch peer {
+                        case let .inputPeerUser(userId, _):
+                            peerId = PeerId(namespace: Namespaces.Peer.CloudUser, id: userId)
+                        case let .inputPeerChat(chatId):
+                            peerId = PeerId(namespace: Namespaces.Peer.CloudGroup, id: chatId)
+                        case let .inputPeerChannel(channelId, _):
+                            peerId = PeerId(namespace: Namespaces.Peer.CloudChannel, id: channelId)
+                        default:
+                            break
+                        }
+                        if let peerId = peerId {
+                            if transaction.getPeer(peerId) == nil && !missingPeerIds.contains(peerId) {
+                                missingPeerIds.insert(peerId)
+                                missingPeers.append(peer)
+                            }
+                        }
+                    }
                 }
             }
             return (filters, missingPeers)
@@ -264,89 +324,144 @@ private func requestChatListFilters(postbox: Postbox, network: Network) -> Signa
         |> castError(RequestChatListFiltersError.self)
         |> mapToSignal { filtersAndMissingPeers -> Signal<[ChatListFilter], RequestChatListFiltersError> in
             let (filters, missingPeers) = filtersAndMissingPeers
-            return .single(filters)
-        }
-    }
-}
-
-func managedChatListFilters(postbox: Postbox, network: Network) -> Signal<Never, NoError> {
-    return requestChatListFilters(postbox: postbox, network: network)
-    |> `catch` { _ -> Signal<[ChatListFilter], NoError> in
-        return .complete()
-    }
-    |> mapToSignal { filters -> Signal<Never, NoError> in
-        return postbox.transaction { transaction in
-            transaction.updatePreferencesEntry(key: PreferencesKeys.chatListFilters, { entry in
-                var settings = entry as? ChatListFiltersState ?? ChatListFiltersState.default
-                settings.filters = filters
-                return settings
-            })
-        }
-        |> ignoreValues
-    }
-}
-
-public func replaceRemoteChatListFilters(account: Account) -> Signal<Never, NoError> {
-    return requestChatListFilters(postbox: account.postbox, network: account.network)
-    |> `catch` { _ -> Signal<[ChatListFilter], NoError> in
-        return .complete()
-    }
-    |> mapToSignal { remoteFilters -> Signal<Never, NoError> in
-        var deleteSignals: [Signal<Never, NoError>] = []
-        for filter in remoteFilters {
-            deleteSignals.append(requestUpdateChatListFilter(account: account, id: filter.id, filter: nil)
-            |> `catch` { _ -> Signal<Never, NoError> in
+            
+            var missingUsers: [Api.InputUser] = []
+            var missingChannels: [Api.InputChannel] = []
+            var missingGroups: [Int32] = []
+            for peer in missingPeers {
+                switch peer {
+                case let .inputPeerUser(userId, accessHash):
+                    missingUsers.append(.inputUser(userId: userId, accessHash: accessHash))
+                case .inputPeerSelf:
+                    missingUsers.append(.inputUserSelf)
+                case let .inputPeerChannel(channelId, accessHash):
+                    missingChannels.append(.inputChannel(channelId: channelId, accessHash: accessHash))
+                case let .inputPeerChat(id):
+                    missingGroups.append(id)
+                case .inputPeerEmpty:
+                    break
+                }
+            }
+            
+            let resolveMissingUsers: Signal<Never, NoError>
+            if !missingUsers.isEmpty {
+                resolveMissingUsers = network.request(Api.functions.users.getUsers(id: missingUsers))
+                |> `catch` { _ -> Signal<[Api.User], NoError> in
+                    return .single([])
+                }
+                |> mapToSignal { users -> Signal<Never, NoError> in
+                    return postbox.transaction { transaction -> Void in
+                        var peers: [Peer] = []
+                        for user in users {
+                            peers.append(TelegramUser(user: user))
+                        }
+                        updatePeers(transaction: transaction, peers: peers, update: { _, updated in
+                            return updated
+                        })
+                    }
+                    |> ignoreValues
+                }
+            } else {
+                resolveMissingUsers = .complete()
+            }
+            
+            let resolveMissingChannels: Signal<Never, NoError>
+            if !missingChannels.isEmpty {
+                resolveMissingChannels = network.request(Api.functions.channels.getChannels(id: missingChannels))
+                |> map(Optional.init)
+                |> `catch` { _ -> Signal<Api.messages.Chats?, NoError> in
+                    return .single(nil)
+                }
+                |> mapToSignal { result -> Signal<Never, NoError> in
+                    return postbox.transaction { transaction -> Void in
+                        if let result = result {
+                            var peers: [Peer] = []
+                            switch result {
+                            case .chats(let chats), .chatsSlice(_, let chats):
+                                for chat in chats {
+                                    if let peer = parseTelegramGroupOrChannel(chat: chat) {
+                                        peers.append(peer)
+                                    }
+                                }
+                            }
+                            updatePeers(transaction: transaction, peers: peers, update: { _, updated in
+                                return updated
+                            })
+                        }
+                    }
+                    |> ignoreValues
+                }
+            } else {
+                resolveMissingChannels = .complete()
+            }
+            
+            let resolveMissingGroups: Signal<Never, NoError>
+            if !missingGroups.isEmpty {
+                resolveMissingGroups = network.request(Api.functions.messages.getChats(id: missingGroups))
+                |> map(Optional.init)
+                |> `catch` { _ -> Signal<Api.messages.Chats?, NoError> in
+                    return .single(nil)
+                }
+                |> mapToSignal { result -> Signal<Never, NoError> in
+                    return postbox.transaction { transaction -> Void in
+                        if let result = result {
+                            var peers: [Peer] = []
+                            switch result {
+                            case .chats(let chats), .chatsSlice(_, let chats):
+                                for chat in chats {
+                                    if let peer = parseTelegramGroupOrChannel(chat: chat) {
+                                        peers.append(peer)
+                                    }
+                                }
+                            }
+                            updatePeers(transaction: transaction, peers: peers, update: { _, updated in
+                                return updated
+                            })
+                        }
+                    }
+                    |> ignoreValues
+                }
+            } else {
+                resolveMissingGroups = .complete()
+            }
+            
+            return (
+                resolveMissingUsers
+            )
+            |> then(
+                resolveMissingChannels
+            )
+            |> then(
+                resolveMissingGroups
+            )
+            |> castError(RequestChatListFiltersError.self)
+            |> mapToSignal { _ -> Signal<[ChatListFilter], RequestChatListFiltersError> in
                 return .complete()
             }
-            |> ignoreValues)
+            |> then(
+                .single(filters)
+            )
         }
-        
-        let addFilters = account.postbox.transaction { transaction -> [(Int32, ChatListFilter)] in
-            let settings = transaction.getPreferencesEntry(key: PreferencesKeys.chatListFilters) as? ChatListFiltersState ?? ChatListFiltersState.default
-            return settings.filters.map { filter -> (Int32, ChatListFilter) in
-                return (filter.id, filter)
-            }
-        }
-        |> mapToSignal { filters -> Signal<Never, NoError> in
-            var signals: [Signal<Never, NoError>] = []
-            for (id, filter) in filters {
-                signals.append(requestUpdateChatListFilter(account: account, id: id, filter: filter)
-                |> `catch` { _ -> Signal<Never, NoError> in
-                    return .complete()
-                }
-                |> ignoreValues)
-            }
-            return combineLatest(signals)
-            |> ignoreValues
-        }
-        
-        return combineLatest(
-            deleteSignals
-        )
-        |> ignoreValues
-        |> then(
-            addFilters
-        )
     }
 }
 
-public struct ChatListFiltersState: PreferencesEntry, Equatable {
-    public var filters: [ChatListFilter]
-    public var remoteFilters: [ChatListFilter]?
+struct ChatListFiltersState: PreferencesEntry, Equatable {
+    var filters: [ChatListFilter]
+    var remoteFilters: [ChatListFilter]?
     
-    public static var `default` = ChatListFiltersState(filters: [], remoteFilters: nil)
+    static var `default` = ChatListFiltersState(filters: [], remoteFilters: nil)
     
-    public init(filters: [ChatListFilter], remoteFilters: [ChatListFilter]?) {
+    fileprivate init(filters: [ChatListFilter], remoteFilters: [ChatListFilter]?) {
         self.filters = filters
         self.remoteFilters = remoteFilters
     }
     
-    public init(decoder: PostboxDecoder) {
+    init(decoder: PostboxDecoder) {
         self.filters = decoder.decodeObjectArrayWithDecoderForKey("filters")
         self.remoteFilters = decoder.decodeOptionalObjectArrayWithDecoderForKey("remoteFilters")
     }
     
-    public func encode(_ encoder: PostboxEncoder) {
+    func encode(_ encoder: PostboxEncoder) {
         encoder.encodeObjectArray(self.filters, forKey: "filters")
         if let remoteFilters = self.remoteFilters {
             encoder.encodeObjectArray(remoteFilters, forKey: "remoteFilters")
@@ -355,7 +470,7 @@ public struct ChatListFiltersState: PreferencesEntry, Equatable {
         }
     }
     
-    public func isEqual(to: PreferencesEntry) -> Bool {
+    func isEqual(to: PreferencesEntry) -> Bool {
         if let to = to as? ChatListFiltersState, self == to {
             return true
         } else {
@@ -364,16 +479,468 @@ public struct ChatListFiltersState: PreferencesEntry, Equatable {
     }
 }
 
-public func updateChatListFilterSettingsInteractively(postbox: Postbox, _ f: @escaping (ChatListFiltersState) -> ChatListFiltersState) -> Signal<ChatListFiltersState, NoError> {
-    return postbox.transaction { transaction -> ChatListFiltersState in
-        var result: ChatListFiltersState?
-        transaction.updatePreferencesEntry(key: PreferencesKeys.chatListFilters, { entry in
-            var settings = entry as? ChatListFiltersState ?? ChatListFiltersState.default
-            let updated = f(settings)
-            result = updated
-            return updated
-        })
-        return result ?? .default
+public func generateNewChatListFilterId(filters: [ChatListFilter]) -> Int32 {
+    while true {
+        let id = Int32(2 + arc4random_uniform(255 - 2))
+        if !filters.contains(where: { $0.id == id }) {
+            return id
+        }
     }
 }
 
+public func updateChatListFiltersInteractively(postbox: Postbox, _ f: @escaping ([ChatListFilter]) -> [ChatListFilter]) -> Signal<[ChatListFilter], NoError> {
+    return postbox.transaction { transaction -> [ChatListFilter] in
+        var updated: [ChatListFilter] = []
+        var hasUpdates = false
+        transaction.updatePreferencesEntry(key: PreferencesKeys.chatListFilters, { entry in
+            var state = entry as? ChatListFiltersState ?? ChatListFiltersState.default
+            let updatedFilters = f(state.filters)
+            if updatedFilters != state.filters {
+                state.filters = updatedFilters
+                hasUpdates = true
+            }
+            updated = updatedFilters
+            return state
+        })
+        if hasUpdates {
+            requestChatListFiltersSync(transaction: transaction)
+        }
+        return updated
+    }
+}
+
+public func updatedChatListFilters(postbox: Postbox) -> Signal<[ChatListFilter], NoError> {
+    return postbox.preferencesView(keys: [PreferencesKeys.chatListFilters])
+    |> map { preferences -> [ChatListFilter] in
+        let filtersState = preferences.values[PreferencesKeys.chatListFilters] as? ChatListFiltersState ?? ChatListFiltersState.default
+        return filtersState.filters
+    }
+    |> distinctUntilChanged
+}
+
+public func currentChatListFilters(postbox: Postbox) -> Signal<[ChatListFilter], NoError> {
+    return postbox.transaction { transaction -> [ChatListFilter] in
+        let settings = transaction.getPreferencesEntry(key: PreferencesKeys.chatListFilters) as? ChatListFiltersState ?? ChatListFiltersState.default
+        return settings.filters
+    }
+}
+
+func updateChatListFiltersState(transaction: Transaction, _ f: (ChatListFiltersState) -> ChatListFiltersState) -> ChatListFiltersState {
+    var result: ChatListFiltersState?
+    transaction.updatePreferencesEntry(key: PreferencesKeys.chatListFilters, { entry in
+        let settings = entry as? ChatListFiltersState ?? ChatListFiltersState.default
+        let updated = f(settings)
+        result = updated
+        return updated
+    })
+    return result ?? .default
+}
+
+public struct ChatListFeaturedFilter: PostboxCoding, Equatable {
+    public var title: String
+    public var description: String
+    public var data: ChatListFilterData
+    
+    fileprivate init(
+        title: String,
+        description: String,
+        data: ChatListFilterData
+    ) {
+        self.title = title
+        self.description = description
+        self.data = data
+    }
+    
+    public init(decoder: PostboxDecoder) {
+        self.title = decoder.decodeStringForKey("title", orElse: "")
+        self.description = decoder.decodeStringForKey("description", orElse: "")
+        self.data = ChatListFilterData(
+            categories: ChatListFilterPeerCategories(rawValue: decoder.decodeInt32ForKey("categories", orElse: 0)),
+            excludeMuted: decoder.decodeInt32ForKey("excludeMuted", orElse: 0) != 0,
+            excludeRead: decoder.decodeInt32ForKey("excludeRead", orElse: 0) != 0,
+            excludeArchived: decoder.decodeInt32ForKey("excludeArchived", orElse: 0) != 0,
+            includePeers: decoder.decodeInt64ArrayForKey("includePeers").map(PeerId.init),
+            excludePeers: decoder.decodeInt64ArrayForKey("excludePeers").map(PeerId.init)
+        )
+    }
+    
+    public func encode(_ encoder: PostboxEncoder) {
+        encoder.encodeString(self.title, forKey: "title")
+        encoder.encodeString(self.description, forKey: "description")
+        encoder.encodeInt32(self.data.categories.rawValue, forKey: "categories")
+        encoder.encodeInt32(self.data.excludeMuted ? 1 : 0, forKey: "excludeMuted")
+        encoder.encodeInt32(self.data.excludeRead ? 1 : 0, forKey: "excludeRead")
+        encoder.encodeInt32(self.data.excludeArchived ? 1 : 0, forKey: "excludeArchived")
+        encoder.encodeInt64Array(self.data.includePeers.map { $0.toInt64() }, forKey: "includePeers")
+        encoder.encodeInt64Array(self.data.excludePeers.map { $0.toInt64() }, forKey: "excludePeers")
+    }
+}
+
+public struct ChatListFiltersFeaturedState: PreferencesEntry, Equatable {
+    public var filters: [ChatListFeaturedFilter]
+    public var isSeen: Bool
+    
+    fileprivate init(filters: [ChatListFeaturedFilter], isSeen: Bool) {
+        self.filters = filters
+        self.isSeen = isSeen
+    }
+    
+    public init(decoder: PostboxDecoder) {
+        self.filters = decoder.decodeObjectArrayWithDecoderForKey("filters")
+        self.isSeen = decoder.decodeInt32ForKey("isSeen", orElse: 0) != 0
+    }
+    
+    public func encode(_ encoder: PostboxEncoder) {
+        encoder.encodeObjectArray(self.filters, forKey: "filters")
+        encoder.encodeInt32(self.isSeen ? 1 : 0, forKey: "isSeen")
+    }
+    
+    public func isEqual(to: PreferencesEntry) -> Bool {
+        if let to = to as? ChatListFiltersFeaturedState, self == to {
+            return true
+        } else {
+            return false
+        }
+    }
+}
+
+public func markChatListFeaturedFiltersAsSeen(postbox: Postbox) -> Signal<Never, NoError> {
+    return postbox.transaction { transaction -> Void in
+        transaction.updatePreferencesEntry(key: PreferencesKeys.chatListFiltersFeaturedState, { entry in
+            guard var state = entry as? ChatListFiltersFeaturedState else {
+                return entry
+            }
+            state.isSeen = true
+            return state
+        })
+    }
+    |> ignoreValues
+}
+
+public func unmarkChatListFeaturedFiltersAsSeen(transaction: Transaction) {
+    transaction.updatePreferencesEntry(key: PreferencesKeys.chatListFiltersFeaturedState, { entry in
+        guard var state = entry as? ChatListFiltersFeaturedState else {
+            return entry
+        }
+        state.isSeen = false
+        return state
+    })
+}
+
+public func updateChatListFeaturedFilters(postbox: Postbox, network: Network) -> Signal<Never, NoError> {
+    return network.request(Api.functions.messages.getSuggestedDialogFilters())
+    |> `catch` { _ -> Signal<[Api.DialogFilterSuggested], NoError> in
+        return .single([])
+    }
+    |> mapToSignal { result -> Signal<Never, NoError> in
+        return postbox.transaction { transaction -> Void in
+            transaction.updatePreferencesEntry(key: PreferencesKeys.chatListFiltersFeaturedState, { entry in
+                var state = entry as? ChatListFiltersFeaturedState ?? ChatListFiltersFeaturedState(filters: [], isSeen: false)
+                state.filters = result.map { item -> ChatListFeaturedFilter in
+                    switch item {
+                    case let .dialogFilterSuggested(filter, description):
+                        let parsedFilter = ChatListFilter(apiFilter: filter)
+                        return ChatListFeaturedFilter(title: parsedFilter.title, description: description, data: parsedFilter.data)
+                    }
+                }
+                return state
+            })
+        }
+        |> ignoreValues
+    }
+}
+
+private enum SynchronizeChatListFiltersOperationContentType: Int32 {
+    case add
+    case remove
+    case sync
+}
+
+private enum SynchronizeChatListFiltersOperationContent: PostboxCoding {
+    case sync
+    
+    public init(decoder: PostboxDecoder) {
+        switch decoder.decodeInt32ForKey("r", orElse: 0) {
+        case SynchronizeChatListFiltersOperationContentType.sync.rawValue:
+            self = .sync
+        default:
+            assertionFailure()
+            self = .sync
+        }
+    }
+    
+    public func encode(_ encoder: PostboxEncoder) {
+        switch self {
+        case .sync:
+            encoder.encodeInt32(SynchronizeChatListFiltersOperationContentType.sync.rawValue, forKey: "r")
+        }
+    }
+}
+
+final class SynchronizeChatListFiltersOperation: PostboxCoding {
+    fileprivate let content: SynchronizeChatListFiltersOperationContent
+    
+    fileprivate init(content: SynchronizeChatListFiltersOperationContent) {
+        self.content = content
+    }
+    
+    init(decoder: PostboxDecoder) {
+        self.content = decoder.decodeObjectForKey("c", decoder: { SynchronizeChatListFiltersOperationContent(decoder: $0) }) as! SynchronizeChatListFiltersOperationContent
+    }
+    
+    func encode(_ encoder: PostboxEncoder) {
+        encoder.encodeObject(self.content, forKey: "c")
+    }
+}
+
+
+private final class ManagedSynchronizeChatListFiltersOperationsHelper {
+    var operationDisposables: [Int32: Disposable] = [:]
+    
+    func update(_ entries: [PeerMergedOperationLogEntry]) -> (disposeOperations: [Disposable], beginOperations: [(PeerMergedOperationLogEntry, MetaDisposable)]) {
+        var disposeOperations: [Disposable] = []
+        var beginOperations: [(PeerMergedOperationLogEntry, MetaDisposable)] = []
+        
+        var hasRunningOperationForPeerId = Set<PeerId>()
+        var validMergedIndices = Set<Int32>()
+        for entry in entries {
+            if !hasRunningOperationForPeerId.contains(entry.peerId) {
+                hasRunningOperationForPeerId.insert(entry.peerId)
+                validMergedIndices.insert(entry.mergedIndex)
+                
+                if self.operationDisposables[entry.mergedIndex] == nil {
+                    let disposable = MetaDisposable()
+                    beginOperations.append((entry, disposable))
+                    self.operationDisposables[entry.mergedIndex] = disposable
+                }
+            }
+        }
+        
+        var removeMergedIndices: [Int32] = []
+        for (mergedIndex, disposable) in self.operationDisposables {
+            if !validMergedIndices.contains(mergedIndex) {
+                removeMergedIndices.append(mergedIndex)
+                disposeOperations.append(disposable)
+            }
+        }
+        
+        for mergedIndex in removeMergedIndices {
+            self.operationDisposables.removeValue(forKey: mergedIndex)
+        }
+        
+        return (disposeOperations, beginOperations)
+    }
+    
+    func reset() -> [Disposable] {
+        let disposables = Array(self.operationDisposables.values)
+        self.operationDisposables.removeAll()
+        return disposables
+    }
+}
+
+private func withTakenOperation(postbox: Postbox, peerId: PeerId, tag: PeerOperationLogTag, tagLocalIndex: Int32, _ f: @escaping (Transaction, PeerMergedOperationLogEntry?) -> Signal<Never, NoError>) -> Signal<Never, NoError> {
+    return postbox.transaction { transaction -> Signal<Never, NoError> in
+        var result: PeerMergedOperationLogEntry?
+        transaction.operationLogUpdateEntry(peerId: peerId, tag: tag, tagLocalIndex: tagLocalIndex, { entry in
+            if let entry = entry, let _ = entry.mergedIndex, entry.contents is SynchronizeChatListFiltersOperation  {
+                result = entry.mergedEntry!
+                return PeerOperationLogEntryUpdate(mergedIndex: .none, contents: .none)
+            } else {
+                return PeerOperationLogEntryUpdate(mergedIndex: .none, contents: .none)
+            }
+        })
+        
+        return f(transaction, result)
+    }
+    |> switchToLatest
+}
+
+func requestChatListFiltersSync(transaction: Transaction) {
+    let tag: PeerOperationLogTag = OperationLogTags.SynchronizeChatListFilters
+    let peerId = PeerId(namespace: 0, id: 0)
+    
+    var topOperation: (SynchronizeChatListFiltersOperation, Int32)?
+    transaction.operationLogEnumerateEntries(peerId: peerId, tag: tag, { entry in
+        if let operation = entry.contents as? SynchronizeChatListFiltersOperation {
+            topOperation = (operation, entry.tagLocalIndex)
+        }
+        return false
+    })
+    
+    if let (topOperation, topLocalIndex) = topOperation, case .sync = topOperation.content {
+        let _ = transaction.operationLogRemoveEntry(peerId: peerId, tag: tag, tagLocalIndex: topLocalIndex)
+    }
+    
+    transaction.operationLogAddEntry(peerId: peerId, tag: tag, tagLocalIndex: .automatic, tagMergedIndex: .automatic, contents: SynchronizeChatListFiltersOperation(content: .sync))
+}
+
+func managedChatListFilters(postbox: Postbox, network: Network) -> Signal<Void, NoError> {
+    return Signal { _ in
+        let updateFeaturedDisposable = updateChatListFeaturedFilters(postbox: postbox, network: network).start()
+        let _ = postbox.transaction({ transaction in
+            requestChatListFiltersSync(transaction: transaction)
+        }).start()
+        
+        let tag: PeerOperationLogTag = OperationLogTags.SynchronizeChatListFilters
+        
+        let helper = Atomic<ManagedSynchronizeChatListFiltersOperationsHelper>(value: ManagedSynchronizeChatListFiltersOperationsHelper())
+        
+        let disposable = postbox.mergedOperationLogView(tag: tag, limit: 10).start(next: { view in
+            let (disposeOperations, beginOperations) = helper.with { helper -> (disposeOperations: [Disposable], beginOperations: [(PeerMergedOperationLogEntry, MetaDisposable)]) in
+                return helper.update(view.entries)
+            }
+            
+            for disposable in disposeOperations {
+                disposable.dispose()
+            }
+            
+            for (entry, disposable) in beginOperations {
+                let signal = withTakenOperation(postbox: postbox, peerId: entry.peerId, tag: tag, tagLocalIndex: entry.tagLocalIndex, { transaction, entry -> Signal<Never, NoError> in
+                    if let entry = entry {
+                        if let operation = entry.contents as? SynchronizeChatListFiltersOperation {
+                            return synchronizeChatListFilters(transaction: transaction, postbox: postbox, network: network, operation: operation)
+                        } else {
+                            assertionFailure()
+                        }
+                    }
+                    return .complete()
+                })
+                |> then(
+                    postbox.transaction { transaction -> Void in
+                    let _ = transaction.operationLogRemoveEntry(peerId: entry.peerId, tag: tag, tagLocalIndex: entry.tagLocalIndex)
+                    }
+                    |> ignoreValues
+                )
+                
+                disposable.set(signal.start())
+            }
+        })
+        
+        return ActionDisposable {
+            updateFeaturedDisposable.dispose()
+            
+            let disposables = helper.with { helper -> [Disposable] in
+                return helper.reset()
+            }
+            for disposable in disposables {
+                disposable.dispose()
+            }
+            disposable.dispose()
+        }
+    }
+}
+
+private func synchronizeChatListFilters(transaction: Transaction, postbox: Postbox, network: Network, operation: SynchronizeChatListFiltersOperation) -> Signal<Never, NoError> {
+    switch operation.content {
+    case .sync:
+        let settings = transaction.getPreferencesEntry(key: PreferencesKeys.chatListFilters) as? ChatListFiltersState ?? ChatListFiltersState.default
+        let localFilters = settings.filters
+        let locallyKnownRemoteFilters = settings.remoteFilters ?? []
+        
+        return requestChatListFilters(postbox: postbox, network: network)
+        |> `catch` { _ -> Signal<[ChatListFilter], NoError> in
+            return .complete()
+        }
+        |> mapToSignal { remoteFilters -> Signal<Never, NoError> in
+            if localFilters == locallyKnownRemoteFilters {
+                return postbox.transaction { transaction -> Void in
+                    let _ = updateChatListFiltersState(transaction: transaction, { state in
+                        var state = state
+                        state.filters = remoteFilters
+                        state.remoteFilters = state.filters
+                        return state
+                    })
+                }
+                |> ignoreValues
+            }
+            
+            let locallyKnownRemoteFilterIds = locallyKnownRemoteFilters.map { $0.id }
+            
+            let remoteFilterIds = remoteFilters.map { $0.id }
+            let remotelyAddedFilters = Set(remoteFilterIds).subtracting(Set(locallyKnownRemoteFilterIds))
+            let remotelyRemovedFilters = Set(Set(locallyKnownRemoteFilterIds)).subtracting(remoteFilterIds)
+            
+            var mergedFilters = localFilters
+            
+            for id in remotelyRemovedFilters {
+                mergedFilters.removeAll(where: { $0.id == id })
+            }
+            
+            for id in remotelyAddedFilters {
+                if let filter = remoteFilters.first(where: { $0.id == id }) {
+                    if let index = mergedFilters.firstIndex(where: { $0.id == id }) {
+                        mergedFilters[index] = filter
+                    } else {
+                        mergedFilters.append(filter)
+                    }
+                }
+            }
+            
+            let mergedFilterIds = mergedFilters.map { $0.id }
+            
+            var deleteSignals: Signal<Never, NoError> = .complete()
+            for filter in remoteFilters {
+                if !mergedFilterIds.contains(where: { $0 == filter.id }) {
+                    deleteSignals = deleteSignals
+                    |> then(
+                        requestUpdateChatListFilter(postbox: postbox, network: network, id: filter.id, filter: nil)
+                        |> `catch` { _ -> Signal<Never, NoError> in
+                            return .complete()
+                        }
+                        |> ignoreValues
+                    )
+                }
+            }
+            
+            var addSignals: Signal<Never, NoError> = .complete()
+            for filter in mergedFilters {
+                let updated: Bool
+                if let index = remoteFilters.firstIndex(where: { $0.id == filter.id }) {
+                    updated = remoteFilters[index] != filter
+                } else {
+                    updated = true
+                }
+                if updated {
+                    addSignals = addSignals
+                    |> then(
+                        requestUpdateChatListFilter(postbox: postbox, network: network, id: filter.id, filter: filter)
+                        |> `catch` { _ -> Signal<Never, NoError> in
+                            return .complete()
+                        }
+                        |> ignoreValues
+                    )
+                }
+            }
+            
+            let reorderFilters: Signal<Never, NoError>
+            if mergedFilterIds != remoteFilterIds {
+                reorderFilters = network.request(Api.functions.messages.updateDialogFiltersOrder(order: mergedFilters.map { $0.id }))
+                |> ignoreValues
+                |> `catch` { _ -> Signal<Never, NoError> in
+                    return .complete()
+                }
+            } else {
+                reorderFilters = .complete()
+            }
+            
+            return deleteSignals
+            |> then(
+                addSignals
+            )
+            |> then(
+                reorderFilters
+            )
+            |> then(
+                postbox.transaction { transaction -> Void in
+                    let _ = updateChatListFiltersState(transaction: transaction, { state in
+                        var state = state
+                        state.filters = mergedFilters
+                        state.remoteFilters = state.filters
+                        return state
+                    })
+                }
+                |> ignoreValues
+            )
+        }
+    }
+}
diff --git a/submodules/TelegramCore/Sources/ChatUpdatingMessageMedia.swift b/submodules/TelegramCore/Sources/ChatUpdatingMessageMedia.swift
index f3fa1baf1a..fec9229846 100644
--- a/submodules/TelegramCore/Sources/ChatUpdatingMessageMedia.swift
+++ b/submodules/TelegramCore/Sources/ChatUpdatingMessageMedia.swift
@@ -1,7 +1,6 @@
 import Foundation
 import Postbox
 import SyncCore
-import TelegramCore
 
 public final class ChatUpdatingMessageMedia: Equatable {
     public let text: String
diff --git a/submodules/TelegramCore/Sources/ContactManagement.swift b/submodules/TelegramCore/Sources/ContactManagement.swift
index bf5d391db8..f2bb32ffc9 100644
--- a/submodules/TelegramCore/Sources/ContactManagement.swift
+++ b/submodules/TelegramCore/Sources/ContactManagement.swift
@@ -2,7 +2,7 @@ import Foundation
 import TelegramApi
 import Postbox
 import SwiftSignalKit
-
+import CryptoUtils
 import SyncCore
 
 private func md5(_ data: Data) -> Data {
diff --git a/submodules/TelegramCore/Sources/JoinChannel.swift b/submodules/TelegramCore/Sources/JoinChannel.swift
index 6189c72da2..e230dd947c 100644
--- a/submodules/TelegramCore/Sources/JoinChannel.swift
+++ b/submodules/TelegramCore/Sources/JoinChannel.swift
@@ -15,9 +15,6 @@ public func joinChannel(account: Account, peerId: PeerId) -> Signal<RenderedChan
     |> take(1)
     |> castError(JoinChannelError.self)
     |> mapToSignal { peer -> Signal<RenderedChannelParticipant?, JoinChannelError> in
-        #if DEBUG
-        return .fail(.tooMuchJoined)
-        #endif
         if let inputChannel = apiInputChannel(peer) {
             return account.network.request(Api.functions.channels.joinChannel(channel: inputChannel))
             |> mapError { error -> JoinChannelError in
diff --git a/submodules/TelegramCore/Sources/Log.swift b/submodules/TelegramCore/Sources/Log.swift
index 0341d6f8ea..4ea33111c9 100644
--- a/submodules/TelegramCore/Sources/Log.swift
+++ b/submodules/TelegramCore/Sources/Log.swift
@@ -2,6 +2,7 @@ import Foundation
 import SwiftSignalKit
 import Postbox
 import TelegramApi
+import NetworkLogging
 
 private let queue = DispatchQueue(label: "org.telegram.Telegram.trace", qos: .utility)
 
@@ -61,6 +62,7 @@ public func registerLoggingFunctions() {
         }
     })
     setTelegramApiLogger({ what in
+        Logger.shared.log("Api", what as String)
         Logger.shared.shortLog("Api", what as String)
     })
 }
diff --git a/submodules/TelegramCore/Sources/MD5.swift b/submodules/TelegramCore/Sources/MD5.swift
index c970e11ad0..3c64edda8e 100644
--- a/submodules/TelegramCore/Sources/MD5.swift
+++ b/submodules/TelegramCore/Sources/MD5.swift
@@ -1,5 +1,6 @@
 import Foundation
 import Postbox
+import CryptoUtils
 
 public extension MemoryBuffer {
     func md5Digest() -> Data {
diff --git a/submodules/TelegramCore/Sources/ManagedChatListHoles.swift b/submodules/TelegramCore/Sources/ManagedChatListHoles.swift
index dca1df5fad..aaa8353268 100644
--- a/submodules/TelegramCore/Sources/ManagedChatListHoles.swift
+++ b/submodules/TelegramCore/Sources/ManagedChatListHoles.swift
@@ -79,11 +79,15 @@ func managedChatListHoles(network: Network, postbox: Postbox, accountPeerId: Pee
             var additionalLatestArchiveHole: ChatListHole?
             
             if let preferencesView = combinedView.views[filtersKey] as? PreferencesView, let filtersState = preferencesView.values[PreferencesKeys.chatListFilters] as? ChatListFiltersState, !filtersState.filters.isEmpty {
-                if let topRootHole = combinedView.views[topRootHoleKey] as? AllChatListHolesView {
-                    additionalLatestHole = topRootHole.latestHole
+                if let topRootHole = combinedView.views[topRootHoleKey] as? AllChatListHolesView, let hole = topRootHole.latestHole {
+                    if !view.entries.contains(ChatListHolesEntry(groupId: .root, hole: hole)) {
+                        additionalLatestHole = hole
+                    }
                 }
-                if let topArchiveHole = combinedView.views[topArchiveHoleKey] as? AllChatListHolesView {
-                    additionalLatestArchiveHole = topArchiveHole.latestHole
+                if let topArchiveHole = combinedView.views[topArchiveHoleKey] as? AllChatListHolesView, let hole = topArchiveHole.latestHole {
+                    if !view.entries.contains(ChatListHolesEntry(groupId: Namespaces.PeerGroup.archive, hole: hole)) {
+                        additionalLatestArchiveHole = hole
+                    }
                 }
             }
             
@@ -104,7 +108,7 @@ func managedChatListHoles(network: Network, postbox: Postbox, accountPeerId: Pee
             }
             
             if let (hole, disposable) = addedAdditionalLatestArchiveHole {
-                disposable.set(fetchChatListHole(postbox: postbox, network: network, accountPeerId: accountPeerId, groupId: .root, hole: hole).start())
+                disposable.set(fetchChatListHole(postbox: postbox, network: network, accountPeerId: accountPeerId, groupId: Namespaces.PeerGroup.archive, hole: hole).start())
             }
         })
         
diff --git a/submodules/TelegramCore/Sources/MultipartUpload.swift b/submodules/TelegramCore/Sources/MultipartUpload.swift
index 39bbaa396e..ac1246a68b 100644
--- a/submodules/TelegramCore/Sources/MultipartUpload.swift
+++ b/submodules/TelegramCore/Sources/MultipartUpload.swift
@@ -3,7 +3,7 @@ import Postbox
 import TelegramApi
 import SwiftSignalKit
 import MtProtoKit
-
+import CryptoUtils
 import SyncCore
 
 private typealias SignalKitTimer = SwiftSignalKit.Timer
diff --git a/submodules/TelegramCore/Sources/Network.swift b/submodules/TelegramCore/Sources/Network.swift
index 5a7d148b23..0e779d912a 100644
--- a/submodules/TelegramCore/Sources/Network.swift
+++ b/submodules/TelegramCore/Sources/Network.swift
@@ -1,9 +1,9 @@
 import Foundation
-
 import Postbox
 import TelegramApi
 import SwiftSignalKit
 import MtProtoKit
+import NetworkLogging
 
 #if os(iOS)
     import CloudData
diff --git a/submodules/TelegramCore/Sources/NetworkType.swift b/submodules/TelegramCore/Sources/NetworkType.swift
index 9cdf3833b6..52e111a845 100644
--- a/submodules/TelegramCore/Sources/NetworkType.swift
+++ b/submodules/TelegramCore/Sources/NetworkType.swift
@@ -1,6 +1,7 @@
 import Foundation
 import SwiftSignalKit
 import MtProtoKit
+import Reachability
 #if os(iOS)
 import CoreTelephony
 #endif
diff --git a/submodules/TelegramCore/Sources/PendingMessageUploadedContent.swift b/submodules/TelegramCore/Sources/PendingMessageUploadedContent.swift
index d544f93fa6..ae508078d9 100644
--- a/submodules/TelegramCore/Sources/PendingMessageUploadedContent.swift
+++ b/submodules/TelegramCore/Sources/PendingMessageUploadedContent.swift
@@ -2,7 +2,7 @@ import Foundation
 import Postbox
 import TelegramApi
 import SwiftSignalKit
-
+import CryptoUtils
 import SyncCore
 
 enum PendingMessageUploadedContent {
diff --git a/submodules/TelegramCore/Sources/SecureIdConfiguration.swift b/submodules/TelegramCore/Sources/SecureIdConfiguration.swift
index 46c2336775..2aa9cc2e98 100644
--- a/submodules/TelegramCore/Sources/SecureIdConfiguration.swift
+++ b/submodules/TelegramCore/Sources/SecureIdConfiguration.swift
@@ -1,3 +1,4 @@
+import Foundation
 import Postbox
 import MtProtoKit
 import SwiftSignalKit
diff --git a/submodules/TelegramCore/Sources/WebpagePreview.swift b/submodules/TelegramCore/Sources/WebpagePreview.swift
index 6f7066202c..b06191804a 100644
--- a/submodules/TelegramCore/Sources/WebpagePreview.swift
+++ b/submodules/TelegramCore/Sources/WebpagePreview.swift
@@ -78,11 +78,12 @@ public func webpagePreviewWithProgress(account: Account, url: String, webpageId:
 public func actualizedWebpage(postbox: Postbox, network: Network, webpage: TelegramMediaWebpage) -> Signal<TelegramMediaWebpage, NoError> {
     if case let .Loaded(content) = webpage.content {
         return network.request(Api.functions.messages.getWebPage(url: content.url, hash: content.hash))
-            |> `catch` { _ -> Signal<Api.WebPage, NoError> in
-                return .single(.webPageNotModified(flags: 0, cachedPageViews: nil))
+            |> map(Optional.init)
+            |> `catch` { _ -> Signal<Api.WebPage?, NoError> in
+                return .single(nil)
             }
             |> mapToSignal { result -> Signal<TelegramMediaWebpage, NoError> in
-                if let updatedWebpage = telegramMediaWebpageFromApiWebpage(result, url: nil), case .Loaded = updatedWebpage.content, updatedWebpage.webpageId == webpage.webpageId {
+                if let result = result, let updatedWebpage = telegramMediaWebpageFromApiWebpage(result, url: nil), case .Loaded = updatedWebpage.content, updatedWebpage.webpageId == webpage.webpageId {
                     return postbox.transaction { transaction -> TelegramMediaWebpage in
                         updateMessageMedia(transaction: transaction, id: webpage.webpageId, media: updatedWebpage)
                         return updatedWebpage
@@ -106,11 +107,12 @@ public func actualizedWebpage(postbox: Postbox, network: Network, webpage: Teleg
 func updatedRemoteWebpage(postbox: Postbox, network: Network, webPage: WebpageReference) -> Signal<TelegramMediaWebpage?, NoError> {
     if case let .webPage(id, url) = webPage.content {
         return network.request(Api.functions.messages.getWebPage(url: url, hash: 0))
-        |> `catch` { _ -> Signal<Api.WebPage, NoError> in
-            return .single(.webPageNotModified(flags: 0, cachedPageViews: nil))
+        |> map(Optional.init)
+        |> `catch` { _ -> Signal<Api.WebPage?, NoError> in
+            return .single(nil)
         }
         |> mapToSignal { result -> Signal<TelegramMediaWebpage?, NoError> in
-            if let updatedWebpage = telegramMediaWebpageFromApiWebpage(result, url: nil), case .Loaded = updatedWebpage.content, updatedWebpage.webpageId.id == id {
+            if let result = result, let updatedWebpage = telegramMediaWebpageFromApiWebpage(result, url: nil), case .Loaded = updatedWebpage.content, updatedWebpage.webpageId.id == id {
                 return postbox.transaction { transaction -> TelegramMediaWebpage? in
                     if transaction.getMedia(updatedWebpage.webpageId) != nil {
                         updateMessageMedia(transaction: transaction, id: updatedWebpage.webpageId, media: updatedWebpage)
diff --git a/submodules/TelegramIntents/BUILD b/submodules/TelegramIntents/BUILD
new file mode 100644
index 0000000000..66569b5f55
--- /dev/null
+++ b/submodules/TelegramIntents/BUILD
@@ -0,0 +1,21 @@
+load("@build_bazel_rules_swift//swift:swift.bzl", "swift_library")
+
+swift_library(
+    name = "TelegramIntents",
+    module_name = "TelegramIntents",
+    srcs = glob([
+        "Sources/**/*.swift",
+    ]),
+    deps = [
+    	"//submodules/TelegramCore:TelegramCore",
+        "//submodules/SyncCore:SyncCore",
+        "//submodules/SSignalKit/SwiftSignalKit:SwiftSignalKit",
+        "//submodules/Display:Display",
+        "//submodules/AccountContext:AccountContext",
+        "//submodules/TelegramPresentationData:TelegramPresentationData",
+        "//submodules/AvatarNode:AvatarNode",
+    ],
+    visibility = [
+        "//visibility:public",
+    ],
+)
diff --git a/submodules/TelegramIntents/Info.plist b/submodules/TelegramIntents/Info.plist
deleted file mode 100644
index e1fe4cfb7b..0000000000
--- a/submodules/TelegramIntents/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/TelegramNotices/BUILD b/submodules/TelegramNotices/BUILD
new file mode 100644
index 0000000000..d0b8191524
--- /dev/null
+++ b/submodules/TelegramNotices/BUILD
@@ -0,0 +1,17 @@
+load("@build_bazel_rules_swift//swift:swift.bzl", "swift_library")
+
+swift_library(
+    name = "TelegramNotices",
+    module_name = "TelegramNotices",
+    srcs = glob([
+        "Sources/**/*.swift",
+    ]),
+    deps = [
+    	"//submodules/Postbox:Postbox",
+        "//submodules/SSignalKit/SwiftSignalKit:SwiftSignalKit",
+        "//submodules/TelegramPermissions:TelegramPermissions",
+    ],
+    visibility = [
+        "//visibility:public",
+    ],
+)
diff --git a/submodules/TelegramNotices/Info.plist b/submodules/TelegramNotices/Info.plist
deleted file mode 100644
index e1fe4cfb7b..0000000000
--- a/submodules/TelegramNotices/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/TelegramNotices/Sources/TelegramNotices.h b/submodules/TelegramNotices/Sources/TelegramNotices.h
deleted file mode 100644
index b500e6e0ee..0000000000
--- a/submodules/TelegramNotices/Sources/TelegramNotices.h
+++ /dev/null
@@ -1,19 +0,0 @@
-//
-//  TelegramNotices.h
-//  TelegramNotices
-//
-//  Created by Peter on 8/10/19.
-//  Copyright © 2019 Telegram Messenger LLP. All rights reserved.
-//
-
-#import <UIKit/UIKit.h>
-
-//! Project version number for TelegramNotices.
-FOUNDATION_EXPORT double TelegramNoticesVersionNumber;
-
-//! Project version string for TelegramNotices.
-FOUNDATION_EXPORT const unsigned char TelegramNoticesVersionString[];
-
-// In this header, you should import all the public headers of your framework using statements like #import <TelegramNotices/PublicHeader.h>
-
-
diff --git a/submodules/TelegramPermissions/BUILD b/submodules/TelegramPermissions/BUILD
new file mode 100644
index 0000000000..6232c96dcb
--- /dev/null
+++ b/submodules/TelegramPermissions/BUILD
@@ -0,0 +1,20 @@
+load("@build_bazel_rules_swift//swift:swift.bzl", "swift_library")
+
+swift_library(
+    name = "TelegramPermissions",
+    module_name = "TelegramPermissions",
+    srcs = glob([
+        "Sources/**/*.swift",
+    ]),
+    deps = [
+    	"//submodules/Postbox:Postbox",
+        "//submodules/TelegramCore:TelegramCore",
+        "//submodules/SyncCore:SyncCore",
+        "//submodules/SSignalKit/SwiftSignalKit:SwiftSignalKit",
+        "//submodules/AccountContext:AccountContext",
+        "//submodules/DeviceAccess:DeviceAccess",
+    ],
+    visibility = [
+        "//visibility:public",
+    ],
+)
diff --git a/submodules/TelegramPermissions/Info.plist b/submodules/TelegramPermissions/Info.plist
deleted file mode 100644
index e1fe4cfb7b..0000000000
--- a/submodules/TelegramPermissions/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/TelegramPermissions/Sources/TelegramPermissions.h b/submodules/TelegramPermissions/Sources/TelegramPermissions.h
deleted file mode 100644
index 06fcbc7884..0000000000
--- a/submodules/TelegramPermissions/Sources/TelegramPermissions.h
+++ /dev/null
@@ -1,19 +0,0 @@
-//
-//  TelegramPermissions.h
-//  TelegramPermissions
-//
-//  Created by Peter on 8/10/19.
-//  Copyright © 2019 Telegram Messenger LLP. All rights reserved.
-//
-
-#import <UIKit/UIKit.h>
-
-//! Project version number for TelegramPermissions.
-FOUNDATION_EXPORT double TelegramPermissionsVersionNumber;
-
-//! Project version string for TelegramPermissions.
-FOUNDATION_EXPORT const unsigned char TelegramPermissionsVersionString[];
-
-// In this header, you should import all the public headers of your framework using statements like #import <TelegramPermissions/PublicHeader.h>
-
-
diff --git a/submodules/TelegramPermissionsUI/BUILD b/submodules/TelegramPermissionsUI/BUILD
new file mode 100644
index 0000000000..e45c5473fb
--- /dev/null
+++ b/submodules/TelegramPermissionsUI/BUILD
@@ -0,0 +1,30 @@
+load("@build_bazel_rules_swift//swift:swift.bzl", "swift_library")
+
+swift_library(
+    name = "TelegramPermissionsUI",
+    module_name = "TelegramPermissionsUI",
+    srcs = glob([
+        "Sources/**/*.swift",
+    ]),
+    deps = [
+    	"//submodules/SSignalKit/SwiftSignalKit:SwiftSignalKit",
+        "//submodules/AsyncDisplayKit:AsyncDisplayKit",
+        "//submodules/Display:Display",
+        "//submodules/Postbox:Postbox",
+        "//submodules/TelegramCore:TelegramCore",
+        "//submodules/SyncCore:SyncCore",
+        "//submodules/TelegramPresentationData:TelegramPresentationData",
+        "//submodules/AccountContext:AccountContext",
+        "//submodules/TextFormat:TextFormat",
+        "//submodules/Markdown:Markdown",
+        "//submodules/TelegramPermissions:TelegramPermissions",
+        "//submodules/DeviceAccess:DeviceAccess",
+        "//submodules/PeersNearbyIconNode:PeersNearbyIconNode",
+        "//submodules/SolidRoundedButtonNode:SolidRoundedButtonNode",
+        "//submodules/AppBundle:AppBundle",
+        "//submodules/PresentationDataUtils:PresentationDataUtils",
+    ],
+    visibility = [
+        "//visibility:public",
+    ],
+)
diff --git a/submodules/TelegramPermissionsUI/Info.plist b/submodules/TelegramPermissionsUI/Info.plist
deleted file mode 100644
index e1fe4cfb7b..0000000000
--- a/submodules/TelegramPermissionsUI/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/TelegramPermissionsUI/Sources/TelegramPermissionsUI.h b/submodules/TelegramPermissionsUI/Sources/TelegramPermissionsUI.h
deleted file mode 100644
index 3be2c04f1f..0000000000
--- a/submodules/TelegramPermissionsUI/Sources/TelegramPermissionsUI.h
+++ /dev/null
@@ -1,19 +0,0 @@
-//
-//  TelegramPermissionsUI.h
-//  TelegramPermissionsUI
-//
-//  Created by Peter on 8/13/19.
-//  Copyright © 2019 Telegram Messenger LLP. All rights reserved.
-//
-
-#import <UIKit/UIKit.h>
-
-//! Project version number for TelegramPermissionsUI.
-FOUNDATION_EXPORT double TelegramPermissionsUIVersionNumber;
-
-//! Project version string for TelegramPermissionsUI.
-FOUNDATION_EXPORT const unsigned char TelegramPermissionsUIVersionString[];
-
-// In this header, you should import all the public headers of your framework using statements like #import <TelegramPermissionsUI/PublicHeader.h>
-
-
diff --git a/submodules/TelegramPresentationData/BUCK b/submodules/TelegramPresentationData/BUCK
index 65db87edf5..9d32fb134e 100644
--- a/submodules/TelegramPresentationData/BUCK
+++ b/submodules/TelegramPresentationData/BUCK
@@ -4,14 +4,7 @@ static_library(
     name = "TelegramPresentationData",
     srcs = glob([
         "Sources/**/*.swift",
-        "Sources/*.m",
     ]),
-    headers = glob([
-        "Sources/*.h",
-    ], exclude = ["Sources/TelegramPresentationData.h"]),
-    exported_headers = glob([
-        "Sources/*.h",
-    ], exclude = ["Sources/TelegramPresentationData.h"]),
     deps = [
     	"//submodules/TelegramCore:TelegramCore#shared",
         "//submodules/SyncCore:SyncCore#shared",
@@ -22,6 +15,7 @@ static_library(
         "//submodules/MediaResources:MediaResources",
         "//submodules/AppBundle:AppBundle",
         "//submodules/StringPluralization:StringPluralization",
+        "//submodules/Sunrise:Sunrise",
     ],
     frameworks = [
         "$SDKROOT/System/Library/Frameworks/Foundation.framework",
diff --git a/submodules/TelegramPresentationData/BUILD b/submodules/TelegramPresentationData/BUILD
new file mode 100644
index 0000000000..741b28c6b7
--- /dev/null
+++ b/submodules/TelegramPresentationData/BUILD
@@ -0,0 +1,24 @@
+load("@build_bazel_rules_swift//swift:swift.bzl", "swift_library")
+
+swift_library(
+    name = "TelegramPresentationData",
+    module_name = "TelegramPresentationData",
+    srcs = glob([
+        "Sources/**/*.swift",
+    ]),
+    deps = [
+        "//submodules/TelegramCore:TelegramCore",
+        "//submodules/SyncCore:SyncCore",
+        "//submodules/Postbox:Postbox",
+        "//submodules/Display:Display",
+        "//submodules/SSignalKit/SwiftSignalKit:SwiftSignalKit",
+        "//submodules/TelegramUIPreferences:TelegramUIPreferences",
+        "//submodules/MediaResources:MediaResources",
+        "//submodules/AppBundle:AppBundle",
+        "//submodules/StringPluralization:StringPluralization",
+        "//submodules/Sunrise:Sunrise",
+    ],
+    visibility = [
+        "//visibility:public",
+    ],
+)
diff --git a/submodules/TelegramPresentationData/Info.plist b/submodules/TelegramPresentationData/Info.plist
deleted file mode 100644
index e1fe4cfb7b..0000000000
--- a/submodules/TelegramPresentationData/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/TelegramPresentationData/Sources/DefaultDarkPresentationTheme.swift b/submodules/TelegramPresentationData/Sources/DefaultDarkPresentationTheme.swift
index 6304a86943..1a3977d678 100644
--- a/submodules/TelegramPresentationData/Sources/DefaultDarkPresentationTheme.swift
+++ b/submodules/TelegramPresentationData/Sources/DefaultDarkPresentationTheme.swift
@@ -256,7 +256,9 @@ public func makeDefaultDarkPresentationTheme(extendingThemeReference: Presentati
         segmentedBackgroundColor: UIColor(rgb: 0x3a3b3d),
         segmentedForegroundColor: UIColor(rgb: 0x6f7075),
         segmentedTextColor: UIColor(rgb: 0xffffff),
-        segmentedDividerColor: UIColor(rgb: 0x505155)
+        segmentedDividerColor: UIColor(rgb: 0x505155),
+        clearButtonBackgroundColor: UIColor(rgb: 0xffffff, alpha: 0.1),
+        clearButtonForegroundColor: UIColor(rgb: 0xffffff)
     )
 
     let navigationSearchBar = PresentationThemeNavigationSearchBar(
diff --git a/submodules/TelegramPresentationData/Sources/DefaultDarkTintedPresentationTheme.swift b/submodules/TelegramPresentationData/Sources/DefaultDarkTintedPresentationTheme.swift
index f3c6970e6a..29881405f1 100644
--- a/submodules/TelegramPresentationData/Sources/DefaultDarkTintedPresentationTheme.swift
+++ b/submodules/TelegramPresentationData/Sources/DefaultDarkTintedPresentationTheme.swift
@@ -503,7 +503,9 @@ public func makeDefaultDarkTintedPresentationTheme(extendingThemeReference: Pres
         segmentedBackgroundColor: mainInputColor,
         segmentedForegroundColor: mainBackgroundColor,
         segmentedTextColor: UIColor(rgb: 0xffffff),
-        segmentedDividerColor: mainSecondaryTextColor.withAlphaComponent(0.5)
+        segmentedDividerColor: mainSecondaryTextColor.withAlphaComponent(0.5),
+        clearButtonBackgroundColor: UIColor(rgb: 0xffffff, alpha: 0.1),
+        clearButtonForegroundColor: UIColor(rgb: 0xffffff)
     )
 
     let navigationSearchBar = PresentationThemeNavigationSearchBar(
diff --git a/submodules/TelegramPresentationData/Sources/DefaultDayPresentationTheme.swift b/submodules/TelegramPresentationData/Sources/DefaultDayPresentationTheme.swift
index 0522f7a94b..20fbe6f575 100644
--- a/submodules/TelegramPresentationData/Sources/DefaultDayPresentationTheme.swift
+++ b/submodules/TelegramPresentationData/Sources/DefaultDayPresentationTheme.swift
@@ -360,7 +360,9 @@ public func makeDefaultDayPresentationTheme(extendingThemeReference: Presentatio
         segmentedBackgroundColor: UIColor(rgb: 0xe9e9e9),
         segmentedForegroundColor: UIColor(rgb: 0xf7f7f7),
         segmentedTextColor: UIColor(rgb: 0x000000),
-        segmentedDividerColor: UIColor(rgb: 0xd6d6dc)
+        segmentedDividerColor: UIColor(rgb: 0xd6d6dc),
+        clearButtonBackgroundColor: UIColor(rgb: 0xE3E3E3, alpha: 0.78),
+        clearButtonForegroundColor: UIColor(rgb: 0x7f7f7f)
     )
     
     let navigationSearchBar = PresentationThemeNavigationSearchBar(
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/Sources/PresentationStrings.swift b/submodules/TelegramPresentationData/Sources/PresentationStrings.swift
index f0fbb625c9..0f11dda036 100644
--- a/submodules/TelegramPresentationData/Sources/PresentationStrings.swift
+++ b/submodules/TelegramPresentationData/Sources/PresentationStrings.swift
@@ -510,4639 +510,4640 @@ public final class PresentationStrings: Equatable {
     public var AuthSessions_LogOutApplicationsHelp: String { return self._s[310]! }
     public var Forward_ErrorPublicQuizDisabledInChannels: String { return self._s[311]! }
     public var Month_GenFebruary: String { return self._s[312]! }
-    public var Wallet_Send_NetworkErrorTitle: String { return self._s[313]! }
+    public var ChatListFilter_AddChatsTitle: String { return self._s[313]! }
+    public var Wallet_Send_NetworkErrorTitle: String { return self._s[314]! }
     public func Login_InvalidPhoneEmailBody(_ _1: String, _ _2: String, _ _3: String, _ _4: String, _ _5: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[315]!, self._r[315]!, [_1, _2, _3, _4, _5])
+        return formatWithArgumentRanges(self._s[316]!, self._r[316]!, [_1, _2, _3, _4, _5])
     }
-    public var Passport_Identity_TypeIdentityCard: String { return self._s[316]! }
-    public var Wallet_Month_ShortJune: String { return self._s[318]! }
-    public var AutoDownloadSettings_DataUsageMedium: String { return self._s[319]! }
-    public var GroupInfo_AddParticipant: String { return self._s[320]! }
-    public var KeyCommand_SendMessage: String { return self._s[321]! }
-    public var VoiceOver_Chat_YourContact: String { return self._s[323]! }
-    public var Map_LiveLocationShowAll: String { return self._s[324]! }
-    public var WallpaperSearch_ColorOrange: String { return self._s[326]! }
-    public var Appearance_AppIconDefaultX: String { return self._s[327]! }
-    public var Checkout_Receipt_Title: String { return self._s[328]! }
-    public var Group_OwnershipTransfer_ErrorPrivacyRestricted: String { return self._s[329]! }
-    public var WallpaperPreview_PreviewTopText: String { return self._s[330]! }
-    public var Message_Contact: String { return self._s[331]! }
-    public var Call_StatusIncoming: String { return self._s[332]! }
-    public var Wallet_TransactionInfo_StorageFeeInfo: String { return self._s[333]! }
+    public var Passport_Identity_TypeIdentityCard: String { return self._s[317]! }
+    public var Wallet_Month_ShortJune: String { return self._s[319]! }
+    public var AutoDownloadSettings_DataUsageMedium: String { return self._s[320]! }
+    public var GroupInfo_AddParticipant: String { return self._s[321]! }
+    public var KeyCommand_SendMessage: String { return self._s[322]! }
+    public var VoiceOver_Chat_YourContact: String { return self._s[324]! }
+    public var Map_LiveLocationShowAll: String { return self._s[325]! }
+    public var WallpaperSearch_ColorOrange: String { return self._s[327]! }
+    public var Appearance_AppIconDefaultX: String { return self._s[328]! }
+    public var Checkout_Receipt_Title: String { return self._s[329]! }
+    public var Group_OwnershipTransfer_ErrorPrivacyRestricted: String { return self._s[330]! }
+    public var WallpaperPreview_PreviewTopText: String { return self._s[331]! }
+    public var Message_Contact: String { return self._s[332]! }
+    public var Call_StatusIncoming: String { return self._s[333]! }
+    public var Wallet_TransactionInfo_StorageFeeInfo: String { return self._s[334]! }
     public func Channel_AdminLog_MessageKickedName(_ _1: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[334]!, self._r[334]!, [_1])
+        return formatWithArgumentRanges(self._s[335]!, self._r[335]!, [_1])
     }
     public func PUSH_ENCRYPTED_MESSAGE(_ _1: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[336]!, self._r[336]!, [_1])
+        return formatWithArgumentRanges(self._s[337]!, self._r[337]!, [_1])
     }
-    public var VoiceOver_Media_PlaybackRate: String { return self._s[337]! }
-    public var Passport_FieldIdentityDetailsHelp: String { return self._s[338]! }
-    public var Conversation_ViewChannel: String { return self._s[339]! }
+    public var VoiceOver_Media_PlaybackRate: String { return self._s[338]! }
+    public var Passport_FieldIdentityDetailsHelp: String { return self._s[339]! }
+    public var Conversation_ViewChannel: String { return self._s[340]! }
     public func Time_TodayAt(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[340]!, self._r[340]!, [_0])
+        return formatWithArgumentRanges(self._s[341]!, self._r[341]!, [_0])
     }
-    public var Theme_Colors_Accent: String { return self._s[341]! }
-    public var Passport_Language_nl: String { return self._s[343]! }
-    public var Camera_Retake: String { return self._s[344]! }
+    public var Theme_Colors_Accent: String { return self._s[342]! }
+    public var Passport_Language_nl: String { return self._s[344]! }
+    public var Camera_Retake: String { return self._s[345]! }
     public func UserInfo_BlockActionTitle(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[345]!, self._r[345]!, [_0])
+        return formatWithArgumentRanges(self._s[346]!, self._r[346]!, [_0])
     }
-    public var AuthSessions_LogOutApplications: String { return self._s[346]! }
-    public var ApplyLanguage_ApplySuccess: String { return self._s[347]! }
-    public var Tour_Title6: String { return self._s[348]! }
-    public var Map_ChooseAPlace: String { return self._s[349]! }
-    public var CallSettings_Never: String { return self._s[351]! }
+    public var AuthSessions_LogOutApplications: String { return self._s[347]! }
+    public var ApplyLanguage_ApplySuccess: String { return self._s[348]! }
+    public var Tour_Title6: String { return self._s[349]! }
+    public var Map_ChooseAPlace: String { return self._s[350]! }
+    public var CallSettings_Never: String { return self._s[352]! }
     public func Notification_ChangedGroupPhoto(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[352]!, self._r[352]!, [_0])
+        return formatWithArgumentRanges(self._s[353]!, self._r[353]!, [_0])
     }
-    public var ChannelRemoved_RemoveInfo: String { return self._s[353]! }
+    public var ChannelRemoved_RemoveInfo: String { return self._s[354]! }
     public func AutoDownloadSettings_PreloadVideoInfo(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[354]!, self._r[354]!, [_0])
+        return formatWithArgumentRanges(self._s[355]!, self._r[355]!, [_0])
     }
-    public var SettingsSearch_Synonyms_Notifications_MessageNotificationsExceptions: String { return self._s[355]! }
+    public var SettingsSearch_Synonyms_Notifications_MessageNotificationsExceptions: String { return self._s[356]! }
     public func Conversation_ClearChatConfirmation(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[356]!, self._r[356]!, [_0])
+        return formatWithArgumentRanges(self._s[357]!, self._r[357]!, [_0])
     }
-    public var GroupInfo_InviteLink_Title: String { return self._s[357]! }
+    public var GroupInfo_InviteLink_Title: String { return self._s[358]! }
     public func Channel_AdminLog_MessageUnkickedNameUsername(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[358]!, self._r[358]!, [_1, _2])
+        return formatWithArgumentRanges(self._s[359]!, self._r[359]!, [_1, _2])
     }
-    public var KeyCommand_ScrollUp: String { return self._s[359]! }
-    public var ContactInfo_URLLabelHomepage: String { return self._s[360]! }
-    public var Channel_OwnershipTransfer_ChangeOwner: String { return self._s[361]! }
+    public var KeyCommand_ScrollUp: String { return self._s[360]! }
+    public var ContactInfo_URLLabelHomepage: String { return self._s[361]! }
+    public var Channel_OwnershipTransfer_ChangeOwner: String { return self._s[362]! }
     public func Channel_AdminLog_DisabledSlowmode(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[362]!, self._r[362]!, [_0])
+        return formatWithArgumentRanges(self._s[363]!, self._r[363]!, [_0])
     }
-    public var TwoFactorSetup_Done_Title: String { return self._s[363]! }
+    public var TwoFactorSetup_Done_Title: String { return self._s[364]! }
     public func Conversation_EncryptedPlaceholderTitleOutgoing(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[364]!, self._r[364]!, [_0])
+        return formatWithArgumentRanges(self._s[365]!, self._r[365]!, [_0])
     }
-    public var CallFeedback_ReasonDistortedSpeech: String { return self._s[365]! }
-    public var Watch_LastSeen_WithinAWeek: String { return self._s[366]! }
-    public var ContactList_Context_SendMessage: String { return self._s[368]! }
-    public var Weekday_Tuesday: String { return self._s[369]! }
-    public var Wallet_Created_Title: String { return self._s[371]! }
-    public var ScheduledMessages_Delete: String { return self._s[372]! }
-    public var UserInfo_StartSecretChat: String { return self._s[373]! }
-    public var Passport_Identity_FilesTitle: String { return self._s[374]! }
-    public var Permissions_NotificationsAllow_v0: String { return self._s[375]! }
-    public var DialogList_DeleteConversationConfirmation: String { return self._s[377]! }
-    public var ChatList_UndoArchiveRevealedTitle: String { return self._s[378]! }
+    public var CallFeedback_ReasonDistortedSpeech: String { return self._s[366]! }
+    public var Watch_LastSeen_WithinAWeek: String { return self._s[367]! }
+    public var ContactList_Context_SendMessage: String { return self._s[369]! }
+    public var Weekday_Tuesday: String { return self._s[370]! }
+    public var Wallet_Created_Title: String { return self._s[372]! }
+    public var ScheduledMessages_Delete: String { return self._s[373]! }
+    public var UserInfo_StartSecretChat: String { return self._s[374]! }
+    public var Passport_Identity_FilesTitle: String { return self._s[375]! }
+    public var Permissions_NotificationsAllow_v0: String { return self._s[376]! }
+    public var DialogList_DeleteConversationConfirmation: String { return self._s[378]! }
+    public var ChatList_UndoArchiveRevealedTitle: String { return self._s[379]! }
     public func Wallet_Configuration_ApplyErrorTextURLUnreachable(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[379]!, self._r[379]!, [_0])
+        return formatWithArgumentRanges(self._s[380]!, self._r[380]!, [_0])
     }
-    public var AuthSessions_Sessions: String { return self._s[380]! }
+    public var AuthSessions_Sessions: String { return self._s[381]! }
     public func Settings_KeepPhoneNumber(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[382]!, self._r[382]!, [_0])
+        return formatWithArgumentRanges(self._s[383]!, self._r[383]!, [_0])
     }
-    public var TwoStepAuth_RecoveryEmailChangeDescription: String { return self._s[383]! }
-    public var Call_StatusWaiting: String { return self._s[384]! }
-    public var CreateGroup_SoftUserLimitAlert: String { return self._s[385]! }
-    public var FastTwoStepSetup_HintHelp: String { return self._s[386]! }
-    public var WallpaperPreview_CustomColorBottomText: String { return self._s[387]! }
-    public var EditTheme_Expand_Preview_OutgoingText: String { return self._s[388]! }
-    public var LogoutOptions_AddAccountText: String { return self._s[389]! }
-    public var PasscodeSettings_6DigitCode: String { return self._s[390]! }
-    public var Settings_LogoutConfirmationText: String { return self._s[391]! }
-    public var Passport_Identity_TypePassport: String { return self._s[393]! }
-    public var Map_Work: String { return self._s[396]! }
+    public var TwoStepAuth_RecoveryEmailChangeDescription: String { return self._s[384]! }
+    public var Call_StatusWaiting: String { return self._s[385]! }
+    public var CreateGroup_SoftUserLimitAlert: String { return self._s[386]! }
+    public var FastTwoStepSetup_HintHelp: String { return self._s[387]! }
+    public var WallpaperPreview_CustomColorBottomText: String { return self._s[388]! }
+    public var EditTheme_Expand_Preview_OutgoingText: String { return self._s[389]! }
+    public var LogoutOptions_AddAccountText: String { return self._s[390]! }
+    public var PasscodeSettings_6DigitCode: String { return self._s[391]! }
+    public var Settings_LogoutConfirmationText: String { return self._s[392]! }
+    public var Passport_Identity_TypePassport: String { return self._s[394]! }
+    public var Map_Work: String { return self._s[397]! }
     public func PUSH_MESSAGE_VIDEOS(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[397]!, self._r[397]!, [_1, _2])
+        return formatWithArgumentRanges(self._s[398]!, self._r[398]!, [_1, _2])
     }
-    public var SocksProxySetup_SaveProxy: String { return self._s[398]! }
-    public var AccessDenied_SaveMedia: String { return self._s[399]! }
-    public var Checkout_ErrorInvoiceAlreadyPaid: String { return self._s[401]! }
-    public var CreatePoll_MultipleChoice: String { return self._s[402]! }
-    public var Settings_Title: String { return self._s[404]! }
-    public var VoiceOver_Chat_RecordModeVideoMessageInfo: String { return self._s[405]! }
-    public var Contacts_InviteSearchLabel: String { return self._s[407]! }
-    public var PrivacySettings_WebSessions: String { return self._s[408]! }
-    public var ConvertToSupergroup_Title: String { return self._s[409]! }
+    public var SocksProxySetup_SaveProxy: String { return self._s[399]! }
+    public var AccessDenied_SaveMedia: String { return self._s[400]! }
+    public var Checkout_ErrorInvoiceAlreadyPaid: String { return self._s[402]! }
+    public var CreatePoll_MultipleChoice: String { return self._s[403]! }
+    public var Settings_Title: String { return self._s[405]! }
+    public var VoiceOver_Chat_RecordModeVideoMessageInfo: String { return self._s[406]! }
+    public var Contacts_InviteSearchLabel: String { return self._s[408]! }
+    public var PrivacySettings_WebSessions: String { return self._s[409]! }
+    public var ConvertToSupergroup_Title: String { return self._s[410]! }
     public func Channel_AdminLog_CaptionEdited(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[410]!, self._r[410]!, [_0])
+        return formatWithArgumentRanges(self._s[411]!, self._r[411]!, [_0])
     }
-    public var TwoFactorSetup_Hint_Text: String { return self._s[411]! }
-    public var InfoPlist_NSSiriUsageDescription: String { return self._s[412]! }
+    public var TwoFactorSetup_Hint_Text: String { return self._s[412]! }
+    public var InfoPlist_NSSiriUsageDescription: String { return self._s[413]! }
     public func PUSH_MESSAGE_CHANNEL_MESSAGE_GAME_SCORE(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[413]!, self._r[413]!, [_1, _2, _3])
+        return formatWithArgumentRanges(self._s[414]!, self._r[414]!, [_1, _2, _3])
     }
-    public var ChatSettings_AutomaticPhotoDownload: String { return self._s[414]! }
-    public var UserInfo_BotHelp: String { return self._s[415]! }
-    public var PrivacySettings_LastSeenEverybody: String { return self._s[416]! }
-    public var Checkout_Name: String { return self._s[417]! }
-    public var AutoDownloadSettings_DataUsage: String { return self._s[418]! }
-    public var Channel_BanUser_BlockFor: String { return self._s[419]! }
-    public var Checkout_ShippingAddress: String { return self._s[420]! }
-    public var AutoDownloadSettings_MaxVideoSize: String { return self._s[421]! }
-    public var Privacy_PaymentsClearInfoDoneHelp: String { return self._s[422]! }
-    public var Privacy_Forwards: String { return self._s[423]! }
-    public var Channel_BanUser_PermissionSendPolls: String { return self._s[424]! }
-    public var Appearance_ThemeCarouselNewNight: String { return self._s[425]! }
+    public var ChatSettings_AutomaticPhotoDownload: String { return self._s[415]! }
+    public var UserInfo_BotHelp: String { return self._s[416]! }
+    public var PrivacySettings_LastSeenEverybody: String { return self._s[417]! }
+    public var Checkout_Name: String { return self._s[418]! }
+    public var AutoDownloadSettings_DataUsage: String { return self._s[419]! }
+    public var Channel_BanUser_BlockFor: String { return self._s[420]! }
+    public var Checkout_ShippingAddress: String { return self._s[421]! }
+    public var AutoDownloadSettings_MaxVideoSize: String { return self._s[422]! }
+    public var Privacy_PaymentsClearInfoDoneHelp: String { return self._s[423]! }
+    public var Privacy_Forwards: String { return self._s[424]! }
+    public var Channel_BanUser_PermissionSendPolls: String { return self._s[425]! }
+    public var Appearance_ThemeCarouselNewNight: String { return self._s[426]! }
     public func SecretVideo_NotViewedYet(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[428]!, self._r[428]!, [_0])
+        return formatWithArgumentRanges(self._s[429]!, self._r[429]!, [_0])
     }
-    public var Contacts_SortedByName: String { return self._s[429]! }
-    public var Group_OwnershipTransfer_Title: String { return self._s[430]! }
-    public var PeerInfo_BioExpand: String { return self._s[432]! }
-    public var VoiceOver_Chat_OpenHint: String { return self._s[433]! }
-    public var Group_LeaveGroup: String { return self._s[434]! }
-    public var Settings_UsernameEmpty: String { return self._s[435]! }
+    public var Contacts_SortedByName: String { return self._s[430]! }
+    public var Group_OwnershipTransfer_Title: String { return self._s[431]! }
+    public var PeerInfo_BioExpand: String { return self._s[433]! }
+    public var VoiceOver_Chat_OpenHint: String { return self._s[434]! }
+    public var Group_LeaveGroup: String { return self._s[435]! }
+    public var Settings_UsernameEmpty: String { return self._s[436]! }
     public func Notification_PinnedPollMessage(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[436]!, self._r[436]!, [_0])
+        return formatWithArgumentRanges(self._s[437]!, self._r[437]!, [_0])
     }
     public func TwoStepAuth_ConfirmEmailDescription(_ _1: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[437]!, self._r[437]!, [_1])
+        return formatWithArgumentRanges(self._s[438]!, self._r[438]!, [_1])
     }
     public func Channel_OwnershipTransfer_DescriptionInfo(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[438]!, self._r[438]!, [_1, _2])
+        return formatWithArgumentRanges(self._s[439]!, self._r[439]!, [_1, _2])
     }
-    public var Message_ImageExpired: String { return self._s[439]! }
-    public var TwoStepAuth_RecoveryFailed: String { return self._s[441]! }
-    public var EditTheme_Edit_Preview_OutgoingText: String { return self._s[442]! }
-    public var UserInfo_AddToExisting: String { return self._s[443]! }
-    public var TwoStepAuth_EnabledSuccess: String { return self._s[444]! }
-    public var Wallet_Send_SyncInProgress: String { return self._s[445]! }
-    public var SettingsSearch_Synonyms_Appearance_ChatBackground_SetColor: String { return self._s[446]! }
+    public var Message_ImageExpired: String { return self._s[440]! }
+    public var TwoStepAuth_RecoveryFailed: String { return self._s[442]! }
+    public var EditTheme_Edit_Preview_OutgoingText: String { return self._s[443]! }
+    public var UserInfo_AddToExisting: String { return self._s[444]! }
+    public var TwoStepAuth_EnabledSuccess: String { return self._s[445]! }
+    public var Wallet_Send_SyncInProgress: String { return self._s[446]! }
+    public var SettingsSearch_Synonyms_Appearance_ChatBackground_SetColor: String { return self._s[447]! }
     public func PUSH_CHANNEL_MESSAGE(_ _1: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[447]!, self._r[447]!, [_1])
+        return formatWithArgumentRanges(self._s[448]!, self._r[448]!, [_1])
     }
-    public var Notifications_GroupNotificationsAlert: String { return self._s[448]! }
-    public var Passport_Language_km: String { return self._s[449]! }
-    public var SocksProxySetup_AdNoticeHelp: String { return self._s[451]! }
-    public var VoiceOver_Media_PlaybackPlay: String { return self._s[452]! }
-    public var Notification_CallMissedShort: String { return self._s[453]! }
-    public var Wallet_Info_YourBalance: String { return self._s[454]! }
-    public var ReportPeer_ReasonOther_Send: String { return self._s[456]! }
-    public var Watch_Compose_Send: String { return self._s[457]! }
-    public var Passport_Identity_TypeInternalPassportUploadScan: String { return self._s[460]! }
-    public var TwoFactorSetup_Email_Action: String { return self._s[461]! }
-    public var Conversation_HoldForVideo: String { return self._s[462]! }
-    public var Wallet_Configuration_ApplyErrorTextURLInvalidData: String { return self._s[463]! }
-    public var AuthSessions_OtherDevices: String { return self._s[464]! }
-    public var Wallet_TransactionInfo_CommentHeader: String { return self._s[465]! }
-    public var CheckoutInfo_ErrorCityInvalid: String { return self._s[467]! }
-    public var Appearance_AutoNightThemeDisabled: String { return self._s[469]! }
-    public var Channel_LinkItem: String { return self._s[470]! }
+    public var Notifications_GroupNotificationsAlert: String { return self._s[449]! }
+    public var Passport_Language_km: String { return self._s[450]! }
+    public var SocksProxySetup_AdNoticeHelp: String { return self._s[452]! }
+    public var VoiceOver_Media_PlaybackPlay: String { return self._s[453]! }
+    public var Notification_CallMissedShort: String { return self._s[454]! }
+    public var Wallet_Info_YourBalance: String { return self._s[455]! }
+    public var ReportPeer_ReasonOther_Send: String { return self._s[457]! }
+    public var Watch_Compose_Send: String { return self._s[458]! }
+    public var Passport_Identity_TypeInternalPassportUploadScan: String { return self._s[461]! }
+    public var TwoFactorSetup_Email_Action: String { return self._s[462]! }
+    public var Conversation_HoldForVideo: String { return self._s[463]! }
+    public var Wallet_Configuration_ApplyErrorTextURLInvalidData: String { return self._s[464]! }
+    public var AuthSessions_OtherDevices: String { return self._s[465]! }
+    public var Wallet_TransactionInfo_CommentHeader: String { return self._s[466]! }
+    public var CheckoutInfo_ErrorCityInvalid: String { return self._s[468]! }
+    public var Appearance_AutoNightThemeDisabled: String { return self._s[470]! }
+    public var Channel_LinkItem: String { return self._s[471]! }
     public func PrivacySettings_LastSeenContactsMinusPlus(_ _0: String, _ _1: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[471]!, self._r[471]!, [_0, _1])
+        return formatWithArgumentRanges(self._s[472]!, self._r[472]!, [_0, _1])
     }
     public func Passport_Identity_NativeNameTitle(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[474]!, self._r[474]!, [_0])
+        return formatWithArgumentRanges(self._s[475]!, self._r[475]!, [_0])
     }
-    public var VoiceOver_Recording_StopAndPreview: String { return self._s[475]! }
-    public var Passport_Language_dv: String { return self._s[476]! }
-    public var Undo_LeftChannel: String { return self._s[477]! }
-    public var Notifications_ExceptionsMuted: String { return self._s[478]! }
-    public var ChatList_UnhideAction: String { return self._s[479]! }
-    public var Conversation_ContextMenuShare: String { return self._s[480]! }
-    public var Conversation_ContextMenuStickerPackInfo: String { return self._s[481]! }
-    public var ShareFileTip_Title: String { return self._s[482]! }
-    public var NotificationsSound_Chord: String { return self._s[483]! }
-    public var Wallet_TransactionInfo_OtherFeeHeader: String { return self._s[484]! }
+    public var VoiceOver_Recording_StopAndPreview: String { return self._s[476]! }
+    public var Passport_Language_dv: String { return self._s[477]! }
+    public var Undo_LeftChannel: String { return self._s[478]! }
+    public var Notifications_ExceptionsMuted: String { return self._s[479]! }
+    public var ChatList_UnhideAction: String { return self._s[480]! }
+    public var Conversation_ContextMenuShare: String { return self._s[481]! }
+    public var Conversation_ContextMenuStickerPackInfo: String { return self._s[482]! }
+    public var ShareFileTip_Title: String { return self._s[483]! }
+    public var NotificationsSound_Chord: String { return self._s[484]! }
+    public var Wallet_TransactionInfo_OtherFeeHeader: String { return self._s[485]! }
     public func PUSH_CHAT_RETURNED(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[485]!, self._r[485]!, [_1, _2])
+        return formatWithArgumentRanges(self._s[486]!, self._r[486]!, [_1, _2])
     }
-    public var Passport_Address_EditTemporaryRegistration: String { return self._s[486]! }
+    public var Passport_Address_EditTemporaryRegistration: String { return self._s[487]! }
     public func Notification_Joined(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[487]!, self._r[487]!, [_0])
+        return formatWithArgumentRanges(self._s[488]!, self._r[488]!, [_0])
     }
     public func Wallet_Time_PreciseDate_m3(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[488]!, self._r[488]!, [_1, _2, _3])
+        return formatWithArgumentRanges(self._s[489]!, self._r[489]!, [_1, _2, _3])
     }
-    public var Wallet_Settings_ConfigurationInfo: String { return self._s[489]! }
-    public var Wallpaper_ErrorNotFound: String { return self._s[490]! }
-    public var Notification_CallOutgoingShort: String { return self._s[492]! }
-    public var Wallet_WordImport_IncorrectText: String { return self._s[493]! }
+    public var Wallet_Settings_ConfigurationInfo: String { return self._s[490]! }
+    public var Wallpaper_ErrorNotFound: String { return self._s[491]! }
+    public var Notification_CallOutgoingShort: String { return self._s[493]! }
+    public var Wallet_WordImport_IncorrectText: String { return self._s[494]! }
     public func Watch_Time_ShortFullAt(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[494]!, self._r[494]!, [_1, _2])
+        return formatWithArgumentRanges(self._s[495]!, self._r[495]!, [_1, _2])
     }
-    public var Passport_Address_TypeUtilityBill: String { return self._s[495]! }
-    public var Privacy_Forwards_LinkIfAllowed: String { return self._s[496]! }
-    public var ReportPeer_Report: String { return self._s[497]! }
-    public var SettingsSearch_Synonyms_Proxy_Title: String { return self._s[498]! }
-    public var GroupInfo_DeactivatedStatus: String { return self._s[499]! }
+    public var Passport_Address_TypeUtilityBill: String { return self._s[496]! }
+    public var Privacy_Forwards_LinkIfAllowed: String { return self._s[497]! }
+    public var ReportPeer_Report: String { return self._s[498]! }
+    public var SettingsSearch_Synonyms_Proxy_Title: String { return self._s[499]! }
+    public var GroupInfo_DeactivatedStatus: String { return self._s[500]! }
     public func VoiceOver_Chat_MusicTitle(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[500]!, self._r[500]!, [_1, _2])
+        return formatWithArgumentRanges(self._s[501]!, self._r[501]!, [_1, _2])
     }
-    public var StickerPack_Send: String { return self._s[501]! }
-    public var Login_CodeSentInternal: String { return self._s[502]! }
-    public var Wallet_Month_GenJanuary: String { return self._s[503]! }
-    public var GroupInfo_InviteLink_LinkSection: String { return self._s[504]! }
+    public var StickerPack_Send: String { return self._s[502]! }
+    public var Login_CodeSentInternal: String { return self._s[503]! }
+    public var Wallet_Month_GenJanuary: String { return self._s[504]! }
+    public var GroupInfo_InviteLink_LinkSection: String { return self._s[505]! }
     public func Channel_AdminLog_MessageDeleted(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[505]!, self._r[505]!, [_0])
+        return formatWithArgumentRanges(self._s[506]!, self._r[506]!, [_0])
     }
     public func Conversation_EncryptionWaiting(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[507]!, self._r[507]!, [_0])
+        return formatWithArgumentRanges(self._s[508]!, self._r[508]!, [_0])
     }
-    public var Channel_BanUser_PermissionSendStickersAndGifs: String { return self._s[508]! }
+    public var Channel_BanUser_PermissionSendStickersAndGifs: String { return self._s[509]! }
     public func PUSH_PINNED_GAME(_ _1: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[509]!, self._r[509]!, [_1])
+        return formatWithArgumentRanges(self._s[510]!, self._r[510]!, [_1])
     }
-    public var ReportPeer_ReasonViolence: String { return self._s[511]! }
-    public var Appearance_ShareThemeColor: String { return self._s[512]! }
-    public var Map_Locating: String { return self._s[513]! }
+    public var ReportPeer_ReasonViolence: String { return self._s[512]! }
+    public var Appearance_ShareThemeColor: String { return self._s[513]! }
+    public var Map_Locating: String { return self._s[514]! }
     public func VoiceOver_Chat_VideoFrom(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[514]!, self._r[514]!, [_0])
+        return formatWithArgumentRanges(self._s[515]!, self._r[515]!, [_0])
     }
     public func PUSH_ALBUM(_ _1: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[515]!, self._r[515]!, [_1])
+        return formatWithArgumentRanges(self._s[516]!, self._r[516]!, [_1])
     }
-    public var AutoDownloadSettings_GroupChats: String { return self._s[517]! }
-    public var CheckoutInfo_SaveInfo: String { return self._s[518]! }
-    public var SharedMedia_EmptyLinksText: String { return self._s[520]! }
-    public var Passport_Address_CityPlaceholder: String { return self._s[521]! }
-    public var CheckoutInfo_ErrorStateInvalid: String { return self._s[522]! }
-    public var Privacy_ProfilePhoto_CustomHelp: String { return self._s[523]! }
-    public var Wallet_Send_OwnAddressAlertTitle: String { return self._s[525]! }
-    public var Channel_AdminLog_CanAddAdmins: String { return self._s[526]! }
+    public var AutoDownloadSettings_GroupChats: String { return self._s[518]! }
+    public var CheckoutInfo_SaveInfo: String { return self._s[519]! }
+    public var SharedMedia_EmptyLinksText: String { return self._s[521]! }
+    public var Passport_Address_CityPlaceholder: String { return self._s[522]! }
+    public var CheckoutInfo_ErrorStateInvalid: String { return self._s[523]! }
+    public var Privacy_ProfilePhoto_CustomHelp: String { return self._s[524]! }
+    public var Wallet_Send_OwnAddressAlertTitle: String { return self._s[526]! }
+    public var Channel_AdminLog_CanAddAdmins: String { return self._s[527]! }
     public func PUSH_CHANNEL_MESSAGE_FWD(_ _1: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[527]!, self._r[527]!, [_1])
+        return formatWithArgumentRanges(self._s[528]!, self._r[528]!, [_1])
     }
     public func Time_MonthOfYear_m8(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[528]!, self._r[528]!, [_0])
+        return formatWithArgumentRanges(self._s[529]!, self._r[529]!, [_0])
     }
-    public var InfoPlist_NSLocationWhenInUseUsageDescription: String { return self._s[529]! }
-    public var GroupInfo_InviteLink_RevokeAlert_Success: String { return self._s[530]! }
-    public var ChangePhoneNumberCode_Code: String { return self._s[531]! }
-    public var Appearance_CreateTheme: String { return self._s[532]! }
+    public var InfoPlist_NSLocationWhenInUseUsageDescription: String { return self._s[530]! }
+    public var GroupInfo_InviteLink_RevokeAlert_Success: String { return self._s[531]! }
+    public var ChangePhoneNumberCode_Code: String { return self._s[532]! }
+    public var Appearance_CreateTheme: String { return self._s[533]! }
     public func UserInfo_NotificationsDefaultSound(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[533]!, self._r[533]!, [_0])
+        return formatWithArgumentRanges(self._s[534]!, self._r[534]!, [_0])
     }
-    public var TwoStepAuth_SetupEmail: String { return self._s[534]! }
-    public var HashtagSearch_AllChats: String { return self._s[535]! }
-    public var MediaPlayer_UnknownTrack: String { return self._s[536]! }
-    public var SettingsSearch_Synonyms_Data_AutoDownloadUsingCellular: String { return self._s[538]! }
+    public var TwoStepAuth_SetupEmail: String { return self._s[535]! }
+    public var HashtagSearch_AllChats: String { return self._s[536]! }
+    public var MediaPlayer_UnknownTrack: String { return self._s[537]! }
+    public var SettingsSearch_Synonyms_Data_AutoDownloadUsingCellular: String { return self._s[539]! }
     public func ChatList_DeleteForEveryone(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[539]!, self._r[539]!, [_0])
+        return formatWithArgumentRanges(self._s[540]!, self._r[540]!, [_0])
     }
-    public var PhotoEditor_QualityHigh: String { return self._s[541]! }
+    public var PhotoEditor_QualityHigh: String { return self._s[542]! }
     public func Passport_Phone_UseTelegramNumber(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[542]!, self._r[542]!, [_0])
+        return formatWithArgumentRanges(self._s[543]!, self._r[543]!, [_0])
     }
-    public var ApplyLanguage_ApplyLanguageAction: String { return self._s[543]! }
-    public var SettingsSearch_Synonyms_Notifications_ChannelNotificationsPreview: String { return self._s[544]! }
-    public var Message_LiveLocation: String { return self._s[545]! }
-    public var Cache_LowDiskSpaceText: String { return self._s[546]! }
-    public var Wallet_Receive_ShareAddress: String { return self._s[547]! }
-    public var EditTheme_ErrorLinkTaken: String { return self._s[548]! }
-    public var Conversation_SendMessage: String { return self._s[549]! }
-    public var AuthSessions_EmptyTitle: String { return self._s[550]! }
-    public var Privacy_PhoneNumber: String { return self._s[551]! }
-    public var PeopleNearby_CreateGroup: String { return self._s[552]! }
-    public var Stats_SharesPerPost: String { return self._s[554]! }
-    public var CallSettings_UseLessData: String { return self._s[555]! }
-    public var NetworkUsageSettings_MediaDocumentDataSection: String { return self._s[556]! }
-    public var Stickers_AddToFavorites: String { return self._s[557]! }
-    public var Wallet_WordImport_Title: String { return self._s[558]! }
-    public var PhotoEditor_QualityLow: String { return self._s[559]! }
-    public var Watch_UserInfo_Unblock: String { return self._s[560]! }
-    public var Settings_Logout: String { return self._s[561]! }
+    public var ApplyLanguage_ApplyLanguageAction: String { return self._s[544]! }
+    public var SettingsSearch_Synonyms_Notifications_ChannelNotificationsPreview: String { return self._s[545]! }
+    public var Message_LiveLocation: String { return self._s[546]! }
+    public var Cache_LowDiskSpaceText: String { return self._s[547]! }
+    public var Wallet_Receive_ShareAddress: String { return self._s[548]! }
+    public var EditTheme_ErrorLinkTaken: String { return self._s[549]! }
+    public var Conversation_SendMessage: String { return self._s[550]! }
+    public var AuthSessions_EmptyTitle: String { return self._s[551]! }
+    public var Privacy_PhoneNumber: String { return self._s[552]! }
+    public var PeopleNearby_CreateGroup: String { return self._s[553]! }
+    public var Stats_SharesPerPost: String { return self._s[555]! }
+    public var CallSettings_UseLessData: String { return self._s[556]! }
+    public var NetworkUsageSettings_MediaDocumentDataSection: String { return self._s[557]! }
+    public var Stickers_AddToFavorites: String { return self._s[558]! }
+    public var Wallet_WordImport_Title: String { return self._s[559]! }
+    public var PhotoEditor_QualityLow: String { return self._s[560]! }
+    public var Watch_UserInfo_Unblock: String { return self._s[561]! }
+    public var Settings_Logout: String { return self._s[562]! }
     public func PUSH_MESSAGE_ROUND(_ _1: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[562]!, self._r[562]!, [_1])
+        return formatWithArgumentRanges(self._s[563]!, self._r[563]!, [_1])
     }
-    public var ContactInfo_PhoneLabelWork: String { return self._s[563]! }
-    public var ChannelInfo_Stats: String { return self._s[564]! }
-    public var TextFormat_Link: String { return self._s[565]! }
+    public var ContactInfo_PhoneLabelWork: String { return self._s[564]! }
+    public var ChannelInfo_Stats: String { return self._s[565]! }
+    public var TextFormat_Link: String { return self._s[566]! }
     public func Date_ChatDateHeader(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[566]!, self._r[566]!, [_1, _2])
+        return formatWithArgumentRanges(self._s[567]!, self._r[567]!, [_1, _2])
     }
-    public var Wallet_TransactionInfo_Title: String { return self._s[567]! }
+    public var Wallet_TransactionInfo_Title: String { return self._s[568]! }
     public func Message_ForwardedMessage(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[568]!, self._r[568]!, [_0])
+        return formatWithArgumentRanges(self._s[569]!, self._r[569]!, [_0])
     }
-    public var Watch_Notification_Joined: String { return self._s[569]! }
-    public var Group_Setup_TypePublicHelp: String { return self._s[570]! }
-    public var Passport_Scans_UploadNew: String { return self._s[571]! }
-    public var Checkout_LiabilityAlertTitle: String { return self._s[572]! }
-    public var DialogList_Title: String { return self._s[575]! }
-    public var NotificationSettings_ContactJoined: String { return self._s[576]! }
-    public var GroupInfo_LabelAdmin: String { return self._s[577]! }
-    public var KeyCommand_ChatInfo: String { return self._s[578]! }
-    public var Conversation_EditingCaptionPanelTitle: String { return self._s[579]! }
-    public var Call_ReportIncludeLog: String { return self._s[580]! }
+    public var Watch_Notification_Joined: String { return self._s[570]! }
+    public var Group_Setup_TypePublicHelp: String { return self._s[571]! }
+    public var Passport_Scans_UploadNew: String { return self._s[572]! }
+    public var Checkout_LiabilityAlertTitle: String { return self._s[573]! }
+    public var DialogList_Title: String { return self._s[576]! }
+    public var NotificationSettings_ContactJoined: String { return self._s[577]! }
+    public var GroupInfo_LabelAdmin: String { return self._s[578]! }
+    public var KeyCommand_ChatInfo: String { return self._s[579]! }
+    public var Conversation_EditingCaptionPanelTitle: String { return self._s[580]! }
+    public var Call_ReportIncludeLog: String { return self._s[581]! }
     public func Notifications_ExceptionsChangeSound(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[583]!, self._r[583]!, [_0])
+        return formatWithArgumentRanges(self._s[584]!, self._r[584]!, [_0])
     }
-    public var Stats_Followers: String { return self._s[584]! }
-    public var Channel_AdminLog_InfoPanelChannelAlertText: String { return self._s[585]! }
-    public var ChatAdmins_AllMembersAreAdmins: String { return self._s[586]! }
-    public var LocalGroup_IrrelevantWarning: String { return self._s[587]! }
-    public var Conversation_DefaultRestrictedInline: String { return self._s[588]! }
-    public var Message_Sticker: String { return self._s[589]! }
-    public var LastSeen_JustNow: String { return self._s[591]! }
-    public var Passport_Email_EmailPlaceholder: String { return self._s[593]! }
-    public var SettingsSearch_Synonyms_AppLanguage: String { return self._s[594]! }
-    public var Channel_AdminLogFilter_EventsEditedMessages: String { return self._s[595]! }
-    public var Channel_EditAdmin_PermissionsHeader: String { return self._s[596]! }
-    public var TwoStepAuth_Email: String { return self._s[597]! }
-    public var SettingsSearch_Synonyms_Notifications_ChannelNotificationsSound: String { return self._s[598]! }
-    public var PhotoEditor_BlurToolOff: String { return self._s[599]! }
-    public var Message_PinnedStickerMessage: String { return self._s[600]! }
-    public var ContactInfo_PhoneLabelPager: String { return self._s[601]! }
-    public var SettingsSearch_Synonyms_Appearance_TextSize: String { return self._s[602]! }
-    public var Passport_DiscardMessageTitle: String { return self._s[603]! }
-    public var Privacy_PaymentsTitle: String { return self._s[604]! }
-    public var EditTheme_Edit_Preview_IncomingReplyName: String { return self._s[605]! }
-    public var ClearCache_StorageCache: String { return self._s[606]! }
-    public var Appearance_TextSizeSetting: String { return self._s[607]! }
-    public var Channel_DiscussionGroup_Header: String { return self._s[609]! }
-    public var VoiceOver_Chat_OptionSelected: String { return self._s[610]! }
-    public var Appearance_ColorTheme: String { return self._s[611]! }
-    public var UserInfo_ShareContact: String { return self._s[612]! }
-    public var Passport_Address_TypePassportRegistration: String { return self._s[613]! }
-    public var Common_More: String { return self._s[614]! }
-    public var Watch_Message_Call: String { return self._s[615]! }
-    public var Profile_EncryptionKey: String { return self._s[618]! }
-    public var Privacy_TopPeers: String { return self._s[619]! }
-    public var Conversation_StopPollConfirmation: String { return self._s[620]! }
-    public var Wallet_Words_NotDoneText: String { return self._s[622]! }
-    public var Privacy_TopPeersWarning: String { return self._s[624]! }
-    public var SettingsSearch_Synonyms_Data_DownloadInBackground: String { return self._s[625]! }
-    public var SettingsSearch_Synonyms_Data_Storage_KeepMedia: String { return self._s[626]! }
-    public var Wallet_RestoreFailed_EnterWords: String { return self._s[629]! }
-    public var DialogList_SearchSectionMessages: String { return self._s[630]! }
-    public var Notifications_ChannelNotifications: String { return self._s[631]! }
-    public var CheckoutInfo_ShippingInfoAddress1Placeholder: String { return self._s[632]! }
-    public var Passport_Language_sk: String { return self._s[633]! }
-    public var Notification_MessageLifetime1h: String { return self._s[634]! }
-    public var Wallpaper_ResetWallpapersInfo: String { return self._s[635]! }
-    public var Appearance_ThemePreview_Chat_5_Text: String { return self._s[636]! }
-    public var Call_ReportSkip: String { return self._s[638]! }
-    public var Cache_ServiceFiles: String { return self._s[639]! }
-    public var Group_ErrorAddTooMuchAdmins: String { return self._s[640]! }
-    public var VoiceOver_Chat_YourFile: String { return self._s[641]! }
-    public var Map_Hybrid: String { return self._s[642]! }
-    public var Contacts_SearchUsersAndGroupsLabel: String { return self._s[644]! }
+    public var Stats_Followers: String { return self._s[585]! }
+    public var Channel_AdminLog_InfoPanelChannelAlertText: String { return self._s[586]! }
+    public var ChatAdmins_AllMembersAreAdmins: String { return self._s[587]! }
+    public var LocalGroup_IrrelevantWarning: String { return self._s[588]! }
+    public var Conversation_DefaultRestrictedInline: String { return self._s[589]! }
+    public var Message_Sticker: String { return self._s[590]! }
+    public var LastSeen_JustNow: String { return self._s[592]! }
+    public var Passport_Email_EmailPlaceholder: String { return self._s[594]! }
+    public var SettingsSearch_Synonyms_AppLanguage: String { return self._s[595]! }
+    public var Channel_AdminLogFilter_EventsEditedMessages: String { return self._s[596]! }
+    public var Channel_EditAdmin_PermissionsHeader: String { return self._s[597]! }
+    public var TwoStepAuth_Email: String { return self._s[598]! }
+    public var SettingsSearch_Synonyms_Notifications_ChannelNotificationsSound: String { return self._s[599]! }
+    public var PhotoEditor_BlurToolOff: String { return self._s[600]! }
+    public var Message_PinnedStickerMessage: String { return self._s[601]! }
+    public var ContactInfo_PhoneLabelPager: String { return self._s[602]! }
+    public var SettingsSearch_Synonyms_Appearance_TextSize: String { return self._s[603]! }
+    public var Passport_DiscardMessageTitle: String { return self._s[604]! }
+    public var Privacy_PaymentsTitle: String { return self._s[605]! }
+    public var EditTheme_Edit_Preview_IncomingReplyName: String { return self._s[606]! }
+    public var ClearCache_StorageCache: String { return self._s[607]! }
+    public var Appearance_TextSizeSetting: String { return self._s[608]! }
+    public var Channel_DiscussionGroup_Header: String { return self._s[610]! }
+    public var VoiceOver_Chat_OptionSelected: String { return self._s[611]! }
+    public var Appearance_ColorTheme: String { return self._s[612]! }
+    public var UserInfo_ShareContact: String { return self._s[613]! }
+    public var Passport_Address_TypePassportRegistration: String { return self._s[614]! }
+    public var Common_More: String { return self._s[615]! }
+    public var Watch_Message_Call: String { return self._s[616]! }
+    public var Profile_EncryptionKey: String { return self._s[619]! }
+    public var Privacy_TopPeers: String { return self._s[620]! }
+    public var Conversation_StopPollConfirmation: String { return self._s[621]! }
+    public var Wallet_Words_NotDoneText: String { return self._s[623]! }
+    public var Privacy_TopPeersWarning: String { return self._s[625]! }
+    public var SettingsSearch_Synonyms_Data_DownloadInBackground: String { return self._s[626]! }
+    public var SettingsSearch_Synonyms_Data_Storage_KeepMedia: String { return self._s[627]! }
+    public var Wallet_RestoreFailed_EnterWords: String { return self._s[630]! }
+    public var DialogList_SearchSectionMessages: String { return self._s[631]! }
+    public var Notifications_ChannelNotifications: String { return self._s[632]! }
+    public var CheckoutInfo_ShippingInfoAddress1Placeholder: String { return self._s[633]! }
+    public var Passport_Language_sk: String { return self._s[634]! }
+    public var Notification_MessageLifetime1h: String { return self._s[635]! }
+    public var Wallpaper_ResetWallpapersInfo: String { return self._s[636]! }
+    public var Appearance_ThemePreview_Chat_5_Text: String { return self._s[637]! }
+    public var Call_ReportSkip: String { return self._s[639]! }
+    public var Cache_ServiceFiles: String { return self._s[640]! }
+    public var Group_ErrorAddTooMuchAdmins: String { return self._s[641]! }
+    public var VoiceOver_Chat_YourFile: String { return self._s[642]! }
+    public var Map_Hybrid: String { return self._s[643]! }
+    public var Contacts_SearchUsersAndGroupsLabel: String { return self._s[645]! }
     public func PUSH_MESSAGE_QUIZ(_ _1: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[645]!, self._r[645]!, [_1])
+        return formatWithArgumentRanges(self._s[646]!, self._r[646]!, [_1])
     }
-    public var ChatSettings_AutoDownloadVideos: String { return self._s[647]! }
-    public var Channel_BanUser_PermissionEmbedLinks: String { return self._s[648]! }
-    public var InfoPlist_NSLocationAlwaysAndWhenInUseUsageDescription: String { return self._s[649]! }
-    public var SocksProxySetup_ProxyTelegram: String { return self._s[652]! }
+    public var ChatSettings_AutoDownloadVideos: String { return self._s[648]! }
+    public var Channel_BanUser_PermissionEmbedLinks: String { return self._s[649]! }
+    public var InfoPlist_NSLocationAlwaysAndWhenInUseUsageDescription: String { return self._s[650]! }
+    public var SocksProxySetup_ProxyTelegram: String { return self._s[653]! }
     public func PUSH_MESSAGE_AUDIO(_ _1: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[653]!, self._r[653]!, [_1])
+        return formatWithArgumentRanges(self._s[654]!, self._r[654]!, [_1])
     }
-    public var Channel_Username_CreatePrivateLinkHelp: String { return self._s[655]! }
-    public var ScheduledMessages_ScheduledToday: String { return self._s[656]! }
+    public var Channel_Username_CreatePrivateLinkHelp: String { return self._s[656]! }
+    public var ScheduledMessages_ScheduledToday: String { return self._s[657]! }
     public func PUSH_CHAT_TITLE_EDITED(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[657]!, self._r[657]!, [_1, _2])
+        return formatWithArgumentRanges(self._s[658]!, self._r[658]!, [_1, _2])
     }
-    public var Conversation_LiveLocationYou: String { return self._s[658]! }
-    public var SettingsSearch_Synonyms_Privacy_Calls: String { return self._s[659]! }
-    public var SettingsSearch_Synonyms_Notifications_MessageNotificationsPreview: String { return self._s[660]! }
-    public var UserInfo_ShareBot: String { return self._s[663]! }
+    public var Conversation_LiveLocationYou: String { return self._s[659]! }
+    public var SettingsSearch_Synonyms_Privacy_Calls: String { return self._s[660]! }
+    public var SettingsSearch_Synonyms_Notifications_MessageNotificationsPreview: String { return self._s[661]! }
+    public var UserInfo_ShareBot: String { return self._s[664]! }
     public func PUSH_AUTH_REGION(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[664]!, self._r[664]!, [_1, _2])
+        return formatWithArgumentRanges(self._s[665]!, self._r[665]!, [_1, _2])
     }
-    public var Conversation_ClearCache: String { return self._s[665]! }
-    public var PhotoEditor_ShadowsTint: String { return self._s[666]! }
-    public var Message_Audio: String { return self._s[667]! }
-    public var Passport_Language_lt: String { return self._s[668]! }
+    public var Conversation_ClearCache: String { return self._s[666]! }
+    public var PhotoEditor_ShadowsTint: String { return self._s[667]! }
+    public var Message_Audio: String { return self._s[668]! }
+    public var Passport_Language_lt: String { return self._s[669]! }
     public func Message_PinnedTextMessage(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[669]!, self._r[669]!, [_0])
+        return formatWithArgumentRanges(self._s[670]!, self._r[670]!, [_0])
     }
-    public var Permissions_SiriText_v0: String { return self._s[670]! }
-    public var Conversation_FileICloudDrive: String { return self._s[671]! }
-    public var ChatList_DeleteForEveryoneConfirmationTitle: String { return self._s[672]! }
-    public var Notifications_Badge_IncludeMutedChats: String { return self._s[673]! }
+    public var Permissions_SiriText_v0: String { return self._s[671]! }
+    public var Conversation_FileICloudDrive: String { return self._s[672]! }
+    public var ChatList_DeleteForEveryoneConfirmationTitle: String { return self._s[673]! }
+    public var Notifications_Badge_IncludeMutedChats: String { return self._s[674]! }
     public func Notification_NewAuthDetected(_ _1: String, _ _2: String, _ _3: String, _ _4: String, _ _5: String, _ _6: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[674]!, self._r[674]!, [_1, _2, _3, _4, _5, _6])
+        return formatWithArgumentRanges(self._s[675]!, self._r[675]!, [_1, _2, _3, _4, _5, _6])
     }
-    public var DialogList_ProxyConnectionIssuesTooltip: String { return self._s[675]! }
+    public var DialogList_ProxyConnectionIssuesTooltip: String { return self._s[676]! }
     public func Time_MonthOfYear_m5(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[676]!, self._r[676]!, [_0])
+        return formatWithArgumentRanges(self._s[677]!, self._r[677]!, [_0])
     }
-    public var Channel_SignMessages: String { return self._s[677]! }
+    public var Channel_SignMessages: String { return self._s[678]! }
     public func PUSH_MESSAGE_NOTEXT(_ _1: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[678]!, self._r[678]!, [_1])
+        return formatWithArgumentRanges(self._s[679]!, self._r[679]!, [_1])
     }
-    public var Compose_ChannelTokenListPlaceholder: String { return self._s[679]! }
-    public var Passport_ScanPassport: String { return self._s[680]! }
-    public var Watch_Suggestion_Thanks: String { return self._s[681]! }
-    public var BlockedUsers_AddNew: String { return self._s[682]! }
+    public var Compose_ChannelTokenListPlaceholder: String { return self._s[680]! }
+    public var Passport_ScanPassport: String { return self._s[681]! }
+    public var Watch_Suggestion_Thanks: String { return self._s[682]! }
+    public var BlockedUsers_AddNew: String { return self._s[683]! }
     public func PUSH_CHAT_MESSAGE(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[683]!, self._r[683]!, [_1, _2])
+        return formatWithArgumentRanges(self._s[684]!, self._r[684]!, [_1, _2])
     }
-    public var Watch_Message_Invoice: String { return self._s[684]! }
-    public var SettingsSearch_Synonyms_Privacy_LastSeen: String { return self._s[685]! }
-    public var Month_GenJuly: String { return self._s[686]! }
-    public var CreatePoll_QuizInfo: String { return self._s[687]! }
-    public var UserInfo_StartSecretChatStart: String { return self._s[688]! }
-    public var SocksProxySetup_ProxySocks5: String { return self._s[689]! }
-    public var IntentsSettings_SuggestByShare: String { return self._s[691]! }
-    public var Notification_Exceptions_DeleteAllConfirmation: String { return self._s[692]! }
-    public var Notification_ChannelInviterSelf: String { return self._s[693]! }
-    public var CheckoutInfo_ReceiverInfoEmail: String { return self._s[694]! }
+    public var Watch_Message_Invoice: String { return self._s[685]! }
+    public var SettingsSearch_Synonyms_Privacy_LastSeen: String { return self._s[686]! }
+    public var Month_GenJuly: String { return self._s[687]! }
+    public var CreatePoll_QuizInfo: String { return self._s[688]! }
+    public var UserInfo_StartSecretChatStart: String { return self._s[689]! }
+    public var SocksProxySetup_ProxySocks5: String { return self._s[690]! }
+    public var IntentsSettings_SuggestByShare: String { return self._s[692]! }
+    public var Notification_Exceptions_DeleteAllConfirmation: String { return self._s[693]! }
+    public var Notification_ChannelInviterSelf: String { return self._s[694]! }
+    public var CheckoutInfo_ReceiverInfoEmail: String { return self._s[695]! }
     public func ApplyLanguage_ChangeLanguageUnofficialText(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[695]!, self._r[695]!, [_1, _2])
+        return formatWithArgumentRanges(self._s[696]!, self._r[696]!, [_1, _2])
     }
-    public var Stats_FollowersTitle: String { return self._s[696]! }
-    public var CheckoutInfo_Title: String { return self._s[697]! }
-    public var Watch_Stickers_RecentPlaceholder: String { return self._s[698]! }
+    public var Stats_FollowersTitle: String { return self._s[697]! }
+    public var CheckoutInfo_Title: String { return self._s[698]! }
+    public var Watch_Stickers_RecentPlaceholder: String { return self._s[699]! }
     public func Map_DistanceAway(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[699]!, self._r[699]!, [_0])
+        return formatWithArgumentRanges(self._s[700]!, self._r[700]!, [_0])
     }
-    public var Passport_Identity_MainPage: String { return self._s[700]! }
-    public var TwoStepAuth_ConfirmEmailResendCode: String { return self._s[701]! }
-    public var Passport_Language_de: String { return self._s[702]! }
-    public var PeerInfo_PaneVoice: String { return self._s[703]! }
-    public var Update_Title: String { return self._s[704]! }
-    public var ContactInfo_PhoneLabelWorkFax: String { return self._s[705]! }
-    public var Channel_AdminLog_BanEmbedLinks: String { return self._s[706]! }
-    public var Passport_Email_UseTelegramEmailHelp: String { return self._s[707]! }
-    public var Notifications_ChannelNotificationsPreview: String { return self._s[708]! }
-    public var NotificationsSound_Telegraph: String { return self._s[709]! }
-    public var Watch_LastSeen_ALongTimeAgo: String { return self._s[710]! }
-    public var ChannelMembers_WhoCanAddMembers: String { return self._s[711]! }
+    public var Passport_Identity_MainPage: String { return self._s[701]! }
+    public var TwoStepAuth_ConfirmEmailResendCode: String { return self._s[702]! }
+    public var Passport_Language_de: String { return self._s[703]! }
+    public var PeerInfo_PaneVoice: String { return self._s[704]! }
+    public var Update_Title: String { return self._s[705]! }
+    public var ContactInfo_PhoneLabelWorkFax: String { return self._s[706]! }
+    public var Channel_AdminLog_BanEmbedLinks: String { return self._s[707]! }
+    public var Passport_Email_UseTelegramEmailHelp: String { return self._s[708]! }
+    public var Notifications_ChannelNotificationsPreview: String { return self._s[709]! }
+    public var NotificationsSound_Telegraph: String { return self._s[710]! }
+    public var Watch_LastSeen_ALongTimeAgo: String { return self._s[711]! }
+    public var ChannelMembers_WhoCanAddMembers: String { return self._s[712]! }
     public func AutoDownloadSettings_UpTo(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[712]!, self._r[712]!, [_0])
+        return formatWithArgumentRanges(self._s[713]!, self._r[713]!, [_0])
     }
-    public var ClearCache_Description: String { return self._s[713]! }
-    public var Stickers_SuggestAll: String { return self._s[714]! }
-    public var Conversation_ForwardTitle: String { return self._s[715]! }
-    public var Appearance_ThemePreview_ChatList_7_Name: String { return self._s[716]! }
+    public var ClearCache_Description: String { return self._s[714]! }
+    public var Stickers_SuggestAll: String { return self._s[715]! }
+    public var Conversation_ForwardTitle: String { return self._s[716]! }
+    public var Appearance_ThemePreview_ChatList_7_Name: String { return self._s[717]! }
     public func Notification_JoinedChannel(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[717]!, self._r[717]!, [_0])
+        return formatWithArgumentRanges(self._s[718]!, self._r[718]!, [_0])
     }
-    public var Calls_NewCall: String { return self._s[718]! }
-    public var Call_StatusEnded: String { return self._s[719]! }
-    public var AutoDownloadSettings_DataUsageLow: String { return self._s[720]! }
-    public var Settings_ProxyConnected: String { return self._s[721]! }
-    public var Channel_AdminLogFilter_EventsPinned: String { return self._s[722]! }
-    public var PhotoEditor_QualityVeryLow: String { return self._s[723]! }
-    public var Channel_AdminLogFilter_EventsDeletedMessages: String { return self._s[724]! }
-    public var Passport_PasswordPlaceholder: String { return self._s[725]! }
-    public var Message_PinnedInvoice: String { return self._s[726]! }
-    public var Passport_Identity_IssueDate: String { return self._s[727]! }
-    public var Passport_Language_pl: String { return self._s[728]! }
+    public var Calls_NewCall: String { return self._s[719]! }
+    public var Call_StatusEnded: String { return self._s[720]! }
+    public var AutoDownloadSettings_DataUsageLow: String { return self._s[721]! }
+    public var Settings_ProxyConnected: String { return self._s[722]! }
+    public var Channel_AdminLogFilter_EventsPinned: String { return self._s[723]! }
+    public var PhotoEditor_QualityVeryLow: String { return self._s[724]! }
+    public var Channel_AdminLogFilter_EventsDeletedMessages: String { return self._s[725]! }
+    public var Passport_PasswordPlaceholder: String { return self._s[726]! }
+    public var Message_PinnedInvoice: String { return self._s[727]! }
+    public var Passport_Identity_IssueDate: String { return self._s[728]! }
+    public var Passport_Language_pl: String { return self._s[729]! }
     public func ChannelInfo_ChannelForbidden(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[729]!, self._r[729]!, [_0])
+        return formatWithArgumentRanges(self._s[730]!, self._r[730]!, [_0])
     }
-    public var Call_StatusConnecting: String { return self._s[730]! }
-    public var SocksProxySetup_PasteFromClipboard: String { return self._s[731]! }
+    public var Call_StatusConnecting: String { return self._s[731]! }
+    public var SocksProxySetup_PasteFromClipboard: String { return self._s[732]! }
     public func Username_UsernameIsAvailable(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[732]!, self._r[732]!, [_0])
+        return formatWithArgumentRanges(self._s[733]!, self._r[733]!, [_0])
     }
-    public var ChatSettings_ConnectionType_UseProxy: String { return self._s[734]! }
-    public var Common_Edit: String { return self._s[735]! }
-    public var PrivacySettings_LastSeenNobody: String { return self._s[736]! }
+    public var ChatSettings_ConnectionType_UseProxy: String { return self._s[735]! }
+    public var Common_Edit: String { return self._s[736]! }
+    public var PrivacySettings_LastSeenNobody: String { return self._s[737]! }
     public func Notification_LeftChat(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[737]!, self._r[737]!, [_0])
+        return formatWithArgumentRanges(self._s[738]!, self._r[738]!, [_0])
     }
-    public var GroupInfo_ChatAdmins: String { return self._s[738]! }
-    public var PrivateDataSettings_Title: String { return self._s[739]! }
-    public var Login_CancelPhoneVerificationStop: String { return self._s[740]! }
-    public var ChatList_Read: String { return self._s[741]! }
-    public var Wallet_WordImport_Text: String { return self._s[742]! }
-    public var Undo_ChatClearedForBothSides: String { return self._s[743]! }
-    public var GroupPermission_SectionTitle: String { return self._s[744]! }
-    public var TwoFactorSetup_Intro_Title: String { return self._s[746]! }
+    public var GroupInfo_ChatAdmins: String { return self._s[739]! }
+    public var PrivateDataSettings_Title: String { return self._s[740]! }
+    public var Login_CancelPhoneVerificationStop: String { return self._s[741]! }
+    public var ChatList_Read: String { return self._s[742]! }
+    public var Wallet_WordImport_Text: String { return self._s[743]! }
+    public var Undo_ChatClearedForBothSides: String { return self._s[744]! }
+    public var GroupPermission_SectionTitle: String { return self._s[745]! }
+    public var TwoFactorSetup_Intro_Title: String { return self._s[747]! }
     public func PUSH_CHAT_LEFT(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[747]!, self._r[747]!, [_1, _2])
+        return formatWithArgumentRanges(self._s[748]!, self._r[748]!, [_1, _2])
     }
-    public var Checkout_ErrorPaymentFailed: String { return self._s[748]! }
-    public var Update_UpdateApp: String { return self._s[749]! }
-    public var Group_Username_RevokeExistingUsernamesInfo: String { return self._s[750]! }
-    public var Settings_Appearance: String { return self._s[751]! }
-    public var SettingsSearch_Synonyms_Stickers_SuggestStickers: String { return self._s[755]! }
-    public var Watch_Location_Access: String { return self._s[756]! }
-    public var ShareMenu_CopyShareLink: String { return self._s[758]! }
-    public var TwoStepAuth_SetupHintTitle: String { return self._s[759]! }
-    public var Conversation_Theme: String { return self._s[761]! }
+    public var Checkout_ErrorPaymentFailed: String { return self._s[749]! }
+    public var Update_UpdateApp: String { return self._s[750]! }
+    public var Group_Username_RevokeExistingUsernamesInfo: String { return self._s[751]! }
+    public var Settings_Appearance: String { return self._s[752]! }
+    public var SettingsSearch_Synonyms_Stickers_SuggestStickers: String { return self._s[756]! }
+    public var Watch_Location_Access: String { return self._s[757]! }
+    public var ShareMenu_CopyShareLink: String { return self._s[759]! }
+    public var TwoStepAuth_SetupHintTitle: String { return self._s[760]! }
+    public var Conversation_Theme: String { return self._s[762]! }
     public func DialogList_SingleRecordingVideoMessageSuffix(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[762]!, self._r[762]!, [_0])
+        return formatWithArgumentRanges(self._s[763]!, self._r[763]!, [_0])
     }
-    public var Notifications_ClassicTones: String { return self._s[763]! }
-    public var Weekday_ShortWednesday: String { return self._s[764]! }
-    public var WallpaperPreview_SwipeColorsBottomText: String { return self._s[765]! }
-    public var Undo_LeftGroup: String { return self._s[768]! }
-    public var Wallet_RestoreFailed_Text: String { return self._s[769]! }
-    public var Conversation_LinkDialogCopy: String { return self._s[770]! }
-    public var Wallet_TransactionInfo_NoAddress: String { return self._s[772]! }
-    public var Wallet_Navigation_Back: String { return self._s[773]! }
-    public var KeyCommand_FocusOnInputField: String { return self._s[774]! }
-    public var Contacts_SelectAll: String { return self._s[775]! }
-    public var Preview_SaveToCameraRoll: String { return self._s[776]! }
-    public var PrivacySettings_PasscodeOff: String { return self._s[777]! }
-    public var Appearance_ThemePreview_ChatList_6_Name: String { return self._s[778]! }
+    public var Notifications_ClassicTones: String { return self._s[764]! }
+    public var Weekday_ShortWednesday: String { return self._s[765]! }
+    public var WallpaperPreview_SwipeColorsBottomText: String { return self._s[766]! }
+    public var Undo_LeftGroup: String { return self._s[769]! }
+    public var Wallet_RestoreFailed_Text: String { return self._s[770]! }
+    public var Conversation_LinkDialogCopy: String { return self._s[771]! }
+    public var Wallet_TransactionInfo_NoAddress: String { return self._s[773]! }
+    public var Wallet_Navigation_Back: String { return self._s[774]! }
+    public var KeyCommand_FocusOnInputField: String { return self._s[775]! }
+    public var Contacts_SelectAll: String { return self._s[776]! }
+    public var Preview_SaveToCameraRoll: String { return self._s[777]! }
+    public var PrivacySettings_PasscodeOff: String { return self._s[778]! }
+    public var Appearance_ThemePreview_ChatList_6_Name: String { return self._s[779]! }
     public func PUSH_CHANNEL_MESSAGE_QUIZ(_ _1: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[779]!, self._r[779]!, [_1])
+        return formatWithArgumentRanges(self._s[780]!, self._r[780]!, [_1])
     }
-    public var Wallpaper_Title: String { return self._s[780]! }
-    public var Conversation_FilePhotoOrVideo: String { return self._s[781]! }
-    public var AccessDenied_Camera: String { return self._s[782]! }
-    public var Watch_Compose_CurrentLocation: String { return self._s[783]! }
-    public var PeerInfo_ButtonMessage: String { return self._s[785]! }
-    public var Channel_DiscussionGroup_MakeHistoryPublicProceed: String { return self._s[786]! }
+    public var Wallpaper_Title: String { return self._s[781]! }
+    public var Conversation_FilePhotoOrVideo: String { return self._s[782]! }
+    public var AccessDenied_Camera: String { return self._s[783]! }
+    public var Watch_Compose_CurrentLocation: String { return self._s[784]! }
+    public var PeerInfo_ButtonMessage: String { return self._s[786]! }
+    public var Channel_DiscussionGroup_MakeHistoryPublicProceed: String { return self._s[787]! }
     public func SecretImage_NotViewedYet(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[787]!, self._r[787]!, [_0])
+        return formatWithArgumentRanges(self._s[788]!, self._r[788]!, [_0])
     }
-    public var GroupInfo_InvitationLinkDoesNotExist: String { return self._s[788]! }
-    public var Passport_Language_ro: String { return self._s[789]! }
-    public var EditTheme_UploadNewTheme: String { return self._s[790]! }
-    public var CheckoutInfo_SaveInfoHelp: String { return self._s[791]! }
-    public var Wallet_Intro_Terms: String { return self._s[792]! }
+    public var GroupInfo_InvitationLinkDoesNotExist: String { return self._s[789]! }
+    public var Passport_Language_ro: String { return self._s[790]! }
+    public var EditTheme_UploadNewTheme: String { return self._s[791]! }
+    public var CheckoutInfo_SaveInfoHelp: String { return self._s[792]! }
+    public var Wallet_Intro_Terms: String { return self._s[793]! }
     public func Notification_SecretChatMessageScreenshot(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[793]!, self._r[793]!, [_0])
+        return formatWithArgumentRanges(self._s[794]!, self._r[794]!, [_0])
     }
-    public var Login_CancelPhoneVerification: String { return self._s[794]! }
-    public var State_ConnectingToProxy: String { return self._s[795]! }
-    public var Calls_RatingTitle: String { return self._s[796]! }
-    public var Generic_ErrorMoreInfo: String { return self._s[797]! }
-    public var ChatList_Search_ShowMore: String { return self._s[798]! }
-    public var Appearance_PreviewReplyText: String { return self._s[799]! }
-    public var CheckoutInfo_ShippingInfoPostcodePlaceholder: String { return self._s[800]! }
+    public var Login_CancelPhoneVerification: String { return self._s[795]! }
+    public var State_ConnectingToProxy: String { return self._s[796]! }
+    public var Calls_RatingTitle: String { return self._s[797]! }
+    public var Generic_ErrorMoreInfo: String { return self._s[798]! }
+    public var ChatList_Search_ShowMore: String { return self._s[799]! }
+    public var Appearance_PreviewReplyText: String { return self._s[800]! }
+    public var CheckoutInfo_ShippingInfoPostcodePlaceholder: String { return self._s[801]! }
     public func Wallet_Send_Balance(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[801]!, self._r[801]!, [_0])
+        return formatWithArgumentRanges(self._s[802]!, self._r[802]!, [_0])
     }
-    public var IntentsSettings_SuggestedChatsContacts: String { return self._s[802]! }
-    public var SharedMedia_CategoryLinks: String { return self._s[803]! }
-    public var Calls_Missed: String { return self._s[804]! }
-    public var Cache_Photos: String { return self._s[808]! }
-    public var GroupPermission_NoAddMembers: String { return self._s[809]! }
-    public var ScheduledMessages_Title: String { return self._s[810]! }
+    public var IntentsSettings_SuggestedChatsContacts: String { return self._s[803]! }
+    public var SharedMedia_CategoryLinks: String { return self._s[804]! }
+    public var Calls_Missed: String { return self._s[805]! }
+    public var Cache_Photos: String { return self._s[809]! }
+    public var GroupPermission_NoAddMembers: String { return self._s[810]! }
+    public var ScheduledMessages_Title: String { return self._s[811]! }
     public func Channel_AdminLog_MessageUnpinned(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[811]!, self._r[811]!, [_0])
+        return formatWithArgumentRanges(self._s[812]!, self._r[812]!, [_0])
     }
-    public var Conversation_ShareBotLocationConfirmationTitle: String { return self._s[812]! }
-    public var Settings_ProxyDisabled: String { return self._s[813]! }
+    public var Conversation_ShareBotLocationConfirmationTitle: String { return self._s[813]! }
+    public var Settings_ProxyDisabled: String { return self._s[814]! }
     public func Settings_ApplyProxyAlertCredentials(_ _1: String, _ _2: String, _ _3: String, _ _4: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[814]!, self._r[814]!, [_1, _2, _3, _4])
+        return formatWithArgumentRanges(self._s[815]!, self._r[815]!, [_1, _2, _3, _4])
     }
     public func Conversation_RestrictedMediaTimed(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[815]!, self._r[815]!, [_0])
+        return formatWithArgumentRanges(self._s[816]!, self._r[816]!, [_0])
     }
-    public var Stats_ViewsPerPost: String { return self._s[817]! }
-    public var ChatList_Context_RemoveFromRecents: String { return self._s[818]! }
-    public var Appearance_Title: String { return self._s[819]! }
+    public var Stats_ViewsPerPost: String { return self._s[818]! }
+    public var ChatList_Context_RemoveFromRecents: String { return self._s[819]! }
+    public var Appearance_Title: String { return self._s[820]! }
     public func Time_MonthOfYear_m2(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[821]!, self._r[821]!, [_0])
+        return formatWithArgumentRanges(self._s[822]!, self._r[822]!, [_0])
     }
-    public var Conversation_WalletRequiredText: String { return self._s[822]! }
-    public var StickerPacksSettings_ShowStickersButtonHelp: String { return self._s[823]! }
-    public var OldChannels_NoticeCreateText: String { return self._s[824]! }
-    public var Channel_EditMessageErrorGeneric: String { return self._s[825]! }
-    public var Privacy_Calls_IntegrationHelp: String { return self._s[826]! }
-    public var Preview_DeletePhoto: String { return self._s[827]! }
-    public var Appearance_AppIconFilledX: String { return self._s[828]! }
-    public var PrivacySettings_PrivacyTitle: String { return self._s[829]! }
+    public var Conversation_WalletRequiredText: String { return self._s[823]! }
+    public var StickerPacksSettings_ShowStickersButtonHelp: String { return self._s[824]! }
+    public var OldChannels_NoticeCreateText: String { return self._s[825]! }
+    public var Channel_EditMessageErrorGeneric: String { return self._s[826]! }
+    public var Privacy_Calls_IntegrationHelp: String { return self._s[827]! }
+    public var Preview_DeletePhoto: String { return self._s[828]! }
+    public var Appearance_AppIconFilledX: String { return self._s[829]! }
+    public var PrivacySettings_PrivacyTitle: String { return self._s[830]! }
     public func Conversation_BotInteractiveUrlAlert(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[830]!, self._r[830]!, [_0])
+        return formatWithArgumentRanges(self._s[831]!, self._r[831]!, [_0])
     }
-    public var Coub_TapForSound: String { return self._s[833]! }
-    public var Map_LocatingError: String { return self._s[834]! }
-    public var TwoStepAuth_EmailChangeSuccess: String { return self._s[836]! }
-    public var Conversation_SendMessage_SendSilently: String { return self._s[837]! }
-    public var VoiceOver_MessageContextOpenMessageMenu: String { return self._s[838]! }
+    public var Coub_TapForSound: String { return self._s[834]! }
+    public var Map_LocatingError: String { return self._s[835]! }
+    public var TwoStepAuth_EmailChangeSuccess: String { return self._s[837]! }
+    public var Conversation_SendMessage_SendSilently: String { return self._s[838]! }
+    public var VoiceOver_MessageContextOpenMessageMenu: String { return self._s[839]! }
     public func Wallet_Time_PreciseDate_m8(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[839]!, self._r[839]!, [_1, _2, _3])
+        return formatWithArgumentRanges(self._s[840]!, self._r[840]!, [_1, _2, _3])
     }
-    public var Passport_ForgottenPassword: String { return self._s[840]! }
-    public var GroupInfo_InviteLink_RevokeLink: String { return self._s[841]! }
-    public var StickerPacksSettings_ArchivedPacks: String { return self._s[842]! }
-    public var Login_TermsOfServiceSignupDecline: String { return self._s[844]! }
-    public var Channel_Moderator_AccessLevelRevoke: String { return self._s[845]! }
-    public var Message_Location: String { return self._s[846]! }
-    public var Passport_Identity_NamePlaceholder: String { return self._s[847]! }
-    public var Channel_Management_Title: String { return self._s[848]! }
-    public var DialogList_SearchSectionDialogs: String { return self._s[850]! }
-    public var Compose_NewChannel_Members: String { return self._s[851]! }
+    public var Passport_ForgottenPassword: String { return self._s[841]! }
+    public var GroupInfo_InviteLink_RevokeLink: String { return self._s[842]! }
+    public var StickerPacksSettings_ArchivedPacks: String { return self._s[843]! }
+    public var Login_TermsOfServiceSignupDecline: String { return self._s[845]! }
+    public var Channel_Moderator_AccessLevelRevoke: String { return self._s[846]! }
+    public var Message_Location: String { return self._s[847]! }
+    public var Passport_Identity_NamePlaceholder: String { return self._s[848]! }
+    public var Channel_Management_Title: String { return self._s[849]! }
+    public var DialogList_SearchSectionDialogs: String { return self._s[851]! }
+    public var Compose_NewChannel_Members: String { return self._s[852]! }
     public func DialogList_SingleUploadingFileSuffix(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[852]!, self._r[852]!, [_0])
+        return formatWithArgumentRanges(self._s[853]!, self._r[853]!, [_0])
     }
-    public var GroupInfo_Location: String { return self._s[853]! }
-    public var Appearance_ThemePreview_ChatList_5_Name: String { return self._s[854]! }
-    public var ClearCache_Clear: String { return self._s[855]! }
-    public var InstantPage_FeedbackButtonShort: String { return self._s[856]! }
-    public var AutoNightTheme_ScheduledFrom: String { return self._s[857]! }
-    public var PhotoEditor_WarmthTool: String { return self._s[858]! }
-    public var Passport_Language_tr: String { return self._s[859]! }
+    public var GroupInfo_Location: String { return self._s[854]! }
+    public var Appearance_ThemePreview_ChatList_5_Name: String { return self._s[855]! }
+    public var ClearCache_Clear: String { return self._s[856]! }
+    public var InstantPage_FeedbackButtonShort: String { return self._s[857]! }
+    public var AutoNightTheme_ScheduledFrom: String { return self._s[858]! }
+    public var PhotoEditor_WarmthTool: String { return self._s[859]! }
+    public var Passport_Language_tr: String { return self._s[860]! }
     public func PUSH_MESSAGE_GAME_SCORE(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[860]!, self._r[860]!, [_1, _2, _3])
+        return formatWithArgumentRanges(self._s[861]!, self._r[861]!, [_1, _2, _3])
     }
-    public var OldChannels_NoticeUpgradeText: String { return self._s[861]! }
-    public var Login_ResetAccountProtected_Reset: String { return self._s[863]! }
-    public var Watch_PhotoView_Title: String { return self._s[864]! }
-    public var Passport_Phone_Delete: String { return self._s[865]! }
-    public var Undo_ChatDeletedForBothSides: String { return self._s[866]! }
-    public var Conversation_EditingMessageMediaEditCurrentPhoto: String { return self._s[867]! }
-    public var GroupInfo_Permissions: String { return self._s[868]! }
-    public var PasscodeSettings_TurnPasscodeOff: String { return self._s[869]! }
-    public var Profile_ShareContactButton: String { return self._s[870]! }
-    public var ChatSettings_Other: String { return self._s[871]! }
-    public var UserInfo_NotificationsDisabled: String { return self._s[872]! }
-    public var CheckoutInfo_ShippingInfoCity: String { return self._s[873]! }
-    public var LastSeen_WithinAMonth: String { return self._s[874]! }
-    public var VoiceOver_Chat_PlayHint: String { return self._s[875]! }
-    public var Conversation_ReportGroupLocation: String { return self._s[876]! }
-    public var Conversation_EncryptionCanceled: String { return self._s[877]! }
-    public var MediaPicker_GroupDescription: String { return self._s[878]! }
-    public var WebSearch_Images: String { return self._s[879]! }
+    public var OldChannels_NoticeUpgradeText: String { return self._s[862]! }
+    public var Login_ResetAccountProtected_Reset: String { return self._s[864]! }
+    public var Watch_PhotoView_Title: String { return self._s[865]! }
+    public var Passport_Phone_Delete: String { return self._s[866]! }
+    public var Undo_ChatDeletedForBothSides: String { return self._s[867]! }
+    public var Conversation_EditingMessageMediaEditCurrentPhoto: String { return self._s[868]! }
+    public var GroupInfo_Permissions: String { return self._s[869]! }
+    public var PasscodeSettings_TurnPasscodeOff: String { return self._s[870]! }
+    public var Profile_ShareContactButton: String { return self._s[871]! }
+    public var ChatSettings_Other: String { return self._s[872]! }
+    public var UserInfo_NotificationsDisabled: String { return self._s[873]! }
+    public var CheckoutInfo_ShippingInfoCity: String { return self._s[874]! }
+    public var LastSeen_WithinAMonth: String { return self._s[875]! }
+    public var VoiceOver_Chat_PlayHint: String { return self._s[876]! }
+    public var Conversation_ReportGroupLocation: String { return self._s[877]! }
+    public var Conversation_EncryptionCanceled: String { return self._s[878]! }
+    public var MediaPicker_GroupDescription: String { return self._s[879]! }
+    public var WebSearch_Images: String { return self._s[880]! }
     public func Channel_Management_PromotedBy(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[880]!, self._r[880]!, [_0])
+        return formatWithArgumentRanges(self._s[881]!, self._r[881]!, [_0])
     }
-    public var Message_Photo: String { return self._s[881]! }
-    public var PasscodeSettings_HelpBottom: String { return self._s[882]! }
-    public var AutoDownloadSettings_VideosTitle: String { return self._s[883]! }
-    public var VoiceOver_Media_PlaybackRateChange: String { return self._s[884]! }
-    public var Passport_Identity_AddDriversLicense: String { return self._s[885]! }
-    public var TwoStepAuth_EnterPasswordPassword: String { return self._s[886]! }
-    public var NotificationsSound_Calypso: String { return self._s[887]! }
-    public var Map_Map: String { return self._s[888]! }
+    public var Message_Photo: String { return self._s[882]! }
+    public var PasscodeSettings_HelpBottom: String { return self._s[883]! }
+    public var AutoDownloadSettings_VideosTitle: String { return self._s[884]! }
+    public var VoiceOver_Media_PlaybackRateChange: String { return self._s[885]! }
+    public var Passport_Identity_AddDriversLicense: String { return self._s[886]! }
+    public var TwoStepAuth_EnterPasswordPassword: String { return self._s[887]! }
+    public var NotificationsSound_Calypso: String { return self._s[888]! }
+    public var Map_Map: String { return self._s[889]! }
     public func Conversation_LiveLocationYouAndOther(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[889]!, self._r[889]!, [_0])
+        return formatWithArgumentRanges(self._s[890]!, self._r[890]!, [_0])
     }
-    public var CheckoutInfo_ReceiverInfoTitle: String { return self._s[891]! }
-    public var ChatSettings_TextSizeUnits: String { return self._s[892]! }
+    public var CheckoutInfo_ReceiverInfoTitle: String { return self._s[892]! }
+    public var ChatSettings_TextSizeUnits: String { return self._s[893]! }
     public func VoiceOver_Chat_FileFrom(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[893]!, self._r[893]!, [_0])
+        return formatWithArgumentRanges(self._s[894]!, self._r[894]!, [_0])
     }
-    public var Common_of: String { return self._s[894]! }
-    public var Conversation_ForwardContacts: String { return self._s[897]! }
-    public var IntentsSettings_SuggestByAll: String { return self._s[899]! }
+    public var Common_of: String { return self._s[895]! }
+    public var Conversation_ForwardContacts: String { return self._s[898]! }
+    public var IntentsSettings_SuggestByAll: String { return self._s[900]! }
     public func Call_AnsweringWithAccount(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[900]!, self._r[900]!, [_0])
+        return formatWithArgumentRanges(self._s[901]!, self._r[901]!, [_0])
     }
-    public var Passport_Language_hy: String { return self._s[901]! }
-    public var Notifications_MessageNotificationsHelp: String { return self._s[902]! }
-    public var AutoDownloadSettings_Reset: String { return self._s[903]! }
-    public var Wallet_TransactionInfo_AddressCopied: String { return self._s[904]! }
-    public var Paint_ClearConfirm: String { return self._s[905]! }
-    public var Camera_VideoMode: String { return self._s[906]! }
+    public var Passport_Language_hy: String { return self._s[902]! }
+    public var Notifications_MessageNotificationsHelp: String { return self._s[903]! }
+    public var AutoDownloadSettings_Reset: String { return self._s[904]! }
+    public var Wallet_TransactionInfo_AddressCopied: String { return self._s[905]! }
+    public var Paint_ClearConfirm: String { return self._s[906]! }
+    public var Camera_VideoMode: String { return self._s[907]! }
     public func Conversation_RestrictedStickersTimed(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[907]!, self._r[907]!, [_0])
+        return formatWithArgumentRanges(self._s[908]!, self._r[908]!, [_0])
     }
-    public var Privacy_Calls_AlwaysAllow_Placeholder: String { return self._s[908]! }
-    public var Conversation_ViewBackground: String { return self._s[909]! }
+    public var Privacy_Calls_AlwaysAllow_Placeholder: String { return self._s[909]! }
+    public var Conversation_ViewBackground: String { return self._s[910]! }
     public func Wallet_Info_TransactionDateHeaderYear(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[910]!, self._r[910]!, [_1, _2, _3])
+        return formatWithArgumentRanges(self._s[911]!, self._r[911]!, [_1, _2, _3])
     }
-    public var Passport_Language_el: String { return self._s[911]! }
-    public var PhotoEditor_Original: String { return self._s[912]! }
-    public var Settings_FAQ_Button: String { return self._s[914]! }
-    public var Channel_Setup_PublicNoLink: String { return self._s[916]! }
-    public var Conversation_UnsupportedMedia: String { return self._s[917]! }
-    public var Conversation_SlideToCancel: String { return self._s[918]! }
-    public var Appearance_ThemePreview_ChatList_4_Name: String { return self._s[919]! }
-    public var Passport_Identity_OneOfTypeInternalPassport: String { return self._s[920]! }
-    public var CheckoutInfo_ShippingInfoPostcode: String { return self._s[921]! }
-    public var Conversation_ReportSpamChannelConfirmation: String { return self._s[922]! }
-    public var AutoNightTheme_NotAvailable: String { return self._s[923]! }
-    public var Conversation_Owner: String { return self._s[924]! }
-    public var Common_Create: String { return self._s[925]! }
-    public var Settings_ApplyProxyAlertEnable: String { return self._s[926]! }
-    public var ContactList_Context_Call: String { return self._s[927]! }
-    public var Localization_ChooseLanguage: String { return self._s[929]! }
-    public var ChatList_Context_AddToContacts: String { return self._s[931]! }
-    public var OldChannels_NoticeTitle: String { return self._s[932]! }
-    public var Settings_Proxy: String { return self._s[934]! }
-    public var Privacy_TopPeersHelp: String { return self._s[935]! }
-    public var CheckoutInfo_ShippingInfoCountryPlaceholder: String { return self._s[936]! }
-    public var Chat_UnsendMyMessages: String { return self._s[937]! }
+    public var Passport_Language_el: String { return self._s[912]! }
+    public var PhotoEditor_Original: String { return self._s[913]! }
+    public var Settings_FAQ_Button: String { return self._s[915]! }
+    public var Channel_Setup_PublicNoLink: String { return self._s[917]! }
+    public var Conversation_UnsupportedMedia: String { return self._s[918]! }
+    public var Conversation_SlideToCancel: String { return self._s[919]! }
+    public var Appearance_ThemePreview_ChatList_4_Name: String { return self._s[920]! }
+    public var Passport_Identity_OneOfTypeInternalPassport: String { return self._s[921]! }
+    public var CheckoutInfo_ShippingInfoPostcode: String { return self._s[922]! }
+    public var Conversation_ReportSpamChannelConfirmation: String { return self._s[923]! }
+    public var AutoNightTheme_NotAvailable: String { return self._s[924]! }
+    public var Conversation_Owner: String { return self._s[925]! }
+    public var Common_Create: String { return self._s[926]! }
+    public var Settings_ApplyProxyAlertEnable: String { return self._s[927]! }
+    public var ContactList_Context_Call: String { return self._s[928]! }
+    public var Localization_ChooseLanguage: String { return self._s[930]! }
+    public var ChatList_Context_AddToContacts: String { return self._s[932]! }
+    public var OldChannels_NoticeTitle: String { return self._s[933]! }
+    public var Settings_Proxy: String { return self._s[935]! }
+    public var Privacy_TopPeersHelp: String { return self._s[936]! }
+    public var CheckoutInfo_ShippingInfoCountryPlaceholder: String { return self._s[937]! }
+    public var Chat_UnsendMyMessages: String { return self._s[938]! }
     public func VoiceOver_Chat_Duration(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[938]!, self._r[938]!, [_0])
+        return formatWithArgumentRanges(self._s[939]!, self._r[939]!, [_0])
     }
-    public var TwoStepAuth_ConfirmationAbort: String { return self._s[939]! }
+    public var TwoStepAuth_ConfirmationAbort: String { return self._s[940]! }
     public func Contacts_AccessDeniedHelpPortrait(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[941]!, self._r[941]!, [_0])
+        return formatWithArgumentRanges(self._s[942]!, self._r[942]!, [_0])
     }
-    public var Contacts_SortedByPresence: String { return self._s[942]! }
-    public var Passport_Identity_SurnamePlaceholder: String { return self._s[943]! }
-    public var Cache_Title: String { return self._s[944]! }
+    public var Contacts_SortedByPresence: String { return self._s[943]! }
+    public var Passport_Identity_SurnamePlaceholder: String { return self._s[944]! }
+    public var Cache_Title: String { return self._s[945]! }
     public func Login_PhoneBannedEmailSubject(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[945]!, self._r[945]!, [_0])
+        return formatWithArgumentRanges(self._s[946]!, self._r[946]!, [_0])
     }
-    public var TwoStepAuth_EmailCodeExpired: String { return self._s[946]! }
-    public var Channel_Moderator_Title: String { return self._s[947]! }
-    public var InstantPage_AutoNightTheme: String { return self._s[949]! }
+    public var TwoStepAuth_EmailCodeExpired: String { return self._s[947]! }
+    public var Channel_Moderator_Title: String { return self._s[948]! }
+    public var InstantPage_AutoNightTheme: String { return self._s[950]! }
     public func PUSH_MESSAGE_POLL(_ _1: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[952]!, self._r[952]!, [_1])
+        return formatWithArgumentRanges(self._s[953]!, self._r[953]!, [_1])
     }
-    public var Passport_Scans_Upload: String { return self._s[953]! }
-    public var Undo_Undo: String { return self._s[955]! }
-    public var Contacts_AccessDeniedHelpON: String { return self._s[956]! }
-    public var TwoStepAuth_RemovePassword: String { return self._s[957]! }
-    public var Common_Delete: String { return self._s[958]! }
-    public var Contacts_AddPeopleNearby: String { return self._s[960]! }
-    public var Conversation_ContextMenuDelete: String { return self._s[961]! }
-    public var SocksProxySetup_Credentials: String { return self._s[962]! }
-    public var Appearance_EditTheme: String { return self._s[964]! }
-    public var ClearCache_StorageOtherApps: String { return self._s[965]! }
-    public var PasscodeSettings_AutoLock_Disabled: String { return self._s[967]! }
-    public var Wallet_Send_NetworkErrorText: String { return self._s[968]! }
-    public var AuthSessions_DevicesTitle: String { return self._s[970]! }
-    public var Passport_Address_OneOfTypeRentalAgreement: String { return self._s[972]! }
-    public var Conversation_ShareBotContactConfirmationTitle: String { return self._s[973]! }
-    public var Passport_Language_id: String { return self._s[975]! }
-    public var WallpaperSearch_ColorTeal: String { return self._s[976]! }
-    public var ChannelIntro_Title: String { return self._s[977]! }
+    public var Passport_Scans_Upload: String { return self._s[954]! }
+    public var Undo_Undo: String { return self._s[956]! }
+    public var Contacts_AccessDeniedHelpON: String { return self._s[957]! }
+    public var TwoStepAuth_RemovePassword: String { return self._s[958]! }
+    public var Common_Delete: String { return self._s[959]! }
+    public var Contacts_AddPeopleNearby: String { return self._s[961]! }
+    public var Conversation_ContextMenuDelete: String { return self._s[962]! }
+    public var SocksProxySetup_Credentials: String { return self._s[963]! }
+    public var Appearance_EditTheme: String { return self._s[965]! }
+    public var ClearCache_StorageOtherApps: String { return self._s[966]! }
+    public var PasscodeSettings_AutoLock_Disabled: String { return self._s[968]! }
+    public var Wallet_Send_NetworkErrorText: String { return self._s[969]! }
+    public var AuthSessions_DevicesTitle: String { return self._s[971]! }
+    public var Passport_Address_OneOfTypeRentalAgreement: String { return self._s[973]! }
+    public var Conversation_ShareBotContactConfirmationTitle: String { return self._s[974]! }
+    public var Passport_Language_id: String { return self._s[976]! }
+    public var WallpaperSearch_ColorTeal: String { return self._s[977]! }
+    public var ChannelIntro_Title: String { return self._s[978]! }
     public func Channel_AdminLog_MessageToggleSignaturesOff(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[978]!, self._r[978]!, [_0])
+        return formatWithArgumentRanges(self._s[979]!, self._r[979]!, [_0])
     }
-    public var VoiceOver_Chat_OpenLinkHint: String { return self._s[980]! }
-    public var VoiceOver_Chat_Reply: String { return self._s[981]! }
-    public var ScheduledMessages_BotActionUnavailable: String { return self._s[982]! }
-    public var Channel_Info_Description: String { return self._s[983]! }
-    public var Stickers_FavoriteStickers: String { return self._s[984]! }
-    public var Channel_BanUser_PermissionAddMembers: String { return self._s[985]! }
-    public var Notifications_DisplayNamesOnLockScreen: String { return self._s[986]! }
-    public var ChatSearch_ResultsTooltip: String { return self._s[987]! }
-    public var Wallet_VoiceOver_Editing_ClearText: String { return self._s[988]! }
-    public var Calls_NoMissedCallsPlacehoder: String { return self._s[989]! }
-    public var Group_PublicLink_Placeholder: String { return self._s[990]! }
-    public var Notifications_ExceptionsDefaultSound: String { return self._s[991]! }
+    public var VoiceOver_Chat_OpenLinkHint: String { return self._s[981]! }
+    public var VoiceOver_Chat_Reply: String { return self._s[982]! }
+    public var ScheduledMessages_BotActionUnavailable: String { return self._s[983]! }
+    public var Channel_Info_Description: String { return self._s[984]! }
+    public var Stickers_FavoriteStickers: String { return self._s[985]! }
+    public var Channel_BanUser_PermissionAddMembers: String { return self._s[986]! }
+    public var Notifications_DisplayNamesOnLockScreen: String { return self._s[987]! }
+    public var ChatSearch_ResultsTooltip: String { return self._s[988]! }
+    public var Wallet_VoiceOver_Editing_ClearText: String { return self._s[989]! }
+    public var Calls_NoMissedCallsPlacehoder: String { return self._s[990]! }
+    public var Group_PublicLink_Placeholder: String { return self._s[991]! }
+    public var Notifications_ExceptionsDefaultSound: String { return self._s[992]! }
     public func PUSH_CHANNEL_MESSAGE_POLL(_ _1: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[992]!, self._r[992]!, [_1])
+        return formatWithArgumentRanges(self._s[993]!, self._r[993]!, [_1])
     }
-    public var TextFormat_Underline: String { return self._s[993]! }
+    public var TextFormat_Underline: String { return self._s[994]! }
     public func DialogList_SearchSubtitleFormat(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[995]!, self._r[995]!, [_1, _2])
+        return formatWithArgumentRanges(self._s[996]!, self._r[996]!, [_1, _2])
     }
     public func Channel_AdminLog_MessageRemovedGroupStickerPack(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[996]!, self._r[996]!, [_0])
+        return formatWithArgumentRanges(self._s[997]!, self._r[997]!, [_0])
     }
-    public var Appearance_ThemePreview_ChatList_3_Name: String { return self._s[997]! }
+    public var Appearance_ThemePreview_ChatList_3_Name: String { return self._s[998]! }
     public func Channel_OwnershipTransfer_TransferCompleted(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[998]!, self._r[998]!, [_1, _2])
+        return formatWithArgumentRanges(self._s[999]!, self._r[999]!, [_1, _2])
     }
-    public var Wallet_Intro_ImportExisting: String { return self._s[999]! }
-    public var GroupPermission_Delete: String { return self._s[1000]! }
-    public var Passport_Language_uk: String { return self._s[1001]! }
-    public var StickerPack_HideStickers: String { return self._s[1003]! }
-    public var ChangePhoneNumberNumber_NumberPlaceholder: String { return self._s[1004]! }
+    public var Wallet_Intro_ImportExisting: String { return self._s[1000]! }
+    public var GroupPermission_Delete: String { return self._s[1001]! }
+    public var Passport_Language_uk: String { return self._s[1002]! }
+    public var StickerPack_HideStickers: String { return self._s[1004]! }
+    public var ChangePhoneNumberNumber_NumberPlaceholder: String { return self._s[1005]! }
     public func PUSH_CHAT_MESSAGE_PHOTO(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[1005]!, self._r[1005]!, [_1, _2])
+        return formatWithArgumentRanges(self._s[1006]!, self._r[1006]!, [_1, _2])
     }
-    public var Activity_UploadingVideoMessage: String { return self._s[1006]! }
+    public var Activity_UploadingVideoMessage: String { return self._s[1007]! }
     public func GroupPermission_ApplyAlertText(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[1007]!, self._r[1007]!, [_0])
+        return formatWithArgumentRanges(self._s[1008]!, self._r[1008]!, [_0])
     }
-    public var Channel_TitleInfo: String { return self._s[1008]! }
-    public var StickerPacksSettings_ArchivedPacks_Info: String { return self._s[1009]! }
-    public var Settings_CallSettings: String { return self._s[1010]! }
-    public var Camera_SquareMode: String { return self._s[1011]! }
-    public var Conversation_SendMessage_ScheduleMessage: String { return self._s[1012]! }
-    public var GroupInfo_SharedMediaNone: String { return self._s[1013]! }
+    public var Channel_TitleInfo: String { return self._s[1009]! }
+    public var StickerPacksSettings_ArchivedPacks_Info: String { return self._s[1010]! }
+    public var Settings_CallSettings: String { return self._s[1011]! }
+    public var Camera_SquareMode: String { return self._s[1012]! }
+    public var Conversation_SendMessage_ScheduleMessage: String { return self._s[1013]! }
+    public var GroupInfo_SharedMediaNone: String { return self._s[1014]! }
     public func PUSH_MESSAGE_VIDEO_SECRET(_ _1: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[1014]!, self._r[1014]!, [_1])
+        return formatWithArgumentRanges(self._s[1015]!, self._r[1015]!, [_1])
     }
-    public var Bot_GenericBotStatus: String { return self._s[1015]! }
-    public var Application_Update: String { return self._s[1017]! }
-    public var Month_ShortJanuary: String { return self._s[1018]! }
-    public var Contacts_PermissionsKeepDisabled: String { return self._s[1019]! }
-    public var Channel_AdminLog_BanReadMessages: String { return self._s[1020]! }
-    public var Settings_AppLanguage_Unofficial: String { return self._s[1021]! }
-    public var Passport_Address_Street2Placeholder: String { return self._s[1022]! }
+    public var Bot_GenericBotStatus: String { return self._s[1016]! }
+    public var Application_Update: String { return self._s[1018]! }
+    public var Month_ShortJanuary: String { return self._s[1019]! }
+    public var Contacts_PermissionsKeepDisabled: String { return self._s[1020]! }
+    public var Channel_AdminLog_BanReadMessages: String { return self._s[1021]! }
+    public var Settings_AppLanguage_Unofficial: String { return self._s[1022]! }
+    public var Passport_Address_Street2Placeholder: String { return self._s[1023]! }
     public func Map_LiveLocationShortHour(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[1023]!, self._r[1023]!, [_0])
+        return formatWithArgumentRanges(self._s[1024]!, self._r[1024]!, [_0])
     }
-    public var NetworkUsageSettings_Cellular: String { return self._s[1024]! }
-    public var Appearance_PreviewOutgoingText: String { return self._s[1025]! }
+    public var NetworkUsageSettings_Cellular: String { return self._s[1025]! }
+    public var Appearance_PreviewOutgoingText: String { return self._s[1026]! }
     public func StickerPackActionInfo_RemovedText(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[1026]!, self._r[1026]!, [_0])
+        return formatWithArgumentRanges(self._s[1027]!, self._r[1027]!, [_0])
     }
-    public var Notifications_PermissionsAllowInSettings: String { return self._s[1027]! }
-    public var AutoDownloadSettings_OnForAll: String { return self._s[1029]! }
-    public var Map_Directions: String { return self._s[1030]! }
-    public var Passport_FieldIdentityTranslationHelp: String { return self._s[1032]! }
-    public var Appearance_ThemeDay: String { return self._s[1033]! }
-    public var LogoutOptions_LogOut: String { return self._s[1034]! }
-    public var Group_PublicLink_Title: String { return self._s[1036]! }
-    public var Channel_AddBotErrorNoRights: String { return self._s[1037]! }
-    public var ChatList_Search_ShowLess: String { return self._s[1038]! }
-    public var Passport_Identity_AddPassport: String { return self._s[1039]! }
-    public var LocalGroup_ButtonTitle: String { return self._s[1040]! }
-    public var Stats_InteractionsTitle: String { return self._s[1041]! }
-    public var Call_Message: String { return self._s[1042]! }
-    public var PhotoEditor_ExposureTool: String { return self._s[1043]! }
-    public var Wallet_Receive_CommentInfo: String { return self._s[1045]! }
-    public var Passport_FieldOneOf_Delimeter: String { return self._s[1046]! }
-    public var Channel_AdminLog_CanBanUsers: String { return self._s[1048]! }
-    public var Appearance_ThemePreview_ChatList_2_Name: String { return self._s[1049]! }
-    public var Appearance_Preview: String { return self._s[1050]! }
-    public var Compose_ChannelMembers: String { return self._s[1051]! }
-    public var Conversation_DeleteManyMessages: String { return self._s[1052]! }
-    public var ReportPeer_ReasonOther_Title: String { return self._s[1053]! }
-    public var Checkout_ErrorProviderAccountTimeout: String { return self._s[1054]! }
-    public var TwoStepAuth_ResetAccountConfirmation: String { return self._s[1055]! }
-    public var Channel_Stickers_CreateYourOwn: String { return self._s[1058]! }
-    public var Conversation_UpdateTelegram: String { return self._s[1059]! }
-    public var EditTheme_Create_TopInfo: String { return self._s[1060]! }
+    public var Notifications_PermissionsAllowInSettings: String { return self._s[1028]! }
+    public var AutoDownloadSettings_OnForAll: String { return self._s[1030]! }
+    public var Map_Directions: String { return self._s[1031]! }
+    public var Passport_FieldIdentityTranslationHelp: String { return self._s[1033]! }
+    public var Appearance_ThemeDay: String { return self._s[1034]! }
+    public var LogoutOptions_LogOut: String { return self._s[1035]! }
+    public var Group_PublicLink_Title: String { return self._s[1037]! }
+    public var Channel_AddBotErrorNoRights: String { return self._s[1038]! }
+    public var ChatList_Search_ShowLess: String { return self._s[1039]! }
+    public var Passport_Identity_AddPassport: String { return self._s[1040]! }
+    public var LocalGroup_ButtonTitle: String { return self._s[1041]! }
+    public var Stats_InteractionsTitle: String { return self._s[1042]! }
+    public var Call_Message: String { return self._s[1043]! }
+    public var PhotoEditor_ExposureTool: String { return self._s[1044]! }
+    public var Wallet_Receive_CommentInfo: String { return self._s[1046]! }
+    public var Passport_FieldOneOf_Delimeter: String { return self._s[1047]! }
+    public var Channel_AdminLog_CanBanUsers: String { return self._s[1049]! }
+    public var Appearance_ThemePreview_ChatList_2_Name: String { return self._s[1050]! }
+    public var Appearance_Preview: String { return self._s[1051]! }
+    public var Compose_ChannelMembers: String { return self._s[1052]! }
+    public var Conversation_DeleteManyMessages: String { return self._s[1053]! }
+    public var ReportPeer_ReasonOther_Title: String { return self._s[1054]! }
+    public var Checkout_ErrorProviderAccountTimeout: String { return self._s[1055]! }
+    public var TwoStepAuth_ResetAccountConfirmation: String { return self._s[1056]! }
+    public var Channel_Stickers_CreateYourOwn: String { return self._s[1059]! }
+    public var Conversation_UpdateTelegram: String { return self._s[1060]! }
+    public var EditTheme_Create_TopInfo: String { return self._s[1061]! }
     public func Notification_PinnedPhotoMessage(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[1061]!, self._r[1061]!, [_0])
+        return formatWithArgumentRanges(self._s[1062]!, self._r[1062]!, [_0])
     }
-    public var Wallet_WordCheck_Continue: String { return self._s[1062]! }
-    public var TwoFactorSetup_Hint_Action: String { return self._s[1063]! }
-    public var IntentsSettings_ResetAll: String { return self._s[1064]! }
+    public var Wallet_WordCheck_Continue: String { return self._s[1063]! }
+    public var TwoFactorSetup_Hint_Action: String { return self._s[1064]! }
+    public var IntentsSettings_ResetAll: String { return self._s[1065]! }
     public func PUSH_PINNED_GIF(_ _1: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[1065]!, self._r[1065]!, [_1])
+        return formatWithArgumentRanges(self._s[1066]!, self._r[1066]!, [_1])
     }
-    public var GroupInfo_Administrators_Title: String { return self._s[1066]! }
-    public var Privacy_Forwards_PreviewMessageText: String { return self._s[1067]! }
+    public var GroupInfo_Administrators_Title: String { return self._s[1067]! }
+    public var Privacy_Forwards_PreviewMessageText: String { return self._s[1068]! }
     public func PrivacySettings_LastSeenNobodyPlus(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[1068]!, self._r[1068]!, [_0])
+        return formatWithArgumentRanges(self._s[1069]!, self._r[1069]!, [_0])
     }
-    public var Tour_Title3: String { return self._s[1069]! }
-    public var Channel_EditAdmin_PermissionInviteSubscribers: String { return self._s[1070]! }
-    public var Clipboard_SendPhoto: String { return self._s[1074]! }
-    public var MediaPicker_Videos: String { return self._s[1075]! }
-    public var Passport_Email_Title: String { return self._s[1076]! }
+    public var Tour_Title3: String { return self._s[1070]! }
+    public var Channel_EditAdmin_PermissionInviteSubscribers: String { return self._s[1071]! }
+    public var Clipboard_SendPhoto: String { return self._s[1075]! }
+    public var MediaPicker_Videos: String { return self._s[1076]! }
+    public var Passport_Email_Title: String { return self._s[1077]! }
     public func PrivacySettings_LastSeenEverybodyMinus(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[1077]!, self._r[1077]!, [_0])
+        return formatWithArgumentRanges(self._s[1078]!, self._r[1078]!, [_0])
     }
-    public var StickerPacksSettings_Title: String { return self._s[1078]! }
-    public var Conversation_MessageDialogDelete: String { return self._s[1079]! }
-    public var Privacy_Calls_CustomHelp: String { return self._s[1081]! }
-    public var Message_Wallpaper: String { return self._s[1082]! }
-    public var MemberSearch_BotSection: String { return self._s[1083]! }
-    public var GroupInfo_SetSound: String { return self._s[1084]! }
+    public var StickerPacksSettings_Title: String { return self._s[1079]! }
+    public var Conversation_MessageDialogDelete: String { return self._s[1080]! }
+    public var Privacy_Calls_CustomHelp: String { return self._s[1082]! }
+    public var Message_Wallpaper: String { return self._s[1083]! }
+    public var MemberSearch_BotSection: String { return self._s[1084]! }
+    public var GroupInfo_SetSound: String { return self._s[1085]! }
+    public var Wallet_Send_EncryptComment: String { return self._s[1086]! }
     public func Time_TomorrowAt(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[1085]!, self._r[1085]!, [_0])
+        return formatWithArgumentRanges(self._s[1087]!, self._r[1087]!, [_0])
     }
-    public var Core_ServiceUserStatus: String { return self._s[1086]! }
-    public var LiveLocationUpdated_JustNow: String { return self._s[1087]! }
-    public var Call_StatusFailed: String { return self._s[1088]! }
-    public var TwoFactorSetup_Email_Placeholder: String { return self._s[1089]! }
-    public var TwoStepAuth_SetupPasswordDescription: String { return self._s[1090]! }
-    public var TwoStepAuth_SetPassword: String { return self._s[1091]! }
-    public var Permissions_PeopleNearbyText_v0: String { return self._s[1092]! }
+    public var Core_ServiceUserStatus: String { return self._s[1088]! }
+    public var LiveLocationUpdated_JustNow: String { return self._s[1089]! }
+    public var Call_StatusFailed: String { return self._s[1090]! }
+    public var TwoFactorSetup_Email_Placeholder: String { return self._s[1091]! }
+    public var TwoStepAuth_SetupPasswordDescription: String { return self._s[1092]! }
+    public var TwoStepAuth_SetPassword: String { return self._s[1093]! }
+    public var Permissions_PeopleNearbyText_v0: String { return self._s[1094]! }
     public func SocksProxySetup_ProxyStatusPing(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[1094]!, self._r[1094]!, [_0])
+        return formatWithArgumentRanges(self._s[1096]!, self._r[1096]!, [_0])
     }
-    public var Calls_SubmitRating: String { return self._s[1095]! }
-    public var Map_NoPlacesNearby: String { return self._s[1096]! }
-    public var Profile_Username: String { return self._s[1097]! }
-    public var Bot_DescriptionTitle: String { return self._s[1098]! }
-    public var MaskStickerSettings_Title: String { return self._s[1099]! }
-    public var SharedMedia_CategoryOther: String { return self._s[1100]! }
-    public var GroupInfo_SetGroupPhoto: String { return self._s[1101]! }
-    public var Common_NotNow: String { return self._s[1102]! }
-    public var CallFeedback_IncludeLogsInfo: String { return self._s[1103]! }
-    public var Conversation_ShareMyPhoneNumber: String { return self._s[1104]! }
-    public var Map_Location: String { return self._s[1105]! }
-    public var Invitation_JoinGroup: String { return self._s[1106]! }
-    public var AutoDownloadSettings_Title: String { return self._s[1108]! }
-    public var Conversation_DiscardVoiceMessageDescription: String { return self._s[1109]! }
-    public var Channel_ErrorAddBlocked: String { return self._s[1110]! }
-    public var Conversation_UnblockUser: String { return self._s[1111]! }
-    public var EditTheme_Edit_TopInfo: String { return self._s[1112]! }
-    public var Watch_Bot_Restart: String { return self._s[1113]! }
-    public var TwoStepAuth_Title: String { return self._s[1114]! }
-    public var Channel_AdminLog_BanSendMessages: String { return self._s[1115]! }
-    public var Checkout_ShippingMethod: String { return self._s[1116]! }
-    public var Passport_Identity_OneOfTypeIdentityCard: String { return self._s[1117]! }
+    public var Calls_SubmitRating: String { return self._s[1097]! }
+    public var Map_NoPlacesNearby: String { return self._s[1098]! }
+    public var Profile_Username: String { return self._s[1099]! }
+    public var Bot_DescriptionTitle: String { return self._s[1100]! }
+    public var MaskStickerSettings_Title: String { return self._s[1101]! }
+    public var SharedMedia_CategoryOther: String { return self._s[1102]! }
+    public var GroupInfo_SetGroupPhoto: String { return self._s[1103]! }
+    public var Common_NotNow: String { return self._s[1104]! }
+    public var CallFeedback_IncludeLogsInfo: String { return self._s[1105]! }
+    public var Conversation_ShareMyPhoneNumber: String { return self._s[1106]! }
+    public var Map_Location: String { return self._s[1107]! }
+    public var Invitation_JoinGroup: String { return self._s[1108]! }
+    public var AutoDownloadSettings_Title: String { return self._s[1110]! }
+    public var Conversation_DiscardVoiceMessageDescription: String { return self._s[1111]! }
+    public var Channel_ErrorAddBlocked: String { return self._s[1112]! }
+    public var Conversation_UnblockUser: String { return self._s[1113]! }
+    public var EditTheme_Edit_TopInfo: String { return self._s[1114]! }
+    public var Watch_Bot_Restart: String { return self._s[1115]! }
+    public var TwoStepAuth_Title: String { return self._s[1116]! }
+    public var Channel_AdminLog_BanSendMessages: String { return self._s[1117]! }
+    public var Checkout_ShippingMethod: String { return self._s[1118]! }
+    public var Passport_Identity_OneOfTypeIdentityCard: String { return self._s[1119]! }
     public func PUSH_CHAT_MESSAGE_STICKER(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[1118]!, self._r[1118]!, [_1, _2, _3])
+        return formatWithArgumentRanges(self._s[1120]!, self._r[1120]!, [_1, _2, _3])
     }
-    public var PeerInfo_ButtonDiscuss: String { return self._s[1119]! }
-    public var EditTheme_ChangeColors: String { return self._s[1121]! }
+    public var PeerInfo_ButtonDiscuss: String { return self._s[1121]! }
+    public var EditTheme_ChangeColors: String { return self._s[1123]! }
     public func Chat_UnsendMyMessagesAlertTitle(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[1122]!, self._r[1122]!, [_0])
+        return formatWithArgumentRanges(self._s[1124]!, self._r[1124]!, [_0])
     }
     public func Channel_Username_LinkHint(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[1123]!, self._r[1123]!, [_0])
+        return formatWithArgumentRanges(self._s[1125]!, self._r[1125]!, [_0])
     }
-    public var Appearance_ThemePreview_ChatList_1_Name: String { return self._s[1124]! }
-    public var SettingsSearch_Synonyms_Data_AutoplayGifs: String { return self._s[1126]! }
-    public var AuthSessions_TerminateOtherSessions: String { return self._s[1127]! }
-    public var Contacts_FailedToSendInvitesMessage: String { return self._s[1128]! }
-    public var PrivacySettings_TwoStepAuth: String { return self._s[1129]! }
-    public var Notification_Exceptions_PreviewAlwaysOn: String { return self._s[1130]! }
-    public var SettingsSearch_Synonyms_Privacy_Passcode: String { return self._s[1131]! }
-    public var Conversation_EditingMessagePanelMedia: String { return self._s[1132]! }
-    public var Checkout_PaymentMethod_Title: String { return self._s[1133]! }
-    public var SocksProxySetup_Connection: String { return self._s[1134]! }
-    public var Group_MessagePhotoRemoved: String { return self._s[1135]! }
-    public var PeopleNearby_MakeInvisible: String { return self._s[1137]! }
-    public var Channel_Stickers_NotFound: String { return self._s[1139]! }
-    public var Group_About_Help: String { return self._s[1140]! }
-    public var Notification_PassportValueProofOfIdentity: String { return self._s[1141]! }
-    public var PeopleNearby_Title: String { return self._s[1143]! }
+    public var Appearance_ThemePreview_ChatList_1_Name: String { return self._s[1126]! }
+    public var SettingsSearch_Synonyms_Data_AutoplayGifs: String { return self._s[1128]! }
+    public var AuthSessions_TerminateOtherSessions: String { return self._s[1129]! }
+    public var Contacts_FailedToSendInvitesMessage: String { return self._s[1130]! }
+    public var PrivacySettings_TwoStepAuth: String { return self._s[1131]! }
+    public var Notification_Exceptions_PreviewAlwaysOn: String { return self._s[1132]! }
+    public var SettingsSearch_Synonyms_Privacy_Passcode: String { return self._s[1133]! }
+    public var Conversation_EditingMessagePanelMedia: String { return self._s[1134]! }
+    public var Checkout_PaymentMethod_Title: String { return self._s[1135]! }
+    public var SocksProxySetup_Connection: String { return self._s[1136]! }
+    public var Group_MessagePhotoRemoved: String { return self._s[1137]! }
+    public var PeopleNearby_MakeInvisible: String { return self._s[1139]! }
+    public var Channel_Stickers_NotFound: String { return self._s[1141]! }
+    public var Group_About_Help: String { return self._s[1142]! }
+    public var Notification_PassportValueProofOfIdentity: String { return self._s[1143]! }
+    public var PeopleNearby_Title: String { return self._s[1145]! }
     public func ApplyLanguage_ChangeLanguageOfficialText(_ _1: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[1144]!, self._r[1144]!, [_1])
+        return formatWithArgumentRanges(self._s[1146]!, self._r[1146]!, [_1])
     }
-    public var Map_Home: String { return self._s[1145]! }
-    public var CheckoutInfo_ShippingInfoStatePlaceholder: String { return self._s[1147]! }
-    public var Notifications_GroupNotificationsExceptionsHelp: String { return self._s[1148]! }
-    public var SocksProxySetup_Password: String { return self._s[1149]! }
-    public var Notifications_PermissionsEnable: String { return self._s[1150]! }
-    public var TwoStepAuth_ChangeEmail: String { return self._s[1152]! }
+    public var Map_Home: String { return self._s[1147]! }
+    public var CheckoutInfo_ShippingInfoStatePlaceholder: String { return self._s[1149]! }
+    public var Notifications_GroupNotificationsExceptionsHelp: String { return self._s[1150]! }
+    public var SocksProxySetup_Password: String { return self._s[1151]! }
+    public var Notifications_PermissionsEnable: String { return self._s[1152]! }
+    public var TwoStepAuth_ChangeEmail: String { return self._s[1154]! }
     public func Channel_AdminLog_MessageInvitedName(_ _1: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[1153]!, self._r[1153]!, [_1])
+        return formatWithArgumentRanges(self._s[1155]!, self._r[1155]!, [_1])
     }
     public func Time_MonthOfYear_m10(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[1155]!, self._r[1155]!, [_0])
+        return formatWithArgumentRanges(self._s[1157]!, self._r[1157]!, [_0])
     }
-    public var Passport_Identity_TypeDriversLicense: String { return self._s[1156]! }
-    public var ArchivedPacksAlert_Title: String { return self._s[1157]! }
-    public var Wallet_Receive_InvoiceUrlCopied: String { return self._s[1158]! }
-    public var Map_PlacesNearby: String { return self._s[1159]! }
+    public var Passport_Identity_TypeDriversLicense: String { return self._s[1158]! }
+    public var ArchivedPacksAlert_Title: String { return self._s[1159]! }
+    public var Wallet_Receive_InvoiceUrlCopied: String { return self._s[1160]! }
+    public var Map_PlacesNearby: String { return self._s[1161]! }
     public func Time_PreciseDate_m7(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[1160]!, self._r[1160]!, [_1, _2, _3])
+        return formatWithArgumentRanges(self._s[1162]!, self._r[1162]!, [_1, _2, _3])
     }
-    public var PrivacyLastSeenSettings_GroupsAndChannelsHelp: String { return self._s[1161]! }
-    public var Privacy_Calls_NeverAllow_Placeholder: String { return self._s[1163]! }
-    public var Conversation_StatusTyping: String { return self._s[1164]! }
-    public var Broadcast_AdminLog_EmptyText: String { return self._s[1165]! }
-    public var Notification_PassportValueProofOfAddress: String { return self._s[1166]! }
-    public var UserInfo_CreateNewContact: String { return self._s[1167]! }
-    public var Passport_Identity_FrontSide: String { return self._s[1168]! }
-    public var Login_PhoneNumberAlreadyAuthorizedSwitch: String { return self._s[1169]! }
-    public var Calls_CallTabTitle: String { return self._s[1170]! }
-    public var Channel_AdminLog_ChannelEmptyText: String { return self._s[1171]! }
+    public var PrivacyLastSeenSettings_GroupsAndChannelsHelp: String { return self._s[1163]! }
+    public var Privacy_Calls_NeverAllow_Placeholder: String { return self._s[1165]! }
+    public var Conversation_StatusTyping: String { return self._s[1166]! }
+    public var Broadcast_AdminLog_EmptyText: String { return self._s[1167]! }
+    public var Notification_PassportValueProofOfAddress: String { return self._s[1168]! }
+    public var UserInfo_CreateNewContact: String { return self._s[1169]! }
+    public var Passport_Identity_FrontSide: String { return self._s[1170]! }
+    public var Login_PhoneNumberAlreadyAuthorizedSwitch: String { return self._s[1171]! }
+    public var Calls_CallTabTitle: String { return self._s[1172]! }
+    public var Channel_AdminLog_ChannelEmptyText: String { return self._s[1173]! }
     public func Login_BannedPhoneBody(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[1173]!, self._r[1173]!, [_0])
+        return formatWithArgumentRanges(self._s[1175]!, self._r[1175]!, [_0])
     }
-    public var Watch_UserInfo_MuteTitle: String { return self._s[1174]! }
-    public var Group_EditAdmin_RankAdminPlaceholder: String { return self._s[1175]! }
-    public var SharedMedia_EmptyMusicText: String { return self._s[1176]! }
-    public var Wallet_Completed_Text: String { return self._s[1177]! }
-    public var PasscodeSettings_AutoLock_IfAwayFor_1minute: String { return self._s[1178]! }
-    public var Paint_Stickers: String { return self._s[1179]! }
-    public var Privacy_GroupsAndChannels: String { return self._s[1180]! }
-    public var ChatList_Context_Delete: String { return self._s[1182]! }
-    public var UserInfo_AddContact: String { return self._s[1183]! }
+    public var Watch_UserInfo_MuteTitle: String { return self._s[1176]! }
+    public var Group_EditAdmin_RankAdminPlaceholder: String { return self._s[1177]! }
+    public var SharedMedia_EmptyMusicText: String { return self._s[1178]! }
+    public var Wallet_Completed_Text: String { return self._s[1179]! }
+    public var PasscodeSettings_AutoLock_IfAwayFor_1minute: String { return self._s[1180]! }
+    public var Paint_Stickers: String { return self._s[1181]! }
+    public var Privacy_GroupsAndChannels: String { return self._s[1182]! }
+    public var ChatList_Context_Delete: String { return self._s[1184]! }
+    public var UserInfo_AddContact: String { return self._s[1185]! }
     public func Conversation_MessageViaUser(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[1184]!, self._r[1184]!, [_0])
+        return formatWithArgumentRanges(self._s[1186]!, self._r[1186]!, [_0])
     }
-    public var PhoneNumberHelp_ChangeNumber: String { return self._s[1186]! }
+    public var PhoneNumberHelp_ChangeNumber: String { return self._s[1188]! }
     public func ChatList_ClearChatConfirmation(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[1188]!, self._r[1188]!, [_0])
+        return formatWithArgumentRanges(self._s[1190]!, self._r[1190]!, [_0])
     }
-    public var DialogList_NoMessagesTitle: String { return self._s[1189]! }
-    public var EditProfile_NameAndPhotoHelp: String { return self._s[1190]! }
-    public var BlockedUsers_BlockUser: String { return self._s[1191]! }
-    public var Notifications_PermissionsOpenSettings: String { return self._s[1192]! }
-    public var MediaPicker_UngroupDescription: String { return self._s[1194]! }
-    public var Watch_NoConnection: String { return self._s[1195]! }
-    public var Month_GenSeptember: String { return self._s[1196]! }
-    public var Conversation_ViewGroup: String { return self._s[1198]! }
-    public var Channel_AdminLogFilter_EventsLeavingSubscribers: String { return self._s[1201]! }
-    public var Privacy_Forwards_AlwaysLink: String { return self._s[1202]! }
-    public var Channel_OwnershipTransfer_ErrorAdminsTooMuch: String { return self._s[1203]! }
-    public var Passport_FieldOneOf_FinalDelimeter: String { return self._s[1204]! }
-    public var Wallet_WordCheck_IncorrectHeader: String { return self._s[1205]! }
-    public var MediaPicker_CameraRoll: String { return self._s[1207]! }
-    public var Month_GenAugust: String { return self._s[1208]! }
-    public var Wallet_Configuration_SourceHeader: String { return self._s[1209]! }
-    public var AccessDenied_VideoMessageMicrophone: String { return self._s[1210]! }
-    public var SharedMedia_EmptyText: String { return self._s[1211]! }
-    public var Map_ShareLiveLocation: String { return self._s[1212]! }
-    public var Calls_All: String { return self._s[1213]! }
-    public var Map_SendThisPlace: String { return self._s[1215]! }
-    public var Appearance_ThemeNight: String { return self._s[1217]! }
-    public var Conversation_HoldForAudio: String { return self._s[1218]! }
-    public var SettingsSearch_Synonyms_Support: String { return self._s[1221]! }
-    public var GroupInfo_GroupHistoryHidden: String { return self._s[1222]! }
-    public var SocksProxySetup_Secret: String { return self._s[1223]! }
+    public var DialogList_NoMessagesTitle: String { return self._s[1191]! }
+    public var EditProfile_NameAndPhotoHelp: String { return self._s[1192]! }
+    public var BlockedUsers_BlockUser: String { return self._s[1193]! }
+    public var Notifications_PermissionsOpenSettings: String { return self._s[1194]! }
+    public var MediaPicker_UngroupDescription: String { return self._s[1196]! }
+    public var Watch_NoConnection: String { return self._s[1197]! }
+    public var Month_GenSeptember: String { return self._s[1198]! }
+    public var Conversation_ViewGroup: String { return self._s[1200]! }
+    public var Channel_AdminLogFilter_EventsLeavingSubscribers: String { return self._s[1203]! }
+    public var Privacy_Forwards_AlwaysLink: String { return self._s[1204]! }
+    public var Channel_OwnershipTransfer_ErrorAdminsTooMuch: String { return self._s[1205]! }
+    public var Passport_FieldOneOf_FinalDelimeter: String { return self._s[1206]! }
+    public var Wallet_WordCheck_IncorrectHeader: String { return self._s[1207]! }
+    public var MediaPicker_CameraRoll: String { return self._s[1209]! }
+    public var Month_GenAugust: String { return self._s[1210]! }
+    public var Wallet_Configuration_SourceHeader: String { return self._s[1211]! }
+    public var AccessDenied_VideoMessageMicrophone: String { return self._s[1212]! }
+    public var SharedMedia_EmptyText: String { return self._s[1213]! }
+    public var Map_ShareLiveLocation: String { return self._s[1214]! }
+    public var Calls_All: String { return self._s[1215]! }
+    public var Map_SendThisPlace: String { return self._s[1217]! }
+    public var Appearance_ThemeNight: String { return self._s[1219]! }
+    public var Conversation_HoldForAudio: String { return self._s[1220]! }
+    public var SettingsSearch_Synonyms_Support: String { return self._s[1223]! }
+    public var GroupInfo_GroupHistoryHidden: String { return self._s[1224]! }
+    public var SocksProxySetup_Secret: String { return self._s[1225]! }
     public func Activity_RemindAboutChannel(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[1224]!, self._r[1224]!, [_0])
+        return formatWithArgumentRanges(self._s[1226]!, self._r[1226]!, [_0])
     }
-    public var Channel_BanList_RestrictedTitle: String { return self._s[1226]! }
-    public var Conversation_Location: String { return self._s[1227]! }
+    public var Channel_BanList_RestrictedTitle: String { return self._s[1228]! }
+    public var Conversation_Location: String { return self._s[1229]! }
     public func AutoDownloadSettings_UpToFor(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[1228]!, self._r[1228]!, [_1, _2])
+        return formatWithArgumentRanges(self._s[1230]!, self._r[1230]!, [_1, _2])
     }
-    public var ChatSettings_AutoDownloadPhotos: String { return self._s[1230]! }
-    public var SettingsSearch_Synonyms_Privacy_Title: String { return self._s[1231]! }
-    public var Notifications_PermissionsText: String { return self._s[1232]! }
-    public var SettingsSearch_Synonyms_Data_SaveIncomingPhotos: String { return self._s[1233]! }
-    public var Call_Flip: String { return self._s[1234]! }
-    public var Channel_AdminLog_CanDeleteMessagesOfOthers: String { return self._s[1236]! }
-    public var SocksProxySetup_ProxyStatusConnecting: String { return self._s[1237]! }
-    public var Wallet_TransactionInfo_StorageFeeInfoUrl: String { return self._s[1238]! }
-    public var PrivacyPhoneNumberSettings_DiscoveryHeader: String { return self._s[1239]! }
-    public var Channel_EditAdmin_PermissionPinMessages: String { return self._s[1241]! }
-    public var TwoStepAuth_ReEnterPasswordDescription: String { return self._s[1243]! }
-    public var Channel_TooMuchBots: String { return self._s[1245]! }
-    public var Passport_DeletePassportConfirmation: String { return self._s[1246]! }
-    public var Login_InvalidCodeError: String { return self._s[1247]! }
-    public var StickerPacksSettings_FeaturedPacks: String { return self._s[1248]! }
+    public var ChatSettings_AutoDownloadPhotos: String { return self._s[1232]! }
+    public var SettingsSearch_Synonyms_Privacy_Title: String { return self._s[1233]! }
+    public var Notifications_PermissionsText: String { return self._s[1234]! }
+    public var SettingsSearch_Synonyms_Data_SaveIncomingPhotos: String { return self._s[1235]! }
+    public var Call_Flip: String { return self._s[1236]! }
+    public var Channel_AdminLog_CanDeleteMessagesOfOthers: String { return self._s[1238]! }
+    public var SocksProxySetup_ProxyStatusConnecting: String { return self._s[1239]! }
+    public var Wallet_TransactionInfo_StorageFeeInfoUrl: String { return self._s[1240]! }
+    public var PrivacyPhoneNumberSettings_DiscoveryHeader: String { return self._s[1241]! }
+    public var Channel_EditAdmin_PermissionPinMessages: String { return self._s[1243]! }
+    public var TwoStepAuth_ReEnterPasswordDescription: String { return self._s[1245]! }
+    public var Channel_TooMuchBots: String { return self._s[1247]! }
+    public var Passport_DeletePassportConfirmation: String { return self._s[1248]! }
+    public var Login_InvalidCodeError: String { return self._s[1249]! }
+    public var StickerPacksSettings_FeaturedPacks: String { return self._s[1250]! }
     public func ChatList_DeleteSecretChatConfirmation(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[1249]!, self._r[1249]!, [_0])
+        return formatWithArgumentRanges(self._s[1251]!, self._r[1251]!, [_0])
     }
     public func GroupInfo_InvitationLinkAcceptChannel(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[1250]!, self._r[1250]!, [_0])
+        return formatWithArgumentRanges(self._s[1252]!, self._r[1252]!, [_0])
     }
-    public var VoiceOver_Navigation_ProxySettings: String { return self._s[1251]! }
-    public var Call_CallInProgressTitle: String { return self._s[1252]! }
-    public var Month_ShortSeptember: String { return self._s[1253]! }
-    public var Watch_ChannelInfo_Title: String { return self._s[1254]! }
-    public var ChatList_DeleteSavedMessagesConfirmation: String { return self._s[1257]! }
-    public var DialogList_PasscodeLockHelp: String { return self._s[1258]! }
-    public var Chat_MultipleTextMessagesDisabled: String { return self._s[1259]! }
-    public var Wallet_Receive_Title: String { return self._s[1260]! }
-    public var Notifications_Badge_IncludePublicGroups: String { return self._s[1261]! }
-    public var Channel_AdminLogFilter_EventsTitle: String { return self._s[1262]! }
-    public var PhotoEditor_CropReset: String { return self._s[1263]! }
-    public var Group_Username_CreatePrivateLinkHelp: String { return self._s[1265]! }
-    public var Channel_Management_LabelEditor: String { return self._s[1266]! }
-    public var Passport_Identity_LatinNameHelp: String { return self._s[1268]! }
-    public var PhotoEditor_HighlightsTool: String { return self._s[1269]! }
-    public var Wallet_Info_WalletCreated: String { return self._s[1270]! }
-    public var UserInfo_Title: String { return self._s[1271]! }
-    public var ChatList_HideAction: String { return self._s[1272]! }
-    public var AccessDenied_Title: String { return self._s[1273]! }
-    public var DialogList_SearchLabel: String { return self._s[1274]! }
-    public var Group_Setup_HistoryHidden: String { return self._s[1275]! }
-    public var TwoStepAuth_PasswordChangeSuccess: String { return self._s[1276]! }
-    public var State_Updating: String { return self._s[1278]! }
-    public var Contacts_TabTitle: String { return self._s[1279]! }
-    public var Notifications_Badge_CountUnreadMessages: String { return self._s[1281]! }
-    public var GroupInfo_GroupHistory: String { return self._s[1282]! }
-    public var Conversation_UnsupportedMediaPlaceholder: String { return self._s[1283]! }
-    public var Wallpaper_SetColor: String { return self._s[1284]! }
-    public var CheckoutInfo_ShippingInfoCountry: String { return self._s[1285]! }
-    public var SettingsSearch_Synonyms_SavedMessages: String { return self._s[1286]! }
-    public var Chat_AttachmentLimitReached: String { return self._s[1287]! }
-    public var Passport_Identity_OneOfTypeDriversLicense: String { return self._s[1288]! }
-    public var Contacts_NotRegisteredSection: String { return self._s[1289]! }
+    public var VoiceOver_Navigation_ProxySettings: String { return self._s[1253]! }
+    public var Call_CallInProgressTitle: String { return self._s[1254]! }
+    public var Month_ShortSeptember: String { return self._s[1255]! }
+    public var Watch_ChannelInfo_Title: String { return self._s[1256]! }
+    public var ChatList_DeleteSavedMessagesConfirmation: String { return self._s[1259]! }
+    public var DialogList_PasscodeLockHelp: String { return self._s[1260]! }
+    public var Chat_MultipleTextMessagesDisabled: String { return self._s[1261]! }
+    public var Wallet_Receive_Title: String { return self._s[1262]! }
+    public var Notifications_Badge_IncludePublicGroups: String { return self._s[1263]! }
+    public var Channel_AdminLogFilter_EventsTitle: String { return self._s[1264]! }
+    public var PhotoEditor_CropReset: String { return self._s[1265]! }
+    public var Group_Username_CreatePrivateLinkHelp: String { return self._s[1267]! }
+    public var Channel_Management_LabelEditor: String { return self._s[1268]! }
+    public var Passport_Identity_LatinNameHelp: String { return self._s[1270]! }
+    public var PhotoEditor_HighlightsTool: String { return self._s[1271]! }
+    public var Wallet_Info_WalletCreated: String { return self._s[1272]! }
+    public var UserInfo_Title: String { return self._s[1273]! }
+    public var ChatList_HideAction: String { return self._s[1274]! }
+    public var AccessDenied_Title: String { return self._s[1275]! }
+    public var DialogList_SearchLabel: String { return self._s[1276]! }
+    public var Group_Setup_HistoryHidden: String { return self._s[1277]! }
+    public var TwoStepAuth_PasswordChangeSuccess: String { return self._s[1278]! }
+    public var State_Updating: String { return self._s[1280]! }
+    public var Contacts_TabTitle: String { return self._s[1281]! }
+    public var Notifications_Badge_CountUnreadMessages: String { return self._s[1283]! }
+    public var GroupInfo_GroupHistory: String { return self._s[1284]! }
+    public var Conversation_UnsupportedMediaPlaceholder: String { return self._s[1285]! }
+    public var Wallpaper_SetColor: String { return self._s[1286]! }
+    public var CheckoutInfo_ShippingInfoCountry: String { return self._s[1287]! }
+    public var SettingsSearch_Synonyms_SavedMessages: String { return self._s[1288]! }
+    public var Chat_AttachmentLimitReached: String { return self._s[1289]! }
+    public var Passport_Identity_OneOfTypeDriversLicense: String { return self._s[1290]! }
+    public var Contacts_NotRegisteredSection: String { return self._s[1291]! }
     public func Time_PreciseDate_m4(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[1290]!, self._r[1290]!, [_1, _2, _3])
+        return formatWithArgumentRanges(self._s[1292]!, self._r[1292]!, [_1, _2, _3])
     }
-    public var Paint_Clear: String { return self._s[1291]! }
-    public var StickerPacksSettings_ArchivedMasks: String { return self._s[1292]! }
-    public var SocksProxySetup_Connecting: String { return self._s[1293]! }
-    public var ExplicitContent_AlertChannel: String { return self._s[1294]! }
-    public var CreatePoll_AllOptionsAdded: String { return self._s[1295]! }
-    public var Conversation_Contact: String { return self._s[1296]! }
-    public var Login_CodeExpired: String { return self._s[1297]! }
-    public var Passport_DiscardMessageAction: String { return self._s[1298]! }
-    public var ChatList_Context_Unpin: String { return self._s[1299]! }
-    public var Channel_AdminLog_MessagePreviousDescription: String { return self._s[1300]! }
+    public var Paint_Clear: String { return self._s[1293]! }
+    public var StickerPacksSettings_ArchivedMasks: String { return self._s[1294]! }
+    public var SocksProxySetup_Connecting: String { return self._s[1295]! }
+    public var ExplicitContent_AlertChannel: String { return self._s[1296]! }
+    public var CreatePoll_AllOptionsAdded: String { return self._s[1297]! }
+    public var Conversation_Contact: String { return self._s[1298]! }
+    public var Login_CodeExpired: String { return self._s[1299]! }
+    public var Passport_DiscardMessageAction: String { return self._s[1300]! }
+    public var ChatList_Context_Unpin: String { return self._s[1301]! }
+    public var Channel_AdminLog_MessagePreviousDescription: String { return self._s[1302]! }
     public func VoiceOver_Chat_MusicFrom(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[1301]!, self._r[1301]!, [_0])
+        return formatWithArgumentRanges(self._s[1303]!, self._r[1303]!, [_0])
     }
-    public var Channel_AdminLog_EmptyMessageText: String { return self._s[1302]! }
-    public var SettingsSearch_Synonyms_Data_NetworkUsage: String { return self._s[1303]! }
+    public var Channel_AdminLog_EmptyMessageText: String { return self._s[1304]! }
+    public var SettingsSearch_Synonyms_Data_NetworkUsage: String { return self._s[1305]! }
     public func Group_EditAdmin_RankInfo(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[1304]!, self._r[1304]!, [_0])
+        return formatWithArgumentRanges(self._s[1306]!, self._r[1306]!, [_0])
     }
-    public var Month_ShortApril: String { return self._s[1305]! }
-    public var AuthSessions_CurrentSession: String { return self._s[1306]! }
-    public var Chat_AttachmentMultipleFilesDisabled: String { return self._s[1309]! }
-    public var Wallet_Navigation_Cancel: String { return self._s[1311]! }
-    public var WallpaperPreview_CropTopText: String { return self._s[1312]! }
-    public var PrivacySettings_DeleteAccountIfAwayFor: String { return self._s[1313]! }
-    public var CheckoutInfo_ShippingInfoTitle: String { return self._s[1314]! }
+    public var Month_ShortApril: String { return self._s[1307]! }
+    public var AuthSessions_CurrentSession: String { return self._s[1308]! }
+    public var Chat_AttachmentMultipleFilesDisabled: String { return self._s[1311]! }
+    public var Wallet_Navigation_Cancel: String { return self._s[1313]! }
+    public var WallpaperPreview_CropTopText: String { return self._s[1314]! }
+    public var PrivacySettings_DeleteAccountIfAwayFor: String { return self._s[1315]! }
+    public var CheckoutInfo_ShippingInfoTitle: String { return self._s[1316]! }
     public func Conversation_ScheduleMessage_SendOn(_ _0: String, _ _1: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[1315]!, self._r[1315]!, [_0, _1])
+        return formatWithArgumentRanges(self._s[1317]!, self._r[1317]!, [_0, _1])
     }
-    public var Appearance_ThemePreview_Chat_2_Text: String { return self._s[1316]! }
-    public var Channel_Setup_TypePrivate: String { return self._s[1318]! }
-    public var Forward_ChannelReadOnly: String { return self._s[1321]! }
-    public var PhotoEditor_CurvesBlue: String { return self._s[1322]! }
-    public var AddContact_SharedContactException: String { return self._s[1323]! }
-    public var UserInfo_BotPrivacy: String { return self._s[1325]! }
-    public var Wallet_CreateInvoice_Title: String { return self._s[1326]! }
-    public var Notification_PassportValueEmail: String { return self._s[1327]! }
-    public var EmptyGroupInfo_Subtitle: String { return self._s[1328]! }
-    public var GroupPermission_NewTitle: String { return self._s[1329]! }
-    public var CallFeedback_ReasonDropped: String { return self._s[1330]! }
-    public var GroupInfo_Permissions_AddException: String { return self._s[1331]! }
-    public var Channel_SignMessages_Help: String { return self._s[1333]! }
-    public var Undo_ChatDeleted: String { return self._s[1335]! }
-    public var Conversation_ChatBackground: String { return self._s[1336]! }
+    public var Appearance_ThemePreview_Chat_2_Text: String { return self._s[1318]! }
+    public var Channel_Setup_TypePrivate: String { return self._s[1320]! }
+    public var Forward_ChannelReadOnly: String { return self._s[1323]! }
+    public var PhotoEditor_CurvesBlue: String { return self._s[1324]! }
+    public var AddContact_SharedContactException: String { return self._s[1325]! }
+    public var UserInfo_BotPrivacy: String { return self._s[1327]! }
+    public var Wallet_CreateInvoice_Title: String { return self._s[1328]! }
+    public var Notification_PassportValueEmail: String { return self._s[1329]! }
+    public var EmptyGroupInfo_Subtitle: String { return self._s[1330]! }
+    public var GroupPermission_NewTitle: String { return self._s[1331]! }
+    public var CallFeedback_ReasonDropped: String { return self._s[1332]! }
+    public var GroupInfo_Permissions_AddException: String { return self._s[1333]! }
+    public var Channel_SignMessages_Help: String { return self._s[1335]! }
+    public var Undo_ChatDeleted: String { return self._s[1337]! }
+    public var Conversation_ChatBackground: String { return self._s[1338]! }
     public func Wallet_WordCheck_Text(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[1337]!, self._r[1337]!, [_1, _2, _3])
+        return formatWithArgumentRanges(self._s[1339]!, self._r[1339]!, [_1, _2, _3])
     }
     public func PUSH_CHAT_MESSAGE_QUIZ(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[1338]!, self._r[1338]!, [_1, _2, _3])
+        return formatWithArgumentRanges(self._s[1340]!, self._r[1340]!, [_1, _2, _3])
     }
-    public var ChannelMembers_WhoCanAddMembers_Admins: String { return self._s[1339]! }
-    public var FastTwoStepSetup_EmailPlaceholder: String { return self._s[1340]! }
-    public var Passport_Language_pt: String { return self._s[1341]! }
-    public var VoiceOver_Chat_YourVoiceMessage: String { return self._s[1342]! }
-    public var NotificationsSound_Popcorn: String { return self._s[1345]! }
-    public var AutoNightTheme_Disabled: String { return self._s[1346]! }
-    public var BlockedUsers_LeavePrefix: String { return self._s[1347]! }
-    public var WallpaperPreview_CustomColorTopText: String { return self._s[1348]! }
-    public var Contacts_PermissionsSuppressWarningText: String { return self._s[1349]! }
-    public var WallpaperSearch_ColorBlue: String { return self._s[1350]! }
+    public var ChannelMembers_WhoCanAddMembers_Admins: String { return self._s[1341]! }
+    public var FastTwoStepSetup_EmailPlaceholder: String { return self._s[1342]! }
+    public var Passport_Language_pt: String { return self._s[1343]! }
+    public var VoiceOver_Chat_YourVoiceMessage: String { return self._s[1344]! }
+    public var NotificationsSound_Popcorn: String { return self._s[1347]! }
+    public var AutoNightTheme_Disabled: String { return self._s[1348]! }
+    public var BlockedUsers_LeavePrefix: String { return self._s[1349]! }
+    public var WallpaperPreview_CustomColorTopText: String { return self._s[1350]! }
+    public var Contacts_PermissionsSuppressWarningText: String { return self._s[1351]! }
+    public var WallpaperSearch_ColorBlue: String { return self._s[1352]! }
     public func CancelResetAccount_TextSMS(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[1351]!, self._r[1351]!, [_0])
+        return formatWithArgumentRanges(self._s[1353]!, self._r[1353]!, [_0])
     }
-    public var CheckoutInfo_ErrorNameInvalid: String { return self._s[1352]! }
-    public var SocksProxySetup_UseForCalls: String { return self._s[1353]! }
-    public var Passport_DeleteDocumentConfirmation: String { return self._s[1355]! }
-    public var PeerInfo_PaneGroups: String { return self._s[1356]! }
+    public var CheckoutInfo_ErrorNameInvalid: String { return self._s[1354]! }
+    public var SocksProxySetup_UseForCalls: String { return self._s[1355]! }
+    public var Passport_DeleteDocumentConfirmation: String { return self._s[1357]! }
+    public var PeerInfo_PaneGroups: String { return self._s[1358]! }
     public func Conversation_Megabytes(_ _0: Float) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[1357]!, self._r[1357]!, ["\(_0)"])
+        return formatWithArgumentRanges(self._s[1359]!, self._r[1359]!, ["\(_0)"])
     }
-    public var SocksProxySetup_Hostname: String { return self._s[1360]! }
-    public var ChatSettings_AutoDownloadSettings_OffForAll: String { return self._s[1361]! }
-    public var Compose_NewEncryptedChat: String { return self._s[1362]! }
-    public var Login_CodeFloodError: String { return self._s[1363]! }
-    public var Calls_TabTitle: String { return self._s[1364]! }
-    public var Privacy_ProfilePhoto: String { return self._s[1365]! }
-    public var Passport_Language_he: String { return self._s[1366]! }
+    public var SocksProxySetup_Hostname: String { return self._s[1362]! }
+    public var ChatSettings_AutoDownloadSettings_OffForAll: String { return self._s[1363]! }
+    public var Compose_NewEncryptedChat: String { return self._s[1364]! }
+    public var Login_CodeFloodError: String { return self._s[1365]! }
+    public var Calls_TabTitle: String { return self._s[1366]! }
+    public var Privacy_ProfilePhoto: String { return self._s[1367]! }
+    public var Passport_Language_he: String { return self._s[1368]! }
     public func Conversation_SetReminder_RemindToday(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[1367]!, self._r[1367]!, [_0])
-    }
-    public var GroupPermission_Title: String { return self._s[1368]! }
-    public func Channel_AdminLog_MessageGroupPreHistoryHidden(_ _0: String) -> (String, [(Int, NSRange)]) {
         return formatWithArgumentRanges(self._s[1369]!, self._r[1369]!, [_0])
     }
-    public var Wallet_TransactionInfo_SenderHeader: String { return self._s[1370]! }
-    public var GroupPermission_NoChangeInfo: String { return self._s[1371]! }
-    public var ChatList_DeleteForCurrentUser: String { return self._s[1372]! }
-    public var Tour_Text1: String { return self._s[1373]! }
-    public var Channel_EditAdmin_TransferOwnership: String { return self._s[1374]! }
-    public var Month_ShortFebruary: String { return self._s[1375]! }
-    public var TwoStepAuth_EmailSkip: String { return self._s[1376]! }
+    public var GroupPermission_Title: String { return self._s[1370]! }
+    public func Channel_AdminLog_MessageGroupPreHistoryHidden(_ _0: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[1371]!, self._r[1371]!, [_0])
+    }
+    public var Wallet_TransactionInfo_SenderHeader: String { return self._s[1372]! }
+    public var GroupPermission_NoChangeInfo: String { return self._s[1373]! }
+    public var ChatList_DeleteForCurrentUser: String { return self._s[1374]! }
+    public var Tour_Text1: String { return self._s[1375]! }
+    public var Channel_EditAdmin_TransferOwnership: String { return self._s[1376]! }
+    public var Month_ShortFebruary: String { return self._s[1377]! }
+    public var TwoStepAuth_EmailSkip: String { return self._s[1378]! }
     public func Wallet_Time_PreciseDate_m4(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[1377]!, self._r[1377]!, [_1, _2, _3])
+        return formatWithArgumentRanges(self._s[1379]!, self._r[1379]!, [_1, _2, _3])
     }
-    public var Stats_LanguagesTitle: String { return self._s[1378]! }
-    public var NotificationsSound_Glass: String { return self._s[1379]! }
-    public var Appearance_ThemeNightBlue: String { return self._s[1380]! }
-    public var CheckoutInfo_Pay: String { return self._s[1381]! }
-    public var PeerInfo_ButtonLeave: String { return self._s[1383]! }
-    public var Invite_LargeRecipientsCountWarning: String { return self._s[1384]! }
-    public var Call_CallAgain: String { return self._s[1386]! }
-    public var AttachmentMenu_SendAsFile: String { return self._s[1387]! }
-    public var AccessDenied_MicrophoneRestricted: String { return self._s[1388]! }
-    public var Passport_InvalidPasswordError: String { return self._s[1389]! }
-    public var Watch_Message_Game: String { return self._s[1390]! }
-    public var Stickers_Install: String { return self._s[1391]! }
-    public var VoiceOver_Chat_Message: String { return self._s[1392]! }
-    public var PrivacyLastSeenSettings_NeverShareWith: String { return self._s[1393]! }
-    public var Passport_Identity_ResidenceCountry: String { return self._s[1395]! }
-    public var Notifications_GroupNotificationsHelp: String { return self._s[1396]! }
-    public var AuthSessions_OtherSessions: String { return self._s[1397]! }
-    public var Channel_Username_Help: String { return self._s[1398]! }
-    public var Camera_Title: String { return self._s[1399]! }
-    public var IntentsSettings_Title: String { return self._s[1400]! }
-    public var GroupInfo_SetGroupPhotoDelete: String { return self._s[1402]! }
-    public var Privacy_ProfilePhoto_NeverShareWith_Title: String { return self._s[1403]! }
-    public var Channel_AdminLog_SendPolls: String { return self._s[1404]! }
-    public var Channel_AdminLog_TitleAllEvents: String { return self._s[1405]! }
-    public var Channel_EditAdmin_PermissionInviteMembers: String { return self._s[1406]! }
-    public var Contacts_MemberSearchSectionTitleGroup: String { return self._s[1407]! }
-    public var ScheduledMessages_DeleteMany: String { return self._s[1408]! }
-    public var Conversation_RestrictedStickers: String { return self._s[1409]! }
-    public var Notifications_ExceptionsResetToDefaults: String { return self._s[1411]! }
-    public var UserInfo_TelegramCall: String { return self._s[1413]! }
-    public var TwoStepAuth_SetupResendEmailCode: String { return self._s[1414]! }
-    public var CreatePoll_OptionsHeader: String { return self._s[1415]! }
-    public var SettingsSearch_Synonyms_Data_CallsUseLessData: String { return self._s[1416]! }
-    public var ArchivedChats_IntroTitle1: String { return self._s[1417]! }
-    public var Privacy_GroupsAndChannels_AlwaysAllow_Title: String { return self._s[1418]! }
-    public var Theme_Colors_Proceed: String { return self._s[1419]! }
-    public var Passport_Identity_EditPersonalDetails: String { return self._s[1420]! }
+    public var Stats_LanguagesTitle: String { return self._s[1380]! }
+    public var NotificationsSound_Glass: String { return self._s[1381]! }
+    public var Appearance_ThemeNightBlue: String { return self._s[1382]! }
+    public var CheckoutInfo_Pay: String { return self._s[1383]! }
+    public var PeerInfo_ButtonLeave: String { return self._s[1385]! }
+    public var Invite_LargeRecipientsCountWarning: String { return self._s[1386]! }
+    public var Call_CallAgain: String { return self._s[1388]! }
+    public var AttachmentMenu_SendAsFile: String { return self._s[1389]! }
+    public var AccessDenied_MicrophoneRestricted: String { return self._s[1390]! }
+    public var Passport_InvalidPasswordError: String { return self._s[1391]! }
+    public var Watch_Message_Game: String { return self._s[1392]! }
+    public var Stickers_Install: String { return self._s[1393]! }
+    public var VoiceOver_Chat_Message: String { return self._s[1394]! }
+    public var PrivacyLastSeenSettings_NeverShareWith: String { return self._s[1395]! }
+    public var Passport_Identity_ResidenceCountry: String { return self._s[1397]! }
+    public var Notifications_GroupNotificationsHelp: String { return self._s[1398]! }
+    public var AuthSessions_OtherSessions: String { return self._s[1399]! }
+    public var Channel_Username_Help: String { return self._s[1400]! }
+    public var Camera_Title: String { return self._s[1401]! }
+    public var IntentsSettings_Title: String { return self._s[1402]! }
+    public var GroupInfo_SetGroupPhotoDelete: String { return self._s[1404]! }
+    public var Privacy_ProfilePhoto_NeverShareWith_Title: String { return self._s[1405]! }
+    public var Channel_AdminLog_SendPolls: String { return self._s[1406]! }
+    public var Channel_AdminLog_TitleAllEvents: String { return self._s[1407]! }
+    public var Channel_EditAdmin_PermissionInviteMembers: String { return self._s[1408]! }
+    public var Contacts_MemberSearchSectionTitleGroup: String { return self._s[1409]! }
+    public var ScheduledMessages_DeleteMany: String { return self._s[1410]! }
+    public var Conversation_RestrictedStickers: String { return self._s[1411]! }
+    public var Notifications_ExceptionsResetToDefaults: String { return self._s[1413]! }
+    public var UserInfo_TelegramCall: String { return self._s[1415]! }
+    public var TwoStepAuth_SetupResendEmailCode: String { return self._s[1416]! }
+    public var CreatePoll_OptionsHeader: String { return self._s[1417]! }
+    public var SettingsSearch_Synonyms_Data_CallsUseLessData: String { return self._s[1418]! }
+    public var ArchivedChats_IntroTitle1: String { return self._s[1419]! }
+    public var Privacy_GroupsAndChannels_AlwaysAllow_Title: String { return self._s[1420]! }
+    public var Theme_Colors_Proceed: String { return self._s[1421]! }
+    public var Passport_Identity_EditPersonalDetails: String { return self._s[1422]! }
     public func Time_PreciseDate_m1(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[1421]!, self._r[1421]!, [_1, _2, _3])
+        return formatWithArgumentRanges(self._s[1423]!, self._r[1423]!, [_1, _2, _3])
     }
-    public var Wallet_Month_GenAugust: String { return self._s[1422]! }
-    public var Settings_SaveEditedPhotos: String { return self._s[1423]! }
-    public var Stats_FollowersBySourceTitle: String { return self._s[1424]! }
-    public var TwoStepAuth_ConfirmationTitle: String { return self._s[1425]! }
-    public var Privacy_GroupsAndChannels_NeverAllow_Title: String { return self._s[1426]! }
-    public var Conversation_MessageDialogRetry: String { return self._s[1427]! }
-    public var ChatList_Context_MarkAsUnread: String { return self._s[1428]! }
-    public var MessagePoll_SubmitVote: String { return self._s[1429]! }
-    public var Conversation_DiscardVoiceMessageAction: String { return self._s[1430]! }
-    public var Permissions_PeopleNearbyTitle_v0: String { return self._s[1431]! }
-    public var Group_Setup_TypeHeader: String { return self._s[1432]! }
-    public var Paint_RecentStickers: String { return self._s[1433]! }
-    public var PhotoEditor_GrainTool: String { return self._s[1434]! }
-    public var CheckoutInfo_ShippingInfoState: String { return self._s[1435]! }
-    public var EmptyGroupInfo_Line4: String { return self._s[1436]! }
-    public var Watch_AuthRequired: String { return self._s[1438]! }
+    public var Wallet_Month_GenAugust: String { return self._s[1424]! }
+    public var Settings_SaveEditedPhotos: String { return self._s[1425]! }
+    public var Stats_FollowersBySourceTitle: String { return self._s[1426]! }
+    public var TwoStepAuth_ConfirmationTitle: String { return self._s[1427]! }
+    public var Privacy_GroupsAndChannels_NeverAllow_Title: String { return self._s[1428]! }
+    public var Conversation_MessageDialogRetry: String { return self._s[1429]! }
+    public var ChatList_Context_MarkAsUnread: String { return self._s[1430]! }
+    public var MessagePoll_SubmitVote: String { return self._s[1431]! }
+    public var Conversation_DiscardVoiceMessageAction: String { return self._s[1432]! }
+    public var Permissions_PeopleNearbyTitle_v0: String { return self._s[1433]! }
+    public var Group_Setup_TypeHeader: String { return self._s[1434]! }
+    public var Paint_RecentStickers: String { return self._s[1435]! }
+    public var PhotoEditor_GrainTool: String { return self._s[1436]! }
+    public var CheckoutInfo_ShippingInfoState: String { return self._s[1437]! }
+    public var EmptyGroupInfo_Line4: String { return self._s[1438]! }
+    public var Watch_AuthRequired: String { return self._s[1440]! }
     public func Passport_Email_UseTelegramEmail(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[1439]!, self._r[1439]!, [_0])
+        return formatWithArgumentRanges(self._s[1441]!, self._r[1441]!, [_0])
     }
-    public var Conversation_EncryptedDescriptionTitle: String { return self._s[1440]! }
-    public var ChannelIntro_Text: String { return self._s[1441]! }
-    public var DialogList_DeleteBotConfirmation: String { return self._s[1442]! }
-    public var GroupPermission_NoSendMedia: String { return self._s[1443]! }
-    public var Calls_AddTab: String { return self._s[1444]! }
-    public var Message_ReplyActionButtonShowReceipt: String { return self._s[1445]! }
-    public var Channel_AdminLog_EmptyFilterText: String { return self._s[1446]! }
-    public var Conversation_WalletRequiredSetup: String { return self._s[1447]! }
-    public var Notification_MessageLifetime1d: String { return self._s[1448]! }
-    public var Notifications_ChannelNotificationsExceptionsHelp: String { return self._s[1449]! }
-    public var Channel_BanUser_PermissionsHeader: String { return self._s[1450]! }
-    public var Passport_Identity_GenderFemale: String { return self._s[1451]! }
-    public var BlockedUsers_BlockTitle: String { return self._s[1452]! }
+    public var Conversation_EncryptedDescriptionTitle: String { return self._s[1442]! }
+    public var ChannelIntro_Text: String { return self._s[1443]! }
+    public var DialogList_DeleteBotConfirmation: String { return self._s[1444]! }
+    public var GroupPermission_NoSendMedia: String { return self._s[1445]! }
+    public var Calls_AddTab: String { return self._s[1446]! }
+    public var Message_ReplyActionButtonShowReceipt: String { return self._s[1447]! }
+    public var Channel_AdminLog_EmptyFilterText: String { return self._s[1448]! }
+    public var Conversation_WalletRequiredSetup: String { return self._s[1449]! }
+    public var Notification_MessageLifetime1d: String { return self._s[1450]! }
+    public var Notifications_ChannelNotificationsExceptionsHelp: String { return self._s[1451]! }
+    public var Channel_BanUser_PermissionsHeader: String { return self._s[1452]! }
+    public var Passport_Identity_GenderFemale: String { return self._s[1453]! }
+    public var BlockedUsers_BlockTitle: String { return self._s[1454]! }
     public func PUSH_CHANNEL_MESSAGE_GIF(_ _1: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[1453]!, self._r[1453]!, [_1])
+        return formatWithArgumentRanges(self._s[1455]!, self._r[1455]!, [_1])
     }
-    public var Weekday_Yesterday: String { return self._s[1454]! }
-    public var WallpaperSearch_ColorBlack: String { return self._s[1455]! }
-    public var Settings_Context_Logout: String { return self._s[1456]! }
-    public var Wallet_Info_UnknownTransaction: String { return self._s[1457]! }
-    public var ChatList_ArchiveAction: String { return self._s[1458]! }
-    public var AutoNightTheme_Scheduled: String { return self._s[1459]! }
-    public var TwoFactorSetup_Email_SkipAction: String { return self._s[1460]! }
-    public var Settings_Devices: String { return self._s[1461]! }
-    public var ContactInfo_Note: String { return self._s[1462]! }
+    public var Weekday_Yesterday: String { return self._s[1456]! }
+    public var WallpaperSearch_ColorBlack: String { return self._s[1457]! }
+    public var Settings_Context_Logout: String { return self._s[1458]! }
+    public var Wallet_Info_UnknownTransaction: String { return self._s[1459]! }
+    public var ChatList_ArchiveAction: String { return self._s[1460]! }
+    public var AutoNightTheme_Scheduled: String { return self._s[1461]! }
+    public var TwoFactorSetup_Email_SkipAction: String { return self._s[1462]! }
+    public var Settings_Devices: String { return self._s[1463]! }
+    public var ContactInfo_Note: String { return self._s[1464]! }
     public func Login_PhoneGenericEmailBody(_ _1: String, _ _2: String, _ _3: String, _ _4: String, _ _5: String, _ _6: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[1463]!, self._r[1463]!, [_1, _2, _3, _4, _5, _6])
+        return formatWithArgumentRanges(self._s[1465]!, self._r[1465]!, [_1, _2, _3, _4, _5, _6])
     }
-    public var EditTheme_ThemeTemplateAlertTitle: String { return self._s[1464]! }
-    public var Wallet_Receive_CreateInvoice: String { return self._s[1465]! }
-    public var PrivacyPolicy_DeclineDeleteNow: String { return self._s[1466]! }
-    public var Theme_Colors_ColorWallpaperWarningProceed: String { return self._s[1467]! }
+    public var EditTheme_ThemeTemplateAlertTitle: String { return self._s[1466]! }
+    public var Wallet_Receive_CreateInvoice: String { return self._s[1467]! }
+    public var PrivacyPolicy_DeclineDeleteNow: String { return self._s[1468]! }
+    public var Theme_Colors_ColorWallpaperWarningProceed: String { return self._s[1469]! }
     public func PUSH_CHAT_JOINED(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[1468]!, self._r[1468]!, [_1, _2])
+        return formatWithArgumentRanges(self._s[1470]!, self._r[1470]!, [_1, _2])
     }
-    public var CreatePoll_Create: String { return self._s[1469]! }
-    public var Channel_Members_AddBannedErrorAdmin: String { return self._s[1470]! }
+    public var CreatePoll_Create: String { return self._s[1471]! }
+    public var Channel_Members_AddBannedErrorAdmin: String { return self._s[1472]! }
     public func Notification_CallFormat(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[1471]!, self._r[1471]!, [_1, _2])
+        return formatWithArgumentRanges(self._s[1473]!, self._r[1473]!, [_1, _2])
     }
-    public var ScheduledMessages_ClearAllConfirmation: String { return self._s[1472]! }
-    public var Checkout_ErrorProviderAccountInvalid: String { return self._s[1473]! }
-    public var Notifications_InAppNotificationsSounds: String { return self._s[1475]! }
+    public var ScheduledMessages_ClearAllConfirmation: String { return self._s[1474]! }
+    public var Checkout_ErrorProviderAccountInvalid: String { return self._s[1475]! }
+    public var Notifications_InAppNotificationsSounds: String { return self._s[1477]! }
     public func PUSH_PINNED_GAME_SCORE(_ _1: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[1476]!, self._r[1476]!, [_1])
+        return formatWithArgumentRanges(self._s[1478]!, self._r[1478]!, [_1])
     }
-    public var Preview_OpenInInstagram: String { return self._s[1477]! }
-    public var Notification_MessageLifetimeRemovedOutgoing: String { return self._s[1478]! }
+    public var Preview_OpenInInstagram: String { return self._s[1479]! }
+    public var Notification_MessageLifetimeRemovedOutgoing: String { return self._s[1480]! }
     public func PUSH_CHAT_ADD_MEMBER(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[1479]!, self._r[1479]!, [_1, _2, _3])
+        return formatWithArgumentRanges(self._s[1481]!, self._r[1481]!, [_1, _2, _3])
     }
     public func Passport_PrivacyPolicy(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[1480]!, self._r[1480]!, [_1, _2])
+        return formatWithArgumentRanges(self._s[1482]!, self._r[1482]!, [_1, _2])
     }
-    public var Channel_AdminLog_InfoPanelAlertTitle: String { return self._s[1481]! }
-    public var ArchivedChats_IntroText3: String { return self._s[1482]! }
-    public var ChatList_UndoArchiveHiddenText: String { return self._s[1483]! }
-    public var NetworkUsageSettings_TotalSection: String { return self._s[1484]! }
-    public var Wallet_Month_GenSeptember: String { return self._s[1485]! }
-    public var Channel_Setup_TypePrivateHelp: String { return self._s[1486]! }
+    public var Channel_AdminLog_InfoPanelAlertTitle: String { return self._s[1483]! }
+    public var ArchivedChats_IntroText3: String { return self._s[1484]! }
+    public var ChatList_UndoArchiveHiddenText: String { return self._s[1485]! }
+    public var NetworkUsageSettings_TotalSection: String { return self._s[1486]! }
+    public var Wallet_Month_GenSeptember: String { return self._s[1487]! }
+    public var Channel_Setup_TypePrivateHelp: String { return self._s[1488]! }
     public func PUSH_CHAT_MESSAGE_POLL(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[1487]!, self._r[1487]!, [_1, _2, _3])
+        return formatWithArgumentRanges(self._s[1489]!, self._r[1489]!, [_1, _2, _3])
     }
-    public var Privacy_GroupsAndChannels_NeverAllow_Placeholder: String { return self._s[1489]! }
-    public var FastTwoStepSetup_HintSection: String { return self._s[1490]! }
-    public var Wallpaper_PhotoLibrary: String { return self._s[1491]! }
-    public var TwoStepAuth_SetupResendEmailCodeAlert: String { return self._s[1492]! }
-    public var Gif_NoGifsFound: String { return self._s[1493]! }
-    public var Watch_LastSeen_WithinAMonth: String { return self._s[1494]! }
-    public var VoiceOver_MessageContextDelete: String { return self._s[1495]! }
-    public var EditTheme_Preview: String { return self._s[1496]! }
+    public var Privacy_GroupsAndChannels_NeverAllow_Placeholder: String { return self._s[1491]! }
+    public var FastTwoStepSetup_HintSection: String { return self._s[1492]! }
+    public var Wallpaper_PhotoLibrary: String { return self._s[1493]! }
+    public var TwoStepAuth_SetupResendEmailCodeAlert: String { return self._s[1494]! }
+    public var Gif_NoGifsFound: String { return self._s[1495]! }
+    public var Watch_LastSeen_WithinAMonth: String { return self._s[1496]! }
+    public var VoiceOver_MessageContextDelete: String { return self._s[1497]! }
+    public var EditTheme_Preview: String { return self._s[1498]! }
     public func ClearCache_StorageTitle(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[1497]!, self._r[1497]!, [_0])
+        return formatWithArgumentRanges(self._s[1499]!, self._r[1499]!, [_0])
     }
-    public var GroupInfo_ActionPromote: String { return self._s[1498]! }
-    public var PasscodeSettings_SimplePasscode: String { return self._s[1499]! }
-    public var GroupInfo_Permissions_Title: String { return self._s[1500]! }
-    public var Permissions_ContactsText_v0: String { return self._s[1501]! }
-    public var PrivacyPhoneNumberSettings_CustomDisabledHelp: String { return self._s[1502]! }
-    public var SettingsSearch_Synonyms_Notifications_BadgeIncludeMutedPublicGroups: String { return self._s[1503]! }
-    public var PrivacySettings_DataSettingsHelp: String { return self._s[1506]! }
-    public var Passport_FieldEmailHelp: String { return self._s[1507]! }
+    public var GroupInfo_ActionPromote: String { return self._s[1500]! }
+    public var PasscodeSettings_SimplePasscode: String { return self._s[1501]! }
+    public var GroupInfo_Permissions_Title: String { return self._s[1502]! }
+    public var Permissions_ContactsText_v0: String { return self._s[1503]! }
+    public var PrivacyPhoneNumberSettings_CustomDisabledHelp: String { return self._s[1504]! }
+    public var SettingsSearch_Synonyms_Notifications_BadgeIncludeMutedPublicGroups: String { return self._s[1505]! }
+    public var PrivacySettings_DataSettingsHelp: String { return self._s[1508]! }
+    public var Passport_FieldEmailHelp: String { return self._s[1509]! }
     public func Activity_RemindAboutUser(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[1508]!, self._r[1508]!, [_0])
+        return formatWithArgumentRanges(self._s[1510]!, self._r[1510]!, [_0])
     }
-    public var Passport_Identity_GenderPlaceholder: String { return self._s[1509]! }
-    public var Weekday_ShortSaturday: String { return self._s[1510]! }
-    public var ContactInfo_PhoneLabelMain: String { return self._s[1511]! }
-    public var Watch_Conversation_UserInfo: String { return self._s[1512]! }
-    public var CheckoutInfo_ShippingInfoCityPlaceholder: String { return self._s[1513]! }
-    public var GroupPermission_PermissionDisabledByDefault: String { return self._s[1514]! }
-    public var PrivacyLastSeenSettings_Title: String { return self._s[1515]! }
-    public var Conversation_ShareBotLocationConfirmation: String { return self._s[1517]! }
-    public var PhotoEditor_VignetteTool: String { return self._s[1518]! }
-    public var Passport_Address_Street1Placeholder: String { return self._s[1519]! }
-    public var Passport_Language_et: String { return self._s[1520]! }
-    public var AppUpgrade_Running: String { return self._s[1521]! }
-    public var Channel_DiscussionGroup_Info: String { return self._s[1523]! }
-    public var EditTheme_Create_Preview_IncomingReplyName: String { return self._s[1524]! }
-    public var Passport_Language_bg: String { return self._s[1525]! }
-    public var Stickers_NoStickersFound: String { return self._s[1527]! }
+    public var Passport_Identity_GenderPlaceholder: String { return self._s[1511]! }
+    public var Weekday_ShortSaturday: String { return self._s[1512]! }
+    public var ContactInfo_PhoneLabelMain: String { return self._s[1513]! }
+    public var Watch_Conversation_UserInfo: String { return self._s[1514]! }
+    public var CheckoutInfo_ShippingInfoCityPlaceholder: String { return self._s[1515]! }
+    public var GroupPermission_PermissionDisabledByDefault: String { return self._s[1516]! }
+    public var PrivacyLastSeenSettings_Title: String { return self._s[1517]! }
+    public var Conversation_ShareBotLocationConfirmation: String { return self._s[1519]! }
+    public var PhotoEditor_VignetteTool: String { return self._s[1520]! }
+    public var Passport_Address_Street1Placeholder: String { return self._s[1521]! }
+    public var Passport_Language_et: String { return self._s[1522]! }
+    public var AppUpgrade_Running: String { return self._s[1523]! }
+    public var Channel_DiscussionGroup_Info: String { return self._s[1525]! }
+    public var EditTheme_Create_Preview_IncomingReplyName: String { return self._s[1526]! }
+    public var Passport_Language_bg: String { return self._s[1527]! }
+    public var Stickers_NoStickersFound: String { return self._s[1529]! }
     public func PUSH_CHANNEL_MESSAGE_TEXT(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[1529]!, self._r[1529]!, [_1, _2])
+        return formatWithArgumentRanges(self._s[1531]!, self._r[1531]!, [_1, _2])
     }
     public func VoiceOver_Chat_ContactFrom(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[1530]!, self._r[1530]!, [_0])
+        return formatWithArgumentRanges(self._s[1532]!, self._r[1532]!, [_0])
     }
-    public var Wallet_Month_GenJuly: String { return self._s[1531]! }
-    public var Wallet_Receive_AddressHeader: String { return self._s[1532]! }
-    public var Wallet_Send_AmountText: String { return self._s[1533]! }
-    public var Settings_About: String { return self._s[1534]! }
+    public var Wallet_Month_GenJuly: String { return self._s[1533]! }
+    public var Wallet_Receive_AddressHeader: String { return self._s[1534]! }
+    public var Wallet_Send_AmountText: String { return self._s[1535]! }
+    public var Settings_About: String { return self._s[1536]! }
     public func Channel_AdminLog_MessageRestricted(_ _0: String, _ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[1535]!, self._r[1535]!, [_0, _1, _2])
+        return formatWithArgumentRanges(self._s[1537]!, self._r[1537]!, [_0, _1, _2])
     }
-    public var ChatList_Context_MarkAsRead: String { return self._s[1537]! }
-    public var KeyCommand_NewMessage: String { return self._s[1538]! }
-    public var Group_ErrorAddBlocked: String { return self._s[1539]! }
+    public var ChatList_Context_MarkAsRead: String { return self._s[1539]! }
+    public var KeyCommand_NewMessage: String { return self._s[1540]! }
+    public var Group_ErrorAddBlocked: String { return self._s[1541]! }
     public func Message_PaymentSent(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[1540]!, self._r[1540]!, [_0])
+        return formatWithArgumentRanges(self._s[1542]!, self._r[1542]!, [_0])
     }
-    public var Map_LocationTitle: String { return self._s[1541]! }
-    public var ReportGroupLocation_Title: String { return self._s[1542]! }
-    public var CallSettings_UseLessDataLongDescription: String { return self._s[1543]! }
-    public var Cache_ClearProgress: String { return self._s[1544]! }
+    public var Map_LocationTitle: String { return self._s[1543]! }
+    public var ReportGroupLocation_Title: String { return self._s[1544]! }
+    public var CallSettings_UseLessDataLongDescription: String { return self._s[1545]! }
+    public var Cache_ClearProgress: String { return self._s[1546]! }
     public func Channel_Management_ErrorNotMember(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[1545]!, self._r[1545]!, [_0])
-    }
-    public var GroupRemoved_AddToGroup: String { return self._s[1546]! }
-    public func External_OpenIn(_ _0: String) -> (String, [(Int, NSRange)]) {
         return formatWithArgumentRanges(self._s[1547]!, self._r[1547]!, [_0])
     }
-    public var Passport_UpdateRequiredError: String { return self._s[1548]! }
-    public var Wallet_SecureStorageNotAvailable_Text: String { return self._s[1549]! }
+    public var GroupRemoved_AddToGroup: String { return self._s[1548]! }
+    public func External_OpenIn(_ _0: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[1549]!, self._r[1549]!, [_0])
+    }
+    public var Passport_UpdateRequiredError: String { return self._s[1550]! }
+    public var Wallet_SecureStorageNotAvailable_Text: String { return self._s[1551]! }
     public func PUSH_MESSAGE_DOC(_ _1: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[1550]!, self._r[1550]!, [_1])
+        return formatWithArgumentRanges(self._s[1552]!, self._r[1552]!, [_1])
     }
-    public var Notifications_PermissionsSuppressWarningText: String { return self._s[1552]! }
-    public var Passport_Identity_MainPageHelp: String { return self._s[1553]! }
-    public var PeerInfo_ButtonSearch: String { return self._s[1554]! }
-    public var Conversation_StatusKickedFromGroup: String { return self._s[1555]! }
-    public var Passport_Language_ka: String { return self._s[1556]! }
+    public var Notifications_PermissionsSuppressWarningText: String { return self._s[1554]! }
+    public var Passport_Identity_MainPageHelp: String { return self._s[1555]! }
+    public var PeerInfo_ButtonSearch: String { return self._s[1556]! }
+    public var Conversation_StatusKickedFromGroup: String { return self._s[1557]! }
+    public var Passport_Language_ka: String { return self._s[1558]! }
     public func Wallet_Time_PreciseDate_m12(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[1557]!, self._r[1557]!, [_1, _2, _3])
+        return formatWithArgumentRanges(self._s[1559]!, self._r[1559]!, [_1, _2, _3])
     }
-    public var Call_Decline: String { return self._s[1558]! }
-    public var SocksProxySetup_ProxyEnabled: String { return self._s[1559]! }
-    public var TwoFactorSetup_Email_SkipConfirmationText: String { return self._s[1562]! }
+    public var Call_Decline: String { return self._s[1560]! }
+    public var SocksProxySetup_ProxyEnabled: String { return self._s[1561]! }
+    public var TwoFactorSetup_Email_SkipConfirmationText: String { return self._s[1564]! }
     public func AuthCode_Alert(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[1563]!, self._r[1563]!, [_0])
+        return formatWithArgumentRanges(self._s[1565]!, self._r[1565]!, [_0])
     }
-    public var CallFeedback_Send: String { return self._s[1564]! }
-    public var EditTheme_EditTitle: String { return self._s[1565]! }
+    public var CallFeedback_Send: String { return self._s[1566]! }
+    public var EditTheme_EditTitle: String { return self._s[1567]! }
     public func Channel_AdminLog_MessagePromotedNameUsername(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[1566]!, self._r[1566]!, [_1, _2])
+        return formatWithArgumentRanges(self._s[1568]!, self._r[1568]!, [_1, _2])
     }
-    public var Passport_Phone_UseTelegramNumberHelp: String { return self._s[1567]! }
+    public var Passport_Phone_UseTelegramNumberHelp: String { return self._s[1569]! }
     public func Wallet_Updated_TodayAt(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[1569]!, self._r[1569]!, [_0])
+        return formatWithArgumentRanges(self._s[1571]!, self._r[1571]!, [_0])
     }
-    public var SettingsSearch_Synonyms_Data_Title: String { return self._s[1570]! }
-    public var Passport_DeletePassport: String { return self._s[1571]! }
-    public var Appearance_AppIconFilled: String { return self._s[1572]! }
-    public var Privacy_Calls_P2PAlways: String { return self._s[1573]! }
-    public var Month_ShortDecember: String { return self._s[1574]! }
-    public var Channel_AdminLog_CanEditMessages: String { return self._s[1576]! }
+    public var SettingsSearch_Synonyms_Data_Title: String { return self._s[1572]! }
+    public var Passport_DeletePassport: String { return self._s[1573]! }
+    public var Appearance_AppIconFilled: String { return self._s[1574]! }
+    public var Privacy_Calls_P2PAlways: String { return self._s[1575]! }
+    public var Month_ShortDecember: String { return self._s[1576]! }
+    public var Channel_AdminLog_CanEditMessages: String { return self._s[1578]! }
     public func Contacts_AccessDeniedHelpLandscape(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[1577]!, self._r[1577]!, [_0])
+        return formatWithArgumentRanges(self._s[1579]!, self._r[1579]!, [_0])
     }
-    public var Channel_Stickers_Searching: String { return self._s[1578]! }
-    public var Conversation_EncryptedDescription1: String { return self._s[1579]! }
-    public var Conversation_EncryptedDescription2: String { return self._s[1580]! }
-    public var PasscodeSettings_PasscodeOptions: String { return self._s[1581]! }
-    public var Conversation_EncryptedDescription3: String { return self._s[1583]! }
-    public var PhotoEditor_SharpenTool: String { return self._s[1584]! }
-    public var Wallet_Configuration_Title: String { return self._s[1585]! }
+    public var Channel_Stickers_Searching: String { return self._s[1580]! }
+    public var Conversation_EncryptedDescription1: String { return self._s[1581]! }
+    public var Conversation_EncryptedDescription2: String { return self._s[1582]! }
+    public var PasscodeSettings_PasscodeOptions: String { return self._s[1583]! }
+    public var Conversation_EncryptedDescription3: String { return self._s[1585]! }
+    public var PhotoEditor_SharpenTool: String { return self._s[1586]! }
+    public var Wallet_Configuration_Title: String { return self._s[1587]! }
     public func Conversation_AddNameToContacts(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[1586]!, self._r[1586]!, [_0])
+        return formatWithArgumentRanges(self._s[1588]!, self._r[1588]!, [_0])
     }
-    public var Conversation_EncryptedDescription4: String { return self._s[1588]! }
-    public var Channel_Members_AddMembers: String { return self._s[1589]! }
-    public var Wallpaper_Search: String { return self._s[1590]! }
-    public var Weekday_Friday: String { return self._s[1592]! }
-    public var Privacy_ContactsSync: String { return self._s[1593]! }
-    public var SettingsSearch_Synonyms_Privacy_Data_ContactsReset: String { return self._s[1594]! }
-    public var ApplyLanguage_ChangeLanguageAction: String { return self._s[1595]! }
+    public var Conversation_EncryptedDescription4: String { return self._s[1590]! }
+    public var Channel_Members_AddMembers: String { return self._s[1591]! }
+    public var Wallpaper_Search: String { return self._s[1592]! }
+    public var Weekday_Friday: String { return self._s[1594]! }
+    public var Privacy_ContactsSync: String { return self._s[1595]! }
+    public var SettingsSearch_Synonyms_Privacy_Data_ContactsReset: String { return self._s[1596]! }
+    public var ApplyLanguage_ChangeLanguageAction: String { return self._s[1597]! }
     public func Channel_Management_RestrictedBy(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[1596]!, self._r[1596]!, [_0])
+        return formatWithArgumentRanges(self._s[1598]!, self._r[1598]!, [_0])
     }
-    public var Wallet_Configuration_BlockchainIdHeader: String { return self._s[1597]! }
-    public var GroupInfo_Permissions_Removed: String { return self._s[1598]! }
-    public var ScheduledMessages_ScheduledOnline: String { return self._s[1599]! }
-    public var Passport_Identity_GenderMale: String { return self._s[1600]! }
+    public var Wallet_Configuration_BlockchainIdHeader: String { return self._s[1599]! }
+    public var GroupInfo_Permissions_Removed: String { return self._s[1600]! }
+    public var ScheduledMessages_ScheduledOnline: String { return self._s[1601]! }
+    public var Passport_Identity_GenderMale: String { return self._s[1602]! }
     public func Call_StatusBar(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[1601]!, self._r[1601]!, [_0])
+        return formatWithArgumentRanges(self._s[1603]!, self._r[1603]!, [_0])
     }
-    public var Notifications_PermissionsKeepDisabled: String { return self._s[1602]! }
-    public var Conversation_JumpToDate: String { return self._s[1603]! }
-    public var Contacts_GlobalSearch: String { return self._s[1604]! }
-    public var AutoDownloadSettings_ResetHelp: String { return self._s[1605]! }
-    public var SettingsSearch_Synonyms_FAQ: String { return self._s[1606]! }
-    public var Profile_MessageLifetime1d: String { return self._s[1607]! }
+    public var Notifications_PermissionsKeepDisabled: String { return self._s[1604]! }
+    public var Conversation_JumpToDate: String { return self._s[1605]! }
+    public var Contacts_GlobalSearch: String { return self._s[1606]! }
+    public var AutoDownloadSettings_ResetHelp: String { return self._s[1607]! }
+    public var SettingsSearch_Synonyms_FAQ: String { return self._s[1608]! }
+    public var Profile_MessageLifetime1d: String { return self._s[1609]! }
     public func MESSAGE_INVOICE(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[1608]!, self._r[1608]!, [_1, _2])
+        return formatWithArgumentRanges(self._s[1610]!, self._r[1610]!, [_1, _2])
     }
-    public var StickerPack_BuiltinPackName: String { return self._s[1611]! }
+    public var StickerPack_BuiltinPackName: String { return self._s[1613]! }
     public func PUSH_CHAT_MESSAGE_AUDIO(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[1612]!, self._r[1612]!, [_1, _2])
+        return formatWithArgumentRanges(self._s[1614]!, self._r[1614]!, [_1, _2])
     }
-    public var VoiceOver_Chat_RecordModeVoiceMessageInfo: String { return self._s[1613]! }
-    public var Passport_InfoTitle: String { return self._s[1615]! }
-    public var Notifications_PermissionsUnreachableText: String { return self._s[1616]! }
+    public var VoiceOver_Chat_RecordModeVoiceMessageInfo: String { return self._s[1615]! }
+    public var Passport_InfoTitle: String { return self._s[1617]! }
+    public var Notifications_PermissionsUnreachableText: String { return self._s[1618]! }
     public func NetworkUsageSettings_CellularUsageSince(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[1620]!, self._r[1620]!, [_0])
+        return formatWithArgumentRanges(self._s[1622]!, self._r[1622]!, [_0])
     }
     public func PUSH_CHAT_MESSAGE_GEO(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[1621]!, self._r[1621]!, [_1, _2])
+        return formatWithArgumentRanges(self._s[1623]!, self._r[1623]!, [_1, _2])
     }
-    public var Passport_Address_TypePassportRegistrationUploadScan: String { return self._s[1622]! }
-    public var Profile_BotInfo: String { return self._s[1623]! }
-    public var Watch_Compose_CreateMessage: String { return self._s[1624]! }
-    public var AutoDownloadSettings_VoiceMessagesInfo: String { return self._s[1625]! }
-    public var Month_ShortNovember: String { return self._s[1626]! }
-    public var Conversation_ScamWarning: String { return self._s[1627]! }
-    public var Wallpaper_SetCustomBackground: String { return self._s[1628]! }
-    public var Appearance_TextSize_Title: String { return self._s[1629]! }
-    public var Passport_Identity_TranslationsHelp: String { return self._s[1630]! }
-    public var NotificationsSound_Chime: String { return self._s[1631]! }
-    public var Passport_Language_ko: String { return self._s[1633]! }
-    public var InviteText_URL: String { return self._s[1634]! }
-    public var TextFormat_Monospace: String { return self._s[1635]! }
+    public var Passport_Address_TypePassportRegistrationUploadScan: String { return self._s[1624]! }
+    public var Profile_BotInfo: String { return self._s[1625]! }
+    public var Watch_Compose_CreateMessage: String { return self._s[1626]! }
+    public var AutoDownloadSettings_VoiceMessagesInfo: String { return self._s[1627]! }
+    public var Month_ShortNovember: String { return self._s[1628]! }
+    public var Conversation_ScamWarning: String { return self._s[1629]! }
+    public var Wallpaper_SetCustomBackground: String { return self._s[1630]! }
+    public var Appearance_TextSize_Title: String { return self._s[1631]! }
+    public var Passport_Identity_TranslationsHelp: String { return self._s[1632]! }
+    public var NotificationsSound_Chime: String { return self._s[1633]! }
+    public var Passport_Language_ko: String { return self._s[1635]! }
+    public var InviteText_URL: String { return self._s[1636]! }
+    public var TextFormat_Monospace: String { return self._s[1637]! }
     public func Time_PreciseDate_m11(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[1636]!, self._r[1636]!, [_1, _2, _3])
+        return formatWithArgumentRanges(self._s[1638]!, self._r[1638]!, [_1, _2, _3])
     }
-    public var EditTheme_Edit_BottomInfo: String { return self._s[1637]! }
+    public var EditTheme_Edit_BottomInfo: String { return self._s[1639]! }
     public func Login_WillSendSms(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[1638]!, self._r[1638]!, [_0])
+        return formatWithArgumentRanges(self._s[1640]!, self._r[1640]!, [_0])
     }
     public func Watch_Time_ShortWeekdayAt(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[1639]!, self._r[1639]!, [_1, _2])
+        return formatWithArgumentRanges(self._s[1641]!, self._r[1641]!, [_1, _2])
     }
-    public var Wallet_Words_Title: String { return self._s[1640]! }
-    public var Wallet_Month_ShortMay: String { return self._s[1641]! }
-    public var EditTheme_CreateTitle: String { return self._s[1643]! }
-    public var Passport_InfoLearnMore: String { return self._s[1644]! }
-    public var TwoStepAuth_EmailPlaceholder: String { return self._s[1645]! }
-    public var Passport_Identity_AddIdentityCard: String { return self._s[1646]! }
-    public var Your_card_has_expired: String { return self._s[1647]! }
-    public var StickerPacksSettings_StickerPacksSection: String { return self._s[1648]! }
-    public var GroupInfo_InviteLink_Help: String { return self._s[1649]! }
-    public var TwoFactorSetup_EmailVerification_ResendAction: String { return self._s[1653]! }
-    public var Conversation_Report: String { return self._s[1655]! }
-    public var Notifications_MessageNotificationsSound: String { return self._s[1656]! }
-    public var Notification_MessageLifetime1m: String { return self._s[1657]! }
-    public var Privacy_ContactsTitle: String { return self._s[1658]! }
-    public var Conversation_ShareMyContactInfo: String { return self._s[1659]! }
-    public var Wallet_WordCheck_Title: String { return self._s[1660]! }
-    public var ChannelMembers_WhoCanAddMembersAdminsHelp: String { return self._s[1661]! }
-    public var Channel_Members_Title: String { return self._s[1662]! }
-    public var Map_OpenInWaze: String { return self._s[1663]! }
-    public var Appearance_RemoveThemeColorConfirmation: String { return self._s[1664]! }
-    public var Login_PhoneBannedError: String { return self._s[1665]! }
+    public var Wallet_Words_Title: String { return self._s[1642]! }
+    public var Wallet_Month_ShortMay: String { return self._s[1643]! }
+    public var EditTheme_CreateTitle: String { return self._s[1645]! }
+    public var Passport_InfoLearnMore: String { return self._s[1646]! }
+    public var TwoStepAuth_EmailPlaceholder: String { return self._s[1647]! }
+    public var Passport_Identity_AddIdentityCard: String { return self._s[1648]! }
+    public var Your_card_has_expired: String { return self._s[1649]! }
+    public var StickerPacksSettings_StickerPacksSection: String { return self._s[1650]! }
+    public var GroupInfo_InviteLink_Help: String { return self._s[1651]! }
+    public var TwoFactorSetup_EmailVerification_ResendAction: String { return self._s[1655]! }
+    public var Conversation_Report: String { return self._s[1657]! }
+    public var Notifications_MessageNotificationsSound: String { return self._s[1658]! }
+    public var Notification_MessageLifetime1m: String { return self._s[1659]! }
+    public var Privacy_ContactsTitle: String { return self._s[1660]! }
+    public var Conversation_ShareMyContactInfo: String { return self._s[1661]! }
+    public var Wallet_WordCheck_Title: String { return self._s[1662]! }
+    public var ChannelMembers_WhoCanAddMembersAdminsHelp: String { return self._s[1663]! }
+    public var Channel_Members_Title: String { return self._s[1664]! }
+    public var Map_OpenInWaze: String { return self._s[1665]! }
+    public var Appearance_RemoveThemeColorConfirmation: String { return self._s[1666]! }
+    public var Login_PhoneBannedError: String { return self._s[1667]! }
     public func LiveLocationUpdated_YesterdayAt(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[1666]!, self._r[1666]!, [_0])
+        return formatWithArgumentRanges(self._s[1668]!, self._r[1668]!, [_0])
     }
-    public var IntentsSettings_MainAccount: String { return self._s[1667]! }
-    public var Group_Management_AddModeratorHelp: String { return self._s[1668]! }
-    public var AutoDownloadSettings_WifiTitle: String { return self._s[1669]! }
-    public var Common_OK: String { return self._s[1670]! }
-    public var Passport_Address_TypeBankStatementUploadScan: String { return self._s[1671]! }
-    public var Wallet_Words_NotDoneResponse: String { return self._s[1672]! }
-    public var Cache_Music: String { return self._s[1673]! }
-    public var Wallet_Configuration_SourceURL: String { return self._s[1674]! }
-    public var SettingsSearch_Synonyms_EditProfile_PhoneNumber: String { return self._s[1675]! }
-    public var PasscodeSettings_UnlockWithTouchId: String { return self._s[1678]! }
-    public var ChatList_EmptyChatListEditFilter: String { return self._s[1679]! }
-    public var TwoStepAuth_HintPlaceholder: String { return self._s[1680]! }
+    public var IntentsSettings_MainAccount: String { return self._s[1669]! }
+    public var Group_Management_AddModeratorHelp: String { return self._s[1670]! }
+    public var AutoDownloadSettings_WifiTitle: String { return self._s[1671]! }
+    public var Common_OK: String { return self._s[1672]! }
+    public var Passport_Address_TypeBankStatementUploadScan: String { return self._s[1673]! }
+    public var Wallet_Words_NotDoneResponse: String { return self._s[1674]! }
+    public var Cache_Music: String { return self._s[1675]! }
+    public var Wallet_Configuration_SourceURL: String { return self._s[1676]! }
+    public var SettingsSearch_Synonyms_EditProfile_PhoneNumber: String { return self._s[1677]! }
+    public var PasscodeSettings_UnlockWithTouchId: String { return self._s[1680]! }
+    public var ChatList_EmptyChatListEditFilter: String { return self._s[1681]! }
+    public var TwoStepAuth_HintPlaceholder: String { return self._s[1682]! }
     public func PUSH_PINNED_INVOICE(_ _1: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[1681]!, self._r[1681]!, [_1])
+        return formatWithArgumentRanges(self._s[1683]!, self._r[1683]!, [_1])
     }
     public func Passport_RequestHeader(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[1682]!, self._r[1682]!, [_0])
-    }
-    public var TwoFactorSetup_Done_Action: String { return self._s[1683]! }
-    public func VoiceOver_Chat_ContactOrganization(_ _0: String) -> (String, [(Int, NSRange)]) {
         return formatWithArgumentRanges(self._s[1684]!, self._r[1684]!, [_0])
     }
-    public var Wallet_Send_ErrorNotEnoughFundsText: String { return self._s[1685]! }
-    public var Watch_MessageView_ViewOnPhone: String { return self._s[1687]! }
-    public var Privacy_Calls_CustomShareHelp: String { return self._s[1688]! }
-    public var Wallet_Receive_CreateInvoiceInfo: String { return self._s[1690]! }
-    public var ChangePhoneNumberNumber_Title: String { return self._s[1691]! }
-    public var State_ConnectingToProxyInfo: String { return self._s[1692]! }
-    public var Conversation_SwipeToReplyHintTitle: String { return self._s[1693]! }
-    public var Message_VideoMessage: String { return self._s[1695]! }
-    public var ChannelInfo_DeleteChannel: String { return self._s[1696]! }
-    public var ContactInfo_PhoneLabelOther: String { return self._s[1697]! }
-    public var Channel_EditAdmin_CannotEdit: String { return self._s[1698]! }
-    public var Passport_DeleteAddressConfirmation: String { return self._s[1699]! }
-    public func Wallet_Time_PreciseDate_m9(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[1700]!, self._r[1700]!, [_1, _2, _3])
+    public var TwoFactorSetup_Done_Action: String { return self._s[1685]! }
+    public func VoiceOver_Chat_ContactOrganization(_ _0: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[1686]!, self._r[1686]!, [_0])
     }
-    public var WallpaperPreview_SwipeBottomText: String { return self._s[1701]! }
-    public var Activity_RecordingAudio: String { return self._s[1702]! }
-    public var SettingsSearch_Synonyms_Watch: String { return self._s[1703]! }
-    public var PasscodeSettings_TryAgainIn1Minute: String { return self._s[1704]! }
-    public var Wallet_Info_Address: String { return self._s[1705]! }
+    public var Wallet_Send_ErrorNotEnoughFundsText: String { return self._s[1687]! }
+    public var Watch_MessageView_ViewOnPhone: String { return self._s[1689]! }
+    public var Privacy_Calls_CustomShareHelp: String { return self._s[1690]! }
+    public var Wallet_Receive_CreateInvoiceInfo: String { return self._s[1692]! }
+    public var ChangePhoneNumberNumber_Title: String { return self._s[1693]! }
+    public var State_ConnectingToProxyInfo: String { return self._s[1694]! }
+    public var Conversation_SwipeToReplyHintTitle: String { return self._s[1695]! }
+    public var Message_VideoMessage: String { return self._s[1697]! }
+    public var ChannelInfo_DeleteChannel: String { return self._s[1698]! }
+    public var ContactInfo_PhoneLabelOther: String { return self._s[1699]! }
+    public var Channel_EditAdmin_CannotEdit: String { return self._s[1700]! }
+    public var Passport_DeleteAddressConfirmation: String { return self._s[1701]! }
+    public func Wallet_Time_PreciseDate_m9(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[1702]!, self._r[1702]!, [_1, _2, _3])
+    }
+    public var WallpaperPreview_SwipeBottomText: String { return self._s[1703]! }
+    public var Activity_RecordingAudio: String { return self._s[1704]! }
+    public var SettingsSearch_Synonyms_Watch: String { return self._s[1705]! }
+    public var PasscodeSettings_TryAgainIn1Minute: String { return self._s[1706]! }
+    public var Wallet_Info_Address: String { return self._s[1707]! }
     public func Notification_ChangedGroupName(_ _0: String, _ _1: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[1707]!, self._r[1707]!, [_0, _1])
+        return formatWithArgumentRanges(self._s[1709]!, self._r[1709]!, [_0, _1])
     }
     public func EmptyGroupInfo_Line1(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[1711]!, self._r[1711]!, [_0])
+        return formatWithArgumentRanges(self._s[1713]!, self._r[1713]!, [_0])
     }
-    public var Conversation_ApplyLocalization: String { return self._s[1712]! }
-    public var TwoFactorSetup_Intro_Action: String { return self._s[1713]! }
-    public var UserInfo_AddPhone: String { return self._s[1714]! }
-    public var Map_ShareLiveLocationHelp: String { return self._s[1715]! }
+    public var Conversation_ApplyLocalization: String { return self._s[1714]! }
+    public var TwoFactorSetup_Intro_Action: String { return self._s[1715]! }
+    public var UserInfo_AddPhone: String { return self._s[1716]! }
+    public var Map_ShareLiveLocationHelp: String { return self._s[1717]! }
     public func Passport_Identity_NativeNameGenericHelp(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[1716]!, self._r[1716]!, [_0])
+        return formatWithArgumentRanges(self._s[1718]!, self._r[1718]!, [_0])
     }
-    public var Passport_Scans: String { return self._s[1718]! }
-    public var BlockedUsers_Unblock: String { return self._s[1719]! }
+    public var Passport_Scans: String { return self._s[1720]! }
+    public var BlockedUsers_Unblock: String { return self._s[1721]! }
     public func PUSH_ENCRYPTION_REQUEST(_ _1: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[1720]!, self._r[1720]!, [_1])
+        return formatWithArgumentRanges(self._s[1722]!, self._r[1722]!, [_1])
     }
-    public var Channel_Management_LabelCreator: String { return self._s[1721]! }
-    public var Conversation_ReportSpamAndLeave: String { return self._s[1722]! }
-    public var SettingsSearch_Synonyms_EditProfile_Bio: String { return self._s[1723]! }
-    public var ChatList_UndoArchiveMultipleTitle: String { return self._s[1724]! }
-    public var Passport_Identity_NativeNameGenericTitle: String { return self._s[1725]! }
+    public var Channel_Management_LabelCreator: String { return self._s[1723]! }
+    public var Conversation_ReportSpamAndLeave: String { return self._s[1724]! }
+    public var SettingsSearch_Synonyms_EditProfile_Bio: String { return self._s[1725]! }
+    public var ChatList_UndoArchiveMultipleTitle: String { return self._s[1726]! }
+    public var Passport_Identity_NativeNameGenericTitle: String { return self._s[1727]! }
     public func Login_EmailPhoneBody(_ _0: String, _ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[1726]!, self._r[1726]!, [_0, _1, _2])
+        return formatWithArgumentRanges(self._s[1728]!, self._r[1728]!, [_0, _1, _2])
     }
-    public var Login_PhoneNumberHelp: String { return self._s[1727]! }
-    public var LastSeen_ALongTimeAgo: String { return self._s[1728]! }
-    public var Channel_AdminLog_CanPinMessages: String { return self._s[1729]! }
-    public var ChannelIntro_CreateChannel: String { return self._s[1730]! }
-    public var Conversation_UnreadMessages: String { return self._s[1731]! }
-    public var SettingsSearch_Synonyms_Stickers_ArchivedPacks: String { return self._s[1732]! }
-    public var Channel_AdminLog_EmptyText: String { return self._s[1733]! }
-    public var Theme_Context_Apply: String { return self._s[1734]! }
-    public var Notification_GroupActivated: String { return self._s[1735]! }
-    public var NotificationSettings_ContactJoinedInfo: String { return self._s[1736]! }
-    public var Wallet_Intro_CreateWallet: String { return self._s[1737]! }
+    public var Login_PhoneNumberHelp: String { return self._s[1729]! }
+    public var LastSeen_ALongTimeAgo: String { return self._s[1730]! }
+    public var Channel_AdminLog_CanPinMessages: String { return self._s[1731]! }
+    public var ChannelIntro_CreateChannel: String { return self._s[1732]! }
+    public var Conversation_UnreadMessages: String { return self._s[1733]! }
+    public var SettingsSearch_Synonyms_Stickers_ArchivedPacks: String { return self._s[1734]! }
+    public var Channel_AdminLog_EmptyText: String { return self._s[1735]! }
+    public var Theme_Context_Apply: String { return self._s[1736]! }
+    public var Notification_GroupActivated: String { return self._s[1737]! }
+    public var NotificationSettings_ContactJoinedInfo: String { return self._s[1738]! }
+    public var Wallet_Intro_CreateWallet: String { return self._s[1739]! }
     public func Notification_PinnedContactMessage(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[1738]!, self._r[1738]!, [_0])
+        return formatWithArgumentRanges(self._s[1740]!, self._r[1740]!, [_0])
     }
     public func DownloadingStatus(_ _0: String, _ _1: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[1739]!, self._r[1739]!, [_0, _1])
+        return formatWithArgumentRanges(self._s[1741]!, self._r[1741]!, [_0, _1])
     }
-    public var GroupInfo_ConvertToSupergroup: String { return self._s[1741]! }
+    public var GroupInfo_ConvertToSupergroup: String { return self._s[1743]! }
     public func PrivacyPolicy_AgeVerificationMessage(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[1742]!, self._r[1742]!, [_0])
+        return formatWithArgumentRanges(self._s[1744]!, self._r[1744]!, [_0])
     }
-    public var Undo_DeletedChannel: String { return self._s[1743]! }
-    public var CallFeedback_AddComment: String { return self._s[1744]! }
+    public var Undo_DeletedChannel: String { return self._s[1745]! }
+    public var CallFeedback_AddComment: String { return self._s[1746]! }
     public func Conversation_OpenBotLinkAllowMessages(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[1745]!, self._r[1745]!, [_0])
-    }
-    public var Document_TargetConfirmationFormat: String { return self._s[1746]! }
-    public func Call_StatusOngoing(_ _0: String) -> (String, [(Int, NSRange)]) {
         return formatWithArgumentRanges(self._s[1747]!, self._r[1747]!, [_0])
     }
-    public var LogoutOptions_SetPasscodeTitle: String { return self._s[1748]! }
+    public var Document_TargetConfirmationFormat: String { return self._s[1748]! }
+    public func Call_StatusOngoing(_ _0: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[1749]!, self._r[1749]!, [_0])
+    }
+    public var LogoutOptions_SetPasscodeTitle: String { return self._s[1750]! }
     public func PUSH_CHAT_MESSAGE_GAME_SCORE(_ _1: String, _ _2: String, _ _3: String, _ _4: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[1749]!, self._r[1749]!, [_1, _2, _3, _4])
+        return formatWithArgumentRanges(self._s[1751]!, self._r[1751]!, [_1, _2, _3, _4])
     }
-    public var Wallet_SecureStorageChanged_PasscodeText: String { return self._s[1750]! }
-    public var Theme_ErrorNotFound: String { return self._s[1751]! }
-    public var Contacts_SortByName: String { return self._s[1752]! }
-    public var SettingsSearch_Synonyms_Privacy_Forwards: String { return self._s[1753]! }
+    public var Wallet_SecureStorageChanged_PasscodeText: String { return self._s[1752]! }
+    public var Theme_ErrorNotFound: String { return self._s[1753]! }
+    public var Contacts_SortByName: String { return self._s[1754]! }
+    public var SettingsSearch_Synonyms_Privacy_Forwards: String { return self._s[1755]! }
     public func CHAT_MESSAGE_INVOICE(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[1755]!, self._r[1755]!, [_1, _2, _3])
+        return formatWithArgumentRanges(self._s[1757]!, self._r[1757]!, [_1, _2, _3])
     }
-    public var Notification_Exceptions_RemoveFromExceptions: String { return self._s[1756]! }
-    public var ScheduledMessages_EditTime: String { return self._s[1757]! }
-    public var Conversation_ClearSelfHistory: String { return self._s[1758]! }
-    public var Checkout_NewCard_PostcodePlaceholder: String { return self._s[1759]! }
-    public var PasscodeSettings_DoNotMatch: String { return self._s[1760]! }
-    public var Stickers_SuggestNone: String { return self._s[1761]! }
-    public var ChatSettings_Cache: String { return self._s[1762]! }
-    public var Settings_SaveIncomingPhotos: String { return self._s[1763]! }
-    public var Media_ShareThisPhoto: String { return self._s[1764]! }
-    public var Chat_SlowmodeTooltipPending: String { return self._s[1765]! }
-    public var InfoPlist_NSContactsUsageDescription: String { return self._s[1766]! }
-    public var Conversation_ContextMenuCopyLink: String { return self._s[1767]! }
-    public var PrivacyPolicy_AgeVerificationTitle: String { return self._s[1768]! }
-    public var SettingsSearch_Synonyms_Stickers_Masks: String { return self._s[1769]! }
-    public var TwoStepAuth_SetupPasswordEnterPasswordNew: String { return self._s[1770]! }
-    public var Appearance_ThemePreview_Chat_6_Text: String { return self._s[1771]! }
+    public var Notification_Exceptions_RemoveFromExceptions: String { return self._s[1758]! }
+    public var ScheduledMessages_EditTime: String { return self._s[1759]! }
+    public var Conversation_ClearSelfHistory: String { return self._s[1760]! }
+    public var Checkout_NewCard_PostcodePlaceholder: String { return self._s[1761]! }
+    public var PasscodeSettings_DoNotMatch: String { return self._s[1762]! }
+    public var Stickers_SuggestNone: String { return self._s[1763]! }
+    public var ChatSettings_Cache: String { return self._s[1764]! }
+    public var Settings_SaveIncomingPhotos: String { return self._s[1765]! }
+    public var Media_ShareThisPhoto: String { return self._s[1766]! }
+    public var Chat_SlowmodeTooltipPending: String { return self._s[1767]! }
+    public var InfoPlist_NSContactsUsageDescription: String { return self._s[1768]! }
+    public var Conversation_ContextMenuCopyLink: String { return self._s[1769]! }
+    public var PrivacyPolicy_AgeVerificationTitle: String { return self._s[1770]! }
+    public var SettingsSearch_Synonyms_Stickers_Masks: String { return self._s[1771]! }
+    public var TwoStepAuth_SetupPasswordEnterPasswordNew: String { return self._s[1772]! }
+    public var Appearance_ThemePreview_Chat_6_Text: String { return self._s[1773]! }
     public func Wallet_SecureStorageReset_BiometryText(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[1772]!, self._r[1772]!, [_0])
+        return formatWithArgumentRanges(self._s[1774]!, self._r[1774]!, [_0])
     }
-    public var Permissions_CellularDataTitle_v0: String { return self._s[1773]! }
-    public var WallpaperSearch_ColorWhite: String { return self._s[1775]! }
-    public var Channel_AdminLog_DefaultRestrictionsUpdated: String { return self._s[1776]! }
-    public var Conversation_ErrorInaccessibleMessage: String { return self._s[1777]! }
-    public var Map_OpenIn: String { return self._s[1778]! }
-    public var PeerInfo_ButtonCall: String { return self._s[1779]! }
+    public var Permissions_CellularDataTitle_v0: String { return self._s[1775]! }
+    public var WallpaperSearch_ColorWhite: String { return self._s[1777]! }
+    public var Channel_AdminLog_DefaultRestrictionsUpdated: String { return self._s[1778]! }
+    public var Conversation_ErrorInaccessibleMessage: String { return self._s[1779]! }
+    public var Map_OpenIn: String { return self._s[1780]! }
+    public var PeerInfo_ButtonCall: String { return self._s[1781]! }
     public func PUSH_PHONE_CALL_MISSED(_ _1: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[1783]!, self._r[1783]!, [_1])
+        return formatWithArgumentRanges(self._s[1785]!, self._r[1785]!, [_1])
     }
     public func ChannelInfo_AddParticipantConfirmation(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[1784]!, self._r[1784]!, [_0])
+        return formatWithArgumentRanges(self._s[1786]!, self._r[1786]!, [_0])
     }
-    public var GroupInfo_Permissions_SlowmodeHeader: String { return self._s[1785]! }
-    public var MessagePoll_LabelClosed: String { return self._s[1786]! }
-    public var GroupPermission_PermissionGloballyDisabled: String { return self._s[1788]! }
-    public var Wallet_Send_SendAnyway: String { return self._s[1789]! }
-    public var Passport_Identity_MiddleNamePlaceholder: String { return self._s[1790]! }
-    public var UserInfo_FirstNamePlaceholder: String { return self._s[1791]! }
-    public var PrivacyLastSeenSettings_WhoCanSeeMyTimestamp: String { return self._s[1792]! }
-    public var Map_SetThisPlace: String { return self._s[1793]! }
-    public var Login_SelectCountry_Title: String { return self._s[1794]! }
-    public var Channel_EditAdmin_PermissionBanUsers: String { return self._s[1795]! }
+    public var GroupInfo_Permissions_SlowmodeHeader: String { return self._s[1787]! }
+    public var MessagePoll_LabelClosed: String { return self._s[1788]! }
+    public var GroupPermission_PermissionGloballyDisabled: String { return self._s[1790]! }
+    public var Wallet_Send_SendAnyway: String { return self._s[1791]! }
+    public var Passport_Identity_MiddleNamePlaceholder: String { return self._s[1792]! }
+    public var UserInfo_FirstNamePlaceholder: String { return self._s[1793]! }
+    public var PrivacyLastSeenSettings_WhoCanSeeMyTimestamp: String { return self._s[1794]! }
+    public var Map_SetThisPlace: String { return self._s[1795]! }
+    public var Login_SelectCountry_Title: String { return self._s[1796]! }
+    public var Channel_EditAdmin_PermissionBanUsers: String { return self._s[1797]! }
     public func Conversation_OpenBotLinkLogin(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[1796]!, self._r[1796]!, [_1, _2])
+        return formatWithArgumentRanges(self._s[1798]!, self._r[1798]!, [_1, _2])
     }
-    public var Channel_AdminLog_ChangeInfo: String { return self._s[1797]! }
-    public var Watch_Suggestion_BRB: String { return self._s[1798]! }
-    public var Passport_Identity_EditIdentityCard: String { return self._s[1799]! }
-    public var Contacts_PermissionsTitle: String { return self._s[1800]! }
-    public var Conversation_RestrictedInline: String { return self._s[1801]! }
-    public var Appearance_RemoveThemeColor: String { return self._s[1803]! }
-    public var StickerPack_ViewPack: String { return self._s[1804]! }
-    public var Wallet_UnknownError: String { return self._s[1805]! }
+    public var Channel_AdminLog_ChangeInfo: String { return self._s[1799]! }
+    public var Watch_Suggestion_BRB: String { return self._s[1800]! }
+    public var Passport_Identity_EditIdentityCard: String { return self._s[1801]! }
+    public var Contacts_PermissionsTitle: String { return self._s[1802]! }
+    public var Conversation_RestrictedInline: String { return self._s[1803]! }
+    public var Appearance_RemoveThemeColor: String { return self._s[1805]! }
+    public var StickerPack_ViewPack: String { return self._s[1806]! }
+    public var Wallet_UnknownError: String { return self._s[1807]! }
     public func Update_AppVersion(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[1806]!, self._r[1806]!, [_0])
+        return formatWithArgumentRanges(self._s[1808]!, self._r[1808]!, [_0])
     }
-    public var Compose_NewChannel: String { return self._s[1808]! }
-    public var ChatSettings_AutoDownloadSettings_TypePhoto: String { return self._s[1812]! }
-    public var MessagePoll_LabelQuiz: String { return self._s[1814]! }
-    public var Conversation_ReportSpamGroupConfirmation: String { return self._s[1815]! }
-    public var Channel_Info_Stickers: String { return self._s[1816]! }
-    public var AutoNightTheme_PreferredTheme: String { return self._s[1817]! }
-    public var PrivacyPolicy_AgeVerificationAgree: String { return self._s[1818]! }
-    public var Passport_DeletePersonalDetails: String { return self._s[1819]! }
-    public var LogoutOptions_AddAccountTitle: String { return self._s[1820]! }
-    public var Channel_DiscussionGroupInfo: String { return self._s[1821]! }
-    public var Group_EditAdmin_RankOwnerPlaceholder: String { return self._s[1822]! }
-    public var Conversation_SearchNoResults: String { return self._s[1825]! }
-    public var Wallet_Configuration_ApplyErrorTextURLInvalid: String { return self._s[1826]! }
-    public var MessagePoll_LabelAnonymous: String { return self._s[1827]! }
-    public var Channel_Members_AddAdminErrorNotAMember: String { return self._s[1828]! }
-    public var Login_Code: String { return self._s[1829]! }
-    public var EditTheme_Create_BottomInfo: String { return self._s[1830]! }
-    public var Watch_Suggestion_WhatsUp: String { return self._s[1831]! }
-    public var Weekday_ShortThursday: String { return self._s[1832]! }
-    public var Resolve_ErrorNotFound: String { return self._s[1834]! }
-    public var LastSeen_Offline: String { return self._s[1835]! }
-    public var PeopleNearby_NoMembers: String { return self._s[1836]! }
-    public var GroupPermission_AddMembersNotAvailable: String { return self._s[1837]! }
-    public var Privacy_Calls_AlwaysAllow_Title: String { return self._s[1838]! }
-    public var GroupInfo_Title: String { return self._s[1840]! }
-    public var NotificationsSound_Note: String { return self._s[1841]! }
-    public var Conversation_EditingMessagePanelTitle: String { return self._s[1842]! }
-    public var Watch_Message_Poll: String { return self._s[1843]! }
-    public var Privacy_Calls: String { return self._s[1844]! }
+    public var Compose_NewChannel: String { return self._s[1810]! }
+    public var ChatSettings_AutoDownloadSettings_TypePhoto: String { return self._s[1814]! }
+    public var MessagePoll_LabelQuiz: String { return self._s[1816]! }
+    public var Conversation_ReportSpamGroupConfirmation: String { return self._s[1817]! }
+    public var Channel_Info_Stickers: String { return self._s[1818]! }
+    public var AutoNightTheme_PreferredTheme: String { return self._s[1819]! }
+    public var PrivacyPolicy_AgeVerificationAgree: String { return self._s[1820]! }
+    public var Passport_DeletePersonalDetails: String { return self._s[1821]! }
+    public var LogoutOptions_AddAccountTitle: String { return self._s[1822]! }
+    public var Channel_DiscussionGroupInfo: String { return self._s[1823]! }
+    public var Group_EditAdmin_RankOwnerPlaceholder: String { return self._s[1824]! }
+    public var Conversation_SearchNoResults: String { return self._s[1827]! }
+    public var Wallet_Configuration_ApplyErrorTextURLInvalid: String { return self._s[1828]! }
+    public var MessagePoll_LabelAnonymous: String { return self._s[1829]! }
+    public var Channel_Members_AddAdminErrorNotAMember: String { return self._s[1830]! }
+    public var Login_Code: String { return self._s[1831]! }
+    public var EditTheme_Create_BottomInfo: String { return self._s[1832]! }
+    public var Watch_Suggestion_WhatsUp: String { return self._s[1833]! }
+    public var Weekday_ShortThursday: String { return self._s[1834]! }
+    public var Resolve_ErrorNotFound: String { return self._s[1836]! }
+    public var LastSeen_Offline: String { return self._s[1837]! }
+    public var PeopleNearby_NoMembers: String { return self._s[1838]! }
+    public var GroupPermission_AddMembersNotAvailable: String { return self._s[1839]! }
+    public var Privacy_Calls_AlwaysAllow_Title: String { return self._s[1840]! }
+    public var GroupInfo_Title: String { return self._s[1842]! }
+    public var NotificationsSound_Note: String { return self._s[1843]! }
+    public var Conversation_EditingMessagePanelTitle: String { return self._s[1844]! }
+    public var Watch_Message_Poll: String { return self._s[1845]! }
+    public var Privacy_Calls: String { return self._s[1846]! }
     public func Channel_AdminLog_MessageRankUsername(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[1845]!, self._r[1845]!, [_1, _2, _3])
+        return formatWithArgumentRanges(self._s[1847]!, self._r[1847]!, [_1, _2, _3])
     }
-    public var Month_ShortAugust: String { return self._s[1846]! }
-    public var TwoStepAuth_SetPasswordHelp: String { return self._s[1847]! }
-    public var Notifications_Reset: String { return self._s[1848]! }
-    public var Conversation_Pin: String { return self._s[1849]! }
-    public var Passport_Language_lv: String { return self._s[1850]! }
-    public var Permissions_PeopleNearbyAllowInSettings_v0: String { return self._s[1851]! }
-    public var BlockedUsers_Info: String { return self._s[1852]! }
-    public var SettingsSearch_Synonyms_Data_AutoplayVideos: String { return self._s[1854]! }
-    public var Watch_Conversation_Unblock: String { return self._s[1856]! }
+    public var Month_ShortAugust: String { return self._s[1848]! }
+    public var TwoStepAuth_SetPasswordHelp: String { return self._s[1849]! }
+    public var Notifications_Reset: String { return self._s[1850]! }
+    public var Conversation_Pin: String { return self._s[1851]! }
+    public var Passport_Language_lv: String { return self._s[1852]! }
+    public var Permissions_PeopleNearbyAllowInSettings_v0: String { return self._s[1853]! }
+    public var BlockedUsers_Info: String { return self._s[1854]! }
+    public var SettingsSearch_Synonyms_Data_AutoplayVideos: String { return self._s[1856]! }
+    public var Watch_Conversation_Unblock: String { return self._s[1858]! }
     public func Time_MonthOfYear_m9(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[1857]!, self._r[1857]!, [_0])
+        return formatWithArgumentRanges(self._s[1859]!, self._r[1859]!, [_0])
     }
-    public var CloudStorage_Title: String { return self._s[1858]! }
-    public var GroupInfo_DeleteAndExitConfirmation: String { return self._s[1859]! }
+    public var CloudStorage_Title: String { return self._s[1860]! }
+    public var GroupInfo_DeleteAndExitConfirmation: String { return self._s[1861]! }
     public func NetworkUsageSettings_WifiUsageSince(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[1860]!, self._r[1860]!, [_0])
+        return formatWithArgumentRanges(self._s[1862]!, self._r[1862]!, [_0])
     }
-    public var Channel_AdminLogFilter_AdminsTitle: String { return self._s[1861]! }
-    public var Watch_Suggestion_OnMyWay: String { return self._s[1862]! }
-    public var TwoStepAuth_RecoveryEmailTitle: String { return self._s[1863]! }
-    public var Passport_Address_EditBankStatement: String { return self._s[1864]! }
+    public var Channel_AdminLogFilter_AdminsTitle: String { return self._s[1863]! }
+    public var Watch_Suggestion_OnMyWay: String { return self._s[1864]! }
+    public var TwoStepAuth_RecoveryEmailTitle: String { return self._s[1865]! }
+    public var Passport_Address_EditBankStatement: String { return self._s[1866]! }
     public func Channel_AdminLog_MessageChangedUnlinkedGroup(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[1865]!, self._r[1865]!, [_1, _2])
+        return formatWithArgumentRanges(self._s[1867]!, self._r[1867]!, [_1, _2])
     }
-    public var ChatSettings_DownloadInBackgroundInfo: String { return self._s[1866]! }
-    public var ShareMenu_Comment: String { return self._s[1867]! }
-    public var Permissions_ContactsTitle_v0: String { return self._s[1868]! }
-    public var Notifications_PermissionsTitle: String { return self._s[1869]! }
-    public var GroupPermission_NoSendLinks: String { return self._s[1870]! }
-    public var Privacy_Forwards_NeverAllow_Title: String { return self._s[1871]! }
-    public var Wallet_SecureStorageChanged_ImportWallet: String { return self._s[1872]! }
-    public var PeerInfo_PaneLinks: String { return self._s[1873]! }
-    public var Settings_Support: String { return self._s[1874]! }
-    public var Notifications_ChannelNotificationsSound: String { return self._s[1875]! }
-    public var SettingsSearch_Synonyms_Data_AutoDownloadReset: String { return self._s[1876]! }
-    public var Privacy_Forwards_Preview: String { return self._s[1877]! }
-    public var GroupPermission_ApplyAlertAction: String { return self._s[1878]! }
-    public var Watch_Stickers_StickerPacks: String { return self._s[1879]! }
-    public var Common_Select: String { return self._s[1881]! }
-    public var CheckoutInfo_ErrorEmailInvalid: String { return self._s[1882]! }
-    public var WallpaperSearch_ColorGray: String { return self._s[1885]! }
-    public var TwoFactorSetup_Password_PlaceholderPassword: String { return self._s[1886]! }
-    public var TwoFactorSetup_Hint_SkipAction: String { return self._s[1887]! }
-    public var ChatAdmins_AllMembersAreAdminsOffHelp: String { return self._s[1888]! }
-    public var PollResults_Title: String { return self._s[1889]! }
-    public var PasscodeSettings_AutoLock_IfAwayFor_5hours: String { return self._s[1890]! }
-    public var Appearance_PreviewReplyAuthor: String { return self._s[1891]! }
-    public var TwoStepAuth_RecoveryTitle: String { return self._s[1892]! }
-    public var Widget_AuthRequired: String { return self._s[1893]! }
-    public var Camera_FlashOn: String { return self._s[1894]! }
-    public var Conversation_ContextMenuLookUp: String { return self._s[1895]! }
-    public var Channel_Stickers_NotFoundHelp: String { return self._s[1896]! }
-    public var Watch_Suggestion_OK: String { return self._s[1897]! }
+    public var ChatSettings_DownloadInBackgroundInfo: String { return self._s[1868]! }
+    public var ShareMenu_Comment: String { return self._s[1869]! }
+    public var Permissions_ContactsTitle_v0: String { return self._s[1870]! }
+    public var Notifications_PermissionsTitle: String { return self._s[1871]! }
+    public var GroupPermission_NoSendLinks: String { return self._s[1872]! }
+    public var Privacy_Forwards_NeverAllow_Title: String { return self._s[1873]! }
+    public var Wallet_SecureStorageChanged_ImportWallet: String { return self._s[1874]! }
+    public var PeerInfo_PaneLinks: String { return self._s[1875]! }
+    public var Settings_Support: String { return self._s[1876]! }
+    public var Notifications_ChannelNotificationsSound: String { return self._s[1877]! }
+    public var SettingsSearch_Synonyms_Data_AutoDownloadReset: String { return self._s[1878]! }
+    public var Privacy_Forwards_Preview: String { return self._s[1879]! }
+    public var GroupPermission_ApplyAlertAction: String { return self._s[1880]! }
+    public var Watch_Stickers_StickerPacks: String { return self._s[1881]! }
+    public var Common_Select: String { return self._s[1883]! }
+    public var CheckoutInfo_ErrorEmailInvalid: String { return self._s[1884]! }
+    public var WallpaperSearch_ColorGray: String { return self._s[1887]! }
+    public var TwoFactorSetup_Password_PlaceholderPassword: String { return self._s[1888]! }
+    public var TwoFactorSetup_Hint_SkipAction: String { return self._s[1889]! }
+    public var ChatAdmins_AllMembersAreAdminsOffHelp: String { return self._s[1890]! }
+    public var PollResults_Title: String { return self._s[1891]! }
+    public var PasscodeSettings_AutoLock_IfAwayFor_5hours: String { return self._s[1892]! }
+    public var Appearance_PreviewReplyAuthor: String { return self._s[1893]! }
+    public var TwoStepAuth_RecoveryTitle: String { return self._s[1894]! }
+    public var Widget_AuthRequired: String { return self._s[1895]! }
+    public var Camera_FlashOn: String { return self._s[1896]! }
+    public var Conversation_ContextMenuLookUp: String { return self._s[1897]! }
+    public var Channel_Stickers_NotFoundHelp: String { return self._s[1898]! }
+    public var Watch_Suggestion_OK: String { return self._s[1899]! }
     public func Username_LinkHint(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[1899]!, self._r[1899]!, [_0])
-    }
-    public func Notification_PinnedLiveLocationMessage(_ _0: String) -> (String, [(Int, NSRange)]) {
         return formatWithArgumentRanges(self._s[1901]!, self._r[1901]!, [_0])
     }
-    public var TextFormat_Strikethrough: String { return self._s[1902]! }
-    public var DialogList_AdLabel: String { return self._s[1903]! }
-    public var WatchRemote_NotificationText: String { return self._s[1904]! }
-    public var IntentsSettings_SuggestedChatsSavedMessages: String { return self._s[1905]! }
-    public var SettingsSearch_Synonyms_Notifications_MessageNotificationsAlert: String { return self._s[1906]! }
-    public var Conversation_ReportSpam: String { return self._s[1907]! }
-    public var SettingsSearch_Synonyms_Privacy_Data_TopPeers: String { return self._s[1908]! }
-    public var Settings_LogoutConfirmationTitle: String { return self._s[1910]! }
-    public var PhoneLabel_Title: String { return self._s[1911]! }
-    public var Passport_Address_EditRentalAgreement: String { return self._s[1912]! }
-    public var Settings_ChangePhoneNumber: String { return self._s[1913]! }
-    public var Notifications_ExceptionsTitle: String { return self._s[1914]! }
-    public var Notifications_AlertTones: String { return self._s[1915]! }
-    public var Call_ReportIncludeLogDescription: String { return self._s[1916]! }
-    public var SettingsSearch_Synonyms_Notifications_ResetAllNotifications: String { return self._s[1917]! }
-    public var AutoDownloadSettings_PrivateChats: String { return self._s[1918]! }
-    public var VoiceOver_Chat_Photo: String { return self._s[1920]! }
-    public var TwoStepAuth_AddHintTitle: String { return self._s[1921]! }
-    public var Stats_PostsTitle: String { return self._s[1922]! }
-    public var ReportPeer_ReasonOther: String { return self._s[1923]! }
-    public var ChatList_Context_JoinChannel: String { return self._s[1924]! }
-    public var KeyCommand_ScrollDown: String { return self._s[1926]! }
-    public var Conversation_ScheduleMessage_Title: String { return self._s[1927]! }
+    public func Notification_PinnedLiveLocationMessage(_ _0: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[1903]!, self._r[1903]!, [_0])
+    }
+    public var TextFormat_Strikethrough: String { return self._s[1904]! }
+    public var DialogList_AdLabel: String { return self._s[1905]! }
+    public var WatchRemote_NotificationText: String { return self._s[1906]! }
+    public var IntentsSettings_SuggestedChatsSavedMessages: String { return self._s[1907]! }
+    public var SettingsSearch_Synonyms_Notifications_MessageNotificationsAlert: String { return self._s[1908]! }
+    public var Conversation_ReportSpam: String { return self._s[1909]! }
+    public var SettingsSearch_Synonyms_Privacy_Data_TopPeers: String { return self._s[1910]! }
+    public var Settings_LogoutConfirmationTitle: String { return self._s[1912]! }
+    public var PhoneLabel_Title: String { return self._s[1913]! }
+    public var Passport_Address_EditRentalAgreement: String { return self._s[1914]! }
+    public var Settings_ChangePhoneNumber: String { return self._s[1915]! }
+    public var Notifications_ExceptionsTitle: String { return self._s[1916]! }
+    public var Notifications_AlertTones: String { return self._s[1917]! }
+    public var Call_ReportIncludeLogDescription: String { return self._s[1918]! }
+    public var SettingsSearch_Synonyms_Notifications_ResetAllNotifications: String { return self._s[1919]! }
+    public var AutoDownloadSettings_PrivateChats: String { return self._s[1920]! }
+    public var VoiceOver_Chat_Photo: String { return self._s[1922]! }
+    public var TwoStepAuth_AddHintTitle: String { return self._s[1923]! }
+    public var Stats_PostsTitle: String { return self._s[1924]! }
+    public var ReportPeer_ReasonOther: String { return self._s[1925]! }
+    public var ChatList_Context_JoinChannel: String { return self._s[1926]! }
+    public var KeyCommand_ScrollDown: String { return self._s[1928]! }
+    public var Conversation_ScheduleMessage_Title: String { return self._s[1929]! }
     public func Login_BannedPhoneSubject(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[1928]!, self._r[1928]!, [_0])
+        return formatWithArgumentRanges(self._s[1930]!, self._r[1930]!, [_0])
     }
-    public var NetworkUsageSettings_MediaVideoDataSection: String { return self._s[1930]! }
-    public var ChannelInfo_DeleteGroupConfirmation: String { return self._s[1931]! }
-    public var AuthSessions_LogOut: String { return self._s[1932]! }
-    public var Passport_Identity_TypeInternalPassport: String { return self._s[1933]! }
-    public var ChatSettings_AutoDownloadVoiceMessages: String { return self._s[1934]! }
-    public var Passport_Phone_Title: String { return self._s[1935]! }
-    public var ContactList_Context_StartSecretChat: String { return self._s[1936]! }
-    public var Settings_PhoneNumber: String { return self._s[1937]! }
+    public var NetworkUsageSettings_MediaVideoDataSection: String { return self._s[1932]! }
+    public var ChannelInfo_DeleteGroupConfirmation: String { return self._s[1933]! }
+    public var AuthSessions_LogOut: String { return self._s[1934]! }
+    public var Passport_Identity_TypeInternalPassport: String { return self._s[1935]! }
+    public var ChatSettings_AutoDownloadVoiceMessages: String { return self._s[1936]! }
+    public var Passport_Phone_Title: String { return self._s[1937]! }
+    public var ContactList_Context_StartSecretChat: String { return self._s[1938]! }
+    public var Settings_PhoneNumber: String { return self._s[1939]! }
     public func Conversation_ScheduleMessage_SendToday(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[1938]!, self._r[1938]!, [_0])
+        return formatWithArgumentRanges(self._s[1940]!, self._r[1940]!, [_0])
     }
-    public var NotificationsSound_Alert: String { return self._s[1940]! }
-    public var Wallet_SecureStorageChanged_CreateWallet: String { return self._s[1941]! }
-    public var WebSearch_SearchNoResults: String { return self._s[1942]! }
-    public var Privacy_ProfilePhoto_AlwaysShareWith_Title: String { return self._s[1944]! }
-    public var Wallet_Configuration_SourceInfo: String { return self._s[1945]! }
-    public var LogoutOptions_AlternativeOptionsSection: String { return self._s[1946]! }
-    public var SettingsSearch_Synonyms_Passport: String { return self._s[1947]! }
-    public var PhotoEditor_CurvesTool: String { return self._s[1948]! }
-    public var Checkout_PaymentMethod: String { return self._s[1950]! }
+    public var NotificationsSound_Alert: String { return self._s[1942]! }
+    public var Wallet_SecureStorageChanged_CreateWallet: String { return self._s[1943]! }
+    public var WebSearch_SearchNoResults: String { return self._s[1944]! }
+    public var Privacy_ProfilePhoto_AlwaysShareWith_Title: String { return self._s[1946]! }
+    public var Wallet_Configuration_SourceInfo: String { return self._s[1947]! }
+    public var LogoutOptions_AlternativeOptionsSection: String { return self._s[1948]! }
+    public var SettingsSearch_Synonyms_Passport: String { return self._s[1949]! }
+    public var PhotoEditor_CurvesTool: String { return self._s[1950]! }
+    public var Checkout_PaymentMethod: String { return self._s[1952]! }
     public func PUSH_CHAT_ADD_YOU(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[1951]!, self._r[1951]!, [_1, _2])
+        return formatWithArgumentRanges(self._s[1953]!, self._r[1953]!, [_1, _2])
     }
-    public var Contacts_AccessDeniedError: String { return self._s[1952]! }
-    public var Camera_PhotoMode: String { return self._s[1955]! }
-    public var EditTheme_Expand_Preview_IncomingText: String { return self._s[1956]! }
-    public var Appearance_TextSize_Apply: String { return self._s[1957]! }
-    public var Passport_Address_AddUtilityBill: String { return self._s[1959]! }
-    public var CallSettings_OnMobile: String { return self._s[1960]! }
-    public var Tour_Text2: String { return self._s[1961]! }
+    public var Contacts_AccessDeniedError: String { return self._s[1954]! }
+    public var Camera_PhotoMode: String { return self._s[1957]! }
+    public var EditTheme_Expand_Preview_IncomingText: String { return self._s[1958]! }
+    public var Appearance_TextSize_Apply: String { return self._s[1959]! }
+    public var Passport_Address_AddUtilityBill: String { return self._s[1961]! }
+    public var CallSettings_OnMobile: String { return self._s[1962]! }
+    public var Tour_Text2: String { return self._s[1963]! }
     public func PUSH_CHAT_MESSAGE_ROUND(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[1962]!, self._r[1962]!, [_1, _2])
+        return formatWithArgumentRanges(self._s[1964]!, self._r[1964]!, [_1, _2])
     }
-    public var DialogList_EncryptionProcessing: String { return self._s[1964]! }
-    public var Permissions_Skip: String { return self._s[1965]! }
-    public var Wallet_Words_NotDoneOk: String { return self._s[1966]! }
-    public var SecretImage_Title: String { return self._s[1967]! }
-    public var Watch_MessageView_Title: String { return self._s[1968]! }
-    public var Channel_DiscussionGroupAdd: String { return self._s[1969]! }
-    public var AttachmentMenu_Poll: String { return self._s[1970]! }
+    public var DialogList_EncryptionProcessing: String { return self._s[1966]! }
+    public var Permissions_Skip: String { return self._s[1967]! }
+    public var Wallet_Words_NotDoneOk: String { return self._s[1968]! }
+    public var SecretImage_Title: String { return self._s[1969]! }
+    public var Watch_MessageView_Title: String { return self._s[1970]! }
+    public var Channel_DiscussionGroupAdd: String { return self._s[1971]! }
+    public var AttachmentMenu_Poll: String { return self._s[1972]! }
     public func Notification_GroupInviter(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[1971]!, self._r[1971]!, [_0])
+        return formatWithArgumentRanges(self._s[1973]!, self._r[1973]!, [_0])
     }
     public func Channel_DiscussionGroup_PrivateChannelLink(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[1972]!, self._r[1972]!, [_1, _2])
+        return formatWithArgumentRanges(self._s[1974]!, self._r[1974]!, [_1, _2])
     }
-    public var Notification_CallCanceled: String { return self._s[1973]! }
-    public var WallpaperPreview_Title: String { return self._s[1974]! }
-    public var Privacy_PaymentsClear_PaymentInfo: String { return self._s[1975]! }
-    public var Settings_ProxyConnecting: String { return self._s[1976]! }
-    public var Settings_CheckPhoneNumberText: String { return self._s[1978]! }
-    public var VoiceOver_Chat_YourVideo: String { return self._s[1979]! }
-    public var Wallet_Intro_Title: String { return self._s[1980]! }
-    public var TwoFactorSetup_Password_Action: String { return self._s[1981]! }
-    public var Profile_MessageLifetime5s: String { return self._s[1982]! }
-    public var Username_InvalidCharacters: String { return self._s[1983]! }
-    public var VoiceOver_Media_PlaybackRateFast: String { return self._s[1984]! }
-    public var ScheduledMessages_ClearAll: String { return self._s[1985]! }
-    public var WallpaperPreview_CropBottomText: String { return self._s[1986]! }
-    public var AutoDownloadSettings_LimitBySize: String { return self._s[1987]! }
-    public var Settings_AddAccount: String { return self._s[1988]! }
-    public var Notification_CreatedChannel: String { return self._s[1991]! }
+    public var Notification_CallCanceled: String { return self._s[1975]! }
+    public var WallpaperPreview_Title: String { return self._s[1976]! }
+    public var Privacy_PaymentsClear_PaymentInfo: String { return self._s[1977]! }
+    public var Settings_ProxyConnecting: String { return self._s[1978]! }
+    public var Settings_CheckPhoneNumberText: String { return self._s[1980]! }
+    public var VoiceOver_Chat_YourVideo: String { return self._s[1981]! }
+    public var Wallet_Intro_Title: String { return self._s[1982]! }
+    public var TwoFactorSetup_Password_Action: String { return self._s[1983]! }
+    public var Profile_MessageLifetime5s: String { return self._s[1984]! }
+    public var Username_InvalidCharacters: String { return self._s[1985]! }
+    public var VoiceOver_Media_PlaybackRateFast: String { return self._s[1986]! }
+    public var ScheduledMessages_ClearAll: String { return self._s[1987]! }
+    public var WallpaperPreview_CropBottomText: String { return self._s[1988]! }
+    public var AutoDownloadSettings_LimitBySize: String { return self._s[1989]! }
+    public var Settings_AddAccount: String { return self._s[1990]! }
+    public var Notification_CreatedChannel: String { return self._s[1993]! }
     public func PUSH_CHAT_DELETE_MEMBER(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[1992]!, self._r[1992]!, [_1, _2, _3])
+        return formatWithArgumentRanges(self._s[1994]!, self._r[1994]!, [_1, _2, _3])
     }
-    public var Passcode_AppLockedAlert: String { return self._s[1994]! }
-    public var StickerPacksSettings_AnimatedStickersInfo: String { return self._s[1995]! }
-    public var VoiceOver_Media_PlaybackStop: String { return self._s[1996]! }
-    public var Contacts_TopSection: String { return self._s[1997]! }
-    public var ChatList_DeleteForEveryoneConfirmationAction: String { return self._s[1998]! }
+    public var Passcode_AppLockedAlert: String { return self._s[1996]! }
+    public var StickerPacksSettings_AnimatedStickersInfo: String { return self._s[1997]! }
+    public var VoiceOver_Media_PlaybackStop: String { return self._s[1998]! }
+    public var Contacts_TopSection: String { return self._s[1999]! }
+    public var ChatList_DeleteForEveryoneConfirmationAction: String { return self._s[2000]! }
     public func Conversation_SetReminder_RemindOn(_ _0: String, _ _1: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[1999]!, self._r[1999]!, [_0, _1])
+        return formatWithArgumentRanges(self._s[2001]!, self._r[2001]!, [_0, _1])
     }
-    public var Wallet_Info_Receive: String { return self._s[2000]! }
-    public var Wallet_Completed_ViewWallet: String { return self._s[2001]! }
+    public var Wallet_Info_Receive: String { return self._s[2002]! }
+    public var Wallet_Completed_ViewWallet: String { return self._s[2003]! }
     public func Time_MonthOfYear_m6(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[2002]!, self._r[2002]!, [_0])
+        return formatWithArgumentRanges(self._s[2004]!, self._r[2004]!, [_0])
     }
-    public var ReportPeer_ReasonSpam: String { return self._s[2003]! }
-    public var UserInfo_TapToCall: String { return self._s[2004]! }
-    public var Conversation_ForwardAuthorHiddenTooltip: String { return self._s[2006]! }
-    public var AutoDownloadSettings_DataUsageCustom: String { return self._s[2007]! }
-    public var Common_Search: String { return self._s[2008]! }
-    public var ScheduledMessages_EmptyPlaceholder: String { return self._s[2009]! }
+    public var ReportPeer_ReasonSpam: String { return self._s[2005]! }
+    public var UserInfo_TapToCall: String { return self._s[2006]! }
+    public var Conversation_ForwardAuthorHiddenTooltip: String { return self._s[2008]! }
+    public var AutoDownloadSettings_DataUsageCustom: String { return self._s[2009]! }
+    public var Common_Search: String { return self._s[2010]! }
+    public var ScheduledMessages_EmptyPlaceholder: String { return self._s[2011]! }
     public func Channel_AdminLog_MessageChangedGroupGeoLocation(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[2010]!, self._r[2010]!, [_0])
+        return formatWithArgumentRanges(self._s[2012]!, self._r[2012]!, [_0])
     }
-    public var Wallet_Month_ShortJuly: String { return self._s[2011]! }
-    public var AuthSessions_IncompleteAttemptsInfo: String { return self._s[2013]! }
-    public var Message_InvoiceLabel: String { return self._s[2014]! }
-    public var Conversation_InputTextPlaceholder: String { return self._s[2015]! }
-    public var NetworkUsageSettings_MediaImageDataSection: String { return self._s[2016]! }
+    public var Wallet_Month_ShortJuly: String { return self._s[2013]! }
+    public var AuthSessions_IncompleteAttemptsInfo: String { return self._s[2015]! }
+    public var Message_InvoiceLabel: String { return self._s[2016]! }
+    public var Conversation_InputTextPlaceholder: String { return self._s[2017]! }
+    public var NetworkUsageSettings_MediaImageDataSection: String { return self._s[2018]! }
     public func Passport_Address_UploadOneOfScan(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[2017]!, self._r[2017]!, [_0])
+        return formatWithArgumentRanges(self._s[2019]!, self._r[2019]!, [_0])
     }
-    public var IntentsSettings_Reset: String { return self._s[2018]! }
-    public var Conversation_Info: String { return self._s[2019]! }
-    public var Login_InfoDeletePhoto: String { return self._s[2020]! }
-    public var Passport_Language_vi: String { return self._s[2022]! }
-    public var UserInfo_ScamUserWarning: String { return self._s[2023]! }
-    public var Conversation_Search: String { return self._s[2024]! }
-    public var DialogList_DeleteBotConversationConfirmation: String { return self._s[2026]! }
-    public var ReportPeer_ReasonPornography: String { return self._s[2027]! }
-    public var AutoDownloadSettings_PhotosTitle: String { return self._s[2028]! }
-    public var Conversation_SendMessageErrorGroupRestricted: String { return self._s[2029]! }
-    public var Map_LiveLocationGroupDescription: String { return self._s[2030]! }
-    public var Channel_Setup_TypeHeader: String { return self._s[2031]! }
-    public var AuthSessions_LoggedIn: String { return self._s[2032]! }
-    public var Privacy_Forwards_AlwaysAllow_Title: String { return self._s[2033]! }
-    public var Login_SmsRequestState3: String { return self._s[2034]! }
-    public var Passport_Address_EditUtilityBill: String { return self._s[2035]! }
-    public var Appearance_ReduceMotionInfo: String { return self._s[2036]! }
-    public var Join_ChannelsTooMuch: String { return self._s[2037]! }
-    public var Channel_Edit_LinkItem: String { return self._s[2038]! }
-    public var Privacy_Calls_P2PNever: String { return self._s[2039]! }
-    public var Conversation_AddToReadingList: String { return self._s[2041]! }
-    public var Share_MultipleMessagesDisabled: String { return self._s[2042]! }
-    public var Message_Animation: String { return self._s[2043]! }
-    public var Conversation_DefaultRestrictedMedia: String { return self._s[2044]! }
-    public var Map_Unknown: String { return self._s[2045]! }
-    public var AutoDownloadSettings_LastDelimeter: String { return self._s[2046]! }
+    public var IntentsSettings_Reset: String { return self._s[2020]! }
+    public var Conversation_Info: String { return self._s[2021]! }
+    public var Login_InfoDeletePhoto: String { return self._s[2022]! }
+    public var Passport_Language_vi: String { return self._s[2024]! }
+    public var UserInfo_ScamUserWarning: String { return self._s[2025]! }
+    public var Conversation_Search: String { return self._s[2026]! }
+    public var DialogList_DeleteBotConversationConfirmation: String { return self._s[2028]! }
+    public var ReportPeer_ReasonPornography: String { return self._s[2029]! }
+    public var AutoDownloadSettings_PhotosTitle: String { return self._s[2030]! }
+    public var Conversation_SendMessageErrorGroupRestricted: String { return self._s[2031]! }
+    public var Map_LiveLocationGroupDescription: String { return self._s[2032]! }
+    public var Channel_Setup_TypeHeader: String { return self._s[2033]! }
+    public var AuthSessions_LoggedIn: String { return self._s[2034]! }
+    public var Privacy_Forwards_AlwaysAllow_Title: String { return self._s[2035]! }
+    public var Login_SmsRequestState3: String { return self._s[2036]! }
+    public var Passport_Address_EditUtilityBill: String { return self._s[2037]! }
+    public var Appearance_ReduceMotionInfo: String { return self._s[2038]! }
+    public var Join_ChannelsTooMuch: String { return self._s[2039]! }
+    public var Channel_Edit_LinkItem: String { return self._s[2040]! }
+    public var Privacy_Calls_P2PNever: String { return self._s[2041]! }
+    public var Conversation_AddToReadingList: String { return self._s[2043]! }
+    public var Share_MultipleMessagesDisabled: String { return self._s[2044]! }
+    public var Message_Animation: String { return self._s[2045]! }
+    public var Conversation_DefaultRestrictedMedia: String { return self._s[2046]! }
+    public var Map_Unknown: String { return self._s[2047]! }
+    public var AutoDownloadSettings_LastDelimeter: String { return self._s[2048]! }
     public func PUSH_PINNED_TEXT(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[2047]!, self._r[2047]!, [_1, _2])
+        return formatWithArgumentRanges(self._s[2049]!, self._r[2049]!, [_1, _2])
     }
     public func Passport_FieldOneOf_Or(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[2048]!, self._r[2048]!, [_1, _2])
+        return formatWithArgumentRanges(self._s[2050]!, self._r[2050]!, [_1, _2])
     }
-    public var Call_StatusRequesting: String { return self._s[2049]! }
-    public var Conversation_SecretChatContextBotAlert: String { return self._s[2050]! }
-    public var SocksProxySetup_ProxyStatusChecking: String { return self._s[2051]! }
+    public var Call_StatusRequesting: String { return self._s[2051]! }
+    public var Conversation_SecretChatContextBotAlert: String { return self._s[2052]! }
+    public var SocksProxySetup_ProxyStatusChecking: String { return self._s[2053]! }
     public func PUSH_CHAT_MESSAGE_DOC(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[2052]!, self._r[2052]!, [_1, _2])
+        return formatWithArgumentRanges(self._s[2054]!, self._r[2054]!, [_1, _2])
     }
     public func Notification_PinnedLocationMessage(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[2053]!, self._r[2053]!, [_0])
+        return formatWithArgumentRanges(self._s[2055]!, self._r[2055]!, [_0])
     }
-    public var Update_Skip: String { return self._s[2054]! }
-    public var Group_Username_RemoveExistingUsernamesInfo: String { return self._s[2055]! }
-    public var BlockedUsers_Title: String { return self._s[2056]! }
-    public var Weekday_Monday: String { return self._s[2057]! }
+    public var Update_Skip: String { return self._s[2056]! }
+    public var Group_Username_RemoveExistingUsernamesInfo: String { return self._s[2057]! }
+    public var BlockedUsers_Title: String { return self._s[2058]! }
+    public var Weekday_Monday: String { return self._s[2059]! }
     public func PUSH_CHANNEL_MESSAGE_AUDIO(_ _1: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[2058]!, self._r[2058]!, [_1])
+        return formatWithArgumentRanges(self._s[2060]!, self._r[2060]!, [_1])
     }
-    public var Username_CheckingUsername: String { return self._s[2059]! }
-    public var NotificationsSound_Bell: String { return self._s[2060]! }
-    public var Conversation_SendMessageErrorFlood: String { return self._s[2061]! }
-    public var SettingsSearch_Synonyms_Notifications_DisplayNamesOnLockScreen: String { return self._s[2062]! }
-    public var ChannelMembers_ChannelAdminsTitle: String { return self._s[2063]! }
-    public var ChatSettings_Groups: String { return self._s[2064]! }
-    public var WallpaperPreview_PatternPaternDiscard: String { return self._s[2065]! }
+    public var Username_CheckingUsername: String { return self._s[2061]! }
+    public var NotificationsSound_Bell: String { return self._s[2062]! }
+    public var Conversation_SendMessageErrorFlood: String { return self._s[2063]! }
+    public var SettingsSearch_Synonyms_Notifications_DisplayNamesOnLockScreen: String { return self._s[2064]! }
+    public var ChannelMembers_ChannelAdminsTitle: String { return self._s[2065]! }
+    public var ChatSettings_Groups: String { return self._s[2066]! }
+    public var WallpaperPreview_PatternPaternDiscard: String { return self._s[2067]! }
     public func Conversation_SetReminder_RemindTomorrow(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[2066]!, self._r[2066]!, [_0])
+        return formatWithArgumentRanges(self._s[2068]!, self._r[2068]!, [_0])
     }
-    public var Your_card_was_declined: String { return self._s[2067]! }
-    public var TwoStepAuth_EnterPasswordHelp: String { return self._s[2069]! }
-    public var Wallet_Month_ShortApril: String { return self._s[2070]! }
-    public var ChatList_Unmute: String { return self._s[2071]! }
-    public var AuthSessions_AddDevice_ScanTitle: String { return self._s[2072]! }
-    public var PhotoEditor_CurvesAll: String { return self._s[2073]! }
-    public var Weekday_ShortTuesday: String { return self._s[2074]! }
-    public var DialogList_Read: String { return self._s[2075]! }
-    public var Appearance_AppIconClassic: String { return self._s[2076]! }
-    public var ChannelMembers_WhoCanAddMembers_AllMembers: String { return self._s[2077]! }
-    public var Passport_Identity_Gender: String { return self._s[2078]! }
+    public var Your_card_was_declined: String { return self._s[2069]! }
+    public var TwoStepAuth_EnterPasswordHelp: String { return self._s[2071]! }
+    public var Wallet_Month_ShortApril: String { return self._s[2072]! }
+    public var ChatList_Unmute: String { return self._s[2073]! }
+    public var AuthSessions_AddDevice_ScanTitle: String { return self._s[2074]! }
+    public var PhotoEditor_CurvesAll: String { return self._s[2075]! }
+    public var Weekday_ShortTuesday: String { return self._s[2076]! }
+    public var DialogList_Read: String { return self._s[2077]! }
+    public var Appearance_AppIconClassic: String { return self._s[2078]! }
+    public var ChannelMembers_WhoCanAddMembers_AllMembers: String { return self._s[2079]! }
+    public var Passport_Identity_Gender: String { return self._s[2080]! }
     public func Target_ShareGameConfirmationPrivate(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[2079]!, self._r[2079]!, [_0])
+        return formatWithArgumentRanges(self._s[2081]!, self._r[2081]!, [_0])
     }
-    public var Target_SelectGroup: String { return self._s[2080]! }
-    public var Map_HomeAndWorkInfo: String { return self._s[2082]! }
+    public var Target_SelectGroup: String { return self._s[2082]! }
+    public var Map_HomeAndWorkInfo: String { return self._s[2084]! }
     public func DialogList_EncryptedChatStartedIncoming(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[2083]!, self._r[2083]!, [_0])
+        return formatWithArgumentRanges(self._s[2085]!, self._r[2085]!, [_0])
     }
-    public var Passport_Language_en: String { return self._s[2084]! }
-    public var AutoDownloadSettings_AutodownloadPhotos: String { return self._s[2085]! }
-    public var Channel_Username_CreatePublicLinkHelp: String { return self._s[2086]! }
-    public var Login_CancelPhoneVerificationContinue: String { return self._s[2087]! }
-    public var ScheduledMessages_SendNow: String { return self._s[2088]! }
-    public var Checkout_NewCard_PaymentCard: String { return self._s[2090]! }
-    public var Login_InfoHelp: String { return self._s[2091]! }
-    public var Appearance_BubbleCorners_AdjustAdjacent: String { return self._s[2092]! }
-    public var Contacts_PermissionsSuppressWarningTitle: String { return self._s[2093]! }
-    public var SettingsSearch_Synonyms_Stickers_FeaturedPacks: String { return self._s[2094]! }
+    public var Passport_Language_en: String { return self._s[2086]! }
+    public var AutoDownloadSettings_AutodownloadPhotos: String { return self._s[2087]! }
+    public var Channel_Username_CreatePublicLinkHelp: String { return self._s[2088]! }
+    public var Login_CancelPhoneVerificationContinue: String { return self._s[2089]! }
+    public var ScheduledMessages_SendNow: String { return self._s[2090]! }
+    public var Checkout_NewCard_PaymentCard: String { return self._s[2092]! }
+    public var Login_InfoHelp: String { return self._s[2093]! }
+    public var Appearance_BubbleCorners_AdjustAdjacent: String { return self._s[2094]! }
+    public var Contacts_PermissionsSuppressWarningTitle: String { return self._s[2095]! }
+    public var SettingsSearch_Synonyms_Stickers_FeaturedPacks: String { return self._s[2096]! }
     public func Channel_AdminLog_MessageChangedLinkedChannel(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[2095]!, self._r[2095]!, [_1, _2])
+        return formatWithArgumentRanges(self._s[2097]!, self._r[2097]!, [_1, _2])
     }
-    public var SocksProxySetup_AddProxy: String { return self._s[2098]! }
-    public var CreatePoll_Title: String { return self._s[2099]! }
-    public var MessagePoll_QuizNoUsers: String { return self._s[2100]! }
-    public var Conversation_ViewTheme: String { return self._s[2101]! }
-    public var SettingsSearch_Synonyms_Privacy_Data_SecretChatLinkPreview: String { return self._s[2102]! }
-    public var PasscodeSettings_SimplePasscodeHelp: String { return self._s[2103]! }
-    public var TwoFactorSetup_Intro_Text: String { return self._s[2104]! }
-    public var UserInfo_GroupsInCommon: String { return self._s[2105]! }
-    public var TelegramWallet_Intro_TermsUrl: String { return self._s[2106]! }
-    public var Call_AudioRouteHide: String { return self._s[2107]! }
+    public var SocksProxySetup_AddProxy: String { return self._s[2100]! }
+    public var CreatePoll_Title: String { return self._s[2101]! }
+    public var MessagePoll_QuizNoUsers: String { return self._s[2102]! }
+    public var Conversation_ViewTheme: String { return self._s[2103]! }
+    public var SettingsSearch_Synonyms_Privacy_Data_SecretChatLinkPreview: String { return self._s[2104]! }
+    public var PasscodeSettings_SimplePasscodeHelp: String { return self._s[2105]! }
+    public var TwoFactorSetup_Intro_Text: String { return self._s[2106]! }
+    public var UserInfo_GroupsInCommon: String { return self._s[2107]! }
+    public var TelegramWallet_Intro_TermsUrl: String { return self._s[2108]! }
+    public var Call_AudioRouteHide: String { return self._s[2109]! }
     public func Wallet_Info_TransactionDateHeader(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[2109]!, self._r[2109]!, [_1, _2])
+        return formatWithArgumentRanges(self._s[2111]!, self._r[2111]!, [_1, _2])
     }
-    public var ContactInfo_PhoneLabelMobile: String { return self._s[2110]! }
-    public var IntentsSettings_SuggestedChatsInfo: String { return self._s[2111]! }
-    public var CreatePoll_QuizOptionsHeader: String { return self._s[2112]! }
+    public var ContactInfo_PhoneLabelMobile: String { return self._s[2112]! }
+    public var IntentsSettings_SuggestedChatsInfo: String { return self._s[2113]! }
+    public var CreatePoll_QuizOptionsHeader: String { return self._s[2114]! }
     public func ChatList_LeaveGroupConfirmation(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[2113]!, self._r[2113]!, [_0])
+        return formatWithArgumentRanges(self._s[2115]!, self._r[2115]!, [_0])
     }
-    public var TextFormat_Bold: String { return self._s[2114]! }
-    public var FastTwoStepSetup_EmailSection: String { return self._s[2115]! }
-    public var StickerPackActionInfo_AddedTitle: String { return self._s[2116]! }
-    public var Notifications_Title: String { return self._s[2117]! }
-    public var Group_Username_InvalidTooShort: String { return self._s[2118]! }
-    public var Channel_ErrorAddTooMuch: String { return self._s[2119]! }
+    public var TextFormat_Bold: String { return self._s[2116]! }
+    public var FastTwoStepSetup_EmailSection: String { return self._s[2117]! }
+    public var StickerPackActionInfo_AddedTitle: String { return self._s[2118]! }
+    public var Notifications_Title: String { return self._s[2119]! }
+    public var Group_Username_InvalidTooShort: String { return self._s[2120]! }
+    public var Channel_ErrorAddTooMuch: String { return self._s[2121]! }
     public func DialogList_MultipleTypingSuffix(_ _0: Int) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[2120]!, self._r[2120]!, ["\(_0)"])
+        return formatWithArgumentRanges(self._s[2122]!, self._r[2122]!, ["\(_0)"])
     }
-    public var VoiceOver_DiscardPreparedContent: String { return self._s[2122]! }
-    public var Stickers_SuggestAdded: String { return self._s[2123]! }
-    public var Login_CountryCode: String { return self._s[2124]! }
-    public var ChatSettings_AutoPlayVideos: String { return self._s[2125]! }
-    public var Map_GetDirections: String { return self._s[2126]! }
-    public var Wallet_Receive_ShareInvoiceUrl: String { return self._s[2127]! }
-    public var Login_PhoneFloodError: String { return self._s[2128]! }
+    public var VoiceOver_DiscardPreparedContent: String { return self._s[2124]! }
+    public var Stickers_SuggestAdded: String { return self._s[2125]! }
+    public var Login_CountryCode: String { return self._s[2126]! }
+    public var ChatSettings_AutoPlayVideos: String { return self._s[2127]! }
+    public var Map_GetDirections: String { return self._s[2128]! }
+    public var Wallet_Receive_ShareInvoiceUrl: String { return self._s[2129]! }
+    public var Login_PhoneFloodError: String { return self._s[2130]! }
     public func Time_MonthOfYear_m3(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[2129]!, self._r[2129]!, [_0])
+        return formatWithArgumentRanges(self._s[2131]!, self._r[2131]!, [_0])
     }
     public func Wallet_Time_PreciseDate_m10(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[2130]!, self._r[2130]!, [_1, _2, _3])
+        return formatWithArgumentRanges(self._s[2132]!, self._r[2132]!, [_1, _2, _3])
     }
-    public var IntentsSettings_SuggestedChatsPrivateChats: String { return self._s[2131]! }
-    public var Settings_SetUsername: String { return self._s[2133]! }
-    public var Group_Location_ChangeLocation: String { return self._s[2134]! }
-    public var Notification_GroupInviterSelf: String { return self._s[2135]! }
-    public var InstantPage_TapToOpenLink: String { return self._s[2136]! }
+    public var IntentsSettings_SuggestedChatsPrivateChats: String { return self._s[2133]! }
+    public var Settings_SetUsername: String { return self._s[2135]! }
+    public var Group_Location_ChangeLocation: String { return self._s[2136]! }
+    public var Notification_GroupInviterSelf: String { return self._s[2137]! }
+    public var InstantPage_TapToOpenLink: String { return self._s[2138]! }
     public func Notification_ChannelInviter(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[2137]!, self._r[2137]!, [_0])
+        return formatWithArgumentRanges(self._s[2139]!, self._r[2139]!, [_0])
     }
-    public var Watch_Suggestion_TalkLater: String { return self._s[2138]! }
-    public var SecretChat_Title: String { return self._s[2139]! }
-    public var Group_UpgradeNoticeText1: String { return self._s[2140]! }
-    public var AuthSessions_Title: String { return self._s[2141]! }
+    public var Watch_Suggestion_TalkLater: String { return self._s[2140]! }
+    public var SecretChat_Title: String { return self._s[2141]! }
+    public var Group_UpgradeNoticeText1: String { return self._s[2142]! }
+    public var AuthSessions_Title: String { return self._s[2143]! }
     public func TextFormat_AddLinkText(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[2142]!, self._r[2142]!, [_0])
+        return formatWithArgumentRanges(self._s[2144]!, self._r[2144]!, [_0])
     }
-    public var PhotoEditor_CropAuto: String { return self._s[2143]! }
-    public var Channel_About_Title: String { return self._s[2144]! }
-    public var Theme_ThemeChanged: String { return self._s[2145]! }
-    public var FastTwoStepSetup_EmailHelp: String { return self._s[2146]! }
+    public var PhotoEditor_CropAuto: String { return self._s[2145]! }
+    public var Channel_About_Title: String { return self._s[2146]! }
+    public var Theme_ThemeChanged: String { return self._s[2147]! }
+    public var FastTwoStepSetup_EmailHelp: String { return self._s[2148]! }
     public func Conversation_Bytes(_ _0: Int) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[2148]!, self._r[2148]!, ["\(_0)"])
+        return formatWithArgumentRanges(self._s[2150]!, self._r[2150]!, ["\(_0)"])
     }
-    public var VoiceOver_MessageContextReport: String { return self._s[2149]! }
-    public var Conversation_PinMessageAlert_OnlyPin: String { return self._s[2151]! }
-    public var Group_Setup_HistoryVisibleHelp: String { return self._s[2152]! }
+    public var VoiceOver_MessageContextReport: String { return self._s[2151]! }
+    public var Conversation_PinMessageAlert_OnlyPin: String { return self._s[2153]! }
+    public var Group_Setup_HistoryVisibleHelp: String { return self._s[2154]! }
     public func PUSH_MESSAGE_GIF(_ _1: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[2153]!, self._r[2153]!, [_1])
+        return formatWithArgumentRanges(self._s[2155]!, self._r[2155]!, [_1])
     }
     public func SharedMedia_SearchNoResultsDescription(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[2155]!, self._r[2155]!, [_0])
+        return formatWithArgumentRanges(self._s[2157]!, self._r[2157]!, [_0])
     }
     public func TwoStepAuth_RecoveryEmailUnavailable(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[2156]!, self._r[2156]!, [_0])
+        return formatWithArgumentRanges(self._s[2158]!, self._r[2158]!, [_0])
     }
-    public var Privacy_PaymentsClearInfoHelp: String { return self._s[2157]! }
-    public var PeopleNearby_DiscoverDescription: String { return self._s[2159]! }
-    public var Presence_online: String { return self._s[2161]! }
-    public var PasscodeSettings_Title: String { return self._s[2162]! }
-    public var Passport_Identity_ExpiryDatePlaceholder: String { return self._s[2163]! }
-    public var Web_OpenExternal: String { return self._s[2164]! }
-    public var AutoDownloadSettings_AutoDownload: String { return self._s[2166]! }
-    public var Channel_OwnershipTransfer_EnterPasswordText: String { return self._s[2167]! }
-    public var LocalGroup_Title: String { return self._s[2168]! }
+    public var Privacy_PaymentsClearInfoHelp: String { return self._s[2159]! }
+    public var PeopleNearby_DiscoverDescription: String { return self._s[2161]! }
+    public var Presence_online: String { return self._s[2163]! }
+    public var PasscodeSettings_Title: String { return self._s[2164]! }
+    public var Passport_Identity_ExpiryDatePlaceholder: String { return self._s[2165]! }
+    public var Web_OpenExternal: String { return self._s[2166]! }
+    public var AutoDownloadSettings_AutoDownload: String { return self._s[2168]! }
+    public var Channel_OwnershipTransfer_EnterPasswordText: String { return self._s[2169]! }
+    public var LocalGroup_Title: String { return self._s[2170]! }
     public func AutoNightTheme_AutomaticHelp(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[2169]!, self._r[2169]!, [_0])
+        return formatWithArgumentRanges(self._s[2171]!, self._r[2171]!, [_0])
     }
-    public var FastTwoStepSetup_PasswordConfirmationPlaceholder: String { return self._s[2170]! }
-    public var Conversation_StopQuizConfirmation: String { return self._s[2171]! }
-    public var Map_YouAreHere: String { return self._s[2172]! }
+    public var FastTwoStepSetup_PasswordConfirmationPlaceholder: String { return self._s[2172]! }
+    public var Conversation_StopQuizConfirmation: String { return self._s[2173]! }
+    public var Map_YouAreHere: String { return self._s[2174]! }
     public func AuthSessions_Message(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[2173]!, self._r[2173]!, [_0])
+        return formatWithArgumentRanges(self._s[2175]!, self._r[2175]!, [_0])
     }
     public func ChatList_DeleteChatConfirmation(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[2174]!, self._r[2174]!, [_0])
+        return formatWithArgumentRanges(self._s[2176]!, self._r[2176]!, [_0])
     }
-    public var Theme_Context_ChangeColors: String { return self._s[2175]! }
-    public var PrivacyLastSeenSettings_AlwaysShareWith: String { return self._s[2176]! }
-    public var Target_InviteToGroupErrorAlreadyInvited: String { return self._s[2177]! }
+    public var Theme_Context_ChangeColors: String { return self._s[2177]! }
+    public var PrivacyLastSeenSettings_AlwaysShareWith: String { return self._s[2178]! }
+    public var Target_InviteToGroupErrorAlreadyInvited: String { return self._s[2179]! }
     public func AuthSessions_AppUnofficial(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[2178]!, self._r[2178]!, [_0])
+        return formatWithArgumentRanges(self._s[2180]!, self._r[2180]!, [_0])
     }
     public func DialogList_LiveLocationSharingTo(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[2179]!, self._r[2179]!, [_0])
+        return formatWithArgumentRanges(self._s[2181]!, self._r[2181]!, [_0])
     }
-    public var SocksProxySetup_Username: String { return self._s[2180]! }
-    public var Bot_Start: String { return self._s[2181]! }
+    public var SocksProxySetup_Username: String { return self._s[2182]! }
+    public var Bot_Start: String { return self._s[2183]! }
     public func Channel_AdminLog_EmptyFilterQueryText(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[2182]!, self._r[2182]!, [_0])
+        return formatWithArgumentRanges(self._s[2184]!, self._r[2184]!, [_0])
     }
     public func Channel_AdminLog_MessagePinned(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[2183]!, self._r[2183]!, [_0])
+        return formatWithArgumentRanges(self._s[2185]!, self._r[2185]!, [_0])
     }
-    public var Contacts_SortByPresence: String { return self._s[2184]! }
-    public var AccentColor_Title: String { return self._s[2187]! }
-    public var Conversation_DiscardVoiceMessageTitle: String { return self._s[2188]! }
+    public var Contacts_SortByPresence: String { return self._s[2186]! }
+    public var AccentColor_Title: String { return self._s[2189]! }
+    public var Conversation_DiscardVoiceMessageTitle: String { return self._s[2190]! }
     public func PUSH_CHAT_CREATED(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[2189]!, self._r[2189]!, [_1, _2])
-    }
-    public func PrivacySettings_LastSeenContactsMinus(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[2190]!, self._r[2190]!, [_0])
-    }
-    public func Channel_AdminLog_MessageChangedLinkedGroup(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
         return formatWithArgumentRanges(self._s[2191]!, self._r[2191]!, [_1, _2])
     }
-    public var Passport_Email_EnterOtherEmail: String { return self._s[2192]! }
-    public var Login_InfoAvatarPhoto: String { return self._s[2193]! }
-    public var Privacy_PaymentsClear_ShippingInfo: String { return self._s[2194]! }
-    public var Tour_Title4: String { return self._s[2195]! }
-    public var Passport_Identity_Translation: String { return self._s[2196]! }
-    public var SettingsSearch_Synonyms_Notifications_ContactJoined: String { return self._s[2197]! }
-    public var Login_TermsOfServiceLabel: String { return self._s[2199]! }
-    public var Passport_Language_it: String { return self._s[2200]! }
-    public var KeyCommand_JumpToNextUnreadChat: String { return self._s[2201]! }
-    public var Passport_Identity_SelfieHelp: String { return self._s[2202]! }
-    public var Conversation_ClearAll: String { return self._s[2204]! }
-    public var Wallet_Send_UninitializedText: String { return self._s[2206]! }
-    public var Channel_OwnershipTransfer_Title: String { return self._s[2207]! }
-    public var TwoStepAuth_FloodError: String { return self._s[2208]! }
+    public func PrivacySettings_LastSeenContactsMinus(_ _0: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[2192]!, self._r[2192]!, [_0])
+    }
+    public func Channel_AdminLog_MessageChangedLinkedGroup(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[2193]!, self._r[2193]!, [_1, _2])
+    }
+    public var Passport_Email_EnterOtherEmail: String { return self._s[2194]! }
+    public var Login_InfoAvatarPhoto: String { return self._s[2195]! }
+    public var Privacy_PaymentsClear_ShippingInfo: String { return self._s[2196]! }
+    public var Tour_Title4: String { return self._s[2197]! }
+    public var Passport_Identity_Translation: String { return self._s[2198]! }
+    public var SettingsSearch_Synonyms_Notifications_ContactJoined: String { return self._s[2199]! }
+    public var Login_TermsOfServiceLabel: String { return self._s[2201]! }
+    public var Passport_Language_it: String { return self._s[2202]! }
+    public var KeyCommand_JumpToNextUnreadChat: String { return self._s[2203]! }
+    public var Passport_Identity_SelfieHelp: String { return self._s[2204]! }
+    public var Conversation_ClearAll: String { return self._s[2206]! }
+    public var Wallet_Send_UninitializedText: String { return self._s[2208]! }
+    public var Channel_OwnershipTransfer_Title: String { return self._s[2209]! }
+    public var TwoStepAuth_FloodError: String { return self._s[2210]! }
     public func PUSH_CHANNEL_MESSAGE_GEO(_ _1: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[2209]!, self._r[2209]!, [_1])
+        return formatWithArgumentRanges(self._s[2211]!, self._r[2211]!, [_1])
     }
-    public var Paint_Delete: String { return self._s[2210]! }
+    public var Paint_Delete: String { return self._s[2212]! }
     public func Wallet_Sent_Text(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[2211]!, self._r[2211]!, [_0])
+        return formatWithArgumentRanges(self._s[2213]!, self._r[2213]!, [_0])
     }
-    public var Privacy_AddNewPeer: String { return self._s[2212]! }
+    public var Privacy_AddNewPeer: String { return self._s[2214]! }
     public func Channel_AdminLog_MessageRank(_ _1: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[2213]!, self._r[2213]!, [_1])
+        return formatWithArgumentRanges(self._s[2215]!, self._r[2215]!, [_1])
     }
-    public var LogoutOptions_SetPasscodeText: String { return self._s[2214]! }
+    public var LogoutOptions_SetPasscodeText: String { return self._s[2216]! }
     public func Passport_AcceptHelp(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[2215]!, self._r[2215]!, [_1, _2])
+        return formatWithArgumentRanges(self._s[2217]!, self._r[2217]!, [_1, _2])
     }
-    public var Message_PinnedAudioMessage: String { return self._s[2216]! }
+    public var Message_PinnedAudioMessage: String { return self._s[2218]! }
     public func Watch_Time_ShortTodayAt(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[2217]!, self._r[2217]!, [_0])
+        return formatWithArgumentRanges(self._s[2219]!, self._r[2219]!, [_0])
     }
-    public var Notification_Mute1hMin: String { return self._s[2218]! }
-    public var Notifications_GroupNotificationsSound: String { return self._s[2219]! }
-    public var Wallet_Month_GenNovember: String { return self._s[2220]! }
-    public var SocksProxySetup_ShareProxyList: String { return self._s[2221]! }
-    public var Conversation_MessageEditedLabel: String { return self._s[2222]! }
+    public var Notification_Mute1hMin: String { return self._s[2220]! }
+    public var Notifications_GroupNotificationsSound: String { return self._s[2221]! }
+    public var Wallet_Month_GenNovember: String { return self._s[2222]! }
+    public var SocksProxySetup_ShareProxyList: String { return self._s[2223]! }
+    public var Conversation_MessageEditedLabel: String { return self._s[2224]! }
     public func ClearCache_Success(_ _0: String, _ _1: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[2223]!, self._r[2223]!, [_0, _1])
+        return formatWithArgumentRanges(self._s[2225]!, self._r[2225]!, [_0, _1])
     }
-    public var Notification_Exceptions_AlwaysOff: String { return self._s[2224]! }
-    public var Notification_Exceptions_NewException_MessagePreviewHeader: String { return self._s[2225]! }
+    public var Notification_Exceptions_AlwaysOff: String { return self._s[2226]! }
+    public var Notification_Exceptions_NewException_MessagePreviewHeader: String { return self._s[2227]! }
     public func Channel_AdminLog_MessageAdmin(_ _0: String, _ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[2226]!, self._r[2226]!, [_0, _1, _2])
+        return formatWithArgumentRanges(self._s[2228]!, self._r[2228]!, [_0, _1, _2])
     }
-    public var NetworkUsageSettings_ResetStats: String { return self._s[2227]! }
+    public var NetworkUsageSettings_ResetStats: String { return self._s[2229]! }
     public func PUSH_MESSAGE_GEOLIVE(_ _1: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[2228]!, self._r[2228]!, [_1])
+        return formatWithArgumentRanges(self._s[2230]!, self._r[2230]!, [_1])
     }
-    public var AccessDenied_LocationTracking: String { return self._s[2229]! }
-    public var Month_GenOctober: String { return self._s[2230]! }
-    public var GroupInfo_InviteLink_RevokeAlert_Revoke: String { return self._s[2231]! }
-    public var EnterPasscode_EnterPasscode: String { return self._s[2232]! }
-    public var MediaPicker_TimerTooltip: String { return self._s[2234]! }
-    public var SharedMedia_TitleAll: String { return self._s[2235]! }
-    public var SettingsSearch_Synonyms_Notifications_ChannelNotificationsExceptions: String { return self._s[2238]! }
-    public var Conversation_RestrictedMedia: String { return self._s[2239]! }
-    public var AccessDenied_PhotosRestricted: String { return self._s[2240]! }
-    public var Privacy_Forwards_WhoCanForward: String { return self._s[2242]! }
-    public var ChangePhoneNumberCode_Called: String { return self._s[2243]! }
+    public var AccessDenied_LocationTracking: String { return self._s[2231]! }
+    public var Month_GenOctober: String { return self._s[2232]! }
+    public var GroupInfo_InviteLink_RevokeAlert_Revoke: String { return self._s[2233]! }
+    public var EnterPasscode_EnterPasscode: String { return self._s[2234]! }
+    public var MediaPicker_TimerTooltip: String { return self._s[2236]! }
+    public var SharedMedia_TitleAll: String { return self._s[2237]! }
+    public var SettingsSearch_Synonyms_Notifications_ChannelNotificationsExceptions: String { return self._s[2240]! }
+    public var Conversation_RestrictedMedia: String { return self._s[2241]! }
+    public var AccessDenied_PhotosRestricted: String { return self._s[2242]! }
+    public var Privacy_Forwards_WhoCanForward: String { return self._s[2244]! }
+    public var ChangePhoneNumberCode_Called: String { return self._s[2245]! }
     public func Notification_PinnedDocumentMessage(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[2244]!, self._r[2244]!, [_0])
+        return formatWithArgumentRanges(self._s[2246]!, self._r[2246]!, [_0])
     }
-    public var Conversation_SavedMessages: String { return self._s[2247]! }
-    public var Your_cards_expiration_month_is_invalid: String { return self._s[2249]! }
-    public var FastTwoStepSetup_PasswordPlaceholder: String { return self._s[2250]! }
+    public var Conversation_SavedMessages: String { return self._s[2249]! }
+    public var Your_cards_expiration_month_is_invalid: String { return self._s[2251]! }
+    public var FastTwoStepSetup_PasswordPlaceholder: String { return self._s[2252]! }
     public func Target_ShareGameConfirmationGroup(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[2252]!, self._r[2252]!, [_0])
-    }
-    public var VoiceOver_Chat_YourMessage: String { return self._s[2253]! }
-    public func VoiceOver_Chat_Title(_ _0: String) -> (String, [(Int, NSRange)]) {
         return formatWithArgumentRanges(self._s[2254]!, self._r[2254]!, [_0])
     }
-    public var ReportPeer_AlertSuccess: String { return self._s[2255]! }
-    public var PhotoEditor_CropAspectRatioOriginal: String { return self._s[2256]! }
+    public var VoiceOver_Chat_YourMessage: String { return self._s[2255]! }
+    public func VoiceOver_Chat_Title(_ _0: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[2256]!, self._r[2256]!, [_0])
+    }
+    public var ReportPeer_AlertSuccess: String { return self._s[2257]! }
+    public var PhotoEditor_CropAspectRatioOriginal: String { return self._s[2258]! }
     public func InstantPage_RelatedArticleAuthorAndDateTitle(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[2257]!, self._r[2257]!, [_1, _2])
+        return formatWithArgumentRanges(self._s[2259]!, self._r[2259]!, [_1, _2])
     }
-    public var Checkout_PasswordEntry_Title: String { return self._s[2258]! }
-    public var PhotoEditor_FadeTool: String { return self._s[2259]! }
-    public var Privacy_ContactsReset: String { return self._s[2260]! }
+    public var Checkout_PasswordEntry_Title: String { return self._s[2260]! }
+    public var PhotoEditor_FadeTool: String { return self._s[2261]! }
+    public var Privacy_ContactsReset: String { return self._s[2262]! }
     public func Channel_AdminLog_MessageRestrictedUntil(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[2262]!, self._r[2262]!, [_0])
+        return formatWithArgumentRanges(self._s[2264]!, self._r[2264]!, [_0])
     }
-    public var Message_PinnedVideoMessage: String { return self._s[2263]! }
-    public var ChatList_Mute: String { return self._s[2264]! }
+    public var Message_PinnedVideoMessage: String { return self._s[2265]! }
+    public var ChatList_Mute: String { return self._s[2266]! }
     public func Wallet_Time_PreciseDate_m5(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[2265]!, self._r[2265]!, [_1, _2, _3])
+        return formatWithArgumentRanges(self._s[2267]!, self._r[2267]!, [_1, _2, _3])
     }
-    public var Permissions_CellularDataText_v0: String { return self._s[2266]! }
-    public var Conversation_PinnedQuiz: String { return self._s[2268]! }
-    public var ShareMenu_SelectChats: String { return self._s[2270]! }
-    public var ChatList_Context_Unarchive: String { return self._s[2271]! }
-    public var MusicPlayer_VoiceNote: String { return self._s[2272]! }
-    public var Conversation_RestrictedText: String { return self._s[2273]! }
-    public var SettingsSearch_Synonyms_Privacy_Data_DeleteDrafts: String { return self._s[2274]! }
-    public var Wallet_Month_GenApril: String { return self._s[2275]! }
-    public var Wallet_Month_ShortMarch: String { return self._s[2276]! }
-    public var TwoStepAuth_DisableSuccess: String { return self._s[2277]! }
-    public var Cache_Videos: String { return self._s[2278]! }
-    public var PrivacySettings_PhoneNumber: String { return self._s[2279]! }
-    public var Wallet_Month_GenFebruary: String { return self._s[2280]! }
-    public var FeatureDisabled_Oops: String { return self._s[2282]! }
-    public var Passport_Address_PostcodePlaceholder: String { return self._s[2283]! }
+    public var Permissions_CellularDataText_v0: String { return self._s[2268]! }
+    public var Conversation_PinnedQuiz: String { return self._s[2270]! }
+    public var ShareMenu_SelectChats: String { return self._s[2272]! }
+    public var ChatList_Context_Unarchive: String { return self._s[2273]! }
+    public var MusicPlayer_VoiceNote: String { return self._s[2274]! }
+    public var Conversation_RestrictedText: String { return self._s[2275]! }
+    public var SettingsSearch_Synonyms_Privacy_Data_DeleteDrafts: String { return self._s[2276]! }
+    public var Wallet_Month_GenApril: String { return self._s[2277]! }
+    public var Wallet_Month_ShortMarch: String { return self._s[2278]! }
+    public var TwoStepAuth_DisableSuccess: String { return self._s[2279]! }
+    public var Cache_Videos: String { return self._s[2280]! }
+    public var PrivacySettings_PhoneNumber: String { return self._s[2281]! }
+    public var Wallet_Month_GenFebruary: String { return self._s[2282]! }
+    public var FeatureDisabled_Oops: String { return self._s[2284]! }
+    public var Passport_Address_PostcodePlaceholder: String { return self._s[2285]! }
     public func AddContact_StatusSuccess(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[2284]!, self._r[2284]!, [_0])
+        return formatWithArgumentRanges(self._s[2286]!, self._r[2286]!, [_0])
     }
-    public var Stickers_GroupStickersHelp: String { return self._s[2286]! }
-    public var GroupPermission_NoSendPolls: String { return self._s[2287]! }
-    public var Wallet_Qr_ScanCode: String { return self._s[2288]! }
-    public var Message_VideoExpired: String { return self._s[2290]! }
-    public var GroupInfo_GroupHistoryVisible: String { return self._s[2291]! }
-    public var Notifications_Badge: String { return self._s[2292]! }
-    public var Wallet_Receive_AddressCopied: String { return self._s[2293]! }
-    public var CreatePoll_OptionPlaceholder: String { return self._s[2294]! }
-    public var Username_InvalidTooShort: String { return self._s[2295]! }
-    public var EnterPasscode_EnterNewPasscodeChange: String { return self._s[2296]! }
-    public var Channel_AdminLog_PinMessages: String { return self._s[2297]! }
-    public var ArchivedChats_IntroTitle3: String { return self._s[2298]! }
+    public var Stickers_GroupStickersHelp: String { return self._s[2288]! }
+    public var GroupPermission_NoSendPolls: String { return self._s[2289]! }
+    public var Wallet_Qr_ScanCode: String { return self._s[2290]! }
+    public var Message_VideoExpired: String { return self._s[2292]! }
+    public var GroupInfo_GroupHistoryVisible: String { return self._s[2293]! }
+    public var Notifications_Badge: String { return self._s[2294]! }
+    public var Wallet_Receive_AddressCopied: String { return self._s[2295]! }
+    public var CreatePoll_OptionPlaceholder: String { return self._s[2296]! }
+    public var Username_InvalidTooShort: String { return self._s[2297]! }
+    public var EnterPasscode_EnterNewPasscodeChange: String { return self._s[2298]! }
+    public var Channel_AdminLog_PinMessages: String { return self._s[2299]! }
+    public var ArchivedChats_IntroTitle3: String { return self._s[2300]! }
     public func Notification_MessageLifetimeRemoved(_ _1: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[2299]!, self._r[2299]!, [_1])
+        return formatWithArgumentRanges(self._s[2301]!, self._r[2301]!, [_1])
     }
-    public var Permissions_SiriAllowInSettings_v0: String { return self._s[2300]! }
-    public var Conversation_DefaultRestrictedText: String { return self._s[2301]! }
-    public var SharedMedia_CategoryDocs: String { return self._s[2304]! }
+    public var Permissions_SiriAllowInSettings_v0: String { return self._s[2302]! }
+    public var Conversation_DefaultRestrictedText: String { return self._s[2303]! }
+    public var SharedMedia_CategoryDocs: String { return self._s[2306]! }
     public func PUSH_MESSAGE_CONTACT(_ _1: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[2305]!, self._r[2305]!, [_1])
+        return formatWithArgumentRanges(self._s[2307]!, self._r[2307]!, [_1])
     }
-    public var Wallet_Send_UninitializedTitle: String { return self._s[2306]! }
-    public var StickerPackActionInfo_ArchivedTitle: String { return self._s[2307]! }
-    public var Privacy_Forwards_NeverLink: String { return self._s[2309]! }
+    public var Wallet_Send_UninitializedTitle: String { return self._s[2308]! }
+    public var StickerPackActionInfo_ArchivedTitle: String { return self._s[2309]! }
+    public var Privacy_Forwards_NeverLink: String { return self._s[2311]! }
     public func Notification_MessageLifetimeChangedOutgoing(_ _1: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[2310]!, self._r[2310]!, [_1])
+        return formatWithArgumentRanges(self._s[2312]!, self._r[2312]!, [_1])
     }
-    public var CheckoutInfo_ErrorShippingNotAvailable: String { return self._s[2311]! }
+    public var CheckoutInfo_ErrorShippingNotAvailable: String { return self._s[2313]! }
     public func Time_MonthOfYear_m12(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[2312]!, self._r[2312]!, [_0])
+        return formatWithArgumentRanges(self._s[2314]!, self._r[2314]!, [_0])
     }
-    public var ChatSettings_PrivateChats: String { return self._s[2313]! }
-    public var SettingsSearch_Synonyms_EditProfile_Logout: String { return self._s[2314]! }
-    public var Conversation_PrivateMessageLinkCopied: String { return self._s[2315]! }
-    public var Channel_UpdatePhotoItem: String { return self._s[2316]! }
-    public var GroupInfo_LeftStatus: String { return self._s[2317]! }
-    public var Watch_MessageView_Forward: String { return self._s[2319]! }
-    public var ReportPeer_ReasonChildAbuse: String { return self._s[2320]! }
-    public var Cache_ClearEmpty: String { return self._s[2322]! }
-    public var Localization_LanguageName: String { return self._s[2323]! }
-    public var Wallet_AccessDenied_Title: String { return self._s[2324]! }
-    public var WebSearch_GIFs: String { return self._s[2325]! }
-    public var Notifications_DisplayNamesOnLockScreenInfoWithLink: String { return self._s[2326]! }
-    public var Wallet_AccessDenied_Settings: String { return self._s[2327]! }
-    public var Username_InvalidStartsWithNumber: String { return self._s[2328]! }
-    public var Common_Back: String { return self._s[2329]! }
-    public var GroupInfo_Permissions_EditingDisabled: String { return self._s[2330]! }
-    public var Passport_Identity_DateOfBirthPlaceholder: String { return self._s[2331]! }
-    public var Wallet_Send_Send: String { return self._s[2332]! }
+    public var ChatSettings_PrivateChats: String { return self._s[2315]! }
+    public var SettingsSearch_Synonyms_EditProfile_Logout: String { return self._s[2316]! }
+    public var Conversation_PrivateMessageLinkCopied: String { return self._s[2317]! }
+    public var Channel_UpdatePhotoItem: String { return self._s[2318]! }
+    public var GroupInfo_LeftStatus: String { return self._s[2319]! }
+    public var Watch_MessageView_Forward: String { return self._s[2321]! }
+    public var ReportPeer_ReasonChildAbuse: String { return self._s[2322]! }
+    public var Cache_ClearEmpty: String { return self._s[2324]! }
+    public var Localization_LanguageName: String { return self._s[2325]! }
+    public var Wallet_AccessDenied_Title: String { return self._s[2326]! }
+    public var WebSearch_GIFs: String { return self._s[2327]! }
+    public var Notifications_DisplayNamesOnLockScreenInfoWithLink: String { return self._s[2328]! }
+    public var Wallet_AccessDenied_Settings: String { return self._s[2329]! }
+    public var Username_InvalidStartsWithNumber: String { return self._s[2330]! }
+    public var Common_Back: String { return self._s[2331]! }
+    public var GroupInfo_Permissions_EditingDisabled: String { return self._s[2332]! }
+    public var Passport_Identity_DateOfBirthPlaceholder: String { return self._s[2333]! }
+    public var Wallet_Send_Send: String { return self._s[2334]! }
     public func PUSH_CHANNEL_MESSAGE_STICKER(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[2334]!, self._r[2334]!, [_1, _2])
+        return formatWithArgumentRanges(self._s[2336]!, self._r[2336]!, [_1, _2])
     }
-    public var Wallet_Info_RefreshErrorTitle: String { return self._s[2335]! }
-    public var Wallet_Month_GenJune: String { return self._s[2336]! }
-    public var Passport_Email_Help: String { return self._s[2337]! }
-    public var Watch_Conversation_Reply: String { return self._s[2339]! }
-    public var Conversation_EditingMessageMediaChange: String { return self._s[2342]! }
-    public var Passport_Identity_IssueDatePlaceholder: String { return self._s[2343]! }
-    public var Channel_BanUser_Unban: String { return self._s[2345]! }
-    public var Channel_EditAdmin_PermissionPostMessages: String { return self._s[2346]! }
-    public var Group_Username_CreatePublicLinkHelp: String { return self._s[2347]! }
-    public var TwoStepAuth_ConfirmEmailCodePlaceholder: String { return self._s[2349]! }
-    public var Wallet_Send_AddressHeader: String { return self._s[2350]! }
-    public var Passport_Identity_Name: String { return self._s[2351]! }
+    public var Wallet_Info_RefreshErrorTitle: String { return self._s[2337]! }
+    public var Wallet_Month_GenJune: String { return self._s[2338]! }
+    public var Passport_Email_Help: String { return self._s[2339]! }
+    public var Watch_Conversation_Reply: String { return self._s[2341]! }
+    public var Conversation_EditingMessageMediaChange: String { return self._s[2344]! }
+    public var Passport_Identity_IssueDatePlaceholder: String { return self._s[2345]! }
+    public var Channel_BanUser_Unban: String { return self._s[2347]! }
+    public var Channel_EditAdmin_PermissionPostMessages: String { return self._s[2348]! }
+    public var Group_Username_CreatePublicLinkHelp: String { return self._s[2349]! }
+    public var TwoStepAuth_ConfirmEmailCodePlaceholder: String { return self._s[2351]! }
+    public var Wallet_Send_AddressHeader: String { return self._s[2352]! }
+    public var Passport_Identity_Name: String { return self._s[2353]! }
     public func Channel_DiscussionGroup_HeaderGroupSet(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[2352]!, self._r[2352]!, [_0])
+        return formatWithArgumentRanges(self._s[2354]!, self._r[2354]!, [_0])
     }
-    public var GroupRemoved_ViewUserInfo: String { return self._s[2353]! }
-    public var Conversation_BlockUser: String { return self._s[2354]! }
-    public var Month_GenJanuary: String { return self._s[2355]! }
-    public var ChatSettings_TextSize: String { return self._s[2356]! }
-    public var Notification_PassportValuePhone: String { return self._s[2357]! }
-    public var MediaPlayer_UnknownArtist: String { return self._s[2358]! }
-    public var Passport_Language_ne: String { return self._s[2359]! }
-    public var Notification_CallBack: String { return self._s[2360]! }
-    public var Wallet_SecureStorageReset_BiometryTouchId: String { return self._s[2361]! }
-    public var TwoStepAuth_EmailHelp: String { return self._s[2362]! }
+    public var GroupRemoved_ViewUserInfo: String { return self._s[2355]! }
+    public var Conversation_BlockUser: String { return self._s[2356]! }
+    public var Month_GenJanuary: String { return self._s[2357]! }
+    public var ChatSettings_TextSize: String { return self._s[2358]! }
+    public var Notification_PassportValuePhone: String { return self._s[2359]! }
+    public var MediaPlayer_UnknownArtist: String { return self._s[2360]! }
+    public var Passport_Language_ne: String { return self._s[2361]! }
+    public var Notification_CallBack: String { return self._s[2362]! }
+    public var Wallet_SecureStorageReset_BiometryTouchId: String { return self._s[2363]! }
+    public var TwoStepAuth_EmailHelp: String { return self._s[2364]! }
     public func Time_YesterdayAt(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[2363]!, self._r[2363]!, [_0])
+        return formatWithArgumentRanges(self._s[2365]!, self._r[2365]!, [_0])
     }
-    public var Channel_Info_Management: String { return self._s[2364]! }
-    public var Passport_FieldIdentityUploadHelp: String { return self._s[2365]! }
-    public var Stickers_FrequentlyUsed: String { return self._s[2367]! }
-    public var Channel_BanUser_PermissionSendMessages: String { return self._s[2368]! }
-    public var Passport_Address_OneOfTypeUtilityBill: String { return self._s[2370]! }
+    public var Channel_Info_Management: String { return self._s[2366]! }
+    public var Passport_FieldIdentityUploadHelp: String { return self._s[2367]! }
+    public var Stickers_FrequentlyUsed: String { return self._s[2369]! }
+    public var Channel_BanUser_PermissionSendMessages: String { return self._s[2370]! }
+    public var Passport_Address_OneOfTypeUtilityBill: String { return self._s[2372]! }
     public func LOCAL_CHANNEL_MESSAGE_FWDS(_ _1: String, _ _2: Int) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[2371]!, self._r[2371]!, [_1, "\(_2)"])
+        return formatWithArgumentRanges(self._s[2373]!, self._r[2373]!, [_1, "\(_2)"])
     }
-    public var TwoFactorSetup_Password_Title: String { return self._s[2372]! }
-    public var Passport_Address_EditResidentialAddress: String { return self._s[2373]! }
-    public var PrivacyPolicy_DeclineTitle: String { return self._s[2374]! }
-    public var CreatePoll_TextHeader: String { return self._s[2375]! }
+    public var TwoFactorSetup_Password_Title: String { return self._s[2374]! }
+    public var Passport_Address_EditResidentialAddress: String { return self._s[2375]! }
+    public var PrivacyPolicy_DeclineTitle: String { return self._s[2376]! }
+    public var CreatePoll_TextHeader: String { return self._s[2377]! }
     public func Checkout_SavePasswordTimeoutAndTouchId(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[2376]!, self._r[2376]!, [_0])
+        return formatWithArgumentRanges(self._s[2378]!, self._r[2378]!, [_0])
     }
-    public var PhotoEditor_QualityMedium: String { return self._s[2377]! }
-    public var InfoPlist_NSMicrophoneUsageDescription: String { return self._s[2378]! }
-    public var Conversation_StatusKickedFromChannel: String { return self._s[2380]! }
-    public var CheckoutInfo_ReceiverInfoName: String { return self._s[2381]! }
-    public var Group_ErrorSendRestrictedStickers: String { return self._s[2382]! }
+    public var PhotoEditor_QualityMedium: String { return self._s[2379]! }
+    public var InfoPlist_NSMicrophoneUsageDescription: String { return self._s[2380]! }
+    public var Conversation_StatusKickedFromChannel: String { return self._s[2382]! }
+    public var CheckoutInfo_ReceiverInfoName: String { return self._s[2383]! }
+    public var Group_ErrorSendRestrictedStickers: String { return self._s[2384]! }
     public func Conversation_RestrictedInlineTimed(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[2383]!, self._r[2383]!, [_0])
+        return formatWithArgumentRanges(self._s[2385]!, self._r[2385]!, [_0])
     }
     public func Channel_AdminLog_MessageTransferedName(_ _1: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[2384]!, self._r[2384]!, [_1])
+        return formatWithArgumentRanges(self._s[2386]!, self._r[2386]!, [_1])
     }
-    public var LogoutOptions_LogOutWalletInfo: String { return self._s[2385]! }
-    public var TwoFactorSetup_Email_SkipConfirmationTitle: String { return self._s[2386]! }
-    public var Conversation_LinkDialogOpen: String { return self._s[2388]! }
-    public var TwoFactorSetup_Hint_Title: String { return self._s[2389]! }
-    public var VoiceOver_Chat_PollNoVotes: String { return self._s[2390]! }
-    public var Settings_Username: String { return self._s[2392]! }
-    public var Conversation_Block: String { return self._s[2394]! }
-    public var Wallpaper_Wallpaper: String { return self._s[2395]! }
-    public var SocksProxySetup_UseProxy: String { return self._s[2397]! }
-    public var Wallet_Send_Confirmation: String { return self._s[2398]! }
-    public var EditTheme_UploadEditedTheme: String { return self._s[2399]! }
-    public var UserInfo_ShareMyContactInfo: String { return self._s[2400]! }
-    public var MessageTimer_Forever: String { return self._s[2401]! }
-    public var Privacy_Calls_WhoCanCallMe: String { return self._s[2402]! }
-    public var PhotoEditor_DiscardChanges: String { return self._s[2403]! }
-    public var AuthSessions_TerminateOtherSessionsHelp: String { return self._s[2404]! }
-    public var Passport_Language_da: String { return self._s[2405]! }
-    public var SocksProxySetup_PortPlaceholder: String { return self._s[2407]! }
+    public var LogoutOptions_LogOutWalletInfo: String { return self._s[2387]! }
+    public var TwoFactorSetup_Email_SkipConfirmationTitle: String { return self._s[2388]! }
+    public var Conversation_LinkDialogOpen: String { return self._s[2390]! }
+    public var TwoFactorSetup_Hint_Title: String { return self._s[2391]! }
+    public var VoiceOver_Chat_PollNoVotes: String { return self._s[2392]! }
+    public var Settings_Username: String { return self._s[2394]! }
+    public var Conversation_Block: String { return self._s[2396]! }
+    public var Wallpaper_Wallpaper: String { return self._s[2397]! }
+    public var SocksProxySetup_UseProxy: String { return self._s[2399]! }
+    public var Wallet_Send_Confirmation: String { return self._s[2400]! }
+    public var EditTheme_UploadEditedTheme: String { return self._s[2401]! }
+    public var UserInfo_ShareMyContactInfo: String { return self._s[2402]! }
+    public var MessageTimer_Forever: String { return self._s[2403]! }
+    public var Privacy_Calls_WhoCanCallMe: String { return self._s[2404]! }
+    public var PhotoEditor_DiscardChanges: String { return self._s[2405]! }
+    public var AuthSessions_TerminateOtherSessionsHelp: String { return self._s[2406]! }
+    public var Passport_Language_da: String { return self._s[2407]! }
+    public var SocksProxySetup_PortPlaceholder: String { return self._s[2409]! }
     public func SecretGIF_NotViewedYet(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[2408]!, self._r[2408]!, [_0])
+        return formatWithArgumentRanges(self._s[2410]!, self._r[2410]!, [_0])
     }
-    public var Passport_Address_EditPassportRegistration: String { return self._s[2409]! }
+    public var Passport_Address_EditPassportRegistration: String { return self._s[2411]! }
     public func Channel_AdminLog_MessageChangedGroupAbout(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[2411]!, self._r[2411]!, [_0])
+        return formatWithArgumentRanges(self._s[2413]!, self._r[2413]!, [_0])
     }
-    public var Settings_AddDevice: String { return self._s[2412]! }
-    public var Passport_Identity_ResidenceCountryPlaceholder: String { return self._s[2414]! }
-    public var AuthSessions_AddDeviceIntro_Text1: String { return self._s[2415]! }
-    public var Conversation_SearchByName_Prefix: String { return self._s[2416]! }
-    public var Conversation_PinnedPoll: String { return self._s[2417]! }
-    public var AuthSessions_AddDeviceIntro_Text2: String { return self._s[2418]! }
-    public var Conversation_EmptyGifPanelPlaceholder: String { return self._s[2419]! }
-    public var AuthSessions_AddDeviceIntro_Text3: String { return self._s[2420]! }
+    public var Settings_AddDevice: String { return self._s[2414]! }
+    public var Passport_Identity_ResidenceCountryPlaceholder: String { return self._s[2416]! }
+    public var AuthSessions_AddDeviceIntro_Text1: String { return self._s[2417]! }
+    public var Conversation_SearchByName_Prefix: String { return self._s[2418]! }
+    public var Conversation_PinnedPoll: String { return self._s[2419]! }
+    public var AuthSessions_AddDeviceIntro_Text2: String { return self._s[2420]! }
+    public var Conversation_EmptyGifPanelPlaceholder: String { return self._s[2421]! }
+    public var AuthSessions_AddDeviceIntro_Text3: String { return self._s[2422]! }
     public func PUSH_ENCRYPTION_ACCEPT(_ _1: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[2421]!, self._r[2421]!, [_1])
+        return formatWithArgumentRanges(self._s[2423]!, self._r[2423]!, [_1])
     }
-    public var WallpaperSearch_ColorPurple: String { return self._s[2422]! }
-    public var Cache_ByPeerHeader: String { return self._s[2423]! }
+    public var WallpaperSearch_ColorPurple: String { return self._s[2424]! }
+    public var Cache_ByPeerHeader: String { return self._s[2425]! }
     public func Conversation_EncryptedPlaceholderTitleIncoming(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[2424]!, self._r[2424]!, [_0])
+        return formatWithArgumentRanges(self._s[2426]!, self._r[2426]!, [_0])
     }
-    public var ChatSettings_AutoDownloadDocuments: String { return self._s[2425]! }
-    public var Appearance_ThemePreview_Chat_3_Text: String { return self._s[2428]! }
-    public var Wallet_Completed_Title: String { return self._s[2429]! }
-    public var Notification_PinnedMessage: String { return self._s[2430]! }
-    public var TwoFactorSetup_EmailVerification_Placeholder: String { return self._s[2431]! }
-    public var VoiceOver_Chat_RecordModeVideoMessage: String { return self._s[2433]! }
-    public var Contacts_SortBy: String { return self._s[2434]! }
+    public var ChatSettings_AutoDownloadDocuments: String { return self._s[2427]! }
+    public var Appearance_ThemePreview_Chat_3_Text: String { return self._s[2430]! }
+    public var Wallet_Completed_Title: String { return self._s[2431]! }
+    public var Notification_PinnedMessage: String { return self._s[2432]! }
+    public var TwoFactorSetup_EmailVerification_Placeholder: String { return self._s[2433]! }
+    public var VoiceOver_Chat_RecordModeVideoMessage: String { return self._s[2435]! }
+    public var Contacts_SortBy: String { return self._s[2436]! }
     public func PUSH_CHANNEL_MESSAGE_NOTEXT(_ _1: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[2435]!, self._r[2435]!, [_1])
+        return formatWithArgumentRanges(self._s[2437]!, self._r[2437]!, [_1])
     }
-    public var Appearance_ColorThemeNight: String { return self._s[2437]! }
+    public var Appearance_ColorThemeNight: String { return self._s[2439]! }
     public func PUSH_MESSAGE_GAME(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[2438]!, self._r[2438]!, [_1, _2])
+        return formatWithArgumentRanges(self._s[2440]!, self._r[2440]!, [_1, _2])
     }
-    public var Call_EncryptionKey_Title: String { return self._s[2439]! }
-    public var Watch_UserInfo_Service: String { return self._s[2440]! }
-    public var SettingsSearch_Synonyms_Data_SaveEditedPhotos: String { return self._s[2442]! }
-    public var Conversation_Unpin: String { return self._s[2444]! }
-    public var CancelResetAccount_Title: String { return self._s[2445]! }
-    public var Map_LiveLocationFor15Minutes: String { return self._s[2446]! }
+    public var Call_EncryptionKey_Title: String { return self._s[2441]! }
+    public var Watch_UserInfo_Service: String { return self._s[2442]! }
+    public var SettingsSearch_Synonyms_Data_SaveEditedPhotos: String { return self._s[2444]! }
+    public var Conversation_Unpin: String { return self._s[2446]! }
+    public var CancelResetAccount_Title: String { return self._s[2447]! }
+    public var Map_LiveLocationFor15Minutes: String { return self._s[2448]! }
     public func Time_PreciseDate_m8(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[2448]!, self._r[2448]!, [_1, _2, _3])
+        return formatWithArgumentRanges(self._s[2450]!, self._r[2450]!, [_1, _2, _3])
     }
-    public var Group_Members_AddMemberBotErrorNotAllowed: String { return self._s[2449]! }
-    public var Appearance_BubbleCorners_Title: String { return self._s[2450]! }
-    public var CallSettings_Title: String { return self._s[2451]! }
-    public var SettingsSearch_Synonyms_Appearance_ChatBackground: String { return self._s[2452]! }
-    public var PasscodeSettings_EncryptDataHelp: String { return self._s[2454]! }
-    public var AutoDownloadSettings_Contacts: String { return self._s[2455]! }
+    public var Group_Members_AddMemberBotErrorNotAllowed: String { return self._s[2451]! }
+    public var Appearance_BubbleCorners_Title: String { return self._s[2452]! }
+    public var CallSettings_Title: String { return self._s[2453]! }
+    public var SettingsSearch_Synonyms_Appearance_ChatBackground: String { return self._s[2454]! }
+    public var PasscodeSettings_EncryptDataHelp: String { return self._s[2456]! }
+    public var AutoDownloadSettings_Contacts: String { return self._s[2457]! }
     public func Channel_AdminLog_MessageRankName(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[2456]!, self._r[2456]!, [_1, _2])
+        return formatWithArgumentRanges(self._s[2458]!, self._r[2458]!, [_1, _2])
     }
-    public var Passport_Identity_DocumentDetails: String { return self._s[2457]! }
-    public var LoginPassword_PasswordHelp: String { return self._s[2458]! }
-    public var SettingsSearch_Synonyms_Data_AutoDownloadUsingWifi: String { return self._s[2459]! }
-    public var PrivacyLastSeenSettings_CustomShareSettings_Delete: String { return self._s[2460]! }
-    public var ChatContextMenu_TextSelectionTip: String { return self._s[2461]! }
-    public var Checkout_TotalPaidAmount: String { return self._s[2462]! }
+    public var Passport_Identity_DocumentDetails: String { return self._s[2459]! }
+    public var LoginPassword_PasswordHelp: String { return self._s[2460]! }
+    public var SettingsSearch_Synonyms_Data_AutoDownloadUsingWifi: String { return self._s[2461]! }
+    public var PrivacyLastSeenSettings_CustomShareSettings_Delete: String { return self._s[2462]! }
+    public var ChatContextMenu_TextSelectionTip: String { return self._s[2463]! }
+    public var Checkout_TotalPaidAmount: String { return self._s[2464]! }
     public func FileSize_KB(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[2463]!, self._r[2463]!, [_0])
+        return formatWithArgumentRanges(self._s[2465]!, self._r[2465]!, [_0])
     }
-    public var ChatState_Updating: String { return self._s[2464]! }
-    public var PasscodeSettings_ChangePasscode: String { return self._s[2465]! }
-    public var Conversation_SecretLinkPreviewAlert: String { return self._s[2467]! }
-    public var Privacy_SecretChatsLinkPreviews: String { return self._s[2468]! }
+    public var ChatState_Updating: String { return self._s[2466]! }
+    public var PasscodeSettings_ChangePasscode: String { return self._s[2467]! }
+    public var Conversation_SecretLinkPreviewAlert: String { return self._s[2469]! }
+    public var Privacy_SecretChatsLinkPreviews: String { return self._s[2470]! }
     public func PUSH_CHANNEL_MESSAGE_DOC(_ _1: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[2469]!, self._r[2469]!, [_1])
+        return formatWithArgumentRanges(self._s[2471]!, self._r[2471]!, [_1])
     }
-    public var VoiceOver_Chat_ReplyToYourMessage: String { return self._s[2470]! }
-    public var Contacts_InviteFriends: String { return self._s[2472]! }
-    public var Map_ChooseLocationTitle: String { return self._s[2473]! }
-    public var Conversation_StopPoll: String { return self._s[2475]! }
+    public var VoiceOver_Chat_ReplyToYourMessage: String { return self._s[2472]! }
+    public var Contacts_InviteFriends: String { return self._s[2474]! }
+    public var Map_ChooseLocationTitle: String { return self._s[2475]! }
+    public var Conversation_StopPoll: String { return self._s[2477]! }
     public func WebSearch_SearchNoResultsDescription(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[2476]!, self._r[2476]!, [_0])
+        return formatWithArgumentRanges(self._s[2478]!, self._r[2478]!, [_0])
     }
-    public var Call_Camera: String { return self._s[2477]! }
-    public var LogoutOptions_ChangePhoneNumberTitle: String { return self._s[2478]! }
-    public var AppWallet_Intro_Text: String { return self._s[2479]! }
-    public var Appearance_BubbleCornersSetting: String { return self._s[2480]! }
-    public var Calls_RatingFeedback: String { return self._s[2481]! }
-    public var GroupInfo_BroadcastListNamePlaceholder: String { return self._s[2483]! }
-    public var Wallet_Alert_OK: String { return self._s[2484]! }
-    public var NotificationsSound_Pulse: String { return self._s[2485]! }
-    public var Watch_LastSeen_Lately: String { return self._s[2486]! }
-    public var ReportGroupLocation_Report: String { return self._s[2489]! }
-    public var Widget_NoUsers: String { return self._s[2490]! }
-    public var Conversation_UnvotePoll: String { return self._s[2491]! }
-    public var SettingsSearch_Synonyms_Privacy_ProfilePhoto: String { return self._s[2493]! }
-    public var Privacy_ProfilePhoto_WhoCanSeeMyPhoto: String { return self._s[2494]! }
-    public var NotificationsSound_Circles: String { return self._s[2495]! }
-    public var PrivacyLastSeenSettings_AlwaysShareWith_Title: String { return self._s[2498]! }
-    public var Wallet_Settings_DeleteWallet: String { return self._s[2499]! }
-    public var TwoStepAuth_RecoveryCodeExpired: String { return self._s[2500]! }
-    public var Proxy_TooltipUnavailable: String { return self._s[2501]! }
-    public var Passport_Identity_CountryPlaceholder: String { return self._s[2503]! }
-    public var GroupInfo_Permissions_SlowmodeInfo: String { return self._s[2505]! }
-    public var Conversation_FileDropbox: String { return self._s[2506]! }
-    public var Notifications_ExceptionsUnmuted: String { return self._s[2507]! }
-    public var Tour_Text3: String { return self._s[2509]! }
-    public var Login_ResetAccountProtected_Title: String { return self._s[2512]! }
-    public var GroupPermission_NoSendMessages: String { return self._s[2513]! }
-    public var WallpaperSearch_ColorTitle: String { return self._s[2514]! }
-    public var ChatAdmins_AllMembersAreAdminsOnHelp: String { return self._s[2515]! }
+    public var Call_Camera: String { return self._s[2479]! }
+    public var LogoutOptions_ChangePhoneNumberTitle: String { return self._s[2480]! }
+    public var AppWallet_Intro_Text: String { return self._s[2481]! }
+    public var Appearance_BubbleCornersSetting: String { return self._s[2482]! }
+    public var Calls_RatingFeedback: String { return self._s[2483]! }
+    public var GroupInfo_BroadcastListNamePlaceholder: String { return self._s[2485]! }
+    public var Wallet_Alert_OK: String { return self._s[2486]! }
+    public var NotificationsSound_Pulse: String { return self._s[2487]! }
+    public var Watch_LastSeen_Lately: String { return self._s[2488]! }
+    public var ReportGroupLocation_Report: String { return self._s[2491]! }
+    public var Widget_NoUsers: String { return self._s[2492]! }
+    public var Conversation_UnvotePoll: String { return self._s[2493]! }
+    public var SettingsSearch_Synonyms_Privacy_ProfilePhoto: String { return self._s[2495]! }
+    public var Privacy_ProfilePhoto_WhoCanSeeMyPhoto: String { return self._s[2496]! }
+    public var NotificationsSound_Circles: String { return self._s[2497]! }
+    public var PrivacyLastSeenSettings_AlwaysShareWith_Title: String { return self._s[2500]! }
+    public var Wallet_Settings_DeleteWallet: String { return self._s[2501]! }
+    public var TwoStepAuth_RecoveryCodeExpired: String { return self._s[2502]! }
+    public var Proxy_TooltipUnavailable: String { return self._s[2503]! }
+    public var Passport_Identity_CountryPlaceholder: String { return self._s[2505]! }
+    public var GroupInfo_Permissions_SlowmodeInfo: String { return self._s[2507]! }
+    public var Conversation_FileDropbox: String { return self._s[2508]! }
+    public var Notifications_ExceptionsUnmuted: String { return self._s[2509]! }
+    public var Tour_Text3: String { return self._s[2511]! }
+    public var Login_ResetAccountProtected_Title: String { return self._s[2514]! }
+    public var GroupPermission_NoSendMessages: String { return self._s[2515]! }
+    public var WallpaperSearch_ColorTitle: String { return self._s[2516]! }
+    public var ChatAdmins_AllMembersAreAdminsOnHelp: String { return self._s[2517]! }
     public func Conversation_LiveLocationYouAnd(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[2517]!, self._r[2517]!, [_0])
+        return formatWithArgumentRanges(self._s[2519]!, self._r[2519]!, [_0])
     }
-    public var GroupInfo_AddParticipantTitle: String { return self._s[2518]! }
-    public var Checkout_ShippingOption_Title: String { return self._s[2519]! }
-    public var ChatSettings_AutoDownloadTitle: String { return self._s[2520]! }
+    public var GroupInfo_AddParticipantTitle: String { return self._s[2520]! }
+    public var Checkout_ShippingOption_Title: String { return self._s[2521]! }
+    public var ChatSettings_AutoDownloadTitle: String { return self._s[2522]! }
     public func DialogList_SingleTypingSuffix(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[2521]!, self._r[2521]!, [_0])
+        return formatWithArgumentRanges(self._s[2523]!, self._r[2523]!, [_0])
     }
     public func ChatSettings_AutoDownloadSettings_TypeVideo(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[2522]!, self._r[2522]!, [_0])
+        return formatWithArgumentRanges(self._s[2524]!, self._r[2524]!, [_0])
     }
-    public var Channel_Management_LabelAdministrator: String { return self._s[2523]! }
-    public var EditTheme_FileReadError: String { return self._s[2524]! }
-    public var OwnershipTransfer_ComeBackLater: String { return self._s[2525]! }
-    public var PrivacyLastSeenSettings_NeverShareWith_Placeholder: String { return self._s[2526]! }
-    public var AutoDownloadSettings_Photos: String { return self._s[2528]! }
-    public var Appearance_PreviewIncomingText: String { return self._s[2529]! }
-    public var ChatList_Context_MarkAllAsRead: String { return self._s[2530]! }
-    public var ChannelInfo_ConfirmLeave: String { return self._s[2531]! }
-    public var MediaPicker_MomentsDateRangeSameMonthYearFormat: String { return self._s[2532]! }
-    public var Passport_Identity_DocumentNumberPlaceholder: String { return self._s[2533]! }
-    public var Channel_AdminLogFilter_EventsNewMembers: String { return self._s[2534]! }
-    public var PasscodeSettings_AutoLock_IfAwayFor_5minutes: String { return self._s[2535]! }
-    public var GroupInfo_SetGroupPhotoStop: String { return self._s[2536]! }
-    public var Notification_SecretChatScreenshot: String { return self._s[2537]! }
-    public var AccessDenied_Wallpapers: String { return self._s[2538]! }
-    public var ChatList_Context_Mute: String { return self._s[2540]! }
-    public var Passport_Address_City: String { return self._s[2541]! }
-    public var InfoPlist_NSPhotoLibraryAddUsageDescription: String { return self._s[2542]! }
-    public var Appearance_ThemeCarouselClassic: String { return self._s[2543]! }
-    public var SocksProxySetup_SecretPlaceholder: String { return self._s[2544]! }
-    public var AccessDenied_LocationDisabled: String { return self._s[2545]! }
-    public var Group_Location_Title: String { return self._s[2546]! }
-    public var SocksProxySetup_HostnamePlaceholder: String { return self._s[2548]! }
-    public var GroupInfo_Sound: String { return self._s[2549]! }
-    public var SettingsSearch_Synonyms_ChatSettings_OpenLinksIn: String { return self._s[2550]! }
-    public var ChannelInfo_ScamChannelWarning: String { return self._s[2551]! }
-    public var Stickers_RemoveFromFavorites: String { return self._s[2552]! }
-    public var Contacts_Title: String { return self._s[2553]! }
-    public var EditTheme_ThemeTemplateAlertText: String { return self._s[2554]! }
-    public var Passport_Language_fr: String { return self._s[2555]! }
-    public var TwoFactorSetup_EmailVerification_Action: String { return self._s[2556]! }
-    public var Notifications_ResetAllNotifications: String { return self._s[2557]! }
-    public var IntentsSettings_SuggestedChats: String { return self._s[2559]! }
-    public var PrivacySettings_SecurityTitle: String { return self._s[2561]! }
-    public var Checkout_NewCard_Title: String { return self._s[2562]! }
-    public var Login_HaveNotReceivedCodeInternal: String { return self._s[2563]! }
-    public var Conversation_ForwardChats: String { return self._s[2564]! }
-    public var Wallet_SecureStorageReset_PasscodeText: String { return self._s[2566]! }
-    public var PasscodeSettings_4DigitCode: String { return self._s[2567]! }
-    public var Settings_FAQ: String { return self._s[2569]! }
-    public var AutoDownloadSettings_DocumentsTitle: String { return self._s[2570]! }
-    public var Conversation_ContextMenuForward: String { return self._s[2571]! }
-    public var VoiceOver_Chat_YourPhoto: String { return self._s[2574]! }
-    public var PrivacyPolicy_Title: String { return self._s[2577]! }
-    public var Notifications_TextTone: String { return self._s[2578]! }
-    public var Profile_CreateNewContact: String { return self._s[2579]! }
-    public var PrivacyPhoneNumberSettings_WhoCanSeeMyPhoneNumber: String { return self._s[2580]! }
-    public var TwoFactorSetup_EmailVerification_Title: String { return self._s[2582]! }
-    public var Call_Speaker: String { return self._s[2583]! }
-    public var AutoNightTheme_AutomaticSection: String { return self._s[2584]! }
-    public var Channel_OwnershipTransfer_EnterPassword: String { return self._s[2586]! }
-    public var Channel_Username_InvalidCharacters: String { return self._s[2587]! }
+    public var Channel_Management_LabelAdministrator: String { return self._s[2525]! }
+    public var EditTheme_FileReadError: String { return self._s[2526]! }
+    public var OwnershipTransfer_ComeBackLater: String { return self._s[2527]! }
+    public var PrivacyLastSeenSettings_NeverShareWith_Placeholder: String { return self._s[2528]! }
+    public var AutoDownloadSettings_Photos: String { return self._s[2530]! }
+    public var Appearance_PreviewIncomingText: String { return self._s[2531]! }
+    public var ChatList_Context_MarkAllAsRead: String { return self._s[2532]! }
+    public var ChannelInfo_ConfirmLeave: String { return self._s[2533]! }
+    public var MediaPicker_MomentsDateRangeSameMonthYearFormat: String { return self._s[2534]! }
+    public var Passport_Identity_DocumentNumberPlaceholder: String { return self._s[2535]! }
+    public var Channel_AdminLogFilter_EventsNewMembers: String { return self._s[2536]! }
+    public var PasscodeSettings_AutoLock_IfAwayFor_5minutes: String { return self._s[2537]! }
+    public var GroupInfo_SetGroupPhotoStop: String { return self._s[2538]! }
+    public var Notification_SecretChatScreenshot: String { return self._s[2539]! }
+    public var AccessDenied_Wallpapers: String { return self._s[2540]! }
+    public var ChatList_Context_Mute: String { return self._s[2542]! }
+    public var Passport_Address_City: String { return self._s[2543]! }
+    public var InfoPlist_NSPhotoLibraryAddUsageDescription: String { return self._s[2544]! }
+    public var Appearance_ThemeCarouselClassic: String { return self._s[2545]! }
+    public var SocksProxySetup_SecretPlaceholder: String { return self._s[2546]! }
+    public var AccessDenied_LocationDisabled: String { return self._s[2547]! }
+    public var Group_Location_Title: String { return self._s[2548]! }
+    public var SocksProxySetup_HostnamePlaceholder: String { return self._s[2550]! }
+    public var GroupInfo_Sound: String { return self._s[2551]! }
+    public var SettingsSearch_Synonyms_ChatSettings_OpenLinksIn: String { return self._s[2552]! }
+    public var ChannelInfo_ScamChannelWarning: String { return self._s[2553]! }
+    public var Stickers_RemoveFromFavorites: String { return self._s[2554]! }
+    public var Contacts_Title: String { return self._s[2555]! }
+    public var EditTheme_ThemeTemplateAlertText: String { return self._s[2556]! }
+    public var Passport_Language_fr: String { return self._s[2557]! }
+    public var TwoFactorSetup_EmailVerification_Action: String { return self._s[2558]! }
+    public var Notifications_ResetAllNotifications: String { return self._s[2559]! }
+    public var IntentsSettings_SuggestedChats: String { return self._s[2561]! }
+    public var PrivacySettings_SecurityTitle: String { return self._s[2563]! }
+    public var Checkout_NewCard_Title: String { return self._s[2564]! }
+    public var Login_HaveNotReceivedCodeInternal: String { return self._s[2565]! }
+    public var Conversation_ForwardChats: String { return self._s[2566]! }
+    public var Wallet_SecureStorageReset_PasscodeText: String { return self._s[2568]! }
+    public var PasscodeSettings_4DigitCode: String { return self._s[2569]! }
+    public var Settings_FAQ: String { return self._s[2571]! }
+    public var AutoDownloadSettings_DocumentsTitle: String { return self._s[2572]! }
+    public var Conversation_ContextMenuForward: String { return self._s[2573]! }
+    public var VoiceOver_Chat_YourPhoto: String { return self._s[2576]! }
+    public var PrivacyPolicy_Title: String { return self._s[2579]! }
+    public var Notifications_TextTone: String { return self._s[2580]! }
+    public var Profile_CreateNewContact: String { return self._s[2581]! }
+    public var PrivacyPhoneNumberSettings_WhoCanSeeMyPhoneNumber: String { return self._s[2582]! }
+    public var TwoFactorSetup_EmailVerification_Title: String { return self._s[2584]! }
+    public var Call_Speaker: String { return self._s[2585]! }
+    public var AutoNightTheme_AutomaticSection: String { return self._s[2586]! }
+    public var Channel_OwnershipTransfer_EnterPassword: String { return self._s[2588]! }
+    public var Channel_Username_InvalidCharacters: String { return self._s[2589]! }
     public func Channel_AdminLog_MessageChangedChannelUsername(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[2588]!, self._r[2588]!, [_0])
+        return formatWithArgumentRanges(self._s[2590]!, self._r[2590]!, [_0])
     }
-    public var AutoDownloadSettings_AutodownloadFiles: String { return self._s[2589]! }
-    public var PrivacySettings_LastSeenTitle: String { return self._s[2590]! }
-    public var Channel_AdminLog_CanInviteUsers: String { return self._s[2591]! }
-    public var SettingsSearch_Synonyms_Privacy_Data_ClearPaymentsInfo: String { return self._s[2592]! }
-    public var OwnershipTransfer_SecurityCheck: String { return self._s[2593]! }
-    public var Conversation_MessageDeliveryFailed: String { return self._s[2594]! }
-    public var Watch_ChatList_NoConversationsText: String { return self._s[2595]! }
-    public var Bot_Unblock: String { return self._s[2596]! }
-    public var TextFormat_Italic: String { return self._s[2597]! }
-    public var WallpaperSearch_ColorPink: String { return self._s[2598]! }
-    public var Settings_About_Help: String { return self._s[2600]! }
-    public var SearchImages_Title: String { return self._s[2601]! }
-    public var Weekday_Wednesday: String { return self._s[2602]! }
-    public var Conversation_ClousStorageInfo_Description1: String { return self._s[2603]! }
-    public var ExplicitContent_AlertTitle: String { return self._s[2604]! }
+    public var AutoDownloadSettings_AutodownloadFiles: String { return self._s[2591]! }
+    public var PrivacySettings_LastSeenTitle: String { return self._s[2592]! }
+    public var Channel_AdminLog_CanInviteUsers: String { return self._s[2593]! }
+    public var SettingsSearch_Synonyms_Privacy_Data_ClearPaymentsInfo: String { return self._s[2594]! }
+    public var OwnershipTransfer_SecurityCheck: String { return self._s[2595]! }
+    public var Conversation_MessageDeliveryFailed: String { return self._s[2596]! }
+    public var Watch_ChatList_NoConversationsText: String { return self._s[2597]! }
+    public var Bot_Unblock: String { return self._s[2598]! }
+    public var TextFormat_Italic: String { return self._s[2599]! }
+    public var WallpaperSearch_ColorPink: String { return self._s[2600]! }
+    public var Settings_About_Help: String { return self._s[2602]! }
+    public var SearchImages_Title: String { return self._s[2603]! }
+    public var Weekday_Wednesday: String { return self._s[2604]! }
+    public var Conversation_ClousStorageInfo_Description1: String { return self._s[2605]! }
+    public var ExplicitContent_AlertTitle: String { return self._s[2606]! }
     public func Time_PreciseDate_m5(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[2605]!, self._r[2605]!, [_1, _2, _3])
+        return formatWithArgumentRanges(self._s[2607]!, self._r[2607]!, [_1, _2, _3])
     }
-    public var Channel_DiscussionGroup_Create: String { return self._s[2606]! }
-    public var Weekday_Thursday: String { return self._s[2607]! }
-    public var Channel_BanUser_PermissionChangeGroupInfo: String { return self._s[2608]! }
-    public var Channel_Members_AddMembersHelp: String { return self._s[2609]! }
+    public var Channel_DiscussionGroup_Create: String { return self._s[2608]! }
+    public var Weekday_Thursday: String { return self._s[2609]! }
+    public var Channel_BanUser_PermissionChangeGroupInfo: String { return self._s[2610]! }
+    public var Channel_Members_AddMembersHelp: String { return self._s[2611]! }
     public func Checkout_SavePasswordTimeout(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[2610]!, self._r[2610]!, [_0])
+        return formatWithArgumentRanges(self._s[2612]!, self._r[2612]!, [_0])
     }
-    public var Channel_DiscussionGroup_LinkGroup: String { return self._s[2611]! }
-    public var SettingsSearch_Synonyms_Notifications_InAppNotificationsVibrate: String { return self._s[2612]! }
-    public var Passport_RequestedInformation: String { return self._s[2613]! }
-    public var Login_PhoneAndCountryHelp: String { return self._s[2614]! }
-    public var Conversation_EncryptionProcessing: String { return self._s[2616]! }
-    public var Notifications_PermissionsSuppressWarningTitle: String { return self._s[2617]! }
-    public var PhotoEditor_EnhanceTool: String { return self._s[2619]! }
-    public var Channel_Setup_Title: String { return self._s[2620]! }
-    public var Conversation_SearchPlaceholder: String { return self._s[2621]! }
-    public var OldChannels_GroupEmptyFormat: String { return self._s[2622]! }
-    public var AccessDenied_LocationAlwaysDenied: String { return self._s[2623]! }
-    public var Checkout_ErrorGeneric: String { return self._s[2624]! }
-    public var Passport_Language_hu: String { return self._s[2625]! }
-    public var GroupPermission_EditingDisabled: String { return self._s[2626]! }
-    public var Wallet_Month_ShortSeptember: String { return self._s[2628]! }
+    public var Channel_DiscussionGroup_LinkGroup: String { return self._s[2613]! }
+    public var SettingsSearch_Synonyms_Notifications_InAppNotificationsVibrate: String { return self._s[2614]! }
+    public var Passport_RequestedInformation: String { return self._s[2615]! }
+    public var Login_PhoneAndCountryHelp: String { return self._s[2616]! }
+    public var Conversation_EncryptionProcessing: String { return self._s[2618]! }
+    public var Notifications_PermissionsSuppressWarningTitle: String { return self._s[2619]! }
+    public var PhotoEditor_EnhanceTool: String { return self._s[2621]! }
+    public var Channel_Setup_Title: String { return self._s[2622]! }
+    public var Conversation_SearchPlaceholder: String { return self._s[2623]! }
+    public var OldChannels_GroupEmptyFormat: String { return self._s[2624]! }
+    public var AccessDenied_LocationAlwaysDenied: String { return self._s[2625]! }
+    public var Checkout_ErrorGeneric: String { return self._s[2626]! }
+    public var Passport_Language_hu: String { return self._s[2627]! }
+    public var GroupPermission_EditingDisabled: String { return self._s[2628]! }
+    public var Wallet_Month_ShortSeptember: String { return self._s[2630]! }
     public func Passport_Identity_UploadOneOfScan(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[2629]!, self._r[2629]!, [_0])
+        return formatWithArgumentRanges(self._s[2631]!, self._r[2631]!, [_0])
     }
     public func PUSH_MESSAGE(_ _1: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[2632]!, self._r[2632]!, [_1])
+        return formatWithArgumentRanges(self._s[2634]!, self._r[2634]!, [_1])
     }
-    public var ChatList_DeleteSavedMessagesConfirmationTitle: String { return self._s[2633]! }
+    public var ChatList_DeleteSavedMessagesConfirmationTitle: String { return self._s[2635]! }
     public func UserInfo_BlockConfirmationTitle(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[2634]!, self._r[2634]!, [_0])
+        return formatWithArgumentRanges(self._s[2636]!, self._r[2636]!, [_0])
     }
-    public var Conversation_CloudStorageInfo_Title: String { return self._s[2635]! }
-    public var Group_Location_Info: String { return self._s[2636]! }
-    public var PhotoEditor_CropAspectRatioSquare: String { return self._s[2637]! }
-    public var Permissions_PeopleNearbyAllow_v0: String { return self._s[2638]! }
+    public var Conversation_CloudStorageInfo_Title: String { return self._s[2637]! }
+    public var Group_Location_Info: String { return self._s[2638]! }
+    public var PhotoEditor_CropAspectRatioSquare: String { return self._s[2639]! }
+    public var Permissions_PeopleNearbyAllow_v0: String { return self._s[2640]! }
     public func Notification_Exceptions_MutedUntil(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[2639]!, self._r[2639]!, [_0])
+        return formatWithArgumentRanges(self._s[2641]!, self._r[2641]!, [_0])
     }
-    public var Conversation_ClearPrivateHistory: String { return self._s[2640]! }
-    public var ContactInfo_PhoneLabelHome: String { return self._s[2641]! }
-    public var Appearance_RemoveThemeConfirmation: String { return self._s[2642]! }
-    public var PrivacySettings_LastSeenContacts: String { return self._s[2643]! }
+    public var Conversation_ClearPrivateHistory: String { return self._s[2642]! }
+    public var ContactInfo_PhoneLabelHome: String { return self._s[2643]! }
+    public var Appearance_RemoveThemeConfirmation: String { return self._s[2644]! }
+    public var PrivacySettings_LastSeenContacts: String { return self._s[2645]! }
     public func ChangePhone_ErrorOccupied(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[2644]!, self._r[2644]!, [_0])
+        return formatWithArgumentRanges(self._s[2646]!, self._r[2646]!, [_0])
     }
     public func Notification_PinnedQuizMessage(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[2645]!, self._r[2645]!, [_0])
+        return formatWithArgumentRanges(self._s[2647]!, self._r[2647]!, [_0])
     }
-    public var Passport_Language_cs: String { return self._s[2646]! }
-    public var Message_PinnedAnimationMessage: String { return self._s[2648]! }
-    public var Passport_Identity_ReverseSideHelp: String { return self._s[2650]! }
-    public var SettingsSearch_Synonyms_Data_Storage_Title: String { return self._s[2651]! }
-    public var Wallet_Info_TransactionTo: String { return self._s[2653]! }
-    public var Stats_ViewsBySourceTitle: String { return self._s[2654]! }
-    public var ChatList_DeleteForEveryoneConfirmationText: String { return self._s[2655]! }
-    public var SettingsSearch_Synonyms_Privacy_PasscodeAndTouchId: String { return self._s[2656]! }
-    public var Embed_PlayingInPIP: String { return self._s[2657]! }
-    public var Appearance_ThemePreview_Chat_3_TextWithLink: String { return self._s[2658]! }
-    public var AutoNightTheme_ScheduleSection: String { return self._s[2659]! }
+    public var Passport_Language_cs: String { return self._s[2648]! }
+    public var Message_PinnedAnimationMessage: String { return self._s[2650]! }
+    public var Passport_Identity_ReverseSideHelp: String { return self._s[2652]! }
+    public var SettingsSearch_Synonyms_Data_Storage_Title: String { return self._s[2653]! }
+    public var Wallet_Info_TransactionTo: String { return self._s[2655]! }
+    public var Stats_ViewsBySourceTitle: String { return self._s[2656]! }
+    public var ChatList_DeleteForEveryoneConfirmationText: String { return self._s[2657]! }
+    public var SettingsSearch_Synonyms_Privacy_PasscodeAndTouchId: String { return self._s[2658]! }
+    public var Embed_PlayingInPIP: String { return self._s[2659]! }
+    public var Appearance_ThemePreview_Chat_3_TextWithLink: String { return self._s[2660]! }
+    public var AutoNightTheme_ScheduleSection: String { return self._s[2661]! }
     public func Call_EmojiDescription(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[2660]!, self._r[2660]!, [_0])
+        return formatWithArgumentRanges(self._s[2662]!, self._r[2662]!, [_0])
     }
-    public var MediaPicker_LivePhotoDescription: String { return self._s[2661]! }
+    public var MediaPicker_LivePhotoDescription: String { return self._s[2663]! }
     public func Channel_AdminLog_MessageRestrictedName(_ _1: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[2662]!, self._r[2662]!, [_1])
+        return formatWithArgumentRanges(self._s[2664]!, self._r[2664]!, [_1])
     }
-    public var Notification_PaymentSent: String { return self._s[2663]! }
-    public var PhotoEditor_CurvesGreen: String { return self._s[2664]! }
-    public var Notification_Exceptions_PreviewAlwaysOff: String { return self._s[2665]! }
-    public var AutoNightTheme_System: String { return self._s[2666]! }
-    public var SaveIncomingPhotosSettings_Title: String { return self._s[2667]! }
-    public var CreatePoll_QuizTitle: String { return self._s[2668]! }
-    public var NotificationSettings_ShowNotificationsAllAccounts: String { return self._s[2669]! }
-    public var VoiceOver_Chat_PagePreview: String { return self._s[2670]! }
+    public var Notification_PaymentSent: String { return self._s[2665]! }
+    public var PhotoEditor_CurvesGreen: String { return self._s[2666]! }
+    public var Notification_Exceptions_PreviewAlwaysOff: String { return self._s[2667]! }
+    public var AutoNightTheme_System: String { return self._s[2668]! }
+    public var SaveIncomingPhotosSettings_Title: String { return self._s[2669]! }
+    public var CreatePoll_QuizTitle: String { return self._s[2670]! }
+    public var NotificationSettings_ShowNotificationsAllAccounts: String { return self._s[2671]! }
+    public var VoiceOver_Chat_PagePreview: String { return self._s[2672]! }
     public func PUSH_MESSAGE_SCREENSHOT(_ _1: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[2673]!, self._r[2673]!, [_1])
-    }
-    public func PUSH_MESSAGE_PHOTO_SECRET(_ _1: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[2674]!, self._r[2674]!, [_1])
-    }
-    public func ApplyLanguage_UnsufficientDataText(_ _1: String) -> (String, [(Int, NSRange)]) {
         return formatWithArgumentRanges(self._s[2675]!, self._r[2675]!, [_1])
     }
-    public var NetworkUsageSettings_CallDataSection: String { return self._s[2677]! }
-    public var PasscodeSettings_HelpTop: String { return self._s[2678]! }
-    public var Conversation_WalletRequiredTitle: String { return self._s[2679]! }
-    public var PeerInfo_AddToContacts: String { return self._s[2680]! }
-    public var Group_OwnershipTransfer_ErrorAdminsTooMuch: String { return self._s[2681]! }
-    public var Passport_Address_TypeRentalAgreement: String { return self._s[2682]! }
-    public var EditTheme_ShortLink: String { return self._s[2683]! }
-    public var Theme_Colors_ColorWallpaperWarning: String { return self._s[2684]! }
-    public var ProxyServer_VoiceOver_Active: String { return self._s[2685]! }
-    public var ReportPeer_ReasonOther_Placeholder: String { return self._s[2686]! }
-    public var CheckoutInfo_ErrorPhoneInvalid: String { return self._s[2687]! }
-    public var Call_Accept: String { return self._s[2689]! }
-    public var GroupRemoved_RemoveInfo: String { return self._s[2690]! }
-    public var Month_GenMarch: String { return self._s[2692]! }
-    public var PhotoEditor_ShadowsTool: String { return self._s[2693]! }
-    public var LoginPassword_Title: String { return self._s[2694]! }
-    public var Call_End: String { return self._s[2695]! }
-    public var Watch_Conversation_GroupInfo: String { return self._s[2696]! }
-    public var VoiceOver_Chat_Contact: String { return self._s[2697]! }
-    public var EditTheme_Create_Preview_IncomingText: String { return self._s[2698]! }
-    public var CallSettings_Always: String { return self._s[2699]! }
-    public var CallFeedback_Success: String { return self._s[2700]! }
-    public var TwoStepAuth_SetupHint: String { return self._s[2701]! }
+    public func PUSH_MESSAGE_PHOTO_SECRET(_ _1: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[2676]!, self._r[2676]!, [_1])
+    }
+    public func ApplyLanguage_UnsufficientDataText(_ _1: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[2677]!, self._r[2677]!, [_1])
+    }
+    public var NetworkUsageSettings_CallDataSection: String { return self._s[2679]! }
+    public var PasscodeSettings_HelpTop: String { return self._s[2680]! }
+    public var Conversation_WalletRequiredTitle: String { return self._s[2681]! }
+    public var PeerInfo_AddToContacts: String { return self._s[2682]! }
+    public var Group_OwnershipTransfer_ErrorAdminsTooMuch: String { return self._s[2683]! }
+    public var Passport_Address_TypeRentalAgreement: String { return self._s[2684]! }
+    public var EditTheme_ShortLink: String { return self._s[2685]! }
+    public var Theme_Colors_ColorWallpaperWarning: String { return self._s[2686]! }
+    public var ProxyServer_VoiceOver_Active: String { return self._s[2687]! }
+    public var ReportPeer_ReasonOther_Placeholder: String { return self._s[2688]! }
+    public var CheckoutInfo_ErrorPhoneInvalid: String { return self._s[2689]! }
+    public var Call_Accept: String { return self._s[2691]! }
+    public var GroupRemoved_RemoveInfo: String { return self._s[2692]! }
+    public var Month_GenMarch: String { return self._s[2694]! }
+    public var PhotoEditor_ShadowsTool: String { return self._s[2695]! }
+    public var LoginPassword_Title: String { return self._s[2696]! }
+    public var Call_End: String { return self._s[2697]! }
+    public var Watch_Conversation_GroupInfo: String { return self._s[2698]! }
+    public var VoiceOver_Chat_Contact: String { return self._s[2699]! }
+    public var EditTheme_Create_Preview_IncomingText: String { return self._s[2700]! }
+    public var CallSettings_Always: String { return self._s[2701]! }
+    public var CallFeedback_Success: String { return self._s[2702]! }
+    public var TwoStepAuth_SetupHint: String { return self._s[2703]! }
     public func AddContact_ContactWillBeSharedAfterMutual(_ _1: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[2702]!, self._r[2702]!, [_1])
+        return formatWithArgumentRanges(self._s[2704]!, self._r[2704]!, [_1])
     }
-    public var ConversationProfile_UsersTooMuchError: String { return self._s[2703]! }
-    public var PeerInfo_ButtonAddMember: String { return self._s[2704]! }
-    public var Login_PhoneTitle: String { return self._s[2705]! }
-    public var Passport_FieldPhoneHelp: String { return self._s[2706]! }
-    public var Weekday_ShortSunday: String { return self._s[2707]! }
-    public var Passport_InfoFAQ_URL: String { return self._s[2708]! }
-    public var ContactInfo_Job: String { return self._s[2710]! }
-    public var UserInfo_InviteBotToGroup: String { return self._s[2711]! }
-    public var Appearance_ThemeCarouselNightBlue: String { return self._s[2712]! }
-    public var CreatePoll_QuizTip: String { return self._s[2713]! }
-    public var TwoFactorSetup_Email_Text: String { return self._s[2714]! }
-    public var TwoStepAuth_PasswordRemovePassportConfirmation: String { return self._s[2715]! }
-    public var Invite_ChannelsTooMuch: String { return self._s[2716]! }
-    public var Wallet_Send_ConfirmationConfirm: String { return self._s[2717]! }
-    public var Wallet_TransactionInfo_OtherFeeInfo: String { return self._s[2718]! }
-    public var SettingsSearch_Synonyms_Notifications_InAppNotificationsPreview: String { return self._s[2719]! }
-    public var Wallet_Receive_AmountText: String { return self._s[2720]! }
-    public var Passport_DeletePersonalDetailsConfirmation: String { return self._s[2721]! }
-    public var CallFeedback_ReasonNoise: String { return self._s[2722]! }
-    public var Appearance_AppIconDefault: String { return self._s[2724]! }
-    public var Passport_Identity_AddInternalPassport: String { return self._s[2725]! }
-    public var MediaPicker_AddCaption: String { return self._s[2726]! }
-    public var CallSettings_TabIconDescription: String { return self._s[2727]! }
+    public var ConversationProfile_UsersTooMuchError: String { return self._s[2705]! }
+    public var PeerInfo_ButtonAddMember: String { return self._s[2706]! }
+    public var Login_PhoneTitle: String { return self._s[2707]! }
+    public var Passport_FieldPhoneHelp: String { return self._s[2708]! }
+    public var Weekday_ShortSunday: String { return self._s[2709]! }
+    public var Passport_InfoFAQ_URL: String { return self._s[2710]! }
+    public var ContactInfo_Job: String { return self._s[2712]! }
+    public var UserInfo_InviteBotToGroup: String { return self._s[2713]! }
+    public var Appearance_ThemeCarouselNightBlue: String { return self._s[2714]! }
+    public var CreatePoll_QuizTip: String { return self._s[2715]! }
+    public var TwoFactorSetup_Email_Text: String { return self._s[2716]! }
+    public var TwoStepAuth_PasswordRemovePassportConfirmation: String { return self._s[2717]! }
+    public var Invite_ChannelsTooMuch: String { return self._s[2718]! }
+    public var Wallet_Send_ConfirmationConfirm: String { return self._s[2719]! }
+    public var Wallet_TransactionInfo_OtherFeeInfo: String { return self._s[2720]! }
+    public var SettingsSearch_Synonyms_Notifications_InAppNotificationsPreview: String { return self._s[2721]! }
+    public var Wallet_Receive_AmountText: String { return self._s[2722]! }
+    public var Passport_DeletePersonalDetailsConfirmation: String { return self._s[2723]! }
+    public var CallFeedback_ReasonNoise: String { return self._s[2724]! }
+    public var Appearance_AppIconDefault: String { return self._s[2726]! }
+    public var Passport_Identity_AddInternalPassport: String { return self._s[2727]! }
+    public var MediaPicker_AddCaption: String { return self._s[2728]! }
+    public var CallSettings_TabIconDescription: String { return self._s[2729]! }
     public func VoiceOver_Chat_Caption(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[2728]!, self._r[2728]!, [_0])
-    }
-    public var IntentsSettings_SuggestedChatsGroups: String { return self._s[2729]! }
-    public func Map_SearchNoResultsDescription(_ _0: String) -> (String, [(Int, NSRange)]) {
         return formatWithArgumentRanges(self._s[2730]!, self._r[2730]!, [_0])
     }
-    public var ChatList_UndoArchiveHiddenTitle: String { return self._s[2732]! }
-    public var Privacy_GroupsAndChannels_AlwaysAllow: String { return self._s[2733]! }
-    public var Passport_Identity_TypePersonalDetails: String { return self._s[2734]! }
-    public var DialogList_SearchSectionRecent: String { return self._s[2735]! }
-    public var PrivacyPolicy_DeclineMessage: String { return self._s[2736]! }
-    public var CreatePoll_Anonymous: String { return self._s[2737]! }
-    public var LogoutOptions_ClearCacheText: String { return self._s[2740]! }
-    public var LastSeen_WithinAWeek: String { return self._s[2741]! }
-    public var ChannelMembers_GroupAdminsTitle: String { return self._s[2742]! }
-    public var Conversation_CloudStorage_ChatStatus: String { return self._s[2744]! }
-    public var VoiceOver_Media_PlaybackRateNormal: String { return self._s[2745]! }
+    public var IntentsSettings_SuggestedChatsGroups: String { return self._s[2731]! }
+    public func Map_SearchNoResultsDescription(_ _0: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[2732]!, self._r[2732]!, [_0])
+    }
+    public var ChatList_UndoArchiveHiddenTitle: String { return self._s[2734]! }
+    public var Privacy_GroupsAndChannels_AlwaysAllow: String { return self._s[2735]! }
+    public var Passport_Identity_TypePersonalDetails: String { return self._s[2736]! }
+    public var DialogList_SearchSectionRecent: String { return self._s[2737]! }
+    public var PrivacyPolicy_DeclineMessage: String { return self._s[2738]! }
+    public var CreatePoll_Anonymous: String { return self._s[2739]! }
+    public var LogoutOptions_ClearCacheText: String { return self._s[2742]! }
+    public var LastSeen_WithinAWeek: String { return self._s[2743]! }
+    public var ChannelMembers_GroupAdminsTitle: String { return self._s[2744]! }
+    public var Conversation_CloudStorage_ChatStatus: String { return self._s[2746]! }
+    public var VoiceOver_Media_PlaybackRateNormal: String { return self._s[2747]! }
     public func AddContact_SharedContactExceptionInfo(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[2746]!, self._r[2746]!, [_0])
+        return formatWithArgumentRanges(self._s[2748]!, self._r[2748]!, [_0])
     }
-    public var Passport_Address_TypeResidentialAddress: String { return self._s[2747]! }
-    public var Conversation_StatusLeftGroup: String { return self._s[2748]! }
-    public var SocksProxySetup_ProxyDetailsTitle: String { return self._s[2749]! }
-    public var SettingsSearch_Synonyms_Calls_Title: String { return self._s[2751]! }
-    public var GroupPermission_AddSuccess: String { return self._s[2752]! }
-    public var PhotoEditor_BlurToolRadial: String { return self._s[2754]! }
-    public var Conversation_ContextMenuCopy: String { return self._s[2755]! }
-    public var AccessDenied_CallMicrophone: String { return self._s[2756]! }
+    public var Passport_Address_TypeResidentialAddress: String { return self._s[2749]! }
+    public var Conversation_StatusLeftGroup: String { return self._s[2750]! }
+    public var SocksProxySetup_ProxyDetailsTitle: String { return self._s[2751]! }
+    public var SettingsSearch_Synonyms_Calls_Title: String { return self._s[2753]! }
+    public var GroupPermission_AddSuccess: String { return self._s[2754]! }
+    public var PhotoEditor_BlurToolRadial: String { return self._s[2756]! }
+    public var Conversation_ContextMenuCopy: String { return self._s[2757]! }
+    public var AccessDenied_CallMicrophone: String { return self._s[2758]! }
     public func Time_PreciseDate_m2(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[2757]!, self._r[2757]!, [_1, _2, _3])
+        return formatWithArgumentRanges(self._s[2759]!, self._r[2759]!, [_1, _2, _3])
     }
-    public var Login_InvalidFirstNameError: String { return self._s[2758]! }
-    public var Notifications_Badge_CountUnreadMessages_InfoOn: String { return self._s[2759]! }
-    public var Checkout_PaymentMethod_New: String { return self._s[2760]! }
-    public var ShareMenu_CopyShareLinkGame: String { return self._s[2761]! }
-    public var PhotoEditor_QualityTool: String { return self._s[2762]! }
-    public var Login_SendCodeViaSms: String { return self._s[2763]! }
-    public var SettingsSearch_Synonyms_Privacy_DeleteAccountIfAwayFor: String { return self._s[2764]! }
-    public var Chat_SlowmodeAttachmentLimitReached: String { return self._s[2765]! }
-    public var Wallet_Receive_CopyAddress: String { return self._s[2766]! }
-    public var Login_EmailNotConfiguredError: String { return self._s[2767]! }
-    public var SocksProxySetup_Status: String { return self._s[2768]! }
-    public var Conversation_ScheduleMessage_SendWhenOnline: String { return self._s[2769]! }
-    public var PrivacyPolicy_Accept: String { return self._s[2770]! }
-    public var Notifications_ExceptionsMessagePlaceholder: String { return self._s[2771]! }
-    public var Appearance_AppIconClassicX: String { return self._s[2772]! }
+    public var Login_InvalidFirstNameError: String { return self._s[2760]! }
+    public var Notifications_Badge_CountUnreadMessages_InfoOn: String { return self._s[2761]! }
+    public var Checkout_PaymentMethod_New: String { return self._s[2762]! }
+    public var ShareMenu_CopyShareLinkGame: String { return self._s[2763]! }
+    public var PhotoEditor_QualityTool: String { return self._s[2764]! }
+    public var Login_SendCodeViaSms: String { return self._s[2765]! }
+    public var SettingsSearch_Synonyms_Privacy_DeleteAccountIfAwayFor: String { return self._s[2766]! }
+    public var Chat_SlowmodeAttachmentLimitReached: String { return self._s[2767]! }
+    public var Wallet_Receive_CopyAddress: String { return self._s[2768]! }
+    public var Login_EmailNotConfiguredError: String { return self._s[2769]! }
+    public var SocksProxySetup_Status: String { return self._s[2770]! }
+    public var Conversation_ScheduleMessage_SendWhenOnline: String { return self._s[2771]! }
+    public var PrivacyPolicy_Accept: String { return self._s[2772]! }
+    public var Notifications_ExceptionsMessagePlaceholder: String { return self._s[2773]! }
+    public var Appearance_AppIconClassicX: String { return self._s[2774]! }
     public func PUSH_CHAT_MESSAGE_TEXT(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[2773]!, self._r[2773]!, [_1, _2, _3])
+        return formatWithArgumentRanges(self._s[2775]!, self._r[2775]!, [_1, _2, _3])
     }
-    public var OwnershipTransfer_SecurityRequirements: String { return self._s[2774]! }
-    public var InfoPlist_NSLocationAlwaysUsageDescription: String { return self._s[2776]! }
-    public var AutoNightTheme_Automatic: String { return self._s[2777]! }
-    public var Channel_Username_InvalidStartsWithNumber: String { return self._s[2778]! }
-    public var Privacy_ContactsSyncHelp: String { return self._s[2779]! }
-    public var Cache_Help: String { return self._s[2780]! }
-    public var Group_ErrorAccessDenied: String { return self._s[2781]! }
-    public var Passport_Language_fa: String { return self._s[2782]! }
-    public var Wallet_Intro_Text: String { return self._s[2783]! }
-    public var Login_ResetAccountProtected_TimerTitle: String { return self._s[2784]! }
-    public var VoiceOver_Chat_YourVideoMessage: String { return self._s[2785]! }
-    public var PrivacySettings_LastSeen: String { return self._s[2786]! }
+    public var OwnershipTransfer_SecurityRequirements: String { return self._s[2776]! }
+    public var InfoPlist_NSLocationAlwaysUsageDescription: String { return self._s[2778]! }
+    public var AutoNightTheme_Automatic: String { return self._s[2779]! }
+    public var Channel_Username_InvalidStartsWithNumber: String { return self._s[2780]! }
+    public var Privacy_ContactsSyncHelp: String { return self._s[2781]! }
+    public var Cache_Help: String { return self._s[2782]! }
+    public var Group_ErrorAccessDenied: String { return self._s[2783]! }
+    public var Passport_Language_fa: String { return self._s[2784]! }
+    public var Wallet_Intro_Text: String { return self._s[2785]! }
+    public var Login_ResetAccountProtected_TimerTitle: String { return self._s[2786]! }
+    public var VoiceOver_Chat_YourVideoMessage: String { return self._s[2787]! }
+    public var PrivacySettings_LastSeen: String { return self._s[2788]! }
     public func DialogList_MultipleTyping(_ _0: String, _ _1: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[2787]!, self._r[2787]!, [_0, _1])
+        return formatWithArgumentRanges(self._s[2789]!, self._r[2789]!, [_0, _1])
     }
-    public var Wallet_Configuration_Apply: String { return self._s[2791]! }
-    public var Preview_SaveGif: String { return self._s[2792]! }
-    public var SettingsSearch_Synonyms_Privacy_TwoStepAuth: String { return self._s[2793]! }
-    public var Profile_About: String { return self._s[2794]! }
-    public var Channel_About_Placeholder: String { return self._s[2795]! }
-    public var Login_InfoTitle: String { return self._s[2796]! }
+    public var Wallet_Configuration_Apply: String { return self._s[2793]! }
+    public var Preview_SaveGif: String { return self._s[2794]! }
+    public var SettingsSearch_Synonyms_Privacy_TwoStepAuth: String { return self._s[2795]! }
+    public var Profile_About: String { return self._s[2796]! }
+    public var Channel_About_Placeholder: String { return self._s[2797]! }
+    public var Login_InfoTitle: String { return self._s[2798]! }
     public func TwoStepAuth_SetupPendingEmail(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[2797]!, self._r[2797]!, [_0])
+        return formatWithArgumentRanges(self._s[2799]!, self._r[2799]!, [_0])
     }
-    public var EditTheme_Expand_Preview_IncomingReplyText: String { return self._s[2798]! }
-    public var Watch_Suggestion_CantTalk: String { return self._s[2800]! }
-    public var ContactInfo_Title: String { return self._s[2801]! }
-    public var Media_ShareThisVideo: String { return self._s[2802]! }
-    public var Weekday_ShortFriday: String { return self._s[2803]! }
-    public var AccessDenied_Contacts: String { return self._s[2805]! }
-    public var Notification_CallIncomingShort: String { return self._s[2806]! }
-    public var Group_Setup_TypePublic: String { return self._s[2807]! }
-    public var Notifications_MessageNotificationsExceptions: String { return self._s[2808]! }
-    public var Notifications_Badge_IncludeChannels: String { return self._s[2809]! }
-    public var Notifications_MessageNotificationsPreview: String { return self._s[2812]! }
-    public var ConversationProfile_ErrorCreatingConversation: String { return self._s[2813]! }
-    public var Group_ErrorAddTooMuchBots: String { return self._s[2814]! }
-    public var Privacy_GroupsAndChannels_CustomShareHelp: String { return self._s[2815]! }
-    public var Permissions_CellularDataAllowInSettings_v0: String { return self._s[2816]! }
+    public var EditTheme_Expand_Preview_IncomingReplyText: String { return self._s[2800]! }
+    public var Watch_Suggestion_CantTalk: String { return self._s[2802]! }
+    public var ContactInfo_Title: String { return self._s[2803]! }
+    public var Media_ShareThisVideo: String { return self._s[2804]! }
+    public var Weekday_ShortFriday: String { return self._s[2805]! }
+    public var AccessDenied_Contacts: String { return self._s[2807]! }
+    public var Notification_CallIncomingShort: String { return self._s[2808]! }
+    public var Group_Setup_TypePublic: String { return self._s[2809]! }
+    public var Notifications_MessageNotificationsExceptions: String { return self._s[2810]! }
+    public var Notifications_Badge_IncludeChannels: String { return self._s[2811]! }
+    public var Notifications_MessageNotificationsPreview: String { return self._s[2814]! }
+    public var ConversationProfile_ErrorCreatingConversation: String { return self._s[2815]! }
+    public var Group_ErrorAddTooMuchBots: String { return self._s[2816]! }
+    public var Privacy_GroupsAndChannels_CustomShareHelp: String { return self._s[2817]! }
+    public var Permissions_CellularDataAllowInSettings_v0: String { return self._s[2818]! }
     public func Wallet_SecureStorageChanged_BiometryText(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[2817]!, self._r[2817]!, [_0])
+        return formatWithArgumentRanges(self._s[2819]!, self._r[2819]!, [_0])
     }
-    public var DialogList_Typing: String { return self._s[2818]! }
-    public var CallFeedback_IncludeLogs: String { return self._s[2820]! }
-    public var Checkout_Phone: String { return self._s[2822]! }
-    public var Login_InfoFirstNamePlaceholder: String { return self._s[2825]! }
-    public var Privacy_Calls_Integration: String { return self._s[2826]! }
-    public var Notifications_PermissionsAllow: String { return self._s[2827]! }
-    public var TwoStepAuth_AddHintDescription: String { return self._s[2833]! }
-    public var Settings_ChatSettings: String { return self._s[2834]! }
-    public var Conversation_SendingOptionsTooltip: String { return self._s[2835]! }
+    public var DialogList_Typing: String { return self._s[2820]! }
+    public var CallFeedback_IncludeLogs: String { return self._s[2822]! }
+    public var Checkout_Phone: String { return self._s[2824]! }
+    public var Login_InfoFirstNamePlaceholder: String { return self._s[2827]! }
+    public var Privacy_Calls_Integration: String { return self._s[2828]! }
+    public var Notifications_PermissionsAllow: String { return self._s[2829]! }
+    public var TwoStepAuth_AddHintDescription: String { return self._s[2835]! }
+    public var Settings_ChatSettings: String { return self._s[2836]! }
+    public var Conversation_SendingOptionsTooltip: String { return self._s[2837]! }
     public func UserInfo_StartSecretChatConfirmation(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[2837]!, self._r[2837]!, [_0])
+        return formatWithArgumentRanges(self._s[2839]!, self._r[2839]!, [_0])
     }
     public func Channel_AdminLog_MessageInvitedNameUsername(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[2838]!, self._r[2838]!, [_1, _2])
+        return formatWithArgumentRanges(self._s[2840]!, self._r[2840]!, [_1, _2])
     }
-    public var GroupRemoved_DeleteUser: String { return self._s[2840]! }
+    public var GroupRemoved_DeleteUser: String { return self._s[2842]! }
     public func Channel_AdminLog_PollStopped(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[2841]!, self._r[2841]!, [_0])
+        return formatWithArgumentRanges(self._s[2843]!, self._r[2843]!, [_0])
     }
     public func PUSH_MESSAGE_PHOTO(_ _1: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[2842]!, self._r[2842]!, [_1])
+        return formatWithArgumentRanges(self._s[2844]!, self._r[2844]!, [_1])
     }
-    public var Login_ContinueWithLocalization: String { return self._s[2843]! }
-    public var Watch_Message_ForwardedFrom: String { return self._s[2844]! }
-    public var TwoStepAuth_EnterEmailCode: String { return self._s[2846]! }
-    public var Conversation_Unblock: String { return self._s[2847]! }
-    public var PrivacySettings_DataSettings: String { return self._s[2848]! }
-    public var WallpaperPreview_PatternPaternApply: String { return self._s[2849]! }
-    public var Group_PublicLink_Info: String { return self._s[2850]! }
+    public var Login_ContinueWithLocalization: String { return self._s[2845]! }
+    public var Watch_Message_ForwardedFrom: String { return self._s[2846]! }
+    public var TwoStepAuth_EnterEmailCode: String { return self._s[2848]! }
+    public var Conversation_Unblock: String { return self._s[2849]! }
+    public var PrivacySettings_DataSettings: String { return self._s[2850]! }
+    public var WallpaperPreview_PatternPaternApply: String { return self._s[2851]! }
+    public var Group_PublicLink_Info: String { return self._s[2852]! }
     public func Wallet_Time_PreciseDate_m1(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[2851]!, self._r[2851]!, [_1, _2, _3])
+        return formatWithArgumentRanges(self._s[2853]!, self._r[2853]!, [_1, _2, _3])
     }
-    public var Notifications_InAppNotificationsVibrate: String { return self._s[2852]! }
+    public var Notifications_InAppNotificationsVibrate: String { return self._s[2854]! }
     public func Privacy_GroupsAndChannels_InviteToChannelError(_ _0: String, _ _1: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[2853]!, self._r[2853]!, [_0, _1])
+        return formatWithArgumentRanges(self._s[2855]!, self._r[2855]!, [_0, _1])
     }
-    public var OldChannels_ChannelsHeader: String { return self._s[2855]! }
-    public var Wallet_RestoreFailed_CreateWallet: String { return self._s[2856]! }
-    public var PrivacySettings_Passcode: String { return self._s[2858]! }
-    public var Call_Mute: String { return self._s[2859]! }
-    public var Wallet_Weekday_Yesterday: String { return self._s[2860]! }
-    public var Passport_Language_dz: String { return self._s[2861]! }
-    public var Wallet_Receive_AmountHeader: String { return self._s[2862]! }
-    public var Wallet_TransactionInfo_OtherFeeInfoUrl: String { return self._s[2863]! }
-    public var Passport_Language_tk: String { return self._s[2864]! }
+    public var OldChannels_ChannelsHeader: String { return self._s[2857]! }
+    public var Wallet_RestoreFailed_CreateWallet: String { return self._s[2858]! }
+    public var PrivacySettings_Passcode: String { return self._s[2860]! }
+    public var Call_Mute: String { return self._s[2861]! }
+    public var Wallet_Weekday_Yesterday: String { return self._s[2862]! }
+    public var Passport_Language_dz: String { return self._s[2863]! }
+    public var Wallet_Receive_AmountHeader: String { return self._s[2864]! }
+    public var Wallet_TransactionInfo_OtherFeeInfoUrl: String { return self._s[2865]! }
+    public var Passport_Language_tk: String { return self._s[2866]! }
     public func Login_EmailCodeSubject(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[2865]!, self._r[2865]!, [_0])
+        return formatWithArgumentRanges(self._s[2867]!, self._r[2867]!, [_0])
     }
-    public var Settings_Search: String { return self._s[2866]! }
-    public var Wallet_Month_ShortFebruary: String { return self._s[2867]! }
-    public var InfoPlist_NSPhotoLibraryUsageDescription: String { return self._s[2868]! }
-    public var Wallet_Configuration_SourceJSON: String { return self._s[2869]! }
-    public var Conversation_ContextMenuReply: String { return self._s[2870]! }
-    public var WallpaperSearch_ColorBrown: String { return self._s[2871]! }
-    public var Chat_AttachmentMultipleForwardDisabled: String { return self._s[2872]! }
-    public var Tour_Title1: String { return self._s[2873]! }
-    public var Wallet_Alert_Cancel: String { return self._s[2874]! }
-    public var Conversation_ClearGroupHistory: String { return self._s[2876]! }
-    public var Wallet_TransactionInfo_RecipientHeader: String { return self._s[2877]! }
-    public var WallpaperPreview_Motion: String { return self._s[2878]! }
+    public var Settings_Search: String { return self._s[2868]! }
+    public var Wallet_Month_ShortFebruary: String { return self._s[2869]! }
+    public var InfoPlist_NSPhotoLibraryUsageDescription: String { return self._s[2870]! }
+    public var Wallet_Configuration_SourceJSON: String { return self._s[2871]! }
+    public var Conversation_ContextMenuReply: String { return self._s[2872]! }
+    public var WallpaperSearch_ColorBrown: String { return self._s[2873]! }
+    public var Chat_AttachmentMultipleForwardDisabled: String { return self._s[2874]! }
+    public var Tour_Title1: String { return self._s[2875]! }
+    public var Wallet_Alert_Cancel: String { return self._s[2876]! }
+    public var Conversation_ClearGroupHistory: String { return self._s[2878]! }
+    public var Wallet_TransactionInfo_RecipientHeader: String { return self._s[2879]! }
+    public var WallpaperPreview_Motion: String { return self._s[2880]! }
     public func Checkout_PasswordEntry_Text(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[2879]!, self._r[2879]!, [_0])
+        return formatWithArgumentRanges(self._s[2881]!, self._r[2881]!, [_0])
     }
-    public var Wallet_Configuration_ApplyErrorTextJSONInvalidData: String { return self._s[2880]! }
-    public var Call_RateCall: String { return self._s[2881]! }
-    public var Channel_AdminLog_BanSendStickersAndGifs: String { return self._s[2882]! }
-    public var Passport_PasswordCompleteSetup: String { return self._s[2883]! }
-    public var Conversation_InputTextSilentBroadcastPlaceholder: String { return self._s[2884]! }
-    public var UserInfo_LastNamePlaceholder: String { return self._s[2886]! }
+    public var Wallet_Configuration_ApplyErrorTextJSONInvalidData: String { return self._s[2882]! }
+    public var Call_RateCall: String { return self._s[2883]! }
+    public var Channel_AdminLog_BanSendStickersAndGifs: String { return self._s[2884]! }
+    public var Passport_PasswordCompleteSetup: String { return self._s[2885]! }
+    public var Conversation_InputTextSilentBroadcastPlaceholder: String { return self._s[2886]! }
+    public var UserInfo_LastNamePlaceholder: String { return self._s[2888]! }
     public func Login_WillCallYou(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[2888]!, self._r[2888]!, [_0])
+        return formatWithArgumentRanges(self._s[2890]!, self._r[2890]!, [_0])
     }
-    public var Compose_Create: String { return self._s[2889]! }
-    public var Contacts_InviteToTelegram: String { return self._s[2890]! }
-    public var GroupInfo_Notifications: String { return self._s[2891]! }
-    public var ChatList_DeleteSavedMessagesConfirmationAction: String { return self._s[2893]! }
-    public var Message_PinnedLiveLocationMessage: String { return self._s[2894]! }
-    public var Month_GenApril: String { return self._s[2895]! }
-    public var Appearance_AutoNightTheme: String { return self._s[2896]! }
-    public var ChatSettings_AutomaticAudioDownload: String { return self._s[2898]! }
-    public var Login_CodeSentSms: String { return self._s[2900]! }
+    public var Compose_Create: String { return self._s[2891]! }
+    public var Contacts_InviteToTelegram: String { return self._s[2892]! }
+    public var GroupInfo_Notifications: String { return self._s[2893]! }
+    public var ChatList_DeleteSavedMessagesConfirmationAction: String { return self._s[2895]! }
+    public var Message_PinnedLiveLocationMessage: String { return self._s[2896]! }
+    public var Month_GenApril: String { return self._s[2897]! }
+    public var Appearance_AutoNightTheme: String { return self._s[2898]! }
+    public var ChatSettings_AutomaticAudioDownload: String { return self._s[2900]! }
+    public var Login_CodeSentSms: String { return self._s[2902]! }
     public func UserInfo_UnblockConfirmation(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[2901]!, self._r[2901]!, [_0])
+        return formatWithArgumentRanges(self._s[2903]!, self._r[2903]!, [_0])
     }
-    public var EmptyGroupInfo_Line3: String { return self._s[2902]! }
-    public var LogoutOptions_ContactSupportText: String { return self._s[2903]! }
-    public var Passport_Language_hr: String { return self._s[2904]! }
-    public var Common_ActionNotAllowedError: String { return self._s[2905]! }
+    public var EmptyGroupInfo_Line3: String { return self._s[2904]! }
+    public var LogoutOptions_ContactSupportText: String { return self._s[2905]! }
+    public var Passport_Language_hr: String { return self._s[2906]! }
+    public var Common_ActionNotAllowedError: String { return self._s[2907]! }
     public func Channel_AdminLog_MessageRestrictedNewSetting(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[2906]!, self._r[2906]!, [_0])
+        return formatWithArgumentRanges(self._s[2908]!, self._r[2908]!, [_0])
     }
-    public var GroupInfo_InviteLink_CopyLink: String { return self._s[2907]! }
-    public var Wallet_Info_TransactionFrom: String { return self._s[2908]! }
-    public var Wallet_Send_ErrorDecryptionFailed: String { return self._s[2909]! }
-    public var Conversation_InputTextBroadcastPlaceholder: String { return self._s[2910]! }
-    public var Privacy_SecretChatsTitle: String { return self._s[2911]! }
-    public var Notification_SecretChatMessageScreenshotSelf: String { return self._s[2913]! }
-    public var GroupInfo_AddUserLeftError: String { return self._s[2914]! }
-    public var AutoDownloadSettings_TypePrivateChats: String { return self._s[2915]! }
-    public var LogoutOptions_ContactSupportTitle: String { return self._s[2916]! }
-    public var Appearance_ThemePreview_Chat_7_Text: String { return self._s[2917]! }
-    public var Channel_AddBotErrorHaveRights: String { return self._s[2918]! }
-    public var Preview_DeleteGif: String { return self._s[2919]! }
-    public var GroupInfo_Permissions_Exceptions: String { return self._s[2920]! }
-    public var Group_ErrorNotMutualContact: String { return self._s[2921]! }
-    public var Notification_MessageLifetime5s: String { return self._s[2922]! }
-    public var Wallet_Send_OwnAddressAlertText: String { return self._s[2923]! }
-    public var OldChannels_ChannelFormat: String { return self._s[2924]! }
+    public var GroupInfo_InviteLink_CopyLink: String { return self._s[2909]! }
+    public var Wallet_Info_TransactionFrom: String { return self._s[2910]! }
+    public var Wallet_Send_ErrorDecryptionFailed: String { return self._s[2911]! }
+    public var Conversation_InputTextBroadcastPlaceholder: String { return self._s[2912]! }
+    public var Privacy_SecretChatsTitle: String { return self._s[2913]! }
+    public var Notification_SecretChatMessageScreenshotSelf: String { return self._s[2915]! }
+    public var GroupInfo_AddUserLeftError: String { return self._s[2916]! }
+    public var AutoDownloadSettings_TypePrivateChats: String { return self._s[2917]! }
+    public var LogoutOptions_ContactSupportTitle: String { return self._s[2918]! }
+    public var Appearance_ThemePreview_Chat_7_Text: String { return self._s[2919]! }
+    public var Channel_AddBotErrorHaveRights: String { return self._s[2920]! }
+    public var Preview_DeleteGif: String { return self._s[2921]! }
+    public var GroupInfo_Permissions_Exceptions: String { return self._s[2922]! }
+    public var Group_ErrorNotMutualContact: String { return self._s[2923]! }
+    public var Notification_MessageLifetime5s: String { return self._s[2924]! }
+    public var Wallet_Send_OwnAddressAlertText: String { return self._s[2925]! }
+    public var OldChannels_ChannelFormat: String { return self._s[2926]! }
     public func Watch_LastSeen_AtDate(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[2925]!, self._r[2925]!, [_0])
+        return formatWithArgumentRanges(self._s[2927]!, self._r[2927]!, [_0])
     }
-    public var VoiceOver_Chat_Video: String { return self._s[2926]! }
-    public var Channel_OwnershipTransfer_ErrorPublicChannelsTooMuch: String { return self._s[2928]! }
-    public var ReportSpam_DeleteThisChat: String { return self._s[2929]! }
-    public var Passport_Address_AddBankStatement: String { return self._s[2930]! }
-    public var Notification_CallIncoming: String { return self._s[2931]! }
-    public var Wallet_Words_NotDoneTitle: String { return self._s[2932]! }
-    public var Compose_NewGroupTitle: String { return self._s[2933]! }
-    public var TwoStepAuth_RecoveryCodeHelp: String { return self._s[2935]! }
-    public var Passport_Address_Postcode: String { return self._s[2937]! }
+    public var VoiceOver_Chat_Video: String { return self._s[2928]! }
+    public var Channel_OwnershipTransfer_ErrorPublicChannelsTooMuch: String { return self._s[2930]! }
+    public var ReportSpam_DeleteThisChat: String { return self._s[2931]! }
+    public var Passport_Address_AddBankStatement: String { return self._s[2932]! }
+    public var Notification_CallIncoming: String { return self._s[2933]! }
+    public var Wallet_Words_NotDoneTitle: String { return self._s[2934]! }
+    public var Compose_NewGroupTitle: String { return self._s[2935]! }
+    public var TwoStepAuth_RecoveryCodeHelp: String { return self._s[2937]! }
+    public var Passport_Address_Postcode: String { return self._s[2939]! }
     public func LastSeen_YesterdayAt(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[2938]!, self._r[2938]!, [_0])
+        return formatWithArgumentRanges(self._s[2940]!, self._r[2940]!, [_0])
     }
-    public var Checkout_NewCard_SaveInfoHelp: String { return self._s[2939]! }
-    public var Wallet_Month_ShortOctober: String { return self._s[2940]! }
-    public var VoiceOver_Chat_YourMusic: String { return self._s[2941]! }
-    public var WallpaperColors_Title: String { return self._s[2942]! }
-    public var SocksProxySetup_ShareQRCodeInfo: String { return self._s[2943]! }
-    public var VoiceOver_MessageContextForward: String { return self._s[2944]! }
-    public var GroupPermission_Duration: String { return self._s[2945]! }
+    public var Checkout_NewCard_SaveInfoHelp: String { return self._s[2941]! }
+    public var Wallet_Month_ShortOctober: String { return self._s[2942]! }
+    public var VoiceOver_Chat_YourMusic: String { return self._s[2943]! }
+    public var WallpaperColors_Title: String { return self._s[2944]! }
+    public var SocksProxySetup_ShareQRCodeInfo: String { return self._s[2945]! }
+    public var VoiceOver_MessageContextForward: String { return self._s[2946]! }
+    public var GroupPermission_Duration: String { return self._s[2947]! }
     public func Cache_Clear(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[2946]!, self._r[2946]!, [_0])
+        return formatWithArgumentRanges(self._s[2948]!, self._r[2948]!, [_0])
     }
-    public var Bot_GroupStatusDoesNotReadHistory: String { return self._s[2947]! }
-    public var Username_Placeholder: String { return self._s[2948]! }
-    public var CallFeedback_WhatWentWrong: String { return self._s[2949]! }
-    public var Passport_FieldAddressUploadHelp: String { return self._s[2950]! }
-    public var Permissions_NotificationsAllowInSettings_v0: String { return self._s[2951]! }
+    public var Bot_GroupStatusDoesNotReadHistory: String { return self._s[2949]! }
+    public var Username_Placeholder: String { return self._s[2950]! }
+    public var CallFeedback_WhatWentWrong: String { return self._s[2951]! }
+    public var Passport_FieldAddressUploadHelp: String { return self._s[2952]! }
+    public var Permissions_NotificationsAllowInSettings_v0: String { return self._s[2953]! }
     public func Channel_AdminLog_MessageChangedUnlinkedChannel(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[2953]!, self._r[2953]!, [_1, _2])
+        return formatWithArgumentRanges(self._s[2955]!, self._r[2955]!, [_1, _2])
     }
-    public var Passport_PasswordDescription: String { return self._s[2954]! }
-    public var Channel_MessagePhotoUpdated: String { return self._s[2955]! }
-    public var MediaPicker_TapToUngroupDescription: String { return self._s[2956]! }
-    public var SettingsSearch_Synonyms_Notifications_BadgeCountUnreadMessages: String { return self._s[2957]! }
-    public var AttachmentMenu_PhotoOrVideo: String { return self._s[2958]! }
-    public var Conversation_ContextMenuMore: String { return self._s[2959]! }
-    public var Privacy_PaymentsClearInfo: String { return self._s[2960]! }
-    public var CallSettings_TabIcon: String { return self._s[2961]! }
-    public var KeyCommand_Find: String { return self._s[2962]! }
-    public var ClearCache_FreeSpaceDescription: String { return self._s[2963]! }
-    public var Appearance_ThemePreview_ChatList_7_Text: String { return self._s[2964]! }
-    public var EditTheme_Edit_Preview_IncomingText: String { return self._s[2965]! }
-    public var Message_PinnedGame: String { return self._s[2966]! }
-    public var VoiceOver_Chat_ForwardedFromYou: String { return self._s[2967]! }
-    public var Notifications_Badge_CountUnreadMessages_InfoOff: String { return self._s[2969]! }
-    public var Login_CallRequestState2: String { return self._s[2971]! }
-    public var CheckoutInfo_ReceiverInfoNamePlaceholder: String { return self._s[2973]! }
+    public var Passport_PasswordDescription: String { return self._s[2956]! }
+    public var Channel_MessagePhotoUpdated: String { return self._s[2957]! }
+    public var MediaPicker_TapToUngroupDescription: String { return self._s[2958]! }
+    public var SettingsSearch_Synonyms_Notifications_BadgeCountUnreadMessages: String { return self._s[2959]! }
+    public var AttachmentMenu_PhotoOrVideo: String { return self._s[2960]! }
+    public var Conversation_ContextMenuMore: String { return self._s[2961]! }
+    public var Privacy_PaymentsClearInfo: String { return self._s[2962]! }
+    public var CallSettings_TabIcon: String { return self._s[2963]! }
+    public var KeyCommand_Find: String { return self._s[2964]! }
+    public var ClearCache_FreeSpaceDescription: String { return self._s[2965]! }
+    public var Appearance_ThemePreview_ChatList_7_Text: String { return self._s[2966]! }
+    public var EditTheme_Edit_Preview_IncomingText: String { return self._s[2967]! }
+    public var Message_PinnedGame: String { return self._s[2968]! }
+    public var VoiceOver_Chat_ForwardedFromYou: String { return self._s[2969]! }
+    public var Notifications_Badge_CountUnreadMessages_InfoOff: String { return self._s[2971]! }
+    public var Login_CallRequestState2: String { return self._s[2973]! }
+    public var CheckoutInfo_ReceiverInfoNamePlaceholder: String { return self._s[2975]! }
     public func VoiceOver_Chat_PhotoFrom(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[2974]!, self._r[2974]!, [_0])
-    }
-    public func Checkout_PayPrice(_ _0: String) -> (String, [(Int, NSRange)]) {
         return formatWithArgumentRanges(self._s[2976]!, self._r[2976]!, [_0])
     }
-    public var AuthSessions_AddDevice: String { return self._s[2977]! }
-    public var WallpaperPreview_Blurred: String { return self._s[2978]! }
-    public var Conversation_InstantPagePreview: String { return self._s[2979]! }
-    public var PeerInfo_ButtonUnmute: String { return self._s[2980]! }
+    public func Checkout_PayPrice(_ _0: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[2978]!, self._r[2978]!, [_0])
+    }
+    public var AuthSessions_AddDevice: String { return self._s[2979]! }
+    public var WallpaperPreview_Blurred: String { return self._s[2980]! }
+    public var Conversation_InstantPagePreview: String { return self._s[2981]! }
+    public var PeerInfo_ButtonUnmute: String { return self._s[2982]! }
     public func DialogList_SingleUploadingVideoSuffix(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[2981]!, self._r[2981]!, [_0])
+        return formatWithArgumentRanges(self._s[2983]!, self._r[2983]!, [_0])
     }
-    public var SecretTimer_VideoDescription: String { return self._s[2984]! }
-    public var WallpaperSearch_ColorRed: String { return self._s[2985]! }
-    public var GroupPermission_NoPinMessages: String { return self._s[2986]! }
-    public var Passport_Language_es: String { return self._s[2987]! }
-    public var Permissions_ContactsAllow_v0: String { return self._s[2989]! }
-    public var Conversation_EditingMessageMediaEditCurrentVideo: String { return self._s[2990]! }
+    public var SecretTimer_VideoDescription: String { return self._s[2986]! }
+    public var WallpaperSearch_ColorRed: String { return self._s[2987]! }
+    public var GroupPermission_NoPinMessages: String { return self._s[2988]! }
+    public var Passport_Language_es: String { return self._s[2989]! }
+    public var Permissions_ContactsAllow_v0: String { return self._s[2991]! }
+    public var Conversation_EditingMessageMediaEditCurrentVideo: String { return self._s[2992]! }
     public func PUSH_CHAT_MESSAGE_CONTACT(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[2991]!, self._r[2991]!, [_1, _2])
+        return formatWithArgumentRanges(self._s[2993]!, self._r[2993]!, [_1, _2])
     }
-    public var Privacy_Forwards_CustomHelp: String { return self._s[2992]! }
-    public var WebPreview_GettingLinkInfo: String { return self._s[2993]! }
-    public var Watch_UserInfo_Unmute: String { return self._s[2994]! }
-    public var GroupInfo_ChannelListNamePlaceholder: String { return self._s[2995]! }
-    public var AccessDenied_CameraRestricted: String { return self._s[2997]! }
+    public var Privacy_Forwards_CustomHelp: String { return self._s[2994]! }
+    public var WebPreview_GettingLinkInfo: String { return self._s[2995]! }
+    public var Watch_UserInfo_Unmute: String { return self._s[2996]! }
+    public var GroupInfo_ChannelListNamePlaceholder: String { return self._s[2997]! }
+    public var AccessDenied_CameraRestricted: String { return self._s[2999]! }
     public func Conversation_Kilobytes(_ _0: Int) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[2998]!, self._r[2998]!, ["\(_0)"])
+        return formatWithArgumentRanges(self._s[3000]!, self._r[3000]!, ["\(_0)"])
     }
-    public var ChatList_ReadAll: String { return self._s[3000]! }
-    public var Settings_CopyUsername: String { return self._s[3001]! }
-    public var Contacts_SearchLabel: String { return self._s[3002]! }
-    public var Map_OpenInYandexNavigator: String { return self._s[3004]! }
-    public var PasscodeSettings_EncryptData: String { return self._s[3005]! }
-    public var Settings_Wallet: String { return self._s[3006]! }
-    public var Group_ErrorSupergroupConversionNotPossible: String { return self._s[3007]! }
-    public var WallpaperSearch_ColorPrefix: String { return self._s[3008]! }
-    public var Notifications_GroupNotificationsPreview: String { return self._s[3009]! }
-    public var DialogList_AdNoticeAlert: String { return self._s[3010]! }
-    public var Wallet_Month_GenMay: String { return self._s[3012]! }
-    public var CheckoutInfo_ShippingInfoAddress1: String { return self._s[3013]! }
-    public var CheckoutInfo_ShippingInfoAddress2: String { return self._s[3014]! }
-    public var Localization_LanguageCustom: String { return self._s[3015]! }
-    public var Passport_Identity_TypeDriversLicenseUploadScan: String { return self._s[3016]! }
-    public var CallFeedback_Title: String { return self._s[3017]! }
-    public var VoiceOver_Chat_RecordPreviewVoiceMessage: String { return self._s[3020]! }
-    public var Passport_Address_OneOfTypePassportRegistration: String { return self._s[3021]! }
-    public var Wallet_Intro_CreateErrorTitle: String { return self._s[3022]! }
-    public var Conversation_InfoGroup: String { return self._s[3023]! }
-    public var Compose_NewMessage: String { return self._s[3024]! }
-    public var FastTwoStepSetup_HintPlaceholder: String { return self._s[3025]! }
-    public var ChatSettings_AutoDownloadVideoMessages: String { return self._s[3026]! }
-    public var Wallet_SecureStorageReset_BiometryFaceId: String { return self._s[3027]! }
-    public var Channel_DiscussionGroup_UnlinkChannel: String { return self._s[3028]! }
+    public var ChatList_ReadAll: String { return self._s[3002]! }
+    public var Settings_CopyUsername: String { return self._s[3003]! }
+    public var Contacts_SearchLabel: String { return self._s[3004]! }
+    public var Map_OpenInYandexNavigator: String { return self._s[3006]! }
+    public var PasscodeSettings_EncryptData: String { return self._s[3007]! }
+    public var Settings_Wallet: String { return self._s[3008]! }
+    public var Group_ErrorSupergroupConversionNotPossible: String { return self._s[3009]! }
+    public var WallpaperSearch_ColorPrefix: String { return self._s[3010]! }
+    public var Notifications_GroupNotificationsPreview: String { return self._s[3011]! }
+    public var DialogList_AdNoticeAlert: String { return self._s[3012]! }
+    public var Wallet_Month_GenMay: String { return self._s[3014]! }
+    public var CheckoutInfo_ShippingInfoAddress1: String { return self._s[3015]! }
+    public var CheckoutInfo_ShippingInfoAddress2: String { return self._s[3016]! }
+    public var Localization_LanguageCustom: String { return self._s[3017]! }
+    public var Passport_Identity_TypeDriversLicenseUploadScan: String { return self._s[3018]! }
+    public var CallFeedback_Title: String { return self._s[3019]! }
+    public var VoiceOver_Chat_RecordPreviewVoiceMessage: String { return self._s[3022]! }
+    public var Passport_Address_OneOfTypePassportRegistration: String { return self._s[3023]! }
+    public var Wallet_Intro_CreateErrorTitle: String { return self._s[3024]! }
+    public var Conversation_InfoGroup: String { return self._s[3025]! }
+    public var Compose_NewMessage: String { return self._s[3026]! }
+    public var FastTwoStepSetup_HintPlaceholder: String { return self._s[3027]! }
+    public var ChatSettings_AutoDownloadVideoMessages: String { return self._s[3028]! }
+    public var Wallet_SecureStorageReset_BiometryFaceId: String { return self._s[3029]! }
+    public var Channel_DiscussionGroup_UnlinkChannel: String { return self._s[3030]! }
     public func Passport_Scans_ScanIndex(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[3029]!, self._r[3029]!, [_0])
+        return formatWithArgumentRanges(self._s[3031]!, self._r[3031]!, [_0])
     }
-    public var Channel_AdminLog_CanDeleteMessages: String { return self._s[3030]! }
-    public var Login_CancelSignUpConfirmation: String { return self._s[3031]! }
-    public var ChangePhoneNumberCode_Help: String { return self._s[3032]! }
-    public var PrivacySettings_DeleteAccountHelp: String { return self._s[3033]! }
-    public var Channel_BlackList_Title: String { return self._s[3034]! }
-    public var UserInfo_PhoneCall: String { return self._s[3035]! }
-    public var Passport_Address_OneOfTypeBankStatement: String { return self._s[3037]! }
-    public var Wallet_Month_ShortJanuary: String { return self._s[3038]! }
-    public var State_connecting: String { return self._s[3039]! }
-    public var Appearance_ThemePreview_ChatList_6_Text: String { return self._s[3040]! }
-    public var Wallet_Month_GenMarch: String { return self._s[3041]! }
-    public var EditTheme_Expand_BottomInfo: String { return self._s[3042]! }
-    public var AuthSessions_AddedDeviceTerminate: String { return self._s[3043]! }
+    public var Channel_AdminLog_CanDeleteMessages: String { return self._s[3032]! }
+    public var Login_CancelSignUpConfirmation: String { return self._s[3033]! }
+    public var ChangePhoneNumberCode_Help: String { return self._s[3034]! }
+    public var PrivacySettings_DeleteAccountHelp: String { return self._s[3035]! }
+    public var Channel_BlackList_Title: String { return self._s[3036]! }
+    public var UserInfo_PhoneCall: String { return self._s[3037]! }
+    public var Passport_Address_OneOfTypeBankStatement: String { return self._s[3039]! }
+    public var Wallet_Month_ShortJanuary: String { return self._s[3040]! }
+    public var State_connecting: String { return self._s[3041]! }
+    public var Appearance_ThemePreview_ChatList_6_Text: String { return self._s[3042]! }
+    public var Wallet_Month_GenMarch: String { return self._s[3043]! }
+    public var EditTheme_Expand_BottomInfo: String { return self._s[3044]! }
+    public var AuthSessions_AddedDeviceTerminate: String { return self._s[3045]! }
     public func LastSeen_TodayAt(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[3044]!, self._r[3044]!, [_0])
+        return formatWithArgumentRanges(self._s[3046]!, self._r[3046]!, [_0])
     }
     public func DialogList_SingleRecordingAudioSuffix(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[3045]!, self._r[3045]!, [_0])
+        return formatWithArgumentRanges(self._s[3047]!, self._r[3047]!, [_0])
     }
-    public var Notifications_GroupNotifications: String { return self._s[3046]! }
-    public var Conversation_SendMessageErrorTooMuchScheduled: String { return self._s[3047]! }
-    public var Passport_Identity_EditPassport: String { return self._s[3048]! }
-    public var EnterPasscode_RepeatNewPasscode: String { return self._s[3050]! }
-    public var Localization_EnglishLanguageName: String { return self._s[3051]! }
-    public var Share_AuthDescription: String { return self._s[3052]! }
-    public var SettingsSearch_Synonyms_Notifications_ChannelNotificationsAlert: String { return self._s[3053]! }
-    public var Passport_Identity_Surname: String { return self._s[3054]! }
-    public var Compose_TokenListPlaceholder: String { return self._s[3055]! }
-    public var Wallet_AccessDenied_Camera: String { return self._s[3056]! }
-    public var Passport_Identity_OneOfTypePassport: String { return self._s[3057]! }
-    public var Settings_AboutEmpty: String { return self._s[3058]! }
-    public var Conversation_Unmute: String { return self._s[3059]! }
-    public var CreateGroup_ChannelsTooMuch: String { return self._s[3061]! }
-    public var Wallet_Sending_Text: String { return self._s[3062]! }
+    public var Notifications_GroupNotifications: String { return self._s[3048]! }
+    public var Conversation_SendMessageErrorTooMuchScheduled: String { return self._s[3049]! }
+    public var Passport_Identity_EditPassport: String { return self._s[3050]! }
+    public var EnterPasscode_RepeatNewPasscode: String { return self._s[3052]! }
+    public var Localization_EnglishLanguageName: String { return self._s[3053]! }
+    public var Share_AuthDescription: String { return self._s[3054]! }
+    public var SettingsSearch_Synonyms_Notifications_ChannelNotificationsAlert: String { return self._s[3055]! }
+    public var Passport_Identity_Surname: String { return self._s[3056]! }
+    public var Compose_TokenListPlaceholder: String { return self._s[3057]! }
+    public var Wallet_AccessDenied_Camera: String { return self._s[3058]! }
+    public var Passport_Identity_OneOfTypePassport: String { return self._s[3059]! }
+    public var Settings_AboutEmpty: String { return self._s[3060]! }
+    public var Conversation_Unmute: String { return self._s[3061]! }
+    public var CreateGroup_ChannelsTooMuch: String { return self._s[3063]! }
+    public var Wallet_Sending_Text: String { return self._s[3064]! }
     public func PUSH_CONTACT_JOINED(_ _1: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[3063]!, self._r[3063]!, [_1])
+        return formatWithArgumentRanges(self._s[3065]!, self._r[3065]!, [_1])
     }
-    public var Login_CodeSentCall: String { return self._s[3064]! }
-    public var ContactInfo_PhoneLabelHomeFax: String { return self._s[3066]! }
-    public var ChatSettings_Appearance: String { return self._s[3067]! }
-    public var ClearCache_StorageUsage: String { return self._s[3068]! }
-    public var Appearance_PickAccentColor: String { return self._s[3069]! }
+    public var Login_CodeSentCall: String { return self._s[3066]! }
+    public var ContactInfo_PhoneLabelHomeFax: String { return self._s[3068]! }
+    public var ChatSettings_Appearance: String { return self._s[3069]! }
+    public var ClearCache_StorageUsage: String { return self._s[3070]! }
+    public var Appearance_PickAccentColor: String { return self._s[3071]! }
     public func PUSH_CHAT_MESSAGE_NOTEXT(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[3070]!, self._r[3070]!, [_1, _2])
+        return formatWithArgumentRanges(self._s[3072]!, self._r[3072]!, [_1, _2])
     }
     public func PUSH_MESSAGE_GEO(_ _1: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[3071]!, self._r[3071]!, [_1])
+        return formatWithArgumentRanges(self._s[3073]!, self._r[3073]!, [_1])
     }
-    public var Notification_CallMissed: String { return self._s[3072]! }
-    public var SettingsSearch_Synonyms_Appearance_ChatBackground_Custom: String { return self._s[3073]! }
-    public var Channel_AdminLogFilter_EventsInfo: String { return self._s[3074]! }
-    public var Wallet_Month_GenOctober: String { return self._s[3076]! }
-    public var ChatAdmins_AdminLabel: String { return self._s[3077]! }
-    public var KeyCommand_JumpToNextChat: String { return self._s[3078]! }
-    public var Conversation_StopPollConfirmationTitle: String { return self._s[3080]! }
-    public var ChangePhoneNumberCode_CodePlaceholder: String { return self._s[3081]! }
-    public var Month_GenJune: String { return self._s[3082]! }
-    public var IntentsSettings_MainAccountInfo: String { return self._s[3083]! }
-    public var Watch_Location_Current: String { return self._s[3084]! }
-    public var Wallet_Receive_CopyInvoiceUrl: String { return self._s[3085]! }
-    public var Conversation_TitleMute: String { return self._s[3086]! }
-    public var Map_PlacesInThisArea: String { return self._s[3087]! }
+    public var Notification_CallMissed: String { return self._s[3074]! }
+    public var SettingsSearch_Synonyms_Appearance_ChatBackground_Custom: String { return self._s[3075]! }
+    public var Channel_AdminLogFilter_EventsInfo: String { return self._s[3076]! }
+    public var Wallet_Month_GenOctober: String { return self._s[3078]! }
+    public var ChatAdmins_AdminLabel: String { return self._s[3079]! }
+    public var KeyCommand_JumpToNextChat: String { return self._s[3080]! }
+    public var Conversation_StopPollConfirmationTitle: String { return self._s[3082]! }
+    public var ChangePhoneNumberCode_CodePlaceholder: String { return self._s[3083]! }
+    public var Month_GenJune: String { return self._s[3084]! }
+    public var IntentsSettings_MainAccountInfo: String { return self._s[3085]! }
+    public var Watch_Location_Current: String { return self._s[3086]! }
+    public var Wallet_Receive_CopyInvoiceUrl: String { return self._s[3087]! }
+    public var Conversation_TitleMute: String { return self._s[3088]! }
+    public var Map_PlacesInThisArea: String { return self._s[3089]! }
     public func PUSH_CHANNEL_MESSAGE_ROUND(_ _1: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[3088]!, self._r[3088]!, [_1])
+        return formatWithArgumentRanges(self._s[3090]!, self._r[3090]!, [_1])
     }
-    public var GroupInfo_DeleteAndExit: String { return self._s[3089]! }
+    public var GroupInfo_DeleteAndExit: String { return self._s[3091]! }
     public func Conversation_Moderate_DeleteAllMessages(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[3090]!, self._r[3090]!, [_0])
+        return formatWithArgumentRanges(self._s[3092]!, self._r[3092]!, [_0])
     }
-    public var Call_ReportPlaceholder: String { return self._s[3091]! }
-    public var Chat_SlowmodeSendError: String { return self._s[3092]! }
-    public var MaskStickerSettings_Info: String { return self._s[3093]! }
-    public var EditTheme_Expand_TopInfo: String { return self._s[3094]! }
+    public var Call_ReportPlaceholder: String { return self._s[3093]! }
+    public var Chat_SlowmodeSendError: String { return self._s[3094]! }
+    public var MaskStickerSettings_Info: String { return self._s[3095]! }
+    public var EditTheme_Expand_TopInfo: String { return self._s[3096]! }
     public func GroupInfo_AddParticipantConfirmation(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[3095]!, self._r[3095]!, [_0])
+        return formatWithArgumentRanges(self._s[3097]!, self._r[3097]!, [_0])
     }
-    public var Checkout_NewCard_PostcodeTitle: String { return self._s[3096]! }
-    public var Passport_Address_RegionPlaceholder: String { return self._s[3098]! }
-    public var Contacts_ShareTelegram: String { return self._s[3099]! }
-    public var EnterPasscode_EnterNewPasscodeNew: String { return self._s[3100]! }
-    public var Map_AddressOnMap: String { return self._s[3101]! }
-    public var Channel_ErrorAccessDenied: String { return self._s[3102]! }
-    public var UserInfo_ScamBotWarning: String { return self._s[3104]! }
-    public var Stickers_GroupChooseStickerPack: String { return self._s[3105]! }
-    public var Call_ConnectionErrorTitle: String { return self._s[3106]! }
-    public var UserInfo_NotificationsEnable: String { return self._s[3107]! }
-    public var ArchivedChats_IntroText1: String { return self._s[3108]! }
-    public var Tour_Text4: String { return self._s[3111]! }
-    public var WallpaperSearch_Recent: String { return self._s[3112]! }
-    public var GroupInfo_ScamGroupWarning: String { return self._s[3113]! }
-    public var PeopleNearby_MakeVisibleTitle: String { return self._s[3114]! }
-    public var Profile_MessageLifetime2s: String { return self._s[3116]! }
-    public var Appearance_ThemePreview_ChatList_5_Text: String { return self._s[3117]! }
-    public var Notification_MessageLifetime2s: String { return self._s[3118]! }
+    public var Checkout_NewCard_PostcodeTitle: String { return self._s[3098]! }
+    public var Passport_Address_RegionPlaceholder: String { return self._s[3100]! }
+    public var Contacts_ShareTelegram: String { return self._s[3101]! }
+    public var EnterPasscode_EnterNewPasscodeNew: String { return self._s[3102]! }
+    public var Map_AddressOnMap: String { return self._s[3103]! }
+    public var Channel_ErrorAccessDenied: String { return self._s[3104]! }
+    public var UserInfo_ScamBotWarning: String { return self._s[3106]! }
+    public var Stickers_GroupChooseStickerPack: String { return self._s[3107]! }
+    public var Call_ConnectionErrorTitle: String { return self._s[3108]! }
+    public var UserInfo_NotificationsEnable: String { return self._s[3109]! }
+    public var ArchivedChats_IntroText1: String { return self._s[3110]! }
+    public var Tour_Text4: String { return self._s[3113]! }
+    public var WallpaperSearch_Recent: String { return self._s[3114]! }
+    public var GroupInfo_ScamGroupWarning: String { return self._s[3115]! }
+    public var PeopleNearby_MakeVisibleTitle: String { return self._s[3116]! }
+    public var Profile_MessageLifetime2s: String { return self._s[3118]! }
+    public var Appearance_ThemePreview_ChatList_5_Text: String { return self._s[3119]! }
+    public var Notification_MessageLifetime2s: String { return self._s[3120]! }
     public func Time_PreciseDate_m10(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[3119]!, self._r[3119]!, [_1, _2, _3])
+        return formatWithArgumentRanges(self._s[3121]!, self._r[3121]!, [_1, _2, _3])
     }
-    public var Cache_ClearCache: String { return self._s[3120]! }
-    public var AutoNightTheme_UpdateLocation: String { return self._s[3121]! }
-    public var Permissions_NotificationsUnreachableText_v0: String { return self._s[3122]! }
+    public var Cache_ClearCache: String { return self._s[3122]! }
+    public var AutoNightTheme_UpdateLocation: String { return self._s[3123]! }
+    public var Permissions_NotificationsUnreachableText_v0: String { return self._s[3124]! }
     public func Channel_AdminLog_MessageChangedGroupUsername(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[3126]!, self._r[3126]!, [_0])
-    }
-    public func Conversation_ShareMyPhoneNumber_StatusSuccess(_ _0: String) -> (String, [(Int, NSRange)]) {
         return formatWithArgumentRanges(self._s[3128]!, self._r[3128]!, [_0])
     }
-    public var LocalGroup_Text: String { return self._s[3129]! }
-    public var PeerInfo_PaneMembers: String { return self._s[3130]! }
-    public var Channel_AdminLog_EmptyFilterTitle: String { return self._s[3131]! }
-    public var SocksProxySetup_TypeSocks: String { return self._s[3132]! }
-    public var ChatList_UnarchiveAction: String { return self._s[3133]! }
-    public var AutoNightTheme_Title: String { return self._s[3134]! }
-    public var InstantPage_FeedbackButton: String { return self._s[3135]! }
-    public var Passport_FieldAddress: String { return self._s[3136]! }
-    public func Channel_AdminLog_SetSlowmode(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[3137]!, self._r[3137]!, [_1, _2])
+    public func Conversation_ShareMyPhoneNumber_StatusSuccess(_ _0: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[3130]!, self._r[3130]!, [_0])
     }
-    public var Month_ShortMarch: String { return self._s[3138]! }
-    public func PUSH_MESSAGE_INVOICE(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
+    public var LocalGroup_Text: String { return self._s[3131]! }
+    public var PeerInfo_PaneMembers: String { return self._s[3132]! }
+    public var Channel_AdminLog_EmptyFilterTitle: String { return self._s[3133]! }
+    public var SocksProxySetup_TypeSocks: String { return self._s[3134]! }
+    public var ChatList_UnarchiveAction: String { return self._s[3135]! }
+    public var AutoNightTheme_Title: String { return self._s[3136]! }
+    public var InstantPage_FeedbackButton: String { return self._s[3137]! }
+    public var Passport_FieldAddress: String { return self._s[3138]! }
+    public func Channel_AdminLog_SetSlowmode(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
         return formatWithArgumentRanges(self._s[3139]!, self._r[3139]!, [_1, _2])
     }
-    public var SocksProxySetup_UsernamePlaceholder: String { return self._s[3140]! }
-    public var Conversation_ShareInlineBotLocationConfirmation: String { return self._s[3141]! }
-    public var Passport_FloodError: String { return self._s[3142]! }
-    public var SecretGif_Title: String { return self._s[3143]! }
-    public var NotificationSettings_ShowNotificationsAllAccountsInfoOn: String { return self._s[3144]! }
-    public var ChatList_Context_UnhideArchive: String { return self._s[3145]! }
-    public var Passport_Language_th: String { return self._s[3147]! }
-    public var Passport_Address_Address: String { return self._s[3148]! }
-    public var Login_InvalidLastNameError: String { return self._s[3149]! }
-    public var Notifications_InAppNotificationsPreview: String { return self._s[3150]! }
-    public var Notifications_PermissionsUnreachableTitle: String { return self._s[3151]! }
-    public var ChatList_Context_Archive: String { return self._s[3152]! }
-    public var SettingsSearch_FAQ: String { return self._s[3153]! }
-    public var ShareMenu_Send: String { return self._s[3154]! }
-    public var ChatState_Connecting: String { return self._s[3155]! }
-    public var WallpaperSearch_ColorYellow: String { return self._s[3157]! }
-    public var Month_GenNovember: String { return self._s[3159]! }
-    public var SettingsSearch_Synonyms_Appearance_LargeEmoji: String { return self._s[3161]! }
+    public var Month_ShortMarch: String { return self._s[3140]! }
+    public func PUSH_MESSAGE_INVOICE(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[3141]!, self._r[3141]!, [_1, _2])
+    }
+    public var SocksProxySetup_UsernamePlaceholder: String { return self._s[3142]! }
+    public var Conversation_ShareInlineBotLocationConfirmation: String { return self._s[3143]! }
+    public var Passport_FloodError: String { return self._s[3144]! }
+    public var SecretGif_Title: String { return self._s[3145]! }
+    public var NotificationSettings_ShowNotificationsAllAccountsInfoOn: String { return self._s[3146]! }
+    public var ChatList_Context_UnhideArchive: String { return self._s[3147]! }
+    public var Passport_Language_th: String { return self._s[3149]! }
+    public var Passport_Address_Address: String { return self._s[3150]! }
+    public var Login_InvalidLastNameError: String { return self._s[3151]! }
+    public var Notifications_InAppNotificationsPreview: String { return self._s[3152]! }
+    public var Notifications_PermissionsUnreachableTitle: String { return self._s[3153]! }
+    public var ChatList_Context_Archive: String { return self._s[3154]! }
+    public var SettingsSearch_FAQ: String { return self._s[3155]! }
+    public var ShareMenu_Send: String { return self._s[3156]! }
+    public var ChatState_Connecting: String { return self._s[3157]! }
+    public var WallpaperSearch_ColorYellow: String { return self._s[3159]! }
+    public var Month_GenNovember: String { return self._s[3161]! }
+    public var SettingsSearch_Synonyms_Appearance_LargeEmoji: String { return self._s[3163]! }
     public func Conversation_ShareMyPhoneNumberConfirmation(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[3162]!, self._r[3162]!, [_1, _2])
+        return formatWithArgumentRanges(self._s[3164]!, self._r[3164]!, [_1, _2])
     }
-    public var Conversation_SwipeToReplyHintText: String { return self._s[3163]! }
-    public var Checkout_Email: String { return self._s[3164]! }
-    public var NotificationsSound_Tritone: String { return self._s[3165]! }
-    public var StickerPacksSettings_ManagingHelp: String { return self._s[3167]! }
-    public var Wallet_ContextMenuCopy: String { return self._s[3169]! }
+    public var Conversation_SwipeToReplyHintText: String { return self._s[3165]! }
+    public var Checkout_Email: String { return self._s[3166]! }
+    public var NotificationsSound_Tritone: String { return self._s[3167]! }
+    public var StickerPacksSettings_ManagingHelp: String { return self._s[3169]! }
+    public var Wallet_ContextMenuCopy: String { return self._s[3171]! }
     public func Wallet_Time_PreciseDate_m6(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[3171]!, self._r[3171]!, [_1, _2, _3])
+        return formatWithArgumentRanges(self._s[3173]!, self._r[3173]!, [_1, _2, _3])
     }
-    public var Appearance_TextSize_Automatic: String { return self._s[3172]! }
+    public var Appearance_TextSize_Automatic: String { return self._s[3174]! }
     public func PUSH_PINNED_ROUND(_ _1: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[3174]!, self._r[3174]!, [_1])
+        return formatWithArgumentRanges(self._s[3176]!, self._r[3176]!, [_1])
     }
     public func StickerPackActionInfo_AddedText(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[3175]!, self._r[3175]!, [_0])
+        return formatWithArgumentRanges(self._s[3177]!, self._r[3177]!, [_0])
     }
-    public var ChangePhoneNumberNumber_Help: String { return self._s[3176]! }
+    public var ChangePhoneNumberNumber_Help: String { return self._s[3178]! }
     public func Checkout_LiabilityAlert(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[3177]!, self._r[3177]!, [_1, _1, _1, _2])
+        return formatWithArgumentRanges(self._s[3179]!, self._r[3179]!, [_1, _1, _1, _2])
     }
-    public var ChatList_UndoArchiveTitle: String { return self._s[3178]! }
-    public var Notification_Exceptions_Add: String { return self._s[3179]! }
-    public var DialogList_You: String { return self._s[3180]! }
-    public var MediaPicker_Send: String { return self._s[3183]! }
-    public var SettingsSearch_Synonyms_Stickers_Title: String { return self._s[3184]! }
-    public var Appearance_ThemePreview_ChatList_4_Text: String { return self._s[3185]! }
-    public var Call_AudioRouteSpeaker: String { return self._s[3186]! }
-    public var Watch_UserInfo_Title: String { return self._s[3187]! }
-    public var VoiceOver_Chat_PollFinalResults: String { return self._s[3188]! }
-    public var Appearance_AccentColor: String { return self._s[3190]! }
+    public var ChatList_UndoArchiveTitle: String { return self._s[3180]! }
+    public var Notification_Exceptions_Add: String { return self._s[3181]! }
+    public var DialogList_You: String { return self._s[3182]! }
+    public var MediaPicker_Send: String { return self._s[3185]! }
+    public var SettingsSearch_Synonyms_Stickers_Title: String { return self._s[3186]! }
+    public var Appearance_ThemePreview_ChatList_4_Text: String { return self._s[3187]! }
+    public var Call_AudioRouteSpeaker: String { return self._s[3188]! }
+    public var Watch_UserInfo_Title: String { return self._s[3189]! }
+    public var VoiceOver_Chat_PollFinalResults: String { return self._s[3190]! }
+    public var Appearance_AccentColor: String { return self._s[3192]! }
     public func Login_EmailPhoneSubject(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[3191]!, self._r[3191]!, [_0])
+        return formatWithArgumentRanges(self._s[3193]!, self._r[3193]!, [_0])
     }
-    public var Permissions_ContactsAllowInSettings_v0: String { return self._s[3192]! }
+    public var Permissions_ContactsAllowInSettings_v0: String { return self._s[3194]! }
     public func PUSH_CHANNEL_MESSAGE_GAME(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[3193]!, self._r[3193]!, [_1, _2])
+        return formatWithArgumentRanges(self._s[3195]!, self._r[3195]!, [_1, _2])
     }
-    public var Conversation_ClousStorageInfo_Description2: String { return self._s[3194]! }
-    public var WebSearch_RecentClearConfirmation: String { return self._s[3195]! }
-    public var Notification_CallOutgoing: String { return self._s[3196]! }
-    public var PrivacySettings_PasscodeAndFaceId: String { return self._s[3197]! }
-    public var Channel_DiscussionGroup_MakeHistoryPublic: String { return self._s[3198]! }
-    public var Call_RecordingDisabledMessage: String { return self._s[3199]! }
-    public var Message_Game: String { return self._s[3200]! }
-    public var Conversation_PressVolumeButtonForSound: String { return self._s[3201]! }
-    public var PrivacyLastSeenSettings_CustomHelp: String { return self._s[3202]! }
-    public var Channel_DiscussionGroup_PrivateGroup: String { return self._s[3203]! }
-    public var Channel_EditAdmin_PermissionAddAdmins: String { return self._s[3204]! }
-    public var Date_DialogDateFormat: String { return self._s[3206]! }
-    public var WallpaperColors_SetCustomColor: String { return self._s[3207]! }
-    public var Notifications_InAppNotifications: String { return self._s[3208]! }
+    public var Conversation_ClousStorageInfo_Description2: String { return self._s[3196]! }
+    public var WebSearch_RecentClearConfirmation: String { return self._s[3197]! }
+    public var Notification_CallOutgoing: String { return self._s[3198]! }
+    public var PrivacySettings_PasscodeAndFaceId: String { return self._s[3199]! }
+    public var Channel_DiscussionGroup_MakeHistoryPublic: String { return self._s[3200]! }
+    public var Call_RecordingDisabledMessage: String { return self._s[3201]! }
+    public var Message_Game: String { return self._s[3202]! }
+    public var Conversation_PressVolumeButtonForSound: String { return self._s[3203]! }
+    public var PrivacyLastSeenSettings_CustomHelp: String { return self._s[3204]! }
+    public var Channel_DiscussionGroup_PrivateGroup: String { return self._s[3205]! }
+    public var Channel_EditAdmin_PermissionAddAdmins: String { return self._s[3206]! }
+    public var Date_DialogDateFormat: String { return self._s[3208]! }
+    public var WallpaperColors_SetCustomColor: String { return self._s[3209]! }
+    public var Notifications_InAppNotifications: String { return self._s[3210]! }
     public func Channel_Management_RemovedBy(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[3209]!, self._r[3209]!, [_0])
+        return formatWithArgumentRanges(self._s[3211]!, self._r[3211]!, [_0])
     }
     public func Settings_ApplyProxyAlert(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[3210]!, self._r[3210]!, [_1, _2])
+        return formatWithArgumentRanges(self._s[3212]!, self._r[3212]!, [_1, _2])
     }
-    public var NewContact_Title: String { return self._s[3211]! }
+    public var NewContact_Title: String { return self._s[3213]! }
     public func AutoDownloadSettings_UpToForAll(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[3212]!, self._r[3212]!, [_0])
+        return formatWithArgumentRanges(self._s[3214]!, self._r[3214]!, [_0])
     }
-    public var Conversation_ViewContactDetails: String { return self._s[3213]! }
+    public var Conversation_ViewContactDetails: String { return self._s[3215]! }
     public func PUSH_CHANNEL_MESSAGE_CONTACT(_ _1: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[3215]!, self._r[3215]!, [_1])
+        return formatWithArgumentRanges(self._s[3217]!, self._r[3217]!, [_1])
     }
-    public var Checkout_NewCard_CardholderNameTitle: String { return self._s[3216]! }
-    public var Passport_Identity_ExpiryDateNone: String { return self._s[3217]! }
-    public var PrivacySettings_Title: String { return self._s[3218]! }
-    public var Conversation_SilentBroadcastTooltipOff: String { return self._s[3221]! }
-    public var GroupRemoved_UsersSectionTitle: String { return self._s[3222]! }
-    public var VoiceOver_Chat_ContactEmail: String { return self._s[3223]! }
-    public var Contacts_PhoneNumber: String { return self._s[3224]! }
-    public var PeerInfo_ButtonMute: String { return self._s[3225]! }
-    public var TwoFactorSetup_Password_PlaceholderConfirmPassword: String { return self._s[3227]! }
-    public var Map_ShowPlaces: String { return self._s[3228]! }
-    public var ChatAdmins_Title: String { return self._s[3229]! }
-    public var InstantPage_Reference: String { return self._s[3231]! }
-    public var Wallet_Info_Updating: String { return self._s[3232]! }
-    public var ReportGroupLocation_Text: String { return self._s[3233]! }
+    public var Checkout_NewCard_CardholderNameTitle: String { return self._s[3218]! }
+    public var Passport_Identity_ExpiryDateNone: String { return self._s[3219]! }
+    public var PrivacySettings_Title: String { return self._s[3220]! }
+    public var Conversation_SilentBroadcastTooltipOff: String { return self._s[3223]! }
+    public var GroupRemoved_UsersSectionTitle: String { return self._s[3224]! }
+    public var VoiceOver_Chat_ContactEmail: String { return self._s[3225]! }
+    public var Contacts_PhoneNumber: String { return self._s[3226]! }
+    public var PeerInfo_ButtonMute: String { return self._s[3227]! }
+    public var TwoFactorSetup_Password_PlaceholderConfirmPassword: String { return self._s[3229]! }
+    public var Map_ShowPlaces: String { return self._s[3230]! }
+    public var ChatAdmins_Title: String { return self._s[3231]! }
+    public var InstantPage_Reference: String { return self._s[3233]! }
+    public var Wallet_Info_Updating: String { return self._s[3234]! }
+    public var ReportGroupLocation_Text: String { return self._s[3235]! }
     public func PUSH_CHAT_MESSAGE_FWD(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[3234]!, self._r[3234]!, [_1, _2])
+        return formatWithArgumentRanges(self._s[3236]!, self._r[3236]!, [_1, _2])
     }
-    public var Camera_FlashOff: String { return self._s[3235]! }
-    public var Watch_UserInfo_Block: String { return self._s[3236]! }
-    public var ChatSettings_Stickers: String { return self._s[3237]! }
-    public var ChatSettings_DownloadInBackground: String { return self._s[3238]! }
-    public var Appearance_ThemeCarouselTintedNight: String { return self._s[3239]! }
+    public var Camera_FlashOff: String { return self._s[3237]! }
+    public var Watch_UserInfo_Block: String { return self._s[3238]! }
+    public var ChatSettings_Stickers: String { return self._s[3239]! }
+    public var ChatSettings_DownloadInBackground: String { return self._s[3240]! }
+    public var Appearance_ThemeCarouselTintedNight: String { return self._s[3241]! }
     public func UserInfo_BlockConfirmation(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[3240]!, self._r[3240]!, [_0])
+        return formatWithArgumentRanges(self._s[3242]!, self._r[3242]!, [_0])
     }
-    public var Settings_ViewPhoto: String { return self._s[3241]! }
-    public var Login_CheckOtherSessionMessages: String { return self._s[3242]! }
-    public var AutoDownloadSettings_Cellular: String { return self._s[3243]! }
-    public var Wallet_Created_ExportErrorTitle: String { return self._s[3244]! }
-    public var SettingsSearch_Synonyms_Notifications_GroupNotificationsExceptions: String { return self._s[3245]! }
-    public var VoiceOver_MessageContextShare: String { return self._s[3246]! }
+    public var Settings_ViewPhoto: String { return self._s[3243]! }
+    public var Login_CheckOtherSessionMessages: String { return self._s[3244]! }
+    public var AutoDownloadSettings_Cellular: String { return self._s[3245]! }
+    public var Wallet_Created_ExportErrorTitle: String { return self._s[3246]! }
+    public var SettingsSearch_Synonyms_Notifications_GroupNotificationsExceptions: String { return self._s[3247]! }
+    public var VoiceOver_MessageContextShare: String { return self._s[3248]! }
     public func Target_InviteToGroupConfirmation(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[3248]!, self._r[3248]!, [_0])
+        return formatWithArgumentRanges(self._s[3250]!, self._r[3250]!, [_0])
     }
-    public var Privacy_DeleteDrafts: String { return self._s[3249]! }
-    public var Wallpaper_SetCustomBackgroundInfo: String { return self._s[3250]! }
+    public var Privacy_DeleteDrafts: String { return self._s[3251]! }
+    public var Wallpaper_SetCustomBackgroundInfo: String { return self._s[3252]! }
     public func LastSeen_AtDate(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[3251]!, self._r[3251]!, [_0])
+        return formatWithArgumentRanges(self._s[3253]!, self._r[3253]!, [_0])
     }
-    public var DialogList_SavedMessagesHelp: String { return self._s[3252]! }
-    public var Wallet_SecureStorageNotAvailable_Title: String { return self._s[3253]! }
-    public var DialogList_SavedMessages: String { return self._s[3254]! }
-    public var GroupInfo_UpgradeButton: String { return self._s[3255]! }
-    public var Appearance_ThemePreview_ChatList_3_Text: String { return self._s[3257]! }
-    public var DialogList_Pin: String { return self._s[3258]! }
+    public var DialogList_SavedMessagesHelp: String { return self._s[3254]! }
+    public var Wallet_SecureStorageNotAvailable_Title: String { return self._s[3255]! }
+    public var DialogList_SavedMessages: String { return self._s[3256]! }
+    public var GroupInfo_UpgradeButton: String { return self._s[3257]! }
+    public var Appearance_ThemePreview_ChatList_3_Text: String { return self._s[3259]! }
+    public var DialogList_Pin: String { return self._s[3260]! }
     public func ForwardedAuthors2(_ _0: String, _ _1: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[3259]!, self._r[3259]!, [_0, _1])
+        return formatWithArgumentRanges(self._s[3261]!, self._r[3261]!, [_0, _1])
     }
     public func Login_PhoneGenericEmailSubject(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[3260]!, self._r[3260]!, [_0])
+        return formatWithArgumentRanges(self._s[3262]!, self._r[3262]!, [_0])
     }
-    public var Notification_Exceptions_AlwaysOn: String { return self._s[3261]! }
-    public var UserInfo_NotificationsDisable: String { return self._s[3262]! }
-    public var Conversation_ContextMenuCancelEditing: String { return self._s[3263]! }
-    public var Paint_Outlined: String { return self._s[3264]! }
-    public var Activity_PlayingGame: String { return self._s[3265]! }
-    public var SearchImages_NoImagesFound: String { return self._s[3266]! }
-    public var SocksProxySetup_ProxyType: String { return self._s[3267]! }
-    public var AppleWatch_ReplyPresetsHelp: String { return self._s[3269]! }
-    public var Conversation_ContextMenuCancelSending: String { return self._s[3270]! }
-    public var Settings_AppLanguage: String { return self._s[3271]! }
-    public var TwoStepAuth_ResetAccountHelp: String { return self._s[3272]! }
-    public var Common_ChoosePhoto: String { return self._s[3273]! }
-    public var AuthSessions_AddDevice_InvalidQRCode: String { return self._s[3274]! }
-    public var CallFeedback_ReasonEcho: String { return self._s[3275]! }
+    public var Notification_Exceptions_AlwaysOn: String { return self._s[3263]! }
+    public var UserInfo_NotificationsDisable: String { return self._s[3264]! }
+    public var Conversation_ContextMenuCancelEditing: String { return self._s[3265]! }
+    public var Paint_Outlined: String { return self._s[3266]! }
+    public var Activity_PlayingGame: String { return self._s[3267]! }
+    public var SearchImages_NoImagesFound: String { return self._s[3268]! }
+    public var SocksProxySetup_ProxyType: String { return self._s[3269]! }
+    public var AppleWatch_ReplyPresetsHelp: String { return self._s[3271]! }
+    public var Conversation_ContextMenuCancelSending: String { return self._s[3272]! }
+    public var Settings_AppLanguage: String { return self._s[3273]! }
+    public var TwoStepAuth_ResetAccountHelp: String { return self._s[3274]! }
+    public var Common_ChoosePhoto: String { return self._s[3275]! }
+    public var AuthSessions_AddDevice_InvalidQRCode: String { return self._s[3276]! }
+    public var CallFeedback_ReasonEcho: String { return self._s[3277]! }
     public func PUSH_PINNED_AUDIO(_ _1: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[3276]!, self._r[3276]!, [_1])
+        return formatWithArgumentRanges(self._s[3278]!, self._r[3278]!, [_1])
     }
-    public var Privacy_Calls_AlwaysAllow: String { return self._s[3277]! }
-    public var PollResults_Collapse: String { return self._s[3278]! }
-    public var Activity_UploadingVideo: String { return self._s[3279]! }
-    public var Conversation_WalletRequiredNotNow: String { return self._s[3280]! }
-    public var ChannelInfo_DeleteChannelConfirmation: String { return self._s[3281]! }
-    public var NetworkUsageSettings_Wifi: String { return self._s[3282]! }
-    public var VoiceOver_Editing_ClearText: String { return self._s[3283]! }
-    public var PUSH_SENDER_YOU: String { return self._s[3284]! }
-    public var Channel_BanUser_PermissionReadMessages: String { return self._s[3285]! }
-    public var Checkout_PayWithTouchId: String { return self._s[3286]! }
-    public var Wallpaper_ResetWallpapersConfirmation: String { return self._s[3287]! }
+    public var Privacy_Calls_AlwaysAllow: String { return self._s[3279]! }
+    public var PollResults_Collapse: String { return self._s[3280]! }
+    public var Activity_UploadingVideo: String { return self._s[3281]! }
+    public var Conversation_WalletRequiredNotNow: String { return self._s[3282]! }
+    public var ChannelInfo_DeleteChannelConfirmation: String { return self._s[3283]! }
+    public var NetworkUsageSettings_Wifi: String { return self._s[3284]! }
+    public var VoiceOver_Editing_ClearText: String { return self._s[3285]! }
+    public var PUSH_SENDER_YOU: String { return self._s[3286]! }
+    public var Channel_BanUser_PermissionReadMessages: String { return self._s[3287]! }
+    public var Checkout_PayWithTouchId: String { return self._s[3288]! }
+    public var Wallpaper_ResetWallpapersConfirmation: String { return self._s[3289]! }
     public func PUSH_LOCKED_MESSAGE(_ _1: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[3289]!, self._r[3289]!, [_1])
+        return formatWithArgumentRanges(self._s[3291]!, self._r[3291]!, [_1])
     }
-    public var Notifications_ExceptionsNone: String { return self._s[3290]! }
+    public var Notifications_ExceptionsNone: String { return self._s[3292]! }
     public func Message_ForwardedMessageShort(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[3291]!, self._r[3291]!, [_0])
+        return formatWithArgumentRanges(self._s[3293]!, self._r[3293]!, [_0])
     }
     public func PUSH_PINNED_GEO(_ _1: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[3292]!, self._r[3292]!, [_1])
+        return formatWithArgumentRanges(self._s[3294]!, self._r[3294]!, [_1])
     }
-    public var AuthSessions_IncompleteAttempts: String { return self._s[3294]! }
-    public var Passport_Address_Region: String { return self._s[3297]! }
-    public var ChatList_DeleteChat: String { return self._s[3298]! }
-    public var LogoutOptions_ClearCacheTitle: String { return self._s[3299]! }
-    public var PhotoEditor_TiltShift: String { return self._s[3300]! }
-    public var Settings_FAQ_URL: String { return self._s[3301]! }
-    public var TwoFactorSetup_EmailVerification_ChangeAction: String { return self._s[3302]! }
-    public var Passport_Language_sl: String { return self._s[3304]! }
-    public var Settings_PrivacySettings: String { return self._s[3306]! }
-    public var SharedMedia_TitleLink: String { return self._s[3307]! }
-    public var Passport_Identity_TypePassportUploadScan: String { return self._s[3308]! }
-    public var Settings_SetProfilePhoto: String { return self._s[3309]! }
-    public var Channel_About_Help: String { return self._s[3310]! }
-    public var Contacts_PermissionsEnable: String { return self._s[3311]! }
-    public var Wallet_Sending_Title: String { return self._s[3312]! }
-    public var PeerInfo_PaneMedia: String { return self._s[3313]! }
-    public var SettingsSearch_Synonyms_Notifications_GroupNotificationsAlert: String { return self._s[3314]! }
-    public var AttachmentMenu_SendAsFiles: String { return self._s[3315]! }
-    public var CallFeedback_ReasonInterruption: String { return self._s[3317]! }
-    public var Passport_Address_AddTemporaryRegistration: String { return self._s[3318]! }
-    public var AutoDownloadSettings_AutodownloadVideos: String { return self._s[3319]! }
-    public var ChatSettings_AutoDownloadSettings_Delimeter: String { return self._s[3320]! }
-    public var OldChannels_Title: String { return self._s[3321]! }
-    public var PrivacySettings_DeleteAccountTitle: String { return self._s[3322]! }
-    public var AccessDenied_VideoMessageCamera: String { return self._s[3324]! }
-    public var Map_OpenInYandexMaps: String { return self._s[3326]! }
-    public var CreateGroup_ErrorLocatedGroupsTooMuch: String { return self._s[3327]! }
-    public var VoiceOver_MessageContextReply: String { return self._s[3328]! }
-    public var PhotoEditor_SaturationTool: String { return self._s[3330]! }
+    public var AuthSessions_IncompleteAttempts: String { return self._s[3296]! }
+    public var Passport_Address_Region: String { return self._s[3299]! }
+    public var ChatList_DeleteChat: String { return self._s[3300]! }
+    public var LogoutOptions_ClearCacheTitle: String { return self._s[3301]! }
+    public var PhotoEditor_TiltShift: String { return self._s[3302]! }
+    public var Settings_FAQ_URL: String { return self._s[3303]! }
+    public var TwoFactorSetup_EmailVerification_ChangeAction: String { return self._s[3304]! }
+    public var Passport_Language_sl: String { return self._s[3306]! }
+    public var Settings_PrivacySettings: String { return self._s[3308]! }
+    public var SharedMedia_TitleLink: String { return self._s[3309]! }
+    public var Passport_Identity_TypePassportUploadScan: String { return self._s[3310]! }
+    public var Settings_SetProfilePhoto: String { return self._s[3311]! }
+    public var Channel_About_Help: String { return self._s[3312]! }
+    public var Contacts_PermissionsEnable: String { return self._s[3313]! }
+    public var Wallet_Sending_Title: String { return self._s[3314]! }
+    public var PeerInfo_PaneMedia: String { return self._s[3315]! }
+    public var SettingsSearch_Synonyms_Notifications_GroupNotificationsAlert: String { return self._s[3316]! }
+    public var AttachmentMenu_SendAsFiles: String { return self._s[3317]! }
+    public var CallFeedback_ReasonInterruption: String { return self._s[3319]! }
+    public var Passport_Address_AddTemporaryRegistration: String { return self._s[3320]! }
+    public var AutoDownloadSettings_AutodownloadVideos: String { return self._s[3321]! }
+    public var ChatSettings_AutoDownloadSettings_Delimeter: String { return self._s[3322]! }
+    public var OldChannels_Title: String { return self._s[3323]! }
+    public var PrivacySettings_DeleteAccountTitle: String { return self._s[3324]! }
+    public var AccessDenied_VideoMessageCamera: String { return self._s[3326]! }
+    public var Map_OpenInYandexMaps: String { return self._s[3328]! }
+    public var CreateGroup_ErrorLocatedGroupsTooMuch: String { return self._s[3329]! }
+    public var VoiceOver_MessageContextReply: String { return self._s[3330]! }
+    public var PhotoEditor_SaturationTool: String { return self._s[3332]! }
     public func PUSH_MESSAGE_STICKER(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[3331]!, self._r[3331]!, [_1, _2])
+        return formatWithArgumentRanges(self._s[3333]!, self._r[3333]!, [_1, _2])
     }
-    public var PrivacyPhoneNumberSettings_CustomHelp: String { return self._s[3332]! }
-    public var Notification_Exceptions_NewException_NotificationHeader: String { return self._s[3333]! }
-    public var Group_OwnershipTransfer_ErrorLocatedGroupsTooMuch: String { return self._s[3334]! }
+    public var PrivacyPhoneNumberSettings_CustomHelp: String { return self._s[3334]! }
+    public var Notification_Exceptions_NewException_NotificationHeader: String { return self._s[3335]! }
+    public var Group_OwnershipTransfer_ErrorLocatedGroupsTooMuch: String { return self._s[3336]! }
     public func LOCAL_MESSAGE_FWDS(_ _1: String, _ _2: Int) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[3335]!, self._r[3335]!, [_1, "\(_2)"])
+        return formatWithArgumentRanges(self._s[3337]!, self._r[3337]!, [_1, "\(_2)"])
     }
-    public var Appearance_ThemePreview_ChatList_2_Text: String { return self._s[3336]! }
-    public var Channel_Username_InvalidTooShort: String { return self._s[3338]! }
-    public var SettingsSearch_Synonyms_Wallet: String { return self._s[3339]! }
+    public var Appearance_ThemePreview_ChatList_2_Text: String { return self._s[3338]! }
+    public var Channel_Username_InvalidTooShort: String { return self._s[3340]! }
+    public var SettingsSearch_Synonyms_Wallet: String { return self._s[3341]! }
     public func Group_OwnershipTransfer_DescriptionInfo(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[3340]!, self._r[3340]!, [_1, _2])
+        return formatWithArgumentRanges(self._s[3342]!, self._r[3342]!, [_1, _2])
     }
-    public var Forward_ErrorPublicPollDisabledInChannels: String { return self._s[3341]! }
+    public var Forward_ErrorPublicPollDisabledInChannels: String { return self._s[3343]! }
     public func PUSH_CHAT_MESSAGE_GAME(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[3342]!, self._r[3342]!, [_1, _2, _3])
+        return formatWithArgumentRanges(self._s[3344]!, self._r[3344]!, [_1, _2, _3])
     }
-    public var WallpaperPreview_PatternTitle: String { return self._s[3343]! }
-    public var GroupInfo_PublicLinkAdd: String { return self._s[3344]! }
-    public var Passport_PassportInformation: String { return self._s[3347]! }
-    public var Theme_Unsupported: String { return self._s[3348]! }
-    public var WatchRemote_AlertTitle: String { return self._s[3349]! }
-    public var Privacy_GroupsAndChannels_NeverAllow: String { return self._s[3350]! }
-    public var ConvertToSupergroup_HelpText: String { return self._s[3352]! }
+    public var WallpaperPreview_PatternTitle: String { return self._s[3345]! }
+    public var GroupInfo_PublicLinkAdd: String { return self._s[3346]! }
+    public var Passport_PassportInformation: String { return self._s[3349]! }
+    public var Theme_Unsupported: String { return self._s[3350]! }
+    public var WatchRemote_AlertTitle: String { return self._s[3351]! }
+    public var Privacy_GroupsAndChannels_NeverAllow: String { return self._s[3352]! }
+    public var ConvertToSupergroup_HelpText: String { return self._s[3354]! }
     public func Time_MonthOfYear_m7(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[3353]!, self._r[3353]!, [_0])
+        return formatWithArgumentRanges(self._s[3355]!, self._r[3355]!, [_0])
     }
     public func PUSH_PHONE_CALL_REQUEST(_ _1: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[3354]!, self._r[3354]!, [_1])
+        return formatWithArgumentRanges(self._s[3356]!, self._r[3356]!, [_1])
     }
-    public var Privacy_GroupsAndChannels_CustomHelp: String { return self._s[3355]! }
-    public var Wallet_Navigation_Done: String { return self._s[3357]! }
-    public var TwoStepAuth_RecoveryCodeInvalid: String { return self._s[3358]! }
-    public var AccessDenied_CameraDisabled: String { return self._s[3359]! }
+    public var Privacy_GroupsAndChannels_CustomHelp: String { return self._s[3357]! }
+    public var Wallet_Navigation_Done: String { return self._s[3359]! }
+    public var TwoStepAuth_RecoveryCodeInvalid: String { return self._s[3360]! }
+    public var AccessDenied_CameraDisabled: String { return self._s[3361]! }
     public func Channel_Username_UsernameIsAvailable(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[3360]!, self._r[3360]!, [_0])
+        return formatWithArgumentRanges(self._s[3362]!, self._r[3362]!, [_0])
     }
-    public var ClearCache_Forever: String { return self._s[3361]! }
-    public var AuthSessions_AddDeviceIntro_Title: String { return self._s[3362]! }
-    public var CreatePoll_Quiz: String { return self._s[3363]! }
-    public var PhotoEditor_ContrastTool: String { return self._s[3366]! }
+    public var ClearCache_Forever: String { return self._s[3363]! }
+    public var AuthSessions_AddDeviceIntro_Title: String { return self._s[3364]! }
+    public var CreatePoll_Quiz: String { return self._s[3365]! }
+    public var PhotoEditor_ContrastTool: String { return self._s[3368]! }
     public func PUSH_PINNED_DOC(_ _1: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[3367]!, self._r[3367]!, [_1])
+        return formatWithArgumentRanges(self._s[3369]!, self._r[3369]!, [_1])
     }
-    public var DialogList_Draft: String { return self._s[3368]! }
-    public var Wallet_Configuration_BlockchainIdInfo: String { return self._s[3369]! }
+    public var DialogList_Draft: String { return self._s[3370]! }
+    public var Wallet_Configuration_BlockchainIdInfo: String { return self._s[3371]! }
     public func PeopleNearby_VisibleUntil(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[3370]!, self._r[3370]!, [_0])
+        return formatWithArgumentRanges(self._s[3372]!, self._r[3372]!, [_0])
     }
-    public var Privacy_TopPeersDelete: String { return self._s[3372]! }
-    public var LoginPassword_PasswordPlaceholder: String { return self._s[3373]! }
-    public var Passport_Identity_TypeIdentityCardUploadScan: String { return self._s[3374]! }
-    public var WebSearch_RecentSectionClear: String { return self._s[3375]! }
-    public var EditTheme_ErrorInvalidCharacters: String { return self._s[3376]! }
-    public var Watch_ChatList_NoConversationsTitle: String { return self._s[3378]! }
-    public var PeerInfo_ButtonMore: String { return self._s[3380]! }
-    public var Common_Done: String { return self._s[3381]! }
-    public var Shortcut_SwitchAccount: String { return self._s[3382]! }
-    public var AuthSessions_EmptyText: String { return self._s[3383]! }
-    public var Wallet_Configuration_BlockchainNameChangedTitle: String { return self._s[3384]! }
-    public var Conversation_ShareBotContactConfirmation: String { return self._s[3385]! }
-    public var Tour_Title5: String { return self._s[3386]! }
-    public var Wallet_Settings_Title: String { return self._s[3387]! }
+    public var Privacy_TopPeersDelete: String { return self._s[3374]! }
+    public var LoginPassword_PasswordPlaceholder: String { return self._s[3375]! }
+    public var Passport_Identity_TypeIdentityCardUploadScan: String { return self._s[3376]! }
+    public var WebSearch_RecentSectionClear: String { return self._s[3377]! }
+    public var EditTheme_ErrorInvalidCharacters: String { return self._s[3378]! }
+    public var Watch_ChatList_NoConversationsTitle: String { return self._s[3380]! }
+    public var PeerInfo_ButtonMore: String { return self._s[3382]! }
+    public var Common_Done: String { return self._s[3383]! }
+    public var Shortcut_SwitchAccount: String { return self._s[3384]! }
+    public var AuthSessions_EmptyText: String { return self._s[3385]! }
+    public var Wallet_Configuration_BlockchainNameChangedTitle: String { return self._s[3386]! }
+    public var Conversation_ShareBotContactConfirmation: String { return self._s[3387]! }
+    public var Tour_Title5: String { return self._s[3388]! }
+    public var Wallet_Settings_Title: String { return self._s[3389]! }
     public func Map_DirectionsDriveEta(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[3388]!, self._r[3388]!, [_0])
+        return formatWithArgumentRanges(self._s[3390]!, self._r[3390]!, [_0])
     }
-    public var ApplyLanguage_UnsufficientDataTitle: String { return self._s[3389]! }
-    public var Conversation_LinkDialogSave: String { return self._s[3390]! }
-    public var GroupInfo_ActionRestrict: String { return self._s[3391]! }
-    public var Checkout_Title: String { return self._s[3392]! }
-    public var Channel_DiscussionGroup_HeaderLabel: String { return self._s[3394]! }
-    public var Channel_AdminLog_CanChangeInfo: String { return self._s[3396]! }
-    public var Notification_RenamedGroup: String { return self._s[3397]! }
-    public var PeopleNearby_Groups: String { return self._s[3398]! }
-    public var Checkout_PayWithFaceId: String { return self._s[3399]! }
-    public var Channel_BanList_BlockedTitle: String { return self._s[3400]! }
-    public var SettingsSearch_Synonyms_Notifications_InAppNotificationsSound: String { return self._s[3402]! }
-    public var Checkout_WebConfirmation_Title: String { return self._s[3403]! }
-    public var Notifications_MessageNotificationsAlert: String { return self._s[3404]! }
+    public var ApplyLanguage_UnsufficientDataTitle: String { return self._s[3391]! }
+    public var Conversation_LinkDialogSave: String { return self._s[3392]! }
+    public var GroupInfo_ActionRestrict: String { return self._s[3393]! }
+    public var Checkout_Title: String { return self._s[3394]! }
+    public var Channel_DiscussionGroup_HeaderLabel: String { return self._s[3396]! }
+    public var Channel_AdminLog_CanChangeInfo: String { return self._s[3398]! }
+    public var Notification_RenamedGroup: String { return self._s[3399]! }
+    public var PeopleNearby_Groups: String { return self._s[3400]! }
+    public var Checkout_PayWithFaceId: String { return self._s[3401]! }
+    public var Channel_BanList_BlockedTitle: String { return self._s[3402]! }
+    public var SettingsSearch_Synonyms_Notifications_InAppNotificationsSound: String { return self._s[3404]! }
+    public var Checkout_WebConfirmation_Title: String { return self._s[3405]! }
+    public var Notifications_MessageNotificationsAlert: String { return self._s[3406]! }
     public func Activity_RemindAboutGroup(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[3405]!, self._r[3405]!, [_0])
+        return formatWithArgumentRanges(self._s[3407]!, self._r[3407]!, [_0])
     }
-    public var Profile_AddToExisting: String { return self._s[3407]! }
+    public var Profile_AddToExisting: String { return self._s[3409]! }
     public func Profile_CreateEncryptedChatOutdatedError(_ _0: String, _ _1: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[3408]!, self._r[3408]!, [_0, _1])
+        return formatWithArgumentRanges(self._s[3410]!, self._r[3410]!, [_0, _1])
     }
-    public var Cache_Files: String { return self._s[3410]! }
-    public var Permissions_PrivacyPolicy: String { return self._s[3411]! }
-    public var SocksProxySetup_ConnectAndSave: String { return self._s[3412]! }
-    public var UserInfo_NotificationsDefaultDisabled: String { return self._s[3413]! }
-    public var AutoDownloadSettings_TypeContacts: String { return self._s[3415]! }
-    public var Appearance_ThemePreview_ChatList_1_Text: String { return self._s[3417]! }
-    public var Calls_NoCallsPlaceholder: String { return self._s[3418]! }
+    public var Cache_Files: String { return self._s[3412]! }
+    public var Permissions_PrivacyPolicy: String { return self._s[3413]! }
+    public var SocksProxySetup_ConnectAndSave: String { return self._s[3414]! }
+    public var UserInfo_NotificationsDefaultDisabled: String { return self._s[3415]! }
+    public var AutoDownloadSettings_TypeContacts: String { return self._s[3417]! }
+    public var Appearance_ThemePreview_ChatList_1_Text: String { return self._s[3419]! }
+    public var Calls_NoCallsPlaceholder: String { return self._s[3420]! }
     public func Wallet_Receive_ShareInvoiceUrlInfo(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[3419]!, self._r[3419]!, [_0])
+        return formatWithArgumentRanges(self._s[3421]!, self._r[3421]!, [_0])
     }
-    public var Channel_Username_RevokeExistingUsernamesInfo: String { return self._s[3420]! }
-    public var VoiceOver_AttachMedia: String { return self._s[3423]! }
-    public var ChatList_EmptyChatFilterList: String { return self._s[3424]! }
-    public var Notifications_ExceptionsGroupPlaceholder: String { return self._s[3425]! }
+    public var Channel_Username_RevokeExistingUsernamesInfo: String { return self._s[3422]! }
+    public var VoiceOver_AttachMedia: String { return self._s[3425]! }
+    public var ChatList_EmptyChatFilterList: String { return self._s[3426]! }
+    public var Notifications_ExceptionsGroupPlaceholder: String { return self._s[3427]! }
     public func PUSH_CHAT_MESSAGE_INVOICE(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[3426]!, self._r[3426]!, [_1, _2, _3])
+        return formatWithArgumentRanges(self._s[3428]!, self._r[3428]!, [_1, _2, _3])
     }
-    public var SettingsSearch_Synonyms_Notifications_GroupNotificationsSound: String { return self._s[3427]! }
-    public var Conversation_SetReminder_Title: String { return self._s[3428]! }
-    public var Passport_FieldAddressHelp: String { return self._s[3429]! }
-    public var Privacy_GroupsAndChannels_InviteToChannelMultipleError: String { return self._s[3430]! }
-    public var PUSH_REMINDER_TITLE: String { return self._s[3431]! }
+    public var SettingsSearch_Synonyms_Notifications_GroupNotificationsSound: String { return self._s[3429]! }
+    public var Conversation_SetReminder_Title: String { return self._s[3430]! }
+    public var Passport_FieldAddressHelp: String { return self._s[3431]! }
+    public var Privacy_GroupsAndChannels_InviteToChannelMultipleError: String { return self._s[3432]! }
+    public var PUSH_REMINDER_TITLE: String { return self._s[3433]! }
     public func Login_TermsOfService_ProceedBot(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[3432]!, self._r[3432]!, [_0])
+        return formatWithArgumentRanges(self._s[3434]!, self._r[3434]!, [_0])
     }
-    public var Channel_AdminLog_EmptyTitle: String { return self._s[3433]! }
-    public var Privacy_Calls_NeverAllow_Title: String { return self._s[3434]! }
-    public var Login_UnknownError: String { return self._s[3435]! }
-    public var Group_UpgradeNoticeText2: String { return self._s[3438]! }
-    public var Watch_Compose_AddContact: String { return self._s[3439]! }
-    public var ClearCache_StorageServiceFiles: String { return self._s[3440]! }
-    public var Web_Error: String { return self._s[3441]! }
-    public var Gif_Search: String { return self._s[3442]! }
-    public var Profile_MessageLifetime1h: String { return self._s[3443]! }
-    public var CheckoutInfo_ReceiverInfoEmailPlaceholder: String { return self._s[3444]! }
-    public var Channel_Username_CheckingUsername: String { return self._s[3445]! }
-    public var CallFeedback_ReasonSilentRemote: String { return self._s[3446]! }
-    public var AutoDownloadSettings_TypeChannels: String { return self._s[3447]! }
-    public var Channel_AboutItem: String { return self._s[3448]! }
-    public var Privacy_GroupsAndChannels_AlwaysAllow_Placeholder: String { return self._s[3450]! }
-    public var VoiceOver_Chat_VoiceMessage: String { return self._s[3451]! }
-    public var GroupInfo_SharedMedia: String { return self._s[3452]! }
+    public var Channel_AdminLog_EmptyTitle: String { return self._s[3435]! }
+    public var Privacy_Calls_NeverAllow_Title: String { return self._s[3436]! }
+    public var Login_UnknownError: String { return self._s[3437]! }
+    public var Group_UpgradeNoticeText2: String { return self._s[3440]! }
+    public var Watch_Compose_AddContact: String { return self._s[3441]! }
+    public var ClearCache_StorageServiceFiles: String { return self._s[3442]! }
+    public var Web_Error: String { return self._s[3443]! }
+    public var Gif_Search: String { return self._s[3444]! }
+    public var Profile_MessageLifetime1h: String { return self._s[3445]! }
+    public var CheckoutInfo_ReceiverInfoEmailPlaceholder: String { return self._s[3446]! }
+    public var Channel_Username_CheckingUsername: String { return self._s[3447]! }
+    public var CallFeedback_ReasonSilentRemote: String { return self._s[3448]! }
+    public var AutoDownloadSettings_TypeChannels: String { return self._s[3449]! }
+    public var Channel_AboutItem: String { return self._s[3450]! }
+    public var Privacy_GroupsAndChannels_AlwaysAllow_Placeholder: String { return self._s[3452]! }
+    public var VoiceOver_Chat_VoiceMessage: String { return self._s[3453]! }
+    public var GroupInfo_SharedMedia: String { return self._s[3454]! }
     public func Channel_AdminLog_MessagePromotedName(_ _1: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[3453]!, self._r[3453]!, [_1])
-    }
-    public var Call_PhoneCallInProgressMessage: String { return self._s[3454]! }
-    public func PUSH_CHANNEL_ALBUM(_ _1: String) -> (String, [(Int, NSRange)]) {
         return formatWithArgumentRanges(self._s[3455]!, self._r[3455]!, [_1])
     }
-    public var ChatList_UndoArchiveRevealedText: String { return self._s[3456]! }
-    public var GroupInfo_InviteLink_RevokeAlert_Text: String { return self._s[3457]! }
-    public var Conversation_SearchByName_Placeholder: String { return self._s[3458]! }
-    public var CreatePoll_AddOption: String { return self._s[3459]! }
-    public var GroupInfo_Permissions_SearchPlaceholder: String { return self._s[3460]! }
-    public var Group_UpgradeNoticeHeader: String { return self._s[3461]! }
-    public var Channel_Management_AddModerator: String { return self._s[3462]! }
-    public var AutoDownloadSettings_MaxFileSize: String { return self._s[3463]! }
-    public var StickerPacksSettings_ShowStickersButton: String { return self._s[3464]! }
-    public var Wallet_Info_RefreshErrorNetworkText: String { return self._s[3465]! }
-    public var Theme_Colors_Background: String { return self._s[3466]! }
-    public var NotificationsSound_Hello: String { return self._s[3469]! }
-    public var SocksProxySetup_SavedProxies: String { return self._s[3471]! }
-    public var Channel_Stickers_Placeholder: String { return self._s[3473]! }
+    public var Call_PhoneCallInProgressMessage: String { return self._s[3456]! }
+    public func PUSH_CHANNEL_ALBUM(_ _1: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[3457]!, self._r[3457]!, [_1])
+    }
+    public var ChatList_UndoArchiveRevealedText: String { return self._s[3458]! }
+    public var GroupInfo_InviteLink_RevokeAlert_Text: String { return self._s[3459]! }
+    public var Conversation_SearchByName_Placeholder: String { return self._s[3460]! }
+    public var CreatePoll_AddOption: String { return self._s[3461]! }
+    public var GroupInfo_Permissions_SearchPlaceholder: String { return self._s[3462]! }
+    public var Group_UpgradeNoticeHeader: String { return self._s[3463]! }
+    public var Channel_Management_AddModerator: String { return self._s[3464]! }
+    public var AutoDownloadSettings_MaxFileSize: String { return self._s[3465]! }
+    public var StickerPacksSettings_ShowStickersButton: String { return self._s[3466]! }
+    public var Wallet_Info_RefreshErrorNetworkText: String { return self._s[3467]! }
+    public var Theme_Colors_Background: String { return self._s[3468]! }
+    public var NotificationsSound_Hello: String { return self._s[3471]! }
+    public var SocksProxySetup_SavedProxies: String { return self._s[3473]! }
+    public var Channel_Stickers_Placeholder: String { return self._s[3475]! }
     public func Login_EmailCodeBody(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[3474]!, self._r[3474]!, [_0])
+        return formatWithArgumentRanges(self._s[3476]!, self._r[3476]!, [_0])
     }
-    public var PrivacyPolicy_DeclineDeclineAndDelete: String { return self._s[3475]! }
-    public var Channel_Management_AddModeratorHelp: String { return self._s[3476]! }
-    public var ContactInfo_BirthdayLabel: String { return self._s[3477]! }
-    public var ChangePhoneNumberCode_RequestingACall: String { return self._s[3478]! }
-    public var AutoDownloadSettings_Channels: String { return self._s[3479]! }
-    public var Passport_Language_mn: String { return self._s[3480]! }
-    public var Notifications_ResetAllNotificationsHelp: String { return self._s[3483]! }
-    public var GroupInfo_Permissions_SlowmodeValue_Off: String { return self._s[3484]! }
-    public var Passport_Language_ja: String { return self._s[3486]! }
-    public var Settings_About_Title: String { return self._s[3487]! }
-    public var Settings_NotificationsAndSounds: String { return self._s[3488]! }
-    public var ChannelInfo_DeleteGroup: String { return self._s[3489]! }
-    public var Settings_BlockedUsers: String { return self._s[3490]! }
+    public var PrivacyPolicy_DeclineDeclineAndDelete: String { return self._s[3477]! }
+    public var Channel_Management_AddModeratorHelp: String { return self._s[3478]! }
+    public var ContactInfo_BirthdayLabel: String { return self._s[3479]! }
+    public var ChangePhoneNumberCode_RequestingACall: String { return self._s[3480]! }
+    public var AutoDownloadSettings_Channels: String { return self._s[3481]! }
+    public var Passport_Language_mn: String { return self._s[3482]! }
+    public var Notifications_ResetAllNotificationsHelp: String { return self._s[3485]! }
+    public var GroupInfo_Permissions_SlowmodeValue_Off: String { return self._s[3486]! }
+    public var Passport_Language_ja: String { return self._s[3488]! }
+    public var Settings_About_Title: String { return self._s[3489]! }
+    public var Settings_NotificationsAndSounds: String { return self._s[3490]! }
+    public var ChannelInfo_DeleteGroup: String { return self._s[3491]! }
+    public var Settings_BlockedUsers: String { return self._s[3492]! }
     public func Time_MonthOfYear_m4(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[3491]!, self._r[3491]!, [_0])
+        return formatWithArgumentRanges(self._s[3493]!, self._r[3493]!, [_0])
     }
-    public var EditTheme_Create_Preview_OutgoingText: String { return self._s[3492]! }
-    public var Wallet_Weekday_Today: String { return self._s[3493]! }
-    public var AutoDownloadSettings_PreloadVideo: String { return self._s[3494]! }
-    public var Widget_ApplicationLocked: String { return self._s[3495]! }
-    public var Passport_Address_AddResidentialAddress: String { return self._s[3496]! }
-    public var Channel_Username_Title: String { return self._s[3497]! }
+    public var EditTheme_Create_Preview_OutgoingText: String { return self._s[3494]! }
+    public var Wallet_Weekday_Today: String { return self._s[3495]! }
+    public var AutoDownloadSettings_PreloadVideo: String { return self._s[3496]! }
+    public var Widget_ApplicationLocked: String { return self._s[3497]! }
+    public var Passport_Address_AddResidentialAddress: String { return self._s[3498]! }
+    public var Channel_Username_Title: String { return self._s[3499]! }
     public func Notification_RemovedGroupPhoto(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[3498]!, self._r[3498]!, [_0])
+        return formatWithArgumentRanges(self._s[3500]!, self._r[3500]!, [_0])
     }
-    public var AttachmentMenu_File: String { return self._s[3500]! }
-    public var AppleWatch_Title: String { return self._s[3501]! }
-    public var Activity_RecordingVideoMessage: String { return self._s[3502]! }
+    public var AttachmentMenu_File: String { return self._s[3502]! }
+    public var AppleWatch_Title: String { return self._s[3503]! }
+    public var Activity_RecordingVideoMessage: String { return self._s[3504]! }
     public func Channel_DiscussionGroup_PublicChannelLink(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[3503]!, self._r[3503]!, [_1, _2])
+        return formatWithArgumentRanges(self._s[3505]!, self._r[3505]!, [_1, _2])
     }
-    public var Theme_Colors_Messages: String { return self._s[3504]! }
-    public var Weekday_Saturday: String { return self._s[3505]! }
-    public var WallpaperPreview_SwipeColorsTopText: String { return self._s[3506]! }
-    public var Profile_CreateEncryptedChatError: String { return self._s[3507]! }
-    public var Common_Next: String { return self._s[3509]! }
-    public var Channel_Stickers_YourStickers: String { return self._s[3511]! }
-    public var Message_Theme: String { return self._s[3512]! }
-    public var Call_AudioRouteHeadphones: String { return self._s[3513]! }
-    public var TwoStepAuth_EnterPasswordForgot: String { return self._s[3515]! }
-    public var Watch_Contacts_NoResults: String { return self._s[3517]! }
-    public var PhotoEditor_TintTool: String { return self._s[3520]! }
-    public var LoginPassword_ResetAccount: String { return self._s[3522]! }
-    public var Settings_SavedMessages: String { return self._s[3523]! }
-    public var SettingsSearch_Synonyms_Appearance_Animations: String { return self._s[3524]! }
-    public var Bot_GenericSupportStatus: String { return self._s[3525]! }
-    public var StickerPack_Add: String { return self._s[3526]! }
-    public var Checkout_TotalAmount: String { return self._s[3527]! }
-    public var Your_cards_number_is_invalid: String { return self._s[3528]! }
-    public var SettingsSearch_Synonyms_Appearance_AutoNightTheme: String { return self._s[3529]! }
-    public var VoiceOver_Chat_VideoMessage: String { return self._s[3530]! }
+    public var Theme_Colors_Messages: String { return self._s[3506]! }
+    public var Weekday_Saturday: String { return self._s[3507]! }
+    public var WallpaperPreview_SwipeColorsTopText: String { return self._s[3508]! }
+    public var Profile_CreateEncryptedChatError: String { return self._s[3509]! }
+    public var Common_Next: String { return self._s[3511]! }
+    public var Channel_Stickers_YourStickers: String { return self._s[3513]! }
+    public var Message_Theme: String { return self._s[3514]! }
+    public var Call_AudioRouteHeadphones: String { return self._s[3515]! }
+    public var TwoStepAuth_EnterPasswordForgot: String { return self._s[3517]! }
+    public var Watch_Contacts_NoResults: String { return self._s[3519]! }
+    public var PhotoEditor_TintTool: String { return self._s[3522]! }
+    public var LoginPassword_ResetAccount: String { return self._s[3524]! }
+    public var Settings_SavedMessages: String { return self._s[3525]! }
+    public var SettingsSearch_Synonyms_Appearance_Animations: String { return self._s[3526]! }
+    public var Bot_GenericSupportStatus: String { return self._s[3527]! }
+    public var StickerPack_Add: String { return self._s[3528]! }
+    public var Checkout_TotalAmount: String { return self._s[3529]! }
+    public var Your_cards_number_is_invalid: String { return self._s[3530]! }
+    public var SettingsSearch_Synonyms_Appearance_AutoNightTheme: String { return self._s[3531]! }
+    public var VoiceOver_Chat_VideoMessage: String { return self._s[3532]! }
     public func ChangePhoneNumberCode_CallTimer(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[3531]!, self._r[3531]!, [_0])
+        return formatWithArgumentRanges(self._s[3533]!, self._r[3533]!, [_0])
     }
     public func GroupPermission_AddedInfo(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[3532]!, self._r[3532]!, [_1, _2])
+        return formatWithArgumentRanges(self._s[3534]!, self._r[3534]!, [_1, _2])
     }
-    public var ChatSettings_ConnectionType_UseSocks5: String { return self._s[3533]! }
+    public var ChatSettings_ConnectionType_UseSocks5: String { return self._s[3535]! }
     public func PUSH_CHAT_PHOTO_EDITED(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[3535]!, self._r[3535]!, [_1, _2])
+        return formatWithArgumentRanges(self._s[3537]!, self._r[3537]!, [_1, _2])
     }
     public func Conversation_RestrictedTextTimed(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[3536]!, self._r[3536]!, [_0])
+        return formatWithArgumentRanges(self._s[3538]!, self._r[3538]!, [_0])
     }
-    public var GroupInfo_InviteLink_ShareLink: String { return self._s[3537]! }
-    public var StickerPack_Share: String { return self._s[3538]! }
-    public var Passport_DeleteAddress: String { return self._s[3539]! }
-    public var Settings_Passport: String { return self._s[3540]! }
-    public var SharedMedia_EmptyFilesText: String { return self._s[3541]! }
-    public var Conversation_DeleteMessagesForMe: String { return self._s[3542]! }
-    public var PasscodeSettings_AutoLock_IfAwayFor_1hour: String { return self._s[3543]! }
-    public var Contacts_PermissionsText: String { return self._s[3544]! }
-    public var Group_Setup_HistoryVisible: String { return self._s[3545]! }
-    public var Wallet_Month_ShortDecember: String { return self._s[3547]! }
-    public var Channel_EditAdmin_PermissionEnabledByDefault: String { return self._s[3548]! }
-    public var Passport_Address_AddRentalAgreement: String { return self._s[3549]! }
-    public var SocksProxySetup_Title: String { return self._s[3550]! }
-    public var Notification_Mute1h: String { return self._s[3551]! }
+    public var GroupInfo_InviteLink_ShareLink: String { return self._s[3539]! }
+    public var StickerPack_Share: String { return self._s[3540]! }
+    public var Passport_DeleteAddress: String { return self._s[3541]! }
+    public var Settings_Passport: String { return self._s[3542]! }
+    public var SharedMedia_EmptyFilesText: String { return self._s[3543]! }
+    public var Conversation_DeleteMessagesForMe: String { return self._s[3544]! }
+    public var PasscodeSettings_AutoLock_IfAwayFor_1hour: String { return self._s[3545]! }
+    public var Contacts_PermissionsText: String { return self._s[3546]! }
+    public var Group_Setup_HistoryVisible: String { return self._s[3547]! }
+    public var Wallet_Month_ShortDecember: String { return self._s[3549]! }
+    public var Channel_EditAdmin_PermissionEnabledByDefault: String { return self._s[3550]! }
+    public var Passport_Address_AddRentalAgreement: String { return self._s[3551]! }
+    public var SocksProxySetup_Title: String { return self._s[3552]! }
+    public var Notification_Mute1h: String { return self._s[3553]! }
     public func Passport_Email_CodeHelp(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[3552]!, self._r[3552]!, [_0])
+        return formatWithArgumentRanges(self._s[3554]!, self._r[3554]!, [_0])
     }
-    public var NotificationSettings_ShowNotificationsAllAccountsInfoOff: String { return self._s[3553]! }
+    public var NotificationSettings_ShowNotificationsAllAccountsInfoOff: String { return self._s[3555]! }
     public func PUSH_PINNED_GEOLIVE(_ _1: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[3554]!, self._r[3554]!, [_1])
+        return formatWithArgumentRanges(self._s[3556]!, self._r[3556]!, [_1])
     }
-    public var FastTwoStepSetup_PasswordSection: String { return self._s[3555]! }
-    public var NetworkUsageSettings_ResetStatsConfirmation: String { return self._s[3558]! }
-    public var InfoPlist_NSFaceIDUsageDescription: String { return self._s[3560]! }
-    public var DialogList_NoMessagesText: String { return self._s[3561]! }
-    public var Privacy_ContactsResetConfirmation: String { return self._s[3562]! }
-    public var Privacy_Calls_P2PHelp: String { return self._s[3563]! }
-    public var Channel_DiscussionGroup_SearchPlaceholder: String { return self._s[3565]! }
-    public var Your_cards_expiration_year_is_invalid: String { return self._s[3566]! }
-    public var Common_TakePhotoOrVideo: String { return self._s[3567]! }
-    public var Wallet_Words_Text: String { return self._s[3568]! }
-    public var Call_StatusBusy: String { return self._s[3569]! }
-    public var Conversation_PinnedMessage: String { return self._s[3570]! }
-    public var AutoDownloadSettings_VoiceMessagesTitle: String { return self._s[3571]! }
-    public var ChatList_EmptyChatListNewMessage: String { return self._s[3572]! }
-    public var Wallet_Configuration_BlockchainNameChangedProceed: String { return self._s[3573]! }
-    public var TwoStepAuth_SetupPasswordConfirmFailed: String { return self._s[3574]! }
-    public var Undo_ChatCleared: String { return self._s[3575]! }
-    public var AppleWatch_ReplyPresets: String { return self._s[3576]! }
-    public var Passport_DiscardMessageDescription: String { return self._s[3578]! }
-    public var Login_NetworkError: String { return self._s[3579]! }
+    public var FastTwoStepSetup_PasswordSection: String { return self._s[3557]! }
+    public var NetworkUsageSettings_ResetStatsConfirmation: String { return self._s[3560]! }
+    public var InfoPlist_NSFaceIDUsageDescription: String { return self._s[3562]! }
+    public var DialogList_NoMessagesText: String { return self._s[3563]! }
+    public var Privacy_ContactsResetConfirmation: String { return self._s[3564]! }
+    public var Privacy_Calls_P2PHelp: String { return self._s[3565]! }
+    public var Channel_DiscussionGroup_SearchPlaceholder: String { return self._s[3567]! }
+    public var Your_cards_expiration_year_is_invalid: String { return self._s[3568]! }
+    public var Common_TakePhotoOrVideo: String { return self._s[3569]! }
+    public var Wallet_Words_Text: String { return self._s[3570]! }
+    public var Call_StatusBusy: String { return self._s[3571]! }
+    public var Conversation_PinnedMessage: String { return self._s[3572]! }
+    public var AutoDownloadSettings_VoiceMessagesTitle: String { return self._s[3573]! }
+    public var ChatList_EmptyChatListNewMessage: String { return self._s[3574]! }
+    public var Wallet_Configuration_BlockchainNameChangedProceed: String { return self._s[3575]! }
+    public var TwoStepAuth_SetupPasswordConfirmFailed: String { return self._s[3576]! }
+    public var Undo_ChatCleared: String { return self._s[3577]! }
+    public var AppleWatch_ReplyPresets: String { return self._s[3578]! }
+    public var Passport_DiscardMessageDescription: String { return self._s[3580]! }
+    public var Login_NetworkError: String { return self._s[3581]! }
     public func Notification_PinnedRoundMessage(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[3580]!, self._r[3580]!, [_0])
+        return formatWithArgumentRanges(self._s[3582]!, self._r[3582]!, [_0])
     }
     public func Channel_AdminLog_MessageRemovedChannelUsername(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[3581]!, self._r[3581]!, [_0])
+        return formatWithArgumentRanges(self._s[3583]!, self._r[3583]!, [_0])
     }
-    public var SocksProxySetup_PasswordPlaceholder: String { return self._s[3582]! }
-    public var Wallet_WordCheck_ViewWords: String { return self._s[3584]! }
-    public var Login_ResetAccountProtected_LimitExceeded: String { return self._s[3585]! }
+    public var SocksProxySetup_PasswordPlaceholder: String { return self._s[3584]! }
+    public var Wallet_WordCheck_ViewWords: String { return self._s[3586]! }
+    public var Login_ResetAccountProtected_LimitExceeded: String { return self._s[3587]! }
     public func Watch_LastSeen_YesterdayAt(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[3587]!, self._r[3587]!, [_0])
+        return formatWithArgumentRanges(self._s[3589]!, self._r[3589]!, [_0])
     }
-    public var Call_ConnectionErrorMessage: String { return self._s[3588]! }
-    public var VoiceOver_Chat_Music: String { return self._s[3589]! }
-    public var SettingsSearch_Synonyms_Notifications_MessageNotificationsSound: String { return self._s[3590]! }
-    public var Compose_GroupTokenListPlaceholder: String { return self._s[3592]! }
-    public var ConversationMedia_Title: String { return self._s[3593]! }
-    public var EncryptionKey_Title: String { return self._s[3595]! }
-    public var TwoStepAuth_EnterPasswordTitle: String { return self._s[3596]! }
-    public var Notification_Exceptions_AddException: String { return self._s[3597]! }
-    public var PrivacySettings_BlockedPeersEmpty: String { return self._s[3598]! }
-    public var Profile_MessageLifetime1m: String { return self._s[3599]! }
+    public var Call_ConnectionErrorMessage: String { return self._s[3590]! }
+    public var VoiceOver_Chat_Music: String { return self._s[3591]! }
+    public var SettingsSearch_Synonyms_Notifications_MessageNotificationsSound: String { return self._s[3592]! }
+    public var Compose_GroupTokenListPlaceholder: String { return self._s[3594]! }
+    public var ConversationMedia_Title: String { return self._s[3595]! }
+    public var EncryptionKey_Title: String { return self._s[3597]! }
+    public var TwoStepAuth_EnterPasswordTitle: String { return self._s[3598]! }
+    public var Notification_Exceptions_AddException: String { return self._s[3599]! }
+    public var PrivacySettings_BlockedPeersEmpty: String { return self._s[3600]! }
+    public var Profile_MessageLifetime1m: String { return self._s[3601]! }
     public func Channel_AdminLog_MessageUnkickedName(_ _1: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[3600]!, self._r[3600]!, [_1])
+        return formatWithArgumentRanges(self._s[3602]!, self._r[3602]!, [_1])
     }
-    public var Month_GenMay: String { return self._s[3601]! }
+    public var Month_GenMay: String { return self._s[3603]! }
     public func LiveLocationUpdated_TodayAt(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[3602]!, self._r[3602]!, [_0])
+        return formatWithArgumentRanges(self._s[3604]!, self._r[3604]!, [_0])
     }
-    public var PeopleNearby_Users: String { return self._s[3603]! }
-    public var Wallet_Send_AddressInfo: String { return self._s[3604]! }
-    public var ChannelMembers_WhoCanAddMembersAllHelp: String { return self._s[3605]! }
-    public var AutoDownloadSettings_ResetSettings: String { return self._s[3606]! }
+    public var PeopleNearby_Users: String { return self._s[3605]! }
+    public var Wallet_Send_AddressInfo: String { return self._s[3606]! }
+    public var ChannelMembers_WhoCanAddMembersAllHelp: String { return self._s[3607]! }
+    public var AutoDownloadSettings_ResetSettings: String { return self._s[3608]! }
     public func Wallet_Updated_AtDate(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[3608]!, self._r[3608]!, [_0])
+        return formatWithArgumentRanges(self._s[3610]!, self._r[3610]!, [_0])
     }
-    public var Conversation_EmptyPlaceholder: String { return self._s[3609]! }
-    public var Passport_Address_AddPassportRegistration: String { return self._s[3610]! }
-    public var Notifications_ChannelNotificationsAlert: String { return self._s[3611]! }
-    public var ChatSettings_AutoDownloadUsingCellular: String { return self._s[3612]! }
-    public var Camera_TapAndHoldForVideo: String { return self._s[3613]! }
-    public var Channel_JoinChannel: String { return self._s[3615]! }
-    public var Appearance_Animations: String { return self._s[3618]! }
+    public var Conversation_EmptyPlaceholder: String { return self._s[3611]! }
+    public var Passport_Address_AddPassportRegistration: String { return self._s[3612]! }
+    public var Notifications_ChannelNotificationsAlert: String { return self._s[3613]! }
+    public var ChatSettings_AutoDownloadUsingCellular: String { return self._s[3614]! }
+    public var Camera_TapAndHoldForVideo: String { return self._s[3615]! }
+    public var Channel_JoinChannel: String { return self._s[3617]! }
+    public var Appearance_Animations: String { return self._s[3620]! }
     public func Notification_MessageLifetimeChanged(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[3619]!, self._r[3619]!, [_1, _2])
+        return formatWithArgumentRanges(self._s[3621]!, self._r[3621]!, [_1, _2])
     }
-    public var Stickers_GroupStickers: String { return self._s[3621]! }
-    public var Appearance_ShareTheme: String { return self._s[3622]! }
-    public var TwoFactorSetup_Hint_Placeholder: String { return self._s[3623]! }
-    public var ConvertToSupergroup_HelpTitle: String { return self._s[3625]! }
-    public var StickerPackActionInfo_RemovedTitle: String { return self._s[3626]! }
-    public var Passport_Address_Street: String { return self._s[3627]! }
-    public var Conversation_AddContact: String { return self._s[3628]! }
-    public var Login_PhonePlaceholder: String { return self._s[3629]! }
-    public var Channel_Members_InviteLink: String { return self._s[3631]! }
-    public var Bot_Stop: String { return self._s[3632]! }
-    public var SettingsSearch_Synonyms_Proxy_UseForCalls: String { return self._s[3634]! }
-    public var Notification_PassportValueAddress: String { return self._s[3635]! }
-    public var Month_ShortJuly: String { return self._s[3636]! }
-    public var Passport_Address_TypeTemporaryRegistrationUploadScan: String { return self._s[3637]! }
-    public var Channel_AdminLog_BanSendMedia: String { return self._s[3638]! }
-    public var Passport_Identity_ReverseSide: String { return self._s[3639]! }
-    public var Watch_Stickers_Recents: String { return self._s[3642]! }
-    public var PrivacyLastSeenSettings_EmpryUsersPlaceholder: String { return self._s[3644]! }
-    public var Map_SendThisLocation: String { return self._s[3645]! }
+    public var Stickers_GroupStickers: String { return self._s[3623]! }
+    public var Appearance_ShareTheme: String { return self._s[3624]! }
+    public var TwoFactorSetup_Hint_Placeholder: String { return self._s[3625]! }
+    public var ConvertToSupergroup_HelpTitle: String { return self._s[3627]! }
+    public var StickerPackActionInfo_RemovedTitle: String { return self._s[3628]! }
+    public var Passport_Address_Street: String { return self._s[3629]! }
+    public var Conversation_AddContact: String { return self._s[3630]! }
+    public var Login_PhonePlaceholder: String { return self._s[3631]! }
+    public var Channel_Members_InviteLink: String { return self._s[3633]! }
+    public var Bot_Stop: String { return self._s[3634]! }
+    public var SettingsSearch_Synonyms_Proxy_UseForCalls: String { return self._s[3636]! }
+    public var Notification_PassportValueAddress: String { return self._s[3637]! }
+    public var Month_ShortJuly: String { return self._s[3638]! }
+    public var Passport_Address_TypeTemporaryRegistrationUploadScan: String { return self._s[3639]! }
+    public var Channel_AdminLog_BanSendMedia: String { return self._s[3640]! }
+    public var Passport_Identity_ReverseSide: String { return self._s[3641]! }
+    public var Watch_Stickers_Recents: String { return self._s[3644]! }
+    public var PrivacyLastSeenSettings_EmpryUsersPlaceholder: String { return self._s[3646]! }
+    public var Map_SendThisLocation: String { return self._s[3647]! }
     public func Time_MonthOfYear_m1(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[3646]!, self._r[3646]!, [_0])
+        return formatWithArgumentRanges(self._s[3648]!, self._r[3648]!, [_0])
     }
     public func InviteText_SingleContact(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[3647]!, self._r[3647]!, [_0])
+        return formatWithArgumentRanges(self._s[3649]!, self._r[3649]!, [_0])
     }
-    public var ConvertToSupergroup_Note: String { return self._s[3648]! }
-    public var Wallet_Intro_NotNow: String { return self._s[3649]! }
+    public var ConvertToSupergroup_Note: String { return self._s[3650]! }
+    public var Wallet_Intro_NotNow: String { return self._s[3651]! }
     public func FileSize_MB(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[3650]!, self._r[3650]!, [_0])
+        return formatWithArgumentRanges(self._s[3652]!, self._r[3652]!, [_0])
     }
-    public var NetworkUsageSettings_GeneralDataSection: String { return self._s[3651]! }
+    public var NetworkUsageSettings_GeneralDataSection: String { return self._s[3653]! }
     public func Compatibility_SecretMediaVersionTooLow(_ _0: String, _ _1: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[3652]!, self._r[3652]!, [_0, _1])
+        return formatWithArgumentRanges(self._s[3654]!, self._r[3654]!, [_0, _1])
     }
-    public var Login_CallRequestState3: String { return self._s[3654]! }
-    public var Wallpaper_SearchShort: String { return self._s[3655]! }
-    public var SettingsSearch_Synonyms_Appearance_ColorTheme: String { return self._s[3657]! }
-    public var PasscodeSettings_UnlockWithFaceId: String { return self._s[3658]! }
-    public var Channel_BotDoesntSupportGroups: String { return self._s[3659]! }
+    public var Login_CallRequestState3: String { return self._s[3656]! }
+    public var Wallpaper_SearchShort: String { return self._s[3657]! }
+    public var SettingsSearch_Synonyms_Appearance_ColorTheme: String { return self._s[3659]! }
+    public var PasscodeSettings_UnlockWithFaceId: String { return self._s[3660]! }
+    public var Channel_BotDoesntSupportGroups: String { return self._s[3661]! }
     public func PUSH_CHAT_MESSAGE_GEOLIVE(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[3660]!, self._r[3660]!, [_1, _2])
+        return formatWithArgumentRanges(self._s[3662]!, self._r[3662]!, [_1, _2])
     }
-    public var Channel_AdminLogFilter_Title: String { return self._s[3661]! }
-    public var Appearance_ThemePreview_Chat_4_Text: String { return self._s[3663]! }
-    public var Notifications_GroupNotificationsExceptions: String { return self._s[3666]! }
+    public var Channel_AdminLogFilter_Title: String { return self._s[3663]! }
+    public var Appearance_ThemePreview_Chat_4_Text: String { return self._s[3665]! }
+    public var Notifications_GroupNotificationsExceptions: String { return self._s[3668]! }
     public func FileSize_B(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[3667]!, self._r[3667]!, [_0])
+        return formatWithArgumentRanges(self._s[3669]!, self._r[3669]!, [_0])
     }
-    public var Passport_CorrectErrors: String { return self._s[3668]! }
-    public var VoiceOver_Chat_YourAnonymousPoll: String { return self._s[3669]! }
+    public var Passport_CorrectErrors: String { return self._s[3670]! }
+    public var VoiceOver_Chat_YourAnonymousPoll: String { return self._s[3671]! }
     public func Channel_MessageTitleUpdated(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[3670]!, self._r[3670]!, [_0])
+        return formatWithArgumentRanges(self._s[3672]!, self._r[3672]!, [_0])
     }
-    public var Map_SendMyCurrentLocation: String { return self._s[3671]! }
-    public var Channel_DiscussionGroup: String { return self._s[3672]! }
-    public var TwoFactorSetup_Email_SkipConfirmationSkip: String { return self._s[3673]! }
+    public var Map_SendMyCurrentLocation: String { return self._s[3673]! }
+    public var Channel_DiscussionGroup: String { return self._s[3674]! }
+    public var TwoFactorSetup_Email_SkipConfirmationSkip: String { return self._s[3675]! }
     public func PUSH_PINNED_CONTACT(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[3674]!, self._r[3674]!, [_1, _2])
+        return formatWithArgumentRanges(self._s[3676]!, self._r[3676]!, [_1, _2])
     }
-    public var SharedMedia_SearchNoResults: String { return self._s[3675]! }
-    public var Permissions_NotificationsText_v0: String { return self._s[3676]! }
-    public var Channel_EditAdmin_PermissionDeleteMessagesOfOthers: String { return self._s[3677]! }
-    public var Appearance_AppIcon: String { return self._s[3678]! }
-    public var Appearance_ThemePreview_ChatList_3_AuthorName: String { return self._s[3679]! }
-    public var LoginPassword_FloodError: String { return self._s[3680]! }
-    public var Wallet_Send_OwnAddressAlertProceed: String { return self._s[3682]! }
-    public var Group_Setup_HistoryHiddenHelp: String { return self._s[3683]! }
+    public var SharedMedia_SearchNoResults: String { return self._s[3677]! }
+    public var Permissions_NotificationsText_v0: String { return self._s[3678]! }
+    public var Channel_EditAdmin_PermissionDeleteMessagesOfOthers: String { return self._s[3679]! }
+    public var Appearance_AppIcon: String { return self._s[3680]! }
+    public var Appearance_ThemePreview_ChatList_3_AuthorName: String { return self._s[3681]! }
+    public var LoginPassword_FloodError: String { return self._s[3682]! }
+    public var Wallet_Send_OwnAddressAlertProceed: String { return self._s[3684]! }
+    public var Group_Setup_HistoryHiddenHelp: String { return self._s[3685]! }
     public func TwoStepAuth_PendingEmailHelp(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[3684]!, self._r[3684]!, [_0])
-    }
-    public var Passport_Language_bn: String { return self._s[3685]! }
-    public func DialogList_SingleUploadingPhotoSuffix(_ _0: String) -> (String, [(Int, NSRange)]) {
         return formatWithArgumentRanges(self._s[3686]!, self._r[3686]!, [_0])
     }
-    public var ChatList_Context_Pin: String { return self._s[3687]! }
-    public func Notification_PinnedAudioMessage(_ _0: String) -> (String, [(Int, NSRange)]) {
+    public var Passport_Language_bn: String { return self._s[3687]! }
+    public func DialogList_SingleUploadingPhotoSuffix(_ _0: String) -> (String, [(Int, NSRange)]) {
         return formatWithArgumentRanges(self._s[3688]!, self._r[3688]!, [_0])
     }
+    public var ChatList_Context_Pin: String { return self._s[3689]! }
+    public func Notification_PinnedAudioMessage(_ _0: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[3690]!, self._r[3690]!, [_0])
+    }
     public func Channel_AdminLog_MessageChangedGroupStickerPack(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[3689]!, self._r[3689]!, [_0])
+        return formatWithArgumentRanges(self._s[3691]!, self._r[3691]!, [_0])
     }
-    public var Wallet_Navigation_Close: String { return self._s[3690]! }
-    public var GroupInfo_InvitationLinkGroupFull: String { return self._s[3694]! }
-    public var Group_EditAdmin_PermissionChangeInfo: String { return self._s[3696]! }
-    public var Wallet_Month_GenDecember: String { return self._s[3697]! }
-    public var Contacts_PermissionsAllow: String { return self._s[3698]! }
-    public var ReportPeer_ReasonCopyright: String { return self._s[3699]! }
-    public var Channel_EditAdmin_PermissinAddAdminOn: String { return self._s[3700]! }
-    public var WallpaperPreview_Pattern: String { return self._s[3701]! }
-    public var Paint_Duplicate: String { return self._s[3702]! }
-    public var Passport_Address_Country: String { return self._s[3703]! }
-    public var Notification_RenamedChannel: String { return self._s[3705]! }
-    public var ChatList_Context_Unmute: String { return self._s[3706]! }
-    public var CheckoutInfo_ErrorPostcodeInvalid: String { return self._s[3707]! }
-    public var Group_MessagePhotoUpdated: String { return self._s[3708]! }
-    public var Channel_BanUser_PermissionSendMedia: String { return self._s[3709]! }
-    public var Conversation_ContextMenuBan: String { return self._s[3710]! }
-    public var TwoStepAuth_EmailSent: String { return self._s[3711]! }
-    public var MessagePoll_NoVotes: String { return self._s[3712]! }
-    public var Wallet_Send_ErrorNotEnoughFundsTitle: String { return self._s[3713]! }
-    public var Passport_Language_is: String { return self._s[3715]! }
-    public var PeopleNearby_UsersEmpty: String { return self._s[3717]! }
-    public var Tour_Text5: String { return self._s[3718]! }
+    public var Wallet_Navigation_Close: String { return self._s[3692]! }
+    public var GroupInfo_InvitationLinkGroupFull: String { return self._s[3696]! }
+    public var Group_EditAdmin_PermissionChangeInfo: String { return self._s[3698]! }
+    public var Wallet_Month_GenDecember: String { return self._s[3699]! }
+    public var Contacts_PermissionsAllow: String { return self._s[3700]! }
+    public var ReportPeer_ReasonCopyright: String { return self._s[3701]! }
+    public var Channel_EditAdmin_PermissinAddAdminOn: String { return self._s[3702]! }
+    public var WallpaperPreview_Pattern: String { return self._s[3703]! }
+    public var Paint_Duplicate: String { return self._s[3704]! }
+    public var Passport_Address_Country: String { return self._s[3705]! }
+    public var Notification_RenamedChannel: String { return self._s[3707]! }
+    public var ChatList_Context_Unmute: String { return self._s[3708]! }
+    public var CheckoutInfo_ErrorPostcodeInvalid: String { return self._s[3709]! }
+    public var Group_MessagePhotoUpdated: String { return self._s[3710]! }
+    public var Channel_BanUser_PermissionSendMedia: String { return self._s[3711]! }
+    public var Conversation_ContextMenuBan: String { return self._s[3712]! }
+    public var TwoStepAuth_EmailSent: String { return self._s[3713]! }
+    public var MessagePoll_NoVotes: String { return self._s[3714]! }
+    public var Wallet_Send_ErrorNotEnoughFundsTitle: String { return self._s[3715]! }
+    public var Passport_Language_is: String { return self._s[3717]! }
+    public var PeopleNearby_UsersEmpty: String { return self._s[3719]! }
+    public var Tour_Text5: String { return self._s[3720]! }
     public func Call_GroupFormat(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[3721]!, self._r[3721]!, [_1, _2])
+        return formatWithArgumentRanges(self._s[3723]!, self._r[3723]!, [_1, _2])
     }
-    public var Undo_SecretChatDeleted: String { return self._s[3722]! }
-    public var SocksProxySetup_ShareQRCode: String { return self._s[3723]! }
+    public var Undo_SecretChatDeleted: String { return self._s[3724]! }
+    public var SocksProxySetup_ShareQRCode: String { return self._s[3725]! }
     public func VoiceOver_Chat_Size(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[3724]!, self._r[3724]!, [_0])
+        return formatWithArgumentRanges(self._s[3726]!, self._r[3726]!, [_0])
     }
-    public var Forward_ErrorDisabledForChat: String { return self._s[3725]! }
-    public var LogoutOptions_ChangePhoneNumberText: String { return self._s[3726]! }
-    public var Paint_Edit: String { return self._s[3728]! }
-    public var ScheduledMessages_ReminderNotification: String { return self._s[3730]! }
-    public var Undo_DeletedGroup: String { return self._s[3732]! }
-    public var LoginPassword_ForgotPassword: String { return self._s[3733]! }
-    public var Wallet_WordImport_IncorrectTitle: String { return self._s[3734]! }
-    public var GroupInfo_GroupNamePlaceholder: String { return self._s[3735]! }
+    public var Forward_ErrorDisabledForChat: String { return self._s[3727]! }
+    public var LogoutOptions_ChangePhoneNumberText: String { return self._s[3728]! }
+    public var Paint_Edit: String { return self._s[3730]! }
+    public var ScheduledMessages_ReminderNotification: String { return self._s[3732]! }
+    public var Undo_DeletedGroup: String { return self._s[3734]! }
+    public var LoginPassword_ForgotPassword: String { return self._s[3735]! }
+    public var Wallet_WordImport_IncorrectTitle: String { return self._s[3736]! }
+    public var GroupInfo_GroupNamePlaceholder: String { return self._s[3737]! }
     public func Notification_Kicked(_ _0: String, _ _1: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[3736]!, self._r[3736]!, [_0, _1])
+        return formatWithArgumentRanges(self._s[3738]!, self._r[3738]!, [_0, _1])
     }
-    public var AppWallet_TransactionInfo_FeeInfoURL: String { return self._s[3737]! }
-    public var Conversation_InputTextCaptionPlaceholder: String { return self._s[3738]! }
-    public var AutoDownloadSettings_VideoMessagesTitle: String { return self._s[3739]! }
-    public var Passport_Language_uz: String { return self._s[3740]! }
-    public var Conversation_PinMessageAlertGroup: String { return self._s[3741]! }
-    public var SettingsSearch_Synonyms_Privacy_GroupsAndChannels: String { return self._s[3742]! }
-    public var Map_StopLiveLocation: String { return self._s[3744]! }
-    public var VoiceOver_MessageContextSend: String { return self._s[3746]! }
-    public var PasscodeSettings_Help: String { return self._s[3747]! }
-    public var NotificationsSound_Input: String { return self._s[3748]! }
-    public var Share_Title: String { return self._s[3751]! }
-    public var LogoutOptions_Title: String { return self._s[3752]! }
-    public var Wallet_Send_AddressText: String { return self._s[3753]! }
-    public var Login_TermsOfServiceAgree: String { return self._s[3754]! }
-    public var Compose_NewEncryptedChatTitle: String { return self._s[3755]! }
-    public var Channel_AdminLog_TitleSelectedEvents: String { return self._s[3756]! }
-    public var Channel_EditAdmin_PermissionEditMessages: String { return self._s[3757]! }
-    public var EnterPasscode_EnterTitle: String { return self._s[3758]! }
+    public var AppWallet_TransactionInfo_FeeInfoURL: String { return self._s[3739]! }
+    public var Conversation_InputTextCaptionPlaceholder: String { return self._s[3740]! }
+    public var AutoDownloadSettings_VideoMessagesTitle: String { return self._s[3741]! }
+    public var Passport_Language_uz: String { return self._s[3742]! }
+    public var Conversation_PinMessageAlertGroup: String { return self._s[3743]! }
+    public var SettingsSearch_Synonyms_Privacy_GroupsAndChannels: String { return self._s[3744]! }
+    public var Map_StopLiveLocation: String { return self._s[3746]! }
+    public var VoiceOver_MessageContextSend: String { return self._s[3748]! }
+    public var PasscodeSettings_Help: String { return self._s[3749]! }
+    public var NotificationsSound_Input: String { return self._s[3750]! }
+    public var Share_Title: String { return self._s[3753]! }
+    public var LogoutOptions_Title: String { return self._s[3754]! }
+    public var Wallet_Send_AddressText: String { return self._s[3755]! }
+    public var Login_TermsOfServiceAgree: String { return self._s[3756]! }
+    public var Compose_NewEncryptedChatTitle: String { return self._s[3757]! }
+    public var Channel_AdminLog_TitleSelectedEvents: String { return self._s[3758]! }
+    public var Channel_EditAdmin_PermissionEditMessages: String { return self._s[3759]! }
+    public var EnterPasscode_EnterTitle: String { return self._s[3760]! }
     public func Call_PrivacyErrorMessage(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[3759]!, self._r[3759]!, [_0])
+        return formatWithArgumentRanges(self._s[3761]!, self._r[3761]!, [_0])
     }
-    public var Settings_CopyPhoneNumber: String { return self._s[3760]! }
-    public var Conversation_AddToContacts: String { return self._s[3761]! }
+    public var Settings_CopyPhoneNumber: String { return self._s[3762]! }
+    public var Conversation_AddToContacts: String { return self._s[3763]! }
     public func VoiceOver_Chat_ReplyFrom(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[3762]!, self._r[3762]!, [_0])
-    }
-    public var NotificationsSound_Keys: String { return self._s[3763]! }
-    public func Call_ParticipantVersionOutdatedError(_ _0: String) -> (String, [(Int, NSRange)]) {
         return formatWithArgumentRanges(self._s[3764]!, self._r[3764]!, [_0])
     }
-    public var Notification_MessageLifetime1w: String { return self._s[3765]! }
-    public var Message_Video: String { return self._s[3766]! }
-    public var AutoDownloadSettings_CellularTitle: String { return self._s[3767]! }
-    public func PUSH_CHANNEL_MESSAGE_PHOTO(_ _1: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[3768]!, self._r[3768]!, [_1])
+    public var NotificationsSound_Keys: String { return self._s[3765]! }
+    public func Call_ParticipantVersionOutdatedError(_ _0: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[3766]!, self._r[3766]!, [_0])
     }
-    public var Wallet_Receive_AmountInfo: String { return self._s[3771]! }
-    public var Stats_Overview: String { return self._s[3772]! }
+    public var Notification_MessageLifetime1w: String { return self._s[3767]! }
+    public var Message_Video: String { return self._s[3768]! }
+    public var AutoDownloadSettings_CellularTitle: String { return self._s[3769]! }
+    public func PUSH_CHANNEL_MESSAGE_PHOTO(_ _1: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[3770]!, self._r[3770]!, [_1])
+    }
+    public var Wallet_Receive_AmountInfo: String { return self._s[3773]! }
+    public var Stats_Overview: String { return self._s[3774]! }
     public func Notification_JoinedChat(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[3773]!, self._r[3773]!, [_0])
+        return formatWithArgumentRanges(self._s[3775]!, self._r[3775]!, [_0])
     }
     public func PrivacySettings_LastSeenContactsPlus(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[3774]!, self._r[3774]!, [_0])
+        return formatWithArgumentRanges(self._s[3776]!, self._r[3776]!, [_0])
     }
-    public var Passport_Language_mk: String { return self._s[3775]! }
+    public var Passport_Language_mk: String { return self._s[3777]! }
     public func Wallet_Time_PreciseDate_m2(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[3776]!, self._r[3776]!, [_1, _2, _3])
+        return formatWithArgumentRanges(self._s[3778]!, self._r[3778]!, [_1, _2, _3])
     }
-    public var CreatePoll_CancelConfirmation: String { return self._s[3777]! }
-    public var MessagePoll_LabelAnonymousQuiz: String { return self._s[3778]! }
-    public var Conversation_SilentBroadcastTooltipOn: String { return self._s[3780]! }
-    public var PrivacyPolicy_Decline: String { return self._s[3781]! }
-    public var Passport_Identity_DoesNotExpire: String { return self._s[3782]! }
-    public var Channel_AdminLogFilter_EventsRestrictions: String { return self._s[3783]! }
-    public var AuthSessions_AddDeviceIntro_Action: String { return self._s[3784]! }
-    public var Permissions_SiriAllow_v0: String { return self._s[3786]! }
-    public var Wallet_Month_ShortAugust: String { return self._s[3787]! }
-    public var Appearance_ThemeCarouselNight: String { return self._s[3788]! }
+    public var CreatePoll_CancelConfirmation: String { return self._s[3779]! }
+    public var MessagePoll_LabelAnonymousQuiz: String { return self._s[3780]! }
+    public var Conversation_SilentBroadcastTooltipOn: String { return self._s[3782]! }
+    public var PrivacyPolicy_Decline: String { return self._s[3783]! }
+    public var Passport_Identity_DoesNotExpire: String { return self._s[3784]! }
+    public var Channel_AdminLogFilter_EventsRestrictions: String { return self._s[3785]! }
+    public var AuthSessions_AddDeviceIntro_Action: String { return self._s[3786]! }
+    public var Permissions_SiriAllow_v0: String { return self._s[3788]! }
+    public var Wallet_Month_ShortAugust: String { return self._s[3789]! }
+    public var Appearance_ThemeCarouselNight: String { return self._s[3790]! }
     public func LOCAL_CHAT_MESSAGE_FWDS(_ _1: String, _ _2: Int) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[3789]!, self._r[3789]!, [_1, "\(_2)"])
+        return formatWithArgumentRanges(self._s[3791]!, self._r[3791]!, [_1, "\(_2)"])
     }
     public func Notification_RenamedChat(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[3790]!, self._r[3790]!, [_0])
+        return formatWithArgumentRanges(self._s[3792]!, self._r[3792]!, [_0])
     }
-    public var Paint_Regular: String { return self._s[3791]! }
-    public var ChatSettings_AutoDownloadReset: String { return self._s[3792]! }
-    public var SocksProxySetup_ShareLink: String { return self._s[3793]! }
-    public var Wallet_Qr_Title: String { return self._s[3794]! }
-    public var BlockedUsers_SelectUserTitle: String { return self._s[3795]! }
-    public var VoiceOver_Chat_RecordModeVoiceMessage: String { return self._s[3797]! }
-    public var Wallet_Settings_Configuration: String { return self._s[3798]! }
-    public var GroupInfo_InviteByLink: String { return self._s[3799]! }
-    public var MessageTimer_Custom: String { return self._s[3800]! }
-    public var UserInfo_NotificationsDefaultEnabled: String { return self._s[3801]! }
-    public var Conversation_StopQuizConfirmationTitle: String { return self._s[3802]! }
-    public var Passport_Address_TypeTemporaryRegistration: String { return self._s[3804]! }
-    public var Conversation_SendMessage_SetReminder: String { return self._s[3805]! }
-    public var VoiceOver_Chat_Selected: String { return self._s[3806]! }
-    public var ChatSettings_AutoDownloadUsingWiFi: String { return self._s[3807]! }
-    public var Channel_Username_InvalidTaken: String { return self._s[3808]! }
-    public var Conversation_ClousStorageInfo_Description3: String { return self._s[3809]! }
-    public var Wallet_WordCheck_TryAgain: String { return self._s[3810]! }
-    public var Wallet_Info_TransactionPendingHeader: String { return self._s[3811]! }
-    public var Settings_ChatBackground: String { return self._s[3812]! }
-    public var Channel_Subscribers_Title: String { return self._s[3813]! }
-    public var Wallet_Receive_InvoiceUrlHeader: String { return self._s[3814]! }
-    public var ApplyLanguage_ChangeLanguageTitle: String { return self._s[3815]! }
-    public var Watch_ConnectionDescription: String { return self._s[3816]! }
-    public var OldChannels_NoticeText: String { return self._s[3819]! }
-    public var Wallet_Configuration_ApplyErrorTitle: String { return self._s[3820]! }
-    public var IntentsSettings_SuggestBy: String { return self._s[3822]! }
-    public var Theme_ThemeChangedText: String { return self._s[3823]! }
-    public var ChatList_ArchivedChatsTitle: String { return self._s[3824]! }
-    public var Wallpaper_ResetWallpapers: String { return self._s[3825]! }
-    public var Wallet_Send_TransactionInProgress: String { return self._s[3826]! }
-    public var EditProfile_Title: String { return self._s[3827]! }
-    public var NotificationsSound_Bamboo: String { return self._s[3829]! }
-    public var Channel_AdminLog_MessagePreviousMessage: String { return self._s[3831]! }
-    public var Login_SmsRequestState2: String { return self._s[3832]! }
-    public var Passport_Language_ar: String { return self._s[3833]! }
+    public var Paint_Regular: String { return self._s[3793]! }
+    public var ChatSettings_AutoDownloadReset: String { return self._s[3794]! }
+    public var SocksProxySetup_ShareLink: String { return self._s[3795]! }
+    public var Wallet_Qr_Title: String { return self._s[3796]! }
+    public var BlockedUsers_SelectUserTitle: String { return self._s[3797]! }
+    public var VoiceOver_Chat_RecordModeVoiceMessage: String { return self._s[3799]! }
+    public var Wallet_Settings_Configuration: String { return self._s[3800]! }
+    public var GroupInfo_InviteByLink: String { return self._s[3801]! }
+    public var MessageTimer_Custom: String { return self._s[3802]! }
+    public var UserInfo_NotificationsDefaultEnabled: String { return self._s[3803]! }
+    public var Conversation_StopQuizConfirmationTitle: String { return self._s[3804]! }
+    public var Passport_Address_TypeTemporaryRegistration: String { return self._s[3806]! }
+    public var Conversation_SendMessage_SetReminder: String { return self._s[3807]! }
+    public var VoiceOver_Chat_Selected: String { return self._s[3808]! }
+    public var ChatSettings_AutoDownloadUsingWiFi: String { return self._s[3809]! }
+    public var Channel_Username_InvalidTaken: String { return self._s[3810]! }
+    public var Conversation_ClousStorageInfo_Description3: String { return self._s[3811]! }
+    public var Wallet_WordCheck_TryAgain: String { return self._s[3812]! }
+    public var Wallet_Info_TransactionPendingHeader: String { return self._s[3813]! }
+    public var Settings_ChatBackground: String { return self._s[3814]! }
+    public var Channel_Subscribers_Title: String { return self._s[3815]! }
+    public var Wallet_Receive_InvoiceUrlHeader: String { return self._s[3816]! }
+    public var ApplyLanguage_ChangeLanguageTitle: String { return self._s[3817]! }
+    public var Watch_ConnectionDescription: String { return self._s[3818]! }
+    public var OldChannels_NoticeText: String { return self._s[3821]! }
+    public var Wallet_Configuration_ApplyErrorTitle: String { return self._s[3822]! }
+    public var IntentsSettings_SuggestBy: String { return self._s[3824]! }
+    public var Theme_ThemeChangedText: String { return self._s[3825]! }
+    public var ChatList_ArchivedChatsTitle: String { return self._s[3826]! }
+    public var Wallpaper_ResetWallpapers: String { return self._s[3827]! }
+    public var Wallet_Send_TransactionInProgress: String { return self._s[3828]! }
+    public var EditProfile_Title: String { return self._s[3829]! }
+    public var NotificationsSound_Bamboo: String { return self._s[3831]! }
+    public var Channel_AdminLog_MessagePreviousMessage: String { return self._s[3833]! }
+    public var Login_SmsRequestState2: String { return self._s[3834]! }
+    public var Passport_Language_ar: String { return self._s[3835]! }
     public func Message_AuthorPinnedGame(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[3834]!, self._r[3834]!, [_0])
+        return formatWithArgumentRanges(self._s[3836]!, self._r[3836]!, [_0])
     }
-    public var SettingsSearch_Synonyms_EditProfile_Title: String { return self._s[3835]! }
-    public var Wallet_Created_Text: String { return self._s[3836]! }
-    public var Conversation_MessageDialogEdit: String { return self._s[3838]! }
-    public var Wallet_Created_Proceed: String { return self._s[3839]! }
-    public var Wallet_Words_Done: String { return self._s[3840]! }
-    public var VoiceOver_Media_PlaybackPause: String { return self._s[3841]! }
+    public var SettingsSearch_Synonyms_EditProfile_Title: String { return self._s[3837]! }
+    public var Wallet_Created_Text: String { return self._s[3838]! }
+    public var Conversation_MessageDialogEdit: String { return self._s[3840]! }
+    public var Wallet_Created_Proceed: String { return self._s[3841]! }
+    public var Wallet_Words_Done: String { return self._s[3842]! }
+    public var VoiceOver_Media_PlaybackPause: String { return self._s[3843]! }
     public func PUSH_AUTH_UNKNOWN(_ _1: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[3842]!, self._r[3842]!, [_1])
+        return formatWithArgumentRanges(self._s[3844]!, self._r[3844]!, [_1])
     }
-    public var Common_Close: String { return self._s[3843]! }
-    public var GroupInfo_PublicLink: String { return self._s[3844]! }
-    public var Channel_OwnershipTransfer_ErrorPrivacyRestricted: String { return self._s[3845]! }
-    public var SettingsSearch_Synonyms_Notifications_GroupNotificationsPreview: String { return self._s[3846]! }
+    public var Common_Close: String { return self._s[3845]! }
+    public var GroupInfo_PublicLink: String { return self._s[3846]! }
+    public var Channel_OwnershipTransfer_ErrorPrivacyRestricted: String { return self._s[3847]! }
+    public var SettingsSearch_Synonyms_Notifications_GroupNotificationsPreview: String { return self._s[3848]! }
     public func Channel_AdminLog_MessageToggleInvitesOff(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[3850]!, self._r[3850]!, [_0])
-    }
-    public var UserInfo_About_Placeholder: String { return self._s[3851]! }
-    public func Conversation_FileHowToText(_ _0: String) -> (String, [(Int, NSRange)]) {
         return formatWithArgumentRanges(self._s[3852]!, self._r[3852]!, [_0])
     }
-    public var GroupInfo_Permissions_SectionTitle: String { return self._s[3853]! }
-    public var Channel_Info_Banned: String { return self._s[3855]! }
+    public var UserInfo_About_Placeholder: String { return self._s[3853]! }
+    public func Conversation_FileHowToText(_ _0: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[3854]!, self._r[3854]!, [_0])
+    }
+    public var GroupInfo_Permissions_SectionTitle: String { return self._s[3855]! }
+    public var Channel_Info_Banned: String { return self._s[3857]! }
     public func Time_MonthOfYear_m11(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[3856]!, self._r[3856]!, [_0])
+        return formatWithArgumentRanges(self._s[3858]!, self._r[3858]!, [_0])
     }
-    public var Appearance_Other: String { return self._s[3857]! }
-    public var Passport_Language_my: String { return self._s[3858]! }
-    public var Group_Setup_BasicHistoryHiddenHelp: String { return self._s[3859]! }
+    public var Appearance_Other: String { return self._s[3859]! }
+    public var Passport_Language_my: String { return self._s[3860]! }
+    public var Group_Setup_BasicHistoryHiddenHelp: String { return self._s[3861]! }
     public func Time_PreciseDate_m9(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[3860]!, self._r[3860]!, [_1, _2, _3])
+        return formatWithArgumentRanges(self._s[3862]!, self._r[3862]!, [_1, _2, _3])
     }
-    public var SettingsSearch_Synonyms_Privacy_PasscodeAndFaceId: String { return self._s[3861]! }
-    public var IntentsSettings_SuggestedAndSpotlightChatsInfo: String { return self._s[3862]! }
-    public var Preview_CopyAddress: String { return self._s[3863]! }
+    public var SettingsSearch_Synonyms_Privacy_PasscodeAndFaceId: String { return self._s[3863]! }
+    public var IntentsSettings_SuggestedAndSpotlightChatsInfo: String { return self._s[3864]! }
+    public var Preview_CopyAddress: String { return self._s[3865]! }
     public func DialogList_SinglePlayingGameSuffix(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[3864]!, self._r[3864]!, [_0])
+        return formatWithArgumentRanges(self._s[3866]!, self._r[3866]!, [_0])
     }
-    public var KeyCommand_JumpToPreviousChat: String { return self._s[3865]! }
-    public var UserInfo_BotSettings: String { return self._s[3866]! }
-    public var LiveLocation_MenuStopAll: String { return self._s[3868]! }
-    public var Passport_PasswordCreate: String { return self._s[3869]! }
-    public var StickerSettings_MaskContextInfo: String { return self._s[3870]! }
-    public var Message_PinnedLocationMessage: String { return self._s[3871]! }
-    public var Map_Satellite: String { return self._s[3872]! }
-    public var Watch_Message_Unsupported: String { return self._s[3873]! }
-    public var Username_TooManyPublicUsernamesError: String { return self._s[3874]! }
-    public var TwoStepAuth_EnterPasswordInvalid: String { return self._s[3875]! }
+    public var KeyCommand_JumpToPreviousChat: String { return self._s[3867]! }
+    public var UserInfo_BotSettings: String { return self._s[3868]! }
+    public var LiveLocation_MenuStopAll: String { return self._s[3870]! }
+    public var Passport_PasswordCreate: String { return self._s[3871]! }
+    public var StickerSettings_MaskContextInfo: String { return self._s[3872]! }
+    public var Message_PinnedLocationMessage: String { return self._s[3873]! }
+    public var Map_Satellite: String { return self._s[3874]! }
+    public var Watch_Message_Unsupported: String { return self._s[3875]! }
+    public var Username_TooManyPublicUsernamesError: String { return self._s[3876]! }
+    public var TwoStepAuth_EnterPasswordInvalid: String { return self._s[3877]! }
     public func Notification_PinnedTextMessage(_ _0: String, _ _1: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[3876]!, self._r[3876]!, [_0, _1])
+        return formatWithArgumentRanges(self._s[3878]!, self._r[3878]!, [_0, _1])
     }
     public func Conversation_OpenBotLinkText(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[3877]!, self._r[3877]!, [_0])
-    }
-    public var Wallet_WordImport_Continue: String { return self._s[3878]! }
-    public func TwoFactorSetup_EmailVerification_Text(_ _0: String) -> (String, [(Int, NSRange)]) {
         return formatWithArgumentRanges(self._s[3879]!, self._r[3879]!, [_0])
     }
-    public var Notifications_ChannelNotificationsHelp: String { return self._s[3880]! }
-    public var Privacy_Calls_P2PContacts: String { return self._s[3881]! }
-    public var NotificationsSound_None: String { return self._s[3882]! }
-    public var Wallet_TransactionInfo_StorageFeeHeader: String { return self._s[3883]! }
-    public var Channel_DiscussionGroup_UnlinkGroup: String { return self._s[3885]! }
-    public var AccessDenied_VoiceMicrophone: String { return self._s[3886]! }
+    public var Wallet_WordImport_Continue: String { return self._s[3880]! }
+    public func TwoFactorSetup_EmailVerification_Text(_ _0: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[3881]!, self._r[3881]!, [_0])
+    }
+    public var Notifications_ChannelNotificationsHelp: String { return self._s[3882]! }
+    public var Privacy_Calls_P2PContacts: String { return self._s[3883]! }
+    public var NotificationsSound_None: String { return self._s[3884]! }
+    public var Wallet_TransactionInfo_StorageFeeHeader: String { return self._s[3885]! }
+    public var Channel_DiscussionGroup_UnlinkGroup: String { return self._s[3887]! }
+    public var AccessDenied_VoiceMicrophone: String { return self._s[3888]! }
     public func ApplyLanguage_ChangeLanguageAlreadyActive(_ _1: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[3887]!, self._r[3887]!, [_1])
+        return formatWithArgumentRanges(self._s[3889]!, self._r[3889]!, [_1])
     }
-    public var Cache_Indexing: String { return self._s[3888]! }
-    public var DialogList_RecentTitlePeople: String { return self._s[3890]! }
-    public var DialogList_EncryptionRejected: String { return self._s[3891]! }
-    public var GroupInfo_Administrators: String { return self._s[3892]! }
-    public var Passport_ScanPassportHelp: String { return self._s[3893]! }
-    public var Application_Name: String { return self._s[3894]! }
-    public var Channel_AdminLogFilter_ChannelEventsInfo: String { return self._s[3895]! }
-    public var PeopleNearby_MakeVisible: String { return self._s[3897]! }
-    public var Appearance_ThemeCarouselDay: String { return self._s[3898]! }
-    public var Stats_GrowthTitle: String { return self._s[3899]! }
-    public var Passport_Identity_TranslationHelp: String { return self._s[3900]! }
+    public var Cache_Indexing: String { return self._s[3890]! }
+    public var DialogList_RecentTitlePeople: String { return self._s[3892]! }
+    public var DialogList_EncryptionRejected: String { return self._s[3893]! }
+    public var GroupInfo_Administrators: String { return self._s[3894]! }
+    public var Passport_ScanPassportHelp: String { return self._s[3895]! }
+    public var Application_Name: String { return self._s[3896]! }
+    public var Channel_AdminLogFilter_ChannelEventsInfo: String { return self._s[3897]! }
+    public var PeopleNearby_MakeVisible: String { return self._s[3899]! }
+    public var Appearance_ThemeCarouselDay: String { return self._s[3900]! }
+    public var Stats_GrowthTitle: String { return self._s[3901]! }
+    public var Passport_Identity_TranslationHelp: String { return self._s[3902]! }
     public func VoiceOver_Chat_VideoMessageFrom(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[3901]!, self._r[3901]!, [_0])
-    }
-    public func Notification_JoinedGroupByLink(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[3902]!, self._r[3902]!, [_0])
-    }
-    public func DialogList_EncryptedChatStartedOutgoing(_ _0: String) -> (String, [(Int, NSRange)]) {
         return formatWithArgumentRanges(self._s[3903]!, self._r[3903]!, [_0])
     }
-    public var Channel_EditAdmin_PermissionDeleteMessages: String { return self._s[3904]! }
-    public var Privacy_ChatsTitle: String { return self._s[3905]! }
-    public var DialogList_ClearHistoryConfirmation: String { return self._s[3906]! }
-    public var SettingsSearch_Synonyms_Data_Storage_ClearCache: String { return self._s[3907]! }
-    public var Watch_Suggestion_HoldOn: String { return self._s[3908]! }
-    public var Group_EditAdmin_TransferOwnership: String { return self._s[3909]! }
-    public var WebBrowser_Title: String { return self._s[3910]! }
-    public var Group_LinkedChannel: String { return self._s[3911]! }
-    public var VoiceOver_Chat_SeenByRecipient: String { return self._s[3912]! }
-    public var SocksProxySetup_RequiredCredentials: String { return self._s[3913]! }
-    public var Passport_Address_TypeRentalAgreementUploadScan: String { return self._s[3914]! }
-    public var Appearance_TextSize_UseSystem: String { return self._s[3915]! }
-    public var TwoStepAuth_EmailSkipAlert: String { return self._s[3916]! }
-    public var ScheduledMessages_RemindersTitle: String { return self._s[3918]! }
-    public var Channel_Setup_TypePublic: String { return self._s[3920]! }
+    public func Notification_JoinedGroupByLink(_ _0: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[3904]!, self._r[3904]!, [_0])
+    }
+    public func DialogList_EncryptedChatStartedOutgoing(_ _0: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[3905]!, self._r[3905]!, [_0])
+    }
+    public var Channel_EditAdmin_PermissionDeleteMessages: String { return self._s[3906]! }
+    public var Privacy_ChatsTitle: String { return self._s[3907]! }
+    public var DialogList_ClearHistoryConfirmation: String { return self._s[3908]! }
+    public var SettingsSearch_Synonyms_Data_Storage_ClearCache: String { return self._s[3909]! }
+    public var Watch_Suggestion_HoldOn: String { return self._s[3910]! }
+    public var Group_EditAdmin_TransferOwnership: String { return self._s[3911]! }
+    public var WebBrowser_Title: String { return self._s[3912]! }
+    public var Group_LinkedChannel: String { return self._s[3913]! }
+    public var VoiceOver_Chat_SeenByRecipient: String { return self._s[3914]! }
+    public var SocksProxySetup_RequiredCredentials: String { return self._s[3915]! }
+    public var Passport_Address_TypeRentalAgreementUploadScan: String { return self._s[3916]! }
+    public var Appearance_TextSize_UseSystem: String { return self._s[3917]! }
+    public var TwoStepAuth_EmailSkipAlert: String { return self._s[3918]! }
+    public var ScheduledMessages_RemindersTitle: String { return self._s[3920]! }
+    public var Channel_Setup_TypePublic: String { return self._s[3922]! }
     public func Channel_AdminLog_MessageToggleInvitesOn(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[3921]!, self._r[3921]!, [_0])
+        return formatWithArgumentRanges(self._s[3923]!, self._r[3923]!, [_0])
     }
-    public var Channel_TypeSetup_Title: String { return self._s[3923]! }
-    public var MessagePoll_ViewResults: String { return self._s[3924]! }
-    public var Map_OpenInMaps: String { return self._s[3926]! }
+    public var Channel_TypeSetup_Title: String { return self._s[3925]! }
+    public var MessagePoll_ViewResults: String { return self._s[3926]! }
+    public var Map_OpenInMaps: String { return self._s[3928]! }
     public func PUSH_PINNED_NOTEXT(_ _1: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[3927]!, self._r[3927]!, [_1])
+        return formatWithArgumentRanges(self._s[3929]!, self._r[3929]!, [_1])
     }
-    public var NotificationsSound_Tremolo: String { return self._s[3929]! }
+    public var NotificationsSound_Tremolo: String { return self._s[3931]! }
     public func Date_ChatDateHeaderYear(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[3930]!, self._r[3930]!, [_1, _2, _3])
+        return formatWithArgumentRanges(self._s[3932]!, self._r[3932]!, [_1, _2, _3])
     }
-    public var ConversationProfile_UnknownAddMemberError: String { return self._s[3931]! }
-    public var Channel_OwnershipTransfer_PasswordPlaceholder: String { return self._s[3932]! }
-    public var Passport_PasswordHelp: String { return self._s[3934]! }
-    public var Login_CodeExpiredError: String { return self._s[3935]! }
-    public var Channel_EditAdmin_PermissionChangeInfo: String { return self._s[3936]! }
-    public var Conversation_TitleUnmute: String { return self._s[3937]! }
-    public var Passport_Identity_ScansHelp: String { return self._s[3938]! }
-    public var Passport_Language_lo: String { return self._s[3939]! }
-    public var Camera_FlashAuto: String { return self._s[3940]! }
-    public var Conversation_OpenBotLinkOpen: String { return self._s[3941]! }
-    public var Common_Cancel: String { return self._s[3942]! }
-    public var DialogList_SavedMessagesTooltip: String { return self._s[3943]! }
-    public var TwoStepAuth_SetupPasswordTitle: String { return self._s[3944]! }
-    public var Appearance_TintAllColors: String { return self._s[3945]! }
+    public var ConversationProfile_UnknownAddMemberError: String { return self._s[3933]! }
+    public var Channel_OwnershipTransfer_PasswordPlaceholder: String { return self._s[3934]! }
+    public var Passport_PasswordHelp: String { return self._s[3936]! }
+    public var Login_CodeExpiredError: String { return self._s[3937]! }
+    public var Channel_EditAdmin_PermissionChangeInfo: String { return self._s[3938]! }
+    public var Conversation_TitleUnmute: String { return self._s[3939]! }
+    public var Passport_Identity_ScansHelp: String { return self._s[3940]! }
+    public var Passport_Language_lo: String { return self._s[3941]! }
+    public var Camera_FlashAuto: String { return self._s[3942]! }
+    public var Conversation_OpenBotLinkOpen: String { return self._s[3943]! }
+    public var Common_Cancel: String { return self._s[3944]! }
+    public var DialogList_SavedMessagesTooltip: String { return self._s[3945]! }
+    public var TwoStepAuth_SetupPasswordTitle: String { return self._s[3946]! }
+    public var Appearance_TintAllColors: String { return self._s[3947]! }
     public func PUSH_MESSAGE_FWD(_ _1: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[3946]!, self._r[3946]!, [_1])
+        return formatWithArgumentRanges(self._s[3948]!, self._r[3948]!, [_1])
     }
-    public var Conversation_ReportSpamConfirmation: String { return self._s[3947]! }
-    public var ChatSettings_Title: String { return self._s[3949]! }
-    public var Passport_PasswordReset: String { return self._s[3950]! }
-    public var SocksProxySetup_TypeNone: String { return self._s[3951]! }
-    public var EditTheme_Title: String { return self._s[3954]! }
-    public var PhoneNumberHelp_Help: String { return self._s[3955]! }
-    public var Checkout_EnterPassword: String { return self._s[3956]! }
-    public var Activity_UploadingDocument: String { return self._s[3958]! }
-    public var Share_AuthTitle: String { return self._s[3959]! }
-    public var State_Connecting: String { return self._s[3960]! }
-    public var Profile_MessageLifetime1w: String { return self._s[3961]! }
-    public var Conversation_ContextMenuReport: String { return self._s[3962]! }
-    public var CheckoutInfo_ReceiverInfoPhone: String { return self._s[3963]! }
-    public var AutoNightTheme_ScheduledTo: String { return self._s[3964]! }
+    public var Conversation_ReportSpamConfirmation: String { return self._s[3949]! }
+    public var ChatSettings_Title: String { return self._s[3951]! }
+    public var Passport_PasswordReset: String { return self._s[3952]! }
+    public var SocksProxySetup_TypeNone: String { return self._s[3953]! }
+    public var EditTheme_Title: String { return self._s[3956]! }
+    public var PhoneNumberHelp_Help: String { return self._s[3957]! }
+    public var Checkout_EnterPassword: String { return self._s[3958]! }
+    public var Activity_UploadingDocument: String { return self._s[3960]! }
+    public var Share_AuthTitle: String { return self._s[3961]! }
+    public var State_Connecting: String { return self._s[3962]! }
+    public var Profile_MessageLifetime1w: String { return self._s[3963]! }
+    public var Conversation_ContextMenuReport: String { return self._s[3964]! }
+    public var CheckoutInfo_ReceiverInfoPhone: String { return self._s[3965]! }
+    public var AutoNightTheme_ScheduledTo: String { return self._s[3966]! }
     public func VoiceOver_Chat_AnonymousPollFrom(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[3965]!, self._r[3965]!, [_0])
+        return formatWithArgumentRanges(self._s[3967]!, self._r[3967]!, [_0])
     }
-    public var AuthSessions_Terminate: String { return self._s[3966]! }
-    public var Wallet_WordImport_CanNotRemember: String { return self._s[3967]! }
-    public var PeerInfo_PaneAudio: String { return self._s[3968]! }
-    public var Checkout_NewCard_CardholderNamePlaceholder: String { return self._s[3970]! }
-    public var KeyCommand_JumpToPreviousUnreadChat: String { return self._s[3971]! }
-    public var PhotoEditor_Set: String { return self._s[3972]! }
-    public var EmptyGroupInfo_Title: String { return self._s[3973]! }
-    public var Login_PadPhoneHelp: String { return self._s[3975]! }
-    public var AutoDownloadSettings_TypeGroupChats: String { return self._s[3977]! }
-    public var PrivacyPolicy_DeclineLastWarning: String { return self._s[3979]! }
-    public var NotificationsSound_Complete: String { return self._s[3980]! }
-    public var SettingsSearch_Synonyms_Privacy_Data_Title: String { return self._s[3981]! }
-    public var Group_Info_AdminLog: String { return self._s[3982]! }
-    public var GroupPermission_NotAvailableInPublicGroups: String { return self._s[3983]! }
+    public var AuthSessions_Terminate: String { return self._s[3968]! }
+    public var Wallet_WordImport_CanNotRemember: String { return self._s[3969]! }
+    public var PeerInfo_PaneAudio: String { return self._s[3970]! }
+    public var Checkout_NewCard_CardholderNamePlaceholder: String { return self._s[3972]! }
+    public var KeyCommand_JumpToPreviousUnreadChat: String { return self._s[3973]! }
+    public var PhotoEditor_Set: String { return self._s[3974]! }
+    public var EmptyGroupInfo_Title: String { return self._s[3975]! }
+    public var Login_PadPhoneHelp: String { return self._s[3977]! }
+    public var AutoDownloadSettings_TypeGroupChats: String { return self._s[3979]! }
+    public var PrivacyPolicy_DeclineLastWarning: String { return self._s[3981]! }
+    public var NotificationsSound_Complete: String { return self._s[3982]! }
+    public var SettingsSearch_Synonyms_Privacy_Data_Title: String { return self._s[3983]! }
+    public var Group_Info_AdminLog: String { return self._s[3984]! }
+    public var GroupPermission_NotAvailableInPublicGroups: String { return self._s[3985]! }
     public func Wallet_Time_PreciseDate_m11(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[3984]!, self._r[3984]!, [_1, _2, _3])
+        return formatWithArgumentRanges(self._s[3986]!, self._r[3986]!, [_1, _2, _3])
     }
-    public var Channel_AdminLog_InfoPanelAlertText: String { return self._s[3985]! }
-    public var Group_Location_CreateInThisPlace: String { return self._s[3987]! }
-    public var Conversation_Admin: String { return self._s[3988]! }
-    public var Conversation_GifTooltip: String { return self._s[3989]! }
-    public var Passport_NotLoggedInMessage: String { return self._s[3990]! }
+    public var Channel_AdminLog_InfoPanelAlertText: String { return self._s[3987]! }
+    public var Group_Location_CreateInThisPlace: String { return self._s[3989]! }
+    public var Conversation_Admin: String { return self._s[3990]! }
+    public var Conversation_GifTooltip: String { return self._s[3991]! }
+    public var Passport_NotLoggedInMessage: String { return self._s[3992]! }
     public func AutoDownloadSettings_OnFor(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[3992]!, self._r[3992]!, [_0])
+        return formatWithArgumentRanges(self._s[3994]!, self._r[3994]!, [_0])
     }
-    public var Profile_MessageLifetimeForever: String { return self._s[3993]! }
-    public var SharedMedia_EmptyTitle: String { return self._s[3995]! }
-    public var Channel_Edit_PrivatePublicLinkAlert: String { return self._s[3997]! }
-    public var Username_Help: String { return self._s[3998]! }
-    public var DialogList_LanguageTooltip: String { return self._s[4000]! }
-    public var Map_LoadError: String { return self._s[4001]! }
-    public var Login_PhoneNumberAlreadyAuthorized: String { return self._s[4002]! }
-    public var Channel_AdminLog_AddMembers: String { return self._s[4003]! }
-    public var ArchivedChats_IntroTitle2: String { return self._s[4004]! }
-    public var Notification_Exceptions_NewException: String { return self._s[4005]! }
-    public var TwoStepAuth_EmailTitle: String { return self._s[4006]! }
-    public var WatchRemote_AlertText: String { return self._s[4007]! }
+    public var Profile_MessageLifetimeForever: String { return self._s[3995]! }
+    public var SharedMedia_EmptyTitle: String { return self._s[3997]! }
+    public var Channel_Edit_PrivatePublicLinkAlert: String { return self._s[3999]! }
+    public var Username_Help: String { return self._s[4000]! }
+    public var DialogList_LanguageTooltip: String { return self._s[4002]! }
+    public var Map_LoadError: String { return self._s[4003]! }
+    public var Login_PhoneNumberAlreadyAuthorized: String { return self._s[4004]! }
+    public var Channel_AdminLog_AddMembers: String { return self._s[4005]! }
+    public var ArchivedChats_IntroTitle2: String { return self._s[4006]! }
+    public var Notification_Exceptions_NewException: String { return self._s[4007]! }
+    public var TwoStepAuth_EmailTitle: String { return self._s[4008]! }
+    public var WatchRemote_AlertText: String { return self._s[4009]! }
     public func Wallet_Send_ConfirmationText(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[4008]!, self._r[4008]!, [_1, _2, _3])
+        return formatWithArgumentRanges(self._s[4010]!, self._r[4010]!, [_1, _2, _3])
     }
-    public var ChatSettings_ConnectionType_Title: String { return self._s[4012]! }
+    public var ChatSettings_ConnectionType_Title: String { return self._s[4014]! }
     public func PUSH_PINNED_QUIZ(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[4013]!, self._r[4013]!, [_1, _2])
+        return formatWithArgumentRanges(self._s[4015]!, self._r[4015]!, [_1, _2])
     }
     public func Settings_CheckPhoneNumberTitle(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[4014]!, self._r[4014]!, [_0])
+        return formatWithArgumentRanges(self._s[4016]!, self._r[4016]!, [_0])
     }
-    public var SettingsSearch_Synonyms_Calls_CallTab: String { return self._s[4015]! }
-    public var WebBrowser_DefaultBrowser: String { return self._s[4016]! }
-    public var Passport_Address_CountryPlaceholder: String { return self._s[4017]! }
+    public var SettingsSearch_Synonyms_Calls_CallTab: String { return self._s[4017]! }
+    public var WebBrowser_DefaultBrowser: String { return self._s[4018]! }
+    public var Passport_Address_CountryPlaceholder: String { return self._s[4019]! }
     public func DialogList_AwaitingEncryption(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[4018]!, self._r[4018]!, [_0])
+        return formatWithArgumentRanges(self._s[4020]!, self._r[4020]!, [_0])
     }
     public func Time_PreciseDate_m6(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[4019]!, self._r[4019]!, [_1, _2, _3])
+        return formatWithArgumentRanges(self._s[4021]!, self._r[4021]!, [_1, _2, _3])
     }
-    public var Group_AdminLog_EmptyText: String { return self._s[4020]! }
-    public var SettingsSearch_Synonyms_Appearance_Title: String { return self._s[4021]! }
-    public var Conversation_PrivateChannelTooltip: String { return self._s[4023]! }
-    public var Wallet_Created_ExportErrorText: String { return self._s[4024]! }
-    public var ChatList_UndoArchiveText1: String { return self._s[4025]! }
-    public var AccessDenied_VideoMicrophone: String { return self._s[4026]! }
-    public var Conversation_ContextMenuStickerPackAdd: String { return self._s[4027]! }
-    public var Cache_ClearNone: String { return self._s[4028]! }
-    public var SocksProxySetup_FailedToConnect: String { return self._s[4029]! }
-    public var Permissions_NotificationsTitle_v0: String { return self._s[4030]! }
+    public var Group_AdminLog_EmptyText: String { return self._s[4022]! }
+    public var SettingsSearch_Synonyms_Appearance_Title: String { return self._s[4023]! }
+    public var Conversation_PrivateChannelTooltip: String { return self._s[4025]! }
+    public var Wallet_Created_ExportErrorText: String { return self._s[4026]! }
+    public var ChatList_UndoArchiveText1: String { return self._s[4027]! }
+    public var AccessDenied_VideoMicrophone: String { return self._s[4028]! }
+    public var Conversation_ContextMenuStickerPackAdd: String { return self._s[4029]! }
+    public var Cache_ClearNone: String { return self._s[4030]! }
+    public var SocksProxySetup_FailedToConnect: String { return self._s[4031]! }
+    public var Permissions_NotificationsTitle_v0: String { return self._s[4032]! }
     public func Channel_AdminLog_MessageEdited(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[4031]!, self._r[4031]!, [_0])
-    }
-    public var Passport_Identity_Country: String { return self._s[4032]! }
-    public func ChatSettings_AutoDownloadSettings_TypeFile(_ _0: String) -> (String, [(Int, NSRange)]) {
         return formatWithArgumentRanges(self._s[4033]!, self._r[4033]!, [_0])
     }
+    public var Passport_Identity_Country: String { return self._s[4034]! }
+    public func ChatSettings_AutoDownloadSettings_TypeFile(_ _0: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[4035]!, self._r[4035]!, [_0])
+    }
     public func Notification_CreatedChat(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[4034]!, self._r[4034]!, [_0])
+        return formatWithArgumentRanges(self._s[4036]!, self._r[4036]!, [_0])
     }
-    public var Exceptions_AddToExceptions: String { return self._s[4035]! }
-    public var AccessDenied_Settings: String { return self._s[4036]! }
-    public var Passport_Address_TypeUtilityBillUploadScan: String { return self._s[4037]! }
-    public var Month_ShortMay: String { return self._s[4038]! }
-    public var Compose_NewGroup: String { return self._s[4040]! }
-    public var Group_Setup_TypePrivate: String { return self._s[4042]! }
-    public var Login_PadPhoneHelpTitle: String { return self._s[4044]! }
-    public var Appearance_ThemeDayClassic: String { return self._s[4045]! }
-    public var Channel_AdminLog_MessagePreviousCaption: String { return self._s[4046]! }
-    public var AutoDownloadSettings_OffForAll: String { return self._s[4047]! }
-    public var Privacy_GroupsAndChannels_WhoCanAddMe: String { return self._s[4048]! }
-    public var Conversation_typing: String { return self._s[4050]! }
-    public var Undo_ScheduledMessagesCleared: String { return self._s[4051]! }
-    public var Paint_Masks: String { return self._s[4052]! }
-    public var Contacts_DeselectAll: String { return self._s[4053]! }
+    public var Exceptions_AddToExceptions: String { return self._s[4037]! }
+    public var AccessDenied_Settings: String { return self._s[4038]! }
+    public var Passport_Address_TypeUtilityBillUploadScan: String { return self._s[4039]! }
+    public var Month_ShortMay: String { return self._s[4040]! }
+    public var Compose_NewGroup: String { return self._s[4042]! }
+    public var Group_Setup_TypePrivate: String { return self._s[4044]! }
+    public var Login_PadPhoneHelpTitle: String { return self._s[4046]! }
+    public var Appearance_ThemeDayClassic: String { return self._s[4047]! }
+    public var Channel_AdminLog_MessagePreviousCaption: String { return self._s[4048]! }
+    public var AutoDownloadSettings_OffForAll: String { return self._s[4049]! }
+    public var Privacy_GroupsAndChannels_WhoCanAddMe: String { return self._s[4050]! }
+    public var Conversation_typing: String { return self._s[4052]! }
+    public var Undo_ScheduledMessagesCleared: String { return self._s[4053]! }
+    public var Paint_Masks: String { return self._s[4054]! }
+    public var Contacts_DeselectAll: String { return self._s[4055]! }
     public func Wallet_Updated_YesterdayAt(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[4054]!, self._r[4054]!, [_0])
+        return formatWithArgumentRanges(self._s[4056]!, self._r[4056]!, [_0])
     }
-    public var CreatePoll_MultipleChoiceQuizAlert: String { return self._s[4055]! }
-    public var Username_InvalidTaken: String { return self._s[4056]! }
-    public var Call_StatusNoAnswer: String { return self._s[4057]! }
-    public var TwoStepAuth_EmailAddSuccess: String { return self._s[4058]! }
-    public var SettingsSearch_Synonyms_Privacy_BlockedUsers: String { return self._s[4059]! }
-    public var Passport_Identity_Selfie: String { return self._s[4060]! }
-    public var Login_InfoLastNamePlaceholder: String { return self._s[4061]! }
-    public var Privacy_SecretChatsLinkPreviewsHelp: String { return self._s[4062]! }
-    public var Conversation_ClearSecretHistory: String { return self._s[4063]! }
-    public var PeopleNearby_Description: String { return self._s[4065]! }
-    public var NetworkUsageSettings_Title: String { return self._s[4066]! }
-    public var Your_cards_security_code_is_invalid: String { return self._s[4068]! }
-    public var Stats_EnabledNotifications: String { return self._s[4069]! }
+    public var CreatePoll_MultipleChoiceQuizAlert: String { return self._s[4057]! }
+    public var Username_InvalidTaken: String { return self._s[4058]! }
+    public var Call_StatusNoAnswer: String { return self._s[4059]! }
+    public var TwoStepAuth_EmailAddSuccess: String { return self._s[4060]! }
+    public var SettingsSearch_Synonyms_Privacy_BlockedUsers: String { return self._s[4061]! }
+    public var Passport_Identity_Selfie: String { return self._s[4062]! }
+    public var Login_InfoLastNamePlaceholder: String { return self._s[4063]! }
+    public var Privacy_SecretChatsLinkPreviewsHelp: String { return self._s[4064]! }
+    public var Conversation_ClearSecretHistory: String { return self._s[4065]! }
+    public var PeopleNearby_Description: String { return self._s[4067]! }
+    public var NetworkUsageSettings_Title: String { return self._s[4068]! }
+    public var Your_cards_security_code_is_invalid: String { return self._s[4070]! }
+    public var Stats_EnabledNotifications: String { return self._s[4071]! }
     public func Notification_LeftChannel(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[4071]!, self._r[4071]!, [_0])
+        return formatWithArgumentRanges(self._s[4073]!, self._r[4073]!, [_0])
     }
     public func Call_CallInProgressMessage(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[4072]!, self._r[4072]!, [_1, _2])
+        return formatWithArgumentRanges(self._s[4074]!, self._r[4074]!, [_1, _2])
     }
-    public var SaveIncomingPhotosSettings_From: String { return self._s[4074]! }
-    public var VoiceOver_Navigation_Search: String { return self._s[4075]! }
-    public var Map_LiveLocationTitle: String { return self._s[4076]! }
-    public var Login_InfoAvatarAdd: String { return self._s[4077]! }
-    public var Passport_Identity_FilesView: String { return self._s[4078]! }
-    public var UserInfo_GenericPhoneLabel: String { return self._s[4079]! }
-    public var Privacy_Calls_NeverAllow: String { return self._s[4080]! }
-    public var VoiceOver_Chat_File: String { return self._s[4081]! }
-    public var Wallet_Settings_DeleteWalletInfo: String { return self._s[4082]! }
+    public var SaveIncomingPhotosSettings_From: String { return self._s[4076]! }
+    public var VoiceOver_Navigation_Search: String { return self._s[4077]! }
+    public var Map_LiveLocationTitle: String { return self._s[4078]! }
+    public var Login_InfoAvatarAdd: String { return self._s[4079]! }
+    public var Passport_Identity_FilesView: String { return self._s[4080]! }
+    public var UserInfo_GenericPhoneLabel: String { return self._s[4081]! }
+    public var Privacy_Calls_NeverAllow: String { return self._s[4082]! }
+    public var VoiceOver_Chat_File: String { return self._s[4083]! }
+    public var Wallet_Settings_DeleteWalletInfo: String { return self._s[4084]! }
     public func Contacts_AddPhoneNumber(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[4083]!, self._r[4083]!, [_0])
+        return formatWithArgumentRanges(self._s[4085]!, self._r[4085]!, [_0])
     }
-    public var ChatList_EmptyChatList: String { return self._s[4084]! }
-    public var ContactInfo_PhoneNumberHidden: String { return self._s[4085]! }
-    public var TwoStepAuth_ConfirmationText: String { return self._s[4086]! }
-    public var ChatSettings_AutomaticVideoMessageDownload: String { return self._s[4087]! }
+    public var ChatList_EmptyChatList: String { return self._s[4086]! }
+    public var ContactInfo_PhoneNumberHidden: String { return self._s[4087]! }
+    public var TwoStepAuth_ConfirmationText: String { return self._s[4088]! }
+    public var ChatSettings_AutomaticVideoMessageDownload: String { return self._s[4089]! }
     public func PUSH_CHAT_MESSAGE_VIDEOS(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[4088]!, self._r[4088]!, [_1, _2, _3])
+        return formatWithArgumentRanges(self._s[4090]!, self._r[4090]!, [_1, _2, _3])
     }
-    public var Channel_AdminLogFilter_AdminsAll: String { return self._s[4089]! }
-    public var Wallet_Intro_CreateErrorText: String { return self._s[4090]! }
-    public var Tour_Title2: String { return self._s[4091]! }
-    public var Wallet_Sent_ViewWallet: String { return self._s[4092]! }
-    public var Conversation_FileOpenIn: String { return self._s[4093]! }
-    public var Checkout_ErrorPrecheckoutFailed: String { return self._s[4094]! }
-    public var Wallet_Send_ErrorInvalidAddress: String { return self._s[4095]! }
-    public var Wallpaper_Set: String { return self._s[4096]! }
-    public var Passport_Identity_Translations: String { return self._s[4098]! }
+    public var Channel_AdminLogFilter_AdminsAll: String { return self._s[4091]! }
+    public var Wallet_Intro_CreateErrorText: String { return self._s[4092]! }
+    public var Tour_Title2: String { return self._s[4093]! }
+    public var Wallet_Sent_ViewWallet: String { return self._s[4094]! }
+    public var Conversation_FileOpenIn: String { return self._s[4095]! }
+    public var Checkout_ErrorPrecheckoutFailed: String { return self._s[4096]! }
+    public var Wallet_Send_ErrorInvalidAddress: String { return self._s[4097]! }
+    public var Wallpaper_Set: String { return self._s[4098]! }
+    public var Passport_Identity_Translations: String { return self._s[4100]! }
     public func Channel_AdminLog_MessageChangedChannelAbout(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[4099]!, self._r[4099]!, [_0])
+        return formatWithArgumentRanges(self._s[4101]!, self._r[4101]!, [_0])
     }
-    public var Channel_LeaveChannel: String { return self._s[4100]! }
+    public var Channel_LeaveChannel: String { return self._s[4102]! }
     public func PINNED_INVOICE(_ _1: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[4101]!, self._r[4101]!, [_1])
+        return formatWithArgumentRanges(self._s[4103]!, self._r[4103]!, [_1])
     }
-    public var SettingsSearch_Synonyms_Proxy_AddProxy: String { return self._s[4103]! }
-    public var PhotoEditor_HighlightsTint: String { return self._s[4104]! }
-    public var MessagePoll_LabelPoll: String { return self._s[4105]! }
-    public var Passport_Email_Delete: String { return self._s[4106]! }
-    public var Conversation_Mute: String { return self._s[4108]! }
-    public var Channel_AddBotAsAdmin: String { return self._s[4109]! }
-    public var Channel_AdminLog_CanSendMessages: String { return self._s[4111]! }
-    public var Wallet_Configuration_BlockchainNameChangedText: String { return self._s[4112]! }
-    public var ChatSettings_IntentsSettings: String { return self._s[4114]! }
-    public var Channel_Management_LabelOwner: String { return self._s[4115]! }
+    public var SettingsSearch_Synonyms_Proxy_AddProxy: String { return self._s[4105]! }
+    public var PhotoEditor_HighlightsTint: String { return self._s[4106]! }
+    public var MessagePoll_LabelPoll: String { return self._s[4107]! }
+    public var Passport_Email_Delete: String { return self._s[4108]! }
+    public var Conversation_Mute: String { return self._s[4110]! }
+    public var Channel_AddBotAsAdmin: String { return self._s[4111]! }
+    public var Channel_AdminLog_CanSendMessages: String { return self._s[4113]! }
+    public var Wallet_Configuration_BlockchainNameChangedText: String { return self._s[4114]! }
+    public var ChatSettings_IntentsSettings: String { return self._s[4116]! }
+    public var Channel_Management_LabelOwner: String { return self._s[4117]! }
     public func Notification_PassportValuesSentMessage(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[4116]!, self._r[4116]!, [_1, _2])
+        return formatWithArgumentRanges(self._s[4118]!, self._r[4118]!, [_1, _2])
     }
-    public var Calls_CallTabDescription: String { return self._s[4117]! }
-    public var Passport_Identity_NativeNameHelp: String { return self._s[4118]! }
-    public var Common_No: String { return self._s[4119]! }
-    public var Weekday_Sunday: String { return self._s[4120]! }
-    public var Notification_Reply: String { return self._s[4121]! }
-    public var Conversation_ViewMessage: String { return self._s[4122]! }
+    public var Calls_CallTabDescription: String { return self._s[4119]! }
+    public var Passport_Identity_NativeNameHelp: String { return self._s[4120]! }
+    public var Common_No: String { return self._s[4121]! }
+    public var Weekday_Sunday: String { return self._s[4122]! }
+    public var Notification_Reply: String { return self._s[4123]! }
+    public var Conversation_ViewMessage: String { return self._s[4124]! }
     public func Checkout_SavePasswordTimeoutAndFaceId(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[4123]!, self._r[4123]!, [_0])
+        return formatWithArgumentRanges(self._s[4125]!, self._r[4125]!, [_0])
     }
     public func Map_LiveLocationPrivateDescription(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[4124]!, self._r[4124]!, [_0])
+        return formatWithArgumentRanges(self._s[4126]!, self._r[4126]!, [_0])
     }
     public func Wallet_Time_PreciseDate_m7(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[4125]!, self._r[4125]!, [_1, _2, _3])
+        return formatWithArgumentRanges(self._s[4127]!, self._r[4127]!, [_1, _2, _3])
     }
-    public var SettingsSearch_Synonyms_EditProfile_AddAccount: String { return self._s[4126]! }
-    public var Wallet_Send_Title: String { return self._s[4127]! }
-    public var Message_PinnedDocumentMessage: String { return self._s[4128]! }
-    public var Wallet_Info_RefreshErrorText: String { return self._s[4129]! }
-    public var DialogList_TabTitle: String { return self._s[4131]! }
-    public var ChatSettings_AutoPlayTitle: String { return self._s[4132]! }
-    public var Passport_FieldEmail: String { return self._s[4133]! }
-    public var Conversation_UnpinMessageAlert: String { return self._s[4134]! }
-    public var Passport_Address_TypeBankStatement: String { return self._s[4135]! }
-    public var Wallet_SecureStorageReset_Title: String { return self._s[4136]! }
-    public var Passport_Identity_ExpiryDate: String { return self._s[4137]! }
-    public var Privacy_Calls_P2P: String { return self._s[4138]! }
+    public var SettingsSearch_Synonyms_EditProfile_AddAccount: String { return self._s[4128]! }
+    public var Wallet_Send_Title: String { return self._s[4129]! }
+    public var Message_PinnedDocumentMessage: String { return self._s[4130]! }
+    public var Wallet_Info_RefreshErrorText: String { return self._s[4131]! }
+    public var DialogList_TabTitle: String { return self._s[4133]! }
+    public var ChatSettings_AutoPlayTitle: String { return self._s[4134]! }
+    public var Passport_FieldEmail: String { return self._s[4135]! }
+    public var Conversation_UnpinMessageAlert: String { return self._s[4136]! }
+    public var Passport_Address_TypeBankStatement: String { return self._s[4137]! }
+    public var Wallet_SecureStorageReset_Title: String { return self._s[4138]! }
+    public var Passport_Identity_ExpiryDate: String { return self._s[4139]! }
+    public var Privacy_Calls_P2P: String { return self._s[4140]! }
     public func CancelResetAccount_Success(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[4140]!, self._r[4140]!, [_0])
+        return formatWithArgumentRanges(self._s[4142]!, self._r[4142]!, [_0])
     }
-    public var SocksProxySetup_UseForCallsHelp: String { return self._s[4141]! }
+    public var SocksProxySetup_UseForCallsHelp: String { return self._s[4143]! }
     public func PUSH_CHAT_ALBUM(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[4142]!, self._r[4142]!, [_1, _2])
+        return formatWithArgumentRanges(self._s[4144]!, self._r[4144]!, [_1, _2])
     }
-    public var Stickers_ClearRecent: String { return self._s[4143]! }
-    public var EnterPasscode_ChangeTitle: String { return self._s[4144]! }
-    public var TwoFactorSetup_Email_Title: String { return self._s[4145]! }
-    public var Passport_InfoText: String { return self._s[4146]! }
-    public var Checkout_NewCard_SaveInfoEnableHelp: String { return self._s[4147]! }
+    public var Stickers_ClearRecent: String { return self._s[4145]! }
+    public var EnterPasscode_ChangeTitle: String { return self._s[4146]! }
+    public var TwoFactorSetup_Email_Title: String { return self._s[4147]! }
+    public var Passport_InfoText: String { return self._s[4148]! }
+    public var Checkout_NewCard_SaveInfoEnableHelp: String { return self._s[4149]! }
     public func Login_InvalidPhoneEmailSubject(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[4148]!, self._r[4148]!, [_0])
+        return formatWithArgumentRanges(self._s[4150]!, self._r[4150]!, [_0])
     }
     public func Time_PreciseDate_m3(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[4149]!, self._r[4149]!, [_1, _2, _3])
+        return formatWithArgumentRanges(self._s[4151]!, self._r[4151]!, [_1, _2, _3])
     }
-    public var SettingsSearch_Synonyms_Notifications_BadgeIncludeMutedChannels: String { return self._s[4150]! }
-    public var ScheduledMessages_PollUnavailable: String { return self._s[4151]! }
-    public var VoiceOver_Navigation_Compose: String { return self._s[4152]! }
-    public var Passport_Identity_EditDriversLicense: String { return self._s[4153]! }
-    public var Conversation_TapAndHoldToRecord: String { return self._s[4155]! }
-    public var SettingsSearch_Synonyms_Notifications_BadgeIncludeMutedChats: String { return self._s[4156]! }
+    public var SettingsSearch_Synonyms_Notifications_BadgeIncludeMutedChannels: String { return self._s[4152]! }
+    public var ScheduledMessages_PollUnavailable: String { return self._s[4153]! }
+    public var VoiceOver_Navigation_Compose: String { return self._s[4154]! }
+    public var Passport_Identity_EditDriversLicense: String { return self._s[4155]! }
+    public var Conversation_TapAndHoldToRecord: String { return self._s[4157]! }
+    public var SettingsSearch_Synonyms_Notifications_BadgeIncludeMutedChats: String { return self._s[4158]! }
     public func Notification_CallTimeFormat(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[4157]!, self._r[4157]!, [_1, _2])
+        return formatWithArgumentRanges(self._s[4159]!, self._r[4159]!, [_1, _2])
     }
-    public var Channel_EditAdmin_PermissionInviteViaLink: String { return self._s[4160]! }
-    public var ChatSettings_OpenLinksIn: String { return self._s[4161]! }
-    public var Map_HomeAndWorkTitle: String { return self._s[4162]! }
+    public var Channel_EditAdmin_PermissionInviteViaLink: String { return self._s[4162]! }
+    public var ChatSettings_OpenLinksIn: String { return self._s[4163]! }
+    public var Map_HomeAndWorkTitle: String { return self._s[4164]! }
     public func Generic_OpenHiddenLinkAlert(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[4164]!, self._r[4164]!, [_0])
+        return formatWithArgumentRanges(self._s[4166]!, self._r[4166]!, [_0])
     }
-    public var DialogList_Unread: String { return self._s[4165]! }
+    public var DialogList_Unread: String { return self._s[4167]! }
     public func PUSH_CHAT_MESSAGE_GIF(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[4166]!, self._r[4166]!, [_1, _2])
+        return formatWithArgumentRanges(self._s[4168]!, self._r[4168]!, [_1, _2])
     }
-    public var User_DeletedAccount: String { return self._s[4167]! }
-    public var OwnershipTransfer_SetupTwoStepAuth: String { return self._s[4168]! }
+    public var User_DeletedAccount: String { return self._s[4169]! }
+    public var OwnershipTransfer_SetupTwoStepAuth: String { return self._s[4170]! }
     public func Watch_Time_ShortYesterdayAt(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[4169]!, self._r[4169]!, [_0])
+        return formatWithArgumentRanges(self._s[4171]!, self._r[4171]!, [_0])
     }
-    public var UserInfo_NotificationsDefault: String { return self._s[4170]! }
-    public var SharedMedia_CategoryMedia: String { return self._s[4171]! }
-    public var SocksProxySetup_ProxyStatusUnavailable: String { return self._s[4172]! }
-    public var Channel_AdminLog_MessageRestrictedForever: String { return self._s[4173]! }
-    public var Watch_ChatList_Compose: String { return self._s[4174]! }
-    public var Notifications_MessageNotificationsExceptionsHelp: String { return self._s[4175]! }
-    public var AutoDownloadSettings_Delimeter: String { return self._s[4176]! }
-    public var Watch_Microphone_Access: String { return self._s[4177]! }
-    public var Group_Setup_HistoryHeader: String { return self._s[4178]! }
-    public var Map_SetThisLocation: String { return self._s[4179]! }
-    public var Appearance_ThemePreview_Chat_2_ReplyName: String { return self._s[4180]! }
-    public var Activity_UploadingPhoto: String { return self._s[4181]! }
-    public var Conversation_Edit: String { return self._s[4183]! }
-    public var Group_ErrorSendRestrictedMedia: String { return self._s[4184]! }
-    public var Login_TermsOfServiceDecline: String { return self._s[4185]! }
-    public var Message_PinnedContactMessage: String { return self._s[4186]! }
+    public var UserInfo_NotificationsDefault: String { return self._s[4172]! }
+    public var SharedMedia_CategoryMedia: String { return self._s[4173]! }
+    public var SocksProxySetup_ProxyStatusUnavailable: String { return self._s[4174]! }
+    public var Channel_AdminLog_MessageRestrictedForever: String { return self._s[4175]! }
+    public var Watch_ChatList_Compose: String { return self._s[4176]! }
+    public var Notifications_MessageNotificationsExceptionsHelp: String { return self._s[4177]! }
+    public var AutoDownloadSettings_Delimeter: String { return self._s[4178]! }
+    public var Watch_Microphone_Access: String { return self._s[4179]! }
+    public var Group_Setup_HistoryHeader: String { return self._s[4180]! }
+    public var Map_SetThisLocation: String { return self._s[4181]! }
+    public var Appearance_ThemePreview_Chat_2_ReplyName: String { return self._s[4182]! }
+    public var Activity_UploadingPhoto: String { return self._s[4183]! }
+    public var Conversation_Edit: String { return self._s[4185]! }
+    public var Group_ErrorSendRestrictedMedia: String { return self._s[4186]! }
+    public var Login_TermsOfServiceDecline: String { return self._s[4187]! }
+    public var Message_PinnedContactMessage: String { return self._s[4188]! }
     public func Channel_AdminLog_MessageRestrictedNameUsername(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[4187]!, self._r[4187]!, [_1, _2])
+        return formatWithArgumentRanges(self._s[4189]!, self._r[4189]!, [_1, _2])
     }
     public func Login_PhoneBannedEmailBody(_ _1: String, _ _2: String, _ _3: String, _ _4: String, _ _5: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[4188]!, self._r[4188]!, [_1, _2, _3, _4, _5])
+        return formatWithArgumentRanges(self._s[4190]!, self._r[4190]!, [_1, _2, _3, _4, _5])
     }
-    public var Appearance_LargeEmoji: String { return self._s[4189]! }
-    public var TwoStepAuth_AdditionalPassword: String { return self._s[4191]! }
-    public var EditTheme_Edit_Preview_IncomingReplyText: String { return self._s[4192]! }
+    public var Appearance_LargeEmoji: String { return self._s[4191]! }
+    public var TwoStepAuth_AdditionalPassword: String { return self._s[4193]! }
+    public var EditTheme_Edit_Preview_IncomingReplyText: String { return self._s[4194]! }
     public func PUSH_CHAT_DELETE_YOU(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[4193]!, self._r[4193]!, [_1, _2])
+        return formatWithArgumentRanges(self._s[4195]!, self._r[4195]!, [_1, _2])
     }
-    public var Passport_Phone_EnterOtherNumber: String { return self._s[4194]! }
-    public var Message_PinnedPhotoMessage: String { return self._s[4195]! }
-    public var Passport_FieldPhone: String { return self._s[4196]! }
-    public var TwoStepAuth_RecoveryEmailAddDescription: String { return self._s[4197]! }
-    public var Stats_NotificationsTitle: String { return self._s[4198]! }
-    public var ChatSettings_AutoPlayGifs: String { return self._s[4199]! }
-    public var InfoPlist_NSCameraUsageDescription: String { return self._s[4201]! }
-    public var Conversation_Call: String { return self._s[4202]! }
-    public var Common_TakePhoto: String { return self._s[4204]! }
-    public var Group_EditAdmin_RankTitle: String { return self._s[4205]! }
-    public var Wallet_Receive_CommentHeader: String { return self._s[4206]! }
-    public var Channel_NotificationLoading: String { return self._s[4207]! }
+    public var Passport_Phone_EnterOtherNumber: String { return self._s[4196]! }
+    public var Message_PinnedPhotoMessage: String { return self._s[4197]! }
+    public var Passport_FieldPhone: String { return self._s[4198]! }
+    public var TwoStepAuth_RecoveryEmailAddDescription: String { return self._s[4199]! }
+    public var Stats_NotificationsTitle: String { return self._s[4200]! }
+    public var ChatSettings_AutoPlayGifs: String { return self._s[4201]! }
+    public var InfoPlist_NSCameraUsageDescription: String { return self._s[4203]! }
+    public var Conversation_Call: String { return self._s[4204]! }
+    public var Common_TakePhoto: String { return self._s[4206]! }
+    public var Group_EditAdmin_RankTitle: String { return self._s[4207]! }
+    public var Wallet_Receive_CommentHeader: String { return self._s[4208]! }
+    public var Channel_NotificationLoading: String { return self._s[4209]! }
     public func Notification_Exceptions_Sound(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[4208]!, self._r[4208]!, [_0])
+        return formatWithArgumentRanges(self._s[4210]!, self._r[4210]!, [_0])
     }
     public func ScheduledMessages_ScheduledDate(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[4209]!, self._r[4209]!, [_0])
+        return formatWithArgumentRanges(self._s[4211]!, self._r[4211]!, [_0])
     }
     public func PUSH_CHANNEL_MESSAGE_VIDEO(_ _1: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[4210]!, self._r[4210]!, [_1])
+        return formatWithArgumentRanges(self._s[4212]!, self._r[4212]!, [_1])
     }
-    public var Permissions_SiriTitle_v0: String { return self._s[4211]! }
+    public var Permissions_SiriTitle_v0: String { return self._s[4213]! }
     public func VoiceOver_Chat_VoiceMessageFrom(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[4212]!, self._r[4212]!, [_0])
+        return formatWithArgumentRanges(self._s[4214]!, self._r[4214]!, [_0])
     }
     public func Login_ResetAccountProtected_Text(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[4213]!, self._r[4213]!, [_0])
+        return formatWithArgumentRanges(self._s[4215]!, self._r[4215]!, [_0])
     }
-    public var Channel_MessagePhotoRemoved: String { return self._s[4214]! }
-    public var Wallet_Info_ReceiveGrams: String { return self._s[4215]! }
-    public var ClearCache_FreeSpace: String { return self._s[4216]! }
-    public var Appearance_BubbleCorners_Apply: String { return self._s[4217]! }
-    public var Common_edit: String { return self._s[4218]! }
-    public var PrivacySettings_AuthSessions: String { return self._s[4219]! }
-    public var Month_ShortJune: String { return self._s[4220]! }
-    public var PrivacyLastSeenSettings_AlwaysShareWith_Placeholder: String { return self._s[4221]! }
-    public var Call_ReportSend: String { return self._s[4222]! }
-    public var Watch_LastSeen_JustNow: String { return self._s[4223]! }
-    public var Notifications_MessageNotifications: String { return self._s[4224]! }
-    public var WallpaperSearch_ColorGreen: String { return self._s[4225]! }
-    public var BroadcastListInfo_AddRecipient: String { return self._s[4227]! }
-    public var Group_Status: String { return self._s[4228]! }
+    public var Channel_MessagePhotoRemoved: String { return self._s[4216]! }
+    public var Wallet_Info_ReceiveGrams: String { return self._s[4217]! }
+    public var ClearCache_FreeSpace: String { return self._s[4218]! }
+    public var Appearance_BubbleCorners_Apply: String { return self._s[4219]! }
+    public var Common_edit: String { return self._s[4220]! }
+    public var PrivacySettings_AuthSessions: String { return self._s[4221]! }
+    public var Month_ShortJune: String { return self._s[4222]! }
+    public var PrivacyLastSeenSettings_AlwaysShareWith_Placeholder: String { return self._s[4223]! }
+    public var Call_ReportSend: String { return self._s[4224]! }
+    public var Watch_LastSeen_JustNow: String { return self._s[4225]! }
+    public var Notifications_MessageNotifications: String { return self._s[4226]! }
+    public var WallpaperSearch_ColorGreen: String { return self._s[4227]! }
+    public var BroadcastListInfo_AddRecipient: String { return self._s[4229]! }
+    public var Group_Status: String { return self._s[4230]! }
     public func AutoNightTheme_LocationHelp(_ _0: String, _ _1: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[4229]!, self._r[4229]!, [_0, _1])
+        return formatWithArgumentRanges(self._s[4231]!, self._r[4231]!, [_0, _1])
     }
-    public var TextFormat_AddLinkTitle: String { return self._s[4230]! }
-    public var ShareMenu_ShareTo: String { return self._s[4231]! }
-    public var Conversation_Moderate_Ban: String { return self._s[4232]! }
+    public var TextFormat_AddLinkTitle: String { return self._s[4232]! }
+    public var ShareMenu_ShareTo: String { return self._s[4233]! }
+    public var Conversation_Moderate_Ban: String { return self._s[4234]! }
     public func Conversation_DeleteMessagesFor(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[4233]!, self._r[4233]!, [_0])
+        return formatWithArgumentRanges(self._s[4235]!, self._r[4235]!, [_0])
     }
-    public var SharedMedia_ViewInChat: String { return self._s[4234]! }
-    public var Map_LiveLocationFor8Hours: String { return self._s[4235]! }
+    public var SharedMedia_ViewInChat: String { return self._s[4236]! }
+    public var Map_LiveLocationFor8Hours: String { return self._s[4237]! }
     public func PUSH_PINNED_PHOTO(_ _1: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[4236]!, self._r[4236]!, [_1])
+        return formatWithArgumentRanges(self._s[4238]!, self._r[4238]!, [_1])
     }
     public func PUSH_PINNED_POLL(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[4237]!, self._r[4237]!, [_1, _2])
+        return formatWithArgumentRanges(self._s[4239]!, self._r[4239]!, [_1, _2])
     }
     public func Map_AccurateTo(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[4239]!, self._r[4239]!, [_0])
+        return formatWithArgumentRanges(self._s[4241]!, self._r[4241]!, [_0])
     }
-    public var Map_OpenInHereMaps: String { return self._s[4240]! }
-    public var Appearance_ReduceMotion: String { return self._s[4241]! }
+    public var Map_OpenInHereMaps: String { return self._s[4242]! }
+    public var Appearance_ReduceMotion: String { return self._s[4243]! }
     public func PUSH_MESSAGE_TEXT(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[4242]!, self._r[4242]!, [_1, _2])
+        return formatWithArgumentRanges(self._s[4244]!, self._r[4244]!, [_1, _2])
     }
-    public var Channel_Setup_TypePublicHelp: String { return self._s[4243]! }
-    public var Passport_Identity_EditInternalPassport: String { return self._s[4244]! }
-    public var PhotoEditor_Skip: String { return self._s[4245]! }
-    public func StickerPack_RemoveMaskCount(_ value: Int32) -> String {
+    public var Channel_Setup_TypePublicHelp: String { return self._s[4245]! }
+    public var Passport_Identity_EditInternalPassport: String { return self._s[4246]! }
+    public var PhotoEditor_Skip: String { return self._s[4247]! }
+    public func OldChannels_InactiveYear(_ value: Int32) -> String {
         let form = getPluralizationForm(self.lc, value)
         let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
         return String(format: self._ps[0 * 6 + Int(form.rawValue)]!, stringValue)
     }
-    public func AttachmentMenu_SendItem(_ value: Int32) -> String {
-        let form = getPluralizationForm(self.lc, value)
-        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
-        return String(format: self._ps[1 * 6 + Int(form.rawValue)]!, stringValue)
+    public func PUSH_CHANNEL_MESSAGE_PHOTOS(_ selector: Int32, _ _1: String, _ _2: Int32) -> String {
+        let form = getPluralizationForm(self.lc, selector)
+        return String(format: self._ps[1 * 6 + Int(form.rawValue)]!, _1, _2)
     }
-    public func DialogList_LiveLocationChatsCount(_ value: Int32) -> String {
+    public func ServiceMessage_GameScoreSelfExtended(_ value: Int32) -> String {
         let form = getPluralizationForm(self.lc, value)
         let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
         return String(format: self._ps[2 * 6 + Int(form.rawValue)]!, stringValue)
     }
-    public func Contacts_ImportersCount(_ value: Int32) -> String {
+    public func Stats_MessageViews(_ value: Int32) -> String {
         let form = getPluralizationForm(self.lc, value)
         let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
         return String(format: self._ps[3 * 6 + Int(form.rawValue)]!, stringValue)
     }
-    public func VoiceOver_Chat_PollVotes(_ value: Int32) -> String {
+    public func Notifications_ExceptionMuteExpires_Minutes(_ value: Int32) -> String {
         let form = getPluralizationForm(self.lc, value)
         let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
         return String(format: self._ps[4 * 6 + Int(form.rawValue)]!, stringValue)
     }
-    public func Wallpaper_DeleteConfirmation(_ value: Int32) -> String {
+    public func MuteExpires_Hours(_ value: Int32) -> String {
         let form = getPluralizationForm(self.lc, value)
         let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
         return String(format: self._ps[5 * 6 + Int(form.rawValue)]!, stringValue)
     }
-    public func MessageTimer_ShortWeeks(_ value: Int32) -> String {
+    public func InviteText_ContactsCountText(_ value: Int32) -> String {
         let form = getPluralizationForm(self.lc, value)
         let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
         return String(format: self._ps[6 * 6 + Int(form.rawValue)]!, stringValue)
     }
-    public func PUSH_CHAT_MESSAGE_VIDEOS(_ selector: Int32, _ _2: String, _ _1: String, _ _3: Int32) -> String {
-        let form = getPluralizationForm(self.lc, selector)
-        return String(format: self._ps[7 * 6 + Int(form.rawValue)]!, _2, _1, _3)
-    }
-    public func AttachmentMenu_SendPhoto(_ value: Int32) -> String {
+    public func MessageTimer_ShortSeconds(_ value: Int32) -> String {
         let form = getPluralizationForm(self.lc, value)
         let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
-        return String(format: self._ps[8 * 6 + Int(form.rawValue)]!, stringValue)
-    }
-    public func Conversation_StatusOnline(_ value: Int32) -> String {
-        let form = getPluralizationForm(self.lc, value)
-        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
-        return String(format: self._ps[9 * 6 + Int(form.rawValue)]!, stringValue)
-    }
-    public func PUSH_MESSAGE_VIDEOS(_ selector: Int32, _ _1: String, _ _2: Int32) -> String {
-        let form = getPluralizationForm(self.lc, selector)
-        return String(format: self._ps[10 * 6 + Int(form.rawValue)]!, _1, _2)
-    }
-    public func PUSH_CHAT_MESSAGE_FWDS(_ selector: Int32, _ _2: String, _ _1: String, _ _3: Int32) -> String {
-        let form = getPluralizationForm(self.lc, selector)
-        return String(format: self._ps[11 * 6 + Int(form.rawValue)]!, _2, _1, _3)
-    }
-    public func SharedMedia_Link(_ value: Int32) -> String {
-        let form = getPluralizationForm(self.lc, value)
-        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
-        return String(format: self._ps[12 * 6 + Int(form.rawValue)]!, stringValue)
-    }
-    public func LastSeen_HoursAgo(_ value: Int32) -> String {
-        let form = getPluralizationForm(self.lc, value)
-        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
-        return String(format: self._ps[13 * 6 + Int(form.rawValue)]!, stringValue)
-    }
-    public func CreatePoll_AddMoreOptions(_ value: Int32) -> String {
-        let form = getPluralizationForm(self.lc, value)
-        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
-        return String(format: self._ps[14 * 6 + Int(form.rawValue)]!, stringValue)
-    }
-    public func Conversation_StatusMembers(_ value: Int32) -> String {
-        let form = getPluralizationForm(self.lc, value)
-        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
-        return String(format: self._ps[15 * 6 + Int(form.rawValue)]!, stringValue)
-    }
-    public func OldChannels_InactiveWeek(_ value: Int32) -> String {
-        let form = getPluralizationForm(self.lc, value)
-        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
-        return String(format: self._ps[16 * 6 + Int(form.rawValue)]!, stringValue)
-    }
-    public func PUSH_MESSAGE_FWDS(_ selector: Int32, _ _1: String, _ _2: Int32) -> String {
-        let form = getPluralizationForm(self.lc, selector)
-        return String(format: self._ps[17 * 6 + Int(form.rawValue)]!, _1, _2)
-    }
-    public func Watch_LastSeen_MinutesAgo(_ value: Int32) -> String {
-        let form = getPluralizationForm(self.lc, value)
-        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
-        return String(format: self._ps[18 * 6 + Int(form.rawValue)]!, stringValue)
-    }
-    public func SharedMedia_Generic(_ value: Int32) -> String {
-        let form = getPluralizationForm(self.lc, value)
-        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
-        return String(format: self._ps[19 * 6 + Int(form.rawValue)]!, stringValue)
-    }
-    public func ForwardedAuthorsOthers(_ selector: Int32, _ _0: String, _ _1: String) -> String {
-        let form = getPluralizationForm(self.lc, selector)
-        return String(format: self._ps[20 * 6 + Int(form.rawValue)]!, _0, _1)
+        return String(format: self._ps[7 * 6 + Int(form.rawValue)]!, stringValue)
     }
     public func ForwardedVideoMessages(_ value: Int32) -> String {
         let form = getPluralizationForm(self.lc, value)
         let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
-        return String(format: self._ps[21 * 6 + Int(form.rawValue)]!, stringValue)
-    }
-    public func MessagePoll_VotedCount(_ value: Int32) -> String {
-        let form = getPluralizationForm(self.lc, value)
-        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
-        return String(format: self._ps[22 * 6 + Int(form.rawValue)]!, stringValue)
-    }
-    public func PUSH_MESSAGES(_ selector: Int32, _ _1: String, _ _2: Int32) -> String {
-        let form = getPluralizationForm(self.lc, selector)
-        return String(format: self._ps[23 * 6 + Int(form.rawValue)]!, _1, _2)
-    }
-    public func MuteExpires_Hours(_ value: Int32) -> String {
-        let form = getPluralizationForm(self.lc, value)
-        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
-        return String(format: self._ps[24 * 6 + Int(form.rawValue)]!, stringValue)
-    }
-    public func SharedMedia_Photo(_ value: Int32) -> String {
-        let form = getPluralizationForm(self.lc, value)
-        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
-        return String(format: self._ps[25 * 6 + Int(form.rawValue)]!, stringValue)
-    }
-    public func Notification_GameScoreExtended(_ value: Int32) -> String {
-        let form = getPluralizationForm(self.lc, value)
-        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
-        return String(format: self._ps[26 * 6 + Int(form.rawValue)]!, stringValue)
-    }
-    public func InviteText_ContactsCountText(_ value: Int32) -> String {
-        let form = getPluralizationForm(self.lc, value)
-        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
-        return String(format: self._ps[27 * 6 + Int(form.rawValue)]!, stringValue)
-    }
-    public func MessageTimer_ShortMinutes(_ value: Int32) -> String {
-        let form = getPluralizationForm(self.lc, value)
-        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
-        return String(format: self._ps[28 * 6 + Int(form.rawValue)]!, stringValue)
-    }
-    public func SharedMedia_Video(_ value: Int32) -> String {
-        let form = getPluralizationForm(self.lc, value)
-        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
-        return String(format: self._ps[29 * 6 + Int(form.rawValue)]!, stringValue)
-    }
-    public func Notifications_Exceptions(_ value: Int32) -> String {
-        let form = getPluralizationForm(self.lc, value)
-        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
-        return String(format: self._ps[30 * 6 + Int(form.rawValue)]!, stringValue)
-    }
-    public func PUSH_CHANNEL_MESSAGE_VIDEOS(_ selector: Int32, _ _1: String, _ _2: Int32) -> String {
-        let form = getPluralizationForm(self.lc, selector)
-        return String(format: self._ps[31 * 6 + Int(form.rawValue)]!, _1, _2)
-    }
-    public func ForwardedPhotos(_ value: Int32) -> String {
-        let form = getPluralizationForm(self.lc, value)
-        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
-        return String(format: self._ps[32 * 6 + Int(form.rawValue)]!, stringValue)
-    }
-    public func Call_ShortMinutes(_ value: Int32) -> String {
-        let form = getPluralizationForm(self.lc, value)
-        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
-        return String(format: self._ps[33 * 6 + Int(form.rawValue)]!, stringValue)
-    }
-    public func Notifications_ExceptionMuteExpires_Hours(_ value: Int32) -> String {
-        let form = getPluralizationForm(self.lc, value)
-        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
-        return String(format: self._ps[34 * 6 + Int(form.rawValue)]!, stringValue)
-    }
-    public func OldChannels_InactiveYear(_ value: Int32) -> String {
-        let form = getPluralizationForm(self.lc, value)
-        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
-        return String(format: self._ps[35 * 6 + Int(form.rawValue)]!, stringValue)
-    }
-    public func PrivacyLastSeenSettings_AddUsers(_ value: Int32) -> String {
-        let form = getPluralizationForm(self.lc, value)
-        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
-        return String(format: self._ps[36 * 6 + Int(form.rawValue)]!, stringValue)
-    }
-    public func StickerPack_AddMaskCount(_ value: Int32) -> String {
-        let form = getPluralizationForm(self.lc, value)
-        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
-        return String(format: self._ps[37 * 6 + Int(form.rawValue)]!, stringValue)
-    }
-    public func Watch_LastSeen_HoursAgo(_ value: Int32) -> String {
-        let form = getPluralizationForm(self.lc, value)
-        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
-        return String(format: self._ps[38 * 6 + Int(form.rawValue)]!, stringValue)
-    }
-    public func MessagePoll_QuizCount(_ value: Int32) -> String {
-        let form = getPluralizationForm(self.lc, value)
-        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
-        return String(format: self._ps[39 * 6 + Int(form.rawValue)]!, stringValue)
-    }
-    public func LastSeen_MinutesAgo(_ value: Int32) -> String {
-        let form = getPluralizationForm(self.lc, value)
-        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
-        return String(format: self._ps[40 * 6 + Int(form.rawValue)]!, stringValue)
-    }
-    public func ForwardedStickers(_ value: Int32) -> String {
-        let form = getPluralizationForm(self.lc, value)
-        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
-        return String(format: self._ps[41 * 6 + Int(form.rawValue)]!, stringValue)
-    }
-    public func OldChannels_GroupFormat(_ value: Int32) -> String {
-        let form = getPluralizationForm(self.lc, value)
-        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
-        return String(format: self._ps[42 * 6 + Int(form.rawValue)]!, stringValue)
-    }
-    public func MessageTimer_ShortDays(_ value: Int32) -> String {
-        let form = getPluralizationForm(self.lc, value)
-        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
-        return String(format: self._ps[43 * 6 + Int(form.rawValue)]!, stringValue)
-    }
-    public func SharedMedia_DeleteItemsConfirmation(_ value: Int32) -> String {
-        let form = getPluralizationForm(self.lc, value)
-        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
-        return String(format: self._ps[44 * 6 + Int(form.rawValue)]!, stringValue)
-    }
-    public func Media_ShareVideo(_ value: Int32) -> String {
-        let form = getPluralizationForm(self.lc, value)
-        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
-        return String(format: self._ps[45 * 6 + Int(form.rawValue)]!, stringValue)
-    }
-    public func MessageTimer_Minutes(_ value: Int32) -> String {
-        let form = getPluralizationForm(self.lc, value)
-        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
-        return String(format: self._ps[46 * 6 + Int(form.rawValue)]!, stringValue)
-    }
-    public func ServiceMessage_GameScoreSimple(_ value: Int32) -> String {
-        let form = getPluralizationForm(self.lc, value)
-        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
-        return String(format: self._ps[47 * 6 + Int(form.rawValue)]!, stringValue)
-    }
-    public func MessageTimer_Days(_ value: Int32) -> String {
-        let form = getPluralizationForm(self.lc, value)
-        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
-        return String(format: self._ps[48 * 6 + Int(form.rawValue)]!, stringValue)
-    }
-    public func ServiceMessage_GameScoreExtended(_ value: Int32) -> String {
-        let form = getPluralizationForm(self.lc, value)
-        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
-        return String(format: self._ps[49 * 6 + Int(form.rawValue)]!, stringValue)
-    }
-    public func PUSH_CHAT_MESSAGES(_ selector: Int32, _ _2: String, _ _1: String, _ _3: Int32) -> String {
-        let form = getPluralizationForm(self.lc, selector)
-        return String(format: self._ps[50 * 6 + Int(form.rawValue)]!, _2, _1, _3)
-    }
-    public func GroupInfo_ShowMoreMembers(_ value: Int32) -> String {
-        let form = getPluralizationForm(self.lc, value)
-        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
-        return String(format: self._ps[51 * 6 + Int(form.rawValue)]!, stringValue)
-    }
-    public func Stats_MessageViews(_ value: Int32) -> String {
-        let form = getPluralizationForm(self.lc, value)
-        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
-        return String(format: self._ps[52 * 6 + Int(form.rawValue)]!, stringValue)
-    }
-    public func Passport_Scans(_ value: Int32) -> String {
-        let form = getPluralizationForm(self.lc, value)
-        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
-        return String(format: self._ps[53 * 6 + Int(form.rawValue)]!, stringValue)
-    }
-    public func PUSH_MESSAGE_PHOTOS(_ selector: Int32, _ _1: String, _ _2: Int32) -> String {
-        let form = getPluralizationForm(self.lc, selector)
-        return String(format: self._ps[54 * 6 + Int(form.rawValue)]!, _1, _2)
-    }
-    public func PUSH_MESSAGE_ROUNDS(_ selector: Int32, _ _1: String, _ _2: Int32) -> String {
-        let form = getPluralizationForm(self.lc, selector)
-        return String(format: self._ps[55 * 6 + Int(form.rawValue)]!, _1, _2)
-    }
-    public func ForwardedVideos(_ value: Int32) -> String {
-        let form = getPluralizationForm(self.lc, value)
-        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
-        return String(format: self._ps[56 * 6 + Int(form.rawValue)]!, stringValue)
-    }
-    public func LiveLocation_MenuChatsCount(_ value: Int32) -> String {
-        let form = getPluralizationForm(self.lc, value)
-        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
-        return String(format: self._ps[57 * 6 + Int(form.rawValue)]!, stringValue)
+        return String(format: self._ps[8 * 6 + Int(form.rawValue)]!, stringValue)
     }
     public func Wallet_Updated_MinutesAgo(_ value: Int32) -> String {
         let form = getPluralizationForm(self.lc, value)
         let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
-        return String(format: self._ps[58 * 6 + Int(form.rawValue)]!, stringValue)
+        return String(format: self._ps[9 * 6 + Int(form.rawValue)]!, stringValue)
+    }
+    public func Conversation_StatusMembers(_ value: Int32) -> String {
+        let form = getPluralizationForm(self.lc, value)
+        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
+        return String(format: self._ps[10 * 6 + Int(form.rawValue)]!, stringValue)
+    }
+    public func StickerPack_AddStickerCount(_ value: Int32) -> String {
+        let form = getPluralizationForm(self.lc, value)
+        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
+        return String(format: self._ps[11 * 6 + Int(form.rawValue)]!, stringValue)
+    }
+    public func MessageTimer_Years(_ value: Int32) -> String {
+        let form = getPluralizationForm(self.lc, value)
+        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
+        return String(format: self._ps[12 * 6 + Int(form.rawValue)]!, stringValue)
+    }
+    public func CreatePoll_AddMoreOptions(_ value: Int32) -> String {
+        let form = getPluralizationForm(self.lc, value)
+        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
+        return String(format: self._ps[13 * 6 + Int(form.rawValue)]!, stringValue)
+    }
+    public func Conversation_StatusSubscribers(_ value: Int32) -> String {
+        let form = getPluralizationForm(self.lc, value)
+        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
+        return String(format: self._ps[14 * 6 + Int(form.rawValue)]!, stringValue)
+    }
+    public func Notification_GameScoreExtended(_ value: Int32) -> String {
+        let form = getPluralizationForm(self.lc, value)
+        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
+        return String(format: self._ps[15 * 6 + Int(form.rawValue)]!, stringValue)
+    }
+    public func VoiceOver_Chat_ContactEmailCount(_ value: Int32) -> String {
+        let form = getPluralizationForm(self.lc, value)
+        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
+        return String(format: self._ps[16 * 6 + Int(form.rawValue)]!, stringValue)
     }
     public func Notifications_ExceptionMuteExpires_Days(_ value: Int32) -> String {
         let form = getPluralizationForm(self.lc, value)
         let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
-        return String(format: self._ps[59 * 6 + Int(form.rawValue)]!, stringValue)
-    }
-    public func MessageTimer_Seconds(_ value: Int32) -> String {
-        let form = getPluralizationForm(self.lc, value)
-        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
-        return String(format: self._ps[60 * 6 + Int(form.rawValue)]!, stringValue)
-    }
-    public func Media_ShareItem(_ value: Int32) -> String {
-        let form = getPluralizationForm(self.lc, value)
-        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
-        return String(format: self._ps[61 * 6 + Int(form.rawValue)]!, stringValue)
-    }
-    public func ChatList_DeletedChats(_ value: Int32) -> String {
-        let form = getPluralizationForm(self.lc, value)
-        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
-        return String(format: self._ps[62 * 6 + Int(form.rawValue)]!, stringValue)
-    }
-    public func MessageTimer_Hours(_ value: Int32) -> String {
-        let form = getPluralizationForm(self.lc, value)
-        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
-        return String(format: self._ps[63 * 6 + Int(form.rawValue)]!, stringValue)
-    }
-    public func Forward_ConfirmMultipleFiles(_ value: Int32) -> String {
-        let form = getPluralizationForm(self.lc, value)
-        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
-        return String(format: self._ps[64 * 6 + Int(form.rawValue)]!, stringValue)
-    }
-    public func Chat_DeleteMessagesConfirmation(_ value: Int32) -> String {
-        let form = getPluralizationForm(self.lc, value)
-        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
-        return String(format: self._ps[65 * 6 + Int(form.rawValue)]!, stringValue)
-    }
-    public func ChatList_DeleteConfirmation(_ value: Int32) -> String {
-        let form = getPluralizationForm(self.lc, value)
-        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
-        return String(format: self._ps[66 * 6 + Int(form.rawValue)]!, stringValue)
+        return String(format: self._ps[17 * 6 + Int(form.rawValue)]!, stringValue)
     }
     public func Wallet_Updated_HoursAgo(_ value: Int32) -> String {
         let form = getPluralizationForm(self.lc, value)
         let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
-        return String(format: self._ps[67 * 6 + Int(form.rawValue)]!, stringValue)
+        return String(format: self._ps[18 * 6 + Int(form.rawValue)]!, stringValue)
+    }
+    public func ForwardedVideos(_ value: Int32) -> String {
+        let form = getPluralizationForm(self.lc, value)
+        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
+        return String(format: self._ps[19 * 6 + Int(form.rawValue)]!, stringValue)
+    }
+    public func Call_Seconds(_ value: Int32) -> String {
+        let form = getPluralizationForm(self.lc, value)
+        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
+        return String(format: self._ps[20 * 6 + Int(form.rawValue)]!, stringValue)
+    }
+    public func PUSH_MESSAGE_PHOTOS(_ selector: Int32, _ _1: String, _ _2: Int32) -> String {
+        let form = getPluralizationForm(self.lc, selector)
+        return String(format: self._ps[21 * 6 + Int(form.rawValue)]!, _1, _2)
+    }
+    public func PUSH_CHAT_MESSAGE_PHOTOS(_ selector: Int32, _ _2: String, _ _1: String, _ _3: Int32) -> String {
+        let form = getPluralizationForm(self.lc, selector)
+        return String(format: self._ps[22 * 6 + Int(form.rawValue)]!, _2, _1, _3)
+    }
+    public func PollResults_ShowMore(_ value: Int32) -> String {
+        let form = getPluralizationForm(self.lc, value)
+        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
+        return String(format: self._ps[23 * 6 + Int(form.rawValue)]!, stringValue)
+    }
+    public func Call_ShortSeconds(_ value: Int32) -> String {
+        let form = getPluralizationForm(self.lc, value)
+        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
+        return String(format: self._ps[24 * 6 + Int(form.rawValue)]!, stringValue)
+    }
+    public func Watch_LastSeen_MinutesAgo(_ value: Int32) -> String {
+        let form = getPluralizationForm(self.lc, value)
+        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
+        return String(format: self._ps[25 * 6 + Int(form.rawValue)]!, stringValue)
+    }
+    public func SharedMedia_Generic(_ value: Int32) -> String {
+        let form = getPluralizationForm(self.lc, value)
+        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
+        return String(format: self._ps[26 * 6 + Int(form.rawValue)]!, stringValue)
+    }
+    public func ForwardedAuthorsOthers(_ selector: Int32, _ _0: String, _ _1: String) -> String {
+        let form = getPluralizationForm(self.lc, selector)
+        return String(format: self._ps[27 * 6 + Int(form.rawValue)]!, _0, _1)
+    }
+    public func ForwardedLocations(_ value: Int32) -> String {
+        let form = getPluralizationForm(self.lc, value)
+        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
+        return String(format: self._ps[28 * 6 + Int(form.rawValue)]!, stringValue)
+    }
+    public func PUSH_CHAT_MESSAGE_FWDS(_ selector: Int32, _ _2: String, _ _1: String, _ _3: Int32) -> String {
+        let form = getPluralizationForm(self.lc, selector)
+        return String(format: self._ps[29 * 6 + Int(form.rawValue)]!, _2, _1, _3)
+    }
+    public func StickerPack_RemoveMaskCount(_ value: Int32) -> String {
+        let form = getPluralizationForm(self.lc, value)
+        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
+        return String(format: self._ps[30 * 6 + Int(form.rawValue)]!, stringValue)
+    }
+    public func MuteExpires_Days(_ value: Int32) -> String {
+        let form = getPluralizationForm(self.lc, value)
+        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
+        return String(format: self._ps[31 * 6 + Int(form.rawValue)]!, stringValue)
     }
     public func Stats_MessageForwards(_ value: Int32) -> String {
         let form = getPluralizationForm(self.lc, value)
         let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
-        return String(format: self._ps[68 * 6 + Int(form.rawValue)]!, stringValue)
+        return String(format: self._ps[32 * 6 + Int(form.rawValue)]!, stringValue)
     }
-    public func StickerPack_RemoveStickerCount(_ value: Int32) -> String {
+    public func Wallpaper_DeleteConfirmation(_ value: Int32) -> String {
         let form = getPluralizationForm(self.lc, value)
         let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
-        return String(format: self._ps[69 * 6 + Int(form.rawValue)]!, stringValue)
-    }
-    public func Notification_GameScoreSimple(_ value: Int32) -> String {
-        let form = getPluralizationForm(self.lc, value)
-        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
-        return String(format: self._ps[70 * 6 + Int(form.rawValue)]!, stringValue)
-    }
-    public func VoiceOver_Chat_PollOptionCount(_ value: Int32) -> String {
-        let form = getPluralizationForm(self.lc, value)
-        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
-        return String(format: self._ps[71 * 6 + Int(form.rawValue)]!, stringValue)
-    }
-    public func ForwardedPolls(_ value: Int32) -> String {
-        let form = getPluralizationForm(self.lc, value)
-        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
-        return String(format: self._ps[72 * 6 + Int(form.rawValue)]!, stringValue)
+        return String(format: self._ps[33 * 6 + Int(form.rawValue)]!, stringValue)
     }
     public func ForwardedFiles(_ value: Int32) -> String {
         let form = getPluralizationForm(self.lc, value)
         let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
-        return String(format: self._ps[73 * 6 + Int(form.rawValue)]!, stringValue)
+        return String(format: self._ps[34 * 6 + Int(form.rawValue)]!, stringValue)
+    }
+    public func Passport_Scans(_ value: Int32) -> String {
+        let form = getPluralizationForm(self.lc, value)
+        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
+        return String(format: self._ps[35 * 6 + Int(form.rawValue)]!, stringValue)
+    }
+    public func SharedMedia_Link(_ value: Int32) -> String {
+        let form = getPluralizationForm(self.lc, value)
+        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
+        return String(format: self._ps[36 * 6 + Int(form.rawValue)]!, stringValue)
+    }
+    public func MessageTimer_ShortMinutes(_ value: Int32) -> String {
+        let form = getPluralizationForm(self.lc, value)
+        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
+        return String(format: self._ps[37 * 6 + Int(form.rawValue)]!, stringValue)
+    }
+    public func Notifications_Exceptions(_ value: Int32) -> String {
+        let form = getPluralizationForm(self.lc, value)
+        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
+        return String(format: self._ps[38 * 6 + Int(form.rawValue)]!, stringValue)
+    }
+    public func ServiceMessage_GameScoreSelfSimple(_ value: Int32) -> String {
+        let form = getPluralizationForm(self.lc, value)
+        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
+        return String(format: self._ps[39 * 6 + Int(form.rawValue)]!, stringValue)
     }
     public func ForwardedMessages(_ value: Int32) -> String {
         let form = getPluralizationForm(self.lc, value)
         let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
-        return String(format: self._ps[74 * 6 + Int(form.rawValue)]!, stringValue)
+        return String(format: self._ps[40 * 6 + Int(form.rawValue)]!, stringValue)
+    }
+    public func MuteFor_Hours(_ value: Int32) -> String {
+        let form = getPluralizationForm(self.lc, value)
+        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
+        return String(format: self._ps[41 * 6 + Int(form.rawValue)]!, stringValue)
+    }
+    public func Conversation_LiveLocationMembersCount(_ value: Int32) -> String {
+        let form = getPluralizationForm(self.lc, value)
+        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
+        return String(format: self._ps[42 * 6 + Int(form.rawValue)]!, stringValue)
+    }
+    public func Call_ShortMinutes(_ value: Int32) -> String {
+        let form = getPluralizationForm(self.lc, value)
+        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
+        return String(format: self._ps[43 * 6 + Int(form.rawValue)]!, stringValue)
+    }
+    public func SharedMedia_Photo(_ value: Int32) -> String {
+        let form = getPluralizationForm(self.lc, value)
+        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
+        return String(format: self._ps[44 * 6 + Int(form.rawValue)]!, stringValue)
+    }
+    public func ServiceMessage_GameScoreSimple(_ value: Int32) -> String {
+        let form = getPluralizationForm(self.lc, value)
+        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
+        return String(format: self._ps[45 * 6 + Int(form.rawValue)]!, stringValue)
+    }
+    public func VoiceOver_Chat_PollVotes(_ value: Int32) -> String {
+        let form = getPluralizationForm(self.lc, value)
+        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
+        return String(format: self._ps[46 * 6 + Int(form.rawValue)]!, stringValue)
+    }
+    public func PUSH_MESSAGE_FWDS(_ selector: Int32, _ _1: String, _ _2: Int32) -> String {
+        let form = getPluralizationForm(self.lc, selector)
+        return String(format: self._ps[47 * 6 + Int(form.rawValue)]!, _1, _2)
+    }
+    public func PUSH_MESSAGES(_ selector: Int32, _ _1: String, _ _2: Int32) -> String {
+        let form = getPluralizationForm(self.lc, selector)
+        return String(format: self._ps[48 * 6 + Int(form.rawValue)]!, _1, _2)
+    }
+    public func AttachmentMenu_SendItem(_ value: Int32) -> String {
+        let form = getPluralizationForm(self.lc, value)
+        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
+        return String(format: self._ps[49 * 6 + Int(form.rawValue)]!, stringValue)
+    }
+    public func StickerPack_RemoveStickerCount(_ value: Int32) -> String {
+        let form = getPluralizationForm(self.lc, value)
+        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
+        return String(format: self._ps[50 * 6 + Int(form.rawValue)]!, stringValue)
+    }
+    public func Media_ShareVideo(_ value: Int32) -> String {
+        let form = getPluralizationForm(self.lc, value)
+        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
+        return String(format: self._ps[51 * 6 + Int(form.rawValue)]!, stringValue)
+    }
+    public func MessageTimer_Days(_ value: Int32) -> String {
+        let form = getPluralizationForm(self.lc, value)
+        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
+        return String(format: self._ps[52 * 6 + Int(form.rawValue)]!, stringValue)
     }
     public func Contacts_InviteContacts(_ value: Int32) -> String {
+        let form = getPluralizationForm(self.lc, value)
+        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
+        return String(format: self._ps[53 * 6 + Int(form.rawValue)]!, stringValue)
+    }
+    public func ForwardedStickers(_ value: Int32) -> String {
+        let form = getPluralizationForm(self.lc, value)
+        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
+        return String(format: self._ps[54 * 6 + Int(form.rawValue)]!, stringValue)
+    }
+    public func ChatList_DeleteConfirmation(_ value: Int32) -> String {
+        let form = getPluralizationForm(self.lc, value)
+        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
+        return String(format: self._ps[55 * 6 + Int(form.rawValue)]!, stringValue)
+    }
+    public func PUSH_CHANNEL_MESSAGES(_ selector: Int32, _ _1: String, _ _2: Int32) -> String {
+        let form = getPluralizationForm(self.lc, selector)
+        return String(format: self._ps[56 * 6 + Int(form.rawValue)]!, _1, _2)
+    }
+    public func PUSH_MESSAGE_VIDEOS(_ selector: Int32, _ _1: String, _ _2: Int32) -> String {
+        let form = getPluralizationForm(self.lc, selector)
+        return String(format: self._ps[57 * 6 + Int(form.rawValue)]!, _1, _2)
+    }
+    public func PUSH_CHANNEL_MESSAGE_FWDS(_ selector: Int32, _ _1: String, _ _2: Int32) -> String {
+        let form = getPluralizationForm(self.lc, selector)
+        return String(format: self._ps[58 * 6 + Int(form.rawValue)]!, _1, _2)
+    }
+    public func StickerPack_StickerCount(_ value: Int32) -> String {
+        let form = getPluralizationForm(self.lc, value)
+        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
+        return String(format: self._ps[59 * 6 + Int(form.rawValue)]!, stringValue)
+    }
+    public func VoiceOver_Chat_PollOptionCount(_ value: Int32) -> String {
+        let form = getPluralizationForm(self.lc, value)
+        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
+        return String(format: self._ps[60 * 6 + Int(form.rawValue)]!, stringValue)
+    }
+    public func DialogList_LiveLocationChatsCount(_ value: Int32) -> String {
+        let form = getPluralizationForm(self.lc, value)
+        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
+        return String(format: self._ps[61 * 6 + Int(form.rawValue)]!, stringValue)
+    }
+    public func ForwardedPhotos(_ value: Int32) -> String {
+        let form = getPluralizationForm(self.lc, value)
+        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
+        return String(format: self._ps[62 * 6 + Int(form.rawValue)]!, stringValue)
+    }
+    public func MessageTimer_Minutes(_ value: Int32) -> String {
+        let form = getPluralizationForm(self.lc, value)
+        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
+        return String(format: self._ps[63 * 6 + Int(form.rawValue)]!, stringValue)
+    }
+    public func AttachmentMenu_SendGif(_ value: Int32) -> String {
+        let form = getPluralizationForm(self.lc, value)
+        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
+        return String(format: self._ps[64 * 6 + Int(form.rawValue)]!, stringValue)
+    }
+    public func MuteExpires_Minutes(_ value: Int32) -> String {
+        let form = getPluralizationForm(self.lc, value)
+        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
+        return String(format: self._ps[65 * 6 + Int(form.rawValue)]!, stringValue)
+    }
+    public func MessageTimer_ShortWeeks(_ value: Int32) -> String {
+        let form = getPluralizationForm(self.lc, value)
+        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
+        return String(format: self._ps[66 * 6 + Int(form.rawValue)]!, stringValue)
+    }
+    public func LastSeen_MinutesAgo(_ value: Int32) -> String {
+        let form = getPluralizationForm(self.lc, value)
+        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
+        return String(format: self._ps[67 * 6 + Int(form.rawValue)]!, stringValue)
+    }
+    public func Media_SharePhoto(_ value: Int32) -> String {
+        let form = getPluralizationForm(self.lc, value)
+        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
+        return String(format: self._ps[68 * 6 + Int(form.rawValue)]!, stringValue)
+    }
+    public func ForwardedGifs(_ value: Int32) -> String {
+        let form = getPluralizationForm(self.lc, value)
+        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
+        return String(format: self._ps[69 * 6 + Int(form.rawValue)]!, stringValue)
+    }
+    public func GroupInfo_ShowMoreMembers(_ value: Int32) -> String {
+        let form = getPluralizationForm(self.lc, value)
+        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
+        return String(format: self._ps[70 * 6 + Int(form.rawValue)]!, stringValue)
+    }
+    public func ForwardedAudios(_ value: Int32) -> String {
+        let form = getPluralizationForm(self.lc, value)
+        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
+        return String(format: self._ps[71 * 6 + Int(form.rawValue)]!, stringValue)
+    }
+    public func PUSH_MESSAGE_ROUNDS(_ selector: Int32, _ _1: String, _ _2: Int32) -> String {
+        let form = getPluralizationForm(self.lc, selector)
+        return String(format: self._ps[72 * 6 + Int(form.rawValue)]!, _1, _2)
+    }
+    public func OldChannels_InactiveWeek(_ value: Int32) -> String {
+        let form = getPluralizationForm(self.lc, value)
+        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
+        return String(format: self._ps[73 * 6 + Int(form.rawValue)]!, stringValue)
+    }
+    public func Media_ShareItem(_ value: Int32) -> String {
+        let form = getPluralizationForm(self.lc, value)
+        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
+        return String(format: self._ps[74 * 6 + Int(form.rawValue)]!, stringValue)
+    }
+    public func PeopleNearby_ShowMorePeople(_ value: Int32) -> String {
         let form = getPluralizationForm(self.lc, value)
         let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
         return String(format: self._ps[75 * 6 + Int(form.rawValue)]!, stringValue)
     }
-    public func LiveLocationUpdated_MinutesAgo(_ value: Int32) -> String {
+    public func MessageTimer_Seconds(_ value: Int32) -> String {
         let form = getPluralizationForm(self.lc, value)
         let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
         return String(format: self._ps[76 * 6 + Int(form.rawValue)]!, stringValue)
     }
-    public func AttachmentMenu_SendVideo(_ value: Int32) -> String {
+    public func Notifications_ExceptionMuteExpires_Hours(_ value: Int32) -> String {
         let form = getPluralizationForm(self.lc, value)
         let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
         return String(format: self._ps[77 * 6 + Int(form.rawValue)]!, stringValue)
     }
-    public func StickerPack_StickerCount(_ value: Int32) -> String {
+    public func MessagePoll_VotedCount(_ value: Int32) -> String {
         let form = getPluralizationForm(self.lc, value)
         let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
         return String(format: self._ps[78 * 6 + Int(form.rawValue)]!, stringValue)
@@ -5151,247 +5152,248 @@ public final class PresentationStrings: Equatable {
         let form = getPluralizationForm(self.lc, selector)
         return String(format: self._ps[79 * 6 + Int(form.rawValue)]!, _2, _1, _3)
     }
-    public func PUSH_CHANNEL_MESSAGE_FWDS(_ selector: Int32, _ _1: String, _ _2: Int32) -> String {
-        let form = getPluralizationForm(self.lc, selector)
-        return String(format: self._ps[80 * 6 + Int(form.rawValue)]!, _1, _2)
-    }
-    public func ForwardedAudios(_ value: Int32) -> String {
+    public func LiveLocation_MenuChatsCount(_ value: Int32) -> String {
         let form = getPluralizationForm(self.lc, value)
         let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
-        return String(format: self._ps[81 * 6 + Int(form.rawValue)]!, stringValue)
-    }
-    public func AttachmentMenu_SendGif(_ value: Int32) -> String {
-        let form = getPluralizationForm(self.lc, value)
-        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
-        return String(format: self._ps[82 * 6 + Int(form.rawValue)]!, stringValue)
-    }
-    public func ForwardedContacts(_ value: Int32) -> String {
-        let form = getPluralizationForm(self.lc, value)
-        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
-        return String(format: self._ps[83 * 6 + Int(form.rawValue)]!, stringValue)
-    }
-    public func Notification_GameScoreSelfExtended(_ value: Int32) -> String {
-        let form = getPluralizationForm(self.lc, value)
-        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
-        return String(format: self._ps[84 * 6 + Int(form.rawValue)]!, stringValue)
-    }
-    public func PeopleNearby_ShowMorePeople(_ value: Int32) -> String {
-        let form = getPluralizationForm(self.lc, value)
-        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
-        return String(format: self._ps[85 * 6 + Int(form.rawValue)]!, stringValue)
-    }
-    public func PollResults_ShowMore(_ value: Int32) -> String {
-        let form = getPluralizationForm(self.lc, value)
-        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
-        return String(format: self._ps[86 * 6 + Int(form.rawValue)]!, stringValue)
-    }
-    public func SharedMedia_File(_ value: Int32) -> String {
-        let form = getPluralizationForm(self.lc, value)
-        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
-        return String(format: self._ps[87 * 6 + Int(form.rawValue)]!, stringValue)
-    }
-    public func Call_Minutes(_ value: Int32) -> String {
-        let form = getPluralizationForm(self.lc, value)
-        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
-        return String(format: self._ps[88 * 6 + Int(form.rawValue)]!, stringValue)
-    }
-    public func PUSH_CHAT_MESSAGE_PHOTOS(_ selector: Int32, _ _2: String, _ _1: String, _ _3: Int32) -> String {
-        let form = getPluralizationForm(self.lc, selector)
-        return String(format: self._ps[89 * 6 + Int(form.rawValue)]!, _2, _1, _3)
-    }
-    public func Media_SharePhoto(_ value: Int32) -> String {
-        let form = getPluralizationForm(self.lc, value)
-        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
-        return String(format: self._ps[90 * 6 + Int(form.rawValue)]!, stringValue)
-    }
-    public func MessageTimer_ShortSeconds(_ value: Int32) -> String {
-        let form = getPluralizationForm(self.lc, value)
-        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
-        return String(format: self._ps[91 * 6 + Int(form.rawValue)]!, stringValue)
-    }
-    public func Conversation_LiveLocationMembersCount(_ value: Int32) -> String {
-        let form = getPluralizationForm(self.lc, value)
-        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
-        return String(format: self._ps[92 * 6 + Int(form.rawValue)]!, stringValue)
-    }
-    public func ServiceMessage_GameScoreSelfSimple(_ value: Int32) -> String {
-        let form = getPluralizationForm(self.lc, value)
-        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
-        return String(format: self._ps[93 * 6 + Int(form.rawValue)]!, stringValue)
-    }
-    public func Watch_UserInfo_Mute(_ value: Int32) -> String {
-        let form = getPluralizationForm(self.lc, value)
-        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
-        return String(format: self._ps[94 * 6 + Int(form.rawValue)]!, stringValue)
-    }
-    public func OldChannels_InactiveMonth(_ value: Int32) -> String {
-        let form = getPluralizationForm(self.lc, value)
-        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
-        return String(format: self._ps[95 * 6 + Int(form.rawValue)]!, stringValue)
-    }
-    public func PUSH_CHANNEL_MESSAGE_PHOTOS(_ selector: Int32, _ _1: String, _ _2: Int32) -> String {
-        let form = getPluralizationForm(self.lc, selector)
-        return String(format: self._ps[96 * 6 + Int(form.rawValue)]!, _1, _2)
-    }
-    public func ForwardedLocations(_ value: Int32) -> String {
-        let form = getPluralizationForm(self.lc, value)
-        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
-        return String(format: self._ps[97 * 6 + Int(form.rawValue)]!, stringValue)
-    }
-    public func ChatList_SelectedChats(_ value: Int32) -> String {
-        let form = getPluralizationForm(self.lc, value)
-        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
-        return String(format: self._ps[98 * 6 + Int(form.rawValue)]!, stringValue)
-    }
-    public func Call_Seconds(_ value: Int32) -> String {
-        let form = getPluralizationForm(self.lc, value)
-        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
-        return String(format: self._ps[99 * 6 + Int(form.rawValue)]!, stringValue)
+        return String(format: self._ps[80 * 6 + Int(form.rawValue)]!, stringValue)
     }
     public func MuteFor_Days(_ value: Int32) -> String {
         let form = getPluralizationForm(self.lc, value)
         let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
-        return String(format: self._ps[100 * 6 + Int(form.rawValue)]!, stringValue)
+        return String(format: self._ps[81 * 6 + Int(form.rawValue)]!, stringValue)
     }
-    public func MuteExpires_Minutes(_ value: Int32) -> String {
+    public func Watch_UserInfo_Mute(_ value: Int32) -> String {
         let form = getPluralizationForm(self.lc, value)
         let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
-        return String(format: self._ps[101 * 6 + Int(form.rawValue)]!, stringValue)
+        return String(format: self._ps[82 * 6 + Int(form.rawValue)]!, stringValue)
     }
-    public func PUSH_CHANNEL_MESSAGE_ROUNDS(_ selector: Int32, _ _1: String, _ _2: Int32) -> String {
-        let form = getPluralizationForm(self.lc, selector)
-        return String(format: self._ps[102 * 6 + Int(form.rawValue)]!, _1, _2)
-    }
-    public func Map_ETAMinutes(_ value: Int32) -> String {
+    public func PrivacyLastSeenSettings_AddUsers(_ value: Int32) -> String {
         let form = getPluralizationForm(self.lc, value)
         let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
-        return String(format: self._ps[103 * 6 + Int(form.rawValue)]!, stringValue)
+        return String(format: self._ps[83 * 6 + Int(form.rawValue)]!, stringValue)
     }
-    public func PasscodeSettings_FailedAttempts(_ value: Int32) -> String {
+    public func MessageTimer_Months(_ value: Int32) -> String {
         let form = getPluralizationForm(self.lc, value)
         let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
-        return String(format: self._ps[104 * 6 + Int(form.rawValue)]!, stringValue)
+        return String(format: self._ps[84 * 6 + Int(form.rawValue)]!, stringValue)
     }
-    public func OldChannels_Leave(_ value: Int32) -> String {
+    public func GroupInfo_ParticipantCount(_ value: Int32) -> String {
         let form = getPluralizationForm(self.lc, value)
         let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
-        return String(format: self._ps[105 * 6 + Int(form.rawValue)]!, stringValue)
+        return String(format: self._ps[85 * 6 + Int(form.rawValue)]!, stringValue)
+    }
+    public func Call_Minutes(_ value: Int32) -> String {
+        let form = getPluralizationForm(self.lc, value)
+        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
+        return String(format: self._ps[86 * 6 + Int(form.rawValue)]!, stringValue)
     }
     public func Invitation_Members(_ value: Int32) -> String {
+        let form = getPluralizationForm(self.lc, value)
+        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
+        return String(format: self._ps[87 * 6 + Int(form.rawValue)]!, stringValue)
+    }
+    public func ForwardedContacts(_ value: Int32) -> String {
+        let form = getPluralizationForm(self.lc, value)
+        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
+        return String(format: self._ps[88 * 6 + Int(form.rawValue)]!, stringValue)
+    }
+    public func OldChannels_InactiveMonth(_ value: Int32) -> String {
+        let form = getPluralizationForm(self.lc, value)
+        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
+        return String(format: self._ps[89 * 6 + Int(form.rawValue)]!, stringValue)
+    }
+    public func Notification_GameScoreSelfExtended(_ value: Int32) -> String {
+        let form = getPluralizationForm(self.lc, value)
+        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
+        return String(format: self._ps[90 * 6 + Int(form.rawValue)]!, stringValue)
+    }
+    public func InstantPage_Views(_ value: Int32) -> String {
+        let form = getPluralizationForm(self.lc, value)
+        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
+        return String(format: self._ps[91 * 6 + Int(form.rawValue)]!, stringValue)
+    }
+    public func Watch_LastSeen_HoursAgo(_ value: Int32) -> String {
+        let form = getPluralizationForm(self.lc, value)
+        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
+        return String(format: self._ps[92 * 6 + Int(form.rawValue)]!, stringValue)
+    }
+    public func PasscodeSettings_FailedAttempts(_ value: Int32) -> String {
+        let form = getPluralizationForm(self.lc, value)
+        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
+        return String(format: self._ps[93 * 6 + Int(form.rawValue)]!, stringValue)
+    }
+    public func Conversation_SelectedMessages(_ value: Int32) -> String {
+        let form = getPluralizationForm(self.lc, value)
+        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
+        return String(format: self._ps[94 * 6 + Int(form.rawValue)]!, stringValue)
+    }
+    public func SharedMedia_Video(_ value: Int32) -> String {
+        let form = getPluralizationForm(self.lc, value)
+        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
+        return String(format: self._ps[95 * 6 + Int(form.rawValue)]!, stringValue)
+    }
+    public func QuickSend_Photos(_ value: Int32) -> String {
+        let form = getPluralizationForm(self.lc, value)
+        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
+        return String(format: self._ps[96 * 6 + Int(form.rawValue)]!, stringValue)
+    }
+    public func AttachmentMenu_SendPhoto(_ value: Int32) -> String {
+        let form = getPluralizationForm(self.lc, value)
+        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
+        return String(format: self._ps[97 * 6 + Int(form.rawValue)]!, stringValue)
+    }
+    public func Theme_UsersCount(_ value: Int32) -> String {
+        let form = getPluralizationForm(self.lc, value)
+        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
+        return String(format: self._ps[98 * 6 + Int(form.rawValue)]!, stringValue)
+    }
+    public func LiveLocationUpdated_MinutesAgo(_ value: Int32) -> String {
+        let form = getPluralizationForm(self.lc, value)
+        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
+        return String(format: self._ps[99 * 6 + Int(form.rawValue)]!, stringValue)
+    }
+    public func ChatList_DeletedChats(_ value: Int32) -> String {
+        let form = getPluralizationForm(self.lc, value)
+        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
+        return String(format: self._ps[100 * 6 + Int(form.rawValue)]!, stringValue)
+    }
+    public func StickerPack_AddMaskCount(_ value: Int32) -> String {
+        let form = getPluralizationForm(self.lc, value)
+        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
+        return String(format: self._ps[101 * 6 + Int(form.rawValue)]!, stringValue)
+    }
+    public func MessagePoll_QuizCount(_ value: Int32) -> String {
+        let form = getPluralizationForm(self.lc, value)
+        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
+        return String(format: self._ps[102 * 6 + Int(form.rawValue)]!, stringValue)
+    }
+    public func MessageTimer_Weeks(_ value: Int32) -> String {
+        let form = getPluralizationForm(self.lc, value)
+        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
+        return String(format: self._ps[103 * 6 + Int(form.rawValue)]!, stringValue)
+    }
+    public func Notification_GameScoreSimple(_ value: Int32) -> String {
+        let form = getPluralizationForm(self.lc, value)
+        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
+        return String(format: self._ps[104 * 6 + Int(form.rawValue)]!, stringValue)
+    }
+    public func MessageTimer_ShortDays(_ value: Int32) -> String {
+        let form = getPluralizationForm(self.lc, value)
+        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
+        return String(format: self._ps[105 * 6 + Int(form.rawValue)]!, stringValue)
+    }
+    public func Contacts_ImportersCount(_ value: Int32) -> String {
         let form = getPluralizationForm(self.lc, value)
         let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
         return String(format: self._ps[106 * 6 + Int(form.rawValue)]!, stringValue)
     }
-    public func PUSH_CHANNEL_MESSAGES(_ selector: Int32, _ _1: String, _ _2: Int32) -> String {
-        let form = getPluralizationForm(self.lc, selector)
-        return String(format: self._ps[107 * 6 + Int(form.rawValue)]!, _1, _2)
+    public func MessageTimer_ShortHours(_ value: Int32) -> String {
+        let form = getPluralizationForm(self.lc, value)
+        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
+        return String(format: self._ps[107 * 6 + Int(form.rawValue)]!, stringValue)
     }
     public func UserCount(_ value: Int32) -> String {
         let form = getPluralizationForm(self.lc, value)
         let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
         return String(format: self._ps[108 * 6 + Int(form.rawValue)]!, stringValue)
     }
-    public func Call_ShortSeconds(_ value: Int32) -> String {
-        let form = getPluralizationForm(self.lc, value)
-        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
-        return String(format: self._ps[109 * 6 + Int(form.rawValue)]!, stringValue)
-    }
-    public func Notifications_ExceptionMuteExpires_Minutes(_ value: Int32) -> String {
-        let form = getPluralizationForm(self.lc, value)
-        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
-        return String(format: self._ps[110 * 6 + Int(form.rawValue)]!, stringValue)
-    }
-    public func GroupInfo_ParticipantCount(_ value: Int32) -> String {
-        let form = getPluralizationForm(self.lc, value)
-        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
-        return String(format: self._ps[111 * 6 + Int(form.rawValue)]!, stringValue)
-    }
-    public func Conversation_SelectedMessages(_ value: Int32) -> String {
-        let form = getPluralizationForm(self.lc, value)
-        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
-        return String(format: self._ps[112 * 6 + Int(form.rawValue)]!, stringValue)
-    }
-    public func VoiceOver_Chat_ContactEmailCount(_ value: Int32) -> String {
-        let form = getPluralizationForm(self.lc, value)
-        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
-        return String(format: self._ps[113 * 6 + Int(form.rawValue)]!, stringValue)
-    }
-    public func ForwardedGifs(_ value: Int32) -> String {
-        let form = getPluralizationForm(self.lc, value)
-        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
-        return String(format: self._ps[114 * 6 + Int(form.rawValue)]!, stringValue)
-    }
-    public func MessageTimer_Months(_ value: Int32) -> String {
-        let form = getPluralizationForm(self.lc, value)
-        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
-        return String(format: self._ps[115 * 6 + Int(form.rawValue)]!, stringValue)
-    }
-    public func MessageTimer_Years(_ value: Int32) -> String {
-        let form = getPluralizationForm(self.lc, value)
-        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
-        return String(format: self._ps[116 * 6 + Int(form.rawValue)]!, stringValue)
-    }
-    public func MessageTimer_ShortHours(_ value: Int32) -> String {
-        let form = getPluralizationForm(self.lc, value)
-        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
-        return String(format: self._ps[117 * 6 + Int(form.rawValue)]!, stringValue)
-    }
-    public func InstantPage_Views(_ value: Int32) -> String {
-        let form = getPluralizationForm(self.lc, value)
-        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
-        return String(format: self._ps[118 * 6 + Int(form.rawValue)]!, stringValue)
-    }
-    public func Conversation_StatusSubscribers(_ value: Int32) -> String {
-        let form = getPluralizationForm(self.lc, value)
-        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
-        return String(format: self._ps[119 * 6 + Int(form.rawValue)]!, stringValue)
-    }
-    public func StickerPack_AddStickerCount(_ value: Int32) -> String {
-        let form = getPluralizationForm(self.lc, value)
-        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
-        return String(format: self._ps[120 * 6 + Int(form.rawValue)]!, stringValue)
+    public func PUSH_CHAT_MESSAGES(_ selector: Int32, _ _2: String, _ _1: String, _ _3: Int32) -> String {
+        let form = getPluralizationForm(self.lc, selector)
+        return String(format: self._ps[109 * 6 + Int(form.rawValue)]!, _2, _1, _3)
     }
     public func Map_ETAHours(_ value: Int32) -> String {
         let form = getPluralizationForm(self.lc, value)
         let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
-        return String(format: self._ps[121 * 6 + Int(form.rawValue)]!, stringValue)
+        return String(format: self._ps[110 * 6 + Int(form.rawValue)]!, stringValue)
     }
-    public func MuteFor_Hours(_ value: Int32) -> String {
+    public func Forward_ConfirmMultipleFiles(_ value: Int32) -> String {
         let form = getPluralizationForm(self.lc, value)
         let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
-        return String(format: self._ps[122 * 6 + Int(form.rawValue)]!, stringValue)
+        return String(format: self._ps[111 * 6 + Int(form.rawValue)]!, stringValue)
     }
-    public func QuickSend_Photos(_ value: Int32) -> String {
+    public func SharedMedia_File(_ value: Int32) -> String {
         let form = getPluralizationForm(self.lc, value)
         let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
-        return String(format: self._ps[123 * 6 + Int(form.rawValue)]!, stringValue)
+        return String(format: self._ps[112 * 6 + Int(form.rawValue)]!, stringValue)
     }
-    public func Theme_UsersCount(_ value: Int32) -> String {
-        let form = getPluralizationForm(self.lc, value)
-        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
-        return String(format: self._ps[124 * 6 + Int(form.rawValue)]!, stringValue)
-    }
-    public func MessageTimer_Weeks(_ value: Int32) -> String {
-        let form = getPluralizationForm(self.lc, value)
-        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
-        return String(format: self._ps[125 * 6 + Int(form.rawValue)]!, stringValue)
+    public func PUSH_CHANNEL_MESSAGE_VIDEOS(_ selector: Int32, _ _1: String, _ _2: Int32) -> String {
+        let form = getPluralizationForm(self.lc, selector)
+        return String(format: self._ps[113 * 6 + Int(form.rawValue)]!, _1, _2)
     }
     public func Notification_GameScoreSelfSimple(_ value: Int32) -> String {
         let form = getPluralizationForm(self.lc, value)
         let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
-        return String(format: self._ps[126 * 6 + Int(form.rawValue)]!, stringValue)
+        return String(format: self._ps[114 * 6 + Int(form.rawValue)]!, stringValue)
     }
-    public func MuteExpires_Days(_ value: Int32) -> String {
+    public func OldChannels_Leave(_ value: Int32) -> String {
         let form = getPluralizationForm(self.lc, value)
         let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
-        return String(format: self._ps[127 * 6 + Int(form.rawValue)]!, stringValue)
+        return String(format: self._ps[115 * 6 + Int(form.rawValue)]!, stringValue)
+    }
+    public func MessageTimer_Hours(_ value: Int32) -> String {
+        let form = getPluralizationForm(self.lc, value)
+        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
+        return String(format: self._ps[116 * 6 + Int(form.rawValue)]!, stringValue)
+    }
+    public func OldChannels_GroupFormat(_ value: Int32) -> String {
+        let form = getPluralizationForm(self.lc, value)
+        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
+        return String(format: self._ps[117 * 6 + Int(form.rawValue)]!, stringValue)
+    }
+    public func Map_ETAMinutes(_ value: Int32) -> String {
+        let form = getPluralizationForm(self.lc, value)
+        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
+        return String(format: self._ps[118 * 6 + Int(form.rawValue)]!, stringValue)
     }
     public func VoiceOver_Chat_ContactPhoneNumberCount(_ value: Int32) -> String {
+        let form = getPluralizationForm(self.lc, value)
+        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
+        return String(format: self._ps[119 * 6 + Int(form.rawValue)]!, stringValue)
+    }
+    public func ServiceMessage_GameScoreExtended(_ value: Int32) -> String {
+        let form = getPluralizationForm(self.lc, value)
+        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
+        return String(format: self._ps[120 * 6 + Int(form.rawValue)]!, stringValue)
+    }
+    public func AttachmentMenu_SendVideo(_ value: Int32) -> String {
+        let form = getPluralizationForm(self.lc, value)
+        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
+        return String(format: self._ps[121 * 6 + Int(form.rawValue)]!, stringValue)
+    }
+    public func PUSH_CHANNEL_MESSAGE_ROUNDS(_ selector: Int32, _ _1: String, _ _2: Int32) -> String {
+        let form = getPluralizationForm(self.lc, selector)
+        return String(format: self._ps[122 * 6 + Int(form.rawValue)]!, _1, _2)
+    }
+    public func SharedMedia_DeleteItemsConfirmation(_ value: Int32) -> String {
+        let form = getPluralizationForm(self.lc, value)
+        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
+        return String(format: self._ps[123 * 6 + Int(form.rawValue)]!, stringValue)
+    }
+    public func PUSH_CHAT_MESSAGE_VIDEOS(_ selector: Int32, _ _2: String, _ _1: String, _ _3: Int32) -> String {
+        let form = getPluralizationForm(self.lc, selector)
+        return String(format: self._ps[124 * 6 + Int(form.rawValue)]!, _2, _1, _3)
+    }
+    public func ChatList_SelectedChats(_ value: Int32) -> String {
+        let form = getPluralizationForm(self.lc, value)
+        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
+        return String(format: self._ps[125 * 6 + Int(form.rawValue)]!, stringValue)
+    }
+    public func Chat_DeleteMessagesConfirmation(_ value: Int32) -> String {
+        let form = getPluralizationForm(self.lc, value)
+        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
+        return String(format: self._ps[126 * 6 + Int(form.rawValue)]!, stringValue)
+    }
+    public func LastSeen_HoursAgo(_ value: Int32) -> String {
+        let form = getPluralizationForm(self.lc, value)
+        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
+        return String(format: self._ps[127 * 6 + Int(form.rawValue)]!, stringValue)
+    }
+    public func ForwardedPolls(_ value: Int32) -> String {
         let form = getPluralizationForm(self.lc, value)
         let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
         return String(format: self._ps[128 * 6 + Int(form.rawValue)]!, stringValue)
     }
-    public func ServiceMessage_GameScoreSelfExtended(_ value: Int32) -> String {
+    public func Conversation_StatusOnline(_ value: Int32) -> String {
         let form = getPluralizationForm(self.lc, value)
         let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
         return String(format: self._ps[129 * 6 + Int(form.rawValue)]!, stringValue)
diff --git a/submodules/TelegramPresentationData/Sources/PresentationTheme.swift b/submodules/TelegramPresentationData/Sources/PresentationTheme.swift
index 003c2d1246..f6e2d4d650 100644
--- a/submodules/TelegramPresentationData/Sources/PresentationTheme.swift
+++ b/submodules/TelegramPresentationData/Sources/PresentationTheme.swift
@@ -126,8 +126,10 @@ public final class PresentationThemeRootNavigationBar {
     public let segmentedForegroundColor: UIColor
     public let segmentedTextColor: UIColor
     public let segmentedDividerColor: UIColor
+    public let clearButtonBackgroundColor: UIColor
+    public let clearButtonForegroundColor: UIColor
     
-    public init(buttonColor: UIColor, disabledButtonColor: UIColor, primaryTextColor: UIColor, secondaryTextColor: UIColor, controlColor: UIColor, accentTextColor: UIColor, backgroundColor: UIColor, separatorColor: UIColor, badgeBackgroundColor: UIColor, badgeStrokeColor: UIColor, badgeTextColor: UIColor, segmentedBackgroundColor: UIColor, segmentedForegroundColor: UIColor, segmentedTextColor: UIColor, segmentedDividerColor: UIColor) {
+    public init(buttonColor: UIColor, disabledButtonColor: UIColor, primaryTextColor: UIColor, secondaryTextColor: UIColor, controlColor: UIColor, accentTextColor: UIColor, backgroundColor: UIColor, separatorColor: UIColor, badgeBackgroundColor: UIColor, badgeStrokeColor: UIColor, badgeTextColor: UIColor, segmentedBackgroundColor: UIColor, segmentedForegroundColor: UIColor, segmentedTextColor: UIColor, segmentedDividerColor: UIColor, clearButtonBackgroundColor: UIColor, clearButtonForegroundColor: UIColor) {
         self.buttonColor = buttonColor
         self.disabledButtonColor = disabledButtonColor
         self.primaryTextColor = primaryTextColor
@@ -143,10 +145,14 @@ public final class PresentationThemeRootNavigationBar {
         self.segmentedForegroundColor = segmentedForegroundColor
         self.segmentedTextColor = segmentedTextColor
         self.segmentedDividerColor = segmentedDividerColor
+        self.clearButtonBackgroundColor = clearButtonBackgroundColor
+        self.clearButtonForegroundColor = clearButtonForegroundColor
     }
     
-    public func withUpdated(buttonColor: UIColor? = nil, disabledButtonColor: UIColor? = nil, primaryTextColor: UIColor? = nil, secondaryTextColor: UIColor? = nil, controlColor: UIColor? = nil, accentTextColor: UIColor? = nil, backgroundColor: UIColor? = nil, separatorColor: UIColor? = nil, badgeBackgroundColor: UIColor? = nil, badgeStrokeColor: UIColor? = nil, badgeTextColor: UIColor? = nil, segmentedBackgroundColor: UIColor? = nil, segmentedForegroundColor: UIColor? = nil, segmentedTextColor: UIColor? = nil, segmentedDividerColor: UIColor? = nil) -> PresentationThemeRootNavigationBar {
-        return PresentationThemeRootNavigationBar(buttonColor: buttonColor ?? self.buttonColor, disabledButtonColor: disabledButtonColor ?? self.disabledButtonColor, primaryTextColor: primaryTextColor ?? self.primaryTextColor, secondaryTextColor: secondaryTextColor ?? self.secondaryTextColor, controlColor: controlColor ?? self.controlColor, accentTextColor: accentTextColor ?? self.accentTextColor, backgroundColor: backgroundColor ?? self.backgroundColor, separatorColor: separatorColor ?? self.separatorColor, badgeBackgroundColor: badgeBackgroundColor ?? self.badgeBackgroundColor, badgeStrokeColor: badgeStrokeColor ?? self.badgeStrokeColor, badgeTextColor: badgeTextColor ?? self.badgeTextColor, segmentedBackgroundColor: segmentedBackgroundColor ?? self.segmentedBackgroundColor, segmentedForegroundColor: segmentedForegroundColor ?? self.segmentedForegroundColor, segmentedTextColor: segmentedTextColor ?? self.segmentedTextColor, segmentedDividerColor: segmentedDividerColor ?? self.segmentedDividerColor)
+    public func withUpdated(buttonColor: UIColor? = nil, disabledButtonColor: UIColor? = nil, primaryTextColor: UIColor? = nil, secondaryTextColor: UIColor? = nil, controlColor: UIColor? = nil, accentTextColor: UIColor? = nil, backgroundColor: UIColor? = nil, separatorColor: UIColor? = nil, badgeBackgroundColor: UIColor? = nil, badgeStrokeColor: UIColor? = nil, badgeTextColor: UIColor? = nil, segmentedBackgroundColor: UIColor? = nil, segmentedForegroundColor: UIColor? = nil, segmentedTextColor: UIColor? = nil, segmentedDividerColor: UIColor? = nil, clearButtonBackgroundColor: UIColor? = nil, clearButtonForegroundColor: UIColor? = nil) -> PresentationThemeRootNavigationBar {
+        let resolvedClearButtonBackgroundColor = clearButtonBackgroundColor ?? self.clearButtonBackgroundColor
+        let resolvedClearButtonForegroundColor = clearButtonForegroundColor ?? self.clearButtonForegroundColor
+        return PresentationThemeRootNavigationBar(buttonColor: buttonColor ?? self.buttonColor, disabledButtonColor: disabledButtonColor ?? self.disabledButtonColor, primaryTextColor: primaryTextColor ?? self.primaryTextColor, secondaryTextColor: secondaryTextColor ?? self.secondaryTextColor, controlColor: controlColor ?? self.controlColor, accentTextColor: accentTextColor ?? self.accentTextColor, backgroundColor: backgroundColor ?? self.backgroundColor, separatorColor: separatorColor ?? self.separatorColor, badgeBackgroundColor: badgeBackgroundColor ?? self.badgeBackgroundColor, badgeStrokeColor: badgeStrokeColor ?? self.badgeStrokeColor, badgeTextColor: badgeTextColor ?? self.badgeTextColor, segmentedBackgroundColor: segmentedBackgroundColor ?? self.segmentedBackgroundColor, segmentedForegroundColor: segmentedForegroundColor ?? self.segmentedForegroundColor, segmentedTextColor: segmentedTextColor ?? self.segmentedTextColor, segmentedDividerColor: segmentedDividerColor ?? self.segmentedDividerColor, clearButtonBackgroundColor: resolvedClearButtonBackgroundColor, clearButtonForegroundColor: resolvedClearButtonForegroundColor)
     }
 }
 
diff --git a/submodules/TelegramPresentationData/Sources/PresentationThemeCodable.swift b/submodules/TelegramPresentationData/Sources/PresentationThemeCodable.swift
index 1eef46a36d..165d9c5e2e 100644
--- a/submodules/TelegramPresentationData/Sources/PresentationThemeCodable.swift
+++ b/submodules/TelegramPresentationData/Sources/PresentationThemeCodable.swift
@@ -402,26 +402,32 @@ extension PresentationThemeRootNavigationBar: Codable {
         case segmentedFg
         case segmentedText
         case segmentedDivider
+        case clearButtonBackground
+        case clearButtonForeground
     }
     
     public convenience init(from decoder: Decoder) throws {
         let values = try decoder.container(keyedBy: CodingKeys.self)
 
-        self.init(buttonColor: try decodeColor(values, .button),
-                  disabledButtonColor: try decodeColor(values, .disabledButton),
-                  primaryTextColor: try decodeColor(values, .primaryText),
-                  secondaryTextColor: try decodeColor(values, .secondaryText),
-                  controlColor: try decodeColor(values, .control),
-                  accentTextColor: try decodeColor(values, .accentText),
-                  backgroundColor: try decodeColor(values, .background),
-                  separatorColor: try decodeColor(values, .separator),
-                  badgeBackgroundColor: try decodeColor(values, .badgeFill),
-                  badgeStrokeColor: try decodeColor(values, .badgeStroke),
-                  badgeTextColor: try decodeColor(values, .badgeText),
-                  segmentedBackgroundColor: try decodeColor(values, .segmentedBg, decoder: decoder, fallbackKey: "root.searchBar.inputFill"),
-                  segmentedForegroundColor: try decodeColor(values, .segmentedFg, decoder: decoder, fallbackKey: "root.navBar.background"),
-                  segmentedTextColor: try decodeColor(values, .segmentedText, decoder: decoder, fallbackKey: "root.navBar.primaryText"),
-                  segmentedDividerColor: try decodeColor(values, .segmentedDivider, decoder: decoder, fallbackKey: "root.list.freeInputField.stroke"))
+        self.init(
+            buttonColor: try decodeColor(values, .button),
+            disabledButtonColor: try decodeColor(values, .disabledButton),
+            primaryTextColor: try decodeColor(values, .primaryText),
+            secondaryTextColor: try decodeColor(values, .secondaryText),
+            controlColor: try decodeColor(values, .control),
+            accentTextColor: try decodeColor(values, .accentText),
+            backgroundColor: try decodeColor(values, .background),
+            separatorColor: try decodeColor(values, .separator),
+            badgeBackgroundColor: try decodeColor(values, .badgeFill),
+            badgeStrokeColor: try decodeColor(values, .badgeStroke),
+            badgeTextColor: try decodeColor(values, .badgeText),
+            segmentedBackgroundColor: try decodeColor(values, .segmentedBg, decoder: decoder, fallbackKey: "root.searchBar.inputFill"),
+            segmentedForegroundColor: try decodeColor(values, .segmentedFg, decoder: decoder, fallbackKey: "root.navBar.background"),
+            segmentedTextColor: try decodeColor(values, .segmentedText, decoder: decoder, fallbackKey: "root.navBar.primaryText"),
+            segmentedDividerColor: try decodeColor(values, .segmentedDivider, decoder: decoder, fallbackKey: "list.freeInputField.stroke"),
+            clearButtonBackgroundColor: try decodeColor(values, .clearButtonBackground, decoder: decoder, fallbackKey: "list.freeInputField.bg"),
+            clearButtonForegroundColor: try decodeColor(values, .clearButtonForeground, decoder: decoder, fallbackKey: "list.freeInputField.primary")
+        )
     }
     
     public func encode(to encoder: Encoder) throws {
diff --git a/submodules/TelegramPresentationData/Sources/TelegramPresentationData.h b/submodules/TelegramPresentationData/Sources/TelegramPresentationData.h
deleted file mode 100644
index d2dfa86ab0..0000000000
--- a/submodules/TelegramPresentationData/Sources/TelegramPresentationData.h
+++ /dev/null
@@ -1,10 +0,0 @@
-#import <UIKit/UIKit.h>
-
-//! Project version number for TelegramPresentationData.
-FOUNDATION_EXPORT double TelegramPresentationDataVersionNumber;
-
-//! Project version string for TelegramPresentationData.
-FOUNDATION_EXPORT const unsigned char TelegramPresentationDataVersionString[];
-
-#import <TelegramPresentationData/NumberPluralizationForm.h>
-#import <TelegramPresentationData/EDSunriseSet.h>
diff --git a/submodules/TelegramStringFormatting/BUILD b/submodules/TelegramStringFormatting/BUILD
new file mode 100644
index 0000000000..c3819e0ffc
--- /dev/null
+++ b/submodules/TelegramStringFormatting/BUILD
@@ -0,0 +1,25 @@
+load("@build_bazel_rules_swift//swift:swift.bzl", "swift_library")
+
+swift_library(
+    name = "TelegramStringFormatting",
+    module_name = "TelegramStringFormatting",
+    srcs = glob([
+        "Sources/**/*.swift",
+    ]),
+    deps = [
+        "//submodules/TelegramCore:TelegramCore",
+        "//submodules/SyncCore:SyncCore",
+        "//submodules/Postbox:Postbox",
+        "//submodules/Display:Display",
+        "//submodules/PlatformRestrictionMatching:PlatformRestrictionMatching",
+        "//submodules/LocalizedPeerData:LocalizedPeerData",
+        "//submodules/TextFormat:TextFormat",
+        "//submodules/Markdown:Markdown",
+        "//submodules/TelegramUIPreferences:TelegramUIPreferences",
+        "//submodules/TelegramPresentationData:TelegramPresentationData",
+        "//submodules/AppBundle:AppBundle",
+    ],
+    visibility = [
+        "//visibility:public",
+    ],
+)
diff --git a/submodules/TelegramStringFormatting/Info.plist b/submodules/TelegramStringFormatting/Info.plist
deleted file mode 100644
index e1fe4cfb7b..0000000000
--- a/submodules/TelegramStringFormatting/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/TelegramStringFormatting/Sources/ServiceMessageStrings.swift b/submodules/TelegramStringFormatting/Sources/ServiceMessageStrings.swift
index d634e990e1..a431e8a0e7 100644
--- a/submodules/TelegramStringFormatting/Sources/ServiceMessageStrings.swift
+++ b/submodules/TelegramStringFormatting/Sources/ServiceMessageStrings.swift
@@ -1,4 +1,5 @@
 import Foundation
+import UIKit
 import Postbox
 import TelegramCore
 import SyncCore
diff --git a/submodules/TelegramStringFormatting/Sources/TelegramStringFormatting.h b/submodules/TelegramStringFormatting/Sources/TelegramStringFormatting.h
deleted file mode 100644
index aed00e9d38..0000000000
--- a/submodules/TelegramStringFormatting/Sources/TelegramStringFormatting.h
+++ /dev/null
@@ -1,19 +0,0 @@
-//
-//  TelegramStringFormatting.h
-//  TelegramStringFormatting
-//
-//  Created by Peter on 8/4/19.
-//  Copyright © 2019 Telegram Messenger LLP. All rights reserved.
-//
-
-#import <UIKit/UIKit.h>
-
-//! Project version number for TelegramStringFormatting.
-FOUNDATION_EXPORT double TelegramStringFormattingVersionNumber;
-
-//! Project version string for TelegramStringFormatting.
-FOUNDATION_EXPORT const unsigned char TelegramStringFormattingVersionString[];
-
-// In this header, you should import all the public headers of your framework using statements like #import <TelegramStringFormatting/PublicHeader.h>
-
-
diff --git a/submodules/TelegramUI/BUCK b/submodules/TelegramUI/BUCK
index a750214b6d..ca062c5cd7 100644
--- a/submodules/TelegramUI/BUCK
+++ b/submodules/TelegramUI/BUCK
@@ -11,16 +11,16 @@ apple_asset_catalog(
 apple_resource(
     name = "TelegramUIResources",
     files = glob([
-        "TelegramUI/Sounds/**/*",
-        "TelegramUI/Resources/**/*",
-    ], exclude = ["TelegramUI/**/.*"]),
+        "Sounds/**/*",
+        "Resources/**/*",
+    ], exclude = ["Sounds/**/.*", "Resources/**/.*"]),
     visibility = ["PUBLIC"],
 )
 
 framework(
     name = "TelegramUI",
     srcs = glob([
-        "TelegramUI/**/*.swift",
+        "Sources/**/*.swift",
     ]),
     deps = [
         "//submodules/SSignalKit/SwiftSignalKit:SwiftSignalKit#shared",
@@ -34,10 +34,10 @@ framework(
         "//submodules/TelegramPresentationData:TelegramPresentationData",
         "//submodules/AccountContext:AccountContext",
         "//submodules/LegacyComponents:LegacyComponents",
-        "//submodules/libtgvoip:libtgvoip",
+        "//submodules/TgVoip:TgVoip",
         "//submodules/lottie-ios:Lottie",
-        "//submodules/FFMpeg:FFMpeg",
-        "//submodules/WebP:WebPImage",
+        "//submodules/FFMpegBinding:FFMpegBinding",
+        "//submodules/WebPBinding:WebPBinding",
         "//submodules/RMIntro:RMIntro",
         "//submodules/GZip:GZip",
         "//submodules/TelegramCallsUI:TelegramCallsUI",
diff --git a/submodules/TelegramUI/BUILD b/submodules/TelegramUI/BUILD
new file mode 100644
index 0000000000..9a6707f0cf
--- /dev/null
+++ b/submodules/TelegramUI/BUILD
@@ -0,0 +1,208 @@
+load("@build_bazel_rules_swift//swift:swift.bzl", "swift_library")
+
+filegroup(
+    name = "TelegramUIResources",
+    srcs = glob([
+        "Sounds/**/*",
+        "Resources/**/*",
+    ], exclude = ["Sounds/**/.*", "Resources/**/.*"]),
+    visibility = ["//visibility:public"],
+)
+
+filegroup(
+    name = "TelegramUIAssets",
+    srcs = glob(["Images.xcassets/**"]),
+    visibility = ["//visibility:public"],
+)
+
+swift_library(
+    name = "TelegramUI",
+    module_name = "TelegramUI",
+    srcs = glob([
+        "Sources/**/*.swift",
+    ]),
+    deps = [
+        "//submodules/SSignalKit/SwiftSignalKit:SwiftSignalKit",
+        "//submodules/SSignalKit/SSignalKit:SSignalKit",
+        "//submodules/AsyncDisplayKit:AsyncDisplayKit",
+        "//submodules/Display:Display",
+        "//submodules/Postbox:Postbox",
+        "//submodules/TelegramCore:TelegramCore",
+        "//submodules/SyncCore:SyncCore",
+        "//submodules/MtProtoKit:MtProtoKit",
+        "//submodules/TelegramPresentationData:TelegramPresentationData",
+        "//submodules/AccountContext:AccountContext",
+        "//submodules/LegacyComponents:LegacyComponents",
+        "//submodules/TgVoip:TgVoip",
+        "//submodules/lottie-ios:Lottie",
+        "//submodules/FFMpegBinding:FFMpegBinding",
+        "//submodules/WebPBinding:WebPBinding",
+        "//submodules/RMIntro:RMIntro",
+        "//submodules/GZip:GZip",
+        "//submodules/TelegramCallsUI:TelegramCallsUI",
+        "//submodules/TelegramUIPreferences:TelegramUIPreferences",
+        "//submodules/MediaPlayer:UniversalMediaPlayer",
+        "//submodules/TelegramVoip:TelegramVoip",
+        "//submodules/DeviceAccess:DeviceAccess",
+        "//submodules/WatchCommon/Host:WatchCommon",
+        "//submodules/LightweightAccountData:LightweightAccountData",
+        "//submodules/BuildConfig:BuildConfig",
+        "//submodules/BuildConfigExtra:BuildConfigExtra",
+        "//submodules/rlottie:RLottieBinding",
+        "//submodules/TelegramUpdateUI:TelegramUpdateUI",
+        "//submodules/MergeLists:MergeLists",
+        "//submodules/ActivityIndicator:ActivityIndicator",
+        "//submodules/ProgressNavigationButtonNode:ProgressNavigationButtonNode",
+        "//submodules/ItemListUI:ItemListUI",
+        "//submodules/TelegramBaseController:TelegramBaseController",
+        "//submodules/DeviceLocationManager:DeviceLocationManager",
+        "//submodules/AvatarNode:AvatarNode",
+        "//submodules/OverlayStatusController:OverlayStatusController",
+        "//submodules/TelegramStringFormatting:TelegramStringFormatting",
+        "//submodules/LiveLocationManager:LiveLocationManager",
+        "//submodules/LiveLocationTimerNode:LiveLocationTimerNode",
+        "//submodules/TemporaryCachedPeerDataManager:TemporaryCachedPeerDataManager",
+        "//submodules/ShareController:ShareController",
+        "//submodules/RadialStatusNode:RadialStatusNode",
+        "//submodules/PeerOnlineMarkerNode:PeerOnlineMarkerNode",
+        "//submodules/PeerPresenceStatusManager:PeerPresenceStatusManager",
+        "//submodules/ChatListSearchRecentPeersNode:ChatListSearchRecentPeersNode",
+        "//submodules/ImageBlur:ImageBlur",
+        "//submodules/ContextUI:ContextUI",
+        "//submodules/MediaResources:MediaResources",
+        "//submodules/TelegramAudio:TelegramAudio",
+        "//submodules/UrlEscaping:UrlEscaping",
+        "//submodules/Tuples:Tuples",
+        "//submodules/TextFormat:TextFormat",
+        "//submodules/SwitchNode:SwitchNode",
+        "//submodules/StickerResources:StickerResources",
+        "//submodules/SelectablePeerNode:SelectablePeerNode",
+        "//submodules/SaveToCameraRoll:SaveToCameraRoll",
+        "//submodules/LocalizedPeerData:LocalizedPeerData",
+        "//submodules/ListSectionHeaderNode:ListSectionHeaderNode",
+        "//submodules/HorizontalPeerItem:HorizontalPeerItem",
+        "//submodules/CheckNode:CheckNode",
+        "//submodules/AnimationUI:AnimationUI",
+        "//submodules/AnimatedStickerNode:AnimatedStickerNode",
+        "//submodules/TelegramAnimatedStickerNode:TelegramAnimatedStickerNode",
+        "//submodules/ActionSheetPeerItem:ActionSheetPeerItem",
+        "//submodules/ComposePollUI:ComposePollUI",
+        "//submodules/AlertUI:AlertUI",
+        "//submodules/PresentationDataUtils:PresentationDataUtils",
+        "//submodules/TouchDownGesture:TouchDownGesture",
+        "//submodules/SwipeToDismissGesture:SwipeToDismissGesture",
+        "//submodules/DirectionalPanGesture:DirectionalPanGesture",
+        "//submodules/UndoUI:UndoUI",
+        "//submodules/PhotoResources:PhotoResources",
+        "//submodules/TinyThumbnail:TinyThumbnail",
+        "//submodules/ImageTransparency:ImageTransparency",
+        "//submodules/TelegramNotices:TelegramNotices",
+        "//submodules/TelegramPermissions:TelegramPermissions",
+        "//submodules/GameUI:GameUI",
+        "//submodules/WebUI:WebUI",
+        "//submodules/PassportUI:PassportUI",
+        "//submodules/PhoneInputNode:PhoneInputNode",
+        "//submodules/CountrySelectionUI:CountrySelectionUI",
+        "//submodules/SearchBarNode:SearchBarNode",
+        "//submodules/GalleryUI:GalleryUI",
+        "//submodules/TelegramUniversalVideoContent:TelegramUniversalVideoContent",
+        "//submodules/WebsiteType:WebsiteType",
+        "//submodules/ScreenCaptureDetection:ScreenCaptureDetection",
+        "//submodules/OpenInExternalAppUI:OpenInExternalAppUI",
+        "//submodules/LegacyUI:LegacyUI",
+        "//submodules/ImageCompression:ImageCompression",
+        "//submodules/DateSelectionUI:DateSelectionUI",
+        "//submodules/PasswordSetupUI:PasswordSetupUI",
+        "//submodules/Pdf:Pdf",
+        "//submodules/InstantPageUI:InstantPageUI",
+        "//submodules/MusicAlbumArtResources:MusicAlbumArtResources",
+        "//submodules/LiveLocationPositionNode:LiveLocationPositionNode",
+        "//submodules/MosaicLayout:MosaicLayout",
+        "//submodules/LocationUI:LocationUI",
+        "//submodules/Stripe:Stripe",
+        "//submodules/BotPaymentsUI:BotPaymentsUI",
+        "//submodules/LocalAuth:LocalAuth",
+        "//submodules/ContactListUI:ContactListUI",
+        "//submodules/SearchUI:SearchUI",
+        "//submodules/ChatListSearchItemHeader:ChatListSearchItemHeader",
+        "//submodules/ItemListPeerItem:ItemListPeerItem",
+        "//submodules/ContactsPeerItem:ContactsPeerItem",
+        "//submodules/ChatListSearchItemNode:ChatListSearchItemNode",
+        "//submodules/TelegramPermissionsUI:TelegramPermissionsUI",
+        "//submodules/PeersNearbyIconNode:PeersNearbyIconNode",
+        "//submodules/SolidRoundedButtonNode:SolidRoundedButtonNode",
+        "//submodules/PasscodeUI:PasscodeUI",
+        "//submodules/CallListUI:CallListUI",
+        "//submodules/ChatListUI:ChatListUI",
+        "//submodules/ChatTitleActivityNode:ChatTitleActivityNode",
+        "//submodules/DeleteChatPeerActionSheetItem:DeleteChatPeerActionSheetItem",
+        "//submodules/LanguageSuggestionUI:LanguageSuggestionUI",
+        "//submodules/TextSelectionNode:TextSelectionNode",
+        "//submodules/PlatformRestrictionMatching:PlatformRestrictionMatching",
+        "//submodules/HashtagSearchUI:HashtagSearchUI",
+        "//submodules/ItemListAvatarAndNameInfoItem:ItemListAvatarAndNameInfoItem",
+        "//submodules/ItemListPeerActionItem:ItemListPeerActionItem",
+        "//submodules/StickerPackPreviewUI:StickerPackPreviewUI",
+        "//submodules/YuvConversion:YuvConversion",
+        "//submodules/JoinLinkPreviewUI:JoinLinkPreviewUI",
+        "//submodules/LanguageLinkPreviewUI:LanguageLinkPreviewUI",
+        "//submodules/WebSearchUI:WebSearchUI",
+        "//submodules/LegacyMediaPickerUI:LegacyMediaPickerUI",
+        "//submodules/MimeTypes:MimeTypes",
+        "//submodules/LocalMediaResources:LocalMediaResources",
+        "//submodules/PeersNearbyUI:PeersNearbyUI",
+        "//submodules/Geocoding:Geocoding",
+        "//submodules/PeerInfoUI:PeerInfoUI",
+        "//submodules/PeerAvatarGalleryUI:PeerAvatarGalleryUI",
+        "//submodules/Emoji:Emoji",
+        "//submodules/ItemListStickerPackItem:ItemListStickerPackItem",
+        "//submodules/NotificationMuteSettingsUI:NotificationMuteSettingsUI",
+        "//submodules/SinglePhoneInputNode:SinglePhoneInputNode",
+        "//submodules/MapResourceToAvatarSizes:MapResourceToAvatarSizes",
+        "//submodules/NotificationSoundSelectionUI:NotificationSoundSelectionUI",
+        "//submodules/EncryptionKeyVisualization:EncryptionKeyVisualization",
+        "//submodules/ItemListAddressItem:ItemListAddressItem",
+        "//submodules/DeviceProximity:DeviceProximity",
+        "//submodules/RaiseToListen:RaiseToListen",
+        "//submodules/OpusBinding:OpusBinding",
+        "//submodules/Opus:opus",
+        "//submodules/WatchBridgeAudio:WatchBridgeAudio",
+        "//submodules/WatchBridge:WatchBridge",
+        "//submodules/LegacyDataImport:LegacyDataImport",
+        "//submodules/ShareItems:ShareItems",
+        "//submodules/ShareItems/Impl:ShareItemsImpl",
+        "//submodules/ReactionSelectionNode:ReactionSelectionNode",
+        "//submodules/SettingsUI:SettingsUI",
+        "//submodules/UrlHandling:UrlHandling",
+        "//submodules/HexColor:HexColor",
+        "//submodules/QrCode:QrCode",
+        "//submodules/WallpaperResources:WallpaperResources",
+        "//submodules/AuthorizationUI:AuthorizationUI",
+        "//submodules/CounterContollerTitleView:CounterContollerTitleView",
+        "//submodules/GridMessageSelectionNode:GridMessageSelectionNode",
+        "//submodules/InstantPageCache:InstantPageCache",
+        "//submodules/PersistentStringHash:PersistentStringHash",
+        "//submodules/MessageReactionListUI:MessageReactionListUI",
+        "//submodules/SegmentedControlNode:SegmentedControlNode",
+        "//submodules/AppBundle:AppBundle",
+        "//submodules/WalletUI:WalletUI",
+        "//submodules/WalletCore:WalletCore",
+        "//submodules/Markdown:Markdown",
+        "//submodules/SearchPeerMembers:SearchPeerMembers",
+        "//submodules/WidgetItems:WidgetItems",
+        "//submodules/OpenSSLEncryptionProvider:OpenSSLEncryptionProvider",
+        "//submodules/PhoneNumberFormat:PhoneNumberFormat",
+        "//submodules/AppLock:AppLock",
+        "//submodules/NotificationsPresentationData:NotificationsPresentationData",
+        "//submodules/UrlWhitelist:UrlWhitelist",
+        "//submodules/TelegramIntents:TelegramIntents",
+        "//submodules/LocationResources:LocationResources",
+        "//submodules/ItemListVenueItem:ItemListVenueItem",
+        "//submodules/SemanticStatusNode:SemanticStatusNode",
+        "//submodules/AccountUtils:AccountUtils",
+        "//submodules/Svg:Svg",
+    ],
+    visibility = [
+        "//visibility:public",
+    ],
+)
diff --git a/submodules/TelegramUI/Images.xcassets/Chat/Context Menu/ItemList.imageset/Contents.json b/submodules/TelegramUI/Images.xcassets/Chat/Context Menu/ItemList.imageset/Contents.json
new file mode 100644
index 0000000000..f9fa203bb7
--- /dev/null
+++ b/submodules/TelegramUI/Images.xcassets/Chat/Context Menu/ItemList.imageset/Contents.json	
@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "ic_list.pdf"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
\ No newline at end of file
diff --git a/submodules/TelegramUI/Images.xcassets/Chat/Context Menu/List.imageset/ic_list.pdf b/submodules/TelegramUI/Images.xcassets/Chat/Context Menu/ItemList.imageset/ic_list.pdf
similarity index 100%
rename from submodules/TelegramUI/Images.xcassets/Chat/Context Menu/List.imageset/ic_list.pdf
rename to submodules/TelegramUI/Images.xcassets/Chat/Context Menu/ItemList.imageset/ic_list.pdf
diff --git a/submodules/TelegramUI/Images.xcassets/Chat/Context Menu/LargeGroup.imageset/Contents.json b/submodules/TelegramUI/Images.xcassets/Chat/Context Menu/LargeGroup.imageset/Contents.json
new file mode 100644
index 0000000000..b744478340
--- /dev/null
+++ b/submodules/TelegramUI/Images.xcassets/Chat/Context Menu/LargeGroup.imageset/Contents.json	
@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "ic_largegroup.pdf"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
\ No newline at end of file
diff --git a/submodules/TelegramUI/Images.xcassets/Chat/Context Menu/LargeGroup.imageset/ic_largegroup.pdf b/submodules/TelegramUI/Images.xcassets/Chat/Context Menu/LargeGroup.imageset/ic_largegroup.pdf
new file mode 100644
index 0000000000..d478e288e9
Binary files /dev/null and b/submodules/TelegramUI/Images.xcassets/Chat/Context Menu/LargeGroup.imageset/ic_largegroup.pdf differ
diff --git a/submodules/TelegramUI/Images.xcassets/Chat/Context Menu/List.imageset/Contents.json b/submodules/TelegramUI/Images.xcassets/Chat/Context Menu/List.imageset/Contents.json
index f9fa203bb7..75a938d28b 100644
--- a/submodules/TelegramUI/Images.xcassets/Chat/Context Menu/List.imageset/Contents.json	
+++ b/submodules/TelegramUI/Images.xcassets/Chat/Context Menu/List.imageset/Contents.json	
@@ -2,7 +2,7 @@
   "images" : [
     {
       "idiom" : "universal",
-      "filename" : "ic_list.pdf"
+      "filename" : "ic_folder.pdf"
     }
   ],
   "info" : {
diff --git a/submodules/TelegramUI/Images.xcassets/Chat/Context Menu/List.imageset/ic_folder.pdf b/submodules/TelegramUI/Images.xcassets/Chat/Context Menu/List.imageset/ic_folder.pdf
new file mode 100644
index 0000000000..842ae3b953
Binary files /dev/null and b/submodules/TelegramUI/Images.xcassets/Chat/Context Menu/List.imageset/ic_folder.pdf differ
diff --git a/submodules/TelegramUI/Images.xcassets/Chat/Context Menu/ReorderItems.imageset/Contents.json b/submodules/TelegramUI/Images.xcassets/Chat/Context Menu/ReorderItems.imageset/Contents.json
new file mode 100644
index 0000000000..b82e6802c1
--- /dev/null
+++ b/submodules/TelegramUI/Images.xcassets/Chat/Context Menu/ReorderItems.imageset/Contents.json	
@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "ic_reorder.pdf"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
\ No newline at end of file
diff --git a/submodules/TelegramUI/Images.xcassets/Chat/Context Menu/ReorderItems.imageset/ic_reorder.pdf b/submodules/TelegramUI/Images.xcassets/Chat/Context Menu/ReorderItems.imageset/ic_reorder.pdf
new file mode 100644
index 0000000000..b409b12f05
Binary files /dev/null and b/submodules/TelegramUI/Images.xcassets/Chat/Context Menu/ReorderItems.imageset/ic_reorder.pdf differ
diff --git a/submodules/TelegramUI/Images.xcassets/Chat/Context Menu/UnknownUser.imageset/Contents.json b/submodules/TelegramUI/Images.xcassets/Chat/Context Menu/UnknownUser.imageset/Contents.json
new file mode 100644
index 0000000000..84b2aaf306
--- /dev/null
+++ b/submodules/TelegramUI/Images.xcassets/Chat/Context Menu/UnknownUser.imageset/Contents.json	
@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "ic_noncontact.pdf"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
\ No newline at end of file
diff --git a/submodules/TelegramUI/Images.xcassets/Chat/Context Menu/UnknownUser.imageset/ic_noncontact.pdf b/submodules/TelegramUI/Images.xcassets/Chat/Context Menu/UnknownUser.imageset/ic_noncontact.pdf
new file mode 100644
index 0000000000..1f10e88fb8
Binary files /dev/null and b/submodules/TelegramUI/Images.xcassets/Chat/Context Menu/UnknownUser.imageset/ic_noncontact.pdf differ
diff --git a/submodules/TelegramUI/Images.xcassets/Settings/MenuIcons/ChatListFilters.imageset/Contents.json b/submodules/TelegramUI/Images.xcassets/Settings/MenuIcons/ChatListFilters.imageset/Contents.json
new file mode 100644
index 0000000000..83ebea8790
--- /dev/null
+++ b/submodules/TelegramUI/Images.xcassets/Settings/MenuIcons/ChatListFilters.imageset/Contents.json
@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "ic_filters.pdf"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
\ No newline at end of file
diff --git a/submodules/TelegramUI/Images.xcassets/Settings/MenuIcons/ChatListFilters.imageset/ic_filters.pdf b/submodules/TelegramUI/Images.xcassets/Settings/MenuIcons/ChatListFilters.imageset/ic_filters.pdf
new file mode 100644
index 0000000000..3f0497030e
Binary files /dev/null and b/submodules/TelegramUI/Images.xcassets/Settings/MenuIcons/ChatListFilters.imageset/ic_filters.pdf differ
diff --git a/submodules/TelegramUI/TelegramUI/Resources/Animations/ChatListEmpty.tgs b/submodules/TelegramUI/Resources/Animations/ChatListEmpty.tgs
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/Resources/Animations/ChatListEmpty.tgs
rename to submodules/TelegramUI/Resources/Animations/ChatListEmpty.tgs
diff --git a/submodules/TelegramUI/TelegramUI/Resources/Animations/ChatListFilterEmpty.tgs b/submodules/TelegramUI/Resources/Animations/ChatListFilterEmpty.tgs
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/Resources/Animations/ChatListFilterEmpty.tgs
rename to submodules/TelegramUI/Resources/Animations/ChatListFilterEmpty.tgs
diff --git a/submodules/TelegramUI/Resources/Animations/ChatListFolders.tgs b/submodules/TelegramUI/Resources/Animations/ChatListFolders.tgs
new file mode 100644
index 0000000000..41b820a74d
Binary files /dev/null and b/submodules/TelegramUI/Resources/Animations/ChatListFolders.tgs differ
diff --git a/submodules/TelegramUI/Resources/Animations/ChatListFoldersTooltip.json b/submodules/TelegramUI/Resources/Animations/ChatListFoldersTooltip.json
new file mode 100644
index 0000000000..0df54154d5
--- /dev/null
+++ b/submodules/TelegramUI/Resources/Animations/ChatListFoldersTooltip.json
@@ -0,0 +1 @@
+{"v":"5.5.9","fr":60,"ip":0,"op":120,"w":72,"h":72,"nm":"ic_filter","ddd":0,"assets":[],"layers":[{"ddd":0,"ind":1,"ty":4,"nm":"Chats","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[36,36,0],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":1,"k":[{"i":{"x":[0.833,0.833,0.833],"y":[0.833,0.833,1]},"o":{"x":[0.333,0.333,0.333],"y":[0,0,0]},"t":20,"s":[27.5,27.5,100]},{"i":{"x":[0.833,0.833,0.833],"y":[0.833,0.833,0.833]},"o":{"x":[0.167,0.167,0.167],"y":[0.167,0.167,0.167]},"t":60,"s":[15,15,100]},{"t":70,"s":[0,0,100]}],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[1.02,1.4],[0,-3.33],[1.9,-1.39],[-0.55,-0.83],[0.34,-0.14],[0.89,0.5],[0.27,-0.06],[0.71,0],[1.25,0.68],[0,4.59]],"o":[[3.3,1.02],[0,2.39],[-0.24,0.18],[0.54,0.83],[-0.2,0.09],[-1.27,-0.71],[-0.66,0.15],[-1.56,0],[4.8,-0.47],[0,-1.82]],"v":[[5.333,-6.824],[11.003,0.356],[7.983,6.096],[8.063,8.096],[8.933,9.446],[6.603,9.076],[4.703,7.716],[2.653,7.946],[-1.617,6.876],[6.953,-1.914]],"c":true},"ix":2},"nm":"Контур 1","mn":"ADBE Vector Shape - Group","hd":false},{"ind":1,"ty":"sh","ix":2,"ks":{"a":0,"k":{"i":[[-4.6,0],[0,-4.19],[4.61,0],[0.65,0.15],[1.28,-0.71],[0.21,0.09],[-0.54,0.83],[0.24,0.18],[0,2.38]],"o":[[4.61,0],[0,4.18],[-0.7,0],[-0.28,-0.06],[-0.89,0.5],[-0.34,-0.14],[0.54,-0.83],[-1.9,-1.39],[0,-4.19]],"v":[[-2.66,-9.5],[5.69,-1.91],[-2.66,5.67],[-4.7,5.44],[-6.61,6.8],[-8.94,7.17],[-8.06,5.82],[-7.98,3.82],[-11,-1.91]],"c":true},"ix":2},"nm":"Контур 2","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"mm","mm":1,"nm":"Объединить контуры 1","mn":"ADBE Vector Filter - Merge","hd":false},{"ty":"fl","c":{"a":0,"k":[1,1,1,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Заливка 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[400,400],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Преобразовать"}],"nm":"Chats","np":4,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":120,"st":0,"bm":0},{"ddd":0,"ind":2,"ty":4,"nm":"Hold","sr":1,"ks":{"o":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":10,"s":[0]},{"t":20,"s":[20]}],"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[36,36,0],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":1,"k":[{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.167,0.167,0.167],"y":[0.167,0.167,0]},"t":10,"s":[25,25,100]},{"i":{"x":[0.833,0.833,0.833],"y":[0.833,0.833,1]},"o":{"x":[0.333,0.333,0.333],"y":[0,0,0]},"t":20,"s":[20,20,100]},{"i":{"x":[0.833,0.833,0.833],"y":[0.833,0.833,0.833]},"o":{"x":[0.167,0.167,0.167],"y":[0.167,0.167,0.167]},"t":60,"s":[15,15,100]},{"t":70,"s":[0,0,100]}],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"d":1,"ty":"el","s":{"a":0,"k":[40,40],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"nm":"Контур эллипса 1","mn":"ADBE Vector Shape - Ellipse","hd":false},{"ty":"fl","c":{"a":0,"k":[1,1,1,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Заливка 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[400,400],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Преобразовать"}],"nm":"Hold","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":130,"st":10,"bm":0},{"ddd":0,"ind":3,"ty":4,"nm":"Folder","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[36,35.25,0],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":1,"k":[{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.167,0.167,0.167],"y":[0.167,0.167,0]},"t":60,"s":[5,5,100]},{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.333,0.333,0.333],"y":[0,0,0]},"t":70,"s":[26.25,26.25,100]},{"t":80,"s":[25,25,100]}],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0],[0.08,-0.67],[0,0],[0,0],[-1.38,-0.1],[0,0],[0,0],[-0.1,1.38],[0,0],[0,0],[0.67,0.08]],"o":[[0,0],[-0.68,0],[0,0],[0,0],[0,1.41],[0,0],[0,0],[1.41,0],[0,0],[0,0],[0,-0.68],[0,0]],"v":[[8.67,-2.75],[-8.67,-2.75],[-9.99,-1.57],[-10,-1.42],[-10,6.58],[-7.53,9.24],[-7.33,9.25],[7.33,9.25],[9.99,6.78],[10,6.58],[10,-1.42],[8.82,-2.74]],"c":true},"ix":2},"nm":"Контур 1","mn":"ADBE Vector Shape - Group","hd":false},{"ind":1,"ty":"sh","ix":2,"ks":{"a":0,"k":{"i":[[0,0],[0,0],[0.1,-1.38],[0,0],[0,0],[0,0],[0,0],[1.31,0.1],[0,0],[0,0],[0.26,0.29],[0,0],[0,0],[0.38,0.05]],"o":[[0,0],[-1.41,0],[0,0],[0,0],[0,0],[0,0],[-0.09,-1.31],[0,0],[0,0],[-0.39,0],[0,0],[0,0],[-0.21,-0.32],[0,0]],"v":[[-4.05,-9.25],[-7.33,-9.25],[-9.99,-6.78],[-10,-6.58],[-10,-4.25],[10,-4.25],[9.99,-4.78],[7.54,-7.24],[7.33,-7.25],[-1.29,-7.25],[-2.3,-7.71],[-2.4,-7.84],[-2.94,-8.66],[-3.88,-9.24]],"c":true},"ix":2},"nm":"Контур 2","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"mm","mm":2,"nm":"Объединить контуры 1","mn":"ADBE Vector Filter - Merge","hd":false},{"ty":"fl","c":{"a":0,"k":[1,1,1,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Заливка 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[400,400],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Преобразовать"}],"nm":"Folder","np":4,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":60,"op":140,"st":20,"bm":0}],"markers":[]}
\ No newline at end of file
diff --git a/submodules/TelegramUI/Resources/Animations/ChatListNewFolder.tgs b/submodules/TelegramUI/Resources/Animations/ChatListNewFolder.tgs
new file mode 100644
index 0000000000..1a60342622
Binary files /dev/null and b/submodules/TelegramUI/Resources/Animations/ChatListNewFolder.tgs differ
diff --git a/submodules/TelegramUI/TelegramUI/Resources/Animations/anim_archive.json b/submodules/TelegramUI/Resources/Animations/anim_archive.json
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/Resources/Animations/anim_archive.json
rename to submodules/TelegramUI/Resources/Animations/anim_archive.json
diff --git a/submodules/TelegramUI/TelegramUI/Resources/Animations/anim_archiveAvatar.json b/submodules/TelegramUI/Resources/Animations/anim_archiveAvatar.json
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/Resources/Animations/anim_archiveAvatar.json
rename to submodules/TelegramUI/Resources/Animations/anim_archiveAvatar.json
diff --git a/submodules/TelegramUI/TelegramUI/Resources/Animations/anim_archiveswipe.json b/submodules/TelegramUI/Resources/Animations/anim_archiveswipe.json
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/Resources/Animations/anim_archiveswipe.json
rename to submodules/TelegramUI/Resources/Animations/anim_archiveswipe.json
diff --git a/submodules/TelegramUI/TelegramUI/Resources/Animations/anim_delete.json b/submodules/TelegramUI/Resources/Animations/anim_delete.json
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/Resources/Animations/anim_delete.json
rename to submodules/TelegramUI/Resources/Animations/anim_delete.json
diff --git a/submodules/TelegramUI/TelegramUI/Resources/Animations/anim_group.json b/submodules/TelegramUI/Resources/Animations/anim_group.json
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/Resources/Animations/anim_group.json
rename to submodules/TelegramUI/Resources/Animations/anim_group.json
diff --git a/submodules/TelegramUI/TelegramUI/Resources/Animations/anim_hide.json b/submodules/TelegramUI/Resources/Animations/anim_hide.json
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/Resources/Animations/anim_hide.json
rename to submodules/TelegramUI/Resources/Animations/anim_hide.json
diff --git a/submodules/TelegramUI/TelegramUI/Resources/Animations/anim_infotip.json b/submodules/TelegramUI/Resources/Animations/anim_infotip.json
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/Resources/Animations/anim_infotip.json
rename to submodules/TelegramUI/Resources/Animations/anim_infotip.json
diff --git a/submodules/TelegramUI/TelegramUI/Resources/Animations/anim_mute.json b/submodules/TelegramUI/Resources/Animations/anim_mute.json
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/Resources/Animations/anim_mute.json
rename to submodules/TelegramUI/Resources/Animations/anim_mute.json
diff --git a/submodules/TelegramUI/TelegramUI/Resources/Animations/anim_pin.json b/submodules/TelegramUI/Resources/Animations/anim_pin.json
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/Resources/Animations/anim_pin.json
rename to submodules/TelegramUI/Resources/Animations/anim_pin.json
diff --git a/submodules/TelegramUI/TelegramUI/Resources/Animations/anim_qr.json b/submodules/TelegramUI/Resources/Animations/anim_qr.json
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/Resources/Animations/anim_qr.json
rename to submodules/TelegramUI/Resources/Animations/anim_qr.json
diff --git a/submodules/TelegramUI/TelegramUI/Resources/Animations/anim_read.json b/submodules/TelegramUI/Resources/Animations/anim_read.json
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/Resources/Animations/anim_read.json
rename to submodules/TelegramUI/Resources/Animations/anim_read.json
diff --git a/submodules/TelegramUI/TelegramUI/Resources/Animations/anim_success.json b/submodules/TelegramUI/Resources/Animations/anim_success.json
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/Resources/Animations/anim_success.json
rename to submodules/TelegramUI/Resources/Animations/anim_success.json
diff --git a/submodules/TelegramUI/TelegramUI/Resources/Animations/anim_swipereply.json b/submodules/TelegramUI/Resources/Animations/anim_swipereply.json
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/Resources/Animations/anim_swipereply.json
rename to submodules/TelegramUI/Resources/Animations/anim_swipereply.json
diff --git a/submodules/TelegramUI/TelegramUI/Resources/Animations/anim_unarchive.json b/submodules/TelegramUI/Resources/Animations/anim_unarchive.json
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/Resources/Animations/anim_unarchive.json
rename to submodules/TelegramUI/Resources/Animations/anim_unarchive.json
diff --git a/submodules/TelegramUI/TelegramUI/Resources/Animations/anim_ungroup.json b/submodules/TelegramUI/Resources/Animations/anim_ungroup.json
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/Resources/Animations/anim_ungroup.json
rename to submodules/TelegramUI/Resources/Animations/anim_ungroup.json
diff --git a/submodules/TelegramUI/TelegramUI/Resources/Animations/anim_unmute.json b/submodules/TelegramUI/Resources/Animations/anim_unmute.json
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/Resources/Animations/anim_unmute.json
rename to submodules/TelegramUI/Resources/Animations/anim_unmute.json
diff --git a/submodules/TelegramUI/TelegramUI/Resources/Animations/anim_unpin.json b/submodules/TelegramUI/Resources/Animations/anim_unpin.json
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/Resources/Animations/anim_unpin.json
rename to submodules/TelegramUI/Resources/Animations/anim_unpin.json
diff --git a/submodules/TelegramUI/TelegramUI/Resources/Animations/anim_unread.json b/submodules/TelegramUI/Resources/Animations/anim_unread.json
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/Resources/Animations/anim_unread.json
rename to submodules/TelegramUI/Resources/Animations/anim_unread.json
diff --git a/submodules/TelegramUI/TelegramUI/Resources/BuiltinReactions/celebrate.tgs b/submodules/TelegramUI/Resources/BuiltinReactions/celebrate.tgs
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/Resources/BuiltinReactions/celebrate.tgs
rename to submodules/TelegramUI/Resources/BuiltinReactions/celebrate.tgs
diff --git a/submodules/TelegramUI/TelegramUI/Resources/BuiltinReactions/cry.tgs b/submodules/TelegramUI/Resources/BuiltinReactions/cry.tgs
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/Resources/BuiltinReactions/cry.tgs
rename to submodules/TelegramUI/Resources/BuiltinReactions/cry.tgs
diff --git a/submodules/TelegramUI/TelegramUI/Resources/BuiltinReactions/heart.tgs b/submodules/TelegramUI/Resources/BuiltinReactions/heart.tgs
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/Resources/BuiltinReactions/heart.tgs
rename to submodules/TelegramUI/Resources/BuiltinReactions/heart.tgs
diff --git a/submodules/TelegramUI/TelegramUI/Resources/BuiltinReactions/lol.tgs b/submodules/TelegramUI/Resources/BuiltinReactions/lol.tgs
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/Resources/BuiltinReactions/lol.tgs
rename to submodules/TelegramUI/Resources/BuiltinReactions/lol.tgs
diff --git a/submodules/TelegramUI/TelegramUI/Resources/BuiltinReactions/meh.tgs b/submodules/TelegramUI/Resources/BuiltinReactions/meh.tgs
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/Resources/BuiltinReactions/meh.tgs
rename to submodules/TelegramUI/Resources/BuiltinReactions/meh.tgs
diff --git a/submodules/TelegramUI/TelegramUI/Resources/BuiltinReactions/ok.tgs b/submodules/TelegramUI/Resources/BuiltinReactions/ok.tgs
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/Resources/BuiltinReactions/ok.tgs
rename to submodules/TelegramUI/Resources/BuiltinReactions/ok.tgs
diff --git a/submodules/TelegramUI/TelegramUI/Resources/BuiltinReactions/poker.tgs b/submodules/TelegramUI/Resources/BuiltinReactions/poker.tgs
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/Resources/BuiltinReactions/poker.tgs
rename to submodules/TelegramUI/Resources/BuiltinReactions/poker.tgs
diff --git a/submodules/TelegramUI/TelegramUI/Resources/BuiltinReactions/poop.tgs b/submodules/TelegramUI/Resources/BuiltinReactions/poop.tgs
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/Resources/BuiltinReactions/poop.tgs
rename to submodules/TelegramUI/Resources/BuiltinReactions/poop.tgs
diff --git a/submodules/TelegramUI/TelegramUI/Resources/BuiltinReactions/sad.tgs b/submodules/TelegramUI/Resources/BuiltinReactions/sad.tgs
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/Resources/BuiltinReactions/sad.tgs
rename to submodules/TelegramUI/Resources/BuiltinReactions/sad.tgs
diff --git a/submodules/TelegramUI/TelegramUI/Resources/BuiltinReactions/smile.tgs b/submodules/TelegramUI/Resources/BuiltinReactions/smile.tgs
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/Resources/BuiltinReactions/smile.tgs
rename to submodules/TelegramUI/Resources/BuiltinReactions/smile.tgs
diff --git a/submodules/TelegramUI/TelegramUI/Resources/BuiltinReactions/surprised.tgs b/submodules/TelegramUI/Resources/BuiltinReactions/surprised.tgs
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/Resources/BuiltinReactions/surprised.tgs
rename to submodules/TelegramUI/Resources/BuiltinReactions/surprised.tgs
diff --git a/submodules/TelegramUI/TelegramUI/Resources/BuiltinReactions/thumbsup.tgs b/submodules/TelegramUI/Resources/BuiltinReactions/thumbsup.tgs
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/Resources/BuiltinReactions/thumbsup.tgs
rename to submodules/TelegramUI/Resources/BuiltinReactions/thumbsup.tgs
diff --git a/submodules/TelegramUI/TelegramUI/Resources/ChatWallpaperBuiltin0.jpg b/submodules/TelegramUI/Resources/ChatWallpaperBuiltin0.jpg
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/Resources/ChatWallpaperBuiltin0.jpg
rename to submodules/TelegramUI/Resources/ChatWallpaperBuiltin0.jpg
diff --git a/submodules/TelegramUI/TelegramUI/Resources/Emoji.mapping b/submodules/TelegramUI/Resources/Emoji.mapping
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/Resources/Emoji.mapping
rename to submodules/TelegramUI/Resources/Emoji.mapping
diff --git a/submodules/TelegramUI/TelegramUI/Resources/Fonts/SFCompactRounded-Semibold.otf b/submodules/TelegramUI/Resources/Fonts/SFCompactRounded-Semibold.otf
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/Resources/Fonts/SFCompactRounded-Semibold.otf
rename to submodules/TelegramUI/Resources/Fonts/SFCompactRounded-Semibold.otf
diff --git a/submodules/TelegramUI/TelegramUI/Resources/PhoneCountries.txt b/submodules/TelegramUI/Resources/PhoneCountries.txt
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/Resources/PhoneCountries.txt
rename to submodules/TelegramUI/Resources/PhoneCountries.txt
diff --git a/submodules/TelegramUI/Resources/PresentationStrings.mapping b/submodules/TelegramUI/Resources/PresentationStrings.mapping
new file mode 100644
index 0000000000..ff00ea1fba
Binary files /dev/null and b/submodules/TelegramUI/Resources/PresentationStrings.mapping differ
diff --git a/submodules/TelegramUI/TelegramUI/Resources/StillReactions/simplereaction_10@2x.png b/submodules/TelegramUI/Resources/StillReactions/simplereaction_10@2x.png
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/Resources/StillReactions/simplereaction_10@2x.png
rename to submodules/TelegramUI/Resources/StillReactions/simplereaction_10@2x.png
diff --git a/submodules/TelegramUI/TelegramUI/Resources/StillReactions/simplereaction_10@3x.png b/submodules/TelegramUI/Resources/StillReactions/simplereaction_10@3x.png
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/Resources/StillReactions/simplereaction_10@3x.png
rename to submodules/TelegramUI/Resources/StillReactions/simplereaction_10@3x.png
diff --git a/submodules/TelegramUI/TelegramUI/Resources/StillReactions/simplereaction_11@2x.png b/submodules/TelegramUI/Resources/StillReactions/simplereaction_11@2x.png
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/Resources/StillReactions/simplereaction_11@2x.png
rename to submodules/TelegramUI/Resources/StillReactions/simplereaction_11@2x.png
diff --git a/submodules/TelegramUI/TelegramUI/Resources/StillReactions/simplereaction_11@3x.png b/submodules/TelegramUI/Resources/StillReactions/simplereaction_11@3x.png
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/Resources/StillReactions/simplereaction_11@3x.png
rename to submodules/TelegramUI/Resources/StillReactions/simplereaction_11@3x.png
diff --git a/submodules/TelegramUI/TelegramUI/Resources/StillReactions/simplereaction_12@2x.png b/submodules/TelegramUI/Resources/StillReactions/simplereaction_12@2x.png
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/Resources/StillReactions/simplereaction_12@2x.png
rename to submodules/TelegramUI/Resources/StillReactions/simplereaction_12@2x.png
diff --git a/submodules/TelegramUI/TelegramUI/Resources/StillReactions/simplereaction_12@3x.png b/submodules/TelegramUI/Resources/StillReactions/simplereaction_12@3x.png
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/Resources/StillReactions/simplereaction_12@3x.png
rename to submodules/TelegramUI/Resources/StillReactions/simplereaction_12@3x.png
diff --git a/submodules/TelegramUI/TelegramUI/Resources/StillReactions/simplereaction_13@2x.png b/submodules/TelegramUI/Resources/StillReactions/simplereaction_13@2x.png
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/Resources/StillReactions/simplereaction_13@2x.png
rename to submodules/TelegramUI/Resources/StillReactions/simplereaction_13@2x.png
diff --git a/submodules/TelegramUI/TelegramUI/Resources/StillReactions/simplereaction_13@3x.png b/submodules/TelegramUI/Resources/StillReactions/simplereaction_13@3x.png
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/Resources/StillReactions/simplereaction_13@3x.png
rename to submodules/TelegramUI/Resources/StillReactions/simplereaction_13@3x.png
diff --git a/submodules/TelegramUI/TelegramUI/Resources/StillReactions/simplereaction_14@2x.png b/submodules/TelegramUI/Resources/StillReactions/simplereaction_14@2x.png
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/Resources/StillReactions/simplereaction_14@2x.png
rename to submodules/TelegramUI/Resources/StillReactions/simplereaction_14@2x.png
diff --git a/submodules/TelegramUI/TelegramUI/Resources/StillReactions/simplereaction_14@3x.png b/submodules/TelegramUI/Resources/StillReactions/simplereaction_14@3x.png
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/Resources/StillReactions/simplereaction_14@3x.png
rename to submodules/TelegramUI/Resources/StillReactions/simplereaction_14@3x.png
diff --git a/submodules/TelegramUI/TelegramUI/Resources/StillReactions/simplereaction_15@2x.png b/submodules/TelegramUI/Resources/StillReactions/simplereaction_15@2x.png
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/Resources/StillReactions/simplereaction_15@2x.png
rename to submodules/TelegramUI/Resources/StillReactions/simplereaction_15@2x.png
diff --git a/submodules/TelegramUI/TelegramUI/Resources/StillReactions/simplereaction_15@3x.png b/submodules/TelegramUI/Resources/StillReactions/simplereaction_15@3x.png
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/Resources/StillReactions/simplereaction_15@3x.png
rename to submodules/TelegramUI/Resources/StillReactions/simplereaction_15@3x.png
diff --git a/submodules/TelegramUI/TelegramUI/Resources/StillReactions/simplereaction_16@2x.png b/submodules/TelegramUI/Resources/StillReactions/simplereaction_16@2x.png
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/Resources/StillReactions/simplereaction_16@2x.png
rename to submodules/TelegramUI/Resources/StillReactions/simplereaction_16@2x.png
diff --git a/submodules/TelegramUI/TelegramUI/Resources/StillReactions/simplereaction_16@3x.png b/submodules/TelegramUI/Resources/StillReactions/simplereaction_16@3x.png
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/Resources/StillReactions/simplereaction_16@3x.png
rename to submodules/TelegramUI/Resources/StillReactions/simplereaction_16@3x.png
diff --git a/submodules/TelegramUI/TelegramUI/Resources/StillReactions/simplereaction_17@2x.png b/submodules/TelegramUI/Resources/StillReactions/simplereaction_17@2x.png
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/Resources/StillReactions/simplereaction_17@2x.png
rename to submodules/TelegramUI/Resources/StillReactions/simplereaction_17@2x.png
diff --git a/submodules/TelegramUI/TelegramUI/Resources/StillReactions/simplereaction_17@3x.png b/submodules/TelegramUI/Resources/StillReactions/simplereaction_17@3x.png
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/Resources/StillReactions/simplereaction_17@3x.png
rename to submodules/TelegramUI/Resources/StillReactions/simplereaction_17@3x.png
diff --git a/submodules/TelegramUI/TelegramUI/Resources/StillReactions/simplereaction_18@2x.png b/submodules/TelegramUI/Resources/StillReactions/simplereaction_18@2x.png
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/Resources/StillReactions/simplereaction_18@2x.png
rename to submodules/TelegramUI/Resources/StillReactions/simplereaction_18@2x.png
diff --git a/submodules/TelegramUI/TelegramUI/Resources/StillReactions/simplereaction_18@3x.png b/submodules/TelegramUI/Resources/StillReactions/simplereaction_18@3x.png
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/Resources/StillReactions/simplereaction_18@3x.png
rename to submodules/TelegramUI/Resources/StillReactions/simplereaction_18@3x.png
diff --git a/submodules/TelegramUI/TelegramUI/Resources/StillReactions/simplereaction_19@2x.png b/submodules/TelegramUI/Resources/StillReactions/simplereaction_19@2x.png
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/Resources/StillReactions/simplereaction_19@2x.png
rename to submodules/TelegramUI/Resources/StillReactions/simplereaction_19@2x.png
diff --git a/submodules/TelegramUI/TelegramUI/Resources/StillReactions/simplereaction_19@3x.png b/submodules/TelegramUI/Resources/StillReactions/simplereaction_19@3x.png
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/Resources/StillReactions/simplereaction_19@3x.png
rename to submodules/TelegramUI/Resources/StillReactions/simplereaction_19@3x.png
diff --git a/submodules/TelegramUI/TelegramUI/Resources/StillReactions/simplereaction_1@2x.png b/submodules/TelegramUI/Resources/StillReactions/simplereaction_1@2x.png
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/Resources/StillReactions/simplereaction_1@2x.png
rename to submodules/TelegramUI/Resources/StillReactions/simplereaction_1@2x.png
diff --git a/submodules/TelegramUI/TelegramUI/Resources/StillReactions/simplereaction_1@3x.png b/submodules/TelegramUI/Resources/StillReactions/simplereaction_1@3x.png
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/Resources/StillReactions/simplereaction_1@3x.png
rename to submodules/TelegramUI/Resources/StillReactions/simplereaction_1@3x.png
diff --git a/submodules/TelegramUI/TelegramUI/Resources/StillReactions/simplereaction_20@2x.png b/submodules/TelegramUI/Resources/StillReactions/simplereaction_20@2x.png
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/Resources/StillReactions/simplereaction_20@2x.png
rename to submodules/TelegramUI/Resources/StillReactions/simplereaction_20@2x.png
diff --git a/submodules/TelegramUI/TelegramUI/Resources/StillReactions/simplereaction_20@3x.png b/submodules/TelegramUI/Resources/StillReactions/simplereaction_20@3x.png
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/Resources/StillReactions/simplereaction_20@3x.png
rename to submodules/TelegramUI/Resources/StillReactions/simplereaction_20@3x.png
diff --git a/submodules/TelegramUI/TelegramUI/Resources/StillReactions/simplereaction_2@2x.png b/submodules/TelegramUI/Resources/StillReactions/simplereaction_2@2x.png
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/Resources/StillReactions/simplereaction_2@2x.png
rename to submodules/TelegramUI/Resources/StillReactions/simplereaction_2@2x.png
diff --git a/submodules/TelegramUI/TelegramUI/Resources/StillReactions/simplereaction_2@3x.png b/submodules/TelegramUI/Resources/StillReactions/simplereaction_2@3x.png
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/Resources/StillReactions/simplereaction_2@3x.png
rename to submodules/TelegramUI/Resources/StillReactions/simplereaction_2@3x.png
diff --git a/submodules/TelegramUI/TelegramUI/Resources/StillReactions/simplereaction_3@2x.png b/submodules/TelegramUI/Resources/StillReactions/simplereaction_3@2x.png
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/Resources/StillReactions/simplereaction_3@2x.png
rename to submodules/TelegramUI/Resources/StillReactions/simplereaction_3@2x.png
diff --git a/submodules/TelegramUI/TelegramUI/Resources/StillReactions/simplereaction_3@3x.png b/submodules/TelegramUI/Resources/StillReactions/simplereaction_3@3x.png
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/Resources/StillReactions/simplereaction_3@3x.png
rename to submodules/TelegramUI/Resources/StillReactions/simplereaction_3@3x.png
diff --git a/submodules/TelegramUI/TelegramUI/Resources/StillReactions/simplereaction_4@2x.png b/submodules/TelegramUI/Resources/StillReactions/simplereaction_4@2x.png
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/Resources/StillReactions/simplereaction_4@2x.png
rename to submodules/TelegramUI/Resources/StillReactions/simplereaction_4@2x.png
diff --git a/submodules/TelegramUI/TelegramUI/Resources/StillReactions/simplereaction_4@3x.png b/submodules/TelegramUI/Resources/StillReactions/simplereaction_4@3x.png
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/Resources/StillReactions/simplereaction_4@3x.png
rename to submodules/TelegramUI/Resources/StillReactions/simplereaction_4@3x.png
diff --git a/submodules/TelegramUI/TelegramUI/Resources/StillReactions/simplereaction_5@2x.png b/submodules/TelegramUI/Resources/StillReactions/simplereaction_5@2x.png
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/Resources/StillReactions/simplereaction_5@2x.png
rename to submodules/TelegramUI/Resources/StillReactions/simplereaction_5@2x.png
diff --git a/submodules/TelegramUI/TelegramUI/Resources/StillReactions/simplereaction_5@3x.png b/submodules/TelegramUI/Resources/StillReactions/simplereaction_5@3x.png
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/Resources/StillReactions/simplereaction_5@3x.png
rename to submodules/TelegramUI/Resources/StillReactions/simplereaction_5@3x.png
diff --git a/submodules/TelegramUI/TelegramUI/Resources/StillReactions/simplereaction_6@2x.png b/submodules/TelegramUI/Resources/StillReactions/simplereaction_6@2x.png
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/Resources/StillReactions/simplereaction_6@2x.png
rename to submodules/TelegramUI/Resources/StillReactions/simplereaction_6@2x.png
diff --git a/submodules/TelegramUI/TelegramUI/Resources/StillReactions/simplereaction_6@3x.png b/submodules/TelegramUI/Resources/StillReactions/simplereaction_6@3x.png
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/Resources/StillReactions/simplereaction_6@3x.png
rename to submodules/TelegramUI/Resources/StillReactions/simplereaction_6@3x.png
diff --git a/submodules/TelegramUI/TelegramUI/Resources/StillReactions/simplereaction_7@2x.png b/submodules/TelegramUI/Resources/StillReactions/simplereaction_7@2x.png
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/Resources/StillReactions/simplereaction_7@2x.png
rename to submodules/TelegramUI/Resources/StillReactions/simplereaction_7@2x.png
diff --git a/submodules/TelegramUI/TelegramUI/Resources/StillReactions/simplereaction_7@3x.png b/submodules/TelegramUI/Resources/StillReactions/simplereaction_7@3x.png
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/Resources/StillReactions/simplereaction_7@3x.png
rename to submodules/TelegramUI/Resources/StillReactions/simplereaction_7@3x.png
diff --git a/submodules/TelegramUI/TelegramUI/Resources/StillReactions/simplereaction_8@2x.png b/submodules/TelegramUI/Resources/StillReactions/simplereaction_8@2x.png
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/Resources/StillReactions/simplereaction_8@2x.png
rename to submodules/TelegramUI/Resources/StillReactions/simplereaction_8@2x.png
diff --git a/submodules/TelegramUI/TelegramUI/Resources/StillReactions/simplereaction_8@3x.png b/submodules/TelegramUI/Resources/StillReactions/simplereaction_8@3x.png
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/Resources/StillReactions/simplereaction_8@3x.png
rename to submodules/TelegramUI/Resources/StillReactions/simplereaction_8@3x.png
diff --git a/submodules/TelegramUI/TelegramUI/Resources/StillReactions/simplereaction_9@2x.png b/submodules/TelegramUI/Resources/StillReactions/simplereaction_9@2x.png
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/Resources/StillReactions/simplereaction_9@2x.png
rename to submodules/TelegramUI/Resources/StillReactions/simplereaction_9@2x.png
diff --git a/submodules/TelegramUI/TelegramUI/Resources/StillReactions/simplereaction_9@3x.png b/submodules/TelegramUI/Resources/StillReactions/simplereaction_9@3x.png
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/Resources/StillReactions/simplereaction_9@3x.png
rename to submodules/TelegramUI/Resources/StillReactions/simplereaction_9@3x.png
diff --git a/submodules/TelegramUI/TelegramUI/Resources/Stripe/stp_card_amex@2x.png b/submodules/TelegramUI/Resources/Stripe/stp_card_amex@2x.png
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/Resources/Stripe/stp_card_amex@2x.png
rename to submodules/TelegramUI/Resources/Stripe/stp_card_amex@2x.png
diff --git a/submodules/TelegramUI/TelegramUI/Resources/Stripe/stp_card_amex@3x.png b/submodules/TelegramUI/Resources/Stripe/stp_card_amex@3x.png
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/Resources/Stripe/stp_card_amex@3x.png
rename to submodules/TelegramUI/Resources/Stripe/stp_card_amex@3x.png
diff --git a/submodules/TelegramUI/TelegramUI/Resources/Stripe/stp_card_amex_template@2x.png b/submodules/TelegramUI/Resources/Stripe/stp_card_amex_template@2x.png
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/Resources/Stripe/stp_card_amex_template@2x.png
rename to submodules/TelegramUI/Resources/Stripe/stp_card_amex_template@2x.png
diff --git a/submodules/TelegramUI/TelegramUI/Resources/Stripe/stp_card_amex_template@3x.png b/submodules/TelegramUI/Resources/Stripe/stp_card_amex_template@3x.png
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/Resources/Stripe/stp_card_amex_template@3x.png
rename to submodules/TelegramUI/Resources/Stripe/stp_card_amex_template@3x.png
diff --git a/submodules/TelegramUI/TelegramUI/Resources/Stripe/stp_card_applepay@2x.png b/submodules/TelegramUI/Resources/Stripe/stp_card_applepay@2x.png
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/Resources/Stripe/stp_card_applepay@2x.png
rename to submodules/TelegramUI/Resources/Stripe/stp_card_applepay@2x.png
diff --git a/submodules/TelegramUI/TelegramUI/Resources/Stripe/stp_card_applepay@3x.png b/submodules/TelegramUI/Resources/Stripe/stp_card_applepay@3x.png
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/Resources/Stripe/stp_card_applepay@3x.png
rename to submodules/TelegramUI/Resources/Stripe/stp_card_applepay@3x.png
diff --git a/submodules/TelegramUI/TelegramUI/Resources/Stripe/stp_card_applepay_template@2x.png b/submodules/TelegramUI/Resources/Stripe/stp_card_applepay_template@2x.png
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/Resources/Stripe/stp_card_applepay_template@2x.png
rename to submodules/TelegramUI/Resources/Stripe/stp_card_applepay_template@2x.png
diff --git a/submodules/TelegramUI/TelegramUI/Resources/Stripe/stp_card_applepay_template@3x.png b/submodules/TelegramUI/Resources/Stripe/stp_card_applepay_template@3x.png
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/Resources/Stripe/stp_card_applepay_template@3x.png
rename to submodules/TelegramUI/Resources/Stripe/stp_card_applepay_template@3x.png
diff --git a/submodules/TelegramUI/TelegramUI/Resources/Stripe/stp_card_cvc@2x.png b/submodules/TelegramUI/Resources/Stripe/stp_card_cvc@2x.png
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/Resources/Stripe/stp_card_cvc@2x.png
rename to submodules/TelegramUI/Resources/Stripe/stp_card_cvc@2x.png
diff --git a/submodules/TelegramUI/TelegramUI/Resources/Stripe/stp_card_cvc@3x.png b/submodules/TelegramUI/Resources/Stripe/stp_card_cvc@3x.png
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/Resources/Stripe/stp_card_cvc@3x.png
rename to submodules/TelegramUI/Resources/Stripe/stp_card_cvc@3x.png
diff --git a/submodules/TelegramUI/TelegramUI/Resources/Stripe/stp_card_cvc_amex@2x.png b/submodules/TelegramUI/Resources/Stripe/stp_card_cvc_amex@2x.png
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/Resources/Stripe/stp_card_cvc_amex@2x.png
rename to submodules/TelegramUI/Resources/Stripe/stp_card_cvc_amex@2x.png
diff --git a/submodules/TelegramUI/TelegramUI/Resources/Stripe/stp_card_cvc_amex@3x.png b/submodules/TelegramUI/Resources/Stripe/stp_card_cvc_amex@3x.png
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/Resources/Stripe/stp_card_cvc_amex@3x.png
rename to submodules/TelegramUI/Resources/Stripe/stp_card_cvc_amex@3x.png
diff --git a/submodules/TelegramUI/TelegramUI/Resources/Stripe/stp_card_diners@2x.png b/submodules/TelegramUI/Resources/Stripe/stp_card_diners@2x.png
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/Resources/Stripe/stp_card_diners@2x.png
rename to submodules/TelegramUI/Resources/Stripe/stp_card_diners@2x.png
diff --git a/submodules/TelegramUI/TelegramUI/Resources/Stripe/stp_card_diners@3x.png b/submodules/TelegramUI/Resources/Stripe/stp_card_diners@3x.png
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/Resources/Stripe/stp_card_diners@3x.png
rename to submodules/TelegramUI/Resources/Stripe/stp_card_diners@3x.png
diff --git a/submodules/TelegramUI/TelegramUI/Resources/Stripe/stp_card_diners_template@2x.png b/submodules/TelegramUI/Resources/Stripe/stp_card_diners_template@2x.png
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/Resources/Stripe/stp_card_diners_template@2x.png
rename to submodules/TelegramUI/Resources/Stripe/stp_card_diners_template@2x.png
diff --git a/submodules/TelegramUI/TelegramUI/Resources/Stripe/stp_card_diners_template@3x.png b/submodules/TelegramUI/Resources/Stripe/stp_card_diners_template@3x.png
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/Resources/Stripe/stp_card_diners_template@3x.png
rename to submodules/TelegramUI/Resources/Stripe/stp_card_diners_template@3x.png
diff --git a/submodules/TelegramUI/TelegramUI/Resources/Stripe/stp_card_discover@2x.png b/submodules/TelegramUI/Resources/Stripe/stp_card_discover@2x.png
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/Resources/Stripe/stp_card_discover@2x.png
rename to submodules/TelegramUI/Resources/Stripe/stp_card_discover@2x.png
diff --git a/submodules/TelegramUI/TelegramUI/Resources/Stripe/stp_card_discover@3x.png b/submodules/TelegramUI/Resources/Stripe/stp_card_discover@3x.png
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/Resources/Stripe/stp_card_discover@3x.png
rename to submodules/TelegramUI/Resources/Stripe/stp_card_discover@3x.png
diff --git a/submodules/TelegramUI/TelegramUI/Resources/Stripe/stp_card_discover_template@2x.png b/submodules/TelegramUI/Resources/Stripe/stp_card_discover_template@2x.png
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/Resources/Stripe/stp_card_discover_template@2x.png
rename to submodules/TelegramUI/Resources/Stripe/stp_card_discover_template@2x.png
diff --git a/submodules/TelegramUI/TelegramUI/Resources/Stripe/stp_card_discover_template@3x.png b/submodules/TelegramUI/Resources/Stripe/stp_card_discover_template@3x.png
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/Resources/Stripe/stp_card_discover_template@3x.png
rename to submodules/TelegramUI/Resources/Stripe/stp_card_discover_template@3x.png
diff --git a/submodules/TelegramUI/TelegramUI/Resources/Stripe/stp_card_form_applepay@2x.png b/submodules/TelegramUI/Resources/Stripe/stp_card_form_applepay@2x.png
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/Resources/Stripe/stp_card_form_applepay@2x.png
rename to submodules/TelegramUI/Resources/Stripe/stp_card_form_applepay@2x.png
diff --git a/submodules/TelegramUI/TelegramUI/Resources/Stripe/stp_card_form_applepay@3x.png b/submodules/TelegramUI/Resources/Stripe/stp_card_form_applepay@3x.png
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/Resources/Stripe/stp_card_form_applepay@3x.png
rename to submodules/TelegramUI/Resources/Stripe/stp_card_form_applepay@3x.png
diff --git a/submodules/TelegramUI/TelegramUI/Resources/Stripe/stp_card_form_back@2x.png b/submodules/TelegramUI/Resources/Stripe/stp_card_form_back@2x.png
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/Resources/Stripe/stp_card_form_back@2x.png
rename to submodules/TelegramUI/Resources/Stripe/stp_card_form_back@2x.png
diff --git a/submodules/TelegramUI/TelegramUI/Resources/Stripe/stp_card_form_back@3x.png b/submodules/TelegramUI/Resources/Stripe/stp_card_form_back@3x.png
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/Resources/Stripe/stp_card_form_back@3x.png
rename to submodules/TelegramUI/Resources/Stripe/stp_card_form_back@3x.png
diff --git a/submodules/TelegramUI/TelegramUI/Resources/Stripe/stp_card_form_front@2x.png b/submodules/TelegramUI/Resources/Stripe/stp_card_form_front@2x.png
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/Resources/Stripe/stp_card_form_front@2x.png
rename to submodules/TelegramUI/Resources/Stripe/stp_card_form_front@2x.png
diff --git a/submodules/TelegramUI/TelegramUI/Resources/Stripe/stp_card_form_front@3x.png b/submodules/TelegramUI/Resources/Stripe/stp_card_form_front@3x.png
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/Resources/Stripe/stp_card_form_front@3x.png
rename to submodules/TelegramUI/Resources/Stripe/stp_card_form_front@3x.png
diff --git a/submodules/TelegramUI/TelegramUI/Resources/Stripe/stp_card_jcb@2x.png b/submodules/TelegramUI/Resources/Stripe/stp_card_jcb@2x.png
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/Resources/Stripe/stp_card_jcb@2x.png
rename to submodules/TelegramUI/Resources/Stripe/stp_card_jcb@2x.png
diff --git a/submodules/TelegramUI/TelegramUI/Resources/Stripe/stp_card_jcb@3x.png b/submodules/TelegramUI/Resources/Stripe/stp_card_jcb@3x.png
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/Resources/Stripe/stp_card_jcb@3x.png
rename to submodules/TelegramUI/Resources/Stripe/stp_card_jcb@3x.png
diff --git a/submodules/TelegramUI/TelegramUI/Resources/Stripe/stp_card_jcb_template@2x.png b/submodules/TelegramUI/Resources/Stripe/stp_card_jcb_template@2x.png
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/Resources/Stripe/stp_card_jcb_template@2x.png
rename to submodules/TelegramUI/Resources/Stripe/stp_card_jcb_template@2x.png
diff --git a/submodules/TelegramUI/TelegramUI/Resources/Stripe/stp_card_jcb_template@3x.png b/submodules/TelegramUI/Resources/Stripe/stp_card_jcb_template@3x.png
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/Resources/Stripe/stp_card_jcb_template@3x.png
rename to submodules/TelegramUI/Resources/Stripe/stp_card_jcb_template@3x.png
diff --git a/submodules/TelegramUI/TelegramUI/Resources/Stripe/stp_card_mastercard@2x.png b/submodules/TelegramUI/Resources/Stripe/stp_card_mastercard@2x.png
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/Resources/Stripe/stp_card_mastercard@2x.png
rename to submodules/TelegramUI/Resources/Stripe/stp_card_mastercard@2x.png
diff --git a/submodules/TelegramUI/TelegramUI/Resources/Stripe/stp_card_mastercard@3x.png b/submodules/TelegramUI/Resources/Stripe/stp_card_mastercard@3x.png
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/Resources/Stripe/stp_card_mastercard@3x.png
rename to submodules/TelegramUI/Resources/Stripe/stp_card_mastercard@3x.png
diff --git a/submodules/TelegramUI/TelegramUI/Resources/Stripe/stp_card_mastercard_template@2x.png b/submodules/TelegramUI/Resources/Stripe/stp_card_mastercard_template@2x.png
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/Resources/Stripe/stp_card_mastercard_template@2x.png
rename to submodules/TelegramUI/Resources/Stripe/stp_card_mastercard_template@2x.png
diff --git a/submodules/TelegramUI/TelegramUI/Resources/Stripe/stp_card_mastercard_template@3x.png b/submodules/TelegramUI/Resources/Stripe/stp_card_mastercard_template@3x.png
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/Resources/Stripe/stp_card_mastercard_template@3x.png
rename to submodules/TelegramUI/Resources/Stripe/stp_card_mastercard_template@3x.png
diff --git a/submodules/TelegramUI/TelegramUI/Resources/Stripe/stp_card_placeholder_template@2x.png b/submodules/TelegramUI/Resources/Stripe/stp_card_placeholder_template@2x.png
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/Resources/Stripe/stp_card_placeholder_template@2x.png
rename to submodules/TelegramUI/Resources/Stripe/stp_card_placeholder_template@2x.png
diff --git a/submodules/TelegramUI/TelegramUI/Resources/Stripe/stp_card_placeholder_template@3x.png b/submodules/TelegramUI/Resources/Stripe/stp_card_placeholder_template@3x.png
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/Resources/Stripe/stp_card_placeholder_template@3x.png
rename to submodules/TelegramUI/Resources/Stripe/stp_card_placeholder_template@3x.png
diff --git a/submodules/TelegramUI/TelegramUI/Resources/Stripe/stp_card_visa@2x.png b/submodules/TelegramUI/Resources/Stripe/stp_card_visa@2x.png
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/Resources/Stripe/stp_card_visa@2x.png
rename to submodules/TelegramUI/Resources/Stripe/stp_card_visa@2x.png
diff --git a/submodules/TelegramUI/TelegramUI/Resources/Stripe/stp_card_visa@3x.png b/submodules/TelegramUI/Resources/Stripe/stp_card_visa@3x.png
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/Resources/Stripe/stp_card_visa@3x.png
rename to submodules/TelegramUI/Resources/Stripe/stp_card_visa@3x.png
diff --git a/submodules/TelegramUI/TelegramUI/Resources/Stripe/stp_card_visa_template@2x.png b/submodules/TelegramUI/Resources/Stripe/stp_card_visa_template@2x.png
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/Resources/Stripe/stp_card_visa_template@2x.png
rename to submodules/TelegramUI/Resources/Stripe/stp_card_visa_template@2x.png
diff --git a/submodules/TelegramUI/TelegramUI/Resources/Stripe/stp_card_visa_template@3x.png b/submodules/TelegramUI/Resources/Stripe/stp_card_visa_template@3x.png
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/Resources/Stripe/stp_card_visa_template@3x.png
rename to submodules/TelegramUI/Resources/Stripe/stp_card_visa_template@3x.png
diff --git a/submodules/TelegramUI/TelegramUI/Resources/WebEmbed/Generic.html b/submodules/TelegramUI/Resources/WebEmbed/Generic.html
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/Resources/WebEmbed/Generic.html
rename to submodules/TelegramUI/Resources/WebEmbed/Generic.html
diff --git a/submodules/TelegramUI/TelegramUI/Resources/WebEmbed/GenericUserScript.js b/submodules/TelegramUI/Resources/WebEmbed/GenericUserScript.js
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/Resources/WebEmbed/GenericUserScript.js
rename to submodules/TelegramUI/Resources/WebEmbed/GenericUserScript.js
diff --git a/submodules/TelegramUI/TelegramUI/Resources/WebEmbed/Instagram.html b/submodules/TelegramUI/Resources/WebEmbed/Instagram.html
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/Resources/WebEmbed/Instagram.html
rename to submodules/TelegramUI/Resources/WebEmbed/Instagram.html
diff --git a/submodules/TelegramUI/TelegramUI/Resources/WebEmbed/Twitch.html b/submodules/TelegramUI/Resources/WebEmbed/Twitch.html
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/Resources/WebEmbed/Twitch.html
rename to submodules/TelegramUI/Resources/WebEmbed/Twitch.html
diff --git a/submodules/TelegramUI/TelegramUI/Resources/WebEmbed/TwitchUserScript.js b/submodules/TelegramUI/Resources/WebEmbed/TwitchUserScript.js
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/Resources/WebEmbed/TwitchUserScript.js
rename to submodules/TelegramUI/Resources/WebEmbed/TwitchUserScript.js
diff --git a/submodules/TelegramUI/TelegramUI/Resources/WebEmbed/Vimeo.html b/submodules/TelegramUI/Resources/WebEmbed/Vimeo.html
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/Resources/WebEmbed/Vimeo.html
rename to submodules/TelegramUI/Resources/WebEmbed/Vimeo.html
diff --git a/submodules/TelegramUI/TelegramUI/Resources/WebEmbed/VimeoUserScript.js b/submodules/TelegramUI/Resources/WebEmbed/VimeoUserScript.js
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/Resources/WebEmbed/VimeoUserScript.js
rename to submodules/TelegramUI/Resources/WebEmbed/VimeoUserScript.js
diff --git a/submodules/TelegramUI/TelegramUI/Resources/WebEmbed/Youtube.html b/submodules/TelegramUI/Resources/WebEmbed/Youtube.html
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/Resources/WebEmbed/Youtube.html
rename to submodules/TelegramUI/Resources/WebEmbed/Youtube.html
diff --git a/submodules/TelegramUI/TelegramUI/Resources/WebEmbed/YoutubeUserScript.js b/submodules/TelegramUI/Resources/WebEmbed/YoutubeUserScript.js
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/Resources/WebEmbed/YoutubeUserScript.js
rename to submodules/TelegramUI/Resources/WebEmbed/YoutubeUserScript.js
diff --git a/submodules/TelegramUI/TelegramUI/Resources/currencies.json b/submodules/TelegramUI/Resources/currencies.json
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/Resources/currencies.json
rename to submodules/TelegramUI/Resources/currencies.json
diff --git a/submodules/TelegramUI/TelegramUI/Sounds/MessageSent.caf b/submodules/TelegramUI/Sounds/MessageSent.caf
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/Sounds/MessageSent.caf
rename to submodules/TelegramUI/Sounds/MessageSent.caf
diff --git a/submodules/TelegramUI/TelegramUI/Sounds/notification.caf b/submodules/TelegramUI/Sounds/notification.caf
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/Sounds/notification.caf
rename to submodules/TelegramUI/Sounds/notification.caf
diff --git a/submodules/TelegramUI/TelegramUI/AccessoryPanelNode.swift b/submodules/TelegramUI/Sources/AccessoryPanelNode.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/AccessoryPanelNode.swift
rename to submodules/TelegramUI/Sources/AccessoryPanelNode.swift
diff --git a/submodules/TelegramUI/TelegramUI/AccountContext.swift b/submodules/TelegramUI/Sources/AccountContext.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/AccountContext.swift
rename to submodules/TelegramUI/Sources/AccountContext.swift
diff --git a/submodules/TelegramUI/TelegramUI/AppDelegate.swift b/submodules/TelegramUI/Sources/AppDelegate.swift
similarity index 99%
rename from submodules/TelegramUI/TelegramUI/AppDelegate.swift
rename to submodules/TelegramUI/Sources/AppDelegate.swift
index 1cb3934f87..cffbe977ea 100644
--- a/submodules/TelegramUI/TelegramUI/AppDelegate.swift
+++ b/submodules/TelegramUI/Sources/AppDelegate.swift
@@ -455,7 +455,7 @@ final class SharedApplicationContext {
             }
         }
         
-        ASDisableLogging()
+        //ASDisableLogging()
         
         initializeLegacyComponents(application: application, currentSizeClassGetter: {
             return UIUserInterfaceSizeClass.compact
diff --git a/submodules/TelegramUI/TelegramUI/ApplicationContext.swift b/submodules/TelegramUI/Sources/ApplicationContext.swift
similarity index 99%
rename from submodules/TelegramUI/TelegramUI/ApplicationContext.swift
rename to submodules/TelegramUI/Sources/ApplicationContext.swift
index eeaa5b2e6d..377a70629a 100644
--- a/submodules/TelegramUI/TelegramUI/ApplicationContext.swift
+++ b/submodules/TelegramUI/Sources/ApplicationContext.swift
@@ -19,6 +19,7 @@ import LegacyUI
 import TelegramPermissionsUI
 import PasscodeUI
 import ImageBlur
+import FastBlur
 import WatchBridge
 import SettingsUI
 import AppLock
diff --git a/submodules/TelegramUI/TelegramUI/ApplicationShortcutItem.swift b/submodules/TelegramUI/Sources/ApplicationShortcutItem.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/ApplicationShortcutItem.swift
rename to submodules/TelegramUI/Sources/ApplicationShortcutItem.swift
diff --git a/submodules/TelegramUI/TelegramUI/AudioRecordningToneData.swift b/submodules/TelegramUI/Sources/AudioRecordningToneData.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/AudioRecordningToneData.swift
rename to submodules/TelegramUI/Sources/AudioRecordningToneData.swift
diff --git a/submodules/TelegramUI/TelegramUI/AudioWaveform.swift b/submodules/TelegramUI/Sources/AudioWaveform.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/AudioWaveform.swift
rename to submodules/TelegramUI/Sources/AudioWaveform.swift
diff --git a/submodules/TelegramUI/TelegramUI/AudioWaveformNode.swift b/submodules/TelegramUI/Sources/AudioWaveformNode.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/AudioWaveformNode.swift
rename to submodules/TelegramUI/Sources/AudioWaveformNode.swift
diff --git a/submodules/TelegramUI/TelegramUI/AuthorizationSequenceAwaitingAccountResetController.swift b/submodules/TelegramUI/Sources/AuthorizationSequenceAwaitingAccountResetController.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/AuthorizationSequenceAwaitingAccountResetController.swift
rename to submodules/TelegramUI/Sources/AuthorizationSequenceAwaitingAccountResetController.swift
diff --git a/submodules/TelegramUI/TelegramUI/AuthorizationSequenceAwaitingAccountResetControllerNode.swift b/submodules/TelegramUI/Sources/AuthorizationSequenceAwaitingAccountResetControllerNode.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/AuthorizationSequenceAwaitingAccountResetControllerNode.swift
rename to submodules/TelegramUI/Sources/AuthorizationSequenceAwaitingAccountResetControllerNode.swift
diff --git a/submodules/TelegramUI/TelegramUI/AuthorizationSequenceCodeEntryController.swift b/submodules/TelegramUI/Sources/AuthorizationSequenceCodeEntryController.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/AuthorizationSequenceCodeEntryController.swift
rename to submodules/TelegramUI/Sources/AuthorizationSequenceCodeEntryController.swift
diff --git a/submodules/TelegramUI/TelegramUI/AuthorizationSequenceCodeEntryControllerNode.swift b/submodules/TelegramUI/Sources/AuthorizationSequenceCodeEntryControllerNode.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/AuthorizationSequenceCodeEntryControllerNode.swift
rename to submodules/TelegramUI/Sources/AuthorizationSequenceCodeEntryControllerNode.swift
diff --git a/submodules/TelegramUI/TelegramUI/AuthorizationSequenceController.swift b/submodules/TelegramUI/Sources/AuthorizationSequenceController.swift
similarity index 99%
rename from submodules/TelegramUI/TelegramUI/AuthorizationSequenceController.swift
rename to submodules/TelegramUI/Sources/AuthorizationSequenceController.swift
index 9ef68b15a7..418241b8e5 100644
--- a/submodules/TelegramUI/TelegramUI/AuthorizationSequenceController.swift
+++ b/submodules/TelegramUI/Sources/AuthorizationSequenceController.swift
@@ -6,11 +6,7 @@ import Postbox
 import TelegramCore
 import SyncCore
 import SwiftSignalKit
-#if BUCK
 import MtProtoKit
-#else
-import MtProtoKitDynamic
-#endif
 import MessageUI
 import CoreTelephony
 import TelegramPresentationData
diff --git a/submodules/TelegramUI/TelegramUI/AuthorizationSequencePasswordEntryController.swift b/submodules/TelegramUI/Sources/AuthorizationSequencePasswordEntryController.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/AuthorizationSequencePasswordEntryController.swift
rename to submodules/TelegramUI/Sources/AuthorizationSequencePasswordEntryController.swift
diff --git a/submodules/TelegramUI/TelegramUI/AuthorizationSequencePasswordEntryControllerNode.swift b/submodules/TelegramUI/Sources/AuthorizationSequencePasswordEntryControllerNode.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/AuthorizationSequencePasswordEntryControllerNode.swift
rename to submodules/TelegramUI/Sources/AuthorizationSequencePasswordEntryControllerNode.swift
diff --git a/submodules/TelegramUI/TelegramUI/AuthorizationSequencePasswordRecoveryController.swift b/submodules/TelegramUI/Sources/AuthorizationSequencePasswordRecoveryController.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/AuthorizationSequencePasswordRecoveryController.swift
rename to submodules/TelegramUI/Sources/AuthorizationSequencePasswordRecoveryController.swift
diff --git a/submodules/TelegramUI/TelegramUI/AuthorizationSequencePasswordRecoveryControllerNode.swift b/submodules/TelegramUI/Sources/AuthorizationSequencePasswordRecoveryControllerNode.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/AuthorizationSequencePasswordRecoveryControllerNode.swift
rename to submodules/TelegramUI/Sources/AuthorizationSequencePasswordRecoveryControllerNode.swift
diff --git a/submodules/TelegramUI/TelegramUI/AuthorizationSequencePhoneEntryController.swift b/submodules/TelegramUI/Sources/AuthorizationSequencePhoneEntryController.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/AuthorizationSequencePhoneEntryController.swift
rename to submodules/TelegramUI/Sources/AuthorizationSequencePhoneEntryController.swift
diff --git a/submodules/TelegramUI/TelegramUI/AuthorizationSequencePhoneEntryControllerNode.swift b/submodules/TelegramUI/Sources/AuthorizationSequencePhoneEntryControllerNode.swift
similarity index 99%
rename from submodules/TelegramUI/TelegramUI/AuthorizationSequencePhoneEntryControllerNode.swift
rename to submodules/TelegramUI/Sources/AuthorizationSequencePhoneEntryControllerNode.swift
index c887a828af..8444c74660 100644
--- a/submodules/TelegramUI/TelegramUI/AuthorizationSequencePhoneEntryControllerNode.swift
+++ b/submodules/TelegramUI/Sources/AuthorizationSequencePhoneEntryControllerNode.swift
@@ -271,6 +271,7 @@ final class AuthorizationSequencePhoneEntryControllerNode: ASDisplayNode {
         self.titleNode.attributedText = NSAttributedString(string: strings.Login_PhoneTitle, font: Font.light(30.0), textColor: theme.list.itemPrimaryTextColor)
         
         self.noticeNode = ASTextNode()
+        self.noticeNode.maximumNumberOfLines = 0
         self.noticeNode.isUserInteractionEnabled = true
         self.noticeNode.displaysAsynchronously = false
         self.noticeNode.attributedText = NSAttributedString(string: strings.Login_PhoneAndCountryHelp, font: Font.regular(16.0), textColor: theme.list.itemPrimaryTextColor, paragraphAlignment: .center)
diff --git a/submodules/TelegramUI/TelegramUI/AuthorizationSequenceSignUpController.swift b/submodules/TelegramUI/Sources/AuthorizationSequenceSignUpController.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/AuthorizationSequenceSignUpController.swift
rename to submodules/TelegramUI/Sources/AuthorizationSequenceSignUpController.swift
diff --git a/submodules/TelegramUI/TelegramUI/AuthorizationSequenceSignUpControllerNode.swift b/submodules/TelegramUI/Sources/AuthorizationSequenceSignUpControllerNode.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/AuthorizationSequenceSignUpControllerNode.swift
rename to submodules/TelegramUI/Sources/AuthorizationSequenceSignUpControllerNode.swift
diff --git a/submodules/TelegramUI/TelegramUI/AuthorizationSequenceSplashController.swift b/submodules/TelegramUI/Sources/AuthorizationSequenceSplashController.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/AuthorizationSequenceSplashController.swift
rename to submodules/TelegramUI/Sources/AuthorizationSequenceSplashController.swift
diff --git a/submodules/TelegramUI/TelegramUI/AuthorizationSequenceSplashControllerNode.swift b/submodules/TelegramUI/Sources/AuthorizationSequenceSplashControllerNode.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/AuthorizationSequenceSplashControllerNode.swift
rename to submodules/TelegramUI/Sources/AuthorizationSequenceSplashControllerNode.swift
diff --git a/submodules/TelegramUI/TelegramUI/ChatAvatarNavigationNode.swift b/submodules/TelegramUI/Sources/ChatAvatarNavigationNode.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/ChatAvatarNavigationNode.swift
rename to submodules/TelegramUI/Sources/ChatAvatarNavigationNode.swift
diff --git a/submodules/TelegramUI/TelegramUI/ChatBotInfoItem.swift b/submodules/TelegramUI/Sources/ChatBotInfoItem.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/ChatBotInfoItem.swift
rename to submodules/TelegramUI/Sources/ChatBotInfoItem.swift
diff --git a/submodules/TelegramUI/TelegramUI/ChatBotStartInputPanelNode.swift b/submodules/TelegramUI/Sources/ChatBotStartInputPanelNode.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/ChatBotStartInputPanelNode.swift
rename to submodules/TelegramUI/Sources/ChatBotStartInputPanelNode.swift
diff --git a/submodules/TelegramUI/TelegramUI/ChatButtonKeyboardInputNode.swift b/submodules/TelegramUI/Sources/ChatButtonKeyboardInputNode.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/ChatButtonKeyboardInputNode.swift
rename to submodules/TelegramUI/Sources/ChatButtonKeyboardInputNode.swift
diff --git a/submodules/TelegramUI/TelegramUI/ChatChannelSubscriberInputPanelNode.swift b/submodules/TelegramUI/Sources/ChatChannelSubscriberInputPanelNode.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/ChatChannelSubscriberInputPanelNode.swift
rename to submodules/TelegramUI/Sources/ChatChannelSubscriberInputPanelNode.swift
diff --git a/submodules/TelegramUI/TelegramUI/ChatContextResultPeekContentNode.swift b/submodules/TelegramUI/Sources/ChatContextResultPeekContentNode.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/ChatContextResultPeekContentNode.swift
rename to submodules/TelegramUI/Sources/ChatContextResultPeekContentNode.swift
diff --git a/submodules/TelegramUI/TelegramUI/ChatController.swift b/submodules/TelegramUI/Sources/ChatController.swift
similarity index 99%
rename from submodules/TelegramUI/TelegramUI/ChatController.swift
rename to submodules/TelegramUI/Sources/ChatController.swift
index 1393f0cb4b..0d812b3e9c 100644
--- a/submodules/TelegramUI/TelegramUI/ChatController.swift
+++ b/submodules/TelegramUI/Sources/ChatController.swift
@@ -194,7 +194,7 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
     private var shareStatusDisposable: MetaDisposable?
     private var clearCacheDisposable: MetaDisposable?
     private var bankCardDisposable: MetaDisposable?
-    
+
     private let editingMessage = ValuePromise<Float?>(nil, ignoreRepeated: true)
     private let startingBot = ValuePromise<Bool>(false, ignoreRepeated: true)
     private let unblockingPeer = ValuePromise<Bool>(false, ignoreRepeated: true)
@@ -1057,7 +1057,7 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
             var cancelImpl: (() -> Void)?
             let presentationData = strongSelf.presentationData
             let progressSignal = Signal<Never, NoError> { subscriber in
-                let controller = OverlayStatusController(theme: presentationData.theme, type: .loading(cancelled: {
+                let controller = OverlayStatusController(theme: presentationData.theme,  type: .loading(cancelled: {
                     cancelImpl?()
                 }))
                 self?.present(controller, in: .window(.root))
@@ -3499,7 +3499,7 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
                 strongSelf.searchResultsController = nil
             }
         }, openSearchResults: { [weak self] in
-            if let strongSelf = self, let searchData = strongSelf.presentationInterfaceState.search, let results = searchData.resultsState {
+            if let strongSelf = self, let searchData = strongSelf.presentationInterfaceState.search, let _ = searchData.resultsState {
                 if let controller = strongSelf.searchResultsController {
                     strongSelf.chatDisplayNode.dismissInput()
                     if case let .inline(navigationController) = strongSelf.presentationInterfaceState.mode {
@@ -4231,9 +4231,6 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
                     }
                     disposables.set((signal
                     |> deliverOnMainQueue).start(error: { _ in
-                        guard let _ = self else {
-                            return
-                        }
                     }, completed: {
                         guard let strongSelf = self else {
                             return
@@ -4722,13 +4719,6 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
         
         if !self.didSetup3dTouch {
             self.didSetup3dTouch = true
-            if #available(iOSApplicationExtension 9.0, iOS 9.0, *) {
-                //self.registerForPreviewing(with: self, sourceView: self.chatDisplayNode.historyNodeContainer.view, theme: PeekControllerTheme(presentationTheme: self.presentationData.theme), onlyNative: true)
-                if case .peer = self.chatLocation, let buttonView = (self.chatInfoNavigationButton?.buttonItem.customDisplayNode as? ChatAvatarNavigationNode)?.avatarNode.view {
-                    //self.registerForPreviewing(with: self, sourceView: buttonView, theme: PeekControllerTheme(presentationTheme: self.presentationData.theme), onlyNative: true)
-                }
-            }
-            
             if #available(iOSApplicationExtension 11.0, iOS 11.0, *) {
                 let dropInteraction = UIDropInteraction(delegate: self)
                 self.chatDisplayNode.view.addInteraction(dropInteraction)
@@ -5601,12 +5591,10 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
                                 
                                 var signal = clearCachedMediaResources(account: strongSelf.context.account, mediaResourceIds: clearResourceIds)
                                 
-                                let resultStats = CacheUsageStats(media: media, mediaResourceIds: stats.mediaResourceIds, peers: stats.peers, otherSize: stats.otherSize, otherPaths: stats.otherPaths, cacheSize: stats.cacheSize, tempPaths: stats.tempPaths, tempSize: stats.tempSize, immutableSize: stats.immutableSize)
-                                
                                 var cancelImpl: (() -> Void)?
                                 let presentationData = strongSelf.context.sharedContext.currentPresentationData.with { $0 }
                                 let progressSignal = Signal<Never, NoError> { subscriber in
-                                    let controller = OverlayStatusController(theme: presentationData.theme, type: .loading(cancelled: {
+                                    let controller = OverlayStatusController(theme: presentationData.theme,  type: .loading(cancelled: {
                                         cancelImpl?()
                                     }))
                                     strongSelf.present(controller, in: .window(.root), with: ViewControllerPresentationArguments(presentationAnimation: .modalSheet))
@@ -5631,7 +5619,7 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
                                 }
                                 disposable.set((signal
                                 |> deliverOnMainQueue).start(completed: { [weak self] in
-                                    if let strongSelf = self, let layout = strongSelf.validLayout {
+                                    if let strongSelf = self, let _ = strongSelf.validLayout {
                                         strongSelf.present(UndoOverlayController(presentationData: presentationData, content: .succeed(text: presentationData.strings.ClearCache_Success("\(dataSizeString(selectedSize, decimalSeparator: presentationData.dateTimeFormat.decimalSeparator))", stringForDeviceType()).0), elevatedLayout: true, action: { _ in return false }), in: .current)
                                     }
                                 }))
@@ -7193,7 +7181,7 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
         } else {
             if let peerId = peerId {
                 switch self.chatLocation {
-                    case .peer:
+                    case let .peer(selfPeerId):
                         switch navigation {
                             case .info:
                                 let peerSignal: Signal<Peer?, NoError>
@@ -7204,7 +7192,11 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
                                 }
                                 self.navigationActionDisposable.set((peerSignal |> take(1) |> deliverOnMainQueue).start(next: { [weak self] peer in
                                     if let strongSelf = self, let peer = peer {
-                                        if let infoController = strongSelf.context.sharedContext.makePeerInfoController(context: strongSelf.context, peer: peer, mode: .generic, avatarInitiallyExpanded: expandAvatar, fromChat: false) {
+                                        var mode: PeerInfoControllerMode = .generic
+                                        if let _ = fromMessage {
+                                            mode = .group(selfPeerId)
+                                        }
+                                        if let infoController = strongSelf.context.sharedContext.makePeerInfoController(context: strongSelf.context, peer: peer, mode: mode, avatarInitiallyExpanded: expandAvatar, fromChat: false) {
                                             strongSelf.effectiveNavigationController?.pushViewController(infoController)
                                         }
                                     }
@@ -7665,7 +7657,7 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
             var cancelImpl: (() -> Void)?
             let presentationData = strongSelf.presentationData
             let progressSignal = Signal<Never, NoError> { subscriber in
-                let controller = OverlayStatusController(theme: presentationData.theme, type: .loading(cancelled: {
+                let controller = OverlayStatusController(theme: presentationData.theme,  type: .loading(cancelled: {
                     cancelImpl?()
                 }))
                 self?.present(controller, in: .window(.root))
@@ -7709,7 +7701,7 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
                 rawDisplayUrl = String(rawDisplayUrl[..<rawDisplayUrl.index(rawDisplayUrl.startIndex, offsetBy: maxLength - 2)]) + "..."
             }
             var displayUrl = rawDisplayUrl
-            displayUrl.replacingOccurrences(of: "\u{202e}", with: "")
+            displayUrl = displayUrl.replacingOccurrences(of: "\u{202e}", with: "")
             self.present(textAlertController(context: self.context, title: nil, text: self.presentationData.strings.Generic_OpenHiddenLinkAlert(displayUrl).0, actions: [TextAlertAction(type: .genericAction, title: self.presentationData.strings.Common_No, action: {}), TextAlertAction(type: .defaultAction, title: self.presentationData.strings.Common_Yes, action: {
                 openImpl()
             })]), in: .window(.root))
@@ -8396,12 +8388,9 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
         }
         
         var canEdit = false
-        self.updateChatPresentationInterfaceState(animated: false, interactive: false, { state in
-            if state.interfaceState.effectiveInputState.inputText.length == 0 && state.interfaceState.editMessage == nil {
-                canEdit = true
-            }
-            return state
-        })
+        if self.presentationInterfaceState.interfaceState.effectiveInputState.inputText.length == 0 && self.presentationInterfaceState.interfaceState.editMessage == nil {
+            canEdit = true
+        }
         
         if canEdit, let message = self.chatDisplayNode.historyNode.firstMessageForEditInCurrentHistoryView() {
             inputShortcuts.append(KeyShortcut(input: UIKeyCommand.inputUpArrow, action: { [weak self] in
@@ -8450,7 +8439,7 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
                 }
             }
         }
-        if let (node, contentBounds, get) = selectedNode {
+        if let (node, _, get) = selectedNode {
             return ({ [weak self] view in
                 guard let strongSelf = self else {
                     return
diff --git a/submodules/TelegramUI/TelegramUI/ChatControllerInteraction.swift b/submodules/TelegramUI/Sources/ChatControllerInteraction.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/ChatControllerInteraction.swift
rename to submodules/TelegramUI/Sources/ChatControllerInteraction.swift
diff --git a/submodules/TelegramUI/TelegramUI/ChatControllerNode.swift b/submodules/TelegramUI/Sources/ChatControllerNode.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/ChatControllerNode.swift
rename to submodules/TelegramUI/Sources/ChatControllerNode.swift
diff --git a/submodules/TelegramUI/TelegramUI/ChatControllerTitlePanelNodeContainer.swift b/submodules/TelegramUI/Sources/ChatControllerTitlePanelNodeContainer.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/ChatControllerTitlePanelNodeContainer.swift
rename to submodules/TelegramUI/Sources/ChatControllerTitlePanelNodeContainer.swift
diff --git a/submodules/TelegramUI/TelegramUI/ChatDateSelectionSheet.swift b/submodules/TelegramUI/Sources/ChatDateSelectionSheet.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/ChatDateSelectionSheet.swift
rename to submodules/TelegramUI/Sources/ChatDateSelectionSheet.swift
diff --git a/submodules/TelegramUI/TelegramUI/ChatEditInterfaceMessageState.swift b/submodules/TelegramUI/Sources/ChatEditInterfaceMessageState.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/ChatEditInterfaceMessageState.swift
rename to submodules/TelegramUI/Sources/ChatEditInterfaceMessageState.swift
diff --git a/submodules/TelegramUI/TelegramUI/ChatEditMessageMediaContext.swift b/submodules/TelegramUI/Sources/ChatEditMessageMediaContext.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/ChatEditMessageMediaContext.swift
rename to submodules/TelegramUI/Sources/ChatEditMessageMediaContext.swift
diff --git a/submodules/TelegramUI/TelegramUI/ChatEmptyNode.swift b/submodules/TelegramUI/Sources/ChatEmptyNode.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/ChatEmptyNode.swift
rename to submodules/TelegramUI/Sources/ChatEmptyNode.swift
diff --git a/submodules/TelegramUI/TelegramUI/ChatFeedNavigationInputPanelNode.swift b/submodules/TelegramUI/Sources/ChatFeedNavigationInputPanelNode.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/ChatFeedNavigationInputPanelNode.swift
rename to submodules/TelegramUI/Sources/ChatFeedNavigationInputPanelNode.swift
diff --git a/submodules/TelegramUI/TelegramUI/ChatHistoryEntriesForView.swift b/submodules/TelegramUI/Sources/ChatHistoryEntriesForView.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/ChatHistoryEntriesForView.swift
rename to submodules/TelegramUI/Sources/ChatHistoryEntriesForView.swift
diff --git a/submodules/TelegramUI/TelegramUI/ChatHistoryEntry.swift b/submodules/TelegramUI/Sources/ChatHistoryEntry.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/ChatHistoryEntry.swift
rename to submodules/TelegramUI/Sources/ChatHistoryEntry.swift
diff --git a/submodules/TelegramUI/TelegramUI/ChatHistoryGridNode.swift b/submodules/TelegramUI/Sources/ChatHistoryGridNode.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/ChatHistoryGridNode.swift
rename to submodules/TelegramUI/Sources/ChatHistoryGridNode.swift
diff --git a/submodules/TelegramUI/TelegramUI/ChatHistoryListNode.swift b/submodules/TelegramUI/Sources/ChatHistoryListNode.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/ChatHistoryListNode.swift
rename to submodules/TelegramUI/Sources/ChatHistoryListNode.swift
diff --git a/submodules/TelegramUI/TelegramUI/ChatHistoryLocation.swift b/submodules/TelegramUI/Sources/ChatHistoryLocation.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/ChatHistoryLocation.swift
rename to submodules/TelegramUI/Sources/ChatHistoryLocation.swift
diff --git a/submodules/TelegramUI/TelegramUI/ChatHistoryNavigationButtonNode.swift b/submodules/TelegramUI/Sources/ChatHistoryNavigationButtonNode.swift
similarity index 98%
rename from submodules/TelegramUI/TelegramUI/ChatHistoryNavigationButtonNode.swift
rename to submodules/TelegramUI/Sources/ChatHistoryNavigationButtonNode.swift
index 6d27116d42..4105b4aeea 100644
--- a/submodules/TelegramUI/TelegramUI/ChatHistoryNavigationButtonNode.swift
+++ b/submodules/TelegramUI/Sources/ChatHistoryNavigationButtonNode.swift
@@ -89,6 +89,7 @@ class ChatHistoryNavigationButtonNode: ASControlNode {
             
             if let string = self.badgeTextNode.attributedText?.string {
                 self.badgeTextNode.attributedText = NSAttributedString(string: string, font: badgeFont, textColor: theme.chat.historyNavigation.badgeTextColor)
+                self.badgeTextNode.redrawIfPossible()
             }
         }
     }
diff --git a/submodules/TelegramUI/TelegramUI/ChatHistoryNavigationButtons.swift b/submodules/TelegramUI/Sources/ChatHistoryNavigationButtons.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/ChatHistoryNavigationButtons.swift
rename to submodules/TelegramUI/Sources/ChatHistoryNavigationButtons.swift
diff --git a/submodules/TelegramUI/TelegramUI/ChatHistoryNavigationStack.swift b/submodules/TelegramUI/Sources/ChatHistoryNavigationStack.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/ChatHistoryNavigationStack.swift
rename to submodules/TelegramUI/Sources/ChatHistoryNavigationStack.swift
diff --git a/submodules/TelegramUI/TelegramUI/ChatHistoryNode.swift b/submodules/TelegramUI/Sources/ChatHistoryNode.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/ChatHistoryNode.swift
rename to submodules/TelegramUI/Sources/ChatHistoryNode.swift
diff --git a/submodules/TelegramUI/TelegramUI/ChatHistorySearchContainerNode.swift b/submodules/TelegramUI/Sources/ChatHistorySearchContainerNode.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/ChatHistorySearchContainerNode.swift
rename to submodules/TelegramUI/Sources/ChatHistorySearchContainerNode.swift
diff --git a/submodules/TelegramUI/TelegramUI/ChatHistoryViewForLocation.swift b/submodules/TelegramUI/Sources/ChatHistoryViewForLocation.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/ChatHistoryViewForLocation.swift
rename to submodules/TelegramUI/Sources/ChatHistoryViewForLocation.swift
diff --git a/submodules/TelegramUI/TelegramUI/ChatHoleItem.swift b/submodules/TelegramUI/Sources/ChatHoleItem.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/ChatHoleItem.swift
rename to submodules/TelegramUI/Sources/ChatHoleItem.swift
diff --git a/submodules/TelegramUI/TelegramUI/ChatInfo.swift b/submodules/TelegramUI/Sources/ChatInfo.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/ChatInfo.swift
rename to submodules/TelegramUI/Sources/ChatInfo.swift
diff --git a/submodules/TelegramUI/TelegramUI/ChatInfoTitlePanelNode.swift b/submodules/TelegramUI/Sources/ChatInfoTitlePanelNode.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/ChatInfoTitlePanelNode.swift
rename to submodules/TelegramUI/Sources/ChatInfoTitlePanelNode.swift
diff --git a/submodules/TelegramUI/TelegramUI/ChatInputContextPanelNode.swift b/submodules/TelegramUI/Sources/ChatInputContextPanelNode.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/ChatInputContextPanelNode.swift
rename to submodules/TelegramUI/Sources/ChatInputContextPanelNode.swift
diff --git a/submodules/TelegramUI/TelegramUI/ChatInputNode.swift b/submodules/TelegramUI/Sources/ChatInputNode.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/ChatInputNode.swift
rename to submodules/TelegramUI/Sources/ChatInputNode.swift
diff --git a/submodules/TelegramUI/TelegramUI/ChatInputPanelNode.swift b/submodules/TelegramUI/Sources/ChatInputPanelNode.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/ChatInputPanelNode.swift
rename to submodules/TelegramUI/Sources/ChatInputPanelNode.swift
diff --git a/submodules/TelegramUI/TelegramUI/ChatInstantVideoMessageDurationNode.swift b/submodules/TelegramUI/Sources/ChatInstantVideoMessageDurationNode.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/ChatInstantVideoMessageDurationNode.swift
rename to submodules/TelegramUI/Sources/ChatInstantVideoMessageDurationNode.swift
diff --git a/submodules/TelegramUI/TelegramUI/ChatInterfaceInputContextPanels.swift b/submodules/TelegramUI/Sources/ChatInterfaceInputContextPanels.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/ChatInterfaceInputContextPanels.swift
rename to submodules/TelegramUI/Sources/ChatInterfaceInputContextPanels.swift
diff --git a/submodules/TelegramUI/TelegramUI/ChatInterfaceInputContexts.swift b/submodules/TelegramUI/Sources/ChatInterfaceInputContexts.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/ChatInterfaceInputContexts.swift
rename to submodules/TelegramUI/Sources/ChatInterfaceInputContexts.swift
diff --git a/submodules/TelegramUI/TelegramUI/ChatInterfaceInputNodes.swift b/submodules/TelegramUI/Sources/ChatInterfaceInputNodes.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/ChatInterfaceInputNodes.swift
rename to submodules/TelegramUI/Sources/ChatInterfaceInputNodes.swift
diff --git a/submodules/TelegramUI/TelegramUI/ChatInterfaceState.swift b/submodules/TelegramUI/Sources/ChatInterfaceState.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/ChatInterfaceState.swift
rename to submodules/TelegramUI/Sources/ChatInterfaceState.swift
diff --git a/submodules/TelegramUI/TelegramUI/ChatInterfaceStateAccessoryPanels.swift b/submodules/TelegramUI/Sources/ChatInterfaceStateAccessoryPanels.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/ChatInterfaceStateAccessoryPanels.swift
rename to submodules/TelegramUI/Sources/ChatInterfaceStateAccessoryPanels.swift
diff --git a/submodules/TelegramUI/TelegramUI/ChatInterfaceStateContextMenus.swift b/submodules/TelegramUI/Sources/ChatInterfaceStateContextMenus.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/ChatInterfaceStateContextMenus.swift
rename to submodules/TelegramUI/Sources/ChatInterfaceStateContextMenus.swift
diff --git a/submodules/TelegramUI/TelegramUI/ChatInterfaceStateContextQueries.swift b/submodules/TelegramUI/Sources/ChatInterfaceStateContextQueries.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/ChatInterfaceStateContextQueries.swift
rename to submodules/TelegramUI/Sources/ChatInterfaceStateContextQueries.swift
diff --git a/submodules/TelegramUI/TelegramUI/ChatInterfaceStateInputPanels.swift b/submodules/TelegramUI/Sources/ChatInterfaceStateInputPanels.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/ChatInterfaceStateInputPanels.swift
rename to submodules/TelegramUI/Sources/ChatInterfaceStateInputPanels.swift
diff --git a/submodules/TelegramUI/TelegramUI/ChatInterfaceStateNavigationButtons.swift b/submodules/TelegramUI/Sources/ChatInterfaceStateNavigationButtons.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/ChatInterfaceStateNavigationButtons.swift
rename to submodules/TelegramUI/Sources/ChatInterfaceStateNavigationButtons.swift
diff --git a/submodules/TelegramUI/TelegramUI/ChatInterfaceTitlePanelNodes.swift b/submodules/TelegramUI/Sources/ChatInterfaceTitlePanelNodes.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/ChatInterfaceTitlePanelNodes.swift
rename to submodules/TelegramUI/Sources/ChatInterfaceTitlePanelNodes.swift
diff --git a/submodules/TelegramUI/TelegramUI/ChatLinkPreview.swift b/submodules/TelegramUI/Sources/ChatLinkPreview.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/ChatLinkPreview.swift
rename to submodules/TelegramUI/Sources/ChatLinkPreview.swift
diff --git a/submodules/TelegramUI/TelegramUI/ChatLoadingNode.swift b/submodules/TelegramUI/Sources/ChatLoadingNode.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/ChatLoadingNode.swift
rename to submodules/TelegramUI/Sources/ChatLoadingNode.swift
diff --git a/submodules/TelegramUI/TelegramUI/ChatMediaInputGifPane.swift b/submodules/TelegramUI/Sources/ChatMediaInputGifPane.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/ChatMediaInputGifPane.swift
rename to submodules/TelegramUI/Sources/ChatMediaInputGifPane.swift
diff --git a/submodules/TelegramUI/TelegramUI/ChatMediaInputGridEntries.swift b/submodules/TelegramUI/Sources/ChatMediaInputGridEntries.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/ChatMediaInputGridEntries.swift
rename to submodules/TelegramUI/Sources/ChatMediaInputGridEntries.swift
diff --git a/submodules/TelegramUI/TelegramUI/ChatMediaInputMetaSectionItemNode.swift b/submodules/TelegramUI/Sources/ChatMediaInputMetaSectionItemNode.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/ChatMediaInputMetaSectionItemNode.swift
rename to submodules/TelegramUI/Sources/ChatMediaInputMetaSectionItemNode.swift
diff --git a/submodules/TelegramUI/TelegramUI/ChatMediaInputNode.swift b/submodules/TelegramUI/Sources/ChatMediaInputNode.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/ChatMediaInputNode.swift
rename to submodules/TelegramUI/Sources/ChatMediaInputNode.swift
diff --git a/submodules/TelegramUI/TelegramUI/ChatMediaInputPane.swift b/submodules/TelegramUI/Sources/ChatMediaInputPane.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/ChatMediaInputPane.swift
rename to submodules/TelegramUI/Sources/ChatMediaInputPane.swift
diff --git a/submodules/TelegramUI/TelegramUI/ChatMediaInputPanelEntries.swift b/submodules/TelegramUI/Sources/ChatMediaInputPanelEntries.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/ChatMediaInputPanelEntries.swift
rename to submodules/TelegramUI/Sources/ChatMediaInputPanelEntries.swift
diff --git a/submodules/TelegramUI/TelegramUI/ChatMediaInputPeerSpecificItem.swift b/submodules/TelegramUI/Sources/ChatMediaInputPeerSpecificItem.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/ChatMediaInputPeerSpecificItem.swift
rename to submodules/TelegramUI/Sources/ChatMediaInputPeerSpecificItem.swift
diff --git a/submodules/TelegramUI/TelegramUI/ChatMediaInputRecentGifsItem.swift b/submodules/TelegramUI/Sources/ChatMediaInputRecentGifsItem.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/ChatMediaInputRecentGifsItem.swift
rename to submodules/TelegramUI/Sources/ChatMediaInputRecentGifsItem.swift
diff --git a/submodules/TelegramUI/TelegramUI/ChatMediaInputSettingsItem.swift b/submodules/TelegramUI/Sources/ChatMediaInputSettingsItem.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/ChatMediaInputSettingsItem.swift
rename to submodules/TelegramUI/Sources/ChatMediaInputSettingsItem.swift
diff --git a/submodules/TelegramUI/TelegramUI/ChatMediaInputStickerGridItem.swift b/submodules/TelegramUI/Sources/ChatMediaInputStickerGridItem.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/ChatMediaInputStickerGridItem.swift
rename to submodules/TelegramUI/Sources/ChatMediaInputStickerGridItem.swift
diff --git a/submodules/TelegramUI/TelegramUI/ChatMediaInputStickerPackItem.swift b/submodules/TelegramUI/Sources/ChatMediaInputStickerPackItem.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/ChatMediaInputStickerPackItem.swift
rename to submodules/TelegramUI/Sources/ChatMediaInputStickerPackItem.swift
diff --git a/submodules/TelegramUI/TelegramUI/ChatMediaInputStickerPane.swift b/submodules/TelegramUI/Sources/ChatMediaInputStickerPane.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/ChatMediaInputStickerPane.swift
rename to submodules/TelegramUI/Sources/ChatMediaInputStickerPane.swift
diff --git a/submodules/TelegramUI/TelegramUI/ChatMediaInputTrendingItem.swift b/submodules/TelegramUI/Sources/ChatMediaInputTrendingItem.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/ChatMediaInputTrendingItem.swift
rename to submodules/TelegramUI/Sources/ChatMediaInputTrendingItem.swift
diff --git a/submodules/TelegramUI/TelegramUI/ChatMediaInputTrendingPane.swift b/submodules/TelegramUI/Sources/ChatMediaInputTrendingPane.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/ChatMediaInputTrendingPane.swift
rename to submodules/TelegramUI/Sources/ChatMediaInputTrendingPane.swift
diff --git a/submodules/TelegramUI/TelegramUI/ChatMessageActionButtonsNode.swift b/submodules/TelegramUI/Sources/ChatMessageActionButtonsNode.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/ChatMessageActionButtonsNode.swift
rename to submodules/TelegramUI/Sources/ChatMessageActionButtonsNode.swift
diff --git a/submodules/TelegramUI/TelegramUI/ChatMessageActionItemNode.swift b/submodules/TelegramUI/Sources/ChatMessageActionItemNode.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/ChatMessageActionItemNode.swift
rename to submodules/TelegramUI/Sources/ChatMessageActionItemNode.swift
diff --git a/submodules/TelegramUI/TelegramUI/ChatMessageActionSheetController.swift b/submodules/TelegramUI/Sources/ChatMessageActionSheetController.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/ChatMessageActionSheetController.swift
rename to submodules/TelegramUI/Sources/ChatMessageActionSheetController.swift
diff --git a/submodules/TelegramUI/TelegramUI/ChatMessageActionSheetControllerNode.swift b/submodules/TelegramUI/Sources/ChatMessageActionSheetControllerNode.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/ChatMessageActionSheetControllerNode.swift
rename to submodules/TelegramUI/Sources/ChatMessageActionSheetControllerNode.swift
diff --git a/submodules/TelegramUI/TelegramUI/ChatMessageActionUrlAuthController.swift b/submodules/TelegramUI/Sources/ChatMessageActionUrlAuthController.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/ChatMessageActionUrlAuthController.swift
rename to submodules/TelegramUI/Sources/ChatMessageActionUrlAuthController.swift
diff --git a/submodules/TelegramUI/TelegramUI/ChatMessageAnimatedStickerItemNode.swift b/submodules/TelegramUI/Sources/ChatMessageAnimatedStickerItemNode.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/ChatMessageAnimatedStickerItemNode.swift
rename to submodules/TelegramUI/Sources/ChatMessageAnimatedStickerItemNode.swift
diff --git a/submodules/TelegramUI/TelegramUI/ChatMessageAttachedContentNode.swift b/submodules/TelegramUI/Sources/ChatMessageAttachedContentNode.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/ChatMessageAttachedContentNode.swift
rename to submodules/TelegramUI/Sources/ChatMessageAttachedContentNode.swift
diff --git a/submodules/TelegramUI/TelegramUI/ChatMessageAvatarAccessoryItem.swift b/submodules/TelegramUI/Sources/ChatMessageAvatarAccessoryItem.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/ChatMessageAvatarAccessoryItem.swift
rename to submodules/TelegramUI/Sources/ChatMessageAvatarAccessoryItem.swift
diff --git a/submodules/TelegramUI/TelegramUI/ChatMessageBackground.swift b/submodules/TelegramUI/Sources/ChatMessageBackground.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/ChatMessageBackground.swift
rename to submodules/TelegramUI/Sources/ChatMessageBackground.swift
diff --git a/submodules/TelegramUI/TelegramUI/ChatMessageBubbleBackdrop.swift b/submodules/TelegramUI/Sources/ChatMessageBubbleBackdrop.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/ChatMessageBubbleBackdrop.swift
rename to submodules/TelegramUI/Sources/ChatMessageBubbleBackdrop.swift
diff --git a/submodules/TelegramUI/TelegramUI/ChatMessageBubbleContentCalclulateImageCorners.swift b/submodules/TelegramUI/Sources/ChatMessageBubbleContentCalclulateImageCorners.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/ChatMessageBubbleContentCalclulateImageCorners.swift
rename to submodules/TelegramUI/Sources/ChatMessageBubbleContentCalclulateImageCorners.swift
diff --git a/submodules/TelegramUI/TelegramUI/ChatMessageBubbleContentNode.swift b/submodules/TelegramUI/Sources/ChatMessageBubbleContentNode.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/ChatMessageBubbleContentNode.swift
rename to submodules/TelegramUI/Sources/ChatMessageBubbleContentNode.swift
diff --git a/submodules/TelegramUI/TelegramUI/ChatMessageBubbleItemNode.swift b/submodules/TelegramUI/Sources/ChatMessageBubbleItemNode.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/ChatMessageBubbleItemNode.swift
rename to submodules/TelegramUI/Sources/ChatMessageBubbleItemNode.swift
diff --git a/submodules/TelegramUI/TelegramUI/ChatMessageCallBubbleContentNode.swift b/submodules/TelegramUI/Sources/ChatMessageCallBubbleContentNode.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/ChatMessageCallBubbleContentNode.swift
rename to submodules/TelegramUI/Sources/ChatMessageCallBubbleContentNode.swift
diff --git a/submodules/TelegramUI/TelegramUI/ChatMessageContactBubbleContentNode.swift b/submodules/TelegramUI/Sources/ChatMessageContactBubbleContentNode.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/ChatMessageContactBubbleContentNode.swift
rename to submodules/TelegramUI/Sources/ChatMessageContactBubbleContentNode.swift
diff --git a/submodules/TelegramUI/TelegramUI/ChatMessageContextControllerContentSource.swift b/submodules/TelegramUI/Sources/ChatMessageContextControllerContentSource.swift
similarity index 97%
rename from submodules/TelegramUI/TelegramUI/ChatMessageContextControllerContentSource.swift
rename to submodules/TelegramUI/Sources/ChatMessageContextControllerContentSource.swift
index 2b3bf7c229..a307509514 100644
--- a/submodules/TelegramUI/TelegramUI/ChatMessageContextControllerContentSource.swift
+++ b/submodules/TelegramUI/Sources/ChatMessageContextControllerContentSource.swift
@@ -6,6 +6,7 @@ import Postbox
 
 final class ChatMessageContextExtractedContentSource: ContextExtractedContentSource {
     let keepInPlace: Bool = false
+    let ignoreContentTouches: Bool = false
     
     private weak var chatNode: ChatControllerNode?
     private let message: Message
diff --git a/submodules/TelegramUI/TelegramUI/ChatMessageDateAndStatusNode.swift b/submodules/TelegramUI/Sources/ChatMessageDateAndStatusNode.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/ChatMessageDateAndStatusNode.swift
rename to submodules/TelegramUI/Sources/ChatMessageDateAndStatusNode.swift
diff --git a/submodules/TelegramUI/TelegramUI/ChatMessageDateHeader.swift b/submodules/TelegramUI/Sources/ChatMessageDateHeader.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/ChatMessageDateHeader.swift
rename to submodules/TelegramUI/Sources/ChatMessageDateHeader.swift
diff --git a/submodules/TelegramUI/TelegramUI/ChatMessageDeliveryFailedNode.swift b/submodules/TelegramUI/Sources/ChatMessageDeliveryFailedNode.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/ChatMessageDeliveryFailedNode.swift
rename to submodules/TelegramUI/Sources/ChatMessageDeliveryFailedNode.swift
diff --git a/submodules/TelegramUI/TelegramUI/ChatMessageEventLogPreviousDescriptionContentNode.swift b/submodules/TelegramUI/Sources/ChatMessageEventLogPreviousDescriptionContentNode.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/ChatMessageEventLogPreviousDescriptionContentNode.swift
rename to submodules/TelegramUI/Sources/ChatMessageEventLogPreviousDescriptionContentNode.swift
diff --git a/submodules/TelegramUI/TelegramUI/ChatMessageEventLogPreviousLinkContentNode.swift b/submodules/TelegramUI/Sources/ChatMessageEventLogPreviousLinkContentNode.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/ChatMessageEventLogPreviousLinkContentNode.swift
rename to submodules/TelegramUI/Sources/ChatMessageEventLogPreviousLinkContentNode.swift
diff --git a/submodules/TelegramUI/TelegramUI/ChatMessageEventLogPreviousMessageContentNode.swift b/submodules/TelegramUI/Sources/ChatMessageEventLogPreviousMessageContentNode.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/ChatMessageEventLogPreviousMessageContentNode.swift
rename to submodules/TelegramUI/Sources/ChatMessageEventLogPreviousMessageContentNode.swift
diff --git a/submodules/TelegramUI/TelegramUI/ChatMessageFileBubbleContentNode.swift b/submodules/TelegramUI/Sources/ChatMessageFileBubbleContentNode.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/ChatMessageFileBubbleContentNode.swift
rename to submodules/TelegramUI/Sources/ChatMessageFileBubbleContentNode.swift
diff --git a/submodules/TelegramUI/TelegramUI/ChatMessageForwardInfoNode.swift b/submodules/TelegramUI/Sources/ChatMessageForwardInfoNode.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/ChatMessageForwardInfoNode.swift
rename to submodules/TelegramUI/Sources/ChatMessageForwardInfoNode.swift
diff --git a/submodules/TelegramUI/TelegramUI/ChatMessageGameBubbleContentNode.swift b/submodules/TelegramUI/Sources/ChatMessageGameBubbleContentNode.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/ChatMessageGameBubbleContentNode.swift
rename to submodules/TelegramUI/Sources/ChatMessageGameBubbleContentNode.swift
diff --git a/submodules/TelegramUI/TelegramUI/ChatMessageInstantVideoItemNode.swift b/submodules/TelegramUI/Sources/ChatMessageInstantVideoItemNode.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/ChatMessageInstantVideoItemNode.swift
rename to submodules/TelegramUI/Sources/ChatMessageInstantVideoItemNode.swift
diff --git a/submodules/TelegramUI/TelegramUI/ChatMessageInteractiveFileNode.swift b/submodules/TelegramUI/Sources/ChatMessageInteractiveFileNode.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/ChatMessageInteractiveFileNode.swift
rename to submodules/TelegramUI/Sources/ChatMessageInteractiveFileNode.swift
diff --git a/submodules/TelegramUI/TelegramUI/ChatMessageInteractiveInstantVideoNode.swift b/submodules/TelegramUI/Sources/ChatMessageInteractiveInstantVideoNode.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/ChatMessageInteractiveInstantVideoNode.swift
rename to submodules/TelegramUI/Sources/ChatMessageInteractiveInstantVideoNode.swift
diff --git a/submodules/TelegramUI/TelegramUI/ChatMessageInteractiveMediaBadge.swift b/submodules/TelegramUI/Sources/ChatMessageInteractiveMediaBadge.swift
similarity index 99%
rename from submodules/TelegramUI/TelegramUI/ChatMessageInteractiveMediaBadge.swift
rename to submodules/TelegramUI/Sources/ChatMessageInteractiveMediaBadge.swift
index b713b25614..09ff15c32c 100644
--- a/submodules/TelegramUI/TelegramUI/ChatMessageInteractiveMediaBadge.swift
+++ b/submodules/TelegramUI/Sources/ChatMessageInteractiveMediaBadge.swift
@@ -122,7 +122,7 @@ final class ChatMessageInteractiveMediaBadge: ASDisplayNode {
                         }
                         self.durationNode.attributedText = convertedText
                         let durationSize = self.durationNode.measure(CGSize(width: 160.0, height: 160.0))
-                        self.durationNode.frame = CGRect(x: 7.0 + inset, y: 2.0, width: durationSize.width, height: durationSize.height)
+                        self.durationNode.frame = CGRect(x: 7.0 + inset, y: 3.0, width: durationSize.width, height: durationSize.height)
                         currentContentSize = CGSize(width: widthForString(text.string) + 14.0 + inset, height: 18.0)
                     
                         if let iconNode = self.iconNode {
@@ -188,7 +188,7 @@ final class ChatMessageInteractiveMediaBadge: ASDisplayNode {
                             transition.updateAlpha(node: statusNode, alpha: active ? 1.0 : 0.0)
                         }
                         
-                        let durationFrame = CGRect(x: active ? 42.0 : 7.0, y: active ? 6.0 : 2.0, width: durationSize.width, height: durationSize.height)
+                        let durationFrame = CGRect(x: active ? 42.0 : 7.0, y: active ? 6.0 : 3.0, width: durationSize.width, height: durationSize.height)
                         self.durationNode.bounds = CGRect(origin: CGPoint(), size: durationFrame.size)
                         textTransition.updatePosition(node: self.durationNode, position: durationFrame.center)
                         
diff --git a/submodules/TelegramUI/TelegramUI/ChatMessageInteractiveMediaNode.swift b/submodules/TelegramUI/Sources/ChatMessageInteractiveMediaNode.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/ChatMessageInteractiveMediaNode.swift
rename to submodules/TelegramUI/Sources/ChatMessageInteractiveMediaNode.swift
diff --git a/submodules/TelegramUI/TelegramUI/ChatMessageInvoiceBubbleContentNode.swift b/submodules/TelegramUI/Sources/ChatMessageInvoiceBubbleContentNode.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/ChatMessageInvoiceBubbleContentNode.swift
rename to submodules/TelegramUI/Sources/ChatMessageInvoiceBubbleContentNode.swift
diff --git a/submodules/TelegramUI/TelegramUI/ChatMessageItem.swift b/submodules/TelegramUI/Sources/ChatMessageItem.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/ChatMessageItem.swift
rename to submodules/TelegramUI/Sources/ChatMessageItem.swift
diff --git a/submodules/TelegramUI/TelegramUI/ChatMessageItemView.swift b/submodules/TelegramUI/Sources/ChatMessageItemView.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/ChatMessageItemView.swift
rename to submodules/TelegramUI/Sources/ChatMessageItemView.swift
diff --git a/submodules/TelegramUI/TelegramUI/ChatMessageLiveLocationTextNode.swift b/submodules/TelegramUI/Sources/ChatMessageLiveLocationTextNode.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/ChatMessageLiveLocationTextNode.swift
rename to submodules/TelegramUI/Sources/ChatMessageLiveLocationTextNode.swift
diff --git a/submodules/TelegramUI/TelegramUI/ChatMessageMapBubbleContentNode.swift b/submodules/TelegramUI/Sources/ChatMessageMapBubbleContentNode.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/ChatMessageMapBubbleContentNode.swift
rename to submodules/TelegramUI/Sources/ChatMessageMapBubbleContentNode.swift
diff --git a/submodules/TelegramUI/TelegramUI/ChatMessageMediaBubbleContentNode.swift b/submodules/TelegramUI/Sources/ChatMessageMediaBubbleContentNode.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/ChatMessageMediaBubbleContentNode.swift
rename to submodules/TelegramUI/Sources/ChatMessageMediaBubbleContentNode.swift
diff --git a/submodules/TelegramUI/TelegramUI/ChatMessageNotificationItem.swift b/submodules/TelegramUI/Sources/ChatMessageNotificationItem.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/ChatMessageNotificationItem.swift
rename to submodules/TelegramUI/Sources/ChatMessageNotificationItem.swift
diff --git a/submodules/TelegramUI/TelegramUI/ChatMessagePollBubbleContentNode.swift b/submodules/TelegramUI/Sources/ChatMessagePollBubbleContentNode.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/ChatMessagePollBubbleContentNode.swift
rename to submodules/TelegramUI/Sources/ChatMessagePollBubbleContentNode.swift
diff --git a/submodules/TelegramUI/TelegramUI/ChatMessageReplyInfoNode.swift b/submodules/TelegramUI/Sources/ChatMessageReplyInfoNode.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/ChatMessageReplyInfoNode.swift
rename to submodules/TelegramUI/Sources/ChatMessageReplyInfoNode.swift
diff --git a/submodules/TelegramUI/TelegramUI/ChatMessageRestrictedBubbleContentNode.swift b/submodules/TelegramUI/Sources/ChatMessageRestrictedBubbleContentNode.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/ChatMessageRestrictedBubbleContentNode.swift
rename to submodules/TelegramUI/Sources/ChatMessageRestrictedBubbleContentNode.swift
diff --git a/submodules/TelegramUI/TelegramUI/ChatMessageSelectionInputPanelNode.swift b/submodules/TelegramUI/Sources/ChatMessageSelectionInputPanelNode.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/ChatMessageSelectionInputPanelNode.swift
rename to submodules/TelegramUI/Sources/ChatMessageSelectionInputPanelNode.swift
diff --git a/submodules/TelegramUI/TelegramUI/ChatMessageSelectionNode.swift b/submodules/TelegramUI/Sources/ChatMessageSelectionNode.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/ChatMessageSelectionNode.swift
rename to submodules/TelegramUI/Sources/ChatMessageSelectionNode.swift
diff --git a/submodules/TelegramUI/TelegramUI/ChatMessageStickerItemNode.swift b/submodules/TelegramUI/Sources/ChatMessageStickerItemNode.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/ChatMessageStickerItemNode.swift
rename to submodules/TelegramUI/Sources/ChatMessageStickerItemNode.swift
diff --git a/submodules/TelegramUI/TelegramUI/ChatMessageSwipeToReplyNode.swift b/submodules/TelegramUI/Sources/ChatMessageSwipeToReplyNode.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/ChatMessageSwipeToReplyNode.swift
rename to submodules/TelegramUI/Sources/ChatMessageSwipeToReplyNode.swift
diff --git a/submodules/TelegramUI/TelegramUI/ChatMessageTextBubbleContentNode.swift b/submodules/TelegramUI/Sources/ChatMessageTextBubbleContentNode.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/ChatMessageTextBubbleContentNode.swift
rename to submodules/TelegramUI/Sources/ChatMessageTextBubbleContentNode.swift
diff --git a/submodules/TelegramUI/TelegramUI/ChatMessageThrottledProcessingManager.swift b/submodules/TelegramUI/Sources/ChatMessageThrottledProcessingManager.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/ChatMessageThrottledProcessingManager.swift
rename to submodules/TelegramUI/Sources/ChatMessageThrottledProcessingManager.swift
diff --git a/submodules/TelegramUI/TelegramUI/ChatMessageUnsupportedBubbleContentNode.swift b/submodules/TelegramUI/Sources/ChatMessageUnsupportedBubbleContentNode.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/ChatMessageUnsupportedBubbleContentNode.swift
rename to submodules/TelegramUI/Sources/ChatMessageUnsupportedBubbleContentNode.swift
diff --git a/submodules/TelegramUI/TelegramUI/ChatMessageWebpageBubbleContentNode.swift b/submodules/TelegramUI/Sources/ChatMessageWebpageBubbleContentNode.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/ChatMessageWebpageBubbleContentNode.swift
rename to submodules/TelegramUI/Sources/ChatMessageWebpageBubbleContentNode.swift
diff --git a/submodules/TelegramUI/TelegramUI/ChatOverlayNavigationBar.swift b/submodules/TelegramUI/Sources/ChatOverlayNavigationBar.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/ChatOverlayNavigationBar.swift
rename to submodules/TelegramUI/Sources/ChatOverlayNavigationBar.swift
diff --git a/submodules/TelegramUI/TelegramUI/ChatPanelInterfaceInteraction.swift b/submodules/TelegramUI/Sources/ChatPanelInterfaceInteraction.swift
similarity index 99%
rename from submodules/TelegramUI/TelegramUI/ChatPanelInterfaceInteraction.swift
rename to submodules/TelegramUI/Sources/ChatPanelInterfaceInteraction.swift
index 7aa8bd50b5..4a5406524c 100644
--- a/submodules/TelegramUI/TelegramUI/ChatPanelInterfaceInteraction.swift
+++ b/submodules/TelegramUI/Sources/ChatPanelInterfaceInteraction.swift
@@ -1,5 +1,6 @@
 import Foundation
 import UIKit
+import AsyncDisplayKit
 import Postbox
 import SwiftSignalKit
 import TelegramCore
diff --git a/submodules/TelegramUI/TelegramUI/ChatPinnedMessageTitlePanelNode.swift b/submodules/TelegramUI/Sources/ChatPinnedMessageTitlePanelNode.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/ChatPinnedMessageTitlePanelNode.swift
rename to submodules/TelegramUI/Sources/ChatPinnedMessageTitlePanelNode.swift
diff --git a/submodules/TelegramUI/TelegramUI/ChatPresentationData.swift b/submodules/TelegramUI/Sources/ChatPresentationData.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/ChatPresentationData.swift
rename to submodules/TelegramUI/Sources/ChatPresentationData.swift
diff --git a/submodules/TelegramUI/TelegramUI/ChatPresentationInterfaceState.swift b/submodules/TelegramUI/Sources/ChatPresentationInterfaceState.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/ChatPresentationInterfaceState.swift
rename to submodules/TelegramUI/Sources/ChatPresentationInterfaceState.swift
diff --git a/submodules/TelegramUI/TelegramUI/ChatRecentActionsController.swift b/submodules/TelegramUI/Sources/ChatRecentActionsController.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/ChatRecentActionsController.swift
rename to submodules/TelegramUI/Sources/ChatRecentActionsController.swift
diff --git a/submodules/TelegramUI/TelegramUI/ChatRecentActionsControllerNode.swift b/submodules/TelegramUI/Sources/ChatRecentActionsControllerNode.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/ChatRecentActionsControllerNode.swift
rename to submodules/TelegramUI/Sources/ChatRecentActionsControllerNode.swift
diff --git a/submodules/TelegramUI/TelegramUI/ChatRecentActionsControllerState.swift b/submodules/TelegramUI/Sources/ChatRecentActionsControllerState.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/ChatRecentActionsControllerState.swift
rename to submodules/TelegramUI/Sources/ChatRecentActionsControllerState.swift
diff --git a/submodules/TelegramUI/TelegramUI/ChatRecentActionsEmptyNode.swift b/submodules/TelegramUI/Sources/ChatRecentActionsEmptyNode.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/ChatRecentActionsEmptyNode.swift
rename to submodules/TelegramUI/Sources/ChatRecentActionsEmptyNode.swift
diff --git a/submodules/TelegramUI/TelegramUI/ChatRecentActionsFilterController.swift b/submodules/TelegramUI/Sources/ChatRecentActionsFilterController.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/ChatRecentActionsFilterController.swift
rename to submodules/TelegramUI/Sources/ChatRecentActionsFilterController.swift
diff --git a/submodules/TelegramUI/TelegramUI/ChatRecentActionsHistoryTransition.swift b/submodules/TelegramUI/Sources/ChatRecentActionsHistoryTransition.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/ChatRecentActionsHistoryTransition.swift
rename to submodules/TelegramUI/Sources/ChatRecentActionsHistoryTransition.swift
diff --git a/submodules/TelegramUI/TelegramUI/ChatRecentActionsInteraction.swift b/submodules/TelegramUI/Sources/ChatRecentActionsInteraction.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/ChatRecentActionsInteraction.swift
rename to submodules/TelegramUI/Sources/ChatRecentActionsInteraction.swift
diff --git a/submodules/TelegramUI/TelegramUI/ChatRecentActionsSearchNavigationContentNode.swift b/submodules/TelegramUI/Sources/ChatRecentActionsSearchNavigationContentNode.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/ChatRecentActionsSearchNavigationContentNode.swift
rename to submodules/TelegramUI/Sources/ChatRecentActionsSearchNavigationContentNode.swift
diff --git a/submodules/TelegramUI/TelegramUI/ChatRecentActionsTitleView.swift b/submodules/TelegramUI/Sources/ChatRecentActionsTitleView.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/ChatRecentActionsTitleView.swift
rename to submodules/TelegramUI/Sources/ChatRecentActionsTitleView.swift
diff --git a/submodules/TelegramUI/TelegramUI/ChatRecordingPreviewInputPanelNode.swift b/submodules/TelegramUI/Sources/ChatRecordingPreviewInputPanelNode.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/ChatRecordingPreviewInputPanelNode.swift
rename to submodules/TelegramUI/Sources/ChatRecordingPreviewInputPanelNode.swift
diff --git a/submodules/TelegramUI/TelegramUI/ChatReportPeerTitlePanelNode.swift b/submodules/TelegramUI/Sources/ChatReportPeerTitlePanelNode.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/ChatReportPeerTitlePanelNode.swift
rename to submodules/TelegramUI/Sources/ChatReportPeerTitlePanelNode.swift
diff --git a/submodules/TelegramUI/TelegramUI/ChatRequestInProgressTitlePanelNode.swift b/submodules/TelegramUI/Sources/ChatRequestInProgressTitlePanelNode.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/ChatRequestInProgressTitlePanelNode.swift
rename to submodules/TelegramUI/Sources/ChatRequestInProgressTitlePanelNode.swift
diff --git a/submodules/TelegramUI/TelegramUI/ChatRestrictedInputPanelNode.swift b/submodules/TelegramUI/Sources/ChatRestrictedInputPanelNode.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/ChatRestrictedInputPanelNode.swift
rename to submodules/TelegramUI/Sources/ChatRestrictedInputPanelNode.swift
diff --git a/submodules/TelegramUI/TelegramUI/ChatRestrictedNode.swift b/submodules/TelegramUI/Sources/ChatRestrictedNode.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/ChatRestrictedNode.swift
rename to submodules/TelegramUI/Sources/ChatRestrictedNode.swift
diff --git a/submodules/TelegramUI/TelegramUI/ChatScheduleTimeController.swift b/submodules/TelegramUI/Sources/ChatScheduleTimeController.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/ChatScheduleTimeController.swift
rename to submodules/TelegramUI/Sources/ChatScheduleTimeController.swift
diff --git a/submodules/TelegramUI/TelegramUI/ChatScheduleTimeControllerNode.swift b/submodules/TelegramUI/Sources/ChatScheduleTimeControllerNode.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/ChatScheduleTimeControllerNode.swift
rename to submodules/TelegramUI/Sources/ChatScheduleTimeControllerNode.swift
diff --git a/submodules/TelegramUI/TelegramUI/ChatSearchInputPanelNode.swift b/submodules/TelegramUI/Sources/ChatSearchInputPanelNode.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/ChatSearchInputPanelNode.swift
rename to submodules/TelegramUI/Sources/ChatSearchInputPanelNode.swift
diff --git a/submodules/TelegramUI/TelegramUI/ChatSearchNavigationContentNode.swift b/submodules/TelegramUI/Sources/ChatSearchNavigationContentNode.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/ChatSearchNavigationContentNode.swift
rename to submodules/TelegramUI/Sources/ChatSearchNavigationContentNode.swift
diff --git a/submodules/TelegramUI/TelegramUI/ChatSearchResultsContollerNode.swift b/submodules/TelegramUI/Sources/ChatSearchResultsContollerNode.swift
similarity index 99%
rename from submodules/TelegramUI/TelegramUI/ChatSearchResultsContollerNode.swift
rename to submodules/TelegramUI/Sources/ChatSearchResultsContollerNode.swift
index 227af409ed..a145a020e6 100644
--- a/submodules/TelegramUI/TelegramUI/ChatSearchResultsContollerNode.swift
+++ b/submodules/TelegramUI/Sources/ChatSearchResultsContollerNode.swift
@@ -170,6 +170,7 @@ class ChatSearchResultsControllerNode: ViewControllerTracingNode, UIScrollViewDe
         }, peerSelected: { _ in
         }, disabledPeerSelected: { _ in
         }, togglePeerSelected: { _ in
+        }, additionalCategorySelected: { _ in
         }, messageSelected: { [weak self] peer, message, _ in
             if let strongSelf = self {
                 if let index = strongSelf.searchResult.messages.firstIndex(where: { $0.index == message.index }) {
@@ -178,7 +179,7 @@ class ChatSearchResultsControllerNode: ViewControllerTracingNode, UIScrollViewDe
                 strongSelf.listNode.clearHighlightAnimated(true)
             }
         }, groupSelected: { _ in
-        }, addContact: { [weak self] phoneNumber in
+        }, addContact: { _ in
         }, setPeerIdWithRevealedOptions: { _, _ in
         }, setItemPinned: { _, _ in
         }, setPeerMuted: { _, _ in
diff --git a/submodules/TelegramUI/TelegramUI/ChatSearchResultsController.swift b/submodules/TelegramUI/Sources/ChatSearchResultsController.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/ChatSearchResultsController.swift
rename to submodules/TelegramUI/Sources/ChatSearchResultsController.swift
diff --git a/submodules/TelegramUI/TelegramUI/ChatSearchState.swift b/submodules/TelegramUI/Sources/ChatSearchState.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/ChatSearchState.swift
rename to submodules/TelegramUI/Sources/ChatSearchState.swift
diff --git a/submodules/TelegramUI/TelegramUI/ChatSecretAutoremoveTimerActionSheet.swift b/submodules/TelegramUI/Sources/ChatSecretAutoremoveTimerActionSheet.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/ChatSecretAutoremoveTimerActionSheet.swift
rename to submodules/TelegramUI/Sources/ChatSecretAutoremoveTimerActionSheet.swift
diff --git a/submodules/TelegramUI/TelegramUI/ChatSendButtonRadialStatusNode.swift b/submodules/TelegramUI/Sources/ChatSendButtonRadialStatusNode.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/ChatSendButtonRadialStatusNode.swift
rename to submodules/TelegramUI/Sources/ChatSendButtonRadialStatusNode.swift
diff --git a/submodules/TelegramUI/TelegramUI/ChatSendMessageActionSheetController.swift b/submodules/TelegramUI/Sources/ChatSendMessageActionSheetController.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/ChatSendMessageActionSheetController.swift
rename to submodules/TelegramUI/Sources/ChatSendMessageActionSheetController.swift
diff --git a/submodules/TelegramUI/TelegramUI/ChatSendMessageActionSheetControllerNode.swift b/submodules/TelegramUI/Sources/ChatSendMessageActionSheetControllerNode.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/ChatSendMessageActionSheetControllerNode.swift
rename to submodules/TelegramUI/Sources/ChatSendMessageActionSheetControllerNode.swift
diff --git a/submodules/TelegramUI/TelegramUI/ChatSlowmodeHintController.swift b/submodules/TelegramUI/Sources/ChatSlowmodeHintController.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/ChatSlowmodeHintController.swift
rename to submodules/TelegramUI/Sources/ChatSlowmodeHintController.swift
diff --git a/submodules/TelegramUI/TelegramUI/ChatSwipeToReplyRecognizer.swift b/submodules/TelegramUI/Sources/ChatSwipeToReplyRecognizer.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/ChatSwipeToReplyRecognizer.swift
rename to submodules/TelegramUI/Sources/ChatSwipeToReplyRecognizer.swift
diff --git a/submodules/TelegramUI/TelegramUI/ChatTextFormat.swift b/submodules/TelegramUI/Sources/ChatTextFormat.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/ChatTextFormat.swift
rename to submodules/TelegramUI/Sources/ChatTextFormat.swift
diff --git a/submodules/TelegramUI/TelegramUI/ChatTextInputAccessoryItem.swift b/submodules/TelegramUI/Sources/ChatTextInputAccessoryItem.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/ChatTextInputAccessoryItem.swift
rename to submodules/TelegramUI/Sources/ChatTextInputAccessoryItem.swift
diff --git a/submodules/TelegramUI/TelegramUI/ChatTextInputActionButtonsNode.swift b/submodules/TelegramUI/Sources/ChatTextInputActionButtonsNode.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/ChatTextInputActionButtonsNode.swift
rename to submodules/TelegramUI/Sources/ChatTextInputActionButtonsNode.swift
diff --git a/submodules/TelegramUI/TelegramUI/ChatTextInputAudioRecordingCancelIndicator.swift b/submodules/TelegramUI/Sources/ChatTextInputAudioRecordingCancelIndicator.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/ChatTextInputAudioRecordingCancelIndicator.swift
rename to submodules/TelegramUI/Sources/ChatTextInputAudioRecordingCancelIndicator.swift
diff --git a/submodules/TelegramUI/TelegramUI/ChatTextInputAudioRecordingOverlayButton.swift b/submodules/TelegramUI/Sources/ChatTextInputAudioRecordingOverlayButton.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/ChatTextInputAudioRecordingOverlayButton.swift
rename to submodules/TelegramUI/Sources/ChatTextInputAudioRecordingOverlayButton.swift
diff --git a/submodules/TelegramUI/TelegramUI/ChatTextInputAudioRecordingTimeNode.swift b/submodules/TelegramUI/Sources/ChatTextInputAudioRecordingTimeNode.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/ChatTextInputAudioRecordingTimeNode.swift
rename to submodules/TelegramUI/Sources/ChatTextInputAudioRecordingTimeNode.swift
diff --git a/submodules/TelegramUI/TelegramUI/ChatTextInputMediaRecordingButton.swift b/submodules/TelegramUI/Sources/ChatTextInputMediaRecordingButton.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/ChatTextInputMediaRecordingButton.swift
rename to submodules/TelegramUI/Sources/ChatTextInputMediaRecordingButton.swift
diff --git a/submodules/TelegramUI/TelegramUI/ChatTextInputMenu.swift b/submodules/TelegramUI/Sources/ChatTextInputMenu.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/ChatTextInputMenu.swift
rename to submodules/TelegramUI/Sources/ChatTextInputMenu.swift
diff --git a/submodules/TelegramUI/TelegramUI/ChatTextInputPanelNode.swift b/submodules/TelegramUI/Sources/ChatTextInputPanelNode.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/ChatTextInputPanelNode.swift
rename to submodules/TelegramUI/Sources/ChatTextInputPanelNode.swift
diff --git a/submodules/TelegramUI/TelegramUI/ChatTextInputPanelState.swift b/submodules/TelegramUI/Sources/ChatTextInputPanelState.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/ChatTextInputPanelState.swift
rename to submodules/TelegramUI/Sources/ChatTextInputPanelState.swift
diff --git a/submodules/TelegramUI/TelegramUI/ChatTextInputSlowmodePlaceholderNode.swift b/submodules/TelegramUI/Sources/ChatTextInputSlowmodePlaceholderNode.swift
similarity index 99%
rename from submodules/TelegramUI/TelegramUI/ChatTextInputSlowmodePlaceholderNode.swift
rename to submodules/TelegramUI/Sources/ChatTextInputSlowmodePlaceholderNode.swift
index 8249baab92..61ecdd6962 100644
--- a/submodules/TelegramUI/TelegramUI/ChatTextInputSlowmodePlaceholderNode.swift
+++ b/submodules/TelegramUI/Sources/ChatTextInputSlowmodePlaceholderNode.swift
@@ -1,4 +1,6 @@
 import Foundation
+import UIKit
+import AsyncDisplayKit
 import Display
 import SwiftSignalKit
 import TelegramPresentationData
diff --git a/submodules/TelegramUI/TelegramUI/ChatTextLinkEditController.swift b/submodules/TelegramUI/Sources/ChatTextLinkEditController.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/ChatTextLinkEditController.swift
rename to submodules/TelegramUI/Sources/ChatTextLinkEditController.swift
diff --git a/submodules/TelegramUI/TelegramUI/ChatTitleAccessoryPanelNode.swift b/submodules/TelegramUI/Sources/ChatTitleAccessoryPanelNode.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/ChatTitleAccessoryPanelNode.swift
rename to submodules/TelegramUI/Sources/ChatTitleAccessoryPanelNode.swift
diff --git a/submodules/TelegramUI/TelegramUI/ChatTitleView.swift b/submodules/TelegramUI/Sources/ChatTitleView.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/ChatTitleView.swift
rename to submodules/TelegramUI/Sources/ChatTitleView.swift
diff --git a/submodules/TelegramUI/TelegramUI/ChatToastAlertPanelNode.swift b/submodules/TelegramUI/Sources/ChatToastAlertPanelNode.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/ChatToastAlertPanelNode.swift
rename to submodules/TelegramUI/Sources/ChatToastAlertPanelNode.swift
diff --git a/submodules/TelegramUI/TelegramUI/ChatUnblockInputPanelNode.swift b/submodules/TelegramUI/Sources/ChatUnblockInputPanelNode.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/ChatUnblockInputPanelNode.swift
rename to submodules/TelegramUI/Sources/ChatUnblockInputPanelNode.swift
diff --git a/submodules/TelegramUI/TelegramUI/ChatUnreadItem.swift b/submodules/TelegramUI/Sources/ChatUnreadItem.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/ChatUnreadItem.swift
rename to submodules/TelegramUI/Sources/ChatUnreadItem.swift
diff --git a/submodules/TelegramUI/TelegramUI/CheckDiskSpace.swift b/submodules/TelegramUI/Sources/CheckDiskSpace.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/CheckDiskSpace.swift
rename to submodules/TelegramUI/Sources/CheckDiskSpace.swift
diff --git a/submodules/TelegramUI/TelegramUI/ClearNotificationsManager.swift b/submodules/TelegramUI/Sources/ClearNotificationsManager.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/ClearNotificationsManager.swift
rename to submodules/TelegramUI/Sources/ClearNotificationsManager.swift
diff --git a/submodules/TelegramUI/TelegramUI/CommandChatInputContextPanelNode.swift b/submodules/TelegramUI/Sources/CommandChatInputContextPanelNode.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/CommandChatInputContextPanelNode.swift
rename to submodules/TelegramUI/Sources/CommandChatInputContextPanelNode.swift
diff --git a/submodules/TelegramUI/TelegramUI/CommandChatInputPanelItem.swift b/submodules/TelegramUI/Sources/CommandChatInputPanelItem.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/CommandChatInputPanelItem.swift
rename to submodules/TelegramUI/Sources/CommandChatInputPanelItem.swift
diff --git a/submodules/TelegramUI/TelegramUI/ComposeController.swift b/submodules/TelegramUI/Sources/ComposeController.swift
similarity index 98%
rename from submodules/TelegramUI/TelegramUI/ComposeController.swift
rename to submodules/TelegramUI/Sources/ComposeController.swift
index bf8741570a..4c760f3562 100644
--- a/submodules/TelegramUI/TelegramUI/ComposeController.swift
+++ b/submodules/TelegramUI/Sources/ComposeController.swift
@@ -131,7 +131,12 @@ public class ComposeController: ViewController {
                     }
                 })
                 strongSelf.createActionDisposable.set((controller.result
-                |> deliverOnMainQueue).start(next: { [weak controller] peerIds in
+                |> deliverOnMainQueue).start(next: { [weak controller] result in
+                    var peerIds: [ContactListPeerId] = []
+                    if case let .result(peerIdsValue, _) = result {
+                        peerIds = peerIdsValue
+                    }
+                    
                     if let strongSelf = self, let controller = controller {
                         let createGroup = strongSelf.context.sharedContext.makeCreateGroupController(context: strongSelf.context, peerIds: peerIds.compactMap({ peerId in
                             if case let .peer(peerId) = peerId {
diff --git a/submodules/TelegramUI/TelegramUI/ComposeControllerNode.swift b/submodules/TelegramUI/Sources/ComposeControllerNode.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/ComposeControllerNode.swift
rename to submodules/TelegramUI/Sources/ComposeControllerNode.swift
diff --git a/submodules/TelegramUI/TelegramUI/ConfettiView.swift b/submodules/TelegramUI/Sources/ConfettiView.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/ConfettiView.swift
rename to submodules/TelegramUI/Sources/ConfettiView.swift
diff --git a/submodules/TelegramUI/TelegramUI/ContactMultiselectionController.swift b/submodules/TelegramUI/Sources/ContactMultiselectionController.swift
similarity index 50%
rename from submodules/TelegramUI/TelegramUI/ContactMultiselectionController.swift
rename to submodules/TelegramUI/Sources/ContactMultiselectionController.swift
index 0e48b3d6f4..475d623841 100644
--- a/submodules/TelegramUI/TelegramUI/ContactMultiselectionController.swift
+++ b/submodules/TelegramUI/Sources/ContactMultiselectionController.swift
@@ -15,6 +15,7 @@ import ContactListUI
 import CounterContollerTitleView
 
 class ContactMultiselectionControllerImpl: ViewController, ContactMultiselectionController {
+    private let params: ContactMultiselectionControllerParams
     private let context: AccountContext
     private let mode: ContactMultiselectionControllerMode
     
@@ -30,13 +31,14 @@ class ContactMultiselectionControllerImpl: ViewController, ContactMultiselection
     
     private var _ready = Promise<Bool>()
     private var _limitsReady = Promise<Bool>()
+    private var _peersReady = Promise<Bool>()
     private var _listReady = Promise<Bool>()
     override var ready: Promise<Bool> {
         return self._ready
     }
     
-    private let _result = Promise<[ContactListPeerId]>()
-    var result: Signal<[ContactListPeerId], NoError> {
+    private let _result = Promise<ContactMultiselectionResult>()
+    var result: Signal<ContactMultiselectionResult, NoError> {
         return self._result.get()
     }
     
@@ -62,10 +64,12 @@ class ContactMultiselectionControllerImpl: ViewController, ContactMultiselection
     
     private var limitsConfiguration: LimitsConfiguration?
     private var limitsConfigurationDisposable: Disposable?
+    private var initialPeersDisposable: Disposable?
     private let options: [ContactListAdditionalOption]
     private let filters: [ContactListFilter]
     
     init(_ params: ContactMultiselectionControllerParams) {
+        self.params = params
         self.context = params.context
         self.mode = params.mode
         self.options = params.options
@@ -83,7 +87,7 @@ class ContactMultiselectionControllerImpl: ViewController, ContactMultiselection
         
         self.scrollToTop = { [weak self] in
             if let strongSelf = self {
-                strongSelf.contactsNode.contactListNode.scrollToTop()
+                strongSelf.contactsNode.scrollToTop()
             }
         }
         
@@ -111,7 +115,28 @@ class ContactMultiselectionControllerImpl: ViewController, ContactMultiselection
             }
         })
         
-        self._ready.set(combineLatest(self._listReady.get(), self._limitsReady.get()) |> map { $0 && $1 })
+        switch self.mode {
+        case let .chatSelection(selectedChats, _):
+            let _ = (self.context.account.postbox.transaction { transaction -> [Peer] in
+                return selectedChats.compactMap(transaction.getPeer)
+            }
+            |> deliverOnMainQueue).start(next: { [weak self] peers in
+                guard let strongSelf = self else {
+                    return
+                }
+                strongSelf.contactsNode.editableTokens = peers.map { peer -> EditableTokenListToken in
+                    return EditableTokenListToken(id: peer.id, title: peer.displayTitle(strings: strongSelf.presentationData.strings, displayOrder: strongSelf.presentationData.nameDisplayOrder))
+                }
+                strongSelf._peersReady.set(.single(true))
+                if strongSelf.isNodeLoaded {
+                    strongSelf.requestLayout(transition: .immediate)
+                }
+            })
+        default:
+            self._peersReady.set(.single(true))
+        }
+        
+        self._ready.set(combineLatest(self._listReady.get(), self._limitsReady.get(), self._peersReady.get()) |> map { $0 && $1 && $2 })
     }
     
     required init(coder aDecoder: NSCoder) {
@@ -121,6 +146,7 @@ class ContactMultiselectionControllerImpl: ViewController, ContactMultiselection
     deinit {
         self.presentationDataDisposable?.dispose()
         self.limitsConfigurationDisposable?.dispose()
+        self.initialPeersDisposable?.dispose()
     }
     
     private func updateThemeAndStrings() {
@@ -132,33 +158,51 @@ class ContactMultiselectionControllerImpl: ViewController, ContactMultiselection
     
     private func updateTitle() {
         switch self.mode {
-            case .groupCreation:
-                let maxCount: Int32 = self.limitsConfiguration?.maxSupergroupMemberCount ?? 5000
-                let count = self.contactsNode.contactListNode.selectionState?.selectedPeerIndices.count ?? 0
-                self.titleView.title = CounterContollerTitle(title: self.presentationData.strings.Compose_NewGroupTitle, counter: "\(count)/\(maxCount)")
-                let rightNavigationButton = UIBarButtonItem(title: self.presentationData.strings.Common_Next, style: .done, target: self, action: #selector(self.rightNavigationButtonPressed))
-                self.rightNavigationButton = rightNavigationButton
-                self.navigationItem.rightBarButtonItem = self.rightNavigationButton
-                rightNavigationButton.isEnabled = count != 0
-            case .channelCreation:
-                self.titleView.title = CounterContollerTitle(title: self.presentationData.strings.GroupInfo_AddParticipantTitle, counter: "")
-                let rightNavigationButton = UIBarButtonItem(title: self.presentationData.strings.Common_Next, style: .done, target: self, action: #selector(self.rightNavigationButtonPressed))
-                self.rightNavigationButton = rightNavigationButton
-                self.navigationItem.rightBarButtonItem = self.rightNavigationButton
-                rightNavigationButton.isEnabled = true
-            case .peerSelection:
-                self.titleView.title = CounterContollerTitle(title: self.presentationData.strings.PrivacyLastSeenSettings_EmpryUsersPlaceholder, counter: "")
-                let rightNavigationButton = UIBarButtonItem(title: self.presentationData.strings.Common_Done, style: .done, target: self, action: #selector(self.rightNavigationButtonPressed))
-                self.rightNavigationButton = rightNavigationButton
-                self.navigationItem.leftBarButtonItem = UIBarButtonItem(title: self.presentationData.strings.Common_Cancel, style: .plain, target: self, action: #selector(cancelPressed))
-                self.navigationItem.rightBarButtonItem = self.rightNavigationButton
-                rightNavigationButton.isEnabled = false
+        case .groupCreation:
+            let maxCount: Int32 = self.limitsConfiguration?.maxSupergroupMemberCount ?? 5000
+            let count: Int
+            switch self.contactsNode.contentNode {
+            case let .contacts(contactsNode):
+                count = contactsNode.selectionState?.selectedPeerIndices.count ?? 0
+            case let .chats(chatsNode):
+                count = chatsNode.currentState.selectedPeerIds.count
+            }
+            self.titleView.title = CounterContollerTitle(title: self.presentationData.strings.Compose_NewGroupTitle, counter: "\(count)/\(maxCount)")
+            let rightNavigationButton = UIBarButtonItem(title: self.presentationData.strings.Common_Next, style: .done, target: self, action: #selector(self.rightNavigationButtonPressed))
+            self.rightNavigationButton = rightNavigationButton
+            self.navigationItem.rightBarButtonItem = self.rightNavigationButton
+            rightNavigationButton.isEnabled = count != 0 || self.params.alwaysEnabled
+        case .channelCreation:
+            self.titleView.title = CounterContollerTitle(title: self.presentationData.strings.GroupInfo_AddParticipantTitle, counter: "")
+            let rightNavigationButton = UIBarButtonItem(title: self.presentationData.strings.Common_Next, style: .done, target: self, action: #selector(self.rightNavigationButtonPressed))
+            self.rightNavigationButton = rightNavigationButton
+            self.navigationItem.rightBarButtonItem = self.rightNavigationButton
+            rightNavigationButton.isEnabled = true
+        case .peerSelection:
+            self.titleView.title = CounterContollerTitle(title: self.presentationData.strings.PrivacyLastSeenSettings_EmpryUsersPlaceholder, counter: "")
+            let rightNavigationButton = UIBarButtonItem(title: self.presentationData.strings.Common_Done, style: .done, target: self, action: #selector(self.rightNavigationButtonPressed))
+            self.rightNavigationButton = rightNavigationButton
+            self.navigationItem.leftBarButtonItem = UIBarButtonItem(title: self.presentationData.strings.Common_Cancel, style: .plain, target: self, action: #selector(cancelPressed))
+            self.navigationItem.rightBarButtonItem = self.rightNavigationButton
+            rightNavigationButton.isEnabled = false
+        case .chatSelection:
+            self.titleView.title = CounterContollerTitle(title: self.presentationData.strings.ChatListFilter_AddChatsTitle, counter: "")
+            let rightNavigationButton = UIBarButtonItem(title: self.presentationData.strings.Common_Done, style: .done, target: self, action: #selector(self.rightNavigationButtonPressed))
+            self.rightNavigationButton = rightNavigationButton
+            self.navigationItem.leftBarButtonItem = UIBarButtonItem(title: self.presentationData.strings.Common_Cancel, style: .plain, target: self, action: #selector(cancelPressed))
+            self.navigationItem.rightBarButtonItem = self.rightNavigationButton
+            rightNavigationButton.isEnabled = self.params.alwaysEnabled
         }
     }
     
     override func loadDisplayNode() {
         self.displayNode = ContactMultiselectionControllerNode(context: self.context, mode: self.mode, options: self.options, filters: filters)
-        self._listReady.set(self.contactsNode.contactListNode.ready)
+        switch self.contactsNode.contentNode {
+        case let .contacts(contactsNode):
+            self._listReady.set(contactsNode.ready)
+        case let .chats(chatsNode):
+            self._listReady.set(chatsNode.ready)
+        }
         
         self.contactsNode.dismiss = { [weak self] in
             self?.presentingViewController?.dismiss(animated: true, completion: nil)
@@ -174,25 +218,47 @@ class ContactMultiselectionControllerImpl: ViewController, ContactMultiselection
                 var displayCountAlert = false
                 
                 var selectionState: ContactListNodeGroupSelectionState?
-                strongSelf.contactsNode.contactListNode.updateSelectionState { state in
-                    if let state = state {
-                        var updatedState = state.withToggledPeerId(.peer(peer.id))
-                        if updatedState.selectedPeerIndices[.peer(peer.id)] == nil {
+                switch strongSelf.contactsNode.contentNode {
+                case let .contacts(contactsNode):
+                    contactsNode.updateSelectionState { state in
+                        if let state = state {
+                            var updatedState = state.withToggledPeerId(.peer(peer.id))
+                            if updatedState.selectedPeerIndices[.peer(peer.id)] == nil {
+                                removedTokenId = peer.id
+                            } else {
+                                if updatedState.selectedPeerIndices.count >= maxRegularCount {
+                                    displayCountAlert = true
+                                    updatedState = updatedState.withToggledPeerId(.peer(peer.id))
+                                } else {
+                                    addedToken = EditableTokenListToken(id: peer.id, title: peer.displayTitle(strings: strongSelf.presentationData.strings, displayOrder: strongSelf.presentationData.nameDisplayOrder))
+                                }
+                            }
+                            updatedCount = updatedState.selectedPeerIndices.count
+                            selectionState = updatedState
+                            return updatedState
+                        } else {
+                            return nil
+                        }
+                    }
+                case let .chats(chatsNode):
+                    chatsNode.updateState { state in
+                        var state = state
+                        if state.selectedPeerIds.contains(peer.id) {
+                            state.selectedPeerIds.remove(peer.id)
                             removedTokenId = peer.id
                         } else {
-                            if updatedState.selectedPeerIndices.count >= maxRegularCount {
-                                displayCountAlert = true
-                                updatedState = updatedState.withToggledPeerId(.peer(peer.id))
-                            } else {
-                                addedToken = EditableTokenListToken(id: peer.id, title: peer.displayTitle(strings: strongSelf.presentationData.strings, displayOrder: strongSelf.presentationData.nameDisplayOrder))
-                            }
+                            addedToken = EditableTokenListToken(id: peer.id, title: peer.displayTitle(strings: strongSelf.presentationData.strings, displayOrder: strongSelf.presentationData.nameDisplayOrder))
+                            state.selectedPeerIds.insert(peer.id)
+                        }
+                        updatedCount = state.selectedPeerIds.count
+                        var updatedState = ContactListNodeGroupSelectionState()
+                        for peerId in state.selectedPeerIds {
+                            updatedState = updatedState.withToggledPeerId(.peer(peerId))
                         }
-                        updatedCount = updatedState.selectedPeerIndices.count
                         selectionState = updatedState
-                        return updatedState
-                    } else {
-                        return nil
+                        return state
                     }
+                    break
                 }
                 if let searchResultsNode = strongSelf.contactsNode.searchResultsNode {
                     searchResultsNode.updateSelectionState { _ in
@@ -202,8 +268,8 @@ class ContactMultiselectionControllerImpl: ViewController, ContactMultiselection
                 
                 if let updatedCount = updatedCount {
                     switch strongSelf.mode {
-                        case .groupCreation, .peerSelection:
-                            strongSelf.rightNavigationButton?.isEnabled = updatedCount != 0
+                        case .groupCreation, .peerSelection, .chatSelection:
+                            strongSelf.rightNavigationButton?.isEnabled = updatedCount != 0 || strongSelf.params.alwaysEnabled
                         case .channelCreation:
                             break
                     }
@@ -212,7 +278,7 @@ class ContactMultiselectionControllerImpl: ViewController, ContactMultiselection
                         case .groupCreation:
                             let maxCount: Int32 = strongSelf.limitsConfiguration?.maxSupergroupMemberCount ?? 5000
                             strongSelf.titleView.title = CounterContollerTitle(title: strongSelf.presentationData.strings.Compose_NewGroupTitle, counter: "\(updatedCount)/\(maxCount)")
-                        case .peerSelection, .channelCreation:
+                        case .peerSelection, .channelCreation, .chatSelection:
                             break
                     }
                 }
@@ -238,19 +304,39 @@ class ContactMultiselectionControllerImpl: ViewController, ContactMultiselection
                 var removedTokenId: AnyHashable?
                 
                 var selectionState: ContactListNodeGroupSelectionState?
-                strongSelf.contactsNode.contactListNode.updateSelectionState { state in
-                    if let state = state {
-                        let updatedState = state.withToggledPeerId(peerId)
-                        if updatedState.selectedPeerIndices[peerId] == nil {
-                            if case let .peer(peerId) = peerId {
-                                removedTokenId = peerId
+                switch strongSelf.contactsNode.contentNode {
+                case let .contacts(contactsNode):
+                    contactsNode.updateSelectionState { state in
+                        if let state = state {
+                            let updatedState = state.withToggledPeerId(peerId)
+                            if updatedState.selectedPeerIndices[peerId] == nil {
+                                if case let .peer(peerId) = peerId {
+                                    removedTokenId = peerId
+                                }
                             }
+                            updatedCount = updatedState.selectedPeerIndices.count
+                            selectionState = updatedState
+                            return updatedState
+                        } else {
+                            return nil
+                        }
+                    }
+                case let .chats(chatsNode):
+                    chatsNode.updateState { state in
+                        var state = state
+                        if case let .peer(peerIdValue) = peerId {
+                            if state.selectedPeerIds.contains(peerIdValue) {
+                                state.selectedPeerIds.remove(peerIdValue)
+                            }
+                            removedTokenId = peerIdValue
+                        }
+                        updatedCount = state.selectedPeerIds.count
+                        var updatedState = ContactListNodeGroupSelectionState()
+                        for peerId in state.selectedPeerIds {
+                            updatedState = updatedState.withToggledPeerId(.peer(peerId))
                         }
-                        updatedCount = updatedState.selectedPeerIndices.count
                         selectionState = updatedState
-                        return updatedState
-                    } else {
-                        return nil
+                        return state
                     }
                 }
                 if let searchResultsNode = strongSelf.contactsNode.searchResultsNode {
@@ -261,8 +347,8 @@ class ContactMultiselectionControllerImpl: ViewController, ContactMultiselection
                 
                 if let updatedCount = updatedCount {
                     switch strongSelf.mode {
-                        case .groupCreation, .peerSelection:
-                            strongSelf.rightNavigationButton?.isEnabled = updatedCount != 0
+                        case .groupCreation, .peerSelection, .chatSelection:
+                            strongSelf.rightNavigationButton?.isEnabled = updatedCount != 0 || strongSelf.params.alwaysEnabled
                         case .channelCreation:
                             break
                     }
@@ -270,7 +356,7 @@ class ContactMultiselectionControllerImpl: ViewController, ContactMultiselection
                         case .groupCreation:
                             let maxCount: Int32 = strongSelf.limitsConfiguration?.maxSupergroupMemberCount ?? 5000
                             strongSelf.titleView.title = CounterContollerTitle(title: strongSelf.presentationData.strings.Compose_NewGroupTitle, counter: "\(updatedCount)/\(maxCount)")
-                        case .peerSelection, .channelCreation:
+                        case .peerSelection, .channelCreation, .chatSelection:
                             break
                     }
                 }
@@ -284,13 +370,38 @@ class ContactMultiselectionControllerImpl: ViewController, ContactMultiselection
             }
         }
         
+        self.contactsNode.additionalCategorySelected = { [weak self] id in
+            guard let strongSelf = self else {
+                return
+            }
+            switch strongSelf.contactsNode.contentNode {
+            case .contacts:
+                break
+            case let .chats(chatsNode):
+                chatsNode.updateState { state in
+                    var state = state
+                    if state.selectedAdditionalCategoryIds.contains(id) {
+                        state.selectedAdditionalCategoryIds.remove(id)
+                    } else {
+                        state.selectedAdditionalCategoryIds.insert(id)
+                    }
+                    return state
+                }
+            }
+        }
+        
         self.displayNodeDidLoad()
     }
     
     override func viewWillAppear(_ animated: Bool) {
         super.viewWillAppear(animated)
         
-        self.contactsNode.contactListNode.enableUpdates = true
+        switch self.contactsNode.contentNode {
+        case let .contacts(contactsNode):
+            contactsNode.enableUpdates = true
+        case .chats:
+            break
+        }
     }
     
     override func viewDidAppear(_ animated: Bool) {
@@ -307,7 +418,12 @@ class ContactMultiselectionControllerImpl: ViewController, ContactMultiselection
     override func viewDidDisappear(_ animated: Bool) {
         super.viewDidDisappear(animated)
         
-        self.contactsNode.contactListNode.enableUpdates = false
+        switch self.contactsNode.contentNode {
+        case let .contacts(contactsNode):
+            contactsNode.enableUpdates = false
+        case .chats:
+            break
+        }
     }
     
     override func containerLayoutUpdated(_ layout: ContainerViewLayout, transition: ContainedViewLayoutTransition) {
@@ -317,18 +433,30 @@ class ContactMultiselectionControllerImpl: ViewController, ContactMultiselection
     }
     
     @objc func cancelPressed() {
-        self._result.set(.single([]))
+        self._result.set(.single(.none))
         self.dismiss()
     }
     
     @objc func rightNavigationButtonPressed() {
         var peerIds: [ContactListPeerId] = []
-        self.contactsNode.contactListNode.updateSelectionState { state in
-            if let state = state {
-                peerIds = Array(state.selectedPeerIndices.keys)
+        var additionalOptionIds: [Int] = []
+        switch self.contactsNode.contentNode {
+        case let .contacts(contactsNode):
+            contactsNode.updateSelectionState { state in
+                if let state = state {
+                    peerIds = Array(state.selectedPeerIndices.keys)
+                }
+                return state
             }
-            return state
+        case let .chats(chatsNode):
+            for peerId in chatsNode.currentState.selectedPeerIds {
+                peerIds.append(.peer(peerId))
+            }
+            for optionId in chatsNode.currentState.selectedAdditionalCategoryIds {
+                additionalOptionIds.append(optionId)
+            }
+            additionalOptionIds.sort()
         }
-        self._result.set(.single(peerIds))
+        self._result.set(.single(.result(peerIds: peerIds, additionalOptionIds: additionalOptionIds)))
     }
 }
diff --git a/submodules/TelegramUI/TelegramUI/ContactMultiselectionControllerNode.swift b/submodules/TelegramUI/Sources/ContactMultiselectionControllerNode.swift
similarity index 68%
rename from submodules/TelegramUI/TelegramUI/ContactMultiselectionControllerNode.swift
rename to submodules/TelegramUI/Sources/ContactMultiselectionControllerNode.swift
index bf5aa6a548..b29a7ffdcf 100644
--- a/submodules/TelegramUI/TelegramUI/ContactMultiselectionControllerNode.swift
+++ b/submodules/TelegramUI/Sources/ContactMultiselectionControllerNode.swift
@@ -9,6 +9,7 @@ import TelegramPresentationData
 import MergeLists
 import AccountContext
 import ContactListUI
+import ChatListUI
 
 private struct SearchResultEntry: Identifiable {
     let index: Int
@@ -27,8 +28,22 @@ private struct SearchResultEntry: Identifiable {
     }
 }
 
+enum ContactMultiselectionContentNode {
+    case contacts(ContactListNode)
+    case chats(ChatListNode)
+    
+    var node: ASDisplayNode {
+        switch self {
+        case let .contacts(contacts):
+            return contacts
+        case let .chats(chats):
+            return chats
+        }
+    }
+}
+
 final class ContactMultiselectionControllerNode: ASDisplayNode {
-    let contactListNode: ContactListNode
+    let contentNode: ContactMultiselectionContentNode
     let tokenListNode: EditableTokenListNode
     var searchResultsNode: ContactListNode?
     
@@ -40,6 +55,7 @@ final class ContactMultiselectionControllerNode: ASDisplayNode {
     var requestOpenPeerFromSearch: ((ContactListPeerId) -> Void)?
     var openPeer: ((ContactListPeer) -> Void)?
     var removeSelectedPeer: ((ContactListPeerId) -> Void)?
+    var additionalCategorySelected: ((Int) -> Void)?
     
     var editableTokens: [EditableTokenListToken] = []
     
@@ -53,7 +69,7 @@ final class ContactMultiselectionControllerNode: ASDisplayNode {
         self.context = context
         self.presentationData = context.sharedContext.currentPresentationData.with { $0 }
         
-        let placeholder: String
+        var placeholder: String
         var includeChatList = false
         switch mode {
             case let .peerSelection(_, searchGroups, searchChannels):
@@ -67,7 +83,26 @@ final class ContactMultiselectionControllerNode: ASDisplayNode {
                 placeholder = self.presentationData.strings.Compose_TokenListPlaceholder
         }
         
-        self.contactListNode = ContactListNode(context: context, presentation: .single(.natural(options: options, includeChatList: includeChatList)), filters: filters, selectionState: ContactListNodeGroupSelectionState())
+        if case let .chatSelection(selectedChats, additionalCategories) = mode {
+            placeholder = self.presentationData.strings.Common_Search
+            let chatListNode = ChatListNode(context: context, groupId: .root, previewing: false, controlsHistoryPreload: false, mode: .peers(filter: [.excludeSavedMessages], isSelecting: true, additionalCategories: additionalCategories?.categories ?? []), theme: self.presentationData.theme, fontSize: self.presentationData.listsFontSize, strings: self.presentationData.strings, dateTimeFormat: self.presentationData.dateTimeFormat, nameSortOrder: self.presentationData.nameSortOrder, nameDisplayOrder: self.presentationData.nameDisplayOrder, disableAnimations: true)
+            chatListNode.updateState { state in
+                var state = state
+                for peerId in selectedChats {
+                    state.selectedPeerIds.insert(peerId)
+                }
+                if let additionalCategories = additionalCategories {
+                    for id in additionalCategories.selectedCategories {
+                        state.selectedAdditionalCategoryIds.insert(id)
+                    }
+                }
+                return state
+            }
+            self.contentNode = .chats(chatListNode)
+        } else {
+            self.contentNode = .contacts(ContactListNode(context: context, presentation: .single(.natural(options: options, includeChatList: includeChatList)), filters: filters, selectionState: ContactListNodeGroupSelectionState()))
+        }
+        
         self.tokenListNode = EditableTokenListNode(theme: EditableTokenListNodeTheme(backgroundColor: self.presentationData.theme.rootController.navigationBar.backgroundColor, separatorColor: self.presentationData.theme.rootController.navigationBar.separatorColor, placeholderTextColor: self.presentationData.theme.list.itemPlaceholderTextColor, primaryTextColor: self.presentationData.theme.list.itemPrimaryTextColor, selectedTextColor: self.presentationData.theme.list.itemCheckColors.foregroundColor, selectedBackgroundColor: self.presentationData.theme.list.itemCheckColors.fillColor, accentColor: self.presentationData.theme.list.itemAccentColor, keyboardColor: self.presentationData.theme.rootController.keyboardColor), placeholder: placeholder)
         
         super.init()
@@ -78,11 +113,24 @@ final class ContactMultiselectionControllerNode: ASDisplayNode {
         
         self.backgroundColor = self.presentationData.theme.chatList.backgroundColor
         
-        self.addSubnode(self.contactListNode)
+        self.addSubnode(self.contentNode.node)
         self.addSubnode(self.tokenListNode)
         
-        self.contactListNode.openPeer = { [weak self] peer in
-            self?.openPeer?(peer)
+        switch self.contentNode {
+        case let .contacts(contactsNode):
+            contactsNode.openPeer = { [weak self] peer in
+                self?.openPeer?(peer)
+            }
+        case let .chats(chatsNode):
+            chatsNode.peerSelected = { [weak self] peer, _, _ in
+                self?.openPeer?(.peer(peer: peer, isGlobal: false, participantCount: nil))
+            }
+            chatsNode.additionalCategorySelected = { [weak self] id in
+                guard let strongSelf = self else {
+                    return
+                }
+                strongSelf.additionalCategorySelected?(id)
+            }
         }
         
         let searchText = ValuePromise<String>()
@@ -102,9 +150,14 @@ final class ContactMultiselectionControllerNode: ASDisplayNode {
                 } else {
                     if strongSelf.searchResultsNode == nil {
                         var selectionState: ContactListNodeGroupSelectionState?
-                        strongSelf.contactListNode.updateSelectionState { state in
-                            selectionState = state
-                            return state
+                        switch strongSelf.contentNode {
+                        case let .contacts(contactsNode):
+                            contactsNode.updateSelectionState { state in
+                                selectionState = state
+                                return state
+                            }
+                        case .chats:
+                            break
                         }
                         var searchChatList = false
                         var searchGroups = false
@@ -113,6 +166,10 @@ final class ContactMultiselectionControllerNode: ASDisplayNode {
                             searchChatList = peerSelection.searchChatList
                             searchGroups = peerSelection.searchGroups
                             searchChannels = peerSelection.searchChannels
+                        } else if case .chatSelection = mode {
+                            searchChatList = true
+                            searchGroups = true
+                            searchChannels = true
                         }
                         let searchResultsNode = ContactListNode(context: context, presentation: .single(.search(signal: searchText.get(), searchChatList: searchChatList, searchDeviceContacts: false, searchGroups: searchGroups, searchChannels: searchChannels)), filters: filters, selectionState: selectionState)
                         searchResultsNode.openPeer = { peer in
@@ -136,7 +193,7 @@ final class ContactMultiselectionControllerNode: ASDisplayNode {
                         
                         strongSelf.searchResultsReadyDisposable.set((searchResultsNode.ready |> deliverOnMainQueue).start(next: { _ in
                             if let strongSelf = self, let searchResultsNode = strongSelf.searchResultsNode {
-                                strongSelf.insertSubnode(searchResultsNode, aboveSubnode: strongSelf.contactListNode)
+                                strongSelf.insertSubnode(searchResultsNode, aboveSubnode: strongSelf.contentNode.node)
                             }
                         }))
                     }
@@ -167,6 +224,15 @@ final class ContactMultiselectionControllerNode: ASDisplayNode {
         self.backgroundColor = self.presentationData.theme.chatList.backgroundColor
     }
     
+    func scrollToTop() {
+        switch self.contentNode {
+        case let .contacts(contactsNode):
+            contactsNode.scrollToTop()
+        case let .chats(chatsNode):
+            chatsNode.scrollToPosition(.top)
+        }
+    }
+    
     func containerLayoutUpdated(_ layout: ContainerViewLayout, navigationBarHeight: CGFloat, actualNavigationBarHeight: CGFloat, transition: ContainedViewLayoutTransition) {
         self.containerLayout = (layout, navigationBarHeight, actualNavigationBarHeight)
         
@@ -183,8 +249,18 @@ final class ContactMultiselectionControllerNode: ASDisplayNode {
         insets.top += tokenListHeight
         headerInsets.top += tokenListHeight
         
-        self.contactListNode.containerLayoutUpdated(ContainerViewLayout(size: layout.size, metrics: layout.metrics, deviceMetrics: layout.deviceMetrics, intrinsicInsets: insets, safeInsets: layout.safeInsets, statusBarHeight: layout.statusBarHeight, inputHeight: layout.inputHeight, inputHeightIsInteractivellyChanging: layout.inputHeightIsInteractivellyChanging, inVoiceOver: layout.inVoiceOver), headerInsets: headerInsets, transition: transition)
-        self.contactListNode.frame = CGRect(origin: CGPoint(), size: layout.size)
+        switch self.contentNode {
+        case let .contacts(contactsNode):
+            contactsNode.containerLayoutUpdated(ContainerViewLayout(size: layout.size, metrics: layout.metrics, deviceMetrics: layout.deviceMetrics, intrinsicInsets: insets, safeInsets: layout.safeInsets, statusBarHeight: layout.statusBarHeight, inputHeight: layout.inputHeight, inputHeightIsInteractivellyChanging: layout.inputHeightIsInteractivellyChanging, inVoiceOver: layout.inVoiceOver), headerInsets: headerInsets, transition: transition)
+        case let .chats(chatsNode):
+            var combinedInsets = insets
+            combinedInsets.left += layout.safeInsets.left
+            combinedInsets.right += layout.safeInsets.right
+            let (duration, curve) = listViewAnimationDurationAndCurve(transition: transition)
+            let updateSizeAndInsets = ListViewUpdateSizeAndInsets(size: layout.size, insets: combinedInsets, headerInsets: headerInsets, duration: duration, curve: curve)
+            chatsNode.updateLayout(transition: transition, updateSizeAndInsets: updateSizeAndInsets)
+        }
+        self.contentNode.node.frame = CGRect(origin: CGPoint(), size: layout.size)
         
         if let searchResultsNode = self.searchResultsNode {
             searchResultsNode.containerLayoutUpdated(ContainerViewLayout(size: layout.size, metrics: layout.metrics, deviceMetrics: layout.deviceMetrics, intrinsicInsets: insets, safeInsets: layout.safeInsets, statusBarHeight: layout.statusBarHeight, inputHeight: layout.inputHeight, inputHeightIsInteractivellyChanging: layout.inputHeightIsInteractivellyChanging, inVoiceOver: layout.inVoiceOver), headerInsets: headerInsets, transition: transition)
diff --git a/submodules/TelegramUI/TelegramUI/ContactSelectionController.swift b/submodules/TelegramUI/Sources/ContactSelectionController.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/ContactSelectionController.swift
rename to submodules/TelegramUI/Sources/ContactSelectionController.swift
diff --git a/submodules/TelegramUI/TelegramUI/ContactSelectionControllerNode.swift b/submodules/TelegramUI/Sources/ContactSelectionControllerNode.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/ContactSelectionControllerNode.swift
rename to submodules/TelegramUI/Sources/ContactSelectionControllerNode.swift
diff --git a/submodules/TelegramUI/TelegramUI/ConvertToWebP.swift b/submodules/TelegramUI/Sources/ConvertToWebP.swift
similarity index 95%
rename from submodules/TelegramUI/TelegramUI/ConvertToWebP.swift
rename to submodules/TelegramUI/Sources/ConvertToWebP.swift
index 8d9574a35f..e90d568760 100644
--- a/submodules/TelegramUI/TelegramUI/ConvertToWebP.swift
+++ b/submodules/TelegramUI/Sources/ConvertToWebP.swift
@@ -2,11 +2,7 @@ import UIKit
 import SwiftSignalKit
 import LegacyComponents
 import Display
-#if BUCK
-import WebPImage
-#else
-import WebP
-#endif
+import WebPBinding
 
 private func scaleImage(_ image: UIImage, size: CGSize, boundiingSize: CGSize) -> UIImage? {
     if #available(iOSApplicationExtension 10.0, iOS 10.0, *) {
diff --git a/submodules/TelegramUI/TelegramUI/CreateChannelController.swift b/submodules/TelegramUI/Sources/CreateChannelController.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/CreateChannelController.swift
rename to submodules/TelegramUI/Sources/CreateChannelController.swift
diff --git a/submodules/TelegramUI/TelegramUI/CreateGroupController.swift b/submodules/TelegramUI/Sources/CreateGroupController.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/CreateGroupController.swift
rename to submodules/TelegramUI/Sources/CreateGroupController.swift
diff --git a/submodules/TelegramUI/TelegramUI/DeclareEncodables.swift b/submodules/TelegramUI/Sources/DeclareEncodables.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/DeclareEncodables.swift
rename to submodules/TelegramUI/Sources/DeclareEncodables.swift
diff --git a/submodules/TelegramUI/TelegramUI/DeleteChatInputPanelNode.swift b/submodules/TelegramUI/Sources/DeleteChatInputPanelNode.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/DeleteChatInputPanelNode.swift
rename to submodules/TelegramUI/Sources/DeleteChatInputPanelNode.swift
diff --git a/submodules/TelegramUI/TelegramUI/DeviceContactDataManager.swift b/submodules/TelegramUI/Sources/DeviceContactDataManager.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/DeviceContactDataManager.swift
rename to submodules/TelegramUI/Sources/DeviceContactDataManager.swift
diff --git a/submodules/TelegramUI/TelegramUI/DisabledContextResultsChatInputContextPanelNode.swift b/submodules/TelegramUI/Sources/DisabledContextResultsChatInputContextPanelNode.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/DisabledContextResultsChatInputContextPanelNode.swift
rename to submodules/TelegramUI/Sources/DisabledContextResultsChatInputContextPanelNode.swift
diff --git a/submodules/TelegramUI/TelegramUI/DocumentPreviewController.swift b/submodules/TelegramUI/Sources/DocumentPreviewController.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/DocumentPreviewController.swift
rename to submodules/TelegramUI/Sources/DocumentPreviewController.swift
diff --git a/submodules/TelegramUI/TelegramUI/EditAccessoryPanelNode.swift b/submodules/TelegramUI/Sources/EditAccessoryPanelNode.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/EditAccessoryPanelNode.swift
rename to submodules/TelegramUI/Sources/EditAccessoryPanelNode.swift
diff --git a/submodules/TelegramUI/TelegramUI/EditableTokenListNode.swift b/submodules/TelegramUI/Sources/EditableTokenListNode.swift
similarity index 99%
rename from submodules/TelegramUI/TelegramUI/EditableTokenListNode.swift
rename to submodules/TelegramUI/Sources/EditableTokenListNode.swift
index b56223d772..d9def48c7e 100644
--- a/submodules/TelegramUI/TelegramUI/EditableTokenListNode.swift
+++ b/submodules/TelegramUI/Sources/EditableTokenListNode.swift
@@ -57,6 +57,7 @@ private final class TokenNode: ASDisplayNode {
         didSet {
             if self.isSelected != oldValue {
                 self.titleNode.attributedText = NSAttributedString(string: token.title + ",", font: Font.regular(15.0), textColor: self.isSelected ? self.theme.selectedTextColor : self.theme.primaryTextColor)
+                self.titleNode.redrawIfPossible()
                 self.selectedBackgroundNode.isHidden = !self.isSelected
             }
         }
@@ -67,6 +68,7 @@ private final class TokenNode: ASDisplayNode {
         self.token = token
         self.titleNode = ASTextNode()
         self.titleNode.isUserInteractionEnabled = false
+        self.titleNode.displaysAsynchronously = false
         self.titleNode.maximumNumberOfLines = 1
         self.selectedBackgroundNode = ASImageNode()
         self.selectedBackgroundNode.displaysAsynchronously = false
diff --git a/submodules/TelegramUI/TelegramUI/EmojiResources.swift b/submodules/TelegramUI/Sources/EmojiResources.swift
similarity index 99%
rename from submodules/TelegramUI/TelegramUI/EmojiResources.swift
rename to submodules/TelegramUI/Sources/EmojiResources.swift
index d93a9da021..730c085b42 100644
--- a/submodules/TelegramUI/TelegramUI/EmojiResources.swift
+++ b/submodules/TelegramUI/Sources/EmojiResources.swift
@@ -5,11 +5,7 @@ import TelegramCore
 import SyncCore
 import SwiftSignalKit
 import Display
-#if BUCK
-import WebPImage
-#else
-import WebP
-#endif
+import WebPBinding
 import MediaResources
 import Emoji
 import AppBundle
diff --git a/submodules/TelegramUI/TelegramUI/EmojisChatInputContextPanelNode.swift b/submodules/TelegramUI/Sources/EmojisChatInputContextPanelNode.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/EmojisChatInputContextPanelNode.swift
rename to submodules/TelegramUI/Sources/EmojisChatInputContextPanelNode.swift
diff --git a/submodules/TelegramUI/TelegramUI/EmojisChatInputPanelItem.swift b/submodules/TelegramUI/Sources/EmojisChatInputPanelItem.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/EmojisChatInputPanelItem.swift
rename to submodules/TelegramUI/Sources/EmojisChatInputPanelItem.swift
diff --git a/submodules/TelegramUI/TelegramUI/FetchCachedRepresentations.swift b/submodules/TelegramUI/Sources/FetchCachedRepresentations.swift
similarity index 99%
rename from submodules/TelegramUI/TelegramUI/FetchCachedRepresentations.swift
rename to submodules/TelegramUI/Sources/FetchCachedRepresentations.swift
index a2448e20a4..45dfa94931 100644
--- a/submodules/TelegramUI/TelegramUI/FetchCachedRepresentations.swift
+++ b/submodules/TelegramUI/Sources/FetchCachedRepresentations.swift
@@ -8,11 +8,7 @@ import ImageIO
 import MobileCoreServices
 import Display
 import AVFoundation
-#if BUCK
-import WebPImage
-#else
-import WebP
-#endif
+import WebPBinding
 import Lottie
 import MediaResources
 import PhotoResources
diff --git a/submodules/TelegramUI/TelegramUI/FetchManager.swift b/submodules/TelegramUI/Sources/FetchManager.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/FetchManager.swift
rename to submodules/TelegramUI/Sources/FetchManager.swift
diff --git a/submodules/TelegramUI/TelegramUI/FetchManagerLocation.swift b/submodules/TelegramUI/Sources/FetchManagerLocation.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/FetchManagerLocation.swift
rename to submodules/TelegramUI/Sources/FetchManagerLocation.swift
diff --git a/submodules/TelegramUI/TelegramUI/FetchResource.swift b/submodules/TelegramUI/Sources/FetchResource.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/FetchResource.swift
rename to submodules/TelegramUI/Sources/FetchResource.swift
diff --git a/submodules/TelegramUI/TelegramUI/FetchVideoMediaResource.swift b/submodules/TelegramUI/Sources/FetchVideoMediaResource.swift
similarity index 99%
rename from submodules/TelegramUI/TelegramUI/FetchVideoMediaResource.swift
rename to submodules/TelegramUI/Sources/FetchVideoMediaResource.swift
index 4ff4aae472..dec88cecf3 100644
--- a/submodules/TelegramUI/TelegramUI/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/TelegramUI/FileMediaResourceStatus.swift b/submodules/TelegramUI/Sources/FileMediaResourceStatus.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/FileMediaResourceStatus.swift
rename to submodules/TelegramUI/Sources/FileMediaResourceStatus.swift
diff --git a/submodules/TelegramUI/TelegramUI/ForwardAccessoryPanelNode.swift b/submodules/TelegramUI/Sources/ForwardAccessoryPanelNode.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/ForwardAccessoryPanelNode.swift
rename to submodules/TelegramUI/Sources/ForwardAccessoryPanelNode.swift
diff --git a/submodules/TelegramUI/TelegramUI/GalleryHiddenMediaManager.swift b/submodules/TelegramUI/Sources/GalleryHiddenMediaManager.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/GalleryHiddenMediaManager.swift
rename to submodules/TelegramUI/Sources/GalleryHiddenMediaManager.swift
diff --git a/submodules/TelegramUI/TelegramUI/GifPaneSearchContentNode.swift b/submodules/TelegramUI/Sources/GifPaneSearchContentNode.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/GifPaneSearchContentNode.swift
rename to submodules/TelegramUI/Sources/GifPaneSearchContentNode.swift
diff --git a/submodules/TelegramUI/TelegramUI/GlobalExperimentalSettings.swift b/submodules/TelegramUI/Sources/GlobalExperimentalSettings.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/GlobalExperimentalSettings.swift
rename to submodules/TelegramUI/Sources/GlobalExperimentalSettings.swift
diff --git a/submodules/TelegramUI/TelegramUI/GridHoleItem.swift b/submodules/TelegramUI/Sources/GridHoleItem.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/GridHoleItem.swift
rename to submodules/TelegramUI/Sources/GridHoleItem.swift
diff --git a/submodules/TelegramUI/TelegramUI/GridMessageItem.swift b/submodules/TelegramUI/Sources/GridMessageItem.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/GridMessageItem.swift
rename to submodules/TelegramUI/Sources/GridMessageItem.swift
diff --git a/submodules/TelegramUI/TelegramUI/HashtagChatInputContextPanelNode.swift b/submodules/TelegramUI/Sources/HashtagChatInputContextPanelNode.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/HashtagChatInputContextPanelNode.swift
rename to submodules/TelegramUI/Sources/HashtagChatInputContextPanelNode.swift
diff --git a/submodules/TelegramUI/TelegramUI/HashtagChatInputPanelItem.swift b/submodules/TelegramUI/Sources/HashtagChatInputPanelItem.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/HashtagChatInputPanelItem.swift
rename to submodules/TelegramUI/Sources/HashtagChatInputPanelItem.swift
diff --git a/submodules/TelegramUI/TelegramUI/HorizontalListContextResultsChatInputContextPanelNode.swift b/submodules/TelegramUI/Sources/HorizontalListContextResultsChatInputContextPanelNode.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/HorizontalListContextResultsChatInputContextPanelNode.swift
rename to submodules/TelegramUI/Sources/HorizontalListContextResultsChatInputContextPanelNode.swift
diff --git a/submodules/TelegramUI/TelegramUI/HorizontalListContextResultsChatInputPanelItem.swift b/submodules/TelegramUI/Sources/HorizontalListContextResultsChatInputPanelItem.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/HorizontalListContextResultsChatInputPanelItem.swift
rename to submodules/TelegramUI/Sources/HorizontalListContextResultsChatInputPanelItem.swift
diff --git a/submodules/TelegramUI/TelegramUI/HorizontalStickerGridItem.swift b/submodules/TelegramUI/Sources/HorizontalStickerGridItem.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/HorizontalStickerGridItem.swift
rename to submodules/TelegramUI/Sources/HorizontalStickerGridItem.swift
diff --git a/submodules/TelegramUI/TelegramUI/HorizontalStickersChatContextPanelNode.swift b/submodules/TelegramUI/Sources/HorizontalStickersChatContextPanelNode.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/HorizontalStickersChatContextPanelNode.swift
rename to submodules/TelegramUI/Sources/HorizontalStickersChatContextPanelNode.swift
diff --git a/submodules/TelegramUI/TelegramUI/ICloudResources.swift b/submodules/TelegramUI/Sources/ICloudResources.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/ICloudResources.swift
rename to submodules/TelegramUI/Sources/ICloudResources.swift
diff --git a/submodules/TelegramUI/TelegramUI/ID3ArtworkReader.swift b/submodules/TelegramUI/Sources/ID3ArtworkReader.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/ID3ArtworkReader.swift
rename to submodules/TelegramUI/Sources/ID3ArtworkReader.swift
diff --git a/submodules/TelegramUI/TelegramUI/IconButtonNode.swift b/submodules/TelegramUI/Sources/IconButtonNode.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/IconButtonNode.swift
rename to submodules/TelegramUI/Sources/IconButtonNode.swift
diff --git a/submodules/TelegramUI/TelegramUI/InChatPrefetchManager.swift b/submodules/TelegramUI/Sources/InChatPrefetchManager.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/InChatPrefetchManager.swift
rename to submodules/TelegramUI/Sources/InChatPrefetchManager.swift
diff --git a/submodules/AsyncDisplayKit/Source/Info.plist b/submodules/TelegramUI/Sources/Info.plist
similarity index 100%
rename from submodules/AsyncDisplayKit/Source/Info.plist
rename to submodules/TelegramUI/Sources/Info.plist
diff --git a/submodules/TelegramUI/TelegramUI/InstantVideoRadialStatusNode.swift b/submodules/TelegramUI/Sources/InstantVideoRadialStatusNode.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/InstantVideoRadialStatusNode.swift
rename to submodules/TelegramUI/Sources/InstantVideoRadialStatusNode.swift
diff --git a/submodules/TelegramUI/TelegramUI/LegacyCache.swift b/submodules/TelegramUI/Sources/LegacyCache.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/LegacyCache.swift
rename to submodules/TelegramUI/Sources/LegacyCache.swift
diff --git a/submodules/TelegramUI/TelegramUI/LegacyCamera.swift b/submodules/TelegramUI/Sources/LegacyCamera.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/LegacyCamera.swift
rename to submodules/TelegramUI/Sources/LegacyCamera.swift
diff --git a/submodules/TelegramUI/TelegramUI/LegacyInstantVideoController.swift b/submodules/TelegramUI/Sources/LegacyInstantVideoController.swift
similarity index 99%
rename from submodules/TelegramUI/TelegramUI/LegacyInstantVideoController.swift
rename to submodules/TelegramUI/Sources/LegacyInstantVideoController.swift
index 39da4e104f..6c7f420b3c 100644
--- a/submodules/TelegramUI/TelegramUI/LegacyInstantVideoController.swift
+++ b/submodules/TelegramUI/Sources/LegacyInstantVideoController.swift
@@ -1,5 +1,6 @@
 import Foundation
 import UIKit
+import AsyncDisplayKit
 import Display
 import TelegramCore
 import SyncCore
diff --git a/submodules/TelegramUI/TelegramUI/LegacyLiveUploadInterface.swift b/submodules/TelegramUI/Sources/LegacyLiveUploadInterface.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/LegacyLiveUploadInterface.swift
rename to submodules/TelegramUI/Sources/LegacyLiveUploadInterface.swift
diff --git a/submodules/TelegramUI/TelegramUI/LinkHighlightingNode.swift b/submodules/TelegramUI/Sources/LinkHighlightingNode.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/LinkHighlightingNode.swift
rename to submodules/TelegramUI/Sources/LinkHighlightingNode.swift
diff --git a/submodules/TelegramUI/TelegramUI/ListMessageDateHeader.swift b/submodules/TelegramUI/Sources/ListMessageDateHeader.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/ListMessageDateHeader.swift
rename to submodules/TelegramUI/Sources/ListMessageDateHeader.swift
diff --git a/submodules/TelegramUI/TelegramUI/ListMessageFileItemNode.swift b/submodules/TelegramUI/Sources/ListMessageFileItemNode.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/ListMessageFileItemNode.swift
rename to submodules/TelegramUI/Sources/ListMessageFileItemNode.swift
diff --git a/submodules/TelegramUI/TelegramUI/ListMessageHoleItem.swift b/submodules/TelegramUI/Sources/ListMessageHoleItem.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/ListMessageHoleItem.swift
rename to submodules/TelegramUI/Sources/ListMessageHoleItem.swift
diff --git a/submodules/TelegramUI/TelegramUI/ListMessageItem.swift b/submodules/TelegramUI/Sources/ListMessageItem.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/ListMessageItem.swift
rename to submodules/TelegramUI/Sources/ListMessageItem.swift
diff --git a/submodules/TelegramUI/TelegramUI/ListMessageNode.swift b/submodules/TelegramUI/Sources/ListMessageNode.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/ListMessageNode.swift
rename to submodules/TelegramUI/Sources/ListMessageNode.swift
diff --git a/submodules/TelegramUI/TelegramUI/ListMessagePlaybackOverlayNode.swift b/submodules/TelegramUI/Sources/ListMessagePlaybackOverlayNode.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/ListMessagePlaybackOverlayNode.swift
rename to submodules/TelegramUI/Sources/ListMessagePlaybackOverlayNode.swift
diff --git a/submodules/TelegramUI/TelegramUI/ListMessageSnippetItemNode.swift b/submodules/TelegramUI/Sources/ListMessageSnippetItemNode.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/ListMessageSnippetItemNode.swift
rename to submodules/TelegramUI/Sources/ListMessageSnippetItemNode.swift
diff --git a/submodules/TelegramUI/TelegramUI/LockedWindowCoveringView.swift b/submodules/TelegramUI/Sources/LockedWindowCoveringView.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/LockedWindowCoveringView.swift
rename to submodules/TelegramUI/Sources/LockedWindowCoveringView.swift
diff --git a/submodules/TelegramUI/TelegramUI/ManageSharedAccountInfo.swift b/submodules/TelegramUI/Sources/ManageSharedAccountInfo.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/ManageSharedAccountInfo.swift
rename to submodules/TelegramUI/Sources/ManageSharedAccountInfo.swift
diff --git a/submodules/TelegramUI/TelegramUI/ManagedAudioRecorder.swift b/submodules/TelegramUI/Sources/ManagedAudioRecorder.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/ManagedAudioRecorder.swift
rename to submodules/TelegramUI/Sources/ManagedAudioRecorder.swift
diff --git a/submodules/TelegramUI/TelegramUI/MediaInputPaneTrendingItem.swift b/submodules/TelegramUI/Sources/MediaInputPaneTrendingItem.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/MediaInputPaneTrendingItem.swift
rename to submodules/TelegramUI/Sources/MediaInputPaneTrendingItem.swift
diff --git a/submodules/TelegramUI/TelegramUI/MediaManager.swift b/submodules/TelegramUI/Sources/MediaManager.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/MediaManager.swift
rename to submodules/TelegramUI/Sources/MediaManager.swift
diff --git a/submodules/TelegramUI/TelegramUI/MediaPlaybackStoredState.swift b/submodules/TelegramUI/Sources/MediaPlaybackStoredState.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/MediaPlaybackStoredState.swift
rename to submodules/TelegramUI/Sources/MediaPlaybackStoredState.swift
diff --git a/submodules/TelegramUI/TelegramUI/MentionChatInputContextPanelNode.swift b/submodules/TelegramUI/Sources/MentionChatInputContextPanelNode.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/MentionChatInputContextPanelNode.swift
rename to submodules/TelegramUI/Sources/MentionChatInputContextPanelNode.swift
diff --git a/submodules/TelegramUI/TelegramUI/MentionChatInputPanelItem.swift b/submodules/TelegramUI/Sources/MentionChatInputPanelItem.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/MentionChatInputPanelItem.swift
rename to submodules/TelegramUI/Sources/MentionChatInputPanelItem.swift
diff --git a/submodules/TelegramUI/TelegramUI/MultiScaleTextNode.swift b/submodules/TelegramUI/Sources/MultiScaleTextNode.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/MultiScaleTextNode.swift
rename to submodules/TelegramUI/Sources/MultiScaleTextNode.swift
diff --git a/submodules/TelegramUI/TelegramUI/MultiplexedSoftwareVideoNode.swift b/submodules/TelegramUI/Sources/MultiplexedSoftwareVideoNode.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/MultiplexedSoftwareVideoNode.swift
rename to submodules/TelegramUI/Sources/MultiplexedSoftwareVideoNode.swift
diff --git a/submodules/TelegramUI/TelegramUI/MultiplexedSoftwareVideoSourceManager.swift b/submodules/TelegramUI/Sources/MultiplexedSoftwareVideoSourceManager.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/MultiplexedSoftwareVideoSourceManager.swift
rename to submodules/TelegramUI/Sources/MultiplexedSoftwareVideoSourceManager.swift
diff --git a/submodules/TelegramUI/TelegramUI/MultiplexedVideoNode.swift b/submodules/TelegramUI/Sources/MultiplexedVideoNode.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/MultiplexedVideoNode.swift
rename to submodules/TelegramUI/Sources/MultiplexedVideoNode.swift
diff --git a/submodules/TelegramUI/TelegramUI/NavigateToChatController.swift b/submodules/TelegramUI/Sources/NavigateToChatController.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/NavigateToChatController.swift
rename to submodules/TelegramUI/Sources/NavigateToChatController.swift
diff --git a/submodules/TelegramUI/TelegramUI/NotificationContainerController.swift b/submodules/TelegramUI/Sources/NotificationContainerController.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/NotificationContainerController.swift
rename to submodules/TelegramUI/Sources/NotificationContainerController.swift
diff --git a/submodules/TelegramUI/TelegramUI/NotificationContainerControllerNode.swift b/submodules/TelegramUI/Sources/NotificationContainerControllerNode.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/NotificationContainerControllerNode.swift
rename to submodules/TelegramUI/Sources/NotificationContainerControllerNode.swift
diff --git a/submodules/TelegramUI/TelegramUI/NotificationContentContext.swift b/submodules/TelegramUI/Sources/NotificationContentContext.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/NotificationContentContext.swift
rename to submodules/TelegramUI/Sources/NotificationContentContext.swift
diff --git a/submodules/TelegramUI/TelegramUI/NotificationItem.swift b/submodules/TelegramUI/Sources/NotificationItem.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/NotificationItem.swift
rename to submodules/TelegramUI/Sources/NotificationItem.swift
diff --git a/submodules/TelegramUI/TelegramUI/NotificationItemContainerNode.swift b/submodules/TelegramUI/Sources/NotificationItemContainerNode.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/NotificationItemContainerNode.swift
rename to submodules/TelegramUI/Sources/NotificationItemContainerNode.swift
diff --git a/submodules/TelegramUI/TelegramUI/OpenAddContact.swift b/submodules/TelegramUI/Sources/OpenAddContact.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/OpenAddContact.swift
rename to submodules/TelegramUI/Sources/OpenAddContact.swift
diff --git a/submodules/TelegramUI/TelegramUI/OpenChatMessage.swift b/submodules/TelegramUI/Sources/OpenChatMessage.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/OpenChatMessage.swift
rename to submodules/TelegramUI/Sources/OpenChatMessage.swift
diff --git a/submodules/TelegramUI/TelegramUI/OpenResolvedUrl.swift b/submodules/TelegramUI/Sources/OpenResolvedUrl.swift
similarity index 99%
rename from submodules/TelegramUI/TelegramUI/OpenResolvedUrl.swift
rename to submodules/TelegramUI/Sources/OpenResolvedUrl.swift
index db29b57c7c..989bbcc9c5 100644
--- a/submodules/TelegramUI/TelegramUI/OpenResolvedUrl.swift
+++ b/submodules/TelegramUI/Sources/OpenResolvedUrl.swift
@@ -1,5 +1,6 @@
 import Foundation
 import UIKit
+import AsyncDisplayKit
 import TelegramCore
 import SyncCore
 import Postbox
@@ -324,7 +325,7 @@ func openResolvedUrlImpl(_ resolvedUrl: ResolvedUrl, context: AccountContext, ur
             
             var cancelImpl: (() -> Void)?
             let progressSignal = Signal<Never, NoError> { subscriber in
-                let controller = OverlayStatusController(theme: presentationData.theme, type: .loading(cancelled: {
+                let controller = OverlayStatusController(theme: presentationData.theme,  type: .loading(cancelled: {
                     cancelImpl?()
                 }))
                 present(controller, nil)
diff --git a/submodules/TelegramUI/TelegramUI/OpenUrl.swift b/submodules/TelegramUI/Sources/OpenUrl.swift
similarity index 99%
rename from submodules/TelegramUI/TelegramUI/OpenUrl.swift
rename to submodules/TelegramUI/Sources/OpenUrl.swift
index 36d0b974bc..a15f80c950 100644
--- a/submodules/TelegramUI/TelegramUI/OpenUrl.swift
+++ b/submodules/TelegramUI/Sources/OpenUrl.swift
@@ -5,11 +5,7 @@ import TelegramCore
 import SyncCore
 import Postbox
 import SwiftSignalKit
-#if BUCK
 import MtProtoKit
-#else
-import MtProtoKitDynamic
-#endif
 import TelegramPresentationData
 import TelegramUIPreferences
 import AccountContext
diff --git a/submodules/TelegramUI/TelegramUI/OverlayAudioPlayerController.swift b/submodules/TelegramUI/Sources/OverlayAudioPlayerController.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/OverlayAudioPlayerController.swift
rename to submodules/TelegramUI/Sources/OverlayAudioPlayerController.swift
diff --git a/submodules/TelegramUI/TelegramUI/OverlayInstantVideoDecoration.swift b/submodules/TelegramUI/Sources/OverlayInstantVideoDecoration.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/OverlayInstantVideoDecoration.swift
rename to submodules/TelegramUI/Sources/OverlayInstantVideoDecoration.swift
diff --git a/submodules/TelegramUI/TelegramUI/OverlayInstantVideoNode.swift b/submodules/TelegramUI/Sources/OverlayInstantVideoNode.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/OverlayInstantVideoNode.swift
rename to submodules/TelegramUI/Sources/OverlayInstantVideoNode.swift
diff --git a/submodules/TelegramUI/TelegramUI/OverlayMediaController.swift b/submodules/TelegramUI/Sources/OverlayMediaController.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/OverlayMediaController.swift
rename to submodules/TelegramUI/Sources/OverlayMediaController.swift
diff --git a/submodules/TelegramUI/TelegramUI/OverlayMediaControllerNode.swift b/submodules/TelegramUI/Sources/OverlayMediaControllerNode.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/OverlayMediaControllerNode.swift
rename to submodules/TelegramUI/Sources/OverlayMediaControllerNode.swift
diff --git a/submodules/TelegramUI/TelegramUI/OverlayPlayerControllerNode.swift b/submodules/TelegramUI/Sources/OverlayPlayerControllerNode.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/OverlayPlayerControllerNode.swift
rename to submodules/TelegramUI/Sources/OverlayPlayerControllerNode.swift
diff --git a/submodules/TelegramUI/TelegramUI/OverlayPlayerControlsNode.swift b/submodules/TelegramUI/Sources/OverlayPlayerControlsNode.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/OverlayPlayerControlsNode.swift
rename to submodules/TelegramUI/Sources/OverlayPlayerControlsNode.swift
diff --git a/submodules/TelegramUI/TelegramUI/PaneSearchBarNode.swift b/submodules/TelegramUI/Sources/PaneSearchBarNode.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/PaneSearchBarNode.swift
rename to submodules/TelegramUI/Sources/PaneSearchBarNode.swift
diff --git a/submodules/TelegramUI/TelegramUI/PaneSearchBarPlaceholderItem.swift b/submodules/TelegramUI/Sources/PaneSearchBarPlaceholderItem.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/PaneSearchBarPlaceholderItem.swift
rename to submodules/TelegramUI/Sources/PaneSearchBarPlaceholderItem.swift
diff --git a/submodules/TelegramUI/TelegramUI/PaneSearchContainerNode.swift b/submodules/TelegramUI/Sources/PaneSearchContainerNode.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/PaneSearchContainerNode.swift
rename to submodules/TelegramUI/Sources/PaneSearchContainerNode.swift
diff --git a/submodules/TelegramUI/TelegramUI/Pasteboard.swift b/submodules/TelegramUI/Sources/Pasteboard.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/Pasteboard.swift
rename to submodules/TelegramUI/Sources/Pasteboard.swift
diff --git a/submodules/TelegramUI/TelegramUI/PeerInfo/ListItems/PeerInfoScreenActionItem.swift b/submodules/TelegramUI/Sources/PeerInfo/ListItems/PeerInfoScreenActionItem.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/PeerInfo/ListItems/PeerInfoScreenActionItem.swift
rename to submodules/TelegramUI/Sources/PeerInfo/ListItems/PeerInfoScreenActionItem.swift
diff --git a/submodules/TelegramUI/TelegramUI/PeerInfo/ListItems/PeerInfoScreenAddressItem.swift b/submodules/TelegramUI/Sources/PeerInfo/ListItems/PeerInfoScreenAddressItem.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/PeerInfo/ListItems/PeerInfoScreenAddressItem.swift
rename to submodules/TelegramUI/Sources/PeerInfo/ListItems/PeerInfoScreenAddressItem.swift
diff --git a/submodules/TelegramUI/TelegramUI/PeerInfo/ListItems/PeerInfoScreenCallListItem.swift b/submodules/TelegramUI/Sources/PeerInfo/ListItems/PeerInfoScreenCallListItem.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/PeerInfo/ListItems/PeerInfoScreenCallListItem.swift
rename to submodules/TelegramUI/Sources/PeerInfo/ListItems/PeerInfoScreenCallListItem.swift
diff --git a/submodules/TelegramUI/TelegramUI/PeerInfo/ListItems/PeerInfoScreenCommentItem.swift b/submodules/TelegramUI/Sources/PeerInfo/ListItems/PeerInfoScreenCommentItem.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/PeerInfo/ListItems/PeerInfoScreenCommentItem.swift
rename to submodules/TelegramUI/Sources/PeerInfo/ListItems/PeerInfoScreenCommentItem.swift
diff --git a/submodules/TelegramUI/TelegramUI/PeerInfo/ListItems/PeerInfoScreenDisclosureEncryptionKeyItem.swift b/submodules/TelegramUI/Sources/PeerInfo/ListItems/PeerInfoScreenDisclosureEncryptionKeyItem.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/PeerInfo/ListItems/PeerInfoScreenDisclosureEncryptionKeyItem.swift
rename to submodules/TelegramUI/Sources/PeerInfo/ListItems/PeerInfoScreenDisclosureEncryptionKeyItem.swift
diff --git a/submodules/TelegramUI/TelegramUI/PeerInfo/ListItems/PeerInfoScreenDisclosureItem.swift b/submodules/TelegramUI/Sources/PeerInfo/ListItems/PeerInfoScreenDisclosureItem.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/PeerInfo/ListItems/PeerInfoScreenDisclosureItem.swift
rename to submodules/TelegramUI/Sources/PeerInfo/ListItems/PeerInfoScreenDisclosureItem.swift
diff --git a/submodules/TelegramUI/TelegramUI/PeerInfo/ListItems/PeerInfoScreenHeaderItem.swift b/submodules/TelegramUI/Sources/PeerInfo/ListItems/PeerInfoScreenHeaderItem.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/PeerInfo/ListItems/PeerInfoScreenHeaderItem.swift
rename to submodules/TelegramUI/Sources/PeerInfo/ListItems/PeerInfoScreenHeaderItem.swift
diff --git a/submodules/TelegramUI/TelegramUI/PeerInfo/ListItems/PeerInfoScreenLabeledValueItem.swift b/submodules/TelegramUI/Sources/PeerInfo/ListItems/PeerInfoScreenLabeledValueItem.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/PeerInfo/ListItems/PeerInfoScreenLabeledValueItem.swift
rename to submodules/TelegramUI/Sources/PeerInfo/ListItems/PeerInfoScreenLabeledValueItem.swift
diff --git a/submodules/TelegramUI/TelegramUI/PeerInfo/ListItems/PeerInfoScreenMemberItem.swift b/submodules/TelegramUI/Sources/PeerInfo/ListItems/PeerInfoScreenMemberItem.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/PeerInfo/ListItems/PeerInfoScreenMemberItem.swift
rename to submodules/TelegramUI/Sources/PeerInfo/ListItems/PeerInfoScreenMemberItem.swift
diff --git a/submodules/TelegramUI/TelegramUI/PeerInfo/ListItems/PeerInfoScreenSelectableBackgroundNode.swift b/submodules/TelegramUI/Sources/PeerInfo/ListItems/PeerInfoScreenSelectableBackgroundNode.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/PeerInfo/ListItems/PeerInfoScreenSelectableBackgroundNode.swift
rename to submodules/TelegramUI/Sources/PeerInfo/ListItems/PeerInfoScreenSelectableBackgroundNode.swift
diff --git a/submodules/TelegramUI/TelegramUI/PeerInfo/ListItems/PeerInfoScreenSwitchItem.swift b/submodules/TelegramUI/Sources/PeerInfo/ListItems/PeerInfoScreenSwitchItem.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/PeerInfo/ListItems/PeerInfoScreenSwitchItem.swift
rename to submodules/TelegramUI/Sources/PeerInfo/ListItems/PeerInfoScreenSwitchItem.swift
diff --git a/submodules/TelegramUI/TelegramUI/PeerInfo/Panes/PeerInfoGroupsInCommonPaneNode.swift b/submodules/TelegramUI/Sources/PeerInfo/Panes/PeerInfoGroupsInCommonPaneNode.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/PeerInfo/Panes/PeerInfoGroupsInCommonPaneNode.swift
rename to submodules/TelegramUI/Sources/PeerInfo/Panes/PeerInfoGroupsInCommonPaneNode.swift
diff --git a/submodules/TelegramUI/TelegramUI/PeerInfo/Panes/PeerInfoListPaneNode.swift b/submodules/TelegramUI/Sources/PeerInfo/Panes/PeerInfoListPaneNode.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/PeerInfo/Panes/PeerInfoListPaneNode.swift
rename to submodules/TelegramUI/Sources/PeerInfo/Panes/PeerInfoListPaneNode.swift
diff --git a/submodules/TelegramUI/TelegramUI/PeerInfo/Panes/PeerInfoMembersPane.swift b/submodules/TelegramUI/Sources/PeerInfo/Panes/PeerInfoMembersPane.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/PeerInfo/Panes/PeerInfoMembersPane.swift
rename to submodules/TelegramUI/Sources/PeerInfo/Panes/PeerInfoMembersPane.swift
diff --git a/submodules/TelegramUI/TelegramUI/PeerInfo/Panes/PeerInfoVisualMediaPaneNode.swift b/submodules/TelegramUI/Sources/PeerInfo/Panes/PeerInfoVisualMediaPaneNode.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/PeerInfo/Panes/PeerInfoVisualMediaPaneNode.swift
rename to submodules/TelegramUI/Sources/PeerInfo/Panes/PeerInfoVisualMediaPaneNode.swift
diff --git a/submodules/TelegramUI/TelegramUI/PeerInfo/PeerInfoData.swift b/submodules/TelegramUI/Sources/PeerInfo/PeerInfoData.swift
similarity index 99%
rename from submodules/TelegramUI/TelegramUI/PeerInfo/PeerInfoData.swift
rename to submodules/TelegramUI/Sources/PeerInfo/PeerInfoData.swift
index 2d9edbe0d4..233b35c6ba 100644
--- a/submodules/TelegramUI/TelegramUI/PeerInfo/PeerInfoData.swift
+++ b/submodules/TelegramUI/Sources/PeerInfo/PeerInfoData.swift
@@ -262,7 +262,7 @@ func keepPeerInfoScreenDataHot(context: AccountContext, peerId: PeerId) -> Signa
     }
 }
 
-func peerInfoScreenData(context: AccountContext, peerId: PeerId, strings: PresentationStrings, dateTimeFormat: PresentationDateTimeFormat) -> Signal<PeerInfoScreenData, NoError> {
+func peerInfoScreenData(context: AccountContext, peerId: PeerId, strings: PresentationStrings, dateTimeFormat: PresentationDateTimeFormat, ignoreGroupInCommon: PeerId?) -> Signal<PeerInfoScreenData, NoError> {
     return peerInfoScreenInputData(context: context, peerId: peerId)
     |> mapToSignal { inputData -> Signal<PeerInfoScreenData, NoError> in
         switch inputData {
@@ -401,7 +401,10 @@ func peerInfoScreenData(context: AccountContext, peerId: PeerId, strings: Presen
                 var availablePanes = availablePanes
                 if availablePanes != nil, groupsInCommon != nil, let cachedData = peerView.cachedData as? CachedUserData {
                     if cachedData.commonGroupCount != 0 {
-                        availablePanes?.append(.groupsInCommon)
+                        if ignoreGroupInCommon != nil && cachedData.commonGroupCount == 1 {
+                        } else {
+                            availablePanes?.append(.groupsInCommon)
+                        }
                     }
                 }
                 
@@ -730,7 +733,6 @@ func peerInfoHeaderButtons(peer: Peer?, cachedData: CachedPeerData?, isOpenedFro
         if let cachedChannelData = cachedData as? CachedChannelData {
             canViewStats = cachedChannelData.flags.contains(.canViewStats)
         }
-        
         switch channel.info {
         case .broadcast:
             if !channel.flags.contains(.isCreator) {
@@ -748,11 +750,9 @@ func peerInfoHeaderButtons(peer: Peer?, cachedData: CachedPeerData?, isOpenedFro
         default:
             displayLeave = false
         }
-        
         if canViewStats {
             displayLeave = false
         }
-        
         result.append(.mute)
         result.append(.search)
         if displayLeave {
@@ -764,7 +764,6 @@ func peerInfoHeaderButtons(peer: Peer?, cachedData: CachedPeerData?, isOpenedFro
                 displayMore = false
             }
         }
-        
         if displayMore {
             result.append(.more)
         }
diff --git a/submodules/TelegramUI/TelegramUI/PeerInfo/PeerInfoHeaderNode.swift b/submodules/TelegramUI/Sources/PeerInfo/PeerInfoHeaderNode.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/PeerInfo/PeerInfoHeaderNode.swift
rename to submodules/TelegramUI/Sources/PeerInfo/PeerInfoHeaderNode.swift
diff --git a/submodules/TelegramUI/TelegramUI/PeerInfo/PeerInfoMembers.swift b/submodules/TelegramUI/Sources/PeerInfo/PeerInfoMembers.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/PeerInfo/PeerInfoMembers.swift
rename to submodules/TelegramUI/Sources/PeerInfo/PeerInfoMembers.swift
diff --git a/submodules/TelegramUI/TelegramUI/PeerInfo/PeerInfoPaneContainerNode.swift b/submodules/TelegramUI/Sources/PeerInfo/PeerInfoPaneContainerNode.swift
similarity index 99%
rename from submodules/TelegramUI/TelegramUI/PeerInfo/PeerInfoPaneContainerNode.swift
rename to submodules/TelegramUI/Sources/PeerInfo/PeerInfoPaneContainerNode.swift
index 070320143f..3212d5c133 100644
--- a/submodules/TelegramUI/TelegramUI/PeerInfo/PeerInfoPaneContainerNode.swift
+++ b/submodules/TelegramUI/Sources/PeerInfo/PeerInfoPaneContainerNode.swift
@@ -509,7 +509,7 @@ final class PeerInfoPaneContainerNode: ASDisplayNode, UIGestureRecognizerDelegat
     override func didLoad() {
         super.didLoad()
         
-        let panRecognizer = InteractiveTransitionGestureRecognizer(target: self, action: #selector(self.panGesture(_:)), allowedDirections: { [weak self] in
+        let panRecognizer = InteractiveTransitionGestureRecognizer(target: self, action: #selector(self.panGesture(_:)), allowedDirections: { [weak self] _ in
             guard let strongSelf = self, let currentPaneKey = strongSelf.currentPaneKey, let availablePanes = strongSelf.currentParams?.data?.availablePanes, let index = availablePanes.index(of: currentPaneKey) else {
                 return []
             }
diff --git a/submodules/TelegramUI/TelegramUI/PeerInfo/PeerInfoScreen.swift b/submodules/TelegramUI/Sources/PeerInfo/PeerInfoScreen.swift
similarity index 99%
rename from submodules/TelegramUI/TelegramUI/PeerInfo/PeerInfoScreen.swift
rename to submodules/TelegramUI/Sources/PeerInfo/PeerInfoScreen.swift
index 6446ed0f53..046f4a93fc 100644
--- a/submodules/TelegramUI/TelegramUI/PeerInfo/PeerInfoScreen.swift
+++ b/submodules/TelegramUI/Sources/PeerInfo/PeerInfoScreen.swift
@@ -489,7 +489,7 @@ private final class PeerInfoInteraction {
     let editingOpenStickerPackSetup: () -> Void
     let openLocation: () -> Void
     let editingOpenSetupLocation: () -> Void
-    let openPeerInfo: (Peer) -> Void
+    let openPeerInfo: (Peer, Bool) -> Void
     let performMemberAction: (PeerInfoMember, PeerInfoMemberAction) -> Void
     let openPeerInfoContextMenu: (PeerInfoContextSubject, ASDisplayNode) -> Void
     let performBioLinkAction: (TextLinkItemActionType, TextLinkItem) -> Void
@@ -519,7 +519,7 @@ private final class PeerInfoInteraction {
         editingOpenStickerPackSetup: @escaping () -> Void,
         openLocation: @escaping () -> Void,
         editingOpenSetupLocation: @escaping () -> Void,
-        openPeerInfo: @escaping (Peer) -> Void,
+        openPeerInfo: @escaping (Peer, Bool) -> Void,
         performMemberAction: @escaping (PeerInfoMember, PeerInfoMemberAction) -> Void,
         openPeerInfoContextMenu: @escaping (PeerInfoContextSubject, ASDisplayNode) -> Void,
         performBioLinkAction: @escaping (TextLinkItemActionType, TextLinkItem) -> Void,
@@ -755,7 +755,7 @@ private func infoItems(data: PeerInfoScreenData?, context: AccountContext, prese
             items[.peerMembers]!.append(PeerInfoScreenMemberItem(id: member.id, context: context, enclosingPeer: peer, member: member, action: isAccountPeer ? nil : { action in
                 switch action {
                 case .open:
-                    interaction.openPeerInfo(member.peer)
+                    interaction.openPeerInfo(member.peer, true)
                 case .promote:
                     interaction.performMemberAction(member, .promote)
                 case .restrict:
@@ -1096,7 +1096,7 @@ private final class PeerInfoScreenNode: ViewControllerTracingNode, UIScrollViewD
     }
     private var didSetReady = false
     
-    init(controller: PeerInfoScreen, context: AccountContext, peerId: PeerId, avatarInitiallyExpanded: Bool, isOpenedFromChat: Bool, nearbyPeer: Bool, callMessages: [Message]) {
+    init(controller: PeerInfoScreen, context: AccountContext, peerId: PeerId, avatarInitiallyExpanded: Bool, isOpenedFromChat: Bool, nearbyPeer: Bool, callMessages: [Message], ignoreGroupInCommon: PeerId?) {
         self.controller = controller
         self.context = context
         self.peerId = peerId
@@ -1181,8 +1181,8 @@ private final class PeerInfoScreenNode: ViewControllerTracingNode, UIScrollViewD
             editingOpenSetupLocation: { [weak self] in
                 self?.editingOpenSetupLocation()
             },
-            openPeerInfo: { [weak self] peer in
-                self?.openPeerInfo(peer: peer)
+            openPeerInfo: { [weak self] peer, isMember in
+                self?.openPeerInfo(peer: peer, isMember: isMember)
             },
             performMemberAction: { [weak self] member, action in
                 self?.performMemberAction(member: member, action: action)
@@ -1637,7 +1637,7 @@ private final class PeerInfoScreenNode: ViewControllerTracingNode, UIScrollViewD
             }
             switch action {
             case .open:
-                strongSelf.openPeerInfo(peer: member.peer)
+                strongSelf.openPeerInfo(peer: member.peer, isMember: true)
             case .promote:
                 strongSelf.performMemberAction(member: member, action: .promote)
             case .restrict:
@@ -1919,7 +1919,7 @@ private final class PeerInfoScreenNode: ViewControllerTracingNode, UIScrollViewD
             }
         }
         
-        self.dataDisposable = (peerInfoScreenData(context: context, peerId: peerId, strings: self.presentationData.strings, dateTimeFormat: self.presentationData.dateTimeFormat)
+        self.dataDisposable = (peerInfoScreenData(context: context, peerId: peerId, strings: self.presentationData.strings, dateTimeFormat: self.presentationData.dateTimeFormat, ignoreGroupInCommon: ignoreGroupInCommon)
         |> deliverOnMainQueue).start(next: { [weak self] data in
             guard let strongSelf = self else {
                 return
@@ -2891,8 +2891,12 @@ private final class PeerInfoScreenNode: ViewControllerTracingNode, UIScrollViewD
         self.controller?.push(locationController)
     }
     
-    private func openPeerInfo(peer: Peer) {
-        if let infoController = self.context.sharedContext.makePeerInfoController(context: self.context, peer: peer, mode: .generic, avatarInitiallyExpanded: false, fromChat: false) {
+    private func openPeerInfo(peer: Peer, isMember: Bool) {
+        var mode: PeerInfoControllerMode = .generic
+        if isMember {
+            mode = .group(self.peerId)
+        }
+        if let infoController = self.context.sharedContext.makePeerInfoController(context: self.context, peer: peer, mode: mode, avatarInitiallyExpanded: false, fromChat: false) {
             (self.controller?.navigationController as? NavigationController)?.pushViewController(infoController)
         }
     }
@@ -3445,7 +3449,12 @@ private final class PeerInfoScreenNode: ViewControllerTracingNode, UIScrollViewD
             }
             if let contactsController = contactsController as? ContactMultiselectionController {
                 selectAddMemberDisposable.set((contactsController.result
-                |> deliverOnMainQueue).start(next: { [weak contactsController] peers in
+                |> deliverOnMainQueue).start(next: { [weak contactsController] result in
+                    var peers: [ContactListPeerId] = []
+                    if case let .result(peerIdsValue, _) = result {
+                        peers = peerIdsValue
+                    }
+                    
                     contactsController?.displayProgress = true
                     addMemberDisposable.set((addMembers(peers)
                     |> deliverOnMainQueue).start(error: { error in
@@ -4167,6 +4176,7 @@ public final class PeerInfoScreen: ViewController {
     private let isOpenedFromChat: Bool
     private let nearbyPeer: Bool
     private let callMessages: [Message]
+    private let ignoreGroupInCommon: PeerId?
     
     private var presentationData: PresentationData
     private var presentationDataDisposable: Disposable?
@@ -4182,13 +4192,14 @@ public final class PeerInfoScreen: ViewController {
     
     private var validLayout: (layout: ContainerViewLayout, navigationHeight: CGFloat)?
     
-    public init(context: AccountContext, peerId: PeerId, avatarInitiallyExpanded: Bool, isOpenedFromChat: Bool, nearbyPeer: Bool, callMessages: [Message]) {
+    public init(context: AccountContext, peerId: PeerId, avatarInitiallyExpanded: Bool, isOpenedFromChat: Bool, nearbyPeer: Bool, callMessages: [Message], ignoreGroupInCommon: PeerId? = nil) {
         self.context = context
         self.peerId = peerId
         self.avatarInitiallyExpanded = avatarInitiallyExpanded
         self.isOpenedFromChat = isOpenedFromChat
         self.nearbyPeer = nearbyPeer
         self.callMessages = callMessages
+        self.ignoreGroupInCommon = ignoreGroupInCommon
         
         self.presentationData = context.sharedContext.currentPresentationData.with { $0 }
         
@@ -4259,7 +4270,7 @@ public final class PeerInfoScreen: ViewController {
     }
     
     override public func loadDisplayNode() {
-        self.displayNode = PeerInfoScreenNode(controller: self, context: self.context, peerId: self.peerId, avatarInitiallyExpanded: self.avatarInitiallyExpanded, isOpenedFromChat: self.isOpenedFromChat, nearbyPeer: self.nearbyPeer, callMessages: self.callMessages)
+        self.displayNode = PeerInfoScreenNode(controller: self, context: self.context, peerId: self.peerId, avatarInitiallyExpanded: self.avatarInitiallyExpanded, isOpenedFromChat: self.isOpenedFromChat, nearbyPeer: self.nearbyPeer, callMessages: self.callMessages, ignoreGroupInCommon: self.ignoreGroupInCommon)
         
         self._ready.set(self.controllerNode.ready.get())
         
diff --git a/submodules/TelegramUI/TelegramUI/PeerMediaCollectionController.swift b/submodules/TelegramUI/Sources/PeerMediaCollectionController.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/PeerMediaCollectionController.swift
rename to submodules/TelegramUI/Sources/PeerMediaCollectionController.swift
diff --git a/submodules/TelegramUI/TelegramUI/PeerMediaCollectionControllerNode.swift b/submodules/TelegramUI/Sources/PeerMediaCollectionControllerNode.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/PeerMediaCollectionControllerNode.swift
rename to submodules/TelegramUI/Sources/PeerMediaCollectionControllerNode.swift
diff --git a/submodules/TelegramUI/TelegramUI/PeerMediaCollectionEmptyNode.swift b/submodules/TelegramUI/Sources/PeerMediaCollectionEmptyNode.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/PeerMediaCollectionEmptyNode.swift
rename to submodules/TelegramUI/Sources/PeerMediaCollectionEmptyNode.swift
diff --git a/submodules/TelegramUI/TelegramUI/PeerMediaCollectionInterfaceState.swift b/submodules/TelegramUI/Sources/PeerMediaCollectionInterfaceState.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/PeerMediaCollectionInterfaceState.swift
rename to submodules/TelegramUI/Sources/PeerMediaCollectionInterfaceState.swift
diff --git a/submodules/TelegramUI/TelegramUI/PeerMediaCollectionInterfaceStateButtons.swift b/submodules/TelegramUI/Sources/PeerMediaCollectionInterfaceStateButtons.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/PeerMediaCollectionInterfaceStateButtons.swift
rename to submodules/TelegramUI/Sources/PeerMediaCollectionInterfaceStateButtons.swift
diff --git a/submodules/TelegramUI/TelegramUI/PeerMediaCollectionSectionsNode.swift b/submodules/TelegramUI/Sources/PeerMediaCollectionSectionsNode.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/PeerMediaCollectionSectionsNode.swift
rename to submodules/TelegramUI/Sources/PeerMediaCollectionSectionsNode.swift
diff --git a/submodules/TelegramUI/TelegramUI/PeerMessagesMediaPlaylist.swift b/submodules/TelegramUI/Sources/PeerMessagesMediaPlaylist.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/PeerMessagesMediaPlaylist.swift
rename to submodules/TelegramUI/Sources/PeerMessagesMediaPlaylist.swift
diff --git a/submodules/TelegramUI/TelegramUI/PeerSelectionController.swift b/submodules/TelegramUI/Sources/PeerSelectionController.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/PeerSelectionController.swift
rename to submodules/TelegramUI/Sources/PeerSelectionController.swift
diff --git a/submodules/TelegramUI/TelegramUI/PeerSelectionControllerNode.swift b/submodules/TelegramUI/Sources/PeerSelectionControllerNode.swift
similarity index 97%
rename from submodules/TelegramUI/TelegramUI/PeerSelectionControllerNode.swift
rename to submodules/TelegramUI/Sources/PeerSelectionControllerNode.swift
index 8d30cec7a7..c6713f055c 100644
--- a/submodules/TelegramUI/TelegramUI/PeerSelectionControllerNode.swift
+++ b/submodules/TelegramUI/Sources/PeerSelectionControllerNode.swift
@@ -85,7 +85,7 @@ final class PeerSelectionControllerNode: ASDisplayNode {
             self.segmentedControlNode = nil
         }
        
-        self.chatListNode = ChatListNode(context: context, groupId: .root, previewing: false, controlsHistoryPreload: false, mode: .peers(filter: filter), theme: presentationData.theme, fontSize: presentationData.listsFontSize, strings: presentationData.strings, dateTimeFormat: presentationData.dateTimeFormat, nameSortOrder: presentationData.nameSortOrder, nameDisplayOrder: presentationData.nameDisplayOrder, disableAnimations: presentationData.disableAnimations)
+        self.chatListNode = ChatListNode(context: context, groupId: .root, previewing: false, controlsHistoryPreload: false, mode: .peers(filter: filter, isSelecting: false, additionalCategories: []), theme: presentationData.theme, fontSize: presentationData.listsFontSize, strings: presentationData.strings, dateTimeFormat: presentationData.dateTimeFormat, nameSortOrder: presentationData.nameSortOrder, nameDisplayOrder: presentationData.nameDisplayOrder, disableAnimations: presentationData.disableAnimations)
         
         super.init()
         
@@ -99,8 +99,8 @@ final class PeerSelectionControllerNode: ASDisplayNode {
             self?.requestActivateSearch?()
         }
         
-        self.chatListNode.peerSelected = { [weak self] peerId, _, _ in
-            self?.requestOpenPeer?(peerId)
+        self.chatListNode.peerSelected = { [weak self] peer, _, _ in
+            self?.requestOpenPeer?(peer.id)
         }
         
         self.chatListNode.disabledPeerSelected = { [weak self] peer in
diff --git a/submodules/TelegramUI/TelegramUI/PeersNearbyManager.swift b/submodules/TelegramUI/Sources/PeersNearbyManager.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/PeersNearbyManager.swift
rename to submodules/TelegramUI/Sources/PeersNearbyManager.swift
diff --git a/submodules/TelegramUI/TelegramUI/PollResultsController.swift b/submodules/TelegramUI/Sources/PollResultsController.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/PollResultsController.swift
rename to submodules/TelegramUI/Sources/PollResultsController.swift
diff --git a/submodules/TelegramUI/TelegramUI/PrefetchManager.swift b/submodules/TelegramUI/Sources/PrefetchManager.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/PrefetchManager.swift
rename to submodules/TelegramUI/Sources/PrefetchManager.swift
diff --git a/submodules/TelegramUI/TelegramUI/PrepareSecretThumbnailData.swift b/submodules/TelegramUI/Sources/PrepareSecretThumbnailData.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/PrepareSecretThumbnailData.swift
rename to submodules/TelegramUI/Sources/PrepareSecretThumbnailData.swift
diff --git a/submodules/TelegramUI/TelegramUI/PreparedChatHistoryViewTransition.swift b/submodules/TelegramUI/Sources/PreparedChatHistoryViewTransition.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/PreparedChatHistoryViewTransition.swift
rename to submodules/TelegramUI/Sources/PreparedChatHistoryViewTransition.swift
diff --git a/submodules/TelegramUI/TelegramUI/ProcessedPeerRestrictionText.swift b/submodules/TelegramUI/Sources/ProcessedPeerRestrictionText.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/ProcessedPeerRestrictionText.swift
rename to submodules/TelegramUI/Sources/ProcessedPeerRestrictionText.swift
diff --git a/submodules/TelegramUI/TelegramUI/RadialProgressNode.swift b/submodules/TelegramUI/Sources/RadialProgressNode.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/RadialProgressNode.swift
rename to submodules/TelegramUI/Sources/RadialProgressNode.swift
diff --git a/submodules/TelegramUI/TelegramUI/RadialTimeoutNode.swift b/submodules/TelegramUI/Sources/RadialTimeoutNode.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/RadialTimeoutNode.swift
rename to submodules/TelegramUI/Sources/RadialTimeoutNode.swift
diff --git a/submodules/TelegramUI/TelegramUI/ReplyAccessoryPanelNode.swift b/submodules/TelegramUI/Sources/ReplyAccessoryPanelNode.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/ReplyAccessoryPanelNode.swift
rename to submodules/TelegramUI/Sources/ReplyAccessoryPanelNode.swift
diff --git a/submodules/TelegramUI/TelegramUI/SampleBufferPool.swift b/submodules/TelegramUI/Sources/SampleBufferPool.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/SampleBufferPool.swift
rename to submodules/TelegramUI/Sources/SampleBufferPool.swift
diff --git a/submodules/TelegramUI/TelegramUI/SecretChatHandshakeStatusInputPanelNode.swift b/submodules/TelegramUI/Sources/SecretChatHandshakeStatusInputPanelNode.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/SecretChatHandshakeStatusInputPanelNode.swift
rename to submodules/TelegramUI/Sources/SecretChatHandshakeStatusInputPanelNode.swift
diff --git a/submodules/TelegramUI/TelegramUI/ServiceSoundManager.swift b/submodules/TelegramUI/Sources/ServiceSoundManager.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/ServiceSoundManager.swift
rename to submodules/TelegramUI/Sources/ServiceSoundManager.swift
diff --git a/submodules/TelegramUI/TelegramUI/ShareExtensionContext.swift b/submodules/TelegramUI/Sources/ShareExtensionContext.swift
similarity index 99%
rename from submodules/TelegramUI/TelegramUI/ShareExtensionContext.swift
rename to submodules/TelegramUI/Sources/ShareExtensionContext.swift
index 91c4c09e33..2148715929 100644
--- a/submodules/TelegramUI/TelegramUI/ShareExtensionContext.swift
+++ b/submodules/TelegramUI/Sources/ShareExtensionContext.swift
@@ -11,6 +11,7 @@ import ShareController
 import LegacyUI
 import PeerInfoUI
 import ShareItems
+import ShareItemsImpl
 import SettingsUI
 import OpenSSLEncryptionProvider
 import AppLock
diff --git a/submodules/TelegramUI/TelegramUI/SharedAccountContext.swift b/submodules/TelegramUI/Sources/SharedAccountContext.swift
similarity index 99%
rename from submodules/TelegramUI/TelegramUI/SharedAccountContext.swift
rename to submodules/TelegramUI/Sources/SharedAccountContext.swift
index 57e6012d9f..c27dd0ff0a 100644
--- a/submodules/TelegramUI/TelegramUI/SharedAccountContext.swift
+++ b/submodules/TelegramUI/Sources/SharedAccountContext.swift
@@ -1,4 +1,6 @@
 import Foundation
+import UIKit
+import AsyncDisplayKit
 import Postbox
 import TelegramCore
 import SyncCore
@@ -1257,6 +1259,7 @@ private func peerInfoControllerImpl(context: AccountContext, peer: Peer, mode: P
     } else if peer is TelegramUser {
         var nearbyPeer = false
         var callMessages: [Message] = []
+        var ignoreGroupInCommon: PeerId?
         switch mode {
         case .nearbyPeer:
             nearbyPeer = true
@@ -1264,8 +1267,10 @@ private func peerInfoControllerImpl(context: AccountContext, peer: Peer, mode: P
             callMessages = messages
         case .generic:
             break
+        case let .group(id):
+            ignoreGroupInCommon = id
         }
-        return PeerInfoScreen(context: context, peerId: peer.id, avatarInitiallyExpanded: avatarInitiallyExpanded, isOpenedFromChat: isOpenedFromChat, nearbyPeer: nearbyPeer, callMessages: callMessages)
+        return PeerInfoScreen(context: context, peerId: peer.id, avatarInitiallyExpanded: avatarInitiallyExpanded, isOpenedFromChat: isOpenedFromChat, nearbyPeer: nearbyPeer, callMessages: callMessages, ignoreGroupInCommon: ignoreGroupInCommon)
     } else if peer is TelegramSecretChat {
         return PeerInfoScreen(context: context, peerId: peer.id, avatarInitiallyExpanded: avatarInitiallyExpanded, isOpenedFromChat: isOpenedFromChat, nearbyPeer: false, callMessages: [])
     }
diff --git a/submodules/TelegramUI/TelegramUI/SharedMediaPlayer.swift b/submodules/TelegramUI/Sources/SharedMediaPlayer.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/SharedMediaPlayer.swift
rename to submodules/TelegramUI/Sources/SharedMediaPlayer.swift
diff --git a/submodules/TelegramUI/TelegramUI/SharedNotificationManager.swift b/submodules/TelegramUI/Sources/SharedNotificationManager.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/SharedNotificationManager.swift
rename to submodules/TelegramUI/Sources/SharedNotificationManager.swift
diff --git a/submodules/TelegramUI/TelegramUI/SharedVideoContextManager.swift b/submodules/TelegramUI/Sources/SharedVideoContextManager.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/SharedVideoContextManager.swift
rename to submodules/TelegramUI/Sources/SharedVideoContextManager.swift
diff --git a/submodules/TelegramUI/TelegramUI/SharedWakeupManager.swift b/submodules/TelegramUI/Sources/SharedWakeupManager.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/SharedWakeupManager.swift
rename to submodules/TelegramUI/Sources/SharedWakeupManager.swift
diff --git a/submodules/TelegramUI/TelegramUI/SoftwareVideoLayerFrameManager.swift b/submodules/TelegramUI/Sources/SoftwareVideoLayerFrameManager.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/SoftwareVideoLayerFrameManager.swift
rename to submodules/TelegramUI/Sources/SoftwareVideoLayerFrameManager.swift
diff --git a/submodules/TelegramUI/TelegramUI/SoftwareVideoThumbnailLayer.swift b/submodules/TelegramUI/Sources/SoftwareVideoThumbnailLayer.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/SoftwareVideoThumbnailLayer.swift
rename to submodules/TelegramUI/Sources/SoftwareVideoThumbnailLayer.swift
diff --git a/submodules/TelegramUI/TelegramUI/SpotlightContacts.swift b/submodules/TelegramUI/Sources/SpotlightContacts.swift
similarity index 99%
rename from submodules/TelegramUI/TelegramUI/SpotlightContacts.swift
rename to submodules/TelegramUI/Sources/SpotlightContacts.swift
index 0904964e64..6f8bf4dd59 100644
--- a/submodules/TelegramUI/TelegramUI/SpotlightContacts.swift
+++ b/submodules/TelegramUI/Sources/SpotlightContacts.swift
@@ -1,4 +1,5 @@
 import Foundation
+import UIKit
 import SwiftSignalKit
 import Postbox
 import SyncCore
diff --git a/submodules/TelegramUI/TelegramUI/StickerPanePeerSpecificSetupGridItem.swift b/submodules/TelegramUI/Sources/StickerPanePeerSpecificSetupGridItem.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/StickerPanePeerSpecificSetupGridItem.swift
rename to submodules/TelegramUI/Sources/StickerPanePeerSpecificSetupGridItem.swift
diff --git a/submodules/TelegramUI/TelegramUI/StickerPaneSearchContentNode.swift b/submodules/TelegramUI/Sources/StickerPaneSearchContentNode.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/StickerPaneSearchContentNode.swift
rename to submodules/TelegramUI/Sources/StickerPaneSearchContentNode.swift
diff --git a/submodules/TelegramUI/TelegramUI/StickerPaneSearchGlobaltem.swift b/submodules/TelegramUI/Sources/StickerPaneSearchGlobaltem.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/StickerPaneSearchGlobaltem.swift
rename to submodules/TelegramUI/Sources/StickerPaneSearchGlobaltem.swift
diff --git a/submodules/TelegramUI/TelegramUI/StickerPaneSearchStickerItem.swift b/submodules/TelegramUI/Sources/StickerPaneSearchStickerItem.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/StickerPaneSearchStickerItem.swift
rename to submodules/TelegramUI/Sources/StickerPaneSearchStickerItem.swift
diff --git a/submodules/TelegramUI/TelegramUI/StickersChatInputContextPanelItem.swift b/submodules/TelegramUI/Sources/StickersChatInputContextPanelItem.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/StickersChatInputContextPanelItem.swift
rename to submodules/TelegramUI/Sources/StickersChatInputContextPanelItem.swift
diff --git a/submodules/TelegramUI/TelegramUI/StickersChatInputContextPanelNode.swift b/submodules/TelegramUI/Sources/StickersChatInputContextPanelNode.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/StickersChatInputContextPanelNode.swift
rename to submodules/TelegramUI/Sources/StickersChatInputContextPanelNode.swift
diff --git a/submodules/TelegramUI/TelegramUI/StoreDownloadedMedia.swift b/submodules/TelegramUI/Sources/StoreDownloadedMedia.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/StoreDownloadedMedia.swift
rename to submodules/TelegramUI/Sources/StoreDownloadedMedia.swift
diff --git a/submodules/TelegramUI/TelegramUI/StringForMessageTimestampStatus.swift b/submodules/TelegramUI/Sources/StringForMessageTimestampStatus.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/StringForMessageTimestampStatus.swift
rename to submodules/TelegramUI/Sources/StringForMessageTimestampStatus.swift
diff --git a/submodules/TelegramUI/TelegramUI/SuppressContactsWarning.swift b/submodules/TelegramUI/Sources/SuppressContactsWarning.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/SuppressContactsWarning.swift
rename to submodules/TelegramUI/Sources/SuppressContactsWarning.swift
diff --git a/submodules/TelegramUI/TelegramUI/TelegramAccountAuxiliaryMethods.swift b/submodules/TelegramUI/Sources/TelegramAccountAuxiliaryMethods.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/TelegramAccountAuxiliaryMethods.swift
rename to submodules/TelegramUI/Sources/TelegramAccountAuxiliaryMethods.swift
diff --git a/submodules/TelegramUI/TelegramUI/TelegramRootController.swift b/submodules/TelegramUI/Sources/TelegramRootController.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/TelegramRootController.swift
rename to submodules/TelegramUI/Sources/TelegramRootController.swift
diff --git a/submodules/TelegramUI/TelegramUI/TelegramUI.h b/submodules/TelegramUI/Sources/TelegramUI.h
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/TelegramUI.h
rename to submodules/TelegramUI/Sources/TelegramUI.h
diff --git a/submodules/TelegramUI/TelegramUI/TextLinkHandling.swift b/submodules/TelegramUI/Sources/TextLinkHandling.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/TextLinkHandling.swift
rename to submodules/TelegramUI/Sources/TextLinkHandling.swift
diff --git a/submodules/TelegramUI/TelegramUI/ThemeUpdateManager.swift b/submodules/TelegramUI/Sources/ThemeUpdateManager.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/ThemeUpdateManager.swift
rename to submodules/TelegramUI/Sources/ThemeUpdateManager.swift
diff --git a/submodules/TelegramUI/TelegramUI/TimeBasedVideoPreload.swift b/submodules/TelegramUI/Sources/TimeBasedVideoPreload.swift
similarity index 98%
rename from submodules/TelegramUI/TelegramUI/TimeBasedVideoPreload.swift
rename to submodules/TelegramUI/Sources/TimeBasedVideoPreload.swift
index 6205787284..2015895dab 100644
--- a/submodules/TelegramUI/TelegramUI/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/TelegramUI/TelegramUI/TonePlayer.swift b/submodules/TelegramUI/Sources/TonePlayer.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/TonePlayer.swift
rename to submodules/TelegramUI/Sources/TonePlayer.swift
diff --git a/submodules/TelegramUI/TelegramUI/TransformOutgoingMessageMedia.swift b/submodules/TelegramUI/Sources/TransformOutgoingMessageMedia.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/TransformOutgoingMessageMedia.swift
rename to submodules/TelegramUI/Sources/TransformOutgoingMessageMedia.swift
diff --git a/submodules/TelegramUI/TelegramUI/UpgradedAccounts.swift b/submodules/TelegramUI/Sources/UpgradedAccounts.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/UpgradedAccounts.swift
rename to submodules/TelegramUI/Sources/UpgradedAccounts.swift
diff --git a/submodules/TelegramUI/TelegramUI/VerticalListContextResultsChatInputContextPanelNode.swift b/submodules/TelegramUI/Sources/VerticalListContextResultsChatInputContextPanelNode.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/VerticalListContextResultsChatInputContextPanelNode.swift
rename to submodules/TelegramUI/Sources/VerticalListContextResultsChatInputContextPanelNode.swift
diff --git a/submodules/TelegramUI/TelegramUI/VerticalListContextResultsChatInputPanelButtonItem.swift b/submodules/TelegramUI/Sources/VerticalListContextResultsChatInputPanelButtonItem.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/VerticalListContextResultsChatInputPanelButtonItem.swift
rename to submodules/TelegramUI/Sources/VerticalListContextResultsChatInputPanelButtonItem.swift
diff --git a/submodules/TelegramUI/TelegramUI/VerticalListContextResultsChatInputPanelItem.swift b/submodules/TelegramUI/Sources/VerticalListContextResultsChatInputPanelItem.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/VerticalListContextResultsChatInputPanelItem.swift
rename to submodules/TelegramUI/Sources/VerticalListContextResultsChatInputPanelItem.swift
diff --git a/submodules/TelegramUI/TelegramUI/VolumeButtons.swift b/submodules/TelegramUI/Sources/VolumeButtons.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/VolumeButtons.swift
rename to submodules/TelegramUI/Sources/VolumeButtons.swift
diff --git a/submodules/TelegramUI/TelegramUI/WalletContextImpl.swift b/submodules/TelegramUI/Sources/WalletContextImpl.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/WalletContextImpl.swift
rename to submodules/TelegramUI/Sources/WalletContextImpl.swift
diff --git a/submodules/TelegramUI/TelegramUI/WallpaperPreviewMedia.swift b/submodules/TelegramUI/Sources/WallpaperPreviewMedia.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/WallpaperPreviewMedia.swift
rename to submodules/TelegramUI/Sources/WallpaperPreviewMedia.swift
diff --git a/submodules/TelegramUI/TelegramUI/WallpaperUploadManager.swift b/submodules/TelegramUI/Sources/WallpaperUploadManager.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/WallpaperUploadManager.swift
rename to submodules/TelegramUI/Sources/WallpaperUploadManager.swift
diff --git a/submodules/TelegramUI/TelegramUI/WatchManager.swift b/submodules/TelegramUI/Sources/WatchManager.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/WatchManager.swift
rename to submodules/TelegramUI/Sources/WatchManager.swift
diff --git a/submodules/TelegramUI/TelegramUI/Weak.swift b/submodules/TelegramUI/Sources/Weak.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/Weak.swift
rename to submodules/TelegramUI/Sources/Weak.swift
diff --git a/submodules/TelegramUI/TelegramUI/WebpagePreviewAccessoryPanelNode.swift b/submodules/TelegramUI/Sources/WebpagePreviewAccessoryPanelNode.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/WebpagePreviewAccessoryPanelNode.swift
rename to submodules/TelegramUI/Sources/WebpagePreviewAccessoryPanelNode.swift
diff --git a/submodules/TelegramUI/TelegramUI/WidgetDataContext.swift b/submodules/TelegramUI/Sources/WidgetDataContext.swift
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/WidgetDataContext.swift
rename to submodules/TelegramUI/Sources/WidgetDataContext.swift
diff --git a/submodules/TelegramUI/TelegramUI/module.private.modulemap b/submodules/TelegramUI/Sources/module.private.modulemap
similarity index 100%
rename from submodules/TelegramUI/TelegramUI/module.private.modulemap
rename to submodules/TelegramUI/Sources/module.private.modulemap
diff --git a/submodules/TelegramUI/TelegramUI/Info.plist b/submodules/TelegramUI/TelegramUI/Info.plist
deleted file mode 100644
index fbe1e6b314..0000000000
--- a/submodules/TelegramUI/TelegramUI/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/TelegramUI/TelegramUI/Resources/PresentationStrings.mapping b/submodules/TelegramUI/TelegramUI/Resources/PresentationStrings.mapping
deleted file mode 100644
index 4a4a8803c8..0000000000
Binary files a/submodules/TelegramUI/TelegramUI/Resources/PresentationStrings.mapping and /dev/null differ
diff --git a/submodules/TelegramUI/TelegramUITests/Info.plist b/submodules/TelegramUI/TelegramUITests/Info.plist
deleted file mode 100644
index 6c6c23c43a..0000000000
--- a/submodules/TelegramUI/TelegramUITests/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>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>BNDL</string>
-	<key>CFBundleShortVersionString</key>
-	<string>1.0</string>
-	<key>CFBundleVersion</key>
-	<string>1</string>
-</dict>
-</plist>
diff --git a/submodules/TelegramUI/TelegramUITests/TelegramUITests.swift b/submodules/TelegramUI/TelegramUITests/TelegramUITests.swift
deleted file mode 100644
index 560aa7a2af..0000000000
--- a/submodules/TelegramUI/TelegramUITests/TelegramUITests.swift
+++ /dev/null
@@ -1,36 +0,0 @@
-//
-//  TelegramUITests.swift
-//  TelegramUITests
-//
-//  Created by Peter on 8/10/16.
-//  Copyright © 2016 Telegram. All rights reserved.
-//
-
-import XCTest
-@testable import TelegramUI
-
-class TelegramUITests: XCTestCase {
-    
-    override func setUp() {
-        super.setUp()
-        // Put setup code here. This method is called before the invocation of each test method in the class.
-    }
-    
-    override func tearDown() {
-        // Put teardown code here. This method is called after the invocation of each test method in the class.
-        super.tearDown()
-    }
-    
-    func testExample() {
-        // This is an example of a functional test case.
-        // Use XCTAssert and related functions to verify your tests produce the correct results.
-    }
-    
-    func testPerformanceExample() {
-        // This is an example of a performance test case.
-        self.measure {
-            // Put the code you want to measure the time of here.
-        }
-    }
-    
-}
diff --git a/submodules/TelegramUIPreferences/BUILD b/submodules/TelegramUIPreferences/BUILD
new file mode 100644
index 0000000000..4f41ca99bc
--- /dev/null
+++ b/submodules/TelegramUIPreferences/BUILD
@@ -0,0 +1,19 @@
+load("@build_bazel_rules_swift//swift:swift.bzl", "swift_library")
+
+swift_library(
+    name = "TelegramUIPreferences",
+    module_name = "TelegramUIPreferences",
+    srcs = glob([
+        "Sources/**/*.swift",
+    ]),
+    deps = [
+        "//submodules/TelegramCore:TelegramCore",
+        "//submodules/SyncCore:SyncCore",
+        "//submodules/Postbox:Postbox",
+        "//submodules/SSignalKit/SwiftSignalKit:SwiftSignalKit",
+        "//submodules/Display:Display",
+    ],
+    visibility = [
+        "//visibility:public",
+    ],
+)
diff --git a/submodules/TelegramUIPreferences/Info.plist b/submodules/TelegramUIPreferences/Info.plist
deleted file mode 100644
index e1fe4cfb7b..0000000000
--- a/submodules/TelegramUIPreferences/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/TelegramUIPreferences/Sources/ChatListFilterSettings.swift b/submodules/TelegramUIPreferences/Sources/ChatListFilterSettings.swift
index 014bd26eb9..dca12977f6 100644
--- a/submodules/TelegramUIPreferences/Sources/ChatListFilterSettings.swift
+++ b/submodules/TelegramUIPreferences/Sources/ChatListFilterSettings.swift
@@ -3,22 +3,17 @@ import Postbox
 import SwiftSignalKit
 
 public struct ChatListFilterSettings: Equatable, PreferencesEntry {
-    public var displayTabs: Bool
-    
     public static var `default`: ChatListFilterSettings {
-        return ChatListFilterSettings(displayTabs: true)
+        return ChatListFilterSettings()
     }
     
-    public init(displayTabs: Bool) {
-        self.displayTabs = displayTabs
+    public init() {
     }
     
     public init(decoder: PostboxDecoder) {
-        self.displayTabs = decoder.decodeInt32ForKey("displayTabs", orElse: 1) != 0
     }
     
     public func encode(_ encoder: PostboxEncoder) {
-        encoder.encodeInt32(self.displayTabs ? 1 : 0, forKey: "displayTabs")
     }
     
     public func isEqual(to: PreferencesEntry) -> Bool {
diff --git a/submodules/TelegramUIPreferences/Sources/InAppNotificationSettings.swift b/submodules/TelegramUIPreferences/Sources/InAppNotificationSettings.swift
index f0cf6f3bfc..7e4952fdd4 100644
--- a/submodules/TelegramUIPreferences/Sources/InAppNotificationSettings.swift
+++ b/submodules/TelegramUIPreferences/Sources/InAppNotificationSettings.swift
@@ -39,7 +39,7 @@ public struct InAppNotificationSettings: PreferencesEntry, Equatable {
     public var displayNotificationsFromAllAccounts: Bool
     
     public static var defaultSettings: InAppNotificationSettings {
-        return InAppNotificationSettings(playSounds: true, vibrate: false, displayPreviews: true, totalUnreadCountDisplayStyle: .filtered, totalUnreadCountDisplayCategory: .messages, totalUnreadCountIncludeTags: [.privateChat, .secretChat, .bot, .privateGroup], displayNameOnLockscreen: true, displayNotificationsFromAllAccounts: true)
+        return InAppNotificationSettings(playSounds: true, vibrate: false, displayPreviews: true, totalUnreadCountDisplayStyle: .filtered, totalUnreadCountDisplayCategory: .messages, totalUnreadCountIncludeTags: .all, displayNameOnLockscreen: true, displayNotificationsFromAllAccounts: true)
     }
     
     public init(playSounds: Bool, vibrate: Bool, displayPreviews: Bool, totalUnreadCountDisplayStyle: TotalUnreadCountDisplayStyle, totalUnreadCountDisplayCategory: TotalUnreadCountDisplayCategory, totalUnreadCountIncludeTags: PeerSummaryCounterTags, displayNameOnLockscreen: Bool, displayNotificationsFromAllAccounts: Bool) {
@@ -65,19 +65,19 @@ public struct InAppNotificationSettings: PreferencesEntry, Equatable {
             var resultTags: PeerSummaryCounterTags = []
             for legacyTag in LegacyPeerSummaryCounterTags(rawValue: value) {
                 if legacyTag == .regularChatsAndPrivateGroups {
-                    resultTags.insert(.privateChat)
-                    resultTags.insert(.secretChat)
+                    resultTags.insert(.contact)
+                    resultTags.insert(.nonContact)
                     resultTags.insert(.bot)
-                    resultTags.insert(.privateGroup)
+                    resultTags.insert(.group)
                 } else if legacyTag == .publicGroups {
-                    resultTags.insert(.publicGroup)
+                    resultTags.insert(.group)
                 } else if legacyTag == .channels {
                     resultTags.insert(.channel)
                 }
             }
             self.totalUnreadCountIncludeTags = resultTags
         } else {
-            self.totalUnreadCountIncludeTags = [.privateChat, .secretChat, .bot, .privateGroup]
+            self.totalUnreadCountIncludeTags = .all
         }
         self.displayNameOnLockscreen = decoder.decodeInt32ForKey("displayNameOnLockscreen", orElse: 1) != 0
         self.displayNotificationsFromAllAccounts = decoder.decodeInt32ForKey("displayNotificationsFromAllAccounts", orElse: 1) != 0
diff --git a/submodules/TelegramUIPreferences/Sources/PresentationThemeSettings.swift b/submodules/TelegramUIPreferences/Sources/PresentationThemeSettings.swift
index ab9d7e7291..57f98c02d8 100644
--- a/submodules/TelegramUIPreferences/Sources/PresentationThemeSettings.swift
+++ b/submodules/TelegramUIPreferences/Sources/PresentationThemeSettings.swift
@@ -1,4 +1,5 @@
 import Foundation
+import UIKit
 import Postbox
 import TelegramCore
 import SyncCore
diff --git a/submodules/TelegramUniversalVideoContent/BUILD b/submodules/TelegramUniversalVideoContent/BUILD
new file mode 100644
index 0000000000..02e43b5184
--- /dev/null
+++ b/submodules/TelegramUniversalVideoContent/BUILD
@@ -0,0 +1,27 @@
+load("@build_bazel_rules_swift//swift:swift.bzl", "swift_library")
+
+swift_library(
+    name = "TelegramUniversalVideoContent",
+    module_name = "TelegramUniversalVideoContent",
+    srcs = glob([
+        "Sources/**/*.swift",
+    ]),
+    deps = [
+        "//submodules/AsyncDisplayKit:AsyncDisplayKit",
+        "//submodules/Display:Display",
+        "//submodules/Postbox:Postbox",
+        "//submodules/TelegramCore:TelegramCore",
+        "//submodules/SyncCore:SyncCore",
+        "//submodules/SSignalKit/SwiftSignalKit:SwiftSignalKit",
+        "//submodules/MediaPlayer:UniversalMediaPlayer",
+        "//submodules/AccountContext:AccountContext",
+        "//submodules/TelegramPresentationData:TelegramPresentationData",
+        "//submodules/PhotoResources:PhotoResources",
+        "//submodules/LegacyComponents:LegacyComponents",
+        "//submodules/RadialStatusNode:RadialStatusNode",
+        "//submodules/AppBundle:AppBundle",
+    ],
+    visibility = [
+        "//visibility:public",
+    ],
+)
diff --git a/submodules/TelegramUniversalVideoContent/Info.plist b/submodules/TelegramUniversalVideoContent/Info.plist
deleted file mode 100644
index e1fe4cfb7b..0000000000
--- a/submodules/TelegramUniversalVideoContent/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/TelegramUpdateUI/BUILD b/submodules/TelegramUpdateUI/BUILD
new file mode 100644
index 0000000000..85e20cc246
--- /dev/null
+++ b/submodules/TelegramUpdateUI/BUILD
@@ -0,0 +1,23 @@
+load("@build_bazel_rules_swift//swift:swift.bzl", "swift_library")
+
+swift_library(
+    name = "TelegramUpdateUI",
+    module_name = "TelegramUpdateUI",
+    srcs = glob([
+        "Sources/**/*.swift",
+    ]),
+    deps = [
+        "//submodules/SSignalKit/SwiftSignalKit:SwiftSignalKit",
+        "//submodules/AsyncDisplayKit:AsyncDisplayKit",
+        "//submodules/Display:Display",
+        "//submodules/Postbox:Postbox",
+        "//submodules/TelegramCore:TelegramCore",
+        "//submodules/SyncCore:SyncCore",
+        "//submodules/TelegramPresentationData:TelegramPresentationData",
+        "//submodules/ItemListUI:ItemListUI",
+        "//submodules/PresentationDataUtils:PresentationDataUtils",
+    ],
+    visibility = [
+        "//visibility:public",
+    ],
+)
diff --git a/submodules/TelegramUpdateUI/Info.plist b/submodules/TelegramUpdateUI/Info.plist
deleted file mode 100644
index e1fe4cfb7b..0000000000
--- a/submodules/TelegramUpdateUI/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/TelegramUpdateUI/Sources/TelegramUpdateUI.h b/submodules/TelegramUpdateUI/Sources/TelegramUpdateUI.h
deleted file mode 100644
index b423213831..0000000000
--- a/submodules/TelegramUpdateUI/Sources/TelegramUpdateUI.h
+++ /dev/null
@@ -1,19 +0,0 @@
-//
-//  TelegramUpdateUI.h
-//  TelegramUpdateUI
-//
-//  Created by Peter on 8/1/19.
-//  Copyright © 2019 Telegram Messenger LLP. All rights reserved.
-//
-
-#import <UIKit/UIKit.h>
-
-//! Project version number for TelegramUpdateUI.
-FOUNDATION_EXPORT double TelegramUpdateUIVersionNumber;
-
-//! Project version string for TelegramUpdateUI.
-FOUNDATION_EXPORT const unsigned char TelegramUpdateUIVersionString[];
-
-// In this header, you should import all the public headers of your framework using statements like #import <TelegramUpdateUI/PublicHeader.h>
-
-
diff --git a/submodules/TelegramVoip/BUCK b/submodules/TelegramVoip/BUCK
index 862593d529..6d74bfe5bb 100644
--- a/submodules/TelegramVoip/BUCK
+++ b/submodules/TelegramVoip/BUCK
@@ -4,21 +4,14 @@ static_library(
     name = "TelegramVoip",
     srcs = glob([
         "Sources/**/*.swift",
-        "Sources/**/*.m",
     ]),
-    headers = glob([
-        "Sources/**/*.h",
-    ], exclude = ["Sources/TelegramVoip.h"]),
-    exported_headers = glob([
-        "Sources/**/*.h",
-    ], exclude = ["Sources/TelegramVoip.h"]),
     deps = [
         "//submodules/SSignalKit/SwiftSignalKit:SwiftSignalKit#shared",
         "//submodules/TelegramCore:TelegramCore#shared",
         "//submodules/SyncCore:SyncCore#shared",
         "//submodules/Postbox:Postbox#shared",
     	"//submodules/TelegramUIPreferences:TelegramUIPreferences",
-        "//submodules/libtgvoip:libtgvoip",
+        "//submodules/TgVoip:TgVoip",
     ],
     frameworks = [
         "$SDKROOT/System/Library/Frameworks/Foundation.framework",
diff --git a/submodules/TelegramVoip/BUILD b/submodules/TelegramVoip/BUILD
new file mode 100644
index 0000000000..0fa6b09a6d
--- /dev/null
+++ b/submodules/TelegramVoip/BUILD
@@ -0,0 +1,20 @@
+load("@build_bazel_rules_swift//swift:swift.bzl", "swift_library")
+
+swift_library(
+    name = "TelegramVoip",
+    module_name = "TelegramVoip",
+    srcs = glob([
+        "Sources/**/*.swift",
+    ]),
+    deps = [
+        "//submodules/SSignalKit/SwiftSignalKit:SwiftSignalKit",
+        "//submodules/TelegramCore:TelegramCore",
+        "//submodules/SyncCore:SyncCore",
+        "//submodules/Postbox:Postbox",
+        "//submodules/TelegramUIPreferences:TelegramUIPreferences",
+        "//submodules/TgVoip:TgVoip",
+    ],
+    visibility = [
+        "//visibility:public",
+    ],
+)
diff --git a/submodules/TelegramVoip/Info.plist b/submodules/TelegramVoip/Info.plist
deleted file mode 100644
index e1fe4cfb7b..0000000000
--- a/submodules/TelegramVoip/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/TelegramVoip/Sources/OngoingCallContext.swift b/submodules/TelegramVoip/Sources/OngoingCallContext.swift
index 016897e9fe..876978cd37 100644
--- a/submodules/TelegramVoip/Sources/OngoingCallContext.swift
+++ b/submodules/TelegramVoip/Sources/OngoingCallContext.swift
@@ -4,7 +4,7 @@ import TelegramCore
 import SyncCore
 import Postbox
 import TelegramUIPreferences
-import libtgvoip
+import TgVoip
 
 private func callConnectionDescription(_ connection: CallSessionConnection) -> OngoingCallConnectionDescription {
     return OngoingCallConnectionDescription(connectionId: connection.id, ip: connection.ip, ipv6: connection.ipv6, port: connection.port, peerTag: connection.peerTag)
diff --git a/submodules/TelegramVoip/Sources/TelegramVoip.h b/submodules/TelegramVoip/Sources/TelegramVoip.h
deleted file mode 100644
index 0452cc7833..0000000000
--- a/submodules/TelegramVoip/Sources/TelegramVoip.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#import <UIKit/UIKit.h>
-
-//! Project version number for TelegramVoip.
-FOUNDATION_EXPORT double TelegramVoipVersionNumber;
-
-//! Project version string for TelegramVoip.
-FOUNDATION_EXPORT const unsigned char TelegramVoipVersionString[];
diff --git a/submodules/TemporaryCachedPeerDataManager/BUILD b/submodules/TemporaryCachedPeerDataManager/BUILD
new file mode 100644
index 0000000000..21f1c84fdd
--- /dev/null
+++ b/submodules/TemporaryCachedPeerDataManager/BUILD
@@ -0,0 +1,19 @@
+load("@build_bazel_rules_swift//swift:swift.bzl", "swift_library")
+
+swift_library(
+    name = "TemporaryCachedPeerDataManager",
+    module_name = "TemporaryCachedPeerDataManager",
+    srcs = glob([
+        "Sources/**/*.swift",
+    ]),
+    deps = [
+        "//submodules/TelegramStringFormatting:TelegramStringFormatting",
+        "//submodules/SSignalKit/SwiftSignalKit:SwiftSignalKit",
+        "//submodules/TelegramCore:TelegramCore",
+        "//submodules/SyncCore:SyncCore",
+        "//submodules/Postbox:Postbox",
+    ],
+    visibility = [
+        "//visibility:public",
+    ],
+)
diff --git a/submodules/TemporaryCachedPeerDataManager/Info.plist b/submodules/TemporaryCachedPeerDataManager/Info.plist
deleted file mode 100644
index e1fe4cfb7b..0000000000
--- a/submodules/TemporaryCachedPeerDataManager/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/TemporaryCachedPeerDataManager/Sources/TemporaryCachedPeerDataManager.h b/submodules/TemporaryCachedPeerDataManager/Sources/TemporaryCachedPeerDataManager.h
deleted file mode 100644
index dd954bf90a..0000000000
--- a/submodules/TemporaryCachedPeerDataManager/Sources/TemporaryCachedPeerDataManager.h
+++ /dev/null
@@ -1,19 +0,0 @@
-//
-//  TemporaryCachedPeerDataManager.h
-//  TemporaryCachedPeerDataManager
-//
-//  Created by Peter on 8/5/19.
-//  Copyright © 2019 Telegram Messenger LLP. All rights reserved.
-//
-
-#import <UIKit/UIKit.h>
-
-//! Project version number for TemporaryCachedPeerDataManager.
-FOUNDATION_EXPORT double TemporaryCachedPeerDataManagerVersionNumber;
-
-//! Project version string for TemporaryCachedPeerDataManager.
-FOUNDATION_EXPORT const unsigned char TemporaryCachedPeerDataManagerVersionString[];
-
-// In this header, you should import all the public headers of your framework using statements like #import <TemporaryCachedPeerDataManager/PublicHeader.h>
-
-
diff --git a/submodules/TextFormat/BUILD b/submodules/TextFormat/BUILD
new file mode 100644
index 0000000000..b182b53814
--- /dev/null
+++ b/submodules/TextFormat/BUILD
@@ -0,0 +1,19 @@
+load("@build_bazel_rules_swift//swift:swift.bzl", "swift_library")
+
+swift_library(
+    name = "TextFormat",
+    module_name = "TextFormat",
+    srcs = glob([
+        "Sources/**/*.swift",
+    ]),
+    deps = [
+    	"//submodules/TelegramCore:TelegramCore",
+        "//submodules/SyncCore:SyncCore",
+        "//submodules/Display:Display",
+        "//submodules/TelegramPresentationData:TelegramPresentationData",
+        "//submodules/Markdown:Markdown",
+    ],
+    visibility = [
+        "//visibility:public",
+    ],
+)
diff --git a/submodules/TextFormat/Info.plist b/submodules/TextFormat/Info.plist
deleted file mode 100644
index e1fe4cfb7b..0000000000
--- a/submodules/TextFormat/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/TextSelectionNode/BUILD b/submodules/TextSelectionNode/BUILD
new file mode 100644
index 0000000000..0795ef338f
--- /dev/null
+++ b/submodules/TextSelectionNode/BUILD
@@ -0,0 +1,17 @@
+load("@build_bazel_rules_swift//swift:swift.bzl", "swift_library")
+
+swift_library(
+    name = "TextSelectionNode",
+    module_name = "TextSelectionNode",
+    srcs = glob([
+        "Sources/**/*.swift",
+    ]),
+    deps = [
+        "//submodules/AsyncDisplayKit:AsyncDisplayKit",
+        "//submodules/Display:Display",
+        "//submodules/TelegramPresentationData:TelegramPresentationData",
+    ],
+    visibility = [
+        "//visibility:public",
+    ],
+)
diff --git a/submodules/TextSelectionNode/Info.plist b/submodules/TextSelectionNode/Info.plist
deleted file mode 100644
index e1fe4cfb7b..0000000000
--- a/submodules/TextSelectionNode/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/TextSelectionNode/Sources/TextSelectionNode.h b/submodules/TextSelectionNode/Sources/TextSelectionNode.h
deleted file mode 100644
index 4f7466a61b..0000000000
--- a/submodules/TextSelectionNode/Sources/TextSelectionNode.h
+++ /dev/null
@@ -1,19 +0,0 @@
-//
-//  TextSelectionNode.h
-//  TextSelectionNode
-//
-//  Created by Peter on 8/13/19.
-//  Copyright © 2019 Telegram Messenger LLP. All rights reserved.
-//
-
-#import <UIKit/UIKit.h>
-
-//! Project version number for TextSelectionNode.
-FOUNDATION_EXPORT double TextSelectionNodeVersionNumber;
-
-//! Project version string for TextSelectionNode.
-FOUNDATION_EXPORT const unsigned char TextSelectionNodeVersionString[];
-
-// In this header, you should import all the public headers of your framework using statements like #import <TextSelectionNode/PublicHeader.h>
-
-
diff --git a/submodules/libtgvoip/BUCK b/submodules/TgVoip/BUCK
similarity index 54%
rename from submodules/libtgvoip/BUCK
rename to submodules/TgVoip/BUCK
index 6435a94a45..e8d8d2596e 100644
--- a/submodules/libtgvoip/BUCK
+++ b/submodules/TgVoip/BUCK
@@ -1,41 +1,48 @@
 load("//Config:buck_rule_macros.bzl", "static_library", "glob_map", "glob_sub_map", "merge_maps")
 
 static_library(
-    name = "libtgvoip",
+    name = "TgVoip",
     srcs = glob([
-        "*.m",
-        "*.mm",
-        "*.cpp",
-        "audio/*.cpp",
-        "video/*.cpp",
-        "os/darwin/*.m",
-        "os/darwin/*.mm",
-        "os/darwin/*.cpp",
-        "os/posix/*.cpp",
-        "webrtc_dsp/**/*.c",
-        "webrtc_dsp/**/*.cc",
-        "webrtc_dsp/**/*.cpp",
-    ], exclude = ["os/darwin/*OSX*"]),
+        "Sources/**/*.m",
+        "Sources/**/*.mm",
+        "Sources/**/*.h",
+        "libtgvoip/*.m",
+        "libtgvoip/*.mm",
+        "libtgvoip/*.cpp",
+        "libtgvoip/audio/*.cpp",
+        "libtgvoip/video/*.cpp",
+        "libtgvoip/os/darwin/*.m",
+        "libtgvoip/os/darwin/*.mm",
+        "libtgvoip/os/darwin/*.cpp",
+        "libtgvoip/os/posix/*.cpp",
+        "libtgvoip/webrtc_dsp/**/*.c",
+        "libtgvoip/webrtc_dsp/**/*.cc",
+        "libtgvoip/webrtc_dsp/**/*.cpp",
+    ], exclude = ["libtgvoip/os/darwin/*OSX*"]),
     has_cpp = True,
     headers = merge_maps([
-        glob_map(glob([
-            "*.h",
-            "audio/*.h",
-            "video/*.h",
-        ])),
-        glob_map(glob([
-            "os/darwin/*.h",
-        ], exclude = ["os/darwin/*OSX*"])),
-        glob_sub_map("webrtc_dsp/", [
-            "webrtc_dsp/**/*.h",
+        glob_sub_map("libtgvoip/", [
+            "libtgvoip/*.h",
+            "libtgvoip/*.hpp",
+            "libtgvoip/audio/*.h",
+            "libtgvoip/audio/*.hpp",
+            "libtgvoip/video/*.h",
+            "libtgvoip/video/*.hpp",
+        ]),
+        glob_sub_map("libtgvoip/", [
+            "libtgvoip/os/darwin/*.h",
+        ], exclude = ["libtgvoip/os/darwin/*OSX*"]),
+        glob_sub_map("libtgvoip/webrtc_dsp/", [
+            "libtgvoip/webrtc_dsp/**/*.h",
         ]),
     ]),
     exported_headers = glob([
-        "OngoingCallThreadLocalContext.h"
-    ], exclude = ["libtgvoip.h"]),
+        "PublicHeaders/**/*.h",
+    ]),
     platform_compiler_flags = [
         ('arm.*', [
             '-DTGVOIP_USE_CUSTOM_CRYPTO',
+            '-DTGVOIP_USE_INSTALLED_OPUS',
             '-DWEBRTC_APM_DEBUG_DUMP=0',
             '-DWEBRTC_POSIX',
             '-DTGVOIP_HAVE_TGLOG',
@@ -45,6 +52,7 @@ static_library(
         ]),
         ('.*', [
             '-DTGVOIP_USE_CUSTOM_CRYPTO',
+            '-DTGVOIP_USE_INSTALLED_OPUS',
             '-DWEBRTC_APM_DEBUG_DUMP=0',
             '-DWEBRTC_POSIX',
             '-DTGVOIP_HAVE_TGLOG',
diff --git a/submodules/TgVoip/BUILD b/submodules/TgVoip/BUILD
new file mode 100644
index 0000000000..2bd634904e
--- /dev/null
+++ b/submodules/TgVoip/BUILD
@@ -0,0 +1,74 @@
+
+copts_arm = [
+    "-DTGVOIP_USE_CUSTOM_CRYPTO",
+    "-DWEBRTC_APM_DEBUG_DUMP=0",
+    "-DWEBRTC_POSIX",
+    "-DTGVOIP_HAVE_TGLOG",
+    "-DWEBRTC_NS_FLOAT",
+    "-DWEBRTC_IOS",
+    "-DWEBRTC_HAS_NEON",
+]
+
+copts_x86 = [
+    "-DTGVOIP_USE_CUSTOM_CRYPTO",
+    "-DWEBRTC_APM_DEBUG_DUMP=0",
+    "-DWEBRTC_POSIX",
+    "-DTGVOIP_HAVE_TGLOG",
+    "-DWEBRTC_NS_FLOAT",
+    "-DWEBRTC_IOS",
+]
+
+objc_library(
+    name = "TgVoip",
+    enable_modules = True,
+    module_name = "TgVoip",
+    srcs = glob([
+        "Sources/**/*.m",
+        "Sources/**/*.mm",
+        "Sources/**/*.h",
+        "libtgvoip/*.m",
+        "libtgvoip/*.mm",
+        "libtgvoip/*.cpp",
+        "libtgvoip/audio/*.cpp",
+        "libtgvoip/video/*.cpp",
+        "libtgvoip/os/darwin/*.m",
+        "libtgvoip/os/darwin/*.mm",
+        "libtgvoip/os/darwin/*.cpp",
+        "libtgvoip/os/posix/*.cpp",
+        "libtgvoip/webrtc_dsp/**/*.c",
+        "libtgvoip/webrtc_dsp/**/*.cc",
+        "libtgvoip/webrtc_dsp/**/*.cpp",
+    ], exclude = ["libtgvoip/os/darwin/*OSX*"]),
+    hdrs = glob([
+        "PublicHeaders/**/*.h",
+    ]),
+    copts = [
+        "-I{}/PublicHeaders/TgVoip".format(package_name()),
+        "-I{}/libtgvoip".format(package_name()),
+        "-I{}/libtgvoip/webrtc_dsp".format(package_name()),
+        "-DTGVOIP_USE_INSTALLED_OPUS",
+    ] + select({
+        "@build_bazel_rules_apple//apple:ios_armv7": copts_arm,
+        "@build_bazel_rules_apple//apple:ios_arm64": copts_arm,
+        "@build_bazel_rules_apple//apple:ios_x86_64": copts_x86,
+    }),
+    includes = [
+        "PublicHeaders",
+    ],
+    deps = [
+        "//submodules/MtProtoKit:MtProtoKit",
+        "//submodules/Opus:opus",
+    ],
+    sdk_frameworks = [
+        "Foundation",
+        "UIKit",
+        "AudioToolbox",
+        "VideoToolbox",
+        "CoreTelephony",
+        "CoreMedia",
+        "AVFoundation",
+    ],
+    visibility = [
+        "//visibility:public",
+    ],
+)
diff --git a/submodules/libtgvoip/OngoingCallThreadLocalContext.h b/submodules/TgVoip/PublicHeaders/TgVoip/OngoingCallThreadLocalContext.h
similarity index 100%
rename from submodules/libtgvoip/OngoingCallThreadLocalContext.h
rename to submodules/TgVoip/PublicHeaders/TgVoip/OngoingCallThreadLocalContext.h
diff --git a/submodules/libtgvoip/OngoingCallThreadLocalContext.mm b/submodules/TgVoip/PublicHeaders/TgVoip/OngoingCallThreadLocalContext.mm
similarity index 100%
rename from submodules/libtgvoip/OngoingCallThreadLocalContext.mm
rename to submodules/TgVoip/PublicHeaders/TgVoip/OngoingCallThreadLocalContext.mm
diff --git a/submodules/TgVoip/Sources/OngoingCallThreadLocalContext.mm b/submodules/TgVoip/Sources/OngoingCallThreadLocalContext.mm
new file mode 100644
index 0000000000..4da89550f7
--- /dev/null
+++ b/submodules/TgVoip/Sources/OngoingCallThreadLocalContext.mm
@@ -0,0 +1,418 @@
+#import "OngoingCallThreadLocalContext.h"
+
+#import "VoIPController.h"
+#import "VoIPServerConfig.h"
+#import "os/darwin/SetupLogging.h"
+
+#import <MtProtoKit/MtProtoKit.h>
+
+static void TGCallAesIgeEncrypt(uint8_t *inBytes, uint8_t *outBytes, size_t length, uint8_t *key, uint8_t *iv) {
+    MTAesEncryptRaw(inBytes, outBytes, length, key, iv);
+}
+
+static void TGCallAesIgeDecrypt(uint8_t *inBytes, uint8_t *outBytes, size_t length, uint8_t *key, uint8_t *iv) {
+    MTAesDecryptRaw(inBytes, outBytes, length, key, iv);
+}
+
+static void TGCallSha1(uint8_t *msg, size_t length, uint8_t *output) {
+    MTRawSha1(msg, length, output);
+}
+
+static void TGCallSha256(uint8_t *msg, size_t length, uint8_t *output) {
+    MTRawSha256(msg, length, output);
+}
+
+static void TGCallAesCtrEncrypt(uint8_t *inOut, size_t length, uint8_t *key, uint8_t *iv, uint8_t *ecount, uint32_t *num) {
+    uint8_t *outData = (uint8_t *)malloc(length);
+    MTAesCtr *aesCtr = [[MTAesCtr alloc] initWithKey:key keyLength:32 iv:iv ecount:ecount num:*num];
+    [aesCtr encryptIn:inOut out:outData len:length];
+    memcpy(inOut, outData, length);
+    free(outData);
+    
+    [aesCtr getIv:iv];
+    
+    memcpy(ecount, [aesCtr ecount], 16);
+    *num = [aesCtr num];
+}
+
+static void TGCallRandomBytes(uint8_t *buffer, size_t length) {
+    arc4random_buf(buffer, length);
+}
+
+@implementation OngoingCallConnectionDescription
+
+- (instancetype _Nonnull)initWithConnectionId:(int64_t)connectionId ip:(NSString * _Nonnull)ip ipv6:(NSString * _Nonnull)ipv6 port:(int32_t)port peerTag:(NSData * _Nonnull)peerTag {
+    self = [super init];
+    if (self != nil) {
+        _connectionId = connectionId;
+        _ip = ip;
+        _ipv6 = ipv6;
+        _port = port;
+        _peerTag = peerTag;
+    }
+    return self;
+}
+
+@end
+
+static MTAtomic *callContexts() {
+    static MTAtomic *instance = nil;
+    static dispatch_once_t onceToken;
+    dispatch_once(&onceToken, ^{
+        instance = [[MTAtomic alloc] initWithValue:[[NSMutableDictionary alloc] init]];
+    });
+    return instance;
+}
+
+@interface OngoingCallThreadLocalContextReference : NSObject
+
+@property (nonatomic, weak) OngoingCallThreadLocalContext *context;
+@property (nonatomic, strong, readonly) id<OngoingCallThreadLocalContextQueue> queue;
+
+@end
+
+@implementation OngoingCallThreadLocalContextReference
+
+- (instancetype)initWithContext:(OngoingCallThreadLocalContext *)context queue:(id<OngoingCallThreadLocalContextQueue>)queue {
+    self = [super init];
+    if (self != nil) {
+        self.context = context;
+        _queue = queue;
+    }
+    return self;
+}
+
+@end
+
+static int32_t nextId = 1;
+
+static int32_t addContext(OngoingCallThreadLocalContext *context, id<OngoingCallThreadLocalContextQueue> queue) {
+    int32_t contextId = OSAtomicIncrement32(&nextId);
+    [callContexts() with:^id(NSMutableDictionary *dict) {
+        dict[@(contextId)] = [[OngoingCallThreadLocalContextReference alloc] initWithContext:context queue:queue];
+        return nil;
+    }];
+    return contextId;
+}
+
+static void removeContext(int32_t contextId) {
+    [callContexts() with:^id(NSMutableDictionary *dict) {
+        [dict removeObjectForKey:@(contextId)];
+        return nil;
+    }];
+}
+
+static void withContext(int32_t contextId, void (^f)(OngoingCallThreadLocalContext *)) {
+    __block OngoingCallThreadLocalContextReference *reference = nil;
+    [callContexts() with:^id(NSMutableDictionary *dict) {
+        reference = dict[@(contextId)];
+        return nil;
+    }];
+    if (reference != nil) {
+        [reference.queue dispatch:^{
+            __strong OngoingCallThreadLocalContext *context = reference.context;
+            if (context != nil) {
+                f(context);
+            }
+        }];
+    }
+}
+
+@interface OngoingCallThreadLocalContext () {
+    id<OngoingCallThreadLocalContextQueue> _queue;
+    int32_t _contextId;
+
+    OngoingCallNetworkType _networkType;
+    NSTimeInterval _callReceiveTimeout;
+    NSTimeInterval _callRingTimeout;
+    NSTimeInterval _callConnectTimeout;
+    NSTimeInterval _callPacketTimeout;
+    int32_t _dataSavingMode;
+    
+    tgvoip::VoIPController *_controller;
+    
+    OngoingCallState _state;
+    int32_t _signalBars;
+    NSData *_lastDerivedState;
+}
+
+- (void)controllerStateChanged:(int)state;
+- (void)signalBarsChanged:(int32_t)signalBars;
+
+@end
+
+static void controllerStateCallback(tgvoip::VoIPController *controller, int state) {
+    int32_t contextId = (int32_t)((intptr_t)controller->implData);
+    withContext(contextId, ^(OngoingCallThreadLocalContext *context) {
+        [context controllerStateChanged:state];
+    });
+}
+
+static void signalBarsCallback(tgvoip::VoIPController *controller, int signalBars) {
+    int32_t contextId = (int32_t)((intptr_t)controller->implData);
+    withContext(contextId, ^(OngoingCallThreadLocalContext *context) {
+        [context signalBarsChanged:(int32_t)signalBars];
+    });
+}
+
+@implementation VoipProxyServer
+
+- (instancetype _Nonnull)initWithHost:(NSString * _Nonnull)host port:(int32_t)port username:(NSString * _Nullable)username password:(NSString * _Nullable)password {
+    self = [super init];
+    if (self != nil) {
+        _host = host;
+        _port = port;
+        _username = username;
+        _password = password;
+    }
+    return self;
+}
+
+@end
+
+static int callControllerNetworkTypeForType(OngoingCallNetworkType type) {
+    switch (type) {
+        case OngoingCallNetworkTypeWifi:
+            return tgvoip::NET_TYPE_WIFI;
+        case OngoingCallNetworkTypeCellularGprs:
+            return tgvoip::NET_TYPE_GPRS;
+        case OngoingCallNetworkTypeCellular3g:
+            return tgvoip::NET_TYPE_3G;
+        case OngoingCallNetworkTypeCellularLte:
+            return tgvoip::NET_TYPE_LTE;
+        default:
+            return tgvoip::NET_TYPE_WIFI;
+    }
+}
+
+static int callControllerDataSavingForType(OngoingCallDataSaving type) {
+    switch (type) {
+        case OngoingCallDataSavingNever:
+            return tgvoip::DATA_SAVING_NEVER;
+        case OngoingCallDataSavingCellular:
+            return tgvoip::DATA_SAVING_MOBILE;
+        case OngoingCallDataSavingAlways:
+            return tgvoip::DATA_SAVING_ALWAYS;
+        default:
+            return tgvoip::DATA_SAVING_NEVER;
+    }
+}
+
+@implementation OngoingCallThreadLocalContext
+
++ (void)setupLoggingFunction:(void (*)(NSString *))loggingFunction {
+    TGVoipLoggingFunction = loggingFunction;
+}
+
++ (void)applyServerConfig:(NSString *)string {
+    if (string.length != 0) {
+        tgvoip::ServerConfig::GetSharedInstance()->Update(std::string(string.UTF8String));
+    }
+}
+
++ (int32_t)maxLayer {
+    return tgvoip::VoIPController::GetConnectionMaxLayer();
+}
+
++ (NSString *)version {
+    return [NSString stringWithUTF8String:tgvoip::VoIPController::GetVersion()];
+}
+
+- (instancetype _Nonnull)initWithQueue:(id<OngoingCallThreadLocalContextQueue> _Nonnull)queue proxy:(VoipProxyServer * _Nullable)proxy networkType:(OngoingCallNetworkType)networkType dataSaving:(OngoingCallDataSaving)dataSaving derivedState:(NSData * _Nonnull)derivedState {
+    self = [super init];
+    if (self != nil) {
+        _queue = queue;
+        assert([queue isCurrent]);
+        _contextId = addContext(self, queue);
+        
+        _callReceiveTimeout = 20.0;
+        _callRingTimeout = 90.0;
+        _callConnectTimeout = 30.0;
+        _callPacketTimeout = 10.0;
+        _dataSavingMode = callControllerDataSavingForType(dataSaving);
+        _networkType = networkType;
+        
+        _controller = new tgvoip::VoIPController();
+        _controller->implData = (void *)((intptr_t)_contextId);
+        std::vector<uint8_t> derivedStateValue;
+        derivedStateValue.resize(derivedState.length);
+        [derivedState getBytes:derivedStateValue.data() length:derivedState.length];
+        _controller->SetPersistentState(derivedStateValue);
+        
+        if (proxy != nil) {
+            _controller->SetProxy(tgvoip::PROXY_SOCKS5, proxy.host.UTF8String, (uint16_t)proxy.port, proxy.username.UTF8String ?: "", proxy.password.UTF8String ?: "");
+        }
+        
+        auto callbacks = tgvoip::VoIPController::Callbacks();
+        callbacks.connectionStateChanged = &controllerStateCallback;
+        callbacks.groupCallKeyReceived = NULL;
+        callbacks.groupCallKeySent = NULL;
+        callbacks.signalBarCountChanged = &signalBarsCallback;
+        callbacks.upgradeToGroupCallRequested = NULL;
+        _controller->SetCallbacks(callbacks);
+        
+        tgvoip::VoIPController::crypto.sha1 = &TGCallSha1;
+        tgvoip::VoIPController::crypto.sha256 = &TGCallSha256;
+        tgvoip::VoIPController::crypto.rand_bytes = &TGCallRandomBytes;
+        tgvoip::VoIPController::crypto.aes_ige_encrypt = &TGCallAesIgeEncrypt;
+        tgvoip::VoIPController::crypto.aes_ige_decrypt = &TGCallAesIgeDecrypt;
+        tgvoip::VoIPController::crypto.aes_ctr_encrypt = &TGCallAesCtrEncrypt;
+        
+        _state = OngoingCallStateInitializing;
+        _signalBars = -1;
+    }
+    return self;
+}
+
+- (void)dealloc {
+    assert([_queue isCurrent]);
+    removeContext(_contextId);
+    if (_controller != NULL) {
+        [self stop:nil];
+    }
+}
+
+- (void)startWithKey:(NSData * _Nonnull)key isOutgoing:(bool)isOutgoing primaryConnection:(OngoingCallConnectionDescription * _Nonnull)primaryConnection alternativeConnections:(NSArray<OngoingCallConnectionDescription *> * _Nonnull)alternativeConnections maxLayer:(int32_t)maxLayer allowP2P:(BOOL)allowP2P logPath:(NSString * _Nonnull)logPath {
+    std::vector<tgvoip::Endpoint> endpoints;
+    NSArray<OngoingCallConnectionDescription *> *connections = [@[primaryConnection] arrayByAddingObjectsFromArray:alternativeConnections];
+    for (OngoingCallConnectionDescription *connection in connections) {
+        struct in_addr addrIpV4;
+        if (!inet_aton(connection.ip.UTF8String, &addrIpV4)) {
+            NSLog(@"CallSession: invalid ipv4 address");
+        }
+        
+        struct in6_addr addrIpV6;
+        if (!inet_pton(AF_INET6, connection.ipv6.UTF8String, &addrIpV6)) {
+            NSLog(@"CallSession: invalid ipv6 address");
+        }
+        
+        tgvoip::IPv4Address address(std::string(connection.ip.UTF8String));
+        tgvoip::IPv6Address addressv6(std::string(connection.ipv6.UTF8String));
+        unsigned char peerTag[16];
+        [connection.peerTag getBytes:peerTag length:16];
+        endpoints.push_back(tgvoip::Endpoint(connection.connectionId, (uint16_t)connection.port, address, addressv6, tgvoip::Endpoint::Type::UDP_RELAY, peerTag));
+    }
+    
+    tgvoip::VoIPController::Config config(_callConnectTimeout, _callPacketTimeout, _dataSavingMode, false, true, true);
+    config.logFilePath = logPath.length > 0 ? std::string(logPath.UTF8String) : "";
+    config.statsDumpFilePath = "";
+    
+    if (_controller != nil) {
+        _controller->SetConfig(config);
+        
+        _controller->SetNetworkType(callControllerNetworkTypeForType(_networkType));
+        _controller->SetEncryptionKey((char *)key.bytes, isOutgoing);
+        _controller->SetRemoteEndpoints(endpoints, allowP2P, maxLayer);
+        _controller->Start();
+        
+        _controller->Connect();
+    }
+}
+
+- (void)stop:(void (^)(NSString *, int64_t, int64_t, int64_t, int64_t))completion {
+    if (_controller != nil) {
+        _controller->Stop();
+        
+        auto debugString = _controller->GetDebugLog();
+        NSString *debugLog = [NSString stringWithUTF8String:debugString.c_str()];
+        
+        tgvoip::VoIPController::TrafficStats stats;
+        _controller->GetStats(&stats);
+        std::vector<uint8_t> derivedStateValue = _controller->GetPersistentState();
+        _lastDerivedState = [[NSData alloc] initWithBytes:derivedStateValue.data() length:derivedStateValue.size()];
+        delete _controller;
+        _controller = NULL;
+        
+        if (completion) {
+            completion(debugLog, stats.bytesSentWifi, stats.bytesRecvdWifi, stats.bytesSentMobile, stats.bytesRecvdMobile);
+        }
+    }
+}
+    
+- (bool)needRate {
+    if (_controller != nil) {
+        return _controller->NeedRate();
+    } else {
+        return false;
+    }
+}
+
+- (NSString *)debugInfo {
+    if (_controller != nil) {
+        auto rawDebugString = _controller->GetDebugString();
+        return [NSString stringWithUTF8String:rawDebugString.c_str()];
+    } else {
+        return nil;
+    }
+}
+
+- (NSString *)version {
+    if (_controller != nil) {
+        return [NSString stringWithUTF8String:_controller->GetVersion()];
+    } else {
+        return nil;
+    }
+}
+
+- (NSData * _Nonnull)getDerivedState {
+    if (_controller != nil) {
+        std::vector<uint8_t> derivedStateValue = _controller->GetPersistentState();
+        return [[NSData alloc] initWithBytes:derivedStateValue.data() length:derivedStateValue.size()];
+    } else if (_lastDerivedState != nil) {
+        return _lastDerivedState;
+    } else {
+        return [NSData data];
+    }
+}
+
+- (void)controllerStateChanged:(int)state {
+    OngoingCallState callState = OngoingCallStateInitializing;
+    switch (state) {
+        case tgvoip::STATE_ESTABLISHED:
+            callState = OngoingCallStateConnected;
+            break;
+        case tgvoip::STATE_FAILED:
+            callState = OngoingCallStateFailed;
+            break;
+        case tgvoip::STATE_RECONNECTING:
+            callState = OngoingCallStateReconnecting;
+            break;
+        default:
+            break;
+    }
+    
+    if (callState != _state) {
+        _state = callState;
+        
+        if (_stateChanged) {
+            _stateChanged(callState);
+        }
+    }
+}
+
+- (void)signalBarsChanged:(int32_t)signalBars {
+    if (signalBars != _signalBars) {
+        _signalBars = signalBars;
+        
+        if (_signalBarsChanged) {
+            _signalBarsChanged(signalBars);
+        }
+    }
+}
+
+- (void)setIsMuted:(bool)isMuted {
+    if (_controller != nil) {
+        _controller->SetMicMute(isMuted);
+    }
+}
+
+- (void)setNetworkType:(OngoingCallNetworkType)networkType {
+    if (_networkType != networkType) {
+        _networkType = networkType;
+        if (_controller != nil) {
+            _controller->SetNetworkType(callControllerNetworkTypeForType(networkType));
+        }
+    }
+}
+
+@end
diff --git a/submodules/TgVoip/libtgvoip b/submodules/TgVoip/libtgvoip
new file mode 160000
index 0000000000..522550a1e9
--- /dev/null
+++ b/submodules/TgVoip/libtgvoip
@@ -0,0 +1 @@
+Subproject commit 522550a1e975b17e9048d7a2ab2d5b97cfc2f5d4
diff --git a/submodules/TinyThumbnail/BUILD b/submodules/TinyThumbnail/BUILD
new file mode 100644
index 0000000000..390a77b9fe
--- /dev/null
+++ b/submodules/TinyThumbnail/BUILD
@@ -0,0 +1,12 @@
+load("@build_bazel_rules_swift//swift:swift.bzl", "swift_library")
+
+swift_library(
+    name = "TinyThumbnail",
+    module_name = "TinyThumbnail",
+    srcs = glob([
+        "Sources/**/*.swift",
+    ]),
+    visibility = [
+        "//visibility:public",
+    ],
+)
diff --git a/submodules/TinyThumbnail/Info.plist b/submodules/TinyThumbnail/Info.plist
deleted file mode 100644
index e1fe4cfb7b..0000000000
--- a/submodules/TinyThumbnail/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/TinyThumbnail/Sources/TinyThumbnail.h b/submodules/TinyThumbnail/Sources/TinyThumbnail.h
deleted file mode 100644
index a7b8ea6aca..0000000000
--- a/submodules/TinyThumbnail/Sources/TinyThumbnail.h
+++ /dev/null
@@ -1,19 +0,0 @@
-//
-//  TinyThumbnail.h
-//  TinyThumbnail
-//
-//  Created by Peter on 8/10/19.
-//  Copyright © 2019 Telegram Messenger LLP. All rights reserved.
-//
-
-#import <UIKit/UIKit.h>
-
-//! Project version number for TinyThumbnail.
-FOUNDATION_EXPORT double TinyThumbnailVersionNumber;
-
-//! Project version string for TinyThumbnail.
-FOUNDATION_EXPORT const unsigned char TinyThumbnailVersionString[];
-
-// In this header, you should import all the public headers of your framework using statements like #import <TinyThumbnail/PublicHeader.h>
-
-
diff --git a/submodules/TonBinding/BUILD b/submodules/TonBinding/BUILD
new file mode 100644
index 0000000000..b3b54d2477
--- /dev/null
+++ b/submodules/TonBinding/BUILD
@@ -0,0 +1,26 @@
+objc_library(
+    name = "TonBinding",
+    module_name = "TonBinding",
+    enable_modules = True,
+    srcs = glob([
+        "Sources/**/*.m",
+        "Sources/**/*.mm",
+    ]),
+    hdrs = glob([
+        "Sources/**/*.h",
+    ]),
+    copts = [
+        "-std=c++14",
+    ],
+    includes = [
+        "Sources",
+    ],
+    deps = [
+        "//submodules/SSignalKit/SSignalKit:SSignalKit",
+        "//submodules/openssl:openssl",
+        "//submodules/ton:ton",
+    ],
+    visibility = [
+        "//visibility:public",
+    ],
+)
diff --git a/submodules/TonBinding/Sources/TON.h b/submodules/TonBinding/Sources/TON.h
index 2a373115f0..f29b344a57 100644
--- a/submodules/TonBinding/Sources/TON.h
+++ b/submodules/TonBinding/Sources/TON.h
@@ -39,15 +39,43 @@ NS_ASSUME_NONNULL_BEGIN
 
 @end
 
+@protocol TONTransactionMessageContents <NSObject>
+
+@end
+
+@interface TONTransactionMessageContentsRawData : NSObject <TONTransactionMessageContents>
+
+@property (nonatomic, strong, readonly) NSData * _Nonnull data;
+
+- (instancetype)initWithData:(NSData * _Nonnull)data;
+
+@end
+
+@interface TONTransactionMessageContentsPlainText : NSObject <TONTransactionMessageContents>
+
+@property (nonatomic, strong, readonly) NSString * _Nonnull text;
+
+- (instancetype)initWithText:(NSString * _Nonnull)text;
+
+@end
+
+@interface TONTransactionMessageContentsEncryptedText : NSObject <TONTransactionMessageContents>
+
+@property (nonatomic, strong, readonly) NSData * _Nonnull data;
+
+- (instancetype)initWithData:(NSData * _Nonnull)data;
+
+@end
+
 @interface TONTransactionMessage : NSObject
 
 @property (nonatomic, readonly) int64_t value;
 @property (nonatomic, strong, readonly) NSString * _Nonnull source;
 @property (nonatomic, strong, readonly) NSString * _Nonnull destination;
-@property (nonatomic, strong, readonly) NSString * _Nonnull textMessage;
+@property (nonatomic, strong, readonly) id<TONTransactionMessageContents> _Nonnull contents;
 @property (nonatomic, strong, readonly) NSData * _Nonnull bodyHash;
 
-- (instancetype)initWithValue:(int64_t)value source:(NSString * _Nonnull)source destination:(NSString * _Nonnull)destination textMessage:(NSString * _Nonnull)textMessage bodyHash:(NSData * _Nonnull)bodyHash;
+- (instancetype)initWithValue:(int64_t)value source:(NSString * _Nonnull)source destination:(NSString * _Nonnull)destination contents:(id<TONTransactionMessageContents> _Nonnull)contents bodyHash:(NSData * _Nonnull)bodyHash;
 
 @end
 
@@ -87,10 +115,10 @@ NS_ASSUME_NONNULL_BEGIN
 
 @interface TONSendGramsQueryFees : NSObject
 
-@property (nonatomic, strong, readonly) TONFees *sourceFees;
-@property (nonatomic, strong, readonly) TONFees *destinationFees;
+@property (nonatomic, strong, readonly) TONFees * _Nonnull sourceFees;
+@property (nonatomic, strong, readonly) NSArray<TONFees *> * _Nonnull destinationFees;
 
-- (instancetype)initWithSourceFees:(TONFees *)sourceFees destinationFees:(TONFees *)destinationFees;
+- (instancetype)initWithSourceFees:(TONFees * _Nonnull)sourceFees destinationFees:(NSArray<TONFees *> * _Nonnull)destinationFees;
 
 @end
 
@@ -131,8 +159,8 @@ NS_ASSUME_NONNULL_BEGIN
 - (SSignal *)createKeyWithLocalPassword:(NSData *)localPassword mnemonicPassword:(NSData *)mnemonicPassword;
 - (SSignal *)getWalletAccountAddressWithPublicKey:(NSString *)publicKey initialWalletId:(int64_t)initialWalletId;
 - (SSignal *)getAccountStateWithAddress:(NSString *)accountAddress;
-- (SSignal *)generateSendGramsQueryFromKey:(TONKey *)key localPassword:(NSData *)localPassword fromAddress:(NSString *)fromAddress toAddress:(NSString *)address amount:(int64_t)amount textMessage:(NSData *)textMessage forceIfDestinationNotInitialized:(bool)forceIfDestinationNotInitialized timeout:(int32_t)timeout randomId:(int64_t)randomId;
-- (SSignal *)generateFakeSendGramsQueryFromAddress:(NSString *)fromAddress toAddress:(NSString *)address amount:(int64_t)amount textMessage:(NSData *)textMessage forceIfDestinationNotInitialized:(bool)forceIfDestinationNotInitialized timeout:(int32_t)timeout;
+- (SSignal *)generateSendGramsQueryFromKey:(TONKey *)key localPassword:(NSData *)localPassword fromAddress:(NSString *)fromAddress toAddress:(NSString *)address amount:(int64_t)amount comment:(NSData *)comment encryptComment:(bool)encryptComment forceIfDestinationNotInitialized:(bool)forceIfDestinationNotInitialized timeout:(int32_t)timeout randomId:(int64_t)randomId;
+- (SSignal *)generateFakeSendGramsQueryFromAddress:(NSString *)fromAddress toAddress:(NSString *)address amount:(int64_t)amount comment:(NSData *)comment encryptComment:(bool)encryptComment forceIfDestinationNotInitialized:(bool)forceIfDestinationNotInitialized timeout:(int32_t)timeout;
 - (SSignal *)estimateSendGramsQueryFees:(TONPreparedSendGramsQuery *)preparedQuery;
 - (SSignal *)commitPreparedSendGramsQuery:(TONPreparedSendGramsQuery *)preparedQuery;
 - (SSignal *)exportKey:(TONKey *)key localPassword:(NSData *)localPassword;
@@ -140,6 +168,7 @@ NS_ASSUME_NONNULL_BEGIN
 - (SSignal *)deleteKey:(TONKey *)key;
 - (SSignal *)deleteAllKeys;
 - (SSignal *)getTransactionListWithAddress:(NSString * _Nonnull)address lt:(int64_t)lt hash:(NSData * _Nonnull)hash;
+- (SSignal *)decryptMessagesWithKey:(TONKey * _Nonnull)key localPassword:(NSData * _Nonnull)localPassword messages:(NSArray<NSData *> * _Nonnull)messages;
 
 - (NSData *)encrypt:(NSData *)decryptedData secret:(NSData *)data;
 - (NSData * __nullable)decrypt:(NSData *)encryptedData secret:(NSData *)data;
diff --git a/submodules/TonBinding/Sources/TON.mm b/submodules/TonBinding/Sources/TON.mm
index e976d08a5c..4b7fdb6bc6 100644
--- a/submodules/TonBinding/Sources/TON.mm
+++ b/submodules/TonBinding/Sources/TON.mm
@@ -48,14 +48,38 @@ static TONTransactionMessage * _Nullable parseTransactionMessage(tonlib_api::obj
     }
     NSString *source = readString(message->source_);
     NSString *destination = readString(message->destination_);
-    NSString *textMessage = readString(message->message_);
+    
+    id<TONTransactionMessageContents> contents = nil;
+    if (message->msg_data_->get_id() == tonlib_api::msg_dataRaw::ID) {
+        auto msgData = tonlib_api::move_object_as<tonlib_api::msg_dataRaw>(message->msg_data_);
+        contents = [[TONTransactionMessageContentsRawData alloc] initWithData:makeData(msgData->body_)];
+    } else if (message->msg_data_->get_id() == tonlib_api::msg_dataText::ID) {
+        auto msgData = tonlib_api::move_object_as<tonlib_api::msg_dataText>(message->msg_data_);
+        NSString *text = readString(msgData->text_);
+        if (text == nil) {
+            contents = [[TONTransactionMessageContentsPlainText alloc] initWithText:@""];
+        } else {
+            contents = [[TONTransactionMessageContentsPlainText alloc] initWithText:text];
+        }
+    } else if (message->msg_data_->get_id() == tonlib_api::msg_dataDecryptedText::ID) {
+        auto msgData = tonlib_api::move_object_as<tonlib_api::msg_dataDecryptedText>(message->msg_data_);
+        NSString *text = readString(msgData->text_);
+        if (text == nil) {
+            contents = [[TONTransactionMessageContentsPlainText alloc] initWithText:@""];
+        } else {
+            contents = [[TONTransactionMessageContentsPlainText alloc] initWithText:text];
+        }
+    } else if (message->msg_data_->get_id() == tonlib_api::msg_dataEncryptedText::ID) {
+        auto msgData = tonlib_api::move_object_as<tonlib_api::msg_dataEncryptedText>(message->msg_data_);
+        contents = [[TONTransactionMessageContentsEncryptedText alloc] initWithData:makeData(msgData->text_)];
+    } else {
+        contents = [[TONTransactionMessageContentsRawData alloc] initWithData:[NSData data]];
+    }
+    
     if (source == nil || destination == nil) {
         return nil;
     }
-    if (textMessage == nil) {
-        textMessage = @"";
-    }
-    return [[TONTransactionMessage alloc] initWithValue:message->value_ source:source destination:destination textMessage:textMessage bodyHash:makeData(message->body_hash_)];
+    return [[TONTransactionMessage alloc] initWithValue:message->value_ source:source destination:destination contents:contents bodyHash:makeData(message->body_hash_)];
 }
 
 @implementation TONKey
@@ -100,15 +124,51 @@ static TONTransactionMessage * _Nullable parseTransactionMessage(tonlib_api::obj
 
 @end
 
+@implementation TONTransactionMessageContentsRawData
+
+- (instancetype)initWithData:(NSData * _Nonnull)data {
+    self = [super init];
+    if (self != nil) {
+        _data = data;
+    }
+    return self;
+}
+
+@end
+
+@implementation TONTransactionMessageContentsPlainText
+
+- (instancetype)initWithText:(NSString * _Nonnull)text {
+    self = [super init];
+    if (self != nil) {
+        _text = text;
+    }
+    return self;
+}
+
+@end
+
+@implementation TONTransactionMessageContentsEncryptedText
+
+- (instancetype)initWithData:(NSData * _Nonnull)data {
+    self = [super init];
+    if (self != nil) {
+        _data = data;
+    }
+    return self;
+}
+
+@end
+
 @implementation TONTransactionMessage
 
-- (instancetype)initWithValue:(int64_t)value source:(NSString * _Nonnull)source destination:(NSString * _Nonnull)destination textMessage:(NSString * _Nonnull)textMessage bodyHash:(NSData * _Nonnull)bodyHash {
+- (instancetype)initWithValue:(int64_t)value source:(NSString * _Nonnull)source destination:(NSString * _Nonnull)destination contents:(id<TONTransactionMessageContents> _Nonnull)contents bodyHash:(NSData * _Nonnull)bodyHash {
     self = [super init];
     if (self != nil) {
         _value = value;
         _source = source;
         _destination = destination;
-        _textMessage = textMessage;
+        _contents = contents;
         _bodyHash = bodyHash;
     }
     return self;
@@ -164,7 +224,7 @@ static TONTransactionMessage * _Nullable parseTransactionMessage(tonlib_api::obj
 
 @implementation TONSendGramsQueryFees
 
-- (instancetype)initWithSourceFees:(TONFees *)sourceFees destinationFees:(TONFees *)destinationFees {
+- (instancetype)initWithSourceFees:(TONFees * _Nonnull)sourceFees destinationFees:(NSArray<TONFees *> * _Nonnull)destinationFees {
     self = [super init];
     if (self != nil) {
         _sourceFees = sourceFees;
@@ -582,11 +642,14 @@ typedef enum {
             }
         }];
         
-        auto query = make_object<tonlib_api::wallet_v3_getAccountAddress>(
-            make_object<tonlib_api::wallet_v3_initialAccountState>(
-                makeString(publicKeyData),
-                initialWalletId
-            )
+        auto initialAccountState = make_object<tonlib_api::wallet_v3_initialAccountState>(
+            makeString(publicKeyData),
+            initialWalletId
+        );
+        
+        auto query = make_object<tonlib_api::getAccountAddress>(
+            tonlib_api::move_object_as<tonlib_api::InitialAccountState>(initialAccountState),
+            1
         );
         _client->send({ requestId, std::move(query) });
         
@@ -604,36 +667,31 @@ typedef enum {
             if (object->get_id() == tonlib_api::error::ID) {
                 auto error = tonlib_api::move_object_as<tonlib_api::error>(object);
                 [subscriber putError:[[TONError alloc] initWithText:[[NSString alloc] initWithUTF8String:error->message_.c_str()]]];
-            } else if (object->get_id() == tonlib_api::generic_accountStateUninited::ID) {
-                auto result = tonlib_api::move_object_as<tonlib_api::generic_accountStateUninited>(object);
-                TONTransactionId *lastTransactionId = nil;
-                if (result->account_state_->last_transaction_id_ != nullptr) {
-                    lastTransactionId = [[TONTransactionId alloc] initWithLt:result->account_state_->last_transaction_id_->lt_ transactionHash:makeData(result->account_state_->last_transaction_id_->hash_)];
+            } else if (object->get_id() == tonlib_api::fullAccountState::ID) {
+                auto fullAccountState = tonlib_api::move_object_as<tonlib_api::fullAccountState>(object);
+                int32_t seqNo = -1;
+                if (fullAccountState->account_state_->get_id() == tonlib_api::uninited_accountState::ID) {
+                    seqNo = -1;
+                } else if (fullAccountState->account_state_->get_id() == tonlib_api::wallet_v3_accountState::ID) {
+                    auto v3AccountState = tonlib_api::move_object_as<tonlib_api::wallet_v3_accountState>(fullAccountState->account_state_);
+                    seqNo = v3AccountState->seqno_;
+                } else {
+                    [subscriber putError:[[TONError alloc] initWithText:@"Unknown type"]];
+                    return;
                 }
-                [subscriber putNext:[[TONAccountState alloc] initWithIsInitialized:false balance:result->account_state_->balance_ seqno:-1 lastTransactionId:lastTransactionId syncUtime:result->account_state_->sync_utime_]];
-                [subscriber putCompletion];
-            } else if (object->get_id() == tonlib_api::generic_accountStateWallet::ID) {
-                auto result = tonlib_api::move_object_as<tonlib_api::generic_accountStateWallet>(object);
+                
                 TONTransactionId *lastTransactionId = nil;
-                if (result->account_state_->last_transaction_id_ != nullptr) {
-                    lastTransactionId = [[TONTransactionId alloc] initWithLt:result->account_state_->last_transaction_id_->lt_ transactionHash:makeData(result->account_state_->last_transaction_id_->hash_)];
+                if (fullAccountState->last_transaction_id_ != nullptr) {
+                    lastTransactionId = [[TONTransactionId alloc] initWithLt:fullAccountState->last_transaction_id_->lt_ transactionHash:makeData(fullAccountState->last_transaction_id_->hash_)];
                 }
-                [subscriber putNext:[[TONAccountState alloc] initWithIsInitialized:true balance:result->account_state_->balance_ seqno:result->account_state_->seqno_ lastTransactionId:lastTransactionId syncUtime:result->account_state_->sync_utime_]];
+                [subscriber putNext:[[TONAccountState alloc] initWithIsInitialized:false balance:fullAccountState->balance_ seqno:-1 lastTransactionId:lastTransactionId syncUtime:fullAccountState->sync_utime_]];
                 [subscriber putCompletion];
-             } else if (object->get_id() == tonlib_api::generic_accountStateWalletV3::ID) {
-                 auto result = tonlib_api::move_object_as<tonlib_api::generic_accountStateWalletV3>(object);
-                 TONTransactionId *lastTransactionId = nil;
-                 if (result->account_state_->last_transaction_id_ != nullptr) {
-                     lastTransactionId = [[TONTransactionId alloc] initWithLt:result->account_state_->last_transaction_id_->lt_ transactionHash:makeData(result->account_state_->last_transaction_id_->hash_)];
-                 }
-                 [subscriber putNext:[[TONAccountState alloc] initWithIsInitialized:true balance:result->account_state_->balance_ seqno:result->account_state_->seqno_ lastTransactionId:lastTransactionId syncUtime:result->account_state_->sync_utime_]];
-                 [subscriber putCompletion];
-             }else {
+            } else {
                 assert(false);
             }
         }];
         
-        auto query = make_object<tonlib_api::generic_getAccountState>(make_object<tonlib_api::accountAddress>(accountAddress.UTF8String));
+        auto query = make_object<tonlib_api::getAccountState>(make_object<tonlib_api::accountAddress>(accountAddress.UTF8String));
         _client->send({ requestId, std::move(query) });
         
         return [[SBlockDisposable alloc] initWithBlock:^{
@@ -641,7 +699,7 @@ typedef enum {
     }] startOn:[SQueue mainQueue]] deliverOn:[SQueue mainQueue]];
 }
 
-- (SSignal *)generateSendGramsQueryFromKey:(TONKey *)key localPassword:(NSData *)localPassword fromAddress:(NSString *)fromAddress toAddress:(NSString *)address amount:(int64_t)amount textMessage:(NSData *)textMessage forceIfDestinationNotInitialized:(bool)forceIfDestinationNotInitialized timeout:(int32_t)timeout randomId:(int64_t)randomId {
+- (SSignal *)generateSendGramsQueryFromKey:(TONKey *)key localPassword:(NSData *)localPassword fromAddress:(NSString *)fromAddress toAddress:(NSString *)address amount:(int64_t)amount comment:(NSData *)comment encryptComment:(bool)encryptComment forceIfDestinationNotInitialized:(bool)forceIfDestinationNotInitialized timeout:(int32_t)timeout randomId:(int64_t)randomId {
     return [[[[SSignal alloc] initWithGenerator:^id<SDisposable>(SSubscriber *subscriber) {
         if ([_sendGramRandomIds containsObject:@(randomId)]) {
             [_sendGramRandomIds addObject:@(randomId)];
@@ -681,7 +739,28 @@ typedef enum {
             }
         }];
         
-        auto query = make_object<tonlib_api::generic_createSendGramsQuery>(
+        tonlib_api::object_ptr<tonlib_api::msg_Data> inputMessageData;
+        if (encryptComment && comment.length != 0) {
+            inputMessageData = make_object<tonlib_api::msg_dataDecryptedText>(
+                makeString(comment)
+            );
+        } else {
+            inputMessageData = make_object<tonlib_api::msg_dataText>(
+                makeString(comment)
+            );
+        }
+        std::vector<tonlib_api::object_ptr<tonlib_api::msg_message> > inputMessages;
+        inputMessages.push_back(make_object<tonlib_api::msg_message>(
+            make_object<tonlib_api::accountAddress>(address.UTF8String),
+            amount,
+            tonlib_api::move_object_as<tonlib_api::msg_Data>(inputMessageData)
+        ));
+        auto inputAction = make_object<tonlib_api::actionMsg>(
+            std::move(inputMessages),
+            forceIfDestinationNotInitialized
+        );
+        
+        auto query = make_object<tonlib_api::createQuery>(
             make_object<tonlib_api::inputKeyRegular>(
                 make_object<tonlib_api::key>(
                     makeString(publicKeyData),
@@ -690,11 +769,8 @@ typedef enum {
                 makeSecureString(localPassword)
             ),
             make_object<tonlib_api::accountAddress>(fromAddress.UTF8String),
-            make_object<tonlib_api::accountAddress>(address.UTF8String),
-            amount,
             timeout,
-            forceIfDestinationNotInitialized,
-            makeString(textMessage)
+            tonlib_api::move_object_as<tonlib_api::Action>(inputAction)
         );
         _client->send({ requestId, std::move(query) });
         
@@ -703,14 +779,12 @@ typedef enum {
     }] startOn:[SQueue mainQueue]] deliverOn:[SQueue mainQueue]];
 }
 
-- (SSignal *)generateFakeSendGramsQueryFromAddress:(NSString *)fromAddress toAddress:(NSString *)address amount:(int64_t)amount textMessage:(NSData *)textMessage forceIfDestinationNotInitialized:(bool)forceIfDestinationNotInitialized timeout:(int32_t)timeout {
+- (SSignal *)generateFakeSendGramsQueryFromAddress:(NSString *)fromAddress toAddress:(NSString *)address amount:(int64_t)amount comment:(NSData *)comment encryptComment:(bool)encryptComment forceIfDestinationNotInitialized:(bool)forceIfDestinationNotInitialized timeout:(int32_t)timeout {
     return [[[[SSignal alloc] initWithGenerator:^id<SDisposable>(SSubscriber *subscriber) {
         
         uint64_t requestId = _nextRequestId;
         _nextRequestId += 1;
         
-        __weak TON *weakSelf = self;
-        SQueue *queue = _queue;
         _requestHandlers[@(requestId)] = [[TONRequestHandler alloc] initWithCompletion:^(tonlib_api::object_ptr<tonlib_api::Object> &object) {
             if (object->get_id() == tonlib_api::error::ID) {
                 auto error = tonlib_api::move_object_as<tonlib_api::error>(object);
@@ -725,14 +799,32 @@ typedef enum {
             }
         }];
         
-        auto query = make_object<tonlib_api::generic_createSendGramsQuery>(
-            make_object<tonlib_api::inputKeyFake>(),
-            make_object<tonlib_api::accountAddress>(fromAddress.UTF8String),
+        tonlib_api::object_ptr<tonlib_api::msg_Data> inputMessageData;
+        if (encryptComment && comment.length != 0) {
+            inputMessageData = make_object<tonlib_api::msg_dataDecryptedText>(
+                makeString(comment)
+            );
+        } else {
+            inputMessageData = make_object<tonlib_api::msg_dataText>(
+                makeString(comment)
+            );
+        }
+        std::vector<tonlib_api::object_ptr<tonlib_api::msg_message> > inputMessages;
+        inputMessages.push_back(make_object<tonlib_api::msg_message>(
             make_object<tonlib_api::accountAddress>(address.UTF8String),
             amount,
+            tonlib_api::move_object_as<tonlib_api::msg_Data>(inputMessageData)
+        ));
+        auto inputAction = make_object<tonlib_api::actionMsg>(
+            std::move(inputMessages),
+            forceIfDestinationNotInitialized
+        );
+        
+        auto query = make_object<tonlib_api::createQuery>(
+            make_object<tonlib_api::inputKeyFake>(),
+            make_object<tonlib_api::accountAddress>(fromAddress.UTF8String),
             timeout,
-            forceIfDestinationNotInitialized,
-            makeString(textMessage)
+            tonlib_api::move_object_as<tonlib_api::Action>(inputAction)
        );
         _client->send({ requestId, std::move(query) });
         
@@ -753,7 +845,12 @@ typedef enum {
             } else if (object->get_id() == tonlib_api::query_fees::ID) {
                 auto result = tonlib_api::move_object_as<tonlib_api::query_fees>(object);
                 TONFees *sourceFees = [[TONFees alloc] initWithInFwdFee:result->source_fees_->in_fwd_fee_ storageFee:result->source_fees_->storage_fee_ gasFee:result->source_fees_->gas_fee_ fwdFee:result->source_fees_->fwd_fee_];
-                TONFees *destinationFees = [[TONFees alloc] initWithInFwdFee:result->destination_fees_->in_fwd_fee_ storageFee:result->destination_fees_->storage_fee_ gasFee:result->destination_fees_->gas_fee_ fwdFee:result->destination_fees_->fwd_fee_];
+                NSMutableArray<TONFees *> *destinationFees = [[NSMutableArray alloc] init];
+                for (auto &fee : result->destination_fees_) {
+                    TONFees *destinationFee = [[TONFees alloc] initWithInFwdFee:fee->in_fwd_fee_ storageFee:fee->storage_fee_ gasFee:fee->gas_fee_ fwdFee:fee->fwd_fee_];
+                    [destinationFees addObject:destinationFee];
+                }
+                
                 [subscriber putNext:[[TONSendGramsQueryFees alloc] initWithSourceFees:sourceFees destinationFees:destinationFees]];
                 [subscriber putCompletion];
             } else {
@@ -980,6 +1077,7 @@ typedef enum {
         }];
         
         auto query = make_object<tonlib_api::raw_getTransactions>(
+            make_object<tonlib_api::inputKeyFake>(),
             make_object<tonlib_api::accountAddress>(
                 makeString(addressData)
             ),
@@ -995,4 +1093,74 @@ typedef enum {
     }] startOn:[SQueue mainQueue]] deliverOn:[SQueue mainQueue]];
 }
 
+- (SSignal *)decryptMessagesWithKey:(TONKey * _Nonnull)key localPassword:(NSData * _Nonnull)localPassword messages:(NSArray<NSData *> * _Nonnull)messages {
+    return [[[[SSignal alloc] initWithGenerator:^id<SDisposable>(SSubscriber *subscriber) {
+        NSData *publicKeyData = [key.publicKey dataUsingEncoding:NSUTF8StringEncoding];
+        if (publicKeyData == nil) {
+            [subscriber putError:[[TONError alloc] initWithText:@"Error encoding UTF8 string in decryptMessagesWithKey"]];
+            return [[SBlockDisposable alloc] initWithBlock:^{}];
+        }
+        
+        uint64_t requestId = _nextRequestId;
+        _nextRequestId += 1;
+        
+        _requestHandlers[@(requestId)] = [[TONRequestHandler alloc] initWithCompletion:^(tonlib_api::object_ptr<tonlib_api::Object> &object) {
+            if (object->get_id() == tonlib_api::error::ID) {
+                auto error = tonlib_api::move_object_as<tonlib_api::error>(object);
+                [subscriber putError:[[TONError alloc] initWithText:[[NSString alloc] initWithUTF8String:error->message_.c_str()]]];
+            } else if (object->get_id() == tonlib_api::msg_dataArray::ID) {
+                auto result = tonlib_api::move_object_as<tonlib_api::msg_dataArray>(object);
+                if (result->elements_.size() != messages.count) {
+                    [subscriber putError:[[TONError alloc] initWithText:@"API interaction error"]];
+                } else {
+                    NSMutableArray<id<TONTransactionMessageContents> > *resultMessages = [[NSMutableArray alloc] init];
+                    int index = 0;
+                    for (auto &it : result->elements_) {
+                        if (it->get_id() == tonlib_api::msg_dataDecryptedText::ID) {
+                            auto dataDecryptedText = tonlib_api::move_object_as<tonlib_api::msg_dataDecryptedText>(it);
+                            NSString *decryptedString = readString(dataDecryptedText->text_);
+                            if (decryptedString != nil) {
+                                [resultMessages addObject:[[TONTransactionMessageContentsPlainText alloc] initWithText:decryptedString]];
+                            } else {
+                                [resultMessages addObject:[[TONTransactionMessageContentsEncryptedText alloc] initWithData:messages[index]]];
+                            }
+                        } else {
+                            [resultMessages addObject:[[TONTransactionMessageContentsEncryptedText alloc] initWithData:messages[index]]];
+                        }
+                        index++;
+                    }
+                    [subscriber putNext:resultMessages];
+                    [subscriber putCompletion];
+                }
+            } else {
+                assert(false);
+            }
+        }];
+        
+        std::vector<tonlib_api::object_ptr<tonlib_api::msg_Data>> inputData;
+        for (NSData *message in messages) {
+            inputData.push_back(make_object<tonlib_api::msg_dataEncryptedText>(
+                makeString(message)
+            ));
+        }
+        
+        auto query = make_object<tonlib_api::msg_decrypt>(
+            make_object<tonlib_api::inputKeyRegular>(
+                make_object<tonlib_api::key>(
+                    makeString(publicKeyData),
+                    makeSecureString(key.secret)
+                ),
+                makeSecureString(localPassword)
+            ),
+            make_object<tonlib_api::msg_dataArray>(
+                std::move(inputData)
+            )
+        );
+        _client->send({ requestId, std::move(query) });
+        
+        return [[SBlockDisposable alloc] initWithBlock:^{
+        }];
+    }] startOn:[SQueue mainQueue]] deliverOn:[SQueue mainQueue]];
+}
+
 @end
diff --git a/submodules/TooltipUI/BUCK b/submodules/TooltipUI/BUCK
new file mode 100644
index 0000000000..5d1b38696f
--- /dev/null
+++ b/submodules/TooltipUI/BUCK
@@ -0,0 +1,19 @@
+load("//Config:buck_rule_macros.bzl", "static_library")
+
+static_library(
+    name = "TooltipUI",
+    srcs = glob([
+        "Sources/**/*.swift",
+    ]),
+    deps = [
+        "//submodules/AsyncDisplayKit:AsyncDisplayKit#shared",
+        "//submodules/Display:Display#shared",
+        "//submodules/TelegramPresentationData:TelegramPresentationData",
+        "//submodules/AppBundle:AppBundle",
+        "//submodules/AnimatedStickerNode:AnimatedStickerNode",
+    ],
+    frameworks = [
+        "$SDKROOT/System/Library/Frameworks/Foundation.framework",
+        "$SDKROOT/System/Library/Frameworks/UIKit.framework",
+    ],
+)
diff --git a/submodules/TooltipUI/BUILD b/submodules/TooltipUI/BUILD
new file mode 100644
index 0000000000..d49d5c90b3
--- /dev/null
+++ b/submodules/TooltipUI/BUILD
@@ -0,0 +1,19 @@
+load("@build_bazel_rules_swift//swift:swift.bzl", "swift_library")
+
+swift_library(
+    name = "TooltipUI",
+    module_name = "TooltipUI",
+    srcs = glob([
+        "Sources/**/*.swift",
+    ]),
+    deps = [
+        "//submodules/AsyncDisplayKit:AsyncDisplayKit",
+        "//submodules/Display:Display",
+        "//submodules/TelegramPresentationData:TelegramPresentationData",
+        "//submodules/AppBundle:AppBundle",
+        "//submodules/AnimatedStickerNode:AnimatedStickerNode",
+    ],
+    visibility = [
+        "//visibility:public",
+    ],
+)
diff --git a/submodules/TooltipUI/Sources/TooltipScreen.swift b/submodules/TooltipUI/Sources/TooltipScreen.swift
new file mode 100644
index 0000000000..456e98ab58
--- /dev/null
+++ b/submodules/TooltipUI/Sources/TooltipScreen.swift
@@ -0,0 +1,194 @@
+import Foundation
+import UIKit
+import AsyncDisplayKit
+import Display
+import TelegramPresentationData
+import AnimatedStickerNode
+import AppBundle
+
+private final class TooltipScreenNode: ViewControllerTracingNode {
+    private let location: CGPoint
+    private let shouldDismissOnTouch: (CGPoint) -> Bool
+    private let requestDismiss: () -> Void
+    
+    private let containerNode: ASDisplayNode
+    private let backgroundNode: ASImageNode
+    private let arrowNode: ASImageNode
+    private let animatedStickerNode: AnimatedStickerNode
+    private let textNode: ImmediateTextNode
+    
+    init(text: String, location: CGPoint, shouldDismissOnTouch: @escaping (CGPoint) -> Bool, requestDismiss: @escaping () -> Void) {
+        self.location = location
+        self.shouldDismissOnTouch = shouldDismissOnTouch
+        self.requestDismiss = requestDismiss
+        
+        self.containerNode = ASDisplayNode()
+        
+        let fillColor = UIColor(white: 0.0, alpha: 0.8)
+        
+        self.backgroundNode = ASImageNode()
+        self.backgroundNode.image = generateAdjustedStretchableFilledCircleImage(diameter: 15.0, color: fillColor)
+        
+        self.arrowNode = ASImageNode()
+        let arrowSize = CGSize(width: 29.0, height: 10.0)
+        self.arrowNode.image = generateImage(arrowSize, rotatedContext: { size, context in
+            context.clear(CGRect(origin: CGPoint(), size: size))
+            context.setFillColor(fillColor.cgColor)
+            context.scaleBy(x: 0.333, y: 0.333)
+            let _ = try? drawSvgPath(context, path: "M85.882251,0 C79.5170552,0 73.4125613,2.52817247 68.9116882,7.02834833 L51.4264069,24.5109211 C46.7401154,29.1964866 39.1421356,29.1964866 34.4558441,24.5109211 L16.9705627,7.02834833 C12.4696897,2.52817247 6.36519576,0 0,0 L85.882251,0 ")
+            context.fillPath()
+        })
+        
+        self.textNode = ImmediateTextNode()
+        self.textNode.displaysAsynchronously = false
+        self.textNode.maximumNumberOfLines = 0
+        self.textNode.attributedText = NSAttributedString(string: text, font: Font.regular(14.0), textColor: .white)
+        
+        self.animatedStickerNode = AnimatedStickerNode()
+        if let path = getAppBundle().path(forResource: "ChatListFoldersTooltip", ofType: "json") {
+            self.animatedStickerNode.setup(source: AnimatedStickerNodeLocalFileSource(path: path), width: Int(70 * UIScreenScale), height: Int(70 * UIScreenScale), playbackMode: .once, mode: .direct)
+            self.animatedStickerNode.automaticallyLoadFirstFrame = true
+        }
+        
+        super.init()
+        
+        self.backgroundNode.addSubnode(self.arrowNode)
+        self.containerNode.addSubnode(self.backgroundNode)
+        self.containerNode.addSubnode(self.textNode)
+        self.containerNode.addSubnode(self.animatedStickerNode)
+        self.addSubnode(self.containerNode)
+    }
+    
+    func updateLayout(layout: ContainerViewLayout, transition: ContainedViewLayoutTransition) {
+        let sideInset: CGFloat = 13.0
+        let bottomInset: CGFloat = 10.0
+        let contentInset: CGFloat = 9.0
+        let contentVerticalInset: CGFloat = 11.0
+        let animationSize = CGSize(width: 32.0, height: 32.0)
+        let animationInset: CGFloat = (70 - animationSize.width) / 2.0
+        let animationSpacing: CGFloat = 8.0
+        let textSize = self.textNode.updateLayout(CGSize(width: layout.size.width - contentInset * 2.0 - sideInset * 2.0 - animationSize.width - animationSpacing, height: .greatestFiniteMagnitude))
+        
+        let backgroundHeight = max(animationSize.height, textSize.height) + contentVerticalInset * 2.0
+        let backgroundFrame = CGRect(origin: CGPoint(x: sideInset, y: self.location.y - bottomInset - backgroundHeight), size: CGSize(width: layout.size.width - sideInset * 2.0, height: backgroundHeight))
+        transition.updateFrame(node: self.containerNode, frame: backgroundFrame)
+        transition.updateFrame(node: self.backgroundNode, frame: CGRect(origin: CGPoint(), size: backgroundFrame.size))
+        if let image = self.arrowNode.image {
+            let arrowSize = image.size
+            let arrowCenterX = self.location.x
+            transition.updateFrame(node: self.arrowNode, frame: CGRect(origin: CGPoint(x: floor(arrowCenterX - arrowSize.width / 2.0), y: backgroundFrame.height), size: arrowSize))
+        }
+        
+        transition.updateFrame(node: self.textNode, frame: CGRect(origin: CGPoint(x: contentInset + animationSize.width + animationSpacing, y: floor((backgroundHeight - textSize.height) / 2.0)), size: textSize))
+        
+        transition.updateFrame(node: self.animatedStickerNode, frame: CGRect(origin: CGPoint(x: contentInset - animationInset, y: floor((backgroundHeight - animationSize.height) / 2.0) - animationInset), size: CGSize(width: animationSize.width + animationInset * 2.0, height: animationSize.height + animationInset * 2.0)))
+        self.animatedStickerNode.updateLayout(size: CGSize(width: animationSize.width + animationInset * 2.0, height: animationSize.height + animationInset * 2.0))
+    }
+    
+    override func hitTest(_ point: CGPoint, with event: UIEvent?) -> UIView? {
+        if let event = event {
+            var eventIsPresses = false
+            if #available(iOSApplicationExtension 9.0, iOS 9.0, *) {
+                eventIsPresses = event.type == .presses
+            }
+            if event.type == .touches || eventIsPresses {
+                if self.shouldDismissOnTouch(point) {
+                    self.requestDismiss()
+                }
+                return nil
+            }
+        }
+        return super.hitTest(point, with: event)
+    }
+    
+    func animateIn() {
+        self.containerNode.layer.animateSpring(from: NSNumber(value: Float(0.01)), to: NSNumber(value: Float(1.0)), keyPath: "transform.scale", duration: 0.6)
+        self.containerNode.layer.animateSpring(from: NSValue(cgPoint: CGPoint(x: self.arrowNode.frame.midX - self.containerNode.bounds.width / 2.0, y: self.arrowNode.frame.maxY - self.containerNode.bounds.height / 2.0)), to: NSValue(cgPoint: CGPoint()), keyPath: "position", duration: 0.6, additive: true)
+        self.containerNode.layer.animateAlpha(from: 0.0, to: 1.0, duration: 0.2)
+        
+        DispatchQueue.main.asyncAfter(deadline: DispatchTime.now() + 0.6, execute: { [weak self] in
+            self?.animatedStickerNode.visibility = true
+        })
+    }
+    
+    func animateOut(completion: @escaping () -> Void) {
+        self.containerNode.layer.animateAlpha(from: 1.0, to: 0.0, duration: 0.2, removeOnCompletion: false, completion: { _ in
+            completion()
+        })
+        self.containerNode.layer.animateScale(from: 1.0, to: 0.01, duration: 0.2, removeOnCompletion: false)
+        self.containerNode.layer.animatePosition(from: CGPoint(), to: CGPoint(x: self.arrowNode.frame.midX - self.containerNode.bounds.width / 2.0, y: self.arrowNode.frame.maxY - self.containerNode.bounds.height / 2.0), duration: 0.2, removeOnCompletion: false, additive: true)
+    }
+}
+
+public final class TooltipScreen: ViewController {
+    private let text: String
+    private let location: CGPoint
+    private let shouldDismissOnTouch: (CGPoint) -> Bool
+    
+    private var controllerNode: TooltipScreenNode {
+        return self.displayNode as! TooltipScreenNode
+    }
+    
+    private var validLayout: ContainerViewLayout?
+    private var isDismissed: Bool = false
+    
+    public init(text: String, location: CGPoint, shouldDismissOnTouch: @escaping (CGPoint) -> Bool) {
+        self.text = text
+        self.location = location
+        self.shouldDismissOnTouch = shouldDismissOnTouch
+        
+        super.init(navigationBarPresentationData: nil)
+        
+        self.statusBar.statusBarStyle = .Ignore
+    }
+    
+    required init(coder aDecoder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+    
+    override public func viewDidAppear(_ animated: Bool) {
+        super.viewDidAppear(animated)
+        
+        self.controllerNode.animateIn()
+        
+        DispatchQueue.main.asyncAfter(deadline: DispatchTime.now() + 5.0, execute: { [weak self] in
+            self?.dismiss()
+        })
+    }
+    
+    override public func loadDisplayNode() {
+        self.displayNode = TooltipScreenNode(text: self.text, location: self.location, shouldDismissOnTouch: self.shouldDismissOnTouch, requestDismiss: { [weak self] in
+            guard let strongSelf = self else {
+                return
+            }
+            strongSelf.dismiss()
+        })
+        self.displayNodeDidLoad()
+    }
+    
+    override public func containerLayoutUpdated(_ layout: ContainerViewLayout, transition: ContainedViewLayoutTransition) {
+        super.containerLayoutUpdated(layout, transition: transition)
+        
+        if let validLayout = self.validLayout {
+            if validLayout.size.width != layout.size.width {
+                self.dismiss()
+            }
+        }
+        self.validLayout = layout
+        
+        self.controllerNode.updateLayout(layout: layout, transition: transition)
+    }
+    
+    override public func dismiss(completion: (() -> Void)? = nil) {
+        if self.isDismissed {
+            return
+        }
+        self.isDismissed = true
+        self.controllerNode.animateOut(completion: { [weak self] in
+            guard let strongSelf = self else {
+                return
+            }
+            strongSelf.presentingViewController?.dismiss(animated: false, completion: nil)
+        })
+    }
+}
diff --git a/submodules/TouchDownGesture/BUILD b/submodules/TouchDownGesture/BUILD
new file mode 100644
index 0000000000..04e076cb47
--- /dev/null
+++ b/submodules/TouchDownGesture/BUILD
@@ -0,0 +1,12 @@
+load("@build_bazel_rules_swift//swift:swift.bzl", "swift_library")
+
+swift_library(
+    name = "TouchDownGesture",
+    module_name = "TouchDownGesture",
+    srcs = glob([
+        "Sources/**/*.swift",
+    ]),
+    visibility = [
+        "//visibility:public",
+    ],
+)
diff --git a/submodules/TouchDownGesture/Info.plist b/submodules/TouchDownGesture/Info.plist
deleted file mode 100644
index e1fe4cfb7b..0000000000
--- a/submodules/TouchDownGesture/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/TouchDownGesture/Sources/TouchDownGesture.h b/submodules/TouchDownGesture/Sources/TouchDownGesture.h
deleted file mode 100644
index 898ba0913a..0000000000
--- a/submodules/TouchDownGesture/Sources/TouchDownGesture.h
+++ /dev/null
@@ -1,19 +0,0 @@
-//
-//  TouchDownGesture.h
-//  TouchDownGesture
-//
-//  Created by Peter on 8/10/19.
-//  Copyright © 2019 Telegram Messenger LLP. All rights reserved.
-//
-
-#import <UIKit/UIKit.h>
-
-//! Project version number for TouchDownGesture.
-FOUNDATION_EXPORT double TouchDownGestureVersionNumber;
-
-//! Project version string for TouchDownGesture.
-FOUNDATION_EXPORT const unsigned char TouchDownGestureVersionString[];
-
-// In this header, you should import all the public headers of your framework using statements like #import <TouchDownGesture/PublicHeader.h>
-
-
diff --git a/submodules/Tuples/BUILD b/submodules/Tuples/BUILD
new file mode 100644
index 0000000000..b9e8a036dc
--- /dev/null
+++ b/submodules/Tuples/BUILD
@@ -0,0 +1,12 @@
+load("@build_bazel_rules_swift//swift:swift.bzl", "swift_library")
+
+swift_library(
+    name = "Tuples",
+    module_name = "Tuples",
+    srcs = glob([
+        "Sources/**/*.swift",
+    ]),
+    visibility = [
+        "//visibility:public",
+    ],
+)
diff --git a/submodules/Tuples/Info.plist b/submodules/Tuples/Info.plist
deleted file mode 100644
index e1fe4cfb7b..0000000000
--- a/submodules/Tuples/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/Tuples/Sources/Tuples.h b/submodules/Tuples/Sources/Tuples.h
deleted file mode 100644
index 9aaba5f5db..0000000000
--- a/submodules/Tuples/Sources/Tuples.h
+++ /dev/null
@@ -1,19 +0,0 @@
-//
-//  Tuples.h
-//  Tuples
-//
-//  Created by Peter on 8/5/19.
-//  Copyright © 2019 Telegram Messenger LLP. All rights reserved.
-//
-
-#import <UIKit/UIKit.h>
-
-//! Project version number for Tuples.
-FOUNDATION_EXPORT double TuplesVersionNumber;
-
-//! Project version string for Tuples.
-FOUNDATION_EXPORT const unsigned char TuplesVersionString[];
-
-// In this header, you should import all the public headers of your framework using statements like #import <Tuples/PublicHeader.h>
-
-
diff --git a/submodules/UIKitRuntimeUtils/BUCK b/submodules/UIKitRuntimeUtils/BUCK
new file mode 100644
index 0000000000..5438bad157
--- /dev/null
+++ b/submodules/UIKitRuntimeUtils/BUCK
@@ -0,0 +1,19 @@
+load("//Config:buck_rule_macros.bzl", "static_library")
+
+static_library(
+    name = "UIKitRuntimeUtils",
+    srcs = glob([
+        "Source/UIKitRuntimeUtils/*.m",
+    ]),
+    exported_headers = glob([
+        "Source/UIKitRuntimeUtils/*.h",
+    ]),
+    deps = [
+        "//submodules/AsyncDisplayKit:AsyncDisplayKit#shared",
+        "//submodules/ObjCRuntimeUtils:ObjCRuntimeUtils",
+    ],
+    frameworks = [
+        "$SDKROOT/System/Library/Frameworks/Foundation.framework",
+        "$SDKROOT/System/Library/Frameworks/UIKit.framework",
+    ],
+)
diff --git a/submodules/UIKitRuntimeUtils/BUILD b/submodules/UIKitRuntimeUtils/BUILD
new file mode 100644
index 0000000000..8086d92521
--- /dev/null
+++ b/submodules/UIKitRuntimeUtils/BUILD
@@ -0,0 +1,26 @@
+
+objc_library(
+    name = "UIKitRuntimeUtils",
+    enable_modules = True,
+    module_name = "UIKitRuntimeUtils",
+    srcs = glob([
+        "Source/UIKitRuntimeUtils/*.m",
+    ]),
+    hdrs = glob([
+        "Source/UIKitRuntimeUtils/*.h",
+    ]),
+    includes = [
+      #"Source",
+    ],
+    deps = [
+      "//submodules/AsyncDisplayKit:AsyncDisplayKit",
+      "//submodules/ObjCRuntimeUtils:ObjCRuntimeUtils",
+    ],
+    sdk_frameworks = [
+      "Foundation",
+      "UIKit",
+    ],
+    visibility = [
+        "//visibility:public",
+    ],
+)
diff --git a/submodules/Display/Display/NSBag.h b/submodules/UIKitRuntimeUtils/Source/UIKitRuntimeUtils/NSBag.h
similarity index 100%
rename from submodules/Display/Display/NSBag.h
rename to submodules/UIKitRuntimeUtils/Source/UIKitRuntimeUtils/NSBag.h
diff --git a/submodules/Display/Display/NSBag.m b/submodules/UIKitRuntimeUtils/Source/UIKitRuntimeUtils/NSBag.m
similarity index 100%
rename from submodules/Display/Display/NSBag.m
rename to submodules/UIKitRuntimeUtils/Source/UIKitRuntimeUtils/NSBag.m
diff --git a/submodules/Display/Display/NSWeakReference.h b/submodules/UIKitRuntimeUtils/Source/UIKitRuntimeUtils/NSWeakReference.h
similarity index 100%
rename from submodules/Display/Display/NSWeakReference.h
rename to submodules/UIKitRuntimeUtils/Source/UIKitRuntimeUtils/NSWeakReference.h
diff --git a/submodules/Display/Display/NSWeakReference.m b/submodules/UIKitRuntimeUtils/Source/UIKitRuntimeUtils/NSWeakReference.m
similarity index 100%
rename from submodules/Display/Display/NSWeakReference.m
rename to submodules/UIKitRuntimeUtils/Source/UIKitRuntimeUtils/NSWeakReference.m
diff --git a/submodules/Display/Display/NotificationCenterUtils.h b/submodules/UIKitRuntimeUtils/Source/UIKitRuntimeUtils/NotificationCenterUtils.h
similarity index 100%
rename from submodules/Display/Display/NotificationCenterUtils.h
rename to submodules/UIKitRuntimeUtils/Source/UIKitRuntimeUtils/NotificationCenterUtils.h
diff --git a/submodules/Display/Display/NotificationCenterUtils.m b/submodules/UIKitRuntimeUtils/Source/UIKitRuntimeUtils/NotificationCenterUtils.m
similarity index 97%
rename from submodules/Display/Display/NotificationCenterUtils.m
rename to submodules/UIKitRuntimeUtils/Source/UIKitRuntimeUtils/NotificationCenterUtils.m
index 1c26229623..886375a760 100644
--- a/submodules/Display/Display/NotificationCenterUtils.m
+++ b/submodules/UIKitRuntimeUtils/Source/UIKitRuntimeUtils/NotificationCenterUtils.m
@@ -1,6 +1,6 @@
 #import "NotificationCenterUtils.h"
 
-#import "RuntimeUtils.h"
+#import <ObjCRuntimeUtils/RuntimeUtils.h>
 #import <UIKit/UIKit.h>
 
 static NSMutableArray *notificationHandlers() {
diff --git a/submodules/Display/Display/UIBarButtonItem+Proxy.h b/submodules/UIKitRuntimeUtils/Source/UIKitRuntimeUtils/UIBarButtonItem+Proxy.h
similarity index 94%
rename from submodules/Display/Display/UIBarButtonItem+Proxy.h
rename to submodules/UIKitRuntimeUtils/Source/UIKitRuntimeUtils/UIBarButtonItem+Proxy.h
index 62a3b1137a..de26cccae4 100644
--- a/submodules/Display/Display/UIBarButtonItem+Proxy.h
+++ b/submodules/UIKitRuntimeUtils/Source/UIKitRuntimeUtils/UIBarButtonItem+Proxy.h
@@ -1,5 +1,5 @@
 #import <UIKit/UIKit.h>
-#import <AsyncDisplayKit/AsyncDisplayKit.h>
+#import <AsyncDisplayKit/ASDisplayNode.h>
 
 typedef void (^UIBarButtonItemSetTitleListener)(NSString *);
 typedef void (^UIBarButtonItemSetEnabledListener)(BOOL);
diff --git a/submodules/Display/Display/UIBarButtonItem+Proxy.m b/submodules/UIKitRuntimeUtils/Source/UIKitRuntimeUtils/UIBarButtonItem+Proxy.m
similarity index 98%
rename from submodules/Display/Display/UIBarButtonItem+Proxy.m
rename to submodules/UIKitRuntimeUtils/Source/UIKitRuntimeUtils/UIBarButtonItem+Proxy.m
index d9c85ae8f3..8de9e6d7d4 100644
--- a/submodules/Display/Display/UIBarButtonItem+Proxy.m
+++ b/submodules/UIKitRuntimeUtils/Source/UIKitRuntimeUtils/UIBarButtonItem+Proxy.m
@@ -1,7 +1,7 @@
 #import "UIBarButtonItem+Proxy.h"
 
 #import "NSBag.h"
-#import "RuntimeUtils.h"
+#import <ObjCRuntimeUtils/RuntimeUtils.h>
 
 static const void *setEnabledListenerBagKey = &setEnabledListenerBagKey;
 static const void *setTitleListenerBagKey = &setTitleListenerBagKey;
diff --git a/submodules/UIKitRuntimeUtils/Source/UIKitRuntimeUtils/UIKitUtils.h b/submodules/UIKitRuntimeUtils/Source/UIKitRuntimeUtils/UIKitUtils.h
new file mode 100644
index 0000000000..746f56d6c7
--- /dev/null
+++ b/submodules/UIKitRuntimeUtils/Source/UIKitRuntimeUtils/UIKitUtils.h
@@ -0,0 +1,11 @@
+#import <UIKit/UIKit.h>
+#import <Foundation/Foundation.h>
+
+double animationDurationFactorImpl();
+
+CABasicAnimation * _Nonnull makeSpringAnimationImpl(NSString * _Nonnull keyPath);
+CABasicAnimation * _Nonnull makeSpringBounceAnimationImpl(NSString * _Nonnull keyPath, CGFloat initialVelocity, CGFloat damping);
+CGFloat springAnimationValueAtImpl(CABasicAnimation * _Nonnull animation, CGFloat t);
+
+UIBlurEffect *makeCustomZoomBlurEffectImpl();
+void applySmoothRoundedCornersImpl(CALayer * _Nonnull layer);
diff --git a/submodules/Display/Display/UIKitUtils.m b/submodules/UIKitRuntimeUtils/Source/UIKitRuntimeUtils/UIKitUtils.m
similarity index 90%
rename from submodules/Display/Display/UIKitUtils.m
rename to submodules/UIKitRuntimeUtils/Source/UIKitRuntimeUtils/UIKitUtils.m
index acd7194ccf..267fd0d26c 100644
--- a/submodules/Display/Display/UIKitUtils.m
+++ b/submodules/UIKitRuntimeUtils/Source/UIKitRuntimeUtils/UIKitUtils.m
@@ -3,22 +3,16 @@
 #import <objc/runtime.h>
 
 #if TARGET_IPHONE_SIMULATOR
-UIKIT_EXTERN float UIAnimationDragCoefficient(); // UIKit private drag coeffient, use judiciously
+UIKIT_EXTERN float UIAnimationDragCoefficient();
 #endif
 
-@implementation UIView (AnimationUtils)
-
-+ (double)animationDurationFactor
-{
+double animationDurationFactorImpl() {
 #if TARGET_IPHONE_SIMULATOR
     return (double)UIAnimationDragCoefficient();
-#endif
-    
+#endif   
     return 1.0f;
 }
 
-@end
-
 @interface CASpringAnimation ()
 
 @end
@@ -54,7 +48,7 @@ UIKIT_EXTERN float UIAnimationDragCoefficient(); // UIKit private drag coeffient
 
 @end
 
-CABasicAnimation * _Nonnull makeSpringAnimation(NSString * _Nonnull keyPath) {
+CABasicAnimation * _Nonnull makeSpringAnimationImpl(NSString * _Nonnull keyPath) {
     CASpringAnimation *springAnimation = [CASpringAnimation animationWithKeyPath:keyPath];
     springAnimation.mass = 3.0f;
     springAnimation.stiffness = 1000.0f;
@@ -64,7 +58,7 @@ CABasicAnimation * _Nonnull makeSpringAnimation(NSString * _Nonnull keyPath) {
     return springAnimation;
 }
 
-CABasicAnimation * _Nonnull makeSpringBounceAnimation(NSString * _Nonnull keyPath, CGFloat initialVelocity, CGFloat damping) {
+CABasicAnimation * _Nonnull makeSpringBounceAnimationImpl(NSString * _Nonnull keyPath, CGFloat initialVelocity, CGFloat damping) {
     CASpringAnimation *springAnimation = [CASpringAnimation animationWithKeyPath:keyPath];
     springAnimation.mass = 5.0f;
     springAnimation.stiffness = 900.0f;
@@ -84,7 +78,7 @@ CABasicAnimation * _Nonnull makeSpringBounceAnimation(NSString * _Nonnull keyPat
     return springAnimation;
 }
 
-CGFloat springAnimationValueAt(CABasicAnimation * _Nonnull animation, CGFloat t) {
+CGFloat springAnimationValueAtImpl(CABasicAnimation * _Nonnull animation, CGFloat t) {
     return [(CASpringAnimation *)animation valueAt:t];
 }
 
@@ -110,9 +104,6 @@ CGFloat springAnimationValueAt(CABasicAnimation * _Nonnull animation, CGFloat t)
 
 @end
 
-void testZoomBlurEffect(UIVisualEffect *effect) {
-}
-
 static NSString *encodeText(NSString *string, int key) {
     NSMutableString *result = [[NSMutableString alloc] init];
     
@@ -168,7 +159,7 @@ static void setBoolField(CustomBlurEffect *object, NSString *name, BOOL value) {
     [inv invoke];
 }
 
-UIBlurEffect *makeCustomZoomBlurEffect() {
+UIBlurEffect *makeCustomZoomBlurEffectImpl() {
     if (@available(iOS 11.0, *)) {
         NSString *string = [@[@"_", @"UI", @"Custom", @"BlurEffect"] componentsJoinedByString:@""];
         CustomBlurEffect *result = (CustomBlurEffect *)[NSClassFromString(string) effectWithStyle:0];
@@ -193,7 +184,7 @@ UIBlurEffect *makeCustomZoomBlurEffect() {
     }
 }
 
-void applySmoothRoundedCorners(CALayer * _Nonnull layer) {
+void applySmoothRoundedCornersImpl(CALayer * _Nonnull layer) {
     if (@available(iOS 11.0, *)) {
         setBoolField(layer, encodeText(@"tfuDpoujovpvtDpsofst;", -1), true);
     }
diff --git a/submodules/Display/Display/UIMenuItem+Icons.h b/submodules/UIKitRuntimeUtils/Source/UIKitRuntimeUtils/UIMenuItem+Icons.h
similarity index 100%
rename from submodules/Display/Display/UIMenuItem+Icons.h
rename to submodules/UIKitRuntimeUtils/Source/UIKitRuntimeUtils/UIMenuItem+Icons.h
diff --git a/submodules/Display/Display/UIMenuItem+Icons.m b/submodules/UIKitRuntimeUtils/Source/UIKitRuntimeUtils/UIMenuItem+Icons.m
similarity index 98%
rename from submodules/Display/Display/UIMenuItem+Icons.m
rename to submodules/UIKitRuntimeUtils/Source/UIKitRuntimeUtils/UIMenuItem+Icons.m
index 1bd837c10c..69f12f21c5 100644
--- a/submodules/Display/Display/UIMenuItem+Icons.m
+++ b/submodules/UIKitRuntimeUtils/Source/UIKitRuntimeUtils/UIMenuItem+Icons.m
@@ -1,7 +1,7 @@
 #import "UIMenuItem+Icons.h"
 
 #import "NSBag.h"
-#import "RuntimeUtils.h"
+#import <ObjCRuntimeUtils/RuntimeUtils.h>
 
 static const void *imageKey = &imageKey;
 static const void *imageViewKey = &imageViewKey;
diff --git a/submodules/Display/Display/UINavigationItem+Proxy.h b/submodules/UIKitRuntimeUtils/Source/UIKitRuntimeUtils/UINavigationItem+Proxy.h
similarity index 100%
rename from submodules/Display/Display/UINavigationItem+Proxy.h
rename to submodules/UIKitRuntimeUtils/Source/UIKitRuntimeUtils/UINavigationItem+Proxy.h
diff --git a/submodules/Display/Display/UINavigationItem+Proxy.m b/submodules/UIKitRuntimeUtils/Source/UIKitRuntimeUtils/UINavigationItem+Proxy.m
similarity index 99%
rename from submodules/Display/Display/UINavigationItem+Proxy.m
rename to submodules/UIKitRuntimeUtils/Source/UIKitRuntimeUtils/UINavigationItem+Proxy.m
index 8b166e5cd4..6dcba5e73e 100644
--- a/submodules/Display/Display/UINavigationItem+Proxy.m
+++ b/submodules/UIKitRuntimeUtils/Source/UIKitRuntimeUtils/UINavigationItem+Proxy.m
@@ -1,7 +1,7 @@
 #import "UINavigationItem+Proxy.h"
 
 #import "NSBag.h"
-#import "RuntimeUtils.h"
+#import <ObjCRuntimeUtils/RuntimeUtils.h>
 #import "NSWeakReference.h"
 
 static const void *sourceItemKey = &sourceItemKey;
diff --git a/submodules/Display/Display/UIViewController+Navigation.h b/submodules/UIKitRuntimeUtils/Source/UIKitRuntimeUtils/UIViewController+Navigation.h
similarity index 100%
rename from submodules/Display/Display/UIViewController+Navigation.h
rename to submodules/UIKitRuntimeUtils/Source/UIKitRuntimeUtils/UIViewController+Navigation.h
diff --git a/submodules/Display/Display/UIViewController+Navigation.m b/submodules/UIKitRuntimeUtils/Source/UIKitRuntimeUtils/UIViewController+Navigation.m
similarity index 99%
rename from submodules/Display/Display/UIViewController+Navigation.m
rename to submodules/UIKitRuntimeUtils/Source/UIKitRuntimeUtils/UIViewController+Navigation.m
index 751faf58d9..328f3e6596 100644
--- a/submodules/Display/Display/UIViewController+Navigation.m
+++ b/submodules/UIKitRuntimeUtils/Source/UIKitRuntimeUtils/UIViewController+Navigation.m
@@ -1,6 +1,6 @@
 #import "UIViewController+Navigation.h"
 
-#import "RuntimeUtils.h"
+#import <ObjCRuntimeUtils/RuntimeUtils.h>
 #import <objc/runtime.h>
 
 #import "NSWeakReference.h"
diff --git a/submodules/Display/Display/UIWindow+OrientationChange.h b/submodules/UIKitRuntimeUtils/Source/UIKitRuntimeUtils/UIWindow+OrientationChange.h
similarity index 100%
rename from submodules/Display/Display/UIWindow+OrientationChange.h
rename to submodules/UIKitRuntimeUtils/Source/UIKitRuntimeUtils/UIWindow+OrientationChange.h
diff --git a/submodules/Display/Display/UIWindow+OrientationChange.m b/submodules/UIKitRuntimeUtils/Source/UIKitRuntimeUtils/UIWindow+OrientationChange.m
similarity index 96%
rename from submodules/Display/Display/UIWindow+OrientationChange.m
rename to submodules/UIKitRuntimeUtils/Source/UIKitRuntimeUtils/UIWindow+OrientationChange.m
index f44d682e5e..88d51c4cce 100644
--- a/submodules/Display/Display/UIWindow+OrientationChange.m
+++ b/submodules/UIKitRuntimeUtils/Source/UIKitRuntimeUtils/UIWindow+OrientationChange.m
@@ -1,6 +1,6 @@
 #import "UIWindow+OrientationChange.h"
 
-#import "RuntimeUtils.h"
+#import <ObjCRuntimeUtils/RuntimeUtils.h>
 #import "NotificationCenterUtils.h"
 
 static const void *isRotatingKey = &isRotatingKey;
@@ -74,8 +74,6 @@ static bool _isDeviceRotating = false;
             } else if ([name isEqualToString:@"UIWindowDidRotateNotification"]) {
                 [(UIWindow *)object setRotating:false];
             } else if ([name isEqualToString:UIDeviceOrientationDidChangeNotification]) {
-                //NSLog(@"notification start: %@", name);
-                
                 _isDeviceRotating = true;
                 
                 passNotification();
@@ -90,8 +88,6 @@ static bool _isDeviceRotating = false;
                 
                 _isDeviceRotating = false;
                 
-                //NSLog(@"notification end: %@", name);
-                
                 return true;
             }
             
diff --git a/submodules/UndoUI/BUILD b/submodules/UndoUI/BUILD
new file mode 100644
index 0000000000..1f7cf22379
--- /dev/null
+++ b/submodules/UndoUI/BUILD
@@ -0,0 +1,29 @@
+load("@build_bazel_rules_swift//swift:swift.bzl", "swift_library")
+
+swift_library(
+    name = "UndoUI",
+    module_name = "UndoUI",
+    srcs = glob([
+		"Sources/**/*.swift",
+    ]),
+    deps = [
+        "//submodules/SSignalKit/SwiftSignalKit:SwiftSignalKit",
+        "//submodules/AsyncDisplayKit:AsyncDisplayKit",
+        "//submodules/Display:Display",
+        "//submodules/Postbox:Postbox",
+        "//submodules/TelegramCore:TelegramCore",
+        "//submodules/SyncCore:SyncCore",
+        "//submodules/TelegramPresentationData:TelegramPresentationData",
+        "//submodules/TextFormat:TextFormat",
+        "//submodules/Markdown:Markdown",
+        "//submodules/RadialStatusNode:RadialStatusNode",
+        "//submodules/AnimationUI:AnimationUI",
+        "//submodules/AnimatedStickerNode:AnimatedStickerNode",
+        "//submodules/AppBundle:AppBundle",
+        "//submodules/StickerResources:StickerResources",
+        "//submodules/TelegramAnimatedStickerNode:TelegramAnimatedStickerNode",
+    ],
+    visibility = [
+        "//visibility:public",
+    ],
+)
diff --git a/submodules/UndoUI/Info.plist b/submodules/UndoUI/Info.plist
deleted file mode 100644
index e1fe4cfb7b..0000000000
--- a/submodules/UndoUI/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/UndoUI/Sources/UndoUI.h b/submodules/UndoUI/Sources/UndoUI.h
deleted file mode 100644
index b8653fc7bc..0000000000
--- a/submodules/UndoUI/Sources/UndoUI.h
+++ /dev/null
@@ -1,19 +0,0 @@
-//
-//  UndoUI.h
-//  UndoUI
-//
-//  Created by Peter on 8/10/19.
-//  Copyright © 2019 Telegram Messenger LLP. All rights reserved.
-//
-
-#import <UIKit/UIKit.h>
-
-//! Project version number for UndoUI.
-FOUNDATION_EXPORT double UndoUIVersionNumber;
-
-//! Project version string for UndoUI.
-FOUNDATION_EXPORT const unsigned char UndoUIVersionString[];
-
-// In this header, you should import all the public headers of your framework using statements like #import <UndoUI/PublicHeader.h>
-
-
diff --git a/submodules/UrlEscaping/BUILD b/submodules/UrlEscaping/BUILD
new file mode 100644
index 0000000000..9e665e590d
--- /dev/null
+++ b/submodules/UrlEscaping/BUILD
@@ -0,0 +1,12 @@
+load("@build_bazel_rules_swift//swift:swift.bzl", "swift_library")
+
+swift_library(
+    name = "UrlEscaping",
+    module_name = "UrlEscaping",
+    srcs = glob([
+        "Sources/**/*.swift",
+    ]),
+    visibility = [
+        "//visibility:public",
+    ],
+)
diff --git a/submodules/UrlEscaping/Info.plist b/submodules/UrlEscaping/Info.plist
deleted file mode 100644
index e1fe4cfb7b..0000000000
--- a/submodules/UrlEscaping/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/UrlEscaping/Sources/UrlEscaping.h b/submodules/UrlEscaping/Sources/UrlEscaping.h
deleted file mode 100644
index e282f81e82..0000000000
--- a/submodules/UrlEscaping/Sources/UrlEscaping.h
+++ /dev/null
@@ -1,19 +0,0 @@
-//
-//  UrlEscaping.h
-//  UrlEscaping
-//
-//  Created by Peter on 8/5/19.
-//  Copyright © 2019 Telegram Messenger LLP. All rights reserved.
-//
-
-#import <UIKit/UIKit.h>
-
-//! Project version number for UrlEscaping.
-FOUNDATION_EXPORT double UrlEscapingVersionNumber;
-
-//! Project version string for UrlEscaping.
-FOUNDATION_EXPORT const unsigned char UrlEscapingVersionString[];
-
-// In this header, you should import all the public headers of your framework using statements like #import <UrlEscaping/PublicHeader.h>
-
-
diff --git a/submodules/UrlHandling/BUCK b/submodules/UrlHandling/BUCK
index ace74ae785..faa86f1b36 100644
--- a/submodules/UrlHandling/BUCK
+++ b/submodules/UrlHandling/BUCK
@@ -13,7 +13,7 @@ static_library(
         "//submodules/MtProtoKit:MtProtoKit#shared",
         "//submodules/AccountContext:AccountContext",
         "//submodules/TelegramUIPreferences:TelegramUIPreferences",
-        #"//submodules/WalletUrl:WalletUrl",
+        "//submodules/WalletUrl:WalletUrl",
     ],
     frameworks = [
         "$SDKROOT/System/Library/Frameworks/Foundation.framework",
diff --git a/submodules/UrlHandling/BUILD b/submodules/UrlHandling/BUILD
new file mode 100644
index 0000000000..20d5f677d3
--- /dev/null
+++ b/submodules/UrlHandling/BUILD
@@ -0,0 +1,22 @@
+load("@build_bazel_rules_swift//swift:swift.bzl", "swift_library")
+
+swift_library(
+    name = "UrlHandling",
+    module_name = "UrlHandling",
+    srcs = glob([
+		"Sources/**/*.swift",
+    ]),
+    deps = [
+        "//submodules/SSignalKit/SwiftSignalKit:SwiftSignalKit",
+        "//submodules/Postbox:Postbox",
+        "//submodules/TelegramCore:TelegramCore",
+        "//submodules/SyncCore:SyncCore",
+        "//submodules/MtProtoKit:MtProtoKit",
+        "//submodules/AccountContext:AccountContext",
+        "//submodules/TelegramUIPreferences:TelegramUIPreferences",
+        "//submodules/WalletUrl:WalletUrl",
+    ],
+    visibility = [
+        "//visibility:public",
+    ],
+)
diff --git a/submodules/UrlHandling/Info.plist b/submodules/UrlHandling/Info.plist
deleted file mode 100644
index e1fe4cfb7b..0000000000
--- a/submodules/UrlHandling/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/UrlHandling/Sources/UrlHandling.h b/submodules/UrlHandling/Sources/UrlHandling.h
deleted file mode 100644
index 55038fbe85..0000000000
--- a/submodules/UrlHandling/Sources/UrlHandling.h
+++ /dev/null
@@ -1,19 +0,0 @@
-//
-//  UrlHandling.h
-//  UrlHandling
-//
-//  Created by Peter on 8/17/19.
-//  Copyright © 2019 Telegram Messenger LLP. All rights reserved.
-//
-
-#import <UIKit/UIKit.h>
-
-//! Project version number for UrlHandling.
-FOUNDATION_EXPORT double UrlHandlingVersionNumber;
-
-//! Project version string for UrlHandling.
-FOUNDATION_EXPORT const unsigned char UrlHandlingVersionString[];
-
-// In this header, you should import all the public headers of your framework using statements like #import <UrlHandling/PublicHeader.h>
-
-
diff --git a/submodules/UrlHandling/Sources/UrlHandling.swift b/submodules/UrlHandling/Sources/UrlHandling.swift
index 9c1fac2cfb..d016af8e75 100644
--- a/submodules/UrlHandling/Sources/UrlHandling.swift
+++ b/submodules/UrlHandling/Sources/UrlHandling.swift
@@ -4,11 +4,7 @@ import SwiftSignalKit
 import Postbox
 import TelegramCore
 import SyncCore
-#if BUCK
 import MtProtoKit
-#else
-import MtProtoKitDynamic
-#endif
 import TelegramPresentationData
 import TelegramUIPreferences
 import AccountContext
diff --git a/submodules/UrlWhitelist/BUCK b/submodules/UrlWhitelist/BUCK
index caf743f8ca..870382826f 100644
--- a/submodules/UrlWhitelist/BUCK
+++ b/submodules/UrlWhitelist/BUCK
@@ -5,8 +5,6 @@ static_library(
     srcs = glob([
         "Sources/**/*.swift",
     ]),
-    deps = [
-    ],
     frameworks = [
         "$SDKROOT/System/Library/Frameworks/Foundation.framework",
     ],
diff --git a/submodules/UrlWhitelist/BUILD b/submodules/UrlWhitelist/BUILD
new file mode 100644
index 0000000000..dadbd3e80a
--- /dev/null
+++ b/submodules/UrlWhitelist/BUILD
@@ -0,0 +1,12 @@
+load("@build_bazel_rules_swift//swift:swift.bzl", "swift_library")
+
+swift_library(
+    name = "UrlWhitelist",
+    module_name = "UrlWhitelist",
+    srcs = glob([
+		"Sources/**/*.swift",
+    ]),
+    visibility = [
+        "//visibility:public",
+    ],
+)
diff --git a/submodules/WalletCore/BUILD b/submodules/WalletCore/BUILD
new file mode 100644
index 0000000000..56b9d8ac32
--- /dev/null
+++ b/submodules/WalletCore/BUILD
@@ -0,0 +1,16 @@
+load("@build_bazel_rules_swift//swift:swift.bzl", "swift_library")
+
+swift_library(
+    name = "WalletCore",
+    module_name = "WalletCore",
+    srcs = glob([
+        "Sources/**/*.swift",
+    ]),
+    deps = [
+	    "//submodules/SSignalKit/SwiftSignalKit:SwiftSignalKit",
+        "//submodules/TonBinding:TonBinding",
+    ],
+    visibility = [
+        "//visibility:public",
+    ],
+)
diff --git a/submodules/WalletCore/Sources/WalletCore.swift b/submodules/WalletCore/Sources/WalletCore.swift
index b39f7dd95a..2d14b36514 100644
--- a/submodules/WalletCore/Sources/WalletCore.swift
+++ b/submodules/WalletCore/Sources/WalletCore.swift
@@ -427,14 +427,45 @@ public final class TonInstance {
         }
     }
     
-    fileprivate func prepareSendGramsFromWalletQuery(decryptedSecret: Data, localPassword: Data, walletInfo: WalletInfo, fromAddress: String, toAddress: String, amount: Int64, textMessage: Data, forceIfDestinationNotInitialized: Bool, timeout: Int32, randomId: Int64) -> Signal<TONPreparedSendGramsQuery, SendGramsFromWalletError> {
+    fileprivate func decryptWalletTransactions(decryptionKey: WalletTransactionDecryptionKey, encryptedMessages: [Data]) -> Signal<[WalletTransactionMessageContents], DecryptWalletTransactionsError> {
+        return Signal { subscriber in
+            let disposable = MetaDisposable()
+            
+            self.impl.with { impl in
+                impl.withInstance { ton in
+                    let cancel = ton.decryptMessages(with: TONKey(publicKey: decryptionKey.walletInfo.publicKey.rawValue, secret: decryptionKey.decryptedSecret), localPassword: decryptionKey.localPassword, messages: encryptedMessages).start(next: { result in
+                        guard let result = result as? [TONTransactionMessageContents] else {
+                            subscriber.putError(.generic)
+                            return
+                        }
+                        subscriber.putNext(result.map(WalletTransactionMessageContents.init(tonTransactionMessageContents:)))
+                    }, error: { error in
+                        if let error = error as? TONError {
+                            subscriber.putError(.generic)
+                        } else {
+                            subscriber.putError(.generic)
+                        }
+                    }, completed: {
+                        subscriber.putCompletion()
+                    })
+                    disposable.set(ActionDisposable {
+                        cancel?.dispose()
+                    })
+                }
+            }
+            
+            return disposable
+        }
+    }
+    
+    fileprivate func prepareSendGramsFromWalletQuery(decryptedSecret: Data, localPassword: Data, walletInfo: WalletInfo, fromAddress: String, toAddress: String, amount: Int64, comment: Data, encryptComment: Bool, forceIfDestinationNotInitialized: Bool, timeout: Int32, randomId: Int64) -> Signal<TONPreparedSendGramsQuery, SendGramsFromWalletError> {
         let key = TONKey(publicKey: walletInfo.publicKey.rawValue, secret: decryptedSecret)
         return Signal { subscriber in
             let disposable = MetaDisposable()
             
             self.impl.with { impl in
                 impl.withInstance { ton in
-                    let cancel = ton.generateSendGramsQuery(from: key, localPassword: localPassword, fromAddress: fromAddress, toAddress: toAddress, amount: amount, textMessage: textMessage, forceIfDestinationNotInitialized: forceIfDestinationNotInitialized, timeout: timeout, randomId: randomId).start(next: { result in
+                    let cancel = ton.generateSendGramsQuery(from: key, localPassword: localPassword, fromAddress: fromAddress, toAddress: toAddress, amount: amount, comment: comment, encryptComment: encryptComment, forceIfDestinationNotInitialized: forceIfDestinationNotInitialized, timeout: timeout, randomId: randomId).start(next: { result in
                         guard let result = result as? TONPreparedSendGramsQuery else {
                             subscriber.putError(.generic)
                             return
@@ -472,13 +503,13 @@ public final class TonInstance {
         }
     }
     
-    fileprivate func prepareFakeSendGramsFromWalletQuery(walletInfo: WalletInfo, fromAddress: String, toAddress: String, amount: Int64, textMessage: Data, timeout: Int32) -> Signal<TONPreparedSendGramsQuery, SendGramsFromWalletError> {
+    fileprivate func prepareFakeSendGramsFromWalletQuery(walletInfo: WalletInfo, fromAddress: String, toAddress: String, amount: Int64, comment: Data, encryptComment: Bool, forceIfDestinationNotInitialized: Bool, timeout: Int32) -> Signal<TONPreparedSendGramsQuery, SendGramsFromWalletError> {
         return Signal { subscriber in
             let disposable = MetaDisposable()
             
             self.impl.with { impl in
                 impl.withInstance { ton in
-                    let cancel = ton.generateFakeSendGramsQuery(fromAddress: fromAddress, toAddress: toAddress, amount: amount, textMessage: textMessage, forceIfDestinationNotInitialized: true, timeout: timeout).start(next: { result in
+                    let cancel = ton.generateFakeSendGramsQuery(fromAddress: fromAddress, toAddress: toAddress, amount: amount, comment: comment, encryptComment: encryptComment, forceIfDestinationNotInitialized: forceIfDestinationNotInitialized, timeout: timeout).start(next: { result in
                         guard let result = result as? TONPreparedSendGramsQuery else {
                             subscriber.putError(.generic)
                             return
@@ -699,6 +730,15 @@ public struct CombinedWalletState: Codable, Equatable {
     public var timestamp: Int64
     public var topTransactions: [WalletTransaction]
     public var pendingTransactions: [PendingWalletTransaction]
+    
+    public func withTopTransactions(_ topTransactions: [WalletTransaction]) -> CombinedWalletState {
+        return CombinedWalletState(
+            walletState: self.walletState,
+            timestamp: self.timestamp,
+            topTransactions: self.topTransactions,
+            pendingTransactions: self.pendingTransactions
+        )
+    }
 }
 
 public struct WalletStateRecord: Codable, Equatable {
@@ -843,7 +883,7 @@ public enum CombinedWalletStateSubject {
     case address(String)
 }
 
-public func getCombinedWalletState(storage: WalletStorageInterface, subject: CombinedWalletStateSubject, tonInstance: TonInstance, onlyCached: Bool = false) -> Signal<CombinedWalletStateResult, GetCombinedWalletStateError> {
+public func getCombinedWalletState(storage: WalletStorageInterface, subject: CombinedWalletStateSubject, transactionDecryptionKey: WalletTransactionDecryptionKey?, tonInstance: TonInstance, onlyCached: Bool) -> Signal<CombinedWalletStateResult, GetCombinedWalletStateError> {
     switch subject {
     case let .wallet(walletInfo):
         return storage.getWalletRecords()
@@ -893,14 +933,21 @@ public func getCombinedWalletState(storage: WalletStorageInterface, subject: Com
                     |> mapToSignal { walletState, syncUtime -> Signal<CombinedWalletStateResult, GetCombinedWalletStateError> in
                         let topTransactions: Signal<[WalletTransaction], GetCombinedWalletStateError>
                         if walletState.lastTransactionId == cachedState?.walletState.lastTransactionId {
-                            topTransactions = .single(cachedState?.topTransactions ?? [])
+                            if let topTransactionsValue = cachedState?.topTransactions, let transactionDecryptionKey = transactionDecryptionKey {
+                                topTransactions = decryptWalletTransactions(decryptionKey: transactionDecryptionKey, transactions: topTransactionsValue, tonInstance: tonInstance)
+                                |> mapError { _ -> GetCombinedWalletStateError in
+                                    return .generic
+                                }
+                            } else {
+                                topTransactions = .single(cachedState?.topTransactions ?? [])
+                            }
                         } else {
                             if cachedState == nil {
-                                topTransactions = getWalletTransactions(address: address, previousId: nil, tonInstance: tonInstance)
+                                topTransactions = getWalletTransactions(address: address, previousId: nil, transactionDecryptionKey: transactionDecryptionKey, tonInstance: tonInstance)
                                 |> retry(1.0, maxDelay: 5.0, onQueue: .concurrentDefaultQueue())
                                 |> castError(GetCombinedWalletStateError.self)
                             } else {
-                                topTransactions = getWalletTransactions(address: address, previousId: nil, tonInstance: tonInstance)
+                                topTransactions = getWalletTransactions(address: address, previousId: nil, transactionDecryptionKey: transactionDecryptionKey, tonInstance: tonInstance)
                                 |> mapError { error -> GetCombinedWalletStateError in
                                     if case .network = error {
                                         return .network
@@ -962,7 +1009,7 @@ public func getCombinedWalletState(storage: WalletStorageInterface, subject: Com
         |> mapToSignal { walletState, syncUtime -> Signal<CombinedWalletStateResult, GetCombinedWalletStateError> in
             let topTransactions: Signal<[WalletTransaction], GetCombinedWalletStateError>
             
-            topTransactions = getWalletTransactions(address: address, previousId: nil, tonInstance: tonInstance)
+            topTransactions = getWalletTransactions(address: address, previousId: nil, transactionDecryptionKey: nil, tonInstance: tonInstance)
             |> mapError { _ -> GetCombinedWalletStateError in
                 return .generic
             }
@@ -994,25 +1041,48 @@ public struct EstimatedSendGramsFees {
     public let fwdFee: Int64
 }
 
-public func verifySendGramsRequestAndEstimateFees(tonInstance: TonInstance, walletInfo: WalletInfo, toAddress: String, amount: Int64, textMessage: Data, timeout: Int32) -> Signal<EstimatedSendGramsFees, SendGramsFromWalletError> {
+public struct SendGramsVerificationResult {
+    public let fees: EstimatedSendGramsFees
+    public let canNotEncryptComment: Bool
+}
+
+public func verifySendGramsRequestAndEstimateFees(tonInstance: TonInstance, walletInfo: WalletInfo, toAddress: String, amount: Int64, comment: Data, encryptComment: Bool, timeout: Int32) -> Signal<SendGramsVerificationResult, SendGramsFromWalletError> {
     return walletAddress(publicKey: walletInfo.publicKey, tonInstance: tonInstance)
     |> castError(SendGramsFromWalletError.self)
-    |> mapToSignal { fromAddress -> Signal<EstimatedSendGramsFees, SendGramsFromWalletError> in
-        return tonInstance.prepareFakeSendGramsFromWalletQuery(walletInfo: walletInfo, fromAddress: fromAddress, toAddress: toAddress, amount: amount, textMessage: textMessage, timeout: timeout)
-        |> mapToSignal { preparedQuery -> Signal<EstimatedSendGramsFees, SendGramsFromWalletError> in
-            return tonInstance.estimateSendGramsQueryFees(preparedQuery: preparedQuery)
-            |> map { result -> EstimatedSendGramsFees in
-                return EstimatedSendGramsFees(inFwdFee: result.sourceFees.inFwdFee, storageFee: result.sourceFees.storageFee, gasFee: result.sourceFees.gasFee, fwdFee: result.sourceFees.fwdFee)
+    |> mapToSignal { fromAddress -> Signal<SendGramsVerificationResult, SendGramsFromWalletError> in
+        struct QueryWithInfo {
+            let query: TONPreparedSendGramsQuery
+            let canNotEncryptComment: Bool
+        }
+        return tonInstance.prepareFakeSendGramsFromWalletQuery(walletInfo: walletInfo, fromAddress: fromAddress, toAddress: toAddress, amount: amount, comment: comment, encryptComment: false, forceIfDestinationNotInitialized: false, timeout: timeout)
+        |> map { query -> QueryWithInfo in
+            return QueryWithInfo(query: query, canNotEncryptComment: false)
+        }
+        |> `catch` { error -> Signal<QueryWithInfo, SendGramsFromWalletError> in
+            switch error {
+            case .destinationIsNotInitialized:
+                return tonInstance.prepareFakeSendGramsFromWalletQuery(walletInfo: walletInfo, fromAddress: fromAddress, toAddress: toAddress, amount: amount, comment: comment, encryptComment: false, forceIfDestinationNotInitialized: true, timeout: timeout)
+                |> map { query -> QueryWithInfo in
+                    return QueryWithInfo(query: query, canNotEncryptComment: encryptComment)
+                }
+            default:
+                return .fail(error)
+            }
+        }
+        |> mapToSignal { queryWithInfo -> Signal<SendGramsVerificationResult, SendGramsFromWalletError> in
+            return tonInstance.estimateSendGramsQueryFees(preparedQuery: queryWithInfo.query)
+            |> map { result -> SendGramsVerificationResult in
+                return SendGramsVerificationResult(fees: EstimatedSendGramsFees(inFwdFee: result.sourceFees.inFwdFee, storageFee: result.sourceFees.storageFee, gasFee: result.sourceFees.gasFee, fwdFee: result.sourceFees.fwdFee), canNotEncryptComment: queryWithInfo.canNotEncryptComment)
             }
         }
     }
 }
 
-public func sendGramsFromWallet(storage: WalletStorageInterface, tonInstance: TonInstance, walletInfo: WalletInfo, decryptedSecret: Data, localPassword: Data, toAddress: String, amount: Int64, textMessage: Data, forceIfDestinationNotInitialized: Bool, timeout: Int32, randomId: Int64) -> Signal<PendingWalletTransaction, SendGramsFromWalletError> {
+public func sendGramsFromWallet(storage: WalletStorageInterface, tonInstance: TonInstance, walletInfo: WalletInfo, decryptedSecret: Data, localPassword: Data, toAddress: String, amount: Int64, comment: Data, encryptComment: Bool, forceIfDestinationNotInitialized: Bool, timeout: Int32, randomId: Int64) -> Signal<PendingWalletTransaction, SendGramsFromWalletError> {
     return walletAddress(publicKey: walletInfo.publicKey, tonInstance: tonInstance)
     |> castError(SendGramsFromWalletError.self)
     |> mapToSignal { fromAddress -> Signal<PendingWalletTransaction, SendGramsFromWalletError> in
-        return tonInstance.prepareSendGramsFromWalletQuery(decryptedSecret: decryptedSecret, localPassword: localPassword, walletInfo: walletInfo, fromAddress: fromAddress, toAddress: toAddress, amount: amount, textMessage: textMessage, forceIfDestinationNotInitialized: forceIfDestinationNotInitialized, timeout: timeout, randomId: randomId)
+        return tonInstance.prepareSendGramsFromWalletQuery(decryptedSecret: decryptedSecret, localPassword: localPassword, walletInfo: walletInfo, fromAddress: fromAddress, toAddress: toAddress, amount: amount, comment: comment, encryptComment: encryptComment, forceIfDestinationNotInitialized: forceIfDestinationNotInitialized, timeout: timeout, randomId: randomId)
         |> mapToSignal { preparedQuery -> Signal<PendingWalletTransaction, SendGramsFromWalletError> in
             return tonInstance.commitPreparedSendGramsQuery(preparedQuery)
             |> retryTonRequest(isNetworkError: { error in
@@ -1025,7 +1095,7 @@ public func sendGramsFromWallet(storage: WalletStorageInterface, tonInstance: To
             |> mapToSignal { _ -> Signal<PendingWalletTransaction, SendGramsFromWalletError> in
                 return .complete()
             }
-            |> then(.single(PendingWalletTransaction(timestamp: Int64(Date().timeIntervalSince1970), validUntilTimestamp: preparedQuery.validUntil, bodyHash: preparedQuery.bodyHash, address: toAddress, value: amount, comment: textMessage)))
+            |> then(.single(PendingWalletTransaction(timestamp: Int64(Date().timeIntervalSince1970), validUntilTimestamp: preparedQuery.validUntil, bodyHash: preparedQuery.bodyHash, address: toAddress, value: amount, comment: comment)))
             |> mapToSignal { result in
                 return storage.updateWalletRecords { records in
                     var records = records
@@ -1060,18 +1130,79 @@ private extension WalletTransactionId {
     }
 }
 
+public enum WalletTransactionMessageContentsDecodingError: Error {
+    case generic
+}
+
+public enum WalletTransactionMessageContents: Codable, Equatable {
+    enum Key: CodingKey {
+        case raw
+        case plainText
+        case encryptedText
+    }
+    
+    case raw(Data)
+    case plainText(String)
+    case encryptedText(Data)
+    
+    public init(from decoder: Decoder) throws {
+        let container = try decoder.container(keyedBy: Key.self)
+        if let data = try? container.decode(Data.self, forKey: .raw) {
+            self = .raw(data)
+        } else if let plainText = try? container.decode(String.self, forKey: .plainText) {
+            self = .plainText(plainText)
+        } else if let encryptedText = try? container.decode(Data.self, forKey: .encryptedText) {
+            self = .encryptedText(encryptedText)
+        } else {
+            throw WalletTransactionMessageContentsDecodingError.generic
+        }
+    }
+    
+    public func encode(to encoder: Encoder) throws {
+        var container = try encoder.container(keyedBy: Key.self)
+        switch self {
+        case let .raw(data):
+            try container.encode(data, forKey: .raw)
+        case let .plainText(text):
+            try container.encode(text, forKey: .plainText)
+        case let .encryptedText(data):
+            try container.encode(data, forKey: .encryptedText)
+        }
+    }
+}
+
+private extension WalletTransactionMessageContents {
+    init(tonTransactionMessageContents: TONTransactionMessageContents) {
+        if let raw = tonTransactionMessageContents as? TONTransactionMessageContentsRawData {
+            self = .raw(raw.data)
+        } else if let plainText = tonTransactionMessageContents as? TONTransactionMessageContentsPlainText {
+            self = .plainText(plainText.text)
+        } else if let encryptedText = tonTransactionMessageContents as? TONTransactionMessageContentsEncryptedText {
+            self = .encryptedText(encryptedText.data)
+        } else {
+            self = .raw(Data())
+        }
+    }
+}
+
 public final class WalletTransactionMessage: Codable, Equatable {
     public let value: Int64
     public let source: String
     public let destination: String
-    public let textMessage: String
+    public let contents: WalletTransactionMessageContents
     public let bodyHash: Data
     
-    init(value: Int64, source: String, destination: String, textMessage: String, bodyHash: Data) {
+    init(
+        value: Int64,
+        source: String,
+        destination: String,
+        contents: WalletTransactionMessageContents,
+        bodyHash: Data
+    ) {
         self.value = value
         self.source = source
         self.destination = destination
-        self.textMessage = textMessage
+        self.contents = contents
         self.bodyHash = bodyHash
     }
     
@@ -1085,7 +1216,7 @@ public final class WalletTransactionMessage: Codable, Equatable {
         if lhs.destination != rhs.destination {
             return false
         }
-        if lhs.textMessage != rhs.textMessage {
+        if lhs.contents != rhs.contents {
             return false
         }
         if lhs.bodyHash != rhs.bodyHash {
@@ -1095,9 +1226,21 @@ public final class WalletTransactionMessage: Codable, Equatable {
     }
 }
 
+private extension WalletTransactionMessage {
+    func withContents(_ contents: WalletTransactionMessageContents) -> WalletTransactionMessage {
+        return WalletTransactionMessage(
+            value: self.value,
+            source: self.source,
+            destination: self.destination,
+            contents: contents,
+            bodyHash: self.bodyHash
+        )
+    }
+}
+
 private extension WalletTransactionMessage {
     convenience init(tonTransactionMessage: TONTransactionMessage) {
-        self.init(value: tonTransactionMessage.value, source: tonTransactionMessage.source, destination: tonTransactionMessage.destination, textMessage: tonTransactionMessage.textMessage, bodyHash: tonTransactionMessage.bodyHash)
+        self.init(value: tonTransactionMessage.value, source: tonTransactionMessage.source, destination: tonTransactionMessage.destination, contents: WalletTransactionMessageContents(tonTransactionMessageContents: tonTransactionMessage.contents), bodyHash: tonTransactionMessage.bodyHash)
     }
 }
 
@@ -1205,13 +1348,100 @@ public enum GetWalletTransactionsError {
     case network
 }
 
-public func getWalletTransactions(address: String, previousId: WalletTransactionId?, tonInstance: TonInstance) -> Signal<[WalletTransaction], GetWalletTransactionsError> {
-    return getWalletTransactionsOnce(address: address, previousId: previousId, tonInstance: tonInstance)
+public final class WalletTransactionDecryptionKey {
+    fileprivate let decryptedSecret: Data
+    fileprivate let localPassword: Data
+    fileprivate let walletInfo: WalletInfo
+    
+    fileprivate init(
+        decryptedSecret: Data,
+        localPassword: Data,
+        walletInfo: WalletInfo
+    ) {
+        self.decryptedSecret = decryptedSecret
+        self.localPassword = localPassword
+        self.walletInfo = walletInfo
+    }
+}
+
+public enum DecryptWalletTransactionsError {
+    case generic
+}
+
+public func walletTransactionDecryptionKey(keychain: TonKeychain, walletInfo: WalletInfo, localPassword: Data) -> Signal<WalletTransactionDecryptionKey?, NoError> {
+    return keychain.decrypt(walletInfo.encryptedSecret)
+    |> map { decryptedSecret -> WalletTransactionDecryptionKey? in
+        return WalletTransactionDecryptionKey(decryptedSecret: decryptedSecret, localPassword: localPassword, walletInfo: walletInfo)
+    }
+    |> `catch` { _ -> Signal<WalletTransactionDecryptionKey?, NoError> in
+        return .single(nil)
+    }
+}
+
+public func decryptWalletTransactions(decryptionKey: WalletTransactionDecryptionKey, transactions: [WalletTransaction], tonInstance: TonInstance) -> Signal<[WalletTransaction], DecryptWalletTransactionsError> {
+    enum EncryptedMessagePath: Equatable {
+        case inMessage
+        case outMessage(Int)
+    }
+    var encryptedMessages: [(Int, EncryptedMessagePath, Data)] = []
+    for i in 0 ..< transactions.count {
+        if let inMessage = transactions[i].inMessage {
+            switch inMessage.contents {
+            case let .encryptedText(data):
+                encryptedMessages.append((i, .inMessage, data))
+            default:
+                break
+            }
+        }
+        for outIndex in 0 ..< transactions[i].outMessages.count {
+            switch transactions[i].outMessages[outIndex].contents {
+            case let .encryptedText(data):
+                encryptedMessages.append((i, .outMessage(outIndex), data))
+            default:
+                break
+            }
+        }
+    }
+    if !encryptedMessages.isEmpty {
+        return tonInstance.decryptWalletTransactions(decryptionKey: decryptionKey, encryptedMessages: encryptedMessages.map { $0.2 })
+        |> map { contentsList -> [WalletTransaction] in
+            var result: [WalletTransaction] = []
+            for transactionIndex in 0 ..< transactions.count {
+                let transaction = transactions[transactionIndex]
+                
+                var inMessage = transaction.inMessage
+                var outMessages = transaction.outMessages
+                
+                for encryptedIndex in 0 ..< encryptedMessages.count {
+                    if encryptedMessages[encryptedIndex].0 == transactionIndex {
+                        switch encryptedMessages[encryptedIndex].1 {
+                        case .inMessage:
+                            inMessage = inMessage?.withContents(contentsList[encryptedIndex])
+                        case let .outMessage(outIndex):
+                            outMessages[outIndex] = outMessages[outIndex].withContents(contentsList[encryptedIndex])
+                        }
+                    }
+                }
+                
+                result.append(WalletTransaction(data: transaction.data, transactionId: transaction.transactionId, timestamp: transaction.timestamp, storageFee: transaction.storageFee, otherFee: transaction.otherFee, inMessage: inMessage, outMessages: outMessages))
+            }
+            return result
+        }
+        |> `catch` { _ -> Signal<[WalletTransaction], DecryptWalletTransactionsError> in
+            return .single(transactions)
+        }
+    } else {
+        return .single(transactions)
+    }
+}
+
+public func getWalletTransactions(address: String, previousId: WalletTransactionId?, transactionDecryptionKey: WalletTransactionDecryptionKey?, tonInstance: TonInstance) -> Signal<[WalletTransaction], GetWalletTransactionsError> {
+    return getWalletTransactionsOnce(address: address, previousId: previousId, transactionDecryptionKey: transactionDecryptionKey, tonInstance: tonInstance)
     |> mapToSignal { transactions in
         guard let lastTransaction = transactions.last, transactions.count >= 2 else {
             return .single(transactions)
         }
-        return getWalletTransactionsOnce(address: address, previousId: lastTransaction.transactionId, tonInstance: tonInstance)
+        return getWalletTransactionsOnce(address: address, previousId: lastTransaction.transactionId, transactionDecryptionKey: transactionDecryptionKey, tonInstance: tonInstance)
         |> map { additionalTransactions in
             var result = transactions
             var existingIds = Set(result.map { $0.transactionId })
@@ -1238,7 +1468,7 @@ private enum WalletLastTransactionIdError {
     case network
 }
 
-private func getWalletTransactionsOnce(address: String, previousId: WalletTransactionId?, tonInstance: TonInstance) -> Signal<[WalletTransaction], GetWalletTransactionsError> {
+private func getWalletTransactionsOnce(address: String, previousId: WalletTransactionId?, transactionDecryptionKey: WalletTransactionDecryptionKey?, tonInstance: TonInstance) -> Signal<[WalletTransaction], GetWalletTransactionsError> {
     let previousIdValue: Signal<WalletTransactionId?, GetWalletTransactionsError>
     if let previousId = previousId {
         previousIdValue = .single(previousId)
@@ -1270,6 +1500,66 @@ private func getWalletTransactionsOnce(address: String, previousId: WalletTransa
                     return false
                 }
             })
+            |> mapToSignal { transactions -> Signal<[WalletTransaction], GetWalletTransactionsError> in
+                if let transactionDecryptionKey = transactionDecryptionKey {
+                    enum EncryptedMessagePath: Equatable {
+                        case inMessage
+                        case outMessage(Int)
+                    }
+                    var encryptedMessages: [(Int, EncryptedMessagePath, Data)] = []
+                    for i in 0 ..< transactions.count {
+                        if let inMessage = transactions[i].inMessage {
+                            switch inMessage.contents {
+                            case let .encryptedText(data):
+                                encryptedMessages.append((i, .inMessage, data))
+                            default:
+                                break
+                            }
+                        }
+                        for outIndex in 0 ..< transactions[i].outMessages.count {
+                            switch transactions[i].outMessages[outIndex].contents {
+                            case let .encryptedText(data):
+                                encryptedMessages.append((i, .outMessage(outIndex), data))
+                            default:
+                                break
+                            }
+                        }
+                    }
+                    if !encryptedMessages.isEmpty {
+                        return tonInstance.decryptWalletTransactions(decryptionKey: transactionDecryptionKey, encryptedMessages: encryptedMessages.map { $0.2 })
+                        |> map { contentsList -> [WalletTransaction] in
+                            var result: [WalletTransaction] = []
+                            for transactionIndex in 0 ..< transactions.count {
+                                let transaction = transactions[transactionIndex]
+                                
+                                var inMessage = transaction.inMessage
+                                var outMessages = transaction.outMessages
+                                
+                                for encryptedIndex in 0 ..< encryptedMessages.count {
+                                    if encryptedMessages[encryptedIndex].0 == transactionIndex {
+                                        switch encryptedMessages[encryptedIndex].1 {
+                                        case .inMessage:
+                                            inMessage = inMessage?.withContents(contentsList[encryptedIndex])
+                                        case let .outMessage(outIndex):
+                                            outMessages[outIndex] = outMessages[outIndex].withContents(contentsList[encryptedIndex])
+                                        }
+                                    }
+                                }
+                                
+                                result.append(WalletTransaction(data: transaction.data, transactionId: transaction.transactionId, timestamp: transaction.timestamp, storageFee: transaction.storageFee, otherFee: transaction.otherFee, inMessage: inMessage, outMessages: outMessages))
+                            }
+                            return result
+                        }
+                        |> `catch` { _ -> Signal<[WalletTransaction], GetWalletTransactionsError> in
+                            return .single(transactions)
+                        }
+                    } else {
+                        return .single(transactions)
+                    }
+                } else {
+                    return .single(transactions)
+                }
+            }
         } else {
             return .single([])
         }
diff --git a/submodules/WalletUI/BUILD b/submodules/WalletUI/BUILD
new file mode 100644
index 0000000000..3933e3e274
--- /dev/null
+++ b/submodules/WalletUI/BUILD
@@ -0,0 +1,49 @@
+load("@build_bazel_rules_swift//swift:swift.bzl", "swift_library")
+
+filegroup(
+    name = "WalletUIResources",
+    srcs = glob([
+        "Resources/**/*",
+    ], exclude = ["Resources/**/.*"]),
+    visibility = ["//visibility:public"],
+)
+
+filegroup(
+    name = "WalletUIAssets",
+    srcs = glob(["WalletImages.xcassets/**"]),
+    visibility = ["//visibility:public"],
+)
+
+swift_library(
+    name = "WalletUI",
+    module_name = "WalletUI",
+    srcs = glob([
+        "Sources/**/*.swift",
+    ]),
+    deps = [
+        "//submodules/SSignalKit/SwiftSignalKit:SwiftSignalKit",
+        "//submodules/AsyncDisplayKit:AsyncDisplayKit",
+        "//submodules/Display:Display",
+        "//submodules/OverlayStatusController:OverlayStatusController",
+        "//submodules/AppBundle:AppBundle",
+        "//submodules/SolidRoundedButtonNode:SolidRoundedButtonNode",
+        "//submodules/AlertUI:AlertUI",
+        "//submodules/Camera:Camera",
+        "//submodules/QrCode:QrCode",
+        "//submodules/MergeLists:MergeLists",
+        "//submodules/GlassButtonNode:GlassButtonNode",
+        "//submodules/UrlEscaping:UrlEscaping",
+        "//submodules/LocalAuth:LocalAuth",
+        "//submodules/ScreenCaptureDetection:ScreenCaptureDetection",
+        "//submodules/WalletUrl:WalletUrl",
+        "//submodules/WalletCore:WalletCore",
+        "//submodules/ActivityIndicator:ActivityIndicator",
+        "//submodules/ProgressNavigationButtonNode:ProgressNavigationButtonNode",
+        "//submodules/Markdown:Markdown",
+        "//submodules/StringPluralization:StringPluralization",
+        "//submodules/AnimatedStickerNode:AnimatedStickerNode",
+    ],
+    visibility = [
+        "//visibility:public",
+    ],
+)
diff --git a/submodules/WalletUI/Resources/WalletStrings.mapping b/submodules/WalletUI/Resources/WalletStrings.mapping
index 589c6fe85e..1246758922 100644
Binary files a/submodules/WalletUI/Resources/WalletStrings.mapping and b/submodules/WalletUI/Resources/WalletStrings.mapping differ
diff --git a/submodules/WalletUI/Sources/ItemList/Items/ItemListMultilineInputItem.swift b/submodules/WalletUI/Sources/ItemList/Items/ItemListMultilineInputItem.swift
index 5d017847fc..e798b2184d 100644
--- a/submodules/WalletUI/Sources/ItemList/Items/ItemListMultilineInputItem.swift
+++ b/submodules/WalletUI/Sources/ItemList/Items/ItemListMultilineInputItem.swift
@@ -316,6 +316,7 @@ class ItemListMultilineInputItemNode: ListViewItemNode, ASEditableTextNodeDelega
                     switch neighbors.bottom {
                         case .sameSection(false):
                             bottomStripeInset = leftInset
+                            strongSelf.bottomStripeNode.isHidden = false
                         default:
                             bottomStripeInset = 0.0
                             hasBottomCorners = true
@@ -327,7 +328,7 @@ class ItemListMultilineInputItemNode: ListViewItemNode, ASEditableTextNodeDelega
                     strongSelf.backgroundNode.frame = CGRect(origin: CGPoint(x: 0.0, y: -min(insets.top, separatorHeight)), size: CGSize(width: params.width, height: contentSize.height + min(insets.top, separatorHeight) + min(insets.bottom, separatorHeight)))
                     strongSelf.maskNode.frame = strongSelf.backgroundNode.frame.insetBy(dx: params.leftInset, dy: 0.0)
                     strongSelf.topStripeNode.frame = CGRect(origin: CGPoint(x: 0.0, y: -min(insets.top, separatorHeight)), size: CGSize(width: layoutSize.width, height: separatorHeight))
-                    strongSelf.bottomStripeNode.frame = CGRect(origin: CGPoint(x: bottomStripeInset, y: contentSize.height), size: CGSize(width: layoutSize.width - bottomStripeInset, height: separatorHeight))
+                    strongSelf.bottomStripeNode.frame = CGRect(origin: CGPoint(x: bottomStripeInset, y: contentSize.height - separatorHeight), size: CGSize(width: layoutSize.width - bottomStripeInset, height: separatorHeight))
                     
                     if strongSelf.textNode.attributedPlaceholderText == nil || !strongSelf.textNode.attributedPlaceholderText!.isEqual(to: attributedPlaceholderText) {
                         strongSelf.textNode.attributedPlaceholderText = attributedPlaceholderText
@@ -393,7 +394,7 @@ class ItemListMultilineInputItemNode: ListViewItemNode, ASEditableTextNodeDelega
         let textBottomInset: CGFloat = 11.0
         
         self.backgroundNode.frame = CGRect(origin: CGPoint(x: 0.0, y: -min(insets.top, separatorHeight)), size: CGSize(width: params.width, height: contentSize.height + min(insets.top, separatorHeight) + min(insets.bottom, separatorHeight)))
-        self.bottomStripeNode.frame = CGRect(origin: CGPoint(x: self.bottomStripeNode.frame.minX, y: contentSize.height), size: CGSize(width: self.bottomStripeNode.frame.size.width, height: separatorHeight))
+        self.bottomStripeNode.frame = CGRect(origin: CGPoint(x: self.bottomStripeNode.frame.minX, y: contentSize.height - separatorHeight), size: CGSize(width: self.bottomStripeNode.frame.size.width, height: separatorHeight))
         
         self.textClippingNode.frame = CGRect(origin: CGPoint(x: leftInset, y: textTopInset), size: CGSize(width: max(0.0, params.width - leftInset - params.rightInset), height: max(0.0, contentSize.height - textTopInset - textBottomInset)))
     }
diff --git a/submodules/WalletUI/Sources/ItemList/Items/ItemListSwitchItem.swift b/submodules/WalletUI/Sources/ItemList/Items/ItemListSwitchItem.swift
new file mode 100644
index 0000000000..290a72e0fc
--- /dev/null
+++ b/submodules/WalletUI/Sources/ItemList/Items/ItemListSwitchItem.swift
@@ -0,0 +1,412 @@
+import Foundation
+import UIKit
+import Display
+import AsyncDisplayKit
+import SwiftSignalKit
+
+enum ItemListSwitchItemNodeType {
+    case regular
+    case icon
+}
+
+class ItemListSwitchItem: ListViewItem, ItemListItem {
+    let theme: WalletTheme
+    let title: String
+    let value: Bool
+    let type: ItemListSwitchItemNodeType
+    let enableInteractiveChanges: Bool
+    let enabled: Bool
+    let disableLeadingInset: Bool
+    let maximumNumberOfLines: Int
+    let sectionId: ItemListSectionId
+    let style: ItemListStyle
+    let updated: (Bool) -> Void
+    let activatedWhileDisabled: () -> Void
+    let tag: ItemListItemTag?
+    
+    init(theme: WalletTheme, title: String, value: Bool, type: ItemListSwitchItemNodeType = .regular, enableInteractiveChanges: Bool = true, enabled: Bool = true, disableLeadingInset: Bool = false, maximumNumberOfLines: Int = 1, sectionId: ItemListSectionId, style: ItemListStyle, updated: @escaping (Bool) -> Void, activatedWhileDisabled: @escaping () -> Void = {}, tag: ItemListItemTag? = nil) {
+        self.theme = theme
+        self.title = title
+        self.value = value
+        self.type = type
+        self.enableInteractiveChanges = enableInteractiveChanges
+        self.enabled = enabled
+        self.disableLeadingInset = disableLeadingInset
+        self.maximumNumberOfLines = maximumNumberOfLines
+        self.sectionId = sectionId
+        self.style = style
+        self.updated = updated
+        self.activatedWhileDisabled = activatedWhileDisabled
+        self.tag = tag
+    }
+    
+    func nodeConfiguredForParams(async: @escaping (@escaping () -> Void) -> Void, params: ListViewItemLayoutParams, synchronousLoads: Bool, previousItem: ListViewItem?, nextItem: ListViewItem?, completion: @escaping (ListViewItemNode, @escaping () -> (Signal<Void, NoError>?, (ListViewItemApply) -> Void)) -> Void) {
+        async {
+            let node = ItemListSwitchItemNode(type: self.type)
+            let (layout, apply) = node.asyncLayout()(self, params, itemListNeighbors(item: self, topItem: previousItem as? ItemListItem, bottomItem: nextItem as? ItemListItem))
+            
+            node.contentSize = layout.contentSize
+            node.insets = layout.insets
+            
+            Queue.mainQueue().async {
+                completion(node, {
+                    return (nil, { _ in apply(false) })
+                })
+            }
+        }
+    }
+    
+    func updateNode(async: @escaping (@escaping () -> Void) -> Void, node: @escaping () -> ListViewItemNode, params: ListViewItemLayoutParams, previousItem: ListViewItem?, nextItem: ListViewItem?, animation: ListViewItemUpdateAnimation, completion: @escaping (ListViewItemNodeLayout, @escaping (ListViewItemApply) -> Void) -> Void) {
+        Queue.mainQueue().async {
+            if let nodeValue = node() as? ItemListSwitchItemNode {
+                let makeLayout = nodeValue.asyncLayout()
+                
+                async {
+                    let (layout, apply) = makeLayout(self, params, itemListNeighbors(item: self, topItem: previousItem as? ItemListItem, bottomItem: nextItem as? ItemListItem))
+                    Queue.mainQueue().async {
+                        completion(layout, { _ in
+                            var animated = true
+                            if case .None = animation {
+                                animated = false
+                            }
+                            apply(animated)
+                        })
+                    }
+                }
+            }
+        }
+    }
+}
+
+class ItemListSwitchItemNode: ListViewItemNode, ItemListItemNode {
+    private let backgroundNode: ASDisplayNode
+    private let topStripeNode: ASDisplayNode
+    private let bottomStripeNode: ASDisplayNode
+    private let highlightedBackgroundNode: ASDisplayNode
+    private let maskNode: ASImageNode
+    
+    private let titleNode: TextNode
+    private var switchNode: SwitchNode
+    private let switchGestureNode: ASDisplayNode
+    private var disabledOverlayNode: ASDisplayNode?
+    
+    private let activateArea: AccessibilityAreaNode
+    
+    private var item: ItemListSwitchItem?
+    
+    var tag: ItemListItemTag? {
+        return self.item?.tag
+    }
+    
+    init(type: ItemListSwitchItemNodeType) {
+        self.backgroundNode = ASDisplayNode()
+        self.backgroundNode.isLayerBacked = true
+        self.backgroundNode.backgroundColor = .white
+        
+        self.maskNode = ASImageNode()
+        
+        self.topStripeNode = ASDisplayNode()
+        self.topStripeNode.isLayerBacked = true
+        
+        self.bottomStripeNode = ASDisplayNode()
+        self.bottomStripeNode.isLayerBacked = true
+        
+        self.titleNode = TextNode()
+        self.titleNode.isUserInteractionEnabled = false
+        self.switchNode = SwitchNode()
+        
+        self.highlightedBackgroundNode = ASDisplayNode()
+        self.highlightedBackgroundNode.isLayerBacked = true
+        
+        self.switchGestureNode = ASDisplayNode()
+        
+        self.activateArea = AccessibilityAreaNode()
+        
+        super.init(layerBacked: false, dynamicBounce: false)
+        
+        self.addSubnode(self.titleNode)
+        self.addSubnode(self.switchNode)
+        self.addSubnode(self.switchGestureNode)
+        self.addSubnode(self.activateArea)
+        
+        self.activateArea.activate = { [weak self] in
+            guard let strongSelf = self, let item = strongSelf.item, item.enabled else {
+                return false
+            }
+            let value = !strongSelf.switchNode.isOn
+            if item.enableInteractiveChanges {
+                strongSelf.switchNode.setOn(value, animated: true)
+            }
+            item.updated(value)
+            return true
+        }
+        
+        self.switchNode.valueUpdated = { [weak self] value in
+            guard let strongSelf = self, let item = strongSelf.item else {
+                return
+            }
+            item.updated(value)
+        }
+    }
+    
+    override func didLoad() {
+        super.didLoad()
+        
+        self.switchGestureNode.view.addGestureRecognizer(UITapGestureRecognizer(target: self, action: #selector(self.tapGesture(_:))))
+    }
+    
+    func asyncLayout() -> (_ item: ItemListSwitchItem, _ params: ListViewItemLayoutParams, _ insets: ItemListNeighbors) -> (ListViewItemNodeLayout, (Bool) -> Void) {
+        let makeTitleLayout = TextNode.asyncLayout(self.titleNode)
+        
+        let currentItem = self.item
+        var currentDisabledOverlayNode = self.disabledOverlayNode
+        
+        return { item, params, neighbors in
+            var contentSize: CGSize
+            var insets: UIEdgeInsets
+            let separatorHeight = UIScreenPixel
+            let itemBackgroundColor: UIColor
+            let itemSeparatorColor: UIColor
+            
+            let titleFont = Font.regular(17.0)
+            
+            var updatedTheme: WalletTheme?
+            
+            if currentItem?.theme !== item.theme {
+                updatedTheme = item.theme
+            }
+            
+            switch item.style {
+            case .plain:
+                itemBackgroundColor = item.theme.list.plainBackgroundColor
+                itemSeparatorColor = item.theme.list.itemPlainSeparatorColor
+                contentSize = CGSize(width: params.width, height: 44.0)
+                insets = itemListNeighborsPlainInsets(neighbors)
+            case .blocks:
+                itemBackgroundColor = item.theme.list.itemBlocksBackgroundColor
+                itemSeparatorColor = item.theme.list.itemBlocksSeparatorColor
+                contentSize = CGSize(width: params.width, height: 44.0)
+                insets = itemListNeighborsGroupedInsets(neighbors)
+            }
+            
+            if item.disableLeadingInset {
+                insets.top = 0.0
+                insets.bottom = 0.0
+            }
+            
+            let (titleLayout, titleApply) = makeTitleLayout(TextNodeLayoutArguments(attributedString: NSAttributedString(string: item.title, font: titleFont, textColor: item.theme.list.itemPrimaryTextColor), backgroundColor: nil, maximumNumberOfLines: item.maximumNumberOfLines, truncationType: .end, constrainedSize: CGSize(width: params.width - params.leftInset - params.rightInset - 80.0, height: CGFloat.greatestFiniteMagnitude), alignment: .natural, cutout: nil, insets: UIEdgeInsets()))
+            
+            contentSize.height = max(contentSize.height, titleLayout.size.height + 22.0)
+            
+            if !item.enabled {
+                if currentDisabledOverlayNode == nil {
+                    currentDisabledOverlayNode = ASDisplayNode()
+                    currentDisabledOverlayNode?.backgroundColor = itemBackgroundColor.withAlphaComponent(0.6)
+                }
+            } else {
+                currentDisabledOverlayNode = nil
+            }
+            
+            let layout = ListViewItemNodeLayout(contentSize: contentSize, insets: insets)
+            let layoutSize = layout.size
+            
+            return (ListViewItemNodeLayout(contentSize: contentSize, insets: insets), { [weak self] animated in
+                if let strongSelf = self {
+                    strongSelf.item = item
+                    
+                    strongSelf.activateArea.frame = CGRect(origin: CGPoint(x: params.leftInset, y: 0.0), size: CGSize(width: params.width - params.leftInset - params.rightInset, height: layout.contentSize.height))
+                    
+                    strongSelf.activateArea.accessibilityLabel = item.title
+                    strongSelf.activateArea.accessibilityValue = item.value ? "On" : "Off"
+                    strongSelf.activateArea.accessibilityHint = "Tap to change"
+                    var accessibilityTraits = UIAccessibilityTraits()
+                    if item.enabled {
+                    } else {
+                        accessibilityTraits.insert(.notEnabled)
+                    }
+                    strongSelf.activateArea.accessibilityTraits = accessibilityTraits
+                    
+                    let transition: ContainedViewLayoutTransition
+                    if animated {
+                        transition = ContainedViewLayoutTransition.animated(duration: 0.4, curve: .spring)
+                    } else {
+                        transition = .immediate
+                    }
+                    
+                    if let currentDisabledOverlayNode = currentDisabledOverlayNode {
+                        if currentDisabledOverlayNode != strongSelf.disabledOverlayNode {
+                            strongSelf.disabledOverlayNode = currentDisabledOverlayNode
+                            strongSelf.insertSubnode(currentDisabledOverlayNode, belowSubnode: strongSelf.switchGestureNode)
+                            currentDisabledOverlayNode.alpha = 0.0
+                            transition.updateAlpha(node: currentDisabledOverlayNode, alpha: 1.0)
+                            currentDisabledOverlayNode.frame = CGRect(origin: CGPoint(), size: CGSize(width: layout.contentSize.width, height: layout.contentSize.height - separatorHeight))
+                        } else {
+                            transition.updateFrame(node: currentDisabledOverlayNode, frame: CGRect(origin: CGPoint(), size: CGSize(width: layout.contentSize.width, height: layout.contentSize.height - separatorHeight)))
+                        }
+                    } else if let disabledOverlayNode = strongSelf.disabledOverlayNode {
+                        transition.updateAlpha(node: disabledOverlayNode, alpha: 0.0, completion: { [weak disabledOverlayNode] _ in
+                            disabledOverlayNode?.removeFromSupernode()
+                        })
+                        strongSelf.disabledOverlayNode = nil
+                    }
+                    
+                    if let _ = updatedTheme {
+                        strongSelf.topStripeNode.backgroundColor = itemSeparatorColor
+                        strongSelf.bottomStripeNode.backgroundColor = itemSeparatorColor
+                        strongSelf.backgroundNode.backgroundColor = itemBackgroundColor
+                        
+                        strongSelf.highlightedBackgroundNode.backgroundColor = item.theme.list.itemHighlightedBackgroundColor
+                    }
+                    
+                    let _ = titleApply()
+                    
+                    let leftInset = 16.0 + params.leftInset
+                    
+                    switch item.style {
+                        case .plain:
+                            if strongSelf.backgroundNode.supernode != nil {
+                                strongSelf.backgroundNode.removeFromSupernode()
+                            }
+                            if strongSelf.topStripeNode.supernode != nil {
+                                strongSelf.topStripeNode.removeFromSupernode()
+                            }
+                            if strongSelf.bottomStripeNode.supernode == nil {
+                                strongSelf.insertSubnode(strongSelf.bottomStripeNode, at: 0)
+                            }
+                            if strongSelf.maskNode.supernode != nil {
+                                strongSelf.maskNode.removeFromSupernode()
+                            }
+                            strongSelf.bottomStripeNode.frame = CGRect(origin: CGPoint(x: leftInset, y: contentSize.height - separatorHeight), size: CGSize(width: params.width - leftInset, height: separatorHeight))
+                        case .blocks:
+                            if strongSelf.backgroundNode.supernode == nil {
+                                strongSelf.insertSubnode(strongSelf.backgroundNode, at: 0)
+                            }
+                            if strongSelf.topStripeNode.supernode == nil {
+                                strongSelf.insertSubnode(strongSelf.topStripeNode, at: 1)
+                            }
+                            if strongSelf.bottomStripeNode.supernode == nil {
+                                strongSelf.insertSubnode(strongSelf.bottomStripeNode, at: 2)
+                            }
+                            if strongSelf.maskNode.supernode == nil {
+                                strongSelf.insertSubnode(strongSelf.maskNode, at: 3)
+                            }
+                            
+                            let hasCorners = itemListHasRoundedBlockLayout(params)
+                            var hasTopCorners = false
+                            var hasBottomCorners = false
+                            switch neighbors.top {
+                                case .sameSection(false):
+                                    strongSelf.topStripeNode.isHidden = true
+                                default:
+                                    hasTopCorners = true
+                                    strongSelf.topStripeNode.isHidden = hasCorners
+                            }
+                            let bottomStripeInset: CGFloat
+                            switch neighbors.bottom {
+                                case .sameSection(false):
+                                    bottomStripeInset = 16.0 + params.leftInset
+                                default:
+                                    bottomStripeInset = 0.0
+                                    hasBottomCorners = true
+                                    strongSelf.bottomStripeNode.isHidden = hasCorners
+                            }
+                            
+                            strongSelf.maskNode.image = hasCorners ? cornersImage(item.theme, top: hasTopCorners, bottom: hasBottomCorners) : nil
+                            
+                            strongSelf.backgroundNode.frame = CGRect(origin: CGPoint(x: 0.0, y: 0.0), size: CGSize(width: params.width, height: contentSize.height))
+                            strongSelf.maskNode.frame = strongSelf.backgroundNode.frame.insetBy(dx: params.leftInset, dy: 0.0)
+                            strongSelf.topStripeNode.frame = CGRect(origin: CGPoint(x: 0.0, y: -min(insets.top, separatorHeight)), size: CGSize(width: layoutSize.width, height: separatorHeight))
+                            strongSelf.bottomStripeNode.frame = CGRect(origin: CGPoint(x: bottomStripeInset, y: contentSize.height - separatorHeight), size: CGSize(width: layoutSize.width - bottomStripeInset, height: separatorHeight))
+                    }
+                    
+                    strongSelf.titleNode.frame = CGRect(origin: CGPoint(x: leftInset, y: floorToScreenPixels((contentSize.height - titleLayout.size.height) / 2.0)), size: titleLayout.size)
+                    if let switchView = strongSelf.switchNode.view as? UISwitch {
+                        if strongSelf.switchNode.bounds.size.width.isZero {
+                            switchView.sizeToFit()
+                        }
+                        let switchSize = switchView.bounds.size
+                        
+                        strongSelf.switchNode.frame = CGRect(origin: CGPoint(x: params.width - params.rightInset - switchSize.width - 15.0, y: floor((contentSize.height - switchSize.height) / 2.0)), size: switchSize)
+                        strongSelf.switchGestureNode.frame = strongSelf.switchNode.frame
+                        if switchView.isOn != item.value {
+                            switchView.setOn(item.value, animated: animated)
+                        }
+                        switchView.isUserInteractionEnabled = item.enableInteractiveChanges
+                    }
+                    strongSelf.switchGestureNode.isHidden = item.enableInteractiveChanges && item.enabled
+                    
+                    strongSelf.highlightedBackgroundNode.frame = CGRect(origin: CGPoint(x: 0.0, y: -UIScreenPixel), size: CGSize(width: params.width, height: 44.0 + UIScreenPixel + UIScreenPixel))
+                }
+            })
+        }
+    }
+    
+    override func accessibilityActivate() -> Bool {
+        guard let item = self.item else {
+            return false
+        }
+        if !item.enabled {
+            return false
+        }
+        self.switchNode.isOn = !self.switchNode.isOn
+        item.updated(self.switchNode.isOn)
+        return true
+    }
+    
+    override func setHighlighted(_ highlighted: Bool, at point: CGPoint, animated: Bool) {
+        super.setHighlighted(highlighted, at: point, animated: animated)
+        
+        if highlighted {
+            self.highlightedBackgroundNode.alpha = 1.0
+            if self.highlightedBackgroundNode.supernode == nil {
+                var anchorNode: ASDisplayNode?
+                if self.bottomStripeNode.supernode != nil {
+                    anchorNode = self.bottomStripeNode
+                } else if self.topStripeNode.supernode != nil {
+                    anchorNode = self.topStripeNode
+                } else if self.backgroundNode.supernode != nil {
+                    anchorNode = self.backgroundNode
+                }
+                if let anchorNode = anchorNode {
+                    self.insertSubnode(self.highlightedBackgroundNode, aboveSubnode: anchorNode)
+                } else {
+                    self.addSubnode(self.highlightedBackgroundNode)
+                }
+            }
+        } else {
+            if self.highlightedBackgroundNode.supernode != nil {
+                if animated {
+                    self.highlightedBackgroundNode.layer.animateAlpha(from: self.highlightedBackgroundNode.alpha, to: 0.0, duration: 0.4, completion: { [weak self] completed in
+                        if let strongSelf = self {
+                            if completed {
+                                strongSelf.highlightedBackgroundNode.removeFromSupernode()
+                            }
+                        }
+                    })
+                    self.highlightedBackgroundNode.alpha = 0.0
+                } else {
+                    self.highlightedBackgroundNode.removeFromSupernode()
+                }
+            }
+        }
+    }
+    
+    override func animateInsertion(_ currentTimestamp: Double, duration: Double, short: Bool) {
+        self.layer.animateAlpha(from: 0.0, to: 1.0, duration: 0.4)
+    }
+    
+    override func animateRemoved(_ currentTimestamp: Double, duration: Double) {
+        self.layer.animateAlpha(from: 1.0, to: 0.0, duration: 0.15, removeOnCompletion: false)
+    }
+    
+    @objc private func tapGesture(_ recognizer: UITapGestureRecognizer) {
+        if let item = self.item, let switchView = self.switchNode.view as? UISwitch, case .ended = recognizer.state {
+            if item.enabled {
+                let value = switchView.isOn
+                item.updated(!value)
+            } else {
+                item.activatedWhileDisabled()
+            }
+        }
+    }
+}
diff --git a/submodules/WalletUI/Sources/WalletInfoScreen.swift b/submodules/WalletUI/Sources/WalletInfoScreen.swift
index 07db0b6db6..dc9f7c7320 100644
--- a/submodules/WalletUI/Sources/WalletInfoScreen.swift
+++ b/submodules/WalletUI/Sources/WalletInfoScreen.swift
@@ -569,6 +569,10 @@ private final class WalletInfoScreenNode: ViewControllerTracingNode {
     
     private let stateDisposable = MetaDisposable()
     private let transactionListDisposable = MetaDisposable()
+    private let transactionDecryptionKey = Promise<WalletTransactionDecryptionKey?>()
+    private var transactionDecryptionKeyRequested = false
+    private var transactionDecryptionKeyValue: WalletTransactionDecryptionKey?
+    private var transactionDecryptionKeyDisposable: Disposable?
     
     private var listOffset: CGFloat?
     private(set) var reloadingState: Bool = false
@@ -689,21 +693,50 @@ private final class WalletInfoScreenNode: ViewControllerTracingNode {
         if let walletInfo = walletInfo {
             subject = .wallet(walletInfo)
             
-            self.watchCombinedStateDisposable = (context.storage.watchWalletRecords()
-            |> deliverOnMainQueue).start(next: { [weak self] records in
-                guard let strongSelf = self else {
+            let watchCombinedStateSignal = context.storage.watchWalletRecords()
+            |> map { records -> WalletStateRecord? in
+                for record in records {
+                    if record.info.publicKey == walletInfo.publicKey {
+                        return record
+                    }
+                }
+                return nil
+            }
+            |> distinctUntilChanged
+            |> mapToSignal { wallet -> Signal<CombinedWalletState?, NoError> in
+                guard let wallet = wallet, let state = wallet.state else {
+                    return .single(nil)
+                }
+                return .single(state)
+            }
+            
+            let tonInstance = self.context.tonInstance
+            let decryptedWalletState = combineLatest(queue: .mainQueue(),
+                watchCombinedStateSignal,
+                self.transactionDecryptionKey.get()
+            )
+            |> mapToSignal { maybeState, decryptionKey -> Signal<CombinedWalletState?, NoError> in
+                guard let state = maybeState, let decryptionKey = decryptionKey else {
+                    return .single(maybeState)
+                }
+                return decryptWalletTransactions(decryptionKey: decryptionKey, transactions: state.topTransactions, tonInstance: tonInstance)
+                |> `catch` { _ -> Signal<[WalletTransaction], NoError> in
+                    return .single(state.topTransactions)
+                }
+                |> map { transactions -> CombinedWalletState? in
+                    return state.withTopTransactions(transactions)
+                }
+            }
+            
+            self.watchCombinedStateDisposable = (decryptedWalletState
+            |> deliverOnMainQueue).start(next: { [weak self] state in
+                guard let strongSelf = self, let state = state else {
                     return
                 }
-                for wallet in records {
-                    if wallet.info.publicKey == walletInfo.publicKey {
-                        if let state = wallet.state {
-                            if state.pendingTransactions != strongSelf.combinedState?.pendingTransactions || state.timestamp != strongSelf.combinedState?.timestamp {
-                                if !strongSelf.reloadingState {
-                                    strongSelf.updateCombinedState(combinedState: state, isUpdated: true)
-                                }
-                            }
-                        }
-                        break
+                
+                if state.pendingTransactions != strongSelf.combinedState?.pendingTransactions || state.timestamp != strongSelf.combinedState?.timestamp {
+                    if !strongSelf.reloadingState {
+                        strongSelf.updateCombinedState(combinedState: state, isUpdated: true)
                     }
                 }
             })
@@ -711,7 +744,7 @@ private final class WalletInfoScreenNode: ViewControllerTracingNode {
             subject = .address(address)
         }
         let pollCombinedState: Signal<Never, NoError> = (
-            getCombinedWalletState(storage: context.storage, subject: subject, tonInstance: context.tonInstance)
+            getCombinedWalletState(storage: context.storage, subject: subject, transactionDecryptionKey: nil, tonInstance: context.tonInstance, onlyCached: false)
             |> ignoreValues
             |> `catch` { _ -> Signal<Never, NoError> in
                 return .complete()
@@ -736,6 +769,81 @@ private final class WalletInfoScreenNode: ViewControllerTracingNode {
                 strongSelf.headerNode.refreshNode.update(state: .refreshing)
             }
         })
+        
+        self.transactionDecryptionKeyDisposable = (self.transactionDecryptionKey.get()
+        |> deliverOnMainQueue).start(next: { [weak self] value in
+            guard let strongSelf = self else {
+                return
+            }
+            strongSelf.transactionDecryptionKeyValue = value
+            if let value = value, let currentEntries = strongSelf.currentEntries {
+                var encryptedTransactions: [WalletTransactionId: WalletTransaction] = [:]
+                for entry in currentEntries {
+                    switch entry {
+                    case .empty:
+                        break
+                    case let .transaction(_, transaction):
+                        switch transaction {
+                        case let .completed(transaction):
+                            var isEncrypted = false
+                            if let inMessage = transaction.inMessage {
+                                switch inMessage.contents {
+                                case .encryptedText:
+                                    isEncrypted = true
+                                default:
+                                    break
+                                }
+                            }
+                            for outMessage in transaction.outMessages {
+                                switch outMessage.contents {
+                                case .encryptedText:
+                                    isEncrypted = true
+                                default:
+                                    break
+                                }
+                            }
+                            if isEncrypted {
+                                encryptedTransactions[transaction.transactionId] = transaction
+                            }
+                        case .pending:
+                            break
+                        }
+                    }
+                }
+                
+                if !encryptedTransactions.isEmpty {
+                    let _ = (decryptWalletTransactions(decryptionKey: value, transactions: Array(encryptedTransactions.values), tonInstance: strongSelf.context.tonInstance)
+                    |> deliverOnMainQueue).start(next: { decryptedTransactions in
+                        guard let strongSelf = self else {
+                            return
+                        }
+                        var decryptedTransactionMap: [WalletTransactionId: WalletTransaction] = [:]
+                        for transaction in decryptedTransactions {
+                            decryptedTransactionMap[transaction.transactionId] = transaction
+                        }
+                        var updatedEntries: [WalletInfoListEntry] = []
+                        for entry in currentEntries {
+                            switch entry {
+                            case .empty:
+                                updatedEntries.append(entry)
+                            case let .transaction(index, transaction):
+                                switch transaction {
+                                case .pending:
+                                    updatedEntries.append(entry)
+                                case let .completed(transaction):
+                                    if let decryptedTransaction = decryptedTransactionMap[transaction.transactionId] {
+                                        updatedEntries.append(.transaction(index, .completed(decryptedTransaction)))
+                                    } else {
+                                        updatedEntries.append(entry)
+                                    }
+                                }
+                            }
+                        }
+                        strongSelf.replaceEntries(updatedEntries)
+                    })
+                }
+            }
+        })
     }
     
     deinit {
@@ -745,6 +853,7 @@ private final class WalletInfoScreenNode: ViewControllerTracingNode {
         self.pollCombinedStateDisposable?.dispose()
         self.watchCombinedStateDisposable?.dispose()
         self.refreshProgressDisposable?.dispose()
+        self.transactionDecryptionKeyDisposable?.dispose()
     }
     
     func scrollToHideHeader() {
@@ -811,7 +920,7 @@ private final class WalletInfoScreenNode: ViewControllerTracingNode {
             subject = .address(self.address)
         }
         
-        self.stateDisposable.set((getCombinedWalletState(storage: self.context.storage, subject: subject, tonInstance: self.context.tonInstance)
+        self.stateDisposable.set((getCombinedWalletState(storage: self.context.storage, subject: subject, transactionDecryptionKey: self.transactionDecryptionKeyValue, tonInstance: self.context.tonInstance, onlyCached: false)
         |> deliverOnMainQueue).start(next: { [weak self] value in
             guard let strongSelf = self else {
                 return
@@ -975,7 +1084,7 @@ private final class WalletInfoScreenNode: ViewControllerTracingNode {
                 break
             }
         }
-        self.transactionListDisposable.set((getWalletTransactions(address: self.address, previousId: lastTransactionId, tonInstance: self.context.tonInstance)
+        self.transactionListDisposable.set((getWalletTransactions(address: self.address, previousId: lastTransactionId, transactionDecryptionKey: self.transactionDecryptionKeyValue, tonInstance: self.context.tonInstance)
         |> deliverOnMainQueue).start(next: { [weak self] transactions in
             guard let strongSelf = self else {
                 return
@@ -1041,6 +1150,61 @@ private final class WalletInfoScreenNode: ViewControllerTracingNode {
             }
         }
         
+        self.replaceEntries(updatedEntries)
+        
+        if !self.transactionDecryptionKeyRequested {
+            var encryptedTransactions: [WalletTransactionId: WalletTransaction] = [:]
+            for entry in updatedEntries {
+                switch entry {
+                case .empty:
+                    break
+                case let .transaction(_, transaction):
+                    switch transaction {
+                    case let .completed(transaction):
+                        var isEncrypted = false
+                        if let inMessage = transaction.inMessage {
+                            switch inMessage.contents {
+                            case .encryptedText:
+                                isEncrypted = true
+                            default:
+                                break
+                            }
+                        }
+                        for outMessage in transaction.outMessages {
+                            switch outMessage.contents {
+                            case .encryptedText:
+                                isEncrypted = true
+                            default:
+                                break
+                            }
+                        }
+                        if isEncrypted {
+                            encryptedTransactions[transaction.transactionId] = transaction
+                        }
+                    case .pending:
+                        break
+                    }
+                }
+            }
+            if !encryptedTransactions.isEmpty, let walletInfo = self.walletInfo {
+                let keychain = self.context.keychain
+                self.transactionDecryptionKeyRequested = true
+                self.transactionDecryptionKey.set(self.context.getServerSalt()
+                |> map(Optional.init)
+                |> `catch` { _ -> Signal<Data?, NoError> in
+                    return .single(nil)
+                }
+                |> mapToSignal { serverSalt -> Signal<WalletTransactionDecryptionKey?, NoError> in
+                    guard let serverSalt = serverSalt else {
+                        return .single(nil)
+                    }
+                    return walletTransactionDecryptionKey(keychain: keychain, walletInfo: walletInfo, localPassword: serverSalt)
+                })
+            }
+        }
+    }
+    
+    private func replaceEntries(_ updatedEntries: [WalletInfoListEntry]) {
         let transaction = preparedTransition(from: self.currentEntries ?? [], to: updatedEntries, presentationData: self.presentationData, action: { [weak self] transaction in
             guard let strongSelf = self else {
                 return
diff --git a/submodules/WalletUI/Sources/WalletInfoTransactionItem.swift b/submodules/WalletUI/Sources/WalletInfoTransactionItem.swift
index 4e2f1d8843..2240a179a7 100644
--- a/submodules/WalletUI/Sources/WalletInfoTransactionItem.swift
+++ b/submodules/WalletUI/Sources/WalletInfoTransactionItem.swift
@@ -242,7 +242,14 @@ class WalletInfoTransactionItemNode: ListViewItemNode {
                             if !description.isEmpty {
                                 description.append("\n")
                             }
-                            description.append(message.textMessage)
+                            switch message.contents {
+                            case .raw:
+                                break
+                            case .encryptedText:
+                                description.append("<encrypted>")
+                            case let .plainText(text):
+                                description.append(text)
+                            }
                         }
                     }
                 case let .pending(transaction):
@@ -268,7 +275,14 @@ class WalletInfoTransactionItemNode: ListViewItemNode {
                 case let .completed(transaction):
                     if let inMessage = transaction.inMessage {
                         text = formatAddress(inMessage.source)
-                        description = inMessage.textMessage
+                        switch inMessage.contents {
+                        case .raw:
+                            description = ""
+                        case .encryptedText:
+                            description = "<encrypted>"
+                        case let .plainText(text):
+                            description = text
+                        }
                     } else {
                         text = "<unknown>"
                     }
@@ -562,7 +576,7 @@ private func monthAtIndex(_ index: Int, strings: WalletStrings) -> String {
 final class WalletInfoTransactionDateHeaderNode: ListViewItemHeaderNode {
     var theme: WalletTheme
     var strings: WalletStrings
-    let titleNode: ASTextNode
+    let titleNode: ImmediateTextNode
     let backgroundNode: ASDisplayNode
     let separatorNode: ASDisplayNode
     
@@ -578,7 +592,7 @@ final class WalletInfoTransactionDateHeaderNode: ListViewItemHeaderNode {
         self.separatorNode.isLayerBacked = true
         self.separatorNode.backgroundColor = theme.list.itemBlocksSeparatorColor
         
-        self.titleNode = ASTextNode()
+        self.titleNode = ImmediateTextNode()
         self.titleNode.isUserInteractionEnabled = false
         
         super.init()
@@ -613,7 +627,7 @@ final class WalletInfoTransactionDateHeaderNode: ListViewItemHeaderNode {
         self.addSubnode(self.titleNode)
         self.titleNode.attributedText = NSAttributedString(string: text, font: sectionTitleFont, textColor: theme.list.itemPrimaryTextColor)
         self.titleNode.maximumNumberOfLines = 1
-        self.titleNode.truncationMode = .byTruncatingTail
+        self.titleNode.truncationType = .end
     }
     
     func updateThemeAndStrings(theme: WalletTheme, strings: WalletStrings) {
@@ -630,7 +644,7 @@ final class WalletInfoTransactionDateHeaderNode: ListViewItemHeaderNode {
     }
     
     override func updateLayout(size: CGSize, leftInset: CGFloat, rightInset: CGFloat) {
-        let titleSize = self.titleNode.measure(CGSize(width: size.width - leftInset - rightInset - 24.0, height: CGFloat.greatestFiniteMagnitude))
+        let titleSize = self.titleNode.updateLayout(CGSize(width: size.width - leftInset - rightInset - 24.0, height: CGFloat.greatestFiniteMagnitude))
         self.titleNode.frame = CGRect(origin: CGPoint(x: leftInset + 16.0, y: floor((size.height - titleSize.height) / 2.0)), size: titleSize)
         self.backgroundNode.frame = CGRect(origin: CGPoint(), size: size)
         self.separatorNode.frame = CGRect(origin: CGPoint(x: 0.0, y: size.height - UIScreenPixel), size: CGSize(width: size.width, height: UIScreenPixel))
diff --git a/submodules/WalletUI/Sources/WalletSendScreen.swift b/submodules/WalletUI/Sources/WalletSendScreen.swift
index c29ae89bf5..ed82929010 100644
--- a/submodules/WalletUI/Sources/WalletSendScreen.swift
+++ b/submodules/WalletUI/Sources/WalletSendScreen.swift
@@ -16,16 +16,18 @@ private final class WalletSendScreenArguments {
     let context: WalletContext
     let updateState: ((WalletSendScreenState) -> WalletSendScreenState) -> Void
     let updateText: (WalletSendScreenEntryTag, String) -> Void
+    let updateIsEncrypted: (Bool) -> Void
     let selectInputItem: (WalletSendScreenEntryTag) -> Void
     let scrollToBottom: () -> Void
     let dismissInput: () -> Void
     let openQrScanner: () -> Void
     let proceed: () -> Void
     
-    init(context: WalletContext, updateState: @escaping ((WalletSendScreenState) -> WalletSendScreenState) -> Void, updateText: @escaping (WalletSendScreenEntryTag, String) -> Void, selectInputItem: @escaping (WalletSendScreenEntryTag) -> Void, scrollToBottom: @escaping () -> Void, dismissInput: @escaping () -> Void, openQrScanner: @escaping () -> Void, proceed: @escaping () -> Void) {
+    init(context: WalletContext, updateState: @escaping ((WalletSendScreenState) -> WalletSendScreenState) -> Void, updateText: @escaping (WalletSendScreenEntryTag, String) -> Void, updateIsEncrypted: @escaping (Bool) -> Void, selectInputItem: @escaping (WalletSendScreenEntryTag) -> Void, scrollToBottom: @escaping () -> Void, dismissInput: @escaping () -> Void, openQrScanner: @escaping () -> Void, proceed: @escaping () -> Void) {
         self.context = context
         self.updateState = updateState
         self.updateText = updateText
+        self.updateIsEncrypted = updateIsEncrypted
         self.selectInputItem = selectInputItem
         self.scrollToBottom = scrollToBottom
         self.dismissInput = dismissInput
@@ -62,6 +64,7 @@ private enum WalletSendScreenEntry: ItemListNodeEntry {
     case addressInfo(WalletTheme, String)
     case commentHeader(WalletTheme, String)
     case comment(WalletTheme, String, String, Bool)
+    case commendEncryption(WalletTheme, String, Bool)
     
     var section: ItemListSectionId {
         switch self {
@@ -69,7 +72,7 @@ private enum WalletSendScreenEntry: ItemListNodeEntry {
             return WalletSendScreenSection.amount.rawValue
         case .addressHeader, .address, .addressInfo:
             return WalletSendScreenSection.address.rawValue
-        case .commentHeader, .comment:
+        case .commentHeader, .comment, .commendEncryption:
             return WalletSendScreenSection.comment.rawValue
         }
     }
@@ -90,6 +93,8 @@ private enum WalletSendScreenEntry: ItemListNodeEntry {
             return 5
         case .comment:
             return 6
+        case .commendEncryption:
+            return 7
         }
     }
     
@@ -137,6 +142,12 @@ private enum WalletSendScreenEntry: ItemListNodeEntry {
             } else {
                 return false
             }
+        case let .commendEncryption(lhsTheme, lhsText, lhsValue):
+            if case let .commendEncryption(rhsTheme, rhsText, rhsValue) = rhs, lhsTheme === rhsTheme, lhsText == rhsText, lhsText == rhsText {
+                return true
+            } else {
+                return false
+            }
         }
     }
     
@@ -257,6 +268,10 @@ private enum WalletSendScreenEntry: ItemListNodeEntry {
                     arguments.proceed()
                 }
             })
+        case let .commendEncryption(theme, text, value):
+            return ItemListSwitchItem(theme: theme, title: text, value: value, sectionId: self.section, style: .blocks, updated: { value in
+                arguments.updateIsEncrypted(value)
+            })
         }
     }
 }
@@ -265,6 +280,7 @@ private struct WalletSendScreenState: Equatable {
     var address: String
     var amount: String
     var comment: String
+    var isCommentEncrypted: Bool
 }
 
 private func walletSendScreenEntries(presentationData: WalletPresentationData, balance: Int64?, state: WalletSendScreenState, sendEnabled: Bool) -> [WalletSendScreenEntry] {
@@ -284,6 +300,8 @@ private func walletSendScreenEntries(presentationData: WalletPresentationData, b
         
     entries.append(.commentHeader(presentationData.theme, presentationData.strings.Wallet_Receive_CommentHeader))
     entries.append(.comment(presentationData.theme, presentationData.strings.Wallet_Receive_CommentInfo, state.comment, sendEnabled))
+    entries.append(.commendEncryption(presentationData.theme, presentationData.strings.Wallet_Send_EncryptComment, state.isCommentEncrypted))
+    
     return entries
 }
 
@@ -298,7 +316,7 @@ private final class WalletSendScreenImpl: ItemListController, WalletSendScreen {
 public func walletSendScreen(context: WalletContext, randomId: Int64, walletInfo: WalletInfo, address: String? = nil, amount: Int64? = nil, comment: String? = nil) -> ViewController {    
     let presentationData = context.presentationData
    
-    let initialState = WalletSendScreenState(address: address ?? "", amount: amount.flatMap { formatBalanceText($0, decimalSeparator: presentationData.dateTimeFormat.decimalSeparator) } ?? "", comment: comment ?? "")
+    let initialState = WalletSendScreenState(address: address ?? "", amount: amount.flatMap { formatBalanceText($0, decimalSeparator: presentationData.dateTimeFormat.decimalSeparator) } ?? "", comment: comment ?? "", isCommentEncrypted: true)
     let statePromise = ValuePromise(initialState, ignoreRepeated: true)
     let stateValue = Atomic(value: initialState)
     let updateState: ((WalletSendScreenState) -> WalletSendScreenState) -> Void = { f in
@@ -337,6 +355,12 @@ public func walletSendScreen(context: WalletContext, randomId: Int64, walletInfo
             return state
         }
         ensureItemVisibleImpl?(tag, false)
+    }, updateIsEncrypted: { value in
+        updateState { state in
+            var state = state
+            state.isCommentEncrypted = value
+            return state
+        }
     }, selectInputItem: { tag in
         selectInputItemImpl?(tag)
     }, scrollToBottom: {
@@ -393,15 +417,15 @@ public func walletSendScreen(context: WalletContext, randomId: Int64, walletInfo
             let controller = OverlayStatusController(theme: presentationData.theme, type: .loading(cancelled: nil))
             presentControllerImpl?(controller, nil)
             
-            let _ = (verifySendGramsRequestAndEstimateFees(tonInstance: context.tonInstance, walletInfo: walletInfo, toAddress: destinationAddress, amount: amount, textMessage: commentData ?? Data(), timeout: 0)
-            |> deliverOnMainQueue).start(next: { [weak controller] fees in
+            let _ = (verifySendGramsRequestAndEstimateFees(tonInstance: context.tonInstance, walletInfo: walletInfo, toAddress: destinationAddress, amount: amount, comment: commentData ?? Data(), encryptComment: state.isCommentEncrypted, timeout: 0)
+            |> deliverOnMainQueue).start(next: { [weak controller] verificationResult in
                 controller?.dismiss()
                 
                 let presentationData = context.presentationData
                 
                 let title = NSAttributedString(string: presentationData.strings.Wallet_Send_Confirmation, font: Font.semibold(17.0), textColor: presentationData.theme.list.itemPrimaryTextColor)
                 
-                let feeAmount = fees.inFwdFee + fees.storageFee + fees.gasFee + fees.fwdFee
+                let feeAmount = verificationResult.fees.inFwdFee + verificationResult.fees.storageFee + verificationResult.fees.gasFee + verificationResult.fees.fwdFee
                 
                 let (text, ranges) = presentationData.strings.Wallet_Send_ConfirmationText(formatBalanceText(amount, decimalSeparator: presentationData.dateTimeFormat.decimalSeparator), formattedAddress, "\(formatBalanceText(feeAmount, decimalSeparator: presentationData.dateTimeFormat.decimalSeparator))")
                 let bodyAttributes = MarkdownAttributeSet(font: Font.regular(13.0), textColor: presentationData.theme.list.itemPrimaryTextColor)
@@ -413,6 +437,11 @@ public func walletSendScreen(context: WalletContext, randomId: Int64, walletInfo
                     }
                 }
                 
+                if verificationResult.canNotEncryptComment {
+                    //TODO:localize
+                    attributedText.append(NSAttributedString(string: "\n\nThe destination wallet is not initialized. The comment will be sent unencrypted.", font: Font.regular(13.0), textColor: presentationData.theme.list.itemDestructiveColor))
+                }
+                
                 var dismissAlertImpl: ((Bool) -> Void)?
                 let theme = context.presentationData.theme
                 let controller = richTextAlertController(alertContext: AlertControllerContext(theme: theme.alert, themeSignal: .single(theme.alert)), title: title, text: attributedText, actions: [TextAlertAction(type: .genericAction, title: presentationData.strings.Wallet_Navigation_Cancel, action: {
@@ -449,7 +478,7 @@ public func walletSendScreen(context: WalletContext, randomId: Int64, walletInfo
                     |> deliverOnMainQueue).start(next: { serverSalt in
                         if let serverSalt = serverSalt {
                             if let commentData = state.comment.data(using: .utf8) {
-                                pushImpl?(WalletSplashScreen(context: context, mode: .sending(walletInfo, state.address, amount, commentData, randomId, serverSalt), walletCreatedPreloadState: nil))
+                                pushImpl?(WalletSplashScreen(context: context, mode: .sending(walletInfo: walletInfo, address: state.address, amount: amount, comment: commentData, encryptComment: state.isCommentEncrypted && !verificationResult.canNotEncryptComment, randomId: randomId, serverSalt: serverSalt), walletCreatedPreloadState: nil))
                             }
                         }
                     })
@@ -515,7 +544,7 @@ public func walletSendScreen(context: WalletContext, randomId: Int64, walletInfo
         })
     })
     
-    let walletState: Signal<WalletState?, NoError> = getCombinedWalletState(storage: context.storage, subject: .wallet(walletInfo), tonInstance: context.tonInstance, onlyCached: true)
+    let walletState: Signal<WalletState?, NoError> = getCombinedWalletState(storage: context.storage, subject: .wallet(walletInfo), transactionDecryptionKey: nil, tonInstance: context.tonInstance, onlyCached: true)
     |> map { combinedState -> WalletState? in
         var state: WalletState?
         switch combinedState {
@@ -529,7 +558,7 @@ public func walletSendScreen(context: WalletContext, randomId: Int64, walletInfo
     |> `catch` { _ -> Signal<WalletState?, NoError> in
         return .single(nil)
         |> then(
-            getCombinedWalletState(storage: context.storage, subject: .wallet(walletInfo), tonInstance: context.tonInstance, onlyCached: false)
+            getCombinedWalletState(storage: context.storage, subject: .wallet(walletInfo), transactionDecryptionKey: nil, tonInstance: context.tonInstance, onlyCached: false)
             |> map { combinedState -> WalletState? in
                 var state: WalletState?
                 switch combinedState {
diff --git a/submodules/WalletUI/Sources/WalletSplashScreen.swift b/submodules/WalletUI/Sources/WalletSplashScreen.swift
index 9c8b97c9d4..1d1d1804e2 100644
--- a/submodules/WalletUI/Sources/WalletSplashScreen.swift
+++ b/submodules/WalletUI/Sources/WalletSplashScreen.swift
@@ -19,11 +19,11 @@ public enum WalletSecureStorageResetReason {
 
 public enum WalletSplashMode {
     case intro
-    case created(WalletInfo, [String]?)
-    case success(WalletInfo)
+    case created(walletInfo: WalletInfo, words: [String]?)
+    case success(walletInfo: WalletInfo)
     case restoreFailed
-    case sending(WalletInfo, String, Int64, Data, Int64, Data)
-    case sent(WalletInfo, Int64)
+    case sending(walletInfo: WalletInfo, address: String, amount: Int64, comment: Data, encryptComment: Bool, randomId: Int64, serverSalt: Data)
+    case sent(walletInfo: WalletInfo, amount: Int64)
     case secureStorageNotAvailable
     case secureStorageReset(WalletSecureStorageResetReason)
 }
@@ -52,7 +52,7 @@ public final class WalletSplashScreen: ViewController {
                 self.walletCreatedPreloadState = walletCreatedPreloadState
             } else {
                 self.walletCreatedPreloadState = Promise()
-                self.walletCreatedPreloadState?.set(getCombinedWalletState(storage: context.storage, subject: .wallet(walletInfo), tonInstance: context.tonInstance)
+                self.walletCreatedPreloadState?.set(getCombinedWalletState(storage: context.storage, subject: .wallet(walletInfo), transactionDecryptionKey: nil, tonInstance: context.tonInstance, onlyCached: false)
                 |> map(Optional.init)
                 |> `catch` { _ -> Signal<CombinedWalletStateResult?, NoError> in
                     return .single(nil)
@@ -63,7 +63,7 @@ public final class WalletSplashScreen: ViewController {
                 self.walletCreatedPreloadState = walletCreatedPreloadState
             } else {
                 self.walletCreatedPreloadState = Promise()
-                self.walletCreatedPreloadState?.set(getCombinedWalletState(storage: context.storage, subject: .wallet(walletInfo), tonInstance: context.tonInstance)
+                self.walletCreatedPreloadState?.set(getCombinedWalletState(storage: context.storage, subject: .wallet(walletInfo), transactionDecryptionKey: nil, tonInstance: context.tonInstance, onlyCached: false)
                 |> map(Optional.init)
                 |> `catch` { _ -> Signal<CombinedWalletStateResult?, NoError> in
                     return .single(nil)
@@ -82,14 +82,14 @@ public final class WalletSplashScreen: ViewController {
         
         switch self.mode {
         case let .intro: self.navigationItem.setRightBarButton(UIBarButtonItem(title: self.presentationData.strings.Wallet_Intro_ImportExisting, style: .plain, target: self, action: #selector(self.importPressed)), animated: false)
-        case let .sending(walletInfo, address, amount, textMessage, randomId, serverSalt):
+        case let .sending(walletInfo, address, amount, comment, encryptComment, randomId, serverSalt):
             self.navigationItem.setLeftBarButton(UIBarButtonItem(customDisplayNode: ASDisplayNode())!, animated: false)
             let _ = (self.context.keychain.decrypt(walletInfo.encryptedSecret)
             |> deliverOnMainQueue).start(next: { [weak self] decryptedSecret in
                 guard let strongSelf = self else {
                     return
                 }
-                strongSelf.sendGrams(walletInfo: walletInfo, decryptedSecret: decryptedSecret, address: address, amount: amount, textMessage: textMessage, forceIfDestinationNotInitialized: true, randomId: randomId, serverSalt: serverSalt)
+                strongSelf.sendGrams(walletInfo: walletInfo, decryptedSecret: decryptedSecret, address: address, amount: amount, comment: comment, encryptComment: encryptComment, forceIfDestinationNotInitialized: true, randomId: randomId, serverSalt: serverSalt)
             }, error: { [weak self] error in
                 guard let strongSelf = self else {
                     return
@@ -133,8 +133,8 @@ public final class WalletSplashScreen: ViewController {
         self.push(WalletWordCheckScreen(context: self.context, mode: .import, walletCreatedPreloadState: nil))
     }
     
-    private func sendGrams(walletInfo: WalletInfo, decryptedSecret: Data, address: String, amount: Int64, textMessage: Data, forceIfDestinationNotInitialized: Bool, randomId: Int64, serverSalt: Data) {
-        let _ = (sendGramsFromWallet(storage: self.context.storage, tonInstance: self.context.tonInstance, walletInfo: walletInfo, decryptedSecret: decryptedSecret, localPassword: serverSalt, toAddress: address, amount: amount, textMessage: textMessage, forceIfDestinationNotInitialized: forceIfDestinationNotInitialized, timeout: 0, randomId: randomId)
+    private func sendGrams(walletInfo: WalletInfo, decryptedSecret: Data, address: String, amount: Int64, comment: Data, encryptComment: Bool, forceIfDestinationNotInitialized: Bool, randomId: Int64, serverSalt: Data) {
+        let _ = (sendGramsFromWallet(storage: self.context.storage, tonInstance: self.context.tonInstance, walletInfo: walletInfo, decryptedSecret: decryptedSecret, localPassword: serverSalt, toAddress: address, amount: amount, comment: comment, encryptComment: encryptComment, forceIfDestinationNotInitialized: forceIfDestinationNotInitialized, timeout: 0, randomId: randomId)
         |> deliverOnMainQueue).start(next: { [weak self] sentTransaction in
             guard let strongSelf = self else {
                 return
@@ -142,7 +142,7 @@ public final class WalletSplashScreen: ViewController {
             
             strongSelf.navigationItem.setRightBarButton(UIBarButtonItem(title: strongSelf.presentationData.strings.Wallet_WordImport_Continue, style: .plain, target: strongSelf, action: #selector(strongSelf.sendGramsContinuePressed)), animated: false)
             
-            let check = getCombinedWalletState(storage: strongSelf.context.storage, subject: .wallet(walletInfo), tonInstance: strongSelf.context.tonInstance)
+            let check = getCombinedWalletState(storage: strongSelf.context.storage, subject: .wallet(walletInfo), transactionDecryptionKey: nil, tonInstance: strongSelf.context.tonInstance, onlyCached: false)
             |> mapToSignal { state -> Signal<Bool, GetCombinedWalletStateError> in
                 switch state {
                 case .cached:
@@ -183,7 +183,7 @@ public final class WalletSplashScreen: ViewController {
                                 controllers.append(controller)
                             }
                         }
-                        controllers.append(WalletSplashScreen(context: strongSelf.context, mode: .sent(walletInfo, amount), walletCreatedPreloadState: nil))
+                        controllers.append(WalletSplashScreen(context: strongSelf.context, mode: .sent(walletInfo: walletInfo, amount: amount), walletCreatedPreloadState: nil))
                         strongSelf.view.endEditing(true)
                         navigationController.setViewControllers(controllers, animated: true)
                     })
@@ -208,7 +208,7 @@ public final class WalletSplashScreen: ViewController {
                                 controllers.append(controller)
                             }
                         }
-                        controllers.append(WalletSplashScreen(context: strongSelf.context, mode: .sent(walletInfo, amount), walletCreatedPreloadState: nil))
+                        controllers.append(WalletSplashScreen(context: strongSelf.context, mode: .sent(walletInfo: walletInfo, amount: amount), walletCreatedPreloadState: nil))
                         strongSelf.view.endEditing(true)
                         navigationController.setViewControllers(controllers, animated: true)
                     })
@@ -246,7 +246,7 @@ public final class WalletSplashScreen: ViewController {
                             }
                         }),
                         TextAlertAction(type: .defaultAction, title: "Send Anyway", action: {
-                            self?.sendGrams(walletInfo: walletInfo, decryptedSecret: decryptedSecret, address: address, amount: amount, textMessage: textMessage, forceIfDestinationNotInitialized: true, randomId: randomId, serverSalt: serverSalt)
+                            self?.sendGrams(walletInfo: walletInfo, decryptedSecret: decryptedSecret, address: address, amount: amount, comment: comment, encryptComment: encryptComment, forceIfDestinationNotInitialized: true, randomId: randomId, serverSalt: serverSalt)
                         })
                     ])
                     strongSelf.present(controller, in: .window(.root))
@@ -333,7 +333,7 @@ public final class WalletSplashScreen: ViewController {
                             return
                         }
                         controller.dismiss()
-                        (strongSelf.navigationController as? NavigationController)?.replaceController(strongSelf, with: WalletSplashScreen(context: strongSelf.context, mode: .created(walletInfo, wordList), walletCreatedPreloadState: nil), animated: true)
+                        (strongSelf.navigationController as? NavigationController)?.replaceController(strongSelf, with: WalletSplashScreen(context: strongSelf.context, mode: .created(walletInfo: walletInfo, words: wordList), walletCreatedPreloadState: nil), animated: true)
                     }, error: { _ in
                         displayError()
                     })
@@ -360,7 +360,7 @@ public final class WalletSplashScreen: ViewController {
                                     return
                                 }
                                 
-                                strongSelf.mode = .created(walletInfo, wordList)
+                                strongSelf.mode = .created(walletInfo: walletInfo, words: wordList)
                                 strongSelf.push(WalletWordDisplayScreen(context: strongSelf.context, walletInfo: walletInfo, wordList: wordList, mode: .check, walletCreatedPreloadState: strongSelf.walletCreatedPreloadState))
                             }, error: { _ in
                                 guard let strongSelf = self else {
diff --git a/submodules/WalletUI/Sources/WalletStrings.swift b/submodules/WalletUI/Sources/WalletStrings.swift
index c572929515..b25bf2d505 100644
--- a/submodules/WalletUI/Sources/WalletStrings.swift
+++ b/submodules/WalletUI/Sources/WalletStrings.swift
@@ -245,209 +245,210 @@ public final class WalletStrings: Equatable {
     public var Wallet_Intro_ImportExisting: String { return self._s[46]! }
     public var Wallet_Receive_CommentInfo: String { return self._s[47]! }
     public var Wallet_WordCheck_Continue: String { return self._s[48]! }
-    public var Wallet_Receive_InvoiceUrlCopied: String { return self._s[49]! }
-    public var Wallet_Completed_Text: String { return self._s[50]! }
-    public var Wallet_WordCheck_IncorrectHeader: String { return self._s[52]! }
-    public var Wallet_Configuration_SourceHeader: String { return self._s[53]! }
-    public var Wallet_TransactionInfo_StorageFeeInfoUrl: String { return self._s[54]! }
-    public var Wallet_Receive_Title: String { return self._s[55]! }
-    public var Wallet_Info_WalletCreated: String { return self._s[56]! }
-    public var Wallet_Navigation_Cancel: String { return self._s[57]! }
-    public var Wallet_CreateInvoice_Title: String { return self._s[58]! }
+    public var Wallet_Send_EncryptComment: String { return self._s[49]! }
+    public var Wallet_Receive_InvoiceUrlCopied: String { return self._s[50]! }
+    public var Wallet_Completed_Text: String { return self._s[51]! }
+    public var Wallet_WordCheck_IncorrectHeader: String { return self._s[53]! }
+    public var Wallet_Configuration_SourceHeader: String { return self._s[54]! }
+    public var Wallet_TransactionInfo_StorageFeeInfoUrl: String { return self._s[55]! }
+    public var Wallet_Receive_Title: String { return self._s[56]! }
+    public var Wallet_Info_WalletCreated: String { return self._s[57]! }
+    public var Wallet_Navigation_Cancel: String { return self._s[58]! }
+    public var Wallet_CreateInvoice_Title: String { return self._s[59]! }
     public func Wallet_WordCheck_Text(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[59]!, self._r[59]!, [_1, _2, _3])
+        return formatWithArgumentRanges(self._s[60]!, self._r[60]!, [_1, _2, _3])
     }
-    public var Wallet_TransactionInfo_SenderHeader: String { return self._s[60]! }
+    public var Wallet_TransactionInfo_SenderHeader: String { return self._s[61]! }
     public func Wallet_Time_PreciseDate_m4(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[61]!, self._r[61]!, [_1, _2, _3])
+        return formatWithArgumentRanges(self._s[62]!, self._r[62]!, [_1, _2, _3])
     }
-    public var Wallet_Month_GenAugust: String { return self._s[62]! }
-    public var Wallet_Info_UnknownTransaction: String { return self._s[63]! }
-    public var Wallet_Receive_CreateInvoice: String { return self._s[64]! }
-    public var Wallet_Month_GenSeptember: String { return self._s[65]! }
-    public var Wallet_Month_GenJuly: String { return self._s[66]! }
-    public var Wallet_Receive_AddressHeader: String { return self._s[67]! }
-    public var Wallet_Send_AmountText: String { return self._s[68]! }
-    public var Wallet_SecureStorageNotAvailable_Text: String { return self._s[69]! }
+    public var Wallet_Month_GenAugust: String { return self._s[63]! }
+    public var Wallet_Info_UnknownTransaction: String { return self._s[64]! }
+    public var Wallet_Receive_CreateInvoice: String { return self._s[65]! }
+    public var Wallet_Month_GenSeptember: String { return self._s[66]! }
+    public var Wallet_Month_GenJuly: String { return self._s[67]! }
+    public var Wallet_Receive_AddressHeader: String { return self._s[68]! }
+    public var Wallet_Send_AmountText: String { return self._s[69]! }
+    public var Wallet_SecureStorageNotAvailable_Text: String { return self._s[70]! }
     public func Wallet_Time_PreciseDate_m12(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[70]!, self._r[70]!, [_1, _2, _3])
+        return formatWithArgumentRanges(self._s[71]!, self._r[71]!, [_1, _2, _3])
     }
     public func Wallet_Updated_TodayAt(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[71]!, self._r[71]!, [_0])
+        return formatWithArgumentRanges(self._s[72]!, self._r[72]!, [_0])
     }
-    public var Wallet_Configuration_Title: String { return self._s[73]! }
-    public var Wallet_Configuration_BlockchainIdHeader: String { return self._s[74]! }
-    public var Wallet_Words_Title: String { return self._s[75]! }
-    public var Wallet_Month_ShortMay: String { return self._s[76]! }
-    public var Wallet_WordCheck_Title: String { return self._s[77]! }
-    public var Wallet_Words_NotDoneResponse: String { return self._s[78]! }
-    public var Wallet_Configuration_SourceURL: String { return self._s[79]! }
-    public var Wallet_Send_ErrorNotEnoughFundsText: String { return self._s[80]! }
-    public var Wallet_Receive_CreateInvoiceInfo: String { return self._s[81]! }
+    public var Wallet_Configuration_Title: String { return self._s[74]! }
+    public var Wallet_Configuration_BlockchainIdHeader: String { return self._s[75]! }
+    public var Wallet_Words_Title: String { return self._s[76]! }
+    public var Wallet_Month_ShortMay: String { return self._s[77]! }
+    public var Wallet_WordCheck_Title: String { return self._s[78]! }
+    public var Wallet_Words_NotDoneResponse: String { return self._s[79]! }
+    public var Wallet_Configuration_SourceURL: String { return self._s[80]! }
+    public var Wallet_Send_ErrorNotEnoughFundsText: String { return self._s[81]! }
+    public var Wallet_Receive_CreateInvoiceInfo: String { return self._s[82]! }
     public func Wallet_Time_PreciseDate_m9(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[82]!, self._r[82]!, [_1, _2, _3])
+        return formatWithArgumentRanges(self._s[83]!, self._r[83]!, [_1, _2, _3])
     }
-    public var Wallet_Info_Address: String { return self._s[83]! }
-    public var Wallet_Intro_CreateWallet: String { return self._s[84]! }
-    public var Wallet_SecureStorageChanged_PasscodeText: String { return self._s[85]! }
+    public var Wallet_Info_Address: String { return self._s[84]! }
+    public var Wallet_Intro_CreateWallet: String { return self._s[85]! }
+    public var Wallet_SecureStorageChanged_PasscodeText: String { return self._s[86]! }
     public func Wallet_SecureStorageReset_BiometryText(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[86]!, self._r[86]!, [_0])
+        return formatWithArgumentRanges(self._s[87]!, self._r[87]!, [_0])
     }
-    public var Wallet_Send_SendAnyway: String { return self._s[87]! }
-    public var Wallet_UnknownError: String { return self._s[88]! }
-    public var Wallet_Configuration_ApplyErrorTextURLInvalid: String { return self._s[89]! }
-    public var Wallet_SecureStorageChanged_ImportWallet: String { return self._s[90]! }
-    public var Wallet_SecureStorageChanged_CreateWallet: String { return self._s[92]! }
-    public var Wallet_Configuration_SourceInfo: String { return self._s[93]! }
-    public var Wallet_Words_NotDoneOk: String { return self._s[94]! }
-    public var Wallet_Intro_Title: String { return self._s[95]! }
-    public var Wallet_Info_Receive: String { return self._s[96]! }
-    public var Wallet_Completed_ViewWallet: String { return self._s[97]! }
-    public var Wallet_Month_ShortJuly: String { return self._s[98]! }
-    public var Wallet_Month_ShortApril: String { return self._s[99]! }
+    public var Wallet_Send_SendAnyway: String { return self._s[88]! }
+    public var Wallet_UnknownError: String { return self._s[89]! }
+    public var Wallet_Configuration_ApplyErrorTextURLInvalid: String { return self._s[90]! }
+    public var Wallet_SecureStorageChanged_ImportWallet: String { return self._s[91]! }
+    public var Wallet_SecureStorageChanged_CreateWallet: String { return self._s[93]! }
+    public var Wallet_Configuration_SourceInfo: String { return self._s[94]! }
+    public var Wallet_Words_NotDoneOk: String { return self._s[95]! }
+    public var Wallet_Intro_Title: String { return self._s[96]! }
+    public var Wallet_Info_Receive: String { return self._s[97]! }
+    public var Wallet_Completed_ViewWallet: String { return self._s[98]! }
+    public var Wallet_Month_ShortJuly: String { return self._s[99]! }
+    public var Wallet_Month_ShortApril: String { return self._s[100]! }
     public func Wallet_Info_TransactionDateHeader(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[100]!, self._r[100]!, [_1, _2])
+        return formatWithArgumentRanges(self._s[101]!, self._r[101]!, [_1, _2])
     }
-    public var Wallet_Receive_ShareInvoiceUrl: String { return self._s[101]! }
+    public var Wallet_Receive_ShareInvoiceUrl: String { return self._s[102]! }
     public func Wallet_Time_PreciseDate_m10(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[102]!, self._r[102]!, [_1, _2, _3])
+        return formatWithArgumentRanges(self._s[103]!, self._r[103]!, [_1, _2, _3])
     }
-    public var Wallet_Send_UninitializedText: String { return self._s[104]! }
+    public var Wallet_Send_UninitializedText: String { return self._s[105]! }
     public func Wallet_Sent_Text(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[105]!, self._r[105]!, [_0])
+        return formatWithArgumentRanges(self._s[106]!, self._r[106]!, [_0])
     }
-    public var Wallet_Month_GenNovember: String { return self._s[106]! }
+    public var Wallet_Month_GenNovember: String { return self._s[107]! }
     public func Wallet_Time_PreciseDate_m5(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[107]!, self._r[107]!, [_1, _2, _3])
+        return formatWithArgumentRanges(self._s[108]!, self._r[108]!, [_1, _2, _3])
     }
-    public var Wallet_Month_GenApril: String { return self._s[108]! }
-    public var Wallet_Month_ShortMarch: String { return self._s[109]! }
-    public var Wallet_Month_GenFebruary: String { return self._s[110]! }
-    public var Wallet_Qr_ScanCode: String { return self._s[111]! }
-    public var Wallet_Receive_AddressCopied: String { return self._s[112]! }
-    public var Wallet_Send_UninitializedTitle: String { return self._s[113]! }
-    public var Wallet_AccessDenied_Title: String { return self._s[114]! }
-    public var Wallet_AccessDenied_Settings: String { return self._s[115]! }
-    public var Wallet_Send_Send: String { return self._s[116]! }
-    public var Wallet_Info_RefreshErrorTitle: String { return self._s[117]! }
-    public var Wallet_Month_GenJune: String { return self._s[118]! }
-    public var Wallet_Send_AddressHeader: String { return self._s[119]! }
-    public var Wallet_SecureStorageReset_BiometryTouchId: String { return self._s[120]! }
-    public var Wallet_Send_Confirmation: String { return self._s[121]! }
-    public var Wallet_Completed_Title: String { return self._s[122]! }
-    public var Wallet_Alert_OK: String { return self._s[123]! }
-    public var Wallet_Settings_DeleteWallet: String { return self._s[124]! }
-    public var Wallet_SecureStorageReset_PasscodeText: String { return self._s[125]! }
-    public var Wallet_Month_ShortSeptember: String { return self._s[126]! }
-    public var Wallet_Info_TransactionTo: String { return self._s[127]! }
-    public var Wallet_Send_ConfirmationConfirm: String { return self._s[128]! }
-    public var Wallet_TransactionInfo_OtherFeeInfo: String { return self._s[129]! }
-    public var Wallet_Receive_AmountText: String { return self._s[130]! }
-    public var Wallet_Receive_CopyAddress: String { return self._s[131]! }
-    public var Wallet_Intro_Text: String { return self._s[133]! }
-    public var Wallet_Configuration_Apply: String { return self._s[134]! }
+    public var Wallet_Month_GenApril: String { return self._s[109]! }
+    public var Wallet_Month_ShortMarch: String { return self._s[110]! }
+    public var Wallet_Month_GenFebruary: String { return self._s[111]! }
+    public var Wallet_Qr_ScanCode: String { return self._s[112]! }
+    public var Wallet_Receive_AddressCopied: String { return self._s[113]! }
+    public var Wallet_Send_UninitializedTitle: String { return self._s[114]! }
+    public var Wallet_AccessDenied_Title: String { return self._s[115]! }
+    public var Wallet_AccessDenied_Settings: String { return self._s[116]! }
+    public var Wallet_Send_Send: String { return self._s[117]! }
+    public var Wallet_Info_RefreshErrorTitle: String { return self._s[118]! }
+    public var Wallet_Month_GenJune: String { return self._s[119]! }
+    public var Wallet_Send_AddressHeader: String { return self._s[120]! }
+    public var Wallet_SecureStorageReset_BiometryTouchId: String { return self._s[121]! }
+    public var Wallet_Send_Confirmation: String { return self._s[122]! }
+    public var Wallet_Completed_Title: String { return self._s[123]! }
+    public var Wallet_Alert_OK: String { return self._s[124]! }
+    public var Wallet_Settings_DeleteWallet: String { return self._s[125]! }
+    public var Wallet_SecureStorageReset_PasscodeText: String { return self._s[126]! }
+    public var Wallet_Month_ShortSeptember: String { return self._s[127]! }
+    public var Wallet_Info_TransactionTo: String { return self._s[128]! }
+    public var Wallet_Send_ConfirmationConfirm: String { return self._s[129]! }
+    public var Wallet_TransactionInfo_OtherFeeInfo: String { return self._s[130]! }
+    public var Wallet_Receive_AmountText: String { return self._s[131]! }
+    public var Wallet_Receive_CopyAddress: String { return self._s[132]! }
+    public var Wallet_Intro_Text: String { return self._s[134]! }
+    public var Wallet_Configuration_Apply: String { return self._s[135]! }
     public func Wallet_SecureStorageChanged_BiometryText(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[135]!, self._r[135]!, [_0])
+        return formatWithArgumentRanges(self._s[136]!, self._r[136]!, [_0])
     }
     public func Wallet_Time_PreciseDate_m1(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[136]!, self._r[136]!, [_1, _2, _3])
+        return formatWithArgumentRanges(self._s[137]!, self._r[137]!, [_1, _2, _3])
     }
-    public var Wallet_RestoreFailed_CreateWallet: String { return self._s[137]! }
-    public var Wallet_Weekday_Yesterday: String { return self._s[138]! }
-    public var Wallet_Receive_AmountHeader: String { return self._s[139]! }
-    public var Wallet_TransactionInfo_OtherFeeInfoUrl: String { return self._s[140]! }
-    public var Wallet_Month_ShortFebruary: String { return self._s[141]! }
-    public var Wallet_Configuration_SourceJSON: String { return self._s[142]! }
-    public var Wallet_Alert_Cancel: String { return self._s[143]! }
-    public var Wallet_TransactionInfo_RecipientHeader: String { return self._s[144]! }
-    public var Wallet_Configuration_ApplyErrorTextJSONInvalidData: String { return self._s[145]! }
-    public var Wallet_Info_TransactionFrom: String { return self._s[146]! }
-    public var Wallet_Send_ErrorDecryptionFailed: String { return self._s[147]! }
-    public var Wallet_Send_OwnAddressAlertText: String { return self._s[148]! }
-    public var Wallet_Words_NotDoneTitle: String { return self._s[149]! }
-    public var Wallet_Month_ShortOctober: String { return self._s[150]! }
-    public var Wallet_Month_GenMay: String { return self._s[151]! }
-    public var Wallet_Intro_CreateErrorTitle: String { return self._s[152]! }
-    public var Wallet_SecureStorageReset_BiometryFaceId: String { return self._s[153]! }
-    public var Wallet_Month_ShortJanuary: String { return self._s[154]! }
-    public var Wallet_Month_GenMarch: String { return self._s[155]! }
-    public var Wallet_AccessDenied_Camera: String { return self._s[156]! }
-    public var Wallet_Sending_Text: String { return self._s[157]! }
-    public var Wallet_Month_GenOctober: String { return self._s[158]! }
-    public var Wallet_Receive_CopyInvoiceUrl: String { return self._s[159]! }
-    public var Wallet_ContextMenuCopy: String { return self._s[160]! }
+    public var Wallet_RestoreFailed_CreateWallet: String { return self._s[138]! }
+    public var Wallet_Weekday_Yesterday: String { return self._s[139]! }
+    public var Wallet_Receive_AmountHeader: String { return self._s[140]! }
+    public var Wallet_TransactionInfo_OtherFeeInfoUrl: String { return self._s[141]! }
+    public var Wallet_Month_ShortFebruary: String { return self._s[142]! }
+    public var Wallet_Configuration_SourceJSON: String { return self._s[143]! }
+    public var Wallet_Alert_Cancel: String { return self._s[144]! }
+    public var Wallet_TransactionInfo_RecipientHeader: String { return self._s[145]! }
+    public var Wallet_Configuration_ApplyErrorTextJSONInvalidData: String { return self._s[146]! }
+    public var Wallet_Info_TransactionFrom: String { return self._s[147]! }
+    public var Wallet_Send_ErrorDecryptionFailed: String { return self._s[148]! }
+    public var Wallet_Send_OwnAddressAlertText: String { return self._s[149]! }
+    public var Wallet_Words_NotDoneTitle: String { return self._s[150]! }
+    public var Wallet_Month_ShortOctober: String { return self._s[151]! }
+    public var Wallet_Month_GenMay: String { return self._s[152]! }
+    public var Wallet_Intro_CreateErrorTitle: String { return self._s[153]! }
+    public var Wallet_SecureStorageReset_BiometryFaceId: String { return self._s[154]! }
+    public var Wallet_Month_ShortJanuary: String { return self._s[155]! }
+    public var Wallet_Month_GenMarch: String { return self._s[156]! }
+    public var Wallet_AccessDenied_Camera: String { return self._s[157]! }
+    public var Wallet_Sending_Text: String { return self._s[158]! }
+    public var Wallet_Month_GenOctober: String { return self._s[159]! }
+    public var Wallet_Receive_CopyInvoiceUrl: String { return self._s[160]! }
+    public var Wallet_ContextMenuCopy: String { return self._s[161]! }
     public func Wallet_Time_PreciseDate_m6(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[161]!, self._r[161]!, [_1, _2, _3])
+        return formatWithArgumentRanges(self._s[162]!, self._r[162]!, [_1, _2, _3])
     }
-    public var Wallet_Info_Updating: String { return self._s[163]! }
-    public var Wallet_Created_ExportErrorTitle: String { return self._s[164]! }
-    public var Wallet_SecureStorageNotAvailable_Title: String { return self._s[165]! }
-    public var Wallet_Sending_Title: String { return self._s[166]! }
-    public var Wallet_Navigation_Done: String { return self._s[167]! }
-    public var Wallet_Configuration_BlockchainIdInfo: String { return self._s[168]! }
-    public var Wallet_Configuration_BlockchainNameChangedTitle: String { return self._s[169]! }
-    public var Wallet_Settings_Title: String { return self._s[170]! }
+    public var Wallet_Info_Updating: String { return self._s[164]! }
+    public var Wallet_Created_ExportErrorTitle: String { return self._s[165]! }
+    public var Wallet_SecureStorageNotAvailable_Title: String { return self._s[166]! }
+    public var Wallet_Sending_Title: String { return self._s[167]! }
+    public var Wallet_Navigation_Done: String { return self._s[168]! }
+    public var Wallet_Configuration_BlockchainIdInfo: String { return self._s[169]! }
+    public var Wallet_Configuration_BlockchainNameChangedTitle: String { return self._s[170]! }
+    public var Wallet_Settings_Title: String { return self._s[171]! }
     public func Wallet_Receive_ShareInvoiceUrlInfo(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[171]!, self._r[171]!, [_0])
+        return formatWithArgumentRanges(self._s[172]!, self._r[172]!, [_0])
     }
-    public var Wallet_Info_RefreshErrorNetworkText: String { return self._s[172]! }
-    public var Wallet_Weekday_Today: String { return self._s[174]! }
-    public var Wallet_Month_ShortDecember: String { return self._s[175]! }
-    public var Wallet_Words_Text: String { return self._s[176]! }
-    public var Wallet_Configuration_BlockchainNameChangedProceed: String { return self._s[177]! }
-    public var Wallet_WordCheck_ViewWords: String { return self._s[178]! }
-    public var Wallet_Send_AddressInfo: String { return self._s[179]! }
+    public var Wallet_Info_RefreshErrorNetworkText: String { return self._s[173]! }
+    public var Wallet_Weekday_Today: String { return self._s[175]! }
+    public var Wallet_Month_ShortDecember: String { return self._s[176]! }
+    public var Wallet_Words_Text: String { return self._s[177]! }
+    public var Wallet_Configuration_BlockchainNameChangedProceed: String { return self._s[178]! }
+    public var Wallet_WordCheck_ViewWords: String { return self._s[179]! }
+    public var Wallet_Send_AddressInfo: String { return self._s[180]! }
     public func Wallet_Updated_AtDate(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[180]!, self._r[180]!, [_0])
+        return formatWithArgumentRanges(self._s[181]!, self._r[181]!, [_0])
     }
-    public var Wallet_Intro_NotNow: String { return self._s[181]! }
-    public var Wallet_Send_OwnAddressAlertProceed: String { return self._s[182]! }
-    public var Wallet_Navigation_Close: String { return self._s[183]! }
-    public var Wallet_Month_GenDecember: String { return self._s[185]! }
-    public var Wallet_Send_ErrorNotEnoughFundsTitle: String { return self._s[186]! }
-    public var Wallet_WordImport_IncorrectTitle: String { return self._s[187]! }
-    public var Wallet_Send_AddressText: String { return self._s[188]! }
-    public var Wallet_Receive_AmountInfo: String { return self._s[189]! }
+    public var Wallet_Intro_NotNow: String { return self._s[182]! }
+    public var Wallet_Send_OwnAddressAlertProceed: String { return self._s[183]! }
+    public var Wallet_Navigation_Close: String { return self._s[184]! }
+    public var Wallet_Month_GenDecember: String { return self._s[186]! }
+    public var Wallet_Send_ErrorNotEnoughFundsTitle: String { return self._s[187]! }
+    public var Wallet_WordImport_IncorrectTitle: String { return self._s[188]! }
+    public var Wallet_Send_AddressText: String { return self._s[189]! }
+    public var Wallet_Receive_AmountInfo: String { return self._s[190]! }
     public func Wallet_Time_PreciseDate_m2(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[190]!, self._r[190]!, [_1, _2, _3])
+        return formatWithArgumentRanges(self._s[191]!, self._r[191]!, [_1, _2, _3])
     }
-    public var Wallet_Month_ShortAugust: String { return self._s[191]! }
-    public var Wallet_Qr_Title: String { return self._s[192]! }
-    public var Wallet_Settings_Configuration: String { return self._s[193]! }
-    public var Wallet_WordCheck_TryAgain: String { return self._s[194]! }
-    public var Wallet_Info_TransactionPendingHeader: String { return self._s[195]! }
-    public var Wallet_Receive_InvoiceUrlHeader: String { return self._s[196]! }
-    public var Wallet_Configuration_ApplyErrorTitle: String { return self._s[197]! }
-    public var Wallet_Send_TransactionInProgress: String { return self._s[198]! }
-    public var Wallet_Created_Text: String { return self._s[199]! }
-    public var Wallet_Created_Proceed: String { return self._s[200]! }
-    public var Wallet_Words_Done: String { return self._s[201]! }
-    public var Wallet_WordImport_Continue: String { return self._s[202]! }
-    public var Wallet_TransactionInfo_StorageFeeHeader: String { return self._s[203]! }
-    public var Wallet_WordImport_CanNotRemember: String { return self._s[204]! }
+    public var Wallet_Month_ShortAugust: String { return self._s[192]! }
+    public var Wallet_Qr_Title: String { return self._s[193]! }
+    public var Wallet_Settings_Configuration: String { return self._s[194]! }
+    public var Wallet_WordCheck_TryAgain: String { return self._s[195]! }
+    public var Wallet_Info_TransactionPendingHeader: String { return self._s[196]! }
+    public var Wallet_Receive_InvoiceUrlHeader: String { return self._s[197]! }
+    public var Wallet_Configuration_ApplyErrorTitle: String { return self._s[198]! }
+    public var Wallet_Send_TransactionInProgress: String { return self._s[199]! }
+    public var Wallet_Created_Text: String { return self._s[200]! }
+    public var Wallet_Created_Proceed: String { return self._s[201]! }
+    public var Wallet_Words_Done: String { return self._s[202]! }
+    public var Wallet_WordImport_Continue: String { return self._s[203]! }
+    public var Wallet_TransactionInfo_StorageFeeHeader: String { return self._s[204]! }
+    public var Wallet_WordImport_CanNotRemember: String { return self._s[205]! }
     public func Wallet_Time_PreciseDate_m11(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[205]!, self._r[205]!, [_1, _2, _3])
-    }
-    public func Wallet_Send_ConfirmationText(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) {
         return formatWithArgumentRanges(self._s[206]!, self._r[206]!, [_1, _2, _3])
     }
-    public var Wallet_Created_ExportErrorText: String { return self._s[208]! }
+    public func Wallet_Send_ConfirmationText(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[207]!, self._r[207]!, [_1, _2, _3])
+    }
+    public var Wallet_Created_ExportErrorText: String { return self._s[209]! }
     public func Wallet_Updated_YesterdayAt(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[209]!, self._r[209]!, [_0])
+        return formatWithArgumentRanges(self._s[210]!, self._r[210]!, [_0])
     }
-    public var Wallet_Settings_DeleteWalletInfo: String { return self._s[210]! }
-    public var Wallet_Intro_CreateErrorText: String { return self._s[211]! }
-    public var Wallet_Sent_ViewWallet: String { return self._s[212]! }
-    public var Wallet_Send_ErrorInvalidAddress: String { return self._s[213]! }
-    public var Wallet_Configuration_BlockchainNameChangedText: String { return self._s[214]! }
+    public var Wallet_Settings_DeleteWalletInfo: String { return self._s[211]! }
+    public var Wallet_Intro_CreateErrorText: String { return self._s[212]! }
+    public var Wallet_Sent_ViewWallet: String { return self._s[213]! }
+    public var Wallet_Send_ErrorInvalidAddress: String { return self._s[214]! }
+    public var Wallet_Configuration_BlockchainNameChangedText: String { return self._s[215]! }
     public func Wallet_Time_PreciseDate_m7(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[215]!, self._r[215]!, [_1, _2, _3])
+        return formatWithArgumentRanges(self._s[216]!, self._r[216]!, [_1, _2, _3])
     }
-    public var Wallet_Send_Title: String { return self._s[216]! }
-    public var Wallet_Info_RefreshErrorText: String { return self._s[217]! }
-    public var Wallet_SecureStorageReset_Title: String { return self._s[218]! }
-    public var Wallet_Receive_CommentHeader: String { return self._s[219]! }
-    public var Wallet_Info_ReceiveGrams: String { return self._s[220]! }
+    public var Wallet_Send_Title: String { return self._s[217]! }
+    public var Wallet_Info_RefreshErrorText: String { return self._s[218]! }
+    public var Wallet_SecureStorageReset_Title: String { return self._s[219]! }
+    public var Wallet_Receive_CommentHeader: String { return self._s[220]! }
+    public var Wallet_Info_ReceiveGrams: String { return self._s[221]! }
     public func Wallet_Updated_HoursAgo(_ value: Int32) -> String {
         let form = getPluralizationForm(self.lc, value)
         let stringValue = walletStringsFormattedNumber(value, self.groupingSeparator)
diff --git a/submodules/WalletUI/Sources/WalletTransactionInfoScreen.swift b/submodules/WalletUI/Sources/WalletTransactionInfoScreen.swift
index 6d420a7ded..5aea1460da 100644
--- a/submodules/WalletUI/Sources/WalletTransactionInfoScreen.swift
+++ b/submodules/WalletUI/Sources/WalletTransactionInfoScreen.swift
@@ -106,11 +106,25 @@ private func extractDescription(_ walletTransaction: WalletInfoTransaction) -> S
                 if !text.isEmpty {
                     text.append("\n\n")
                 }
-                text.append(message.textMessage)
+                switch message.contents {
+                case .raw:
+                    break
+                case .encryptedText:
+                    text.append("<encrypted>")
+                case let .plainText(plainText):
+                    text.append(plainText)
+                }
             }
         } else {
             if let inMessage = walletTransaction.inMessage {
-                text = inMessage.textMessage
+                switch inMessage.contents {
+                case .raw:
+                    text = ""
+                case .encryptedText:
+                    text = "<encrypted>"
+                case let .plainText(plainText):
+                    text = plainText
+                }
             }
         }
         return text
diff --git a/submodules/WalletUI/Sources/WalletWordCheckScreen.swift b/submodules/WalletUI/Sources/WalletWordCheckScreen.swift
index e66231cc9c..076dcd7f46 100644
--- a/submodules/WalletUI/Sources/WalletWordCheckScreen.swift
+++ b/submodules/WalletUI/Sources/WalletWordCheckScreen.swift
@@ -2137,7 +2137,7 @@ public final class WalletWordCheckScreen: ViewController {
                             return true
                         }
                         let _ = confirmWalletExported(storage: strongSelf.context.storage, publicKey: walletInfo.publicKey).start()
-                        controllers.append(WalletSplashScreen(context: strongSelf.context, mode: .success(walletInfo), walletCreatedPreloadState: strongSelf.walletCreatedPreloadState))
+                        controllers.append(WalletSplashScreen(context: strongSelf.context, mode: .success(walletInfo: walletInfo), walletCreatedPreloadState: strongSelf.walletCreatedPreloadState))
                         strongSelf.view.endEditing(true)
                         navigationController.setViewControllers(controllers, animated: true)
                     }
@@ -2205,7 +2205,7 @@ public final class WalletWordCheckScreen: ViewController {
                                 }
                                 return true
                             }
-                            controllers.append(WalletSplashScreen(context: strongSelf.context, mode: .success(walletInfo), walletCreatedPreloadState: strongSelf.walletCreatedPreloadState))
+                            controllers.append(WalletSplashScreen(context: strongSelf.context, mode: .success(walletInfo: walletInfo), walletCreatedPreloadState: strongSelf.walletCreatedPreloadState))
                             strongSelf.view.endEditing(true)
                             navigationController.setViewControllers(controllers, animated: true)
                         }
@@ -2894,7 +2894,7 @@ private final class WalletWordCheckScreenNode: ViewControllerTracingNode, UIScro
         
         let buttonFrame = CGRect(origin: CGPoint(x: floor((contentAreaSize.width - buttonWidth) / 2.0), y: max(contentHeight + buttonSpacing, availableAreaSize.height - bottomInset - buttonHeight)), size: CGSize(width: buttonWidth, height: buttonHeight))
         transition.updateFrame(node: self.buttonNode, frame: buttonFrame)
-        self.buttonNode.updateLayout(width: buttonFrame.width, transition: transition)
+        let _ = self.buttonNode.updateLayout(width: buttonFrame.width, transition: transition)
         
         transition.animateView {
             self.scrollNode.view.contentInset = UIEdgeInsets(top: 0.0, left: 0.0, bottom: layout.insets(options: [.input]).bottom + 30.0, right: 0.0)
diff --git a/submodules/WalletUrl/BUILD b/submodules/WalletUrl/BUILD
new file mode 100644
index 0000000000..e6de266abb
--- /dev/null
+++ b/submodules/WalletUrl/BUILD
@@ -0,0 +1,12 @@
+load("@build_bazel_rules_swift//swift:swift.bzl", "swift_library")
+
+swift_library(
+    name = "WalletUrl",
+    module_name = "WalletUrl",
+    srcs = glob([
+        "Sources/**/*.swift",
+    ]),
+    visibility = [
+        "//visibility:public",
+    ],
+)
diff --git a/submodules/WallpaperResources/BUILD b/submodules/WallpaperResources/BUILD
new file mode 100644
index 0000000000..e5aa740c94
--- /dev/null
+++ b/submodules/WallpaperResources/BUILD
@@ -0,0 +1,27 @@
+load("@build_bazel_rules_swift//swift:swift.bzl", "swift_library")
+
+swift_library(
+    name = "WallpaperResources",
+    module_name = "WallpaperResources",
+    srcs = glob([
+		"Sources/**/*.swift",
+    ]),
+    deps = [
+    	"//submodules/TelegramCore:TelegramCore",
+        "//submodules/SyncCore:SyncCore",
+    	"//submodules/Postbox:Postbox",
+        "//submodules/SSignalKit/SwiftSignalKit:SwiftSignalKit",
+        "//submodules/Display:Display",
+        "//submodules/LocalMediaResources:LocalMediaResources",
+        "//submodules/TinyThumbnail:TinyThumbnail",
+        "//submodules/ImageBlur:ImageBlur",
+        "//submodules/MediaResources:MediaResources",
+        "//submodules/PhotoResources:PhotoResources",
+        "//submodules/PersistentStringHash:PersistentStringHash",
+        "//submodules/AppBundle:AppBundle",
+        "//submodules/Svg:Svg",
+    ],
+    visibility = [
+        "//visibility:public",
+    ],
+)
diff --git a/submodules/WallpaperResources/Info.plist b/submodules/WallpaperResources/Info.plist
deleted file mode 100644
index e1fe4cfb7b..0000000000
--- a/submodules/WallpaperResources/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/WallpaperResources/Sources/WallpaperResources.h b/submodules/WallpaperResources/Sources/WallpaperResources.h
deleted file mode 100644
index 90370b1a6e..0000000000
--- a/submodules/WallpaperResources/Sources/WallpaperResources.h
+++ /dev/null
@@ -1,19 +0,0 @@
-//
-//  WallpaperResources.h
-//  WallpaperResources
-//
-//  Created by Peter on 8/17/19.
-//  Copyright © 2019 Telegram Messenger LLP. All rights reserved.
-//
-
-#import <UIKit/UIKit.h>
-
-//! Project version number for WallpaperResources.
-FOUNDATION_EXPORT double WallpaperResourcesVersionNumber;
-
-//! Project version string for WallpaperResources.
-FOUNDATION_EXPORT const unsigned char WallpaperResourcesVersionString[];
-
-// In this header, you should import all the public headers of your framework using statements like #import <WallpaperResources/PublicHeader.h>
-
-
diff --git a/submodules/WallpaperResources/Sources/WallpaperResources.swift b/submodules/WallpaperResources/Sources/WallpaperResources.swift
index 0c39b08129..b8b6d8efcd 100644
--- a/submodules/WallpaperResources/Sources/WallpaperResources.swift
+++ b/submodules/WallpaperResources/Sources/WallpaperResources.swift
@@ -7,6 +7,7 @@ import TelegramCore
 import SyncCore
 import MediaResources
 import ImageBlur
+import FastBlur
 import TinyThumbnail
 import PhotoResources
 import LocalMediaResources
diff --git a/submodules/WatchBridge/BUCK b/submodules/WatchBridge/BUCK
index db0cc53f52..43887ef484 100644
--- a/submodules/WatchBridge/BUCK
+++ b/submodules/WatchBridge/BUCK
@@ -4,14 +4,7 @@ static_library(
     name = "WatchBridge",
     srcs = glob([
         "Sources/**/*.swift",
-        "Sources/**/*.m",
     ]),
-    headers = glob([
-        "Sources/**/*.h",
-    ], exclude = ["Sources/WatchBridge.h"]),
-    exported_headers = glob([
-        "Sources/**/*.h",
-    ], exclude = ["Sources/WatchBridge.h"]),
     deps = [
         "//submodules/SSignalKit/SwiftSignalKit:SwiftSignalKit#shared",
         "//submodules/SSignalKit/SSignalKit:SSignalKit",
@@ -29,6 +22,7 @@ static_library(
         "//submodules/LegacyComponents:LegacyComponents",
         "//submodules/LegacyUI:LegacyUI",
         "//submodules/PhoneNumberFormat:PhoneNumberFormat",
+        "//submodules/WatchBridge/Impl:WatchBridgeImpl",
     ],
     frameworks = [
         "$SDKROOT/System/Library/Frameworks/Foundation.framework",
diff --git a/submodules/WatchBridge/BUILD b/submodules/WatchBridge/BUILD
new file mode 100644
index 0000000000..313426283a
--- /dev/null
+++ b/submodules/WatchBridge/BUILD
@@ -0,0 +1,31 @@
+load("@build_bazel_rules_swift//swift:swift.bzl", "swift_library")
+
+swift_library(
+    name = "WatchBridge",
+    module_name = "WatchBridge",
+    srcs = glob([
+        "Sources/**/*.swift",
+    ]),
+    deps = [
+        "//submodules/SSignalKit/SwiftSignalKit:SwiftSignalKit",
+        "//submodules/SSignalKit/SSignalKit:SSignalKit",
+        "//submodules/Postbox:Postbox",
+        "//submodules/TelegramCore:TelegramCore",
+        "//submodules/SyncCore:SyncCore",
+        "//submodules/WatchCommon/Host:WatchCommon",
+        "//submodules/WatchBridgeAudio:WatchBridgeAudio",
+        "//submodules/TelegramPresentationData:TelegramPresentationData",
+        "//submodules/TelegramUIPreferences:TelegramUIPreferences",
+        "//submodules/AccountContext:AccountContext",
+        "//submodules/AvatarNode:AvatarNode",
+        "//submodules/StickerResources:StickerResources",
+        "//submodules/PhotoResources:PhotoResources",
+        "//submodules/LegacyComponents:LegacyComponents",
+        "//submodules/LegacyUI:LegacyUI",
+        "//submodules/PhoneNumberFormat:PhoneNumberFormat",
+    	"//submodules/WatchBridge/Impl:WatchBridgeImpl",
+    ],
+    visibility = [
+        "//visibility:public",
+    ],
+)
diff --git a/submodules/WatchBridge/Impl/BUCK b/submodules/WatchBridge/Impl/BUCK
new file mode 100644
index 0000000000..0fffa19506
--- /dev/null
+++ b/submodules/WatchBridge/Impl/BUCK
@@ -0,0 +1,38 @@
+load("//Config:buck_rule_macros.bzl", "static_library")
+
+static_library(
+    name = "WatchBridgeImpl",
+    srcs = glob([
+        "Sources/**/*.swift",
+        "Sources/**/*.m",
+    ]),
+    headers = glob([
+        "Sources/**/*.h",
+    ]),
+    exported_headers = glob([
+        "PublicHeaders/**/*.h",
+    ]),
+    deps = [
+        "//submodules/SSignalKit/SwiftSignalKit:SwiftSignalKit#shared",
+        "//submodules/SSignalKit/SSignalKit:SSignalKit",
+        "//submodules/Postbox:Postbox#shared",
+        "//submodules/TelegramCore:TelegramCore#shared",
+        "//submodules/SyncCore:SyncCore#shared",
+        "//submodules/WatchCommon/Host:WatchCommon",
+        "//submodules/WatchBridgeAudio:WatchBridgeAudio",
+        "//submodules/TelegramPresentationData:TelegramPresentationData",
+        "//submodules/TelegramUIPreferences:TelegramUIPreferences",
+        "//submodules/AccountContext:AccountContext",
+        "//submodules/AvatarNode:AvatarNode",
+        "//submodules/StickerResources:StickerResources",
+        "//submodules/PhotoResources:PhotoResources",
+        "//submodules/LegacyComponents:LegacyComponents",
+        "//submodules/LegacyUI:LegacyUI",
+        "//submodules/PhoneNumberFormat:PhoneNumberFormat",
+    ],
+    frameworks = [
+        "$SDKROOT/System/Library/Frameworks/Foundation.framework",
+        "$SDKROOT/System/Library/Frameworks/UIKit.framework",
+        "$SDKROOT/System/Library/Frameworks/WatchConnectivity.framework",
+    ],
+)
diff --git a/submodules/WatchBridge/Impl/BUILD b/submodules/WatchBridge/Impl/BUILD
new file mode 100644
index 0000000000..8127f989a9
--- /dev/null
+++ b/submodules/WatchBridge/Impl/BUILD
@@ -0,0 +1,27 @@
+
+objc_library(
+    name = "WatchBridgeImpl",
+    enable_modules = True,
+    module_name = "WatchBridgeImpl",
+    srcs = glob([
+        "Sources/**/*.m",
+        "Sources/**/*.h",
+    ]),
+    hdrs = glob([
+        "PublicHeaders/**/*.h",
+    ]),
+    includes = [
+        "PublicHeaders",
+    ],
+    deps = [
+        "//submodules/LegacyComponents:LegacyComponents",
+        "//submodules/WatchCommon/Host:WatchCommon",
+    ],
+    sdk_frameworks = [
+        "Foundation",
+        "WatchConnectivity",
+    ],
+    visibility = [
+        "//visibility:public",
+    ],
+)
diff --git a/submodules/WatchBridge/Sources/TGBridgeServer.h b/submodules/WatchBridge/Impl/PublicHeaders/WatchBridgeImpl/TGBridgeServer.h
similarity index 100%
rename from submodules/WatchBridge/Sources/TGBridgeServer.h
rename to submodules/WatchBridge/Impl/PublicHeaders/WatchBridgeImpl/TGBridgeServer.h
diff --git a/submodules/WatchBridge/Impl/PublicHeaders/WatchBridgeImpl/WatchBridgeImpl.h b/submodules/WatchBridge/Impl/PublicHeaders/WatchBridgeImpl/WatchBridgeImpl.h
new file mode 100644
index 0000000000..8ed2f162d1
--- /dev/null
+++ b/submodules/WatchBridge/Impl/PublicHeaders/WatchBridgeImpl/WatchBridgeImpl.h
@@ -0,0 +1,3 @@
+#import <UIKit/UIKit.h>
+
+#import <WatchBridgeImpl/TGBridgeServer.h>
diff --git a/submodules/WatchBridge/Sources/TGBridgeServer.m b/submodules/WatchBridge/Impl/Sources/TGBridgeServer.m
similarity index 99%
rename from submodules/WatchBridge/Sources/TGBridgeServer.m
rename to submodules/WatchBridge/Impl/Sources/TGBridgeServer.m
index 372c92c8a1..6bbf49c4de 100644
--- a/submodules/WatchBridge/Sources/TGBridgeServer.m
+++ b/submodules/WatchBridge/Impl/Sources/TGBridgeServer.m
@@ -1,4 +1,4 @@
-#import "TGBridgeServer.h"
+#import <WatchBridgeImpl/TGBridgeServer.h>
 
 #import <LegacyComponents/LegacyComponents.h>
 #import <WatchConnectivity/WatchConnectivity.h>
diff --git a/submodules/WatchBridge/Info.plist b/submodules/WatchBridge/Info.plist
deleted file mode 100644
index e1fe4cfb7b..0000000000
--- a/submodules/WatchBridge/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/WatchBridge/Sources/WatchBridge.h b/submodules/WatchBridge/Sources/WatchBridge.h
deleted file mode 100644
index 52f8b28491..0000000000
--- a/submodules/WatchBridge/Sources/WatchBridge.h
+++ /dev/null
@@ -1,9 +0,0 @@
-#import <UIKit/UIKit.h>
-
-//! Project version number for WatchBridge.
-FOUNDATION_EXPORT double WatchBridgeVersionNumber;
-
-//! Project version string for WatchBridge.
-FOUNDATION_EXPORT const unsigned char WatchBridgeVersionString[];
-
-#import <WatchBridge/TGBridgeServer.h>
diff --git a/submodules/WatchBridge/Sources/WatchBridge.swift b/submodules/WatchBridge/Sources/WatchBridge.swift
index b5cfd95ff5..ed63d89821 100644
--- a/submodules/WatchBridge/Sources/WatchBridge.swift
+++ b/submodules/WatchBridge/Sources/WatchBridge.swift
@@ -319,7 +319,7 @@ func makeBridgeMedia(message: Message, strings: PresentationStrings, chatPeer: P
 }
 
 func makeBridgeChat(_ entry: ChatListEntry, strings: PresentationStrings) -> (TGBridgeChat, [Int64 : TGBridgeUser])? {
-    if case let .MessageEntry(index, message, readState, _, _, renderedPeer, _, _, hasFailed) = entry {
+    if case let .MessageEntry(index, message, readState, _, _, renderedPeer, _, _, hasFailed, _) = entry {
         guard index.messageIndex.id.peerId.namespace != Namespaces.Peer.SecretChat else {
             return nil
         }
diff --git a/submodules/WatchBridge/Sources/WatchCommunicationManager.swift b/submodules/WatchBridge/Sources/WatchCommunicationManager.swift
index 55ed7a862a..18b3f617ad 100644
--- a/submodules/WatchBridge/Sources/WatchCommunicationManager.swift
+++ b/submodules/WatchBridge/Sources/WatchCommunicationManager.swift
@@ -7,6 +7,7 @@ import WatchCommon
 import SSignalKit
 import TelegramUIPreferences
 import AccountContext
+import WatchBridgeImpl
 
 public final class WatchCommunicationManagerContext {
     public let context: AccountContext
diff --git a/submodules/WatchBridgeAudio/BUCK b/submodules/WatchBridgeAudio/BUCK
index 8f7915792a..c344d50cd6 100644
--- a/submodules/WatchBridgeAudio/BUCK
+++ b/submodules/WatchBridgeAudio/BUCK
@@ -4,19 +4,10 @@ static_library(
     name = "WatchBridgeAudio",
     srcs = glob([
         "Sources/**/*.swift",
-        "Sources/**/*.m",
-        "Sources/**/*.mm",
     ]),
-    headers = glob([
-        "Sources/**/*.h",
-    ], exclude = ["Sources/WatchBridgeAudio.h"]),
-    exported_headers = glob([
-        "Sources/**/*.h",
-    ], exclude = ["Sources/WatchBridgeAudio.h"]),
     deps = [
         "//submodules/SSignalKit/SwiftSignalKit:SwiftSignalKit#shared",
-        "//submodules/SSignalKit/SSignalKit:SSignalKit",
-        "//submodules/OpusBinding:OpusBinding",
+        "//submodules/WatchBridgeAudio/Impl:WatchBridgeAudioImpl",
     ],
     frameworks = [
         "$SDKROOT/System/Library/Frameworks/Foundation.framework",
diff --git a/submodules/WatchBridgeAudio/BUILD b/submodules/WatchBridgeAudio/BUILD
new file mode 100644
index 0000000000..27b6b76576
--- /dev/null
+++ b/submodules/WatchBridgeAudio/BUILD
@@ -0,0 +1,16 @@
+load("@build_bazel_rules_swift//swift:swift.bzl", "swift_library")
+
+swift_library(
+    name = "WatchBridgeAudio",
+    module_name = "WatchBridgeAudio",
+    srcs = glob([
+        "Sources/**/*.swift",
+    ]),
+    deps = [
+        "//submodules/SSignalKit/SwiftSignalKit:SwiftSignalKit",
+    	"//submodules/WatchBridgeAudio/Impl:WatchBridgeAudioImpl",
+    ],
+    visibility = [
+        "//visibility:public",
+    ],
+)
diff --git a/submodules/WatchBridgeAudio/Impl/BUCK b/submodules/WatchBridgeAudio/Impl/BUCK
new file mode 100644
index 0000000000..68519a7f3e
--- /dev/null
+++ b/submodules/WatchBridgeAudio/Impl/BUCK
@@ -0,0 +1,24 @@
+load("//Config:buck_rule_macros.bzl", "static_library")
+
+static_library(
+    name = "WatchBridgeAudioImpl",
+    srcs = glob([
+        "Sources/**/*.m",
+        "Sources/**/*.mm",
+    ]),
+    headers = glob([
+        "Sources/**/*.h",
+    ]),
+    exported_headers = glob([
+        "PublicHeaders/**/*.h",
+    ]),
+    deps = [
+        "//submodules/SSignalKit/SSignalKit:SSignalKit",
+        "//submodules/OpusBinding:OpusBinding",
+    ],
+    frameworks = [
+        "$SDKROOT/System/Library/Frameworks/Foundation.framework",
+        "$SDKROOT/System/Library/Frameworks/AVFoundation.framework",
+        "$SDKROOT/System/Library/Frameworks/AudioToolbox.framework",
+    ],
+)
diff --git a/submodules/WatchBridgeAudio/Impl/BUILD b/submodules/WatchBridgeAudio/Impl/BUILD
new file mode 100644
index 0000000000..8b1b386fb4
--- /dev/null
+++ b/submodules/WatchBridgeAudio/Impl/BUILD
@@ -0,0 +1,27 @@
+
+objc_library(
+    name = "WatchBridgeAudioImpl",
+    enable_modules = True,
+    module_name = "WatchBridgeAudioImpl",
+    srcs = glob([
+        "Sources/**/*.m",
+        "Sources/**/*.mm",
+        "Sources/**/*.h",
+    ]),
+    hdrs = glob([
+        "PublicHeaders/**/*.h",
+    ]),
+    includes = [
+        "PublicHeaders",
+    ],
+    deps = [
+        "//submodules/SSignalKit/SSignalKit:SSignalKit",
+        "//submodules/OpusBinding:OpusBinding",
+    ],
+    sdk_frameworks = [
+        "Foundation",
+    ],
+    visibility = [
+        "//visibility:public",
+    ],
+)
diff --git a/submodules/WatchBridgeAudio/Sources/TGBridgeAudioDecoder.h b/submodules/WatchBridgeAudio/Impl/PublicHeaders/WatchBridgeAudioImpl/TGBridgeAudioDecoder.h
similarity index 100%
rename from submodules/WatchBridgeAudio/Sources/TGBridgeAudioDecoder.h
rename to submodules/WatchBridgeAudio/Impl/PublicHeaders/WatchBridgeAudioImpl/TGBridgeAudioDecoder.h
diff --git a/submodules/WatchBridgeAudio/Sources/TGBridgeAudioEncoder.h b/submodules/WatchBridgeAudio/Impl/PublicHeaders/WatchBridgeAudioImpl/TGBridgeAudioEncoder.h
similarity index 100%
rename from submodules/WatchBridgeAudio/Sources/TGBridgeAudioEncoder.h
rename to submodules/WatchBridgeAudio/Impl/PublicHeaders/WatchBridgeAudioImpl/TGBridgeAudioEncoder.h
diff --git a/submodules/WatchBridgeAudio/Impl/PublicHeaders/WatchBridgeAudioImpl/WatchBridgeAudioImpl.h b/submodules/WatchBridgeAudio/Impl/PublicHeaders/WatchBridgeAudioImpl/WatchBridgeAudioImpl.h
new file mode 100644
index 0000000000..03950d978a
--- /dev/null
+++ b/submodules/WatchBridgeAudio/Impl/PublicHeaders/WatchBridgeAudioImpl/WatchBridgeAudioImpl.h
@@ -0,0 +1,6 @@
+#import <UIKit/UIKit.h>
+
+#import <WatchBridgeAudioImpl/TGBridgeAudioEncoder.h>
+#import <WatchBridgeAudioImpl/TGBridgeAudioDecoder.h>
+
+
diff --git a/submodules/WatchBridgeAudio/Sources/TGBridgeAudioDecoder.mm b/submodules/WatchBridgeAudio/Impl/Sources/TGBridgeAudioDecoder.mm
similarity index 99%
rename from submodules/WatchBridgeAudio/Sources/TGBridgeAudioDecoder.mm
rename to submodules/WatchBridgeAudio/Impl/Sources/TGBridgeAudioDecoder.mm
index eb9da777bc..c1d30b80f1 100644
--- a/submodules/WatchBridgeAudio/Sources/TGBridgeAudioDecoder.mm
+++ b/submodules/WatchBridgeAudio/Impl/Sources/TGBridgeAudioDecoder.mm
@@ -1,4 +1,4 @@
-#import "TGBridgeAudioDecoder.h"
+#import <WatchBridgeAudioImpl/TGBridgeAudioDecoder.h>
 
 #import <AudioToolbox/AudioToolbox.h>
 #import <AVFoundation/AVFoundation.h>
diff --git a/submodules/WatchBridgeAudio/Sources/TGBridgeAudioEncoder.m b/submodules/WatchBridgeAudio/Impl/Sources/TGBridgeAudioEncoder.m
similarity index 99%
rename from submodules/WatchBridgeAudio/Sources/TGBridgeAudioEncoder.m
rename to submodules/WatchBridgeAudio/Impl/Sources/TGBridgeAudioEncoder.m
index 709e42a1e1..2bf80914d3 100644
--- a/submodules/WatchBridgeAudio/Sources/TGBridgeAudioEncoder.m
+++ b/submodules/WatchBridgeAudio/Impl/Sources/TGBridgeAudioEncoder.m
@@ -1,4 +1,4 @@
-#import "TGBridgeAudioEncoder.h"
+#import <WatchBridgeAudioImpl/TGBridgeAudioEncoder.h>
 #import <AVFoundation/AVFoundation.h>
 
 #import <OpusBinding/OpusBinding.h>
diff --git a/submodules/WatchBridgeAudio/Info.plist b/submodules/WatchBridgeAudio/Info.plist
deleted file mode 100644
index e1fe4cfb7b..0000000000
--- a/submodules/WatchBridgeAudio/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/WatchBridgeAudio/Sources/LegacyBridgeAudio.swift b/submodules/WatchBridgeAudio/Sources/LegacyBridgeAudio.swift
index eb51caf60c..ab80d4f2a0 100644
--- a/submodules/WatchBridgeAudio/Sources/LegacyBridgeAudio.swift
+++ b/submodules/WatchBridgeAudio/Sources/LegacyBridgeAudio.swift
@@ -1,5 +1,6 @@
 import Foundation
 import SwiftSignalKit
+import WatchBridgeAudioImpl
 
 public func legacyDecodeOpusAudio(path: String, outputPath: String) -> Signal<String, NoError> {
     return Signal { subscriber in
diff --git a/submodules/WatchBridgeAudio/Sources/WatchBridgeAudio.h b/submodules/WatchBridgeAudio/Sources/WatchBridgeAudio.h
deleted file mode 100644
index 15091d1154..0000000000
--- a/submodules/WatchBridgeAudio/Sources/WatchBridgeAudio.h
+++ /dev/null
@@ -1,12 +0,0 @@
-#import <UIKit/UIKit.h>
-
-//! Project version number for WatchBridgeAudio.
-FOUNDATION_EXPORT double WatchBridgeAudioVersionNumber;
-
-//! Project version string for WatchBridgeAudio.
-FOUNDATION_EXPORT const unsigned char WatchBridgeAudioVersionString[];
-
-#import <WatchBridgeAudio/TGBridgeAudioEncoder.h>
-#import <WatchBridgeAudio/TGBridgeAudioDecoder.h>
-
-
diff --git a/submodules/WatchCommon/BUCK b/submodules/WatchCommon/BUCK
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/submodules/WatchCommon/BUILD b/submodules/WatchCommon/BUILD
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/submodules/WatchCommon/Host/BUCK b/submodules/WatchCommon/Host/BUCK
index b4a597439b..56fb1a1683 100644
--- a/submodules/WatchCommon/Host/BUCK
+++ b/submodules/WatchCommon/Host/BUCK
@@ -7,10 +7,10 @@ static_library(
     ]),
     headers = glob([
         "Sources/*.h",
-    ], exclude = ["Sources/WatchCommon.h", "Sources/WatchCommon.h"]),
+    ]),
     exported_headers = glob([
-        "Sources/*.h",
-    ], exclude = ["Sources/WatchCommon.h", "Sources/WatchCommon.h"]),
+        "PublicHeaders/**/*.h",
+    ]),
     frameworks = [
         "$SDKROOT/System/Library/Frameworks/Foundation.framework",
     ],
diff --git a/submodules/WatchCommon/Host/BUILD b/submodules/WatchCommon/Host/BUILD
new file mode 100644
index 0000000000..8d9c05aabf
--- /dev/null
+++ b/submodules/WatchCommon/Host/BUILD
@@ -0,0 +1,25 @@
+
+objc_library(
+    name = "WatchCommon",
+    enable_modules = True,
+    module_name = "WatchCommon",
+    srcs = glob([
+        "Sources/**/*.m",
+        "Sources/**/*.h",
+    ]),
+    hdrs = glob([
+        "PublicHeaders/**/*.h",
+    ]),
+    copts = [
+        "-I{}/PublicHeaders/WatchCommon".format(package_name()),
+    ],
+    includes = [
+        "PublicHeaders",
+    ],
+    sdk_frameworks = [
+        "Foundation",
+    ],
+    visibility = [
+        "//visibility:public",
+    ],
+)
diff --git a/submodules/WatchCommon/Host/Sources/TGBridgeActionMediaAttachment.h b/submodules/WatchCommon/Host/PublicHeaders/WatchCommon/TGBridgeActionMediaAttachment.h
similarity index 100%
rename from submodules/WatchCommon/Host/Sources/TGBridgeActionMediaAttachment.h
rename to submodules/WatchCommon/Host/PublicHeaders/WatchCommon/TGBridgeActionMediaAttachment.h
diff --git a/submodules/WatchCommon/Host/Sources/TGBridgeAudioMediaAttachment.h b/submodules/WatchCommon/Host/PublicHeaders/WatchCommon/TGBridgeAudioMediaAttachment.h
similarity index 100%
rename from submodules/WatchCommon/Host/Sources/TGBridgeAudioMediaAttachment.h
rename to submodules/WatchCommon/Host/PublicHeaders/WatchCommon/TGBridgeAudioMediaAttachment.h
diff --git a/submodules/WatchCommon/Host/Sources/TGBridgeBotCommandInfo.h b/submodules/WatchCommon/Host/PublicHeaders/WatchCommon/TGBridgeBotCommandInfo.h
similarity index 100%
rename from submodules/WatchCommon/Host/Sources/TGBridgeBotCommandInfo.h
rename to submodules/WatchCommon/Host/PublicHeaders/WatchCommon/TGBridgeBotCommandInfo.h
diff --git a/submodules/WatchCommon/Host/Sources/TGBridgeBotInfo.h b/submodules/WatchCommon/Host/PublicHeaders/WatchCommon/TGBridgeBotInfo.h
similarity index 100%
rename from submodules/WatchCommon/Host/Sources/TGBridgeBotInfo.h
rename to submodules/WatchCommon/Host/PublicHeaders/WatchCommon/TGBridgeBotInfo.h
diff --git a/submodules/WatchCommon/Host/Sources/TGBridgeChat.h b/submodules/WatchCommon/Host/PublicHeaders/WatchCommon/TGBridgeChat.h
similarity index 100%
rename from submodules/WatchCommon/Host/Sources/TGBridgeChat.h
rename to submodules/WatchCommon/Host/PublicHeaders/WatchCommon/TGBridgeChat.h
diff --git a/submodules/WatchCommon/Host/Sources/TGBridgeChatMessages.h b/submodules/WatchCommon/Host/PublicHeaders/WatchCommon/TGBridgeChatMessages.h
similarity index 100%
rename from submodules/WatchCommon/Host/Sources/TGBridgeChatMessages.h
rename to submodules/WatchCommon/Host/PublicHeaders/WatchCommon/TGBridgeChatMessages.h
diff --git a/submodules/WatchCommon/Host/Sources/TGBridgeCommon.h b/submodules/WatchCommon/Host/PublicHeaders/WatchCommon/TGBridgeCommon.h
similarity index 100%
rename from submodules/WatchCommon/Host/Sources/TGBridgeCommon.h
rename to submodules/WatchCommon/Host/PublicHeaders/WatchCommon/TGBridgeCommon.h
diff --git a/submodules/WatchCommon/Host/Sources/TGBridgeContactMediaAttachment.h b/submodules/WatchCommon/Host/PublicHeaders/WatchCommon/TGBridgeContactMediaAttachment.h
similarity index 100%
rename from submodules/WatchCommon/Host/Sources/TGBridgeContactMediaAttachment.h
rename to submodules/WatchCommon/Host/PublicHeaders/WatchCommon/TGBridgeContactMediaAttachment.h
diff --git a/submodules/WatchCommon/Host/Sources/TGBridgeContext.h b/submodules/WatchCommon/Host/PublicHeaders/WatchCommon/TGBridgeContext.h
similarity index 100%
rename from submodules/WatchCommon/Host/Sources/TGBridgeContext.h
rename to submodules/WatchCommon/Host/PublicHeaders/WatchCommon/TGBridgeContext.h
diff --git a/submodules/WatchCommon/Host/Sources/TGBridgeDocumentMediaAttachment.h b/submodules/WatchCommon/Host/PublicHeaders/WatchCommon/TGBridgeDocumentMediaAttachment.h
similarity index 100%
rename from submodules/WatchCommon/Host/Sources/TGBridgeDocumentMediaAttachment.h
rename to submodules/WatchCommon/Host/PublicHeaders/WatchCommon/TGBridgeDocumentMediaAttachment.h
diff --git a/submodules/WatchCommon/Host/Sources/TGBridgeForwardedMessageMediaAttachment.h b/submodules/WatchCommon/Host/PublicHeaders/WatchCommon/TGBridgeForwardedMessageMediaAttachment.h
similarity index 100%
rename from submodules/WatchCommon/Host/Sources/TGBridgeForwardedMessageMediaAttachment.h
rename to submodules/WatchCommon/Host/PublicHeaders/WatchCommon/TGBridgeForwardedMessageMediaAttachment.h
diff --git a/submodules/WatchCommon/Host/Sources/TGBridgeImageMediaAttachment.h b/submodules/WatchCommon/Host/PublicHeaders/WatchCommon/TGBridgeImageMediaAttachment.h
similarity index 100%
rename from submodules/WatchCommon/Host/Sources/TGBridgeImageMediaAttachment.h
rename to submodules/WatchCommon/Host/PublicHeaders/WatchCommon/TGBridgeImageMediaAttachment.h
diff --git a/submodules/WatchCommon/Host/Sources/TGBridgeLocationMediaAttachment.h b/submodules/WatchCommon/Host/PublicHeaders/WatchCommon/TGBridgeLocationMediaAttachment.h
similarity index 100%
rename from submodules/WatchCommon/Host/Sources/TGBridgeLocationMediaAttachment.h
rename to submodules/WatchCommon/Host/PublicHeaders/WatchCommon/TGBridgeLocationMediaAttachment.h
diff --git a/submodules/WatchCommon/Host/Sources/TGBridgeLocationVenue.h b/submodules/WatchCommon/Host/PublicHeaders/WatchCommon/TGBridgeLocationVenue.h
similarity index 100%
rename from submodules/WatchCommon/Host/Sources/TGBridgeLocationVenue.h
rename to submodules/WatchCommon/Host/PublicHeaders/WatchCommon/TGBridgeLocationVenue.h
diff --git a/submodules/WatchCommon/Host/Sources/TGBridgeMediaAttachment.h b/submodules/WatchCommon/Host/PublicHeaders/WatchCommon/TGBridgeMediaAttachment.h
similarity index 100%
rename from submodules/WatchCommon/Host/Sources/TGBridgeMediaAttachment.h
rename to submodules/WatchCommon/Host/PublicHeaders/WatchCommon/TGBridgeMediaAttachment.h
diff --git a/submodules/WatchCommon/Host/Sources/TGBridgeMessage.h b/submodules/WatchCommon/Host/PublicHeaders/WatchCommon/TGBridgeMessage.h
similarity index 100%
rename from submodules/WatchCommon/Host/Sources/TGBridgeMessage.h
rename to submodules/WatchCommon/Host/PublicHeaders/WatchCommon/TGBridgeMessage.h
diff --git a/submodules/WatchCommon/Host/Sources/TGBridgeMessageEntities.h b/submodules/WatchCommon/Host/PublicHeaders/WatchCommon/TGBridgeMessageEntities.h
similarity index 100%
rename from submodules/WatchCommon/Host/Sources/TGBridgeMessageEntities.h
rename to submodules/WatchCommon/Host/PublicHeaders/WatchCommon/TGBridgeMessageEntities.h
diff --git a/submodules/WatchCommon/Host/Sources/TGBridgeMessageEntitiesAttachment.h b/submodules/WatchCommon/Host/PublicHeaders/WatchCommon/TGBridgeMessageEntitiesAttachment.h
similarity index 100%
rename from submodules/WatchCommon/Host/Sources/TGBridgeMessageEntitiesAttachment.h
rename to submodules/WatchCommon/Host/PublicHeaders/WatchCommon/TGBridgeMessageEntitiesAttachment.h
diff --git a/submodules/WatchCommon/Host/Sources/TGBridgePeerIdAdapter.h b/submodules/WatchCommon/Host/PublicHeaders/WatchCommon/TGBridgePeerIdAdapter.h
similarity index 100%
rename from submodules/WatchCommon/Host/Sources/TGBridgePeerIdAdapter.h
rename to submodules/WatchCommon/Host/PublicHeaders/WatchCommon/TGBridgePeerIdAdapter.h
diff --git a/submodules/WatchCommon/Host/Sources/TGBridgePeerNotificationSettings.h b/submodules/WatchCommon/Host/PublicHeaders/WatchCommon/TGBridgePeerNotificationSettings.h
similarity index 100%
rename from submodules/WatchCommon/Host/Sources/TGBridgePeerNotificationSettings.h
rename to submodules/WatchCommon/Host/PublicHeaders/WatchCommon/TGBridgePeerNotificationSettings.h
diff --git a/submodules/WatchCommon/Host/Sources/TGBridgeReplyMarkupMediaAttachment.h b/submodules/WatchCommon/Host/PublicHeaders/WatchCommon/TGBridgeReplyMarkupMediaAttachment.h
similarity index 100%
rename from submodules/WatchCommon/Host/Sources/TGBridgeReplyMarkupMediaAttachment.h
rename to submodules/WatchCommon/Host/PublicHeaders/WatchCommon/TGBridgeReplyMarkupMediaAttachment.h
diff --git a/submodules/WatchCommon/Host/Sources/TGBridgeReplyMessageMediaAttachment.h b/submodules/WatchCommon/Host/PublicHeaders/WatchCommon/TGBridgeReplyMessageMediaAttachment.h
similarity index 100%
rename from submodules/WatchCommon/Host/Sources/TGBridgeReplyMessageMediaAttachment.h
rename to submodules/WatchCommon/Host/PublicHeaders/WatchCommon/TGBridgeReplyMessageMediaAttachment.h
diff --git a/submodules/WatchCommon/Host/Sources/TGBridgeSubscriptions.h b/submodules/WatchCommon/Host/PublicHeaders/WatchCommon/TGBridgeSubscriptions.h
similarity index 100%
rename from submodules/WatchCommon/Host/Sources/TGBridgeSubscriptions.h
rename to submodules/WatchCommon/Host/PublicHeaders/WatchCommon/TGBridgeSubscriptions.h
diff --git a/submodules/WatchCommon/Host/Sources/TGBridgeUnsupportedMediaAttachment.h b/submodules/WatchCommon/Host/PublicHeaders/WatchCommon/TGBridgeUnsupportedMediaAttachment.h
similarity index 100%
rename from submodules/WatchCommon/Host/Sources/TGBridgeUnsupportedMediaAttachment.h
rename to submodules/WatchCommon/Host/PublicHeaders/WatchCommon/TGBridgeUnsupportedMediaAttachment.h
diff --git a/submodules/WatchCommon/Host/Sources/TGBridgeUser.h b/submodules/WatchCommon/Host/PublicHeaders/WatchCommon/TGBridgeUser.h
similarity index 100%
rename from submodules/WatchCommon/Host/Sources/TGBridgeUser.h
rename to submodules/WatchCommon/Host/PublicHeaders/WatchCommon/TGBridgeUser.h
diff --git a/submodules/WatchCommon/Host/Sources/TGBridgeVideoMediaAttachment.h b/submodules/WatchCommon/Host/PublicHeaders/WatchCommon/TGBridgeVideoMediaAttachment.h
similarity index 100%
rename from submodules/WatchCommon/Host/Sources/TGBridgeVideoMediaAttachment.h
rename to submodules/WatchCommon/Host/PublicHeaders/WatchCommon/TGBridgeVideoMediaAttachment.h
diff --git a/submodules/WatchCommon/Host/Sources/TGBridgeWebPageMediaAttachment.h b/submodules/WatchCommon/Host/PublicHeaders/WatchCommon/TGBridgeWebPageMediaAttachment.h
similarity index 100%
rename from submodules/WatchCommon/Host/Sources/TGBridgeWebPageMediaAttachment.h
rename to submodules/WatchCommon/Host/PublicHeaders/WatchCommon/TGBridgeWebPageMediaAttachment.h
diff --git a/submodules/WatchCommon/Host/Sources/WatchCommon.h b/submodules/WatchCommon/Host/PublicHeaders/WatchCommon/WatchCommon.h
similarity index 86%
rename from submodules/WatchCommon/Host/Sources/WatchCommon.h
rename to submodules/WatchCommon/Host/PublicHeaders/WatchCommon/WatchCommon.h
index 740b833b89..27b37d2d7b 100644
--- a/submodules/WatchCommon/Host/Sources/WatchCommon.h
+++ b/submodules/WatchCommon/Host/PublicHeaders/WatchCommon/WatchCommon.h
@@ -1,11 +1,5 @@
 #import <UIKit/UIKit.h>
 
-//! Project version number for WatchCommon.
-FOUNDATION_EXPORT double WatchCommonVersionNumber;
-
-//! Project version string for WatchCommon.
-FOUNDATION_EXPORT const unsigned char WatchCommonVersionString[];
-
 #import <WatchCommon/TGBridgeActionMediaAttachment.h>
 #import <WatchCommon/TGBridgeAudioMediaAttachment.h>
 #import <WatchCommon/TGBridgeBotCommandInfo.h>
diff --git a/submodules/WatchCommon/Info.plist b/submodules/WatchCommon/Info.plist
deleted file mode 100644
index e1fe4cfb7b..0000000000
--- a/submodules/WatchCommon/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/WatchCommon/WatchCommonWatch/Info.plist b/submodules/WatchCommon/WatchCommonWatch/Info.plist
deleted file mode 100644
index e1fe4cfb7b..0000000000
--- a/submodules/WatchCommon/WatchCommonWatch/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/WatchCommon/WatchCommonWatch/WatchCommonWatch.h b/submodules/WatchCommon/WatchCommonWatch/WatchCommonWatch.h
deleted file mode 100644
index 2aa9040e2b..0000000000
--- a/submodules/WatchCommon/WatchCommonWatch/WatchCommonWatch.h
+++ /dev/null
@@ -1,19 +0,0 @@
-//
-//  WatchCommonWatch.h
-//  WatchCommonWatch
-//
-//  Created by Peter on 6/15/19.
-//  Copyright © 2019 Telegram LLP. All rights reserved.
-//
-
-#import <WatchKit/WatchKit.h>
-
-//! Project version number for WatchCommonWatch.
-FOUNDATION_EXPORT double WatchCommonWatchVersionNumber;
-
-//! Project version string for WatchCommonWatch.
-FOUNDATION_EXPORT const unsigned char WatchCommonWatchVersionString[];
-
-// In this header, you should import all the public headers of your framework using statements like #import <WatchCommonWatch/PublicHeader.h>
-
-
diff --git a/submodules/WebPBinding/BUCK b/submodules/WebPBinding/BUCK
new file mode 100644
index 0000000000..7e23c440ec
--- /dev/null
+++ b/submodules/WebPBinding/BUCK
@@ -0,0 +1,21 @@
+load("//Config:buck_rule_macros.bzl", "static_library", "framework")
+
+static_library(
+    name = "WebPBinding",
+    srcs = glob([
+        "Sources/**/*.m",
+    ]),
+    headers = glob([
+        "Sources/**/*.h",
+    ]),
+	exported_headers = glob([
+        "PublicHeaders/**/*.h",
+    ]),
+    deps = [
+        "//submodules/webp:webp",
+    ],
+    frameworks = [
+        "$SDKROOT/System/Library/Frameworks/Foundation.framework",
+        "$SDKROOT/System/Library/Frameworks/UIKit.framework",
+    ],
+)
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/WebSearchUI/BUILD b/submodules/WebSearchUI/BUILD
new file mode 100644
index 0000000000..ec39c0d60c
--- /dev/null
+++ b/submodules/WebSearchUI/BUILD
@@ -0,0 +1,36 @@
+load("@build_bazel_rules_swift//swift:swift.bzl", "swift_library")
+
+swift_library(
+    name = "WebSearchUI",
+    module_name = "WebSearchUI",
+    srcs = glob([
+		"Sources/**/*.swift",
+    ]),
+    deps = [
+    	"//submodules/SSignalKit/SwiftSignalKit:SwiftSignalKit",
+        "//submodules/AsyncDisplayKit:AsyncDisplayKit",
+        "//submodules/Display:Display",
+        "//submodules/Postbox:Postbox",
+        "//submodules/TelegramCore:TelegramCore",
+        "//submodules/SyncCore:SyncCore",
+        "//submodules/TelegramPresentationData:TelegramPresentationData",
+        "//submodules/AccountContext:AccountContext",
+        "//submodules/LegacyComponents:LegacyComponents",
+        "//submodules/TelegramUIPreferences:TelegramUIPreferences",
+        "//submodules/MergeLists:MergeLists",
+        "//submodules/GalleryUI:GalleryUI",
+        "//submodules/ChatListSearchItemHeader:ChatListSearchItemHeader",
+        "//submodules/TelegramUniversalVideoContent:TelegramUniversalVideoContent",
+        "//submodules/CheckNode:CheckNode",
+        "//submodules/PhotoResources:PhotoResources",
+        "//submodules/SearchBarNode:SearchBarNode",
+        "//submodules/ItemListUI:ItemListUI",
+        "//submodules/LegacyMediaPickerUI:LegacyMediaPickerUI",
+        "//submodules/SegmentedControlNode:SegmentedControlNode",
+        "//submodules/AppBundle:AppBundle",
+        "//submodules/PresentationDataUtils:PresentationDataUtils",
+    ],
+    visibility = [
+        "//visibility:public",
+    ],
+)
diff --git a/submodules/WebSearchUI/Info.plist b/submodules/WebSearchUI/Info.plist
deleted file mode 100644
index e1fe4cfb7b..0000000000
--- a/submodules/WebSearchUI/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/WebSearchUI/Sources/WebSearchUI.h b/submodules/WebSearchUI/Sources/WebSearchUI.h
deleted file mode 100644
index 4c61e7ca82..0000000000
--- a/submodules/WebSearchUI/Sources/WebSearchUI.h
+++ /dev/null
@@ -1,19 +0,0 @@
-//
-//  WebSearchUI.h
-//  WebSearchUI
-//
-//  Created by Peter on 8/15/19.
-//  Copyright © 2019 Telegram Messenger LLP. All rights reserved.
-//
-
-#import <UIKit/UIKit.h>
-
-//! Project version number for WebSearchUI.
-FOUNDATION_EXPORT double WebSearchUIVersionNumber;
-
-//! Project version string for WebSearchUI.
-FOUNDATION_EXPORT const unsigned char WebSearchUIVersionString[];
-
-// In this header, you should import all the public headers of your framework using statements like #import <WebSearchUI/PublicHeader.h>
-
-
diff --git a/submodules/WebUI/BUILD b/submodules/WebUI/BUILD
new file mode 100644
index 0000000000..a07198be9e
--- /dev/null
+++ b/submodules/WebUI/BUILD
@@ -0,0 +1,16 @@
+load("@build_bazel_rules_swift//swift:swift.bzl", "swift_library")
+
+swift_library(
+    name = "WebUI",
+    module_name = "WebUI",
+    srcs = glob([
+		"Sources/**/*.swift",
+    ]),
+    deps = [
+    	"//submodules/AsyncDisplayKit:AsyncDisplayKit",
+        "//submodules/Display:Display",
+    ],
+    visibility = [
+        "//visibility:public",
+    ],
+)
diff --git a/submodules/WebUI/Info.plist b/submodules/WebUI/Info.plist
deleted file mode 100644
index e1fe4cfb7b..0000000000
--- a/submodules/WebUI/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/WebUI/Sources/WebUI.h b/submodules/WebUI/Sources/WebUI.h
deleted file mode 100644
index d599a3132a..0000000000
--- a/submodules/WebUI/Sources/WebUI.h
+++ /dev/null
@@ -1,19 +0,0 @@
-//
-//  WebUI.h
-//  WebUI
-//
-//  Created by Peter on 8/11/19.
-//  Copyright © 2019 Telegram Messenger LLP. All rights reserved.
-//
-
-#import <UIKit/UIKit.h>
-
-//! Project version number for WebUI.
-FOUNDATION_EXPORT double WebUIVersionNumber;
-
-//! Project version string for WebUI.
-FOUNDATION_EXPORT const unsigned char WebUIVersionString[];
-
-// In this header, you should import all the public headers of your framework using statements like #import <WebUI/PublicHeader.h>
-
-
diff --git a/submodules/WebsiteType/BUILD b/submodules/WebsiteType/BUILD
new file mode 100644
index 0000000000..ba2a658eb1
--- /dev/null
+++ b/submodules/WebsiteType/BUILD
@@ -0,0 +1,14 @@
+load("@build_bazel_rules_swift//swift:swift.bzl", "swift_library")
+
+swift_library(
+    name = "WebsiteType",
+    module_name = "WebsiteType",
+    srcs = glob([
+        "Sources/**/*.swift",
+    ]),
+    deps = [
+    ],
+    visibility = [
+        "//visibility:public",
+    ],
+)
diff --git a/submodules/WebsiteType/Info.plist b/submodules/WebsiteType/Info.plist
deleted file mode 100644
index e1fe4cfb7b..0000000000
--- a/submodules/WebsiteType/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/WidgetItems/BUILD b/submodules/WidgetItems/BUILD
new file mode 100644
index 0000000000..0da6915f24
--- /dev/null
+++ b/submodules/WidgetItems/BUILD
@@ -0,0 +1,12 @@
+load("@build_bazel_rules_swift//swift:swift.bzl", "swift_library")
+
+swift_library(
+    name = "WidgetItems",
+    module_name = "WidgetItems",
+    srcs = glob([
+		"Sources/**/*.swift",
+    ]),
+    visibility = [
+        "//visibility:public",
+    ],
+)
diff --git a/submodules/YuvConversion/BUCK b/submodules/YuvConversion/BUCK
index 735ac133f2..2d4675cff4 100644
--- a/submodules/YuvConversion/BUCK
+++ b/submodules/YuvConversion/BUCK
@@ -5,12 +5,9 @@ static_library(
     srcs = glob([
         "Sources/*.m",
     ]),
-    headers = glob([
-        "Sources/*.h",
-    ], exclude = ["Sources/YuvConversion.h"]),
     exported_headers = glob([
-        "Sources/*.h",
-    ], exclude = ["Sources/YuvConversion.h"]),
+        "PublicHeaders/**/*.h",
+    ]),
     frameworks = [
         "$SDKROOT/System/Library/Frameworks/Foundation.framework",
         "$SDKROOT/System/Library/Frameworks/Accelerate.framework",
diff --git a/submodules/YuvConversion/BUILD b/submodules/YuvConversion/BUILD
new file mode 100644
index 0000000000..726607e056
--- /dev/null
+++ b/submodules/YuvConversion/BUILD
@@ -0,0 +1,21 @@
+ 
+objc_library(
+    name = "YuvConversion",
+    enable_modules = True,
+    module_name = "YuvConversion",
+    srcs = glob([
+        "Sources/*.m",
+    ]),
+    hdrs = glob([
+        "PublicHeaders/**/*.h",
+    ]),
+    includes = [
+      "PublicHeaders",
+    ],
+    sdk_frameworks = [
+      "Foundation",
+    ],
+    visibility = [
+        "//visibility:public",
+    ],
+)
diff --git a/submodules/YuvConversion/Info.plist b/submodules/YuvConversion/Info.plist
deleted file mode 100644
index e1fe4cfb7b..0000000000
--- a/submodules/YuvConversion/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/YuvConversion/Sources/YUV.h b/submodules/YuvConversion/PublicHeaders/YuvConversion/YUV.h
similarity index 100%
rename from submodules/YuvConversion/Sources/YUV.h
rename to submodules/YuvConversion/PublicHeaders/YuvConversion/YUV.h
diff --git a/submodules/YuvConversion/Sources/YUV.m b/submodules/YuvConversion/Sources/YUV.m
index 08a52aba58..d5c2f0ad16 100644
--- a/submodules/YuvConversion/Sources/YUV.m
+++ b/submodules/YuvConversion/Sources/YUV.m
@@ -1,4 +1,4 @@
-#import "YUV.h"
+#import <YuvConversion/YUV.h>
 #import <Accelerate/Accelerate.h>
 
 void encodeRGBAToYUVA(uint8_t *yuva, uint8_t const *argb, int width, int height, int bytesPerRow) {
diff --git a/submodules/YuvConversion/Sources/YuvConversion.h b/submodules/YuvConversion/Sources/YuvConversion.h
deleted file mode 100644
index 4da2e49979..0000000000
--- a/submodules/YuvConversion/Sources/YuvConversion.h
+++ /dev/null
@@ -1,11 +0,0 @@
-#import <UIKit/UIKit.h>
-
-//! Project version number for YuvConversion.
-FOUNDATION_EXPORT double YuvConversionVersionNumber;
-
-//! Project version string for YuvConversion.
-FOUNDATION_EXPORT const unsigned char YuvConversionVersionString[];
-
-#import <YuvConversion/YUV.h>
-
-
diff --git a/submodules/ffmpeg/BUCK b/submodules/ffmpeg/BUCK
index 19a4d37012..67e9c161eb 100644
--- a/submodules/ffmpeg/BUCK
+++ b/submodules/ffmpeg/BUCK
@@ -1,4 +1,4 @@
-load("//Config:buck_rule_macros.bzl", "static_library", "gen_header_targets")
+load("//Config:buck_rule_macros.bzl", "static_library", "gen_header_targets", "merge_maps")
 
 ffmpeg_header_paths = [
     "libavutil/hwcontext.h",
@@ -111,11 +111,11 @@ library_archs = "arm64 armv7 x86_64"
 genrule(
     name = "libffmpeg_build",
     srcs = glob([
-        "FFMpeg/**/*",
-    ], exclude = ["FFMpeg/**/.*"]),
+        "Sources/FFMpeg/**/*",
+    ], exclude = ["Sources/FFMpeg/**/.*"]),
     bash =
         "PATH=\"$PATH:$(location //third-party/yasm:yasm)/yasm-1.3.0/build\" " +
-        "$SRCDIR/FFMpeg/build-ffmpeg.sh release \"" + library_archs + "\" $OUT $SRCDIR/FFMpeg",
+        "$SRCDIR/Sources/FFMpeg/build-ffmpeg-buck.sh release \"" + library_archs + "\" $OUT $SRCDIR/Sources/FFMpeg",
     out = "libffmpeg",
     visibility = [
         "//submodules/ffmpeg:FFMpeg",
@@ -159,13 +159,12 @@ apple_library(
 )
 
 static_library(
-    name = "FFMpeg",
-    srcs = glob([
-        "FFMpeg/*.m",
-    ]),
-    headers = ffmpeg_header_targets,
-    exported_headers = glob([
-        "FFMpeg/*.h",
+    name = "ffmpeg",
+    exported_headers = merge_maps([
+        {
+            "ffmpeg/ffmpeg.h": "PublicHeaders/ffmpeg/ffmpeg.h",
+        },
+        ffmpeg_header_targets,
     ]),
     deps = [
         ":libffmpeg_build",
diff --git a/submodules/ffmpeg/BUILD b/submodules/ffmpeg/BUILD
new file mode 100644
index 0000000000..edcc75499d
--- /dev/null
+++ b/submodules/ffmpeg/BUILD
@@ -0,0 +1,192 @@
+ffmpeg_header_paths = [
+    "libavutil/hwcontext.h",
+    "libavutil/time.h",
+    "libavutil/hwcontext_cuda.h",
+    "libavutil/intfloat.h",
+    "libavutil/error.h",
+    "libavutil/fifo.h",
+    "libavutil/blowfish.h",
+    "libavutil/hwcontext_mediacodec.h",
+    "libavutil/replaygain.h",
+    "libavutil/version.h",
+    "libavutil/murmur3.h",
+    "libavutil/stereo3d.h",
+    "libavutil/samplefmt.h",
+    "libavutil/pixdesc.h",
+    "libavutil/base64.h",
+    "libavutil/rational.h",
+    "libavutil/sha.h",
+    "libavutil/motion_vector.h",
+    "libavutil/avconfig.h",
+    "libavutil/lfg.h",
+    "libavutil/avutil.h",
+    "libavutil/xtea.h",
+    "libavutil/crc.h",
+    "libavutil/hwcontext_vdpau.h",
+    "libavutil/frame.h",
+    "libavutil/file.h",
+    "libavutil/md5.h",
+    "libavutil/cast5.h",
+    "libavutil/hwcontext_vaapi.h",
+    "libavutil/spherical.h",
+    "libavutil/ffversion.h",
+    "libavutil/audio_fifo.h",
+    "libavutil/tree.h",
+    "libavutil/threadmessage.h",
+    "libavutil/attributes.h",
+    "libavutil/adler32.h",
+    "libavutil/hwcontext_d3d11va.h",
+    "libavutil/timecode.h",
+    "libavutil/sha512.h",
+    "libavutil/hwcontext_dxva2.h",
+    "libavutil/display.h",
+    "libavutil/buffer.h",
+    "libavutil/camellia.h",
+    "libavutil/pixelutils.h",
+    "libavutil/hwcontext_drm.h",
+    "libavutil/common.h",
+    "libavutil/hmac.h",
+    "libavutil/eval.h",
+    "libavutil/dict.h",
+    "libavutil/random_seed.h",
+    "libavutil/opt.h",
+    "libavutil/mastering_display_metadata.h",
+    "libavutil/log.h",
+    "libavutil/aes.h",
+    "libavutil/macros.h",
+    "libavutil/bswap.h",
+    "libavutil/rc4.h",
+    "libavutil/tea.h",
+    "libavutil/cpu.h",
+    "libavutil/lzo.h",
+    "libavutil/des.h",
+    "libavutil/channel_layout.h",
+    "libavutil/encryption_info.h",
+    "libavutil/twofish.h",
+    "libavutil/imgutils.h",
+    "libavutil/hwcontext_videotoolbox.h",
+    "libavutil/mem.h",
+    "libavutil/parseutils.h",
+    "libavutil/ripemd.h",
+    "libavutil/bprint.h",
+    "libavutil/hwcontext_qsv.h",
+    "libavutil/pixfmt.h",
+    "libavutil/aes_ctr.h",
+    "libavutil/timestamp.h",
+    "libavutil/downmix_info.h",
+    "libavutil/avassert.h",
+    "libavutil/hash.h",
+    "libavutil/mathematics.h",
+    "libavutil/intreadwrite.h",
+    "libavutil/avstring.h",
+    "libavformat/version.h",
+    "libavformat/avio.h",
+    "libavformat/avformat.h",
+    "libavcodec/adts_parser.h",
+    "libavcodec/avcodec.h",
+    "libavcodec/version.h",
+    "libavcodec/vdpau.h",
+    "libavcodec/qsv.h",
+    "libavcodec/vaapi.h",
+    "libavcodec/videotoolbox.h",
+    "libavcodec/xvmc.h",
+    "libavcodec/mediacodec.h",
+    "libavcodec/d3d11va.h",
+    "libavcodec/avfft.h",
+    "libavcodec/jni.h",
+    "libavcodec/dirac.h",
+    "libavcodec/avdct.h",
+    "libavcodec/ac3_parser.h",
+    "libavcodec/vorbis_parser.h",
+    "libavcodec/dxva2.h",
+    "libavcodec/dv_profile.h",
+    "libswresample/version.h",
+    "libswresample/swresample.h",
+]
+
+ffmpeg_libs = [
+    "libavutil.a",
+    "libavcodec.a",
+    "libavformat.a",
+    "libswresample.a",
+]
+
+source_files = glob([
+    "Sources/**/*",
+], exclude = ["Sources/**/.*"])
+
+filegroup(
+    name = "FFMpegSources",
+    srcs = source_files,
+)
+
+genrule(
+    name = "libffmpeg_build",
+    srcs = [
+        ":FFMpegSources",
+    ],
+    cmd_bash =
+    """
+        SOURCE_PATH="submodules/ffmpeg/Sources/FFMpeg"
+
+        BUILD_DIR="$(RULEDIR)/build"
+        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"
+        elif [ "$(TARGET_CPU)" == "ios_arm64" ]; then
+            BUILD_ARCH="arm64"
+        elif [ "$(TARGET_CPU)" == "ios_x86_64" ]; then
+            BUILD_ARCH="x86_64"
+        else
+            echo "Unsupported architecture $(TARGET_CPU)"
+        fi
+
+        PATH="$$PATH:$$YASM_DIR" "$$SOURCE_PATH/build-ffmpeg-bazel.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",
+    ],
+    visibility = [
+        "//visibility:public",
+    ],
+)
+
+cc_library(
+    name = "ffmpeg_lib",
+    srcs = ffmpeg_libs,
+)
+
+objc_library(
+    name = "ffmpeg",
+    module_name = "ffmpeg",
+    enable_modules = True,
+    hdrs = ["Public/ffmpeg/" + x for x in ffmpeg_header_paths],
+    includes = [
+        "Public/ffmpeg",
+    ],
+    sdk_dylibs = [
+        "libbz2",
+        "libiconv",
+        "z",
+    ],
+    deps = [
+        ":ffmpeg_lib",
+        "//submodules/Opus:opus",
+    ],
+    visibility = [
+        "//visibility:public",
+    ]
+)
diff --git a/submodules/ffmpeg/FFMpeg/FFMpeg.h b/submodules/ffmpeg/FFMpeg/FFMpeg.h
deleted file mode 100644
index f636e140ae..0000000000
--- a/submodules/ffmpeg/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/FFMpeg/Info.plist b/submodules/ffmpeg/FFMpeg/Info.plist
deleted file mode 100644
index e1fe4cfb7b..0000000000
--- a/submodules/ffmpeg/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/PublicHeaders/ffmpeg/ffmpeg.h b/submodules/ffmpeg/PublicHeaders/ffmpeg/ffmpeg.h
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/submodules/ffmpeg/Sources/FFMpeg/build-ffmpeg-bazel.sh b/submodules/ffmpeg/Sources/FFMpeg/build-ffmpeg-bazel.sh
new file mode 100755
index 0000000000..5d6664b16f
--- /dev/null
+++ b/submodules/ffmpeg/Sources/FFMpeg/build-ffmpeg-bazel.sh
@@ -0,0 +1,222 @@
+#!/bin/sh
+
+RAW_ARCHS="$2"
+ARCHS=""
+
+for RAW_ARCH in $RAW_ARCHS; do
+	ARCH_NAME="$RAW_ARCH"
+	if [ "$ARCH_NAME" == "iphoneos-arm64" ]; then
+		ARCH_NAME="arm64"
+	elif [ "$ARCH_NAME" == "iphoneos-armv7" ]; then
+		ARCH_NAME="armv7"
+	elif [ "$ARCH_NAME" == "iphonesimulator-x86_64" ]; then
+		ARCH_NAME="x86_64"
+	elif [ "$ARCH_NAME" == "iphonesimulator-i386" ]; then
+		ARCH_NAME="i386"
+	fi
+
+	if [ "$ARCH_NAME" = "i386" -o "$ARCH_NAME" = "x86_64" -o "$ARCH_NAME" = "arm64" -o "$ARCH_NAME" = "armv7" ]
+	then
+		ARCHS="$ARCHS $ARCH_NAME"
+	else
+		echo "Invalid architecture $ARCH"
+		exit 1
+	fi
+done
+
+BUILD_DIR=$3
+SOURCE_DIR=$4
+
+FF_VERSION="4.1"
+SOURCE="$SOURCE_DIR/ffmpeg-$FF_VERSION"
+
+GAS_PREPROCESSOR_PATH="$SOURCE_DIR/gas-preprocessor.pl"
+
+FAT="$BUILD_DIR/FFmpeg-iOS"
+
+SCRATCH="$BUILD_DIR/scratch"
+THIN="$BUILD_DIR/thin"
+
+PKG_CONFIG="$SOURCE_DIR/pkg-config"
+
+export PATH="$SOURCE_DIR:$PATH"
+
+LIB_NAMES="libavcodec libavformat libavutil libswresample"
+
+set -e
+
+CONFIGURE_FLAGS="--enable-cross-compile --disable-programs \
+				 --disable-armv5te --disable-armv6 --disable-armv6t2 \
+                 --disable-doc --enable-pic --disable-all --disable-everything \
+                 --enable-avcodec  \
+                 --enable-swresample \
+                 --enable-avformat \
+                 --disable-xlib \
+                 --enable-libopus \
+                 --enable-audiotoolbox \
+                 --enable-bsf=aac_adtstoasc \
+                 --enable-decoder=h264,hevc,libopus,mp3_at,aac,flac,alac_at,pcm_s16le,pcm_s24le,gsm_ms_at \
+                 --enable-demuxer=aac,mov,m4v,mp3,ogg,libopus,flac,wav,aiff,matroska \
+                 --enable-parser=aac,h264,mp3,libopus \
+                 --enable-protocol=file \
+                 --enable-muxer=mp4 \
+                 "
+
+
+#--enable-hwaccel=h264_videotoolbox,hevc_videotoolbox \
+
+if [ "$1" = "debug" ];
+then
+	CONFIGURE_FLAGS="$CONFIGURE_FLAGS --disable-optimizations --disable-stripping"
+elif [ "$1" = "release" ];
+then
+	CONFIGURE_FLAGS="$CONFIGURE_FLAGS --disable-debug"
+else
+	echo "No configuration specified (debug / release)"
+	exit 1
+fi
+
+COMPILE="y"
+
+DEPLOYMENT_TARGET="8.0"
+
+LIBS_HASH=""
+for ARCH in $ARCHS
+do
+	for LIB_NAME in $LIB_NAMES
+	do
+		LIB="$THIN/$ARCH/lib/$LIB_NAME.a"
+		if [ -f "$LIB" ]; then
+			LIB_DATE=`crc32 "$LIB"`
+			LIBS_HASH="$LIBS_HASH $ARCH/$LIB:$LIB_DATE"
+		fi
+	done
+done
+
+if [ "$COMPILE" ]
+then
+	if [ ! `which yasm` ]; then
+		echo 'Yasm not found'
+		exit 1
+	fi
+	if [ ! `which pkg-config` ]; then
+		echo 'pkg-config not found'
+		exit 1
+	else
+		echo "PATH=$PATH"
+		echo "pkg-config=$(which pkg-config)"
+	fi
+	if [ ! `which "$GAS_PREPROCESSOR_PATH"` ]; then
+		echo '$GAS_PREPROCESSOR_PATH not found.'
+		exit 1
+	fi
+
+	if [ ! -r $SOURCE ]; then
+		echo "FFmpeg source not found at $SOURCE"
+		exit 1
+	fi
+
+	for ARCH in $ARCHS
+	do
+		echo "building $ARCH..."
+		mkdir -p "$SCRATCH/$ARCH"
+
+		LIBOPUS_PATH="$SOURCE_DIR/libopus"
+
+		CFLAGS="-arch $ARCH"
+		if [ "$ARCH" = "i386" -o "$ARCH" = "x86_64" ]
+		then
+		    PLATFORM="iPhoneSimulator"
+		    CFLAGS="$CFLAGS -mios-simulator-version-min=$DEPLOYMENT_TARGET"
+		else
+		    PLATFORM="iPhoneOS"
+		    CFLAGS="$CFLAGS -mios-version-min=$DEPLOYMENT_TARGET"
+		    if [ "$ARCH" = "arm64" ]
+		    then
+		        EXPORT="GASPP_FIX_XCODE5=1"
+		    fi
+		fi
+
+		XCRUN_SDK=`echo $PLATFORM | tr '[:upper:]' '[:lower:]'`
+		CC="xcrun -sdk $XCRUN_SDK clang"
+
+		if [ "$ARCH" = "arm64" ]
+		then
+		    AS="$GAS_PREPROCESSOR_PATH -arch aarch64 -- $CC"
+		else
+		    AS="$GAS_PREPROCESSOR_PATH -- $CC"
+		fi
+
+		CXXFLAGS="$CFLAGS"
+		LDFLAGS="$CFLAGS"
+
+		CONFIGURED_MARKER="$THIN/$ARCH/configured_marker"
+		CONFIGURED_MARKER_CONTENTS=""
+		if [ -r "$CONFIGURED_MARKER" ]
+		then
+			CONFIGURED_MARKER_CONTENTS=`cat "$CONFIGURED_MARKER"`
+		fi
+		if [ "$CONFIGURED_MARKER_CONTENTS" = "$CONFIGURE_FLAGS" ]
+		then
+			echo "1" >/dev/null
+		else
+			mkdir -p "$THIN/$ARCH"
+			TMPDIR=${TMPDIR/%\/} "$SOURCE/configure" \
+			    --target-os=darwin \
+			    --arch=$ARCH \
+			    --cc="$CC" \
+			    --as="$AS" \
+			    $CONFIGURE_FLAGS \
+			    --extra-cflags="$CFLAGS" \
+			    --extra-ldflags="$LDFLAGS" \
+			    --prefix="$THIN/$ARCH" \
+			    --pkg-config="$PKG_CONFIG" \
+			    --pkg-config-flags="--libopus_path $LIBOPUS_PATH" \
+			|| exit 1
+			echo "$CONFIGURE_FLAGS" > "$CONFIGURED_MARKER"
+		fi
+
+		CORE_COUNT=`sysctl -n hw.logicalcpu`
+		make -j$CORE_COUNT install $EXPORT || exit 1
+	done
+fi
+
+UPDATED_LIBS_HASH=""
+for ARCH in $ARCHS
+do
+	for LIB_NAME in $LIB_NAMES
+	do
+		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
+	done
+done
+
+if [ "$UPDATED_LIBS_HASH" = "$LIBS_HASH" ]
+then
+	echo "Libs aren't changed, skipping lipo"
+else
+	echo "UPDATED_LIBS_HASH=$UPDATED_LIBS_HASH"
+	echo "LIBS_HASH=$LIBS_HASH"
+	LIPO="y"
+fi
+
+if [ "$LIPO" ]
+then
+	echo "building fat binaries in $FAT"
+	mkdir -p "$FAT"/lib
+	set - $ARCHS
+	for LIB in "$THIN/$1/lib/"*.a
+	do
+		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
+
+	cp -rf "$THIN/$1/include" "$FAT"
+fi
+
+echo Done
diff --git a/submodules/ffmpeg/FFMpeg/build-ffmpeg.sh b/submodules/ffmpeg/Sources/FFMpeg/build-ffmpeg-buck.sh
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/build-ffmpeg.sh
rename to submodules/ffmpeg/Sources/FFMpeg/build-ffmpeg-buck.sh
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/.gitattributes b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/.gitattributes
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/.gitattributes
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/.gitattributes
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/.travis.yml b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/.travis.yml
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/.travis.yml
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/.travis.yml
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/CONTRIBUTING.md b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/CONTRIBUTING.md
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/CONTRIBUTING.md
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/CONTRIBUTING.md
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/COPYING.GPLv2 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/COPYING.GPLv2
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/COPYING.GPLv2
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/COPYING.GPLv2
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/COPYING.GPLv3 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/COPYING.GPLv3
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/COPYING.GPLv3
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/COPYING.GPLv3
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/COPYING.LGPLv2.1 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/COPYING.LGPLv2.1
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/COPYING.LGPLv2.1
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/COPYING.LGPLv2.1
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/COPYING.LGPLv3 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/COPYING.LGPLv3
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/COPYING.LGPLv3
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/COPYING.LGPLv3
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/CREDITS b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/CREDITS
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/CREDITS
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/CREDITS
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/Changelog b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/Changelog
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/Changelog
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/Changelog
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/INSTALL.md b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/INSTALL.md
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/INSTALL.md
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/INSTALL.md
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/LICENSE.md b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/LICENSE.md
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/LICENSE.md
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/LICENSE.md
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/MAINTAINERS b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/MAINTAINERS
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/MAINTAINERS
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/MAINTAINERS
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/Makefile b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/Makefile
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/Makefile
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/Makefile
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/README.md b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/README.md
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/README.md
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/README.md
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/RELEASE b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/RELEASE
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/RELEASE
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/RELEASE
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/RELEASE_NOTES b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/RELEASE_NOTES
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/RELEASE_NOTES
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/RELEASE_NOTES
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/VERSION b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/VERSION
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/VERSION
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/VERSION
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/compat/aix/math.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/compat/aix/math.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/compat/aix/math.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/compat/aix/math.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/compat/atomics/dummy/stdatomic.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/compat/atomics/dummy/stdatomic.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/compat/atomics/dummy/stdatomic.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/compat/atomics/dummy/stdatomic.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/compat/atomics/gcc/stdatomic.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/compat/atomics/gcc/stdatomic.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/compat/atomics/gcc/stdatomic.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/compat/atomics/gcc/stdatomic.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/compat/atomics/pthread/stdatomic.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/compat/atomics/pthread/stdatomic.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/compat/atomics/pthread/stdatomic.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/compat/atomics/pthread/stdatomic.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/compat/atomics/pthread/stdatomic.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/compat/atomics/pthread/stdatomic.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/compat/atomics/pthread/stdatomic.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/compat/atomics/pthread/stdatomic.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/compat/atomics/suncc/stdatomic.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/compat/atomics/suncc/stdatomic.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/compat/atomics/suncc/stdatomic.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/compat/atomics/suncc/stdatomic.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/compat/atomics/win32/stdatomic.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/compat/atomics/win32/stdatomic.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/compat/atomics/win32/stdatomic.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/compat/atomics/win32/stdatomic.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/compat/avisynth/avisynth_c.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/compat/avisynth/avisynth_c.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/compat/avisynth/avisynth_c.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/compat/avisynth/avisynth_c.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/compat/avisynth/avs/capi.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/compat/avisynth/avs/capi.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/compat/avisynth/avs/capi.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/compat/avisynth/avs/capi.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/compat/avisynth/avs/config.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/compat/avisynth/avs/config.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/compat/avisynth/avs/config.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/compat/avisynth/avs/config.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/compat/avisynth/avs/types.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/compat/avisynth/avs/types.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/compat/avisynth/avs/types.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/compat/avisynth/avs/types.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/compat/avisynth/avxsynth_c.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/compat/avisynth/avxsynth_c.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/compat/avisynth/avxsynth_c.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/compat/avisynth/avxsynth_c.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/compat/avisynth/windowsPorts/basicDataTypeConversions.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/compat/avisynth/windowsPorts/basicDataTypeConversions.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/compat/avisynth/windowsPorts/basicDataTypeConversions.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/compat/avisynth/windowsPorts/basicDataTypeConversions.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/compat/avisynth/windowsPorts/windows2linux.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/compat/avisynth/windowsPorts/windows2linux.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/compat/avisynth/windowsPorts/windows2linux.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/compat/avisynth/windowsPorts/windows2linux.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/compat/cuda/dynlink_loader.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/compat/cuda/dynlink_loader.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/compat/cuda/dynlink_loader.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/compat/cuda/dynlink_loader.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/compat/cuda/ptx2c.sh b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/compat/cuda/ptx2c.sh
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/compat/cuda/ptx2c.sh
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/compat/cuda/ptx2c.sh
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/compat/dispatch_semaphore/semaphore.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/compat/dispatch_semaphore/semaphore.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/compat/dispatch_semaphore/semaphore.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/compat/dispatch_semaphore/semaphore.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/compat/float/float.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/compat/float/float.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/compat/float/float.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/compat/float/float.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/compat/float/limits.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/compat/float/limits.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/compat/float/limits.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/compat/float/limits.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/compat/getopt.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/compat/getopt.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/compat/getopt.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/compat/getopt.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/compat/msvcrt/snprintf.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/compat/msvcrt/snprintf.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/compat/msvcrt/snprintf.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/compat/msvcrt/snprintf.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/compat/msvcrt/snprintf.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/compat/msvcrt/snprintf.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/compat/msvcrt/snprintf.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/compat/msvcrt/snprintf.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/compat/os2threads.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/compat/os2threads.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/compat/os2threads.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/compat/os2threads.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/compat/solaris/make_sunver.pl b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/compat/solaris/make_sunver.pl
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/compat/solaris/make_sunver.pl
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/compat/solaris/make_sunver.pl
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/compat/strtod.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/compat/strtod.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/compat/strtod.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/compat/strtod.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/compat/va_copy.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/compat/va_copy.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/compat/va_copy.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/compat/va_copy.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/compat/w32dlfcn.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/compat/w32dlfcn.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/compat/w32dlfcn.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/compat/w32dlfcn.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/compat/w32pthreads.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/compat/w32pthreads.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/compat/w32pthreads.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/compat/w32pthreads.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/compat/windows/makedef b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/compat/windows/makedef
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/compat/windows/makedef
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/compat/windows/makedef
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/compat/windows/mslink b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/compat/windows/mslink
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/compat/windows/mslink
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/compat/windows/mslink
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/configure b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/configure
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/configure
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/configure
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/doc/APIchanges b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/doc/APIchanges
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/doc/APIchanges
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/doc/APIchanges
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/doc/Doxyfile b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/doc/Doxyfile
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/doc/Doxyfile
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/doc/Doxyfile
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/doc/Makefile b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/doc/Makefile
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/doc/Makefile
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/doc/Makefile
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/doc/authors.texi b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/doc/authors.texi
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/doc/authors.texi
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/doc/authors.texi
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/doc/bitstream_filters.texi b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/doc/bitstream_filters.texi
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/doc/bitstream_filters.texi
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/doc/bitstream_filters.texi
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/doc/bootstrap.min.css b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/doc/bootstrap.min.css
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/doc/bootstrap.min.css
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/doc/bootstrap.min.css
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/doc/build_system.txt b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/doc/build_system.txt
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/doc/build_system.txt
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/doc/build_system.txt
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/doc/codecs.texi b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/doc/codecs.texi
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/doc/codecs.texi
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/doc/codecs.texi
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/doc/decoders.texi b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/doc/decoders.texi
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/doc/decoders.texi
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/doc/decoders.texi
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/doc/default.css b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/doc/default.css
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/doc/default.css
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/doc/default.css
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/doc/demuxers.texi b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/doc/demuxers.texi
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/doc/demuxers.texi
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/doc/demuxers.texi
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/doc/developer.texi b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/doc/developer.texi
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/doc/developer.texi
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/doc/developer.texi
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/doc/devices.texi b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/doc/devices.texi
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/doc/devices.texi
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/doc/devices.texi
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/doc/doxy-wrapper.sh b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/doc/doxy-wrapper.sh
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/doc/doxy-wrapper.sh
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/doc/doxy-wrapper.sh
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/doc/encoders.texi b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/doc/encoders.texi
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/doc/encoders.texi
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/doc/encoders.texi
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/doc/errno.txt b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/doc/errno.txt
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/doc/errno.txt
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/doc/errno.txt
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/doc/examples/Makefile b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/doc/examples/Makefile
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/doc/examples/Makefile
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/doc/examples/Makefile
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/doc/examples/Makefile.example b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/doc/examples/Makefile.example
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/doc/examples/Makefile.example
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/doc/examples/Makefile.example
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/doc/examples/README b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/doc/examples/README
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/doc/examples/README
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/doc/examples/README
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/doc/examples/avio_dir_cmd.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/doc/examples/avio_dir_cmd.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/doc/examples/avio_dir_cmd.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/doc/examples/avio_dir_cmd.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/doc/examples/avio_reading.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/doc/examples/avio_reading.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/doc/examples/avio_reading.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/doc/examples/avio_reading.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/doc/examples/decode_audio.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/doc/examples/decode_audio.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/doc/examples/decode_audio.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/doc/examples/decode_audio.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/doc/examples/decode_video.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/doc/examples/decode_video.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/doc/examples/decode_video.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/doc/examples/decode_video.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/doc/examples/demuxing_decoding.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/doc/examples/demuxing_decoding.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/doc/examples/demuxing_decoding.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/doc/examples/demuxing_decoding.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/doc/examples/encode_audio.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/doc/examples/encode_audio.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/doc/examples/encode_audio.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/doc/examples/encode_audio.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/doc/examples/encode_video.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/doc/examples/encode_video.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/doc/examples/encode_video.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/doc/examples/encode_video.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/doc/examples/extract_mvs.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/doc/examples/extract_mvs.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/doc/examples/extract_mvs.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/doc/examples/extract_mvs.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/doc/examples/filter_audio.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/doc/examples/filter_audio.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/doc/examples/filter_audio.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/doc/examples/filter_audio.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/doc/examples/filtering_audio.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/doc/examples/filtering_audio.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/doc/examples/filtering_audio.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/doc/examples/filtering_audio.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/doc/examples/filtering_video.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/doc/examples/filtering_video.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/doc/examples/filtering_video.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/doc/examples/filtering_video.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/doc/examples/http_multiclient.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/doc/examples/http_multiclient.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/doc/examples/http_multiclient.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/doc/examples/http_multiclient.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/doc/examples/hw_decode.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/doc/examples/hw_decode.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/doc/examples/hw_decode.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/doc/examples/hw_decode.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/doc/examples/metadata.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/doc/examples/metadata.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/doc/examples/metadata.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/doc/examples/metadata.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/doc/examples/muxing.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/doc/examples/muxing.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/doc/examples/muxing.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/doc/examples/muxing.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/doc/examples/qsvdec.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/doc/examples/qsvdec.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/doc/examples/qsvdec.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/doc/examples/qsvdec.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/doc/examples/remuxing.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/doc/examples/remuxing.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/doc/examples/remuxing.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/doc/examples/remuxing.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/doc/examples/resampling_audio.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/doc/examples/resampling_audio.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/doc/examples/resampling_audio.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/doc/examples/resampling_audio.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/doc/examples/scaling_video.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/doc/examples/scaling_video.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/doc/examples/scaling_video.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/doc/examples/scaling_video.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/doc/examples/transcode_aac.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/doc/examples/transcode_aac.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/doc/examples/transcode_aac.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/doc/examples/transcode_aac.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/doc/examples/transcoding.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/doc/examples/transcoding.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/doc/examples/transcoding.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/doc/examples/transcoding.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/doc/examples/vaapi_encode.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/doc/examples/vaapi_encode.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/doc/examples/vaapi_encode.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/doc/examples/vaapi_encode.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/doc/examples/vaapi_transcode.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/doc/examples/vaapi_transcode.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/doc/examples/vaapi_transcode.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/doc/examples/vaapi_transcode.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/doc/faq.texi b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/doc/faq.texi
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/doc/faq.texi
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/doc/faq.texi
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/doc/fate.texi b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/doc/fate.texi
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/doc/fate.texi
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/doc/fate.texi
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/doc/fate_config.sh.template b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/doc/fate_config.sh.template
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/doc/fate_config.sh.template
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/doc/fate_config.sh.template
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/doc/ffmpeg-bitstream-filters.texi b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/doc/ffmpeg-bitstream-filters.texi
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/doc/ffmpeg-bitstream-filters.texi
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/doc/ffmpeg-bitstream-filters.texi
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/doc/ffmpeg-codecs.texi b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/doc/ffmpeg-codecs.texi
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/doc/ffmpeg-codecs.texi
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/doc/ffmpeg-codecs.texi
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/doc/ffmpeg-devices.texi b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/doc/ffmpeg-devices.texi
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/doc/ffmpeg-devices.texi
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/doc/ffmpeg-devices.texi
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/doc/ffmpeg-filters.texi b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/doc/ffmpeg-filters.texi
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/doc/ffmpeg-filters.texi
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/doc/ffmpeg-filters.texi
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/doc/ffmpeg-formats.texi b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/doc/ffmpeg-formats.texi
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/doc/ffmpeg-formats.texi
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/doc/ffmpeg-formats.texi
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/doc/ffmpeg-protocols.texi b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/doc/ffmpeg-protocols.texi
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/doc/ffmpeg-protocols.texi
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/doc/ffmpeg-protocols.texi
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/doc/ffmpeg-resampler.texi b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/doc/ffmpeg-resampler.texi
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/doc/ffmpeg-resampler.texi
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/doc/ffmpeg-resampler.texi
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/doc/ffmpeg-scaler.texi b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/doc/ffmpeg-scaler.texi
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/doc/ffmpeg-scaler.texi
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/doc/ffmpeg-scaler.texi
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/doc/ffmpeg-utils.texi b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/doc/ffmpeg-utils.texi
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/doc/ffmpeg-utils.texi
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/doc/ffmpeg-utils.texi
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/doc/ffmpeg.texi b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/doc/ffmpeg.texi
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/doc/ffmpeg.texi
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/doc/ffmpeg.texi
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/doc/ffmpeg.txt b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/doc/ffmpeg.txt
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/doc/ffmpeg.txt
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/doc/ffmpeg.txt
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/doc/ffplay.texi b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/doc/ffplay.texi
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/doc/ffplay.texi
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/doc/ffplay.texi
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/doc/ffprobe.texi b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/doc/ffprobe.texi
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/doc/ffprobe.texi
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/doc/ffprobe.texi
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/doc/ffprobe.xsd b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/doc/ffprobe.xsd
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/doc/ffprobe.xsd
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/doc/ffprobe.xsd
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/doc/fftools-common-opts.texi b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/doc/fftools-common-opts.texi
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/doc/fftools-common-opts.texi
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/doc/fftools-common-opts.texi
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/doc/filter_design.txt b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/doc/filter_design.txt
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/doc/filter_design.txt
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/doc/filter_design.txt
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/doc/filters.texi b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/doc/filters.texi
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/doc/filters.texi
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/doc/filters.texi
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/doc/formats.texi b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/doc/formats.texi
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/doc/formats.texi
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/doc/formats.texi
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/doc/general.texi b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/doc/general.texi
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/doc/general.texi
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/doc/general.texi
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/doc/git-howto.texi b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/doc/git-howto.texi
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/doc/git-howto.texi
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/doc/git-howto.texi
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/doc/indevs.texi b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/doc/indevs.texi
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/doc/indevs.texi
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/doc/indevs.texi
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/doc/issue_tracker.txt b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/doc/issue_tracker.txt
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/doc/issue_tracker.txt
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/doc/issue_tracker.txt
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/doc/lexicon b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/doc/lexicon
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/doc/lexicon
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/doc/lexicon
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/doc/libav-merge.txt b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/doc/libav-merge.txt
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/doc/libav-merge.txt
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/doc/libav-merge.txt
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/doc/libavcodec.texi b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/doc/libavcodec.texi
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/doc/libavcodec.texi
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/doc/libavcodec.texi
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/doc/libavdevice.texi b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/doc/libavdevice.texi
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/doc/libavdevice.texi
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/doc/libavdevice.texi
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/doc/libavfilter.texi b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/doc/libavfilter.texi
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/doc/libavfilter.texi
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/doc/libavfilter.texi
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/doc/libavformat.texi b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/doc/libavformat.texi
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/doc/libavformat.texi
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/doc/libavformat.texi
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/doc/libavutil.texi b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/doc/libavutil.texi
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/doc/libavutil.texi
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/doc/libavutil.texi
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/doc/libswresample.texi b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/doc/libswresample.texi
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/doc/libswresample.texi
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/doc/libswresample.texi
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/doc/libswscale.texi b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/doc/libswscale.texi
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/doc/libswscale.texi
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/doc/libswscale.texi
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/doc/mailing-list-faq.texi b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/doc/mailing-list-faq.texi
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/doc/mailing-list-faq.texi
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/doc/mailing-list-faq.texi
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/doc/metadata.texi b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/doc/metadata.texi
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/doc/metadata.texi
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/doc/metadata.texi
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/doc/mips.txt b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/doc/mips.txt
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/doc/mips.txt
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/doc/mips.txt
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/doc/multithreading.txt b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/doc/multithreading.txt
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/doc/multithreading.txt
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/doc/multithreading.txt
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/doc/muxers.texi b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/doc/muxers.texi
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/doc/muxers.texi
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/doc/muxers.texi
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/doc/nut.texi b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/doc/nut.texi
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/doc/nut.texi
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/doc/nut.texi
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/doc/optimization.txt b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/doc/optimization.txt
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/doc/optimization.txt
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/doc/optimization.txt
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/doc/outdevs.texi b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/doc/outdevs.texi
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/doc/outdevs.texi
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/doc/outdevs.texi
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/doc/patchwork b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/doc/patchwork
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/doc/patchwork
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/doc/patchwork
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/doc/platform.texi b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/doc/platform.texi
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/doc/platform.texi
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/doc/platform.texi
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/doc/print_options.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/doc/print_options.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/doc/print_options.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/doc/print_options.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/doc/protocols.texi b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/doc/protocols.texi
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/doc/protocols.texi
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/doc/protocols.texi
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/doc/rate_distortion.txt b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/doc/rate_distortion.txt
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/doc/rate_distortion.txt
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/doc/rate_distortion.txt
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/doc/resampler.texi b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/doc/resampler.texi
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/doc/resampler.texi
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/doc/resampler.texi
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/doc/scaler.texi b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/doc/scaler.texi
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/doc/scaler.texi
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/doc/scaler.texi
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/doc/snow.txt b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/doc/snow.txt
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/doc/snow.txt
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/doc/snow.txt
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/doc/style.min.css b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/doc/style.min.css
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/doc/style.min.css
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/doc/style.min.css
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/doc/swresample.txt b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/doc/swresample.txt
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/doc/swresample.txt
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/doc/swresample.txt
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/doc/swscale.txt b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/doc/swscale.txt
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/doc/swscale.txt
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/doc/swscale.txt
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/doc/t2h.init b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/doc/t2h.init
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/doc/t2h.init
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/doc/t2h.init
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/doc/t2h.pm b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/doc/t2h.pm
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/doc/t2h.pm
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/doc/t2h.pm
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/doc/tablegen.txt b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/doc/tablegen.txt
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/doc/tablegen.txt
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/doc/tablegen.txt
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/doc/texi2pod.pl b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/doc/texi2pod.pl
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/doc/texi2pod.pl
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/doc/texi2pod.pl
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/doc/texidep.pl b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/doc/texidep.pl
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/doc/texidep.pl
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/doc/texidep.pl
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/doc/undefined.txt b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/doc/undefined.txt
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/doc/undefined.txt
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/doc/undefined.txt
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/doc/utils.texi b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/doc/utils.texi
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/doc/utils.texi
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/doc/utils.texi
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/doc/writing_filters.txt b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/doc/writing_filters.txt
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/doc/writing_filters.txt
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/doc/writing_filters.txt
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/ffbuild/arch.mak b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/ffbuild/arch.mak
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/ffbuild/arch.mak
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/ffbuild/arch.mak
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/ffbuild/common.mak b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/ffbuild/common.mak
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/ffbuild/common.mak
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/ffbuild/common.mak
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/ffbuild/library.mak b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/ffbuild/library.mak
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/ffbuild/library.mak
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/ffbuild/library.mak
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/ffbuild/libversion.sh b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/ffbuild/libversion.sh
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/ffbuild/libversion.sh
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/ffbuild/libversion.sh
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/ffbuild/pkgconfig_generate.sh b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/ffbuild/pkgconfig_generate.sh
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/ffbuild/pkgconfig_generate.sh
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/ffbuild/pkgconfig_generate.sh
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/ffbuild/version.sh b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/ffbuild/version.sh
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/ffbuild/version.sh
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/ffbuild/version.sh
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/fftools/Makefile b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/fftools/Makefile
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/fftools/Makefile
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/fftools/Makefile
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/fftools/cmdutils.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/fftools/cmdutils.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/fftools/cmdutils.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/fftools/cmdutils.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/fftools/cmdutils.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/fftools/cmdutils.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/fftools/cmdutils.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/fftools/cmdutils.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/fftools/ffmpeg.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/fftools/ffmpeg.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/fftools/ffmpeg.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/fftools/ffmpeg.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/fftools/ffmpeg.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/fftools/ffmpeg.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/fftools/ffmpeg.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/fftools/ffmpeg.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/fftools/ffmpeg_cuvid.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/fftools/ffmpeg_cuvid.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/fftools/ffmpeg_cuvid.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/fftools/ffmpeg_cuvid.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/fftools/ffmpeg_filter.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/fftools/ffmpeg_filter.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/fftools/ffmpeg_filter.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/fftools/ffmpeg_filter.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/fftools/ffmpeg_hw.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/fftools/ffmpeg_hw.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/fftools/ffmpeg_hw.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/fftools/ffmpeg_hw.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/fftools/ffmpeg_opt.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/fftools/ffmpeg_opt.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/fftools/ffmpeg_opt.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/fftools/ffmpeg_opt.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/fftools/ffmpeg_qsv.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/fftools/ffmpeg_qsv.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/fftools/ffmpeg_qsv.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/fftools/ffmpeg_qsv.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/fftools/ffmpeg_videotoolbox.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/fftools/ffmpeg_videotoolbox.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/fftools/ffmpeg_videotoolbox.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/fftools/ffmpeg_videotoolbox.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/fftools/ffplay.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/fftools/ffplay.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/fftools/ffplay.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/fftools/ffplay.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/fftools/ffprobe.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/fftools/ffprobe.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/fftools/ffprobe.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/fftools/ffprobe.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/012v.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/012v.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/012v.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/012v.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/4xm.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/4xm.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/4xm.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/4xm.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/8bps.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/8bps.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/8bps.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/8bps.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/8svx.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/8svx.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/8svx.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/8svx.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/Makefile b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/Makefile
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/Makefile
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/Makefile
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/a64colors.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/a64colors.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/a64colors.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/a64colors.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/a64multienc.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/a64multienc.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/a64multienc.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/a64multienc.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/a64tables.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/a64tables.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/a64tables.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/a64tables.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/aac.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/aac.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/aac.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/aac.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/aac_ac3_parser.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/aac_ac3_parser.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/aac_ac3_parser.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/aac_ac3_parser.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/aac_ac3_parser.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/aac_ac3_parser.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/aac_ac3_parser.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/aac_ac3_parser.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/aac_adtstoasc_bsf.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/aac_adtstoasc_bsf.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/aac_adtstoasc_bsf.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/aac_adtstoasc_bsf.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/aac_defines.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/aac_defines.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/aac_defines.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/aac_defines.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/aac_parser.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/aac_parser.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/aac_parser.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/aac_parser.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/aaccoder.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/aaccoder.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/aaccoder.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/aaccoder.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/aaccoder_trellis.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/aaccoder_trellis.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/aaccoder_trellis.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/aaccoder_trellis.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/aaccoder_twoloop.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/aaccoder_twoloop.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/aaccoder_twoloop.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/aaccoder_twoloop.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/aacdec.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/aacdec.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/aacdec.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/aacdec.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/aacdec_fixed.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/aacdec_fixed.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/aacdec_fixed.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/aacdec_fixed.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/aacdec_template.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/aacdec_template.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/aacdec_template.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/aacdec_template.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/aacdectab.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/aacdectab.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/aacdectab.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/aacdectab.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/aacenc.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/aacenc.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/aacenc.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/aacenc.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/aacenc.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/aacenc.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/aacenc.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/aacenc.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/aacenc_is.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/aacenc_is.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/aacenc_is.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/aacenc_is.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/aacenc_is.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/aacenc_is.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/aacenc_is.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/aacenc_is.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/aacenc_ltp.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/aacenc_ltp.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/aacenc_ltp.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/aacenc_ltp.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/aacenc_ltp.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/aacenc_ltp.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/aacenc_ltp.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/aacenc_ltp.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/aacenc_pred.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/aacenc_pred.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/aacenc_pred.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/aacenc_pred.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/aacenc_pred.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/aacenc_pred.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/aacenc_pred.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/aacenc_pred.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/aacenc_quantization.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/aacenc_quantization.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/aacenc_quantization.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/aacenc_quantization.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/aacenc_quantization_misc.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/aacenc_quantization_misc.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/aacenc_quantization_misc.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/aacenc_quantization_misc.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/aacenc_tns.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/aacenc_tns.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/aacenc_tns.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/aacenc_tns.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/aacenc_tns.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/aacenc_tns.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/aacenc_tns.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/aacenc_tns.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/aacenc_utils.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/aacenc_utils.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/aacenc_utils.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/aacenc_utils.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/aacenctab.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/aacenctab.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/aacenctab.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/aacenctab.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/aacenctab.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/aacenctab.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/aacenctab.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/aacenctab.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/aacps.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/aacps.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/aacps.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/aacps.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/aacps.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/aacps.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/aacps.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/aacps.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/aacps_fixed.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/aacps_fixed.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/aacps_fixed.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/aacps_fixed.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/aacps_fixed_tablegen.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/aacps_fixed_tablegen.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/aacps_fixed_tablegen.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/aacps_fixed_tablegen.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/aacps_fixed_tablegen.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/aacps_fixed_tablegen.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/aacps_fixed_tablegen.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/aacps_fixed_tablegen.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/aacps_float.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/aacps_float.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/aacps_float.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/aacps_float.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/aacps_tablegen.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/aacps_tablegen.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/aacps_tablegen.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/aacps_tablegen.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/aacps_tablegen.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/aacps_tablegen.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/aacps_tablegen.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/aacps_tablegen.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/aacps_tablegen_template.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/aacps_tablegen_template.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/aacps_tablegen_template.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/aacps_tablegen_template.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/aacpsdata.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/aacpsdata.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/aacpsdata.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/aacpsdata.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/aacpsdsp.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/aacpsdsp.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/aacpsdsp.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/aacpsdsp.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/aacpsdsp_fixed.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/aacpsdsp_fixed.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/aacpsdsp_fixed.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/aacpsdsp_fixed.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/aacpsdsp_float.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/aacpsdsp_float.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/aacpsdsp_float.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/aacpsdsp_float.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/aacpsdsp_template.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/aacpsdsp_template.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/aacpsdsp_template.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/aacpsdsp_template.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/aacpsy.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/aacpsy.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/aacpsy.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/aacpsy.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/aacsbr.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/aacsbr.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/aacsbr.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/aacsbr.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/aacsbr.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/aacsbr.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/aacsbr.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/aacsbr.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/aacsbr_fixed.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/aacsbr_fixed.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/aacsbr_fixed.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/aacsbr_fixed.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/aacsbr_fixed_tablegen.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/aacsbr_fixed_tablegen.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/aacsbr_fixed_tablegen.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/aacsbr_fixed_tablegen.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/aacsbr_tablegen.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/aacsbr_tablegen.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/aacsbr_tablegen.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/aacsbr_tablegen.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/aacsbr_tablegen_common.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/aacsbr_tablegen_common.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/aacsbr_tablegen_common.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/aacsbr_tablegen_common.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/aacsbr_template.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/aacsbr_template.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/aacsbr_template.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/aacsbr_template.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/aacsbrdata.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/aacsbrdata.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/aacsbrdata.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/aacsbrdata.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/aactab.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/aactab.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/aactab.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/aactab.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/aactab.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/aactab.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/aactab.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/aactab.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/aandcttab.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/aandcttab.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/aandcttab.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/aandcttab.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/aandcttab.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/aandcttab.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/aandcttab.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/aandcttab.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/aarch64/Makefile b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/aarch64/Makefile
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/aarch64/Makefile
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/aarch64/Makefile
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/aarch64/aacpsdsp_init_aarch64.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/aarch64/aacpsdsp_init_aarch64.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/aarch64/aacpsdsp_init_aarch64.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/aarch64/aacpsdsp_init_aarch64.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/aarch64/aacpsdsp_neon.S b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/aarch64/aacpsdsp_neon.S
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/aarch64/aacpsdsp_neon.S
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/aarch64/aacpsdsp_neon.S
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/aarch64/asm-offsets.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/aarch64/asm-offsets.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/aarch64/asm-offsets.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/aarch64/asm-offsets.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/aarch64/cabac.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/aarch64/cabac.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/aarch64/cabac.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/aarch64/cabac.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/aarch64/fft_init_aarch64.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/aarch64/fft_init_aarch64.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/aarch64/fft_init_aarch64.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/aarch64/fft_init_aarch64.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/aarch64/fft_neon.S b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/aarch64/fft_neon.S
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/aarch64/fft_neon.S
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/aarch64/fft_neon.S
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/aarch64/fmtconvert_init.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/aarch64/fmtconvert_init.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/aarch64/fmtconvert_init.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/aarch64/fmtconvert_init.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/aarch64/fmtconvert_neon.S b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/aarch64/fmtconvert_neon.S
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/aarch64/fmtconvert_neon.S
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/aarch64/fmtconvert_neon.S
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/aarch64/h264chroma_init_aarch64.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/aarch64/h264chroma_init_aarch64.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/aarch64/h264chroma_init_aarch64.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/aarch64/h264chroma_init_aarch64.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/aarch64/h264cmc_neon.S b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/aarch64/h264cmc_neon.S
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/aarch64/h264cmc_neon.S
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/aarch64/h264cmc_neon.S
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/aarch64/h264dsp_init_aarch64.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/aarch64/h264dsp_init_aarch64.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/aarch64/h264dsp_init_aarch64.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/aarch64/h264dsp_init_aarch64.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/aarch64/h264dsp_neon.S b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/aarch64/h264dsp_neon.S
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/aarch64/h264dsp_neon.S
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/aarch64/h264dsp_neon.S
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/aarch64/h264idct_neon.S b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/aarch64/h264idct_neon.S
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/aarch64/h264idct_neon.S
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/aarch64/h264idct_neon.S
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/aarch64/h264pred_init.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/aarch64/h264pred_init.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/aarch64/h264pred_init.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/aarch64/h264pred_init.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/aarch64/h264pred_neon.S b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/aarch64/h264pred_neon.S
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/aarch64/h264pred_neon.S
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/aarch64/h264pred_neon.S
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/aarch64/h264qpel_init_aarch64.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/aarch64/h264qpel_init_aarch64.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/aarch64/h264qpel_init_aarch64.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/aarch64/h264qpel_init_aarch64.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/aarch64/h264qpel_neon.S b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/aarch64/h264qpel_neon.S
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/aarch64/h264qpel_neon.S
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/aarch64/h264qpel_neon.S
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/aarch64/hpeldsp_init_aarch64.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/aarch64/hpeldsp_init_aarch64.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/aarch64/hpeldsp_init_aarch64.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/aarch64/hpeldsp_init_aarch64.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/aarch64/hpeldsp_neon.S b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/aarch64/hpeldsp_neon.S
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/aarch64/hpeldsp_neon.S
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/aarch64/hpeldsp_neon.S
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/aarch64/idct.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/aarch64/idct.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/aarch64/idct.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/aarch64/idct.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/aarch64/idctdsp_init_aarch64.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/aarch64/idctdsp_init_aarch64.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/aarch64/idctdsp_init_aarch64.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/aarch64/idctdsp_init_aarch64.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/aarch64/mdct_neon.S b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/aarch64/mdct_neon.S
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/aarch64/mdct_neon.S
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/aarch64/mdct_neon.S
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/aarch64/mpegaudiodsp_init.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/aarch64/mpegaudiodsp_init.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/aarch64/mpegaudiodsp_init.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/aarch64/mpegaudiodsp_init.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/aarch64/mpegaudiodsp_neon.S b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/aarch64/mpegaudiodsp_neon.S
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/aarch64/mpegaudiodsp_neon.S
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/aarch64/mpegaudiodsp_neon.S
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/aarch64/neon.S b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/aarch64/neon.S
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/aarch64/neon.S
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/aarch64/neon.S
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/aarch64/neontest.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/aarch64/neontest.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/aarch64/neontest.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/aarch64/neontest.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/aarch64/rv40dsp_init_aarch64.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/aarch64/rv40dsp_init_aarch64.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/aarch64/rv40dsp_init_aarch64.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/aarch64/rv40dsp_init_aarch64.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/aarch64/sbrdsp_init_aarch64.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/aarch64/sbrdsp_init_aarch64.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/aarch64/sbrdsp_init_aarch64.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/aarch64/sbrdsp_init_aarch64.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/aarch64/sbrdsp_neon.S b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/aarch64/sbrdsp_neon.S
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/aarch64/sbrdsp_neon.S
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/aarch64/sbrdsp_neon.S
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/aarch64/simple_idct_neon.S b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/aarch64/simple_idct_neon.S
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/aarch64/simple_idct_neon.S
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/aarch64/simple_idct_neon.S
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/aarch64/synth_filter_init.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/aarch64/synth_filter_init.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/aarch64/synth_filter_init.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/aarch64/synth_filter_init.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/aarch64/synth_filter_neon.S b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/aarch64/synth_filter_neon.S
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/aarch64/synth_filter_neon.S
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/aarch64/synth_filter_neon.S
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/aarch64/vc1dsp_init_aarch64.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/aarch64/vc1dsp_init_aarch64.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/aarch64/vc1dsp_init_aarch64.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/aarch64/vc1dsp_init_aarch64.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/aarch64/videodsp.S b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/aarch64/videodsp.S
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/aarch64/videodsp.S
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/aarch64/videodsp.S
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/aarch64/videodsp_init.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/aarch64/videodsp_init.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/aarch64/videodsp_init.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/aarch64/videodsp_init.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/aarch64/vorbisdsp_init.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/aarch64/vorbisdsp_init.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/aarch64/vorbisdsp_init.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/aarch64/vorbisdsp_init.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/aarch64/vorbisdsp_neon.S b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/aarch64/vorbisdsp_neon.S
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/aarch64/vorbisdsp_neon.S
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/aarch64/vorbisdsp_neon.S
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/aarch64/vp9dsp_init.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/aarch64/vp9dsp_init.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/aarch64/vp9dsp_init.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/aarch64/vp9dsp_init.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/aarch64/vp9dsp_init_10bpp_aarch64.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/aarch64/vp9dsp_init_10bpp_aarch64.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/aarch64/vp9dsp_init_10bpp_aarch64.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/aarch64/vp9dsp_init_10bpp_aarch64.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/aarch64/vp9dsp_init_12bpp_aarch64.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/aarch64/vp9dsp_init_12bpp_aarch64.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/aarch64/vp9dsp_init_12bpp_aarch64.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/aarch64/vp9dsp_init_12bpp_aarch64.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/aarch64/vp9dsp_init_16bpp_aarch64_template.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/aarch64/vp9dsp_init_16bpp_aarch64_template.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/aarch64/vp9dsp_init_16bpp_aarch64_template.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/aarch64/vp9dsp_init_16bpp_aarch64_template.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/aarch64/vp9dsp_init_aarch64.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/aarch64/vp9dsp_init_aarch64.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/aarch64/vp9dsp_init_aarch64.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/aarch64/vp9dsp_init_aarch64.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/aarch64/vp9itxfm_16bpp_neon.S b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/aarch64/vp9itxfm_16bpp_neon.S
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/aarch64/vp9itxfm_16bpp_neon.S
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/aarch64/vp9itxfm_16bpp_neon.S
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/aarch64/vp9itxfm_neon.S b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/aarch64/vp9itxfm_neon.S
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/aarch64/vp9itxfm_neon.S
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/aarch64/vp9itxfm_neon.S
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/aarch64/vp9lpf_16bpp_neon.S b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/aarch64/vp9lpf_16bpp_neon.S
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/aarch64/vp9lpf_16bpp_neon.S
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/aarch64/vp9lpf_16bpp_neon.S
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/aarch64/vp9lpf_neon.S b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/aarch64/vp9lpf_neon.S
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/aarch64/vp9lpf_neon.S
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/aarch64/vp9lpf_neon.S
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/aarch64/vp9mc_16bpp_neon.S b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/aarch64/vp9mc_16bpp_neon.S
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/aarch64/vp9mc_16bpp_neon.S
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/aarch64/vp9mc_16bpp_neon.S
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/aarch64/vp9mc_neon.S b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/aarch64/vp9mc_neon.S
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/aarch64/vp9mc_neon.S
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/aarch64/vp9mc_neon.S
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/aasc.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/aasc.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/aasc.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/aasc.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/ac3.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/ac3.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/ac3.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/ac3.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/ac3.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/ac3.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/ac3.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/ac3.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/ac3_parser.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/ac3_parser.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/ac3_parser.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/ac3_parser.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/ac3_parser.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/ac3_parser.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/ac3_parser.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/ac3_parser.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/ac3_parser_internal.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/ac3_parser_internal.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/ac3_parser_internal.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/ac3_parser_internal.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/ac3dec.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/ac3dec.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/ac3dec.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/ac3dec.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/ac3dec.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/ac3dec.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/ac3dec.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/ac3dec.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/ac3dec_data.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/ac3dec_data.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/ac3dec_data.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/ac3dec_data.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/ac3dec_data.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/ac3dec_data.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/ac3dec_data.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/ac3dec_data.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/ac3dec_fixed.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/ac3dec_fixed.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/ac3dec_fixed.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/ac3dec_fixed.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/ac3dec_float.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/ac3dec_float.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/ac3dec_float.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/ac3dec_float.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/ac3dsp.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/ac3dsp.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/ac3dsp.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/ac3dsp.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/ac3dsp.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/ac3dsp.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/ac3dsp.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/ac3dsp.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/ac3enc.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/ac3enc.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/ac3enc.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/ac3enc.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/ac3enc.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/ac3enc.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/ac3enc.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/ac3enc.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/ac3enc_fixed.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/ac3enc_fixed.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/ac3enc_fixed.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/ac3enc_fixed.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/ac3enc_float.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/ac3enc_float.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/ac3enc_float.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/ac3enc_float.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/ac3enc_opts_template.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/ac3enc_opts_template.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/ac3enc_opts_template.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/ac3enc_opts_template.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/ac3enc_template.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/ac3enc_template.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/ac3enc_template.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/ac3enc_template.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/ac3tab.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/ac3tab.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/ac3tab.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/ac3tab.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/ac3tab.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/ac3tab.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/ac3tab.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/ac3tab.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/acelp_filters.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/acelp_filters.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/acelp_filters.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/acelp_filters.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/acelp_filters.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/acelp_filters.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/acelp_filters.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/acelp_filters.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/acelp_pitch_delay.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/acelp_pitch_delay.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/acelp_pitch_delay.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/acelp_pitch_delay.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/acelp_pitch_delay.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/acelp_pitch_delay.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/acelp_pitch_delay.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/acelp_pitch_delay.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/acelp_vectors.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/acelp_vectors.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/acelp_vectors.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/acelp_vectors.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/acelp_vectors.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/acelp_vectors.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/acelp_vectors.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/acelp_vectors.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/adpcm.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/adpcm.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/adpcm.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/adpcm.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/adpcm.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/adpcm.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/adpcm.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/adpcm.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/adpcm_data.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/adpcm_data.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/adpcm_data.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/adpcm_data.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/adpcm_data.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/adpcm_data.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/adpcm_data.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/adpcm_data.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/adpcmenc.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/adpcmenc.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/adpcmenc.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/adpcmenc.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/adts_header.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/adts_header.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/adts_header.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/adts_header.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/adts_header.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/adts_header.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/adts_header.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/adts_header.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/adts_parser.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/adts_parser.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/adts_parser.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/adts_parser.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/adts_parser.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/adts_parser.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/adts_parser.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/adts_parser.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/adx.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/adx.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/adx.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/adx.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/adx.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/adx.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/adx.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/adx.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/adx_parser.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/adx_parser.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/adx_parser.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/adx_parser.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/adxdec.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/adxdec.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/adxdec.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/adxdec.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/adxenc.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/adxenc.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/adxenc.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/adxenc.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/aic.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/aic.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/aic.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/aic.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/alac.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/alac.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/alac.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/alac.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/alac_data.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/alac_data.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/alac_data.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/alac_data.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/alac_data.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/alac_data.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/alac_data.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/alac_data.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/alacdsp.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/alacdsp.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/alacdsp.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/alacdsp.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/alacdsp.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/alacdsp.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/alacdsp.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/alacdsp.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/alacenc.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/alacenc.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/alacenc.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/alacenc.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/aliaspixdec.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/aliaspixdec.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/aliaspixdec.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/aliaspixdec.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/aliaspixenc.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/aliaspixenc.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/aliaspixenc.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/aliaspixenc.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/allcodecs.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/allcodecs.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/allcodecs.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/allcodecs.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/alpha/Makefile b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/alpha/Makefile
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/alpha/Makefile
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/alpha/Makefile
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/alpha/asm.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/alpha/asm.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/alpha/asm.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/alpha/asm.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/alpha/blockdsp_alpha.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/alpha/blockdsp_alpha.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/alpha/blockdsp_alpha.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/alpha/blockdsp_alpha.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/alpha/hpeldsp_alpha.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/alpha/hpeldsp_alpha.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/alpha/hpeldsp_alpha.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/alpha/hpeldsp_alpha.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/alpha/hpeldsp_alpha.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/alpha/hpeldsp_alpha.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/alpha/hpeldsp_alpha.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/alpha/hpeldsp_alpha.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/alpha/hpeldsp_alpha_asm.S b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/alpha/hpeldsp_alpha_asm.S
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/alpha/hpeldsp_alpha_asm.S
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/alpha/hpeldsp_alpha_asm.S
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/alpha/idctdsp_alpha.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/alpha/idctdsp_alpha.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/alpha/idctdsp_alpha.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/alpha/idctdsp_alpha.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/alpha/idctdsp_alpha.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/alpha/idctdsp_alpha.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/alpha/idctdsp_alpha.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/alpha/idctdsp_alpha.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/alpha/idctdsp_alpha_asm.S b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/alpha/idctdsp_alpha_asm.S
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/alpha/idctdsp_alpha_asm.S
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/alpha/idctdsp_alpha_asm.S
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/alpha/me_cmp_alpha.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/alpha/me_cmp_alpha.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/alpha/me_cmp_alpha.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/alpha/me_cmp_alpha.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/alpha/me_cmp_mvi_asm.S b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/alpha/me_cmp_mvi_asm.S
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/alpha/me_cmp_mvi_asm.S
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/alpha/me_cmp_mvi_asm.S
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/alpha/mpegvideo_alpha.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/alpha/mpegvideo_alpha.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/alpha/mpegvideo_alpha.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/alpha/mpegvideo_alpha.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/alpha/pixblockdsp_alpha.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/alpha/pixblockdsp_alpha.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/alpha/pixblockdsp_alpha.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/alpha/pixblockdsp_alpha.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/alpha/regdef.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/alpha/regdef.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/alpha/regdef.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/alpha/regdef.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/alpha/simple_idct_alpha.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/alpha/simple_idct_alpha.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/alpha/simple_idct_alpha.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/alpha/simple_idct_alpha.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/alsdec.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/alsdec.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/alsdec.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/alsdec.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/amfenc.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/amfenc.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/amfenc.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/amfenc.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/amfenc.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/amfenc.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/amfenc.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/amfenc.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/amfenc_h264.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/amfenc_h264.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/amfenc_h264.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/amfenc_h264.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/amfenc_hevc.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/amfenc_hevc.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/amfenc_hevc.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/amfenc_hevc.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/amr.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/amr.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/amr.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/amr.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/amrnbdata.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/amrnbdata.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/amrnbdata.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/amrnbdata.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/amrnbdec.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/amrnbdec.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/amrnbdec.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/amrnbdec.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/amrwbdata.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/amrwbdata.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/amrwbdata.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/amrwbdata.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/amrwbdec.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/amrwbdec.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/amrwbdec.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/amrwbdec.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/anm.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/anm.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/anm.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/anm.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/ansi.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/ansi.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/ansi.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/ansi.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/apedec.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/apedec.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/apedec.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/apedec.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/apng.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/apng.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/apng.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/apng.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/aptx.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/aptx.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/aptx.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/aptx.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/arm/Makefile b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/arm/Makefile
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/arm/Makefile
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/arm/Makefile
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/arm/aac.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/arm/aac.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/arm/aac.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/arm/aac.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/arm/aacpsdsp_init_arm.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/arm/aacpsdsp_init_arm.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/arm/aacpsdsp_init_arm.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/arm/aacpsdsp_init_arm.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/arm/aacpsdsp_neon.S b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/arm/aacpsdsp_neon.S
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/arm/aacpsdsp_neon.S
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/arm/aacpsdsp_neon.S
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/arm/ac3dsp_arm.S b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/arm/ac3dsp_arm.S
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/arm/ac3dsp_arm.S
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/arm/ac3dsp_arm.S
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/arm/ac3dsp_armv6.S b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/arm/ac3dsp_armv6.S
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/arm/ac3dsp_armv6.S
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/arm/ac3dsp_armv6.S
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/arm/ac3dsp_init_arm.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/arm/ac3dsp_init_arm.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/arm/ac3dsp_init_arm.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/arm/ac3dsp_init_arm.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/arm/ac3dsp_neon.S b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/arm/ac3dsp_neon.S
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/arm/ac3dsp_neon.S
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/arm/ac3dsp_neon.S
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/arm/asm-offsets.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/arm/asm-offsets.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/arm/asm-offsets.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/arm/asm-offsets.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/arm/audiodsp_arm.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/arm/audiodsp_arm.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/arm/audiodsp_arm.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/arm/audiodsp_arm.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/arm/audiodsp_init_arm.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/arm/audiodsp_init_arm.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/arm/audiodsp_init_arm.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/arm/audiodsp_init_arm.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/arm/audiodsp_init_neon.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/arm/audiodsp_init_neon.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/arm/audiodsp_init_neon.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/arm/audiodsp_init_neon.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/arm/audiodsp_neon.S b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/arm/audiodsp_neon.S
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/arm/audiodsp_neon.S
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/arm/audiodsp_neon.S
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/arm/blockdsp_arm.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/arm/blockdsp_arm.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/arm/blockdsp_arm.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/arm/blockdsp_arm.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/arm/blockdsp_init_arm.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/arm/blockdsp_init_arm.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/arm/blockdsp_init_arm.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/arm/blockdsp_init_arm.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/arm/blockdsp_init_neon.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/arm/blockdsp_init_neon.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/arm/blockdsp_init_neon.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/arm/blockdsp_init_neon.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/arm/blockdsp_neon.S b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/arm/blockdsp_neon.S
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/arm/blockdsp_neon.S
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/arm/blockdsp_neon.S
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/arm/cabac.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/arm/cabac.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/arm/cabac.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/arm/cabac.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/arm/dca.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/arm/dca.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/arm/dca.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/arm/dca.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/arm/fft_fixed_init_arm.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/arm/fft_fixed_init_arm.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/arm/fft_fixed_init_arm.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/arm/fft_fixed_init_arm.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/arm/fft_fixed_neon.S b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/arm/fft_fixed_neon.S
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/arm/fft_fixed_neon.S
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/arm/fft_fixed_neon.S
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/arm/fft_init_arm.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/arm/fft_init_arm.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/arm/fft_init_arm.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/arm/fft_init_arm.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/arm/fft_neon.S b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/arm/fft_neon.S
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/arm/fft_neon.S
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/arm/fft_neon.S
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/arm/fft_vfp.S b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/arm/fft_vfp.S
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/arm/fft_vfp.S
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/arm/fft_vfp.S
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/arm/flacdsp_arm.S b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/arm/flacdsp_arm.S
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/arm/flacdsp_arm.S
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/arm/flacdsp_arm.S
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/arm/flacdsp_init_arm.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/arm/flacdsp_init_arm.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/arm/flacdsp_init_arm.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/arm/flacdsp_init_arm.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/arm/fmtconvert_init_arm.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/arm/fmtconvert_init_arm.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/arm/fmtconvert_init_arm.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/arm/fmtconvert_init_arm.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/arm/fmtconvert_neon.S b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/arm/fmtconvert_neon.S
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/arm/fmtconvert_neon.S
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/arm/fmtconvert_neon.S
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/arm/fmtconvert_vfp.S b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/arm/fmtconvert_vfp.S
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/arm/fmtconvert_vfp.S
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/arm/fmtconvert_vfp.S
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/arm/g722dsp_init_arm.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/arm/g722dsp_init_arm.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/arm/g722dsp_init_arm.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/arm/g722dsp_init_arm.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/arm/g722dsp_neon.S b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/arm/g722dsp_neon.S
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/arm/g722dsp_neon.S
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/arm/g722dsp_neon.S
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/arm/h264chroma_init_arm.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/arm/h264chroma_init_arm.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/arm/h264chroma_init_arm.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/arm/h264chroma_init_arm.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/arm/h264cmc_neon.S b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/arm/h264cmc_neon.S
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/arm/h264cmc_neon.S
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/arm/h264cmc_neon.S
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/arm/h264dsp_init_arm.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/arm/h264dsp_init_arm.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/arm/h264dsp_init_arm.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/arm/h264dsp_init_arm.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/arm/h264dsp_neon.S b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/arm/h264dsp_neon.S
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/arm/h264dsp_neon.S
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/arm/h264dsp_neon.S
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/arm/h264idct_neon.S b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/arm/h264idct_neon.S
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/arm/h264idct_neon.S
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/arm/h264idct_neon.S
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/arm/h264pred_init_arm.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/arm/h264pred_init_arm.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/arm/h264pred_init_arm.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/arm/h264pred_init_arm.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/arm/h264pred_neon.S b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/arm/h264pred_neon.S
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/arm/h264pred_neon.S
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/arm/h264pred_neon.S
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/arm/h264qpel_init_arm.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/arm/h264qpel_init_arm.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/arm/h264qpel_init_arm.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/arm/h264qpel_init_arm.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/arm/h264qpel_neon.S b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/arm/h264qpel_neon.S
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/arm/h264qpel_neon.S
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/arm/h264qpel_neon.S
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/arm/hevcdsp_arm.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/arm/hevcdsp_arm.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/arm/hevcdsp_arm.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/arm/hevcdsp_arm.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/arm/hevcdsp_deblock_neon.S b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/arm/hevcdsp_deblock_neon.S
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/arm/hevcdsp_deblock_neon.S
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/arm/hevcdsp_deblock_neon.S
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/arm/hevcdsp_idct_neon.S b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/arm/hevcdsp_idct_neon.S
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/arm/hevcdsp_idct_neon.S
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/arm/hevcdsp_idct_neon.S
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/arm/hevcdsp_init_arm.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/arm/hevcdsp_init_arm.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/arm/hevcdsp_init_arm.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/arm/hevcdsp_init_arm.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/arm/hevcdsp_init_neon.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/arm/hevcdsp_init_neon.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/arm/hevcdsp_init_neon.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/arm/hevcdsp_init_neon.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/arm/hevcdsp_qpel_neon.S b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/arm/hevcdsp_qpel_neon.S
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/arm/hevcdsp_qpel_neon.S
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/arm/hevcdsp_qpel_neon.S
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/arm/hevcdsp_sao_neon.S b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/arm/hevcdsp_sao_neon.S
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/arm/hevcdsp_sao_neon.S
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/arm/hevcdsp_sao_neon.S
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/arm/hpeldsp_arm.S b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/arm/hpeldsp_arm.S
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/arm/hpeldsp_arm.S
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/arm/hpeldsp_arm.S
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/arm/hpeldsp_arm.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/arm/hpeldsp_arm.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/arm/hpeldsp_arm.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/arm/hpeldsp_arm.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/arm/hpeldsp_armv6.S b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/arm/hpeldsp_armv6.S
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/arm/hpeldsp_armv6.S
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/arm/hpeldsp_armv6.S
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/arm/hpeldsp_init_arm.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/arm/hpeldsp_init_arm.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/arm/hpeldsp_init_arm.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/arm/hpeldsp_init_arm.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/arm/hpeldsp_init_armv6.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/arm/hpeldsp_init_armv6.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/arm/hpeldsp_init_armv6.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/arm/hpeldsp_init_armv6.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/arm/hpeldsp_init_neon.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/arm/hpeldsp_init_neon.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/arm/hpeldsp_init_neon.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/arm/hpeldsp_init_neon.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/arm/hpeldsp_neon.S b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/arm/hpeldsp_neon.S
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/arm/hpeldsp_neon.S
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/arm/hpeldsp_neon.S
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/arm/idct.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/arm/idct.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/arm/idct.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/arm/idct.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/arm/idctdsp_arm.S b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/arm/idctdsp_arm.S
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/arm/idctdsp_arm.S
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/arm/idctdsp_arm.S
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/arm/idctdsp_arm.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/arm/idctdsp_arm.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/arm/idctdsp_arm.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/arm/idctdsp_arm.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/arm/idctdsp_armv6.S b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/arm/idctdsp_armv6.S
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/arm/idctdsp_armv6.S
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/arm/idctdsp_armv6.S
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/arm/idctdsp_init_arm.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/arm/idctdsp_init_arm.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/arm/idctdsp_init_arm.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/arm/idctdsp_init_arm.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/arm/idctdsp_init_armv5te.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/arm/idctdsp_init_armv5te.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/arm/idctdsp_init_armv5te.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/arm/idctdsp_init_armv5te.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/arm/idctdsp_init_armv6.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/arm/idctdsp_init_armv6.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/arm/idctdsp_init_armv6.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/arm/idctdsp_init_armv6.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/arm/idctdsp_init_neon.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/arm/idctdsp_init_neon.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/arm/idctdsp_init_neon.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/arm/idctdsp_init_neon.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/arm/idctdsp_neon.S b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/arm/idctdsp_neon.S
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/arm/idctdsp_neon.S
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/arm/idctdsp_neon.S
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/arm/int_neon.S b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/arm/int_neon.S
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/arm/int_neon.S
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/arm/int_neon.S
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/arm/jrevdct_arm.S b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/arm/jrevdct_arm.S
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/arm/jrevdct_arm.S
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/arm/jrevdct_arm.S
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/arm/lossless_audiodsp_init_arm.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/arm/lossless_audiodsp_init_arm.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/arm/lossless_audiodsp_init_arm.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/arm/lossless_audiodsp_init_arm.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/arm/lossless_audiodsp_neon.S b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/arm/lossless_audiodsp_neon.S
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/arm/lossless_audiodsp_neon.S
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/arm/lossless_audiodsp_neon.S
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/arm/mathops.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/arm/mathops.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/arm/mathops.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/arm/mathops.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/arm/mdct_fixed_neon.S b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/arm/mdct_fixed_neon.S
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/arm/mdct_fixed_neon.S
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/arm/mdct_fixed_neon.S
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/arm/mdct_neon.S b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/arm/mdct_neon.S
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/arm/mdct_neon.S
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/arm/mdct_neon.S
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/arm/mdct_vfp.S b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/arm/mdct_vfp.S
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/arm/mdct_vfp.S
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/arm/mdct_vfp.S
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/arm/me_cmp_armv6.S b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/arm/me_cmp_armv6.S
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/arm/me_cmp_armv6.S
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/arm/me_cmp_armv6.S
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/arm/me_cmp_init_arm.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/arm/me_cmp_init_arm.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/arm/me_cmp_init_arm.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/arm/me_cmp_init_arm.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/arm/mlpdsp_armv5te.S b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/arm/mlpdsp_armv5te.S
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/arm/mlpdsp_armv5te.S
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/arm/mlpdsp_armv5te.S
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/arm/mlpdsp_armv6.S b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/arm/mlpdsp_armv6.S
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/arm/mlpdsp_armv6.S
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/arm/mlpdsp_armv6.S
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/arm/mlpdsp_init_arm.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/arm/mlpdsp_init_arm.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/arm/mlpdsp_init_arm.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/arm/mlpdsp_init_arm.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/arm/mpegaudiodsp_fixed_armv6.S b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/arm/mpegaudiodsp_fixed_armv6.S
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/arm/mpegaudiodsp_fixed_armv6.S
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/arm/mpegaudiodsp_fixed_armv6.S
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/arm/mpegaudiodsp_init_arm.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/arm/mpegaudiodsp_init_arm.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/arm/mpegaudiodsp_init_arm.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/arm/mpegaudiodsp_init_arm.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/arm/mpegvideo_arm.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/arm/mpegvideo_arm.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/arm/mpegvideo_arm.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/arm/mpegvideo_arm.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/arm/mpegvideo_arm.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/arm/mpegvideo_arm.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/arm/mpegvideo_arm.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/arm/mpegvideo_arm.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/arm/mpegvideo_armv5te.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/arm/mpegvideo_armv5te.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/arm/mpegvideo_armv5te.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/arm/mpegvideo_armv5te.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/arm/mpegvideo_armv5te_s.S b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/arm/mpegvideo_armv5te_s.S
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/arm/mpegvideo_armv5te_s.S
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/arm/mpegvideo_armv5te_s.S
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/arm/mpegvideo_neon.S b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/arm/mpegvideo_neon.S
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/arm/mpegvideo_neon.S
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/arm/mpegvideo_neon.S
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/arm/mpegvideoencdsp_armv6.S b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/arm/mpegvideoencdsp_armv6.S
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/arm/mpegvideoencdsp_armv6.S
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/arm/mpegvideoencdsp_armv6.S
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/arm/mpegvideoencdsp_init_arm.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/arm/mpegvideoencdsp_init_arm.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/arm/mpegvideoencdsp_init_arm.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/arm/mpegvideoencdsp_init_arm.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/arm/neon.S b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/arm/neon.S
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/arm/neon.S
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/arm/neon.S
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/arm/neontest.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/arm/neontest.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/arm/neontest.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/arm/neontest.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/arm/pixblockdsp_armv6.S b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/arm/pixblockdsp_armv6.S
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/arm/pixblockdsp_armv6.S
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/arm/pixblockdsp_armv6.S
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/arm/pixblockdsp_init_arm.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/arm/pixblockdsp_init_arm.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/arm/pixblockdsp_init_arm.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/arm/pixblockdsp_init_arm.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/arm/rdft_init_arm.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/arm/rdft_init_arm.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/arm/rdft_init_arm.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/arm/rdft_init_arm.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/arm/rdft_neon.S b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/arm/rdft_neon.S
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/arm/rdft_neon.S
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/arm/rdft_neon.S
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/arm/rv34dsp_init_arm.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/arm/rv34dsp_init_arm.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/arm/rv34dsp_init_arm.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/arm/rv34dsp_init_arm.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/arm/rv34dsp_neon.S b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/arm/rv34dsp_neon.S
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/arm/rv34dsp_neon.S
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/arm/rv34dsp_neon.S
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/arm/rv40dsp_init_arm.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/arm/rv40dsp_init_arm.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/arm/rv40dsp_init_arm.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/arm/rv40dsp_init_arm.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/arm/rv40dsp_neon.S b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/arm/rv40dsp_neon.S
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/arm/rv40dsp_neon.S
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/arm/rv40dsp_neon.S
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/arm/sbcdsp_armv6.S b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/arm/sbcdsp_armv6.S
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/arm/sbcdsp_armv6.S
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/arm/sbcdsp_armv6.S
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/arm/sbcdsp_init_arm.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/arm/sbcdsp_init_arm.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/arm/sbcdsp_init_arm.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/arm/sbcdsp_init_arm.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/arm/sbcdsp_neon.S b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/arm/sbcdsp_neon.S
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/arm/sbcdsp_neon.S
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/arm/sbcdsp_neon.S
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/arm/sbrdsp_init_arm.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/arm/sbrdsp_init_arm.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/arm/sbrdsp_init_arm.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/arm/sbrdsp_init_arm.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/arm/sbrdsp_neon.S b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/arm/sbrdsp_neon.S
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/arm/sbrdsp_neon.S
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/arm/sbrdsp_neon.S
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/arm/simple_idct_arm.S b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/arm/simple_idct_arm.S
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/arm/simple_idct_arm.S
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/arm/simple_idct_arm.S
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/arm/simple_idct_armv5te.S b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/arm/simple_idct_armv5te.S
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/arm/simple_idct_armv5te.S
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/arm/simple_idct_armv5te.S
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/arm/simple_idct_armv6.S b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/arm/simple_idct_armv6.S
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/arm/simple_idct_armv6.S
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/arm/simple_idct_armv6.S
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/arm/simple_idct_neon.S b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/arm/simple_idct_neon.S
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/arm/simple_idct_neon.S
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/arm/simple_idct_neon.S
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/arm/startcode.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/arm/startcode.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/arm/startcode.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/arm/startcode.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/arm/startcode_armv6.S b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/arm/startcode_armv6.S
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/arm/startcode_armv6.S
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/arm/startcode_armv6.S
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/arm/synth_filter_init_arm.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/arm/synth_filter_init_arm.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/arm/synth_filter_init_arm.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/arm/synth_filter_init_arm.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/arm/synth_filter_neon.S b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/arm/synth_filter_neon.S
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/arm/synth_filter_neon.S
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/arm/synth_filter_neon.S
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/arm/synth_filter_vfp.S b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/arm/synth_filter_vfp.S
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/arm/synth_filter_vfp.S
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/arm/synth_filter_vfp.S
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/arm/vc1dsp.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/arm/vc1dsp.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/arm/vc1dsp.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/arm/vc1dsp.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/arm/vc1dsp_init_arm.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/arm/vc1dsp_init_arm.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/arm/vc1dsp_init_arm.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/arm/vc1dsp_init_arm.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/arm/vc1dsp_init_neon.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/arm/vc1dsp_init_neon.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/arm/vc1dsp_init_neon.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/arm/vc1dsp_init_neon.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/arm/vc1dsp_neon.S b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/arm/vc1dsp_neon.S
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/arm/vc1dsp_neon.S
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/arm/vc1dsp_neon.S
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/arm/videodsp_arm.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/arm/videodsp_arm.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/arm/videodsp_arm.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/arm/videodsp_arm.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/arm/videodsp_armv5te.S b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/arm/videodsp_armv5te.S
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/arm/videodsp_armv5te.S
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/arm/videodsp_armv5te.S
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/arm/videodsp_init_arm.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/arm/videodsp_init_arm.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/arm/videodsp_init_arm.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/arm/videodsp_init_arm.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/arm/videodsp_init_armv5te.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/arm/videodsp_init_armv5te.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/arm/videodsp_init_armv5te.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/arm/videodsp_init_armv5te.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/arm/vorbisdsp_init_arm.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/arm/vorbisdsp_init_arm.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/arm/vorbisdsp_init_arm.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/arm/vorbisdsp_init_arm.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/arm/vorbisdsp_neon.S b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/arm/vorbisdsp_neon.S
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/arm/vorbisdsp_neon.S
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/arm/vorbisdsp_neon.S
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/arm/vp3dsp_init_arm.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/arm/vp3dsp_init_arm.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/arm/vp3dsp_init_arm.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/arm/vp3dsp_init_arm.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/arm/vp3dsp_neon.S b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/arm/vp3dsp_neon.S
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/arm/vp3dsp_neon.S
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/arm/vp3dsp_neon.S
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/arm/vp56_arith.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/arm/vp56_arith.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/arm/vp56_arith.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/arm/vp56_arith.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/arm/vp6dsp_init_arm.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/arm/vp6dsp_init_arm.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/arm/vp6dsp_init_arm.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/arm/vp6dsp_init_arm.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/arm/vp6dsp_neon.S b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/arm/vp6dsp_neon.S
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/arm/vp6dsp_neon.S
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/arm/vp6dsp_neon.S
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/arm/vp8.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/arm/vp8.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/arm/vp8.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/arm/vp8.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/arm/vp8_armv6.S b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/arm/vp8_armv6.S
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/arm/vp8_armv6.S
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/arm/vp8_armv6.S
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/arm/vp8dsp.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/arm/vp8dsp.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/arm/vp8dsp.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/arm/vp8dsp.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/arm/vp8dsp_armv6.S b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/arm/vp8dsp_armv6.S
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/arm/vp8dsp_armv6.S
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/arm/vp8dsp_armv6.S
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/arm/vp8dsp_init_arm.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/arm/vp8dsp_init_arm.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/arm/vp8dsp_init_arm.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/arm/vp8dsp_init_arm.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/arm/vp8dsp_init_armv6.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/arm/vp8dsp_init_armv6.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/arm/vp8dsp_init_armv6.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/arm/vp8dsp_init_armv6.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/arm/vp8dsp_init_neon.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/arm/vp8dsp_init_neon.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/arm/vp8dsp_init_neon.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/arm/vp8dsp_init_neon.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/arm/vp8dsp_neon.S b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/arm/vp8dsp_neon.S
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/arm/vp8dsp_neon.S
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/arm/vp8dsp_neon.S
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/arm/vp9dsp_init.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/arm/vp9dsp_init.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/arm/vp9dsp_init.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/arm/vp9dsp_init.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/arm/vp9dsp_init_10bpp_arm.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/arm/vp9dsp_init_10bpp_arm.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/arm/vp9dsp_init_10bpp_arm.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/arm/vp9dsp_init_10bpp_arm.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/arm/vp9dsp_init_12bpp_arm.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/arm/vp9dsp_init_12bpp_arm.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/arm/vp9dsp_init_12bpp_arm.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/arm/vp9dsp_init_12bpp_arm.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/arm/vp9dsp_init_16bpp_arm_template.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/arm/vp9dsp_init_16bpp_arm_template.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/arm/vp9dsp_init_16bpp_arm_template.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/arm/vp9dsp_init_16bpp_arm_template.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/arm/vp9dsp_init_arm.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/arm/vp9dsp_init_arm.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/arm/vp9dsp_init_arm.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/arm/vp9dsp_init_arm.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/arm/vp9itxfm_16bpp_neon.S b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/arm/vp9itxfm_16bpp_neon.S
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/arm/vp9itxfm_16bpp_neon.S
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/arm/vp9itxfm_16bpp_neon.S
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/arm/vp9itxfm_neon.S b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/arm/vp9itxfm_neon.S
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/arm/vp9itxfm_neon.S
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/arm/vp9itxfm_neon.S
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/arm/vp9lpf_16bpp_neon.S b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/arm/vp9lpf_16bpp_neon.S
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/arm/vp9lpf_16bpp_neon.S
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/arm/vp9lpf_16bpp_neon.S
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/arm/vp9lpf_neon.S b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/arm/vp9lpf_neon.S
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/arm/vp9lpf_neon.S
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/arm/vp9lpf_neon.S
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/arm/vp9mc_16bpp_neon.S b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/arm/vp9mc_16bpp_neon.S
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/arm/vp9mc_16bpp_neon.S
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/arm/vp9mc_16bpp_neon.S
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/arm/vp9mc_neon.S b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/arm/vp9mc_neon.S
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/arm/vp9mc_neon.S
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/arm/vp9mc_neon.S
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/ass.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/ass.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/ass.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/ass.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/ass.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/ass.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/ass.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/ass.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/ass_split.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/ass_split.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/ass_split.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/ass_split.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/ass_split.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/ass_split.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/ass_split.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/ass_split.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/assdec.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/assdec.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/assdec.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/assdec.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/assenc.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/assenc.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/assenc.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/assenc.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/asv.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/asv.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/asv.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/asv.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/asv.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/asv.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/asv.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/asv.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/asvdec.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/asvdec.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/asvdec.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/asvdec.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/asvenc.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/asvenc.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/asvenc.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/asvenc.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/atrac.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/atrac.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/atrac.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/atrac.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/atrac.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/atrac.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/atrac.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/atrac.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/atrac1.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/atrac1.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/atrac1.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/atrac1.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/atrac1data.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/atrac1data.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/atrac1data.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/atrac1data.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/atrac3.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/atrac3.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/atrac3.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/atrac3.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/atrac3data.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/atrac3data.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/atrac3data.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/atrac3data.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/atrac3plus.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/atrac3plus.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/atrac3plus.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/atrac3plus.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/atrac3plus.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/atrac3plus.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/atrac3plus.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/atrac3plus.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/atrac3plus_data.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/atrac3plus_data.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/atrac3plus_data.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/atrac3plus_data.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/atrac3plusdec.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/atrac3plusdec.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/atrac3plusdec.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/atrac3plusdec.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/atrac3plusdsp.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/atrac3plusdsp.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/atrac3plusdsp.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/atrac3plusdsp.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/atrac9dec.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/atrac9dec.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/atrac9dec.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/atrac9dec.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/atrac9tab.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/atrac9tab.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/atrac9tab.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/atrac9tab.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/audio_frame_queue.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/audio_frame_queue.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/audio_frame_queue.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/audio_frame_queue.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/audio_frame_queue.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/audio_frame_queue.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/audio_frame_queue.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/audio_frame_queue.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/audiodsp.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/audiodsp.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/audiodsp.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/audiodsp.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/audiodsp.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/audiodsp.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/audiodsp.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/audiodsp.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/audiotoolboxdec.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/audiotoolboxdec.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/audiotoolboxdec.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/audiotoolboxdec.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/audiotoolboxenc.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/audiotoolboxenc.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/audiotoolboxenc.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/audiotoolboxenc.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/aura.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/aura.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/aura.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/aura.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/av1.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/av1.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/av1.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/av1.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/av1_metadata_bsf.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/av1_metadata_bsf.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/av1_metadata_bsf.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/av1_metadata_bsf.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/av1_parse.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/av1_parse.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/av1_parse.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/av1_parse.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/av1_parse.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/av1_parse.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/av1_parse.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/av1_parse.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/av1_parser.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/av1_parser.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/av1_parser.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/av1_parser.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/avcodec.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/avcodec.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/avcodec.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/avcodec.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/avcodecres.rc b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/avcodecres.rc
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/avcodecres.rc
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/avcodecres.rc
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/avdct.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/avdct.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/avdct.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/avdct.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/avdct.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/avdct.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/avdct.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/avdct.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/avfft.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/avfft.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/avfft.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/avfft.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/avfft.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/avfft.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/avfft.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/avfft.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/avpacket.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/avpacket.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/avpacket.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/avpacket.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/avpicture.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/avpicture.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/avpicture.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/avpicture.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/avr32/mathops.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/avr32/mathops.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/avr32/mathops.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/avr32/mathops.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/avrndec.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/avrndec.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/avrndec.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/avrndec.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/avs.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/avs.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/avs.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/avs.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/avs2_parser.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/avs2_parser.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/avs2_parser.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/avs2_parser.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/avuidec.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/avuidec.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/avuidec.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/avuidec.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/avuienc.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/avuienc.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/avuienc.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/avuienc.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/bethsoftvideo.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/bethsoftvideo.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/bethsoftvideo.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/bethsoftvideo.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/bethsoftvideo.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/bethsoftvideo.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/bethsoftvideo.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/bethsoftvideo.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/bfi.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/bfi.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/bfi.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/bfi.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/bfin/README b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/bfin/README
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/bfin/README
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/bfin/README
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/bgmc.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/bgmc.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/bgmc.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/bgmc.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/bgmc.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/bgmc.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/bgmc.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/bgmc.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/bink.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/bink.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/bink.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/bink.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/binkaudio.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/binkaudio.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/binkaudio.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/binkaudio.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/binkdata.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/binkdata.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/binkdata.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/binkdata.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/binkdsp.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/binkdsp.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/binkdsp.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/binkdsp.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/binkdsp.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/binkdsp.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/binkdsp.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/binkdsp.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/bintext.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/bintext.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/bintext.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/bintext.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/bintext.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/bintext.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/bintext.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/bintext.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/bit_depth_template.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/bit_depth_template.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/bit_depth_template.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/bit_depth_template.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/bitpacked.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/bitpacked.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/bitpacked.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/bitpacked.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/bitstream.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/bitstream.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/bitstream.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/bitstream.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/bitstream_filter.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/bitstream_filter.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/bitstream_filter.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/bitstream_filter.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/bitstream_filters.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/bitstream_filters.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/bitstream_filters.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/bitstream_filters.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/blockdsp.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/blockdsp.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/blockdsp.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/blockdsp.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/blockdsp.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/blockdsp.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/blockdsp.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/blockdsp.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/bmp.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/bmp.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/bmp.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/bmp.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/bmp.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/bmp.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/bmp.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/bmp.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/bmp_parser.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/bmp_parser.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/bmp_parser.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/bmp_parser.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/bmpenc.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/bmpenc.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/bmpenc.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/bmpenc.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/bmvaudio.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/bmvaudio.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/bmvaudio.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/bmvaudio.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/bmvvideo.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/bmvvideo.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/bmvvideo.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/bmvvideo.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/brenderpix.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/brenderpix.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/brenderpix.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/brenderpix.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/bsf.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/bsf.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/bsf.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/bsf.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/bsf.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/bsf.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/bsf.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/bsf.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/bswapdsp.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/bswapdsp.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/bswapdsp.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/bswapdsp.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/bswapdsp.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/bswapdsp.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/bswapdsp.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/bswapdsp.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/bytestream.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/bytestream.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/bytestream.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/bytestream.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/c93.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/c93.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/c93.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/c93.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/cabac.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/cabac.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/cabac.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/cabac.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/cabac.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/cabac.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/cabac.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/cabac.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/cabac_functions.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/cabac_functions.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/cabac_functions.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/cabac_functions.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/canopus.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/canopus.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/canopus.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/canopus.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/canopus.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/canopus.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/canopus.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/canopus.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/cavs.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/cavs.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/cavs.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/cavs.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/cavs.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/cavs.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/cavs.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/cavs.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/cavs_parser.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/cavs_parser.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/cavs_parser.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/cavs_parser.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/cavsdata.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/cavsdata.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/cavsdata.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/cavsdata.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/cavsdec.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/cavsdec.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/cavsdec.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/cavsdec.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/cavsdsp.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/cavsdsp.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/cavsdsp.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/cavsdsp.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/cavsdsp.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/cavsdsp.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/cavsdsp.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/cavsdsp.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/cbrt_data.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/cbrt_data.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/cbrt_data.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/cbrt_data.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/cbrt_data.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/cbrt_data.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/cbrt_data.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/cbrt_data.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/cbrt_data_fixed.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/cbrt_data_fixed.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/cbrt_data_fixed.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/cbrt_data_fixed.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/cbrt_fixed_tablegen.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/cbrt_fixed_tablegen.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/cbrt_fixed_tablegen.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/cbrt_fixed_tablegen.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/cbrt_tablegen.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/cbrt_tablegen.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/cbrt_tablegen.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/cbrt_tablegen.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/cbrt_tablegen.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/cbrt_tablegen.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/cbrt_tablegen.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/cbrt_tablegen.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/cbrt_tablegen_template.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/cbrt_tablegen_template.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/cbrt_tablegen_template.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/cbrt_tablegen_template.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/cbs.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/cbs.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/cbs.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/cbs.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/cbs.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/cbs.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/cbs.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/cbs.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/cbs_av1.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/cbs_av1.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/cbs_av1.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/cbs_av1.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/cbs_av1.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/cbs_av1.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/cbs_av1.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/cbs_av1.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/cbs_av1_syntax_template.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/cbs_av1_syntax_template.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/cbs_av1_syntax_template.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/cbs_av1_syntax_template.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/cbs_h264.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/cbs_h264.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/cbs_h264.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/cbs_h264.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/cbs_h2645.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/cbs_h2645.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/cbs_h2645.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/cbs_h2645.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/cbs_h2645.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/cbs_h2645.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/cbs_h2645.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/cbs_h2645.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/cbs_h264_syntax_template.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/cbs_h264_syntax_template.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/cbs_h264_syntax_template.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/cbs_h264_syntax_template.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/cbs_h265.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/cbs_h265.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/cbs_h265.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/cbs_h265.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/cbs_h265_syntax_template.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/cbs_h265_syntax_template.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/cbs_h265_syntax_template.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/cbs_h265_syntax_template.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/cbs_internal.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/cbs_internal.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/cbs_internal.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/cbs_internal.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/cbs_jpeg.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/cbs_jpeg.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/cbs_jpeg.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/cbs_jpeg.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/cbs_jpeg.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/cbs_jpeg.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/cbs_jpeg.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/cbs_jpeg.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/cbs_jpeg_syntax_template.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/cbs_jpeg_syntax_template.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/cbs_jpeg_syntax_template.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/cbs_jpeg_syntax_template.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/cbs_mpeg2.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/cbs_mpeg2.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/cbs_mpeg2.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/cbs_mpeg2.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/cbs_mpeg2.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/cbs_mpeg2.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/cbs_mpeg2.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/cbs_mpeg2.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/cbs_mpeg2_syntax_template.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/cbs_mpeg2_syntax_template.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/cbs_mpeg2_syntax_template.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/cbs_mpeg2_syntax_template.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/cbs_vp9.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/cbs_vp9.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/cbs_vp9.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/cbs_vp9.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/cbs_vp9.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/cbs_vp9.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/cbs_vp9.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/cbs_vp9.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/cbs_vp9_syntax_template.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/cbs_vp9_syntax_template.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/cbs_vp9_syntax_template.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/cbs_vp9_syntax_template.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/ccaption_dec.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/ccaption_dec.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/ccaption_dec.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/ccaption_dec.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/cdgraphics.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/cdgraphics.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/cdgraphics.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/cdgraphics.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/cdxl.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/cdxl.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/cdxl.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/cdxl.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/celp_filters.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/celp_filters.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/celp_filters.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/celp_filters.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/celp_filters.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/celp_filters.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/celp_filters.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/celp_filters.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/celp_math.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/celp_math.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/celp_math.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/celp_math.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/celp_math.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/celp_math.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/celp_math.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/celp_math.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/cfhd.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/cfhd.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/cfhd.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/cfhd.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/cfhd.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/cfhd.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/cfhd.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/cfhd.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/cfhddata.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/cfhddata.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/cfhddata.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/cfhddata.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/cga_data.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/cga_data.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/cga_data.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/cga_data.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/cga_data.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/cga_data.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/cga_data.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/cga_data.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/chomp_bsf.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/chomp_bsf.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/chomp_bsf.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/chomp_bsf.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/cinepak.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/cinepak.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/cinepak.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/cinepak.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/cinepakenc.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/cinepakenc.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/cinepakenc.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/cinepakenc.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/clearvideo.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/clearvideo.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/clearvideo.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/clearvideo.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/clearvideodata.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/clearvideodata.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/clearvideodata.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/clearvideodata.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/cljrdec.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/cljrdec.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/cljrdec.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/cljrdec.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/cljrenc.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/cljrenc.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/cljrenc.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/cljrenc.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/cllc.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/cllc.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/cllc.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/cllc.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/cngdec.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/cngdec.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/cngdec.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/cngdec.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/cngenc.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/cngenc.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/cngenc.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/cngenc.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/codec2utils.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/codec2utils.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/codec2utils.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/codec2utils.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/codec2utils.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/codec2utils.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/codec2utils.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/codec2utils.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/codec_desc.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/codec_desc.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/codec_desc.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/codec_desc.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/cook.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/cook.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/cook.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/cook.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/cook_parser.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/cook_parser.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/cook_parser.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/cook_parser.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/cookdata.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/cookdata.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/cookdata.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/cookdata.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/copy_block.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/copy_block.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/copy_block.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/copy_block.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/cos_tablegen.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/cos_tablegen.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/cos_tablegen.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/cos_tablegen.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/cpia.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/cpia.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/cpia.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/cpia.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/crystalhd.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/crystalhd.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/crystalhd.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/crystalhd.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/cscd.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/cscd.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/cscd.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/cscd.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/cuviddec.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/cuviddec.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/cuviddec.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/cuviddec.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/cyuv.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/cyuv.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/cyuv.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/cyuv.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/d3d11va.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/d3d11va.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/d3d11va.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/d3d11va.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/d3d11va.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/d3d11va.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/d3d11va.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/d3d11va.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/dca.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/dca.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/dca.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/dca.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/dca.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/dca.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/dca.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/dca.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/dca_core.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/dca_core.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/dca_core.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/dca_core.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/dca_core.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/dca_core.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/dca_core.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/dca_core.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/dca_core_bsf.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/dca_core_bsf.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/dca_core_bsf.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/dca_core_bsf.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/dca_exss.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/dca_exss.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/dca_exss.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/dca_exss.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/dca_exss.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/dca_exss.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/dca_exss.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/dca_exss.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/dca_lbr.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/dca_lbr.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/dca_lbr.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/dca_lbr.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/dca_lbr.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/dca_lbr.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/dca_lbr.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/dca_lbr.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/dca_parser.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/dca_parser.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/dca_parser.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/dca_parser.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/dca_syncwords.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/dca_syncwords.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/dca_syncwords.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/dca_syncwords.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/dca_xll.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/dca_xll.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/dca_xll.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/dca_xll.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/dca_xll.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/dca_xll.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/dca_xll.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/dca_xll.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/dcaadpcm.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/dcaadpcm.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/dcaadpcm.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/dcaadpcm.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/dcaadpcm.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/dcaadpcm.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/dcaadpcm.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/dcaadpcm.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/dcadata.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/dcadata.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/dcadata.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/dcadata.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/dcadata.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/dcadata.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/dcadata.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/dcadata.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/dcadct.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/dcadct.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/dcadct.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/dcadct.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/dcadct.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/dcadct.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/dcadct.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/dcadct.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/dcadec.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/dcadec.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/dcadec.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/dcadec.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/dcadec.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/dcadec.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/dcadec.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/dcadec.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/dcadsp.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/dcadsp.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/dcadsp.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/dcadsp.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/dcadsp.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/dcadsp.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/dcadsp.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/dcadsp.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/dcaenc.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/dcaenc.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/dcaenc.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/dcaenc.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/dcaenc.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/dcaenc.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/dcaenc.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/dcaenc.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/dcahuff.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/dcahuff.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/dcahuff.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/dcahuff.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/dcahuff.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/dcahuff.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/dcahuff.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/dcahuff.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/dcamath.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/dcamath.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/dcamath.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/dcamath.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/dct.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/dct.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/dct.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/dct.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/dct.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/dct.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/dct.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/dct.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/dct32.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/dct32.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/dct32.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/dct32.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/dct32_fixed.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/dct32_fixed.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/dct32_fixed.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/dct32_fixed.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/dct32_float.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/dct32_float.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/dct32_float.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/dct32_float.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/dct32_template.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/dct32_template.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/dct32_template.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/dct32_template.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/dctref.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/dctref.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/dctref.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/dctref.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/dctref.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/dctref.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/dctref.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/dctref.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/dds.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/dds.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/dds.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/dds.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/decode.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/decode.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/decode.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/decode.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/decode.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/decode.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/decode.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/decode.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/dfa.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/dfa.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/dfa.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/dfa.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/dirac.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/dirac.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/dirac.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/dirac.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/dirac.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/dirac.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/dirac.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/dirac.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/dirac_arith.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/dirac_arith.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/dirac_arith.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/dirac_arith.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/dirac_arith.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/dirac_arith.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/dirac_arith.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/dirac_arith.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/dirac_dwt.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/dirac_dwt.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/dirac_dwt.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/dirac_dwt.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/dirac_dwt.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/dirac_dwt.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/dirac_dwt.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/dirac_dwt.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/dirac_dwt_template.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/dirac_dwt_template.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/dirac_dwt_template.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/dirac_dwt_template.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/dirac_parser.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/dirac_parser.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/dirac_parser.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/dirac_parser.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/dirac_vlc.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/dirac_vlc.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/dirac_vlc.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/dirac_vlc.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/dirac_vlc.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/dirac_vlc.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/dirac_vlc.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/dirac_vlc.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/diracdec.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/diracdec.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/diracdec.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/diracdec.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/diracdsp.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/diracdsp.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/diracdsp.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/diracdsp.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/diracdsp.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/diracdsp.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/diracdsp.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/diracdsp.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/diractab.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/diractab.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/diractab.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/diractab.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/diractab.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/diractab.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/diractab.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/diractab.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/dnxhd_parser.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/dnxhd_parser.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/dnxhd_parser.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/dnxhd_parser.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/dnxhddata.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/dnxhddata.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/dnxhddata.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/dnxhddata.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/dnxhddata.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/dnxhddata.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/dnxhddata.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/dnxhddata.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/dnxhddec.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/dnxhddec.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/dnxhddec.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/dnxhddec.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/dnxhdenc.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/dnxhdenc.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/dnxhdenc.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/dnxhdenc.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/dnxhdenc.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/dnxhdenc.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/dnxhdenc.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/dnxhdenc.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/dolby_e.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/dolby_e.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/dolby_e.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/dolby_e.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/dolby_e.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/dolby_e.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/dolby_e.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/dolby_e.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/dpcm.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/dpcm.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/dpcm.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/dpcm.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/dpx.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/dpx.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/dpx.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/dpx.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/dpx_parser.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/dpx_parser.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/dpx_parser.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/dpx_parser.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/dpxenc.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/dpxenc.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/dpxenc.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/dpxenc.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/dsd.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/dsd.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/dsd.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/dsd.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/dsd.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/dsd.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/dsd.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/dsd.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/dsd_tablegen.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/dsd_tablegen.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/dsd_tablegen.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/dsd_tablegen.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/dsddec.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/dsddec.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/dsddec.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/dsddec.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/dsicinaudio.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/dsicinaudio.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/dsicinaudio.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/dsicinaudio.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/dsicinvideo.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/dsicinvideo.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/dsicinvideo.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/dsicinvideo.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/dss_sp.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/dss_sp.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/dss_sp.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/dss_sp.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/dstdec.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/dstdec.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/dstdec.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/dstdec.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/dump_extradata_bsf.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/dump_extradata_bsf.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/dump_extradata_bsf.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/dump_extradata_bsf.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/dv.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/dv.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/dv.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/dv.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/dv.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/dv.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/dv.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/dv.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/dv_profile.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/dv_profile.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/dv_profile.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/dv_profile.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/dv_profile.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/dv_profile.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/dv_profile.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/dv_profile.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/dv_profile_internal.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/dv_profile_internal.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/dv_profile_internal.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/dv_profile_internal.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/dv_tablegen.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/dv_tablegen.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/dv_tablegen.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/dv_tablegen.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/dv_tablegen.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/dv_tablegen.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/dv_tablegen.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/dv_tablegen.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/dvaudio.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/dvaudio.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/dvaudio.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/dvaudio.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/dvaudio_parser.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/dvaudio_parser.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/dvaudio_parser.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/dvaudio_parser.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/dvaudiodec.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/dvaudiodec.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/dvaudiodec.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/dvaudiodec.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/dvbsub.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/dvbsub.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/dvbsub.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/dvbsub.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/dvbsub_parser.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/dvbsub_parser.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/dvbsub_parser.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/dvbsub_parser.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/dvbsubdec.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/dvbsubdec.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/dvbsubdec.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/dvbsubdec.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/dvbtxt.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/dvbtxt.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/dvbtxt.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/dvbtxt.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/dvd_nav_parser.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/dvd_nav_parser.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/dvd_nav_parser.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/dvd_nav_parser.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/dvdata.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/dvdata.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/dvdata.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/dvdata.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/dvdata.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/dvdata.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/dvdata.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/dvdata.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/dvdec.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/dvdec.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/dvdec.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/dvdec.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/dvdsub_parser.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/dvdsub_parser.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/dvdsub_parser.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/dvdsub_parser.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/dvdsubdec.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/dvdsubdec.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/dvdsubdec.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/dvdsubdec.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/dvdsubenc.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/dvdsubenc.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/dvdsubenc.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/dvdsubenc.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/dvenc.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/dvenc.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/dvenc.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/dvenc.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/dxa.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/dxa.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/dxa.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/dxa.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/dxtory.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/dxtory.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/dxtory.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/dxtory.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/dxv.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/dxv.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/dxv.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/dxv.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/dxva2.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/dxva2.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/dxva2.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/dxva2.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/dxva2.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/dxva2.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/dxva2.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/dxva2.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/dxva2_h264.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/dxva2_h264.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/dxva2_h264.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/dxva2_h264.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/dxva2_hevc.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/dxva2_hevc.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/dxva2_hevc.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/dxva2_hevc.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/dxva2_internal.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/dxva2_internal.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/dxva2_internal.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/dxva2_internal.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/dxva2_mpeg2.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/dxva2_mpeg2.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/dxva2_mpeg2.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/dxva2_mpeg2.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/dxva2_vc1.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/dxva2_vc1.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/dxva2_vc1.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/dxva2_vc1.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/dxva2_vp9.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/dxva2_vp9.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/dxva2_vp9.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/dxva2_vp9.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/eac3_core_bsf.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/eac3_core_bsf.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/eac3_core_bsf.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/eac3_core_bsf.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/eac3_data.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/eac3_data.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/eac3_data.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/eac3_data.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/eac3_data.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/eac3_data.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/eac3_data.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/eac3_data.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/eac3dec.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/eac3dec.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/eac3dec.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/eac3dec.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/eac3enc.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/eac3enc.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/eac3enc.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/eac3enc.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/eac3enc.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/eac3enc.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/eac3enc.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/eac3enc.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/eacmv.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/eacmv.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/eacmv.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/eacmv.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/eaidct.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/eaidct.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/eaidct.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/eaidct.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/eaidct.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/eaidct.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/eaidct.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/eaidct.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/eamad.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/eamad.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/eamad.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/eamad.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/eatgq.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/eatgq.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/eatgq.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/eatgq.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/eatgv.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/eatgv.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/eatgv.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/eatgv.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/eatqi.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/eatqi.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/eatqi.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/eatqi.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/elbg.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/elbg.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/elbg.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/elbg.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/elbg.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/elbg.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/elbg.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/elbg.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/elsdec.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/elsdec.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/elsdec.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/elsdec.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/elsdec.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/elsdec.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/elsdec.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/elsdec.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/encode.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/encode.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/encode.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/encode.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/error_resilience.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/error_resilience.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/error_resilience.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/error_resilience.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/error_resilience.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/error_resilience.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/error_resilience.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/error_resilience.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/escape124.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/escape124.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/escape124.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/escape124.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/escape130.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/escape130.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/escape130.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/escape130.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/evrcdata.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/evrcdata.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/evrcdata.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/evrcdata.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/evrcdec.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/evrcdec.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/evrcdec.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/evrcdec.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/exif.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/exif.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/exif.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/exif.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/exif.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/exif.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/exif.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/exif.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/exr.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/exr.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/exr.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/exr.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/exrdsp.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/exrdsp.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/exrdsp.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/exrdsp.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/exrdsp.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/exrdsp.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/exrdsp.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/exrdsp.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/extract_extradata_bsf.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/extract_extradata_bsf.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/extract_extradata_bsf.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/extract_extradata_bsf.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/faandct.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/faandct.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/faandct.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/faandct.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/faandct.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/faandct.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/faandct.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/faandct.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/faanidct.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/faanidct.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/faanidct.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/faanidct.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/faanidct.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/faanidct.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/faanidct.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/faanidct.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/faxcompr.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/faxcompr.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/faxcompr.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/faxcompr.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/faxcompr.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/faxcompr.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/faxcompr.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/faxcompr.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/fdctdsp.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/fdctdsp.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/fdctdsp.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/fdctdsp.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/fdctdsp.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/fdctdsp.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/fdctdsp.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/fdctdsp.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/ffjni.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/ffjni.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/ffjni.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/ffjni.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/ffjni.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/ffjni.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/ffjni.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/ffjni.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/fft-internal.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/fft-internal.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/fft-internal.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/fft-internal.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/fft.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/fft.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/fft.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/fft.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/fft_fixed.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/fft_fixed.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/fft_fixed.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/fft_fixed.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/fft_fixed_32.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/fft_fixed_32.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/fft_fixed_32.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/fft_fixed_32.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/fft_float.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/fft_float.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/fft_float.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/fft_float.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/fft_init_table.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/fft_init_table.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/fft_init_table.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/fft_init_table.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/fft_table.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/fft_table.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/fft_table.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/fft_table.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/fft_template.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/fft_template.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/fft_template.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/fft_template.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/ffv1.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/ffv1.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/ffv1.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/ffv1.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/ffv1.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/ffv1.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/ffv1.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/ffv1.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/ffv1_template.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/ffv1_template.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/ffv1_template.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/ffv1_template.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/ffv1dec.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/ffv1dec.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/ffv1dec.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/ffv1dec.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/ffv1dec_template.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/ffv1dec_template.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/ffv1dec_template.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/ffv1dec_template.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/ffv1enc.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/ffv1enc.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/ffv1enc.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/ffv1enc.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/ffv1enc_template.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/ffv1enc_template.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/ffv1enc_template.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/ffv1enc_template.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/ffwavesynth.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/ffwavesynth.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/ffwavesynth.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/ffwavesynth.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/fic.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/fic.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/fic.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/fic.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/file_open.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/file_open.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/file_open.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/file_open.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/filter_units_bsf.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/filter_units_bsf.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/filter_units_bsf.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/filter_units_bsf.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/fits.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/fits.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/fits.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/fits.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/fits.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/fits.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/fits.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/fits.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/fitsdec.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/fitsdec.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/fitsdec.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/fitsdec.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/fitsenc.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/fitsenc.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/fitsenc.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/fitsenc.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/flac.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/flac.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/flac.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/flac.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/flac.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/flac.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/flac.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/flac.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/flac_parser.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/flac_parser.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/flac_parser.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/flac_parser.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/flacdata.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/flacdata.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/flacdata.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/flacdata.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/flacdata.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/flacdata.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/flacdata.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/flacdata.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/flacdec.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/flacdec.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/flacdec.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/flacdec.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/flacdsp.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/flacdsp.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/flacdsp.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/flacdsp.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/flacdsp.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/flacdsp.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/flacdsp.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/flacdsp.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/flacdsp_lpc_template.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/flacdsp_lpc_template.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/flacdsp_lpc_template.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/flacdsp_lpc_template.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/flacdsp_template.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/flacdsp_template.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/flacdsp_template.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/flacdsp_template.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/flacenc.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/flacenc.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/flacenc.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/flacenc.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/flashsv.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/flashsv.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/flashsv.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/flashsv.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/flashsv2enc.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/flashsv2enc.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/flashsv2enc.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/flashsv2enc.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/flashsvenc.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/flashsvenc.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/flashsvenc.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/flashsvenc.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/flicvideo.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/flicvideo.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/flicvideo.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/flicvideo.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/flv.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/flv.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/flv.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/flv.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/flvdec.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/flvdec.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/flvdec.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/flvdec.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/flvenc.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/flvenc.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/flvenc.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/flvenc.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/fmtconvert.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/fmtconvert.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/fmtconvert.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/fmtconvert.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/fmtconvert.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/fmtconvert.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/fmtconvert.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/fmtconvert.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/fmvc.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/fmvc.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/fmvc.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/fmvc.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/frame_thread_encoder.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/frame_thread_encoder.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/frame_thread_encoder.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/frame_thread_encoder.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/frame_thread_encoder.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/frame_thread_encoder.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/frame_thread_encoder.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/frame_thread_encoder.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/fraps.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/fraps.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/fraps.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/fraps.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/frwu.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/frwu.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/frwu.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/frwu.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/g2meet.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/g2meet.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/g2meet.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/g2meet.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/g722.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/g722.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/g722.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/g722.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/g722.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/g722.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/g722.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/g722.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/g722dec.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/g722dec.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/g722dec.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/g722dec.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/g722dsp.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/g722dsp.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/g722dsp.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/g722dsp.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/g722dsp.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/g722dsp.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/g722dsp.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/g722dsp.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/g722enc.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/g722enc.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/g722enc.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/g722enc.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/g723_1.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/g723_1.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/g723_1.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/g723_1.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/g723_1.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/g723_1.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/g723_1.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/g723_1.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/g723_1dec.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/g723_1dec.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/g723_1dec.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/g723_1dec.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/g723_1enc.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/g723_1enc.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/g723_1enc.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/g723_1enc.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/g726.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/g726.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/g726.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/g726.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/g729.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/g729.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/g729.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/g729.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/g729_parser.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/g729_parser.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/g729_parser.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/g729_parser.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/g729data.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/g729data.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/g729data.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/g729data.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/g729dec.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/g729dec.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/g729dec.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/g729dec.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/g729postfilter.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/g729postfilter.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/g729postfilter.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/g729postfilter.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/g729postfilter.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/g729postfilter.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/g729postfilter.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/g729postfilter.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/gdv.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/gdv.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/gdv.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/gdv.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/get_bits.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/get_bits.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/get_bits.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/get_bits.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/gif.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/gif.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/gif.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/gif.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/gif.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/gif.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/gif.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/gif.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/gifdec.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/gifdec.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/gifdec.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/gifdec.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/golomb.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/golomb.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/golomb.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/golomb.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/golomb.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/golomb.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/golomb.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/golomb.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/gsm.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/gsm.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/gsm.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/gsm.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/gsm_parser.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/gsm_parser.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/gsm_parser.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/gsm_parser.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/gsmdec.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/gsmdec.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/gsmdec.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/gsmdec.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/gsmdec_data.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/gsmdec_data.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/gsmdec_data.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/gsmdec_data.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/gsmdec_data.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/gsmdec_data.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/gsmdec_data.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/gsmdec_data.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/gsmdec_template.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/gsmdec_template.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/gsmdec_template.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/gsmdec_template.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/h261.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/h261.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/h261.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/h261.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/h261.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/h261.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/h261.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/h261.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/h261_parser.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/h261_parser.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/h261_parser.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/h261_parser.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/h261data.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/h261data.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/h261data.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/h261data.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/h261dec.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/h261dec.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/h261dec.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/h261dec.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/h261enc.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/h261enc.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/h261enc.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/h261enc.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/h263.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/h263.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/h263.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/h263.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/h263.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/h263.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/h263.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/h263.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/h263_parser.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/h263_parser.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/h263_parser.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/h263_parser.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/h263_parser.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/h263_parser.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/h263_parser.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/h263_parser.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/h263data.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/h263data.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/h263data.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/h263data.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/h263data.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/h263data.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/h263data.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/h263data.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/h263dec.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/h263dec.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/h263dec.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/h263dec.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/h263dsp.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/h263dsp.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/h263dsp.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/h263dsp.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/h263dsp.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/h263dsp.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/h263dsp.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/h263dsp.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/h264.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/h264.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/h264.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/h264.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/h2645_parse.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/h2645_parse.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/h2645_parse.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/h2645_parse.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/h2645_parse.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/h2645_parse.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/h2645_parse.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/h2645_parse.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/h264_cabac.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/h264_cabac.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/h264_cabac.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/h264_cabac.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/h264_cavlc.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/h264_cavlc.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/h264_cavlc.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/h264_cavlc.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/h264_direct.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/h264_direct.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/h264_direct.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/h264_direct.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/h264_levels.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/h264_levels.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/h264_levels.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/h264_levels.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/h264_levels.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/h264_levels.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/h264_levels.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/h264_levels.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/h264_loopfilter.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/h264_loopfilter.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/h264_loopfilter.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/h264_loopfilter.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/h264_mb.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/h264_mb.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/h264_mb.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/h264_mb.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/h264_mb_template.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/h264_mb_template.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/h264_mb_template.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/h264_mb_template.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/h264_mc_template.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/h264_mc_template.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/h264_mc_template.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/h264_mc_template.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/h264_metadata_bsf.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/h264_metadata_bsf.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/h264_metadata_bsf.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/h264_metadata_bsf.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/h264_mp4toannexb_bsf.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/h264_mp4toannexb_bsf.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/h264_mp4toannexb_bsf.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/h264_mp4toannexb_bsf.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/h264_mvpred.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/h264_mvpred.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/h264_mvpred.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/h264_mvpred.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/h264_parse.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/h264_parse.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/h264_parse.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/h264_parse.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/h264_parse.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/h264_parse.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/h264_parse.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/h264_parse.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/h264_parser.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/h264_parser.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/h264_parser.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/h264_parser.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/h264_picture.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/h264_picture.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/h264_picture.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/h264_picture.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/h264_ps.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/h264_ps.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/h264_ps.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/h264_ps.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/h264_ps.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/h264_ps.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/h264_ps.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/h264_ps.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/h264_redundant_pps_bsf.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/h264_redundant_pps_bsf.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/h264_redundant_pps_bsf.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/h264_redundant_pps_bsf.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/h264_refs.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/h264_refs.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/h264_refs.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/h264_refs.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/h264_sei.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/h264_sei.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/h264_sei.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/h264_sei.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/h264_sei.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/h264_sei.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/h264_sei.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/h264_sei.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/h264_slice.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/h264_slice.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/h264_slice.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/h264_slice.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/h264addpx_template.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/h264addpx_template.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/h264addpx_template.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/h264addpx_template.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/h264chroma.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/h264chroma.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/h264chroma.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/h264chroma.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/h264chroma.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/h264chroma.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/h264chroma.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/h264chroma.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/h264chroma_template.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/h264chroma_template.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/h264chroma_template.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/h264chroma_template.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/h264data.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/h264data.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/h264data.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/h264data.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/h264data.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/h264data.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/h264data.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/h264data.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/h264dec.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/h264dec.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/h264dec.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/h264dec.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/h264dec.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/h264dec.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/h264dec.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/h264dec.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/h264dsp.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/h264dsp.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/h264dsp.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/h264dsp.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/h264dsp.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/h264dsp.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/h264dsp.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/h264dsp.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/h264dsp_template.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/h264dsp_template.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/h264dsp_template.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/h264dsp_template.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/h264idct.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/h264idct.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/h264idct.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/h264idct.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/h264idct.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/h264idct.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/h264idct.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/h264idct.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/h264idct_template.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/h264idct_template.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/h264idct_template.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/h264idct_template.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/h264pred.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/h264pred.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/h264pred.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/h264pred.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/h264pred.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/h264pred.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/h264pred.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/h264pred.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/h264pred_template.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/h264pred_template.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/h264pred_template.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/h264pred_template.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/h264qpel.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/h264qpel.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/h264qpel.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/h264qpel.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/h264qpel.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/h264qpel.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/h264qpel.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/h264qpel.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/h264qpel_template.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/h264qpel_template.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/h264qpel_template.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/h264qpel_template.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/h265_metadata_bsf.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/h265_metadata_bsf.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/h265_metadata_bsf.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/h265_metadata_bsf.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/h265_profile_level.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/h265_profile_level.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/h265_profile_level.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/h265_profile_level.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/h265_profile_level.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/h265_profile_level.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/h265_profile_level.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/h265_profile_level.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/hap.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/hap.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/hap.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/hap.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/hap.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/hap.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/hap.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/hap.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/hapdec.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/hapdec.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/hapdec.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/hapdec.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/hapenc.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/hapenc.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/hapenc.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/hapenc.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/hapqa_extract_bsf.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/hapqa_extract_bsf.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/hapqa_extract_bsf.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/hapqa_extract_bsf.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/hevc.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/hevc.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/hevc.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/hevc.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/hevc_cabac.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/hevc_cabac.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/hevc_cabac.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/hevc_cabac.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/hevc_data.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/hevc_data.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/hevc_data.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/hevc_data.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/hevc_data.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/hevc_data.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/hevc_data.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/hevc_data.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/hevc_filter.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/hevc_filter.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/hevc_filter.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/hevc_filter.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/hevc_mp4toannexb_bsf.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/hevc_mp4toannexb_bsf.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/hevc_mp4toannexb_bsf.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/hevc_mp4toannexb_bsf.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/hevc_mvs.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/hevc_mvs.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/hevc_mvs.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/hevc_mvs.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/hevc_parse.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/hevc_parse.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/hevc_parse.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/hevc_parse.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/hevc_parse.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/hevc_parse.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/hevc_parse.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/hevc_parse.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/hevc_parser.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/hevc_parser.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/hevc_parser.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/hevc_parser.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/hevc_ps.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/hevc_ps.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/hevc_ps.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/hevc_ps.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/hevc_ps.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/hevc_ps.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/hevc_ps.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/hevc_ps.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/hevc_ps_enc.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/hevc_ps_enc.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/hevc_ps_enc.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/hevc_ps_enc.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/hevc_refs.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/hevc_refs.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/hevc_refs.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/hevc_refs.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/hevc_sei.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/hevc_sei.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/hevc_sei.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/hevc_sei.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/hevc_sei.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/hevc_sei.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/hevc_sei.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/hevc_sei.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/hevcdec.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/hevcdec.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/hevcdec.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/hevcdec.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/hevcdec.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/hevcdec.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/hevcdec.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/hevcdec.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/hevcdsp.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/hevcdsp.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/hevcdsp.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/hevcdsp.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/hevcdsp.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/hevcdsp.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/hevcdsp.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/hevcdsp.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/hevcdsp_template.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/hevcdsp_template.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/hevcdsp_template.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/hevcdsp_template.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/hevcpred.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/hevcpred.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/hevcpred.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/hevcpred.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/hevcpred.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/hevcpred.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/hevcpred.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/hevcpred.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/hevcpred_template.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/hevcpred_template.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/hevcpred_template.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/hevcpred_template.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/hnm4video.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/hnm4video.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/hnm4video.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/hnm4video.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/hpel_template.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/hpel_template.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/hpel_template.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/hpel_template.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/hpeldsp.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/hpeldsp.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/hpeldsp.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/hpeldsp.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/hpeldsp.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/hpeldsp.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/hpeldsp.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/hpeldsp.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/hq_hqa.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/hq_hqa.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/hq_hqa.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/hq_hqa.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/hq_hqa.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/hq_hqa.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/hq_hqa.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/hq_hqa.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/hq_hqadata.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/hq_hqadata.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/hq_hqadata.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/hq_hqadata.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/hq_hqadsp.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/hq_hqadsp.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/hq_hqadsp.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/hq_hqadsp.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/hq_hqadsp.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/hq_hqadsp.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/hq_hqadsp.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/hq_hqadsp.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/hqx.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/hqx.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/hqx.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/hqx.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/hqx.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/hqx.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/hqx.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/hqx.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/hqxdsp.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/hqxdsp.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/hqxdsp.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/hqxdsp.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/hqxdsp.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/hqxdsp.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/hqxdsp.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/hqxdsp.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/hqxvlc.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/hqxvlc.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/hqxvlc.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/hqxvlc.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/htmlsubtitles.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/htmlsubtitles.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/htmlsubtitles.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/htmlsubtitles.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/htmlsubtitles.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/htmlsubtitles.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/htmlsubtitles.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/htmlsubtitles.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/huffman.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/huffman.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/huffman.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/huffman.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/huffman.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/huffman.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/huffman.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/huffman.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/huffyuv.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/huffyuv.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/huffyuv.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/huffyuv.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/huffyuv.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/huffyuv.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/huffyuv.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/huffyuv.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/huffyuvdec.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/huffyuvdec.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/huffyuvdec.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/huffyuvdec.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/huffyuvdsp.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/huffyuvdsp.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/huffyuvdsp.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/huffyuvdsp.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/huffyuvdsp.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/huffyuvdsp.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/huffyuvdsp.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/huffyuvdsp.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/huffyuvenc.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/huffyuvenc.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/huffyuvenc.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/huffyuvenc.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/huffyuvencdsp.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/huffyuvencdsp.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/huffyuvencdsp.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/huffyuvencdsp.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/huffyuvencdsp.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/huffyuvencdsp.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/huffyuvencdsp.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/huffyuvencdsp.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/hwaccel.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/hwaccel.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/hwaccel.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/hwaccel.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/hwaccels.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/hwaccels.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/hwaccels.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/hwaccels.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/idcinvideo.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/idcinvideo.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/idcinvideo.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/idcinvideo.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/idctdsp.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/idctdsp.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/idctdsp.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/idctdsp.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/idctdsp.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/idctdsp.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/idctdsp.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/idctdsp.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/iff.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/iff.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/iff.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/iff.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/iirfilter.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/iirfilter.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/iirfilter.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/iirfilter.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/iirfilter.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/iirfilter.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/iirfilter.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/iirfilter.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/ilbcdata.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/ilbcdata.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/ilbcdata.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/ilbcdata.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/ilbcdec.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/ilbcdec.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/ilbcdec.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/ilbcdec.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/imc.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/imc.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/imc.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/imc.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/imcdata.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/imcdata.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/imcdata.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/imcdata.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/imgconvert.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/imgconvert.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/imgconvert.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/imgconvert.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/imm4.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/imm4.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/imm4.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/imm4.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/imx_dump_header_bsf.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/imx_dump_header_bsf.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/imx_dump_header_bsf.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/imx_dump_header_bsf.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/indeo2.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/indeo2.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/indeo2.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/indeo2.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/indeo2data.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/indeo2data.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/indeo2data.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/indeo2data.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/indeo3.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/indeo3.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/indeo3.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/indeo3.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/indeo3data.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/indeo3data.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/indeo3data.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/indeo3data.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/indeo4.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/indeo4.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/indeo4.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/indeo4.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/indeo4data.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/indeo4data.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/indeo4data.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/indeo4data.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/indeo5.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/indeo5.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/indeo5.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/indeo5.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/indeo5data.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/indeo5data.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/indeo5data.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/indeo5data.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/intelh263dec.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/intelh263dec.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/intelh263dec.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/intelh263dec.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/internal.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/internal.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/internal.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/internal.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/interplayacm.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/interplayacm.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/interplayacm.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/interplayacm.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/interplayvideo.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/interplayvideo.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/interplayvideo.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/interplayvideo.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/intrax8.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/intrax8.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/intrax8.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/intrax8.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/intrax8.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/intrax8.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/intrax8.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/intrax8.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/intrax8dsp.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/intrax8dsp.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/intrax8dsp.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/intrax8dsp.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/intrax8dsp.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/intrax8dsp.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/intrax8dsp.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/intrax8dsp.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/intrax8huf.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/intrax8huf.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/intrax8huf.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/intrax8huf.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/ituh263dec.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/ituh263dec.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/ituh263dec.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/ituh263dec.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/ituh263enc.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/ituh263enc.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/ituh263enc.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/ituh263enc.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/ivi.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/ivi.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/ivi.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/ivi.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/ivi.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/ivi.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/ivi.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/ivi.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/ivi_dsp.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/ivi_dsp.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/ivi_dsp.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/ivi_dsp.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/ivi_dsp.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/ivi_dsp.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/ivi_dsp.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/ivi_dsp.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/j2kenc.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/j2kenc.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/j2kenc.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/j2kenc.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/jacosub.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/jacosub.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/jacosub.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/jacosub.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/jacosubdec.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/jacosubdec.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/jacosubdec.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/jacosubdec.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/jfdctfst.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/jfdctfst.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/jfdctfst.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/jfdctfst.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/jfdctint.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/jfdctint.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/jfdctint.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/jfdctint.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/jfdctint_template.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/jfdctint_template.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/jfdctint_template.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/jfdctint_template.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/jni.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/jni.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/jni.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/jni.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/jni.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/jni.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/jni.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/jni.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/jpeg2000.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/jpeg2000.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/jpeg2000.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/jpeg2000.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/jpeg2000.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/jpeg2000.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/jpeg2000.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/jpeg2000.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/jpeg2000dec.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/jpeg2000dec.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/jpeg2000dec.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/jpeg2000dec.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/jpeg2000dsp.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/jpeg2000dsp.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/jpeg2000dsp.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/jpeg2000dsp.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/jpeg2000dsp.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/jpeg2000dsp.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/jpeg2000dsp.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/jpeg2000dsp.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/jpeg2000dwt.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/jpeg2000dwt.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/jpeg2000dwt.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/jpeg2000dwt.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/jpeg2000dwt.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/jpeg2000dwt.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/jpeg2000dwt.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/jpeg2000dwt.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/jpegls.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/jpegls.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/jpegls.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/jpegls.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/jpegls.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/jpegls.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/jpegls.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/jpegls.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/jpeglsdec.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/jpeglsdec.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/jpeglsdec.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/jpeglsdec.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/jpeglsdec.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/jpeglsdec.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/jpeglsdec.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/jpeglsdec.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/jpeglsenc.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/jpeglsenc.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/jpeglsenc.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/jpeglsenc.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/jpegtables.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/jpegtables.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/jpegtables.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/jpegtables.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/jpegtables.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/jpegtables.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/jpegtables.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/jpegtables.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/jrevdct.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/jrevdct.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/jrevdct.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/jrevdct.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/jvdec.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/jvdec.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/jvdec.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/jvdec.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/kbdwin.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/kbdwin.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/kbdwin.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/kbdwin.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/kbdwin.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/kbdwin.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/kbdwin.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/kbdwin.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/kgv1dec.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/kgv1dec.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/kgv1dec.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/kgv1dec.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/kmvc.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/kmvc.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/kmvc.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/kmvc.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/lagarith.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/lagarith.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/lagarith.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/lagarith.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/lagarithrac.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/lagarithrac.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/lagarithrac.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/lagarithrac.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/lagarithrac.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/lagarithrac.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/lagarithrac.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/lagarithrac.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/latm_parser.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/latm_parser.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/latm_parser.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/latm_parser.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/lcl.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/lcl.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/lcl.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/lcl.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/lcldec.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/lcldec.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/lcldec.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/lcldec.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/lclenc.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/lclenc.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/lclenc.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/lclenc.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/libaomdec.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/libaomdec.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/libaomdec.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/libaomdec.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/libaomenc.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/libaomenc.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/libaomenc.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/libaomenc.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/libavcodec.v b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/libavcodec.v
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/libavcodec.v
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/libavcodec.v
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/libcelt_dec.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/libcelt_dec.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/libcelt_dec.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/libcelt_dec.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/libcodec2.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/libcodec2.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/libcodec2.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/libcodec2.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/libdavs2.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/libdavs2.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/libdavs2.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/libdavs2.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/libfdk-aacdec.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/libfdk-aacdec.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/libfdk-aacdec.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/libfdk-aacdec.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/libfdk-aacenc.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/libfdk-aacenc.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/libfdk-aacenc.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/libfdk-aacenc.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/libgsmdec.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/libgsmdec.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/libgsmdec.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/libgsmdec.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/libgsmenc.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/libgsmenc.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/libgsmenc.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/libgsmenc.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/libilbc.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/libilbc.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/libilbc.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/libilbc.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/libkvazaar.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/libkvazaar.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/libkvazaar.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/libkvazaar.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/libmp3lame.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/libmp3lame.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/libmp3lame.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/libmp3lame.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/libopencore-amr.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/libopencore-amr.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/libopencore-amr.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/libopencore-amr.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/libopenh264.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/libopenh264.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/libopenh264.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/libopenh264.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/libopenh264.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/libopenh264.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/libopenh264.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/libopenh264.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/libopenh264dec.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/libopenh264dec.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/libopenh264dec.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/libopenh264dec.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/libopenh264enc.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/libopenh264enc.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/libopenh264enc.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/libopenh264enc.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/libopenjpegdec.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/libopenjpegdec.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/libopenjpegdec.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/libopenjpegdec.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/libopenjpegenc.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/libopenjpegenc.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/libopenjpegenc.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/libopenjpegenc.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/libopus.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/libopus.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/libopus.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/libopus.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/libopus.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/libopus.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/libopus.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/libopus.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/libopusdec.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/libopusdec.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/libopusdec.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/libopusdec.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/libopusenc.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/libopusenc.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/libopusenc.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/libopusenc.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/librsvgdec.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/librsvgdec.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/librsvgdec.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/librsvgdec.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/libshine.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/libshine.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/libshine.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/libshine.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/libspeexdec.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/libspeexdec.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/libspeexdec.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/libspeexdec.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/libspeexenc.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/libspeexenc.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/libspeexenc.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/libspeexenc.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/libtheoraenc.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/libtheoraenc.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/libtheoraenc.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/libtheoraenc.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/libtwolame.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/libtwolame.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/libtwolame.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/libtwolame.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/libvo-amrwbenc.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/libvo-amrwbenc.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/libvo-amrwbenc.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/libvo-amrwbenc.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/libvorbisdec.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/libvorbisdec.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/libvorbisdec.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/libvorbisdec.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/libvorbisenc.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/libvorbisenc.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/libvorbisenc.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/libvorbisenc.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/libvpx.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/libvpx.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/libvpx.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/libvpx.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/libvpx.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/libvpx.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/libvpx.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/libvpx.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/libvpxdec.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/libvpxdec.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/libvpxdec.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/libvpxdec.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/libvpxenc.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/libvpxenc.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/libvpxenc.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/libvpxenc.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/libwavpackenc.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/libwavpackenc.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/libwavpackenc.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/libwavpackenc.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/libwebpenc.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/libwebpenc.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/libwebpenc.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/libwebpenc.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/libwebpenc_animencoder.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/libwebpenc_animencoder.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/libwebpenc_animencoder.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/libwebpenc_animencoder.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/libwebpenc_common.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/libwebpenc_common.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/libwebpenc_common.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/libwebpenc_common.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/libwebpenc_common.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/libwebpenc_common.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/libwebpenc_common.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/libwebpenc_common.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/libx264.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/libx264.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/libx264.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/libx264.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/libx265.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/libx265.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/libx265.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/libx265.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/libxavs.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/libxavs.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/libxavs.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/libxavs.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/libxavs2.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/libxavs2.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/libxavs2.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/libxavs2.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/libxvid.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/libxvid.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/libxvid.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/libxvid.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/libxvid.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/libxvid.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/libxvid.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/libxvid.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/libzvbi-teletextdec.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/libzvbi-teletextdec.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/libzvbi-teletextdec.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/libzvbi-teletextdec.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/ljpegenc.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/ljpegenc.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/ljpegenc.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/ljpegenc.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/loco.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/loco.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/loco.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/loco.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/log2_tab.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/log2_tab.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/log2_tab.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/log2_tab.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/lossless_audiodsp.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/lossless_audiodsp.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/lossless_audiodsp.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/lossless_audiodsp.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/lossless_audiodsp.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/lossless_audiodsp.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/lossless_audiodsp.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/lossless_audiodsp.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/lossless_videodsp.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/lossless_videodsp.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/lossless_videodsp.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/lossless_videodsp.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/lossless_videodsp.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/lossless_videodsp.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/lossless_videodsp.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/lossless_videodsp.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/lossless_videoencdsp.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/lossless_videoencdsp.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/lossless_videoencdsp.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/lossless_videoencdsp.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/lossless_videoencdsp.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/lossless_videoencdsp.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/lossless_videoencdsp.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/lossless_videoencdsp.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/lpc.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/lpc.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/lpc.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/lpc.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/lpc.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/lpc.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/lpc.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/lpc.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/lsp.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/lsp.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/lsp.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/lsp.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/lsp.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/lsp.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/lsp.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/lsp.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/lzf.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/lzf.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/lzf.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/lzf.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/lzf.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/lzf.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/lzf.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/lzf.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/lzw.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/lzw.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/lzw.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/lzw.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/lzw.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/lzw.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/lzw.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/lzw.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/lzwenc.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/lzwenc.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/lzwenc.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/lzwenc.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/m101.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/m101.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/m101.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/m101.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mace.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mace.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mace.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mace.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/magicyuv.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/magicyuv.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/magicyuv.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/magicyuv.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/magicyuvenc.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/magicyuvenc.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/magicyuvenc.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/magicyuvenc.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mathops.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mathops.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mathops.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mathops.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mathtables.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mathtables.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mathtables.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mathtables.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mdct15.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mdct15.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mdct15.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mdct15.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mdct15.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mdct15.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mdct15.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mdct15.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mdct_fixed.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mdct_fixed.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mdct_fixed.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mdct_fixed.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mdct_fixed_32.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mdct_fixed_32.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mdct_fixed_32.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mdct_fixed_32.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mdct_float.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mdct_float.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mdct_float.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mdct_float.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mdct_template.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mdct_template.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mdct_template.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mdct_template.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mdec.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mdec.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mdec.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mdec.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/me_cmp.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/me_cmp.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/me_cmp.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/me_cmp.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/me_cmp.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/me_cmp.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/me_cmp.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/me_cmp.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mediacodec.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mediacodec.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mediacodec.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mediacodec.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mediacodec.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mediacodec.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mediacodec.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mediacodec.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mediacodec_surface.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mediacodec_surface.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mediacodec_surface.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mediacodec_surface.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mediacodec_surface.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mediacodec_surface.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mediacodec_surface.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mediacodec_surface.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mediacodec_sw_buffer.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mediacodec_sw_buffer.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mediacodec_sw_buffer.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mediacodec_sw_buffer.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mediacodec_sw_buffer.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mediacodec_sw_buffer.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mediacodec_sw_buffer.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mediacodec_sw_buffer.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mediacodec_wrapper.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mediacodec_wrapper.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mediacodec_wrapper.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mediacodec_wrapper.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mediacodec_wrapper.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mediacodec_wrapper.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mediacodec_wrapper.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mediacodec_wrapper.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mediacodecdec.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mediacodecdec.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mediacodecdec.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mediacodecdec.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mediacodecdec_common.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mediacodecdec_common.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mediacodecdec_common.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mediacodecdec_common.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mediacodecdec_common.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mediacodecdec_common.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mediacodecdec_common.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mediacodecdec_common.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/metasound.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/metasound.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/metasound.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/metasound.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/metasound_data.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/metasound_data.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/metasound_data.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/metasound_data.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/metasound_data.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/metasound_data.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/metasound_data.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/metasound_data.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/microdvddec.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/microdvddec.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/microdvddec.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/microdvddec.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mimic.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mimic.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mimic.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mimic.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mips/Makefile b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mips/Makefile
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mips/Makefile
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mips/Makefile
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mips/aaccoder_mips.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mips/aaccoder_mips.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mips/aaccoder_mips.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mips/aaccoder_mips.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mips/aacdec_mips.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mips/aacdec_mips.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mips/aacdec_mips.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mips/aacdec_mips.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mips/aacdec_mips.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mips/aacdec_mips.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mips/aacdec_mips.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mips/aacdec_mips.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mips/aacpsdsp_mips.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mips/aacpsdsp_mips.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mips/aacpsdsp_mips.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mips/aacpsdsp_mips.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mips/aacpsy_mips.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mips/aacpsy_mips.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mips/aacpsy_mips.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mips/aacpsy_mips.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mips/aacsbr_mips.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mips/aacsbr_mips.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mips/aacsbr_mips.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mips/aacsbr_mips.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mips/aacsbr_mips.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mips/aacsbr_mips.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mips/aacsbr_mips.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mips/aacsbr_mips.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mips/ac3dsp_mips.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mips/ac3dsp_mips.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mips/ac3dsp_mips.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mips/ac3dsp_mips.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mips/acelp_filters_mips.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mips/acelp_filters_mips.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mips/acelp_filters_mips.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mips/acelp_filters_mips.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mips/acelp_vectors_mips.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mips/acelp_vectors_mips.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mips/acelp_vectors_mips.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mips/acelp_vectors_mips.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mips/amrwbdec_mips.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mips/amrwbdec_mips.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mips/amrwbdec_mips.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mips/amrwbdec_mips.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mips/amrwbdec_mips.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mips/amrwbdec_mips.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mips/amrwbdec_mips.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mips/amrwbdec_mips.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mips/blockdsp_init_mips.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mips/blockdsp_init_mips.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mips/blockdsp_init_mips.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mips/blockdsp_init_mips.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mips/blockdsp_mips.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mips/blockdsp_mips.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mips/blockdsp_mips.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mips/blockdsp_mips.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mips/blockdsp_mmi.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mips/blockdsp_mmi.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mips/blockdsp_mmi.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mips/blockdsp_mmi.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mips/blockdsp_msa.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mips/blockdsp_msa.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mips/blockdsp_msa.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mips/blockdsp_msa.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mips/cabac.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mips/cabac.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mips/cabac.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mips/cabac.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mips/celp_filters_mips.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mips/celp_filters_mips.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mips/celp_filters_mips.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mips/celp_filters_mips.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mips/celp_math_mips.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mips/celp_math_mips.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mips/celp_math_mips.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mips/celp_math_mips.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mips/compute_antialias_fixed.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mips/compute_antialias_fixed.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mips/compute_antialias_fixed.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mips/compute_antialias_fixed.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mips/compute_antialias_float.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mips/compute_antialias_float.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mips/compute_antialias_float.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mips/compute_antialias_float.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mips/constants.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mips/constants.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mips/constants.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mips/constants.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mips/constants.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mips/constants.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mips/constants.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mips/constants.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mips/fft_mips.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mips/fft_mips.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mips/fft_mips.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mips/fft_mips.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mips/fmtconvert_mips.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mips/fmtconvert_mips.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mips/fmtconvert_mips.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mips/fmtconvert_mips.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mips/h263dsp_init_mips.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mips/h263dsp_init_mips.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mips/h263dsp_init_mips.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mips/h263dsp_init_mips.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mips/h263dsp_mips.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mips/h263dsp_mips.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mips/h263dsp_mips.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mips/h263dsp_mips.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mips/h263dsp_msa.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mips/h263dsp_msa.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mips/h263dsp_msa.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mips/h263dsp_msa.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mips/h264chroma_init_mips.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mips/h264chroma_init_mips.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mips/h264chroma_init_mips.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mips/h264chroma_init_mips.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mips/h264chroma_mips.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mips/h264chroma_mips.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mips/h264chroma_mips.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mips/h264chroma_mips.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mips/h264chroma_mmi.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mips/h264chroma_mmi.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mips/h264chroma_mmi.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mips/h264chroma_mmi.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mips/h264chroma_msa.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mips/h264chroma_msa.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mips/h264chroma_msa.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mips/h264chroma_msa.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mips/h264dsp_init_mips.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mips/h264dsp_init_mips.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mips/h264dsp_init_mips.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mips/h264dsp_init_mips.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mips/h264dsp_mips.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mips/h264dsp_mips.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mips/h264dsp_mips.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mips/h264dsp_mips.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mips/h264dsp_mmi.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mips/h264dsp_mmi.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mips/h264dsp_mmi.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mips/h264dsp_mmi.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mips/h264dsp_msa.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mips/h264dsp_msa.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mips/h264dsp_msa.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mips/h264dsp_msa.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mips/h264idct_msa.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mips/h264idct_msa.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mips/h264idct_msa.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mips/h264idct_msa.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mips/h264pred_init_mips.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mips/h264pred_init_mips.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mips/h264pred_init_mips.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mips/h264pred_init_mips.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mips/h264pred_mips.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mips/h264pred_mips.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mips/h264pred_mips.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mips/h264pred_mips.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mips/h264pred_mmi.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mips/h264pred_mmi.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mips/h264pred_mmi.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mips/h264pred_mmi.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mips/h264pred_msa.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mips/h264pred_msa.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mips/h264pred_msa.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mips/h264pred_msa.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mips/h264qpel_init_mips.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mips/h264qpel_init_mips.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mips/h264qpel_init_mips.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mips/h264qpel_init_mips.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mips/h264qpel_mmi.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mips/h264qpel_mmi.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mips/h264qpel_mmi.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mips/h264qpel_mmi.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mips/h264qpel_msa.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mips/h264qpel_msa.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mips/h264qpel_msa.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mips/h264qpel_msa.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mips/hevc_idct_msa.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mips/hevc_idct_msa.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mips/hevc_idct_msa.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mips/hevc_idct_msa.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mips/hevc_lpf_sao_msa.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mips/hevc_lpf_sao_msa.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mips/hevc_lpf_sao_msa.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mips/hevc_lpf_sao_msa.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mips/hevc_macros_msa.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mips/hevc_macros_msa.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mips/hevc_macros_msa.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mips/hevc_macros_msa.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mips/hevc_mc_bi_msa.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mips/hevc_mc_bi_msa.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mips/hevc_mc_bi_msa.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mips/hevc_mc_bi_msa.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mips/hevc_mc_biw_msa.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mips/hevc_mc_biw_msa.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mips/hevc_mc_biw_msa.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mips/hevc_mc_biw_msa.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mips/hevc_mc_uni_msa.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mips/hevc_mc_uni_msa.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mips/hevc_mc_uni_msa.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mips/hevc_mc_uni_msa.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mips/hevc_mc_uniw_msa.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mips/hevc_mc_uniw_msa.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mips/hevc_mc_uniw_msa.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mips/hevc_mc_uniw_msa.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mips/hevcdsp_init_mips.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mips/hevcdsp_init_mips.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mips/hevcdsp_init_mips.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mips/hevcdsp_init_mips.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mips/hevcdsp_mips.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mips/hevcdsp_mips.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mips/hevcdsp_mips.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mips/hevcdsp_mips.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mips/hevcdsp_msa.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mips/hevcdsp_msa.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mips/hevcdsp_msa.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mips/hevcdsp_msa.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mips/hevcpred_init_mips.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mips/hevcpred_init_mips.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mips/hevcpred_init_mips.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mips/hevcpred_init_mips.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mips/hevcpred_mips.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mips/hevcpred_mips.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mips/hevcpred_mips.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mips/hevcpred_mips.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mips/hevcpred_msa.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mips/hevcpred_msa.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mips/hevcpred_msa.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mips/hevcpred_msa.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mips/hpeldsp_init_mips.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mips/hpeldsp_init_mips.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mips/hpeldsp_init_mips.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mips/hpeldsp_init_mips.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mips/hpeldsp_mips.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mips/hpeldsp_mips.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mips/hpeldsp_mips.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mips/hpeldsp_mips.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mips/hpeldsp_mmi.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mips/hpeldsp_mmi.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mips/hpeldsp_mmi.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mips/hpeldsp_mmi.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mips/hpeldsp_msa.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mips/hpeldsp_msa.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mips/hpeldsp_msa.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mips/hpeldsp_msa.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mips/idctdsp_init_mips.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mips/idctdsp_init_mips.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mips/idctdsp_init_mips.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mips/idctdsp_init_mips.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mips/idctdsp_mips.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mips/idctdsp_mips.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mips/idctdsp_mips.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mips/idctdsp_mips.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mips/idctdsp_mmi.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mips/idctdsp_mmi.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mips/idctdsp_mmi.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mips/idctdsp_mmi.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mips/idctdsp_msa.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mips/idctdsp_msa.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mips/idctdsp_msa.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mips/idctdsp_msa.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mips/iirfilter_mips.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mips/iirfilter_mips.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mips/iirfilter_mips.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mips/iirfilter_mips.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mips/lsp_mips.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mips/lsp_mips.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mips/lsp_mips.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mips/lsp_mips.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mips/mathops.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mips/mathops.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mips/mathops.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mips/mathops.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mips/me_cmp_init_mips.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mips/me_cmp_init_mips.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mips/me_cmp_init_mips.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mips/me_cmp_init_mips.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mips/me_cmp_mips.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mips/me_cmp_mips.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mips/me_cmp_mips.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mips/me_cmp_mips.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mips/me_cmp_msa.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mips/me_cmp_msa.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mips/me_cmp_msa.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mips/me_cmp_msa.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mips/mpegaudiodsp_mips_fixed.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mips/mpegaudiodsp_mips_fixed.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mips/mpegaudiodsp_mips_fixed.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mips/mpegaudiodsp_mips_fixed.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mips/mpegaudiodsp_mips_float.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mips/mpegaudiodsp_mips_float.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mips/mpegaudiodsp_mips_float.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mips/mpegaudiodsp_mips_float.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mips/mpegvideo_init_mips.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mips/mpegvideo_init_mips.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mips/mpegvideo_init_mips.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mips/mpegvideo_init_mips.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mips/mpegvideo_mips.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mips/mpegvideo_mips.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mips/mpegvideo_mips.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mips/mpegvideo_mips.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mips/mpegvideo_mmi.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mips/mpegvideo_mmi.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mips/mpegvideo_mmi.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mips/mpegvideo_mmi.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mips/mpegvideo_msa.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mips/mpegvideo_msa.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mips/mpegvideo_msa.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mips/mpegvideo_msa.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mips/mpegvideoencdsp_init_mips.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mips/mpegvideoencdsp_init_mips.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mips/mpegvideoencdsp_init_mips.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mips/mpegvideoencdsp_init_mips.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mips/mpegvideoencdsp_msa.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mips/mpegvideoencdsp_msa.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mips/mpegvideoencdsp_msa.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mips/mpegvideoencdsp_msa.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mips/pixblockdsp_init_mips.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mips/pixblockdsp_init_mips.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mips/pixblockdsp_init_mips.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mips/pixblockdsp_init_mips.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mips/pixblockdsp_mips.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mips/pixblockdsp_mips.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mips/pixblockdsp_mips.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mips/pixblockdsp_mips.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mips/pixblockdsp_mmi.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mips/pixblockdsp_mmi.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mips/pixblockdsp_mmi.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mips/pixblockdsp_mmi.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mips/pixblockdsp_msa.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mips/pixblockdsp_msa.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mips/pixblockdsp_msa.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mips/pixblockdsp_msa.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mips/qpeldsp_init_mips.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mips/qpeldsp_init_mips.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mips/qpeldsp_init_mips.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mips/qpeldsp_init_mips.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mips/qpeldsp_mips.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mips/qpeldsp_mips.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mips/qpeldsp_mips.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mips/qpeldsp_mips.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mips/qpeldsp_msa.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mips/qpeldsp_msa.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mips/qpeldsp_msa.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mips/qpeldsp_msa.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mips/sbrdsp_mips.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mips/sbrdsp_mips.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mips/sbrdsp_mips.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mips/sbrdsp_mips.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mips/simple_idct_mmi.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mips/simple_idct_mmi.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mips/simple_idct_mmi.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mips/simple_idct_mmi.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mips/simple_idct_msa.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mips/simple_idct_msa.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mips/simple_idct_msa.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mips/simple_idct_msa.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mips/vc1dsp_init_mips.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mips/vc1dsp_init_mips.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mips/vc1dsp_init_mips.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mips/vc1dsp_init_mips.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mips/vc1dsp_mips.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mips/vc1dsp_mips.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mips/vc1dsp_mips.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mips/vc1dsp_mips.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mips/vc1dsp_mmi.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mips/vc1dsp_mmi.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mips/vc1dsp_mmi.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mips/vc1dsp_mmi.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mips/videodsp_init.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mips/videodsp_init.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mips/videodsp_init.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mips/videodsp_init.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mips/vp8_idct_msa.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mips/vp8_idct_msa.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mips/vp8_idct_msa.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mips/vp8_idct_msa.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mips/vp8_lpf_msa.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mips/vp8_lpf_msa.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mips/vp8_lpf_msa.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mips/vp8_lpf_msa.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mips/vp8_mc_msa.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mips/vp8_mc_msa.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mips/vp8_mc_msa.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mips/vp8_mc_msa.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mips/vp8dsp_init_mips.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mips/vp8dsp_init_mips.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mips/vp8dsp_init_mips.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mips/vp8dsp_init_mips.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mips/vp8dsp_mips.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mips/vp8dsp_mips.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mips/vp8dsp_mips.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mips/vp8dsp_mips.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mips/vp8dsp_mmi.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mips/vp8dsp_mmi.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mips/vp8dsp_mmi.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mips/vp8dsp_mmi.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mips/vp9_idct_msa.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mips/vp9_idct_msa.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mips/vp9_idct_msa.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mips/vp9_idct_msa.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mips/vp9_intra_msa.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mips/vp9_intra_msa.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mips/vp9_intra_msa.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mips/vp9_intra_msa.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mips/vp9_lpf_msa.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mips/vp9_lpf_msa.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mips/vp9_lpf_msa.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mips/vp9_lpf_msa.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mips/vp9_mc_msa.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mips/vp9_mc_msa.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mips/vp9_mc_msa.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mips/vp9_mc_msa.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mips/vp9dsp_init_mips.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mips/vp9dsp_init_mips.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mips/vp9dsp_init_mips.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mips/vp9dsp_init_mips.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mips/vp9dsp_mips.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mips/vp9dsp_mips.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mips/vp9dsp_mips.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mips/vp9dsp_mips.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mips/wmv2dsp_init_mips.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mips/wmv2dsp_init_mips.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mips/wmv2dsp_init_mips.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mips/wmv2dsp_init_mips.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mips/wmv2dsp_mips.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mips/wmv2dsp_mips.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mips/wmv2dsp_mips.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mips/wmv2dsp_mips.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mips/wmv2dsp_mmi.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mips/wmv2dsp_mmi.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mips/wmv2dsp_mmi.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mips/wmv2dsp_mmi.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mips/xvid_idct_mmi.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mips/xvid_idct_mmi.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mips/xvid_idct_mmi.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mips/xvid_idct_mmi.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mips/xvididct_init_mips.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mips/xvididct_init_mips.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mips/xvididct_init_mips.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mips/xvididct_init_mips.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mips/xvididct_mips.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mips/xvididct_mips.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mips/xvididct_mips.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mips/xvididct_mips.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mjpeg.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mjpeg.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mjpeg.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mjpeg.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mjpeg2jpeg_bsf.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mjpeg2jpeg_bsf.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mjpeg2jpeg_bsf.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mjpeg2jpeg_bsf.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mjpeg_parser.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mjpeg_parser.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mjpeg_parser.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mjpeg_parser.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mjpega_dump_header_bsf.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mjpega_dump_header_bsf.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mjpega_dump_header_bsf.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mjpega_dump_header_bsf.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mjpegbdec.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mjpegbdec.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mjpegbdec.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mjpegbdec.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mjpegdec.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mjpegdec.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mjpegdec.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mjpegdec.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mjpegdec.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mjpegdec.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mjpegdec.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mjpegdec.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mjpegenc.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mjpegenc.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mjpegenc.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mjpegenc.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mjpegenc.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mjpegenc.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mjpegenc.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mjpegenc.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mjpegenc_common.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mjpegenc_common.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mjpegenc_common.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mjpegenc_common.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mjpegenc_common.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mjpegenc_common.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mjpegenc_common.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mjpegenc_common.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mjpegenc_huffman.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mjpegenc_huffman.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mjpegenc_huffman.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mjpegenc_huffman.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mjpegenc_huffman.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mjpegenc_huffman.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mjpegenc_huffman.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mjpegenc_huffman.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mlp.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mlp.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mlp.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mlp.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mlp.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mlp.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mlp.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mlp.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mlp_parser.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mlp_parser.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mlp_parser.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mlp_parser.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mlp_parser.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mlp_parser.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mlp_parser.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mlp_parser.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mlpdec.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mlpdec.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mlpdec.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mlpdec.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mlpdsp.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mlpdsp.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mlpdsp.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mlpdsp.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mlpdsp.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mlpdsp.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mlpdsp.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mlpdsp.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mlpenc.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mlpenc.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mlpenc.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mlpenc.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mlz.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mlz.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mlz.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mlz.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mlz.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mlz.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mlz.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mlz.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mmaldec.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mmaldec.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mmaldec.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mmaldec.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mmvideo.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mmvideo.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mmvideo.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mmvideo.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/motion_est.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/motion_est.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/motion_est.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/motion_est.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/motion_est.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/motion_est.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/motion_est.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/motion_est.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/motion_est_template.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/motion_est_template.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/motion_est_template.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/motion_est_template.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/motionpixels.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/motionpixels.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/motionpixels.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/motionpixels.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/motionpixels_tablegen.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/motionpixels_tablegen.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/motionpixels_tablegen.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/motionpixels_tablegen.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/motionpixels_tablegen.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/motionpixels_tablegen.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/motionpixels_tablegen.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/motionpixels_tablegen.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/movsub_bsf.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/movsub_bsf.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/movsub_bsf.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/movsub_bsf.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/movtextdec.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/movtextdec.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/movtextdec.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/movtextdec.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/movtextenc.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/movtextenc.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/movtextenc.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/movtextenc.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mp3_header_decompress_bsf.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mp3_header_decompress_bsf.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mp3_header_decompress_bsf.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mp3_header_decompress_bsf.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mpc.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mpc.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mpc.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mpc.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mpc.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mpc.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mpc.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mpc.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mpc7.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mpc7.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mpc7.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mpc7.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mpc7data.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mpc7data.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mpc7data.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mpc7data.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mpc8.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mpc8.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mpc8.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mpc8.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mpc8data.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mpc8data.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mpc8data.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mpc8data.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mpc8huff.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mpc8huff.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mpc8huff.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mpc8huff.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mpcdata.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mpcdata.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mpcdata.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mpcdata.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mpeg12.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mpeg12.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mpeg12.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mpeg12.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mpeg12.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mpeg12.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mpeg12.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mpeg12.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mpeg12data.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mpeg12data.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mpeg12data.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mpeg12data.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mpeg12data.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mpeg12data.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mpeg12data.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mpeg12data.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mpeg12dec.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mpeg12dec.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mpeg12dec.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mpeg12dec.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mpeg12enc.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mpeg12enc.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mpeg12enc.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mpeg12enc.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mpeg12framerate.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mpeg12framerate.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mpeg12framerate.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mpeg12framerate.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mpeg12vlc.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mpeg12vlc.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mpeg12vlc.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mpeg12vlc.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mpeg2_metadata_bsf.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mpeg2_metadata_bsf.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mpeg2_metadata_bsf.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mpeg2_metadata_bsf.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mpeg4_unpack_bframes_bsf.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mpeg4_unpack_bframes_bsf.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mpeg4_unpack_bframes_bsf.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mpeg4_unpack_bframes_bsf.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mpeg4audio.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mpeg4audio.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mpeg4audio.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mpeg4audio.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mpeg4audio.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mpeg4audio.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mpeg4audio.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mpeg4audio.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mpeg4data.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mpeg4data.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mpeg4data.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mpeg4data.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mpeg4video.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mpeg4video.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mpeg4video.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mpeg4video.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mpeg4video.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mpeg4video.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mpeg4video.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mpeg4video.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mpeg4video_parser.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mpeg4video_parser.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mpeg4video_parser.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mpeg4video_parser.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mpeg4video_parser.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mpeg4video_parser.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mpeg4video_parser.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mpeg4video_parser.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mpeg4videodec.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mpeg4videodec.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mpeg4videodec.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mpeg4videodec.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mpeg4videoenc.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mpeg4videoenc.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mpeg4videoenc.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mpeg4videoenc.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mpeg_er.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mpeg_er.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mpeg_er.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mpeg_er.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mpeg_er.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mpeg_er.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mpeg_er.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mpeg_er.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mpegaudio.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mpegaudio.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mpegaudio.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mpegaudio.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mpegaudio.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mpegaudio.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mpegaudio.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mpegaudio.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mpegaudio_parser.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mpegaudio_parser.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mpegaudio_parser.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mpegaudio_parser.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mpegaudio_tablegen.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mpegaudio_tablegen.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mpegaudio_tablegen.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mpegaudio_tablegen.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mpegaudio_tablegen.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mpegaudio_tablegen.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mpegaudio_tablegen.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mpegaudio_tablegen.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mpegaudiodata.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mpegaudiodata.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mpegaudiodata.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mpegaudiodata.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mpegaudiodata.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mpegaudiodata.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mpegaudiodata.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mpegaudiodata.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mpegaudiodec_fixed.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mpegaudiodec_fixed.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mpegaudiodec_fixed.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mpegaudiodec_fixed.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mpegaudiodec_float.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mpegaudiodec_float.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mpegaudiodec_float.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mpegaudiodec_float.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mpegaudiodec_template.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mpegaudiodec_template.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mpegaudiodec_template.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mpegaudiodec_template.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mpegaudiodecheader.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mpegaudiodecheader.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mpegaudiodecheader.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mpegaudiodecheader.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mpegaudiodecheader.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mpegaudiodecheader.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mpegaudiodecheader.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mpegaudiodecheader.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mpegaudiodectab.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mpegaudiodectab.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mpegaudiodectab.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mpegaudiodectab.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mpegaudiodsp.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mpegaudiodsp.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mpegaudiodsp.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mpegaudiodsp.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mpegaudiodsp.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mpegaudiodsp.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mpegaudiodsp.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mpegaudiodsp.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mpegaudiodsp_data.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mpegaudiodsp_data.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mpegaudiodsp_data.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mpegaudiodsp_data.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mpegaudiodsp_fixed.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mpegaudiodsp_fixed.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mpegaudiodsp_fixed.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mpegaudiodsp_fixed.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mpegaudiodsp_float.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mpegaudiodsp_float.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mpegaudiodsp_float.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mpegaudiodsp_float.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mpegaudiodsp_template.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mpegaudiodsp_template.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mpegaudiodsp_template.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mpegaudiodsp_template.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mpegaudioenc_fixed.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mpegaudioenc_fixed.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mpegaudioenc_fixed.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mpegaudioenc_fixed.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mpegaudioenc_float.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mpegaudioenc_float.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mpegaudioenc_float.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mpegaudioenc_float.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mpegaudioenc_template.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mpegaudioenc_template.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mpegaudioenc_template.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mpegaudioenc_template.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mpegaudiotab.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mpegaudiotab.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mpegaudiotab.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mpegaudiotab.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mpegpicture.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mpegpicture.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mpegpicture.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mpegpicture.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mpegpicture.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mpegpicture.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mpegpicture.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mpegpicture.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mpegutils.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mpegutils.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mpegutils.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mpegutils.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mpegutils.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mpegutils.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mpegutils.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mpegutils.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mpegvideo.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mpegvideo.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mpegvideo.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mpegvideo.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mpegvideo.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mpegvideo.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mpegvideo.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mpegvideo.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mpegvideo_enc.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mpegvideo_enc.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mpegvideo_enc.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mpegvideo_enc.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mpegvideo_motion.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mpegvideo_motion.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mpegvideo_motion.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mpegvideo_motion.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mpegvideo_parser.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mpegvideo_parser.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mpegvideo_parser.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mpegvideo_parser.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mpegvideo_xvmc.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mpegvideo_xvmc.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mpegvideo_xvmc.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mpegvideo_xvmc.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mpegvideodata.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mpegvideodata.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mpegvideodata.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mpegvideodata.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mpegvideodata.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mpegvideodata.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mpegvideodata.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mpegvideodata.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mpegvideodsp.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mpegvideodsp.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mpegvideodsp.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mpegvideodsp.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mpegvideodsp.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mpegvideodsp.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mpegvideodsp.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mpegvideodsp.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mpegvideoencdsp.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mpegvideoencdsp.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mpegvideoencdsp.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mpegvideoencdsp.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mpegvideoencdsp.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mpegvideoencdsp.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mpegvideoencdsp.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mpegvideoencdsp.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mpl2dec.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mpl2dec.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mpl2dec.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mpl2dec.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mqc.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mqc.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mqc.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mqc.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mqc.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mqc.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mqc.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mqc.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mqcdec.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mqcdec.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mqcdec.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mqcdec.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mqcenc.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mqcenc.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mqcenc.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mqcenc.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mscc.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mscc.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mscc.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mscc.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/msgsmdec.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/msgsmdec.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/msgsmdec.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/msgsmdec.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/msgsmdec.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/msgsmdec.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/msgsmdec.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/msgsmdec.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/msmpeg4.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/msmpeg4.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/msmpeg4.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/msmpeg4.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/msmpeg4.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/msmpeg4.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/msmpeg4.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/msmpeg4.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/msmpeg4data.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/msmpeg4data.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/msmpeg4data.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/msmpeg4data.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/msmpeg4data.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/msmpeg4data.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/msmpeg4data.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/msmpeg4data.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/msmpeg4dec.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/msmpeg4dec.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/msmpeg4dec.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/msmpeg4dec.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/msmpeg4enc.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/msmpeg4enc.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/msmpeg4enc.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/msmpeg4enc.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/msrle.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/msrle.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/msrle.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/msrle.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/msrledec.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/msrledec.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/msrledec.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/msrledec.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/msrledec.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/msrledec.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/msrledec.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/msrledec.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mss1.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mss1.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mss1.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mss1.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mss12.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mss12.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mss12.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mss12.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mss12.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mss12.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mss12.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mss12.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mss2.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mss2.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mss2.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mss2.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mss2dsp.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mss2dsp.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mss2dsp.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mss2dsp.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mss2dsp.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mss2dsp.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mss2dsp.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mss2dsp.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mss3.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mss3.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mss3.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mss3.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mss34dsp.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mss34dsp.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mss34dsp.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mss34dsp.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mss34dsp.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mss34dsp.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mss34dsp.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mss34dsp.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mss4.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mss4.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mss4.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mss4.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/msvideo1.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/msvideo1.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/msvideo1.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/msvideo1.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/msvideo1enc.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/msvideo1enc.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/msvideo1enc.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/msvideo1enc.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mvcdec.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mvcdec.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mvcdec.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mvcdec.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mwsc.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mwsc.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mwsc.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mwsc.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mxpegdec.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mxpegdec.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/mxpegdec.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/mxpegdec.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/nellymoser.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/nellymoser.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/nellymoser.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/nellymoser.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/nellymoser.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/nellymoser.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/nellymoser.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/nellymoser.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/nellymoserdec.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/nellymoserdec.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/nellymoserdec.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/nellymoserdec.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/nellymoserenc.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/nellymoserenc.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/nellymoserenc.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/nellymoserenc.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/neon/Makefile b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/neon/Makefile
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/neon/Makefile
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/neon/Makefile
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/neon/mpegvideo.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/neon/mpegvideo.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/neon/mpegvideo.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/neon/mpegvideo.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/noise_bsf.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/noise_bsf.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/noise_bsf.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/noise_bsf.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/null_bsf.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/null_bsf.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/null_bsf.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/null_bsf.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/nuv.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/nuv.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/nuv.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/nuv.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/nvdec.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/nvdec.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/nvdec.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/nvdec.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/nvdec.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/nvdec.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/nvdec.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/nvdec.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/nvdec_h264.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/nvdec_h264.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/nvdec_h264.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/nvdec_h264.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/nvdec_hevc.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/nvdec_hevc.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/nvdec_hevc.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/nvdec_hevc.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/nvdec_mjpeg.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/nvdec_mjpeg.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/nvdec_mjpeg.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/nvdec_mjpeg.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/nvdec_mpeg12.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/nvdec_mpeg12.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/nvdec_mpeg12.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/nvdec_mpeg12.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/nvdec_mpeg4.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/nvdec_mpeg4.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/nvdec_mpeg4.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/nvdec_mpeg4.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/nvdec_vc1.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/nvdec_vc1.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/nvdec_vc1.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/nvdec_vc1.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/nvdec_vp8.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/nvdec_vp8.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/nvdec_vp8.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/nvdec_vp8.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/nvdec_vp9.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/nvdec_vp9.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/nvdec_vp9.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/nvdec_vp9.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/nvenc.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/nvenc.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/nvenc.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/nvenc.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/nvenc.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/nvenc.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/nvenc.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/nvenc.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/nvenc_h264.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/nvenc_h264.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/nvenc_h264.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/nvenc_h264.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/nvenc_hevc.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/nvenc_hevc.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/nvenc_hevc.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/nvenc_hevc.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/omx.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/omx.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/omx.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/omx.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/on2avc.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/on2avc.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/on2avc.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/on2avc.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/on2avcdata.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/on2avcdata.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/on2avcdata.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/on2avcdata.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/on2avcdata.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/on2avcdata.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/on2avcdata.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/on2avcdata.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/options.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/options.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/options.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/options.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/options_table.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/options_table.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/options_table.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/options_table.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/opus.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/opus.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/opus.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/opus.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/opus.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/opus.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/opus.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/opus.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/opus_celt.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/opus_celt.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/opus_celt.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/opus_celt.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/opus_celt.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/opus_celt.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/opus_celt.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/opus_celt.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/opus_parser.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/opus_parser.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/opus_parser.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/opus_parser.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/opus_pvq.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/opus_pvq.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/opus_pvq.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/opus_pvq.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/opus_pvq.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/opus_pvq.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/opus_pvq.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/opus_pvq.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/opus_rc.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/opus_rc.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/opus_rc.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/opus_rc.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/opus_rc.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/opus_rc.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/opus_rc.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/opus_rc.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/opus_silk.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/opus_silk.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/opus_silk.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/opus_silk.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/opusdec.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/opusdec.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/opusdec.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/opusdec.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/opusenc.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/opusenc.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/opusenc.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/opusenc.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/opusenc.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/opusenc.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/opusenc.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/opusenc.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/opusenc_psy.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/opusenc_psy.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/opusenc_psy.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/opusenc_psy.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/opusenc_psy.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/opusenc_psy.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/opusenc_psy.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/opusenc_psy.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/opusenc_utils.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/opusenc_utils.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/opusenc_utils.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/opusenc_utils.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/opustab.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/opustab.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/opustab.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/opustab.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/opustab.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/opustab.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/opustab.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/opustab.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/paf.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/paf.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/paf.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/paf.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/pafaudio.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/pafaudio.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/pafaudio.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/pafaudio.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/pafvideo.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/pafvideo.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/pafvideo.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/pafvideo.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/pamenc.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/pamenc.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/pamenc.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/pamenc.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/parser.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/parser.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/parser.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/parser.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/parser.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/parser.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/parser.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/parser.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/parsers.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/parsers.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/parsers.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/parsers.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/pcm-bluray.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/pcm-bluray.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/pcm-bluray.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/pcm-bluray.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/pcm-dvd.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/pcm-dvd.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/pcm-dvd.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/pcm-dvd.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/pcm.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/pcm.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/pcm.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/pcm.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/pcm_tablegen.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/pcm_tablegen.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/pcm_tablegen.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/pcm_tablegen.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/pcm_tablegen.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/pcm_tablegen.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/pcm_tablegen.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/pcm_tablegen.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/pcx.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/pcx.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/pcx.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/pcx.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/pcxenc.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/pcxenc.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/pcxenc.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/pcxenc.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/pel_template.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/pel_template.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/pel_template.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/pel_template.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/pgssubdec.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/pgssubdec.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/pgssubdec.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/pgssubdec.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/pictordec.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/pictordec.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/pictordec.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/pictordec.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/pixblockdsp.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/pixblockdsp.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/pixblockdsp.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/pixblockdsp.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/pixblockdsp.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/pixblockdsp.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/pixblockdsp.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/pixblockdsp.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/pixels.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/pixels.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/pixels.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/pixels.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/pixlet.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/pixlet.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/pixlet.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/pixlet.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/png.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/png.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/png.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/png.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/png.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/png.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/png.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/png.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/png_parser.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/png_parser.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/png_parser.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/png_parser.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/pngdec.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/pngdec.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/pngdec.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/pngdec.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/pngdsp.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/pngdsp.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/pngdsp.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/pngdsp.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/pngdsp.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/pngdsp.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/pngdsp.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/pngdsp.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/pngenc.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/pngenc.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/pngenc.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/pngenc.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/pnm.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/pnm.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/pnm.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/pnm.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/pnm.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/pnm.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/pnm.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/pnm.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/pnm_parser.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/pnm_parser.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/pnm_parser.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/pnm_parser.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/pnmdec.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/pnmdec.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/pnmdec.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/pnmdec.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/pnmenc.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/pnmenc.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/pnmenc.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/pnmenc.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/ppc/Makefile b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/ppc/Makefile
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/ppc/Makefile
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/ppc/Makefile
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/ppc/asm.S b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/ppc/asm.S
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/ppc/asm.S
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/ppc/asm.S
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/ppc/audiodsp.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/ppc/audiodsp.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/ppc/audiodsp.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/ppc/audiodsp.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/ppc/blockdsp.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/ppc/blockdsp.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/ppc/blockdsp.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/ppc/blockdsp.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/ppc/fdct.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/ppc/fdct.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/ppc/fdct.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/ppc/fdct.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/ppc/fdctdsp.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/ppc/fdctdsp.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/ppc/fdctdsp.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/ppc/fdctdsp.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/ppc/fft_altivec.S b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/ppc/fft_altivec.S
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/ppc/fft_altivec.S
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/ppc/fft_altivec.S
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/ppc/fft_init.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/ppc/fft_init.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/ppc/fft_init.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/ppc/fft_init.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/ppc/fft_vsx.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/ppc/fft_vsx.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/ppc/fft_vsx.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/ppc/fft_vsx.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/ppc/fft_vsx.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/ppc/fft_vsx.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/ppc/fft_vsx.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/ppc/fft_vsx.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/ppc/fmtconvert_altivec.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/ppc/fmtconvert_altivec.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/ppc/fmtconvert_altivec.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/ppc/fmtconvert_altivec.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/ppc/h264chroma_init.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/ppc/h264chroma_init.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/ppc/h264chroma_init.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/ppc/h264chroma_init.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/ppc/h264chroma_template.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/ppc/h264chroma_template.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/ppc/h264chroma_template.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/ppc/h264chroma_template.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/ppc/h264dsp.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/ppc/h264dsp.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/ppc/h264dsp.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/ppc/h264dsp.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/ppc/h264qpel.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/ppc/h264qpel.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/ppc/h264qpel.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/ppc/h264qpel.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/ppc/h264qpel_template.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/ppc/h264qpel_template.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/ppc/h264qpel_template.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/ppc/h264qpel_template.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/ppc/hevcdsp.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/ppc/hevcdsp.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/ppc/hevcdsp.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/ppc/hevcdsp.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/ppc/hevcdsp_template.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/ppc/hevcdsp_template.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/ppc/hevcdsp_template.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/ppc/hevcdsp_template.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/ppc/hpeldsp_altivec.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/ppc/hpeldsp_altivec.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/ppc/hpeldsp_altivec.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/ppc/hpeldsp_altivec.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/ppc/hpeldsp_altivec.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/ppc/hpeldsp_altivec.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/ppc/hpeldsp_altivec.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/ppc/hpeldsp_altivec.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/ppc/idctdsp.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/ppc/idctdsp.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/ppc/idctdsp.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/ppc/idctdsp.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/ppc/lossless_audiodsp_altivec.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/ppc/lossless_audiodsp_altivec.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/ppc/lossless_audiodsp_altivec.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/ppc/lossless_audiodsp_altivec.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/ppc/lossless_videodsp_altivec.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/ppc/lossless_videodsp_altivec.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/ppc/lossless_videodsp_altivec.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/ppc/lossless_videodsp_altivec.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/ppc/mathops.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/ppc/mathops.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/ppc/mathops.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/ppc/mathops.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/ppc/me_cmp.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/ppc/me_cmp.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/ppc/me_cmp.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/ppc/me_cmp.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/ppc/mpegaudiodsp_altivec.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/ppc/mpegaudiodsp_altivec.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/ppc/mpegaudiodsp_altivec.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/ppc/mpegaudiodsp_altivec.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/ppc/mpegvideo_altivec.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/ppc/mpegvideo_altivec.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/ppc/mpegvideo_altivec.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/ppc/mpegvideo_altivec.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/ppc/mpegvideodsp.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/ppc/mpegvideodsp.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/ppc/mpegvideodsp.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/ppc/mpegvideodsp.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/ppc/mpegvideoencdsp.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/ppc/mpegvideoencdsp.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/ppc/mpegvideoencdsp.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/ppc/mpegvideoencdsp.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/ppc/pixblockdsp.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/ppc/pixblockdsp.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/ppc/pixblockdsp.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/ppc/pixblockdsp.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/ppc/svq1enc_altivec.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/ppc/svq1enc_altivec.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/ppc/svq1enc_altivec.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/ppc/svq1enc_altivec.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/ppc/vc1dsp_altivec.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/ppc/vc1dsp_altivec.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/ppc/vc1dsp_altivec.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/ppc/vc1dsp_altivec.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/ppc/videodsp.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/ppc/videodsp.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/ppc/videodsp.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/ppc/videodsp.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/ppc/vorbisdsp_altivec.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/ppc/vorbisdsp_altivec.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/ppc/vorbisdsp_altivec.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/ppc/vorbisdsp_altivec.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/ppc/vp3dsp_altivec.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/ppc/vp3dsp_altivec.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/ppc/vp3dsp_altivec.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/ppc/vp3dsp_altivec.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/ppc/vp8dsp_altivec.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/ppc/vp8dsp_altivec.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/ppc/vp8dsp_altivec.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/ppc/vp8dsp_altivec.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/profiles.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/profiles.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/profiles.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/profiles.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/profiles.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/profiles.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/profiles.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/profiles.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/proresdata.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/proresdata.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/proresdata.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/proresdata.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/proresdata.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/proresdata.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/proresdata.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/proresdata.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/proresdec.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/proresdec.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/proresdec.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/proresdec.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/proresdec2.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/proresdec2.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/proresdec2.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/proresdec2.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/proresdsp.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/proresdsp.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/proresdsp.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/proresdsp.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/proresdsp.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/proresdsp.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/proresdsp.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/proresdsp.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/proresenc_anatoliy.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/proresenc_anatoliy.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/proresenc_anatoliy.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/proresenc_anatoliy.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/proresenc_kostya.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/proresenc_kostya.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/proresenc_kostya.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/proresenc_kostya.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/prosumer.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/prosumer.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/prosumer.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/prosumer.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/psd.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/psd.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/psd.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/psd.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/psymodel.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/psymodel.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/psymodel.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/psymodel.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/psymodel.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/psymodel.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/psymodel.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/psymodel.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/pthread.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/pthread.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/pthread.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/pthread.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/pthread_frame.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/pthread_frame.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/pthread_frame.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/pthread_frame.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/pthread_internal.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/pthread_internal.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/pthread_internal.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/pthread_internal.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/pthread_slice.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/pthread_slice.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/pthread_slice.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/pthread_slice.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/ptx.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/ptx.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/ptx.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/ptx.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/put_bits.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/put_bits.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/put_bits.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/put_bits.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/qcelpdata.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/qcelpdata.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/qcelpdata.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/qcelpdata.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/qcelpdec.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/qcelpdec.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/qcelpdec.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/qcelpdec.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/qdm2.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/qdm2.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/qdm2.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/qdm2.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/qdm2_tablegen.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/qdm2_tablegen.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/qdm2_tablegen.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/qdm2_tablegen.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/qdm2_tablegen.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/qdm2_tablegen.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/qdm2_tablegen.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/qdm2_tablegen.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/qdm2data.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/qdm2data.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/qdm2data.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/qdm2data.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/qdmc.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/qdmc.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/qdmc.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/qdmc.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/qdrw.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/qdrw.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/qdrw.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/qdrw.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/qpeg.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/qpeg.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/qpeg.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/qpeg.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/qpel_template.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/qpel_template.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/qpel_template.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/qpel_template.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/qpeldsp.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/qpeldsp.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/qpeldsp.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/qpeldsp.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/qpeldsp.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/qpeldsp.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/qpeldsp.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/qpeldsp.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/qsv.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/qsv.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/qsv.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/qsv.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/qsv.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/qsv.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/qsv.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/qsv.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/qsv_api.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/qsv_api.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/qsv_api.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/qsv_api.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/qsv_internal.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/qsv_internal.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/qsv_internal.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/qsv_internal.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/qsvdec.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/qsvdec.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/qsvdec.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/qsvdec.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/qsvdec.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/qsvdec.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/qsvdec.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/qsvdec.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/qsvdec_h2645.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/qsvdec_h2645.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/qsvdec_h2645.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/qsvdec_h2645.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/qsvdec_other.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/qsvdec_other.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/qsvdec_other.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/qsvdec_other.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/qsvenc.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/qsvenc.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/qsvenc.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/qsvenc.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/qsvenc.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/qsvenc.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/qsvenc.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/qsvenc.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/qsvenc_h264.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/qsvenc_h264.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/qsvenc_h264.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/qsvenc_h264.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/qsvenc_hevc.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/qsvenc_hevc.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/qsvenc_hevc.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/qsvenc_hevc.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/qsvenc_jpeg.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/qsvenc_jpeg.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/qsvenc_jpeg.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/qsvenc_jpeg.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/qsvenc_mpeg2.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/qsvenc_mpeg2.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/qsvenc_mpeg2.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/qsvenc_mpeg2.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/qtrle.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/qtrle.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/qtrle.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/qtrle.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/qtrleenc.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/qtrleenc.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/qtrleenc.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/qtrleenc.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/r210dec.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/r210dec.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/r210dec.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/r210dec.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/r210enc.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/r210enc.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/r210enc.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/r210enc.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/ra144.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/ra144.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/ra144.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/ra144.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/ra144.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/ra144.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/ra144.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/ra144.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/ra144dec.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/ra144dec.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/ra144dec.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/ra144dec.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/ra144enc.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/ra144enc.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/ra144enc.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/ra144enc.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/ra288.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/ra288.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/ra288.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/ra288.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/ra288.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/ra288.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/ra288.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/ra288.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/ralf.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/ralf.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/ralf.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/ralf.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/ralfdata.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/ralfdata.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/ralfdata.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/ralfdata.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/rangecoder.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/rangecoder.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/rangecoder.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/rangecoder.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/rangecoder.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/rangecoder.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/rangecoder.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/rangecoder.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/rasc.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/rasc.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/rasc.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/rasc.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/ratecontrol.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/ratecontrol.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/ratecontrol.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/ratecontrol.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/ratecontrol.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/ratecontrol.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/ratecontrol.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/ratecontrol.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/raw.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/raw.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/raw.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/raw.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/raw.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/raw.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/raw.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/raw.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/rawdec.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/rawdec.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/rawdec.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/rawdec.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/rawenc.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/rawenc.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/rawenc.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/rawenc.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/rdft.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/rdft.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/rdft.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/rdft.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/rdft.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/rdft.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/rdft.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/rdft.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/realtextdec.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/realtextdec.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/realtextdec.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/realtextdec.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/rectangle.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/rectangle.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/rectangle.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/rectangle.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/remove_extradata_bsf.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/remove_extradata_bsf.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/remove_extradata_bsf.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/remove_extradata_bsf.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/reverse.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/reverse.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/reverse.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/reverse.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/rkmppdec.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/rkmppdec.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/rkmppdec.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/rkmppdec.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/rl.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/rl.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/rl.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/rl.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/rl.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/rl.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/rl.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/rl.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/rl2.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/rl2.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/rl2.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/rl2.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/rle.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/rle.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/rle.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/rle.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/rle.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/rle.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/rle.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/rle.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/rnd_avg.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/rnd_avg.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/rnd_avg.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/rnd_avg.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/roqaudioenc.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/roqaudioenc.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/roqaudioenc.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/roqaudioenc.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/roqvideo.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/roqvideo.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/roqvideo.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/roqvideo.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/roqvideo.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/roqvideo.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/roqvideo.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/roqvideo.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/roqvideodec.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/roqvideodec.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/roqvideodec.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/roqvideodec.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/roqvideoenc.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/roqvideoenc.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/roqvideoenc.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/roqvideoenc.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/rpza.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/rpza.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/rpza.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/rpza.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/rscc.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/rscc.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/rscc.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/rscc.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/rtjpeg.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/rtjpeg.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/rtjpeg.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/rtjpeg.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/rtjpeg.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/rtjpeg.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/rtjpeg.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/rtjpeg.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/rv10.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/rv10.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/rv10.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/rv10.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/rv10.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/rv10.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/rv10.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/rv10.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/rv10enc.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/rv10enc.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/rv10enc.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/rv10enc.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/rv20enc.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/rv20enc.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/rv20enc.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/rv20enc.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/rv30.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/rv30.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/rv30.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/rv30.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/rv30data.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/rv30data.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/rv30data.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/rv30data.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/rv30dsp.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/rv30dsp.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/rv30dsp.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/rv30dsp.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/rv34.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/rv34.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/rv34.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/rv34.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/rv34.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/rv34.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/rv34.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/rv34.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/rv34_parser.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/rv34_parser.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/rv34_parser.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/rv34_parser.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/rv34data.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/rv34data.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/rv34data.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/rv34data.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/rv34dsp.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/rv34dsp.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/rv34dsp.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/rv34dsp.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/rv34dsp.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/rv34dsp.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/rv34dsp.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/rv34dsp.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/rv34vlc.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/rv34vlc.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/rv34vlc.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/rv34vlc.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/rv40.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/rv40.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/rv40.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/rv40.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/rv40data.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/rv40data.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/rv40data.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/rv40data.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/rv40dsp.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/rv40dsp.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/rv40dsp.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/rv40dsp.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/rv40vlc2.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/rv40vlc2.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/rv40vlc2.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/rv40vlc2.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/s302m.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/s302m.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/s302m.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/s302m.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/s302menc.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/s302menc.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/s302menc.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/s302menc.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/samidec.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/samidec.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/samidec.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/samidec.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/sanm.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/sanm.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/sanm.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/sanm.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/sbc.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/sbc.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/sbc.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/sbc.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/sbc.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/sbc.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/sbc.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/sbc.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/sbc_parser.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/sbc_parser.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/sbc_parser.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/sbc_parser.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/sbcdec.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/sbcdec.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/sbcdec.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/sbcdec.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/sbcdec_data.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/sbcdec_data.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/sbcdec_data.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/sbcdec_data.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/sbcdec_data.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/sbcdec_data.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/sbcdec_data.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/sbcdec_data.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/sbcdsp.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/sbcdsp.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/sbcdsp.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/sbcdsp.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/sbcdsp.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/sbcdsp.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/sbcdsp.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/sbcdsp.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/sbcdsp_data.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/sbcdsp_data.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/sbcdsp_data.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/sbcdsp_data.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/sbcdsp_data.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/sbcdsp_data.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/sbcdsp_data.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/sbcdsp_data.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/sbcenc.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/sbcenc.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/sbcenc.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/sbcenc.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/sbr.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/sbr.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/sbr.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/sbr.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/sbrdsp.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/sbrdsp.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/sbrdsp.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/sbrdsp.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/sbrdsp.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/sbrdsp.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/sbrdsp.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/sbrdsp.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/sbrdsp_fixed.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/sbrdsp_fixed.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/sbrdsp_fixed.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/sbrdsp_fixed.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/sbrdsp_template.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/sbrdsp_template.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/sbrdsp_template.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/sbrdsp_template.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/scpr.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/scpr.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/scpr.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/scpr.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/screenpresso.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/screenpresso.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/screenpresso.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/screenpresso.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/sgi.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/sgi.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/sgi.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/sgi.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/sgidec.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/sgidec.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/sgidec.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/sgidec.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/sgienc.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/sgienc.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/sgienc.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/sgienc.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/sgirledec.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/sgirledec.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/sgirledec.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/sgirledec.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/sh4/README b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/sh4/README
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/sh4/README
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/sh4/README
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/sheervideo.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/sheervideo.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/sheervideo.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/sheervideo.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/sheervideodata.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/sheervideodata.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/sheervideodata.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/sheervideodata.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/shorten.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/shorten.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/shorten.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/shorten.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/simple_idct.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/simple_idct.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/simple_idct.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/simple_idct.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/simple_idct.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/simple_idct.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/simple_idct.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/simple_idct.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/simple_idct_template.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/simple_idct_template.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/simple_idct_template.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/simple_idct_template.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/sinewin.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/sinewin.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/sinewin.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/sinewin.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/sinewin.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/sinewin.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/sinewin.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/sinewin.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/sinewin_fixed.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/sinewin_fixed.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/sinewin_fixed.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/sinewin_fixed.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/sinewin_fixed_tablegen.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/sinewin_fixed_tablegen.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/sinewin_fixed_tablegen.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/sinewin_fixed_tablegen.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/sinewin_tablegen.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/sinewin_tablegen.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/sinewin_tablegen.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/sinewin_tablegen.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/sinewin_tablegen.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/sinewin_tablegen.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/sinewin_tablegen.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/sinewin_tablegen.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/sinewin_tablegen_template.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/sinewin_tablegen_template.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/sinewin_tablegen_template.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/sinewin_tablegen_template.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/sipr.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/sipr.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/sipr.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/sipr.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/sipr.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/sipr.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/sipr.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/sipr.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/sipr16k.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/sipr16k.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/sipr16k.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/sipr16k.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/sipr16kdata.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/sipr16kdata.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/sipr16kdata.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/sipr16kdata.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/sipr_parser.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/sipr_parser.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/sipr_parser.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/sipr_parser.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/siprdata.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/siprdata.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/siprdata.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/siprdata.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/smacker.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/smacker.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/smacker.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/smacker.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/smc.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/smc.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/smc.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/smc.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/smvjpegdec.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/smvjpegdec.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/smvjpegdec.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/smvjpegdec.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/snappy.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/snappy.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/snappy.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/snappy.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/snappy.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/snappy.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/snappy.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/snappy.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/snow.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/snow.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/snow.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/snow.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/snow.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/snow.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/snow.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/snow.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/snow_dwt.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/snow_dwt.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/snow_dwt.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/snow_dwt.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/snow_dwt.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/snow_dwt.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/snow_dwt.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/snow_dwt.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/snowdata.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/snowdata.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/snowdata.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/snowdata.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/snowdec.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/snowdec.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/snowdec.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/snowdec.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/snowenc.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/snowenc.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/snowenc.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/snowenc.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/sonic.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/sonic.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/sonic.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/sonic.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/sp5x.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/sp5x.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/sp5x.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/sp5x.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/sp5xdec.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/sp5xdec.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/sp5xdec.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/sp5xdec.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/sparc/README b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/sparc/README
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/sparc/README
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/sparc/README
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/speedhq.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/speedhq.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/speedhq.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/speedhq.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/srtdec.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/srtdec.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/srtdec.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/srtdec.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/srtenc.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/srtenc.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/srtenc.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/srtenc.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/startcode.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/startcode.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/startcode.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/startcode.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/startcode.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/startcode.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/startcode.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/startcode.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/subviewerdec.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/subviewerdec.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/subviewerdec.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/subviewerdec.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/sunrast.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/sunrast.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/sunrast.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/sunrast.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/sunrast.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/sunrast.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/sunrast.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/sunrast.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/sunrastenc.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/sunrastenc.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/sunrastenc.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/sunrastenc.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/svq1.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/svq1.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/svq1.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/svq1.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/svq1.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/svq1.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/svq1.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/svq1.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/svq13.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/svq13.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/svq13.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/svq13.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/svq1_cb.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/svq1_cb.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/svq1_cb.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/svq1_cb.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/svq1_vlc.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/svq1_vlc.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/svq1_vlc.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/svq1_vlc.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/svq1dec.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/svq1dec.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/svq1dec.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/svq1dec.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/svq1enc.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/svq1enc.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/svq1enc.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/svq1enc.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/svq1enc.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/svq1enc.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/svq1enc.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/svq1enc.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/svq1enc_cb.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/svq1enc_cb.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/svq1enc_cb.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/svq1enc_cb.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/svq3.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/svq3.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/svq3.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/svq3.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/synth_filter.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/synth_filter.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/synth_filter.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/synth_filter.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/synth_filter.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/synth_filter.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/synth_filter.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/synth_filter.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/tableprint.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/tableprint.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/tableprint.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/tableprint.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/tableprint_vlc.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/tableprint_vlc.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/tableprint_vlc.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/tableprint_vlc.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/tak.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/tak.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/tak.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/tak.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/tak.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/tak.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/tak.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/tak.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/tak_parser.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/tak_parser.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/tak_parser.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/tak_parser.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/takdec.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/takdec.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/takdec.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/takdec.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/takdsp.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/takdsp.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/takdsp.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/takdsp.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/takdsp.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/takdsp.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/takdsp.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/takdsp.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/targa.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/targa.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/targa.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/targa.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/targa.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/targa.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/targa.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/targa.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/targa_y216dec.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/targa_y216dec.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/targa_y216dec.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/targa_y216dec.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/targaenc.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/targaenc.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/targaenc.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/targaenc.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/tdsc.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/tdsc.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/tdsc.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/tdsc.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/tests/aarch64/dct.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/tests/aarch64/dct.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/tests/aarch64/dct.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/tests/aarch64/dct.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/tests/arm/dct.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/tests/arm/dct.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/tests/arm/dct.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/tests/arm/dct.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/tests/avfft.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/tests/avfft.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/tests/avfft.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/tests/avfft.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/tests/avpacket.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/tests/avpacket.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/tests/avpacket.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/tests/avpacket.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/tests/cabac.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/tests/cabac.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/tests/cabac.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/tests/cabac.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/tests/celp_math.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/tests/celp_math.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/tests/celp_math.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/tests/celp_math.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/tests/codec_desc.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/tests/codec_desc.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/tests/codec_desc.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/tests/codec_desc.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/tests/dct.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/tests/dct.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/tests/dct.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/tests/dct.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/tests/fft-fixed.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/tests/fft-fixed.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/tests/fft-fixed.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/tests/fft-fixed.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/tests/fft-fixed32.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/tests/fft-fixed32.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/tests/fft-fixed32.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/tests/fft-fixed32.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/tests/fft.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/tests/fft.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/tests/fft.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/tests/fft.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/tests/golomb.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/tests/golomb.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/tests/golomb.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/tests/golomb.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/tests/h264_levels.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/tests/h264_levels.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/tests/h264_levels.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/tests/h264_levels.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/tests/htmlsubtitles.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/tests/htmlsubtitles.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/tests/htmlsubtitles.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/tests/htmlsubtitles.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/tests/iirfilter.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/tests/iirfilter.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/tests/iirfilter.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/tests/iirfilter.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/tests/imgconvert.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/tests/imgconvert.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/tests/imgconvert.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/tests/imgconvert.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/tests/jpeg2000dwt.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/tests/jpeg2000dwt.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/tests/jpeg2000dwt.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/tests/jpeg2000dwt.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/tests/mathops.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/tests/mathops.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/tests/mathops.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/tests/mathops.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/tests/mjpegenc_huffman.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/tests/mjpegenc_huffman.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/tests/mjpegenc_huffman.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/tests/mjpegenc_huffman.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/tests/motion.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/tests/motion.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/tests/motion.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/tests/motion.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/tests/mpeg12framerate.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/tests/mpeg12framerate.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/tests/mpeg12framerate.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/tests/mpeg12framerate.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/tests/options.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/tests/options.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/tests/options.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/tests/options.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/tests/ppc/dct.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/tests/ppc/dct.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/tests/ppc/dct.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/tests/ppc/dct.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/tests/rangecoder.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/tests/rangecoder.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/tests/rangecoder.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/tests/rangecoder.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/tests/snowenc.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/tests/snowenc.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/tests/snowenc.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/tests/snowenc.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/tests/utils.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/tests/utils.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/tests/utils.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/tests/utils.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/tests/x86/dct.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/tests/x86/dct.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/tests/x86/dct.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/tests/x86/dct.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/textdec.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/textdec.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/textdec.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/textdec.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/texturedsp.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/texturedsp.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/texturedsp.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/texturedsp.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/texturedsp.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/texturedsp.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/texturedsp.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/texturedsp.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/texturedspenc.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/texturedspenc.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/texturedspenc.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/texturedspenc.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/thread.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/thread.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/thread.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/thread.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/tiertexseqv.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/tiertexseqv.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/tiertexseqv.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/tiertexseqv.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/tiff.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/tiff.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/tiff.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/tiff.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/tiff.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/tiff.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/tiff.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/tiff.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/tiff_common.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/tiff_common.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/tiff_common.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/tiff_common.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/tiff_common.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/tiff_common.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/tiff_common.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/tiff_common.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/tiff_data.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/tiff_data.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/tiff_data.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/tiff_data.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/tiff_data.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/tiff_data.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/tiff_data.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/tiff_data.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/tiffenc.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/tiffenc.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/tiffenc.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/tiffenc.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/tmv.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/tmv.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/tmv.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/tmv.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/tpeldsp.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/tpeldsp.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/tpeldsp.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/tpeldsp.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/tpeldsp.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/tpeldsp.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/tpeldsp.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/tpeldsp.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/trace_headers_bsf.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/trace_headers_bsf.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/trace_headers_bsf.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/trace_headers_bsf.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/truemotion1.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/truemotion1.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/truemotion1.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/truemotion1.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/truemotion1data.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/truemotion1data.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/truemotion1data.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/truemotion1data.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/truemotion2.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/truemotion2.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/truemotion2.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/truemotion2.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/truemotion2rt.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/truemotion2rt.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/truemotion2rt.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/truemotion2rt.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/truespeech.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/truespeech.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/truespeech.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/truespeech.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/truespeech_data.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/truespeech_data.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/truespeech_data.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/truespeech_data.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/tscc.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/tscc.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/tscc.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/tscc.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/tscc2.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/tscc2.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/tscc2.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/tscc2.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/tscc2data.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/tscc2data.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/tscc2data.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/tscc2data.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/tta.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/tta.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/tta.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/tta.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/ttadata.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/ttadata.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/ttadata.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/ttadata.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/ttadata.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/ttadata.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/ttadata.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/ttadata.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/ttadsp.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/ttadsp.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/ttadsp.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/ttadsp.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/ttadsp.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/ttadsp.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/ttadsp.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/ttadsp.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/ttaenc.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/ttaenc.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/ttaenc.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/ttaenc.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/ttaencdsp.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/ttaencdsp.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/ttaencdsp.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/ttaencdsp.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/ttaencdsp.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/ttaencdsp.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/ttaencdsp.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/ttaencdsp.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/twinvq.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/twinvq.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/twinvq.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/twinvq.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/twinvq.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/twinvq.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/twinvq.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/twinvq.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/twinvq_data.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/twinvq_data.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/twinvq_data.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/twinvq_data.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/twinvqdec.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/twinvqdec.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/twinvqdec.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/twinvqdec.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/txd.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/txd.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/txd.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/txd.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/ulti.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/ulti.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/ulti.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/ulti.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/ulti_cb.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/ulti_cb.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/ulti_cb.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/ulti_cb.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/unary.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/unary.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/unary.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/unary.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/utils.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/utils.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/utils.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/utils.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/utvideo.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/utvideo.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/utvideo.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/utvideo.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/utvideo.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/utvideo.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/utvideo.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/utvideo.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/utvideodec.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/utvideodec.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/utvideodec.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/utvideodec.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/utvideodsp.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/utvideodsp.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/utvideodsp.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/utvideodsp.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/utvideodsp.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/utvideodsp.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/utvideodsp.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/utvideodsp.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/utvideoenc.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/utvideoenc.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/utvideoenc.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/utvideoenc.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/v210dec.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/v210dec.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/v210dec.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/v210dec.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/v210dec.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/v210dec.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/v210dec.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/v210dec.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/v210enc.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/v210enc.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/v210enc.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/v210enc.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/v210enc.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/v210enc.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/v210enc.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/v210enc.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/v210x.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/v210x.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/v210x.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/v210x.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/v308dec.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/v308dec.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/v308dec.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/v308dec.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/v308enc.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/v308enc.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/v308enc.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/v308enc.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/v408dec.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/v408dec.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/v408dec.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/v408dec.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/v408enc.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/v408enc.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/v408enc.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/v408enc.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/v410dec.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/v410dec.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/v410dec.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/v410dec.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/v410enc.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/v410enc.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/v410enc.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/v410enc.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/v4l2_buffers.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/v4l2_buffers.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/v4l2_buffers.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/v4l2_buffers.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/v4l2_buffers.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/v4l2_buffers.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/v4l2_buffers.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/v4l2_buffers.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/v4l2_context.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/v4l2_context.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/v4l2_context.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/v4l2_context.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/v4l2_context.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/v4l2_context.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/v4l2_context.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/v4l2_context.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/v4l2_fmt.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/v4l2_fmt.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/v4l2_fmt.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/v4l2_fmt.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/v4l2_fmt.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/v4l2_fmt.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/v4l2_fmt.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/v4l2_fmt.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/v4l2_m2m.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/v4l2_m2m.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/v4l2_m2m.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/v4l2_m2m.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/v4l2_m2m.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/v4l2_m2m.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/v4l2_m2m.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/v4l2_m2m.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/v4l2_m2m_dec.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/v4l2_m2m_dec.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/v4l2_m2m_dec.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/v4l2_m2m_dec.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/v4l2_m2m_enc.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/v4l2_m2m_enc.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/v4l2_m2m_enc.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/v4l2_m2m_enc.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/vaapi.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/vaapi.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/vaapi.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/vaapi.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/vaapi_decode.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/vaapi_decode.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/vaapi_decode.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/vaapi_decode.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/vaapi_decode.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/vaapi_decode.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/vaapi_decode.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/vaapi_decode.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/vaapi_encode.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/vaapi_encode.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/vaapi_encode.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/vaapi_encode.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/vaapi_encode.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/vaapi_encode.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/vaapi_encode.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/vaapi_encode.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/vaapi_encode_h264.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/vaapi_encode_h264.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/vaapi_encode_h264.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/vaapi_encode_h264.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/vaapi_encode_h265.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/vaapi_encode_h265.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/vaapi_encode_h265.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/vaapi_encode_h265.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/vaapi_encode_mjpeg.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/vaapi_encode_mjpeg.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/vaapi_encode_mjpeg.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/vaapi_encode_mjpeg.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/vaapi_encode_mpeg2.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/vaapi_encode_mpeg2.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/vaapi_encode_mpeg2.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/vaapi_encode_mpeg2.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/vaapi_encode_vp8.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/vaapi_encode_vp8.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/vaapi_encode_vp8.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/vaapi_encode_vp8.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/vaapi_encode_vp9.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/vaapi_encode_vp9.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/vaapi_encode_vp9.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/vaapi_encode_vp9.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/vaapi_h264.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/vaapi_h264.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/vaapi_h264.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/vaapi_h264.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/vaapi_hevc.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/vaapi_hevc.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/vaapi_hevc.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/vaapi_hevc.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/vaapi_mjpeg.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/vaapi_mjpeg.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/vaapi_mjpeg.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/vaapi_mjpeg.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/vaapi_mpeg2.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/vaapi_mpeg2.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/vaapi_mpeg2.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/vaapi_mpeg2.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/vaapi_mpeg4.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/vaapi_mpeg4.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/vaapi_mpeg4.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/vaapi_mpeg4.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/vaapi_vc1.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/vaapi_vc1.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/vaapi_vc1.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/vaapi_vc1.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/vaapi_vp8.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/vaapi_vp8.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/vaapi_vp8.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/vaapi_vp8.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/vaapi_vp9.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/vaapi_vp9.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/vaapi_vp9.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/vaapi_vp9.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/vb.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/vb.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/vb.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/vb.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/vble.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/vble.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/vble.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/vble.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/vc1.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/vc1.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/vc1.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/vc1.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/vc1.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/vc1.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/vc1.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/vc1.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/vc1_block.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/vc1_block.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/vc1_block.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/vc1_block.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/vc1_common.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/vc1_common.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/vc1_common.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/vc1_common.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/vc1_loopfilter.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/vc1_loopfilter.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/vc1_loopfilter.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/vc1_loopfilter.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/vc1_mc.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/vc1_mc.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/vc1_mc.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/vc1_mc.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/vc1_parser.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/vc1_parser.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/vc1_parser.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/vc1_parser.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/vc1_pred.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/vc1_pred.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/vc1_pred.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/vc1_pred.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/vc1_pred.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/vc1_pred.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/vc1_pred.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/vc1_pred.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/vc1acdata.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/vc1acdata.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/vc1acdata.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/vc1acdata.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/vc1data.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/vc1data.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/vc1data.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/vc1data.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/vc1data.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/vc1data.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/vc1data.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/vc1data.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/vc1dec.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/vc1dec.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/vc1dec.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/vc1dec.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/vc1dsp.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/vc1dsp.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/vc1dsp.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/vc1dsp.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/vc1dsp.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/vc1dsp.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/vc1dsp.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/vc1dsp.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/vc2enc.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/vc2enc.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/vc2enc.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/vc2enc.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/vc2enc_dwt.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/vc2enc_dwt.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/vc2enc_dwt.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/vc2enc_dwt.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/vc2enc_dwt.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/vc2enc_dwt.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/vc2enc_dwt.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/vc2enc_dwt.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/vcr1.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/vcr1.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/vcr1.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/vcr1.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/vdpau.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/vdpau.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/vdpau.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/vdpau.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/vdpau.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/vdpau.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/vdpau.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/vdpau.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/vdpau_h264.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/vdpau_h264.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/vdpau_h264.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/vdpau_h264.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/vdpau_hevc.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/vdpau_hevc.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/vdpau_hevc.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/vdpau_hevc.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/vdpau_internal.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/vdpau_internal.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/vdpau_internal.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/vdpau_internal.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/vdpau_mpeg12.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/vdpau_mpeg12.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/vdpau_mpeg12.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/vdpau_mpeg12.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/vdpau_mpeg4.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/vdpau_mpeg4.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/vdpau_mpeg4.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/vdpau_mpeg4.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/vdpau_vc1.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/vdpau_vc1.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/vdpau_vc1.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/vdpau_vc1.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/version.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/version.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/version.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/version.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/videodsp.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/videodsp.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/videodsp.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/videodsp.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/videodsp.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/videodsp.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/videodsp.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/videodsp.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/videodsp_template.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/videodsp_template.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/videodsp_template.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/videodsp_template.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/videotoolbox.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/videotoolbox.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/videotoolbox.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/videotoolbox.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/videotoolbox.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/videotoolbox.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/videotoolbox.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/videotoolbox.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/videotoolboxenc.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/videotoolboxenc.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/videotoolboxenc.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/videotoolboxenc.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/vima.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/vima.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/vima.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/vima.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/vlc.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/vlc.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/vlc.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/vlc.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/vmdaudio.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/vmdaudio.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/vmdaudio.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/vmdaudio.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/vmdvideo.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/vmdvideo.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/vmdvideo.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/vmdvideo.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/vmnc.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/vmnc.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/vmnc.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/vmnc.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/vorbis.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/vorbis.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/vorbis.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/vorbis.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/vorbis.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/vorbis.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/vorbis.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/vorbis.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/vorbis_data.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/vorbis_data.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/vorbis_data.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/vorbis_data.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/vorbis_enc_data.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/vorbis_enc_data.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/vorbis_enc_data.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/vorbis_enc_data.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/vorbis_parser.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/vorbis_parser.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/vorbis_parser.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/vorbis_parser.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/vorbis_parser.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/vorbis_parser.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/vorbis_parser.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/vorbis_parser.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/vorbis_parser_internal.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/vorbis_parser_internal.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/vorbis_parser_internal.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/vorbis_parser_internal.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/vorbisdec.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/vorbisdec.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/vorbisdec.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/vorbisdec.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/vorbisdsp.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/vorbisdsp.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/vorbisdsp.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/vorbisdsp.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/vorbisdsp.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/vorbisdsp.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/vorbisdsp.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/vorbisdsp.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/vorbisenc.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/vorbisenc.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/vorbisenc.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/vorbisenc.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/vp3.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/vp3.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/vp3.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/vp3.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/vp3_parser.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/vp3_parser.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/vp3_parser.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/vp3_parser.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/vp3data.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/vp3data.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/vp3data.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/vp3data.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/vp3dsp.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/vp3dsp.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/vp3dsp.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/vp3dsp.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/vp3dsp.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/vp3dsp.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/vp3dsp.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/vp3dsp.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/vp5.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/vp5.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/vp5.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/vp5.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/vp56.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/vp56.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/vp56.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/vp56.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/vp56.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/vp56.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/vp56.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/vp56.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/vp56data.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/vp56data.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/vp56data.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/vp56data.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/vp56data.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/vp56data.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/vp56data.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/vp56data.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/vp56dsp.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/vp56dsp.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/vp56dsp.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/vp56dsp.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/vp56dsp.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/vp56dsp.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/vp56dsp.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/vp56dsp.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/vp56rac.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/vp56rac.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/vp56rac.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/vp56rac.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/vp5data.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/vp5data.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/vp5data.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/vp5data.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/vp6.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/vp6.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/vp6.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/vp6.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/vp6data.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/vp6data.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/vp6data.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/vp6data.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/vp6dsp.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/vp6dsp.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/vp6dsp.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/vp6dsp.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/vp8.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/vp8.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/vp8.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/vp8.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/vp8.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/vp8.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/vp8.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/vp8.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/vp8_parser.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/vp8_parser.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/vp8_parser.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/vp8_parser.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/vp8data.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/vp8data.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/vp8data.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/vp8data.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/vp8dsp.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/vp8dsp.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/vp8dsp.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/vp8dsp.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/vp8dsp.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/vp8dsp.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/vp8dsp.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/vp8dsp.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/vp9.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/vp9.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/vp9.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/vp9.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/vp9.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/vp9.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/vp9.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/vp9.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/vp9_mc_template.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/vp9_mc_template.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/vp9_mc_template.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/vp9_mc_template.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/vp9_metadata_bsf.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/vp9_metadata_bsf.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/vp9_metadata_bsf.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/vp9_metadata_bsf.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/vp9_parser.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/vp9_parser.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/vp9_parser.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/vp9_parser.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/vp9_raw_reorder_bsf.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/vp9_raw_reorder_bsf.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/vp9_raw_reorder_bsf.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/vp9_raw_reorder_bsf.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/vp9_superframe_bsf.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/vp9_superframe_bsf.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/vp9_superframe_bsf.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/vp9_superframe_bsf.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/vp9_superframe_split_bsf.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/vp9_superframe_split_bsf.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/vp9_superframe_split_bsf.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/vp9_superframe_split_bsf.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/vp9block.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/vp9block.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/vp9block.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/vp9block.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/vp9data.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/vp9data.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/vp9data.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/vp9data.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/vp9data.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/vp9data.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/vp9data.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/vp9data.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/vp9dec.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/vp9dec.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/vp9dec.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/vp9dec.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/vp9dsp.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/vp9dsp.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/vp9dsp.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/vp9dsp.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/vp9dsp.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/vp9dsp.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/vp9dsp.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/vp9dsp.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/vp9dsp_10bpp.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/vp9dsp_10bpp.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/vp9dsp_10bpp.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/vp9dsp_10bpp.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/vp9dsp_12bpp.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/vp9dsp_12bpp.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/vp9dsp_12bpp.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/vp9dsp_12bpp.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/vp9dsp_8bpp.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/vp9dsp_8bpp.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/vp9dsp_8bpp.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/vp9dsp_8bpp.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/vp9dsp_template.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/vp9dsp_template.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/vp9dsp_template.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/vp9dsp_template.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/vp9lpf.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/vp9lpf.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/vp9lpf.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/vp9lpf.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/vp9mvs.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/vp9mvs.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/vp9mvs.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/vp9mvs.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/vp9prob.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/vp9prob.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/vp9prob.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/vp9prob.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/vp9recon.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/vp9recon.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/vp9recon.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/vp9recon.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/vp9shared.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/vp9shared.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/vp9shared.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/vp9shared.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/vqavideo.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/vqavideo.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/vqavideo.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/vqavideo.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/vt_internal.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/vt_internal.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/vt_internal.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/vt_internal.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/wavpack.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/wavpack.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/wavpack.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/wavpack.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/wavpack.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/wavpack.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/wavpack.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/wavpack.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/wavpackenc.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/wavpackenc.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/wavpackenc.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/wavpackenc.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/wavpackenc.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/wavpackenc.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/wavpackenc.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/wavpackenc.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/wcmv.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/wcmv.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/wcmv.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/wcmv.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/webp.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/webp.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/webp.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/webp.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/webvttdec.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/webvttdec.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/webvttdec.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/webvttdec.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/webvttenc.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/webvttenc.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/webvttenc.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/webvttenc.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/wma.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/wma.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/wma.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/wma.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/wma.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/wma.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/wma.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/wma.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/wma_common.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/wma_common.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/wma_common.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/wma_common.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/wma_common.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/wma_common.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/wma_common.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/wma_common.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/wma_freqs.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/wma_freqs.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/wma_freqs.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/wma_freqs.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/wma_freqs.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/wma_freqs.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/wma_freqs.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/wma_freqs.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/wmadata.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/wmadata.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/wmadata.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/wmadata.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/wmadec.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/wmadec.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/wmadec.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/wmadec.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/wmaenc.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/wmaenc.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/wmaenc.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/wmaenc.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/wmalosslessdec.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/wmalosslessdec.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/wmalosslessdec.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/wmalosslessdec.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/wmaprodata.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/wmaprodata.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/wmaprodata.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/wmaprodata.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/wmaprodec.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/wmaprodec.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/wmaprodec.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/wmaprodec.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/wmavoice.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/wmavoice.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/wmavoice.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/wmavoice.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/wmavoice_data.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/wmavoice_data.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/wmavoice_data.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/wmavoice_data.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/wmv2.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/wmv2.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/wmv2.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/wmv2.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/wmv2.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/wmv2.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/wmv2.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/wmv2.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/wmv2data.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/wmv2data.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/wmv2data.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/wmv2data.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/wmv2data.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/wmv2data.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/wmv2data.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/wmv2data.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/wmv2dec.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/wmv2dec.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/wmv2dec.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/wmv2dec.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/wmv2dsp.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/wmv2dsp.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/wmv2dsp.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/wmv2dsp.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/wmv2dsp.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/wmv2dsp.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/wmv2dsp.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/wmv2dsp.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/wmv2enc.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/wmv2enc.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/wmv2enc.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/wmv2enc.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/wnv1.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/wnv1.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/wnv1.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/wnv1.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/wrapped_avframe.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/wrapped_avframe.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/wrapped_avframe.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/wrapped_avframe.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/ws-snd1.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/ws-snd1.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/ws-snd1.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/ws-snd1.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/Makefile b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/Makefile
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/Makefile
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/Makefile
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/aacencdsp.asm b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/aacencdsp.asm
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/aacencdsp.asm
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/aacencdsp.asm
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/aacencdsp_init.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/aacencdsp_init.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/aacencdsp_init.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/aacencdsp_init.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/aacpsdsp.asm b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/aacpsdsp.asm
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/aacpsdsp.asm
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/aacpsdsp.asm
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/aacpsdsp_init.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/aacpsdsp_init.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/aacpsdsp_init.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/aacpsdsp_init.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/ac3dsp.asm b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/ac3dsp.asm
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/ac3dsp.asm
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/ac3dsp.asm
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/ac3dsp_downmix.asm b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/ac3dsp_downmix.asm
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/ac3dsp_downmix.asm
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/ac3dsp_downmix.asm
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/ac3dsp_init.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/ac3dsp_init.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/ac3dsp_init.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/ac3dsp_init.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/alacdsp.asm b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/alacdsp.asm
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/alacdsp.asm
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/alacdsp.asm
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/alacdsp_init.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/alacdsp_init.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/alacdsp_init.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/alacdsp_init.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/audiodsp.asm b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/audiodsp.asm
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/audiodsp.asm
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/audiodsp.asm
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/audiodsp_init.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/audiodsp_init.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/audiodsp_init.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/audiodsp_init.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/blockdsp.asm b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/blockdsp.asm
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/blockdsp.asm
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/blockdsp.asm
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/blockdsp_init.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/blockdsp_init.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/blockdsp_init.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/blockdsp_init.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/bswapdsp.asm b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/bswapdsp.asm
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/bswapdsp.asm
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/bswapdsp.asm
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/bswapdsp_init.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/bswapdsp_init.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/bswapdsp_init.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/bswapdsp_init.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/cabac.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/cabac.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/cabac.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/cabac.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/cavsdsp.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/cavsdsp.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/cavsdsp.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/cavsdsp.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/cavsidct.asm b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/cavsidct.asm
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/cavsidct.asm
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/cavsidct.asm
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/constants.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/constants.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/constants.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/constants.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/constants.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/constants.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/constants.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/constants.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/dcadsp.asm b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/dcadsp.asm
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/dcadsp.asm
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/dcadsp.asm
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/dcadsp_init.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/dcadsp_init.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/dcadsp_init.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/dcadsp_init.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/dct32.asm b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/dct32.asm
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/dct32.asm
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/dct32.asm
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/dct_init.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/dct_init.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/dct_init.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/dct_init.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/dirac_dwt.asm b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/dirac_dwt.asm
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/dirac_dwt.asm
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/dirac_dwt.asm
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/dirac_dwt_init.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/dirac_dwt_init.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/dirac_dwt_init.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/dirac_dwt_init.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/diracdsp.asm b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/diracdsp.asm
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/diracdsp.asm
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/diracdsp.asm
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/diracdsp_init.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/diracdsp_init.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/diracdsp_init.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/diracdsp_init.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/dnxhdenc.asm b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/dnxhdenc.asm
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/dnxhdenc.asm
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/dnxhdenc.asm
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/dnxhdenc_init.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/dnxhdenc_init.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/dnxhdenc_init.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/dnxhdenc_init.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/exrdsp.asm b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/exrdsp.asm
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/exrdsp.asm
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/exrdsp.asm
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/exrdsp_init.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/exrdsp_init.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/exrdsp_init.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/exrdsp_init.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/fdct.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/fdct.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/fdct.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/fdct.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/fdct.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/fdct.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/fdct.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/fdct.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/fdctdsp_init.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/fdctdsp_init.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/fdctdsp_init.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/fdctdsp_init.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/fft.asm b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/fft.asm
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/fft.asm
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/fft.asm
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/fft.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/fft.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/fft.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/fft.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/fft_init.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/fft_init.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/fft_init.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/fft_init.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/flac_dsp_gpl.asm b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/flac_dsp_gpl.asm
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/flac_dsp_gpl.asm
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/flac_dsp_gpl.asm
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/flacdsp.asm b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/flacdsp.asm
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/flacdsp.asm
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/flacdsp.asm
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/flacdsp_init.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/flacdsp_init.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/flacdsp_init.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/flacdsp_init.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/fmtconvert.asm b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/fmtconvert.asm
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/fmtconvert.asm
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/fmtconvert.asm
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/fmtconvert_init.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/fmtconvert_init.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/fmtconvert_init.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/fmtconvert_init.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/fpel.asm b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/fpel.asm
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/fpel.asm
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/fpel.asm
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/fpel.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/fpel.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/fpel.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/fpel.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/g722dsp.asm b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/g722dsp.asm
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/g722dsp.asm
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/g722dsp.asm
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/g722dsp_init.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/g722dsp_init.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/g722dsp_init.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/g722dsp_init.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/h263_loopfilter.asm b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/h263_loopfilter.asm
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/h263_loopfilter.asm
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/h263_loopfilter.asm
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/h263dsp_init.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/h263dsp_init.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/h263dsp_init.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/h263dsp_init.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/h264_cabac.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/h264_cabac.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/h264_cabac.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/h264_cabac.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/h264_chromamc.asm b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/h264_chromamc.asm
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/h264_chromamc.asm
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/h264_chromamc.asm
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/h264_chromamc_10bit.asm b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/h264_chromamc_10bit.asm
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/h264_chromamc_10bit.asm
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/h264_chromamc_10bit.asm
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/h264_deblock.asm b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/h264_deblock.asm
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/h264_deblock.asm
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/h264_deblock.asm
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/h264_deblock_10bit.asm b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/h264_deblock_10bit.asm
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/h264_deblock_10bit.asm
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/h264_deblock_10bit.asm
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/h264_idct.asm b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/h264_idct.asm
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/h264_idct.asm
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/h264_idct.asm
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/h264_idct_10bit.asm b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/h264_idct_10bit.asm
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/h264_idct_10bit.asm
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/h264_idct_10bit.asm
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/h264_intrapred.asm b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/h264_intrapred.asm
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/h264_intrapred.asm
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/h264_intrapred.asm
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/h264_intrapred_10bit.asm b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/h264_intrapred_10bit.asm
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/h264_intrapred_10bit.asm
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/h264_intrapred_10bit.asm
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/h264_intrapred_init.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/h264_intrapred_init.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/h264_intrapred_init.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/h264_intrapred_init.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/h264_qpel.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/h264_qpel.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/h264_qpel.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/h264_qpel.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/h264_qpel_10bit.asm b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/h264_qpel_10bit.asm
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/h264_qpel_10bit.asm
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/h264_qpel_10bit.asm
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/h264_qpel_8bit.asm b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/h264_qpel_8bit.asm
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/h264_qpel_8bit.asm
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/h264_qpel_8bit.asm
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/h264_weight.asm b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/h264_weight.asm
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/h264_weight.asm
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/h264_weight.asm
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/h264_weight_10bit.asm b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/h264_weight_10bit.asm
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/h264_weight_10bit.asm
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/h264_weight_10bit.asm
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/h264chroma_init.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/h264chroma_init.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/h264chroma_init.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/h264chroma_init.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/h264dsp_init.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/h264dsp_init.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/h264dsp_init.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/h264dsp_init.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/hevc_add_res.asm b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/hevc_add_res.asm
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/hevc_add_res.asm
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/hevc_add_res.asm
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/hevc_deblock.asm b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/hevc_deblock.asm
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/hevc_deblock.asm
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/hevc_deblock.asm
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/hevc_idct.asm b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/hevc_idct.asm
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/hevc_idct.asm
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/hevc_idct.asm
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/hevc_mc.asm b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/hevc_mc.asm
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/hevc_mc.asm
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/hevc_mc.asm
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/hevc_sao.asm b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/hevc_sao.asm
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/hevc_sao.asm
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/hevc_sao.asm
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/hevc_sao_10bit.asm b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/hevc_sao_10bit.asm
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/hevc_sao_10bit.asm
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/hevc_sao_10bit.asm
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/hevcdsp.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/hevcdsp.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/hevcdsp.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/hevcdsp.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/hevcdsp_init.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/hevcdsp_init.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/hevcdsp_init.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/hevcdsp_init.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/hpeldsp.asm b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/hpeldsp.asm
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/hpeldsp.asm
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/hpeldsp.asm
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/hpeldsp.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/hpeldsp.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/hpeldsp.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/hpeldsp.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/hpeldsp_init.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/hpeldsp_init.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/hpeldsp_init.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/hpeldsp_init.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/hpeldsp_rnd_template.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/hpeldsp_rnd_template.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/hpeldsp_rnd_template.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/hpeldsp_rnd_template.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/hpeldsp_vp3.asm b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/hpeldsp_vp3.asm
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/hpeldsp_vp3.asm
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/hpeldsp_vp3.asm
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/hpeldsp_vp3_init.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/hpeldsp_vp3_init.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/hpeldsp_vp3_init.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/hpeldsp_vp3_init.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/huffyuvdsp.asm b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/huffyuvdsp.asm
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/huffyuvdsp.asm
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/huffyuvdsp.asm
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/huffyuvdsp_init.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/huffyuvdsp_init.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/huffyuvdsp_init.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/huffyuvdsp_init.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/huffyuvdsp_template.asm b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/huffyuvdsp_template.asm
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/huffyuvdsp_template.asm
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/huffyuvdsp_template.asm
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/huffyuvencdsp.asm b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/huffyuvencdsp.asm
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/huffyuvencdsp.asm
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/huffyuvencdsp.asm
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/huffyuvencdsp_init.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/huffyuvencdsp_init.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/huffyuvencdsp_init.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/huffyuvencdsp_init.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/idctdsp.asm b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/idctdsp.asm
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/idctdsp.asm
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/idctdsp.asm
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/idctdsp.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/idctdsp.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/idctdsp.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/idctdsp.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/idctdsp_init.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/idctdsp_init.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/idctdsp_init.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/idctdsp_init.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/imdct36.asm b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/imdct36.asm
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/imdct36.asm
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/imdct36.asm
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/inline_asm.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/inline_asm.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/inline_asm.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/inline_asm.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/jpeg2000dsp.asm b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/jpeg2000dsp.asm
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/jpeg2000dsp.asm
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/jpeg2000dsp.asm
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/jpeg2000dsp_init.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/jpeg2000dsp_init.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/jpeg2000dsp_init.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/jpeg2000dsp_init.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/lossless_audiodsp.asm b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/lossless_audiodsp.asm
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/lossless_audiodsp.asm
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/lossless_audiodsp.asm
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/lossless_audiodsp_init.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/lossless_audiodsp_init.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/lossless_audiodsp_init.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/lossless_audiodsp_init.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/lossless_videodsp.asm b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/lossless_videodsp.asm
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/lossless_videodsp.asm
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/lossless_videodsp.asm
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/lossless_videodsp_init.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/lossless_videodsp_init.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/lossless_videodsp_init.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/lossless_videodsp_init.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/lossless_videoencdsp.asm b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/lossless_videoencdsp.asm
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/lossless_videoencdsp.asm
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/lossless_videoencdsp.asm
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/lossless_videoencdsp_init.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/lossless_videoencdsp_init.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/lossless_videoencdsp_init.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/lossless_videoencdsp_init.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/lpc.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/lpc.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/lpc.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/lpc.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/mathops.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/mathops.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/mathops.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/mathops.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/mdct15.asm b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/mdct15.asm
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/mdct15.asm
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/mdct15.asm
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/mdct15_init.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/mdct15_init.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/mdct15_init.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/mdct15_init.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/me_cmp.asm b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/me_cmp.asm
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/me_cmp.asm
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/me_cmp.asm
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/me_cmp_init.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/me_cmp_init.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/me_cmp_init.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/me_cmp_init.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/mlpdsp.asm b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/mlpdsp.asm
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/mlpdsp.asm
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/mlpdsp.asm
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/mlpdsp_init.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/mlpdsp_init.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/mlpdsp_init.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/mlpdsp_init.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/mpegaudiodsp.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/mpegaudiodsp.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/mpegaudiodsp.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/mpegaudiodsp.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/mpegvideo.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/mpegvideo.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/mpegvideo.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/mpegvideo.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/mpegvideodsp.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/mpegvideodsp.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/mpegvideodsp.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/mpegvideodsp.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/mpegvideoenc.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/mpegvideoenc.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/mpegvideoenc.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/mpegvideoenc.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/mpegvideoenc_qns_template.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/mpegvideoenc_qns_template.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/mpegvideoenc_qns_template.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/mpegvideoenc_qns_template.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/mpegvideoenc_template.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/mpegvideoenc_template.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/mpegvideoenc_template.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/mpegvideoenc_template.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/mpegvideoencdsp.asm b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/mpegvideoencdsp.asm
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/mpegvideoencdsp.asm
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/mpegvideoencdsp.asm
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/mpegvideoencdsp_init.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/mpegvideoencdsp_init.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/mpegvideoencdsp_init.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/mpegvideoencdsp_init.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/opus_dsp_init.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/opus_dsp_init.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/opus_dsp_init.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/opus_dsp_init.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/opus_pvq_search.asm b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/opus_pvq_search.asm
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/opus_pvq_search.asm
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/opus_pvq_search.asm
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/pixblockdsp.asm b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/pixblockdsp.asm
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/pixblockdsp.asm
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/pixblockdsp.asm
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/pixblockdsp_init.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/pixblockdsp_init.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/pixblockdsp_init.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/pixblockdsp_init.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/pngdsp.asm b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/pngdsp.asm
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/pngdsp.asm
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/pngdsp.asm
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/pngdsp_init.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/pngdsp_init.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/pngdsp_init.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/pngdsp_init.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/proresdsp.asm b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/proresdsp.asm
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/proresdsp.asm
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/proresdsp.asm
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/proresdsp_init.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/proresdsp_init.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/proresdsp_init.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/proresdsp_init.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/qpel.asm b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/qpel.asm
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/qpel.asm
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/qpel.asm
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/qpeldsp.asm b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/qpeldsp.asm
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/qpeldsp.asm
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/qpeldsp.asm
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/qpeldsp_init.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/qpeldsp_init.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/qpeldsp_init.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/qpeldsp_init.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/rnd_template.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/rnd_template.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/rnd_template.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/rnd_template.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/rv34dsp.asm b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/rv34dsp.asm
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/rv34dsp.asm
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/rv34dsp.asm
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/rv34dsp_init.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/rv34dsp_init.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/rv34dsp_init.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/rv34dsp_init.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/rv40dsp.asm b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/rv40dsp.asm
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/rv40dsp.asm
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/rv40dsp.asm
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/rv40dsp_init.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/rv40dsp_init.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/rv40dsp_init.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/rv40dsp_init.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/sbcdsp.asm b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/sbcdsp.asm
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/sbcdsp.asm
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/sbcdsp.asm
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/sbcdsp_init.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/sbcdsp_init.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/sbcdsp_init.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/sbcdsp_init.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/sbrdsp.asm b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/sbrdsp.asm
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/sbrdsp.asm
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/sbrdsp.asm
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/sbrdsp_init.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/sbrdsp_init.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/sbrdsp_init.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/sbrdsp_init.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/simple_idct.asm b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/simple_idct.asm
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/simple_idct.asm
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/simple_idct.asm
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/simple_idct.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/simple_idct.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/simple_idct.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/simple_idct.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/simple_idct10.asm b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/simple_idct10.asm
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/simple_idct10.asm
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/simple_idct10.asm
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/simple_idct10_template.asm b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/simple_idct10_template.asm
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/simple_idct10_template.asm
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/simple_idct10_template.asm
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/snowdsp.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/snowdsp.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/snowdsp.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/snowdsp.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/svq1enc.asm b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/svq1enc.asm
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/svq1enc.asm
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/svq1enc.asm
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/svq1enc_init.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/svq1enc_init.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/svq1enc_init.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/svq1enc_init.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/synth_filter.asm b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/synth_filter.asm
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/synth_filter.asm
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/synth_filter.asm
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/synth_filter_init.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/synth_filter_init.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/synth_filter_init.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/synth_filter_init.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/takdsp.asm b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/takdsp.asm
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/takdsp.asm
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/takdsp.asm
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/takdsp_init.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/takdsp_init.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/takdsp_init.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/takdsp_init.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/ttadsp.asm b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/ttadsp.asm
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/ttadsp.asm
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/ttadsp.asm
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/ttadsp_init.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/ttadsp_init.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/ttadsp_init.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/ttadsp_init.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/ttaencdsp.asm b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/ttaencdsp.asm
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/ttaencdsp.asm
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/ttaencdsp.asm
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/ttaencdsp_init.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/ttaencdsp_init.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/ttaencdsp_init.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/ttaencdsp_init.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/utvideodsp.asm b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/utvideodsp.asm
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/utvideodsp.asm
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/utvideodsp.asm
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/utvideodsp_init.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/utvideodsp_init.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/utvideodsp_init.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/utvideodsp_init.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/v210-init.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/v210-init.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/v210-init.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/v210-init.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/v210.asm b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/v210.asm
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/v210.asm
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/v210.asm
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/v210enc.asm b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/v210enc.asm
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/v210enc.asm
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/v210enc.asm
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/v210enc_init.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/v210enc_init.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/v210enc_init.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/v210enc_init.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/vc1dsp.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/vc1dsp.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/vc1dsp.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/vc1dsp.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/vc1dsp_init.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/vc1dsp_init.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/vc1dsp_init.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/vc1dsp_init.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/vc1dsp_loopfilter.asm b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/vc1dsp_loopfilter.asm
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/vc1dsp_loopfilter.asm
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/vc1dsp_loopfilter.asm
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/vc1dsp_mc.asm b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/vc1dsp_mc.asm
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/vc1dsp_mc.asm
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/vc1dsp_mc.asm
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/vc1dsp_mmx.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/vc1dsp_mmx.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/vc1dsp_mmx.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/vc1dsp_mmx.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/videodsp.asm b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/videodsp.asm
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/videodsp.asm
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/videodsp.asm
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/videodsp_init.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/videodsp_init.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/videodsp_init.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/videodsp_init.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/vorbisdsp.asm b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/vorbisdsp.asm
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/vorbisdsp.asm
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/vorbisdsp.asm
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/vorbisdsp_init.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/vorbisdsp_init.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/vorbisdsp_init.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/vorbisdsp_init.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/vp3dsp.asm b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/vp3dsp.asm
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/vp3dsp.asm
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/vp3dsp.asm
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/vp3dsp_init.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/vp3dsp_init.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/vp3dsp_init.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/vp3dsp_init.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/vp56_arith.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/vp56_arith.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/vp56_arith.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/vp56_arith.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/vp6dsp.asm b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/vp6dsp.asm
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/vp6dsp.asm
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/vp6dsp.asm
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/vp6dsp_init.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/vp6dsp_init.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/vp6dsp_init.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/vp6dsp_init.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/vp8dsp.asm b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/vp8dsp.asm
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/vp8dsp.asm
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/vp8dsp.asm
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/vp8dsp_init.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/vp8dsp_init.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/vp8dsp_init.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/vp8dsp_init.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/vp8dsp_loopfilter.asm b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/vp8dsp_loopfilter.asm
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/vp8dsp_loopfilter.asm
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/vp8dsp_loopfilter.asm
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/vp9dsp_init.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/vp9dsp_init.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/vp9dsp_init.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/vp9dsp_init.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/vp9dsp_init.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/vp9dsp_init.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/vp9dsp_init.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/vp9dsp_init.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/vp9dsp_init_10bpp.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/vp9dsp_init_10bpp.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/vp9dsp_init_10bpp.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/vp9dsp_init_10bpp.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/vp9dsp_init_12bpp.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/vp9dsp_init_12bpp.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/vp9dsp_init_12bpp.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/vp9dsp_init_12bpp.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/vp9dsp_init_16bpp.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/vp9dsp_init_16bpp.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/vp9dsp_init_16bpp.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/vp9dsp_init_16bpp.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/vp9dsp_init_16bpp_template.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/vp9dsp_init_16bpp_template.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/vp9dsp_init_16bpp_template.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/vp9dsp_init_16bpp_template.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/vp9intrapred.asm b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/vp9intrapred.asm
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/vp9intrapred.asm
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/vp9intrapred.asm
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/vp9intrapred_16bpp.asm b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/vp9intrapred_16bpp.asm
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/vp9intrapred_16bpp.asm
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/vp9intrapred_16bpp.asm
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/vp9itxfm.asm b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/vp9itxfm.asm
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/vp9itxfm.asm
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/vp9itxfm.asm
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/vp9itxfm_16bpp.asm b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/vp9itxfm_16bpp.asm
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/vp9itxfm_16bpp.asm
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/vp9itxfm_16bpp.asm
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/vp9itxfm_template.asm b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/vp9itxfm_template.asm
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/vp9itxfm_template.asm
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/vp9itxfm_template.asm
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/vp9lpf.asm b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/vp9lpf.asm
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/vp9lpf.asm
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/vp9lpf.asm
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/vp9lpf_16bpp.asm b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/vp9lpf_16bpp.asm
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/vp9lpf_16bpp.asm
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/vp9lpf_16bpp.asm
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/vp9mc.asm b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/vp9mc.asm
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/vp9mc.asm
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/vp9mc.asm
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/vp9mc_16bpp.asm b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/vp9mc_16bpp.asm
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/vp9mc_16bpp.asm
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/vp9mc_16bpp.asm
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/w64xmmtest.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/w64xmmtest.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/w64xmmtest.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/w64xmmtest.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/xvididct.asm b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/xvididct.asm
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/xvididct.asm
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/xvididct.asm
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/xvididct.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/xvididct.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/xvididct.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/xvididct.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/xvididct_init.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/xvididct_init.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/x86/xvididct_init.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/x86/xvididct_init.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/xan.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/xan.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/xan.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/xan.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/xbmdec.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/xbmdec.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/xbmdec.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/xbmdec.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/xbmenc.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/xbmenc.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/xbmenc.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/xbmenc.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/xface.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/xface.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/xface.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/xface.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/xface.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/xface.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/xface.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/xface.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/xfacedec.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/xfacedec.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/xfacedec.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/xfacedec.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/xfaceenc.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/xfaceenc.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/xfaceenc.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/xfaceenc.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/xiph.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/xiph.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/xiph.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/xiph.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/xiph.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/xiph.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/xiph.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/xiph.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/xl.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/xl.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/xl.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/xl.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/xma_parser.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/xma_parser.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/xma_parser.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/xma_parser.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/xpmdec.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/xpmdec.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/xpmdec.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/xpmdec.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/xsubdec.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/xsubdec.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/xsubdec.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/xsubdec.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/xsubenc.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/xsubenc.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/xsubenc.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/xsubenc.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/xvididct.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/xvididct.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/xvididct.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/xvididct.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/xvididct.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/xvididct.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/xvididct.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/xvididct.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/xvmc.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/xvmc.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/xvmc.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/xvmc.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/xvmc_internal.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/xvmc_internal.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/xvmc_internal.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/xvmc_internal.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/xwd.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/xwd.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/xwd.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/xwd.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/xwddec.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/xwddec.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/xwddec.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/xwddec.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/xwdenc.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/xwdenc.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/xwdenc.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/xwdenc.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/xxan.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/xxan.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/xxan.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/xxan.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/y41pdec.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/y41pdec.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/y41pdec.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/y41pdec.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/y41penc.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/y41penc.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/y41penc.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/y41penc.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/ylc.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/ylc.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/ylc.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/ylc.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/yop.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/yop.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/yop.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/yop.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/yuv4dec.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/yuv4dec.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/yuv4dec.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/yuv4dec.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/yuv4enc.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/yuv4enc.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/yuv4enc.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/yuv4enc.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/zerocodec.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/zerocodec.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/zerocodec.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/zerocodec.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/zmbv.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/zmbv.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/zmbv.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/zmbv.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/zmbvenc.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/zmbvenc.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavcodec/zmbvenc.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavcodec/zmbvenc.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavdevice/Makefile b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavdevice/Makefile
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavdevice/Makefile
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavdevice/Makefile
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavdevice/alldevices.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavdevice/alldevices.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavdevice/alldevices.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavdevice/alldevices.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavdevice/alsa.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavdevice/alsa.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavdevice/alsa.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavdevice/alsa.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavdevice/alsa.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavdevice/alsa.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavdevice/alsa.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavdevice/alsa.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavdevice/alsa_dec.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavdevice/alsa_dec.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavdevice/alsa_dec.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavdevice/alsa_dec.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavdevice/alsa_enc.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavdevice/alsa_enc.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavdevice/alsa_enc.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavdevice/alsa_enc.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavdevice/android_camera.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavdevice/android_camera.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavdevice/android_camera.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavdevice/android_camera.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavdevice/avdevice.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavdevice/avdevice.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavdevice/avdevice.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavdevice/avdevice.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavdevice/avdevice.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavdevice/avdevice.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavdevice/avdevice.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavdevice/avdevice.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavdevice/avdeviceres.rc b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavdevice/avdeviceres.rc
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavdevice/avdeviceres.rc
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavdevice/avdeviceres.rc
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavdevice/avfoundation.m b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavdevice/avfoundation.m
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavdevice/avfoundation.m
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavdevice/avfoundation.m
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavdevice/bktr.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavdevice/bktr.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavdevice/bktr.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavdevice/bktr.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavdevice/caca.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavdevice/caca.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavdevice/caca.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavdevice/caca.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavdevice/decklink_common.cpp b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavdevice/decklink_common.cpp
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavdevice/decklink_common.cpp
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavdevice/decklink_common.cpp
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavdevice/decklink_common.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavdevice/decklink_common.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavdevice/decklink_common.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavdevice/decklink_common.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavdevice/decklink_common_c.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavdevice/decklink_common_c.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavdevice/decklink_common_c.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavdevice/decklink_common_c.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavdevice/decklink_dec.cpp b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavdevice/decklink_dec.cpp
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavdevice/decklink_dec.cpp
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavdevice/decklink_dec.cpp
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavdevice/decklink_dec.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavdevice/decklink_dec.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavdevice/decklink_dec.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavdevice/decklink_dec.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavdevice/decklink_dec_c.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavdevice/decklink_dec_c.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavdevice/decklink_dec_c.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavdevice/decklink_dec_c.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavdevice/decklink_enc.cpp b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavdevice/decklink_enc.cpp
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavdevice/decklink_enc.cpp
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavdevice/decklink_enc.cpp
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavdevice/decklink_enc.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavdevice/decklink_enc.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavdevice/decklink_enc.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavdevice/decklink_enc.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavdevice/decklink_enc_c.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavdevice/decklink_enc_c.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavdevice/decklink_enc_c.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavdevice/decklink_enc_c.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavdevice/dshow.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavdevice/dshow.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavdevice/dshow.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavdevice/dshow.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavdevice/dshow_capture.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavdevice/dshow_capture.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavdevice/dshow_capture.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavdevice/dshow_capture.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavdevice/dshow_common.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavdevice/dshow_common.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavdevice/dshow_common.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavdevice/dshow_common.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavdevice/dshow_crossbar.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavdevice/dshow_crossbar.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavdevice/dshow_crossbar.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavdevice/dshow_crossbar.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavdevice/dshow_enummediatypes.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavdevice/dshow_enummediatypes.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavdevice/dshow_enummediatypes.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavdevice/dshow_enummediatypes.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavdevice/dshow_enumpins.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavdevice/dshow_enumpins.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavdevice/dshow_enumpins.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavdevice/dshow_enumpins.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavdevice/dshow_filter.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavdevice/dshow_filter.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavdevice/dshow_filter.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavdevice/dshow_filter.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavdevice/dshow_pin.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavdevice/dshow_pin.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavdevice/dshow_pin.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavdevice/dshow_pin.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavdevice/fbdev_common.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavdevice/fbdev_common.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavdevice/fbdev_common.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavdevice/fbdev_common.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavdevice/fbdev_common.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavdevice/fbdev_common.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavdevice/fbdev_common.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavdevice/fbdev_common.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavdevice/fbdev_dec.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavdevice/fbdev_dec.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavdevice/fbdev_dec.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavdevice/fbdev_dec.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavdevice/fbdev_enc.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavdevice/fbdev_enc.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavdevice/fbdev_enc.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavdevice/fbdev_enc.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavdevice/file_open.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavdevice/file_open.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavdevice/file_open.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavdevice/file_open.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavdevice/gdigrab.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavdevice/gdigrab.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavdevice/gdigrab.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavdevice/gdigrab.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavdevice/iec61883.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavdevice/iec61883.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavdevice/iec61883.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavdevice/iec61883.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavdevice/internal.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavdevice/internal.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavdevice/internal.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavdevice/internal.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavdevice/jack.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavdevice/jack.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavdevice/jack.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavdevice/jack.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavdevice/kmsgrab.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavdevice/kmsgrab.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavdevice/kmsgrab.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavdevice/kmsgrab.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavdevice/lavfi.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavdevice/lavfi.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavdevice/lavfi.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavdevice/lavfi.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavdevice/libavdevice.v b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavdevice/libavdevice.v
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavdevice/libavdevice.v
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavdevice/libavdevice.v
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavdevice/libcdio.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavdevice/libcdio.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavdevice/libcdio.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavdevice/libcdio.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavdevice/libdc1394.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavdevice/libdc1394.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavdevice/libdc1394.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavdevice/libdc1394.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavdevice/libndi_newtek_common.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavdevice/libndi_newtek_common.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavdevice/libndi_newtek_common.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavdevice/libndi_newtek_common.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavdevice/libndi_newtek_dec.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavdevice/libndi_newtek_dec.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavdevice/libndi_newtek_dec.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavdevice/libndi_newtek_dec.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavdevice/libndi_newtek_enc.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavdevice/libndi_newtek_enc.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavdevice/libndi_newtek_enc.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavdevice/libndi_newtek_enc.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavdevice/openal-dec.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavdevice/openal-dec.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavdevice/openal-dec.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavdevice/openal-dec.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavdevice/opengl_enc.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavdevice/opengl_enc.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavdevice/opengl_enc.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavdevice/opengl_enc.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavdevice/opengl_enc_shaders.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavdevice/opengl_enc_shaders.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavdevice/opengl_enc_shaders.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavdevice/opengl_enc_shaders.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavdevice/oss.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavdevice/oss.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavdevice/oss.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavdevice/oss.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavdevice/oss.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavdevice/oss.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavdevice/oss.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavdevice/oss.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavdevice/oss_dec.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavdevice/oss_dec.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavdevice/oss_dec.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavdevice/oss_dec.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavdevice/oss_enc.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavdevice/oss_enc.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavdevice/oss_enc.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavdevice/oss_enc.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavdevice/pulse_audio_common.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavdevice/pulse_audio_common.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavdevice/pulse_audio_common.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavdevice/pulse_audio_common.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavdevice/pulse_audio_common.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavdevice/pulse_audio_common.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavdevice/pulse_audio_common.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavdevice/pulse_audio_common.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavdevice/pulse_audio_dec.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavdevice/pulse_audio_dec.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavdevice/pulse_audio_dec.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavdevice/pulse_audio_dec.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavdevice/pulse_audio_enc.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavdevice/pulse_audio_enc.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavdevice/pulse_audio_enc.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavdevice/pulse_audio_enc.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavdevice/reverse.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavdevice/reverse.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavdevice/reverse.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavdevice/reverse.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavdevice/sdl2.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavdevice/sdl2.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavdevice/sdl2.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavdevice/sdl2.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavdevice/sndio.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavdevice/sndio.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavdevice/sndio.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavdevice/sndio.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavdevice/sndio.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavdevice/sndio.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavdevice/sndio.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavdevice/sndio.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavdevice/sndio_dec.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavdevice/sndio_dec.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavdevice/sndio_dec.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavdevice/sndio_dec.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavdevice/sndio_enc.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavdevice/sndio_enc.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavdevice/sndio_enc.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavdevice/sndio_enc.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavdevice/tests/timefilter.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavdevice/tests/timefilter.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavdevice/tests/timefilter.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavdevice/tests/timefilter.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavdevice/timefilter.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavdevice/timefilter.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavdevice/timefilter.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavdevice/timefilter.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavdevice/timefilter.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavdevice/timefilter.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavdevice/timefilter.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavdevice/timefilter.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavdevice/utils.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavdevice/utils.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavdevice/utils.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavdevice/utils.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavdevice/v4l2-common.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavdevice/v4l2-common.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavdevice/v4l2-common.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavdevice/v4l2-common.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavdevice/v4l2-common.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavdevice/v4l2-common.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavdevice/v4l2-common.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavdevice/v4l2-common.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavdevice/v4l2.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavdevice/v4l2.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavdevice/v4l2.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavdevice/v4l2.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavdevice/v4l2enc.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavdevice/v4l2enc.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavdevice/v4l2enc.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavdevice/v4l2enc.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavdevice/version.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavdevice/version.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavdevice/version.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavdevice/version.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavdevice/vfwcap.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavdevice/vfwcap.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavdevice/vfwcap.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavdevice/vfwcap.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavdevice/xcbgrab.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavdevice/xcbgrab.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavdevice/xcbgrab.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavdevice/xcbgrab.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavdevice/xv.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavdevice/xv.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavdevice/xv.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavdevice/xv.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/Makefile b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/Makefile
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/Makefile
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/Makefile
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/aarch64/Makefile b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/aarch64/Makefile
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/aarch64/Makefile
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/aarch64/Makefile
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/aarch64/vf_nlmeans_init.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/aarch64/vf_nlmeans_init.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/aarch64/vf_nlmeans_init.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/aarch64/vf_nlmeans_init.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/aarch64/vf_nlmeans_neon.S b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/aarch64/vf_nlmeans_neon.S
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/aarch64/vf_nlmeans_neon.S
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/aarch64/vf_nlmeans_neon.S
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/aeval.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/aeval.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/aeval.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/aeval.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/af_acontrast.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/af_acontrast.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/af_acontrast.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/af_acontrast.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/af_acopy.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/af_acopy.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/af_acopy.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/af_acopy.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/af_acrossover.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/af_acrossover.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/af_acrossover.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/af_acrossover.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/af_acrusher.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/af_acrusher.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/af_acrusher.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/af_acrusher.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/af_adeclick.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/af_adeclick.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/af_adeclick.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/af_adeclick.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/af_adelay.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/af_adelay.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/af_adelay.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/af_adelay.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/af_aderivative.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/af_aderivative.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/af_aderivative.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/af_aderivative.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/af_aecho.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/af_aecho.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/af_aecho.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/af_aecho.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/af_aemphasis.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/af_aemphasis.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/af_aemphasis.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/af_aemphasis.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/af_afade.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/af_afade.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/af_afade.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/af_afade.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/af_afftdn.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/af_afftdn.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/af_afftdn.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/af_afftdn.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/af_afftfilt.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/af_afftfilt.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/af_afftfilt.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/af_afftfilt.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/af_afir.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/af_afir.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/af_afir.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/af_afir.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/af_afir.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/af_afir.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/af_afir.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/af_afir.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/af_aformat.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/af_aformat.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/af_aformat.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/af_aformat.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/af_agate.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/af_agate.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/af_agate.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/af_agate.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/af_aiir.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/af_aiir.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/af_aiir.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/af_aiir.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/af_alimiter.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/af_alimiter.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/af_alimiter.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/af_alimiter.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/af_amerge.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/af_amerge.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/af_amerge.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/af_amerge.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/af_amix.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/af_amix.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/af_amix.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/af_amix.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/af_amultiply.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/af_amultiply.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/af_amultiply.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/af_amultiply.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/af_anequalizer.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/af_anequalizer.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/af_anequalizer.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/af_anequalizer.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/af_anull.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/af_anull.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/af_anull.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/af_anull.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/af_apad.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/af_apad.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/af_apad.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/af_apad.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/af_aphaser.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/af_aphaser.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/af_aphaser.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/af_aphaser.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/af_apulsator.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/af_apulsator.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/af_apulsator.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/af_apulsator.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/af_aresample.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/af_aresample.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/af_aresample.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/af_aresample.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/af_asetnsamples.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/af_asetnsamples.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/af_asetnsamples.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/af_asetnsamples.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/af_asetrate.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/af_asetrate.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/af_asetrate.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/af_asetrate.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/af_ashowinfo.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/af_ashowinfo.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/af_ashowinfo.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/af_ashowinfo.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/af_astats.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/af_astats.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/af_astats.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/af_astats.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/af_atempo.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/af_atempo.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/af_atempo.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/af_atempo.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/af_biquads.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/af_biquads.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/af_biquads.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/af_biquads.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/af_bs2b.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/af_bs2b.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/af_bs2b.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/af_bs2b.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/af_channelmap.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/af_channelmap.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/af_channelmap.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/af_channelmap.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/af_channelsplit.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/af_channelsplit.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/af_channelsplit.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/af_channelsplit.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/af_chorus.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/af_chorus.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/af_chorus.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/af_chorus.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/af_compand.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/af_compand.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/af_compand.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/af_compand.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/af_compensationdelay.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/af_compensationdelay.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/af_compensationdelay.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/af_compensationdelay.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/af_crossfeed.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/af_crossfeed.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/af_crossfeed.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/af_crossfeed.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/af_crystalizer.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/af_crystalizer.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/af_crystalizer.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/af_crystalizer.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/af_dcshift.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/af_dcshift.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/af_dcshift.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/af_dcshift.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/af_drmeter.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/af_drmeter.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/af_drmeter.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/af_drmeter.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/af_dynaudnorm.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/af_dynaudnorm.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/af_dynaudnorm.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/af_dynaudnorm.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/af_earwax.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/af_earwax.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/af_earwax.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/af_earwax.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/af_extrastereo.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/af_extrastereo.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/af_extrastereo.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/af_extrastereo.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/af_firequalizer.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/af_firequalizer.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/af_firequalizer.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/af_firequalizer.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/af_flanger.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/af_flanger.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/af_flanger.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/af_flanger.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/af_haas.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/af_haas.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/af_haas.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/af_haas.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/af_hdcd.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/af_hdcd.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/af_hdcd.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/af_hdcd.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/af_headphone.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/af_headphone.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/af_headphone.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/af_headphone.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/af_join.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/af_join.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/af_join.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/af_join.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/af_ladspa.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/af_ladspa.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/af_ladspa.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/af_ladspa.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/af_loudnorm.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/af_loudnorm.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/af_loudnorm.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/af_loudnorm.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/af_lv2.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/af_lv2.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/af_lv2.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/af_lv2.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/af_mcompand.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/af_mcompand.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/af_mcompand.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/af_mcompand.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/af_pan.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/af_pan.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/af_pan.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/af_pan.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/af_replaygain.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/af_replaygain.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/af_replaygain.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/af_replaygain.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/af_resample.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/af_resample.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/af_resample.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/af_resample.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/af_rubberband.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/af_rubberband.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/af_rubberband.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/af_rubberband.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/af_sidechaincompress.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/af_sidechaincompress.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/af_sidechaincompress.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/af_sidechaincompress.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/af_silencedetect.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/af_silencedetect.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/af_silencedetect.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/af_silencedetect.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/af_silenceremove.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/af_silenceremove.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/af_silenceremove.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/af_silenceremove.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/af_sofalizer.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/af_sofalizer.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/af_sofalizer.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/af_sofalizer.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/af_stereotools.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/af_stereotools.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/af_stereotools.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/af_stereotools.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/af_stereowiden.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/af_stereowiden.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/af_stereowiden.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/af_stereowiden.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/af_superequalizer.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/af_superequalizer.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/af_superequalizer.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/af_superequalizer.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/af_surround.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/af_surround.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/af_surround.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/af_surround.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/af_tremolo.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/af_tremolo.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/af_tremolo.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/af_tremolo.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/af_vibrato.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/af_vibrato.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/af_vibrato.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/af_vibrato.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/af_volume.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/af_volume.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/af_volume.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/af_volume.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/af_volume.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/af_volume.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/af_volume.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/af_volume.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/af_volumedetect.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/af_volumedetect.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/af_volumedetect.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/af_volumedetect.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/all_channel_layouts.inc b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/all_channel_layouts.inc
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/all_channel_layouts.inc
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/all_channel_layouts.inc
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/allfilters.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/allfilters.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/allfilters.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/allfilters.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/asink_anullsink.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/asink_anullsink.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/asink_anullsink.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/asink_anullsink.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/asrc_anoisesrc.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/asrc_anoisesrc.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/asrc_anoisesrc.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/asrc_anoisesrc.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/asrc_anullsrc.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/asrc_anullsrc.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/asrc_anullsrc.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/asrc_anullsrc.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/asrc_flite.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/asrc_flite.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/asrc_flite.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/asrc_flite.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/asrc_hilbert.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/asrc_hilbert.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/asrc_hilbert.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/asrc_hilbert.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/asrc_sinc.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/asrc_sinc.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/asrc_sinc.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/asrc_sinc.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/asrc_sine.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/asrc_sine.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/asrc_sine.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/asrc_sine.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/audio.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/audio.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/audio.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/audio.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/audio.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/audio.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/audio.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/audio.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/avf_abitscope.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/avf_abitscope.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/avf_abitscope.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/avf_abitscope.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/avf_ahistogram.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/avf_ahistogram.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/avf_ahistogram.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/avf_ahistogram.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/avf_aphasemeter.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/avf_aphasemeter.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/avf_aphasemeter.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/avf_aphasemeter.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/avf_avectorscope.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/avf_avectorscope.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/avf_avectorscope.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/avf_avectorscope.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/avf_concat.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/avf_concat.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/avf_concat.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/avf_concat.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/avf_showcqt.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/avf_showcqt.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/avf_showcqt.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/avf_showcqt.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/avf_showcqt.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/avf_showcqt.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/avf_showcqt.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/avf_showcqt.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/avf_showfreqs.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/avf_showfreqs.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/avf_showfreqs.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/avf_showfreqs.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/avf_showspectrum.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/avf_showspectrum.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/avf_showspectrum.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/avf_showspectrum.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/avf_showvolume.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/avf_showvolume.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/avf_showvolume.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/avf_showvolume.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/avf_showwaves.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/avf_showwaves.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/avf_showwaves.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/avf_showwaves.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/avfilter.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/avfilter.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/avfilter.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/avfilter.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/avfilter.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/avfilter.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/avfilter.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/avfilter.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/avfiltergraph.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/avfiltergraph.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/avfiltergraph.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/avfiltergraph.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/avfilterres.rc b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/avfilterres.rc
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/avfilterres.rc
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/avfilterres.rc
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/bbox.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/bbox.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/bbox.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/bbox.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/bbox.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/bbox.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/bbox.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/bbox.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/blend.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/blend.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/blend.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/blend.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/boxblur.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/boxblur.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/boxblur.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/boxblur.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/boxblur.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/boxblur.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/boxblur.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/boxblur.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/bufferqueue.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/bufferqueue.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/bufferqueue.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/bufferqueue.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/buffersink.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/buffersink.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/buffersink.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/buffersink.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/buffersink.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/buffersink.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/buffersink.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/buffersink.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/buffersrc.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/buffersrc.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/buffersrc.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/buffersrc.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/buffersrc.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/buffersrc.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/buffersrc.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/buffersrc.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/bwdif.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/bwdif.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/bwdif.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/bwdif.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/colorspace.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/colorspace.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/colorspace.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/colorspace.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/colorspace.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/colorspace.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/colorspace.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/colorspace.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/colorspacedsp.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/colorspacedsp.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/colorspacedsp.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/colorspacedsp.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/colorspacedsp.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/colorspacedsp.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/colorspacedsp.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/colorspacedsp.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/colorspacedsp_template.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/colorspacedsp_template.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/colorspacedsp_template.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/colorspacedsp_template.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/colorspacedsp_yuv2yuv_template.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/colorspacedsp_yuv2yuv_template.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/colorspacedsp_yuv2yuv_template.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/colorspacedsp_yuv2yuv_template.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/deshake.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/deshake.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/deshake.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/deshake.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/dnn_backend_native.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/dnn_backend_native.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/dnn_backend_native.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/dnn_backend_native.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/dnn_backend_native.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/dnn_backend_native.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/dnn_backend_native.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/dnn_backend_native.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/dnn_backend_tf.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/dnn_backend_tf.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/dnn_backend_tf.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/dnn_backend_tf.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/dnn_backend_tf.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/dnn_backend_tf.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/dnn_backend_tf.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/dnn_backend_tf.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/dnn_interface.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/dnn_interface.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/dnn_interface.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/dnn_interface.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/dnn_interface.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/dnn_interface.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/dnn_interface.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/dnn_interface.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/drawutils.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/drawutils.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/drawutils.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/drawutils.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/drawutils.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/drawutils.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/drawutils.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/drawutils.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/ebur128.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/ebur128.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/ebur128.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/ebur128.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/ebur128.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/ebur128.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/ebur128.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/ebur128.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/f_bench.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/f_bench.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/f_bench.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/f_bench.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/f_cue.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/f_cue.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/f_cue.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/f_cue.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/f_drawgraph.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/f_drawgraph.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/f_drawgraph.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/f_drawgraph.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/f_ebur128.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/f_ebur128.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/f_ebur128.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/f_ebur128.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/f_graphmonitor.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/f_graphmonitor.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/f_graphmonitor.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/f_graphmonitor.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/f_interleave.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/f_interleave.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/f_interleave.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/f_interleave.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/f_loop.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/f_loop.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/f_loop.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/f_loop.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/f_metadata.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/f_metadata.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/f_metadata.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/f_metadata.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/f_perms.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/f_perms.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/f_perms.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/f_perms.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/f_realtime.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/f_realtime.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/f_realtime.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/f_realtime.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/f_reverse.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/f_reverse.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/f_reverse.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/f_reverse.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/f_select.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/f_select.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/f_select.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/f_select.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/f_sendcmd.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/f_sendcmd.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/f_sendcmd.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/f_sendcmd.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/f_sidedata.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/f_sidedata.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/f_sidedata.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/f_sidedata.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/f_streamselect.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/f_streamselect.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/f_streamselect.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/f_streamselect.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/f_zmq.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/f_zmq.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/f_zmq.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/f_zmq.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/fifo.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/fifo.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/fifo.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/fifo.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/filters.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/filters.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/filters.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/filters.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/formats.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/formats.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/formats.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/formats.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/formats.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/formats.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/formats.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/formats.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/framepool.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/framepool.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/framepool.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/framepool.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/framepool.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/framepool.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/framepool.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/framepool.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/framequeue.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/framequeue.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/framequeue.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/framequeue.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/framequeue.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/framequeue.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/framequeue.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/framequeue.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/framerate.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/framerate.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/framerate.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/framerate.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/framesync.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/framesync.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/framesync.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/framesync.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/framesync.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/framesync.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/framesync.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/framesync.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/generate_wave_table.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/generate_wave_table.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/generate_wave_table.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/generate_wave_table.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/generate_wave_table.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/generate_wave_table.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/generate_wave_table.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/generate_wave_table.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/gradfun.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/gradfun.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/gradfun.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/gradfun.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/graphdump.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/graphdump.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/graphdump.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/graphdump.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/graphparser.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/graphparser.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/graphparser.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/graphparser.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/hermite.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/hermite.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/hermite.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/hermite.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/hflip.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/hflip.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/hflip.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/hflip.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/internal.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/internal.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/internal.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/internal.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/lavfutils.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/lavfutils.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/lavfutils.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/lavfutils.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/lavfutils.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/lavfutils.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/lavfutils.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/lavfutils.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/libavfilter.v b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/libavfilter.v
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/libavfilter.v
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/libavfilter.v
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/limiter.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/limiter.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/limiter.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/limiter.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/log2_tab.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/log2_tab.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/log2_tab.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/log2_tab.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/lswsutils.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/lswsutils.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/lswsutils.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/lswsutils.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/lswsutils.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/lswsutils.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/lswsutils.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/lswsutils.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/maskedmerge.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/maskedmerge.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/maskedmerge.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/maskedmerge.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/motion_estimation.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/motion_estimation.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/motion_estimation.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/motion_estimation.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/motion_estimation.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/motion_estimation.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/motion_estimation.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/motion_estimation.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/opencl.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/opencl.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/opencl.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/opencl.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/opencl.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/opencl.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/opencl.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/opencl.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/opencl/avgblur.cl b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/opencl/avgblur.cl
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/opencl/avgblur.cl
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/opencl/avgblur.cl
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/opencl/colorspace_common.cl b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/opencl/colorspace_common.cl
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/opencl/colorspace_common.cl
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/opencl/colorspace_common.cl
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/opencl/convolution.cl b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/opencl/convolution.cl
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/opencl/convolution.cl
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/opencl/convolution.cl
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/opencl/neighbor.cl b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/opencl/neighbor.cl
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/opencl/neighbor.cl
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/opencl/neighbor.cl
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/opencl/overlay.cl b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/opencl/overlay.cl
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/opencl/overlay.cl
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/opencl/overlay.cl
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/opencl/tonemap.cl b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/opencl/tonemap.cl
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/opencl/tonemap.cl
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/opencl/tonemap.cl
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/opencl/unsharp.cl b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/opencl/unsharp.cl
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/opencl/unsharp.cl
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/opencl/unsharp.cl
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/opencl_source.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/opencl_source.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/opencl_source.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/opencl_source.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/psnr.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/psnr.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/psnr.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/psnr.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/pthread.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/pthread.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/pthread.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/pthread.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/qsvvpp.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/qsvvpp.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/qsvvpp.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/qsvvpp.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/qsvvpp.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/qsvvpp.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/qsvvpp.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/qsvvpp.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/removegrain.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/removegrain.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/removegrain.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/removegrain.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/scale.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/scale.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/scale.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/scale.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/scale.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/scale.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/scale.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/scale.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/setpts.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/setpts.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/setpts.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/setpts.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/settb.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/settb.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/settb.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/settb.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/signature.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/signature.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/signature.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/signature.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/signature_lookup.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/signature_lookup.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/signature_lookup.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/signature_lookup.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/split.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/split.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/split.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/split.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/src_movie.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/src_movie.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/src_movie.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/src_movie.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/ssim.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/ssim.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/ssim.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/ssim.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/stereo3d.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/stereo3d.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/stereo3d.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/stereo3d.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/tests/drawutils.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/tests/drawutils.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/tests/drawutils.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/tests/drawutils.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/tests/filtfmts.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/tests/filtfmts.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/tests/filtfmts.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/tests/filtfmts.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/tests/formats.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/tests/formats.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/tests/formats.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/tests/formats.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/tests/integral.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/tests/integral.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/tests/integral.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/tests/integral.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/thread.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/thread.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/thread.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/thread.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/threshold.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/threshold.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/threshold.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/threshold.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/tinterlace.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/tinterlace.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/tinterlace.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/tinterlace.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/transform.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/transform.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/transform.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/transform.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/transform.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/transform.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/transform.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/transform.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/trim.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/trim.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/trim.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/trim.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/unsharp.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/unsharp.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/unsharp.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/unsharp.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vaapi_vpp.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vaapi_vpp.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vaapi_vpp.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vaapi_vpp.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vaapi_vpp.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vaapi_vpp.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vaapi_vpp.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vaapi_vpp.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vaf_spectrumsynth.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vaf_spectrumsynth.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vaf_spectrumsynth.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vaf_spectrumsynth.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/version.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/version.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/version.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/version.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_alphamerge.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_alphamerge.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_alphamerge.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_alphamerge.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_amplify.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_amplify.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_amplify.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_amplify.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_aspect.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_aspect.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_aspect.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_aspect.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_atadenoise.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_atadenoise.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_atadenoise.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_atadenoise.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_avgblur.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_avgblur.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_avgblur.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_avgblur.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_avgblur_opencl.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_avgblur_opencl.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_avgblur_opencl.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_avgblur_opencl.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_bbox.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_bbox.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_bbox.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_bbox.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_bitplanenoise.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_bitplanenoise.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_bitplanenoise.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_bitplanenoise.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_blackdetect.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_blackdetect.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_blackdetect.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_blackdetect.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_blackframe.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_blackframe.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_blackframe.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_blackframe.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_blend.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_blend.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_blend.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_blend.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_bm3d.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_bm3d.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_bm3d.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_bm3d.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_boxblur.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_boxblur.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_boxblur.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_boxblur.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_bwdif.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_bwdif.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_bwdif.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_bwdif.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_chromakey.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_chromakey.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_chromakey.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_chromakey.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_ciescope.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_ciescope.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_ciescope.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_ciescope.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_codecview.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_codecview.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_codecview.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_codecview.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_colorbalance.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_colorbalance.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_colorbalance.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_colorbalance.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_colorchannelmixer.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_colorchannelmixer.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_colorchannelmixer.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_colorchannelmixer.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_colorconstancy.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_colorconstancy.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_colorconstancy.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_colorconstancy.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_colorkey.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_colorkey.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_colorkey.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_colorkey.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_colorlevels.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_colorlevels.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_colorlevels.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_colorlevels.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_colormatrix.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_colormatrix.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_colormatrix.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_colormatrix.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_colorspace.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_colorspace.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_colorspace.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_colorspace.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_convolution.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_convolution.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_convolution.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_convolution.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_convolution_opencl.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_convolution_opencl.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_convolution_opencl.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_convolution_opencl.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_convolve.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_convolve.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_convolve.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_convolve.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_copy.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_copy.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_copy.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_copy.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_coreimage.m b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_coreimage.m
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_coreimage.m
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_coreimage.m
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_cover_rect.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_cover_rect.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_cover_rect.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_cover_rect.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_crop.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_crop.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_crop.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_crop.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_cropdetect.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_cropdetect.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_cropdetect.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_cropdetect.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_curves.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_curves.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_curves.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_curves.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_datascope.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_datascope.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_datascope.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_datascope.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_dctdnoiz.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_dctdnoiz.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_dctdnoiz.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_dctdnoiz.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_deband.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_deband.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_deband.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_deband.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_deblock.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_deblock.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_deblock.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_deblock.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_decimate.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_decimate.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_decimate.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_decimate.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_deflicker.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_deflicker.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_deflicker.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_deflicker.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_deinterlace_qsv.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_deinterlace_qsv.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_deinterlace_qsv.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_deinterlace_qsv.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_deinterlace_vaapi.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_deinterlace_vaapi.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_deinterlace_vaapi.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_deinterlace_vaapi.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_dejudder.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_dejudder.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_dejudder.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_dejudder.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_delogo.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_delogo.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_delogo.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_delogo.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_deshake.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_deshake.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_deshake.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_deshake.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_despill.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_despill.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_despill.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_despill.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_detelecine.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_detelecine.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_detelecine.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_detelecine.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_displace.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_displace.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_displace.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_displace.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_drawbox.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_drawbox.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_drawbox.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_drawbox.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_drawtext.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_drawtext.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_drawtext.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_drawtext.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_edgedetect.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_edgedetect.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_edgedetect.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_edgedetect.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_elbg.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_elbg.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_elbg.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_elbg.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_entropy.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_entropy.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_entropy.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_entropy.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_eq.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_eq.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_eq.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_eq.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_eq.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_eq.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_eq.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_eq.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_extractplanes.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_extractplanes.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_extractplanes.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_extractplanes.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_fade.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_fade.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_fade.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_fade.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_fftdnoiz.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_fftdnoiz.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_fftdnoiz.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_fftdnoiz.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_fftfilt.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_fftfilt.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_fftfilt.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_fftfilt.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_field.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_field.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_field.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_field.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_fieldhint.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_fieldhint.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_fieldhint.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_fieldhint.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_fieldmatch.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_fieldmatch.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_fieldmatch.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_fieldmatch.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_fieldorder.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_fieldorder.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_fieldorder.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_fieldorder.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_fillborders.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_fillborders.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_fillborders.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_fillborders.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_find_rect.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_find_rect.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_find_rect.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_find_rect.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_floodfill.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_floodfill.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_floodfill.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_floodfill.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_format.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_format.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_format.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_format.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_fps.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_fps.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_fps.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_fps.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_framepack.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_framepack.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_framepack.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_framepack.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_framerate.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_framerate.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_framerate.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_framerate.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_framestep.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_framestep.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_framestep.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_framestep.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_frei0r.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_frei0r.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_frei0r.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_frei0r.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_fspp.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_fspp.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_fspp.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_fspp.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_fspp.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_fspp.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_fspp.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_fspp.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_gblur.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_gblur.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_gblur.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_gblur.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_geq.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_geq.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_geq.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_geq.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_gradfun.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_gradfun.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_gradfun.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_gradfun.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_hflip.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_hflip.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_hflip.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_hflip.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_histeq.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_histeq.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_histeq.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_histeq.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_histogram.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_histogram.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_histogram.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_histogram.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_hqdn3d.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_hqdn3d.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_hqdn3d.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_hqdn3d.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_hqdn3d.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_hqdn3d.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_hqdn3d.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_hqdn3d.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_hqx.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_hqx.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_hqx.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_hqx.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_hue.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_hue.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_hue.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_hue.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_hwdownload.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_hwdownload.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_hwdownload.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_hwdownload.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_hwmap.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_hwmap.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_hwmap.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_hwmap.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_hwupload.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_hwupload.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_hwupload.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_hwupload.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_hwupload_cuda.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_hwupload_cuda.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_hwupload_cuda.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_hwupload_cuda.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_hysteresis.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_hysteresis.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_hysteresis.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_hysteresis.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_idet.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_idet.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_idet.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_idet.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_idet.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_idet.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_idet.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_idet.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_il.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_il.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_il.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_il.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_kerndeint.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_kerndeint.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_kerndeint.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_kerndeint.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_lenscorrection.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_lenscorrection.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_lenscorrection.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_lenscorrection.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_lensfun.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_lensfun.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_lensfun.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_lensfun.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_libopencv.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_libopencv.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_libopencv.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_libopencv.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_libvmaf.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_libvmaf.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_libvmaf.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_libvmaf.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_limiter.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_limiter.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_limiter.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_limiter.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_lumakey.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_lumakey.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_lumakey.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_lumakey.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_lut.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_lut.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_lut.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_lut.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_lut2.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_lut2.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_lut2.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_lut2.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_lut3d.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_lut3d.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_lut3d.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_lut3d.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_maskedclamp.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_maskedclamp.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_maskedclamp.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_maskedclamp.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_maskedmerge.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_maskedmerge.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_maskedmerge.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_maskedmerge.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_mcdeint.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_mcdeint.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_mcdeint.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_mcdeint.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_mergeplanes.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_mergeplanes.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_mergeplanes.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_mergeplanes.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_mestimate.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_mestimate.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_mestimate.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_mestimate.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_midequalizer.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_midequalizer.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_midequalizer.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_midequalizer.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_minterpolate.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_minterpolate.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_minterpolate.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_minterpolate.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_misc_vaapi.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_misc_vaapi.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_misc_vaapi.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_misc_vaapi.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_mix.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_mix.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_mix.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_mix.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_mpdecimate.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_mpdecimate.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_mpdecimate.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_mpdecimate.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_neighbor.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_neighbor.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_neighbor.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_neighbor.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_neighbor_opencl.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_neighbor_opencl.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_neighbor_opencl.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_neighbor_opencl.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_nlmeans.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_nlmeans.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_nlmeans.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_nlmeans.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_nlmeans.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_nlmeans.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_nlmeans.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_nlmeans.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_nnedi.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_nnedi.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_nnedi.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_nnedi.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_noise.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_noise.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_noise.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_noise.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_noise.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_noise.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_noise.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_noise.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_normalize.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_normalize.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_normalize.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_normalize.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_null.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_null.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_null.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_null.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_ocr.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_ocr.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_ocr.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_ocr.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_overlay.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_overlay.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_overlay.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_overlay.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_overlay.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_overlay.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_overlay.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_overlay.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_overlay_opencl.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_overlay_opencl.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_overlay_opencl.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_overlay_opencl.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_overlay_qsv.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_overlay_qsv.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_overlay_qsv.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_overlay_qsv.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_owdenoise.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_owdenoise.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_owdenoise.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_owdenoise.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_pad.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_pad.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_pad.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_pad.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_palettegen.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_palettegen.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_palettegen.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_palettegen.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_paletteuse.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_paletteuse.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_paletteuse.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_paletteuse.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_perspective.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_perspective.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_perspective.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_perspective.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_phase.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_phase.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_phase.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_phase.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_pixdesctest.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_pixdesctest.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_pixdesctest.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_pixdesctest.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_pp.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_pp.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_pp.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_pp.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_pp7.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_pp7.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_pp7.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_pp7.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_pp7.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_pp7.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_pp7.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_pp7.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_premultiply.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_premultiply.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_premultiply.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_premultiply.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_procamp_vaapi.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_procamp_vaapi.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_procamp_vaapi.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_procamp_vaapi.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_program_opencl.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_program_opencl.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_program_opencl.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_program_opencl.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_pseudocolor.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_pseudocolor.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_pseudocolor.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_pseudocolor.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_psnr.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_psnr.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_psnr.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_psnr.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_pullup.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_pullup.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_pullup.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_pullup.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_pullup.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_pullup.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_pullup.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_pullup.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_qp.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_qp.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_qp.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_qp.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_random.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_random.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_random.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_random.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_readeia608.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_readeia608.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_readeia608.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_readeia608.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_readvitc.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_readvitc.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_readvitc.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_readvitc.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_remap.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_remap.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_remap.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_remap.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_removegrain.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_removegrain.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_removegrain.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_removegrain.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_removelogo.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_removelogo.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_removelogo.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_removelogo.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_repeatfields.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_repeatfields.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_repeatfields.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_repeatfields.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_rotate.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_rotate.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_rotate.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_rotate.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_sab.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_sab.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_sab.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_sab.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_scale.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_scale.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_scale.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_scale.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_scale_cuda.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_scale_cuda.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_scale_cuda.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_scale_cuda.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_scale_cuda.cu b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_scale_cuda.cu
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_scale_cuda.cu
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_scale_cuda.cu
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_scale_npp.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_scale_npp.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_scale_npp.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_scale_npp.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_scale_qsv.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_scale_qsv.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_scale_qsv.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_scale_qsv.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_scale_vaapi.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_scale_vaapi.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_scale_vaapi.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_scale_vaapi.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_selectivecolor.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_selectivecolor.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_selectivecolor.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_selectivecolor.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_separatefields.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_separatefields.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_separatefields.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_separatefields.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_setparams.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_setparams.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_setparams.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_setparams.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_showinfo.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_showinfo.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_showinfo.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_showinfo.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_showpalette.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_showpalette.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_showpalette.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_showpalette.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_shuffleframes.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_shuffleframes.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_shuffleframes.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_shuffleframes.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_shuffleplanes.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_shuffleplanes.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_shuffleplanes.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_shuffleplanes.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_signalstats.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_signalstats.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_signalstats.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_signalstats.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_signature.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_signature.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_signature.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_signature.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_smartblur.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_smartblur.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_smartblur.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_smartblur.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_spp.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_spp.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_spp.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_spp.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_spp.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_spp.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_spp.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_spp.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_sr.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_sr.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_sr.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_sr.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_ssim.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_ssim.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_ssim.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_ssim.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_stack.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_stack.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_stack.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_stack.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_stereo3d.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_stereo3d.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_stereo3d.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_stereo3d.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_subtitles.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_subtitles.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_subtitles.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_subtitles.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_super2xsai.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_super2xsai.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_super2xsai.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_super2xsai.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_swaprect.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_swaprect.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_swaprect.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_swaprect.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_swapuv.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_swapuv.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_swapuv.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_swapuv.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_telecine.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_telecine.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_telecine.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_telecine.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_threshold.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_threshold.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_threshold.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_threshold.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_thumbnail.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_thumbnail.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_thumbnail.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_thumbnail.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_thumbnail_cuda.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_thumbnail_cuda.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_thumbnail_cuda.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_thumbnail_cuda.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_thumbnail_cuda.cu b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_thumbnail_cuda.cu
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_thumbnail_cuda.cu
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_thumbnail_cuda.cu
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_tile.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_tile.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_tile.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_tile.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_tinterlace.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_tinterlace.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_tinterlace.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_tinterlace.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_tonemap.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_tonemap.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_tonemap.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_tonemap.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_tonemap_opencl.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_tonemap_opencl.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_tonemap_opencl.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_tonemap_opencl.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_transpose.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_transpose.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_transpose.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_transpose.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_transpose_npp.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_transpose_npp.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_transpose_npp.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_transpose_npp.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_unsharp.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_unsharp.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_unsharp.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_unsharp.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_unsharp_opencl.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_unsharp_opencl.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_unsharp_opencl.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_unsharp_opencl.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_uspp.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_uspp.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_uspp.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_uspp.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_vaguedenoiser.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_vaguedenoiser.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_vaguedenoiser.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_vaguedenoiser.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_vectorscope.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_vectorscope.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_vectorscope.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_vectorscope.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_vflip.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_vflip.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_vflip.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_vflip.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_vfrdet.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_vfrdet.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_vfrdet.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_vfrdet.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_vibrance.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_vibrance.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_vibrance.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_vibrance.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_vidstabdetect.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_vidstabdetect.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_vidstabdetect.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_vidstabdetect.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_vidstabtransform.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_vidstabtransform.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_vidstabtransform.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_vidstabtransform.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_vignette.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_vignette.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_vignette.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_vignette.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_vmafmotion.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_vmafmotion.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_vmafmotion.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_vmafmotion.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_vpp_qsv.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_vpp_qsv.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_vpp_qsv.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_vpp_qsv.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_w3fdif.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_w3fdif.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_w3fdif.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_w3fdif.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_waveform.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_waveform.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_waveform.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_waveform.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_weave.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_weave.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_weave.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_weave.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_xbr.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_xbr.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_xbr.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_xbr.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_yadif.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_yadif.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_yadif.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_yadif.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_yadif_cuda.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_yadif_cuda.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_yadif_cuda.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_yadif_cuda.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_yadif_cuda.cu b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_yadif_cuda.cu
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_yadif_cuda.cu
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_yadif_cuda.cu
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_zoompan.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_zoompan.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_zoompan.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_zoompan.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_zscale.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_zscale.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vf_zscale.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vf_zscale.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/video.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/video.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/video.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/video.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/video.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/video.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/video.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/video.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vidstabutils.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vidstabutils.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vidstabutils.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vidstabutils.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vidstabutils.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vidstabutils.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vidstabutils.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vidstabutils.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vmaf_motion.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vmaf_motion.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vmaf_motion.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vmaf_motion.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vsink_nullsink.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vsink_nullsink.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vsink_nullsink.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vsink_nullsink.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vsrc_cellauto.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vsrc_cellauto.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vsrc_cellauto.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vsrc_cellauto.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vsrc_life.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vsrc_life.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vsrc_life.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vsrc_life.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vsrc_mandelbrot.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vsrc_mandelbrot.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vsrc_mandelbrot.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vsrc_mandelbrot.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vsrc_mptestsrc.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vsrc_mptestsrc.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vsrc_mptestsrc.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vsrc_mptestsrc.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vsrc_testsrc.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vsrc_testsrc.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/vsrc_testsrc.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/vsrc_testsrc.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/w3fdif.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/w3fdif.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/w3fdif.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/w3fdif.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/window_func.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/window_func.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/window_func.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/window_func.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/x86/Makefile b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/x86/Makefile
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/x86/Makefile
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/x86/Makefile
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/x86/af_afir.asm b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/x86/af_afir.asm
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/x86/af_afir.asm
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/x86/af_afir.asm
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/x86/af_afir_init.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/x86/af_afir_init.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/x86/af_afir_init.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/x86/af_afir_init.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/x86/af_volume.asm b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/x86/af_volume.asm
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/x86/af_volume.asm
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/x86/af_volume.asm
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/x86/af_volume_init.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/x86/af_volume_init.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/x86/af_volume_init.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/x86/af_volume_init.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/x86/avf_showcqt.asm b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/x86/avf_showcqt.asm
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/x86/avf_showcqt.asm
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/x86/avf_showcqt.asm
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/x86/avf_showcqt_init.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/x86/avf_showcqt_init.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/x86/avf_showcqt_init.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/x86/avf_showcqt_init.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/x86/colorspacedsp.asm b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/x86/colorspacedsp.asm
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/x86/colorspacedsp.asm
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/x86/colorspacedsp.asm
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/x86/colorspacedsp_init.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/x86/colorspacedsp_init.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/x86/colorspacedsp_init.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/x86/colorspacedsp_init.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/x86/vf_blend.asm b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/x86/vf_blend.asm
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/x86/vf_blend.asm
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/x86/vf_blend.asm
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/x86/vf_blend_init.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/x86/vf_blend_init.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/x86/vf_blend_init.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/x86/vf_blend_init.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/x86/vf_bwdif.asm b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/x86/vf_bwdif.asm
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/x86/vf_bwdif.asm
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/x86/vf_bwdif.asm
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/x86/vf_bwdif_init.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/x86/vf_bwdif_init.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/x86/vf_bwdif_init.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/x86/vf_bwdif_init.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/x86/vf_eq.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/x86/vf_eq.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/x86/vf_eq.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/x86/vf_eq.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/x86/vf_framerate.asm b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/x86/vf_framerate.asm
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/x86/vf_framerate.asm
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/x86/vf_framerate.asm
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/x86/vf_framerate_init.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/x86/vf_framerate_init.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/x86/vf_framerate_init.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/x86/vf_framerate_init.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/x86/vf_fspp.asm b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/x86/vf_fspp.asm
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/x86/vf_fspp.asm
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/x86/vf_fspp.asm
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/x86/vf_fspp_init.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/x86/vf_fspp_init.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/x86/vf_fspp_init.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/x86/vf_fspp_init.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/x86/vf_gradfun.asm b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/x86/vf_gradfun.asm
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/x86/vf_gradfun.asm
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/x86/vf_gradfun.asm
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/x86/vf_gradfun_init.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/x86/vf_gradfun_init.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/x86/vf_gradfun_init.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/x86/vf_gradfun_init.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/x86/vf_hflip.asm b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/x86/vf_hflip.asm
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/x86/vf_hflip.asm
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/x86/vf_hflip.asm
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/x86/vf_hflip_init.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/x86/vf_hflip_init.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/x86/vf_hflip_init.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/x86/vf_hflip_init.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/x86/vf_hqdn3d.asm b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/x86/vf_hqdn3d.asm
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/x86/vf_hqdn3d.asm
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/x86/vf_hqdn3d.asm
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/x86/vf_hqdn3d_init.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/x86/vf_hqdn3d_init.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/x86/vf_hqdn3d_init.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/x86/vf_hqdn3d_init.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/x86/vf_idet.asm b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/x86/vf_idet.asm
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/x86/vf_idet.asm
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/x86/vf_idet.asm
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/x86/vf_idet_init.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/x86/vf_idet_init.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/x86/vf_idet_init.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/x86/vf_idet_init.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/x86/vf_interlace.asm b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/x86/vf_interlace.asm
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/x86/vf_interlace.asm
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/x86/vf_interlace.asm
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/x86/vf_limiter.asm b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/x86/vf_limiter.asm
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/x86/vf_limiter.asm
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/x86/vf_limiter.asm
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/x86/vf_limiter_init.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/x86/vf_limiter_init.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/x86/vf_limiter_init.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/x86/vf_limiter_init.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/x86/vf_maskedmerge.asm b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/x86/vf_maskedmerge.asm
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/x86/vf_maskedmerge.asm
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/x86/vf_maskedmerge.asm
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/x86/vf_maskedmerge_init.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/x86/vf_maskedmerge_init.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/x86/vf_maskedmerge_init.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/x86/vf_maskedmerge_init.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/x86/vf_noise.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/x86/vf_noise.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/x86/vf_noise.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/x86/vf_noise.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/x86/vf_overlay.asm b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/x86/vf_overlay.asm
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/x86/vf_overlay.asm
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/x86/vf_overlay.asm
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/x86/vf_overlay_init.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/x86/vf_overlay_init.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/x86/vf_overlay_init.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/x86/vf_overlay_init.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/x86/vf_pp7.asm b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/x86/vf_pp7.asm
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/x86/vf_pp7.asm
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/x86/vf_pp7.asm
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/x86/vf_pp7_init.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/x86/vf_pp7_init.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/x86/vf_pp7_init.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/x86/vf_pp7_init.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/x86/vf_psnr.asm b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/x86/vf_psnr.asm
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/x86/vf_psnr.asm
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/x86/vf_psnr.asm
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/x86/vf_psnr_init.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/x86/vf_psnr_init.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/x86/vf_psnr_init.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/x86/vf_psnr_init.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/x86/vf_pullup.asm b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/x86/vf_pullup.asm
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/x86/vf_pullup.asm
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/x86/vf_pullup.asm
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/x86/vf_pullup_init.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/x86/vf_pullup_init.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/x86/vf_pullup_init.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/x86/vf_pullup_init.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/x86/vf_removegrain.asm b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/x86/vf_removegrain.asm
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/x86/vf_removegrain.asm
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/x86/vf_removegrain.asm
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/x86/vf_removegrain_init.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/x86/vf_removegrain_init.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/x86/vf_removegrain_init.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/x86/vf_removegrain_init.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/x86/vf_spp.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/x86/vf_spp.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/x86/vf_spp.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/x86/vf_spp.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/x86/vf_ssim.asm b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/x86/vf_ssim.asm
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/x86/vf_ssim.asm
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/x86/vf_ssim.asm
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/x86/vf_ssim_init.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/x86/vf_ssim_init.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/x86/vf_ssim_init.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/x86/vf_ssim_init.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/x86/vf_stereo3d.asm b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/x86/vf_stereo3d.asm
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/x86/vf_stereo3d.asm
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/x86/vf_stereo3d.asm
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/x86/vf_stereo3d_init.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/x86/vf_stereo3d_init.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/x86/vf_stereo3d_init.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/x86/vf_stereo3d_init.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/x86/vf_threshold.asm b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/x86/vf_threshold.asm
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/x86/vf_threshold.asm
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/x86/vf_threshold.asm
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/x86/vf_threshold_init.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/x86/vf_threshold_init.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/x86/vf_threshold_init.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/x86/vf_threshold_init.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/x86/vf_tinterlace_init.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/x86/vf_tinterlace_init.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/x86/vf_tinterlace_init.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/x86/vf_tinterlace_init.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/x86/vf_w3fdif.asm b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/x86/vf_w3fdif.asm
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/x86/vf_w3fdif.asm
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/x86/vf_w3fdif.asm
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/x86/vf_w3fdif_init.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/x86/vf_w3fdif_init.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/x86/vf_w3fdif_init.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/x86/vf_w3fdif_init.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/x86/vf_yadif.asm b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/x86/vf_yadif.asm
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/x86/vf_yadif.asm
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/x86/vf_yadif.asm
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/x86/vf_yadif_init.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/x86/vf_yadif_init.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/x86/vf_yadif_init.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/x86/vf_yadif_init.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/x86/yadif-10.asm b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/x86/yadif-10.asm
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/x86/yadif-10.asm
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/x86/yadif-10.asm
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/x86/yadif-16.asm b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/x86/yadif-16.asm
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/x86/yadif-16.asm
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/x86/yadif-16.asm
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/yadif.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/yadif.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/yadif.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/yadif.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/yadif_common.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/yadif_common.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavfilter/yadif_common.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavfilter/yadif_common.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/3dostr.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/3dostr.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/3dostr.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/3dostr.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/4xm.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/4xm.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/4xm.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/4xm.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/Makefile b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/Makefile
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/Makefile
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/Makefile
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/a64.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/a64.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/a64.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/a64.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/aacdec.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/aacdec.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/aacdec.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/aacdec.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/aadec.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/aadec.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/aadec.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/aadec.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/ac3dec.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/ac3dec.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/ac3dec.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/ac3dec.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/acm.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/acm.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/acm.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/acm.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/act.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/act.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/act.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/act.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/adp.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/adp.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/adp.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/adp.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/ads.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/ads.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/ads.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/ads.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/adtsenc.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/adtsenc.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/adtsenc.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/adtsenc.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/adxdec.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/adxdec.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/adxdec.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/adxdec.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/aea.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/aea.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/aea.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/aea.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/afc.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/afc.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/afc.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/afc.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/aiff.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/aiff.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/aiff.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/aiff.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/aiffdec.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/aiffdec.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/aiffdec.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/aiffdec.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/aiffenc.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/aiffenc.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/aiffenc.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/aiffenc.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/aixdec.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/aixdec.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/aixdec.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/aixdec.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/allformats.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/allformats.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/allformats.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/allformats.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/amr.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/amr.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/amr.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/amr.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/anm.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/anm.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/anm.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/anm.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/apc.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/apc.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/apc.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/apc.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/ape.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/ape.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/ape.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/ape.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/apetag.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/apetag.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/apetag.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/apetag.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/apetag.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/apetag.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/apetag.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/apetag.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/apngdec.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/apngdec.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/apngdec.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/apngdec.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/apngenc.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/apngenc.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/apngenc.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/apngenc.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/aptxdec.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/aptxdec.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/aptxdec.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/aptxdec.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/aqtitledec.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/aqtitledec.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/aqtitledec.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/aqtitledec.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/asf.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/asf.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/asf.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/asf.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/asf.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/asf.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/asf.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/asf.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/asfcrypt.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/asfcrypt.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/asfcrypt.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/asfcrypt.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/asfcrypt.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/asfcrypt.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/asfcrypt.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/asfcrypt.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/asfdec_f.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/asfdec_f.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/asfdec_f.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/asfdec_f.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/asfdec_o.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/asfdec_o.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/asfdec_o.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/asfdec_o.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/asfenc.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/asfenc.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/asfenc.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/asfenc.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/assdec.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/assdec.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/assdec.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/assdec.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/assenc.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/assenc.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/assenc.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/assenc.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/ast.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/ast.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/ast.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/ast.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/ast.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/ast.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/ast.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/ast.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/astdec.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/astdec.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/astdec.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/astdec.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/astenc.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/astenc.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/astenc.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/astenc.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/async.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/async.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/async.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/async.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/au.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/au.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/au.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/au.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/audiointerleave.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/audiointerleave.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/audiointerleave.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/audiointerleave.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/audiointerleave.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/audiointerleave.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/audiointerleave.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/audiointerleave.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/av1.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/av1.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/av1.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/av1.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/av1.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/av1.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/av1.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/av1.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/avc.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/avc.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/avc.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/avc.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/avc.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/avc.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/avc.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/avc.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/avformat.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/avformat.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/avformat.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/avformat.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/avformatres.rc b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/avformatres.rc
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/avformatres.rc
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/avformatres.rc
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/avi.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/avi.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/avi.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/avi.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/avidec.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/avidec.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/avidec.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/avidec.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/avienc.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/avienc.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/avienc.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/avienc.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/avio.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/avio.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/avio.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/avio.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/avio.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/avio.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/avio.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/avio.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/avio_internal.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/avio_internal.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/avio_internal.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/avio_internal.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/aviobuf.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/aviobuf.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/aviobuf.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/aviobuf.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/avisynth.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/avisynth.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/avisynth.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/avisynth.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/avlanguage.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/avlanguage.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/avlanguage.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/avlanguage.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/avlanguage.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/avlanguage.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/avlanguage.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/avlanguage.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/avr.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/avr.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/avr.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/avr.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/avs.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/avs.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/avs.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/avs.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/bethsoftvid.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/bethsoftvid.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/bethsoftvid.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/bethsoftvid.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/bfi.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/bfi.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/bfi.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/bfi.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/bink.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/bink.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/bink.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/bink.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/bintext.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/bintext.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/bintext.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/bintext.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/bit.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/bit.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/bit.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/bit.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/bluray.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/bluray.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/bluray.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/bluray.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/bmv.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/bmv.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/bmv.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/bmv.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/boadec.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/boadec.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/boadec.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/boadec.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/brstm.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/brstm.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/brstm.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/brstm.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/c93.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/c93.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/c93.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/c93.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/cache.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/cache.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/cache.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/cache.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/caf.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/caf.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/caf.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/caf.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/caf.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/caf.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/caf.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/caf.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/cafdec.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/cafdec.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/cafdec.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/cafdec.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/cafenc.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/cafenc.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/cafenc.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/cafenc.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/cavsvideodec.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/cavsvideodec.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/cavsvideodec.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/cavsvideodec.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/cdg.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/cdg.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/cdg.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/cdg.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/cdxl.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/cdxl.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/cdxl.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/cdxl.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/chromaprint.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/chromaprint.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/chromaprint.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/chromaprint.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/cinedec.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/cinedec.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/cinedec.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/cinedec.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/codec2.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/codec2.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/codec2.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/codec2.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/concat.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/concat.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/concat.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/concat.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/concatdec.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/concatdec.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/concatdec.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/concatdec.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/crcenc.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/crcenc.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/crcenc.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/crcenc.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/crypto.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/crypto.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/crypto.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/crypto.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/cutils.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/cutils.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/cutils.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/cutils.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/dash.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/dash.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/dash.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/dash.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/dash.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/dash.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/dash.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/dash.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/dashdec.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/dashdec.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/dashdec.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/dashdec.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/dashenc.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/dashenc.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/dashenc.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/dashenc.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/data_uri.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/data_uri.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/data_uri.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/data_uri.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/dauddec.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/dauddec.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/dauddec.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/dauddec.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/daudenc.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/daudenc.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/daudenc.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/daudenc.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/davs2.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/davs2.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/davs2.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/davs2.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/dcstr.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/dcstr.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/dcstr.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/dcstr.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/dfa.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/dfa.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/dfa.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/dfa.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/diracdec.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/diracdec.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/diracdec.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/diracdec.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/dnxhddec.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/dnxhddec.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/dnxhddec.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/dnxhddec.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/dsfdec.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/dsfdec.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/dsfdec.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/dsfdec.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/dsicin.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/dsicin.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/dsicin.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/dsicin.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/dss.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/dss.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/dss.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/dss.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/dtsdec.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/dtsdec.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/dtsdec.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/dtsdec.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/dtshddec.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/dtshddec.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/dtshddec.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/dtshddec.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/dump.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/dump.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/dump.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/dump.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/dv.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/dv.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/dv.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/dv.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/dv.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/dv.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/dv.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/dv.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/dvbsub.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/dvbsub.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/dvbsub.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/dvbsub.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/dvbtxt.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/dvbtxt.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/dvbtxt.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/dvbtxt.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/dvenc.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/dvenc.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/dvenc.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/dvenc.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/dxa.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/dxa.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/dxa.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/dxa.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/eacdata.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/eacdata.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/eacdata.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/eacdata.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/electronicarts.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/electronicarts.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/electronicarts.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/electronicarts.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/epafdec.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/epafdec.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/epafdec.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/epafdec.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/ffmeta.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/ffmeta.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/ffmeta.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/ffmeta.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/ffmetadec.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/ffmetadec.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/ffmetadec.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/ffmetadec.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/ffmetaenc.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/ffmetaenc.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/ffmetaenc.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/ffmetaenc.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/fifo.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/fifo.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/fifo.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/fifo.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/fifo_test.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/fifo_test.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/fifo_test.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/fifo_test.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/file.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/file.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/file.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/file.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/file_open.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/file_open.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/file_open.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/file_open.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/filmstripdec.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/filmstripdec.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/filmstripdec.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/filmstripdec.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/filmstripenc.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/filmstripenc.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/filmstripenc.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/filmstripenc.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/fitsdec.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/fitsdec.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/fitsdec.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/fitsdec.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/fitsenc.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/fitsenc.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/fitsenc.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/fitsenc.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/flac_picture.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/flac_picture.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/flac_picture.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/flac_picture.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/flac_picture.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/flac_picture.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/flac_picture.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/flac_picture.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/flacdec.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/flacdec.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/flacdec.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/flacdec.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/flacenc.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/flacenc.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/flacenc.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/flacenc.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/flacenc.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/flacenc.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/flacenc.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/flacenc.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/flacenc_header.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/flacenc_header.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/flacenc_header.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/flacenc_header.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/flic.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/flic.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/flic.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/flic.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/flv.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/flv.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/flv.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/flv.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/flvdec.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/flvdec.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/flvdec.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/flvdec.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/flvenc.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/flvenc.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/flvenc.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/flvenc.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/format.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/format.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/format.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/format.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/framecrcenc.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/framecrcenc.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/framecrcenc.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/framecrcenc.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/framehash.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/framehash.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/framehash.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/framehash.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/frmdec.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/frmdec.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/frmdec.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/frmdec.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/fsb.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/fsb.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/fsb.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/fsb.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/ftp.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/ftp.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/ftp.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/ftp.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/g722.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/g722.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/g722.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/g722.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/g723_1.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/g723_1.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/g723_1.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/g723_1.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/g726.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/g726.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/g726.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/g726.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/g729dec.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/g729dec.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/g729dec.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/g729dec.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/gdv.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/gdv.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/gdv.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/gdv.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/genh.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/genh.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/genh.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/genh.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/gif.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/gif.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/gif.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/gif.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/gifdec.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/gifdec.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/gifdec.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/gifdec.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/golomb_tab.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/golomb_tab.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/golomb_tab.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/golomb_tab.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/gopher.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/gopher.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/gopher.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/gopher.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/gsmdec.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/gsmdec.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/gsmdec.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/gsmdec.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/gxf.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/gxf.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/gxf.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/gxf.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/gxf.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/gxf.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/gxf.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/gxf.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/gxfenc.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/gxfenc.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/gxfenc.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/gxfenc.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/h261dec.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/h261dec.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/h261dec.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/h261dec.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/h263dec.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/h263dec.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/h263dec.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/h263dec.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/h264dec.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/h264dec.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/h264dec.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/h264dec.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/hashenc.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/hashenc.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/hashenc.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/hashenc.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/hdsenc.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/hdsenc.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/hdsenc.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/hdsenc.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/hevc.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/hevc.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/hevc.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/hevc.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/hevc.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/hevc.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/hevc.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/hevc.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/hevcdec.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/hevcdec.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/hevcdec.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/hevcdec.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/hls.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/hls.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/hls.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/hls.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/hlsenc.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/hlsenc.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/hlsenc.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/hlsenc.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/hlsplaylist.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/hlsplaylist.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/hlsplaylist.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/hlsplaylist.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/hlsplaylist.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/hlsplaylist.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/hlsplaylist.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/hlsplaylist.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/hlsproto.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/hlsproto.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/hlsproto.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/hlsproto.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/hnm.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/hnm.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/hnm.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/hnm.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/http.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/http.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/http.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/http.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/http.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/http.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/http.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/http.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/httpauth.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/httpauth.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/httpauth.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/httpauth.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/httpauth.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/httpauth.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/httpauth.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/httpauth.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/icecast.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/icecast.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/icecast.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/icecast.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/icodec.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/icodec.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/icodec.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/icodec.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/icoenc.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/icoenc.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/icoenc.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/icoenc.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/id3v1.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/id3v1.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/id3v1.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/id3v1.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/id3v1.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/id3v1.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/id3v1.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/id3v1.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/id3v2.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/id3v2.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/id3v2.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/id3v2.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/id3v2.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/id3v2.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/id3v2.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/id3v2.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/id3v2enc.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/id3v2enc.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/id3v2enc.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/id3v2enc.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/idcin.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/idcin.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/idcin.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/idcin.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/idroqdec.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/idroqdec.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/idroqdec.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/idroqdec.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/idroqenc.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/idroqenc.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/idroqenc.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/idroqenc.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/iff.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/iff.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/iff.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/iff.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/ilbc.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/ilbc.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/ilbc.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/ilbc.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/img2.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/img2.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/img2.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/img2.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/img2.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/img2.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/img2.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/img2.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/img2_alias_pix.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/img2_alias_pix.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/img2_alias_pix.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/img2_alias_pix.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/img2_brender_pix.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/img2_brender_pix.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/img2_brender_pix.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/img2_brender_pix.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/img2dec.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/img2dec.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/img2dec.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/img2dec.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/img2enc.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/img2enc.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/img2enc.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/img2enc.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/ingenientdec.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/ingenientdec.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/ingenientdec.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/ingenientdec.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/internal.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/internal.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/internal.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/internal.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/ip.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/ip.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/ip.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/ip.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/ip.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/ip.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/ip.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/ip.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/ipmovie.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/ipmovie.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/ipmovie.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/ipmovie.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/ircam.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/ircam.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/ircam.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/ircam.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/ircam.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/ircam.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/ircam.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/ircam.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/ircamdec.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/ircamdec.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/ircamdec.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/ircamdec.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/ircamenc.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/ircamenc.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/ircamenc.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/ircamenc.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/isom.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/isom.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/isom.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/isom.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/isom.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/isom.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/isom.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/isom.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/iss.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/iss.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/iss.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/iss.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/iv8.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/iv8.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/iv8.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/iv8.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/ivfdec.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/ivfdec.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/ivfdec.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/ivfdec.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/ivfenc.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/ivfenc.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/ivfenc.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/ivfenc.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/jacosubdec.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/jacosubdec.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/jacosubdec.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/jacosubdec.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/jacosubenc.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/jacosubenc.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/jacosubenc.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/jacosubenc.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/jvdec.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/jvdec.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/jvdec.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/jvdec.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/latmenc.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/latmenc.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/latmenc.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/latmenc.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/libavformat.v b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/libavformat.v
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/libavformat.v
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/libavformat.v
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/libgme.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/libgme.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/libgme.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/libgme.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/libmodplug.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/libmodplug.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/libmodplug.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/libmodplug.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/libopenmpt.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/libopenmpt.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/libopenmpt.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/libopenmpt.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/librtmp.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/librtmp.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/librtmp.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/librtmp.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/libsmbclient.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/libsmbclient.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/libsmbclient.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/libsmbclient.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/libsrt.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/libsrt.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/libsrt.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/libsrt.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/libssh.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/libssh.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/libssh.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/libssh.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/lmlm4.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/lmlm4.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/lmlm4.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/lmlm4.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/loasdec.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/loasdec.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/loasdec.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/loasdec.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/log2_tab.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/log2_tab.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/log2_tab.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/log2_tab.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/lrc.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/lrc.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/lrc.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/lrc.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/lrc.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/lrc.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/lrc.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/lrc.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/lrcdec.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/lrcdec.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/lrcdec.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/lrcdec.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/lrcenc.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/lrcenc.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/lrcenc.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/lrcenc.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/lvfdec.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/lvfdec.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/lvfdec.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/lvfdec.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/lxfdec.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/lxfdec.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/lxfdec.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/lxfdec.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/m4vdec.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/m4vdec.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/m4vdec.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/m4vdec.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/matroska.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/matroska.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/matroska.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/matroska.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/matroska.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/matroska.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/matroska.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/matroska.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/matroskadec.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/matroskadec.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/matroskadec.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/matroskadec.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/matroskaenc.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/matroskaenc.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/matroskaenc.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/matroskaenc.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/md5proto.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/md5proto.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/md5proto.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/md5proto.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/metadata.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/metadata.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/metadata.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/metadata.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/metadata.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/metadata.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/metadata.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/metadata.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/mgsts.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/mgsts.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/mgsts.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/mgsts.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/microdvddec.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/microdvddec.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/microdvddec.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/microdvddec.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/microdvdenc.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/microdvdenc.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/microdvdenc.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/microdvdenc.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/mj2kdec.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/mj2kdec.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/mj2kdec.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/mj2kdec.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/mkvtimestamp_v2.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/mkvtimestamp_v2.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/mkvtimestamp_v2.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/mkvtimestamp_v2.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/mlpdec.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/mlpdec.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/mlpdec.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/mlpdec.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/mlvdec.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/mlvdec.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/mlvdec.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/mlvdec.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/mm.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/mm.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/mm.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/mm.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/mmf.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/mmf.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/mmf.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/mmf.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/mms.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/mms.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/mms.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/mms.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/mms.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/mms.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/mms.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/mms.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/mmsh.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/mmsh.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/mmsh.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/mmsh.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/mmst.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/mmst.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/mmst.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/mmst.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/mov.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/mov.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/mov.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/mov.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/mov_chan.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/mov_chan.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/mov_chan.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/mov_chan.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/mov_chan.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/mov_chan.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/mov_chan.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/mov_chan.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/mov_esds.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/mov_esds.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/mov_esds.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/mov_esds.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/movenc.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/movenc.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/movenc.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/movenc.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/movenc.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/movenc.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/movenc.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/movenc.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/movenccenc.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/movenccenc.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/movenccenc.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/movenccenc.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/movenccenc.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/movenccenc.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/movenccenc.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/movenccenc.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/movenchint.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/movenchint.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/movenchint.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/movenchint.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/mp3dec.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/mp3dec.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/mp3dec.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/mp3dec.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/mp3enc.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/mp3enc.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/mp3enc.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/mp3enc.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/mpc.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/mpc.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/mpc.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/mpc.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/mpc8.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/mpc8.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/mpc8.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/mpc8.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/mpeg.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/mpeg.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/mpeg.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/mpeg.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/mpeg.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/mpeg.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/mpeg.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/mpeg.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/mpegenc.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/mpegenc.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/mpegenc.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/mpegenc.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/mpegts.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/mpegts.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/mpegts.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/mpegts.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/mpegts.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/mpegts.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/mpegts.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/mpegts.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/mpegtsenc.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/mpegtsenc.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/mpegtsenc.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/mpegtsenc.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/mpegvideodec.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/mpegvideodec.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/mpegvideodec.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/mpegvideodec.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/mpjpeg.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/mpjpeg.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/mpjpeg.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/mpjpeg.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/mpjpegdec.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/mpjpegdec.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/mpjpegdec.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/mpjpegdec.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/mpl2dec.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/mpl2dec.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/mpl2dec.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/mpl2dec.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/mpsubdec.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/mpsubdec.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/mpsubdec.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/mpsubdec.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/msf.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/msf.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/msf.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/msf.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/msnwc_tcp.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/msnwc_tcp.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/msnwc_tcp.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/msnwc_tcp.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/mtaf.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/mtaf.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/mtaf.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/mtaf.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/mtv.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/mtv.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/mtv.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/mtv.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/musx.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/musx.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/musx.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/musx.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/mux.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/mux.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/mux.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/mux.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/mvdec.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/mvdec.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/mvdec.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/mvdec.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/mvi.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/mvi.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/mvi.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/mvi.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/mxf.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/mxf.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/mxf.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/mxf.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/mxf.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/mxf.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/mxf.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/mxf.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/mxfdec.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/mxfdec.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/mxfdec.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/mxfdec.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/mxfenc.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/mxfenc.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/mxfenc.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/mxfenc.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/mxg.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/mxg.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/mxg.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/mxg.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/ncdec.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/ncdec.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/ncdec.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/ncdec.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/network.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/network.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/network.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/network.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/network.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/network.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/network.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/network.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/nistspheredec.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/nistspheredec.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/nistspheredec.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/nistspheredec.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/nspdec.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/nspdec.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/nspdec.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/nspdec.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/nsvdec.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/nsvdec.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/nsvdec.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/nsvdec.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/nullenc.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/nullenc.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/nullenc.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/nullenc.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/nut.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/nut.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/nut.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/nut.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/nut.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/nut.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/nut.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/nut.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/nutdec.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/nutdec.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/nutdec.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/nutdec.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/nutenc.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/nutenc.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/nutenc.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/nutenc.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/nuv.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/nuv.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/nuv.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/nuv.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/oggdec.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/oggdec.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/oggdec.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/oggdec.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/oggdec.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/oggdec.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/oggdec.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/oggdec.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/oggenc.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/oggenc.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/oggenc.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/oggenc.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/oggparsecelt.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/oggparsecelt.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/oggparsecelt.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/oggparsecelt.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/oggparsedaala.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/oggparsedaala.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/oggparsedaala.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/oggparsedaala.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/oggparsedirac.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/oggparsedirac.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/oggparsedirac.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/oggparsedirac.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/oggparseflac.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/oggparseflac.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/oggparseflac.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/oggparseflac.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/oggparseogm.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/oggparseogm.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/oggparseogm.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/oggparseogm.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/oggparseopus.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/oggparseopus.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/oggparseopus.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/oggparseopus.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/oggparseskeleton.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/oggparseskeleton.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/oggparseskeleton.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/oggparseskeleton.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/oggparsespeex.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/oggparsespeex.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/oggparsespeex.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/oggparsespeex.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/oggparsetheora.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/oggparsetheora.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/oggparsetheora.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/oggparsetheora.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/oggparsevorbis.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/oggparsevorbis.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/oggparsevorbis.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/oggparsevorbis.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/oggparsevp8.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/oggparsevp8.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/oggparsevp8.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/oggparsevp8.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/oma.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/oma.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/oma.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/oma.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/oma.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/oma.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/oma.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/oma.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/omadec.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/omadec.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/omadec.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/omadec.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/omaenc.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/omaenc.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/omaenc.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/omaenc.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/options.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/options.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/options.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/options.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/options_table.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/options_table.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/options_table.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/options_table.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/os_support.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/os_support.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/os_support.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/os_support.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/os_support.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/os_support.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/os_support.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/os_support.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/paf.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/paf.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/paf.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/paf.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/pcm.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/pcm.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/pcm.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/pcm.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/pcm.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/pcm.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/pcm.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/pcm.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/pcmdec.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/pcmdec.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/pcmdec.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/pcmdec.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/pcmenc.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/pcmenc.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/pcmenc.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/pcmenc.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/pjsdec.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/pjsdec.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/pjsdec.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/pjsdec.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/pmpdec.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/pmpdec.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/pmpdec.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/pmpdec.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/prompeg.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/prompeg.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/prompeg.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/prompeg.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/protocols.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/protocols.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/protocols.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/protocols.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/psxstr.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/psxstr.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/psxstr.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/psxstr.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/pva.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/pva.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/pva.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/pva.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/pvfdec.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/pvfdec.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/pvfdec.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/pvfdec.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/qcp.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/qcp.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/qcp.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/qcp.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/qtpalette.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/qtpalette.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/qtpalette.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/qtpalette.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/qtpalette.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/qtpalette.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/qtpalette.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/qtpalette.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/r3d.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/r3d.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/r3d.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/r3d.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/rawdec.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/rawdec.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/rawdec.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/rawdec.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/rawdec.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/rawdec.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/rawdec.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/rawdec.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/rawenc.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/rawenc.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/rawenc.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/rawenc.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/rawenc.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/rawenc.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/rawenc.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/rawenc.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/rawutils.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/rawutils.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/rawutils.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/rawutils.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/rawvideodec.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/rawvideodec.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/rawvideodec.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/rawvideodec.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/rdt.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/rdt.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/rdt.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/rdt.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/rdt.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/rdt.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/rdt.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/rdt.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/realtextdec.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/realtextdec.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/realtextdec.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/realtextdec.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/redspark.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/redspark.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/redspark.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/redspark.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/replaygain.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/replaygain.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/replaygain.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/replaygain.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/replaygain.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/replaygain.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/replaygain.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/replaygain.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/riff.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/riff.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/riff.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/riff.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/riff.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/riff.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/riff.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/riff.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/riffdec.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/riffdec.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/riffdec.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/riffdec.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/riffenc.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/riffenc.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/riffenc.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/riffenc.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/rl2.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/rl2.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/rl2.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/rl2.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/rm.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/rm.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/rm.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/rm.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/rm.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/rm.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/rm.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/rm.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/rmdec.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/rmdec.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/rmdec.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/rmdec.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/rmenc.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/rmenc.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/rmenc.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/rmenc.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/rmsipr.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/rmsipr.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/rmsipr.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/rmsipr.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/rmsipr.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/rmsipr.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/rmsipr.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/rmsipr.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/rpl.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/rpl.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/rpl.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/rpl.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/rsd.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/rsd.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/rsd.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/rsd.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/rso.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/rso.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/rso.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/rso.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/rso.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/rso.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/rso.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/rso.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/rsodec.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/rsodec.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/rsodec.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/rsodec.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/rsoenc.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/rsoenc.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/rsoenc.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/rsoenc.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/rtmp.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/rtmp.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/rtmp.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/rtmp.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/rtmpcrypt.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/rtmpcrypt.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/rtmpcrypt.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/rtmpcrypt.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/rtmpcrypt.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/rtmpcrypt.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/rtmpcrypt.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/rtmpcrypt.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/rtmpdh.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/rtmpdh.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/rtmpdh.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/rtmpdh.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/rtmpdh.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/rtmpdh.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/rtmpdh.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/rtmpdh.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/rtmpdigest.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/rtmpdigest.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/rtmpdigest.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/rtmpdigest.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/rtmphttp.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/rtmphttp.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/rtmphttp.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/rtmphttp.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/rtmppkt.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/rtmppkt.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/rtmppkt.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/rtmppkt.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/rtmppkt.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/rtmppkt.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/rtmppkt.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/rtmppkt.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/rtmpproto.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/rtmpproto.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/rtmpproto.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/rtmpproto.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/rtp.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/rtp.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/rtp.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/rtp.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/rtp.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/rtp.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/rtp.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/rtp.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/rtpdec.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/rtpdec.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/rtpdec.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/rtpdec.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/rtpdec.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/rtpdec.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/rtpdec.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/rtpdec.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/rtpdec_ac3.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/rtpdec_ac3.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/rtpdec_ac3.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/rtpdec_ac3.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/rtpdec_amr.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/rtpdec_amr.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/rtpdec_amr.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/rtpdec_amr.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/rtpdec_asf.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/rtpdec_asf.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/rtpdec_asf.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/rtpdec_asf.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/rtpdec_dv.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/rtpdec_dv.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/rtpdec_dv.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/rtpdec_dv.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/rtpdec_formats.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/rtpdec_formats.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/rtpdec_formats.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/rtpdec_formats.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/rtpdec_g726.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/rtpdec_g726.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/rtpdec_g726.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/rtpdec_g726.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/rtpdec_h261.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/rtpdec_h261.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/rtpdec_h261.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/rtpdec_h261.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/rtpdec_h263.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/rtpdec_h263.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/rtpdec_h263.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/rtpdec_h263.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/rtpdec_h263_rfc2190.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/rtpdec_h263_rfc2190.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/rtpdec_h263_rfc2190.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/rtpdec_h263_rfc2190.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/rtpdec_h264.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/rtpdec_h264.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/rtpdec_h264.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/rtpdec_h264.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/rtpdec_hevc.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/rtpdec_hevc.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/rtpdec_hevc.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/rtpdec_hevc.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/rtpdec_ilbc.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/rtpdec_ilbc.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/rtpdec_ilbc.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/rtpdec_ilbc.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/rtpdec_jpeg.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/rtpdec_jpeg.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/rtpdec_jpeg.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/rtpdec_jpeg.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/rtpdec_latm.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/rtpdec_latm.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/rtpdec_latm.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/rtpdec_latm.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/rtpdec_mpa_robust.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/rtpdec_mpa_robust.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/rtpdec_mpa_robust.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/rtpdec_mpa_robust.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/rtpdec_mpeg12.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/rtpdec_mpeg12.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/rtpdec_mpeg12.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/rtpdec_mpeg12.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/rtpdec_mpeg4.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/rtpdec_mpeg4.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/rtpdec_mpeg4.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/rtpdec_mpeg4.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/rtpdec_mpegts.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/rtpdec_mpegts.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/rtpdec_mpegts.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/rtpdec_mpegts.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/rtpdec_qcelp.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/rtpdec_qcelp.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/rtpdec_qcelp.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/rtpdec_qcelp.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/rtpdec_qdm2.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/rtpdec_qdm2.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/rtpdec_qdm2.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/rtpdec_qdm2.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/rtpdec_qt.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/rtpdec_qt.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/rtpdec_qt.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/rtpdec_qt.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/rtpdec_rfc4175.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/rtpdec_rfc4175.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/rtpdec_rfc4175.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/rtpdec_rfc4175.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/rtpdec_svq3.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/rtpdec_svq3.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/rtpdec_svq3.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/rtpdec_svq3.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/rtpdec_vc2hq.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/rtpdec_vc2hq.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/rtpdec_vc2hq.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/rtpdec_vc2hq.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/rtpdec_vp8.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/rtpdec_vp8.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/rtpdec_vp8.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/rtpdec_vp8.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/rtpdec_vp9.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/rtpdec_vp9.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/rtpdec_vp9.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/rtpdec_vp9.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/rtpdec_xiph.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/rtpdec_xiph.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/rtpdec_xiph.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/rtpdec_xiph.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/rtpenc.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/rtpenc.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/rtpenc.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/rtpenc.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/rtpenc.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/rtpenc.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/rtpenc.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/rtpenc.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/rtpenc_aac.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/rtpenc_aac.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/rtpenc_aac.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/rtpenc_aac.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/rtpenc_amr.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/rtpenc_amr.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/rtpenc_amr.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/rtpenc_amr.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/rtpenc_chain.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/rtpenc_chain.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/rtpenc_chain.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/rtpenc_chain.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/rtpenc_chain.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/rtpenc_chain.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/rtpenc_chain.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/rtpenc_chain.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/rtpenc_h261.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/rtpenc_h261.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/rtpenc_h261.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/rtpenc_h261.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/rtpenc_h263.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/rtpenc_h263.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/rtpenc_h263.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/rtpenc_h263.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/rtpenc_h263_rfc2190.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/rtpenc_h263_rfc2190.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/rtpenc_h263_rfc2190.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/rtpenc_h263_rfc2190.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/rtpenc_h264_hevc.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/rtpenc_h264_hevc.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/rtpenc_h264_hevc.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/rtpenc_h264_hevc.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/rtpenc_jpeg.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/rtpenc_jpeg.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/rtpenc_jpeg.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/rtpenc_jpeg.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/rtpenc_latm.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/rtpenc_latm.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/rtpenc_latm.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/rtpenc_latm.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/rtpenc_mpegts.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/rtpenc_mpegts.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/rtpenc_mpegts.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/rtpenc_mpegts.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/rtpenc_mpv.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/rtpenc_mpv.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/rtpenc_mpv.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/rtpenc_mpv.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/rtpenc_vc2hq.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/rtpenc_vc2hq.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/rtpenc_vc2hq.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/rtpenc_vc2hq.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/rtpenc_vp8.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/rtpenc_vp8.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/rtpenc_vp8.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/rtpenc_vp8.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/rtpenc_vp9.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/rtpenc_vp9.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/rtpenc_vp9.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/rtpenc_vp9.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/rtpenc_xiph.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/rtpenc_xiph.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/rtpenc_xiph.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/rtpenc_xiph.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/rtpproto.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/rtpproto.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/rtpproto.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/rtpproto.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/rtpproto.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/rtpproto.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/rtpproto.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/rtpproto.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/rtsp.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/rtsp.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/rtsp.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/rtsp.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/rtsp.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/rtsp.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/rtsp.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/rtsp.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/rtspcodes.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/rtspcodes.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/rtspcodes.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/rtspcodes.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/rtspdec.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/rtspdec.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/rtspdec.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/rtspdec.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/rtspenc.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/rtspenc.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/rtspenc.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/rtspenc.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/s337m.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/s337m.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/s337m.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/s337m.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/samidec.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/samidec.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/samidec.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/samidec.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/sapdec.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/sapdec.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/sapdec.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/sapdec.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/sapenc.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/sapenc.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/sapenc.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/sapenc.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/sauce.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/sauce.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/sauce.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/sauce.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/sauce.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/sauce.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/sauce.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/sauce.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/sbcdec.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/sbcdec.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/sbcdec.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/sbcdec.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/sbgdec.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/sbgdec.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/sbgdec.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/sbgdec.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/sccdec.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/sccdec.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/sccdec.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/sccdec.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/sccenc.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/sccenc.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/sccenc.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/sccenc.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/sctp.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/sctp.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/sctp.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/sctp.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/sdp.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/sdp.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/sdp.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/sdp.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/sdr2.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/sdr2.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/sdr2.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/sdr2.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/sdsdec.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/sdsdec.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/sdsdec.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/sdsdec.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/sdxdec.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/sdxdec.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/sdxdec.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/sdxdec.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/segafilm.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/segafilm.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/segafilm.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/segafilm.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/segafilmenc.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/segafilmenc.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/segafilmenc.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/segafilmenc.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/segment.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/segment.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/segment.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/segment.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/serdec.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/serdec.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/serdec.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/serdec.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/shortendec.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/shortendec.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/shortendec.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/shortendec.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/sierravmd.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/sierravmd.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/sierravmd.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/sierravmd.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/siff.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/siff.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/siff.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/siff.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/smacker.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/smacker.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/smacker.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/smacker.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/smjpeg.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/smjpeg.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/smjpeg.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/smjpeg.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/smjpeg.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/smjpeg.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/smjpeg.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/smjpeg.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/smjpegdec.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/smjpegdec.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/smjpegdec.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/smjpegdec.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/smjpegenc.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/smjpegenc.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/smjpegenc.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/smjpegenc.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/smoothstreamingenc.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/smoothstreamingenc.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/smoothstreamingenc.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/smoothstreamingenc.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/smush.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/smush.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/smush.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/smush.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/sol.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/sol.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/sol.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/sol.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/sox.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/sox.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/sox.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/sox.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/soxdec.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/soxdec.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/soxdec.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/soxdec.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/soxenc.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/soxenc.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/soxenc.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/soxenc.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/spdif.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/spdif.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/spdif.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/spdif.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/spdif.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/spdif.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/spdif.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/spdif.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/spdifdec.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/spdifdec.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/spdifdec.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/spdifdec.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/spdifenc.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/spdifenc.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/spdifenc.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/spdifenc.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/srtdec.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/srtdec.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/srtdec.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/srtdec.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/srtenc.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/srtenc.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/srtenc.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/srtenc.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/srtp.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/srtp.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/srtp.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/srtp.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/srtp.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/srtp.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/srtp.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/srtp.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/srtpproto.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/srtpproto.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/srtpproto.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/srtpproto.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/stldec.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/stldec.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/stldec.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/stldec.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/subfile.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/subfile.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/subfile.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/subfile.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/subtitles.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/subtitles.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/subtitles.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/subtitles.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/subtitles.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/subtitles.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/subtitles.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/subtitles.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/subviewer1dec.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/subviewer1dec.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/subviewer1dec.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/subviewer1dec.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/subviewerdec.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/subviewerdec.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/subviewerdec.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/subviewerdec.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/supdec.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/supdec.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/supdec.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/supdec.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/supenc.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/supenc.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/supenc.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/supenc.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/svag.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/svag.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/svag.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/svag.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/swf.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/swf.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/swf.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/swf.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/swf.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/swf.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/swf.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/swf.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/swfdec.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/swfdec.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/swfdec.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/swfdec.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/swfenc.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/swfenc.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/swfenc.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/swfenc.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/takdec.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/takdec.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/takdec.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/takdec.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/tcp.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/tcp.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/tcp.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/tcp.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/tedcaptionsdec.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/tedcaptionsdec.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/tedcaptionsdec.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/tedcaptionsdec.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/tee.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/tee.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/tee.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/tee.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/tee_common.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/tee_common.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/tee_common.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/tee_common.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/tee_common.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/tee_common.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/tee_common.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/tee_common.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/teeproto.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/teeproto.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/teeproto.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/teeproto.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/tests/fifo_muxer.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/tests/fifo_muxer.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/tests/fifo_muxer.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/tests/fifo_muxer.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/tests/movenc.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/tests/movenc.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/tests/movenc.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/tests/movenc.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/tests/noproxy.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/tests/noproxy.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/tests/noproxy.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/tests/noproxy.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/tests/rtmpdh.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/tests/rtmpdh.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/tests/rtmpdh.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/tests/rtmpdh.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/tests/seek.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/tests/seek.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/tests/seek.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/tests/seek.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/tests/srtp.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/tests/srtp.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/tests/srtp.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/tests/srtp.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/tests/url.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/tests/url.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/tests/url.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/tests/url.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/thp.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/thp.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/thp.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/thp.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/tiertexseq.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/tiertexseq.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/tiertexseq.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/tiertexseq.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/tls.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/tls.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/tls.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/tls.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/tls.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/tls.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/tls.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/tls.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/tls_gnutls.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/tls_gnutls.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/tls_gnutls.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/tls_gnutls.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/tls_libtls.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/tls_libtls.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/tls_libtls.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/tls_libtls.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/tls_mbedtls.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/tls_mbedtls.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/tls_mbedtls.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/tls_mbedtls.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/tls_openssl.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/tls_openssl.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/tls_openssl.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/tls_openssl.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/tls_schannel.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/tls_schannel.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/tls_schannel.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/tls_schannel.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/tls_securetransport.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/tls_securetransport.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/tls_securetransport.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/tls_securetransport.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/tmv.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/tmv.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/tmv.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/tmv.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/tta.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/tta.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/tta.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/tta.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/ttaenc.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/ttaenc.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/ttaenc.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/ttaenc.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/tty.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/tty.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/tty.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/tty.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/txd.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/txd.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/txd.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/txd.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/ty.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/ty.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/ty.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/ty.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/udp.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/udp.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/udp.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/udp.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/uncodedframecrcenc.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/uncodedframecrcenc.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/uncodedframecrcenc.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/uncodedframecrcenc.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/unix.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/unix.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/unix.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/unix.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/url.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/url.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/url.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/url.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/url.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/url.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/url.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/url.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/urldecode.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/urldecode.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/urldecode.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/urldecode.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/urldecode.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/urldecode.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/urldecode.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/urldecode.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/utils.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/utils.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/utils.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/utils.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/v210.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/v210.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/v210.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/v210.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/vag.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/vag.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/vag.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/vag.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/vapoursynth.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/vapoursynth.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/vapoursynth.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/vapoursynth.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/vc1dec.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/vc1dec.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/vc1dec.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/vc1dec.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/vc1test.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/vc1test.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/vc1test.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/vc1test.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/vc1testenc.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/vc1testenc.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/vc1testenc.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/vc1testenc.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/version.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/version.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/version.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/version.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/vivo.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/vivo.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/vivo.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/vivo.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/voc.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/voc.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/voc.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/voc.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/voc.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/voc.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/voc.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/voc.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/voc_packet.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/voc_packet.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/voc_packet.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/voc_packet.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/vocdec.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/vocdec.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/vocdec.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/vocdec.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/vocenc.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/vocenc.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/vocenc.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/vocenc.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/vorbiscomment.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/vorbiscomment.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/vorbiscomment.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/vorbiscomment.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/vorbiscomment.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/vorbiscomment.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/vorbiscomment.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/vorbiscomment.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/vpcc.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/vpcc.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/vpcc.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/vpcc.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/vpcc.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/vpcc.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/vpcc.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/vpcc.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/vpk.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/vpk.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/vpk.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/vpk.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/vplayerdec.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/vplayerdec.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/vplayerdec.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/vplayerdec.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/vqf.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/vqf.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/vqf.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/vqf.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/w64.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/w64.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/w64.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/w64.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/w64.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/w64.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/w64.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/w64.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/wavdec.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/wavdec.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/wavdec.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/wavdec.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/wavenc.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/wavenc.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/wavenc.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/wavenc.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/wc3movie.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/wc3movie.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/wc3movie.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/wc3movie.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/webm_chunk.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/webm_chunk.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/webm_chunk.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/webm_chunk.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/webmdashenc.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/webmdashenc.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/webmdashenc.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/webmdashenc.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/webpenc.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/webpenc.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/webpenc.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/webpenc.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/webvttdec.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/webvttdec.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/webvttdec.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/webvttdec.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/webvttenc.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/webvttenc.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/webvttenc.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/webvttenc.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/westwood_aud.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/westwood_aud.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/westwood_aud.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/westwood_aud.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/westwood_vqa.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/westwood_vqa.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/westwood_vqa.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/westwood_vqa.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/wsddec.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/wsddec.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/wsddec.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/wsddec.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/wtv.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/wtv.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/wtv.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/wtv.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/wtv_common.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/wtv_common.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/wtv_common.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/wtv_common.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/wtvdec.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/wtvdec.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/wtvdec.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/wtvdec.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/wtvenc.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/wtvenc.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/wtvenc.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/wtvenc.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/wv.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/wv.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/wv.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/wv.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/wv.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/wv.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/wv.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/wv.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/wvdec.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/wvdec.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/wvdec.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/wvdec.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/wvedec.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/wvedec.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/wvedec.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/wvedec.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/wvenc.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/wvenc.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/wvenc.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/wvenc.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/xa.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/xa.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/xa.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/xa.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/xmv.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/xmv.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/xmv.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/xmv.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/xvag.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/xvag.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/xvag.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/xvag.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/xwma.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/xwma.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/xwma.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/xwma.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/yop.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/yop.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/yop.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/yop.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/yuv4mpeg.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/yuv4mpeg.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/yuv4mpeg.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/yuv4mpeg.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/yuv4mpegdec.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/yuv4mpegdec.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/yuv4mpegdec.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/yuv4mpegdec.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/yuv4mpegenc.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/yuv4mpegenc.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavformat/yuv4mpegenc.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavformat/yuv4mpegenc.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavresample/Makefile b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavresample/Makefile
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavresample/Makefile
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavresample/Makefile
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavresample/aarch64/Makefile b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavresample/aarch64/Makefile
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavresample/aarch64/Makefile
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavresample/aarch64/Makefile
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavresample/aarch64/asm-offsets.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavresample/aarch64/asm-offsets.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavresample/aarch64/asm-offsets.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavresample/aarch64/asm-offsets.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavresample/aarch64/audio_convert_init.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavresample/aarch64/audio_convert_init.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavresample/aarch64/audio_convert_init.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavresample/aarch64/audio_convert_init.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavresample/aarch64/audio_convert_neon.S b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavresample/aarch64/audio_convert_neon.S
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavresample/aarch64/audio_convert_neon.S
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavresample/aarch64/audio_convert_neon.S
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavresample/aarch64/neontest.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavresample/aarch64/neontest.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavresample/aarch64/neontest.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavresample/aarch64/neontest.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavresample/aarch64/resample_init.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavresample/aarch64/resample_init.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavresample/aarch64/resample_init.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavresample/aarch64/resample_init.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavresample/aarch64/resample_neon.S b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavresample/aarch64/resample_neon.S
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavresample/aarch64/resample_neon.S
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavresample/aarch64/resample_neon.S
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavresample/arm/Makefile b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavresample/arm/Makefile
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavresample/arm/Makefile
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavresample/arm/Makefile
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavresample/arm/asm-offsets.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavresample/arm/asm-offsets.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavresample/arm/asm-offsets.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavresample/arm/asm-offsets.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavresample/arm/audio_convert_init.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavresample/arm/audio_convert_init.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavresample/arm/audio_convert_init.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavresample/arm/audio_convert_init.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavresample/arm/audio_convert_neon.S b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavresample/arm/audio_convert_neon.S
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavresample/arm/audio_convert_neon.S
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavresample/arm/audio_convert_neon.S
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavresample/arm/neontest.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavresample/arm/neontest.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavresample/arm/neontest.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavresample/arm/neontest.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavresample/arm/resample_init.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavresample/arm/resample_init.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavresample/arm/resample_init.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavresample/arm/resample_init.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavresample/arm/resample_neon.S b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavresample/arm/resample_neon.S
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavresample/arm/resample_neon.S
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavresample/arm/resample_neon.S
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavresample/audio_convert.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavresample/audio_convert.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavresample/audio_convert.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavresample/audio_convert.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavresample/audio_convert.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavresample/audio_convert.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavresample/audio_convert.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavresample/audio_convert.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavresample/audio_data.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavresample/audio_data.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavresample/audio_data.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavresample/audio_data.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavresample/audio_data.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavresample/audio_data.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavresample/audio_data.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavresample/audio_data.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavresample/audio_mix.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavresample/audio_mix.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavresample/audio_mix.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavresample/audio_mix.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavresample/audio_mix.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavresample/audio_mix.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavresample/audio_mix.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavresample/audio_mix.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavresample/audio_mix_matrix.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavresample/audio_mix_matrix.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavresample/audio_mix_matrix.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavresample/audio_mix_matrix.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavresample/avresample.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavresample/avresample.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavresample/avresample.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavresample/avresample.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavresample/avresampleres.rc b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavresample/avresampleres.rc
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavresample/avresampleres.rc
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavresample/avresampleres.rc
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavresample/dither.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavresample/dither.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavresample/dither.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavresample/dither.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavresample/dither.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavresample/dither.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavresample/dither.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavresample/dither.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavresample/internal.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavresample/internal.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavresample/internal.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavresample/internal.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavresample/libavresample.v b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavresample/libavresample.v
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavresample/libavresample.v
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavresample/libavresample.v
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavresample/options.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavresample/options.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavresample/options.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavresample/options.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavresample/resample.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavresample/resample.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavresample/resample.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavresample/resample.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavresample/resample.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavresample/resample.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavresample/resample.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavresample/resample.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavresample/resample_template.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavresample/resample_template.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavresample/resample_template.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavresample/resample_template.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavresample/tests/avresample.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavresample/tests/avresample.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavresample/tests/avresample.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavresample/tests/avresample.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavresample/utils.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavresample/utils.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavresample/utils.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavresample/utils.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavresample/version.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavresample/version.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavresample/version.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavresample/version.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavresample/x86/Makefile b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavresample/x86/Makefile
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavresample/x86/Makefile
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavresample/x86/Makefile
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavresample/x86/audio_convert.asm b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavresample/x86/audio_convert.asm
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavresample/x86/audio_convert.asm
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavresample/x86/audio_convert.asm
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavresample/x86/audio_convert_init.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavresample/x86/audio_convert_init.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavresample/x86/audio_convert_init.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavresample/x86/audio_convert_init.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavresample/x86/audio_mix.asm b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavresample/x86/audio_mix.asm
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavresample/x86/audio_mix.asm
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavresample/x86/audio_mix.asm
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavresample/x86/audio_mix_init.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavresample/x86/audio_mix_init.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavresample/x86/audio_mix_init.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavresample/x86/audio_mix_init.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavresample/x86/dither.asm b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavresample/x86/dither.asm
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavresample/x86/dither.asm
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavresample/x86/dither.asm
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavresample/x86/dither_init.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavresample/x86/dither_init.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavresample/x86/dither_init.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavresample/x86/dither_init.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavresample/x86/util.asm b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavresample/x86/util.asm
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavresample/x86/util.asm
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavresample/x86/util.asm
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavresample/x86/w64xmmtest.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavresample/x86/w64xmmtest.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavresample/x86/w64xmmtest.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavresample/x86/w64xmmtest.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/Makefile b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/Makefile
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/Makefile
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/Makefile
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/aarch64/Makefile b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/aarch64/Makefile
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/aarch64/Makefile
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/aarch64/Makefile
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/aarch64/asm.S b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/aarch64/asm.S
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/aarch64/asm.S
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/aarch64/asm.S
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/aarch64/bswap.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/aarch64/bswap.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/aarch64/bswap.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/aarch64/bswap.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/aarch64/cpu.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/aarch64/cpu.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/aarch64/cpu.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/aarch64/cpu.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/aarch64/cpu.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/aarch64/cpu.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/aarch64/cpu.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/aarch64/cpu.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/aarch64/float_dsp_init.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/aarch64/float_dsp_init.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/aarch64/float_dsp_init.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/aarch64/float_dsp_init.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/aarch64/float_dsp_neon.S b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/aarch64/float_dsp_neon.S
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/aarch64/float_dsp_neon.S
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/aarch64/float_dsp_neon.S
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/aarch64/neontest.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/aarch64/neontest.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/aarch64/neontest.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/aarch64/neontest.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/aarch64/timer.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/aarch64/timer.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/aarch64/timer.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/aarch64/timer.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/adler32.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/adler32.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/adler32.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/adler32.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/adler32.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/adler32.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/adler32.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/adler32.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/aes.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/aes.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/aes.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/aes.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/aes.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/aes.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/aes.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/aes.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/aes_ctr.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/aes_ctr.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/aes_ctr.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/aes_ctr.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/aes_ctr.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/aes_ctr.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/aes_ctr.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/aes_ctr.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/aes_internal.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/aes_internal.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/aes_internal.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/aes_internal.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/arm/Makefile b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/arm/Makefile
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/arm/Makefile
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/arm/Makefile
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/arm/asm.S b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/arm/asm.S
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/arm/asm.S
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/arm/asm.S
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/arm/bswap.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/arm/bswap.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/arm/bswap.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/arm/bswap.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/arm/cpu.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/arm/cpu.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/arm/cpu.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/arm/cpu.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/arm/cpu.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/arm/cpu.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/arm/cpu.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/arm/cpu.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/arm/float_dsp_arm.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/arm/float_dsp_arm.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/arm/float_dsp_arm.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/arm/float_dsp_arm.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/arm/float_dsp_init_arm.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/arm/float_dsp_init_arm.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/arm/float_dsp_init_arm.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/arm/float_dsp_init_arm.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/arm/float_dsp_init_neon.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/arm/float_dsp_init_neon.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/arm/float_dsp_init_neon.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/arm/float_dsp_init_neon.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/arm/float_dsp_init_vfp.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/arm/float_dsp_init_vfp.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/arm/float_dsp_init_vfp.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/arm/float_dsp_init_vfp.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/arm/float_dsp_neon.S b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/arm/float_dsp_neon.S
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/arm/float_dsp_neon.S
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/arm/float_dsp_neon.S
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/arm/float_dsp_vfp.S b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/arm/float_dsp_vfp.S
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/arm/float_dsp_vfp.S
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/arm/float_dsp_vfp.S
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/arm/intmath.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/arm/intmath.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/arm/intmath.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/arm/intmath.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/arm/intreadwrite.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/arm/intreadwrite.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/arm/intreadwrite.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/arm/intreadwrite.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/arm/neontest.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/arm/neontest.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/arm/neontest.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/arm/neontest.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/arm/timer.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/arm/timer.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/arm/timer.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/arm/timer.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/attributes.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/attributes.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/attributes.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/attributes.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/audio_fifo.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/audio_fifo.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/audio_fifo.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/audio_fifo.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/audio_fifo.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/audio_fifo.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/audio_fifo.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/audio_fifo.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/avassert.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/avassert.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/avassert.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/avassert.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/avr32/bswap.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/avr32/bswap.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/avr32/bswap.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/avr32/bswap.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/avr32/intreadwrite.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/avr32/intreadwrite.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/avr32/intreadwrite.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/avr32/intreadwrite.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/avstring.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/avstring.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/avstring.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/avstring.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/avstring.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/avstring.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/avstring.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/avstring.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/avutil.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/avutil.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/avutil.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/avutil.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/avutilres.rc b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/avutilres.rc
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/avutilres.rc
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/avutilres.rc
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/base64.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/base64.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/base64.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/base64.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/base64.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/base64.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/base64.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/base64.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/bfin/bswap.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/bfin/bswap.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/bfin/bswap.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/bfin/bswap.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/bfin/timer.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/bfin/timer.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/bfin/timer.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/bfin/timer.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/blowfish.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/blowfish.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/blowfish.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/blowfish.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/blowfish.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/blowfish.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/blowfish.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/blowfish.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/bprint.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/bprint.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/bprint.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/bprint.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/bprint.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/bprint.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/bprint.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/bprint.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/bswap.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/bswap.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/bswap.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/bswap.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/buffer.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/buffer.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/buffer.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/buffer.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/buffer.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/buffer.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/buffer.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/buffer.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/buffer_internal.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/buffer_internal.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/buffer_internal.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/buffer_internal.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/camellia.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/camellia.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/camellia.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/camellia.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/camellia.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/camellia.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/camellia.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/camellia.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/cast5.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/cast5.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/cast5.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/cast5.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/cast5.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/cast5.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/cast5.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/cast5.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/channel_layout.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/channel_layout.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/channel_layout.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/channel_layout.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/channel_layout.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/channel_layout.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/channel_layout.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/channel_layout.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/color_utils.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/color_utils.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/color_utils.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/color_utils.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/color_utils.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/color_utils.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/color_utils.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/color_utils.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/colorspace.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/colorspace.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/colorspace.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/colorspace.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/common.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/common.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/common.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/common.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/cpu.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/cpu.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/cpu.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/cpu.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/cpu.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/cpu.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/cpu.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/cpu.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/cpu_internal.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/cpu_internal.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/cpu_internal.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/cpu_internal.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/crc.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/crc.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/crc.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/crc.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/crc.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/crc.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/crc.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/crc.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/des.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/des.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/des.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/des.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/des.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/des.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/des.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/des.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/dict.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/dict.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/dict.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/dict.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/dict.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/dict.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/dict.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/dict.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/display.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/display.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/display.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/display.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/display.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/display.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/display.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/display.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/downmix_info.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/downmix_info.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/downmix_info.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/downmix_info.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/downmix_info.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/downmix_info.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/downmix_info.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/downmix_info.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/dynarray.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/dynarray.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/dynarray.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/dynarray.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/encryption_info.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/encryption_info.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/encryption_info.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/encryption_info.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/encryption_info.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/encryption_info.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/encryption_info.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/encryption_info.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/error.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/error.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/error.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/error.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/error.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/error.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/error.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/error.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/eval.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/eval.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/eval.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/eval.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/eval.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/eval.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/eval.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/eval.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/ffmath.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/ffmath.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/ffmath.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/ffmath.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/fifo.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/fifo.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/fifo.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/fifo.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/fifo.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/fifo.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/fifo.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/fifo.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/file.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/file.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/file.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/file.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/file.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/file.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/file.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/file.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/file_open.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/file_open.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/file_open.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/file_open.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/fixed_dsp.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/fixed_dsp.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/fixed_dsp.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/fixed_dsp.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/fixed_dsp.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/fixed_dsp.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/fixed_dsp.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/fixed_dsp.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/float_dsp.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/float_dsp.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/float_dsp.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/float_dsp.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/float_dsp.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/float_dsp.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/float_dsp.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/float_dsp.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/frame.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/frame.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/frame.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/frame.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/frame.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/frame.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/frame.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/frame.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/hash.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/hash.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/hash.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/hash.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/hash.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/hash.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/hash.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/hash.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/hmac.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/hmac.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/hmac.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/hmac.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/hmac.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/hmac.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/hmac.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/hmac.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/hwcontext.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/hwcontext.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/hwcontext.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/hwcontext.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/hwcontext.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/hwcontext.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/hwcontext.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/hwcontext.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/hwcontext_cuda.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/hwcontext_cuda.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/hwcontext_cuda.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/hwcontext_cuda.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/hwcontext_cuda.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/hwcontext_cuda.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/hwcontext_cuda.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/hwcontext_cuda.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/hwcontext_cuda_internal.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/hwcontext_cuda_internal.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/hwcontext_cuda_internal.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/hwcontext_cuda_internal.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/hwcontext_d3d11va.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/hwcontext_d3d11va.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/hwcontext_d3d11va.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/hwcontext_d3d11va.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/hwcontext_d3d11va.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/hwcontext_d3d11va.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/hwcontext_d3d11va.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/hwcontext_d3d11va.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/hwcontext_drm.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/hwcontext_drm.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/hwcontext_drm.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/hwcontext_drm.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/hwcontext_drm.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/hwcontext_drm.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/hwcontext_drm.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/hwcontext_drm.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/hwcontext_dxva2.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/hwcontext_dxva2.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/hwcontext_dxva2.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/hwcontext_dxva2.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/hwcontext_dxva2.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/hwcontext_dxva2.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/hwcontext_dxva2.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/hwcontext_dxva2.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/hwcontext_internal.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/hwcontext_internal.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/hwcontext_internal.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/hwcontext_internal.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/hwcontext_mediacodec.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/hwcontext_mediacodec.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/hwcontext_mediacodec.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/hwcontext_mediacodec.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/hwcontext_mediacodec.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/hwcontext_mediacodec.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/hwcontext_mediacodec.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/hwcontext_mediacodec.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/hwcontext_opencl.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/hwcontext_opencl.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/hwcontext_opencl.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/hwcontext_opencl.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/hwcontext_opencl.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/hwcontext_opencl.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/hwcontext_opencl.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/hwcontext_opencl.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/hwcontext_qsv.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/hwcontext_qsv.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/hwcontext_qsv.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/hwcontext_qsv.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/hwcontext_qsv.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/hwcontext_qsv.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/hwcontext_qsv.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/hwcontext_qsv.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/hwcontext_vaapi.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/hwcontext_vaapi.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/hwcontext_vaapi.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/hwcontext_vaapi.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/hwcontext_vaapi.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/hwcontext_vaapi.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/hwcontext_vaapi.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/hwcontext_vaapi.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/hwcontext_vdpau.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/hwcontext_vdpau.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/hwcontext_vdpau.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/hwcontext_vdpau.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/hwcontext_vdpau.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/hwcontext_vdpau.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/hwcontext_vdpau.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/hwcontext_vdpau.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/hwcontext_videotoolbox.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/hwcontext_videotoolbox.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/hwcontext_videotoolbox.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/hwcontext_videotoolbox.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/hwcontext_videotoolbox.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/hwcontext_videotoolbox.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/hwcontext_videotoolbox.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/hwcontext_videotoolbox.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/imgutils.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/imgutils.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/imgutils.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/imgutils.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/imgutils.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/imgutils.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/imgutils.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/imgutils.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/imgutils_internal.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/imgutils_internal.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/imgutils_internal.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/imgutils_internal.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/integer.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/integer.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/integer.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/integer.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/integer.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/integer.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/integer.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/integer.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/internal.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/internal.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/internal.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/internal.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/intfloat.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/intfloat.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/intfloat.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/intfloat.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/intmath.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/intmath.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/intmath.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/intmath.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/intmath.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/intmath.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/intmath.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/intmath.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/intreadwrite.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/intreadwrite.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/intreadwrite.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/intreadwrite.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/lfg.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/lfg.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/lfg.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/lfg.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/lfg.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/lfg.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/lfg.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/lfg.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/libavutil.v b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/libavutil.v
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/libavutil.v
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/libavutil.v
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/libm.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/libm.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/libm.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/libm.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/lls.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/lls.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/lls.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/lls.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/lls.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/lls.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/lls.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/lls.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/log.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/log.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/log.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/log.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/log.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/log.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/log.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/log.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/log2_tab.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/log2_tab.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/log2_tab.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/log2_tab.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/lzo.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/lzo.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/lzo.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/lzo.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/lzo.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/lzo.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/lzo.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/lzo.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/macros.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/macros.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/macros.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/macros.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/mastering_display_metadata.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/mastering_display_metadata.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/mastering_display_metadata.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/mastering_display_metadata.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/mastering_display_metadata.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/mastering_display_metadata.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/mastering_display_metadata.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/mastering_display_metadata.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/mathematics.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/mathematics.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/mathematics.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/mathematics.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/mathematics.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/mathematics.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/mathematics.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/mathematics.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/md5.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/md5.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/md5.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/md5.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/md5.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/md5.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/md5.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/md5.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/mem.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/mem.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/mem.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/mem.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/mem.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/mem.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/mem.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/mem.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/mem_internal.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/mem_internal.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/mem_internal.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/mem_internal.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/mips/Makefile b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/mips/Makefile
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/mips/Makefile
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/mips/Makefile
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/mips/asmdefs.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/mips/asmdefs.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/mips/asmdefs.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/mips/asmdefs.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/mips/float_dsp_mips.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/mips/float_dsp_mips.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/mips/float_dsp_mips.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/mips/float_dsp_mips.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/mips/generic_macros_msa.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/mips/generic_macros_msa.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/mips/generic_macros_msa.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/mips/generic_macros_msa.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/mips/intreadwrite.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/mips/intreadwrite.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/mips/intreadwrite.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/mips/intreadwrite.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/mips/libm_mips.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/mips/libm_mips.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/mips/libm_mips.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/mips/libm_mips.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/mips/mmiutils.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/mips/mmiutils.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/mips/mmiutils.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/mips/mmiutils.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/motion_vector.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/motion_vector.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/motion_vector.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/motion_vector.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/murmur3.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/murmur3.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/murmur3.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/murmur3.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/murmur3.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/murmur3.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/murmur3.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/murmur3.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/opt.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/opt.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/opt.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/opt.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/opt.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/opt.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/opt.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/opt.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/parseutils.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/parseutils.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/parseutils.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/parseutils.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/parseutils.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/parseutils.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/parseutils.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/parseutils.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/pca.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/pca.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/pca.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/pca.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/pca.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/pca.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/pca.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/pca.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/pixdesc.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/pixdesc.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/pixdesc.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/pixdesc.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/pixdesc.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/pixdesc.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/pixdesc.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/pixdesc.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/pixelutils.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/pixelutils.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/pixelutils.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/pixelutils.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/pixelutils.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/pixelutils.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/pixelutils.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/pixelutils.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/pixfmt.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/pixfmt.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/pixfmt.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/pixfmt.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/ppc/Makefile b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/ppc/Makefile
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/ppc/Makefile
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/ppc/Makefile
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/ppc/cpu.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/ppc/cpu.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/ppc/cpu.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/ppc/cpu.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/ppc/cpu.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/ppc/cpu.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/ppc/cpu.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/ppc/cpu.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/ppc/float_dsp_altivec.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/ppc/float_dsp_altivec.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/ppc/float_dsp_altivec.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/ppc/float_dsp_altivec.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/ppc/float_dsp_altivec.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/ppc/float_dsp_altivec.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/ppc/float_dsp_altivec.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/ppc/float_dsp_altivec.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/ppc/float_dsp_init.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/ppc/float_dsp_init.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/ppc/float_dsp_init.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/ppc/float_dsp_init.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/ppc/float_dsp_vsx.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/ppc/float_dsp_vsx.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/ppc/float_dsp_vsx.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/ppc/float_dsp_vsx.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/ppc/float_dsp_vsx.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/ppc/float_dsp_vsx.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/ppc/float_dsp_vsx.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/ppc/float_dsp_vsx.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/ppc/intreadwrite.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/ppc/intreadwrite.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/ppc/intreadwrite.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/ppc/intreadwrite.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/ppc/timer.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/ppc/timer.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/ppc/timer.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/ppc/timer.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/ppc/util_altivec.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/ppc/util_altivec.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/ppc/util_altivec.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/ppc/util_altivec.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/qsort.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/qsort.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/qsort.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/qsort.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/random_seed.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/random_seed.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/random_seed.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/random_seed.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/random_seed.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/random_seed.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/random_seed.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/random_seed.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/rational.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/rational.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/rational.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/rational.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/rational.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/rational.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/rational.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/rational.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/rc4.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/rc4.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/rc4.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/rc4.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/rc4.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/rc4.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/rc4.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/rc4.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/replaygain.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/replaygain.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/replaygain.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/replaygain.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/reverse.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/reverse.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/reverse.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/reverse.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/reverse.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/reverse.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/reverse.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/reverse.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/ripemd.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/ripemd.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/ripemd.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/ripemd.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/ripemd.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/ripemd.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/ripemd.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/ripemd.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/samplefmt.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/samplefmt.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/samplefmt.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/samplefmt.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/samplefmt.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/samplefmt.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/samplefmt.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/samplefmt.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/sh4/bswap.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/sh4/bswap.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/sh4/bswap.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/sh4/bswap.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/sha.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/sha.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/sha.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/sha.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/sha.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/sha.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/sha.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/sha.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/sha512.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/sha512.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/sha512.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/sha512.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/sha512.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/sha512.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/sha512.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/sha512.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/slicethread.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/slicethread.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/slicethread.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/slicethread.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/slicethread.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/slicethread.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/slicethread.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/slicethread.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/softfloat.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/softfloat.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/softfloat.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/softfloat.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/softfloat_ieee754.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/softfloat_ieee754.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/softfloat_ieee754.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/softfloat_ieee754.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/softfloat_tables.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/softfloat_tables.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/softfloat_tables.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/softfloat_tables.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/spherical.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/spherical.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/spherical.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/spherical.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/spherical.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/spherical.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/spherical.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/spherical.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/stereo3d.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/stereo3d.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/stereo3d.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/stereo3d.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/stereo3d.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/stereo3d.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/stereo3d.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/stereo3d.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/tablegen.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/tablegen.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/tablegen.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/tablegen.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/tea.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/tea.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/tea.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/tea.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/tea.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/tea.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/tea.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/tea.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/tests/adler32.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/tests/adler32.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/tests/adler32.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/tests/adler32.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/tests/aes.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/tests/aes.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/tests/aes.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/tests/aes.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/tests/aes_ctr.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/tests/aes_ctr.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/tests/aes_ctr.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/tests/aes_ctr.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/tests/audio_fifo.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/tests/audio_fifo.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/tests/audio_fifo.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/tests/audio_fifo.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/tests/avstring.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/tests/avstring.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/tests/avstring.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/tests/avstring.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/tests/base64.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/tests/base64.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/tests/base64.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/tests/base64.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/tests/blowfish.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/tests/blowfish.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/tests/blowfish.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/tests/blowfish.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/tests/bprint.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/tests/bprint.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/tests/bprint.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/tests/bprint.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/tests/camellia.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/tests/camellia.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/tests/camellia.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/tests/camellia.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/tests/cast5.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/tests/cast5.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/tests/cast5.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/tests/cast5.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/tests/color_utils.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/tests/color_utils.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/tests/color_utils.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/tests/color_utils.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/tests/cpu.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/tests/cpu.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/tests/cpu.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/tests/cpu.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/tests/cpu_init.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/tests/cpu_init.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/tests/cpu_init.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/tests/cpu_init.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/tests/crc.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/tests/crc.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/tests/crc.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/tests/crc.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/tests/des.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/tests/des.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/tests/des.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/tests/des.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/tests/dict.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/tests/dict.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/tests/dict.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/tests/dict.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/tests/display.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/tests/display.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/tests/display.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/tests/display.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/tests/encryption_info.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/tests/encryption_info.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/tests/encryption_info.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/tests/encryption_info.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/tests/error.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/tests/error.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/tests/error.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/tests/error.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/tests/eval.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/tests/eval.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/tests/eval.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/tests/eval.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/tests/fifo.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/tests/fifo.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/tests/fifo.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/tests/fifo.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/tests/file.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/tests/file.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/tests/file.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/tests/file.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/tests/hash.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/tests/hash.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/tests/hash.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/tests/hash.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/tests/hmac.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/tests/hmac.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/tests/hmac.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/tests/hmac.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/tests/hwdevice.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/tests/hwdevice.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/tests/hwdevice.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/tests/hwdevice.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/tests/imgutils.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/tests/imgutils.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/tests/imgutils.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/tests/imgutils.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/tests/integer.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/tests/integer.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/tests/integer.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/tests/integer.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/tests/lfg.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/tests/lfg.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/tests/lfg.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/tests/lfg.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/tests/lls.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/tests/lls.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/tests/lls.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/tests/lls.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/tests/log.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/tests/log.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/tests/log.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/tests/log.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/tests/lzo.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/tests/lzo.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/tests/lzo.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/tests/lzo.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/tests/md5.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/tests/md5.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/tests/md5.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/tests/md5.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/tests/murmur3.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/tests/murmur3.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/tests/murmur3.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/tests/murmur3.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/tests/opt.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/tests/opt.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/tests/opt.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/tests/opt.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/tests/parseutils.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/tests/parseutils.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/tests/parseutils.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/tests/parseutils.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/tests/pca.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/tests/pca.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/tests/pca.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/tests/pca.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/tests/pixdesc.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/tests/pixdesc.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/tests/pixdesc.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/tests/pixdesc.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/tests/pixelutils.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/tests/pixelutils.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/tests/pixelutils.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/tests/pixelutils.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/tests/pixfmt_best.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/tests/pixfmt_best.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/tests/pixfmt_best.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/tests/pixfmt_best.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/tests/random_seed.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/tests/random_seed.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/tests/random_seed.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/tests/random_seed.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/tests/rational.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/tests/rational.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/tests/rational.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/tests/rational.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/tests/ripemd.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/tests/ripemd.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/tests/ripemd.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/tests/ripemd.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/tests/sha.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/tests/sha.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/tests/sha.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/tests/sha.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/tests/sha512.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/tests/sha512.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/tests/sha512.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/tests/sha512.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/tests/softfloat.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/tests/softfloat.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/tests/softfloat.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/tests/softfloat.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/tests/tea.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/tests/tea.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/tests/tea.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/tests/tea.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/tests/tree.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/tests/tree.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/tests/tree.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/tests/tree.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/tests/twofish.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/tests/twofish.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/tests/twofish.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/tests/twofish.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/tests/utf8.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/tests/utf8.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/tests/utf8.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/tests/utf8.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/tests/xtea.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/tests/xtea.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/tests/xtea.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/tests/xtea.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/thread.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/thread.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/thread.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/thread.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/threadmessage.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/threadmessage.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/threadmessage.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/threadmessage.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/threadmessage.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/threadmessage.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/threadmessage.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/threadmessage.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/time.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/time.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/time.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/time.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/time.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/time.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/time.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/time.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/time_internal.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/time_internal.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/time_internal.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/time_internal.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/timecode.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/timecode.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/timecode.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/timecode.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/timecode.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/timecode.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/timecode.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/timecode.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/timer.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/timer.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/timer.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/timer.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/timestamp.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/timestamp.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/timestamp.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/timestamp.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/tomi/intreadwrite.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/tomi/intreadwrite.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/tomi/intreadwrite.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/tomi/intreadwrite.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/tree.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/tree.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/tree.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/tree.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/tree.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/tree.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/tree.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/tree.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/twofish.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/twofish.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/twofish.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/twofish.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/twofish.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/twofish.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/twofish.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/twofish.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/utils.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/utils.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/utils.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/utils.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/version.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/version.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/version.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/version.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/wchar_filename.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/wchar_filename.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/wchar_filename.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/wchar_filename.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/x86/Makefile b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/x86/Makefile
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/x86/Makefile
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/x86/Makefile
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/x86/asm.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/x86/asm.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/x86/asm.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/x86/asm.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/x86/bswap.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/x86/bswap.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/x86/bswap.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/x86/bswap.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/x86/cpu.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/x86/cpu.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/x86/cpu.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/x86/cpu.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/x86/cpu.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/x86/cpu.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/x86/cpu.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/x86/cpu.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/x86/cpuid.asm b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/x86/cpuid.asm
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/x86/cpuid.asm
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/x86/cpuid.asm
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/x86/emms.asm b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/x86/emms.asm
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/x86/emms.asm
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/x86/emms.asm
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/x86/emms.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/x86/emms.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/x86/emms.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/x86/emms.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/x86/fixed_dsp.asm b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/x86/fixed_dsp.asm
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/x86/fixed_dsp.asm
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/x86/fixed_dsp.asm
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/x86/fixed_dsp_init.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/x86/fixed_dsp_init.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/x86/fixed_dsp_init.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/x86/fixed_dsp_init.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/x86/float_dsp.asm b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/x86/float_dsp.asm
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/x86/float_dsp.asm
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/x86/float_dsp.asm
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/x86/float_dsp_init.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/x86/float_dsp_init.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/x86/float_dsp_init.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/x86/float_dsp_init.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/x86/imgutils.asm b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/x86/imgutils.asm
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/x86/imgutils.asm
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/x86/imgutils.asm
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/x86/imgutils_init.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/x86/imgutils_init.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/x86/imgutils_init.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/x86/imgutils_init.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/x86/intmath.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/x86/intmath.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/x86/intmath.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/x86/intmath.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/x86/intreadwrite.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/x86/intreadwrite.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/x86/intreadwrite.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/x86/intreadwrite.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/x86/lls.asm b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/x86/lls.asm
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/x86/lls.asm
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/x86/lls.asm
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/x86/lls_init.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/x86/lls_init.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/x86/lls_init.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/x86/lls_init.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/x86/pixelutils.asm b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/x86/pixelutils.asm
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/x86/pixelutils.asm
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/x86/pixelutils.asm
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/x86/pixelutils.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/x86/pixelutils.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/x86/pixelutils.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/x86/pixelutils.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/x86/pixelutils_init.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/x86/pixelutils_init.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/x86/pixelutils_init.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/x86/pixelutils_init.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/x86/timer.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/x86/timer.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/x86/timer.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/x86/timer.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/x86/w64xmmtest.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/x86/w64xmmtest.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/x86/w64xmmtest.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/x86/w64xmmtest.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/x86/x86inc.asm b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/x86/x86inc.asm
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/x86/x86inc.asm
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/x86/x86inc.asm
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/x86/x86util.asm b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/x86/x86util.asm
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/x86/x86util.asm
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/x86/x86util.asm
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/xga_font_data.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/xga_font_data.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/xga_font_data.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/xga_font_data.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/xga_font_data.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/xga_font_data.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/xga_font_data.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/xga_font_data.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/xtea.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/xtea.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/xtea.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/xtea.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/xtea.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/xtea.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libavutil/xtea.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libavutil/xtea.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libpostproc/Makefile b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libpostproc/Makefile
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libpostproc/Makefile
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libpostproc/Makefile
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libpostproc/libpostproc.v b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libpostproc/libpostproc.v
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libpostproc/libpostproc.v
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libpostproc/libpostproc.v
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libpostproc/postprocess.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libpostproc/postprocess.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libpostproc/postprocess.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libpostproc/postprocess.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libpostproc/postprocess.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libpostproc/postprocess.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libpostproc/postprocess.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libpostproc/postprocess.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libpostproc/postprocess_altivec_template.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libpostproc/postprocess_altivec_template.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libpostproc/postprocess_altivec_template.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libpostproc/postprocess_altivec_template.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libpostproc/postprocess_internal.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libpostproc/postprocess_internal.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libpostproc/postprocess_internal.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libpostproc/postprocess_internal.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libpostproc/postprocess_template.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libpostproc/postprocess_template.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libpostproc/postprocess_template.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libpostproc/postprocess_template.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libpostproc/postprocres.rc b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libpostproc/postprocres.rc
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libpostproc/postprocres.rc
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libpostproc/postprocres.rc
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libpostproc/version.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libpostproc/version.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libpostproc/version.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libpostproc/version.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libswresample/Makefile b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libswresample/Makefile
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libswresample/Makefile
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libswresample/Makefile
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libswresample/aarch64/Makefile b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libswresample/aarch64/Makefile
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libswresample/aarch64/Makefile
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libswresample/aarch64/Makefile
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libswresample/aarch64/audio_convert_init.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libswresample/aarch64/audio_convert_init.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libswresample/aarch64/audio_convert_init.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libswresample/aarch64/audio_convert_init.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libswresample/aarch64/audio_convert_neon.S b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libswresample/aarch64/audio_convert_neon.S
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libswresample/aarch64/audio_convert_neon.S
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libswresample/aarch64/audio_convert_neon.S
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libswresample/aarch64/neontest.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libswresample/aarch64/neontest.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libswresample/aarch64/neontest.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libswresample/aarch64/neontest.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libswresample/aarch64/resample.S b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libswresample/aarch64/resample.S
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libswresample/aarch64/resample.S
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libswresample/aarch64/resample.S
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libswresample/aarch64/resample_init.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libswresample/aarch64/resample_init.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libswresample/aarch64/resample_init.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libswresample/aarch64/resample_init.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libswresample/arm/Makefile b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libswresample/arm/Makefile
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libswresample/arm/Makefile
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libswresample/arm/Makefile
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libswresample/arm/audio_convert_init.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libswresample/arm/audio_convert_init.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libswresample/arm/audio_convert_init.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libswresample/arm/audio_convert_init.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libswresample/arm/audio_convert_neon.S b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libswresample/arm/audio_convert_neon.S
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libswresample/arm/audio_convert_neon.S
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libswresample/arm/audio_convert_neon.S
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libswresample/arm/neontest.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libswresample/arm/neontest.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libswresample/arm/neontest.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libswresample/arm/neontest.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libswresample/arm/resample.S b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libswresample/arm/resample.S
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libswresample/arm/resample.S
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libswresample/arm/resample.S
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libswresample/arm/resample_init.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libswresample/arm/resample_init.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libswresample/arm/resample_init.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libswresample/arm/resample_init.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libswresample/audioconvert.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libswresample/audioconvert.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libswresample/audioconvert.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libswresample/audioconvert.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libswresample/audioconvert.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libswresample/audioconvert.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libswresample/audioconvert.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libswresample/audioconvert.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libswresample/dither.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libswresample/dither.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libswresample/dither.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libswresample/dither.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libswresample/dither_template.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libswresample/dither_template.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libswresample/dither_template.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libswresample/dither_template.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libswresample/libswresample.v b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libswresample/libswresample.v
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libswresample/libswresample.v
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libswresample/libswresample.v
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libswresample/log2_tab.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libswresample/log2_tab.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libswresample/log2_tab.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libswresample/log2_tab.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libswresample/noise_shaping_data.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libswresample/noise_shaping_data.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libswresample/noise_shaping_data.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libswresample/noise_shaping_data.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libswresample/options.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libswresample/options.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libswresample/options.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libswresample/options.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libswresample/rematrix.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libswresample/rematrix.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libswresample/rematrix.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libswresample/rematrix.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libswresample/rematrix_template.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libswresample/rematrix_template.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libswresample/rematrix_template.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libswresample/rematrix_template.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libswresample/resample.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libswresample/resample.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libswresample/resample.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libswresample/resample.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libswresample/resample.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libswresample/resample.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libswresample/resample.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libswresample/resample.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libswresample/resample_dsp.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libswresample/resample_dsp.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libswresample/resample_dsp.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libswresample/resample_dsp.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libswresample/resample_template.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libswresample/resample_template.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libswresample/resample_template.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libswresample/resample_template.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libswresample/soxr_resample.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libswresample/soxr_resample.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libswresample/soxr_resample.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libswresample/soxr_resample.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libswresample/swresample.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libswresample/swresample.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libswresample/swresample.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libswresample/swresample.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libswresample/swresample.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libswresample/swresample.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libswresample/swresample.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libswresample/swresample.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libswresample/swresample_frame.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libswresample/swresample_frame.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libswresample/swresample_frame.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libswresample/swresample_frame.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libswresample/swresample_internal.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libswresample/swresample_internal.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libswresample/swresample_internal.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libswresample/swresample_internal.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libswresample/swresampleres.rc b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libswresample/swresampleres.rc
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libswresample/swresampleres.rc
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libswresample/swresampleres.rc
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libswresample/tests/swresample.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libswresample/tests/swresample.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libswresample/tests/swresample.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libswresample/tests/swresample.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libswresample/version.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libswresample/version.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libswresample/version.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libswresample/version.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libswresample/x86/Makefile b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libswresample/x86/Makefile
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libswresample/x86/Makefile
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libswresample/x86/Makefile
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libswresample/x86/audio_convert.asm b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libswresample/x86/audio_convert.asm
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libswresample/x86/audio_convert.asm
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libswresample/x86/audio_convert.asm
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libswresample/x86/audio_convert_init.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libswresample/x86/audio_convert_init.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libswresample/x86/audio_convert_init.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libswresample/x86/audio_convert_init.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libswresample/x86/rematrix.asm b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libswresample/x86/rematrix.asm
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libswresample/x86/rematrix.asm
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libswresample/x86/rematrix.asm
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libswresample/x86/rematrix_init.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libswresample/x86/rematrix_init.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libswresample/x86/rematrix_init.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libswresample/x86/rematrix_init.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libswresample/x86/resample.asm b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libswresample/x86/resample.asm
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libswresample/x86/resample.asm
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libswresample/x86/resample.asm
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libswresample/x86/resample_init.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libswresample/x86/resample_init.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libswresample/x86/resample_init.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libswresample/x86/resample_init.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libswresample/x86/w64xmmtest.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libswresample/x86/w64xmmtest.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libswresample/x86/w64xmmtest.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libswresample/x86/w64xmmtest.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libswscale/Makefile b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libswscale/Makefile
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libswscale/Makefile
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libswscale/Makefile
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libswscale/aarch64/Makefile b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libswscale/aarch64/Makefile
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libswscale/aarch64/Makefile
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libswscale/aarch64/Makefile
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libswscale/aarch64/hscale.S b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libswscale/aarch64/hscale.S
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libswscale/aarch64/hscale.S
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libswscale/aarch64/hscale.S
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libswscale/aarch64/output.S b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libswscale/aarch64/output.S
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libswscale/aarch64/output.S
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libswscale/aarch64/output.S
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libswscale/aarch64/swscale.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libswscale/aarch64/swscale.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libswscale/aarch64/swscale.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libswscale/aarch64/swscale.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libswscale/aarch64/swscale_unscaled.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libswscale/aarch64/swscale_unscaled.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libswscale/aarch64/swscale_unscaled.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libswscale/aarch64/swscale_unscaled.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libswscale/aarch64/yuv2rgb_neon.S b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libswscale/aarch64/yuv2rgb_neon.S
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libswscale/aarch64/yuv2rgb_neon.S
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libswscale/aarch64/yuv2rgb_neon.S
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libswscale/alphablend.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libswscale/alphablend.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libswscale/alphablend.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libswscale/alphablend.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libswscale/arm/Makefile b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libswscale/arm/Makefile
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libswscale/arm/Makefile
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libswscale/arm/Makefile
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libswscale/arm/hscale.S b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libswscale/arm/hscale.S
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libswscale/arm/hscale.S
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libswscale/arm/hscale.S
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libswscale/arm/output.S b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libswscale/arm/output.S
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libswscale/arm/output.S
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libswscale/arm/output.S
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libswscale/arm/rgb2yuv_neon_16.S b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libswscale/arm/rgb2yuv_neon_16.S
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libswscale/arm/rgb2yuv_neon_16.S
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libswscale/arm/rgb2yuv_neon_16.S
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libswscale/arm/rgb2yuv_neon_32.S b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libswscale/arm/rgb2yuv_neon_32.S
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libswscale/arm/rgb2yuv_neon_32.S
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libswscale/arm/rgb2yuv_neon_32.S
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libswscale/arm/rgb2yuv_neon_common.S b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libswscale/arm/rgb2yuv_neon_common.S
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libswscale/arm/rgb2yuv_neon_common.S
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libswscale/arm/rgb2yuv_neon_common.S
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libswscale/arm/swscale.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libswscale/arm/swscale.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libswscale/arm/swscale.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libswscale/arm/swscale.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libswscale/arm/swscale_unscaled.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libswscale/arm/swscale_unscaled.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libswscale/arm/swscale_unscaled.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libswscale/arm/swscale_unscaled.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libswscale/arm/yuv2rgb_neon.S b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libswscale/arm/yuv2rgb_neon.S
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libswscale/arm/yuv2rgb_neon.S
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libswscale/arm/yuv2rgb_neon.S
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libswscale/bayer_template.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libswscale/bayer_template.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libswscale/bayer_template.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libswscale/bayer_template.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libswscale/gamma.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libswscale/gamma.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libswscale/gamma.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libswscale/gamma.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libswscale/hscale.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libswscale/hscale.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libswscale/hscale.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libswscale/hscale.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libswscale/hscale_fast_bilinear.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libswscale/hscale_fast_bilinear.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libswscale/hscale_fast_bilinear.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libswscale/hscale_fast_bilinear.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libswscale/input.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libswscale/input.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libswscale/input.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libswscale/input.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libswscale/libswscale.v b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libswscale/libswscale.v
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libswscale/libswscale.v
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libswscale/libswscale.v
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libswscale/log2_tab.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libswscale/log2_tab.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libswscale/log2_tab.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libswscale/log2_tab.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libswscale/options.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libswscale/options.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libswscale/options.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libswscale/options.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libswscale/output.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libswscale/output.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libswscale/output.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libswscale/output.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libswscale/ppc/Makefile b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libswscale/ppc/Makefile
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libswscale/ppc/Makefile
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libswscale/ppc/Makefile
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libswscale/ppc/swscale_altivec.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libswscale/ppc/swscale_altivec.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libswscale/ppc/swscale_altivec.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libswscale/ppc/swscale_altivec.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libswscale/ppc/yuv2rgb_altivec.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libswscale/ppc/yuv2rgb_altivec.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libswscale/ppc/yuv2rgb_altivec.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libswscale/ppc/yuv2rgb_altivec.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libswscale/ppc/yuv2rgb_altivec.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libswscale/ppc/yuv2rgb_altivec.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libswscale/ppc/yuv2rgb_altivec.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libswscale/ppc/yuv2rgb_altivec.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libswscale/ppc/yuv2yuv_altivec.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libswscale/ppc/yuv2yuv_altivec.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libswscale/ppc/yuv2yuv_altivec.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libswscale/ppc/yuv2yuv_altivec.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libswscale/rgb2rgb.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libswscale/rgb2rgb.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libswscale/rgb2rgb.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libswscale/rgb2rgb.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libswscale/rgb2rgb.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libswscale/rgb2rgb.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libswscale/rgb2rgb.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libswscale/rgb2rgb.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libswscale/rgb2rgb_template.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libswscale/rgb2rgb_template.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libswscale/rgb2rgb_template.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libswscale/rgb2rgb_template.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libswscale/slice.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libswscale/slice.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libswscale/slice.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libswscale/slice.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libswscale/swscale.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libswscale/swscale.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libswscale/swscale.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libswscale/swscale.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libswscale/swscale.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libswscale/swscale.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libswscale/swscale.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libswscale/swscale.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libswscale/swscale_internal.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libswscale/swscale_internal.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libswscale/swscale_internal.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libswscale/swscale_internal.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libswscale/swscale_unscaled.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libswscale/swscale_unscaled.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libswscale/swscale_unscaled.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libswscale/swscale_unscaled.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libswscale/swscaleres.rc b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libswscale/swscaleres.rc
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libswscale/swscaleres.rc
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libswscale/swscaleres.rc
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libswscale/tests/colorspace.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libswscale/tests/colorspace.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libswscale/tests/colorspace.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libswscale/tests/colorspace.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libswscale/tests/pixdesc_query.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libswscale/tests/pixdesc_query.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libswscale/tests/pixdesc_query.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libswscale/tests/pixdesc_query.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libswscale/tests/swscale.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libswscale/tests/swscale.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libswscale/tests/swscale.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libswscale/tests/swscale.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libswscale/utils.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libswscale/utils.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libswscale/utils.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libswscale/utils.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libswscale/version.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libswscale/version.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libswscale/version.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libswscale/version.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libswscale/vscale.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libswscale/vscale.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libswscale/vscale.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libswscale/vscale.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libswscale/x86/Makefile b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libswscale/x86/Makefile
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libswscale/x86/Makefile
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libswscale/x86/Makefile
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libswscale/x86/hscale_fast_bilinear_simd.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libswscale/x86/hscale_fast_bilinear_simd.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libswscale/x86/hscale_fast_bilinear_simd.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libswscale/x86/hscale_fast_bilinear_simd.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libswscale/x86/input.asm b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libswscale/x86/input.asm
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libswscale/x86/input.asm
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libswscale/x86/input.asm
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libswscale/x86/output.asm b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libswscale/x86/output.asm
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libswscale/x86/output.asm
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libswscale/x86/output.asm
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libswscale/x86/rgb2rgb.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libswscale/x86/rgb2rgb.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libswscale/x86/rgb2rgb.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libswscale/x86/rgb2rgb.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libswscale/x86/rgb2rgb_template.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libswscale/x86/rgb2rgb_template.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libswscale/x86/rgb2rgb_template.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libswscale/x86/rgb2rgb_template.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libswscale/x86/rgb_2_rgb.asm b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libswscale/x86/rgb_2_rgb.asm
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libswscale/x86/rgb_2_rgb.asm
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libswscale/x86/rgb_2_rgb.asm
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libswscale/x86/scale.asm b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libswscale/x86/scale.asm
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libswscale/x86/scale.asm
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libswscale/x86/scale.asm
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libswscale/x86/swscale.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libswscale/x86/swscale.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libswscale/x86/swscale.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libswscale/x86/swscale.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libswscale/x86/swscale_template.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libswscale/x86/swscale_template.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libswscale/x86/swscale_template.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libswscale/x86/swscale_template.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libswscale/x86/w64xmmtest.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libswscale/x86/w64xmmtest.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libswscale/x86/w64xmmtest.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libswscale/x86/w64xmmtest.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libswscale/x86/yuv2rgb.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libswscale/x86/yuv2rgb.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libswscale/x86/yuv2rgb.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libswscale/x86/yuv2rgb.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libswscale/x86/yuv2rgb_template.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libswscale/x86/yuv2rgb_template.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libswscale/x86/yuv2rgb_template.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libswscale/x86/yuv2rgb_template.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libswscale/yuv2rgb.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libswscale/yuv2rgb.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/libswscale/yuv2rgb.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/libswscale/yuv2rgb.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/presets/libvpx-1080p.ffpreset b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/presets/libvpx-1080p.ffpreset
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/presets/libvpx-1080p.ffpreset
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/presets/libvpx-1080p.ffpreset
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/presets/libvpx-1080p50_60.ffpreset b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/presets/libvpx-1080p50_60.ffpreset
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/presets/libvpx-1080p50_60.ffpreset
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/presets/libvpx-1080p50_60.ffpreset
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/presets/libvpx-360p.ffpreset b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/presets/libvpx-360p.ffpreset
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/presets/libvpx-360p.ffpreset
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/presets/libvpx-360p.ffpreset
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/presets/libvpx-720p.ffpreset b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/presets/libvpx-720p.ffpreset
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/presets/libvpx-720p.ffpreset
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/presets/libvpx-720p.ffpreset
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/presets/libvpx-720p50_60.ffpreset b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/presets/libvpx-720p50_60.ffpreset
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/presets/libvpx-720p50_60.ffpreset
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/presets/libvpx-720p50_60.ffpreset
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/Makefile b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/Makefile
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/Makefile
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/Makefile
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/api/Makefile b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/api/Makefile
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/api/Makefile
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/api/Makefile
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/api/api-band-test.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/api/api-band-test.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/api/api-band-test.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/api/api-band-test.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/api/api-codec-param-test.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/api/api-codec-param-test.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/api/api-codec-param-test.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/api/api-codec-param-test.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/api/api-flac-test.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/api/api-flac-test.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/api/api-flac-test.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/api/api-flac-test.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/api/api-h264-slice-test.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/api/api-h264-slice-test.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/api/api-h264-slice-test.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/api/api-h264-slice-test.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/api/api-h264-test.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/api/api-h264-test.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/api/api-h264-test.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/api/api-h264-test.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/api/api-seek-test.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/api/api-seek-test.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/api/api-seek-test.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/api/api-seek-test.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/api/api-threadmessage-test.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/api/api-threadmessage-test.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/api/api-threadmessage-test.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/api/api-threadmessage-test.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/audiogen.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/audiogen.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/audiogen.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/audiogen.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/audiomatch.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/audiomatch.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/audiomatch.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/audiomatch.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/base64.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/base64.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/base64.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/base64.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/checkasm/Makefile b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/checkasm/Makefile
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/checkasm/Makefile
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/checkasm/Makefile
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/checkasm/aacpsdsp.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/checkasm/aacpsdsp.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/checkasm/aacpsdsp.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/checkasm/aacpsdsp.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/checkasm/aarch64/checkasm.S b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/checkasm/aarch64/checkasm.S
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/checkasm/aarch64/checkasm.S
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/checkasm/aarch64/checkasm.S
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/checkasm/alacdsp.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/checkasm/alacdsp.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/checkasm/alacdsp.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/checkasm/alacdsp.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/checkasm/arm/checkasm.S b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/checkasm/arm/checkasm.S
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/checkasm/arm/checkasm.S
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/checkasm/arm/checkasm.S
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/checkasm/audiodsp.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/checkasm/audiodsp.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/checkasm/audiodsp.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/checkasm/audiodsp.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/checkasm/blockdsp.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/checkasm/blockdsp.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/checkasm/blockdsp.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/checkasm/blockdsp.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/checkasm/bswapdsp.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/checkasm/bswapdsp.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/checkasm/bswapdsp.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/checkasm/bswapdsp.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/checkasm/checkasm.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/checkasm/checkasm.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/checkasm/checkasm.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/checkasm/checkasm.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/checkasm/checkasm.h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/checkasm/checkasm.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/checkasm/checkasm.h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/checkasm/checkasm.h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/checkasm/exrdsp.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/checkasm/exrdsp.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/checkasm/exrdsp.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/checkasm/exrdsp.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/checkasm/fixed_dsp.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/checkasm/fixed_dsp.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/checkasm/fixed_dsp.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/checkasm/fixed_dsp.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/checkasm/flacdsp.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/checkasm/flacdsp.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/checkasm/flacdsp.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/checkasm/flacdsp.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/checkasm/float_dsp.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/checkasm/float_dsp.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/checkasm/float_dsp.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/checkasm/float_dsp.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/checkasm/fmtconvert.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/checkasm/fmtconvert.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/checkasm/fmtconvert.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/checkasm/fmtconvert.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/checkasm/g722dsp.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/checkasm/g722dsp.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/checkasm/g722dsp.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/checkasm/g722dsp.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/checkasm/h264dsp.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/checkasm/h264dsp.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/checkasm/h264dsp.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/checkasm/h264dsp.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/checkasm/h264pred.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/checkasm/h264pred.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/checkasm/h264pred.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/checkasm/h264pred.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/checkasm/h264qpel.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/checkasm/h264qpel.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/checkasm/h264qpel.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/checkasm/h264qpel.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/checkasm/hevc_add_res.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/checkasm/hevc_add_res.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/checkasm/hevc_add_res.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/checkasm/hevc_add_res.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/checkasm/hevc_idct.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/checkasm/hevc_idct.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/checkasm/hevc_idct.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/checkasm/hevc_idct.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/checkasm/hevc_sao.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/checkasm/hevc_sao.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/checkasm/hevc_sao.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/checkasm/hevc_sao.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/checkasm/huffyuvdsp.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/checkasm/huffyuvdsp.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/checkasm/huffyuvdsp.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/checkasm/huffyuvdsp.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/checkasm/jpeg2000dsp.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/checkasm/jpeg2000dsp.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/checkasm/jpeg2000dsp.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/checkasm/jpeg2000dsp.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/checkasm/llviddsp.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/checkasm/llviddsp.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/checkasm/llviddsp.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/checkasm/llviddsp.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/checkasm/llviddspenc.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/checkasm/llviddspenc.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/checkasm/llviddspenc.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/checkasm/llviddspenc.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/checkasm/pixblockdsp.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/checkasm/pixblockdsp.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/checkasm/pixblockdsp.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/checkasm/pixblockdsp.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/checkasm/sbrdsp.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/checkasm/sbrdsp.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/checkasm/sbrdsp.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/checkasm/sbrdsp.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/checkasm/sw_rgb.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/checkasm/sw_rgb.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/checkasm/sw_rgb.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/checkasm/sw_rgb.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/checkasm/synth_filter.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/checkasm/synth_filter.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/checkasm/synth_filter.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/checkasm/synth_filter.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/checkasm/utvideodsp.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/checkasm/utvideodsp.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/checkasm/utvideodsp.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/checkasm/utvideodsp.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/checkasm/v210enc.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/checkasm/v210enc.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/checkasm/v210enc.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/checkasm/v210enc.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/checkasm/vf_blend.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/checkasm/vf_blend.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/checkasm/vf_blend.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/checkasm/vf_blend.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/checkasm/vf_colorspace.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/checkasm/vf_colorspace.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/checkasm/vf_colorspace.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/checkasm/vf_colorspace.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/checkasm/vf_hflip.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/checkasm/vf_hflip.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/checkasm/vf_hflip.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/checkasm/vf_hflip.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/checkasm/vf_nlmeans.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/checkasm/vf_nlmeans.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/checkasm/vf_nlmeans.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/checkasm/vf_nlmeans.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/checkasm/vf_threshold.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/checkasm/vf_threshold.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/checkasm/vf_threshold.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/checkasm/vf_threshold.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/checkasm/videodsp.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/checkasm/videodsp.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/checkasm/videodsp.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/checkasm/videodsp.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/checkasm/vp8dsp.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/checkasm/vp8dsp.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/checkasm/vp8dsp.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/checkasm/vp8dsp.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/checkasm/vp9dsp.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/checkasm/vp9dsp.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/checkasm/vp9dsp.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/checkasm/vp9dsp.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/checkasm/x86/checkasm.asm b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/checkasm/x86/checkasm.asm
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/checkasm/x86/checkasm.asm
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/checkasm/x86/checkasm.asm
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/copycooker.sh b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/copycooker.sh
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/copycooker.sh
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/copycooker.sh
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/extended.ffconcat b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/extended.ffconcat
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/extended.ffconcat
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/extended.ffconcat
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/fate-run.sh b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/fate-run.sh
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/fate-run.sh
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/fate-run.sh
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/fate-valgrind.supp b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/fate-valgrind.supp
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/fate-valgrind.supp
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/fate-valgrind.supp
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/fate.sh b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/fate.sh
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/fate.sh
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/fate.sh
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/fate/aac.mak b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/fate/aac.mak
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/fate/aac.mak
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/fate/aac.mak
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/fate/ac3.mak b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/fate/ac3.mak
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/fate/ac3.mak
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/fate/ac3.mak
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/fate/acodec.mak b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/fate/acodec.mak
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/fate/acodec.mak
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/fate/acodec.mak
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/fate/adpcm.mak b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/fate/adpcm.mak
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/fate/adpcm.mak
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/fate/adpcm.mak
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/fate/alac.mak b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/fate/alac.mak
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/fate/alac.mak
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/fate/alac.mak
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/fate/als.mak b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/fate/als.mak
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/fate/als.mak
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/fate/als.mak
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/fate/amrnb.mak b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/fate/amrnb.mak
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/fate/amrnb.mak
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/fate/amrnb.mak
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/fate/amrwb.mak b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/fate/amrwb.mak
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/fate/amrwb.mak
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/fate/amrwb.mak
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/fate/api.mak b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/fate/api.mak
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/fate/api.mak
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/fate/api.mak
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/fate/apng.mak b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/fate/apng.mak
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/fate/apng.mak
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/fate/apng.mak
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/fate/atrac.mak b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/fate/atrac.mak
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/fate/atrac.mak
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/fate/atrac.mak
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/fate/audio.mak b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/fate/audio.mak
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/fate/audio.mak
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/fate/audio.mak
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/fate/avformat.mak b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/fate/avformat.mak
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/fate/avformat.mak
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/fate/avformat.mak
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/fate/bmp.mak b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/fate/bmp.mak
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/fate/bmp.mak
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/fate/bmp.mak
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/fate/build.mak b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/fate/build.mak
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/fate/build.mak
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/fate/build.mak
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/fate/canopus.mak b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/fate/canopus.mak
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/fate/canopus.mak
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/fate/canopus.mak
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/fate/cbs.mak b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/fate/cbs.mak
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/fate/cbs.mak
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/fate/cbs.mak
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/fate/cdxl.mak b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/fate/cdxl.mak
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/fate/cdxl.mak
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/fate/cdxl.mak
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/fate/checkasm.mak b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/fate/checkasm.mak
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/fate/checkasm.mak
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/fate/checkasm.mak
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/fate/concatdec.mak b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/fate/concatdec.mak
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/fate/concatdec.mak
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/fate/concatdec.mak
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/fate/cover-art.mak b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/fate/cover-art.mak
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/fate/cover-art.mak
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/fate/cover-art.mak
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/fate/dca.mak b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/fate/dca.mak
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/fate/dca.mak
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/fate/dca.mak
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/fate/demux.mak b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/fate/demux.mak
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/fate/demux.mak
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/fate/demux.mak
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/fate/dfa.mak b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/fate/dfa.mak
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/fate/dfa.mak
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/fate/dfa.mak
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/fate/dnxhd.mak b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/fate/dnxhd.mak
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/fate/dnxhd.mak
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/fate/dnxhd.mak
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/fate/dpcm.mak b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/fate/dpcm.mak
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/fate/dpcm.mak
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/fate/dpcm.mak
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/fate/ea.mak b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/fate/ea.mak
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/fate/ea.mak
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/fate/ea.mak
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/fate/exif.mak b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/fate/exif.mak
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/fate/exif.mak
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/fate/exif.mak
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/fate/ffmpeg.mak b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/fate/ffmpeg.mak
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/fate/ffmpeg.mak
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/fate/ffmpeg.mak
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/fate/ffprobe.mak b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/fate/ffprobe.mak
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/fate/ffprobe.mak
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/fate/ffprobe.mak
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/fate/fft.mak b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/fate/fft.mak
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/fate/fft.mak
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/fate/fft.mak
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/fate/fifo-muxer.mak b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/fate/fifo-muxer.mak
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/fate/fifo-muxer.mak
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/fate/fifo-muxer.mak
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/fate/filter-audio.mak b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/fate/filter-audio.mak
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/fate/filter-audio.mak
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/fate/filter-audio.mak
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/fate/filter-video.mak b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/fate/filter-video.mak
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/fate/filter-video.mak
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/fate/filter-video.mak
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/fate/fits.mak b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/fate/fits.mak
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/fate/fits.mak
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/fate/fits.mak
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/fate/flac.mak b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/fate/flac.mak
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/fate/flac.mak
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/fate/flac.mak
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/fate/flvenc.mak b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/fate/flvenc.mak
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/fate/flvenc.mak
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/fate/flvenc.mak
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/fate/gapless.mak b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/fate/gapless.mak
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/fate/gapless.mak
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/fate/gapless.mak
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/fate/gif.mak b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/fate/gif.mak
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/fate/gif.mak
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/fate/gif.mak
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/fate/h264.mak b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/fate/h264.mak
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/fate/h264.mak
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/fate/h264.mak
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/fate/hap.mak b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/fate/hap.mak
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/fate/hap.mak
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/fate/hap.mak
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/fate/hevc.mak b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/fate/hevc.mak
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/fate/hevc.mak
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/fate/hevc.mak
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/fate/hw.mak b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/fate/hw.mak
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/fate/hw.mak
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/fate/hw.mak
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/fate/id3v2.mak b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/fate/id3v2.mak
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/fate/id3v2.mak
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/fate/id3v2.mak
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/fate/image.mak b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/fate/image.mak
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/fate/image.mak
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/fate/image.mak
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/fate/indeo.mak b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/fate/indeo.mak
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/fate/indeo.mak
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/fate/indeo.mak
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/fate/libavcodec.mak b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/fate/libavcodec.mak
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/fate/libavcodec.mak
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/fate/libavcodec.mak
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/fate/libavdevice.mak b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/fate/libavdevice.mak
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/fate/libavdevice.mak
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/fate/libavdevice.mak
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/fate/libavformat.mak b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/fate/libavformat.mak
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/fate/libavformat.mak
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/fate/libavformat.mak
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/fate/libavresample.mak b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/fate/libavresample.mak
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/fate/libavresample.mak
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/fate/libavresample.mak
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/fate/libavutil.mak b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/fate/libavutil.mak
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/fate/libavutil.mak
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/fate/libavutil.mak
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/fate/libswresample.mak b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/fate/libswresample.mak
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/fate/libswresample.mak
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/fate/libswresample.mak
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/fate/libswscale.mak b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/fate/libswscale.mak
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/fate/libswscale.mak
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/fate/libswscale.mak
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/fate/lossless-audio.mak b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/fate/lossless-audio.mak
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/fate/lossless-audio.mak
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/fate/lossless-audio.mak
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/fate/lossless-video.mak b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/fate/lossless-video.mak
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/fate/lossless-video.mak
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/fate/lossless-video.mak
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/fate/matroska.mak b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/fate/matroska.mak
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/fate/matroska.mak
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/fate/matroska.mak
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/fate/microsoft.mak b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/fate/microsoft.mak
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/fate/microsoft.mak
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/fate/microsoft.mak
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/fate/monkeysaudio.mak b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/fate/monkeysaudio.mak
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/fate/monkeysaudio.mak
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/fate/monkeysaudio.mak
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/fate/mov.mak b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/fate/mov.mak
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/fate/mov.mak
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/fate/mov.mak
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/fate/mp3.mak b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/fate/mp3.mak
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/fate/mp3.mak
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/fate/mp3.mak
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/fate/mpc.mak b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/fate/mpc.mak
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/fate/mpc.mak
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/fate/mpc.mak
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/fate/mpeg4.mak b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/fate/mpeg4.mak
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/fate/mpeg4.mak
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/fate/mpeg4.mak
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/fate/mpegps.mak b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/fate/mpegps.mak
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/fate/mpegps.mak
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/fate/mpegps.mak
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/fate/mpegts.mak b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/fate/mpegts.mak
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/fate/mpegts.mak
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/fate/mpegts.mak
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/fate/mxf.mak b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/fate/mxf.mak
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/fate/mxf.mak
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/fate/mxf.mak
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/fate/opus.mak b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/fate/opus.mak
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/fate/opus.mak
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/fate/opus.mak
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/fate/pcm.mak b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/fate/pcm.mak
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/fate/pcm.mak
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/fate/pcm.mak
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/fate/pixlet.mak b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/fate/pixlet.mak
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/fate/pixlet.mak
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/fate/pixlet.mak
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/fate/probe.mak b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/fate/probe.mak
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/fate/probe.mak
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/fate/probe.mak
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/fate/prores.mak b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/fate/prores.mak
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/fate/prores.mak
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/fate/prores.mak
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/fate/qt.mak b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/fate/qt.mak
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/fate/qt.mak
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/fate/qt.mak
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/fate/qtrle.mak b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/fate/qtrle.mak
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/fate/qtrle.mak
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/fate/qtrle.mak
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/fate/real.mak b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/fate/real.mak
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/fate/real.mak
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/fate/real.mak
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/fate/screen.mak b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/fate/screen.mak
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/fate/screen.mak
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/fate/screen.mak
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/fate/seek.mak b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/fate/seek.mak
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/fate/seek.mak
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/fate/seek.mak
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/fate/source-check.sh b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/fate/source-check.sh
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/fate/source-check.sh
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/fate/source-check.sh
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/fate/source.mak b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/fate/source.mak
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/fate/source.mak
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/fate/source.mak
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/fate/speedhq.mak b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/fate/speedhq.mak
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/fate/speedhq.mak
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/fate/speedhq.mak
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/fate/subtitles.mak b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/fate/subtitles.mak
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/fate/subtitles.mak
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/fate/subtitles.mak
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/fate/utvideo.mak b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/fate/utvideo.mak
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/fate/utvideo.mak
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/fate/utvideo.mak
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/fate/vcodec.mak b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/fate/vcodec.mak
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/fate/vcodec.mak
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/fate/vcodec.mak
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/fate/video.mak b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/fate/video.mak
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/fate/video.mak
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/fate/video.mak
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/fate/voice.mak b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/fate/voice.mak
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/fate/voice.mak
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/fate/voice.mak
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/fate/vorbis.mak b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/fate/vorbis.mak
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/fate/vorbis.mak
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/fate/vorbis.mak
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/fate/vpx.mak b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/fate/vpx.mak
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/fate/vpx.mak
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/fate/vpx.mak
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/fate/vqf.mak b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/fate/vqf.mak
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/fate/vqf.mak
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/fate/vqf.mak
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/fate/wavpack.mak b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/fate/wavpack.mak
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/fate/wavpack.mak
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/fate/wavpack.mak
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/fate/wma.mak b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/fate/wma.mak
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/fate/wma.mak
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/fate/wma.mak
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/fate/xvid.mak b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/fate/xvid.mak
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/fate/xvid.mak
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/fate/xvid.mak
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/filtergraphs/alphamerge_alphaextract_rgb b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/filtergraphs/alphamerge_alphaextract_rgb
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/filtergraphs/alphamerge_alphaextract_rgb
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/filtergraphs/alphamerge_alphaextract_rgb
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/filtergraphs/alphamerge_alphaextract_yuv b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/filtergraphs/alphamerge_alphaextract_yuv
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/filtergraphs/alphamerge_alphaextract_yuv
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/filtergraphs/alphamerge_alphaextract_yuv
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/filtergraphs/anequalizer b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/filtergraphs/anequalizer
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/filtergraphs/anequalizer
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/filtergraphs/anequalizer
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/filtergraphs/channelmap_one_int b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/filtergraphs/channelmap_one_int
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/filtergraphs/channelmap_one_int
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/filtergraphs/channelmap_one_int
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/filtergraphs/channelmap_one_str b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/filtergraphs/channelmap_one_str
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/filtergraphs/channelmap_one_str
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/filtergraphs/channelmap_one_str
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/filtergraphs/colorkey b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/filtergraphs/colorkey
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/filtergraphs/colorkey
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/filtergraphs/colorkey
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/filtergraphs/compand b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/filtergraphs/compand
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/filtergraphs/compand
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/filtergraphs/compand
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/filtergraphs/concat b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/filtergraphs/concat
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/filtergraphs/concat
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/filtergraphs/concat
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/filtergraphs/firequalizer b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/filtergraphs/firequalizer
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/filtergraphs/firequalizer
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/filtergraphs/firequalizer
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/filtergraphs/gradfun b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/filtergraphs/gradfun
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/filtergraphs/gradfun
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/filtergraphs/gradfun
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/filtergraphs/hqdn3d b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/filtergraphs/hqdn3d
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/filtergraphs/hqdn3d
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/filtergraphs/hqdn3d
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/filtergraphs/hstack b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/filtergraphs/hstack
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/filtergraphs/hstack
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/filtergraphs/hstack
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/filtergraphs/lavr_mix_output_zero b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/filtergraphs/lavr_mix_output_zero
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/filtergraphs/lavr_mix_output_zero
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/filtergraphs/lavr_mix_output_zero
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/filtergraphs/mergeplanes b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/filtergraphs/mergeplanes
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/filtergraphs/mergeplanes
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/filtergraphs/mergeplanes
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/filtergraphs/overlay b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/filtergraphs/overlay
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/filtergraphs/overlay
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/filtergraphs/overlay
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/filtergraphs/overlay-dvdsub-2397 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/filtergraphs/overlay-dvdsub-2397
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/filtergraphs/overlay-dvdsub-2397
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/filtergraphs/overlay-dvdsub-2397
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/filtergraphs/overlay_nv12 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/filtergraphs/overlay_nv12
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/filtergraphs/overlay_nv12
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/filtergraphs/overlay_nv12
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/filtergraphs/overlay_nv21 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/filtergraphs/overlay_nv21
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/filtergraphs/overlay_nv21
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/filtergraphs/overlay_nv21
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/filtergraphs/overlay_rgb b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/filtergraphs/overlay_rgb
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/filtergraphs/overlay_rgb
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/filtergraphs/overlay_rgb
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/filtergraphs/overlay_yuv420 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/filtergraphs/overlay_yuv420
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/filtergraphs/overlay_yuv420
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/filtergraphs/overlay_yuv420
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/filtergraphs/overlay_yuv422 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/filtergraphs/overlay_yuv422
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/filtergraphs/overlay_yuv422
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/filtergraphs/overlay_yuv422
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/filtergraphs/overlay_yuv444 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/filtergraphs/overlay_yuv444
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/filtergraphs/overlay_yuv444
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/filtergraphs/overlay_yuv444
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/filtergraphs/scale2ref_keep_aspect b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/filtergraphs/scale2ref_keep_aspect
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/filtergraphs/scale2ref_keep_aspect
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/filtergraphs/scale2ref_keep_aspect
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/filtergraphs/scalenorm b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/filtergraphs/scalenorm
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/filtergraphs/scalenorm
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/filtergraphs/scalenorm
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/filtergraphs/select-alternate b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/filtergraphs/select-alternate
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/filtergraphs/select-alternate
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/filtergraphs/select-alternate
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/filtergraphs/setpts b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/filtergraphs/setpts
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/filtergraphs/setpts
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/filtergraphs/setpts
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/filtergraphs/vstack b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/filtergraphs/vstack
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/filtergraphs/vstack
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/filtergraphs/vstack
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/lavf-regression.sh b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/lavf-regression.sh
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/lavf-regression.sh
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/lavf-regression.sh
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/md5.sh b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/md5.sh
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/md5.sh
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/md5.sh
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/acodec/adpcm-adx b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/acodec/adpcm-adx
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/acodec/adpcm-adx
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/acodec/adpcm-adx
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/acodec/adpcm-adx-trellis b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/acodec/adpcm-adx-trellis
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/acodec/adpcm-adx-trellis
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/acodec/adpcm-adx-trellis
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/acodec/adpcm-ima_qt b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/acodec/adpcm-ima_qt
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/acodec/adpcm-ima_qt
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/acodec/adpcm-ima_qt
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/acodec/adpcm-ima_qt-trellis b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/acodec/adpcm-ima_qt-trellis
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/acodec/adpcm-ima_qt-trellis
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/acodec/adpcm-ima_qt-trellis
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/acodec/adpcm-ima_wav b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/acodec/adpcm-ima_wav
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/acodec/adpcm-ima_wav
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/acodec/adpcm-ima_wav
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/acodec/adpcm-ima_wav-trellis b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/acodec/adpcm-ima_wav-trellis
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/acodec/adpcm-ima_wav-trellis
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/acodec/adpcm-ima_wav-trellis
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/acodec/adpcm-ms b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/acodec/adpcm-ms
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/acodec/adpcm-ms
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/acodec/adpcm-ms
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/acodec/adpcm-ms-trellis b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/acodec/adpcm-ms-trellis
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/acodec/adpcm-ms-trellis
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/acodec/adpcm-ms-trellis
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/acodec/adpcm-swf b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/acodec/adpcm-swf
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/acodec/adpcm-swf
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/acodec/adpcm-swf
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/acodec/adpcm-swf-trellis b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/acodec/adpcm-swf-trellis
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/acodec/adpcm-swf-trellis
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/acodec/adpcm-swf-trellis
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/acodec/adpcm-yamaha b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/acodec/adpcm-yamaha
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/acodec/adpcm-yamaha
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/acodec/adpcm-yamaha
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/acodec/adpcm-yamaha-trellis b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/acodec/adpcm-yamaha-trellis
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/acodec/adpcm-yamaha-trellis
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/acodec/adpcm-yamaha-trellis
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/acodec/adpcm_ima_qt b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/acodec/adpcm_ima_qt
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/acodec/adpcm_ima_qt
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/acodec/adpcm_ima_qt
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/acodec/alac b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/acodec/alac
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/acodec/alac
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/acodec/alac
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/acodec/flac b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/acodec/flac
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/acodec/flac
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/acodec/flac
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/acodec/flac-exact-rice b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/acodec/flac-exact-rice
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/acodec/flac-exact-rice
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/acodec/flac-exact-rice
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/acodec/g723_1 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/acodec/g723_1
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/acodec/g723_1
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/acodec/g723_1
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/acodec/mp2 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/acodec/mp2
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/acodec/mp2
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/acodec/mp2
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/acodec/mp2fixed b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/acodec/mp2fixed
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/acodec/mp2fixed
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/acodec/mp2fixed
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/acodec/pcm-alaw b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/acodec/pcm-alaw
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/acodec/pcm-alaw
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/acodec/pcm-alaw
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/acodec/pcm-f32be b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/acodec/pcm-f32be
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/acodec/pcm-f32be
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/acodec/pcm-f32be
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/acodec/pcm-f32le b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/acodec/pcm-f32le
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/acodec/pcm-f32le
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/acodec/pcm-f32le
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/acodec/pcm-f64be b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/acodec/pcm-f64be
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/acodec/pcm-f64be
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/acodec/pcm-f64be
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/acodec/pcm-f64le b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/acodec/pcm-f64le
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/acodec/pcm-f64le
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/acodec/pcm-f64le
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/acodec/pcm-mulaw b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/acodec/pcm-mulaw
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/acodec/pcm-mulaw
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/acodec/pcm-mulaw
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/acodec/pcm-s16be b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/acodec/pcm-s16be
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/acodec/pcm-s16be
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/acodec/pcm-s16be
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/acodec/pcm-s16be_planar b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/acodec/pcm-s16be_planar
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/acodec/pcm-s16be_planar
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/acodec/pcm-s16be_planar
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/acodec/pcm-s16le b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/acodec/pcm-s16le
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/acodec/pcm-s16le
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/acodec/pcm-s16le
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/acodec/pcm-s16le_planar b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/acodec/pcm-s16le_planar
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/acodec/pcm-s16le_planar
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/acodec/pcm-s16le_planar
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/acodec/pcm-s24be b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/acodec/pcm-s24be
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/acodec/pcm-s24be
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/acodec/pcm-s24be
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/acodec/pcm-s24le b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/acodec/pcm-s24le
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/acodec/pcm-s24le
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/acodec/pcm-s24le
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/acodec/pcm-s24le_planar b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/acodec/pcm-s24le_planar
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/acodec/pcm-s24le_planar
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/acodec/pcm-s24le_planar
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/acodec/pcm-s32be b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/acodec/pcm-s32be
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/acodec/pcm-s32be
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/acodec/pcm-s32be
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/acodec/pcm-s32le b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/acodec/pcm-s32le
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/acodec/pcm-s32le
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/acodec/pcm-s32le
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/acodec/pcm-s32le_planar b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/acodec/pcm-s32le_planar
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/acodec/pcm-s32le_planar
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/acodec/pcm-s32le_planar
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/acodec/pcm-s8 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/acodec/pcm-s8
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/acodec/pcm-s8
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/acodec/pcm-s8
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/acodec/pcm-s8_planar b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/acodec/pcm-s8_planar
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/acodec/pcm-s8_planar
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/acodec/pcm-s8_planar
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/acodec/pcm-u16be b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/acodec/pcm-u16be
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/acodec/pcm-u16be
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/acodec/pcm-u16be
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/acodec/pcm-u16le b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/acodec/pcm-u16le
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/acodec/pcm-u16le
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/acodec/pcm-u16le
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/acodec/pcm-u24be b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/acodec/pcm-u24be
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/acodec/pcm-u24be
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/acodec/pcm-u24be
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/acodec/pcm-u24le b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/acodec/pcm-u24le
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/acodec/pcm-u24le
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/acodec/pcm-u24le
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/acodec/pcm-u32be b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/acodec/pcm-u32be
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/acodec/pcm-u32be
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/acodec/pcm-u32be
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/acodec/pcm-u32le b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/acodec/pcm-u32le
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/acodec/pcm-u32le
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/acodec/pcm-u32le
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/acodec/pcm-u8 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/acodec/pcm-u8
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/acodec/pcm-u8
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/acodec/pcm-u8
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/acodec/roqaudio b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/acodec/roqaudio
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/acodec/roqaudio
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/acodec/roqaudio
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/acodec/s302m b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/acodec/s302m
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/acodec/s302m
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/acodec/s302m
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/acodec/tta b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/acodec/tta
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/acodec/tta
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/acodec/tta
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/acodec/wavpack b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/acodec/wavpack
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/acodec/wavpack
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/acodec/wavpack
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/012v b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/012v
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/012v
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/012v
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/4xm-1 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/4xm-1
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/4xm-1
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/4xm-1
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/4xm-2 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/4xm-2
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/4xm-2
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/4xm-2
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/8bps b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/8bps
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/8bps
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/8bps
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/aac-autobsf-adtstoasc b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/aac-autobsf-adtstoasc
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/aac-autobsf-adtstoasc
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/aac-autobsf-adtstoasc
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/aasc b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/aasc
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/aasc
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/aasc
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/acodec-aref b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/acodec-aref
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/acodec-aref
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/acodec-aref
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/adpcm-4xm b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/adpcm-4xm
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/adpcm-4xm
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/adpcm-4xm
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/adpcm-afc b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/adpcm-afc
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/adpcm-afc
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/adpcm-afc
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/adpcm-creative b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/adpcm-creative
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/adpcm-creative
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/adpcm-creative
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/adpcm-creative-8-2.6bit b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/adpcm-creative-8-2.6bit
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/adpcm-creative-8-2.6bit
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/adpcm-creative-8-2.6bit
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/adpcm-creative-8-2bit b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/adpcm-creative-8-2bit
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/adpcm-creative-8-2bit
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/adpcm-creative-8-2bit
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/adpcm-creative-8-4bit b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/adpcm-creative-8-4bit
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/adpcm-creative-8-4bit
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/adpcm-creative-8-4bit
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/adpcm-dtk b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/adpcm-dtk
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/adpcm-dtk
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/adpcm-dtk
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/adpcm-ea-1 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/adpcm-ea-1
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/adpcm-ea-1
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/adpcm-ea-1
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/adpcm-ea-2 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/adpcm-ea-2
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/adpcm-ea-2
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/adpcm-ea-2
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/adpcm-ea-maxis-xa b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/adpcm-ea-maxis-xa
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/adpcm-ea-maxis-xa
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/adpcm-ea-maxis-xa
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/adpcm-ea-r1 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/adpcm-ea-r1
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/adpcm-ea-r1
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/adpcm-ea-r1
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/adpcm-ea-r2 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/adpcm-ea-r2
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/adpcm-ea-r2
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/adpcm-ea-r2
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/adpcm-ea-r3 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/adpcm-ea-r3
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/adpcm-ea-r3
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/adpcm-ea-r3
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/adpcm-ima-amv b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/adpcm-ima-amv
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/adpcm-ima-amv
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/adpcm-ima-amv
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/adpcm-ima-apc b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/adpcm-ima-apc
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/adpcm-ima-apc
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/adpcm-ima-apc
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/adpcm-ima-dk3 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/adpcm-ima-dk3
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/adpcm-ima-dk3
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/adpcm-ima-dk3
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/adpcm-ima-dk4 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/adpcm-ima-dk4
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/adpcm-ima-dk4
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/adpcm-ima-dk4
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/adpcm-ima-ea-eacs b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/adpcm-ima-ea-eacs
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/adpcm-ima-ea-eacs
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/adpcm-ima-ea-eacs
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/adpcm-ima-ea-sead b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/adpcm-ima-ea-sead
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/adpcm-ima-ea-sead
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/adpcm-ima-ea-sead
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/adpcm-ima-iss b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/adpcm-ima-iss
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/adpcm-ima-iss
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/adpcm-ima-iss
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/adpcm-ima-oki b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/adpcm-ima-oki
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/adpcm-ima-oki
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/adpcm-ima-oki
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/adpcm-ima-rad b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/adpcm-ima-rad
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/adpcm-ima-rad
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/adpcm-ima-rad
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/adpcm-ima-smjpeg b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/adpcm-ima-smjpeg
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/adpcm-ima-smjpeg
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/adpcm-ima-smjpeg
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/adpcm-ima-ws b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/adpcm-ima-ws
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/adpcm-ima-ws
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/adpcm-ima-ws
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/adpcm-ima_wav-stereo b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/adpcm-ima_wav-stereo
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/adpcm-ima_wav-stereo
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/adpcm-ima_wav-stereo
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/adpcm-ms-mono b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/adpcm-ms-mono
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/adpcm-ms-mono
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/adpcm-ms-mono
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/adpcm-thp b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/adpcm-thp
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/adpcm-thp
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/adpcm-thp
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/adpcm-vima b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/adpcm-vima
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/adpcm-vima
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/adpcm-vima
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/adpcm-xa b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/adpcm-xa
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/adpcm-xa
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/adpcm-xa
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/adpcm_ms-stereo b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/adpcm_ms-stereo
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/adpcm_ms-stereo
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/adpcm_ms-stereo
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/adts-demux b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/adts-demux
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/adts-demux
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/adts-demux
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/adts-id3v1-demux b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/adts-id3v1-demux
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/adts-id3v1-demux
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/adts-id3v1-demux
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/adts-id3v2-demux b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/adts-id3v2-demux
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/adts-id3v2-demux
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/adts-id3v2-demux
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/adts-id3v2-two-tags-demux b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/adts-id3v2-two-tags-demux
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/adts-id3v2-two-tags-demux
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/adts-id3v2-two-tags-demux
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/adtstoasc_ticket3715 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/adtstoasc_ticket3715
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/adtstoasc_ticket3715
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/adtstoasc_ticket3715
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/aea-demux b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/aea-demux
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/aea-demux
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/aea-demux
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/aic b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/aic
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/aic
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/aic
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/aic-oddsize b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/aic-oddsize
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/aic-oddsize
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/aic-oddsize
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/alg-mm b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/alg-mm
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/alg-mm
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/alg-mm
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/aliaspix-bgr b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/aliaspix-bgr
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/aliaspix-bgr
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/aliaspix-bgr
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/aliaspix-gray b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/aliaspix-gray
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/aliaspix-gray
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/aliaspix-gray
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/amv b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/amv
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/amv
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/amv
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/ansi b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/ansi
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/ansi
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/ansi
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/ansi256 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/ansi256
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/ansi256
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/ansi256
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/api-h264 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/api-h264
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/api-h264
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/api-h264
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/api-h264-slice b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/api-h264-slice
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/api-h264-slice
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/api-h264-slice
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/api-mjpeg-codec-param b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/api-mjpeg-codec-param
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/api-mjpeg-codec-param
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/api-mjpeg-codec-param
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/api-png-codec-param b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/api-png-codec-param
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/api-png-codec-param
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/api-png-codec-param
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/apng-clock b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/apng-clock
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/apng-clock
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/apng-clock
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/apng-osample b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/apng-osample
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/apng-osample
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/apng-osample
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/armovie-escape124 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/armovie-escape124
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/armovie-escape124
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/armovie-escape124
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/armovie-escape130 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/armovie-escape130
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/armovie-escape130
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/armovie-escape130
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/asf-repldata b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/asf-repldata
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/asf-repldata
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/asf-repldata
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/ast b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/ast
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/ast
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/ast
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/async b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/async
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/async
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/async
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/audio_fifo b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/audio_fifo
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/audio_fifo
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/audio_fifo
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/audiomatch-afconvert-16000-mono-he-adts b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/audiomatch-afconvert-16000-mono-he-adts
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/audiomatch-afconvert-16000-mono-he-adts
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/audiomatch-afconvert-16000-mono-he-adts
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/audiomatch-afconvert-16000-mono-he-m4a b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/audiomatch-afconvert-16000-mono-he-m4a
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/audiomatch-afconvert-16000-mono-he-m4a
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/audiomatch-afconvert-16000-mono-he-m4a
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/audiomatch-afconvert-16000-mono-lc-adts b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/audiomatch-afconvert-16000-mono-lc-adts
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/audiomatch-afconvert-16000-mono-lc-adts
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/audiomatch-afconvert-16000-mono-lc-adts
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/audiomatch-afconvert-16000-mono-lc-m4a b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/audiomatch-afconvert-16000-mono-lc-m4a
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/audiomatch-afconvert-16000-mono-lc-m4a
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/audiomatch-afconvert-16000-mono-lc-m4a
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/audiomatch-afconvert-16000-stereo-he-adts b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/audiomatch-afconvert-16000-stereo-he-adts
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/audiomatch-afconvert-16000-stereo-he-adts
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/audiomatch-afconvert-16000-stereo-he-adts
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/audiomatch-afconvert-16000-stereo-he-m4a b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/audiomatch-afconvert-16000-stereo-he-m4a
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/audiomatch-afconvert-16000-stereo-he-m4a
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/audiomatch-afconvert-16000-stereo-he-m4a
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/audiomatch-afconvert-16000-stereo-he2-adts b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/audiomatch-afconvert-16000-stereo-he2-adts
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/audiomatch-afconvert-16000-stereo-he2-adts
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/audiomatch-afconvert-16000-stereo-he2-adts
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/audiomatch-afconvert-16000-stereo-he2-m4a b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/audiomatch-afconvert-16000-stereo-he2-m4a
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/audiomatch-afconvert-16000-stereo-he2-m4a
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/audiomatch-afconvert-16000-stereo-he2-m4a
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/audiomatch-afconvert-16000-stereo-lc-adts b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/audiomatch-afconvert-16000-stereo-lc-adts
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/audiomatch-afconvert-16000-stereo-lc-adts
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/audiomatch-afconvert-16000-stereo-lc-adts
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/audiomatch-afconvert-16000-stereo-lc-m4a b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/audiomatch-afconvert-16000-stereo-lc-m4a
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/audiomatch-afconvert-16000-stereo-lc-m4a
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/audiomatch-afconvert-16000-stereo-lc-m4a
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/audiomatch-afconvert-44100-mono-he-adts b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/audiomatch-afconvert-44100-mono-he-adts
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/audiomatch-afconvert-44100-mono-he-adts
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/audiomatch-afconvert-44100-mono-he-adts
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/audiomatch-afconvert-44100-mono-he-m4a b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/audiomatch-afconvert-44100-mono-he-m4a
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/audiomatch-afconvert-44100-mono-he-m4a
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/audiomatch-afconvert-44100-mono-he-m4a
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/audiomatch-afconvert-44100-mono-lc-adts b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/audiomatch-afconvert-44100-mono-lc-adts
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/audiomatch-afconvert-44100-mono-lc-adts
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/audiomatch-afconvert-44100-mono-lc-adts
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/audiomatch-afconvert-44100-mono-lc-m4a b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/audiomatch-afconvert-44100-mono-lc-m4a
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/audiomatch-afconvert-44100-mono-lc-m4a
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/audiomatch-afconvert-44100-mono-lc-m4a
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/audiomatch-afconvert-44100-stereo-he-adts b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/audiomatch-afconvert-44100-stereo-he-adts
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/audiomatch-afconvert-44100-stereo-he-adts
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/audiomatch-afconvert-44100-stereo-he-adts
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/audiomatch-afconvert-44100-stereo-he-m4a b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/audiomatch-afconvert-44100-stereo-he-m4a
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/audiomatch-afconvert-44100-stereo-he-m4a
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/audiomatch-afconvert-44100-stereo-he-m4a
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/audiomatch-afconvert-44100-stereo-he2-adts b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/audiomatch-afconvert-44100-stereo-he2-adts
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/audiomatch-afconvert-44100-stereo-he2-adts
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/audiomatch-afconvert-44100-stereo-he2-adts
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/audiomatch-afconvert-44100-stereo-he2-m4a b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/audiomatch-afconvert-44100-stereo-he2-m4a
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/audiomatch-afconvert-44100-stereo-he2-m4a
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/audiomatch-afconvert-44100-stereo-he2-m4a
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/audiomatch-afconvert-44100-stereo-lc-adts b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/audiomatch-afconvert-44100-stereo-lc-adts
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/audiomatch-afconvert-44100-stereo-lc-adts
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/audiomatch-afconvert-44100-stereo-lc-adts
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/audiomatch-afconvert-44100-stereo-lc-m4a b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/audiomatch-afconvert-44100-stereo-lc-m4a
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/audiomatch-afconvert-44100-stereo-lc-m4a
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/audiomatch-afconvert-44100-stereo-lc-m4a
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/audiomatch-dolby-44100-mono-he-mp4 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/audiomatch-dolby-44100-mono-he-mp4
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/audiomatch-dolby-44100-mono-he-mp4
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/audiomatch-dolby-44100-mono-he-mp4
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/audiomatch-dolby-44100-mono-lc-mp4 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/audiomatch-dolby-44100-mono-lc-mp4
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/audiomatch-dolby-44100-mono-lc-mp4
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/audiomatch-dolby-44100-mono-lc-mp4
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/audiomatch-dolby-44100-stereo-he-mp4 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/audiomatch-dolby-44100-stereo-he-mp4
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/audiomatch-dolby-44100-stereo-he-mp4
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/audiomatch-dolby-44100-stereo-he-mp4
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/audiomatch-dolby-44100-stereo-he2-mp4 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/audiomatch-dolby-44100-stereo-he2-mp4
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/audiomatch-dolby-44100-stereo-he2-mp4
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/audiomatch-dolby-44100-stereo-he2-mp4
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/audiomatch-dolby-44100-stereo-lc-mp4 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/audiomatch-dolby-44100-stereo-lc-mp4
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/audiomatch-dolby-44100-stereo-lc-mp4
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/audiomatch-dolby-44100-stereo-lc-mp4
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/audiomatch-faac-16000-mono-lc-adts b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/audiomatch-faac-16000-mono-lc-adts
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/audiomatch-faac-16000-mono-lc-adts
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/audiomatch-faac-16000-mono-lc-adts
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/audiomatch-faac-16000-mono-lc-m4a b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/audiomatch-faac-16000-mono-lc-m4a
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/audiomatch-faac-16000-mono-lc-m4a
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/audiomatch-faac-16000-mono-lc-m4a
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/audiomatch-faac-16000-stereo-lc-adts b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/audiomatch-faac-16000-stereo-lc-adts
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/audiomatch-faac-16000-stereo-lc-adts
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/audiomatch-faac-16000-stereo-lc-adts
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/audiomatch-faac-16000-stereo-lc-m4a b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/audiomatch-faac-16000-stereo-lc-m4a
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/audiomatch-faac-16000-stereo-lc-m4a
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/audiomatch-faac-16000-stereo-lc-m4a
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/audiomatch-faac-44100-mono-lc-adts b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/audiomatch-faac-44100-mono-lc-adts
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/audiomatch-faac-44100-mono-lc-adts
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/audiomatch-faac-44100-mono-lc-adts
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/audiomatch-faac-44100-mono-lc-m4a b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/audiomatch-faac-44100-mono-lc-m4a
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/audiomatch-faac-44100-mono-lc-m4a
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/audiomatch-faac-44100-mono-lc-m4a
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/audiomatch-faac-44100-stereo-lc-adts b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/audiomatch-faac-44100-stereo-lc-adts
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/audiomatch-faac-44100-stereo-lc-adts
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/audiomatch-faac-44100-stereo-lc-adts
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/audiomatch-faac-44100-stereo-lc-m4a b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/audiomatch-faac-44100-stereo-lc-m4a
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/audiomatch-faac-44100-stereo-lc-m4a
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/audiomatch-faac-44100-stereo-lc-m4a
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/audiomatch-nero-16000-mono-he-m4a b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/audiomatch-nero-16000-mono-he-m4a
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/audiomatch-nero-16000-mono-he-m4a
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/audiomatch-nero-16000-mono-he-m4a
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/audiomatch-nero-16000-mono-lc-m4a b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/audiomatch-nero-16000-mono-lc-m4a
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/audiomatch-nero-16000-mono-lc-m4a
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/audiomatch-nero-16000-mono-lc-m4a
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/audiomatch-nero-16000-stereo-he-m4a b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/audiomatch-nero-16000-stereo-he-m4a
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/audiomatch-nero-16000-stereo-he-m4a
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/audiomatch-nero-16000-stereo-he-m4a
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/audiomatch-nero-16000-stereo-he2-m4a b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/audiomatch-nero-16000-stereo-he2-m4a
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/audiomatch-nero-16000-stereo-he2-m4a
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/audiomatch-nero-16000-stereo-he2-m4a
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/audiomatch-nero-16000-stereo-lc-m4a b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/audiomatch-nero-16000-stereo-lc-m4a
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/audiomatch-nero-16000-stereo-lc-m4a
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/audiomatch-nero-16000-stereo-lc-m4a
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/audiomatch-nero-44100-mono-he-m4a b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/audiomatch-nero-44100-mono-he-m4a
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/audiomatch-nero-44100-mono-he-m4a
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/audiomatch-nero-44100-mono-he-m4a
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/audiomatch-nero-44100-mono-lc-m4a b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/audiomatch-nero-44100-mono-lc-m4a
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/audiomatch-nero-44100-mono-lc-m4a
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/audiomatch-nero-44100-mono-lc-m4a
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/audiomatch-nero-44100-stereo-he-m4a b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/audiomatch-nero-44100-stereo-he-m4a
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/audiomatch-nero-44100-stereo-he-m4a
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/audiomatch-nero-44100-stereo-he-m4a
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/audiomatch-nero-44100-stereo-he2-m4a b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/audiomatch-nero-44100-stereo-he2-m4a
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/audiomatch-nero-44100-stereo-he2-m4a
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/audiomatch-nero-44100-stereo-he2-m4a
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/audiomatch-nero-44100-stereo-lc-m4a b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/audiomatch-nero-44100-stereo-lc-m4a
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/audiomatch-nero-44100-stereo-lc-m4a
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/audiomatch-nero-44100-stereo-lc-m4a
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/audiomatch-quicktime7-44100-stereo-lc-mp4 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/audiomatch-quicktime7-44100-stereo-lc-mp4
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/audiomatch-quicktime7-44100-stereo-lc-mp4
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/audiomatch-quicktime7-44100-stereo-lc-mp4
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/audiomatch-quicktimeX-44100-stereo-lc-m4a b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/audiomatch-quicktimeX-44100-stereo-lc-m4a
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/audiomatch-quicktimeX-44100-stereo-lc-m4a
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/audiomatch-quicktimeX-44100-stereo-lc-m4a
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/audiomatch-square-aac b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/audiomatch-square-aac
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/audiomatch-square-aac
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/audiomatch-square-aac
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/audiomatch-square-mp3 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/audiomatch-square-mp3
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/audiomatch-square-mp3
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/audiomatch-square-mp3
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/auravision-v1 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/auravision-v1
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/auravision-v1
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/auravision-v1
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/auravision-v2 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/auravision-v2
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/auravision-v2
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/auravision-v2
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/avio-direct b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/avio-direct
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/avio-direct
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/avio-direct
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/avstring b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/avstring
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/avstring
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/avstring
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/base64 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/base64
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/base64
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/base64
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/bcstm b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/bcstm
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/bcstm
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/bcstm
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/bethsoft-vid b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/bethsoft-vid
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/bethsoft-vid
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/bethsoft-vid
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/bfi b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/bfi
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/bfi
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/bfi
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/bfstm b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/bfstm
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/bfstm
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/bfstm
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/bink-demux b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/bink-demux
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/bink-demux
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/bink-demux
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/bink-video-b b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/bink-video-b
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/bink-video-b
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/bink-video-b
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/bink-video-f b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/bink-video-f
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/bink-video-f
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/bink-video-f
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/bink-video-i b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/bink-video-i
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/bink-video-i
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/bink-video-i
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/binsub-mksenc b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/binsub-mksenc
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/binsub-mksenc
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/binsub-mksenc
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/binsub-movtextenc b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/binsub-movtextenc
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/binsub-movtextenc
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/binsub-movtextenc
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/blowfish b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/blowfish
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/blowfish
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/blowfish
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/bmp-15bit b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/bmp-15bit
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/bmp-15bit
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/bmp-15bit
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/bmp-15bit-mask b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/bmp-15bit-mask
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/bmp-15bit-mask
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/bmp-15bit-mask
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/bmp-16bit-mask b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/bmp-16bit-mask
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/bmp-16bit-mask
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/bmp-16bit-mask
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/bmp-1bit b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/bmp-1bit
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/bmp-1bit
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/bmp-1bit
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/bmp-24bit b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/bmp-24bit
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/bmp-24bit
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/bmp-24bit
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/bmp-32bit b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/bmp-32bit
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/bmp-32bit
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/bmp-32bit
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/bmp-32bit-mask b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/bmp-32bit-mask
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/bmp-32bit-mask
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/bmp-32bit-mask
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/bmp-4bit b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/bmp-4bit
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/bmp-4bit
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/bmp-4bit
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/bmp-4bit-os2 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/bmp-4bit-os2
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/bmp-4bit-os2
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/bmp-4bit-os2
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/bmp-8bit b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/bmp-8bit
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/bmp-8bit
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/bmp-8bit
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/bmp-8bit-os2 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/bmp-8bit-os2
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/bmp-8bit-os2
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/bmp-8bit-os2
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/bmp-rle4 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/bmp-rle4
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/bmp-rle4
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/bmp-rle4
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/bmp-rle8 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/bmp-rle8
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/bmp-rle8
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/bmp-rle8
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/bmpparser b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/bmpparser
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/bmpparser
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/bmpparser
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/bmv-audio b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/bmv-audio
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/bmv-audio
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/bmv-audio
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/bmv-video b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/bmv-video
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/bmv-video
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/bmv-video
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/bprint b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/bprint
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/bprint
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/bprint
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/brenderpix-24 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/brenderpix-24
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/brenderpix-24
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/brenderpix-24
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/brenderpix-565 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/brenderpix-565
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/brenderpix-565
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/brenderpix-565
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/brenderpix-defpal b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/brenderpix-defpal
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/brenderpix-defpal
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/brenderpix-defpal
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/brenderpix-intpal b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/brenderpix-intpal
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/brenderpix-intpal
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/brenderpix-intpal
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/brenderpix-y400a b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/brenderpix-y400a
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/brenderpix-y400a
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/brenderpix-y400a
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/brstm b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/brstm
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/brstm
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/brstm
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/caf b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/caf
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/caf
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/caf
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/canopus-cllc-argb b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/canopus-cllc-argb
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/canopus-cllc-argb
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/canopus-cllc-argb
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/canopus-cllc-rgb b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/canopus-cllc-rgb
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/canopus-cllc-rgb
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/canopus-cllc-rgb
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/canopus-cllc-yuy2-noblock b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/canopus-cllc-yuy2-noblock
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/canopus-cllc-yuy2-noblock
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/canopus-cllc-yuy2-noblock
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/canopus-hq_hqa-hq b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/canopus-hq_hqa-hq
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/canopus-hq_hqa-hq
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/canopus-hq_hqa-hq
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/canopus-hq_hqa-hqa b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/canopus-hq_hqa-hqa
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/canopus-hq_hqa-hqa
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/canopus-hq_hqa-hqa
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/canopus-hq_hqa-inter b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/canopus-hq_hqa-inter
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/canopus-hq_hqa-inter
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/canopus-hq_hqa-inter
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/canopus-hqx422 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/canopus-hqx422
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/canopus-hqx422
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/canopus-hqx422
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/canopus-hqx422a b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/canopus-hqx422a
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/canopus-hqx422a
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/canopus-hqx422a
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/cavs b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/cavs
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/cavs
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/cavs
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/cbs-h264-AUD_MW_E b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/cbs-h264-AUD_MW_E
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/cbs-h264-AUD_MW_E
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/cbs-h264-AUD_MW_E
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/cbs-h264-BASQP1_Sony_C b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/cbs-h264-BASQP1_Sony_C
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/cbs-h264-BASQP1_Sony_C
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/cbs-h264-BASQP1_Sony_C
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/cbs-h264-CABACI3_Sony_B b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/cbs-h264-CABACI3_Sony_B
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/cbs-h264-CABACI3_Sony_B
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/cbs-h264-CABACI3_Sony_B
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/cbs-h264-CVBS3_Sony_C b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/cbs-h264-CVBS3_Sony_C
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/cbs-h264-CVBS3_Sony_C
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/cbs-h264-CVBS3_Sony_C
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/cbs-h264-CVFC1_Sony_C b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/cbs-h264-CVFC1_Sony_C
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/cbs-h264-CVFC1_Sony_C
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/cbs-h264-CVFC1_Sony_C
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/cbs-h264-CVMANL1_TOSHIBA_B b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/cbs-h264-CVMANL1_TOSHIBA_B
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/cbs-h264-CVMANL1_TOSHIBA_B
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/cbs-h264-CVMANL1_TOSHIBA_B
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/cbs-h264-CVNLFI1_Sony_C b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/cbs-h264-CVNLFI1_Sony_C
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/cbs-h264-CVNLFI1_Sony_C
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/cbs-h264-CVNLFI1_Sony_C
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/cbs-h264-CVSE2_Sony_B b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/cbs-h264-CVSE2_Sony_B
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/cbs-h264-CVSE2_Sony_B
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/cbs-h264-CVSE2_Sony_B
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/cbs-h264-CVWP1_TOSHIBA_E b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/cbs-h264-CVWP1_TOSHIBA_E
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/cbs-h264-CVWP1_TOSHIBA_E
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/cbs-h264-CVWP1_TOSHIBA_E
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/cbs-h264-FM1_BT_B b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/cbs-h264-FM1_BT_B
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/cbs-h264-FM1_BT_B
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/cbs-h264-FM1_BT_B
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/cbs-h264-MR1_BT_A b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/cbs-h264-MR1_BT_A
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/cbs-h264-MR1_BT_A
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/cbs-h264-MR1_BT_A
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/cbs-h264-SVA_Base_B b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/cbs-h264-SVA_Base_B
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/cbs-h264-SVA_Base_B
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/cbs-h264-SVA_Base_B
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/cbs-h264-Sharp_MP_PAFF_1r2 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/cbs-h264-Sharp_MP_PAFF_1r2
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/cbs-h264-Sharp_MP_PAFF_1r2
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/cbs-h264-Sharp_MP_PAFF_1r2
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/cbs-h264-sei-1 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/cbs-h264-sei-1
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/cbs-h264-sei-1
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/cbs-h264-sei-1
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/cbs-h264-sp1_bt_a b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/cbs-h264-sp1_bt_a
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/cbs-h264-sp1_bt_a
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/cbs-h264-sp1_bt_a
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/cbs-hevc-CAINIT_E_SHARP_3 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/cbs-hevc-CAINIT_E_SHARP_3
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/cbs-hevc-CAINIT_E_SHARP_3
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/cbs-hevc-CAINIT_E_SHARP_3
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/cbs-hevc-CAINIT_H_SHARP_3 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/cbs-hevc-CAINIT_H_SHARP_3
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/cbs-hevc-CAINIT_H_SHARP_3
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/cbs-hevc-CAINIT_H_SHARP_3
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/cbs-hevc-CONFWIN_A_Sony_1 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/cbs-hevc-CONFWIN_A_Sony_1
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/cbs-hevc-CONFWIN_A_Sony_1
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/cbs-hevc-CONFWIN_A_Sony_1
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/cbs-hevc-HRD_A_Fujitsu_2 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/cbs-hevc-HRD_A_Fujitsu_2
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/cbs-hevc-HRD_A_Fujitsu_2
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/cbs-hevc-HRD_A_Fujitsu_2
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/cbs-hevc-LTRPSPS_A_Qualcomm_1 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/cbs-hevc-LTRPSPS_A_Qualcomm_1
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/cbs-hevc-LTRPSPS_A_Qualcomm_1
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/cbs-hevc-LTRPSPS_A_Qualcomm_1
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/cbs-hevc-NUT_A_ericsson_5 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/cbs-hevc-NUT_A_ericsson_5
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/cbs-hevc-NUT_A_ericsson_5
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/cbs-hevc-NUT_A_ericsson_5
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/cbs-hevc-PICSIZE_A_Bossen_1 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/cbs-hevc-PICSIZE_A_Bossen_1
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/cbs-hevc-PICSIZE_A_Bossen_1
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/cbs-hevc-PICSIZE_A_Bossen_1
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/cbs-hevc-PICSIZE_B_Bossen_1 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/cbs-hevc-PICSIZE_B_Bossen_1
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/cbs-hevc-PICSIZE_B_Bossen_1
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/cbs-hevc-PICSIZE_B_Bossen_1
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/cbs-hevc-RPLM_A_qualcomm_4 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/cbs-hevc-RPLM_A_qualcomm_4
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/cbs-hevc-RPLM_A_qualcomm_4
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/cbs-hevc-RPLM_A_qualcomm_4
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/cbs-hevc-RPS_A_docomo_4 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/cbs-hevc-RPS_A_docomo_4
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/cbs-hevc-RPS_A_docomo_4
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/cbs-hevc-RPS_A_docomo_4
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/cbs-hevc-RPS_E_qualcomm_5 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/cbs-hevc-RPS_E_qualcomm_5
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/cbs-hevc-RPS_E_qualcomm_5
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/cbs-hevc-RPS_E_qualcomm_5
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/cbs-hevc-SLIST_A_Sony_4 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/cbs-hevc-SLIST_A_Sony_4
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/cbs-hevc-SLIST_A_Sony_4
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/cbs-hevc-SLIST_A_Sony_4
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/cbs-hevc-SLIST_D_Sony_9 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/cbs-hevc-SLIST_D_Sony_9
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/cbs-hevc-SLIST_D_Sony_9
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/cbs-hevc-SLIST_D_Sony_9
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/cbs-hevc-STRUCT_A_Samsung_5 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/cbs-hevc-STRUCT_A_Samsung_5
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/cbs-hevc-STRUCT_A_Samsung_5
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/cbs-hevc-STRUCT_A_Samsung_5
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/cbs-hevc-TILES_B_Cisco_1 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/cbs-hevc-TILES_B_Cisco_1
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/cbs-hevc-TILES_B_Cisco_1
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/cbs-hevc-TILES_B_Cisco_1
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/cbs-hevc-WPP_A_ericsson_MAIN_2 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/cbs-hevc-WPP_A_ericsson_MAIN_2
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/cbs-hevc-WPP_A_ericsson_MAIN_2
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/cbs-hevc-WPP_A_ericsson_MAIN_2
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/cbs-hevc-WPP_F_ericsson_MAIN_2 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/cbs-hevc-WPP_F_ericsson_MAIN_2
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/cbs-hevc-WPP_F_ericsson_MAIN_2
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/cbs-hevc-WPP_F_ericsson_MAIN_2
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/cbs-hevc-WP_A_Toshiba_3 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/cbs-hevc-WP_A_Toshiba_3
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/cbs-hevc-WP_A_Toshiba_3
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/cbs-hevc-WP_A_Toshiba_3
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/cbs-hevc-ipcm_E_NEC_2 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/cbs-hevc-ipcm_E_NEC_2
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/cbs-hevc-ipcm_E_NEC_2
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/cbs-hevc-ipcm_E_NEC_2
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/cbs-mpeg2-hhi_burst_422_short b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/cbs-mpeg2-hhi_burst_422_short
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/cbs-mpeg2-hhi_burst_422_short
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/cbs-mpeg2-hhi_burst_422_short
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/cbs-mpeg2-sony-ct3 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/cbs-mpeg2-sony-ct3
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/cbs-mpeg2-sony-ct3
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/cbs-mpeg2-sony-ct3
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/cbs-mpeg2-tcela-6 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/cbs-mpeg2-tcela-6
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/cbs-mpeg2-tcela-6
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/cbs-mpeg2-tcela-6
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/cbs-vp9-vp90-2-03-deltaq b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/cbs-vp9-vp90-2-03-deltaq
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/cbs-vp9-vp90-2-03-deltaq
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/cbs-vp9-vp90-2-03-deltaq
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/cbs-vp9-vp90-2-05-resize b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/cbs-vp9-vp90-2-05-resize
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/cbs-vp9-vp90-2-05-resize
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/cbs-vp9-vp90-2-05-resize
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/cbs-vp9-vp90-2-06-bilinear b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/cbs-vp9-vp90-2-06-bilinear
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/cbs-vp9-vp90-2-06-bilinear
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/cbs-vp9-vp90-2-06-bilinear
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/cbs-vp9-vp90-2-09-lf_deltas b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/cbs-vp9-vp90-2-09-lf_deltas
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/cbs-vp9-vp90-2-09-lf_deltas
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/cbs-vp9-vp90-2-09-lf_deltas
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/cbs-vp9-vp90-2-10-show-existing-frame b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/cbs-vp9-vp90-2-10-show-existing-frame
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/cbs-vp9-vp90-2-10-show-existing-frame
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/cbs-vp9-vp90-2-10-show-existing-frame
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/cbs-vp9-vp90-2-10-show-existing-frame2 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/cbs-vp9-vp90-2-10-show-existing-frame2
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/cbs-vp9-vp90-2-10-show-existing-frame2
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/cbs-vp9-vp90-2-10-show-existing-frame2
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/cbs-vp9-vp90-2-segmentation-aq-akiyo b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/cbs-vp9-vp90-2-segmentation-aq-akiyo
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/cbs-vp9-vp90-2-segmentation-aq-akiyo
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/cbs-vp9-vp90-2-segmentation-aq-akiyo
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/cbs-vp9-vp90-2-segmentation-sf-akiyo b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/cbs-vp9-vp90-2-segmentation-sf-akiyo
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/cbs-vp9-vp90-2-segmentation-sf-akiyo
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/cbs-vp9-vp90-2-segmentation-sf-akiyo
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/cbs-vp9-vp90-2-tiling-pedestrian b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/cbs-vp9-vp90-2-tiling-pedestrian
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/cbs-vp9-vp90-2-tiling-pedestrian
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/cbs-vp9-vp90-2-tiling-pedestrian
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/cbs-vp9-vp91-2-04-yuv440 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/cbs-vp9-vp91-2-04-yuv440
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/cbs-vp9-vp91-2-04-yuv440
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/cbs-vp9-vp91-2-04-yuv440
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/cbs-vp9-vp91-2-04-yuv444 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/cbs-vp9-vp91-2-04-yuv444
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/cbs-vp9-vp91-2-04-yuv444
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/cbs-vp9-vp91-2-04-yuv444
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/cbs-vp9-vp92-2-20-10bit-yuv420 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/cbs-vp9-vp92-2-20-10bit-yuv420
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/cbs-vp9-vp92-2-20-10bit-yuv420
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/cbs-vp9-vp92-2-20-10bit-yuv420
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/cbs-vp9-vp93-2-20-10bit-yuv422 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/cbs-vp9-vp93-2-20-10bit-yuv422
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/cbs-vp9-vp93-2-20-10bit-yuv422
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/cbs-vp9-vp93-2-20-10bit-yuv422
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/cbs-vp9-vp93-2-20-12bit-yuv444 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/cbs-vp9-vp93-2-20-12bit-yuv444
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/cbs-vp9-vp93-2-20-12bit-yuv444
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/cbs-vp9-vp93-2-20-12bit-yuv444
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/cdgraphics b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/cdgraphics
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/cdgraphics
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/cdgraphics
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/cdxl-bitline-ham6 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/cdxl-bitline-ham6
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/cdxl-bitline-ham6
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/cdxl-bitline-ham6
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/cdxl-demux b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/cdxl-demux
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/cdxl-demux
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/cdxl-demux
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/cdxl-ham6 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/cdxl-ham6
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/cdxl-ham6
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/cdxl-ham6
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/cdxl-ham8 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/cdxl-ham8
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/cdxl-ham8
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/cdxl-ham8
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/cdxl-pal8 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/cdxl-pal8
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/cdxl-pal8
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/cdxl-pal8
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/cdxl-pal8-small b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/cdxl-pal8-small
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/cdxl-pal8-small
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/cdxl-pal8-small
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/cfhd-1 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/cfhd-1
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/cfhd-1
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/cfhd-1
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/cfhd-2 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/cfhd-2
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/cfhd-2
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/cfhd-2
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/cfhd-3 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/cfhd-3
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/cfhd-3
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/cfhd-3
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/cine-demux b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/cine-demux
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/cine-demux
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/cine-demux
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/cljr b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/cljr
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/cljr
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/cljr
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/color_utils b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/color_utils
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/color_utils
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/color_utils
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/concat-demuxer-extended-lavf-mxf b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/concat-demuxer-extended-lavf-mxf
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/concat-demuxer-extended-lavf-mxf
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/concat-demuxer-extended-lavf-mxf
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/concat-demuxer-extended-lavf-mxf_d10 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/concat-demuxer-extended-lavf-mxf_d10
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/concat-demuxer-extended-lavf-mxf_d10
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/concat-demuxer-extended-lavf-mxf_d10
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/concat-demuxer-simple1-lavf-mxf b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/concat-demuxer-simple1-lavf-mxf
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/concat-demuxer-simple1-lavf-mxf
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/concat-demuxer-simple1-lavf-mxf
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/concat-demuxer-simple1-lavf-mxf_d10 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/concat-demuxer-simple1-lavf-mxf_d10
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/concat-demuxer-simple1-lavf-mxf_d10
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/concat-demuxer-simple1-lavf-mxf_d10
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/concat-demuxer-simple2-lavf-ts b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/concat-demuxer-simple2-lavf-ts
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/concat-demuxer-simple2-lavf-ts
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/concat-demuxer-simple2-lavf-ts
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/copy-psp b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/copy-psp
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/copy-psp
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/copy-psp
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/copy-trac2211-avi b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/copy-trac2211-avi
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/copy-trac2211-avi
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/copy-trac2211-avi
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/copy-trac236 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/copy-trac236
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/copy-trac236
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/copy-trac236
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/copy-trac3074 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/copy-trac3074
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/copy-trac3074
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/copy-trac3074
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/copy-trac4914 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/copy-trac4914
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/copy-trac4914
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/copy-trac4914
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/copy-trac4914-avi b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/copy-trac4914-avi
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/copy-trac4914-avi
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/copy-trac4914-avi
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/corepng b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/corepng
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/corepng
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/corepng
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/crc b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/crc
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/crc
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/crc
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/creatureshock-avs b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/creatureshock-avs
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/creatureshock-avs
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/creatureshock-avs
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/cscd b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/cscd
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/cscd
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/cscd
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/cvid-grayscale b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/cvid-grayscale
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/cvid-grayscale
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/cvid-grayscale
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/cvid-palette b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/cvid-palette
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/cvid-palette
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/cvid-palette
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/cvid-partial b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/cvid-partial
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/cvid-partial
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/cvid-partial
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/cyberia-c93 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/cyberia-c93
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/cyberia-c93
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/cyberia-c93
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/cyuv b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/cyuv
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/cyuv
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/cyuv
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/d-cinema-demux b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/d-cinema-demux
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/d-cinema-demux
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/d-cinema-demux
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/d-eavp6-demux b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/d-eavp6-demux
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/d-eavp6-demux
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/d-eavp6-demux
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/dca-xll b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/dca-xll
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/dca-xll
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/dca-xll
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/dca-xll_51_16_192_768_0 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/dca-xll_51_16_192_768_0
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/dca-xll_51_16_192_768_0
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/dca-xll_51_16_192_768_0
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/dca-xll_51_16_192_768_0-dmix_2 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/dca-xll_51_16_192_768_0-dmix_2
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/dca-xll_51_16_192_768_0-dmix_2
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/dca-xll_51_16_192_768_0-dmix_2
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/dca-xll_51_16_192_768_0-dmix_6 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/dca-xll_51_16_192_768_0-dmix_6
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/dca-xll_51_16_192_768_0-dmix_6
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/dca-xll_51_16_192_768_0-dmix_6
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/dca-xll_51_16_192_768_1 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/dca-xll_51_16_192_768_1
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/dca-xll_51_16_192_768_1
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/dca-xll_51_16_192_768_1
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/dca-xll_51_16_192_768_1-dmix_2 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/dca-xll_51_16_192_768_1-dmix_2
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/dca-xll_51_16_192_768_1-dmix_2
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/dca-xll_51_16_192_768_1-dmix_2
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/dca-xll_51_16_192_768_1-dmix_6 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/dca-xll_51_16_192_768_1-dmix_6
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/dca-xll_51_16_192_768_1-dmix_6
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/dca-xll_51_16_192_768_1-dmix_6
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/dca-xll_51_24_48_768 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/dca-xll_51_24_48_768
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/dca-xll_51_24_48_768
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/dca-xll_51_24_48_768
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/dca-xll_51_24_48_768-dmix_2 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/dca-xll_51_24_48_768-dmix_2
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/dca-xll_51_24_48_768-dmix_2
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/dca-xll_51_24_48_768-dmix_2
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/dca-xll_51_24_48_768-dmix_6 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/dca-xll_51_24_48_768-dmix_6
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/dca-xll_51_24_48_768-dmix_6
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/dca-xll_51_24_48_768-dmix_6
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/dca-xll_51_24_48_none b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/dca-xll_51_24_48_none
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/dca-xll_51_24_48_none
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/dca-xll_51_24_48_none
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/dca-xll_51_24_48_none-dmix_2 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/dca-xll_51_24_48_none-dmix_2
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/dca-xll_51_24_48_none-dmix_2
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/dca-xll_51_24_48_none-dmix_2
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/dca-xll_51_24_48_none-dmix_6 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/dca-xll_51_24_48_none-dmix_6
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/dca-xll_51_24_48_none-dmix_6
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/dca-xll_51_24_48_none-dmix_6
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/dca-xll_71_24_48_768_0 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/dca-xll_71_24_48_768_0
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/dca-xll_71_24_48_768_0
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/dca-xll_71_24_48_768_0
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/dca-xll_71_24_48_768_0-dmix_2 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/dca-xll_71_24_48_768_0-dmix_2
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/dca-xll_71_24_48_768_0-dmix_2
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/dca-xll_71_24_48_768_0-dmix_2
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/dca-xll_71_24_48_768_0-dmix_6 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/dca-xll_71_24_48_768_0-dmix_6
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/dca-xll_71_24_48_768_0-dmix_6
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/dca-xll_71_24_48_768_0-dmix_6
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/dca-xll_71_24_48_768_1 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/dca-xll_71_24_48_768_1
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/dca-xll_71_24_48_768_1
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/dca-xll_71_24_48_768_1
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/dca-xll_71_24_48_768_1-dmix_2 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/dca-xll_71_24_48_768_1-dmix_2
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/dca-xll_71_24_48_768_1-dmix_2
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/dca-xll_71_24_48_768_1-dmix_2
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/dca-xll_71_24_48_768_1-dmix_6 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/dca-xll_71_24_48_768_1-dmix_6
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/dca-xll_71_24_48_768_1-dmix_6
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/dca-xll_71_24_48_768_1-dmix_6
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/dca-xll_71_24_96_768 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/dca-xll_71_24_96_768
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/dca-xll_71_24_96_768
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/dca-xll_71_24_96_768
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/dca-xll_71_24_96_768-dmix_2 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/dca-xll_71_24_96_768-dmix_2
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/dca-xll_71_24_96_768-dmix_2
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/dca-xll_71_24_96_768-dmix_2
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/dca-xll_71_24_96_768-dmix_6 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/dca-xll_71_24_96_768-dmix_6
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/dca-xll_71_24_96_768-dmix_6
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/dca-xll_71_24_96_768-dmix_6
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/dca-xll_x96_51_24_96_1509 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/dca-xll_x96_51_24_96_1509
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/dca-xll_x96_51_24_96_1509
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/dca-xll_x96_51_24_96_1509
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/dca-xll_x96_51_24_96_1509-dmix_2 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/dca-xll_x96_51_24_96_1509-dmix_2
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/dca-xll_x96_51_24_96_1509-dmix_2
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/dca-xll_x96_51_24_96_1509-dmix_2
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/dca-xll_x96_51_24_96_1509-dmix_6 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/dca-xll_x96_51_24_96_1509-dmix_6
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/dca-xll_x96_51_24_96_1509-dmix_6
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/dca-xll_x96_51_24_96_1509-dmix_6
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/dca-xll_xch_61_24_48_768 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/dca-xll_xch_61_24_48_768
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/dca-xll_xch_61_24_48_768
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/dca-xll_xch_61_24_48_768
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/dca-xll_xch_61_24_48_768-dmix_2 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/dca-xll_xch_61_24_48_768-dmix_2
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/dca-xll_xch_61_24_48_768-dmix_2
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/dca-xll_xch_61_24_48_768-dmix_2
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/dca-xll_xch_61_24_48_768-dmix_6 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/dca-xll_xch_61_24_48_768-dmix_6
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/dca-xll_xch_61_24_48_768-dmix_6
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/dca-xll_xch_61_24_48_768-dmix_6
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/dcinema-encode b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/dcinema-encode
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/dcinema-encode
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/dcinema-encode
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/dds-alpha8 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/dds-alpha8
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/dds-alpha8
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/dds-alpha8
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/dds-argb b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/dds-argb
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/dds-argb
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/dds-argb
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/dds-argb-aexp b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/dds-argb-aexp
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/dds-argb-aexp
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/dds-argb-aexp
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/dds-dx10-bc1 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/dds-dx10-bc1
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/dds-dx10-bc1
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/dds-dx10-bc1
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/dds-dx10-bc1a b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/dds-dx10-bc1a
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/dds-dx10-bc1a
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/dds-dx10-bc1a
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/dds-dx10-bc2 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/dds-dx10-bc2
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/dds-dx10-bc2
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/dds-dx10-bc2
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/dds-dx10-bc3 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/dds-dx10-bc3
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/dds-dx10-bc3
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/dds-dx10-bc3
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/dds-dx10-bc4 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/dds-dx10-bc4
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/dds-dx10-bc4
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/dds-dx10-bc4
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/dds-dx10-bc5 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/dds-dx10-bc5
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/dds-dx10-bc5
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/dds-dx10-bc5
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/dds-dxt1 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/dds-dxt1
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/dds-dxt1
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/dds-dxt1
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/dds-dxt1-normalmap b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/dds-dxt1-normalmap
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/dds-dxt1-normalmap
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/dds-dxt1-normalmap
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/dds-dxt1a b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/dds-dxt1a
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/dds-dxt1a
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/dds-dxt1a
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/dds-dxt2 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/dds-dxt2
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/dds-dxt2
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/dds-dxt2
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/dds-dxt3 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/dds-dxt3
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/dds-dxt3
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/dds-dxt3
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/dds-dxt4 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/dds-dxt4
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/dds-dxt4
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/dds-dxt4
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/dds-dxt5 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/dds-dxt5
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/dds-dxt5
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/dds-dxt5
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/dds-dxt5-aexp b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/dds-dxt5-aexp
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/dds-dxt5-aexp
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/dds-dxt5-aexp
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/dds-dxt5-normalmap b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/dds-dxt5-normalmap
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/dds-dxt5-normalmap
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/dds-dxt5-normalmap
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/dds-dxt5-normalmap-ati b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/dds-dxt5-normalmap-ati
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/dds-dxt5-normalmap-ati
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/dds-dxt5-normalmap-ati
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/dds-dxt5-rbxg b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/dds-dxt5-rbxg
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/dds-dxt5-rbxg
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/dds-dxt5-rbxg
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/dds-dxt5-rgxb b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/dds-dxt5-rgxb
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/dds-dxt5-rgxb
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/dds-dxt5-rgxb
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/dds-dxt5-rxbg b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/dds-dxt5-rxbg
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/dds-dxt5-rxbg
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/dds-dxt5-rxbg
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/dds-dxt5-rxgb b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/dds-dxt5-rxgb
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/dds-dxt5-rxgb
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/dds-dxt5-rxgb
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/dds-dxt5-xgbr b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/dds-dxt5-xgbr
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/dds-dxt5-xgbr
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/dds-dxt5-xgbr
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/dds-dxt5-xgxr b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/dds-dxt5-xgxr
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/dds-dxt5-xgxr
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/dds-dxt5-xgxr
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/dds-dxt5-xrbg b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/dds-dxt5-xrbg
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/dds-dxt5-xrbg
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/dds-dxt5-xrbg
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/dds-dxt5-ycocg b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/dds-dxt5-ycocg
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/dds-dxt5-ycocg
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/dds-dxt5-ycocg
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/dds-dxt5-ycocg-scaled b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/dds-dxt5-ycocg-scaled
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/dds-dxt5-ycocg-scaled
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/dds-dxt5-ycocg-scaled
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/dds-monob b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/dds-monob
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/dds-monob
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/dds-monob
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/dds-pal b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/dds-pal
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/dds-pal
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/dds-pal
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/dds-pal-ati b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/dds-pal-ati
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/dds-pal-ati
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/dds-pal-ati
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/dds-rgb1555 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/dds-rgb1555
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/dds-rgb1555
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/dds-rgb1555
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/dds-rgb16 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/dds-rgb16
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/dds-rgb16
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/dds-rgb16
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/dds-rgb24 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/dds-rgb24
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/dds-rgb24
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/dds-rgb24
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/dds-rgb555 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/dds-rgb555
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/dds-rgb555
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/dds-rgb555
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/dds-rgba b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/dds-rgba
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/dds-rgba
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/dds-rgba
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/dds-rgtc1s b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/dds-rgtc1s
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/dds-rgtc1s
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/dds-rgtc1s
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/dds-rgtc1u b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/dds-rgtc1u
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/dds-rgtc1u
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/dds-rgtc1u
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/dds-rgtc2s b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/dds-rgtc2s
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/dds-rgtc2s
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/dds-rgtc2s
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/dds-rgtc2u b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/dds-rgtc2u
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/dds-rgtc2u
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/dds-rgtc2u
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/dds-rgtc2u-xy b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/dds-rgtc2u-xy
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/dds-rgtc2u-xy
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/dds-rgtc2u-xy
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/dds-uyvy b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/dds-uyvy
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/dds-uyvy
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/dds-uyvy
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/dds-xbgr b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/dds-xbgr
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/dds-xbgr
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/dds-xbgr
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/dds-xrgb b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/dds-xrgb
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/dds-xrgb
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/dds-xrgb
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/dds-y b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/dds-y
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/dds-y
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/dds-y
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/dds-ya b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/dds-ya
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/dds-ya
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/dds-ya
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/dds-ycocg b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/dds-ycocg
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/dds-ycocg
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/dds-ycocg
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/dds-yuyv b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/dds-yuyv
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/dds-yuyv
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/dds-yuyv
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/delphine-cin-audio b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/delphine-cin-audio
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/delphine-cin-audio
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/delphine-cin-audio
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/delphine-cin-video b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/delphine-cin-video
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/delphine-cin-video
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/delphine-cin-video
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/deluxepaint-anm b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/deluxepaint-anm
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/deluxepaint-anm
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/deluxepaint-anm
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/dfa1 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/dfa1
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/dfa1
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/dfa1
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/dfa10 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/dfa10
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/dfa10
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/dfa10
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/dfa11 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/dfa11
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/dfa11
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/dfa11
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/dfa2 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/dfa2
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/dfa2
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/dfa2
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/dfa3 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/dfa3
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/dfa3
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/dfa3
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/dfa4 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/dfa4
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/dfa4
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/dfa4
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/dfa5 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/dfa5
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/dfa5
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/dfa5
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/dfa6 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/dfa6
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/dfa6
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/dfa6
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/dfa7 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/dfa7
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/dfa7
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/dfa7
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/dfa8 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/dfa8
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/dfa8
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/dfa8
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/dfa9 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/dfa9
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/dfa9
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/dfa9
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/dict b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/dict
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/dict
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/dict
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/dirac b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/dirac
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/dirac
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/dirac
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/dirac-low-delay b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/dirac-low-delay
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/dirac-low-delay
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/dirac-low-delay
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/display b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/display
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/display
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/display
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/dnxhd-mbaff b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/dnxhd-mbaff
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/dnxhd-mbaff
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/dnxhd-mbaff
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/dnxhr-12bit b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/dnxhr-12bit
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/dnxhr-12bit
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/dnxhr-12bit
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/dnxhr-444 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/dnxhr-444
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/dnxhr-444
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/dnxhr-444
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/dnxhr-parse b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/dnxhr-parse
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/dnxhr-parse
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/dnxhr-parse
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/dnxhr-prefix1 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/dnxhr-prefix1
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/dnxhr-prefix1
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/dnxhr-prefix1
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/dnxhr-prefix2 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/dnxhr-prefix2
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/dnxhr-prefix2
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/dnxhr-prefix2
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/dnxhr-prefix3 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/dnxhr-prefix3
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/dnxhr-prefix3
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/dnxhr-prefix3
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/dnxhr-prefix4 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/dnxhr-prefix4
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/dnxhr-prefix4
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/dnxhr-prefix4
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/dnxhr-prefix5 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/dnxhr-prefix5
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/dnxhr-prefix5
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/dnxhr-prefix5
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/dpcm-idroq b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/dpcm-idroq
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/dpcm-idroq
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/dpcm-idroq
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/dpcm-interplay b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/dpcm-interplay
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/dpcm-interplay
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/dpcm-interplay
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/dpcm-sierra b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/dpcm-sierra
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/dpcm-sierra
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/dpcm-sierra
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/dpcm-xan b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/dpcm-xan
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/dpcm-xan
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/dpcm-xan
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/dpx b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/dpx
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/dpx
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/dpx
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/dpxparser b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/dpxparser
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/dpxparser
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/dpxparser
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/dss-lp b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/dss-lp
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/dss-lp
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/dss-lp
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/dss-sp b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/dss-sp
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/dss-sp
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/dss-sp
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/dxa-feeble b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/dxa-feeble
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/dxa-feeble
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/dxa-feeble
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/dxa-scummvm b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/dxa-scummvm
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/dxa-scummvm
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/dxa-scummvm
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/dxtory b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/dxtory
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/dxtory
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/dxtory
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/dxv-dxt1 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/dxv-dxt1
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/dxv-dxt1
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/dxv-dxt1
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/dxv-dxt5 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/dxv-dxt5
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/dxv-dxt5
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/dxv-dxt5
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/dxv3-dxt1 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/dxv3-dxt1
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/dxv3-dxt1
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/dxv3-dxt1
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/dxv3-dxt5 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/dxv3-dxt5
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/dxv3-dxt5
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/dxv3-dxt5
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/ea-cdata b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/ea-cdata
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/ea-cdata
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/ea-cdata
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/ea-cmv b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/ea-cmv
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/ea-cmv
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/ea-cmv
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/ea-mad b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/ea-mad
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/ea-mad
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/ea-mad
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/ea-tgq b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/ea-tgq
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/ea-tgq
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/ea-tgq
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/ea-tgv-1 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/ea-tgv-1
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/ea-tgv-1
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/ea-tgv-1
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/ea-tgv-2 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/ea-tgv-2
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/ea-tgv-2
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/ea-tgv-2
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/ea-tqi b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/ea-tqi
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/ea-tqi
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/ea-tqi
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/eval b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/eval
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/eval
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/eval
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/exif-image-embedded b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/exif-image-embedded
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/exif-image-embedded
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/exif-image-embedded
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/exif-image-jpg b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/exif-image-jpg
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/exif-image-jpg
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/exif-image-jpg
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/exif-image-tiff b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/exif-image-tiff
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/exif-image-tiff
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/exif-image-tiff
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/exif-image-webp b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/exif-image-webp
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/exif-image-webp
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/exif-image-webp
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/exr-rgb-b44a-half-negative-4x4 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/exr-rgb-b44a-half-negative-4x4
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/exr-rgb-b44a-half-negative-4x4
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/exr-rgb-b44a-half-negative-4x4
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/exr-rgb-scanline-b44-half-float-12x8-l1 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/exr-rgb-scanline-b44-half-float-12x8-l1
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/exr-rgb-scanline-b44-half-float-12x8-l1
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/exr-rgb-scanline-b44-half-float-12x8-l1
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/exr-rgb-scanline-b44-half-float-12x8-l2 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/exr-rgb-scanline-b44-half-float-12x8-l2
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/exr-rgb-scanline-b44-half-float-12x8-l2
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/exr-rgb-scanline-b44-half-float-12x8-l2
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/exr-rgb-scanline-b44-uint32 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/exr-rgb-scanline-b44-uint32
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/exr-rgb-scanline-b44-uint32
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/exr-rgb-scanline-b44-uint32
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/exr-rgb-scanline-float-b44 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/exr-rgb-scanline-float-b44
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/exr-rgb-scanline-float-b44
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/exr-rgb-scanline-float-b44
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/exr-rgb-scanline-float-piz-48x32 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/exr-rgb-scanline-float-piz-48x32
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/exr-rgb-scanline-float-piz-48x32
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/exr-rgb-scanline-float-piz-48x32
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/exr-rgb-scanline-half-b44-12x8 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/exr-rgb-scanline-half-b44-12x8
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/exr-rgb-scanline-half-b44-12x8
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/exr-rgb-scanline-half-b44-12x8
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/exr-rgb-scanline-half-b44-13x9 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/exr-rgb-scanline-half-b44-13x9
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/exr-rgb-scanline-half-b44-13x9
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/exr-rgb-scanline-half-b44-13x9
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/exr-rgb-scanline-half-piz-bw b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/exr-rgb-scanline-half-piz-bw
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/exr-rgb-scanline-half-piz-bw
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/exr-rgb-scanline-half-piz-bw
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/exr-rgb-scanline-half-piz-color b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/exr-rgb-scanline-half-piz-color
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/exr-rgb-scanline-half-piz-color
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/exr-rgb-scanline-half-piz-color
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/exr-rgb-scanline-half-piz-dw-t01 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/exr-rgb-scanline-half-piz-dw-t01
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/exr-rgb-scanline-half-piz-dw-t01
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/exr-rgb-scanline-half-piz-dw-t01
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/exr-rgb-scanline-half-piz-dw-t08 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/exr-rgb-scanline-half-piz-dw-t08
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/exr-rgb-scanline-half-piz-dw-t08
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/exr-rgb-scanline-half-piz-dw-t08
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/exr-rgb-scanline-none-negative-red b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/exr-rgb-scanline-none-negative-red
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/exr-rgb-scanline-none-negative-red
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/exr-rgb-scanline-none-negative-red
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/exr-rgb-scanline-pxr24-float-12x8 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/exr-rgb-scanline-pxr24-float-12x8
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/exr-rgb-scanline-pxr24-float-12x8
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/exr-rgb-scanline-pxr24-float-12x8
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/exr-rgb-scanline-pxr24-float-half-l1 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/exr-rgb-scanline-pxr24-float-half-l1
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/exr-rgb-scanline-pxr24-float-half-l1
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/exr-rgb-scanline-pxr24-float-half-l1
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/exr-rgb-scanline-pxr24-float-half-l2 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/exr-rgb-scanline-pxr24-float-half-l2
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/exr-rgb-scanline-pxr24-float-half-l2
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/exr-rgb-scanline-pxr24-float-half-l2
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/exr-rgb-scanline-pxr24-half-float-l1 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/exr-rgb-scanline-pxr24-half-float-l1
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/exr-rgb-scanline-pxr24-half-float-l1
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/exr-rgb-scanline-pxr24-half-float-l1
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/exr-rgb-scanline-pxr24-half-float-l2 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/exr-rgb-scanline-pxr24-half-float-l2
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/exr-rgb-scanline-pxr24-half-float-l2
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/exr-rgb-scanline-pxr24-half-float-l2
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/exr-rgb-scanline-pxr24-half-uint32-13x9 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/exr-rgb-scanline-pxr24-half-uint32-13x9
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/exr-rgb-scanline-pxr24-half-uint32-13x9
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/exr-rgb-scanline-pxr24-half-uint32-13x9
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/exr-rgb-scanline-pxr24-uint32 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/exr-rgb-scanline-pxr24-uint32
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/exr-rgb-scanline-pxr24-uint32
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/exr-rgb-scanline-pxr24-uint32
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/exr-rgb-scanline-raw-half-float-l1 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/exr-rgb-scanline-raw-half-float-l1
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/exr-rgb-scanline-raw-half-float-l1
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/exr-rgb-scanline-raw-half-float-l1
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/exr-rgb-scanline-raw-half-float-l2 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/exr-rgb-scanline-raw-half-float-l2
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/exr-rgb-scanline-raw-half-float-l2
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/exr-rgb-scanline-raw-half-float-l2
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/exr-rgb-scanline-rle-half-float-l1 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/exr-rgb-scanline-rle-half-float-l1
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/exr-rgb-scanline-rle-half-float-l1
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/exr-rgb-scanline-rle-half-float-l1
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/exr-rgb-scanline-rle-half-float-l2 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/exr-rgb-scanline-rle-half-float-l2
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/exr-rgb-scanline-rle-half-float-l2
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/exr-rgb-scanline-rle-half-float-l2
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/exr-rgb-scanline-zip-half-float-l1 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/exr-rgb-scanline-zip-half-float-l1
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/exr-rgb-scanline-zip-half-float-l1
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/exr-rgb-scanline-zip-half-float-l1
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/exr-rgb-scanline-zip-half-float-l2 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/exr-rgb-scanline-zip-half-float-l2
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/exr-rgb-scanline-zip-half-float-l2
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/exr-rgb-scanline-zip-half-float-l2
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/exr-rgb-scanline-zip1-half-float-l1 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/exr-rgb-scanline-zip1-half-float-l1
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/exr-rgb-scanline-zip1-half-float-l1
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/exr-rgb-scanline-zip1-half-float-l1
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/exr-rgb-scanline-zip1-half-float-l1-zero-offsets b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/exr-rgb-scanline-zip1-half-float-l1-zero-offsets
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/exr-rgb-scanline-zip1-half-float-l1-zero-offsets
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/exr-rgb-scanline-zip1-half-float-l1-zero-offsets
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/exr-rgb-scanline-zip1-half-float-l2 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/exr-rgb-scanline-zip1-half-float-l2
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/exr-rgb-scanline-zip1-half-float-l2
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/exr-rgb-scanline-zip1-half-float-l2
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/exr-rgb-tile-float-raw-12x8 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/exr-rgb-tile-float-raw-12x8
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/exr-rgb-tile-float-raw-12x8
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/exr-rgb-tile-float-raw-12x8
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/exr-rgb-tile-float-raw-150x130 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/exr-rgb-tile-float-raw-150x130
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/exr-rgb-tile-float-raw-150x130
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/exr-rgb-tile-float-raw-150x130
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/exr-rgb-tile-half-float-b44-12x8-l1 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/exr-rgb-tile-half-float-b44-12x8-l1
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/exr-rgb-tile-half-float-b44-12x8-l1
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/exr-rgb-tile-half-float-b44-12x8-l1
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/exr-rgb-tile-half-float-b44-12x8-l2 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/exr-rgb-tile-half-float-b44-12x8-l2
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/exr-rgb-tile-half-float-b44-12x8-l2
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/exr-rgb-tile-half-float-b44-12x8-l2
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/exr-rgb-tile-half-raw-12x8 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/exr-rgb-tile-half-raw-12x8
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/exr-rgb-tile-half-raw-12x8
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/exr-rgb-tile-half-raw-12x8
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/exr-rgb-tile-pxr24-float-half-l1 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/exr-rgb-tile-pxr24-float-half-l1
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/exr-rgb-tile-pxr24-float-half-l1
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/exr-rgb-tile-pxr24-float-half-l1
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/exr-rgb-tile-pxr24-float-half-l2 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/exr-rgb-tile-pxr24-float-half-l2
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/exr-rgb-tile-pxr24-float-half-l2
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/exr-rgb-tile-pxr24-float-half-l2
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/exr-rgb-tile-pxr24-half-float-l1 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/exr-rgb-tile-pxr24-half-float-l1
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/exr-rgb-tile-pxr24-half-float-l1
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/exr-rgb-tile-pxr24-half-float-l1
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/exr-rgb-tile-pxr24-half-float-l2 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/exr-rgb-tile-pxr24-half-float-l2
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/exr-rgb-tile-pxr24-half-float-l2
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/exr-rgb-tile-pxr24-half-float-l2
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/exr-rgb-tile-raw-half-float-l1 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/exr-rgb-tile-raw-half-float-l1
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/exr-rgb-tile-raw-half-float-l1
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/exr-rgb-tile-raw-half-float-l1
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/exr-rgb-tile-raw-half-float-l2 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/exr-rgb-tile-raw-half-float-l2
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/exr-rgb-tile-raw-half-float-l2
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/exr-rgb-tile-raw-half-float-l2
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/exr-rgb-tile-rle-half-float-l1 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/exr-rgb-tile-rle-half-float-l1
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/exr-rgb-tile-rle-half-float-l1
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/exr-rgb-tile-rle-half-float-l1
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/exr-rgb-tile-rle-half-float-l2 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/exr-rgb-tile-rle-half-float-l2
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/exr-rgb-tile-rle-half-float-l2
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/exr-rgb-tile-rle-half-float-l2
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/exr-rgb-tile-zip-half-float-l1 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/exr-rgb-tile-zip-half-float-l1
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/exr-rgb-tile-zip-half-float-l1
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/exr-rgb-tile-zip-half-float-l1
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/exr-rgb-tile-zip-half-float-l2 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/exr-rgb-tile-zip-half-float-l2
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/exr-rgb-tile-zip-half-float-l2
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/exr-rgb-tile-zip-half-float-l2
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/exr-rgb-tile-zip1-half-float-l1 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/exr-rgb-tile-zip1-half-float-l1
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/exr-rgb-tile-zip1-half-float-l1
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/exr-rgb-tile-zip1-half-float-l1
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/exr-rgb-tile-zip1-half-float-l2 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/exr-rgb-tile-zip1-half-float-l2
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/exr-rgb-tile-zip1-half-float-l2
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/exr-rgb-tile-zip1-half-float-l2
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/exr-rgba-multiscanline-half-b44 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/exr-rgba-multiscanline-half-b44
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/exr-rgba-multiscanline-half-b44
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/exr-rgba-multiscanline-half-b44
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/exr-rgba-scanline-float-half-b44-12x8-l1 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/exr-rgba-scanline-float-half-b44-12x8-l1
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/exr-rgba-scanline-float-half-b44-12x8-l1
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/exr-rgba-scanline-float-half-b44-12x8-l1
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/exr-rgba-scanline-float-half-b44-12x8-l2 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/exr-rgba-scanline-float-half-b44-12x8-l2
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/exr-rgba-scanline-float-half-b44-12x8-l2
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/exr-rgba-scanline-float-half-b44-12x8-l2
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/exr-rgba-scanline-float-half-b44-13x9-l1 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/exr-rgba-scanline-float-half-b44-13x9-l1
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/exr-rgba-scanline-float-half-b44-13x9-l1
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/exr-rgba-scanline-float-half-b44-13x9-l1
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/exr-rgba-scanline-float-half-b44-13x9-l2 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/exr-rgba-scanline-float-half-b44-13x9-l2
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/exr-rgba-scanline-float-half-b44-13x9-l2
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/exr-rgba-scanline-float-half-b44-13x9-l2
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/exr-rgba-scanline-float-half-b44a-12x8-l1 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/exr-rgba-scanline-float-half-b44a-12x8-l1
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/exr-rgba-scanline-float-half-b44a-12x8-l1
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/exr-rgba-scanline-float-half-b44a-12x8-l1
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/exr-rgba-scanline-float-half-b44a-12x8-l2 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/exr-rgba-scanline-float-half-b44a-12x8-l2
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/exr-rgba-scanline-float-half-b44a-12x8-l2
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/exr-rgba-scanline-float-half-b44a-12x8-l2
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/exr-rgba-scanline-float-half-b44a-13x9-l1 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/exr-rgba-scanline-float-half-b44a-13x9-l1
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/exr-rgba-scanline-float-half-b44a-13x9-l1
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/exr-rgba-scanline-float-half-b44a-13x9-l1
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/exr-rgba-scanline-float-half-b44a-13x9-l2 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/exr-rgba-scanline-float-half-b44a-13x9-l2
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/exr-rgba-scanline-float-half-b44a-13x9-l2
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/exr-rgba-scanline-float-half-b44a-13x9-l2
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/exr-rgba-zip16-16x32-flag4 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/exr-rgba-zip16-16x32-flag4
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/exr-rgba-zip16-16x32-flag4
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/exr-rgba-zip16-16x32-flag4
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/exr-slice-pxr24 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/exr-slice-pxr24
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/exr-slice-pxr24
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/exr-slice-pxr24
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/exr-slice-raw b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/exr-slice-raw
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/exr-slice-raw
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/exr-slice-raw
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/exr-slice-rle b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/exr-slice-rle
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/exr-slice-rle
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/exr-slice-rle
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/exr-slice-zip1 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/exr-slice-zip1
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/exr-slice-zip1
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/exr-slice-zip1
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/exr-slice-zip16 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/exr-slice-zip16
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/exr-slice-zip16
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/exr-slice-zip16
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/exr-y-scanline-zip-half-12x8 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/exr-y-scanline-zip-half-12x8
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/exr-y-scanline-zip-half-12x8
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/exr-y-scanline-zip-half-12x8
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/exr-y-tile-zip-half-12x8 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/exr-y-tile-zip-half-12x8
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/exr-y-tile-zip-half-12x8
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/exr-y-tile-zip-half-12x8
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/ffmpeg-attached_pics b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/ffmpeg-attached_pics
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/ffmpeg-attached_pics
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/ffmpeg-attached_pics
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/ffmpeg-bsf-remove-e b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/ffmpeg-bsf-remove-e
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/ffmpeg-bsf-remove-e
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/ffmpeg-bsf-remove-e
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/ffmpeg-bsf-remove-k b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/ffmpeg-bsf-remove-k
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/ffmpeg-bsf-remove-k
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/ffmpeg-bsf-remove-k
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/ffmpeg-bsf-remove-r b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/ffmpeg-bsf-remove-r
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/ffmpeg-bsf-remove-r
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/ffmpeg-bsf-remove-r
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/ffmpeg-filter_colorkey b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/ffmpeg-filter_colorkey
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/ffmpeg-filter_colorkey
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/ffmpeg-filter_colorkey
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/ffmpeg-filter_complex b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/ffmpeg-filter_complex
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/ffmpeg-filter_complex
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/ffmpeg-filter_complex
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/ffmpeg-filter_complex_audio b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/ffmpeg-filter_complex_audio
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/ffmpeg-filter_complex_audio
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/ffmpeg-filter_complex_audio
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/ffmpeg-lavfi b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/ffmpeg-lavfi
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/ffmpeg-lavfi
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/ffmpeg-lavfi
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/ffprobe_compact b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/ffprobe_compact
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/ffprobe_compact
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/ffprobe_compact
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/ffprobe_csv b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/ffprobe_csv
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/ffprobe_csv
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/ffprobe_csv
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/ffprobe_default b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/ffprobe_default
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/ffprobe_default
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/ffprobe_default
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/ffprobe_flat b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/ffprobe_flat
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/ffprobe_flat
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/ffprobe_flat
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/ffprobe_ini b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/ffprobe_ini
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/ffprobe_ini
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/ffprobe_ini
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/ffprobe_json b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/ffprobe_json
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/ffprobe_json
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/ffprobe_json
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/ffprobe_xml b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/ffprobe_xml
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/ffprobe_xml
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/ffprobe_xml
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/fic-avi b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/fic-avi
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/fic-avi
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/fic-avi
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/fifo b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/fifo
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/fifo
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/fifo
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/fifo-muxer-tst b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/fifo-muxer-tst
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/fifo-muxer-tst
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/fifo-muxer-tst
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/film-cvid b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/film-cvid
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/film-cvid
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/film-cvid
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-2xbr b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-2xbr
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-2xbr
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-2xbr
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-3xbr b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-3xbr
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-3xbr
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-3xbr
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-4xbr b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-4xbr
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-4xbr
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-4xbr
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-acrossfade b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-acrossfade
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-acrossfade
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-acrossfade
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-adelay b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-adelay
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-adelay
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-adelay
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-aecho b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-aecho
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-aecho
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-aecho
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-aemphasis b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-aemphasis
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-aemphasis
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-aemphasis
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-aemphasis-50fm b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-aemphasis-50fm
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-aemphasis-50fm
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-aemphasis-50fm
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-aemphasis-75kf b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-aemphasis-75kf
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-aemphasis-75kf
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-aemphasis-75kf
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-afade-esin b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-afade-esin
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-afade-esin
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-afade-esin
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-afade-exp b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-afade-exp
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-afade-exp
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-afade-exp
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-afade-hsin b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-afade-hsin
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-afade-hsin
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-afade-hsin
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-afade-iqsin b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-afade-iqsin
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-afade-iqsin
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-afade-iqsin
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-afade-log b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-afade-log
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-afade-log
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-afade-log
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-afade-qsin b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-afade-qsin
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-afade-qsin
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-afade-qsin
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-agate b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-agate
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-agate
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-agate
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-alimiter b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-alimiter
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-alimiter
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-alimiter
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-allrgb b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-allrgb
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-allrgb
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-allrgb
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-allyuv b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-allyuv
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-allyuv
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-allyuv
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-alphaextract_alphamerge_rgb b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-alphaextract_alphamerge_rgb
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-alphaextract_alphamerge_rgb
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-alphaextract_alphamerge_rgb
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-alphaextract_alphamerge_yuv b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-alphaextract_alphamerge_yuv
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-alphaextract_alphamerge_yuv
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-alphaextract_alphamerge_yuv
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-amerge b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-amerge
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-amerge
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-amerge
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-anequalizer b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-anequalizer
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-anequalizer
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-anequalizer
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-apad b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-apad
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-apad
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-apad
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-asetnsamples-nopad b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-asetnsamples-nopad
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-asetnsamples-nopad
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-asetnsamples-nopad
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-asetnsamples-pad b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-asetnsamples-pad
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-asetnsamples-pad
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-asetnsamples-pad
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-asetrate b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-asetrate
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-asetrate
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-asetrate
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-atrim-duration b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-atrim-duration
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-atrim-duration
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-atrim-duration
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-atrim-mixed b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-atrim-mixed
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-atrim-mixed
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-atrim-mixed
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-atrim-samples b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-atrim-samples
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-atrim-samples
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-atrim-samples
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-atrim-time b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-atrim-time
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-atrim-time
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-atrim-time
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-boxblur b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-boxblur
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-boxblur
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-boxblur
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-chorus b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-chorus
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-chorus
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-chorus
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-codecview-mvs b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-codecview-mvs
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-codecview-mvs
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-codecview-mvs
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-colorchannelmixer b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-colorchannelmixer
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-colorchannelmixer
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-colorchannelmixer
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-colormatrix1 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-colormatrix1
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-colormatrix1
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-colormatrix1
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-colormatrix2 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-colormatrix2
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-colormatrix2
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-colormatrix2
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-compand b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-compand
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-compand
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-compand
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-concat b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-concat
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-concat
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-concat
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-crop b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-crop
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-crop
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-crop
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-crop_scale b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-crop_scale
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-crop_scale
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-crop_scale
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-crop_scale_vflip b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-crop_scale_vflip
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-crop_scale_vflip
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-crop_scale_vflip
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-crop_vflip b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-crop_vflip
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-crop_vflip
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-crop_vflip
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-curves b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-curves
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-curves
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-curves
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-dcshift b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-dcshift
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-dcshift
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-dcshift
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-delogo b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-delogo
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-delogo
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-delogo
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-drawbox b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-drawbox
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-drawbox
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-drawbox
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-earwax b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-earwax
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-earwax
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-earwax
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-edgedetect b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-edgedetect
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-edgedetect
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-edgedetect
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-edgedetect-colormix b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-edgedetect-colormix
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-edgedetect-colormix
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-edgedetect-colormix
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-extrastereo b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-extrastereo
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-extrastereo
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-extrastereo
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-fade b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-fade
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-fade
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-fade
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-fieldorder b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-fieldorder
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-fieldorder
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-fieldorder
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-formats b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-formats
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-formats
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-formats
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-fps b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-fps
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-fps
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-fps
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-fps-cfr b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-fps-cfr
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-fps-cfr
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-fps-cfr
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-fps-down b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-fps-down
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-fps-down
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-fps-down
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-fps-down-eof-pass b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-fps-down-eof-pass
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-fps-down-eof-pass
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-fps-down-eof-pass
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-fps-down-round-down b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-fps-down-round-down
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-fps-down-round-down
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-fps-down-round-down
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-fps-down-round-up b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-fps-down-round-up
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-fps-down-round-up
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-fps-down-round-up
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-fps-r b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-fps-r
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-fps-r
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-fps-r
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-fps-start-drop b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-fps-start-drop
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-fps-start-drop
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-fps-start-drop
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-fps-start-fill b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-fps-start-fill
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-fps-start-fill
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-fps-start-fill
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-fps-up b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-fps-up
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-fps-up
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-fps-up
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-fps-up-round-down b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-fps-up-round-down
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-fps-up-round-down
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-fps-up-round-down
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-fps-up-round-up b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-fps-up-round-up
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-fps-up-round-up
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-fps-up-round-up
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-framepack-columns b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-framepack-columns
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-framepack-columns
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-framepack-columns
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-framepack-frameseq b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-framepack-frameseq
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-framepack-frameseq
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-framepack-frameseq
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-framepack-lines b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-framepack-lines
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-framepack-lines
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-framepack-lines
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-framepack-sbs b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-framepack-sbs
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-framepack-sbs
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-framepack-sbs
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-framepack-tab b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-framepack-tab
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-framepack-tab
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-framepack-tab
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-framerate-12bit-down b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-framerate-12bit-down
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-framerate-12bit-down
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-framerate-12bit-down
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-framerate-12bit-up b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-framerate-12bit-up
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-framerate-12bit-up
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-framerate-12bit-up
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-framerate-down b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-framerate-down
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-framerate-down
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-framerate-down
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-framerate-up b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-framerate-up
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-framerate-up
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-framerate-up
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-gradfun b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-gradfun
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-gradfun
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-gradfun
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-gradfun-sample b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-gradfun-sample
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-gradfun-sample
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-gradfun-sample
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-histogram-levels b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-histogram-levels
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-histogram-levels
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-histogram-levels
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-hls b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-hls
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-hls
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-hls
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-hls-append b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-hls-append
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-hls-append
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-hls-append
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-hq2x b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-hq2x
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-hq2x
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-hq2x
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-hq3x b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-hq3x
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-hq3x
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-hq3x
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-hq4x b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-hq4x
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-hq4x
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-hq4x
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-hqdn3d b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-hqdn3d
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-hqdn3d
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-hqdn3d
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-hqdn3d-sample b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-hqdn3d-sample
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-hqdn3d-sample
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-hqdn3d-sample
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-hstack b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-hstack
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-hstack
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-hstack
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-hue1 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-hue1
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-hue1
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-hue1
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-hue2 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-hue2
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-hue2
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-hue2
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-hue3 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-hue3
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-hue3
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-hue3
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-hue4 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-hue4
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-hue4
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-hue4
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-idet b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-idet
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-idet
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-idet
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-interlace b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-interlace
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-interlace
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-interlace
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-interlace-complex b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-interlace-complex
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-interlace-complex
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-interlace-complex
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-lavd-life b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-lavd-life
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-lavd-life
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-lavd-life
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-lavd-scalenorm b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-lavd-scalenorm
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-lavd-scalenorm
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-lavd-scalenorm
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-lavd-testsrc b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-lavd-testsrc
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-lavd-testsrc
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-lavd-testsrc
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-mcdeint-fast b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-mcdeint-fast
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-mcdeint-fast
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-mcdeint-fast
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-mcdeint-medium b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-mcdeint-medium
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-mcdeint-medium
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-mcdeint-medium
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-mergeplanes b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-mergeplanes
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-mergeplanes
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-mergeplanes
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-meta-4560-rotate0 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-meta-4560-rotate0
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-meta-4560-rotate0
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-meta-4560-rotate0
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-metadata-avf-aphase-meter-mono b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-metadata-avf-aphase-meter-mono
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-metadata-avf-aphase-meter-mono
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-metadata-avf-aphase-meter-mono
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-metadata-avf-aphase-meter-out-of-phase b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-metadata-avf-aphase-meter-out-of-phase
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-metadata-avf-aphase-meter-out-of-phase
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-metadata-avf-aphase-meter-out-of-phase
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-metadata-cropdetect b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-metadata-cropdetect
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-metadata-cropdetect
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-metadata-cropdetect
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-metadata-ebur128 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-metadata-ebur128
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-metadata-ebur128
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-metadata-ebur128
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-metadata-readvitc-def b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-metadata-readvitc-def
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-metadata-readvitc-def
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-metadata-readvitc-def
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-metadata-readvitc-thr b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-metadata-readvitc-thr
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-metadata-readvitc-thr
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-metadata-readvitc-thr
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-metadata-scenedetect b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-metadata-scenedetect
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-metadata-scenedetect
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-metadata-scenedetect
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-metadata-silencedetect b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-metadata-silencedetect
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-metadata-silencedetect
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-metadata-silencedetect
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-mpdecimate b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-mpdecimate
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-mpdecimate
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-mpdecimate
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-negate b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-negate
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-negate
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-negate
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-null b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-null
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-null
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-null
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-overlay b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-overlay
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-overlay
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-overlay
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-overlay-dvdsub-2397 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-overlay-dvdsub-2397
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-overlay-dvdsub-2397
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-overlay-dvdsub-2397
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-overlay_gbrap_gbrap b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-overlay_gbrap_gbrap
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-overlay_gbrap_gbrap
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-overlay_gbrap_gbrap
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-overlay_gbrp_gbrap b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-overlay_gbrp_gbrap
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-overlay_gbrp_gbrap
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-overlay_gbrp_gbrap
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-overlay_rgb b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-overlay_rgb
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-overlay_rgb
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-overlay_rgb
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-overlay_rgb_rgba b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-overlay_rgb_rgba
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-overlay_rgb_rgba
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-overlay_rgb_rgba
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-overlay_rgba_rgba b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-overlay_rgba_rgba
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-overlay_rgba_rgba
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-overlay_rgba_rgba
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-overlay_yuv420 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-overlay_yuv420
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-overlay_yuv420
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-overlay_yuv420
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-overlay_yuv420_yuva420 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-overlay_yuv420_yuva420
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-overlay_yuv420_yuva420
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-overlay_yuv420_yuva420
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-overlay_yuv422 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-overlay_yuv422
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-overlay_yuv422
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-overlay_yuv422
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-overlay_yuv422_yuva422 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-overlay_yuv422_yuva422
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-overlay_yuv422_yuva422
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-overlay_yuv422_yuva422
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-overlay_yuv444 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-overlay_yuv444
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-overlay_yuv444
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-overlay_yuv444
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-overlay_yuv444_yuva444 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-overlay_yuv444_yuva444
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-overlay_yuv444_yuva444
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-overlay_yuv444_yuva444
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-overlay_yuva420_yuva420 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-overlay_yuva420_yuva420
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-overlay_yuva420_yuva420
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-overlay_yuva420_yuva420
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-overlay_yuva422_yuva422 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-overlay_yuva422_yuva422
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-overlay_yuva422_yuva422
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-overlay_yuva422_yuva422
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-overlay_yuva444_yuva444 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-overlay_yuva444_yuva444
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-overlay_yuva444_yuva444
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-overlay_yuva444_yuva444
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pad b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pad
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pad
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pad
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pal100bars b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pal100bars
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pal100bars
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pal100bars
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pal75bars b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pal75bars
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pal75bars
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pal75bars
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-palettegen-1 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-palettegen-1
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-palettegen-1
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-palettegen-1
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-palettegen-2 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-palettegen-2
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-palettegen-2
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-palettegen-2
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-paletteuse-bayer b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-paletteuse-bayer
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-paletteuse-bayer
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-paletteuse-bayer
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-paletteuse-nodither b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-paletteuse-nodither
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-paletteuse-nodither
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-paletteuse-nodither
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-paletteuse-sierra2_4a b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-paletteuse-sierra2_4a
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-paletteuse-sierra2_4a
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-paletteuse-sierra2_4a
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pan-downmix1 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pan-downmix1
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pan-downmix1
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pan-downmix1
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pan-downmix2 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pan-downmix2
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pan-downmix2
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pan-downmix2
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pan-mono1 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pan-mono1
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pan-mono1
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pan-mono1
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pan-mono2 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pan-mono2
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pan-mono2
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pan-mono2
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pan-stereo1 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pan-stereo1
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pan-stereo1
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pan-stereo1
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pan-stereo2 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pan-stereo2
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pan-stereo2
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pan-stereo2
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pan-stereo3 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pan-stereo3
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pan-stereo3
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pan-stereo3
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pan-stereo4 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pan-stereo4
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pan-stereo4
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pan-stereo4
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pan-upmix1 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pan-upmix1
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pan-upmix1
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pan-upmix1
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pan-upmix2 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pan-upmix2
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pan-upmix2
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pan-upmix2
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-phase b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-phase
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-phase
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-phase
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-0bgr b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-0bgr
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-0bgr
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-0bgr
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-0rgb b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-0rgb
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-0rgb
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-0rgb
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-abgr b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-abgr
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-abgr
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-abgr
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-argb b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-argb
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-argb
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-argb
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-ayuv64le b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-ayuv64le
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-ayuv64le
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-ayuv64le
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-bgr0 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-bgr0
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-bgr0
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-bgr0
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-bgr24 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-bgr24
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-bgr24
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-bgr24
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-bgr444be b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-bgr444be
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-bgr444be
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-bgr444be
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-bgr444le b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-bgr444le
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-bgr444le
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-bgr444le
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-bgr48be b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-bgr48be
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-bgr48be
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-bgr48be
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-bgr48le b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-bgr48le
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-bgr48le
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-bgr48le
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-bgr4_byte b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-bgr4_byte
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-bgr4_byte
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-bgr4_byte
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-bgr555be b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-bgr555be
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-bgr555be
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-bgr555be
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-bgr555le b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-bgr555le
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-bgr555le
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-bgr555le
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-bgr565be b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-bgr565be
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-bgr565be
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-bgr565be
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-bgr565le b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-bgr565le
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-bgr565le
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-bgr565le
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-bgr8 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-bgr8
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-bgr8
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-bgr8
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-bgra b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-bgra
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-bgra
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-bgra
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-bgra64be b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-bgra64be
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-bgra64be
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-bgra64be
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-bgra64le b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-bgra64le
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-bgra64le
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-bgra64le
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-gbrap b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-gbrap
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-gbrap
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-gbrap
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-gbrap10be b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-gbrap10be
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-gbrap10be
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-gbrap10be
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-gbrap10le b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-gbrap10le
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-gbrap10le
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-gbrap10le
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-gbrap12be b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-gbrap12be
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-gbrap12be
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-gbrap12be
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-gbrap12le b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-gbrap12le
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-gbrap12le
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-gbrap12le
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-gbrap16be b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-gbrap16be
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-gbrap16be
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-gbrap16be
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-gbrap16le b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-gbrap16le
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-gbrap16le
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-gbrap16le
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-gbrp b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-gbrp
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-gbrp
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-gbrp
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-gbrp10be b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-gbrp10be
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-gbrp10be
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-gbrp10be
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-gbrp10le b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-gbrp10le
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-gbrp10le
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-gbrp10le
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-gbrp12be b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-gbrp12be
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-gbrp12be
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-gbrp12be
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-gbrp12le b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-gbrp12le
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-gbrp12le
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-gbrp12le
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-gbrp14be b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-gbrp14be
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-gbrp14be
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-gbrp14be
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-gbrp14le b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-gbrp14le
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-gbrp14le
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-gbrp14le
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-gbrp16be b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-gbrp16be
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-gbrp16be
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-gbrp16be
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-gbrp16le b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-gbrp16le
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-gbrp16le
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-gbrp16le
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-gbrp9be b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-gbrp9be
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-gbrp9be
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-gbrp9be
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-gbrp9le b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-gbrp9le
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-gbrp9le
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-gbrp9le
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-gray b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-gray
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-gray
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-gray
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-gray10be b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-gray10be
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-gray10be
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-gray10be
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-gray10le b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-gray10le
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-gray10le
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-gray10le
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-gray12be b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-gray12be
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-gray12be
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-gray12be
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-gray12le b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-gray12le
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-gray12le
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-gray12le
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-gray14be b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-gray14be
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-gray14be
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-gray14be
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-gray14le b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-gray14le
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-gray14le
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-gray14le
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-gray16be b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-gray16be
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-gray16be
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-gray16be
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-gray16le b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-gray16le
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-gray16le
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-gray16le
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-gray9be b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-gray9be
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-gray9be
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-gray9be
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-gray9le b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-gray9le
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-gray9le
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-gray9le
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-grayf32be b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-grayf32be
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-grayf32be
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-grayf32be
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-grayf32le b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-grayf32le
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-grayf32le
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-grayf32le
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-monob b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-monob
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-monob
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-monob
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-monow b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-monow
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-monow
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-monow
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-nv12 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-nv12
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-nv12
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-nv12
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-nv21 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-nv21
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-nv21
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-nv21
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-p010be b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-p010be
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-p010be
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-p010be
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-p010le b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-p010le
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-p010le
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-p010le
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-p016be b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-p016be
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-p016be
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-p016be
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-p016le b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-p016le
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-p016le
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-p016le
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-rgb0 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-rgb0
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-rgb0
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-rgb0
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-rgb24 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-rgb24
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-rgb24
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-rgb24
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-rgb444be b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-rgb444be
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-rgb444be
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-rgb444be
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-rgb444le b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-rgb444le
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-rgb444le
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-rgb444le
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-rgb48be b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-rgb48be
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-rgb48be
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-rgb48be
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-rgb48le b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-rgb48le
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-rgb48le
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-rgb48le
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-rgb4_byte b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-rgb4_byte
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-rgb4_byte
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-rgb4_byte
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-rgb555be b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-rgb555be
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-rgb555be
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-rgb555be
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-rgb555le b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-rgb555le
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-rgb555le
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-rgb555le
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-rgb565be b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-rgb565be
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-rgb565be
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-rgb565be
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-rgb565le b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-rgb565le
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-rgb565le
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-rgb565le
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-rgb8 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-rgb8
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-rgb8
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-rgb8
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-rgba b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-rgba
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-rgba
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-rgba
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-rgba64be b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-rgba64be
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-rgba64be
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-rgba64be
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-rgba64le b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-rgba64le
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-rgba64le
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-rgba64le
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-uyvy422 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-uyvy422
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-uyvy422
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-uyvy422
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-xyz12be b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-xyz12be
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-xyz12be
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-xyz12be
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-xyz12le b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-xyz12le
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-xyz12le
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-xyz12le
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-ya16be b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-ya16be
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-ya16be
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-ya16be
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-ya16le b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-ya16le
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-ya16le
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-ya16le
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-ya8 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-ya8
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-ya8
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-ya8
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-yuv410p b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-yuv410p
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-yuv410p
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-yuv410p
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-yuv411p b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-yuv411p
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-yuv411p
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-yuv411p
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-yuv420p b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-yuv420p
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-yuv420p
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-yuv420p
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-yuv420p10be b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-yuv420p10be
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-yuv420p10be
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-yuv420p10be
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-yuv420p10le b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-yuv420p10le
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-yuv420p10le
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-yuv420p10le
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-yuv420p12be b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-yuv420p12be
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-yuv420p12be
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-yuv420p12be
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-yuv420p12le b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-yuv420p12le
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-yuv420p12le
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-yuv420p12le
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-yuv420p14be b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-yuv420p14be
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-yuv420p14be
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-yuv420p14be
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-yuv420p14le b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-yuv420p14le
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-yuv420p14le
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-yuv420p14le
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-yuv420p16be b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-yuv420p16be
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-yuv420p16be
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-yuv420p16be
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-yuv420p16le b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-yuv420p16le
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-yuv420p16le
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-yuv420p16le
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-yuv420p9be b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-yuv420p9be
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-yuv420p9be
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-yuv420p9be
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-yuv420p9le b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-yuv420p9le
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-yuv420p9le
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-yuv420p9le
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-yuv422p b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-yuv422p
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-yuv422p
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-yuv422p
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-yuv422p10be b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-yuv422p10be
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-yuv422p10be
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-yuv422p10be
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-yuv422p10le b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-yuv422p10le
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-yuv422p10le
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-yuv422p10le
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-yuv422p12be b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-yuv422p12be
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-yuv422p12be
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-yuv422p12be
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-yuv422p12le b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-yuv422p12le
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-yuv422p12le
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-yuv422p12le
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-yuv422p14be b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-yuv422p14be
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-yuv422p14be
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-yuv422p14be
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-yuv422p14le b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-yuv422p14le
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-yuv422p14le
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-yuv422p14le
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-yuv422p16be b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-yuv422p16be
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-yuv422p16be
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-yuv422p16be
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-yuv422p16le b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-yuv422p16le
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-yuv422p16le
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-yuv422p16le
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-yuv422p9be b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-yuv422p9be
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-yuv422p9be
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-yuv422p9be
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-yuv422p9le b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-yuv422p9le
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-yuv422p9le
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-yuv422p9le
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-yuv440p b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-yuv440p
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-yuv440p
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-yuv440p
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-yuv440p10be b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-yuv440p10be
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-yuv440p10be
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-yuv440p10be
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-yuv440p10le b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-yuv440p10le
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-yuv440p10le
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-yuv440p10le
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-yuv440p12be b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-yuv440p12be
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-yuv440p12be
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-yuv440p12be
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-yuv440p12le b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-yuv440p12le
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-yuv440p12le
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-yuv440p12le
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-yuv444p b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-yuv444p
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-yuv444p
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-yuv444p
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-yuv444p10be b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-yuv444p10be
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-yuv444p10be
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-yuv444p10be
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-yuv444p10le b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-yuv444p10le
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-yuv444p10le
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-yuv444p10le
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-yuv444p12be b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-yuv444p12be
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-yuv444p12be
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-yuv444p12be
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-yuv444p12le b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-yuv444p12le
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-yuv444p12le
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-yuv444p12le
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-yuv444p14be b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-yuv444p14be
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-yuv444p14be
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-yuv444p14be
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-yuv444p14le b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-yuv444p14le
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-yuv444p14le
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-yuv444p14le
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-yuv444p16be b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-yuv444p16be
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-yuv444p16be
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-yuv444p16be
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-yuv444p16le b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-yuv444p16le
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-yuv444p16le
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-yuv444p16le
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-yuv444p9be b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-yuv444p9be
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-yuv444p9be
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-yuv444p9be
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-yuv444p9le b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-yuv444p9le
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-yuv444p9le
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-yuv444p9le
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-yuva420p b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-yuva420p
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-yuva420p
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-yuva420p
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-yuva420p10be b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-yuva420p10be
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-yuva420p10be
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-yuva420p10be
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-yuva420p10le b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-yuva420p10le
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-yuva420p10le
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-yuva420p10le
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-yuva420p16be b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-yuva420p16be
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-yuva420p16be
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-yuva420p16be
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-yuva420p16le b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-yuva420p16le
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-yuva420p16le
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-yuva420p16le
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-yuva420p9be b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-yuva420p9be
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-yuva420p9be
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-yuva420p9be
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-yuva420p9le b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-yuva420p9le
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-yuva420p9le
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-yuva420p9le
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-yuva422p b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-yuva422p
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-yuva422p
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-yuva422p
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-yuva422p10be b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-yuva422p10be
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-yuva422p10be
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-yuva422p10be
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-yuva422p10le b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-yuva422p10le
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-yuva422p10le
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-yuva422p10le
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-yuva422p16be b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-yuva422p16be
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-yuva422p16be
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-yuva422p16be
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-yuva422p16le b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-yuva422p16le
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-yuva422p16le
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-yuva422p16le
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-yuva422p9be b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-yuva422p9be
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-yuva422p9be
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-yuva422p9be
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-yuva422p9le b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-yuva422p9le
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-yuva422p9le
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-yuva422p9le
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-yuva444p b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-yuva444p
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-yuva444p
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-yuva444p
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-yuva444p10be b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-yuva444p10be
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-yuva444p10be
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-yuva444p10be
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-yuva444p10le b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-yuva444p10le
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-yuva444p10le
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-yuva444p10le
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-yuva444p16be b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-yuva444p16be
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-yuva444p16be
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-yuva444p16be
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-yuva444p16le b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-yuva444p16le
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-yuva444p16le
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-yuva444p16le
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-yuva444p9be b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-yuva444p9be
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-yuva444p9be
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-yuva444p9be
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-yuva444p9le b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-yuva444p9le
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-yuva444p9le
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-yuva444p9le
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-yuvj411p b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-yuvj411p
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-yuvj411p
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-yuvj411p
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-yuvj420p b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-yuvj420p
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-yuvj420p
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-yuvj420p
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-yuvj422p b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-yuvj422p
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-yuvj422p
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-yuvj422p
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-yuvj440p b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-yuvj440p
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-yuvj440p
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-yuvj440p
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-yuvj444p b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-yuvj444p
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-yuvj444p
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-yuvj444p
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-yuyv422 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-yuyv422
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-yuyv422
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-yuyv422
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-yvyu422 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-yvyu422
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-yvyu422
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixdesc-yvyu422
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixfmts-copy b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixfmts-copy
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixfmts-copy
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixfmts-copy
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixfmts-crop b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixfmts-crop
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixfmts-crop
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixfmts-crop
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixfmts-field b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixfmts-field
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixfmts-field
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixfmts-field
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixfmts-fieldmatch b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixfmts-fieldmatch
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixfmts-fieldmatch
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixfmts-fieldmatch
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixfmts-fieldorder b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixfmts-fieldorder
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixfmts-fieldorder
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixfmts-fieldorder
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixfmts-hflip b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixfmts-hflip
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixfmts-hflip
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixfmts-hflip
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixfmts-histeq b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixfmts-histeq
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixfmts-histeq
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixfmts-histeq
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixfmts-il b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixfmts-il
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixfmts-il
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixfmts-il
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixfmts-kerndeint b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixfmts-kerndeint
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixfmts-kerndeint
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixfmts-kerndeint
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixfmts-lut b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixfmts-lut
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixfmts-lut
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixfmts-lut
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixfmts-null b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixfmts-null
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixfmts-null
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixfmts-null
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixfmts-pad b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixfmts-pad
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixfmts-pad
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixfmts-pad
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixfmts-pullup b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixfmts-pullup
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixfmts-pullup
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixfmts-pullup
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixfmts-rotate b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixfmts-rotate
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixfmts-rotate
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixfmts-rotate
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixfmts-scale b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixfmts-scale
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixfmts-scale
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixfmts-scale
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixfmts-super2xsai b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixfmts-super2xsai
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixfmts-super2xsai
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixfmts-super2xsai
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixfmts-swapuv b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixfmts-swapuv
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixfmts-swapuv
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixfmts-swapuv
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixfmts-tinterlace_cvlpf b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixfmts-tinterlace_cvlpf
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixfmts-tinterlace_cvlpf
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixfmts-tinterlace_cvlpf
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixfmts-tinterlace_merge b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixfmts-tinterlace_merge
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixfmts-tinterlace_merge
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixfmts-tinterlace_merge
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixfmts-tinterlace_pad b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixfmts-tinterlace_pad
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixfmts-tinterlace_pad
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixfmts-tinterlace_pad
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixfmts-tinterlace_vlpf b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixfmts-tinterlace_vlpf
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixfmts-tinterlace_vlpf
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixfmts-tinterlace_vlpf
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixfmts-transpose b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixfmts-transpose
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixfmts-transpose
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixfmts-transpose
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixfmts-vflip b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixfmts-vflip
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixfmts-vflip
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pixfmts-vflip
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pp b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pp
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pp
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pp
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pp1 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pp1
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pp1
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pp1
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pp2 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pp2
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pp2
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pp2
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pp3 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pp3
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pp3
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pp3
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pp4 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pp4
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pp4
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pp4
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pp5 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pp5
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pp5
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pp5
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pp6 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pp6
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pp6
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-pp6
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-qp b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-qp
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-qp
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-qp
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-refcmp-psnr-rgb b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-refcmp-psnr-rgb
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-refcmp-psnr-rgb
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-refcmp-psnr-rgb
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-refcmp-psnr-yuv b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-refcmp-psnr-yuv
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-refcmp-psnr-yuv
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-refcmp-psnr-yuv
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-refcmp-ssim-rgb b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-refcmp-ssim-rgb
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-refcmp-ssim-rgb
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-refcmp-ssim-rgb
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-refcmp-ssim-yuv b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-refcmp-ssim-yuv
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-refcmp-ssim-yuv
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-refcmp-ssim-yuv
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-removegrain-mode-00 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-removegrain-mode-00
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-removegrain-mode-00
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-removegrain-mode-00
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-removegrain-mode-01 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-removegrain-mode-01
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-removegrain-mode-01
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-removegrain-mode-01
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-removegrain-mode-02 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-removegrain-mode-02
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-removegrain-mode-02
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-removegrain-mode-02
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-removegrain-mode-03 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-removegrain-mode-03
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-removegrain-mode-03
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-removegrain-mode-03
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-removegrain-mode-04 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-removegrain-mode-04
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-removegrain-mode-04
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-removegrain-mode-04
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-removegrain-mode-05 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-removegrain-mode-05
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-removegrain-mode-05
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-removegrain-mode-05
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-removegrain-mode-06 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-removegrain-mode-06
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-removegrain-mode-06
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-removegrain-mode-06
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-removegrain-mode-07 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-removegrain-mode-07
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-removegrain-mode-07
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-removegrain-mode-07
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-removegrain-mode-08 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-removegrain-mode-08
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-removegrain-mode-08
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-removegrain-mode-08
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-removegrain-mode-09 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-removegrain-mode-09
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-removegrain-mode-09
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-removegrain-mode-09
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-removegrain-mode-10 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-removegrain-mode-10
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-removegrain-mode-10
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-removegrain-mode-10
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-removegrain-mode-11 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-removegrain-mode-11
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-removegrain-mode-11
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-removegrain-mode-11
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-removegrain-mode-12 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-removegrain-mode-12
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-removegrain-mode-12
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-removegrain-mode-12
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-removegrain-mode-13 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-removegrain-mode-13
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-removegrain-mode-13
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-removegrain-mode-13
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-removegrain-mode-14 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-removegrain-mode-14
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-removegrain-mode-14
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-removegrain-mode-14
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-removegrain-mode-15 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-removegrain-mode-15
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-removegrain-mode-15
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-removegrain-mode-15
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-removegrain-mode-16 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-removegrain-mode-16
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-removegrain-mode-16
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-removegrain-mode-16
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-removegrain-mode-17 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-removegrain-mode-17
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-removegrain-mode-17
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-removegrain-mode-17
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-removegrain-mode-18 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-removegrain-mode-18
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-removegrain-mode-18
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-removegrain-mode-18
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-removegrain-mode-19 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-removegrain-mode-19
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-removegrain-mode-19
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-removegrain-mode-19
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-removegrain-mode-20 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-removegrain-mode-20
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-removegrain-mode-20
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-removegrain-mode-20
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-removegrain-mode-21 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-removegrain-mode-21
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-removegrain-mode-21
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-removegrain-mode-21
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-removegrain-mode-22 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-removegrain-mode-22
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-removegrain-mode-22
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-removegrain-mode-22
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-removegrain-mode-23 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-removegrain-mode-23
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-removegrain-mode-23
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-removegrain-mode-23
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-removegrain-mode-24 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-removegrain-mode-24
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-removegrain-mode-24
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-removegrain-mode-24
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-rgbtestsrc b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-rgbtestsrc
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-rgbtestsrc
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-rgbtestsrc
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-scale200 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-scale200
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-scale200
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-scale200
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-scale2ref_keep_aspect b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-scale2ref_keep_aspect
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-scale2ref_keep_aspect
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-scale2ref_keep_aspect
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-scale500 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-scale500
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-scale500
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-scale500
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-scalechroma b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-scalechroma
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-scalechroma
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-scalechroma
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-select b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-select
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-select
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-select
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-select-alternate b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-select-alternate
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-select-alternate
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-select-alternate
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-separatefields b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-separatefields
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-separatefields
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-separatefields
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-setdar b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-setdar
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-setdar
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-setdar
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-setpts b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-setpts
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-setpts
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-setpts
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-setsar b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-setsar
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-setsar
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-setsar
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-showpalette b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-showpalette
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-showpalette
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-showpalette
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-shuffleframes b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-shuffleframes
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-shuffleframes
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-shuffleframes
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-shuffleplanes-dup-luma b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-shuffleplanes-dup-luma
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-shuffleplanes-dup-luma
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-shuffleplanes-dup-luma
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-shuffleplanes-swapuv b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-shuffleplanes-swapuv
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-shuffleplanes-swapuv
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-shuffleplanes-swapuv
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-silenceremove b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-silenceremove
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-silenceremove
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-silenceremove
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-smptebars b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-smptebars
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-smptebars
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-smptebars
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-smptehdbars b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-smptehdbars
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-smptehdbars
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-smptehdbars
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-stereo3d-abr-ml b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-stereo3d-abr-ml
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-stereo3d-abr-ml
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-stereo3d-abr-ml
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-stereo3d-abr-mr b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-stereo3d-abr-mr
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-stereo3d-abr-mr
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-stereo3d-abr-mr
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-stereo3d-al-sbsl b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-stereo3d-al-sbsl
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-stereo3d-al-sbsl
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-stereo3d-al-sbsl
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-stereo3d-ar-abl b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-stereo3d-ar-abl
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-stereo3d-ar-abl
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-stereo3d-ar-abl
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-stereo3d-sbsl-abl b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-stereo3d-sbsl-abl
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-stereo3d-sbsl-abl
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-stereo3d-sbsl-abl
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-stereo3d-sbsl-abr b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-stereo3d-sbsl-abr
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-stereo3d-sbsl-abr
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-stereo3d-sbsl-abr
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-stereo3d-sbsl-agmc b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-stereo3d-sbsl-agmc
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-stereo3d-sbsl-agmc
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-stereo3d-sbsl-agmc
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-stereo3d-sbsl-agmd b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-stereo3d-sbsl-agmd
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-stereo3d-sbsl-agmd
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-stereo3d-sbsl-agmd
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-stereo3d-sbsl-agmg b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-stereo3d-sbsl-agmg
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-stereo3d-sbsl-agmg
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-stereo3d-sbsl-agmg
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-stereo3d-sbsl-agmh b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-stereo3d-sbsl-agmh
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-stereo3d-sbsl-agmh
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-stereo3d-sbsl-agmh
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-stereo3d-sbsl-al b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-stereo3d-sbsl-al
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-stereo3d-sbsl-al
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-stereo3d-sbsl-al
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-stereo3d-sbsl-arbg b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-stereo3d-sbsl-arbg
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-stereo3d-sbsl-arbg
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-stereo3d-sbsl-arbg
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-stereo3d-sbsl-arcc b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-stereo3d-sbsl-arcc
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-stereo3d-sbsl-arcc
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-stereo3d-sbsl-arcc
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-stereo3d-sbsl-arcd b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-stereo3d-sbsl-arcd
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-stereo3d-sbsl-arcd
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-stereo3d-sbsl-arcd
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-stereo3d-sbsl-arcg b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-stereo3d-sbsl-arcg
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-stereo3d-sbsl-arcg
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-stereo3d-sbsl-arcg
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-stereo3d-sbsl-arch b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-stereo3d-sbsl-arch
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-stereo3d-sbsl-arch
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-stereo3d-sbsl-arch
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-stereo3d-sbsl-argg b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-stereo3d-sbsl-argg
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-stereo3d-sbsl-argg
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-stereo3d-sbsl-argg
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-stereo3d-sbsl-aybc b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-stereo3d-sbsl-aybc
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-stereo3d-sbsl-aybc
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-stereo3d-sbsl-aybc
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-stereo3d-sbsl-aybd b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-stereo3d-sbsl-aybd
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-stereo3d-sbsl-aybd
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-stereo3d-sbsl-aybd
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-stereo3d-sbsl-aybg b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-stereo3d-sbsl-aybg
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-stereo3d-sbsl-aybg
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-stereo3d-sbsl-aybg
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-stereo3d-sbsl-aybh b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-stereo3d-sbsl-aybh
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-stereo3d-sbsl-aybh
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-stereo3d-sbsl-aybh
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-stereo3d-sbsl-sbsr b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-stereo3d-sbsl-sbsr
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-stereo3d-sbsl-sbsr
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-stereo3d-sbsl-sbsr
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-stereotools b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-stereotools
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-stereotools
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-stereotools
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-swaprect b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-swaprect
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-swaprect
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-swaprect
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-tblend b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-tblend
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-tblend
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-tblend
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-telecine b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-telecine
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-telecine
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-telecine
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-testsrc2-rgb24 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-testsrc2-rgb24
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-testsrc2-rgb24
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-testsrc2-rgb24
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-testsrc2-rgba b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-testsrc2-rgba
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-testsrc2-rgba
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-testsrc2-rgba
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-testsrc2-yuv420p b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-testsrc2-yuv420p
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-testsrc2-yuv420p
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-testsrc2-yuv420p
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-testsrc2-yuv444p b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-testsrc2-yuv444p
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-testsrc2-yuv444p
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-testsrc2-yuv444p
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-thumbnail b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-thumbnail
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-thumbnail
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-thumbnail
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-tile b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-tile
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-tile
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-tile
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-transpose b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-transpose
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-transpose
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-transpose
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-tremolo b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-tremolo
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-tremolo
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-tremolo
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-trim-duration b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-trim-duration
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-trim-duration
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-trim-duration
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-trim-frame b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-trim-frame
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-trim-frame
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-trim-frame
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-trim-mixed b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-trim-mixed
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-trim-mixed
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-trim-mixed
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-trim-time b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-trim-time
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-trim-time
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-trim-time
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-unsharp b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-unsharp
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-unsharp
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-unsharp
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-vectorscope_color b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-vectorscope_color
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-vectorscope_color
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-vectorscope_color
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-vectorscope_color2 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-vectorscope_color2
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-vectorscope_color2
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-vectorscope_color2
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-vectorscope_color3 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-vectorscope_color3
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-vectorscope_color3
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-vectorscope_color3
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-vectorscope_color4 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-vectorscope_color4
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-vectorscope_color4
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-vectorscope_color4
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-vectorscope_gray b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-vectorscope_gray
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-vectorscope_gray
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-vectorscope_gray
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-vectorscope_xy b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-vectorscope_xy
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-vectorscope_xy
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-vectorscope_xy
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-vflip b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-vflip
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-vflip
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-vflip
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-vflip_crop b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-vflip_crop
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-vflip_crop
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-vflip_crop
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-vflip_vflip b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-vflip_vflip
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-vflip_vflip
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-vflip_vflip
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-vstack b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-vstack
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-vstack
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-vstack
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-w3fdif-complex b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-w3fdif-complex
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-w3fdif-complex
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-w3fdif-complex
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-w3fdif-simple b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-w3fdif-simple
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-w3fdif-simple
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-w3fdif-simple
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-waveform_column b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-waveform_column
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-waveform_column
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-waveform_column
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-waveform_envelope b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-waveform_envelope
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-waveform_envelope
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-waveform_envelope
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-waveform_row b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-waveform_row
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-waveform_row
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-waveform_row
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-waveform_uv b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-waveform_uv
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-waveform_uv
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-waveform_uv
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-weave b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-weave
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-weave
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-weave
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-yadif-mode0 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-yadif-mode0
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-yadif-mode0
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-yadif-mode0
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-yadif-mode1 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-yadif-mode1
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-yadif-mode1
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-yadif-mode1
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-yadif10 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-yadif10
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-yadif10
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-yadif10
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-yadif16 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-yadif16
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-yadif16
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-yadif16
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-yuvtestsrc-yuv444p b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-yuvtestsrc-yuv444p
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-yuvtestsrc-yuv444p
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-yuvtestsrc-yuv444p
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-yuvtestsrc-yuv444p12 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-yuvtestsrc-yuv444p12
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-yuvtestsrc-yuv444p12
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/filter-yuvtestsrc-yuv444p12
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/fits-demux b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/fits-demux
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/fits-demux
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/fits-demux
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/fitsdec-bitpix-32 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/fitsdec-bitpix-32
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/fitsdec-bitpix-32
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/fitsdec-bitpix-32
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/fitsdec-bitpix-64 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/fitsdec-bitpix-64
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/fitsdec-bitpix-64
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/fitsdec-bitpix-64
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/fitsdec-blank_bitpix32 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/fitsdec-blank_bitpix32
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/fitsdec-blank_bitpix32
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/fitsdec-blank_bitpix32
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/fitsdec-ext_data_min_max b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/fitsdec-ext_data_min_max
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/fitsdec-ext_data_min_max
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/fitsdec-ext_data_min_max
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/fitsdec-gbrap16le b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/fitsdec-gbrap16le
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/fitsdec-gbrap16le
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/fitsdec-gbrap16le
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/fitsdec-gbrp b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/fitsdec-gbrp
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/fitsdec-gbrp
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/fitsdec-gbrp
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/fitsdec-gbrp16 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/fitsdec-gbrp16
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/fitsdec-gbrp16
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/fitsdec-gbrp16
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/fitsdec-gray b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/fitsdec-gray
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/fitsdec-gray
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/fitsdec-gray
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/fitsdec-multi b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/fitsdec-multi
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/fitsdec-multi
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/fitsdec-multi
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/fitsenc-gbrap b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/fitsenc-gbrap
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/fitsenc-gbrap
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/fitsenc-gbrap
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/fitsenc-gbrap16be b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/fitsenc-gbrap16be
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/fitsenc-gbrap16be
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/fitsenc-gbrap16be
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/fitsenc-gbrp b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/fitsenc-gbrp
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/fitsenc-gbrp
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/fitsenc-gbrp
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/fitsenc-gbrp16be b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/fitsenc-gbrp16be
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/fitsenc-gbrp16be
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/fitsenc-gbrp16be
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/fitsenc-gray b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/fitsenc-gray
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/fitsenc-gray
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/fitsenc-gray
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/fitsenc-gray16be b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/fitsenc-gray16be
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/fitsenc-gray16be
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/fitsenc-gray16be
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/flcl1905 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/flcl1905
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/flcl1905
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/flcl1905
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/flic-af11-palette-change b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/flic-af11-palette-change
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/flic-af11-palette-change
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/flic-af11-palette-change
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/flic-af12 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/flic-af12
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/flic-af12
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/flic-af12
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/flic-magiccarpet b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/flic-magiccarpet
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/flic-magiccarpet
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/flic-magiccarpet
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/flv-add_keyframe_index b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/flv-add_keyframe_index
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/flv-add_keyframe_index
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/flv-add_keyframe_index
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/flv-demux b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/flv-demux
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/flv-demux
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/flv-demux
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/fmvc-type1 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/fmvc-type1
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/fmvc-type1
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/fmvc-type1
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/fmvc-type2 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/fmvc-type2
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/fmvc-type2
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/fmvc-type2
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/force_key_frames b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/force_key_frames
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/force_key_frames
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/force_key_frames
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/fraps-v0 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/fraps-v0
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/fraps-v0
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/fraps-v0
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/fraps-v1 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/fraps-v1
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/fraps-v1
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/fraps-v1
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/fraps-v2 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/fraps-v2
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/fraps-v2
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/fraps-v2
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/fraps-v3 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/fraps-v3
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/fraps-v3
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/fraps-v3
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/fraps-v4 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/fraps-v4
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/fraps-v4
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/fraps-v4
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/fraps-v5 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/fraps-v5
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/fraps-v5
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/fraps-v5
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/frwu b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/frwu
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/frwu
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/frwu
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/g2m2 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/g2m2
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/g2m2
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/g2m2
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/g2m3 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/g2m3
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/g2m3
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/g2m3
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/g2m4 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/g2m4
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/g2m4
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/g2m4
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/g722-encode b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/g722-encode
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/g722-encode
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/g722-encode
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/g722dec-1 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/g722dec-1
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/g722dec-1
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/g722dec-1
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/g723_1-dec-1 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/g723_1-dec-1
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/g723_1-dec-1
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/g723_1-dec-1
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/g723_1-dec-2 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/g723_1-dec-2
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/g723_1-dec-2
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/g723_1-dec-2
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/g723_1-dec-3 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/g723_1-dec-3
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/g723_1-dec-3
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/g723_1-dec-3
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/g723_1-dec-4 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/g723_1-dec-4
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/g723_1-dec-4
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/g723_1-dec-4
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/g723_1-dec-5 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/g723_1-dec-5
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/g723_1-dec-5
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/g723_1-dec-5
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/g723_1-dec-6 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/g723_1-dec-6
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/g723_1-dec-6
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/g723_1-dec-6
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/g723_1-dec-7 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/g723_1-dec-7
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/g723_1-dec-7
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/g723_1-dec-7
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/g723_1-dec-8 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/g723_1-dec-8
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/g723_1-dec-8
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/g723_1-dec-8
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/g726-encode-2bit b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/g726-encode-2bit
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/g726-encode-2bit
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/g726-encode-2bit
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/g726-encode-3bit b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/g726-encode-3bit
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/g726-encode-3bit
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/g726-encode-3bit
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/g726-encode-4bit b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/g726-encode-4bit
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/g726-encode-4bit
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/g726-encode-4bit
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/g726-encode-5bit b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/g726-encode-5bit
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/g726-encode-5bit
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/g726-encode-5bit
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/g729-0 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/g729-0
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/g729-0
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/g729-0
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/g729-1 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/g729-1
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/g729-1
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/g729-1
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/gapless-mp3 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/gapless-mp3
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/gapless-mp3
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/gapless-mp3
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/gaplessenc-itunes-to-ipod-aac b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/gaplessenc-itunes-to-ipod-aac
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/gaplessenc-itunes-to-ipod-aac
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/gaplessenc-itunes-to-ipod-aac
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/gaplessenc-pcm-to-mov-aac b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/gaplessenc-pcm-to-mov-aac
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/gaplessenc-pcm-to-mov-aac
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/gaplessenc-pcm-to-mov-aac
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/gaplessinfo-itunes1 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/gaplessinfo-itunes1
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/gaplessinfo-itunes1
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/gaplessinfo-itunes1
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/gaplessinfo-itunes2 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/gaplessinfo-itunes2
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/gaplessinfo-itunes2
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/gaplessinfo-itunes2
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/gif-color b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/gif-color
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/gif-color
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/gif-color
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/gif-deal b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/gif-deal
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/gif-deal
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/gif-deal
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/gif-demux b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/gif-demux
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/gif-demux
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/gif-demux
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/gif-disposal-background b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/gif-disposal-background
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/gif-disposal-background
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/gif-disposal-background
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/gif-disposal-restore b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/gif-disposal-restore
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/gif-disposal-restore
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/gif-disposal-restore
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/gif-gray b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/gif-gray
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/gif-gray
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/gif-gray
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/gifenc-bgr4_byte b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/gifenc-bgr4_byte
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/gifenc-bgr4_byte
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/gifenc-bgr4_byte
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/gifenc-bgr8 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/gifenc-bgr8
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/gifenc-bgr8
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/gifenc-bgr8
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/gifenc-gray b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/gifenc-gray
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/gifenc-gray
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/gifenc-gray
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/gifenc-pal8 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/gifenc-pal8
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/gifenc-pal8
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/gifenc-pal8
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/gifenc-rgb4_byte b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/gifenc-rgb4_byte
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/gifenc-rgb4_byte
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/gifenc-rgb4_byte
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/gifenc-rgb8 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/gifenc-rgb8
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/gifenc-rgb8
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/gifenc-rgb8
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/gsm-ms b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/gsm-ms
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/gsm-ms
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/gsm-ms
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/gsm-toast b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/gsm-toast
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/gsm-toast
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/gsm-toast
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-3386 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-3386
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-3386
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-3386
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-attachment-631 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-attachment-631
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-attachment-631
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-attachment-631
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-brokensps-2580 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-brokensps-2580
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-brokensps-2580
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-brokensps-2580
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-bsf-mp4toannexb b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-bsf-mp4toannexb
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-bsf-mp4toannexb
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-bsf-mp4toannexb
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-aud_mw_e b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-aud_mw_e
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-aud_mw_e
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-aud_mw_e
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-ba1_ft_c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-ba1_ft_c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-ba1_ft_c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-ba1_ft_c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-ba1_sony_d b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-ba1_sony_d
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-ba1_sony_d
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-ba1_sony_d
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-ba2_sony_f b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-ba2_sony_f
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-ba2_sony_f
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-ba2_sony_f
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-ba3_sva_c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-ba3_sva_c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-ba3_sva_c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-ba3_sva_c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-ba_mw_d b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-ba_mw_d
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-ba_mw_d
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-ba_mw_d
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-bamq1_jvc_c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-bamq1_jvc_c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-bamq1_jvc_c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-bamq1_jvc_c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-bamq2_jvc_c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-bamq2_jvc_c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-bamq2_jvc_c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-bamq2_jvc_c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-banm_mw_d b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-banm_mw_d
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-banm_mw_d
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-banm_mw_d
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-basqp1_sony_c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-basqp1_sony_c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-basqp1_sony_c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-basqp1_sony_c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-caba1_sony_d b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-caba1_sony_d
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-caba1_sony_d
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-caba1_sony_d
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-caba1_sva_b b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-caba1_sva_b
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-caba1_sva_b
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-caba1_sva_b
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-caba2_sony_e b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-caba2_sony_e
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-caba2_sony_e
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-caba2_sony_e
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-caba2_sva_b b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-caba2_sva_b
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-caba2_sva_b
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-caba2_sva_b
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-caba3_sony_c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-caba3_sony_c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-caba3_sony_c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-caba3_sony_c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-caba3_sva_b b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-caba3_sva_b
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-caba3_sva_b
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-caba3_sva_b
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-caba3_toshiba_e b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-caba3_toshiba_e
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-caba3_toshiba_e
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-caba3_toshiba_e
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-cabac_mot_fld0_full b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-cabac_mot_fld0_full
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-cabac_mot_fld0_full
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-cabac_mot_fld0_full
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-cabac_mot_frm0_full b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-cabac_mot_frm0_full
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-cabac_mot_frm0_full
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-cabac_mot_frm0_full
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-cabac_mot_mbaff0_full b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-cabac_mot_mbaff0_full
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-cabac_mot_mbaff0_full
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-cabac_mot_mbaff0_full
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-cabac_mot_picaff0_full b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-cabac_mot_picaff0_full
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-cabac_mot_picaff0_full
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-cabac_mot_picaff0_full
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-cabaci3_sony_b b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-cabaci3_sony_b
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-cabaci3_sony_b
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-cabaci3_sony_b
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-cabast3_sony_e b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-cabast3_sony_e
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-cabast3_sony_e
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-cabast3_sony_e
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-cabastbr3_sony_b b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-cabastbr3_sony_b
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-cabastbr3_sony_b
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-cabastbr3_sony_b
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-cabref3_sand_d b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-cabref3_sand_d
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-cabref3_sand_d
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-cabref3_sand_d
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-cacqp3_sony_d b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-cacqp3_sony_d
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-cacqp3_sony_d
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-cacqp3_sony_d
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-cafi1_sva_c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-cafi1_sva_c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-cafi1_sva_c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-cafi1_sva_c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-cama1_sony_c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-cama1_sony_c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-cama1_sony_c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-cama1_sony_c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-cama1_toshiba_b b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-cama1_toshiba_b
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-cama1_toshiba_b
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-cama1_toshiba_b
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-cama1_vtc_c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-cama1_vtc_c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-cama1_vtc_c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-cama1_vtc_c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-cama2_vtc_b b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-cama2_vtc_b
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-cama2_vtc_b
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-cama2_vtc_b
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-cama3_sand_e b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-cama3_sand_e
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-cama3_sand_e
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-cama3_sand_e
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-cama3_vtc_b b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-cama3_vtc_b
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-cama3_vtc_b
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-cama3_vtc_b
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-camaci3_sony_c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-camaci3_sony_c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-camaci3_sony_c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-camaci3_sony_c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-camanl1_toshiba_b b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-camanl1_toshiba_b
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-camanl1_toshiba_b
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-camanl1_toshiba_b
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-camanl2_toshiba_b b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-camanl2_toshiba_b
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-camanl2_toshiba_b
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-camanl2_toshiba_b
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-camanl3_sand_e b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-camanl3_sand_e
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-camanl3_sand_e
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-camanl3_sand_e
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-camasl3_sony_b b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-camasl3_sony_b
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-camasl3_sony_b
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-camasl3_sony_b
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-camp_mot_mbaff_l30 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-camp_mot_mbaff_l30
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-camp_mot_mbaff_l30
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-camp_mot_mbaff_l30
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-camp_mot_mbaff_l31 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-camp_mot_mbaff_l31
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-camp_mot_mbaff_l31
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-camp_mot_mbaff_l31
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-canl1_sony_e b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-canl1_sony_e
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-canl1_sony_e
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-canl1_sony_e
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-canl1_sva_b b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-canl1_sva_b
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-canl1_sva_b
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-canl1_sva_b
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-canl1_toshiba_g b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-canl1_toshiba_g
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-canl1_toshiba_g
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-canl1_toshiba_g
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-canl2_sony_e b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-canl2_sony_e
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-canl2_sony_e
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-canl2_sony_e
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-canl2_sva_b b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-canl2_sva_b
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-canl2_sva_b
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-canl2_sva_b
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-canl3_sony_c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-canl3_sony_c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-canl3_sony_c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-canl3_sony_c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-canl3_sva_b b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-canl3_sva_b
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-canl3_sva_b
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-canl3_sva_b
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-canl4_sva_b b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-canl4_sva_b
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-canl4_sva_b
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-canl4_sva_b
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-canlma2_sony_c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-canlma2_sony_c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-canlma2_sony_c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-canlma2_sony_c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-canlma3_sony_c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-canlma3_sony_c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-canlma3_sony_c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-canlma3_sony_c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-capa1_toshiba_b b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-capa1_toshiba_b
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-capa1_toshiba_b
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-capa1_toshiba_b
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-capama3_sand_f b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-capama3_sand_f
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-capama3_sand_f
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-capama3_sand_f
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-capcm1_sand_e b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-capcm1_sand_e
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-capcm1_sand_e
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-capcm1_sand_e
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-capcmnl1_sand_e b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-capcmnl1_sand_e
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-capcmnl1_sand_e
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-capcmnl1_sand_e
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-capm3_sony_d b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-capm3_sony_d
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-capm3_sony_d
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-capm3_sony_d
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-caqp1_sony_b b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-caqp1_sony_b
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-caqp1_sony_b
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-caqp1_sony_b
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-cavlc_mot_fld0_full_b b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-cavlc_mot_fld0_full_b
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-cavlc_mot_fld0_full_b
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-cavlc_mot_fld0_full_b
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-cavlc_mot_frm0_full_b b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-cavlc_mot_frm0_full_b
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-cavlc_mot_frm0_full_b
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-cavlc_mot_frm0_full_b
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-cavlc_mot_mbaff0_full_b b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-cavlc_mot_mbaff0_full_b
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-cavlc_mot_mbaff0_full_b
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-cavlc_mot_mbaff0_full_b
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-cavlc_mot_picaff0_full_b b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-cavlc_mot_picaff0_full_b
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-cavlc_mot_picaff0_full_b
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-cavlc_mot_picaff0_full_b
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-cawp1_toshiba_e b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-cawp1_toshiba_e
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-cawp1_toshiba_e
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-cawp1_toshiba_e
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-cawp5_toshiba_e b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-cawp5_toshiba_e
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-cawp5_toshiba_e
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-cawp5_toshiba_e
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-ci1_ft_b b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-ci1_ft_b
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-ci1_ft_b
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-ci1_ft_b
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-ci_mw_d b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-ci_mw_d
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-ci_mw_d
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-ci_mw_d
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-cvbs3_sony_c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-cvbs3_sony_c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-cvbs3_sony_c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-cvbs3_sony_c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-cvcanlma2_sony_c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-cvcanlma2_sony_c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-cvcanlma2_sony_c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-cvcanlma2_sony_c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-cvfc1_sony_c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-cvfc1_sony_c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-cvfc1_sony_c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-cvfc1_sony_c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-cvfi1_sony_d b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-cvfi1_sony_d
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-cvfi1_sony_d
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-cvfi1_sony_d
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-cvfi1_sva_c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-cvfi1_sva_c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-cvfi1_sva_c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-cvfi1_sva_c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-cvfi2_sony_h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-cvfi2_sony_h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-cvfi2_sony_h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-cvfi2_sony_h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-cvfi2_sva_c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-cvfi2_sva_c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-cvfi2_sva_c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-cvfi2_sva_c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-cvma1_sony_d b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-cvma1_sony_d
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-cvma1_sony_d
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-cvma1_sony_d
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-cvma1_toshiba_b b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-cvma1_toshiba_b
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-cvma1_toshiba_b
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-cvma1_toshiba_b
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-cvmanl1_toshiba_b b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-cvmanl1_toshiba_b
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-cvmanl1_toshiba_b
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-cvmanl1_toshiba_b
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-cvmanl2_toshiba_b b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-cvmanl2_toshiba_b
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-cvmanl2_toshiba_b
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-cvmanl2_toshiba_b
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-cvmapaqp3_sony_e b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-cvmapaqp3_sony_e
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-cvmapaqp3_sony_e
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-cvmapaqp3_sony_e
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-cvmaqp2_sony_g b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-cvmaqp2_sony_g
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-cvmaqp2_sony_g
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-cvmaqp2_sony_g
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-cvmaqp3_sony_d b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-cvmaqp3_sony_d
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-cvmaqp3_sony_d
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-cvmaqp3_sony_d
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-cvmp_mot_fld_l30_b b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-cvmp_mot_fld_l30_b
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-cvmp_mot_fld_l30_b
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-cvmp_mot_fld_l30_b
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-cvmp_mot_frm_l31_b b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-cvmp_mot_frm_l31_b
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-cvmp_mot_frm_l31_b
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-cvmp_mot_frm_l31_b
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-cvnlfi1_sony_c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-cvnlfi1_sony_c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-cvnlfi1_sony_c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-cvnlfi1_sony_c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-cvnlfi2_sony_h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-cvnlfi2_sony_h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-cvnlfi2_sony_h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-cvnlfi2_sony_h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-cvpa1_toshiba_b b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-cvpa1_toshiba_b
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-cvpa1_toshiba_b
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-cvpa1_toshiba_b
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-cvpcmnl1_sva_c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-cvpcmnl1_sva_c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-cvpcmnl1_sva_c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-cvpcmnl1_sva_c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-cvpcmnl2_sva_c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-cvpcmnl2_sva_c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-cvpcmnl2_sva_c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-cvpcmnl2_sva_c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-cvwp1_toshiba_e b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-cvwp1_toshiba_e
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-cvwp1_toshiba_e
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-cvwp1_toshiba_e
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-cvwp2_toshiba_e b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-cvwp2_toshiba_e
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-cvwp2_toshiba_e
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-cvwp2_toshiba_e
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-cvwp3_toshiba_e b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-cvwp3_toshiba_e
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-cvwp3_toshiba_e
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-cvwp3_toshiba_e
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-cvwp5_toshiba_e b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-cvwp5_toshiba_e
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-cvwp5_toshiba_e
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-cvwp5_toshiba_e
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-fi1_sony_e b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-fi1_sony_e
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-fi1_sony_e
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-fi1_sony_e
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-frext-alphaconformanceg b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-frext-alphaconformanceg
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-frext-alphaconformanceg
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-frext-alphaconformanceg
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-frext-bcrm_freh10 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-frext-bcrm_freh10
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-frext-bcrm_freh10
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-frext-bcrm_freh10
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-frext-brcm_freh11 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-frext-brcm_freh11
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-frext-brcm_freh11
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-frext-brcm_freh11
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-frext-brcm_freh3 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-frext-brcm_freh3
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-frext-brcm_freh3
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-frext-brcm_freh3
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-frext-brcm_freh4 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-frext-brcm_freh4
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-frext-brcm_freh4
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-frext-brcm_freh4
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-frext-brcm_freh5 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-frext-brcm_freh5
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-frext-brcm_freh5
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-frext-brcm_freh5
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-frext-brcm_freh8 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-frext-brcm_freh8
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-frext-brcm_freh8
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-frext-brcm_freh8
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-frext-brcm_freh9 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-frext-brcm_freh9
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-frext-brcm_freh9
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-frext-brcm_freh9
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-frext-freh12_b b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-frext-freh12_b
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-frext-freh12_b
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-frext-freh12_b
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-frext-freh1_b b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-frext-freh1_b
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-frext-freh1_b
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-frext-freh1_b
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-frext-freh2_b b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-frext-freh2_b
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-frext-freh2_b
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-frext-freh2_b
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-frext-freh6 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-frext-freh6
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-frext-freh6
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-frext-freh6
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-frext-freh7_b b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-frext-freh7_b
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-frext-freh7_b
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-frext-freh7_b
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-frext-frext01_jvc_d b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-frext-frext01_jvc_d
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-frext-frext01_jvc_d
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-frext-frext01_jvc_d
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-frext-frext02_jvc_c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-frext-frext02_jvc_c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-frext-frext02_jvc_c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-frext-frext02_jvc_c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-frext-frext1_panasonic_c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-frext-frext1_panasonic_c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-frext-frext1_panasonic_c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-frext-frext1_panasonic_c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-frext-frext2_panasonic_b b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-frext-frext2_panasonic_b
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-frext-frext2_panasonic_b
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-frext-frext2_panasonic_b
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-frext-frext3_panasonic_d b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-frext-frext3_panasonic_d
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-frext-frext3_panasonic_d
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-frext-frext3_panasonic_d
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-frext-frext4_panasonic_a b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-frext-frext4_panasonic_a
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-frext-frext4_panasonic_a
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-frext-frext4_panasonic_a
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-frext-frext_mmco4_sony_b b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-frext-frext_mmco4_sony_b
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-frext-frext_mmco4_sony_b
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-frext-frext_mmco4_sony_b
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-frext-hcaff1_hhi_b b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-frext-hcaff1_hhi_b
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-frext-hcaff1_hhi_b
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-frext-hcaff1_hhi_b
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-frext-hcafr1_hhi_c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-frext-hcafr1_hhi_c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-frext-hcafr1_hhi_c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-frext-hcafr1_hhi_c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-frext-hcafr2_hhi_a b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-frext-hcafr2_hhi_a
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-frext-hcafr2_hhi_a
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-frext-hcafr2_hhi_a
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-frext-hcafr3_hhi_a b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-frext-hcafr3_hhi_a
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-frext-hcafr3_hhi_a
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-frext-hcafr3_hhi_a
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-frext-hcafr4_hhi_a b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-frext-hcafr4_hhi_a
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-frext-hcafr4_hhi_a
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-frext-hcafr4_hhi_a
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-frext-hcamff1_hhi_b b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-frext-hcamff1_hhi_b
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-frext-hcamff1_hhi_b
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-frext-hcamff1_hhi_b
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-frext-hi422fr10_sony_b b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-frext-hi422fr10_sony_b
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-frext-hi422fr10_sony_b
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-frext-hi422fr10_sony_b
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-frext-hi422fr13_sony_b b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-frext-hi422fr13_sony_b
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-frext-hi422fr13_sony_b
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-frext-hi422fr13_sony_b
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-frext-hi422fr1_sony_a b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-frext-hi422fr1_sony_a
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-frext-hi422fr1_sony_a
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-frext-hi422fr1_sony_a
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-frext-hi422fr6_sony_a b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-frext-hi422fr6_sony_a
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-frext-hi422fr6_sony_a
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-frext-hi422fr6_sony_a
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-frext-hpca_brcm_c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-frext-hpca_brcm_c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-frext-hpca_brcm_c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-frext-hpca_brcm_c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-frext-hpcadq_brcm_b b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-frext-hpcadq_brcm_b
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-frext-hpcadq_brcm_b
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-frext-hpcadq_brcm_b
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-frext-hpcafl_bcrm_c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-frext-hpcafl_bcrm_c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-frext-hpcafl_bcrm_c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-frext-hpcafl_bcrm_c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-frext-hpcaflnl_bcrm_c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-frext-hpcaflnl_bcrm_c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-frext-hpcaflnl_bcrm_c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-frext-hpcaflnl_bcrm_c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-frext-hpcalq_brcm_b b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-frext-hpcalq_brcm_b
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-frext-hpcalq_brcm_b
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-frext-hpcalq_brcm_b
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-frext-hpcamapalq_bcrm_b b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-frext-hpcamapalq_bcrm_b
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-frext-hpcamapalq_bcrm_b
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-frext-hpcamapalq_bcrm_b
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-frext-hpcamolq_brcm_b b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-frext-hpcamolq_brcm_b
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-frext-hpcamolq_brcm_b
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-frext-hpcamolq_brcm_b
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-frext-hpcanl_brcm_c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-frext-hpcanl_brcm_c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-frext-hpcanl_brcm_c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-frext-hpcanl_brcm_c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-frext-hpcaq2lq_brcm_b b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-frext-hpcaq2lq_brcm_b
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-frext-hpcaq2lq_brcm_b
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-frext-hpcaq2lq_brcm_b
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-frext-hpcv_brcm_a b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-frext-hpcv_brcm_a
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-frext-hpcv_brcm_a
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-frext-hpcv_brcm_a
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-frext-hpcvfl_bcrm_a b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-frext-hpcvfl_bcrm_a
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-frext-hpcvfl_bcrm_a
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-frext-hpcvfl_bcrm_a
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-frext-hpcvflnl_bcrm_a b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-frext-hpcvflnl_bcrm_a
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-frext-hpcvflnl_bcrm_a
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-frext-hpcvflnl_bcrm_a
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-frext-hpcvmolq_brcm_b b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-frext-hpcvmolq_brcm_b
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-frext-hpcvmolq_brcm_b
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-frext-hpcvmolq_brcm_b
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-frext-hpcvnl_brcm_a b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-frext-hpcvnl_brcm_a
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-frext-hpcvnl_brcm_a
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-frext-hpcvnl_brcm_a
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-frext-pph10i1_panasonic_a b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-frext-pph10i1_panasonic_a
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-frext-pph10i1_panasonic_a
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-frext-pph10i1_panasonic_a
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-frext-pph10i2_panasonic_a b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-frext-pph10i2_panasonic_a
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-frext-pph10i2_panasonic_a
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-frext-pph10i2_panasonic_a
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-frext-pph10i3_panasonic_a b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-frext-pph10i3_panasonic_a
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-frext-pph10i3_panasonic_a
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-frext-pph10i3_panasonic_a
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-frext-pph10i4_panasonic_a b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-frext-pph10i4_panasonic_a
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-frext-pph10i4_panasonic_a
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-frext-pph10i4_panasonic_a
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-frext-pph10i5_panasonic_a b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-frext-pph10i5_panasonic_a
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-frext-pph10i5_panasonic_a
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-frext-pph10i5_panasonic_a
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-frext-pph10i6_panasonic_a b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-frext-pph10i6_panasonic_a
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-frext-pph10i6_panasonic_a
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-frext-pph10i6_panasonic_a
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-frext-pph10i7_panasonic_a b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-frext-pph10i7_panasonic_a
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-frext-pph10i7_panasonic_a
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-frext-pph10i7_panasonic_a
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-frext-pph422i1_panasonic_a b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-frext-pph422i1_panasonic_a
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-frext-pph422i1_panasonic_a
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-frext-pph422i1_panasonic_a
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-frext-pph422i2_panasonic_a b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-frext-pph422i2_panasonic_a
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-frext-pph422i2_panasonic_a
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-frext-pph422i2_panasonic_a
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-frext-pph422i3_panasonic_a b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-frext-pph422i3_panasonic_a
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-frext-pph422i3_panasonic_a
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-frext-pph422i3_panasonic_a
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-frext-pph422i4_panasonic_a b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-frext-pph422i4_panasonic_a
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-frext-pph422i4_panasonic_a
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-frext-pph422i4_panasonic_a
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-frext-pph422i5_panasonic_a b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-frext-pph422i5_panasonic_a
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-frext-pph422i5_panasonic_a
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-frext-pph422i5_panasonic_a
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-frext-pph422i6_panasonic_a b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-frext-pph422i6_panasonic_a
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-frext-pph422i6_panasonic_a
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-frext-pph422i6_panasonic_a
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-frext-pph422i7_panasonic_a b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-frext-pph422i7_panasonic_a
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-frext-pph422i7_panasonic_a
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-frext-pph422i7_panasonic_a
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-hcbp2_hhi_a b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-hcbp2_hhi_a
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-hcbp2_hhi_a
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-hcbp2_hhi_a
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-hcmp1_hhi_a b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-hcmp1_hhi_a
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-hcmp1_hhi_a
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-hcmp1_hhi_a
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-ls_sva_d b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-ls_sva_d
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-ls_sva_d
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-ls_sva_d
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-midr_mw_d b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-midr_mw_d
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-midr_mw_d
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-midr_mw_d
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-mps_mw_a b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-mps_mw_a
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-mps_mw_a
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-mps_mw_a
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-mr1_bt_a b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-mr1_bt_a
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-mr1_bt_a
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-mr1_bt_a
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-mr1_mw_a b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-mr1_mw_a
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-mr1_mw_a
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-mr1_mw_a
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-mr2_mw_a b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-mr2_mw_a
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-mr2_mw_a
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-mr2_mw_a
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-mr2_tandberg_e b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-mr2_tandberg_e
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-mr2_tandberg_e
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-mr2_tandberg_e
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-mr3_tandberg_b b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-mr3_tandberg_b
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-mr3_tandberg_b
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-mr3_tandberg_b
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-mr4_tandberg_c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-mr4_tandberg_c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-mr4_tandberg_c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-mr4_tandberg_c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-mr5_tandberg_c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-mr5_tandberg_c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-mr5_tandberg_c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-mr5_tandberg_c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-mr6_bt_b b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-mr6_bt_b
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-mr6_bt_b
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-mr6_bt_b
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-mr7_bt_b b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-mr7_bt_b
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-mr7_bt_b
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-mr7_bt_b
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-mr8_bt_b b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-mr8_bt_b
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-mr8_bt_b
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-mr8_bt_b
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-mr9_bt_b b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-mr9_bt_b
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-mr9_bt_b
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-mr9_bt_b
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-mv1_brcm_d b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-mv1_brcm_d
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-mv1_brcm_d
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-mv1_brcm_d
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-nl1_sony_d b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-nl1_sony_d
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-nl1_sony_d
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-nl1_sony_d
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-nl2_sony_h b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-nl2_sony_h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-nl2_sony_h
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-nl2_sony_h
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-nl3_sva_e b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-nl3_sva_e
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-nl3_sva_e
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-nl3_sva_e
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-nlmq1_jvc_c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-nlmq1_jvc_c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-nlmq1_jvc_c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-nlmq1_jvc_c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-nlmq2_jvc_c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-nlmq2_jvc_c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-nlmq2_jvc_c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-nlmq2_jvc_c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-nrf_mw_e b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-nrf_mw_e
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-nrf_mw_e
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-nrf_mw_e
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-sharp_mp_field_1_b b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-sharp_mp_field_1_b
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-sharp_mp_field_1_b
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-sharp_mp_field_1_b
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-sharp_mp_field_2_b b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-sharp_mp_field_2_b
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-sharp_mp_field_2_b
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-sharp_mp_field_2_b
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-sharp_mp_field_3_b b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-sharp_mp_field_3_b
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-sharp_mp_field_3_b
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-sharp_mp_field_3_b
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-sharp_mp_paff_1r2 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-sharp_mp_paff_1r2
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-sharp_mp_paff_1r2
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-sharp_mp_paff_1r2
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-sharp_mp_paff_2r b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-sharp_mp_paff_2r
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-sharp_mp_paff_2r
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-sharp_mp_paff_2r
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-sl1_sva_b b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-sl1_sva_b
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-sl1_sva_b
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-sl1_sva_b
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-sva_ba1_b b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-sva_ba1_b
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-sva_ba1_b
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-sva_ba1_b
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-sva_ba2_d b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-sva_ba2_d
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-sva_ba2_d
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-sva_ba2_d
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-sva_base_b b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-sva_base_b
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-sva_base_b
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-sva_base_b
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-sva_cl1_e b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-sva_cl1_e
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-sva_cl1_e
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-sva_cl1_e
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-sva_fm1_e b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-sva_fm1_e
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-sva_fm1_e
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-sva_fm1_e
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-sva_nl1_b b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-sva_nl1_b
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-sva_nl1_b
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-sva_nl1_b
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-sva_nl2_e b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-sva_nl2_e
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-sva_nl2_e
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-conformance-sva_nl2_e
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-crop-to-container b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-crop-to-container
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-crop-to-container
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-crop-to-container
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-direct-bff b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-direct-bff
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-direct-bff
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-direct-bff
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-dts_5frames b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-dts_5frames
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-dts_5frames
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-dts_5frames
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-extradata-reload b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-extradata-reload
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-extradata-reload
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-extradata-reload
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-extreme-plane-pred b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-extreme-plane-pred
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-extreme-plane-pred
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-extreme-plane-pred
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-interlace-crop b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-interlace-crop
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-interlace-crop
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-interlace-crop
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-intra-refresh-recovery b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-intra-refresh-recovery
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-intra-refresh-recovery
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-intra-refresh-recovery
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-invalid-ref-mod b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-invalid-ref-mod
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-invalid-ref-mod
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-invalid-ref-mod
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-lossless b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-lossless
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-lossless
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-lossless
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-missing-frame b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-missing-frame
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-missing-frame
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-missing-frame
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-mixed-nal-coding b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-mixed-nal-coding
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-mixed-nal-coding
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-mixed-nal-coding
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-ref-pic-mod-overflow b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-ref-pic-mod-overflow
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-ref-pic-mod-overflow
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-ref-pic-mod-overflow
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-reinit-large_420_8-to-small_420_8 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-reinit-large_420_8-to-small_420_8
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-reinit-large_420_8-to-small_420_8
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-reinit-large_420_8-to-small_420_8
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-reinit-small_420_8-to-large_444_10 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-reinit-small_420_8-to-large_444_10
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-reinit-small_420_8-to-large_444_10
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-reinit-small_420_8-to-large_444_10
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-reinit-small_420_9-to-small_420_8 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-reinit-small_420_9-to-small_420_8
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-reinit-small_420_9-to-small_420_8
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-reinit-small_420_9-to-small_420_8
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-reinit-small_422_9-to-small_420_9 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-reinit-small_422_9-to-small_420_9
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-reinit-small_422_9-to-small_420_9
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-reinit-small_422_9-to-small_420_9
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-skip-nointra b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-skip-nointra
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-skip-nointra
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-skip-nointra
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-skip-nokey b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-skip-nokey
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-skip-nokey
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-skip-nokey
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-timecode b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-timecode
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-timecode
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-timecode
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-twofields-packet b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-twofields-packet
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-twofields-packet
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-twofields-packet
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-unescaped-extradata b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-unescaped-extradata
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-unescaped-extradata
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-unescaped-extradata
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-xavc-4389 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-xavc-4389
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-xavc-4389
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264-xavc-4389
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264_mp4toannexb_ticket2991 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264_mp4toannexb_ticket2991
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264_mp4toannexb_ticket2991
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264_mp4toannexb_ticket2991
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264_mp4toannexb_ticket5927 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264_mp4toannexb_ticket5927
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264_mp4toannexb_ticket5927
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264_mp4toannexb_ticket5927
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264_mp4toannexb_ticket5927_2 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264_mp4toannexb_ticket5927_2
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264_mp4toannexb_ticket5927_2
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/h264_mp4toannexb_ticket5927_2
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hap-alpha-only-nosnappy-128x72 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hap-alpha-only-nosnappy-128x72
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hap-alpha-only-nosnappy-128x72
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hap-alpha-only-nosnappy-128x72
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hap-alpha-only-snappy-127x71 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hap-alpha-only-snappy-127x71
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hap-alpha-only-snappy-127x71
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hap-alpha-only-snappy-127x71
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hap-chunk b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hap-chunk
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hap-chunk
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hap-chunk
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hap1 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hap1
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hap1
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hap1
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hap5 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hap5
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hap5
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hap5
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hapenc-hap-none b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hapenc-hap-none
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hapenc-hap-none
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hapenc-hap-none
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hapenc-hapa-none b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hapenc-hapa-none
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hapenc-hapa-none
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hapenc-hapa-none
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hapenc-hapq-none b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hapenc-hapq-none
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hapenc-hapq-none
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hapenc-hapq-none
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hapqa-extract-nosnappy-to-hapalphaonly-mov b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hapqa-extract-nosnappy-to-hapalphaonly-mov
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hapqa-extract-nosnappy-to-hapalphaonly-mov
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hapqa-extract-nosnappy-to-hapalphaonly-mov
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hapqa-extract-nosnappy-to-hapq-mov b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hapqa-extract-nosnappy-to-hapq-mov
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hapqa-extract-nosnappy-to-hapq-mov
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hapqa-extract-nosnappy-to-hapq-mov
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hapqa-extract-snappy1-to-hapalphaonly b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hapqa-extract-snappy1-to-hapalphaonly
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hapqa-extract-snappy1-to-hapalphaonly
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hapqa-extract-snappy1-to-hapalphaonly
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hapqa-extract-snappy1-to-hapq b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hapqa-extract-snappy1-to-hapq
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hapqa-extract-snappy1-to-hapq
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hapqa-extract-snappy1-to-hapq
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hapqa-extract-snappy16-to-hapalphaonly b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hapqa-extract-snappy16-to-hapalphaonly
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hapqa-extract-snappy16-to-hapalphaonly
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hapqa-extract-snappy16-to-hapalphaonly
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hapqa-extract-snappy16-to-hapq b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hapqa-extract-snappy16-to-hapq
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hapqa-extract-snappy16-to-hapq
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hapqa-extract-snappy16-to-hapq
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hapqa-nosnappy-127x71 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hapqa-nosnappy-127x71
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hapqa-nosnappy-127x71
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hapqa-nosnappy-127x71
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hapqa-snappy1-127x71 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hapqa-snappy1-127x71
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hapqa-snappy1-127x71
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hapqa-snappy1-127x71
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hapqa-snappy16-127x71 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hapqa-snappy16-127x71
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hapqa-snappy16-127x71
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hapqa-snappy16-127x71
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hapy b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hapy
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hapy
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hapy
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hash b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hash
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hash
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hash
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-ADJUST_IPRED_ANGLE_A_RExt_Mitsubishi_1 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-ADJUST_IPRED_ANGLE_A_RExt_Mitsubishi_1
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-ADJUST_IPRED_ANGLE_A_RExt_Mitsubishi_1
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-ADJUST_IPRED_ANGLE_A_RExt_Mitsubishi_1
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-AMP_A_Samsung_4 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-AMP_A_Samsung_4
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-AMP_A_Samsung_4
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-AMP_A_Samsung_4
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-AMP_A_Samsung_6 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-AMP_A_Samsung_6
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-AMP_A_Samsung_6
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-AMP_A_Samsung_6
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-AMP_B_Samsung_4 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-AMP_B_Samsung_4
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-AMP_B_Samsung_4
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-AMP_B_Samsung_4
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-AMP_B_Samsung_6 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-AMP_B_Samsung_6
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-AMP_B_Samsung_6
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-AMP_B_Samsung_6
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-AMP_D_Hisilicon b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-AMP_D_Hisilicon
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-AMP_D_Hisilicon
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-AMP_D_Hisilicon
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-AMP_E_Hisilicon b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-AMP_E_Hisilicon
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-AMP_E_Hisilicon
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-AMP_E_Hisilicon
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-AMP_F_Hisilicon_3 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-AMP_F_Hisilicon_3
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-AMP_F_Hisilicon_3
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-AMP_F_Hisilicon_3
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-AMVP_A_MTK_4 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-AMVP_A_MTK_4
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-AMVP_A_MTK_4
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-AMVP_A_MTK_4
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-AMVP_B_MTK_4 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-AMVP_B_MTK_4
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-AMVP_B_MTK_4
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-AMVP_B_MTK_4
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-AMVP_C_Samsung_4 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-AMVP_C_Samsung_4
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-AMVP_C_Samsung_4
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-AMVP_C_Samsung_4
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-AMVP_C_Samsung_6 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-AMVP_C_Samsung_6
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-AMVP_C_Samsung_6
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-AMVP_C_Samsung_6
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-BUMPING_A_ericsson_1 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-BUMPING_A_ericsson_1
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-BUMPING_A_ericsson_1
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-BUMPING_A_ericsson_1
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-CAINIT_A_SHARP_4 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-CAINIT_A_SHARP_4
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-CAINIT_A_SHARP_4
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-CAINIT_A_SHARP_4
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-CAINIT_B_SHARP_4 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-CAINIT_B_SHARP_4
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-CAINIT_B_SHARP_4
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-CAINIT_B_SHARP_4
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-CAINIT_C_SHARP_3 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-CAINIT_C_SHARP_3
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-CAINIT_C_SHARP_3
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-CAINIT_C_SHARP_3
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-CAINIT_D_SHARP_3 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-CAINIT_D_SHARP_3
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-CAINIT_D_SHARP_3
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-CAINIT_D_SHARP_3
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-CAINIT_E_SHARP_3 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-CAINIT_E_SHARP_3
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-CAINIT_E_SHARP_3
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-CAINIT_E_SHARP_3
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-CAINIT_F_SHARP_3 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-CAINIT_F_SHARP_3
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-CAINIT_F_SHARP_3
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-CAINIT_F_SHARP_3
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-CAINIT_G_SHARP_3 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-CAINIT_G_SHARP_3
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-CAINIT_G_SHARP_3
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-CAINIT_G_SHARP_3
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-CAINIT_H_SHARP_3 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-CAINIT_H_SHARP_3
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-CAINIT_H_SHARP_3
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-CAINIT_H_SHARP_3
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-CIP_A_Panasonic_3 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-CIP_A_Panasonic_3
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-CIP_A_Panasonic_3
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-CIP_A_Panasonic_3
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-CIP_C_Panasonic_2 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-CIP_C_Panasonic_2
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-CIP_C_Panasonic_2
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-CIP_C_Panasonic_2
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-CONFWIN_A_Sony_1 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-CONFWIN_A_Sony_1
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-CONFWIN_A_Sony_1
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-CONFWIN_A_Sony_1
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-DBLK_A_MAIN10_VIXS_3 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-DBLK_A_MAIN10_VIXS_3
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-DBLK_A_MAIN10_VIXS_3
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-DBLK_A_MAIN10_VIXS_3
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-DBLK_A_SONY_3 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-DBLK_A_SONY_3
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-DBLK_A_SONY_3
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-DBLK_A_SONY_3
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-DBLK_B_SONY_3 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-DBLK_B_SONY_3
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-DBLK_B_SONY_3
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-DBLK_B_SONY_3
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-DBLK_C_SONY_3 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-DBLK_C_SONY_3
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-DBLK_C_SONY_3
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-DBLK_C_SONY_3
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-DBLK_D_VIXS_2 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-DBLK_D_VIXS_2
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-DBLK_D_VIXS_2
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-DBLK_D_VIXS_2
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-DBLK_E_VIXS_2 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-DBLK_E_VIXS_2
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-DBLK_E_VIXS_2
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-DBLK_E_VIXS_2
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-DBLK_F_VIXS_2 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-DBLK_F_VIXS_2
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-DBLK_F_VIXS_2
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-DBLK_F_VIXS_2
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-DBLK_G_VIXS_2 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-DBLK_G_VIXS_2
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-DBLK_G_VIXS_2
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-DBLK_G_VIXS_2
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-DELTAQP_A_BRCM_4 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-DELTAQP_A_BRCM_4
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-DELTAQP_A_BRCM_4
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-DELTAQP_A_BRCM_4
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-DELTAQP_B_SONY_3 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-DELTAQP_B_SONY_3
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-DELTAQP_B_SONY_3
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-DELTAQP_B_SONY_3
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-DELTAQP_C_SONY_3 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-DELTAQP_C_SONY_3
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-DELTAQP_C_SONY_3
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-DELTAQP_C_SONY_3
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-DSLICE_A_HHI_5 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-DSLICE_A_HHI_5
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-DSLICE_A_HHI_5
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-DSLICE_A_HHI_5
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-DSLICE_B_HHI_5 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-DSLICE_B_HHI_5
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-DSLICE_B_HHI_5
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-DSLICE_B_HHI_5
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-DSLICE_C_HHI_5 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-DSLICE_C_HHI_5
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-DSLICE_C_HHI_5
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-DSLICE_C_HHI_5
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-ENTP_A_Qualcomm_1 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-ENTP_A_Qualcomm_1
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-ENTP_A_Qualcomm_1
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-ENTP_A_Qualcomm_1
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-ENTP_B_Qualcomm_1 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-ENTP_B_Qualcomm_1
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-ENTP_B_Qualcomm_1
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-ENTP_B_Qualcomm_1
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-ENTP_C_Qualcomm_1 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-ENTP_C_Qualcomm_1
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-ENTP_C_Qualcomm_1
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-ENTP_C_Qualcomm_1
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-EXT_A_ericsson_4 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-EXT_A_ericsson_4
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-EXT_A_ericsson_4
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-EXT_A_ericsson_4
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-FILLER_A_Sony_1 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-FILLER_A_Sony_1
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-FILLER_A_Sony_1
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-FILLER_A_Sony_1
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-HRD_A_Fujitsu_2 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-HRD_A_Fujitsu_2
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-HRD_A_Fujitsu_2
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-HRD_A_Fujitsu_2
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-HRD_A_Fujitsu_3 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-HRD_A_Fujitsu_3
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-HRD_A_Fujitsu_3
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-HRD_A_Fujitsu_3
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-INITQP_A_Sony_1 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-INITQP_A_Sony_1
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-INITQP_A_Sony_1
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-INITQP_A_Sony_1
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-INITQP_B_Sony_1 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-INITQP_B_Sony_1
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-INITQP_B_Sony_1
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-INITQP_B_Sony_1
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-IPCM_A_RExt_NEC b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-IPCM_A_RExt_NEC
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-IPCM_A_RExt_NEC
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-IPCM_A_RExt_NEC
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-IPCM_B_RExt_NEC b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-IPCM_B_RExt_NEC
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-IPCM_B_RExt_NEC
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-IPCM_B_RExt_NEC
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-IPRED_A_docomo_2 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-IPRED_A_docomo_2
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-IPRED_A_docomo_2
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-IPRED_A_docomo_2
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-IPRED_B_Nokia_3 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-IPRED_B_Nokia_3
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-IPRED_B_Nokia_3
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-IPRED_B_Nokia_3
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-IPRED_C_Mitsubishi_3 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-IPRED_C_Mitsubishi_3
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-IPRED_C_Mitsubishi_3
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-IPRED_C_Mitsubishi_3
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-LS_A_Orange_2 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-LS_A_Orange_2
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-LS_A_Orange_2
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-LS_A_Orange_2
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-LS_B_ORANGE_4 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-LS_B_ORANGE_4
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-LS_B_ORANGE_4
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-LS_B_ORANGE_4
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-LTRPSPS_A_Qualcomm_1 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-LTRPSPS_A_Qualcomm_1
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-LTRPSPS_A_Qualcomm_1
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-LTRPSPS_A_Qualcomm_1
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-MAXBINS_A_TI_4 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-MAXBINS_A_TI_4
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-MAXBINS_A_TI_4
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-MAXBINS_A_TI_4
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-MAXBINS_B_TI_4 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-MAXBINS_B_TI_4
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-MAXBINS_B_TI_4
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-MAXBINS_B_TI_4
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-MAXBINS_C_TI_4 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-MAXBINS_C_TI_4
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-MAXBINS_C_TI_4
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-MAXBINS_C_TI_4
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-MERGE_A_TI_3 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-MERGE_A_TI_3
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-MERGE_A_TI_3
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-MERGE_A_TI_3
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-MERGE_B_TI_3 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-MERGE_B_TI_3
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-MERGE_B_TI_3
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-MERGE_B_TI_3
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-MERGE_C_TI_3 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-MERGE_C_TI_3
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-MERGE_C_TI_3
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-MERGE_C_TI_3
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-MERGE_D_TI_3 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-MERGE_D_TI_3
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-MERGE_D_TI_3
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-MERGE_D_TI_3
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-MERGE_E_TI_3 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-MERGE_E_TI_3
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-MERGE_E_TI_3
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-MERGE_E_TI_3
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-MERGE_F_MTK_4 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-MERGE_F_MTK_4
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-MERGE_F_MTK_4
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-MERGE_F_MTK_4
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-MERGE_G_HHI_4 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-MERGE_G_HHI_4
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-MERGE_G_HHI_4
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-MERGE_G_HHI_4
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-MVCLIP_A_qualcomm_3 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-MVCLIP_A_qualcomm_3
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-MVCLIP_A_qualcomm_3
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-MVCLIP_A_qualcomm_3
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-MVDL1ZERO_A_docomo_3 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-MVDL1ZERO_A_docomo_3
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-MVDL1ZERO_A_docomo_3
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-MVDL1ZERO_A_docomo_3
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-MVEDGE_A_qualcomm_3 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-MVEDGE_A_qualcomm_3
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-MVEDGE_A_qualcomm_3
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-MVEDGE_A_qualcomm_3
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-Main_422_10_A_RExt_Sony_1 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-Main_422_10_A_RExt_Sony_1
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-Main_422_10_A_RExt_Sony_1
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-Main_422_10_A_RExt_Sony_1
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-Main_422_10_B_RExt_Sony_1 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-Main_422_10_B_RExt_Sony_1
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-Main_422_10_B_RExt_Sony_1
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-Main_422_10_B_RExt_Sony_1
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-NUT_A_ericsson_5 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-NUT_A_ericsson_5
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-NUT_A_ericsson_5
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-NUT_A_ericsson_5
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-NoOutPrior_A_Qualcomm_1 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-NoOutPrior_A_Qualcomm_1
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-NoOutPrior_A_Qualcomm_1
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-NoOutPrior_A_Qualcomm_1
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-NoOutPrior_B_Qualcomm_1 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-NoOutPrior_B_Qualcomm_1
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-NoOutPrior_B_Qualcomm_1
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-NoOutPrior_B_Qualcomm_1
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-OPFLAG_A_Qualcomm_1 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-OPFLAG_A_Qualcomm_1
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-OPFLAG_A_Qualcomm_1
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-OPFLAG_A_Qualcomm_1
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-OPFLAG_B_Qualcomm_1 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-OPFLAG_B_Qualcomm_1
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-OPFLAG_B_Qualcomm_1
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-OPFLAG_B_Qualcomm_1
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-OPFLAG_C_Qualcomm_1 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-OPFLAG_C_Qualcomm_1
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-OPFLAG_C_Qualcomm_1
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-OPFLAG_C_Qualcomm_1
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-PERSIST_RPARAM_A_RExt_Sony_1 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-PERSIST_RPARAM_A_RExt_Sony_1
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-PERSIST_RPARAM_A_RExt_Sony_1
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-PERSIST_RPARAM_A_RExt_Sony_1
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-PERSIST_RPARAM_A_RExt_Sony_3 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-PERSIST_RPARAM_A_RExt_Sony_3
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-PERSIST_RPARAM_A_RExt_Sony_3
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-PERSIST_RPARAM_A_RExt_Sony_3
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-PICSIZE_A_Bossen_1 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-PICSIZE_A_Bossen_1
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-PICSIZE_A_Bossen_1
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-PICSIZE_A_Bossen_1
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-PICSIZE_B_Bossen_1 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-PICSIZE_B_Bossen_1
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-PICSIZE_B_Bossen_1
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-PICSIZE_B_Bossen_1
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-PICSIZE_C_Bossen_1 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-PICSIZE_C_Bossen_1
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-PICSIZE_C_Bossen_1
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-PICSIZE_C_Bossen_1
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-PICSIZE_D_Bossen_1 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-PICSIZE_D_Bossen_1
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-PICSIZE_D_Bossen_1
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-PICSIZE_D_Bossen_1
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-PMERGE_A_TI_3 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-PMERGE_A_TI_3
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-PMERGE_A_TI_3
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-PMERGE_A_TI_3
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-PMERGE_B_TI_3 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-PMERGE_B_TI_3
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-PMERGE_B_TI_3
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-PMERGE_B_TI_3
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-PMERGE_C_TI_3 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-PMERGE_C_TI_3
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-PMERGE_C_TI_3
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-PMERGE_C_TI_3
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-PMERGE_D_TI_3 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-PMERGE_D_TI_3
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-PMERGE_D_TI_3
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-PMERGE_D_TI_3
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-PMERGE_E_TI_3 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-PMERGE_E_TI_3
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-PMERGE_E_TI_3
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-PMERGE_E_TI_3
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-POC_A_Bossen_3 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-POC_A_Bossen_3
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-POC_A_Bossen_3
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-POC_A_Bossen_3
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-PPS_A_qualcomm_7 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-PPS_A_qualcomm_7
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-PPS_A_qualcomm_7
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-PPS_A_qualcomm_7
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-PS_A_VIDYO_3 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-PS_A_VIDYO_3
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-PS_A_VIDYO_3
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-PS_A_VIDYO_3
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-PS_B_VIDYO_3 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-PS_B_VIDYO_3
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-PS_B_VIDYO_3
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-PS_B_VIDYO_3
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-QMATRIX_A_RExt_Sony_1 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-QMATRIX_A_RExt_Sony_1
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-QMATRIX_A_RExt_Sony_1
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-QMATRIX_A_RExt_Sony_1
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-RAP_A_docomo_4 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-RAP_A_docomo_4
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-RAP_A_docomo_4
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-RAP_A_docomo_4
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-RAP_B_Bossen_1 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-RAP_B_Bossen_1
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-RAP_B_Bossen_1
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-RAP_B_Bossen_1
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-RPLM_A_qualcomm_4 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-RPLM_A_qualcomm_4
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-RPLM_A_qualcomm_4
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-RPLM_A_qualcomm_4
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-RPLM_B_qualcomm_4 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-RPLM_B_qualcomm_4
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-RPLM_B_qualcomm_4
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-RPLM_B_qualcomm_4
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-RPS_A_docomo_4 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-RPS_A_docomo_4
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-RPS_A_docomo_4
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-RPS_A_docomo_4
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-RPS_B_qualcomm_5 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-RPS_B_qualcomm_5
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-RPS_B_qualcomm_5
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-RPS_B_qualcomm_5
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-RPS_C_ericsson_5 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-RPS_C_ericsson_5
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-RPS_C_ericsson_5
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-RPS_C_ericsson_5
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-RPS_D_ericsson_6 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-RPS_D_ericsson_6
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-RPS_D_ericsson_6
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-RPS_D_ericsson_6
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-RPS_E_qualcomm_5 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-RPS_E_qualcomm_5
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-RPS_E_qualcomm_5
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-RPS_E_qualcomm_5
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-RPS_F_docomo_1 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-RPS_F_docomo_1
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-RPS_F_docomo_1
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-RPS_F_docomo_1
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-RQT_A_HHI_4 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-RQT_A_HHI_4
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-RQT_A_HHI_4
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-RQT_A_HHI_4
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-RQT_B_HHI_4 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-RQT_B_HHI_4
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-RQT_B_HHI_4
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-RQT_B_HHI_4
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-RQT_C_HHI_4 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-RQT_C_HHI_4
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-RQT_C_HHI_4
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-RQT_C_HHI_4
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-RQT_D_HHI_4 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-RQT_D_HHI_4
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-RQT_D_HHI_4
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-RQT_D_HHI_4
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-RQT_E_HHI_4 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-RQT_E_HHI_4
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-RQT_E_HHI_4
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-RQT_E_HHI_4
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-RQT_F_HHI_4 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-RQT_F_HHI_4
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-RQT_F_HHI_4
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-RQT_F_HHI_4
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-RQT_G_HHI_4 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-RQT_G_HHI_4
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-RQT_G_HHI_4
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-RQT_G_HHI_4
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-SAO_A_MediaTek_4 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-SAO_A_MediaTek_4
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-SAO_A_MediaTek_4
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-SAO_A_MediaTek_4
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-SAO_A_RExt_MediaTek_1 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-SAO_A_RExt_MediaTek_1
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-SAO_A_RExt_MediaTek_1
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-SAO_A_RExt_MediaTek_1
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-SAO_B_MediaTek_5 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-SAO_B_MediaTek_5
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-SAO_B_MediaTek_5
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-SAO_B_MediaTek_5
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-SAO_C_Samsung_4 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-SAO_C_Samsung_4
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-SAO_C_Samsung_4
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-SAO_C_Samsung_4
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-SAO_C_Samsung_5 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-SAO_C_Samsung_5
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-SAO_C_Samsung_5
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-SAO_C_Samsung_5
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-SAO_D_Samsung_4 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-SAO_D_Samsung_4
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-SAO_D_Samsung_4
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-SAO_D_Samsung_4
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-SAO_D_Samsung_5 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-SAO_D_Samsung_5
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-SAO_D_Samsung_5
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-SAO_D_Samsung_5
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-SAO_E_Canon_4 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-SAO_E_Canon_4
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-SAO_E_Canon_4
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-SAO_E_Canon_4
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-SAO_F_Canon_3 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-SAO_F_Canon_3
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-SAO_F_Canon_3
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-SAO_F_Canon_3
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-SAO_G_Canon_3 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-SAO_G_Canon_3
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-SAO_G_Canon_3
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-SAO_G_Canon_3
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-SDH_A_Orange_3 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-SDH_A_Orange_3
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-SDH_A_Orange_3
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-SDH_A_Orange_3
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-SLICES_A_Rovi_3 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-SLICES_A_Rovi_3
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-SLICES_A_Rovi_3
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-SLICES_A_Rovi_3
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-SLIST_A_Sony_4 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-SLIST_A_Sony_4
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-SLIST_A_Sony_4
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-SLIST_A_Sony_4
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-SLIST_B_Sony_8 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-SLIST_B_Sony_8
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-SLIST_B_Sony_8
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-SLIST_B_Sony_8
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-SLIST_C_Sony_3 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-SLIST_C_Sony_3
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-SLIST_C_Sony_3
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-SLIST_C_Sony_3
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-SLIST_D_Sony_9 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-SLIST_D_Sony_9
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-SLIST_D_Sony_9
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-SLIST_D_Sony_9
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-SLPPLP_A_VIDYO_1 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-SLPPLP_A_VIDYO_1
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-SLPPLP_A_VIDYO_1
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-SLPPLP_A_VIDYO_1
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-SLPPLP_A_VIDYO_2 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-SLPPLP_A_VIDYO_2
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-SLPPLP_A_VIDYO_2
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-SLPPLP_A_VIDYO_2
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-STRUCT_A_Samsung_5 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-STRUCT_A_Samsung_5
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-STRUCT_A_Samsung_5
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-STRUCT_A_Samsung_5
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-STRUCT_B_Samsung_4 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-STRUCT_B_Samsung_4
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-STRUCT_B_Samsung_4
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-STRUCT_B_Samsung_4
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-STRUCT_B_Samsung_6 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-STRUCT_B_Samsung_6
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-STRUCT_B_Samsung_6
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-STRUCT_B_Samsung_6
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-TILES_A_Cisco_2 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-TILES_A_Cisco_2
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-TILES_A_Cisco_2
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-TILES_A_Cisco_2
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-TILES_B_Cisco_1 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-TILES_B_Cisco_1
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-TILES_B_Cisco_1
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-TILES_B_Cisco_1
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-TMVP_A_MS_3 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-TMVP_A_MS_3
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-TMVP_A_MS_3
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-TMVP_A_MS_3
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-TSCL_A_VIDYO_5 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-TSCL_A_VIDYO_5
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-TSCL_A_VIDYO_5
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-TSCL_A_VIDYO_5
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-TSCL_B_VIDYO_4 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-TSCL_B_VIDYO_4
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-TSCL_B_VIDYO_4
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-TSCL_B_VIDYO_4
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-TSKIP_A_MS_3 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-TSKIP_A_MS_3
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-TSKIP_A_MS_3
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-TSKIP_A_MS_3
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-TUSIZE_A_Samsung_1 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-TUSIZE_A_Samsung_1
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-TUSIZE_A_Samsung_1
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-TUSIZE_A_Samsung_1
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-VPSID_A_VIDYO_1 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-VPSID_A_VIDYO_1
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-VPSID_A_VIDYO_1
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-VPSID_A_VIDYO_1
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-VPSID_A_VIDYO_2 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-VPSID_A_VIDYO_2
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-VPSID_A_VIDYO_2
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-VPSID_A_VIDYO_2
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-WPP_A_ericsson_MAIN10_2 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-WPP_A_ericsson_MAIN10_2
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-WPP_A_ericsson_MAIN10_2
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-WPP_A_ericsson_MAIN10_2
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-WPP_A_ericsson_MAIN_2 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-WPP_A_ericsson_MAIN_2
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-WPP_A_ericsson_MAIN_2
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-WPP_A_ericsson_MAIN_2
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-WPP_B_ericsson_MAIN10_2 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-WPP_B_ericsson_MAIN10_2
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-WPP_B_ericsson_MAIN10_2
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-WPP_B_ericsson_MAIN10_2
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-WPP_B_ericsson_MAIN_2 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-WPP_B_ericsson_MAIN_2
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-WPP_B_ericsson_MAIN_2
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-WPP_B_ericsson_MAIN_2
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-WPP_C_ericsson_MAIN10_2 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-WPP_C_ericsson_MAIN10_2
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-WPP_C_ericsson_MAIN10_2
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-WPP_C_ericsson_MAIN10_2
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-WPP_C_ericsson_MAIN_2 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-WPP_C_ericsson_MAIN_2
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-WPP_C_ericsson_MAIN_2
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-WPP_C_ericsson_MAIN_2
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-WPP_D_ericsson_MAIN10_2 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-WPP_D_ericsson_MAIN10_2
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-WPP_D_ericsson_MAIN10_2
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-WPP_D_ericsson_MAIN10_2
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-WPP_D_ericsson_MAIN_2 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-WPP_D_ericsson_MAIN_2
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-WPP_D_ericsson_MAIN_2
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-WPP_D_ericsson_MAIN_2
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-WPP_E_ericsson_MAIN10_2 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-WPP_E_ericsson_MAIN10_2
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-WPP_E_ericsson_MAIN10_2
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-WPP_E_ericsson_MAIN10_2
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-WPP_E_ericsson_MAIN_2 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-WPP_E_ericsson_MAIN_2
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-WPP_E_ericsson_MAIN_2
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-WPP_E_ericsson_MAIN_2
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-WPP_F_ericsson_MAIN10_2 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-WPP_F_ericsson_MAIN10_2
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-WPP_F_ericsson_MAIN10_2
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-WPP_F_ericsson_MAIN10_2
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-WPP_F_ericsson_MAIN_2 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-WPP_F_ericsson_MAIN_2
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-WPP_F_ericsson_MAIN_2
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-WPP_F_ericsson_MAIN_2
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-WP_A_MAIN10_Toshiba_3 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-WP_A_MAIN10_Toshiba_3
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-WP_A_MAIN10_Toshiba_3
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-WP_A_MAIN10_Toshiba_3
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-WP_A_Toshiba_3 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-WP_A_Toshiba_3
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-WP_A_Toshiba_3
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-WP_A_Toshiba_3
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-WP_B_Toshiba_3 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-WP_B_Toshiba_3
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-WP_B_Toshiba_3
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-WP_B_Toshiba_3
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-WP_MAIN10_B_Toshiba_3 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-WP_MAIN10_B_Toshiba_3
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-WP_MAIN10_B_Toshiba_3
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-WP_MAIN10_B_Toshiba_3
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-cip_B_NEC_3 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-cip_B_NEC_3
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-cip_B_NEC_3
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-cip_B_NEC_3
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-ipcm_A_NEC_3 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-ipcm_A_NEC_3
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-ipcm_A_NEC_3
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-ipcm_A_NEC_3
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-ipcm_B_NEC_3 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-ipcm_B_NEC_3
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-ipcm_B_NEC_3
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-ipcm_B_NEC_3
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-ipcm_C_NEC_3 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-ipcm_C_NEC_3
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-ipcm_C_NEC_3
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-ipcm_C_NEC_3
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-ipcm_D_NEC_3 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-ipcm_D_NEC_3
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-ipcm_D_NEC_3
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-ipcm_D_NEC_3
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-ipcm_E_NEC_2 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-ipcm_E_NEC_2
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-ipcm_E_NEC_2
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-conformance-ipcm_E_NEC_2
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-extradata-reload b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-extradata-reload
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-extradata-reload
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-extradata-reload
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-monochrome-crop b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-monochrome-crop
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-monochrome-crop
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-monochrome-crop
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-paired-fields b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-paired-fields
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-paired-fields
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-paired-fields
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-paramchange-yuv420p-yuv420p10 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-paramchange-yuv420p-yuv420p10
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-paramchange-yuv420p-yuv420p10
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-paramchange-yuv420p-yuv420p10
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-skiploopfilter b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-skiploopfilter
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-skiploopfilter
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hevc-skiploopfilter
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hmac b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hmac
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/hmac
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/hmac
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/id-cin-video b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/id-cin-video
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/id-cin-video
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/id-cin-video
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/id3v2-priv b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/id3v2-priv
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/id3v2-priv
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/id3v2-priv
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/idroq-video-encode b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/idroq-video-encode
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/idroq-video-encode
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/idroq-video-encode
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/iff-byterun1 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/iff-byterun1
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/iff-byterun1
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/iff-byterun1
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/iff-fibonacci b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/iff-fibonacci
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/iff-fibonacci
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/iff-fibonacci
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/iff-ilbm b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/iff-ilbm
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/iff-ilbm
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/iff-ilbm
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/iff-pcm b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/iff-pcm
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/iff-pcm
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/iff-pcm
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/iirfilter b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/iirfilter
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/iirfilter
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/iirfilter
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/imgutils b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/imgutils
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/imgutils
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/imgutils
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/indeo2-delta b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/indeo2-delta
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/indeo2-delta
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/indeo2-delta
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/indeo2-intra b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/indeo2-intra
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/indeo2-intra
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/indeo2-intra
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/indeo3-1 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/indeo3-1
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/indeo3-1
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/indeo3-1
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/indeo3-2 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/indeo3-2
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/indeo3-2
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/indeo3-2
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/indeo4 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/indeo4
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/indeo4
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/indeo4
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/indeo5 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/indeo5
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/indeo5
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/indeo5
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/interplay-mve-16bit b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/interplay-mve-16bit
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/interplay-mve-16bit
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/interplay-mve-16bit
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/interplay-mve-8bit b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/interplay-mve-8bit
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/interplay-mve-8bit
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/interplay-mve-8bit
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/iscc b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/iscc
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/iscc
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/iscc
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/iv8-demux b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/iv8-demux
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/iv8-demux
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/iv8-demux
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/j2k-dwt b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/j2k-dwt
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/j2k-dwt
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/j2k-dwt
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/jpeg2000-dcinema b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/jpeg2000-dcinema
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/jpeg2000-dcinema
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/jpeg2000-dcinema
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/jpg-12bpp b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/jpg-12bpp
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/jpg-12bpp
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/jpg-12bpp
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/jpg-jfif b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/jpg-jfif
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/jpg-jfif
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/jpg-jfif
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/jv b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/jv
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/jv
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/jv
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/jv-demux b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/jv-demux
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/jv-demux
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/jv-demux
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/kgv1 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/kgv1
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/kgv1
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/kgv1
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/kmvc b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/kmvc
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/kmvc
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/kmvc
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/lagarith-red b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/lagarith-red
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/lagarith-red
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/lagarith-red
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/lagarith-rgb24 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/lagarith-rgb24
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/lagarith-rgb24
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/lagarith-rgb24
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/lagarith-rgb32 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/lagarith-rgb32
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/lagarith-rgb32
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/lagarith-rgb32
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/lagarith-ticket4119 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/lagarith-ticket4119
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/lagarith-ticket4119
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/lagarith-ticket4119
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/lagarith-ticket4119-cfr b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/lagarith-ticket4119-cfr
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/lagarith-ticket4119-cfr
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/lagarith-ticket4119-cfr
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/lagarith-ticket4119-drop b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/lagarith-ticket4119-drop
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/lagarith-ticket4119-drop
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/lagarith-ticket4119-drop
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/lagarith-ticket4119-pass b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/lagarith-ticket4119-pass
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/lagarith-ticket4119-pass
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/lagarith-ticket4119-pass
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/lagarith-ticket4119-vfr b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/lagarith-ticket4119-vfr
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/lagarith-ticket4119-vfr
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/lagarith-ticket4119-vfr
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/lagarith-yuy2 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/lagarith-yuy2
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/lagarith-yuy2
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/lagarith-yuy2
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/lagarith-yv12 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/lagarith-yv12
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/lagarith-yv12
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/lagarith-yv12
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/lfg b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/lfg
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/lfg
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/lfg
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/libavcodec-htmlsubtitles b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/libavcodec-htmlsubtitles
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/libavcodec-htmlsubtitles
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/libavcodec-htmlsubtitles
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/libavcodec-options b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/libavcodec-options
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/libavcodec-options
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/libavcodec-options
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/limited_input_seek b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/limited_input_seek
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/limited_input_seek
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/limited_input_seek
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/limited_input_seek-copyts b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/limited_input_seek-copyts
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/limited_input_seek-copyts
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/limited_input_seek-copyts
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/lmlm4-demux b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/lmlm4-demux
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/lmlm4-demux
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/lmlm4-demux
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/loco-rgb b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/loco-rgb
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/loco-rgb
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/loco-rgb
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/loco-yuy2 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/loco-yuy2
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/loco-yuy2
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/loco-yuy2
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/lossless-alac b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/lossless-alac
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/lossless-alac
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/lossless-alac
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/lossless-meridianaudio b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/lossless-meridianaudio
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/lossless-meridianaudio
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/lossless-meridianaudio
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/lossless-monkeysaudio-399 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/lossless-monkeysaudio-399
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/lossless-monkeysaudio-399
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/lossless-monkeysaudio-399
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/lossless-shorten b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/lossless-shorten
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/lossless-shorten
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/lossless-shorten
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/lossless-tak b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/lossless-tak
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/lossless-tak
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/lossless-tak
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/lossless-truehd-5.1 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/lossless-truehd-5.1
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/lossless-truehd-5.1
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/lossless-truehd-5.1
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/lossless-truehd-5.1-downmix-2.0 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/lossless-truehd-5.1-downmix-2.0
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/lossless-truehd-5.1-downmix-2.0
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/lossless-truehd-5.1-downmix-2.0
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/lossless-tta b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/lossless-tta
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/lossless-tta
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/lossless-tta
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/lossless-tta-encrypted b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/lossless-tta-encrypted
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/lossless-tta-encrypted
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/lossless-tta-encrypted
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/lossless-wma b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/lossless-wma
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/lossless-wma
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/lossless-wma
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/lossless-wma24-1 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/lossless-wma24-1
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/lossless-wma24-1
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/lossless-wma24-1
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/lossless-wma24-2 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/lossless-wma24-2
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/lossless-wma24-2
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/lossless-wma24-2
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/lossless-wma24-rawtile b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/lossless-wma24-rawtile
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/lossless-wma24-rawtile
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/lossless-wma24-rawtile
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/m4v b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/m4v
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/m4v
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/m4v
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/m4v-cfr b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/m4v-cfr
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/m4v-cfr
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/m4v-cfr
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/magicyuv-rgb b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/magicyuv-rgb
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/magicyuv-rgb
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/magicyuv-rgb
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/magicyuv-rgba b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/magicyuv-rgba
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/magicyuv-rgba
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/magicyuv-rgba
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/magicyuv-y400i b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/magicyuv-y400i
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/magicyuv-y400i
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/magicyuv-y400i
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/magicyuv-y420 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/magicyuv-y420
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/magicyuv-y420
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/magicyuv-y420
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/magicyuv-y422i b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/magicyuv-y422i
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/magicyuv-y422i
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/magicyuv-y422i
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/magicyuv-y444 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/magicyuv-y444
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/magicyuv-y444
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/magicyuv-y444
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/magicyuv-y4444i b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/magicyuv-y4444i
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/magicyuv-y4444i
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/magicyuv-y4444i
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/mapchan-2ch-extract-ch0-ch2-trailing b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/mapchan-2ch-extract-ch0-ch2-trailing
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/mapchan-2ch-extract-ch0-ch2-trailing
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/mapchan-2ch-extract-ch0-ch2-trailing
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/mapchan-3ch-extract-ch0-ch2-trailing b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/mapchan-3ch-extract-ch0-ch2-trailing
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/mapchan-3ch-extract-ch0-ch2-trailing
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/mapchan-3ch-extract-ch0-ch2-trailing
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/mapchan-6ch-extract-2 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/mapchan-6ch-extract-2
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/mapchan-6ch-extract-2
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/mapchan-6ch-extract-2
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/mapchan-6ch-extract-2-downmix-mono b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/mapchan-6ch-extract-2-downmix-mono
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/mapchan-6ch-extract-2-downmix-mono
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/mapchan-6ch-extract-2-downmix-mono
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/mapchan-silent-mono b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/mapchan-silent-mono
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/mapchan-silent-mono
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/mapchan-silent-mono
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/matroska-spherical-mono b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/matroska-spherical-mono
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/matroska-spherical-mono
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/matroska-spherical-mono
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/maxis-xa b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/maxis-xa
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/maxis-xa
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/maxis-xa
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/md5 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/md5
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/md5
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/md5
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/mdec b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/mdec
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/mdec
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/mdec
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/mdec-v3 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/mdec-v3
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/mdec-v3
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/mdec-v3
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/mimic b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/mimic
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/mimic
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/mimic
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/mjpegb b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/mjpegb
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/mjpegb
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/mjpegb
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/mkv b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/mkv
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/mkv
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/mkv
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/mkv-1242 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/mkv-1242
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/mkv-1242
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/mkv-1242
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/mlv-demux b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/mlv-demux
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/mlv-demux
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/mlv-demux
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/motionpixels b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/motionpixels
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/motionpixels
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/motionpixels
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/mov-1elist-1ctts b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/mov-1elist-1ctts
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/mov-1elist-1ctts
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/mov-1elist-1ctts
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/mov-1elist-ends-last-bframe b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/mov-1elist-ends-last-bframe
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/mov-1elist-ends-last-bframe
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/mov-1elist-ends-last-bframe
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/mov-1elist-noctts b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/mov-1elist-noctts
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/mov-1elist-noctts
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/mov-1elist-noctts
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/mov-2elist-elist1-ends-bframe b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/mov-2elist-elist1-ends-bframe
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/mov-2elist-elist1-ends-bframe
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/mov-2elist-elist1-ends-bframe
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/mov-3elist b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/mov-3elist
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/mov-3elist
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/mov-3elist
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/mov-3elist-1ctts b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/mov-3elist-1ctts
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/mov-3elist-1ctts
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/mov-3elist-1ctts
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/mov-3elist-encrypted b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/mov-3elist-encrypted
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/mov-3elist-encrypted
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/mov-3elist-encrypted
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/mov-440hz-10ms b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/mov-440hz-10ms
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/mov-440hz-10ms
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/mov-440hz-10ms
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/mov-aac-2048-priming b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/mov-aac-2048-priming
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/mov-aac-2048-priming
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/mov-aac-2048-priming
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/mov-bbi-elst-starts-b b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/mov-bbi-elst-starts-b
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/mov-bbi-elst-starts-b
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/mov-bbi-elst-starts-b
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/mov-displaymatrix b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/mov-displaymatrix
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/mov-displaymatrix
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/mov-displaymatrix
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/mov-elist-starts-ctts-2ndsample b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/mov-elist-starts-ctts-2ndsample
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/mov-elist-starts-ctts-2ndsample
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/mov-elist-starts-ctts-2ndsample
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/mov-elst-ends-betn-b-and-i b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/mov-elst-ends-betn-b-and-i
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/mov-elst-ends-betn-b-and-i
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/mov-elst-ends-betn-b-and-i
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/mov-frag-encrypted b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/mov-frag-encrypted
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/mov-frag-encrypted
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/mov-frag-encrypted
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/mov-frag-overlap b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/mov-frag-overlap
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/mov-frag-overlap
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/mov-frag-overlap
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/mov-guess-delay-1 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/mov-guess-delay-1
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/mov-guess-delay-1
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/mov-guess-delay-1
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/mov-guess-delay-2 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/mov-guess-delay-2
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/mov-guess-delay-2
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/mov-guess-delay-2
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/mov-guess-delay-3 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/mov-guess-delay-3
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/mov-guess-delay-3
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/mov-guess-delay-3
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/mov-ibi-elst-starts-b b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/mov-ibi-elst-starts-b
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/mov-ibi-elst-starts-b
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/mov-ibi-elst-starts-b
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/mov-init-nonkeyframe b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/mov-init-nonkeyframe
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/mov-init-nonkeyframe
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/mov-init-nonkeyframe
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/mov-invalid-elst-entry-count b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/mov-invalid-elst-entry-count
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/mov-invalid-elst-entry-count
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/mov-invalid-elst-entry-count
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/mov-mp3-demux b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/mov-mp3-demux
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/mov-mp3-demux
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/mov-mp3-demux
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/mov-mp4-with-mov-in24-ver b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/mov-mp4-with-mov-in24-ver
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/mov-mp4-with-mov-in24-ver
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/mov-mp4-with-mov-in24-ver
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/mov-neg-firstpts-discard b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/mov-neg-firstpts-discard
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/mov-neg-firstpts-discard
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/mov-neg-firstpts-discard
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/mov-neg-firstpts-discard-frames b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/mov-neg-firstpts-discard-frames
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/mov-neg-firstpts-discard-frames
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/mov-neg-firstpts-discard-frames
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/mov-neg-firstpts-discard-vorbis b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/mov-neg-firstpts-discard-vorbis
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/mov-neg-firstpts-discard-vorbis
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/mov-neg-firstpts-discard-vorbis
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/mov-spherical-mono b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/mov-spherical-mono
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/mov-spherical-mono
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/mov-spherical-mono
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/mov-stream-shorter-than-movie b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/mov-stream-shorter-than-movie
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/mov-stream-shorter-than-movie
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/mov-stream-shorter-than-movie
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/mov-tenc-only-encrypted b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/mov-tenc-only-encrypted
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/mov-tenc-only-encrypted
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/mov-tenc-only-encrypted
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/mov-zombie b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/mov-zombie
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/mov-zombie
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/mov-zombie
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/movenc b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/movenc
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/movenc
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/movenc
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/mpc7-demux b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/mpc7-demux
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/mpc7-demux
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/mpc7-demux
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/mpc8-demux b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/mpc8-demux
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/mpc8-demux
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/mpc8-demux
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/mpeg2-field-enc b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/mpeg2-field-enc
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/mpeg2-field-enc
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/mpeg2-field-enc
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/mpeg2-ticket186 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/mpeg2-ticket186
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/mpeg2-ticket186
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/mpeg2-ticket186
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/mpeg2-ticket6024 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/mpeg2-ticket6024
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/mpeg2-ticket6024
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/mpeg2-ticket6024
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/mpeg2-ticket6677 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/mpeg2-ticket6677
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/mpeg2-ticket6677
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/mpeg2-ticket6677
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/mpeg4-als-conformance-00 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/mpeg4-als-conformance-00
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/mpeg4-als-conformance-00
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/mpeg4-als-conformance-00
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/mpeg4-als-conformance-01 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/mpeg4-als-conformance-01
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/mpeg4-als-conformance-01
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/mpeg4-als-conformance-01
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/mpeg4-als-conformance-02 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/mpeg4-als-conformance-02
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/mpeg4-als-conformance-02
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/mpeg4-als-conformance-02
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/mpeg4-als-conformance-03 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/mpeg4-als-conformance-03
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/mpeg4-als-conformance-03
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/mpeg4-als-conformance-03
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/mpeg4-als-conformance-04 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/mpeg4-als-conformance-04
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/mpeg4-als-conformance-04
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/mpeg4-als-conformance-04
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/mpeg4-als-conformance-05 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/mpeg4-als-conformance-05
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/mpeg4-als-conformance-05
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/mpeg4-als-conformance-05
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/mpeg4-bsf-unpack-bframes b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/mpeg4-bsf-unpack-bframes
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/mpeg4-bsf-unpack-bframes
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/mpeg4-bsf-unpack-bframes
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/mpeg4-packed b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/mpeg4-packed
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/mpeg4-packed
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/mpeg4-packed
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/mpeg4-resolution-change-down-down b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/mpeg4-resolution-change-down-down
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/mpeg4-resolution-change-down-down
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/mpeg4-resolution-change-down-down
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/mpeg4-resolution-change-down-up b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/mpeg4-resolution-change-down-up
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/mpeg4-resolution-change-down-up
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/mpeg4-resolution-change-down-up
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/mpeg4-resolution-change-up-down b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/mpeg4-resolution-change-up-down
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/mpeg4-resolution-change-up-down
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/mpeg4-resolution-change-up-down
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/mpeg4-resolution-change-up-up b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/mpeg4-resolution-change-up-up
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/mpeg4-resolution-change-up-up
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/mpeg4-resolution-change-up-up
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/mpegps-remuxed-pcm-demux b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/mpegps-remuxed-pcm-demux
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/mpegps-remuxed-pcm-demux
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/mpegps-remuxed-pcm-demux
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/mpegts-probe-latm b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/mpegts-probe-latm
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/mpegts-probe-latm
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/mpegts-probe-latm
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/mpegts-probe-pmt-merge b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/mpegts-probe-pmt-merge
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/mpegts-probe-pmt-merge
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/mpegts-probe-pmt-merge
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/mpegts-probe-program b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/mpegts-probe-program
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/mpegts-probe-program
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/mpegts-probe-program
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/msmpeg4v1 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/msmpeg4v1
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/msmpeg4v1
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/msmpeg4v1
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/msrle-8bit b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/msrle-8bit
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/msrle-8bit
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/msrle-8bit
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/mss1-pal b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/mss1-pal
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/mss1-pal
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/mss1-pal
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/mss2-pal b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/mss2-pal
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/mss2-pal
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/mss2-pal
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/mss2-pals b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/mss2-pals
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/mss2-pals
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/mss2-pals
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/mss2-rgb555 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/mss2-rgb555
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/mss2-rgb555
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/mss2-rgb555
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/mss2-rgb555s b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/mss2-rgb555s
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/mss2-rgb555s
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/mss2-rgb555s
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/mss2-wmv b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/mss2-wmv
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/mss2-wmv
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/mss2-wmv
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/msvideo1-16bit b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/msvideo1-16bit
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/msvideo1-16bit
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/msvideo1-16bit
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/msvideo1-8bit b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/msvideo1-8bit
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/msvideo1-8bit
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/msvideo1-8bit
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/mszh b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/mszh
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/mszh
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/mszh
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/mts2 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/mts2
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/mts2
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/mts2
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/mts2-xesc b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/mts2-xesc
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/mts2-xesc
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/mts2-xesc
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/mtv b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/mtv
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/mtv
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/mtv
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/murmur3 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/murmur3
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/murmur3
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/murmur3
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/mv-mvc1 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/mv-mvc1
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/mv-mvc1
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/mv-mvc1
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/mv-mvc2 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/mv-mvc2
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/mv-mvc2
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/mv-mvc2
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/mv-sgirle b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/mv-sgirle
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/mv-sgirle
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/mv-sgirle
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/mxf-demux b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/mxf-demux
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/mxf-demux
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/mxf-demux
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/mxf-essencegroup-demux b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/mxf-essencegroup-demux
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/mxf-essencegroup-demux
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/mxf-essencegroup-demux
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/mxf-metadata-source-ref1 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/mxf-metadata-source-ref1
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/mxf-metadata-source-ref1
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/mxf-metadata-source-ref1
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/mxf-metadata-source-ref2 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/mxf-metadata-source-ref2
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/mxf-metadata-source-ref2
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/mxf-metadata-source-ref2
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/mxf-missing-index-demux b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/mxf-missing-index-demux
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/mxf-missing-index-demux
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/mxf-missing-index-demux
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/mxf-multiple-components-demux b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/mxf-multiple-components-demux
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/mxf-multiple-components-demux
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/mxf-multiple-components-demux
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/mxf-probe-d10 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/mxf-probe-d10
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/mxf-probe-d10
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/mxf-probe-d10
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/mxf-probe-dnxhd b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/mxf-probe-dnxhd
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/mxf-probe-dnxhd
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/mxf-probe-dnxhd
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/mxf-probe-dv25 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/mxf-probe-dv25
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/mxf-probe-dv25
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/mxf-probe-dv25
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/mxf-reel_name b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/mxf-reel_name
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/mxf-reel_name
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/mxf-reel_name
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/mxpeg b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/mxpeg
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/mxpeg
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/mxpeg
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/nc-demux b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/nc-demux
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/nc-demux
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/nc-demux
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/nistsphere-demux b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/nistsphere-demux
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/nistsphere-demux
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/nistsphere-demux
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/noproxy b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/noproxy
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/noproxy
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/noproxy
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/nsv-demux b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/nsv-demux
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/nsv-demux
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/nsv-demux
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/nuv-rtjpeg b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/nuv-rtjpeg
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/nuv-rtjpeg
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/nuv-rtjpeg
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/nuv-rtjpeg-fh b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/nuv-rtjpeg-fh
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/nuv-rtjpeg-fh
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/nuv-rtjpeg-fh
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/oggopus-demux b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/oggopus-demux
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/oggopus-demux
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/oggopus-demux
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/oggvp8-demux b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/oggvp8-demux
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/oggvp8-demux
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/oggvp8-demux
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/oma-demux b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/oma-demux
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/oma-demux
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/oma-demux
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/on2avc b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/on2avc
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/on2avc
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/on2avc
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/opt b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/opt
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/opt
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/opt
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/paf-audio b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/paf-audio
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/paf-audio
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/paf-audio
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/paf-demux b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/paf-demux
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/paf-demux
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/paf-demux
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/paf-video b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/paf-video
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/paf-video
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/paf-video
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/parseutils b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/parseutils
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/parseutils
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/parseutils
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/pcm-planar b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/pcm-planar
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/pcm-planar
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/pcm-planar
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/pcm_dvd b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/pcm_dvd
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/pcm_dvd
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/pcm_dvd
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/pcm_s16be-stereo b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/pcm_s16be-stereo
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/pcm_s16be-stereo
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/pcm_s16be-stereo
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/pcm_s16le-stereo b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/pcm_s16le-stereo
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/pcm_s16le-stereo
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/pcm_s16le-stereo
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/pcm_u8-mono b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/pcm_u8-mono
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/pcm_u8-mono
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/pcm_u8-mono
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/pcm_u8-stereo b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/pcm_u8-stereo
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/pcm_u8-stereo
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/pcm_u8-stereo
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/pict b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/pict
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/pict
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/pict
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/pictor b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/pictor
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/pictor
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/pictor
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/pixelutils b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/pixelutils
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/pixelutils
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/pixelutils
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/pixfmt_best b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/pixfmt_best
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/pixfmt_best
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/pixfmt_best
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/pixlet-rgb b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/pixlet-rgb
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/pixlet-rgb
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/pixlet-rgb
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/pmp-demux b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/pmp-demux
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/pmp-demux
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/pmp-demux
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/png-gray16 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/png-gray16
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/png-gray16
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/png-gray16
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/png-gray8 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/png-gray8
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/png-gray8
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/png-gray8
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/png-int-rgb24 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/png-int-rgb24
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/png-int-rgb24
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/png-int-rgb24
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/png-rgb24 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/png-rgb24
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/png-rgb24
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/png-rgb24
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/png-rgb48 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/png-rgb48
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/png-rgb48
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/png-rgb48
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/png-rgba b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/png-rgba
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/png-rgba
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/png-rgba
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/png-rgba64 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/png-rgba64
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/png-rgba64
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/png-rgba64
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/png-ya16 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/png-ya16
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/png-ya16
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/png-ya16
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/png-ya8 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/png-ya8
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/png-ya8
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/png-ya8
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/pngparser b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/pngparser
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/pngparser
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/pngparser
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/prores-422 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/prores-422
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/prores-422
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/prores-422
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/prores-422_hq b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/prores-422_hq
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/prores-422_hq
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/prores-422_hq
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/prores-422_lt b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/prores-422_lt
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/prores-422_lt
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/prores-422_lt
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/prores-422_proxy b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/prores-422_proxy
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/prores-422_proxy
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/prores-422_proxy
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/prores-alpha b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/prores-alpha
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/prores-alpha
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/prores-alpha
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/prores-alpha_skip b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/prores-alpha_skip
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/prores-alpha_skip
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/prores-alpha_skip
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/prores-gray b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/prores-gray
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/prores-gray
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/prores-gray
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/prores-transparency b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/prores-transparency
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/prores-transparency
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/prores-transparency
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/prores-transparency_skip b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/prores-transparency_skip
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/prores-transparency_skip
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/prores-transparency_skip
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/psd-duo-tone-color b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/psd-duo-tone-color
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/psd-duo-tone-color
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/psd-duo-tone-color
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/psd-gray16 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/psd-gray16
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/psd-gray16
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/psd-gray16
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/psd-gray8 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/psd-gray8
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/psd-gray8
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/psd-gray8
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/psd-lena-127x127-rgb24 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/psd-lena-127x127-rgb24
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/psd-lena-127x127-rgb24
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/psd-lena-127x127-rgb24
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/psd-lena-256c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/psd-lena-256c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/psd-lena-256c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/psd-lena-256c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/psd-lena-bitmap b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/psd-lena-bitmap
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/psd-lena-bitmap
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/psd-lena-bitmap
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/psd-lena-rgb-rle-127x127-16b b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/psd-lena-rgb-rle-127x127-16b
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/psd-lena-rgb-rle-127x127-16b
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/psd-lena-rgb-rle-127x127-16b
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/psd-lena-rgb-rle-127x127-8b b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/psd-lena-rgb-rle-127x127-8b
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/psd-lena-rgb-rle-127x127-8b
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/psd-lena-rgb-rle-127x127-8b
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/psd-lena-rgba-rle-128x128-8b b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/psd-lena-rgba-rle-128x128-8b
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/psd-lena-rgba-rle-128x128-8b
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/psd-lena-rgba-rle-128x128-8b
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/psd-rgb24 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/psd-rgb24
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/psd-rgb24
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/psd-rgb24
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/psd-rgb48 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/psd-rgb48
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/psd-rgb48
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/psd-rgb48
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/psd-rgba b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/psd-rgba
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/psd-rgba
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/psd-rgba
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/psd-rgba64 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/psd-rgba64
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/psd-rgba64
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/psd-rgba64
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/psd-ya16 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/psd-ya16
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/psd-ya16
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/psd-ya16
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/psd-ya8 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/psd-ya8
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/psd-ya8
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/psd-ya8
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/psx-str-demux b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/psx-str-demux
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/psx-str-demux
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/psx-str-demux
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/ptx b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/ptx
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/ptx
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/ptx
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/pva-demux b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/pva-demux
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/pva-demux
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/pva-demux
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/qcp-demux b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/qcp-demux
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/qcp-demux
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/qcp-demux
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/qpeg b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/qpeg
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/qpeg
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/qpeg
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/qt-alaw-mono b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/qt-alaw-mono
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/qt-alaw-mono
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/qt-alaw-mono
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/qt-alaw-stereo b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/qt-alaw-stereo
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/qt-alaw-stereo
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/qt-alaw-stereo
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/qt-ima4-mono b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/qt-ima4-mono
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/qt-ima4-mono
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/qt-ima4-mono
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/qt-ima4-stereo b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/qt-ima4-stereo
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/qt-ima4-stereo
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/qt-ima4-stereo
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/qt-mac3-mono b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/qt-mac3-mono
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/qt-mac3-mono
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/qt-mac3-mono
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/qt-mac3-stereo b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/qt-mac3-stereo
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/qt-mac3-stereo
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/qt-mac3-stereo
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/qt-mac6-mono b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/qt-mac6-mono
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/qt-mac6-mono
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/qt-mac6-mono
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/qt-mac6-stereo b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/qt-mac6-stereo
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/qt-mac6-stereo
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/qt-mac6-stereo
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/qt-ulaw-mono b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/qt-ulaw-mono
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/qt-ulaw-mono
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/qt-ulaw-mono
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/qt-ulaw-stereo b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/qt-ulaw-stereo
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/qt-ulaw-stereo
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/qt-ulaw-stereo
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/qtrle-16bit b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/qtrle-16bit
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/qtrle-16bit
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/qtrle-16bit
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/qtrle-1bit b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/qtrle-1bit
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/qtrle-1bit
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/qtrle-1bit
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/qtrle-24bit b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/qtrle-24bit
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/qtrle-24bit
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/qtrle-24bit
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/qtrle-2bit b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/qtrle-2bit
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/qtrle-2bit
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/qtrle-2bit
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/qtrle-32bit b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/qtrle-32bit
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/qtrle-32bit
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/qtrle-32bit
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/qtrle-4bit b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/qtrle-4bit
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/qtrle-4bit
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/qtrle-4bit
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/qtrle-8bit b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/qtrle-8bit
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/qtrle-8bit
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/qtrle-8bit
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/quickdraw b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/quickdraw
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/quickdraw
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/quickdraw
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/r210 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/r210
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/r210
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/r210
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/ra-144 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/ra-144
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/ra-144
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/ra-144
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/ra3-144 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/ra3-144
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/ra3-144
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/ra3-144
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/ralf b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/ralf
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/ralf
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/ralf
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/random_seed b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/random_seed
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/random_seed
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/random_seed
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/redcode-demux b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/redcode-demux
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/redcode-demux
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/redcode-demux
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/redspark-demux b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/redspark-demux
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/redspark-demux
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/redspark-demux
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/rgb24-mkv b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/rgb24-mkv
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/rgb24-mkv
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/rgb24-mkv
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/rgbapng-4816 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/rgbapng-4816
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/rgbapng-4816
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/rgbapng-4816
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/ripemd b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/ripemd
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/ripemd
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/ripemd
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/rl2 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/rl2
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/rl2
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/rl2
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/roqvideo b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/roqvideo
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/roqvideo
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/roqvideo
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/rpza b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/rpza
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/rpza
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/rpza
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/rscc-16bit b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/rscc-16bit
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/rscc-16bit
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/rscc-16bit
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/rscc-24bit b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/rscc-24bit
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/rscc-24bit
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/rscc-24bit
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/rscc-32bit b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/rscc-32bit
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/rscc-32bit
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/rscc-32bit
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/rscc-8bit b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/rscc-8bit
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/rscc-8bit
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/rscc-8bit
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/rsd-demux b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/rsd-demux
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/rsd-demux
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/rsd-demux
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/rtmpdh b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/rtmpdh
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/rtmpdh
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/rtmpdh
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/rv20-1239 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/rv20-1239
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/rv20-1239
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/rv20-1239
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/rv30 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/rv30
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/rv30
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/rv30
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/rv40 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/rv40
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/rv40
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/rv40
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/sanm b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/sanm
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/sanm
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/sanm
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/screenpresso-16bit b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/screenpresso-16bit
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/screenpresso-16bit
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/screenpresso-16bit
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/screenpresso-24bit b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/screenpresso-24bit
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/screenpresso-24bit
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/screenpresso-24bit
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/screenpresso-32bit b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/screenpresso-32bit
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/screenpresso-32bit
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/screenpresso-32bit
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/segment-adts-to-mkv-header-000 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/segment-adts-to-mkv-header-000
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/segment-adts-to-mkv-header-000
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/segment-adts-to-mkv-header-000
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/segment-adts-to-mkv-header-001 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/segment-adts-to-mkv-header-001
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/segment-adts-to-mkv-header-001
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/segment-adts-to-mkv-header-001
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/segment-adts-to-mkv-header-002 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/segment-adts-to-mkv-header-002
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/segment-adts-to-mkv-header-002
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/segment-adts-to-mkv-header-002
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/segment-adts-to-mkv-header-all b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/segment-adts-to-mkv-header-all
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/segment-adts-to-mkv-header-all
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/segment-adts-to-mkv-header-all
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/segment-mp4-to-ts b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/segment-mp4-to-ts
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/segment-mp4-to-ts
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/segment-mp4-to-ts
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/sgi-gray16 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/sgi-gray16
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/sgi-gray16
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/sgi-gray16
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/sgi-gray16-rle b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/sgi-gray16-rle
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/sgi-gray16-rle
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/sgi-gray16-rle
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/sgi-gray8 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/sgi-gray8
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/sgi-gray8
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/sgi-gray8
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/sgi-gray8-rle b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/sgi-gray8-rle
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/sgi-gray8-rle
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/sgi-gray8-rle
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/sgi-rgb24 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/sgi-rgb24
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/sgi-rgb24
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/sgi-rgb24
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/sgi-rgb24-rle b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/sgi-rgb24-rle
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/sgi-rgb24-rle
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/sgi-rgb24-rle
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/sgi-rgb48 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/sgi-rgb48
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/sgi-rgb48
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/sgi-rgb48
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/sgi-rgb48-rle b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/sgi-rgb48-rle
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/sgi-rgb48-rle
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/sgi-rgb48-rle
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/sgi-rgba b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/sgi-rgba
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/sgi-rgba
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/sgi-rgba
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/sgi-rgba-rle b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/sgi-rgba-rle
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/sgi-rgba-rle
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/sgi-rgba-rle
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/sgi-rgba64 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/sgi-rgba64
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/sgi-rgba64
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/sgi-rgba64
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/sgi-rgba64-rle b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/sgi-rgba64-rle
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/sgi-rgba64-rle
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/sgi-rgba64-rle
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/sha b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/sha
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/sha
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/sha
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/sha512 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/sha512
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/sha512
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/sha512
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/sierra-vmd-audio b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/sierra-vmd-audio
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/sierra-vmd-audio
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/sierra-vmd-audio
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/sierra-vmd-video b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/sierra-vmd-video
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/sierra-vmd-video
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/sierra-vmd-video
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/siff-demux b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/siff-demux
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/siff-demux
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/siff-demux
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/smacker-audio b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/smacker-audio
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/smacker-audio
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/smacker-audio
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/smacker-video b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/smacker-video
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/smacker-video
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/smacker-video
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/smc b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/smc
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/smc
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/smc
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/smjpeg b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/smjpeg
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/smjpeg
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/smjpeg
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/smjpeg-demux b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/smjpeg-demux
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/smjpeg-demux
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/smjpeg-demux
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/smvjpeg b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/smvjpeg
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/smvjpeg
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/smvjpeg
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/source b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/source
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/source
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/source
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/sp5x b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/sp5x
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/sp5x
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/sp5x
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/speedhq-422 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/speedhq-422
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/speedhq-422
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/speedhq-422
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/speedhq-422-singlefield b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/speedhq-422-singlefield
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/speedhq-422-singlefield
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/speedhq-422-singlefield
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/srtp b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/srtp
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/srtp
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/srtp
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/sub-aqtitle b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/sub-aqtitle
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/sub-aqtitle
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/sub-aqtitle
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/sub-ass-to-ass-transcode b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/sub-ass-to-ass-transcode
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/sub-ass-to-ass-transcode
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/sub-ass-to-ass-transcode
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/sub-cc b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/sub-cc
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/sub-cc
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/sub-cc
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/sub-cc-realtime b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/sub-cc-realtime
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/sub-cc-realtime
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/sub-cc-realtime
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/sub-cc-scte20 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/sub-cc-scte20
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/sub-cc-scte20
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/sub-cc-scte20
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/sub-charenc b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/sub-charenc
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/sub-charenc
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/sub-charenc
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/sub-jacosub b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/sub-jacosub
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/sub-jacosub
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/sub-jacosub
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/sub-microdvd b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/sub-microdvd
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/sub-microdvd
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/sub-microdvd
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/sub-microdvd-remux b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/sub-microdvd-remux
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/sub-microdvd-remux
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/sub-microdvd-remux
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/sub-movtext b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/sub-movtext
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/sub-movtext
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/sub-movtext
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/sub-mpl2 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/sub-mpl2
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/sub-mpl2
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/sub-mpl2
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/sub-mpsub b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/sub-mpsub
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/sub-mpsub
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/sub-mpsub
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/sub-mpsub-frames b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/sub-mpsub-frames
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/sub-mpsub-frames
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/sub-mpsub-frames
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/sub-pjs b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/sub-pjs
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/sub-pjs
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/sub-pjs
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/sub-realtext b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/sub-realtext
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/sub-realtext
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/sub-realtext
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/sub-sami b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/sub-sami
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/sub-sami
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/sub-sami
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/sub-sami2 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/sub-sami2
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/sub-sami2
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/sub-sami2
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/sub-scc b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/sub-scc
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/sub-scc
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/sub-scc
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/sub-srt b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/sub-srt
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/sub-srt
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/sub-srt
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/sub-srt-badsyntax b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/sub-srt-badsyntax
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/sub-srt-badsyntax
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/sub-srt-badsyntax
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/sub-srt-empty-events b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/sub-srt-empty-events
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/sub-srt-empty-events
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/sub-srt-empty-events
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/sub-srt-madness-timeshift b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/sub-srt-madness-timeshift
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/sub-srt-madness-timeshift
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/sub-srt-madness-timeshift
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/sub-srt-rrn-remux b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/sub-srt-rrn-remux
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/sub-srt-rrn-remux
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/sub-srt-rrn-remux
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/sub-ssa-to-ass-remux b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/sub-ssa-to-ass-remux
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/sub-ssa-to-ass-remux
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/sub-ssa-to-ass-remux
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/sub-stl b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/sub-stl
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/sub-stl
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/sub-stl
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/sub-subripenc b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/sub-subripenc
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/sub-subripenc
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/sub-subripenc
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/sub-subviewer b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/sub-subviewer
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/sub-subviewer
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/sub-subviewer
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/sub-subviewer1 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/sub-subviewer1
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/sub-subviewer1
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/sub-subviewer1
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/sub-textenc b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/sub-textenc
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/sub-textenc
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/sub-textenc
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/sub-vplayer b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/sub-vplayer
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/sub-vplayer
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/sub-vplayer
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/sub-webvtt b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/sub-webvtt
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/sub-webvtt
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/sub-webvtt
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/sub-webvtt2 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/sub-webvtt2
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/sub-webvtt2
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/sub-webvtt2
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/sub-webvttenc b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/sub-webvttenc
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/sub-webvttenc
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/sub-webvttenc
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/sub2video b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/sub2video
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/sub2video
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/sub2video
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/sunraster-1bit-raw b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/sunraster-1bit-raw
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/sunraster-1bit-raw
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/sunraster-1bit-raw
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/sunraster-1bit-rle b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/sunraster-1bit-rle
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/sunraster-1bit-rle
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/sunraster-1bit-rle
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/sunraster-24bit-raw b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/sunraster-24bit-raw
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/sunraster-24bit-raw
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/sunraster-24bit-raw
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/sunraster-24bit-rle b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/sunraster-24bit-rle
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/sunraster-24bit-rle
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/sunraster-24bit-rle
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/sunraster-8bit-raw b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/sunraster-8bit-raw
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/sunraster-8bit-raw
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/sunraster-8bit-raw
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/sunraster-8bit-rle b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/sunraster-8bit-rle
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/sunraster-8bit-rle
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/sunraster-8bit-rle
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/sunraster-8bit_gray-raw b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/sunraster-8bit_gray-raw
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/sunraster-8bit_gray-raw
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/sunraster-8bit_gray-raw
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/svq1 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/svq1
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/svq1
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/svq1
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/svq1-headerswap b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/svq1-headerswap
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/svq1-headerswap
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/svq1-headerswap
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/svq3-1 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/svq3-1
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/svq3-1
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/svq3-1
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/svq3-2 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/svq3-2
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/svq3-2
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/svq3-2
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/svq3-watermark b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/svq3-watermark
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/svq3-watermark
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/svq3-watermark
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/sws-pixdesc-query b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/sws-pixdesc-query
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/sws-pixdesc-query
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/sws-pixdesc-query
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/targa-conformance-CBW8 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/targa-conformance-CBW8
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/targa-conformance-CBW8
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/targa-conformance-CBW8
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/targa-conformance-CCM8 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/targa-conformance-CCM8
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/targa-conformance-CCM8
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/targa-conformance-CCM8
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/targa-conformance-CTC16 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/targa-conformance-CTC16
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/targa-conformance-CTC16
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/targa-conformance-CTC16
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/targa-conformance-CTC24 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/targa-conformance-CTC24
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/targa-conformance-CTC24
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/targa-conformance-CTC24
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/targa-conformance-CTC32 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/targa-conformance-CTC32
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/targa-conformance-CTC32
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/targa-conformance-CTC32
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/targa-conformance-UBW8 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/targa-conformance-UBW8
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/targa-conformance-UBW8
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/targa-conformance-UBW8
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/targa-conformance-UCM8 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/targa-conformance-UCM8
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/targa-conformance-UCM8
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/targa-conformance-UCM8
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/targa-conformance-UTC16 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/targa-conformance-UTC16
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/targa-conformance-UTC16
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/targa-conformance-UTC16
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/targa-conformance-UTC24 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/targa-conformance-UTC24
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/targa-conformance-UTC24
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/targa-conformance-UTC24
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/targa-conformance-UTC32 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/targa-conformance-UTC32
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/targa-conformance-UTC32
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/targa-conformance-UTC32
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/targa-top-to-bottom b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/targa-top-to-bottom
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/targa-top-to-bottom
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/targa-top-to-bottom
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/tdsc b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/tdsc
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/tdsc
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/tdsc
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/tea b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/tea
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/tea
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/tea
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/theora-coeff-level64 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/theora-coeff-level64
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/theora-coeff-level64
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/theora-coeff-level64
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/theora-offset b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/theora-offset
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/theora-offset
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/theora-offset
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/thp b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/thp
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/thp
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/thp
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/tiertex-seq b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/tiertex-seq
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/tiertex-seq
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/tiertex-seq
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/tiff-fax-g3 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/tiff-fax-g3
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/tiff-fax-g3
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/tiff-fax-g3
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/tiff-fax-g3s b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/tiff-fax-g3s
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/tiff-fax-g3s
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/tiff-fax-g3s
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/time_base b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/time_base
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/time_base
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/time_base
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/timefilter b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/timefilter
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/timefilter
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/timefilter
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/tmv b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/tmv
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/tmv
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/tmv
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/truemotion1-15 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/truemotion1-15
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/truemotion1-15
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/truemotion1-15
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/truemotion1-24 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/truemotion1-24
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/truemotion1-24
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/truemotion1-24
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/truemotion2 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/truemotion2
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/truemotion2
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/truemotion2
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/truemotion2rt-high b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/truemotion2rt-high
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/truemotion2rt-high
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/truemotion2rt-high
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/truemotion2rt-low b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/truemotion2rt-low
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/truemotion2rt-low
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/truemotion2rt-low
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/truemotion2rt-mid b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/truemotion2rt-mid
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/truemotion2rt-mid
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/truemotion2rt-mid
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/ts-demux b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/ts-demux
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/ts-demux
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/ts-demux
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/ts-opus-demux b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/ts-opus-demux
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/ts-opus-demux
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/ts-opus-demux
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/ts-small-demux b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/ts-small-demux
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/ts-small-demux
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/ts-small-demux
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/tscc-15bit b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/tscc-15bit
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/tscc-15bit
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/tscc-15bit
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/tscc-32bit b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/tscc-32bit
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/tscc-32bit
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/tscc-32bit
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/tscc2-avi b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/tscc2-avi
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/tscc2-avi
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/tscc2-avi
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/tscc2-mov b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/tscc2-mov
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/tscc2-mov
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/tscc2-mov
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/txd-16bpp b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/txd-16bpp
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/txd-16bpp
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/txd-16bpp
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/txd-odd b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/txd-odd
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/txd-odd
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/txd-odd
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/txd-pal8 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/txd-pal8
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/txd-pal8
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/txd-pal8
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/ulti b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/ulti
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/ulti
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/ulti
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/unknown_layout-ac3 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/unknown_layout-ac3
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/unknown_layout-ac3
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/unknown_layout-ac3
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/unknown_layout-pcm b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/unknown_layout-pcm
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/unknown_layout-pcm
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/unknown_layout-pcm
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/url b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/url
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/url
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/url
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/utvideo_rgb_int_gradient b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/utvideo_rgb_int_gradient
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/utvideo_rgb_int_gradient
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/utvideo_rgb_int_gradient
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/utvideo_rgb_int_median b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/utvideo_rgb_int_median
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/utvideo_rgb_int_median
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/utvideo_rgb_int_median
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/utvideo_rgb_left b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/utvideo_rgb_left
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/utvideo_rgb_left
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/utvideo_rgb_left
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/utvideo_rgb_median b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/utvideo_rgb_median
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/utvideo_rgb_median
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/utvideo_rgb_median
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/utvideo_rgba_gradient b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/utvideo_rgba_gradient
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/utvideo_rgba_gradient
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/utvideo_rgba_gradient
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/utvideo_rgba_left b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/utvideo_rgba_left
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/utvideo_rgba_left
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/utvideo_rgba_left
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/utvideo_rgba_median b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/utvideo_rgba_median
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/utvideo_rgba_median
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/utvideo_rgba_median
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/utvideo_rgba_single_symbol b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/utvideo_rgba_single_symbol
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/utvideo_rgba_single_symbol
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/utvideo_rgba_single_symbol
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/utvideo_yuv420_gradient b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/utvideo_yuv420_gradient
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/utvideo_yuv420_gradient
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/utvideo_yuv420_gradient
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/utvideo_yuv420_int_gradient b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/utvideo_yuv420_int_gradient
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/utvideo_yuv420_int_gradient
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/utvideo_yuv420_int_gradient
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/utvideo_yuv420_int_median b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/utvideo_yuv420_int_median
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/utvideo_yuv420_int_median
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/utvideo_yuv420_int_median
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/utvideo_yuv420_left b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/utvideo_yuv420_left
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/utvideo_yuv420_left
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/utvideo_yuv420_left
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/utvideo_yuv420_median b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/utvideo_yuv420_median
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/utvideo_yuv420_median
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/utvideo_yuv420_median
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/utvideo_yuv422_gradient b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/utvideo_yuv422_gradient
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/utvideo_yuv422_gradient
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/utvideo_yuv422_gradient
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/utvideo_yuv422_int_gradient b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/utvideo_yuv422_int_gradient
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/utvideo_yuv422_int_gradient
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/utvideo_yuv422_int_gradient
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/utvideo_yuv422_int_median b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/utvideo_yuv422_int_median
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/utvideo_yuv422_int_median
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/utvideo_yuv422_int_median
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/utvideo_yuv422_left b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/utvideo_yuv422_left
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/utvideo_yuv422_left
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/utvideo_yuv422_left
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/utvideo_yuv422_median b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/utvideo_yuv422_median
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/utvideo_yuv422_median
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/utvideo_yuv422_median
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/utvideo_yuv444_709_gradient b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/utvideo_yuv444_709_gradient
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/utvideo_yuv444_709_gradient
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/utvideo_yuv444_709_gradient
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/utvideo_yuv444_709_int_gradient b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/utvideo_yuv444_709_int_gradient
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/utvideo_yuv444_709_int_gradient
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/utvideo_yuv444_709_int_gradient
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/utvideo_yuv444_709_int_median b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/utvideo_yuv444_709_int_median
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/utvideo_yuv444_709_int_median
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/utvideo_yuv444_709_int_median
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/utvideo_yuv444_709_median b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/utvideo_yuv444_709_median
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/utvideo_yuv444_709_median
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/utvideo_yuv444_709_median
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/utvideoenc_rgb_left b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/utvideoenc_rgb_left
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/utvideoenc_rgb_left
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/utvideoenc_rgb_left
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/utvideoenc_rgb_median b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/utvideoenc_rgb_median
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/utvideoenc_rgb_median
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/utvideoenc_rgb_median
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/utvideoenc_rgb_none b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/utvideoenc_rgb_none
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/utvideoenc_rgb_none
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/utvideoenc_rgb_none
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/utvideoenc_rgba_left b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/utvideoenc_rgba_left
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/utvideoenc_rgba_left
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/utvideoenc_rgba_left
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/utvideoenc_rgba_median b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/utvideoenc_rgba_median
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/utvideoenc_rgba_median
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/utvideoenc_rgba_median
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/utvideoenc_rgba_none b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/utvideoenc_rgba_none
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/utvideoenc_rgba_none
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/utvideoenc_rgba_none
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/utvideoenc_yuv420_left b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/utvideoenc_yuv420_left
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/utvideoenc_yuv420_left
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/utvideoenc_yuv420_left
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/utvideoenc_yuv420_median b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/utvideoenc_yuv420_median
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/utvideoenc_yuv420_median
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/utvideoenc_yuv420_median
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/utvideoenc_yuv420_none b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/utvideoenc_yuv420_none
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/utvideoenc_yuv420_none
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/utvideoenc_yuv420_none
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/utvideoenc_yuv422_left b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/utvideoenc_yuv422_left
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/utvideoenc_yuv422_left
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/utvideoenc_yuv422_left
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/utvideoenc_yuv422_median b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/utvideoenc_yuv422_median
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/utvideoenc_yuv422_median
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/utvideoenc_yuv422_median
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/utvideoenc_yuv422_none b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/utvideoenc_yuv422_none
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/utvideoenc_yuv422_none
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/utvideoenc_yuv422_none
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/utvideoenc_yuv444_left b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/utvideoenc_yuv444_left
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/utvideoenc_yuv444_left
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/utvideoenc_yuv444_left
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/utvideoenc_yuv444_median b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/utvideoenc_yuv444_median
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/utvideoenc_yuv444_median
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/utvideoenc_yuv444_median
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/utvideoenc_yuv444_none b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/utvideoenc_yuv444_none
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/utvideoenc_yuv444_none
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/utvideoenc_yuv444_none
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/v210 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/v210
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/v210
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/v210
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/v410dec b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/v410dec
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/v410dec
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/v410dec
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/v410enc b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/v410enc
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/v410enc
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/v410enc
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vb b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vb
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vb
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vb
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vble b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vble
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vble
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vble
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vc1-ism b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vc1-ism
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vc1-ism
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vc1-ism
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vc1_ilaced_twomv b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vc1_ilaced_twomv
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vc1_ilaced_twomv
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vc1_ilaced_twomv
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vc1_sa00040 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vc1_sa00040
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vc1_sa00040
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vc1_sa00040
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vc1_sa00050 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vc1_sa00050
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vc1_sa00050
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vc1_sa00050
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vc1_sa10091 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vc1_sa10091
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vc1_sa10091
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vc1_sa10091
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vc1_sa10143 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vc1_sa10143
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vc1_sa10143
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vc1_sa10143
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vc1_sa20021 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vc1_sa20021
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vc1_sa20021
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vc1_sa20021
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vcr1 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vcr1
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vcr1
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vcr1
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vcr2 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vcr2
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vcr2
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vcr2
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/videoxl b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/videoxl
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/videoxl
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/videoxl
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vmnc-16bit b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vmnc-16bit
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vmnc-16bit
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vmnc-16bit
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vmnc-32bit b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vmnc-32bit
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vmnc-32bit
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vmnc-32bit
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vorbis-1833-chapters b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vorbis-1833-chapters
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vorbis-1833-chapters
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vorbis-1833-chapters
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp31 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp31
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp31
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp31
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp5 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp5
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp5
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp5
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp60 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp60
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp60
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp60
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp61 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp61
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp61
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp61
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp6a b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp6a
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp6a
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp6a
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp6a-skip_alpha b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp6a-skip_alpha
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp6a-skip_alpha
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp6a-skip_alpha
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp6f b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp6f
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp6f
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp6f
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp7 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp7
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp7
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp7
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp8-2451 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp8-2451
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp8-2451
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp8-2451
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp8-alpha b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp8-alpha
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp8-alpha
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp8-alpha
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp8-sign-bias b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp8-sign-bias
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp8-sign-bias
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp8-sign-bias
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp8-size-change b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp8-size-change
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp8-size-change
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp8-size-change
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp8-test-vector-001 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp8-test-vector-001
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp8-test-vector-001
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp8-test-vector-001
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp8-test-vector-002 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp8-test-vector-002
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp8-test-vector-002
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp8-test-vector-002
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp8-test-vector-003 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp8-test-vector-003
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp8-test-vector-003
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp8-test-vector-003
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp8-test-vector-004 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp8-test-vector-004
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp8-test-vector-004
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp8-test-vector-004
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp8-test-vector-005 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp8-test-vector-005
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp8-test-vector-005
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp8-test-vector-005
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp8-test-vector-006 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp8-test-vector-006
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp8-test-vector-006
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp8-test-vector-006
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp8-test-vector-007 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp8-test-vector-007
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp8-test-vector-007
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp8-test-vector-007
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp8-test-vector-008 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp8-test-vector-008
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp8-test-vector-008
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp8-test-vector-008
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp8-test-vector-009 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp8-test-vector-009
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp8-test-vector-009
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp8-test-vector-009
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp8-test-vector-010 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp8-test-vector-010
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp8-test-vector-010
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp8-test-vector-010
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp8-test-vector-011 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp8-test-vector-011
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp8-test-vector-011
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp8-test-vector-011
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp8-test-vector-012 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp8-test-vector-012
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp8-test-vector-012
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp8-test-vector-012
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp8-test-vector-013 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp8-test-vector-013
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp8-test-vector-013
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp8-test-vector-013
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp8-test-vector-014 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp8-test-vector-014
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp8-test-vector-014
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp8-test-vector-014
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp8-test-vector-015 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp8-test-vector-015
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp8-test-vector-015
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp8-test-vector-015
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp8-test-vector-016 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp8-test-vector-016
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp8-test-vector-016
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp8-test-vector-016
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp8-test-vector-017 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp8-test-vector-017
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp8-test-vector-017
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp8-test-vector-017
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-00-quantizer-00 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-00-quantizer-00
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-00-quantizer-00
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-00-quantizer-00
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-00-quantizer-01 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-00-quantizer-01
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-00-quantizer-01
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-00-quantizer-01
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-00-quantizer-02 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-00-quantizer-02
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-00-quantizer-02
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-00-quantizer-02
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-00-quantizer-03 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-00-quantizer-03
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-00-quantizer-03
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-00-quantizer-03
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-00-quantizer-04 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-00-quantizer-04
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-00-quantizer-04
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-00-quantizer-04
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-00-quantizer-05 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-00-quantizer-05
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-00-quantizer-05
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-00-quantizer-05
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-00-quantizer-06 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-00-quantizer-06
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-00-quantizer-06
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-00-quantizer-06
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-00-quantizer-07 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-00-quantizer-07
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-00-quantizer-07
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-00-quantizer-07
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-00-quantizer-08 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-00-quantizer-08
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-00-quantizer-08
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-00-quantizer-08
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-00-quantizer-09 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-00-quantizer-09
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-00-quantizer-09
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-00-quantizer-09
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-00-quantizer-10 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-00-quantizer-10
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-00-quantizer-10
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-00-quantizer-10
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-00-quantizer-11 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-00-quantizer-11
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-00-quantizer-11
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-00-quantizer-11
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-00-quantizer-12 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-00-quantizer-12
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-00-quantizer-12
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-00-quantizer-12
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-00-quantizer-13 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-00-quantizer-13
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-00-quantizer-13
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-00-quantizer-13
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-00-quantizer-14 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-00-quantizer-14
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-00-quantizer-14
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-00-quantizer-14
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-00-quantizer-15 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-00-quantizer-15
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-00-quantizer-15
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-00-quantizer-15
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-00-quantizer-16 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-00-quantizer-16
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-00-quantizer-16
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-00-quantizer-16
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-00-quantizer-17 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-00-quantizer-17
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-00-quantizer-17
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-00-quantizer-17
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-00-quantizer-18 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-00-quantizer-18
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-00-quantizer-18
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-00-quantizer-18
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-00-quantizer-19 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-00-quantizer-19
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-00-quantizer-19
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-00-quantizer-19
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-00-quantizer-20 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-00-quantizer-20
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-00-quantizer-20
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-00-quantizer-20
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-00-quantizer-21 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-00-quantizer-21
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-00-quantizer-21
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-00-quantizer-21
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-00-quantizer-22 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-00-quantizer-22
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-00-quantizer-22
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-00-quantizer-22
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-00-quantizer-23 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-00-quantizer-23
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-00-quantizer-23
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-00-quantizer-23
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-00-quantizer-24 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-00-quantizer-24
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-00-quantizer-24
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-00-quantizer-24
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-00-quantizer-25 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-00-quantizer-25
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-00-quantizer-25
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-00-quantizer-25
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-00-quantizer-26 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-00-quantizer-26
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-00-quantizer-26
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-00-quantizer-26
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-00-quantizer-27 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-00-quantizer-27
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-00-quantizer-27
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-00-quantizer-27
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-00-quantizer-28 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-00-quantizer-28
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-00-quantizer-28
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-00-quantizer-28
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-00-quantizer-29 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-00-quantizer-29
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-00-quantizer-29
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-00-quantizer-29
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-00-quantizer-30 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-00-quantizer-30
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-00-quantizer-30
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-00-quantizer-30
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-00-quantizer-31 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-00-quantizer-31
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-00-quantizer-31
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-00-quantizer-31
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-00-quantizer-32 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-00-quantizer-32
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-00-quantizer-32
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-00-quantizer-32
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-00-quantizer-33 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-00-quantizer-33
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-00-quantizer-33
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-00-quantizer-33
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-00-quantizer-34 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-00-quantizer-34
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-00-quantizer-34
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-00-quantizer-34
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-00-quantizer-35 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-00-quantizer-35
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-00-quantizer-35
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-00-quantizer-35
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-00-quantizer-36 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-00-quantizer-36
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-00-quantizer-36
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-00-quantizer-36
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-00-quantizer-37 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-00-quantizer-37
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-00-quantizer-37
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-00-quantizer-37
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-00-quantizer-38 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-00-quantizer-38
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-00-quantizer-38
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-00-quantizer-38
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-00-quantizer-39 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-00-quantizer-39
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-00-quantizer-39
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-00-quantizer-39
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-00-quantizer-40 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-00-quantizer-40
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-00-quantizer-40
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-00-quantizer-40
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-00-quantizer-41 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-00-quantizer-41
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-00-quantizer-41
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-00-quantizer-41
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-00-quantizer-42 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-00-quantizer-42
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-00-quantizer-42
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-00-quantizer-42
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-00-quantizer-43 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-00-quantizer-43
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-00-quantizer-43
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-00-quantizer-43
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-00-quantizer-44 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-00-quantizer-44
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-00-quantizer-44
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-00-quantizer-44
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-00-quantizer-45 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-00-quantizer-45
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-00-quantizer-45
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-00-quantizer-45
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-00-quantizer-46 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-00-quantizer-46
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-00-quantizer-46
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-00-quantizer-46
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-00-quantizer-47 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-00-quantizer-47
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-00-quantizer-47
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-00-quantizer-47
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-00-quantizer-48 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-00-quantizer-48
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-00-quantizer-48
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-00-quantizer-48
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-00-quantizer-49 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-00-quantizer-49
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-00-quantizer-49
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-00-quantizer-49
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-00-quantizer-50 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-00-quantizer-50
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-00-quantizer-50
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-00-quantizer-50
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-00-quantizer-51 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-00-quantizer-51
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-00-quantizer-51
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-00-quantizer-51
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-00-quantizer-52 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-00-quantizer-52
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-00-quantizer-52
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-00-quantizer-52
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-00-quantizer-53 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-00-quantizer-53
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-00-quantizer-53
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-00-quantizer-53
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-00-quantizer-54 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-00-quantizer-54
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-00-quantizer-54
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-00-quantizer-54
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-00-quantizer-55 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-00-quantizer-55
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-00-quantizer-55
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-00-quantizer-55
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-00-quantizer-56 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-00-quantizer-56
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-00-quantizer-56
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-00-quantizer-56
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-00-quantizer-57 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-00-quantizer-57
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-00-quantizer-57
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-00-quantizer-57
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-00-quantizer-58 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-00-quantizer-58
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-00-quantizer-58
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-00-quantizer-58
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-00-quantizer-59 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-00-quantizer-59
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-00-quantizer-59
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-00-quantizer-59
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-00-quantizer-60 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-00-quantizer-60
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-00-quantizer-60
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-00-quantizer-60
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-00-quantizer-61 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-00-quantizer-61
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-00-quantizer-61
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-00-quantizer-61
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-00-quantizer-62 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-00-quantizer-62
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-00-quantizer-62
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-00-quantizer-62
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-00-quantizer-63 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-00-quantizer-63
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-00-quantizer-63
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-00-quantizer-63
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-01-sharpness-1 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-01-sharpness-1
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-01-sharpness-1
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-01-sharpness-1
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-01-sharpness-2 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-01-sharpness-2
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-01-sharpness-2
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-01-sharpness-2
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-01-sharpness-3 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-01-sharpness-3
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-01-sharpness-3
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-01-sharpness-3
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-01-sharpness-4 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-01-sharpness-4
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-01-sharpness-4
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-01-sharpness-4
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-01-sharpness-5 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-01-sharpness-5
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-01-sharpness-5
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-01-sharpness-5
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-01-sharpness-6 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-01-sharpness-6
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-01-sharpness-6
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-01-sharpness-6
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-01-sharpness-7 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-01-sharpness-7
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-01-sharpness-7
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-01-sharpness-7
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-02-size-08x08 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-02-size-08x08
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-02-size-08x08
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-02-size-08x08
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-02-size-08x10 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-02-size-08x10
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-02-size-08x10
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-02-size-08x10
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-02-size-08x16 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-02-size-08x16
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-02-size-08x16
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-02-size-08x16
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-02-size-08x18 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-02-size-08x18
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-02-size-08x18
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-02-size-08x18
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-02-size-08x32 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-02-size-08x32
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-02-size-08x32
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-02-size-08x32
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-02-size-08x34 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-02-size-08x34
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-02-size-08x34
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-02-size-08x34
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-02-size-08x64 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-02-size-08x64
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-02-size-08x64
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-02-size-08x64
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-02-size-08x66 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-02-size-08x66
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-02-size-08x66
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-02-size-08x66
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-02-size-10x08 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-02-size-10x08
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-02-size-10x08
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-02-size-10x08
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-02-size-10x10 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-02-size-10x10
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-02-size-10x10
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-02-size-10x10
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-02-size-10x16 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-02-size-10x16
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-02-size-10x16
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-02-size-10x16
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-02-size-10x18 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-02-size-10x18
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-02-size-10x18
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-02-size-10x18
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-02-size-10x32 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-02-size-10x32
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-02-size-10x32
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-02-size-10x32
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-02-size-10x34 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-02-size-10x34
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-02-size-10x34
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-02-size-10x34
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-02-size-10x64 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-02-size-10x64
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-02-size-10x64
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-02-size-10x64
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-02-size-10x66 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-02-size-10x66
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-02-size-10x66
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-02-size-10x66
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-02-size-16x08 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-02-size-16x08
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-02-size-16x08
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-02-size-16x08
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-02-size-16x10 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-02-size-16x10
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-02-size-16x10
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-02-size-16x10
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-02-size-16x16 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-02-size-16x16
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-02-size-16x16
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-02-size-16x16
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-02-size-16x18 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-02-size-16x18
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-02-size-16x18
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-02-size-16x18
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-02-size-16x32 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-02-size-16x32
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-02-size-16x32
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-02-size-16x32
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-02-size-16x34 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-02-size-16x34
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-02-size-16x34
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-02-size-16x34
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-02-size-16x64 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-02-size-16x64
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-02-size-16x64
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-02-size-16x64
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-02-size-16x66 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-02-size-16x66
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-02-size-16x66
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-02-size-16x66
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-02-size-18x08 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-02-size-18x08
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-02-size-18x08
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-02-size-18x08
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-02-size-18x10 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-02-size-18x10
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-02-size-18x10
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-02-size-18x10
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-02-size-18x16 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-02-size-18x16
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-02-size-18x16
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-02-size-18x16
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-02-size-18x18 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-02-size-18x18
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-02-size-18x18
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-02-size-18x18
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-02-size-18x32 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-02-size-18x32
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-02-size-18x32
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-02-size-18x32
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-02-size-18x34 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-02-size-18x34
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-02-size-18x34
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-02-size-18x34
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-02-size-18x64 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-02-size-18x64
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-02-size-18x64
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-02-size-18x64
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-02-size-18x66 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-02-size-18x66
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-02-size-18x66
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-02-size-18x66
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-02-size-32x08 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-02-size-32x08
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-02-size-32x08
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-02-size-32x08
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-02-size-32x10 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-02-size-32x10
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-02-size-32x10
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-02-size-32x10
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-02-size-32x16 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-02-size-32x16
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-02-size-32x16
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-02-size-32x16
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-02-size-32x18 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-02-size-32x18
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-02-size-32x18
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-02-size-32x18
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-02-size-32x32 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-02-size-32x32
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-02-size-32x32
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-02-size-32x32
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-02-size-32x34 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-02-size-32x34
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-02-size-32x34
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-02-size-32x34
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-02-size-32x64 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-02-size-32x64
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-02-size-32x64
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-02-size-32x64
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-02-size-32x66 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-02-size-32x66
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-02-size-32x66
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-02-size-32x66
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-02-size-34x08 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-02-size-34x08
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-02-size-34x08
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-02-size-34x08
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-02-size-34x10 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-02-size-34x10
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-02-size-34x10
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-02-size-34x10
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-02-size-34x16 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-02-size-34x16
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-02-size-34x16
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-02-size-34x16
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-02-size-34x18 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-02-size-34x18
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-02-size-34x18
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-02-size-34x18
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-02-size-34x32 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-02-size-34x32
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-02-size-34x32
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-02-size-34x32
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-02-size-34x34 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-02-size-34x34
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-02-size-34x34
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-02-size-34x34
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-02-size-34x64 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-02-size-34x64
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-02-size-34x64
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-02-size-34x64
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-02-size-34x66 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-02-size-34x66
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-02-size-34x66
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-02-size-34x66
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-02-size-64x08 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-02-size-64x08
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-02-size-64x08
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-02-size-64x08
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-02-size-64x10 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-02-size-64x10
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-02-size-64x10
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-02-size-64x10
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-02-size-64x16 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-02-size-64x16
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-02-size-64x16
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-02-size-64x16
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-02-size-64x18 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-02-size-64x18
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-02-size-64x18
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-02-size-64x18
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-02-size-64x32 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-02-size-64x32
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-02-size-64x32
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-02-size-64x32
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-02-size-64x34 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-02-size-64x34
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-02-size-64x34
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-02-size-64x34
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-02-size-64x64 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-02-size-64x64
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-02-size-64x64
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-02-size-64x64
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-02-size-64x66 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-02-size-64x66
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-02-size-64x66
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-02-size-64x66
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-02-size-66x08 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-02-size-66x08
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-02-size-66x08
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-02-size-66x08
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-02-size-66x10 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-02-size-66x10
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-02-size-66x10
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-02-size-66x10
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-02-size-66x16 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-02-size-66x16
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-02-size-66x16
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-02-size-66x16
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-02-size-66x18 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-02-size-66x18
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-02-size-66x18
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-02-size-66x18
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-02-size-66x32 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-02-size-66x32
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-02-size-66x32
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-02-size-66x32
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-02-size-66x34 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-02-size-66x34
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-02-size-66x34
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-02-size-66x34
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-02-size-66x64 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-02-size-66x64
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-02-size-66x64
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-02-size-66x64
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-02-size-66x66 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-02-size-66x66
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-02-size-66x66
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-02-size-66x66
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-03-deltaq b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-03-deltaq
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-03-deltaq
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-03-deltaq
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-03-size-196x196 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-03-size-196x196
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-03-size-196x196
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-03-size-196x196
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-03-size-196x198 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-03-size-196x198
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-03-size-196x198
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-03-size-196x198
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-03-size-196x200 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-03-size-196x200
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-03-size-196x200
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-03-size-196x200
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-03-size-196x202 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-03-size-196x202
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-03-size-196x202
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-03-size-196x202
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-03-size-196x208 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-03-size-196x208
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-03-size-196x208
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-03-size-196x208
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-03-size-196x210 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-03-size-196x210
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-03-size-196x210
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-03-size-196x210
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-03-size-196x224 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-03-size-196x224
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-03-size-196x224
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-03-size-196x224
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-03-size-196x226 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-03-size-196x226
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-03-size-196x226
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-03-size-196x226
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-03-size-198x196 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-03-size-198x196
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-03-size-198x196
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-03-size-198x196
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-03-size-198x198 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-03-size-198x198
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-03-size-198x198
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-03-size-198x198
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-03-size-198x200 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-03-size-198x200
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-03-size-198x200
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-03-size-198x200
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-03-size-198x202 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-03-size-198x202
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-03-size-198x202
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-03-size-198x202
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-03-size-198x208 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-03-size-198x208
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-03-size-198x208
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-03-size-198x208
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-03-size-198x210 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-03-size-198x210
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-03-size-198x210
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-03-size-198x210
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-03-size-198x224 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-03-size-198x224
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-03-size-198x224
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-03-size-198x224
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-03-size-198x226 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-03-size-198x226
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-03-size-198x226
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-03-size-198x226
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-03-size-200x196 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-03-size-200x196
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-03-size-200x196
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-03-size-200x196
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-03-size-200x198 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-03-size-200x198
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-03-size-200x198
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-03-size-200x198
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-03-size-200x200 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-03-size-200x200
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-03-size-200x200
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-03-size-200x200
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-03-size-200x202 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-03-size-200x202
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-03-size-200x202
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-03-size-200x202
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-03-size-200x208 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-03-size-200x208
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-03-size-200x208
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-03-size-200x208
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-03-size-200x210 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-03-size-200x210
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-03-size-200x210
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-03-size-200x210
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-03-size-200x224 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-03-size-200x224
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-03-size-200x224
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-03-size-200x224
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-03-size-200x226 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-03-size-200x226
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-03-size-200x226
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-03-size-200x226
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-03-size-202x196 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-03-size-202x196
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-03-size-202x196
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-03-size-202x196
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-03-size-202x198 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-03-size-202x198
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-03-size-202x198
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-03-size-202x198
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-03-size-202x200 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-03-size-202x200
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-03-size-202x200
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-03-size-202x200
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-03-size-202x202 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-03-size-202x202
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-03-size-202x202
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-03-size-202x202
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-03-size-202x208 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-03-size-202x208
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-03-size-202x208
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-03-size-202x208
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-03-size-202x210 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-03-size-202x210
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-03-size-202x210
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-03-size-202x210
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-03-size-202x224 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-03-size-202x224
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-03-size-202x224
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-03-size-202x224
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-03-size-202x226 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-03-size-202x226
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-03-size-202x226
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-03-size-202x226
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-03-size-208x196 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-03-size-208x196
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-03-size-208x196
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-03-size-208x196
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-03-size-208x198 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-03-size-208x198
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-03-size-208x198
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-03-size-208x198
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-03-size-208x200 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-03-size-208x200
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-03-size-208x200
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-03-size-208x200
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-03-size-208x202 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-03-size-208x202
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-03-size-208x202
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-03-size-208x202
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-03-size-208x208 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-03-size-208x208
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-03-size-208x208
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-03-size-208x208
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-03-size-208x210 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-03-size-208x210
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-03-size-208x210
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-03-size-208x210
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-03-size-208x224 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-03-size-208x224
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-03-size-208x224
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-03-size-208x224
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-03-size-208x226 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-03-size-208x226
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-03-size-208x226
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-03-size-208x226
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-03-size-210x196 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-03-size-210x196
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-03-size-210x196
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-03-size-210x196
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-03-size-210x198 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-03-size-210x198
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-03-size-210x198
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-03-size-210x198
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-03-size-210x200 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-03-size-210x200
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-03-size-210x200
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-03-size-210x200
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-03-size-210x202 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-03-size-210x202
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-03-size-210x202
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-03-size-210x202
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-03-size-210x208 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-03-size-210x208
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-03-size-210x208
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-03-size-210x208
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-03-size-210x210 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-03-size-210x210
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-03-size-210x210
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-03-size-210x210
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-03-size-210x224 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-03-size-210x224
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-03-size-210x224
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-03-size-210x224
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-03-size-210x226 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-03-size-210x226
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-03-size-210x226
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-03-size-210x226
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-03-size-224x196 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-03-size-224x196
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-03-size-224x196
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-03-size-224x196
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-03-size-224x198 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-03-size-224x198
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-03-size-224x198
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-03-size-224x198
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-03-size-224x200 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-03-size-224x200
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-03-size-224x200
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-03-size-224x200
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-03-size-224x202 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-03-size-224x202
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-03-size-224x202
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-03-size-224x202
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-03-size-224x208 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-03-size-224x208
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-03-size-224x208
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-03-size-224x208
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-03-size-224x210 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-03-size-224x210
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-03-size-224x210
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-03-size-224x210
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-03-size-224x224 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-03-size-224x224
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-03-size-224x224
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-03-size-224x224
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-03-size-224x226 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-03-size-224x226
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-03-size-224x226
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-03-size-224x226
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-03-size-226x196 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-03-size-226x196
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-03-size-226x196
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-03-size-226x196
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-03-size-226x198 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-03-size-226x198
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-03-size-226x198
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-03-size-226x198
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-03-size-226x200 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-03-size-226x200
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-03-size-226x200
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-03-size-226x200
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-03-size-226x202 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-03-size-226x202
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-03-size-226x202
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-03-size-226x202
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-03-size-226x208 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-03-size-226x208
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-03-size-226x208
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-03-size-226x208
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-03-size-226x210 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-03-size-226x210
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-03-size-226x210
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-03-size-226x210
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-03-size-226x224 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-03-size-226x224
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-03-size-226x224
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-03-size-226x224
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-03-size-226x226 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-03-size-226x226
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-03-size-226x226
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-03-size-226x226
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-05-resize b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-05-resize
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-05-resize
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-05-resize
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-06-bilinear b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-06-bilinear
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-06-bilinear
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-06-bilinear
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-09-lf_deltas b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-09-lf_deltas
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-09-lf_deltas
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-09-lf_deltas
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-10-show-existing-frame b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-10-show-existing-frame
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-10-show-existing-frame
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-10-show-existing-frame
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-10-show-existing-frame2 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-10-show-existing-frame2
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-10-show-existing-frame2
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-10-show-existing-frame2
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-15-segkey_adpq b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-15-segkey_adpq
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-15-segkey_adpq
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-15-segkey_adpq
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-16-intra-only b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-16-intra-only
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-16-intra-only
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-16-intra-only
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-2pass-akiyo b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-2pass-akiyo
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-2pass-akiyo
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-2pass-akiyo
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-parallelmode-akiyo b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-parallelmode-akiyo
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-parallelmode-akiyo
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-parallelmode-akiyo
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-segmentation-aq-akiyo b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-segmentation-aq-akiyo
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-segmentation-aq-akiyo
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-segmentation-aq-akiyo
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-segmentation-sf-akiyo b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-segmentation-sf-akiyo
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-segmentation-sf-akiyo
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-segmentation-sf-akiyo
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-tiling-pedestrian b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-tiling-pedestrian
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-tiling-pedestrian
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-tiling-pedestrian
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-trac3849 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-trac3849
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-trac3849
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-trac3849
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-trac4359 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-trac4359
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-trac4359
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9-trac4359
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9p1-04-yuv422 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9p1-04-yuv422
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9p1-04-yuv422
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9p1-04-yuv422
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9p1-04-yuv440 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9p1-04-yuv440
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9p1-04-yuv440
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9p1-04-yuv440
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9p1-04-yuv444 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9p1-04-yuv444
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9p1-04-yuv444
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9p1-04-yuv444
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9p2-20-10bit-yuv420 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9p2-20-10bit-yuv420
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9p2-20-10bit-yuv420
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9p2-20-10bit-yuv420
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9p2-20-12bit-yuv420 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9p2-20-12bit-yuv420
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9p2-20-12bit-yuv420
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9p2-20-12bit-yuv420
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9p3-20-10bit-yuv422 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9p3-20-10bit-yuv422
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9p3-20-10bit-yuv422
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9p3-20-10bit-yuv422
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9p3-20-10bit-yuv440 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9p3-20-10bit-yuv440
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9p3-20-10bit-yuv440
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9p3-20-10bit-yuv440
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9p3-20-10bit-yuv444 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9p3-20-10bit-yuv444
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9p3-20-10bit-yuv444
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9p3-20-10bit-yuv444
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9p3-20-12bit-yuv422 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9p3-20-12bit-yuv422
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9p3-20-12bit-yuv422
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9p3-20-12bit-yuv422
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9p3-20-12bit-yuv440 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9p3-20-12bit-yuv440
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9p3-20-12bit-yuv440
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9p3-20-12bit-yuv440
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9p3-20-12bit-yuv444 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9p3-20-12bit-yuv444
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9p3-20-12bit-yuv444
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vp9p3-20-12bit-yuv444
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vqa-cc b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vqa-cc
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vqa-cc
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vqa-cc
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vqf-demux b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vqf-demux
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/vqf-demux
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/vqf-demux
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/w64 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/w64
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/w64
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/w64
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/wav-ac3 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/wav-ac3
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/wav-ac3
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/wav-ac3
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/wavpack-channels-4.0 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/wavpack-channels-4.0
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/wavpack-channels-4.0
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/wavpack-channels-4.0
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/wavpack-channels-5.1 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/wavpack-channels-5.1
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/wavpack-channels-5.1
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/wavpack-channels-5.1
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/wavpack-channels-6.1 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/wavpack-channels-6.1
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/wavpack-channels-6.1
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/wavpack-channels-6.1
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/wavpack-channels-7.1 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/wavpack-channels-7.1
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/wavpack-channels-7.1
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/wavpack-channels-7.1
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/wavpack-channels-monofloat b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/wavpack-channels-monofloat
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/wavpack-channels-monofloat
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/wavpack-channels-monofloat
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/wavpack-channels-monoint b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/wavpack-channels-monoint
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/wavpack-channels-monoint
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/wavpack-channels-monoint
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/wavpack-clipping b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/wavpack-clipping
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/wavpack-clipping
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/wavpack-clipping
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/wavpack-cuesheet b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/wavpack-cuesheet
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/wavpack-cuesheet
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/wavpack-cuesheet
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/wavpack-falsestereo b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/wavpack-falsestereo
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/wavpack-falsestereo
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/wavpack-falsestereo
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/wavpack-lossless-12bit b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/wavpack-lossless-12bit
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/wavpack-lossless-12bit
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/wavpack-lossless-12bit
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/wavpack-lossless-16bit b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/wavpack-lossless-16bit
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/wavpack-lossless-16bit
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/wavpack-lossless-16bit
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/wavpack-lossless-24bit b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/wavpack-lossless-24bit
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/wavpack-lossless-24bit
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/wavpack-lossless-24bit
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/wavpack-lossless-32bit b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/wavpack-lossless-32bit
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/wavpack-lossless-32bit
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/wavpack-lossless-32bit
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/wavpack-lossless-8bit b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/wavpack-lossless-8bit
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/wavpack-lossless-8bit
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/wavpack-lossless-8bit
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/wavpack-lossless-float b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/wavpack-lossless-float
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/wavpack-lossless-float
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/wavpack-lossless-float
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/wavpack-lossy-16bit b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/wavpack-lossy-16bit
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/wavpack-lossy-16bit
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/wavpack-lossy-16bit
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/wavpack-lossy-24bit b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/wavpack-lossy-24bit
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/wavpack-lossy-24bit
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/wavpack-lossy-24bit
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/wavpack-lossy-32bit b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/wavpack-lossy-32bit
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/wavpack-lossy-32bit
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/wavpack-lossy-32bit
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/wavpack-lossy-8bit b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/wavpack-lossy-8bit
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/wavpack-lossy-8bit
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/wavpack-lossy-8bit
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/wavpack-lossy-float b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/wavpack-lossy-float
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/wavpack-lossy-float
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/wavpack-lossy-float
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/wavpack-matroskamode b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/wavpack-matroskamode
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/wavpack-matroskamode
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/wavpack-matroskamode
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/wavpack-speed-default b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/wavpack-speed-default
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/wavpack-speed-default
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/wavpack-speed-default
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/wavpack-speed-fast b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/wavpack-speed-fast
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/wavpack-speed-fast
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/wavpack-speed-fast
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/wavpack-speed-high b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/wavpack-speed-high
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/wavpack-speed-high
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/wavpack-speed-high
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/wavpack-speed-vhigh b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/wavpack-speed-vhigh
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/wavpack-speed-vhigh
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/wavpack-speed-vhigh
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/wavpack-zerolsbs b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/wavpack-zerolsbs
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/wavpack-zerolsbs
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/wavpack-zerolsbs
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/wc3movie-xan b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/wc3movie-xan
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/wc3movie-xan
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/wc3movie-xan
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/webm-dash-manifest b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/webm-dash-manifest
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/webm-dash-manifest
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/webm-dash-manifest
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/webm-dash-manifest-live b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/webm-dash-manifest-live
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/webm-dash-manifest-live
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/webm-dash-manifest-live
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/webm-dash-manifest-live-bandwidth b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/webm-dash-manifest-live-bandwidth
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/webm-dash-manifest-live-bandwidth
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/webm-dash-manifest-live-bandwidth
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/webm-dash-manifest-representations b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/webm-dash-manifest-representations
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/webm-dash-manifest-representations
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/webm-dash-manifest-representations
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/webm-dash-manifest-unaligned-audio-streams b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/webm-dash-manifest-unaligned-audio-streams
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/webm-dash-manifest-unaligned-audio-streams
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/webm-dash-manifest-unaligned-audio-streams
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/webm-dash-manifest-unaligned-video-streams b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/webm-dash-manifest-unaligned-video-streams
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/webm-dash-manifest-unaligned-video-streams
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/webm-dash-manifest-unaligned-video-streams
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/webp-rgb-lena-lossless b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/webp-rgb-lena-lossless
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/webp-rgb-lena-lossless
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/webp-rgb-lena-lossless
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/webp-rgb-lena-lossless-rgb24 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/webp-rgb-lena-lossless-rgb24
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/webp-rgb-lena-lossless-rgb24
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/webp-rgb-lena-lossless-rgb24
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/webp-rgb-lossless b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/webp-rgb-lossless
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/webp-rgb-lossless
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/webp-rgb-lossless
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/webp-rgb-lossy-q80 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/webp-rgb-lossy-q80
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/webp-rgb-lossy-q80
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/webp-rgb-lossy-q80
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/webp-rgba-lossless b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/webp-rgba-lossless
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/webp-rgba-lossless
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/webp-rgba-lossless
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/webp-rgba-lossy-q80 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/webp-rgba-lossy-q80
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/webp-rgba-lossy-q80
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/webp-rgba-lossy-q80
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/westwood-aud b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/westwood-aud
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/westwood-aud
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/westwood-aud
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/wmv3-drm-dec b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/wmv3-drm-dec
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/wmv3-drm-dec
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/wmv3-drm-dec
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/wmv3-drm-nodec b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/wmv3-drm-nodec
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/wmv3-drm-nodec
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/wmv3-drm-nodec
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/wmv8-x8intra b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/wmv8-x8intra
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/wmv8-x8intra
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/wmv8-x8intra
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/wnv1 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/wnv1
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/wnv1
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/wnv1
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/ws_snd b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/ws_snd
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/ws_snd
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/ws_snd
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/wtv-demux b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/wtv-demux
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/wtv-demux
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/wtv-demux
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/xbm10 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/xbm10
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/xbm10
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/xbm10
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/xbm11 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/xbm11
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/xbm11
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/xbm11
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/xface b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/xface
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/xface
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/xface
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/xmv-demux b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/xmv-demux
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/xmv-demux
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/xmv-demux
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/xtea b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/xtea
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/xtea
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/xtea
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/xvid-custom-matrix b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/xvid-custom-matrix
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/xvid-custom-matrix
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/xvid-custom-matrix
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/xvid-idct b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/xvid-idct
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/xvid-idct
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/xvid-idct
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/xwma-demux b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/xwma-demux
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/xwma-demux
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/xwma-demux
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/xxan-wc4 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/xxan-wc4
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/xxan-wc4
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/xxan-wc4
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/yop b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/yop
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/yop
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/yop
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/zerocodec b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/zerocodec
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/zerocodec
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/zerocodec
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/zlib b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/zlib
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/zlib
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/zlib
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/zmbv-15bit b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/zmbv-15bit
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/zmbv-15bit
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/zmbv-15bit
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/zmbv-16bit b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/zmbv-16bit
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/zmbv-16bit
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/zmbv-16bit
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/zmbv-32bit b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/zmbv-32bit
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/zmbv-32bit
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/zmbv-32bit
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/zmbv-8bit b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/zmbv-8bit
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/fate/zmbv-8bit
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/fate/zmbv-8bit
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/lavf-fate/avi_cram b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/lavf-fate/avi_cram
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/lavf-fate/avi_cram
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/lavf-fate/avi_cram
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/lavf-fate/latm b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/lavf-fate/latm
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/lavf-fate/latm
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/lavf-fate/latm
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/lavf-fate/mov_qtrle_mace6 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/lavf-fate/mov_qtrle_mace6
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/lavf-fate/mov_qtrle_mace6
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/lavf-fate/mov_qtrle_mace6
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/lavf-fate/mp3 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/lavf-fate/mp3
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/lavf-fate/mp3
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/lavf-fate/mp3
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/lavf-fate/ogg_vp3 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/lavf-fate/ogg_vp3
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/lavf-fate/ogg_vp3
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/lavf-fate/ogg_vp3
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/lavf-fate/ogg_vp8 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/lavf-fate/ogg_vp8
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/lavf-fate/ogg_vp8
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/lavf-fate/ogg_vp8
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/lavf/aiff b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/lavf/aiff
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/lavf/aiff
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/lavf/aiff
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/lavf/alaw b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/lavf/alaw
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/lavf/alaw
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/lavf/alaw
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/lavf/apng b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/lavf/apng
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/lavf/apng
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/lavf/apng
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/lavf/asf b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/lavf/asf
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/lavf/asf
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/lavf/asf
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/lavf/ast b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/lavf/ast
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/lavf/ast
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/lavf/ast
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/lavf/au b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/lavf/au
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/lavf/au
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/lavf/au
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/lavf/avi b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/lavf/avi
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/lavf/avi
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/lavf/avi
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/lavf/bmp b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/lavf/bmp
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/lavf/bmp
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/lavf/bmp
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/lavf/caf b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/lavf/caf
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/lavf/caf
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/lavf/caf
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/lavf/dpx b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/lavf/dpx
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/lavf/dpx
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/lavf/dpx
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/lavf/dv_fmt b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/lavf/dv_fmt
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/lavf/dv_fmt
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/lavf/dv_fmt
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/lavf/fits b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/lavf/fits
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/lavf/fits
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/lavf/fits
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/lavf/flm b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/lavf/flm
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/lavf/flm
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/lavf/flm
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/lavf/flv_fmt b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/lavf/flv_fmt
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/lavf/flv_fmt
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/lavf/flv_fmt
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/lavf/gif b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/lavf/gif
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/lavf/gif
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/lavf/gif
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/lavf/gxf b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/lavf/gxf
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/lavf/gxf
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/lavf/gxf
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/lavf/ircam b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/lavf/ircam
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/lavf/ircam
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/lavf/ircam
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/lavf/ismv b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/lavf/ismv
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/lavf/ismv
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/lavf/ismv
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/lavf/jpg b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/lavf/jpg
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/lavf/jpg
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/lavf/jpg
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/lavf/mka b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/lavf/mka
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/lavf/mka
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/lavf/mka
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/lavf/mkv b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/lavf/mkv
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/lavf/mkv
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/lavf/mkv
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/lavf/mmf b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/lavf/mmf
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/lavf/mmf
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/lavf/mmf
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/lavf/mov b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/lavf/mov
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/lavf/mov
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/lavf/mov
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/lavf/mpg b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/lavf/mpg
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/lavf/mpg
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/lavf/mpg
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/lavf/mulaw b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/lavf/mulaw
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/lavf/mulaw
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/lavf/mulaw
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/lavf/mxf b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/lavf/mxf
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/lavf/mxf
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/lavf/mxf
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/lavf/mxf_d10 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/lavf/mxf_d10
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/lavf/mxf_d10
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/lavf/mxf_d10
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/lavf/mxf_dv25 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/lavf/mxf_dv25
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/lavf/mxf_dv25
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/lavf/mxf_dv25
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/lavf/mxf_dvcpro50 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/lavf/mxf_dvcpro50
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/lavf/mxf_dvcpro50
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/lavf/mxf_dvcpro50
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/lavf/mxf_opatom b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/lavf/mxf_opatom
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/lavf/mxf_opatom
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/lavf/mxf_opatom
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/lavf/mxf_opatom_audio b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/lavf/mxf_opatom_audio
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/lavf/mxf_opatom_audio
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/lavf/mxf_opatom_audio
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/lavf/nut b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/lavf/nut
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/lavf/nut
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/lavf/nut
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/lavf/ogg b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/lavf/ogg
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/lavf/ogg
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/lavf/ogg
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/lavf/pam b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/lavf/pam
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/lavf/pam
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/lavf/pam
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/lavf/pbmpipe b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/lavf/pbmpipe
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/lavf/pbmpipe
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/lavf/pbmpipe
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/lavf/pcx b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/lavf/pcx
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/lavf/pcx
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/lavf/pcx
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/lavf/pgm b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/lavf/pgm
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/lavf/pgm
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/lavf/pgm
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/lavf/pgmpipe b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/lavf/pgmpipe
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/lavf/pgmpipe
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/lavf/pgmpipe
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/lavf/pixfmt b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/lavf/pixfmt
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/lavf/pixfmt
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/lavf/pixfmt
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/lavf/png b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/lavf/png
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/lavf/png
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/lavf/png
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/lavf/ppm b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/lavf/ppm
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/lavf/ppm
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/lavf/ppm
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/lavf/ppmpipe b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/lavf/ppmpipe
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/lavf/ppmpipe
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/lavf/ppmpipe
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/lavf/rm b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/lavf/rm
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/lavf/rm
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/lavf/rm
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/lavf/rso b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/lavf/rso
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/lavf/rso
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/lavf/rso
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/lavf/sgi b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/lavf/sgi
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/lavf/sgi
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/lavf/sgi
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/lavf/smjpeg b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/lavf/smjpeg
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/lavf/smjpeg
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/lavf/smjpeg
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/lavf/sox b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/lavf/sox
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/lavf/sox
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/lavf/sox
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/lavf/sunrast b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/lavf/sunrast
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/lavf/sunrast
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/lavf/sunrast
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/lavf/swf b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/lavf/swf
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/lavf/swf
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/lavf/swf
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/lavf/tga b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/lavf/tga
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/lavf/tga
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/lavf/tga
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/lavf/tiff b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/lavf/tiff
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/lavf/tiff
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/lavf/tiff
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/lavf/ts b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/lavf/ts
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/lavf/ts
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/lavf/ts
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/lavf/tta b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/lavf/tta
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/lavf/tta
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/lavf/tta
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/lavf/voc b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/lavf/voc
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/lavf/voc
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/lavf/voc
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/lavf/voc_s16 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/lavf/voc_s16
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/lavf/voc_s16
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/lavf/voc_s16
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/lavf/w64 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/lavf/w64
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/lavf/w64
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/lavf/w64
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/lavf/wav b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/lavf/wav
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/lavf/wav
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/lavf/wav
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/lavf/wav_peak b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/lavf/wav_peak
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/lavf/wav_peak
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/lavf/wav_peak
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/lavf/wav_peak_only b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/lavf/wav_peak_only
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/lavf/wav_peak_only
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/lavf/wav_peak_only
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/lavf/wtv b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/lavf/wtv
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/lavf/wtv
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/lavf/wtv
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/lavf/wv b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/lavf/wv
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/lavf/wv
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/lavf/wv
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/lavf/xbm b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/lavf/xbm
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/lavf/xbm
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/lavf/xbm
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/lavf/xwd b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/lavf/xwd
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/lavf/xwd
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/lavf/xwd
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/lavf/yuv4mpeg b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/lavf/yuv4mpeg
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/lavf/yuv4mpeg
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/lavf/yuv4mpeg
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/seek/acodec-adpcm-ima_qt b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/seek/acodec-adpcm-ima_qt
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/seek/acodec-adpcm-ima_qt
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/seek/acodec-adpcm-ima_qt
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/seek/acodec-adpcm-ima_qt-trellis b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/seek/acodec-adpcm-ima_qt-trellis
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/seek/acodec-adpcm-ima_qt-trellis
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/seek/acodec-adpcm-ima_qt-trellis
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/seek/acodec-adpcm-ima_wav b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/seek/acodec-adpcm-ima_wav
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/seek/acodec-adpcm-ima_wav
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/seek/acodec-adpcm-ima_wav
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/seek/acodec-adpcm-ima_wav-trellis b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/seek/acodec-adpcm-ima_wav-trellis
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/seek/acodec-adpcm-ima_wav-trellis
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/seek/acodec-adpcm-ima_wav-trellis
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/seek/acodec-adpcm-ms b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/seek/acodec-adpcm-ms
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/seek/acodec-adpcm-ms
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/seek/acodec-adpcm-ms
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/seek/acodec-adpcm-ms-trellis b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/seek/acodec-adpcm-ms-trellis
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/seek/acodec-adpcm-ms-trellis
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/seek/acodec-adpcm-ms-trellis
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/seek/acodec-adpcm-swf b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/seek/acodec-adpcm-swf
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/seek/acodec-adpcm-swf
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/seek/acodec-adpcm-swf
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/seek/acodec-adpcm-swf-trellis b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/seek/acodec-adpcm-swf-trellis
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/seek/acodec-adpcm-swf-trellis
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/seek/acodec-adpcm-swf-trellis
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/seek/acodec-adpcm-yamaha b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/seek/acodec-adpcm-yamaha
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/seek/acodec-adpcm-yamaha
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/seek/acodec-adpcm-yamaha
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/seek/acodec-adpcm-yamaha-trellis b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/seek/acodec-adpcm-yamaha-trellis
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/seek/acodec-adpcm-yamaha-trellis
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/seek/acodec-adpcm-yamaha-trellis
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/seek/acodec-alac b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/seek/acodec-alac
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/seek/acodec-alac
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/seek/acodec-alac
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/seek/acodec-flac b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/seek/acodec-flac
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/seek/acodec-flac
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/seek/acodec-flac
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/seek/acodec-mp2 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/seek/acodec-mp2
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/seek/acodec-mp2
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/seek/acodec-mp2
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/seek/acodec-pcm-alaw b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/seek/acodec-pcm-alaw
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/seek/acodec-pcm-alaw
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/seek/acodec-pcm-alaw
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/seek/acodec-pcm-f32be b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/seek/acodec-pcm-f32be
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/seek/acodec-pcm-f32be
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/seek/acodec-pcm-f32be
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/seek/acodec-pcm-f32le b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/seek/acodec-pcm-f32le
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/seek/acodec-pcm-f32le
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/seek/acodec-pcm-f32le
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/seek/acodec-pcm-f64be b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/seek/acodec-pcm-f64be
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/seek/acodec-pcm-f64be
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/seek/acodec-pcm-f64be
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/seek/acodec-pcm-f64le b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/seek/acodec-pcm-f64le
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/seek/acodec-pcm-f64le
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/seek/acodec-pcm-f64le
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/seek/acodec-pcm-mulaw b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/seek/acodec-pcm-mulaw
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/seek/acodec-pcm-mulaw
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/seek/acodec-pcm-mulaw
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/seek/acodec-pcm-s16be b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/seek/acodec-pcm-s16be
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/seek/acodec-pcm-s16be
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/seek/acodec-pcm-s16be
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/seek/acodec-pcm-s16le b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/seek/acodec-pcm-s16le
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/seek/acodec-pcm-s16le
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/seek/acodec-pcm-s16le
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/seek/acodec-pcm-s24be b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/seek/acodec-pcm-s24be
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/seek/acodec-pcm-s24be
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/seek/acodec-pcm-s24be
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/seek/acodec-pcm-s24le b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/seek/acodec-pcm-s24le
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/seek/acodec-pcm-s24le
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/seek/acodec-pcm-s24le
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/seek/acodec-pcm-s32be b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/seek/acodec-pcm-s32be
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/seek/acodec-pcm-s32be
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/seek/acodec-pcm-s32be
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/seek/acodec-pcm-s32le b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/seek/acodec-pcm-s32le
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/seek/acodec-pcm-s32le
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/seek/acodec-pcm-s32le
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/seek/acodec-pcm-s8 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/seek/acodec-pcm-s8
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/seek/acodec-pcm-s8
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/seek/acodec-pcm-s8
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/seek/acodec-pcm-u8 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/seek/acodec-pcm-u8
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/seek/acodec-pcm-u8
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/seek/acodec-pcm-u8
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/seek/cache-pipe b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/seek/cache-pipe
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/seek/cache-pipe
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/seek/cache-pipe
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/seek/empty-edit-mp4 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/seek/empty-edit-mp4
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/seek/empty-edit-mp4
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/seek/empty-edit-mp4
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/seek/extra-mp3 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/seek/extra-mp3
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/seek/extra-mp3
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/seek/extra-mp3
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/seek/extra-mp4 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/seek/extra-mp4
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/seek/extra-mp4
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/seek/extra-mp4
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/seek/lavf-aiff b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/seek/lavf-aiff
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/seek/lavf-aiff
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/seek/lavf-aiff
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/seek/lavf-alaw b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/seek/lavf-alaw
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/seek/lavf-alaw
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/seek/lavf-alaw
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/seek/lavf-asf b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/seek/lavf-asf
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/seek/lavf-asf
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/seek/lavf-asf
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/seek/lavf-au b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/seek/lavf-au
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/seek/lavf-au
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/seek/lavf-au
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/seek/lavf-avi b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/seek/lavf-avi
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/seek/lavf-avi
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/seek/lavf-avi
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/seek/lavf-bmp b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/seek/lavf-bmp
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/seek/lavf-bmp
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/seek/lavf-bmp
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/seek/lavf-dv_fmt b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/seek/lavf-dv_fmt
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/seek/lavf-dv_fmt
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/seek/lavf-dv_fmt
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/seek/lavf-flv_fmt b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/seek/lavf-flv_fmt
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/seek/lavf-flv_fmt
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/seek/lavf-flv_fmt
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/seek/lavf-gif b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/seek/lavf-gif
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/seek/lavf-gif
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/seek/lavf-gif
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/seek/lavf-gxf b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/seek/lavf-gxf
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/seek/lavf-gxf
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/seek/lavf-gxf
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/seek/lavf-jpg b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/seek/lavf-jpg
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/seek/lavf-jpg
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/seek/lavf-jpg
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/seek/lavf-mkv b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/seek/lavf-mkv
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/seek/lavf-mkv
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/seek/lavf-mkv
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/seek/lavf-mmf b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/seek/lavf-mmf
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/seek/lavf-mmf
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/seek/lavf-mmf
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/seek/lavf-mov b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/seek/lavf-mov
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/seek/lavf-mov
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/seek/lavf-mov
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/seek/lavf-mpg b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/seek/lavf-mpg
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/seek/lavf-mpg
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/seek/lavf-mpg
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/seek/lavf-mulaw b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/seek/lavf-mulaw
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/seek/lavf-mulaw
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/seek/lavf-mulaw
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/seek/lavf-mxf b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/seek/lavf-mxf
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/seek/lavf-mxf
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/seek/lavf-mxf
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/seek/lavf-mxf_d10 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/seek/lavf-mxf_d10
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/seek/lavf-mxf_d10
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/seek/lavf-mxf_d10
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/seek/lavf-mxf_dv25 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/seek/lavf-mxf_dv25
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/seek/lavf-mxf_dv25
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/seek/lavf-mxf_dv25
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/seek/lavf-mxf_dvcpro50 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/seek/lavf-mxf_dvcpro50
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/seek/lavf-mxf_dvcpro50
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/seek/lavf-mxf_dvcpro50
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/seek/lavf-mxf_opatom b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/seek/lavf-mxf_opatom
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/seek/lavf-mxf_opatom
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/seek/lavf-mxf_opatom
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/seek/lavf-mxf_opatom_audio b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/seek/lavf-mxf_opatom_audio
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/seek/lavf-mxf_opatom_audio
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/seek/lavf-mxf_opatom_audio
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/seek/lavf-nut b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/seek/lavf-nut
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/seek/lavf-nut
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/seek/lavf-nut
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/seek/lavf-ogg b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/seek/lavf-ogg
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/seek/lavf-ogg
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/seek/lavf-ogg
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/seek/lavf-pbmpipe b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/seek/lavf-pbmpipe
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/seek/lavf-pbmpipe
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/seek/lavf-pbmpipe
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/seek/lavf-pcx b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/seek/lavf-pcx
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/seek/lavf-pcx
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/seek/lavf-pcx
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/seek/lavf-pgm b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/seek/lavf-pgm
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/seek/lavf-pgm
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/seek/lavf-pgm
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/seek/lavf-pgmpipe b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/seek/lavf-pgmpipe
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/seek/lavf-pgmpipe
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/seek/lavf-pgmpipe
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/seek/lavf-ppm b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/seek/lavf-ppm
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/seek/lavf-ppm
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/seek/lavf-ppm
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/seek/lavf-ppmpipe b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/seek/lavf-ppmpipe
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/seek/lavf-ppmpipe
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/seek/lavf-ppmpipe
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/seek/lavf-rm b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/seek/lavf-rm
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/seek/lavf-rm
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/seek/lavf-rm
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/seek/lavf-sgi b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/seek/lavf-sgi
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/seek/lavf-sgi
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/seek/lavf-sgi
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/seek/lavf-swf b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/seek/lavf-swf
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/seek/lavf-swf
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/seek/lavf-swf
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/seek/lavf-tga b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/seek/lavf-tga
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/seek/lavf-tga
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/seek/lavf-tga
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/seek/lavf-tiff b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/seek/lavf-tiff
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/seek/lavf-tiff
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/seek/lavf-tiff
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/seek/lavf-ts b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/seek/lavf-ts
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/seek/lavf-ts
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/seek/lavf-ts
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/seek/lavf-voc b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/seek/lavf-voc
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/seek/lavf-voc
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/seek/lavf-voc
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/seek/lavf-wav b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/seek/lavf-wav
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/seek/lavf-wav
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/seek/lavf-wav
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/seek/lavf-wtv b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/seek/lavf-wtv
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/seek/lavf-wtv
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/seek/lavf-wtv
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/seek/lavf-yuv4mpeg b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/seek/lavf-yuv4mpeg
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/seek/lavf-yuv4mpeg
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/seek/lavf-yuv4mpeg
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/seek/mkv-codec-delay b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/seek/mkv-codec-delay
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/seek/mkv-codec-delay
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/seek/mkv-codec-delay
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/seek/test-iibbibb-mp4 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/seek/test-iibbibb-mp4
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/seek/test-iibbibb-mp4
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/seek/test-iibbibb-mp4
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/seek/test-iibbibb-neg-ctts-mp4 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/seek/test-iibbibb-neg-ctts-mp4
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/seek/test-iibbibb-neg-ctts-mp4
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/seek/test-iibbibb-neg-ctts-mp4
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/seek/vsynth_lena-asv1 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/seek/vsynth_lena-asv1
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/seek/vsynth_lena-asv1
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/seek/vsynth_lena-asv1
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/seek/vsynth_lena-asv2 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/seek/vsynth_lena-asv2
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/seek/vsynth_lena-asv2
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/seek/vsynth_lena-asv2
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/seek/vsynth_lena-dnxhd-1080i b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/seek/vsynth_lena-dnxhd-1080i
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/seek/vsynth_lena-dnxhd-1080i
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/seek/vsynth_lena-dnxhd-1080i
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/seek/vsynth_lena-dnxhd-4k-hr-lb b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/seek/vsynth_lena-dnxhd-4k-hr-lb
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/seek/vsynth_lena-dnxhd-4k-hr-lb
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/seek/vsynth_lena-dnxhd-4k-hr-lb
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/seek/vsynth_lena-dnxhd-720p b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/seek/vsynth_lena-dnxhd-720p
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/seek/vsynth_lena-dnxhd-720p
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/seek/vsynth_lena-dnxhd-720p
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/seek/vsynth_lena-dnxhd-720p-rd b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/seek/vsynth_lena-dnxhd-720p-rd
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/seek/vsynth_lena-dnxhd-720p-rd
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/seek/vsynth_lena-dnxhd-720p-rd
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/seek/vsynth_lena-dv b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/seek/vsynth_lena-dv
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/seek/vsynth_lena-dv
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/seek/vsynth_lena-dv
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/seek/vsynth_lena-dv-411 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/seek/vsynth_lena-dv-411
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/seek/vsynth_lena-dv-411
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/seek/vsynth_lena-dv-411
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/seek/vsynth_lena-dv-50 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/seek/vsynth_lena-dv-50
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/seek/vsynth_lena-dv-50
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/seek/vsynth_lena-dv-50
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/seek/vsynth_lena-ffv1 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/seek/vsynth_lena-ffv1
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/seek/vsynth_lena-ffv1
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/seek/vsynth_lena-ffv1
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/seek/vsynth_lena-flashsv b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/seek/vsynth_lena-flashsv
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/seek/vsynth_lena-flashsv
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/seek/vsynth_lena-flashsv
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/seek/vsynth_lena-flv b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/seek/vsynth_lena-flv
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/seek/vsynth_lena-flv
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/seek/vsynth_lena-flv
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/seek/vsynth_lena-h261 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/seek/vsynth_lena-h261
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/seek/vsynth_lena-h261
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/seek/vsynth_lena-h261
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/seek/vsynth_lena-h263 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/seek/vsynth_lena-h263
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/seek/vsynth_lena-h263
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/seek/vsynth_lena-h263
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/seek/vsynth_lena-h263p b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/seek/vsynth_lena-h263p
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/seek/vsynth_lena-h263p
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/seek/vsynth_lena-h263p
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/seek/vsynth_lena-huffyuv b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/seek/vsynth_lena-huffyuv
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/seek/vsynth_lena-huffyuv
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/seek/vsynth_lena-huffyuv
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/seek/vsynth_lena-jpegls b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/seek/vsynth_lena-jpegls
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/seek/vsynth_lena-jpegls
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/seek/vsynth_lena-jpegls
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/seek/vsynth_lena-ljpeg b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/seek/vsynth_lena-ljpeg
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/seek/vsynth_lena-ljpeg
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/seek/vsynth_lena-ljpeg
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/seek/vsynth_lena-mjpeg b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/seek/vsynth_lena-mjpeg
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/seek/vsynth_lena-mjpeg
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/seek/vsynth_lena-mjpeg
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/seek/vsynth_lena-mpeg1 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/seek/vsynth_lena-mpeg1
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/seek/vsynth_lena-mpeg1
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/seek/vsynth_lena-mpeg1
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/seek/vsynth_lena-mpeg1b b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/seek/vsynth_lena-mpeg1b
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/seek/vsynth_lena-mpeg1b
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/seek/vsynth_lena-mpeg1b
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/seek/vsynth_lena-mpeg2-422 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/seek/vsynth_lena-mpeg2-422
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/seek/vsynth_lena-mpeg2-422
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/seek/vsynth_lena-mpeg2-422
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/seek/vsynth_lena-mpeg2-idct-int b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/seek/vsynth_lena-mpeg2-idct-int
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/seek/vsynth_lena-mpeg2-idct-int
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/seek/vsynth_lena-mpeg2-idct-int
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/seek/vsynth_lena-mpeg2-ilace b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/seek/vsynth_lena-mpeg2-ilace
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/seek/vsynth_lena-mpeg2-ilace
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/seek/vsynth_lena-mpeg2-ilace
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/seek/vsynth_lena-mpeg2-ivlc-qprd b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/seek/vsynth_lena-mpeg2-ivlc-qprd
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/seek/vsynth_lena-mpeg2-ivlc-qprd
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/seek/vsynth_lena-mpeg2-ivlc-qprd
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/seek/vsynth_lena-mpeg2-thread b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/seek/vsynth_lena-mpeg2-thread
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/seek/vsynth_lena-mpeg2-thread
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/seek/vsynth_lena-mpeg2-thread
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/seek/vsynth_lena-mpeg2-thread-ivlc b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/seek/vsynth_lena-mpeg2-thread-ivlc
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/seek/vsynth_lena-mpeg2-thread-ivlc
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/seek/vsynth_lena-mpeg2-thread-ivlc
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/seek/vsynth_lena-mpeg4 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/seek/vsynth_lena-mpeg4
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/seek/vsynth_lena-mpeg4
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/seek/vsynth_lena-mpeg4
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/seek/vsynth_lena-mpeg4-adap b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/seek/vsynth_lena-mpeg4-adap
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/seek/vsynth_lena-mpeg4-adap
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/seek/vsynth_lena-mpeg4-adap
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/seek/vsynth_lena-mpeg4-adv b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/seek/vsynth_lena-mpeg4-adv
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/seek/vsynth_lena-mpeg4-adv
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/seek/vsynth_lena-mpeg4-adv
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/seek/vsynth_lena-mpeg4-error b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/seek/vsynth_lena-mpeg4-error
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/seek/vsynth_lena-mpeg4-error
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/seek/vsynth_lena-mpeg4-error
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/seek/vsynth_lena-mpeg4-nr b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/seek/vsynth_lena-mpeg4-nr
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/seek/vsynth_lena-mpeg4-nr
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/seek/vsynth_lena-mpeg4-nr
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/seek/vsynth_lena-mpeg4-nsse b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/seek/vsynth_lena-mpeg4-nsse
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/seek/vsynth_lena-mpeg4-nsse
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/seek/vsynth_lena-mpeg4-nsse
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/seek/vsynth_lena-mpeg4-qpel b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/seek/vsynth_lena-mpeg4-qpel
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/seek/vsynth_lena-mpeg4-qpel
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/seek/vsynth_lena-mpeg4-qpel
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/seek/vsynth_lena-mpeg4-qprd b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/seek/vsynth_lena-mpeg4-qprd
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/seek/vsynth_lena-mpeg4-qprd
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/seek/vsynth_lena-mpeg4-qprd
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/seek/vsynth_lena-mpeg4-rc b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/seek/vsynth_lena-mpeg4-rc
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/seek/vsynth_lena-mpeg4-rc
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/seek/vsynth_lena-mpeg4-rc
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/seek/vsynth_lena-mpeg4-thread b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/seek/vsynth_lena-mpeg4-thread
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/seek/vsynth_lena-mpeg4-thread
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/seek/vsynth_lena-mpeg4-thread
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/seek/vsynth_lena-msmpeg4 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/seek/vsynth_lena-msmpeg4
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/seek/vsynth_lena-msmpeg4
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/seek/vsynth_lena-msmpeg4
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/seek/vsynth_lena-msmpeg4v2 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/seek/vsynth_lena-msmpeg4v2
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/seek/vsynth_lena-msmpeg4v2
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/seek/vsynth_lena-msmpeg4v2
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/seek/vsynth_lena-rgb b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/seek/vsynth_lena-rgb
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/seek/vsynth_lena-rgb
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/seek/vsynth_lena-rgb
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/seek/vsynth_lena-roqvideo b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/seek/vsynth_lena-roqvideo
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/seek/vsynth_lena-roqvideo
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/seek/vsynth_lena-roqvideo
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/seek/vsynth_lena-rv10 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/seek/vsynth_lena-rv10
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/seek/vsynth_lena-rv10
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/seek/vsynth_lena-rv10
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/seek/vsynth_lena-rv20 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/seek/vsynth_lena-rv20
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/seek/vsynth_lena-rv20
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/seek/vsynth_lena-rv20
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/seek/vsynth_lena-snow b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/seek/vsynth_lena-snow
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/seek/vsynth_lena-snow
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/seek/vsynth_lena-snow
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/seek/vsynth_lena-snow-ll b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/seek/vsynth_lena-snow-ll
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/seek/vsynth_lena-snow-ll
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/seek/vsynth_lena-snow-ll
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/seek/vsynth_lena-svq1 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/seek/vsynth_lena-svq1
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/seek/vsynth_lena-svq1
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/seek/vsynth_lena-svq1
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/seek/vsynth_lena-wmv1 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/seek/vsynth_lena-wmv1
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/seek/vsynth_lena-wmv1
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/seek/vsynth_lena-wmv1
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/seek/vsynth_lena-wmv2 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/seek/vsynth_lena-wmv2
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/seek/vsynth_lena-wmv2
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/seek/vsynth_lena-wmv2
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/seek/vsynth_lena-yuv b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/seek/vsynth_lena-yuv
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/seek/vsynth_lena-yuv
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/seek/vsynth_lena-yuv
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-amv b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-amv
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-amv
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-amv
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-asv1 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-asv1
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-asv1
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-asv1
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-asv2 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-asv2
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-asv2
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-asv2
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-avui b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-avui
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-avui
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-avui
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-bpp1 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-bpp1
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-bpp1
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-bpp1
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-bpp15 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-bpp15
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-bpp15
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-bpp15
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-cinepak b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-cinepak
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-cinepak
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-cinepak
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-cljr b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-cljr
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-cljr
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-cljr
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-dnxhd-1080i b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-dnxhd-1080i
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-dnxhd-1080i
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-dnxhd-1080i
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-dnxhd-1080i-10bit b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-dnxhd-1080i-10bit
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-dnxhd-1080i-10bit
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-dnxhd-1080i-10bit
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-dnxhd-1080i-colr b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-dnxhd-1080i-colr
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-dnxhd-1080i-colr
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-dnxhd-1080i-colr
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-dnxhd-2k-hr-hq b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-dnxhd-2k-hr-hq
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-dnxhd-2k-hr-hq
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-dnxhd-2k-hr-hq
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-dnxhd-4k-hr-lb b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-dnxhd-4k-hr-lb
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-dnxhd-4k-hr-lb
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-dnxhd-4k-hr-lb
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-dnxhd-720p b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-dnxhd-720p
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-dnxhd-720p
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-dnxhd-720p
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-dnxhd-720p-10bit b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-dnxhd-720p-10bit
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-dnxhd-720p-10bit
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-dnxhd-720p-10bit
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-dnxhd-720p-hr-lb b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-dnxhd-720p-hr-lb
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-dnxhd-720p-hr-lb
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-dnxhd-720p-hr-lb
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-dnxhd-720p-rd b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-dnxhd-720p-rd
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-dnxhd-720p-rd
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-dnxhd-720p-rd
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-dnxhd-edge1-hr b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-dnxhd-edge1-hr
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-dnxhd-edge1-hr
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-dnxhd-edge1-hr
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-dnxhd-edge2-hr b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-dnxhd-edge2-hr
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-dnxhd-edge2-hr
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-dnxhd-edge2-hr
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-dnxhd-edge3-hr b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-dnxhd-edge3-hr
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-dnxhd-edge3-hr
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-dnxhd-edge3-hr
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-dnxhd-hr-hq-mov b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-dnxhd-hr-hq-mov
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-dnxhd-hr-hq-mov
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-dnxhd-hr-hq-mov
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-dnxhd-hr-lb-mov b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-dnxhd-hr-lb-mov
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-dnxhd-hr-lb-mov
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-dnxhd-hr-lb-mov
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-dnxhd-hr-sq-mov b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-dnxhd-hr-sq-mov
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-dnxhd-hr-sq-mov
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-dnxhd-hr-sq-mov
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-dnxhd-uhd-hr-sq b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-dnxhd-uhd-hr-sq
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-dnxhd-uhd-hr-sq
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-dnxhd-uhd-hr-sq
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-dnxhd_1080i b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-dnxhd_1080i
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-dnxhd_1080i
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-dnxhd_1080i
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-dv b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-dv
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-dv
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-dv
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-dv-411 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-dv-411
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-dv-411
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-dv-411
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-dv-50 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-dv-50
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-dv-50
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-dv-50
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-dv_411 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-dv_411
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-dv_411
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-dv_411
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-ffv1 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-ffv1
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-ffv1
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-ffv1
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-ffv1-v0 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-ffv1-v0
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-ffv1-v0
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-ffv1-v0
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-ffv1-v3-bgr0 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-ffv1-v3-bgr0
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-ffv1-v3-bgr0
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-ffv1-v3-bgr0
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-ffv1-v3-rgb48 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-ffv1-v3-rgb48
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-ffv1-v3-rgb48
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-ffv1-v3-rgb48
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-ffv1-v3-yuv420p b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-ffv1-v3-yuv420p
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-ffv1-v3-yuv420p
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-ffv1-v3-yuv420p
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-ffv1-v3-yuv422p10 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-ffv1-v3-yuv422p10
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-ffv1-v3-yuv422p10
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-ffv1-v3-yuv422p10
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-ffv1-v3-yuv444p16 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-ffv1-v3-yuv444p16
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-ffv1-v3-yuv444p16
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-ffv1-v3-yuv444p16
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-ffvhuff b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-ffvhuff
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-ffvhuff
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-ffvhuff
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-ffvhuff420p12 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-ffvhuff420p12
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-ffvhuff420p12
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-ffvhuff420p12
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-ffvhuff422p10left b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-ffvhuff422p10left
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-ffvhuff422p10left
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-ffvhuff422p10left
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-ffvhuff444 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-ffvhuff444
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-ffvhuff444
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-ffvhuff444
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-ffvhuff444p16 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-ffvhuff444p16
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-ffvhuff444p16
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-ffvhuff444p16
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-flashsv b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-flashsv
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-flashsv
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-flashsv
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-flashsv2 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-flashsv2
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-flashsv2
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-flashsv2
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-flv b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-flv
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-flv
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-flv
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-h261 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-h261
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-h261
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-h261
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-h261-trellis b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-h261-trellis
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-h261-trellis
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-h261-trellis
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-h263 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-h263
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-h263
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-h263
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-h263-obmc b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-h263-obmc
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-h263-obmc
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-h263-obmc
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-h263p b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-h263p
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-h263p
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-h263p
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-huffyuv b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-huffyuv
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-huffyuv
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-huffyuv
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-huffyuvbgr24 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-huffyuvbgr24
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-huffyuvbgr24
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-huffyuvbgr24
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-huffyuvbgra b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-huffyuvbgra
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-huffyuvbgra
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-huffyuvbgra
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-jpeg2000 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-jpeg2000
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-jpeg2000
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-jpeg2000
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-jpeg2000-97 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-jpeg2000-97
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-jpeg2000-97
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-jpeg2000-97
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-jpegls b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-jpegls
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-jpegls
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-jpegls
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-ljpeg b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-ljpeg
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-ljpeg
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-ljpeg
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-mjpeg b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-mjpeg
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-mjpeg
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-mjpeg
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-mjpeg-422 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-mjpeg-422
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-mjpeg-422
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-mjpeg-422
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-mjpeg-444 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-mjpeg-444
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-mjpeg-444
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-mjpeg-444
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-mjpeg-huffman b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-mjpeg-huffman
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-mjpeg-huffman
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-mjpeg-huffman
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-mjpeg-trell b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-mjpeg-trell
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-mjpeg-trell
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-mjpeg-trell
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-mjpeg-trell-huffman b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-mjpeg-trell-huffman
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-mjpeg-trell-huffman
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-mjpeg-trell-huffman
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-mov-bgr24 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-mov-bgr24
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-mov-bgr24
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-mov-bgr24
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-mov-bpp15 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-mov-bpp15
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-mov-bpp15
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-mov-bpp15
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-mov-bpp16 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-mov-bpp16
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-mov-bpp16
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-mov-bpp16
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-mpeg1 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-mpeg1
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-mpeg1
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-mpeg1
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-mpeg1b b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-mpeg1b
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-mpeg1b
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-mpeg1b
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-mpeg2 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-mpeg2
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-mpeg2
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-mpeg2
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-mpeg2-422 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-mpeg2-422
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-mpeg2-422
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-mpeg2-422
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-mpeg2-idct-int b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-mpeg2-idct-int
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-mpeg2-idct-int
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-mpeg2-idct-int
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-mpeg2-ilace b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-mpeg2-ilace
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-mpeg2-ilace
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-mpeg2-ilace
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-mpeg2-ivlc-qprd b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-mpeg2-ivlc-qprd
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-mpeg2-ivlc-qprd
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-mpeg2-ivlc-qprd
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-mpeg2-thread b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-mpeg2-thread
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-mpeg2-thread
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-mpeg2-thread
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-mpeg2-thread-ivlc b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-mpeg2-thread-ivlc
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-mpeg2-thread-ivlc
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-mpeg2-thread-ivlc
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-mpeg4 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-mpeg4
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-mpeg4
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-mpeg4
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-mpeg4-adap b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-mpeg4-adap
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-mpeg4-adap
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-mpeg4-adap
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-mpeg4-adv b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-mpeg4-adv
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-mpeg4-adv
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-mpeg4-adv
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-mpeg4-error b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-mpeg4-error
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-mpeg4-error
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-mpeg4-error
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-mpeg4-nr b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-mpeg4-nr
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-mpeg4-nr
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-mpeg4-nr
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-mpeg4-nsse b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-mpeg4-nsse
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-mpeg4-nsse
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-mpeg4-nsse
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-mpeg4-qpel b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-mpeg4-qpel
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-mpeg4-qpel
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-mpeg4-qpel
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-mpeg4-qprd b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-mpeg4-qprd
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-mpeg4-qprd
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-mpeg4-qprd
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-mpeg4-rc b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-mpeg4-rc
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-mpeg4-rc
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-mpeg4-rc
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-mpeg4-thread b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-mpeg4-thread
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-mpeg4-thread
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-mpeg4-thread
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-mpng b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-mpng
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-mpng
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-mpng
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-msmpeg4 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-msmpeg4
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-msmpeg4
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-msmpeg4
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-msmpeg4v2 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-msmpeg4v2
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-msmpeg4v2
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-msmpeg4v2
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-msvideo1 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-msvideo1
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-msvideo1
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-msvideo1
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-prores b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-prores
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-prores
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-prores
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-prores_ks b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-prores_ks
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-prores_ks
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-prores_ks
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-qtrle b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-qtrle
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-qtrle
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-qtrle
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-qtrlegray b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-qtrlegray
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-qtrlegray
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-qtrlegray
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-r210 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-r210
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-r210
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-r210
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-rgb b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-rgb
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-rgb
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-rgb
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-roqvideo b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-roqvideo
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-roqvideo
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-roqvideo
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-rv10 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-rv10
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-rv10
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-rv10
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-rv20 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-rv20
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-rv20
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-rv20
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-snow b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-snow
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-snow
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-snow
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-snow-hpel b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-snow-hpel
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-snow-hpel
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-snow-hpel
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-snow-ll b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-snow-ll
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-snow-ll
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-snow-ll
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-svq1 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-svq1
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-svq1
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-svq1
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-v210 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-v210
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-v210
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-v210
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-v210-10 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-v210-10
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-v210-10
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-v210-10
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-v308 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-v308
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-v308
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-v308
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-v408 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-v408
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-v408
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-v408
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-vc2-420p b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-vc2-420p
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-vc2-420p
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-vc2-420p
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-vc2-420p10 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-vc2-420p10
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-vc2-420p10
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-vc2-420p10
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-vc2-420p12 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-vc2-420p12
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-vc2-420p12
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-vc2-420p12
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-vc2-422p b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-vc2-422p
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-vc2-422p
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-vc2-422p
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-vc2-422p10 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-vc2-422p10
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-vc2-422p10
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-vc2-422p10
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-vc2-422p12 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-vc2-422p12
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-vc2-422p12
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-vc2-422p12
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-vc2-444p b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-vc2-444p
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-vc2-444p
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-vc2-444p
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-vc2-444p10 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-vc2-444p10
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-vc2-444p10
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-vc2-444p10
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-vc2-444p12 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-vc2-444p12
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-vc2-444p12
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-vc2-444p12
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-vc2-t5_3 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-vc2-t5_3
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-vc2-t5_3
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-vc2-t5_3
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-vc2-thaar b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-vc2-thaar
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-vc2-thaar
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-vc2-thaar
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-wmv1 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-wmv1
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-wmv1
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-wmv1
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-wmv2 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-wmv2
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-wmv2
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-wmv2
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-xface b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-xface
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-xface
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-xface
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-y41p b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-y41p
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-y41p
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-y41p
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-yuv b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-yuv
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-yuv
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-yuv
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-yuv4 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-yuv4
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-yuv4
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-yuv4
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-zlib b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-zlib
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-zlib
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-zlib
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-zmbv b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-zmbv
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-zmbv
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth1-zmbv
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-amv b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-amv
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-amv
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-amv
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-asv1 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-asv1
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-asv1
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-asv1
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-asv2 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-asv2
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-asv2
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-asv2
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-avui b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-avui
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-avui
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-avui
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-bpp1 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-bpp1
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-bpp1
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-bpp1
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-bpp15 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-bpp15
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-bpp15
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-bpp15
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-cinepak b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-cinepak
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-cinepak
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-cinepak
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-cljr b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-cljr
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-cljr
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-cljr
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-dnxhd-1080i b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-dnxhd-1080i
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-dnxhd-1080i
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-dnxhd-1080i
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-dnxhd-1080i-10bit b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-dnxhd-1080i-10bit
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-dnxhd-1080i-10bit
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-dnxhd-1080i-10bit
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-dnxhd-1080i-colr b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-dnxhd-1080i-colr
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-dnxhd-1080i-colr
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-dnxhd-1080i-colr
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-dnxhd-2k-hr-hq b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-dnxhd-2k-hr-hq
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-dnxhd-2k-hr-hq
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-dnxhd-2k-hr-hq
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-dnxhd-4k-hr-lb b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-dnxhd-4k-hr-lb
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-dnxhd-4k-hr-lb
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-dnxhd-4k-hr-lb
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-dnxhd-720p b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-dnxhd-720p
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-dnxhd-720p
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-dnxhd-720p
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-dnxhd-720p-10bit b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-dnxhd-720p-10bit
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-dnxhd-720p-10bit
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-dnxhd-720p-10bit
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-dnxhd-720p-hr-lb b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-dnxhd-720p-hr-lb
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-dnxhd-720p-hr-lb
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-dnxhd-720p-hr-lb
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-dnxhd-720p-rd b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-dnxhd-720p-rd
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-dnxhd-720p-rd
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-dnxhd-720p-rd
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-dnxhd-edge1-hr b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-dnxhd-edge1-hr
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-dnxhd-edge1-hr
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-dnxhd-edge1-hr
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-dnxhd-edge2-hr b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-dnxhd-edge2-hr
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-dnxhd-edge2-hr
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-dnxhd-edge2-hr
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-dnxhd-edge3-hr b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-dnxhd-edge3-hr
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-dnxhd-edge3-hr
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-dnxhd-edge3-hr
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-dnxhd-hr-hq-mov b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-dnxhd-hr-hq-mov
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-dnxhd-hr-hq-mov
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-dnxhd-hr-hq-mov
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-dnxhd-hr-lb-mov b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-dnxhd-hr-lb-mov
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-dnxhd-hr-lb-mov
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-dnxhd-hr-lb-mov
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-dnxhd-hr-sq-mov b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-dnxhd-hr-sq-mov
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-dnxhd-hr-sq-mov
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-dnxhd-hr-sq-mov
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-dnxhd-uhd-hr-sq b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-dnxhd-uhd-hr-sq
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-dnxhd-uhd-hr-sq
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-dnxhd-uhd-hr-sq
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-dv b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-dv
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-dv
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-dv
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-dv-411 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-dv-411
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-dv-411
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-dv-411
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-dv-50 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-dv-50
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-dv-50
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-dv-50
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-ffv1 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-ffv1
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-ffv1
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-ffv1
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-ffv1-v0 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-ffv1-v0
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-ffv1-v0
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-ffv1-v0
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-ffv1-v3-bgr0 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-ffv1-v3-bgr0
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-ffv1-v3-bgr0
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-ffv1-v3-bgr0
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-ffv1-v3-rgb48 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-ffv1-v3-rgb48
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-ffv1-v3-rgb48
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-ffv1-v3-rgb48
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-ffv1-v3-yuv420p b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-ffv1-v3-yuv420p
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-ffv1-v3-yuv420p
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-ffv1-v3-yuv420p
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-ffv1-v3-yuv422p10 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-ffv1-v3-yuv422p10
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-ffv1-v3-yuv422p10
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-ffv1-v3-yuv422p10
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-ffv1-v3-yuv444p16 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-ffv1-v3-yuv444p16
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-ffv1-v3-yuv444p16
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-ffv1-v3-yuv444p16
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-ffvhuff b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-ffvhuff
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-ffvhuff
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-ffvhuff
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-ffvhuff420p12 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-ffvhuff420p12
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-ffvhuff420p12
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-ffvhuff420p12
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-ffvhuff422p10left b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-ffvhuff422p10left
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-ffvhuff422p10left
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-ffvhuff422p10left
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-ffvhuff444 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-ffvhuff444
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-ffvhuff444
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-ffvhuff444
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-ffvhuff444p16 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-ffvhuff444p16
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-ffvhuff444p16
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-ffvhuff444p16
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-flashsv b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-flashsv
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-flashsv
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-flashsv
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-flashsv2 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-flashsv2
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-flashsv2
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-flashsv2
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-flv b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-flv
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-flv
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-flv
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-h261 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-h261
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-h261
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-h261
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-h261-trellis b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-h261-trellis
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-h261-trellis
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-h261-trellis
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-h263 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-h263
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-h263
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-h263
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-h263-obmc b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-h263-obmc
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-h263-obmc
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-h263-obmc
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-h263p b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-h263p
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-h263p
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-h263p
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-huffyuv b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-huffyuv
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-huffyuv
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-huffyuv
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-huffyuvbgr24 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-huffyuvbgr24
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-huffyuvbgr24
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-huffyuvbgr24
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-huffyuvbgra b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-huffyuvbgra
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-huffyuvbgra
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-huffyuvbgra
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-jpeg2000 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-jpeg2000
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-jpeg2000
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-jpeg2000
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-jpeg2000-97 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-jpeg2000-97
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-jpeg2000-97
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-jpeg2000-97
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-jpegls b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-jpegls
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-jpegls
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-jpegls
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-ljpeg b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-ljpeg
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-ljpeg
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-ljpeg
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-mjpeg b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-mjpeg
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-mjpeg
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-mjpeg
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-mjpeg-422 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-mjpeg-422
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-mjpeg-422
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-mjpeg-422
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-mjpeg-444 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-mjpeg-444
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-mjpeg-444
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-mjpeg-444
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-mjpeg-huffman b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-mjpeg-huffman
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-mjpeg-huffman
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-mjpeg-huffman
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-mjpeg-trell b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-mjpeg-trell
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-mjpeg-trell
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-mjpeg-trell
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-mjpeg-trell-huffman b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-mjpeg-trell-huffman
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-mjpeg-trell-huffman
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-mjpeg-trell-huffman
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-mov-bgr24 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-mov-bgr24
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-mov-bgr24
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-mov-bgr24
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-mov-bpp15 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-mov-bpp15
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-mov-bpp15
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-mov-bpp15
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-mov-bpp16 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-mov-bpp16
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-mov-bpp16
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-mov-bpp16
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-mpeg1 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-mpeg1
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-mpeg1
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-mpeg1
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-mpeg1b b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-mpeg1b
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-mpeg1b
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-mpeg1b
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-mpeg2 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-mpeg2
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-mpeg2
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-mpeg2
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-mpeg2-422 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-mpeg2-422
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-mpeg2-422
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-mpeg2-422
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-mpeg2-idct-int b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-mpeg2-idct-int
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-mpeg2-idct-int
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-mpeg2-idct-int
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-mpeg2-ilace b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-mpeg2-ilace
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-mpeg2-ilace
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-mpeg2-ilace
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-mpeg2-ivlc-qprd b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-mpeg2-ivlc-qprd
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-mpeg2-ivlc-qprd
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-mpeg2-ivlc-qprd
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-mpeg2-thread b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-mpeg2-thread
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-mpeg2-thread
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-mpeg2-thread
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-mpeg2-thread-ivlc b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-mpeg2-thread-ivlc
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-mpeg2-thread-ivlc
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-mpeg2-thread-ivlc
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-mpeg4 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-mpeg4
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-mpeg4
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-mpeg4
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-mpeg4-adap b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-mpeg4-adap
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-mpeg4-adap
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-mpeg4-adap
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-mpeg4-adv b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-mpeg4-adv
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-mpeg4-adv
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-mpeg4-adv
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-mpeg4-error b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-mpeg4-error
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-mpeg4-error
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-mpeg4-error
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-mpeg4-nr b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-mpeg4-nr
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-mpeg4-nr
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-mpeg4-nr
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-mpeg4-nsse b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-mpeg4-nsse
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-mpeg4-nsse
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-mpeg4-nsse
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-mpeg4-qpel b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-mpeg4-qpel
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-mpeg4-qpel
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-mpeg4-qpel
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-mpeg4-qprd b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-mpeg4-qprd
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-mpeg4-qprd
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-mpeg4-qprd
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-mpeg4-rc b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-mpeg4-rc
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-mpeg4-rc
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-mpeg4-rc
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-mpeg4-thread b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-mpeg4-thread
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-mpeg4-thread
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-mpeg4-thread
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-mpng b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-mpng
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-mpng
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-mpng
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-msmpeg4 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-msmpeg4
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-msmpeg4
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-msmpeg4
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-msmpeg4v2 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-msmpeg4v2
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-msmpeg4v2
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-msmpeg4v2
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-msvideo1 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-msvideo1
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-msvideo1
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-msvideo1
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-prores b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-prores
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-prores
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-prores
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-prores_ks b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-prores_ks
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-prores_ks
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-prores_ks
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-qtrle b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-qtrle
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-qtrle
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-qtrle
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-qtrlegray b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-qtrlegray
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-qtrlegray
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-qtrlegray
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-r210 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-r210
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-r210
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-r210
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-rgb b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-rgb
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-rgb
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-rgb
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-roqvideo b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-roqvideo
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-roqvideo
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-roqvideo
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-rv10 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-rv10
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-rv10
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-rv10
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-rv20 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-rv20
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-rv20
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-rv20
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-snow b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-snow
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-snow
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-snow
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-snow-hpel b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-snow-hpel
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-snow-hpel
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-snow-hpel
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-snow-ll b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-snow-ll
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-snow-ll
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-snow-ll
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-svq1 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-svq1
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-svq1
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-svq1
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-v210 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-v210
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-v210
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-v210
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-v210-10 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-v210-10
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-v210-10
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-v210-10
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-v308 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-v308
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-v308
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-v308
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-v408 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-v408
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-v408
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-v408
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-vc2-420p b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-vc2-420p
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-vc2-420p
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-vc2-420p
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-vc2-420p10 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-vc2-420p10
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-vc2-420p10
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-vc2-420p10
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-vc2-420p12 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-vc2-420p12
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-vc2-420p12
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-vc2-420p12
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-vc2-422p b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-vc2-422p
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-vc2-422p
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-vc2-422p
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-vc2-422p10 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-vc2-422p10
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-vc2-422p10
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-vc2-422p10
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-vc2-422p12 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-vc2-422p12
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-vc2-422p12
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-vc2-422p12
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-vc2-444p b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-vc2-444p
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-vc2-444p
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-vc2-444p
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-vc2-444p10 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-vc2-444p10
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-vc2-444p10
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-vc2-444p10
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-vc2-444p12 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-vc2-444p12
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-vc2-444p12
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-vc2-444p12
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-vc2-t5_3 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-vc2-t5_3
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-vc2-t5_3
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-vc2-t5_3
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-vc2-thaar b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-vc2-thaar
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-vc2-thaar
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-vc2-thaar
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-wmv1 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-wmv1
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-wmv1
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-wmv1
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-wmv2 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-wmv2
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-wmv2
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-wmv2
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-xface b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-xface
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-xface
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-xface
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-y41p b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-y41p
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-y41p
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-y41p
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-yuv b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-yuv
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-yuv
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-yuv
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-yuv4 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-yuv4
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-yuv4
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-yuv4
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-zlib b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-zlib
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-zlib
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth2-zlib
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-amv b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-amv
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-amv
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-amv
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-asv1 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-asv1
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-asv1
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-asv1
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-asv2 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-asv2
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-asv2
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-asv2
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-bpp1 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-bpp1
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-bpp1
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-bpp1
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-bpp15 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-bpp15
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-bpp15
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-bpp15
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-cljr b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-cljr
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-cljr
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-cljr
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-dnxhd-1080i-10bit b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-dnxhd-1080i-10bit
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-dnxhd-1080i-10bit
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-dnxhd-1080i-10bit
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-dnxhd-1080i-colr b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-dnxhd-1080i-colr
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-dnxhd-1080i-colr
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-dnxhd-1080i-colr
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-dnxhd-2k-hr-hq b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-dnxhd-2k-hr-hq
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-dnxhd-2k-hr-hq
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-dnxhd-2k-hr-hq
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-dnxhd-4k-hr-lb b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-dnxhd-4k-hr-lb
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-dnxhd-4k-hr-lb
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-dnxhd-4k-hr-lb
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-dnxhd-720p-hr-lb b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-dnxhd-720p-hr-lb
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-dnxhd-720p-hr-lb
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-dnxhd-720p-hr-lb
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-dnxhd-edge1-hr b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-dnxhd-edge1-hr
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-dnxhd-edge1-hr
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-dnxhd-edge1-hr
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-dnxhd-edge2-hr b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-dnxhd-edge2-hr
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-dnxhd-edge2-hr
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-dnxhd-edge2-hr
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-dnxhd-edge3-hr b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-dnxhd-edge3-hr
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-dnxhd-edge3-hr
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-dnxhd-edge3-hr
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-dnxhd-hr-hq-mov b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-dnxhd-hr-hq-mov
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-dnxhd-hr-hq-mov
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-dnxhd-hr-hq-mov
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-dnxhd-hr-lb-mov b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-dnxhd-hr-lb-mov
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-dnxhd-hr-lb-mov
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-dnxhd-hr-lb-mov
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-dnxhd-hr-sq-mov b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-dnxhd-hr-sq-mov
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-dnxhd-hr-sq-mov
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-dnxhd-hr-sq-mov
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-dnxhd-uhd-hr-sq b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-dnxhd-uhd-hr-sq
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-dnxhd-uhd-hr-sq
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-dnxhd-uhd-hr-sq
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-ffv1 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-ffv1
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-ffv1
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-ffv1
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-ffv1-v0 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-ffv1-v0
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-ffv1-v0
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-ffv1-v0
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-ffv1-v3-bgr0 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-ffv1-v3-bgr0
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-ffv1-v3-bgr0
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-ffv1-v3-bgr0
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-ffv1-v3-rgb48 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-ffv1-v3-rgb48
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-ffv1-v3-rgb48
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-ffv1-v3-rgb48
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-ffv1-v3-yuv420p b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-ffv1-v3-yuv420p
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-ffv1-v3-yuv420p
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-ffv1-v3-yuv420p
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-ffv1-v3-yuv422p10 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-ffv1-v3-yuv422p10
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-ffv1-v3-yuv422p10
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-ffv1-v3-yuv422p10
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-ffv1-v3-yuv444p16 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-ffv1-v3-yuv444p16
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-ffv1-v3-yuv444p16
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-ffv1-v3-yuv444p16
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-ffvhuff b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-ffvhuff
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-ffvhuff
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-ffvhuff
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-ffvhuff420p12 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-ffvhuff420p12
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-ffvhuff420p12
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-ffvhuff420p12
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-ffvhuff422p10left b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-ffvhuff422p10left
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-ffvhuff422p10left
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-ffvhuff422p10left
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-ffvhuff444 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-ffvhuff444
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-ffvhuff444
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-ffvhuff444
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-ffvhuff444p16 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-ffvhuff444p16
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-ffvhuff444p16
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-ffvhuff444p16
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-flashsv b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-flashsv
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-flashsv
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-flashsv
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-flashsv2 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-flashsv2
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-flashsv2
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-flashsv2
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-flv b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-flv
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-flv
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-flv
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-huffyuv b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-huffyuv
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-huffyuv
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-huffyuv
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-huffyuvbgr24 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-huffyuvbgr24
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-huffyuvbgr24
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-huffyuvbgr24
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-huffyuvbgra b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-huffyuvbgra
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-huffyuvbgra
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-huffyuvbgra
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-jpeg2000 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-jpeg2000
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-jpeg2000
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-jpeg2000
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-jpeg2000-97 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-jpeg2000-97
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-jpeg2000-97
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-jpeg2000-97
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-jpegls b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-jpegls
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-jpegls
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-jpegls
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-ljpeg b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-ljpeg
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-ljpeg
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-ljpeg
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-mjpeg b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-mjpeg
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-mjpeg
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-mjpeg
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-mjpeg-422 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-mjpeg-422
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-mjpeg-422
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-mjpeg-422
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-mjpeg-444 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-mjpeg-444
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-mjpeg-444
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-mjpeg-444
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-mjpeg-huffman b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-mjpeg-huffman
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-mjpeg-huffman
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-mjpeg-huffman
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-mjpeg-trell b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-mjpeg-trell
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-mjpeg-trell
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-mjpeg-trell
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-mjpeg-trell-huffman b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-mjpeg-trell-huffman
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-mjpeg-trell-huffman
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-mjpeg-trell-huffman
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-mov-bgr24 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-mov-bgr24
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-mov-bgr24
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-mov-bgr24
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-mov-bpp15 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-mov-bpp15
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-mov-bpp15
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-mov-bpp15
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-mov-bpp16 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-mov-bpp16
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-mov-bpp16
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-mov-bpp16
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-mpeg1 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-mpeg1
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-mpeg1
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-mpeg1
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-mpeg1b b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-mpeg1b
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-mpeg1b
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-mpeg1b
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-mpeg2 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-mpeg2
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-mpeg2
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-mpeg2
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-mpeg2-422 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-mpeg2-422
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-mpeg2-422
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-mpeg2-422
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-mpeg2-idct-int b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-mpeg2-idct-int
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-mpeg2-idct-int
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-mpeg2-idct-int
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-mpeg2-ilace b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-mpeg2-ilace
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-mpeg2-ilace
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-mpeg2-ilace
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-mpeg2-ivlc-qprd b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-mpeg2-ivlc-qprd
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-mpeg2-ivlc-qprd
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-mpeg2-ivlc-qprd
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-mpeg2-thread b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-mpeg2-thread
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-mpeg2-thread
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-mpeg2-thread
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-mpeg2-thread-ivlc b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-mpeg2-thread-ivlc
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-mpeg2-thread-ivlc
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-mpeg2-thread-ivlc
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-mpeg4 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-mpeg4
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-mpeg4
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-mpeg4
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-mpeg4-adap b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-mpeg4-adap
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-mpeg4-adap
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-mpeg4-adap
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-mpeg4-adv b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-mpeg4-adv
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-mpeg4-adv
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-mpeg4-adv
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-mpeg4-error b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-mpeg4-error
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-mpeg4-error
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-mpeg4-error
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-mpeg4-nr b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-mpeg4-nr
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-mpeg4-nr
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-mpeg4-nr
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-mpeg4-nsse b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-mpeg4-nsse
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-mpeg4-nsse
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-mpeg4-nsse
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-mpeg4-qpel b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-mpeg4-qpel
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-mpeg4-qpel
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-mpeg4-qpel
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-mpeg4-qprd b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-mpeg4-qprd
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-mpeg4-qprd
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-mpeg4-qprd
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-mpeg4-rc b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-mpeg4-rc
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-mpeg4-rc
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-mpeg4-rc
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-mpeg4-thread b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-mpeg4-thread
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-mpeg4-thread
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-mpeg4-thread
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-mpng b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-mpng
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-mpng
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-mpng
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-msmpeg4 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-msmpeg4
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-msmpeg4
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-msmpeg4
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-msmpeg4v2 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-msmpeg4v2
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-msmpeg4v2
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-msmpeg4v2
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-prores b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-prores
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-prores
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-prores
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-prores_ks b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-prores_ks
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-prores_ks
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-prores_ks
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-qtrle b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-qtrle
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-qtrle
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-qtrle
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-r210 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-r210
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-r210
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-r210
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-rgb b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-rgb
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-rgb
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-rgb
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-svq1 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-svq1
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-svq1
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-svq1
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-v210 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-v210
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-v210
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-v210
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-v210-10 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-v210-10
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-v210-10
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-v210-10
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-v308 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-v308
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-v308
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-v308
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-v408 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-v408
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-v408
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-v408
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-wmv1 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-wmv1
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-wmv1
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-wmv1
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-wmv2 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-wmv2
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-wmv2
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-wmv2
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-xface b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-xface
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-xface
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-xface
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-yuv b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-yuv
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-yuv
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-yuv
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-yuv4 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-yuv4
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-yuv4
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-yuv4
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-zlib b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-zlib
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-zlib
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth3-zlib
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-amv b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-amv
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-amv
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-amv
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-asv1 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-asv1
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-asv1
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-asv1
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-asv2 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-asv2
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-asv2
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-asv2
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-avui b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-avui
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-avui
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-avui
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-bpp1 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-bpp1
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-bpp1
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-bpp1
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-bpp15 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-bpp15
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-bpp15
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-bpp15
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-cinepak b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-cinepak
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-cinepak
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-cinepak
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-cljr b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-cljr
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-cljr
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-cljr
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-dnxhd-1080i b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-dnxhd-1080i
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-dnxhd-1080i
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-dnxhd-1080i
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-dnxhd-1080i-10bit b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-dnxhd-1080i-10bit
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-dnxhd-1080i-10bit
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-dnxhd-1080i-10bit
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-dnxhd-1080i-colr b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-dnxhd-1080i-colr
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-dnxhd-1080i-colr
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-dnxhd-1080i-colr
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-dnxhd-2k-hr-hq b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-dnxhd-2k-hr-hq
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-dnxhd-2k-hr-hq
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-dnxhd-2k-hr-hq
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-dnxhd-4k-hr-lb b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-dnxhd-4k-hr-lb
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-dnxhd-4k-hr-lb
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-dnxhd-4k-hr-lb
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-dnxhd-720p b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-dnxhd-720p
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-dnxhd-720p
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-dnxhd-720p
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-dnxhd-720p-10bit b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-dnxhd-720p-10bit
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-dnxhd-720p-10bit
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-dnxhd-720p-10bit
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-dnxhd-720p-hr-lb b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-dnxhd-720p-hr-lb
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-dnxhd-720p-hr-lb
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-dnxhd-720p-hr-lb
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-dnxhd-720p-rd b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-dnxhd-720p-rd
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-dnxhd-720p-rd
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-dnxhd-720p-rd
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-dnxhd-edge1-hr b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-dnxhd-edge1-hr
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-dnxhd-edge1-hr
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-dnxhd-edge1-hr
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-dnxhd-edge2-hr b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-dnxhd-edge2-hr
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-dnxhd-edge2-hr
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-dnxhd-edge2-hr
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-dnxhd-edge3-hr b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-dnxhd-edge3-hr
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-dnxhd-edge3-hr
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-dnxhd-edge3-hr
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-dnxhd-hr-hq-mov b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-dnxhd-hr-hq-mov
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-dnxhd-hr-hq-mov
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-dnxhd-hr-hq-mov
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-dnxhd-hr-lb-mov b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-dnxhd-hr-lb-mov
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-dnxhd-hr-lb-mov
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-dnxhd-hr-lb-mov
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-dnxhd-hr-sq-mov b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-dnxhd-hr-sq-mov
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-dnxhd-hr-sq-mov
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-dnxhd-hr-sq-mov
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-dnxhd-uhd-hr-sq b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-dnxhd-uhd-hr-sq
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-dnxhd-uhd-hr-sq
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-dnxhd-uhd-hr-sq
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-dnxhd_1080i b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-dnxhd_1080i
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-dnxhd_1080i
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-dnxhd_1080i
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-dv b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-dv
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-dv
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-dv
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-dv-411 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-dv-411
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-dv-411
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-dv-411
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-dv-50 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-dv-50
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-dv-50
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-dv-50
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-dv_411 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-dv_411
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-dv_411
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-dv_411
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-ffv1 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-ffv1
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-ffv1
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-ffv1
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-ffv1-v0 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-ffv1-v0
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-ffv1-v0
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-ffv1-v0
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-ffv1-v3-bgr0 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-ffv1-v3-bgr0
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-ffv1-v3-bgr0
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-ffv1-v3-bgr0
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-ffv1-v3-rgb48 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-ffv1-v3-rgb48
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-ffv1-v3-rgb48
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-ffv1-v3-rgb48
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-ffv1-v3-yuv420p b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-ffv1-v3-yuv420p
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-ffv1-v3-yuv420p
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-ffv1-v3-yuv420p
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-ffv1-v3-yuv422p10 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-ffv1-v3-yuv422p10
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-ffv1-v3-yuv422p10
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-ffv1-v3-yuv422p10
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-ffv1-v3-yuv444p16 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-ffv1-v3-yuv444p16
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-ffv1-v3-yuv444p16
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-ffv1-v3-yuv444p16
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-ffvhuff b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-ffvhuff
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-ffvhuff
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-ffvhuff
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-ffvhuff420p12 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-ffvhuff420p12
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-ffvhuff420p12
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-ffvhuff420p12
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-ffvhuff422p10left b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-ffvhuff422p10left
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-ffvhuff422p10left
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-ffvhuff422p10left
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-ffvhuff444 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-ffvhuff444
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-ffvhuff444
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-ffvhuff444
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-ffvhuff444p16 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-ffvhuff444p16
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-ffvhuff444p16
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-ffvhuff444p16
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-flashsv b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-flashsv
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-flashsv
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-flashsv
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-flashsv2 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-flashsv2
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-flashsv2
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-flashsv2
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-flv b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-flv
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-flv
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-flv
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-h261 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-h261
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-h261
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-h261
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-h261-trellis b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-h261-trellis
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-h261-trellis
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-h261-trellis
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-h263 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-h263
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-h263
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-h263
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-h263-obmc b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-h263-obmc
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-h263-obmc
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-h263-obmc
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-h263p b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-h263p
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-h263p
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-h263p
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-huffyuv b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-huffyuv
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-huffyuv
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-huffyuv
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-huffyuvbgr24 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-huffyuvbgr24
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-huffyuvbgr24
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-huffyuvbgr24
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-huffyuvbgra b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-huffyuvbgra
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-huffyuvbgra
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-huffyuvbgra
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-jpeg2000 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-jpeg2000
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-jpeg2000
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-jpeg2000
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-jpeg2000-97 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-jpeg2000-97
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-jpeg2000-97
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-jpeg2000-97
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-jpegls b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-jpegls
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-jpegls
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-jpegls
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-ljpeg b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-ljpeg
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-ljpeg
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-ljpeg
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-mjpeg b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-mjpeg
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-mjpeg
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-mjpeg
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-mjpeg-422 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-mjpeg-422
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-mjpeg-422
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-mjpeg-422
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-mjpeg-444 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-mjpeg-444
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-mjpeg-444
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-mjpeg-444
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-mjpeg-huffman b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-mjpeg-huffman
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-mjpeg-huffman
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-mjpeg-huffman
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-mjpeg-trell b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-mjpeg-trell
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-mjpeg-trell
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-mjpeg-trell
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-mjpeg-trell-huffman b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-mjpeg-trell-huffman
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-mjpeg-trell-huffman
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-mjpeg-trell-huffman
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-mov-bgr24 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-mov-bgr24
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-mov-bgr24
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-mov-bgr24
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-mov-bpp15 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-mov-bpp15
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-mov-bpp15
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-mov-bpp15
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-mov-bpp16 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-mov-bpp16
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-mov-bpp16
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-mov-bpp16
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-mpeg1 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-mpeg1
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-mpeg1
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-mpeg1
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-mpeg1b b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-mpeg1b
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-mpeg1b
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-mpeg1b
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-mpeg2 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-mpeg2
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-mpeg2
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-mpeg2
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-mpeg2-422 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-mpeg2-422
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-mpeg2-422
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-mpeg2-422
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-mpeg2-idct-int b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-mpeg2-idct-int
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-mpeg2-idct-int
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-mpeg2-idct-int
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-mpeg2-ilace b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-mpeg2-ilace
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-mpeg2-ilace
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-mpeg2-ilace
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-mpeg2-ivlc-qprd b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-mpeg2-ivlc-qprd
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-mpeg2-ivlc-qprd
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-mpeg2-ivlc-qprd
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-mpeg2-thread b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-mpeg2-thread
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-mpeg2-thread
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-mpeg2-thread
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-mpeg2-thread-ivlc b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-mpeg2-thread-ivlc
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-mpeg2-thread-ivlc
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-mpeg2-thread-ivlc
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-mpeg4 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-mpeg4
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-mpeg4
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-mpeg4
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-mpeg4-adap b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-mpeg4-adap
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-mpeg4-adap
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-mpeg4-adap
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-mpeg4-adv b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-mpeg4-adv
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-mpeg4-adv
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-mpeg4-adv
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-mpeg4-error b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-mpeg4-error
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-mpeg4-error
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-mpeg4-error
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-mpeg4-nr b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-mpeg4-nr
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-mpeg4-nr
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-mpeg4-nr
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-mpeg4-nsse b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-mpeg4-nsse
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-mpeg4-nsse
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-mpeg4-nsse
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-mpeg4-qpel b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-mpeg4-qpel
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-mpeg4-qpel
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-mpeg4-qpel
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-mpeg4-qprd b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-mpeg4-qprd
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-mpeg4-qprd
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-mpeg4-qprd
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-mpeg4-rc b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-mpeg4-rc
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-mpeg4-rc
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-mpeg4-rc
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-mpeg4-thread b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-mpeg4-thread
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-mpeg4-thread
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-mpeg4-thread
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-mpng b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-mpng
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-mpng
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-mpng
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-msmpeg4 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-msmpeg4
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-msmpeg4
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-msmpeg4
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-msmpeg4v2 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-msmpeg4v2
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-msmpeg4v2
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-msmpeg4v2
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-msvideo1 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-msvideo1
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-msvideo1
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-msvideo1
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-prores b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-prores
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-prores
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-prores
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-prores_ks b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-prores_ks
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-prores_ks
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-prores_ks
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-qtrle b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-qtrle
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-qtrle
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-qtrle
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-qtrlegray b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-qtrlegray
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-qtrlegray
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-qtrlegray
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-r210 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-r210
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-r210
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-r210
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-rgb b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-rgb
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-rgb
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-rgb
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-roqvideo b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-roqvideo
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-roqvideo
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-roqvideo
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-rv10 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-rv10
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-rv10
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-rv10
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-rv20 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-rv20
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-rv20
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-rv20
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-snow b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-snow
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-snow
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-snow
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-snow-hpel b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-snow-hpel
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-snow-hpel
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-snow-hpel
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-snow-ll b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-snow-ll
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-snow-ll
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-snow-ll
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-svq1 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-svq1
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-svq1
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-svq1
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-v210 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-v210
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-v210
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-v210
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-v210-10 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-v210-10
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-v210-10
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-v210-10
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-v308 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-v308
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-v308
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-v308
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-v408 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-v408
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-v408
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-v408
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-vc2-420p b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-vc2-420p
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-vc2-420p
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-vc2-420p
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-vc2-420p10 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-vc2-420p10
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-vc2-420p10
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-vc2-420p10
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-vc2-420p12 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-vc2-420p12
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-vc2-420p12
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-vc2-420p12
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-vc2-422p b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-vc2-422p
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-vc2-422p
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-vc2-422p
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-vc2-422p10 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-vc2-422p10
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-vc2-422p10
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-vc2-422p10
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-vc2-422p12 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-vc2-422p12
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-vc2-422p12
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-vc2-422p12
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-vc2-444p b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-vc2-444p
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-vc2-444p
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-vc2-444p
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-vc2-444p10 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-vc2-444p10
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-vc2-444p10
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-vc2-444p10
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-vc2-444p12 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-vc2-444p12
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-vc2-444p12
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-vc2-444p12
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-vc2-t5_3 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-vc2-t5_3
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-vc2-t5_3
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-vc2-t5_3
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-vc2-thaar b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-vc2-thaar
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-vc2-thaar
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-vc2-thaar
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-wmv1 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-wmv1
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-wmv1
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-wmv1
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-wmv2 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-wmv2
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-wmv2
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-wmv2
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-xface b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-xface
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-xface
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-xface
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-y41p b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-y41p
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-y41p
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-y41p
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-yuv b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-yuv
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-yuv
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-yuv
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-yuv4 b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-yuv4
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-yuv4
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-yuv4
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-zlib b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-zlib
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-zlib
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-zlib
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-zmbv b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-zmbv
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-zmbv
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth/vsynth_lena-zmbv
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth1/cljr b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth1/cljr
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth1/cljr
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth1/cljr
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth1/yuv b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth1/yuv
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth1/yuv
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth1/yuv
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth_lena/cljr b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth_lena/cljr
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth_lena/cljr
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth_lena/cljr
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth_lena/huffyuv b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth_lena/huffyuv
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth_lena/huffyuv
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth_lena/huffyuv
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth_lena/yuv b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth_lena/yuv
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/ref/vsynth_lena/yuv
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/ref/vsynth_lena/yuv
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/refcmp-metadata.awk b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/refcmp-metadata.awk
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/refcmp-metadata.awk
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/refcmp-metadata.awk
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/reference.pnm b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/reference.pnm
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/reference.pnm
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/reference.pnm
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/regression-funcs.sh b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/regression-funcs.sh
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/regression-funcs.sh
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/regression-funcs.sh
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/rotozoom.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/rotozoom.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/rotozoom.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/rotozoom.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/simple1.ffconcat b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/simple1.ffconcat
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/simple1.ffconcat
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/simple1.ffconcat
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/simple2.ffconcat b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/simple2.ffconcat
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/simple2.ffconcat
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/simple2.ffconcat
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/test.ffmeta b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/test.ffmeta
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/test.ffmeta
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/test.ffmeta
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/tiny_psnr.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/tiny_psnr.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/tiny_psnr.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/tiny_psnr.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/tiny_ssim.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/tiny_ssim.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/tiny_ssim.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/tiny_ssim.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/utils.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/utils.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/utils.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/utils.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/videogen.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/videogen.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tests/videogen.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tests/videogen.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tools/Makefile b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tools/Makefile
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tools/Makefile
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tools/Makefile
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tools/aviocat.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tools/aviocat.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tools/aviocat.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tools/aviocat.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tools/bisect-create b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tools/bisect-create
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tools/bisect-create
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tools/bisect-create
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tools/bookmarklets.html b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tools/bookmarklets.html
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tools/bookmarklets.html
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tools/bookmarklets.html
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tools/cl2c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tools/cl2c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tools/cl2c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tools/cl2c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tools/clean-diff b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tools/clean-diff
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tools/clean-diff
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tools/clean-diff
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tools/coverity.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tools/coverity.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tools/coverity.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tools/coverity.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tools/crypto_bench.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tools/crypto_bench.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tools/crypto_bench.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tools/crypto_bench.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tools/cws2fws.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tools/cws2fws.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tools/cws2fws.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tools/cws2fws.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tools/dvd2concat b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tools/dvd2concat
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tools/dvd2concat
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tools/dvd2concat
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tools/enum_options.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tools/enum_options.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tools/enum_options.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tools/enum_options.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tools/ffescape.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tools/ffescape.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tools/ffescape.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tools/ffescape.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tools/ffeval.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tools/ffeval.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tools/ffeval.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tools/ffeval.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tools/ffhash.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tools/ffhash.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tools/ffhash.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tools/ffhash.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tools/fourcc2pixfmt.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tools/fourcc2pixfmt.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tools/fourcc2pixfmt.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tools/fourcc2pixfmt.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tools/gen-rc b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tools/gen-rc
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tools/gen-rc
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tools/gen-rc
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tools/graph2dot.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tools/graph2dot.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tools/graph2dot.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tools/graph2dot.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tools/ismindex.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tools/ismindex.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tools/ismindex.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tools/ismindex.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tools/libav-merge-next-commit b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tools/libav-merge-next-commit
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tools/libav-merge-next-commit
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tools/libav-merge-next-commit
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tools/loudnorm.rb b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tools/loudnorm.rb
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tools/loudnorm.rb
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tools/loudnorm.rb
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tools/make_chlayout_test b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tools/make_chlayout_test
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tools/make_chlayout_test
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tools/make_chlayout_test
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tools/missing_codec_desc b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tools/missing_codec_desc
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tools/missing_codec_desc
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tools/missing_codec_desc
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tools/murge b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tools/murge
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tools/murge
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tools/murge
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tools/normalize.py b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tools/normalize.py
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tools/normalize.py
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tools/normalize.py
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tools/patcheck b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tools/patcheck
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tools/patcheck
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tools/patcheck
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tools/pktdumper.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tools/pktdumper.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tools/pktdumper.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tools/pktdumper.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tools/plotframes b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tools/plotframes
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tools/plotframes
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tools/plotframes
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tools/probetest.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tools/probetest.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tools/probetest.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tools/probetest.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tools/qt-faststart.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tools/qt-faststart.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tools/qt-faststart.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tools/qt-faststart.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tools/seek_print.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tools/seek_print.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tools/seek_print.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tools/seek_print.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tools/sidxindex.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tools/sidxindex.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tools/sidxindex.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tools/sidxindex.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tools/sofa2wavs.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tools/sofa2wavs.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tools/sofa2wavs.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tools/sofa2wavs.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tools/target_dec_fuzzer.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tools/target_dec_fuzzer.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tools/target_dec_fuzzer.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tools/target_dec_fuzzer.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tools/trasher.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tools/trasher.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tools/trasher.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tools/trasher.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tools/uncoded_frame.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tools/uncoded_frame.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tools/uncoded_frame.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tools/uncoded_frame.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tools/unwrap-diff b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tools/unwrap-diff
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tools/unwrap-diff
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tools/unwrap-diff
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tools/yuvcmp.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tools/yuvcmp.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tools/yuvcmp.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tools/yuvcmp.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tools/zmqsend.c b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tools/zmqsend.c
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tools/zmqsend.c
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tools/zmqsend.c
diff --git a/submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tools/zmqshell.py b/submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tools/zmqshell.py
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/ffmpeg-4.1/tools/zmqshell.py
rename to submodules/ffmpeg/Sources/FFMpeg/ffmpeg-4.1/tools/zmqshell.py
diff --git a/submodules/ffmpeg/FFMpeg/gas-preprocessor.pl b/submodules/ffmpeg/Sources/FFMpeg/gas-preprocessor.pl
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/gas-preprocessor.pl
rename to submodules/ffmpeg/Sources/FFMpeg/gas-preprocessor.pl
diff --git a/submodules/ffmpeg/FFMpeg/libopus/include/opus/opus.h b/submodules/ffmpeg/Sources/FFMpeg/libopus/include/opus/opus.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/libopus/include/opus/opus.h
rename to submodules/ffmpeg/Sources/FFMpeg/libopus/include/opus/opus.h
diff --git a/submodules/ffmpeg/FFMpeg/libopus/include/opus/opus_defines.h b/submodules/ffmpeg/Sources/FFMpeg/libopus/include/opus/opus_defines.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/libopus/include/opus/opus_defines.h
rename to submodules/ffmpeg/Sources/FFMpeg/libopus/include/opus/opus_defines.h
diff --git a/submodules/ffmpeg/FFMpeg/libopus/include/opus/opus_multistream.h b/submodules/ffmpeg/Sources/FFMpeg/libopus/include/opus/opus_multistream.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/libopus/include/opus/opus_multistream.h
rename to submodules/ffmpeg/Sources/FFMpeg/libopus/include/opus/opus_multistream.h
diff --git a/submodules/ffmpeg/FFMpeg/libopus/include/opus/opus_projection.h b/submodules/ffmpeg/Sources/FFMpeg/libopus/include/opus/opus_projection.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/libopus/include/opus/opus_projection.h
rename to submodules/ffmpeg/Sources/FFMpeg/libopus/include/opus/opus_projection.h
diff --git a/submodules/ffmpeg/FFMpeg/libopus/include/opus/opus_types.h b/submodules/ffmpeg/Sources/FFMpeg/libopus/include/opus/opus_types.h
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/libopus/include/opus/opus_types.h
rename to submodules/ffmpeg/Sources/FFMpeg/libopus/include/opus/opus_types.h
diff --git a/submodules/ffmpeg/FFMpeg/libopus/lib/libopus.a b/submodules/ffmpeg/Sources/FFMpeg/libopus/lib/libopus.a
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/libopus/lib/libopus.a
rename to submodules/ffmpeg/Sources/FFMpeg/libopus/lib/libopus.a
diff --git a/submodules/ffmpeg/FFMpeg/pkg-config b/submodules/ffmpeg/Sources/FFMpeg/pkg-config
similarity index 100%
rename from submodules/ffmpeg/FFMpeg/pkg-config
rename to submodules/ffmpeg/Sources/FFMpeg/pkg-config
diff --git a/submodules/ffmpeg/gas-preprocessor.pl b/submodules/ffmpeg/Sources/gas-preprocessor.pl
similarity index 100%
rename from submodules/ffmpeg/gas-preprocessor.pl
rename to submodules/ffmpeg/Sources/gas-preprocessor.pl
diff --git a/submodules/ffmpeg/opus/include/opus/opus.h b/submodules/ffmpeg/Sources/opus/include/opus/opus.h
similarity index 100%
rename from submodules/ffmpeg/opus/include/opus/opus.h
rename to submodules/ffmpeg/Sources/opus/include/opus/opus.h
diff --git a/submodules/ffmpeg/opus/include/opus/opus_defines.h b/submodules/ffmpeg/Sources/opus/include/opus/opus_defines.h
similarity index 100%
rename from submodules/ffmpeg/opus/include/opus/opus_defines.h
rename to submodules/ffmpeg/Sources/opus/include/opus/opus_defines.h
diff --git a/submodules/ffmpeg/opus/include/opus/opus_multistream.h b/submodules/ffmpeg/Sources/opus/include/opus/opus_multistream.h
similarity index 100%
rename from submodules/ffmpeg/opus/include/opus/opus_multistream.h
rename to submodules/ffmpeg/Sources/opus/include/opus/opus_multistream.h
diff --git a/submodules/ffmpeg/opus/include/opus/opus_projection.h b/submodules/ffmpeg/Sources/opus/include/opus/opus_projection.h
similarity index 100%
rename from submodules/ffmpeg/opus/include/opus/opus_projection.h
rename to submodules/ffmpeg/Sources/opus/include/opus/opus_projection.h
diff --git a/submodules/ffmpeg/opus/include/opus/opus_types.h b/submodules/ffmpeg/Sources/opus/include/opus/opus_types.h
similarity index 100%
rename from submodules/ffmpeg/opus/include/opus/opus_types.h
rename to submodules/ffmpeg/Sources/opus/include/opus/opus_types.h
diff --git a/submodules/ffmpeg/opus/lib/libopus.a b/submodules/ffmpeg/Sources/opus/lib/libopus.a
similarity index 100%
rename from submodules/ffmpeg/opus/lib/libopus.a
rename to submodules/ffmpeg/Sources/opus/lib/libopus.a
diff --git a/submodules/libphonenumber/BUCK b/submodules/libphonenumber/BUCK
index 14fc48fa58..2bf07e7f10 100644
--- a/submodules/libphonenumber/BUCK
+++ b/submodules/libphonenumber/BUCK
@@ -8,12 +8,9 @@ static_library(
     headers = glob([
 	    "Sources/*.h",
     ]),
-    exported_headers = [
-    	"Sources/NBPhoneNumberDefines.h",
-    	"Sources/NBPhoneNumber.h",
-		"Sources/NBPhoneNumberUtil.h",
-        "Sources/NBAsYouTypeFormatter.h",
-    ],
+    exported_headers = glob([
+        "PublicHeaders/**/*.h",
+    ]),
     deps = [
     ],
     frameworks = [
diff --git a/submodules/libphonenumber/BUILD b/submodules/libphonenumber/BUILD
new file mode 100644
index 0000000000..261764c043
--- /dev/null
+++ b/submodules/libphonenumber/BUILD
@@ -0,0 +1,22 @@
+
+objc_library(
+    name = "libphonenumber",
+    enable_modules = True,
+    module_name = "libphonenumber",
+    srcs = glob([
+        "Sources/*.m",
+        "Sources/*.h",
+    ]),
+    hdrs = glob([
+        "PublicHeaders/**/*.h",
+    ]),
+    includes = [
+        "PublicHeaders",
+    ],
+    sdk_frameworks = [
+      "Foundation",
+    ],
+    visibility = [
+        "//visibility:public",
+    ],
+)
diff --git a/submodules/libphonenumber/Sources/NBAsYouTypeFormatter.h b/submodules/libphonenumber/PublicHeaders/libphonenumber/NBAsYouTypeFormatter.h
similarity index 100%
rename from submodules/libphonenumber/Sources/NBAsYouTypeFormatter.h
rename to submodules/libphonenumber/PublicHeaders/libphonenumber/NBAsYouTypeFormatter.h
diff --git a/submodules/libphonenumber/Sources/NBPhoneNumber.h b/submodules/libphonenumber/PublicHeaders/libphonenumber/NBPhoneNumber.h
similarity index 100%
rename from submodules/libphonenumber/Sources/NBPhoneNumber.h
rename to submodules/libphonenumber/PublicHeaders/libphonenumber/NBPhoneNumber.h
diff --git a/submodules/libphonenumber/Sources/NBPhoneNumberDefines.h b/submodules/libphonenumber/PublicHeaders/libphonenumber/NBPhoneNumberDefines.h
similarity index 100%
rename from submodules/libphonenumber/Sources/NBPhoneNumberDefines.h
rename to submodules/libphonenumber/PublicHeaders/libphonenumber/NBPhoneNumberDefines.h
diff --git a/submodules/libphonenumber/Sources/NBPhoneNumberUtil.h b/submodules/libphonenumber/PublicHeaders/libphonenumber/NBPhoneNumberUtil.h
similarity index 100%
rename from submodules/libphonenumber/Sources/NBPhoneNumberUtil.h
rename to submodules/libphonenumber/PublicHeaders/libphonenumber/NBPhoneNumberUtil.h
diff --git a/submodules/libphonenumber/Sources/libphonenumber.h b/submodules/libphonenumber/PublicHeaders/libphonenumber/libphonenumber.h
similarity index 100%
rename from submodules/libphonenumber/Sources/libphonenumber.h
rename to submodules/libphonenumber/PublicHeaders/libphonenumber/libphonenumber.h
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/libtgvoip/.gitignore b/submodules/libtgvoip/.gitignore
deleted file mode 100644
index 6572e25a84..0000000000
--- a/submodules/libtgvoip/.gitignore
+++ /dev/null
@@ -1,28 +0,0 @@
-.DS_Store
-bin
-.idea
-build
-*/Debug/*
-*/Release/*
-
-# Build results
-[Dd]ebug/
-[Dd]ebugPublic/
-[Rr]elease/
-[Rr]eleases/
-[Pp]review/
-[Pp]roduction/
-x64/
-x86/
-bld/
-[Bb]in/
-[Oo]bj/
-DerivedData/
-
-# Visual Studio 2015 cache/options directory
-.vs/
-
-xcuserdata/
-autom4te.cache/
-
-libtgvoip.xcodeproj/*
diff --git a/submodules/libtgvoip/Android.mk b/submodules/libtgvoip/Android.mk
deleted file mode 100644
index 0351868921..0000000000
--- a/submodules/libtgvoip/Android.mk
+++ /dev/null
@@ -1,350 +0,0 @@
-LOCAL_PATH := $(call my-dir)
-
-LOCAL_MODULE := voip
-LOCAL_CPPFLAGS := -Wall -std=c++11 -DANDROID -finline-functions -ffast-math -Os -fno-strict-aliasing -O3 -frtti -D__STDC_LIMIT_MACROS -Wno-unknown-pragmas
-LOCAL_CFLAGS := -O3 -DUSE_KISS_FFT -fexceptions -DWEBRTC_APM_DEBUG_DUMP=0 -DWEBRTC_POSIX -DWEBRTC_ANDROID -D__STDC_LIMIT_MACROS -DFIXED_POINT -DWEBRTC_NS_FLOAT
-LOCAL_EXPORT_LDLIBS := -llog -lOpenSLES
-
-MY_DIR := libtgvoip
-
-LOCAL_C_INCLUDES := $(LOCAL_PATH)/../opus/include $(LOCAL_PATH)/../boringssl/include/ $(LOCAL_PATH)/webrtc_dsp/
-
-ifeq ($(TARGET_ARCH_ABI),$(filter $(TARGET_ARCH_ABI),armeabi-v7a arm64-v8a))
-CC_NEON := cc.neon
-LOCAL_CFLAGS += -DWEBRTC_HAS_NEON
-else
-CC_NEON := cc
-endif
-
-LOCAL_CFLAGS += $(TGVOIP_ADDITIONAL_CFLAGS)
-
-LOCAL_SRC_FILES := \
-./logging.cpp \
-./VoIPController.cpp \
-./VoIPGroupController.cpp \
-./Buffers.cpp \
-./BlockingQueue.cpp \
-./audio/AudioInput.cpp \
-./os/android/AudioInputOpenSLES.cpp \
-./MediaStreamItf.cpp \
-./audio/AudioOutput.cpp \
-./OpusEncoder.cpp \
-./os/android/AudioOutputOpenSLES.cpp \
-./JitterBuffer.cpp \
-./OpusDecoder.cpp \
-./os/android/OpenSLEngineWrapper.cpp \
-./os/android/AudioInputAndroid.cpp \
-./os/android/AudioOutputAndroid.cpp \
-./EchoCanceller.cpp \
-./CongestionControl.cpp \
-./VoIPServerConfig.cpp \
-./audio/Resampler.cpp \
-./NetworkSocket.cpp \
-./os/posix/NetworkSocketPosix.cpp \
-./PacketReassembler.cpp \
-./MessageThread.cpp \
-./json11.cpp \
-./audio/AudioIO.cpp \
-./video/VideoRenderer.cpp \
-./video/VideoSource.cpp \
-./video/ScreamCongestionController.cpp \
-./os/android/VideoSourceAndroid.cpp \
-./os/android/VideoRendererAndroid.cpp \
-./client/android/tg_voip_jni.cpp
-
-# WebRTC signal processing
-
-LOCAL_SRC_FILES += \
-./webrtc_dsp/system_wrappers/source/field_trial.cc \
-./webrtc_dsp/system_wrappers/source/metrics.cc \
-./webrtc_dsp/system_wrappers/source/cpu_features.cc \
-./webrtc_dsp/absl/strings/internal/memutil.cc \
-./webrtc_dsp/absl/strings/string_view.cc \
-./webrtc_dsp/absl/strings/ascii.cc \
-./webrtc_dsp/absl/types/bad_optional_access.cc \
-./webrtc_dsp/absl/types/optional.cc \
-./webrtc_dsp/absl/base/internal/raw_logging.cc \
-./webrtc_dsp/absl/base/internal/throw_delegate.cc \
-./webrtc_dsp/rtc_base/race_checker.cc \
-./webrtc_dsp/rtc_base/strings/string_builder.cc \
-./webrtc_dsp/rtc_base/memory/aligned_malloc.cc \
-./webrtc_dsp/rtc_base/timeutils.cc \
-./webrtc_dsp/rtc_base/platform_file.cc \
-./webrtc_dsp/rtc_base/string_to_number.cc \
-./webrtc_dsp/rtc_base/thread_checker_impl.cc \
-./webrtc_dsp/rtc_base/stringencode.cc \
-./webrtc_dsp/rtc_base/stringutils.cc \
-./webrtc_dsp/rtc_base/checks.cc \
-./webrtc_dsp/rtc_base/platform_thread.cc \
-./webrtc_dsp/rtc_base/criticalsection.cc \
-./webrtc_dsp/rtc_base/platform_thread_types.cc \
-./webrtc_dsp/rtc_base/event.cc \
-./webrtc_dsp/rtc_base/event_tracer.cc \
-./webrtc_dsp/rtc_base/logging_webrtc.cc \
-./webrtc_dsp/third_party/rnnoise/src/rnn_vad_weights.cc \
-./webrtc_dsp/third_party/rnnoise/src/kiss_fft.cc \
-./webrtc_dsp/api/audio/audio_frame.cc \
-./webrtc_dsp/api/audio/echo_canceller3_config.cc \
-./webrtc_dsp/api/audio/echo_canceller3_factory.cc \
-./webrtc_dsp/modules/third_party/fft/fft.c \
-./webrtc_dsp/modules/audio_coding/codecs/isac/main/source/pitch_estimator.c \
-./webrtc_dsp/modules/audio_coding/codecs/isac/main/source/lpc_shape_swb16_tables.c \
-./webrtc_dsp/modules/audio_coding/codecs/isac/main/source/pitch_gain_tables.c \
-./webrtc_dsp/modules/audio_coding/codecs/isac/main/source/arith_routines_logist.c \
-./webrtc_dsp/modules/audio_coding/codecs/isac/main/source/filterbanks.c \
-./webrtc_dsp/modules/audio_coding/codecs/isac/main/source/transform.c \
-./webrtc_dsp/modules/audio_coding/codecs/isac/main/source/pitch_filter.c \
-./webrtc_dsp/modules/audio_coding/codecs/isac/main/source/encode_lpc_swb.c \
-./webrtc_dsp/modules/audio_coding/codecs/isac/main/source/filter_functions.c \
-./webrtc_dsp/modules/audio_coding/codecs/isac/main/source/decode.c \
-./webrtc_dsp/modules/audio_coding/codecs/isac/main/source/lattice.c \
-./webrtc_dsp/modules/audio_coding/codecs/isac/main/source/intialize.c \
-./webrtc_dsp/modules/audio_coding/codecs/isac/main/source/lpc_tables.c \
-./webrtc_dsp/modules/audio_coding/codecs/isac/main/source/lpc_gain_swb_tables.c \
-./webrtc_dsp/modules/audio_coding/codecs/isac/main/source/bandwidth_estimator.c \
-./webrtc_dsp/modules/audio_coding/codecs/isac/main/source/encode.c \
-./webrtc_dsp/modules/audio_coding/codecs/isac/main/source/lpc_analysis.c \
-./webrtc_dsp/modules/audio_coding/codecs/isac/main/source/arith_routines_hist.c \
-./webrtc_dsp/modules/audio_coding/codecs/isac/main/source/entropy_coding.c \
-./webrtc_dsp/modules/audio_coding/codecs/isac/main/source/isac_vad.c \
-./webrtc_dsp/modules/audio_coding/codecs/isac/main/source/arith_routines.c \
-./webrtc_dsp/modules/audio_coding/codecs/isac/main/source/crc.c \
-./webrtc_dsp/modules/audio_coding/codecs/isac/main/source/lpc_shape_swb12_tables.c \
-./webrtc_dsp/modules/audio_coding/codecs/isac/main/source/decode_bwe.c \
-./webrtc_dsp/modules/audio_coding/codecs/isac/main/source/spectrum_ar_model_tables.c \
-./webrtc_dsp/modules/audio_coding/codecs/isac/main/source/pitch_lag_tables.c \
-./webrtc_dsp/modules/audio_coding/codecs/isac/main/source/isac.c \
-./webrtc_dsp/modules/audio_processing/rms_level.cc \
-./webrtc_dsp/modules/audio_processing/echo_detector/normalized_covariance_estimator.cc \
-./webrtc_dsp/modules/audio_processing/echo_detector/moving_max.cc \
-./webrtc_dsp/modules/audio_processing/echo_detector/circular_buffer.cc \
-./webrtc_dsp/modules/audio_processing/echo_detector/mean_variance_estimator.cc \
-./webrtc_dsp/modules/audio_processing/splitting_filter.cc \
-./webrtc_dsp/modules/audio_processing/gain_control_impl.cc \
-./webrtc_dsp/modules/audio_processing/ns/nsx_core.c \
-./webrtc_dsp/modules/audio_processing/ns/noise_suppression_x.c \
-./webrtc_dsp/modules/audio_processing/ns/nsx_core_c.c \
-./webrtc_dsp/modules/audio_processing/ns/ns_core.c \
-./webrtc_dsp/modules/audio_processing/ns/noise_suppression.c \
-./webrtc_dsp/modules/audio_processing/audio_buffer.cc \
-./webrtc_dsp/modules/audio_processing/typing_detection.cc \
-./webrtc_dsp/modules/audio_processing/include/audio_processing_statistics.cc \
-./webrtc_dsp/modules/audio_processing/include/audio_generator_factory.cc \
-./webrtc_dsp/modules/audio_processing/include/aec_dump.cc \
-./webrtc_dsp/modules/audio_processing/include/audio_processing.cc \
-./webrtc_dsp/modules/audio_processing/include/config.cc \
-./webrtc_dsp/modules/audio_processing/agc2/interpolated_gain_curve.cc \
-./webrtc_dsp/modules/audio_processing/agc2/agc2_common.cc \
-./webrtc_dsp/modules/audio_processing/agc2/gain_applier.cc \
-./webrtc_dsp/modules/audio_processing/agc2/adaptive_agc.cc \
-./webrtc_dsp/modules/audio_processing/agc2/adaptive_digital_gain_applier.cc \
-./webrtc_dsp/modules/audio_processing/agc2/limiter.cc \
-./webrtc_dsp/modules/audio_processing/agc2/saturation_protector.cc \
-./webrtc_dsp/modules/audio_processing/agc2/rnn_vad/spectral_features_internal.cc \
-./webrtc_dsp/modules/audio_processing/agc2/rnn_vad/rnn.cc \
-./webrtc_dsp/modules/audio_processing/agc2/rnn_vad/pitch_search_internal.cc \
-./webrtc_dsp/modules/audio_processing/agc2/rnn_vad/spectral_features.cc \
-./webrtc_dsp/modules/audio_processing/agc2/rnn_vad/pitch_search.cc \
-./webrtc_dsp/modules/audio_processing/agc2/rnn_vad/features_extraction.cc \
-./webrtc_dsp/modules/audio_processing/agc2/rnn_vad/fft_util.cc \
-./webrtc_dsp/modules/audio_processing/agc2/rnn_vad/lp_residual.cc \
-./webrtc_dsp/modules/audio_processing/agc2/adaptive_mode_level_estimator_agc.cc \
-./webrtc_dsp/modules/audio_processing/agc2/vector_float_frame.cc \
-./webrtc_dsp/modules/audio_processing/agc2/noise_level_estimator.cc \
-./webrtc_dsp/modules/audio_processing/agc2/agc2_testing_common.cc \
-./webrtc_dsp/modules/audio_processing/agc2/fixed_digital_level_estimator.cc \
-./webrtc_dsp/modules/audio_processing/agc2/fixed_gain_controller.cc \
-./webrtc_dsp/modules/audio_processing/agc2/vad_with_level.cc \
-./webrtc_dsp/modules/audio_processing/agc2/limiter_db_gain_curve.cc \
-./webrtc_dsp/modules/audio_processing/agc2/down_sampler.cc \
-./webrtc_dsp/modules/audio_processing/agc2/signal_classifier.cc \
-./webrtc_dsp/modules/audio_processing/agc2/noise_spectrum_estimator.cc \
-./webrtc_dsp/modules/audio_processing/agc2/compute_interpolated_gain_curve.cc \
-./webrtc_dsp/modules/audio_processing/agc2/biquad_filter.cc \
-./webrtc_dsp/modules/audio_processing/agc2/adaptive_mode_level_estimator.cc \
-./webrtc_dsp/modules/audio_processing/transient/moving_moments.cc \
-./webrtc_dsp/modules/audio_processing/transient/wpd_tree.cc \
-./webrtc_dsp/modules/audio_processing/transient/wpd_node.cc \
-./webrtc_dsp/modules/audio_processing/transient/transient_suppressor.cc \
-./webrtc_dsp/modules/audio_processing/transient/transient_detector.cc \
-./webrtc_dsp/modules/audio_processing/low_cut_filter.cc \
-./webrtc_dsp/modules/audio_processing/level_estimator_impl.cc \
-./webrtc_dsp/modules/audio_processing/three_band_filter_bank.cc \
-./webrtc_dsp/modules/audio_processing/aec/echo_cancellation.cc \
-./webrtc_dsp/modules/audio_processing/aec/aec_resampler.cc \
-./webrtc_dsp/modules/audio_processing/aec/aec_core.cc \
-./webrtc_dsp/modules/audio_processing/voice_detection_impl.cc \
-./webrtc_dsp/modules/audio_processing/echo_cancellation_impl.cc \
-./webrtc_dsp/modules/audio_processing/gain_control_for_experimental_agc.cc \
-./webrtc_dsp/modules/audio_processing/agc/agc.cc \
-./webrtc_dsp/modules/audio_processing/agc/loudness_histogram.cc \
-./webrtc_dsp/modules/audio_processing/agc/agc_manager_direct.cc \
-./webrtc_dsp/modules/audio_processing/agc/legacy/analog_agc.c \
-./webrtc_dsp/modules/audio_processing/agc/legacy/digital_agc.c \
-./webrtc_dsp/modules/audio_processing/agc/utility.cc \
-./webrtc_dsp/modules/audio_processing/audio_processing_impl.cc \
-./webrtc_dsp/modules/audio_processing/audio_generator/file_audio_generator.cc \
-./webrtc_dsp/modules/audio_processing/gain_controller2.cc \
-./webrtc_dsp/modules/audio_processing/residual_echo_detector.cc \
-./webrtc_dsp/modules/audio_processing/noise_suppression_impl.cc \
-./webrtc_dsp/modules/audio_processing/aecm/aecm_core.cc \
-./webrtc_dsp/modules/audio_processing/aecm/aecm_core_c.cc \
-./webrtc_dsp/modules/audio_processing/aecm/echo_control_mobile.cc \
-./webrtc_dsp/modules/audio_processing/aec3/render_reverb_model.cc \
-./webrtc_dsp/modules/audio_processing/aec3/reverb_model_fallback.cc \
-./webrtc_dsp/modules/audio_processing/aec3/echo_remover_metrics.cc \
-./webrtc_dsp/modules/audio_processing/aec3/matched_filter_lag_aggregator.cc \
-./webrtc_dsp/modules/audio_processing/aec3/render_delay_buffer2.cc \
-./webrtc_dsp/modules/audio_processing/aec3/echo_path_variability.cc \
-./webrtc_dsp/modules/audio_processing/aec3/frame_blocker.cc \
-./webrtc_dsp/modules/audio_processing/aec3/subtractor.cc \
-./webrtc_dsp/modules/audio_processing/aec3/aec3_fft.cc \
-./webrtc_dsp/modules/audio_processing/aec3/fullband_erle_estimator.cc \
-./webrtc_dsp/modules/audio_processing/aec3/suppression_filter.$(CC_NEON) \
-./webrtc_dsp/modules/audio_processing/aec3/block_processor.cc \
-./webrtc_dsp/modules/audio_processing/aec3/subband_erle_estimator.cc \
-./webrtc_dsp/modules/audio_processing/aec3/render_delay_controller_metrics.cc \
-./webrtc_dsp/modules/audio_processing/aec3/render_delay_buffer.cc \
-./webrtc_dsp/modules/audio_processing/aec3/vector_buffer.cc \
-./webrtc_dsp/modules/audio_processing/aec3/erl_estimator.cc \
-./webrtc_dsp/modules/audio_processing/aec3/aec_state.cc \
-./webrtc_dsp/modules/audio_processing/aec3/adaptive_fir_filter.$(CC_NEON) \
-./webrtc_dsp/modules/audio_processing/aec3/render_delay_controller.cc \
-./webrtc_dsp/modules/audio_processing/aec3/skew_estimator.cc \
-./webrtc_dsp/modules/audio_processing/aec3/echo_path_delay_estimator.cc \
-./webrtc_dsp/modules/audio_processing/aec3/block_framer.cc \
-./webrtc_dsp/modules/audio_processing/aec3/erle_estimator.cc \
-./webrtc_dsp/modules/audio_processing/aec3/reverb_model.cc \
-./webrtc_dsp/modules/audio_processing/aec3/cascaded_biquad_filter.cc \
-./webrtc_dsp/modules/audio_processing/aec3/render_buffer.cc \
-./webrtc_dsp/modules/audio_processing/aec3/subtractor_output.cc \
-./webrtc_dsp/modules/audio_processing/aec3/stationarity_estimator.cc \
-./webrtc_dsp/modules/audio_processing/aec3/render_signal_analyzer.cc \
-./webrtc_dsp/modules/audio_processing/aec3/subtractor_output_analyzer.cc \
-./webrtc_dsp/modules/audio_processing/aec3/suppression_gain.$(CC_NEON) \
-./webrtc_dsp/modules/audio_processing/aec3/echo_audibility.cc \
-./webrtc_dsp/modules/audio_processing/aec3/block_processor_metrics.cc \
-./webrtc_dsp/modules/audio_processing/aec3/moving_average.cc \
-./webrtc_dsp/modules/audio_processing/aec3/reverb_model_estimator.cc \
-./webrtc_dsp/modules/audio_processing/aec3/aec3_common.cc \
-./webrtc_dsp/modules/audio_processing/aec3/residual_echo_estimator.cc \
-./webrtc_dsp/modules/audio_processing/aec3/matched_filter.$(CC_NEON) \
-./webrtc_dsp/modules/audio_processing/aec3/reverb_decay_estimator.cc \
-./webrtc_dsp/modules/audio_processing/aec3/render_delay_controller2.cc \
-./webrtc_dsp/modules/audio_processing/aec3/suppression_gain_limiter.cc \
-./webrtc_dsp/modules/audio_processing/aec3/main_filter_update_gain.cc \
-./webrtc_dsp/modules/audio_processing/aec3/echo_remover.cc \
-./webrtc_dsp/modules/audio_processing/aec3/downsampled_render_buffer.cc \
-./webrtc_dsp/modules/audio_processing/aec3/matrix_buffer.cc \
-./webrtc_dsp/modules/audio_processing/aec3/block_processor2.cc \
-./webrtc_dsp/modules/audio_processing/aec3/echo_canceller3.cc \
-./webrtc_dsp/modules/audio_processing/aec3/block_delay_buffer.cc \
-./webrtc_dsp/modules/audio_processing/aec3/fft_buffer.cc \
-./webrtc_dsp/modules/audio_processing/aec3/comfort_noise_generator.$(CC_NEON) \
-./webrtc_dsp/modules/audio_processing/aec3/shadow_filter_update_gain.cc \
-./webrtc_dsp/modules/audio_processing/aec3/filter_analyzer.cc \
-./webrtc_dsp/modules/audio_processing/aec3/reverb_frequency_response.cc \
-./webrtc_dsp/modules/audio_processing/aec3/decimator.cc \
-./webrtc_dsp/modules/audio_processing/echo_control_mobile_impl.cc \
-./webrtc_dsp/modules/audio_processing/logging/apm_data_dumper.cc \
-./webrtc_dsp/modules/audio_processing/vad/voice_activity_detector.cc \
-./webrtc_dsp/modules/audio_processing/vad/standalone_vad.cc \
-./webrtc_dsp/modules/audio_processing/vad/pitch_internal.cc \
-./webrtc_dsp/modules/audio_processing/vad/vad_circular_buffer.cc \
-./webrtc_dsp/modules/audio_processing/vad/vad_audio_proc.cc \
-./webrtc_dsp/modules/audio_processing/vad/pole_zero_filter.cc \
-./webrtc_dsp/modules/audio_processing/vad/pitch_based_vad.cc \
-./webrtc_dsp/modules/audio_processing/vad/gmm.cc \
-./webrtc_dsp/modules/audio_processing/utility/ooura_fft.cc \
-./webrtc_dsp/modules/audio_processing/utility/delay_estimator_wrapper.cc \
-./webrtc_dsp/modules/audio_processing/utility/delay_estimator.cc \
-./webrtc_dsp/modules/audio_processing/utility/block_mean_calculator.cc \
-./webrtc_dsp/common_audio/window_generator.cc \
-./webrtc_dsp/common_audio/channel_buffer.cc \
-./webrtc_dsp/common_audio/fir_filter_factory.cc \
-./webrtc_dsp/common_audio/wav_header.cc \
-./webrtc_dsp/common_audio/real_fourier_ooura.cc \
-./webrtc_dsp/common_audio/audio_util.cc \
-./webrtc_dsp/common_audio/resampler/push_sinc_resampler.cc \
-./webrtc_dsp/common_audio/resampler/resampler.cc \
-./webrtc_dsp/common_audio/resampler/push_resampler.cc \
-./webrtc_dsp/common_audio/resampler/sinc_resampler.cc \
-./webrtc_dsp/common_audio/resampler/sinusoidal_linear_chirp_source.cc \
-./webrtc_dsp/common_audio/wav_file.cc \
-./webrtc_dsp/common_audio/third_party/spl_sqrt_floor/spl_sqrt_floor.c \
-./webrtc_dsp/common_audio/third_party/fft4g/fft4g.c \
-./webrtc_dsp/common_audio/audio_converter.cc \
-./webrtc_dsp/common_audio/real_fourier.cc \
-./webrtc_dsp/common_audio/sparse_fir_filter.cc \
-./webrtc_dsp/common_audio/smoothing_filter.cc \
-./webrtc_dsp/common_audio/fir_filter_c.cc \
-./webrtc_dsp/common_audio/ring_buffer.c \
-./webrtc_dsp/common_audio/signal_processing/complex_fft.c \
-./webrtc_dsp/common_audio/signal_processing/filter_ma_fast_q12.c \
-./webrtc_dsp/common_audio/signal_processing/levinson_durbin.c \
-./webrtc_dsp/common_audio/signal_processing/dot_product_with_scale.cc \
-./webrtc_dsp/common_audio/signal_processing/auto_corr_to_refl_coef.c \
-./webrtc_dsp/common_audio/signal_processing/resample_by_2_internal.c \
-./webrtc_dsp/common_audio/signal_processing/energy.c \
-./webrtc_dsp/common_audio/signal_processing/sqrt_of_one_minus_x_squared.c \
-./webrtc_dsp/common_audio/signal_processing/downsample_fast.c \
-./webrtc_dsp/common_audio/signal_processing/splitting_filter1.c \
-./webrtc_dsp/common_audio/signal_processing/filter_ar_fast_q12.c \
-./webrtc_dsp/common_audio/signal_processing/spl_init.c \
-./webrtc_dsp/common_audio/signal_processing/lpc_to_refl_coef.c \
-./webrtc_dsp/common_audio/signal_processing/cross_correlation.c \
-./webrtc_dsp/common_audio/signal_processing/division_operations.c \
-./webrtc_dsp/common_audio/signal_processing/auto_correlation.c \
-./webrtc_dsp/common_audio/signal_processing/get_scaling_square.c \
-./webrtc_dsp/common_audio/signal_processing/resample.c \
-./webrtc_dsp/common_audio/signal_processing/min_max_operations.c \
-./webrtc_dsp/common_audio/signal_processing/refl_coef_to_lpc.c \
-./webrtc_dsp/common_audio/signal_processing/filter_ar.c \
-./webrtc_dsp/common_audio/signal_processing/vector_scaling_operations.c \
-./webrtc_dsp/common_audio/signal_processing/resample_fractional.c \
-./webrtc_dsp/common_audio/signal_processing/real_fft.c \
-./webrtc_dsp/common_audio/signal_processing/ilbc_specific_functions.c \
-./webrtc_dsp/common_audio/signal_processing/complex_bit_reverse.c \
-./webrtc_dsp/common_audio/signal_processing/randomization_functions.c \
-./webrtc_dsp/common_audio/signal_processing/copy_set_operations.c \
-./webrtc_dsp/common_audio/signal_processing/resample_by_2.c \
-./webrtc_dsp/common_audio/signal_processing/get_hanning_window.c \
-./webrtc_dsp/common_audio/signal_processing/resample_48khz.c \
-./webrtc_dsp/common_audio/signal_processing/spl_inl.c \
-./webrtc_dsp/common_audio/signal_processing/spl_sqrt.c \
-./webrtc_dsp/common_audio/vad/vad_sp.c \
-./webrtc_dsp/common_audio/vad/vad.cc \
-./webrtc_dsp/common_audio/vad/webrtc_vad.c \
-./webrtc_dsp/common_audio/vad/vad_filterbank.c \
-./webrtc_dsp/common_audio/vad/vad_core.c \
-./webrtc_dsp/common_audio/vad/vad_gmm.c
-
-ifeq ($(TARGET_ARCH_ABI),$(filter $(TARGET_ARCH_ABI),armeabi-v7a arm64-v8a))
-LOCAL_SRC_FILES += \
-./webrtc_dsp/modules/audio_processing/ns/nsx_core_neon.c.neon \
-./webrtc_dsp/modules/audio_processing/aec/aec_core_neon.cc.neon \
-./webrtc_dsp/modules/audio_processing/aecm/aecm_core_neon.cc.neon \
-./webrtc_dsp/modules/audio_processing/utility/ooura_fft_neon.cc.neon \
-./webrtc_dsp/common_audio/fir_filter_neon.cc.neon \
-./webrtc_dsp/common_audio/resampler/sinc_resampler_neon.cc.neon \
-./webrtc_dsp/common_audio/signal_processing/downsample_fast_neon.c.neon \
-./webrtc_dsp/common_audio/signal_processing/min_max_operations_neon.c.neon \
-./webrtc_dsp/common_audio/signal_processing/cross_correlation_neon.c.neon
-endif
-
-ifeq ($(TARGET_ARCH_ABI),armeabi-v7a)
-LOCAL_SRC_FILES += \
-./webrtc_dsp/common_audio/third_party/spl_sqrt_floor/spl_sqrt_floor_arm.S.neon \
-./webrtc_dsp/common_audio/signal_processing/complex_bit_reverse_arm.S.neon \
-./webrtc_dsp/common_audio/signal_processing/filter_ar_fast_q12_armv7.S.neon
-endif
-
-ifeq ($(TARGET_ARCH_ABI),$(filter $(TARGET_ARCH_ABI),x86 x86_64))
-LOCAL_SRC_FILES += \
-./webrtc_dsp/modules/audio_processing/aec/aec_core_sse2.cc \
-./webrtc_dsp/modules/audio_processing/utility/ooura_fft_sse2.cc \
-./webrtc_dsp/common_audio/fir_filter_sse.cc \
-./webrtc_dsp/common_audio/resampler/sinc_resampler_sse.cc
-endif
-
-include $(BUILD_STATIC_LIBRARY)
diff --git a/submodules/libtgvoip/BlockingQueue.cpp b/submodules/libtgvoip/BlockingQueue.cpp
deleted file mode 100644
index 4a02d47625..0000000000
--- a/submodules/libtgvoip/BlockingQueue.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
-//
-// libtgvoip is free and unencumbered public domain software.
-// For more information, see http://unlicense.org or the UNLICENSE file
-// you should have received with this source code distribution.
-//
-
-#include "BlockingQueue.h"
-
-using namespace tgvoip;
-
diff --git a/submodules/libtgvoip/BlockingQueue.h b/submodules/libtgvoip/BlockingQueue.h
deleted file mode 100644
index df7eda3274..0000000000
--- a/submodules/libtgvoip/BlockingQueue.h
+++ /dev/null
@@ -1,92 +0,0 @@
-//
-// libtgvoip is free and unencumbered public domain software.
-// For more information, see http://unlicense.org or the UNLICENSE file
-// you should have received with this source code distribution.
-//
-
-#ifndef LIBTGVOIP_BLOCKINGQUEUE_H
-#define LIBTGVOIP_BLOCKINGQUEUE_H
-
-#include <stdlib.h>
-#include <list>
-#include "threading.h"
-#include "utils.h"
-
-using namespace std;
-
-namespace tgvoip{
-
-template<typename T>
-class BlockingQueue{
-public:
-	TGVOIP_DISALLOW_COPY_AND_ASSIGN(BlockingQueue);
-	BlockingQueue(size_t capacity) : semaphore(capacity, 0){
-		this->capacity=capacity;
-		overflowCallback=NULL;
-	};
-
-	~BlockingQueue(){
-		semaphore.Release();
-	}
-
-	void Put(T thing){
-		MutexGuard sync(mutex);
-		queue.push_back(std::move(thing));
-		bool didOverflow=false;
-		while(queue.size()>capacity){
-			didOverflow=true;
-			if(overflowCallback){
-				overflowCallback(std::move(queue.front()));
-				queue.pop_front();
-			}else{
-				abort();
-			}
-		}
-		if(!didOverflow)
-			semaphore.Release();
-	}
-
-	T GetBlocking(){
-		semaphore.Acquire();
-		MutexGuard sync(mutex);
-		return GetInternal();
-	}
-
-	T Get(){
-		MutexGuard sync(mutex);
-		if(queue.size()>0)
-			semaphore.Acquire();
-		return GetInternal();
-	}
-
-	unsigned int Size(){
-		return queue.size();
-	}
-
-	void PrepareDealloc(){
-
-	}
-
-	void SetOverflowCallback(void (*overflowCallback)(T)){
-		this->overflowCallback=overflowCallback;
-	}
-
-private:
-	T GetInternal(){
-		//if(queue.size()==0)
-		//	return NULL;
-		T r=std::move(queue.front());
-		queue.pop_front();
-		return r;
-	}
-
-	list<T> queue;
-	size_t capacity;
-	//tgvoip_lock_t lock;
-	Semaphore semaphore;
-	Mutex mutex;
-	void (*overflowCallback)(T);
-};
-}
-
-#endif //LIBTGVOIP_BLOCKINGQUEUE_H
diff --git a/submodules/libtgvoip/Buffers.cpp b/submodules/libtgvoip/Buffers.cpp
deleted file mode 100644
index 85db3e9218..0000000000
--- a/submodules/libtgvoip/Buffers.cpp
+++ /dev/null
@@ -1,290 +0,0 @@
-//
-// libtgvoip is free and unencumbered public domain software.
-// For more information, see http://unlicense.org or the UNLICENSE file
-// you should have received with this source code distribution.
-//
-
-#include "Buffers.h"
-#include <assert.h>
-#include <string.h>
-#include <exception>
-#include <stdexcept>
-#include <stdlib.h>
-#include "logging.h"
-
-using namespace tgvoip;
-
-#pragma mark - BufferInputStream
-
-BufferInputStream::BufferInputStream(const unsigned char* data, size_t length){
-	this->buffer=data;
-	this->length=length;
-	offset=0;
-}
-
-BufferInputStream::BufferInputStream(const Buffer &buffer){
-	this->buffer=*buffer;
-	this->length=buffer.Length();
-	offset=0;
-}
-
-BufferInputStream::~BufferInputStream(){
-
-}
-
-
-void BufferInputStream::Seek(size_t offset){
-	if(offset>length){
-		throw std::out_of_range("Not enough bytes in buffer");
-	}
-	this->offset=offset;
-}
-
-size_t BufferInputStream::GetLength(){
-	return length;
-}
-
-size_t BufferInputStream::GetOffset(){
-	return offset;
-}
-
-size_t BufferInputStream::Remaining(){
-	return length-offset;
-}
-
-unsigned char BufferInputStream::ReadByte(){
-	EnsureEnoughRemaining(1);
-	return (unsigned char)buffer[offset++];
-}
-
-int32_t BufferInputStream::ReadInt32(){
-	EnsureEnoughRemaining(4);
-	int32_t res=((int32_t)buffer[offset] & 0xFF) |
-			(((int32_t)buffer[offset+1] & 0xFF) << 8) |
-			(((int32_t)buffer[offset+2] & 0xFF) << 16) |
-			(((int32_t)buffer[offset+3] & 0xFF) << 24);
-	offset+=4;
-	return res;
-}
-
-int64_t BufferInputStream::ReadInt64(){
-	EnsureEnoughRemaining(8);
-	int64_t res=((int64_t)buffer[offset] & 0xFF) |
-			(((int64_t)buffer[offset+1] & 0xFF) << 8) |
-			(((int64_t)buffer[offset+2] & 0xFF) << 16) |
-			(((int64_t)buffer[offset+3] & 0xFF) << 24) |
-			(((int64_t)buffer[offset+4] & 0xFF) << 32) |
-			(((int64_t)buffer[offset+5] & 0xFF) << 40) |
-			(((int64_t)buffer[offset+6] & 0xFF) << 48) |
-			(((int64_t)buffer[offset+7] & 0xFF) << 56);
-	offset+=8;
-	return res;
-}
-
-int16_t BufferInputStream::ReadInt16(){
-	EnsureEnoughRemaining(2);
-	int16_t res=(uint16_t)buffer[offset] | ((uint16_t)buffer[offset+1] << 8);
-	offset+=2;
-	return res;
-}
-
-
-int32_t BufferInputStream::ReadTlLength(){
-	unsigned char l=ReadByte();
-	if(l<254)
-		return l;
-	assert(length-offset>=3);
-	EnsureEnoughRemaining(3);
-	int32_t res=((int32_t)buffer[offset] & 0xFF) |
-				(((int32_t)buffer[offset+1] & 0xFF) << 8) |
-				(((int32_t)buffer[offset+2] & 0xFF) << 16);
-	offset+=3;
-	return res;
-}
-
-void BufferInputStream::ReadBytes(unsigned char *to, size_t count){
-	EnsureEnoughRemaining(count);
-	memcpy(to, buffer+offset, count);
-	offset+=count;
-}
-
-void BufferInputStream::ReadBytes(Buffer &to){
-	ReadBytes(*to, to.Length());
-}
-
-BufferInputStream BufferInputStream::GetPartBuffer(size_t length, bool advance){
-	EnsureEnoughRemaining(length);
-	BufferInputStream s=BufferInputStream(buffer+offset, length);
-	if(advance)
-		offset+=length;
-	return s;
-}
-
-void BufferInputStream::EnsureEnoughRemaining(size_t need){
-	if(length-offset<need){
-		throw std::out_of_range("Not enough bytes in buffer");
-	}
-}
-
-#pragma mark - BufferOutputStream
-
-BufferOutputStream::BufferOutputStream(size_t size){
-	buffer=(unsigned char*) malloc(size);
-	if(!buffer)
-		throw std::bad_alloc();
-	offset=0;
-	this->size=size;
-	bufferProvided=false;
-}
-
-BufferOutputStream::BufferOutputStream(unsigned char *buffer, size_t size){
-	this->buffer=buffer;
-	this->size=size;
-	offset=0;
-	bufferProvided=true;
-}
-
-BufferOutputStream::~BufferOutputStream(){
-	if(!bufferProvided && buffer)
-		free(buffer);
-}
-
-void BufferOutputStream::WriteByte(unsigned char byte){
-	this->ExpandBufferIfNeeded(1);
-	buffer[offset++]=byte;
-}
-
-void BufferOutputStream::WriteInt32(int32_t i){
-	this->ExpandBufferIfNeeded(4);
-	buffer[offset+3]=(unsigned char)((i >> 24) & 0xFF);
-	buffer[offset+2]=(unsigned char)((i >> 16) & 0xFF);
-	buffer[offset+1]=(unsigned char)((i >> 8) & 0xFF);
-	buffer[offset]=(unsigned char)(i & 0xFF);
-	offset+=4;
-}
-
-void BufferOutputStream::WriteInt64(int64_t i){
-	this->ExpandBufferIfNeeded(8);
-	buffer[offset+7]=(unsigned char)((i >> 56) & 0xFF);
-	buffer[offset+6]=(unsigned char)((i >> 48) & 0xFF);
-	buffer[offset+5]=(unsigned char)((i >> 40) & 0xFF);
-	buffer[offset+4]=(unsigned char)((i >> 32) & 0xFF);
-	buffer[offset+3]=(unsigned char)((i >> 24) & 0xFF);
-	buffer[offset+2]=(unsigned char)((i >> 16) & 0xFF);
-	buffer[offset+1]=(unsigned char)((i >> 8) & 0xFF);
-	buffer[offset]=(unsigned char)(i & 0xFF);
-	offset+=8;
-}
-
-void BufferOutputStream::WriteInt16(int16_t i){
-	this->ExpandBufferIfNeeded(2);
-	buffer[offset+1]=(unsigned char)((i >> 8) & 0xFF);
-	buffer[offset]=(unsigned char)(i & 0xFF);
-	offset+=2;
-}
-
-void BufferOutputStream::WriteBytes(const unsigned char *bytes, size_t count){
-	this->ExpandBufferIfNeeded(count);
-	memcpy(buffer+offset, bytes, count);
-	offset+=count;
-}
-
-void BufferOutputStream::WriteBytes(const Buffer &buffer){
-	WriteBytes(*buffer, buffer.Length());
-}
-
-void BufferOutputStream::WriteBytes(const Buffer &buffer, size_t offset, size_t count){
-	if(offset+count>buffer.Length())
-		throw std::out_of_range("offset out of buffer bounds");
-	WriteBytes(*buffer+offset, count);
-}
-
-unsigned char *BufferOutputStream::GetBuffer(){
-	return buffer;
-}
-
-size_t BufferOutputStream::GetLength(){
-	return offset;
-}
-
-void BufferOutputStream::ExpandBufferIfNeeded(size_t need){
-	if(offset+need>size){
-		if(bufferProvided){
-			throw std::out_of_range("buffer overflow");
-		}
-		if(need<1024){
-			buffer=(unsigned char *) realloc(buffer, size+1024);
-			size+=1024;
-		}else{
-			buffer=(unsigned char *) realloc(buffer, size+need);
-			size+=need;
-		}
-		if(!buffer)
-			throw std::bad_alloc();
-	}
-}
-
-
-void BufferOutputStream::Reset(){
-	offset=0;
-}
-
-void BufferOutputStream::Rewind(size_t numBytes){
-	if(numBytes>offset)
-		throw std::out_of_range("buffer underflow");
-	offset-=numBytes;
-}
-
-#pragma mark - BufferPool
-
-BufferPool::BufferPool(unsigned int size, unsigned int count){
-	assert(count<=64);
-	buffers[0]=(unsigned char*) malloc(size*count);
-	bufferCount=count;
-	unsigned int i;
-	for(i=1;i<count;i++){
-		buffers[i]=buffers[0]+i*size;
-	}
-	usedBuffers=0;
-	this->size=size;
-}
-
-BufferPool::~BufferPool(){
-	free(buffers[0]);
-}
-
-unsigned char* BufferPool::Get(){
-	MutexGuard m(mutex);
-	int i;
-	for(i=0;i<bufferCount;i++){
-		if(!((usedBuffers >> i) & 1)){
-			usedBuffers|=(1LL << i);
-			return buffers[i];
-		}
-	}
-	return NULL;
-}
-
-void BufferPool::Reuse(unsigned char* buffer){
-	MutexGuard m(mutex);
-	int i;
-	for(i=0;i<bufferCount;i++){
-		if(buffers[i]==buffer){
-			usedBuffers&= ~(1LL << i);
-			return;
-		}
-	}
-	LOGE("pointer passed isn't a valid buffer from this pool");
-	abort();
-}
-
-size_t BufferPool::GetSingleBufferSize(){
-	return size;
-}
-
-size_t BufferPool::GetBufferCount(){
-	return (size_t) bufferCount;
-}
-
-#pragma mark - Buffer
-
diff --git a/submodules/libtgvoip/Buffers.h b/submodules/libtgvoip/Buffers.h
deleted file mode 100644
index d1ec35a78b..0000000000
--- a/submodules/libtgvoip/Buffers.h
+++ /dev/null
@@ -1,278 +0,0 @@
-//
-// libtgvoip is free and unencumbered public domain software.
-// For more information, see http://unlicense.org or the UNLICENSE file
-// you should have received with this source code distribution.
-//
-
-#ifndef LIBTGVOIP_BUFFERINPUTSTREAM_H
-#define LIBTGVOIP_BUFFERINPUTSTREAM_H
-
-#include <stdio.h>
-#include <stdint.h>
-#include <stdlib.h>
-#include <string.h>
-#include <assert.h>
-#include <stdexcept>
-#include <array>
-#include <limits>
-#include <stddef.h>
-#include "threading.h"
-#include "utils.h"
-
-namespace tgvoip{
-	class Buffer;
-
-	class BufferInputStream{
-
-	public:
-		BufferInputStream(const unsigned char* data, size_t length);
-		BufferInputStream(const Buffer& buffer);
-		~BufferInputStream();
-		void Seek(size_t offset);
-		size_t GetLength();
-		size_t GetOffset();
-		size_t Remaining();
-		unsigned char ReadByte();
-		int64_t ReadInt64();
-		int32_t ReadInt32();
-		int16_t ReadInt16();
-		int32_t ReadTlLength();
-		void ReadBytes(unsigned char* to, size_t count);
-		void ReadBytes(Buffer& to);
-		BufferInputStream GetPartBuffer(size_t length, bool advance);
-
-	private:
-		void EnsureEnoughRemaining(size_t need);
-		const unsigned char* buffer;
-		size_t length;
-		size_t offset;
-	};
-
-	class BufferOutputStream{
-	friend class Buffer;
-	public:
-		TGVOIP_DISALLOW_COPY_AND_ASSIGN(BufferOutputStream);
-		BufferOutputStream(size_t size);
-		BufferOutputStream(unsigned char* buffer, size_t size);
-		~BufferOutputStream();
-		void WriteByte(unsigned char byte);
-		void WriteInt64(int64_t i);
-		void WriteInt32(int32_t i);
-		void WriteInt16(int16_t i);
-		void WriteBytes(const unsigned char* bytes, size_t count);
-		void WriteBytes(const Buffer& buffer);
-		void WriteBytes(const Buffer& buffer, size_t offset, size_t count);
-		unsigned char* GetBuffer();
-		size_t GetLength();
-		void Reset();
-		void Rewind(size_t numBytes);
-		
-		BufferOutputStream& operator=(BufferOutputStream&& other){
-			if(this!=&other){
-				if(!bufferProvided && buffer)
-					free(buffer);
-				buffer=other.buffer;
-				offset=other.offset;
-				size=other.size;
-				bufferProvided=other.bufferProvided;
-				other.buffer=NULL;
-			}
-			return *this;
-		}
-
-	private:
-		void ExpandBufferIfNeeded(size_t need);
-		unsigned char* buffer=NULL;
-		size_t size;
-		size_t offset;
-		bool bufferProvided;
-	};
-
-	class BufferPool{
-	public:
-		TGVOIP_DISALLOW_COPY_AND_ASSIGN(BufferPool);
-		BufferPool(unsigned int size, unsigned int count);
-		~BufferPool();
-		unsigned char* Get();
-		void Reuse(unsigned char* buffer);
-		size_t GetSingleBufferSize();
-		size_t GetBufferCount();
-
-	private:
-		uint64_t usedBuffers;
-		int bufferCount;
-		size_t size;
-		unsigned char* buffers[64];
-		Mutex mutex;
-	};
-
-	class Buffer{
-	public:
-		Buffer(size_t capacity){
-			if(capacity>0)
-				data=(unsigned char *) malloc(capacity);
-			else
-				data=NULL;
-			length=capacity;
-		};
-		TGVOIP_DISALLOW_COPY_AND_ASSIGN(Buffer); // use Buffer::CopyOf to copy contents explicitly
-		Buffer(Buffer&& other) noexcept {
-			data=other.data;
-			length=other.length;
-			other.data=NULL;
-		};
-		Buffer(BufferOutputStream&& stream){
-			data=stream.buffer;
-			length=stream.offset;
-			stream.buffer=NULL;
-		}
-		Buffer(){
-			data=NULL;
-			length=0;
-		}
-		~Buffer(){
-			if(data)
-				free(data);
-			data=NULL;
-		};
-		Buffer& operator=(Buffer&& other){
-			if(this!=&other){
-				if(data)
-					free(data);
-				data=other.data;
-				length=other.length;
-				other.data=NULL;
-			}
-			return *this;
-		}
-		unsigned char& operator[](size_t i){
-			if(i>=length)
-				throw std::out_of_range("");
-			return data[i];
-		}
-		const unsigned char& operator[](size_t i) const{
-			if(i>=length)
-				throw std::out_of_range("");
-			return data[i];
-		}
-		unsigned char* operator*(){
-			return data;
-		}
-		const unsigned char* operator*() const{
-			return data;
-		}
-		void CopyFrom(const Buffer& other, size_t count, size_t srcOffset=0, size_t dstOffset=0){
-			if(!other.data)
-				throw std::invalid_argument("CopyFrom can't copy from NULL");
-			if(other.length<srcOffset+count || length<dstOffset+count)
-				throw std::out_of_range("Out of offset+count bounds of either buffer");
-			memcpy(data+dstOffset, other.data+srcOffset, count);
-		}
-		void CopyFrom(const void* ptr, size_t dstOffset, size_t count){
-			if(length<dstOffset+count)
-				throw std::out_of_range("Offset+count is out of bounds");
-			memcpy(data+dstOffset, ptr, count);
-		}
-		void Resize(size_t newSize){
-			data=(unsigned char *) realloc(data, newSize);
-			length=newSize;
-		}
-		size_t Length() const{
-			return length;
-		}
-		bool IsEmpty() const{
-			return length==0;
-		}
-		static Buffer CopyOf(const Buffer& other){
-			Buffer buf(other.length);
-			buf.CopyFrom(other, other.length);
-			return buf;
-		}
-	private:
-		unsigned char* data;
-		size_t length;
-	};
-
-	template <typename T, size_t size, typename AVG_T=T> class HistoricBuffer{
-	public:
-		HistoricBuffer(){
-			std::fill(data.begin(), data.end(), (T)0);
-		}
-
-		AVG_T Average(){
-			AVG_T avg=(AVG_T)0;
-			for(T& i:data){
-				avg+=i;
-			}
-			return avg/(AVG_T)size;
-		}
-
-		AVG_T Average(size_t firstN){
-			AVG_T avg=(AVG_T)0;
-			for(size_t i=0;i<firstN;i++){
-				avg+=(*this)[i];
-			}
-			return avg/(AVG_T)firstN;
-		}
-
-		AVG_T NonZeroAverage(){
-			AVG_T avg=(AVG_T)0;
-			int nonZeroCount=0;
-			for(T& i:data){
-				if(i!=0){
-					nonZeroCount++;
-					avg+=i;
-				}
-			}
-			if(nonZeroCount==0)
-				return (AVG_T)0;
-			return avg/(AVG_T)nonZeroCount;
-		}
-
-		void Add(T el){
-			data[offset]=el;
-			offset=(offset+1)%size;
-		}
-
-		T Min(){
-			T min=std::numeric_limits<T>::max();
-			for(T& i:data){
-				if(i<min)
-					min=i;
-			}
-			return min;
-		}
-
-		T Max(){
-			T max=std::numeric_limits<T>::min();
-			for(T& i:data){
-				if(i>max)
-					max=i;
-			}
-			return max;
-		}
-
-		void Reset(){
-			std::fill(data.begin(), data.end(), (T)0);
-			offset=0;
-		}
-
-		T& operator[](size_t i){
-			assert(i<size);
-			// [0] should return the most recent entry, [1] the one before it, and so on
-			ptrdiff_t _i=offset-i-1;
-			if(_i<0)
-				_i=size+_i;
-			return data[_i];
-		}
-
-		size_t Size(){
-			return size;
-		}
-	private:
-		std::array<T, size> data;
-		ptrdiff_t offset=0;
-	};
-}
-
-#endif //LIBTGVOIP_BUFFERINPUTSTREAM_H
diff --git a/submodules/libtgvoip/CongestionControl.cpp b/submodules/libtgvoip/CongestionControl.cpp
deleted file mode 100644
index a761b1a3bb..0000000000
--- a/submodules/libtgvoip/CongestionControl.cpp
+++ /dev/null
@@ -1,142 +0,0 @@
-//
-// libtgvoip is free and unencumbered public domain software.
-// For more information, see http://unlicense.org or the UNLICENSE file
-// you should have received with this source code distribution.
-//
-
-#include "CongestionControl.h"
-#include "VoIPController.h"
-#include "logging.h"
-#include "VoIPServerConfig.h"
-#include "PrivateDefines.h"
-#include <math.h>
-#include <assert.h>
-
-using namespace tgvoip;
-
-CongestionControl::CongestionControl(){
-	memset(inflightPackets, 0, sizeof(inflightPackets));
-	tmpRtt=0;
-	tmpRttCount=0;
-	lastSentSeq=0;
-	lastActionTime=0;
-	lastActionRtt=0;
-	stateTransitionTime=0;
-	inflightDataSize=0;
-	lossCount=0;
-	cwnd=(size_t) ServerConfig::GetSharedInstance()->GetInt("audio_congestion_window", 1024);
-}
-
-CongestionControl::~CongestionControl(){
-}
-
-size_t CongestionControl::GetAcknowledgedDataSize(){
-	return 0;
-}
-
-double CongestionControl::GetAverageRTT(){
-	return rttHistory.NonZeroAverage();
-}
-
-size_t CongestionControl::GetInflightDataSize(){
-	return inflightHistory.Average();
-}
-
-
-size_t CongestionControl::GetCongestionWindow(){
-	return cwnd;
-}
-
-double CongestionControl::GetMinimumRTT(){
-	return rttHistory.Min();
-}
-
-void CongestionControl::PacketAcknowledged(uint32_t seq){
-	MutexGuard sync(mutex);
-	int i;
-	for(i=0;i<100;i++){
-		if(inflightPackets[i].seq==seq && inflightPackets[i].sendTime>0){
-			tmpRtt+=(VoIPController::GetCurrentTime()-inflightPackets[i].sendTime);
-			tmpRttCount++;
-			inflightPackets[i].sendTime=0;
-			inflightDataSize-=inflightPackets[i].size;
-			break;
-		}
-	}
-}
-
-void CongestionControl::PacketSent(uint32_t seq, size_t size){
-	if(!seqgt(seq, lastSentSeq) || seq==lastSentSeq){
-		LOGW("Duplicate outgoing seq %u", seq);
-		return;
-	}
-	lastSentSeq=seq;
-	MutexGuard sync(mutex);
-	double smallestSendTime=INFINITY;
-	tgvoip_congestionctl_packet_t* slot=NULL;
-	int i;
-	for(i=0;i<100;i++){
-		if(inflightPackets[i].sendTime==0){
-			slot=&inflightPackets[i];
-			break;
-		}
-		if(smallestSendTime>inflightPackets[i].sendTime){
-			slot=&inflightPackets[i];
-			smallestSendTime=slot->sendTime;
-		}
-	}
-	assert(slot!=NULL);
-	if(slot->sendTime>0){
-		inflightDataSize-=slot->size;
-		lossCount++;
-		LOGD("Packet with seq %u was not acknowledged", slot->seq);
-	}
-	slot->seq=seq;
-	slot->size=size;
-	slot->sendTime=VoIPController::GetCurrentTime();
-	inflightDataSize+=size;
-}
-
-
-void CongestionControl::Tick(){
-	tickCount++;
-	MutexGuard sync(mutex);
-	if(tmpRttCount>0){
-		rttHistory.Add(tmpRtt/tmpRttCount);
-		tmpRtt=0;
-		tmpRttCount=0;
-	}
-	int i;
-	for(i=0;i<100;i++){
-		if(inflightPackets[i].sendTime!=0 && VoIPController::GetCurrentTime()-inflightPackets[i].sendTime>2){
-			inflightPackets[i].sendTime=0;
-			inflightDataSize-=inflightPackets[i].size;
-			lossCount++;
-			LOGD("Packet with seq %u was not acknowledged", inflightPackets[i].seq);
-		}
-	}
-	inflightHistory.Add(inflightDataSize);
-}
-
-
-int CongestionControl::GetBandwidthControlAction(){
-	if(VoIPController::GetCurrentTime()-lastActionTime<1)
-		return TGVOIP_CONCTL_ACT_NONE;
-	size_t inflightAvg=GetInflightDataSize();
-	size_t max=cwnd+cwnd/10;
-	size_t min=cwnd-cwnd/10;
-	if(inflightAvg<min){
-		lastActionTime=VoIPController::GetCurrentTime();
-		return TGVOIP_CONCTL_ACT_INCREASE;
-	}
-	if(inflightAvg>max){
-		lastActionTime=VoIPController::GetCurrentTime();
-		return TGVOIP_CONCTL_ACT_DECREASE;
-	}
-	return TGVOIP_CONCTL_ACT_NONE;
-}
-
-
-uint32_t CongestionControl::GetSendLossCount(){
-	return lossCount;
-}
diff --git a/submodules/libtgvoip/CongestionControl.h b/submodules/libtgvoip/CongestionControl.h
deleted file mode 100644
index 02a2589de3..0000000000
--- a/submodules/libtgvoip/CongestionControl.h
+++ /dev/null
@@ -1,63 +0,0 @@
-//
-// libtgvoip is free and unencumbered public domain software.
-// For more information, see http://unlicense.org or the UNLICENSE file
-// you should have received with this source code distribution.
-//
-
-#ifndef LIBTGVOIP_CONGESTIONCONTROL_H
-#define LIBTGVOIP_CONGESTIONCONTROL_H
-
-#include <stdlib.h>
-#include <stdint.h>
-#include "threading.h"
-#include "Buffers.h"
-
-#define TGVOIP_CONCTL_ACT_INCREASE 1
-#define TGVOIP_CONCTL_ACT_DECREASE 2
-#define TGVOIP_CONCTL_ACT_NONE 0
-
-namespace tgvoip{
-
-struct tgvoip_congestionctl_packet_t{
-	uint32_t seq;
-	double sendTime;
-	size_t size;
-};
-typedef struct tgvoip_congestionctl_packet_t tgvoip_congestionctl_packet_t;
-
-class CongestionControl{
-public:
-	CongestionControl();
-	~CongestionControl();
-
-	void PacketSent(uint32_t seq, size_t size);
-	void PacketAcknowledged(uint32_t seq);
-
-	double GetAverageRTT();
-	double GetMinimumRTT();
-	size_t GetInflightDataSize();
-	size_t GetCongestionWindow();
-	size_t GetAcknowledgedDataSize();
-	void Tick();
-	int GetBandwidthControlAction();
-	uint32_t GetSendLossCount();
-
-private:
-	HistoricBuffer<double, 100> rttHistory;
-	HistoricBuffer<size_t, 30> inflightHistory;
-	tgvoip_congestionctl_packet_t inflightPackets[100];
-	uint32_t lossCount;
-	double tmpRtt;
-	double lastActionTime;
-	double lastActionRtt;
-	double stateTransitionTime;
-	int tmpRttCount;
-	uint32_t lastSentSeq;
-	uint32_t tickCount;
-	size_t inflightDataSize;
-	size_t cwnd;
-	Mutex mutex;
-};
-}
-
-#endif //LIBTGVOIP_CONGESTIONCONTROL_H
diff --git a/submodules/libtgvoip/EchoCanceller.cpp b/submodules/libtgvoip/EchoCanceller.cpp
deleted file mode 100755
index d11f110623..0000000000
--- a/submodules/libtgvoip/EchoCanceller.cpp
+++ /dev/null
@@ -1,240 +0,0 @@
-//
-// libtgvoip is free and unencumbered public domain software.
-// For more information, see http://unlicense.org or the UNLICENSE file
-// you should have received with this source code distribution.
-//
-
-#ifndef TGVOIP_NO_DSP
-#include "webrtc_dsp/modules/audio_processing/include/audio_processing.h"
-#include "webrtc_dsp/api/audio/audio_frame.h"
-#endif
-
-#include "EchoCanceller.h"
-#include "audio/AudioOutput.h"
-#include "audio/AudioInput.h"
-#include "logging.h"
-#include "VoIPServerConfig.h"
-#include <string.h>
-#include <stdio.h>
-#include <math.h>
-
-using namespace tgvoip;
-
-EchoCanceller::EchoCanceller(bool enableAEC, bool enableNS, bool enableAGC){
-#ifndef TGVOIP_NO_DSP
-	this->enableAEC=enableAEC;
-	this->enableAGC=enableAGC;
-	this->enableNS=enableNS;
-	isOn=true;
-
-	webrtc::Config extraConfig;
-#ifdef TGVOIP_USE_DESKTOP_DSP
-	extraConfig.Set(new webrtc::DelayAgnostic(true));
-#endif
-
-	apm=webrtc::AudioProcessingBuilder().Create(extraConfig);
-
-	webrtc::AudioProcessing::Config config;
-	config.echo_canceller.enabled = enableAEC;
-#ifndef TGVOIP_USE_DESKTOP_DSP
-	config.echo_canceller.mobile_mode = true;
-#else
-	config.echo_canceller.mobile_mode = false;
-#endif
-	config.high_pass_filter.enabled = enableAEC;
-	config.gain_controller2.enabled = enableAGC;
-	apm->ApplyConfig(config);
-	
-	webrtc::NoiseSuppression::Level nsLevel;
-#ifdef __APPLE__
-	switch(ServerConfig::GetSharedInstance()->GetInt("webrtc_ns_level_vpio", 0)){
-#else
-	switch(ServerConfig::GetSharedInstance()->GetInt("webrtc_ns_level", 2)){
-#endif
-		case 0:
-			nsLevel=webrtc::NoiseSuppression::Level::kLow;
-			break;
-		case 1:
-			nsLevel=webrtc::NoiseSuppression::Level::kModerate;
-			break;
-		case 3:
-			nsLevel=webrtc::NoiseSuppression::Level::kVeryHigh;
-			break;
-		case 2:
-		default:
-			nsLevel=webrtc::NoiseSuppression::Level::kHigh;
-			break;
-	}
-	apm->noise_suppression()->set_level(nsLevel);
-	apm->noise_suppression()->Enable(enableNS);
-	if(enableAGC){
-		apm->gain_control()->set_mode(webrtc::GainControl::Mode::kAdaptiveDigital);
-		apm->gain_control()->set_target_level_dbfs(ServerConfig::GetSharedInstance()->GetInt("webrtc_agc_target_level", 9));
-		apm->gain_control()->enable_limiter(ServerConfig::GetSharedInstance()->GetBoolean("webrtc_agc_enable_limiter", true));
-		apm->gain_control()->set_compression_gain_db(ServerConfig::GetSharedInstance()->GetInt("webrtc_agc_compression_gain", 20));
-	}
-	apm->voice_detection()->set_likelihood(webrtc::VoiceDetection::Likelihood::kVeryLowLikelihood);
-
-	audioFrame=new webrtc::AudioFrame();
-	audioFrame->samples_per_channel_=480;
-	audioFrame->sample_rate_hz_=48000;
-	audioFrame->num_channels_=1;
-
-	farendQueue=new BlockingQueue<int16_t*>(11);
-	farendBufferPool=new BufferPool(960*2, 10);
-	running=true;
-	bufferFarendThread=new Thread(std::bind(&EchoCanceller::RunBufferFarendThread, this));
-	bufferFarendThread->Start();
-
-#else
-	this->enableAEC=this->enableAGC=enableAGC=this->enableNS=enableNS=false;
-	isOn=true;
-#endif
-}
-
-EchoCanceller::~EchoCanceller(){
-#ifndef TGVOIP_NO_DSP
-	delete apm;
-	delete audioFrame;
-#endif
-}
-
-void EchoCanceller::Start(){
-
-}
-
-void EchoCanceller::Stop(){
-
-}
-
-
-void EchoCanceller::SpeakerOutCallback(unsigned char* data, size_t len){
-    if(len!=960*2 || !enableAEC || !isOn)
-		return;
-#ifndef TGVOIP_NO_DSP
-	int16_t* buf=(int16_t*)farendBufferPool->Get();
-	if(buf){
-		memcpy(buf, data, 960*2);
-		farendQueue->Put(buf);
-	}
-#endif
-}
-
-#ifndef TGVOIP_NO_DSP
-void EchoCanceller::RunBufferFarendThread(){
-	webrtc::AudioFrame frame;
-	frame.num_channels_=1;
-	frame.sample_rate_hz_=48000;
-	frame.samples_per_channel_=480;
-	while(running){
-		int16_t* samplesIn=farendQueue->GetBlocking();
-		if(samplesIn){
-			memcpy(frame.mutable_data(), samplesIn, 480*2);
-			apm->ProcessReverseStream(&frame);
-			memcpy(frame.mutable_data(), samplesIn+480, 480*2);
-			apm->ProcessReverseStream(&frame);
-			didBufferFarend=true;
-			farendBufferPool->Reuse(reinterpret_cast<unsigned char*>(samplesIn));
-		}
-	}
-}
-#endif
-
-void EchoCanceller::Enable(bool enabled){
-	isOn=enabled;
-}
-
-void EchoCanceller::ProcessInput(int16_t* inOut, size_t numSamples, bool& hasVoice){
-#ifndef TGVOIP_NO_DSP
-	if(!isOn || (!enableAEC && !enableAGC && !enableNS)){
-		return;
-	}
-	int delay=audio::AudioInput::GetEstimatedDelay()+audio::AudioOutput::GetEstimatedDelay();
-	assert(numSamples==960);
-
-	memcpy(audioFrame->mutable_data(), inOut, 480*2);
-	if(enableAEC)
-    	apm->set_stream_delay_ms(delay);
-	apm->ProcessStream(audioFrame);
-	if(enableVAD)
-    	hasVoice=apm->voice_detection()->stream_has_voice();
-	memcpy(inOut, audioFrame->data(), 480*2);
-	memcpy(audioFrame->mutable_data(), inOut+480, 480*2);
-	if(enableAEC)
-    	apm->set_stream_delay_ms(delay);
-	apm->ProcessStream(audioFrame);
-	if(enableVAD){
-    	hasVoice=hasVoice || apm->voice_detection()->stream_has_voice();
-	}
-	memcpy(inOut+480, audioFrame->data(), 480*2);
-#endif
-}
-
-void EchoCanceller::SetAECStrength(int strength){
-#ifndef TGVOIP_NO_DSP
-	/*if(aec){
-#ifndef TGVOIP_USE_DESKTOP_DSP
-		AecmConfig cfg;
-		cfg.cngMode=AecmFalse;
-		cfg.echoMode=(int16_t) strength;
-		WebRtcAecm_set_config(aec, cfg);
-#endif
-	}*/
-#endif
-}
-
-void EchoCanceller::SetVoiceDetectionEnabled(bool enabled){
-	enableVAD=enabled;
-#ifndef TGVOIP_NO_DSP
-	apm->voice_detection()->Enable(enabled);
-#endif
-}
-
-using namespace tgvoip::effects;
-
-AudioEffect::~AudioEffect(){
-
-}
-
-void AudioEffect::SetPassThrough(bool passThrough){
-	this->passThrough=passThrough;
-}
-
-Volume::Volume(){
-
-}
-
-Volume::~Volume(){
-
-}
-
-void Volume::Process(int16_t* inOut, size_t numSamples){
-	if(level==1.0f || passThrough){
-		return;
-	}
-	for(size_t i=0;i<numSamples;i++){
-		float sample=(float)inOut[i]*multiplier;
-		if(sample>32767.0f)
-			inOut[i]=INT16_MAX;
-		else if(sample<-32768.0f)
-			inOut[i]=INT16_MIN;
-		else
-			inOut[i]=(int16_t)sample;
-	}
-}
-
-void Volume::SetLevel(float level){
-	this->level=level;
-	float db;
-	if(level<1.0f)
-		db=-50.0f*(1.0f-level);
-	else if(level>1.0f && level<=2.0f)
-		db=10.0f*(level-1.0f);
-	else
-		db=0.0f;
-	multiplier=expf(db/20.0f * logf(10.0f));
-}
-
-float Volume::GetLevel(){
-	return level;
-}
diff --git a/submodules/libtgvoip/EchoCanceller.h b/submodules/libtgvoip/EchoCanceller.h
deleted file mode 100755
index 5f26e1aeb9..0000000000
--- a/submodules/libtgvoip/EchoCanceller.h
+++ /dev/null
@@ -1,83 +0,0 @@
-//
-// libtgvoip is free and unencumbered public domain software.
-// For more information, see http://unlicense.org or the UNLICENSE file
-// you should have received with this source code distribution.
-//
-
-#ifndef LIBTGVOIP_ECHOCANCELLER_H
-#define LIBTGVOIP_ECHOCANCELLER_H
-
-#include "threading.h"
-#include "Buffers.h"
-#include "BlockingQueue.h"
-#include "MediaStreamItf.h"
-#include "utils.h"
-
-namespace webrtc{
-	class AudioProcessing;
-	class AudioFrame;
-}
-
-namespace tgvoip{
-class EchoCanceller{
-
-public:
-	TGVOIP_DISALLOW_COPY_AND_ASSIGN(EchoCanceller);
-	EchoCanceller(bool enableAEC, bool enableNS, bool enableAGC);
-	virtual ~EchoCanceller();
-	virtual void Start();
-	virtual void Stop();
-	void SpeakerOutCallback(unsigned char* data, size_t len);
-	void Enable(bool enabled);
-	void ProcessInput(int16_t* inOut, size_t numSamples, bool& hasVoice);
-	void SetAECStrength(int strength);
-	void SetVoiceDetectionEnabled(bool enabled);
-
-private:
-	bool enableAEC;
-	bool enableAGC;
-	bool enableNS;
-	bool enableVAD=false;
-	bool isOn;
-#ifndef TGVOIP_NO_DSP
-	webrtc::AudioProcessing* apm=NULL;
-	webrtc::AudioFrame* audioFrame=NULL;
-	void RunBufferFarendThread();
-	bool didBufferFarend;
-	Thread* bufferFarendThread;
-	BlockingQueue<int16_t*>* farendQueue;
-	BufferPool* farendBufferPool;
-	bool running;
-#endif
-};
-
-namespace effects{
-
-class AudioEffect{
-public:
-	virtual ~AudioEffect()=0;
-	virtual void Process(int16_t* inOut, size_t numSamples)=0;
-	virtual void SetPassThrough(bool passThrough);
-protected:
-	bool passThrough=false;
-};
-
-class Volume : public AudioEffect{
-public:
-	Volume();
-	virtual ~Volume();
-	virtual void Process(int16_t* inOut, size_t numSamples);
-	/**
-	* Level is (0.0, 2.0]
-	*/
-	void SetLevel(float level);
-	float GetLevel();
-private:
-	float level=1.0f;
-	float multiplier=1.0f;
-};
-
-}
-}
-
-#endif //LIBTGVOIP_ECHOCANCELLER_H
diff --git a/submodules/libtgvoip/Info.plist b/submodules/libtgvoip/Info.plist
deleted file mode 100644
index fbe1e6b314..0000000000
--- a/submodules/libtgvoip/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/libtgvoip/JitterBuffer.cpp b/submodules/libtgvoip/JitterBuffer.cpp
deleted file mode 100755
index 18bf2ad80e..0000000000
--- a/submodules/libtgvoip/JitterBuffer.cpp
+++ /dev/null
@@ -1,463 +0,0 @@
-//
-// libtgvoip is free and unencumbered public domain software.
-// For more information, see http://unlicense.org or the UNLICENSE file
-// you should have received with this source code distribution.
-//
-
-#include "VoIPController.h"
-#include "JitterBuffer.h"
-#include "logging.h"
-#include "VoIPServerConfig.h"
-#include <math.h>
-
-using namespace tgvoip;
-
-JitterBuffer::JitterBuffer(MediaStreamItf *out, uint32_t step):bufferPool(JITTER_SLOT_SIZE, JITTER_SLOT_COUNT){
-	if(out)
-		out->SetCallback(JitterBuffer::CallbackOut, this);
-	this->step=step;
-	memset(slots, 0, sizeof(jitter_packet_t)*JITTER_SLOT_COUNT);
-	if(step<30){
-		minMinDelay=(uint32_t) ServerConfig::GetSharedInstance()->GetInt("jitter_min_delay_20", 6);
-		maxMinDelay=(uint32_t) ServerConfig::GetSharedInstance()->GetInt("jitter_max_delay_20", 25);
-		maxUsedSlots=(uint32_t) ServerConfig::GetSharedInstance()->GetInt("jitter_max_slots_20", 50);
-	}else if(step<50){
-		minMinDelay=(uint32_t) ServerConfig::GetSharedInstance()->GetInt("jitter_min_delay_40", 4);
-		maxMinDelay=(uint32_t) ServerConfig::GetSharedInstance()->GetInt("jitter_max_delay_40", 15);
-		maxUsedSlots=(uint32_t) ServerConfig::GetSharedInstance()->GetInt("jitter_max_slots_40", 30);
-	}else{
-		minMinDelay=(uint32_t) ServerConfig::GetSharedInstance()->GetInt("jitter_min_delay_60", 2);
-		maxMinDelay=(uint32_t) ServerConfig::GetSharedInstance()->GetInt("jitter_max_delay_60", 10);
-		maxUsedSlots=(uint32_t) ServerConfig::GetSharedInstance()->GetInt("jitter_max_slots_60", 20);
-	}
-	lossesToReset=(uint32_t) ServerConfig::GetSharedInstance()->GetInt("jitter_losses_to_reset", 20);
-	resyncThreshold=ServerConfig::GetSharedInstance()->GetDouble("jitter_resync_threshold", 1.0);
-#ifdef TGVOIP_DUMP_JITTER_STATS
-#ifdef TGVOIP_JITTER_DUMP_FILE
-	dump=fopen(TGVOIP_JITTER_DUMP_FILE, "w");
-#elif defined(__ANDROID__)
-	dump=fopen("/sdcard/tgvoip_jitter_dump.txt", "w");
-#else
-	dump=fopen("tgvoip_jitter_dump.txt", "w");
-#endif
-	tgvoip_log_file_write_header(dump);
-	fprintf(dump, "PTS\tRTS\tNumInBuf\tAJitter\tADelay\tTDelay\n");
-#endif
-	Reset();
-}
-
-JitterBuffer::~JitterBuffer(){
-	Reset();
-}
-
-void JitterBuffer::SetMinPacketCount(uint32_t count){
-	LOGI("jitter: set min packet count %u", count);
-	minDelay=count;
-	minMinDelay=count;
-	//Reset();
-}
-
-int JitterBuffer::GetMinPacketCount(){
-	return (int)minDelay;
-}
-
-size_t JitterBuffer::CallbackIn(unsigned char *data, size_t len, void *param){
-	//((JitterBuffer*)param)->HandleInput(data, len);
-	return 0;
-}
-
-size_t JitterBuffer::CallbackOut(unsigned char *data, size_t len, void *param){
-	return 0; //((JitterBuffer*)param)->HandleOutput(data, len, 0, NULL);
-}
-
-void JitterBuffer::HandleInput(unsigned char *data, size_t len, uint32_t timestamp, bool isEC){
-	MutexGuard m(mutex);
-	jitter_packet_t pkt;
-	pkt.size=len;
-	pkt.buffer=data;
-	pkt.timestamp=timestamp;
-	pkt.isEC=isEC;
-	PutInternal(&pkt, !isEC);
-	//LOGV("in, ts=%d, ec=%d", timestamp, isEC);
-
-}
-
-void JitterBuffer::Reset(){
-	wasReset=true;
-	needBuffering=true;
-	lastPutTimestamp=0;
-	int i;
-	for(i=0;i<JITTER_SLOT_COUNT;i++){
-		if(slots[i].buffer){
-			bufferPool.Reuse(slots[i].buffer);
-			slots[i].buffer=NULL;
-		}
-	}
-	delayHistory.Reset();
-	lateHistory.Reset();
-	adjustingDelay=false;
-	lostSinceReset=0;
-	gotSinceReset=0;
-	expectNextAtTime=0;
-	deviationHistory.Reset();
-	outstandingDelayChange=0;
-	dontChangeDelay=0;
-}
-
-
-size_t JitterBuffer::HandleOutput(unsigned char *buffer, size_t len, int offsetInSteps, bool advance, int& playbackScaledDuration, bool& isEC){
-	jitter_packet_t pkt;
-	pkt.buffer=buffer;
-	pkt.size=len;
-	MutexGuard m(mutex);
-	if(first){
-		first=false;
-		unsigned int delay=GetCurrentDelay();
-		if(GetCurrentDelay()>5){
-			LOGW("jitter: delay too big upon start (%u), dropping packets", delay);
-			while(delay>GetMinPacketCount()){
-				for(int i=0;i<JITTER_SLOT_COUNT;i++){
-					if(slots[i].timestamp==nextTimestamp){
-						if(slots[i].buffer){
-    						bufferPool.Reuse(slots[i].buffer);
-    						slots[i].buffer=NULL;
-						}
-						break;
-					}
-				}
-				Advance();
-				delay--;
-			}
-		}
-	}
-	int result=GetInternal(&pkt, offsetInSteps, advance);
-	if(outstandingDelayChange!=0){
-		if(outstandingDelayChange<0){
-			playbackScaledDuration=40;
-			outstandingDelayChange+=20;
-		}else{
-			playbackScaledDuration=80;
-			outstandingDelayChange-=20;
-		}
-		//LOGV("outstanding delay change: %d", outstandingDelayChange);
-	}else if(advance && GetCurrentDelay()==0){
-		//LOGV("stretching packet because the next one is late");
-		playbackScaledDuration=80;
-	}else{
-		playbackScaledDuration=60;
-	}
-	if(result==JR_OK){
-		isEC=pkt.isEC;
-		return pkt.size;
-	}else{
-		return 0;
-	}
-}
-
-
-int JitterBuffer::GetInternal(jitter_packet_t* pkt, int offset, bool advance){
-	/*if(needBuffering && lastPutTimestamp<nextTimestamp){
-		LOGV("jitter: don't have timestamp %lld, buffering", (long long int)nextTimestamp);
-		Advance();
-		return JR_BUFFERING;
-	}*/
-
-	//needBuffering=false;
-
-	int64_t timestampToGet=nextTimestamp+offset*(int32_t)step;
-
-	int i;
-	for(i=0;i<JITTER_SLOT_COUNT;i++){
-		if(slots[i].buffer!=NULL && slots[i].timestamp==timestampToGet){
-			break;
-		}
-	}
-
-	if(i<JITTER_SLOT_COUNT){
-		if(pkt && pkt->size<slots[i].size){
-			LOGE("jitter: packet won't fit into provided buffer of %d (need %d)", int(slots[i].size), int(pkt->size));
-		}else{
-			if(pkt) {
-				pkt->size = slots[i].size;
-				pkt->timestamp = slots[i].timestamp;
-				memcpy(pkt->buffer, slots[i].buffer, slots[i].size);
-				pkt->isEC=slots[i].isEC;
-			}
-		}
-		bufferPool.Reuse(slots[i].buffer);
-		slots[i].buffer=NULL;
-		if(offset==0)
-			Advance();
-		lostCount=0;
-		needBuffering=false;
-		return JR_OK;
-	}
-
-	LOGV("jitter: found no packet for timestamp %lld (last put = %d, lost = %d)", (long long int)timestampToGet, lastPutTimestamp, lostCount);
-
-	if(advance)
-		Advance();
-
-	if(!needBuffering){
-		lostCount++;
-		if(offset==0){
-			lostPackets++;
-			lostSinceReset++;
-		}
-		if(lostCount>=lossesToReset || (gotSinceReset>minDelay*25 && lostSinceReset>gotSinceReset/2)){
-			LOGW("jitter: lost %d packets in a row, resetting", lostCount);
-			//minDelay++;
-			dontIncMinDelay=16;
-			dontDecMinDelay+=128;
-			if(GetCurrentDelay()<minDelay)
-				nextTimestamp-=(int64_t)(minDelay-GetCurrentDelay());
-			lostCount=0;
-			Reset();
-		}
-
-		return JR_MISSING;
-	}
-	return JR_BUFFERING;
-}
-
-void JitterBuffer::PutInternal(jitter_packet_t* pkt, bool overwriteExisting){
-	if(pkt->size>JITTER_SLOT_SIZE){
-		LOGE("The packet is too big to fit into the jitter buffer");
-		return;
-	}
-
-	int i;
-	for(i=0;i<JITTER_SLOT_COUNT;i++){
-		if(slots[i].buffer && slots[i].timestamp==pkt->timestamp){
-			//LOGV("Found existing packet for timestamp %u, overwrite %d", pkt->timestamp, overwriteExisting);
-			if(overwriteExisting){
-				memcpy(slots[i].buffer, pkt->buffer, pkt->size);
-				slots[i].size=pkt->size;
-				slots[i].isEC=pkt->isEC;
-			}
-			return;
-		}
-	}
-	gotSinceReset++;
-	if(wasReset){
-		wasReset=false;
-		outstandingDelayChange=0;
-		nextTimestamp=(int64_t)(((int64_t)pkt->timestamp)-step*minDelay);
-		first=true;
-		LOGI("jitter: resyncing, next timestamp = %lld (step=%d, minDelay=%f)", (long long int)nextTimestamp, step, minDelay);
-	}
-	
-	for(i=0;i<JITTER_SLOT_COUNT;i++){
-		if(slots[i].buffer!=NULL){
-			if(slots[i].timestamp<nextTimestamp-1){
-				bufferPool.Reuse(slots[i].buffer);
-				slots[i].buffer=NULL;
-			}
-		}
-	}
-
-	/*double prevTime=0;
-	uint32_t closestTime=0;
-	for(i=0;i<JITTER_SLOT_COUNT;i++){
-		if(slots[i].buffer!=NULL && pkt->timestamp-slots[i].timestamp<pkt->timestamp-closestTime){
-			closestTime=slots[i].timestamp;
-			prevTime=slots[i].recvTime;
-		}
-	}*/
-	double time=VoIPController::GetCurrentTime();
-	if(expectNextAtTime!=0){
-		double dev=expectNextAtTime-time;
-		//LOGV("packet dev %f", dev);
-		deviationHistory.Add(dev);
-		expectNextAtTime+=step/1000.0;
-	}else{
-		expectNextAtTime=time+step/1000.0;
-	}
-
-	if(pkt->timestamp<nextTimestamp){
-		//LOGW("jitter: would drop packet with timestamp %d because it is late but not hopelessly", pkt->timestamp);
-		latePacketCount++;
-		lostPackets--;
-	}else if(pkt->timestamp<nextTimestamp-1){
-		//LOGW("jitter: dropping packet with timestamp %d because it is too late", pkt->timestamp);
-		latePacketCount++;
-		return;
-	}
-
-	if(pkt->timestamp>lastPutTimestamp)
-		lastPutTimestamp=pkt->timestamp;
-
-	for(i=0;i<JITTER_SLOT_COUNT;i++){
-		if(slots[i].buffer==NULL)
-			break;
-	}
-	if(i==JITTER_SLOT_COUNT || GetCurrentDelay()>=maxUsedSlots){
-		int toRemove=JITTER_SLOT_COUNT;
-		uint32_t bestTimestamp=0xFFFFFFFF;
-		for(i=0;i<JITTER_SLOT_COUNT;i++){
-			if(slots[i].buffer!=NULL && slots[i].timestamp<bestTimestamp){
-				toRemove=i;
-				bestTimestamp=slots[i].timestamp;
-			}
-		}
-		Advance();
-		bufferPool.Reuse(slots[toRemove].buffer);
-		slots[toRemove].buffer=NULL;
-		i=toRemove;
-	}
-	slots[i].timestamp=pkt->timestamp;
-	slots[i].size=pkt->size;
-	slots[i].buffer=bufferPool.Get();
-	slots[i].recvTimeDiff=time-prevRecvTime;
-	slots[i].isEC=pkt->isEC;
-	if(slots[i].buffer)
-		memcpy(slots[i].buffer, pkt->buffer, pkt->size);
-	else
-		LOGE("WTF!!");
-#ifdef TGVOIP_DUMP_JITTER_STATS
-	fprintf(dump, "%u\t%.03f\t%d\t%.03f\t%.03f\t%.03f\n", pkt->timestamp, time, GetCurrentDelay(), lastMeasuredJitter, lastMeasuredDelay, minDelay);
-#endif
-	prevRecvTime=time;
-}
-
-
-void JitterBuffer::Advance(){
-	nextTimestamp+=step;
-}
-
-
-unsigned int JitterBuffer::GetCurrentDelay(){
-	unsigned int delay=0;
-	int i;
-	for(i=0;i<JITTER_SLOT_COUNT;i++){
-		if(slots[i].buffer!=NULL)
-			delay++;
-	}
-	return delay;
-}
-
-void JitterBuffer::Tick(){
-	MutexGuard m(mutex);
-	int i;
-
-	lateHistory.Add(latePacketCount);
-	latePacketCount=0;
-	bool absolutelyNoLatePackets=lateHistory.Max()==0;
-
-	double avgLate16=lateHistory.Average(16);
-	//LOGV("jitter: avg late=%.1f, %.1f, %.1f", avgLate16, avgLate32, avgLate64);
-	if(avgLate16>=resyncThreshold){
-		LOGV("resyncing: avgLate16=%f, resyncThreshold=%f", avgLate16, resyncThreshold);
-		wasReset=true;
-	}
-
-	if(absolutelyNoLatePackets){
-		if(dontDecMinDelay>0)
-			dontDecMinDelay--;
-	}
-
-	delayHistory.Add(GetCurrentDelay());
-	avgDelay=delayHistory.Average(32);
-
-	double stddev=0;
-	double avgdev=deviationHistory.Average();
-	for(i=0;i<64;i++){
-		double d=(deviationHistory[i]-avgdev);
-		stddev+=(d*d);
-	}
-	stddev=sqrt(stddev/64);
-	uint32_t stddevDelay=(uint32_t)ceil(stddev*2*1000/step);
-	if(stddevDelay<minMinDelay)
-		stddevDelay=minMinDelay;
-	if(stddevDelay>maxMinDelay)
-		stddevDelay=maxMinDelay;
-	if(stddevDelay!=minDelay){
-		int32_t diff=(int32_t)(stddevDelay-minDelay);
-		if(diff>0){
-			dontDecMinDelay=100;
-		}
-		if(diff<-1)
-			diff=-1;
-		if(diff>1)
-			diff=1;
-		if((diff>0 && dontIncMinDelay==0) || (diff<0 && dontDecMinDelay==0)){
-			//nextTimestamp+=diff*(int32_t)step;
-			minDelay+=diff;
-			outstandingDelayChange+=diff*60;
-			dontChangeDelay+=32;
-			//LOGD("new delay from stddev %f", minDelay);
-			if(diff<0){
-				dontDecMinDelay+=25;
-			}
-			if(diff>0){
-				dontIncMinDelay=25;
-			}
-		}
-	}
-	lastMeasuredJitter=stddev;
-	lastMeasuredDelay=stddevDelay;
-	//LOGV("stddev=%.3f, avg=%.3f, ndelay=%d, dontDec=%u", stddev, avgdev, stddevDelay, dontDecMinDelay);
-	if(dontChangeDelay==0){
-		if(avgDelay>minDelay+0.5){
-			outstandingDelayChange-=avgDelay>minDelay+2 ? 60 : 20;
-			dontChangeDelay+=10;
-		}else if(avgDelay<minDelay-0.3){
-			outstandingDelayChange+=20;
-			dontChangeDelay+=10;
-		}
-	}
-	if(dontChangeDelay>0)
-		dontChangeDelay--;
-
-	//LOGV("jitter: avg delay=%d, delay=%d, late16=%.1f, dontDecMinDelay=%d", avgDelay, delayHistory[0], avgLate16, dontDecMinDelay);
-	/*if(!adjustingDelay) {
-		if (((minDelay==1 ? (avgDelay>=3) : (avgDelay>=minDelay/2)) && delayHistory[0]>minDelay && avgLate16<=0.1 && absolutelyNoLatePackets && dontDecMinDelay<32 && min>minDelay)) {
-			LOGI("jitter: need adjust");
-			adjustingDelay=true;
-		}
-	}else{
-		if(!absolutelyNoLatePackets){
-			LOGI("jitter: done adjusting because we're losing packets");
-			adjustingDelay=false;
-		}else if(tickCount%5==0){
-			LOGD("jitter: removing a packet to reduce delay");
-			GetInternal(NULL, 0);
-			expectNextAtTime=0;
-			if(GetCurrentDelay()<=minDelay || min<=minDelay){
-				adjustingDelay = false;
-				LOGI("jitter: done adjusting");
-			}
-		}
-	}*/
-
-	tickCount++;
-
-}
-
-
-void JitterBuffer::GetAverageLateCount(double *out){
-	double avgLate64=lateHistory.Average(), avgLate32=lateHistory.Average(32), avgLate16=lateHistory.Average(16);
-	out[0]=avgLate16;
-	out[1]=avgLate32;
-	out[2]=avgLate64;
-}
-
-
-int JitterBuffer::GetAndResetLostPacketCount(){
-	MutexGuard m(mutex);
-	int r=lostPackets;
-	lostPackets=0;
-	return r;
-}
-
-double JitterBuffer::GetLastMeasuredJitter(){
-	return lastMeasuredJitter;
-}
-
-double JitterBuffer::GetLastMeasuredDelay(){
-	return lastMeasuredDelay;
-}
-
-double JitterBuffer::GetAverageDelay(){
-	return avgDelay;
-}
diff --git a/submodules/libtgvoip/JitterBuffer.h b/submodules/libtgvoip/JitterBuffer.h
deleted file mode 100644
index ddbe4475d8..0000000000
--- a/submodules/libtgvoip/JitterBuffer.h
+++ /dev/null
@@ -1,97 +0,0 @@
-//
-// libtgvoip is free and unencumbered public domain software.
-// For more information, see http://unlicense.org or the UNLICENSE file
-// you should have received with this source code distribution.
-//
-
-#ifndef LIBTGVOIP_JITTERBUFFER_H
-#define LIBTGVOIP_JITTERBUFFER_H
-
-#include <stdlib.h>
-#include <vector>
-#include <stdio.h>
-#include "MediaStreamItf.h"
-#include "BlockingQueue.h"
-#include "Buffers.h"
-#include "threading.h"
-
-#define JITTER_SLOT_COUNT 64
-#define JITTER_SLOT_SIZE 1024
-#define JR_OK 1
-#define JR_MISSING 2
-#define JR_BUFFERING 3
-
-
-namespace tgvoip{
-class JitterBuffer{
-public:
-	JitterBuffer(MediaStreamItf* out, uint32_t step);
-	~JitterBuffer();
-	void SetMinPacketCount(uint32_t count);
-	int GetMinPacketCount();
-	unsigned int GetCurrentDelay();
-	double GetAverageDelay();
-	void Reset();
-	void HandleInput(unsigned char* data, size_t len, uint32_t timestamp, bool isEC);
-	size_t HandleOutput(unsigned char* buffer, size_t len, int offsetInSteps, bool advance, int& playbackScaledDuration, bool& isEC);
-	void Tick();
-	void GetAverageLateCount(double* out);
-	int GetAndResetLostPacketCount();
-	double GetLastMeasuredJitter();
-	double GetLastMeasuredDelay();
-
-private:
-	struct jitter_packet_t{
-		unsigned char* buffer=NULL;
-		size_t size;
-		uint32_t timestamp;
-		bool isEC;
-		double recvTimeDiff;
-	};
-	static size_t CallbackIn(unsigned char* data, size_t len, void* param);
-	static size_t CallbackOut(unsigned char* data, size_t len, void* param);
-	void PutInternal(jitter_packet_t* pkt, bool overwriteExisting);
-	int GetInternal(jitter_packet_t* pkt, int offset, bool advance);
-	void Advance();
-
-	BufferPool bufferPool;
-	Mutex mutex;
-	jitter_packet_t slots[JITTER_SLOT_COUNT];
-	int64_t nextTimestamp=0;
-	uint32_t step;
-	double minDelay=6;
-	uint32_t minMinDelay;
-	uint32_t maxMinDelay;
-	uint32_t maxUsedSlots;
-	uint32_t lastPutTimestamp;
-	uint32_t lossesToReset;
-	double resyncThreshold;
-	unsigned int lostCount=0;
-	unsigned int lostSinceReset=0;
-	unsigned int gotSinceReset=0;
-	bool wasReset=true;
-	bool needBuffering=true;
-	HistoricBuffer<int, 64, double> delayHistory;
-	HistoricBuffer<int, 64, double> lateHistory;
-	bool adjustingDelay=false;
-	unsigned int tickCount=0;
-	unsigned int latePacketCount=0;
-	unsigned int dontIncMinDelay=0;
-	unsigned int dontDecMinDelay=0;
-	int lostPackets=0;
-	double prevRecvTime=0;
-	double expectNextAtTime=0;
-	HistoricBuffer<double, 64> deviationHistory;
-	double lastMeasuredJitter=0;
-	double lastMeasuredDelay=0;
-	int outstandingDelayChange=0;
-	unsigned int dontChangeDelay=0;
-	double avgDelay=0;
-	bool first=true;
-#ifdef TGVOIP_DUMP_JITTER_STATS
-	FILE* dump;
-#endif
-};
-}
-
-#endif //LIBTGVOIP_JITTERBUFFER_H
diff --git a/submodules/libtgvoip/Makefile.am b/submodules/libtgvoip/Makefile.am
deleted file mode 100644
index 0d1f1b50ff..0000000000
--- a/submodules/libtgvoip/Makefile.am
+++ /dev/null
@@ -1,760 +0,0 @@
-AUTOMAKE_OPTIONS = foreign
-
-CFLAGS = -Wall -DHAVE_CONFIG_H -Wno-unknown-pragmas
-
-lib_LTLIBRARIES = libtgvoip.la
-
-SRC = VoIPController.cpp \
-Buffers.cpp \
-CongestionControl.cpp \
-EchoCanceller.cpp \
-JitterBuffer.cpp \
-logging.cpp \
-MediaStreamItf.cpp \
-MessageThread.cpp \
-NetworkSocket.cpp \
-OpusDecoder.cpp \
-OpusEncoder.cpp \
-PacketReassembler.cpp \
-VoIPGroupController.cpp \
-VoIPServerConfig.cpp \
-audio/AudioIO.cpp \
-audio/AudioInput.cpp \
-audio/AudioOutput.cpp \
-audio/Resampler.cpp \
-os/posix/NetworkSocketPosix.cpp \
-video/VideoSource.cpp \
-video/VideoRenderer.cpp \
-video/ScreamCongestionController.cpp \
-json11.cpp
-
-TGVOIP_HDRS = \
-VoIPController.h \
-Buffers.h \
-BlockingQueue.h \
-PrivateDefines.h \
-CongestionControl.h \
-EchoCanceller.h \
-JitterBuffer.h \
-logging.h \
-threading.h \
-MediaStreamItf.h \
-MessageThread.h \
-NetworkSocket.h \
-OpusDecoder.h \
-OpusEncoder.h \
-PacketReassembler.h \
-VoIPServerConfig.h \
-audio/AudioIO.h \
-audio/AudioInput.h \
-audio/AudioOutput.h \
-audio/Resampler.h \
-os/posix/NetworkSocketPosix.h \
-video/VideoSource.h \
-video/VideoRenderer.h \
-video/ScreamCongestionController.h \
-json11.hpp \
-utils.h
-
-if TARGET_OS_OSX
-
-SRC += \
-os/darwin/AudioInputAudioUnit.cpp \
-os/darwin/AudioOutputAudioUnit.cpp \
-os/darwin/AudioUnitIO.cpp \
-os/darwin/AudioInputAudioUnitOSX.cpp \
-os/darwin/AudioOutputAudioUnitOSX.cpp \
-os/darwin/DarwinSpecific.mm \
-os/darwin/SampleBufferDisplayLayerRenderer.mm \
-os/darwin/TGVVideoRenderer.mm \
-os/darwin/TGVVideoSource.mm \
-os/darwin/VideoToolboxEncoderSource.mm
-
-TGVOIP_HDRS += \
-os/darwin/AudioInputAudioUnit.h \
-os/darwin/AudioOutputAudioUnit.h \
-os/darwin/AudioUnitIO.h \
-os/darwin/AudioInputAudioUnitOSX.h \
-os/darwin/AudioOutputAudioUnitOSX.h \
-os/darwin/DarwinSpecific.h \
-os/darwin/SampleBufferDisplayLayerRenderer.h \
-os/darwin/TGVVideoRenderer.h \
-os/darwin/TGVVideoSource.h \
-os/darwin/VideoToolboxEncoderSource.h
-
-LDFLAGS += -framework Foundation -framework CoreFoundation -framework CoreAudio -framework AudioToolbox -framework VideoToolbox -framework CoreMedia -framework CoreVideo
-
-else
-# Linux-specific
-
-if WITH_ALSA
-SRC += \
-os/linux/AudioInputALSA.cpp \
-os/linux/AudioOutputALSA.cpp
-TGVOIP_HDRS += \
-os/linux/AudioInputALSA.h \
-os/linux/AudioOutputALSA.h
-endif
-
-if WITH_PULSE
-SRC += \
-os/linux/AudioOutputPulse.cpp \
-os/linux/AudioInputPulse.cpp \
-os/linux/AudioPulse.cpp
-TGVOIP_HDRS += \
-os/linux/AudioOutputPulse.h \
-os/linux/AudioInputPulse.h \
-os/linux/AudioPulse.h \
-os/linux/PulseFunctions.h
-endif
-endif
-
-if ENABLE_DSP
-CFLAGS += -DWEBRTC_POSIX -DWEBRTC_APM_DEBUG_DUMP=0 -DWEBRTC_NS_FLOAT -I$(top_srcdir)/webrtc_dsp
-CCASFLAGS += -I$(top_srcdir)/webrtc_dsp
-
-SRC += \
-./webrtc_dsp/system_wrappers/source/field_trial.cc \
-./webrtc_dsp/system_wrappers/source/metrics.cc \
-./webrtc_dsp/system_wrappers/source/cpu_features.cc \
-./webrtc_dsp/absl/strings/internal/memutil.cc \
-./webrtc_dsp/absl/strings/string_view.cc \
-./webrtc_dsp/absl/strings/ascii.cc \
-./webrtc_dsp/absl/types/bad_optional_access.cc \
-./webrtc_dsp/absl/types/optional.cc \
-./webrtc_dsp/absl/base/internal/raw_logging.cc \
-./webrtc_dsp/absl/base/internal/throw_delegate.cc \
-./webrtc_dsp/rtc_base/race_checker.cc \
-./webrtc_dsp/rtc_base/strings/string_builder.cc \
-./webrtc_dsp/rtc_base/memory/aligned_malloc.cc \
-./webrtc_dsp/rtc_base/timeutils.cc \
-./webrtc_dsp/rtc_base/platform_file.cc \
-./webrtc_dsp/rtc_base/string_to_number.cc \
-./webrtc_dsp/rtc_base/thread_checker_impl.cc \
-./webrtc_dsp/rtc_base/stringencode.cc \
-./webrtc_dsp/rtc_base/stringutils.cc \
-./webrtc_dsp/rtc_base/checks.cc \
-./webrtc_dsp/rtc_base/platform_thread.cc \
-./webrtc_dsp/rtc_base/logging_webrtc.cc \
-./webrtc_dsp/rtc_base/criticalsection.cc \
-./webrtc_dsp/rtc_base/platform_thread_types.cc \
-./webrtc_dsp/rtc_base/event.cc \
-./webrtc_dsp/rtc_base/event_tracer.cc \
-./webrtc_dsp/third_party/rnnoise/src/rnn_vad_weights.cc \
-./webrtc_dsp/third_party/rnnoise/src/kiss_fft.cc \
-./webrtc_dsp/api/audio/audio_frame.cc \
-./webrtc_dsp/api/audio/echo_canceller3_config.cc \
-./webrtc_dsp/api/audio/echo_canceller3_factory.cc \
-./webrtc_dsp/modules/third_party/fft/fft.c \
-./webrtc_dsp/modules/audio_coding/codecs/isac/main/source/pitch_estimator.c \
-./webrtc_dsp/modules/audio_coding/codecs/isac/main/source/lpc_shape_swb16_tables.c \
-./webrtc_dsp/modules/audio_coding/codecs/isac/main/source/pitch_gain_tables.c \
-./webrtc_dsp/modules/audio_coding/codecs/isac/main/source/arith_routines_logist.c \
-./webrtc_dsp/modules/audio_coding/codecs/isac/main/source/filterbanks.c \
-./webrtc_dsp/modules/audio_coding/codecs/isac/main/source/transform.c \
-./webrtc_dsp/modules/audio_coding/codecs/isac/main/source/pitch_filter.c \
-./webrtc_dsp/modules/audio_coding/codecs/isac/main/source/encode_lpc_swb.c \
-./webrtc_dsp/modules/audio_coding/codecs/isac/main/source/filter_functions.c \
-./webrtc_dsp/modules/audio_coding/codecs/isac/main/source/decode.c \
-./webrtc_dsp/modules/audio_coding/codecs/isac/main/source/lattice.c \
-./webrtc_dsp/modules/audio_coding/codecs/isac/main/source/intialize.c \
-./webrtc_dsp/modules/audio_coding/codecs/isac/main/source/lpc_tables.c \
-./webrtc_dsp/modules/audio_coding/codecs/isac/main/source/lpc_gain_swb_tables.c \
-./webrtc_dsp/modules/audio_coding/codecs/isac/main/source/bandwidth_estimator.c \
-./webrtc_dsp/modules/audio_coding/codecs/isac/main/source/encode.c \
-./webrtc_dsp/modules/audio_coding/codecs/isac/main/source/lpc_analysis.c \
-./webrtc_dsp/modules/audio_coding/codecs/isac/main/source/arith_routines_hist.c \
-./webrtc_dsp/modules/audio_coding/codecs/isac/main/source/entropy_coding.c \
-./webrtc_dsp/modules/audio_coding/codecs/isac/main/source/isac_vad.c \
-./webrtc_dsp/modules/audio_coding/codecs/isac/main/source/arith_routines.c \
-./webrtc_dsp/modules/audio_coding/codecs/isac/main/source/crc.c \
-./webrtc_dsp/modules/audio_coding/codecs/isac/main/source/lpc_shape_swb12_tables.c \
-./webrtc_dsp/modules/audio_coding/codecs/isac/main/source/decode_bwe.c \
-./webrtc_dsp/modules/audio_coding/codecs/isac/main/source/spectrum_ar_model_tables.c \
-./webrtc_dsp/modules/audio_coding/codecs/isac/main/source/pitch_lag_tables.c \
-./webrtc_dsp/modules/audio_coding/codecs/isac/main/source/isac.c \
-./webrtc_dsp/modules/audio_processing/rms_level.cc \
-./webrtc_dsp/modules/audio_processing/echo_detector/normalized_covariance_estimator.cc \
-./webrtc_dsp/modules/audio_processing/echo_detector/moving_max.cc \
-./webrtc_dsp/modules/audio_processing/echo_detector/circular_buffer.cc \
-./webrtc_dsp/modules/audio_processing/echo_detector/mean_variance_estimator.cc \
-./webrtc_dsp/modules/audio_processing/splitting_filter.cc \
-./webrtc_dsp/modules/audio_processing/gain_control_impl.cc \
-./webrtc_dsp/modules/audio_processing/ns/nsx_core.c \
-./webrtc_dsp/modules/audio_processing/ns/noise_suppression_x.c \
-./webrtc_dsp/modules/audio_processing/ns/nsx_core_c.c \
-./webrtc_dsp/modules/audio_processing/ns/ns_core.c \
-./webrtc_dsp/modules/audio_processing/ns/noise_suppression.c \
-./webrtc_dsp/modules/audio_processing/audio_buffer.cc \
-./webrtc_dsp/modules/audio_processing/typing_detection.cc \
-./webrtc_dsp/modules/audio_processing/include/audio_processing_statistics.cc \
-./webrtc_dsp/modules/audio_processing/include/audio_generator_factory.cc \
-./webrtc_dsp/modules/audio_processing/include/aec_dump.cc \
-./webrtc_dsp/modules/audio_processing/include/audio_processing.cc \
-./webrtc_dsp/modules/audio_processing/include/config.cc \
-./webrtc_dsp/modules/audio_processing/agc2/interpolated_gain_curve.cc \
-./webrtc_dsp/modules/audio_processing/agc2/agc2_common.cc \
-./webrtc_dsp/modules/audio_processing/agc2/gain_applier.cc \
-./webrtc_dsp/modules/audio_processing/agc2/adaptive_agc.cc \
-./webrtc_dsp/modules/audio_processing/agc2/adaptive_digital_gain_applier.cc \
-./webrtc_dsp/modules/audio_processing/agc2/limiter.cc \
-./webrtc_dsp/modules/audio_processing/agc2/saturation_protector.cc \
-./webrtc_dsp/modules/audio_processing/agc2/rnn_vad/spectral_features_internal.cc \
-./webrtc_dsp/modules/audio_processing/agc2/rnn_vad/rnn.cc \
-./webrtc_dsp/modules/audio_processing/agc2/rnn_vad/pitch_search_internal.cc \
-./webrtc_dsp/modules/audio_processing/agc2/rnn_vad/spectral_features.cc \
-./webrtc_dsp/modules/audio_processing/agc2/rnn_vad/pitch_search.cc \
-./webrtc_dsp/modules/audio_processing/agc2/rnn_vad/features_extraction.cc \
-./webrtc_dsp/modules/audio_processing/agc2/rnn_vad/fft_util.cc \
-./webrtc_dsp/modules/audio_processing/agc2/rnn_vad/lp_residual.cc \
-./webrtc_dsp/modules/audio_processing/agc2/adaptive_mode_level_estimator_agc.cc \
-./webrtc_dsp/modules/audio_processing/agc2/vector_float_frame.cc \
-./webrtc_dsp/modules/audio_processing/agc2/noise_level_estimator.cc \
-./webrtc_dsp/modules/audio_processing/agc2/agc2_testing_common.cc \
-./webrtc_dsp/modules/audio_processing/agc2/fixed_digital_level_estimator.cc \
-./webrtc_dsp/modules/audio_processing/agc2/fixed_gain_controller.cc \
-./webrtc_dsp/modules/audio_processing/agc2/vad_with_level.cc \
-./webrtc_dsp/modules/audio_processing/agc2/limiter_db_gain_curve.cc \
-./webrtc_dsp/modules/audio_processing/agc2/down_sampler.cc \
-./webrtc_dsp/modules/audio_processing/agc2/signal_classifier.cc \
-./webrtc_dsp/modules/audio_processing/agc2/noise_spectrum_estimator.cc \
-./webrtc_dsp/modules/audio_processing/agc2/compute_interpolated_gain_curve.cc \
-./webrtc_dsp/modules/audio_processing/agc2/biquad_filter.cc \
-./webrtc_dsp/modules/audio_processing/agc2/adaptive_mode_level_estimator.cc \
-./webrtc_dsp/modules/audio_processing/transient/moving_moments.cc \
-./webrtc_dsp/modules/audio_processing/transient/wpd_tree.cc \
-./webrtc_dsp/modules/audio_processing/transient/wpd_node.cc \
-./webrtc_dsp/modules/audio_processing/transient/transient_suppressor.cc \
-./webrtc_dsp/modules/audio_processing/transient/transient_detector.cc \
-./webrtc_dsp/modules/audio_processing/low_cut_filter.cc \
-./webrtc_dsp/modules/audio_processing/level_estimator_impl.cc \
-./webrtc_dsp/modules/audio_processing/three_band_filter_bank.cc \
-./webrtc_dsp/modules/audio_processing/aec/echo_cancellation.cc \
-./webrtc_dsp/modules/audio_processing/aec/aec_resampler.cc \
-./webrtc_dsp/modules/audio_processing/aec/aec_core.cc \
-./webrtc_dsp/modules/audio_processing/voice_detection_impl.cc \
-./webrtc_dsp/modules/audio_processing/echo_cancellation_impl.cc \
-./webrtc_dsp/modules/audio_processing/gain_control_for_experimental_agc.cc \
-./webrtc_dsp/modules/audio_processing/agc/agc.cc \
-./webrtc_dsp/modules/audio_processing/agc/loudness_histogram.cc \
-./webrtc_dsp/modules/audio_processing/agc/agc_manager_direct.cc \
-./webrtc_dsp/modules/audio_processing/agc/legacy/analog_agc.c \
-./webrtc_dsp/modules/audio_processing/agc/legacy/digital_agc.c \
-./webrtc_dsp/modules/audio_processing/agc/utility.cc \
-./webrtc_dsp/modules/audio_processing/audio_processing_impl.cc \
-./webrtc_dsp/modules/audio_processing/audio_generator/file_audio_generator.cc \
-./webrtc_dsp/modules/audio_processing/gain_controller2.cc \
-./webrtc_dsp/modules/audio_processing/residual_echo_detector.cc \
-./webrtc_dsp/modules/audio_processing/noise_suppression_impl.cc \
-./webrtc_dsp/modules/audio_processing/aecm/aecm_core.cc \
-./webrtc_dsp/modules/audio_processing/aecm/aecm_core_c.cc \
-./webrtc_dsp/modules/audio_processing/aecm/echo_control_mobile.cc \
-./webrtc_dsp/modules/audio_processing/aec3/render_reverb_model.cc \
-./webrtc_dsp/modules/audio_processing/aec3/reverb_model_fallback.cc \
-./webrtc_dsp/modules/audio_processing/aec3/echo_remover_metrics.cc \
-./webrtc_dsp/modules/audio_processing/aec3/matched_filter_lag_aggregator.cc \
-./webrtc_dsp/modules/audio_processing/aec3/render_delay_buffer2.cc \
-./webrtc_dsp/modules/audio_processing/aec3/echo_path_variability.cc \
-./webrtc_dsp/modules/audio_processing/aec3/frame_blocker.cc \
-./webrtc_dsp/modules/audio_processing/aec3/subtractor.cc \
-./webrtc_dsp/modules/audio_processing/aec3/aec3_fft.cc \
-./webrtc_dsp/modules/audio_processing/aec3/fullband_erle_estimator.cc \
-./webrtc_dsp/modules/audio_processing/aec3/suppression_filter.cc \
-./webrtc_dsp/modules/audio_processing/aec3/block_processor.cc \
-./webrtc_dsp/modules/audio_processing/aec3/subband_erle_estimator.cc \
-./webrtc_dsp/modules/audio_processing/aec3/render_delay_controller_metrics.cc \
-./webrtc_dsp/modules/audio_processing/aec3/render_delay_buffer.cc \
-./webrtc_dsp/modules/audio_processing/aec3/vector_buffer.cc \
-./webrtc_dsp/modules/audio_processing/aec3/erl_estimator.cc \
-./webrtc_dsp/modules/audio_processing/aec3/aec_state.cc \
-./webrtc_dsp/modules/audio_processing/aec3/adaptive_fir_filter.cc \
-./webrtc_dsp/modules/audio_processing/aec3/render_delay_controller.cc \
-./webrtc_dsp/modules/audio_processing/aec3/skew_estimator.cc \
-./webrtc_dsp/modules/audio_processing/aec3/echo_path_delay_estimator.cc \
-./webrtc_dsp/modules/audio_processing/aec3/block_framer.cc \
-./webrtc_dsp/modules/audio_processing/aec3/erle_estimator.cc \
-./webrtc_dsp/modules/audio_processing/aec3/reverb_model.cc \
-./webrtc_dsp/modules/audio_processing/aec3/cascaded_biquad_filter.cc \
-./webrtc_dsp/modules/audio_processing/aec3/render_buffer.cc \
-./webrtc_dsp/modules/audio_processing/aec3/subtractor_output.cc \
-./webrtc_dsp/modules/audio_processing/aec3/stationarity_estimator.cc \
-./webrtc_dsp/modules/audio_processing/aec3/render_signal_analyzer.cc \
-./webrtc_dsp/modules/audio_processing/aec3/subtractor_output_analyzer.cc \
-./webrtc_dsp/modules/audio_processing/aec3/suppression_gain.cc \
-./webrtc_dsp/modules/audio_processing/aec3/echo_audibility.cc \
-./webrtc_dsp/modules/audio_processing/aec3/block_processor_metrics.cc \
-./webrtc_dsp/modules/audio_processing/aec3/moving_average.cc \
-./webrtc_dsp/modules/audio_processing/aec3/reverb_model_estimator.cc \
-./webrtc_dsp/modules/audio_processing/aec3/aec3_common.cc \
-./webrtc_dsp/modules/audio_processing/aec3/residual_echo_estimator.cc \
-./webrtc_dsp/modules/audio_processing/aec3/matched_filter.cc \
-./webrtc_dsp/modules/audio_processing/aec3/reverb_decay_estimator.cc \
-./webrtc_dsp/modules/audio_processing/aec3/render_delay_controller2.cc \
-./webrtc_dsp/modules/audio_processing/aec3/suppression_gain_limiter.cc \
-./webrtc_dsp/modules/audio_processing/aec3/main_filter_update_gain.cc \
-./webrtc_dsp/modules/audio_processing/aec3/echo_remover.cc \
-./webrtc_dsp/modules/audio_processing/aec3/downsampled_render_buffer.cc \
-./webrtc_dsp/modules/audio_processing/aec3/matrix_buffer.cc \
-./webrtc_dsp/modules/audio_processing/aec3/block_processor2.cc \
-./webrtc_dsp/modules/audio_processing/aec3/echo_canceller3.cc \
-./webrtc_dsp/modules/audio_processing/aec3/block_delay_buffer.cc \
-./webrtc_dsp/modules/audio_processing/aec3/fft_buffer.cc \
-./webrtc_dsp/modules/audio_processing/aec3/comfort_noise_generator.cc \
-./webrtc_dsp/modules/audio_processing/aec3/shadow_filter_update_gain.cc \
-./webrtc_dsp/modules/audio_processing/aec3/filter_analyzer.cc \
-./webrtc_dsp/modules/audio_processing/aec3/reverb_frequency_response.cc \
-./webrtc_dsp/modules/audio_processing/aec3/decimator.cc \
-./webrtc_dsp/modules/audio_processing/echo_control_mobile_impl.cc \
-./webrtc_dsp/modules/audio_processing/logging/apm_data_dumper.cc \
-./webrtc_dsp/modules/audio_processing/vad/voice_activity_detector.cc \
-./webrtc_dsp/modules/audio_processing/vad/standalone_vad.cc \
-./webrtc_dsp/modules/audio_processing/vad/pitch_internal.cc \
-./webrtc_dsp/modules/audio_processing/vad/vad_circular_buffer.cc \
-./webrtc_dsp/modules/audio_processing/vad/vad_audio_proc.cc \
-./webrtc_dsp/modules/audio_processing/vad/pole_zero_filter.cc \
-./webrtc_dsp/modules/audio_processing/vad/pitch_based_vad.cc \
-./webrtc_dsp/modules/audio_processing/vad/gmm.cc \
-./webrtc_dsp/modules/audio_processing/utility/ooura_fft.cc \
-./webrtc_dsp/modules/audio_processing/utility/delay_estimator_wrapper.cc \
-./webrtc_dsp/modules/audio_processing/utility/delay_estimator.cc \
-./webrtc_dsp/modules/audio_processing/utility/block_mean_calculator.cc \
-./webrtc_dsp/common_audio/window_generator.cc \
-./webrtc_dsp/common_audio/channel_buffer.cc \
-./webrtc_dsp/common_audio/fir_filter_factory.cc \
-./webrtc_dsp/common_audio/wav_header.cc \
-./webrtc_dsp/common_audio/real_fourier_ooura.cc \
-./webrtc_dsp/common_audio/audio_util.cc \
-./webrtc_dsp/common_audio/fir_filter_sse.cc \
-./webrtc_dsp/common_audio/resampler/push_sinc_resampler.cc \
-./webrtc_dsp/common_audio/resampler/resampler.cc \
-./webrtc_dsp/common_audio/resampler/sinc_resampler_sse.cc \
-./webrtc_dsp/common_audio/resampler/push_resampler.cc \
-./webrtc_dsp/common_audio/resampler/sinc_resampler.cc \
-./webrtc_dsp/common_audio/resampler/sinusoidal_linear_chirp_source.cc \
-./webrtc_dsp/common_audio/wav_file.cc \
-./webrtc_dsp/common_audio/third_party/fft4g/fft4g.c \
-./webrtc_dsp/common_audio/audio_converter.cc \
-./webrtc_dsp/common_audio/real_fourier.cc \
-./webrtc_dsp/common_audio/sparse_fir_filter.cc \
-./webrtc_dsp/common_audio/smoothing_filter.cc \
-./webrtc_dsp/common_audio/fir_filter_c.cc \
-./webrtc_dsp/common_audio/ring_buffer.c \
-./webrtc_dsp/common_audio/signal_processing/complex_fft.c \
-./webrtc_dsp/common_audio/signal_processing/filter_ma_fast_q12.c \
-./webrtc_dsp/common_audio/signal_processing/splitting_filter1.c \
-./webrtc_dsp/common_audio/signal_processing/levinson_durbin.c \
-./webrtc_dsp/common_audio/signal_processing/dot_product_with_scale.cc \
-./webrtc_dsp/common_audio/signal_processing/auto_corr_to_refl_coef.c \
-./webrtc_dsp/common_audio/signal_processing/resample_by_2_internal.c \
-./webrtc_dsp/common_audio/signal_processing/energy.c \
-./webrtc_dsp/common_audio/signal_processing/sqrt_of_one_minus_x_squared.c \
-./webrtc_dsp/common_audio/signal_processing/downsample_fast.c \
-./webrtc_dsp/common_audio/signal_processing/filter_ar_fast_q12.c \
-./webrtc_dsp/common_audio/signal_processing/spl_init.c \
-./webrtc_dsp/common_audio/signal_processing/lpc_to_refl_coef.c \
-./webrtc_dsp/common_audio/signal_processing/cross_correlation.c \
-./webrtc_dsp/common_audio/signal_processing/division_operations.c \
-./webrtc_dsp/common_audio/signal_processing/auto_correlation.c \
-./webrtc_dsp/common_audio/signal_processing/get_scaling_square.c \
-./webrtc_dsp/common_audio/signal_processing/resample.c \
-./webrtc_dsp/common_audio/signal_processing/min_max_operations.c \
-./webrtc_dsp/common_audio/signal_processing/refl_coef_to_lpc.c \
-./webrtc_dsp/common_audio/signal_processing/filter_ar.c \
-./webrtc_dsp/common_audio/signal_processing/vector_scaling_operations.c \
-./webrtc_dsp/common_audio/signal_processing/resample_fractional.c \
-./webrtc_dsp/common_audio/signal_processing/real_fft.c \
-./webrtc_dsp/common_audio/signal_processing/ilbc_specific_functions.c \
-./webrtc_dsp/common_audio/signal_processing/randomization_functions.c \
-./webrtc_dsp/common_audio/signal_processing/copy_set_operations.c \
-./webrtc_dsp/common_audio/signal_processing/resample_by_2.c \
-./webrtc_dsp/common_audio/signal_processing/get_hanning_window.c \
-./webrtc_dsp/common_audio/signal_processing/resample_48khz.c \
-./webrtc_dsp/common_audio/signal_processing/spl_inl.c \
-./webrtc_dsp/common_audio/signal_processing/spl_sqrt.c \
-./webrtc_dsp/common_audio/vad/vad_sp.c \
-./webrtc_dsp/common_audio/vad/vad.cc \
-./webrtc_dsp/common_audio/vad/webrtc_vad.c \
-./webrtc_dsp/common_audio/vad/vad_filterbank.c \
-./webrtc_dsp/common_audio/vad/vad_core.c \
-./webrtc_dsp/common_audio/vad/vad_gmm.c
-
-if TARGET_OS_OSX
-CFLAGS += -DWEBRTC_MAC
-SRC += \
-webrtc_dsp/rtc_base/logging_mac.mm \
-webrtc_dsp/rtc_base/logging_mac.h
-else
-CFLAGS += -DWEBRTC_LINUX
-endif
-
-if TARGET_CPU_X86
-SRC += \
-webrtc_dsp/modules/audio_processing/aec/aec_core_sse2.cc \
-webrtc_dsp/modules/audio_processing/utility/ooura_fft_sse2.cc
-endif
-
-if ENABLE_AUDIO_CALLBACK
-CFLAGS += -DTGVOIP_USE_CALLBACK_AUDIO_IO
-SRC += \
-audio/AudioIOCallback.cpp
-TGVOIP_HDRS += \
-audio/AudioIOCallback.h
-endif
-
-if TARGET_CPU_ARM
-SRC += \
-webrtc_dsp/common_audio/signal_processing/complex_bit_reverse_arm.S \
-webrtc_dsp/common_audio/third_party/spl_sqrt_floor/spl_sqrt_floor_arm.S
-if TARGET_CPU_ARMV7
-CFLAGS += -mfpu=neon -mfloat-abi=hard
-CCASFLAGS += -mfpu=neon -mfloat-abi=hard
-SRC += \
-webrtc_dsp/common_audio/signal_processing/cross_correlation_neon.c \
-webrtc_dsp/common_audio/signal_processing/downsample_fast_neon.c \
-webrtc_dsp/common_audio/signal_processing/min_max_operations_neon.c \
-webrtc_dsp/modules/audio_processing/aec/aec_core_neon.cc \
-webrtc_dsp/modules/audio_processing/aecm/aecm_core_neon.cc \
-webrtc_dsp/modules/audio_processing/ns/nsx_core_neon.c \
-webrtc_dsp/modules/audio_processing/utility/ooura_fft_neon.cc
-# webrtc_dsp/common_audio/signal_processing/filter_ar_fast_q12_armv7.S
-endif
-else
-SRC += \
-webrtc_dsp/common_audio/signal_processing/complex_bit_reverse.c \
-webrtc_dsp/common_audio/third_party/spl_sqrt_floor/spl_sqrt_floor.c
-endif
-
-# headers
-SRC += \
-webrtc_dsp/system_wrappers/include/field_trial.h \
-webrtc_dsp/system_wrappers/include/cpu_features_wrapper.h \
-webrtc_dsp/system_wrappers/include/asm_defines.h \
-webrtc_dsp/system_wrappers/include/metrics.h \
-webrtc_dsp/system_wrappers/include/compile_assert_c.h \
-webrtc_dsp/typedefs.h \
-webrtc_dsp/absl/strings/internal/memutil.h \
-webrtc_dsp/absl/strings/ascii.h \
-webrtc_dsp/absl/strings/string_view.h \
-webrtc_dsp/absl/types/optional.h \
-webrtc_dsp/absl/types/bad_optional_access.h \
-webrtc_dsp/absl/memory/memory.h \
-webrtc_dsp/absl/meta/type_traits.h \
-webrtc_dsp/absl/algorithm/algorithm.h \
-webrtc_dsp/absl/container/inlined_vector.h \
-webrtc_dsp/absl/base/policy_checks.h \
-webrtc_dsp/absl/base/port.h \
-webrtc_dsp/absl/base/config.h \
-webrtc_dsp/absl/base/internal/invoke.h \
-webrtc_dsp/absl/base/internal/inline_variable.h \
-webrtc_dsp/absl/base/internal/atomic_hook.h \
-webrtc_dsp/absl/base/internal/identity.h \
-webrtc_dsp/absl/base/internal/raw_logging.h \
-webrtc_dsp/absl/base/internal/throw_delegate.h \
-webrtc_dsp/absl/base/attributes.h \
-webrtc_dsp/absl/base/macros.h \
-webrtc_dsp/absl/base/optimization.h \
-webrtc_dsp/absl/base/log_severity.h \
-webrtc_dsp/absl/utility/utility.h \
-webrtc_dsp/rtc_base/string_to_number.h \
-webrtc_dsp/rtc_base/constructormagic.h \
-webrtc_dsp/rtc_base/strings/string_builder.h \
-webrtc_dsp/rtc_base/event_tracer.h \
-webrtc_dsp/rtc_base/stringencode.h \
-webrtc_dsp/rtc_base/memory/aligned_malloc.h \
-webrtc_dsp/rtc_base/event.h \
-webrtc_dsp/rtc_base/ignore_wundef.h \
-webrtc_dsp/rtc_base/stringutils.h \
-webrtc_dsp/rtc_base/arraysize.h \
-webrtc_dsp/rtc_base/swap_queue.h \
-webrtc_dsp/rtc_base/trace_event.h \
-webrtc_dsp/rtc_base/checks.h \
-webrtc_dsp/rtc_base/deprecation.h \
-webrtc_dsp/rtc_base/sanitizer.h \
-webrtc_dsp/rtc_base/scoped_ref_ptr.h \
-webrtc_dsp/rtc_base/logging.h \
-webrtc_dsp/rtc_base/timeutils.h \
-webrtc_dsp/rtc_base/atomicops.h \
-webrtc_dsp/rtc_base/numerics/safe_minmax.h \
-webrtc_dsp/rtc_base/numerics/safe_conversions.h \
-webrtc_dsp/rtc_base/numerics/safe_conversions_impl.h \
-webrtc_dsp/rtc_base/numerics/safe_compare.h \
-webrtc_dsp/rtc_base/system/unused.h \
-webrtc_dsp/rtc_base/system/inline.h \
-webrtc_dsp/rtc_base/system/ignore_warnings.h \
-webrtc_dsp/rtc_base/system/asm_defines.h \
-webrtc_dsp/rtc_base/system/rtc_export.h \
-webrtc_dsp/rtc_base/system/arch.h \
-webrtc_dsp/rtc_base/platform_thread.h \
-webrtc_dsp/rtc_base/platform_thread_types.h \
-webrtc_dsp/rtc_base/protobuf_utils.h \
-webrtc_dsp/rtc_base/thread_annotations.h \
-webrtc_dsp/rtc_base/gtest_prod_util.h \
-webrtc_dsp/rtc_base/function_view.h \
-webrtc_dsp/rtc_base/criticalsection.h \
-webrtc_dsp/rtc_base/refcount.h \
-webrtc_dsp/rtc_base/thread_checker_impl.h \
-webrtc_dsp/rtc_base/compile_assert_c.h \
-webrtc_dsp/rtc_base/type_traits.h \
-webrtc_dsp/rtc_base/platform_file.h \
-webrtc_dsp/rtc_base/refcounter.h \
-webrtc_dsp/rtc_base/thread_checker.h \
-webrtc_dsp/rtc_base/race_checker.h \
-webrtc_dsp/rtc_base/refcountedobject.h \
-webrtc_dsp/third_party/rnnoise/src/rnn_activations.h \
-webrtc_dsp/third_party/rnnoise/src/kiss_fft.h \
-webrtc_dsp/third_party/rnnoise/src/rnn_vad_weights.h \
-webrtc_dsp/api/audio/echo_canceller3_config.h \
-webrtc_dsp/api/audio/echo_control.h \
-webrtc_dsp/api/audio/audio_frame.h \
-webrtc_dsp/api/audio/echo_canceller3_factory.h \
-webrtc_dsp/api/array_view.h \
-webrtc_dsp/modules/third_party/fft/fft.h \
-webrtc_dsp/modules/audio_coding/codecs/isac/bandwidth_info.h \
-webrtc_dsp/modules/audio_coding/codecs/isac/main/include/isac.h \
-webrtc_dsp/modules/audio_coding/codecs/isac/main/source/os_specific_inline.h \
-webrtc_dsp/modules/audio_coding/codecs/isac/main/source/entropy_coding.h \
-webrtc_dsp/modules/audio_coding/codecs/isac/main/source/isac_vad.h \
-webrtc_dsp/modules/audio_coding/codecs/isac/main/source/settings.h \
-webrtc_dsp/modules/audio_coding/codecs/isac/main/source/lpc_shape_swb12_tables.h \
-webrtc_dsp/modules/audio_coding/codecs/isac/main/source/arith_routines.h \
-webrtc_dsp/modules/audio_coding/codecs/isac/main/source/crc.h \
-webrtc_dsp/modules/audio_coding/codecs/isac/main/source/isac_float_type.h \
-webrtc_dsp/modules/audio_coding/codecs/isac/main/source/pitch_lag_tables.h \
-webrtc_dsp/modules/audio_coding/codecs/isac/main/source/spectrum_ar_model_tables.h \
-webrtc_dsp/modules/audio_coding/codecs/isac/main/source/codec.h \
-webrtc_dsp/modules/audio_coding/codecs/isac/main/source/pitch_gain_tables.h \
-webrtc_dsp/modules/audio_coding/codecs/isac/main/source/lpc_shape_swb16_tables.h \
-webrtc_dsp/modules/audio_coding/codecs/isac/main/source/pitch_estimator.h \
-webrtc_dsp/modules/audio_coding/codecs/isac/main/source/structs.h \
-webrtc_dsp/modules/audio_coding/codecs/isac/main/source/filter_functions.h \
-webrtc_dsp/modules/audio_coding/codecs/isac/main/source/encode_lpc_swb.h \
-webrtc_dsp/modules/audio_coding/codecs/isac/main/source/pitch_filter.h \
-webrtc_dsp/modules/audio_coding/codecs/isac/main/source/lpc_analysis.h \
-webrtc_dsp/modules/audio_coding/codecs/isac/main/source/bandwidth_estimator.h \
-webrtc_dsp/modules/audio_coding/codecs/isac/main/source/lpc_gain_swb_tables.h \
-webrtc_dsp/modules/audio_coding/codecs/isac/main/source/lpc_tables.h \
-webrtc_dsp/modules/audio_processing/echo_detector/moving_max.h \
-webrtc_dsp/modules/audio_processing/echo_detector/circular_buffer.h \
-webrtc_dsp/modules/audio_processing/echo_detector/normalized_covariance_estimator.h \
-webrtc_dsp/modules/audio_processing/echo_detector/mean_variance_estimator.h \
-webrtc_dsp/modules/audio_processing/gain_control_for_experimental_agc.h \
-webrtc_dsp/modules/audio_processing/rms_level.h \
-webrtc_dsp/modules/audio_processing/ns/ns_core.h \
-webrtc_dsp/modules/audio_processing/ns/defines.h \
-webrtc_dsp/modules/audio_processing/ns/noise_suppression.h \
-webrtc_dsp/modules/audio_processing/ns/nsx_core.h \
-webrtc_dsp/modules/audio_processing/ns/windows_private.h \
-webrtc_dsp/modules/audio_processing/ns/noise_suppression_x.h \
-webrtc_dsp/modules/audio_processing/ns/nsx_defines.h \
-webrtc_dsp/modules/audio_processing/residual_echo_detector.h \
-webrtc_dsp/modules/audio_processing/audio_processing_impl.h \
-webrtc_dsp/modules/audio_processing/render_queue_item_verifier.h \
-webrtc_dsp/modules/audio_processing/include/audio_generator.h \
-webrtc_dsp/modules/audio_processing/include/config.h \
-webrtc_dsp/modules/audio_processing/include/audio_frame_view.h \
-webrtc_dsp/modules/audio_processing/include/mock_audio_processing.h \
-webrtc_dsp/modules/audio_processing/include/gain_control.h \
-webrtc_dsp/modules/audio_processing/include/audio_generator_factory.h \
-webrtc_dsp/modules/audio_processing/include/aec_dump.h \
-webrtc_dsp/modules/audio_processing/include/audio_processing_statistics.h \
-webrtc_dsp/modules/audio_processing/include/audio_processing.h \
-webrtc_dsp/modules/audio_processing/agc2/interpolated_gain_curve.h \
-webrtc_dsp/modules/audio_processing/agc2/biquad_filter.h \
-webrtc_dsp/modules/audio_processing/agc2/agc2_testing_common.h \
-webrtc_dsp/modules/audio_processing/agc2/adaptive_mode_level_estimator.h \
-webrtc_dsp/modules/audio_processing/agc2/signal_classifier.h \
-webrtc_dsp/modules/audio_processing/agc2/vector_float_frame.h \
-webrtc_dsp/modules/audio_processing/agc2/rnn_vad/sequence_buffer.h \
-webrtc_dsp/modules/audio_processing/agc2/rnn_vad/rnn.h \
-webrtc_dsp/modules/audio_processing/agc2/rnn_vad/test_utils.h \
-webrtc_dsp/modules/audio_processing/agc2/rnn_vad/pitch_info.h \
-webrtc_dsp/modules/audio_processing/agc2/rnn_vad/lp_residual.h \
-webrtc_dsp/modules/audio_processing/agc2/rnn_vad/ring_buffer.h \
-webrtc_dsp/modules/audio_processing/agc2/rnn_vad/symmetric_matrix_buffer.h \
-webrtc_dsp/modules/audio_processing/agc2/rnn_vad/spectral_features.h \
-webrtc_dsp/modules/audio_processing/agc2/rnn_vad/features_extraction.h \
-webrtc_dsp/modules/audio_processing/agc2/rnn_vad/common.h \
-webrtc_dsp/modules/audio_processing/agc2/rnn_vad/spectral_features_internal.h \
-webrtc_dsp/modules/audio_processing/agc2/rnn_vad/fft_util.h \
-webrtc_dsp/modules/audio_processing/agc2/rnn_vad/pitch_search_internal.h \
-webrtc_dsp/modules/audio_processing/agc2/rnn_vad/pitch_search.h \
-webrtc_dsp/modules/audio_processing/agc2/fixed_gain_controller.h \
-webrtc_dsp/modules/audio_processing/agc2/down_sampler.h \
-webrtc_dsp/modules/audio_processing/agc2/saturation_protector.h \
-webrtc_dsp/modules/audio_processing/agc2/agc2_common.h \
-webrtc_dsp/modules/audio_processing/agc2/adaptive_mode_level_estimator_agc.h \
-webrtc_dsp/modules/audio_processing/agc2/adaptive_digital_gain_applier.h \
-webrtc_dsp/modules/audio_processing/agc2/vad_with_level.h \
-webrtc_dsp/modules/audio_processing/agc2/limiter_db_gain_curve.h \
-webrtc_dsp/modules/audio_processing/agc2/fixed_digital_level_estimator.h \
-webrtc_dsp/modules/audio_processing/agc2/adaptive_agc.h \
-webrtc_dsp/modules/audio_processing/agc2/gain_applier.h \
-webrtc_dsp/modules/audio_processing/agc2/noise_level_estimator.h \
-webrtc_dsp/modules/audio_processing/agc2/compute_interpolated_gain_curve.h \
-webrtc_dsp/modules/audio_processing/agc2/noise_spectrum_estimator.h \
-webrtc_dsp/modules/audio_processing/agc2/limiter.h \
-webrtc_dsp/modules/audio_processing/transient/transient_detector.h \
-webrtc_dsp/modules/audio_processing/transient/transient_suppressor.h \
-webrtc_dsp/modules/audio_processing/transient/daubechies_8_wavelet_coeffs.h \
-webrtc_dsp/modules/audio_processing/transient/common.h \
-webrtc_dsp/modules/audio_processing/transient/wpd_node.h \
-webrtc_dsp/modules/audio_processing/transient/moving_moments.h \
-webrtc_dsp/modules/audio_processing/transient/wpd_tree.h \
-webrtc_dsp/modules/audio_processing/transient/dyadic_decimator.h \
-webrtc_dsp/modules/audio_processing/noise_suppression_impl.h \
-webrtc_dsp/modules/audio_processing/aec/aec_resampler.h \
-webrtc_dsp/modules/audio_processing/aec/echo_cancellation.h \
-webrtc_dsp/modules/audio_processing/aec/aec_core.h \
-webrtc_dsp/modules/audio_processing/aec/aec_core_optimized_methods.h \
-webrtc_dsp/modules/audio_processing/aec/aec_common.h \
-webrtc_dsp/modules/audio_processing/voice_detection_impl.h \
-webrtc_dsp/modules/audio_processing/agc/legacy/analog_agc.h \
-webrtc_dsp/modules/audio_processing/agc/legacy/gain_control.h \
-webrtc_dsp/modules/audio_processing/agc/legacy/digital_agc.h \
-webrtc_dsp/modules/audio_processing/agc/mock_agc.h \
-webrtc_dsp/modules/audio_processing/agc/loudness_histogram.h \
-webrtc_dsp/modules/audio_processing/agc/gain_map_internal.h \
-webrtc_dsp/modules/audio_processing/agc/utility.h \
-webrtc_dsp/modules/audio_processing/agc/agc_manager_direct.h \
-webrtc_dsp/modules/audio_processing/agc/agc.h \
-webrtc_dsp/modules/audio_processing/common.h \
-webrtc_dsp/modules/audio_processing/audio_buffer.h \
-webrtc_dsp/modules/audio_processing/echo_control_mobile_impl.h \
-webrtc_dsp/modules/audio_processing/splitting_filter.h \
-webrtc_dsp/modules/audio_processing/low_cut_filter.h \
-webrtc_dsp/modules/audio_processing/audio_generator/file_audio_generator.h \
-webrtc_dsp/modules/audio_processing/three_band_filter_bank.h \
-webrtc_dsp/modules/audio_processing/echo_cancellation_impl.h \
-webrtc_dsp/modules/audio_processing/level_estimator_impl.h \
-webrtc_dsp/modules/audio_processing/gain_controller2.h \
-webrtc_dsp/modules/audio_processing/aecm/aecm_core.h \
-webrtc_dsp/modules/audio_processing/aecm/aecm_defines.h \
-webrtc_dsp/modules/audio_processing/aecm/echo_control_mobile.h \
-webrtc_dsp/modules/audio_processing/aec3/downsampled_render_buffer.h \
-webrtc_dsp/modules/audio_processing/aec3/subtractor_output_analyzer.h \
-webrtc_dsp/modules/audio_processing/aec3/residual_echo_estimator.h \
-webrtc_dsp/modules/audio_processing/aec3/shadow_filter_update_gain.h \
-webrtc_dsp/modules/audio_processing/aec3/aec_state.h \
-webrtc_dsp/modules/audio_processing/aec3/suppression_filter.h \
-webrtc_dsp/modules/audio_processing/aec3/block_delay_buffer.h \
-webrtc_dsp/modules/audio_processing/aec3/adaptive_fir_filter.h \
-webrtc_dsp/modules/audio_processing/aec3/cascaded_biquad_filter.h \
-webrtc_dsp/modules/audio_processing/aec3/matched_filter.h \
-webrtc_dsp/modules/audio_processing/aec3/subtractor_output.h \
-webrtc_dsp/modules/audio_processing/aec3/render_signal_analyzer.h \
-webrtc_dsp/modules/audio_processing/aec3/aec3_fft.h \
-webrtc_dsp/modules/audio_processing/aec3/echo_remover_metrics.h \
-webrtc_dsp/modules/audio_processing/aec3/filter_analyzer.h \
-webrtc_dsp/modules/audio_processing/aec3/subtractor.h \
-webrtc_dsp/modules/audio_processing/aec3/echo_path_delay_estimator.h \
-webrtc_dsp/modules/audio_processing/aec3/block_processor_metrics.h \
-webrtc_dsp/modules/audio_processing/aec3/fft_data.h \
-webrtc_dsp/modules/audio_processing/aec3/render_delay_controller_metrics.h \
-webrtc_dsp/modules/audio_processing/aec3/comfort_noise_generator.h \
-webrtc_dsp/modules/audio_processing/aec3/erl_estimator.h \
-webrtc_dsp/modules/audio_processing/aec3/echo_remover.h \
-webrtc_dsp/modules/audio_processing/aec3/matrix_buffer.h \
-webrtc_dsp/modules/audio_processing/aec3/reverb_model_estimator.h \
-webrtc_dsp/modules/audio_processing/aec3/echo_path_variability.h \
-webrtc_dsp/modules/audio_processing/aec3/moving_average.h \
-webrtc_dsp/modules/audio_processing/aec3/render_reverb_model.h \
-webrtc_dsp/modules/audio_processing/aec3/render_delay_controller.h \
-webrtc_dsp/modules/audio_processing/aec3/suppression_gain.h \
-webrtc_dsp/modules/audio_processing/aec3/erle_estimator.h \
-webrtc_dsp/modules/audio_processing/aec3/subband_erle_estimator.h \
-webrtc_dsp/modules/audio_processing/aec3/block_processor.h \
-webrtc_dsp/modules/audio_processing/aec3/fullband_erle_estimator.h \
-webrtc_dsp/modules/audio_processing/aec3/stationarity_estimator.h \
-webrtc_dsp/modules/audio_processing/aec3/echo_canceller3.h \
-webrtc_dsp/modules/audio_processing/aec3/skew_estimator.h \
-webrtc_dsp/modules/audio_processing/aec3/render_buffer.h \
-webrtc_dsp/modules/audio_processing/aec3/reverb_model_fallback.h \
-webrtc_dsp/modules/audio_processing/aec3/vector_buffer.h \
-webrtc_dsp/modules/audio_processing/aec3/reverb_frequency_response.h \
-webrtc_dsp/modules/audio_processing/aec3/echo_audibility.h \
-webrtc_dsp/modules/audio_processing/aec3/fft_buffer.h \
-webrtc_dsp/modules/audio_processing/aec3/aec3_common.h \
-webrtc_dsp/modules/audio_processing/aec3/vector_math.h \
-webrtc_dsp/modules/audio_processing/aec3/decimator.h \
-webrtc_dsp/modules/audio_processing/aec3/frame_blocker.h \
-webrtc_dsp/modules/audio_processing/aec3/block_framer.h \
-webrtc_dsp/modules/audio_processing/aec3/suppression_gain_limiter.h \
-webrtc_dsp/modules/audio_processing/aec3/delay_estimate.h \
-webrtc_dsp/modules/audio_processing/aec3/reverb_model.h \
-webrtc_dsp/modules/audio_processing/aec3/main_filter_update_gain.h \
-webrtc_dsp/modules/audio_processing/aec3/matched_filter_lag_aggregator.h \
-webrtc_dsp/modules/audio_processing/aec3/reverb_decay_estimator.h \
-webrtc_dsp/modules/audio_processing/aec3/render_delay_buffer.h \
-webrtc_dsp/modules/audio_processing/gain_control_impl.h \
-webrtc_dsp/modules/audio_processing/typing_detection.h \
-webrtc_dsp/modules/audio_processing/logging/apm_data_dumper.h \
-webrtc_dsp/modules/audio_processing/vad/vad_audio_proc_internal.h \
-webrtc_dsp/modules/audio_processing/vad/vad_circular_buffer.h \
-webrtc_dsp/modules/audio_processing/vad/pitch_based_vad.h \
-webrtc_dsp/modules/audio_processing/vad/pole_zero_filter.h \
-webrtc_dsp/modules/audio_processing/vad/gmm.h \
-webrtc_dsp/modules/audio_processing/vad/common.h \
-webrtc_dsp/modules/audio_processing/vad/vad_audio_proc.h \
-webrtc_dsp/modules/audio_processing/vad/voice_gmm_tables.h \
-webrtc_dsp/modules/audio_processing/vad/noise_gmm_tables.h \
-webrtc_dsp/modules/audio_processing/vad/pitch_internal.h \
-webrtc_dsp/modules/audio_processing/vad/standalone_vad.h \
-webrtc_dsp/modules/audio_processing/vad/voice_activity_detector.h \
-webrtc_dsp/modules/audio_processing/utility/ooura_fft_tables_neon_sse2.h \
-webrtc_dsp/modules/audio_processing/utility/delay_estimator_internal.h \
-webrtc_dsp/modules/audio_processing/utility/ooura_fft.h \
-webrtc_dsp/modules/audio_processing/utility/block_mean_calculator.h \
-webrtc_dsp/modules/audio_processing/utility/delay_estimator.h \
-webrtc_dsp/modules/audio_processing/utility/ooura_fft_tables_common.h \
-webrtc_dsp/modules/audio_processing/utility/delay_estimator_wrapper.h \
-webrtc_dsp/common_audio/mocks/mock_smoothing_filter.h \
-webrtc_dsp/common_audio/wav_file.h \
-webrtc_dsp/common_audio/sparse_fir_filter.h \
-webrtc_dsp/common_audio/fir_filter_sse.h \
-webrtc_dsp/common_audio/window_generator.h \
-webrtc_dsp/common_audio/ring_buffer.h \
-webrtc_dsp/common_audio/fir_filter.h \
-webrtc_dsp/common_audio/include/audio_util.h \
-webrtc_dsp/common_audio/real_fourier_ooura.h \
-webrtc_dsp/common_audio/smoothing_filter.h \
-webrtc_dsp/common_audio/resampler/sinc_resampler.h \
-webrtc_dsp/common_audio/resampler/include/push_resampler.h \
-webrtc_dsp/common_audio/resampler/include/resampler.h \
-webrtc_dsp/common_audio/resampler/push_sinc_resampler.h \
-webrtc_dsp/common_audio/resampler/sinusoidal_linear_chirp_source.h \
-webrtc_dsp/common_audio/fir_filter_factory.h \
-webrtc_dsp/common_audio/audio_converter.h \
-webrtc_dsp/common_audio/third_party/spl_sqrt_floor/spl_sqrt_floor.h \
-webrtc_dsp/common_audio/third_party/fft4g/fft4g.h \
-webrtc_dsp/common_audio/channel_buffer.h \
-webrtc_dsp/common_audio/real_fourier.h \
-webrtc_dsp/common_audio/fir_filter_neon.h \
-webrtc_dsp/common_audio/fir_filter_c.h \
-webrtc_dsp/common_audio/signal_processing/complex_fft_tables.h \
-webrtc_dsp/common_audio/signal_processing/include/signal_processing_library.h \
-webrtc_dsp/common_audio/signal_processing/include/real_fft.h \
-webrtc_dsp/common_audio/signal_processing/include/spl_inl.h \
-webrtc_dsp/common_audio/signal_processing/include/spl_inl_armv7.h \
-webrtc_dsp/common_audio/signal_processing/dot_product_with_scale.h \
-webrtc_dsp/common_audio/signal_processing/resample_by_2_internal.h \
-webrtc_dsp/common_audio/wav_header.h \
-webrtc_dsp/common_audio/vad/vad_core.h \
-webrtc_dsp/common_audio/vad/include/vad.h \
-webrtc_dsp/common_audio/vad/include/webrtc_vad.h \
-webrtc_dsp/common_audio/vad/vad_gmm.h \
-webrtc_dsp/common_audio/vad/vad_sp.h \
-webrtc_dsp/common_audio/vad/vad_filterbank.h
-
-else
-CFLAGS += -DTGVOIP_NO_DSP
-endif
-
-libtgvoip_la_SOURCES = $(SRC) $(TGVOIP_HDRS)
-tgvoipincludedir = $(includedir)/tgvoip
-nobase_tgvoipinclude_HEADERS = $(TGVOIP_HDRS)
-
-CXXFLAGS += -std=gnu++0x $(CFLAGS)
-if TARGET_OS_OSX
-OBJCFLAGS = $(CFLAGS)
-OBJCXXFLAGS += -std=gnu++0x $(CFLAGS)
-endif
\ No newline at end of file
diff --git a/submodules/libtgvoip/Makefile.in b/submodules/libtgvoip/Makefile.in
deleted file mode 100644
index c401d281ca..0000000000
--- a/submodules/libtgvoip/Makefile.in
+++ /dev/null
@@ -1,5223 +0,0 @@
-# Makefile.in generated by automake 1.16.1 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994-2018 Free Software Foundation, Inc.
-
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-
-VPATH = @srcdir@
-am__is_gnu_make = { \
-  if test -z '$(MAKELEVEL)'; then \
-    false; \
-  elif test -n '$(MAKE_HOST)'; then \
-    true; \
-  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
-    true; \
-  else \
-    false; \
-  fi; \
-}
-am__make_running_with_option = \
-  case $${target_option-} in \
-      ?) ;; \
-      *) echo "am__make_running_with_option: internal error: invalid" \
-              "target option '$${target_option-}' specified" >&2; \
-         exit 1;; \
-  esac; \
-  has_opt=no; \
-  sane_makeflags=$$MAKEFLAGS; \
-  if $(am__is_gnu_make); then \
-    sane_makeflags=$$MFLAGS; \
-  else \
-    case $$MAKEFLAGS in \
-      *\\[\ \	]*) \
-        bs=\\; \
-        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
-          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
-    esac; \
-  fi; \
-  skip_next=no; \
-  strip_trailopt () \
-  { \
-    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
-  }; \
-  for flg in $$sane_makeflags; do \
-    test $$skip_next = yes && { skip_next=no; continue; }; \
-    case $$flg in \
-      *=*|--*) continue;; \
-        -*I) strip_trailopt 'I'; skip_next=yes;; \
-      -*I?*) strip_trailopt 'I';; \
-        -*O) strip_trailopt 'O'; skip_next=yes;; \
-      -*O?*) strip_trailopt 'O';; \
-        -*l) strip_trailopt 'l'; skip_next=yes;; \
-      -*l?*) strip_trailopt 'l';; \
-      -[dEDm]) skip_next=yes;; \
-      -[JT]) skip_next=yes;; \
-    esac; \
-    case $$flg in \
-      *$$target_option*) has_opt=yes; break;; \
-    esac; \
-  done; \
-  test $$has_opt = yes
-am__make_dryrun = (target_option=n; $(am__make_running_with_option))
-am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
-pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-@TARGET_OS_OSX_TRUE@am__append_1 = \
-@TARGET_OS_OSX_TRUE@os/darwin/AudioInputAudioUnit.cpp \
-@TARGET_OS_OSX_TRUE@os/darwin/AudioOutputAudioUnit.cpp \
-@TARGET_OS_OSX_TRUE@os/darwin/AudioUnitIO.cpp \
-@TARGET_OS_OSX_TRUE@os/darwin/AudioInputAudioUnitOSX.cpp \
-@TARGET_OS_OSX_TRUE@os/darwin/AudioOutputAudioUnitOSX.cpp \
-@TARGET_OS_OSX_TRUE@os/darwin/DarwinSpecific.mm \
-@TARGET_OS_OSX_TRUE@os/darwin/SampleBufferDisplayLayerRenderer.mm \
-@TARGET_OS_OSX_TRUE@os/darwin/TGVVideoRenderer.mm \
-@TARGET_OS_OSX_TRUE@os/darwin/TGVVideoSource.mm \
-@TARGET_OS_OSX_TRUE@os/darwin/VideoToolboxEncoderSource.mm
-
-@TARGET_OS_OSX_TRUE@am__append_2 = \
-@TARGET_OS_OSX_TRUE@os/darwin/AudioInputAudioUnit.h \
-@TARGET_OS_OSX_TRUE@os/darwin/AudioOutputAudioUnit.h \
-@TARGET_OS_OSX_TRUE@os/darwin/AudioUnitIO.h \
-@TARGET_OS_OSX_TRUE@os/darwin/AudioInputAudioUnitOSX.h \
-@TARGET_OS_OSX_TRUE@os/darwin/AudioOutputAudioUnitOSX.h \
-@TARGET_OS_OSX_TRUE@os/darwin/DarwinSpecific.h \
-@TARGET_OS_OSX_TRUE@os/darwin/SampleBufferDisplayLayerRenderer.h \
-@TARGET_OS_OSX_TRUE@os/darwin/TGVVideoRenderer.h \
-@TARGET_OS_OSX_TRUE@os/darwin/TGVVideoSource.h \
-@TARGET_OS_OSX_TRUE@os/darwin/VideoToolboxEncoderSource.h
-
-@TARGET_OS_OSX_TRUE@am__append_3 = -framework Foundation -framework CoreFoundation -framework CoreAudio -framework AudioToolbox -framework VideoToolbox -framework CoreMedia -framework CoreVideo
-
-# Linux-specific
-@TARGET_OS_OSX_FALSE@@WITH_ALSA_TRUE@am__append_4 = \
-@TARGET_OS_OSX_FALSE@@WITH_ALSA_TRUE@os/linux/AudioInputALSA.cpp \
-@TARGET_OS_OSX_FALSE@@WITH_ALSA_TRUE@os/linux/AudioOutputALSA.cpp
-
-@TARGET_OS_OSX_FALSE@@WITH_ALSA_TRUE@am__append_5 = \
-@TARGET_OS_OSX_FALSE@@WITH_ALSA_TRUE@os/linux/AudioInputALSA.h \
-@TARGET_OS_OSX_FALSE@@WITH_ALSA_TRUE@os/linux/AudioOutputALSA.h
-
-@TARGET_OS_OSX_FALSE@@WITH_PULSE_TRUE@am__append_6 = \
-@TARGET_OS_OSX_FALSE@@WITH_PULSE_TRUE@os/linux/AudioOutputPulse.cpp \
-@TARGET_OS_OSX_FALSE@@WITH_PULSE_TRUE@os/linux/AudioInputPulse.cpp \
-@TARGET_OS_OSX_FALSE@@WITH_PULSE_TRUE@os/linux/AudioPulse.cpp
-
-@TARGET_OS_OSX_FALSE@@WITH_PULSE_TRUE@am__append_7 = \
-@TARGET_OS_OSX_FALSE@@WITH_PULSE_TRUE@os/linux/AudioOutputPulse.h \
-@TARGET_OS_OSX_FALSE@@WITH_PULSE_TRUE@os/linux/AudioInputPulse.h \
-@TARGET_OS_OSX_FALSE@@WITH_PULSE_TRUE@os/linux/AudioPulse.h \
-@TARGET_OS_OSX_FALSE@@WITH_PULSE_TRUE@os/linux/PulseFunctions.h
-
-@ENABLE_DSP_TRUE@am__append_8 = -DWEBRTC_POSIX -DWEBRTC_APM_DEBUG_DUMP=0 -DWEBRTC_NS_FLOAT -I$(top_srcdir)/webrtc_dsp
-@ENABLE_DSP_TRUE@am__append_9 = -I$(top_srcdir)/webrtc_dsp
-@ENABLE_DSP_TRUE@am__append_10 = \
-@ENABLE_DSP_TRUE@./webrtc_dsp/system_wrappers/source/field_trial.cc \
-@ENABLE_DSP_TRUE@./webrtc_dsp/system_wrappers/source/metrics.cc \
-@ENABLE_DSP_TRUE@./webrtc_dsp/system_wrappers/source/cpu_features.cc \
-@ENABLE_DSP_TRUE@./webrtc_dsp/absl/strings/internal/memutil.cc \
-@ENABLE_DSP_TRUE@./webrtc_dsp/absl/strings/string_view.cc \
-@ENABLE_DSP_TRUE@./webrtc_dsp/absl/strings/ascii.cc \
-@ENABLE_DSP_TRUE@./webrtc_dsp/absl/types/bad_optional_access.cc \
-@ENABLE_DSP_TRUE@./webrtc_dsp/absl/types/optional.cc \
-@ENABLE_DSP_TRUE@./webrtc_dsp/absl/base/internal/raw_logging.cc \
-@ENABLE_DSP_TRUE@./webrtc_dsp/absl/base/internal/throw_delegate.cc \
-@ENABLE_DSP_TRUE@./webrtc_dsp/rtc_base/race_checker.cc \
-@ENABLE_DSP_TRUE@./webrtc_dsp/rtc_base/strings/string_builder.cc \
-@ENABLE_DSP_TRUE@./webrtc_dsp/rtc_base/memory/aligned_malloc.cc \
-@ENABLE_DSP_TRUE@./webrtc_dsp/rtc_base/timeutils.cc \
-@ENABLE_DSP_TRUE@./webrtc_dsp/rtc_base/platform_file.cc \
-@ENABLE_DSP_TRUE@./webrtc_dsp/rtc_base/string_to_number.cc \
-@ENABLE_DSP_TRUE@./webrtc_dsp/rtc_base/thread_checker_impl.cc \
-@ENABLE_DSP_TRUE@./webrtc_dsp/rtc_base/stringencode.cc \
-@ENABLE_DSP_TRUE@./webrtc_dsp/rtc_base/stringutils.cc \
-@ENABLE_DSP_TRUE@./webrtc_dsp/rtc_base/checks.cc \
-@ENABLE_DSP_TRUE@./webrtc_dsp/rtc_base/platform_thread.cc \
-@ENABLE_DSP_TRUE@./webrtc_dsp/rtc_base/logging_webrtc.cc \
-@ENABLE_DSP_TRUE@./webrtc_dsp/rtc_base/criticalsection.cc \
-@ENABLE_DSP_TRUE@./webrtc_dsp/rtc_base/platform_thread_types.cc \
-@ENABLE_DSP_TRUE@./webrtc_dsp/rtc_base/event.cc \
-@ENABLE_DSP_TRUE@./webrtc_dsp/rtc_base/event_tracer.cc \
-@ENABLE_DSP_TRUE@./webrtc_dsp/third_party/rnnoise/src/rnn_vad_weights.cc \
-@ENABLE_DSP_TRUE@./webrtc_dsp/third_party/rnnoise/src/kiss_fft.cc \
-@ENABLE_DSP_TRUE@./webrtc_dsp/api/audio/audio_frame.cc \
-@ENABLE_DSP_TRUE@./webrtc_dsp/api/audio/echo_canceller3_config.cc \
-@ENABLE_DSP_TRUE@./webrtc_dsp/api/audio/echo_canceller3_factory.cc \
-@ENABLE_DSP_TRUE@./webrtc_dsp/modules/third_party/fft/fft.c \
-@ENABLE_DSP_TRUE@./webrtc_dsp/modules/audio_coding/codecs/isac/main/source/pitch_estimator.c \
-@ENABLE_DSP_TRUE@./webrtc_dsp/modules/audio_coding/codecs/isac/main/source/lpc_shape_swb16_tables.c \
-@ENABLE_DSP_TRUE@./webrtc_dsp/modules/audio_coding/codecs/isac/main/source/pitch_gain_tables.c \
-@ENABLE_DSP_TRUE@./webrtc_dsp/modules/audio_coding/codecs/isac/main/source/arith_routines_logist.c \
-@ENABLE_DSP_TRUE@./webrtc_dsp/modules/audio_coding/codecs/isac/main/source/filterbanks.c \
-@ENABLE_DSP_TRUE@./webrtc_dsp/modules/audio_coding/codecs/isac/main/source/transform.c \
-@ENABLE_DSP_TRUE@./webrtc_dsp/modules/audio_coding/codecs/isac/main/source/pitch_filter.c \
-@ENABLE_DSP_TRUE@./webrtc_dsp/modules/audio_coding/codecs/isac/main/source/encode_lpc_swb.c \
-@ENABLE_DSP_TRUE@./webrtc_dsp/modules/audio_coding/codecs/isac/main/source/filter_functions.c \
-@ENABLE_DSP_TRUE@./webrtc_dsp/modules/audio_coding/codecs/isac/main/source/decode.c \
-@ENABLE_DSP_TRUE@./webrtc_dsp/modules/audio_coding/codecs/isac/main/source/lattice.c \
-@ENABLE_DSP_TRUE@./webrtc_dsp/modules/audio_coding/codecs/isac/main/source/intialize.c \
-@ENABLE_DSP_TRUE@./webrtc_dsp/modules/audio_coding/codecs/isac/main/source/lpc_tables.c \
-@ENABLE_DSP_TRUE@./webrtc_dsp/modules/audio_coding/codecs/isac/main/source/lpc_gain_swb_tables.c \
-@ENABLE_DSP_TRUE@./webrtc_dsp/modules/audio_coding/codecs/isac/main/source/bandwidth_estimator.c \
-@ENABLE_DSP_TRUE@./webrtc_dsp/modules/audio_coding/codecs/isac/main/source/encode.c \
-@ENABLE_DSP_TRUE@./webrtc_dsp/modules/audio_coding/codecs/isac/main/source/lpc_analysis.c \
-@ENABLE_DSP_TRUE@./webrtc_dsp/modules/audio_coding/codecs/isac/main/source/arith_routines_hist.c \
-@ENABLE_DSP_TRUE@./webrtc_dsp/modules/audio_coding/codecs/isac/main/source/entropy_coding.c \
-@ENABLE_DSP_TRUE@./webrtc_dsp/modules/audio_coding/codecs/isac/main/source/isac_vad.c \
-@ENABLE_DSP_TRUE@./webrtc_dsp/modules/audio_coding/codecs/isac/main/source/arith_routines.c \
-@ENABLE_DSP_TRUE@./webrtc_dsp/modules/audio_coding/codecs/isac/main/source/crc.c \
-@ENABLE_DSP_TRUE@./webrtc_dsp/modules/audio_coding/codecs/isac/main/source/lpc_shape_swb12_tables.c \
-@ENABLE_DSP_TRUE@./webrtc_dsp/modules/audio_coding/codecs/isac/main/source/decode_bwe.c \
-@ENABLE_DSP_TRUE@./webrtc_dsp/modules/audio_coding/codecs/isac/main/source/spectrum_ar_model_tables.c \
-@ENABLE_DSP_TRUE@./webrtc_dsp/modules/audio_coding/codecs/isac/main/source/pitch_lag_tables.c \
-@ENABLE_DSP_TRUE@./webrtc_dsp/modules/audio_coding/codecs/isac/main/source/isac.c \
-@ENABLE_DSP_TRUE@./webrtc_dsp/modules/audio_processing/rms_level.cc \
-@ENABLE_DSP_TRUE@./webrtc_dsp/modules/audio_processing/echo_detector/normalized_covariance_estimator.cc \
-@ENABLE_DSP_TRUE@./webrtc_dsp/modules/audio_processing/echo_detector/moving_max.cc \
-@ENABLE_DSP_TRUE@./webrtc_dsp/modules/audio_processing/echo_detector/circular_buffer.cc \
-@ENABLE_DSP_TRUE@./webrtc_dsp/modules/audio_processing/echo_detector/mean_variance_estimator.cc \
-@ENABLE_DSP_TRUE@./webrtc_dsp/modules/audio_processing/splitting_filter.cc \
-@ENABLE_DSP_TRUE@./webrtc_dsp/modules/audio_processing/gain_control_impl.cc \
-@ENABLE_DSP_TRUE@./webrtc_dsp/modules/audio_processing/ns/nsx_core.c \
-@ENABLE_DSP_TRUE@./webrtc_dsp/modules/audio_processing/ns/noise_suppression_x.c \
-@ENABLE_DSP_TRUE@./webrtc_dsp/modules/audio_processing/ns/nsx_core_c.c \
-@ENABLE_DSP_TRUE@./webrtc_dsp/modules/audio_processing/ns/ns_core.c \
-@ENABLE_DSP_TRUE@./webrtc_dsp/modules/audio_processing/ns/noise_suppression.c \
-@ENABLE_DSP_TRUE@./webrtc_dsp/modules/audio_processing/audio_buffer.cc \
-@ENABLE_DSP_TRUE@./webrtc_dsp/modules/audio_processing/typing_detection.cc \
-@ENABLE_DSP_TRUE@./webrtc_dsp/modules/audio_processing/include/audio_processing_statistics.cc \
-@ENABLE_DSP_TRUE@./webrtc_dsp/modules/audio_processing/include/audio_generator_factory.cc \
-@ENABLE_DSP_TRUE@./webrtc_dsp/modules/audio_processing/include/aec_dump.cc \
-@ENABLE_DSP_TRUE@./webrtc_dsp/modules/audio_processing/include/audio_processing.cc \
-@ENABLE_DSP_TRUE@./webrtc_dsp/modules/audio_processing/include/config.cc \
-@ENABLE_DSP_TRUE@./webrtc_dsp/modules/audio_processing/agc2/interpolated_gain_curve.cc \
-@ENABLE_DSP_TRUE@./webrtc_dsp/modules/audio_processing/agc2/agc2_common.cc \
-@ENABLE_DSP_TRUE@./webrtc_dsp/modules/audio_processing/agc2/gain_applier.cc \
-@ENABLE_DSP_TRUE@./webrtc_dsp/modules/audio_processing/agc2/adaptive_agc.cc \
-@ENABLE_DSP_TRUE@./webrtc_dsp/modules/audio_processing/agc2/adaptive_digital_gain_applier.cc \
-@ENABLE_DSP_TRUE@./webrtc_dsp/modules/audio_processing/agc2/limiter.cc \
-@ENABLE_DSP_TRUE@./webrtc_dsp/modules/audio_processing/agc2/saturation_protector.cc \
-@ENABLE_DSP_TRUE@./webrtc_dsp/modules/audio_processing/agc2/rnn_vad/spectral_features_internal.cc \
-@ENABLE_DSP_TRUE@./webrtc_dsp/modules/audio_processing/agc2/rnn_vad/rnn.cc \
-@ENABLE_DSP_TRUE@./webrtc_dsp/modules/audio_processing/agc2/rnn_vad/pitch_search_internal.cc \
-@ENABLE_DSP_TRUE@./webrtc_dsp/modules/audio_processing/agc2/rnn_vad/spectral_features.cc \
-@ENABLE_DSP_TRUE@./webrtc_dsp/modules/audio_processing/agc2/rnn_vad/pitch_search.cc \
-@ENABLE_DSP_TRUE@./webrtc_dsp/modules/audio_processing/agc2/rnn_vad/features_extraction.cc \
-@ENABLE_DSP_TRUE@./webrtc_dsp/modules/audio_processing/agc2/rnn_vad/fft_util.cc \
-@ENABLE_DSP_TRUE@./webrtc_dsp/modules/audio_processing/agc2/rnn_vad/lp_residual.cc \
-@ENABLE_DSP_TRUE@./webrtc_dsp/modules/audio_processing/agc2/adaptive_mode_level_estimator_agc.cc \
-@ENABLE_DSP_TRUE@./webrtc_dsp/modules/audio_processing/agc2/vector_float_frame.cc \
-@ENABLE_DSP_TRUE@./webrtc_dsp/modules/audio_processing/agc2/noise_level_estimator.cc \
-@ENABLE_DSP_TRUE@./webrtc_dsp/modules/audio_processing/agc2/agc2_testing_common.cc \
-@ENABLE_DSP_TRUE@./webrtc_dsp/modules/audio_processing/agc2/fixed_digital_level_estimator.cc \
-@ENABLE_DSP_TRUE@./webrtc_dsp/modules/audio_processing/agc2/fixed_gain_controller.cc \
-@ENABLE_DSP_TRUE@./webrtc_dsp/modules/audio_processing/agc2/vad_with_level.cc \
-@ENABLE_DSP_TRUE@./webrtc_dsp/modules/audio_processing/agc2/limiter_db_gain_curve.cc \
-@ENABLE_DSP_TRUE@./webrtc_dsp/modules/audio_processing/agc2/down_sampler.cc \
-@ENABLE_DSP_TRUE@./webrtc_dsp/modules/audio_processing/agc2/signal_classifier.cc \
-@ENABLE_DSP_TRUE@./webrtc_dsp/modules/audio_processing/agc2/noise_spectrum_estimator.cc \
-@ENABLE_DSP_TRUE@./webrtc_dsp/modules/audio_processing/agc2/compute_interpolated_gain_curve.cc \
-@ENABLE_DSP_TRUE@./webrtc_dsp/modules/audio_processing/agc2/biquad_filter.cc \
-@ENABLE_DSP_TRUE@./webrtc_dsp/modules/audio_processing/agc2/adaptive_mode_level_estimator.cc \
-@ENABLE_DSP_TRUE@./webrtc_dsp/modules/audio_processing/transient/moving_moments.cc \
-@ENABLE_DSP_TRUE@./webrtc_dsp/modules/audio_processing/transient/wpd_tree.cc \
-@ENABLE_DSP_TRUE@./webrtc_dsp/modules/audio_processing/transient/wpd_node.cc \
-@ENABLE_DSP_TRUE@./webrtc_dsp/modules/audio_processing/transient/transient_suppressor.cc \
-@ENABLE_DSP_TRUE@./webrtc_dsp/modules/audio_processing/transient/transient_detector.cc \
-@ENABLE_DSP_TRUE@./webrtc_dsp/modules/audio_processing/low_cut_filter.cc \
-@ENABLE_DSP_TRUE@./webrtc_dsp/modules/audio_processing/level_estimator_impl.cc \
-@ENABLE_DSP_TRUE@./webrtc_dsp/modules/audio_processing/three_band_filter_bank.cc \
-@ENABLE_DSP_TRUE@./webrtc_dsp/modules/audio_processing/aec/echo_cancellation.cc \
-@ENABLE_DSP_TRUE@./webrtc_dsp/modules/audio_processing/aec/aec_resampler.cc \
-@ENABLE_DSP_TRUE@./webrtc_dsp/modules/audio_processing/aec/aec_core.cc \
-@ENABLE_DSP_TRUE@./webrtc_dsp/modules/audio_processing/voice_detection_impl.cc \
-@ENABLE_DSP_TRUE@./webrtc_dsp/modules/audio_processing/echo_cancellation_impl.cc \
-@ENABLE_DSP_TRUE@./webrtc_dsp/modules/audio_processing/gain_control_for_experimental_agc.cc \
-@ENABLE_DSP_TRUE@./webrtc_dsp/modules/audio_processing/agc/agc.cc \
-@ENABLE_DSP_TRUE@./webrtc_dsp/modules/audio_processing/agc/loudness_histogram.cc \
-@ENABLE_DSP_TRUE@./webrtc_dsp/modules/audio_processing/agc/agc_manager_direct.cc \
-@ENABLE_DSP_TRUE@./webrtc_dsp/modules/audio_processing/agc/legacy/analog_agc.c \
-@ENABLE_DSP_TRUE@./webrtc_dsp/modules/audio_processing/agc/legacy/digital_agc.c \
-@ENABLE_DSP_TRUE@./webrtc_dsp/modules/audio_processing/agc/utility.cc \
-@ENABLE_DSP_TRUE@./webrtc_dsp/modules/audio_processing/audio_processing_impl.cc \
-@ENABLE_DSP_TRUE@./webrtc_dsp/modules/audio_processing/audio_generator/file_audio_generator.cc \
-@ENABLE_DSP_TRUE@./webrtc_dsp/modules/audio_processing/gain_controller2.cc \
-@ENABLE_DSP_TRUE@./webrtc_dsp/modules/audio_processing/residual_echo_detector.cc \
-@ENABLE_DSP_TRUE@./webrtc_dsp/modules/audio_processing/noise_suppression_impl.cc \
-@ENABLE_DSP_TRUE@./webrtc_dsp/modules/audio_processing/aecm/aecm_core.cc \
-@ENABLE_DSP_TRUE@./webrtc_dsp/modules/audio_processing/aecm/aecm_core_c.cc \
-@ENABLE_DSP_TRUE@./webrtc_dsp/modules/audio_processing/aecm/echo_control_mobile.cc \
-@ENABLE_DSP_TRUE@./webrtc_dsp/modules/audio_processing/aec3/render_reverb_model.cc \
-@ENABLE_DSP_TRUE@./webrtc_dsp/modules/audio_processing/aec3/reverb_model_fallback.cc \
-@ENABLE_DSP_TRUE@./webrtc_dsp/modules/audio_processing/aec3/echo_remover_metrics.cc \
-@ENABLE_DSP_TRUE@./webrtc_dsp/modules/audio_processing/aec3/matched_filter_lag_aggregator.cc \
-@ENABLE_DSP_TRUE@./webrtc_dsp/modules/audio_processing/aec3/render_delay_buffer2.cc \
-@ENABLE_DSP_TRUE@./webrtc_dsp/modules/audio_processing/aec3/echo_path_variability.cc \
-@ENABLE_DSP_TRUE@./webrtc_dsp/modules/audio_processing/aec3/frame_blocker.cc \
-@ENABLE_DSP_TRUE@./webrtc_dsp/modules/audio_processing/aec3/subtractor.cc \
-@ENABLE_DSP_TRUE@./webrtc_dsp/modules/audio_processing/aec3/aec3_fft.cc \
-@ENABLE_DSP_TRUE@./webrtc_dsp/modules/audio_processing/aec3/fullband_erle_estimator.cc \
-@ENABLE_DSP_TRUE@./webrtc_dsp/modules/audio_processing/aec3/suppression_filter.cc \
-@ENABLE_DSP_TRUE@./webrtc_dsp/modules/audio_processing/aec3/block_processor.cc \
-@ENABLE_DSP_TRUE@./webrtc_dsp/modules/audio_processing/aec3/subband_erle_estimator.cc \
-@ENABLE_DSP_TRUE@./webrtc_dsp/modules/audio_processing/aec3/render_delay_controller_metrics.cc \
-@ENABLE_DSP_TRUE@./webrtc_dsp/modules/audio_processing/aec3/render_delay_buffer.cc \
-@ENABLE_DSP_TRUE@./webrtc_dsp/modules/audio_processing/aec3/vector_buffer.cc \
-@ENABLE_DSP_TRUE@./webrtc_dsp/modules/audio_processing/aec3/erl_estimator.cc \
-@ENABLE_DSP_TRUE@./webrtc_dsp/modules/audio_processing/aec3/aec_state.cc \
-@ENABLE_DSP_TRUE@./webrtc_dsp/modules/audio_processing/aec3/adaptive_fir_filter.cc \
-@ENABLE_DSP_TRUE@./webrtc_dsp/modules/audio_processing/aec3/render_delay_controller.cc \
-@ENABLE_DSP_TRUE@./webrtc_dsp/modules/audio_processing/aec3/skew_estimator.cc \
-@ENABLE_DSP_TRUE@./webrtc_dsp/modules/audio_processing/aec3/echo_path_delay_estimator.cc \
-@ENABLE_DSP_TRUE@./webrtc_dsp/modules/audio_processing/aec3/block_framer.cc \
-@ENABLE_DSP_TRUE@./webrtc_dsp/modules/audio_processing/aec3/erle_estimator.cc \
-@ENABLE_DSP_TRUE@./webrtc_dsp/modules/audio_processing/aec3/reverb_model.cc \
-@ENABLE_DSP_TRUE@./webrtc_dsp/modules/audio_processing/aec3/cascaded_biquad_filter.cc \
-@ENABLE_DSP_TRUE@./webrtc_dsp/modules/audio_processing/aec3/render_buffer.cc \
-@ENABLE_DSP_TRUE@./webrtc_dsp/modules/audio_processing/aec3/subtractor_output.cc \
-@ENABLE_DSP_TRUE@./webrtc_dsp/modules/audio_processing/aec3/stationarity_estimator.cc \
-@ENABLE_DSP_TRUE@./webrtc_dsp/modules/audio_processing/aec3/render_signal_analyzer.cc \
-@ENABLE_DSP_TRUE@./webrtc_dsp/modules/audio_processing/aec3/subtractor_output_analyzer.cc \
-@ENABLE_DSP_TRUE@./webrtc_dsp/modules/audio_processing/aec3/suppression_gain.cc \
-@ENABLE_DSP_TRUE@./webrtc_dsp/modules/audio_processing/aec3/echo_audibility.cc \
-@ENABLE_DSP_TRUE@./webrtc_dsp/modules/audio_processing/aec3/block_processor_metrics.cc \
-@ENABLE_DSP_TRUE@./webrtc_dsp/modules/audio_processing/aec3/moving_average.cc \
-@ENABLE_DSP_TRUE@./webrtc_dsp/modules/audio_processing/aec3/reverb_model_estimator.cc \
-@ENABLE_DSP_TRUE@./webrtc_dsp/modules/audio_processing/aec3/aec3_common.cc \
-@ENABLE_DSP_TRUE@./webrtc_dsp/modules/audio_processing/aec3/residual_echo_estimator.cc \
-@ENABLE_DSP_TRUE@./webrtc_dsp/modules/audio_processing/aec3/matched_filter.cc \
-@ENABLE_DSP_TRUE@./webrtc_dsp/modules/audio_processing/aec3/reverb_decay_estimator.cc \
-@ENABLE_DSP_TRUE@./webrtc_dsp/modules/audio_processing/aec3/render_delay_controller2.cc \
-@ENABLE_DSP_TRUE@./webrtc_dsp/modules/audio_processing/aec3/suppression_gain_limiter.cc \
-@ENABLE_DSP_TRUE@./webrtc_dsp/modules/audio_processing/aec3/main_filter_update_gain.cc \
-@ENABLE_DSP_TRUE@./webrtc_dsp/modules/audio_processing/aec3/echo_remover.cc \
-@ENABLE_DSP_TRUE@./webrtc_dsp/modules/audio_processing/aec3/downsampled_render_buffer.cc \
-@ENABLE_DSP_TRUE@./webrtc_dsp/modules/audio_processing/aec3/matrix_buffer.cc \
-@ENABLE_DSP_TRUE@./webrtc_dsp/modules/audio_processing/aec3/block_processor2.cc \
-@ENABLE_DSP_TRUE@./webrtc_dsp/modules/audio_processing/aec3/echo_canceller3.cc \
-@ENABLE_DSP_TRUE@./webrtc_dsp/modules/audio_processing/aec3/block_delay_buffer.cc \
-@ENABLE_DSP_TRUE@./webrtc_dsp/modules/audio_processing/aec3/fft_buffer.cc \
-@ENABLE_DSP_TRUE@./webrtc_dsp/modules/audio_processing/aec3/comfort_noise_generator.cc \
-@ENABLE_DSP_TRUE@./webrtc_dsp/modules/audio_processing/aec3/shadow_filter_update_gain.cc \
-@ENABLE_DSP_TRUE@./webrtc_dsp/modules/audio_processing/aec3/filter_analyzer.cc \
-@ENABLE_DSP_TRUE@./webrtc_dsp/modules/audio_processing/aec3/reverb_frequency_response.cc \
-@ENABLE_DSP_TRUE@./webrtc_dsp/modules/audio_processing/aec3/decimator.cc \
-@ENABLE_DSP_TRUE@./webrtc_dsp/modules/audio_processing/echo_control_mobile_impl.cc \
-@ENABLE_DSP_TRUE@./webrtc_dsp/modules/audio_processing/logging/apm_data_dumper.cc \
-@ENABLE_DSP_TRUE@./webrtc_dsp/modules/audio_processing/vad/voice_activity_detector.cc \
-@ENABLE_DSP_TRUE@./webrtc_dsp/modules/audio_processing/vad/standalone_vad.cc \
-@ENABLE_DSP_TRUE@./webrtc_dsp/modules/audio_processing/vad/pitch_internal.cc \
-@ENABLE_DSP_TRUE@./webrtc_dsp/modules/audio_processing/vad/vad_circular_buffer.cc \
-@ENABLE_DSP_TRUE@./webrtc_dsp/modules/audio_processing/vad/vad_audio_proc.cc \
-@ENABLE_DSP_TRUE@./webrtc_dsp/modules/audio_processing/vad/pole_zero_filter.cc \
-@ENABLE_DSP_TRUE@./webrtc_dsp/modules/audio_processing/vad/pitch_based_vad.cc \
-@ENABLE_DSP_TRUE@./webrtc_dsp/modules/audio_processing/vad/gmm.cc \
-@ENABLE_DSP_TRUE@./webrtc_dsp/modules/audio_processing/utility/ooura_fft.cc \
-@ENABLE_DSP_TRUE@./webrtc_dsp/modules/audio_processing/utility/delay_estimator_wrapper.cc \
-@ENABLE_DSP_TRUE@./webrtc_dsp/modules/audio_processing/utility/delay_estimator.cc \
-@ENABLE_DSP_TRUE@./webrtc_dsp/modules/audio_processing/utility/block_mean_calculator.cc \
-@ENABLE_DSP_TRUE@./webrtc_dsp/common_audio/window_generator.cc \
-@ENABLE_DSP_TRUE@./webrtc_dsp/common_audio/channel_buffer.cc \
-@ENABLE_DSP_TRUE@./webrtc_dsp/common_audio/fir_filter_factory.cc \
-@ENABLE_DSP_TRUE@./webrtc_dsp/common_audio/wav_header.cc \
-@ENABLE_DSP_TRUE@./webrtc_dsp/common_audio/real_fourier_ooura.cc \
-@ENABLE_DSP_TRUE@./webrtc_dsp/common_audio/audio_util.cc \
-@ENABLE_DSP_TRUE@./webrtc_dsp/common_audio/fir_filter_sse.cc \
-@ENABLE_DSP_TRUE@./webrtc_dsp/common_audio/resampler/push_sinc_resampler.cc \
-@ENABLE_DSP_TRUE@./webrtc_dsp/common_audio/resampler/resampler.cc \
-@ENABLE_DSP_TRUE@./webrtc_dsp/common_audio/resampler/sinc_resampler_sse.cc \
-@ENABLE_DSP_TRUE@./webrtc_dsp/common_audio/resampler/push_resampler.cc \
-@ENABLE_DSP_TRUE@./webrtc_dsp/common_audio/resampler/sinc_resampler.cc \
-@ENABLE_DSP_TRUE@./webrtc_dsp/common_audio/resampler/sinusoidal_linear_chirp_source.cc \
-@ENABLE_DSP_TRUE@./webrtc_dsp/common_audio/wav_file.cc \
-@ENABLE_DSP_TRUE@./webrtc_dsp/common_audio/third_party/fft4g/fft4g.c \
-@ENABLE_DSP_TRUE@./webrtc_dsp/common_audio/audio_converter.cc \
-@ENABLE_DSP_TRUE@./webrtc_dsp/common_audio/real_fourier.cc \
-@ENABLE_DSP_TRUE@./webrtc_dsp/common_audio/sparse_fir_filter.cc \
-@ENABLE_DSP_TRUE@./webrtc_dsp/common_audio/smoothing_filter.cc \
-@ENABLE_DSP_TRUE@./webrtc_dsp/common_audio/fir_filter_c.cc \
-@ENABLE_DSP_TRUE@./webrtc_dsp/common_audio/ring_buffer.c \
-@ENABLE_DSP_TRUE@./webrtc_dsp/common_audio/signal_processing/complex_fft.c \
-@ENABLE_DSP_TRUE@./webrtc_dsp/common_audio/signal_processing/filter_ma_fast_q12.c \
-@ENABLE_DSP_TRUE@./webrtc_dsp/common_audio/signal_processing/splitting_filter1.c \
-@ENABLE_DSP_TRUE@./webrtc_dsp/common_audio/signal_processing/levinson_durbin.c \
-@ENABLE_DSP_TRUE@./webrtc_dsp/common_audio/signal_processing/dot_product_with_scale.cc \
-@ENABLE_DSP_TRUE@./webrtc_dsp/common_audio/signal_processing/auto_corr_to_refl_coef.c \
-@ENABLE_DSP_TRUE@./webrtc_dsp/common_audio/signal_processing/resample_by_2_internal.c \
-@ENABLE_DSP_TRUE@./webrtc_dsp/common_audio/signal_processing/energy.c \
-@ENABLE_DSP_TRUE@./webrtc_dsp/common_audio/signal_processing/sqrt_of_one_minus_x_squared.c \
-@ENABLE_DSP_TRUE@./webrtc_dsp/common_audio/signal_processing/downsample_fast.c \
-@ENABLE_DSP_TRUE@./webrtc_dsp/common_audio/signal_processing/filter_ar_fast_q12.c \
-@ENABLE_DSP_TRUE@./webrtc_dsp/common_audio/signal_processing/spl_init.c \
-@ENABLE_DSP_TRUE@./webrtc_dsp/common_audio/signal_processing/lpc_to_refl_coef.c \
-@ENABLE_DSP_TRUE@./webrtc_dsp/common_audio/signal_processing/cross_correlation.c \
-@ENABLE_DSP_TRUE@./webrtc_dsp/common_audio/signal_processing/division_operations.c \
-@ENABLE_DSP_TRUE@./webrtc_dsp/common_audio/signal_processing/auto_correlation.c \
-@ENABLE_DSP_TRUE@./webrtc_dsp/common_audio/signal_processing/get_scaling_square.c \
-@ENABLE_DSP_TRUE@./webrtc_dsp/common_audio/signal_processing/resample.c \
-@ENABLE_DSP_TRUE@./webrtc_dsp/common_audio/signal_processing/min_max_operations.c \
-@ENABLE_DSP_TRUE@./webrtc_dsp/common_audio/signal_processing/refl_coef_to_lpc.c \
-@ENABLE_DSP_TRUE@./webrtc_dsp/common_audio/signal_processing/filter_ar.c \
-@ENABLE_DSP_TRUE@./webrtc_dsp/common_audio/signal_processing/vector_scaling_operations.c \
-@ENABLE_DSP_TRUE@./webrtc_dsp/common_audio/signal_processing/resample_fractional.c \
-@ENABLE_DSP_TRUE@./webrtc_dsp/common_audio/signal_processing/real_fft.c \
-@ENABLE_DSP_TRUE@./webrtc_dsp/common_audio/signal_processing/ilbc_specific_functions.c \
-@ENABLE_DSP_TRUE@./webrtc_dsp/common_audio/signal_processing/randomization_functions.c \
-@ENABLE_DSP_TRUE@./webrtc_dsp/common_audio/signal_processing/copy_set_operations.c \
-@ENABLE_DSP_TRUE@./webrtc_dsp/common_audio/signal_processing/resample_by_2.c \
-@ENABLE_DSP_TRUE@./webrtc_dsp/common_audio/signal_processing/get_hanning_window.c \
-@ENABLE_DSP_TRUE@./webrtc_dsp/common_audio/signal_processing/resample_48khz.c \
-@ENABLE_DSP_TRUE@./webrtc_dsp/common_audio/signal_processing/spl_inl.c \
-@ENABLE_DSP_TRUE@./webrtc_dsp/common_audio/signal_processing/spl_sqrt.c \
-@ENABLE_DSP_TRUE@./webrtc_dsp/common_audio/vad/vad_sp.c \
-@ENABLE_DSP_TRUE@./webrtc_dsp/common_audio/vad/vad.cc \
-@ENABLE_DSP_TRUE@./webrtc_dsp/common_audio/vad/webrtc_vad.c \
-@ENABLE_DSP_TRUE@./webrtc_dsp/common_audio/vad/vad_filterbank.c \
-@ENABLE_DSP_TRUE@./webrtc_dsp/common_audio/vad/vad_core.c \
-@ENABLE_DSP_TRUE@./webrtc_dsp/common_audio/vad/vad_gmm.c
-
-@ENABLE_DSP_TRUE@@TARGET_OS_OSX_TRUE@am__append_11 = -DWEBRTC_MAC
-@ENABLE_DSP_TRUE@@TARGET_OS_OSX_TRUE@am__append_12 = \
-@ENABLE_DSP_TRUE@@TARGET_OS_OSX_TRUE@webrtc_dsp/rtc_base/logging_mac.mm \
-@ENABLE_DSP_TRUE@@TARGET_OS_OSX_TRUE@webrtc_dsp/rtc_base/logging_mac.h
-
-@ENABLE_DSP_TRUE@@TARGET_OS_OSX_FALSE@am__append_13 = -DWEBRTC_LINUX
-@ENABLE_DSP_TRUE@@TARGET_CPU_X86_TRUE@am__append_14 = \
-@ENABLE_DSP_TRUE@@TARGET_CPU_X86_TRUE@webrtc_dsp/modules/audio_processing/aec/aec_core_sse2.cc \
-@ENABLE_DSP_TRUE@@TARGET_CPU_X86_TRUE@webrtc_dsp/modules/audio_processing/utility/ooura_fft_sse2.cc
-
-@ENABLE_AUDIO_CALLBACK_TRUE@@ENABLE_DSP_TRUE@am__append_15 = -DTGVOIP_USE_CALLBACK_AUDIO_IO
-@ENABLE_AUDIO_CALLBACK_TRUE@@ENABLE_DSP_TRUE@am__append_16 = \
-@ENABLE_AUDIO_CALLBACK_TRUE@@ENABLE_DSP_TRUE@audio/AudioIOCallback.cpp
-
-@ENABLE_AUDIO_CALLBACK_TRUE@@ENABLE_DSP_TRUE@am__append_17 = \
-@ENABLE_AUDIO_CALLBACK_TRUE@@ENABLE_DSP_TRUE@audio/AudioIOCallback.h
-
-@ENABLE_DSP_TRUE@@TARGET_CPU_ARM_TRUE@am__append_18 = \
-@ENABLE_DSP_TRUE@@TARGET_CPU_ARM_TRUE@webrtc_dsp/common_audio/signal_processing/complex_bit_reverse_arm.S \
-@ENABLE_DSP_TRUE@@TARGET_CPU_ARM_TRUE@webrtc_dsp/common_audio/third_party/spl_sqrt_floor/spl_sqrt_floor_arm.S
-
-@ENABLE_DSP_TRUE@@TARGET_CPU_ARMV7_TRUE@@TARGET_CPU_ARM_TRUE@am__append_19 = -mfpu=neon -mfloat-abi=hard
-@ENABLE_DSP_TRUE@@TARGET_CPU_ARMV7_TRUE@@TARGET_CPU_ARM_TRUE@am__append_20 = -mfpu=neon -mfloat-abi=hard
-@ENABLE_DSP_TRUE@@TARGET_CPU_ARMV7_TRUE@@TARGET_CPU_ARM_TRUE@am__append_21 = \
-@ENABLE_DSP_TRUE@@TARGET_CPU_ARMV7_TRUE@@TARGET_CPU_ARM_TRUE@webrtc_dsp/common_audio/signal_processing/cross_correlation_neon.c \
-@ENABLE_DSP_TRUE@@TARGET_CPU_ARMV7_TRUE@@TARGET_CPU_ARM_TRUE@webrtc_dsp/common_audio/signal_processing/downsample_fast_neon.c \
-@ENABLE_DSP_TRUE@@TARGET_CPU_ARMV7_TRUE@@TARGET_CPU_ARM_TRUE@webrtc_dsp/common_audio/signal_processing/min_max_operations_neon.c \
-@ENABLE_DSP_TRUE@@TARGET_CPU_ARMV7_TRUE@@TARGET_CPU_ARM_TRUE@webrtc_dsp/modules/audio_processing/aec/aec_core_neon.cc \
-@ENABLE_DSP_TRUE@@TARGET_CPU_ARMV7_TRUE@@TARGET_CPU_ARM_TRUE@webrtc_dsp/modules/audio_processing/aecm/aecm_core_neon.cc \
-@ENABLE_DSP_TRUE@@TARGET_CPU_ARMV7_TRUE@@TARGET_CPU_ARM_TRUE@webrtc_dsp/modules/audio_processing/ns/nsx_core_neon.c \
-@ENABLE_DSP_TRUE@@TARGET_CPU_ARMV7_TRUE@@TARGET_CPU_ARM_TRUE@webrtc_dsp/modules/audio_processing/utility/ooura_fft_neon.cc
-
-# webrtc_dsp/common_audio/signal_processing/filter_ar_fast_q12_armv7.S
-@ENABLE_DSP_TRUE@@TARGET_CPU_ARM_FALSE@am__append_22 = \
-@ENABLE_DSP_TRUE@@TARGET_CPU_ARM_FALSE@webrtc_dsp/common_audio/signal_processing/complex_bit_reverse.c \
-@ENABLE_DSP_TRUE@@TARGET_CPU_ARM_FALSE@webrtc_dsp/common_audio/third_party/spl_sqrt_floor/spl_sqrt_floor.c
-
-
-# headers
-@ENABLE_DSP_TRUE@am__append_23 = \
-@ENABLE_DSP_TRUE@webrtc_dsp/system_wrappers/include/field_trial.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/system_wrappers/include/cpu_features_wrapper.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/system_wrappers/include/asm_defines.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/system_wrappers/include/metrics.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/system_wrappers/include/compile_assert_c.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/typedefs.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/absl/strings/internal/memutil.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/absl/strings/ascii.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/absl/strings/string_view.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/absl/types/optional.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/absl/types/bad_optional_access.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/absl/memory/memory.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/absl/meta/type_traits.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/absl/algorithm/algorithm.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/absl/container/inlined_vector.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/absl/base/policy_checks.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/absl/base/port.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/absl/base/config.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/absl/base/internal/invoke.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/absl/base/internal/inline_variable.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/absl/base/internal/atomic_hook.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/absl/base/internal/identity.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/absl/base/internal/raw_logging.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/absl/base/internal/throw_delegate.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/absl/base/attributes.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/absl/base/macros.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/absl/base/optimization.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/absl/base/log_severity.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/absl/utility/utility.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/rtc_base/string_to_number.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/rtc_base/constructormagic.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/rtc_base/strings/string_builder.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/rtc_base/event_tracer.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/rtc_base/stringencode.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/rtc_base/memory/aligned_malloc.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/rtc_base/event.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/rtc_base/ignore_wundef.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/rtc_base/stringutils.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/rtc_base/arraysize.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/rtc_base/swap_queue.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/rtc_base/trace_event.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/rtc_base/checks.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/rtc_base/deprecation.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/rtc_base/sanitizer.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/rtc_base/scoped_ref_ptr.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/rtc_base/logging.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/rtc_base/timeutils.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/rtc_base/atomicops.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/rtc_base/numerics/safe_minmax.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/rtc_base/numerics/safe_conversions.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/rtc_base/numerics/safe_conversions_impl.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/rtc_base/numerics/safe_compare.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/rtc_base/system/unused.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/rtc_base/system/inline.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/rtc_base/system/ignore_warnings.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/rtc_base/system/asm_defines.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/rtc_base/system/rtc_export.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/rtc_base/system/arch.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/rtc_base/platform_thread.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/rtc_base/platform_thread_types.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/rtc_base/protobuf_utils.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/rtc_base/thread_annotations.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/rtc_base/gtest_prod_util.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/rtc_base/function_view.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/rtc_base/criticalsection.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/rtc_base/refcount.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/rtc_base/thread_checker_impl.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/rtc_base/compile_assert_c.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/rtc_base/type_traits.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/rtc_base/platform_file.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/rtc_base/refcounter.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/rtc_base/thread_checker.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/rtc_base/race_checker.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/rtc_base/refcountedobject.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/third_party/rnnoise/src/rnn_activations.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/third_party/rnnoise/src/kiss_fft.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/third_party/rnnoise/src/rnn_vad_weights.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/api/audio/echo_canceller3_config.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/api/audio/echo_control.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/api/audio/audio_frame.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/api/audio/echo_canceller3_factory.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/api/array_view.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/modules/third_party/fft/fft.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/modules/audio_coding/codecs/isac/bandwidth_info.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/modules/audio_coding/codecs/isac/main/include/isac.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/modules/audio_coding/codecs/isac/main/source/os_specific_inline.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/modules/audio_coding/codecs/isac/main/source/entropy_coding.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/modules/audio_coding/codecs/isac/main/source/isac_vad.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/modules/audio_coding/codecs/isac/main/source/settings.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/modules/audio_coding/codecs/isac/main/source/lpc_shape_swb12_tables.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/modules/audio_coding/codecs/isac/main/source/arith_routines.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/modules/audio_coding/codecs/isac/main/source/crc.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/modules/audio_coding/codecs/isac/main/source/isac_float_type.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/modules/audio_coding/codecs/isac/main/source/pitch_lag_tables.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/modules/audio_coding/codecs/isac/main/source/spectrum_ar_model_tables.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/modules/audio_coding/codecs/isac/main/source/codec.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/modules/audio_coding/codecs/isac/main/source/pitch_gain_tables.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/modules/audio_coding/codecs/isac/main/source/lpc_shape_swb16_tables.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/modules/audio_coding/codecs/isac/main/source/pitch_estimator.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/modules/audio_coding/codecs/isac/main/source/structs.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/modules/audio_coding/codecs/isac/main/source/filter_functions.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/modules/audio_coding/codecs/isac/main/source/encode_lpc_swb.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/modules/audio_coding/codecs/isac/main/source/pitch_filter.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/modules/audio_coding/codecs/isac/main/source/lpc_analysis.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/modules/audio_coding/codecs/isac/main/source/bandwidth_estimator.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/modules/audio_coding/codecs/isac/main/source/lpc_gain_swb_tables.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/modules/audio_coding/codecs/isac/main/source/lpc_tables.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/modules/audio_processing/echo_detector/moving_max.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/modules/audio_processing/echo_detector/circular_buffer.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/modules/audio_processing/echo_detector/normalized_covariance_estimator.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/modules/audio_processing/echo_detector/mean_variance_estimator.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/modules/audio_processing/gain_control_for_experimental_agc.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/modules/audio_processing/rms_level.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/modules/audio_processing/ns/ns_core.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/modules/audio_processing/ns/defines.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/modules/audio_processing/ns/noise_suppression.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/modules/audio_processing/ns/nsx_core.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/modules/audio_processing/ns/windows_private.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/modules/audio_processing/ns/noise_suppression_x.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/modules/audio_processing/ns/nsx_defines.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/modules/audio_processing/residual_echo_detector.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/modules/audio_processing/audio_processing_impl.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/modules/audio_processing/render_queue_item_verifier.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/modules/audio_processing/include/audio_generator.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/modules/audio_processing/include/config.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/modules/audio_processing/include/audio_frame_view.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/modules/audio_processing/include/mock_audio_processing.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/modules/audio_processing/include/gain_control.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/modules/audio_processing/include/audio_generator_factory.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/modules/audio_processing/include/aec_dump.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/modules/audio_processing/include/audio_processing_statistics.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/modules/audio_processing/include/audio_processing.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/modules/audio_processing/agc2/interpolated_gain_curve.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/modules/audio_processing/agc2/biquad_filter.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/modules/audio_processing/agc2/agc2_testing_common.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/modules/audio_processing/agc2/adaptive_mode_level_estimator.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/modules/audio_processing/agc2/signal_classifier.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/modules/audio_processing/agc2/vector_float_frame.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/modules/audio_processing/agc2/rnn_vad/sequence_buffer.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/modules/audio_processing/agc2/rnn_vad/rnn.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/modules/audio_processing/agc2/rnn_vad/test_utils.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/modules/audio_processing/agc2/rnn_vad/pitch_info.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/modules/audio_processing/agc2/rnn_vad/lp_residual.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/modules/audio_processing/agc2/rnn_vad/ring_buffer.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/modules/audio_processing/agc2/rnn_vad/symmetric_matrix_buffer.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/modules/audio_processing/agc2/rnn_vad/spectral_features.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/modules/audio_processing/agc2/rnn_vad/features_extraction.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/modules/audio_processing/agc2/rnn_vad/common.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/modules/audio_processing/agc2/rnn_vad/spectral_features_internal.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/modules/audio_processing/agc2/rnn_vad/fft_util.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/modules/audio_processing/agc2/rnn_vad/pitch_search_internal.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/modules/audio_processing/agc2/rnn_vad/pitch_search.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/modules/audio_processing/agc2/fixed_gain_controller.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/modules/audio_processing/agc2/down_sampler.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/modules/audio_processing/agc2/saturation_protector.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/modules/audio_processing/agc2/agc2_common.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/modules/audio_processing/agc2/adaptive_mode_level_estimator_agc.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/modules/audio_processing/agc2/adaptive_digital_gain_applier.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/modules/audio_processing/agc2/vad_with_level.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/modules/audio_processing/agc2/limiter_db_gain_curve.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/modules/audio_processing/agc2/fixed_digital_level_estimator.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/modules/audio_processing/agc2/adaptive_agc.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/modules/audio_processing/agc2/gain_applier.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/modules/audio_processing/agc2/noise_level_estimator.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/modules/audio_processing/agc2/compute_interpolated_gain_curve.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/modules/audio_processing/agc2/noise_spectrum_estimator.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/modules/audio_processing/agc2/limiter.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/modules/audio_processing/transient/transient_detector.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/modules/audio_processing/transient/transient_suppressor.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/modules/audio_processing/transient/daubechies_8_wavelet_coeffs.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/modules/audio_processing/transient/common.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/modules/audio_processing/transient/wpd_node.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/modules/audio_processing/transient/moving_moments.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/modules/audio_processing/transient/wpd_tree.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/modules/audio_processing/transient/dyadic_decimator.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/modules/audio_processing/noise_suppression_impl.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/modules/audio_processing/aec/aec_resampler.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/modules/audio_processing/aec/echo_cancellation.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/modules/audio_processing/aec/aec_core.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/modules/audio_processing/aec/aec_core_optimized_methods.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/modules/audio_processing/aec/aec_common.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/modules/audio_processing/voice_detection_impl.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/modules/audio_processing/agc/legacy/analog_agc.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/modules/audio_processing/agc/legacy/gain_control.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/modules/audio_processing/agc/legacy/digital_agc.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/modules/audio_processing/agc/mock_agc.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/modules/audio_processing/agc/loudness_histogram.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/modules/audio_processing/agc/gain_map_internal.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/modules/audio_processing/agc/utility.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/modules/audio_processing/agc/agc_manager_direct.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/modules/audio_processing/agc/agc.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/modules/audio_processing/common.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/modules/audio_processing/audio_buffer.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/modules/audio_processing/echo_control_mobile_impl.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/modules/audio_processing/splitting_filter.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/modules/audio_processing/low_cut_filter.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/modules/audio_processing/audio_generator/file_audio_generator.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/modules/audio_processing/three_band_filter_bank.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/modules/audio_processing/echo_cancellation_impl.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/modules/audio_processing/level_estimator_impl.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/modules/audio_processing/gain_controller2.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/modules/audio_processing/aecm/aecm_core.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/modules/audio_processing/aecm/aecm_defines.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/modules/audio_processing/aecm/echo_control_mobile.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/modules/audio_processing/aec3/downsampled_render_buffer.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/modules/audio_processing/aec3/subtractor_output_analyzer.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/modules/audio_processing/aec3/residual_echo_estimator.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/modules/audio_processing/aec3/shadow_filter_update_gain.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/modules/audio_processing/aec3/aec_state.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/modules/audio_processing/aec3/suppression_filter.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/modules/audio_processing/aec3/block_delay_buffer.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/modules/audio_processing/aec3/adaptive_fir_filter.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/modules/audio_processing/aec3/cascaded_biquad_filter.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/modules/audio_processing/aec3/matched_filter.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/modules/audio_processing/aec3/subtractor_output.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/modules/audio_processing/aec3/render_signal_analyzer.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/modules/audio_processing/aec3/aec3_fft.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/modules/audio_processing/aec3/echo_remover_metrics.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/modules/audio_processing/aec3/filter_analyzer.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/modules/audio_processing/aec3/subtractor.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/modules/audio_processing/aec3/echo_path_delay_estimator.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/modules/audio_processing/aec3/block_processor_metrics.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/modules/audio_processing/aec3/fft_data.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/modules/audio_processing/aec3/render_delay_controller_metrics.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/modules/audio_processing/aec3/comfort_noise_generator.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/modules/audio_processing/aec3/erl_estimator.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/modules/audio_processing/aec3/echo_remover.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/modules/audio_processing/aec3/matrix_buffer.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/modules/audio_processing/aec3/reverb_model_estimator.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/modules/audio_processing/aec3/echo_path_variability.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/modules/audio_processing/aec3/moving_average.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/modules/audio_processing/aec3/render_reverb_model.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/modules/audio_processing/aec3/render_delay_controller.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/modules/audio_processing/aec3/suppression_gain.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/modules/audio_processing/aec3/erle_estimator.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/modules/audio_processing/aec3/subband_erle_estimator.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/modules/audio_processing/aec3/block_processor.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/modules/audio_processing/aec3/fullband_erle_estimator.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/modules/audio_processing/aec3/stationarity_estimator.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/modules/audio_processing/aec3/echo_canceller3.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/modules/audio_processing/aec3/skew_estimator.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/modules/audio_processing/aec3/render_buffer.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/modules/audio_processing/aec3/reverb_model_fallback.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/modules/audio_processing/aec3/vector_buffer.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/modules/audio_processing/aec3/reverb_frequency_response.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/modules/audio_processing/aec3/echo_audibility.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/modules/audio_processing/aec3/fft_buffer.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/modules/audio_processing/aec3/aec3_common.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/modules/audio_processing/aec3/vector_math.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/modules/audio_processing/aec3/decimator.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/modules/audio_processing/aec3/frame_blocker.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/modules/audio_processing/aec3/block_framer.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/modules/audio_processing/aec3/suppression_gain_limiter.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/modules/audio_processing/aec3/delay_estimate.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/modules/audio_processing/aec3/reverb_model.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/modules/audio_processing/aec3/main_filter_update_gain.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/modules/audio_processing/aec3/matched_filter_lag_aggregator.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/modules/audio_processing/aec3/reverb_decay_estimator.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/modules/audio_processing/aec3/render_delay_buffer.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/modules/audio_processing/gain_control_impl.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/modules/audio_processing/typing_detection.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/modules/audio_processing/logging/apm_data_dumper.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/modules/audio_processing/vad/vad_audio_proc_internal.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/modules/audio_processing/vad/vad_circular_buffer.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/modules/audio_processing/vad/pitch_based_vad.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/modules/audio_processing/vad/pole_zero_filter.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/modules/audio_processing/vad/gmm.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/modules/audio_processing/vad/common.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/modules/audio_processing/vad/vad_audio_proc.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/modules/audio_processing/vad/voice_gmm_tables.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/modules/audio_processing/vad/noise_gmm_tables.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/modules/audio_processing/vad/pitch_internal.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/modules/audio_processing/vad/standalone_vad.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/modules/audio_processing/vad/voice_activity_detector.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/modules/audio_processing/utility/ooura_fft_tables_neon_sse2.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/modules/audio_processing/utility/delay_estimator_internal.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/modules/audio_processing/utility/ooura_fft.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/modules/audio_processing/utility/block_mean_calculator.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/modules/audio_processing/utility/delay_estimator.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/modules/audio_processing/utility/ooura_fft_tables_common.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/modules/audio_processing/utility/delay_estimator_wrapper.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/common_audio/mocks/mock_smoothing_filter.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/common_audio/wav_file.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/common_audio/sparse_fir_filter.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/common_audio/fir_filter_sse.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/common_audio/window_generator.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/common_audio/ring_buffer.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/common_audio/fir_filter.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/common_audio/include/audio_util.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/common_audio/real_fourier_ooura.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/common_audio/smoothing_filter.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/common_audio/resampler/sinc_resampler.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/common_audio/resampler/include/push_resampler.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/common_audio/resampler/include/resampler.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/common_audio/resampler/push_sinc_resampler.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/common_audio/resampler/sinusoidal_linear_chirp_source.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/common_audio/fir_filter_factory.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/common_audio/audio_converter.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/common_audio/third_party/spl_sqrt_floor/spl_sqrt_floor.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/common_audio/third_party/fft4g/fft4g.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/common_audio/channel_buffer.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/common_audio/real_fourier.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/common_audio/fir_filter_neon.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/common_audio/fir_filter_c.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/common_audio/signal_processing/complex_fft_tables.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/common_audio/signal_processing/include/signal_processing_library.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/common_audio/signal_processing/include/real_fft.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/common_audio/signal_processing/include/spl_inl.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/common_audio/signal_processing/include/spl_inl_armv7.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/common_audio/signal_processing/dot_product_with_scale.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/common_audio/signal_processing/resample_by_2_internal.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/common_audio/wav_header.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/common_audio/vad/vad_core.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/common_audio/vad/include/vad.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/common_audio/vad/include/webrtc_vad.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/common_audio/vad/vad_gmm.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/common_audio/vad/vad_sp.h \
-@ENABLE_DSP_TRUE@webrtc_dsp/common_audio/vad/vad_filterbank.h
-
-@ENABLE_DSP_FALSE@am__append_24 = -DTGVOIP_NO_DSP
-@TARGET_OS_OSX_TRUE@am__append_25 = -std=gnu++0x $(CFLAGS)
-subdir = .
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-DIST_COMMON = $(srcdir)/Makefile.am $(top_srcdir)/configure \
-	$(am__configure_deps) $(am__nobase_tgvoipinclude_HEADERS_DIST) \
-	$(am__DIST_COMMON)
-am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
- configure.lineno config.status.lineno
-mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = config.h
-CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
-    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-    *) f=$$p;; \
-  esac;
-am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
-am__install_max = 40
-am__nobase_strip_setup = \
-  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
-am__nobase_strip = \
-  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
-am__nobase_list = $(am__nobase_strip_setup); \
-  for p in $$list; do echo "$$p $$p"; done | \
-  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
-  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
-    if (++n[$$2] == $(am__install_max)) \
-      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
-    END { for (dir in files) print dir, files[dir] }'
-am__base_list = \
-  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
-  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-am__uninstall_files_from_dir = { \
-  test -z "$$files" \
-    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
-    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
-         $(am__cd) "$$dir" && rm -f $$files; }; \
-  }
-am__installdirs = "$(DESTDIR)$(libdir)" \
-	"$(DESTDIR)$(tgvoipincludedir)"
-LTLIBRARIES = $(lib_LTLIBRARIES)
-libtgvoip_la_LIBADD =
-am__libtgvoip_la_SOURCES_DIST = VoIPController.cpp Buffers.cpp \
-	CongestionControl.cpp EchoCanceller.cpp JitterBuffer.cpp \
-	logging.cpp MediaStreamItf.cpp MessageThread.cpp \
-	NetworkSocket.cpp OpusDecoder.cpp OpusEncoder.cpp \
-	PacketReassembler.cpp VoIPGroupController.cpp \
-	VoIPServerConfig.cpp audio/AudioIO.cpp audio/AudioInput.cpp \
-	audio/AudioOutput.cpp audio/Resampler.cpp \
-	os/posix/NetworkSocketPosix.cpp video/VideoSource.cpp \
-	video/VideoRenderer.cpp video/ScreamCongestionController.cpp \
-	json11.cpp os/darwin/AudioInputAudioUnit.cpp \
-	os/darwin/AudioOutputAudioUnit.cpp os/darwin/AudioUnitIO.cpp \
-	os/darwin/AudioInputAudioUnitOSX.cpp \
-	os/darwin/AudioOutputAudioUnitOSX.cpp \
-	os/darwin/DarwinSpecific.mm \
-	os/darwin/SampleBufferDisplayLayerRenderer.mm \
-	os/darwin/TGVVideoRenderer.mm os/darwin/TGVVideoSource.mm \
-	os/darwin/VideoToolboxEncoderSource.mm \
-	os/linux/AudioInputALSA.cpp os/linux/AudioOutputALSA.cpp \
-	os/linux/AudioOutputPulse.cpp os/linux/AudioInputPulse.cpp \
-	os/linux/AudioPulse.cpp \
-	./webrtc_dsp/system_wrappers/source/field_trial.cc \
-	./webrtc_dsp/system_wrappers/source/metrics.cc \
-	./webrtc_dsp/system_wrappers/source/cpu_features.cc \
-	./webrtc_dsp/absl/strings/internal/memutil.cc \
-	./webrtc_dsp/absl/strings/string_view.cc \
-	./webrtc_dsp/absl/strings/ascii.cc \
-	./webrtc_dsp/absl/types/bad_optional_access.cc \
-	./webrtc_dsp/absl/types/optional.cc \
-	./webrtc_dsp/absl/base/internal/raw_logging.cc \
-	./webrtc_dsp/absl/base/internal/throw_delegate.cc \
-	./webrtc_dsp/rtc_base/race_checker.cc \
-	./webrtc_dsp/rtc_base/strings/string_builder.cc \
-	./webrtc_dsp/rtc_base/memory/aligned_malloc.cc \
-	./webrtc_dsp/rtc_base/timeutils.cc \
-	./webrtc_dsp/rtc_base/platform_file.cc \
-	./webrtc_dsp/rtc_base/string_to_number.cc \
-	./webrtc_dsp/rtc_base/thread_checker_impl.cc \
-	./webrtc_dsp/rtc_base/stringencode.cc \
-	./webrtc_dsp/rtc_base/stringutils.cc \
-	./webrtc_dsp/rtc_base/checks.cc \
-	./webrtc_dsp/rtc_base/platform_thread.cc \
-	./webrtc_dsp/rtc_base/logging_webrtc.cc \
-	./webrtc_dsp/rtc_base/criticalsection.cc \
-	./webrtc_dsp/rtc_base/platform_thread_types.cc \
-	./webrtc_dsp/rtc_base/event.cc \
-	./webrtc_dsp/rtc_base/event_tracer.cc \
-	./webrtc_dsp/third_party/rnnoise/src/rnn_vad_weights.cc \
-	./webrtc_dsp/third_party/rnnoise/src/kiss_fft.cc \
-	./webrtc_dsp/api/audio/audio_frame.cc \
-	./webrtc_dsp/api/audio/echo_canceller3_config.cc \
-	./webrtc_dsp/api/audio/echo_canceller3_factory.cc \
-	./webrtc_dsp/modules/third_party/fft/fft.c \
-	./webrtc_dsp/modules/audio_coding/codecs/isac/main/source/pitch_estimator.c \
-	./webrtc_dsp/modules/audio_coding/codecs/isac/main/source/lpc_shape_swb16_tables.c \
-	./webrtc_dsp/modules/audio_coding/codecs/isac/main/source/pitch_gain_tables.c \
-	./webrtc_dsp/modules/audio_coding/codecs/isac/main/source/arith_routines_logist.c \
-	./webrtc_dsp/modules/audio_coding/codecs/isac/main/source/filterbanks.c \
-	./webrtc_dsp/modules/audio_coding/codecs/isac/main/source/transform.c \
-	./webrtc_dsp/modules/audio_coding/codecs/isac/main/source/pitch_filter.c \
-	./webrtc_dsp/modules/audio_coding/codecs/isac/main/source/encode_lpc_swb.c \
-	./webrtc_dsp/modules/audio_coding/codecs/isac/main/source/filter_functions.c \
-	./webrtc_dsp/modules/audio_coding/codecs/isac/main/source/decode.c \
-	./webrtc_dsp/modules/audio_coding/codecs/isac/main/source/lattice.c \
-	./webrtc_dsp/modules/audio_coding/codecs/isac/main/source/intialize.c \
-	./webrtc_dsp/modules/audio_coding/codecs/isac/main/source/lpc_tables.c \
-	./webrtc_dsp/modules/audio_coding/codecs/isac/main/source/lpc_gain_swb_tables.c \
-	./webrtc_dsp/modules/audio_coding/codecs/isac/main/source/bandwidth_estimator.c \
-	./webrtc_dsp/modules/audio_coding/codecs/isac/main/source/encode.c \
-	./webrtc_dsp/modules/audio_coding/codecs/isac/main/source/lpc_analysis.c \
-	./webrtc_dsp/modules/audio_coding/codecs/isac/main/source/arith_routines_hist.c \
-	./webrtc_dsp/modules/audio_coding/codecs/isac/main/source/entropy_coding.c \
-	./webrtc_dsp/modules/audio_coding/codecs/isac/main/source/isac_vad.c \
-	./webrtc_dsp/modules/audio_coding/codecs/isac/main/source/arith_routines.c \
-	./webrtc_dsp/modules/audio_coding/codecs/isac/main/source/crc.c \
-	./webrtc_dsp/modules/audio_coding/codecs/isac/main/source/lpc_shape_swb12_tables.c \
-	./webrtc_dsp/modules/audio_coding/codecs/isac/main/source/decode_bwe.c \
-	./webrtc_dsp/modules/audio_coding/codecs/isac/main/source/spectrum_ar_model_tables.c \
-	./webrtc_dsp/modules/audio_coding/codecs/isac/main/source/pitch_lag_tables.c \
-	./webrtc_dsp/modules/audio_coding/codecs/isac/main/source/isac.c \
-	./webrtc_dsp/modules/audio_processing/rms_level.cc \
-	./webrtc_dsp/modules/audio_processing/echo_detector/normalized_covariance_estimator.cc \
-	./webrtc_dsp/modules/audio_processing/echo_detector/moving_max.cc \
-	./webrtc_dsp/modules/audio_processing/echo_detector/circular_buffer.cc \
-	./webrtc_dsp/modules/audio_processing/echo_detector/mean_variance_estimator.cc \
-	./webrtc_dsp/modules/audio_processing/splitting_filter.cc \
-	./webrtc_dsp/modules/audio_processing/gain_control_impl.cc \
-	./webrtc_dsp/modules/audio_processing/ns/nsx_core.c \
-	./webrtc_dsp/modules/audio_processing/ns/noise_suppression_x.c \
-	./webrtc_dsp/modules/audio_processing/ns/nsx_core_c.c \
-	./webrtc_dsp/modules/audio_processing/ns/ns_core.c \
-	./webrtc_dsp/modules/audio_processing/ns/noise_suppression.c \
-	./webrtc_dsp/modules/audio_processing/audio_buffer.cc \
-	./webrtc_dsp/modules/audio_processing/typing_detection.cc \
-	./webrtc_dsp/modules/audio_processing/include/audio_processing_statistics.cc \
-	./webrtc_dsp/modules/audio_processing/include/audio_generator_factory.cc \
-	./webrtc_dsp/modules/audio_processing/include/aec_dump.cc \
-	./webrtc_dsp/modules/audio_processing/include/audio_processing.cc \
-	./webrtc_dsp/modules/audio_processing/include/config.cc \
-	./webrtc_dsp/modules/audio_processing/agc2/interpolated_gain_curve.cc \
-	./webrtc_dsp/modules/audio_processing/agc2/agc2_common.cc \
-	./webrtc_dsp/modules/audio_processing/agc2/gain_applier.cc \
-	./webrtc_dsp/modules/audio_processing/agc2/adaptive_agc.cc \
-	./webrtc_dsp/modules/audio_processing/agc2/adaptive_digital_gain_applier.cc \
-	./webrtc_dsp/modules/audio_processing/agc2/limiter.cc \
-	./webrtc_dsp/modules/audio_processing/agc2/saturation_protector.cc \
-	./webrtc_dsp/modules/audio_processing/agc2/rnn_vad/spectral_features_internal.cc \
-	./webrtc_dsp/modules/audio_processing/agc2/rnn_vad/rnn.cc \
-	./webrtc_dsp/modules/audio_processing/agc2/rnn_vad/pitch_search_internal.cc \
-	./webrtc_dsp/modules/audio_processing/agc2/rnn_vad/spectral_features.cc \
-	./webrtc_dsp/modules/audio_processing/agc2/rnn_vad/pitch_search.cc \
-	./webrtc_dsp/modules/audio_processing/agc2/rnn_vad/features_extraction.cc \
-	./webrtc_dsp/modules/audio_processing/agc2/rnn_vad/fft_util.cc \
-	./webrtc_dsp/modules/audio_processing/agc2/rnn_vad/lp_residual.cc \
-	./webrtc_dsp/modules/audio_processing/agc2/adaptive_mode_level_estimator_agc.cc \
-	./webrtc_dsp/modules/audio_processing/agc2/vector_float_frame.cc \
-	./webrtc_dsp/modules/audio_processing/agc2/noise_level_estimator.cc \
-	./webrtc_dsp/modules/audio_processing/agc2/agc2_testing_common.cc \
-	./webrtc_dsp/modules/audio_processing/agc2/fixed_digital_level_estimator.cc \
-	./webrtc_dsp/modules/audio_processing/agc2/fixed_gain_controller.cc \
-	./webrtc_dsp/modules/audio_processing/agc2/vad_with_level.cc \
-	./webrtc_dsp/modules/audio_processing/agc2/limiter_db_gain_curve.cc \
-	./webrtc_dsp/modules/audio_processing/agc2/down_sampler.cc \
-	./webrtc_dsp/modules/audio_processing/agc2/signal_classifier.cc \
-	./webrtc_dsp/modules/audio_processing/agc2/noise_spectrum_estimator.cc \
-	./webrtc_dsp/modules/audio_processing/agc2/compute_interpolated_gain_curve.cc \
-	./webrtc_dsp/modules/audio_processing/agc2/biquad_filter.cc \
-	./webrtc_dsp/modules/audio_processing/agc2/adaptive_mode_level_estimator.cc \
-	./webrtc_dsp/modules/audio_processing/transient/moving_moments.cc \
-	./webrtc_dsp/modules/audio_processing/transient/wpd_tree.cc \
-	./webrtc_dsp/modules/audio_processing/transient/wpd_node.cc \
-	./webrtc_dsp/modules/audio_processing/transient/transient_suppressor.cc \
-	./webrtc_dsp/modules/audio_processing/transient/transient_detector.cc \
-	./webrtc_dsp/modules/audio_processing/low_cut_filter.cc \
-	./webrtc_dsp/modules/audio_processing/level_estimator_impl.cc \
-	./webrtc_dsp/modules/audio_processing/three_band_filter_bank.cc \
-	./webrtc_dsp/modules/audio_processing/aec/echo_cancellation.cc \
-	./webrtc_dsp/modules/audio_processing/aec/aec_resampler.cc \
-	./webrtc_dsp/modules/audio_processing/aec/aec_core.cc \
-	./webrtc_dsp/modules/audio_processing/voice_detection_impl.cc \
-	./webrtc_dsp/modules/audio_processing/echo_cancellation_impl.cc \
-	./webrtc_dsp/modules/audio_processing/gain_control_for_experimental_agc.cc \
-	./webrtc_dsp/modules/audio_processing/agc/agc.cc \
-	./webrtc_dsp/modules/audio_processing/agc/loudness_histogram.cc \
-	./webrtc_dsp/modules/audio_processing/agc/agc_manager_direct.cc \
-	./webrtc_dsp/modules/audio_processing/agc/legacy/analog_agc.c \
-	./webrtc_dsp/modules/audio_processing/agc/legacy/digital_agc.c \
-	./webrtc_dsp/modules/audio_processing/agc/utility.cc \
-	./webrtc_dsp/modules/audio_processing/audio_processing_impl.cc \
-	./webrtc_dsp/modules/audio_processing/audio_generator/file_audio_generator.cc \
-	./webrtc_dsp/modules/audio_processing/gain_controller2.cc \
-	./webrtc_dsp/modules/audio_processing/residual_echo_detector.cc \
-	./webrtc_dsp/modules/audio_processing/noise_suppression_impl.cc \
-	./webrtc_dsp/modules/audio_processing/aecm/aecm_core.cc \
-	./webrtc_dsp/modules/audio_processing/aecm/aecm_core_c.cc \
-	./webrtc_dsp/modules/audio_processing/aecm/echo_control_mobile.cc \
-	./webrtc_dsp/modules/audio_processing/aec3/render_reverb_model.cc \
-	./webrtc_dsp/modules/audio_processing/aec3/reverb_model_fallback.cc \
-	./webrtc_dsp/modules/audio_processing/aec3/echo_remover_metrics.cc \
-	./webrtc_dsp/modules/audio_processing/aec3/matched_filter_lag_aggregator.cc \
-	./webrtc_dsp/modules/audio_processing/aec3/render_delay_buffer2.cc \
-	./webrtc_dsp/modules/audio_processing/aec3/echo_path_variability.cc \
-	./webrtc_dsp/modules/audio_processing/aec3/frame_blocker.cc \
-	./webrtc_dsp/modules/audio_processing/aec3/subtractor.cc \
-	./webrtc_dsp/modules/audio_processing/aec3/aec3_fft.cc \
-	./webrtc_dsp/modules/audio_processing/aec3/fullband_erle_estimator.cc \
-	./webrtc_dsp/modules/audio_processing/aec3/suppression_filter.cc \
-	./webrtc_dsp/modules/audio_processing/aec3/block_processor.cc \
-	./webrtc_dsp/modules/audio_processing/aec3/subband_erle_estimator.cc \
-	./webrtc_dsp/modules/audio_processing/aec3/render_delay_controller_metrics.cc \
-	./webrtc_dsp/modules/audio_processing/aec3/render_delay_buffer.cc \
-	./webrtc_dsp/modules/audio_processing/aec3/vector_buffer.cc \
-	./webrtc_dsp/modules/audio_processing/aec3/erl_estimator.cc \
-	./webrtc_dsp/modules/audio_processing/aec3/aec_state.cc \
-	./webrtc_dsp/modules/audio_processing/aec3/adaptive_fir_filter.cc \
-	./webrtc_dsp/modules/audio_processing/aec3/render_delay_controller.cc \
-	./webrtc_dsp/modules/audio_processing/aec3/skew_estimator.cc \
-	./webrtc_dsp/modules/audio_processing/aec3/echo_path_delay_estimator.cc \
-	./webrtc_dsp/modules/audio_processing/aec3/block_framer.cc \
-	./webrtc_dsp/modules/audio_processing/aec3/erle_estimator.cc \
-	./webrtc_dsp/modules/audio_processing/aec3/reverb_model.cc \
-	./webrtc_dsp/modules/audio_processing/aec3/cascaded_biquad_filter.cc \
-	./webrtc_dsp/modules/audio_processing/aec3/render_buffer.cc \
-	./webrtc_dsp/modules/audio_processing/aec3/subtractor_output.cc \
-	./webrtc_dsp/modules/audio_processing/aec3/stationarity_estimator.cc \
-	./webrtc_dsp/modules/audio_processing/aec3/render_signal_analyzer.cc \
-	./webrtc_dsp/modules/audio_processing/aec3/subtractor_output_analyzer.cc \
-	./webrtc_dsp/modules/audio_processing/aec3/suppression_gain.cc \
-	./webrtc_dsp/modules/audio_processing/aec3/echo_audibility.cc \
-	./webrtc_dsp/modules/audio_processing/aec3/block_processor_metrics.cc \
-	./webrtc_dsp/modules/audio_processing/aec3/moving_average.cc \
-	./webrtc_dsp/modules/audio_processing/aec3/reverb_model_estimator.cc \
-	./webrtc_dsp/modules/audio_processing/aec3/aec3_common.cc \
-	./webrtc_dsp/modules/audio_processing/aec3/residual_echo_estimator.cc \
-	./webrtc_dsp/modules/audio_processing/aec3/matched_filter.cc \
-	./webrtc_dsp/modules/audio_processing/aec3/reverb_decay_estimator.cc \
-	./webrtc_dsp/modules/audio_processing/aec3/render_delay_controller2.cc \
-	./webrtc_dsp/modules/audio_processing/aec3/suppression_gain_limiter.cc \
-	./webrtc_dsp/modules/audio_processing/aec3/main_filter_update_gain.cc \
-	./webrtc_dsp/modules/audio_processing/aec3/echo_remover.cc \
-	./webrtc_dsp/modules/audio_processing/aec3/downsampled_render_buffer.cc \
-	./webrtc_dsp/modules/audio_processing/aec3/matrix_buffer.cc \
-	./webrtc_dsp/modules/audio_processing/aec3/block_processor2.cc \
-	./webrtc_dsp/modules/audio_processing/aec3/echo_canceller3.cc \
-	./webrtc_dsp/modules/audio_processing/aec3/block_delay_buffer.cc \
-	./webrtc_dsp/modules/audio_processing/aec3/fft_buffer.cc \
-	./webrtc_dsp/modules/audio_processing/aec3/comfort_noise_generator.cc \
-	./webrtc_dsp/modules/audio_processing/aec3/shadow_filter_update_gain.cc \
-	./webrtc_dsp/modules/audio_processing/aec3/filter_analyzer.cc \
-	./webrtc_dsp/modules/audio_processing/aec3/reverb_frequency_response.cc \
-	./webrtc_dsp/modules/audio_processing/aec3/decimator.cc \
-	./webrtc_dsp/modules/audio_processing/echo_control_mobile_impl.cc \
-	./webrtc_dsp/modules/audio_processing/logging/apm_data_dumper.cc \
-	./webrtc_dsp/modules/audio_processing/vad/voice_activity_detector.cc \
-	./webrtc_dsp/modules/audio_processing/vad/standalone_vad.cc \
-	./webrtc_dsp/modules/audio_processing/vad/pitch_internal.cc \
-	./webrtc_dsp/modules/audio_processing/vad/vad_circular_buffer.cc \
-	./webrtc_dsp/modules/audio_processing/vad/vad_audio_proc.cc \
-	./webrtc_dsp/modules/audio_processing/vad/pole_zero_filter.cc \
-	./webrtc_dsp/modules/audio_processing/vad/pitch_based_vad.cc \
-	./webrtc_dsp/modules/audio_processing/vad/gmm.cc \
-	./webrtc_dsp/modules/audio_processing/utility/ooura_fft.cc \
-	./webrtc_dsp/modules/audio_processing/utility/delay_estimator_wrapper.cc \
-	./webrtc_dsp/modules/audio_processing/utility/delay_estimator.cc \
-	./webrtc_dsp/modules/audio_processing/utility/block_mean_calculator.cc \
-	./webrtc_dsp/common_audio/window_generator.cc \
-	./webrtc_dsp/common_audio/channel_buffer.cc \
-	./webrtc_dsp/common_audio/fir_filter_factory.cc \
-	./webrtc_dsp/common_audio/wav_header.cc \
-	./webrtc_dsp/common_audio/real_fourier_ooura.cc \
-	./webrtc_dsp/common_audio/audio_util.cc \
-	./webrtc_dsp/common_audio/fir_filter_sse.cc \
-	./webrtc_dsp/common_audio/resampler/push_sinc_resampler.cc \
-	./webrtc_dsp/common_audio/resampler/resampler.cc \
-	./webrtc_dsp/common_audio/resampler/sinc_resampler_sse.cc \
-	./webrtc_dsp/common_audio/resampler/push_resampler.cc \
-	./webrtc_dsp/common_audio/resampler/sinc_resampler.cc \
-	./webrtc_dsp/common_audio/resampler/sinusoidal_linear_chirp_source.cc \
-	./webrtc_dsp/common_audio/wav_file.cc \
-	./webrtc_dsp/common_audio/third_party/fft4g/fft4g.c \
-	./webrtc_dsp/common_audio/audio_converter.cc \
-	./webrtc_dsp/common_audio/real_fourier.cc \
-	./webrtc_dsp/common_audio/sparse_fir_filter.cc \
-	./webrtc_dsp/common_audio/smoothing_filter.cc \
-	./webrtc_dsp/common_audio/fir_filter_c.cc \
-	./webrtc_dsp/common_audio/ring_buffer.c \
-	./webrtc_dsp/common_audio/signal_processing/complex_fft.c \
-	./webrtc_dsp/common_audio/signal_processing/filter_ma_fast_q12.c \
-	./webrtc_dsp/common_audio/signal_processing/splitting_filter1.c \
-	./webrtc_dsp/common_audio/signal_processing/levinson_durbin.c \
-	./webrtc_dsp/common_audio/signal_processing/dot_product_with_scale.cc \
-	./webrtc_dsp/common_audio/signal_processing/auto_corr_to_refl_coef.c \
-	./webrtc_dsp/common_audio/signal_processing/resample_by_2_internal.c \
-	./webrtc_dsp/common_audio/signal_processing/energy.c \
-	./webrtc_dsp/common_audio/signal_processing/sqrt_of_one_minus_x_squared.c \
-	./webrtc_dsp/common_audio/signal_processing/downsample_fast.c \
-	./webrtc_dsp/common_audio/signal_processing/filter_ar_fast_q12.c \
-	./webrtc_dsp/common_audio/signal_processing/spl_init.c \
-	./webrtc_dsp/common_audio/signal_processing/lpc_to_refl_coef.c \
-	./webrtc_dsp/common_audio/signal_processing/cross_correlation.c \
-	./webrtc_dsp/common_audio/signal_processing/division_operations.c \
-	./webrtc_dsp/common_audio/signal_processing/auto_correlation.c \
-	./webrtc_dsp/common_audio/signal_processing/get_scaling_square.c \
-	./webrtc_dsp/common_audio/signal_processing/resample.c \
-	./webrtc_dsp/common_audio/signal_processing/min_max_operations.c \
-	./webrtc_dsp/common_audio/signal_processing/refl_coef_to_lpc.c \
-	./webrtc_dsp/common_audio/signal_processing/filter_ar.c \
-	./webrtc_dsp/common_audio/signal_processing/vector_scaling_operations.c \
-	./webrtc_dsp/common_audio/signal_processing/resample_fractional.c \
-	./webrtc_dsp/common_audio/signal_processing/real_fft.c \
-	./webrtc_dsp/common_audio/signal_processing/ilbc_specific_functions.c \
-	./webrtc_dsp/common_audio/signal_processing/randomization_functions.c \
-	./webrtc_dsp/common_audio/signal_processing/copy_set_operations.c \
-	./webrtc_dsp/common_audio/signal_processing/resample_by_2.c \
-	./webrtc_dsp/common_audio/signal_processing/get_hanning_window.c \
-	./webrtc_dsp/common_audio/signal_processing/resample_48khz.c \
-	./webrtc_dsp/common_audio/signal_processing/spl_inl.c \
-	./webrtc_dsp/common_audio/signal_processing/spl_sqrt.c \
-	./webrtc_dsp/common_audio/vad/vad_sp.c \
-	./webrtc_dsp/common_audio/vad/vad.cc \
-	./webrtc_dsp/common_audio/vad/webrtc_vad.c \
-	./webrtc_dsp/common_audio/vad/vad_filterbank.c \
-	./webrtc_dsp/common_audio/vad/vad_core.c \
-	./webrtc_dsp/common_audio/vad/vad_gmm.c \
-	webrtc_dsp/rtc_base/logging_mac.mm \
-	webrtc_dsp/rtc_base/logging_mac.h \
-	webrtc_dsp/modules/audio_processing/aec/aec_core_sse2.cc \
-	webrtc_dsp/modules/audio_processing/utility/ooura_fft_sse2.cc \
-	audio/AudioIOCallback.cpp \
-	webrtc_dsp/common_audio/signal_processing/complex_bit_reverse_arm.S \
-	webrtc_dsp/common_audio/third_party/spl_sqrt_floor/spl_sqrt_floor_arm.S \
-	webrtc_dsp/common_audio/signal_processing/cross_correlation_neon.c \
-	webrtc_dsp/common_audio/signal_processing/downsample_fast_neon.c \
-	webrtc_dsp/common_audio/signal_processing/min_max_operations_neon.c \
-	webrtc_dsp/modules/audio_processing/aec/aec_core_neon.cc \
-	webrtc_dsp/modules/audio_processing/aecm/aecm_core_neon.cc \
-	webrtc_dsp/modules/audio_processing/ns/nsx_core_neon.c \
-	webrtc_dsp/modules/audio_processing/utility/ooura_fft_neon.cc \
-	webrtc_dsp/common_audio/signal_processing/complex_bit_reverse.c \
-	webrtc_dsp/common_audio/third_party/spl_sqrt_floor/spl_sqrt_floor.c \
-	webrtc_dsp/system_wrappers/include/field_trial.h \
-	webrtc_dsp/system_wrappers/include/cpu_features_wrapper.h \
-	webrtc_dsp/system_wrappers/include/asm_defines.h \
-	webrtc_dsp/system_wrappers/include/metrics.h \
-	webrtc_dsp/system_wrappers/include/compile_assert_c.h \
-	webrtc_dsp/typedefs.h \
-	webrtc_dsp/absl/strings/internal/memutil.h \
-	webrtc_dsp/absl/strings/ascii.h \
-	webrtc_dsp/absl/strings/string_view.h \
-	webrtc_dsp/absl/types/optional.h \
-	webrtc_dsp/absl/types/bad_optional_access.h \
-	webrtc_dsp/absl/memory/memory.h \
-	webrtc_dsp/absl/meta/type_traits.h \
-	webrtc_dsp/absl/algorithm/algorithm.h \
-	webrtc_dsp/absl/container/inlined_vector.h \
-	webrtc_dsp/absl/base/policy_checks.h \
-	webrtc_dsp/absl/base/port.h webrtc_dsp/absl/base/config.h \
-	webrtc_dsp/absl/base/internal/invoke.h \
-	webrtc_dsp/absl/base/internal/inline_variable.h \
-	webrtc_dsp/absl/base/internal/atomic_hook.h \
-	webrtc_dsp/absl/base/internal/identity.h \
-	webrtc_dsp/absl/base/internal/raw_logging.h \
-	webrtc_dsp/absl/base/internal/throw_delegate.h \
-	webrtc_dsp/absl/base/attributes.h \
-	webrtc_dsp/absl/base/macros.h \
-	webrtc_dsp/absl/base/optimization.h \
-	webrtc_dsp/absl/base/log_severity.h \
-	webrtc_dsp/absl/utility/utility.h \
-	webrtc_dsp/rtc_base/string_to_number.h \
-	webrtc_dsp/rtc_base/constructormagic.h \
-	webrtc_dsp/rtc_base/strings/string_builder.h \
-	webrtc_dsp/rtc_base/event_tracer.h \
-	webrtc_dsp/rtc_base/stringencode.h \
-	webrtc_dsp/rtc_base/memory/aligned_malloc.h \
-	webrtc_dsp/rtc_base/event.h \
-	webrtc_dsp/rtc_base/ignore_wundef.h \
-	webrtc_dsp/rtc_base/stringutils.h \
-	webrtc_dsp/rtc_base/arraysize.h \
-	webrtc_dsp/rtc_base/swap_queue.h \
-	webrtc_dsp/rtc_base/trace_event.h webrtc_dsp/rtc_base/checks.h \
-	webrtc_dsp/rtc_base/deprecation.h \
-	webrtc_dsp/rtc_base/sanitizer.h \
-	webrtc_dsp/rtc_base/scoped_ref_ptr.h \
-	webrtc_dsp/rtc_base/logging.h webrtc_dsp/rtc_base/timeutils.h \
-	webrtc_dsp/rtc_base/atomicops.h \
-	webrtc_dsp/rtc_base/numerics/safe_minmax.h \
-	webrtc_dsp/rtc_base/numerics/safe_conversions.h \
-	webrtc_dsp/rtc_base/numerics/safe_conversions_impl.h \
-	webrtc_dsp/rtc_base/numerics/safe_compare.h \
-	webrtc_dsp/rtc_base/system/unused.h \
-	webrtc_dsp/rtc_base/system/inline.h \
-	webrtc_dsp/rtc_base/system/ignore_warnings.h \
-	webrtc_dsp/rtc_base/system/asm_defines.h \
-	webrtc_dsp/rtc_base/system/rtc_export.h \
-	webrtc_dsp/rtc_base/system/arch.h \
-	webrtc_dsp/rtc_base/platform_thread.h \
-	webrtc_dsp/rtc_base/platform_thread_types.h \
-	webrtc_dsp/rtc_base/protobuf_utils.h \
-	webrtc_dsp/rtc_base/thread_annotations.h \
-	webrtc_dsp/rtc_base/gtest_prod_util.h \
-	webrtc_dsp/rtc_base/function_view.h \
-	webrtc_dsp/rtc_base/criticalsection.h \
-	webrtc_dsp/rtc_base/refcount.h \
-	webrtc_dsp/rtc_base/thread_checker_impl.h \
-	webrtc_dsp/rtc_base/compile_assert_c.h \
-	webrtc_dsp/rtc_base/type_traits.h \
-	webrtc_dsp/rtc_base/platform_file.h \
-	webrtc_dsp/rtc_base/refcounter.h \
-	webrtc_dsp/rtc_base/thread_checker.h \
-	webrtc_dsp/rtc_base/race_checker.h \
-	webrtc_dsp/rtc_base/refcountedobject.h \
-	webrtc_dsp/third_party/rnnoise/src/rnn_activations.h \
-	webrtc_dsp/third_party/rnnoise/src/kiss_fft.h \
-	webrtc_dsp/third_party/rnnoise/src/rnn_vad_weights.h \
-	webrtc_dsp/api/audio/echo_canceller3_config.h \
-	webrtc_dsp/api/audio/echo_control.h \
-	webrtc_dsp/api/audio/audio_frame.h \
-	webrtc_dsp/api/audio/echo_canceller3_factory.h \
-	webrtc_dsp/api/array_view.h \
-	webrtc_dsp/modules/third_party/fft/fft.h \
-	webrtc_dsp/modules/audio_coding/codecs/isac/bandwidth_info.h \
-	webrtc_dsp/modules/audio_coding/codecs/isac/main/include/isac.h \
-	webrtc_dsp/modules/audio_coding/codecs/isac/main/source/os_specific_inline.h \
-	webrtc_dsp/modules/audio_coding/codecs/isac/main/source/entropy_coding.h \
-	webrtc_dsp/modules/audio_coding/codecs/isac/main/source/isac_vad.h \
-	webrtc_dsp/modules/audio_coding/codecs/isac/main/source/settings.h \
-	webrtc_dsp/modules/audio_coding/codecs/isac/main/source/lpc_shape_swb12_tables.h \
-	webrtc_dsp/modules/audio_coding/codecs/isac/main/source/arith_routines.h \
-	webrtc_dsp/modules/audio_coding/codecs/isac/main/source/crc.h \
-	webrtc_dsp/modules/audio_coding/codecs/isac/main/source/isac_float_type.h \
-	webrtc_dsp/modules/audio_coding/codecs/isac/main/source/pitch_lag_tables.h \
-	webrtc_dsp/modules/audio_coding/codecs/isac/main/source/spectrum_ar_model_tables.h \
-	webrtc_dsp/modules/audio_coding/codecs/isac/main/source/codec.h \
-	webrtc_dsp/modules/audio_coding/codecs/isac/main/source/pitch_gain_tables.h \
-	webrtc_dsp/modules/audio_coding/codecs/isac/main/source/lpc_shape_swb16_tables.h \
-	webrtc_dsp/modules/audio_coding/codecs/isac/main/source/pitch_estimator.h \
-	webrtc_dsp/modules/audio_coding/codecs/isac/main/source/structs.h \
-	webrtc_dsp/modules/audio_coding/codecs/isac/main/source/filter_functions.h \
-	webrtc_dsp/modules/audio_coding/codecs/isac/main/source/encode_lpc_swb.h \
-	webrtc_dsp/modules/audio_coding/codecs/isac/main/source/pitch_filter.h \
-	webrtc_dsp/modules/audio_coding/codecs/isac/main/source/lpc_analysis.h \
-	webrtc_dsp/modules/audio_coding/codecs/isac/main/source/bandwidth_estimator.h \
-	webrtc_dsp/modules/audio_coding/codecs/isac/main/source/lpc_gain_swb_tables.h \
-	webrtc_dsp/modules/audio_coding/codecs/isac/main/source/lpc_tables.h \
-	webrtc_dsp/modules/audio_processing/echo_detector/moving_max.h \
-	webrtc_dsp/modules/audio_processing/echo_detector/circular_buffer.h \
-	webrtc_dsp/modules/audio_processing/echo_detector/normalized_covariance_estimator.h \
-	webrtc_dsp/modules/audio_processing/echo_detector/mean_variance_estimator.h \
-	webrtc_dsp/modules/audio_processing/gain_control_for_experimental_agc.h \
-	webrtc_dsp/modules/audio_processing/rms_level.h \
-	webrtc_dsp/modules/audio_processing/ns/ns_core.h \
-	webrtc_dsp/modules/audio_processing/ns/defines.h \
-	webrtc_dsp/modules/audio_processing/ns/noise_suppression.h \
-	webrtc_dsp/modules/audio_processing/ns/nsx_core.h \
-	webrtc_dsp/modules/audio_processing/ns/windows_private.h \
-	webrtc_dsp/modules/audio_processing/ns/noise_suppression_x.h \
-	webrtc_dsp/modules/audio_processing/ns/nsx_defines.h \
-	webrtc_dsp/modules/audio_processing/residual_echo_detector.h \
-	webrtc_dsp/modules/audio_processing/audio_processing_impl.h \
-	webrtc_dsp/modules/audio_processing/render_queue_item_verifier.h \
-	webrtc_dsp/modules/audio_processing/include/audio_generator.h \
-	webrtc_dsp/modules/audio_processing/include/config.h \
-	webrtc_dsp/modules/audio_processing/include/audio_frame_view.h \
-	webrtc_dsp/modules/audio_processing/include/mock_audio_processing.h \
-	webrtc_dsp/modules/audio_processing/include/gain_control.h \
-	webrtc_dsp/modules/audio_processing/include/audio_generator_factory.h \
-	webrtc_dsp/modules/audio_processing/include/aec_dump.h \
-	webrtc_dsp/modules/audio_processing/include/audio_processing_statistics.h \
-	webrtc_dsp/modules/audio_processing/include/audio_processing.h \
-	webrtc_dsp/modules/audio_processing/agc2/interpolated_gain_curve.h \
-	webrtc_dsp/modules/audio_processing/agc2/biquad_filter.h \
-	webrtc_dsp/modules/audio_processing/agc2/agc2_testing_common.h \
-	webrtc_dsp/modules/audio_processing/agc2/adaptive_mode_level_estimator.h \
-	webrtc_dsp/modules/audio_processing/agc2/signal_classifier.h \
-	webrtc_dsp/modules/audio_processing/agc2/vector_float_frame.h \
-	webrtc_dsp/modules/audio_processing/agc2/rnn_vad/sequence_buffer.h \
-	webrtc_dsp/modules/audio_processing/agc2/rnn_vad/rnn.h \
-	webrtc_dsp/modules/audio_processing/agc2/rnn_vad/test_utils.h \
-	webrtc_dsp/modules/audio_processing/agc2/rnn_vad/pitch_info.h \
-	webrtc_dsp/modules/audio_processing/agc2/rnn_vad/lp_residual.h \
-	webrtc_dsp/modules/audio_processing/agc2/rnn_vad/ring_buffer.h \
-	webrtc_dsp/modules/audio_processing/agc2/rnn_vad/symmetric_matrix_buffer.h \
-	webrtc_dsp/modules/audio_processing/agc2/rnn_vad/spectral_features.h \
-	webrtc_dsp/modules/audio_processing/agc2/rnn_vad/features_extraction.h \
-	webrtc_dsp/modules/audio_processing/agc2/rnn_vad/common.h \
-	webrtc_dsp/modules/audio_processing/agc2/rnn_vad/spectral_features_internal.h \
-	webrtc_dsp/modules/audio_processing/agc2/rnn_vad/fft_util.h \
-	webrtc_dsp/modules/audio_processing/agc2/rnn_vad/pitch_search_internal.h \
-	webrtc_dsp/modules/audio_processing/agc2/rnn_vad/pitch_search.h \
-	webrtc_dsp/modules/audio_processing/agc2/fixed_gain_controller.h \
-	webrtc_dsp/modules/audio_processing/agc2/down_sampler.h \
-	webrtc_dsp/modules/audio_processing/agc2/saturation_protector.h \
-	webrtc_dsp/modules/audio_processing/agc2/agc2_common.h \
-	webrtc_dsp/modules/audio_processing/agc2/adaptive_mode_level_estimator_agc.h \
-	webrtc_dsp/modules/audio_processing/agc2/adaptive_digital_gain_applier.h \
-	webrtc_dsp/modules/audio_processing/agc2/vad_with_level.h \
-	webrtc_dsp/modules/audio_processing/agc2/limiter_db_gain_curve.h \
-	webrtc_dsp/modules/audio_processing/agc2/fixed_digital_level_estimator.h \
-	webrtc_dsp/modules/audio_processing/agc2/adaptive_agc.h \
-	webrtc_dsp/modules/audio_processing/agc2/gain_applier.h \
-	webrtc_dsp/modules/audio_processing/agc2/noise_level_estimator.h \
-	webrtc_dsp/modules/audio_processing/agc2/compute_interpolated_gain_curve.h \
-	webrtc_dsp/modules/audio_processing/agc2/noise_spectrum_estimator.h \
-	webrtc_dsp/modules/audio_processing/agc2/limiter.h \
-	webrtc_dsp/modules/audio_processing/transient/transient_detector.h \
-	webrtc_dsp/modules/audio_processing/transient/transient_suppressor.h \
-	webrtc_dsp/modules/audio_processing/transient/daubechies_8_wavelet_coeffs.h \
-	webrtc_dsp/modules/audio_processing/transient/common.h \
-	webrtc_dsp/modules/audio_processing/transient/wpd_node.h \
-	webrtc_dsp/modules/audio_processing/transient/moving_moments.h \
-	webrtc_dsp/modules/audio_processing/transient/wpd_tree.h \
-	webrtc_dsp/modules/audio_processing/transient/dyadic_decimator.h \
-	webrtc_dsp/modules/audio_processing/noise_suppression_impl.h \
-	webrtc_dsp/modules/audio_processing/aec/aec_resampler.h \
-	webrtc_dsp/modules/audio_processing/aec/echo_cancellation.h \
-	webrtc_dsp/modules/audio_processing/aec/aec_core.h \
-	webrtc_dsp/modules/audio_processing/aec/aec_core_optimized_methods.h \
-	webrtc_dsp/modules/audio_processing/aec/aec_common.h \
-	webrtc_dsp/modules/audio_processing/voice_detection_impl.h \
-	webrtc_dsp/modules/audio_processing/agc/legacy/analog_agc.h \
-	webrtc_dsp/modules/audio_processing/agc/legacy/gain_control.h \
-	webrtc_dsp/modules/audio_processing/agc/legacy/digital_agc.h \
-	webrtc_dsp/modules/audio_processing/agc/mock_agc.h \
-	webrtc_dsp/modules/audio_processing/agc/loudness_histogram.h \
-	webrtc_dsp/modules/audio_processing/agc/gain_map_internal.h \
-	webrtc_dsp/modules/audio_processing/agc/utility.h \
-	webrtc_dsp/modules/audio_processing/agc/agc_manager_direct.h \
-	webrtc_dsp/modules/audio_processing/agc/agc.h \
-	webrtc_dsp/modules/audio_processing/common.h \
-	webrtc_dsp/modules/audio_processing/audio_buffer.h \
-	webrtc_dsp/modules/audio_processing/echo_control_mobile_impl.h \
-	webrtc_dsp/modules/audio_processing/splitting_filter.h \
-	webrtc_dsp/modules/audio_processing/low_cut_filter.h \
-	webrtc_dsp/modules/audio_processing/audio_generator/file_audio_generator.h \
-	webrtc_dsp/modules/audio_processing/three_band_filter_bank.h \
-	webrtc_dsp/modules/audio_processing/echo_cancellation_impl.h \
-	webrtc_dsp/modules/audio_processing/level_estimator_impl.h \
-	webrtc_dsp/modules/audio_processing/gain_controller2.h \
-	webrtc_dsp/modules/audio_processing/aecm/aecm_core.h \
-	webrtc_dsp/modules/audio_processing/aecm/aecm_defines.h \
-	webrtc_dsp/modules/audio_processing/aecm/echo_control_mobile.h \
-	webrtc_dsp/modules/audio_processing/aec3/downsampled_render_buffer.h \
-	webrtc_dsp/modules/audio_processing/aec3/subtractor_output_analyzer.h \
-	webrtc_dsp/modules/audio_processing/aec3/residual_echo_estimator.h \
-	webrtc_dsp/modules/audio_processing/aec3/shadow_filter_update_gain.h \
-	webrtc_dsp/modules/audio_processing/aec3/aec_state.h \
-	webrtc_dsp/modules/audio_processing/aec3/suppression_filter.h \
-	webrtc_dsp/modules/audio_processing/aec3/block_delay_buffer.h \
-	webrtc_dsp/modules/audio_processing/aec3/adaptive_fir_filter.h \
-	webrtc_dsp/modules/audio_processing/aec3/cascaded_biquad_filter.h \
-	webrtc_dsp/modules/audio_processing/aec3/matched_filter.h \
-	webrtc_dsp/modules/audio_processing/aec3/subtractor_output.h \
-	webrtc_dsp/modules/audio_processing/aec3/render_signal_analyzer.h \
-	webrtc_dsp/modules/audio_processing/aec3/aec3_fft.h \
-	webrtc_dsp/modules/audio_processing/aec3/echo_remover_metrics.h \
-	webrtc_dsp/modules/audio_processing/aec3/filter_analyzer.h \
-	webrtc_dsp/modules/audio_processing/aec3/subtractor.h \
-	webrtc_dsp/modules/audio_processing/aec3/echo_path_delay_estimator.h \
-	webrtc_dsp/modules/audio_processing/aec3/block_processor_metrics.h \
-	webrtc_dsp/modules/audio_processing/aec3/fft_data.h \
-	webrtc_dsp/modules/audio_processing/aec3/render_delay_controller_metrics.h \
-	webrtc_dsp/modules/audio_processing/aec3/comfort_noise_generator.h \
-	webrtc_dsp/modules/audio_processing/aec3/erl_estimator.h \
-	webrtc_dsp/modules/audio_processing/aec3/echo_remover.h \
-	webrtc_dsp/modules/audio_processing/aec3/matrix_buffer.h \
-	webrtc_dsp/modules/audio_processing/aec3/reverb_model_estimator.h \
-	webrtc_dsp/modules/audio_processing/aec3/echo_path_variability.h \
-	webrtc_dsp/modules/audio_processing/aec3/moving_average.h \
-	webrtc_dsp/modules/audio_processing/aec3/render_reverb_model.h \
-	webrtc_dsp/modules/audio_processing/aec3/render_delay_controller.h \
-	webrtc_dsp/modules/audio_processing/aec3/suppression_gain.h \
-	webrtc_dsp/modules/audio_processing/aec3/erle_estimator.h \
-	webrtc_dsp/modules/audio_processing/aec3/subband_erle_estimator.h \
-	webrtc_dsp/modules/audio_processing/aec3/block_processor.h \
-	webrtc_dsp/modules/audio_processing/aec3/fullband_erle_estimator.h \
-	webrtc_dsp/modules/audio_processing/aec3/stationarity_estimator.h \
-	webrtc_dsp/modules/audio_processing/aec3/echo_canceller3.h \
-	webrtc_dsp/modules/audio_processing/aec3/skew_estimator.h \
-	webrtc_dsp/modules/audio_processing/aec3/render_buffer.h \
-	webrtc_dsp/modules/audio_processing/aec3/reverb_model_fallback.h \
-	webrtc_dsp/modules/audio_processing/aec3/vector_buffer.h \
-	webrtc_dsp/modules/audio_processing/aec3/reverb_frequency_response.h \
-	webrtc_dsp/modules/audio_processing/aec3/echo_audibility.h \
-	webrtc_dsp/modules/audio_processing/aec3/fft_buffer.h \
-	webrtc_dsp/modules/audio_processing/aec3/aec3_common.h \
-	webrtc_dsp/modules/audio_processing/aec3/vector_math.h \
-	webrtc_dsp/modules/audio_processing/aec3/decimator.h \
-	webrtc_dsp/modules/audio_processing/aec3/frame_blocker.h \
-	webrtc_dsp/modules/audio_processing/aec3/block_framer.h \
-	webrtc_dsp/modules/audio_processing/aec3/suppression_gain_limiter.h \
-	webrtc_dsp/modules/audio_processing/aec3/delay_estimate.h \
-	webrtc_dsp/modules/audio_processing/aec3/reverb_model.h \
-	webrtc_dsp/modules/audio_processing/aec3/main_filter_update_gain.h \
-	webrtc_dsp/modules/audio_processing/aec3/matched_filter_lag_aggregator.h \
-	webrtc_dsp/modules/audio_processing/aec3/reverb_decay_estimator.h \
-	webrtc_dsp/modules/audio_processing/aec3/render_delay_buffer.h \
-	webrtc_dsp/modules/audio_processing/gain_control_impl.h \
-	webrtc_dsp/modules/audio_processing/typing_detection.h \
-	webrtc_dsp/modules/audio_processing/logging/apm_data_dumper.h \
-	webrtc_dsp/modules/audio_processing/vad/vad_audio_proc_internal.h \
-	webrtc_dsp/modules/audio_processing/vad/vad_circular_buffer.h \
-	webrtc_dsp/modules/audio_processing/vad/pitch_based_vad.h \
-	webrtc_dsp/modules/audio_processing/vad/pole_zero_filter.h \
-	webrtc_dsp/modules/audio_processing/vad/gmm.h \
-	webrtc_dsp/modules/audio_processing/vad/common.h \
-	webrtc_dsp/modules/audio_processing/vad/vad_audio_proc.h \
-	webrtc_dsp/modules/audio_processing/vad/voice_gmm_tables.h \
-	webrtc_dsp/modules/audio_processing/vad/noise_gmm_tables.h \
-	webrtc_dsp/modules/audio_processing/vad/pitch_internal.h \
-	webrtc_dsp/modules/audio_processing/vad/standalone_vad.h \
-	webrtc_dsp/modules/audio_processing/vad/voice_activity_detector.h \
-	webrtc_dsp/modules/audio_processing/utility/ooura_fft_tables_neon_sse2.h \
-	webrtc_dsp/modules/audio_processing/utility/delay_estimator_internal.h \
-	webrtc_dsp/modules/audio_processing/utility/ooura_fft.h \
-	webrtc_dsp/modules/audio_processing/utility/block_mean_calculator.h \
-	webrtc_dsp/modules/audio_processing/utility/delay_estimator.h \
-	webrtc_dsp/modules/audio_processing/utility/ooura_fft_tables_common.h \
-	webrtc_dsp/modules/audio_processing/utility/delay_estimator_wrapper.h \
-	webrtc_dsp/common_audio/mocks/mock_smoothing_filter.h \
-	webrtc_dsp/common_audio/wav_file.h \
-	webrtc_dsp/common_audio/sparse_fir_filter.h \
-	webrtc_dsp/common_audio/fir_filter_sse.h \
-	webrtc_dsp/common_audio/window_generator.h \
-	webrtc_dsp/common_audio/ring_buffer.h \
-	webrtc_dsp/common_audio/fir_filter.h \
-	webrtc_dsp/common_audio/include/audio_util.h \
-	webrtc_dsp/common_audio/real_fourier_ooura.h \
-	webrtc_dsp/common_audio/smoothing_filter.h \
-	webrtc_dsp/common_audio/resampler/sinc_resampler.h \
-	webrtc_dsp/common_audio/resampler/include/push_resampler.h \
-	webrtc_dsp/common_audio/resampler/include/resampler.h \
-	webrtc_dsp/common_audio/resampler/push_sinc_resampler.h \
-	webrtc_dsp/common_audio/resampler/sinusoidal_linear_chirp_source.h \
-	webrtc_dsp/common_audio/fir_filter_factory.h \
-	webrtc_dsp/common_audio/audio_converter.h \
-	webrtc_dsp/common_audio/third_party/spl_sqrt_floor/spl_sqrt_floor.h \
-	webrtc_dsp/common_audio/third_party/fft4g/fft4g.h \
-	webrtc_dsp/common_audio/channel_buffer.h \
-	webrtc_dsp/common_audio/real_fourier.h \
-	webrtc_dsp/common_audio/fir_filter_neon.h \
-	webrtc_dsp/common_audio/fir_filter_c.h \
-	webrtc_dsp/common_audio/signal_processing/complex_fft_tables.h \
-	webrtc_dsp/common_audio/signal_processing/include/signal_processing_library.h \
-	webrtc_dsp/common_audio/signal_processing/include/real_fft.h \
-	webrtc_dsp/common_audio/signal_processing/include/spl_inl.h \
-	webrtc_dsp/common_audio/signal_processing/include/spl_inl_armv7.h \
-	webrtc_dsp/common_audio/signal_processing/dot_product_with_scale.h \
-	webrtc_dsp/common_audio/signal_processing/resample_by_2_internal.h \
-	webrtc_dsp/common_audio/wav_header.h \
-	webrtc_dsp/common_audio/vad/vad_core.h \
-	webrtc_dsp/common_audio/vad/include/vad.h \
-	webrtc_dsp/common_audio/vad/include/webrtc_vad.h \
-	webrtc_dsp/common_audio/vad/vad_gmm.h \
-	webrtc_dsp/common_audio/vad/vad_sp.h \
-	webrtc_dsp/common_audio/vad/vad_filterbank.h VoIPController.h \
-	Buffers.h BlockingQueue.h PrivateDefines.h CongestionControl.h \
-	EchoCanceller.h JitterBuffer.h logging.h threading.h \
-	MediaStreamItf.h MessageThread.h NetworkSocket.h OpusDecoder.h \
-	OpusEncoder.h PacketReassembler.h VoIPServerConfig.h \
-	audio/AudioIO.h audio/AudioInput.h audio/AudioOutput.h \
-	audio/Resampler.h os/posix/NetworkSocketPosix.h \
-	video/VideoSource.h video/VideoRenderer.h \
-	video/ScreamCongestionController.h json11.hpp utils.h \
-	os/darwin/AudioInputAudioUnit.h \
-	os/darwin/AudioOutputAudioUnit.h os/darwin/AudioUnitIO.h \
-	os/darwin/AudioInputAudioUnitOSX.h \
-	os/darwin/AudioOutputAudioUnitOSX.h os/darwin/DarwinSpecific.h \
-	os/darwin/SampleBufferDisplayLayerRenderer.h \
-	os/darwin/TGVVideoRenderer.h os/darwin/TGVVideoSource.h \
-	os/darwin/VideoToolboxEncoderSource.h \
-	os/linux/AudioInputALSA.h os/linux/AudioOutputALSA.h \
-	os/linux/AudioOutputPulse.h os/linux/AudioInputPulse.h \
-	os/linux/AudioPulse.h os/linux/PulseFunctions.h \
-	audio/AudioIOCallback.h
-am__dirstamp = $(am__leading_dot)dirstamp
-@TARGET_OS_OSX_TRUE@am__objects_1 = os/darwin/AudioInputAudioUnit.lo \
-@TARGET_OS_OSX_TRUE@	os/darwin/AudioOutputAudioUnit.lo \
-@TARGET_OS_OSX_TRUE@	os/darwin/AudioUnitIO.lo \
-@TARGET_OS_OSX_TRUE@	os/darwin/AudioInputAudioUnitOSX.lo \
-@TARGET_OS_OSX_TRUE@	os/darwin/AudioOutputAudioUnitOSX.lo \
-@TARGET_OS_OSX_TRUE@	os/darwin/DarwinSpecific.lo \
-@TARGET_OS_OSX_TRUE@	os/darwin/SampleBufferDisplayLayerRenderer.lo \
-@TARGET_OS_OSX_TRUE@	os/darwin/TGVVideoRenderer.lo \
-@TARGET_OS_OSX_TRUE@	os/darwin/TGVVideoSource.lo \
-@TARGET_OS_OSX_TRUE@	os/darwin/VideoToolboxEncoderSource.lo
-@TARGET_OS_OSX_FALSE@@WITH_ALSA_TRUE@am__objects_2 = os/linux/AudioInputALSA.lo \
-@TARGET_OS_OSX_FALSE@@WITH_ALSA_TRUE@	os/linux/AudioOutputALSA.lo
-@TARGET_OS_OSX_FALSE@@WITH_PULSE_TRUE@am__objects_3 = os/linux/AudioOutputPulse.lo \
-@TARGET_OS_OSX_FALSE@@WITH_PULSE_TRUE@	os/linux/AudioInputPulse.lo \
-@TARGET_OS_OSX_FALSE@@WITH_PULSE_TRUE@	os/linux/AudioPulse.lo
-@ENABLE_DSP_TRUE@am__objects_4 = ./webrtc_dsp/system_wrappers/source/field_trial.lo \
-@ENABLE_DSP_TRUE@	./webrtc_dsp/system_wrappers/source/metrics.lo \
-@ENABLE_DSP_TRUE@	./webrtc_dsp/system_wrappers/source/cpu_features.lo \
-@ENABLE_DSP_TRUE@	./webrtc_dsp/absl/strings/internal/memutil.lo \
-@ENABLE_DSP_TRUE@	./webrtc_dsp/absl/strings/string_view.lo \
-@ENABLE_DSP_TRUE@	./webrtc_dsp/absl/strings/ascii.lo \
-@ENABLE_DSP_TRUE@	./webrtc_dsp/absl/types/bad_optional_access.lo \
-@ENABLE_DSP_TRUE@	./webrtc_dsp/absl/types/optional.lo \
-@ENABLE_DSP_TRUE@	./webrtc_dsp/absl/base/internal/raw_logging.lo \
-@ENABLE_DSP_TRUE@	./webrtc_dsp/absl/base/internal/throw_delegate.lo \
-@ENABLE_DSP_TRUE@	./webrtc_dsp/rtc_base/race_checker.lo \
-@ENABLE_DSP_TRUE@	./webrtc_dsp/rtc_base/strings/string_builder.lo \
-@ENABLE_DSP_TRUE@	./webrtc_dsp/rtc_base/memory/aligned_malloc.lo \
-@ENABLE_DSP_TRUE@	./webrtc_dsp/rtc_base/timeutils.lo \
-@ENABLE_DSP_TRUE@	./webrtc_dsp/rtc_base/platform_file.lo \
-@ENABLE_DSP_TRUE@	./webrtc_dsp/rtc_base/string_to_number.lo \
-@ENABLE_DSP_TRUE@	./webrtc_dsp/rtc_base/thread_checker_impl.lo \
-@ENABLE_DSP_TRUE@	./webrtc_dsp/rtc_base/stringencode.lo \
-@ENABLE_DSP_TRUE@	./webrtc_dsp/rtc_base/stringutils.lo \
-@ENABLE_DSP_TRUE@	./webrtc_dsp/rtc_base/checks.lo \
-@ENABLE_DSP_TRUE@	./webrtc_dsp/rtc_base/platform_thread.lo \
-@ENABLE_DSP_TRUE@	./webrtc_dsp/rtc_base/logging_webrtc.lo \
-@ENABLE_DSP_TRUE@	./webrtc_dsp/rtc_base/criticalsection.lo \
-@ENABLE_DSP_TRUE@	./webrtc_dsp/rtc_base/platform_thread_types.lo \
-@ENABLE_DSP_TRUE@	./webrtc_dsp/rtc_base/event.lo \
-@ENABLE_DSP_TRUE@	./webrtc_dsp/rtc_base/event_tracer.lo \
-@ENABLE_DSP_TRUE@	./webrtc_dsp/third_party/rnnoise/src/rnn_vad_weights.lo \
-@ENABLE_DSP_TRUE@	./webrtc_dsp/third_party/rnnoise/src/kiss_fft.lo \
-@ENABLE_DSP_TRUE@	./webrtc_dsp/api/audio/audio_frame.lo \
-@ENABLE_DSP_TRUE@	./webrtc_dsp/api/audio/echo_canceller3_config.lo \
-@ENABLE_DSP_TRUE@	./webrtc_dsp/api/audio/echo_canceller3_factory.lo \
-@ENABLE_DSP_TRUE@	./webrtc_dsp/modules/third_party/fft/fft.lo \
-@ENABLE_DSP_TRUE@	./webrtc_dsp/modules/audio_coding/codecs/isac/main/source/pitch_estimator.lo \
-@ENABLE_DSP_TRUE@	./webrtc_dsp/modules/audio_coding/codecs/isac/main/source/lpc_shape_swb16_tables.lo \
-@ENABLE_DSP_TRUE@	./webrtc_dsp/modules/audio_coding/codecs/isac/main/source/pitch_gain_tables.lo \
-@ENABLE_DSP_TRUE@	./webrtc_dsp/modules/audio_coding/codecs/isac/main/source/arith_routines_logist.lo \
-@ENABLE_DSP_TRUE@	./webrtc_dsp/modules/audio_coding/codecs/isac/main/source/filterbanks.lo \
-@ENABLE_DSP_TRUE@	./webrtc_dsp/modules/audio_coding/codecs/isac/main/source/transform.lo \
-@ENABLE_DSP_TRUE@	./webrtc_dsp/modules/audio_coding/codecs/isac/main/source/pitch_filter.lo \
-@ENABLE_DSP_TRUE@	./webrtc_dsp/modules/audio_coding/codecs/isac/main/source/encode_lpc_swb.lo \
-@ENABLE_DSP_TRUE@	./webrtc_dsp/modules/audio_coding/codecs/isac/main/source/filter_functions.lo \
-@ENABLE_DSP_TRUE@	./webrtc_dsp/modules/audio_coding/codecs/isac/main/source/decode.lo \
-@ENABLE_DSP_TRUE@	./webrtc_dsp/modules/audio_coding/codecs/isac/main/source/lattice.lo \
-@ENABLE_DSP_TRUE@	./webrtc_dsp/modules/audio_coding/codecs/isac/main/source/intialize.lo \
-@ENABLE_DSP_TRUE@	./webrtc_dsp/modules/audio_coding/codecs/isac/main/source/lpc_tables.lo \
-@ENABLE_DSP_TRUE@	./webrtc_dsp/modules/audio_coding/codecs/isac/main/source/lpc_gain_swb_tables.lo \
-@ENABLE_DSP_TRUE@	./webrtc_dsp/modules/audio_coding/codecs/isac/main/source/bandwidth_estimator.lo \
-@ENABLE_DSP_TRUE@	./webrtc_dsp/modules/audio_coding/codecs/isac/main/source/encode.lo \
-@ENABLE_DSP_TRUE@	./webrtc_dsp/modules/audio_coding/codecs/isac/main/source/lpc_analysis.lo \
-@ENABLE_DSP_TRUE@	./webrtc_dsp/modules/audio_coding/codecs/isac/main/source/arith_routines_hist.lo \
-@ENABLE_DSP_TRUE@	./webrtc_dsp/modules/audio_coding/codecs/isac/main/source/entropy_coding.lo \
-@ENABLE_DSP_TRUE@	./webrtc_dsp/modules/audio_coding/codecs/isac/main/source/isac_vad.lo \
-@ENABLE_DSP_TRUE@	./webrtc_dsp/modules/audio_coding/codecs/isac/main/source/arith_routines.lo \
-@ENABLE_DSP_TRUE@	./webrtc_dsp/modules/audio_coding/codecs/isac/main/source/crc.lo \
-@ENABLE_DSP_TRUE@	./webrtc_dsp/modules/audio_coding/codecs/isac/main/source/lpc_shape_swb12_tables.lo \
-@ENABLE_DSP_TRUE@	./webrtc_dsp/modules/audio_coding/codecs/isac/main/source/decode_bwe.lo \
-@ENABLE_DSP_TRUE@	./webrtc_dsp/modules/audio_coding/codecs/isac/main/source/spectrum_ar_model_tables.lo \
-@ENABLE_DSP_TRUE@	./webrtc_dsp/modules/audio_coding/codecs/isac/main/source/pitch_lag_tables.lo \
-@ENABLE_DSP_TRUE@	./webrtc_dsp/modules/audio_coding/codecs/isac/main/source/isac.lo \
-@ENABLE_DSP_TRUE@	./webrtc_dsp/modules/audio_processing/rms_level.lo \
-@ENABLE_DSP_TRUE@	./webrtc_dsp/modules/audio_processing/echo_detector/normalized_covariance_estimator.lo \
-@ENABLE_DSP_TRUE@	./webrtc_dsp/modules/audio_processing/echo_detector/moving_max.lo \
-@ENABLE_DSP_TRUE@	./webrtc_dsp/modules/audio_processing/echo_detector/circular_buffer.lo \
-@ENABLE_DSP_TRUE@	./webrtc_dsp/modules/audio_processing/echo_detector/mean_variance_estimator.lo \
-@ENABLE_DSP_TRUE@	./webrtc_dsp/modules/audio_processing/splitting_filter.lo \
-@ENABLE_DSP_TRUE@	./webrtc_dsp/modules/audio_processing/gain_control_impl.lo \
-@ENABLE_DSP_TRUE@	./webrtc_dsp/modules/audio_processing/ns/nsx_core.lo \
-@ENABLE_DSP_TRUE@	./webrtc_dsp/modules/audio_processing/ns/noise_suppression_x.lo \
-@ENABLE_DSP_TRUE@	./webrtc_dsp/modules/audio_processing/ns/nsx_core_c.lo \
-@ENABLE_DSP_TRUE@	./webrtc_dsp/modules/audio_processing/ns/ns_core.lo \
-@ENABLE_DSP_TRUE@	./webrtc_dsp/modules/audio_processing/ns/noise_suppression.lo \
-@ENABLE_DSP_TRUE@	./webrtc_dsp/modules/audio_processing/audio_buffer.lo \
-@ENABLE_DSP_TRUE@	./webrtc_dsp/modules/audio_processing/typing_detection.lo \
-@ENABLE_DSP_TRUE@	./webrtc_dsp/modules/audio_processing/include/audio_processing_statistics.lo \
-@ENABLE_DSP_TRUE@	./webrtc_dsp/modules/audio_processing/include/audio_generator_factory.lo \
-@ENABLE_DSP_TRUE@	./webrtc_dsp/modules/audio_processing/include/aec_dump.lo \
-@ENABLE_DSP_TRUE@	./webrtc_dsp/modules/audio_processing/include/audio_processing.lo \
-@ENABLE_DSP_TRUE@	./webrtc_dsp/modules/audio_processing/include/config.lo \
-@ENABLE_DSP_TRUE@	./webrtc_dsp/modules/audio_processing/agc2/interpolated_gain_curve.lo \
-@ENABLE_DSP_TRUE@	./webrtc_dsp/modules/audio_processing/agc2/agc2_common.lo \
-@ENABLE_DSP_TRUE@	./webrtc_dsp/modules/audio_processing/agc2/gain_applier.lo \
-@ENABLE_DSP_TRUE@	./webrtc_dsp/modules/audio_processing/agc2/adaptive_agc.lo \
-@ENABLE_DSP_TRUE@	./webrtc_dsp/modules/audio_processing/agc2/adaptive_digital_gain_applier.lo \
-@ENABLE_DSP_TRUE@	./webrtc_dsp/modules/audio_processing/agc2/limiter.lo \
-@ENABLE_DSP_TRUE@	./webrtc_dsp/modules/audio_processing/agc2/saturation_protector.lo \
-@ENABLE_DSP_TRUE@	./webrtc_dsp/modules/audio_processing/agc2/rnn_vad/spectral_features_internal.lo \
-@ENABLE_DSP_TRUE@	./webrtc_dsp/modules/audio_processing/agc2/rnn_vad/rnn.lo \
-@ENABLE_DSP_TRUE@	./webrtc_dsp/modules/audio_processing/agc2/rnn_vad/pitch_search_internal.lo \
-@ENABLE_DSP_TRUE@	./webrtc_dsp/modules/audio_processing/agc2/rnn_vad/spectral_features.lo \
-@ENABLE_DSP_TRUE@	./webrtc_dsp/modules/audio_processing/agc2/rnn_vad/pitch_search.lo \
-@ENABLE_DSP_TRUE@	./webrtc_dsp/modules/audio_processing/agc2/rnn_vad/features_extraction.lo \
-@ENABLE_DSP_TRUE@	./webrtc_dsp/modules/audio_processing/agc2/rnn_vad/fft_util.lo \
-@ENABLE_DSP_TRUE@	./webrtc_dsp/modules/audio_processing/agc2/rnn_vad/lp_residual.lo \
-@ENABLE_DSP_TRUE@	./webrtc_dsp/modules/audio_processing/agc2/adaptive_mode_level_estimator_agc.lo \
-@ENABLE_DSP_TRUE@	./webrtc_dsp/modules/audio_processing/agc2/vector_float_frame.lo \
-@ENABLE_DSP_TRUE@	./webrtc_dsp/modules/audio_processing/agc2/noise_level_estimator.lo \
-@ENABLE_DSP_TRUE@	./webrtc_dsp/modules/audio_processing/agc2/agc2_testing_common.lo \
-@ENABLE_DSP_TRUE@	./webrtc_dsp/modules/audio_processing/agc2/fixed_digital_level_estimator.lo \
-@ENABLE_DSP_TRUE@	./webrtc_dsp/modules/audio_processing/agc2/fixed_gain_controller.lo \
-@ENABLE_DSP_TRUE@	./webrtc_dsp/modules/audio_processing/agc2/vad_with_level.lo \
-@ENABLE_DSP_TRUE@	./webrtc_dsp/modules/audio_processing/agc2/limiter_db_gain_curve.lo \
-@ENABLE_DSP_TRUE@	./webrtc_dsp/modules/audio_processing/agc2/down_sampler.lo \
-@ENABLE_DSP_TRUE@	./webrtc_dsp/modules/audio_processing/agc2/signal_classifier.lo \
-@ENABLE_DSP_TRUE@	./webrtc_dsp/modules/audio_processing/agc2/noise_spectrum_estimator.lo \
-@ENABLE_DSP_TRUE@	./webrtc_dsp/modules/audio_processing/agc2/compute_interpolated_gain_curve.lo \
-@ENABLE_DSP_TRUE@	./webrtc_dsp/modules/audio_processing/agc2/biquad_filter.lo \
-@ENABLE_DSP_TRUE@	./webrtc_dsp/modules/audio_processing/agc2/adaptive_mode_level_estimator.lo \
-@ENABLE_DSP_TRUE@	./webrtc_dsp/modules/audio_processing/transient/moving_moments.lo \
-@ENABLE_DSP_TRUE@	./webrtc_dsp/modules/audio_processing/transient/wpd_tree.lo \
-@ENABLE_DSP_TRUE@	./webrtc_dsp/modules/audio_processing/transient/wpd_node.lo \
-@ENABLE_DSP_TRUE@	./webrtc_dsp/modules/audio_processing/transient/transient_suppressor.lo \
-@ENABLE_DSP_TRUE@	./webrtc_dsp/modules/audio_processing/transient/transient_detector.lo \
-@ENABLE_DSP_TRUE@	./webrtc_dsp/modules/audio_processing/low_cut_filter.lo \
-@ENABLE_DSP_TRUE@	./webrtc_dsp/modules/audio_processing/level_estimator_impl.lo \
-@ENABLE_DSP_TRUE@	./webrtc_dsp/modules/audio_processing/three_band_filter_bank.lo \
-@ENABLE_DSP_TRUE@	./webrtc_dsp/modules/audio_processing/aec/echo_cancellation.lo \
-@ENABLE_DSP_TRUE@	./webrtc_dsp/modules/audio_processing/aec/aec_resampler.lo \
-@ENABLE_DSP_TRUE@	./webrtc_dsp/modules/audio_processing/aec/aec_core.lo \
-@ENABLE_DSP_TRUE@	./webrtc_dsp/modules/audio_processing/voice_detection_impl.lo \
-@ENABLE_DSP_TRUE@	./webrtc_dsp/modules/audio_processing/echo_cancellation_impl.lo \
-@ENABLE_DSP_TRUE@	./webrtc_dsp/modules/audio_processing/gain_control_for_experimental_agc.lo \
-@ENABLE_DSP_TRUE@	./webrtc_dsp/modules/audio_processing/agc/agc.lo \
-@ENABLE_DSP_TRUE@	./webrtc_dsp/modules/audio_processing/agc/loudness_histogram.lo \
-@ENABLE_DSP_TRUE@	./webrtc_dsp/modules/audio_processing/agc/agc_manager_direct.lo \
-@ENABLE_DSP_TRUE@	./webrtc_dsp/modules/audio_processing/agc/legacy/analog_agc.lo \
-@ENABLE_DSP_TRUE@	./webrtc_dsp/modules/audio_processing/agc/legacy/digital_agc.lo \
-@ENABLE_DSP_TRUE@	./webrtc_dsp/modules/audio_processing/agc/utility.lo \
-@ENABLE_DSP_TRUE@	./webrtc_dsp/modules/audio_processing/audio_processing_impl.lo \
-@ENABLE_DSP_TRUE@	./webrtc_dsp/modules/audio_processing/audio_generator/file_audio_generator.lo \
-@ENABLE_DSP_TRUE@	./webrtc_dsp/modules/audio_processing/gain_controller2.lo \
-@ENABLE_DSP_TRUE@	./webrtc_dsp/modules/audio_processing/residual_echo_detector.lo \
-@ENABLE_DSP_TRUE@	./webrtc_dsp/modules/audio_processing/noise_suppression_impl.lo \
-@ENABLE_DSP_TRUE@	./webrtc_dsp/modules/audio_processing/aecm/aecm_core.lo \
-@ENABLE_DSP_TRUE@	./webrtc_dsp/modules/audio_processing/aecm/aecm_core_c.lo \
-@ENABLE_DSP_TRUE@	./webrtc_dsp/modules/audio_processing/aecm/echo_control_mobile.lo \
-@ENABLE_DSP_TRUE@	./webrtc_dsp/modules/audio_processing/aec3/render_reverb_model.lo \
-@ENABLE_DSP_TRUE@	./webrtc_dsp/modules/audio_processing/aec3/reverb_model_fallback.lo \
-@ENABLE_DSP_TRUE@	./webrtc_dsp/modules/audio_processing/aec3/echo_remover_metrics.lo \
-@ENABLE_DSP_TRUE@	./webrtc_dsp/modules/audio_processing/aec3/matched_filter_lag_aggregator.lo \
-@ENABLE_DSP_TRUE@	./webrtc_dsp/modules/audio_processing/aec3/render_delay_buffer2.lo \
-@ENABLE_DSP_TRUE@	./webrtc_dsp/modules/audio_processing/aec3/echo_path_variability.lo \
-@ENABLE_DSP_TRUE@	./webrtc_dsp/modules/audio_processing/aec3/frame_blocker.lo \
-@ENABLE_DSP_TRUE@	./webrtc_dsp/modules/audio_processing/aec3/subtractor.lo \
-@ENABLE_DSP_TRUE@	./webrtc_dsp/modules/audio_processing/aec3/aec3_fft.lo \
-@ENABLE_DSP_TRUE@	./webrtc_dsp/modules/audio_processing/aec3/fullband_erle_estimator.lo \
-@ENABLE_DSP_TRUE@	./webrtc_dsp/modules/audio_processing/aec3/suppression_filter.lo \
-@ENABLE_DSP_TRUE@	./webrtc_dsp/modules/audio_processing/aec3/block_processor.lo \
-@ENABLE_DSP_TRUE@	./webrtc_dsp/modules/audio_processing/aec3/subband_erle_estimator.lo \
-@ENABLE_DSP_TRUE@	./webrtc_dsp/modules/audio_processing/aec3/render_delay_controller_metrics.lo \
-@ENABLE_DSP_TRUE@	./webrtc_dsp/modules/audio_processing/aec3/render_delay_buffer.lo \
-@ENABLE_DSP_TRUE@	./webrtc_dsp/modules/audio_processing/aec3/vector_buffer.lo \
-@ENABLE_DSP_TRUE@	./webrtc_dsp/modules/audio_processing/aec3/erl_estimator.lo \
-@ENABLE_DSP_TRUE@	./webrtc_dsp/modules/audio_processing/aec3/aec_state.lo \
-@ENABLE_DSP_TRUE@	./webrtc_dsp/modules/audio_processing/aec3/adaptive_fir_filter.lo \
-@ENABLE_DSP_TRUE@	./webrtc_dsp/modules/audio_processing/aec3/render_delay_controller.lo \
-@ENABLE_DSP_TRUE@	./webrtc_dsp/modules/audio_processing/aec3/skew_estimator.lo \
-@ENABLE_DSP_TRUE@	./webrtc_dsp/modules/audio_processing/aec3/echo_path_delay_estimator.lo \
-@ENABLE_DSP_TRUE@	./webrtc_dsp/modules/audio_processing/aec3/block_framer.lo \
-@ENABLE_DSP_TRUE@	./webrtc_dsp/modules/audio_processing/aec3/erle_estimator.lo \
-@ENABLE_DSP_TRUE@	./webrtc_dsp/modules/audio_processing/aec3/reverb_model.lo \
-@ENABLE_DSP_TRUE@	./webrtc_dsp/modules/audio_processing/aec3/cascaded_biquad_filter.lo \
-@ENABLE_DSP_TRUE@	./webrtc_dsp/modules/audio_processing/aec3/render_buffer.lo \
-@ENABLE_DSP_TRUE@	./webrtc_dsp/modules/audio_processing/aec3/subtractor_output.lo \
-@ENABLE_DSP_TRUE@	./webrtc_dsp/modules/audio_processing/aec3/stationarity_estimator.lo \
-@ENABLE_DSP_TRUE@	./webrtc_dsp/modules/audio_processing/aec3/render_signal_analyzer.lo \
-@ENABLE_DSP_TRUE@	./webrtc_dsp/modules/audio_processing/aec3/subtractor_output_analyzer.lo \
-@ENABLE_DSP_TRUE@	./webrtc_dsp/modules/audio_processing/aec3/suppression_gain.lo \
-@ENABLE_DSP_TRUE@	./webrtc_dsp/modules/audio_processing/aec3/echo_audibility.lo \
-@ENABLE_DSP_TRUE@	./webrtc_dsp/modules/audio_processing/aec3/block_processor_metrics.lo \
-@ENABLE_DSP_TRUE@	./webrtc_dsp/modules/audio_processing/aec3/moving_average.lo \
-@ENABLE_DSP_TRUE@	./webrtc_dsp/modules/audio_processing/aec3/reverb_model_estimator.lo \
-@ENABLE_DSP_TRUE@	./webrtc_dsp/modules/audio_processing/aec3/aec3_common.lo \
-@ENABLE_DSP_TRUE@	./webrtc_dsp/modules/audio_processing/aec3/residual_echo_estimator.lo \
-@ENABLE_DSP_TRUE@	./webrtc_dsp/modules/audio_processing/aec3/matched_filter.lo \
-@ENABLE_DSP_TRUE@	./webrtc_dsp/modules/audio_processing/aec3/reverb_decay_estimator.lo \
-@ENABLE_DSP_TRUE@	./webrtc_dsp/modules/audio_processing/aec3/render_delay_controller2.lo \
-@ENABLE_DSP_TRUE@	./webrtc_dsp/modules/audio_processing/aec3/suppression_gain_limiter.lo \
-@ENABLE_DSP_TRUE@	./webrtc_dsp/modules/audio_processing/aec3/main_filter_update_gain.lo \
-@ENABLE_DSP_TRUE@	./webrtc_dsp/modules/audio_processing/aec3/echo_remover.lo \
-@ENABLE_DSP_TRUE@	./webrtc_dsp/modules/audio_processing/aec3/downsampled_render_buffer.lo \
-@ENABLE_DSP_TRUE@	./webrtc_dsp/modules/audio_processing/aec3/matrix_buffer.lo \
-@ENABLE_DSP_TRUE@	./webrtc_dsp/modules/audio_processing/aec3/block_processor2.lo \
-@ENABLE_DSP_TRUE@	./webrtc_dsp/modules/audio_processing/aec3/echo_canceller3.lo \
-@ENABLE_DSP_TRUE@	./webrtc_dsp/modules/audio_processing/aec3/block_delay_buffer.lo \
-@ENABLE_DSP_TRUE@	./webrtc_dsp/modules/audio_processing/aec3/fft_buffer.lo \
-@ENABLE_DSP_TRUE@	./webrtc_dsp/modules/audio_processing/aec3/comfort_noise_generator.lo \
-@ENABLE_DSP_TRUE@	./webrtc_dsp/modules/audio_processing/aec3/shadow_filter_update_gain.lo \
-@ENABLE_DSP_TRUE@	./webrtc_dsp/modules/audio_processing/aec3/filter_analyzer.lo \
-@ENABLE_DSP_TRUE@	./webrtc_dsp/modules/audio_processing/aec3/reverb_frequency_response.lo \
-@ENABLE_DSP_TRUE@	./webrtc_dsp/modules/audio_processing/aec3/decimator.lo \
-@ENABLE_DSP_TRUE@	./webrtc_dsp/modules/audio_processing/echo_control_mobile_impl.lo \
-@ENABLE_DSP_TRUE@	./webrtc_dsp/modules/audio_processing/logging/apm_data_dumper.lo \
-@ENABLE_DSP_TRUE@	./webrtc_dsp/modules/audio_processing/vad/voice_activity_detector.lo \
-@ENABLE_DSP_TRUE@	./webrtc_dsp/modules/audio_processing/vad/standalone_vad.lo \
-@ENABLE_DSP_TRUE@	./webrtc_dsp/modules/audio_processing/vad/pitch_internal.lo \
-@ENABLE_DSP_TRUE@	./webrtc_dsp/modules/audio_processing/vad/vad_circular_buffer.lo \
-@ENABLE_DSP_TRUE@	./webrtc_dsp/modules/audio_processing/vad/vad_audio_proc.lo \
-@ENABLE_DSP_TRUE@	./webrtc_dsp/modules/audio_processing/vad/pole_zero_filter.lo \
-@ENABLE_DSP_TRUE@	./webrtc_dsp/modules/audio_processing/vad/pitch_based_vad.lo \
-@ENABLE_DSP_TRUE@	./webrtc_dsp/modules/audio_processing/vad/gmm.lo \
-@ENABLE_DSP_TRUE@	./webrtc_dsp/modules/audio_processing/utility/ooura_fft.lo \
-@ENABLE_DSP_TRUE@	./webrtc_dsp/modules/audio_processing/utility/delay_estimator_wrapper.lo \
-@ENABLE_DSP_TRUE@	./webrtc_dsp/modules/audio_processing/utility/delay_estimator.lo \
-@ENABLE_DSP_TRUE@	./webrtc_dsp/modules/audio_processing/utility/block_mean_calculator.lo \
-@ENABLE_DSP_TRUE@	./webrtc_dsp/common_audio/window_generator.lo \
-@ENABLE_DSP_TRUE@	./webrtc_dsp/common_audio/channel_buffer.lo \
-@ENABLE_DSP_TRUE@	./webrtc_dsp/common_audio/fir_filter_factory.lo \
-@ENABLE_DSP_TRUE@	./webrtc_dsp/common_audio/wav_header.lo \
-@ENABLE_DSP_TRUE@	./webrtc_dsp/common_audio/real_fourier_ooura.lo \
-@ENABLE_DSP_TRUE@	./webrtc_dsp/common_audio/audio_util.lo \
-@ENABLE_DSP_TRUE@	./webrtc_dsp/common_audio/fir_filter_sse.lo \
-@ENABLE_DSP_TRUE@	./webrtc_dsp/common_audio/resampler/push_sinc_resampler.lo \
-@ENABLE_DSP_TRUE@	./webrtc_dsp/common_audio/resampler/resampler.lo \
-@ENABLE_DSP_TRUE@	./webrtc_dsp/common_audio/resampler/sinc_resampler_sse.lo \
-@ENABLE_DSP_TRUE@	./webrtc_dsp/common_audio/resampler/push_resampler.lo \
-@ENABLE_DSP_TRUE@	./webrtc_dsp/common_audio/resampler/sinc_resampler.lo \
-@ENABLE_DSP_TRUE@	./webrtc_dsp/common_audio/resampler/sinusoidal_linear_chirp_source.lo \
-@ENABLE_DSP_TRUE@	./webrtc_dsp/common_audio/wav_file.lo \
-@ENABLE_DSP_TRUE@	./webrtc_dsp/common_audio/third_party/fft4g/fft4g.lo \
-@ENABLE_DSP_TRUE@	./webrtc_dsp/common_audio/audio_converter.lo \
-@ENABLE_DSP_TRUE@	./webrtc_dsp/common_audio/real_fourier.lo \
-@ENABLE_DSP_TRUE@	./webrtc_dsp/common_audio/sparse_fir_filter.lo \
-@ENABLE_DSP_TRUE@	./webrtc_dsp/common_audio/smoothing_filter.lo \
-@ENABLE_DSP_TRUE@	./webrtc_dsp/common_audio/fir_filter_c.lo \
-@ENABLE_DSP_TRUE@	./webrtc_dsp/common_audio/ring_buffer.lo \
-@ENABLE_DSP_TRUE@	./webrtc_dsp/common_audio/signal_processing/complex_fft.lo \
-@ENABLE_DSP_TRUE@	./webrtc_dsp/common_audio/signal_processing/filter_ma_fast_q12.lo \
-@ENABLE_DSP_TRUE@	./webrtc_dsp/common_audio/signal_processing/splitting_filter1.lo \
-@ENABLE_DSP_TRUE@	./webrtc_dsp/common_audio/signal_processing/levinson_durbin.lo \
-@ENABLE_DSP_TRUE@	./webrtc_dsp/common_audio/signal_processing/dot_product_with_scale.lo \
-@ENABLE_DSP_TRUE@	./webrtc_dsp/common_audio/signal_processing/auto_corr_to_refl_coef.lo \
-@ENABLE_DSP_TRUE@	./webrtc_dsp/common_audio/signal_processing/resample_by_2_internal.lo \
-@ENABLE_DSP_TRUE@	./webrtc_dsp/common_audio/signal_processing/energy.lo \
-@ENABLE_DSP_TRUE@	./webrtc_dsp/common_audio/signal_processing/sqrt_of_one_minus_x_squared.lo \
-@ENABLE_DSP_TRUE@	./webrtc_dsp/common_audio/signal_processing/downsample_fast.lo \
-@ENABLE_DSP_TRUE@	./webrtc_dsp/common_audio/signal_processing/filter_ar_fast_q12.lo \
-@ENABLE_DSP_TRUE@	./webrtc_dsp/common_audio/signal_processing/spl_init.lo \
-@ENABLE_DSP_TRUE@	./webrtc_dsp/common_audio/signal_processing/lpc_to_refl_coef.lo \
-@ENABLE_DSP_TRUE@	./webrtc_dsp/common_audio/signal_processing/cross_correlation.lo \
-@ENABLE_DSP_TRUE@	./webrtc_dsp/common_audio/signal_processing/division_operations.lo \
-@ENABLE_DSP_TRUE@	./webrtc_dsp/common_audio/signal_processing/auto_correlation.lo \
-@ENABLE_DSP_TRUE@	./webrtc_dsp/common_audio/signal_processing/get_scaling_square.lo \
-@ENABLE_DSP_TRUE@	./webrtc_dsp/common_audio/signal_processing/resample.lo \
-@ENABLE_DSP_TRUE@	./webrtc_dsp/common_audio/signal_processing/min_max_operations.lo \
-@ENABLE_DSP_TRUE@	./webrtc_dsp/common_audio/signal_processing/refl_coef_to_lpc.lo \
-@ENABLE_DSP_TRUE@	./webrtc_dsp/common_audio/signal_processing/filter_ar.lo \
-@ENABLE_DSP_TRUE@	./webrtc_dsp/common_audio/signal_processing/vector_scaling_operations.lo \
-@ENABLE_DSP_TRUE@	./webrtc_dsp/common_audio/signal_processing/resample_fractional.lo \
-@ENABLE_DSP_TRUE@	./webrtc_dsp/common_audio/signal_processing/real_fft.lo \
-@ENABLE_DSP_TRUE@	./webrtc_dsp/common_audio/signal_processing/ilbc_specific_functions.lo \
-@ENABLE_DSP_TRUE@	./webrtc_dsp/common_audio/signal_processing/randomization_functions.lo \
-@ENABLE_DSP_TRUE@	./webrtc_dsp/common_audio/signal_processing/copy_set_operations.lo \
-@ENABLE_DSP_TRUE@	./webrtc_dsp/common_audio/signal_processing/resample_by_2.lo \
-@ENABLE_DSP_TRUE@	./webrtc_dsp/common_audio/signal_processing/get_hanning_window.lo \
-@ENABLE_DSP_TRUE@	./webrtc_dsp/common_audio/signal_processing/resample_48khz.lo \
-@ENABLE_DSP_TRUE@	./webrtc_dsp/common_audio/signal_processing/spl_inl.lo \
-@ENABLE_DSP_TRUE@	./webrtc_dsp/common_audio/signal_processing/spl_sqrt.lo \
-@ENABLE_DSP_TRUE@	./webrtc_dsp/common_audio/vad/vad_sp.lo \
-@ENABLE_DSP_TRUE@	./webrtc_dsp/common_audio/vad/vad.lo \
-@ENABLE_DSP_TRUE@	./webrtc_dsp/common_audio/vad/webrtc_vad.lo \
-@ENABLE_DSP_TRUE@	./webrtc_dsp/common_audio/vad/vad_filterbank.lo \
-@ENABLE_DSP_TRUE@	./webrtc_dsp/common_audio/vad/vad_core.lo \
-@ENABLE_DSP_TRUE@	./webrtc_dsp/common_audio/vad/vad_gmm.lo
-@ENABLE_DSP_TRUE@@TARGET_OS_OSX_TRUE@am__objects_5 = webrtc_dsp/rtc_base/logging_mac.lo
-@ENABLE_DSP_TRUE@@TARGET_CPU_X86_TRUE@am__objects_6 = webrtc_dsp/modules/audio_processing/aec/aec_core_sse2.lo \
-@ENABLE_DSP_TRUE@@TARGET_CPU_X86_TRUE@	webrtc_dsp/modules/audio_processing/utility/ooura_fft_sse2.lo
-@ENABLE_AUDIO_CALLBACK_TRUE@@ENABLE_DSP_TRUE@am__objects_7 = audio/AudioIOCallback.lo
-@ENABLE_DSP_TRUE@@TARGET_CPU_ARM_TRUE@am__objects_8 = webrtc_dsp/common_audio/signal_processing/complex_bit_reverse_arm.lo \
-@ENABLE_DSP_TRUE@@TARGET_CPU_ARM_TRUE@	webrtc_dsp/common_audio/third_party/spl_sqrt_floor/spl_sqrt_floor_arm.lo
-@ENABLE_DSP_TRUE@@TARGET_CPU_ARMV7_TRUE@@TARGET_CPU_ARM_TRUE@am__objects_9 = webrtc_dsp/common_audio/signal_processing/cross_correlation_neon.lo \
-@ENABLE_DSP_TRUE@@TARGET_CPU_ARMV7_TRUE@@TARGET_CPU_ARM_TRUE@	webrtc_dsp/common_audio/signal_processing/downsample_fast_neon.lo \
-@ENABLE_DSP_TRUE@@TARGET_CPU_ARMV7_TRUE@@TARGET_CPU_ARM_TRUE@	webrtc_dsp/common_audio/signal_processing/min_max_operations_neon.lo \
-@ENABLE_DSP_TRUE@@TARGET_CPU_ARMV7_TRUE@@TARGET_CPU_ARM_TRUE@	webrtc_dsp/modules/audio_processing/aec/aec_core_neon.lo \
-@ENABLE_DSP_TRUE@@TARGET_CPU_ARMV7_TRUE@@TARGET_CPU_ARM_TRUE@	webrtc_dsp/modules/audio_processing/aecm/aecm_core_neon.lo \
-@ENABLE_DSP_TRUE@@TARGET_CPU_ARMV7_TRUE@@TARGET_CPU_ARM_TRUE@	webrtc_dsp/modules/audio_processing/ns/nsx_core_neon.lo \
-@ENABLE_DSP_TRUE@@TARGET_CPU_ARMV7_TRUE@@TARGET_CPU_ARM_TRUE@	webrtc_dsp/modules/audio_processing/utility/ooura_fft_neon.lo
-@ENABLE_DSP_TRUE@@TARGET_CPU_ARM_FALSE@am__objects_10 = webrtc_dsp/common_audio/signal_processing/complex_bit_reverse.lo \
-@ENABLE_DSP_TRUE@@TARGET_CPU_ARM_FALSE@	webrtc_dsp/common_audio/third_party/spl_sqrt_floor/spl_sqrt_floor.lo
-am__objects_11 =
-am__objects_12 = VoIPController.lo Buffers.lo CongestionControl.lo \
-	EchoCanceller.lo JitterBuffer.lo logging.lo MediaStreamItf.lo \
-	MessageThread.lo NetworkSocket.lo OpusDecoder.lo \
-	OpusEncoder.lo PacketReassembler.lo VoIPGroupController.lo \
-	VoIPServerConfig.lo audio/AudioIO.lo audio/AudioInput.lo \
-	audio/AudioOutput.lo audio/Resampler.lo \
-	os/posix/NetworkSocketPosix.lo video/VideoSource.lo \
-	video/VideoRenderer.lo video/ScreamCongestionController.lo \
-	json11.lo $(am__objects_1) $(am__objects_2) $(am__objects_3) \
-	$(am__objects_4) $(am__objects_5) $(am__objects_6) \
-	$(am__objects_7) $(am__objects_8) $(am__objects_9) \
-	$(am__objects_10) $(am__objects_11)
-am__objects_13 = $(am__objects_11) $(am__objects_11) $(am__objects_11) \
-	$(am__objects_11)
-am_libtgvoip_la_OBJECTS = $(am__objects_12) $(am__objects_13)
-libtgvoip_la_OBJECTS = $(am_libtgvoip_la_OBJECTS)
-AM_V_lt = $(am__v_lt_@AM_V@)
-am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
-am__v_lt_0 = --silent
-am__v_lt_1 = 
-AM_V_P = $(am__v_P_@AM_V@)
-am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
-am__v_P_0 = false
-am__v_P_1 = :
-AM_V_GEN = $(am__v_GEN_@AM_V@)
-am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
-am__v_GEN_0 = @echo "  GEN     " $@;
-am__v_GEN_1 = 
-AM_V_at = $(am__v_at_@AM_V@)
-am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
-am__v_at_0 = @
-am__v_at_1 = 
-DEFAULT_INCLUDES = -I.@am__isrc@
-depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__maybe_remake_depfiles = depfiles
-am__depfiles_remade = ./$(DEPDIR)/Buffers.Plo \
-	./$(DEPDIR)/CongestionControl.Plo \
-	./$(DEPDIR)/EchoCanceller.Plo ./$(DEPDIR)/JitterBuffer.Plo \
-	./$(DEPDIR)/MediaStreamItf.Plo ./$(DEPDIR)/MessageThread.Plo \
-	./$(DEPDIR)/NetworkSocket.Plo ./$(DEPDIR)/OpusDecoder.Plo \
-	./$(DEPDIR)/OpusEncoder.Plo ./$(DEPDIR)/PacketReassembler.Plo \
-	./$(DEPDIR)/VoIPController.Plo \
-	./$(DEPDIR)/VoIPGroupController.Plo \
-	./$(DEPDIR)/VoIPServerConfig.Plo ./$(DEPDIR)/json11.Plo \
-	./$(DEPDIR)/logging.Plo \
-	./webrtc_dsp/absl/base/internal/$(DEPDIR)/raw_logging.Plo \
-	./webrtc_dsp/absl/base/internal/$(DEPDIR)/throw_delegate.Plo \
-	./webrtc_dsp/absl/strings/$(DEPDIR)/ascii.Plo \
-	./webrtc_dsp/absl/strings/$(DEPDIR)/string_view.Plo \
-	./webrtc_dsp/absl/strings/internal/$(DEPDIR)/memutil.Plo \
-	./webrtc_dsp/absl/types/$(DEPDIR)/bad_optional_access.Plo \
-	./webrtc_dsp/absl/types/$(DEPDIR)/optional.Plo \
-	./webrtc_dsp/api/audio/$(DEPDIR)/audio_frame.Plo \
-	./webrtc_dsp/api/audio/$(DEPDIR)/echo_canceller3_config.Plo \
-	./webrtc_dsp/api/audio/$(DEPDIR)/echo_canceller3_factory.Plo \
-	./webrtc_dsp/common_audio/$(DEPDIR)/audio_converter.Plo \
-	./webrtc_dsp/common_audio/$(DEPDIR)/audio_util.Plo \
-	./webrtc_dsp/common_audio/$(DEPDIR)/channel_buffer.Plo \
-	./webrtc_dsp/common_audio/$(DEPDIR)/fir_filter_c.Plo \
-	./webrtc_dsp/common_audio/$(DEPDIR)/fir_filter_factory.Plo \
-	./webrtc_dsp/common_audio/$(DEPDIR)/fir_filter_sse.Plo \
-	./webrtc_dsp/common_audio/$(DEPDIR)/real_fourier.Plo \
-	./webrtc_dsp/common_audio/$(DEPDIR)/real_fourier_ooura.Plo \
-	./webrtc_dsp/common_audio/$(DEPDIR)/ring_buffer.Plo \
-	./webrtc_dsp/common_audio/$(DEPDIR)/smoothing_filter.Plo \
-	./webrtc_dsp/common_audio/$(DEPDIR)/sparse_fir_filter.Plo \
-	./webrtc_dsp/common_audio/$(DEPDIR)/wav_file.Plo \
-	./webrtc_dsp/common_audio/$(DEPDIR)/wav_header.Plo \
-	./webrtc_dsp/common_audio/$(DEPDIR)/window_generator.Plo \
-	./webrtc_dsp/common_audio/resampler/$(DEPDIR)/push_resampler.Plo \
-	./webrtc_dsp/common_audio/resampler/$(DEPDIR)/push_sinc_resampler.Plo \
-	./webrtc_dsp/common_audio/resampler/$(DEPDIR)/resampler.Plo \
-	./webrtc_dsp/common_audio/resampler/$(DEPDIR)/sinc_resampler.Plo \
-	./webrtc_dsp/common_audio/resampler/$(DEPDIR)/sinc_resampler_sse.Plo \
-	./webrtc_dsp/common_audio/resampler/$(DEPDIR)/sinusoidal_linear_chirp_source.Plo \
-	./webrtc_dsp/common_audio/signal_processing/$(DEPDIR)/auto_corr_to_refl_coef.Plo \
-	./webrtc_dsp/common_audio/signal_processing/$(DEPDIR)/auto_correlation.Plo \
-	./webrtc_dsp/common_audio/signal_processing/$(DEPDIR)/complex_fft.Plo \
-	./webrtc_dsp/common_audio/signal_processing/$(DEPDIR)/copy_set_operations.Plo \
-	./webrtc_dsp/common_audio/signal_processing/$(DEPDIR)/cross_correlation.Plo \
-	./webrtc_dsp/common_audio/signal_processing/$(DEPDIR)/division_operations.Plo \
-	./webrtc_dsp/common_audio/signal_processing/$(DEPDIR)/dot_product_with_scale.Plo \
-	./webrtc_dsp/common_audio/signal_processing/$(DEPDIR)/downsample_fast.Plo \
-	./webrtc_dsp/common_audio/signal_processing/$(DEPDIR)/energy.Plo \
-	./webrtc_dsp/common_audio/signal_processing/$(DEPDIR)/filter_ar.Plo \
-	./webrtc_dsp/common_audio/signal_processing/$(DEPDIR)/filter_ar_fast_q12.Plo \
-	./webrtc_dsp/common_audio/signal_processing/$(DEPDIR)/filter_ma_fast_q12.Plo \
-	./webrtc_dsp/common_audio/signal_processing/$(DEPDIR)/get_hanning_window.Plo \
-	./webrtc_dsp/common_audio/signal_processing/$(DEPDIR)/get_scaling_square.Plo \
-	./webrtc_dsp/common_audio/signal_processing/$(DEPDIR)/ilbc_specific_functions.Plo \
-	./webrtc_dsp/common_audio/signal_processing/$(DEPDIR)/levinson_durbin.Plo \
-	./webrtc_dsp/common_audio/signal_processing/$(DEPDIR)/lpc_to_refl_coef.Plo \
-	./webrtc_dsp/common_audio/signal_processing/$(DEPDIR)/min_max_operations.Plo \
-	./webrtc_dsp/common_audio/signal_processing/$(DEPDIR)/randomization_functions.Plo \
-	./webrtc_dsp/common_audio/signal_processing/$(DEPDIR)/real_fft.Plo \
-	./webrtc_dsp/common_audio/signal_processing/$(DEPDIR)/refl_coef_to_lpc.Plo \
-	./webrtc_dsp/common_audio/signal_processing/$(DEPDIR)/resample.Plo \
-	./webrtc_dsp/common_audio/signal_processing/$(DEPDIR)/resample_48khz.Plo \
-	./webrtc_dsp/common_audio/signal_processing/$(DEPDIR)/resample_by_2.Plo \
-	./webrtc_dsp/common_audio/signal_processing/$(DEPDIR)/resample_by_2_internal.Plo \
-	./webrtc_dsp/common_audio/signal_processing/$(DEPDIR)/resample_fractional.Plo \
-	./webrtc_dsp/common_audio/signal_processing/$(DEPDIR)/spl_init.Plo \
-	./webrtc_dsp/common_audio/signal_processing/$(DEPDIR)/spl_inl.Plo \
-	./webrtc_dsp/common_audio/signal_processing/$(DEPDIR)/spl_sqrt.Plo \
-	./webrtc_dsp/common_audio/signal_processing/$(DEPDIR)/splitting_filter1.Plo \
-	./webrtc_dsp/common_audio/signal_processing/$(DEPDIR)/sqrt_of_one_minus_x_squared.Plo \
-	./webrtc_dsp/common_audio/signal_processing/$(DEPDIR)/vector_scaling_operations.Plo \
-	./webrtc_dsp/common_audio/third_party/fft4g/$(DEPDIR)/fft4g.Plo \
-	./webrtc_dsp/common_audio/vad/$(DEPDIR)/vad.Plo \
-	./webrtc_dsp/common_audio/vad/$(DEPDIR)/vad_core.Plo \
-	./webrtc_dsp/common_audio/vad/$(DEPDIR)/vad_filterbank.Plo \
-	./webrtc_dsp/common_audio/vad/$(DEPDIR)/vad_gmm.Plo \
-	./webrtc_dsp/common_audio/vad/$(DEPDIR)/vad_sp.Plo \
-	./webrtc_dsp/common_audio/vad/$(DEPDIR)/webrtc_vad.Plo \
-	./webrtc_dsp/modules/audio_coding/codecs/isac/main/source/$(DEPDIR)/arith_routines.Plo \
-	./webrtc_dsp/modules/audio_coding/codecs/isac/main/source/$(DEPDIR)/arith_routines_hist.Plo \
-	./webrtc_dsp/modules/audio_coding/codecs/isac/main/source/$(DEPDIR)/arith_routines_logist.Plo \
-	./webrtc_dsp/modules/audio_coding/codecs/isac/main/source/$(DEPDIR)/bandwidth_estimator.Plo \
-	./webrtc_dsp/modules/audio_coding/codecs/isac/main/source/$(DEPDIR)/crc.Plo \
-	./webrtc_dsp/modules/audio_coding/codecs/isac/main/source/$(DEPDIR)/decode.Plo \
-	./webrtc_dsp/modules/audio_coding/codecs/isac/main/source/$(DEPDIR)/decode_bwe.Plo \
-	./webrtc_dsp/modules/audio_coding/codecs/isac/main/source/$(DEPDIR)/encode.Plo \
-	./webrtc_dsp/modules/audio_coding/codecs/isac/main/source/$(DEPDIR)/encode_lpc_swb.Plo \
-	./webrtc_dsp/modules/audio_coding/codecs/isac/main/source/$(DEPDIR)/entropy_coding.Plo \
-	./webrtc_dsp/modules/audio_coding/codecs/isac/main/source/$(DEPDIR)/filter_functions.Plo \
-	./webrtc_dsp/modules/audio_coding/codecs/isac/main/source/$(DEPDIR)/filterbanks.Plo \
-	./webrtc_dsp/modules/audio_coding/codecs/isac/main/source/$(DEPDIR)/intialize.Plo \
-	./webrtc_dsp/modules/audio_coding/codecs/isac/main/source/$(DEPDIR)/isac.Plo \
-	./webrtc_dsp/modules/audio_coding/codecs/isac/main/source/$(DEPDIR)/isac_vad.Plo \
-	./webrtc_dsp/modules/audio_coding/codecs/isac/main/source/$(DEPDIR)/lattice.Plo \
-	./webrtc_dsp/modules/audio_coding/codecs/isac/main/source/$(DEPDIR)/lpc_analysis.Plo \
-	./webrtc_dsp/modules/audio_coding/codecs/isac/main/source/$(DEPDIR)/lpc_gain_swb_tables.Plo \
-	./webrtc_dsp/modules/audio_coding/codecs/isac/main/source/$(DEPDIR)/lpc_shape_swb12_tables.Plo \
-	./webrtc_dsp/modules/audio_coding/codecs/isac/main/source/$(DEPDIR)/lpc_shape_swb16_tables.Plo \
-	./webrtc_dsp/modules/audio_coding/codecs/isac/main/source/$(DEPDIR)/lpc_tables.Plo \
-	./webrtc_dsp/modules/audio_coding/codecs/isac/main/source/$(DEPDIR)/pitch_estimator.Plo \
-	./webrtc_dsp/modules/audio_coding/codecs/isac/main/source/$(DEPDIR)/pitch_filter.Plo \
-	./webrtc_dsp/modules/audio_coding/codecs/isac/main/source/$(DEPDIR)/pitch_gain_tables.Plo \
-	./webrtc_dsp/modules/audio_coding/codecs/isac/main/source/$(DEPDIR)/pitch_lag_tables.Plo \
-	./webrtc_dsp/modules/audio_coding/codecs/isac/main/source/$(DEPDIR)/spectrum_ar_model_tables.Plo \
-	./webrtc_dsp/modules/audio_coding/codecs/isac/main/source/$(DEPDIR)/transform.Plo \
-	./webrtc_dsp/modules/audio_processing/$(DEPDIR)/audio_buffer.Plo \
-	./webrtc_dsp/modules/audio_processing/$(DEPDIR)/audio_processing_impl.Plo \
-	./webrtc_dsp/modules/audio_processing/$(DEPDIR)/echo_cancellation_impl.Plo \
-	./webrtc_dsp/modules/audio_processing/$(DEPDIR)/echo_control_mobile_impl.Plo \
-	./webrtc_dsp/modules/audio_processing/$(DEPDIR)/gain_control_for_experimental_agc.Plo \
-	./webrtc_dsp/modules/audio_processing/$(DEPDIR)/gain_control_impl.Plo \
-	./webrtc_dsp/modules/audio_processing/$(DEPDIR)/gain_controller2.Plo \
-	./webrtc_dsp/modules/audio_processing/$(DEPDIR)/level_estimator_impl.Plo \
-	./webrtc_dsp/modules/audio_processing/$(DEPDIR)/low_cut_filter.Plo \
-	./webrtc_dsp/modules/audio_processing/$(DEPDIR)/noise_suppression_impl.Plo \
-	./webrtc_dsp/modules/audio_processing/$(DEPDIR)/residual_echo_detector.Plo \
-	./webrtc_dsp/modules/audio_processing/$(DEPDIR)/rms_level.Plo \
-	./webrtc_dsp/modules/audio_processing/$(DEPDIR)/splitting_filter.Plo \
-	./webrtc_dsp/modules/audio_processing/$(DEPDIR)/three_band_filter_bank.Plo \
-	./webrtc_dsp/modules/audio_processing/$(DEPDIR)/typing_detection.Plo \
-	./webrtc_dsp/modules/audio_processing/$(DEPDIR)/voice_detection_impl.Plo \
-	./webrtc_dsp/modules/audio_processing/aec/$(DEPDIR)/aec_core.Plo \
-	./webrtc_dsp/modules/audio_processing/aec/$(DEPDIR)/aec_resampler.Plo \
-	./webrtc_dsp/modules/audio_processing/aec/$(DEPDIR)/echo_cancellation.Plo \
-	./webrtc_dsp/modules/audio_processing/aec3/$(DEPDIR)/adaptive_fir_filter.Plo \
-	./webrtc_dsp/modules/audio_processing/aec3/$(DEPDIR)/aec3_common.Plo \
-	./webrtc_dsp/modules/audio_processing/aec3/$(DEPDIR)/aec3_fft.Plo \
-	./webrtc_dsp/modules/audio_processing/aec3/$(DEPDIR)/aec_state.Plo \
-	./webrtc_dsp/modules/audio_processing/aec3/$(DEPDIR)/block_delay_buffer.Plo \
-	./webrtc_dsp/modules/audio_processing/aec3/$(DEPDIR)/block_framer.Plo \
-	./webrtc_dsp/modules/audio_processing/aec3/$(DEPDIR)/block_processor.Plo \
-	./webrtc_dsp/modules/audio_processing/aec3/$(DEPDIR)/block_processor2.Plo \
-	./webrtc_dsp/modules/audio_processing/aec3/$(DEPDIR)/block_processor_metrics.Plo \
-	./webrtc_dsp/modules/audio_processing/aec3/$(DEPDIR)/cascaded_biquad_filter.Plo \
-	./webrtc_dsp/modules/audio_processing/aec3/$(DEPDIR)/comfort_noise_generator.Plo \
-	./webrtc_dsp/modules/audio_processing/aec3/$(DEPDIR)/decimator.Plo \
-	./webrtc_dsp/modules/audio_processing/aec3/$(DEPDIR)/downsampled_render_buffer.Plo \
-	./webrtc_dsp/modules/audio_processing/aec3/$(DEPDIR)/echo_audibility.Plo \
-	./webrtc_dsp/modules/audio_processing/aec3/$(DEPDIR)/echo_canceller3.Plo \
-	./webrtc_dsp/modules/audio_processing/aec3/$(DEPDIR)/echo_path_delay_estimator.Plo \
-	./webrtc_dsp/modules/audio_processing/aec3/$(DEPDIR)/echo_path_variability.Plo \
-	./webrtc_dsp/modules/audio_processing/aec3/$(DEPDIR)/echo_remover.Plo \
-	./webrtc_dsp/modules/audio_processing/aec3/$(DEPDIR)/echo_remover_metrics.Plo \
-	./webrtc_dsp/modules/audio_processing/aec3/$(DEPDIR)/erl_estimator.Plo \
-	./webrtc_dsp/modules/audio_processing/aec3/$(DEPDIR)/erle_estimator.Plo \
-	./webrtc_dsp/modules/audio_processing/aec3/$(DEPDIR)/fft_buffer.Plo \
-	./webrtc_dsp/modules/audio_processing/aec3/$(DEPDIR)/filter_analyzer.Plo \
-	./webrtc_dsp/modules/audio_processing/aec3/$(DEPDIR)/frame_blocker.Plo \
-	./webrtc_dsp/modules/audio_processing/aec3/$(DEPDIR)/fullband_erle_estimator.Plo \
-	./webrtc_dsp/modules/audio_processing/aec3/$(DEPDIR)/main_filter_update_gain.Plo \
-	./webrtc_dsp/modules/audio_processing/aec3/$(DEPDIR)/matched_filter.Plo \
-	./webrtc_dsp/modules/audio_processing/aec3/$(DEPDIR)/matched_filter_lag_aggregator.Plo \
-	./webrtc_dsp/modules/audio_processing/aec3/$(DEPDIR)/matrix_buffer.Plo \
-	./webrtc_dsp/modules/audio_processing/aec3/$(DEPDIR)/moving_average.Plo \
-	./webrtc_dsp/modules/audio_processing/aec3/$(DEPDIR)/render_buffer.Plo \
-	./webrtc_dsp/modules/audio_processing/aec3/$(DEPDIR)/render_delay_buffer.Plo \
-	./webrtc_dsp/modules/audio_processing/aec3/$(DEPDIR)/render_delay_buffer2.Plo \
-	./webrtc_dsp/modules/audio_processing/aec3/$(DEPDIR)/render_delay_controller.Plo \
-	./webrtc_dsp/modules/audio_processing/aec3/$(DEPDIR)/render_delay_controller2.Plo \
-	./webrtc_dsp/modules/audio_processing/aec3/$(DEPDIR)/render_delay_controller_metrics.Plo \
-	./webrtc_dsp/modules/audio_processing/aec3/$(DEPDIR)/render_reverb_model.Plo \
-	./webrtc_dsp/modules/audio_processing/aec3/$(DEPDIR)/render_signal_analyzer.Plo \
-	./webrtc_dsp/modules/audio_processing/aec3/$(DEPDIR)/residual_echo_estimator.Plo \
-	./webrtc_dsp/modules/audio_processing/aec3/$(DEPDIR)/reverb_decay_estimator.Plo \
-	./webrtc_dsp/modules/audio_processing/aec3/$(DEPDIR)/reverb_frequency_response.Plo \
-	./webrtc_dsp/modules/audio_processing/aec3/$(DEPDIR)/reverb_model.Plo \
-	./webrtc_dsp/modules/audio_processing/aec3/$(DEPDIR)/reverb_model_estimator.Plo \
-	./webrtc_dsp/modules/audio_processing/aec3/$(DEPDIR)/reverb_model_fallback.Plo \
-	./webrtc_dsp/modules/audio_processing/aec3/$(DEPDIR)/shadow_filter_update_gain.Plo \
-	./webrtc_dsp/modules/audio_processing/aec3/$(DEPDIR)/skew_estimator.Plo \
-	./webrtc_dsp/modules/audio_processing/aec3/$(DEPDIR)/stationarity_estimator.Plo \
-	./webrtc_dsp/modules/audio_processing/aec3/$(DEPDIR)/subband_erle_estimator.Plo \
-	./webrtc_dsp/modules/audio_processing/aec3/$(DEPDIR)/subtractor.Plo \
-	./webrtc_dsp/modules/audio_processing/aec3/$(DEPDIR)/subtractor_output.Plo \
-	./webrtc_dsp/modules/audio_processing/aec3/$(DEPDIR)/subtractor_output_analyzer.Plo \
-	./webrtc_dsp/modules/audio_processing/aec3/$(DEPDIR)/suppression_filter.Plo \
-	./webrtc_dsp/modules/audio_processing/aec3/$(DEPDIR)/suppression_gain.Plo \
-	./webrtc_dsp/modules/audio_processing/aec3/$(DEPDIR)/suppression_gain_limiter.Plo \
-	./webrtc_dsp/modules/audio_processing/aec3/$(DEPDIR)/vector_buffer.Plo \
-	./webrtc_dsp/modules/audio_processing/aecm/$(DEPDIR)/aecm_core.Plo \
-	./webrtc_dsp/modules/audio_processing/aecm/$(DEPDIR)/aecm_core_c.Plo \
-	./webrtc_dsp/modules/audio_processing/aecm/$(DEPDIR)/echo_control_mobile.Plo \
-	./webrtc_dsp/modules/audio_processing/agc/$(DEPDIR)/agc.Plo \
-	./webrtc_dsp/modules/audio_processing/agc/$(DEPDIR)/agc_manager_direct.Plo \
-	./webrtc_dsp/modules/audio_processing/agc/$(DEPDIR)/loudness_histogram.Plo \
-	./webrtc_dsp/modules/audio_processing/agc/$(DEPDIR)/utility.Plo \
-	./webrtc_dsp/modules/audio_processing/agc/legacy/$(DEPDIR)/analog_agc.Plo \
-	./webrtc_dsp/modules/audio_processing/agc/legacy/$(DEPDIR)/digital_agc.Plo \
-	./webrtc_dsp/modules/audio_processing/agc2/$(DEPDIR)/adaptive_agc.Plo \
-	./webrtc_dsp/modules/audio_processing/agc2/$(DEPDIR)/adaptive_digital_gain_applier.Plo \
-	./webrtc_dsp/modules/audio_processing/agc2/$(DEPDIR)/adaptive_mode_level_estimator.Plo \
-	./webrtc_dsp/modules/audio_processing/agc2/$(DEPDIR)/adaptive_mode_level_estimator_agc.Plo \
-	./webrtc_dsp/modules/audio_processing/agc2/$(DEPDIR)/agc2_common.Plo \
-	./webrtc_dsp/modules/audio_processing/agc2/$(DEPDIR)/agc2_testing_common.Plo \
-	./webrtc_dsp/modules/audio_processing/agc2/$(DEPDIR)/biquad_filter.Plo \
-	./webrtc_dsp/modules/audio_processing/agc2/$(DEPDIR)/compute_interpolated_gain_curve.Plo \
-	./webrtc_dsp/modules/audio_processing/agc2/$(DEPDIR)/down_sampler.Plo \
-	./webrtc_dsp/modules/audio_processing/agc2/$(DEPDIR)/fixed_digital_level_estimator.Plo \
-	./webrtc_dsp/modules/audio_processing/agc2/$(DEPDIR)/fixed_gain_controller.Plo \
-	./webrtc_dsp/modules/audio_processing/agc2/$(DEPDIR)/gain_applier.Plo \
-	./webrtc_dsp/modules/audio_processing/agc2/$(DEPDIR)/interpolated_gain_curve.Plo \
-	./webrtc_dsp/modules/audio_processing/agc2/$(DEPDIR)/limiter.Plo \
-	./webrtc_dsp/modules/audio_processing/agc2/$(DEPDIR)/limiter_db_gain_curve.Plo \
-	./webrtc_dsp/modules/audio_processing/agc2/$(DEPDIR)/noise_level_estimator.Plo \
-	./webrtc_dsp/modules/audio_processing/agc2/$(DEPDIR)/noise_spectrum_estimator.Plo \
-	./webrtc_dsp/modules/audio_processing/agc2/$(DEPDIR)/saturation_protector.Plo \
-	./webrtc_dsp/modules/audio_processing/agc2/$(DEPDIR)/signal_classifier.Plo \
-	./webrtc_dsp/modules/audio_processing/agc2/$(DEPDIR)/vad_with_level.Plo \
-	./webrtc_dsp/modules/audio_processing/agc2/$(DEPDIR)/vector_float_frame.Plo \
-	./webrtc_dsp/modules/audio_processing/agc2/rnn_vad/$(DEPDIR)/features_extraction.Plo \
-	./webrtc_dsp/modules/audio_processing/agc2/rnn_vad/$(DEPDIR)/fft_util.Plo \
-	./webrtc_dsp/modules/audio_processing/agc2/rnn_vad/$(DEPDIR)/lp_residual.Plo \
-	./webrtc_dsp/modules/audio_processing/agc2/rnn_vad/$(DEPDIR)/pitch_search.Plo \
-	./webrtc_dsp/modules/audio_processing/agc2/rnn_vad/$(DEPDIR)/pitch_search_internal.Plo \
-	./webrtc_dsp/modules/audio_processing/agc2/rnn_vad/$(DEPDIR)/rnn.Plo \
-	./webrtc_dsp/modules/audio_processing/agc2/rnn_vad/$(DEPDIR)/spectral_features.Plo \
-	./webrtc_dsp/modules/audio_processing/agc2/rnn_vad/$(DEPDIR)/spectral_features_internal.Plo \
-	./webrtc_dsp/modules/audio_processing/audio_generator/$(DEPDIR)/file_audio_generator.Plo \
-	./webrtc_dsp/modules/audio_processing/echo_detector/$(DEPDIR)/circular_buffer.Plo \
-	./webrtc_dsp/modules/audio_processing/echo_detector/$(DEPDIR)/mean_variance_estimator.Plo \
-	./webrtc_dsp/modules/audio_processing/echo_detector/$(DEPDIR)/moving_max.Plo \
-	./webrtc_dsp/modules/audio_processing/echo_detector/$(DEPDIR)/normalized_covariance_estimator.Plo \
-	./webrtc_dsp/modules/audio_processing/include/$(DEPDIR)/aec_dump.Plo \
-	./webrtc_dsp/modules/audio_processing/include/$(DEPDIR)/audio_generator_factory.Plo \
-	./webrtc_dsp/modules/audio_processing/include/$(DEPDIR)/audio_processing.Plo \
-	./webrtc_dsp/modules/audio_processing/include/$(DEPDIR)/audio_processing_statistics.Plo \
-	./webrtc_dsp/modules/audio_processing/include/$(DEPDIR)/config.Plo \
-	./webrtc_dsp/modules/audio_processing/logging/$(DEPDIR)/apm_data_dumper.Plo \
-	./webrtc_dsp/modules/audio_processing/ns/$(DEPDIR)/noise_suppression.Plo \
-	./webrtc_dsp/modules/audio_processing/ns/$(DEPDIR)/noise_suppression_x.Plo \
-	./webrtc_dsp/modules/audio_processing/ns/$(DEPDIR)/ns_core.Plo \
-	./webrtc_dsp/modules/audio_processing/ns/$(DEPDIR)/nsx_core.Plo \
-	./webrtc_dsp/modules/audio_processing/ns/$(DEPDIR)/nsx_core_c.Plo \
-	./webrtc_dsp/modules/audio_processing/transient/$(DEPDIR)/moving_moments.Plo \
-	./webrtc_dsp/modules/audio_processing/transient/$(DEPDIR)/transient_detector.Plo \
-	./webrtc_dsp/modules/audio_processing/transient/$(DEPDIR)/transient_suppressor.Plo \
-	./webrtc_dsp/modules/audio_processing/transient/$(DEPDIR)/wpd_node.Plo \
-	./webrtc_dsp/modules/audio_processing/transient/$(DEPDIR)/wpd_tree.Plo \
-	./webrtc_dsp/modules/audio_processing/utility/$(DEPDIR)/block_mean_calculator.Plo \
-	./webrtc_dsp/modules/audio_processing/utility/$(DEPDIR)/delay_estimator.Plo \
-	./webrtc_dsp/modules/audio_processing/utility/$(DEPDIR)/delay_estimator_wrapper.Plo \
-	./webrtc_dsp/modules/audio_processing/utility/$(DEPDIR)/ooura_fft.Plo \
-	./webrtc_dsp/modules/audio_processing/vad/$(DEPDIR)/gmm.Plo \
-	./webrtc_dsp/modules/audio_processing/vad/$(DEPDIR)/pitch_based_vad.Plo \
-	./webrtc_dsp/modules/audio_processing/vad/$(DEPDIR)/pitch_internal.Plo \
-	./webrtc_dsp/modules/audio_processing/vad/$(DEPDIR)/pole_zero_filter.Plo \
-	./webrtc_dsp/modules/audio_processing/vad/$(DEPDIR)/standalone_vad.Plo \
-	./webrtc_dsp/modules/audio_processing/vad/$(DEPDIR)/vad_audio_proc.Plo \
-	./webrtc_dsp/modules/audio_processing/vad/$(DEPDIR)/vad_circular_buffer.Plo \
-	./webrtc_dsp/modules/audio_processing/vad/$(DEPDIR)/voice_activity_detector.Plo \
-	./webrtc_dsp/modules/third_party/fft/$(DEPDIR)/fft.Plo \
-	./webrtc_dsp/rtc_base/$(DEPDIR)/checks.Plo \
-	./webrtc_dsp/rtc_base/$(DEPDIR)/criticalsection.Plo \
-	./webrtc_dsp/rtc_base/$(DEPDIR)/event.Plo \
-	./webrtc_dsp/rtc_base/$(DEPDIR)/event_tracer.Plo \
-	./webrtc_dsp/rtc_base/$(DEPDIR)/logging_webrtc.Plo \
-	./webrtc_dsp/rtc_base/$(DEPDIR)/platform_file.Plo \
-	./webrtc_dsp/rtc_base/$(DEPDIR)/platform_thread.Plo \
-	./webrtc_dsp/rtc_base/$(DEPDIR)/platform_thread_types.Plo \
-	./webrtc_dsp/rtc_base/$(DEPDIR)/race_checker.Plo \
-	./webrtc_dsp/rtc_base/$(DEPDIR)/string_to_number.Plo \
-	./webrtc_dsp/rtc_base/$(DEPDIR)/stringencode.Plo \
-	./webrtc_dsp/rtc_base/$(DEPDIR)/stringutils.Plo \
-	./webrtc_dsp/rtc_base/$(DEPDIR)/thread_checker_impl.Plo \
-	./webrtc_dsp/rtc_base/$(DEPDIR)/timeutils.Plo \
-	./webrtc_dsp/rtc_base/memory/$(DEPDIR)/aligned_malloc.Plo \
-	./webrtc_dsp/rtc_base/strings/$(DEPDIR)/string_builder.Plo \
-	./webrtc_dsp/system_wrappers/source/$(DEPDIR)/cpu_features.Plo \
-	./webrtc_dsp/system_wrappers/source/$(DEPDIR)/field_trial.Plo \
-	./webrtc_dsp/system_wrappers/source/$(DEPDIR)/metrics.Plo \
-	./webrtc_dsp/third_party/rnnoise/src/$(DEPDIR)/kiss_fft.Plo \
-	./webrtc_dsp/third_party/rnnoise/src/$(DEPDIR)/rnn_vad_weights.Plo \
-	audio/$(DEPDIR)/AudioIO.Plo \
-	audio/$(DEPDIR)/AudioIOCallback.Plo \
-	audio/$(DEPDIR)/AudioInput.Plo audio/$(DEPDIR)/AudioOutput.Plo \
-	audio/$(DEPDIR)/Resampler.Plo \
-	os/darwin/$(DEPDIR)/AudioInputAudioUnit.Plo \
-	os/darwin/$(DEPDIR)/AudioInputAudioUnitOSX.Plo \
-	os/darwin/$(DEPDIR)/AudioOutputAudioUnit.Plo \
-	os/darwin/$(DEPDIR)/AudioOutputAudioUnitOSX.Plo \
-	os/darwin/$(DEPDIR)/AudioUnitIO.Plo \
-	os/darwin/$(DEPDIR)/DarwinSpecific.Plo \
-	os/darwin/$(DEPDIR)/SampleBufferDisplayLayerRenderer.Plo \
-	os/darwin/$(DEPDIR)/TGVVideoRenderer.Plo \
-	os/darwin/$(DEPDIR)/TGVVideoSource.Plo \
-	os/darwin/$(DEPDIR)/VideoToolboxEncoderSource.Plo \
-	os/linux/$(DEPDIR)/AudioInputALSA.Plo \
-	os/linux/$(DEPDIR)/AudioInputPulse.Plo \
-	os/linux/$(DEPDIR)/AudioOutputALSA.Plo \
-	os/linux/$(DEPDIR)/AudioOutputPulse.Plo \
-	os/linux/$(DEPDIR)/AudioPulse.Plo \
-	os/posix/$(DEPDIR)/NetworkSocketPosix.Plo \
-	video/$(DEPDIR)/ScreamCongestionController.Plo \
-	video/$(DEPDIR)/VideoRenderer.Plo \
-	video/$(DEPDIR)/VideoSource.Plo \
-	webrtc_dsp/common_audio/signal_processing/$(DEPDIR)/complex_bit_reverse.Plo \
-	webrtc_dsp/common_audio/signal_processing/$(DEPDIR)/complex_bit_reverse_arm.Plo \
-	webrtc_dsp/common_audio/signal_processing/$(DEPDIR)/cross_correlation_neon.Plo \
-	webrtc_dsp/common_audio/signal_processing/$(DEPDIR)/downsample_fast_neon.Plo \
-	webrtc_dsp/common_audio/signal_processing/$(DEPDIR)/min_max_operations_neon.Plo \
-	webrtc_dsp/common_audio/third_party/spl_sqrt_floor/$(DEPDIR)/spl_sqrt_floor.Plo \
-	webrtc_dsp/common_audio/third_party/spl_sqrt_floor/$(DEPDIR)/spl_sqrt_floor_arm.Plo \
-	webrtc_dsp/modules/audio_processing/aec/$(DEPDIR)/aec_core_neon.Plo \
-	webrtc_dsp/modules/audio_processing/aec/$(DEPDIR)/aec_core_sse2.Plo \
-	webrtc_dsp/modules/audio_processing/aecm/$(DEPDIR)/aecm_core_neon.Plo \
-	webrtc_dsp/modules/audio_processing/ns/$(DEPDIR)/nsx_core_neon.Plo \
-	webrtc_dsp/modules/audio_processing/utility/$(DEPDIR)/ooura_fft_neon.Plo \
-	webrtc_dsp/modules/audio_processing/utility/$(DEPDIR)/ooura_fft_sse2.Plo \
-	webrtc_dsp/rtc_base/$(DEPDIR)/logging_mac.Plo
-am__mv = mv -f
-CPPASCOMPILE = $(CCAS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CCASFLAGS) $(CCASFLAGS)
-LTCPPASCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=compile $(CCAS) $(DEFS) \
-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-	$(AM_CCASFLAGS) $(CCASFLAGS)
-AM_V_CPPAS = $(am__v_CPPAS_@AM_V@)
-am__v_CPPAS_ = $(am__v_CPPAS_@AM_DEFAULT_V@)
-am__v_CPPAS_0 = @echo "  CPPAS   " $@;
-am__v_CPPAS_1 = 
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-	$(AM_CFLAGS) $(CFLAGS)
-AM_V_CC = $(am__v_CC_@AM_V@)
-am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
-am__v_CC_0 = @echo "  CC      " $@;
-am__v_CC_1 = 
-CCLD = $(CC)
-LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-AM_V_CCLD = $(am__v_CCLD_@AM_V@)
-am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
-am__v_CCLD_0 = @echo "  CCLD    " $@;
-am__v_CCLD_1 = 
-CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \
-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-	$(AM_CXXFLAGS) $(CXXFLAGS)
-AM_V_CXX = $(am__v_CXX_@AM_V@)
-am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@)
-am__v_CXX_0 = @echo "  CXX     " $@;
-am__v_CXX_1 = 
-CXXLD = $(CXX)
-CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-AM_V_CXXLD = $(am__v_CXXLD_@AM_V@)
-am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@)
-am__v_CXXLD_0 = @echo "  CXXLD   " $@;
-am__v_CXXLD_1 = 
-OBJCXXCOMPILE = $(OBJCXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_OBJCXXFLAGS) $(OBJCXXFLAGS)
-LTOBJCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=compile $(OBJCXX) $(DEFS) \
-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-	$(AM_OBJCXXFLAGS) $(OBJCXXFLAGS)
-AM_V_OBJCXX = $(am__v_OBJCXX_@AM_V@)
-am__v_OBJCXX_ = $(am__v_OBJCXX_@AM_DEFAULT_V@)
-am__v_OBJCXX_0 = @echo "  OBJCXX  " $@;
-am__v_OBJCXX_1 = 
-OBJCXXLD = $(OBJCXX)
-OBJCXXLINK = $(LIBTOOL) $(AM_V_lt) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=link $(OBJCXXLD) $(AM_OBJCXXFLAGS) $(OBJCXXFLAGS) \
-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-AM_V_OBJCXXLD = $(am__v_OBJCXXLD_@AM_V@)
-am__v_OBJCXXLD_ = $(am__v_OBJCXXLD_@AM_DEFAULT_V@)
-am__v_OBJCXXLD_0 = @echo "  OBJCXXLD" $@;
-am__v_OBJCXXLD_1 = 
-SOURCES = $(libtgvoip_la_SOURCES)
-DIST_SOURCES = $(am__libtgvoip_la_SOURCES_DIST)
-am__can_run_installinfo = \
-  case $$AM_UPDATE_INFO_DIR in \
-    n|no|NO) false;; \
-    *) (install-info --version) >/dev/null 2>&1;; \
-  esac
-am__nobase_tgvoipinclude_HEADERS_DIST = VoIPController.h Buffers.h \
-	BlockingQueue.h PrivateDefines.h CongestionControl.h \
-	EchoCanceller.h JitterBuffer.h logging.h threading.h \
-	MediaStreamItf.h MessageThread.h NetworkSocket.h OpusDecoder.h \
-	OpusEncoder.h PacketReassembler.h VoIPServerConfig.h \
-	audio/AudioIO.h audio/AudioInput.h audio/AudioOutput.h \
-	audio/Resampler.h os/posix/NetworkSocketPosix.h \
-	video/VideoSource.h video/VideoRenderer.h \
-	video/ScreamCongestionController.h json11.hpp utils.h \
-	os/darwin/AudioInputAudioUnit.h \
-	os/darwin/AudioOutputAudioUnit.h os/darwin/AudioUnitIO.h \
-	os/darwin/AudioInputAudioUnitOSX.h \
-	os/darwin/AudioOutputAudioUnitOSX.h os/darwin/DarwinSpecific.h \
-	os/darwin/SampleBufferDisplayLayerRenderer.h \
-	os/darwin/TGVVideoRenderer.h os/darwin/TGVVideoSource.h \
-	os/darwin/VideoToolboxEncoderSource.h \
-	os/linux/AudioInputALSA.h os/linux/AudioOutputALSA.h \
-	os/linux/AudioOutputPulse.h os/linux/AudioInputPulse.h \
-	os/linux/AudioPulse.h os/linux/PulseFunctions.h \
-	audio/AudioIOCallback.h
-HEADERS = $(nobase_tgvoipinclude_HEADERS)
-am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) \
-	$(LISP)config.h.in
-# Read a list of newline-separated strings from the standard input,
-# and print each of them once, without duplicates.  Input order is
-# *not* preserved.
-am__uniquify_input = $(AWK) '\
-  BEGIN { nonempty = 0; } \
-  { items[$$0] = 1; nonempty = 1; } \
-  END { if (nonempty) { for (i in items) print i; }; } \
-'
-# Make sure the list of sources is unique.  This is necessary because,
-# e.g., the same source file might be shared among _SOURCES variables
-# for different programs/libraries.
-am__define_uniq_tagged_files = \
-  list='$(am__tagged_files)'; \
-  unique=`for i in $$list; do \
-    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-  done | $(am__uniquify_input)`
-ETAGS = etags
-CTAGS = ctags
-CSCOPE = cscope
-AM_RECURSIVE_TARGETS = cscope
-am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/config.h.in compile \
-	config.guess config.sub depcomp install-sh ltmain.sh missing
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-distdir = $(PACKAGE)-$(VERSION)
-top_distdir = $(distdir)
-am__remove_distdir = \
-  if test -d "$(distdir)"; then \
-    find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \
-      && rm -rf "$(distdir)" \
-      || { sleep 5 && rm -rf "$(distdir)"; }; \
-  else :; fi
-am__post_remove_distdir = $(am__remove_distdir)
-DIST_ARCHIVES = $(distdir).tar.gz
-GZIP_ENV = --best
-DIST_TARGETS = dist-gzip
-distuninstallcheck_listfiles = find . -type f -print
-am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \
-  | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$'
-distcleancheck_listfiles = find . -type f -print
-ACLOCAL = @ACLOCAL@
-ALLOCA = @ALLOCA@
-AMTAR = @AMTAR@
-AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
-AR = @AR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-CC = @CC@
-CCAS = @CCAS@
-CCASDEPMODE = @CCASDEPMODE@
-CCASFLAGS = @CCASFLAGS@ $(am__append_9) $(am__append_20)
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = -Wall -DHAVE_CONFIG_H -Wno-unknown-pragmas $(am__append_8) \
-	$(am__append_11) $(am__append_13) $(am__append_15) \
-	$(am__append_19) $(am__append_24)
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@ -std=gnu++0x $(CFLAGS)
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DLLTOOL = @DLLTOOL@
-DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-FGREP = @FGREP@
-GREP = @GREP@
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-LD = @LD@
-LDFLAGS = @LDFLAGS@ $(am__append_3)
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LIPO = @LIPO@
-LN_S = @LN_S@
-LTLIBOBJS = @LTLIBOBJS@
-LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
-MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
-MKDIR_P = @MKDIR_P@
-NM = @NM@
-NMEDIT = @NMEDIT@
-OBJCXX = @OBJCXX@
-OBJCXXDEPMODE = @OBJCXXDEPMODE@
-OBJCXXFLAGS = @OBJCXXFLAGS@ $(am__append_25)
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-OTOOL = @OTOOL@
-OTOOL64 = @OTOOL64@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-RANLIB = @RANLIB@
-SED = @SED@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-VERSION = @VERSION@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-ac_ct_OBJCXX = @ac_ct_OBJCXX@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-docdir = @docdir@
-dvidir = @dvidir@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-AUTOMAKE_OPTIONS = foreign
-lib_LTLIBRARIES = libtgvoip.la
-SRC = VoIPController.cpp Buffers.cpp CongestionControl.cpp \
-	EchoCanceller.cpp JitterBuffer.cpp logging.cpp \
-	MediaStreamItf.cpp MessageThread.cpp NetworkSocket.cpp \
-	OpusDecoder.cpp OpusEncoder.cpp PacketReassembler.cpp \
-	VoIPGroupController.cpp VoIPServerConfig.cpp audio/AudioIO.cpp \
-	audio/AudioInput.cpp audio/AudioOutput.cpp audio/Resampler.cpp \
-	os/posix/NetworkSocketPosix.cpp video/VideoSource.cpp \
-	video/VideoRenderer.cpp video/ScreamCongestionController.cpp \
-	json11.cpp $(am__append_1) $(am__append_4) $(am__append_6) \
-	$(am__append_10) $(am__append_12) $(am__append_14) \
-	$(am__append_16) $(am__append_18) $(am__append_21) \
-	$(am__append_22) $(am__append_23)
-TGVOIP_HDRS = VoIPController.h Buffers.h BlockingQueue.h \
-	PrivateDefines.h CongestionControl.h EchoCanceller.h \
-	JitterBuffer.h logging.h threading.h MediaStreamItf.h \
-	MessageThread.h NetworkSocket.h OpusDecoder.h OpusEncoder.h \
-	PacketReassembler.h VoIPServerConfig.h audio/AudioIO.h \
-	audio/AudioInput.h audio/AudioOutput.h audio/Resampler.h \
-	os/posix/NetworkSocketPosix.h video/VideoSource.h \
-	video/VideoRenderer.h video/ScreamCongestionController.h \
-	json11.hpp utils.h $(am__append_2) $(am__append_5) \
-	$(am__append_7) $(am__append_17)
-libtgvoip_la_SOURCES = $(SRC) $(TGVOIP_HDRS)
-tgvoipincludedir = $(includedir)/tgvoip
-nobase_tgvoipinclude_HEADERS = $(TGVOIP_HDRS)
-@TARGET_OS_OSX_TRUE@OBJCFLAGS = $(CFLAGS)
-all: config.h
-	$(MAKE) $(AM_MAKEFLAGS) all-am
-
-.SUFFIXES:
-.SUFFIXES: .S .c .cc .cpp .lo .mm .o .obj
-am--refresh: Makefile
-	@:
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      echo ' cd $(srcdir) && $(AUTOMAKE) --foreign'; \
-	      $(am__cd) $(srcdir) && $(AUTOMAKE) --foreign \
-		&& exit 0; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \
-	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    echo ' $(SHELL) ./config.status'; \
-	    $(SHELL) ./config.status;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__maybe_remake_depfiles)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__maybe_remake_depfiles);; \
-	esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	$(SHELL) ./config.status --recheck
-
-$(top_srcdir)/configure:  $(am__configure_deps)
-	$(am__cd) $(srcdir) && $(AUTOCONF)
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-	$(am__cd) $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
-$(am__aclocal_m4_deps):
-
-config.h: stamp-h1
-	@test -f $@ || rm -f stamp-h1
-	@test -f $@ || $(MAKE) $(AM_MAKEFLAGS) stamp-h1
-
-stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
-	@rm -f stamp-h1
-	cd $(top_builddir) && $(SHELL) ./config.status config.h
-$(srcdir)/config.h.in:  $(am__configure_deps) 
-	($(am__cd) $(top_srcdir) && $(AUTOHEADER))
-	rm -f stamp-h1
-	touch $@
-
-distclean-hdr:
-	-rm -f config.h stamp-h1
-
-install-libLTLIBRARIES: $(lib_LTLIBRARIES)
-	@$(NORMAL_INSTALL)
-	@list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \
-	list2=; for p in $$list; do \
-	  if test -f $$p; then \
-	    list2="$$list2 $$p"; \
-	  else :; fi; \
-	done; \
-	test -z "$$list2" || { \
-	  echo " $(MKDIR_P) '$(DESTDIR)$(libdir)'"; \
-	  $(MKDIR_P) "$(DESTDIR)$(libdir)" || exit 1; \
-	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(libdir)'"; \
-	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(libdir)"; \
-	}
-
-uninstall-libLTLIBRARIES:
-	@$(NORMAL_UNINSTALL)
-	@list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \
-	for p in $$list; do \
-	  $(am__strip_dir) \
-	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$f'"; \
-	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$f"; \
-	done
-
-clean-libLTLIBRARIES:
-	-test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
-	@list='$(lib_LTLIBRARIES)'; \
-	locs=`for p in $$list; do echo $$p; done | \
-	      sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
-	      sort -u`; \
-	test -z "$$locs" || { \
-	  echo rm -f $${locs}; \
-	  rm -f $${locs}; \
-	}
-audio/$(am__dirstamp):
-	@$(MKDIR_P) audio
-	@: > audio/$(am__dirstamp)
-audio/$(DEPDIR)/$(am__dirstamp):
-	@$(MKDIR_P) audio/$(DEPDIR)
-	@: > audio/$(DEPDIR)/$(am__dirstamp)
-audio/AudioIO.lo: audio/$(am__dirstamp) \
-	audio/$(DEPDIR)/$(am__dirstamp)
-audio/AudioInput.lo: audio/$(am__dirstamp) \
-	audio/$(DEPDIR)/$(am__dirstamp)
-audio/AudioOutput.lo: audio/$(am__dirstamp) \
-	audio/$(DEPDIR)/$(am__dirstamp)
-audio/Resampler.lo: audio/$(am__dirstamp) \
-	audio/$(DEPDIR)/$(am__dirstamp)
-os/posix/$(am__dirstamp):
-	@$(MKDIR_P) os/posix
-	@: > os/posix/$(am__dirstamp)
-os/posix/$(DEPDIR)/$(am__dirstamp):
-	@$(MKDIR_P) os/posix/$(DEPDIR)
-	@: > os/posix/$(DEPDIR)/$(am__dirstamp)
-os/posix/NetworkSocketPosix.lo: os/posix/$(am__dirstamp) \
-	os/posix/$(DEPDIR)/$(am__dirstamp)
-video/$(am__dirstamp):
-	@$(MKDIR_P) video
-	@: > video/$(am__dirstamp)
-video/$(DEPDIR)/$(am__dirstamp):
-	@$(MKDIR_P) video/$(DEPDIR)
-	@: > video/$(DEPDIR)/$(am__dirstamp)
-video/VideoSource.lo: video/$(am__dirstamp) \
-	video/$(DEPDIR)/$(am__dirstamp)
-video/VideoRenderer.lo: video/$(am__dirstamp) \
-	video/$(DEPDIR)/$(am__dirstamp)
-video/ScreamCongestionController.lo: video/$(am__dirstamp) \
-	video/$(DEPDIR)/$(am__dirstamp)
-os/darwin/$(am__dirstamp):
-	@$(MKDIR_P) os/darwin
-	@: > os/darwin/$(am__dirstamp)
-os/darwin/$(DEPDIR)/$(am__dirstamp):
-	@$(MKDIR_P) os/darwin/$(DEPDIR)
-	@: > os/darwin/$(DEPDIR)/$(am__dirstamp)
-os/darwin/AudioInputAudioUnit.lo: os/darwin/$(am__dirstamp) \
-	os/darwin/$(DEPDIR)/$(am__dirstamp)
-os/darwin/AudioOutputAudioUnit.lo: os/darwin/$(am__dirstamp) \
-	os/darwin/$(DEPDIR)/$(am__dirstamp)
-os/darwin/AudioUnitIO.lo: os/darwin/$(am__dirstamp) \
-	os/darwin/$(DEPDIR)/$(am__dirstamp)
-os/darwin/AudioInputAudioUnitOSX.lo: os/darwin/$(am__dirstamp) \
-	os/darwin/$(DEPDIR)/$(am__dirstamp)
-os/darwin/AudioOutputAudioUnitOSX.lo: os/darwin/$(am__dirstamp) \
-	os/darwin/$(DEPDIR)/$(am__dirstamp)
-os/darwin/DarwinSpecific.lo: os/darwin/$(am__dirstamp) \
-	os/darwin/$(DEPDIR)/$(am__dirstamp)
-os/darwin/SampleBufferDisplayLayerRenderer.lo:  \
-	os/darwin/$(am__dirstamp) os/darwin/$(DEPDIR)/$(am__dirstamp)
-os/darwin/TGVVideoRenderer.lo: os/darwin/$(am__dirstamp) \
-	os/darwin/$(DEPDIR)/$(am__dirstamp)
-os/darwin/TGVVideoSource.lo: os/darwin/$(am__dirstamp) \
-	os/darwin/$(DEPDIR)/$(am__dirstamp)
-os/darwin/VideoToolboxEncoderSource.lo: os/darwin/$(am__dirstamp) \
-	os/darwin/$(DEPDIR)/$(am__dirstamp)
-os/linux/$(am__dirstamp):
-	@$(MKDIR_P) os/linux
-	@: > os/linux/$(am__dirstamp)
-os/linux/$(DEPDIR)/$(am__dirstamp):
-	@$(MKDIR_P) os/linux/$(DEPDIR)
-	@: > os/linux/$(DEPDIR)/$(am__dirstamp)
-os/linux/AudioInputALSA.lo: os/linux/$(am__dirstamp) \
-	os/linux/$(DEPDIR)/$(am__dirstamp)
-os/linux/AudioOutputALSA.lo: os/linux/$(am__dirstamp) \
-	os/linux/$(DEPDIR)/$(am__dirstamp)
-os/linux/AudioOutputPulse.lo: os/linux/$(am__dirstamp) \
-	os/linux/$(DEPDIR)/$(am__dirstamp)
-os/linux/AudioInputPulse.lo: os/linux/$(am__dirstamp) \
-	os/linux/$(DEPDIR)/$(am__dirstamp)
-os/linux/AudioPulse.lo: os/linux/$(am__dirstamp) \
-	os/linux/$(DEPDIR)/$(am__dirstamp)
-webrtc_dsp/system_wrappers/source/$(am__dirstamp):
-	@$(MKDIR_P) ./webrtc_dsp/system_wrappers/source
-	@: > webrtc_dsp/system_wrappers/source/$(am__dirstamp)
-webrtc_dsp/system_wrappers/source/$(DEPDIR)/$(am__dirstamp):
-	@$(MKDIR_P) ./webrtc_dsp/system_wrappers/source/$(DEPDIR)
-	@: > webrtc_dsp/system_wrappers/source/$(DEPDIR)/$(am__dirstamp)
-./webrtc_dsp/system_wrappers/source/field_trial.lo:  \
-	webrtc_dsp/system_wrappers/source/$(am__dirstamp) \
-	webrtc_dsp/system_wrappers/source/$(DEPDIR)/$(am__dirstamp)
-./webrtc_dsp/system_wrappers/source/metrics.lo:  \
-	webrtc_dsp/system_wrappers/source/$(am__dirstamp) \
-	webrtc_dsp/system_wrappers/source/$(DEPDIR)/$(am__dirstamp)
-./webrtc_dsp/system_wrappers/source/cpu_features.lo:  \
-	webrtc_dsp/system_wrappers/source/$(am__dirstamp) \
-	webrtc_dsp/system_wrappers/source/$(DEPDIR)/$(am__dirstamp)
-webrtc_dsp/absl/strings/internal/$(am__dirstamp):
-	@$(MKDIR_P) ./webrtc_dsp/absl/strings/internal
-	@: > webrtc_dsp/absl/strings/internal/$(am__dirstamp)
-webrtc_dsp/absl/strings/internal/$(DEPDIR)/$(am__dirstamp):
-	@$(MKDIR_P) ./webrtc_dsp/absl/strings/internal/$(DEPDIR)
-	@: > webrtc_dsp/absl/strings/internal/$(DEPDIR)/$(am__dirstamp)
-./webrtc_dsp/absl/strings/internal/memutil.lo:  \
-	webrtc_dsp/absl/strings/internal/$(am__dirstamp) \
-	webrtc_dsp/absl/strings/internal/$(DEPDIR)/$(am__dirstamp)
-webrtc_dsp/absl/strings/$(am__dirstamp):
-	@$(MKDIR_P) ./webrtc_dsp/absl/strings
-	@: > webrtc_dsp/absl/strings/$(am__dirstamp)
-webrtc_dsp/absl/strings/$(DEPDIR)/$(am__dirstamp):
-	@$(MKDIR_P) ./webrtc_dsp/absl/strings/$(DEPDIR)
-	@: > webrtc_dsp/absl/strings/$(DEPDIR)/$(am__dirstamp)
-./webrtc_dsp/absl/strings/string_view.lo:  \
-	webrtc_dsp/absl/strings/$(am__dirstamp) \
-	webrtc_dsp/absl/strings/$(DEPDIR)/$(am__dirstamp)
-./webrtc_dsp/absl/strings/ascii.lo:  \
-	webrtc_dsp/absl/strings/$(am__dirstamp) \
-	webrtc_dsp/absl/strings/$(DEPDIR)/$(am__dirstamp)
-webrtc_dsp/absl/types/$(am__dirstamp):
-	@$(MKDIR_P) ./webrtc_dsp/absl/types
-	@: > webrtc_dsp/absl/types/$(am__dirstamp)
-webrtc_dsp/absl/types/$(DEPDIR)/$(am__dirstamp):
-	@$(MKDIR_P) ./webrtc_dsp/absl/types/$(DEPDIR)
-	@: > webrtc_dsp/absl/types/$(DEPDIR)/$(am__dirstamp)
-./webrtc_dsp/absl/types/bad_optional_access.lo:  \
-	webrtc_dsp/absl/types/$(am__dirstamp) \
-	webrtc_dsp/absl/types/$(DEPDIR)/$(am__dirstamp)
-./webrtc_dsp/absl/types/optional.lo:  \
-	webrtc_dsp/absl/types/$(am__dirstamp) \
-	webrtc_dsp/absl/types/$(DEPDIR)/$(am__dirstamp)
-webrtc_dsp/absl/base/internal/$(am__dirstamp):
-	@$(MKDIR_P) ./webrtc_dsp/absl/base/internal
-	@: > webrtc_dsp/absl/base/internal/$(am__dirstamp)
-webrtc_dsp/absl/base/internal/$(DEPDIR)/$(am__dirstamp):
-	@$(MKDIR_P) ./webrtc_dsp/absl/base/internal/$(DEPDIR)
-	@: > webrtc_dsp/absl/base/internal/$(DEPDIR)/$(am__dirstamp)
-./webrtc_dsp/absl/base/internal/raw_logging.lo:  \
-	webrtc_dsp/absl/base/internal/$(am__dirstamp) \
-	webrtc_dsp/absl/base/internal/$(DEPDIR)/$(am__dirstamp)
-./webrtc_dsp/absl/base/internal/throw_delegate.lo:  \
-	webrtc_dsp/absl/base/internal/$(am__dirstamp) \
-	webrtc_dsp/absl/base/internal/$(DEPDIR)/$(am__dirstamp)
-webrtc_dsp/rtc_base/$(am__dirstamp):
-	@$(MKDIR_P) ./webrtc_dsp/rtc_base
-	@: > webrtc_dsp/rtc_base/$(am__dirstamp)
-webrtc_dsp/rtc_base/$(DEPDIR)/$(am__dirstamp):
-	@$(MKDIR_P) ./webrtc_dsp/rtc_base/$(DEPDIR)
-	@: > webrtc_dsp/rtc_base/$(DEPDIR)/$(am__dirstamp)
-./webrtc_dsp/rtc_base/race_checker.lo:  \
-	webrtc_dsp/rtc_base/$(am__dirstamp) \
-	webrtc_dsp/rtc_base/$(DEPDIR)/$(am__dirstamp)
-webrtc_dsp/rtc_base/strings/$(am__dirstamp):
-	@$(MKDIR_P) ./webrtc_dsp/rtc_base/strings
-	@: > webrtc_dsp/rtc_base/strings/$(am__dirstamp)
-webrtc_dsp/rtc_base/strings/$(DEPDIR)/$(am__dirstamp):
-	@$(MKDIR_P) ./webrtc_dsp/rtc_base/strings/$(DEPDIR)
-	@: > webrtc_dsp/rtc_base/strings/$(DEPDIR)/$(am__dirstamp)
-./webrtc_dsp/rtc_base/strings/string_builder.lo:  \
-	webrtc_dsp/rtc_base/strings/$(am__dirstamp) \
-	webrtc_dsp/rtc_base/strings/$(DEPDIR)/$(am__dirstamp)
-webrtc_dsp/rtc_base/memory/$(am__dirstamp):
-	@$(MKDIR_P) ./webrtc_dsp/rtc_base/memory
-	@: > webrtc_dsp/rtc_base/memory/$(am__dirstamp)
-webrtc_dsp/rtc_base/memory/$(DEPDIR)/$(am__dirstamp):
-	@$(MKDIR_P) ./webrtc_dsp/rtc_base/memory/$(DEPDIR)
-	@: > webrtc_dsp/rtc_base/memory/$(DEPDIR)/$(am__dirstamp)
-./webrtc_dsp/rtc_base/memory/aligned_malloc.lo:  \
-	webrtc_dsp/rtc_base/memory/$(am__dirstamp) \
-	webrtc_dsp/rtc_base/memory/$(DEPDIR)/$(am__dirstamp)
-./webrtc_dsp/rtc_base/timeutils.lo:  \
-	webrtc_dsp/rtc_base/$(am__dirstamp) \
-	webrtc_dsp/rtc_base/$(DEPDIR)/$(am__dirstamp)
-./webrtc_dsp/rtc_base/platform_file.lo:  \
-	webrtc_dsp/rtc_base/$(am__dirstamp) \
-	webrtc_dsp/rtc_base/$(DEPDIR)/$(am__dirstamp)
-./webrtc_dsp/rtc_base/string_to_number.lo:  \
-	webrtc_dsp/rtc_base/$(am__dirstamp) \
-	webrtc_dsp/rtc_base/$(DEPDIR)/$(am__dirstamp)
-./webrtc_dsp/rtc_base/thread_checker_impl.lo:  \
-	webrtc_dsp/rtc_base/$(am__dirstamp) \
-	webrtc_dsp/rtc_base/$(DEPDIR)/$(am__dirstamp)
-./webrtc_dsp/rtc_base/stringencode.lo:  \
-	webrtc_dsp/rtc_base/$(am__dirstamp) \
-	webrtc_dsp/rtc_base/$(DEPDIR)/$(am__dirstamp)
-./webrtc_dsp/rtc_base/stringutils.lo:  \
-	webrtc_dsp/rtc_base/$(am__dirstamp) \
-	webrtc_dsp/rtc_base/$(DEPDIR)/$(am__dirstamp)
-./webrtc_dsp/rtc_base/checks.lo: webrtc_dsp/rtc_base/$(am__dirstamp) \
-	webrtc_dsp/rtc_base/$(DEPDIR)/$(am__dirstamp)
-./webrtc_dsp/rtc_base/platform_thread.lo:  \
-	webrtc_dsp/rtc_base/$(am__dirstamp) \
-	webrtc_dsp/rtc_base/$(DEPDIR)/$(am__dirstamp)
-./webrtc_dsp/rtc_base/logging_webrtc.lo:  \
-	webrtc_dsp/rtc_base/$(am__dirstamp) \
-	webrtc_dsp/rtc_base/$(DEPDIR)/$(am__dirstamp)
-./webrtc_dsp/rtc_base/criticalsection.lo:  \
-	webrtc_dsp/rtc_base/$(am__dirstamp) \
-	webrtc_dsp/rtc_base/$(DEPDIR)/$(am__dirstamp)
-./webrtc_dsp/rtc_base/platform_thread_types.lo:  \
-	webrtc_dsp/rtc_base/$(am__dirstamp) \
-	webrtc_dsp/rtc_base/$(DEPDIR)/$(am__dirstamp)
-./webrtc_dsp/rtc_base/event.lo: webrtc_dsp/rtc_base/$(am__dirstamp) \
-	webrtc_dsp/rtc_base/$(DEPDIR)/$(am__dirstamp)
-./webrtc_dsp/rtc_base/event_tracer.lo:  \
-	webrtc_dsp/rtc_base/$(am__dirstamp) \
-	webrtc_dsp/rtc_base/$(DEPDIR)/$(am__dirstamp)
-webrtc_dsp/third_party/rnnoise/src/$(am__dirstamp):
-	@$(MKDIR_P) ./webrtc_dsp/third_party/rnnoise/src
-	@: > webrtc_dsp/third_party/rnnoise/src/$(am__dirstamp)
-webrtc_dsp/third_party/rnnoise/src/$(DEPDIR)/$(am__dirstamp):
-	@$(MKDIR_P) ./webrtc_dsp/third_party/rnnoise/src/$(DEPDIR)
-	@: > webrtc_dsp/third_party/rnnoise/src/$(DEPDIR)/$(am__dirstamp)
-./webrtc_dsp/third_party/rnnoise/src/rnn_vad_weights.lo:  \
-	webrtc_dsp/third_party/rnnoise/src/$(am__dirstamp) \
-	webrtc_dsp/third_party/rnnoise/src/$(DEPDIR)/$(am__dirstamp)
-./webrtc_dsp/third_party/rnnoise/src/kiss_fft.lo:  \
-	webrtc_dsp/third_party/rnnoise/src/$(am__dirstamp) \
-	webrtc_dsp/third_party/rnnoise/src/$(DEPDIR)/$(am__dirstamp)
-webrtc_dsp/api/audio/$(am__dirstamp):
-	@$(MKDIR_P) ./webrtc_dsp/api/audio
-	@: > webrtc_dsp/api/audio/$(am__dirstamp)
-webrtc_dsp/api/audio/$(DEPDIR)/$(am__dirstamp):
-	@$(MKDIR_P) ./webrtc_dsp/api/audio/$(DEPDIR)
-	@: > webrtc_dsp/api/audio/$(DEPDIR)/$(am__dirstamp)
-./webrtc_dsp/api/audio/audio_frame.lo:  \
-	webrtc_dsp/api/audio/$(am__dirstamp) \
-	webrtc_dsp/api/audio/$(DEPDIR)/$(am__dirstamp)
-./webrtc_dsp/api/audio/echo_canceller3_config.lo:  \
-	webrtc_dsp/api/audio/$(am__dirstamp) \
-	webrtc_dsp/api/audio/$(DEPDIR)/$(am__dirstamp)
-./webrtc_dsp/api/audio/echo_canceller3_factory.lo:  \
-	webrtc_dsp/api/audio/$(am__dirstamp) \
-	webrtc_dsp/api/audio/$(DEPDIR)/$(am__dirstamp)
-webrtc_dsp/modules/third_party/fft/$(am__dirstamp):
-	@$(MKDIR_P) ./webrtc_dsp/modules/third_party/fft
-	@: > webrtc_dsp/modules/third_party/fft/$(am__dirstamp)
-webrtc_dsp/modules/third_party/fft/$(DEPDIR)/$(am__dirstamp):
-	@$(MKDIR_P) ./webrtc_dsp/modules/third_party/fft/$(DEPDIR)
-	@: > webrtc_dsp/modules/third_party/fft/$(DEPDIR)/$(am__dirstamp)
-./webrtc_dsp/modules/third_party/fft/fft.lo:  \
-	webrtc_dsp/modules/third_party/fft/$(am__dirstamp) \
-	webrtc_dsp/modules/third_party/fft/$(DEPDIR)/$(am__dirstamp)
-webrtc_dsp/modules/audio_coding/codecs/isac/main/source/$(am__dirstamp):
-	@$(MKDIR_P) ./webrtc_dsp/modules/audio_coding/codecs/isac/main/source
-	@: > webrtc_dsp/modules/audio_coding/codecs/isac/main/source/$(am__dirstamp)
-webrtc_dsp/modules/audio_coding/codecs/isac/main/source/$(DEPDIR)/$(am__dirstamp):
-	@$(MKDIR_P) ./webrtc_dsp/modules/audio_coding/codecs/isac/main/source/$(DEPDIR)
-	@: > webrtc_dsp/modules/audio_coding/codecs/isac/main/source/$(DEPDIR)/$(am__dirstamp)
-./webrtc_dsp/modules/audio_coding/codecs/isac/main/source/pitch_estimator.lo: webrtc_dsp/modules/audio_coding/codecs/isac/main/source/$(am__dirstamp) \
-	webrtc_dsp/modules/audio_coding/codecs/isac/main/source/$(DEPDIR)/$(am__dirstamp)
-./webrtc_dsp/modules/audio_coding/codecs/isac/main/source/lpc_shape_swb16_tables.lo: webrtc_dsp/modules/audio_coding/codecs/isac/main/source/$(am__dirstamp) \
-	webrtc_dsp/modules/audio_coding/codecs/isac/main/source/$(DEPDIR)/$(am__dirstamp)
-./webrtc_dsp/modules/audio_coding/codecs/isac/main/source/pitch_gain_tables.lo: webrtc_dsp/modules/audio_coding/codecs/isac/main/source/$(am__dirstamp) \
-	webrtc_dsp/modules/audio_coding/codecs/isac/main/source/$(DEPDIR)/$(am__dirstamp)
-./webrtc_dsp/modules/audio_coding/codecs/isac/main/source/arith_routines_logist.lo: webrtc_dsp/modules/audio_coding/codecs/isac/main/source/$(am__dirstamp) \
-	webrtc_dsp/modules/audio_coding/codecs/isac/main/source/$(DEPDIR)/$(am__dirstamp)
-./webrtc_dsp/modules/audio_coding/codecs/isac/main/source/filterbanks.lo: webrtc_dsp/modules/audio_coding/codecs/isac/main/source/$(am__dirstamp) \
-	webrtc_dsp/modules/audio_coding/codecs/isac/main/source/$(DEPDIR)/$(am__dirstamp)
-./webrtc_dsp/modules/audio_coding/codecs/isac/main/source/transform.lo: webrtc_dsp/modules/audio_coding/codecs/isac/main/source/$(am__dirstamp) \
-	webrtc_dsp/modules/audio_coding/codecs/isac/main/source/$(DEPDIR)/$(am__dirstamp)
-./webrtc_dsp/modules/audio_coding/codecs/isac/main/source/pitch_filter.lo: webrtc_dsp/modules/audio_coding/codecs/isac/main/source/$(am__dirstamp) \
-	webrtc_dsp/modules/audio_coding/codecs/isac/main/source/$(DEPDIR)/$(am__dirstamp)
-./webrtc_dsp/modules/audio_coding/codecs/isac/main/source/encode_lpc_swb.lo: webrtc_dsp/modules/audio_coding/codecs/isac/main/source/$(am__dirstamp) \
-	webrtc_dsp/modules/audio_coding/codecs/isac/main/source/$(DEPDIR)/$(am__dirstamp)
-./webrtc_dsp/modules/audio_coding/codecs/isac/main/source/filter_functions.lo: webrtc_dsp/modules/audio_coding/codecs/isac/main/source/$(am__dirstamp) \
-	webrtc_dsp/modules/audio_coding/codecs/isac/main/source/$(DEPDIR)/$(am__dirstamp)
-./webrtc_dsp/modules/audio_coding/codecs/isac/main/source/decode.lo: webrtc_dsp/modules/audio_coding/codecs/isac/main/source/$(am__dirstamp) \
-	webrtc_dsp/modules/audio_coding/codecs/isac/main/source/$(DEPDIR)/$(am__dirstamp)
-./webrtc_dsp/modules/audio_coding/codecs/isac/main/source/lattice.lo: webrtc_dsp/modules/audio_coding/codecs/isac/main/source/$(am__dirstamp) \
-	webrtc_dsp/modules/audio_coding/codecs/isac/main/source/$(DEPDIR)/$(am__dirstamp)
-./webrtc_dsp/modules/audio_coding/codecs/isac/main/source/intialize.lo: webrtc_dsp/modules/audio_coding/codecs/isac/main/source/$(am__dirstamp) \
-	webrtc_dsp/modules/audio_coding/codecs/isac/main/source/$(DEPDIR)/$(am__dirstamp)
-./webrtc_dsp/modules/audio_coding/codecs/isac/main/source/lpc_tables.lo: webrtc_dsp/modules/audio_coding/codecs/isac/main/source/$(am__dirstamp) \
-	webrtc_dsp/modules/audio_coding/codecs/isac/main/source/$(DEPDIR)/$(am__dirstamp)
-./webrtc_dsp/modules/audio_coding/codecs/isac/main/source/lpc_gain_swb_tables.lo: webrtc_dsp/modules/audio_coding/codecs/isac/main/source/$(am__dirstamp) \
-	webrtc_dsp/modules/audio_coding/codecs/isac/main/source/$(DEPDIR)/$(am__dirstamp)
-./webrtc_dsp/modules/audio_coding/codecs/isac/main/source/bandwidth_estimator.lo: webrtc_dsp/modules/audio_coding/codecs/isac/main/source/$(am__dirstamp) \
-	webrtc_dsp/modules/audio_coding/codecs/isac/main/source/$(DEPDIR)/$(am__dirstamp)
-./webrtc_dsp/modules/audio_coding/codecs/isac/main/source/encode.lo: webrtc_dsp/modules/audio_coding/codecs/isac/main/source/$(am__dirstamp) \
-	webrtc_dsp/modules/audio_coding/codecs/isac/main/source/$(DEPDIR)/$(am__dirstamp)
-./webrtc_dsp/modules/audio_coding/codecs/isac/main/source/lpc_analysis.lo: webrtc_dsp/modules/audio_coding/codecs/isac/main/source/$(am__dirstamp) \
-	webrtc_dsp/modules/audio_coding/codecs/isac/main/source/$(DEPDIR)/$(am__dirstamp)
-./webrtc_dsp/modules/audio_coding/codecs/isac/main/source/arith_routines_hist.lo: webrtc_dsp/modules/audio_coding/codecs/isac/main/source/$(am__dirstamp) \
-	webrtc_dsp/modules/audio_coding/codecs/isac/main/source/$(DEPDIR)/$(am__dirstamp)
-./webrtc_dsp/modules/audio_coding/codecs/isac/main/source/entropy_coding.lo: webrtc_dsp/modules/audio_coding/codecs/isac/main/source/$(am__dirstamp) \
-	webrtc_dsp/modules/audio_coding/codecs/isac/main/source/$(DEPDIR)/$(am__dirstamp)
-./webrtc_dsp/modules/audio_coding/codecs/isac/main/source/isac_vad.lo: webrtc_dsp/modules/audio_coding/codecs/isac/main/source/$(am__dirstamp) \
-	webrtc_dsp/modules/audio_coding/codecs/isac/main/source/$(DEPDIR)/$(am__dirstamp)
-./webrtc_dsp/modules/audio_coding/codecs/isac/main/source/arith_routines.lo: webrtc_dsp/modules/audio_coding/codecs/isac/main/source/$(am__dirstamp) \
-	webrtc_dsp/modules/audio_coding/codecs/isac/main/source/$(DEPDIR)/$(am__dirstamp)
-./webrtc_dsp/modules/audio_coding/codecs/isac/main/source/crc.lo: webrtc_dsp/modules/audio_coding/codecs/isac/main/source/$(am__dirstamp) \
-	webrtc_dsp/modules/audio_coding/codecs/isac/main/source/$(DEPDIR)/$(am__dirstamp)
-./webrtc_dsp/modules/audio_coding/codecs/isac/main/source/lpc_shape_swb12_tables.lo: webrtc_dsp/modules/audio_coding/codecs/isac/main/source/$(am__dirstamp) \
-	webrtc_dsp/modules/audio_coding/codecs/isac/main/source/$(DEPDIR)/$(am__dirstamp)
-./webrtc_dsp/modules/audio_coding/codecs/isac/main/source/decode_bwe.lo: webrtc_dsp/modules/audio_coding/codecs/isac/main/source/$(am__dirstamp) \
-	webrtc_dsp/modules/audio_coding/codecs/isac/main/source/$(DEPDIR)/$(am__dirstamp)
-./webrtc_dsp/modules/audio_coding/codecs/isac/main/source/spectrum_ar_model_tables.lo: webrtc_dsp/modules/audio_coding/codecs/isac/main/source/$(am__dirstamp) \
-	webrtc_dsp/modules/audio_coding/codecs/isac/main/source/$(DEPDIR)/$(am__dirstamp)
-./webrtc_dsp/modules/audio_coding/codecs/isac/main/source/pitch_lag_tables.lo: webrtc_dsp/modules/audio_coding/codecs/isac/main/source/$(am__dirstamp) \
-	webrtc_dsp/modules/audio_coding/codecs/isac/main/source/$(DEPDIR)/$(am__dirstamp)
-./webrtc_dsp/modules/audio_coding/codecs/isac/main/source/isac.lo: webrtc_dsp/modules/audio_coding/codecs/isac/main/source/$(am__dirstamp) \
-	webrtc_dsp/modules/audio_coding/codecs/isac/main/source/$(DEPDIR)/$(am__dirstamp)
-webrtc_dsp/modules/audio_processing/$(am__dirstamp):
-	@$(MKDIR_P) ./webrtc_dsp/modules/audio_processing
-	@: > webrtc_dsp/modules/audio_processing/$(am__dirstamp)
-webrtc_dsp/modules/audio_processing/$(DEPDIR)/$(am__dirstamp):
-	@$(MKDIR_P) ./webrtc_dsp/modules/audio_processing/$(DEPDIR)
-	@: > webrtc_dsp/modules/audio_processing/$(DEPDIR)/$(am__dirstamp)
-./webrtc_dsp/modules/audio_processing/rms_level.lo:  \
-	webrtc_dsp/modules/audio_processing/$(am__dirstamp) \
-	webrtc_dsp/modules/audio_processing/$(DEPDIR)/$(am__dirstamp)
-webrtc_dsp/modules/audio_processing/echo_detector/$(am__dirstamp):
-	@$(MKDIR_P) ./webrtc_dsp/modules/audio_processing/echo_detector
-	@: > webrtc_dsp/modules/audio_processing/echo_detector/$(am__dirstamp)
-webrtc_dsp/modules/audio_processing/echo_detector/$(DEPDIR)/$(am__dirstamp):
-	@$(MKDIR_P) ./webrtc_dsp/modules/audio_processing/echo_detector/$(DEPDIR)
-	@: > webrtc_dsp/modules/audio_processing/echo_detector/$(DEPDIR)/$(am__dirstamp)
-./webrtc_dsp/modules/audio_processing/echo_detector/normalized_covariance_estimator.lo: webrtc_dsp/modules/audio_processing/echo_detector/$(am__dirstamp) \
-	webrtc_dsp/modules/audio_processing/echo_detector/$(DEPDIR)/$(am__dirstamp)
-./webrtc_dsp/modules/audio_processing/echo_detector/moving_max.lo: webrtc_dsp/modules/audio_processing/echo_detector/$(am__dirstamp) \
-	webrtc_dsp/modules/audio_processing/echo_detector/$(DEPDIR)/$(am__dirstamp)
-./webrtc_dsp/modules/audio_processing/echo_detector/circular_buffer.lo: webrtc_dsp/modules/audio_processing/echo_detector/$(am__dirstamp) \
-	webrtc_dsp/modules/audio_processing/echo_detector/$(DEPDIR)/$(am__dirstamp)
-./webrtc_dsp/modules/audio_processing/echo_detector/mean_variance_estimator.lo: webrtc_dsp/modules/audio_processing/echo_detector/$(am__dirstamp) \
-	webrtc_dsp/modules/audio_processing/echo_detector/$(DEPDIR)/$(am__dirstamp)
-./webrtc_dsp/modules/audio_processing/splitting_filter.lo:  \
-	webrtc_dsp/modules/audio_processing/$(am__dirstamp) \
-	webrtc_dsp/modules/audio_processing/$(DEPDIR)/$(am__dirstamp)
-./webrtc_dsp/modules/audio_processing/gain_control_impl.lo:  \
-	webrtc_dsp/modules/audio_processing/$(am__dirstamp) \
-	webrtc_dsp/modules/audio_processing/$(DEPDIR)/$(am__dirstamp)
-webrtc_dsp/modules/audio_processing/ns/$(am__dirstamp):
-	@$(MKDIR_P) ./webrtc_dsp/modules/audio_processing/ns
-	@: > webrtc_dsp/modules/audio_processing/ns/$(am__dirstamp)
-webrtc_dsp/modules/audio_processing/ns/$(DEPDIR)/$(am__dirstamp):
-	@$(MKDIR_P) ./webrtc_dsp/modules/audio_processing/ns/$(DEPDIR)
-	@: > webrtc_dsp/modules/audio_processing/ns/$(DEPDIR)/$(am__dirstamp)
-./webrtc_dsp/modules/audio_processing/ns/nsx_core.lo:  \
-	webrtc_dsp/modules/audio_processing/ns/$(am__dirstamp) \
-	webrtc_dsp/modules/audio_processing/ns/$(DEPDIR)/$(am__dirstamp)
-./webrtc_dsp/modules/audio_processing/ns/noise_suppression_x.lo:  \
-	webrtc_dsp/modules/audio_processing/ns/$(am__dirstamp) \
-	webrtc_dsp/modules/audio_processing/ns/$(DEPDIR)/$(am__dirstamp)
-./webrtc_dsp/modules/audio_processing/ns/nsx_core_c.lo:  \
-	webrtc_dsp/modules/audio_processing/ns/$(am__dirstamp) \
-	webrtc_dsp/modules/audio_processing/ns/$(DEPDIR)/$(am__dirstamp)
-./webrtc_dsp/modules/audio_processing/ns/ns_core.lo:  \
-	webrtc_dsp/modules/audio_processing/ns/$(am__dirstamp) \
-	webrtc_dsp/modules/audio_processing/ns/$(DEPDIR)/$(am__dirstamp)
-./webrtc_dsp/modules/audio_processing/ns/noise_suppression.lo:  \
-	webrtc_dsp/modules/audio_processing/ns/$(am__dirstamp) \
-	webrtc_dsp/modules/audio_processing/ns/$(DEPDIR)/$(am__dirstamp)
-./webrtc_dsp/modules/audio_processing/audio_buffer.lo:  \
-	webrtc_dsp/modules/audio_processing/$(am__dirstamp) \
-	webrtc_dsp/modules/audio_processing/$(DEPDIR)/$(am__dirstamp)
-./webrtc_dsp/modules/audio_processing/typing_detection.lo:  \
-	webrtc_dsp/modules/audio_processing/$(am__dirstamp) \
-	webrtc_dsp/modules/audio_processing/$(DEPDIR)/$(am__dirstamp)
-webrtc_dsp/modules/audio_processing/include/$(am__dirstamp):
-	@$(MKDIR_P) ./webrtc_dsp/modules/audio_processing/include
-	@: > webrtc_dsp/modules/audio_processing/include/$(am__dirstamp)
-webrtc_dsp/modules/audio_processing/include/$(DEPDIR)/$(am__dirstamp):
-	@$(MKDIR_P) ./webrtc_dsp/modules/audio_processing/include/$(DEPDIR)
-	@: > webrtc_dsp/modules/audio_processing/include/$(DEPDIR)/$(am__dirstamp)
-./webrtc_dsp/modules/audio_processing/include/audio_processing_statistics.lo:  \
-	webrtc_dsp/modules/audio_processing/include/$(am__dirstamp) \
-	webrtc_dsp/modules/audio_processing/include/$(DEPDIR)/$(am__dirstamp)
-./webrtc_dsp/modules/audio_processing/include/audio_generator_factory.lo:  \
-	webrtc_dsp/modules/audio_processing/include/$(am__dirstamp) \
-	webrtc_dsp/modules/audio_processing/include/$(DEPDIR)/$(am__dirstamp)
-./webrtc_dsp/modules/audio_processing/include/aec_dump.lo:  \
-	webrtc_dsp/modules/audio_processing/include/$(am__dirstamp) \
-	webrtc_dsp/modules/audio_processing/include/$(DEPDIR)/$(am__dirstamp)
-./webrtc_dsp/modules/audio_processing/include/audio_processing.lo:  \
-	webrtc_dsp/modules/audio_processing/include/$(am__dirstamp) \
-	webrtc_dsp/modules/audio_processing/include/$(DEPDIR)/$(am__dirstamp)
-./webrtc_dsp/modules/audio_processing/include/config.lo:  \
-	webrtc_dsp/modules/audio_processing/include/$(am__dirstamp) \
-	webrtc_dsp/modules/audio_processing/include/$(DEPDIR)/$(am__dirstamp)
-webrtc_dsp/modules/audio_processing/agc2/$(am__dirstamp):
-	@$(MKDIR_P) ./webrtc_dsp/modules/audio_processing/agc2
-	@: > webrtc_dsp/modules/audio_processing/agc2/$(am__dirstamp)
-webrtc_dsp/modules/audio_processing/agc2/$(DEPDIR)/$(am__dirstamp):
-	@$(MKDIR_P) ./webrtc_dsp/modules/audio_processing/agc2/$(DEPDIR)
-	@: > webrtc_dsp/modules/audio_processing/agc2/$(DEPDIR)/$(am__dirstamp)
-./webrtc_dsp/modules/audio_processing/agc2/interpolated_gain_curve.lo:  \
-	webrtc_dsp/modules/audio_processing/agc2/$(am__dirstamp) \
-	webrtc_dsp/modules/audio_processing/agc2/$(DEPDIR)/$(am__dirstamp)
-./webrtc_dsp/modules/audio_processing/agc2/agc2_common.lo:  \
-	webrtc_dsp/modules/audio_processing/agc2/$(am__dirstamp) \
-	webrtc_dsp/modules/audio_processing/agc2/$(DEPDIR)/$(am__dirstamp)
-./webrtc_dsp/modules/audio_processing/agc2/gain_applier.lo:  \
-	webrtc_dsp/modules/audio_processing/agc2/$(am__dirstamp) \
-	webrtc_dsp/modules/audio_processing/agc2/$(DEPDIR)/$(am__dirstamp)
-./webrtc_dsp/modules/audio_processing/agc2/adaptive_agc.lo:  \
-	webrtc_dsp/modules/audio_processing/agc2/$(am__dirstamp) \
-	webrtc_dsp/modules/audio_processing/agc2/$(DEPDIR)/$(am__dirstamp)
-./webrtc_dsp/modules/audio_processing/agc2/adaptive_digital_gain_applier.lo:  \
-	webrtc_dsp/modules/audio_processing/agc2/$(am__dirstamp) \
-	webrtc_dsp/modules/audio_processing/agc2/$(DEPDIR)/$(am__dirstamp)
-./webrtc_dsp/modules/audio_processing/agc2/limiter.lo:  \
-	webrtc_dsp/modules/audio_processing/agc2/$(am__dirstamp) \
-	webrtc_dsp/modules/audio_processing/agc2/$(DEPDIR)/$(am__dirstamp)
-./webrtc_dsp/modules/audio_processing/agc2/saturation_protector.lo:  \
-	webrtc_dsp/modules/audio_processing/agc2/$(am__dirstamp) \
-	webrtc_dsp/modules/audio_processing/agc2/$(DEPDIR)/$(am__dirstamp)
-webrtc_dsp/modules/audio_processing/agc2/rnn_vad/$(am__dirstamp):
-	@$(MKDIR_P) ./webrtc_dsp/modules/audio_processing/agc2/rnn_vad
-	@: > webrtc_dsp/modules/audio_processing/agc2/rnn_vad/$(am__dirstamp)
-webrtc_dsp/modules/audio_processing/agc2/rnn_vad/$(DEPDIR)/$(am__dirstamp):
-	@$(MKDIR_P) ./webrtc_dsp/modules/audio_processing/agc2/rnn_vad/$(DEPDIR)
-	@: > webrtc_dsp/modules/audio_processing/agc2/rnn_vad/$(DEPDIR)/$(am__dirstamp)
-./webrtc_dsp/modules/audio_processing/agc2/rnn_vad/spectral_features_internal.lo: webrtc_dsp/modules/audio_processing/agc2/rnn_vad/$(am__dirstamp) \
-	webrtc_dsp/modules/audio_processing/agc2/rnn_vad/$(DEPDIR)/$(am__dirstamp)
-./webrtc_dsp/modules/audio_processing/agc2/rnn_vad/rnn.lo: webrtc_dsp/modules/audio_processing/agc2/rnn_vad/$(am__dirstamp) \
-	webrtc_dsp/modules/audio_processing/agc2/rnn_vad/$(DEPDIR)/$(am__dirstamp)
-./webrtc_dsp/modules/audio_processing/agc2/rnn_vad/pitch_search_internal.lo: webrtc_dsp/modules/audio_processing/agc2/rnn_vad/$(am__dirstamp) \
-	webrtc_dsp/modules/audio_processing/agc2/rnn_vad/$(DEPDIR)/$(am__dirstamp)
-./webrtc_dsp/modules/audio_processing/agc2/rnn_vad/spectral_features.lo: webrtc_dsp/modules/audio_processing/agc2/rnn_vad/$(am__dirstamp) \
-	webrtc_dsp/modules/audio_processing/agc2/rnn_vad/$(DEPDIR)/$(am__dirstamp)
-./webrtc_dsp/modules/audio_processing/agc2/rnn_vad/pitch_search.lo: webrtc_dsp/modules/audio_processing/agc2/rnn_vad/$(am__dirstamp) \
-	webrtc_dsp/modules/audio_processing/agc2/rnn_vad/$(DEPDIR)/$(am__dirstamp)
-./webrtc_dsp/modules/audio_processing/agc2/rnn_vad/features_extraction.lo: webrtc_dsp/modules/audio_processing/agc2/rnn_vad/$(am__dirstamp) \
-	webrtc_dsp/modules/audio_processing/agc2/rnn_vad/$(DEPDIR)/$(am__dirstamp)
-./webrtc_dsp/modules/audio_processing/agc2/rnn_vad/fft_util.lo: webrtc_dsp/modules/audio_processing/agc2/rnn_vad/$(am__dirstamp) \
-	webrtc_dsp/modules/audio_processing/agc2/rnn_vad/$(DEPDIR)/$(am__dirstamp)
-./webrtc_dsp/modules/audio_processing/agc2/rnn_vad/lp_residual.lo: webrtc_dsp/modules/audio_processing/agc2/rnn_vad/$(am__dirstamp) \
-	webrtc_dsp/modules/audio_processing/agc2/rnn_vad/$(DEPDIR)/$(am__dirstamp)
-./webrtc_dsp/modules/audio_processing/agc2/adaptive_mode_level_estimator_agc.lo:  \
-	webrtc_dsp/modules/audio_processing/agc2/$(am__dirstamp) \
-	webrtc_dsp/modules/audio_processing/agc2/$(DEPDIR)/$(am__dirstamp)
-./webrtc_dsp/modules/audio_processing/agc2/vector_float_frame.lo:  \
-	webrtc_dsp/modules/audio_processing/agc2/$(am__dirstamp) \
-	webrtc_dsp/modules/audio_processing/agc2/$(DEPDIR)/$(am__dirstamp)
-./webrtc_dsp/modules/audio_processing/agc2/noise_level_estimator.lo:  \
-	webrtc_dsp/modules/audio_processing/agc2/$(am__dirstamp) \
-	webrtc_dsp/modules/audio_processing/agc2/$(DEPDIR)/$(am__dirstamp)
-./webrtc_dsp/modules/audio_processing/agc2/agc2_testing_common.lo:  \
-	webrtc_dsp/modules/audio_processing/agc2/$(am__dirstamp) \
-	webrtc_dsp/modules/audio_processing/agc2/$(DEPDIR)/$(am__dirstamp)
-./webrtc_dsp/modules/audio_processing/agc2/fixed_digital_level_estimator.lo:  \
-	webrtc_dsp/modules/audio_processing/agc2/$(am__dirstamp) \
-	webrtc_dsp/modules/audio_processing/agc2/$(DEPDIR)/$(am__dirstamp)
-./webrtc_dsp/modules/audio_processing/agc2/fixed_gain_controller.lo:  \
-	webrtc_dsp/modules/audio_processing/agc2/$(am__dirstamp) \
-	webrtc_dsp/modules/audio_processing/agc2/$(DEPDIR)/$(am__dirstamp)
-./webrtc_dsp/modules/audio_processing/agc2/vad_with_level.lo:  \
-	webrtc_dsp/modules/audio_processing/agc2/$(am__dirstamp) \
-	webrtc_dsp/modules/audio_processing/agc2/$(DEPDIR)/$(am__dirstamp)
-./webrtc_dsp/modules/audio_processing/agc2/limiter_db_gain_curve.lo:  \
-	webrtc_dsp/modules/audio_processing/agc2/$(am__dirstamp) \
-	webrtc_dsp/modules/audio_processing/agc2/$(DEPDIR)/$(am__dirstamp)
-./webrtc_dsp/modules/audio_processing/agc2/down_sampler.lo:  \
-	webrtc_dsp/modules/audio_processing/agc2/$(am__dirstamp) \
-	webrtc_dsp/modules/audio_processing/agc2/$(DEPDIR)/$(am__dirstamp)
-./webrtc_dsp/modules/audio_processing/agc2/signal_classifier.lo:  \
-	webrtc_dsp/modules/audio_processing/agc2/$(am__dirstamp) \
-	webrtc_dsp/modules/audio_processing/agc2/$(DEPDIR)/$(am__dirstamp)
-./webrtc_dsp/modules/audio_processing/agc2/noise_spectrum_estimator.lo:  \
-	webrtc_dsp/modules/audio_processing/agc2/$(am__dirstamp) \
-	webrtc_dsp/modules/audio_processing/agc2/$(DEPDIR)/$(am__dirstamp)
-./webrtc_dsp/modules/audio_processing/agc2/compute_interpolated_gain_curve.lo:  \
-	webrtc_dsp/modules/audio_processing/agc2/$(am__dirstamp) \
-	webrtc_dsp/modules/audio_processing/agc2/$(DEPDIR)/$(am__dirstamp)
-./webrtc_dsp/modules/audio_processing/agc2/biquad_filter.lo:  \
-	webrtc_dsp/modules/audio_processing/agc2/$(am__dirstamp) \
-	webrtc_dsp/modules/audio_processing/agc2/$(DEPDIR)/$(am__dirstamp)
-./webrtc_dsp/modules/audio_processing/agc2/adaptive_mode_level_estimator.lo:  \
-	webrtc_dsp/modules/audio_processing/agc2/$(am__dirstamp) \
-	webrtc_dsp/modules/audio_processing/agc2/$(DEPDIR)/$(am__dirstamp)
-webrtc_dsp/modules/audio_processing/transient/$(am__dirstamp):
-	@$(MKDIR_P) ./webrtc_dsp/modules/audio_processing/transient
-	@: > webrtc_dsp/modules/audio_processing/transient/$(am__dirstamp)
-webrtc_dsp/modules/audio_processing/transient/$(DEPDIR)/$(am__dirstamp):
-	@$(MKDIR_P) ./webrtc_dsp/modules/audio_processing/transient/$(DEPDIR)
-	@: > webrtc_dsp/modules/audio_processing/transient/$(DEPDIR)/$(am__dirstamp)
-./webrtc_dsp/modules/audio_processing/transient/moving_moments.lo:  \
-	webrtc_dsp/modules/audio_processing/transient/$(am__dirstamp) \
-	webrtc_dsp/modules/audio_processing/transient/$(DEPDIR)/$(am__dirstamp)
-./webrtc_dsp/modules/audio_processing/transient/wpd_tree.lo:  \
-	webrtc_dsp/modules/audio_processing/transient/$(am__dirstamp) \
-	webrtc_dsp/modules/audio_processing/transient/$(DEPDIR)/$(am__dirstamp)
-./webrtc_dsp/modules/audio_processing/transient/wpd_node.lo:  \
-	webrtc_dsp/modules/audio_processing/transient/$(am__dirstamp) \
-	webrtc_dsp/modules/audio_processing/transient/$(DEPDIR)/$(am__dirstamp)
-./webrtc_dsp/modules/audio_processing/transient/transient_suppressor.lo:  \
-	webrtc_dsp/modules/audio_processing/transient/$(am__dirstamp) \
-	webrtc_dsp/modules/audio_processing/transient/$(DEPDIR)/$(am__dirstamp)
-./webrtc_dsp/modules/audio_processing/transient/transient_detector.lo:  \
-	webrtc_dsp/modules/audio_processing/transient/$(am__dirstamp) \
-	webrtc_dsp/modules/audio_processing/transient/$(DEPDIR)/$(am__dirstamp)
-./webrtc_dsp/modules/audio_processing/low_cut_filter.lo:  \
-	webrtc_dsp/modules/audio_processing/$(am__dirstamp) \
-	webrtc_dsp/modules/audio_processing/$(DEPDIR)/$(am__dirstamp)
-./webrtc_dsp/modules/audio_processing/level_estimator_impl.lo:  \
-	webrtc_dsp/modules/audio_processing/$(am__dirstamp) \
-	webrtc_dsp/modules/audio_processing/$(DEPDIR)/$(am__dirstamp)
-./webrtc_dsp/modules/audio_processing/three_band_filter_bank.lo:  \
-	webrtc_dsp/modules/audio_processing/$(am__dirstamp) \
-	webrtc_dsp/modules/audio_processing/$(DEPDIR)/$(am__dirstamp)
-webrtc_dsp/modules/audio_processing/aec/$(am__dirstamp):
-	@$(MKDIR_P) ./webrtc_dsp/modules/audio_processing/aec
-	@: > webrtc_dsp/modules/audio_processing/aec/$(am__dirstamp)
-webrtc_dsp/modules/audio_processing/aec/$(DEPDIR)/$(am__dirstamp):
-	@$(MKDIR_P) ./webrtc_dsp/modules/audio_processing/aec/$(DEPDIR)
-	@: > webrtc_dsp/modules/audio_processing/aec/$(DEPDIR)/$(am__dirstamp)
-./webrtc_dsp/modules/audio_processing/aec/echo_cancellation.lo:  \
-	webrtc_dsp/modules/audio_processing/aec/$(am__dirstamp) \
-	webrtc_dsp/modules/audio_processing/aec/$(DEPDIR)/$(am__dirstamp)
-./webrtc_dsp/modules/audio_processing/aec/aec_resampler.lo:  \
-	webrtc_dsp/modules/audio_processing/aec/$(am__dirstamp) \
-	webrtc_dsp/modules/audio_processing/aec/$(DEPDIR)/$(am__dirstamp)
-./webrtc_dsp/modules/audio_processing/aec/aec_core.lo:  \
-	webrtc_dsp/modules/audio_processing/aec/$(am__dirstamp) \
-	webrtc_dsp/modules/audio_processing/aec/$(DEPDIR)/$(am__dirstamp)
-./webrtc_dsp/modules/audio_processing/voice_detection_impl.lo:  \
-	webrtc_dsp/modules/audio_processing/$(am__dirstamp) \
-	webrtc_dsp/modules/audio_processing/$(DEPDIR)/$(am__dirstamp)
-./webrtc_dsp/modules/audio_processing/echo_cancellation_impl.lo:  \
-	webrtc_dsp/modules/audio_processing/$(am__dirstamp) \
-	webrtc_dsp/modules/audio_processing/$(DEPDIR)/$(am__dirstamp)
-./webrtc_dsp/modules/audio_processing/gain_control_for_experimental_agc.lo:  \
-	webrtc_dsp/modules/audio_processing/$(am__dirstamp) \
-	webrtc_dsp/modules/audio_processing/$(DEPDIR)/$(am__dirstamp)
-webrtc_dsp/modules/audio_processing/agc/$(am__dirstamp):
-	@$(MKDIR_P) ./webrtc_dsp/modules/audio_processing/agc
-	@: > webrtc_dsp/modules/audio_processing/agc/$(am__dirstamp)
-webrtc_dsp/modules/audio_processing/agc/$(DEPDIR)/$(am__dirstamp):
-	@$(MKDIR_P) ./webrtc_dsp/modules/audio_processing/agc/$(DEPDIR)
-	@: > webrtc_dsp/modules/audio_processing/agc/$(DEPDIR)/$(am__dirstamp)
-./webrtc_dsp/modules/audio_processing/agc/agc.lo:  \
-	webrtc_dsp/modules/audio_processing/agc/$(am__dirstamp) \
-	webrtc_dsp/modules/audio_processing/agc/$(DEPDIR)/$(am__dirstamp)
-./webrtc_dsp/modules/audio_processing/agc/loudness_histogram.lo:  \
-	webrtc_dsp/modules/audio_processing/agc/$(am__dirstamp) \
-	webrtc_dsp/modules/audio_processing/agc/$(DEPDIR)/$(am__dirstamp)
-./webrtc_dsp/modules/audio_processing/agc/agc_manager_direct.lo:  \
-	webrtc_dsp/modules/audio_processing/agc/$(am__dirstamp) \
-	webrtc_dsp/modules/audio_processing/agc/$(DEPDIR)/$(am__dirstamp)
-webrtc_dsp/modules/audio_processing/agc/legacy/$(am__dirstamp):
-	@$(MKDIR_P) ./webrtc_dsp/modules/audio_processing/agc/legacy
-	@: > webrtc_dsp/modules/audio_processing/agc/legacy/$(am__dirstamp)
-webrtc_dsp/modules/audio_processing/agc/legacy/$(DEPDIR)/$(am__dirstamp):
-	@$(MKDIR_P) ./webrtc_dsp/modules/audio_processing/agc/legacy/$(DEPDIR)
-	@: > webrtc_dsp/modules/audio_processing/agc/legacy/$(DEPDIR)/$(am__dirstamp)
-./webrtc_dsp/modules/audio_processing/agc/legacy/analog_agc.lo: webrtc_dsp/modules/audio_processing/agc/legacy/$(am__dirstamp) \
-	webrtc_dsp/modules/audio_processing/agc/legacy/$(DEPDIR)/$(am__dirstamp)
-./webrtc_dsp/modules/audio_processing/agc/legacy/digital_agc.lo: webrtc_dsp/modules/audio_processing/agc/legacy/$(am__dirstamp) \
-	webrtc_dsp/modules/audio_processing/agc/legacy/$(DEPDIR)/$(am__dirstamp)
-./webrtc_dsp/modules/audio_processing/agc/utility.lo:  \
-	webrtc_dsp/modules/audio_processing/agc/$(am__dirstamp) \
-	webrtc_dsp/modules/audio_processing/agc/$(DEPDIR)/$(am__dirstamp)
-./webrtc_dsp/modules/audio_processing/audio_processing_impl.lo:  \
-	webrtc_dsp/modules/audio_processing/$(am__dirstamp) \
-	webrtc_dsp/modules/audio_processing/$(DEPDIR)/$(am__dirstamp)
-webrtc_dsp/modules/audio_processing/audio_generator/$(am__dirstamp):
-	@$(MKDIR_P) ./webrtc_dsp/modules/audio_processing/audio_generator
-	@: > webrtc_dsp/modules/audio_processing/audio_generator/$(am__dirstamp)
-webrtc_dsp/modules/audio_processing/audio_generator/$(DEPDIR)/$(am__dirstamp):
-	@$(MKDIR_P) ./webrtc_dsp/modules/audio_processing/audio_generator/$(DEPDIR)
-	@: > webrtc_dsp/modules/audio_processing/audio_generator/$(DEPDIR)/$(am__dirstamp)
-./webrtc_dsp/modules/audio_processing/audio_generator/file_audio_generator.lo: webrtc_dsp/modules/audio_processing/audio_generator/$(am__dirstamp) \
-	webrtc_dsp/modules/audio_processing/audio_generator/$(DEPDIR)/$(am__dirstamp)
-./webrtc_dsp/modules/audio_processing/gain_controller2.lo:  \
-	webrtc_dsp/modules/audio_processing/$(am__dirstamp) \
-	webrtc_dsp/modules/audio_processing/$(DEPDIR)/$(am__dirstamp)
-./webrtc_dsp/modules/audio_processing/residual_echo_detector.lo:  \
-	webrtc_dsp/modules/audio_processing/$(am__dirstamp) \
-	webrtc_dsp/modules/audio_processing/$(DEPDIR)/$(am__dirstamp)
-./webrtc_dsp/modules/audio_processing/noise_suppression_impl.lo:  \
-	webrtc_dsp/modules/audio_processing/$(am__dirstamp) \
-	webrtc_dsp/modules/audio_processing/$(DEPDIR)/$(am__dirstamp)
-webrtc_dsp/modules/audio_processing/aecm/$(am__dirstamp):
-	@$(MKDIR_P) ./webrtc_dsp/modules/audio_processing/aecm
-	@: > webrtc_dsp/modules/audio_processing/aecm/$(am__dirstamp)
-webrtc_dsp/modules/audio_processing/aecm/$(DEPDIR)/$(am__dirstamp):
-	@$(MKDIR_P) ./webrtc_dsp/modules/audio_processing/aecm/$(DEPDIR)
-	@: > webrtc_dsp/modules/audio_processing/aecm/$(DEPDIR)/$(am__dirstamp)
-./webrtc_dsp/modules/audio_processing/aecm/aecm_core.lo:  \
-	webrtc_dsp/modules/audio_processing/aecm/$(am__dirstamp) \
-	webrtc_dsp/modules/audio_processing/aecm/$(DEPDIR)/$(am__dirstamp)
-./webrtc_dsp/modules/audio_processing/aecm/aecm_core_c.lo:  \
-	webrtc_dsp/modules/audio_processing/aecm/$(am__dirstamp) \
-	webrtc_dsp/modules/audio_processing/aecm/$(DEPDIR)/$(am__dirstamp)
-./webrtc_dsp/modules/audio_processing/aecm/echo_control_mobile.lo:  \
-	webrtc_dsp/modules/audio_processing/aecm/$(am__dirstamp) \
-	webrtc_dsp/modules/audio_processing/aecm/$(DEPDIR)/$(am__dirstamp)
-webrtc_dsp/modules/audio_processing/aec3/$(am__dirstamp):
-	@$(MKDIR_P) ./webrtc_dsp/modules/audio_processing/aec3
-	@: > webrtc_dsp/modules/audio_processing/aec3/$(am__dirstamp)
-webrtc_dsp/modules/audio_processing/aec3/$(DEPDIR)/$(am__dirstamp):
-	@$(MKDIR_P) ./webrtc_dsp/modules/audio_processing/aec3/$(DEPDIR)
-	@: > webrtc_dsp/modules/audio_processing/aec3/$(DEPDIR)/$(am__dirstamp)
-./webrtc_dsp/modules/audio_processing/aec3/render_reverb_model.lo:  \
-	webrtc_dsp/modules/audio_processing/aec3/$(am__dirstamp) \
-	webrtc_dsp/modules/audio_processing/aec3/$(DEPDIR)/$(am__dirstamp)
-./webrtc_dsp/modules/audio_processing/aec3/reverb_model_fallback.lo:  \
-	webrtc_dsp/modules/audio_processing/aec3/$(am__dirstamp) \
-	webrtc_dsp/modules/audio_processing/aec3/$(DEPDIR)/$(am__dirstamp)
-./webrtc_dsp/modules/audio_processing/aec3/echo_remover_metrics.lo:  \
-	webrtc_dsp/modules/audio_processing/aec3/$(am__dirstamp) \
-	webrtc_dsp/modules/audio_processing/aec3/$(DEPDIR)/$(am__dirstamp)
-./webrtc_dsp/modules/audio_processing/aec3/matched_filter_lag_aggregator.lo:  \
-	webrtc_dsp/modules/audio_processing/aec3/$(am__dirstamp) \
-	webrtc_dsp/modules/audio_processing/aec3/$(DEPDIR)/$(am__dirstamp)
-./webrtc_dsp/modules/audio_processing/aec3/render_delay_buffer2.lo:  \
-	webrtc_dsp/modules/audio_processing/aec3/$(am__dirstamp) \
-	webrtc_dsp/modules/audio_processing/aec3/$(DEPDIR)/$(am__dirstamp)
-./webrtc_dsp/modules/audio_processing/aec3/echo_path_variability.lo:  \
-	webrtc_dsp/modules/audio_processing/aec3/$(am__dirstamp) \
-	webrtc_dsp/modules/audio_processing/aec3/$(DEPDIR)/$(am__dirstamp)
-./webrtc_dsp/modules/audio_processing/aec3/frame_blocker.lo:  \
-	webrtc_dsp/modules/audio_processing/aec3/$(am__dirstamp) \
-	webrtc_dsp/modules/audio_processing/aec3/$(DEPDIR)/$(am__dirstamp)
-./webrtc_dsp/modules/audio_processing/aec3/subtractor.lo:  \
-	webrtc_dsp/modules/audio_processing/aec3/$(am__dirstamp) \
-	webrtc_dsp/modules/audio_processing/aec3/$(DEPDIR)/$(am__dirstamp)
-./webrtc_dsp/modules/audio_processing/aec3/aec3_fft.lo:  \
-	webrtc_dsp/modules/audio_processing/aec3/$(am__dirstamp) \
-	webrtc_dsp/modules/audio_processing/aec3/$(DEPDIR)/$(am__dirstamp)
-./webrtc_dsp/modules/audio_processing/aec3/fullband_erle_estimator.lo:  \
-	webrtc_dsp/modules/audio_processing/aec3/$(am__dirstamp) \
-	webrtc_dsp/modules/audio_processing/aec3/$(DEPDIR)/$(am__dirstamp)
-./webrtc_dsp/modules/audio_processing/aec3/suppression_filter.lo:  \
-	webrtc_dsp/modules/audio_processing/aec3/$(am__dirstamp) \
-	webrtc_dsp/modules/audio_processing/aec3/$(DEPDIR)/$(am__dirstamp)
-./webrtc_dsp/modules/audio_processing/aec3/block_processor.lo:  \
-	webrtc_dsp/modules/audio_processing/aec3/$(am__dirstamp) \
-	webrtc_dsp/modules/audio_processing/aec3/$(DEPDIR)/$(am__dirstamp)
-./webrtc_dsp/modules/audio_processing/aec3/subband_erle_estimator.lo:  \
-	webrtc_dsp/modules/audio_processing/aec3/$(am__dirstamp) \
-	webrtc_dsp/modules/audio_processing/aec3/$(DEPDIR)/$(am__dirstamp)
-./webrtc_dsp/modules/audio_processing/aec3/render_delay_controller_metrics.lo:  \
-	webrtc_dsp/modules/audio_processing/aec3/$(am__dirstamp) \
-	webrtc_dsp/modules/audio_processing/aec3/$(DEPDIR)/$(am__dirstamp)
-./webrtc_dsp/modules/audio_processing/aec3/render_delay_buffer.lo:  \
-	webrtc_dsp/modules/audio_processing/aec3/$(am__dirstamp) \
-	webrtc_dsp/modules/audio_processing/aec3/$(DEPDIR)/$(am__dirstamp)
-./webrtc_dsp/modules/audio_processing/aec3/vector_buffer.lo:  \
-	webrtc_dsp/modules/audio_processing/aec3/$(am__dirstamp) \
-	webrtc_dsp/modules/audio_processing/aec3/$(DEPDIR)/$(am__dirstamp)
-./webrtc_dsp/modules/audio_processing/aec3/erl_estimator.lo:  \
-	webrtc_dsp/modules/audio_processing/aec3/$(am__dirstamp) \
-	webrtc_dsp/modules/audio_processing/aec3/$(DEPDIR)/$(am__dirstamp)
-./webrtc_dsp/modules/audio_processing/aec3/aec_state.lo:  \
-	webrtc_dsp/modules/audio_processing/aec3/$(am__dirstamp) \
-	webrtc_dsp/modules/audio_processing/aec3/$(DEPDIR)/$(am__dirstamp)
-./webrtc_dsp/modules/audio_processing/aec3/adaptive_fir_filter.lo:  \
-	webrtc_dsp/modules/audio_processing/aec3/$(am__dirstamp) \
-	webrtc_dsp/modules/audio_processing/aec3/$(DEPDIR)/$(am__dirstamp)
-./webrtc_dsp/modules/audio_processing/aec3/render_delay_controller.lo:  \
-	webrtc_dsp/modules/audio_processing/aec3/$(am__dirstamp) \
-	webrtc_dsp/modules/audio_processing/aec3/$(DEPDIR)/$(am__dirstamp)
-./webrtc_dsp/modules/audio_processing/aec3/skew_estimator.lo:  \
-	webrtc_dsp/modules/audio_processing/aec3/$(am__dirstamp) \
-	webrtc_dsp/modules/audio_processing/aec3/$(DEPDIR)/$(am__dirstamp)
-./webrtc_dsp/modules/audio_processing/aec3/echo_path_delay_estimator.lo:  \
-	webrtc_dsp/modules/audio_processing/aec3/$(am__dirstamp) \
-	webrtc_dsp/modules/audio_processing/aec3/$(DEPDIR)/$(am__dirstamp)
-./webrtc_dsp/modules/audio_processing/aec3/block_framer.lo:  \
-	webrtc_dsp/modules/audio_processing/aec3/$(am__dirstamp) \
-	webrtc_dsp/modules/audio_processing/aec3/$(DEPDIR)/$(am__dirstamp)
-./webrtc_dsp/modules/audio_processing/aec3/erle_estimator.lo:  \
-	webrtc_dsp/modules/audio_processing/aec3/$(am__dirstamp) \
-	webrtc_dsp/modules/audio_processing/aec3/$(DEPDIR)/$(am__dirstamp)
-./webrtc_dsp/modules/audio_processing/aec3/reverb_model.lo:  \
-	webrtc_dsp/modules/audio_processing/aec3/$(am__dirstamp) \
-	webrtc_dsp/modules/audio_processing/aec3/$(DEPDIR)/$(am__dirstamp)
-./webrtc_dsp/modules/audio_processing/aec3/cascaded_biquad_filter.lo:  \
-	webrtc_dsp/modules/audio_processing/aec3/$(am__dirstamp) \
-	webrtc_dsp/modules/audio_processing/aec3/$(DEPDIR)/$(am__dirstamp)
-./webrtc_dsp/modules/audio_processing/aec3/render_buffer.lo:  \
-	webrtc_dsp/modules/audio_processing/aec3/$(am__dirstamp) \
-	webrtc_dsp/modules/audio_processing/aec3/$(DEPDIR)/$(am__dirstamp)
-./webrtc_dsp/modules/audio_processing/aec3/subtractor_output.lo:  \
-	webrtc_dsp/modules/audio_processing/aec3/$(am__dirstamp) \
-	webrtc_dsp/modules/audio_processing/aec3/$(DEPDIR)/$(am__dirstamp)
-./webrtc_dsp/modules/audio_processing/aec3/stationarity_estimator.lo:  \
-	webrtc_dsp/modules/audio_processing/aec3/$(am__dirstamp) \
-	webrtc_dsp/modules/audio_processing/aec3/$(DEPDIR)/$(am__dirstamp)
-./webrtc_dsp/modules/audio_processing/aec3/render_signal_analyzer.lo:  \
-	webrtc_dsp/modules/audio_processing/aec3/$(am__dirstamp) \
-	webrtc_dsp/modules/audio_processing/aec3/$(DEPDIR)/$(am__dirstamp)
-./webrtc_dsp/modules/audio_processing/aec3/subtractor_output_analyzer.lo:  \
-	webrtc_dsp/modules/audio_processing/aec3/$(am__dirstamp) \
-	webrtc_dsp/modules/audio_processing/aec3/$(DEPDIR)/$(am__dirstamp)
-./webrtc_dsp/modules/audio_processing/aec3/suppression_gain.lo:  \
-	webrtc_dsp/modules/audio_processing/aec3/$(am__dirstamp) \
-	webrtc_dsp/modules/audio_processing/aec3/$(DEPDIR)/$(am__dirstamp)
-./webrtc_dsp/modules/audio_processing/aec3/echo_audibility.lo:  \
-	webrtc_dsp/modules/audio_processing/aec3/$(am__dirstamp) \
-	webrtc_dsp/modules/audio_processing/aec3/$(DEPDIR)/$(am__dirstamp)
-./webrtc_dsp/modules/audio_processing/aec3/block_processor_metrics.lo:  \
-	webrtc_dsp/modules/audio_processing/aec3/$(am__dirstamp) \
-	webrtc_dsp/modules/audio_processing/aec3/$(DEPDIR)/$(am__dirstamp)
-./webrtc_dsp/modules/audio_processing/aec3/moving_average.lo:  \
-	webrtc_dsp/modules/audio_processing/aec3/$(am__dirstamp) \
-	webrtc_dsp/modules/audio_processing/aec3/$(DEPDIR)/$(am__dirstamp)
-./webrtc_dsp/modules/audio_processing/aec3/reverb_model_estimator.lo:  \
-	webrtc_dsp/modules/audio_processing/aec3/$(am__dirstamp) \
-	webrtc_dsp/modules/audio_processing/aec3/$(DEPDIR)/$(am__dirstamp)
-./webrtc_dsp/modules/audio_processing/aec3/aec3_common.lo:  \
-	webrtc_dsp/modules/audio_processing/aec3/$(am__dirstamp) \
-	webrtc_dsp/modules/audio_processing/aec3/$(DEPDIR)/$(am__dirstamp)
-./webrtc_dsp/modules/audio_processing/aec3/residual_echo_estimator.lo:  \
-	webrtc_dsp/modules/audio_processing/aec3/$(am__dirstamp) \
-	webrtc_dsp/modules/audio_processing/aec3/$(DEPDIR)/$(am__dirstamp)
-./webrtc_dsp/modules/audio_processing/aec3/matched_filter.lo:  \
-	webrtc_dsp/modules/audio_processing/aec3/$(am__dirstamp) \
-	webrtc_dsp/modules/audio_processing/aec3/$(DEPDIR)/$(am__dirstamp)
-./webrtc_dsp/modules/audio_processing/aec3/reverb_decay_estimator.lo:  \
-	webrtc_dsp/modules/audio_processing/aec3/$(am__dirstamp) \
-	webrtc_dsp/modules/audio_processing/aec3/$(DEPDIR)/$(am__dirstamp)
-./webrtc_dsp/modules/audio_processing/aec3/render_delay_controller2.lo:  \
-	webrtc_dsp/modules/audio_processing/aec3/$(am__dirstamp) \
-	webrtc_dsp/modules/audio_processing/aec3/$(DEPDIR)/$(am__dirstamp)
-./webrtc_dsp/modules/audio_processing/aec3/suppression_gain_limiter.lo:  \
-	webrtc_dsp/modules/audio_processing/aec3/$(am__dirstamp) \
-	webrtc_dsp/modules/audio_processing/aec3/$(DEPDIR)/$(am__dirstamp)
-./webrtc_dsp/modules/audio_processing/aec3/main_filter_update_gain.lo:  \
-	webrtc_dsp/modules/audio_processing/aec3/$(am__dirstamp) \
-	webrtc_dsp/modules/audio_processing/aec3/$(DEPDIR)/$(am__dirstamp)
-./webrtc_dsp/modules/audio_processing/aec3/echo_remover.lo:  \
-	webrtc_dsp/modules/audio_processing/aec3/$(am__dirstamp) \
-	webrtc_dsp/modules/audio_processing/aec3/$(DEPDIR)/$(am__dirstamp)
-./webrtc_dsp/modules/audio_processing/aec3/downsampled_render_buffer.lo:  \
-	webrtc_dsp/modules/audio_processing/aec3/$(am__dirstamp) \
-	webrtc_dsp/modules/audio_processing/aec3/$(DEPDIR)/$(am__dirstamp)
-./webrtc_dsp/modules/audio_processing/aec3/matrix_buffer.lo:  \
-	webrtc_dsp/modules/audio_processing/aec3/$(am__dirstamp) \
-	webrtc_dsp/modules/audio_processing/aec3/$(DEPDIR)/$(am__dirstamp)
-./webrtc_dsp/modules/audio_processing/aec3/block_processor2.lo:  \
-	webrtc_dsp/modules/audio_processing/aec3/$(am__dirstamp) \
-	webrtc_dsp/modules/audio_processing/aec3/$(DEPDIR)/$(am__dirstamp)
-./webrtc_dsp/modules/audio_processing/aec3/echo_canceller3.lo:  \
-	webrtc_dsp/modules/audio_processing/aec3/$(am__dirstamp) \
-	webrtc_dsp/modules/audio_processing/aec3/$(DEPDIR)/$(am__dirstamp)
-./webrtc_dsp/modules/audio_processing/aec3/block_delay_buffer.lo:  \
-	webrtc_dsp/modules/audio_processing/aec3/$(am__dirstamp) \
-	webrtc_dsp/modules/audio_processing/aec3/$(DEPDIR)/$(am__dirstamp)
-./webrtc_dsp/modules/audio_processing/aec3/fft_buffer.lo:  \
-	webrtc_dsp/modules/audio_processing/aec3/$(am__dirstamp) \
-	webrtc_dsp/modules/audio_processing/aec3/$(DEPDIR)/$(am__dirstamp)
-./webrtc_dsp/modules/audio_processing/aec3/comfort_noise_generator.lo:  \
-	webrtc_dsp/modules/audio_processing/aec3/$(am__dirstamp) \
-	webrtc_dsp/modules/audio_processing/aec3/$(DEPDIR)/$(am__dirstamp)
-./webrtc_dsp/modules/audio_processing/aec3/shadow_filter_update_gain.lo:  \
-	webrtc_dsp/modules/audio_processing/aec3/$(am__dirstamp) \
-	webrtc_dsp/modules/audio_processing/aec3/$(DEPDIR)/$(am__dirstamp)
-./webrtc_dsp/modules/audio_processing/aec3/filter_analyzer.lo:  \
-	webrtc_dsp/modules/audio_processing/aec3/$(am__dirstamp) \
-	webrtc_dsp/modules/audio_processing/aec3/$(DEPDIR)/$(am__dirstamp)
-./webrtc_dsp/modules/audio_processing/aec3/reverb_frequency_response.lo:  \
-	webrtc_dsp/modules/audio_processing/aec3/$(am__dirstamp) \
-	webrtc_dsp/modules/audio_processing/aec3/$(DEPDIR)/$(am__dirstamp)
-./webrtc_dsp/modules/audio_processing/aec3/decimator.lo:  \
-	webrtc_dsp/modules/audio_processing/aec3/$(am__dirstamp) \
-	webrtc_dsp/modules/audio_processing/aec3/$(DEPDIR)/$(am__dirstamp)
-./webrtc_dsp/modules/audio_processing/echo_control_mobile_impl.lo:  \
-	webrtc_dsp/modules/audio_processing/$(am__dirstamp) \
-	webrtc_dsp/modules/audio_processing/$(DEPDIR)/$(am__dirstamp)
-webrtc_dsp/modules/audio_processing/logging/$(am__dirstamp):
-	@$(MKDIR_P) ./webrtc_dsp/modules/audio_processing/logging
-	@: > webrtc_dsp/modules/audio_processing/logging/$(am__dirstamp)
-webrtc_dsp/modules/audio_processing/logging/$(DEPDIR)/$(am__dirstamp):
-	@$(MKDIR_P) ./webrtc_dsp/modules/audio_processing/logging/$(DEPDIR)
-	@: > webrtc_dsp/modules/audio_processing/logging/$(DEPDIR)/$(am__dirstamp)
-./webrtc_dsp/modules/audio_processing/logging/apm_data_dumper.lo:  \
-	webrtc_dsp/modules/audio_processing/logging/$(am__dirstamp) \
-	webrtc_dsp/modules/audio_processing/logging/$(DEPDIR)/$(am__dirstamp)
-webrtc_dsp/modules/audio_processing/vad/$(am__dirstamp):
-	@$(MKDIR_P) ./webrtc_dsp/modules/audio_processing/vad
-	@: > webrtc_dsp/modules/audio_processing/vad/$(am__dirstamp)
-webrtc_dsp/modules/audio_processing/vad/$(DEPDIR)/$(am__dirstamp):
-	@$(MKDIR_P) ./webrtc_dsp/modules/audio_processing/vad/$(DEPDIR)
-	@: > webrtc_dsp/modules/audio_processing/vad/$(DEPDIR)/$(am__dirstamp)
-./webrtc_dsp/modules/audio_processing/vad/voice_activity_detector.lo:  \
-	webrtc_dsp/modules/audio_processing/vad/$(am__dirstamp) \
-	webrtc_dsp/modules/audio_processing/vad/$(DEPDIR)/$(am__dirstamp)
-./webrtc_dsp/modules/audio_processing/vad/standalone_vad.lo:  \
-	webrtc_dsp/modules/audio_processing/vad/$(am__dirstamp) \
-	webrtc_dsp/modules/audio_processing/vad/$(DEPDIR)/$(am__dirstamp)
-./webrtc_dsp/modules/audio_processing/vad/pitch_internal.lo:  \
-	webrtc_dsp/modules/audio_processing/vad/$(am__dirstamp) \
-	webrtc_dsp/modules/audio_processing/vad/$(DEPDIR)/$(am__dirstamp)
-./webrtc_dsp/modules/audio_processing/vad/vad_circular_buffer.lo:  \
-	webrtc_dsp/modules/audio_processing/vad/$(am__dirstamp) \
-	webrtc_dsp/modules/audio_processing/vad/$(DEPDIR)/$(am__dirstamp)
-./webrtc_dsp/modules/audio_processing/vad/vad_audio_proc.lo:  \
-	webrtc_dsp/modules/audio_processing/vad/$(am__dirstamp) \
-	webrtc_dsp/modules/audio_processing/vad/$(DEPDIR)/$(am__dirstamp)
-./webrtc_dsp/modules/audio_processing/vad/pole_zero_filter.lo:  \
-	webrtc_dsp/modules/audio_processing/vad/$(am__dirstamp) \
-	webrtc_dsp/modules/audio_processing/vad/$(DEPDIR)/$(am__dirstamp)
-./webrtc_dsp/modules/audio_processing/vad/pitch_based_vad.lo:  \
-	webrtc_dsp/modules/audio_processing/vad/$(am__dirstamp) \
-	webrtc_dsp/modules/audio_processing/vad/$(DEPDIR)/$(am__dirstamp)
-./webrtc_dsp/modules/audio_processing/vad/gmm.lo:  \
-	webrtc_dsp/modules/audio_processing/vad/$(am__dirstamp) \
-	webrtc_dsp/modules/audio_processing/vad/$(DEPDIR)/$(am__dirstamp)
-webrtc_dsp/modules/audio_processing/utility/$(am__dirstamp):
-	@$(MKDIR_P) ./webrtc_dsp/modules/audio_processing/utility
-	@: > webrtc_dsp/modules/audio_processing/utility/$(am__dirstamp)
-webrtc_dsp/modules/audio_processing/utility/$(DEPDIR)/$(am__dirstamp):
-	@$(MKDIR_P) ./webrtc_dsp/modules/audio_processing/utility/$(DEPDIR)
-	@: > webrtc_dsp/modules/audio_processing/utility/$(DEPDIR)/$(am__dirstamp)
-./webrtc_dsp/modules/audio_processing/utility/ooura_fft.lo:  \
-	webrtc_dsp/modules/audio_processing/utility/$(am__dirstamp) \
-	webrtc_dsp/modules/audio_processing/utility/$(DEPDIR)/$(am__dirstamp)
-./webrtc_dsp/modules/audio_processing/utility/delay_estimator_wrapper.lo:  \
-	webrtc_dsp/modules/audio_processing/utility/$(am__dirstamp) \
-	webrtc_dsp/modules/audio_processing/utility/$(DEPDIR)/$(am__dirstamp)
-./webrtc_dsp/modules/audio_processing/utility/delay_estimator.lo:  \
-	webrtc_dsp/modules/audio_processing/utility/$(am__dirstamp) \
-	webrtc_dsp/modules/audio_processing/utility/$(DEPDIR)/$(am__dirstamp)
-./webrtc_dsp/modules/audio_processing/utility/block_mean_calculator.lo:  \
-	webrtc_dsp/modules/audio_processing/utility/$(am__dirstamp) \
-	webrtc_dsp/modules/audio_processing/utility/$(DEPDIR)/$(am__dirstamp)
-webrtc_dsp/common_audio/$(am__dirstamp):
-	@$(MKDIR_P) ./webrtc_dsp/common_audio
-	@: > webrtc_dsp/common_audio/$(am__dirstamp)
-webrtc_dsp/common_audio/$(DEPDIR)/$(am__dirstamp):
-	@$(MKDIR_P) ./webrtc_dsp/common_audio/$(DEPDIR)
-	@: > webrtc_dsp/common_audio/$(DEPDIR)/$(am__dirstamp)
-./webrtc_dsp/common_audio/window_generator.lo:  \
-	webrtc_dsp/common_audio/$(am__dirstamp) \
-	webrtc_dsp/common_audio/$(DEPDIR)/$(am__dirstamp)
-./webrtc_dsp/common_audio/channel_buffer.lo:  \
-	webrtc_dsp/common_audio/$(am__dirstamp) \
-	webrtc_dsp/common_audio/$(DEPDIR)/$(am__dirstamp)
-./webrtc_dsp/common_audio/fir_filter_factory.lo:  \
-	webrtc_dsp/common_audio/$(am__dirstamp) \
-	webrtc_dsp/common_audio/$(DEPDIR)/$(am__dirstamp)
-./webrtc_dsp/common_audio/wav_header.lo:  \
-	webrtc_dsp/common_audio/$(am__dirstamp) \
-	webrtc_dsp/common_audio/$(DEPDIR)/$(am__dirstamp)
-./webrtc_dsp/common_audio/real_fourier_ooura.lo:  \
-	webrtc_dsp/common_audio/$(am__dirstamp) \
-	webrtc_dsp/common_audio/$(DEPDIR)/$(am__dirstamp)
-./webrtc_dsp/common_audio/audio_util.lo:  \
-	webrtc_dsp/common_audio/$(am__dirstamp) \
-	webrtc_dsp/common_audio/$(DEPDIR)/$(am__dirstamp)
-./webrtc_dsp/common_audio/fir_filter_sse.lo:  \
-	webrtc_dsp/common_audio/$(am__dirstamp) \
-	webrtc_dsp/common_audio/$(DEPDIR)/$(am__dirstamp)
-webrtc_dsp/common_audio/resampler/$(am__dirstamp):
-	@$(MKDIR_P) ./webrtc_dsp/common_audio/resampler
-	@: > webrtc_dsp/common_audio/resampler/$(am__dirstamp)
-webrtc_dsp/common_audio/resampler/$(DEPDIR)/$(am__dirstamp):
-	@$(MKDIR_P) ./webrtc_dsp/common_audio/resampler/$(DEPDIR)
-	@: > webrtc_dsp/common_audio/resampler/$(DEPDIR)/$(am__dirstamp)
-./webrtc_dsp/common_audio/resampler/push_sinc_resampler.lo:  \
-	webrtc_dsp/common_audio/resampler/$(am__dirstamp) \
-	webrtc_dsp/common_audio/resampler/$(DEPDIR)/$(am__dirstamp)
-./webrtc_dsp/common_audio/resampler/resampler.lo:  \
-	webrtc_dsp/common_audio/resampler/$(am__dirstamp) \
-	webrtc_dsp/common_audio/resampler/$(DEPDIR)/$(am__dirstamp)
-./webrtc_dsp/common_audio/resampler/sinc_resampler_sse.lo:  \
-	webrtc_dsp/common_audio/resampler/$(am__dirstamp) \
-	webrtc_dsp/common_audio/resampler/$(DEPDIR)/$(am__dirstamp)
-./webrtc_dsp/common_audio/resampler/push_resampler.lo:  \
-	webrtc_dsp/common_audio/resampler/$(am__dirstamp) \
-	webrtc_dsp/common_audio/resampler/$(DEPDIR)/$(am__dirstamp)
-./webrtc_dsp/common_audio/resampler/sinc_resampler.lo:  \
-	webrtc_dsp/common_audio/resampler/$(am__dirstamp) \
-	webrtc_dsp/common_audio/resampler/$(DEPDIR)/$(am__dirstamp)
-./webrtc_dsp/common_audio/resampler/sinusoidal_linear_chirp_source.lo:  \
-	webrtc_dsp/common_audio/resampler/$(am__dirstamp) \
-	webrtc_dsp/common_audio/resampler/$(DEPDIR)/$(am__dirstamp)
-./webrtc_dsp/common_audio/wav_file.lo:  \
-	webrtc_dsp/common_audio/$(am__dirstamp) \
-	webrtc_dsp/common_audio/$(DEPDIR)/$(am__dirstamp)
-webrtc_dsp/common_audio/third_party/fft4g/$(am__dirstamp):
-	@$(MKDIR_P) ./webrtc_dsp/common_audio/third_party/fft4g
-	@: > webrtc_dsp/common_audio/third_party/fft4g/$(am__dirstamp)
-webrtc_dsp/common_audio/third_party/fft4g/$(DEPDIR)/$(am__dirstamp):
-	@$(MKDIR_P) ./webrtc_dsp/common_audio/third_party/fft4g/$(DEPDIR)
-	@: > webrtc_dsp/common_audio/third_party/fft4g/$(DEPDIR)/$(am__dirstamp)
-./webrtc_dsp/common_audio/third_party/fft4g/fft4g.lo:  \
-	webrtc_dsp/common_audio/third_party/fft4g/$(am__dirstamp) \
-	webrtc_dsp/common_audio/third_party/fft4g/$(DEPDIR)/$(am__dirstamp)
-./webrtc_dsp/common_audio/audio_converter.lo:  \
-	webrtc_dsp/common_audio/$(am__dirstamp) \
-	webrtc_dsp/common_audio/$(DEPDIR)/$(am__dirstamp)
-./webrtc_dsp/common_audio/real_fourier.lo:  \
-	webrtc_dsp/common_audio/$(am__dirstamp) \
-	webrtc_dsp/common_audio/$(DEPDIR)/$(am__dirstamp)
-./webrtc_dsp/common_audio/sparse_fir_filter.lo:  \
-	webrtc_dsp/common_audio/$(am__dirstamp) \
-	webrtc_dsp/common_audio/$(DEPDIR)/$(am__dirstamp)
-./webrtc_dsp/common_audio/smoothing_filter.lo:  \
-	webrtc_dsp/common_audio/$(am__dirstamp) \
-	webrtc_dsp/common_audio/$(DEPDIR)/$(am__dirstamp)
-./webrtc_dsp/common_audio/fir_filter_c.lo:  \
-	webrtc_dsp/common_audio/$(am__dirstamp) \
-	webrtc_dsp/common_audio/$(DEPDIR)/$(am__dirstamp)
-./webrtc_dsp/common_audio/ring_buffer.lo:  \
-	webrtc_dsp/common_audio/$(am__dirstamp) \
-	webrtc_dsp/common_audio/$(DEPDIR)/$(am__dirstamp)
-webrtc_dsp/common_audio/signal_processing/$(am__dirstamp):
-	@$(MKDIR_P) ./webrtc_dsp/common_audio/signal_processing
-	@: > webrtc_dsp/common_audio/signal_processing/$(am__dirstamp)
-webrtc_dsp/common_audio/signal_processing/$(DEPDIR)/$(am__dirstamp):
-	@$(MKDIR_P) ./webrtc_dsp/common_audio/signal_processing/$(DEPDIR)
-	@: > webrtc_dsp/common_audio/signal_processing/$(DEPDIR)/$(am__dirstamp)
-./webrtc_dsp/common_audio/signal_processing/complex_fft.lo:  \
-	webrtc_dsp/common_audio/signal_processing/$(am__dirstamp) \
-	webrtc_dsp/common_audio/signal_processing/$(DEPDIR)/$(am__dirstamp)
-./webrtc_dsp/common_audio/signal_processing/filter_ma_fast_q12.lo:  \
-	webrtc_dsp/common_audio/signal_processing/$(am__dirstamp) \
-	webrtc_dsp/common_audio/signal_processing/$(DEPDIR)/$(am__dirstamp)
-./webrtc_dsp/common_audio/signal_processing/splitting_filter1.lo:  \
-	webrtc_dsp/common_audio/signal_processing/$(am__dirstamp) \
-	webrtc_dsp/common_audio/signal_processing/$(DEPDIR)/$(am__dirstamp)
-./webrtc_dsp/common_audio/signal_processing/levinson_durbin.lo:  \
-	webrtc_dsp/common_audio/signal_processing/$(am__dirstamp) \
-	webrtc_dsp/common_audio/signal_processing/$(DEPDIR)/$(am__dirstamp)
-./webrtc_dsp/common_audio/signal_processing/dot_product_with_scale.lo:  \
-	webrtc_dsp/common_audio/signal_processing/$(am__dirstamp) \
-	webrtc_dsp/common_audio/signal_processing/$(DEPDIR)/$(am__dirstamp)
-./webrtc_dsp/common_audio/signal_processing/auto_corr_to_refl_coef.lo:  \
-	webrtc_dsp/common_audio/signal_processing/$(am__dirstamp) \
-	webrtc_dsp/common_audio/signal_processing/$(DEPDIR)/$(am__dirstamp)
-./webrtc_dsp/common_audio/signal_processing/resample_by_2_internal.lo:  \
-	webrtc_dsp/common_audio/signal_processing/$(am__dirstamp) \
-	webrtc_dsp/common_audio/signal_processing/$(DEPDIR)/$(am__dirstamp)
-./webrtc_dsp/common_audio/signal_processing/energy.lo:  \
-	webrtc_dsp/common_audio/signal_processing/$(am__dirstamp) \
-	webrtc_dsp/common_audio/signal_processing/$(DEPDIR)/$(am__dirstamp)
-./webrtc_dsp/common_audio/signal_processing/sqrt_of_one_minus_x_squared.lo:  \
-	webrtc_dsp/common_audio/signal_processing/$(am__dirstamp) \
-	webrtc_dsp/common_audio/signal_processing/$(DEPDIR)/$(am__dirstamp)
-./webrtc_dsp/common_audio/signal_processing/downsample_fast.lo:  \
-	webrtc_dsp/common_audio/signal_processing/$(am__dirstamp) \
-	webrtc_dsp/common_audio/signal_processing/$(DEPDIR)/$(am__dirstamp)
-./webrtc_dsp/common_audio/signal_processing/filter_ar_fast_q12.lo:  \
-	webrtc_dsp/common_audio/signal_processing/$(am__dirstamp) \
-	webrtc_dsp/common_audio/signal_processing/$(DEPDIR)/$(am__dirstamp)
-./webrtc_dsp/common_audio/signal_processing/spl_init.lo:  \
-	webrtc_dsp/common_audio/signal_processing/$(am__dirstamp) \
-	webrtc_dsp/common_audio/signal_processing/$(DEPDIR)/$(am__dirstamp)
-./webrtc_dsp/common_audio/signal_processing/lpc_to_refl_coef.lo:  \
-	webrtc_dsp/common_audio/signal_processing/$(am__dirstamp) \
-	webrtc_dsp/common_audio/signal_processing/$(DEPDIR)/$(am__dirstamp)
-./webrtc_dsp/common_audio/signal_processing/cross_correlation.lo:  \
-	webrtc_dsp/common_audio/signal_processing/$(am__dirstamp) \
-	webrtc_dsp/common_audio/signal_processing/$(DEPDIR)/$(am__dirstamp)
-./webrtc_dsp/common_audio/signal_processing/division_operations.lo:  \
-	webrtc_dsp/common_audio/signal_processing/$(am__dirstamp) \
-	webrtc_dsp/common_audio/signal_processing/$(DEPDIR)/$(am__dirstamp)
-./webrtc_dsp/common_audio/signal_processing/auto_correlation.lo:  \
-	webrtc_dsp/common_audio/signal_processing/$(am__dirstamp) \
-	webrtc_dsp/common_audio/signal_processing/$(DEPDIR)/$(am__dirstamp)
-./webrtc_dsp/common_audio/signal_processing/get_scaling_square.lo:  \
-	webrtc_dsp/common_audio/signal_processing/$(am__dirstamp) \
-	webrtc_dsp/common_audio/signal_processing/$(DEPDIR)/$(am__dirstamp)
-./webrtc_dsp/common_audio/signal_processing/resample.lo:  \
-	webrtc_dsp/common_audio/signal_processing/$(am__dirstamp) \
-	webrtc_dsp/common_audio/signal_processing/$(DEPDIR)/$(am__dirstamp)
-./webrtc_dsp/common_audio/signal_processing/min_max_operations.lo:  \
-	webrtc_dsp/common_audio/signal_processing/$(am__dirstamp) \
-	webrtc_dsp/common_audio/signal_processing/$(DEPDIR)/$(am__dirstamp)
-./webrtc_dsp/common_audio/signal_processing/refl_coef_to_lpc.lo:  \
-	webrtc_dsp/common_audio/signal_processing/$(am__dirstamp) \
-	webrtc_dsp/common_audio/signal_processing/$(DEPDIR)/$(am__dirstamp)
-./webrtc_dsp/common_audio/signal_processing/filter_ar.lo:  \
-	webrtc_dsp/common_audio/signal_processing/$(am__dirstamp) \
-	webrtc_dsp/common_audio/signal_processing/$(DEPDIR)/$(am__dirstamp)
-./webrtc_dsp/common_audio/signal_processing/vector_scaling_operations.lo:  \
-	webrtc_dsp/common_audio/signal_processing/$(am__dirstamp) \
-	webrtc_dsp/common_audio/signal_processing/$(DEPDIR)/$(am__dirstamp)
-./webrtc_dsp/common_audio/signal_processing/resample_fractional.lo:  \
-	webrtc_dsp/common_audio/signal_processing/$(am__dirstamp) \
-	webrtc_dsp/common_audio/signal_processing/$(DEPDIR)/$(am__dirstamp)
-./webrtc_dsp/common_audio/signal_processing/real_fft.lo:  \
-	webrtc_dsp/common_audio/signal_processing/$(am__dirstamp) \
-	webrtc_dsp/common_audio/signal_processing/$(DEPDIR)/$(am__dirstamp)
-./webrtc_dsp/common_audio/signal_processing/ilbc_specific_functions.lo:  \
-	webrtc_dsp/common_audio/signal_processing/$(am__dirstamp) \
-	webrtc_dsp/common_audio/signal_processing/$(DEPDIR)/$(am__dirstamp)
-./webrtc_dsp/common_audio/signal_processing/randomization_functions.lo:  \
-	webrtc_dsp/common_audio/signal_processing/$(am__dirstamp) \
-	webrtc_dsp/common_audio/signal_processing/$(DEPDIR)/$(am__dirstamp)
-./webrtc_dsp/common_audio/signal_processing/copy_set_operations.lo:  \
-	webrtc_dsp/common_audio/signal_processing/$(am__dirstamp) \
-	webrtc_dsp/common_audio/signal_processing/$(DEPDIR)/$(am__dirstamp)
-./webrtc_dsp/common_audio/signal_processing/resample_by_2.lo:  \
-	webrtc_dsp/common_audio/signal_processing/$(am__dirstamp) \
-	webrtc_dsp/common_audio/signal_processing/$(DEPDIR)/$(am__dirstamp)
-./webrtc_dsp/common_audio/signal_processing/get_hanning_window.lo:  \
-	webrtc_dsp/common_audio/signal_processing/$(am__dirstamp) \
-	webrtc_dsp/common_audio/signal_processing/$(DEPDIR)/$(am__dirstamp)
-./webrtc_dsp/common_audio/signal_processing/resample_48khz.lo:  \
-	webrtc_dsp/common_audio/signal_processing/$(am__dirstamp) \
-	webrtc_dsp/common_audio/signal_processing/$(DEPDIR)/$(am__dirstamp)
-./webrtc_dsp/common_audio/signal_processing/spl_inl.lo:  \
-	webrtc_dsp/common_audio/signal_processing/$(am__dirstamp) \
-	webrtc_dsp/common_audio/signal_processing/$(DEPDIR)/$(am__dirstamp)
-./webrtc_dsp/common_audio/signal_processing/spl_sqrt.lo:  \
-	webrtc_dsp/common_audio/signal_processing/$(am__dirstamp) \
-	webrtc_dsp/common_audio/signal_processing/$(DEPDIR)/$(am__dirstamp)
-webrtc_dsp/common_audio/vad/$(am__dirstamp):
-	@$(MKDIR_P) ./webrtc_dsp/common_audio/vad
-	@: > webrtc_dsp/common_audio/vad/$(am__dirstamp)
-webrtc_dsp/common_audio/vad/$(DEPDIR)/$(am__dirstamp):
-	@$(MKDIR_P) ./webrtc_dsp/common_audio/vad/$(DEPDIR)
-	@: > webrtc_dsp/common_audio/vad/$(DEPDIR)/$(am__dirstamp)
-./webrtc_dsp/common_audio/vad/vad_sp.lo:  \
-	webrtc_dsp/common_audio/vad/$(am__dirstamp) \
-	webrtc_dsp/common_audio/vad/$(DEPDIR)/$(am__dirstamp)
-./webrtc_dsp/common_audio/vad/vad.lo:  \
-	webrtc_dsp/common_audio/vad/$(am__dirstamp) \
-	webrtc_dsp/common_audio/vad/$(DEPDIR)/$(am__dirstamp)
-./webrtc_dsp/common_audio/vad/webrtc_vad.lo:  \
-	webrtc_dsp/common_audio/vad/$(am__dirstamp) \
-	webrtc_dsp/common_audio/vad/$(DEPDIR)/$(am__dirstamp)
-./webrtc_dsp/common_audio/vad/vad_filterbank.lo:  \
-	webrtc_dsp/common_audio/vad/$(am__dirstamp) \
-	webrtc_dsp/common_audio/vad/$(DEPDIR)/$(am__dirstamp)
-./webrtc_dsp/common_audio/vad/vad_core.lo:  \
-	webrtc_dsp/common_audio/vad/$(am__dirstamp) \
-	webrtc_dsp/common_audio/vad/$(DEPDIR)/$(am__dirstamp)
-./webrtc_dsp/common_audio/vad/vad_gmm.lo:  \
-	webrtc_dsp/common_audio/vad/$(am__dirstamp) \
-	webrtc_dsp/common_audio/vad/$(DEPDIR)/$(am__dirstamp)
-webrtc_dsp/rtc_base/logging_mac.lo:  \
-	webrtc_dsp/rtc_base/$(am__dirstamp) \
-	webrtc_dsp/rtc_base/$(DEPDIR)/$(am__dirstamp)
-webrtc_dsp/modules/audio_processing/aec/aec_core_sse2.lo:  \
-	webrtc_dsp/modules/audio_processing/aec/$(am__dirstamp) \
-	webrtc_dsp/modules/audio_processing/aec/$(DEPDIR)/$(am__dirstamp)
-webrtc_dsp/modules/audio_processing/utility/ooura_fft_sse2.lo:  \
-	webrtc_dsp/modules/audio_processing/utility/$(am__dirstamp) \
-	webrtc_dsp/modules/audio_processing/utility/$(DEPDIR)/$(am__dirstamp)
-audio/AudioIOCallback.lo: audio/$(am__dirstamp) \
-	audio/$(DEPDIR)/$(am__dirstamp)
-webrtc_dsp/common_audio/signal_processing/complex_bit_reverse_arm.lo:  \
-	webrtc_dsp/common_audio/signal_processing/$(am__dirstamp) \
-	webrtc_dsp/common_audio/signal_processing/$(DEPDIR)/$(am__dirstamp)
-webrtc_dsp/common_audio/third_party/spl_sqrt_floor/$(am__dirstamp):
-	@$(MKDIR_P) webrtc_dsp/common_audio/third_party/spl_sqrt_floor
-	@: > webrtc_dsp/common_audio/third_party/spl_sqrt_floor/$(am__dirstamp)
-webrtc_dsp/common_audio/third_party/spl_sqrt_floor/$(DEPDIR)/$(am__dirstamp):
-	@$(MKDIR_P) webrtc_dsp/common_audio/third_party/spl_sqrt_floor/$(DEPDIR)
-	@: > webrtc_dsp/common_audio/third_party/spl_sqrt_floor/$(DEPDIR)/$(am__dirstamp)
-webrtc_dsp/common_audio/third_party/spl_sqrt_floor/spl_sqrt_floor_arm.lo: webrtc_dsp/common_audio/third_party/spl_sqrt_floor/$(am__dirstamp) \
-	webrtc_dsp/common_audio/third_party/spl_sqrt_floor/$(DEPDIR)/$(am__dirstamp)
-webrtc_dsp/common_audio/signal_processing/cross_correlation_neon.lo:  \
-	webrtc_dsp/common_audio/signal_processing/$(am__dirstamp) \
-	webrtc_dsp/common_audio/signal_processing/$(DEPDIR)/$(am__dirstamp)
-webrtc_dsp/common_audio/signal_processing/downsample_fast_neon.lo:  \
-	webrtc_dsp/common_audio/signal_processing/$(am__dirstamp) \
-	webrtc_dsp/common_audio/signal_processing/$(DEPDIR)/$(am__dirstamp)
-webrtc_dsp/common_audio/signal_processing/min_max_operations_neon.lo:  \
-	webrtc_dsp/common_audio/signal_processing/$(am__dirstamp) \
-	webrtc_dsp/common_audio/signal_processing/$(DEPDIR)/$(am__dirstamp)
-webrtc_dsp/modules/audio_processing/aec/aec_core_neon.lo:  \
-	webrtc_dsp/modules/audio_processing/aec/$(am__dirstamp) \
-	webrtc_dsp/modules/audio_processing/aec/$(DEPDIR)/$(am__dirstamp)
-webrtc_dsp/modules/audio_processing/aecm/aecm_core_neon.lo:  \
-	webrtc_dsp/modules/audio_processing/aecm/$(am__dirstamp) \
-	webrtc_dsp/modules/audio_processing/aecm/$(DEPDIR)/$(am__dirstamp)
-webrtc_dsp/modules/audio_processing/ns/nsx_core_neon.lo:  \
-	webrtc_dsp/modules/audio_processing/ns/$(am__dirstamp) \
-	webrtc_dsp/modules/audio_processing/ns/$(DEPDIR)/$(am__dirstamp)
-webrtc_dsp/modules/audio_processing/utility/ooura_fft_neon.lo:  \
-	webrtc_dsp/modules/audio_processing/utility/$(am__dirstamp) \
-	webrtc_dsp/modules/audio_processing/utility/$(DEPDIR)/$(am__dirstamp)
-webrtc_dsp/common_audio/signal_processing/complex_bit_reverse.lo:  \
-	webrtc_dsp/common_audio/signal_processing/$(am__dirstamp) \
-	webrtc_dsp/common_audio/signal_processing/$(DEPDIR)/$(am__dirstamp)
-webrtc_dsp/common_audio/third_party/spl_sqrt_floor/spl_sqrt_floor.lo: webrtc_dsp/common_audio/third_party/spl_sqrt_floor/$(am__dirstamp) \
-	webrtc_dsp/common_audio/third_party/spl_sqrt_floor/$(DEPDIR)/$(am__dirstamp)
-
-libtgvoip.la: $(libtgvoip_la_OBJECTS) $(libtgvoip_la_DEPENDENCIES) $(EXTRA_libtgvoip_la_DEPENDENCIES) 
-	$(AM_V_OBJCXXLD)$(OBJCXXLINK) -rpath $(libdir) $(libtgvoip_la_OBJECTS) $(libtgvoip_la_LIBADD) $(LIBS)
-
-mostlyclean-compile:
-	-rm -f *.$(OBJEXT)
-	-rm -f ./webrtc_dsp/absl/base/internal/*.$(OBJEXT)
-	-rm -f ./webrtc_dsp/absl/base/internal/*.lo
-	-rm -f ./webrtc_dsp/absl/strings/*.$(OBJEXT)
-	-rm -f ./webrtc_dsp/absl/strings/*.lo
-	-rm -f ./webrtc_dsp/absl/strings/internal/*.$(OBJEXT)
-	-rm -f ./webrtc_dsp/absl/strings/internal/*.lo
-	-rm -f ./webrtc_dsp/absl/types/*.$(OBJEXT)
-	-rm -f ./webrtc_dsp/absl/types/*.lo
-	-rm -f ./webrtc_dsp/api/audio/*.$(OBJEXT)
-	-rm -f ./webrtc_dsp/api/audio/*.lo
-	-rm -f ./webrtc_dsp/common_audio/*.$(OBJEXT)
-	-rm -f ./webrtc_dsp/common_audio/*.lo
-	-rm -f ./webrtc_dsp/common_audio/resampler/*.$(OBJEXT)
-	-rm -f ./webrtc_dsp/common_audio/resampler/*.lo
-	-rm -f ./webrtc_dsp/common_audio/signal_processing/*.$(OBJEXT)
-	-rm -f ./webrtc_dsp/common_audio/signal_processing/*.lo
-	-rm -f ./webrtc_dsp/common_audio/third_party/fft4g/*.$(OBJEXT)
-	-rm -f ./webrtc_dsp/common_audio/third_party/fft4g/*.lo
-	-rm -f ./webrtc_dsp/common_audio/vad/*.$(OBJEXT)
-	-rm -f ./webrtc_dsp/common_audio/vad/*.lo
-	-rm -f ./webrtc_dsp/modules/audio_coding/codecs/isac/main/source/*.$(OBJEXT)
-	-rm -f ./webrtc_dsp/modules/audio_coding/codecs/isac/main/source/*.lo
-	-rm -f ./webrtc_dsp/modules/audio_processing/*.$(OBJEXT)
-	-rm -f ./webrtc_dsp/modules/audio_processing/*.lo
-	-rm -f ./webrtc_dsp/modules/audio_processing/aec/*.$(OBJEXT)
-	-rm -f ./webrtc_dsp/modules/audio_processing/aec/*.lo
-	-rm -f ./webrtc_dsp/modules/audio_processing/aec3/*.$(OBJEXT)
-	-rm -f ./webrtc_dsp/modules/audio_processing/aec3/*.lo
-	-rm -f ./webrtc_dsp/modules/audio_processing/aecm/*.$(OBJEXT)
-	-rm -f ./webrtc_dsp/modules/audio_processing/aecm/*.lo
-	-rm -f ./webrtc_dsp/modules/audio_processing/agc/*.$(OBJEXT)
-	-rm -f ./webrtc_dsp/modules/audio_processing/agc/*.lo
-	-rm -f ./webrtc_dsp/modules/audio_processing/agc/legacy/*.$(OBJEXT)
-	-rm -f ./webrtc_dsp/modules/audio_processing/agc/legacy/*.lo
-	-rm -f ./webrtc_dsp/modules/audio_processing/agc2/*.$(OBJEXT)
-	-rm -f ./webrtc_dsp/modules/audio_processing/agc2/*.lo
-	-rm -f ./webrtc_dsp/modules/audio_processing/agc2/rnn_vad/*.$(OBJEXT)
-	-rm -f ./webrtc_dsp/modules/audio_processing/agc2/rnn_vad/*.lo
-	-rm -f ./webrtc_dsp/modules/audio_processing/audio_generator/*.$(OBJEXT)
-	-rm -f ./webrtc_dsp/modules/audio_processing/audio_generator/*.lo
-	-rm -f ./webrtc_dsp/modules/audio_processing/echo_detector/*.$(OBJEXT)
-	-rm -f ./webrtc_dsp/modules/audio_processing/echo_detector/*.lo
-	-rm -f ./webrtc_dsp/modules/audio_processing/include/*.$(OBJEXT)
-	-rm -f ./webrtc_dsp/modules/audio_processing/include/*.lo
-	-rm -f ./webrtc_dsp/modules/audio_processing/logging/*.$(OBJEXT)
-	-rm -f ./webrtc_dsp/modules/audio_processing/logging/*.lo
-	-rm -f ./webrtc_dsp/modules/audio_processing/ns/*.$(OBJEXT)
-	-rm -f ./webrtc_dsp/modules/audio_processing/ns/*.lo
-	-rm -f ./webrtc_dsp/modules/audio_processing/transient/*.$(OBJEXT)
-	-rm -f ./webrtc_dsp/modules/audio_processing/transient/*.lo
-	-rm -f ./webrtc_dsp/modules/audio_processing/utility/*.$(OBJEXT)
-	-rm -f ./webrtc_dsp/modules/audio_processing/utility/*.lo
-	-rm -f ./webrtc_dsp/modules/audio_processing/vad/*.$(OBJEXT)
-	-rm -f ./webrtc_dsp/modules/audio_processing/vad/*.lo
-	-rm -f ./webrtc_dsp/modules/third_party/fft/*.$(OBJEXT)
-	-rm -f ./webrtc_dsp/modules/third_party/fft/*.lo
-	-rm -f ./webrtc_dsp/rtc_base/*.$(OBJEXT)
-	-rm -f ./webrtc_dsp/rtc_base/*.lo
-	-rm -f ./webrtc_dsp/rtc_base/memory/*.$(OBJEXT)
-	-rm -f ./webrtc_dsp/rtc_base/memory/*.lo
-	-rm -f ./webrtc_dsp/rtc_base/strings/*.$(OBJEXT)
-	-rm -f ./webrtc_dsp/rtc_base/strings/*.lo
-	-rm -f ./webrtc_dsp/system_wrappers/source/*.$(OBJEXT)
-	-rm -f ./webrtc_dsp/system_wrappers/source/*.lo
-	-rm -f ./webrtc_dsp/third_party/rnnoise/src/*.$(OBJEXT)
-	-rm -f ./webrtc_dsp/third_party/rnnoise/src/*.lo
-	-rm -f audio/*.$(OBJEXT)
-	-rm -f audio/*.lo
-	-rm -f os/darwin/*.$(OBJEXT)
-	-rm -f os/darwin/*.lo
-	-rm -f os/linux/*.$(OBJEXT)
-	-rm -f os/linux/*.lo
-	-rm -f os/posix/*.$(OBJEXT)
-	-rm -f os/posix/*.lo
-	-rm -f video/*.$(OBJEXT)
-	-rm -f video/*.lo
-	-rm -f webrtc_dsp/common_audio/signal_processing/*.$(OBJEXT)
-	-rm -f webrtc_dsp/common_audio/signal_processing/*.lo
-	-rm -f webrtc_dsp/common_audio/third_party/spl_sqrt_floor/*.$(OBJEXT)
-	-rm -f webrtc_dsp/common_audio/third_party/spl_sqrt_floor/*.lo
-	-rm -f webrtc_dsp/modules/audio_processing/aec/*.$(OBJEXT)
-	-rm -f webrtc_dsp/modules/audio_processing/aec/*.lo
-	-rm -f webrtc_dsp/modules/audio_processing/aecm/*.$(OBJEXT)
-	-rm -f webrtc_dsp/modules/audio_processing/aecm/*.lo
-	-rm -f webrtc_dsp/modules/audio_processing/ns/*.$(OBJEXT)
-	-rm -f webrtc_dsp/modules/audio_processing/ns/*.lo
-	-rm -f webrtc_dsp/modules/audio_processing/utility/*.$(OBJEXT)
-	-rm -f webrtc_dsp/modules/audio_processing/utility/*.lo
-	-rm -f webrtc_dsp/rtc_base/*.$(OBJEXT)
-	-rm -f webrtc_dsp/rtc_base/*.lo
-
-distclean-compile:
-	-rm -f *.tab.c
-
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Buffers.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CongestionControl.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/EchoCanceller.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/JitterBuffer.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/MediaStreamItf.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/MessageThread.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/NetworkSocket.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/OpusDecoder.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/OpusEncoder.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/PacketReassembler.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/VoIPController.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/VoIPGroupController.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/VoIPServerConfig.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/json11.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/logging.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./webrtc_dsp/absl/base/internal/$(DEPDIR)/raw_logging.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./webrtc_dsp/absl/base/internal/$(DEPDIR)/throw_delegate.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./webrtc_dsp/absl/strings/$(DEPDIR)/ascii.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./webrtc_dsp/absl/strings/$(DEPDIR)/string_view.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./webrtc_dsp/absl/strings/internal/$(DEPDIR)/memutil.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./webrtc_dsp/absl/types/$(DEPDIR)/bad_optional_access.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./webrtc_dsp/absl/types/$(DEPDIR)/optional.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./webrtc_dsp/api/audio/$(DEPDIR)/audio_frame.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./webrtc_dsp/api/audio/$(DEPDIR)/echo_canceller3_config.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./webrtc_dsp/api/audio/$(DEPDIR)/echo_canceller3_factory.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./webrtc_dsp/common_audio/$(DEPDIR)/audio_converter.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./webrtc_dsp/common_audio/$(DEPDIR)/audio_util.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./webrtc_dsp/common_audio/$(DEPDIR)/channel_buffer.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./webrtc_dsp/common_audio/$(DEPDIR)/fir_filter_c.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./webrtc_dsp/common_audio/$(DEPDIR)/fir_filter_factory.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./webrtc_dsp/common_audio/$(DEPDIR)/fir_filter_sse.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./webrtc_dsp/common_audio/$(DEPDIR)/real_fourier.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./webrtc_dsp/common_audio/$(DEPDIR)/real_fourier_ooura.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./webrtc_dsp/common_audio/$(DEPDIR)/ring_buffer.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./webrtc_dsp/common_audio/$(DEPDIR)/smoothing_filter.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./webrtc_dsp/common_audio/$(DEPDIR)/sparse_fir_filter.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./webrtc_dsp/common_audio/$(DEPDIR)/wav_file.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./webrtc_dsp/common_audio/$(DEPDIR)/wav_header.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./webrtc_dsp/common_audio/$(DEPDIR)/window_generator.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./webrtc_dsp/common_audio/resampler/$(DEPDIR)/push_resampler.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./webrtc_dsp/common_audio/resampler/$(DEPDIR)/push_sinc_resampler.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./webrtc_dsp/common_audio/resampler/$(DEPDIR)/resampler.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./webrtc_dsp/common_audio/resampler/$(DEPDIR)/sinc_resampler.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./webrtc_dsp/common_audio/resampler/$(DEPDIR)/sinc_resampler_sse.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./webrtc_dsp/common_audio/resampler/$(DEPDIR)/sinusoidal_linear_chirp_source.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./webrtc_dsp/common_audio/signal_processing/$(DEPDIR)/auto_corr_to_refl_coef.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./webrtc_dsp/common_audio/signal_processing/$(DEPDIR)/auto_correlation.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./webrtc_dsp/common_audio/signal_processing/$(DEPDIR)/complex_fft.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./webrtc_dsp/common_audio/signal_processing/$(DEPDIR)/copy_set_operations.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./webrtc_dsp/common_audio/signal_processing/$(DEPDIR)/cross_correlation.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./webrtc_dsp/common_audio/signal_processing/$(DEPDIR)/division_operations.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./webrtc_dsp/common_audio/signal_processing/$(DEPDIR)/dot_product_with_scale.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./webrtc_dsp/common_audio/signal_processing/$(DEPDIR)/downsample_fast.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./webrtc_dsp/common_audio/signal_processing/$(DEPDIR)/energy.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./webrtc_dsp/common_audio/signal_processing/$(DEPDIR)/filter_ar.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./webrtc_dsp/common_audio/signal_processing/$(DEPDIR)/filter_ar_fast_q12.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./webrtc_dsp/common_audio/signal_processing/$(DEPDIR)/filter_ma_fast_q12.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./webrtc_dsp/common_audio/signal_processing/$(DEPDIR)/get_hanning_window.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./webrtc_dsp/common_audio/signal_processing/$(DEPDIR)/get_scaling_square.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./webrtc_dsp/common_audio/signal_processing/$(DEPDIR)/ilbc_specific_functions.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./webrtc_dsp/common_audio/signal_processing/$(DEPDIR)/levinson_durbin.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./webrtc_dsp/common_audio/signal_processing/$(DEPDIR)/lpc_to_refl_coef.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./webrtc_dsp/common_audio/signal_processing/$(DEPDIR)/min_max_operations.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./webrtc_dsp/common_audio/signal_processing/$(DEPDIR)/randomization_functions.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./webrtc_dsp/common_audio/signal_processing/$(DEPDIR)/real_fft.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./webrtc_dsp/common_audio/signal_processing/$(DEPDIR)/refl_coef_to_lpc.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./webrtc_dsp/common_audio/signal_processing/$(DEPDIR)/resample.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./webrtc_dsp/common_audio/signal_processing/$(DEPDIR)/resample_48khz.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./webrtc_dsp/common_audio/signal_processing/$(DEPDIR)/resample_by_2.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./webrtc_dsp/common_audio/signal_processing/$(DEPDIR)/resample_by_2_internal.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./webrtc_dsp/common_audio/signal_processing/$(DEPDIR)/resample_fractional.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./webrtc_dsp/common_audio/signal_processing/$(DEPDIR)/spl_init.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./webrtc_dsp/common_audio/signal_processing/$(DEPDIR)/spl_inl.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./webrtc_dsp/common_audio/signal_processing/$(DEPDIR)/spl_sqrt.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./webrtc_dsp/common_audio/signal_processing/$(DEPDIR)/splitting_filter1.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./webrtc_dsp/common_audio/signal_processing/$(DEPDIR)/sqrt_of_one_minus_x_squared.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./webrtc_dsp/common_audio/signal_processing/$(DEPDIR)/vector_scaling_operations.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./webrtc_dsp/common_audio/third_party/fft4g/$(DEPDIR)/fft4g.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./webrtc_dsp/common_audio/vad/$(DEPDIR)/vad.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./webrtc_dsp/common_audio/vad/$(DEPDIR)/vad_core.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./webrtc_dsp/common_audio/vad/$(DEPDIR)/vad_filterbank.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./webrtc_dsp/common_audio/vad/$(DEPDIR)/vad_gmm.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./webrtc_dsp/common_audio/vad/$(DEPDIR)/vad_sp.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./webrtc_dsp/common_audio/vad/$(DEPDIR)/webrtc_vad.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./webrtc_dsp/modules/audio_coding/codecs/isac/main/source/$(DEPDIR)/arith_routines.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./webrtc_dsp/modules/audio_coding/codecs/isac/main/source/$(DEPDIR)/arith_routines_hist.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./webrtc_dsp/modules/audio_coding/codecs/isac/main/source/$(DEPDIR)/arith_routines_logist.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./webrtc_dsp/modules/audio_coding/codecs/isac/main/source/$(DEPDIR)/bandwidth_estimator.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./webrtc_dsp/modules/audio_coding/codecs/isac/main/source/$(DEPDIR)/crc.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./webrtc_dsp/modules/audio_coding/codecs/isac/main/source/$(DEPDIR)/decode.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./webrtc_dsp/modules/audio_coding/codecs/isac/main/source/$(DEPDIR)/decode_bwe.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./webrtc_dsp/modules/audio_coding/codecs/isac/main/source/$(DEPDIR)/encode.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./webrtc_dsp/modules/audio_coding/codecs/isac/main/source/$(DEPDIR)/encode_lpc_swb.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./webrtc_dsp/modules/audio_coding/codecs/isac/main/source/$(DEPDIR)/entropy_coding.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./webrtc_dsp/modules/audio_coding/codecs/isac/main/source/$(DEPDIR)/filter_functions.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./webrtc_dsp/modules/audio_coding/codecs/isac/main/source/$(DEPDIR)/filterbanks.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./webrtc_dsp/modules/audio_coding/codecs/isac/main/source/$(DEPDIR)/intialize.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./webrtc_dsp/modules/audio_coding/codecs/isac/main/source/$(DEPDIR)/isac.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./webrtc_dsp/modules/audio_coding/codecs/isac/main/source/$(DEPDIR)/isac_vad.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./webrtc_dsp/modules/audio_coding/codecs/isac/main/source/$(DEPDIR)/lattice.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./webrtc_dsp/modules/audio_coding/codecs/isac/main/source/$(DEPDIR)/lpc_analysis.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./webrtc_dsp/modules/audio_coding/codecs/isac/main/source/$(DEPDIR)/lpc_gain_swb_tables.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./webrtc_dsp/modules/audio_coding/codecs/isac/main/source/$(DEPDIR)/lpc_shape_swb12_tables.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./webrtc_dsp/modules/audio_coding/codecs/isac/main/source/$(DEPDIR)/lpc_shape_swb16_tables.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./webrtc_dsp/modules/audio_coding/codecs/isac/main/source/$(DEPDIR)/lpc_tables.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./webrtc_dsp/modules/audio_coding/codecs/isac/main/source/$(DEPDIR)/pitch_estimator.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./webrtc_dsp/modules/audio_coding/codecs/isac/main/source/$(DEPDIR)/pitch_filter.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./webrtc_dsp/modules/audio_coding/codecs/isac/main/source/$(DEPDIR)/pitch_gain_tables.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./webrtc_dsp/modules/audio_coding/codecs/isac/main/source/$(DEPDIR)/pitch_lag_tables.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./webrtc_dsp/modules/audio_coding/codecs/isac/main/source/$(DEPDIR)/spectrum_ar_model_tables.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./webrtc_dsp/modules/audio_coding/codecs/isac/main/source/$(DEPDIR)/transform.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./webrtc_dsp/modules/audio_processing/$(DEPDIR)/audio_buffer.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./webrtc_dsp/modules/audio_processing/$(DEPDIR)/audio_processing_impl.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./webrtc_dsp/modules/audio_processing/$(DEPDIR)/echo_cancellation_impl.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./webrtc_dsp/modules/audio_processing/$(DEPDIR)/echo_control_mobile_impl.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./webrtc_dsp/modules/audio_processing/$(DEPDIR)/gain_control_for_experimental_agc.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./webrtc_dsp/modules/audio_processing/$(DEPDIR)/gain_control_impl.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./webrtc_dsp/modules/audio_processing/$(DEPDIR)/gain_controller2.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./webrtc_dsp/modules/audio_processing/$(DEPDIR)/level_estimator_impl.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./webrtc_dsp/modules/audio_processing/$(DEPDIR)/low_cut_filter.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./webrtc_dsp/modules/audio_processing/$(DEPDIR)/noise_suppression_impl.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./webrtc_dsp/modules/audio_processing/$(DEPDIR)/residual_echo_detector.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./webrtc_dsp/modules/audio_processing/$(DEPDIR)/rms_level.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./webrtc_dsp/modules/audio_processing/$(DEPDIR)/splitting_filter.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./webrtc_dsp/modules/audio_processing/$(DEPDIR)/three_band_filter_bank.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./webrtc_dsp/modules/audio_processing/$(DEPDIR)/typing_detection.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./webrtc_dsp/modules/audio_processing/$(DEPDIR)/voice_detection_impl.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./webrtc_dsp/modules/audio_processing/aec/$(DEPDIR)/aec_core.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./webrtc_dsp/modules/audio_processing/aec/$(DEPDIR)/aec_resampler.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./webrtc_dsp/modules/audio_processing/aec/$(DEPDIR)/echo_cancellation.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./webrtc_dsp/modules/audio_processing/aec3/$(DEPDIR)/adaptive_fir_filter.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./webrtc_dsp/modules/audio_processing/aec3/$(DEPDIR)/aec3_common.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./webrtc_dsp/modules/audio_processing/aec3/$(DEPDIR)/aec3_fft.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./webrtc_dsp/modules/audio_processing/aec3/$(DEPDIR)/aec_state.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./webrtc_dsp/modules/audio_processing/aec3/$(DEPDIR)/block_delay_buffer.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./webrtc_dsp/modules/audio_processing/aec3/$(DEPDIR)/block_framer.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./webrtc_dsp/modules/audio_processing/aec3/$(DEPDIR)/block_processor.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./webrtc_dsp/modules/audio_processing/aec3/$(DEPDIR)/block_processor2.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./webrtc_dsp/modules/audio_processing/aec3/$(DEPDIR)/block_processor_metrics.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./webrtc_dsp/modules/audio_processing/aec3/$(DEPDIR)/cascaded_biquad_filter.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./webrtc_dsp/modules/audio_processing/aec3/$(DEPDIR)/comfort_noise_generator.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./webrtc_dsp/modules/audio_processing/aec3/$(DEPDIR)/decimator.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./webrtc_dsp/modules/audio_processing/aec3/$(DEPDIR)/downsampled_render_buffer.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./webrtc_dsp/modules/audio_processing/aec3/$(DEPDIR)/echo_audibility.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./webrtc_dsp/modules/audio_processing/aec3/$(DEPDIR)/echo_canceller3.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./webrtc_dsp/modules/audio_processing/aec3/$(DEPDIR)/echo_path_delay_estimator.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./webrtc_dsp/modules/audio_processing/aec3/$(DEPDIR)/echo_path_variability.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./webrtc_dsp/modules/audio_processing/aec3/$(DEPDIR)/echo_remover.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./webrtc_dsp/modules/audio_processing/aec3/$(DEPDIR)/echo_remover_metrics.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./webrtc_dsp/modules/audio_processing/aec3/$(DEPDIR)/erl_estimator.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./webrtc_dsp/modules/audio_processing/aec3/$(DEPDIR)/erle_estimator.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./webrtc_dsp/modules/audio_processing/aec3/$(DEPDIR)/fft_buffer.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./webrtc_dsp/modules/audio_processing/aec3/$(DEPDIR)/filter_analyzer.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./webrtc_dsp/modules/audio_processing/aec3/$(DEPDIR)/frame_blocker.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./webrtc_dsp/modules/audio_processing/aec3/$(DEPDIR)/fullband_erle_estimator.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./webrtc_dsp/modules/audio_processing/aec3/$(DEPDIR)/main_filter_update_gain.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./webrtc_dsp/modules/audio_processing/aec3/$(DEPDIR)/matched_filter.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./webrtc_dsp/modules/audio_processing/aec3/$(DEPDIR)/matched_filter_lag_aggregator.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./webrtc_dsp/modules/audio_processing/aec3/$(DEPDIR)/matrix_buffer.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./webrtc_dsp/modules/audio_processing/aec3/$(DEPDIR)/moving_average.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./webrtc_dsp/modules/audio_processing/aec3/$(DEPDIR)/render_buffer.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./webrtc_dsp/modules/audio_processing/aec3/$(DEPDIR)/render_delay_buffer.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./webrtc_dsp/modules/audio_processing/aec3/$(DEPDIR)/render_delay_buffer2.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./webrtc_dsp/modules/audio_processing/aec3/$(DEPDIR)/render_delay_controller.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./webrtc_dsp/modules/audio_processing/aec3/$(DEPDIR)/render_delay_controller2.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./webrtc_dsp/modules/audio_processing/aec3/$(DEPDIR)/render_delay_controller_metrics.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./webrtc_dsp/modules/audio_processing/aec3/$(DEPDIR)/render_reverb_model.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./webrtc_dsp/modules/audio_processing/aec3/$(DEPDIR)/render_signal_analyzer.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./webrtc_dsp/modules/audio_processing/aec3/$(DEPDIR)/residual_echo_estimator.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./webrtc_dsp/modules/audio_processing/aec3/$(DEPDIR)/reverb_decay_estimator.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./webrtc_dsp/modules/audio_processing/aec3/$(DEPDIR)/reverb_frequency_response.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./webrtc_dsp/modules/audio_processing/aec3/$(DEPDIR)/reverb_model.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./webrtc_dsp/modules/audio_processing/aec3/$(DEPDIR)/reverb_model_estimator.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./webrtc_dsp/modules/audio_processing/aec3/$(DEPDIR)/reverb_model_fallback.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./webrtc_dsp/modules/audio_processing/aec3/$(DEPDIR)/shadow_filter_update_gain.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./webrtc_dsp/modules/audio_processing/aec3/$(DEPDIR)/skew_estimator.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./webrtc_dsp/modules/audio_processing/aec3/$(DEPDIR)/stationarity_estimator.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./webrtc_dsp/modules/audio_processing/aec3/$(DEPDIR)/subband_erle_estimator.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./webrtc_dsp/modules/audio_processing/aec3/$(DEPDIR)/subtractor.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./webrtc_dsp/modules/audio_processing/aec3/$(DEPDIR)/subtractor_output.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./webrtc_dsp/modules/audio_processing/aec3/$(DEPDIR)/subtractor_output_analyzer.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./webrtc_dsp/modules/audio_processing/aec3/$(DEPDIR)/suppression_filter.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./webrtc_dsp/modules/audio_processing/aec3/$(DEPDIR)/suppression_gain.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./webrtc_dsp/modules/audio_processing/aec3/$(DEPDIR)/suppression_gain_limiter.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./webrtc_dsp/modules/audio_processing/aec3/$(DEPDIR)/vector_buffer.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./webrtc_dsp/modules/audio_processing/aecm/$(DEPDIR)/aecm_core.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./webrtc_dsp/modules/audio_processing/aecm/$(DEPDIR)/aecm_core_c.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./webrtc_dsp/modules/audio_processing/aecm/$(DEPDIR)/echo_control_mobile.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./webrtc_dsp/modules/audio_processing/agc/$(DEPDIR)/agc.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./webrtc_dsp/modules/audio_processing/agc/$(DEPDIR)/agc_manager_direct.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./webrtc_dsp/modules/audio_processing/agc/$(DEPDIR)/loudness_histogram.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./webrtc_dsp/modules/audio_processing/agc/$(DEPDIR)/utility.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./webrtc_dsp/modules/audio_processing/agc/legacy/$(DEPDIR)/analog_agc.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./webrtc_dsp/modules/audio_processing/agc/legacy/$(DEPDIR)/digital_agc.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./webrtc_dsp/modules/audio_processing/agc2/$(DEPDIR)/adaptive_agc.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./webrtc_dsp/modules/audio_processing/agc2/$(DEPDIR)/adaptive_digital_gain_applier.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./webrtc_dsp/modules/audio_processing/agc2/$(DEPDIR)/adaptive_mode_level_estimator.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./webrtc_dsp/modules/audio_processing/agc2/$(DEPDIR)/adaptive_mode_level_estimator_agc.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./webrtc_dsp/modules/audio_processing/agc2/$(DEPDIR)/agc2_common.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./webrtc_dsp/modules/audio_processing/agc2/$(DEPDIR)/agc2_testing_common.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./webrtc_dsp/modules/audio_processing/agc2/$(DEPDIR)/biquad_filter.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./webrtc_dsp/modules/audio_processing/agc2/$(DEPDIR)/compute_interpolated_gain_curve.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./webrtc_dsp/modules/audio_processing/agc2/$(DEPDIR)/down_sampler.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./webrtc_dsp/modules/audio_processing/agc2/$(DEPDIR)/fixed_digital_level_estimator.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./webrtc_dsp/modules/audio_processing/agc2/$(DEPDIR)/fixed_gain_controller.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./webrtc_dsp/modules/audio_processing/agc2/$(DEPDIR)/gain_applier.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./webrtc_dsp/modules/audio_processing/agc2/$(DEPDIR)/interpolated_gain_curve.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./webrtc_dsp/modules/audio_processing/agc2/$(DEPDIR)/limiter.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./webrtc_dsp/modules/audio_processing/agc2/$(DEPDIR)/limiter_db_gain_curve.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./webrtc_dsp/modules/audio_processing/agc2/$(DEPDIR)/noise_level_estimator.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./webrtc_dsp/modules/audio_processing/agc2/$(DEPDIR)/noise_spectrum_estimator.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./webrtc_dsp/modules/audio_processing/agc2/$(DEPDIR)/saturation_protector.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./webrtc_dsp/modules/audio_processing/agc2/$(DEPDIR)/signal_classifier.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./webrtc_dsp/modules/audio_processing/agc2/$(DEPDIR)/vad_with_level.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./webrtc_dsp/modules/audio_processing/agc2/$(DEPDIR)/vector_float_frame.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./webrtc_dsp/modules/audio_processing/agc2/rnn_vad/$(DEPDIR)/features_extraction.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./webrtc_dsp/modules/audio_processing/agc2/rnn_vad/$(DEPDIR)/fft_util.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./webrtc_dsp/modules/audio_processing/agc2/rnn_vad/$(DEPDIR)/lp_residual.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./webrtc_dsp/modules/audio_processing/agc2/rnn_vad/$(DEPDIR)/pitch_search.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./webrtc_dsp/modules/audio_processing/agc2/rnn_vad/$(DEPDIR)/pitch_search_internal.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./webrtc_dsp/modules/audio_processing/agc2/rnn_vad/$(DEPDIR)/rnn.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./webrtc_dsp/modules/audio_processing/agc2/rnn_vad/$(DEPDIR)/spectral_features.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./webrtc_dsp/modules/audio_processing/agc2/rnn_vad/$(DEPDIR)/spectral_features_internal.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./webrtc_dsp/modules/audio_processing/audio_generator/$(DEPDIR)/file_audio_generator.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./webrtc_dsp/modules/audio_processing/echo_detector/$(DEPDIR)/circular_buffer.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./webrtc_dsp/modules/audio_processing/echo_detector/$(DEPDIR)/mean_variance_estimator.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./webrtc_dsp/modules/audio_processing/echo_detector/$(DEPDIR)/moving_max.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./webrtc_dsp/modules/audio_processing/echo_detector/$(DEPDIR)/normalized_covariance_estimator.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./webrtc_dsp/modules/audio_processing/include/$(DEPDIR)/aec_dump.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./webrtc_dsp/modules/audio_processing/include/$(DEPDIR)/audio_generator_factory.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./webrtc_dsp/modules/audio_processing/include/$(DEPDIR)/audio_processing.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./webrtc_dsp/modules/audio_processing/include/$(DEPDIR)/audio_processing_statistics.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./webrtc_dsp/modules/audio_processing/include/$(DEPDIR)/config.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./webrtc_dsp/modules/audio_processing/logging/$(DEPDIR)/apm_data_dumper.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./webrtc_dsp/modules/audio_processing/ns/$(DEPDIR)/noise_suppression.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./webrtc_dsp/modules/audio_processing/ns/$(DEPDIR)/noise_suppression_x.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./webrtc_dsp/modules/audio_processing/ns/$(DEPDIR)/ns_core.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./webrtc_dsp/modules/audio_processing/ns/$(DEPDIR)/nsx_core.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./webrtc_dsp/modules/audio_processing/ns/$(DEPDIR)/nsx_core_c.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./webrtc_dsp/modules/audio_processing/transient/$(DEPDIR)/moving_moments.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./webrtc_dsp/modules/audio_processing/transient/$(DEPDIR)/transient_detector.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./webrtc_dsp/modules/audio_processing/transient/$(DEPDIR)/transient_suppressor.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./webrtc_dsp/modules/audio_processing/transient/$(DEPDIR)/wpd_node.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./webrtc_dsp/modules/audio_processing/transient/$(DEPDIR)/wpd_tree.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./webrtc_dsp/modules/audio_processing/utility/$(DEPDIR)/block_mean_calculator.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./webrtc_dsp/modules/audio_processing/utility/$(DEPDIR)/delay_estimator.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./webrtc_dsp/modules/audio_processing/utility/$(DEPDIR)/delay_estimator_wrapper.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./webrtc_dsp/modules/audio_processing/utility/$(DEPDIR)/ooura_fft.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./webrtc_dsp/modules/audio_processing/vad/$(DEPDIR)/gmm.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./webrtc_dsp/modules/audio_processing/vad/$(DEPDIR)/pitch_based_vad.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./webrtc_dsp/modules/audio_processing/vad/$(DEPDIR)/pitch_internal.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./webrtc_dsp/modules/audio_processing/vad/$(DEPDIR)/pole_zero_filter.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./webrtc_dsp/modules/audio_processing/vad/$(DEPDIR)/standalone_vad.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./webrtc_dsp/modules/audio_processing/vad/$(DEPDIR)/vad_audio_proc.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./webrtc_dsp/modules/audio_processing/vad/$(DEPDIR)/vad_circular_buffer.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./webrtc_dsp/modules/audio_processing/vad/$(DEPDIR)/voice_activity_detector.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./webrtc_dsp/modules/third_party/fft/$(DEPDIR)/fft.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./webrtc_dsp/rtc_base/$(DEPDIR)/checks.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./webrtc_dsp/rtc_base/$(DEPDIR)/criticalsection.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./webrtc_dsp/rtc_base/$(DEPDIR)/event.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./webrtc_dsp/rtc_base/$(DEPDIR)/event_tracer.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./webrtc_dsp/rtc_base/$(DEPDIR)/logging_webrtc.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./webrtc_dsp/rtc_base/$(DEPDIR)/platform_file.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./webrtc_dsp/rtc_base/$(DEPDIR)/platform_thread.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./webrtc_dsp/rtc_base/$(DEPDIR)/platform_thread_types.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./webrtc_dsp/rtc_base/$(DEPDIR)/race_checker.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./webrtc_dsp/rtc_base/$(DEPDIR)/string_to_number.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./webrtc_dsp/rtc_base/$(DEPDIR)/stringencode.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./webrtc_dsp/rtc_base/$(DEPDIR)/stringutils.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./webrtc_dsp/rtc_base/$(DEPDIR)/thread_checker_impl.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./webrtc_dsp/rtc_base/$(DEPDIR)/timeutils.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./webrtc_dsp/rtc_base/memory/$(DEPDIR)/aligned_malloc.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./webrtc_dsp/rtc_base/strings/$(DEPDIR)/string_builder.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./webrtc_dsp/system_wrappers/source/$(DEPDIR)/cpu_features.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./webrtc_dsp/system_wrappers/source/$(DEPDIR)/field_trial.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./webrtc_dsp/system_wrappers/source/$(DEPDIR)/metrics.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./webrtc_dsp/third_party/rnnoise/src/$(DEPDIR)/kiss_fft.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./webrtc_dsp/third_party/rnnoise/src/$(DEPDIR)/rnn_vad_weights.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@audio/$(DEPDIR)/AudioIO.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@audio/$(DEPDIR)/AudioIOCallback.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@audio/$(DEPDIR)/AudioInput.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@audio/$(DEPDIR)/AudioOutput.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@audio/$(DEPDIR)/Resampler.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@os/darwin/$(DEPDIR)/AudioInputAudioUnit.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@os/darwin/$(DEPDIR)/AudioInputAudioUnitOSX.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@os/darwin/$(DEPDIR)/AudioOutputAudioUnit.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@os/darwin/$(DEPDIR)/AudioOutputAudioUnitOSX.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@os/darwin/$(DEPDIR)/AudioUnitIO.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@os/darwin/$(DEPDIR)/DarwinSpecific.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@os/darwin/$(DEPDIR)/SampleBufferDisplayLayerRenderer.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@os/darwin/$(DEPDIR)/TGVVideoRenderer.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@os/darwin/$(DEPDIR)/TGVVideoSource.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@os/darwin/$(DEPDIR)/VideoToolboxEncoderSource.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@os/linux/$(DEPDIR)/AudioInputALSA.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@os/linux/$(DEPDIR)/AudioInputPulse.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@os/linux/$(DEPDIR)/AudioOutputALSA.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@os/linux/$(DEPDIR)/AudioOutputPulse.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@os/linux/$(DEPDIR)/AudioPulse.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@os/posix/$(DEPDIR)/NetworkSocketPosix.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@video/$(DEPDIR)/ScreamCongestionController.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@video/$(DEPDIR)/VideoRenderer.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@video/$(DEPDIR)/VideoSource.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@webrtc_dsp/common_audio/signal_processing/$(DEPDIR)/complex_bit_reverse.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@webrtc_dsp/common_audio/signal_processing/$(DEPDIR)/complex_bit_reverse_arm.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@webrtc_dsp/common_audio/signal_processing/$(DEPDIR)/cross_correlation_neon.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@webrtc_dsp/common_audio/signal_processing/$(DEPDIR)/downsample_fast_neon.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@webrtc_dsp/common_audio/signal_processing/$(DEPDIR)/min_max_operations_neon.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@webrtc_dsp/common_audio/third_party/spl_sqrt_floor/$(DEPDIR)/spl_sqrt_floor.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@webrtc_dsp/common_audio/third_party/spl_sqrt_floor/$(DEPDIR)/spl_sqrt_floor_arm.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@webrtc_dsp/modules/audio_processing/aec/$(DEPDIR)/aec_core_neon.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@webrtc_dsp/modules/audio_processing/aec/$(DEPDIR)/aec_core_sse2.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@webrtc_dsp/modules/audio_processing/aecm/$(DEPDIR)/aecm_core_neon.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@webrtc_dsp/modules/audio_processing/ns/$(DEPDIR)/nsx_core_neon.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@webrtc_dsp/modules/audio_processing/utility/$(DEPDIR)/ooura_fft_neon.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@webrtc_dsp/modules/audio_processing/utility/$(DEPDIR)/ooura_fft_sse2.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@webrtc_dsp/rtc_base/$(DEPDIR)/logging_mac.Plo@am__quote@ # am--include-marker
-
-$(am__depfiles_remade):
-	@$(MKDIR_P) $(@D)
-	@echo '# dummy' >$@-t && $(am__mv) $@-t $@
-
-am--depfiles: $(am__depfiles_remade)
-
-.S.o:
-@am__fastdepCCAS_TRUE@	$(AM_V_CPPAS)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
-@am__fastdepCCAS_TRUE@	$(CPPASCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
-@am__fastdepCCAS_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
-@AMDEP_TRUE@@am__fastdepCCAS_FALSE@	$(AM_V_CPPAS)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCCAS_FALSE@	DEPDIR=$(DEPDIR) $(CCASDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCCAS_FALSE@	$(AM_V_CPPAS@am__nodep@)$(CPPASCOMPILE) -c -o $@ $<
-
-.S.obj:
-@am__fastdepCCAS_TRUE@	$(AM_V_CPPAS)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
-@am__fastdepCCAS_TRUE@	$(CPPASCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
-@am__fastdepCCAS_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
-@AMDEP_TRUE@@am__fastdepCCAS_FALSE@	$(AM_V_CPPAS)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCCAS_FALSE@	DEPDIR=$(DEPDIR) $(CCASDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCCAS_FALSE@	$(AM_V_CPPAS@am__nodep@)$(CPPASCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-
-.S.lo:
-@am__fastdepCCAS_TRUE@	$(AM_V_CPPAS)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
-@am__fastdepCCAS_TRUE@	$(LTCPPASCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
-@am__fastdepCCAS_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Plo
-@AMDEP_TRUE@@am__fastdepCCAS_FALSE@	$(AM_V_CPPAS)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCCAS_FALSE@	DEPDIR=$(DEPDIR) $(CCASDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCCAS_FALSE@	$(AM_V_CPPAS@am__nodep@)$(LTCPPASCOMPILE) -c -o $@ $<
-
-.c.o:
-@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
-@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
-
-.c.obj:
-@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
-@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-
-.c.lo:
-@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
-@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
-@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
-
-.cc.o:
-@am__fastdepCXX_TRUE@	$(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
-@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
-@am__fastdepCXX_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $<
-
-.cc.obj:
-@am__fastdepCXX_TRUE@	$(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
-@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
-@am__fastdepCXX_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-
-.cc.lo:
-@am__fastdepCXX_TRUE@	$(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
-@am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
-@am__fastdepCXX_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Plo
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $<
-
-.cpp.o:
-@am__fastdepCXX_TRUE@	$(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
-@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
-@am__fastdepCXX_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $<
-
-.cpp.obj:
-@am__fastdepCXX_TRUE@	$(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
-@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
-@am__fastdepCXX_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-
-.cpp.lo:
-@am__fastdepCXX_TRUE@	$(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
-@am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
-@am__fastdepCXX_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Plo
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $<
-
-.mm.o:
-@am__fastdepOBJCXX_TRUE@	$(AM_V_OBJCXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
-@am__fastdepOBJCXX_TRUE@	$(OBJCXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
-@am__fastdepOBJCXX_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
-@AMDEP_TRUE@@am__fastdepOBJCXX_FALSE@	$(AM_V_OBJCXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepOBJCXX_FALSE@	DEPDIR=$(DEPDIR) $(OBJCXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepOBJCXX_FALSE@	$(AM_V_OBJCXX@am__nodep@)$(OBJCXXCOMPILE) -c -o $@ $<
-
-.mm.obj:
-@am__fastdepOBJCXX_TRUE@	$(AM_V_OBJCXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
-@am__fastdepOBJCXX_TRUE@	$(OBJCXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
-@am__fastdepOBJCXX_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
-@AMDEP_TRUE@@am__fastdepOBJCXX_FALSE@	$(AM_V_OBJCXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepOBJCXX_FALSE@	DEPDIR=$(DEPDIR) $(OBJCXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepOBJCXX_FALSE@	$(AM_V_OBJCXX@am__nodep@)$(OBJCXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-
-.mm.lo:
-@am__fastdepOBJCXX_TRUE@	$(AM_V_OBJCXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
-@am__fastdepOBJCXX_TRUE@	$(LTOBJCXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
-@am__fastdepOBJCXX_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Plo
-@AMDEP_TRUE@@am__fastdepOBJCXX_FALSE@	$(AM_V_OBJCXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepOBJCXX_FALSE@	DEPDIR=$(DEPDIR) $(OBJCXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepOBJCXX_FALSE@	$(AM_V_OBJCXX@am__nodep@)$(LTOBJCXXCOMPILE) -c -o $@ $<
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-	-rm -rf ./webrtc_dsp/absl/base/internal/.libs ./webrtc_dsp/absl/base/internal/_libs
-	-rm -rf ./webrtc_dsp/absl/strings/.libs ./webrtc_dsp/absl/strings/_libs
-	-rm -rf ./webrtc_dsp/absl/strings/internal/.libs ./webrtc_dsp/absl/strings/internal/_libs
-	-rm -rf ./webrtc_dsp/absl/types/.libs ./webrtc_dsp/absl/types/_libs
-	-rm -rf ./webrtc_dsp/api/audio/.libs ./webrtc_dsp/api/audio/_libs
-	-rm -rf ./webrtc_dsp/common_audio/.libs ./webrtc_dsp/common_audio/_libs
-	-rm -rf ./webrtc_dsp/common_audio/resampler/.libs ./webrtc_dsp/common_audio/resampler/_libs
-	-rm -rf ./webrtc_dsp/common_audio/signal_processing/.libs ./webrtc_dsp/common_audio/signal_processing/_libs
-	-rm -rf ./webrtc_dsp/common_audio/third_party/fft4g/.libs ./webrtc_dsp/common_audio/third_party/fft4g/_libs
-	-rm -rf ./webrtc_dsp/common_audio/vad/.libs ./webrtc_dsp/common_audio/vad/_libs
-	-rm -rf ./webrtc_dsp/modules/audio_coding/codecs/isac/main/source/.libs ./webrtc_dsp/modules/audio_coding/codecs/isac/main/source/_libs
-	-rm -rf ./webrtc_dsp/modules/audio_processing/.libs ./webrtc_dsp/modules/audio_processing/_libs
-	-rm -rf ./webrtc_dsp/modules/audio_processing/aec/.libs ./webrtc_dsp/modules/audio_processing/aec/_libs
-	-rm -rf ./webrtc_dsp/modules/audio_processing/aec3/.libs ./webrtc_dsp/modules/audio_processing/aec3/_libs
-	-rm -rf ./webrtc_dsp/modules/audio_processing/aecm/.libs ./webrtc_dsp/modules/audio_processing/aecm/_libs
-	-rm -rf ./webrtc_dsp/modules/audio_processing/agc/.libs ./webrtc_dsp/modules/audio_processing/agc/_libs
-	-rm -rf ./webrtc_dsp/modules/audio_processing/agc/legacy/.libs ./webrtc_dsp/modules/audio_processing/agc/legacy/_libs
-	-rm -rf ./webrtc_dsp/modules/audio_processing/agc2/.libs ./webrtc_dsp/modules/audio_processing/agc2/_libs
-	-rm -rf ./webrtc_dsp/modules/audio_processing/agc2/rnn_vad/.libs ./webrtc_dsp/modules/audio_processing/agc2/rnn_vad/_libs
-	-rm -rf ./webrtc_dsp/modules/audio_processing/audio_generator/.libs ./webrtc_dsp/modules/audio_processing/audio_generator/_libs
-	-rm -rf ./webrtc_dsp/modules/audio_processing/echo_detector/.libs ./webrtc_dsp/modules/audio_processing/echo_detector/_libs
-	-rm -rf ./webrtc_dsp/modules/audio_processing/include/.libs ./webrtc_dsp/modules/audio_processing/include/_libs
-	-rm -rf ./webrtc_dsp/modules/audio_processing/logging/.libs ./webrtc_dsp/modules/audio_processing/logging/_libs
-	-rm -rf ./webrtc_dsp/modules/audio_processing/ns/.libs ./webrtc_dsp/modules/audio_processing/ns/_libs
-	-rm -rf ./webrtc_dsp/modules/audio_processing/transient/.libs ./webrtc_dsp/modules/audio_processing/transient/_libs
-	-rm -rf ./webrtc_dsp/modules/audio_processing/utility/.libs ./webrtc_dsp/modules/audio_processing/utility/_libs
-	-rm -rf ./webrtc_dsp/modules/audio_processing/vad/.libs ./webrtc_dsp/modules/audio_processing/vad/_libs
-	-rm -rf ./webrtc_dsp/modules/third_party/fft/.libs ./webrtc_dsp/modules/third_party/fft/_libs
-	-rm -rf ./webrtc_dsp/rtc_base/.libs ./webrtc_dsp/rtc_base/_libs
-	-rm -rf ./webrtc_dsp/rtc_base/memory/.libs ./webrtc_dsp/rtc_base/memory/_libs
-	-rm -rf ./webrtc_dsp/rtc_base/strings/.libs ./webrtc_dsp/rtc_base/strings/_libs
-	-rm -rf ./webrtc_dsp/system_wrappers/source/.libs ./webrtc_dsp/system_wrappers/source/_libs
-	-rm -rf ./webrtc_dsp/third_party/rnnoise/src/.libs ./webrtc_dsp/third_party/rnnoise/src/_libs
-	-rm -rf audio/.libs audio/_libs
-	-rm -rf os/darwin/.libs os/darwin/_libs
-	-rm -rf os/linux/.libs os/linux/_libs
-	-rm -rf os/posix/.libs os/posix/_libs
-	-rm -rf video/.libs video/_libs
-	-rm -rf webrtc_dsp/common_audio/signal_processing/.libs webrtc_dsp/common_audio/signal_processing/_libs
-	-rm -rf webrtc_dsp/common_audio/third_party/spl_sqrt_floor/.libs webrtc_dsp/common_audio/third_party/spl_sqrt_floor/_libs
-	-rm -rf webrtc_dsp/modules/audio_processing/aec/.libs webrtc_dsp/modules/audio_processing/aec/_libs
-	-rm -rf webrtc_dsp/modules/audio_processing/aecm/.libs webrtc_dsp/modules/audio_processing/aecm/_libs
-	-rm -rf webrtc_dsp/modules/audio_processing/ns/.libs webrtc_dsp/modules/audio_processing/ns/_libs
-	-rm -rf webrtc_dsp/modules/audio_processing/utility/.libs webrtc_dsp/modules/audio_processing/utility/_libs
-	-rm -rf webrtc_dsp/rtc_base/.libs webrtc_dsp/rtc_base/_libs
-
-distclean-libtool:
-	-rm -f libtool config.lt
-install-nobase_tgvoipincludeHEADERS: $(nobase_tgvoipinclude_HEADERS)
-	@$(NORMAL_INSTALL)
-	@list='$(nobase_tgvoipinclude_HEADERS)'; test -n "$(tgvoipincludedir)" || list=; \
-	if test -n "$$list"; then \
-	  echo " $(MKDIR_P) '$(DESTDIR)$(tgvoipincludedir)'"; \
-	  $(MKDIR_P) "$(DESTDIR)$(tgvoipincludedir)" || exit 1; \
-	fi; \
-	$(am__nobase_list) | while read dir files; do \
-	  xfiles=; for file in $$files; do \
-	    if test -f "$$file"; then xfiles="$$xfiles $$file"; \
-	    else xfiles="$$xfiles $(srcdir)/$$file"; fi; done; \
-	  test -z "$$xfiles" || { \
-	    test "x$$dir" = x. || { \
-	      echo " $(MKDIR_P) '$(DESTDIR)$(tgvoipincludedir)/$$dir'"; \
-	      $(MKDIR_P) "$(DESTDIR)$(tgvoipincludedir)/$$dir"; }; \
-	    echo " $(INSTALL_HEADER) $$xfiles '$(DESTDIR)$(tgvoipincludedir)/$$dir'"; \
-	    $(INSTALL_HEADER) $$xfiles "$(DESTDIR)$(tgvoipincludedir)/$$dir" || exit $$?; }; \
-	done
-
-uninstall-nobase_tgvoipincludeHEADERS:
-	@$(NORMAL_UNINSTALL)
-	@list='$(nobase_tgvoipinclude_HEADERS)'; test -n "$(tgvoipincludedir)" || list=; \
-	$(am__nobase_strip_setup); files=`$(am__nobase_strip)`; \
-	dir='$(DESTDIR)$(tgvoipincludedir)'; $(am__uninstall_files_from_dir)
-
-ID: $(am__tagged_files)
-	$(am__define_uniq_tagged_files); mkid -fID $$unique
-tags: tags-am
-TAGS: tags
-
-tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
-	set x; \
-	here=`pwd`; \
-	$(am__define_uniq_tagged_files); \
-	shift; \
-	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
-	  test -n "$$unique" || unique=$$empty_fix; \
-	  if test $$# -gt 0; then \
-	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	      "$$@" $$unique; \
-	  else \
-	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	      $$unique; \
-	  fi; \
-	fi
-ctags: ctags-am
-
-CTAGS: ctags
-ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
-	$(am__define_uniq_tagged_files); \
-	test -z "$(CTAGS_ARGS)$$unique" \
-	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$unique
-
-GTAGS:
-	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && $(am__cd) $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) "$$here"
-cscope: cscope.files
-	test ! -s cscope.files \
-	  || $(CSCOPE) -b -q $(AM_CSCOPEFLAGS) $(CSCOPEFLAGS) -i cscope.files $(CSCOPE_ARGS)
-clean-cscope:
-	-rm -f cscope.files
-cscope.files: clean-cscope cscopelist
-cscopelist: cscopelist-am
-
-cscopelist-am: $(am__tagged_files)
-	list='$(am__tagged_files)'; \
-	case "$(srcdir)" in \
-	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
-	  *) sdir=$(subdir)/$(srcdir) ;; \
-	esac; \
-	for i in $$list; do \
-	  if test -f "$$i"; then \
-	    echo "$(subdir)/$$i"; \
-	  else \
-	    echo "$$sdir/$$i"; \
-	  fi; \
-	done >> $(top_builddir)/cscope.files
-
-distclean-tags:
-	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-	-rm -f cscope.out cscope.in.out cscope.po.out cscope.files
-
-distdir: $(BUILT_SOURCES)
-	$(MAKE) $(AM_MAKEFLAGS) distdir-am
-
-distdir-am: $(DISTFILES)
-	$(am__remove_distdir)
-	test -d "$(distdir)" || mkdir "$(distdir)"
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	  dist_files=`for file in $$list; do echo $$file; done | \
-	  sed -e "s|^$$srcdirstrip/||;t" \
-	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-			   sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d "$(distdir)/$$file"; then \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-	  else \
-	    test -f "$(distdir)/$$file" \
-	    || cp -p $$d/$$file "$(distdir)/$$file" \
-	    || exit 1; \
-	  fi; \
-	done
-	-test -n "$(am__skip_mode_fix)" \
-	|| find "$(distdir)" -type d ! -perm -755 \
-		-exec chmod u+rwx,go+rx {} \; -o \
-	  ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
-	  ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
-	  ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
-	|| chmod -R a+r "$(distdir)"
-dist-gzip: distdir
-	tardir=$(distdir) && $(am__tar) | eval GZIP= gzip $(GZIP_ENV) -c >$(distdir).tar.gz
-	$(am__post_remove_distdir)
-
-dist-bzip2: distdir
-	tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2
-	$(am__post_remove_distdir)
-
-dist-lzip: distdir
-	tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9} >$(distdir).tar.lz
-	$(am__post_remove_distdir)
-
-dist-xz: distdir
-	tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz
-	$(am__post_remove_distdir)
-
-dist-tarZ: distdir
-	@echo WARNING: "Support for distribution archives compressed with" \
-		       "legacy program 'compress' is deprecated." >&2
-	@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
-	tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
-	$(am__post_remove_distdir)
-
-dist-shar: distdir
-	@echo WARNING: "Support for shar distribution archives is" \
-	               "deprecated." >&2
-	@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
-	shar $(distdir) | eval GZIP= gzip $(GZIP_ENV) -c >$(distdir).shar.gz
-	$(am__post_remove_distdir)
-
-dist-zip: distdir
-	-rm -f $(distdir).zip
-	zip -rq $(distdir).zip $(distdir)
-	$(am__post_remove_distdir)
-
-dist dist-all:
-	$(MAKE) $(AM_MAKEFLAGS) $(DIST_TARGETS) am__post_remove_distdir='@:'
-	$(am__post_remove_distdir)
-
-# This target untars the dist file and tries a VPATH configuration.  Then
-# it guarantees that the distribution is self-contained by making another
-# tarfile.
-distcheck: dist
-	case '$(DIST_ARCHIVES)' in \
-	*.tar.gz*) \
-	  eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).tar.gz | $(am__untar) ;;\
-	*.tar.bz2*) \
-	  bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
-	*.tar.lz*) \
-	  lzip -dc $(distdir).tar.lz | $(am__untar) ;;\
-	*.tar.xz*) \
-	  xz -dc $(distdir).tar.xz | $(am__untar) ;;\
-	*.tar.Z*) \
-	  uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
-	*.shar.gz*) \
-	  eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).shar.gz | unshar ;;\
-	*.zip*) \
-	  unzip $(distdir).zip ;;\
-	esac
-	chmod -R a-w $(distdir)
-	chmod u+w $(distdir)
-	mkdir $(distdir)/_build $(distdir)/_build/sub $(distdir)/_inst
-	chmod a-w $(distdir)
-	test -d $(distdir)/_build || exit 0; \
-	dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
-	  && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
-	  && am__cwd=`pwd` \
-	  && $(am__cd) $(distdir)/_build/sub \
-	  && ../../configure \
-	    $(AM_DISTCHECK_CONFIGURE_FLAGS) \
-	    $(DISTCHECK_CONFIGURE_FLAGS) \
-	    --srcdir=../.. --prefix="$$dc_install_base" \
-	  && $(MAKE) $(AM_MAKEFLAGS) \
-	  && $(MAKE) $(AM_MAKEFLAGS) dvi \
-	  && $(MAKE) $(AM_MAKEFLAGS) check \
-	  && $(MAKE) $(AM_MAKEFLAGS) install \
-	  && $(MAKE) $(AM_MAKEFLAGS) installcheck \
-	  && $(MAKE) $(AM_MAKEFLAGS) uninstall \
-	  && $(MAKE) $(AM_MAKEFLAGS) distuninstallcheck_dir="$$dc_install_base" \
-	        distuninstallcheck \
-	  && chmod -R a-w "$$dc_install_base" \
-	  && ({ \
-	       (cd ../.. && umask 077 && mkdir "$$dc_destdir") \
-	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" install \
-	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" uninstall \
-	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" \
-	            distuninstallcheck_dir="$$dc_destdir" distuninstallcheck; \
-	      } || { rm -rf "$$dc_destdir"; exit 1; }) \
-	  && rm -rf "$$dc_destdir" \
-	  && $(MAKE) $(AM_MAKEFLAGS) dist \
-	  && rm -rf $(DIST_ARCHIVES) \
-	  && $(MAKE) $(AM_MAKEFLAGS) distcleancheck \
-	  && cd "$$am__cwd" \
-	  || exit 1
-	$(am__post_remove_distdir)
-	@(echo "$(distdir) archives ready for distribution: "; \
-	  list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
-	  sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x'
-distuninstallcheck:
-	@test -n '$(distuninstallcheck_dir)' || { \
-	  echo 'ERROR: trying to run $@ with an empty' \
-	       '$$(distuninstallcheck_dir)' >&2; \
-	  exit 1; \
-	}; \
-	$(am__cd) '$(distuninstallcheck_dir)' || { \
-	  echo 'ERROR: cannot chdir into $(distuninstallcheck_dir)' >&2; \
-	  exit 1; \
-	}; \
-	test `$(am__distuninstallcheck_listfiles) | wc -l` -eq 0 \
-	   || { echo "ERROR: files left after uninstall:" ; \
-	        if test -n "$(DESTDIR)"; then \
-	          echo "  (check DESTDIR support)"; \
-	        fi ; \
-	        $(distuninstallcheck_listfiles) ; \
-	        exit 1; } >&2
-distcleancheck: distclean
-	@if test '$(srcdir)' = . ; then \
-	  echo "ERROR: distcleancheck can only run from a VPATH build" ; \
-	  exit 1 ; \
-	fi
-	@test `$(distcleancheck_listfiles) | wc -l` -eq 0 \
-	  || { echo "ERROR: files left in build directory after distclean:" ; \
-	       $(distcleancheck_listfiles) ; \
-	       exit 1; } >&2
-check-am: all-am
-check: check-am
-all-am: Makefile $(LTLIBRARIES) $(HEADERS) config.h
-installdirs:
-	for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(tgvoipincludedir)"; do \
-	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
-	done
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-	if test -z '$(STRIP)'; then \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	      install; \
-	else \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
-	fi
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-	-rm -f audio/$(DEPDIR)/$(am__dirstamp)
-	-rm -f audio/$(am__dirstamp)
-	-rm -f os/darwin/$(DEPDIR)/$(am__dirstamp)
-	-rm -f os/darwin/$(am__dirstamp)
-	-rm -f os/linux/$(DEPDIR)/$(am__dirstamp)
-	-rm -f os/linux/$(am__dirstamp)
-	-rm -f os/posix/$(DEPDIR)/$(am__dirstamp)
-	-rm -f os/posix/$(am__dirstamp)
-	-rm -f video/$(DEPDIR)/$(am__dirstamp)
-	-rm -f video/$(am__dirstamp)
-	-rm -f webrtc_dsp/absl/base/internal/$(DEPDIR)/$(am__dirstamp)
-	-rm -f webrtc_dsp/absl/base/internal/$(am__dirstamp)
-	-rm -f webrtc_dsp/absl/strings/$(DEPDIR)/$(am__dirstamp)
-	-rm -f webrtc_dsp/absl/strings/$(am__dirstamp)
-	-rm -f webrtc_dsp/absl/strings/internal/$(DEPDIR)/$(am__dirstamp)
-	-rm -f webrtc_dsp/absl/strings/internal/$(am__dirstamp)
-	-rm -f webrtc_dsp/absl/types/$(DEPDIR)/$(am__dirstamp)
-	-rm -f webrtc_dsp/absl/types/$(am__dirstamp)
-	-rm -f webrtc_dsp/api/audio/$(DEPDIR)/$(am__dirstamp)
-	-rm -f webrtc_dsp/api/audio/$(am__dirstamp)
-	-rm -f webrtc_dsp/common_audio/$(DEPDIR)/$(am__dirstamp)
-	-rm -f webrtc_dsp/common_audio/$(am__dirstamp)
-	-rm -f webrtc_dsp/common_audio/resampler/$(DEPDIR)/$(am__dirstamp)
-	-rm -f webrtc_dsp/common_audio/resampler/$(am__dirstamp)
-	-rm -f webrtc_dsp/common_audio/signal_processing/$(DEPDIR)/$(am__dirstamp)
-	-rm -f webrtc_dsp/common_audio/signal_processing/$(am__dirstamp)
-	-rm -f webrtc_dsp/common_audio/third_party/fft4g/$(DEPDIR)/$(am__dirstamp)
-	-rm -f webrtc_dsp/common_audio/third_party/fft4g/$(am__dirstamp)
-	-rm -f webrtc_dsp/common_audio/third_party/spl_sqrt_floor/$(DEPDIR)/$(am__dirstamp)
-	-rm -f webrtc_dsp/common_audio/third_party/spl_sqrt_floor/$(am__dirstamp)
-	-rm -f webrtc_dsp/common_audio/vad/$(DEPDIR)/$(am__dirstamp)
-	-rm -f webrtc_dsp/common_audio/vad/$(am__dirstamp)
-	-rm -f webrtc_dsp/modules/audio_coding/codecs/isac/main/source/$(DEPDIR)/$(am__dirstamp)
-	-rm -f webrtc_dsp/modules/audio_coding/codecs/isac/main/source/$(am__dirstamp)
-	-rm -f webrtc_dsp/modules/audio_processing/$(DEPDIR)/$(am__dirstamp)
-	-rm -f webrtc_dsp/modules/audio_processing/$(am__dirstamp)
-	-rm -f webrtc_dsp/modules/audio_processing/aec/$(DEPDIR)/$(am__dirstamp)
-	-rm -f webrtc_dsp/modules/audio_processing/aec/$(am__dirstamp)
-	-rm -f webrtc_dsp/modules/audio_processing/aec3/$(DEPDIR)/$(am__dirstamp)
-	-rm -f webrtc_dsp/modules/audio_processing/aec3/$(am__dirstamp)
-	-rm -f webrtc_dsp/modules/audio_processing/aecm/$(DEPDIR)/$(am__dirstamp)
-	-rm -f webrtc_dsp/modules/audio_processing/aecm/$(am__dirstamp)
-	-rm -f webrtc_dsp/modules/audio_processing/agc/$(DEPDIR)/$(am__dirstamp)
-	-rm -f webrtc_dsp/modules/audio_processing/agc/$(am__dirstamp)
-	-rm -f webrtc_dsp/modules/audio_processing/agc/legacy/$(DEPDIR)/$(am__dirstamp)
-	-rm -f webrtc_dsp/modules/audio_processing/agc/legacy/$(am__dirstamp)
-	-rm -f webrtc_dsp/modules/audio_processing/agc2/$(DEPDIR)/$(am__dirstamp)
-	-rm -f webrtc_dsp/modules/audio_processing/agc2/$(am__dirstamp)
-	-rm -f webrtc_dsp/modules/audio_processing/agc2/rnn_vad/$(DEPDIR)/$(am__dirstamp)
-	-rm -f webrtc_dsp/modules/audio_processing/agc2/rnn_vad/$(am__dirstamp)
-	-rm -f webrtc_dsp/modules/audio_processing/audio_generator/$(DEPDIR)/$(am__dirstamp)
-	-rm -f webrtc_dsp/modules/audio_processing/audio_generator/$(am__dirstamp)
-	-rm -f webrtc_dsp/modules/audio_processing/echo_detector/$(DEPDIR)/$(am__dirstamp)
-	-rm -f webrtc_dsp/modules/audio_processing/echo_detector/$(am__dirstamp)
-	-rm -f webrtc_dsp/modules/audio_processing/include/$(DEPDIR)/$(am__dirstamp)
-	-rm -f webrtc_dsp/modules/audio_processing/include/$(am__dirstamp)
-	-rm -f webrtc_dsp/modules/audio_processing/logging/$(DEPDIR)/$(am__dirstamp)
-	-rm -f webrtc_dsp/modules/audio_processing/logging/$(am__dirstamp)
-	-rm -f webrtc_dsp/modules/audio_processing/ns/$(DEPDIR)/$(am__dirstamp)
-	-rm -f webrtc_dsp/modules/audio_processing/ns/$(am__dirstamp)
-	-rm -f webrtc_dsp/modules/audio_processing/transient/$(DEPDIR)/$(am__dirstamp)
-	-rm -f webrtc_dsp/modules/audio_processing/transient/$(am__dirstamp)
-	-rm -f webrtc_dsp/modules/audio_processing/utility/$(DEPDIR)/$(am__dirstamp)
-	-rm -f webrtc_dsp/modules/audio_processing/utility/$(am__dirstamp)
-	-rm -f webrtc_dsp/modules/audio_processing/vad/$(DEPDIR)/$(am__dirstamp)
-	-rm -f webrtc_dsp/modules/audio_processing/vad/$(am__dirstamp)
-	-rm -f webrtc_dsp/modules/third_party/fft/$(DEPDIR)/$(am__dirstamp)
-	-rm -f webrtc_dsp/modules/third_party/fft/$(am__dirstamp)
-	-rm -f webrtc_dsp/rtc_base/$(DEPDIR)/$(am__dirstamp)
-	-rm -f webrtc_dsp/rtc_base/$(am__dirstamp)
-	-rm -f webrtc_dsp/rtc_base/memory/$(DEPDIR)/$(am__dirstamp)
-	-rm -f webrtc_dsp/rtc_base/memory/$(am__dirstamp)
-	-rm -f webrtc_dsp/rtc_base/strings/$(DEPDIR)/$(am__dirstamp)
-	-rm -f webrtc_dsp/rtc_base/strings/$(am__dirstamp)
-	-rm -f webrtc_dsp/system_wrappers/source/$(DEPDIR)/$(am__dirstamp)
-	-rm -f webrtc_dsp/system_wrappers/source/$(am__dirstamp)
-	-rm -f webrtc_dsp/third_party/rnnoise/src/$(DEPDIR)/$(am__dirstamp)
-	-rm -f webrtc_dsp/third_party/rnnoise/src/$(am__dirstamp)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-clean: clean-am
-
-clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \
-	mostlyclean-am
-
-distclean: distclean-am
-	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
-		-rm -f ./$(DEPDIR)/Buffers.Plo
-	-rm -f ./$(DEPDIR)/CongestionControl.Plo
-	-rm -f ./$(DEPDIR)/EchoCanceller.Plo
-	-rm -f ./$(DEPDIR)/JitterBuffer.Plo
-	-rm -f ./$(DEPDIR)/MediaStreamItf.Plo
-	-rm -f ./$(DEPDIR)/MessageThread.Plo
-	-rm -f ./$(DEPDIR)/NetworkSocket.Plo
-	-rm -f ./$(DEPDIR)/OpusDecoder.Plo
-	-rm -f ./$(DEPDIR)/OpusEncoder.Plo
-	-rm -f ./$(DEPDIR)/PacketReassembler.Plo
-	-rm -f ./$(DEPDIR)/VoIPController.Plo
-	-rm -f ./$(DEPDIR)/VoIPGroupController.Plo
-	-rm -f ./$(DEPDIR)/VoIPServerConfig.Plo
-	-rm -f ./$(DEPDIR)/json11.Plo
-	-rm -f ./$(DEPDIR)/logging.Plo
-	-rm -f ./webrtc_dsp/absl/base/internal/$(DEPDIR)/raw_logging.Plo
-	-rm -f ./webrtc_dsp/absl/base/internal/$(DEPDIR)/throw_delegate.Plo
-	-rm -f ./webrtc_dsp/absl/strings/$(DEPDIR)/ascii.Plo
-	-rm -f ./webrtc_dsp/absl/strings/$(DEPDIR)/string_view.Plo
-	-rm -f ./webrtc_dsp/absl/strings/internal/$(DEPDIR)/memutil.Plo
-	-rm -f ./webrtc_dsp/absl/types/$(DEPDIR)/bad_optional_access.Plo
-	-rm -f ./webrtc_dsp/absl/types/$(DEPDIR)/optional.Plo
-	-rm -f ./webrtc_dsp/api/audio/$(DEPDIR)/audio_frame.Plo
-	-rm -f ./webrtc_dsp/api/audio/$(DEPDIR)/echo_canceller3_config.Plo
-	-rm -f ./webrtc_dsp/api/audio/$(DEPDIR)/echo_canceller3_factory.Plo
-	-rm -f ./webrtc_dsp/common_audio/$(DEPDIR)/audio_converter.Plo
-	-rm -f ./webrtc_dsp/common_audio/$(DEPDIR)/audio_util.Plo
-	-rm -f ./webrtc_dsp/common_audio/$(DEPDIR)/channel_buffer.Plo
-	-rm -f ./webrtc_dsp/common_audio/$(DEPDIR)/fir_filter_c.Plo
-	-rm -f ./webrtc_dsp/common_audio/$(DEPDIR)/fir_filter_factory.Plo
-	-rm -f ./webrtc_dsp/common_audio/$(DEPDIR)/fir_filter_sse.Plo
-	-rm -f ./webrtc_dsp/common_audio/$(DEPDIR)/real_fourier.Plo
-	-rm -f ./webrtc_dsp/common_audio/$(DEPDIR)/real_fourier_ooura.Plo
-	-rm -f ./webrtc_dsp/common_audio/$(DEPDIR)/ring_buffer.Plo
-	-rm -f ./webrtc_dsp/common_audio/$(DEPDIR)/smoothing_filter.Plo
-	-rm -f ./webrtc_dsp/common_audio/$(DEPDIR)/sparse_fir_filter.Plo
-	-rm -f ./webrtc_dsp/common_audio/$(DEPDIR)/wav_file.Plo
-	-rm -f ./webrtc_dsp/common_audio/$(DEPDIR)/wav_header.Plo
-	-rm -f ./webrtc_dsp/common_audio/$(DEPDIR)/window_generator.Plo
-	-rm -f ./webrtc_dsp/common_audio/resampler/$(DEPDIR)/push_resampler.Plo
-	-rm -f ./webrtc_dsp/common_audio/resampler/$(DEPDIR)/push_sinc_resampler.Plo
-	-rm -f ./webrtc_dsp/common_audio/resampler/$(DEPDIR)/resampler.Plo
-	-rm -f ./webrtc_dsp/common_audio/resampler/$(DEPDIR)/sinc_resampler.Plo
-	-rm -f ./webrtc_dsp/common_audio/resampler/$(DEPDIR)/sinc_resampler_sse.Plo
-	-rm -f ./webrtc_dsp/common_audio/resampler/$(DEPDIR)/sinusoidal_linear_chirp_source.Plo
-	-rm -f ./webrtc_dsp/common_audio/signal_processing/$(DEPDIR)/auto_corr_to_refl_coef.Plo
-	-rm -f ./webrtc_dsp/common_audio/signal_processing/$(DEPDIR)/auto_correlation.Plo
-	-rm -f ./webrtc_dsp/common_audio/signal_processing/$(DEPDIR)/complex_fft.Plo
-	-rm -f ./webrtc_dsp/common_audio/signal_processing/$(DEPDIR)/copy_set_operations.Plo
-	-rm -f ./webrtc_dsp/common_audio/signal_processing/$(DEPDIR)/cross_correlation.Plo
-	-rm -f ./webrtc_dsp/common_audio/signal_processing/$(DEPDIR)/division_operations.Plo
-	-rm -f ./webrtc_dsp/common_audio/signal_processing/$(DEPDIR)/dot_product_with_scale.Plo
-	-rm -f ./webrtc_dsp/common_audio/signal_processing/$(DEPDIR)/downsample_fast.Plo
-	-rm -f ./webrtc_dsp/common_audio/signal_processing/$(DEPDIR)/energy.Plo
-	-rm -f ./webrtc_dsp/common_audio/signal_processing/$(DEPDIR)/filter_ar.Plo
-	-rm -f ./webrtc_dsp/common_audio/signal_processing/$(DEPDIR)/filter_ar_fast_q12.Plo
-	-rm -f ./webrtc_dsp/common_audio/signal_processing/$(DEPDIR)/filter_ma_fast_q12.Plo
-	-rm -f ./webrtc_dsp/common_audio/signal_processing/$(DEPDIR)/get_hanning_window.Plo
-	-rm -f ./webrtc_dsp/common_audio/signal_processing/$(DEPDIR)/get_scaling_square.Plo
-	-rm -f ./webrtc_dsp/common_audio/signal_processing/$(DEPDIR)/ilbc_specific_functions.Plo
-	-rm -f ./webrtc_dsp/common_audio/signal_processing/$(DEPDIR)/levinson_durbin.Plo
-	-rm -f ./webrtc_dsp/common_audio/signal_processing/$(DEPDIR)/lpc_to_refl_coef.Plo
-	-rm -f ./webrtc_dsp/common_audio/signal_processing/$(DEPDIR)/min_max_operations.Plo
-	-rm -f ./webrtc_dsp/common_audio/signal_processing/$(DEPDIR)/randomization_functions.Plo
-	-rm -f ./webrtc_dsp/common_audio/signal_processing/$(DEPDIR)/real_fft.Plo
-	-rm -f ./webrtc_dsp/common_audio/signal_processing/$(DEPDIR)/refl_coef_to_lpc.Plo
-	-rm -f ./webrtc_dsp/common_audio/signal_processing/$(DEPDIR)/resample.Plo
-	-rm -f ./webrtc_dsp/common_audio/signal_processing/$(DEPDIR)/resample_48khz.Plo
-	-rm -f ./webrtc_dsp/common_audio/signal_processing/$(DEPDIR)/resample_by_2.Plo
-	-rm -f ./webrtc_dsp/common_audio/signal_processing/$(DEPDIR)/resample_by_2_internal.Plo
-	-rm -f ./webrtc_dsp/common_audio/signal_processing/$(DEPDIR)/resample_fractional.Plo
-	-rm -f ./webrtc_dsp/common_audio/signal_processing/$(DEPDIR)/spl_init.Plo
-	-rm -f ./webrtc_dsp/common_audio/signal_processing/$(DEPDIR)/spl_inl.Plo
-	-rm -f ./webrtc_dsp/common_audio/signal_processing/$(DEPDIR)/spl_sqrt.Plo
-	-rm -f ./webrtc_dsp/common_audio/signal_processing/$(DEPDIR)/splitting_filter1.Plo
-	-rm -f ./webrtc_dsp/common_audio/signal_processing/$(DEPDIR)/sqrt_of_one_minus_x_squared.Plo
-	-rm -f ./webrtc_dsp/common_audio/signal_processing/$(DEPDIR)/vector_scaling_operations.Plo
-	-rm -f ./webrtc_dsp/common_audio/third_party/fft4g/$(DEPDIR)/fft4g.Plo
-	-rm -f ./webrtc_dsp/common_audio/vad/$(DEPDIR)/vad.Plo
-	-rm -f ./webrtc_dsp/common_audio/vad/$(DEPDIR)/vad_core.Plo
-	-rm -f ./webrtc_dsp/common_audio/vad/$(DEPDIR)/vad_filterbank.Plo
-	-rm -f ./webrtc_dsp/common_audio/vad/$(DEPDIR)/vad_gmm.Plo
-	-rm -f ./webrtc_dsp/common_audio/vad/$(DEPDIR)/vad_sp.Plo
-	-rm -f ./webrtc_dsp/common_audio/vad/$(DEPDIR)/webrtc_vad.Plo
-	-rm -f ./webrtc_dsp/modules/audio_coding/codecs/isac/main/source/$(DEPDIR)/arith_routines.Plo
-	-rm -f ./webrtc_dsp/modules/audio_coding/codecs/isac/main/source/$(DEPDIR)/arith_routines_hist.Plo
-	-rm -f ./webrtc_dsp/modules/audio_coding/codecs/isac/main/source/$(DEPDIR)/arith_routines_logist.Plo
-	-rm -f ./webrtc_dsp/modules/audio_coding/codecs/isac/main/source/$(DEPDIR)/bandwidth_estimator.Plo
-	-rm -f ./webrtc_dsp/modules/audio_coding/codecs/isac/main/source/$(DEPDIR)/crc.Plo
-	-rm -f ./webrtc_dsp/modules/audio_coding/codecs/isac/main/source/$(DEPDIR)/decode.Plo
-	-rm -f ./webrtc_dsp/modules/audio_coding/codecs/isac/main/source/$(DEPDIR)/decode_bwe.Plo
-	-rm -f ./webrtc_dsp/modules/audio_coding/codecs/isac/main/source/$(DEPDIR)/encode.Plo
-	-rm -f ./webrtc_dsp/modules/audio_coding/codecs/isac/main/source/$(DEPDIR)/encode_lpc_swb.Plo
-	-rm -f ./webrtc_dsp/modules/audio_coding/codecs/isac/main/source/$(DEPDIR)/entropy_coding.Plo
-	-rm -f ./webrtc_dsp/modules/audio_coding/codecs/isac/main/source/$(DEPDIR)/filter_functions.Plo
-	-rm -f ./webrtc_dsp/modules/audio_coding/codecs/isac/main/source/$(DEPDIR)/filterbanks.Plo
-	-rm -f ./webrtc_dsp/modules/audio_coding/codecs/isac/main/source/$(DEPDIR)/intialize.Plo
-	-rm -f ./webrtc_dsp/modules/audio_coding/codecs/isac/main/source/$(DEPDIR)/isac.Plo
-	-rm -f ./webrtc_dsp/modules/audio_coding/codecs/isac/main/source/$(DEPDIR)/isac_vad.Plo
-	-rm -f ./webrtc_dsp/modules/audio_coding/codecs/isac/main/source/$(DEPDIR)/lattice.Plo
-	-rm -f ./webrtc_dsp/modules/audio_coding/codecs/isac/main/source/$(DEPDIR)/lpc_analysis.Plo
-	-rm -f ./webrtc_dsp/modules/audio_coding/codecs/isac/main/source/$(DEPDIR)/lpc_gain_swb_tables.Plo
-	-rm -f ./webrtc_dsp/modules/audio_coding/codecs/isac/main/source/$(DEPDIR)/lpc_shape_swb12_tables.Plo
-	-rm -f ./webrtc_dsp/modules/audio_coding/codecs/isac/main/source/$(DEPDIR)/lpc_shape_swb16_tables.Plo
-	-rm -f ./webrtc_dsp/modules/audio_coding/codecs/isac/main/source/$(DEPDIR)/lpc_tables.Plo
-	-rm -f ./webrtc_dsp/modules/audio_coding/codecs/isac/main/source/$(DEPDIR)/pitch_estimator.Plo
-	-rm -f ./webrtc_dsp/modules/audio_coding/codecs/isac/main/source/$(DEPDIR)/pitch_filter.Plo
-	-rm -f ./webrtc_dsp/modules/audio_coding/codecs/isac/main/source/$(DEPDIR)/pitch_gain_tables.Plo
-	-rm -f ./webrtc_dsp/modules/audio_coding/codecs/isac/main/source/$(DEPDIR)/pitch_lag_tables.Plo
-	-rm -f ./webrtc_dsp/modules/audio_coding/codecs/isac/main/source/$(DEPDIR)/spectrum_ar_model_tables.Plo
-	-rm -f ./webrtc_dsp/modules/audio_coding/codecs/isac/main/source/$(DEPDIR)/transform.Plo
-	-rm -f ./webrtc_dsp/modules/audio_processing/$(DEPDIR)/audio_buffer.Plo
-	-rm -f ./webrtc_dsp/modules/audio_processing/$(DEPDIR)/audio_processing_impl.Plo
-	-rm -f ./webrtc_dsp/modules/audio_processing/$(DEPDIR)/echo_cancellation_impl.Plo
-	-rm -f ./webrtc_dsp/modules/audio_processing/$(DEPDIR)/echo_control_mobile_impl.Plo
-	-rm -f ./webrtc_dsp/modules/audio_processing/$(DEPDIR)/gain_control_for_experimental_agc.Plo
-	-rm -f ./webrtc_dsp/modules/audio_processing/$(DEPDIR)/gain_control_impl.Plo
-	-rm -f ./webrtc_dsp/modules/audio_processing/$(DEPDIR)/gain_controller2.Plo
-	-rm -f ./webrtc_dsp/modules/audio_processing/$(DEPDIR)/level_estimator_impl.Plo
-	-rm -f ./webrtc_dsp/modules/audio_processing/$(DEPDIR)/low_cut_filter.Plo
-	-rm -f ./webrtc_dsp/modules/audio_processing/$(DEPDIR)/noise_suppression_impl.Plo
-	-rm -f ./webrtc_dsp/modules/audio_processing/$(DEPDIR)/residual_echo_detector.Plo
-	-rm -f ./webrtc_dsp/modules/audio_processing/$(DEPDIR)/rms_level.Plo
-	-rm -f ./webrtc_dsp/modules/audio_processing/$(DEPDIR)/splitting_filter.Plo
-	-rm -f ./webrtc_dsp/modules/audio_processing/$(DEPDIR)/three_band_filter_bank.Plo
-	-rm -f ./webrtc_dsp/modules/audio_processing/$(DEPDIR)/typing_detection.Plo
-	-rm -f ./webrtc_dsp/modules/audio_processing/$(DEPDIR)/voice_detection_impl.Plo
-	-rm -f ./webrtc_dsp/modules/audio_processing/aec/$(DEPDIR)/aec_core.Plo
-	-rm -f ./webrtc_dsp/modules/audio_processing/aec/$(DEPDIR)/aec_resampler.Plo
-	-rm -f ./webrtc_dsp/modules/audio_processing/aec/$(DEPDIR)/echo_cancellation.Plo
-	-rm -f ./webrtc_dsp/modules/audio_processing/aec3/$(DEPDIR)/adaptive_fir_filter.Plo
-	-rm -f ./webrtc_dsp/modules/audio_processing/aec3/$(DEPDIR)/aec3_common.Plo
-	-rm -f ./webrtc_dsp/modules/audio_processing/aec3/$(DEPDIR)/aec3_fft.Plo
-	-rm -f ./webrtc_dsp/modules/audio_processing/aec3/$(DEPDIR)/aec_state.Plo
-	-rm -f ./webrtc_dsp/modules/audio_processing/aec3/$(DEPDIR)/block_delay_buffer.Plo
-	-rm -f ./webrtc_dsp/modules/audio_processing/aec3/$(DEPDIR)/block_framer.Plo
-	-rm -f ./webrtc_dsp/modules/audio_processing/aec3/$(DEPDIR)/block_processor.Plo
-	-rm -f ./webrtc_dsp/modules/audio_processing/aec3/$(DEPDIR)/block_processor2.Plo
-	-rm -f ./webrtc_dsp/modules/audio_processing/aec3/$(DEPDIR)/block_processor_metrics.Plo
-	-rm -f ./webrtc_dsp/modules/audio_processing/aec3/$(DEPDIR)/cascaded_biquad_filter.Plo
-	-rm -f ./webrtc_dsp/modules/audio_processing/aec3/$(DEPDIR)/comfort_noise_generator.Plo
-	-rm -f ./webrtc_dsp/modules/audio_processing/aec3/$(DEPDIR)/decimator.Plo
-	-rm -f ./webrtc_dsp/modules/audio_processing/aec3/$(DEPDIR)/downsampled_render_buffer.Plo
-	-rm -f ./webrtc_dsp/modules/audio_processing/aec3/$(DEPDIR)/echo_audibility.Plo
-	-rm -f ./webrtc_dsp/modules/audio_processing/aec3/$(DEPDIR)/echo_canceller3.Plo
-	-rm -f ./webrtc_dsp/modules/audio_processing/aec3/$(DEPDIR)/echo_path_delay_estimator.Plo
-	-rm -f ./webrtc_dsp/modules/audio_processing/aec3/$(DEPDIR)/echo_path_variability.Plo
-	-rm -f ./webrtc_dsp/modules/audio_processing/aec3/$(DEPDIR)/echo_remover.Plo
-	-rm -f ./webrtc_dsp/modules/audio_processing/aec3/$(DEPDIR)/echo_remover_metrics.Plo
-	-rm -f ./webrtc_dsp/modules/audio_processing/aec3/$(DEPDIR)/erl_estimator.Plo
-	-rm -f ./webrtc_dsp/modules/audio_processing/aec3/$(DEPDIR)/erle_estimator.Plo
-	-rm -f ./webrtc_dsp/modules/audio_processing/aec3/$(DEPDIR)/fft_buffer.Plo
-	-rm -f ./webrtc_dsp/modules/audio_processing/aec3/$(DEPDIR)/filter_analyzer.Plo
-	-rm -f ./webrtc_dsp/modules/audio_processing/aec3/$(DEPDIR)/frame_blocker.Plo
-	-rm -f ./webrtc_dsp/modules/audio_processing/aec3/$(DEPDIR)/fullband_erle_estimator.Plo
-	-rm -f ./webrtc_dsp/modules/audio_processing/aec3/$(DEPDIR)/main_filter_update_gain.Plo
-	-rm -f ./webrtc_dsp/modules/audio_processing/aec3/$(DEPDIR)/matched_filter.Plo
-	-rm -f ./webrtc_dsp/modules/audio_processing/aec3/$(DEPDIR)/matched_filter_lag_aggregator.Plo
-	-rm -f ./webrtc_dsp/modules/audio_processing/aec3/$(DEPDIR)/matrix_buffer.Plo
-	-rm -f ./webrtc_dsp/modules/audio_processing/aec3/$(DEPDIR)/moving_average.Plo
-	-rm -f ./webrtc_dsp/modules/audio_processing/aec3/$(DEPDIR)/render_buffer.Plo
-	-rm -f ./webrtc_dsp/modules/audio_processing/aec3/$(DEPDIR)/render_delay_buffer.Plo
-	-rm -f ./webrtc_dsp/modules/audio_processing/aec3/$(DEPDIR)/render_delay_buffer2.Plo
-	-rm -f ./webrtc_dsp/modules/audio_processing/aec3/$(DEPDIR)/render_delay_controller.Plo
-	-rm -f ./webrtc_dsp/modules/audio_processing/aec3/$(DEPDIR)/render_delay_controller2.Plo
-	-rm -f ./webrtc_dsp/modules/audio_processing/aec3/$(DEPDIR)/render_delay_controller_metrics.Plo
-	-rm -f ./webrtc_dsp/modules/audio_processing/aec3/$(DEPDIR)/render_reverb_model.Plo
-	-rm -f ./webrtc_dsp/modules/audio_processing/aec3/$(DEPDIR)/render_signal_analyzer.Plo
-	-rm -f ./webrtc_dsp/modules/audio_processing/aec3/$(DEPDIR)/residual_echo_estimator.Plo
-	-rm -f ./webrtc_dsp/modules/audio_processing/aec3/$(DEPDIR)/reverb_decay_estimator.Plo
-	-rm -f ./webrtc_dsp/modules/audio_processing/aec3/$(DEPDIR)/reverb_frequency_response.Plo
-	-rm -f ./webrtc_dsp/modules/audio_processing/aec3/$(DEPDIR)/reverb_model.Plo
-	-rm -f ./webrtc_dsp/modules/audio_processing/aec3/$(DEPDIR)/reverb_model_estimator.Plo
-	-rm -f ./webrtc_dsp/modules/audio_processing/aec3/$(DEPDIR)/reverb_model_fallback.Plo
-	-rm -f ./webrtc_dsp/modules/audio_processing/aec3/$(DEPDIR)/shadow_filter_update_gain.Plo
-	-rm -f ./webrtc_dsp/modules/audio_processing/aec3/$(DEPDIR)/skew_estimator.Plo
-	-rm -f ./webrtc_dsp/modules/audio_processing/aec3/$(DEPDIR)/stationarity_estimator.Plo
-	-rm -f ./webrtc_dsp/modules/audio_processing/aec3/$(DEPDIR)/subband_erle_estimator.Plo
-	-rm -f ./webrtc_dsp/modules/audio_processing/aec3/$(DEPDIR)/subtractor.Plo
-	-rm -f ./webrtc_dsp/modules/audio_processing/aec3/$(DEPDIR)/subtractor_output.Plo
-	-rm -f ./webrtc_dsp/modules/audio_processing/aec3/$(DEPDIR)/subtractor_output_analyzer.Plo
-	-rm -f ./webrtc_dsp/modules/audio_processing/aec3/$(DEPDIR)/suppression_filter.Plo
-	-rm -f ./webrtc_dsp/modules/audio_processing/aec3/$(DEPDIR)/suppression_gain.Plo
-	-rm -f ./webrtc_dsp/modules/audio_processing/aec3/$(DEPDIR)/suppression_gain_limiter.Plo
-	-rm -f ./webrtc_dsp/modules/audio_processing/aec3/$(DEPDIR)/vector_buffer.Plo
-	-rm -f ./webrtc_dsp/modules/audio_processing/aecm/$(DEPDIR)/aecm_core.Plo
-	-rm -f ./webrtc_dsp/modules/audio_processing/aecm/$(DEPDIR)/aecm_core_c.Plo
-	-rm -f ./webrtc_dsp/modules/audio_processing/aecm/$(DEPDIR)/echo_control_mobile.Plo
-	-rm -f ./webrtc_dsp/modules/audio_processing/agc/$(DEPDIR)/agc.Plo
-	-rm -f ./webrtc_dsp/modules/audio_processing/agc/$(DEPDIR)/agc_manager_direct.Plo
-	-rm -f ./webrtc_dsp/modules/audio_processing/agc/$(DEPDIR)/loudness_histogram.Plo
-	-rm -f ./webrtc_dsp/modules/audio_processing/agc/$(DEPDIR)/utility.Plo
-	-rm -f ./webrtc_dsp/modules/audio_processing/agc/legacy/$(DEPDIR)/analog_agc.Plo
-	-rm -f ./webrtc_dsp/modules/audio_processing/agc/legacy/$(DEPDIR)/digital_agc.Plo
-	-rm -f ./webrtc_dsp/modules/audio_processing/agc2/$(DEPDIR)/adaptive_agc.Plo
-	-rm -f ./webrtc_dsp/modules/audio_processing/agc2/$(DEPDIR)/adaptive_digital_gain_applier.Plo
-	-rm -f ./webrtc_dsp/modules/audio_processing/agc2/$(DEPDIR)/adaptive_mode_level_estimator.Plo
-	-rm -f ./webrtc_dsp/modules/audio_processing/agc2/$(DEPDIR)/adaptive_mode_level_estimator_agc.Plo
-	-rm -f ./webrtc_dsp/modules/audio_processing/agc2/$(DEPDIR)/agc2_common.Plo
-	-rm -f ./webrtc_dsp/modules/audio_processing/agc2/$(DEPDIR)/agc2_testing_common.Plo
-	-rm -f ./webrtc_dsp/modules/audio_processing/agc2/$(DEPDIR)/biquad_filter.Plo
-	-rm -f ./webrtc_dsp/modules/audio_processing/agc2/$(DEPDIR)/compute_interpolated_gain_curve.Plo
-	-rm -f ./webrtc_dsp/modules/audio_processing/agc2/$(DEPDIR)/down_sampler.Plo
-	-rm -f ./webrtc_dsp/modules/audio_processing/agc2/$(DEPDIR)/fixed_digital_level_estimator.Plo
-	-rm -f ./webrtc_dsp/modules/audio_processing/agc2/$(DEPDIR)/fixed_gain_controller.Plo
-	-rm -f ./webrtc_dsp/modules/audio_processing/agc2/$(DEPDIR)/gain_applier.Plo
-	-rm -f ./webrtc_dsp/modules/audio_processing/agc2/$(DEPDIR)/interpolated_gain_curve.Plo
-	-rm -f ./webrtc_dsp/modules/audio_processing/agc2/$(DEPDIR)/limiter.Plo
-	-rm -f ./webrtc_dsp/modules/audio_processing/agc2/$(DEPDIR)/limiter_db_gain_curve.Plo
-	-rm -f ./webrtc_dsp/modules/audio_processing/agc2/$(DEPDIR)/noise_level_estimator.Plo
-	-rm -f ./webrtc_dsp/modules/audio_processing/agc2/$(DEPDIR)/noise_spectrum_estimator.Plo
-	-rm -f ./webrtc_dsp/modules/audio_processing/agc2/$(DEPDIR)/saturation_protector.Plo
-	-rm -f ./webrtc_dsp/modules/audio_processing/agc2/$(DEPDIR)/signal_classifier.Plo
-	-rm -f ./webrtc_dsp/modules/audio_processing/agc2/$(DEPDIR)/vad_with_level.Plo
-	-rm -f ./webrtc_dsp/modules/audio_processing/agc2/$(DEPDIR)/vector_float_frame.Plo
-	-rm -f ./webrtc_dsp/modules/audio_processing/agc2/rnn_vad/$(DEPDIR)/features_extraction.Plo
-	-rm -f ./webrtc_dsp/modules/audio_processing/agc2/rnn_vad/$(DEPDIR)/fft_util.Plo
-	-rm -f ./webrtc_dsp/modules/audio_processing/agc2/rnn_vad/$(DEPDIR)/lp_residual.Plo
-	-rm -f ./webrtc_dsp/modules/audio_processing/agc2/rnn_vad/$(DEPDIR)/pitch_search.Plo
-	-rm -f ./webrtc_dsp/modules/audio_processing/agc2/rnn_vad/$(DEPDIR)/pitch_search_internal.Plo
-	-rm -f ./webrtc_dsp/modules/audio_processing/agc2/rnn_vad/$(DEPDIR)/rnn.Plo
-	-rm -f ./webrtc_dsp/modules/audio_processing/agc2/rnn_vad/$(DEPDIR)/spectral_features.Plo
-	-rm -f ./webrtc_dsp/modules/audio_processing/agc2/rnn_vad/$(DEPDIR)/spectral_features_internal.Plo
-	-rm -f ./webrtc_dsp/modules/audio_processing/audio_generator/$(DEPDIR)/file_audio_generator.Plo
-	-rm -f ./webrtc_dsp/modules/audio_processing/echo_detector/$(DEPDIR)/circular_buffer.Plo
-	-rm -f ./webrtc_dsp/modules/audio_processing/echo_detector/$(DEPDIR)/mean_variance_estimator.Plo
-	-rm -f ./webrtc_dsp/modules/audio_processing/echo_detector/$(DEPDIR)/moving_max.Plo
-	-rm -f ./webrtc_dsp/modules/audio_processing/echo_detector/$(DEPDIR)/normalized_covariance_estimator.Plo
-	-rm -f ./webrtc_dsp/modules/audio_processing/include/$(DEPDIR)/aec_dump.Plo
-	-rm -f ./webrtc_dsp/modules/audio_processing/include/$(DEPDIR)/audio_generator_factory.Plo
-	-rm -f ./webrtc_dsp/modules/audio_processing/include/$(DEPDIR)/audio_processing.Plo
-	-rm -f ./webrtc_dsp/modules/audio_processing/include/$(DEPDIR)/audio_processing_statistics.Plo
-	-rm -f ./webrtc_dsp/modules/audio_processing/include/$(DEPDIR)/config.Plo
-	-rm -f ./webrtc_dsp/modules/audio_processing/logging/$(DEPDIR)/apm_data_dumper.Plo
-	-rm -f ./webrtc_dsp/modules/audio_processing/ns/$(DEPDIR)/noise_suppression.Plo
-	-rm -f ./webrtc_dsp/modules/audio_processing/ns/$(DEPDIR)/noise_suppression_x.Plo
-	-rm -f ./webrtc_dsp/modules/audio_processing/ns/$(DEPDIR)/ns_core.Plo
-	-rm -f ./webrtc_dsp/modules/audio_processing/ns/$(DEPDIR)/nsx_core.Plo
-	-rm -f ./webrtc_dsp/modules/audio_processing/ns/$(DEPDIR)/nsx_core_c.Plo
-	-rm -f ./webrtc_dsp/modules/audio_processing/transient/$(DEPDIR)/moving_moments.Plo
-	-rm -f ./webrtc_dsp/modules/audio_processing/transient/$(DEPDIR)/transient_detector.Plo
-	-rm -f ./webrtc_dsp/modules/audio_processing/transient/$(DEPDIR)/transient_suppressor.Plo
-	-rm -f ./webrtc_dsp/modules/audio_processing/transient/$(DEPDIR)/wpd_node.Plo
-	-rm -f ./webrtc_dsp/modules/audio_processing/transient/$(DEPDIR)/wpd_tree.Plo
-	-rm -f ./webrtc_dsp/modules/audio_processing/utility/$(DEPDIR)/block_mean_calculator.Plo
-	-rm -f ./webrtc_dsp/modules/audio_processing/utility/$(DEPDIR)/delay_estimator.Plo
-	-rm -f ./webrtc_dsp/modules/audio_processing/utility/$(DEPDIR)/delay_estimator_wrapper.Plo
-	-rm -f ./webrtc_dsp/modules/audio_processing/utility/$(DEPDIR)/ooura_fft.Plo
-	-rm -f ./webrtc_dsp/modules/audio_processing/vad/$(DEPDIR)/gmm.Plo
-	-rm -f ./webrtc_dsp/modules/audio_processing/vad/$(DEPDIR)/pitch_based_vad.Plo
-	-rm -f ./webrtc_dsp/modules/audio_processing/vad/$(DEPDIR)/pitch_internal.Plo
-	-rm -f ./webrtc_dsp/modules/audio_processing/vad/$(DEPDIR)/pole_zero_filter.Plo
-	-rm -f ./webrtc_dsp/modules/audio_processing/vad/$(DEPDIR)/standalone_vad.Plo
-	-rm -f ./webrtc_dsp/modules/audio_processing/vad/$(DEPDIR)/vad_audio_proc.Plo
-	-rm -f ./webrtc_dsp/modules/audio_processing/vad/$(DEPDIR)/vad_circular_buffer.Plo
-	-rm -f ./webrtc_dsp/modules/audio_processing/vad/$(DEPDIR)/voice_activity_detector.Plo
-	-rm -f ./webrtc_dsp/modules/third_party/fft/$(DEPDIR)/fft.Plo
-	-rm -f ./webrtc_dsp/rtc_base/$(DEPDIR)/checks.Plo
-	-rm -f ./webrtc_dsp/rtc_base/$(DEPDIR)/criticalsection.Plo
-	-rm -f ./webrtc_dsp/rtc_base/$(DEPDIR)/event.Plo
-	-rm -f ./webrtc_dsp/rtc_base/$(DEPDIR)/event_tracer.Plo
-	-rm -f ./webrtc_dsp/rtc_base/$(DEPDIR)/logging_webrtc.Plo
-	-rm -f ./webrtc_dsp/rtc_base/$(DEPDIR)/platform_file.Plo
-	-rm -f ./webrtc_dsp/rtc_base/$(DEPDIR)/platform_thread.Plo
-	-rm -f ./webrtc_dsp/rtc_base/$(DEPDIR)/platform_thread_types.Plo
-	-rm -f ./webrtc_dsp/rtc_base/$(DEPDIR)/race_checker.Plo
-	-rm -f ./webrtc_dsp/rtc_base/$(DEPDIR)/string_to_number.Plo
-	-rm -f ./webrtc_dsp/rtc_base/$(DEPDIR)/stringencode.Plo
-	-rm -f ./webrtc_dsp/rtc_base/$(DEPDIR)/stringutils.Plo
-	-rm -f ./webrtc_dsp/rtc_base/$(DEPDIR)/thread_checker_impl.Plo
-	-rm -f ./webrtc_dsp/rtc_base/$(DEPDIR)/timeutils.Plo
-	-rm -f ./webrtc_dsp/rtc_base/memory/$(DEPDIR)/aligned_malloc.Plo
-	-rm -f ./webrtc_dsp/rtc_base/strings/$(DEPDIR)/string_builder.Plo
-	-rm -f ./webrtc_dsp/system_wrappers/source/$(DEPDIR)/cpu_features.Plo
-	-rm -f ./webrtc_dsp/system_wrappers/source/$(DEPDIR)/field_trial.Plo
-	-rm -f ./webrtc_dsp/system_wrappers/source/$(DEPDIR)/metrics.Plo
-	-rm -f ./webrtc_dsp/third_party/rnnoise/src/$(DEPDIR)/kiss_fft.Plo
-	-rm -f ./webrtc_dsp/third_party/rnnoise/src/$(DEPDIR)/rnn_vad_weights.Plo
-	-rm -f audio/$(DEPDIR)/AudioIO.Plo
-	-rm -f audio/$(DEPDIR)/AudioIOCallback.Plo
-	-rm -f audio/$(DEPDIR)/AudioInput.Plo
-	-rm -f audio/$(DEPDIR)/AudioOutput.Plo
-	-rm -f audio/$(DEPDIR)/Resampler.Plo
-	-rm -f os/darwin/$(DEPDIR)/AudioInputAudioUnit.Plo
-	-rm -f os/darwin/$(DEPDIR)/AudioInputAudioUnitOSX.Plo
-	-rm -f os/darwin/$(DEPDIR)/AudioOutputAudioUnit.Plo
-	-rm -f os/darwin/$(DEPDIR)/AudioOutputAudioUnitOSX.Plo
-	-rm -f os/darwin/$(DEPDIR)/AudioUnitIO.Plo
-	-rm -f os/darwin/$(DEPDIR)/DarwinSpecific.Plo
-	-rm -f os/darwin/$(DEPDIR)/SampleBufferDisplayLayerRenderer.Plo
-	-rm -f os/darwin/$(DEPDIR)/TGVVideoRenderer.Plo
-	-rm -f os/darwin/$(DEPDIR)/TGVVideoSource.Plo
-	-rm -f os/darwin/$(DEPDIR)/VideoToolboxEncoderSource.Plo
-	-rm -f os/linux/$(DEPDIR)/AudioInputALSA.Plo
-	-rm -f os/linux/$(DEPDIR)/AudioInputPulse.Plo
-	-rm -f os/linux/$(DEPDIR)/AudioOutputALSA.Plo
-	-rm -f os/linux/$(DEPDIR)/AudioOutputPulse.Plo
-	-rm -f os/linux/$(DEPDIR)/AudioPulse.Plo
-	-rm -f os/posix/$(DEPDIR)/NetworkSocketPosix.Plo
-	-rm -f video/$(DEPDIR)/ScreamCongestionController.Plo
-	-rm -f video/$(DEPDIR)/VideoRenderer.Plo
-	-rm -f video/$(DEPDIR)/VideoSource.Plo
-	-rm -f webrtc_dsp/common_audio/signal_processing/$(DEPDIR)/complex_bit_reverse.Plo
-	-rm -f webrtc_dsp/common_audio/signal_processing/$(DEPDIR)/complex_bit_reverse_arm.Plo
-	-rm -f webrtc_dsp/common_audio/signal_processing/$(DEPDIR)/cross_correlation_neon.Plo
-	-rm -f webrtc_dsp/common_audio/signal_processing/$(DEPDIR)/downsample_fast_neon.Plo
-	-rm -f webrtc_dsp/common_audio/signal_processing/$(DEPDIR)/min_max_operations_neon.Plo
-	-rm -f webrtc_dsp/common_audio/third_party/spl_sqrt_floor/$(DEPDIR)/spl_sqrt_floor.Plo
-	-rm -f webrtc_dsp/common_audio/third_party/spl_sqrt_floor/$(DEPDIR)/spl_sqrt_floor_arm.Plo
-	-rm -f webrtc_dsp/modules/audio_processing/aec/$(DEPDIR)/aec_core_neon.Plo
-	-rm -f webrtc_dsp/modules/audio_processing/aec/$(DEPDIR)/aec_core_sse2.Plo
-	-rm -f webrtc_dsp/modules/audio_processing/aecm/$(DEPDIR)/aecm_core_neon.Plo
-	-rm -f webrtc_dsp/modules/audio_processing/ns/$(DEPDIR)/nsx_core_neon.Plo
-	-rm -f webrtc_dsp/modules/audio_processing/utility/$(DEPDIR)/ooura_fft_neon.Plo
-	-rm -f webrtc_dsp/modules/audio_processing/utility/$(DEPDIR)/ooura_fft_sse2.Plo
-	-rm -f webrtc_dsp/rtc_base/$(DEPDIR)/logging_mac.Plo
-	-rm -f Makefile
-distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-hdr distclean-libtool distclean-tags
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-html-am:
-
-info: info-am
-
-info-am:
-
-install-data-am: install-nobase_tgvoipincludeHEADERS
-
-install-dvi: install-dvi-am
-
-install-dvi-am:
-
-install-exec-am: install-libLTLIBRARIES
-
-install-html: install-html-am
-
-install-html-am:
-
-install-info: install-info-am
-
-install-info-am:
-
-install-man:
-
-install-pdf: install-pdf-am
-
-install-pdf-am:
-
-install-ps: install-ps-am
-
-install-ps-am:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
-	-rm -rf $(top_srcdir)/autom4te.cache
-		-rm -f ./$(DEPDIR)/Buffers.Plo
-	-rm -f ./$(DEPDIR)/CongestionControl.Plo
-	-rm -f ./$(DEPDIR)/EchoCanceller.Plo
-	-rm -f ./$(DEPDIR)/JitterBuffer.Plo
-	-rm -f ./$(DEPDIR)/MediaStreamItf.Plo
-	-rm -f ./$(DEPDIR)/MessageThread.Plo
-	-rm -f ./$(DEPDIR)/NetworkSocket.Plo
-	-rm -f ./$(DEPDIR)/OpusDecoder.Plo
-	-rm -f ./$(DEPDIR)/OpusEncoder.Plo
-	-rm -f ./$(DEPDIR)/PacketReassembler.Plo
-	-rm -f ./$(DEPDIR)/VoIPController.Plo
-	-rm -f ./$(DEPDIR)/VoIPGroupController.Plo
-	-rm -f ./$(DEPDIR)/VoIPServerConfig.Plo
-	-rm -f ./$(DEPDIR)/json11.Plo
-	-rm -f ./$(DEPDIR)/logging.Plo
-	-rm -f ./webrtc_dsp/absl/base/internal/$(DEPDIR)/raw_logging.Plo
-	-rm -f ./webrtc_dsp/absl/base/internal/$(DEPDIR)/throw_delegate.Plo
-	-rm -f ./webrtc_dsp/absl/strings/$(DEPDIR)/ascii.Plo
-	-rm -f ./webrtc_dsp/absl/strings/$(DEPDIR)/string_view.Plo
-	-rm -f ./webrtc_dsp/absl/strings/internal/$(DEPDIR)/memutil.Plo
-	-rm -f ./webrtc_dsp/absl/types/$(DEPDIR)/bad_optional_access.Plo
-	-rm -f ./webrtc_dsp/absl/types/$(DEPDIR)/optional.Plo
-	-rm -f ./webrtc_dsp/api/audio/$(DEPDIR)/audio_frame.Plo
-	-rm -f ./webrtc_dsp/api/audio/$(DEPDIR)/echo_canceller3_config.Plo
-	-rm -f ./webrtc_dsp/api/audio/$(DEPDIR)/echo_canceller3_factory.Plo
-	-rm -f ./webrtc_dsp/common_audio/$(DEPDIR)/audio_converter.Plo
-	-rm -f ./webrtc_dsp/common_audio/$(DEPDIR)/audio_util.Plo
-	-rm -f ./webrtc_dsp/common_audio/$(DEPDIR)/channel_buffer.Plo
-	-rm -f ./webrtc_dsp/common_audio/$(DEPDIR)/fir_filter_c.Plo
-	-rm -f ./webrtc_dsp/common_audio/$(DEPDIR)/fir_filter_factory.Plo
-	-rm -f ./webrtc_dsp/common_audio/$(DEPDIR)/fir_filter_sse.Plo
-	-rm -f ./webrtc_dsp/common_audio/$(DEPDIR)/real_fourier.Plo
-	-rm -f ./webrtc_dsp/common_audio/$(DEPDIR)/real_fourier_ooura.Plo
-	-rm -f ./webrtc_dsp/common_audio/$(DEPDIR)/ring_buffer.Plo
-	-rm -f ./webrtc_dsp/common_audio/$(DEPDIR)/smoothing_filter.Plo
-	-rm -f ./webrtc_dsp/common_audio/$(DEPDIR)/sparse_fir_filter.Plo
-	-rm -f ./webrtc_dsp/common_audio/$(DEPDIR)/wav_file.Plo
-	-rm -f ./webrtc_dsp/common_audio/$(DEPDIR)/wav_header.Plo
-	-rm -f ./webrtc_dsp/common_audio/$(DEPDIR)/window_generator.Plo
-	-rm -f ./webrtc_dsp/common_audio/resampler/$(DEPDIR)/push_resampler.Plo
-	-rm -f ./webrtc_dsp/common_audio/resampler/$(DEPDIR)/push_sinc_resampler.Plo
-	-rm -f ./webrtc_dsp/common_audio/resampler/$(DEPDIR)/resampler.Plo
-	-rm -f ./webrtc_dsp/common_audio/resampler/$(DEPDIR)/sinc_resampler.Plo
-	-rm -f ./webrtc_dsp/common_audio/resampler/$(DEPDIR)/sinc_resampler_sse.Plo
-	-rm -f ./webrtc_dsp/common_audio/resampler/$(DEPDIR)/sinusoidal_linear_chirp_source.Plo
-	-rm -f ./webrtc_dsp/common_audio/signal_processing/$(DEPDIR)/auto_corr_to_refl_coef.Plo
-	-rm -f ./webrtc_dsp/common_audio/signal_processing/$(DEPDIR)/auto_correlation.Plo
-	-rm -f ./webrtc_dsp/common_audio/signal_processing/$(DEPDIR)/complex_fft.Plo
-	-rm -f ./webrtc_dsp/common_audio/signal_processing/$(DEPDIR)/copy_set_operations.Plo
-	-rm -f ./webrtc_dsp/common_audio/signal_processing/$(DEPDIR)/cross_correlation.Plo
-	-rm -f ./webrtc_dsp/common_audio/signal_processing/$(DEPDIR)/division_operations.Plo
-	-rm -f ./webrtc_dsp/common_audio/signal_processing/$(DEPDIR)/dot_product_with_scale.Plo
-	-rm -f ./webrtc_dsp/common_audio/signal_processing/$(DEPDIR)/downsample_fast.Plo
-	-rm -f ./webrtc_dsp/common_audio/signal_processing/$(DEPDIR)/energy.Plo
-	-rm -f ./webrtc_dsp/common_audio/signal_processing/$(DEPDIR)/filter_ar.Plo
-	-rm -f ./webrtc_dsp/common_audio/signal_processing/$(DEPDIR)/filter_ar_fast_q12.Plo
-	-rm -f ./webrtc_dsp/common_audio/signal_processing/$(DEPDIR)/filter_ma_fast_q12.Plo
-	-rm -f ./webrtc_dsp/common_audio/signal_processing/$(DEPDIR)/get_hanning_window.Plo
-	-rm -f ./webrtc_dsp/common_audio/signal_processing/$(DEPDIR)/get_scaling_square.Plo
-	-rm -f ./webrtc_dsp/common_audio/signal_processing/$(DEPDIR)/ilbc_specific_functions.Plo
-	-rm -f ./webrtc_dsp/common_audio/signal_processing/$(DEPDIR)/levinson_durbin.Plo
-	-rm -f ./webrtc_dsp/common_audio/signal_processing/$(DEPDIR)/lpc_to_refl_coef.Plo
-	-rm -f ./webrtc_dsp/common_audio/signal_processing/$(DEPDIR)/min_max_operations.Plo
-	-rm -f ./webrtc_dsp/common_audio/signal_processing/$(DEPDIR)/randomization_functions.Plo
-	-rm -f ./webrtc_dsp/common_audio/signal_processing/$(DEPDIR)/real_fft.Plo
-	-rm -f ./webrtc_dsp/common_audio/signal_processing/$(DEPDIR)/refl_coef_to_lpc.Plo
-	-rm -f ./webrtc_dsp/common_audio/signal_processing/$(DEPDIR)/resample.Plo
-	-rm -f ./webrtc_dsp/common_audio/signal_processing/$(DEPDIR)/resample_48khz.Plo
-	-rm -f ./webrtc_dsp/common_audio/signal_processing/$(DEPDIR)/resample_by_2.Plo
-	-rm -f ./webrtc_dsp/common_audio/signal_processing/$(DEPDIR)/resample_by_2_internal.Plo
-	-rm -f ./webrtc_dsp/common_audio/signal_processing/$(DEPDIR)/resample_fractional.Plo
-	-rm -f ./webrtc_dsp/common_audio/signal_processing/$(DEPDIR)/spl_init.Plo
-	-rm -f ./webrtc_dsp/common_audio/signal_processing/$(DEPDIR)/spl_inl.Plo
-	-rm -f ./webrtc_dsp/common_audio/signal_processing/$(DEPDIR)/spl_sqrt.Plo
-	-rm -f ./webrtc_dsp/common_audio/signal_processing/$(DEPDIR)/splitting_filter1.Plo
-	-rm -f ./webrtc_dsp/common_audio/signal_processing/$(DEPDIR)/sqrt_of_one_minus_x_squared.Plo
-	-rm -f ./webrtc_dsp/common_audio/signal_processing/$(DEPDIR)/vector_scaling_operations.Plo
-	-rm -f ./webrtc_dsp/common_audio/third_party/fft4g/$(DEPDIR)/fft4g.Plo
-	-rm -f ./webrtc_dsp/common_audio/vad/$(DEPDIR)/vad.Plo
-	-rm -f ./webrtc_dsp/common_audio/vad/$(DEPDIR)/vad_core.Plo
-	-rm -f ./webrtc_dsp/common_audio/vad/$(DEPDIR)/vad_filterbank.Plo
-	-rm -f ./webrtc_dsp/common_audio/vad/$(DEPDIR)/vad_gmm.Plo
-	-rm -f ./webrtc_dsp/common_audio/vad/$(DEPDIR)/vad_sp.Plo
-	-rm -f ./webrtc_dsp/common_audio/vad/$(DEPDIR)/webrtc_vad.Plo
-	-rm -f ./webrtc_dsp/modules/audio_coding/codecs/isac/main/source/$(DEPDIR)/arith_routines.Plo
-	-rm -f ./webrtc_dsp/modules/audio_coding/codecs/isac/main/source/$(DEPDIR)/arith_routines_hist.Plo
-	-rm -f ./webrtc_dsp/modules/audio_coding/codecs/isac/main/source/$(DEPDIR)/arith_routines_logist.Plo
-	-rm -f ./webrtc_dsp/modules/audio_coding/codecs/isac/main/source/$(DEPDIR)/bandwidth_estimator.Plo
-	-rm -f ./webrtc_dsp/modules/audio_coding/codecs/isac/main/source/$(DEPDIR)/crc.Plo
-	-rm -f ./webrtc_dsp/modules/audio_coding/codecs/isac/main/source/$(DEPDIR)/decode.Plo
-	-rm -f ./webrtc_dsp/modules/audio_coding/codecs/isac/main/source/$(DEPDIR)/decode_bwe.Plo
-	-rm -f ./webrtc_dsp/modules/audio_coding/codecs/isac/main/source/$(DEPDIR)/encode.Plo
-	-rm -f ./webrtc_dsp/modules/audio_coding/codecs/isac/main/source/$(DEPDIR)/encode_lpc_swb.Plo
-	-rm -f ./webrtc_dsp/modules/audio_coding/codecs/isac/main/source/$(DEPDIR)/entropy_coding.Plo
-	-rm -f ./webrtc_dsp/modules/audio_coding/codecs/isac/main/source/$(DEPDIR)/filter_functions.Plo
-	-rm -f ./webrtc_dsp/modules/audio_coding/codecs/isac/main/source/$(DEPDIR)/filterbanks.Plo
-	-rm -f ./webrtc_dsp/modules/audio_coding/codecs/isac/main/source/$(DEPDIR)/intialize.Plo
-	-rm -f ./webrtc_dsp/modules/audio_coding/codecs/isac/main/source/$(DEPDIR)/isac.Plo
-	-rm -f ./webrtc_dsp/modules/audio_coding/codecs/isac/main/source/$(DEPDIR)/isac_vad.Plo
-	-rm -f ./webrtc_dsp/modules/audio_coding/codecs/isac/main/source/$(DEPDIR)/lattice.Plo
-	-rm -f ./webrtc_dsp/modules/audio_coding/codecs/isac/main/source/$(DEPDIR)/lpc_analysis.Plo
-	-rm -f ./webrtc_dsp/modules/audio_coding/codecs/isac/main/source/$(DEPDIR)/lpc_gain_swb_tables.Plo
-	-rm -f ./webrtc_dsp/modules/audio_coding/codecs/isac/main/source/$(DEPDIR)/lpc_shape_swb12_tables.Plo
-	-rm -f ./webrtc_dsp/modules/audio_coding/codecs/isac/main/source/$(DEPDIR)/lpc_shape_swb16_tables.Plo
-	-rm -f ./webrtc_dsp/modules/audio_coding/codecs/isac/main/source/$(DEPDIR)/lpc_tables.Plo
-	-rm -f ./webrtc_dsp/modules/audio_coding/codecs/isac/main/source/$(DEPDIR)/pitch_estimator.Plo
-	-rm -f ./webrtc_dsp/modules/audio_coding/codecs/isac/main/source/$(DEPDIR)/pitch_filter.Plo
-	-rm -f ./webrtc_dsp/modules/audio_coding/codecs/isac/main/source/$(DEPDIR)/pitch_gain_tables.Plo
-	-rm -f ./webrtc_dsp/modules/audio_coding/codecs/isac/main/source/$(DEPDIR)/pitch_lag_tables.Plo
-	-rm -f ./webrtc_dsp/modules/audio_coding/codecs/isac/main/source/$(DEPDIR)/spectrum_ar_model_tables.Plo
-	-rm -f ./webrtc_dsp/modules/audio_coding/codecs/isac/main/source/$(DEPDIR)/transform.Plo
-	-rm -f ./webrtc_dsp/modules/audio_processing/$(DEPDIR)/audio_buffer.Plo
-	-rm -f ./webrtc_dsp/modules/audio_processing/$(DEPDIR)/audio_processing_impl.Plo
-	-rm -f ./webrtc_dsp/modules/audio_processing/$(DEPDIR)/echo_cancellation_impl.Plo
-	-rm -f ./webrtc_dsp/modules/audio_processing/$(DEPDIR)/echo_control_mobile_impl.Plo
-	-rm -f ./webrtc_dsp/modules/audio_processing/$(DEPDIR)/gain_control_for_experimental_agc.Plo
-	-rm -f ./webrtc_dsp/modules/audio_processing/$(DEPDIR)/gain_control_impl.Plo
-	-rm -f ./webrtc_dsp/modules/audio_processing/$(DEPDIR)/gain_controller2.Plo
-	-rm -f ./webrtc_dsp/modules/audio_processing/$(DEPDIR)/level_estimator_impl.Plo
-	-rm -f ./webrtc_dsp/modules/audio_processing/$(DEPDIR)/low_cut_filter.Plo
-	-rm -f ./webrtc_dsp/modules/audio_processing/$(DEPDIR)/noise_suppression_impl.Plo
-	-rm -f ./webrtc_dsp/modules/audio_processing/$(DEPDIR)/residual_echo_detector.Plo
-	-rm -f ./webrtc_dsp/modules/audio_processing/$(DEPDIR)/rms_level.Plo
-	-rm -f ./webrtc_dsp/modules/audio_processing/$(DEPDIR)/splitting_filter.Plo
-	-rm -f ./webrtc_dsp/modules/audio_processing/$(DEPDIR)/three_band_filter_bank.Plo
-	-rm -f ./webrtc_dsp/modules/audio_processing/$(DEPDIR)/typing_detection.Plo
-	-rm -f ./webrtc_dsp/modules/audio_processing/$(DEPDIR)/voice_detection_impl.Plo
-	-rm -f ./webrtc_dsp/modules/audio_processing/aec/$(DEPDIR)/aec_core.Plo
-	-rm -f ./webrtc_dsp/modules/audio_processing/aec/$(DEPDIR)/aec_resampler.Plo
-	-rm -f ./webrtc_dsp/modules/audio_processing/aec/$(DEPDIR)/echo_cancellation.Plo
-	-rm -f ./webrtc_dsp/modules/audio_processing/aec3/$(DEPDIR)/adaptive_fir_filter.Plo
-	-rm -f ./webrtc_dsp/modules/audio_processing/aec3/$(DEPDIR)/aec3_common.Plo
-	-rm -f ./webrtc_dsp/modules/audio_processing/aec3/$(DEPDIR)/aec3_fft.Plo
-	-rm -f ./webrtc_dsp/modules/audio_processing/aec3/$(DEPDIR)/aec_state.Plo
-	-rm -f ./webrtc_dsp/modules/audio_processing/aec3/$(DEPDIR)/block_delay_buffer.Plo
-	-rm -f ./webrtc_dsp/modules/audio_processing/aec3/$(DEPDIR)/block_framer.Plo
-	-rm -f ./webrtc_dsp/modules/audio_processing/aec3/$(DEPDIR)/block_processor.Plo
-	-rm -f ./webrtc_dsp/modules/audio_processing/aec3/$(DEPDIR)/block_processor2.Plo
-	-rm -f ./webrtc_dsp/modules/audio_processing/aec3/$(DEPDIR)/block_processor_metrics.Plo
-	-rm -f ./webrtc_dsp/modules/audio_processing/aec3/$(DEPDIR)/cascaded_biquad_filter.Plo
-	-rm -f ./webrtc_dsp/modules/audio_processing/aec3/$(DEPDIR)/comfort_noise_generator.Plo
-	-rm -f ./webrtc_dsp/modules/audio_processing/aec3/$(DEPDIR)/decimator.Plo
-	-rm -f ./webrtc_dsp/modules/audio_processing/aec3/$(DEPDIR)/downsampled_render_buffer.Plo
-	-rm -f ./webrtc_dsp/modules/audio_processing/aec3/$(DEPDIR)/echo_audibility.Plo
-	-rm -f ./webrtc_dsp/modules/audio_processing/aec3/$(DEPDIR)/echo_canceller3.Plo
-	-rm -f ./webrtc_dsp/modules/audio_processing/aec3/$(DEPDIR)/echo_path_delay_estimator.Plo
-	-rm -f ./webrtc_dsp/modules/audio_processing/aec3/$(DEPDIR)/echo_path_variability.Plo
-	-rm -f ./webrtc_dsp/modules/audio_processing/aec3/$(DEPDIR)/echo_remover.Plo
-	-rm -f ./webrtc_dsp/modules/audio_processing/aec3/$(DEPDIR)/echo_remover_metrics.Plo
-	-rm -f ./webrtc_dsp/modules/audio_processing/aec3/$(DEPDIR)/erl_estimator.Plo
-	-rm -f ./webrtc_dsp/modules/audio_processing/aec3/$(DEPDIR)/erle_estimator.Plo
-	-rm -f ./webrtc_dsp/modules/audio_processing/aec3/$(DEPDIR)/fft_buffer.Plo
-	-rm -f ./webrtc_dsp/modules/audio_processing/aec3/$(DEPDIR)/filter_analyzer.Plo
-	-rm -f ./webrtc_dsp/modules/audio_processing/aec3/$(DEPDIR)/frame_blocker.Plo
-	-rm -f ./webrtc_dsp/modules/audio_processing/aec3/$(DEPDIR)/fullband_erle_estimator.Plo
-	-rm -f ./webrtc_dsp/modules/audio_processing/aec3/$(DEPDIR)/main_filter_update_gain.Plo
-	-rm -f ./webrtc_dsp/modules/audio_processing/aec3/$(DEPDIR)/matched_filter.Plo
-	-rm -f ./webrtc_dsp/modules/audio_processing/aec3/$(DEPDIR)/matched_filter_lag_aggregator.Plo
-	-rm -f ./webrtc_dsp/modules/audio_processing/aec3/$(DEPDIR)/matrix_buffer.Plo
-	-rm -f ./webrtc_dsp/modules/audio_processing/aec3/$(DEPDIR)/moving_average.Plo
-	-rm -f ./webrtc_dsp/modules/audio_processing/aec3/$(DEPDIR)/render_buffer.Plo
-	-rm -f ./webrtc_dsp/modules/audio_processing/aec3/$(DEPDIR)/render_delay_buffer.Plo
-	-rm -f ./webrtc_dsp/modules/audio_processing/aec3/$(DEPDIR)/render_delay_buffer2.Plo
-	-rm -f ./webrtc_dsp/modules/audio_processing/aec3/$(DEPDIR)/render_delay_controller.Plo
-	-rm -f ./webrtc_dsp/modules/audio_processing/aec3/$(DEPDIR)/render_delay_controller2.Plo
-	-rm -f ./webrtc_dsp/modules/audio_processing/aec3/$(DEPDIR)/render_delay_controller_metrics.Plo
-	-rm -f ./webrtc_dsp/modules/audio_processing/aec3/$(DEPDIR)/render_reverb_model.Plo
-	-rm -f ./webrtc_dsp/modules/audio_processing/aec3/$(DEPDIR)/render_signal_analyzer.Plo
-	-rm -f ./webrtc_dsp/modules/audio_processing/aec3/$(DEPDIR)/residual_echo_estimator.Plo
-	-rm -f ./webrtc_dsp/modules/audio_processing/aec3/$(DEPDIR)/reverb_decay_estimator.Plo
-	-rm -f ./webrtc_dsp/modules/audio_processing/aec3/$(DEPDIR)/reverb_frequency_response.Plo
-	-rm -f ./webrtc_dsp/modules/audio_processing/aec3/$(DEPDIR)/reverb_model.Plo
-	-rm -f ./webrtc_dsp/modules/audio_processing/aec3/$(DEPDIR)/reverb_model_estimator.Plo
-	-rm -f ./webrtc_dsp/modules/audio_processing/aec3/$(DEPDIR)/reverb_model_fallback.Plo
-	-rm -f ./webrtc_dsp/modules/audio_processing/aec3/$(DEPDIR)/shadow_filter_update_gain.Plo
-	-rm -f ./webrtc_dsp/modules/audio_processing/aec3/$(DEPDIR)/skew_estimator.Plo
-	-rm -f ./webrtc_dsp/modules/audio_processing/aec3/$(DEPDIR)/stationarity_estimator.Plo
-	-rm -f ./webrtc_dsp/modules/audio_processing/aec3/$(DEPDIR)/subband_erle_estimator.Plo
-	-rm -f ./webrtc_dsp/modules/audio_processing/aec3/$(DEPDIR)/subtractor.Plo
-	-rm -f ./webrtc_dsp/modules/audio_processing/aec3/$(DEPDIR)/subtractor_output.Plo
-	-rm -f ./webrtc_dsp/modules/audio_processing/aec3/$(DEPDIR)/subtractor_output_analyzer.Plo
-	-rm -f ./webrtc_dsp/modules/audio_processing/aec3/$(DEPDIR)/suppression_filter.Plo
-	-rm -f ./webrtc_dsp/modules/audio_processing/aec3/$(DEPDIR)/suppression_gain.Plo
-	-rm -f ./webrtc_dsp/modules/audio_processing/aec3/$(DEPDIR)/suppression_gain_limiter.Plo
-	-rm -f ./webrtc_dsp/modules/audio_processing/aec3/$(DEPDIR)/vector_buffer.Plo
-	-rm -f ./webrtc_dsp/modules/audio_processing/aecm/$(DEPDIR)/aecm_core.Plo
-	-rm -f ./webrtc_dsp/modules/audio_processing/aecm/$(DEPDIR)/aecm_core_c.Plo
-	-rm -f ./webrtc_dsp/modules/audio_processing/aecm/$(DEPDIR)/echo_control_mobile.Plo
-	-rm -f ./webrtc_dsp/modules/audio_processing/agc/$(DEPDIR)/agc.Plo
-	-rm -f ./webrtc_dsp/modules/audio_processing/agc/$(DEPDIR)/agc_manager_direct.Plo
-	-rm -f ./webrtc_dsp/modules/audio_processing/agc/$(DEPDIR)/loudness_histogram.Plo
-	-rm -f ./webrtc_dsp/modules/audio_processing/agc/$(DEPDIR)/utility.Plo
-	-rm -f ./webrtc_dsp/modules/audio_processing/agc/legacy/$(DEPDIR)/analog_agc.Plo
-	-rm -f ./webrtc_dsp/modules/audio_processing/agc/legacy/$(DEPDIR)/digital_agc.Plo
-	-rm -f ./webrtc_dsp/modules/audio_processing/agc2/$(DEPDIR)/adaptive_agc.Plo
-	-rm -f ./webrtc_dsp/modules/audio_processing/agc2/$(DEPDIR)/adaptive_digital_gain_applier.Plo
-	-rm -f ./webrtc_dsp/modules/audio_processing/agc2/$(DEPDIR)/adaptive_mode_level_estimator.Plo
-	-rm -f ./webrtc_dsp/modules/audio_processing/agc2/$(DEPDIR)/adaptive_mode_level_estimator_agc.Plo
-	-rm -f ./webrtc_dsp/modules/audio_processing/agc2/$(DEPDIR)/agc2_common.Plo
-	-rm -f ./webrtc_dsp/modules/audio_processing/agc2/$(DEPDIR)/agc2_testing_common.Plo
-	-rm -f ./webrtc_dsp/modules/audio_processing/agc2/$(DEPDIR)/biquad_filter.Plo
-	-rm -f ./webrtc_dsp/modules/audio_processing/agc2/$(DEPDIR)/compute_interpolated_gain_curve.Plo
-	-rm -f ./webrtc_dsp/modules/audio_processing/agc2/$(DEPDIR)/down_sampler.Plo
-	-rm -f ./webrtc_dsp/modules/audio_processing/agc2/$(DEPDIR)/fixed_digital_level_estimator.Plo
-	-rm -f ./webrtc_dsp/modules/audio_processing/agc2/$(DEPDIR)/fixed_gain_controller.Plo
-	-rm -f ./webrtc_dsp/modules/audio_processing/agc2/$(DEPDIR)/gain_applier.Plo
-	-rm -f ./webrtc_dsp/modules/audio_processing/agc2/$(DEPDIR)/interpolated_gain_curve.Plo
-	-rm -f ./webrtc_dsp/modules/audio_processing/agc2/$(DEPDIR)/limiter.Plo
-	-rm -f ./webrtc_dsp/modules/audio_processing/agc2/$(DEPDIR)/limiter_db_gain_curve.Plo
-	-rm -f ./webrtc_dsp/modules/audio_processing/agc2/$(DEPDIR)/noise_level_estimator.Plo
-	-rm -f ./webrtc_dsp/modules/audio_processing/agc2/$(DEPDIR)/noise_spectrum_estimator.Plo
-	-rm -f ./webrtc_dsp/modules/audio_processing/agc2/$(DEPDIR)/saturation_protector.Plo
-	-rm -f ./webrtc_dsp/modules/audio_processing/agc2/$(DEPDIR)/signal_classifier.Plo
-	-rm -f ./webrtc_dsp/modules/audio_processing/agc2/$(DEPDIR)/vad_with_level.Plo
-	-rm -f ./webrtc_dsp/modules/audio_processing/agc2/$(DEPDIR)/vector_float_frame.Plo
-	-rm -f ./webrtc_dsp/modules/audio_processing/agc2/rnn_vad/$(DEPDIR)/features_extraction.Plo
-	-rm -f ./webrtc_dsp/modules/audio_processing/agc2/rnn_vad/$(DEPDIR)/fft_util.Plo
-	-rm -f ./webrtc_dsp/modules/audio_processing/agc2/rnn_vad/$(DEPDIR)/lp_residual.Plo
-	-rm -f ./webrtc_dsp/modules/audio_processing/agc2/rnn_vad/$(DEPDIR)/pitch_search.Plo
-	-rm -f ./webrtc_dsp/modules/audio_processing/agc2/rnn_vad/$(DEPDIR)/pitch_search_internal.Plo
-	-rm -f ./webrtc_dsp/modules/audio_processing/agc2/rnn_vad/$(DEPDIR)/rnn.Plo
-	-rm -f ./webrtc_dsp/modules/audio_processing/agc2/rnn_vad/$(DEPDIR)/spectral_features.Plo
-	-rm -f ./webrtc_dsp/modules/audio_processing/agc2/rnn_vad/$(DEPDIR)/spectral_features_internal.Plo
-	-rm -f ./webrtc_dsp/modules/audio_processing/audio_generator/$(DEPDIR)/file_audio_generator.Plo
-	-rm -f ./webrtc_dsp/modules/audio_processing/echo_detector/$(DEPDIR)/circular_buffer.Plo
-	-rm -f ./webrtc_dsp/modules/audio_processing/echo_detector/$(DEPDIR)/mean_variance_estimator.Plo
-	-rm -f ./webrtc_dsp/modules/audio_processing/echo_detector/$(DEPDIR)/moving_max.Plo
-	-rm -f ./webrtc_dsp/modules/audio_processing/echo_detector/$(DEPDIR)/normalized_covariance_estimator.Plo
-	-rm -f ./webrtc_dsp/modules/audio_processing/include/$(DEPDIR)/aec_dump.Plo
-	-rm -f ./webrtc_dsp/modules/audio_processing/include/$(DEPDIR)/audio_generator_factory.Plo
-	-rm -f ./webrtc_dsp/modules/audio_processing/include/$(DEPDIR)/audio_processing.Plo
-	-rm -f ./webrtc_dsp/modules/audio_processing/include/$(DEPDIR)/audio_processing_statistics.Plo
-	-rm -f ./webrtc_dsp/modules/audio_processing/include/$(DEPDIR)/config.Plo
-	-rm -f ./webrtc_dsp/modules/audio_processing/logging/$(DEPDIR)/apm_data_dumper.Plo
-	-rm -f ./webrtc_dsp/modules/audio_processing/ns/$(DEPDIR)/noise_suppression.Plo
-	-rm -f ./webrtc_dsp/modules/audio_processing/ns/$(DEPDIR)/noise_suppression_x.Plo
-	-rm -f ./webrtc_dsp/modules/audio_processing/ns/$(DEPDIR)/ns_core.Plo
-	-rm -f ./webrtc_dsp/modules/audio_processing/ns/$(DEPDIR)/nsx_core.Plo
-	-rm -f ./webrtc_dsp/modules/audio_processing/ns/$(DEPDIR)/nsx_core_c.Plo
-	-rm -f ./webrtc_dsp/modules/audio_processing/transient/$(DEPDIR)/moving_moments.Plo
-	-rm -f ./webrtc_dsp/modules/audio_processing/transient/$(DEPDIR)/transient_detector.Plo
-	-rm -f ./webrtc_dsp/modules/audio_processing/transient/$(DEPDIR)/transient_suppressor.Plo
-	-rm -f ./webrtc_dsp/modules/audio_processing/transient/$(DEPDIR)/wpd_node.Plo
-	-rm -f ./webrtc_dsp/modules/audio_processing/transient/$(DEPDIR)/wpd_tree.Plo
-	-rm -f ./webrtc_dsp/modules/audio_processing/utility/$(DEPDIR)/block_mean_calculator.Plo
-	-rm -f ./webrtc_dsp/modules/audio_processing/utility/$(DEPDIR)/delay_estimator.Plo
-	-rm -f ./webrtc_dsp/modules/audio_processing/utility/$(DEPDIR)/delay_estimator_wrapper.Plo
-	-rm -f ./webrtc_dsp/modules/audio_processing/utility/$(DEPDIR)/ooura_fft.Plo
-	-rm -f ./webrtc_dsp/modules/audio_processing/vad/$(DEPDIR)/gmm.Plo
-	-rm -f ./webrtc_dsp/modules/audio_processing/vad/$(DEPDIR)/pitch_based_vad.Plo
-	-rm -f ./webrtc_dsp/modules/audio_processing/vad/$(DEPDIR)/pitch_internal.Plo
-	-rm -f ./webrtc_dsp/modules/audio_processing/vad/$(DEPDIR)/pole_zero_filter.Plo
-	-rm -f ./webrtc_dsp/modules/audio_processing/vad/$(DEPDIR)/standalone_vad.Plo
-	-rm -f ./webrtc_dsp/modules/audio_processing/vad/$(DEPDIR)/vad_audio_proc.Plo
-	-rm -f ./webrtc_dsp/modules/audio_processing/vad/$(DEPDIR)/vad_circular_buffer.Plo
-	-rm -f ./webrtc_dsp/modules/audio_processing/vad/$(DEPDIR)/voice_activity_detector.Plo
-	-rm -f ./webrtc_dsp/modules/third_party/fft/$(DEPDIR)/fft.Plo
-	-rm -f ./webrtc_dsp/rtc_base/$(DEPDIR)/checks.Plo
-	-rm -f ./webrtc_dsp/rtc_base/$(DEPDIR)/criticalsection.Plo
-	-rm -f ./webrtc_dsp/rtc_base/$(DEPDIR)/event.Plo
-	-rm -f ./webrtc_dsp/rtc_base/$(DEPDIR)/event_tracer.Plo
-	-rm -f ./webrtc_dsp/rtc_base/$(DEPDIR)/logging_webrtc.Plo
-	-rm -f ./webrtc_dsp/rtc_base/$(DEPDIR)/platform_file.Plo
-	-rm -f ./webrtc_dsp/rtc_base/$(DEPDIR)/platform_thread.Plo
-	-rm -f ./webrtc_dsp/rtc_base/$(DEPDIR)/platform_thread_types.Plo
-	-rm -f ./webrtc_dsp/rtc_base/$(DEPDIR)/race_checker.Plo
-	-rm -f ./webrtc_dsp/rtc_base/$(DEPDIR)/string_to_number.Plo
-	-rm -f ./webrtc_dsp/rtc_base/$(DEPDIR)/stringencode.Plo
-	-rm -f ./webrtc_dsp/rtc_base/$(DEPDIR)/stringutils.Plo
-	-rm -f ./webrtc_dsp/rtc_base/$(DEPDIR)/thread_checker_impl.Plo
-	-rm -f ./webrtc_dsp/rtc_base/$(DEPDIR)/timeutils.Plo
-	-rm -f ./webrtc_dsp/rtc_base/memory/$(DEPDIR)/aligned_malloc.Plo
-	-rm -f ./webrtc_dsp/rtc_base/strings/$(DEPDIR)/string_builder.Plo
-	-rm -f ./webrtc_dsp/system_wrappers/source/$(DEPDIR)/cpu_features.Plo
-	-rm -f ./webrtc_dsp/system_wrappers/source/$(DEPDIR)/field_trial.Plo
-	-rm -f ./webrtc_dsp/system_wrappers/source/$(DEPDIR)/metrics.Plo
-	-rm -f ./webrtc_dsp/third_party/rnnoise/src/$(DEPDIR)/kiss_fft.Plo
-	-rm -f ./webrtc_dsp/third_party/rnnoise/src/$(DEPDIR)/rnn_vad_weights.Plo
-	-rm -f audio/$(DEPDIR)/AudioIO.Plo
-	-rm -f audio/$(DEPDIR)/AudioIOCallback.Plo
-	-rm -f audio/$(DEPDIR)/AudioInput.Plo
-	-rm -f audio/$(DEPDIR)/AudioOutput.Plo
-	-rm -f audio/$(DEPDIR)/Resampler.Plo
-	-rm -f os/darwin/$(DEPDIR)/AudioInputAudioUnit.Plo
-	-rm -f os/darwin/$(DEPDIR)/AudioInputAudioUnitOSX.Plo
-	-rm -f os/darwin/$(DEPDIR)/AudioOutputAudioUnit.Plo
-	-rm -f os/darwin/$(DEPDIR)/AudioOutputAudioUnitOSX.Plo
-	-rm -f os/darwin/$(DEPDIR)/AudioUnitIO.Plo
-	-rm -f os/darwin/$(DEPDIR)/DarwinSpecific.Plo
-	-rm -f os/darwin/$(DEPDIR)/SampleBufferDisplayLayerRenderer.Plo
-	-rm -f os/darwin/$(DEPDIR)/TGVVideoRenderer.Plo
-	-rm -f os/darwin/$(DEPDIR)/TGVVideoSource.Plo
-	-rm -f os/darwin/$(DEPDIR)/VideoToolboxEncoderSource.Plo
-	-rm -f os/linux/$(DEPDIR)/AudioInputALSA.Plo
-	-rm -f os/linux/$(DEPDIR)/AudioInputPulse.Plo
-	-rm -f os/linux/$(DEPDIR)/AudioOutputALSA.Plo
-	-rm -f os/linux/$(DEPDIR)/AudioOutputPulse.Plo
-	-rm -f os/linux/$(DEPDIR)/AudioPulse.Plo
-	-rm -f os/posix/$(DEPDIR)/NetworkSocketPosix.Plo
-	-rm -f video/$(DEPDIR)/ScreamCongestionController.Plo
-	-rm -f video/$(DEPDIR)/VideoRenderer.Plo
-	-rm -f video/$(DEPDIR)/VideoSource.Plo
-	-rm -f webrtc_dsp/common_audio/signal_processing/$(DEPDIR)/complex_bit_reverse.Plo
-	-rm -f webrtc_dsp/common_audio/signal_processing/$(DEPDIR)/complex_bit_reverse_arm.Plo
-	-rm -f webrtc_dsp/common_audio/signal_processing/$(DEPDIR)/cross_correlation_neon.Plo
-	-rm -f webrtc_dsp/common_audio/signal_processing/$(DEPDIR)/downsample_fast_neon.Plo
-	-rm -f webrtc_dsp/common_audio/signal_processing/$(DEPDIR)/min_max_operations_neon.Plo
-	-rm -f webrtc_dsp/common_audio/third_party/spl_sqrt_floor/$(DEPDIR)/spl_sqrt_floor.Plo
-	-rm -f webrtc_dsp/common_audio/third_party/spl_sqrt_floor/$(DEPDIR)/spl_sqrt_floor_arm.Plo
-	-rm -f webrtc_dsp/modules/audio_processing/aec/$(DEPDIR)/aec_core_neon.Plo
-	-rm -f webrtc_dsp/modules/audio_processing/aec/$(DEPDIR)/aec_core_sse2.Plo
-	-rm -f webrtc_dsp/modules/audio_processing/aecm/$(DEPDIR)/aecm_core_neon.Plo
-	-rm -f webrtc_dsp/modules/audio_processing/ns/$(DEPDIR)/nsx_core_neon.Plo
-	-rm -f webrtc_dsp/modules/audio_processing/utility/$(DEPDIR)/ooura_fft_neon.Plo
-	-rm -f webrtc_dsp/modules/audio_processing/utility/$(DEPDIR)/ooura_fft_sse2.Plo
-	-rm -f webrtc_dsp/rtc_base/$(DEPDIR)/logging_mac.Plo
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-compile mostlyclean-generic \
-	mostlyclean-libtool
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am: uninstall-libLTLIBRARIES \
-	uninstall-nobase_tgvoipincludeHEADERS
-
-.MAKE: all install-am install-strip
-
-.PHONY: CTAGS GTAGS TAGS all all-am am--depfiles am--refresh check \
-	check-am clean clean-cscope clean-generic clean-libLTLIBRARIES \
-	clean-libtool cscope cscopelist-am ctags ctags-am dist \
-	dist-all dist-bzip2 dist-gzip dist-lzip dist-shar dist-tarZ \
-	dist-xz dist-zip distcheck distclean distclean-compile \
-	distclean-generic distclean-hdr distclean-libtool \
-	distclean-tags distcleancheck distdir distuninstallcheck dvi \
-	dvi-am html html-am info info-am install install-am \
-	install-data install-data-am install-dvi install-dvi-am \
-	install-exec install-exec-am install-html install-html-am \
-	install-info install-info-am install-libLTLIBRARIES \
-	install-man install-nobase_tgvoipincludeHEADERS install-pdf \
-	install-pdf-am install-ps install-ps-am install-strip \
-	installcheck installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-compile \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags tags-am uninstall uninstall-am uninstall-libLTLIBRARIES \
-	uninstall-nobase_tgvoipincludeHEADERS
-
-.PRECIOUS: Makefile
-
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/submodules/libtgvoip/MediaStreamItf.cpp b/submodules/libtgvoip/MediaStreamItf.cpp
deleted file mode 100644
index 554ed0d7ab..0000000000
--- a/submodules/libtgvoip/MediaStreamItf.cpp
+++ /dev/null
@@ -1,209 +0,0 @@
-//
-// libtgvoip is free and unencumbered public domain software.
-// For more information, see http://unlicense.org or the UNLICENSE file
-// you should have received with this source code distribution.
-//
-
-#include "logging.h"
-#include "MediaStreamItf.h"
-#include "EchoCanceller.h"
-#include <stdint.h>
-#include <algorithm>
-#include <math.h>
-#include <assert.h>
-
-using namespace tgvoip;
-
-void MediaStreamItf::SetCallback(size_t (*f)(unsigned char *, size_t, void*), void* param){
-	callback=f;
-	callbackParam=param;
-}
-
-size_t MediaStreamItf::InvokeCallback(unsigned char *data, size_t length){
-	if(callback)
-		return (*callback)(data, length, callbackParam);
-	return 0;
-}
-
-AudioMixer::AudioMixer() : bufferPool(960*2, 16), processedQueue(16), semaphore(16, 0){
-	running=false;
-}
-
-AudioMixer::~AudioMixer(){
-}
-
-void AudioMixer::SetOutput(MediaStreamItf* output){
-	output->SetCallback(OutputCallback, this);
-}
-
-void AudioMixer::Start(){
-	assert(!running);
-	running=true;
-	thread=new Thread(std::bind(&AudioMixer::RunThread, this));
-	thread->SetName("AudioMixer");
-	thread->Start();
-}
-
-void AudioMixer::Stop(){
-	if(!running){
-		LOGE("Tried to stop AudioMixer that wasn't started");
-		return;
-	}
-	running=false;
-	semaphore.Release();
-	thread->Join();
-	delete thread;
-	thread=NULL;
-}
-
-void AudioMixer::DoCallback(unsigned char *data, size_t length){
-	//memset(data, 0, 960*2);
-	//LOGD("audio mixer callback, %d inputs", inputs.size());
-	if(processedQueue.Size()==0)
-		semaphore.Release(2);
-	else
-		semaphore.Release();
-	unsigned char* buf=processedQueue.GetBlocking();
-	memcpy(data, buf, 960*2);
-	bufferPool.Reuse(buf);
-}
-
-size_t AudioMixer::OutputCallback(unsigned char *data, size_t length, void *arg){
-	((AudioMixer*)arg)->DoCallback(data, length);
-	return 960*2;
-}
-
-void AudioMixer::AddInput(std::shared_ptr<MediaStreamItf> input){
-	MutexGuard m(inputsMutex);
-	MixerInput in;
-	in.multiplier=1;
-	in.source=input;
-	inputs.push_back(in);
-}
-
-void AudioMixer::RemoveInput(std::shared_ptr<MediaStreamItf> input){
-	MutexGuard m(inputsMutex);
-	for(std::vector<MixerInput>::iterator i=inputs.begin();i!=inputs.end();++i){
-		if(i->source==input){
-			inputs.erase(i);
-			return;
-		}
-	}
-}
-
-void AudioMixer::SetInputVolume(std::shared_ptr<MediaStreamItf> input, float volumeDB){
-	MutexGuard m(inputsMutex);
-	for(std::vector<MixerInput>::iterator i=inputs.begin();i!=inputs.end();++i){
-		if(i->source==input){
-			if(volumeDB==-INFINITY)
-				i->multiplier=0;
-			else
-				i->multiplier=expf(volumeDB/20.0f * logf(10.0f));
-			return;
-		}
-	}
-}
-
-void AudioMixer::RunThread(){
-	LOGV("AudioMixer thread started");
-	while(running){
-		semaphore.Acquire();
-		if(!running)
-			break;
-
-		unsigned char* data=bufferPool.Get();
-		//LOGV("Audio mixer processing a frame");
-		if(!data){
-			LOGE("AudioMixer: no buffers left");
-			continue;
-		}
-		MutexGuard m(inputsMutex);
-		int16_t* buf=reinterpret_cast<int16_t*>(data);
-		int16_t input[960];
-		float out[960];
-		memset(out, 0, 960*4);
-		int usedInputs=0;
-		for(std::vector<MixerInput>::iterator in=inputs.begin();in!=inputs.end();++in){
-			size_t res=in->source->InvokeCallback(reinterpret_cast<unsigned char*>(input), 960*2);
-			if(!res || in->multiplier==0){
-				//LOGV("AudioMixer: skipping silent packet");
-				continue;
-			}
-			usedInputs++;
-			float k=in->multiplier;
-			if(k!=1){
-				for(size_t i=0; i<960; i++){
-					out[i]+=(float)input[i]*k;
-				}
-			}else{
-				for(size_t i=0;i<960;i++){
-					out[i]+=(float)input[i];
-				}
-			}
-		}
-		if(usedInputs>0){
-			for(size_t i=0; i<960; i++){
-				if(out[i]>32767.0f)
-					buf[i]=INT16_MAX;
-				else if(out[i]<-32768.0f)
-					buf[i]=INT16_MIN;
-				else
-					buf[i]=(int16_t)out[i];
-			}
-		}else{
-			memset(data, 0, 960*2);
-		}
-		if(echoCanceller)
-			echoCanceller->SpeakerOutCallback(data, 960*2);
-		processedQueue.Put(data);
-	}
-	LOGI("======== audio mixer thread exiting =========");
-}
-
-void AudioMixer::SetEchoCanceller(EchoCanceller *aec){
-	echoCanceller=aec;
-}
-
-AudioLevelMeter::AudioLevelMeter(){
-	absMax=0;
-	count=0;
-	currentLevel=0;
-	currentLevelFullRange=0;
-}
-
-float AudioLevelMeter::GetLevel(){
-	return currentLevel/9.0f;
-}
-
-void AudioLevelMeter::Update(int16_t *samples, size_t count){
-	// Number of bars on the indicator.
-	// Note that the number of elements is specified because we are indexing it
-	// in the range of 0-32
-	const int8_t permutation[33]={0,1,2,3,4,4,5,5,5,5,6,6,6,6,6,7,7,7,7,8,8,8,9,9,9,9,9,9,9,9,9,9,9};
-	int16_t absValue=0;
-	for(unsigned int k=0;k<count;k++){
-		int16_t absolute=(int16_t)abs(samples[k]);
-		if (absolute>absValue)
-			absValue=absolute;
-	}
-
-	if(absValue>absMax)
-		absMax = absValue;
-	// Update level approximately 10 times per second
-	if (this->count++==10){
-		currentLevelFullRange=absMax;
-		this->count=0;
-		// Highest value for a int16_t is 0x7fff = 32767
-		// Divide with 1000 to get in the range of 0-32 which is the range of
-		// the permutation vector
-		int32_t position=absMax/1000;
-		// Make it less likely that the bar stays at position 0. I.e. only if
-		// its in the range 0-250 (instead of 0-1000)
-		/*if ((position==0) && (absMax>250)){
-			position=1;
-		}*/
-		currentLevel=permutation[position];
-		// Decay the absolute maximum (divide by 4)
-		absMax >>= 2;
-	}
-}
diff --git a/submodules/libtgvoip/MediaStreamItf.h b/submodules/libtgvoip/MediaStreamItf.h
deleted file mode 100644
index c8b5acdcee..0000000000
--- a/submodules/libtgvoip/MediaStreamItf.h
+++ /dev/null
@@ -1,88 +0,0 @@
-//
-// libtgvoip is free and unencumbered public domain software.
-// For more information, see http://unlicense.org or the UNLICENSE file
-// you should have received with this source code distribution.
-//
-
-#ifndef LIBTGVOIP_MEDIASTREAMINPUT_H
-#define LIBTGVOIP_MEDIASTREAMINPUT_H
-
-#include <string.h>
-#include <vector>
-#include <memory>
-#include <stdint.h>
-#include "threading.h"
-#include "BlockingQueue.h"
-#include "Buffers.h"
-
-namespace tgvoip{
-
-	class EchoCanceller;
-
-class MediaStreamItf{
-public:
-	virtual void Start()=0;
-	virtual void Stop()=0;
-	void SetCallback(size_t (*f)(unsigned char*, size_t, void*), void* param);
-
-//protected:
-	size_t InvokeCallback(unsigned char* data, size_t length);
-
-private:
-	size_t (*callback)(unsigned char*, size_t, void*)=NULL;
-	void* callbackParam;
-};
-
-	class AudioMixer : public MediaStreamItf{
-	public:
-		AudioMixer();
-		virtual ~AudioMixer();
-		void SetOutput(MediaStreamItf* output);
-		virtual void Start();
-		virtual void Stop();
-		void AddInput(std::shared_ptr<MediaStreamItf> input);
-		void RemoveInput(std::shared_ptr<MediaStreamItf> input);
-		void SetInputVolume(std::shared_ptr<MediaStreamItf> input, float volumeDB);
-		void SetEchoCanceller(EchoCanceller* aec);
-	private:
-		void RunThread();
-		struct MixerInput{
-			std::shared_ptr<MediaStreamItf> source;
-			float multiplier;
-		};
-		Mutex inputsMutex;
-		void DoCallback(unsigned char* data, size_t length);
-		static size_t OutputCallback(unsigned char* data, size_t length, void* arg);
-		std::vector<MixerInput> inputs;
-		Thread* thread;
-		BufferPool bufferPool;
-		BlockingQueue<unsigned char*> processedQueue;
-		Semaphore semaphore;
-		EchoCanceller* echoCanceller;
-		bool running;
-	};
-
-	class CallbackWrapper : public MediaStreamItf{
-	public:
-		CallbackWrapper(){};
-		virtual ~CallbackWrapper(){};
-		virtual void Start(){};
-		virtual void Stop(){};
-
-	};
-
-	class AudioLevelMeter{
-	public:
-		AudioLevelMeter();
-		float GetLevel();
-		void Update(int16_t* samples, size_t count);
-	private:
-		int16_t absMax;
-		int16_t count;
-		int8_t currentLevel;
-		int16_t currentLevelFullRange;
-	};
-};
-
-
-#endif //LIBTGVOIP_MEDIASTREAMINPUT_H
diff --git a/submodules/libtgvoip/MessageThread.cpp b/submodules/libtgvoip/MessageThread.cpp
deleted file mode 100755
index 9af1441046..0000000000
--- a/submodules/libtgvoip/MessageThread.cpp
+++ /dev/null
@@ -1,183 +0,0 @@
-//
-// Created by Grishka on 17.06.2018.
-//
-
-#include <assert.h>
-#include <time.h>
-#include <math.h>
-#include <float.h>
-#include <stdint.h>
-
-#ifndef _WIN32
-#include <sys/time.h>
-#endif
-
-#include "MessageThread.h"
-#include "VoIPController.h"
-#include "logging.h"
-
-using namespace tgvoip;
-
-MessageThread::MessageThread() : Thread(std::bind(&MessageThread::Run, this)){
-
-	SetName("MessageThread");
-
-#ifdef _WIN32
-#if !defined(WINAPI_FAMILY) || WINAPI_FAMILY!=WINAPI_FAMILY_PHONE_APP
-	event=CreateEvent(NULL, false, false, NULL);
-#else
-	event=CreateEventEx(NULL, NULL, 0, EVENT_ALL_ACCESS);
-#endif
-#else
-	pthread_cond_init(&cond, NULL);
-#endif
-}
-
-MessageThread::~MessageThread(){
-	Stop();
-#ifdef _WIN32
-	CloseHandle(event);
-#else
-	pthread_cond_destroy(&cond);
-#endif
-}
-
-void MessageThread::Stop(){
-	if(running){
-		running=false;
-#ifdef _WIN32
-		SetEvent(event);
-#else
-		pthread_cond_signal(&cond);
-#endif
-		Join();
-	}
-}
-
-void MessageThread::Run(){
-	queueMutex.Lock();
-	while(running){
-		double currentTime=VoIPController::GetCurrentTime();
-		double waitTimeout=queue.empty() ? DBL_MAX : (queue[0].deliverAt-currentTime);
-		//LOGW("MessageThread wait timeout %f", waitTimeout);
-		if(waitTimeout>0.0){
-#ifdef _WIN32
-			queueMutex.Unlock();
-			DWORD actualWaitTimeout=waitTimeout==DBL_MAX ? INFINITE : ((DWORD)round(waitTimeout*1000.0));
-#if !defined(WINAPI_FAMILY) || WINAPI_FAMILY!=WINAPI_FAMILY_PHONE_APP
-			WaitForSingleObject(event, actualWaitTimeout);
-#else
-			WaitForSingleObjectEx(event, actualWaitTimeout, false);
-#endif
-			// we don't really care if a context switch happens here and anything gets added to the queue by another thread
-			// since any new no-delay messages will get delivered on this iteration anyway
-			queueMutex.Lock();
-#else
-			if(waitTimeout!=DBL_MAX){
-				struct timeval now;
-				struct timespec timeout;
-				gettimeofday(&now, NULL);
-				waitTimeout+=now.tv_sec;
-				waitTimeout+=(now.tv_usec/1000000.0);
-				timeout.tv_sec=(time_t)(floor(waitTimeout));
-				timeout.tv_nsec=(long)((waitTimeout-floor(waitTimeout))*1000000000.0);
-				pthread_cond_timedwait(&cond, queueMutex.NativeHandle(), &timeout);
-			}else{
-				pthread_cond_wait(&cond, queueMutex.NativeHandle());
-			}
-#endif
-		}
-		if(!running){
-			queueMutex.Unlock();
-			return;
-		}
-		currentTime=VoIPController::GetCurrentTime();
-		std::vector<Message> msgsToDeliverNow;
-		for(std::vector<Message>::iterator m=queue.begin();m!=queue.end();){
-			if(m->deliverAt==0.0 || currentTime>=m->deliverAt){
-				msgsToDeliverNow.push_back(*m);
-				m=queue.erase(m);
-				continue;
-			}
-			++m;
-		}
-
-		for(Message& m:msgsToDeliverNow){
-			//LOGI("MessageThread delivering %u", m.msg);
-			cancelCurrent=false;
-			if(m.deliverAt==0.0)
-				m.deliverAt=VoIPController::GetCurrentTime();
-			if(m.func!=nullptr){
-				m.func();
-			}
-			if(!cancelCurrent && m.interval>0.0){
-				m.deliverAt+=m.interval;
-				InsertMessageInternal(m);
-			}
-		}
-
-	}
-	queueMutex.Unlock();
-}
-
-uint32_t MessageThread::Post(std::function<void()> func, double delay, double interval){
-	assert(delay>=0);
-	//LOGI("MessageThread post [function] delay %f", delay);
-	if(!IsCurrent()){
-		queueMutex.Lock();
-	}
-	double currentTime=VoIPController::GetCurrentTime();
-	Message m{lastMessageID++, delay==0.0 ? 0.0 : (currentTime+delay), interval, func};
-	InsertMessageInternal(m);
-	if(!IsCurrent()){
-#ifdef _WIN32
-		SetEvent(event);
-#else
-		pthread_cond_signal(&cond);
-#endif
-		queueMutex.Unlock();
-	}
-	return m.id;
-}
-
-void MessageThread::InsertMessageInternal(MessageThread::Message &m){
-	if(queue.empty()){
-		queue.push_back(m);
-	}else{
-		if(queue[0].deliverAt>m.deliverAt){
-			queue.insert(queue.begin(), m);
-		}else{
-			std::vector<Message>::iterator insertAfter=queue.begin();
-			for(; insertAfter!=queue.end(); ++insertAfter){
-				std::vector<Message>::iterator next=std::next(insertAfter);
-				if(next==queue.end() || (next->deliverAt>m.deliverAt && insertAfter->deliverAt<=m.deliverAt)){
-					queue.insert(next, m);
-					break;
-				}
-			}
-		}
-	}
-}
-
-void MessageThread::Cancel(uint32_t id){
-	if(!IsCurrent()){
-		queueMutex.Lock();
-	}
-
-	for(std::vector<Message>::iterator m=queue.begin();m!=queue.end();){
-		if(m->id==id){
-			m=queue.erase(m);
-		}else{
-			++m;
-		}
-	}
-
-	if(!IsCurrent()){
-		queueMutex.Unlock();
-	}
-}
-
-void MessageThread::CancelSelf(){
-	assert(IsCurrent());
-	cancelCurrent=true;
-}
diff --git a/submodules/libtgvoip/MessageThread.h b/submodules/libtgvoip/MessageThread.h
deleted file mode 100755
index 8feb9166dc..0000000000
--- a/submodules/libtgvoip/MessageThread.h
+++ /dev/null
@@ -1,52 +0,0 @@
-//
-// Created by Grishka on 17.06.2018.
-//
-
-#ifndef LIBTGVOIP_MESSAGETHREAD_H
-#define LIBTGVOIP_MESSAGETHREAD_H
-
-#include "threading.h"
-#include "utils.h"
-#include <vector>
-#include <functional>
-
-namespace tgvoip{
-	class MessageThread : public Thread{
-	public:
-		TGVOIP_DISALLOW_COPY_AND_ASSIGN(MessageThread);
-		MessageThread();
-		virtual ~MessageThread();
-		uint32_t Post(std::function<void()> func, double delay=0, double interval=0);
-		void Cancel(uint32_t id);
-		void CancelSelf();
-		void Stop();
-
-		enum{
-			INVALID_ID=0
-		};
-	private:
-		struct Message{
-			uint32_t id;
-			double deliverAt;
-			double interval;
-			std::function<void()> func;
-		};
-
-		void Run();
-		void InsertMessageInternal(Message& m);
-
-		bool running=true;
-		std::vector<Message> queue;
-		Mutex queueMutex;
-		uint32_t lastMessageID=1;
-		bool cancelCurrent=false;
-
-#ifdef _WIN32
-		HANDLE event;
-#else
-		pthread_cond_t cond;
-#endif
-	};
-}
-
-#endif //LIBTGVOIP_MESSAGETHREAD_H
diff --git a/submodules/libtgvoip/NetworkSocket.cpp b/submodules/libtgvoip/NetworkSocket.cpp
deleted file mode 100644
index 4ee314e913..0000000000
--- a/submodules/libtgvoip/NetworkSocket.cpp
+++ /dev/null
@@ -1,682 +0,0 @@
-//
-// Created by Grishka on 29.03.17.
-//
-
-#include "NetworkSocket.h"
-#include <stdexcept>
-#include <algorithm>
-#include <stdlib.h>
-#include <string.h>
-#if defined(_WIN32)
-#include "os/windows/NetworkSocketWinsock.h"
-#include <winsock2.h>
-#else
-#include "os/posix/NetworkSocketPosix.h"
-#endif
-#include "logging.h"
-#include "VoIPServerConfig.h"
-#include "VoIPController.h"
-#include "Buffers.h"
-
-#define MIN_UDP_PORT 16384
-#define MAX_UDP_PORT 32768
-
-using namespace tgvoip;
-
-NetworkSocket::NetworkSocket(NetworkProtocol protocol) : protocol(protocol){
-	ipv6Timeout=ServerConfig::GetSharedInstance()->GetDouble("nat64_fallback_timeout", 3);
-	failed=false;
-}
-
-NetworkSocket::~NetworkSocket(){
-
-}
-
-std::string NetworkSocket::GetLocalInterfaceInfo(IPv4Address *inet4addr, IPv6Address *inet6addr){
-	std::string r="not implemented";
-	return r;
-}
-
-uint16_t NetworkSocket::GenerateLocalPort(){
-	uint16_t rnd;
-	VoIPController::crypto.rand_bytes(reinterpret_cast<uint8_t*>(&rnd), 2);
-	return (uint16_t) ((rnd%(MAX_UDP_PORT-MIN_UDP_PORT))+MIN_UDP_PORT);
-}
-
-void NetworkSocket::SetMaxPriority(){
-}
-
-bool NetworkSocket::IsFailed(){
-	return failed;
-}
-
-NetworkSocket *NetworkSocket::Create(NetworkProtocol protocol){
-#ifndef _WIN32
-	return new NetworkSocketPosix(protocol);
-#else
-	return new NetworkSocketWinsock(protocol);
-#endif
-}
-
-IPv4Address *NetworkSocket::ResolveDomainName(std::string name){
-#ifndef _WIN32
-	return NetworkSocketPosix::ResolveDomainName(name);
-#else
-	return NetworkSocketWinsock::ResolveDomainName(name);
-#endif
-}
-
-void NetworkSocket::GenerateTCPO2States(unsigned char* buffer, TCPO2State* recvState, TCPO2State* sendState){
-	memset(recvState, 0, sizeof(TCPO2State));
-	memset(sendState, 0, sizeof(TCPO2State));
-	unsigned char nonce[64];
-	uint32_t *first = reinterpret_cast<uint32_t*>(nonce), *second = first + 1;
-	uint32_t first1 = 0x44414548U, first2 = 0x54534f50U, first3 = 0x20544547U, first4 = 0x20544547U, first5 = 0xeeeeeeeeU;
-	uint32_t second1 = 0;
-	do {
-		VoIPController::crypto.rand_bytes(nonce, sizeof(nonce));
-	} while (*first == first1 || *first == first2 || *first == first3 || *first == first4 || *first == first5 || *second == second1 || *reinterpret_cast<unsigned char*>(nonce) == 0xef);
-
-	// prepare encryption key/iv
-	memcpy(sendState->key, nonce + 8, 32);
-	memcpy(sendState->iv, nonce + 8 + 32, 16);
-
-	// prepare decryption key/iv
-	char reversed[48];
-	memcpy(reversed, nonce + 8, sizeof(reversed));
-	std::reverse(reversed, reversed + sizeof(reversed));
-	memcpy(recvState->key, reversed, 32);
-	memcpy(recvState->iv, reversed + 32, 16);
-
-	// write protocol identifier
-	*reinterpret_cast<uint32_t*>(nonce + 56) = 0xefefefefU;
-	memcpy(buffer, nonce, 56);
-	EncryptForTCPO2(nonce, sizeof(nonce), sendState);
-	memcpy(buffer+56, nonce+56, 8);
-}
-
-void NetworkSocket::EncryptForTCPO2(unsigned char *buffer, size_t len, TCPO2State *state){
-	VoIPController::crypto.aes_ctr_encrypt(buffer, len, state->key, state->iv, state->ecount, &state->num);
-}
-
-size_t NetworkSocket::Receive(unsigned char *buffer, size_t len){
-	NetworkPacket pkt={0};
-	pkt.data=buffer;
-	pkt.length=len;
-	Receive(&pkt);
-	return pkt.length;
-}
-
-size_t NetworkSocket::Send(unsigned char *buffer, size_t len){
-	NetworkPacket pkt={0};
-	pkt.data=buffer;
-	pkt.length=len;
-	Send(&pkt);
-	return pkt.length;
-}
-
-bool NetworkAddress::operator==(const NetworkAddress &other) const{
-	const IPv4Address* self4=dynamic_cast<const IPv4Address*>(this);
-	const IPv4Address* other4=dynamic_cast<const IPv4Address*>((NetworkAddress*)&other);
-	if(self4 && other4){
-		return self4->GetAddress()==other4->GetAddress();
-	}
-	const IPv6Address* self6=dynamic_cast<const IPv6Address*>(this);
-	const IPv6Address* other6=dynamic_cast<const IPv6Address*>((NetworkAddress*)&other);
-	if(self6 && other6){
-		return memcmp(self6->GetAddress(), other6->GetAddress(), 16)==0;
-	}
-	return false;
-}
-
-bool NetworkAddress::operator!=(const NetworkAddress &other) const{
-	return !(*this == other);
-}
-
-IPv4Address::IPv4Address(std::string addr){
-#ifndef _WIN32
-	this->address=NetworkSocketPosix::StringToV4Address(addr);
-#else
-	this->address=NetworkSocketWinsock::StringToV4Address(addr);
-#endif
-}
-
-IPv4Address::IPv4Address(uint32_t addr){
-	this->address=addr;
-}
-
-IPv4Address::IPv4Address(){
-	this->address=0;
-}
-
-
-std::string IPv4Address::ToString() const{
-#ifndef _WIN32
-	return NetworkSocketPosix::V4AddressToString(address);
-#else
-	return NetworkSocketWinsock::V4AddressToString(address);
-#endif
-}
-
-bool IPv4Address::PrefixMatches(const unsigned int prefix, const NetworkAddress &other) const{
-	const IPv4Address* v4=dynamic_cast<const IPv4Address*>(&other);
-	if(v4){
-		uint32_t mask=0xFFFFFFFF << (32-prefix);
-		return (address & mask) == (v4->address & mask);
-	}
-	return false;
-}
-
-/*sockaddr &IPv4Address::ToSockAddr(uint16_t port){
-	sockaddr_in sa;
-	sa.sin_family=AF_INET;
-	sa.sin_addr=addr;
-	sa.sin_port=port;
-	return *((sockaddr *) &sa);
-}*/
-
-uint32_t IPv4Address::GetAddress() const{
-	return address;
-}
-
-bool IPv4Address::IsEmpty() const{
-	return address==0;
-}
-
-IPv6Address::IPv6Address(std::string addr){
-#ifndef _WIN32
-	NetworkSocketPosix::StringToV6Address(addr, this->address);
-#else
-	NetworkSocketWinsock::StringToV6Address(addr, this->address);
-#endif
-}
-
-IPv6Address::IPv6Address(const uint8_t* addr){
-	memcpy(address, addr, 16);
-}
-
-IPv6Address::IPv6Address(){
-	memset(address, 0, 16);
-}
-
-std::string IPv6Address::ToString() const{
-#ifndef _WIN32
-	return NetworkSocketPosix::V6AddressToString(address);
-#else
-	return NetworkSocketWinsock::V6AddressToString(address);
-#endif
-}
-
-bool IPv6Address::PrefixMatches(const unsigned int prefix, const NetworkAddress &other) const{
-	return false;
-}
-
-bool IPv6Address::IsEmpty() const{
-	const uint64_t* a=reinterpret_cast<const uint64_t*>(address);
-	return a[0]==0LL && a[1]==0LL;
-}
-
-/*sockaddr &IPv6Address::ToSockAddr(uint16_t port){
-	sockaddr_in6 sa;
-	sa.sin6_family=AF_INET6;
-	sa.sin6_addr=addr;
-	sa.sin6_port=port;
-	return *((sockaddr *) &sa);
-}*/
-
-const uint8_t *IPv6Address::GetAddress() const{
-	return address;
-}
-
-bool NetworkSocket::Select(std::vector<NetworkSocket *> &readFds, std::vector<NetworkSocket*> &writeFds, std::vector<NetworkSocket *> &errorFds, SocketSelectCanceller *canceller){
-#ifndef _WIN32
-	return NetworkSocketPosix::Select(readFds, writeFds, errorFds, canceller);
-#else
-	return NetworkSocketWinsock::Select(readFds, writeFds, errorFds, canceller);
-#endif
-}
-
-SocketSelectCanceller::~SocketSelectCanceller(){
-
-}
-
-SocketSelectCanceller *SocketSelectCanceller::Create(){
-#ifndef _WIN32
-	return new SocketSelectCancellerPosix();
-#else
-	return new SocketSelectCancellerWin32();
-#endif
-}
-
-
-
-NetworkSocketTCPObfuscated::NetworkSocketTCPObfuscated(NetworkSocket *wrapped) : NetworkSocketWrapper(PROTO_TCP){
-	this->wrapped=wrapped;
-}
-
-NetworkSocketTCPObfuscated::~NetworkSocketTCPObfuscated(){
-	if(wrapped)
-		delete wrapped;
-}
-
-NetworkSocket *NetworkSocketTCPObfuscated::GetWrapped(){
-	return wrapped;
-}
-
-void NetworkSocketTCPObfuscated::InitConnection(){
-	unsigned char buf[64];
-	GenerateTCPO2States(buf, &recvState, &sendState);
-	wrapped->Send(buf, 64);
-}
-
-void NetworkSocketTCPObfuscated::Send(NetworkPacket *packet){
-	BufferOutputStream os(packet->length+4);
-	size_t len=packet->length/4;
-	if(len<0x7F){
-		os.WriteByte((unsigned char)len);
-	}else{
-		os.WriteByte(0x7F);
-		os.WriteByte((unsigned char)(len & 0xFF));
-		os.WriteByte((unsigned char)((len >> 8) & 0xFF));
-		os.WriteByte((unsigned char)((len >> 16) & 0xFF));
-	}
-	os.WriteBytes(packet->data, packet->length);
-	EncryptForTCPO2(os.GetBuffer(), os.GetLength(), &sendState);
-	wrapped->Send(os.GetBuffer(), os.GetLength());
-	//LOGD("Sent %u bytes", os.GetLength());
-}
-
-bool NetworkSocketTCPObfuscated::OnReadyToSend(){
-	if(!initialized){
-		//LOGV("Initializing TCPO2 connection");
-		initialized=true;
-		InitConnection();
-		readyToSend=true;
-		return false;
-	}
-	return wrapped->OnReadyToSend();
-}
-
-void NetworkSocketTCPObfuscated::Receive(NetworkPacket *packet){
-	unsigned char len1;
-	size_t packetLen=0;
-	size_t offset=0;
-	size_t len;
-	len=wrapped->Receive(&len1, 1);
-	if(len<=0){
-		packet->length=0;
-		return;
-	}
-	EncryptForTCPO2(&len1, 1, &recvState);
-
-	if(len1<0x7F){
-		packetLen=(size_t)len1*4;
-	}else{
-		unsigned char len2[3];
-		len=wrapped->Receive(len2, 3);
-		if(len<=0){
-			packet->length=0;
-			return;
-		}
-		EncryptForTCPO2(len2, 3, &recvState);
-		packetLen=((size_t)len2[0] | ((size_t)len2[1] << 8) | ((size_t)len2[2] << 16))*4;
-	}
-
-	if(packetLen>packet->length){
-		LOGW("packet too big to fit into buffer (%u vs %u)", (unsigned int)packetLen, (unsigned int)packet->length);
-		packet->length=0;
-		return;
-	}
-
-	while(offset<packetLen){
-		len=wrapped->Receive(packet->data+offset, packetLen-offset);
-		if(len<=0){
-			packet->length=0;
-			return;
-		}
-		offset+=len;
-	}
-	EncryptForTCPO2(packet->data, packetLen, &recvState);
-	//packet->address=&itr->address;
-	packet->length=packetLen;
-	//packet->port=itr->port;
-	packet->protocol=PROTO_TCP;
-	packet->address=wrapped->GetConnectedAddress();
-	packet->port=wrapped->GetConnectedPort();
-}
-
-void NetworkSocketTCPObfuscated::Open(){
-
-}
-
-void NetworkSocketTCPObfuscated::Close(){
-	wrapped->Close();
-}
-
-void NetworkSocketTCPObfuscated::Connect(const NetworkAddress *address, uint16_t port){
-	wrapped->Connect(address, port);
-}
-
-bool NetworkSocketTCPObfuscated::IsFailed(){
-	return wrapped->IsFailed();
-}
-
-NetworkSocketSOCKS5Proxy::NetworkSocketSOCKS5Proxy(NetworkSocket *tcp, NetworkSocket *udp, std::string username, std::string password) : NetworkSocketWrapper(udp ? PROTO_UDP : PROTO_TCP){
-	this->tcp=tcp;
-	this->udp=udp;
-	this->username=username;
-	this->password=password;
-	connectedAddress=NULL;
-}
-
-NetworkSocketSOCKS5Proxy::~NetworkSocketSOCKS5Proxy(){
-	delete tcp;
-	if(connectedAddress)
-		delete connectedAddress;
-}
-
-void NetworkSocketSOCKS5Proxy::Send(NetworkPacket *packet){
-	if(protocol==PROTO_TCP){
-		tcp->Send(packet);
-	}else if(protocol==PROTO_UDP){
-		unsigned char buf[1500];
-		BufferOutputStream out(buf, sizeof(buf));
-		out.WriteInt16(0); // RSV
-		out.WriteByte(0); // FRAG
-		const IPv4Address* v4=dynamic_cast<IPv4Address*>(packet->address);
-		const IPv6Address* v6=dynamic_cast<IPv6Address*>(packet->address);
-		if(v4){
-			out.WriteByte(1); // ATYP (IPv4)
-			out.WriteInt32(v4->GetAddress());
-		}else{
-			out.WriteByte(4); // ATYP (IPv6)
-			out.WriteBytes((unsigned char *) v6->GetAddress(), 16);
-		}
-		out.WriteInt16(htons(packet->port));
-		out.WriteBytes(packet->data, packet->length);
-		NetworkPacket p={0};
-		p.data=buf;
-		p.length=out.GetLength();
-		p.address=connectedAddress;
-		p.port=connectedPort;
-		p.protocol=PROTO_UDP;
-		udp->Send(&p);
-	}
-}
-
-void NetworkSocketSOCKS5Proxy::Receive(NetworkPacket *packet){
-	if(protocol==PROTO_TCP){
-		tcp->Receive(packet);
-		packet->address=connectedAddress;
-		packet->port=connectedPort;
-	}else if(protocol==PROTO_UDP){
-		unsigned char buf[1500];
-		NetworkPacket p={0};
-		p.data=buf;
-		p.length=sizeof(buf);
-		udp->Receive(&p);
-		if(p.length && p.address && *p.address==*connectedAddress && p.port==connectedPort){
-			BufferInputStream in(buf, p.length);
-			in.ReadInt16(); // RSV
-			in.ReadByte(); // FRAG
-			unsigned char atyp=in.ReadByte();
-			if(atyp==1){ // IPv4
-				lastRecvdV4=IPv4Address((uint32_t) in.ReadInt32());
-				packet->address=&lastRecvdV4;
-			}else if(atyp==4){ // IPv6
-				unsigned char addr[16];
-				in.ReadBytes(addr, 16);
-				lastRecvdV6=IPv6Address(addr);
-				packet->address=&lastRecvdV6;
-			}
-			packet->port=ntohs(in.ReadInt16());
-			if(packet->length>=in.Remaining()){
-				packet->length=in.Remaining();
-				in.ReadBytes(packet->data, in.Remaining());
-			}else{
-				packet->length=0;
-				LOGW("socks5: received packet too big");
-			}
-		}
-	}
-}
-
-void NetworkSocketSOCKS5Proxy::Open(){
-
-}
-
-void NetworkSocketSOCKS5Proxy::Close(){
-	tcp->Close();
-}
-
-void NetworkSocketSOCKS5Proxy::Connect(const NetworkAddress *address, uint16_t port){
-	const IPv4Address* v4=dynamic_cast<const IPv4Address*>(address);
-	const IPv6Address* v6=dynamic_cast<const IPv6Address*>(address);
-	connectedAddress=v4 ? (NetworkAddress*)new IPv4Address(*v4) : (NetworkAddress*)new IPv6Address(*v6);
-	connectedPort=port;
-}
-
-NetworkSocket *NetworkSocketSOCKS5Proxy::GetWrapped(){
-	return protocol==PROTO_TCP ? tcp : udp;
-}
-
-void NetworkSocketSOCKS5Proxy::InitConnection(){
-}
-
-bool NetworkSocketSOCKS5Proxy::IsFailed(){
-	return NetworkSocket::IsFailed() || tcp->IsFailed();
-}
-
-NetworkAddress *NetworkSocketSOCKS5Proxy::GetConnectedAddress(){
-	return connectedAddress;
-}
-
-uint16_t NetworkSocketSOCKS5Proxy::GetConnectedPort(){
-	return connectedPort;
-}
-
-bool NetworkSocketSOCKS5Proxy::OnReadyToSend(){
-	//LOGV("on ready to send, state=%d", state);
-	unsigned char buf[1024];
-	if(state==ConnectionState::Initial){
-		BufferOutputStream p(buf, sizeof(buf));
-		p.WriteByte(5); // VER
-		if(!username.empty()){
-			p.WriteByte(2); // NMETHODS
-			p.WriteByte(0); // no auth
-			p.WriteByte(2); // user/pass
-		}else{
-			p.WriteByte(1); // NMETHODS
-			p.WriteByte(0); // no auth
-		}
-		tcp->Send(buf, p.GetLength());
-		state=ConnectionState::WaitingForAuthMethod;
-		return false;
-	}
-	return udp ? udp->OnReadyToSend() : tcp->OnReadyToSend();
-}
-
-bool NetworkSocketSOCKS5Proxy::OnReadyToReceive(){
-	//LOGV("on ready to receive state=%d", state);
-	unsigned char buf[1024];
-	if(state==ConnectionState::WaitingForAuthMethod){
-		size_t l=tcp->Receive(buf, sizeof(buf));
-		if(l<2 || tcp->IsFailed()){
-			failed=true;
-			return false;
-		}
-		BufferInputStream in(buf, l);
-		unsigned char ver=in.ReadByte();
-		unsigned char chosenMethod=in.ReadByte();
-		LOGV("socks5: VER=%02X, METHOD=%02X", ver, chosenMethod);
-		if(ver!=5){
-			LOGW("socks5: incorrect VER in response");
-			failed=true;
-			return false;
-		}
-		if(chosenMethod==0){
-			// connected, no further auth needed
-			SendConnectionCommand();
-		}else if(chosenMethod==2 && !username.empty()){
-        	BufferOutputStream p(buf, sizeof(buf));
-			p.WriteByte(1); // VER
-			p.WriteByte((unsigned char)(username.length()>255 ? 255 : username.length())); // ULEN
-			p.WriteBytes((unsigned char*)username.c_str(), username.length()>255 ? 255 : username.length()); // UNAME
-			p.WriteByte((unsigned char)(password.length()>255 ? 255 : password.length())); // PLEN
-			p.WriteBytes((unsigned char*)password.c_str(), password.length()>255 ? 255 : password.length()); // PASSWD
-			tcp->Send(buf, p.GetLength());
-			state=ConnectionState::WaitingForAuthResult;
-		}else{
-			LOGW("socks5: unsupported auth method");
-			failed=true;
-			return false;
-		}
-		return false;
-	}else if(state==ConnectionState::WaitingForAuthResult){
-		size_t l=tcp->Receive(buf, sizeof(buf));
-		if(l<2 || tcp->IsFailed()){
-			failed=true;
-			return false;
-		}
-		BufferInputStream in(buf, l);
-		uint8_t ver=in.ReadByte();
-		unsigned char status=in.ReadByte();
-		LOGV("socks5: auth response VER=%02X, STATUS=%02X", ver, status);
-		if(ver!=1){
-			LOGW("socks5: auth response VER is incorrect");
-			failed=true;
-			return false;
-		}
-		if(status!=0){
-			LOGW("socks5: username/password auth failed");
-			failed=true;
-			return false;
-		}
-		LOGV("socks5: authentication succeeded");
-		SendConnectionCommand();
-		return false;
-	}else if(state==ConnectionState::WaitingForCommandResult){
-		size_t l=tcp->Receive(buf, sizeof(buf));
-		if(protocol==PROTO_TCP){
-    		if(l<2 || tcp->IsFailed()){
-    			LOGW("socks5: connect failed")
-    			failed=true;
-    			return false;
-    		}
-    		BufferInputStream in(buf, l);
-    		unsigned char ver=in.ReadByte();
-    		if(ver!=5){
-    			LOGW("socks5: connect: wrong ver in response");
-    			failed=true;
-    			return false;
-    		}
-    		unsigned char rep=in.ReadByte();
-    		if(rep!=0){
-    			LOGW("socks5: connect: failed with error %02X", rep);
-    			failed=true;
-    			return false;
-    		}
-    		LOGV("socks5: connect succeeded");
-    		state=ConnectionState::Connected;
-    		tcp=new NetworkSocketTCPObfuscated(tcp);
-    		readyToSend=true;
-    		return tcp->OnReadyToSend();
-		}else if(protocol==PROTO_UDP){
-			if(l<2 || tcp->IsFailed()){
-				LOGW("socks5: udp associate failed");
-				failed=true;
-				return false;
-			}
-			try{
-				BufferInputStream in(buf, l);
-				unsigned char ver=in.ReadByte();
-				unsigned char rep=in.ReadByte();
-				if(ver!=5){
-					LOGW("socks5: udp associate: wrong ver in response");
-					failed=true;
-					return false;
-				}
-				if(rep!=0){
-					LOGW("socks5: udp associate failed with error %02X", rep);
-					failed=true;
-					return false;
-				}
-				in.ReadByte(); // RSV
-				unsigned char atyp=in.ReadByte();
-				if(atyp==1){
-					uint32_t addr=(uint32_t) in.ReadInt32();
-					connectedAddress=new IPv4Address(addr);
-				}else if(atyp==3){
-					unsigned char len=in.ReadByte();
-					char domain[256];
-					memset(domain, 0, sizeof(domain));
-					in.ReadBytes((unsigned char*)domain, len);
-					LOGD("address type is domain, address=%s", domain);
-					connectedAddress=ResolveDomainName(std::string(domain));
-					if(!connectedAddress){
-						LOGW("socks5: failed to resolve domain name '%s'", domain);
-						failed=true;
-						return false;
-					}
-				}else if(atyp==4){
-					unsigned char addr[16];
-					in.ReadBytes(addr, 16);
-					connectedAddress=new IPv6Address(addr);
-				}else{
-					LOGW("socks5: unknown address type %d", atyp);
-					failed=true;
-					return false;
-				}
-				connectedPort=(uint16_t)ntohs(in.ReadInt16());
-        		state=ConnectionState::Connected;
-				readyToSend=true;
-				LOGV("socks5: udp associate successful, given endpoint %s:%d", connectedAddress->ToString().c_str(), connectedPort);
-			}catch(std::out_of_range& x){
-				LOGW("socks5: udp associate response parse failed");
-				failed=true;
-			}
-		}
-	}
-	return udp ? udp->OnReadyToReceive() : tcp->OnReadyToReceive();
-}
-
-void NetworkSocketSOCKS5Proxy::SendConnectionCommand(){
-	unsigned char buf[1024];
-	if(protocol==PROTO_TCP){
-		BufferOutputStream out(buf, sizeof(buf));
-		out.WriteByte(5); // VER
-		out.WriteByte(1); // CMD (CONNECT)
-		out.WriteByte(0); // RSV
-		const IPv4Address* v4=dynamic_cast<const IPv4Address*>(connectedAddress);
-		const IPv6Address* v6=dynamic_cast<const IPv6Address*>(connectedAddress);
-		if(v4){
-			out.WriteByte(1); // ATYP (IPv4)
-			out.WriteInt32(v4->GetAddress());
-		}else if(v6){
-			out.WriteByte(4); // ATYP (IPv6)
-			out.WriteBytes((unsigned char*)v6->GetAddress(), 16);
-		}else{
-			LOGW("socks5: unknown address type");
-			failed=true;
-			return;
-		}
-		out.WriteInt16(htons(connectedPort)); // DST.PORT
-		tcp->Send(buf, out.GetLength());
-		state=ConnectionState::WaitingForCommandResult;
-	}else if(protocol==PROTO_UDP){
-		LOGV("Sending udp associate");
-		BufferOutputStream out(buf, sizeof(buf));
-		out.WriteByte(5); // VER
-		out.WriteByte(3); // CMD (UDP ASSOCIATE)
-		out.WriteByte(0); // RSV
-		out.WriteByte(1); // ATYP (IPv4)
-		out.WriteInt32(0); // DST.ADDR
-		out.WriteInt16(0); // DST.PORT
-		tcp->Send(buf, out.GetLength());
-		state=ConnectionState::WaitingForCommandResult;
-	}
-}
-
-bool NetworkSocketSOCKS5Proxy::NeedSelectForSending(){
-	return state==ConnectionState::Initial || state==ConnectionState::Connected;
-}
diff --git a/submodules/libtgvoip/NetworkSocket.h b/submodules/libtgvoip/NetworkSocket.h
deleted file mode 100644
index 67b134247f..0000000000
--- a/submodules/libtgvoip/NetworkSocket.h
+++ /dev/null
@@ -1,210 +0,0 @@
-//
-// Created by Grishka on 29.03.17.
-//
-
-#ifndef LIBTGVOIP_NETWORKSOCKET_H
-#define LIBTGVOIP_NETWORKSOCKET_H
-
-#include <stdint.h>
-#include <string>
-#include <vector>
-#include "utils.h"
-
-namespace tgvoip {
-
-	enum NetworkProtocol{
-		PROTO_UDP=0,
-		PROTO_TCP
-	};
-
-	struct TCPO2State{
-		unsigned char key[32];
-		unsigned char iv[16];
-		unsigned char ecount[16];
-		uint32_t num;
-	};
-
-	class NetworkAddress{
-	public:
-		virtual std::string ToString() const =0;
-		bool operator==(const NetworkAddress& other) const;
-		bool operator!=(const NetworkAddress& other) const;
-		virtual ~NetworkAddress()=default;
-		virtual bool IsEmpty() const =0;
-		virtual bool PrefixMatches(const unsigned int prefix, const NetworkAddress& other) const =0;
-	};
-
-	class IPv4Address : public NetworkAddress{
-	public:
-		IPv4Address(std::string addr);
-		IPv4Address(uint32_t addr);
-		IPv4Address();
-		virtual std::string ToString() const override;
-		uint32_t GetAddress() const;
-		virtual bool IsEmpty() const override;
-		virtual bool PrefixMatches(const unsigned int prefix, const NetworkAddress& other) const override;
-
-		static const IPv4Address Broadcast(){
-			return IPv4Address(0xFFFFFFFF);
-		}
-	private:
-		uint32_t address;
-	};
-
-	class IPv6Address : public NetworkAddress{
-	public:
-		IPv6Address(std::string addr);
-		IPv6Address(const uint8_t* addr);
-		IPv6Address();
-		virtual std::string ToString() const override;
-		const uint8_t* GetAddress() const;
-		virtual bool IsEmpty() const override;
-		virtual bool PrefixMatches(const unsigned int prefix, const NetworkAddress& other) const override;
-	private:
-		uint8_t address[16];
-	};
-
-	struct NetworkPacket{
-		unsigned char* data;
-		size_t length;
-		NetworkAddress* address;
-		uint16_t port;
-		NetworkProtocol protocol;
-	};
-	typedef struct NetworkPacket NetworkPacket;
-
-	class SocketSelectCanceller{
-	public:
-		virtual ~SocketSelectCanceller();
-		virtual void CancelSelect()=0;
-		static SocketSelectCanceller* Create();
-	};
-
-	class NetworkSocket{
-	public:
-		friend class NetworkSocketPosix;
-		friend class NetworkSocketWinsock;
-
-		TGVOIP_DISALLOW_COPY_AND_ASSIGN(NetworkSocket);
-		NetworkSocket(NetworkProtocol protocol);
-		virtual ~NetworkSocket();
-		virtual void Send(NetworkPacket* packet)=0;
-		virtual void Receive(NetworkPacket* packet)=0;
-		size_t Receive(unsigned char* buffer, size_t len);
-		size_t Send(unsigned char* buffer, size_t len);
-		virtual void Open()=0;
-		virtual void Close()=0;
-		virtual uint16_t GetLocalPort(){ return 0; };
-		virtual void Connect(const NetworkAddress* address, uint16_t port)=0;
-		virtual std::string GetLocalInterfaceInfo(IPv4Address* inet4addr, IPv6Address* inet6addr);
-		virtual void OnActiveInterfaceChanged(){};
-		virtual NetworkAddress* GetConnectedAddress(){ return NULL; };
-		virtual uint16_t GetConnectedPort(){ return 0; };
-		virtual void SetTimeouts(int sendTimeout, int recvTimeout){};
-
-		virtual bool IsFailed();
-		virtual bool IsReadyToSend(){
-			return readyToSend;
-		}
-		virtual bool OnReadyToSend(){ readyToSend=true; return true; };
-		virtual bool OnReadyToReceive(){ return true; };
-		void SetTimeout(double timeout){
-			this->timeout=timeout;
-		};
-
-		static NetworkSocket* Create(NetworkProtocol protocol);
-		static IPv4Address* ResolveDomainName(std::string name);
-		static bool Select(std::vector<NetworkSocket*>& readFds, std::vector<NetworkSocket*>& writeFds, std::vector<NetworkSocket*>& errorFds, SocketSelectCanceller* canceller);
-
-	protected:
-		virtual uint16_t GenerateLocalPort();
-		virtual void SetMaxPriority();
-
-		static void GenerateTCPO2States(unsigned char* buffer, TCPO2State* recvState, TCPO2State* sendState);
-		static void EncryptForTCPO2(unsigned char* buffer, size_t len, TCPO2State* state);
-		double ipv6Timeout;
-		unsigned char nat64Prefix[12];
-		bool failed;
-		bool readyToSend=false;
-		double lastSuccessfulOperationTime=0.0;
-		double timeout=0.0;
-		NetworkProtocol protocol;
-	};
-
-	class NetworkSocketWrapper : public NetworkSocket{
-	public:
-		NetworkSocketWrapper(NetworkProtocol protocol) : NetworkSocket(protocol){};
-		virtual ~NetworkSocketWrapper(){};
-		virtual NetworkSocket* GetWrapped()=0;
-		virtual void InitConnection()=0;
-		virtual void SetNonBlocking(bool){};
-	};
-
-	class NetworkSocketTCPObfuscated : public NetworkSocketWrapper{
-	public:
-		NetworkSocketTCPObfuscated(NetworkSocket* wrapped);
-		virtual ~NetworkSocketTCPObfuscated();
-		virtual NetworkSocket* GetWrapped();
-		virtual void InitConnection();
-		virtual void Send(NetworkPacket *packet);
-		virtual void Receive(NetworkPacket *packet);
-		virtual void Open();
-		virtual void Close();
-		virtual void Connect(const NetworkAddress *address, uint16_t port);
-		virtual bool OnReadyToSend();
-
-		virtual bool IsFailed();
-		virtual bool IsReadyToSend(){
-			return readyToSend && wrapped->IsReadyToSend();
-		};
-
-	private:
-		NetworkSocket* wrapped;
-		TCPO2State recvState;
-		TCPO2State sendState;
-		bool initialized=false;
-	};
-
-	class NetworkSocketSOCKS5Proxy : public NetworkSocketWrapper{
-	public:
-		NetworkSocketSOCKS5Proxy(NetworkSocket* tcp, NetworkSocket* udp, std::string username, std::string password);
-		virtual ~NetworkSocketSOCKS5Proxy();
-		virtual void Send(NetworkPacket *packet);
-		virtual void Receive(NetworkPacket *packet);
-		virtual void Open();
-		virtual void Close();
-		virtual void Connect(const NetworkAddress *address, uint16_t port);
-		virtual NetworkSocket *GetWrapped();
-		virtual void InitConnection();
-		virtual bool IsFailed();
-		virtual NetworkAddress *GetConnectedAddress();
-		virtual uint16_t GetConnectedPort();
-		virtual bool OnReadyToSend();
-		virtual bool OnReadyToReceive();
-		
-		bool NeedSelectForSending();
-
-	private:
-		void SendConnectionCommand();
-		enum ConnectionState{
-			Initial,
-			WaitingForAuthMethod,
-			WaitingForAuthResult,
-			WaitingForCommandResult,
-			Connected
-		};
-		NetworkSocket* tcp;
-		NetworkSocket* udp;
-		std::string username;
-		std::string password;
-		NetworkAddress* connectedAddress;
-		uint16_t connectedPort;
-		ConnectionState state=ConnectionState::Initial;
-
-		IPv4Address lastRecvdV4;
-		IPv6Address lastRecvdV6;
-	};
-
-}
-
-#endif //LIBTGVOIP_NETWORKSOCKET_H
diff --git a/submodules/libtgvoip/OpusDecoder.cpp b/submodules/libtgvoip/OpusDecoder.cpp
deleted file mode 100755
index 7b2d7c8bfd..0000000000
--- a/submodules/libtgvoip/OpusDecoder.cpp
+++ /dev/null
@@ -1,286 +0,0 @@
-//
-// libtgvoip is free and unencumbered public domain software.
-// For more information, see http://unlicense.org or the UNLICENSE file
-// you should have received with this source code distribution.
-//
-
-#include "OpusDecoder.h"
-#include "audio/Resampler.h"
-#include "logging.h"
-#include <assert.h>
-#include <math.h>
-#include <algorithm>
-#include <opus/opus.h>
-
-#include "VoIPController.h"
-
-#define PACKET_SIZE (960*2)
-
-using namespace tgvoip;
-
-tgvoip::OpusDecoder::OpusDecoder(const std::shared_ptr<MediaStreamItf>& dst, bool isAsync, bool needEC){
-	dst->SetCallback(OpusDecoder::Callback, this);
-	Initialize(isAsync, needEC);
-}
-
-tgvoip::OpusDecoder::OpusDecoder(const std::unique_ptr<MediaStreamItf>& dst, bool isAsync, bool needEC){
-	dst->SetCallback(OpusDecoder::Callback, this);
-	Initialize(isAsync, needEC);
-}
-
-tgvoip::OpusDecoder::OpusDecoder(MediaStreamItf* dst, bool isAsync, bool needEC){
-	dst->SetCallback(OpusDecoder::Callback, this);
-	Initialize(isAsync, needEC);
-}
-
-void tgvoip::OpusDecoder::Initialize(bool isAsync, bool needEC){
-	async=isAsync;
-	if(async){
-		decodedQueue=new BlockingQueue<unsigned char*>(33);
-		bufferPool=new BufferPool(PACKET_SIZE, 32);
-		semaphore=new Semaphore(32, 0);
-	}else{
-		decodedQueue=NULL;
-		bufferPool=NULL;
-		semaphore=NULL;
-	}
-	dec=opus_decoder_create(48000, 1, NULL);
-	if(needEC)
-		ecDec=opus_decoder_create(48000, 1, NULL);
-	else
-		ecDec=NULL;
-	buffer=(unsigned char *) malloc(8192);
-	lastDecoded=NULL;
-	outputBufferSize=0;
-	echoCanceller=NULL;
-	frameDuration=20;
-	consecutiveLostPackets=0;
-	enableDTX=false;
-	silentPacketCount=0;
-	levelMeter=NULL;
-	nextLen=0;
-	running=false;
-	remainingDataLen=0;
-	processedBuffer=NULL;
-	prevWasEC=false;
-	prevLastSample=0;
-}
-
-tgvoip::OpusDecoder::~OpusDecoder(){
-	opus_decoder_destroy(dec);
-	if(ecDec)
-		opus_decoder_destroy(ecDec);
-	free(buffer);
-	if(bufferPool)
-		delete bufferPool;
-	if(decodedQueue)
-		delete decodedQueue;
-	if(semaphore)
-		delete semaphore;
-}
-
-
-void tgvoip::OpusDecoder::SetEchoCanceller(EchoCanceller* canceller){
-	echoCanceller=canceller;
-}
-
-size_t tgvoip::OpusDecoder::Callback(unsigned char *data, size_t len, void *param){
-	return ((OpusDecoder*)param)->HandleCallback(data, len);
-}
-
-size_t tgvoip::OpusDecoder::HandleCallback(unsigned char *data, size_t len){
-	if(async){
-		if(!running){
-			memset(data, 0, len);
-			return 0;
-		}
-		if(outputBufferSize==0){
-			outputBufferSize=len;
-			int packetsNeeded;
-			if(len>PACKET_SIZE)
-				packetsNeeded=len/PACKET_SIZE;
-			else
-				packetsNeeded=1;
-			packetsNeeded*=2;
-			semaphore->Release(packetsNeeded);
-		}
-		assert(outputBufferSize==len && "output buffer size is supposed to be the same throughout callbacks");
-		if(len==PACKET_SIZE){
-			lastDecoded=(unsigned char *) decodedQueue->GetBlocking();
-			if(!lastDecoded)
-				return 0;
-			memcpy(data, lastDecoded, PACKET_SIZE);
-			bufferPool->Reuse(lastDecoded);
-			semaphore->Release();
-			if(silentPacketCount>0){
-				silentPacketCount--;
-				if(levelMeter)
-					levelMeter->Update(reinterpret_cast<int16_t *>(data), 0);
-				return 0;
-			}
-			if(echoCanceller){
-				echoCanceller->SpeakerOutCallback(data, PACKET_SIZE);
-			}
-		}else{
-			LOGE("Opus decoder buffer length != 960 samples");
-			abort();
-		}
-	}else{
-		if(remainingDataLen==0 && silentPacketCount==0){
-			int duration=DecodeNextFrame();
-			remainingDataLen=(size_t) (duration/20*960*2);
-		}
-		if(silentPacketCount>0 || remainingDataLen==0 || !processedBuffer){
-			if(silentPacketCount>0)
-				silentPacketCount--;
-			memset(data, 0, 960*2);
-			if(levelMeter)
-				levelMeter->Update(reinterpret_cast<int16_t *>(data), 0);
-			return 0;
-		}
-		memcpy(data, processedBuffer, 960*2);
-		remainingDataLen-=960*2;
-		if(remainingDataLen>0){
-			memmove(processedBuffer, processedBuffer+960*2, remainingDataLen);
-		}
-	}
-	if(levelMeter)
-		levelMeter->Update(reinterpret_cast<int16_t *>(data), len/2);
-	return len;
-}
-
-
-void tgvoip::OpusDecoder::Start(){
-	if(!async)
-		return;
-	running=true;
-	thread=new Thread(std::bind(&tgvoip::OpusDecoder::RunThread, this));
-	thread->SetName("opus_decoder");
-	thread->SetMaxPriority();
-	thread->Start();
-}
-
-void tgvoip::OpusDecoder::Stop(){
-	if(!running || !async)
-		return;
-	running=false;
-	semaphore->Release();
-	thread->Join();
-	delete thread;
-}
-
-void tgvoip::OpusDecoder::RunThread(){
-	int i;
-	LOGI("decoder: packets per frame %d", packetsPerFrame);
-	while(running){
-		int playbackDuration=DecodeNextFrame();
-		for(i=0;i<playbackDuration/20;i++){
-			semaphore->Acquire();
-			if(!running){
-				LOGI("==== decoder exiting ====");
-				return;
-			}
-			unsigned char *buf=bufferPool->Get();
-			if(buf){
-				if(remainingDataLen>0){
-					for(effects::AudioEffect*& effect:postProcEffects){
-						effect->Process(reinterpret_cast<int16_t*>(processedBuffer+(PACKET_SIZE*i)), 960);
-					}
-					memcpy(buf, processedBuffer+(PACKET_SIZE*i), PACKET_SIZE);
-				}else{
-					//LOGE("Error decoding, result=%d", size);
-					memset(buf, 0, PACKET_SIZE);
-				}
-				decodedQueue->Put(buf);
-			}else{
-				LOGW("decoder: no buffers left!");
-			}
-		}
-	}
-}
-
-int tgvoip::OpusDecoder::DecodeNextFrame(){
-	int playbackDuration=0;
-	bool isEC=false;
-	size_t len=jitterBuffer->HandleOutput(buffer, 8192, 0, true, playbackDuration, isEC);
-	bool fec=false;
-	if(!len){
-		fec=true;
-		len=jitterBuffer->HandleOutput(buffer, 8192, 0, false, playbackDuration, isEC);
-		//if(len)
-		//	LOGV("Trying FEC...");
-	}
-	int size;
-	if(len){
-		size=opus_decode(isEC ? ecDec : dec, buffer, len, (opus_int16 *) decodeBuffer, packetsPerFrame*960, fec ? 1 : 0);
-		consecutiveLostPackets=0;
-		if(prevWasEC!=isEC && size){
-			// It turns out the waveforms generated by the PLC feature are also great to help smooth out the
-			// otherwise audible transition between the frames from different decoders. Those are basically an extrapolation
-			// of the previous successfully decoded data -- which is exactly what we need here.
-			size=opus_decode(prevWasEC ? ecDec : dec, NULL, 0, (opus_int16*)nextBuffer, packetsPerFrame*960, 0);
-			if(size){
-				int16_t* plcSamples=reinterpret_cast<int16_t*>(nextBuffer);
-				int16_t* samples=reinterpret_cast<int16_t*>(decodeBuffer);
-				constexpr float coeffs[]={0.999802, 0.995062, 0.984031, 0.966778, 0.943413, 0.914084, 0.878975, 0.838309, 0.792344,
-										  0.741368, 0.685706, 0.625708, 0.561754, 0.494249, 0.423619, 0.350311, 0.274788, 0.197527, 0.119018, 0.039757};
-				for(int i=0;i<20;i++){
-					samples[i]=(int16_t)round((plcSamples[i]*coeffs[i]+(float)samples[i]*(1.0-coeffs[i])));
-				}
-			}
-		}
-		prevWasEC=isEC;
-		prevLastSample=decodeBuffer[size-1];
-	}else{ // do packet loss concealment
-		consecutiveLostPackets++;
-		if(consecutiveLostPackets>2 && enableDTX){
-			silentPacketCount+=packetsPerFrame;
-			size=packetsPerFrame*960;
-		}else{
-			size=opus_decode(prevWasEC ? ecDec : dec, NULL, 0, (opus_int16 *) decodeBuffer, packetsPerFrame*960, 0);
-			//LOGV("PLC");
-		}
-	}
-	if(size<0)
-		LOGW("decoder: opus_decode error %d", size);
-	remainingDataLen=size;
-	if(playbackDuration==80){
-		processedBuffer=buffer;
-		audio::Resampler::Rescale60To80((int16_t*) decodeBuffer, (int16_t*) processedBuffer);
-	}else if(playbackDuration==40){
-		processedBuffer=buffer;
-		audio::Resampler::Rescale60To40((int16_t*) decodeBuffer, (int16_t*) processedBuffer);
-	}else{
-		processedBuffer=decodeBuffer;
-	}
-	return playbackDuration;
-}
-
-
-void tgvoip::OpusDecoder::SetFrameDuration(uint32_t duration){
-	frameDuration=duration;
-	packetsPerFrame=frameDuration/20;
-}
-
-
-void tgvoip::OpusDecoder::SetJitterBuffer(std::shared_ptr<JitterBuffer> jitterBuffer){
-	this->jitterBuffer=jitterBuffer;
-}
-
-void tgvoip::OpusDecoder::SetDTX(bool enable){
-	enableDTX=enable;
-}
-
-void tgvoip::OpusDecoder::SetLevelMeter(AudioLevelMeter *levelMeter){
-	this->levelMeter=levelMeter;
-}
-
-void tgvoip::OpusDecoder::AddAudioEffect(effects::AudioEffect *effect){
-	postProcEffects.push_back(effect);
-}
-
-void tgvoip::OpusDecoder::RemoveAudioEffect(effects::AudioEffect *effect){
-	std::vector<effects::AudioEffect*>::iterator i=std::find(postProcEffects.begin(), postProcEffects.end(), effect);
-	if(i!=postProcEffects.end())
-		postProcEffects.erase(i);
-}
diff --git a/submodules/libtgvoip/OpusDecoder.h b/submodules/libtgvoip/OpusDecoder.h
deleted file mode 100755
index 572649185a..0000000000
--- a/submodules/libtgvoip/OpusDecoder.h
+++ /dev/null
@@ -1,80 +0,0 @@
-//
-// libtgvoip is free and unencumbered public domain software.
-// For more information, see http://unlicense.org or the UNLICENSE file
-// you should have received with this source code distribution.
-//
-
-#ifndef LIBTGVOIP_OPUSDECODER_H
-#define LIBTGVOIP_OPUSDECODER_H
-
-
-#include "MediaStreamItf.h"
-#include "threading.h"
-#include "BlockingQueue.h"
-#include "Buffers.h"
-#include "EchoCanceller.h"
-#include "JitterBuffer.h"
-#include "utils.h"
-#include <stdio.h>
-#include <vector>
-#include <memory>
-
-struct OpusDecoder;
-
-namespace tgvoip{
-class OpusDecoder {
-public:
-	TGVOIP_DISALLOW_COPY_AND_ASSIGN(OpusDecoder);
-	virtual void Start();
-
-	virtual void Stop();
-
-	OpusDecoder(const std::shared_ptr<MediaStreamItf>& dst, bool isAsync, bool needEC);
-	OpusDecoder(const std::unique_ptr<MediaStreamItf>& dst, bool isAsync, bool needEC);
-	OpusDecoder(MediaStreamItf* dst, bool isAsync, bool needEC);
-	virtual ~OpusDecoder();
-	size_t HandleCallback(unsigned char* data, size_t len);
-	void SetEchoCanceller(EchoCanceller* canceller);
-	void SetFrameDuration(uint32_t duration);
-	void SetJitterBuffer(std::shared_ptr<JitterBuffer> jitterBuffer);
-	void SetDTX(bool enable);
-	void SetLevelMeter(AudioLevelMeter* levelMeter);
-	void AddAudioEffect(effects::AudioEffect* effect);
-	void RemoveAudioEffect(effects::AudioEffect* effect);
-
-private:
-	void Initialize(bool isAsync, bool needEC);
-	static size_t Callback(unsigned char* data, size_t len, void* param);
-	void RunThread();
-	int DecodeNextFrame();
-	::OpusDecoder* dec;
-	::OpusDecoder* ecDec;
-	BlockingQueue<unsigned char*>* decodedQueue;
-	BufferPool* bufferPool;
-	unsigned char* buffer;
-	unsigned char* lastDecoded;
-	unsigned char* processedBuffer;
-	size_t outputBufferSize;
-	bool running;
-    Thread* thread;
-	Semaphore* semaphore;
-	uint32_t frameDuration;
-	EchoCanceller* echoCanceller;
-	std::shared_ptr<JitterBuffer> jitterBuffer;
-	AudioLevelMeter* levelMeter;
-	int consecutiveLostPackets;
-	bool enableDTX;
-	size_t silentPacketCount;
-	std::vector<effects::AudioEffect*> postProcEffects;
-	bool async;
-	unsigned char nextBuffer[8192];
-	unsigned char decodeBuffer[8192];
-	size_t nextLen;
-	unsigned int packetsPerFrame;
-	ptrdiff_t remainingDataLen;
-	bool prevWasEC;
-	int16_t prevLastSample;
-};
-}
-
-#endif //LIBTGVOIP_OPUSDECODER_H
diff --git a/submodules/libtgvoip/OpusEncoder.cpp b/submodules/libtgvoip/OpusEncoder.cpp
deleted file mode 100755
index b50c16efcf..0000000000
--- a/submodules/libtgvoip/OpusEncoder.cpp
+++ /dev/null
@@ -1,266 +0,0 @@
-//
-// libtgvoip is free and unencumbered public domain software.
-// For more information, see http://unlicense.org or the UNLICENSE file
-// you should have received with this source code distribution.
-//
-
-#include "OpusEncoder.h"
-#include <assert.h>
-#include <algorithm>
-#include "logging.h"
-#include "VoIPServerConfig.h"
-#include <opus/opus.h>
-
-namespace{
-	int serverConfigValueToBandwidth(int config){
-		switch(config){
-			case 0:
-				return OPUS_BANDWIDTH_NARROWBAND;
-			case 1:
-				return OPUS_BANDWIDTH_MEDIUMBAND;
-			case 2:
-				return OPUS_BANDWIDTH_WIDEBAND;
-			case 3:
-				return OPUS_BANDWIDTH_SUPERWIDEBAND;
-			case 4:
-			default:
-				return OPUS_BANDWIDTH_FULLBAND;
-		}
-	}
-}
-
-tgvoip::OpusEncoder::OpusEncoder(MediaStreamItf *source, bool needSecondary):queue(11), bufferPool(960*2, 10){
-	this->source=source;
-	source->SetCallback(tgvoip::OpusEncoder::Callback, this);
-	enc=opus_encoder_create(48000, 1, OPUS_APPLICATION_VOIP, NULL);
-	opus_encoder_ctl(enc, OPUS_SET_COMPLEXITY(10));
-	opus_encoder_ctl(enc, OPUS_SET_PACKET_LOSS_PERC(1));
-	opus_encoder_ctl(enc, OPUS_SET_INBAND_FEC(1));
-	opus_encoder_ctl(enc, OPUS_SET_SIGNAL(OPUS_SIGNAL_VOICE));
-	opus_encoder_ctl(enc, OPUS_SET_BANDWIDTH(OPUS_BANDWIDTH_FULLBAND));
-	requestedBitrate=20000;
-	currentBitrate=0;
-	running=false;
-	echoCanceller=NULL;
-	complexity=10;
-	frameDuration=20;
-	levelMeter=NULL;
-	vadNoVoiceBitrate=static_cast<uint32_t>(ServerConfig::GetSharedInstance()->GetInt("audio_vad_no_voice_bitrate", 6000));
-	vadModeVoiceBandwidth=serverConfigValueToBandwidth(ServerConfig::GetSharedInstance()->GetInt("audio_vad_bandwidth", 3));
-	vadModeNoVoiceBandwidth=serverConfigValueToBandwidth(ServerConfig::GetSharedInstance()->GetInt("audio_vad_no_voice_bandwidth", 0));
-	secondaryEnabledBandwidth=serverConfigValueToBandwidth(ServerConfig::GetSharedInstance()->GetInt("audio_extra_ec_bandwidth", 2));
-	secondaryEncoderEnabled=false;
-
-	if(needSecondary){
-		secondaryEncoder=opus_encoder_create(48000, 1, OPUS_APPLICATION_VOIP, NULL);
-		opus_encoder_ctl(secondaryEncoder, OPUS_SET_COMPLEXITY(10));
-		opus_encoder_ctl(secondaryEncoder, OPUS_SET_SIGNAL(OPUS_SIGNAL_VOICE));
-		//opus_encoder_ctl(secondaryEncoder, OPUS_SET_VBR(0));
-		opus_encoder_ctl(secondaryEncoder, OPUS_SET_BITRATE(8000));
-		opus_encoder_ctl(secondaryEncoder, OPUS_SET_BANDWIDTH(secondaryEnabledBandwidth));
-	}else{
-		secondaryEncoder=NULL;
-	}
-}
-
-tgvoip::OpusEncoder::~OpusEncoder(){
-	opus_encoder_destroy(enc);
-	if(secondaryEncoder)
-		opus_encoder_destroy(secondaryEncoder);
-}
-
-void tgvoip::OpusEncoder::Start(){
-	if(running)
-		return;
-	running=true;
-	thread=new Thread(std::bind(&tgvoip::OpusEncoder::RunThread, this));
-	thread->SetName("OpusEncoder");
-	thread->Start();
-	thread->SetMaxPriority();
-}
-
-void tgvoip::OpusEncoder::Stop(){
-	if(!running)
-		return;
-	running=false;
-	queue.Put(NULL);
-	thread->Join();
-	delete thread;
-}
-
-
-void tgvoip::OpusEncoder::SetBitrate(uint32_t bitrate){
-	requestedBitrate=bitrate;
-}
-
-void tgvoip::OpusEncoder::Encode(int16_t* data, size_t len){
-	if(requestedBitrate!=currentBitrate){
-		opus_encoder_ctl(enc, OPUS_SET_BITRATE(requestedBitrate));
-		currentBitrate=requestedBitrate;
-		LOGV("opus_encoder: setting bitrate to %u", currentBitrate);
-	}
-	if(levelMeter)
-		levelMeter->Update(data, len);
-	if(secondaryEncoderEnabled!=wasSecondaryEncoderEnabled){
-		wasSecondaryEncoderEnabled=secondaryEncoderEnabled;
-		opus_encoder_ctl(enc, OPUS_SET_BANDWIDTH(secondaryEncoderEnabled ? secondaryEnabledBandwidth : OPUS_BANDWIDTH_FULLBAND));
-	}
-	int32_t r=opus_encode(enc, data, static_cast<int>(len), buffer, 4096);
-	if(r<=0){
-		LOGE("Error encoding: %d", r);
-	}else if(r==1){
-		LOGW("DTX");
-	}else if(running){
-		//LOGV("Packet size = %d", r);
-		int32_t secondaryLen=0;
-		unsigned char secondaryBuffer[128];
-		if(secondaryEncoderEnabled && secondaryEncoder){
-			secondaryLen=opus_encode(secondaryEncoder, data, static_cast<int>(len), secondaryBuffer, sizeof(secondaryBuffer));
-			//LOGV("secondaryLen %d", secondaryLen);
-		}
-		InvokeCallback(buffer, (size_t)r, secondaryBuffer, (size_t)secondaryLen);
-	}
-}
-
-size_t tgvoip::OpusEncoder::Callback(unsigned char *data, size_t len, void* param){
-	OpusEncoder* e=(OpusEncoder*)param;
-	unsigned char* buf=e->bufferPool.Get();
-	if(buf){
-		assert(len==960*2);
-		memcpy(buf, data, 960*2);
-		e->queue.Put(buf);
-	}else{
-		LOGW("opus_encoder: no buffer slots left");
-		if(e->complexity>1){
-			e->complexity--;
-			opus_encoder_ctl(e->enc, OPUS_SET_COMPLEXITY(e->complexity));
-		}
-	}
-	return 0;
-}
-
-
-uint32_t tgvoip::OpusEncoder::GetBitrate(){
-	return requestedBitrate;
-}
-
-void tgvoip::OpusEncoder::SetEchoCanceller(EchoCanceller* aec){
-	echoCanceller=aec;
-}
-
-void tgvoip::OpusEncoder::RunThread(){
-	uint32_t bufferedCount=0;
-	uint32_t packetsPerFrame=frameDuration/20;
-	LOGV("starting encoder, packets per frame=%d", packetsPerFrame);
-	int16_t* frame;
-	if(packetsPerFrame>1)
-		frame=(int16_t*) malloc(960*2*packetsPerFrame);
-	else
-		frame=NULL;
-	bool frameHasVoice=false;
-	bool wasVadMode=false;
-	while(running){
-		int16_t* packet=(int16_t*)queue.GetBlocking();
-		if(packet){
-			bool hasVoice=true;
-			if(echoCanceller)
-				echoCanceller->ProcessInput(packet, 960, hasVoice);
-			if(!postProcEffects.empty()){
-				for(effects::AudioEffect* effect:postProcEffects){
-					effect->Process(packet, 960);
-				}
-			}
-			if(packetsPerFrame==1){
-				Encode(packet, 960);
-			}else{
-				memcpy(frame+(960*bufferedCount), packet, 960*2);
-    			frameHasVoice=frameHasVoice || hasVoice;
-				bufferedCount++;
-				if(bufferedCount==packetsPerFrame){
-					if(vadMode){
-						if(frameHasVoice){
-							opus_encoder_ctl(enc, OPUS_SET_BITRATE(currentBitrate));
-							opus_encoder_ctl(enc, OPUS_SET_BANDWIDTH(vadModeVoiceBandwidth));
-							if(secondaryEncoder){
-								opus_encoder_ctl(secondaryEncoder, OPUS_SET_BITRATE(currentBitrate));
-								opus_encoder_ctl(secondaryEncoder, OPUS_SET_BANDWIDTH(vadModeVoiceBandwidth));
-							}
-						}else{
-							opus_encoder_ctl(enc, OPUS_SET_BITRATE(vadNoVoiceBitrate));
-							opus_encoder_ctl(enc, OPUS_SET_BANDWIDTH(vadModeNoVoiceBandwidth));
-							if(secondaryEncoder){
-								opus_encoder_ctl(secondaryEncoder, OPUS_SET_BITRATE(vadNoVoiceBitrate));
-								opus_encoder_ctl(secondaryEncoder, OPUS_SET_BANDWIDTH(vadModeNoVoiceBandwidth));
-							}
-						}
-						wasVadMode=true;
-					}else if(wasVadMode){
-						wasVadMode=false;
-						opus_encoder_ctl(enc, OPUS_SET_BITRATE(currentBitrate));
-						opus_encoder_ctl(enc, OPUS_SET_BANDWIDTH(secondaryEncoderEnabled ? secondaryEnabledBandwidth : OPUS_AUTO));
-						if(secondaryEncoder){
-							opus_encoder_ctl(secondaryEncoder, OPUS_SET_BITRATE(currentBitrate));
-							opus_encoder_ctl(secondaryEncoder, OPUS_SET_BANDWIDTH(secondaryEnabledBandwidth));
-						}
-					}
-					Encode(frame, 960*packetsPerFrame);
-					bufferedCount=0;
-					frameHasVoice=false;
-				}
-			}
-			bufferPool.Reuse(reinterpret_cast<unsigned char *>(packet));
-		}
-	}
-	if(frame)
-		free(frame);
-}
-
-
-void tgvoip::OpusEncoder::SetOutputFrameDuration(uint32_t duration){
-	frameDuration=duration;
-}
-
-
-void tgvoip::OpusEncoder::SetPacketLoss(int percent){
-	packetLossPercent=std::min(20, percent);
-	opus_encoder_ctl(enc, OPUS_SET_PACKET_LOSS_PERC(packetLossPercent));
-	opus_encoder_ctl(enc, OPUS_SET_INBAND_FEC(percent>0 && !secondaryEncoderEnabled ? 1 : 0));
-}
-
-int tgvoip::OpusEncoder::GetPacketLoss(){
-	return packetLossPercent;
-}
-
-void tgvoip::OpusEncoder::SetDTX(bool enable){
-	opus_encoder_ctl(enc, OPUS_SET_DTX(enable ? 1 : 0));
-}
-
-void tgvoip::OpusEncoder::SetLevelMeter(tgvoip::AudioLevelMeter *levelMeter){
-	this->levelMeter=levelMeter;
-}
-
-void tgvoip::OpusEncoder::SetCallback(void (*f)(unsigned char *, size_t, unsigned char *, size_t, void *), void *param){
-	callback=f;
-	callbackParam=param;
-}
-
-void tgvoip::OpusEncoder::InvokeCallback(unsigned char *data, size_t length, unsigned char *secondaryData, size_t secondaryLength){
-	callback(data, length, secondaryData, secondaryLength, callbackParam);
-}
-
-void tgvoip::OpusEncoder::SetSecondaryEncoderEnabled(bool enabled){
-	secondaryEncoderEnabled=enabled;
-}
-
-void tgvoip::OpusEncoder::SetVadMode(bool vad){
-	vadMode=vad;
-}
-void tgvoip::OpusEncoder::AddAudioEffect(effects::AudioEffect *effect){
-	postProcEffects.push_back(effect);
-}
-
-void tgvoip::OpusEncoder::RemoveAudioEffect(effects::AudioEffect *effect){
-	std::vector<effects::AudioEffect*>::iterator i=std::find(postProcEffects.begin(), postProcEffects.end(), effect);
-	if(i!=postProcEffects.end())
-		postProcEffects.erase(i);
-}
diff --git a/submodules/libtgvoip/OpusEncoder.h b/submodules/libtgvoip/OpusEncoder.h
deleted file mode 100755
index efb65cbcc2..0000000000
--- a/submodules/libtgvoip/OpusEncoder.h
+++ /dev/null
@@ -1,82 +0,0 @@
-//
-// libtgvoip is free and unencumbered public domain software.
-// For more information, see http://unlicense.org or the UNLICENSE file
-// you should have received with this source code distribution.
-//
-
-#ifndef LIBTGVOIP_OPUSENCODER_H
-#define LIBTGVOIP_OPUSENCODER_H
-
-
-#include "MediaStreamItf.h"
-#include "threading.h"
-#include "BlockingQueue.h"
-#include "Buffers.h"
-#include "EchoCanceller.h"
-#include "utils.h"
-
-#include <stdint.h>
-
-struct OpusEncoder;
-
-namespace tgvoip{
-class OpusEncoder{
-public:
-	TGVOIP_DISALLOW_COPY_AND_ASSIGN(OpusEncoder);
-	OpusEncoder(MediaStreamItf* source, bool needSecondary);
-	virtual ~OpusEncoder();
-	virtual void Start();
-	virtual void Stop();
-	void SetBitrate(uint32_t bitrate);
-	void SetEchoCanceller(EchoCanceller* aec);
-	void SetOutputFrameDuration(uint32_t duration);
-	void SetPacketLoss(int percent);
-	int GetPacketLoss();
-	uint32_t GetBitrate();
-	void SetDTX(bool enable);
-	void SetLevelMeter(AudioLevelMeter* levelMeter);
-	void SetCallback(void (*f)(unsigned char*, size_t, unsigned char*, size_t, void*), void* param);
-	void SetSecondaryEncoderEnabled(bool enabled);
-	void SetVadMode(bool vad);
-	void AddAudioEffect(effects::AudioEffect* effect);
-	void RemoveAudioEffect(effects::AudioEffect* effect);
-	int GetComplexity(){
-		return complexity;
-	}
-
-private:
-	static size_t Callback(unsigned char* data, size_t len, void* param);
-	void RunThread();
-	void Encode(int16_t* data, size_t len);
-	void InvokeCallback(unsigned char* data, size_t length, unsigned char* secondaryData, size_t secondaryLength);
-	MediaStreamItf* source;
-	::OpusEncoder* enc;
-	::OpusEncoder* secondaryEncoder;
-	unsigned char buffer[4096];
-	uint32_t requestedBitrate;
-	uint32_t currentBitrate;
-	Thread* thread;
-	BlockingQueue<unsigned char*> queue;
-	BufferPool bufferPool;
-	EchoCanceller* echoCanceller;
-	int complexity;
-	bool running;
-	uint32_t frameDuration;
-	int packetLossPercent;
-	AudioLevelMeter* levelMeter;
-	bool secondaryEncoderEnabled;
-	bool vadMode=false;
-	uint32_t vadNoVoiceBitrate;
-	std::vector<effects::AudioEffect*> postProcEffects;
-	int secondaryEnabledBandwidth;
-	int vadModeVoiceBandwidth;
-	int vadModeNoVoiceBandwidth;
-
-	bool wasSecondaryEncoderEnabled=false;
-
-	void (*callback)(unsigned char*, size_t, unsigned char*, size_t, void*);
-	void* callbackParam;
-};
-}
-
-#endif //LIBTGVOIP_OPUSENCODER_H
diff --git a/submodules/libtgvoip/PacketReassembler.cpp b/submodules/libtgvoip/PacketReassembler.cpp
deleted file mode 100644
index 9d2bdfeb05..0000000000
--- a/submodules/libtgvoip/PacketReassembler.cpp
+++ /dev/null
@@ -1,91 +0,0 @@
-//
-// Created by Grishka on 19.03.2018.
-//
-
-#include "PacketReassembler.h"
-#include "logging.h"
-
-#include <assert.h>
-
-using namespace tgvoip;
-
-PacketReassembler::PacketReassembler(){
-
-}
-
-PacketReassembler::~PacketReassembler(){
-
-}
-
-void PacketReassembler::Reset(){
-
-}
-
-void PacketReassembler::AddFragment(Buffer pkt, unsigned int fragmentIndex, unsigned int fragmentCount, uint32_t pts, bool keyframe){
-	for(Packet& packet:packets){
-		if(packet.timestamp==pts){
-			if(fragmentCount!=packet.partCount){
-				LOGE("Received fragment total count %u inconsistent with previous %u", fragmentCount, packet.partCount);
-				return;
-			}
-			packet.AddFragment(std::move(pkt), fragmentIndex);
-			return;
-		}
-	}
-
-	if(pts<maxTimestamp){
-		LOGW("Received fragment doesn't belong here (ts=%u < maxTs=%u)", pts, maxTimestamp);
-		return;
-	}
-	if(fragmentIndex>=fragmentCount){
-		LOGE("Received fragment index %u is out of bounds %u", fragmentIndex, fragmentCount);
-		return;
-	}
-	if(fragmentCount>255){
-		LOGE("Received fragment total count too big %u", fragmentCount);
-		return;
-	}
-
-	maxTimestamp=std::max(maxTimestamp, pts);
-
-	Packet packet(fragmentCount);
-	packet.timestamp=pts;
-	packet.isKeyframe=keyframe;
-	packet.receivedPartCount=0;
-	packet.AddFragment(std::move(pkt), fragmentIndex);
-
-	packets.push_back(std::move(packet));
-	while(packets.size()>3){
-		Packet&& old=std::move(packets[0]);
-		packets.erase(packets.begin());
-		if(old.receivedPartCount==old.partCount){
-			Buffer buffer=old.Reassemble();
-			callback(std::move(buffer), old.timestamp, old.isKeyframe);
-			//LOGV("Packet %u reassembled", old.timestamp);
-		}else{
-			LOGW("Packet %u not reassembled (%u of %u)", old.timestamp, old.receivedPartCount, old.partCount);
-		}
-	}
-}
-
-void PacketReassembler::SetCallback(std::function<void(Buffer packet, uint32_t pts, bool keyframe)> callback){
-	this->callback=callback;
-}
-
-void PacketReassembler::Packet::AddFragment(Buffer pkt, uint32_t fragmentIndex){
-	//LOGV("Add fragment %u/%u to packet %u", fragmentIndex, partCount, timestamp);
-	parts[fragmentIndex]=std::move(pkt);
-	receivedPartCount++;
-}
-
-Buffer PacketReassembler::Packet::Reassemble(){
-	if(partCount==1){
-		return std::move(parts[0]);
-	}
-	BufferOutputStream out(10240);
-	for(unsigned int i=0;i<partCount;i++){
-		out.WriteBytes(parts[i]);
-		parts[i]=Buffer();
-	}
-	return Buffer(std::move(out));
-}
diff --git a/submodules/libtgvoip/PacketReassembler.h b/submodules/libtgvoip/PacketReassembler.h
deleted file mode 100644
index c0b45e5773..0000000000
--- a/submodules/libtgvoip/PacketReassembler.h
+++ /dev/null
@@ -1,70 +0,0 @@
-//
-// Created by Grishka on 19.03.2018.
-//
-
-#ifndef TGVOIP_PACKETREASSEMBLER_H
-#define TGVOIP_PACKETREASSEMBLER_H
-
-#include <vector>
-#include <functional>
-#include <unordered_map>
-
-#include "Buffers.h"
-
-namespace tgvoip {
-	class PacketReassembler{
-	public:
-		PacketReassembler();
-		virtual ~PacketReassembler();
-
-		void Reset();
-		void AddFragment(Buffer pkt, unsigned int fragmentIndex, unsigned int fragmentCount, uint32_t pts, bool keyframe);
-		void SetCallback(std::function<void(Buffer packet, uint32_t pts, bool keyframe)> callback);
-
-	private:
-		struct Packet{
-			uint32_t timestamp;
-			uint32_t partCount;
-			uint32_t receivedPartCount;
-			bool isKeyframe;
-			Buffer* parts;
-
-			TGVOIP_DISALLOW_COPY_AND_ASSIGN(Packet);
-
-			Packet(Packet&& other) : timestamp(other.timestamp), partCount(other.partCount), receivedPartCount(other.receivedPartCount), isKeyframe(other.isKeyframe){
-				parts=other.parts;
-				other.parts=NULL;
-			}
-			Packet& operator=(Packet&& other){
-				if(&other!=this){
-					if(parts)
-						delete[] parts;
-					parts=other.parts;
-					other.parts=NULL;
-					timestamp=other.timestamp;
-					partCount=other.partCount;
-					receivedPartCount=other.receivedPartCount;
-					isKeyframe=other.isKeyframe;
-				}
-				return *this;
-			}
-
-			Packet(uint32_t partCount) : partCount(partCount){
-				parts=new Buffer[partCount];
-			}
-			~Packet(){
-				if(parts)
-					delete[] parts;
-			}
-
-
-			void AddFragment(Buffer pkt, uint32_t fragmentIndex);
-			Buffer Reassemble();
-		};
-		std::function<void(Buffer, uint32_t, bool)> callback;
-		std::vector<Packet> packets;
-		uint32_t maxTimestamp=0;
-	};
-}
-
-#endif //TGVOIP_PACKETREASSEMBLER_H
diff --git a/submodules/libtgvoip/PrivateDefines.h b/submodules/libtgvoip/PrivateDefines.h
deleted file mode 100644
index 10a1108011..0000000000
--- a/submodules/libtgvoip/PrivateDefines.h
+++ /dev/null
@@ -1,137 +0,0 @@
-//
-// Created by Grishka on 20.04.2018.
-//
-
-#ifndef TGVOIP_PRIVATEDEFINES_H
-#define TGVOIP_PRIVATEDEFINES_H
-
-#define PKT_INIT 1
-#define PKT_INIT_ACK 2
-#define PKT_STREAM_STATE 3
-#define PKT_STREAM_DATA 4
-#define PKT_UPDATE_STREAMS 5
-#define PKT_PING 6
-#define PKT_PONG 7
-#define PKT_STREAM_DATA_X2 8
-#define PKT_STREAM_DATA_X3 9
-#define PKT_LAN_ENDPOINT 10
-#define PKT_NETWORK_CHANGED 11
-#define PKT_SWITCH_PREF_RELAY 12
-#define PKT_SWITCH_TO_P2P 13
-#define PKT_NOP 14
-//#define PKT_GROUP_CALL_KEY 15		// replaced with 'extra' in 2.1 (protocol v6)
-//#define PKT_REQUEST_GROUP 16
-#define PKT_STREAM_EC 17
-
-#define IS_MOBILE_NETWORK(x) (x==NET_TYPE_GPRS || x==NET_TYPE_EDGE || x==NET_TYPE_3G || x==NET_TYPE_HSPA || x==NET_TYPE_LTE || x==NET_TYPE_OTHER_MOBILE)
-
-#define PROTOCOL_NAME 0x50567247 // "GrVP" in little endian (reversed here)
-#define PROTOCOL_VERSION 9
-#define MIN_PROTOCOL_VERSION 3
-
-#define STREAM_DATA_FLAG_LEN16 0x40
-#define STREAM_DATA_FLAG_HAS_MORE_FLAGS 0x80
-// Since the data can't be larger than the MTU anyway,
-// 5 top bits of data length are allocated for these flags
-#define STREAM_DATA_XFLAG_KEYFRAME (1 << 15)
-#define STREAM_DATA_XFLAG_FRAGMENTED (1 << 14)
-#define STREAM_DATA_XFLAG_EXTRA_FEC (1 << 13)
-
-#define STREAM_TYPE_AUDIO 1
-#define STREAM_TYPE_VIDEO 2
-
-#define FOURCC(a,b,c,d) ((uint32_t)d | ((uint32_t)c << 8) | ((uint32_t)b << 16) | ((uint32_t)a << 24))
-#define PRINT_FOURCC(x) (char)(x >> 24), (char)(x >> 16), (char)(x >> 8), (char)x
-
-#define CODEC_OPUS_OLD 1
-#define CODEC_OPUS FOURCC('O','P','U','S')
-
-#define CODEC_AVC FOURCC('A','V','C',' ')
-#define CODEC_HEVC FOURCC('H','E','V','C')
-#define CODEC_VP8 FOURCC('V','P','8','0')
-#define CODEC_VP9 FOURCC('V','P','9','0')
-#define CODEC_AV1 FOURCC('A','V','0','1')
-
-#define DEFAULT_MTU 1100
-
-/*flags:# voice_call_id:flags.2?int128 in_seq_no:flags.4?int out_seq_no:flags.4?int
-	 * recent_received_mask:flags.5?int proto:flags.3?int extra:flags.1?string raw_data:flags.0?string*/
-#define PFLAG_HAS_DATA 1
-#define PFLAG_HAS_EXTRA 2
-#define PFLAG_HAS_CALL_ID 4
-#define PFLAG_HAS_PROTO 8
-#define PFLAG_HAS_SEQ 16
-#define PFLAG_HAS_RECENT_RECV 32
-#define PFLAG_HAS_SENDER_TAG_HASH 64
-
-#define XPFLAG_HAS_EXTRA 1
-#define XPFLAG_HAS_RECV_TS 2
-
-#define EXTRA_TYPE_STREAM_FLAGS 1
-#define EXTRA_TYPE_STREAM_CSD 2
-#define EXTRA_TYPE_LAN_ENDPOINT 3
-#define EXTRA_TYPE_NETWORK_CHANGED 4
-#define EXTRA_TYPE_GROUP_CALL_KEY 5
-#define EXTRA_TYPE_REQUEST_GROUP 6
-#define EXTRA_TYPE_IPV6_ENDPOINT 7
-#define EXTRA_TYPE_BW_ESTIMATE 8
-#define EXTRA_TYPE_VIDEO_ROTATION 9
-
-#define STREAM_FLAG_ENABLED 1
-#define STREAM_FLAG_DTX 2
-#define STREAM_FLAG_EXTRA_EC 4
-
-#define STREAM_RFLAG_SUPPORTED 1
-
-#define INIT_FLAG_DATA_SAVING_ENABLED 1
-#define INIT_FLAG_GROUP_CALLS_SUPPORTED 2
-#define INIT_FLAG_VIDEO_SEND_SUPPORTED 4
-#define INIT_FLAG_VIDEO_RECV_SUPPORTED 8
-
-#define INIT_VIDEO_RES_NONE 0
-#define INIT_VIDEO_RES_240 1
-#define INIT_VIDEO_RES_360 2
-#define INIT_VIDEO_RES_480 3
-#define INIT_VIDEO_RES_720 4
-#define INIT_VIDEO_RES_1080 5
-#define INIT_VIDEO_RES_1440 6
-#define INIT_VIDEO_RES_4K 7
-
-#define TLID_DECRYPTED_AUDIO_BLOCK 0xDBF948C1
-#define TLID_SIMPLE_AUDIO_BLOCK 0xCC0D0E76
-#define TLID_UDP_REFLECTOR_PEER_INFO 0x27D9371C
-#define TLID_UDP_REFLECTOR_PEER_INFO_IPV6 0x83fc73b1
-#define TLID_UDP_REFLECTOR_SELF_INFO 0xc01572c7
-#define TLID_UDP_REFLECTOR_REQUEST_PACKETS_INFO 0x1a06fc96
-#define TLID_UDP_REFLECTOR_LAST_PACKETS_INFO 0x0e107305
-#define TLID_VECTOR 0x1cb5c415
-#define PAD4(x) (4-(x+(x<=253 ? 1 : 0))%4)
-
-#define MAX_RECENT_PACKETS 128
-
-#define MAX(a,b) (a>b ? a : b)
-#define MIN(a,b) (a<b ? a : b)
-
-#define SHA1_LENGTH 20
-#define SHA256_LENGTH 32
-
-#ifdef _MSC_VER
-#define MSC_STACK_FALLBACK(a, b) (b)
-#else
-#define MSC_STACK_FALLBACK(a, b) (a)
-#endif
-
-#define SEQ_MAX 0xFFFFFFFF
-
-inline bool seqgt(uint32_t s1, uint32_t s2){
-	return ((s1>s2) && (s1-s2<=SEQ_MAX/2)) || ((s1<s2) && (s2-s1>SEQ_MAX/2));
-}
-
-#define NEED_RATE_FLAG_SHITTY_INTERNET_MODE 1
-#define NEED_RATE_FLAG_UDP_NA 2
-#define NEED_RATE_FLAG_UDP_BAD 4
-#define NEED_RATE_FLAG_RECONNECTING 8
-
-#define VIDEO_FRAME_FLAG_KEYFRAME 1
-
-#endif //TGVOIP_PRIVATEDEFINES_H
diff --git a/submodules/libtgvoip/UNLICENSE b/submodules/libtgvoip/UNLICENSE
deleted file mode 100644
index 00d2e135a7..0000000000
--- a/submodules/libtgvoip/UNLICENSE
+++ /dev/null
@@ -1,24 +0,0 @@
-This is free and unencumbered software released into the public domain.
-
-Anyone is free to copy, modify, publish, use, compile, sell, or
-distribute this software, either in source code form or as a compiled
-binary, for any purpose, commercial or non-commercial, and by any
-means.
-
-In jurisdictions that recognize copyright laws, the author or authors
-of this software dedicate any and all copyright interest in the
-software to the public domain. We make this dedication for the benefit
-of the public at large and to the detriment of our heirs and
-successors. We intend this dedication to be an overt act of
-relinquishment in perpetuity of all present and future rights to this
-software under copyright law.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR
-OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-OTHER DEALINGS IN THE SOFTWARE.
-
-For more information, please refer to <http://unlicense.org/>
\ No newline at end of file
diff --git a/submodules/libtgvoip/VoIPController.cpp b/submodules/libtgvoip/VoIPController.cpp
deleted file mode 100755
index 407cec4904..0000000000
--- a/submodules/libtgvoip/VoIPController.cpp
+++ /dev/null
@@ -1,4015 +0,0 @@
-//
-// libtgvoip is free and unencumbered public domain software.
-// For more information, see http://unlicense.org or the UNLICENSE file
-// you should have received with this source code distribution.
-//
-
-#ifndef _WIN32
-#include <unistd.h>
-#include <sys/time.h>
-#endif
-#include <errno.h>
-#include <string.h>
-#include <wchar.h>
-#include "VoIPController.h"
-#include "logging.h"
-#include "threading.h"
-#include "Buffers.h"
-#include "OpusEncoder.h"
-#include "OpusDecoder.h"
-#include "VoIPServerConfig.h"
-#include "PrivateDefines.h"
-#include "json11.hpp"
-#include <assert.h>
-#include <time.h>
-#include <math.h>
-#include <exception>
-#include <stdexcept>
-#include <algorithm>
-#include <sstream>
-#include <inttypes.h>
-#include <float.h>
-
-
-inline int pad4(int x){
-	int r=PAD4(x);
-	if(r==4)
-		return 0;
-	return r;
-}
-
-
-using namespace tgvoip;
-using namespace std;
-
-#ifdef __APPLE__
-#include "os/darwin/AudioUnitIO.h"
-#include <mach/mach_time.h>
-double VoIPController::machTimebase=0;
-uint64_t VoIPController::machTimestart=0;
-#endif
-
-#ifdef _WIN32
-int64_t VoIPController::win32TimeScale = 0;
-bool VoIPController::didInitWin32TimeScale = false;
-#endif
-
-#ifdef __ANDROID__
-#include "os/android/JNIUtilities.h"
-#include "os/android/AudioInputAndroid.h"
-extern jclass jniUtilitiesClass;
-#endif
-
-#if defined(TGVOIP_USE_CALLBACK_AUDIO_IO)
-#include "audio/AudioIOCallback.h"
-#endif
-
-#pragma mark - OpenSSL wrappers
-
-#ifndef TGVOIP_USE_CUSTOM_CRYPTO
-extern "C" {
-#include <openssl/sha.h>
-#include <openssl/aes.h>
-#include <openssl/modes.h>
-#include <openssl/rand.h>
-}
-
-void tgvoip_openssl_aes_ige_encrypt(uint8_t* in, uint8_t* out, size_t length, uint8_t* key, uint8_t* iv){
-	AES_KEY akey;
-	AES_set_encrypt_key(key, 32*8, &akey);
-	AES_ige_encrypt(in, out, length, &akey, iv, AES_ENCRYPT);
-}
-
-void tgvoip_openssl_aes_ige_decrypt(uint8_t* in, uint8_t* out, size_t length, uint8_t* key, uint8_t* iv){
-	AES_KEY akey;
-	AES_set_decrypt_key(key, 32*8, &akey);
-	AES_ige_encrypt(in, out, length, &akey, iv, AES_DECRYPT);
-}
-
-void tgvoip_openssl_rand_bytes(uint8_t* buffer, size_t len){
-	RAND_bytes(buffer, len);
-}
-
-void tgvoip_openssl_sha1(uint8_t* msg, size_t len, uint8_t* output){
-	SHA1(msg, len, output);
-}
-
-void tgvoip_openssl_sha256(uint8_t* msg, size_t len, uint8_t* output){
-	SHA256(msg, len, output);
-}
-
-void tgvoip_openssl_aes_ctr_encrypt(uint8_t* inout, size_t length, uint8_t* key, uint8_t* iv, uint8_t* ecount, uint32_t* num){
-	AES_KEY akey;
-	AES_set_encrypt_key(key, 32*8, &akey);
-	CRYPTO_ctr128_encrypt(inout, inout, length, &akey, iv, ecount, num, (block128_f) AES_encrypt);
-}
-
-void tgvoip_openssl_aes_cbc_encrypt(uint8_t* in, uint8_t* out, size_t length, uint8_t* key, uint8_t* iv){
-	AES_KEY akey;
-	AES_set_encrypt_key(key, 256, &akey);
-	AES_cbc_encrypt(in, out, length, &akey, iv, AES_ENCRYPT);
-}
-
-void tgvoip_openssl_aes_cbc_decrypt(uint8_t* in, uint8_t* out, size_t length, uint8_t* key, uint8_t* iv){
-	AES_KEY akey;
-	AES_set_decrypt_key(key, 256, &akey);
-	AES_cbc_encrypt(in, out, length, &akey, iv, AES_DECRYPT);
-}
-
-CryptoFunctions VoIPController::crypto={
-		tgvoip_openssl_rand_bytes,
-		tgvoip_openssl_sha1,
-		tgvoip_openssl_sha256,
-		tgvoip_openssl_aes_ige_encrypt,
-		tgvoip_openssl_aes_ige_decrypt,
-		tgvoip_openssl_aes_ctr_encrypt,
-		tgvoip_openssl_aes_cbc_encrypt,
-		tgvoip_openssl_aes_cbc_decrypt
-
-};
-#else
-CryptoFunctions VoIPController::crypto; // set it yourself upon initialization
-#endif
-
-
-extern FILE* tgvoipLogFile;
-
-#pragma mark - Public API
-
-VoIPController::VoIPController() : activeNetItfName(""),
-								   currentAudioInput("default"),
-								   currentAudioOutput("default"),
-								   proxyAddress(""),
-								   proxyUsername(""),
-								   proxyPassword(""){
-	seq=1;
-	lastRemoteSeq=0;
-	state=STATE_WAIT_INIT;
-	audioInput=NULL;
-	audioOutput=NULL;
-	encoder=NULL;
-	audioOutStarted=false;
-	audioTimestampIn=0;
-	audioTimestampOut=0;
-	stopping=false;
-	memset(recvPacketTimes, 0, sizeof(double)*32);
-	memset(&stats, 0, sizeof(TrafficStats));
-	lastRemoteAckSeq=0;
-	lastSentSeq=0;
-	recvLossCount=0;
-	packetsReceived=0;
-	waitingForAcks=false;
-	networkType=NET_TYPE_UNKNOWN;
-	echoCanceller=NULL;
-	dontSendPackets=0;
-	micMuted=false;
-	waitingForRelayPeerInfo=false;
-	allowP2p=true;
-	dataSavingMode=false;
-	publicEndpointsReqTime=0;
-	connectionInitTime=0;
-	lastRecvPacketTime=0;
-	dataSavingRequestedByPeer=false;
-	peerVersion=0;
-	conctl=new CongestionControl();
-	prevSendLossCount=0;
-	receivedInit=false;
-	receivedInitAck=false;
-	statsDump=NULL;
-	useTCP=false;
-	useUDP=true;
-	didAddTcpRelays=false;
-	udpPingCount=0;
-	lastUdpPingTime=0;
-
-	proxyProtocol=PROXY_NONE;
-	proxyPort=0;
-	resolvedProxyAddress=NULL;
-
-	selectCanceller=SocketSelectCanceller::Create();
-	udpSocket=NetworkSocket::Create(PROTO_UDP);
-	realUdpSocket=udpSocket;
-	udpConnectivityState=UDP_UNKNOWN;
-	echoCancellationStrength=1;
-
-	peerCapabilities=0;
-	callbacks={0};
-	didReceiveGroupCallKey=false;
-	didReceiveGroupCallKeyAck=false;
-	didSendGroupCallKey=false;
-	didSendUpgradeRequest=false;
-	didInvokeUpgradeCallback=false;
-
-	connectionMaxLayer=0;
-	useMTProto2=false;
-	setCurrentEndpointToTCP=false;
-	useIPv6=false;
-	peerIPv6Available=false;
-	shittyInternetMode=false;
-	didAddIPv6Relays=false;
-	didSendIPv6Endpoint=false;
-	unsentStreamPackets.store(0);
-
-	sendThread=NULL;
-	recvThread=NULL;
-
-	maxAudioBitrate=(uint32_t) ServerConfig::GetSharedInstance()->GetInt("audio_max_bitrate", 20000);
-	maxAudioBitrateGPRS=(uint32_t) ServerConfig::GetSharedInstance()->GetInt("audio_max_bitrate_gprs", 8000);
-	maxAudioBitrateEDGE=(uint32_t) ServerConfig::GetSharedInstance()->GetInt("audio_max_bitrate_edge", 16000);
-	maxAudioBitrateSaving=(uint32_t) ServerConfig::GetSharedInstance()->GetInt("audio_max_bitrate_saving", 8000);
-	initAudioBitrate=(uint32_t) ServerConfig::GetSharedInstance()->GetInt("audio_init_bitrate", 16000);
-	initAudioBitrateGPRS=(uint32_t) ServerConfig::GetSharedInstance()->GetInt("audio_init_bitrate_gprs", 8000);
-	initAudioBitrateEDGE=(uint32_t) ServerConfig::GetSharedInstance()->GetInt("audio_init_bitrate_edge", 8000);
-	initAudioBitrateSaving=(uint32_t) ServerConfig::GetSharedInstance()->GetInt("audio_init_bitrate_saving", 8000);
-	audioBitrateStepIncr=(uint32_t) ServerConfig::GetSharedInstance()->GetInt("audio_bitrate_step_incr", 1000);
-	audioBitrateStepDecr=(uint32_t) ServerConfig::GetSharedInstance()->GetInt("audio_bitrate_step_decr", 1000);
-	minAudioBitrate=(uint32_t) ServerConfig::GetSharedInstance()->GetInt("audio_min_bitrate", 8000);
-	relaySwitchThreshold=ServerConfig::GetSharedInstance()->GetDouble("relay_switch_threshold", 0.8);
-	p2pToRelaySwitchThreshold=ServerConfig::GetSharedInstance()->GetDouble("p2p_to_relay_switch_threshold", 0.6);
-	relayToP2pSwitchThreshold=ServerConfig::GetSharedInstance()->GetDouble("relay_to_p2p_switch_threshold", 0.8);
-	reconnectingTimeout=ServerConfig::GetSharedInstance()->GetDouble("reconnecting_state_timeout", 2.0);
-	needRateFlags=static_cast<uint32_t>(ServerConfig::GetSharedInstance()->GetInt("rate_flags", 0xFFFFFFFF));
-	rateMaxAcceptableRTT=ServerConfig::GetSharedInstance()->GetDouble("rate_min_rtt", 0.6);
-	rateMaxAcceptableSendLoss=ServerConfig::GetSharedInstance()->GetDouble("rate_min_send_loss", 0.2);
-	packetLossToEnableExtraEC=ServerConfig::GetSharedInstance()->GetDouble("packet_loss_for_extra_ec", 0.02);
-	maxUnsentStreamPackets=static_cast<uint32_t>(ServerConfig::GetSharedInstance()->GetInt("max_unsent_stream_packets", 2));
-
-#ifdef __APPLE__
-	machTimestart=0;
-#endif
-
-	shared_ptr<Stream> stm=make_shared<Stream>();
-	stm->id=1;
-	stm->type=STREAM_TYPE_AUDIO;
-	stm->codec=CODEC_OPUS;
-	stm->enabled=1;
-	stm->frameDuration=60;
-	outgoingStreams.push_back(stm);
-
-}
-
-VoIPController::~VoIPController(){
-	LOGD("Entered VoIPController::~VoIPController");
-	if(!stopping){
-		LOGE("!!!!!!!!!!!!!!!!!!!! CALL controller->Stop() BEFORE DELETING THE CONTROLLER OBJECT !!!!!!!!!!!!!!!!!!!!!!!1");
-		abort();
-	}
-	LOGD("before close socket");
-	if(udpSocket)
-		delete udpSocket;
-	if(udpSocket!=realUdpSocket)
-		delete realUdpSocket;
-	LOGD("before delete audioIO");
-	if(audioIO){
-		delete audioIO;
-		audioInput=NULL;
-		audioOutput=NULL;
-	}
-	for(vector<shared_ptr<Stream>>::iterator _stm=incomingStreams.begin();_stm!=incomingStreams.end();++_stm){
-		shared_ptr<Stream> stm=*_stm;
-		LOGD("before stop decoder");
-		if(stm->decoder){
-			stm->decoder->Stop();
-		}
-	}
-	LOGD("before delete encoder");
-	if(encoder){
-		encoder->Stop();
-		delete encoder;
-	}
-	LOGD("before delete echo canceller");
-	if(echoCanceller){
-		echoCanceller->Stop();
-		delete echoCanceller;
-	}
-	delete conctl;
-	if(statsDump)
-		fclose(statsDump);
-	if(resolvedProxyAddress)
-		delete resolvedProxyAddress;
-	delete selectCanceller;
-	LOGD("Left VoIPController::~VoIPController");
-	if(tgvoipLogFile){
-		FILE* log=tgvoipLogFile;
-		tgvoipLogFile=NULL;
-		fclose(log);
-	}
-}
-
-void VoIPController::Stop(){
-	LOGD("Entered VoIPController::Stop");
-	stopping=true;
-	runReceiver=false;
-	LOGD("before shutdown socket");
-	if(udpSocket)
-		udpSocket->Close();
-	if(realUdpSocket!=udpSocket)
-		realUdpSocket->Close();
-	selectCanceller->CancelSelect();
-	Buffer emptyBuf(0);
-	//PendingOutgoingPacket emptyPacket{0, 0, 0, move(emptyBuf), 0};
-	//sendQueue->Put(move(emptyPacket));
-	LOGD("before join sendThread");
-	if(sendThread){
-		sendThread->Join();
-		delete sendThread;
-	}
-	LOGD("before join recvThread");
-	if(recvThread){
-		recvThread->Join();
-		delete recvThread;
-	}
-	LOGD("before stop messageThread");
-	messageThread.Stop();
-	{
-		LOGD("Before stop audio I/O");
-		MutexGuard m(audioIOMutex);
-		if(audioInput){
-			audioInput->Stop();
-			audioInput->SetCallback(NULL, NULL);
-		}
-		if(audioOutput){
-			audioOutput->Stop();
-			audioOutput->SetCallback(NULL, NULL);
-		}
-	}
-	LOGD("Left VoIPController::Stop [need rate = %d]", (int)needRate);
-}
-
-bool VoIPController::NeedRate(){
-	return needRate && ServerConfig::GetSharedInstance()->GetBoolean("bad_call_rating", false);
-}
-
-void VoIPController::SetRemoteEndpoints(vector<Endpoint> endpoints, bool allowP2p, int32_t connectionMaxLayer){
-	LOGW("Set remote endpoints, allowP2P=%d, connectionMaxLayer=%u", allowP2p ? 1 : 0, connectionMaxLayer);
-	preferredRelay=0;
-	{
-		MutexGuard m(endpointsMutex);
-		this->endpoints.clear();
-		didAddTcpRelays=false;
-		useTCP=true;
-		for(vector<Endpoint>::iterator itrtr=endpoints.begin();itrtr!=endpoints.end();++itrtr){
-			if(this->endpoints.find(itrtr->id)!=this->endpoints.end())
-				LOGE("Endpoint IDs are not unique!");
-			this->endpoints[itrtr->id]=*itrtr;
-			if(currentEndpoint==0)
-				currentEndpoint=itrtr->id;
-			if(itrtr->type==Endpoint::Type::TCP_RELAY)
-				didAddTcpRelays=true;
-			if(itrtr->type==Endpoint::Type::UDP_RELAY)
-				useTCP=false;
-			LOGV("Adding endpoint: %s:%d, %s", itrtr->address.ToString().c_str(), itrtr->port, itrtr->type==Endpoint::Type::UDP_RELAY ? "UDP" : "TCP");
-		}
-	}
-	preferredRelay=currentEndpoint;
-	this->allowP2p=allowP2p;
-	this->connectionMaxLayer=connectionMaxLayer;
-	if(connectionMaxLayer>=74){
-		useMTProto2=true;
-	}
-	AddIPv6Relays();
-}
-
-void VoIPController::Start(){
-	LOGW("Starting voip controller");
-	udpSocket->Open();
-	if(udpSocket->IsFailed()){
-		SetState(STATE_FAILED);
-		return;
-	}
-
-	//SendPacket(NULL, 0, currentEndpoint);
-
-	runReceiver=true;
-	recvThread=new Thread(bind(&VoIPController::RunRecvThread, this));
-	recvThread->SetName("VoipRecv");
-	recvThread->Start();
-
-	messageThread.Start();
-}
-
-
-void VoIPController::Connect(){
-	assert(state!=STATE_WAIT_INIT_ACK);
-	connectionInitTime=GetCurrentTime();
-	if(config.initTimeout==0.0){
-		LOGE("Init timeout is 0 -- did you forget to set config?");
-		config.initTimeout=30.0;
-	}
-
-	//InitializeTimers();
-	//SendInit();
-	sendThread=new Thread(bind(&VoIPController::RunSendThread, this));
-	sendThread->SetName("VoipSend");
-	sendThread->Start();
-}
-
-void VoIPController::SetEncryptionKey(char *key, bool isOutgoing){
-	memcpy(encryptionKey, key, 256);
-	uint8_t sha1[SHA1_LENGTH];
-	crypto.sha1((uint8_t*) encryptionKey, 256, sha1);
-	memcpy(keyFingerprint, sha1+(SHA1_LENGTH-8), 8);
-	uint8_t sha256[SHA256_LENGTH];
-	crypto.sha256((uint8_t*) encryptionKey, 256, sha256);
-	memcpy(callID, sha256+(SHA256_LENGTH-16), 16);
-	this->isOutgoing=isOutgoing;
-}
-
-void VoIPController::SetNetworkType(int type){
-	networkType=type;
-	UpdateDataSavingState();
-	UpdateAudioBitrateLimit();
-	myIPv6=IPv6Address();
-	string itfName=udpSocket->GetLocalInterfaceInfo(NULL, &myIPv6);
-	LOGI("set network type: %s, active interface %s", NetworkTypeToString(type).c_str(), itfName.c_str());
-	LOGI("Local IPv6 address: %s", myIPv6.ToString().c_str());
-	if(IS_MOBILE_NETWORK(networkType)){
-		CellularCarrierInfo carrier=GetCarrierInfo();
-		if(!carrier.name.empty()){
-			LOGI("Carrier: %s [%s; mcc=%s, mnc=%s]", carrier.name.c_str(), carrier.countryCode.c_str(), carrier.mcc.c_str(), carrier.mnc.c_str());
-		}
-	}
-	if(itfName!=activeNetItfName){
-		udpSocket->OnActiveInterfaceChanged();
-		LOGI("Active network interface changed: %s -> %s", activeNetItfName.c_str(), itfName.c_str());
-		bool isFirstChange=activeNetItfName.length()==0 && state!=STATE_ESTABLISHED && state!=STATE_RECONNECTING;
-		activeNetItfName=itfName;
-		if(isFirstChange)
-			return;
-		wasNetworkHandover=true;
-		if(currentEndpoint){
-			const Endpoint& _currentEndpoint=endpoints.at(currentEndpoint);
-			const Endpoint& _preferredRelay=endpoints.at(preferredRelay);
-			if(_currentEndpoint.type!=Endpoint::Type::UDP_RELAY){
-				if(_preferredRelay.type==Endpoint::Type::UDP_RELAY)
-					currentEndpoint=preferredRelay;
-				MutexGuard m(endpointsMutex);
-				constexpr int64_t lanID=(int64_t)(FOURCC('L','A','N','4')) << 32;
-				endpoints.erase(lanID);
-				for(pair<const int64_t, Endpoint>& e:endpoints){
-					Endpoint& endpoint=e.second;
-					if(endpoint.type==Endpoint::Type::UDP_RELAY && useTCP){
-						useTCP=false;
-						if(_preferredRelay.type==Endpoint::Type::TCP_RELAY){
-							preferredRelay=currentEndpoint=endpoint.id;
-						}
-					}else if(endpoint.type==Endpoint::Type::TCP_RELAY && endpoint.socket){
-						endpoint.socket->Close();
-						//delete endpoint.socket;
-						//endpoint.socket=NULL;
-					}
-					//if(endpoint->type==Endpoint::Type::UDP_P2P_INET){
-					endpoint.averageRTT=0;
-					endpoint.rtts.Reset();
-					//}
-				}
-			}
-		}
-		lastUdpPingTime=0;
-		if(proxyProtocol==PROXY_SOCKS5)
-			InitUDPProxy();
-		if(allowP2p && currentEndpoint){
-			SendPublicEndpointsRequest();
-		}
-		BufferOutputStream s(4);
-		s.WriteInt32(dataSavingMode ? INIT_FLAG_DATA_SAVING_ENABLED : 0);
-		if(peerVersion<6){
-			SendPacketReliably(PKT_NETWORK_CHANGED, s.GetBuffer(), s.GetLength(), 1, 20);
-		}else{
-			Buffer buf(move(s));
-			SendExtra(buf, EXTRA_TYPE_NETWORK_CHANGED);
-		}
-		needReInitUdpProxy=true;
-		selectCanceller->CancelSelect();
-		didSendIPv6Endpoint=false;
-
-		AddIPv6Relays();
-		ResetUdpAvailability();
-		ResetEndpointPingStats();
-
-	}
-}
-
-double VoIPController::GetAverageRTT(){
-	if(lastSentSeq>=lastRemoteAckSeq){
-		uint32_t diff=lastSentSeq-lastRemoteAckSeq;
-		//LOGV("rtt diff=%u", diff);
-		if(diff<32){
-			double res=0;
-			int count=0;
-			/*for(i=diff;i<32;i++){
-				if(remoteAcks[i-diff]>0){
-					res+=(remoteAcks[i-diff]-sentPacketTimes[i]);
-					count++;
-				}
-			}*/
-			MutexGuard m(queuedPacketsMutex);
-			for(std::vector<RecentOutgoingPacket>::iterator itr=recentOutgoingPackets.begin();itr!=recentOutgoingPackets.end();++itr){
-				if(itr->ackTime>0){
-					res+=(itr->ackTime-itr->sendTime);
-					count++;
-				}
-			}
-			if(count>0)
-				res/=count;
-			return res;
-		}
-	}
-	return 999;
-}
-
-void VoIPController::SetMicMute(bool mute){
-	if(micMuted==mute)
-		return;
-	micMuted=mute;
-	if(audioInput){
-		if(mute)
-			audioInput->Stop();
-		else
-			audioInput->Start();
-		if(!audioInput->IsInitialized()){
-			lastError=ERROR_AUDIO_IO;
-			SetState(STATE_FAILED);
-			return;
-		}
-	}
-	if(echoCanceller)
-		echoCanceller->Enable(!mute);
-	if(state==STATE_ESTABLISHED){
-		for(shared_ptr<Stream>& s:outgoingStreams){
-			if(s->type==STREAM_TYPE_AUDIO){
-				s->enabled=!mute;
-				if(peerVersion<6){
-					unsigned char buf[2];
-					buf[0]=s->id;
-					buf[1]=(char) (mute ? 0 : 1);
-					SendPacketReliably(PKT_STREAM_STATE, buf, 2, .5f, 20);
-				}else{
-					SendStreamFlags(*s);
-				}
-			}
-		}
-	}
-	if(mute){
-		if(noStreamsNopID==MessageThread::INVALID_ID)
-			noStreamsNopID=messageThread.Post(std::bind(&VoIPController::SendNopPacket, this), 0.2, 0.2);
-	}else{
-		if(noStreamsNopID!=MessageThread::INVALID_ID){
-			messageThread.Cancel(noStreamsNopID);
-			noStreamsNopID=MessageThread::INVALID_ID;
-		}
-	}
-}
-
-string VoIPController::GetDebugString(){
-	string r="Remote endpoints: \n";
-	char buffer[2048];
-	MutexGuard m(endpointsMutex);
-	for(pair<const int64_t, Endpoint>& _e:endpoints){
-		Endpoint& endpoint=_e.second;
-		const char* type;
-		switch(endpoint.type){
-			case Endpoint::Type::UDP_P2P_INET:
-				type="UDP_P2P_INET";
-				break;
-			case Endpoint::Type::UDP_P2P_LAN:
-				type="UDP_P2P_LAN";
-				break;
-			case Endpoint::Type::UDP_RELAY:
-				type="UDP_RELAY";
-				break;
-			case Endpoint::Type::TCP_RELAY:
-				type="TCP_RELAY";
-				break;
-			default:
-				type="UNKNOWN";
-				break;
-		}
-		snprintf(buffer, sizeof(buffer), "%s:%u %dms %d 0x%" PRIx64 " [%s%s]\n", endpoint.address.IsEmpty() ? ("["+endpoint.v6address.ToString()+"]").c_str() : endpoint.address.ToString().c_str(), endpoint.port, (int)(endpoint.averageRTT*1000), endpoint.udpPongCount, (uint64_t)endpoint.id, type, currentEndpoint==endpoint.id ? ", IN_USE" : "");
-		r+=buffer;
-	}
-	if(shittyInternetMode){
-		snprintf(buffer, sizeof(buffer), "ShittyInternetMode: level %d\n", extraEcLevel);
-		r+=buffer;
-	}
-	double avgLate[3];
-	shared_ptr<Stream> stm=GetStreamByType(STREAM_TYPE_AUDIO, false);
-	shared_ptr<JitterBuffer> jitterBuffer;
-	if(stm)
-		jitterBuffer=stm->jitterBuffer;
-	if(jitterBuffer)
-		jitterBuffer->GetAverageLateCount(avgLate);
-	else
-		memset(avgLate, 0, 3*sizeof(double));
-	snprintf(buffer, sizeof(buffer),
-			 "Jitter buffer: %d/%.2f | %.1f, %.1f, %.1f\n"
-			 "RTT avg/min: %d/%d\n"
-			 "Congestion window: %d/%d bytes\n"
-			 "Key fingerprint: %02hhX%02hhX%02hhX%02hhX%02hhX%02hhX%02hhX%02hhX%s\n"
-			 "Last sent/ack'd seq: %u/%u\n"
-			 "Last recvd seq: %u\n"
-			 "Send/recv losses: %u/%u (%d%%)\n"
-			 "Audio bitrate: %d kbit\n"
-			 "Outgoing queue: %u\n"
-			 //					 "Packet grouping: %d\n"
-			 "Frame size out/in: %d/%d\n"
-			 "Bytes sent/recvd: %llu/%llu",
-			 jitterBuffer ? jitterBuffer->GetMinPacketCount() : 0, jitterBuffer ? jitterBuffer->GetAverageDelay() : 0, avgLate[0], avgLate[1], avgLate[2],
-			// (int)(GetAverageRTT()*1000), 0,
-			 (int)(conctl->GetAverageRTT()*1000), (int)(conctl->GetMinimumRTT()*1000),
-			 int(conctl->GetInflightDataSize()), int(conctl->GetCongestionWindow()),
-			 keyFingerprint[0],keyFingerprint[1],keyFingerprint[2],keyFingerprint[3],keyFingerprint[4],keyFingerprint[5],keyFingerprint[6],keyFingerprint[7],
-			 useMTProto2 ? " (MTProto2.0)" : "",
-			 lastSentSeq, lastRemoteAckSeq, lastRemoteSeq,
-			 conctl->GetSendLossCount(), recvLossCount, encoder ? encoder->GetPacketLoss() : 0,
-			 encoder ? (encoder->GetBitrate()/1000) : 0,
-			 static_cast<unsigned int>(unsentStreamPackets),
-//			 audioPacketGrouping,
-			 outgoingStreams[0]->frameDuration, incomingStreams.size()>0 ? incomingStreams[0]->frameDuration : 0,
-			 (long long unsigned int)(stats.bytesSentMobile+stats.bytesSentWifi),
-			 (long long unsigned int)(stats.bytesRecvdMobile+stats.bytesRecvdWifi));
-	r+=buffer;
-	return r;
-}
-
-const char* VoIPController::GetVersion(){
-	return LIBTGVOIP_VERSION;
-}
-
-
-int64_t VoIPController::GetPreferredRelayID(){
-	return preferredRelay;
-}
-
-
-int VoIPController::GetLastError(){
-	return lastError;
-}
-
-
-void VoIPController::GetStats(TrafficStats *stats){
-	memcpy(stats, &this->stats, sizeof(TrafficStats));
-}
-
-string VoIPController::GetDebugLog(){
-	map<string, json11::Json> network{
-			{"type", NetworkTypeToString(networkType)}
-	};
-	if(IS_MOBILE_NETWORK(networkType)){
-		CellularCarrierInfo carrier=GetCarrierInfo();
-		if(!carrier.name.empty()){
-			network["carrier"]=carrier.name;
-			network["country"]=carrier.countryCode;
-			network["mcc"]=carrier.mcc;
-			network["mnc"]=carrier.mnc;
-		}
-	}else if(networkType==NET_TYPE_WIFI){
-#ifdef __ANDROID__
-		jni::DoWithJNI([&](JNIEnv* env){
-			jmethodID getWifiInfoMethod=env->GetStaticMethodID(jniUtilitiesClass, "getWifiInfo", "()[I");
-			jintArray res=static_cast<jintArray>(env->CallStaticObjectMethod(jniUtilitiesClass, getWifiInfoMethod));
-			if(res){
-				jint* wifiInfo=env->GetIntArrayElements(res, NULL);
-				network["rssi"]=wifiInfo[0];
-				network["link_speed"]=wifiInfo[1];
-				env->ReleaseIntArrayElements(res, wifiInfo, JNI_ABORT);
-			}
-		});
-#endif
-	}
-	/*vector<json11::Json> lpkts;
-	for(DebugLoggedPacket& lpkt:debugLoggedPackets){
-		lpkts.push_back(json11::Json::array{lpkt.timestamp, lpkt.seq, lpkt.length});
-	}
-	return json11::Json(json11::Json::object{
-			{"log_type", "out_packet_stats"},
-			{"libtgvoip_version", LIBTGVOIP_VERSION},
-			{"network", network},
-			{"protocol_version", std::min(peerVersion, PROTOCOL_VERSION)},
-			{"total_losses", json11::Json::object{
-					{"s", (int32_t)conctl->GetSendLossCount()},
-					{"r", (int32_t)recvLossCount}
-			}},
-			{"call_duration", GetCurrentTime()-connectionInitTime},
-			{"out_packet_stats", lpkts}
-	}).dump();*/
-
-	string p2pType="none";
-	Endpoint& cur=endpoints[currentEndpoint];
-	if(cur.type==Endpoint::Type::UDP_P2P_INET)
-		p2pType=cur.IsIPv6Only() ? "inet6" : "inet";
-	else if(cur.type==Endpoint::Type::UDP_P2P_LAN)
-		p2pType="lan";
-
-	vector<string> problems;
-	if(lastError==ERROR_TIMEOUT)
-		problems.push_back("timeout");
-	if(wasReconnecting)
-		problems.push_back("reconnecting");
-	if(wasExtraEC)
-		problems.push_back("extra_ec");
-	if(wasEncoderLaggy)
-		problems.push_back("encoder_lag");
-	if(!wasEstablished)
-		problems.push_back("not_inited");
-	if(wasNetworkHandover)
-		problems.push_back("network_handover");
-
-	ostringstream prefRelay;
-	prefRelay << preferredRelay;
-
-	return json11::Json(json11::Json::object{
-			{"log_type", "call_stats"},
-			{"libtgvoip_version", LIBTGVOIP_VERSION},
-			{"network", network},
-			{"protocol_version", std::min(peerVersion, PROTOCOL_VERSION)},
-			{"udp_avail", udpConnectivityState==UDP_AVAILABLE},
-			{"tcp_used", useTCP},
-			{"relay_rtt", (int)(endpoints[preferredRelay].averageRTT*1000.0)},
-			{"p2p_type", p2pType},
-			{"rtt", (int)(endpoints[currentEndpoint].averageRTT*1000.0)},
-			{"packet_stats", json11::Json::object{
-					{"out", (int)seq},
-					{"in", (int)packetsReceived},
-					{"lost_out", (int)conctl->GetSendLossCount()},
-					{"lost_in", (int)recvLossCount}
-			}},
-			{"problems", problems},
-			{"pref_relay", prefRelay.str()}
-	}).dump();
-}
-
-vector<AudioInputDevice> VoIPController::EnumerateAudioInputs(){
-	vector<AudioInputDevice> devs;
-	audio::AudioInput::EnumerateDevices(devs);
-	return devs;
-}
-
-vector<AudioOutputDevice> VoIPController::EnumerateAudioOutputs(){
-	vector<AudioOutputDevice> devs;
-	audio::AudioOutput::EnumerateDevices(devs);
-	return devs;
-}
-
-void VoIPController::SetCurrentAudioInput(string id){
-	currentAudioInput=id;
-	if(audioInput)
-		audioInput->SetCurrentDevice(id);
-}
-
-void VoIPController::SetCurrentAudioOutput(string id){
-	currentAudioOutput=id;
-	if(audioOutput)
-		audioOutput->SetCurrentDevice(id);
-}
-
-string VoIPController::GetCurrentAudioInputID(){
-	return currentAudioInput;
-}
-
-string VoIPController::GetCurrentAudioOutputID(){
-	return currentAudioOutput;
-}
-
-void VoIPController::SetProxy(int protocol, string address, uint16_t port, string username, string password){
-	proxyProtocol=protocol;
-	proxyAddress=address;
-	proxyPort=port;
-	proxyUsername=username;
-	proxyPassword=password;
-}
-
-int VoIPController::GetSignalBarsCount(){
-	return signalBarsHistory.NonZeroAverage();
-}
-
-void VoIPController::SetCallbacks(VoIPController::Callbacks callbacks){
-	this->callbacks=callbacks;
-	if(callbacks.connectionStateChanged)
-		callbacks.connectionStateChanged(this, state);
-}
-
-void VoIPController::SetAudioOutputGainControlEnabled(bool enabled){
-	LOGD("New output AGC state: %d", enabled);
-}
-
-uint32_t VoIPController::GetPeerCapabilities(){
-	return peerCapabilities;
-}
-
-void VoIPController::SendGroupCallKey(unsigned char *key){
-	if(!(peerCapabilities & TGVOIP_PEER_CAP_GROUP_CALLS)){
-		LOGE("Tried to send group call key but peer isn't capable of them");
-		return;
-	}
-	if(didSendGroupCallKey){
-		LOGE("Tried to send a group call key repeatedly");
-		return;
-	}
-	if(!isOutgoing){
-		LOGE("You aren't supposed to send group call key in an incoming call, use VoIPController::RequestCallUpgrade() instead");
-		return;
-	}
-	didSendGroupCallKey=true;
-	Buffer buf(256);
-	buf.CopyFrom(key, 0, 256);
-	SendExtra(buf, EXTRA_TYPE_GROUP_CALL_KEY);
-}
-
-void VoIPController::RequestCallUpgrade(){
-	if(!(peerCapabilities & TGVOIP_PEER_CAP_GROUP_CALLS)){
-		LOGE("Tried to send group call key but peer isn't capable of them");
-		return;
-	}
-	if(didSendUpgradeRequest){
-		LOGE("Tried to send upgrade request repeatedly");
-		return;
-	}
-	if(isOutgoing){
-		LOGE("You aren't supposed to send an upgrade request in an outgoing call, generate an encryption key and use VoIPController::SendGroupCallKey instead");
-		return;
-	}
-	didSendUpgradeRequest=true;
-	Buffer empty(0);
-	SendExtra(empty, EXTRA_TYPE_REQUEST_GROUP);
-}
-
-void VoIPController::SetEchoCancellationStrength(int strength){
-	echoCancellationStrength=strength;
-	if(echoCanceller)
-		echoCanceller->SetAECStrength(strength);
-}
-
-#if defined(TGVOIP_USE_CALLBACK_AUDIO_IO)
-void VoIPController::SetAudioDataCallbacks(std::function<void(int16_t*, size_t)> input, std::function<void(int16_t*, size_t)> output){
-	audioInputDataCallback=input;
-	audioOutputDataCallback=output;
-}
-#endif
-
-int VoIPController::GetConnectionState(){
-	return state;
-}
-
-void VoIPController::SetConfig(const Config& cfg){
-	config=cfg;
-	if(tgvoipLogFile){
-		fclose(tgvoipLogFile);
-		tgvoipLogFile=NULL;
-	}
-	if(!config.logFilePath.empty()){
-#ifndef _WIN32
-		tgvoipLogFile=fopen(config.logFilePath.c_str(), "a");
-#else
-		if(_wfopen_s(&tgvoipLogFile, config.logFilePath.c_str(), L"a")!=0){
-			tgvoipLogFile=NULL;
-		}
-#endif
-		tgvoip_log_file_write_header(tgvoipLogFile);
-	}else{
-		tgvoipLogFile=NULL;
-	}
-	if(statsDump){
-		fclose(statsDump);
-		statsDump=NULL;
-	}
-	if(!config.statsDumpFilePath.empty()){
-#ifndef _WIN32
-		statsDump=fopen(config.statsDumpFilePath.c_str(), "w");
-#else
-		if(_wfopen_s(&statsDump, config.statsDumpFilePath.c_str(), L"w")!=0){
-			statsDump=NULL;
-		}
-#endif
-		if(statsDump)
-			fprintf(statsDump, "Time\tRTT\tLRSeq\tLSSeq\tLASeq\tLostR\tLostS\tCWnd\tBitrate\tLoss%%\tJitter\tJDelay\tAJDelay\n");
-		//else
-		//	LOGW("Failed to open stats dump file %s for writing", config.statsDumpFilePath.c_str());
-	}else{
-		statsDump=NULL;
-	}
-	UpdateDataSavingState();
-	UpdateAudioBitrateLimit();
-}
-
-void VoIPController::SetPersistentState(vector<uint8_t> state){
-	using namespace json11;
-	
-	if(state.empty())
-		return;
-	string jsonErr;
-	string json=string(state.begin(), state.end());
-	Json _obj=Json::parse(json, jsonErr);
-	if(!jsonErr.empty()){
-		LOGE("Error parsing persistable state: %s", jsonErr.c_str());
-		return;
-	}
-	Json::object obj=_obj.object_items();
-	if(obj.find("proxy")!=obj.end()){
-		Json::object proxy=obj["proxy"].object_items();
-		lastTestedProxyServer=proxy["server"].string_value();
-		proxySupportsUDP=proxy["udp"].bool_value();
-		proxySupportsTCP=proxy["tcp"].bool_value();
-	}
-}
-
-vector<uint8_t> VoIPController::GetPersistentState(){
-	using namespace json11;
-	
-	Json::object obj=Json::object{
-		{"ver", 1},
-	};
-	if(proxyProtocol==PROXY_SOCKS5){
-		char pbuf[128];
-		snprintf(pbuf, sizeof(pbuf), "%s:%u", proxyAddress.c_str(), proxyPort);
-    	obj.insert({"proxy", Json::object{
-    		{"server", string(pbuf)},
-			{"udp", proxySupportsUDP},
-			{"tcp", proxySupportsTCP}
-    	}});
-	}
-	string _jstr=Json(obj).dump();
-	const char* jstr=_jstr.c_str();
-	return vector<uint8_t>(jstr, jstr+strlen(jstr));
-}
-
-void VoIPController::SetOutputVolume(float level){
-	outputVolume.SetLevel(level);
-}
-
-void VoIPController::SetInputVolume(float level){
-	inputVolume.SetLevel(level);
-}
-
-#if defined(__APPLE__) && TARGET_OS_OSX
-void VoIPController::SetAudioOutputDuckingEnabled(bool enabled){
-	macAudioDuckingEnabled=enabled;
-	audio::AudioUnitIO* osxAudio=dynamic_cast<audio::AudioUnitIO*>(audioIO);
-	if(osxAudio){
-		osxAudio->SetDuckingEnabled(enabled);
-	}
-}
-#endif
-
-#pragma mark - Internal intialization
-
-void VoIPController::InitializeTimers(){
-	initTimeoutID=messageThread.Post([this]{
-		LOGW("Init timeout, disconnecting");
-		lastError=ERROR_TIMEOUT;
-		SetState(STATE_FAILED);
-	}, config.initTimeout);
-
-	if(!config.statsDumpFilePath.empty()){
-		messageThread.Post([this]{
-			if(statsDump && incomingStreams.size()==1){
-				shared_ptr<JitterBuffer>& jitterBuffer=incomingStreams[0]->jitterBuffer;
-				//fprintf(statsDump, "Time\tRTT\tLISeq\tLASeq\tCWnd\tBitrate\tJitter\tJDelay\tAJDelay\n");
-				fprintf(statsDump, "%.3f\t%.3f\t%d\t%d\t%d\t%d\t%d\t%d\t%d\t%d\t%.3f\t%.3f\t%.3f\n",
-						GetCurrentTime()-connectionInitTime,
-						endpoints.at(currentEndpoint).rtts[0],
-						lastRemoteSeq,
-						(uint32_t)seq,
-						lastRemoteAckSeq,
-						recvLossCount,
-						conctl ? conctl->GetSendLossCount() : 0,
-						conctl ? (int)conctl->GetInflightDataSize() : 0,
-						encoder ? encoder->GetBitrate() : 0,
-						encoder ? encoder->GetPacketLoss() : 0,
-						jitterBuffer ? jitterBuffer->GetLastMeasuredJitter() : 0,
-						jitterBuffer ? jitterBuffer->GetLastMeasuredDelay()*0.06 : 0,
-						jitterBuffer ? jitterBuffer->GetAverageDelay()*0.06 : 0);
-			}
-		}, 0.1, 0.1);
-	}
-
-	messageThread.Post(std::bind(&VoIPController::SendRelayPings, this), 0.0, 2.0);
-}
-
-void VoIPController::RunSendThread(){
-	InitializeAudio();
-	InitializeTimers();
-	SendInit();
-	LOGI("=== send thread exiting ===");
-}
-
-#pragma mark - Miscellaneous
-
-void VoIPController::SetState(int state){
-	this->state=state;
-	LOGV("Call state changed to %d", state);
-	stateChangeTime=GetCurrentTime();
-	messageThread.Post([this, state]{
-		if(callbacks.connectionStateChanged)
-			callbacks.connectionStateChanged(this, state);
-	});
-	if(state==STATE_ESTABLISHED){
-		SetMicMute(micMuted);
-		if(!wasEstablished){
-			wasEstablished=true;
-			messageThread.Post(std::bind(&VoIPController::UpdateRTT, this), 0.1, 0.5);
-			messageThread.Post(std::bind(&VoIPController::UpdateAudioBitrate, this), 0.0, 0.3);
-			messageThread.Post(std::bind(&VoIPController::UpdateCongestion, this), 0.0, 1.0);
-			messageThread.Post(std::bind(&VoIPController::UpdateSignalBars, this), 1.0, 1.0);
-			messageThread.Post(std::bind(&VoIPController::TickJitterBufferAngCongestionControl, this), 0.0, 0.1);
-		}
-	}
-}
-
-void VoIPController::SendStreamFlags(Stream& stream){
-	BufferOutputStream s(5);
-	s.WriteByte(stream.id);
-	uint32_t flags=0;
-	if(stream.enabled)
-		flags|=STREAM_FLAG_ENABLED;
-	if(stream.extraECEnabled)
-		flags|=STREAM_FLAG_EXTRA_EC;
-	s.WriteInt32(flags);
-	LOGV("My stream state: id %u flags %u", (unsigned int)stream.id, (unsigned int)flags);
-	Buffer buf(move(s));
-	SendExtra(buf, EXTRA_TYPE_STREAM_FLAGS);
-}
-
-shared_ptr<VoIPController::Stream> VoIPController::GetStreamByType(int type, bool outgoing){
-	shared_ptr<Stream> s;
-	for(shared_ptr<Stream>& ss:(outgoing ? outgoingStreams : incomingStreams)){
-		if(ss->type==type)
-			return ss;
-	}
-	return s;
-}
-
-CellularCarrierInfo VoIPController::GetCarrierInfo(){
-#if defined(__APPLE__) && TARGET_OS_IOS
-	return DarwinSpecific::GetCarrierInfo();
-#elif defined(__ANDROID__)
-	CellularCarrierInfo carrier;
-	jni::DoWithJNI([&carrier](JNIEnv* env){
-		jmethodID getCarrierInfoMethod=env->GetStaticMethodID(jniUtilitiesClass, "getCarrierInfo", "()[Ljava/lang/String;");
-		jobjectArray jinfo=(jobjectArray) env->CallStaticObjectMethod(jniUtilitiesClass, getCarrierInfoMethod);
-		if(jinfo && env->GetArrayLength(jinfo)==4){
-			carrier.name=jni::JavaStringToStdString(env, (jstring)env->GetObjectArrayElement(jinfo, 0));
-			carrier.countryCode=jni::JavaStringToStdString(env, (jstring)env->GetObjectArrayElement(jinfo, 1));
-			carrier.mcc=jni::JavaStringToStdString(env, (jstring)env->GetObjectArrayElement(jinfo, 2));
-			carrier.mnc=jni::JavaStringToStdString(env, (jstring)env->GetObjectArrayElement(jinfo, 3));
-		}else{
-			LOGW("Failed to get carrier info");
-		}
-	});
-	return carrier;
-#else
-	return CellularCarrierInfo();
-#endif
-}
-
-#pragma mark - Audio I/O
-
-void VoIPController::AudioInputCallback(unsigned char* data, size_t length, unsigned char* secondaryData, size_t secondaryLength, void* param){
-	((VoIPController*)param)->HandleAudioInput(data, length, secondaryData, secondaryLength);
-}
-
-void VoIPController::HandleAudioInput(unsigned char *data, size_t len, unsigned char* secondaryData, size_t secondaryLen){
-	if(stopping)
-		return;
-	unsentStreamPacketsHistory.Add(static_cast<unsigned int>(unsentStreamPackets));
-	if(unsentStreamPacketsHistory.Average()>=maxUnsentStreamPackets && !videoSource){
-		LOGW("Resetting stalled send queue");
-		sendQueue.clear();
-		unsentStreamPacketsHistory.Reset();
-		unsentStreamPackets=0;
-	}
-	if(waitingForAcks || dontSendPackets>0 || ((unsigned int)unsentStreamPackets>=maxUnsentStreamPackets /*&& endpoints[currentEndpoint].type==Endpoint::Type::TCP_RELAY*/)){
-		LOGV("waiting for queue, dropping outgoing audio packet, %d %d %d [%d]", (unsigned int)unsentStreamPackets, waitingForAcks, dontSendPackets, maxUnsentStreamPackets);
-		return;
-	}
-	//LOGV("Audio packet size %u", (unsigned int)len);
-	if(!receivedInitAck)
-		return;
-
-	BufferOutputStream pkt(1500);
-
-	bool hasExtraFEC=peerVersion>=7 && secondaryData && secondaryLen && shittyInternetMode;
-	unsigned char flags=(unsigned char) (len>255 || hasExtraFEC ? STREAM_DATA_FLAG_LEN16 : 0);
-	pkt.WriteByte((unsigned char) (1 | flags)); // streamID + flags
-	if(len>255 || hasExtraFEC){
-		int16_t lenAndFlags=static_cast<int16_t>(len);
-		if(hasExtraFEC)
-			lenAndFlags|=STREAM_DATA_XFLAG_EXTRA_FEC;
-		pkt.WriteInt16(lenAndFlags);
-	}else{
-		pkt.WriteByte((unsigned char) len);
-	}
-	pkt.WriteInt32(audioTimestampOut);
-	pkt.WriteBytes(data, len);
-
-	if(hasExtraFEC){
-		Buffer ecBuf(secondaryLen);
-		ecBuf.CopyFrom(secondaryData, 0, secondaryLen);
-		ecAudioPackets.push_back(move(ecBuf));
-		while(ecAudioPackets.size()>4)
-			ecAudioPackets.erase(ecAudioPackets.begin());
-		pkt.WriteByte((unsigned char)MIN(ecAudioPackets.size(), extraEcLevel));
-		for(vector<Buffer>::iterator ecData=ecAudioPackets.begin()+MAX(0, (int)ecAudioPackets.size()-extraEcLevel);ecData!=ecAudioPackets.end();++ecData){
-			pkt.WriteByte((unsigned char)ecData->Length());
-			pkt.WriteBytes(*ecData);
-		}
-	}
-
-	unsentStreamPackets++;
-	PendingOutgoingPacket p{
-			/*.seq=*/GenerateOutSeq(),
-			/*.type=*/PKT_STREAM_DATA,
-			/*.len=*/pkt.GetLength(),
-			/*.data=*/Buffer(move(pkt)),
-			/*.endpoint=*/0,
-	};
-
-	conctl->PacketSent(p.seq, p.len);
-
-	SendOrEnqueuePacket(move(p));
-	if(peerVersion<7 && secondaryData && secondaryLen && shittyInternetMode){
-		Buffer ecBuf(secondaryLen);
-		ecBuf.CopyFrom(secondaryData, 0, secondaryLen);
-		ecAudioPackets.push_back(move(ecBuf));
-		while(ecAudioPackets.size()>4)
-			ecAudioPackets.erase(ecAudioPackets.begin());
-		pkt=BufferOutputStream(1500);
-		pkt.WriteByte(outgoingStreams[0]->id);
-		pkt.WriteInt32(audioTimestampOut);
-		pkt.WriteByte((unsigned char)MIN(ecAudioPackets.size(), extraEcLevel));
-		for(vector<Buffer>::iterator ecData=ecAudioPackets.begin()+MAX(0, (int)ecAudioPackets.size()-extraEcLevel);ecData!=ecAudioPackets.end();++ecData){
-			pkt.WriteByte((unsigned char)ecData->Length());
-			pkt.WriteBytes(*ecData);
-		}
-
-		PendingOutgoingPacket p{
-				GenerateOutSeq(),
-				PKT_STREAM_EC,
-				pkt.GetLength(),
-				Buffer(move(pkt)),
-				0
-		};
-		SendOrEnqueuePacket(move(p));
-	}
-
-	audioTimestampOut+=outgoingStreams[0]->frameDuration;
-}
-
-void VoIPController::InitializeAudio(){
-	double t=GetCurrentTime();
-	shared_ptr<Stream> outgoingAudioStream=GetStreamByType(STREAM_TYPE_AUDIO, true);
-	LOGI("before create audio io");
-	audioIO=audio::AudioIO::Create(currentAudioInput, currentAudioOutput);
-	audioInput=audioIO->GetInput();
-	audioOutput=audioIO->GetOutput();
-#ifdef __ANDROID__
-	audio::AudioInputAndroid* androidInput=dynamic_cast<audio::AudioInputAndroid*>(audioInput);
-	if(androidInput){
-		unsigned int effects=androidInput->GetEnabledEffects();
-		if(!(effects & audio::AudioInputAndroid::EFFECT_AEC)){
-			config.enableAEC=true;
-			LOGI("Forcing software AEC because built-in is not good");
-		}
-		if(!(effects & audio::AudioInputAndroid::EFFECT_NS)){
-			config.enableNS=true;
-			LOGI("Forcing software NS because built-in is not good");
-		}
-	}
-#elif defined(__APPLE__) && TARGET_OS_OSX
-	SetAudioOutputDuckingEnabled(macAudioDuckingEnabled);
-#endif
-	LOGI("AEC: %d NS: %d AGC: %d", config.enableAEC, config.enableNS, config.enableAGC);
-	echoCanceller=new EchoCanceller(config.enableAEC, config.enableNS, config.enableAGC);
-	encoder=new OpusEncoder(audioInput, true);
-	encoder->SetCallback(AudioInputCallback, this);
-	encoder->SetOutputFrameDuration(outgoingAudioStream->frameDuration);
-	encoder->SetEchoCanceller(echoCanceller);
-	encoder->SetSecondaryEncoderEnabled(false);
-	if(config.enableVolumeControl){
-		encoder->AddAudioEffect(&inputVolume);
-	}
-
-#if defined(TGVOIP_USE_CALLBACK_AUDIO_IO)
-	dynamic_cast<audio::AudioInputCallback*>(audioInput)->SetDataCallback(audioInputDataCallback);
-	dynamic_cast<audio::AudioOutputCallback*>(audioOutput)->SetDataCallback(audioOutputDataCallback);
-#endif
-
-	if(!audioOutput->IsInitialized()){
-		LOGE("Error initializing audio playback");
-		lastError=ERROR_AUDIO_IO;
-
-		SetState(STATE_FAILED);
-		return;
-	}
-	UpdateAudioBitrateLimit();
-	LOGI("Audio initialization took %f seconds", GetCurrentTime()-t);
-}
-
-void VoIPController::StartAudio(){
-	OnAudioOutputReady();
-
-	encoder->Start();
-	if(!micMuted){
-		audioInput->Start();
-		if(!audioInput->IsInitialized()){
-			LOGE("Erorr initializing audio capture");
-			lastError=ERROR_AUDIO_IO;
-
-			SetState(STATE_FAILED);
-			return;
-		}
-	}
-}
-
-void VoIPController::OnAudioOutputReady(){
-	LOGI("Audio I/O ready");
-	shared_ptr<Stream>& stm=incomingStreams[0];
-	stm->decoder=make_shared<OpusDecoder>(audioOutput, true, peerVersion>=6);
-	stm->decoder->SetEchoCanceller(echoCanceller);
-	if(config.enableVolumeControl){
-		stm->decoder->AddAudioEffect(&outputVolume);
-	}
-	stm->decoder->SetJitterBuffer(stm->jitterBuffer);
-	stm->decoder->SetFrameDuration(stm->frameDuration);
-	stm->decoder->Start();
-}
-
-void VoIPController::UpdateAudioOutputState(){
-	bool areAnyAudioStreamsEnabled=false;
-	for(vector<shared_ptr<Stream>>::iterator s=incomingStreams.begin();s!=incomingStreams.end();++s){
-		if((*s)->type==STREAM_TYPE_AUDIO && (*s)->enabled)
-			areAnyAudioStreamsEnabled=true;
-	}
-	if(audioOutput){
-		LOGV("New audio output state: %d", areAnyAudioStreamsEnabled);
-		if(audioOutput->IsPlaying()!=areAnyAudioStreamsEnabled){
-			if(areAnyAudioStreamsEnabled)
-				audioOutput->Start();
-			else
-				audioOutput->Stop();
-		}
-	}
-}
-
-#pragma mark - Bandwidth management
-
-void VoIPController::UpdateAudioBitrateLimit(){
-	if(encoder){
-		if(dataSavingMode || dataSavingRequestedByPeer){
-			maxBitrate=maxAudioBitrateSaving;
-			encoder->SetBitrate(initAudioBitrateSaving);
-		}else if(networkType==NET_TYPE_GPRS){
-			maxBitrate=maxAudioBitrateGPRS;
-			encoder->SetBitrate(initAudioBitrateGPRS);
-		}else if(networkType==NET_TYPE_EDGE){
-			maxBitrate=maxAudioBitrateEDGE;
-			encoder->SetBitrate(initAudioBitrateEDGE);
-		}else{
-			maxBitrate=maxAudioBitrate;
-			encoder->SetBitrate(initAudioBitrate);
-		}
-		encoder->SetVadMode(dataSavingMode || dataSavingRequestedByPeer);
-		if(echoCanceller)
-			echoCanceller->SetVoiceDetectionEnabled(dataSavingMode || dataSavingRequestedByPeer);
-	}
-}
-
-void VoIPController::UpdateDataSavingState(){
-	if(config.dataSaving==DATA_SAVING_ALWAYS){
-		dataSavingMode=true;
-	}else if(config.dataSaving==DATA_SAVING_MOBILE){
-		dataSavingMode=networkType==NET_TYPE_GPRS || networkType==NET_TYPE_EDGE ||
-					   networkType==NET_TYPE_3G || networkType==NET_TYPE_HSPA || networkType==NET_TYPE_LTE || networkType==NET_TYPE_OTHER_MOBILE;
-	}else{
-		dataSavingMode=false;
-	}
-	LOGI("update data saving mode, config %d, enabled %d, reqd by peer %d", config.dataSaving, dataSavingMode, dataSavingRequestedByPeer);
-}
-
-#pragma mark - Networking & crypto
-
-uint32_t VoIPController::GenerateOutSeq(){
-	return seq++;
-}
-
-void VoIPController::WritePacketHeader(uint32_t pseq, BufferOutputStream *s, unsigned char type, uint32_t length){
-	uint32_t acks=0;
-	int i;
-	for(i=0;i<32;i++){
-		if(recvPacketTimes[i]>0)
-			acks|=1;
-		if(i<31)
-			acks<<=1;
-	}
-
-	if(peerVersion>=8 || (!peerVersion && connectionMaxLayer>=92)){
-		s->WriteByte(type);
-		s->WriteInt32(lastRemoteSeq);
-		s->WriteInt32(pseq);
-		s->WriteInt32(acks);
-		MutexGuard m(queuedPacketsMutex);
-		unsigned char flags;
-		if(currentExtras.empty()){
-			flags=0;
-		}else{
-			flags=XPFLAG_HAS_EXTRA;
-		}
-
-		shared_ptr<Stream> videoStream=GetStreamByType(STREAM_TYPE_VIDEO, false);
-		if(peerVersion>=9 && videoStream && videoStream->enabled)
-			flags |= XPFLAG_HAS_RECV_TS;
-
-		s->WriteByte(flags);
-
-		if(!currentExtras.empty()){
-			s->WriteByte(static_cast<unsigned char>(currentExtras.size()));
-			for(vector<UnacknowledgedExtraData>::iterator x=currentExtras.begin(); x!=currentExtras.end(); ++x){
-				LOGV("Writing extra into header: type %u, length %lu", x->type, x->data.Length());
-				assert(x->data.Length()<=254);
-				s->WriteByte(static_cast<unsigned char>(x->data.Length()+1));
-				s->WriteByte(x->type);
-				s->WriteBytes(*x->data, x->data.Length());
-				if(x->firstContainingSeq==0)
-					x->firstContainingSeq=pseq;
-			}
-		}
-		if(peerVersion>=9 && videoStream && videoStream->enabled){
-			s->WriteInt32((uint32_t)((lastRecvPacketTime-connectionInitTime)*1000.0));
-		}
-	}else{
-		if(state==STATE_WAIT_INIT || state==STATE_WAIT_INIT_ACK){
-			s->WriteInt32(TLID_DECRYPTED_AUDIO_BLOCK);
-			int64_t randomID;
-			crypto.rand_bytes((uint8_t *) &randomID, 8);
-			s->WriteInt64(randomID);
-			unsigned char randBytes[7];
-			crypto.rand_bytes(randBytes, 7);
-			s->WriteByte(7);
-			s->WriteBytes(randBytes, 7);
-			uint32_t pflags=PFLAG_HAS_RECENT_RECV | PFLAG_HAS_SEQ;
-			if(length>0)
-				pflags|=PFLAG_HAS_DATA;
-			if(state==STATE_WAIT_INIT || state==STATE_WAIT_INIT_ACK){
-				pflags|=PFLAG_HAS_CALL_ID | PFLAG_HAS_PROTO;
-			}
-			pflags|=((uint32_t) type) << 24;
-			s->WriteInt32(pflags);
-
-			if(pflags & PFLAG_HAS_CALL_ID){
-				s->WriteBytes(callID, 16);
-			}
-			s->WriteInt32(lastRemoteSeq);
-			s->WriteInt32(pseq);
-			s->WriteInt32(acks);
-			if(pflags & PFLAG_HAS_PROTO){
-				s->WriteInt32(PROTOCOL_NAME);
-			}
-			if(length>0){
-				if(length<=253){
-					s->WriteByte((unsigned char) length);
-				}else{
-					s->WriteByte(254);
-					s->WriteByte((unsigned char) (length & 0xFF));
-					s->WriteByte((unsigned char) ((length >> 8) & 0xFF));
-					s->WriteByte((unsigned char) ((length >> 16) & 0xFF));
-				}
-			}
-		}else{
-			s->WriteInt32(TLID_SIMPLE_AUDIO_BLOCK);
-			int64_t randomID;
-			crypto.rand_bytes((uint8_t *) &randomID, 8);
-			s->WriteInt64(randomID);
-			unsigned char randBytes[7];
-			crypto.rand_bytes(randBytes, 7);
-			s->WriteByte(7);
-			s->WriteBytes(randBytes, 7);
-			uint32_t lenWithHeader=length+13;
-			if(lenWithHeader>0){
-				if(lenWithHeader<=253){
-					s->WriteByte((unsigned char) lenWithHeader);
-				}else{
-					s->WriteByte(254);
-					s->WriteByte((unsigned char) (lenWithHeader & 0xFF));
-					s->WriteByte((unsigned char) ((lenWithHeader >> 8) & 0xFF));
-					s->WriteByte((unsigned char) ((lenWithHeader >> 16) & 0xFF));
-				}
-			}
-			s->WriteByte(type);
-			s->WriteInt32(lastRemoteSeq);
-			s->WriteInt32(pseq);
-			s->WriteInt32(acks);
-			if(peerVersion>=6){
-				MutexGuard m(queuedPacketsMutex);
-				if(currentExtras.empty()){
-					s->WriteByte(0);
-				}else{
-					s->WriteByte(XPFLAG_HAS_EXTRA);
-					s->WriteByte(static_cast<unsigned char>(currentExtras.size()));
-					for(vector<UnacknowledgedExtraData>::iterator x=currentExtras.begin(); x!=currentExtras.end(); ++x){
-						LOGV("Writing extra into header: type %u, length %lu", x->type, x->data.Length());
-						assert(x->data.Length()<=254);
-						s->WriteByte(static_cast<unsigned char>(x->data.Length()+1));
-						s->WriteByte(x->type);
-						s->WriteBytes(*x->data, x->data.Length());
-						if(x->firstContainingSeq==0)
-							x->firstContainingSeq=pseq;
-					}
-				}
-			}
-		}
-	}
-
-
-	MutexGuard m(queuedPacketsMutex);
-	recentOutgoingPackets.push_back(RecentOutgoingPacket{
-			pseq,
-			0,
-			GetCurrentTime(),
-			0,
-			type,
-			length
-	});
-	while(recentOutgoingPackets.size()>MAX_RECENT_PACKETS){
-		recentOutgoingPackets.erase(recentOutgoingPackets.begin());
-	}
-	lastSentSeq=pseq;
-	//LOGI("packet header size %d", s->GetLength());
-}
-
-
-
-void VoIPController::SendInit(){
-	{
-		MutexGuard m(endpointsMutex);
-		uint32_t initSeq=GenerateOutSeq();
-		for(pair<const int64_t, Endpoint>& _e:endpoints){
-			Endpoint& e=_e.second;
-			if(e.type==Endpoint::Type::TCP_RELAY && !useTCP)
-				continue;
-			BufferOutputStream out(1024);
-			out.WriteInt32(PROTOCOL_VERSION);
-			out.WriteInt32(MIN_PROTOCOL_VERSION);
-			uint32_t flags=0;
-			if(config.enableCallUpgrade)
-				flags|=INIT_FLAG_GROUP_CALLS_SUPPORTED;
-			if(config.enableVideoReceive)
-				flags|=INIT_FLAG_VIDEO_RECV_SUPPORTED;
-			if(config.enableVideoSend)
-				flags|=INIT_FLAG_VIDEO_SEND_SUPPORTED;
-			if(dataSavingMode)
-				flags|=INIT_FLAG_DATA_SAVING_ENABLED;
-			out.WriteInt32(flags);
-			if(connectionMaxLayer<74){
-				out.WriteByte(2); // audio codecs count
-				out.WriteByte(CODEC_OPUS_OLD);
-				out.WriteByte(0);
-				out.WriteByte(0);
-				out.WriteByte(0);
-				out.WriteInt32(CODEC_OPUS);
-				out.WriteByte(0); // video codecs count (decode)
-				out.WriteByte(0); // video codecs count (encode)
-			}else{
-				out.WriteByte(1);
-				out.WriteInt32(CODEC_OPUS);
-				vector<uint32_t> decoders=config.enableVideoReceive ? video::VideoRenderer::GetAvailableDecoders() : vector<uint32_t>();
-				vector<uint32_t> encoders=config.enableVideoSend ? video::VideoSource::GetAvailableEncoders() : vector<uint32_t>();
-				out.WriteByte((unsigned char)decoders.size());
-				for(uint32_t id:decoders){
-					out.WriteInt32(id);
-				}
-				if(connectionMaxLayer>=92)
-					out.WriteByte((unsigned char)video::VideoRenderer::GetMaximumResolution());
-				else
-					out.WriteByte(0);
-				/*out.WriteByte((unsigned char)encoders.size());
-				for(uint32_t id:encoders){
-					out.WriteInt32(id);
-				}*/
-			}
-			SendOrEnqueuePacket(PendingOutgoingPacket{
-					/*.seq=*/initSeq,
-					/*.type=*/PKT_INIT,
-					/*.len=*/out.GetLength(),
-					/*.data=*/Buffer(move(out)),
-					/*.endpoint=*/e.id
-			});
-		}
-	}
-	if(state==STATE_WAIT_INIT)
-		SetState(STATE_WAIT_INIT_ACK);
-	messageThread.Post([this]{
-		if(state==STATE_WAIT_INIT_ACK){
-			SendInit();
-		}
-	}, 0.5);
-}
-
-void VoIPController::InitUDPProxy(){
-	if(realUdpSocket!=udpSocket){
-		udpSocket->Close();
-		delete udpSocket;
-		udpSocket=realUdpSocket;
-	}
-	char sbuf[128];
-	snprintf(sbuf, sizeof(sbuf), "%s:%u", proxyAddress.c_str(), proxyPort);
-	string proxyHostPort(sbuf);
-	if(proxyHostPort==lastTestedProxyServer && !proxySupportsUDP){
-		LOGI("Proxy does not support UDP - using UDP directly instead");
-		ResetUdpAvailability();
-		return;
-	}
-	
-	NetworkSocket* tcp=NetworkSocket::Create(PROTO_TCP);
-	tcp->Connect(resolvedProxyAddress, proxyPort);
-	
-	vector<NetworkSocket*> writeSockets;
-	vector<NetworkSocket*> readSockets;
-	vector<NetworkSocket*> errorSockets;
-	
-	while(!tcp->IsFailed() && !tcp->IsReadyToSend()){
-		writeSockets.push_back(tcp);
-		if(!NetworkSocket::Select(readSockets, writeSockets, errorSockets, selectCanceller)){
-			LOGW("Select canceled while waiting for proxy control socket to connect");
-			delete tcp;
-			return;
-		}
-	}
-	LOGV("UDP proxy control socket ready to send");
-    NetworkSocketSOCKS5Proxy* udpProxy=new NetworkSocketSOCKS5Proxy(tcp, realUdpSocket, proxyUsername, proxyPassword);
-	udpProxy->OnReadyToSend();
-	writeSockets.clear();
-	while(!udpProxy->IsFailed() && !tcp->IsFailed() && !udpProxy->IsReadyToSend()){
-		readSockets.clear();
-		errorSockets.clear();
-		readSockets.push_back(tcp);
-		errorSockets.push_back(tcp);
-		if(!NetworkSocket::Select(readSockets, writeSockets, errorSockets, selectCanceller)){
-			LOGW("Select canceled while waiting for UDP proxy to initialize");
-			delete udpProxy;
-			return;
-		}
-		if(!readSockets.empty())
-			udpProxy->OnReadyToReceive();
-	}
-	LOGV("UDP proxy initialized");
-
-	if(udpProxy->IsFailed()){
-		udpProxy->Close();
-		delete udpProxy;
-		proxySupportsUDP=false;
-	}else{
-		udpSocket=udpProxy;
-	}
-	ResetUdpAvailability();
-}
-
-void VoIPController::RunRecvThread(){
-	LOGI("Receive thread starting");
-	Buffer buffer(1500);
-	NetworkPacket packet={0};
-	if(proxyProtocol==PROXY_SOCKS5){
-		resolvedProxyAddress=NetworkSocket::ResolveDomainName(proxyAddress);
-		if(!resolvedProxyAddress){
-			LOGW("Error resolving proxy address %s", proxyAddress.c_str());
-			SetState(STATE_FAILED);
-			return;
-		}
-	}else{
-		udpConnectivityState=UDP_PING_PENDING;
-		udpPingTimeoutID=messageThread.Post(std::bind(&VoIPController::SendUdpPings, this), 0.0, 0.5);
-	}
-	while(runReceiver){
-		
-		if(proxyProtocol==PROXY_SOCKS5 && needReInitUdpProxy){
-			InitUDPProxy();
-			needReInitUdpProxy=false;
-		}
-		
-		packet.data=*buffer;
-		packet.length=buffer.Length();
-
-		vector<NetworkSocket*> readSockets;
-		vector<NetworkSocket*> errorSockets;
-		vector<NetworkSocket*> writeSockets;
-		readSockets.push_back(udpSocket);
-		errorSockets.push_back(realUdpSocket);
-		if(!realUdpSocket->IsReadyToSend())
-			writeSockets.push_back(realUdpSocket);
-		
-		{
-			MutexGuard m(endpointsMutex);
-			for(pair<const int64_t, Endpoint>& _e:endpoints){
-				const Endpoint& e=_e.second;
-				if(e.type==Endpoint::Type::TCP_RELAY){
-					if(e.socket){
-						readSockets.push_back(e.socket);
-						errorSockets.push_back(e.socket);
-						if(!e.socket->IsReadyToSend()){
-							NetworkSocketSOCKS5Proxy* proxy=dynamic_cast<NetworkSocketSOCKS5Proxy*>(e.socket);
-							if(!proxy || proxy->NeedSelectForSending())
-    							writeSockets.push_back(e.socket);
-						}
-					}
-				}
-			}
-		}
-
-		{
-			MutexGuard m(socketSelectMutex);
-			bool selRes=NetworkSocket::Select(readSockets, writeSockets, errorSockets, selectCanceller);
-			if(!selRes){
-				LOGV("Select canceled");
-				continue;
-			}
-		}
-		if(!runReceiver)
-			return;
-
-		if(!errorSockets.empty()){
-			if(find(errorSockets.begin(), errorSockets.end(), realUdpSocket)!=errorSockets.end()){
-				LOGW("UDP socket failed");
-				SetState(STATE_FAILED);
-				return;
-			}
-			MutexGuard m(endpointsMutex);
-			for(NetworkSocket*& socket:errorSockets){
-				for(pair<const int64_t, Endpoint>& _e:endpoints){
-					Endpoint& e=_e.second;
-					if(e.socket && e.socket==socket){
-						e.socket->Close();
-						delete e.socket;
-						e.socket=NULL;
-						LOGI("Closing failed TCP socket for %s:%u", e.GetAddress().ToString().c_str(), e.port);
-					}
-				}
-			}
-			continue;
-		}
-
-		for(NetworkSocket*& socket:readSockets){
-			//while(packet.length){
-			packet.length=1500;
-			socket->Receive(&packet);
-			if(!packet.address){
-				LOGE("Packet has null address. This shouldn't happen.");
-				continue;
-			}
-			size_t len=packet.length;
-			if(!len){
-				LOGE("Packet has zero length.");
-				continue;
-			}
-			//LOGV("Received %d bytes from %s:%d at %.5lf", len, packet.address->ToString().c_str(), packet.port, GetCurrentTime());
-			int64_t srcEndpointID=0;
-
-			IPv4Address *src4=dynamic_cast<IPv4Address *>(packet.address);
-			if(src4){
-				MutexGuard m(endpointsMutex);
-				for(pair<const int64_t, Endpoint>& _e:endpoints){
-					const Endpoint& e=_e.second;
-					if(e.address==*src4 && e.port==packet.port){
-						if((e.type!=Endpoint::Type::TCP_RELAY && packet.protocol==PROTO_UDP) || (e.type==Endpoint::Type::TCP_RELAY && packet.protocol==PROTO_TCP)){
-							srcEndpointID=e.id;
-							break;
-						}
-					}
-				}
-				if(!srcEndpointID && packet.protocol==PROTO_UDP){
-					try{
-						Endpoint &p2p=GetEndpointByType(Endpoint::Type::UDP_P2P_INET);
-						if(p2p.rtts[0]==0.0 && p2p.address.PrefixMatches(24, *packet.address)){
-							LOGD("Packet source matches p2p endpoint partially: %s:%u", packet.address->ToString().c_str(), packet.port);
-							srcEndpointID=p2p.id;
-						}
-					}catch(out_of_range& ex){}
-				}
-			}else{
-				IPv6Address *src6=dynamic_cast<IPv6Address *>(packet.address);
-				if(src6){
-					MutexGuard m(endpointsMutex);
-					for(pair<const int64_t, Endpoint> &_e:endpoints){
-						const Endpoint& e=_e.second;
-						if(e.v6address==*src6 && e.port==packet.port && e.IsIPv6Only()){
-							if((e.type!=Endpoint::Type::TCP_RELAY && packet.protocol==PROTO_UDP) || (e.type==Endpoint::Type::TCP_RELAY && packet.protocol==PROTO_TCP)){
-								srcEndpointID=e.id;
-								break;
-							}
-						}
-					}
-				}
-			}
-
-			if(!srcEndpointID){
-				LOGW("Received a packet from unknown source %s:%u", packet.address->ToString().c_str(), packet.port);
-				continue;
-			}
-			if(len<=0){
-				//LOGW("error receiving: %d / %s", errno, strerror(errno));
-				continue;
-			}
-			if(IS_MOBILE_NETWORK(networkType))
-				stats.bytesRecvdMobile+=(uint64_t) len;
-			else
-				stats.bytesRecvdWifi+=(uint64_t) len;
-			try{
-				ProcessIncomingPacket(packet, endpoints.at(srcEndpointID));
-			}catch(out_of_range& x){
-				LOGW("Error parsing packet: %s", x.what());
-			}
-			//}
-		}
-
-		for(vector<PendingOutgoingPacket>::iterator opkt=sendQueue.begin();opkt!=sendQueue.end();){
-			Endpoint* endpoint=GetEndpointForPacket(*opkt);
-			if(!endpoint){
-				opkt=sendQueue.erase(opkt);
-				LOGE("SendQueue contained packet for nonexistent endpoint");
-				continue;
-			}
-			bool canSend;
-			if(endpoint->type!=Endpoint::Type::TCP_RELAY)
-				canSend=realUdpSocket->IsReadyToSend();
-			else
-				canSend=endpoint->socket && endpoint->socket->IsReadyToSend();
-			if(canSend){
-				LOGI("Sending queued packet");
-				SendOrEnqueuePacket(move(*opkt), false);
-				opkt=sendQueue.erase(opkt);
-			}else{
-				++opkt;
-			}
-		}
-	}
-	LOGI("=== recv thread exiting ===");
-}
-
-bool VoIPController::WasOutgoingPacketAcknowledged(uint32_t seq){
-	RecentOutgoingPacket* pkt=GetRecentOutgoingPacket(seq);
-	if(!pkt)
-		return false;
-	return pkt->ackTime!=0.0;
-}
-
-VoIPController::RecentOutgoingPacket *VoIPController::GetRecentOutgoingPacket(uint32_t seq){
-	for(RecentOutgoingPacket& opkt:recentOutgoingPackets){
-		if(opkt.seq==seq){
-			return &opkt;
-		}
-	}
-	return NULL;
-}
-
-void VoIPController::ProcessIncomingPacket(NetworkPacket &packet, Endpoint& srcEndpoint){
-	unsigned char *buffer=packet.data;
-	size_t len=packet.length;
-	BufferInputStream in(buffer, (size_t) len);
-	bool hasPeerTag=false;
-	if(peerVersion<9 || srcEndpoint.type==Endpoint::Type::UDP_RELAY || srcEndpoint.type==Endpoint::Type::TCP_RELAY){
-		if(memcmp(buffer, srcEndpoint.type==Endpoint::Type::UDP_RELAY || srcEndpoint.type==Endpoint::Type::TCP_RELAY ? (void *) srcEndpoint.peerTag : (void *) callID, 16)!=0){
-			LOGW("Received packet has wrong peerTag");
-			return;
-		}
-		in.Seek(16);
-		hasPeerTag=true;
-	}
-	if(in.Remaining()>=16 && (srcEndpoint.type==Endpoint::Type::UDP_RELAY || srcEndpoint.type==Endpoint::Type::TCP_RELAY)
-	   && *reinterpret_cast<uint64_t *>(buffer+16)==0xFFFFFFFFFFFFFFFFLL && *reinterpret_cast<uint32_t *>(buffer+24)==0xFFFFFFFF){
-		// relay special request response
-		in.Seek(16+12);
-		uint32_t tlid=(uint32_t) in.ReadInt32();
-
-		if(tlid==TLID_UDP_REFLECTOR_SELF_INFO){
-			if(srcEndpoint.type==Endpoint::Type::UDP_RELAY /*&& udpConnectivityState==UDP_PING_SENT*/ && in.Remaining()>=32){
-				int32_t date=in.ReadInt32();
-				int64_t queryID=in.ReadInt64();
-				unsigned char myIP[16];
-				in.ReadBytes(myIP, 16);
-				int32_t myPort=in.ReadInt32();
-				//udpConnectivityState=UDP_AVAILABLE;
-				LOGV("Received UDP ping reply from %s:%d: date=%d, queryID=%ld, my IP=%s, my port=%d", srcEndpoint.address.ToString().c_str(), srcEndpoint.port, date, (long int) queryID, IPv4Address(*reinterpret_cast<uint32_t *>(myIP+12)).ToString().c_str(), myPort);
-				srcEndpoint.udpPongCount++;
-				if(srcEndpoint.IsIPv6Only() && !didSendIPv6Endpoint){
-					IPv6Address realAddr(myIP);
-					if(realAddr==myIPv6){
-						LOGI("Public IPv6 matches local address");
-						useIPv6=true;
-						if(allowP2p){
-							didSendIPv6Endpoint=true;
-							BufferOutputStream o(18);
-							o.WriteBytes(myIP, 16);
-							o.WriteInt16(udpSocket->GetLocalPort());
-							Buffer b(move(o));
-							SendExtra(b, EXTRA_TYPE_IPV6_ENDPOINT);
-						}
-					}
-				}
-			}
-		}else if(tlid==TLID_UDP_REFLECTOR_PEER_INFO){
-			if(in.Remaining()>=16){
-				MutexGuard _m(endpointsMutex);
-				uint32_t myAddr=(uint32_t) in.ReadInt32();
-				uint32_t myPort=(uint32_t) in.ReadInt32();
-				uint32_t peerAddr=(uint32_t) in.ReadInt32();
-				uint32_t peerPort=(uint32_t) in.ReadInt32();
-
-				constexpr int64_t p2pID=(int64_t) (FOURCC('P', '2', 'P', '4')) << 32;
-				constexpr int64_t lanID=(int64_t) (FOURCC('L', 'A', 'N', '4')) << 32;
-
-				if(currentEndpoint==p2pID || currentEndpoint==lanID)
-					currentEndpoint=preferredRelay;
-
-				endpoints.erase(lanID);
-
-				IPv4Address _peerAddr(peerAddr);
-				IPv6Address emptyV6(string("::0"));
-				unsigned char peerTag[16];
-				LOGW("Received reflector peer info, my=%s:%u, peer=%s:%u", IPv4Address(myAddr).ToString().c_str(), myPort, IPv4Address(peerAddr).ToString().c_str(), peerPort);
-				if(waitingForRelayPeerInfo){
-					Endpoint p2p(p2pID, (uint16_t) peerPort, _peerAddr, emptyV6, Endpoint::Type::UDP_P2P_INET, peerTag);
-					endpoints[p2pID]=p2p;
-					if(myAddr==peerAddr){
-						LOGW("Detected LAN");
-						IPv4Address lanAddr(0);
-						udpSocket->GetLocalInterfaceInfo(&lanAddr, NULL);
-
-						BufferOutputStream pkt(8);
-						pkt.WriteInt32(lanAddr.GetAddress());
-						pkt.WriteInt32(udpSocket->GetLocalPort());
-						if(peerVersion<6){
-							SendPacketReliably(PKT_LAN_ENDPOINT, pkt.GetBuffer(), pkt.GetLength(), 0.5, 10);
-						}else{
-							Buffer buf(move(pkt));
-							SendExtra(buf, EXTRA_TYPE_LAN_ENDPOINT);
-						}
-					}
-					waitingForRelayPeerInfo=false;
-				}
-			}
-		}else{
-			LOGV("Received relay response with unknown tl id: 0x%08X", tlid);
-		}
-		return;
-	}
-	if(in.Remaining()<40){
-		LOGV("Received packet is too small");
-		return;
-	}
-
-	bool retryWith2=false;
-	size_t innerLen=0;
-	bool shortFormat=peerVersion>=8 || (!peerVersion && connectionMaxLayer>=92);
-
-	if(!useMTProto2){
-		unsigned char fingerprint[8], msgHash[16];
-		in.ReadBytes(fingerprint, 8);
-		in.ReadBytes(msgHash, 16);
-		unsigned char key[32], iv[32];
-		KDF(msgHash, isOutgoing ? 8 : 0, key, iv);
-		unsigned char aesOut[MSC_STACK_FALLBACK(in.Remaining(), 1500)];
-		if(in.Remaining()>sizeof(aesOut))
-			return;
-		crypto.aes_ige_decrypt((unsigned char *) buffer+in.GetOffset(), aesOut, in.Remaining(), key, iv);
-		BufferInputStream _in(aesOut, in.Remaining());
-		unsigned char sha[SHA1_LENGTH];
-		uint32_t _len=(uint32_t) _in.ReadInt32();
-		if(_len>_in.Remaining())
-			_len=(uint32_t) _in.Remaining();
-		crypto.sha1((uint8_t *) (aesOut), (size_t) (_len+4), sha);
-		if(memcmp(msgHash, sha+(SHA1_LENGTH-16), 16)!=0){
-			LOGW("Received packet has wrong hash after decryption");
-			if(state==STATE_WAIT_INIT || state==STATE_WAIT_INIT_ACK)
-				retryWith2=true;
-			else
-				return;
-		}else{
-			memcpy(buffer+in.GetOffset(), aesOut, in.Remaining());
-			in.ReadInt32();
-		}
-	}
-
-	if(useMTProto2 || retryWith2){
-		if(hasPeerTag)
-			in.Seek(16); // peer tag
-
-		unsigned char fingerprint[8], msgKey[16];
-		if(!shortFormat){
-			in.ReadBytes(fingerprint, 8);
-			if(memcmp(fingerprint, keyFingerprint, 8)!=0){
-				LOGW("Received packet has wrong key fingerprint");
-				return;
-			}
-		}
-		in.ReadBytes(msgKey, 16);
-
-		unsigned char decrypted[1500];
-		unsigned char aesKey[32], aesIv[32];
-		KDF2(msgKey, isOutgoing ? 8 : 0, aesKey, aesIv);
-		size_t decryptedLen=in.Remaining();
-		if(decryptedLen>sizeof(decrypted))
-			return;
-		if(decryptedLen%16!=0){
-			LOGW("wrong decrypted length");
-			return;
-		}
-
-		crypto.aes_ige_decrypt(packet.data+in.GetOffset(), decrypted, decryptedLen, aesKey, aesIv);
-
-		in=BufferInputStream(decrypted, decryptedLen);
-		//LOGD("received packet length: %d", in.ReadInt32());
-		size_t sizeSize=shortFormat ? 0 : 4;
-
-		BufferOutputStream buf(decryptedLen+32);
-		size_t x=isOutgoing ? 8 : 0;
-		buf.WriteBytes(encryptionKey+88+x, 32);
-		buf.WriteBytes(decrypted+sizeSize, decryptedLen-sizeSize);
-		unsigned char msgKeyLarge[32];
-		crypto.sha256(buf.GetBuffer(), buf.GetLength(), msgKeyLarge);
-
-		if(memcmp(msgKey, msgKeyLarge+8, 16)!=0){
-			LOGW("Received packet has wrong hash");
-			return;
-		}
-
-		innerLen=(uint32_t) (shortFormat ? in.ReadInt16() : in.ReadInt32());
-		if(innerLen>decryptedLen-sizeSize){
-			LOGW("Received packet has wrong inner length (%d with total of %u)", (int) innerLen, (unsigned int) decryptedLen);
-			return;
-		}
-		if(decryptedLen-innerLen<(shortFormat ? 16 : 12)){
-			LOGW("Received packet has too little padding (%u)", (unsigned int) (decryptedLen-innerLen));
-			return;
-		}
-		memcpy(buffer, decrypted+(shortFormat ? 2 : 4), innerLen);
-		in=BufferInputStream(buffer, (size_t) innerLen);
-		if(retryWith2){
-			LOGD("Successfully decrypted packet in MTProto2.0 fallback, upgrading");
-			useMTProto2=true;
-		}
-	}
-
-	lastRecvPacketTime=GetCurrentTime();
-
-	if(state==STATE_RECONNECTING){
-		LOGI("Received a valid packet while reconnecting - setting state to established");
-		SetState(STATE_ESTABLISHED);
-	}
-
-	if(srcEndpoint.type==Endpoint::Type::UDP_P2P_INET && !srcEndpoint.IsIPv6Only()){
-		if(srcEndpoint.port!=packet.port || srcEndpoint.address!=*packet.address){
-			IPv4Address *v4=dynamic_cast<IPv4Address *>(packet.address);
-			if(v4){
-				LOGI("Incoming packet was decrypted successfully, changing P2P endpoint to %s:%u", packet.address->ToString().c_str(), packet.port);
-				srcEndpoint.address=*v4;
-				srcEndpoint.port=packet.port;
-			}
-		}
-	}
-
-	/*decryptedAudioBlock random_id:long random_bytes:string flags:# voice_call_id:flags.2?int128 in_seq_no:flags.4?int out_seq_no:flags.4?int
- * recent_received_mask:flags.5?int proto:flags.3?int extra:flags.1?string raw_data:flags.0?string = DecryptedAudioBlock
-simpleAudioBlock random_id:long random_bytes:string raw_data:string = DecryptedAudioBlock;
-*/
-	uint32_t ackId, pseq, acks;
-	unsigned char type, pflags;
-	size_t packetInnerLen=0;
-	if(shortFormat){
-		type=in.ReadByte();
-		ackId=(uint32_t) in.ReadInt32();
-		pseq=(uint32_t) in.ReadInt32();
-		acks=(uint32_t) in.ReadInt32();
-		pflags=in.ReadByte();
-		packetInnerLen=innerLen-14;
-	}else{
-		uint32_t tlid=(uint32_t) in.ReadInt32();
-		if(tlid==TLID_DECRYPTED_AUDIO_BLOCK){
-			in.ReadInt64(); // random id
-			uint32_t randLen=(uint32_t) in.ReadTlLength();
-			in.Seek(in.GetOffset()+randLen+pad4(randLen));
-			uint32_t flags=(uint32_t) in.ReadInt32();
-			type=(unsigned char) ((flags >> 24) & 0xFF);
-			if(!(flags & PFLAG_HAS_SEQ && flags & PFLAG_HAS_RECENT_RECV)){
-				LOGW("Received packet doesn't have PFLAG_HAS_SEQ, PFLAG_HAS_RECENT_RECV, or both");
-
-				return;
-			}
-			if(flags & PFLAG_HAS_CALL_ID){
-				unsigned char pktCallID[16];
-				in.ReadBytes(pktCallID, 16);
-				if(memcmp(pktCallID, callID, 16)!=0){
-					LOGW("Received packet has wrong call id");
-
-					lastError=ERROR_UNKNOWN;
-					SetState(STATE_FAILED);
-					return;
-				}
-			}
-			ackId=(uint32_t) in.ReadInt32();
-			pseq=(uint32_t) in.ReadInt32();
-			acks=(uint32_t) in.ReadInt32();
-			if(flags & PFLAG_HAS_PROTO){
-				uint32_t proto=(uint32_t) in.ReadInt32();
-				if(proto!=PROTOCOL_NAME){
-					LOGW("Received packet uses wrong protocol");
-
-					lastError=ERROR_INCOMPATIBLE;
-					SetState(STATE_FAILED);
-					return;
-				}
-			}
-			if(flags & PFLAG_HAS_EXTRA){
-				uint32_t extraLen=(uint32_t) in.ReadTlLength();
-				in.Seek(in.GetOffset()+extraLen+pad4(extraLen));
-			}
-			if(flags & PFLAG_HAS_DATA){
-				packetInnerLen=in.ReadTlLength();
-			}
-			pflags=0;
-		}else if(tlid==TLID_SIMPLE_AUDIO_BLOCK){
-			in.ReadInt64(); // random id
-			uint32_t randLen=(uint32_t) in.ReadTlLength();
-			in.Seek(in.GetOffset()+randLen+pad4(randLen));
-			packetInnerLen=in.ReadTlLength();
-			type=in.ReadByte();
-			ackId=(uint32_t) in.ReadInt32();
-			pseq=(uint32_t) in.ReadInt32();
-			acks=(uint32_t) in.ReadInt32();
-			if(peerVersion>=6)
-				pflags=in.ReadByte();
-			else
-				pflags=0;
-		}else{
-			LOGW("Received a packet of unknown type %08X", tlid);
-
-			return;
-		}
-	}
-	packetsReceived++;
-	if(seqgt(pseq, lastRemoteSeq)){
-		uint32_t diff=pseq-lastRemoteSeq;
-		if(diff>31){
-			memset(recvPacketTimes, 0, 32*sizeof(double));
-		}else{
-			memmove(&recvPacketTimes[diff], recvPacketTimes, (32-diff)*sizeof(double));
-			if(diff>1){
-				memset(recvPacketTimes, 0, diff*sizeof(double));
-			}
-			recvPacketTimes[0]=GetCurrentTime();
-		}
-		lastRemoteSeq=pseq;
-	}else if(!seqgt(pseq, lastRemoteSeq) && lastRemoteSeq-pseq<32){
-		if(recvPacketTimes[lastRemoteSeq-pseq]!=0){
-			LOGW("Received duplicated packet for seq %u", pseq);
-
-			return;
-		}
-		recvPacketTimes[lastRemoteSeq-pseq]=GetCurrentTime();
-	}else if(lastRemoteSeq-pseq>=32){
-		LOGW("Packet %u is out of order and too late", pseq);
-
-		return;
-	}
-	bool didAckNewPackets=false;
-	unsigned int newlyAckedVideoBytes=0;
-	if(seqgt(ackId, lastRemoteAckSeq)){
-		didAckNewPackets=true;
-
-		MutexGuard _m(queuedPacketsMutex);
-		if(waitingForAcks && lastRemoteAckSeq>=firstSentPing){
-			rttHistory.Reset();
-			waitingForAcks=false;
-			dontSendPackets=10;
-			messageThread.Post([this]{
-				dontSendPackets=0;
-			}, 1.0);
-			LOGI("resuming sending");
-		}
-		lastRemoteAckSeq=ackId;
-		conctl->PacketAcknowledged(ackId);
-		unsigned int i;
-		for(i=0;i<31;i++){
-			for(vector<RecentOutgoingPacket>::iterator itr=recentOutgoingPackets.begin();itr!=recentOutgoingPackets.end();++itr){
-				if(itr->ackTime!=0)
-					continue;
-				if(((acks >> (31-i)) & 1) && itr->seq==ackId-(i+1)){
-					itr->ackTime=GetCurrentTime();
-					conctl->PacketAcknowledged(itr->seq);
-				}
-			}
-			/*if(remoteAcks[i+1]==0){
-				if((acks >> (31-i)) & 1){
-					remoteAcks[i+1]=GetCurrentTime();
-					conctl->PacketAcknowledged(ackId-(i+1));
-				}
-			}*/
-		}
-		for(i=0;i<queuedPackets.size();i++){
-			QueuedPacket& qp=queuedPackets[i];
-			int j;
-			bool didAck=false;
-			for(j=0;j<16;j++){
-				LOGD("queued packet %u, seq %u=%u", i, j, qp.seqs[j]);
-				if(qp.seqs[j]==0)
-					break;
-				int remoteAcksIndex=lastRemoteAckSeq-qp.seqs[j];
-				//LOGV("remote acks index %u, value %f", remoteAcksIndex, remoteAcksIndex>=0 && remoteAcksIndex<32 ? remoteAcks[remoteAcksIndex] : -1);
-				if(seqgt(lastRemoteAckSeq, qp.seqs[j]) && remoteAcksIndex>=0 && remoteAcksIndex<32){
-					for(RecentOutgoingPacket& opkt:recentOutgoingPackets){
-						if(opkt.seq==qp.seqs[j] && opkt.ackTime>0){
-							LOGD("did ack seq %u, removing", qp.seqs[j]);
-							didAck=true;
-							break;
-						}
-					}
-					if(didAck)
-						break;
-				}
-			}
-			if(didAck){
-				queuedPackets.erase(queuedPackets.begin()+i);
-				i--;
-				continue;
-			}
-		}
-		for(vector<UnacknowledgedExtraData>::iterator x=currentExtras.begin();x!=currentExtras.end();){
-			if(x->firstContainingSeq!=0 && (lastRemoteAckSeq==x->firstContainingSeq || seqgt(lastRemoteAckSeq, x->firstContainingSeq))){
-				LOGV("Peer acknowledged extra type %u length %lu", x->type, x->data.Length());
-				ProcessAcknowledgedOutgoingExtra(*x);
-				x=currentExtras.erase(x);
-				continue;
-			}
-			++x;
-		}
-		if(videoSource && !videoKeyframeRequested){
-			// video frames are stored in sentVideoFrames in order of increasing numbers
-			// so if a frame (or part of it) is acknowledged but isn't sentVideoFrames[0], we know there was a packet loss
-			MutexGuard m(sentVideoFramesMutex);
-			for(SentVideoFrame& f:sentVideoFrames){
-				for(vector<uint32_t>::iterator s=f.unacknowledgedPackets.begin(); s!=f.unacknowledgedPackets.end();){
-					RecentOutgoingPacket* opkt=GetRecentOutgoingPacket(*s);
-					if(opkt && opkt->ackTime!=0.0){
-						s=f.unacknowledgedPackets.erase(s);
-						newlyAckedVideoBytes+=opkt->size;
-					}else{
-						++s;
-					}
-				}
-			}
-			bool first=true;
-			for(vector<SentVideoFrame>::iterator f=sentVideoFrames.begin();f!=sentVideoFrames.end();){
-				if(f->unacknowledgedPackets.empty() && f->fragmentsInQueue==0){
-					//LOGV("Video frame %u was acknowledged", f->num);
-					if(first){
-						f=sentVideoFrames.erase(f);
-						continue;
-					}else{
-						LOGE("!!!!!!!!!!!!!!11 VIDEO FRAME LOSS DETECTED [1] %u of %u fragments", sentVideoFrames[0].unacknowledgedPackets.size(), sentVideoFrames[0].fragmentCount);
-						videoPacketLossCount++;
-						videoKeyframeRequested=true;
-						videoSource->RequestKeyFrame();
-						break;
-					}
-				}else if(first){
-					first=false;
-				}else if(!first && f->unacknowledgedPackets.size()<f->fragmentCount){
-					LOGE("!!!!!!!!!!!!!!11 VIDEO FRAME LOSS DETECTED [2] %u of %u fragments", f->unacknowledgedPackets.size(), f->fragmentCount);
-					videoPacketLossCount++;
-					videoKeyframeRequested=true;
-					videoSource->RequestKeyFrame();
-					break;
-				}
-				++f;
-			}
-		}
-	}
-
-	Endpoint* _currentEndpoint=&endpoints.at(currentEndpoint);
-	if(srcEndpoint.id!=currentEndpoint && (srcEndpoint.type==Endpoint::Type::UDP_RELAY || srcEndpoint.type==Endpoint::Type::TCP_RELAY) && ((_currentEndpoint->type!=Endpoint::Type::UDP_RELAY && _currentEndpoint->type!=Endpoint::Type::TCP_RELAY) || _currentEndpoint->averageRTT==0)){
-		if(seqgt(lastSentSeq-32, lastRemoteAckSeq)){
-			currentEndpoint=srcEndpoint.id;
-			_currentEndpoint=&srcEndpoint;
-			LOGI("Peer network address probably changed, switching to relay");
-			if(allowP2p)
-				SendPublicEndpointsRequest();
-		}
-	}
-
-	if(pflags & XPFLAG_HAS_EXTRA){
-		unsigned char extraCount=in.ReadByte();
-		for(int i=0;i<extraCount;i++){
-			size_t extraLen=in.ReadByte();
-			Buffer xbuffer(extraLen);
-			in.ReadBytes(*xbuffer, extraLen);
-			ProcessExtraData(xbuffer);
-		}
-	}
-
-	if(pflags & XPFLAG_HAS_RECV_TS){
-		uint32_t recvTS=static_cast<uint32_t>(in.ReadInt32());
-		if(didAckNewPackets){
-			//LOGV("recv ts %u", recvTS);
-            for(RecentOutgoingPacket& opkt:recentOutgoingPackets){
-            	if(opkt.seq==lastRemoteAckSeq){
-                    float sendTime=(float)(opkt.sendTime-connectionInitTime);
-                    float recvTime=(float)recvTS/1000.0f;
-                    float oneWayDelay=recvTime-sendTime;
-                    //LOGV("one-way delay: %f", oneWayDelay);
-                    videoCongestionControl.ProcessAcks(oneWayDelay, newlyAckedVideoBytes, videoPacketLossCount, rttHistory.Average(5));
-            		break;
-            	}
-            }
-		}
-	}
-
-	if(config.logPacketStats){
-		DebugLoggedPacket dpkt={
-				static_cast<int32_t>(pseq),
-				GetCurrentTime()-connectionInitTime,
-				static_cast<int32_t>(packet.length)
-		};
-		debugLoggedPackets.push_back(dpkt);
-		if(debugLoggedPackets.size()>=2500){
-			debugLoggedPackets.erase(debugLoggedPackets.begin(), debugLoggedPackets.begin()+500);
-		}
-	}
-
-#ifdef LOG_PACKETS
-	LOGV("Received: from=%s:%u, seq=%u, length=%u, type=%s", srcEndpoint.GetAddress().ToString().c_str(), srcEndpoint.port, pseq, packet.length, GetPacketTypeString(type).c_str());
-#endif
-
-	//LOGV("acks: %u -> %.2lf, %.2lf, %.2lf, %.2lf, %.2lf, %.2lf, %.2lf, %.2lf", lastRemoteAckSeq, remoteAcks[0], remoteAcks[1], remoteAcks[2], remoteAcks[3], remoteAcks[4], remoteAcks[5], remoteAcks[6], remoteAcks[7]);
-	//LOGD("recv: %u -> %.2lf, %.2lf, %.2lf, %.2lf, %.2lf, %.2lf, %.2lf, %.2lf", lastRemoteSeq, recvPacketTimes[0], recvPacketTimes[1], recvPacketTimes[2], recvPacketTimes[3], recvPacketTimes[4], recvPacketTimes[5], recvPacketTimes[6], recvPacketTimes[7]);
-	//LOGI("RTT = %.3lf", GetAverageRTT());
-	//LOGV("Packet %u type is %d", pseq, type);
-	if(type==PKT_INIT){
-		LOGD("Received init");
-		uint32_t ver=(uint32_t)in.ReadInt32();
-		if(!receivedInit)
-			peerVersion=ver;
-		LOGI("Peer version is %d", peerVersion);
-		uint32_t minVer=(uint32_t) in.ReadInt32();
-		if(minVer>PROTOCOL_VERSION || peerVersion<MIN_PROTOCOL_VERSION){
-			lastError=ERROR_INCOMPATIBLE;
-
-			SetState(STATE_FAILED);
-			return;
-		}
-		uint32_t flags=(uint32_t) in.ReadInt32();
-		if(!receivedInit){
-			if(flags & INIT_FLAG_DATA_SAVING_ENABLED){
-				dataSavingRequestedByPeer=true;
-				UpdateDataSavingState();
-				UpdateAudioBitrateLimit();
-			}
-			if(flags & INIT_FLAG_GROUP_CALLS_SUPPORTED){
-				peerCapabilities|=TGVOIP_PEER_CAP_GROUP_CALLS;
-			}
-			if(flags & INIT_FLAG_VIDEO_RECV_SUPPORTED){
-				peerCapabilities|=TGVOIP_PEER_CAP_VIDEO_DISPLAY;
-			}
-			if(flags & INIT_FLAG_VIDEO_SEND_SUPPORTED){
-				peerCapabilities|=TGVOIP_PEER_CAP_VIDEO_CAPTURE;
-			}
-		}
-
-		unsigned int i;
-		unsigned int numSupportedAudioCodecs=in.ReadByte();
-		for(i=0; i<numSupportedAudioCodecs; i++){
-			if(peerVersion<5)
-				in.ReadByte(); // ignore for now
-			else
-				in.ReadInt32();
-		}
-		if(!receivedInit && ((flags & INIT_FLAG_VIDEO_SEND_SUPPORTED && config.enableVideoReceive) || (flags & INIT_FLAG_VIDEO_RECV_SUPPORTED && config.enableVideoSend))){
-			LOGD("Peer video decoders:");
-			unsigned int numSupportedVideoDecoders=in.ReadByte();
-			for(i=0; i<numSupportedVideoDecoders; i++){
-				uint32_t id=static_cast<uint32_t>(in.ReadInt32());
-				peerVideoDecoders.push_back(id);
-				char* _id=reinterpret_cast<char*>(&id);
-				LOGD("%c%c%c%c", _id[3], _id[2], _id[1], _id[0]);
-			}
-			peerMaxVideoResolution=in.ReadByte();
-
-			SetupOutgoingVideoStream();
-		}
-
-		BufferOutputStream out(1024);
-
-		out.WriteInt32(PROTOCOL_VERSION);
-		out.WriteInt32(MIN_PROTOCOL_VERSION);
-
-		out.WriteByte((unsigned char) outgoingStreams.size());
-		for(vector<shared_ptr<Stream>>::iterator s=outgoingStreams.begin(); s!=outgoingStreams.end(); ++s){
-			out.WriteByte((*s)->id);
-			out.WriteByte((*s)->type);
-			if(peerVersion<5)
-				out.WriteByte((unsigned char) ((*s)->codec==CODEC_OPUS ? CODEC_OPUS_OLD : 0));
-			else
-				out.WriteInt32((*s)->codec);
-			out.WriteInt16((*s)->frameDuration);
-			out.WriteByte((unsigned char) ((*s)->enabled ? 1 : 0));
-		}
-		LOGI("Sending init ack");
-		SendOrEnqueuePacket(PendingOutgoingPacket{
-				/*.seq=*/GenerateOutSeq(),
-				/*.type=*/PKT_INIT_ACK,
-				/*.len=*/out.GetLength(),
-				/*.data=*/Buffer(move(out)),
-				/*.endpoint=*/0
-		});
-		if(!receivedInit){
-			receivedInit=true;
-			if((srcEndpoint.type==Endpoint::Type::UDP_RELAY && udpConnectivityState!=UDP_BAD && udpConnectivityState!=UDP_NOT_AVAILABLE) || srcEndpoint.type==Endpoint::Type::TCP_RELAY){
-				currentEndpoint=srcEndpoint.id;
-				if(srcEndpoint.type==Endpoint::Type::UDP_RELAY || (useTCP && srcEndpoint.type==Endpoint::Type::TCP_RELAY))
-					preferredRelay=srcEndpoint.id;
-			}
-		}
-		if(!audioStarted && receivedInitAck){
-			StartAudio();
-			audioStarted=true;
-		}
-	}
-	if(type==PKT_INIT_ACK){
-		LOGD("Received init ack");
-
-		if(!receivedInitAck){
-			receivedInitAck=true;
-
-			messageThread.Cancel(initTimeoutID);
-			initTimeoutID=MessageThread::INVALID_ID;
-
-			if(packetInnerLen>10){
-				peerVersion=in.ReadInt32();
-				uint32_t minVer=(uint32_t) in.ReadInt32();
-				if(minVer>PROTOCOL_VERSION || peerVersion<MIN_PROTOCOL_VERSION){
-					lastError=ERROR_INCOMPATIBLE;
-
-					SetState(STATE_FAILED);
-					return;
-				}
-			}else{
-				peerVersion=1;
-			}
-
-			LOGI("peer version from init ack %d", peerVersion);
-
-			unsigned char streamCount=in.ReadByte();
-			if(streamCount==0)
-				return;
-
-			int i;
-			shared_ptr<Stream> incomingAudioStream=NULL;
-			for(i=0; i<streamCount; i++){
-				shared_ptr<Stream> stm=make_shared<Stream>();
-				stm->id=in.ReadByte();
-				stm->type=in.ReadByte();
-				if(peerVersion<5){
-					unsigned char codec=in.ReadByte();
-					if(codec==CODEC_OPUS_OLD)
-						stm->codec=CODEC_OPUS;
-				}else{
-					stm->codec=(uint32_t) in.ReadInt32();
-				}
-				in.ReadInt16();
-				stm->frameDuration=60;
-				stm->enabled=in.ReadByte()==1;
-				if(stm->type==STREAM_TYPE_VIDEO && peerVersion<9){
-					LOGV("Skipping video stream for old protocol version");
-					continue;
-				}
-				if(stm->type==STREAM_TYPE_AUDIO){
-					stm->jitterBuffer=make_shared<JitterBuffer>(nullptr, stm->frameDuration);
-					if(stm->frameDuration>50)
-						stm->jitterBuffer->SetMinPacketCount((uint32_t) ServerConfig::GetSharedInstance()->GetInt("jitter_initial_delay_60", 2));
-					else if(stm->frameDuration>30)
-						stm->jitterBuffer->SetMinPacketCount((uint32_t) ServerConfig::GetSharedInstance()->GetInt("jitter_initial_delay_40", 4));
-					else
-						stm->jitterBuffer->SetMinPacketCount((uint32_t) ServerConfig::GetSharedInstance()->GetInt("jitter_initial_delay_20", 6));
-					stm->decoder=NULL;
-				}else if(stm->type==STREAM_TYPE_VIDEO){
-//                    if(!stm->packetReassembler){
-//                        stm->packetReassembler=make_shared<PacketReassembler>();
-//                        stm->packetReassembler->SetCallback(bind(&VoIPController::ProcessIncomingVideoFrame, this, placeholders::_1, placeholders::_2, placeholders::_3));
-//                    }
-				}else{
-					LOGW("Unknown incoming stream type: %d", stm->type);
-					continue;
-				}
-				incomingStreams.push_back(stm);
-				if(stm->type==STREAM_TYPE_AUDIO && !incomingAudioStream)
-					incomingAudioStream=stm;
-			}
-			if(!incomingAudioStream)
-				return;
-
-			if(peerVersion>=5 && !useMTProto2){
-				useMTProto2=true;
-				LOGD("MTProto2 wasn't initially enabled for whatever reason but peer supports it; upgrading");
-			}
-
-			if(!audioStarted && receivedInit){
-				StartAudio();
-				audioStarted=true;
-			}
-			messageThread.Post([this]{
-				if(state==STATE_WAIT_INIT_ACK){
-					SetState(STATE_ESTABLISHED);
-				}
-			}, ServerConfig::GetSharedInstance()->GetDouble("established_delay_if_no_stream_data", 1.5));
-			if(allowP2p)
-				SendPublicEndpointsRequest();
-		}
-	}
-	if(type==PKT_STREAM_DATA || type==PKT_STREAM_DATA_X2 || type==PKT_STREAM_DATA_X3){
-		if(!receivedFirstStreamPacket){
-			receivedFirstStreamPacket=true;
-			if(state!=STATE_ESTABLISHED && receivedInitAck){
-				messageThread.Post([this](){
-					SetState(STATE_ESTABLISHED);
-				}, .5);
-				LOGW("First audio packet - setting state to ESTABLISHED");
-			}
-		}
-		int count;
-		switch(type){
-			case PKT_STREAM_DATA_X2:
-				count=2;
-				break;
-			case PKT_STREAM_DATA_X3:
-				count=3;
-				break;
-			case PKT_STREAM_DATA:
-			default:
-				count=1;
-				break;
-		}
-		int i;
-		if(srcEndpoint.type==Endpoint::Type::UDP_RELAY && srcEndpoint.id!=peerPreferredRelay){
-			peerPreferredRelay=srcEndpoint.id;
-		}
-		for(i=0;i<count;i++){
-			unsigned char streamID=in.ReadByte();
-			unsigned char flags=(unsigned char) (streamID & 0xC0);
-			streamID&=0x3F;
-			uint16_t sdlen=(uint16_t) (flags & STREAM_DATA_FLAG_LEN16 ? in.ReadInt16() : in.ReadByte());
-			uint32_t pts=(uint32_t) in.ReadInt32();
-			unsigned char fragmentCount=1;
-			unsigned char fragmentIndex=0;
-			//LOGD("stream data, pts=%d, len=%d, rem=%d", pts, sdlen, in.Remaining());
-			audioTimestampIn=pts;
-			if(!audioOutStarted && audioOutput){
-				MutexGuard m(audioIOMutex);
-				audioOutput->Start();
-				audioOutStarted=true;
-			}
-			bool fragmented=static_cast<bool>(sdlen & STREAM_DATA_XFLAG_FRAGMENTED);
-			bool extraFEC=static_cast<bool>(sdlen & STREAM_DATA_XFLAG_EXTRA_FEC);
-			bool keyframe=static_cast<bool>(sdlen & STREAM_DATA_XFLAG_KEYFRAME);
-			if(fragmented){
-				fragmentIndex=in.ReadByte();
-				fragmentCount=in.ReadByte();
-			}
-			sdlen&=0x7FF;
-			if(in.GetOffset()+sdlen>len){
-				return;
-			}
-			shared_ptr<Stream> stm;
-			for(shared_ptr<Stream>& ss:incomingStreams){
-				if(ss->id==streamID){
-					stm=ss;
-					break;
-				}
-			}
-			if(stm && stm->type==STREAM_TYPE_AUDIO){
-				if(stm->jitterBuffer){
-					stm->jitterBuffer->HandleInput((unsigned char *) (buffer+in.GetOffset()), sdlen, pts, false);
-					if(extraFEC){
-						in.Seek(in.GetOffset()+sdlen);
-						unsigned int fecCount=in.ReadByte();
-						for(unsigned int j=0;j<fecCount;j++){
-							unsigned char dlen=in.ReadByte();
-							unsigned char data[256];
-							in.ReadBytes(data, dlen);
-							stm->jitterBuffer->HandleInput(data, dlen, pts-(fecCount-j-1)*stm->frameDuration, true);
-						}
-					}
-				}
-			}else if(stm && stm->type==STREAM_TYPE_VIDEO){
-				if(stm->packetReassembler){
-					Buffer pdata(sdlen);
-					pdata.CopyFrom(buffer+in.GetOffset(), 0, sdlen);
-					stm->packetReassembler->AddFragment(std::move(pdata), fragmentIndex, fragmentCount, pts, keyframe);
-				}
-				//LOGV("Received video fragment %u of %u", fragmentIndex, fragmentCount);
-			}else{
-				LOGW("received packet for unknown stream %u", (unsigned int)streamID);
-			}
-			if(i<count-1)
-				in.Seek(in.GetOffset()+sdlen);
-		}
-	}
-	if(type==PKT_PING){
-		//LOGD("Received ping from %s:%d", srcEndpoint.address.ToString().c_str(), srcEndpoint.port);
-		if(srcEndpoint.type!=Endpoint::Type::UDP_RELAY && srcEndpoint.type!=Endpoint::Type::TCP_RELAY && !allowP2p){
-			LOGW("Received p2p ping but p2p is disabled by manual override");
-			return;
-		}
-		BufferOutputStream pkt(128);
-		pkt.WriteInt32(pseq);
-		SendOrEnqueuePacket(PendingOutgoingPacket{
-				/*.seq=*/GenerateOutSeq(),
-				/*.type=*/PKT_PONG,
-				/*.len=*/pkt.GetLength(),
-				/*.data=*/Buffer(move(pkt)),
-				/*.endpoint=*/srcEndpoint.id,
-		});
-	}
-	if(type==PKT_PONG){
-		if(packetInnerLen>=4){
-			uint32_t pingSeq=(uint32_t) in.ReadInt32();
-#ifdef LOG_PACKETS
-			LOGD("Received pong for ping in seq %u", pingSeq);
-#endif
-			if(pingSeq==srcEndpoint.lastPingSeq){
-				srcEndpoint.rtts.Add(GetCurrentTime()-srcEndpoint.lastPingTime);
-				srcEndpoint.averageRTT=srcEndpoint.rtts.NonZeroAverage();
-				LOGD("Current RTT via %s: %.3f, average: %.3f", packet.address->ToString().c_str(), srcEndpoint.rtts[0], srcEndpoint.averageRTT);
-				if(srcEndpoint.averageRTT>rateMaxAcceptableRTT)
-					needRate=true;
-			}
-		}
-	}
-	if(type==PKT_STREAM_STATE){
-		unsigned char id=in.ReadByte();
-		unsigned char enabled=in.ReadByte();
-		LOGV("Peer stream state: id %u flags %u", (int)id, (int)enabled);
-		for(vector<shared_ptr<Stream>>::iterator s=incomingStreams.begin();s!=incomingStreams.end();++s){
-			if((*s)->id==id){
-				(*s)->enabled=enabled==1;
-				UpdateAudioOutputState();
-				break;
-			}
-		}
-	}
-	if(type==PKT_LAN_ENDPOINT){
-		LOGV("received lan endpoint");
-		uint32_t peerAddr=(uint32_t) in.ReadInt32();
-		uint16_t peerPort=(uint16_t) in.ReadInt32();
-		MutexGuard m(endpointsMutex);
-		constexpr int64_t lanID=(int64_t)(FOURCC('L','A','N','4')) << 32;
-		IPv4Address v4addr(peerAddr);
-		IPv6Address v6addr(string("::0"));
-		unsigned char peerTag[16];
-		Endpoint lan(lanID, peerPort, v4addr, v6addr, Endpoint::Type::UDP_P2P_LAN, peerTag);
-
-		if(currentEndpoint==lanID)
-			currentEndpoint=preferredRelay;
-		endpoints[lanID]=lan;
-	}
-	if(type==PKT_NETWORK_CHANGED && _currentEndpoint->type!=Endpoint::Type::UDP_RELAY && _currentEndpoint->type!=Endpoint::Type::TCP_RELAY){
-		currentEndpoint=preferredRelay;
-		if(allowP2p)
-			SendPublicEndpointsRequest();
-		if(peerVersion>=2){
-			uint32_t flags=(uint32_t) in.ReadInt32();
-			dataSavingRequestedByPeer=(flags & INIT_FLAG_DATA_SAVING_ENABLED)==INIT_FLAG_DATA_SAVING_ENABLED;
-			UpdateDataSavingState();
-			UpdateAudioBitrateLimit();
-			ResetEndpointPingStats();
-		}
-	}
-	if(type==PKT_STREAM_EC){
-		unsigned char streamID=in.ReadByte();
-		uint32_t lastTimestamp=(uint32_t)in.ReadInt32();
-		unsigned char count=in.ReadByte();
-		for(shared_ptr<Stream>& stm:incomingStreams){
-			if(stm->id==streamID){
-				for(unsigned int i=0;i<count;i++){
-					unsigned char dlen=in.ReadByte();
-					unsigned char data[256];
-					in.ReadBytes(data, dlen);
-					if(stm->jitterBuffer){
-						stm->jitterBuffer->HandleInput(data, dlen, lastTimestamp-(count-i-1)*stm->frameDuration, true);
-					}
-				}
-				break;
-			}
-		}
-	}
-}
-
-void VoIPController::ProcessExtraData(Buffer &data){
-	BufferInputStream in(*data, data.Length());
-	unsigned char type=in.ReadByte();
-	unsigned char fullHash[SHA1_LENGTH];
-	crypto.sha1(*data, data.Length(), fullHash);
-	uint64_t hash=*reinterpret_cast<uint64_t*>(fullHash);
-	if(lastReceivedExtrasByType[type]==hash){
-		return;
-	}
-	LOGE("ProcessExtraData");
-	lastReceivedExtrasByType[type]=hash;
-	if(type==EXTRA_TYPE_STREAM_FLAGS){
-		unsigned char id=in.ReadByte();
-		uint32_t flags=static_cast<uint32_t>(in.ReadInt32());
-		LOGV("Peer stream state: id %u flags %u", (unsigned int)id, (unsigned int)flags);
-		for(shared_ptr<Stream>& s:incomingStreams){
-			if(s->id==id){
-				bool prevEnabled=s->enabled;
-				s->enabled=(flags & STREAM_FLAG_ENABLED)==STREAM_FLAG_ENABLED;
-				if(flags & STREAM_FLAG_EXTRA_EC){
-					if(!s->extraECEnabled){
-						s->extraECEnabled=true;
-						if(s->jitterBuffer)
-							s->jitterBuffer->SetMinPacketCount(4);
-					}
-				}else{
-					if(s->extraECEnabled){
-						s->extraECEnabled=false;
-						if(s->jitterBuffer)
-							s->jitterBuffer->SetMinPacketCount(2);
-					}
-				}
-				if(prevEnabled!=s->enabled && s->type==STREAM_TYPE_VIDEO && videoRenderer)
-					videoRenderer->SetStreamEnabled(s->enabled);
-				UpdateAudioOutputState();
-				break;
-			}
-		}
-	}else if(type==EXTRA_TYPE_STREAM_CSD){
-		LOGI("Received codec specific data");
-		/*
-		os.WriteByte(stream.id);
-		os.WriteByte(static_cast<unsigned char>(stream.codecSpecificData.size()));
-		for(Buffer& b:stream.codecSpecificData){
-			assert(b.Length()<255);
-			os.WriteByte(static_cast<unsigned char>(b.Length()));
-			os.WriteBytes(b);
-		}
-		Buffer buf(move(os));
-		SendExtra(buf, EXTRA_TYPE_STREAM_CSD);
-		 */
-		unsigned char streamID=in.ReadByte();
-		for(shared_ptr<Stream>& stm:incomingStreams){
-			if(stm->id==streamID){
-				stm->codecSpecificData.clear();
-				stm->csdIsValid=false;
-				stm->width=static_cast<unsigned int>(in.ReadInt16());
-				stm->height=static_cast<unsigned int>(in.ReadInt16());
-				size_t count=(size_t)in.ReadByte();
-				for(size_t i=0;i<count;i++){
-					size_t len=(size_t)in.ReadByte();
-					Buffer csd(len);
-					in.ReadBytes(*csd, len);
-					stm->codecSpecificData.push_back(move(csd));
-				}
-				break;
-			}
-		}
-	}else if(type==EXTRA_TYPE_LAN_ENDPOINT){
-		if(!allowP2p)
-			return;
-		LOGV("received lan endpoint (extra)");
-		uint32_t peerAddr=(uint32_t) in.ReadInt32();
-		uint16_t peerPort=(uint16_t) in.ReadInt32();
-		MutexGuard m(endpointsMutex);
-		constexpr int64_t lanID=(int64_t)(FOURCC('L','A','N','4')) << 32;
-		if(currentEndpoint==lanID)
-			currentEndpoint=preferredRelay;
-
-		IPv4Address v4addr(peerAddr);
-		IPv6Address v6addr(string("::0"));
-		unsigned char peerTag[16];
-		Endpoint lan(lanID, peerPort, v4addr, v6addr, Endpoint::Type::UDP_P2P_LAN, peerTag);
-		endpoints[lanID]=lan;
-	}else if(type==EXTRA_TYPE_NETWORK_CHANGED){
-		LOGI("Peer network changed");
-		wasNetworkHandover=true;
-		const Endpoint& _currentEndpoint=endpoints.at(currentEndpoint);
-		if(_currentEndpoint.type!=Endpoint::Type::UDP_RELAY && _currentEndpoint.type!=Endpoint::Type::TCP_RELAY)
-			currentEndpoint=preferredRelay;
-		if(allowP2p)
-			SendPublicEndpointsRequest();
-		uint32_t flags=(uint32_t) in.ReadInt32();
-		dataSavingRequestedByPeer=(flags & INIT_FLAG_DATA_SAVING_ENABLED)==INIT_FLAG_DATA_SAVING_ENABLED;
-		UpdateDataSavingState();
-		UpdateAudioBitrateLimit();
-		ResetEndpointPingStats();
-	}else if(type==EXTRA_TYPE_GROUP_CALL_KEY){
-		if(!didReceiveGroupCallKey && !didSendGroupCallKey){
-			unsigned char groupKey[256];
-			in.ReadBytes(groupKey, 256);
-			messageThread.Post([this, &groupKey]{
-				if(callbacks.groupCallKeyReceived)
-					callbacks.groupCallKeyReceived(this, groupKey);
-			});
-			didReceiveGroupCallKey=true;
-		}
-	}else if(type==EXTRA_TYPE_REQUEST_GROUP){
-		if(!didInvokeUpgradeCallback){
-			messageThread.Post([this]{
-				if(callbacks.upgradeToGroupCallRequested)
-					callbacks.upgradeToGroupCallRequested(this);
-			});
-			didInvokeUpgradeCallback=true;
-		}
-	}else if(type==EXTRA_TYPE_IPV6_ENDPOINT){
-		if(!allowP2p)
-			return;
-		unsigned char _addr[16];
-		in.ReadBytes(_addr, 16);
-		IPv6Address addr(_addr);
-		uint16_t port=static_cast<uint16_t>(in.ReadInt16());
-		MutexGuard m(endpointsMutex);
-		peerIPv6Available=true;
-		LOGV("Received peer IPv6 endpoint [%s]:%u", addr.ToString().c_str(), port);
-
-		constexpr int64_t p2pID=(int64_t)(FOURCC('P','2','P','6')) << 32;
-
-		Endpoint ep;
-		ep.type=Endpoint::Type::UDP_P2P_INET;
-		ep.port=port;
-		ep.v6address=addr;
-		ep.id=p2pID;
-		endpoints[p2pID]=ep;
-		if(!myIPv6.IsEmpty())
-			currentEndpoint=p2pID;
-	}
-}
-
-void VoIPController::ProcessAcknowledgedOutgoingExtra(UnacknowledgedExtraData &extra){
-	if(extra.type==EXTRA_TYPE_GROUP_CALL_KEY){
-		if(!didReceiveGroupCallKeyAck){
-			didReceiveGroupCallKeyAck=true;
-			messageThread.Post([this]{
-				if(callbacks.groupCallKeySent)
-					callbacks.groupCallKeySent(this);
-			});
-		}
-	}
-}
-
-Endpoint& VoIPController::GetRemoteEndpoint(){
-	return endpoints.at(currentEndpoint);
-}
-
-Endpoint* VoIPController::GetEndpointForPacket(const PendingOutgoingPacket& pkt){
-	Endpoint* endpoint=NULL;
-	if(pkt.endpoint){
-		try{
-			endpoint=&endpoints.at(pkt.endpoint);
-		}catch(out_of_range& x){
-			LOGW("Unable to send packet via nonexistent endpoint %" PRIu64, pkt.endpoint);
-			return NULL;
-		}
-	}
-	if(!endpoint)
-		endpoint=&endpoints.at(currentEndpoint);
-	return endpoint;
-}
-
-bool VoIPController::SendOrEnqueuePacket(PendingOutgoingPacket pkt, bool enqueue){
-	Endpoint* endpoint=GetEndpointForPacket(pkt);
-	if(!endpoint){
-		abort();
-		return false;
-	}
-	
-
-	bool canSend;
-	if(endpoint->type!=Endpoint::Type::TCP_RELAY){
-		canSend=realUdpSocket->IsReadyToSend();
-	}else{
-		if(!endpoint->socket){
-			LOGV("Connecting to %s:%u", endpoint->GetAddress().ToString().c_str(), endpoint->port);
-			if(proxyProtocol==PROXY_NONE){
-				endpoint->socket=new NetworkSocketTCPObfuscated(NetworkSocket::Create(NetworkProtocol::PROTO_TCP));
-				endpoint->socket->Connect(&endpoint->GetAddress(), endpoint->port);
-			}else if(proxyProtocol==PROXY_SOCKS5){
-				NetworkSocket* tcp=NetworkSocket::Create(NetworkProtocol::PROTO_TCP);
-				tcp->Connect(resolvedProxyAddress, proxyPort);
-				NetworkSocketSOCKS5Proxy* proxy=new NetworkSocketSOCKS5Proxy(tcp, NULL, proxyUsername, proxyPassword);
-				endpoint->socket=proxy;
-				endpoint->socket->Connect(&endpoint->GetAddress(), endpoint->port);
-			}
-			selectCanceller->CancelSelect();
-		}
-		canSend=endpoint->socket && endpoint->socket->IsReadyToSend();
-	}
-	if(!canSend){
-		if(enqueue){
-    		LOGW("Not ready to send - enqueueing");
-    		sendQueue.push_back(move(pkt));
-		}
-		return false;
-	}
-	if((endpoint->type==Endpoint::Type::TCP_RELAY && useTCP) || (endpoint->type!=Endpoint::Type::TCP_RELAY && useUDP)){
-		//BufferOutputStream p(buf, sizeof(buf));
-		BufferOutputStream p(1500);
-		WritePacketHeader(pkt.seq, &p, pkt.type, (uint32_t)pkt.len);
-		p.WriteBytes(pkt.data);
-		SendPacket(p.GetBuffer(), p.GetLength(), *endpoint, pkt);
-		if(pkt.type==PKT_STREAM_DATA){
-			unsentStreamPackets--;
-		}
-	}
-	return true;
-}
-
-void VoIPController::SendPacket(unsigned char *data, size_t len, Endpoint& ep, PendingOutgoingPacket& srcPacket){
-	if(stopping)
-		return;
-	if(ep.type==Endpoint::Type::TCP_RELAY && !useTCP)
-		return;
-	BufferOutputStream out(len+128);
-	if(ep.type==Endpoint::Type::UDP_RELAY || ep.type==Endpoint::Type::TCP_RELAY)
-		out.WriteBytes((unsigned char*)ep.peerTag, 16);
-	else if(peerVersion<9)
-		out.WriteBytes(callID, 16);
-	if(len>0){
-		if(useMTProto2){
-			BufferOutputStream inner(len+128);
-			size_t sizeSize;
-			if(peerVersion>=8 || (!peerVersion && connectionMaxLayer>=92)){
-				inner.WriteInt16((uint16_t) len);
-				sizeSize=0;
-			}else{
-				inner.WriteInt32((uint32_t) len);
-				out.WriteBytes(keyFingerprint, 8);
-				sizeSize=4;
-			}
-			inner.WriteBytes(data, len);
-
-			size_t padLen=16-inner.GetLength()%16;
-			if(padLen<16)
-				padLen+=16;
-			unsigned char padding[32];
-			crypto.rand_bytes((uint8_t *) padding, padLen);
-			inner.WriteBytes(padding, padLen);
-			assert(inner.GetLength()%16==0);
-
-			unsigned char key[32], iv[32], msgKey[16];
-			BufferOutputStream buf(len+32);
-			size_t x=isOutgoing ? 0 : 8;
-			buf.WriteBytes(encryptionKey+88+x, 32);
-			buf.WriteBytes(inner.GetBuffer()+sizeSize, inner.GetLength()-sizeSize);
-			unsigned char msgKeyLarge[32];
-			crypto.sha256(buf.GetBuffer(), buf.GetLength(), msgKeyLarge);
-			memcpy(msgKey, msgKeyLarge+8, 16);
-			KDF2(msgKey, isOutgoing ? 0 : 8, key, iv);
-			out.WriteBytes(msgKey, 16);
-			//LOGV("<- MSG KEY: %08x %08x %08x %08x, hashed %u", *reinterpret_cast<int32_t*>(msgKey), *reinterpret_cast<int32_t*>(msgKey+4), *reinterpret_cast<int32_t*>(msgKey+8), *reinterpret_cast<int32_t*>(msgKey+12), inner.GetLength()-4);
-
-			unsigned char aesOut[MSC_STACK_FALLBACK(inner.GetLength(), 1500)];
-			crypto.aes_ige_encrypt(inner.GetBuffer(), aesOut, inner.GetLength(), key, iv);
-			out.WriteBytes(aesOut, inner.GetLength());
-		}else{
-			BufferOutputStream inner(len+128);
-			inner.WriteInt32((int32_t)len);
-			inner.WriteBytes(data, len);
-			if(inner.GetLength()%16!=0){
-				size_t padLen=16-inner.GetLength()%16;
-				unsigned char padding[16];
-				crypto.rand_bytes((uint8_t *) padding, padLen);
-				inner.WriteBytes(padding, padLen);
-			}
-			assert(inner.GetLength()%16==0);
-			unsigned char key[32], iv[32], msgHash[SHA1_LENGTH];
-			crypto.sha1((uint8_t *) inner.GetBuffer(), len+4, msgHash);
-			out.WriteBytes(keyFingerprint, 8);
-			out.WriteBytes((msgHash+(SHA1_LENGTH-16)), 16);
-			KDF(msgHash+(SHA1_LENGTH-16), isOutgoing ? 0 : 8, key, iv);
-			unsigned char aesOut[MSC_STACK_FALLBACK(inner.GetLength(), 1500)];
-			crypto.aes_ige_encrypt(inner.GetBuffer(), aesOut, inner.GetLength(), key, iv);
-			out.WriteBytes(aesOut, inner.GetLength());
-		}
-	}
-	//LOGV("Sending %d bytes to %s:%d", out.GetLength(), ep.address.ToString().c_str(), ep.port);
-#ifdef LOG_PACKETS
-	LOGV("Sending: to=%s:%u, seq=%u, length=%u, type=%s", ep.GetAddress().ToString().c_str(), ep.port, srcPacket.seq, out.GetLength(), GetPacketTypeString(srcPacket.type).c_str());
-#endif
-
-	NetworkPacket pkt={0};
-	pkt.address=&ep.GetAddress();
-	pkt.port=ep.port;
-	pkt.length=out.GetLength();
-	pkt.data=out.GetBuffer();
-	pkt.protocol=ep.type==Endpoint::Type::TCP_RELAY ? PROTO_TCP : PROTO_UDP;
-	ActuallySendPacket(pkt, ep);
-}
-
-void VoIPController::ActuallySendPacket(NetworkPacket &pkt, Endpoint& ep){
-	//LOGI("Sending packet of %d bytes", pkt.length);
-	if(IS_MOBILE_NETWORK(networkType))
-		stats.bytesSentMobile+=(uint64_t)pkt.length;
-	else
-		stats.bytesSentWifi+=(uint64_t)pkt.length;
-	if(ep.type==Endpoint::Type::TCP_RELAY){
-		if(ep.socket && !ep.socket->IsFailed()){
-			ep.socket->Send(&pkt);
-		}
-	}else{
-		udpSocket->Send(&pkt);
-	}
-}
-
-
-std::string VoIPController::NetworkTypeToString(int type){
-	switch(type){
-		case NET_TYPE_WIFI:
-			return "wifi";
-		case NET_TYPE_GPRS:
-			return "gprs";
-		case NET_TYPE_EDGE:
-			return "edge";
-		case NET_TYPE_3G:
-			return "3g";
-		case NET_TYPE_HSPA:
-			return "hspa";
-		case NET_TYPE_LTE:
-			return "lte";
-		case NET_TYPE_ETHERNET:
-			return "ethernet";
-		case NET_TYPE_OTHER_HIGH_SPEED:
-			return "other_high_speed";
-		case NET_TYPE_OTHER_LOW_SPEED:
-			return "other_low_speed";
-		case NET_TYPE_DIALUP:
-			return "dialup";
-		case NET_TYPE_OTHER_MOBILE:
-			return "other_mobile";
-		default:
-			return "unknown";
-	}
-}
-
-std::string VoIPController::GetPacketTypeString(unsigned char type){
-	switch(type){
-		case PKT_INIT:
-			return "init";
-		case PKT_INIT_ACK:
-			return "init_ack";
-		case PKT_STREAM_STATE:
-			return "stream_state";
-		case PKT_STREAM_DATA:
-			return "stream_data";
-		case PKT_PING:
-			return "ping";
-		case PKT_PONG:
-			return "pong";
-		case PKT_LAN_ENDPOINT:
-			return "lan_endpoint";
-		case PKT_NETWORK_CHANGED:
-			return "network_changed";
-		case PKT_NOP:
-			return "nop";
-		case PKT_STREAM_EC:
-			return "stream_ec";
-	}
-    char buf[255];
-	snprintf(buf, sizeof(buf), "unknown(%u)", type);
-	return string(buf);
-}
-
-void VoIPController::AddIPv6Relays(){
-	if(!myIPv6.IsEmpty() && !didAddIPv6Relays){
-		unordered_map<string, vector<Endpoint>> endpointsByAddress;
-		MutexGuard m(endpointsMutex);
-		for(pair<const int64_t, Endpoint>& _e:endpoints){
-			Endpoint& e=_e.second;
-			if((e.type==Endpoint::Type::UDP_RELAY || e.type==Endpoint::Type::TCP_RELAY) && !e.v6address.IsEmpty() && !e.address.IsEmpty()){
-				endpointsByAddress[e.v6address.ToString()].push_back(e);
-			}
-		}
-		for(pair<const string, vector<Endpoint>>& addr:endpointsByAddress){
-			for(Endpoint& e:addr.second){
-				didAddIPv6Relays=true;
-				e.address=IPv4Address(0);
-				e.id=e.id ^ ((int64_t)(FOURCC('I','P','v','6')) << 32);
-				e.averageRTT=0;
-				e.lastPingSeq=0;
-				e.lastPingTime=0;
-				e.rtts.Reset();
-				e.udpPongCount=0;
-				endpoints[e.id]=e;
-				LOGD("Adding IPv6-only endpoint [%s]:%u", e.v6address.ToString().c_str(), e.port);
-			}
-		}
-	}
-}
-
-void VoIPController::AddTCPRelays(){
-	if(!didAddTcpRelays){
-		bool wasSetCurrentToTCP=setCurrentEndpointToTCP;
-		LOGV("Adding TCP relays");
-		MutexGuard m(endpointsMutex);
-		vector<Endpoint> relays;
-		for(pair<const int64_t, Endpoint> &_e:endpoints){
-			Endpoint& e=_e.second;
-			if(e.type!=Endpoint::Type::UDP_RELAY)
-				continue;
-			if(wasSetCurrentToTCP && !useUDP){
-				e.rtts.Reset();
-				e.averageRTT=0;
-				e.lastPingSeq=0;
-			}
-			Endpoint tcpRelay(e);
-			tcpRelay.type=Endpoint::Type::TCP_RELAY;
-			tcpRelay.averageRTT=0;
-			tcpRelay.lastPingSeq=0;
-			tcpRelay.lastPingTime=0;
-			tcpRelay.rtts.Reset();
-			tcpRelay.udpPongCount=0;
-			tcpRelay.id=tcpRelay.id ^ ((int64_t) (FOURCC('T', 'C', 'P', 0)) << 32);
-			if(setCurrentEndpointToTCP && endpoints.at(currentEndpoint).type!=Endpoint::Type::TCP_RELAY){
-				LOGV("Setting current endpoint to TCP");
-				setCurrentEndpointToTCP=false;
-				currentEndpoint=tcpRelay.id;
-				preferredRelay=tcpRelay.id;
-			}
-			relays.push_back(tcpRelay);
-		}
-		for(Endpoint& e:relays){
-			endpoints[e.id]=move(e);
-		}
-		didAddTcpRelays=true;
-	}
-}
-
-#if defined(__APPLE__)
-static void initMachTimestart() {
-	mach_timebase_info_data_t tb = { 0, 0 };
-	mach_timebase_info(&tb);
-	VoIPController::machTimebase = tb.numer;
-	VoIPController::machTimebase /= tb.denom;
-	VoIPController::machTimestart = mach_absolute_time();
-}
-#endif
-
-double VoIPController::GetCurrentTime(){
-#if defined(__linux__)
-	struct timespec ts;
-	clock_gettime(CLOCK_MONOTONIC, &ts);
-	return ts.tv_sec+(double)ts.tv_nsec/1000000000.0;
-#elif defined(__APPLE__)
-	static pthread_once_t token = PTHREAD_ONCE_INIT;
-	pthread_once(&token, &initMachTimestart);
-	return (mach_absolute_time() - machTimestart) * machTimebase / 1000000000.0f;
-#elif defined(_WIN32)
-	if(!didInitWin32TimeScale){
-		LARGE_INTEGER scale;
-		QueryPerformanceFrequency(&scale);
-		win32TimeScale=scale.QuadPart;
-		didInitWin32TimeScale=true;
-	}
-	LARGE_INTEGER t;
-	QueryPerformanceCounter(&t);
-	return (double)t.QuadPart/(double)win32TimeScale;
-#endif
-}
-
-
-
-void VoIPController::KDF(unsigned char* msgKey, size_t x, unsigned char* aesKey, unsigned char* aesIv){
-	uint8_t sA[SHA1_LENGTH], sB[SHA1_LENGTH], sC[SHA1_LENGTH], sD[SHA1_LENGTH];
-	BufferOutputStream buf(128);
-	buf.WriteBytes(msgKey, 16);
-	buf.WriteBytes(encryptionKey+x, 32);
-	crypto.sha1(buf.GetBuffer(), buf.GetLength(), sA);
-	buf.Reset();
-	buf.WriteBytes(encryptionKey+32+x, 16);
-	buf.WriteBytes(msgKey, 16);
-	buf.WriteBytes(encryptionKey+48+x, 16);
-	crypto.sha1(buf.GetBuffer(), buf.GetLength(), sB);
-	buf.Reset();
-	buf.WriteBytes(encryptionKey+64+x, 32);
-	buf.WriteBytes(msgKey, 16);
-	crypto.sha1(buf.GetBuffer(), buf.GetLength(), sC);
-	buf.Reset();
-	buf.WriteBytes(msgKey, 16);
-	buf.WriteBytes(encryptionKey+96+x, 32);
-	crypto.sha1(buf.GetBuffer(), buf.GetLength(), sD);
-	buf.Reset();
-	buf.WriteBytes(sA, 8);
-	buf.WriteBytes(sB+8, 12);
-	buf.WriteBytes(sC+4, 12);
-	assert(buf.GetLength()==32);
-	memcpy(aesKey, buf.GetBuffer(), 32);
-	buf.Reset();
-	buf.WriteBytes(sA+8, 12);
-	buf.WriteBytes(sB, 8);
-	buf.WriteBytes(sC+16, 4);
-	buf.WriteBytes(sD, 8);
-	assert(buf.GetLength()==32);
-	memcpy(aesIv, buf.GetBuffer(), 32);
-}
-
-void VoIPController::KDF2(unsigned char* msgKey, size_t x, unsigned char *aesKey, unsigned char *aesIv){
-	uint8_t sA[32], sB[32];
-	BufferOutputStream buf(128);
-	buf.WriteBytes(msgKey, 16);
-	buf.WriteBytes(encryptionKey+x, 36);
-	crypto.sha256(buf.GetBuffer(), buf.GetLength(), sA);
-	buf.Reset();
-	buf.WriteBytes(encryptionKey+40+x, 36);
-	buf.WriteBytes(msgKey, 16);
-	crypto.sha256(buf.GetBuffer(), buf.GetLength(), sB);
-	buf.Reset();
-	buf.WriteBytes(sA, 8);
-	buf.WriteBytes(sB+8, 16);
-	buf.WriteBytes(sA+24, 8);
-	memcpy(aesKey, buf.GetBuffer(), 32);
-	buf.Reset();
-	buf.WriteBytes(sB, 8);
-	buf.WriteBytes(sA+8, 16);
-	buf.WriteBytes(sB+24, 8);
-	memcpy(aesIv, buf.GetBuffer(), 32);
-}
-
-
-void VoIPController::SendPublicEndpointsRequest(const Endpoint& relay){
-	if(!useUDP)
-		return;
-	LOGD("Sending public endpoints request to %s:%d", relay.address.ToString().c_str(), relay.port);
-	publicEndpointsReqTime=GetCurrentTime();
-	waitingForRelayPeerInfo=true;
-	unsigned char buf[32];
-	memcpy(buf, relay.peerTag, 16);
-	memset(buf+16, 0xFF, 16);
-	NetworkPacket pkt={0};
-	pkt.data=buf;
-	pkt.length=32;
-	pkt.address=(NetworkAddress*)&relay.address;
-	pkt.port=relay.port;
-	pkt.protocol=PROTO_UDP;
-	udpSocket->Send(&pkt);
-}
-
-Endpoint& VoIPController::GetEndpointByType(int type){
-	if(type==Endpoint::Type::UDP_RELAY && preferredRelay)
-		return endpoints.at(preferredRelay);
-	for(pair<const int64_t, Endpoint>& e:endpoints){
-		if(e.second.type==type)
-			return e.second;
-	}
-	throw out_of_range("no endpoint");
-}
-
-
-void VoIPController::SendPacketReliably(unsigned char type, unsigned char *data, size_t len, double retryInterval, double timeout){
-	LOGD("Send reliably, type=%u, len=%u, retry=%.3f, timeout=%.3f", type, unsigned(len), retryInterval, timeout);
-	QueuedPacket pkt;
-	if(data){
-		Buffer b(len);
-		b.CopyFrom(data, 0, len);
-		pkt.data=move(b);
-	}
-	pkt.type=type;
-	pkt.retryInterval=retryInterval;
-	pkt.timeout=timeout;
-	pkt.firstSentTime=0;
-	pkt.lastSentTime=0;
-	{
-		MutexGuard m(queuedPacketsMutex);
-		queuedPackets.push_back(move(pkt));
-	}
-	messageThread.Post(std::bind(&VoIPController::UpdateQueuedPackets, this));
-	if(timeout>0.0){
-		messageThread.Post(std::bind(&VoIPController::UpdateQueuedPackets, this), timeout);
-	}
-}
-
-void VoIPController::SendExtra(Buffer &data, unsigned char type){
-	MutexGuard m(queuedPacketsMutex);
-	LOGV("Sending extra type %u length %lu", type, data.Length());
-	for(vector<UnacknowledgedExtraData>::iterator x=currentExtras.begin();x!=currentExtras.end();++x){
-		if(x->type==type){
-			x->firstContainingSeq=0;
-			x->data=move(data);
-			return;
-		}
-	}
-	UnacknowledgedExtraData xd={type, move(data), 0};
-	currentExtras.push_back(move(xd));
-}
-
-
-
-
-
-void VoIPController::DebugCtl(int request, int param){
-	if(request==1){ // set bitrate
-		maxBitrate=param;
-		if(encoder){
-			encoder->SetBitrate(maxBitrate);
-		}
-	}else if(request==2){ // set packet loss
-		if(encoder){
-			encoder->SetPacketLoss(param);
-		}
-	}else if(request==3){ // force enable/disable p2p
-		allowP2p=param==1;
-		/*if(!allowP2p && currentEndpoint && currentEndpoint->type!=Endpoint::Type::UDP_RELAY){
-			currentEndpoint=preferredRelay;
-		}else if(allowP2p){
-			SendPublicEndpointsRequest();
-		}*/
-		BufferOutputStream s(4);
-		s.WriteInt32(dataSavingMode ? INIT_FLAG_DATA_SAVING_ENABLED : 0);
-		SendPacketReliably(PKT_NETWORK_CHANGED, s.GetBuffer(), s.GetLength(), 1, 20);
-	}else if(request==4){
-		if(echoCanceller)
-			echoCanceller->Enable(param==1);
-	}
-}
-
-void VoIPController::SendUdpPing(Endpoint& endpoint){
-	if(endpoint.type!=Endpoint::Type::UDP_RELAY)
-		return;
-	BufferOutputStream p(1024);
-	p.WriteBytes(endpoint.peerTag, 16);
-	p.WriteInt32(-1);
-	p.WriteInt32(-1);
-	p.WriteInt32(-1);
-	p.WriteInt32(-2);
-	int64_t id;
-	crypto.rand_bytes(reinterpret_cast<uint8_t*>(&id), 8);
-	p.WriteInt64(id);
-	NetworkPacket pkt={0};
-	pkt.address=&endpoint.GetAddress();
-	pkt.port=endpoint.port;
-	pkt.protocol=PROTO_UDP;
-	pkt.data=p.GetBuffer();
-	pkt.length=p.GetLength();
-	udpSocket->Send(&pkt);
-	LOGV("Sending UDP ping to %s:%d, id %" PRId64, endpoint.GetAddress().ToString().c_str(), endpoint.port, id);
-}
-
-
-void VoIPController::ResetUdpAvailability(){
-	LOGI("Resetting UDP availability");
-	if(udpPingTimeoutID!=MessageThread::INVALID_ID){
-		messageThread.Cancel(udpPingTimeoutID);
-	}
-	{
-		MutexGuard m(endpointsMutex);
-		for(pair<const int64_t, Endpoint>& e:endpoints){
-			e.second.udpPongCount=0;
-		}
-	}
-	udpPingCount=0;
-	udpConnectivityState=UDP_PING_PENDING;
-	udpPingTimeoutID=messageThread.Post(std::bind(&VoIPController::SendUdpPings, this), 0.0, 0.5);
-}
-
-void VoIPController::ResetEndpointPingStats(){
-	MutexGuard m(endpointsMutex);
-	for(pair<const int64_t, Endpoint>& e:endpoints){
-		e.second.averageRTT=0.0;
-		e.second.rtts.Reset();
-	}
-}
-
-
-
-#pragma mark - Video
-
-int VoIPController::GetVideoResolutionForCurrentBitrate(){
-	shared_ptr<Stream> stm=GetStreamByType(STREAM_TYPE_VIDEO, true);
-	if(!stm)
-		return INIT_VIDEO_RES_NONE;
-
-	int resolutionFromBitrate=INIT_VIDEO_RES_1080;
-	// TODO: probably move this to server config
-	if(stm->codec==CODEC_AVC || stm->codec==CODEC_VP8){
-		if(currentVideoBitrate>400000){
-			resolutionFromBitrate=INIT_VIDEO_RES_720;
-		}else if(currentVideoBitrate>250000){
-			resolutionFromBitrate=INIT_VIDEO_RES_480;
-		}else{
-			resolutionFromBitrate=INIT_VIDEO_RES_360;
-		}
-	}else if(stm->codec==CODEC_HEVC || stm->codec==CODEC_VP9){
-		if(currentVideoBitrate>400000){
-			resolutionFromBitrate=INIT_VIDEO_RES_1080;
-		}else if(currentVideoBitrate>250000){
-			resolutionFromBitrate=INIT_VIDEO_RES_720;
-		}else if(currentVideoBitrate>100000){
-			resolutionFromBitrate=INIT_VIDEO_RES_480;
-		}else{
-			resolutionFromBitrate=INIT_VIDEO_RES_360;
-		}
-	}
-	return min(peerMaxVideoResolution, resolutionFromBitrate);
-}
-
-void VoIPController::SetVideoSource(video::VideoSource *source){
-	if(videoSource){
-		videoSource->Stop();
-		videoSource->SetCallback(nullptr);
-	}
-	videoSource=source;
-	shared_ptr<Stream> stm=GetStreamByType(STREAM_TYPE_VIDEO, true);
-	if(!stm){
-		LOGE("Can't set video source when there is no outgoing video stream");
-		return;
-	}
-	if(videoSource){
-		if(!stm->enabled){
-			stm->enabled=true;
-			SendStreamFlags(*stm);
-		}
-		uint32_t bitrate=videoCongestionControl.GetBitrate();
-		currentVideoBitrate=bitrate;
-		videoSource->SetBitrate(bitrate);
-		videoSource->Reset(stm->codec, stm->resolution=GetVideoResolutionForCurrentBitrate());
-		videoSource->Start();
-		videoSource->SetCallback(bind(&VoIPController::SendVideoFrame, this, placeholders::_1, placeholders::_2));
-		lastVideoResolutionChangeTime=GetCurrentTime();
-	}else{
-		if(stm->enabled){
-			stm->enabled=false;
-			SendStreamFlags(*stm);
-		}
-	}
-}
-
-void VoIPController::SetVideoRenderer(video::VideoRenderer *renderer){
-	videoRenderer=renderer;
-}
-
-void VoIPController::SetVideoCodecSpecificData(const std::vector<Buffer>& data){
-	outgoingStreams[1]->codecSpecificData.clear();
-	for(const Buffer& csd:data){
-		outgoingStreams[1]->codecSpecificData.push_back(Buffer::CopyOf(csd));
-	}
-	LOGI("Set outgoing video stream CSD");
-}
-
-void VoIPController::SendVideoFrame(const Buffer &frame, uint32_t flags){
-	//LOGI("Send video frame %u flags %u", (unsigned int)frame.Length(), flags);
-	shared_ptr<Stream> stm=GetStreamByType(STREAM_TYPE_VIDEO, true);
-	if(stm){
-		if(firstVideoFrameTime==0.0)
-			firstVideoFrameTime=GetCurrentTime();
-
-		videoCongestionControl.UpdateMediaRate(static_cast<uint32_t>(frame.Length()));
-		uint32_t bitrate=videoCongestionControl.GetBitrate();
-		if(bitrate!=currentVideoBitrate){
-			currentVideoBitrate=bitrate;
-			LOGD("Setting video bitrate to %u", bitrate);
-			videoSource->SetBitrate(bitrate);
-
-			int resolutionFromBitrate=GetVideoResolutionForCurrentBitrate();
-			if(resolutionFromBitrate!=stm->resolution && GetCurrentTime()-lastVideoResolutionChangeTime>3.0){
-				LOGI("Changing video resolution: %d -> %d", stm->resolution, resolutionFromBitrate);
-				stm->resolution=resolutionFromBitrate;
-				messageThread.Post([this, stm, resolutionFromBitrate]{
-    				videoSource->Reset(stm->codec, resolutionFromBitrate);
-    				stm->csdIsValid=false;
-				});
-				lastVideoResolutionChangeTime=GetCurrentTime();
-				return;
-			}
-		}
-
-		if(videoKeyframeRequested){
-			if(flags & VIDEO_FRAME_FLAG_KEYFRAME){
-				for(SentVideoFrame& f:sentVideoFrames){
-					if(!f.unacknowledgedPackets.empty()){
-						for(uint32_t& pseq:f.unacknowledgedPackets){
-							RecentOutgoingPacket* opkt=GetRecentOutgoingPacket(pseq);
-							if(opkt){
-								videoCongestionControl.ProcessPacketLost(opkt->size);
-							}
-						}
-					}
-				}
-				sentVideoFrames.clear();
-				videoKeyframeRequested=false;
-			}else{
-				LOGV("Dropping input video frame waiting for key frame");
-				return;
-			}
-		}
-
-		uint32_t pts=videoFrameCount++;
-		if(!stm->csdIsValid){
-			vector<Buffer>& csd=videoSource->GetCodecSpecificData();
-			stm->codecSpecificData.clear();
-			for(Buffer& b:csd){
-				stm->codecSpecificData.push_back(Buffer::CopyOf(b));
-			}
-			stm->csdIsValid=true;
-			stm->width=videoSource->GetFrameWidth();
-			stm->height=videoSource->GetFrameHeight();
-			SendStreamCSD(*stm);
-		}
-
-		size_t segmentCount=frame.Length()/1024;
-		if(frame.Length()%1024>0)
-			segmentCount++;
-		SentVideoFrame sentFrame;
-		sentFrame.num=pts;
-		sentFrame.fragmentCount=static_cast<uint32_t>(segmentCount);
-		sentFrame.fragmentsInQueue=0;//static_cast<uint32_t>(segmentCount);
-		for(size_t seg=0;seg<segmentCount;seg++){
-			BufferOutputStream pkt(1500);
-			size_t offset=seg*1024;
-			size_t len=MIN(1024, frame.Length()-offset);
-			unsigned char pflags=STREAM_DATA_FLAG_LEN16;
-			//pflags |= STREAM_DATA_FLAG_HAS_MORE_FLAGS;
-			pkt.WriteByte((unsigned char) (stm->id | pflags)); // streamID + flags
-			int16_t lengthAndFlags=static_cast<int16_t>(len & 0x7FF);
-			if(segmentCount>1)
-				lengthAndFlags |= STREAM_DATA_XFLAG_FRAGMENTED;
-			if(flags & VIDEO_FRAME_FLAG_KEYFRAME)
-				lengthAndFlags |= STREAM_DATA_XFLAG_KEYFRAME;
-			pkt.WriteInt16(lengthAndFlags);
-			//pkt.WriteInt32(audioTimestampOut);
-			pkt.WriteInt32(pts);
-			if(segmentCount>1){
-				pkt.WriteByte((unsigned char)seg);
-				pkt.WriteByte((unsigned char)segmentCount);
-			}
-			//LOGV("Sending segment %u of %u", (unsigned int)seg, (unsigned int)segmentCount);
-			pkt.WriteBytes(frame, offset, len);
-
-			uint32_t seq=GenerateOutSeq();
-			PendingOutgoingPacket p{
-					/*.seq=*/seq,
-					/*.type=*/PKT_STREAM_DATA,
-					/*.len=*/pkt.GetLength(),
-					/*.data=*/Buffer(move(pkt)),
-					/*.endpoint=*/0,
-			};
-			unsentStreamPackets++;
-			SendOrEnqueuePacket(move(p));
-			videoCongestionControl.ProcessPacketSent(static_cast<unsigned int>(pkt.GetLength()));
-			sentFrame.unacknowledgedPackets.push_back(seq);
-		}
-		MutexGuard m(sentVideoFramesMutex);
-		sentVideoFrames.push_back(sentFrame);
-	}
-}
-
-void VoIPController::SendStreamCSD(VoIPController::Stream &stream){
-	assert(stream.csdIsValid);
-
-	BufferOutputStream os(256);
-	os.WriteByte(stream.id);
-	os.WriteInt16((int16_t)stream.width);
-	os.WriteInt16((int16_t)stream.height);
-	os.WriteByte(static_cast<unsigned char>(stream.codecSpecificData.size()));
-	for(Buffer& b:stream.codecSpecificData){
-		assert(b.Length()<255);
-		os.WriteByte(static_cast<unsigned char>(b.Length()));
-		os.WriteBytes(b);
-	}
-	Buffer buf(move(os));
-	SendExtra(buf, EXTRA_TYPE_STREAM_CSD);
-}
-
-void VoIPController::ProcessIncomingVideoFrame(Buffer frame, uint32_t pts, bool keyframe){
-	//LOGI("Incoming video frame size %u pts %u", (unsigned int)frame.Length(), pts);
-	if(frame.Length()==0){
-		LOGE("EMPTY FRAME");
-	}
-	if(videoRenderer){
-		shared_ptr<Stream> stm=GetStreamByType(STREAM_TYPE_VIDEO, false);
-		if(!stm->csdIsValid){
-			videoRenderer->Reset(stm->codec, stm->width, stm->height, stm->codecSpecificData);
-			stm->csdIsValid=true;
-		}
-		if(lastReceivedVideoFrameNumber==UINT32_MAX || lastReceivedVideoFrameNumber==pts-1 || keyframe){
-			lastReceivedVideoFrameNumber=pts;
-			//LOGV("3 before decode %u", (unsigned int)frame.Length());
-			videoRenderer->DecodeAndDisplay(move(frame), pts);
-		}else{
-			LOGW("Skipping non-keyframe after packet loss...");
-		}
-	}
-}
-
-void VoIPController::SetupOutgoingVideoStream(){
-	vector<uint32_t> myEncoders=video::VideoSource::GetAvailableEncoders();
-	shared_ptr<Stream> vstm=make_shared<Stream>();
-	vstm->id=2;
-	vstm->type=STREAM_TYPE_VIDEO;
-
-	if(find(myEncoders.begin(), myEncoders.end(), CODEC_HEVC)!=myEncoders.end() && find(peerVideoDecoders.begin(), peerVideoDecoders.end(), CODEC_HEVC)!=peerVideoDecoders.end()){
-		vstm->codec=CODEC_HEVC;
-	}else if(find(myEncoders.begin(), myEncoders.end(), CODEC_AVC)!=myEncoders.end() && find(peerVideoDecoders.begin(), peerVideoDecoders.end(), CODEC_AVC)!=peerVideoDecoders.end()){
-		vstm->codec=CODEC_AVC;
-	}else if(find(myEncoders.begin(), myEncoders.end(), CODEC_VP8)!=myEncoders.end() && find(peerVideoDecoders.begin(), peerVideoDecoders.end(), CODEC_VP8)!=peerVideoDecoders.end()){
-		vstm->codec=CODEC_VP8;
-	}else{
-		LOGW("Can't setup outgoing video stream: no codecs in common");
-		return;
-	}
-
-	vstm->enabled=false;
-	outgoingStreams.push_back(vstm);
-}
-
-#pragma mark - Timer methods
-
-void VoIPController::SendUdpPings(){
-	LOGW("Send udp pings");
-	MutexGuard m(endpointsMutex);
-	for(pair<const int64_t, Endpoint>& e:endpoints){
-		if(e.second.type==Endpoint::Type::UDP_RELAY){
-			SendUdpPing(e.second);
-		}
-	}
-	if(udpConnectivityState==UDP_UNKNOWN || udpConnectivityState==UDP_PING_PENDING)
-		udpConnectivityState=UDP_PING_SENT;
-	udpPingCount++;
-	if(udpPingCount==4 || udpPingCount==10){
-		messageThread.CancelSelf();
-		udpPingTimeoutID=messageThread.Post(std::bind(&VoIPController::EvaluateUdpPingResults, this), 1.0);
-	}
-}
-
-void VoIPController::EvaluateUdpPingResults(){
-	double avgPongs=0;
-	int count=0;
-	for(pair<const int64_t, Endpoint>& _e:endpoints){
-		Endpoint& e=_e.second;
-		if(e.type==Endpoint::Type::UDP_RELAY){
-			if(e.udpPongCount>0){
-				avgPongs+=(double) e.udpPongCount;
-				count++;
-			}
-		}
-	}
-	if(count>0)
-		avgPongs/=(double)count;
-	else
-		avgPongs=0.0;
-	LOGI("UDP ping reply count: %.2f", avgPongs);
-	if(avgPongs==0.0 && proxyProtocol==PROXY_SOCKS5 && udpSocket!=realUdpSocket){
-		LOGI("Proxy does not let UDP through, closing proxy connection and using UDP directly");
-		NetworkSocket* proxySocket=udpSocket;
-		proxySocket->Close();
-		udpSocket=realUdpSocket;
-		selectCanceller->CancelSelect();
-		delete proxySocket;
-		proxySupportsUDP=false;
-		ResetUdpAvailability();
-		return;
-	}
-	bool configUseTCP=ServerConfig::GetSharedInstance()->GetBoolean("use_tcp", true);
-	if(configUseTCP){
-		if(avgPongs==0.0 || (udpConnectivityState==UDP_BAD && avgPongs<7.0)){
-			if(needRateFlags & NEED_RATE_FLAG_UDP_NA)
-				needRate=true;
-			udpConnectivityState=UDP_NOT_AVAILABLE;
-			useTCP=true;
-			useUDP=avgPongs>1.0;
-			if(endpoints.at(currentEndpoint).type!=Endpoint::Type::TCP_RELAY)
-				setCurrentEndpointToTCP=true;
-			AddTCPRelays();
-			waitingForRelayPeerInfo=false;
-		}else if(avgPongs<3.0){
-			if(needRateFlags & NEED_RATE_FLAG_UDP_BAD)
-				needRate=true;
-			udpConnectivityState=UDP_BAD;
-			useTCP=true;
-			setCurrentEndpointToTCP=true;
-			AddTCPRelays();
-			udpPingTimeoutID=messageThread.Post(std::bind(&VoIPController::SendUdpPings, this), 0.5, 0.5);
-		}else{
-			udpPingTimeoutID=MessageThread::INVALID_ID;
-			udpConnectivityState=UDP_AVAILABLE;
-		}
-	}else{
-		udpPingTimeoutID=MessageThread::INVALID_ID;
-		udpConnectivityState=UDP_NOT_AVAILABLE;
-	}
-}
-
-void VoIPController::SendRelayPings(){
-	MutexGuard m(endpointsMutex);
-	if((state==STATE_ESTABLISHED || state==STATE_RECONNECTING) && endpoints.size()>1){
-		Endpoint* _preferredRelay=&endpoints.at(preferredRelay);
-		Endpoint* _currentEndpoint=&endpoints.at(currentEndpoint);
-		Endpoint* minPingRelay=_preferredRelay;
-		double minPing=_preferredRelay->averageRTT*(_preferredRelay->type==Endpoint::Type::TCP_RELAY ? 2 : 1);
-		if(minPing==0.0) // force the switch to an available relay, if any
-			minPing=DBL_MAX;
-		for(pair<const int64_t, Endpoint>& _endpoint:endpoints){
-			Endpoint& endpoint=_endpoint.second;
-			if(endpoint.type==Endpoint::Type::TCP_RELAY && !useTCP)
-				continue;
-			if(endpoint.type==Endpoint::Type::UDP_RELAY && !useUDP)
-				continue;
-			if(GetCurrentTime()-endpoint.lastPingTime>=10){
-				LOGV("Sending ping to %s", endpoint.GetAddress().ToString().c_str());
-				SendOrEnqueuePacket(PendingOutgoingPacket{
-						/*.seq=*/(endpoint.lastPingSeq=GenerateOutSeq()),
-						/*.type=*/PKT_PING,
-						/*.len=*/0,
-						/*.data=*/Buffer(),
-						/*.endpoint=*/endpoint.id
-				});
-				endpoint.lastPingTime=GetCurrentTime();
-			}
-			if((useUDP && endpoint.type==Endpoint::Type::UDP_RELAY) || (useTCP && endpoint.type==Endpoint::Type::TCP_RELAY)){
-				double k=endpoint.type==Endpoint::Type::UDP_RELAY ? 1 : 2;
-				if(endpoint.averageRTT>0 && endpoint.averageRTT*k<minPing*relaySwitchThreshold){
-					minPing=endpoint.averageRTT*k;
-					minPingRelay=&endpoint;
-				}
-			}
-		}
-		if(minPingRelay->id!=preferredRelay){
-			preferredRelay=minPingRelay->id;
-			_preferredRelay=minPingRelay;
-			LOGV("set preferred relay to %s", _preferredRelay->address.ToString().c_str());
-			if(_currentEndpoint->type==Endpoint::Type::UDP_RELAY || _currentEndpoint->type==Endpoint::Type::TCP_RELAY){
-				currentEndpoint=preferredRelay;
-				_currentEndpoint=_preferredRelay;
-			}
-		}
-		if(_currentEndpoint->type==Endpoint::Type::UDP_RELAY && useUDP){
-			constexpr int64_t p2pID=(int64_t)(FOURCC('P','2','P','4')) << 32;
-			constexpr int64_t lanID=(int64_t)(FOURCC('L','A','N','4')) << 32;
-
-			if(endpoints.find(p2pID)!=endpoints.end()){
-				Endpoint& p2p=endpoints[p2pID];
-				if(endpoints.find(lanID)!=endpoints.end() && endpoints[lanID].averageRTT>0 && endpoints[lanID].averageRTT<minPing*relayToP2pSwitchThreshold){
-					currentEndpoint=lanID;
-					LOGI("Switching to p2p (LAN)");
-				}else{
-					if(p2p.averageRTT>0 && p2p.averageRTT<minPing*relayToP2pSwitchThreshold){
-						currentEndpoint=p2pID;
-						LOGI("Switching to p2p (Inet)");
-					}
-				}
-			}
-		}else{
-			if(minPing>0 && minPing<_currentEndpoint->averageRTT*p2pToRelaySwitchThreshold){
-				LOGI("Switching to relay");
-				currentEndpoint=preferredRelay;
-			}
-		}
-	}
-}
-
-void VoIPController::UpdateRTT(){
-	rttHistory.Add(GetAverageRTT());
-	//double v=rttHistory.Average();
-	if(rttHistory[0]>10.0 && rttHistory[8]>10.0 && (networkType==NET_TYPE_EDGE || networkType==NET_TYPE_GPRS)){
-		waitingForAcks=true;
-	}else{
-		waitingForAcks=false;
-	}
-	//LOGI("%.3lf/%.3lf, rtt diff %.3lf, waiting=%d, queue=%d", rttHistory[0], rttHistory[8], v, waitingForAcks, sendQueue->Size());
-	for(vector<shared_ptr<Stream>>::iterator stm=incomingStreams.begin();stm!=incomingStreams.end();++stm){
-		if((*stm)->jitterBuffer){
-			int lostCount=(*stm)->jitterBuffer->GetAndResetLostPacketCount();
-			if(lostCount>0 || (lostCount<0 && recvLossCount>((uint32_t) -lostCount)))
-				recvLossCount+=lostCount;
-		}
-	}
-}
-
-void VoIPController::UpdateCongestion(){
-	if(conctl && encoder){
-		uint32_t sendLossCount=conctl->GetSendLossCount();
-		sendLossCountHistory.Add(sendLossCount-prevSendLossCount);
-		prevSendLossCount=sendLossCount;
-		double packetsPerSec=1000/(double) outgoingStreams[0]->frameDuration;
-		double avgSendLossCount=sendLossCountHistory.Average()/packetsPerSec;
-		//LOGV("avg send loss: %.3f%%", avgSendLossCount*100);
-
-		if(avgSendLossCount>packetLossToEnableExtraEC && networkType!=NET_TYPE_GPRS && networkType!=NET_TYPE_EDGE){
-			if(!shittyInternetMode){
-				// Shitty Internet Mode™. Redundant redundancy you can trust.
-				shittyInternetMode=true;
-				for(shared_ptr<Stream> &s:outgoingStreams){
-					if(s->type==STREAM_TYPE_AUDIO){
-						s->extraECEnabled=true;
-						SendStreamFlags(*s);
-						break;
-					}
-				}
-				if(encoder)
-					encoder->SetSecondaryEncoderEnabled(true);
-				LOGW("Enabling extra EC");
-				if(needRateFlags & NEED_RATE_FLAG_SHITTY_INTERNET_MODE)
-					needRate=true;
-				wasExtraEC=true;
-			}
-		}
-		
-		if(avgSendLossCount>0.08){
-			extraEcLevel=4;
-		}else if(avgSendLossCount>0.05){
-			extraEcLevel=3;
-		}else if(avgSendLossCount>0.02){
-			extraEcLevel=2;
-		}else{
-			extraEcLevel=0;
-		}
-		encoder->SetPacketLoss((int)(avgSendLossCount*100.0));
-		if(avgSendLossCount>rateMaxAcceptableSendLoss)
-			needRate=true;
-
-		if((avgSendLossCount<packetLossToEnableExtraEC || networkType==NET_TYPE_EDGE || networkType==NET_TYPE_GPRS) && shittyInternetMode){
-			shittyInternetMode=false;
-			for(shared_ptr<Stream> &s:outgoingStreams){
-				if(s->type==STREAM_TYPE_AUDIO){
-					s->extraECEnabled=false;
-					SendStreamFlags(*s);
-					break;
-				}
-			}
-			if(encoder)
-				encoder->SetSecondaryEncoderEnabled(false);
-			LOGW("Disabling extra EC");
-		}
-		if(!wasEncoderLaggy && encoder->GetComplexity()<10)
-			wasEncoderLaggy=true;
-	}
-}
-
-void VoIPController::UpdateAudioBitrate(){
-	if(encoder && conctl){
-		double time=GetCurrentTime();
-		if((audioInput && !audioInput->IsInitialized()) || (audioOutput && !audioOutput->IsInitialized())){
-			LOGE("Audio I/O failed");
-			lastError=ERROR_AUDIO_IO;
-			SetState(STATE_FAILED);
-		}
-
-		int act=conctl->GetBandwidthControlAction();
-		if(shittyInternetMode){
-			encoder->SetBitrate(8000);
-		}else if(act==TGVOIP_CONCTL_ACT_DECREASE){
-			uint32_t bitrate=encoder->GetBitrate();
-			if(bitrate>8000)
-				encoder->SetBitrate(bitrate<(minAudioBitrate+audioBitrateStepDecr) ? minAudioBitrate : (bitrate-audioBitrateStepDecr));
-		}else if(act==TGVOIP_CONCTL_ACT_INCREASE){
-			uint32_t bitrate=encoder->GetBitrate();
-			if(bitrate<maxBitrate)
-				encoder->SetBitrate(bitrate+audioBitrateStepIncr);
-		}
-
-		if(state==STATE_ESTABLISHED && time-lastRecvPacketTime>=reconnectingTimeout){
-			SetState(STATE_RECONNECTING);
-			if(needRateFlags & NEED_RATE_FLAG_RECONNECTING)
-				needRate=true;
-			wasReconnecting=true;
-			ResetUdpAvailability();
-		}
-
-		if(state==STATE_ESTABLISHED || state==STATE_RECONNECTING){
-			if(time-lastRecvPacketTime>=config.recvTimeout){
-				const Endpoint& _currentEndpoint=endpoints.at(currentEndpoint);
-				if(_currentEndpoint.type!=Endpoint::Type::UDP_RELAY && _currentEndpoint.type!=Endpoint::Type::TCP_RELAY){
-					LOGW("Packet receive timeout, switching to relay");
-					currentEndpoint=preferredRelay;
-					for(pair<const int64_t, Endpoint>& _e:endpoints){
-						Endpoint& e=_e.second;
-						if(e.type==Endpoint::Type::UDP_P2P_INET || e.type==Endpoint::Type::UDP_P2P_LAN){
-							e.averageRTT=0;
-							e.rtts.Reset();
-						}
-					}
-					if(allowP2p){
-						SendPublicEndpointsRequest();
-					}
-					UpdateDataSavingState();
-					UpdateAudioBitrateLimit();
-					BufferOutputStream s(4);
-					s.WriteInt32(dataSavingMode ? INIT_FLAG_DATA_SAVING_ENABLED : 0);
-					if(peerVersion<6){
-						SendPacketReliably(PKT_NETWORK_CHANGED, s.GetBuffer(), s.GetLength(), 1, 20);
-					}else{
-						Buffer buf(move(s));
-						SendExtra(buf, EXTRA_TYPE_NETWORK_CHANGED);
-					}
-					lastRecvPacketTime=time;
-				}else{
-					LOGW("Packet receive timeout, disconnecting");
-					lastError=ERROR_TIMEOUT;
-					SetState(STATE_FAILED);
-				}
-			}
-		}
-	}
-}
-
-void VoIPController::UpdateSignalBars(){
-	int prevSignalBarCount=GetSignalBarsCount();
-	double packetsPerSec=1000/(double) outgoingStreams[0]->frameDuration;
-	double avgSendLossCount=sendLossCountHistory.Average()/packetsPerSec;
-
-	int signalBarCount=4;
-	if(state==STATE_RECONNECTING || waitingForAcks)
-		signalBarCount=1;
-	if(endpoints.at(currentEndpoint).type==Endpoint::Type::TCP_RELAY){
-		signalBarCount=MIN(signalBarCount, 3);
-	}
-	if(avgSendLossCount>0.1){
-		signalBarCount=1;
-	}else if(avgSendLossCount>0.0625){
-		signalBarCount=MIN(signalBarCount, 2);
-	}else if(avgSendLossCount>0.025){
-		signalBarCount=MIN(signalBarCount, 3);
-	}
-
-	for(shared_ptr<Stream>& stm:incomingStreams){
-		if(stm->jitterBuffer){
-			double avgLateCount[3];
-			stm->jitterBuffer->GetAverageLateCount(avgLateCount);
-			if(avgLateCount[2]>=0.2)
-				signalBarCount=1;
-			else if(avgLateCount[2]>=0.1)
-				signalBarCount=MIN(signalBarCount, 2);
-		}
-	}
-
-	signalBarsHistory.Add(static_cast<unsigned char>(signalBarCount));
-	//LOGV("Signal bar count history %08X", *reinterpret_cast<uint32_t *>(&signalBarsHistory));
-	int _signalBarCount=GetSignalBarsCount();
-	if(_signalBarCount!=prevSignalBarCount){
-		LOGD("SIGNAL BAR COUNT CHANGED: %d", _signalBarCount);
-		if(callbacks.signalBarCountChanged)
-			callbacks.signalBarCountChanged(this, _signalBarCount);
-	}
-}
-
-void VoIPController::UpdateQueuedPackets(){
-	vector<PendingOutgoingPacket> packetsToSend;
-	{
-		MutexGuard m(queuedPacketsMutex);
-		for(std::vector<QueuedPacket>::iterator qp=queuedPackets.begin(); qp!=queuedPackets.end();){
-			if(qp->timeout>0 && qp->firstSentTime>0 && GetCurrentTime()-qp->firstSentTime>=qp->timeout){
-				LOGD("Removing queued packet because of timeout");
-				qp=queuedPackets.erase(qp);
-				continue;
-			}
-			if(GetCurrentTime()-qp->lastSentTime>=qp->retryInterval){
-				messageThread.Post(std::bind(&VoIPController::UpdateQueuedPackets, this), qp->retryInterval);
-				uint32_t seq=GenerateOutSeq();
-				qp->seqs.Add(seq);
-				qp->lastSentTime=GetCurrentTime();
-				//LOGD("Sending queued packet, seq=%u, type=%u, len=%u", seq, qp.type, qp.data.Length());
-				Buffer buf(qp->data.Length());
-				if(qp->firstSentTime==0)
-					qp->firstSentTime=qp->lastSentTime;
-				if(qp->data.Length())
-					buf.CopyFrom(qp->data, qp->data.Length());
-				packetsToSend.push_back(PendingOutgoingPacket{
-						/*.seq=*/seq,
-						/*.type=*/qp->type,
-						/*.len=*/qp->data.Length(),
-						/*.data=*/move(buf),
-						/*.endpoint=*/0
-				});
-			}
-			++qp;
-		}
-	}
-	for(PendingOutgoingPacket& pkt:packetsToSend){
-		SendOrEnqueuePacket(move(pkt));
-	}
-}
-
-void VoIPController::SendNopPacket(){
-	if(state!=STATE_ESTABLISHED)
-		return;
-	SendOrEnqueuePacket(PendingOutgoingPacket{
-			/*.seq=*/(firstSentPing=GenerateOutSeq()),
-			/*.type=*/PKT_NOP,
-			/*.len=*/0,
-			/*.data=*/Buffer(),
-			/*.endpoint=*/0
-	});
-}
-
-void VoIPController::SendPublicEndpointsRequest(){
-	if(!allowP2p)
-		return;
-	LOGI("Sending public endpoints request");
-	MutexGuard m(endpointsMutex);
-	for(pair<const int64_t, Endpoint>& e:endpoints){
-		if(e.second.type==Endpoint::Type::UDP_RELAY && !e.second.IsIPv6Only()){
-			SendPublicEndpointsRequest(e.second);
-		}
-	}
-	publicEndpointsReqCount++;
-	if(publicEndpointsReqCount<10){
-		messageThread.Post([this]{
-			if(waitingForRelayPeerInfo){
-				LOGW("Resending peer relay info request");
-				SendPublicEndpointsRequest();
-			}
-		}, 5.0);
-	}else{
-		publicEndpointsReqCount=0;
-	}
-}
-
-void VoIPController::TickJitterBufferAngCongestionControl(){
-	// TODO get rid of this and update states of these things internally and retroactively
-	for(shared_ptr<Stream>& stm:incomingStreams){
-		if(stm->jitterBuffer){
-			stm->jitterBuffer->Tick();
-		}
-	}
-	if(conctl){
-		conctl->Tick();
-	}
-}
-
-#pragma mark - Endpoint
-
-Endpoint::Endpoint(int64_t id, uint16_t port, const IPv4Address& _address, const IPv6Address& _v6address, Type type, unsigned char peerTag[16]) : address(_address), v6address(_v6address){
-	this->id=id;
-	this->port=port;
-	this->type=type;
-	memcpy(this->peerTag, peerTag, 16);
-	if(type==Type::UDP_RELAY && ServerConfig::GetSharedInstance()->GetBoolean("force_tcp", false))
-		this->type=Type::TCP_RELAY;
-
-	lastPingSeq=0;
-	lastPingTime=0;
-	averageRTT=0;
-	socket=NULL;
-	udpPongCount=0;
-}
-
-Endpoint::Endpoint() : address(0), v6address(string("::0")) {
-	lastPingSeq=0;
-	lastPingTime=0;
-	averageRTT=0;
-	socket=NULL;
-	udpPongCount=0;
-}
-
-const NetworkAddress &Endpoint::GetAddress() const{
-	return IsIPv6Only() ? (NetworkAddress&)v6address : (NetworkAddress&)address;
-}
-
-NetworkAddress &Endpoint::GetAddress(){
-	return IsIPv6Only() ? (NetworkAddress&)v6address : (NetworkAddress&)address;
-}
-
-bool Endpoint::IsIPv6Only() const{
-	return address.IsEmpty() && !v6address.IsEmpty();
-}
-
-Endpoint::~Endpoint(){
-	if(socket){
-		socket->Close();
-		delete socket;
-	}
-}
-
-#pragma mark - AudioInputTester
-
-AudioInputTester::AudioInputTester(std::string deviceID) : deviceID(deviceID){
-	io=audio::AudioIO::Create(deviceID, "default");
-	if(io->Failed()){
-		LOGE("Audio IO failed");
-		return;
-	}
-	input=io->GetInput();
-	input->SetCallback([](unsigned char* data, size_t size, void* ctx) -> size_t{
-		reinterpret_cast<AudioInputTester*>(ctx)->Update(reinterpret_cast<int16_t*>(data), size/2);
-		return 0;
-	}, this);
-	input->Start();
-	/*thread=new MessageThread();
-	thread->Start();
-	thread->Post([this]{
-		this->callback(maxSample/(float)INT16_MAX);
-		maxSample=0;
-	}, updateInterval, updateInterval);*/
-}
-
-AudioInputTester::~AudioInputTester(){
-	//thread->Stop();
-	//delete thread;
-	input->Stop();
-	delete io;
-}
-
-void AudioInputTester::Update(int16_t *samples, size_t count){
-	for(size_t i=0;i<count;i++){
-		int16_t s=abs(samples[i]);
-		if(s>maxSample)
-			maxSample=s;
-	}
-}
-
-float AudioInputTester::GetAndResetLevel(){
-	float s=maxSample;
-	maxSample=0;
-	return s/(float)INT16_MAX;
-}
diff --git a/submodules/libtgvoip/VoIPController.h b/submodules/libtgvoip/VoIPController.h
deleted file mode 100755
index bb3c30de5c..0000000000
--- a/submodules/libtgvoip/VoIPController.h
+++ /dev/null
@@ -1,879 +0,0 @@
-//
-// libtgvoip is free and unencumbered public domain software.
-// For more information, see http://unlicense.org or the UNLICENSE file
-// you should have received with this source code distribution.
-//
-
-#ifndef __VOIPCONTROLLER_H
-#define __VOIPCONTROLLER_H
-
-#ifndef _WIN32
-#include <arpa/inet.h>
-#include <netinet/in.h>
-#endif
-#ifdef __APPLE__
-#include <TargetConditionals.h>
-#include "os/darwin/AudioUnitIO.h"
-#endif
-#include <stdint.h>
-#include <vector>
-#include <string>
-#include <unordered_map>
-#include <map>
-#include <memory>
-#include "video/VideoSource.h"
-#include "video/VideoRenderer.h"
-#include <atomic>
-#include "video/ScreamCongestionController.h"
-#include "audio/AudioInput.h"
-#include "BlockingQueue.h"
-#include "audio/AudioOutput.h"
-#include "audio/AudioIO.h"
-#include "JitterBuffer.h"
-#include "OpusDecoder.h"
-#include "OpusEncoder.h"
-#include "EchoCanceller.h"
-#include "CongestionControl.h"
-#include "NetworkSocket.h"
-#include "Buffers.h"
-#include "PacketReassembler.h"
-#include "MessageThread.h"
-#include "utils.h"
-
-#define LIBTGVOIP_VERSION "2.4.4"
-
-#ifdef _WIN32
-#undef GetCurrentTime
-#undef ERROR_TIMEOUT
-#endif
-
-#define TGVOIP_PEER_CAP_GROUP_CALLS 1
-#define TGVOIP_PEER_CAP_VIDEO_CAPTURE 2
-#define TGVOIP_PEER_CAP_VIDEO_DISPLAY 4
-
-namespace tgvoip{
-
-	enum{
-		PROXY_NONE=0,
-		PROXY_SOCKS5,
-		//PROXY_HTTP
-	};
-
-	enum{
-		STATE_WAIT_INIT=1,
-		STATE_WAIT_INIT_ACK,
-		STATE_ESTABLISHED,
-		STATE_FAILED,
-		STATE_RECONNECTING
-	};
-
-	enum{
-		ERROR_UNKNOWN=0,
-		ERROR_INCOMPATIBLE,
-		ERROR_TIMEOUT,
-		ERROR_AUDIO_IO,
-		ERROR_PROXY
-	};
-
-	enum{
-		NET_TYPE_UNKNOWN=0,
-		NET_TYPE_GPRS,
-		NET_TYPE_EDGE,
-		NET_TYPE_3G,
-		NET_TYPE_HSPA,
-		NET_TYPE_LTE,
-		NET_TYPE_WIFI,
-		NET_TYPE_ETHERNET,
-		NET_TYPE_OTHER_HIGH_SPEED,
-		NET_TYPE_OTHER_LOW_SPEED,
-		NET_TYPE_DIALUP,
-		NET_TYPE_OTHER_MOBILE
-	};
-
-	enum{
-		DATA_SAVING_NEVER=0,
-		DATA_SAVING_MOBILE,
-		DATA_SAVING_ALWAYS
-	};
-
-	struct CryptoFunctions{
-		void (*rand_bytes)(uint8_t* buffer, size_t length);
-		void (*sha1)(uint8_t* msg, size_t length, uint8_t* output);
-		void (*sha256)(uint8_t* msg, size_t length, uint8_t* output);
-		void (*aes_ige_encrypt)(uint8_t* in, uint8_t* out, size_t length, uint8_t* key, uint8_t* iv);
-		void (*aes_ige_decrypt)(uint8_t* in, uint8_t* out, size_t length, uint8_t* key, uint8_t* iv);
-		void (*aes_ctr_encrypt)(uint8_t* inout, size_t length, uint8_t* key, uint8_t* iv, uint8_t* ecount, uint32_t* num);
-		void (*aes_cbc_encrypt)(uint8_t* in, uint8_t* out, size_t length, uint8_t* key, uint8_t* iv);
-		void (*aes_cbc_decrypt)(uint8_t* in, uint8_t* out, size_t length, uint8_t* key, uint8_t* iv);
-	};
-	
-	struct CellularCarrierInfo{
-		std::string name;
-		std::string mcc;
-		std::string mnc;
-		std::string countryCode;
-	};
-
-	class Endpoint{
-		friend class VoIPController;
-		friend class VoIPGroupController;
-	public:
-
-		enum Type{
-			UDP_P2P_INET=1,
-			UDP_P2P_LAN,
-			UDP_RELAY,
-			TCP_RELAY
-		};
-
-		Endpoint(int64_t id, uint16_t port, const IPv4Address& address, const IPv6Address& v6address, Type type, unsigned char* peerTag);
-		Endpoint();
-		~Endpoint();
-		const NetworkAddress& GetAddress() const;
-		NetworkAddress& GetAddress();
-		bool IsIPv6Only() const;
-		int64_t id;
-		uint16_t port;
-		IPv4Address address;
-		IPv6Address v6address;
-		Type type;
-		unsigned char peerTag[16];
-
-	private:
-		double lastPingTime;
-		uint32_t lastPingSeq;
-		HistoricBuffer<double, 6> rtts;
-		double averageRTT;
-		NetworkSocket* socket;
-		int udpPongCount;
-	};
-
-	class AudioDevice{
-	public:
-		std::string id;
-		std::string displayName;
-	};
-
-	class AudioOutputDevice : public AudioDevice{
-
-	};
-
-	class AudioInputDevice : public AudioDevice{
-	
-	};
-	
-	class AudioInputTester{
-	public:
-		AudioInputTester(const std::string deviceID);
-		~AudioInputTester();
-		TGVOIP_DISALLOW_COPY_AND_ASSIGN(AudioInputTester);
-		float GetAndResetLevel();
-		bool Failed(){
-			return io && io->Failed();
-		}
-	private:
-		void Update(int16_t* samples, size_t count);
-		audio::AudioIO* io=NULL;
-		audio::AudioInput* input=NULL;
-		int16_t maxSample=0;
-		std::string deviceID;
-	};
-
-	class VoIPController{
-		friend class VoIPGroupController;
-	public:
-		TGVOIP_DISALLOW_COPY_AND_ASSIGN(VoIPController);
-		struct Config{
-			Config(double initTimeout=30.0, double recvTimeout=20.0, int dataSaving=DATA_SAVING_NEVER, bool enableAEC=false, bool enableNS=false, bool enableAGC=false, bool enableCallUpgrade=false){
-				this->initTimeout=initTimeout;
-				this->recvTimeout=recvTimeout;
-				this->dataSaving=dataSaving;
-				this->enableAEC=enableAEC;
-				this->enableNS=enableNS;
-				this->enableAGC=enableAGC;
-				this->enableCallUpgrade=enableCallUpgrade;
-			}
-
-			double initTimeout;
-			double recvTimeout;
-			int dataSaving;
-#ifndef _WIN32
-			std::string logFilePath="";
-			std::string statsDumpFilePath="";
-#else
-			std::wstring logFilePath=L"";
-			std::wstring statsDumpFilePath=L"";
-#endif
-
-			bool enableAEC;
-			bool enableNS;
-			bool enableAGC;
-
-			bool enableCallUpgrade;
-
-			bool logPacketStats=false;
-			bool enableVolumeControl=false;
-
-			bool enableVideoSend=false;
-			bool enableVideoReceive=false;
-		};
-
-		struct TrafficStats{
-			uint64_t bytesSentWifi;
-			uint64_t bytesRecvdWifi;
-			uint64_t bytesSentMobile;
-			uint64_t bytesRecvdMobile;
-		};
-
-
-		VoIPController();
-		virtual ~VoIPController();
-
-		/**
-		 * Set the initial endpoints (relays)
-		 * @param endpoints Endpoints converted from phone.PhoneConnection TL objects
-		 * @param allowP2p Whether p2p connectivity is allowed
-		 * @param connectionMaxLayer The max_layer field from the phoneCallProtocol object returned by Telegram server.
-		 * DO NOT HARDCODE THIS VALUE, it's extremely important for backwards compatibility.
-		 */
-		void SetRemoteEndpoints(std::vector<Endpoint> endpoints, bool allowP2p, int32_t connectionMaxLayer);
-		/**
-		 * Initialize and start all the internal threads
-		 */
-		void Start();
-		/**
-		 * Stop any internal threads. Don't call any other methods after this.
-		 */
-		void Stop();
-		/**
-		 * Initiate connection
-		 */
-		void Connect();
-		Endpoint& GetRemoteEndpoint();
-		/**
-		 * Get the debug info string to be displayed in client UI
-		 */
-		virtual std::string GetDebugString();
-		/**
-		 * Notify the library of network type change
-		 * @param type The new network type
-		 */
-		virtual void SetNetworkType(int type);
-		/**
-		 * Get the average round-trip time for network packets
-		 * @return
-		 */
-		double GetAverageRTT();
-		static double GetCurrentTime();
-		/**
-		 * Use this field to store any of your context data associated with this call
-		 */
-		void* implData;
-		/**
-		 *
-		 * @param mute
-		 */
-		virtual void SetMicMute(bool mute);
-		/**
-		 *
-		 * @param key
-		 * @param isOutgoing
-		 */
-		void SetEncryptionKey(char* key, bool isOutgoing);
-		/**
-		 *
-		 * @param cfg
-		 */
-		void SetConfig(const Config& cfg);
-		void DebugCtl(int request, int param);
-		/**
-		 *
-		 * @param stats
-		 */
-		void GetStats(TrafficStats* stats);
-		/**
-		 *
-		 * @return
-		 */
-		int64_t GetPreferredRelayID();
-		/**
-		 *
-		 * @return
-		 */
-		int GetLastError();
-		/**
-		 *
-		 */
-		static CryptoFunctions crypto;
-		/**
-		 *
-		 * @return
-		 */
-		static const char* GetVersion();
-		/**
-		 *
-		 * @return
-		 */
-		std::string GetDebugLog();
-		/**
-		 *
-		 * @return
-		 */
-		static std::vector<AudioInputDevice> EnumerateAudioInputs();
-		/**
-		 *
-		 * @return
-		 */
-		static std::vector<AudioOutputDevice> EnumerateAudioOutputs();
-		/**
-		 *
-		 * @param id
-		 */
-		void SetCurrentAudioInput(std::string id);
-		/**
-		 *
-		 * @param id
-		 */
-		void SetCurrentAudioOutput(std::string id);
-		/**
-		 *
-		 * @return
-		 */
-		std::string GetCurrentAudioInputID();
-		/**
-		 *
-		 * @return
-		 */
-		std::string GetCurrentAudioOutputID();
-		/**
-		 * Set the proxy server to route the data through. Call this before connecting.
-		 * @param protocol PROXY_NONE or PROXY_SOCKS5
-		 * @param address IP address or domain name of the server
-		 * @param port Port of the server
-		 * @param username Username; empty string for anonymous
-		 * @param password Password; empty string if none
-		 */
-		void SetProxy(int protocol, std::string address, uint16_t port, std::string username, std::string password);
-		/**
-		 * Get the number of signal bars to display in the client UI.
-		 * @return the number of signal bars, from 1 to 4
-		 */
-		int GetSignalBarsCount();
-		/**
-		 * Enable or disable AGC (automatic gain control) on audio output. Should only be enabled on phones when the earpiece speaker is being used.
-		 * The audio output will be louder with this on.
-		 * AGC with speakerphone or other kinds of loud speakers has detrimental effects on some echo cancellation implementations.
-		 * @param enabled I usually pick argument names to be self-explanatory
-		 */
-		void SetAudioOutputGainControlEnabled(bool enabled);
-		/**
-		 * Get the additional capabilities of the peer client app
-		 * @return corresponding TGVOIP_PEER_CAP_* flags OR'ed together
-		 */
-		uint32_t GetPeerCapabilities();
-		/**
-		 * Send the peer the key for the group call to prepare this private call to an upgrade to a E2E group call.
-		 * The peer must have the TGVOIP_PEER_CAP_GROUP_CALLS capability. After the peer acknowledges the key, Callbacks::groupCallKeySent will be called.
-		 * @param key newly-generated group call key, must be exactly 265 bytes long
-		 */
-		void SendGroupCallKey(unsigned char* key);
-		/**
-		 * In an incoming call, request the peer to generate a new encryption key, send it to you and upgrade this call to a E2E group call.
-		 */
-		void RequestCallUpgrade();
-		void SetEchoCancellationStrength(int strength);
-		int GetConnectionState();
-		bool NeedRate();
-		/**
-		 * Get the maximum connection layer supported by this libtgvoip version.
-		 * Pass this as <code>max_layer</code> in the phone.phoneConnection TL object when requesting and accepting calls.
-		 */
-		static int32_t GetConnectionMaxLayer(){
-			return 92;
-		};
-		/**
-		 * Get the persistable state of the library, like proxy capabilities, to save somewhere on the disk. Call this at the end of the call.
-		 * Using this will speed up the connection establishment in some cases.
-		 */
-		std::vector<uint8_t> GetPersistentState();
-		/**
-		 * Load the persistable state. Call this before starting the call.
-		 */
-		void SetPersistentState(std::vector<uint8_t> state);
-
-#if defined(TGVOIP_USE_CALLBACK_AUDIO_IO)
-		void SetAudioDataCallbacks(std::function<void(int16_t*, size_t)> input, std::function<void(int16_t*, size_t)> output);
-#endif
-
-		void SetVideoCodecSpecificData(const std::vector<Buffer>& data);
-
-		struct Callbacks{
-			void (*connectionStateChanged)(VoIPController*, int);
-			void (*signalBarCountChanged)(VoIPController*, int);
-			void (*groupCallKeySent)(VoIPController*);
-			void (*groupCallKeyReceived)(VoIPController*, const unsigned char*);
-			void (*upgradeToGroupCallRequested)(VoIPController*);
-		};
-		void SetCallbacks(Callbacks callbacks);
-		
-		float GetOutputLevel(){
-			return 0.0f;
-		};
-		int GetVideoResolutionForCurrentBitrate();
-		void SetVideoSource(video::VideoSource* source);
-		void SetVideoRenderer(video::VideoRenderer* renderer);
-		
-		void SetInputVolume(float level);
-		void SetOutputVolume(float level);
-#if defined(__APPLE__) && defined(TARGET_OS_OSX)
-		void SetAudioOutputDuckingEnabled(bool enabled);
-#endif
-
-	private:
-		struct Stream;
-		struct UnacknowledgedExtraData;
-
-	protected:
-		struct RecentOutgoingPacket{
-			uint32_t seq;
-			uint16_t id; // for group calls only
-			double sendTime;
-			double ackTime;
-			uint8_t type;
-			uint32_t size;
-		};
-		struct PendingOutgoingPacket{
-			PendingOutgoingPacket(uint32_t seq, unsigned char type, size_t len, Buffer&& data, int64_t endpoint){
-				this->seq=seq;
-				this->type=type;
-				this->len=len;
-				this->data=std::move(data);
-				this->endpoint=endpoint;
-			}
-			PendingOutgoingPacket(PendingOutgoingPacket&& other){
-				seq=other.seq;
-				type=other.type;
-				len=other.len;
-				data=std::move(other.data);
-				endpoint=other.endpoint;
-			}
-			PendingOutgoingPacket& operator=(PendingOutgoingPacket&& other){
-				if(this!=&other){
-					seq=other.seq;
-					type=other.type;
-					len=other.len;
-					data=std::move(other.data);
-					endpoint=other.endpoint;
-				}
-				return *this;
-			}
-			TGVOIP_DISALLOW_COPY_AND_ASSIGN(PendingOutgoingPacket);
-			uint32_t seq;
-			unsigned char type;
-			size_t len;
-			Buffer data;
-			int64_t endpoint;
-		};
-		struct QueuedPacket{
-#if defined(_MSC_VER) && _MSC_VER <= 1800 // VS2013 doesn't support auto-generating move constructors
-			//TGVOIP_DISALLOW_COPY_AND_ASSIGN(QueuedPacket);
-			QueuedPacket(QueuedPacket&& other){
-				data=std::move(other.data);
-				type=other.type;
-				seqs=other.seqs;
-				firstSentTime=other.firstSentTime;
-				lastSentTime=other.lastSentTime;
-				retryInterval=other.retryInterval;
-				timeout=other.timeout;
-			}
-			QueuedPacket(){
-
-			}
-#endif
-			Buffer data;
-			unsigned char type;
-			HistoricBuffer<uint32_t, 16> seqs;
-			double firstSentTime;
-			double lastSentTime;
-			double retryInterval;
-			double timeout;
-		};
-		virtual void ProcessIncomingPacket(NetworkPacket& packet, Endpoint& srcEndpoint);
-		virtual void ProcessExtraData(Buffer& data);
-		virtual void WritePacketHeader(uint32_t seq, BufferOutputStream* s, unsigned char type, uint32_t length);
-		virtual void SendPacket(unsigned char* data, size_t len, Endpoint& ep, PendingOutgoingPacket& srcPacket);
-		virtual void SendInit();
-		virtual void SendUdpPing(Endpoint& endpoint);
-		virtual void SendRelayPings();
-		virtual void OnAudioOutputReady();
-		virtual void SendExtra(Buffer& data, unsigned char type);
-		void SendStreamFlags(Stream& stream);
-		void SendStreamCSD(Stream& stream);
-		void InitializeTimers();
-		void ResetEndpointPingStats();
-		void SendVideoFrame(const Buffer& frame, uint32_t flags);
-		void ProcessIncomingVideoFrame(Buffer frame, uint32_t pts, bool keyframe);
-		std::shared_ptr<Stream> GetStreamByType(int type, bool outgoing);
-		Endpoint* GetEndpointForPacket(const PendingOutgoingPacket& pkt);
-		bool SendOrEnqueuePacket(PendingOutgoingPacket pkt, bool enqueue=true);
-		static std::string NetworkTypeToString(int type);
-		CellularCarrierInfo GetCarrierInfo();
-
-	private:
-		struct Stream{
-			int32_t userID;
-			unsigned char id;
-			unsigned char type;
-			uint32_t codec;
-			bool enabled;
-			bool extraECEnabled;
-			uint16_t frameDuration;
-			std::shared_ptr<JitterBuffer> jitterBuffer;
-			std::shared_ptr<OpusDecoder> decoder;
-			std::shared_ptr<PacketReassembler> packetReassembler;
-			std::shared_ptr<CallbackWrapper> callbackWrapper;
-			std::vector<Buffer> codecSpecificData;
-			bool csdIsValid=false;
-			int resolution;
-			unsigned int width=0;
-			unsigned int height=0;
-			uint16_t rotation=0;
-		};
-		struct UnacknowledgedExtraData{
-#if defined(_MSC_VER) && _MSC_VER <= 1800 // VS2013 doesn't support auto-generating move constructors
-			UnacknowledgedExtraData(UnacknowledgedExtraData&& other){
-				type=other.type;
-				data=std::move(other.data);
-				firstContainingSeq=other.firstContainingSeq;
-			}
-			UnacknowledgedExtraData(unsigned char _type, Buffer&& _data, uint32_t _firstContainingSeq){
-				type=_type;
-				data=_data;
-				firstContainingSeq=_firstContainingSeq;
-			}
-#endif
-			unsigned char type;
-			Buffer data;
-			uint32_t firstContainingSeq;
-		};
-		enum{
-			UDP_UNKNOWN=0,
-			UDP_PING_PENDING,
-			UDP_PING_SENT,
-			UDP_AVAILABLE,
-			UDP_NOT_AVAILABLE,
-			UDP_BAD
-		};
-		struct DebugLoggedPacket{
-			int32_t seq;
-			double timestamp;
-			int32_t length;
-		};
-		struct SentVideoFrame{
-			uint32_t num;
-			uint32_t fragmentCount;
-			std::vector<uint32_t> unacknowledgedPackets;
-            uint32_t fragmentsInQueue;
-		};
-		struct PendingVideoFrameFragment{
-			uint32_t pts;
-			Buffer data;
-		};
-
-		void RunRecvThread();
-		void RunSendThread();
-		void HandleAudioInput(unsigned char* data, size_t len, unsigned char* secondaryData, size_t secondaryLen);
-		void UpdateAudioBitrateLimit();
-		void SetState(int state);
-		void UpdateAudioOutputState();
-		void InitUDPProxy();
-		void UpdateDataSavingState();
-		void KDF(unsigned char* msgKey, size_t x, unsigned char* aesKey, unsigned char* aesIv);
-		void KDF2(unsigned char* msgKey, size_t x, unsigned char* aesKey, unsigned char* aesIv);
-		static void AudioInputCallback(unsigned char* data, size_t length, unsigned char* secondaryData, size_t secondaryLength, void* param);
-		void SendPublicEndpointsRequest();
-		void SendPublicEndpointsRequest(const Endpoint& relay);
-		Endpoint& GetEndpointByType(int type);
-		void SendPacketReliably(unsigned char type, unsigned char* data, size_t len, double retryInterval, double timeout);
-		uint32_t GenerateOutSeq();
-		void ActuallySendPacket(NetworkPacket& pkt, Endpoint& ep);
-		void InitializeAudio();
-		void StartAudio();
-		void ProcessAcknowledgedOutgoingExtra(UnacknowledgedExtraData& extra);
-		void AddIPv6Relays();
-		void AddTCPRelays();
-		void SendUdpPings();
-		void EvaluateUdpPingResults();
-		void UpdateRTT();
-		void UpdateCongestion();
-		void UpdateAudioBitrate();
-		void UpdateSignalBars();
-		void UpdateQueuedPackets();
-		void SendNopPacket();
-		void TickJitterBufferAngCongestionControl();
-		void ResetUdpAvailability();
-		std::string GetPacketTypeString(unsigned char type);
-		void SetupOutgoingVideoStream();
-		bool WasOutgoingPacketAcknowledged(uint32_t seq);
-		RecentOutgoingPacket* GetRecentOutgoingPacket(uint32_t seq);
-
-		int state;
-		std::map<int64_t, Endpoint> endpoints;
-		int64_t currentEndpoint=0;
-		int64_t preferredRelay=0;
-		int64_t peerPreferredRelay=0;
-		bool runReceiver;
-		std::atomic<uint32_t> seq;
-		uint32_t lastRemoteSeq;
-		uint32_t lastRemoteAckSeq;
-		uint32_t lastSentSeq;
-		std::vector<RecentOutgoingPacket> recentOutgoingPackets;
-		double recvPacketTimes[32];
-		HistoricBuffer<uint32_t, 10, double> sendLossCountHistory;
-		uint32_t audioTimestampIn;
-		uint32_t audioTimestampOut;
-		tgvoip::audio::AudioIO* audioIO=NULL;
-		tgvoip::audio::AudioInput* audioInput=NULL;
-		tgvoip::audio::AudioOutput* audioOutput=NULL;
-		OpusEncoder* encoder;
-		std::vector<PendingOutgoingPacket> sendQueue;
-		EchoCanceller* echoCanceller;
-		Mutex sendBufferMutex;
-		Mutex endpointsMutex;
-		Mutex socketSelectMutex;
-		bool stopping;
-		bool audioOutStarted;
-		Thread* recvThread;
-		Thread* sendThread;
-		uint32_t packetsReceived;
-		uint32_t recvLossCount;
-		uint32_t prevSendLossCount;
-		uint32_t firstSentPing;
-		HistoricBuffer<double, 32> rttHistory;
-		bool waitingForAcks;
-		int networkType;
-		int dontSendPackets;
-		int lastError;
-		bool micMuted;
-		uint32_t maxBitrate;
-		std::vector<std::shared_ptr<Stream>> outgoingStreams;
-		std::vector<std::shared_ptr<Stream>> incomingStreams;
-		unsigned char encryptionKey[256];
-		unsigned char keyFingerprint[8];
-		unsigned char callID[16];
-		double stateChangeTime;
-		bool waitingForRelayPeerInfo;
-		bool allowP2p;
-		bool dataSavingMode;
-		bool dataSavingRequestedByPeer;
-		std::string activeNetItfName;
-		double publicEndpointsReqTime;
-		std::vector<QueuedPacket> queuedPackets;
-		Mutex audioIOMutex;
-		Mutex queuedPacketsMutex;
-		double connectionInitTime;
-		double lastRecvPacketTime;
-		Config config;
-		int32_t peerVersion;
-		CongestionControl* conctl;
-		TrafficStats stats;
-		bool receivedInit;
-		bool receivedInitAck;
-		bool isOutgoing;
-		NetworkSocket* udpSocket;
-		NetworkSocket* realUdpSocket;
-		FILE* statsDump;
-		std::string currentAudioInput;
-		std::string currentAudioOutput;
-		bool useTCP;
-		bool useUDP;
-		bool didAddTcpRelays;
-		SocketSelectCanceller* selectCanceller;
-		HistoricBuffer<unsigned char, 4, int> signalBarsHistory;
-		bool audioStarted=false;
-
-		int udpConnectivityState;
-		double lastUdpPingTime;
-		int udpPingCount;
-    	int echoCancellationStrength;
-
-		int proxyProtocol;
-		std::string proxyAddress;
-		uint16_t proxyPort;
-		std::string proxyUsername;
-		std::string proxyPassword;
-		IPv4Address* resolvedProxyAddress;
-
-		uint32_t peerCapabilities;
-		Callbacks callbacks;
-		bool didReceiveGroupCallKey;
-		bool didReceiveGroupCallKeyAck;
-		bool didSendGroupCallKey;
-		bool didSendUpgradeRequest;
-		bool didInvokeUpgradeCallback;
-
-		int32_t connectionMaxLayer;
-		bool useMTProto2;
-		bool setCurrentEndpointToTCP;
-
-		std::vector<UnacknowledgedExtraData> currentExtras;
-		std::unordered_map<uint8_t, uint64_t> lastReceivedExtrasByType;
-		bool useIPv6;
-		bool peerIPv6Available;
-		IPv6Address myIPv6;
-		bool shittyInternetMode;
-		int extraEcLevel=0;
-		std::vector<Buffer> ecAudioPackets;
-		bool didAddIPv6Relays;
-		bool didSendIPv6Endpoint;
-		int publicEndpointsReqCount=0;
-		MessageThread messageThread;
-		bool wasEstablished=false;
-		bool receivedFirstStreamPacket=false;
-		std::atomic<unsigned int> unsentStreamPackets;
-		HistoricBuffer<unsigned int, 5> unsentStreamPacketsHistory;
-		bool needReInitUdpProxy=true;
-		bool needRate=false;
-		std::vector<DebugLoggedPacket> debugLoggedPackets;
-
-		uint32_t initTimeoutID=MessageThread::INVALID_ID;
-		uint32_t noStreamsNopID=MessageThread::INVALID_ID;
-		uint32_t udpPingTimeoutID=MessageThread::INVALID_ID;
-		
-		effects::Volume outputVolume;
-		effects::Volume inputVolume;
-
-		std::vector<uint32_t> peerVideoDecoders;
-        int peerMaxVideoResolution=0;
-
-#if defined(TGVOIP_USE_CALLBACK_AUDIO_IO)
-		std::function<void(int16_t*, size_t)> audioInputDataCallback;
-		std::function<void(int16_t*, size_t)> audioOutputDataCallback;
-#endif
-#if defined(__APPLE__) && defined(TARGET_OS_OSX)
-		bool macAudioDuckingEnabled=true;
-#endif
-		
-		video::VideoSource* videoSource=NULL;
-		video::VideoRenderer* videoRenderer=NULL;
-		double firstVideoFrameTime=0.0;
-		uint32_t videoFrameCount=0;
-		uint32_t lastReceivedVideoFrameNumber=UINT32_MAX;
-		std::vector<SentVideoFrame> sentVideoFrames;
-		Mutex sentVideoFramesMutex;
-		bool videoKeyframeRequested=false;
-		video::ScreamCongestionController videoCongestionControl;
-		std::vector<PendingVideoFrameFragment> videoPacingQueue;
-		uint32_t sendVideoPacketID=MessageThread::INVALID_ID;
-		uint32_t videoPacketLossCount=0;
-		uint32_t currentVideoBitrate=0;
-		double lastVideoResolutionChangeTime=0.0;
-
-		/*** debug report problems ***/
-		bool wasReconnecting=false;
-		bool wasExtraEC=false;
-		bool wasEncoderLaggy=false;
-		bool wasNetworkHandover=false;
-
-		/*** persistable state values ***/
-		bool proxySupportsUDP=true;
-		bool proxySupportsTCP=true;
-		std::string lastTestedProxyServer="";
-
-		/*** server config values ***/
-		uint32_t maxAudioBitrate;
-		uint32_t maxAudioBitrateEDGE;
-		uint32_t maxAudioBitrateGPRS;
-		uint32_t maxAudioBitrateSaving;
-		uint32_t initAudioBitrate;
-		uint32_t initAudioBitrateEDGE;
-		uint32_t initAudioBitrateGPRS;
-		uint32_t initAudioBitrateSaving;
-		uint32_t minAudioBitrate;
-		uint32_t audioBitrateStepIncr;
-		uint32_t audioBitrateStepDecr;
-		double relaySwitchThreshold;
-		double p2pToRelaySwitchThreshold;
-		double relayToP2pSwitchThreshold;
-		double reconnectingTimeout;
-		uint32_t needRateFlags;
-		double rateMaxAcceptableRTT;
-		double rateMaxAcceptableSendLoss;
-		double packetLossToEnableExtraEC;
-		uint32_t maxUnsentStreamPackets;
-
-	public:
-#ifdef __APPLE__
-		static double machTimebase;
-		static uint64_t machTimestart;
-#endif
-#ifdef _WIN32
-		static int64_t win32TimeScale;
-		static bool didInitWin32TimeScale;
-#endif
-	};
-
-	class VoIPGroupController : public VoIPController{
-	public:
-		VoIPGroupController(int32_t timeDifference);
-		virtual ~VoIPGroupController();
-		void SetGroupCallInfo(unsigned char* encryptionKey, unsigned char* reflectorGroupTag, unsigned char* reflectorSelfTag, unsigned char* reflectorSelfSecret,  unsigned char* reflectorSelfTagHash, int32_t selfUserID, IPv4Address reflectorAddress, IPv6Address reflectorAddressV6, uint16_t reflectorPort);
-		void AddGroupCallParticipant(int32_t userID, unsigned char* memberTagHash, unsigned char* serializedStreams, size_t streamsLength);
-		void RemoveGroupCallParticipant(int32_t userID);
-		float GetParticipantAudioLevel(int32_t userID);
-		virtual void SetMicMute(bool mute);
-		void SetParticipantVolume(int32_t userID, float volume);
-		void SetParticipantStreams(int32_t userID, unsigned char* serializedStreams, size_t length);
-		static size_t GetInitialStreams(unsigned char* buf, size_t size);
-
-		struct Callbacks : public VoIPController::Callbacks{
-			void (*updateStreams)(VoIPGroupController*, unsigned char*, size_t);
-			void (*participantAudioStateChanged)(VoIPGroupController*, int32_t, bool);
-
-		};
-		void SetCallbacks(Callbacks callbacks);
-		virtual std::string GetDebugString();
-		virtual void SetNetworkType(int type);
-	protected:
-		virtual void ProcessIncomingPacket(NetworkPacket& packet, Endpoint& srcEndpoint);
-		virtual void SendInit();
-		virtual void SendUdpPing(Endpoint& endpoint);
-		virtual void SendRelayPings();
-		virtual void SendPacket(unsigned char* data, size_t len, Endpoint& ep, PendingOutgoingPacket& srcPacket);
-		virtual void WritePacketHeader(uint32_t seq, BufferOutputStream* s, unsigned char type, uint32_t length);
-		virtual void OnAudioOutputReady();
-	private:
-		int32_t GetCurrentUnixtime();
-		std::vector<std::shared_ptr<Stream>> DeserializeStreams(BufferInputStream& in);
-		void SendRecentPacketsRequest();
-		void SendSpecialReflectorRequest(unsigned char* data, size_t len);
-		void SerializeAndUpdateOutgoingStreams();
-		struct GroupCallParticipant{
-			int32_t userID;
-			unsigned char memberTagHash[32];
-			std::vector<std::shared_ptr<Stream>> streams;
-			AudioLevelMeter* levelMeter;
-		};
-		std::vector<GroupCallParticipant> participants;
-		unsigned char reflectorSelfTag[16];
-		unsigned char reflectorSelfSecret[16];
-		unsigned char reflectorSelfTagHash[32];
-		int32_t userSelfID;
-		Endpoint groupReflector;
-		AudioMixer* audioMixer;
-		AudioLevelMeter selfLevelMeter;
-		Callbacks groupCallbacks;
-		struct PacketIdMapping{
-			uint32_t seq;
-			uint16_t id;
-			double ackTime;
-		};
-		std::vector<PacketIdMapping> recentSentPackets;
-		Mutex sentPacketsMutex;
-		Mutex participantsMutex;
-		int32_t timeDifference;
-	};
-
-};
-
-#endif
diff --git a/submodules/libtgvoip/VoIPGroupController.cpp b/submodules/libtgvoip/VoIPGroupController.cpp
deleted file mode 100644
index 5efcb9b37d..0000000000
--- a/submodules/libtgvoip/VoIPGroupController.cpp
+++ /dev/null
@@ -1,816 +0,0 @@
-//
-// libtgvoip is free and unencumbered public domain software.
-// For more information, see http://unlicense.org or the UNLICENSE file
-// you should have received with this source code distribution.
-//
-
-#include "VoIPController.h"
-#include "logging.h"
-#include "VoIPServerConfig.h"
-#include "PrivateDefines.h"
-#include <assert.h>
-#include <math.h>
-#include <time.h>
-
-using namespace tgvoip;
-using namespace std;
-
-VoIPGroupController::VoIPGroupController(int32_t timeDifference){
-	audioMixer=new AudioMixer();
-	memset(&callbacks, 0, sizeof(callbacks));
-	userSelfID=0;
-	this->timeDifference=timeDifference;
-	LOGV("Created VoIPGroupController; timeDifference=%d", timeDifference);
-}
-
-VoIPGroupController::~VoIPGroupController(){
-	if(audioOutput){
-		audioOutput->Stop();
-	}
-	LOGD("before stop audio mixer");
-	audioMixer->Stop();
-	delete audioMixer;
-
-	for(vector<GroupCallParticipant>::iterator p=participants.begin();p!=participants.end();p++){
-		if(p->levelMeter)
-			delete p->levelMeter;
-	}
-}
-
-void VoIPGroupController::SetGroupCallInfo(unsigned char *encryptionKey, unsigned char *reflectorGroupTag, unsigned char *reflectorSelfTag, unsigned char *reflectorSelfSecret, unsigned char* reflectorSelfTagHash, int32_t selfUserID, IPv4Address reflectorAddress, IPv6Address reflectorAddressV6, uint16_t reflectorPort){
-	Endpoint e;
-	e.address=reflectorAddress;
-	e.v6address=reflectorAddressV6;
-	e.port=reflectorPort;
-	memcpy(e.peerTag, reflectorGroupTag, 16);
-	e.type=Endpoint::Type::UDP_RELAY;
-	e.id=FOURCC('G','R','P','R');
-	endpoints[e.id]=e;
-	groupReflector=e;
-	currentEndpoint=e.id;
-
-	memcpy(this->encryptionKey, encryptionKey, 256);
-	memcpy(this->reflectorSelfTag, reflectorSelfTag, 16);
-	memcpy(this->reflectorSelfSecret, reflectorSelfSecret, 16);
-	memcpy(this->reflectorSelfTagHash, reflectorSelfTagHash, 16);
-	uint8_t sha256[SHA256_LENGTH];
-	crypto.sha256((uint8_t*) encryptionKey, 256, sha256);
-	memcpy(callID, sha256+(SHA256_LENGTH-16), 16);
-	memcpy(keyFingerprint, sha256+(SHA256_LENGTH-16), 8);
-	this->userSelfID=selfUserID;
-
-	//LOGD("reflectorSelfTag = %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X", reflectorSelfTag[0], reflectorSelfTag[1], reflectorSelfTag[2], reflectorSelfTag[3], reflectorSelfTag[4], reflectorSelfTag[5], reflectorSelfTag[6], reflectorSelfTag[7], reflectorSelfTag[8], reflectorSelfTag[9], reflectorSelfTag[10], reflectorSelfTag[11], reflectorSelfTag[12], reflectorSelfTag[13], reflectorSelfTag[14], reflectorSelfTag[15]);
-	//LOGD("reflectorSelfSecret = %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X", reflectorSelfSecret[0], reflectorSelfSecret[1], reflectorSelfSecret[2], reflectorSelfSecret[3], reflectorSelfSecret[4], reflectorSelfSecret[5], reflectorSelfSecret[6], reflectorSelfSecret[7], reflectorSelfSecret[8], reflectorSelfSecret[9], reflectorSelfSecret[10], reflectorSelfSecret[11], reflectorSelfSecret[12], reflectorSelfSecret[13], reflectorSelfSecret[14], reflectorSelfSecret[15]);
-	//LOGD("reflectorSelfTagHash = %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X", reflectorSelfTagHash[0], reflectorSelfTagHash[1], reflectorSelfTagHash[2], reflectorSelfTagHash[3], reflectorSelfTagHash[4], reflectorSelfTagHash[5], reflectorSelfTagHash[6], reflectorSelfTagHash[7], reflectorSelfTagHash[8], reflectorSelfTagHash[9], reflectorSelfTagHash[10], reflectorSelfTagHash[11], reflectorSelfTagHash[12], reflectorSelfTagHash[13], reflectorSelfTagHash[14], reflectorSelfTagHash[15]);
-}
-
-void VoIPGroupController::AddGroupCallParticipant(int32_t userID, unsigned char *memberTagHash, unsigned char* serializedStreams, size_t streamsLength){
-	if(userID==userSelfID)
-		return;
-	if(userSelfID==0)
-		return;
-	//if(streamsLength==0)
-	//	return;
-	MutexGuard m(participantsMutex);
-	LOGV("Adding group call user %d, streams length %u", userID, (unsigned int)streamsLength);
-
-	for(vector<GroupCallParticipant>::iterator p=participants.begin();p!=participants.end();++p){
-		if(p->userID==userID){
-			LOGE("user %d already added", userID);
-			abort();
-			break;
-		}
-	}
-
-	GroupCallParticipant p;
-	p.userID=userID;
-	memcpy(p.memberTagHash, memberTagHash, sizeof(p.memberTagHash));
-	p.levelMeter=new AudioLevelMeter();
-
-	BufferInputStream ss(serializedStreams, streamsLength);
-	vector<shared_ptr<Stream>> streams=DeserializeStreams(ss);
-
-	unsigned char audioStreamID=0;
-
-	for(vector<shared_ptr<Stream>>::iterator _s=streams.begin();_s!=streams.end();++_s){
-		shared_ptr<Stream>& s=*_s;
-		s->userID=userID;
-		if(s->type==STREAM_TYPE_AUDIO && s->codec==CODEC_OPUS && !audioStreamID){
-			audioStreamID=s->id;
-			s->jitterBuffer=make_shared<JitterBuffer>(nullptr, s->frameDuration);
-			if(s->frameDuration>50)
-				s->jitterBuffer->SetMinPacketCount((uint32_t) ServerConfig::GetSharedInstance()->GetInt("jitter_initial_delay_60", 2));
-			else if(s->frameDuration>30)
-				s->jitterBuffer->SetMinPacketCount((uint32_t) ServerConfig::GetSharedInstance()->GetInt("jitter_initial_delay_40", 4));
-			else
-				s->jitterBuffer->SetMinPacketCount((uint32_t) ServerConfig::GetSharedInstance()->GetInt("jitter_initial_delay_20", 6));
-			s->callbackWrapper=make_shared<CallbackWrapper>();
-			s->decoder=make_shared<OpusDecoder>(s->callbackWrapper, false, false);
-			s->decoder->SetJitterBuffer(s->jitterBuffer);
-			s->decoder->SetFrameDuration(s->frameDuration);
-			s->decoder->SetDTX(true);
-			s->decoder->SetLevelMeter(p.levelMeter);
-			audioMixer->AddInput(s->callbackWrapper);
-		}
-		incomingStreams.push_back(s);
-	}
-
-	if(!audioStreamID){
-		LOGW("User %d has no usable audio stream", userID);
-	}
-
-	p.streams.insert(p.streams.end(), streams.begin(), streams.end());
-	participants.push_back(p);
-	LOGI("Added group call participant %d", userID);
-}
-
-void VoIPGroupController::RemoveGroupCallParticipant(int32_t userID){
-	MutexGuard m(participantsMutex);
-	vector<shared_ptr<Stream>>::iterator stm=incomingStreams.begin();
-	while(stm!=incomingStreams.end()){
-		if((*stm)->userID==userID){
-			LOGI("Removed stream %d belonging to user %d", (*stm)->id, userID);
-			audioMixer->RemoveInput((*stm)->callbackWrapper);
-			(*stm)->decoder->Stop();
-			//delete (*stm)->decoder;
-			//delete (*stm)->jitterBuffer;
-			//delete (*stm)->callbackWrapper;
-			stm=incomingStreams.erase(stm);
-			continue;
-		}
-		++stm;
-	}
-	for(vector<GroupCallParticipant>::iterator p=participants.begin();p!=participants.end();++p){
-		if(p->userID==userID){
-			if(p->levelMeter)
-				delete p->levelMeter;
-			participants.erase(p);
-			LOGI("Removed group call participant %d", userID);
-			break;
-		}
-	}
-}
-
-vector<shared_ptr<VoIPController::Stream>> VoIPGroupController::DeserializeStreams(BufferInputStream& in){
-	vector<shared_ptr<Stream>> res;
-	try{
-		unsigned char count=in.ReadByte();
-		for(unsigned char i=0;i<count;i++){
-			uint16_t len=(uint16_t) in.ReadInt16();
-			BufferInputStream inner=in.GetPartBuffer(len, true);
-			shared_ptr<Stream> s=make_shared<Stream>();
-			s->id=inner.ReadByte();
-			s->type=inner.ReadByte();
-			s->codec=(uint32_t) inner.ReadInt32();
-			uint32_t flags=(uint32_t) inner.ReadInt32();
-			s->enabled=(flags & STREAM_FLAG_ENABLED)==STREAM_FLAG_ENABLED;
-			s->frameDuration=(uint16_t) inner.ReadInt16();
-			res.push_back(s);
-		}
-	}catch(out_of_range& x){
-		LOGW("Error deserializing streams: %s", x.what());
-	}
-	return res;
-}
-
-void VoIPGroupController::SetParticipantStreams(int32_t userID, unsigned char *serializedStreams, size_t length){
-	LOGD("Set participant streams for %d", userID);
-	MutexGuard m(participantsMutex);
-	for(vector<GroupCallParticipant>::iterator p=participants.begin();p!=participants.end();++p){
-		if(p->userID==userID){
-			BufferInputStream in(serializedStreams, length);
-			vector<shared_ptr<Stream>> streams=DeserializeStreams(in);
-			for(vector<shared_ptr<Stream>>::iterator ns=streams.begin();ns!=streams.end();++ns){
-				bool found=false;
-				for(vector<shared_ptr<Stream>>::iterator s=p->streams.begin();s!=p->streams.end();++s){
-					if((*s)->id==(*ns)->id){
-						(*s)->enabled=(*ns)->enabled;
-						if(groupCallbacks.participantAudioStateChanged)
-							groupCallbacks.participantAudioStateChanged(this, userID, (*s)->enabled);
-						found=true;
-						break;
-					}
-				}
-				if(!found){
-					LOGW("Tried to add stream %d for user %d but adding/removing streams is not supported", (*ns)->id, userID);
-				}
-			}
-			break;
-		}
-	}
-}
-
-size_t VoIPGroupController::GetInitialStreams(unsigned char *buf, size_t size){
-	BufferOutputStream s(buf, size);
-	s.WriteByte(1); // streams count
-
-	s.WriteInt16(12); // this object length
-	s.WriteByte(1); // stream id
-	s.WriteByte(STREAM_TYPE_AUDIO);
-	s.WriteInt32(CODEC_OPUS);
-	s.WriteInt32(STREAM_FLAG_ENABLED | STREAM_FLAG_DTX); // flags
-	s.WriteInt16(60); // frame duration
-
-	return s.GetLength();
-}
-
-void VoIPGroupController::SendInit(){
-	SendRecentPacketsRequest();
-}
-
-void VoIPGroupController::ProcessIncomingPacket(NetworkPacket &packet, Endpoint& srcEndpoint){
-	//LOGD("Received incoming packet from %s:%u, %u bytes", packet.address->ToString().c_str(), packet.port, packet.length);
-	if(packet.length<17 || packet.length>2000){
-		LOGW("Received packet has wrong length %d", (int)packet.length);
-		return;
-	}
-	BufferOutputStream sigData(packet.length);
-	sigData.WriteBytes(packet.data, packet.length-16);
-	sigData.WriteBytes(reflectorSelfSecret, 16);
-	unsigned char sig[32];
-	crypto.sha256(sigData.GetBuffer(), sigData.GetLength(), sig);
-	if(memcmp(sig, packet.data+(packet.length-16), 16)!=0){
-		LOGW("Received packet has incorrect signature");
-		return;
-	}
-
-	// reflector special response
-	if(memcmp(packet.data, reflectorSelfTagHash, 16)==0 && packet.length>60){
-		//LOGI("possible reflector special response");
-		unsigned char firstBlock[16];
-		unsigned char iv[16];
-		memcpy(iv, packet.data+16, 16);
-		unsigned char key[32];
-		crypto.sha256(reflectorSelfSecret, 16, key);
-		crypto.aes_cbc_decrypt(packet.data+32, firstBlock, 16, key, iv);
-		BufferInputStream in(firstBlock, 16);
-		in.Seek(8);
-		size_t len=(size_t) in.ReadInt32();
-		int32_t tlid=in.ReadInt32();
-		//LOGD("special response: len=%d, tlid=0x%08X", len, tlid);
-		if(len%4==0 && len+60<=packet.length && packet.length<=1500){
-			lastRecvPacketTime=GetCurrentTime();
-			memcpy(iv, packet.data+16, 16);
-			unsigned char buf[1500];
-			crypto.aes_cbc_decrypt(packet.data+32, buf, len+16, key, iv);
-			try{
-				if(tlid==TLID_UDP_REFLECTOR_LAST_PACKETS_INFO){
-					MutexGuard m(sentPacketsMutex);
-					//LOGV("received udpReflector.lastPacketsInfo");
-					in=BufferInputStream(buf, len+16);
-					in.Seek(16);
-					/*int32_t date=*/in.ReadInt32();
-					/*int64_t queryID=*/in.ReadInt64();
-					int32_t vectorMagic=in.ReadInt32();
-					if(vectorMagic!=TLID_VECTOR){
-						LOGW("last packets info: expected vector, got %08X", vectorMagic);
-						return;
-					}
-					int32_t recvCount=in.ReadInt32();
-					//LOGV("%d received packets", recvCount);
-					for(int i=0;i<recvCount;i++){
-						uint32_t p=(uint32_t) in.ReadInt32();
-						//LOGV("Relay received packet: %08X", p);
-						uint16_t id=(uint16_t) (p & 0xFFFF);
-						//LOGV("ack id %04X", id);
-						for(vector<PacketIdMapping>::iterator pkt=recentSentPackets.begin();pkt!=recentSentPackets.end();++pkt){
-							//LOGV("== sent id %04X", pkt->id);
-							if(pkt->id==id){
-								if(!pkt->ackTime){
-									pkt->ackTime=GetCurrentTime();
-									conctl->PacketAcknowledged(pkt->seq);
-									//LOGV("relay acknowledged packet %u", pkt->seq);
-									if(seqgt(pkt->seq, lastRemoteAckSeq))
-										lastRemoteAckSeq=pkt->seq;
-								}
-								break;
-							}
-						}
-					}
-					vectorMagic=in.ReadInt32();
-					if(vectorMagic!=TLID_VECTOR){
-						LOGW("last packets info: expected vector, got %08X", vectorMagic);
-						return;
-					}
-					int32_t sentCount=in.ReadInt32();
-					//LOGV("%d sent packets", sentCount);
-					for(int i=0;i<sentCount;i++){
-						/*int32_t p=*/in.ReadInt32();
-						//LOGV("Sent packet: %08X", p);
-					}
-					if(udpConnectivityState!=UDP_AVAILABLE)
-						udpConnectivityState=UDP_AVAILABLE;
-					if(state!=STATE_ESTABLISHED)
-						SetState(STATE_ESTABLISHED);
-					if(!audioInput){
-						InitializeAudio();
-						if(state!=STATE_FAILED){
-							//	audioOutput->Start();
-						}
-					}
-				}
-			}catch(out_of_range& x){
-				LOGE("Error parsing special response: %s", x.what());
-			}
-			return;
-		}
-	}
-
-	if(packet.length<32)
-		return;
-
-	// it's a packet relayed from another participant - find the sender
-	MutexGuard m(participantsMutex);
-	GroupCallParticipant* sender=NULL;
-	for(vector<GroupCallParticipant>::iterator p=participants.begin();p!=participants.end();++p){
-		if(memcmp(packet.data, p->memberTagHash, 16)==0){
-			//LOGV("received data packet from user %d", p->userID);
-			sender=&*p;
-			break;
-		}
-	}
-	if(!sender){
-		LOGV("Received data packet is from unknown user");
-		return;
-	}
-
-	if(memcmp(packet.data+16, keyFingerprint, 8)!=0){
-		LOGW("received packet has wrong key fingerprint");
-		return;
-	}
-
-	BufferInputStream in(packet.data, packet.length-16);
-	in.Seek(16+8); // peer tag + key fingerprint
-
-	unsigned char msgKey[16];
-	in.ReadBytes(msgKey, 16);
-
-	unsigned char decrypted[1500];
-	unsigned char aesKey[32], aesIv[32];
-	KDF2(msgKey, 0, aesKey, aesIv);
-	size_t decryptedLen=in.Remaining()-16;
-	if(decryptedLen>sizeof(decrypted))
-		return;
-	//LOGV("-> MSG KEY: %08x %08x %08x %08x, hashed %u", *reinterpret_cast<int32_t*>(msgKey), *reinterpret_cast<int32_t*>(msgKey+4), *reinterpret_cast<int32_t*>(msgKey+8), *reinterpret_cast<int32_t*>(msgKey+12), decryptedLen-4);
-	uint8_t *decryptOffset = packet.data + in.GetOffset();
-	if ((((intptr_t)decryptOffset) % sizeof(long)) != 0) {
-		LOGE("alignment2 packet.data+in.GetOffset()");
-	}
-	if (decryptedLen % sizeof(long) != 0) {
-		LOGE("alignment2 decryptedLen");
-	}
-	crypto.aes_ige_decrypt(packet.data+in.GetOffset(), decrypted, decryptedLen, aesKey, aesIv);
-
-	in=BufferInputStream(decrypted, decryptedLen);
-	//LOGD("received packet length: %d", in.ReadInt32());
-
-	BufferOutputStream buf(decryptedLen+32);
-	size_t x=0;
-	buf.WriteBytes(encryptionKey+88+x, 32);
-	buf.WriteBytes(decrypted+4, decryptedLen-4);
-	unsigned char msgKeyLarge[32];
-	crypto.sha256(buf.GetBuffer(), buf.GetLength(), msgKeyLarge);
-
-	if(memcmp(msgKey, msgKeyLarge+8, 16)!=0){
-		LOGW("Received packet from user %d has wrong hash", sender->userID);
-		return;
-	}
-
-	uint32_t innerLen=(uint32_t) in.ReadInt32();
-	if(innerLen>decryptedLen-4){
-		LOGW("Received packet has wrong inner length (%d with total of %u)", (int)innerLen, (unsigned int)decryptedLen);
-		return;
-	}
-	if(decryptedLen-innerLen<12){
-		LOGW("Received packet has too little padding (%u)", (unsigned int)(decryptedLen-innerLen));
-		return;
-	}
-	in=BufferInputStream(decrypted+4, (size_t) innerLen);
-
-	uint32_t tlid=(uint32_t) in.ReadInt32();
-	if(tlid!=TLID_DECRYPTED_AUDIO_BLOCK){
-		LOGW("Received packet has unknown TL ID 0x%08x", tlid);
-		return;
-	}
-	in.Seek(in.GetOffset()+16); // random bytes
-	int32_t flags=in.ReadInt32();
-	if(!(flags & PFLAG_HAS_SEQ) || !(flags & PFLAG_HAS_SENDER_TAG_HASH)){
-		LOGW("Received packet has wrong flags");
-		return;
-	}
-	/*uint32_t seq=(uint32_t) */in.ReadInt32();
-	unsigned char senderTagHash[16];
-	in.ReadBytes(senderTagHash, 16);
-	if(memcmp(senderTagHash, sender->memberTagHash, 16)!=0){
-		LOGW("Received packet has wrong inner sender tag hash");
-		return;
-	}
-
-	//int32_t oneMoreInnerLengthWhyDoWeEvenNeedThis;
-	if(flags & PFLAG_HAS_DATA){
-		/*oneMoreInnerLengthWhyDoWeEvenNeedThis=*/in.ReadTlLength();
-	}
-	unsigned char type=(unsigned char) ((flags >> 24) & 0xFF);
-	lastRecvPacketTime=GetCurrentTime();
-
-	if(type==PKT_STREAM_DATA || type==PKT_STREAM_DATA_X2 || type==PKT_STREAM_DATA_X3){
-		if(state!=STATE_ESTABLISHED && receivedInitAck)
-			SetState(STATE_ESTABLISHED);
-		int count;
-		switch(type){
-			case PKT_STREAM_DATA_X2:
-				count=2;
-				break;
-			case PKT_STREAM_DATA_X3:
-				count=3;
-				break;
-			case PKT_STREAM_DATA:
-			default:
-				count=1;
-				break;
-		}
-		int i;
-		//if(srcEndpoint->type==Endpoint::Type::UDP_RELAY && srcEndpoint!=peerPreferredRelay){
-		//	peerPreferredRelay=srcEndpoint;
-		//}
-		for(i=0;i<count;i++){
-			unsigned char streamID=in.ReadByte();
-			unsigned char sflags=(unsigned char) (streamID & 0xC0);
-			uint16_t sdlen=(uint16_t) (sflags & STREAM_DATA_FLAG_LEN16 ? in.ReadInt16() : in.ReadByte());
-			uint32_t pts=(uint32_t) in.ReadInt32();
-			//LOGD("stream data, pts=%d, len=%d, rem=%d", pts, sdlen, in.Remaining());
-			audioTimestampIn=pts;
-			/*if(!audioOutStarted && audioOutput){
-				audioOutput->Start();
-				audioOutStarted=true;
-			}*/
-			if(in.GetOffset()+sdlen>in.GetLength()){
-				return;
-			}
-			for(vector<shared_ptr<Stream>>::iterator stm=sender->streams.begin();stm!=sender->streams.end();++stm){
-				if((*stm)->id==streamID){
-					if((*stm)->jitterBuffer){
-						(*stm)->jitterBuffer->HandleInput(decrypted+4+in.GetOffset(), sdlen, pts, false);
-					}
-					break;
-				}
-			}
-			if(i<count-1)
-				in.Seek(in.GetOffset()+sdlen);
-		}
-	}
-}
-
-void VoIPGroupController::SendUdpPing(Endpoint& endpoint){
-
-}
-
-void VoIPGroupController::SetNetworkType(int type){
-	networkType=type;
-	UpdateDataSavingState();
-	UpdateAudioBitrateLimit();
-	string itfName=udpSocket->GetLocalInterfaceInfo(NULL, NULL);
-	if(itfName!=activeNetItfName){
-		udpSocket->OnActiveInterfaceChanged();
-		LOGI("Active network interface changed: %s -> %s", activeNetItfName.c_str(), itfName.c_str());
-		bool isFirstChange=activeNetItfName.length()==0;
-		activeNetItfName=itfName;
-		if(isFirstChange)
-			return;
-		udpConnectivityState=UDP_UNKNOWN;
-		udpPingCount=0;
-		lastUdpPingTime=0;
-		if(proxyProtocol==PROXY_SOCKS5)
-			InitUDPProxy();
-		selectCanceller->CancelSelect();
-	}
-}
-
-void VoIPGroupController::SendRecentPacketsRequest(){
-	BufferOutputStream out(1024);
-	out.WriteInt32(TLID_UDP_REFLECTOR_REQUEST_PACKETS_INFO); // TL function
-	out.WriteInt32(GetCurrentUnixtime()); // date:int
-	out.WriteInt64(0); // query_id:long
-	out.WriteInt32(64); // recv_num:int
-	out.WriteInt32(0); // sent_num:int
-	SendSpecialReflectorRequest(out.GetBuffer(), out.GetLength());
-}
-
-void VoIPGroupController::SendSpecialReflectorRequest(unsigned char *data, size_t len){
-	BufferOutputStream out(1024);
-	unsigned char buf[1500];
-	crypto.rand_bytes(buf, 8);
-	out.WriteBytes(buf, 8);
-	out.WriteInt32((int32_t)len);
-	out.WriteBytes(data, len);
-	if(out.GetLength()%16!=0){
-		size_t paddingLen=16-(out.GetLength()%16);
-		crypto.rand_bytes(buf, paddingLen);
-		out.WriteBytes(buf, paddingLen);
-	}
-	unsigned char iv[16];
-	crypto.rand_bytes(iv, 16);
-	unsigned char key[32];
-	crypto.sha256(reflectorSelfSecret, 16, key);
-	unsigned char _iv[16];
-	memcpy(_iv, iv, 16);
-	size_t encryptedLen=out.GetLength();
-	crypto.aes_cbc_encrypt(out.GetBuffer(), buf, encryptedLen, key, _iv);
-	out.Reset();
-	out.WriteBytes(reflectorSelfTag, 16);
-	out.WriteBytes(iv, 16);
-	out.WriteBytes(buf, encryptedLen);
-	out.WriteBytes(reflectorSelfSecret, 16);
-	crypto.sha256(out.GetBuffer(), out.GetLength(), buf);
-	out.Rewind(16);
-	out.WriteBytes(buf, 16);
-
-	NetworkPacket pkt={0};
-	pkt.address=&groupReflector.address;
-	pkt.port=groupReflector.port;
-	pkt.protocol=PROTO_UDP;
-	pkt.data=out.GetBuffer();
-	pkt.length=out.GetLength();
-	ActuallySendPacket(pkt, groupReflector);
-}
-
-void VoIPGroupController::SendRelayPings(){
-	//LOGV("Send relay pings 2");
-	double currentTime=GetCurrentTime();
-	if(currentTime-groupReflector.lastPingTime>=0.25){
-		SendRecentPacketsRequest();
-		groupReflector.lastPingTime=currentTime;
-	}
-}
-
-void VoIPGroupController::OnAudioOutputReady(){
-	encoder->SetDTX(true);
-	audioMixer->SetOutput(audioOutput);
-	audioMixer->SetEchoCanceller(echoCanceller);
-	audioMixer->Start();
-	audioOutput->Start();
-	audioOutStarted=true;
-	encoder->SetLevelMeter(&selfLevelMeter);
-}
-
-void VoIPGroupController::WritePacketHeader(uint32_t seq, BufferOutputStream *s, unsigned char type, uint32_t length){
-	s->WriteInt32(TLID_DECRYPTED_AUDIO_BLOCK);
-	int64_t randomID;
-	crypto.rand_bytes((uint8_t *) &randomID, 8);
-	s->WriteInt64(randomID);
-	unsigned char randBytes[7];
-	crypto.rand_bytes(randBytes, 7);
-	s->WriteByte(7);
-	s->WriteBytes(randBytes, 7);
-	uint32_t pflags=PFLAG_HAS_SEQ | PFLAG_HAS_SENDER_TAG_HASH;
-	if(length>0)
-		pflags|=PFLAG_HAS_DATA;
-	pflags|=((uint32_t) type) << 24;
-	s->WriteInt32(pflags);
-
-	if(type==PKT_STREAM_DATA || type==PKT_STREAM_DATA_X2 || type==PKT_STREAM_DATA_X3){
-		conctl->PacketSent(seq, length);
-	}
-
-	/*if(pflags & PFLAG_HAS_CALL_ID){
-		s->WriteBytes(callID, 16);
-	}*/
-	//s->WriteInt32(lastRemoteSeq);
-	s->WriteInt32(seq);
-	s->WriteBytes(reflectorSelfTagHash, 16);
-	if(length>0){
-		if(length<=253){
-			s->WriteByte((unsigned char) length);
-		}else{
-			s->WriteByte(254);
-			s->WriteByte((unsigned char) (length & 0xFF));
-			s->WriteByte((unsigned char) ((length >> 8) & 0xFF));
-			s->WriteByte((unsigned char) ((length >> 16) & 0xFF));
-		}
-	}
-}
-
-void VoIPGroupController::SendPacket(unsigned char *data, size_t len, Endpoint& ep, PendingOutgoingPacket& srcPacket){
-	if(stopping)
-		return;
-	if(ep.type==Endpoint::Type::TCP_RELAY && !useTCP)
-		return;
-	BufferOutputStream out(len+128);
-	//LOGV("send group packet %u", len);
-
-	out.WriteBytes(reflectorSelfTag, 16);
-
-	if(len>0){
-		BufferOutputStream inner(len+128);
-		inner.WriteInt32((uint32_t)len);
-		inner.WriteBytes(data, len);
-		size_t padLen=16-inner.GetLength()%16;
-		if(padLen<12)
-			padLen+=16;
-		unsigned char padding[28];
-		crypto.rand_bytes((uint8_t *) padding, padLen);
-		inner.WriteBytes(padding, padLen);
-		assert(inner.GetLength()%16==0);
-
-		unsigned char key[32], iv[32], msgKey[16];
-		out.WriteBytes(keyFingerprint, 8);
-		BufferOutputStream buf(len+32);
-		size_t x=0;
-		buf.WriteBytes(encryptionKey+88+x, 32);
-		buf.WriteBytes(inner.GetBuffer()+4, inner.GetLength()-4);
-		unsigned char msgKeyLarge[32];
-		crypto.sha256(buf.GetBuffer(), buf.GetLength(), msgKeyLarge);
-		memcpy(msgKey, msgKeyLarge+8, 16);
-		KDF2(msgKey, 0, key, iv);
-		out.WriteBytes(msgKey, 16);
-		//LOGV("<- MSG KEY: %08x %08x %08x %08x, hashed %u", *reinterpret_cast<int32_t*>(msgKey), *reinterpret_cast<int32_t*>(msgKey+4), *reinterpret_cast<int32_t*>(msgKey+8), *reinterpret_cast<int32_t*>(msgKey+12), inner.GetLength()-4);
-
-		unsigned char aesOut[MSC_STACK_FALLBACK(inner.GetLength(), 1500)];
-		crypto.aes_ige_encrypt(inner.GetBuffer(), aesOut, inner.GetLength(), key, iv);
-		out.WriteBytes(aesOut, inner.GetLength());
-	}
-
-	// relay signature
-	out.WriteBytes(reflectorSelfSecret, 16);
-	unsigned char sig[32];
-	crypto.sha256(out.GetBuffer(), out.GetLength(), sig);
-	out.Rewind(16);
-	out.WriteBytes(sig, 16);
-
-	if(srcPacket.type==PKT_STREAM_DATA || srcPacket.type==PKT_STREAM_DATA_X2 || srcPacket.type==PKT_STREAM_DATA_X3){
-		PacketIdMapping mapping={srcPacket.seq, *reinterpret_cast<uint16_t*>(sig+14), 0};
-		MutexGuard m(sentPacketsMutex);
-		recentSentPackets.push_back(mapping);
-		//LOGD("sent packet with id: %04X", mapping.id);
-		while(recentSentPackets.size()>64)
-			recentSentPackets.erase(recentSentPackets.begin());
-	}
-	lastSentSeq=srcPacket.seq;
-
-	if(IS_MOBILE_NETWORK(networkType))
-		stats.bytesSentMobile+=(uint64_t)out.GetLength();
-	else
-		stats.bytesSentWifi+=(uint64_t)out.GetLength();
-
-	NetworkPacket pkt={0};
-	pkt.address=(NetworkAddress*)&ep.address;
-	pkt.port=ep.port;
-	pkt.length=out.GetLength();
-	pkt.data=out.GetBuffer();
-	pkt.protocol=ep.type==Endpoint::Type::TCP_RELAY ? PROTO_TCP : PROTO_UDP;
-	ActuallySendPacket(pkt, ep);
-}
-
-void VoIPGroupController::SetCallbacks(VoIPGroupController::Callbacks callbacks){
-	VoIPController::SetCallbacks(callbacks);
-	this->groupCallbacks=callbacks;
-}
-
-int32_t VoIPGroupController::GetCurrentUnixtime(){
-	return time(NULL)+timeDifference;
-}
-
-float VoIPGroupController::GetParticipantAudioLevel(int32_t userID){
-	if(userID==userSelfID)
-		return selfLevelMeter.GetLevel();
-	MutexGuard m(participantsMutex);
-	for(vector<GroupCallParticipant>::iterator p=participants.begin(); p!=participants.end(); ++p){
-		if(p->userID==userID){
-			return p->levelMeter->GetLevel();
-		}
-	}
-	return 0;
-}
-
-void VoIPGroupController::SetMicMute(bool mute){
-	micMuted=mute;
-	if(audioInput){
-		if(mute)
-			audioInput->Stop();
-		else
-			audioInput->Start();
-		if(!audioInput->IsInitialized()){
-			lastError=ERROR_AUDIO_IO;
-			SetState(STATE_FAILED);
-			return;
-		}
-	}
-	outgoingStreams[0]->enabled=!mute;
-	SerializeAndUpdateOutgoingStreams();
-}
-
-void VoIPGroupController::SetParticipantVolume(int32_t userID, float volume){
-	MutexGuard m(participantsMutex);
-	for(vector<GroupCallParticipant>::iterator p=participants.begin();p!=participants.end();++p){
-		if(p->userID==userID){
-			for(vector<shared_ptr<Stream>>::iterator s=p->streams.begin();s!=p->streams.end();++s){
-				if((*s)->type==STREAM_TYPE_AUDIO){
-					if((*s)->decoder){
-						float db;
-						if(volume==0.0f)
-							db=-INFINITY;
-						else if(volume<1.0f)
-							db=-50.0f*(1.0f-volume);
-						else if(volume>1.0f && volume<=2.0f)
-							db=10.0f*(volume-1.0f);
-						else
-							db=0.0f;
-						//LOGV("Setting user %u audio volume to %.2f dB", userID, db);
-						audioMixer->SetInputVolume((*s)->callbackWrapper, db);
-					}
-					break;
-				}
-			}
-			break;
-		}
-	}
-}
-
-void VoIPGroupController::SerializeAndUpdateOutgoingStreams(){
-	BufferOutputStream out(1024);
-	out.WriteByte((unsigned char) outgoingStreams.size());
-
-	for(vector<shared_ptr<Stream>>::iterator s=outgoingStreams.begin(); s!=outgoingStreams.end(); ++s){
-		BufferOutputStream o(128);
-		o.WriteByte((*s)->id);
-		o.WriteByte((*s)->type);
-		o.WriteInt32((*s)->codec);
-		o.WriteInt32((unsigned char) (((*s)->enabled ? STREAM_FLAG_ENABLED : 0) | STREAM_FLAG_DTX));
-		o.WriteInt16((*s)->frameDuration);
-		out.WriteInt16((int16_t) o.GetLength());
-		out.WriteBytes(o.GetBuffer(), o.GetLength());
-	}
-	if(groupCallbacks.updateStreams)
-		groupCallbacks.updateStreams(this, out.GetBuffer(), out.GetLength());
-}
-
-std::string VoIPGroupController::GetDebugString(){
-	std::string r="Remote endpoints: \n";
-	char buffer[2048];
-	for(pair<const int64_t, Endpoint>& _endpoint:endpoints){
-		Endpoint& endpoint=_endpoint.second;
-		const char* type;
-		switch(endpoint.type){
-			case Endpoint::Type::UDP_P2P_INET:
-				type="UDP_P2P_INET";
-				break;
-			case Endpoint::Type::UDP_P2P_LAN:
-				type="UDP_P2P_LAN";
-				break;
-			case Endpoint::Type::UDP_RELAY:
-				type="UDP_RELAY";
-				break;
-			case Endpoint::Type::TCP_RELAY:
-				type="TCP_RELAY";
-				break;
-			default:
-				type="UNKNOWN";
-				break;
-		}
-		snprintf(buffer, sizeof(buffer), "%s:%u %dms [%s%s]\n", endpoint.address.ToString().c_str(), endpoint.port, (int)(endpoint.averageRTT*1000), type, currentEndpoint==endpoint.id ? ", IN_USE" : "");
-		r+=buffer;
-	}
-	double avgLate[3];
-	shared_ptr<JitterBuffer> jitterBuffer=incomingStreams.size()==1 ? incomingStreams[0]->jitterBuffer : NULL;
-	if(jitterBuffer)
-		jitterBuffer->GetAverageLateCount(avgLate);
-	else
-		memset(avgLate, 0, 3*sizeof(double));
-	snprintf(buffer, sizeof(buffer),
-					 "RTT avg/min: %d/%d\n"
-					 "Congestion window: %d/%d bytes\n"
-					 "Key fingerprint: %02hhX%02hhX%02hhX%02hhX%02hhX%02hhX%02hhX%02hhX\n"
-					 "Last sent/ack'd seq: %u/%u\n"
-					 "Send/recv losses: %u/%u (%d%%)\n"
-					 "Audio bitrate: %d kbit\n"
-					 "Bytes sent/recvd: %llu/%llu\n\n",
-			 (int)(conctl->GetAverageRTT()*1000), (int)(conctl->GetMinimumRTT()*1000),
-			 int(conctl->GetInflightDataSize()), int(conctl->GetCongestionWindow()),
-			 keyFingerprint[0],keyFingerprint[1],keyFingerprint[2],keyFingerprint[3],keyFingerprint[4],keyFingerprint[5],keyFingerprint[6],keyFingerprint[7],
-			 lastSentSeq, lastRemoteAckSeq,
-			 conctl->GetSendLossCount(), recvLossCount, encoder ? encoder->GetPacketLoss() : 0,
-			 encoder ? (encoder->GetBitrate()/1000) : 0,
-			 (long long unsigned int)(stats.bytesSentMobile+stats.bytesSentWifi),
-			 (long long unsigned int)(stats.bytesRecvdMobile+stats.bytesRecvdWifi));
-
-	MutexGuard m(participantsMutex);
-	for(vector<GroupCallParticipant>::iterator p=participants.begin();p!=participants.end();++p){
-		snprintf(buffer, sizeof(buffer), "Participant id: %d\n", p->userID);
-		r+=buffer;
-		for(vector<shared_ptr<Stream>>::iterator stm=p->streams.begin();stm!=p->streams.end();++stm){
-			char* codec=reinterpret_cast<char*>(&(*stm)->codec);
-			snprintf(buffer, sizeof(buffer), "Stream %d (type %d, codec '%c%c%c%c', %sabled)\n",
-					 (*stm)->id, (*stm)->type, codec[3], codec[2], codec[1], codec[0], (*stm)->enabled ? "en" : "dis");
-			r+=buffer;
-			if((*stm)->enabled){
-				if((*stm)->jitterBuffer){
-					snprintf(buffer, sizeof(buffer), "Jitter buffer: %d/%.2f\n",
-							 (*stm)->jitterBuffer->GetMinPacketCount(), (*stm)->jitterBuffer->GetAverageDelay());
-					r+=buffer;
-				}
-			}
-		}
-		r+="\n";
-	}
-	return r;
-}
diff --git a/submodules/libtgvoip/VoIPServerConfig.cpp b/submodules/libtgvoip/VoIPServerConfig.cpp
deleted file mode 100644
index 27f15a78d5..0000000000
--- a/submodules/libtgvoip/VoIPServerConfig.cpp
+++ /dev/null
@@ -1,70 +0,0 @@
-//
-// libtgvoip is free and unencumbered public domain software.
-// For more information, see http://unlicense.org or the UNLICENSE file
-// you should have received with this source code distribution.
-//
-
-#include "VoIPServerConfig.h"
-#include <stdlib.h>
-#include "logging.h"
-#include <sstream>
-#include <locale>
-
-using namespace tgvoip;
-
-ServerConfig* ServerConfig::sharedInstance=NULL;
-
-ServerConfig::ServerConfig(){
-}
-
-ServerConfig::~ServerConfig(){
-}
-
-ServerConfig *ServerConfig::GetSharedInstance(){
-	if(!sharedInstance)
-		sharedInstance=new ServerConfig();
-	return sharedInstance;
-}
-
-bool ServerConfig::GetBoolean(std::string name, bool fallback){
-	MutexGuard sync(mutex);
-	if(ContainsKey(name) && config[name].is_bool())
-		return config[name].bool_value();
-	return fallback;
-}
-
-double ServerConfig::GetDouble(std::string name, double fallback){
-	MutexGuard sync(mutex);
-	if(ContainsKey(name) && config[name].is_number())
-		return config[name].number_value();
-	return fallback;
-}
-
-int32_t ServerConfig::GetInt(std::string name, int32_t fallback){
-	MutexGuard sync(mutex);
-	if(ContainsKey(name) && config[name].is_number())
-		return config[name].int_value();
-	return fallback;
-}
-
-std::string ServerConfig::GetString(std::string name, std::string fallback){
-	MutexGuard sync(mutex);
-	if(ContainsKey(name) && config[name].is_string())
-		return config[name].string_value();
-	return fallback;
-}
-
-void ServerConfig::Update(std::string jsonString){
-	MutexGuard sync(mutex);
-	LOGD("=== Updating voip config ===");
-	LOGD("%s", jsonString.c_str());
-	std::string jsonError;
-	config=json11::Json::parse(jsonString, jsonError);
-	if(!jsonError.empty())
-		LOGE("Error parsing server config: %s", jsonError.c_str());
-}
-
-
-bool ServerConfig::ContainsKey(std::string key){
-	return config.object_items().find(key)!=config.object_items().end();
-}
diff --git a/submodules/libtgvoip/VoIPServerConfig.h b/submodules/libtgvoip/VoIPServerConfig.h
deleted file mode 100644
index 3eb5124e72..0000000000
--- a/submodules/libtgvoip/VoIPServerConfig.h
+++ /dev/null
@@ -1,37 +0,0 @@
-//
-// libtgvoip is free and unencumbered public domain software.
-// For more information, see http://unlicense.org or the UNLICENSE file
-// you should have received with this source code distribution.
-//
-
-#ifndef TGVOIP_VOIPSERVERCONFIG_H
-#define TGVOIP_VOIPSERVERCONFIG_H
-
-#include <map>
-#include <string>
-#include <stdint.h>
-#include "threading.h"
-#include "json11.hpp"
-
-namespace tgvoip{
-
-class ServerConfig{
-public:
-	ServerConfig();
-	~ServerConfig();
-	static ServerConfig* GetSharedInstance();
-	int32_t GetInt(std::string name, int32_t fallback);
-	double GetDouble(std::string name, double fallback);
-	std::string GetString(std::string name, std::string fallback);
-	bool GetBoolean(std::string name, bool fallback);
-	void Update(std::string jsonString);
-
-private:
-	static ServerConfig* sharedInstance;
-	bool ContainsKey(std::string key);
-    json11::Json config;
-	Mutex mutex;
-};
-}
-
-#endif //TGVOIP_VOIPSERVERCONFIG_H
diff --git a/submodules/libtgvoip/aclocal.m4 b/submodules/libtgvoip/aclocal.m4
deleted file mode 100644
index 897cabf3ad..0000000000
--- a/submodules/libtgvoip/aclocal.m4
+++ /dev/null
@@ -1,10209 +0,0 @@
-# generated automatically by aclocal 1.16.1 -*- Autoconf -*-
-
-# Copyright (C) 1996-2018 Free Software Foundation, Inc.
-
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])])
-m4_ifndef([AC_AUTOCONF_VERSION],
-  [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
-m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.69],,
-[m4_warning([this file was generated for autoconf 2.69.
-You have another version of autoconf.  It may work, but is not guaranteed to.
-If you have problems, you may need to regenerate the build system entirely.
-To do so, use the procedure documented by the package, typically 'autoreconf'.])])
-
-# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
-#
-#   Copyright (C) 1996-2001, 2003-2018 Free Software Foundation, Inc.
-#   Written by Gordon Matzigkeit, 1996
-#
-# This file is free software; the Free Software Foundation gives
-# unlimited permission to copy and/or distribute it, with or without
-# modifications, as long as this notice is preserved.
-
-m4_define([_LT_COPYING], [dnl
-# Copyright (C) 2014 Free Software Foundation, Inc.
-# This is free software; see the source for copying conditions.  There is NO
-# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-
-# GNU Libtool is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of of the License, or
-# (at your option) any later version.
-#
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program or library that is built
-# using GNU Libtool, you may include this file under the  same
-# distribution terms that you use for the rest of that program.
-#
-# GNU Libtool is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-])
-
-# serial 58 LT_INIT
-
-
-# LT_PREREQ(VERSION)
-# ------------------
-# Complain and exit if this libtool version is less that VERSION.
-m4_defun([LT_PREREQ],
-[m4_if(m4_version_compare(m4_defn([LT_PACKAGE_VERSION]), [$1]), -1,
-       [m4_default([$3],
-		   [m4_fatal([Libtool version $1 or higher is required],
-		             63)])],
-       [$2])])
-
-
-# _LT_CHECK_BUILDDIR
-# ------------------
-# Complain if the absolute build directory name contains unusual characters
-m4_defun([_LT_CHECK_BUILDDIR],
-[case `pwd` in
-  *\ * | *\	*)
-    AC_MSG_WARN([Libtool does not cope well with whitespace in `pwd`]) ;;
-esac
-])
-
-
-# LT_INIT([OPTIONS])
-# ------------------
-AC_DEFUN([LT_INIT],
-[AC_PREREQ([2.62])dnl We use AC_PATH_PROGS_FEATURE_CHECK
-AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl
-AC_BEFORE([$0], [LT_LANG])dnl
-AC_BEFORE([$0], [LT_OUTPUT])dnl
-AC_BEFORE([$0], [LTDL_INIT])dnl
-m4_require([_LT_CHECK_BUILDDIR])dnl
-
-dnl Autoconf doesn't catch unexpanded LT_ macros by default:
-m4_pattern_forbid([^_?LT_[A-Z_]+$])dnl
-m4_pattern_allow([^(_LT_EOF|LT_DLGLOBAL|LT_DLLAZY_OR_NOW|LT_MULTI_MODULE)$])dnl
-dnl aclocal doesn't pull ltoptions.m4, ltsugar.m4, or ltversion.m4
-dnl unless we require an AC_DEFUNed macro:
-AC_REQUIRE([LTOPTIONS_VERSION])dnl
-AC_REQUIRE([LTSUGAR_VERSION])dnl
-AC_REQUIRE([LTVERSION_VERSION])dnl
-AC_REQUIRE([LTOBSOLETE_VERSION])dnl
-m4_require([_LT_PROG_LTMAIN])dnl
-
-_LT_SHELL_INIT([SHELL=${CONFIG_SHELL-/bin/sh}])
-
-dnl Parse OPTIONS
-_LT_SET_OPTIONS([$0], [$1])
-
-# This can be used to rebuild libtool when needed
-LIBTOOL_DEPS=$ltmain
-
-# Always use our own libtool.
-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-AC_SUBST(LIBTOOL)dnl
-
-_LT_SETUP
-
-# Only expand once:
-m4_define([LT_INIT])
-])# LT_INIT
-
-# Old names:
-AU_ALIAS([AC_PROG_LIBTOOL], [LT_INIT])
-AU_ALIAS([AM_PROG_LIBTOOL], [LT_INIT])
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AC_PROG_LIBTOOL], [])
-dnl AC_DEFUN([AM_PROG_LIBTOOL], [])
-
-
-# _LT_PREPARE_CC_BASENAME
-# -----------------------
-m4_defun([_LT_PREPARE_CC_BASENAME], [
-# Calculate cc_basename.  Skip known compiler wrappers and cross-prefix.
-func_cc_basename ()
-{
-    for cc_temp in @S|@*""; do
-      case $cc_temp in
-        compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;;
-        distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;;
-        \-*) ;;
-        *) break;;
-      esac
-    done
-    func_cc_basename_result=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`
-}
-])# _LT_PREPARE_CC_BASENAME
-
-
-# _LT_CC_BASENAME(CC)
-# -------------------
-# It would be clearer to call AC_REQUIREs from _LT_PREPARE_CC_BASENAME,
-# but that macro is also expanded into generated libtool script, which
-# arranges for $SED and $ECHO to be set by different means.
-m4_defun([_LT_CC_BASENAME],
-[m4_require([_LT_PREPARE_CC_BASENAME])dnl
-AC_REQUIRE([_LT_DECL_SED])dnl
-AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])dnl
-func_cc_basename $1
-cc_basename=$func_cc_basename_result
-])
-
-
-# _LT_FILEUTILS_DEFAULTS
-# ----------------------
-# It is okay to use these file commands and assume they have been set
-# sensibly after 'm4_require([_LT_FILEUTILS_DEFAULTS])'.
-m4_defun([_LT_FILEUTILS_DEFAULTS],
-[: ${CP="cp -f"}
-: ${MV="mv -f"}
-: ${RM="rm -f"}
-])# _LT_FILEUTILS_DEFAULTS
-
-
-# _LT_SETUP
-# ---------
-m4_defun([_LT_SETUP],
-[AC_REQUIRE([AC_CANONICAL_HOST])dnl
-AC_REQUIRE([AC_CANONICAL_BUILD])dnl
-AC_REQUIRE([_LT_PREPARE_SED_QUOTE_VARS])dnl
-AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])dnl
-
-_LT_DECL([], [PATH_SEPARATOR], [1], [The PATH separator for the build system])dnl
-dnl
-_LT_DECL([], [host_alias], [0], [The host system])dnl
-_LT_DECL([], [host], [0])dnl
-_LT_DECL([], [host_os], [0])dnl
-dnl
-_LT_DECL([], [build_alias], [0], [The build system])dnl
-_LT_DECL([], [build], [0])dnl
-_LT_DECL([], [build_os], [0])dnl
-dnl
-AC_REQUIRE([AC_PROG_CC])dnl
-AC_REQUIRE([LT_PATH_LD])dnl
-AC_REQUIRE([LT_PATH_NM])dnl
-dnl
-AC_REQUIRE([AC_PROG_LN_S])dnl
-test -z "$LN_S" && LN_S="ln -s"
-_LT_DECL([], [LN_S], [1], [Whether we need soft or hard links])dnl
-dnl
-AC_REQUIRE([LT_CMD_MAX_LEN])dnl
-_LT_DECL([objext], [ac_objext], [0], [Object file suffix (normally "o")])dnl
-_LT_DECL([], [exeext], [0], [Executable file suffix (normally "")])dnl
-dnl
-m4_require([_LT_FILEUTILS_DEFAULTS])dnl
-m4_require([_LT_CHECK_SHELL_FEATURES])dnl
-m4_require([_LT_PATH_CONVERSION_FUNCTIONS])dnl
-m4_require([_LT_CMD_RELOAD])dnl
-m4_require([_LT_CHECK_MAGIC_METHOD])dnl
-m4_require([_LT_CHECK_SHAREDLIB_FROM_LINKLIB])dnl
-m4_require([_LT_CMD_OLD_ARCHIVE])dnl
-m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl
-m4_require([_LT_WITH_SYSROOT])dnl
-m4_require([_LT_CMD_TRUNCATE])dnl
-
-_LT_CONFIG_LIBTOOL_INIT([
-# See if we are running on zsh, and set the options that allow our
-# commands through without removal of \ escapes INIT.
-if test -n "\${ZSH_VERSION+set}"; then
-   setopt NO_GLOB_SUBST
-fi
-])
-if test -n "${ZSH_VERSION+set}"; then
-   setopt NO_GLOB_SUBST
-fi
-
-_LT_CHECK_OBJDIR
-
-m4_require([_LT_TAG_COMPILER])dnl
-
-case $host_os in
-aix3*)
-  # AIX sometimes has problems with the GCC collect2 program.  For some
-  # reason, if we set the COLLECT_NAMES environment variable, the problems
-  # vanish in a puff of smoke.
-  if test set != "${COLLECT_NAMES+set}"; then
-    COLLECT_NAMES=
-    export COLLECT_NAMES
-  fi
-  ;;
-esac
-
-# Global variables:
-ofile=libtool
-can_build_shared=yes
-
-# All known linkers require a '.a' archive for static linking (except MSVC and
-# ICC, which need '.lib').
-libext=a
-
-with_gnu_ld=$lt_cv_prog_gnu_ld
-
-old_CC=$CC
-old_CFLAGS=$CFLAGS
-
-# Set sane defaults for various variables
-test -z "$CC" && CC=cc
-test -z "$LTCC" && LTCC=$CC
-test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS
-test -z "$LD" && LD=ld
-test -z "$ac_objext" && ac_objext=o
-
-_LT_CC_BASENAME([$compiler])
-
-# Only perform the check for file, if the check method requires it
-test -z "$MAGIC_CMD" && MAGIC_CMD=file
-case $deplibs_check_method in
-file_magic*)
-  if test "$file_magic_cmd" = '$MAGIC_CMD'; then
-    _LT_PATH_MAGIC
-  fi
-  ;;
-esac
-
-# Use C for the default configuration in the libtool script
-LT_SUPPORTED_TAG([CC])
-_LT_LANG_C_CONFIG
-_LT_LANG_DEFAULT_CONFIG
-_LT_CONFIG_COMMANDS
-])# _LT_SETUP
-
-
-# _LT_PREPARE_SED_QUOTE_VARS
-# --------------------------
-# Define a few sed substitution that help us do robust quoting.
-m4_defun([_LT_PREPARE_SED_QUOTE_VARS],
-[# Backslashify metacharacters that are still active within
-# double-quoted strings.
-sed_quote_subst='s/\([["`$\\]]\)/\\\1/g'
-
-# Same as above, but do not quote variable references.
-double_quote_subst='s/\([["`\\]]\)/\\\1/g'
-
-# Sed substitution to delay expansion of an escaped shell variable in a
-# double_quote_subst'ed string.
-delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
-
-# Sed substitution to delay expansion of an escaped single quote.
-delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g'
-
-# Sed substitution to avoid accidental globbing in evaled expressions
-no_glob_subst='s/\*/\\\*/g'
-])
-
-# _LT_PROG_LTMAIN
-# ---------------
-# Note that this code is called both from 'configure', and 'config.status'
-# now that we use AC_CONFIG_COMMANDS to generate libtool.  Notably,
-# 'config.status' has no value for ac_aux_dir unless we are using Automake,
-# so we pass a copy along to make sure it has a sensible value anyway.
-m4_defun([_LT_PROG_LTMAIN],
-[m4_ifdef([AC_REQUIRE_AUX_FILE], [AC_REQUIRE_AUX_FILE([ltmain.sh])])dnl
-_LT_CONFIG_LIBTOOL_INIT([ac_aux_dir='$ac_aux_dir'])
-ltmain=$ac_aux_dir/ltmain.sh
-])# _LT_PROG_LTMAIN
-
-
-
-# So that we can recreate a full libtool script including additional
-# tags, we accumulate the chunks of code to send to AC_CONFIG_COMMANDS
-# in macros and then make a single call at the end using the 'libtool'
-# label.
-
-
-# _LT_CONFIG_LIBTOOL_INIT([INIT-COMMANDS])
-# ----------------------------------------
-# Register INIT-COMMANDS to be passed to AC_CONFIG_COMMANDS later.
-m4_define([_LT_CONFIG_LIBTOOL_INIT],
-[m4_ifval([$1],
-          [m4_append([_LT_OUTPUT_LIBTOOL_INIT],
-                     [$1
-])])])
-
-# Initialize.
-m4_define([_LT_OUTPUT_LIBTOOL_INIT])
-
-
-# _LT_CONFIG_LIBTOOL([COMMANDS])
-# ------------------------------
-# Register COMMANDS to be passed to AC_CONFIG_COMMANDS later.
-m4_define([_LT_CONFIG_LIBTOOL],
-[m4_ifval([$1],
-          [m4_append([_LT_OUTPUT_LIBTOOL_COMMANDS],
-                     [$1
-])])])
-
-# Initialize.
-m4_define([_LT_OUTPUT_LIBTOOL_COMMANDS])
-
-
-# _LT_CONFIG_SAVE_COMMANDS([COMMANDS], [INIT_COMMANDS])
-# -----------------------------------------------------
-m4_defun([_LT_CONFIG_SAVE_COMMANDS],
-[_LT_CONFIG_LIBTOOL([$1])
-_LT_CONFIG_LIBTOOL_INIT([$2])
-])
-
-
-# _LT_FORMAT_COMMENT([COMMENT])
-# -----------------------------
-# Add leading comment marks to the start of each line, and a trailing
-# full-stop to the whole comment if one is not present already.
-m4_define([_LT_FORMAT_COMMENT],
-[m4_ifval([$1], [
-m4_bpatsubst([m4_bpatsubst([$1], [^ *], [# ])],
-              [['`$\]], [\\\&])]m4_bmatch([$1], [[!?.]$], [], [.])
-)])
-
-
-
-
-
-# _LT_DECL([CONFIGNAME], VARNAME, VALUE, [DESCRIPTION], [IS-TAGGED?])
-# -------------------------------------------------------------------
-# CONFIGNAME is the name given to the value in the libtool script.
-# VARNAME is the (base) name used in the configure script.
-# VALUE may be 0, 1 or 2 for a computed quote escaped value based on
-# VARNAME.  Any other value will be used directly.
-m4_define([_LT_DECL],
-[lt_if_append_uniq([lt_decl_varnames], [$2], [, ],
-    [lt_dict_add_subkey([lt_decl_dict], [$2], [libtool_name],
-	[m4_ifval([$1], [$1], [$2])])
-    lt_dict_add_subkey([lt_decl_dict], [$2], [value], [$3])
-    m4_ifval([$4],
-	[lt_dict_add_subkey([lt_decl_dict], [$2], [description], [$4])])
-    lt_dict_add_subkey([lt_decl_dict], [$2],
-	[tagged?], [m4_ifval([$5], [yes], [no])])])
-])
-
-
-# _LT_TAGDECL([CONFIGNAME], VARNAME, VALUE, [DESCRIPTION])
-# --------------------------------------------------------
-m4_define([_LT_TAGDECL], [_LT_DECL([$1], [$2], [$3], [$4], [yes])])
-
-
-# lt_decl_tag_varnames([SEPARATOR], [VARNAME1...])
-# ------------------------------------------------
-m4_define([lt_decl_tag_varnames],
-[_lt_decl_filter([tagged?], [yes], $@)])
-
-
-# _lt_decl_filter(SUBKEY, VALUE, [SEPARATOR], [VARNAME1..])
-# ---------------------------------------------------------
-m4_define([_lt_decl_filter],
-[m4_case([$#],
-  [0], [m4_fatal([$0: too few arguments: $#])],
-  [1], [m4_fatal([$0: too few arguments: $#: $1])],
-  [2], [lt_dict_filter([lt_decl_dict], [$1], [$2], [], lt_decl_varnames)],
-  [3], [lt_dict_filter([lt_decl_dict], [$1], [$2], [$3], lt_decl_varnames)],
-  [lt_dict_filter([lt_decl_dict], $@)])[]dnl
-])
-
-
-# lt_decl_quote_varnames([SEPARATOR], [VARNAME1...])
-# --------------------------------------------------
-m4_define([lt_decl_quote_varnames],
-[_lt_decl_filter([value], [1], $@)])
-
-
-# lt_decl_dquote_varnames([SEPARATOR], [VARNAME1...])
-# ---------------------------------------------------
-m4_define([lt_decl_dquote_varnames],
-[_lt_decl_filter([value], [2], $@)])
-
-
-# lt_decl_varnames_tagged([SEPARATOR], [VARNAME1...])
-# ---------------------------------------------------
-m4_define([lt_decl_varnames_tagged],
-[m4_assert([$# <= 2])dnl
-_$0(m4_quote(m4_default([$1], [[, ]])),
-    m4_ifval([$2], [[$2]], [m4_dquote(lt_decl_tag_varnames)]),
-    m4_split(m4_normalize(m4_quote(_LT_TAGS)), [ ]))])
-m4_define([_lt_decl_varnames_tagged],
-[m4_ifval([$3], [lt_combine([$1], [$2], [_], $3)])])
-
-
-# lt_decl_all_varnames([SEPARATOR], [VARNAME1...])
-# ------------------------------------------------
-m4_define([lt_decl_all_varnames],
-[_$0(m4_quote(m4_default([$1], [[, ]])),
-     m4_if([$2], [],
-	   m4_quote(lt_decl_varnames),
-	m4_quote(m4_shift($@))))[]dnl
-])
-m4_define([_lt_decl_all_varnames],
-[lt_join($@, lt_decl_varnames_tagged([$1],
-			lt_decl_tag_varnames([[, ]], m4_shift($@))))dnl
-])
-
-
-# _LT_CONFIG_STATUS_DECLARE([VARNAME])
-# ------------------------------------
-# Quote a variable value, and forward it to 'config.status' so that its
-# declaration there will have the same value as in 'configure'.  VARNAME
-# must have a single quote delimited value for this to work.
-m4_define([_LT_CONFIG_STATUS_DECLARE],
-[$1='`$ECHO "$][$1" | $SED "$delay_single_quote_subst"`'])
-
-
-# _LT_CONFIG_STATUS_DECLARATIONS
-# ------------------------------
-# We delimit libtool config variables with single quotes, so when
-# we write them to config.status, we have to be sure to quote all
-# embedded single quotes properly.  In configure, this macro expands
-# each variable declared with _LT_DECL (and _LT_TAGDECL) into:
-#
-#    <var>='`$ECHO "$<var>" | $SED "$delay_single_quote_subst"`'
-m4_defun([_LT_CONFIG_STATUS_DECLARATIONS],
-[m4_foreach([_lt_var], m4_quote(lt_decl_all_varnames),
-    [m4_n([_LT_CONFIG_STATUS_DECLARE(_lt_var)])])])
-
-
-# _LT_LIBTOOL_TAGS
-# ----------------
-# Output comment and list of tags supported by the script
-m4_defun([_LT_LIBTOOL_TAGS],
-[_LT_FORMAT_COMMENT([The names of the tagged configurations supported by this script])dnl
-available_tags='_LT_TAGS'dnl
-])
-
-
-# _LT_LIBTOOL_DECLARE(VARNAME, [TAG])
-# -----------------------------------
-# Extract the dictionary values for VARNAME (optionally with TAG) and
-# expand to a commented shell variable setting:
-#
-#    # Some comment about what VAR is for.
-#    visible_name=$lt_internal_name
-m4_define([_LT_LIBTOOL_DECLARE],
-[_LT_FORMAT_COMMENT(m4_quote(lt_dict_fetch([lt_decl_dict], [$1],
-					   [description])))[]dnl
-m4_pushdef([_libtool_name],
-    m4_quote(lt_dict_fetch([lt_decl_dict], [$1], [libtool_name])))[]dnl
-m4_case(m4_quote(lt_dict_fetch([lt_decl_dict], [$1], [value])),
-    [0], [_libtool_name=[$]$1],
-    [1], [_libtool_name=$lt_[]$1],
-    [2], [_libtool_name=$lt_[]$1],
-    [_libtool_name=lt_dict_fetch([lt_decl_dict], [$1], [value])])[]dnl
-m4_ifval([$2], [_$2])[]m4_popdef([_libtool_name])[]dnl
-])
-
-
-# _LT_LIBTOOL_CONFIG_VARS
-# -----------------------
-# Produce commented declarations of non-tagged libtool config variables
-# suitable for insertion in the LIBTOOL CONFIG section of the 'libtool'
-# script.  Tagged libtool config variables (even for the LIBTOOL CONFIG
-# section) are produced by _LT_LIBTOOL_TAG_VARS.
-m4_defun([_LT_LIBTOOL_CONFIG_VARS],
-[m4_foreach([_lt_var],
-    m4_quote(_lt_decl_filter([tagged?], [no], [], lt_decl_varnames)),
-    [m4_n([_LT_LIBTOOL_DECLARE(_lt_var)])])])
-
-
-# _LT_LIBTOOL_TAG_VARS(TAG)
-# -------------------------
-m4_define([_LT_LIBTOOL_TAG_VARS],
-[m4_foreach([_lt_var], m4_quote(lt_decl_tag_varnames),
-    [m4_n([_LT_LIBTOOL_DECLARE(_lt_var, [$1])])])])
-
-
-# _LT_TAGVAR(VARNAME, [TAGNAME])
-# ------------------------------
-m4_define([_LT_TAGVAR], [m4_ifval([$2], [$1_$2], [$1])])
-
-
-# _LT_CONFIG_COMMANDS
-# -------------------
-# Send accumulated output to $CONFIG_STATUS.  Thanks to the lists of
-# variables for single and double quote escaping we saved from calls
-# to _LT_DECL, we can put quote escaped variables declarations
-# into 'config.status', and then the shell code to quote escape them in
-# for loops in 'config.status'.  Finally, any additional code accumulated
-# from calls to _LT_CONFIG_LIBTOOL_INIT is expanded.
-m4_defun([_LT_CONFIG_COMMANDS],
-[AC_PROVIDE_IFELSE([LT_OUTPUT],
-	dnl If the libtool generation code has been placed in $CONFIG_LT,
-	dnl instead of duplicating it all over again into config.status,
-	dnl then we will have config.status run $CONFIG_LT later, so it
-	dnl needs to know what name is stored there:
-        [AC_CONFIG_COMMANDS([libtool],
-            [$SHELL $CONFIG_LT || AS_EXIT(1)], [CONFIG_LT='$CONFIG_LT'])],
-    dnl If the libtool generation code is destined for config.status,
-    dnl expand the accumulated commands and init code now:
-    [AC_CONFIG_COMMANDS([libtool],
-        [_LT_OUTPUT_LIBTOOL_COMMANDS], [_LT_OUTPUT_LIBTOOL_COMMANDS_INIT])])
-])#_LT_CONFIG_COMMANDS
-
-
-# Initialize.
-m4_define([_LT_OUTPUT_LIBTOOL_COMMANDS_INIT],
-[
-
-# The HP-UX ksh and POSIX shell print the target directory to stdout
-# if CDPATH is set.
-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
-
-sed_quote_subst='$sed_quote_subst'
-double_quote_subst='$double_quote_subst'
-delay_variable_subst='$delay_variable_subst'
-_LT_CONFIG_STATUS_DECLARATIONS
-LTCC='$LTCC'
-LTCFLAGS='$LTCFLAGS'
-compiler='$compiler_DEFAULT'
-
-# A function that is used when there is no print builtin or printf.
-func_fallback_echo ()
-{
-  eval 'cat <<_LTECHO_EOF
-\$[]1
-_LTECHO_EOF'
-}
-
-# Quote evaled strings.
-for var in lt_decl_all_varnames([[ \
-]], lt_decl_quote_varnames); do
-    case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
-    *[[\\\\\\\`\\"\\\$]]*)
-      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\"" ## exclude from sc_prohibit_nested_quotes
-      ;;
-    *)
-      eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
-      ;;
-    esac
-done
-
-# Double-quote double-evaled strings.
-for var in lt_decl_all_varnames([[ \
-]], lt_decl_dquote_varnames); do
-    case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
-    *[[\\\\\\\`\\"\\\$]]*)
-      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" ## exclude from sc_prohibit_nested_quotes
-      ;;
-    *)
-      eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
-      ;;
-    esac
-done
-
-_LT_OUTPUT_LIBTOOL_INIT
-])
-
-# _LT_GENERATED_FILE_INIT(FILE, [COMMENT])
-# ------------------------------------
-# Generate a child script FILE with all initialization necessary to
-# reuse the environment learned by the parent script, and make the
-# file executable.  If COMMENT is supplied, it is inserted after the
-# '#!' sequence but before initialization text begins.  After this
-# macro, additional text can be appended to FILE to form the body of
-# the child script.  The macro ends with non-zero status if the
-# file could not be fully written (such as if the disk is full).
-m4_ifdef([AS_INIT_GENERATED],
-[m4_defun([_LT_GENERATED_FILE_INIT],[AS_INIT_GENERATED($@)])],
-[m4_defun([_LT_GENERATED_FILE_INIT],
-[m4_require([AS_PREPARE])]dnl
-[m4_pushdef([AS_MESSAGE_LOG_FD])]dnl
-[lt_write_fail=0
-cat >$1 <<_ASEOF || lt_write_fail=1
-#! $SHELL
-# Generated by $as_me.
-$2
-SHELL=\${CONFIG_SHELL-$SHELL}
-export SHELL
-_ASEOF
-cat >>$1 <<\_ASEOF || lt_write_fail=1
-AS_SHELL_SANITIZE
-_AS_PREPARE
-exec AS_MESSAGE_FD>&1
-_ASEOF
-test 0 = "$lt_write_fail" && chmod +x $1[]dnl
-m4_popdef([AS_MESSAGE_LOG_FD])])])# _LT_GENERATED_FILE_INIT
-
-# LT_OUTPUT
-# ---------
-# This macro allows early generation of the libtool script (before
-# AC_OUTPUT is called), incase it is used in configure for compilation
-# tests.
-AC_DEFUN([LT_OUTPUT],
-[: ${CONFIG_LT=./config.lt}
-AC_MSG_NOTICE([creating $CONFIG_LT])
-_LT_GENERATED_FILE_INIT(["$CONFIG_LT"],
-[# Run this file to recreate a libtool stub with the current configuration.])
-
-cat >>"$CONFIG_LT" <<\_LTEOF
-lt_cl_silent=false
-exec AS_MESSAGE_LOG_FD>>config.log
-{
-  echo
-  AS_BOX([Running $as_me.])
-} >&AS_MESSAGE_LOG_FD
-
-lt_cl_help="\
-'$as_me' creates a local libtool stub from the current configuration,
-for use in further configure time tests before the real libtool is
-generated.
-
-Usage: $[0] [[OPTIONS]]
-
-  -h, --help      print this help, then exit
-  -V, --version   print version number, then exit
-  -q, --quiet     do not print progress messages
-  -d, --debug     don't remove temporary files
-
-Report bugs to <bug-libtool@gnu.org>."
-
-lt_cl_version="\
-m4_ifset([AC_PACKAGE_NAME], [AC_PACKAGE_NAME ])config.lt[]dnl
-m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION])
-configured by $[0], generated by m4_PACKAGE_STRING.
-
-Copyright (C) 2011 Free Software Foundation, Inc.
-This config.lt script is free software; the Free Software Foundation
-gives unlimited permision to copy, distribute and modify it."
-
-while test 0 != $[#]
-do
-  case $[1] in
-    --version | --v* | -V )
-      echo "$lt_cl_version"; exit 0 ;;
-    --help | --h* | -h )
-      echo "$lt_cl_help"; exit 0 ;;
-    --debug | --d* | -d )
-      debug=: ;;
-    --quiet | --q* | --silent | --s* | -q )
-      lt_cl_silent=: ;;
-
-    -*) AC_MSG_ERROR([unrecognized option: $[1]
-Try '$[0] --help' for more information.]) ;;
-
-    *) AC_MSG_ERROR([unrecognized argument: $[1]
-Try '$[0] --help' for more information.]) ;;
-  esac
-  shift
-done
-
-if $lt_cl_silent; then
-  exec AS_MESSAGE_FD>/dev/null
-fi
-_LTEOF
-
-cat >>"$CONFIG_LT" <<_LTEOF
-_LT_OUTPUT_LIBTOOL_COMMANDS_INIT
-_LTEOF
-
-cat >>"$CONFIG_LT" <<\_LTEOF
-AC_MSG_NOTICE([creating $ofile])
-_LT_OUTPUT_LIBTOOL_COMMANDS
-AS_EXIT(0)
-_LTEOF
-chmod +x "$CONFIG_LT"
-
-# configure is writing to config.log, but config.lt does its own redirection,
-# appending to config.log, which fails on DOS, as config.log is still kept
-# open by configure.  Here we exec the FD to /dev/null, effectively closing
-# config.log, so it can be properly (re)opened and appended to by config.lt.
-lt_cl_success=:
-test yes = "$silent" &&
-  lt_config_lt_args="$lt_config_lt_args --quiet"
-exec AS_MESSAGE_LOG_FD>/dev/null
-$SHELL "$CONFIG_LT" $lt_config_lt_args || lt_cl_success=false
-exec AS_MESSAGE_LOG_FD>>config.log
-$lt_cl_success || AS_EXIT(1)
-])# LT_OUTPUT
-
-
-# _LT_CONFIG(TAG)
-# ---------------
-# If TAG is the built-in tag, create an initial libtool script with a
-# default configuration from the untagged config vars.  Otherwise add code
-# to config.status for appending the configuration named by TAG from the
-# matching tagged config vars.
-m4_defun([_LT_CONFIG],
-[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
-_LT_CONFIG_SAVE_COMMANDS([
-  m4_define([_LT_TAG], m4_if([$1], [], [C], [$1]))dnl
-  m4_if(_LT_TAG, [C], [
-    # See if we are running on zsh, and set the options that allow our
-    # commands through without removal of \ escapes.
-    if test -n "${ZSH_VERSION+set}"; then
-      setopt NO_GLOB_SUBST
-    fi
-
-    cfgfile=${ofile}T
-    trap "$RM \"$cfgfile\"; exit 1" 1 2 15
-    $RM "$cfgfile"
-
-    cat <<_LT_EOF >> "$cfgfile"
-#! $SHELL
-# Generated automatically by $as_me ($PACKAGE) $VERSION
-# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
-# NOTE: Changes made to this file will be lost: look at ltmain.sh.
-
-# Provide generalized library-building support services.
-# Written by Gordon Matzigkeit, 1996
-
-_LT_COPYING
-_LT_LIBTOOL_TAGS
-
-# Configured defaults for sys_lib_dlsearch_path munging.
-: \${LT_SYS_LIBRARY_PATH="$configure_time_lt_sys_library_path"}
-
-# ### BEGIN LIBTOOL CONFIG
-_LT_LIBTOOL_CONFIG_VARS
-_LT_LIBTOOL_TAG_VARS
-# ### END LIBTOOL CONFIG
-
-_LT_EOF
-
-    cat <<'_LT_EOF' >> "$cfgfile"
-
-# ### BEGIN FUNCTIONS SHARED WITH CONFIGURE
-
-_LT_PREPARE_MUNGE_PATH_LIST
-_LT_PREPARE_CC_BASENAME
-
-# ### END FUNCTIONS SHARED WITH CONFIGURE
-
-_LT_EOF
-
-  case $host_os in
-  aix3*)
-    cat <<\_LT_EOF >> "$cfgfile"
-# AIX sometimes has problems with the GCC collect2 program.  For some
-# reason, if we set the COLLECT_NAMES environment variable, the problems
-# vanish in a puff of smoke.
-if test set != "${COLLECT_NAMES+set}"; then
-  COLLECT_NAMES=
-  export COLLECT_NAMES
-fi
-_LT_EOF
-    ;;
-  esac
-
-  _LT_PROG_LTMAIN
-
-  # We use sed instead of cat because bash on DJGPP gets confused if
-  # if finds mixed CR/LF and LF-only lines.  Since sed operates in
-  # text mode, it properly converts lines to CR/LF.  This bash problem
-  # is reportedly fixed, but why not run on old versions too?
-  sed '$q' "$ltmain" >> "$cfgfile" \
-     || (rm -f "$cfgfile"; exit 1)
-
-   mv -f "$cfgfile" "$ofile" ||
-    (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
-  chmod +x "$ofile"
-],
-[cat <<_LT_EOF >> "$ofile"
-
-dnl Unfortunately we have to use $1 here, since _LT_TAG is not expanded
-dnl in a comment (ie after a #).
-# ### BEGIN LIBTOOL TAG CONFIG: $1
-_LT_LIBTOOL_TAG_VARS(_LT_TAG)
-# ### END LIBTOOL TAG CONFIG: $1
-_LT_EOF
-])dnl /m4_if
-],
-[m4_if([$1], [], [
-    PACKAGE='$PACKAGE'
-    VERSION='$VERSION'
-    RM='$RM'
-    ofile='$ofile'], [])
-])dnl /_LT_CONFIG_SAVE_COMMANDS
-])# _LT_CONFIG
-
-
-# LT_SUPPORTED_TAG(TAG)
-# ---------------------
-# Trace this macro to discover what tags are supported by the libtool
-# --tag option, using:
-#    autoconf --trace 'LT_SUPPORTED_TAG:$1'
-AC_DEFUN([LT_SUPPORTED_TAG], [])
-
-
-# C support is built-in for now
-m4_define([_LT_LANG_C_enabled], [])
-m4_define([_LT_TAGS], [])
-
-
-# LT_LANG(LANG)
-# -------------
-# Enable libtool support for the given language if not already enabled.
-AC_DEFUN([LT_LANG],
-[AC_BEFORE([$0], [LT_OUTPUT])dnl
-m4_case([$1],
-  [C],			[_LT_LANG(C)],
-  [C++],		[_LT_LANG(CXX)],
-  [Go],			[_LT_LANG(GO)],
-  [Java],		[_LT_LANG(GCJ)],
-  [Fortran 77],		[_LT_LANG(F77)],
-  [Fortran],		[_LT_LANG(FC)],
-  [Windows Resource],	[_LT_LANG(RC)],
-  [m4_ifdef([_LT_LANG_]$1[_CONFIG],
-    [_LT_LANG($1)],
-    [m4_fatal([$0: unsupported language: "$1"])])])dnl
-])# LT_LANG
-
-
-# _LT_LANG(LANGNAME)
-# ------------------
-m4_defun([_LT_LANG],
-[m4_ifdef([_LT_LANG_]$1[_enabled], [],
-  [LT_SUPPORTED_TAG([$1])dnl
-  m4_append([_LT_TAGS], [$1 ])dnl
-  m4_define([_LT_LANG_]$1[_enabled], [])dnl
-  _LT_LANG_$1_CONFIG($1)])dnl
-])# _LT_LANG
-
-
-m4_ifndef([AC_PROG_GO], [
-# NOTE: This macro has been submitted for inclusion into   #
-#  GNU Autoconf as AC_PROG_GO.  When it is available in    #
-#  a released version of Autoconf we should remove this    #
-#  macro and use it instead.                               #
-m4_defun([AC_PROG_GO],
-[AC_LANG_PUSH(Go)dnl
-AC_ARG_VAR([GOC],     [Go compiler command])dnl
-AC_ARG_VAR([GOFLAGS], [Go compiler flags])dnl
-_AC_ARG_VAR_LDFLAGS()dnl
-AC_CHECK_TOOL(GOC, gccgo)
-if test -z "$GOC"; then
-  if test -n "$ac_tool_prefix"; then
-    AC_CHECK_PROG(GOC, [${ac_tool_prefix}gccgo], [${ac_tool_prefix}gccgo])
-  fi
-fi
-if test -z "$GOC"; then
-  AC_CHECK_PROG(GOC, gccgo, gccgo, false)
-fi
-])#m4_defun
-])#m4_ifndef
-
-
-# _LT_LANG_DEFAULT_CONFIG
-# -----------------------
-m4_defun([_LT_LANG_DEFAULT_CONFIG],
-[AC_PROVIDE_IFELSE([AC_PROG_CXX],
-  [LT_LANG(CXX)],
-  [m4_define([AC_PROG_CXX], defn([AC_PROG_CXX])[LT_LANG(CXX)])])
-
-AC_PROVIDE_IFELSE([AC_PROG_F77],
-  [LT_LANG(F77)],
-  [m4_define([AC_PROG_F77], defn([AC_PROG_F77])[LT_LANG(F77)])])
-
-AC_PROVIDE_IFELSE([AC_PROG_FC],
-  [LT_LANG(FC)],
-  [m4_define([AC_PROG_FC], defn([AC_PROG_FC])[LT_LANG(FC)])])
-
-dnl The call to [A][M_PROG_GCJ] is quoted like that to stop aclocal
-dnl pulling things in needlessly.
-AC_PROVIDE_IFELSE([AC_PROG_GCJ],
-  [LT_LANG(GCJ)],
-  [AC_PROVIDE_IFELSE([A][M_PROG_GCJ],
-    [LT_LANG(GCJ)],
-    [AC_PROVIDE_IFELSE([LT_PROG_GCJ],
-      [LT_LANG(GCJ)],
-      [m4_ifdef([AC_PROG_GCJ],
-	[m4_define([AC_PROG_GCJ], defn([AC_PROG_GCJ])[LT_LANG(GCJ)])])
-       m4_ifdef([A][M_PROG_GCJ],
-	[m4_define([A][M_PROG_GCJ], defn([A][M_PROG_GCJ])[LT_LANG(GCJ)])])
-       m4_ifdef([LT_PROG_GCJ],
-	[m4_define([LT_PROG_GCJ], defn([LT_PROG_GCJ])[LT_LANG(GCJ)])])])])])
-
-AC_PROVIDE_IFELSE([AC_PROG_GO],
-  [LT_LANG(GO)],
-  [m4_define([AC_PROG_GO], defn([AC_PROG_GO])[LT_LANG(GO)])])
-
-AC_PROVIDE_IFELSE([LT_PROG_RC],
-  [LT_LANG(RC)],
-  [m4_define([LT_PROG_RC], defn([LT_PROG_RC])[LT_LANG(RC)])])
-])# _LT_LANG_DEFAULT_CONFIG
-
-# Obsolete macros:
-AU_DEFUN([AC_LIBTOOL_CXX], [LT_LANG(C++)])
-AU_DEFUN([AC_LIBTOOL_F77], [LT_LANG(Fortran 77)])
-AU_DEFUN([AC_LIBTOOL_FC], [LT_LANG(Fortran)])
-AU_DEFUN([AC_LIBTOOL_GCJ], [LT_LANG(Java)])
-AU_DEFUN([AC_LIBTOOL_RC], [LT_LANG(Windows Resource)])
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AC_LIBTOOL_CXX], [])
-dnl AC_DEFUN([AC_LIBTOOL_F77], [])
-dnl AC_DEFUN([AC_LIBTOOL_FC], [])
-dnl AC_DEFUN([AC_LIBTOOL_GCJ], [])
-dnl AC_DEFUN([AC_LIBTOOL_RC], [])
-
-
-# _LT_TAG_COMPILER
-# ----------------
-m4_defun([_LT_TAG_COMPILER],
-[AC_REQUIRE([AC_PROG_CC])dnl
-
-_LT_DECL([LTCC], [CC], [1], [A C compiler])dnl
-_LT_DECL([LTCFLAGS], [CFLAGS], [1], [LTCC compiler flags])dnl
-_LT_TAGDECL([CC], [compiler], [1], [A language specific compiler])dnl
-_LT_TAGDECL([with_gcc], [GCC], [0], [Is the compiler the GNU compiler?])dnl
-
-# If no C compiler was specified, use CC.
-LTCC=${LTCC-"$CC"}
-
-# If no C compiler flags were specified, use CFLAGS.
-LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
-
-# Allow CC to be a program name with arguments.
-compiler=$CC
-])# _LT_TAG_COMPILER
-
-
-# _LT_COMPILER_BOILERPLATE
-# ------------------------
-# Check for compiler boilerplate output or warnings with
-# the simple compiler test code.
-m4_defun([_LT_COMPILER_BOILERPLATE],
-[m4_require([_LT_DECL_SED])dnl
-ac_outfile=conftest.$ac_objext
-echo "$lt_simple_compile_test_code" >conftest.$ac_ext
-eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
-_lt_compiler_boilerplate=`cat conftest.err`
-$RM conftest*
-])# _LT_COMPILER_BOILERPLATE
-
-
-# _LT_LINKER_BOILERPLATE
-# ----------------------
-# Check for linker boilerplate output or warnings with
-# the simple link test code.
-m4_defun([_LT_LINKER_BOILERPLATE],
-[m4_require([_LT_DECL_SED])dnl
-ac_outfile=conftest.$ac_objext
-echo "$lt_simple_link_test_code" >conftest.$ac_ext
-eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
-_lt_linker_boilerplate=`cat conftest.err`
-$RM -r conftest*
-])# _LT_LINKER_BOILERPLATE
-
-# _LT_REQUIRED_DARWIN_CHECKS
-# -------------------------
-m4_defun_once([_LT_REQUIRED_DARWIN_CHECKS],[
-  case $host_os in
-    rhapsody* | darwin*)
-    AC_CHECK_TOOL([DSYMUTIL], [dsymutil], [:])
-    AC_CHECK_TOOL([NMEDIT], [nmedit], [:])
-    AC_CHECK_TOOL([LIPO], [lipo], [:])
-    AC_CHECK_TOOL([OTOOL], [otool], [:])
-    AC_CHECK_TOOL([OTOOL64], [otool64], [:])
-    _LT_DECL([], [DSYMUTIL], [1],
-      [Tool to manipulate archived DWARF debug symbol files on Mac OS X])
-    _LT_DECL([], [NMEDIT], [1],
-      [Tool to change global to local symbols on Mac OS X])
-    _LT_DECL([], [LIPO], [1],
-      [Tool to manipulate fat objects and archives on Mac OS X])
-    _LT_DECL([], [OTOOL], [1],
-      [ldd/readelf like tool for Mach-O binaries on Mac OS X])
-    _LT_DECL([], [OTOOL64], [1],
-      [ldd/readelf like tool for 64 bit Mach-O binaries on Mac OS X 10.4])
-
-    AC_CACHE_CHECK([for -single_module linker flag],[lt_cv_apple_cc_single_mod],
-      [lt_cv_apple_cc_single_mod=no
-      if test -z "$LT_MULTI_MODULE"; then
-	# By default we will add the -single_module flag. You can override
-	# by either setting the environment variable LT_MULTI_MODULE
-	# non-empty at configure time, or by adding -multi_module to the
-	# link flags.
-	rm -rf libconftest.dylib*
-	echo "int foo(void){return 1;}" > conftest.c
-	echo "$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
--dynamiclib -Wl,-single_module conftest.c" >&AS_MESSAGE_LOG_FD
-	$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
-	  -dynamiclib -Wl,-single_module conftest.c 2>conftest.err
-        _lt_result=$?
-	# If there is a non-empty error log, and "single_module"
-	# appears in it, assume the flag caused a linker warning
-        if test -s conftest.err && $GREP single_module conftest.err; then
-	  cat conftest.err >&AS_MESSAGE_LOG_FD
-	# Otherwise, if the output was created with a 0 exit code from
-	# the compiler, it worked.
-	elif test -f libconftest.dylib && test 0 = "$_lt_result"; then
-	  lt_cv_apple_cc_single_mod=yes
-	else
-	  cat conftest.err >&AS_MESSAGE_LOG_FD
-	fi
-	rm -rf libconftest.dylib*
-	rm -f conftest.*
-      fi])
-
-    AC_CACHE_CHECK([for -exported_symbols_list linker flag],
-      [lt_cv_ld_exported_symbols_list],
-      [lt_cv_ld_exported_symbols_list=no
-      save_LDFLAGS=$LDFLAGS
-      echo "_main" > conftest.sym
-      LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym"
-      AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])],
-	[lt_cv_ld_exported_symbols_list=yes],
-	[lt_cv_ld_exported_symbols_list=no])
-	LDFLAGS=$save_LDFLAGS
-    ])
-
-    AC_CACHE_CHECK([for -force_load linker flag],[lt_cv_ld_force_load],
-      [lt_cv_ld_force_load=no
-      cat > conftest.c << _LT_EOF
-int forced_loaded() { return 2;}
-_LT_EOF
-      echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&AS_MESSAGE_LOG_FD
-      $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&AS_MESSAGE_LOG_FD
-      echo "$AR $AR_FLAGS libconftest.a conftest.o" >&AS_MESSAGE_LOG_FD
-      $AR $AR_FLAGS libconftest.a conftest.o 2>&AS_MESSAGE_LOG_FD
-      echo "$RANLIB libconftest.a" >&AS_MESSAGE_LOG_FD
-      $RANLIB libconftest.a 2>&AS_MESSAGE_LOG_FD
-      cat > conftest.c << _LT_EOF
-int main() { return 0;}
-_LT_EOF
-      echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&AS_MESSAGE_LOG_FD
-      $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err
-      _lt_result=$?
-      if test -s conftest.err && $GREP force_load conftest.err; then
-	cat conftest.err >&AS_MESSAGE_LOG_FD
-      elif test -f conftest && test 0 = "$_lt_result" && $GREP forced_load conftest >/dev/null 2>&1; then
-	lt_cv_ld_force_load=yes
-      else
-	cat conftest.err >&AS_MESSAGE_LOG_FD
-      fi
-        rm -f conftest.err libconftest.a conftest conftest.c
-        rm -rf conftest.dSYM
-    ])
-    case $host_os in
-    rhapsody* | darwin1.[[012]])
-      _lt_dar_allow_undefined='$wl-undefined ${wl}suppress' ;;
-    darwin1.*)
-      _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;;
-    darwin*) # darwin 5.x on
-      # if running on 10.5 or later, the deployment target defaults
-      # to the OS version, if on x86, and 10.4, the deployment
-      # target defaults to 10.4. Don't you love it?
-      case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
-	10.0,*86*-darwin8*|10.0,*-darwin[[91]]*)
-	  _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;;
-	10.[[012]][[,.]]*)
-	  _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;;
-	10.*)
-	  _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;;
-      esac
-    ;;
-  esac
-    if test yes = "$lt_cv_apple_cc_single_mod"; then
-      _lt_dar_single_mod='$single_module'
-    fi
-    if test yes = "$lt_cv_ld_exported_symbols_list"; then
-      _lt_dar_export_syms=' $wl-exported_symbols_list,$output_objdir/$libname-symbols.expsym'
-    else
-      _lt_dar_export_syms='~$NMEDIT -s $output_objdir/$libname-symbols.expsym $lib'
-    fi
-    if test : != "$DSYMUTIL" && test no = "$lt_cv_ld_force_load"; then
-      _lt_dsymutil='~$DSYMUTIL $lib || :'
-    else
-      _lt_dsymutil=
-    fi
-    ;;
-  esac
-])
-
-
-# _LT_DARWIN_LINKER_FEATURES([TAG])
-# ---------------------------------
-# Checks for linker and compiler features on darwin
-m4_defun([_LT_DARWIN_LINKER_FEATURES],
-[
-  m4_require([_LT_REQUIRED_DARWIN_CHECKS])
-  _LT_TAGVAR(archive_cmds_need_lc, $1)=no
-  _LT_TAGVAR(hardcode_direct, $1)=no
-  _LT_TAGVAR(hardcode_automatic, $1)=yes
-  _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
-  if test yes = "$lt_cv_ld_force_load"; then
-    _LT_TAGVAR(whole_archive_flag_spec, $1)='`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience $wl-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`'
-    m4_case([$1], [F77], [_LT_TAGVAR(compiler_needs_object, $1)=yes],
-                  [FC],  [_LT_TAGVAR(compiler_needs_object, $1)=yes])
-  else
-    _LT_TAGVAR(whole_archive_flag_spec, $1)=''
-  fi
-  _LT_TAGVAR(link_all_deplibs, $1)=yes
-  _LT_TAGVAR(allow_undefined_flag, $1)=$_lt_dar_allow_undefined
-  case $cc_basename in
-     ifort*|nagfor*) _lt_dar_can_shared=yes ;;
-     *) _lt_dar_can_shared=$GCC ;;
-  esac
-  if test yes = "$_lt_dar_can_shared"; then
-    output_verbose_link_cmd=func_echo_all
-    _LT_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dsymutil"
-    _LT_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dsymutil"
-    _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dar_export_syms$_lt_dsymutil"
-    _LT_TAGVAR(module_expsym_cmds, $1)="sed -e 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dar_export_syms$_lt_dsymutil"
-    m4_if([$1], [CXX],
-[   if test yes != "$lt_cv_apple_cc_single_mod"; then
-      _LT_TAGVAR(archive_cmds, $1)="\$CC -r -keep_private_externs -nostdlib -o \$lib-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$lib-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring$_lt_dsymutil"
-      _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \$lib-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$lib-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring$_lt_dar_export_syms$_lt_dsymutil"
-    fi
-],[])
-  else
-  _LT_TAGVAR(ld_shlibs, $1)=no
-  fi
-])
-
-# _LT_SYS_MODULE_PATH_AIX([TAGNAME])
-# ----------------------------------
-# Links a minimal program and checks the executable
-# for the system default hardcoded library path. In most cases,
-# this is /usr/lib:/lib, but when the MPI compilers are used
-# the location of the communication and MPI libs are included too.
-# If we don't find anything, use the default library path according
-# to the aix ld manual.
-# Store the results from the different compilers for each TAGNAME.
-# Allow to override them for all tags through lt_cv_aix_libpath.
-m4_defun([_LT_SYS_MODULE_PATH_AIX],
-[m4_require([_LT_DECL_SED])dnl
-if test set = "${lt_cv_aix_libpath+set}"; then
-  aix_libpath=$lt_cv_aix_libpath
-else
-  AC_CACHE_VAL([_LT_TAGVAR([lt_cv_aix_libpath_], [$1])],
-  [AC_LINK_IFELSE([AC_LANG_PROGRAM],[
-  lt_aix_libpath_sed='[
-      /Import File Strings/,/^$/ {
-	  /^0/ {
-	      s/^0  *\([^ ]*\) *$/\1/
-	      p
-	  }
-      }]'
-  _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-  # Check for a 64-bit object if we didn't find anything.
-  if test -z "$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])"; then
-    _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-  fi],[])
-  if test -z "$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])"; then
-    _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=/usr/lib:/lib
-  fi
-  ])
-  aix_libpath=$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])
-fi
-])# _LT_SYS_MODULE_PATH_AIX
-
-
-# _LT_SHELL_INIT(ARG)
-# -------------------
-m4_define([_LT_SHELL_INIT],
-[m4_divert_text([M4SH-INIT], [$1
-])])# _LT_SHELL_INIT
-
-
-
-# _LT_PROG_ECHO_BACKSLASH
-# -----------------------
-# Find how we can fake an echo command that does not interpret backslash.
-# In particular, with Autoconf 2.60 or later we add some code to the start
-# of the generated configure script that will find a shell with a builtin
-# printf (that we can use as an echo command).
-m4_defun([_LT_PROG_ECHO_BACKSLASH],
-[ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
-ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO
-ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
-
-AC_MSG_CHECKING([how to print strings])
-# Test print first, because it will be a builtin if present.
-if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \
-   test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
-  ECHO='print -r --'
-elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
-  ECHO='printf %s\n'
-else
-  # Use this function as a fallback that always works.
-  func_fallback_echo ()
-  {
-    eval 'cat <<_LTECHO_EOF
-$[]1
-_LTECHO_EOF'
-  }
-  ECHO='func_fallback_echo'
-fi
-
-# func_echo_all arg...
-# Invoke $ECHO with all args, space-separated.
-func_echo_all ()
-{
-    $ECHO "$*"
-}
-
-case $ECHO in
-  printf*) AC_MSG_RESULT([printf]) ;;
-  print*) AC_MSG_RESULT([print -r]) ;;
-  *) AC_MSG_RESULT([cat]) ;;
-esac
-
-m4_ifdef([_AS_DETECT_SUGGESTED],
-[_AS_DETECT_SUGGESTED([
-  test -n "${ZSH_VERSION+set}${BASH_VERSION+set}" || (
-    ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
-    ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO
-    ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
-    PATH=/empty FPATH=/empty; export PATH FPATH
-    test "X`printf %s $ECHO`" = "X$ECHO" \
-      || test "X`print -r -- $ECHO`" = "X$ECHO" )])])
-
-_LT_DECL([], [SHELL], [1], [Shell to use when invoking shell scripts])
-_LT_DECL([], [ECHO], [1], [An echo program that protects backslashes])
-])# _LT_PROG_ECHO_BACKSLASH
-
-
-# _LT_WITH_SYSROOT
-# ----------------
-AC_DEFUN([_LT_WITH_SYSROOT],
-[AC_MSG_CHECKING([for sysroot])
-AC_ARG_WITH([sysroot],
-[AS_HELP_STRING([--with-sysroot@<:@=DIR@:>@],
-  [Search for dependent libraries within DIR (or the compiler's sysroot
-   if not specified).])],
-[], [with_sysroot=no])
-
-dnl lt_sysroot will always be passed unquoted.  We quote it here
-dnl in case the user passed a directory name.
-lt_sysroot=
-case $with_sysroot in #(
- yes)
-   if test yes = "$GCC"; then
-     lt_sysroot=`$CC --print-sysroot 2>/dev/null`
-   fi
-   ;; #(
- /*)
-   lt_sysroot=`echo "$with_sysroot" | sed -e "$sed_quote_subst"`
-   ;; #(
- no|'')
-   ;; #(
- *)
-   AC_MSG_RESULT([$with_sysroot])
-   AC_MSG_ERROR([The sysroot must be an absolute path.])
-   ;;
-esac
-
- AC_MSG_RESULT([${lt_sysroot:-no}])
-_LT_DECL([], [lt_sysroot], [0], [The root where to search for ]dnl
-[dependent libraries, and where our libraries should be installed.])])
-
-# _LT_ENABLE_LOCK
-# ---------------
-m4_defun([_LT_ENABLE_LOCK],
-[AC_ARG_ENABLE([libtool-lock],
-  [AS_HELP_STRING([--disable-libtool-lock],
-    [avoid locking (might break parallel builds)])])
-test no = "$enable_libtool_lock" || enable_libtool_lock=yes
-
-# Some flags need to be propagated to the compiler or linker for good
-# libtool support.
-case $host in
-ia64-*-hpux*)
-  # Find out what ABI is being produced by ac_compile, and set mode
-  # options accordingly.
-  echo 'int i;' > conftest.$ac_ext
-  if AC_TRY_EVAL(ac_compile); then
-    case `/usr/bin/file conftest.$ac_objext` in
-      *ELF-32*)
-	HPUX_IA64_MODE=32
-	;;
-      *ELF-64*)
-	HPUX_IA64_MODE=64
-	;;
-    esac
-  fi
-  rm -rf conftest*
-  ;;
-*-*-irix6*)
-  # Find out what ABI is being produced by ac_compile, and set linker
-  # options accordingly.
-  echo '[#]line '$LINENO' "configure"' > conftest.$ac_ext
-  if AC_TRY_EVAL(ac_compile); then
-    if test yes = "$lt_cv_prog_gnu_ld"; then
-      case `/usr/bin/file conftest.$ac_objext` in
-	*32-bit*)
-	  LD="${LD-ld} -melf32bsmip"
-	  ;;
-	*N32*)
-	  LD="${LD-ld} -melf32bmipn32"
-	  ;;
-	*64-bit*)
-	  LD="${LD-ld} -melf64bmip"
-	;;
-      esac
-    else
-      case `/usr/bin/file conftest.$ac_objext` in
-	*32-bit*)
-	  LD="${LD-ld} -32"
-	  ;;
-	*N32*)
-	  LD="${LD-ld} -n32"
-	  ;;
-	*64-bit*)
-	  LD="${LD-ld} -64"
-	  ;;
-      esac
-    fi
-  fi
-  rm -rf conftest*
-  ;;
-
-mips64*-*linux*)
-  # Find out what ABI is being produced by ac_compile, and set linker
-  # options accordingly.
-  echo '[#]line '$LINENO' "configure"' > conftest.$ac_ext
-  if AC_TRY_EVAL(ac_compile); then
-    emul=elf
-    case `/usr/bin/file conftest.$ac_objext` in
-      *32-bit*)
-	emul="${emul}32"
-	;;
-      *64-bit*)
-	emul="${emul}64"
-	;;
-    esac
-    case `/usr/bin/file conftest.$ac_objext` in
-      *MSB*)
-	emul="${emul}btsmip"
-	;;
-      *LSB*)
-	emul="${emul}ltsmip"
-	;;
-    esac
-    case `/usr/bin/file conftest.$ac_objext` in
-      *N32*)
-	emul="${emul}n32"
-	;;
-    esac
-    LD="${LD-ld} -m $emul"
-  fi
-  rm -rf conftest*
-  ;;
-
-x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \
-s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
-  # Find out what ABI is being produced by ac_compile, and set linker
-  # options accordingly.  Note that the listed cases only cover the
-  # situations where additional linker options are needed (such as when
-  # doing 32-bit compilation for a host where ld defaults to 64-bit, or
-  # vice versa); the common cases where no linker options are needed do
-  # not appear in the list.
-  echo 'int i;' > conftest.$ac_ext
-  if AC_TRY_EVAL(ac_compile); then
-    case `/usr/bin/file conftest.o` in
-      *32-bit*)
-	case $host in
-	  x86_64-*kfreebsd*-gnu)
-	    LD="${LD-ld} -m elf_i386_fbsd"
-	    ;;
-	  x86_64-*linux*)
-	    case `/usr/bin/file conftest.o` in
-	      *x86-64*)
-		LD="${LD-ld} -m elf32_x86_64"
-		;;
-	      *)
-		LD="${LD-ld} -m elf_i386"
-		;;
-	    esac
-	    ;;
-	  powerpc64le-*linux*)
-	    LD="${LD-ld} -m elf32lppclinux"
-	    ;;
-	  powerpc64-*linux*)
-	    LD="${LD-ld} -m elf32ppclinux"
-	    ;;
-	  s390x-*linux*)
-	    LD="${LD-ld} -m elf_s390"
-	    ;;
-	  sparc64-*linux*)
-	    LD="${LD-ld} -m elf32_sparc"
-	    ;;
-	esac
-	;;
-      *64-bit*)
-	case $host in
-	  x86_64-*kfreebsd*-gnu)
-	    LD="${LD-ld} -m elf_x86_64_fbsd"
-	    ;;
-	  x86_64-*linux*)
-	    LD="${LD-ld} -m elf_x86_64"
-	    ;;
-	  powerpcle-*linux*)
-	    LD="${LD-ld} -m elf64lppc"
-	    ;;
-	  powerpc-*linux*)
-	    LD="${LD-ld} -m elf64ppc"
-	    ;;
-	  s390*-*linux*|s390*-*tpf*)
-	    LD="${LD-ld} -m elf64_s390"
-	    ;;
-	  sparc*-*linux*)
-	    LD="${LD-ld} -m elf64_sparc"
-	    ;;
-	esac
-	;;
-    esac
-  fi
-  rm -rf conftest*
-  ;;
-
-*-*-sco3.2v5*)
-  # On SCO OpenServer 5, we need -belf to get full-featured binaries.
-  SAVE_CFLAGS=$CFLAGS
-  CFLAGS="$CFLAGS -belf"
-  AC_CACHE_CHECK([whether the C compiler needs -belf], lt_cv_cc_needs_belf,
-    [AC_LANG_PUSH(C)
-     AC_LINK_IFELSE([AC_LANG_PROGRAM([[]],[[]])],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no])
-     AC_LANG_POP])
-  if test yes != "$lt_cv_cc_needs_belf"; then
-    # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
-    CFLAGS=$SAVE_CFLAGS
-  fi
-  ;;
-*-*solaris*)
-  # Find out what ABI is being produced by ac_compile, and set linker
-  # options accordingly.
-  echo 'int i;' > conftest.$ac_ext
-  if AC_TRY_EVAL(ac_compile); then
-    case `/usr/bin/file conftest.o` in
-    *64-bit*)
-      case $lt_cv_prog_gnu_ld in
-      yes*)
-        case $host in
-        i?86-*-solaris*|x86_64-*-solaris*)
-          LD="${LD-ld} -m elf_x86_64"
-          ;;
-        sparc*-*-solaris*)
-          LD="${LD-ld} -m elf64_sparc"
-          ;;
-        esac
-        # GNU ld 2.21 introduced _sol2 emulations.  Use them if available.
-        if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then
-          LD=${LD-ld}_sol2
-        fi
-        ;;
-      *)
-	if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then
-	  LD="${LD-ld} -64"
-	fi
-	;;
-      esac
-      ;;
-    esac
-  fi
-  rm -rf conftest*
-  ;;
-esac
-
-need_locks=$enable_libtool_lock
-])# _LT_ENABLE_LOCK
-
-
-# _LT_PROG_AR
-# -----------
-m4_defun([_LT_PROG_AR],
-[AC_CHECK_TOOLS(AR, [ar], false)
-: ${AR=ar}
-_LT_DECL([], [AR], [1], [The archiver])
-
-# Use ARFLAGS variable as AR's operation code to sync the variable naming with
-# Automake.  If both AR_FLAGS and ARFLAGS are specified, AR_FLAGS should have
-# higher priority because thats what people were doing historically (setting
-# ARFLAGS for automake and AR_FLAGS for libtool).  FIXME: Make the AR_FLAGS
-# variable obsoleted/removed.
-
-test ${AR_FLAGS+y} || AR_FLAGS=${ARFLAGS-cr}
-lt_ar_flags=$AR_FLAGS
-_LT_DECL([], [lt_ar_flags], [0], [Flags to create an archive (by configure)])
-
-# Make AR_FLAGS overridable by 'make ARFLAGS='.  Don't try to run-time override
-# by AR_FLAGS because that was never working and AR_FLAGS is about to die.
-_LT_DECL([], [AR_FLAGS], [\@S|@{ARFLAGS-"\@S|@lt_ar_flags"}],
-         [Flags to create an archive])
-
-AC_CACHE_CHECK([for archiver @FILE support], [lt_cv_ar_at_file],
-  [lt_cv_ar_at_file=no
-   AC_COMPILE_IFELSE([AC_LANG_PROGRAM],
-     [echo conftest.$ac_objext > conftest.lst
-      lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&AS_MESSAGE_LOG_FD'
-      AC_TRY_EVAL([lt_ar_try])
-      if test 0 -eq "$ac_status"; then
-	# Ensure the archiver fails upon bogus file names.
-	rm -f conftest.$ac_objext libconftest.a
-	AC_TRY_EVAL([lt_ar_try])
-	if test 0 -ne "$ac_status"; then
-          lt_cv_ar_at_file=@
-        fi
-      fi
-      rm -f conftest.* libconftest.a
-     ])
-  ])
-
-if test no = "$lt_cv_ar_at_file"; then
-  archiver_list_spec=
-else
-  archiver_list_spec=$lt_cv_ar_at_file
-fi
-_LT_DECL([], [archiver_list_spec], [1],
-  [How to feed a file listing to the archiver])
-])# _LT_PROG_AR
-
-
-# _LT_CMD_OLD_ARCHIVE
-# -------------------
-m4_defun([_LT_CMD_OLD_ARCHIVE],
-[_LT_PROG_AR
-
-AC_CHECK_TOOL(STRIP, strip, :)
-test -z "$STRIP" && STRIP=:
-_LT_DECL([], [STRIP], [1], [A symbol stripping program])
-
-AC_CHECK_TOOL(RANLIB, ranlib, :)
-test -z "$RANLIB" && RANLIB=:
-_LT_DECL([], [RANLIB], [1],
-    [Commands used to install an old-style archive])
-
-# Determine commands to create old-style static archives.
-old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs'
-old_postinstall_cmds='chmod 644 $oldlib'
-old_postuninstall_cmds=
-
-if test -n "$RANLIB"; then
-  case $host_os in
-  bitrig* | openbsd*)
-    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib"
-    ;;
-  *)
-    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$tool_oldlib"
-    ;;
-  esac
-  old_archive_cmds="$old_archive_cmds~\$RANLIB \$tool_oldlib"
-fi
-
-case $host_os in
-  darwin*)
-    lock_old_archive_extraction=yes ;;
-  *)
-    lock_old_archive_extraction=no ;;
-esac
-_LT_DECL([], [old_postinstall_cmds], [2])
-_LT_DECL([], [old_postuninstall_cmds], [2])
-_LT_TAGDECL([], [old_archive_cmds], [2],
-    [Commands used to build an old-style archive])
-_LT_DECL([], [lock_old_archive_extraction], [0],
-    [Whether to use a lock for old archive extraction])
-])# _LT_CMD_OLD_ARCHIVE
-
-
-# _LT_COMPILER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS,
-#		[OUTPUT-FILE], [ACTION-SUCCESS], [ACTION-FAILURE])
-# ----------------------------------------------------------------
-# Check whether the given compiler option works
-AC_DEFUN([_LT_COMPILER_OPTION],
-[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
-m4_require([_LT_DECL_SED])dnl
-AC_CACHE_CHECK([$1], [$2],
-  [$2=no
-   m4_if([$4], , [ac_outfile=conftest.$ac_objext], [ac_outfile=$4])
-   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-   lt_compiler_flag="$3"  ## exclude from sc_useless_quotes_in_assignment
-   # Insert the option either (1) after the last *FLAGS variable, or
-   # (2) before a word containing "conftest.", or (3) at the end.
-   # Note that $ac_compile itself does not contain backslashes and begins
-   # with a dollar sign (not a hyphen), so the echo should work correctly.
-   # The option is referenced via a variable to avoid confusing sed.
-   lt_compile=`echo "$ac_compile" | $SED \
-   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-   -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
-   -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
-   (eval "$lt_compile" 2>conftest.err)
-   ac_status=$?
-   cat conftest.err >&AS_MESSAGE_LOG_FD
-   echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
-   if (exit $ac_status) && test -s "$ac_outfile"; then
-     # The compiler can only warn and ignore the option if not recognized
-     # So say no if there are warnings other than the usual output.
-     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp
-     $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
-     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
-       $2=yes
-     fi
-   fi
-   $RM conftest*
-])
-
-if test yes = "[$]$2"; then
-    m4_if([$5], , :, [$5])
-else
-    m4_if([$6], , :, [$6])
-fi
-])# _LT_COMPILER_OPTION
-
-# Old name:
-AU_ALIAS([AC_LIBTOOL_COMPILER_OPTION], [_LT_COMPILER_OPTION])
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AC_LIBTOOL_COMPILER_OPTION], [])
-
-
-# _LT_LINKER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS,
-#                  [ACTION-SUCCESS], [ACTION-FAILURE])
-# ----------------------------------------------------
-# Check whether the given linker option works
-AC_DEFUN([_LT_LINKER_OPTION],
-[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
-m4_require([_LT_DECL_SED])dnl
-AC_CACHE_CHECK([$1], [$2],
-  [$2=no
-   save_LDFLAGS=$LDFLAGS
-   LDFLAGS="$LDFLAGS $3"
-   echo "$lt_simple_link_test_code" > conftest.$ac_ext
-   if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
-     # The linker can only warn and ignore the option if not recognized
-     # So say no if there are warnings
-     if test -s conftest.err; then
-       # Append any errors to the config.log.
-       cat conftest.err 1>&AS_MESSAGE_LOG_FD
-       $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp
-       $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
-       if diff conftest.exp conftest.er2 >/dev/null; then
-         $2=yes
-       fi
-     else
-       $2=yes
-     fi
-   fi
-   $RM -r conftest*
-   LDFLAGS=$save_LDFLAGS
-])
-
-if test yes = "[$]$2"; then
-    m4_if([$4], , :, [$4])
-else
-    m4_if([$5], , :, [$5])
-fi
-])# _LT_LINKER_OPTION
-
-# Old name:
-AU_ALIAS([AC_LIBTOOL_LINKER_OPTION], [_LT_LINKER_OPTION])
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AC_LIBTOOL_LINKER_OPTION], [])
-
-
-# LT_CMD_MAX_LEN
-#---------------
-AC_DEFUN([LT_CMD_MAX_LEN],
-[AC_REQUIRE([AC_CANONICAL_HOST])dnl
-# find the maximum length of command line arguments
-AC_MSG_CHECKING([the maximum length of command line arguments])
-AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
-  i=0
-  teststring=ABCD
-
-  case $build_os in
-  msdosdjgpp*)
-    # On DJGPP, this test can blow up pretty badly due to problems in libc
-    # (any single argument exceeding 2000 bytes causes a buffer overrun
-    # during glob expansion).  Even if it were fixed, the result of this
-    # check would be larger than it should be.
-    lt_cv_sys_max_cmd_len=12288;    # 12K is about right
-    ;;
-
-  gnu*)
-    # Under GNU Hurd, this test is not required because there is
-    # no limit to the length of command line arguments.
-    # Libtool will interpret -1 as no limit whatsoever
-    lt_cv_sys_max_cmd_len=-1;
-    ;;
-
-  cygwin* | mingw* | cegcc*)
-    # On Win9x/ME, this test blows up -- it succeeds, but takes
-    # about 5 minutes as the teststring grows exponentially.
-    # Worse, since 9x/ME are not pre-emptively multitasking,
-    # you end up with a "frozen" computer, even though with patience
-    # the test eventually succeeds (with a max line length of 256k).
-    # Instead, let's just punt: use the minimum linelength reported by
-    # all of the supported platforms: 8192 (on NT/2K/XP).
-    lt_cv_sys_max_cmd_len=8192;
-    ;;
-
-  mint*)
-    # On MiNT this can take a long time and run out of memory.
-    lt_cv_sys_max_cmd_len=8192;
-    ;;
-
-  amigaos*)
-    # On AmigaOS with pdksh, this test takes hours, literally.
-    # So we just punt and use a minimum line length of 8192.
-    lt_cv_sys_max_cmd_len=8192;
-    ;;
-
-  bitrig* | darwin* | dragonfly* | freebsd* | netbsd* | openbsd*)
-    # This has been around since 386BSD, at least.  Likely further.
-    if test -x /sbin/sysctl; then
-      lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
-    elif test -x /usr/sbin/sysctl; then
-      lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax`
-    else
-      lt_cv_sys_max_cmd_len=65536	# usable default for all BSDs
-    fi
-    # And add a safety zone
-    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
-    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
-    ;;
-
-  interix*)
-    # We know the value 262144 and hardcode it with a safety zone (like BSD)
-    lt_cv_sys_max_cmd_len=196608
-    ;;
-
-  os2*)
-    # The test takes a long time on OS/2.
-    lt_cv_sys_max_cmd_len=8192
-    ;;
-
-  osf*)
-    # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure
-    # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not
-    # nice to cause kernel panics so lets avoid the loop below.
-    # First set a reasonable default.
-    lt_cv_sys_max_cmd_len=16384
-    #
-    if test -x /sbin/sysconfig; then
-      case `/sbin/sysconfig -q proc exec_disable_arg_limit` in
-        *1*) lt_cv_sys_max_cmd_len=-1 ;;
-      esac
-    fi
-    ;;
-  sco3.2v5*)
-    lt_cv_sys_max_cmd_len=102400
-    ;;
-  sysv5* | sco5v6* | sysv4.2uw2*)
-    kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null`
-    if test -n "$kargmax"; then
-      lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[[	 ]]//'`
-    else
-      lt_cv_sys_max_cmd_len=32768
-    fi
-    ;;
-  *)
-    lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null`
-    if test -n "$lt_cv_sys_max_cmd_len" && \
-       test undefined != "$lt_cv_sys_max_cmd_len"; then
-      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
-      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
-    else
-      # Make teststring a little bigger before we do anything with it.
-      # a 1K string should be a reasonable start.
-      for i in 1 2 3 4 5 6 7 8; do
-        teststring=$teststring$teststring
-      done
-      SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
-      # If test is not a shell built-in, we'll probably end up computing a
-      # maximum length that is only half of the actual maximum length, but
-      # we can't tell.
-      while { test X`env echo "$teststring$teststring" 2>/dev/null` \
-	         = "X$teststring$teststring"; } >/dev/null 2>&1 &&
-	      test 17 != "$i" # 1/2 MB should be enough
-      do
-        i=`expr $i + 1`
-        teststring=$teststring$teststring
-      done
-      # Only check the string length outside the loop.
-      lt_cv_sys_max_cmd_len=`expr "X$teststring" : ".*" 2>&1`
-      teststring=
-      # Add a significant safety factor because C++ compilers can tack on
-      # massive amounts of additional arguments before passing them to the
-      # linker.  It appears as though 1/2 is a usable value.
-      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
-    fi
-    ;;
-  esac
-])
-if test -n "$lt_cv_sys_max_cmd_len"; then
-  AC_MSG_RESULT($lt_cv_sys_max_cmd_len)
-else
-  AC_MSG_RESULT(none)
-fi
-max_cmd_len=$lt_cv_sys_max_cmd_len
-_LT_DECL([], [max_cmd_len], [0],
-    [What is the maximum length of a command?])
-])# LT_CMD_MAX_LEN
-
-# Old name:
-AU_ALIAS([AC_LIBTOOL_SYS_MAX_CMD_LEN], [LT_CMD_MAX_LEN])
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AC_LIBTOOL_SYS_MAX_CMD_LEN], [])
-
-
-# _LT_HEADER_DLFCN
-# ----------------
-m4_defun([_LT_HEADER_DLFCN],
-[AC_CHECK_HEADERS([dlfcn.h], [], [], [AC_INCLUDES_DEFAULT])dnl
-])# _LT_HEADER_DLFCN
-
-
-# _LT_TRY_DLOPEN_SELF (ACTION-IF-TRUE, ACTION-IF-TRUE-W-USCORE,
-#                      ACTION-IF-FALSE, ACTION-IF-CROSS-COMPILING)
-# ----------------------------------------------------------------
-m4_defun([_LT_TRY_DLOPEN_SELF],
-[m4_require([_LT_HEADER_DLFCN])dnl
-if test yes = "$cross_compiling"; then :
-  [$4]
-else
-  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
-  lt_status=$lt_dlunknown
-  cat > conftest.$ac_ext <<_LT_EOF
-[#line $LINENO "configure"
-#include "confdefs.h"
-
-#if HAVE_DLFCN_H
-#include <dlfcn.h>
-#endif
-
-#include <stdio.h>
-
-#ifdef RTLD_GLOBAL
-#  define LT_DLGLOBAL		RTLD_GLOBAL
-#else
-#  ifdef DL_GLOBAL
-#    define LT_DLGLOBAL		DL_GLOBAL
-#  else
-#    define LT_DLGLOBAL		0
-#  endif
-#endif
-
-/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
-   find out it does not work in some platform. */
-#ifndef LT_DLLAZY_OR_NOW
-#  ifdef RTLD_LAZY
-#    define LT_DLLAZY_OR_NOW		RTLD_LAZY
-#  else
-#    ifdef DL_LAZY
-#      define LT_DLLAZY_OR_NOW		DL_LAZY
-#    else
-#      ifdef RTLD_NOW
-#        define LT_DLLAZY_OR_NOW	RTLD_NOW
-#      else
-#        ifdef DL_NOW
-#          define LT_DLLAZY_OR_NOW	DL_NOW
-#        else
-#          define LT_DLLAZY_OR_NOW	0
-#        endif
-#      endif
-#    endif
-#  endif
-#endif
-
-/* When -fvisibility=hidden is used, assume the code has been annotated
-   correspondingly for the symbols needed.  */
-#if defined __GNUC__ && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
-int fnord () __attribute__((visibility("default")));
-#endif
-
-int fnord () { return 42; }
-int main ()
-{
-  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
-  int status = $lt_dlunknown;
-
-  if (self)
-    {
-      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
-      else
-        {
-	  if (dlsym( self,"_fnord"))  status = $lt_dlneed_uscore;
-          else puts (dlerror ());
-	}
-      /* dlclose (self); */
-    }
-  else
-    puts (dlerror ());
-
-  return status;
-}]
-_LT_EOF
-  if AC_TRY_EVAL(ac_link) && test -s "conftest$ac_exeext" 2>/dev/null; then
-    (./conftest; exit; ) >&AS_MESSAGE_LOG_FD 2>/dev/null
-    lt_status=$?
-    case x$lt_status in
-      x$lt_dlno_uscore) $1 ;;
-      x$lt_dlneed_uscore) $2 ;;
-      x$lt_dlunknown|x*) $3 ;;
-    esac
-  else :
-    # compilation failed
-    $3
-  fi
-fi
-rm -fr conftest*
-])# _LT_TRY_DLOPEN_SELF
-
-
-# LT_SYS_DLOPEN_SELF
-# ------------------
-AC_DEFUN([LT_SYS_DLOPEN_SELF],
-[m4_require([_LT_HEADER_DLFCN])dnl
-if test yes != "$enable_dlopen"; then
-  enable_dlopen=unknown
-  enable_dlopen_self=unknown
-  enable_dlopen_self_static=unknown
-else
-  lt_cv_dlopen=no
-  lt_cv_dlopen_libs=
-
-  case $host_os in
-  beos*)
-    lt_cv_dlopen=load_add_on
-    lt_cv_dlopen_libs=
-    lt_cv_dlopen_self=yes
-    ;;
-
-  mingw* | pw32* | cegcc*)
-    lt_cv_dlopen=LoadLibrary
-    lt_cv_dlopen_libs=
-    ;;
-
-  cygwin*)
-    lt_cv_dlopen=dlopen
-    lt_cv_dlopen_libs=
-    ;;
-
-  darwin*)
-    # if libdl is installed we need to link against it
-    AC_CHECK_LIB([dl], [dlopen],
-		[lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-ldl],[
-    lt_cv_dlopen=dyld
-    lt_cv_dlopen_libs=
-    lt_cv_dlopen_self=yes
-    ])
-    ;;
-
-  tpf*)
-    # Don't try to run any link tests for TPF.  We know it's impossible
-    # because TPF is a cross-compiler, and we know how we open DSOs.
-    lt_cv_dlopen=dlopen
-    lt_cv_dlopen_libs=
-    lt_cv_dlopen_self=no
-    ;;
-
-  *)
-    AC_CHECK_FUNC([shl_load],
-	  [lt_cv_dlopen=shl_load],
-      [AC_CHECK_LIB([dld], [shl_load],
-	    [lt_cv_dlopen=shl_load lt_cv_dlopen_libs=-ldld],
-	[AC_CHECK_FUNC([dlopen],
-	      [lt_cv_dlopen=dlopen],
-	  [AC_CHECK_LIB([dl], [dlopen],
-		[lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-ldl],
-	    [AC_CHECK_LIB([svld], [dlopen],
-		  [lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-lsvld],
-	      [AC_CHECK_LIB([dld], [dld_link],
-		    [lt_cv_dlopen=dld_link lt_cv_dlopen_libs=-ldld])
-	      ])
-	    ])
-	  ])
-	])
-      ])
-    ;;
-  esac
-
-  if test no = "$lt_cv_dlopen"; then
-    enable_dlopen=no
-  else
-    enable_dlopen=yes
-  fi
-
-  case $lt_cv_dlopen in
-  dlopen)
-    save_CPPFLAGS=$CPPFLAGS
-    test yes = "$ac_cv_header_dlfcn_h" && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
-
-    save_LDFLAGS=$LDFLAGS
-    wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
-
-    save_LIBS=$LIBS
-    LIBS="$lt_cv_dlopen_libs $LIBS"
-
-    AC_CACHE_CHECK([whether a program can dlopen itself],
-	  lt_cv_dlopen_self, [dnl
-	  _LT_TRY_DLOPEN_SELF(
-	    lt_cv_dlopen_self=yes, lt_cv_dlopen_self=yes,
-	    lt_cv_dlopen_self=no, lt_cv_dlopen_self=cross)
-    ])
-
-    if test yes = "$lt_cv_dlopen_self"; then
-      wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
-      AC_CACHE_CHECK([whether a statically linked program can dlopen itself],
-	  lt_cv_dlopen_self_static, [dnl
-	  _LT_TRY_DLOPEN_SELF(
-	    lt_cv_dlopen_self_static=yes, lt_cv_dlopen_self_static=yes,
-	    lt_cv_dlopen_self_static=no,  lt_cv_dlopen_self_static=cross)
-      ])
-    fi
-
-    CPPFLAGS=$save_CPPFLAGS
-    LDFLAGS=$save_LDFLAGS
-    LIBS=$save_LIBS
-    ;;
-  esac
-
-  case $lt_cv_dlopen_self in
-  yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
-  *) enable_dlopen_self=unknown ;;
-  esac
-
-  case $lt_cv_dlopen_self_static in
-  yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;;
-  *) enable_dlopen_self_static=unknown ;;
-  esac
-fi
-_LT_DECL([dlopen_support], [enable_dlopen], [0],
-	 [Whether dlopen is supported])
-_LT_DECL([dlopen_self], [enable_dlopen_self], [0],
-	 [Whether dlopen of programs is supported])
-_LT_DECL([dlopen_self_static], [enable_dlopen_self_static], [0],
-	 [Whether dlopen of statically linked programs is supported])
-])# LT_SYS_DLOPEN_SELF
-
-# Old name:
-AU_ALIAS([AC_LIBTOOL_DLOPEN_SELF], [LT_SYS_DLOPEN_SELF])
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AC_LIBTOOL_DLOPEN_SELF], [])
-
-
-# _LT_COMPILER_C_O([TAGNAME])
-# ---------------------------
-# Check to see if options -c and -o are simultaneously supported by compiler.
-# This macro does not hard code the compiler like AC_PROG_CC_C_O.
-m4_defun([_LT_COMPILER_C_O],
-[m4_require([_LT_DECL_SED])dnl
-m4_require([_LT_FILEUTILS_DEFAULTS])dnl
-m4_require([_LT_TAG_COMPILER])dnl
-AC_CACHE_CHECK([if $compiler supports -c -o file.$ac_objext],
-  [_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)],
-  [_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=no
-   $RM -r conftest 2>/dev/null
-   mkdir conftest
-   cd conftest
-   mkdir out
-   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-
-   lt_compiler_flag="-o out/conftest2.$ac_objext"
-   # Insert the option either (1) after the last *FLAGS variable, or
-   # (2) before a word containing "conftest.", or (3) at the end.
-   # Note that $ac_compile itself does not contain backslashes and begins
-   # with a dollar sign (not a hyphen), so the echo should work correctly.
-   lt_compile=`echo "$ac_compile" | $SED \
-   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-   -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
-   -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
-   (eval "$lt_compile" 2>out/conftest.err)
-   ac_status=$?
-   cat out/conftest.err >&AS_MESSAGE_LOG_FD
-   echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
-   if (exit $ac_status) && test -s out/conftest2.$ac_objext
-   then
-     # The compiler can only warn and ignore the option if not recognized
-     # So say no if there are warnings
-     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp
-     $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
-     if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
-       _LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
-     fi
-   fi
-   chmod u+w . 2>&AS_MESSAGE_LOG_FD
-   $RM conftest*
-   # SGI C++ compiler will create directory out/ii_files/ for
-   # template instantiation
-   test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files
-   $RM out/* && rmdir out
-   cd ..
-   $RM -r conftest
-   $RM conftest*
-])
-_LT_TAGDECL([compiler_c_o], [lt_cv_prog_compiler_c_o], [1],
-	[Does compiler simultaneously support -c and -o options?])
-])# _LT_COMPILER_C_O
-
-
-# _LT_COMPILER_FILE_LOCKS([TAGNAME])
-# ----------------------------------
-# Check to see if we can do hard links to lock some files if needed
-m4_defun([_LT_COMPILER_FILE_LOCKS],
-[m4_require([_LT_ENABLE_LOCK])dnl
-m4_require([_LT_FILEUTILS_DEFAULTS])dnl
-_LT_COMPILER_C_O([$1])
-
-hard_links=nottested
-if test no = "$_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)" && test no != "$need_locks"; then
-  # do not overwrite the value of need_locks provided by the user
-  AC_MSG_CHECKING([if we can lock with hard links])
-  hard_links=yes
-  $RM conftest*
-  ln conftest.a conftest.b 2>/dev/null && hard_links=no
-  touch conftest.a
-  ln conftest.a conftest.b 2>&5 || hard_links=no
-  ln conftest.a conftest.b 2>/dev/null && hard_links=no
-  AC_MSG_RESULT([$hard_links])
-  if test no = "$hard_links"; then
-    AC_MSG_WARN(['$CC' does not support '-c -o', so 'make -j' may be unsafe])
-    need_locks=warn
-  fi
-else
-  need_locks=no
-fi
-_LT_DECL([], [need_locks], [1], [Must we lock files when doing compilation?])
-])# _LT_COMPILER_FILE_LOCKS
-
-
-# _LT_CHECK_OBJDIR
-# ----------------
-m4_defun([_LT_CHECK_OBJDIR],
-[AC_CACHE_CHECK([for objdir], [lt_cv_objdir],
-[rm -f .libs 2>/dev/null
-mkdir .libs 2>/dev/null
-if test -d .libs; then
-  lt_cv_objdir=.libs
-else
-  # MS-DOS does not allow filenames that begin with a dot.
-  lt_cv_objdir=_libs
-fi
-rmdir .libs 2>/dev/null])
-objdir=$lt_cv_objdir
-_LT_DECL([], [objdir], [0],
-         [The name of the directory that contains temporary libtool files])dnl
-m4_pattern_allow([LT_OBJDIR])dnl
-AC_DEFINE_UNQUOTED([LT_OBJDIR], "$lt_cv_objdir/",
-  [Define to the sub-directory where libtool stores uninstalled libraries.])
-])# _LT_CHECK_OBJDIR
-
-
-# _LT_LINKER_HARDCODE_LIBPATH([TAGNAME])
-# --------------------------------------
-# Check hardcoding attributes.
-m4_defun([_LT_LINKER_HARDCODE_LIBPATH],
-[AC_MSG_CHECKING([how to hardcode library paths into programs])
-_LT_TAGVAR(hardcode_action, $1)=
-if test -n "$_LT_TAGVAR(hardcode_libdir_flag_spec, $1)" ||
-   test -n "$_LT_TAGVAR(runpath_var, $1)" ||
-   test yes = "$_LT_TAGVAR(hardcode_automatic, $1)"; then
-
-  # We can hardcode non-existent directories.
-  if test no != "$_LT_TAGVAR(hardcode_direct, $1)" &&
-     # If the only mechanism to avoid hardcoding is shlibpath_var, we
-     # have to relink, otherwise we might link with an installed library
-     # when we should be linking with a yet-to-be-installed one
-     ## test no != "$_LT_TAGVAR(hardcode_shlibpath_var, $1)" &&
-     test no != "$_LT_TAGVAR(hardcode_minus_L, $1)"; then
-    # Linking always hardcodes the temporary library directory.
-    _LT_TAGVAR(hardcode_action, $1)=relink
-  else
-    # We can link without hardcoding, and we can hardcode nonexisting dirs.
-    _LT_TAGVAR(hardcode_action, $1)=immediate
-  fi
-else
-  # We cannot hardcode anything, or else we can only hardcode existing
-  # directories.
-  _LT_TAGVAR(hardcode_action, $1)=unsupported
-fi
-AC_MSG_RESULT([$_LT_TAGVAR(hardcode_action, $1)])
-
-if test relink = "$_LT_TAGVAR(hardcode_action, $1)" ||
-   test yes = "$_LT_TAGVAR(inherit_rpath, $1)"; then
-  # Fast installation is not supported
-  enable_fast_install=no
-elif test yes = "$shlibpath_overrides_runpath" ||
-     test no = "$enable_shared"; then
-  # Fast installation is not necessary
-  enable_fast_install=needless
-fi
-_LT_TAGDECL([], [hardcode_action], [0],
-    [How to hardcode a shared library path into an executable])
-])# _LT_LINKER_HARDCODE_LIBPATH
-
-
-# _LT_CMD_STRIPLIB
-# ----------------
-m4_defun([_LT_CMD_STRIPLIB],
-[m4_require([_LT_DECL_EGREP])
-striplib=
-old_striplib=
-AC_MSG_CHECKING([whether stripping libraries is possible])
-if test -z "$STRIP"; then
-  AC_MSG_RESULT([no])
-else
-  if $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then
-    old_striplib="$STRIP --strip-debug"
-    striplib="$STRIP --strip-unneeded"
-    AC_MSG_RESULT([yes])
-  else
-    case $host_os in
-    darwin*)
-      # FIXME - insert some real tests, host_os isn't really good enough
-      striplib="$STRIP -x"
-      old_striplib="$STRIP -S"
-      AC_MSG_RESULT([yes])
-      ;;
-    freebsd*)
-      if $STRIP -V 2>&1 | $GREP "elftoolchain" >/dev/null; then
-        old_striplib="$STRIP --strip-debug"
-        striplib="$STRIP --strip-unneeded"
-        AC_MSG_RESULT([yes])
-      else
-        AC_MSG_RESULT([no])
-      fi
-      ;;
-    *)
-      AC_MSG_RESULT([no])
-      ;;
-    esac
-  fi
-fi
-_LT_DECL([], [old_striplib], [1], [Commands to strip libraries])
-_LT_DECL([], [striplib], [1])
-])# _LT_CMD_STRIPLIB
-
-
-# _LT_PREPARE_MUNGE_PATH_LIST
-# ---------------------------
-# Make sure func_munge_path_list() is defined correctly.
-m4_defun([_LT_PREPARE_MUNGE_PATH_LIST],
-[[# func_munge_path_list VARIABLE PATH
-# -----------------------------------
-# VARIABLE is name of variable containing _space_ separated list of
-# directories to be munged by the contents of PATH, which is string
-# having a format:
-# "DIR[:DIR]:"
-#       string "DIR[ DIR]" will be prepended to VARIABLE
-# ":DIR[:DIR]"
-#       string "DIR[ DIR]" will be appended to VARIABLE
-# "DIRP[:DIRP]::[DIRA:]DIRA"
-#       string "DIRP[ DIRP]" will be prepended to VARIABLE and string
-#       "DIRA[ DIRA]" will be appended to VARIABLE
-# "DIR[:DIR]"
-#       VARIABLE will be replaced by "DIR[ DIR]"
-func_munge_path_list ()
-{
-    case x@S|@2 in
-    x)
-        ;;
-    *:)
-        eval @S|@1=\"`$ECHO @S|@2 | $SED 's/:/ /g'` \@S|@@S|@1\"
-        ;;
-    x:*)
-        eval @S|@1=\"\@S|@@S|@1 `$ECHO @S|@2 | $SED 's/:/ /g'`\"
-        ;;
-    *::*)
-        eval @S|@1=\"\@S|@@S|@1\ `$ECHO @S|@2 | $SED -e 's/.*:://' -e 's/:/ /g'`\"
-        eval @S|@1=\"`$ECHO @S|@2 | $SED -e 's/::.*//' -e 's/:/ /g'`\ \@S|@@S|@1\"
-        ;;
-    *)
-        eval @S|@1=\"`$ECHO @S|@2 | $SED 's/:/ /g'`\"
-        ;;
-    esac
-}
-]])# _LT_PREPARE_PATH_LIST
-
-
-# _LT_SYS_DYNAMIC_LINKER([TAG])
-# -----------------------------
-# PORTME Fill in your ld.so characteristics
-m4_defun([_LT_SYS_DYNAMIC_LINKER],
-[AC_REQUIRE([AC_CANONICAL_HOST])dnl
-m4_require([_LT_DECL_EGREP])dnl
-m4_require([_LT_FILEUTILS_DEFAULTS])dnl
-m4_require([_LT_DECL_OBJDUMP])dnl
-m4_require([_LT_DECL_SED])dnl
-m4_require([_LT_CHECK_SHELL_FEATURES])dnl
-m4_require([_LT_PREPARE_MUNGE_PATH_LIST])dnl
-AC_MSG_CHECKING([dynamic linker characteristics])
-m4_if([$1],
-	[], [
-if test yes = "$GCC"; then
-  case $host_os in
-    darwin*) lt_awk_arg='/^libraries:/,/LR/' ;;
-    *) lt_awk_arg='/^libraries:/' ;;
-  esac
-  case $host_os in
-    mingw* | cegcc*) lt_sed_strip_eq='s|=\([[A-Za-z]]:\)|\1|g' ;;
-    *) lt_sed_strip_eq='s|=/|/|g' ;;
-  esac
-  lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e $lt_sed_strip_eq`
-  case $lt_search_path_spec in
-  *\;*)
-    # if the path contains ";" then we assume it to be the separator
-    # otherwise default to the standard path separator (i.e. ":") - it is
-    # assumed that no part of a normal pathname contains ";" but that should
-    # okay in the real world where ";" in dirpaths is itself problematic.
-    lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED 's/;/ /g'`
-    ;;
-  *)
-    lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED "s/$PATH_SEPARATOR/ /g"`
-    ;;
-  esac
-  # Ok, now we have the path, separated by spaces, we can step through it
-  # and add multilib dir if necessary...
-  lt_tmp_lt_search_path_spec=
-  lt_multi_os_dir=/`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null`
-  # ...but if some path component already ends with the multilib dir we assume
-  # that all is fine and trust -print-search-dirs as is (GCC 4.2? or newer).
-  case "$lt_multi_os_dir; $lt_search_path_spec " in
-  "/; "* | "/.; "* | "/./; "* | *"$lt_multi_os_dir "* | *"$lt_multi_os_dir/ "*)
-    lt_multi_os_dir=
-    ;;
-  esac
-  for lt_sys_path in $lt_search_path_spec; do
-    if test -d "$lt_sys_path$lt_multi_os_dir"; then
-      lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path$lt_multi_os_dir"
-    elif test -n "$lt_multi_os_dir"; then
-      test -d "$lt_sys_path" && \
-	lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path"
-    fi
-  done
-  lt_search_path_spec=`$ECHO "$lt_tmp_lt_search_path_spec" | awk '
-BEGIN {RS = " "; FS = "/|\n";} {
-  lt_foo = "";
-  lt_count = 0;
-  for (lt_i = NF; lt_i > 0; lt_i--) {
-    if ($lt_i != "" && $lt_i != ".") {
-      if ($lt_i == "..") {
-        lt_count++;
-      } else {
-        if (lt_count == 0) {
-          lt_foo = "/" $lt_i lt_foo;
-        } else {
-          lt_count--;
-        }
-      }
-    }
-  }
-  if (lt_foo != "") { lt_freq[[lt_foo]]++; }
-  if (lt_freq[[lt_foo]] == 1) { print lt_foo; }
-}'`
-  # AWK program above erroneously prepends '/' to C:/dos/paths
-  # for these hosts.
-  case $host_os in
-    mingw* | cegcc*) lt_search_path_spec=`$ECHO "$lt_search_path_spec" |\
-      $SED 's|/\([[A-Za-z]]:\)|\1|g'` ;;
-  esac
-  sys_lib_search_path_spec=`$ECHO "$lt_search_path_spec" | $lt_NL2SP`
-else
-  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
-fi])
-library_names_spec=
-libname_spec='lib$name'
-soname_spec=
-shrext_cmds=.so
-postinstall_cmds=
-postuninstall_cmds=
-finish_cmds=
-finish_eval=
-shlibpath_var=
-shlibpath_overrides_runpath=unknown
-version_type=none
-dynamic_linker="$host_os ld.so"
-sys_lib_dlsearch_path_spec="/lib /usr/lib"
-need_lib_prefix=unknown
-hardcode_into_libs=no
-
-# when you set need_version to no, make sure it does not cause -set_version
-# flags to be left without arguments
-need_version=unknown
-
-AC_ARG_VAR([LT_SYS_LIBRARY_PATH],
-[User-defined run-time library search path.])
-
-case $host_os in
-aix3*)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  library_names_spec='$libname$release$shared_ext$versuffix $libname.a'
-  shlibpath_var=LIBPATH
-
-  # AIX 3 has no versioning support, so we append a major version to the name.
-  soname_spec='$libname$release$shared_ext$major'
-  ;;
-
-aix[[4-9]]*)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  need_lib_prefix=no
-  need_version=no
-  hardcode_into_libs=yes
-  if test ia64 = "$host_cpu"; then
-    # AIX 5 supports IA64
-    library_names_spec='$libname$release$shared_ext$major $libname$release$shared_ext$versuffix $libname$shared_ext'
-    shlibpath_var=LD_LIBRARY_PATH
-  else
-    # With GCC up to 2.95.x, collect2 would create an import file
-    # for dependence libraries.  The import file would start with
-    # the line '#! .'.  This would cause the generated library to
-    # depend on '.', always an invalid library.  This was fixed in
-    # development snapshots of GCC prior to 3.0.
-    case $host_os in
-      aix4 | aix4.[[01]] | aix4.[[01]].*)
-      if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
-	   echo ' yes '
-	   echo '#endif'; } | $CC -E - | $GREP yes > /dev/null; then
-	:
-      else
-	can_build_shared=no
-      fi
-      ;;
-    esac
-    # Using Import Files as archive members, it is possible to support
-    # filename-based versioning of shared library archives on AIX. While
-    # this would work for both with and without runtime linking, it will
-    # prevent static linking of such archives. So we do filename-based
-    # shared library versioning with .so extension only, which is used
-    # when both runtime linking and shared linking is enabled.
-    # Unfortunately, runtime linking may impact performance, so we do
-    # not want this to be the default eventually. Also, we use the
-    # versioned .so libs for executables only if there is the -brtl
-    # linker flag in LDFLAGS as well, or --with-aix-soname=svr4 only.
-    # To allow for filename-based versioning support, we need to create
-    # libNAME.so.V as an archive file, containing:
-    # *) an Import File, referring to the versioned filename of the
-    #    archive as well as the shared archive member, telling the
-    #    bitwidth (32 or 64) of that shared object, and providing the
-    #    list of exported symbols of that shared object, eventually
-    #    decorated with the 'weak' keyword
-    # *) the shared object with the F_LOADONLY flag set, to really avoid
-    #    it being seen by the linker.
-    # At run time we better use the real file rather than another symlink,
-    # but for link time we create the symlink libNAME.so -> libNAME.so.V
-
-    case $with_aix_soname,$aix_use_runtimelinking in
-    # AIX (on Power*) has no versioning support, so currently we cannot hardcode correct
-    # soname into executable. Probably we can add versioning support to
-    # collect2, so additional links can be useful in future.
-    aix,yes) # traditional libtool
-      dynamic_linker='AIX unversionable lib.so'
-      # If using run time linking (on AIX 4.2 or later) use lib<name>.so
-      # instead of lib<name>.a to let people know that these are not
-      # typical AIX shared libraries.
-      library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
-      ;;
-    aix,no) # traditional AIX only
-      dynamic_linker='AIX lib.a[(]lib.so.V[)]'
-      # We preserve .a as extension for shared libraries through AIX4.2
-      # and later when we are not doing run time linking.
-      library_names_spec='$libname$release.a $libname.a'
-      soname_spec='$libname$release$shared_ext$major'
-      ;;
-    svr4,*) # full svr4 only
-      dynamic_linker="AIX lib.so.V[(]$shared_archive_member_spec.o[)]"
-      library_names_spec='$libname$release$shared_ext$major $libname$shared_ext'
-      # We do not specify a path in Import Files, so LIBPATH fires.
-      shlibpath_overrides_runpath=yes
-      ;;
-    *,yes) # both, prefer svr4
-      dynamic_linker="AIX lib.so.V[(]$shared_archive_member_spec.o[)], lib.a[(]lib.so.V[)]"
-      library_names_spec='$libname$release$shared_ext$major $libname$shared_ext'
-      # unpreferred sharedlib libNAME.a needs extra handling
-      postinstall_cmds='test -n "$linkname" || linkname="$realname"~func_stripname "" ".so" "$linkname"~$install_shared_prog "$dir/$func_stripname_result.$libext" "$destdir/$func_stripname_result.$libext"~test -z "$tstripme" || test -z "$striplib" || $striplib "$destdir/$func_stripname_result.$libext"'
-      postuninstall_cmds='for n in $library_names $old_library; do :; done~func_stripname "" ".so" "$n"~test "$func_stripname_result" = "$n" || func_append rmfiles " $odir/$func_stripname_result.$libext"'
-      # We do not specify a path in Import Files, so LIBPATH fires.
-      shlibpath_overrides_runpath=yes
-      ;;
-    *,no) # both, prefer aix
-      dynamic_linker="AIX lib.a[(]lib.so.V[)], lib.so.V[(]$shared_archive_member_spec.o[)]"
-      library_names_spec='$libname$release.a $libname.a'
-      soname_spec='$libname$release$shared_ext$major'
-      # unpreferred sharedlib libNAME.so.V and symlink libNAME.so need extra handling
-      postinstall_cmds='test -z "$dlname" || $install_shared_prog $dir/$dlname $destdir/$dlname~test -z "$tstripme" || test -z "$striplib" || $striplib $destdir/$dlname~test -n "$linkname" || linkname=$realname~func_stripname "" ".a" "$linkname"~(cd "$destdir" && $LN_S -f $dlname $func_stripname_result.so)'
-      postuninstall_cmds='test -z "$dlname" || func_append rmfiles " $odir/$dlname"~for n in $old_library $library_names; do :; done~func_stripname "" ".a" "$n"~func_append rmfiles " $odir/$func_stripname_result.so"'
-      ;;
-    esac
-    shlibpath_var=LIBPATH
-  fi
-  ;;
-
-amigaos*)
-  case $host_cpu in
-  powerpc)
-    # Since July 2007 AmigaOS4 officially supports .so libraries.
-    # When compiling the executable, add -use-dynld -Lsobjs: to the compileline.
-    library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
-    ;;
-  m68k)
-    library_names_spec='$libname.ixlibrary $libname.a'
-    # Create ${libname}_ixlibrary.a entries in /sys/libs.
-    finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
-    ;;
-  esac
-  ;;
-
-beos*)
-  library_names_spec='$libname$shared_ext'
-  dynamic_linker="$host_os ld.so"
-  shlibpath_var=LIBRARY_PATH
-  ;;
-
-bsdi[[45]]*)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  need_version=no
-  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
-  soname_spec='$libname$release$shared_ext$major'
-  finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
-  sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
-  # the default ld.so.conf also contains /usr/contrib/lib and
-  # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
-  # libtool to hard-code these into programs
-  ;;
-
-cygwin* | mingw* | pw32* | cegcc*)
-  version_type=windows
-  shrext_cmds=.dll
-  need_version=no
-  need_lib_prefix=no
-
-  case $GCC,$cc_basename in
-  yes,*)
-    # gcc
-    library_names_spec='$libname.dll.a'
-    # DLL is installed to $(libdir)/../bin by postinstall_cmds
-    postinstall_cmds='base_file=`basename \$file`~
-      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; echo \$dlname'\''`~
-      dldir=$destdir/`dirname \$dlpath`~
-      test -d \$dldir || mkdir -p \$dldir~
-      $install_prog $dir/$dlname \$dldir/$dlname~
-      chmod a+x \$dldir/$dlname~
-      if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then
-        eval '\''$striplib \$dldir/$dlname'\'' || exit \$?;
-      fi'
-    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
-      dlpath=$dir/\$dldll~
-       $RM \$dlpath'
-    shlibpath_overrides_runpath=yes
-
-    case $host_os in
-    cygwin*)
-      # Cygwin DLLs use 'cyg' prefix rather than 'lib'
-      soname_spec='`echo $libname | sed -e 's/^lib/cyg/'``echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext'
-m4_if([$1], [],[
-      sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"])
-      ;;
-    mingw* | cegcc*)
-      # MinGW DLLs use traditional 'lib' prefix
-      soname_spec='$libname`echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext'
-      ;;
-    pw32*)
-      # pw32 DLLs use 'pw' prefix rather than 'lib'
-      library_names_spec='`echo $libname | sed -e 's/^lib/pw/'``echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext'
-      ;;
-    esac
-    dynamic_linker='Win32 ld.exe'
-    ;;
-
-  *,cl* | *,icl*)
-    # Native MSVC or ICC
-    libname_spec='$name'
-    soname_spec='$libname`echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext'
-    library_names_spec='$libname.dll.lib'
-
-    case $build_os in
-    mingw*)
-      sys_lib_search_path_spec=
-      lt_save_ifs=$IFS
-      IFS=';'
-      for lt_path in $LIB
-      do
-        IFS=$lt_save_ifs
-        # Let DOS variable expansion print the short 8.3 style file name.
-        lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"`
-        sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path"
-      done
-      IFS=$lt_save_ifs
-      # Convert to MSYS style.
-      sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([[a-zA-Z]]\\):| /\\1|g' -e 's|^ ||'`
-      ;;
-    cygwin*)
-      # Convert to unix form, then to dos form, then back to unix form
-      # but this time dos style (no spaces!) so that the unix form looks
-      # like /cygdrive/c/PROGRA~1:/cygdr...
-      sys_lib_search_path_spec=`cygpath --path --unix "$LIB"`
-      sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null`
-      sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
-      ;;
-    *)
-      sys_lib_search_path_spec=$LIB
-      if $ECHO "$sys_lib_search_path_spec" | [$GREP ';[c-zC-Z]:/' >/dev/null]; then
-        # It is most probably a Windows format PATH.
-        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
-      else
-        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
-      fi
-      # FIXME: find the short name or the path components, as spaces are
-      # common. (e.g. "Program Files" -> "PROGRA~1")
-      ;;
-    esac
-
-    # DLL is installed to $(libdir)/../bin by postinstall_cmds
-    postinstall_cmds='base_file=`basename \$file`~
-      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; echo \$dlname'\''`~
-      dldir=$destdir/`dirname \$dlpath`~
-      test -d \$dldir || mkdir -p \$dldir~
-      $install_prog $dir/$dlname \$dldir/$dlname'
-    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
-      dlpath=$dir/\$dldll~
-       $RM \$dlpath'
-    shlibpath_overrides_runpath=yes
-    dynamic_linker='Win32 link.exe'
-    ;;
-
-  *)
-    # Assume MSVC and ICC wrapper
-    library_names_spec='$libname`echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext $libname.lib'
-    dynamic_linker='Win32 ld.exe'
-    ;;
-  esac
-  # FIXME: first we should search . and the directory the executable is in
-  shlibpath_var=PATH
-  ;;
-
-darwin* | rhapsody*)
-  dynamic_linker="$host_os dyld"
-  version_type=darwin
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='$libname$release$major$shared_ext $libname$shared_ext'
-  soname_spec='$libname$release$major$shared_ext'
-  shlibpath_overrides_runpath=yes
-  shlibpath_var=DYLD_LIBRARY_PATH
-  shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
-m4_if([$1], [],[
-  sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib"])
-  sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
-  ;;
-
-dgux*)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
-  soname_spec='$libname$release$shared_ext$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  ;;
-
-freebsd* | dragonfly*)
-  # DragonFly does not have aout.  When/if they implement a new
-  # versioning mechanism, adjust this.
-  if test -x /usr/bin/objformat; then
-    objformat=`/usr/bin/objformat`
-  else
-    case $host_os in
-    freebsd[[23]].*) objformat=aout ;;
-    *) objformat=elf ;;
-    esac
-  fi
-  version_type=freebsd-$objformat
-  case $version_type in
-    freebsd-elf*)
-      library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
-      soname_spec='$libname$release$shared_ext$major'
-      need_version=no
-      need_lib_prefix=no
-      ;;
-    freebsd-*)
-      library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix'
-      need_version=yes
-      ;;
-  esac
-  shlibpath_var=LD_LIBRARY_PATH
-  case $host_os in
-  freebsd2.*)
-    shlibpath_overrides_runpath=yes
-    ;;
-  freebsd3.[[01]]* | freebsdelf3.[[01]]*)
-    shlibpath_overrides_runpath=yes
-    hardcode_into_libs=yes
-    ;;
-  freebsd3.[[2-9]]* | freebsdelf3.[[2-9]]* | \
-  freebsd4.[[0-5]] | freebsdelf4.[[0-5]] | freebsd4.1.1 | freebsdelf4.1.1)
-    shlibpath_overrides_runpath=no
-    hardcode_into_libs=yes
-    ;;
-  *) # from 4.6 on, and DragonFly
-    shlibpath_overrides_runpath=yes
-    hardcode_into_libs=yes
-    ;;
-  esac
-  ;;
-
-haiku*)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  need_lib_prefix=no
-  need_version=no
-  dynamic_linker="$host_os runtime_loader"
-  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
-  soname_spec='$libname$release$shared_ext$major'
-  shlibpath_var=LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
-  hardcode_into_libs=yes
-  ;;
-
-hpux9* | hpux10* | hpux11*)
-  # Give a soname corresponding to the major version so that dld.sl refuses to
-  # link against other versions.
-  version_type=sunos
-  need_lib_prefix=no
-  need_version=no
-  case $host_cpu in
-  ia64*)
-    shrext_cmds='.so'
-    hardcode_into_libs=yes
-    dynamic_linker="$host_os dld.so"
-    shlibpath_var=LD_LIBRARY_PATH
-    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
-    library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
-    soname_spec='$libname$release$shared_ext$major'
-    if test 32 = "$HPUX_IA64_MODE"; then
-      sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
-      sys_lib_dlsearch_path_spec=/usr/lib/hpux32
-    else
-      sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
-      sys_lib_dlsearch_path_spec=/usr/lib/hpux64
-    fi
-    ;;
-  hppa*64*)
-    shrext_cmds='.sl'
-    hardcode_into_libs=yes
-    dynamic_linker="$host_os dld.sl"
-    shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
-    library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
-    soname_spec='$libname$release$shared_ext$major'
-    sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
-    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
-    ;;
-  *)
-    shrext_cmds='.sl'
-    dynamic_linker="$host_os dld.sl"
-    shlibpath_var=SHLIB_PATH
-    shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-    library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
-    soname_spec='$libname$release$shared_ext$major'
-    ;;
-  esac
-  # HP-UX runs *really* slowly unless shared libraries are mode 555, ...
-  postinstall_cmds='chmod 555 $lib'
-  # or fails outright, so override atomically:
-  install_override_mode=555
-  ;;
-
-interix[[3-9]]*)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
-  soname_spec='$libname$release$shared_ext$major'
-  dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  ;;
-
-irix5* | irix6* | nonstopux*)
-  case $host_os in
-    nonstopux*) version_type=nonstopux ;;
-    *)
-	if test yes = "$lt_cv_prog_gnu_ld"; then
-		version_type=linux # correct to gnu/linux during the next big refactor
-	else
-		version_type=irix
-	fi ;;
-  esac
-  need_lib_prefix=no
-  need_version=no
-  soname_spec='$libname$release$shared_ext$major'
-  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$release$shared_ext $libname$shared_ext'
-  case $host_os in
-  irix5* | nonstopux*)
-    libsuff= shlibsuff=
-    ;;
-  *)
-    case $LD in # libtool.m4 will add one of these switches to LD
-    *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ")
-      libsuff= shlibsuff= libmagic=32-bit;;
-    *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ")
-      libsuff=32 shlibsuff=N32 libmagic=N32;;
-    *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ")
-      libsuff=64 shlibsuff=64 libmagic=64-bit;;
-    *) libsuff= shlibsuff= libmagic=never-match;;
-    esac
-    ;;
-  esac
-  shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
-  shlibpath_overrides_runpath=no
-  sys_lib_search_path_spec="/usr/lib$libsuff /lib$libsuff /usr/local/lib$libsuff"
-  sys_lib_dlsearch_path_spec="/usr/lib$libsuff /lib$libsuff"
-  hardcode_into_libs=yes
-  ;;
-
-# No shared lib support for Linux oldld, aout, or coff.
-linux*oldld* | linux*aout* | linux*coff*)
-  dynamic_linker=no
-  ;;
-
-linux*android*)
-  version_type=none # Android doesn't support versioned libraries.
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='$libname$release$shared_ext'
-  soname_spec='$libname$release$shared_ext'
-  finish_cmds=
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-
-  # This implies no fast_install, which is unacceptable.
-  # Some rework will be needed to allow for fast_install
-  # before this can be enabled.
-  hardcode_into_libs=yes
-
-  dynamic_linker='Android linker'
-  # Don't embed -rpath directories since the linker doesn't support them.
-  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-  ;;
-
-# This must be glibc/ELF.
-linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
-  soname_spec='$libname$release$shared_ext$major'
-  finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-
-  # Some binutils ld are patched to set DT_RUNPATH
-  AC_CACHE_VAL([lt_cv_shlibpath_overrides_runpath],
-    [lt_cv_shlibpath_overrides_runpath=no
-    save_LDFLAGS=$LDFLAGS
-    save_libdir=$libdir
-    eval "libdir=/foo; wl=\"$_LT_TAGVAR(lt_prog_compiler_wl, $1)\"; \
-	 LDFLAGS=\"\$LDFLAGS $_LT_TAGVAR(hardcode_libdir_flag_spec, $1)\""
-    AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])],
-      [AS_IF([ ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null],
-	 [lt_cv_shlibpath_overrides_runpath=yes])])
-    LDFLAGS=$save_LDFLAGS
-    libdir=$save_libdir
-    ])
-  shlibpath_overrides_runpath=$lt_cv_shlibpath_overrides_runpath
-
-  # This implies no fast_install, which is unacceptable.
-  # Some rework will be needed to allow for fast_install
-  # before this can be enabled.
-  hardcode_into_libs=yes
-
-  # Ideally, we could use ldconfig to report *all* directores which are
-  # searched for libraries, however this is still not possible.  Aside from not
-  # being certain /sbin/ldconfig is available, command
-  # 'ldconfig -N -X -v | grep ^/' on 64bit Fedora does not report /usr/lib64,
-  # even though it is searched at run-time.  Try to do the best guess by
-  # appending ld.so.conf contents (and includes) to the search path.
-  if test -f /etc/ld.so.conf; then
-    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[	 ]*hwcap[	 ]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '`
-    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
-  fi
-
-  # We used to test for /lib/ld.so.1 and disable shared libraries on
-  # powerpc, because MkLinux only supported shared libraries with the
-  # GNU dynamic linker.  Since this was broken with cross compilers,
-  # most powerpc-linux boxes support dynamic linking these days and
-  # people can always --disable-shared, the test was removed, and we
-  # assume the GNU/Linux dynamic linker is in use.
-  dynamic_linker='GNU/Linux ld.so'
-  ;;
-
-netbsd*)
-  version_type=sunos
-  need_lib_prefix=no
-  need_version=no
-  if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
-    library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix'
-    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-    dynamic_linker='NetBSD (a.out) ld.so'
-  else
-    library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
-    soname_spec='$libname$release$shared_ext$major'
-    dynamic_linker='NetBSD ld.elf_so'
-  fi
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  hardcode_into_libs=yes
-  ;;
-
-newsos6)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  ;;
-
-*nto* | *qnx*)
-  version_type=qnx
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
-  soname_spec='$libname$release$shared_ext$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  dynamic_linker='ldqnx.so'
-  ;;
-
-openbsd* | bitrig*)
-  version_type=sunos
-  sys_lib_dlsearch_path_spec=/usr/lib
-  need_lib_prefix=no
-  if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then
-    need_version=no
-  else
-    need_version=yes
-  fi
-  library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix'
-  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  ;;
-
-os2*)
-  libname_spec='$name'
-  version_type=windows
-  shrext_cmds=.dll
-  need_version=no
-  need_lib_prefix=no
-  # OS/2 can only load a DLL with a base name of 8 characters or less.
-  soname_spec='`test -n "$os2dllname" && libname="$os2dllname";
-    v=$($ECHO $release$versuffix | tr -d .-);
-    n=$($ECHO $libname | cut -b -$((8 - ${#v})) | tr . _);
-    $ECHO $n$v`$shared_ext'
-  library_names_spec='${libname}_dll.$libext'
-  dynamic_linker='OS/2 ld.exe'
-  shlibpath_var=BEGINLIBPATH
-  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
-  sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
-  postinstall_cmds='base_file=`basename \$file`~
-    dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; $ECHO \$dlname'\''`~
-    dldir=$destdir/`dirname \$dlpath`~
-    test -d \$dldir || mkdir -p \$dldir~
-    $install_prog $dir/$dlname \$dldir/$dlname~
-    chmod a+x \$dldir/$dlname~
-    if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then
-      eval '\''$striplib \$dldir/$dlname'\'' || exit \$?;
-    fi'
-  postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; $ECHO \$dlname'\''`~
-    dlpath=$dir/\$dldll~
-    $RM \$dlpath'
-  ;;
-
-osf3* | osf4* | osf5*)
-  version_type=osf
-  need_lib_prefix=no
-  need_version=no
-  soname_spec='$libname$release$shared_ext$major'
-  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
-  shlibpath_var=LD_LIBRARY_PATH
-  sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
-  sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
-  ;;
-
-rdos*)
-  dynamic_linker=no
-  ;;
-
-solaris*)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
-  soname_spec='$libname$release$shared_ext$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  hardcode_into_libs=yes
-  # ldd complains unless libraries are executable
-  postinstall_cmds='chmod +x $lib'
-  ;;
-
-sunos4*)
-  version_type=sunos
-  library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix'
-  finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  if test yes = "$with_gnu_ld"; then
-    need_lib_prefix=no
-  fi
-  need_version=yes
-  ;;
-
-sysv4 | sysv4.3*)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
-  soname_spec='$libname$release$shared_ext$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  case $host_vendor in
-    sni)
-      shlibpath_overrides_runpath=no
-      need_lib_prefix=no
-      runpath_var=LD_RUN_PATH
-      ;;
-    siemens)
-      need_lib_prefix=no
-      ;;
-    motorola)
-      need_lib_prefix=no
-      need_version=no
-      shlibpath_overrides_runpath=no
-      sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
-      ;;
-  esac
-  ;;
-
-sysv4*MP*)
-  if test -d /usr/nec; then
-    version_type=linux # correct to gnu/linux during the next big refactor
-    library_names_spec='$libname$shared_ext.$versuffix $libname$shared_ext.$major $libname$shared_ext'
-    soname_spec='$libname$shared_ext.$major'
-    shlibpath_var=LD_LIBRARY_PATH
-  fi
-  ;;
-
-sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
-  version_type=sco
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext $libname$shared_ext'
-  soname_spec='$libname$release$shared_ext$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  hardcode_into_libs=yes
-  if test yes = "$with_gnu_ld"; then
-    sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
-  else
-    sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
-    case $host_os in
-      sco3.2v5*)
-        sys_lib_search_path_spec="$sys_lib_search_path_spec /lib"
-	;;
-    esac
-  fi
-  sys_lib_dlsearch_path_spec='/usr/lib'
-  ;;
-
-tpf*)
-  # TPF is a cross-target only.  Preferred cross-host = GNU/Linux.
-  version_type=linux # correct to gnu/linux during the next big refactor
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  ;;
-
-uts4*)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
-  soname_spec='$libname$release$shared_ext$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  ;;
-
-*)
-  dynamic_linker=no
-  ;;
-esac
-AC_MSG_RESULT([$dynamic_linker])
-test no = "$dynamic_linker" && can_build_shared=no
-
-variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
-if test yes = "$GCC"; then
-  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
-fi
-
-if test set = "${lt_cv_sys_lib_search_path_spec+set}"; then
-  sys_lib_search_path_spec=$lt_cv_sys_lib_search_path_spec
-fi
-
-if test set = "${lt_cv_sys_lib_dlsearch_path_spec+set}"; then
-  sys_lib_dlsearch_path_spec=$lt_cv_sys_lib_dlsearch_path_spec
-fi
-
-# remember unaugmented sys_lib_dlsearch_path content for libtool script decls...
-configure_time_dlsearch_path=$sys_lib_dlsearch_path_spec
-
-# ... but it needs LT_SYS_LIBRARY_PATH munging for other configure-time code
-func_munge_path_list sys_lib_dlsearch_path_spec "$LT_SYS_LIBRARY_PATH"
-
-# to be used as default LT_SYS_LIBRARY_PATH value in generated libtool
-configure_time_lt_sys_library_path=$LT_SYS_LIBRARY_PATH
-
-_LT_DECL([], [variables_saved_for_relink], [1],
-    [Variables whose values should be saved in libtool wrapper scripts and
-    restored at link time])
-_LT_DECL([], [need_lib_prefix], [0],
-    [Do we need the "lib" prefix for modules?])
-_LT_DECL([], [need_version], [0], [Do we need a version for libraries?])
-_LT_DECL([], [version_type], [0], [Library versioning type])
-_LT_DECL([], [runpath_var], [0],  [Shared library runtime path variable])
-_LT_DECL([], [shlibpath_var], [0],[Shared library path variable])
-_LT_DECL([], [shlibpath_overrides_runpath], [0],
-    [Is shlibpath searched before the hard-coded library search path?])
-_LT_DECL([], [libname_spec], [1], [Format of library name prefix])
-_LT_DECL([], [library_names_spec], [1],
-    [[List of archive names.  First name is the real one, the rest are links.
-    The last name is the one that the linker finds with -lNAME]])
-_LT_DECL([], [soname_spec], [1],
-    [[The coded name of the library, if different from the real name]])
-_LT_DECL([], [install_override_mode], [1],
-    [Permission mode override for installation of shared libraries])
-_LT_DECL([], [postinstall_cmds], [2],
-    [Command to use after installation of a shared archive])
-_LT_DECL([], [postuninstall_cmds], [2],
-    [Command to use after uninstallation of a shared archive])
-_LT_DECL([], [finish_cmds], [2],
-    [Commands used to finish a libtool library installation in a directory])
-_LT_DECL([], [finish_eval], [1],
-    [[As "finish_cmds", except a single script fragment to be evaled but
-    not shown]])
-_LT_DECL([], [hardcode_into_libs], [0],
-    [Whether we should hardcode library paths into libraries])
-_LT_DECL([], [sys_lib_search_path_spec], [2],
-    [Compile-time system search path for libraries])
-_LT_DECL([sys_lib_dlsearch_path_spec], [configure_time_dlsearch_path], [2],
-    [Detected run-time system search path for libraries])
-_LT_DECL([], [configure_time_lt_sys_library_path], [2],
-    [Explicit LT_SYS_LIBRARY_PATH set during ./configure time])
-])# _LT_SYS_DYNAMIC_LINKER
-
-
-# _LT_PATH_TOOL_PREFIX(TOOL)
-# --------------------------
-# find a file program that can recognize shared library
-AC_DEFUN([_LT_PATH_TOOL_PREFIX],
-[m4_require([_LT_DECL_EGREP])dnl
-AC_MSG_CHECKING([for $1])
-AC_CACHE_VAL(lt_cv_path_MAGIC_CMD,
-[case $MAGIC_CMD in
-[[\\/*] |  ?:[\\/]*])
-  lt_cv_path_MAGIC_CMD=$MAGIC_CMD # Let the user override the test with a path.
-  ;;
-*)
-  lt_save_MAGIC_CMD=$MAGIC_CMD
-  lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR
-dnl $ac_dummy forces splitting on constant user-supplied paths.
-dnl POSIX.2 word splitting is done only on the output of word expansions,
-dnl not every word.  This closes a longstanding sh security hole.
-  ac_dummy="m4_if([$2], , $PATH, [$2])"
-  for ac_dir in $ac_dummy; do
-    IFS=$lt_save_ifs
-    test -z "$ac_dir" && ac_dir=.
-    if test -f "$ac_dir/$1"; then
-      lt_cv_path_MAGIC_CMD=$ac_dir/"$1"
-      if test -n "$file_magic_test_file"; then
-	case $deplibs_check_method in
-	"file_magic "*)
-	  file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"`
-	  MAGIC_CMD=$lt_cv_path_MAGIC_CMD
-	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
-	    $EGREP "$file_magic_regex" > /dev/null; then
-	    :
-	  else
-	    cat <<_LT_EOF 1>&2
-
-*** Warning: the command libtool uses to detect shared libraries,
-*** $file_magic_cmd, produces output that libtool cannot recognize.
-*** The result is that libtool may fail to recognize shared libraries
-*** as such.  This will affect the creation of libtool libraries that
-*** depend on shared libraries, but programs linked with such libtool
-*** libraries will work regardless of this problem.  Nevertheless, you
-*** may want to report the problem to your system manager and/or to
-*** bug-libtool@gnu.org
-
-_LT_EOF
-	  fi ;;
-	esac
-      fi
-      break
-    fi
-  done
-  IFS=$lt_save_ifs
-  MAGIC_CMD=$lt_save_MAGIC_CMD
-  ;;
-esac])
-MAGIC_CMD=$lt_cv_path_MAGIC_CMD
-if test -n "$MAGIC_CMD"; then
-  AC_MSG_RESULT($MAGIC_CMD)
-else
-  AC_MSG_RESULT(no)
-fi
-_LT_DECL([], [MAGIC_CMD], [0],
-	 [Used to examine libraries when file_magic_cmd begins with "file"])dnl
-])# _LT_PATH_TOOL_PREFIX
-
-# Old name:
-AU_ALIAS([AC_PATH_TOOL_PREFIX], [_LT_PATH_TOOL_PREFIX])
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AC_PATH_TOOL_PREFIX], [])
-
-
-# _LT_PATH_MAGIC
-# --------------
-# find a file program that can recognize a shared library
-m4_defun([_LT_PATH_MAGIC],
-[_LT_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin$PATH_SEPARATOR$PATH)
-if test -z "$lt_cv_path_MAGIC_CMD"; then
-  if test -n "$ac_tool_prefix"; then
-    _LT_PATH_TOOL_PREFIX(file, /usr/bin$PATH_SEPARATOR$PATH)
-  else
-    MAGIC_CMD=:
-  fi
-fi
-])# _LT_PATH_MAGIC
-
-
-# LT_PATH_LD
-# ----------
-# find the pathname to the GNU or non-GNU linker
-AC_DEFUN([LT_PATH_LD],
-[AC_REQUIRE([AC_PROG_CC])dnl
-AC_REQUIRE([AC_CANONICAL_HOST])dnl
-AC_REQUIRE([AC_CANONICAL_BUILD])dnl
-m4_require([_LT_DECL_SED])dnl
-m4_require([_LT_DECL_EGREP])dnl
-m4_require([_LT_PROG_ECHO_BACKSLASH])dnl
-
-AC_ARG_WITH([gnu-ld],
-    [AS_HELP_STRING([--with-gnu-ld],
-	[assume the C compiler uses GNU ld @<:@default=no@:>@])],
-    [test no = "$withval" || with_gnu_ld=yes],
-    [with_gnu_ld=no])dnl
-
-ac_prog=ld
-if test yes = "$GCC"; then
-  # Check if gcc -print-prog-name=ld gives a path.
-  AC_MSG_CHECKING([for ld used by $CC])
-  case $host in
-  *-*-mingw*)
-    # gcc leaves a trailing carriage return, which upsets mingw
-    ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
-  *)
-    ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
-  esac
-  case $ac_prog in
-    # Accept absolute paths.
-    [[\\/]]* | ?:[[\\/]]*)
-      re_direlt='/[[^/]][[^/]]*/\.\./'
-      # Canonicalize the pathname of ld
-      ac_prog=`$ECHO "$ac_prog"| $SED 's%\\\\%/%g'`
-      while $ECHO "$ac_prog" | $GREP "$re_direlt" > /dev/null 2>&1; do
-	ac_prog=`$ECHO $ac_prog| $SED "s%$re_direlt%/%"`
-      done
-      test -z "$LD" && LD=$ac_prog
-      ;;
-  "")
-    # If it fails, then pretend we aren't using GCC.
-    ac_prog=ld
-    ;;
-  *)
-    # If it is relative, then search for the first ld in PATH.
-    with_gnu_ld=unknown
-    ;;
-  esac
-elif test yes = "$with_gnu_ld"; then
-  AC_MSG_CHECKING([for GNU ld])
-else
-  AC_MSG_CHECKING([for non-GNU ld])
-fi
-AC_CACHE_VAL(lt_cv_path_LD,
-[if test -z "$LD"; then
-  lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR
-  for ac_dir in $PATH; do
-    IFS=$lt_save_ifs
-    test -z "$ac_dir" && ac_dir=.
-    if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
-      lt_cv_path_LD=$ac_dir/$ac_prog
-      # Check to see if the program is GNU ld.  I'd rather use --version,
-      # but apparently some variants of GNU ld only accept -v.
-      # Break only if it was the GNU/non-GNU ld that we prefer.
-      case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
-      *GNU* | *'with BFD'*)
-	test no != "$with_gnu_ld" && break
-	;;
-      *)
-	test yes != "$with_gnu_ld" && break
-	;;
-      esac
-    fi
-  done
-  IFS=$lt_save_ifs
-else
-  lt_cv_path_LD=$LD # Let the user override the test with a path.
-fi])
-LD=$lt_cv_path_LD
-if test -n "$LD"; then
-  AC_MSG_RESULT($LD)
-else
-  AC_MSG_RESULT(no)
-fi
-test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH])
-_LT_PATH_LD_GNU
-AC_SUBST([LD])
-
-_LT_TAGDECL([], [LD], [1], [The linker used to build libraries])
-])# LT_PATH_LD
-
-# Old names:
-AU_ALIAS([AM_PROG_LD], [LT_PATH_LD])
-AU_ALIAS([AC_PROG_LD], [LT_PATH_LD])
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AM_PROG_LD], [])
-dnl AC_DEFUN([AC_PROG_LD], [])
-
-
-# _LT_PATH_LD_GNU
-#- --------------
-m4_defun([_LT_PATH_LD_GNU],
-[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], lt_cv_prog_gnu_ld,
-[# I'd rather use --version here, but apparently some GNU lds only accept -v.
-case `$LD -v 2>&1 </dev/null` in
-*GNU* | *'with BFD'*)
-  lt_cv_prog_gnu_ld=yes
-  ;;
-*)
-  lt_cv_prog_gnu_ld=no
-  ;;
-esac])
-with_gnu_ld=$lt_cv_prog_gnu_ld
-])# _LT_PATH_LD_GNU
-
-
-# _LT_CMD_RELOAD
-# --------------
-# find reload flag for linker
-#   -- PORTME Some linkers may need a different reload flag.
-m4_defun([_LT_CMD_RELOAD],
-[AC_CACHE_CHECK([for $LD option to reload object files],
-  lt_cv_ld_reload_flag,
-  [lt_cv_ld_reload_flag='-r'])
-reload_flag=$lt_cv_ld_reload_flag
-case $reload_flag in
-"" | " "*) ;;
-*) reload_flag=" $reload_flag" ;;
-esac
-reload_cmds='$LD$reload_flag -o $output$reload_objs'
-case $host_os in
-  cygwin* | mingw* | pw32* | cegcc*)
-    if test yes != "$GCC"; then
-      reload_cmds=false
-    fi
-    ;;
-  darwin*)
-    if test yes = "$GCC"; then
-      reload_cmds='$LTCC $LTCFLAGS -nostdlib $wl-r -o $output$reload_objs'
-    else
-      reload_cmds='$LD$reload_flag -o $output$reload_objs'
-    fi
-    ;;
-esac
-_LT_TAGDECL([], [reload_flag], [1], [How to create reloadable object files])dnl
-_LT_TAGDECL([], [reload_cmds], [2])dnl
-])# _LT_CMD_RELOAD
-
-
-# _LT_PATH_DD
-# -----------
-# find a working dd
-m4_defun([_LT_PATH_DD],
-[AC_CACHE_CHECK([for a working dd], [ac_cv_path_lt_DD],
-[printf 0123456789abcdef0123456789abcdef >conftest.i
-cat conftest.i conftest.i >conftest2.i
-: ${lt_DD:=$DD}
-AC_PATH_PROGS_FEATURE_CHECK([lt_DD], [dd],
-[if "$ac_path_lt_DD" bs=32 count=1 <conftest2.i >conftest.out 2>/dev/null; then
-  cmp -s conftest.i conftest.out \
-  && ac_cv_path_lt_DD="$ac_path_lt_DD" ac_path_lt_DD_found=:
-fi])
-rm -f conftest.i conftest2.i conftest.out])
-])# _LT_PATH_DD
-
-
-# _LT_CMD_TRUNCATE
-# ----------------
-# find command to truncate a binary pipe
-m4_defun([_LT_CMD_TRUNCATE],
-[m4_require([_LT_PATH_DD])
-AC_CACHE_CHECK([how to truncate binary pipes], [lt_cv_truncate_bin],
-[printf 0123456789abcdef0123456789abcdef >conftest.i
-cat conftest.i conftest.i >conftest2.i
-lt_cv_truncate_bin=
-if "$ac_cv_path_lt_DD" bs=32 count=1 <conftest2.i >conftest.out 2>/dev/null; then
-  cmp -s conftest.i conftest.out \
-  && lt_cv_truncate_bin="$ac_cv_path_lt_DD bs=4096 count=1"
-fi
-rm -f conftest.i conftest2.i conftest.out
-test -z "$lt_cv_truncate_bin" && lt_cv_truncate_bin="$SED -e 4q"])
-_LT_DECL([lt_truncate_bin], [lt_cv_truncate_bin], [1],
-  [Command to truncate a binary pipe])
-])# _LT_CMD_TRUNCATE
-
-
-# _LT_CHECK_MAGIC_METHOD
-# ----------------------
-# how to check for library dependencies
-#  -- PORTME fill in with the dynamic library characteristics
-m4_defun([_LT_CHECK_MAGIC_METHOD],
-[m4_require([_LT_DECL_EGREP])
-m4_require([_LT_DECL_OBJDUMP])
-AC_CACHE_CHECK([how to recognize dependent libraries],
-lt_cv_deplibs_check_method,
-[lt_cv_file_magic_cmd='$MAGIC_CMD'
-lt_cv_file_magic_test_file=
-lt_cv_deplibs_check_method='unknown'
-# Need to set the preceding variable on all platforms that support
-# interlibrary dependencies.
-# 'none' -- dependencies not supported.
-# 'unknown' -- same as none, but documents that we really don't know.
-# 'pass_all' -- all dependencies passed with no checks.
-# 'test_compile' -- check by making test program.
-# 'file_magic [[regex]]' -- check by looking for files in library path
-# that responds to the $file_magic_cmd with a given extended regex.
-# If you have 'file' or equivalent on your system and you're not sure
-# whether 'pass_all' will *always* work, you probably want this one.
-
-case $host_os in
-aix[[4-9]]*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-beos*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-bsdi[[45]]*)
-  lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib)'
-  lt_cv_file_magic_cmd='/usr/bin/file -L'
-  lt_cv_file_magic_test_file=/shlib/libc.so
-  ;;
-
-cygwin*)
-  # func_win32_libid is a shell function defined in ltmain.sh
-  lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
-  lt_cv_file_magic_cmd='func_win32_libid'
-  ;;
-
-mingw* | pw32*)
-  # Base MSYS/MinGW do not provide the 'file' command needed by
-  # func_win32_libid shell function, so use a weaker test based on 'objdump',
-  # unless we find 'file', for example because we are cross-compiling.
-  if ( file / ) >/dev/null 2>&1; then
-    lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
-    lt_cv_file_magic_cmd='func_win32_libid'
-  else
-    # Keep this pattern in sync with the one in func_win32_libid.
-    lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)'
-    lt_cv_file_magic_cmd='$OBJDUMP -f'
-  fi
-  ;;
-
-cegcc*)
-  # use the weaker test based on 'objdump'. See mingw*.
-  lt_cv_deplibs_check_method='file_magic file format pe-arm-.*little(.*architecture: arm)?'
-  lt_cv_file_magic_cmd='$OBJDUMP -f'
-  ;;
-
-darwin* | rhapsody*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-freebsd* | dragonfly*)
-  if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
-    case $host_cpu in
-    i*86 )
-      # Not sure whether the presence of OpenBSD here was a mistake.
-      # Let's accept both of them until this is cleared up.
-      lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[[3-9]]86 (compact )?demand paged shared library'
-      lt_cv_file_magic_cmd=/usr/bin/file
-      lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
-      ;;
-    esac
-  else
-    lt_cv_deplibs_check_method=pass_all
-  fi
-  ;;
-
-haiku*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-hpux10.20* | hpux11*)
-  lt_cv_file_magic_cmd=/usr/bin/file
-  case $host_cpu in
-  ia64*)
-    lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|ELF-[[0-9]][[0-9]]) shared object file - IA64'
-    lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
-    ;;
-  hppa*64*)
-    [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF[ -][0-9][0-9])(-bit)?( [LM]SB)? shared object( file)?[, -]* PA-RISC [0-9]\.[0-9]']
-    lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl
-    ;;
-  *)
-    lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|PA-RISC[[0-9]]\.[[0-9]]) shared library'
-    lt_cv_file_magic_test_file=/usr/lib/libc.sl
-    ;;
-  esac
-  ;;
-
-interix[[3-9]]*)
-  # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here
-  lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|\.a)$'
-  ;;
-
-irix5* | irix6* | nonstopux*)
-  case $LD in
-  *-32|*"-32 ") libmagic=32-bit;;
-  *-n32|*"-n32 ") libmagic=N32;;
-  *-64|*"-64 ") libmagic=64-bit;;
-  *) libmagic=never-match;;
-  esac
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-# This must be glibc/ELF.
-linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-netbsd*)
-  if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
-    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
-  else
-    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|_pic\.a)$'
-  fi
-  ;;
-
-newos6*)
-  lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (executable|dynamic lib)'
-  lt_cv_file_magic_cmd=/usr/bin/file
-  lt_cv_file_magic_test_file=/usr/lib/libnls.so
-  ;;
-
-*nto* | *qnx*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-openbsd* | bitrig*)
-  if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then
-    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|\.so|_pic\.a)$'
-  else
-    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
-  fi
-  ;;
-
-osf3* | osf4* | osf5*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-rdos*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-solaris*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-sysv4 | sysv4.3*)
-  case $host_vendor in
-  motorola)
-    lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib) M[[0-9]][[0-9]]* Version [[0-9]]'
-    lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*`
-    ;;
-  ncr)
-    lt_cv_deplibs_check_method=pass_all
-    ;;
-  sequent)
-    lt_cv_file_magic_cmd='/bin/file'
-    lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB (shared object|dynamic lib )'
-    ;;
-  sni)
-    lt_cv_file_magic_cmd='/bin/file'
-    lt_cv_deplibs_check_method="file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB dynamic lib"
-    lt_cv_file_magic_test_file=/lib/libc.so
-    ;;
-  siemens)
-    lt_cv_deplibs_check_method=pass_all
-    ;;
-  pc)
-    lt_cv_deplibs_check_method=pass_all
-    ;;
-  esac
-  ;;
-
-tpf*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-os2*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-esac
-])
-
-file_magic_glob=
-want_nocaseglob=no
-if test "$build" = "$host"; then
-  case $host_os in
-  mingw* | pw32*)
-    if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then
-      want_nocaseglob=yes
-    else
-      file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[[\1]]\/[[\1]]\/g;/g"`
-    fi
-    ;;
-  esac
-fi
-
-file_magic_cmd=$lt_cv_file_magic_cmd
-deplibs_check_method=$lt_cv_deplibs_check_method
-test -z "$deplibs_check_method" && deplibs_check_method=unknown
-
-_LT_DECL([], [deplibs_check_method], [1],
-    [Method to check whether dependent libraries are shared objects])
-_LT_DECL([], [file_magic_cmd], [1],
-    [Command to use when deplibs_check_method = "file_magic"])
-_LT_DECL([], [file_magic_glob], [1],
-    [How to find potential files when deplibs_check_method = "file_magic"])
-_LT_DECL([], [want_nocaseglob], [1],
-    [Find potential files using nocaseglob when deplibs_check_method = "file_magic"])
-])# _LT_CHECK_MAGIC_METHOD
-
-
-# LT_PATH_NM
-# ----------
-# find the pathname to a BSD- or MS-compatible name lister
-AC_DEFUN([LT_PATH_NM],
-[AC_REQUIRE([AC_PROG_CC])dnl
-AC_CACHE_CHECK([for BSD- or MS-compatible name lister (nm)], lt_cv_path_NM,
-[if test -n "$NM"; then
-  # Let the user override the test.
-  lt_cv_path_NM=$NM
-else
-  lt_nm_to_check=${ac_tool_prefix}nm
-  if test -n "$ac_tool_prefix" && test "$build" = "$host"; then
-    lt_nm_to_check="$lt_nm_to_check nm"
-  fi
-  for lt_tmp_nm in $lt_nm_to_check; do
-    lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR
-    for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do
-      IFS=$lt_save_ifs
-      test -z "$ac_dir" && ac_dir=.
-      tmp_nm=$ac_dir/$lt_tmp_nm
-      if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext"; then
-	# Check to see if the nm accepts a BSD-compat flag.
-	# Adding the 'sed 1q' prevents false positives on HP-UX, which says:
-	#   nm: unknown option "B" ignored
-	# Tru64's nm complains that /dev/null is an invalid object file
-	# MSYS converts /dev/null to NUL, MinGW nm treats NUL as empty
-	case $build_os in
-	mingw*) lt_bad_file=conftest.nm/nofile ;;
-	*) lt_bad_file=/dev/null ;;
-	esac
-	case `"$tmp_nm" -B $lt_bad_file 2>&1 | sed '1q'` in
-	*$lt_bad_file* | *'Invalid file or object type'*)
-	  lt_cv_path_NM="$tmp_nm -B"
-	  break 2
-	  ;;
-	*)
-	  case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in
-	  */dev/null*)
-	    lt_cv_path_NM="$tmp_nm -p"
-	    break 2
-	    ;;
-	  *)
-	    lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
-	    continue # so that we can try to find one that supports BSD flags
-	    ;;
-	  esac
-	  ;;
-	esac
-      fi
-    done
-    IFS=$lt_save_ifs
-  done
-  : ${lt_cv_path_NM=no}
-fi])
-if test no != "$lt_cv_path_NM"; then
-  NM=$lt_cv_path_NM
-else
-  # Didn't find any BSD compatible name lister, look for dumpbin.
-  if test -n "$DUMPBIN"; then :
-    # Let the user override the test.
-  else
-    AC_CHECK_TOOLS(DUMPBIN, [dumpbin "link -dump"], :)
-    case `$DUMPBIN -symbols -headers /dev/null 2>&1 | sed '1q'` in
-    *COFF*)
-      DUMPBIN="$DUMPBIN -symbols -headers"
-      ;;
-    *)
-      DUMPBIN=:
-      ;;
-    esac
-  fi
-  AC_SUBST([DUMPBIN])
-  if test : != "$DUMPBIN"; then
-    NM=$DUMPBIN
-  fi
-fi
-test -z "$NM" && NM=nm
-AC_SUBST([NM])
-_LT_DECL([], [NM], [1], [A BSD- or MS-compatible name lister])dnl
-
-AC_CACHE_CHECK([the name lister ($NM) interface], [lt_cv_nm_interface],
-  [lt_cv_nm_interface="BSD nm"
-  echo "int some_variable = 0;" > conftest.$ac_ext
-  (eval echo "\"\$as_me:$LINENO: $ac_compile\"" >&AS_MESSAGE_LOG_FD)
-  (eval "$ac_compile" 2>conftest.err)
-  cat conftest.err >&AS_MESSAGE_LOG_FD
-  (eval echo "\"\$as_me:$LINENO: $NM \\\"conftest.$ac_objext\\\"\"" >&AS_MESSAGE_LOG_FD)
-  (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
-  cat conftest.err >&AS_MESSAGE_LOG_FD
-  (eval echo "\"\$as_me:$LINENO: output\"" >&AS_MESSAGE_LOG_FD)
-  cat conftest.out >&AS_MESSAGE_LOG_FD
-  if $GREP 'External.*some_variable' conftest.out > /dev/null; then
-    lt_cv_nm_interface="MS dumpbin"
-  fi
-  rm -f conftest*])
-])# LT_PATH_NM
-
-# Old names:
-AU_ALIAS([AM_PROG_NM], [LT_PATH_NM])
-AU_ALIAS([AC_PROG_NM], [LT_PATH_NM])
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AM_PROG_NM], [])
-dnl AC_DEFUN([AC_PROG_NM], [])
-
-# _LT_CHECK_SHAREDLIB_FROM_LINKLIB
-# --------------------------------
-# how to determine the name of the shared library
-# associated with a specific link library.
-#  -- PORTME fill in with the dynamic library characteristics
-m4_defun([_LT_CHECK_SHAREDLIB_FROM_LINKLIB],
-[m4_require([_LT_DECL_EGREP])
-m4_require([_LT_DECL_OBJDUMP])
-m4_require([_LT_DECL_DLLTOOL])
-AC_CACHE_CHECK([how to associate runtime and link libraries],
-lt_cv_sharedlib_from_linklib_cmd,
-[lt_cv_sharedlib_from_linklib_cmd='unknown'
-
-case $host_os in
-cygwin* | mingw* | pw32* | cegcc*)
-  # two different shell functions defined in ltmain.sh;
-  # decide which one to use based on capabilities of $DLLTOOL
-  case `$DLLTOOL --help 2>&1` in
-  *--identify-strict*)
-    lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib
-    ;;
-  *)
-    lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback
-    ;;
-  esac
-  ;;
-*)
-  # fallback: assume linklib IS sharedlib
-  lt_cv_sharedlib_from_linklib_cmd=$ECHO
-  ;;
-esac
-])
-sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd
-test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO
-
-_LT_DECL([], [sharedlib_from_linklib_cmd], [1],
-    [Command to associate shared and link libraries])
-])# _LT_CHECK_SHAREDLIB_FROM_LINKLIB
-
-
-# _LT_PATH_MANIFEST_TOOL
-# ----------------------
-# locate the manifest tool
-m4_defun([_LT_PATH_MANIFEST_TOOL],
-[AC_CHECK_TOOL(MANIFEST_TOOL, mt, :)
-test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt
-AC_CACHE_CHECK([if $MANIFEST_TOOL is a manifest tool], [lt_cv_path_mainfest_tool],
-  [lt_cv_path_mainfest_tool=no
-  echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&AS_MESSAGE_LOG_FD
-  $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out
-  cat conftest.err >&AS_MESSAGE_LOG_FD
-  if $GREP 'Manifest Tool' conftest.out > /dev/null; then
-    lt_cv_path_mainfest_tool=yes
-  fi
-  rm -f conftest*])
-if test yes != "$lt_cv_path_mainfest_tool"; then
-  MANIFEST_TOOL=:
-fi
-_LT_DECL([], [MANIFEST_TOOL], [1], [Manifest tool])dnl
-])# _LT_PATH_MANIFEST_TOOL
-
-
-# _LT_DLL_DEF_P([FILE])
-# ---------------------
-# True iff FILE is a Windows DLL '.def' file.
-# Keep in sync with func_dll_def_p in the libtool script
-AC_DEFUN([_LT_DLL_DEF_P],
-[dnl
-  test DEF = "`$SED -n dnl
-    -e '\''s/^[[	 ]]*//'\'' dnl Strip leading whitespace
-    -e '\''/^\(;.*\)*$/d'\'' dnl      Delete empty lines and comments
-    -e '\''s/^\(EXPORTS\|LIBRARY\)\([[	 ]].*\)*$/DEF/p'\'' dnl
-    -e q dnl                          Only consider the first "real" line
-    $1`" dnl
-])# _LT_DLL_DEF_P
-
-
-# LT_LIB_M
-# --------
-# check for math library
-AC_DEFUN([LT_LIB_M],
-[AC_REQUIRE([AC_CANONICAL_HOST])dnl
-LIBM=
-case $host in
-*-*-beos* | *-*-cegcc* | *-*-cygwin* | *-*-haiku* | *-*-pw32* | *-*-darwin*)
-  # These system don't have libm, or don't need it
-  ;;
-*-ncr-sysv4.3*)
-  AC_CHECK_LIB(mw, _mwvalidcheckl, LIBM=-lmw)
-  AC_CHECK_LIB(m, cos, LIBM="$LIBM -lm")
-  ;;
-*)
-  AC_CHECK_LIB(m, cos, LIBM=-lm)
-  ;;
-esac
-AC_SUBST([LIBM])
-])# LT_LIB_M
-
-# Old name:
-AU_ALIAS([AC_CHECK_LIBM], [LT_LIB_M])
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AC_CHECK_LIBM], [])
-
-
-# _LT_COMPILER_NO_RTTI([TAGNAME])
-# -------------------------------
-m4_defun([_LT_COMPILER_NO_RTTI],
-[m4_require([_LT_TAG_COMPILER])dnl
-
-_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
-
-if test yes = "$GCC"; then
-  case $cc_basename in
-  nvcc*)
-    _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -Xcompiler -fno-builtin' ;;
-  *)
-    _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin' ;;
-  esac
-
-  _LT_COMPILER_OPTION([if $compiler supports -fno-rtti -fno-exceptions],
-    lt_cv_prog_compiler_rtti_exceptions,
-    [-fno-rtti -fno-exceptions], [],
-    [_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)="$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1) -fno-rtti -fno-exceptions"])
-fi
-_LT_TAGDECL([no_builtin_flag], [lt_prog_compiler_no_builtin_flag], [1],
-	[Compiler flag to turn off builtin functions])
-])# _LT_COMPILER_NO_RTTI
-
-
-# _LT_CMD_GLOBAL_SYMBOLS
-# ----------------------
-m4_defun([_LT_CMD_GLOBAL_SYMBOLS],
-[AC_REQUIRE([AC_CANONICAL_HOST])dnl
-AC_REQUIRE([AC_PROG_CC])dnl
-AC_REQUIRE([AC_PROG_AWK])dnl
-AC_REQUIRE([LT_PATH_NM])dnl
-AC_REQUIRE([LT_PATH_LD])dnl
-m4_require([_LT_DECL_SED])dnl
-m4_require([_LT_DECL_EGREP])dnl
-m4_require([_LT_TAG_COMPILER])dnl
-
-# Check for command to grab the raw symbol name followed by C symbol from nm.
-AC_MSG_CHECKING([command to parse $NM output from $compiler object])
-AC_CACHE_VAL([lt_cv_sys_global_symbol_pipe],
-[
-# These are sane defaults that work on at least a few old systems.
-# [They come from Ultrix.  What could be older than Ultrix?!! ;)]
-
-# Character class describing NM global symbol codes.
-symcode='[[BCDEGRST]]'
-
-# Regexp to match symbols that can be accessed directly from C.
-sympat='\([[_A-Za-z]][[_A-Za-z0-9]]*\)'
-
-# Define system-specific variables.
-case $host_os in
-aix*)
-  symcode='[[BCDT]]'
-  ;;
-cygwin* | mingw* | pw32* | cegcc*)
-  symcode='[[ABCDGISTW]]'
-  ;;
-hpux*)
-  if test ia64 = "$host_cpu"; then
-    symcode='[[ABCDEGRST]]'
-  fi
-  ;;
-irix* | nonstopux*)
-  symcode='[[BCDEGRST]]'
-  ;;
-osf*)
-  symcode='[[BCDEGQRST]]'
-  ;;
-solaris*)
-  symcode='[[BDRT]]'
-  ;;
-sco3.2v5*)
-  symcode='[[DT]]'
-  ;;
-sysv4.2uw2*)
-  symcode='[[DT]]'
-  ;;
-sysv5* | sco5v6* | unixware* | OpenUNIX*)
-  symcode='[[ABDT]]'
-  ;;
-sysv4)
-  symcode='[[DFNSTU]]'
-  ;;
-esac
-
-# If we're using GNU nm, then use its standard symbol codes.
-case `$NM -V 2>&1` in
-*GNU* | *'with BFD'*)
-  symcode='[[ABCDGIRSTW]]' ;;
-esac
-
-if test "$lt_cv_nm_interface" = "MS dumpbin"; then
-  # Gets list of data symbols to import.
-  lt_cv_sys_global_symbol_to_import="sed -n -e 's/^I .* \(.*\)$/\1/p'"
-  # Adjust the below global symbol transforms to fixup imported variables.
-  lt_cdecl_hook=" -e 's/^I .* \(.*\)$/extern __declspec(dllimport) char \1;/p'"
-  lt_c_name_hook=" -e 's/^I .* \(.*\)$/  {\"\1\", (void *) 0},/p'"
-  lt_c_name_lib_hook="\
-  -e 's/^I .* \(lib.*\)$/  {\"\1\", (void *) 0},/p'\
-  -e 's/^I .* \(.*\)$/  {\"lib\1\", (void *) 0},/p'"
-else
-  # Disable hooks by default.
-  lt_cv_sys_global_symbol_to_import=
-  lt_cdecl_hook=
-  lt_c_name_hook=
-  lt_c_name_lib_hook=
-fi
-
-# Transform an extracted symbol line into a proper C declaration.
-# Some systems (esp. on ia64) link data and code symbols differently,
-# so use this general approach.
-lt_cv_sys_global_symbol_to_cdecl="sed -n"\
-$lt_cdecl_hook\
-" -e 's/^T .* \(.*\)$/extern int \1();/p'"\
-" -e 's/^$symcode$symcode* .* \(.*\)$/extern char \1;/p'"
-
-# Transform an extracted symbol line into symbol name and symbol address
-lt_cv_sys_global_symbol_to_c_name_address="sed -n"\
-$lt_c_name_hook\
-" -e 's/^: \(.*\) .*$/  {\"\1\", (void *) 0},/p'"\
-" -e 's/^$symcode$symcode* .* \(.*\)$/  {\"\1\", (void *) \&\1},/p'"
-
-# Transform an extracted symbol line into symbol name with lib prefix and
-# symbol address.
-lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n"\
-$lt_c_name_lib_hook\
-" -e 's/^: \(.*\) .*$/  {\"\1\", (void *) 0},/p'"\
-" -e 's/^$symcode$symcode* .* \(lib.*\)$/  {\"\1\", (void *) \&\1},/p'"\
-" -e 's/^$symcode$symcode* .* \(.*\)$/  {\"lib\1\", (void *) \&\1},/p'"
-
-# Handle CRLF in mingw tool chain
-opt_cr=
-case $build_os in
-mingw*)
-  opt_cr=`$ECHO 'x\{0,1\}' | tr x '\015'` # option cr in regexp
-  ;;
-esac
-
-# Try without a prefix underscore, then with it.
-for ac_symprfx in "" "_"; do
-
-  # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol.
-  symxfrm="\\1 $ac_symprfx\\2 \\2"
-
-  # Write the raw and C identifiers.
-  if test "$lt_cv_nm_interface" = "MS dumpbin"; then
-    # Fake it for dumpbin and say T for any non-static function,
-    # D for any global variable and I for any imported variable.
-    # Also find C++ and __fastcall symbols from MSVC++ or ICC,
-    # which start with @ or ?.
-    lt_cv_sys_global_symbol_pipe="$AWK ['"\
-"     {last_section=section; section=\$ 3};"\
-"     /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\
-"     /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\
-"     /^ *Symbol name *: /{split(\$ 0,sn,\":\"); si=substr(sn[2],2)};"\
-"     /^ *Type *: code/{print \"T\",si,substr(si,length(prfx))};"\
-"     /^ *Type *: data/{print \"I\",si,substr(si,length(prfx))};"\
-"     \$ 0!~/External *\|/{next};"\
-"     / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\
-"     {if(hide[section]) next};"\
-"     {f=\"D\"}; \$ 0~/\(\).*\|/{f=\"T\"};"\
-"     {split(\$ 0,a,/\||\r/); split(a[2],s)};"\
-"     s[1]~/^[@?]/{print f,s[1],s[1]; next};"\
-"     s[1]~prfx {split(s[1],t,\"@\"); print f,t[1],substr(t[1],length(prfx))}"\
-"     ' prfx=^$ac_symprfx]"
-  else
-    lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[	 ]]\($symcode$symcode*\)[[	 ]][[	 ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
-  fi
-  lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'"
-
-  # Check to see that the pipe works correctly.
-  pipe_works=no
-
-  rm -f conftest*
-  cat > conftest.$ac_ext <<_LT_EOF
-#ifdef __cplusplus
-extern "C" {
-#endif
-char nm_test_var;
-void nm_test_func(void);
-void nm_test_func(void){}
-#ifdef __cplusplus
-}
-#endif
-int main(){nm_test_var='a';nm_test_func();return(0);}
-_LT_EOF
-
-  if AC_TRY_EVAL(ac_compile); then
-    # Now try to grab the symbols.
-    nlist=conftest.nm
-    if AC_TRY_EVAL(NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist) && test -s "$nlist"; then
-      # Try sorting and uniquifying the output.
-      if sort "$nlist" | uniq > "$nlist"T; then
-	mv -f "$nlist"T "$nlist"
-      else
-	rm -f "$nlist"T
-      fi
-
-      # Make sure that we snagged all the symbols we need.
-      if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
-	if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
-	  cat <<_LT_EOF > conftest.$ac_ext
-/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests.  */
-#if defined _WIN32 || defined __CYGWIN__ || defined _WIN32_WCE
-/* DATA imports from DLLs on WIN32 can't be const, because runtime
-   relocations are performed -- see ld's documentation on pseudo-relocs.  */
-# define LT@&t@_DLSYM_CONST
-#elif defined __osf__
-/* This system does not cope well with relocations in const data.  */
-# define LT@&t@_DLSYM_CONST
-#else
-# define LT@&t@_DLSYM_CONST const
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-_LT_EOF
-	  # Now generate the symbol file.
-	  eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | $GREP -v main >> conftest.$ac_ext'
-
-	  cat <<_LT_EOF >> conftest.$ac_ext
-
-/* The mapping between symbol names and symbols.  */
-LT@&t@_DLSYM_CONST struct {
-  const char *name;
-  void       *address;
-}
-lt__PROGRAM__LTX_preloaded_symbols[[]] =
-{
-  { "@PROGRAM@", (void *) 0 },
-_LT_EOF
-	  $SED "s/^$symcode$symcode* .* \(.*\)$/  {\"\1\", (void *) \&\1},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext
-	  cat <<\_LT_EOF >> conftest.$ac_ext
-  {0, (void *) 0}
-};
-
-/* This works around a problem in FreeBSD linker */
-#ifdef FREEBSD_WORKAROUND
-static const void *lt_preloaded_setup() {
-  return lt__PROGRAM__LTX_preloaded_symbols;
-}
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-_LT_EOF
-	  # Now try linking the two files.
-	  mv conftest.$ac_objext conftstm.$ac_objext
-	  lt_globsym_save_LIBS=$LIBS
-	  lt_globsym_save_CFLAGS=$CFLAGS
-	  LIBS=conftstm.$ac_objext
-	  CFLAGS="$CFLAGS$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)"
-	  if AC_TRY_EVAL(ac_link) && test -s conftest$ac_exeext; then
-	    pipe_works=yes
-	  fi
-	  LIBS=$lt_globsym_save_LIBS
-	  CFLAGS=$lt_globsym_save_CFLAGS
-	else
-	  echo "cannot find nm_test_func in $nlist" >&AS_MESSAGE_LOG_FD
-	fi
-      else
-	echo "cannot find nm_test_var in $nlist" >&AS_MESSAGE_LOG_FD
-      fi
-    else
-      echo "cannot run $lt_cv_sys_global_symbol_pipe" >&AS_MESSAGE_LOG_FD
-    fi
-  else
-    echo "$progname: failed program was:" >&AS_MESSAGE_LOG_FD
-    cat conftest.$ac_ext >&5
-  fi
-  rm -rf conftest* conftst*
-
-  # Do not use the global_symbol_pipe unless it works.
-  if test yes = "$pipe_works"; then
-    break
-  else
-    lt_cv_sys_global_symbol_pipe=
-  fi
-done
-])
-if test -z "$lt_cv_sys_global_symbol_pipe"; then
-  lt_cv_sys_global_symbol_to_cdecl=
-fi
-if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then
-  AC_MSG_RESULT(failed)
-else
-  AC_MSG_RESULT(ok)
-fi
-
-# Response file support.
-if test "$lt_cv_nm_interface" = "MS dumpbin"; then
-  nm_file_list_spec='@'
-elif $NM --help 2>/dev/null | grep '[[@]]FILE' >/dev/null; then
-  nm_file_list_spec='@'
-fi
-
-_LT_DECL([global_symbol_pipe], [lt_cv_sys_global_symbol_pipe], [1],
-    [Take the output of nm and produce a listing of raw symbols and C names])
-_LT_DECL([global_symbol_to_cdecl], [lt_cv_sys_global_symbol_to_cdecl], [1],
-    [Transform the output of nm in a proper C declaration])
-_LT_DECL([global_symbol_to_import], [lt_cv_sys_global_symbol_to_import], [1],
-    [Transform the output of nm into a list of symbols to manually relocate])
-_LT_DECL([global_symbol_to_c_name_address],
-    [lt_cv_sys_global_symbol_to_c_name_address], [1],
-    [Transform the output of nm in a C name address pair])
-_LT_DECL([global_symbol_to_c_name_address_lib_prefix],
-    [lt_cv_sys_global_symbol_to_c_name_address_lib_prefix], [1],
-    [Transform the output of nm in a C name address pair when lib prefix is needed])
-_LT_DECL([nm_interface], [lt_cv_nm_interface], [1],
-    [The name lister interface])
-_LT_DECL([], [nm_file_list_spec], [1],
-    [Specify filename containing input files for $NM])
-]) # _LT_CMD_GLOBAL_SYMBOLS
-
-
-# _LT_COMPILER_PIC([TAGNAME])
-# ---------------------------
-m4_defun([_LT_COMPILER_PIC],
-[m4_require([_LT_TAG_COMPILER])dnl
-_LT_TAGVAR(lt_prog_compiler_wl, $1)=
-_LT_TAGVAR(lt_prog_compiler_pic, $1)=
-_LT_TAGVAR(lt_prog_compiler_static, $1)=
-
-m4_if([$1], [CXX], [
-  # C++ specific cases for pic, static, wl, etc.
-  if test yes = "$GXX"; then
-    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-    _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
-
-    case $host_os in
-    aix*)
-      # All AIX code is PIC.
-      if test ia64 = "$host_cpu"; then
-	# AIX 5 now supports IA64 processor
-	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-      fi
-      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-      ;;
-
-    amigaos*)
-      case $host_cpu in
-      powerpc)
-            # see comment about AmigaOS4 .so support
-            _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-        ;;
-      m68k)
-            # FIXME: we need at least 68020 code to build shared libraries, but
-            # adding the '-m68020' flag to GCC prevents building anything better,
-            # like '-m68040'.
-            _LT_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
-        ;;
-      esac
-      ;;
-
-    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
-      # PIC is the default for these OSes.
-      ;;
-    mingw* | cygwin* | os2* | pw32* | cegcc*)
-      # This hack is so that the source file can tell whether it is being
-      # built for inclusion in a dll (and should export symbols for example).
-      # Although the cygwin gcc ignores -fPIC, still need this for old-style
-      # (--disable-auto-import) libraries
-      m4_if([$1], [GCJ], [],
-	[_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
-      case $host_os in
-      os2*)
-	_LT_TAGVAR(lt_prog_compiler_static, $1)='$wl-static'
-	;;
-      esac
-      ;;
-    darwin* | rhapsody*)
-      # PIC is the default on this platform
-      # Common symbols not allowed in MH_DYLIB files
-      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
-      ;;
-    *djgpp*)
-      # DJGPP does not support shared libraries at all
-      _LT_TAGVAR(lt_prog_compiler_pic, $1)=
-      ;;
-    haiku*)
-      # PIC is the default for Haiku.
-      # The "-static" flag exists, but is broken.
-      _LT_TAGVAR(lt_prog_compiler_static, $1)=
-      ;;
-    interix[[3-9]]*)
-      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
-      # Instead, we relocate shared libraries at runtime.
-      ;;
-    sysv4*MP*)
-      if test -d /usr/nec; then
-	_LT_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic
-      fi
-      ;;
-    hpux*)
-      # PIC is the default for 64-bit PA HP-UX, but not for 32-bit
-      # PA HP-UX.  On IA64 HP-UX, PIC is the default but the pic flag
-      # sets the default TLS model and affects inlining.
-      case $host_cpu in
-      hppa*64*)
-	;;
-      *)
-	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-	;;
-      esac
-      ;;
-    *qnx* | *nto*)
-      # QNX uses GNU C++, but need to define -shared option too, otherwise
-      # it will coredump.
-      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared'
-      ;;
-    *)
-      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-      ;;
-    esac
-  else
-    case $host_os in
-      aix[[4-9]]*)
-	# All AIX code is PIC.
-	if test ia64 = "$host_cpu"; then
-	  # AIX 5 now supports IA64 processor
-	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-	else
-	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp'
-	fi
-	;;
-      chorus*)
-	case $cc_basename in
-	cxch68*)
-	  # Green Hills C++ Compiler
-	  # _LT_TAGVAR(lt_prog_compiler_static, $1)="--no_auto_instantiation -u __main -u __premain -u _abort -r $COOL_DIR/lib/libOrb.a $MVME_DIR/lib/CC/libC.a $MVME_DIR/lib/classix/libcx.s.a"
-	  ;;
-	esac
-	;;
-      mingw* | cygwin* | os2* | pw32* | cegcc*)
-	# This hack is so that the source file can tell whether it is being
-	# built for inclusion in a dll (and should export symbols for example).
-	m4_if([$1], [GCJ], [],
-	  [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
-	;;
-      dgux*)
-	case $cc_basename in
-	  ec++*)
-	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-	    ;;
-	  ghcx*)
-	    # Green Hills C++ Compiler
-	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      freebsd* | dragonfly*)
-	# FreeBSD uses GNU C++
-	;;
-      hpux9* | hpux10* | hpux11*)
-	case $cc_basename in
-	  CC*)
-	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	    _LT_TAGVAR(lt_prog_compiler_static, $1)='$wl-a ${wl}archive'
-	    if test ia64 != "$host_cpu"; then
-	      _LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
-	    fi
-	    ;;
-	  aCC*)
-	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	    _LT_TAGVAR(lt_prog_compiler_static, $1)='$wl-a ${wl}archive'
-	    case $host_cpu in
-	    hppa*64*|ia64*)
-	      # +Z the default
-	      ;;
-	    *)
-	      _LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
-	      ;;
-	    esac
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      interix*)
-	# This is c89, which is MS Visual C++ (no shared libs)
-	# Anyone wants to do a port?
-	;;
-      irix5* | irix6* | nonstopux*)
-	case $cc_basename in
-	  CC*)
-	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
-	    # CC pic flag -KPIC is the default.
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
-	case $cc_basename in
-	  KCC*)
-	    # KAI C++ Compiler
-	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,'
-	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-	    ;;
-	  ecpc* )
-	    # old Intel C++ for x86_64, which still supported -KPIC.
-	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
-	    ;;
-	  icpc* )
-	    # Intel C++, used to be incompatible with GCC.
-	    # ICC 10 doesn't accept -KPIC any more.
-	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
-	    ;;
-	  pgCC* | pgcpp*)
-	    # Portland Group C++ compiler
-	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
-	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-	    ;;
-	  cxx*)
-	    # Compaq C++
-	    # Make sure the PIC flag is empty.  It appears that all Alpha
-	    # Linux and Compaq Tru64 Unix objects are PIC.
-	    _LT_TAGVAR(lt_prog_compiler_pic, $1)=
-	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
-	    ;;
-	  xlc* | xlC* | bgxl[[cC]]* | mpixl[[cC]]*)
-	    # IBM XL 8.0, 9.0 on PPC and BlueGene
-	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic'
-	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink'
-	    ;;
-	  *)
-	    case `$CC -V 2>&1 | sed 5q` in
-	    *Sun\ C*)
-	      # Sun C++ 5.9
-	      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-	      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-	      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
-	      ;;
-	    esac
-	    ;;
-	esac
-	;;
-      lynxos*)
-	;;
-      m88k*)
-	;;
-      mvs*)
-	case $cc_basename in
-	  cxx*)
-	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-W c,exportall'
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      netbsd*)
-	;;
-      *qnx* | *nto*)
-        # QNX uses GNU C++, but need to define -shared option too, otherwise
-        # it will coredump.
-        _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared'
-        ;;
-      osf3* | osf4* | osf5*)
-	case $cc_basename in
-	  KCC*)
-	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,'
-	    ;;
-	  RCC*)
-	    # Rational C++ 2.4.1
-	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
-	    ;;
-	  cxx*)
-	    # Digital/Compaq C++
-	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	    # Make sure the PIC flag is empty.  It appears that all Alpha
-	    # Linux and Compaq Tru64 Unix objects are PIC.
-	    _LT_TAGVAR(lt_prog_compiler_pic, $1)=
-	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      psos*)
-	;;
-      solaris*)
-	case $cc_basename in
-	  CC* | sunCC*)
-	    # Sun C++ 4.2, 5.x and Centerline C++
-	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
-	    ;;
-	  gcx*)
-	    # Green Hills C++ Compiler
-	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      sunos4*)
-	case $cc_basename in
-	  CC*)
-	    # Sun C++ 4.x
-	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
-	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-	    ;;
-	  lcc*)
-	    # Lucid
-	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
-	case $cc_basename in
-	  CC*)
-	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-	    ;;
-	esac
-	;;
-      tandem*)
-	case $cc_basename in
-	  NCC*)
-	    # NonStop-UX NCC 3.20
-	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      vxworks*)
-	;;
-      *)
-	_LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
-	;;
-    esac
-  fi
-],
-[
-  if test yes = "$GCC"; then
-    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-    _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
-
-    case $host_os in
-      aix*)
-      # All AIX code is PIC.
-      if test ia64 = "$host_cpu"; then
-	# AIX 5 now supports IA64 processor
-	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-      fi
-      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-      ;;
-
-    amigaos*)
-      case $host_cpu in
-      powerpc)
-            # see comment about AmigaOS4 .so support
-            _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-        ;;
-      m68k)
-            # FIXME: we need at least 68020 code to build shared libraries, but
-            # adding the '-m68020' flag to GCC prevents building anything better,
-            # like '-m68040'.
-            _LT_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
-        ;;
-      esac
-      ;;
-
-    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
-      # PIC is the default for these OSes.
-      ;;
-
-    mingw* | cygwin* | pw32* | os2* | cegcc*)
-      # This hack is so that the source file can tell whether it is being
-      # built for inclusion in a dll (and should export symbols for example).
-      # Although the cygwin gcc ignores -fPIC, still need this for old-style
-      # (--disable-auto-import) libraries
-      m4_if([$1], [GCJ], [],
-	[_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
-      case $host_os in
-      os2*)
-	_LT_TAGVAR(lt_prog_compiler_static, $1)='$wl-static'
-	;;
-      esac
-      ;;
-
-    darwin* | rhapsody*)
-      # PIC is the default on this platform
-      # Common symbols not allowed in MH_DYLIB files
-      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
-      ;;
-
-    haiku*)
-      # PIC is the default for Haiku.
-      # The "-static" flag exists, but is broken.
-      _LT_TAGVAR(lt_prog_compiler_static, $1)=
-      ;;
-
-    hpux*)
-      # PIC is the default for 64-bit PA HP-UX, but not for 32-bit
-      # PA HP-UX.  On IA64 HP-UX, PIC is the default but the pic flag
-      # sets the default TLS model and affects inlining.
-      case $host_cpu in
-      hppa*64*)
-	# +Z the default
-	;;
-      *)
-	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-	;;
-      esac
-      ;;
-
-    interix[[3-9]]*)
-      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
-      # Instead, we relocate shared libraries at runtime.
-      ;;
-
-    msdosdjgpp*)
-      # Just because we use GCC doesn't mean we suddenly get shared libraries
-      # on systems that don't support them.
-      _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
-      enable_shared=no
-      ;;
-
-    *nto* | *qnx*)
-      # QNX uses GNU C++, but need to define -shared option too, otherwise
-      # it will coredump.
-      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared'
-      ;;
-
-    sysv4*MP*)
-      if test -d /usr/nec; then
-	_LT_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic
-      fi
-      ;;
-
-    *)
-      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-      ;;
-    esac
-
-    case $cc_basename in
-    nvcc*) # Cuda Compiler Driver 2.2
-      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Xlinker '
-      if test -n "$_LT_TAGVAR(lt_prog_compiler_pic, $1)"; then
-        _LT_TAGVAR(lt_prog_compiler_pic, $1)="-Xcompiler $_LT_TAGVAR(lt_prog_compiler_pic, $1)"
-      fi
-      ;;
-    esac
-  else
-    # PORTME Check for flag to pass linker flags through the system compiler.
-    case $host_os in
-    aix*)
-      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-      if test ia64 = "$host_cpu"; then
-	# AIX 5 now supports IA64 processor
-	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-      else
-	_LT_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp'
-      fi
-      ;;
-
-    darwin* | rhapsody*)
-      # PIC is the default on this platform
-      # Common symbols not allowed in MH_DYLIB files
-      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
-      case $cc_basename in
-      nagfor*)
-        # NAG Fortran compiler
-        _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,-Wl,,'
-        _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
-        _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-        ;;
-      esac
-      ;;
-
-    mingw* | cygwin* | pw32* | os2* | cegcc*)
-      # This hack is so that the source file can tell whether it is being
-      # built for inclusion in a dll (and should export symbols for example).
-      m4_if([$1], [GCJ], [],
-	[_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
-      case $host_os in
-      os2*)
-	_LT_TAGVAR(lt_prog_compiler_static, $1)='$wl-static'
-	;;
-      esac
-      ;;
-
-    hpux9* | hpux10* | hpux11*)
-      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
-      # not for PA HP-UX.
-      case $host_cpu in
-      hppa*64*|ia64*)
-	# +Z the default
-	;;
-      *)
-	_LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
-	;;
-      esac
-      # Is there a better lt_prog_compiler_static that works with the bundled CC?
-      _LT_TAGVAR(lt_prog_compiler_static, $1)='$wl-a ${wl}archive'
-      ;;
-
-    irix5* | irix6* | nonstopux*)
-      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-      # PIC (with -KPIC) is the default.
-      _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
-      ;;
-
-    linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
-      case $cc_basename in
-      # old Intel for x86_64, which still supported -KPIC.
-      ecc*)
-	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-	_LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
-        ;;
-      # icc used to be incompatible with GCC.
-      # ICC 10 doesn't accept -KPIC any more.
-      icc* | ifort*)
-	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-	_LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
-        ;;
-      # Lahey Fortran 8.1.
-      lf95*)
-	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	_LT_TAGVAR(lt_prog_compiler_pic, $1)='--shared'
-	_LT_TAGVAR(lt_prog_compiler_static, $1)='--static'
-	;;
-      nagfor*)
-	# NAG Fortran compiler
-	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,-Wl,,'
-	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
-	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-	;;
-      tcc*)
-	# Fabrice Bellard et al's Tiny C Compiler
-	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-	_LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
-	;;
-      pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
-        # Portland Group compilers (*not* the Pentium gcc compiler,
-	# which looks to be a dead project)
-	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
-	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-        ;;
-      ccc*)
-        _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-        # All Alpha code is PIC.
-        _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
-        ;;
-      xl* | bgxl* | bgf* | mpixl*)
-	# IBM XL C 8.0/Fortran 10.1, 11.1 on PPC and BlueGene
-	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic'
-	_LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink'
-	;;
-      *)
-	case `$CC -V 2>&1 | sed 5q` in
-	*Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [[1-7]].* | *Sun*Fortran*\ 8.[[0-3]]*)
-	  # Sun Fortran 8.3 passes all unrecognized flags to the linker
-	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-	  _LT_TAGVAR(lt_prog_compiler_wl, $1)=''
-	  ;;
-	*Sun\ F* | *Sun*Fortran*)
-	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-	  _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
-	  ;;
-	*Sun\ C*)
-	  # Sun C 5.9
-	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-	  _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	  ;;
-        *Intel*\ [[CF]]*Compiler*)
-	  _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
-	  ;;
-	*Portland\ Group*)
-	  _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
-	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-	  ;;
-	esac
-	;;
-      esac
-      ;;
-
-    newsos6)
-      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-      ;;
-
-    *nto* | *qnx*)
-      # QNX uses GNU C++, but need to define -shared option too, otherwise
-      # it will coredump.
-      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared'
-      ;;
-
-    osf3* | osf4* | osf5*)
-      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-      # All OSF/1 code is PIC.
-      _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
-      ;;
-
-    rdos*)
-      _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
-      ;;
-
-    solaris*)
-      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-      case $cc_basename in
-      f77* | f90* | f95* | sunf77* | sunf90* | sunf95*)
-	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';;
-      *)
-	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';;
-      esac
-      ;;
-
-    sunos4*)
-      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
-      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
-      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-      ;;
-
-    sysv4 | sysv4.2uw2* | sysv4.3*)
-      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-      ;;
-
-    sysv4*MP*)
-      if test -d /usr/nec; then
-	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-Kconform_pic'
-	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-      fi
-      ;;
-
-    sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
-      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-      ;;
-
-    unicos*)
-      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-      _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
-      ;;
-
-    uts4*)
-      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
-      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-      ;;
-
-    *)
-      _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
-      ;;
-    esac
-  fi
-])
-case $host_os in
-  # For platforms that do not support PIC, -DPIC is meaningless:
-  *djgpp*)
-    _LT_TAGVAR(lt_prog_compiler_pic, $1)=
-    ;;
-  *)
-    _LT_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_TAGVAR(lt_prog_compiler_pic, $1)@&t@m4_if([$1],[],[ -DPIC],[m4_if([$1],[CXX],[ -DPIC],[])])"
-    ;;
-esac
-
-AC_CACHE_CHECK([for $compiler option to produce PIC],
-  [_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)],
-  [_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)=$_LT_TAGVAR(lt_prog_compiler_pic, $1)])
-_LT_TAGVAR(lt_prog_compiler_pic, $1)=$_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)
-
-#
-# Check to make sure the PIC flag actually works.
-#
-if test -n "$_LT_TAGVAR(lt_prog_compiler_pic, $1)"; then
-  _LT_COMPILER_OPTION([if $compiler PIC flag $_LT_TAGVAR(lt_prog_compiler_pic, $1) works],
-    [_LT_TAGVAR(lt_cv_prog_compiler_pic_works, $1)],
-    [$_LT_TAGVAR(lt_prog_compiler_pic, $1)@&t@m4_if([$1],[],[ -DPIC],[m4_if([$1],[CXX],[ -DPIC],[])])], [],
-    [case $_LT_TAGVAR(lt_prog_compiler_pic, $1) in
-     "" | " "*) ;;
-     *) _LT_TAGVAR(lt_prog_compiler_pic, $1)=" $_LT_TAGVAR(lt_prog_compiler_pic, $1)" ;;
-     esac],
-    [_LT_TAGVAR(lt_prog_compiler_pic, $1)=
-     _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no])
-fi
-_LT_TAGDECL([pic_flag], [lt_prog_compiler_pic], [1],
-	[Additional compiler flags for building library objects])
-
-_LT_TAGDECL([wl], [lt_prog_compiler_wl], [1],
-	[How to pass a linker flag through the compiler])
-#
-# Check to make sure the static flag actually works.
-#
-wl=$_LT_TAGVAR(lt_prog_compiler_wl, $1) eval lt_tmp_static_flag=\"$_LT_TAGVAR(lt_prog_compiler_static, $1)\"
-_LT_LINKER_OPTION([if $compiler static flag $lt_tmp_static_flag works],
-  _LT_TAGVAR(lt_cv_prog_compiler_static_works, $1),
-  $lt_tmp_static_flag,
-  [],
-  [_LT_TAGVAR(lt_prog_compiler_static, $1)=])
-_LT_TAGDECL([link_static_flag], [lt_prog_compiler_static], [1],
-	[Compiler flag to prevent dynamic linking])
-])# _LT_COMPILER_PIC
-
-
-# _LT_LINKER_SHLIBS([TAGNAME])
-# ----------------------------
-# See if the linker supports building shared libraries.
-m4_defun([_LT_LINKER_SHLIBS],
-[AC_REQUIRE([LT_PATH_LD])dnl
-AC_REQUIRE([LT_PATH_NM])dnl
-m4_require([_LT_PATH_MANIFEST_TOOL])dnl
-m4_require([_LT_FILEUTILS_DEFAULTS])dnl
-m4_require([_LT_DECL_EGREP])dnl
-m4_require([_LT_DECL_SED])dnl
-m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl
-m4_require([_LT_TAG_COMPILER])dnl
-AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
-m4_if([$1], [CXX], [
-  _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-  _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']
-  case $host_os in
-  aix[[4-9]]*)
-    # If we're using GNU nm, then we don't want the "-C" option.
-    # -C means demangle to GNU nm, but means don't demangle to AIX nm.
-    # Without the "-l" option, or with the "-B" option, AIX nm treats
-    # weak defined symbols like other global defined symbols, whereas
-    # GNU nm marks them as "W".
-    # While the 'weak' keyword is ignored in the Export File, we need
-    # it in the Import File for the 'aix-soname' feature, so we have
-    # to replace the "-B" option with "-P" for AIX nm.
-    if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
-      _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { if (\$ 2 == "W") { print \$ 3 " weak" } else { print \$ 3 } } }'\'' | sort -u > $export_symbols'
-    else
-      _LT_TAGVAR(export_symbols_cmds, $1)='`func_echo_all $NM | $SED -e '\''s/B\([[^B]]*\)$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "L") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && ([substr](\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols'
-    fi
-    ;;
-  pw32*)
-    _LT_TAGVAR(export_symbols_cmds, $1)=$ltdll_cmds
-    ;;
-  cygwin* | mingw* | cegcc*)
-    case $cc_basename in
-    cl* | icl*)
-      _LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*'
-      ;;
-    *)
-      _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols'
-      _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname']
-      ;;
-    esac
-    ;;
-  *)
-    _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-    ;;
-  esac
-], [
-  runpath_var=
-  _LT_TAGVAR(allow_undefined_flag, $1)=
-  _LT_TAGVAR(always_export_symbols, $1)=no
-  _LT_TAGVAR(archive_cmds, $1)=
-  _LT_TAGVAR(archive_expsym_cmds, $1)=
-  _LT_TAGVAR(compiler_needs_object, $1)=no
-  _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
-  _LT_TAGVAR(export_dynamic_flag_spec, $1)=
-  _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-  _LT_TAGVAR(hardcode_automatic, $1)=no
-  _LT_TAGVAR(hardcode_direct, $1)=no
-  _LT_TAGVAR(hardcode_direct_absolute, $1)=no
-  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
-  _LT_TAGVAR(hardcode_libdir_separator, $1)=
-  _LT_TAGVAR(hardcode_minus_L, $1)=no
-  _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
-  _LT_TAGVAR(inherit_rpath, $1)=no
-  _LT_TAGVAR(link_all_deplibs, $1)=unknown
-  _LT_TAGVAR(module_cmds, $1)=
-  _LT_TAGVAR(module_expsym_cmds, $1)=
-  _LT_TAGVAR(old_archive_from_new_cmds, $1)=
-  _LT_TAGVAR(old_archive_from_expsyms_cmds, $1)=
-  _LT_TAGVAR(thread_safe_flag_spec, $1)=
-  _LT_TAGVAR(whole_archive_flag_spec, $1)=
-  # include_expsyms should be a list of space-separated symbols to be *always*
-  # included in the symbol list
-  _LT_TAGVAR(include_expsyms, $1)=
-  # exclude_expsyms can be an extended regexp of symbols to exclude
-  # it will be wrapped by ' (' and ')$', so one must not match beginning or
-  # end of line.  Example: 'a|bc|.*d.*' will exclude the symbols 'a' and 'bc',
-  # as well as any symbol that contains 'd'.
-  _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']
-  # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
-  # platforms (ab)use it in PIC code, but their linkers get confused if
-  # the symbol is explicitly referenced.  Since portable code cannot
-  # rely on this symbol name, it's probably fine to never include it in
-  # preloaded symbol tables.
-  # Exclude shared library initialization/finalization symbols.
-dnl Note also adjust exclude_expsyms for C++ above.
-  extract_expsyms_cmds=
-
-  case $host_os in
-  cygwin* | mingw* | pw32* | cegcc*)
-    # FIXME: the MSVC++ and ICC port hasn't been tested in a loooong time
-    # When not using gcc, we currently assume that we are using
-    # Microsoft Visual C++ or Intel C++ Compiler.
-    if test yes != "$GCC"; then
-      with_gnu_ld=no
-    fi
-    ;;
-  interix*)
-    # we just hope/assume this is gcc and not c89 (= MSVC++ or ICC)
-    with_gnu_ld=yes
-    ;;
-  openbsd* | bitrig*)
-    with_gnu_ld=no
-    ;;
-  esac
-
-  _LT_TAGVAR(ld_shlibs, $1)=yes
-
-  # On some targets, GNU ld is compatible enough with the native linker
-  # that we're better off using the native interface for both.
-  lt_use_gnu_ld_interface=no
-  if test yes = "$with_gnu_ld"; then
-    case $host_os in
-      aix*)
-	# The AIX port of GNU ld has always aspired to compatibility
-	# with the native linker.  However, as the warning in the GNU ld
-	# block says, versions before 2.19.5* couldn't really create working
-	# shared libraries, regardless of the interface used.
-	case `$LD -v 2>&1` in
-	  *\ \(GNU\ Binutils\)\ 2.19.5*) ;;
-	  *\ \(GNU\ Binutils\)\ 2.[[2-9]]*) ;;
-	  *\ \(GNU\ Binutils\)\ [[3-9]]*) ;;
-	  *)
-	    lt_use_gnu_ld_interface=yes
-	    ;;
-	esac
-	;;
-      *)
-	lt_use_gnu_ld_interface=yes
-	;;
-    esac
-  fi
-
-  if test yes = "$lt_use_gnu_ld_interface"; then
-    # If archive_cmds runs LD, not CC, wlarc should be empty
-    wlarc='$wl'
-
-    # Set some defaults for GNU ld with shared library support. These
-    # are reset later if shared libraries are not supported. Putting them
-    # here allows them to be overridden if necessary.
-    runpath_var=LD_RUN_PATH
-    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
-    _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-dynamic'
-    # ancient GNU ld didn't support --whole-archive et. al.
-    if $LD --help 2>&1 | $GREP 'no-whole-archive' > /dev/null; then
-      _LT_TAGVAR(whole_archive_flag_spec, $1)=$wlarc'--whole-archive$convenience '$wlarc'--no-whole-archive'
-    else
-      _LT_TAGVAR(whole_archive_flag_spec, $1)=
-    fi
-    supports_anon_versioning=no
-    case `$LD -v | $SED -e 's/([^)]\+)\s\+//' 2>&1` in
-      *GNU\ gold*) supports_anon_versioning=yes ;;
-      *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11
-      *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
-      *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
-      *\ 2.11.*) ;; # other 2.11 versions
-      *) supports_anon_versioning=yes ;;
-    esac
-
-    # See if GNU ld supports shared libraries.
-    case $host_os in
-    aix[[3-9]]*)
-      # On AIX/PPC, the GNU linker is very broken
-      if test ia64 != "$host_cpu"; then
-	_LT_TAGVAR(ld_shlibs, $1)=no
-	cat <<_LT_EOF 1>&2
-
-*** Warning: the GNU linker, at least up to release 2.19, is reported
-*** to be unable to reliably create shared libraries on AIX.
-*** Therefore, libtool is disabling shared libraries support.  If you
-*** really care for shared libraries, you may want to install binutils
-*** 2.20 or above, or modify your PATH so that a non-GNU linker is found.
-*** You will then need to restart the configuration process.
-
-_LT_EOF
-      fi
-      ;;
-
-    amigaos*)
-      case $host_cpu in
-      powerpc)
-            # see comment about AmigaOS4 .so support
-            _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
-            _LT_TAGVAR(archive_expsym_cmds, $1)=''
-        ;;
-      m68k)
-            _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
-            _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-            _LT_TAGVAR(hardcode_minus_L, $1)=yes
-        ;;
-      esac
-      ;;
-
-    beos*)
-      if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
-	_LT_TAGVAR(allow_undefined_flag, $1)=unsupported
-	# Joseph Beckenbach <jrb3@best.com> says some releases of gcc
-	# support --undefined.  This deserves some investigation.  FIXME
-	_LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
-      else
-	_LT_TAGVAR(ld_shlibs, $1)=no
-      fi
-      ;;
-
-    cygwin* | mingw* | pw32* | cegcc*)
-      # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
-      # as there is no search path for DLLs.
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-      _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-all-symbols'
-      _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
-      _LT_TAGVAR(always_export_symbols, $1)=no
-      _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
-      _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols'
-      _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname']
-
-      if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
-        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-	# If the export-symbols file already is a .def file, use it as
-	# is; otherwise, prepend EXPORTS...
-	_LT_TAGVAR(archive_expsym_cmds, $1)='if _LT_DLL_DEF_P([$export_symbols]); then
-          cp $export_symbols $output_objdir/$soname.def;
-        else
-          echo EXPORTS > $output_objdir/$soname.def;
-          cat $export_symbols >> $output_objdir/$soname.def;
-        fi~
-        $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-      else
-	_LT_TAGVAR(ld_shlibs, $1)=no
-      fi
-      ;;
-
-    haiku*)
-      _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
-      _LT_TAGVAR(link_all_deplibs, $1)=yes
-      ;;
-
-    os2*)
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-      _LT_TAGVAR(hardcode_minus_L, $1)=yes
-      _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
-      shrext_cmds=.dll
-      _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
-	$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
-	$ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
-	$ECHO EXPORTS >> $output_objdir/$libname.def~
-	emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~
-	$CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
-	emximp -o $lib $output_objdir/$libname.def'
-      _LT_TAGVAR(archive_expsym_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
-	$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
-	$ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
-	$ECHO EXPORTS >> $output_objdir/$libname.def~
-	prefix_cmds="$SED"~
-	if test EXPORTS = "`$SED 1q $export_symbols`"; then
-	  prefix_cmds="$prefix_cmds -e 1d";
-	fi~
-	prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~
-	cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~
-	$CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
-	emximp -o $lib $output_objdir/$libname.def'
-      _LT_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
-      _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
-      _LT_TAGVAR(file_list_spec, $1)='@'
-      ;;
-
-    interix[[3-9]]*)
-      _LT_TAGVAR(hardcode_direct, $1)=no
-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir'
-      _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E'
-      # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
-      # Instead, shared libraries are loaded at an image base (0x10000000 by
-      # default) and relocated if they conflict, which is a slow very memory
-      # consuming and fragmenting process.  To avoid this, we pick a random,
-      # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
-      # time.  Moving up from 0x10000000 also allows more sbrk(2) space.
-      _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
-      _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--retain-symbols-file,$output_objdir/$soname.expsym $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
-      ;;
-
-    gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu)
-      tmp_diet=no
-      if test linux-dietlibc = "$host_os"; then
-	case $cc_basename in
-	  diet\ *) tmp_diet=yes;;	# linux-dietlibc with static linking (!diet-dyn)
-	esac
-      fi
-      if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \
-	 && test no = "$tmp_diet"
-      then
-	tmp_addflag=' $pic_flag'
-	tmp_sharedflag='-shared'
-	case $cc_basename,$host_cpu in
-        pgcc*)				# Portland Group C compiler
-	  _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
-	  tmp_addflag=' $pic_flag'
-	  ;;
-	pgf77* | pgf90* | pgf95* | pgfortran*)
-					# Portland Group f77 and f90 compilers
-	  _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
-	  tmp_addflag=' $pic_flag -Mnomain' ;;
-	ecc*,ia64* | icc*,ia64*)	# Intel C compiler on ia64
-	  tmp_addflag=' -i_dynamic' ;;
-	efc*,ia64* | ifort*,ia64*)	# Intel Fortran compiler on ia64
-	  tmp_addflag=' -i_dynamic -nofor_main' ;;
-	ifc* | ifort*)			# Intel Fortran compiler
-	  tmp_addflag=' -nofor_main' ;;
-	lf95*)				# Lahey Fortran 8.1
-	  _LT_TAGVAR(whole_archive_flag_spec, $1)=
-	  tmp_sharedflag='--shared' ;;
-        nagfor*)                        # NAGFOR 5.3
-          tmp_sharedflag='-Wl,-shared' ;;
-	xl[[cC]]* | bgxl[[cC]]* | mpixl[[cC]]*) # IBM XL C 8.0 on PPC (deal with xlf below)
-	  tmp_sharedflag='-qmkshrobj'
-	  tmp_addflag= ;;
-	nvcc*)	# Cuda Compiler Driver 2.2
-	  _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
-	  _LT_TAGVAR(compiler_needs_object, $1)=yes
-	  ;;
-	esac
-	case `$CC -V 2>&1 | sed 5q` in
-	*Sun\ C*)			# Sun C 5.9
-	  _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
-	  _LT_TAGVAR(compiler_needs_object, $1)=yes
-	  tmp_sharedflag='-G' ;;
-	*Sun\ F*)			# Sun Fortran 8.3
-	  tmp_sharedflag='-G' ;;
-	esac
-	_LT_TAGVAR(archive_cmds, $1)='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
-
-        if test yes = "$supports_anon_versioning"; then
-          _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~
-            cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
-            echo "local: *; };" >> $output_objdir/$libname.ver~
-            $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$output_objdir/$libname.ver -o $lib'
-        fi
-
-	case $cc_basename in
-	tcc*)
-	  _LT_TAGVAR(export_dynamic_flag_spec, $1)='-rdynamic'
-	  ;;
-	xlf* | bgf* | bgxlf* | mpixlf*)
-	  # IBM XL Fortran 10.1 on PPC cannot create shared libs itself
-	  _LT_TAGVAR(whole_archive_flag_spec, $1)='--whole-archive$convenience --no-whole-archive'
-	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
-	  _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
-	  if test yes = "$supports_anon_versioning"; then
-	    _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~
-              cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
-              echo "local: *; };" >> $output_objdir/$libname.ver~
-              $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
-	  fi
-	  ;;
-	esac
-      else
-        _LT_TAGVAR(ld_shlibs, $1)=no
-      fi
-      ;;
-
-    netbsd*)
-      if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
-	_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
-	wlarc=
-      else
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
-	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
-      fi
-      ;;
-
-    solaris*)
-      if $LD -v 2>&1 | $GREP 'BFD 2\.8' > /dev/null; then
-	_LT_TAGVAR(ld_shlibs, $1)=no
-	cat <<_LT_EOF 1>&2
-
-*** Warning: The releases 2.8.* of the GNU linker cannot reliably
-*** create shared libraries on Solaris systems.  Therefore, libtool
-*** is disabling shared libraries support.  We urge you to upgrade GNU
-*** binutils to release 2.9.1 or newer.  Another option is to modify
-*** your PATH or compiler configuration so that the native linker is
-*** used, and then restart.
-
-_LT_EOF
-      elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
-	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
-      else
-	_LT_TAGVAR(ld_shlibs, $1)=no
-      fi
-      ;;
-
-    sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
-      case `$LD -v 2>&1` in
-        *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.1[[0-5]].*)
-	_LT_TAGVAR(ld_shlibs, $1)=no
-	cat <<_LT_EOF 1>&2
-
-*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 cannot
-*** reliably create shared libraries on SCO systems.  Therefore, libtool
-*** is disabling shared libraries support.  We urge you to upgrade GNU
-*** binutils to release 2.16.91.0.3 or newer.  Another option is to modify
-*** your PATH or compiler configuration so that the native linker is
-*** used, and then restart.
-
-_LT_EOF
-	;;
-	*)
-	  # For security reasons, it is highly recommended that you always
-	  # use absolute paths for naming shared libraries, and exclude the
-	  # DT_RUNPATH tag from executables and libraries.  But doing so
-	  # requires that you compile everything twice, which is a pain.
-	  if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
-	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
-	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
-	    _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
-	  else
-	    _LT_TAGVAR(ld_shlibs, $1)=no
-	  fi
-	;;
-      esac
-      ;;
-
-    sunos4*)
-      _LT_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-      wlarc=
-      _LT_TAGVAR(hardcode_direct, $1)=yes
-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
-
-    *)
-      if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
-	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
-      else
-	_LT_TAGVAR(ld_shlibs, $1)=no
-      fi
-      ;;
-    esac
-
-    if test no = "$_LT_TAGVAR(ld_shlibs, $1)"; then
-      runpath_var=
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
-      _LT_TAGVAR(export_dynamic_flag_spec, $1)=
-      _LT_TAGVAR(whole_archive_flag_spec, $1)=
-    fi
-  else
-    # PORTME fill in a description of your system's linker (not GNU ld)
-    case $host_os in
-    aix3*)
-      _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
-      _LT_TAGVAR(always_export_symbols, $1)=yes
-      _LT_TAGVAR(archive_expsym_cmds, $1)='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname'
-      # Note: this linker hardcodes the directories in LIBPATH if there
-      # are no directories specified by -L.
-      _LT_TAGVAR(hardcode_minus_L, $1)=yes
-      if test yes = "$GCC" && test -z "$lt_prog_compiler_static"; then
-	# Neither direct hardcoding nor static linking is supported with a
-	# broken collect2.
-	_LT_TAGVAR(hardcode_direct, $1)=unsupported
-      fi
-      ;;
-
-    aix[[4-9]]*)
-      if test ia64 = "$host_cpu"; then
-	# On IA64, the linker does run time linking by default, so we don't
-	# have to do anything special.
-	aix_use_runtimelinking=no
-	exp_sym_flag='-Bexport'
-	no_entry_flag=
-      else
-	# If we're using GNU nm, then we don't want the "-C" option.
-	# -C means demangle to GNU nm, but means don't demangle to AIX nm.
-	# Without the "-l" option, or with the "-B" option, AIX nm treats
-	# weak defined symbols like other global defined symbols, whereas
-	# GNU nm marks them as "W".
-	# While the 'weak' keyword is ignored in the Export File, we need
-	# it in the Import File for the 'aix-soname' feature, so we have
-	# to replace the "-B" option with "-P" for AIX nm.
-	if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
-	  _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { if (\$ 2 == "W") { print \$ 3 " weak" } else { print \$ 3 } } }'\'' | sort -u > $export_symbols'
-	else
-	  _LT_TAGVAR(export_symbols_cmds, $1)='`func_echo_all $NM | $SED -e '\''s/B\([[^B]]*\)$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "L") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && ([substr](\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols'
-	fi
-	aix_use_runtimelinking=no
-
-	# Test if we are trying to use run time linking or normal
-	# AIX style linking. If -brtl is somewhere in LDFLAGS, we
-	# have runtime linking enabled, and use it for executables.
-	# For shared libraries, we enable/disable runtime linking
-	# depending on the kind of the shared library created -
-	# when "with_aix_soname,aix_use_runtimelinking" is:
-	# "aix,no"   lib.a(lib.so.V) shared, rtl:no,  for executables
-	# "aix,yes"  lib.so          shared, rtl:yes, for executables
-	#            lib.a           static archive
-	# "both,no"  lib.so.V(shr.o) shared, rtl:yes
-	#            lib.a(lib.so.V) shared, rtl:no,  for executables
-	# "both,yes" lib.so.V(shr.o) shared, rtl:yes, for executables
-	#            lib.a(lib.so.V) shared, rtl:no
-	# "svr4,*"   lib.so.V(shr.o) shared, rtl:yes, for executables
-	#            lib.a           static archive
-	case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*)
-	  for ld_flag in $LDFLAGS; do
-	  if (test x-brtl = "x$ld_flag" || test x-Wl,-brtl = "x$ld_flag"); then
-	    aix_use_runtimelinking=yes
-	    break
-	  fi
-	  done
-	  if test svr4,no = "$with_aix_soname,$aix_use_runtimelinking"; then
-	    # With aix-soname=svr4, we create the lib.so.V shared archives only,
-	    # so we don't have lib.a shared libs to link our executables.
-	    # We have to force runtime linking in this case.
-	    aix_use_runtimelinking=yes
-	    LDFLAGS="$LDFLAGS -Wl,-brtl"
-	  fi
-	  ;;
-	esac
-
-	exp_sym_flag='-bexport'
-	no_entry_flag='-bnoentry'
-      fi
-
-      # When large executables or shared objects are built, AIX ld can
-      # have problems creating the table of contents.  If linking a library
-      # or program results in "error TOC overflow" add -mminimal-toc to
-      # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
-      # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
-
-      _LT_TAGVAR(archive_cmds, $1)=''
-      _LT_TAGVAR(hardcode_direct, $1)=yes
-      _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
-      _LT_TAGVAR(hardcode_libdir_separator, $1)=':'
-      _LT_TAGVAR(link_all_deplibs, $1)=yes
-      _LT_TAGVAR(file_list_spec, $1)='$wl-f,'
-      case $with_aix_soname,$aix_use_runtimelinking in
-      aix,*) ;; # traditional, no import file
-      svr4,* | *,yes) # use import file
-	# The Import File defines what to hardcode.
-	_LT_TAGVAR(hardcode_direct, $1)=no
-	_LT_TAGVAR(hardcode_direct_absolute, $1)=no
-	;;
-      esac
-
-      if test yes = "$GCC"; then
-	case $host_os in aix4.[[012]]|aix4.[[012]].*)
-	# We only want to do this on AIX 4.2 and lower, the check
-	# below for broken collect2 doesn't work under 4.3+
-	  collect2name=`$CC -print-prog-name=collect2`
-	  if test -f "$collect2name" &&
-	   strings "$collect2name" | $GREP resolve_lib_name >/dev/null
-	  then
-	  # We have reworked collect2
-	  :
-	  else
-	  # We have old collect2
-	  _LT_TAGVAR(hardcode_direct, $1)=unsupported
-	  # It fails to find uninstalled libraries when the uninstalled
-	  # path is not listed in the libpath.  Setting hardcode_minus_L
-	  # to unsupported forces relinking
-	  _LT_TAGVAR(hardcode_minus_L, $1)=yes
-	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-	  _LT_TAGVAR(hardcode_libdir_separator, $1)=
-	  fi
-	  ;;
-	esac
-	shared_flag='-shared'
-	if test yes = "$aix_use_runtimelinking"; then
-	  shared_flag="$shared_flag "'$wl-G'
-	fi
-	# Need to ensure runtime linking is disabled for the traditional
-	# shared library, or the linker may eventually find shared libraries
-	# /with/ Import File - we do not want to mix them.
-	shared_flag_aix='-shared'
-	shared_flag_svr4='-shared $wl-G'
-      else
-	# not using gcc
-	if test ia64 = "$host_cpu"; then
-	# VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
-	# chokes on -Wl,-G. The following line is correct:
-	  shared_flag='-G'
-	else
-	  if test yes = "$aix_use_runtimelinking"; then
-	    shared_flag='$wl-G'
-	  else
-	    shared_flag='$wl-bM:SRE'
-	  fi
-	  shared_flag_aix='$wl-bM:SRE'
-	  shared_flag_svr4='$wl-G'
-	fi
-      fi
-
-      _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-bexpall'
-      # It seems that -bexpall does not export symbols beginning with
-      # underscore (_), so it is better to generate a list of symbols to export.
-      _LT_TAGVAR(always_export_symbols, $1)=yes
-      if test aix,yes = "$with_aix_soname,$aix_use_runtimelinking"; then
-	# Warning - without using the other runtime loading flags (-brtl),
-	# -berok will link without error, but may produce a broken library.
-	_LT_TAGVAR(allow_undefined_flag, $1)='-berok'
-        # Determine the default libpath from the value encoded in an
-        # empty executable.
-        _LT_SYS_MODULE_PATH_AIX([$1])
-        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-blibpath:$libdir:'"$aix_libpath"
-        _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs $wl'$no_entry_flag' $compiler_flags `if test -n "$allow_undefined_flag"; then func_echo_all "$wl$allow_undefined_flag"; else :; fi` $wl'$exp_sym_flag:\$export_symbols' '$shared_flag
-      else
-	if test ia64 = "$host_cpu"; then
-	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-R $libdir:/usr/lib:/lib'
-	  _LT_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
-	  _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\$wl$no_entry_flag"' $compiler_flags $wl$allow_undefined_flag '"\$wl$exp_sym_flag:\$export_symbols"
-	else
-	 # Determine the default libpath from the value encoded in an
-	 # empty executable.
-	 _LT_SYS_MODULE_PATH_AIX([$1])
-	 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-blibpath:$libdir:'"$aix_libpath"
-	  # Warning - without using the other run time loading flags,
-	  # -berok will link without error, but may produce a broken library.
-	  _LT_TAGVAR(no_undefined_flag, $1)=' $wl-bernotok'
-	  _LT_TAGVAR(allow_undefined_flag, $1)=' $wl-berok'
-	  if test yes = "$with_gnu_ld"; then
-	    # We only use this code for GNU lds that support --whole-archive.
-	    _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive$convenience $wl--no-whole-archive'
-	  else
-	    # Exported symbols can be pulled into shared objects from archives
-	    _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
-	  fi
-	  _LT_TAGVAR(archive_cmds_need_lc, $1)=yes
-	  _LT_TAGVAR(archive_expsym_cmds, $1)='$RM -r $output_objdir/$realname.d~$MKDIR $output_objdir/$realname.d'
-	  # -brtl affects multiple linker settings, -berok does not and is overridden later
-	  compiler_flags_filtered='`func_echo_all "$compiler_flags " | $SED -e "s%-brtl\\([[, ]]\\)%-berok\\1%g"`'
-	  if test svr4 != "$with_aix_soname"; then
-	    # This is similar to how AIX traditionally builds its shared libraries.
-	    _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$CC '$shared_flag_aix' -o $output_objdir/$realname.d/$soname $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$realname.d/$soname'
-	  fi
-	  if test aix != "$with_aix_soname"; then
-	    _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$CC '$shared_flag_svr4' -o $output_objdir/$realname.d/$shared_archive_member_spec.o $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$STRIP -e $output_objdir/$realname.d/$shared_archive_member_spec.o~( func_echo_all "#! $soname($shared_archive_member_spec.o)"; if test shr_64 = "$shared_archive_member_spec"; then func_echo_all "# 64"; else func_echo_all "# 32"; fi; cat $export_symbols ) > $output_objdir/$realname.d/$shared_archive_member_spec.imp~$AR $AR_FLAGS $output_objdir/$soname $output_objdir/$realname.d/$shared_archive_member_spec.o $output_objdir/$realname.d/$shared_archive_member_spec.imp'
-	  else
-	    # used by -dlpreopen to get the symbols
-	    _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$MV  $output_objdir/$realname.d/$soname $output_objdir'
-	  fi
-	  _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$RM -r $output_objdir/$realname.d'
-	fi
-      fi
-      ;;
-
-    amigaos*)
-      case $host_cpu in
-      powerpc)
-            # see comment about AmigaOS4 .so support
-            _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
-            _LT_TAGVAR(archive_expsym_cmds, $1)=''
-        ;;
-      m68k)
-            _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
-            _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-            _LT_TAGVAR(hardcode_minus_L, $1)=yes
-        ;;
-      esac
-      ;;
-
-    bsdi[[45]]*)
-      _LT_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic
-      ;;
-
-    cygwin* | mingw* | pw32* | cegcc*)
-      # When not using gcc, we currently assume that we are using
-      # Microsoft Visual C++ or Intel C++ Compiler.
-      # hardcode_libdir_flag_spec is actually meaningless, as there is
-      # no search path for DLLs.
-      case $cc_basename in
-      cl* | icl*)
-	# Native MSVC or ICC
-	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
-	_LT_TAGVAR(allow_undefined_flag, $1)=unsupported
-	_LT_TAGVAR(always_export_symbols, $1)=yes
-	_LT_TAGVAR(file_list_spec, $1)='@'
-	# Tell ltmain to make .lib files, not .a files.
-	libext=lib
-	# Tell ltmain to make .dll files, not .so files.
-	shrext_cmds=.dll
-	# FIXME: Setting linknames here is a bad hack.
-	_LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~linknames='
-	_LT_TAGVAR(archive_expsym_cmds, $1)='if _LT_DLL_DEF_P([$export_symbols]); then
-            cp "$export_symbols" "$output_objdir/$soname.def";
-            echo "$tool_output_objdir$soname.def" > "$output_objdir/$soname.exp";
-          else
-            $SED -e '\''s/^/-link -EXPORT:/'\'' < $export_symbols > $output_objdir/$soname.exp;
-          fi~
-          $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
-          linknames='
-	# The linker will not automatically build a static lib if we build a DLL.
-	# _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
-	_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
-	_LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*'
-	_LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1,DATA/'\'' | $SED -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols'
-	# Don't use ranlib
-	_LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib'
-	_LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~
-          lt_tool_outputfile="@TOOL_OUTPUT@"~
-          case $lt_outputfile in
-            *.exe|*.EXE) ;;
-            *)
-              lt_outputfile=$lt_outputfile.exe
-              lt_tool_outputfile=$lt_tool_outputfile.exe
-              ;;
-          esac~
-          if test : != "$MANIFEST_TOOL" && test -f "$lt_outputfile.manifest"; then
-            $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
-            $RM "$lt_outputfile.manifest";
-          fi'
-	;;
-      *)
-	# Assume MSVC and ICC wrapper
-	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
-	_LT_TAGVAR(allow_undefined_flag, $1)=unsupported
-	# Tell ltmain to make .lib files, not .a files.
-	libext=lib
-	# Tell ltmain to make .dll files, not .so files.
-	shrext_cmds=.dll
-	# FIXME: Setting linknames here is a bad hack.
-	_LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
-	# The linker will automatically build a .lib file if we build a DLL.
-	_LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
-	# FIXME: Should let the user specify the lib program.
-	_LT_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs'
-	_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
-	;;
-      esac
-      ;;
-
-    darwin* | rhapsody*)
-      _LT_DARWIN_LINKER_FEATURES($1)
-      ;;
-
-    dgux*)
-      _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
-
-    # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
-    # support.  Future versions do this automatically, but an explicit c++rt0.o
-    # does not break anything, and helps significantly (at the cost of a little
-    # extra space).
-    freebsd2.2*)
-      _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o'
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-      _LT_TAGVAR(hardcode_direct, $1)=yes
-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
-
-    # Unfortunately, older versions of FreeBSD 2 do not have this feature.
-    freebsd2.*)
-      _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-      _LT_TAGVAR(hardcode_direct, $1)=yes
-      _LT_TAGVAR(hardcode_minus_L, $1)=yes
-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
-
-    # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
-    freebsd* | dragonfly*)
-      _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-      _LT_TAGVAR(hardcode_direct, $1)=yes
-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
-
-    hpux9*)
-      if test yes = "$GCC"; then
-	_LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared $pic_flag $wl+b $wl$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib'
-      else
-	_LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib'
-      fi
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl+b $wl$libdir'
-      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-      _LT_TAGVAR(hardcode_direct, $1)=yes
-
-      # hardcode_minus_L: Not really in the search PATH,
-      # but as the default location of the library.
-      _LT_TAGVAR(hardcode_minus_L, $1)=yes
-      _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E'
-      ;;
-
-    hpux10*)
-      if test yes,no = "$GCC,$with_gnu_ld"; then
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
-      else
-	_LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
-      fi
-      if test no = "$with_gnu_ld"; then
-	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl+b $wl$libdir'
-	_LT_TAGVAR(hardcode_libdir_separator, $1)=:
-	_LT_TAGVAR(hardcode_direct, $1)=yes
-	_LT_TAGVAR(hardcode_direct_absolute, $1)=yes
-	_LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E'
-	# hardcode_minus_L: Not really in the search PATH,
-	# but as the default location of the library.
-	_LT_TAGVAR(hardcode_minus_L, $1)=yes
-      fi
-      ;;
-
-    hpux11*)
-      if test yes,no = "$GCC,$with_gnu_ld"; then
-	case $host_cpu in
-	hppa*64*)
-	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared $wl+h $wl$soname -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	ia64*)
-	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $wl+h $wl$soname $wl+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	*)
-	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	esac
-      else
-	case $host_cpu in
-	hppa*64*)
-	  _LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	ia64*)
-	  _LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname $wl+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	*)
-	m4_if($1, [], [
-	  # Older versions of the 11.00 compiler do not understand -b yet
-	  # (HP92453-01 A.11.01.20 doesn't, HP92453-01 B.11.X.35175-35176.GP does)
-	  _LT_LINKER_OPTION([if $CC understands -b],
-	    _LT_TAGVAR(lt_cv_prog_compiler__b, $1), [-b],
-	    [_LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags'],
-	    [_LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'])],
-	  [_LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags'])
-	  ;;
-	esac
-      fi
-      if test no = "$with_gnu_ld"; then
-	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl+b $wl$libdir'
-	_LT_TAGVAR(hardcode_libdir_separator, $1)=:
-
-	case $host_cpu in
-	hppa*64*|ia64*)
-	  _LT_TAGVAR(hardcode_direct, $1)=no
-	  _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-	  ;;
-	*)
-	  _LT_TAGVAR(hardcode_direct, $1)=yes
-	  _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
-	  _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E'
-
-	  # hardcode_minus_L: Not really in the search PATH,
-	  # but as the default location of the library.
-	  _LT_TAGVAR(hardcode_minus_L, $1)=yes
-	  ;;
-	esac
-      fi
-      ;;
-
-    irix5* | irix6* | nonstopux*)
-      if test yes = "$GCC"; then
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib'
-	# Try to use the -exported_symbol ld option, if it does not
-	# work, assume that -exports_file does not work either and
-	# implicitly export all symbols.
-	# This should be the same for all languages, so no per-tag cache variable.
-	AC_CACHE_CHECK([whether the $host_os linker accepts -exported_symbol],
-	  [lt_cv_irix_exported_symbol],
-	  [save_LDFLAGS=$LDFLAGS
-	   LDFLAGS="$LDFLAGS -shared $wl-exported_symbol ${wl}foo $wl-update_registry $wl/dev/null"
-	   AC_LINK_IFELSE(
-	     [AC_LANG_SOURCE(
-	        [AC_LANG_CASE([C], [[int foo (void) { return 0; }]],
-			      [C++], [[int foo (void) { return 0; }]],
-			      [Fortran 77], [[
-      subroutine foo
-      end]],
-			      [Fortran], [[
-      subroutine foo
-      end]])])],
-	      [lt_cv_irix_exported_symbol=yes],
-	      [lt_cv_irix_exported_symbol=no])
-           LDFLAGS=$save_LDFLAGS])
-	if test yes = "$lt_cv_irix_exported_symbol"; then
-          _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations $wl-exports_file $wl$export_symbols -o $lib'
-	fi
-      else
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
-	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -exports_file $export_symbols -o $lib'
-      fi
-      _LT_TAGVAR(archive_cmds_need_lc, $1)='no'
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
-      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-      _LT_TAGVAR(inherit_rpath, $1)=yes
-      _LT_TAGVAR(link_all_deplibs, $1)=yes
-      ;;
-
-    linux*)
-      case $cc_basename in
-      tcc*)
-	# Fabrice Bellard et al's Tiny C Compiler
-	_LT_TAGVAR(ld_shlibs, $1)=yes
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-	;;
-      esac
-      ;;
-
-    netbsd*)
-      if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
-	_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
-      else
-	_LT_TAGVAR(archive_cmds, $1)='$LD -shared -o $lib $libobjs $deplibs $linker_flags'      # ELF
-      fi
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-      _LT_TAGVAR(hardcode_direct, $1)=yes
-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
-
-    newsos6)
-      _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      _LT_TAGVAR(hardcode_direct, $1)=yes
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
-      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
-
-    *nto* | *qnx*)
-      ;;
-
-    openbsd* | bitrig*)
-      if test -f /usr/libexec/ld.so; then
-	_LT_TAGVAR(hardcode_direct, $1)=yes
-	_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-	_LT_TAGVAR(hardcode_direct_absolute, $1)=yes
-	if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then
-	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-	  _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags $wl-retain-symbols-file,$export_symbols'
-	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir'
-	  _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E'
-	else
-	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir'
-	fi
-      else
-	_LT_TAGVAR(ld_shlibs, $1)=no
-      fi
-      ;;
-
-    os2*)
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-      _LT_TAGVAR(hardcode_minus_L, $1)=yes
-      _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
-      shrext_cmds=.dll
-      _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
-	$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
-	$ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
-	$ECHO EXPORTS >> $output_objdir/$libname.def~
-	emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~
-	$CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
-	emximp -o $lib $output_objdir/$libname.def'
-      _LT_TAGVAR(archive_expsym_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
-	$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
-	$ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
-	$ECHO EXPORTS >> $output_objdir/$libname.def~
-	prefix_cmds="$SED"~
-	if test EXPORTS = "`$SED 1q $export_symbols`"; then
-	  prefix_cmds="$prefix_cmds -e 1d";
-	fi~
-	prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~
-	cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~
-	$CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
-	emximp -o $lib $output_objdir/$libname.def'
-      _LT_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
-      _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
-      _LT_TAGVAR(file_list_spec, $1)='@'
-      ;;
-
-    osf3*)
-      if test yes = "$GCC"; then
-	_LT_TAGVAR(allow_undefined_flag, $1)=' $wl-expect_unresolved $wl\*'
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared$allow_undefined_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib'
-      else
-	_LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared$allow_undefined_flag $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
-      fi
-      _LT_TAGVAR(archive_cmds_need_lc, $1)='no'
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
-      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-      ;;
-
-    osf4* | osf5*)	# as osf3* with the addition of -msym flag
-      if test yes = "$GCC"; then
-	_LT_TAGVAR(allow_undefined_flag, $1)=' $wl-expect_unresolved $wl\*'
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared$allow_undefined_flag $pic_flag $libobjs $deplibs $compiler_flags $wl-msym $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib'
-	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
-      else
-	_LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared$allow_undefined_flag $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
-	_LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~
-          $CC -shared$allow_undefined_flag $wl-input $wl$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib~$RM $lib.exp'
-
-	# Both c and cxx compiler support -rpath directly
-	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
-      fi
-      _LT_TAGVAR(archive_cmds_need_lc, $1)='no'
-      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-      ;;
-
-    solaris*)
-      _LT_TAGVAR(no_undefined_flag, $1)=' -z defs'
-      if test yes = "$GCC"; then
-	wlarc='$wl'
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $wl-z ${wl}text $wl-h $wl$soname -o $lib $libobjs $deplibs $compiler_flags'
-	_LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-          $CC -shared $pic_flag $wl-z ${wl}text $wl-M $wl$lib.exp $wl-h $wl$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
-      else
-	case `$CC -V 2>&1` in
-	*"Compilers 5.0"*)
-	  wlarc=''
-	  _LT_TAGVAR(archive_cmds, $1)='$LD -G$allow_undefined_flag -h $soname -o $lib $libobjs $deplibs $linker_flags'
-	  _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-            $LD -G$allow_undefined_flag -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp'
-	  ;;
-	*)
-	  wlarc='$wl'
-	  _LT_TAGVAR(archive_cmds, $1)='$CC -G$allow_undefined_flag -h $soname -o $lib $libobjs $deplibs $compiler_flags'
-	  _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-            $CC -G$allow_undefined_flag -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
-	  ;;
-	esac
-      fi
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-      case $host_os in
-      solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
-      *)
-	# The compiler driver will combine and reorder linker options,
-	# but understands '-z linker_flag'.  GCC discards it without '$wl',
-	# but is careful enough not to reorder.
-	# Supported since Solaris 2.6 (maybe 2.5.1?)
-	if test yes = "$GCC"; then
-	  _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl-z ${wl}allextract$convenience $wl-z ${wl}defaultextract'
-	else
-	  _LT_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract'
-	fi
-	;;
-      esac
-      _LT_TAGVAR(link_all_deplibs, $1)=yes
-      ;;
-
-    sunos4*)
-      if test sequent = "$host_vendor"; then
-	# Use $CC to link under sequent, because it throws in some extra .o
-	# files that make .init and .fini sections work.
-	_LT_TAGVAR(archive_cmds, $1)='$CC -G $wl-h $soname -o $lib $libobjs $deplibs $compiler_flags'
-      else
-	_LT_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
-      fi
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-      _LT_TAGVAR(hardcode_direct, $1)=yes
-      _LT_TAGVAR(hardcode_minus_L, $1)=yes
-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
-
-    sysv4)
-      case $host_vendor in
-	sni)
-	  _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-	  _LT_TAGVAR(hardcode_direct, $1)=yes # is this really true???
-	;;
-	siemens)
-	  ## LD is ld it makes a PLAMLIB
-	  ## CC just makes a GrossModule.
-	  _LT_TAGVAR(archive_cmds, $1)='$LD -G -o $lib $libobjs $deplibs $linker_flags'
-	  _LT_TAGVAR(reload_cmds, $1)='$CC -r -o $output$reload_objs'
-	  _LT_TAGVAR(hardcode_direct, $1)=no
-        ;;
-	motorola)
-	  _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-	  _LT_TAGVAR(hardcode_direct, $1)=no #Motorola manual says yes, but my tests say they lie
-	;;
-      esac
-      runpath_var='LD_RUN_PATH'
-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
-
-    sysv4.3*)
-      _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-      _LT_TAGVAR(export_dynamic_flag_spec, $1)='-Bexport'
-      ;;
-
-    sysv4*MP*)
-      if test -d /usr/nec; then
-	_LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-	_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-	runpath_var=LD_RUN_PATH
-	hardcode_runpath_var=yes
-	_LT_TAGVAR(ld_shlibs, $1)=yes
-      fi
-      ;;
-
-    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*)
-      _LT_TAGVAR(no_undefined_flag, $1)='$wl-z,text'
-      _LT_TAGVAR(archive_cmds_need_lc, $1)=no
-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-      runpath_var='LD_RUN_PATH'
-
-      if test yes = "$GCC"; then
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-      else
-	_LT_TAGVAR(archive_cmds, $1)='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-      fi
-      ;;
-
-    sysv5* | sco3.2v5* | sco5v6*)
-      # Note: We CANNOT use -z defs as we might desire, because we do not
-      # link with -lc, and that would cause any symbols used from libc to
-      # always be unresolved, which means just about no library would
-      # ever link correctly.  If we're not using GNU ld we use -z text
-      # though, which does catch some bad symbols but isn't as heavy-handed
-      # as -z defs.
-      _LT_TAGVAR(no_undefined_flag, $1)='$wl-z,text'
-      _LT_TAGVAR(allow_undefined_flag, $1)='$wl-z,nodefs'
-      _LT_TAGVAR(archive_cmds_need_lc, $1)=no
-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-R,$libdir'
-      _LT_TAGVAR(hardcode_libdir_separator, $1)=':'
-      _LT_TAGVAR(link_all_deplibs, $1)=yes
-      _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-Bexport'
-      runpath_var='LD_RUN_PATH'
-
-      if test yes = "$GCC"; then
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-      else
-	_LT_TAGVAR(archive_cmds, $1)='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-      fi
-      ;;
-
-    uts4*)
-      _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
-
-    *)
-      _LT_TAGVAR(ld_shlibs, $1)=no
-      ;;
-    esac
-
-    if test sni = "$host_vendor"; then
-      case $host in
-      sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-	_LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-Blargedynsym'
-	;;
-      esac
-    fi
-  fi
-])
-AC_MSG_RESULT([$_LT_TAGVAR(ld_shlibs, $1)])
-test no = "$_LT_TAGVAR(ld_shlibs, $1)" && can_build_shared=no
-
-_LT_TAGVAR(with_gnu_ld, $1)=$with_gnu_ld
-
-_LT_DECL([], [libext], [0], [Old archive suffix (normally "a")])dnl
-_LT_DECL([], [shrext_cmds], [1], [Shared library suffix (normally ".so")])dnl
-_LT_DECL([], [extract_expsyms_cmds], [2],
-    [The commands to extract the exported symbol list from a shared archive])
-
-#
-# Do we need to explicitly link libc?
-#
-case "x$_LT_TAGVAR(archive_cmds_need_lc, $1)" in
-x|xyes)
-  # Assume -lc should be added
-  _LT_TAGVAR(archive_cmds_need_lc, $1)=yes
-
-  if test yes,yes = "$GCC,$enable_shared"; then
-    case $_LT_TAGVAR(archive_cmds, $1) in
-    *'~'*)
-      # FIXME: we may have to deal with multi-command sequences.
-      ;;
-    '$CC '*)
-      # Test whether the compiler implicitly links with -lc since on some
-      # systems, -lgcc has to come before -lc. If gcc already passes -lc
-      # to ld, don't add -lc before -lgcc.
-      AC_CACHE_CHECK([whether -lc should be explicitly linked in],
-	[lt_cv_]_LT_TAGVAR(archive_cmds_need_lc, $1),
-	[$RM conftest*
-	echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-
-	if AC_TRY_EVAL(ac_compile) 2>conftest.err; then
-	  soname=conftest
-	  lib=conftest
-	  libobjs=conftest.$ac_objext
-	  deplibs=
-	  wl=$_LT_TAGVAR(lt_prog_compiler_wl, $1)
-	  pic_flag=$_LT_TAGVAR(lt_prog_compiler_pic, $1)
-	  compiler_flags=-v
-	  linker_flags=-v
-	  verstring=
-	  output_objdir=.
-	  libname=conftest
-	  lt_save_allow_undefined_flag=$_LT_TAGVAR(allow_undefined_flag, $1)
-	  _LT_TAGVAR(allow_undefined_flag, $1)=
-	  if AC_TRY_EVAL(_LT_TAGVAR(archive_cmds, $1) 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1)
-	  then
-	    lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1)=no
-	  else
-	    lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1)=yes
-	  fi
-	  _LT_TAGVAR(allow_undefined_flag, $1)=$lt_save_allow_undefined_flag
-	else
-	  cat conftest.err 1>&5
-	fi
-	$RM conftest*
-	])
-      _LT_TAGVAR(archive_cmds_need_lc, $1)=$lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1)
-      ;;
-    esac
-  fi
-  ;;
-esac
-
-_LT_TAGDECL([build_libtool_need_lc], [archive_cmds_need_lc], [0],
-    [Whether or not to add -lc for building shared libraries])
-_LT_TAGDECL([allow_libtool_libs_with_static_runtimes],
-    [enable_shared_with_static_runtimes], [0],
-    [Whether or not to disallow shared libs when runtime libs are static])
-_LT_TAGDECL([], [export_dynamic_flag_spec], [1],
-    [Compiler flag to allow reflexive dlopens])
-_LT_TAGDECL([], [whole_archive_flag_spec], [1],
-    [Compiler flag to generate shared objects directly from archives])
-_LT_TAGDECL([], [compiler_needs_object], [1],
-    [Whether the compiler copes with passing no objects directly])
-_LT_TAGDECL([], [old_archive_from_new_cmds], [2],
-    [Create an old-style archive from a shared archive])
-_LT_TAGDECL([], [old_archive_from_expsyms_cmds], [2],
-    [Create a temporary old-style archive to link instead of a shared archive])
-_LT_TAGDECL([], [archive_cmds], [2], [Commands used to build a shared archive])
-_LT_TAGDECL([], [archive_expsym_cmds], [2])
-_LT_TAGDECL([], [module_cmds], [2],
-    [Commands used to build a loadable module if different from building
-    a shared archive.])
-_LT_TAGDECL([], [module_expsym_cmds], [2])
-_LT_TAGDECL([], [with_gnu_ld], [1],
-    [Whether we are building with GNU ld or not])
-_LT_TAGDECL([], [allow_undefined_flag], [1],
-    [Flag that allows shared libraries with undefined symbols to be built])
-_LT_TAGDECL([], [no_undefined_flag], [1],
-    [Flag that enforces no undefined symbols])
-_LT_TAGDECL([], [hardcode_libdir_flag_spec], [1],
-    [Flag to hardcode $libdir into a binary during linking.
-    This must work even if $libdir does not exist])
-_LT_TAGDECL([], [hardcode_libdir_separator], [1],
-    [Whether we need a single "-rpath" flag with a separated argument])
-_LT_TAGDECL([], [hardcode_direct], [0],
-    [Set to "yes" if using DIR/libNAME$shared_ext during linking hardcodes
-    DIR into the resulting binary])
-_LT_TAGDECL([], [hardcode_direct_absolute], [0],
-    [Set to "yes" if using DIR/libNAME$shared_ext during linking hardcodes
-    DIR into the resulting binary and the resulting library dependency is
-    "absolute", i.e impossible to change by setting $shlibpath_var if the
-    library is relocated])
-_LT_TAGDECL([], [hardcode_minus_L], [0],
-    [Set to "yes" if using the -LDIR flag during linking hardcodes DIR
-    into the resulting binary])
-_LT_TAGDECL([], [hardcode_shlibpath_var], [0],
-    [Set to "yes" if using SHLIBPATH_VAR=DIR during linking hardcodes DIR
-    into the resulting binary])
-_LT_TAGDECL([], [hardcode_automatic], [0],
-    [Set to "yes" if building a shared library automatically hardcodes DIR
-    into the library and all subsequent libraries and executables linked
-    against it])
-_LT_TAGDECL([], [inherit_rpath], [0],
-    [Set to yes if linker adds runtime paths of dependent libraries
-    to runtime path list])
-_LT_TAGDECL([], [link_all_deplibs], [0],
-    [Whether libtool must link a program against all its dependency libraries])
-_LT_TAGDECL([], [always_export_symbols], [0],
-    [Set to "yes" if exported symbols are required])
-_LT_TAGDECL([], [export_symbols_cmds], [2],
-    [The commands to list exported symbols])
-_LT_TAGDECL([], [exclude_expsyms], [1],
-    [Symbols that should not be listed in the preloaded symbols])
-_LT_TAGDECL([], [include_expsyms], [1],
-    [Symbols that must always be exported])
-_LT_TAGDECL([], [prelink_cmds], [2],
-    [Commands necessary for linking programs (against libraries) with templates])
-_LT_TAGDECL([], [postlink_cmds], [2],
-    [Commands necessary for finishing linking programs])
-_LT_TAGDECL([], [file_list_spec], [1],
-    [Specify filename containing input files])
-dnl FIXME: Not yet implemented
-dnl _LT_TAGDECL([], [thread_safe_flag_spec], [1],
-dnl    [Compiler flag to generate thread safe objects])
-])# _LT_LINKER_SHLIBS
-
-
-# _LT_LANG_C_CONFIG([TAG])
-# ------------------------
-# Ensure that the configuration variables for a C compiler are suitably
-# defined.  These variables are subsequently used by _LT_CONFIG to write
-# the compiler configuration to 'libtool'.
-m4_defun([_LT_LANG_C_CONFIG],
-[m4_require([_LT_DECL_EGREP])dnl
-lt_save_CC=$CC
-AC_LANG_PUSH(C)
-
-# Source file extension for C test sources.
-ac_ext=c
-
-# Object file extension for compiled C test sources.
-objext=o
-_LT_TAGVAR(objext, $1)=$objext
-
-# Code to be used in simple compile tests
-lt_simple_compile_test_code="int some_variable = 0;"
-
-# Code to be used in simple link tests
-lt_simple_link_test_code='int main(){return(0);}'
-
-_LT_TAG_COMPILER
-# Save the default compiler, since it gets overwritten when the other
-# tags are being tested, and _LT_TAGVAR(compiler, []) is a NOP.
-compiler_DEFAULT=$CC
-
-# save warnings/boilerplate of simple test code
-_LT_COMPILER_BOILERPLATE
-_LT_LINKER_BOILERPLATE
-
-if test -n "$compiler"; then
-  _LT_COMPILER_NO_RTTI($1)
-  _LT_COMPILER_PIC($1)
-  _LT_COMPILER_C_O($1)
-  _LT_COMPILER_FILE_LOCKS($1)
-  _LT_LINKER_SHLIBS($1)
-  _LT_SYS_DYNAMIC_LINKER($1)
-  _LT_LINKER_HARDCODE_LIBPATH($1)
-  LT_SYS_DLOPEN_SELF
-  _LT_CMD_STRIPLIB
-
-  # Report what library types will actually be built
-  AC_MSG_CHECKING([if libtool supports shared libraries])
-  AC_MSG_RESULT([$can_build_shared])
-
-  AC_MSG_CHECKING([whether to build shared libraries])
-  test no = "$can_build_shared" && enable_shared=no
-
-  # On AIX, shared libraries and static libraries use the same namespace, and
-  # are all built from PIC.
-  case $host_os in
-  aix3*)
-    test yes = "$enable_shared" && enable_static=no
-    if test -n "$RANLIB"; then
-      archive_cmds="$archive_cmds~\$RANLIB \$lib"
-      postinstall_cmds='$RANLIB $lib'
-    fi
-    ;;
-
-  aix[[4-9]]*)
-    if test ia64 != "$host_cpu"; then
-      case $enable_shared,$with_aix_soname,$aix_use_runtimelinking in
-      yes,aix,yes) ;;			# shared object as lib.so file only
-      yes,svr4,*) ;;			# shared object as lib.so archive member only
-      yes,*) enable_static=no ;;	# shared object in lib.a archive as well
-      esac
-    fi
-    ;;
-  esac
-  AC_MSG_RESULT([$enable_shared])
-
-  AC_MSG_CHECKING([whether to build static libraries])
-  # Make sure either enable_shared or enable_static is yes.
-  test yes = "$enable_shared" || enable_static=yes
-  AC_MSG_RESULT([$enable_static])
-
-  _LT_CONFIG($1)
-fi
-AC_LANG_POP
-CC=$lt_save_CC
-])# _LT_LANG_C_CONFIG
-
-
-# _LT_LANG_CXX_CONFIG([TAG])
-# --------------------------
-# Ensure that the configuration variables for a C++ compiler are suitably
-# defined.  These variables are subsequently used by _LT_CONFIG to write
-# the compiler configuration to 'libtool'.
-m4_defun([_LT_LANG_CXX_CONFIG],
-[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
-m4_require([_LT_DECL_EGREP])dnl
-m4_require([_LT_PATH_MANIFEST_TOOL])dnl
-if test -n "$CXX" && ( test no != "$CXX" &&
-    ( (test g++ = "$CXX" && `g++ -v >/dev/null 2>&1` ) ||
-    (test g++ != "$CXX"))); then
-  AC_PROG_CXXCPP
-else
-  _lt_caught_CXX_error=yes
-fi
-
-AC_LANG_PUSH(C++)
-_LT_TAGVAR(archive_cmds_need_lc, $1)=no
-_LT_TAGVAR(allow_undefined_flag, $1)=
-_LT_TAGVAR(always_export_symbols, $1)=no
-_LT_TAGVAR(archive_expsym_cmds, $1)=
-_LT_TAGVAR(compiler_needs_object, $1)=no
-_LT_TAGVAR(export_dynamic_flag_spec, $1)=
-_LT_TAGVAR(hardcode_direct, $1)=no
-_LT_TAGVAR(hardcode_direct_absolute, $1)=no
-_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
-_LT_TAGVAR(hardcode_libdir_separator, $1)=
-_LT_TAGVAR(hardcode_minus_L, $1)=no
-_LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
-_LT_TAGVAR(hardcode_automatic, $1)=no
-_LT_TAGVAR(inherit_rpath, $1)=no
-_LT_TAGVAR(module_cmds, $1)=
-_LT_TAGVAR(module_expsym_cmds, $1)=
-_LT_TAGVAR(link_all_deplibs, $1)=unknown
-_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
-_LT_TAGVAR(reload_flag, $1)=$reload_flag
-_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
-_LT_TAGVAR(no_undefined_flag, $1)=
-_LT_TAGVAR(whole_archive_flag_spec, $1)=
-_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
-
-# Source file extension for C++ test sources.
-ac_ext=cpp
-
-# Object file extension for compiled C++ test sources.
-objext=o
-_LT_TAGVAR(objext, $1)=$objext
-
-# No sense in running all these tests if we already determined that
-# the CXX compiler isn't working.  Some variables (like enable_shared)
-# are currently assumed to apply to all compilers on this platform,
-# and will be corrupted by setting them based on a non-working compiler.
-if test yes != "$_lt_caught_CXX_error"; then
-  # Code to be used in simple compile tests
-  lt_simple_compile_test_code="int some_variable = 0;"
-
-  # Code to be used in simple link tests
-  lt_simple_link_test_code='int main(int, char *[[]]) { return(0); }'
-
-  # ltmain only uses $CC for tagged configurations so make sure $CC is set.
-  _LT_TAG_COMPILER
-
-  # save warnings/boilerplate of simple test code
-  _LT_COMPILER_BOILERPLATE
-  _LT_LINKER_BOILERPLATE
-
-  # Allow CC to be a program name with arguments.
-  lt_save_CC=$CC
-  lt_save_CFLAGS=$CFLAGS
-  lt_save_LD=$LD
-  lt_save_GCC=$GCC
-  GCC=$GXX
-  lt_save_with_gnu_ld=$with_gnu_ld
-  lt_save_path_LD=$lt_cv_path_LD
-  if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then
-    lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx
-  else
-    $as_unset lt_cv_prog_gnu_ld
-  fi
-  if test -n "${lt_cv_path_LDCXX+set}"; then
-    lt_cv_path_LD=$lt_cv_path_LDCXX
-  else
-    $as_unset lt_cv_path_LD
-  fi
-  test -z "${LDCXX+set}" || LD=$LDCXX
-  CC=${CXX-"c++"}
-  CFLAGS=$CXXFLAGS
-  compiler=$CC
-  _LT_TAGVAR(compiler, $1)=$CC
-  _LT_CC_BASENAME([$compiler])
-
-  if test -n "$compiler"; then
-    # We don't want -fno-exception when compiling C++ code, so set the
-    # no_builtin_flag separately
-    if test yes = "$GXX"; then
-      _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin'
-    else
-      _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
-    fi
-
-    if test yes = "$GXX"; then
-      # Set up default GNU C++ configuration
-
-      LT_PATH_LD
-
-      # Check if GNU C++ uses GNU ld as the underlying linker, since the
-      # archiving commands below assume that GNU ld is being used.
-      if test yes = "$with_gnu_ld"; then
-        _LT_TAGVAR(archive_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib'
-        _LT_TAGVAR(archive_expsym_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
-
-        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
-        _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-dynamic'
-
-        # If archive_cmds runs LD, not CC, wlarc should be empty
-        # XXX I think wlarc can be eliminated in ltcf-cxx, but I need to
-        #     investigate it a little bit more. (MM)
-        wlarc='$wl'
-
-        # ancient GNU ld didn't support --whole-archive et. al.
-        if eval "`$CC -print-prog-name=ld` --help 2>&1" |
-	  $GREP 'no-whole-archive' > /dev/null; then
-          _LT_TAGVAR(whole_archive_flag_spec, $1)=$wlarc'--whole-archive$convenience '$wlarc'--no-whole-archive'
-        else
-          _LT_TAGVAR(whole_archive_flag_spec, $1)=
-        fi
-      else
-        with_gnu_ld=no
-        wlarc=
-
-        # A generic and very simple default shared library creation
-        # command for GNU C++ for the case where it uses the native
-        # linker, instead of GNU ld.  If possible, this setting should
-        # overridden to take advantage of the native linker features on
-        # the platform it is being used on.
-        _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
-      fi
-
-      # Commands to make compiler produce verbose output that lists
-      # what "hidden" libraries, object files and flags are used when
-      # linking a shared library.
-      output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
-
-    else
-      GXX=no
-      with_gnu_ld=no
-      wlarc=
-    fi
-
-    # PORTME: fill in a description of your system's C++ link characteristics
-    AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
-    _LT_TAGVAR(ld_shlibs, $1)=yes
-    case $host_os in
-      aix3*)
-        # FIXME: insert proper C++ library support
-        _LT_TAGVAR(ld_shlibs, $1)=no
-        ;;
-      aix[[4-9]]*)
-        if test ia64 = "$host_cpu"; then
-          # On IA64, the linker does run time linking by default, so we don't
-          # have to do anything special.
-          aix_use_runtimelinking=no
-          exp_sym_flag='-Bexport'
-          no_entry_flag=
-        else
-          aix_use_runtimelinking=no
-
-          # Test if we are trying to use run time linking or normal
-          # AIX style linking. If -brtl is somewhere in LDFLAGS, we
-          # have runtime linking enabled, and use it for executables.
-          # For shared libraries, we enable/disable runtime linking
-          # depending on the kind of the shared library created -
-          # when "with_aix_soname,aix_use_runtimelinking" is:
-          # "aix,no"   lib.a(lib.so.V) shared, rtl:no,  for executables
-          # "aix,yes"  lib.so          shared, rtl:yes, for executables
-          #            lib.a           static archive
-          # "both,no"  lib.so.V(shr.o) shared, rtl:yes
-          #            lib.a(lib.so.V) shared, rtl:no,  for executables
-          # "both,yes" lib.so.V(shr.o) shared, rtl:yes, for executables
-          #            lib.a(lib.so.V) shared, rtl:no
-          # "svr4,*"   lib.so.V(shr.o) shared, rtl:yes, for executables
-          #            lib.a           static archive
-          case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*)
-	    for ld_flag in $LDFLAGS; do
-	      case $ld_flag in
-	      *-brtl*)
-	        aix_use_runtimelinking=yes
-	        break
-	        ;;
-	      esac
-	    done
-	    if test svr4,no = "$with_aix_soname,$aix_use_runtimelinking"; then
-	      # With aix-soname=svr4, we create the lib.so.V shared archives only,
-	      # so we don't have lib.a shared libs to link our executables.
-	      # We have to force runtime linking in this case.
-	      aix_use_runtimelinking=yes
-	      LDFLAGS="$LDFLAGS -Wl,-brtl"
-	    fi
-	    ;;
-          esac
-
-          exp_sym_flag='-bexport'
-          no_entry_flag='-bnoentry'
-        fi
-
-        # When large executables or shared objects are built, AIX ld can
-        # have problems creating the table of contents.  If linking a library
-        # or program results in "error TOC overflow" add -mminimal-toc to
-        # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
-        # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
-
-        _LT_TAGVAR(archive_cmds, $1)=''
-        _LT_TAGVAR(hardcode_direct, $1)=yes
-        _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
-        _LT_TAGVAR(hardcode_libdir_separator, $1)=':'
-        _LT_TAGVAR(link_all_deplibs, $1)=yes
-        _LT_TAGVAR(file_list_spec, $1)='$wl-f,'
-        case $with_aix_soname,$aix_use_runtimelinking in
-        aix,*) ;;	# no import file
-        svr4,* | *,yes) # use import file
-          # The Import File defines what to hardcode.
-          _LT_TAGVAR(hardcode_direct, $1)=no
-          _LT_TAGVAR(hardcode_direct_absolute, $1)=no
-          ;;
-        esac
-
-        if test yes = "$GXX"; then
-          case $host_os in aix4.[[012]]|aix4.[[012]].*)
-          # We only want to do this on AIX 4.2 and lower, the check
-          # below for broken collect2 doesn't work under 4.3+
-	  collect2name=`$CC -print-prog-name=collect2`
-	  if test -f "$collect2name" &&
-	     strings "$collect2name" | $GREP resolve_lib_name >/dev/null
-	  then
-	    # We have reworked collect2
-	    :
-	  else
-	    # We have old collect2
-	    _LT_TAGVAR(hardcode_direct, $1)=unsupported
-	    # It fails to find uninstalled libraries when the uninstalled
-	    # path is not listed in the libpath.  Setting hardcode_minus_L
-	    # to unsupported forces relinking
-	    _LT_TAGVAR(hardcode_minus_L, $1)=yes
-	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-	    _LT_TAGVAR(hardcode_libdir_separator, $1)=
-	  fi
-          esac
-          shared_flag='-shared'
-	  if test yes = "$aix_use_runtimelinking"; then
-	    shared_flag=$shared_flag' $wl-G'
-	  fi
-	  # Need to ensure runtime linking is disabled for the traditional
-	  # shared library, or the linker may eventually find shared libraries
-	  # /with/ Import File - we do not want to mix them.
-	  shared_flag_aix='-shared'
-	  shared_flag_svr4='-shared $wl-G'
-        else
-          # not using gcc
-          if test ia64 = "$host_cpu"; then
-	  # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
-	  # chokes on -Wl,-G. The following line is correct:
-	  shared_flag='-G'
-          else
-	    if test yes = "$aix_use_runtimelinking"; then
-	      shared_flag='$wl-G'
-	    else
-	      shared_flag='$wl-bM:SRE'
-	    fi
-	    shared_flag_aix='$wl-bM:SRE'
-	    shared_flag_svr4='$wl-G'
-          fi
-        fi
-
-        _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-bexpall'
-        # It seems that -bexpall does not export symbols beginning with
-        # underscore (_), so it is better to generate a list of symbols to
-	# export.
-        _LT_TAGVAR(always_export_symbols, $1)=yes
-	if test aix,yes = "$with_aix_soname,$aix_use_runtimelinking"; then
-          # Warning - without using the other runtime loading flags (-brtl),
-          # -berok will link without error, but may produce a broken library.
-          # The "-G" linker flag allows undefined symbols.
-          _LT_TAGVAR(no_undefined_flag, $1)='-bernotok'
-          # Determine the default libpath from the value encoded in an empty
-          # executable.
-          _LT_SYS_MODULE_PATH_AIX([$1])
-          _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-blibpath:$libdir:'"$aix_libpath"
-
-          _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs $wl'$no_entry_flag' $compiler_flags `if test -n "$allow_undefined_flag"; then func_echo_all "$wl$allow_undefined_flag"; else :; fi` $wl'$exp_sym_flag:\$export_symbols' '$shared_flag
-        else
-          if test ia64 = "$host_cpu"; then
-	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-R $libdir:/usr/lib:/lib'
-	    _LT_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
-	    _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\$wl$no_entry_flag"' $compiler_flags $wl$allow_undefined_flag '"\$wl$exp_sym_flag:\$export_symbols"
-          else
-	    # Determine the default libpath from the value encoded in an
-	    # empty executable.
-	    _LT_SYS_MODULE_PATH_AIX([$1])
-	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-blibpath:$libdir:'"$aix_libpath"
-	    # Warning - without using the other run time loading flags,
-	    # -berok will link without error, but may produce a broken library.
-	    _LT_TAGVAR(no_undefined_flag, $1)=' $wl-bernotok'
-	    _LT_TAGVAR(allow_undefined_flag, $1)=' $wl-berok'
-	    if test yes = "$with_gnu_ld"; then
-	      # We only use this code for GNU lds that support --whole-archive.
-	      _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive$convenience $wl--no-whole-archive'
-	    else
-	      # Exported symbols can be pulled into shared objects from archives
-	      _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
-	    fi
-	    _LT_TAGVAR(archive_cmds_need_lc, $1)=yes
-	    _LT_TAGVAR(archive_expsym_cmds, $1)='$RM -r $output_objdir/$realname.d~$MKDIR $output_objdir/$realname.d'
-	    # -brtl affects multiple linker settings, -berok does not and is overridden later
-	    compiler_flags_filtered='`func_echo_all "$compiler_flags " | $SED -e "s%-brtl\\([[, ]]\\)%-berok\\1%g"`'
-	    if test svr4 != "$with_aix_soname"; then
-	      # This is similar to how AIX traditionally builds its shared
-	      # libraries. Need -bnortl late, we may have -brtl in LDFLAGS.
-	      _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$CC '$shared_flag_aix' -o $output_objdir/$realname.d/$soname $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$realname.d/$soname'
-	    fi
-	    if test aix != "$with_aix_soname"; then
-	      _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$CC '$shared_flag_svr4' -o $output_objdir/$realname.d/$shared_archive_member_spec.o $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$STRIP -e $output_objdir/$realname.d/$shared_archive_member_spec.o~( func_echo_all "#! $soname($shared_archive_member_spec.o)"; if test shr_64 = "$shared_archive_member_spec"; then func_echo_all "# 64"; else func_echo_all "# 32"; fi; cat $export_symbols ) > $output_objdir/$realname.d/$shared_archive_member_spec.imp~$AR $AR_FLAGS $output_objdir/$soname $output_objdir/$realname.d/$shared_archive_member_spec.o $output_objdir/$realname.d/$shared_archive_member_spec.imp'
-	    else
-	      # used by -dlpreopen to get the symbols
-	      _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$MV  $output_objdir/$realname.d/$soname $output_objdir'
-	    fi
-	    _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$RM -r $output_objdir/$realname.d'
-          fi
-        fi
-        ;;
-
-      beos*)
-	if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
-	  _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
-	  # Joseph Beckenbach <jrb3@best.com> says some releases of gcc
-	  # support --undefined.  This deserves some investigation.  FIXME
-	  _LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
-	else
-	  _LT_TAGVAR(ld_shlibs, $1)=no
-	fi
-	;;
-
-      chorus*)
-        case $cc_basename in
-          *)
-	  # FIXME: insert proper C++ library support
-	  _LT_TAGVAR(ld_shlibs, $1)=no
-	  ;;
-        esac
-        ;;
-
-      cygwin* | mingw* | pw32* | cegcc*)
-	case $GXX,$cc_basename in
-	,cl* | no,cl* | ,icl* | no,icl*)
-	  # Native MSVC or ICC
-	  # hardcode_libdir_flag_spec is actually meaningless, as there is
-	  # no search path for DLLs.
-	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
-	  _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
-	  _LT_TAGVAR(always_export_symbols, $1)=yes
-	  _LT_TAGVAR(file_list_spec, $1)='@'
-	  # Tell ltmain to make .lib files, not .a files.
-	  libext=lib
-	  # Tell ltmain to make .dll files, not .so files.
-	  shrext_cmds=.dll
-	  # FIXME: Setting linknames here is a bad hack.
-	  _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~linknames='
-	  _LT_TAGVAR(archive_expsym_cmds, $1)='if _LT_DLL_DEF_P([$export_symbols]); then
-              cp "$export_symbols" "$output_objdir/$soname.def";
-              echo "$tool_output_objdir$soname.def" > "$output_objdir/$soname.exp";
-            else
-              $SED -e '\''s/^/-link -EXPORT:/'\'' < $export_symbols > $output_objdir/$soname.exp;
-            fi~
-            $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
-            linknames='
-	  # The linker will not automatically build a static lib if we build a DLL.
-	  # _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
-	  _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
-	  # Don't use ranlib
-	  _LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib'
-	  _LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~
-            lt_tool_outputfile="@TOOL_OUTPUT@"~
-            case $lt_outputfile in
-              *.exe|*.EXE) ;;
-              *)
-                lt_outputfile=$lt_outputfile.exe
-                lt_tool_outputfile=$lt_tool_outputfile.exe
-                ;;
-            esac~
-            func_to_tool_file "$lt_outputfile"~
-            if test : != "$MANIFEST_TOOL" && test -f "$lt_outputfile.manifest"; then
-              $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
-              $RM "$lt_outputfile.manifest";
-            fi'
-	  ;;
-	*)
-	  # g++
-	  # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
-	  # as there is no search path for DLLs.
-	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-	  _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-all-symbols'
-	  _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
-	  _LT_TAGVAR(always_export_symbols, $1)=no
-	  _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
-
-	  if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
-	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-	    # If the export-symbols file already is a .def file, use it as
-	    # is; otherwise, prepend EXPORTS...
-	    _LT_TAGVAR(archive_expsym_cmds, $1)='if _LT_DLL_DEF_P([$export_symbols]); then
-              cp $export_symbols $output_objdir/$soname.def;
-            else
-              echo EXPORTS > $output_objdir/$soname.def;
-              cat $export_symbols >> $output_objdir/$soname.def;
-            fi~
-            $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-	  else
-	    _LT_TAGVAR(ld_shlibs, $1)=no
-	  fi
-	  ;;
-	esac
-	;;
-      darwin* | rhapsody*)
-        _LT_DARWIN_LINKER_FEATURES($1)
-	;;
-
-      os2*)
-	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-	_LT_TAGVAR(hardcode_minus_L, $1)=yes
-	_LT_TAGVAR(allow_undefined_flag, $1)=unsupported
-	shrext_cmds=.dll
-	_LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
-	  $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
-	  $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
-	  $ECHO EXPORTS >> $output_objdir/$libname.def~
-	  emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~
-	  $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
-	  emximp -o $lib $output_objdir/$libname.def'
-	_LT_TAGVAR(archive_expsym_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
-	  $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
-	  $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
-	  $ECHO EXPORTS >> $output_objdir/$libname.def~
-	  prefix_cmds="$SED"~
-	  if test EXPORTS = "`$SED 1q $export_symbols`"; then
-	    prefix_cmds="$prefix_cmds -e 1d";
-	  fi~
-	  prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~
-	  cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~
-	  $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
-	  emximp -o $lib $output_objdir/$libname.def'
-	_LT_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
-	_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
-	_LT_TAGVAR(file_list_spec, $1)='@'
-	;;
-
-      dgux*)
-        case $cc_basename in
-          ec++*)
-	    # FIXME: insert proper C++ library support
-	    _LT_TAGVAR(ld_shlibs, $1)=no
-	    ;;
-          ghcx*)
-	    # Green Hills C++ Compiler
-	    # FIXME: insert proper C++ library support
-	    _LT_TAGVAR(ld_shlibs, $1)=no
-	    ;;
-          *)
-	    # FIXME: insert proper C++ library support
-	    _LT_TAGVAR(ld_shlibs, $1)=no
-	    ;;
-        esac
-        ;;
-
-      freebsd2.*)
-        # C++ shared libraries reported to be fairly broken before
-	# switch to ELF
-        _LT_TAGVAR(ld_shlibs, $1)=no
-        ;;
-
-      freebsd-elf*)
-        _LT_TAGVAR(archive_cmds_need_lc, $1)=no
-        ;;
-
-      freebsd* | dragonfly*)
-        # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
-        # conventions
-        _LT_TAGVAR(ld_shlibs, $1)=yes
-        ;;
-
-      haiku*)
-        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
-        _LT_TAGVAR(link_all_deplibs, $1)=yes
-        ;;
-
-      hpux9*)
-        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl+b $wl$libdir'
-        _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-        _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E'
-        _LT_TAGVAR(hardcode_direct, $1)=yes
-        _LT_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH,
-				             # but as the default
-				             # location of the library.
-
-        case $cc_basename in
-          CC*)
-            # FIXME: insert proper C++ library support
-            _LT_TAGVAR(ld_shlibs, $1)=no
-            ;;
-          aCC*)
-            _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -b $wl+b $wl$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib'
-            # Commands to make compiler produce verbose output that lists
-            # what "hidden" libraries, object files and flags are used when
-            # linking a shared library.
-            #
-            # There doesn't appear to be a way to prevent this compiler from
-            # explicitly linking system object files so we need to strip them
-            # from the output so that they don't get included in the library
-            # dependencies.
-            output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
-            ;;
-          *)
-            if test yes = "$GXX"; then
-              _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -nostdlib $pic_flag $wl+b $wl$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib'
-            else
-              # FIXME: insert proper C++ library support
-              _LT_TAGVAR(ld_shlibs, $1)=no
-            fi
-            ;;
-        esac
-        ;;
-
-      hpux10*|hpux11*)
-        if test no = "$with_gnu_ld"; then
-	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl+b $wl$libdir'
-	  _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-
-          case $host_cpu in
-            hppa*64*|ia64*)
-              ;;
-            *)
-	      _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E'
-              ;;
-          esac
-        fi
-        case $host_cpu in
-          hppa*64*|ia64*)
-            _LT_TAGVAR(hardcode_direct, $1)=no
-            _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-            ;;
-          *)
-            _LT_TAGVAR(hardcode_direct, $1)=yes
-            _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
-            _LT_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH,
-					         # but as the default
-					         # location of the library.
-            ;;
-        esac
-
-        case $cc_basename in
-          CC*)
-	    # FIXME: insert proper C++ library support
-	    _LT_TAGVAR(ld_shlibs, $1)=no
-	    ;;
-          aCC*)
-	    case $host_cpu in
-	      hppa*64*)
-	        _LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-	        ;;
-	      ia64*)
-	        _LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname $wl+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-	        ;;
-	      *)
-	        _LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-	        ;;
-	    esac
-	    # Commands to make compiler produce verbose output that lists
-	    # what "hidden" libraries, object files and flags are used when
-	    # linking a shared library.
-	    #
-	    # There doesn't appear to be a way to prevent this compiler from
-	    # explicitly linking system object files so we need to strip them
-	    # from the output so that they don't get included in the library
-	    # dependencies.
-	    output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
-	    ;;
-          *)
-	    if test yes = "$GXX"; then
-	      if test no = "$with_gnu_ld"; then
-	        case $host_cpu in
-	          hppa*64*)
-	            _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC $wl+h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-	            ;;
-	          ia64*)
-	            _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag $wl+h $wl$soname $wl+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-	            ;;
-	          *)
-	            _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-	            ;;
-	        esac
-	      fi
-	    else
-	      # FIXME: insert proper C++ library support
-	      _LT_TAGVAR(ld_shlibs, $1)=no
-	    fi
-	    ;;
-        esac
-        ;;
-
-      interix[[3-9]]*)
-	_LT_TAGVAR(hardcode_direct, $1)=no
-	_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir'
-	_LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E'
-	# Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
-	# Instead, shared libraries are loaded at an image base (0x10000000 by
-	# default) and relocated if they conflict, which is a slow very memory
-	# consuming and fragmenting process.  To avoid this, we pick a random,
-	# 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
-	# time.  Moving up from 0x10000000 also allows more sbrk(2) space.
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
-	_LT_TAGVAR(archive_expsym_cmds, $1)='sed "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--retain-symbols-file,$output_objdir/$soname.expsym $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
-	;;
-      irix5* | irix6*)
-        case $cc_basename in
-          CC*)
-	    # SGI C++
-	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
-
-	    # Archives containing C++ object files must be created using
-	    # "CC -ar", where "CC" is the IRIX C++ compiler.  This is
-	    # necessary to make sure instantiated templates are included
-	    # in the archive.
-	    _LT_TAGVAR(old_archive_cmds, $1)='$CC -ar -WR,-u -o $oldlib $oldobjs'
-	    ;;
-          *)
-	    if test yes = "$GXX"; then
-	      if test no = "$with_gnu_ld"; then
-	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib'
-	      else
-	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` -o $lib'
-	      fi
-	    fi
-	    _LT_TAGVAR(link_all_deplibs, $1)=yes
-	    ;;
-        esac
-        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
-        _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-        _LT_TAGVAR(inherit_rpath, $1)=yes
-        ;;
-
-      linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
-        case $cc_basename in
-          KCC*)
-	    # Kuck and Associates, Inc. (KAI) C++ Compiler
-
-	    # KCC will only create a shared library if the output file
-	    # ends with ".so" (or ".sl" for HP-UX), so rename the library
-	    # to its proper name (with version) after linking.
-	    _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\$tempext\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
-	    _LT_TAGVAR(archive_expsym_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\$tempext\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib $wl-retain-symbols-file,$export_symbols; mv \$templib $lib'
-	    # Commands to make compiler produce verbose output that lists
-	    # what "hidden" libraries, object files and flags are used when
-	    # linking a shared library.
-	    #
-	    # There doesn't appear to be a way to prevent this compiler from
-	    # explicitly linking system object files so we need to strip them
-	    # from the output so that they don't get included in the library
-	    # dependencies.
-	    output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
-
-	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir'
-	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-dynamic'
-
-	    # Archives containing C++ object files must be created using
-	    # "CC -Bstatic", where "CC" is the KAI C++ compiler.
-	    _LT_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
-	    ;;
-	  icpc* | ecpc* )
-	    # Intel C++
-	    with_gnu_ld=yes
-	    # version 8.0 and above of icpc choke on multiply defined symbols
-	    # if we add $predep_objects and $postdep_objects, however 7.1 and
-	    # earlier do not add the objects themselves.
-	    case `$CC -V 2>&1` in
-	      *"Version 7."*)
-	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib'
-		_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
-		;;
-	      *)  # Version 8.0 or newer
-	        tmp_idyn=
-	        case $host_cpu in
-		  ia64*) tmp_idyn=' -i_dynamic';;
-		esac
-	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
-		_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
-		;;
-	    esac
-	    _LT_TAGVAR(archive_cmds_need_lc, $1)=no
-	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir'
-	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-dynamic'
-	    _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive$convenience $wl--no-whole-archive'
-	    ;;
-          pgCC* | pgcpp*)
-            # Portland Group C++ compiler
-	    case `$CC -V` in
-	    *pgCC\ [[1-5]].* | *pgcpp\ [[1-5]].*)
-	      _LT_TAGVAR(prelink_cmds, $1)='tpldir=Template.dir~
-               rm -rf $tpldir~
-               $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~
-               compile_command="$compile_command `find $tpldir -name \*.o | sort | $NL2SP`"'
-	      _LT_TAGVAR(old_archive_cmds, $1)='tpldir=Template.dir~
-                rm -rf $tpldir~
-                $CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~
-                $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $NL2SP`~
-                $RANLIB $oldlib'
-	      _LT_TAGVAR(archive_cmds, $1)='tpldir=Template.dir~
-                rm -rf $tpldir~
-                $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
-                $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib'
-	      _LT_TAGVAR(archive_expsym_cmds, $1)='tpldir=Template.dir~
-                rm -rf $tpldir~
-                $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
-                $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
-	      ;;
-	    *) # Version 6 and above use weak symbols
-	      _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib'
-	      _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
-	      ;;
-	    esac
-
-	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl--rpath $wl$libdir'
-	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-dynamic'
-	    _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
-            ;;
-	  cxx*)
-	    # Compaq C++
-	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib'
-	    _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname  -o $lib $wl-retain-symbols-file $wl$export_symbols'
-
-	    runpath_var=LD_RUN_PATH
-	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
-	    _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-
-	    # Commands to make compiler produce verbose output that lists
-	    # what "hidden" libraries, object files and flags are used when
-	    # linking a shared library.
-	    #
-	    # There doesn't appear to be a way to prevent this compiler from
-	    # explicitly linking system object files so we need to strip them
-	    # from the output so that they don't get included in the library
-	    # dependencies.
-	    output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "X$list" | $Xsed'
-	    ;;
-	  xl* | mpixl* | bgxl*)
-	    # IBM XL 8.0 on PPC, with GNU ld
-	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
-	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-dynamic'
-	    _LT_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
-	    if test yes = "$supports_anon_versioning"; then
-	      _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~
-                cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
-                echo "local: *; };" >> $output_objdir/$libname.ver~
-                $CC -qmkshrobj $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$output_objdir/$libname.ver -o $lib'
-	    fi
-	    ;;
-	  *)
-	    case `$CC -V 2>&1 | sed 5q` in
-	    *Sun\ C*)
-	      # Sun C++ 5.9
-	      _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs'
-	      _LT_TAGVAR(archive_cmds, $1)='$CC -G$allow_undefined_flag -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-	      _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G$allow_undefined_flag -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-retain-symbols-file $wl$export_symbols'
-	      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-	      _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
-	      _LT_TAGVAR(compiler_needs_object, $1)=yes
-
-	      # Not sure whether something based on
-	      # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1
-	      # would be better.
-	      output_verbose_link_cmd='func_echo_all'
-
-	      # Archives containing C++ object files must be created using
-	      # "CC -xar", where "CC" is the Sun C++ compiler.  This is
-	      # necessary to make sure instantiated templates are included
-	      # in the archive.
-	      _LT_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs'
-	      ;;
-	    esac
-	    ;;
-	esac
-	;;
-
-      lynxos*)
-        # FIXME: insert proper C++ library support
-	_LT_TAGVAR(ld_shlibs, $1)=no
-	;;
-
-      m88k*)
-        # FIXME: insert proper C++ library support
-        _LT_TAGVAR(ld_shlibs, $1)=no
-	;;
-
-      mvs*)
-        case $cc_basename in
-          cxx*)
-	    # FIXME: insert proper C++ library support
-	    _LT_TAGVAR(ld_shlibs, $1)=no
-	    ;;
-	  *)
-	    # FIXME: insert proper C++ library support
-	    _LT_TAGVAR(ld_shlibs, $1)=no
-	    ;;
-	esac
-	;;
-
-      netbsd*)
-        if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
-	  _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable  -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
-	  wlarc=
-	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-	  _LT_TAGVAR(hardcode_direct, $1)=yes
-	  _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-	fi
-	# Workaround some broken pre-1.5 toolchains
-	output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"'
-	;;
-
-      *nto* | *qnx*)
-        _LT_TAGVAR(ld_shlibs, $1)=yes
-	;;
-
-      openbsd* | bitrig*)
-	if test -f /usr/libexec/ld.so; then
-	  _LT_TAGVAR(hardcode_direct, $1)=yes
-	  _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-	  _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
-	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
-	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir'
-	  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`"; then
-	    _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-retain-symbols-file,$export_symbols -o $lib'
-	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E'
-	    _LT_TAGVAR(whole_archive_flag_spec, $1)=$wlarc'--whole-archive$convenience '$wlarc'--no-whole-archive'
-	  fi
-	  output_verbose_link_cmd=func_echo_all
-	else
-	  _LT_TAGVAR(ld_shlibs, $1)=no
-	fi
-	;;
-
-      osf3* | osf4* | osf5*)
-        case $cc_basename in
-          KCC*)
-	    # Kuck and Associates, Inc. (KAI) C++ Compiler
-
-	    # KCC will only create a shared library if the output file
-	    # ends with ".so" (or ".sl" for HP-UX), so rename the library
-	    # to its proper name (with version) after linking.
-	    _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo "$lib" | $SED -e "s/\$tempext\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
-
-	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir'
-	    _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-
-	    # Archives containing C++ object files must be created using
-	    # the KAI C++ compiler.
-	    case $host in
-	      osf3*) _LT_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs' ;;
-	      *) _LT_TAGVAR(old_archive_cmds, $1)='$CC -o $oldlib $oldobjs' ;;
-	    esac
-	    ;;
-          RCC*)
-	    # Rational C++ 2.4.1
-	    # FIXME: insert proper C++ library support
-	    _LT_TAGVAR(ld_shlibs, $1)=no
-	    ;;
-          cxx*)
-	    case $host in
-	      osf3*)
-	        _LT_TAGVAR(allow_undefined_flag, $1)=' $wl-expect_unresolved $wl\*'
-	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $soname `test -n "$verstring" && func_echo_all "$wl-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
-	        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
-		;;
-	      *)
-	        _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
-	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
-	        _LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~
-                  echo "-hidden">> $lib.exp~
-                  $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname $wl-input $wl$lib.exp  `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib~
-                  $RM $lib.exp'
-	        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
-		;;
-	    esac
-
-	    _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-
-	    # Commands to make compiler produce verbose output that lists
-	    # what "hidden" libraries, object files and flags are used when
-	    # linking a shared library.
-	    #
-	    # There doesn't appear to be a way to prevent this compiler from
-	    # explicitly linking system object files so we need to strip them
-	    # from the output so that they don't get included in the library
-	    # dependencies.
-	    output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
-	    ;;
-	  *)
-	    if test yes,no = "$GXX,$with_gnu_ld"; then
-	      _LT_TAGVAR(allow_undefined_flag, $1)=' $wl-expect_unresolved $wl\*'
-	      case $host in
-	        osf3*)
-	          _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib'
-		  ;;
-	        *)
-	          _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-msym $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib'
-		  ;;
-	      esac
-
-	      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
-	      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-
-	      # Commands to make compiler produce verbose output that lists
-	      # what "hidden" libraries, object files and flags are used when
-	      # linking a shared library.
-	      output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
-
-	    else
-	      # FIXME: insert proper C++ library support
-	      _LT_TAGVAR(ld_shlibs, $1)=no
-	    fi
-	    ;;
-        esac
-        ;;
-
-      psos*)
-        # FIXME: insert proper C++ library support
-        _LT_TAGVAR(ld_shlibs, $1)=no
-        ;;
-
-      sunos4*)
-        case $cc_basename in
-          CC*)
-	    # Sun C++ 4.x
-	    # FIXME: insert proper C++ library support
-	    _LT_TAGVAR(ld_shlibs, $1)=no
-	    ;;
-          lcc*)
-	    # Lucid
-	    # FIXME: insert proper C++ library support
-	    _LT_TAGVAR(ld_shlibs, $1)=no
-	    ;;
-          *)
-	    # FIXME: insert proper C++ library support
-	    _LT_TAGVAR(ld_shlibs, $1)=no
-	    ;;
-        esac
-        ;;
-
-      solaris*)
-        case $cc_basename in
-          CC* | sunCC*)
-	    # Sun C++ 4.2, 5.x and Centerline C++
-            _LT_TAGVAR(archive_cmds_need_lc,$1)=yes
-	    _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs'
-	    _LT_TAGVAR(archive_cmds, $1)='$CC -G$allow_undefined_flag -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-	    _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-              $CC -G$allow_undefined_flag $wl-M $wl$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
-
-	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-	    _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-	    case $host_os in
-	      solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
-	      *)
-		# The compiler driver will combine and reorder linker options,
-		# but understands '-z linker_flag'.
-	        # Supported since Solaris 2.6 (maybe 2.5.1?)
-		_LT_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract'
-	        ;;
-	    esac
-	    _LT_TAGVAR(link_all_deplibs, $1)=yes
-
-	    output_verbose_link_cmd='func_echo_all'
-
-	    # Archives containing C++ object files must be created using
-	    # "CC -xar", where "CC" is the Sun C++ compiler.  This is
-	    # necessary to make sure instantiated templates are included
-	    # in the archive.
-	    _LT_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs'
-	    ;;
-          gcx*)
-	    # Green Hills C++ Compiler
-	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-h $wl$soname -o $lib'
-
-	    # The C++ compiler must be used to create the archive.
-	    _LT_TAGVAR(old_archive_cmds, $1)='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
-	    ;;
-          *)
-	    # GNU C++ compiler with Solaris linker
-	    if test yes,no = "$GXX,$with_gnu_ld"; then
-	      _LT_TAGVAR(no_undefined_flag, $1)=' $wl-z ${wl}defs'
-	      if $CC --version | $GREP -v '^2\.7' > /dev/null; then
-	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-h $wl$soname -o $lib'
-	        _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-                  $CC -shared $pic_flag -nostdlib $wl-M $wl$lib.exp $wl-h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
-
-	        # Commands to make compiler produce verbose output that lists
-	        # what "hidden" libraries, object files and flags are used when
-	        # linking a shared library.
-	        output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
-	      else
-	        # g++ 2.7 appears to require '-G' NOT '-shared' on this
-	        # platform.
-	        _LT_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-h $wl$soname -o $lib'
-	        _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-                  $CC -G -nostdlib $wl-M $wl$lib.exp $wl-h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
-
-	        # Commands to make compiler produce verbose output that lists
-	        # what "hidden" libraries, object files and flags are used when
-	        # linking a shared library.
-	        output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
-	      fi
-
-	      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-R $wl$libdir'
-	      case $host_os in
-		solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
-		*)
-		  _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl-z ${wl}allextract$convenience $wl-z ${wl}defaultextract'
-		  ;;
-	      esac
-	    fi
-	    ;;
-        esac
-        ;;
-
-    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*)
-      _LT_TAGVAR(no_undefined_flag, $1)='$wl-z,text'
-      _LT_TAGVAR(archive_cmds_need_lc, $1)=no
-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-      runpath_var='LD_RUN_PATH'
-
-      case $cc_basename in
-        CC*)
-	  _LT_TAGVAR(archive_cmds, $1)='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	  _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	*)
-	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	  _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-      esac
-      ;;
-
-      sysv5* | sco3.2v5* | sco5v6*)
-	# Note: We CANNOT use -z defs as we might desire, because we do not
-	# link with -lc, and that would cause any symbols used from libc to
-	# always be unresolved, which means just about no library would
-	# ever link correctly.  If we're not using GNU ld we use -z text
-	# though, which does catch some bad symbols but isn't as heavy-handed
-	# as -z defs.
-	_LT_TAGVAR(no_undefined_flag, $1)='$wl-z,text'
-	_LT_TAGVAR(allow_undefined_flag, $1)='$wl-z,nodefs'
-	_LT_TAGVAR(archive_cmds_need_lc, $1)=no
-	_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-R,$libdir'
-	_LT_TAGVAR(hardcode_libdir_separator, $1)=':'
-	_LT_TAGVAR(link_all_deplibs, $1)=yes
-	_LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-Bexport'
-	runpath_var='LD_RUN_PATH'
-
-	case $cc_basename in
-          CC*)
-	    _LT_TAGVAR(archive_cmds, $1)='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	    _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	    _LT_TAGVAR(old_archive_cmds, $1)='$CC -Tprelink_objects $oldobjs~
-              '"$_LT_TAGVAR(old_archive_cmds, $1)"
-	    _LT_TAGVAR(reload_cmds, $1)='$CC -Tprelink_objects $reload_objs~
-              '"$_LT_TAGVAR(reload_cmds, $1)"
-	    ;;
-	  *)
-	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	    _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	    ;;
-	esac
-      ;;
-
-      tandem*)
-        case $cc_basename in
-          NCC*)
-	    # NonStop-UX NCC 3.20
-	    # FIXME: insert proper C++ library support
-	    _LT_TAGVAR(ld_shlibs, $1)=no
-	    ;;
-          *)
-	    # FIXME: insert proper C++ library support
-	    _LT_TAGVAR(ld_shlibs, $1)=no
-	    ;;
-        esac
-        ;;
-
-      vxworks*)
-        # FIXME: insert proper C++ library support
-        _LT_TAGVAR(ld_shlibs, $1)=no
-        ;;
-
-      *)
-        # FIXME: insert proper C++ library support
-        _LT_TAGVAR(ld_shlibs, $1)=no
-        ;;
-    esac
-
-    AC_MSG_RESULT([$_LT_TAGVAR(ld_shlibs, $1)])
-    test no = "$_LT_TAGVAR(ld_shlibs, $1)" && can_build_shared=no
-
-    _LT_TAGVAR(GCC, $1)=$GXX
-    _LT_TAGVAR(LD, $1)=$LD
-
-    ## CAVEAT EMPTOR:
-    ## There is no encapsulation within the following macros, do not change
-    ## the running order or otherwise move them around unless you know exactly
-    ## what you are doing...
-    _LT_SYS_HIDDEN_LIBDEPS($1)
-    _LT_COMPILER_PIC($1)
-    _LT_COMPILER_C_O($1)
-    _LT_COMPILER_FILE_LOCKS($1)
-    _LT_LINKER_SHLIBS($1)
-    _LT_SYS_DYNAMIC_LINKER($1)
-    _LT_LINKER_HARDCODE_LIBPATH($1)
-
-    _LT_CONFIG($1)
-  fi # test -n "$compiler"
-
-  CC=$lt_save_CC
-  CFLAGS=$lt_save_CFLAGS
-  LDCXX=$LD
-  LD=$lt_save_LD
-  GCC=$lt_save_GCC
-  with_gnu_ld=$lt_save_with_gnu_ld
-  lt_cv_path_LDCXX=$lt_cv_path_LD
-  lt_cv_path_LD=$lt_save_path_LD
-  lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld
-  lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld
-fi # test yes != "$_lt_caught_CXX_error"
-
-AC_LANG_POP
-])# _LT_LANG_CXX_CONFIG
-
-
-# _LT_FUNC_STRIPNAME_CNF
-# ----------------------
-# func_stripname_cnf prefix suffix name
-# strip PREFIX and SUFFIX off of NAME.
-# PREFIX and SUFFIX must not contain globbing or regex special
-# characters, hashes, percent signs, but SUFFIX may contain a leading
-# dot (in which case that matches only a dot).
-#
-# This function is identical to the (non-XSI) version of func_stripname,
-# except this one can be used by m4 code that may be executed by configure,
-# rather than the libtool script.
-m4_defun([_LT_FUNC_STRIPNAME_CNF],[dnl
-AC_REQUIRE([_LT_DECL_SED])
-AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])
-func_stripname_cnf ()
-{
-  case @S|@2 in
-  .*) func_stripname_result=`$ECHO "@S|@3" | $SED "s%^@S|@1%%; s%\\\\@S|@2\$%%"`;;
-  *)  func_stripname_result=`$ECHO "@S|@3" | $SED "s%^@S|@1%%; s%@S|@2\$%%"`;;
-  esac
-} # func_stripname_cnf
-])# _LT_FUNC_STRIPNAME_CNF
-
-
-# _LT_SYS_HIDDEN_LIBDEPS([TAGNAME])
-# ---------------------------------
-# Figure out "hidden" library dependencies from verbose
-# compiler output when linking a shared library.
-# Parse the compiler output and extract the necessary
-# objects, libraries and library flags.
-m4_defun([_LT_SYS_HIDDEN_LIBDEPS],
-[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
-AC_REQUIRE([_LT_FUNC_STRIPNAME_CNF])dnl
-# Dependencies to place before and after the object being linked:
-_LT_TAGVAR(predep_objects, $1)=
-_LT_TAGVAR(postdep_objects, $1)=
-_LT_TAGVAR(predeps, $1)=
-_LT_TAGVAR(postdeps, $1)=
-_LT_TAGVAR(compiler_lib_search_path, $1)=
-
-dnl we can't use the lt_simple_compile_test_code here,
-dnl because it contains code intended for an executable,
-dnl not a library.  It's possible we should let each
-dnl tag define a new lt_????_link_test_code variable,
-dnl but it's only used here...
-m4_if([$1], [], [cat > conftest.$ac_ext <<_LT_EOF
-int a;
-void foo (void) { a = 0; }
-_LT_EOF
-], [$1], [CXX], [cat > conftest.$ac_ext <<_LT_EOF
-class Foo
-{
-public:
-  Foo (void) { a = 0; }
-private:
-  int a;
-};
-_LT_EOF
-], [$1], [F77], [cat > conftest.$ac_ext <<_LT_EOF
-      subroutine foo
-      implicit none
-      integer*4 a
-      a=0
-      return
-      end
-_LT_EOF
-], [$1], [FC], [cat > conftest.$ac_ext <<_LT_EOF
-      subroutine foo
-      implicit none
-      integer a
-      a=0
-      return
-      end
-_LT_EOF
-], [$1], [GCJ], [cat > conftest.$ac_ext <<_LT_EOF
-public class foo {
-  private int a;
-  public void bar (void) {
-    a = 0;
-  }
-};
-_LT_EOF
-], [$1], [GO], [cat > conftest.$ac_ext <<_LT_EOF
-package foo
-func foo() {
-}
-_LT_EOF
-])
-
-_lt_libdeps_save_CFLAGS=$CFLAGS
-case "$CC $CFLAGS " in #(
-*\ -flto*\ *) CFLAGS="$CFLAGS -fno-lto" ;;
-*\ -fwhopr*\ *) CFLAGS="$CFLAGS -fno-whopr" ;;
-*\ -fuse-linker-plugin*\ *) CFLAGS="$CFLAGS -fno-use-linker-plugin" ;;
-esac
-
-dnl Parse the compiler output and extract the necessary
-dnl objects, libraries and library flags.
-if AC_TRY_EVAL(ac_compile); then
-  # Parse the compiler output and extract the necessary
-  # objects, libraries and library flags.
-
-  # Sentinel used to keep track of whether or not we are before
-  # the conftest object file.
-  pre_test_object_deps_done=no
-
-  for p in `eval "$output_verbose_link_cmd"`; do
-    case $prev$p in
-
-    -L* | -R* | -l*)
-       # Some compilers place space between "-{L,R}" and the path.
-       # Remove the space.
-       if test x-L = "$p" ||
-          test x-R = "$p"; then
-	 prev=$p
-	 continue
-       fi
-
-       # Expand the sysroot to ease extracting the directories later.
-       if test -z "$prev"; then
-         case $p in
-         -L*) func_stripname_cnf '-L' '' "$p"; prev=-L; p=$func_stripname_result ;;
-         -R*) func_stripname_cnf '-R' '' "$p"; prev=-R; p=$func_stripname_result ;;
-         -l*) func_stripname_cnf '-l' '' "$p"; prev=-l; p=$func_stripname_result ;;
-         esac
-       fi
-       case $p in
-       =*) func_stripname_cnf '=' '' "$p"; p=$lt_sysroot$func_stripname_result ;;
-       esac
-       if test no = "$pre_test_object_deps_done"; then
-	 case $prev in
-	 -L | -R)
-	   # Internal compiler library paths should come after those
-	   # provided the user.  The postdeps already come after the
-	   # user supplied libs so there is no need to process them.
-	   if test -z "$_LT_TAGVAR(compiler_lib_search_path, $1)"; then
-	     _LT_TAGVAR(compiler_lib_search_path, $1)=$prev$p
-	   else
-	     _LT_TAGVAR(compiler_lib_search_path, $1)="${_LT_TAGVAR(compiler_lib_search_path, $1)} $prev$p"
-	   fi
-	   ;;
-	 # The "-l" case would never come before the object being
-	 # linked, so don't bother handling this case.
-	 esac
-       else
-	 if test -z "$_LT_TAGVAR(postdeps, $1)"; then
-	   _LT_TAGVAR(postdeps, $1)=$prev$p
-	 else
-	   _LT_TAGVAR(postdeps, $1)="${_LT_TAGVAR(postdeps, $1)} $prev$p"
-	 fi
-       fi
-       prev=
-       ;;
-
-    *.lto.$objext) ;; # Ignore GCC LTO objects
-    *.$objext)
-       # This assumes that the test object file only shows up
-       # once in the compiler output.
-       if test "$p" = "conftest.$objext"; then
-	 pre_test_object_deps_done=yes
-	 continue
-       fi
-
-       if test no = "$pre_test_object_deps_done"; then
-	 if test -z "$_LT_TAGVAR(predep_objects, $1)"; then
-	   _LT_TAGVAR(predep_objects, $1)=$p
-	 else
-	   _LT_TAGVAR(predep_objects, $1)="$_LT_TAGVAR(predep_objects, $1) $p"
-	 fi
-       else
-	 if test -z "$_LT_TAGVAR(postdep_objects, $1)"; then
-	   _LT_TAGVAR(postdep_objects, $1)=$p
-	 else
-	   _LT_TAGVAR(postdep_objects, $1)="$_LT_TAGVAR(postdep_objects, $1) $p"
-	 fi
-       fi
-       ;;
-
-    *) ;; # Ignore the rest.
-
-    esac
-  done
-
-  # Clean up.
-  rm -f a.out a.exe
-else
-  echo "libtool.m4: error: problem compiling $1 test program"
-fi
-
-$RM -f confest.$objext
-CFLAGS=$_lt_libdeps_save_CFLAGS
-
-# PORTME: override above test on systems where it is broken
-m4_if([$1], [CXX],
-[case $host_os in
-interix[[3-9]]*)
-  # Interix 3.5 installs completely hosed .la files for C++, so rather than
-  # hack all around it, let's just trust "g++" to DTRT.
-  _LT_TAGVAR(predep_objects,$1)=
-  _LT_TAGVAR(postdep_objects,$1)=
-  _LT_TAGVAR(postdeps,$1)=
-  ;;
-esac
-])
-
-case " $_LT_TAGVAR(postdeps, $1) " in
-*" -lc "*) _LT_TAGVAR(archive_cmds_need_lc, $1)=no ;;
-esac
- _LT_TAGVAR(compiler_lib_search_dirs, $1)=
-if test -n "${_LT_TAGVAR(compiler_lib_search_path, $1)}"; then
- _LT_TAGVAR(compiler_lib_search_dirs, $1)=`echo " ${_LT_TAGVAR(compiler_lib_search_path, $1)}" | $SED -e 's! -L! !g' -e 's!^ !!'`
-fi
-_LT_TAGDECL([], [compiler_lib_search_dirs], [1],
-    [The directories searched by this compiler when creating a shared library])
-_LT_TAGDECL([], [predep_objects], [1],
-    [Dependencies to place before and after the objects being linked to
-    create a shared library])
-_LT_TAGDECL([], [postdep_objects], [1])
-_LT_TAGDECL([], [predeps], [1])
-_LT_TAGDECL([], [postdeps], [1])
-_LT_TAGDECL([], [compiler_lib_search_path], [1],
-    [The library search path used internally by the compiler when linking
-    a shared library])
-])# _LT_SYS_HIDDEN_LIBDEPS
-
-
-# _LT_LANG_F77_CONFIG([TAG])
-# --------------------------
-# Ensure that the configuration variables for a Fortran 77 compiler are
-# suitably defined.  These variables are subsequently used by _LT_CONFIG
-# to write the compiler configuration to 'libtool'.
-m4_defun([_LT_LANG_F77_CONFIG],
-[AC_LANG_PUSH(Fortran 77)
-if test -z "$F77" || test no = "$F77"; then
-  _lt_disable_F77=yes
-fi
-
-_LT_TAGVAR(archive_cmds_need_lc, $1)=no
-_LT_TAGVAR(allow_undefined_flag, $1)=
-_LT_TAGVAR(always_export_symbols, $1)=no
-_LT_TAGVAR(archive_expsym_cmds, $1)=
-_LT_TAGVAR(export_dynamic_flag_spec, $1)=
-_LT_TAGVAR(hardcode_direct, $1)=no
-_LT_TAGVAR(hardcode_direct_absolute, $1)=no
-_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
-_LT_TAGVAR(hardcode_libdir_separator, $1)=
-_LT_TAGVAR(hardcode_minus_L, $1)=no
-_LT_TAGVAR(hardcode_automatic, $1)=no
-_LT_TAGVAR(inherit_rpath, $1)=no
-_LT_TAGVAR(module_cmds, $1)=
-_LT_TAGVAR(module_expsym_cmds, $1)=
-_LT_TAGVAR(link_all_deplibs, $1)=unknown
-_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
-_LT_TAGVAR(reload_flag, $1)=$reload_flag
-_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
-_LT_TAGVAR(no_undefined_flag, $1)=
-_LT_TAGVAR(whole_archive_flag_spec, $1)=
-_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
-
-# Source file extension for f77 test sources.
-ac_ext=f
-
-# Object file extension for compiled f77 test sources.
-objext=o
-_LT_TAGVAR(objext, $1)=$objext
-
-# No sense in running all these tests if we already determined that
-# the F77 compiler isn't working.  Some variables (like enable_shared)
-# are currently assumed to apply to all compilers on this platform,
-# and will be corrupted by setting them based on a non-working compiler.
-if test yes != "$_lt_disable_F77"; then
-  # Code to be used in simple compile tests
-  lt_simple_compile_test_code="\
-      subroutine t
-      return
-      end
-"
-
-  # Code to be used in simple link tests
-  lt_simple_link_test_code="\
-      program t
-      end
-"
-
-  # ltmain only uses $CC for tagged configurations so make sure $CC is set.
-  _LT_TAG_COMPILER
-
-  # save warnings/boilerplate of simple test code
-  _LT_COMPILER_BOILERPLATE
-  _LT_LINKER_BOILERPLATE
-
-  # Allow CC to be a program name with arguments.
-  lt_save_CC=$CC
-  lt_save_GCC=$GCC
-  lt_save_CFLAGS=$CFLAGS
-  CC=${F77-"f77"}
-  CFLAGS=$FFLAGS
-  compiler=$CC
-  _LT_TAGVAR(compiler, $1)=$CC
-  _LT_CC_BASENAME([$compiler])
-  GCC=$G77
-  if test -n "$compiler"; then
-    AC_MSG_CHECKING([if libtool supports shared libraries])
-    AC_MSG_RESULT([$can_build_shared])
-
-    AC_MSG_CHECKING([whether to build shared libraries])
-    test no = "$can_build_shared" && enable_shared=no
-
-    # On AIX, shared libraries and static libraries use the same namespace, and
-    # are all built from PIC.
-    case $host_os in
-      aix3*)
-        test yes = "$enable_shared" && enable_static=no
-        if test -n "$RANLIB"; then
-          archive_cmds="$archive_cmds~\$RANLIB \$lib"
-          postinstall_cmds='$RANLIB $lib'
-        fi
-        ;;
-      aix[[4-9]]*)
-	if test ia64 != "$host_cpu"; then
-	  case $enable_shared,$with_aix_soname,$aix_use_runtimelinking in
-	  yes,aix,yes) ;;		# shared object as lib.so file only
-	  yes,svr4,*) ;;		# shared object as lib.so archive member only
-	  yes,*) enable_static=no ;;	# shared object in lib.a archive as well
-	  esac
-	fi
-        ;;
-    esac
-    AC_MSG_RESULT([$enable_shared])
-
-    AC_MSG_CHECKING([whether to build static libraries])
-    # Make sure either enable_shared or enable_static is yes.
-    test yes = "$enable_shared" || enable_static=yes
-    AC_MSG_RESULT([$enable_static])
-
-    _LT_TAGVAR(GCC, $1)=$G77
-    _LT_TAGVAR(LD, $1)=$LD
-
-    ## CAVEAT EMPTOR:
-    ## There is no encapsulation within the following macros, do not change
-    ## the running order or otherwise move them around unless you know exactly
-    ## what you are doing...
-    _LT_COMPILER_PIC($1)
-    _LT_COMPILER_C_O($1)
-    _LT_COMPILER_FILE_LOCKS($1)
-    _LT_LINKER_SHLIBS($1)
-    _LT_SYS_DYNAMIC_LINKER($1)
-    _LT_LINKER_HARDCODE_LIBPATH($1)
-
-    _LT_CONFIG($1)
-  fi # test -n "$compiler"
-
-  GCC=$lt_save_GCC
-  CC=$lt_save_CC
-  CFLAGS=$lt_save_CFLAGS
-fi # test yes != "$_lt_disable_F77"
-
-AC_LANG_POP
-])# _LT_LANG_F77_CONFIG
-
-
-# _LT_LANG_FC_CONFIG([TAG])
-# -------------------------
-# Ensure that the configuration variables for a Fortran compiler are
-# suitably defined.  These variables are subsequently used by _LT_CONFIG
-# to write the compiler configuration to 'libtool'.
-m4_defun([_LT_LANG_FC_CONFIG],
-[AC_LANG_PUSH(Fortran)
-
-if test -z "$FC" || test no = "$FC"; then
-  _lt_disable_FC=yes
-fi
-
-_LT_TAGVAR(archive_cmds_need_lc, $1)=no
-_LT_TAGVAR(allow_undefined_flag, $1)=
-_LT_TAGVAR(always_export_symbols, $1)=no
-_LT_TAGVAR(archive_expsym_cmds, $1)=
-_LT_TAGVAR(export_dynamic_flag_spec, $1)=
-_LT_TAGVAR(hardcode_direct, $1)=no
-_LT_TAGVAR(hardcode_direct_absolute, $1)=no
-_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
-_LT_TAGVAR(hardcode_libdir_separator, $1)=
-_LT_TAGVAR(hardcode_minus_L, $1)=no
-_LT_TAGVAR(hardcode_automatic, $1)=no
-_LT_TAGVAR(inherit_rpath, $1)=no
-_LT_TAGVAR(module_cmds, $1)=
-_LT_TAGVAR(module_expsym_cmds, $1)=
-_LT_TAGVAR(link_all_deplibs, $1)=unknown
-_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
-_LT_TAGVAR(reload_flag, $1)=$reload_flag
-_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
-_LT_TAGVAR(no_undefined_flag, $1)=
-_LT_TAGVAR(whole_archive_flag_spec, $1)=
-_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
-
-# Source file extension for fc test sources.
-ac_ext=${ac_fc_srcext-f}
-
-# Object file extension for compiled fc test sources.
-objext=o
-_LT_TAGVAR(objext, $1)=$objext
-
-# No sense in running all these tests if we already determined that
-# the FC compiler isn't working.  Some variables (like enable_shared)
-# are currently assumed to apply to all compilers on this platform,
-# and will be corrupted by setting them based on a non-working compiler.
-if test yes != "$_lt_disable_FC"; then
-  # Code to be used in simple compile tests
-  lt_simple_compile_test_code="\
-      subroutine t
-      return
-      end
-"
-
-  # Code to be used in simple link tests
-  lt_simple_link_test_code="\
-      program t
-      end
-"
-
-  # ltmain only uses $CC for tagged configurations so make sure $CC is set.
-  _LT_TAG_COMPILER
-
-  # save warnings/boilerplate of simple test code
-  _LT_COMPILER_BOILERPLATE
-  _LT_LINKER_BOILERPLATE
-
-  # Allow CC to be a program name with arguments.
-  lt_save_CC=$CC
-  lt_save_GCC=$GCC
-  lt_save_CFLAGS=$CFLAGS
-  CC=${FC-"f95"}
-  CFLAGS=$FCFLAGS
-  compiler=$CC
-  GCC=$ac_cv_fc_compiler_gnu
-
-  _LT_TAGVAR(compiler, $1)=$CC
-  _LT_CC_BASENAME([$compiler])
-
-  if test -n "$compiler"; then
-    AC_MSG_CHECKING([if libtool supports shared libraries])
-    AC_MSG_RESULT([$can_build_shared])
-
-    AC_MSG_CHECKING([whether to build shared libraries])
-    test no = "$can_build_shared" && enable_shared=no
-
-    # On AIX, shared libraries and static libraries use the same namespace, and
-    # are all built from PIC.
-    case $host_os in
-      aix3*)
-        test yes = "$enable_shared" && enable_static=no
-        if test -n "$RANLIB"; then
-          archive_cmds="$archive_cmds~\$RANLIB \$lib"
-          postinstall_cmds='$RANLIB $lib'
-        fi
-        ;;
-      aix[[4-9]]*)
-	if test ia64 != "$host_cpu"; then
-	  case $enable_shared,$with_aix_soname,$aix_use_runtimelinking in
-	  yes,aix,yes) ;;		# shared object as lib.so file only
-	  yes,svr4,*) ;;		# shared object as lib.so archive member only
-	  yes,*) enable_static=no ;;	# shared object in lib.a archive as well
-	  esac
-	fi
-        ;;
-    esac
-    AC_MSG_RESULT([$enable_shared])
-
-    AC_MSG_CHECKING([whether to build static libraries])
-    # Make sure either enable_shared or enable_static is yes.
-    test yes = "$enable_shared" || enable_static=yes
-    AC_MSG_RESULT([$enable_static])
-
-    _LT_TAGVAR(GCC, $1)=$ac_cv_fc_compiler_gnu
-    _LT_TAGVAR(LD, $1)=$LD
-
-    ## CAVEAT EMPTOR:
-    ## There is no encapsulation within the following macros, do not change
-    ## the running order or otherwise move them around unless you know exactly
-    ## what you are doing...
-    _LT_SYS_HIDDEN_LIBDEPS($1)
-    _LT_COMPILER_PIC($1)
-    _LT_COMPILER_C_O($1)
-    _LT_COMPILER_FILE_LOCKS($1)
-    _LT_LINKER_SHLIBS($1)
-    _LT_SYS_DYNAMIC_LINKER($1)
-    _LT_LINKER_HARDCODE_LIBPATH($1)
-
-    _LT_CONFIG($1)
-  fi # test -n "$compiler"
-
-  GCC=$lt_save_GCC
-  CC=$lt_save_CC
-  CFLAGS=$lt_save_CFLAGS
-fi # test yes != "$_lt_disable_FC"
-
-AC_LANG_POP
-])# _LT_LANG_FC_CONFIG
-
-
-# _LT_LANG_GCJ_CONFIG([TAG])
-# --------------------------
-# Ensure that the configuration variables for the GNU Java Compiler compiler
-# are suitably defined.  These variables are subsequently used by _LT_CONFIG
-# to write the compiler configuration to 'libtool'.
-m4_defun([_LT_LANG_GCJ_CONFIG],
-[AC_REQUIRE([LT_PROG_GCJ])dnl
-AC_LANG_SAVE
-
-# Source file extension for Java test sources.
-ac_ext=java
-
-# Object file extension for compiled Java test sources.
-objext=o
-_LT_TAGVAR(objext, $1)=$objext
-
-# Code to be used in simple compile tests
-lt_simple_compile_test_code="class foo {}"
-
-# Code to be used in simple link tests
-lt_simple_link_test_code='public class conftest { public static void main(String[[]] argv) {}; }'
-
-# ltmain only uses $CC for tagged configurations so make sure $CC is set.
-_LT_TAG_COMPILER
-
-# save warnings/boilerplate of simple test code
-_LT_COMPILER_BOILERPLATE
-_LT_LINKER_BOILERPLATE
-
-# Allow CC to be a program name with arguments.
-lt_save_CC=$CC
-lt_save_CFLAGS=$CFLAGS
-lt_save_GCC=$GCC
-GCC=yes
-CC=${GCJ-"gcj"}
-CFLAGS=$GCJFLAGS
-compiler=$CC
-_LT_TAGVAR(compiler, $1)=$CC
-_LT_TAGVAR(LD, $1)=$LD
-_LT_CC_BASENAME([$compiler])
-
-# GCJ did not exist at the time GCC didn't implicitly link libc in.
-_LT_TAGVAR(archive_cmds_need_lc, $1)=no
-
-_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
-_LT_TAGVAR(reload_flag, $1)=$reload_flag
-_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
-
-if test -n "$compiler"; then
-  _LT_COMPILER_NO_RTTI($1)
-  _LT_COMPILER_PIC($1)
-  _LT_COMPILER_C_O($1)
-  _LT_COMPILER_FILE_LOCKS($1)
-  _LT_LINKER_SHLIBS($1)
-  _LT_LINKER_HARDCODE_LIBPATH($1)
-
-  _LT_CONFIG($1)
-fi
-
-AC_LANG_RESTORE
-
-GCC=$lt_save_GCC
-CC=$lt_save_CC
-CFLAGS=$lt_save_CFLAGS
-])# _LT_LANG_GCJ_CONFIG
-
-
-# _LT_LANG_GO_CONFIG([TAG])
-# --------------------------
-# Ensure that the configuration variables for the GNU Go compiler
-# are suitably defined.  These variables are subsequently used by _LT_CONFIG
-# to write the compiler configuration to 'libtool'.
-m4_defun([_LT_LANG_GO_CONFIG],
-[AC_REQUIRE([LT_PROG_GO])dnl
-AC_LANG_SAVE
-
-# Source file extension for Go test sources.
-ac_ext=go
-
-# Object file extension for compiled Go test sources.
-objext=o
-_LT_TAGVAR(objext, $1)=$objext
-
-# Code to be used in simple compile tests
-lt_simple_compile_test_code="package main; func main() { }"
-
-# Code to be used in simple link tests
-lt_simple_link_test_code='package main; func main() { }'
-
-# ltmain only uses $CC for tagged configurations so make sure $CC is set.
-_LT_TAG_COMPILER
-
-# save warnings/boilerplate of simple test code
-_LT_COMPILER_BOILERPLATE
-_LT_LINKER_BOILERPLATE
-
-# Allow CC to be a program name with arguments.
-lt_save_CC=$CC
-lt_save_CFLAGS=$CFLAGS
-lt_save_GCC=$GCC
-GCC=yes
-CC=${GOC-"gccgo"}
-CFLAGS=$GOFLAGS
-compiler=$CC
-_LT_TAGVAR(compiler, $1)=$CC
-_LT_TAGVAR(LD, $1)=$LD
-_LT_CC_BASENAME([$compiler])
-
-# Go did not exist at the time GCC didn't implicitly link libc in.
-_LT_TAGVAR(archive_cmds_need_lc, $1)=no
-
-_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
-_LT_TAGVAR(reload_flag, $1)=$reload_flag
-_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
-
-if test -n "$compiler"; then
-  _LT_COMPILER_NO_RTTI($1)
-  _LT_COMPILER_PIC($1)
-  _LT_COMPILER_C_O($1)
-  _LT_COMPILER_FILE_LOCKS($1)
-  _LT_LINKER_SHLIBS($1)
-  _LT_LINKER_HARDCODE_LIBPATH($1)
-
-  _LT_CONFIG($1)
-fi
-
-AC_LANG_RESTORE
-
-GCC=$lt_save_GCC
-CC=$lt_save_CC
-CFLAGS=$lt_save_CFLAGS
-])# _LT_LANG_GO_CONFIG
-
-
-# _LT_LANG_RC_CONFIG([TAG])
-# -------------------------
-# Ensure that the configuration variables for the Windows resource compiler
-# are suitably defined.  These variables are subsequently used by _LT_CONFIG
-# to write the compiler configuration to 'libtool'.
-m4_defun([_LT_LANG_RC_CONFIG],
-[AC_REQUIRE([LT_PROG_RC])dnl
-AC_LANG_SAVE
-
-# Source file extension for RC test sources.
-ac_ext=rc
-
-# Object file extension for compiled RC test sources.
-objext=o
-_LT_TAGVAR(objext, $1)=$objext
-
-# Code to be used in simple compile tests
-lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }'
-
-# Code to be used in simple link tests
-lt_simple_link_test_code=$lt_simple_compile_test_code
-
-# ltmain only uses $CC for tagged configurations so make sure $CC is set.
-_LT_TAG_COMPILER
-
-# save warnings/boilerplate of simple test code
-_LT_COMPILER_BOILERPLATE
-_LT_LINKER_BOILERPLATE
-
-# Allow CC to be a program name with arguments.
-lt_save_CC=$CC
-lt_save_CFLAGS=$CFLAGS
-lt_save_GCC=$GCC
-GCC=
-CC=${RC-"windres"}
-CFLAGS=
-compiler=$CC
-_LT_TAGVAR(compiler, $1)=$CC
-_LT_CC_BASENAME([$compiler])
-_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
-
-if test -n "$compiler"; then
-  :
-  _LT_CONFIG($1)
-fi
-
-GCC=$lt_save_GCC
-AC_LANG_RESTORE
-CC=$lt_save_CC
-CFLAGS=$lt_save_CFLAGS
-])# _LT_LANG_RC_CONFIG
-
-
-# LT_PROG_GCJ
-# -----------
-AC_DEFUN([LT_PROG_GCJ],
-[m4_ifdef([AC_PROG_GCJ], [AC_PROG_GCJ],
-  [m4_ifdef([A][M_PROG_GCJ], [A][M_PROG_GCJ],
-    [AC_CHECK_TOOL(GCJ, gcj,)
-      test set = "${GCJFLAGS+set}" || GCJFLAGS="-g -O2"
-      AC_SUBST(GCJFLAGS)])])[]dnl
-])
-
-# Old name:
-AU_ALIAS([LT_AC_PROG_GCJ], [LT_PROG_GCJ])
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([LT_AC_PROG_GCJ], [])
-
-
-# LT_PROG_GO
-# ----------
-AC_DEFUN([LT_PROG_GO],
-[AC_CHECK_TOOL(GOC, gccgo,)
-])
-
-
-# LT_PROG_RC
-# ----------
-AC_DEFUN([LT_PROG_RC],
-[AC_CHECK_TOOL(RC, windres,)
-])
-
-# Old name:
-AU_ALIAS([LT_AC_PROG_RC], [LT_PROG_RC])
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([LT_AC_PROG_RC], [])
-
-
-# _LT_DECL_EGREP
-# --------------
-# If we don't have a new enough Autoconf to choose the best grep
-# available, choose the one first in the user's PATH.
-m4_defun([_LT_DECL_EGREP],
-[AC_REQUIRE([AC_PROG_EGREP])dnl
-AC_REQUIRE([AC_PROG_FGREP])dnl
-test -z "$GREP" && GREP=grep
-_LT_DECL([], [GREP], [1], [A grep program that handles long lines])
-_LT_DECL([], [EGREP], [1], [An ERE matcher])
-_LT_DECL([], [FGREP], [1], [A literal string matcher])
-dnl Non-bleeding-edge autoconf doesn't subst GREP, so do it here too
-AC_SUBST([GREP])
-])
-
-
-# _LT_DECL_OBJDUMP
-# --------------
-# If we don't have a new enough Autoconf to choose the best objdump
-# available, choose the one first in the user's PATH.
-m4_defun([_LT_DECL_OBJDUMP],
-[AC_CHECK_TOOL(OBJDUMP, objdump, false)
-test -z "$OBJDUMP" && OBJDUMP=objdump
-_LT_DECL([], [OBJDUMP], [1], [An object symbol dumper])
-AC_SUBST([OBJDUMP])
-])
-
-# _LT_DECL_DLLTOOL
-# ----------------
-# Ensure DLLTOOL variable is set.
-m4_defun([_LT_DECL_DLLTOOL],
-[AC_CHECK_TOOL(DLLTOOL, dlltool, false)
-test -z "$DLLTOOL" && DLLTOOL=dlltool
-_LT_DECL([], [DLLTOOL], [1], [DLL creation program])
-AC_SUBST([DLLTOOL])
-])
-
-# _LT_DECL_SED
-# ------------
-# Check for a fully-functional sed program, that truncates
-# as few characters as possible.  Prefer GNU sed if found.
-m4_defun([_LT_DECL_SED],
-[AC_PROG_SED
-test -z "$SED" && SED=sed
-Xsed="$SED -e 1s/^X//"
-_LT_DECL([], [SED], [1], [A sed program that does not truncate output])
-_LT_DECL([], [Xsed], ["\$SED -e 1s/^X//"],
-    [Sed that helps us avoid accidentally triggering echo(1) options like -n])
-])# _LT_DECL_SED
-
-m4_ifndef([AC_PROG_SED], [
-# NOTE: This macro has been submitted for inclusion into   #
-#  GNU Autoconf as AC_PROG_SED.  When it is available in   #
-#  a released version of Autoconf we should remove this    #
-#  macro and use it instead.                               #
-
-m4_defun([AC_PROG_SED],
-[AC_MSG_CHECKING([for a sed that does not truncate output])
-AC_CACHE_VAL(lt_cv_path_SED,
-[# Loop through the user's path and test for sed and gsed.
-# Then use that list of sed's as ones to test for truncation.
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for lt_ac_prog in sed gsed; do
-    for ac_exec_ext in '' $ac_executable_extensions; do
-      if $as_executable_p "$as_dir/$lt_ac_prog$ac_exec_ext"; then
-        lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext"
-      fi
-    done
-  done
-done
-IFS=$as_save_IFS
-lt_ac_max=0
-lt_ac_count=0
-# Add /usr/xpg4/bin/sed as it is typically found on Solaris
-# along with /bin/sed that truncates output.
-for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do
-  test ! -f "$lt_ac_sed" && continue
-  cat /dev/null > conftest.in
-  lt_ac_count=0
-  echo $ECHO_N "0123456789$ECHO_C" >conftest.in
-  # Check for GNU sed and select it if it is found.
-  if "$lt_ac_sed" --version 2>&1 < /dev/null | grep 'GNU' > /dev/null; then
-    lt_cv_path_SED=$lt_ac_sed
-    break
-  fi
-  while true; do
-    cat conftest.in conftest.in >conftest.tmp
-    mv conftest.tmp conftest.in
-    cp conftest.in conftest.nl
-    echo >>conftest.nl
-    $lt_ac_sed -e 's/a$//' < conftest.nl >conftest.out || break
-    cmp -s conftest.out conftest.nl || break
-    # 10000 chars as input seems more than enough
-    test 10 -lt "$lt_ac_count" && break
-    lt_ac_count=`expr $lt_ac_count + 1`
-    if test "$lt_ac_count" -gt "$lt_ac_max"; then
-      lt_ac_max=$lt_ac_count
-      lt_cv_path_SED=$lt_ac_sed
-    fi
-  done
-done
-])
-SED=$lt_cv_path_SED
-AC_SUBST([SED])
-AC_MSG_RESULT([$SED])
-])#AC_PROG_SED
-])#m4_ifndef
-
-# Old name:
-AU_ALIAS([LT_AC_PROG_SED], [AC_PROG_SED])
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([LT_AC_PROG_SED], [])
-
-
-# _LT_CHECK_SHELL_FEATURES
-# ------------------------
-# Find out whether the shell is Bourne or XSI compatible,
-# or has some other useful features.
-m4_defun([_LT_CHECK_SHELL_FEATURES],
-[if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
-  lt_unset=unset
-else
-  lt_unset=false
-fi
-_LT_DECL([], [lt_unset], [0], [whether the shell understands "unset"])dnl
-
-# test EBCDIC or ASCII
-case `echo X|tr X '\101'` in
- A) # ASCII based system
-    # \n is not interpreted correctly by Solaris 8 /usr/ucb/tr
-  lt_SP2NL='tr \040 \012'
-  lt_NL2SP='tr \015\012 \040\040'
-  ;;
- *) # EBCDIC based system
-  lt_SP2NL='tr \100 \n'
-  lt_NL2SP='tr \r\n \100\100'
-  ;;
-esac
-_LT_DECL([SP2NL], [lt_SP2NL], [1], [turn spaces into newlines])dnl
-_LT_DECL([NL2SP], [lt_NL2SP], [1], [turn newlines into spaces])dnl
-])# _LT_CHECK_SHELL_FEATURES
-
-
-# _LT_PATH_CONVERSION_FUNCTIONS
-# -----------------------------
-# Determine what file name conversion functions should be used by
-# func_to_host_file (and, implicitly, by func_to_host_path).  These are needed
-# for certain cross-compile configurations and native mingw.
-m4_defun([_LT_PATH_CONVERSION_FUNCTIONS],
-[AC_REQUIRE([AC_CANONICAL_HOST])dnl
-AC_REQUIRE([AC_CANONICAL_BUILD])dnl
-AC_MSG_CHECKING([how to convert $build file names to $host format])
-AC_CACHE_VAL(lt_cv_to_host_file_cmd,
-[case $host in
-  *-*-mingw* )
-    case $build in
-      *-*-mingw* ) # actually msys
-        lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32
-        ;;
-      *-*-cygwin* )
-        lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32
-        ;;
-      * ) # otherwise, assume *nix
-        lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32
-        ;;
-    esac
-    ;;
-  *-*-cygwin* )
-    case $build in
-      *-*-mingw* ) # actually msys
-        lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin
-        ;;
-      *-*-cygwin* )
-        lt_cv_to_host_file_cmd=func_convert_file_noop
-        ;;
-      * ) # otherwise, assume *nix
-        lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin
-        ;;
-    esac
-    ;;
-  * ) # unhandled hosts (and "normal" native builds)
-    lt_cv_to_host_file_cmd=func_convert_file_noop
-    ;;
-esac
-])
-to_host_file_cmd=$lt_cv_to_host_file_cmd
-AC_MSG_RESULT([$lt_cv_to_host_file_cmd])
-_LT_DECL([to_host_file_cmd], [lt_cv_to_host_file_cmd],
-         [0], [convert $build file names to $host format])dnl
-
-AC_MSG_CHECKING([how to convert $build file names to toolchain format])
-AC_CACHE_VAL(lt_cv_to_tool_file_cmd,
-[#assume ordinary cross tools, or native build.
-lt_cv_to_tool_file_cmd=func_convert_file_noop
-case $host in
-  *-*-mingw* )
-    case $build in
-      *-*-mingw* ) # actually msys
-        lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32
-        ;;
-    esac
-    ;;
-esac
-])
-to_tool_file_cmd=$lt_cv_to_tool_file_cmd
-AC_MSG_RESULT([$lt_cv_to_tool_file_cmd])
-_LT_DECL([to_tool_file_cmd], [lt_cv_to_tool_file_cmd],
-         [0], [convert $build files to toolchain format])dnl
-])# _LT_PATH_CONVERSION_FUNCTIONS
-
-# Helper functions for option handling.                    -*- Autoconf -*-
-#
-#   Copyright (C) 2004-2005, 2007-2009, 2011-2018 Free Software
-#   Foundation, Inc.
-#   Written by Gary V. Vaughan, 2004
-#
-# This file is free software; the Free Software Foundation gives
-# unlimited permission to copy and/or distribute it, with or without
-# modifications, as long as this notice is preserved.
-
-# serial 8 ltoptions.m4
-
-# This is to help aclocal find these macros, as it can't see m4_define.
-AC_DEFUN([LTOPTIONS_VERSION], [m4_if([1])])
-
-
-# _LT_MANGLE_OPTION(MACRO-NAME, OPTION-NAME)
-# ------------------------------------------
-m4_define([_LT_MANGLE_OPTION],
-[[_LT_OPTION_]m4_bpatsubst($1__$2, [[^a-zA-Z0-9_]], [_])])
-
-
-# _LT_SET_OPTION(MACRO-NAME, OPTION-NAME)
-# ---------------------------------------
-# Set option OPTION-NAME for macro MACRO-NAME, and if there is a
-# matching handler defined, dispatch to it.  Other OPTION-NAMEs are
-# saved as a flag.
-m4_define([_LT_SET_OPTION],
-[m4_define(_LT_MANGLE_OPTION([$1], [$2]))dnl
-m4_ifdef(_LT_MANGLE_DEFUN([$1], [$2]),
-        _LT_MANGLE_DEFUN([$1], [$2]),
-    [m4_warning([Unknown $1 option '$2'])])[]dnl
-])
-
-
-# _LT_IF_OPTION(MACRO-NAME, OPTION-NAME, IF-SET, [IF-NOT-SET])
-# ------------------------------------------------------------
-# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise.
-m4_define([_LT_IF_OPTION],
-[m4_ifdef(_LT_MANGLE_OPTION([$1], [$2]), [$3], [$4])])
-
-
-# _LT_UNLESS_OPTIONS(MACRO-NAME, OPTION-LIST, IF-NOT-SET)
-# -------------------------------------------------------
-# Execute IF-NOT-SET unless all options in OPTION-LIST for MACRO-NAME
-# are set.
-m4_define([_LT_UNLESS_OPTIONS],
-[m4_foreach([_LT_Option], m4_split(m4_normalize([$2])),
-	    [m4_ifdef(_LT_MANGLE_OPTION([$1], _LT_Option),
-		      [m4_define([$0_found])])])[]dnl
-m4_ifdef([$0_found], [m4_undefine([$0_found])], [$3
-])[]dnl
-])
-
-
-# _LT_SET_OPTIONS(MACRO-NAME, OPTION-LIST)
-# ----------------------------------------
-# OPTION-LIST is a space-separated list of Libtool options associated
-# with MACRO-NAME.  If any OPTION has a matching handler declared with
-# LT_OPTION_DEFINE, dispatch to that macro; otherwise complain about
-# the unknown option and exit.
-m4_defun([_LT_SET_OPTIONS],
-[# Set options
-m4_foreach([_LT_Option], m4_split(m4_normalize([$2])),
-    [_LT_SET_OPTION([$1], _LT_Option)])
-
-m4_if([$1],[LT_INIT],[
-  dnl
-  dnl Simply set some default values (i.e off) if boolean options were not
-  dnl specified:
-  _LT_UNLESS_OPTIONS([LT_INIT], [dlopen], [enable_dlopen=no
-  ])
-  _LT_UNLESS_OPTIONS([LT_INIT], [win32-dll], [enable_win32_dll=no
-  ])
-  dnl
-  dnl If no reference was made to various pairs of opposing options, then
-  dnl we run the default mode handler for the pair.  For example, if neither
-  dnl 'shared' nor 'disable-shared' was passed, we enable building of shared
-  dnl archives by default:
-  _LT_UNLESS_OPTIONS([LT_INIT], [shared disable-shared], [_LT_ENABLE_SHARED])
-  _LT_UNLESS_OPTIONS([LT_INIT], [static disable-static], [_LT_ENABLE_STATIC])
-  _LT_UNLESS_OPTIONS([LT_INIT], [pic-only no-pic], [_LT_WITH_PIC])
-  _LT_UNLESS_OPTIONS([LT_INIT], [fast-install disable-fast-install],
-		   [_LT_ENABLE_FAST_INSTALL])
-  _LT_UNLESS_OPTIONS([LT_INIT], [aix-soname=aix aix-soname=both aix-soname=svr4],
-		   [_LT_WITH_AIX_SONAME([aix])])
-  ])
-])# _LT_SET_OPTIONS
-
-
-
-# _LT_MANGLE_DEFUN(MACRO-NAME, OPTION-NAME)
-# -----------------------------------------
-m4_define([_LT_MANGLE_DEFUN],
-[[_LT_OPTION_DEFUN_]m4_bpatsubst(m4_toupper([$1__$2]), [[^A-Z0-9_]], [_])])
-
-
-# LT_OPTION_DEFINE(MACRO-NAME, OPTION-NAME, CODE)
-# -----------------------------------------------
-m4_define([LT_OPTION_DEFINE],
-[m4_define(_LT_MANGLE_DEFUN([$1], [$2]), [$3])[]dnl
-])# LT_OPTION_DEFINE
-
-
-# dlopen
-# ------
-LT_OPTION_DEFINE([LT_INIT], [dlopen], [enable_dlopen=yes
-])
-
-AU_DEFUN([AC_LIBTOOL_DLOPEN],
-[_LT_SET_OPTION([LT_INIT], [dlopen])
-AC_DIAGNOSE([obsolete],
-[$0: Remove this warning and the call to _LT_SET_OPTION when you
-put the 'dlopen' option into LT_INIT's first parameter.])
-])
-
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AC_LIBTOOL_DLOPEN], [])
-
-
-# win32-dll
-# ---------
-# Declare package support for building win32 dll's.
-LT_OPTION_DEFINE([LT_INIT], [win32-dll],
-[enable_win32_dll=yes
-
-case $host in
-*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-cegcc*)
-  AC_CHECK_TOOL(AS, as, false)
-  AC_CHECK_TOOL(DLLTOOL, dlltool, false)
-  AC_CHECK_TOOL(OBJDUMP, objdump, false)
-  ;;
-esac
-
-test -z "$AS" && AS=as
-_LT_DECL([], [AS],      [1], [Assembler program])dnl
-
-test -z "$DLLTOOL" && DLLTOOL=dlltool
-_LT_DECL([], [DLLTOOL], [1], [DLL creation program])dnl
-
-test -z "$OBJDUMP" && OBJDUMP=objdump
-_LT_DECL([], [OBJDUMP], [1], [Object dumper program])dnl
-])# win32-dll
-
-AU_DEFUN([AC_LIBTOOL_WIN32_DLL],
-[AC_REQUIRE([AC_CANONICAL_HOST])dnl
-_LT_SET_OPTION([LT_INIT], [win32-dll])
-AC_DIAGNOSE([obsolete],
-[$0: Remove this warning and the call to _LT_SET_OPTION when you
-put the 'win32-dll' option into LT_INIT's first parameter.])
-])
-
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AC_LIBTOOL_WIN32_DLL], [])
-
-
-# _LT_ENABLE_SHARED([DEFAULT])
-# ----------------------------
-# implement the --enable-shared flag, and supports the 'shared' and
-# 'disable-shared' LT_INIT options.
-# DEFAULT is either 'yes' or 'no'.  If omitted, it defaults to 'yes'.
-m4_define([_LT_ENABLE_SHARED],
-[m4_define([_LT_ENABLE_SHARED_DEFAULT], [m4_if($1, no, no, yes)])dnl
-AC_ARG_ENABLE([shared],
-    [AS_HELP_STRING([--enable-shared@<:@=PKGS@:>@],
-	[build shared libraries @<:@default=]_LT_ENABLE_SHARED_DEFAULT[@:>@])],
-    [p=${PACKAGE-default}
-    case $enableval in
-    yes) enable_shared=yes ;;
-    no) enable_shared=no ;;
-    *)
-      enable_shared=no
-      # Look at the argument we got.  We use all the common list separators.
-      lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
-      for pkg in $enableval; do
-	IFS=$lt_save_ifs
-	if test "X$pkg" = "X$p"; then
-	  enable_shared=yes
-	fi
-      done
-      IFS=$lt_save_ifs
-      ;;
-    esac],
-    [enable_shared=]_LT_ENABLE_SHARED_DEFAULT)
-
-    _LT_DECL([build_libtool_libs], [enable_shared], [0],
-	[Whether or not to build shared libraries])
-])# _LT_ENABLE_SHARED
-
-LT_OPTION_DEFINE([LT_INIT], [shared], [_LT_ENABLE_SHARED([yes])])
-LT_OPTION_DEFINE([LT_INIT], [disable-shared], [_LT_ENABLE_SHARED([no])])
-
-# Old names:
-AC_DEFUN([AC_ENABLE_SHARED],
-[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[shared])
-])
-
-AC_DEFUN([AC_DISABLE_SHARED],
-[_LT_SET_OPTION([LT_INIT], [disable-shared])
-])
-
-AU_DEFUN([AM_ENABLE_SHARED], [AC_ENABLE_SHARED($@)])
-AU_DEFUN([AM_DISABLE_SHARED], [AC_DISABLE_SHARED($@)])
-
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AM_ENABLE_SHARED], [])
-dnl AC_DEFUN([AM_DISABLE_SHARED], [])
-
-
-
-# _LT_ENABLE_STATIC([DEFAULT])
-# ----------------------------
-# implement the --enable-static flag, and support the 'static' and
-# 'disable-static' LT_INIT options.
-# DEFAULT is either 'yes' or 'no'.  If omitted, it defaults to 'yes'.
-m4_define([_LT_ENABLE_STATIC],
-[m4_define([_LT_ENABLE_STATIC_DEFAULT], [m4_if($1, no, no, yes)])dnl
-AC_ARG_ENABLE([static],
-    [AS_HELP_STRING([--enable-static@<:@=PKGS@:>@],
-	[build static libraries @<:@default=]_LT_ENABLE_STATIC_DEFAULT[@:>@])],
-    [p=${PACKAGE-default}
-    case $enableval in
-    yes) enable_static=yes ;;
-    no) enable_static=no ;;
-    *)
-     enable_static=no
-      # Look at the argument we got.  We use all the common list separators.
-      lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
-      for pkg in $enableval; do
-	IFS=$lt_save_ifs
-	if test "X$pkg" = "X$p"; then
-	  enable_static=yes
-	fi
-      done
-      IFS=$lt_save_ifs
-      ;;
-    esac],
-    [enable_static=]_LT_ENABLE_STATIC_DEFAULT)
-
-    _LT_DECL([build_old_libs], [enable_static], [0],
-	[Whether or not to build static libraries])
-])# _LT_ENABLE_STATIC
-
-LT_OPTION_DEFINE([LT_INIT], [static], [_LT_ENABLE_STATIC([yes])])
-LT_OPTION_DEFINE([LT_INIT], [disable-static], [_LT_ENABLE_STATIC([no])])
-
-# Old names:
-AC_DEFUN([AC_ENABLE_STATIC],
-[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[static])
-])
-
-AC_DEFUN([AC_DISABLE_STATIC],
-[_LT_SET_OPTION([LT_INIT], [disable-static])
-])
-
-AU_DEFUN([AM_ENABLE_STATIC], [AC_ENABLE_STATIC($@)])
-AU_DEFUN([AM_DISABLE_STATIC], [AC_DISABLE_STATIC($@)])
-
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AM_ENABLE_STATIC], [])
-dnl AC_DEFUN([AM_DISABLE_STATIC], [])
-
-
-
-# _LT_ENABLE_FAST_INSTALL([DEFAULT])
-# ----------------------------------
-# implement the --enable-fast-install flag, and support the 'fast-install'
-# and 'disable-fast-install' LT_INIT options.
-# DEFAULT is either 'yes' or 'no'.  If omitted, it defaults to 'yes'.
-m4_define([_LT_ENABLE_FAST_INSTALL],
-[m4_define([_LT_ENABLE_FAST_INSTALL_DEFAULT], [m4_if($1, no, no, yes)])dnl
-AC_ARG_ENABLE([fast-install],
-    [AS_HELP_STRING([--enable-fast-install@<:@=PKGS@:>@],
-    [optimize for fast installation @<:@default=]_LT_ENABLE_FAST_INSTALL_DEFAULT[@:>@])],
-    [p=${PACKAGE-default}
-    case $enableval in
-    yes) enable_fast_install=yes ;;
-    no) enable_fast_install=no ;;
-    *)
-      enable_fast_install=no
-      # Look at the argument we got.  We use all the common list separators.
-      lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
-      for pkg in $enableval; do
-	IFS=$lt_save_ifs
-	if test "X$pkg" = "X$p"; then
-	  enable_fast_install=yes
-	fi
-      done
-      IFS=$lt_save_ifs
-      ;;
-    esac],
-    [enable_fast_install=]_LT_ENABLE_FAST_INSTALL_DEFAULT)
-
-_LT_DECL([fast_install], [enable_fast_install], [0],
-	 [Whether or not to optimize for fast installation])dnl
-])# _LT_ENABLE_FAST_INSTALL
-
-LT_OPTION_DEFINE([LT_INIT], [fast-install], [_LT_ENABLE_FAST_INSTALL([yes])])
-LT_OPTION_DEFINE([LT_INIT], [disable-fast-install], [_LT_ENABLE_FAST_INSTALL([no])])
-
-# Old names:
-AU_DEFUN([AC_ENABLE_FAST_INSTALL],
-[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[fast-install])
-AC_DIAGNOSE([obsolete],
-[$0: Remove this warning and the call to _LT_SET_OPTION when you put
-the 'fast-install' option into LT_INIT's first parameter.])
-])
-
-AU_DEFUN([AC_DISABLE_FAST_INSTALL],
-[_LT_SET_OPTION([LT_INIT], [disable-fast-install])
-AC_DIAGNOSE([obsolete],
-[$0: Remove this warning and the call to _LT_SET_OPTION when you put
-the 'disable-fast-install' option into LT_INIT's first parameter.])
-])
-
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AC_ENABLE_FAST_INSTALL], [])
-dnl AC_DEFUN([AM_DISABLE_FAST_INSTALL], [])
-
-
-# _LT_WITH_AIX_SONAME([DEFAULT])
-# ----------------------------------
-# implement the --with-aix-soname flag, and support the `aix-soname=aix'
-# and `aix-soname=both' and `aix-soname=svr4' LT_INIT options. DEFAULT
-# is either `aix', `both' or `svr4'.  If omitted, it defaults to `aix'.
-m4_define([_LT_WITH_AIX_SONAME],
-[m4_define([_LT_WITH_AIX_SONAME_DEFAULT], [m4_if($1, svr4, svr4, m4_if($1, both, both, aix))])dnl
-shared_archive_member_spec=
-case $host,$enable_shared in
-power*-*-aix[[5-9]]*,yes)
-  AC_MSG_CHECKING([which variant of shared library versioning to provide])
-  AC_ARG_WITH([aix-soname],
-    [AS_HELP_STRING([--with-aix-soname=aix|svr4|both],
-      [shared library versioning (aka "SONAME") variant to provide on AIX, @<:@default=]_LT_WITH_AIX_SONAME_DEFAULT[@:>@.])],
-    [case $withval in
-    aix|svr4|both)
-      ;;
-    *)
-      AC_MSG_ERROR([Unknown argument to --with-aix-soname])
-      ;;
-    esac
-    lt_cv_with_aix_soname=$with_aix_soname],
-    [AC_CACHE_VAL([lt_cv_with_aix_soname],
-      [lt_cv_with_aix_soname=]_LT_WITH_AIX_SONAME_DEFAULT)
-    with_aix_soname=$lt_cv_with_aix_soname])
-  AC_MSG_RESULT([$with_aix_soname])
-  if test aix != "$with_aix_soname"; then
-    # For the AIX way of multilib, we name the shared archive member
-    # based on the bitwidth used, traditionally 'shr.o' or 'shr_64.o',
-    # and 'shr.imp' or 'shr_64.imp', respectively, for the Import File.
-    # Even when GNU compilers ignore OBJECT_MODE but need '-maix64' flag,
-    # the AIX toolchain works better with OBJECT_MODE set (default 32).
-    if test 64 = "${OBJECT_MODE-32}"; then
-      shared_archive_member_spec=shr_64
-    else
-      shared_archive_member_spec=shr
-    fi
-  fi
-  ;;
-*)
-  with_aix_soname=aix
-  ;;
-esac
-
-_LT_DECL([], [shared_archive_member_spec], [0],
-    [Shared archive member basename, for filename based shared library versioning on AIX])dnl
-])# _LT_WITH_AIX_SONAME
-
-LT_OPTION_DEFINE([LT_INIT], [aix-soname=aix], [_LT_WITH_AIX_SONAME([aix])])
-LT_OPTION_DEFINE([LT_INIT], [aix-soname=both], [_LT_WITH_AIX_SONAME([both])])
-LT_OPTION_DEFINE([LT_INIT], [aix-soname=svr4], [_LT_WITH_AIX_SONAME([svr4])])
-
-
-# _LT_WITH_PIC([MODE])
-# --------------------
-# implement the --with-pic flag, and support the 'pic-only' and 'no-pic'
-# LT_INIT options.
-# MODE is either 'yes' or 'no'.  If omitted, it defaults to 'both'.
-m4_define([_LT_WITH_PIC],
-[AC_ARG_WITH([pic],
-    [AS_HELP_STRING([--with-pic@<:@=PKGS@:>@],
-	[try to use only PIC/non-PIC objects @<:@default=use both@:>@])],
-    [lt_p=${PACKAGE-default}
-    case $withval in
-    yes|no) pic_mode=$withval ;;
-    *)
-      pic_mode=default
-      # Look at the argument we got.  We use all the common list separators.
-      lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
-      for lt_pkg in $withval; do
-	IFS=$lt_save_ifs
-	if test "X$lt_pkg" = "X$lt_p"; then
-	  pic_mode=yes
-	fi
-      done
-      IFS=$lt_save_ifs
-      ;;
-    esac],
-    [pic_mode=m4_default([$1], [default])])
-
-_LT_DECL([], [pic_mode], [0], [What type of objects to build])dnl
-])# _LT_WITH_PIC
-
-LT_OPTION_DEFINE([LT_INIT], [pic-only], [_LT_WITH_PIC([yes])])
-LT_OPTION_DEFINE([LT_INIT], [no-pic], [_LT_WITH_PIC([no])])
-
-# Old name:
-AU_DEFUN([AC_LIBTOOL_PICMODE],
-[_LT_SET_OPTION([LT_INIT], [pic-only])
-AC_DIAGNOSE([obsolete],
-[$0: Remove this warning and the call to _LT_SET_OPTION when you
-put the 'pic-only' option into LT_INIT's first parameter.])
-])
-
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AC_LIBTOOL_PICMODE], [])
-
-
-m4_define([_LTDL_MODE], [])
-LT_OPTION_DEFINE([LTDL_INIT], [nonrecursive],
-		 [m4_define([_LTDL_MODE], [nonrecursive])])
-LT_OPTION_DEFINE([LTDL_INIT], [recursive],
-		 [m4_define([_LTDL_MODE], [recursive])])
-LT_OPTION_DEFINE([LTDL_INIT], [subproject],
-		 [m4_define([_LTDL_MODE], [subproject])])
-
-m4_define([_LTDL_TYPE], [])
-LT_OPTION_DEFINE([LTDL_INIT], [installable],
-		 [m4_define([_LTDL_TYPE], [installable])])
-LT_OPTION_DEFINE([LTDL_INIT], [convenience],
-		 [m4_define([_LTDL_TYPE], [convenience])])
-
-# ltsugar.m4 -- libtool m4 base layer.                         -*-Autoconf-*-
-#
-# Copyright (C) 2004-2005, 2007-2008, 2011-2018 Free Software
-# Foundation, Inc.
-# Written by Gary V. Vaughan, 2004
-#
-# This file is free software; the Free Software Foundation gives
-# unlimited permission to copy and/or distribute it, with or without
-# modifications, as long as this notice is preserved.
-
-# serial 6 ltsugar.m4
-
-# This is to help aclocal find these macros, as it can't see m4_define.
-AC_DEFUN([LTSUGAR_VERSION], [m4_if([0.1])])
-
-
-# lt_join(SEP, ARG1, [ARG2...])
-# -----------------------------
-# Produce ARG1SEPARG2...SEPARGn, omitting [] arguments and their
-# associated separator.
-# Needed until we can rely on m4_join from Autoconf 2.62, since all earlier
-# versions in m4sugar had bugs.
-m4_define([lt_join],
-[m4_if([$#], [1], [],
-       [$#], [2], [[$2]],
-       [m4_if([$2], [], [], [[$2]_])$0([$1], m4_shift(m4_shift($@)))])])
-m4_define([_lt_join],
-[m4_if([$#$2], [2], [],
-       [m4_if([$2], [], [], [[$1$2]])$0([$1], m4_shift(m4_shift($@)))])])
-
-
-# lt_car(LIST)
-# lt_cdr(LIST)
-# ------------
-# Manipulate m4 lists.
-# These macros are necessary as long as will still need to support
-# Autoconf-2.59, which quotes differently.
-m4_define([lt_car], [[$1]])
-m4_define([lt_cdr],
-[m4_if([$#], 0, [m4_fatal([$0: cannot be called without arguments])],
-       [$#], 1, [],
-       [m4_dquote(m4_shift($@))])])
-m4_define([lt_unquote], $1)
-
-
-# lt_append(MACRO-NAME, STRING, [SEPARATOR])
-# ------------------------------------------
-# Redefine MACRO-NAME to hold its former content plus 'SEPARATOR''STRING'.
-# Note that neither SEPARATOR nor STRING are expanded; they are appended
-# to MACRO-NAME as is (leaving the expansion for when MACRO-NAME is invoked).
-# No SEPARATOR is output if MACRO-NAME was previously undefined (different
-# than defined and empty).
-#
-# This macro is needed until we can rely on Autoconf 2.62, since earlier
-# versions of m4sugar mistakenly expanded SEPARATOR but not STRING.
-m4_define([lt_append],
-[m4_define([$1],
-	   m4_ifdef([$1], [m4_defn([$1])[$3]])[$2])])
-
-
-
-# lt_combine(SEP, PREFIX-LIST, INFIX, SUFFIX1, [SUFFIX2...])
-# ----------------------------------------------------------
-# Produce a SEP delimited list of all paired combinations of elements of
-# PREFIX-LIST with SUFFIX1 through SUFFIXn.  Each element of the list
-# has the form PREFIXmINFIXSUFFIXn.
-# Needed until we can rely on m4_combine added in Autoconf 2.62.
-m4_define([lt_combine],
-[m4_if(m4_eval([$# > 3]), [1],
-       [m4_pushdef([_Lt_sep], [m4_define([_Lt_sep], m4_defn([lt_car]))])]]dnl
-[[m4_foreach([_Lt_prefix], [$2],
-	     [m4_foreach([_Lt_suffix],
-		]m4_dquote(m4_dquote(m4_shift(m4_shift(m4_shift($@)))))[,
-	[_Lt_sep([$1])[]m4_defn([_Lt_prefix])[$3]m4_defn([_Lt_suffix])])])])])
-
-
-# lt_if_append_uniq(MACRO-NAME, VARNAME, [SEPARATOR], [UNIQ], [NOT-UNIQ])
-# -----------------------------------------------------------------------
-# Iff MACRO-NAME does not yet contain VARNAME, then append it (delimited
-# by SEPARATOR if supplied) and expand UNIQ, else NOT-UNIQ.
-m4_define([lt_if_append_uniq],
-[m4_ifdef([$1],
-	  [m4_if(m4_index([$3]m4_defn([$1])[$3], [$3$2$3]), [-1],
-		 [lt_append([$1], [$2], [$3])$4],
-		 [$5])],
-	  [lt_append([$1], [$2], [$3])$4])])
-
-
-# lt_dict_add(DICT, KEY, VALUE)
-# -----------------------------
-m4_define([lt_dict_add],
-[m4_define([$1($2)], [$3])])
-
-
-# lt_dict_add_subkey(DICT, KEY, SUBKEY, VALUE)
-# --------------------------------------------
-m4_define([lt_dict_add_subkey],
-[m4_define([$1($2:$3)], [$4])])
-
-
-# lt_dict_fetch(DICT, KEY, [SUBKEY])
-# ----------------------------------
-m4_define([lt_dict_fetch],
-[m4_ifval([$3],
-	m4_ifdef([$1($2:$3)], [m4_defn([$1($2:$3)])]),
-    m4_ifdef([$1($2)], [m4_defn([$1($2)])]))])
-
-
-# lt_if_dict_fetch(DICT, KEY, [SUBKEY], VALUE, IF-TRUE, [IF-FALSE])
-# -----------------------------------------------------------------
-m4_define([lt_if_dict_fetch],
-[m4_if(lt_dict_fetch([$1], [$2], [$3]), [$4],
-	[$5],
-    [$6])])
-
-
-# lt_dict_filter(DICT, [SUBKEY], VALUE, [SEPARATOR], KEY, [...])
-# --------------------------------------------------------------
-m4_define([lt_dict_filter],
-[m4_if([$5], [], [],
-  [lt_join(m4_quote(m4_default([$4], [[, ]])),
-           lt_unquote(m4_split(m4_normalize(m4_foreach(_Lt_key, lt_car([m4_shiftn(4, $@)]),
-		      [lt_if_dict_fetch([$1], _Lt_key, [$2], [$3], [_Lt_key ])])))))])[]dnl
-])
-
-# ltversion.m4 -- version numbers			-*- Autoconf -*-
-#
-#   Copyright (C) 2004, 2011-2018 Free Software Foundation, Inc.
-#   Written by Scott James Remnant, 2004
-#
-# This file is free software; the Free Software Foundation gives
-# unlimited permission to copy and/or distribute it, with or without
-# modifications, as long as this notice is preserved.
-
-# @configure_input@
-
-# serial 4221 ltversion.m4
-# This file is part of GNU Libtool
-
-m4_define([LT_PACKAGE_VERSION], [2.4.6.42-b88ce])
-m4_define([LT_PACKAGE_REVISION], [2.4.6.42])
-
-AC_DEFUN([LTVERSION_VERSION],
-[macro_version='2.4.6.42-b88ce'
-macro_revision='2.4.6.42'
-_LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?])
-_LT_DECL(, macro_revision, 0)
-])
-
-# lt~obsolete.m4 -- aclocal satisfying obsolete definitions.    -*-Autoconf-*-
-#
-#   Copyright (C) 2004-2005, 2007, 2009, 2011-2018 Free Software
-#   Foundation, Inc.
-#   Written by Scott James Remnant, 2004.
-#
-# This file is free software; the Free Software Foundation gives
-# unlimited permission to copy and/or distribute it, with or without
-# modifications, as long as this notice is preserved.
-
-# serial 5 lt~obsolete.m4
-
-# These exist entirely to fool aclocal when bootstrapping libtool.
-#
-# In the past libtool.m4 has provided macros via AC_DEFUN (or AU_DEFUN),
-# which have later been changed to m4_define as they aren't part of the
-# exported API, or moved to Autoconf or Automake where they belong.
-#
-# The trouble is, aclocal is a bit thick.  It'll see the old AC_DEFUN
-# in /usr/share/aclocal/libtool.m4 and remember it, then when it sees us
-# using a macro with the same name in our local m4/libtool.m4 it'll
-# pull the old libtool.m4 in (it doesn't see our shiny new m4_define
-# and doesn't know about Autoconf macros at all.)
-#
-# So we provide this file, which has a silly filename so it's always
-# included after everything else.  This provides aclocal with the
-# AC_DEFUNs it wants, but when m4 processes it, it doesn't do anything
-# because those macros already exist, or will be overwritten later.
-# We use AC_DEFUN over AU_DEFUN for compatibility with aclocal-1.6.
-#
-# Anytime we withdraw an AC_DEFUN or AU_DEFUN, remember to add it here.
-# Yes, that means every name once taken will need to remain here until
-# we give up compatibility with versions before 1.7, at which point
-# we need to keep only those names which we still refer to.
-
-# This is to help aclocal find these macros, as it can't see m4_define.
-AC_DEFUN([LTOBSOLETE_VERSION], [m4_if([1])])
-
-m4_ifndef([AC_LIBTOOL_LINKER_OPTION],	[AC_DEFUN([AC_LIBTOOL_LINKER_OPTION])])
-m4_ifndef([AC_PROG_EGREP],		[AC_DEFUN([AC_PROG_EGREP])])
-m4_ifndef([_LT_AC_PROG_ECHO_BACKSLASH],	[AC_DEFUN([_LT_AC_PROG_ECHO_BACKSLASH])])
-m4_ifndef([_LT_AC_SHELL_INIT],		[AC_DEFUN([_LT_AC_SHELL_INIT])])
-m4_ifndef([_LT_AC_SYS_LIBPATH_AIX],	[AC_DEFUN([_LT_AC_SYS_LIBPATH_AIX])])
-m4_ifndef([_LT_PROG_LTMAIN],		[AC_DEFUN([_LT_PROG_LTMAIN])])
-m4_ifndef([_LT_AC_TAGVAR],		[AC_DEFUN([_LT_AC_TAGVAR])])
-m4_ifndef([AC_LTDL_ENABLE_INSTALL],	[AC_DEFUN([AC_LTDL_ENABLE_INSTALL])])
-m4_ifndef([AC_LTDL_PREOPEN],		[AC_DEFUN([AC_LTDL_PREOPEN])])
-m4_ifndef([_LT_AC_SYS_COMPILER],	[AC_DEFUN([_LT_AC_SYS_COMPILER])])
-m4_ifndef([_LT_AC_LOCK],		[AC_DEFUN([_LT_AC_LOCK])])
-m4_ifndef([AC_LIBTOOL_SYS_OLD_ARCHIVE],	[AC_DEFUN([AC_LIBTOOL_SYS_OLD_ARCHIVE])])
-m4_ifndef([_LT_AC_TRY_DLOPEN_SELF],	[AC_DEFUN([_LT_AC_TRY_DLOPEN_SELF])])
-m4_ifndef([AC_LIBTOOL_PROG_CC_C_O],	[AC_DEFUN([AC_LIBTOOL_PROG_CC_C_O])])
-m4_ifndef([AC_LIBTOOL_SYS_HARD_LINK_LOCKS], [AC_DEFUN([AC_LIBTOOL_SYS_HARD_LINK_LOCKS])])
-m4_ifndef([AC_LIBTOOL_OBJDIR],		[AC_DEFUN([AC_LIBTOOL_OBJDIR])])
-m4_ifndef([AC_LTDL_OBJDIR],		[AC_DEFUN([AC_LTDL_OBJDIR])])
-m4_ifndef([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH], [AC_DEFUN([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH])])
-m4_ifndef([AC_LIBTOOL_SYS_LIB_STRIP],	[AC_DEFUN([AC_LIBTOOL_SYS_LIB_STRIP])])
-m4_ifndef([AC_PATH_MAGIC],		[AC_DEFUN([AC_PATH_MAGIC])])
-m4_ifndef([AC_PROG_LD_GNU],		[AC_DEFUN([AC_PROG_LD_GNU])])
-m4_ifndef([AC_PROG_LD_RELOAD_FLAG],	[AC_DEFUN([AC_PROG_LD_RELOAD_FLAG])])
-m4_ifndef([AC_DEPLIBS_CHECK_METHOD],	[AC_DEFUN([AC_DEPLIBS_CHECK_METHOD])])
-m4_ifndef([AC_LIBTOOL_PROG_COMPILER_NO_RTTI], [AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_NO_RTTI])])
-m4_ifndef([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE], [AC_DEFUN([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE])])
-m4_ifndef([AC_LIBTOOL_PROG_COMPILER_PIC], [AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_PIC])])
-m4_ifndef([AC_LIBTOOL_PROG_LD_SHLIBS],	[AC_DEFUN([AC_LIBTOOL_PROG_LD_SHLIBS])])
-m4_ifndef([AC_LIBTOOL_POSTDEP_PREDEP],	[AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP])])
-m4_ifndef([LT_AC_PROG_EGREP],		[AC_DEFUN([LT_AC_PROG_EGREP])])
-m4_ifndef([LT_AC_PROG_SED],		[AC_DEFUN([LT_AC_PROG_SED])])
-m4_ifndef([_LT_CC_BASENAME],		[AC_DEFUN([_LT_CC_BASENAME])])
-m4_ifndef([_LT_COMPILER_BOILERPLATE],	[AC_DEFUN([_LT_COMPILER_BOILERPLATE])])
-m4_ifndef([_LT_LINKER_BOILERPLATE],	[AC_DEFUN([_LT_LINKER_BOILERPLATE])])
-m4_ifndef([_AC_PROG_LIBTOOL],		[AC_DEFUN([_AC_PROG_LIBTOOL])])
-m4_ifndef([AC_LIBTOOL_SETUP],		[AC_DEFUN([AC_LIBTOOL_SETUP])])
-m4_ifndef([_LT_AC_CHECK_DLFCN],		[AC_DEFUN([_LT_AC_CHECK_DLFCN])])
-m4_ifndef([AC_LIBTOOL_SYS_DYNAMIC_LINKER],	[AC_DEFUN([AC_LIBTOOL_SYS_DYNAMIC_LINKER])])
-m4_ifndef([_LT_AC_TAGCONFIG],		[AC_DEFUN([_LT_AC_TAGCONFIG])])
-m4_ifndef([AC_DISABLE_FAST_INSTALL],	[AC_DEFUN([AC_DISABLE_FAST_INSTALL])])
-m4_ifndef([_LT_AC_LANG_CXX],		[AC_DEFUN([_LT_AC_LANG_CXX])])
-m4_ifndef([_LT_AC_LANG_F77],		[AC_DEFUN([_LT_AC_LANG_F77])])
-m4_ifndef([_LT_AC_LANG_GCJ],		[AC_DEFUN([_LT_AC_LANG_GCJ])])
-m4_ifndef([AC_LIBTOOL_LANG_C_CONFIG],	[AC_DEFUN([AC_LIBTOOL_LANG_C_CONFIG])])
-m4_ifndef([_LT_AC_LANG_C_CONFIG],	[AC_DEFUN([_LT_AC_LANG_C_CONFIG])])
-m4_ifndef([AC_LIBTOOL_LANG_CXX_CONFIG],	[AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG])])
-m4_ifndef([_LT_AC_LANG_CXX_CONFIG],	[AC_DEFUN([_LT_AC_LANG_CXX_CONFIG])])
-m4_ifndef([AC_LIBTOOL_LANG_F77_CONFIG],	[AC_DEFUN([AC_LIBTOOL_LANG_F77_CONFIG])])
-m4_ifndef([_LT_AC_LANG_F77_CONFIG],	[AC_DEFUN([_LT_AC_LANG_F77_CONFIG])])
-m4_ifndef([AC_LIBTOOL_LANG_GCJ_CONFIG],	[AC_DEFUN([AC_LIBTOOL_LANG_GCJ_CONFIG])])
-m4_ifndef([_LT_AC_LANG_GCJ_CONFIG],	[AC_DEFUN([_LT_AC_LANG_GCJ_CONFIG])])
-m4_ifndef([AC_LIBTOOL_LANG_RC_CONFIG],	[AC_DEFUN([AC_LIBTOOL_LANG_RC_CONFIG])])
-m4_ifndef([_LT_AC_LANG_RC_CONFIG],	[AC_DEFUN([_LT_AC_LANG_RC_CONFIG])])
-m4_ifndef([AC_LIBTOOL_CONFIG],		[AC_DEFUN([AC_LIBTOOL_CONFIG])])
-m4_ifndef([_LT_AC_FILE_LTDLL_C],	[AC_DEFUN([_LT_AC_FILE_LTDLL_C])])
-m4_ifndef([_LT_REQUIRED_DARWIN_CHECKS],	[AC_DEFUN([_LT_REQUIRED_DARWIN_CHECKS])])
-m4_ifndef([_LT_AC_PROG_CXXCPP],		[AC_DEFUN([_LT_AC_PROG_CXXCPP])])
-m4_ifndef([_LT_PREPARE_SED_QUOTE_VARS],	[AC_DEFUN([_LT_PREPARE_SED_QUOTE_VARS])])
-m4_ifndef([_LT_PROG_ECHO_BACKSLASH],	[AC_DEFUN([_LT_PROG_ECHO_BACKSLASH])])
-m4_ifndef([_LT_PROG_F77],		[AC_DEFUN([_LT_PROG_F77])])
-m4_ifndef([_LT_PROG_FC],		[AC_DEFUN([_LT_PROG_FC])])
-m4_ifndef([_LT_PROG_CXX],		[AC_DEFUN([_LT_PROG_CXX])])
-
-# Copyright (C) 2002-2018 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# AM_AUTOMAKE_VERSION(VERSION)
-# ----------------------------
-# Automake X.Y traces this macro to ensure aclocal.m4 has been
-# generated from the m4 files accompanying Automake X.Y.
-# (This private macro should not be called outside this file.)
-AC_DEFUN([AM_AUTOMAKE_VERSION],
-[am__api_version='1.16'
-dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
-dnl require some minimum version.  Point them to the right macro.
-m4_if([$1], [1.16.1], [],
-      [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
-])
-
-# _AM_AUTOCONF_VERSION(VERSION)
-# -----------------------------
-# aclocal traces this macro to find the Autoconf version.
-# This is a private macro too.  Using m4_define simplifies
-# the logic in aclocal, which can simply ignore this definition.
-m4_define([_AM_AUTOCONF_VERSION], [])
-
-# AM_SET_CURRENT_AUTOMAKE_VERSION
-# -------------------------------
-# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
-# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
-AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.16.1])dnl
-m4_ifndef([AC_AUTOCONF_VERSION],
-  [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
-_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
-
-# Figure out how to run the assembler.                      -*- Autoconf -*-
-
-# Copyright (C) 2001-2018 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# AM_PROG_AS
-# ----------
-AC_DEFUN([AM_PROG_AS],
-[# By default we simply use the C compiler to build assembly code.
-AC_REQUIRE([AC_PROG_CC])
-test "${CCAS+set}" = set || CCAS=$CC
-test "${CCASFLAGS+set}" = set || CCASFLAGS=$CFLAGS
-AC_ARG_VAR([CCAS],      [assembler compiler command (defaults to CC)])
-AC_ARG_VAR([CCASFLAGS], [assembler compiler flags (defaults to CFLAGS)])
-_AM_IF_OPTION([no-dependencies],, [_AM_DEPENDENCIES([CCAS])])dnl
-])
-
-# AM_AUX_DIR_EXPAND                                         -*- Autoconf -*-
-
-# Copyright (C) 2001-2018 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
-# $ac_aux_dir to '$srcdir/foo'.  In other projects, it is set to
-# '$srcdir', '$srcdir/..', or '$srcdir/../..'.
-#
-# Of course, Automake must honor this variable whenever it calls a
-# tool from the auxiliary directory.  The problem is that $srcdir (and
-# therefore $ac_aux_dir as well) can be either absolute or relative,
-# depending on how configure is run.  This is pretty annoying, since
-# it makes $ac_aux_dir quite unusable in subdirectories: in the top
-# source directory, any form will work fine, but in subdirectories a
-# relative path needs to be adjusted first.
-#
-# $ac_aux_dir/missing
-#    fails when called from a subdirectory if $ac_aux_dir is relative
-# $top_srcdir/$ac_aux_dir/missing
-#    fails if $ac_aux_dir is absolute,
-#    fails when called from a subdirectory in a VPATH build with
-#          a relative $ac_aux_dir
-#
-# The reason of the latter failure is that $top_srcdir and $ac_aux_dir
-# are both prefixed by $srcdir.  In an in-source build this is usually
-# harmless because $srcdir is '.', but things will broke when you
-# start a VPATH build or use an absolute $srcdir.
-#
-# So we could use something similar to $top_srcdir/$ac_aux_dir/missing,
-# iff we strip the leading $srcdir from $ac_aux_dir.  That would be:
-#   am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*\(.*\)"`
-# and then we would define $MISSING as
-#   MISSING="\${SHELL} $am_aux_dir/missing"
-# This will work as long as MISSING is not called from configure, because
-# unfortunately $(top_srcdir) has no meaning in configure.
-# However there are other variables, like CC, which are often used in
-# configure, and could therefore not use this "fixed" $ac_aux_dir.
-#
-# Another solution, used here, is to always expand $ac_aux_dir to an
-# absolute PATH.  The drawback is that using absolute paths prevent a
-# configured tree to be moved without reconfiguration.
-
-AC_DEFUN([AM_AUX_DIR_EXPAND],
-[AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl
-# Expand $ac_aux_dir to an absolute path.
-am_aux_dir=`cd "$ac_aux_dir" && pwd`
-])
-
-# AM_CONDITIONAL                                            -*- Autoconf -*-
-
-# Copyright (C) 1997-2018 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# AM_CONDITIONAL(NAME, SHELL-CONDITION)
-# -------------------------------------
-# Define a conditional.
-AC_DEFUN([AM_CONDITIONAL],
-[AC_PREREQ([2.52])dnl
- m4_if([$1], [TRUE],  [AC_FATAL([$0: invalid condition: $1])],
-       [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
-AC_SUBST([$1_TRUE])dnl
-AC_SUBST([$1_FALSE])dnl
-_AM_SUBST_NOTMAKE([$1_TRUE])dnl
-_AM_SUBST_NOTMAKE([$1_FALSE])dnl
-m4_define([_AM_COND_VALUE_$1], [$2])dnl
-if $2; then
-  $1_TRUE=
-  $1_FALSE='#'
-else
-  $1_TRUE='#'
-  $1_FALSE=
-fi
-AC_CONFIG_COMMANDS_PRE(
-[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then
-  AC_MSG_ERROR([[conditional "$1" was never defined.
-Usually this means the macro was only invoked conditionally.]])
-fi])])
-
-# Copyright (C) 1999-2018 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-
-# There are a few dirty hacks below to avoid letting 'AC_PROG_CC' be
-# written in clear, in which case automake, when reading aclocal.m4,
-# will think it sees a *use*, and therefore will trigger all it's
-# C support machinery.  Also note that it means that autoscan, seeing
-# CC etc. in the Makefile, will ask for an AC_PROG_CC use...
-
-
-# _AM_DEPENDENCIES(NAME)
-# ----------------------
-# See how the compiler implements dependency checking.
-# NAME is "CC", "CXX", "OBJC", "OBJCXX", "UPC", or "GJC".
-# We try a few techniques and use that to set a single cache variable.
-#
-# We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was
-# modified to invoke _AM_DEPENDENCIES(CC); we would have a circular
-# dependency, and given that the user is not expected to run this macro,
-# just rely on AC_PROG_CC.
-AC_DEFUN([_AM_DEPENDENCIES],
-[AC_REQUIRE([AM_SET_DEPDIR])dnl
-AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl
-AC_REQUIRE([AM_MAKE_INCLUDE])dnl
-AC_REQUIRE([AM_DEP_TRACK])dnl
-
-m4_if([$1], [CC],   [depcc="$CC"   am_compiler_list=],
-      [$1], [CXX],  [depcc="$CXX"  am_compiler_list=],
-      [$1], [OBJC], [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
-      [$1], [OBJCXX], [depcc="$OBJCXX" am_compiler_list='gcc3 gcc'],
-      [$1], [UPC],  [depcc="$UPC"  am_compiler_list=],
-      [$1], [GCJ],  [depcc="$GCJ"  am_compiler_list='gcc3 gcc'],
-                    [depcc="$$1"   am_compiler_list=])
-
-AC_CACHE_CHECK([dependency style of $depcc],
-               [am_cv_$1_dependencies_compiler_type],
-[if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
-  # We make a subdir and do the tests there.  Otherwise we can end up
-  # making bogus files that we don't know about and never remove.  For
-  # instance it was reported that on HP-UX the gcc test will end up
-  # making a dummy file named 'D' -- because '-MD' means "put the output
-  # in D".
-  rm -rf conftest.dir
-  mkdir conftest.dir
-  # Copy depcomp to subdir because otherwise we won't find it if we're
-  # using a relative directory.
-  cp "$am_depcomp" conftest.dir
-  cd conftest.dir
-  # We will build objects and dependencies in a subdirectory because
-  # it helps to detect inapplicable dependency modes.  For instance
-  # both Tru64's cc and ICC support -MD to output dependencies as a
-  # side effect of compilation, but ICC will put the dependencies in
-  # the current directory while Tru64 will put them in the object
-  # directory.
-  mkdir sub
-
-  am_cv_$1_dependencies_compiler_type=none
-  if test "$am_compiler_list" = ""; then
-     am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp`
-  fi
-  am__universal=false
-  m4_case([$1], [CC],
-    [case " $depcc " in #(
-     *\ -arch\ *\ -arch\ *) am__universal=true ;;
-     esac],
-    [CXX],
-    [case " $depcc " in #(
-     *\ -arch\ *\ -arch\ *) am__universal=true ;;
-     esac])
-
-  for depmode in $am_compiler_list; do
-    # Setup a source with many dependencies, because some compilers
-    # like to wrap large dependency lists on column 80 (with \), and
-    # we should not choose a depcomp mode which is confused by this.
-    #
-    # We need to recreate these files for each test, as the compiler may
-    # overwrite some of them when testing with obscure command lines.
-    # This happens at least with the AIX C compiler.
-    : > sub/conftest.c
-    for i in 1 2 3 4 5 6; do
-      echo '#include "conftst'$i'.h"' >> sub/conftest.c
-      # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with
-      # Solaris 10 /bin/sh.
-      echo '/* dummy */' > sub/conftst$i.h
-    done
-    echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
-
-    # We check with '-c' and '-o' for the sake of the "dashmstdout"
-    # mode.  It turns out that the SunPro C++ compiler does not properly
-    # handle '-M -o', and we need to detect this.  Also, some Intel
-    # versions had trouble with output in subdirs.
-    am__obj=sub/conftest.${OBJEXT-o}
-    am__minus_obj="-o $am__obj"
-    case $depmode in
-    gcc)
-      # This depmode causes a compiler race in universal mode.
-      test "$am__universal" = false || continue
-      ;;
-    nosideeffect)
-      # After this tag, mechanisms are not by side-effect, so they'll
-      # only be used when explicitly requested.
-      if test "x$enable_dependency_tracking" = xyes; then
-	continue
-      else
-	break
-      fi
-      ;;
-    msvc7 | msvc7msys | msvisualcpp | msvcmsys)
-      # This compiler won't grok '-c -o', but also, the minuso test has
-      # not run yet.  These depmodes are late enough in the game, and
-      # so weak that their functioning should not be impacted.
-      am__obj=conftest.${OBJEXT-o}
-      am__minus_obj=
-      ;;
-    none) break ;;
-    esac
-    if depmode=$depmode \
-       source=sub/conftest.c object=$am__obj \
-       depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
-       $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \
-         >/dev/null 2>conftest.err &&
-       grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
-       grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
-       grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&
-       ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
-      # icc doesn't choke on unknown options, it will just issue warnings
-      # or remarks (even with -Werror).  So we grep stderr for any message
-      # that says an option was ignored or not supported.
-      # When given -MP, icc 7.0 and 7.1 complain thusly:
-      #   icc: Command line warning: ignoring option '-M'; no argument required
-      # The diagnosis changed in icc 8.0:
-      #   icc: Command line remark: option '-MP' not supported
-      if (grep 'ignoring option' conftest.err ||
-          grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
-        am_cv_$1_dependencies_compiler_type=$depmode
-        break
-      fi
-    fi
-  done
-
-  cd ..
-  rm -rf conftest.dir
-else
-  am_cv_$1_dependencies_compiler_type=none
-fi
-])
-AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type])
-AM_CONDITIONAL([am__fastdep$1], [
-  test "x$enable_dependency_tracking" != xno \
-  && test "$am_cv_$1_dependencies_compiler_type" = gcc3])
-])
-
-
-# AM_SET_DEPDIR
-# -------------
-# Choose a directory name for dependency files.
-# This macro is AC_REQUIREd in _AM_DEPENDENCIES.
-AC_DEFUN([AM_SET_DEPDIR],
-[AC_REQUIRE([AM_SET_LEADING_DOT])dnl
-AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl
-])
-
-
-# AM_DEP_TRACK
-# ------------
-AC_DEFUN([AM_DEP_TRACK],
-[AC_ARG_ENABLE([dependency-tracking], [dnl
-AS_HELP_STRING(
-  [--enable-dependency-tracking],
-  [do not reject slow dependency extractors])
-AS_HELP_STRING(
-  [--disable-dependency-tracking],
-  [speeds up one-time build])])
-if test "x$enable_dependency_tracking" != xno; then
-  am_depcomp="$ac_aux_dir/depcomp"
-  AMDEPBACKSLASH='\'
-  am__nodep='_no'
-fi
-AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
-AC_SUBST([AMDEPBACKSLASH])dnl
-_AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl
-AC_SUBST([am__nodep])dnl
-_AM_SUBST_NOTMAKE([am__nodep])dnl
-])
-
-# Generate code to set up dependency tracking.              -*- Autoconf -*-
-
-# Copyright (C) 1999-2018 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# _AM_OUTPUT_DEPENDENCY_COMMANDS
-# ------------------------------
-AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
-[{
-  # Older Autoconf quotes --file arguments for eval, but not when files
-  # are listed without --file.  Let's play safe and only enable the eval
-  # if we detect the quoting.
-  # TODO: see whether this extra hack can be removed once we start
-  # requiring Autoconf 2.70 or later.
-  AS_CASE([$CONFIG_FILES],
-          [*\'*], [eval set x "$CONFIG_FILES"],
-          [*], [set x $CONFIG_FILES])
-  shift
-  # Used to flag and report bootstrapping failures.
-  am_rc=0
-  for am_mf
-  do
-    # Strip MF so we end up with the name of the file.
-    am_mf=`AS_ECHO(["$am_mf"]) | sed -e 's/:.*$//'`
-    # Check whether this is an Automake generated Makefile which includes
-    # dependency-tracking related rules and includes.
-    # Grep'ing the whole file directly is not great: AIX grep has a line
-    # limit of 2048, but all sed's we know have understand at least 4000.
-    sed -n 's,^am--depfiles:.*,X,p' "$am_mf" | grep X >/dev/null 2>&1 \
-      || continue
-    am_dirpart=`AS_DIRNAME(["$am_mf"])`
-    am_filepart=`AS_BASENAME(["$am_mf"])`
-    AM_RUN_LOG([cd "$am_dirpart" \
-      && sed -e '/# am--include-marker/d' "$am_filepart" \
-        | $MAKE -f - am--depfiles]) || am_rc=$?
-  done
-  if test $am_rc -ne 0; then
-    AC_MSG_FAILURE([Something went wrong bootstrapping makefile fragments
-    for automatic dependency tracking.  Try re-running configure with the
-    '--disable-dependency-tracking' option to at least be able to build
-    the package (albeit without support for automatic dependency tracking).])
-  fi
-  AS_UNSET([am_dirpart])
-  AS_UNSET([am_filepart])
-  AS_UNSET([am_mf])
-  AS_UNSET([am_rc])
-  rm -f conftest-deps.mk
-}
-])# _AM_OUTPUT_DEPENDENCY_COMMANDS
-
-
-# AM_OUTPUT_DEPENDENCY_COMMANDS
-# -----------------------------
-# This macro should only be invoked once -- use via AC_REQUIRE.
-#
-# This code is only required when automatic dependency tracking is enabled.
-# This creates each '.Po' and '.Plo' makefile fragment that we'll need in
-# order to bootstrap the dependency handling code.
-AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
-[AC_CONFIG_COMMANDS([depfiles],
-     [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS],
-     [AMDEP_TRUE="$AMDEP_TRUE" MAKE="${MAKE-make}"])])
-
-# Do all the work for Automake.                             -*- Autoconf -*-
-
-# Copyright (C) 1996-2018 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This macro actually does too much.  Some checks are only needed if
-# your package does certain things.  But this isn't really a big deal.
-
-dnl Redefine AC_PROG_CC to automatically invoke _AM_PROG_CC_C_O.
-m4_define([AC_PROG_CC],
-m4_defn([AC_PROG_CC])
-[_AM_PROG_CC_C_O
-])
-
-# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE])
-# AM_INIT_AUTOMAKE([OPTIONS])
-# -----------------------------------------------
-# The call with PACKAGE and VERSION arguments is the old style
-# call (pre autoconf-2.50), which is being phased out.  PACKAGE
-# and VERSION should now be passed to AC_INIT and removed from
-# the call to AM_INIT_AUTOMAKE.
-# We support both call styles for the transition.  After
-# the next Automake release, Autoconf can make the AC_INIT
-# arguments mandatory, and then we can depend on a new Autoconf
-# release and drop the old call support.
-AC_DEFUN([AM_INIT_AUTOMAKE],
-[AC_PREREQ([2.65])dnl
-dnl Autoconf wants to disallow AM_ names.  We explicitly allow
-dnl the ones we care about.
-m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
-AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
-AC_REQUIRE([AC_PROG_INSTALL])dnl
-if test "`cd $srcdir && pwd`" != "`pwd`"; then
-  # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
-  # is not polluted with repeated "-I."
-  AC_SUBST([am__isrc], [' -I$(srcdir)'])_AM_SUBST_NOTMAKE([am__isrc])dnl
-  # test to see if srcdir already configured
-  if test -f $srcdir/config.status; then
-    AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
-  fi
-fi
-
-# test whether we have cygpath
-if test -z "$CYGPATH_W"; then
-  if (cygpath --version) >/dev/null 2>/dev/null; then
-    CYGPATH_W='cygpath -w'
-  else
-    CYGPATH_W=echo
-  fi
-fi
-AC_SUBST([CYGPATH_W])
-
-# Define the identity of the package.
-dnl Distinguish between old-style and new-style calls.
-m4_ifval([$2],
-[AC_DIAGNOSE([obsolete],
-             [$0: two- and three-arguments forms are deprecated.])
-m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
- AC_SUBST([PACKAGE], [$1])dnl
- AC_SUBST([VERSION], [$2])],
-[_AM_SET_OPTIONS([$1])dnl
-dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT.
-m4_if(
-  m4_ifdef([AC_PACKAGE_NAME], [ok]):m4_ifdef([AC_PACKAGE_VERSION], [ok]),
-  [ok:ok],,
-  [m4_fatal([AC_INIT should be called with package and version arguments])])dnl
- AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
- AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl
-
-_AM_IF_OPTION([no-define],,
-[AC_DEFINE_UNQUOTED([PACKAGE], ["$PACKAGE"], [Name of package])
- AC_DEFINE_UNQUOTED([VERSION], ["$VERSION"], [Version number of package])])dnl
-
-# Some tools Automake needs.
-AC_REQUIRE([AM_SANITY_CHECK])dnl
-AC_REQUIRE([AC_ARG_PROGRAM])dnl
-AM_MISSING_PROG([ACLOCAL], [aclocal-${am__api_version}])
-AM_MISSING_PROG([AUTOCONF], [autoconf])
-AM_MISSING_PROG([AUTOMAKE], [automake-${am__api_version}])
-AM_MISSING_PROG([AUTOHEADER], [autoheader])
-AM_MISSING_PROG([MAKEINFO], [makeinfo])
-AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
-AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl
-AC_REQUIRE([AC_PROG_MKDIR_P])dnl
-# For better backward compatibility.  To be removed once Automake 1.9.x
-# dies out for good.  For more background, see:
-# <https://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
-# <https://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
-AC_SUBST([mkdir_p], ['$(MKDIR_P)'])
-# We need awk for the "check" target (and possibly the TAP driver).  The
-# system "awk" is bad on some platforms.
-AC_REQUIRE([AC_PROG_AWK])dnl
-AC_REQUIRE([AC_PROG_MAKE_SET])dnl
-AC_REQUIRE([AM_SET_LEADING_DOT])dnl
-_AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])],
-	      [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])],
-			     [_AM_PROG_TAR([v7])])])
-_AM_IF_OPTION([no-dependencies],,
-[AC_PROVIDE_IFELSE([AC_PROG_CC],
-		  [_AM_DEPENDENCIES([CC])],
-		  [m4_define([AC_PROG_CC],
-			     m4_defn([AC_PROG_CC])[_AM_DEPENDENCIES([CC])])])dnl
-AC_PROVIDE_IFELSE([AC_PROG_CXX],
-		  [_AM_DEPENDENCIES([CXX])],
-		  [m4_define([AC_PROG_CXX],
-			     m4_defn([AC_PROG_CXX])[_AM_DEPENDENCIES([CXX])])])dnl
-AC_PROVIDE_IFELSE([AC_PROG_OBJC],
-		  [_AM_DEPENDENCIES([OBJC])],
-		  [m4_define([AC_PROG_OBJC],
-			     m4_defn([AC_PROG_OBJC])[_AM_DEPENDENCIES([OBJC])])])dnl
-AC_PROVIDE_IFELSE([AC_PROG_OBJCXX],
-		  [_AM_DEPENDENCIES([OBJCXX])],
-		  [m4_define([AC_PROG_OBJCXX],
-			     m4_defn([AC_PROG_OBJCXX])[_AM_DEPENDENCIES([OBJCXX])])])dnl
-])
-AC_REQUIRE([AM_SILENT_RULES])dnl
-dnl The testsuite driver may need to know about EXEEXT, so add the
-dnl 'am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen.  This
-dnl macro is hooked onto _AC_COMPILER_EXEEXT early, see below.
-AC_CONFIG_COMMANDS_PRE(dnl
-[m4_provide_if([_AM_COMPILER_EXEEXT],
-  [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl
-
-# POSIX will say in a future version that running "rm -f" with no argument
-# is OK; and we want to be able to make that assumption in our Makefile
-# recipes.  So use an aggressive probe to check that the usage we want is
-# actually supported "in the wild" to an acceptable degree.
-# See automake bug#10828.
-# To make any issue more visible, cause the running configure to be aborted
-# by default if the 'rm' program in use doesn't match our expectations; the
-# user can still override this though.
-if rm -f && rm -fr && rm -rf; then : OK; else
-  cat >&2 <<'END'
-Oops!
-
-Your 'rm' program seems unable to run without file operands specified
-on the command line, even when the '-f' option is present.  This is contrary
-to the behaviour of most rm programs out there, and not conforming with
-the upcoming POSIX standard: <http://austingroupbugs.net/view.php?id=542>
-
-Please tell bug-automake@gnu.org about your system, including the value
-of your $PATH and any error possibly output before this message.  This
-can help us improve future automake versions.
-
-END
-  if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then
-    echo 'Configuration will proceed anyway, since you have set the' >&2
-    echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2
-    echo >&2
-  else
-    cat >&2 <<'END'
-Aborting the configuration process, to ensure you take notice of the issue.
-
-You can download and install GNU coreutils to get an 'rm' implementation
-that behaves properly: <https://www.gnu.org/software/coreutils/>.
-
-If you want to complete the configuration process using your problematic
-'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM
-to "yes", and re-run configure.
-
-END
-    AC_MSG_ERROR([Your 'rm' program is bad, sorry.])
-  fi
-fi
-dnl The trailing newline in this macro's definition is deliberate, for
-dnl backward compatibility and to allow trailing 'dnl'-style comments
-dnl after the AM_INIT_AUTOMAKE invocation. See automake bug#16841.
-])
-
-dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion.  Do not
-dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further
-dnl mangled by Autoconf and run in a shell conditional statement.
-m4_define([_AC_COMPILER_EXEEXT],
-m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])])
-
-# When config.status generates a header, we must update the stamp-h file.
-# This file resides in the same directory as the config header
-# that is generated.  The stamp files are numbered to have different names.
-
-# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the
-# loop where config.status creates the headers, so we can generate
-# our stamp files there.
-AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK],
-[# Compute $1's index in $config_headers.
-_am_arg=$1
-_am_stamp_count=1
-for _am_header in $config_headers :; do
-  case $_am_header in
-    $_am_arg | $_am_arg:* )
-      break ;;
-    * )
-      _am_stamp_count=`expr $_am_stamp_count + 1` ;;
-  esac
-done
-echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
-
-# Copyright (C) 2001-2018 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# AM_PROG_INSTALL_SH
-# ------------------
-# Define $install_sh.
-AC_DEFUN([AM_PROG_INSTALL_SH],
-[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
-if test x"${install_sh+set}" != xset; then
-  case $am_aux_dir in
-  *\ * | *\	*)
-    install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
-  *)
-    install_sh="\${SHELL} $am_aux_dir/install-sh"
-  esac
-fi
-AC_SUBST([install_sh])])
-
-# Copyright (C) 2003-2018 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# Check whether the underlying file-system supports filenames
-# with a leading dot.  For instance MS-DOS doesn't.
-AC_DEFUN([AM_SET_LEADING_DOT],
-[rm -rf .tst 2>/dev/null
-mkdir .tst 2>/dev/null
-if test -d .tst; then
-  am__leading_dot=.
-else
-  am__leading_dot=_
-fi
-rmdir .tst 2>/dev/null
-AC_SUBST([am__leading_dot])])
-
-# Check to see how 'make' treats includes.	            -*- Autoconf -*-
-
-# Copyright (C) 2001-2018 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# AM_MAKE_INCLUDE()
-# -----------------
-# Check whether make has an 'include' directive that can support all
-# the idioms we need for our automatic dependency tracking code.
-AC_DEFUN([AM_MAKE_INCLUDE],
-[AC_MSG_CHECKING([whether ${MAKE-make} supports the include directive])
-cat > confinc.mk << 'END'
-am__doit:
-	@echo this is the am__doit target >confinc.out
-.PHONY: am__doit
-END
-am__include="#"
-am__quote=
-# BSD make does it like this.
-echo '.include "confinc.mk" # ignored' > confmf.BSD
-# Other make implementations (GNU, Solaris 10, AIX) do it like this.
-echo 'include confinc.mk # ignored' > confmf.GNU
-_am_result=no
-for s in GNU BSD; do
-  AM_RUN_LOG([${MAKE-make} -f confmf.$s && cat confinc.out])
-  AS_CASE([$?:`cat confinc.out 2>/dev/null`],
-      ['0:this is the am__doit target'],
-      [AS_CASE([$s],
-          [BSD], [am__include='.include' am__quote='"'],
-          [am__include='include' am__quote=''])])
-  if test "$am__include" != "#"; then
-    _am_result="yes ($s style)"
-    break
-  fi
-done
-rm -f confinc.* confmf.*
-AC_MSG_RESULT([${_am_result}])
-AC_SUBST([am__include])])
-AC_SUBST([am__quote])])
-
-# Fake the existence of programs that GNU maintainers use.  -*- Autoconf -*-
-
-# Copyright (C) 1997-2018 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# AM_MISSING_PROG(NAME, PROGRAM)
-# ------------------------------
-AC_DEFUN([AM_MISSING_PROG],
-[AC_REQUIRE([AM_MISSING_HAS_RUN])
-$1=${$1-"${am_missing_run}$2"}
-AC_SUBST($1)])
-
-# AM_MISSING_HAS_RUN
-# ------------------
-# Define MISSING if not defined so far and test if it is modern enough.
-# If it is, set am_missing_run to use it, otherwise, to nothing.
-AC_DEFUN([AM_MISSING_HAS_RUN],
-[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
-AC_REQUIRE_AUX_FILE([missing])dnl
-if test x"${MISSING+set}" != xset; then
-  case $am_aux_dir in
-  *\ * | *\	*)
-    MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;;
-  *)
-    MISSING="\${SHELL} $am_aux_dir/missing" ;;
-  esac
-fi
-# Use eval to expand $SHELL
-if eval "$MISSING --is-lightweight"; then
-  am_missing_run="$MISSING "
-else
-  am_missing_run=
-  AC_MSG_WARN(['missing' script is too old or missing])
-fi
-])
-
-# Helper functions for option handling.                     -*- Autoconf -*-
-
-# Copyright (C) 2001-2018 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# _AM_MANGLE_OPTION(NAME)
-# -----------------------
-AC_DEFUN([_AM_MANGLE_OPTION],
-[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])])
-
-# _AM_SET_OPTION(NAME)
-# --------------------
-# Set option NAME.  Presently that only means defining a flag for this option.
-AC_DEFUN([_AM_SET_OPTION],
-[m4_define(_AM_MANGLE_OPTION([$1]), [1])])
-
-# _AM_SET_OPTIONS(OPTIONS)
-# ------------------------
-# OPTIONS is a space-separated list of Automake options.
-AC_DEFUN([_AM_SET_OPTIONS],
-[m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
-
-# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET])
-# -------------------------------------------
-# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise.
-AC_DEFUN([_AM_IF_OPTION],
-[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
-
-# Copyright (C) 1999-2018 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# _AM_PROG_CC_C_O
-# ---------------
-# Like AC_PROG_CC_C_O, but changed for automake.  We rewrite AC_PROG_CC
-# to automatically call this.
-AC_DEFUN([_AM_PROG_CC_C_O],
-[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
-AC_REQUIRE_AUX_FILE([compile])dnl
-AC_LANG_PUSH([C])dnl
-AC_CACHE_CHECK(
-  [whether $CC understands -c and -o together],
-  [am_cv_prog_cc_c_o],
-  [AC_LANG_CONFTEST([AC_LANG_PROGRAM([])])
-  # Make sure it works both with $CC and with simple cc.
-  # Following AC_PROG_CC_C_O, we do the test twice because some
-  # compilers refuse to overwrite an existing .o file with -o,
-  # though they will create one.
-  am_cv_prog_cc_c_o=yes
-  for am_i in 1 2; do
-    if AM_RUN_LOG([$CC -c conftest.$ac_ext -o conftest2.$ac_objext]) \
-         && test -f conftest2.$ac_objext; then
-      : OK
-    else
-      am_cv_prog_cc_c_o=no
-      break
-    fi
-  done
-  rm -f core conftest*
-  unset am_i])
-if test "$am_cv_prog_cc_c_o" != yes; then
-   # Losing compiler, so override with the script.
-   # FIXME: It is wrong to rewrite CC.
-   # But if we don't then we get into trouble of one sort or another.
-   # A longer-term fix would be to have automake use am__CC in this case,
-   # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
-   CC="$am_aux_dir/compile $CC"
-fi
-AC_LANG_POP([C])])
-
-# For backward compatibility.
-AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])])
-
-# Copyright (C) 2001-2018 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# AM_RUN_LOG(COMMAND)
-# -------------------
-# Run COMMAND, save the exit status in ac_status, and log it.
-# (This has been adapted from Autoconf's _AC_RUN_LOG macro.)
-AC_DEFUN([AM_RUN_LOG],
-[{ echo "$as_me:$LINENO: $1" >&AS_MESSAGE_LOG_FD
-   ($1) >&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
-   (exit $ac_status); }])
-
-# Check to make sure that the build environment is sane.    -*- Autoconf -*-
-
-# Copyright (C) 1996-2018 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# AM_SANITY_CHECK
-# ---------------
-AC_DEFUN([AM_SANITY_CHECK],
-[AC_MSG_CHECKING([whether build environment is sane])
-# Reject unsafe characters in $srcdir or the absolute working directory
-# name.  Accept space and tab only in the latter.
-am_lf='
-'
-case `pwd` in
-  *[[\\\"\#\$\&\'\`$am_lf]]*)
-    AC_MSG_ERROR([unsafe absolute working directory name]);;
-esac
-case $srcdir in
-  *[[\\\"\#\$\&\'\`$am_lf\ \	]]*)
-    AC_MSG_ERROR([unsafe srcdir value: '$srcdir']);;
-esac
-
-# Do 'set' in a subshell so we don't clobber the current shell's
-# arguments.  Must try -L first in case configure is actually a
-# symlink; some systems play weird games with the mod time of symlinks
-# (eg FreeBSD returns the mod time of the symlink's containing
-# directory).
-if (
-   am_has_slept=no
-   for am_try in 1 2; do
-     echo "timestamp, slept: $am_has_slept" > conftest.file
-     set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
-     if test "$[*]" = "X"; then
-	# -L didn't work.
-	set X `ls -t "$srcdir/configure" conftest.file`
-     fi
-     if test "$[*]" != "X $srcdir/configure conftest.file" \
-	&& test "$[*]" != "X conftest.file $srcdir/configure"; then
-
-	# If neither matched, then we have a broken ls.  This can happen
-	# if, for instance, CONFIG_SHELL is bash and it inherits a
-	# broken ls alias from the environment.  This has actually
-	# happened.  Such a system could not be considered "sane".
-	AC_MSG_ERROR([ls -t appears to fail.  Make sure there is not a broken
-  alias in your environment])
-     fi
-     if test "$[2]" = conftest.file || test $am_try -eq 2; then
-       break
-     fi
-     # Just in case.
-     sleep 1
-     am_has_slept=yes
-   done
-   test "$[2]" = conftest.file
-   )
-then
-   # Ok.
-   :
-else
-   AC_MSG_ERROR([newly created file is older than distributed files!
-Check your system clock])
-fi
-AC_MSG_RESULT([yes])
-# If we didn't sleep, we still need to ensure time stamps of config.status and
-# generated files are strictly newer.
-am_sleep_pid=
-if grep 'slept: no' conftest.file >/dev/null 2>&1; then
-  ( sleep 1 ) &
-  am_sleep_pid=$!
-fi
-AC_CONFIG_COMMANDS_PRE(
-  [AC_MSG_CHECKING([that generated files are newer than configure])
-   if test -n "$am_sleep_pid"; then
-     # Hide warnings about reused PIDs.
-     wait $am_sleep_pid 2>/dev/null
-   fi
-   AC_MSG_RESULT([done])])
-rm -f conftest.file
-])
-
-# Copyright (C) 2009-2018 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# AM_SILENT_RULES([DEFAULT])
-# --------------------------
-# Enable less verbose build rules; with the default set to DEFAULT
-# ("yes" being less verbose, "no" or empty being verbose).
-AC_DEFUN([AM_SILENT_RULES],
-[AC_ARG_ENABLE([silent-rules], [dnl
-AS_HELP_STRING(
-  [--enable-silent-rules],
-  [less verbose build output (undo: "make V=1")])
-AS_HELP_STRING(
-  [--disable-silent-rules],
-  [verbose build output (undo: "make V=0")])dnl
-])
-case $enable_silent_rules in @%:@ (((
-  yes) AM_DEFAULT_VERBOSITY=0;;
-   no) AM_DEFAULT_VERBOSITY=1;;
-    *) AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1]);;
-esac
-dnl
-dnl A few 'make' implementations (e.g., NonStop OS and NextStep)
-dnl do not support nested variable expansions.
-dnl See automake bug#9928 and bug#10237.
-am_make=${MAKE-make}
-AC_CACHE_CHECK([whether $am_make supports nested variables],
-   [am_cv_make_support_nested_variables],
-   [if AS_ECHO([['TRUE=$(BAR$(V))
-BAR0=false
-BAR1=true
-V=1
-am__doit:
-	@$(TRUE)
-.PHONY: am__doit']]) | $am_make -f - >/dev/null 2>&1; then
-  am_cv_make_support_nested_variables=yes
-else
-  am_cv_make_support_nested_variables=no
-fi])
-if test $am_cv_make_support_nested_variables = yes; then
-  dnl Using '$V' instead of '$(V)' breaks IRIX make.
-  AM_V='$(V)'
-  AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)'
-else
-  AM_V=$AM_DEFAULT_VERBOSITY
-  AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY
-fi
-AC_SUBST([AM_V])dnl
-AM_SUBST_NOTMAKE([AM_V])dnl
-AC_SUBST([AM_DEFAULT_V])dnl
-AM_SUBST_NOTMAKE([AM_DEFAULT_V])dnl
-AC_SUBST([AM_DEFAULT_VERBOSITY])dnl
-AM_BACKSLASH='\'
-AC_SUBST([AM_BACKSLASH])dnl
-_AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl
-])
-
-# Copyright (C) 2001-2018 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# AM_PROG_INSTALL_STRIP
-# ---------------------
-# One issue with vendor 'install' (even GNU) is that you can't
-# specify the program used to strip binaries.  This is especially
-# annoying in cross-compiling environments, where the build's strip
-# is unlikely to handle the host's binaries.
-# Fortunately install-sh will honor a STRIPPROG variable, so we
-# always use install-sh in "make install-strip", and initialize
-# STRIPPROG with the value of the STRIP variable (set by the user).
-AC_DEFUN([AM_PROG_INSTALL_STRIP],
-[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
-# Installed binaries are usually stripped using 'strip' when the user
-# run "make install-strip".  However 'strip' might not be the right
-# tool to use in cross-compilation environments, therefore Automake
-# will honor the 'STRIP' environment variable to overrule this program.
-dnl Don't test for $cross_compiling = yes, because it might be 'maybe'.
-if test "$cross_compiling" != no; then
-  AC_CHECK_TOOL([STRIP], [strip], :)
-fi
-INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
-AC_SUBST([INSTALL_STRIP_PROGRAM])])
-
-# Copyright (C) 2006-2018 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# _AM_SUBST_NOTMAKE(VARIABLE)
-# ---------------------------
-# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in.
-# This macro is traced by Automake.
-AC_DEFUN([_AM_SUBST_NOTMAKE])
-
-# AM_SUBST_NOTMAKE(VARIABLE)
-# --------------------------
-# Public sister of _AM_SUBST_NOTMAKE.
-AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
-
-# Check how to create a tarball.                            -*- Autoconf -*-
-
-# Copyright (C) 2004-2018 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# _AM_PROG_TAR(FORMAT)
-# --------------------
-# Check how to create a tarball in format FORMAT.
-# FORMAT should be one of 'v7', 'ustar', or 'pax'.
-#
-# Substitute a variable $(am__tar) that is a command
-# writing to stdout a FORMAT-tarball containing the directory
-# $tardir.
-#     tardir=directory && $(am__tar) > result.tar
-#
-# Substitute a variable $(am__untar) that extract such
-# a tarball read from stdin.
-#     $(am__untar) < result.tar
-#
-AC_DEFUN([_AM_PROG_TAR],
-[# Always define AMTAR for backward compatibility.  Yes, it's still used
-# in the wild :-(  We should find a proper way to deprecate it ...
-AC_SUBST([AMTAR], ['$${TAR-tar}'])
-
-# We'll loop over all known methods to create a tar archive until one works.
-_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none'
-
-m4_if([$1], [v7],
-  [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'],
-
-  [m4_case([$1],
-    [ustar],
-     [# The POSIX 1988 'ustar' format is defined with fixed-size fields.
-      # There is notably a 21 bits limit for the UID and the GID.  In fact,
-      # the 'pax' utility can hang on bigger UID/GID (see automake bug#8343
-      # and bug#13588).
-      am_max_uid=2097151 # 2^21 - 1
-      am_max_gid=$am_max_uid
-      # The $UID and $GID variables are not portable, so we need to resort
-      # to the POSIX-mandated id(1) utility.  Errors in the 'id' calls
-      # below are definitely unexpected, so allow the users to see them
-      # (that is, avoid stderr redirection).
-      am_uid=`id -u || echo unknown`
-      am_gid=`id -g || echo unknown`
-      AC_MSG_CHECKING([whether UID '$am_uid' is supported by ustar format])
-      if test $am_uid -le $am_max_uid; then
-         AC_MSG_RESULT([yes])
-      else
-         AC_MSG_RESULT([no])
-         _am_tools=none
-      fi
-      AC_MSG_CHECKING([whether GID '$am_gid' is supported by ustar format])
-      if test $am_gid -le $am_max_gid; then
-         AC_MSG_RESULT([yes])
-      else
-        AC_MSG_RESULT([no])
-        _am_tools=none
-      fi],
-
-  [pax],
-    [],
-
-  [m4_fatal([Unknown tar format])])
-
-  AC_MSG_CHECKING([how to create a $1 tar archive])
-
-  # Go ahead even if we have the value already cached.  We do so because we
-  # need to set the values for the 'am__tar' and 'am__untar' variables.
-  _am_tools=${am_cv_prog_tar_$1-$_am_tools}
-
-  for _am_tool in $_am_tools; do
-    case $_am_tool in
-    gnutar)
-      for _am_tar in tar gnutar gtar; do
-        AM_RUN_LOG([$_am_tar --version]) && break
-      done
-      am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"'
-      am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"'
-      am__untar="$_am_tar -xf -"
-      ;;
-    plaintar)
-      # Must skip GNU tar: if it does not support --format= it doesn't create
-      # ustar tarball either.
-      (tar --version) >/dev/null 2>&1 && continue
-      am__tar='tar chf - "$$tardir"'
-      am__tar_='tar chf - "$tardir"'
-      am__untar='tar xf -'
-      ;;
-    pax)
-      am__tar='pax -L -x $1 -w "$$tardir"'
-      am__tar_='pax -L -x $1 -w "$tardir"'
-      am__untar='pax -r'
-      ;;
-    cpio)
-      am__tar='find "$$tardir" -print | cpio -o -H $1 -L'
-      am__tar_='find "$tardir" -print | cpio -o -H $1 -L'
-      am__untar='cpio -i -H $1 -d'
-      ;;
-    none)
-      am__tar=false
-      am__tar_=false
-      am__untar=false
-      ;;
-    esac
-
-    # If the value was cached, stop now.  We just wanted to have am__tar
-    # and am__untar set.
-    test -n "${am_cv_prog_tar_$1}" && break
-
-    # tar/untar a dummy directory, and stop if the command works.
-    rm -rf conftest.dir
-    mkdir conftest.dir
-    echo GrepMe > conftest.dir/file
-    AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar])
-    rm -rf conftest.dir
-    if test -s conftest.tar; then
-      AM_RUN_LOG([$am__untar <conftest.tar])
-      AM_RUN_LOG([cat conftest.dir/file])
-      grep GrepMe conftest.dir/file >/dev/null 2>&1 && break
-    fi
-  done
-  rm -rf conftest.dir
-
-  AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool])
-  AC_MSG_RESULT([$am_cv_prog_tar_$1])])
-
-AC_SUBST([am__tar])
-AC_SUBST([am__untar])
-]) # _AM_PROG_TAR
-
diff --git a/submodules/libtgvoip/audio/AudioIO.cpp b/submodules/libtgvoip/audio/AudioIO.cpp
deleted file mode 100644
index 2c16ca701f..0000000000
--- a/submodules/libtgvoip/audio/AudioIO.cpp
+++ /dev/null
@@ -1,92 +0,0 @@
-//
-// libtgvoip is free and unencumbered public domain software.
-// For more information, see http://unlicense.org or the UNLICENSE file
-// you should have received with this source code distribution.
-//
-
-
-#include "AudioIO.h"
-#include "../logging.h"
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#if defined(TGVOIP_USE_CALLBACK_AUDIO_IO)
-#include "AudioIOCallback.h"
-#elif defined(__ANDROID__)
-#include "../os/android/AudioInputAndroid.h"
-#include "../os/android/AudioOutputAndroid.h"
-#elif defined(__APPLE__)
-#include <TargetConditionals.h>
-#include "../os/darwin/AudioUnitIO.h"
-#if TARGET_OS_OSX
-#include "../os/darwin/AudioInputAudioUnitOSX.h"
-#include "../os/darwin/AudioOutputAudioUnitOSX.h"
-#endif
-#elif defined(_WIN32)
-#ifdef TGVOIP_WINXP_COMPAT
-#include "../os/windows/AudioInputWave.h"
-#include "../os/windows/AudioOutputWave.h"
-#endif
-#include "../os/windows/AudioInputWASAPI.h"
-#include "../os/windows/AudioOutputWASAPI.h"
-#elif defined(__linux__) || defined(__FreeBSD_kernel__) || defined(__gnu_hurd__)
-#ifndef WITHOUT_ALSA
-#include "../os/linux/AudioInputALSA.h"
-#include "../os/linux/AudioOutputALSA.h"
-#endif
-#ifndef WITHOUT_PULSE
-#include "../os/linux/AudioPulse.h"
-#endif
-#else
-#error "Unsupported operating system"
-#endif
-
-using namespace tgvoip;
-using namespace tgvoip::audio;
-using namespace std;
-
-AudioIO* AudioIO::Create(std::string inputDevice, std::string outputDevice){
-#if defined(TGVOIP_USE_CALLBACK_AUDIO_IO)
-	return new AudioIOCallback();
-#elif defined(__ANDROID__)
-	return new ContextlessAudioIO<AudioInputAndroid, AudioOutputAndroid>();
-#elif defined(__APPLE__)
-#if TARGET_OS_OSX
-	if(kCFCoreFoundationVersionNumber<kCFCoreFoundationVersionNumber10_7)
-		return new ContextlessAudioIO<AudioInputAudioUnitLegacy, AudioOutputAudioUnitLegacy>(inputDevice, outputDevice);
-
-#endif
-	return new AudioUnitIO(inputDevice, outputDevice);
-#elif defined(_WIN32)
-#ifdef TGVOIP_WINXP_COMPAT
-	if(LOBYTE(LOWORD(GetVersion()))<6)
-		return new ContextlessAudioIO<AudioInputWave, AudioOutputWave>(inputDevice, outputDevice);
-#endif
-	return new ContextlessAudioIO<AudioInputWASAPI, AudioOutputWASAPI>(inputDevice, outputDevice);
-#elif defined(__linux__)
-#ifndef WITHOUT_ALSA
-#ifndef WITHOUT_PULSE
-	if(AudioPulse::Load()){
-		AudioIO* io=new AudioPulse(inputDevice, outputDevice);
-		if(!io->Failed() && io->GetInput()->IsInitialized() && io->GetOutput()->IsInitialized())
-			return io;
-		LOGW("PulseAudio available but not working; trying ALSA");
-		delete io;
-	}
-#endif
-	return new ContextlessAudioIO<AudioInputALSA, AudioOutputALSA>(inputDevice, outputDevice);
-#else
-	return new AudioPulse(inputDevice, outputDevice);
-#endif
-#endif
-}
-
-bool AudioIO::Failed(){
-	return failed;
-}
-
-std::string AudioIO::GetErrorDescription(){
-	return error;
-}
diff --git a/submodules/libtgvoip/audio/AudioIO.h b/submodules/libtgvoip/audio/AudioIO.h
deleted file mode 100644
index e60af25b51..0000000000
--- a/submodules/libtgvoip/audio/AudioIO.h
+++ /dev/null
@@ -1,65 +0,0 @@
-//
-// libtgvoip is free and unencumbered public domain software.
-// For more information, see http://unlicense.org or the UNLICENSE file
-// you should have received with this source code distribution.
-//
-
-
-#ifndef LIBTGVOIP_AUDIOIO_H
-#define LIBTGVOIP_AUDIOIO_H
-
-#include "AudioInput.h"
-#include "AudioOutput.h"
-#include "../utils.h"
-#include <memory>
-#include <string>
-
-namespace tgvoip{
-	namespace audio {
-		class AudioIO{
-		public:
-			AudioIO(){};
-			virtual ~AudioIO(){};
-			TGVOIP_DISALLOW_COPY_AND_ASSIGN(AudioIO);
-			static AudioIO* Create(std::string inputDevice, std::string outputDevice);
-			virtual AudioInput* GetInput()=0;
-			virtual AudioOutput* GetOutput()=0;
-			bool Failed();
-			std::string GetErrorDescription();
-		protected:
-			bool failed=false;
-			std::string error;
-		};
-		
-		template<class I, class O> class ContextlessAudioIO : public AudioIO{
-		public:
-			ContextlessAudioIO(){
-				input=new I();
-				output=new O();
-			}
-
-			ContextlessAudioIO(std::string inputDeviceID, std::string outputDeviceID){
-				input=new I(inputDeviceID);
-				output=new O(outputDeviceID);
-			}
-			
-			virtual ~ContextlessAudioIO(){
-				delete input;
-				delete output;
-			}
-			
-			virtual AudioInput* GetInput(){
-				return input;
-			}
-			
-			virtual AudioOutput* GetOutput(){
-				return output;
-			}
-		private:
-			I* input;
-			O* output;
-		};
-	}
-}
-
-#endif //LIBTGVOIP_AUDIOIO_H
diff --git a/submodules/libtgvoip/audio/AudioIOCallback.cpp b/submodules/libtgvoip/audio/AudioIOCallback.cpp
deleted file mode 100644
index 012a705c10..0000000000
--- a/submodules/libtgvoip/audio/AudioIOCallback.cpp
+++ /dev/null
@@ -1,121 +0,0 @@
-//
-// libtgvoip is free and unencumbered public domain software.
-// For more information, see http://unlicense.org or the UNLICENSE file
-// you should have received with this source code distribution.
-//
-
-#include "AudioIOCallback.h"
-#include "../VoIPController.h"
-#include "../logging.h"
-
-using namespace tgvoip;
-using namespace tgvoip::audio;
-
-#pragma mark - IO
-
-AudioIOCallback::AudioIOCallback(){
-	input=new AudioInputCallback();
-	output=new AudioOutputCallback();
-}
-
-AudioIOCallback::~AudioIOCallback(){
-	delete input;
-	delete output;
-}
-
-AudioInput* AudioIOCallback::GetInput(){
-	return input;
-}
-
-AudioOutput* AudioIOCallback::GetOutput(){
-	return output;
-}
-
-#pragma mark - Input
-
-AudioInputCallback::AudioInputCallback(){
-	thread=new Thread(std::bind(&AudioInputCallback::RunThread, this));
-	thread->SetName("AudioInputCallback");
-}
-
-AudioInputCallback::~AudioInputCallback(){
-	running=false;
-	thread->Join();
-	delete thread;
-}
-
-void AudioInputCallback::Start(){
-	if(!running){
-		running=true;
-		thread->Start();
-	}
-	recording=true;
-}
-
-void AudioInputCallback::Stop(){
-	recording=false;
-}
-
-void AudioInputCallback::SetDataCallback(std::function<void(int16_t*, size_t)> c){
-	dataCallback=c;
-}
-
-void AudioInputCallback::RunThread(){
-	int16_t buf[960];
-	while(running){
-		double t=VoIPController::GetCurrentTime();
-		memset(buf, 0, sizeof(buf));
-		dataCallback(buf, 960);
-		InvokeCallback(reinterpret_cast<unsigned char*>(buf), 960*2);
-		double sl=0.02-(VoIPController::GetCurrentTime()-t);
-		if(sl>0)
-			Thread::Sleep(sl);
-	}
-}
-
-#pragma mark - Output
-
-AudioOutputCallback::AudioOutputCallback(){
-	thread=new Thread(std::bind(&AudioOutputCallback::RunThread, this));
-	thread->SetName("AudioOutputCallback");
-}
-
-AudioOutputCallback::~AudioOutputCallback(){
-	running=false;
-	thread->Join();
-	delete thread;
-}
-
-void AudioOutputCallback::Start(){
-	if(!running){
-		running=true;
-		thread->Start();
-	}
-	playing=true;
-}
-
-void AudioOutputCallback::Stop(){
-	playing=false;
-}
-
-bool AudioOutputCallback::IsPlaying(){
-	return playing;
-}
-
-void AudioOutputCallback::SetDataCallback(std::function<void(int16_t*, size_t)> c){
-	dataCallback=c;
-}
-
-void AudioOutputCallback::RunThread(){
-	int16_t buf[960];
-	while(running){
-		double t=VoIPController::GetCurrentTime();
-		InvokeCallback(reinterpret_cast<unsigned char*>(buf), 960*2);
-		dataCallback(buf, 960);
-		double sl=0.02-(VoIPController::GetCurrentTime()-t);
-		if(sl>0)
-			Thread::Sleep(sl);
-	}
-}
-
-
diff --git a/submodules/libtgvoip/audio/AudioIOCallback.h b/submodules/libtgvoip/audio/AudioIOCallback.h
deleted file mode 100644
index 4240970f36..0000000000
--- a/submodules/libtgvoip/audio/AudioIOCallback.h
+++ /dev/null
@@ -1,62 +0,0 @@
-//
-// libtgvoip is free and unencumbered public domain software.
-// For more information, see http://unlicense.org or the UNLICENSE file
-// you should have received with this source code distribution.
-//
-
-#ifndef LIBTGVOIP_AUDIO_IO_CALLBACK
-#define LIBTGVOIP_AUDIO_IO_CALLBACK
-
-#include "AudioIO.h"
-#include <functional>
-
-#include "../threading.h"
-
-namespace tgvoip{
-	namespace audio{
-		class AudioInputCallback : public AudioInput{
-		public:
-			AudioInputCallback();
-			virtual ~AudioInputCallback();
-			virtual void Start() override;
-			virtual void Stop() override;
-			void SetDataCallback(std::function<void(int16_t*, size_t)> c);
-		private:
-			void RunThread();
-			bool running=false;
-			bool recording=false;
-			Thread* thread;
-			std::function<void(int16_t*, size_t)> dataCallback;
-		};
-		
-		class AudioOutputCallback : public AudioOutput{
-		public:
-			AudioOutputCallback();
-			virtual ~AudioOutputCallback();
-			virtual void Start() override;
-			virtual void Stop() override;
-			virtual bool IsPlaying() override;
-			void SetDataCallback(std::function<void(int16_t*, size_t)> c);
-		private:
-			void RunThread();
-			bool running=false;
-			bool playing=false;
-			Thread* thread;
-			std::function<void(int16_t*, size_t)> dataCallback;
-		};
-		
-		class AudioIOCallback : public AudioIO{
-		public:
-			AudioIOCallback();
-			virtual ~AudioIOCallback();
-			virtual AudioInput* GetInput() override;
-			virtual AudioOutput* GetOutput() override;
-		private:
-			AudioInputCallback* input;
-			AudioOutputCallback* output;
-		};
-	}
-}
-
-
-#endif /* LIBTGVOIP_AUDIO_IO_CALLBACK */
diff --git a/submodules/libtgvoip/audio/AudioInput.cpp b/submodules/libtgvoip/audio/AudioInput.cpp
deleted file mode 100644
index dae647a1c7..0000000000
--- a/submodules/libtgvoip/audio/AudioInput.cpp
+++ /dev/null
@@ -1,97 +0,0 @@
-//
-// libtgvoip is free and unencumbered public domain software.
-// For more information, see http://unlicense.org or the UNLICENSE file
-// you should have received with this source code distribution.
-//
-
-#include "AudioInput.h"
-#include "../logging.h"
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#if defined(TGVOIP_USE_CALLBACK_AUDIO_IO)
-// nothing
-#elif defined(__ANDROID__)
-#include "../os/android/AudioInputAndroid.h"
-#elif defined(__APPLE__)
-#include <TargetConditionals.h>
-#include "../os/darwin/AudioInputAudioUnit.h"
-#if TARGET_OS_OSX
-#include "../os/darwin/AudioInputAudioUnitOSX.h"
-#endif
-#elif defined(_WIN32)
-#ifdef TGVOIP_WINXP_COMPAT
-#include "../os/windows/AudioInputWave.h"
-#endif
-#include "../os/windows/AudioInputWASAPI.h"
-#elif defined(__linux__) || defined(__FreeBSD_kernel__) || defined(__gnu_hurd__)
-#ifndef WITHOUT_ALSA
-#include "../os/linux/AudioInputALSA.h"
-#endif
-#ifndef WITHOUT_PULSE
-#include "../os/linux/AudioPulse.h"
-#endif
-#else
-#error "Unsupported operating system"
-#endif
-
-using namespace tgvoip;
-using namespace tgvoip::audio;
-
-int32_t AudioInput::estimatedDelay=60;
-
-AudioInput::AudioInput() : currentDevice("default"){
-	failed=false;
-}
-
-AudioInput::AudioInput(std::string deviceID) : currentDevice(deviceID){
-	failed=false;
-}
-
-
-AudioInput::~AudioInput(){
-
-}
-
-bool AudioInput::IsInitialized(){
-	return !failed;
-}
-
-void AudioInput::EnumerateDevices(std::vector<AudioInputDevice>& devs){
-#if defined(TGVOIP_USE_CALLBACK_AUDIO_IO)
-	// not supported
-#elif defined(__APPLE__) && TARGET_OS_OSX
-	AudioInputAudioUnitLegacy::EnumerateDevices(devs);
-#elif defined(_WIN32)
-#ifdef TGVOIP_WINXP_COMPAT
-	if(LOBYTE(LOWORD(GetVersion()))<6){
-		AudioInputWave::EnumerateDevices(devs);
-		return;
-	}
-#endif
-	AudioInputWASAPI::EnumerateDevices(devs);
-#elif defined(__linux__) && !defined(__ANDROID__)
-#if !defined(WITHOUT_PULSE) && !defined(WITHOUT_ALSA)
-	if(!AudioInputPulse::EnumerateDevices(devs))
-		AudioInputALSA::EnumerateDevices(devs);
-#elif defined(WITHOUT_PULSE)
-	AudioInputALSA::EnumerateDevices(devs);
-#else
-	AudioInputPulse::EnumerateDevices(devs)
-#endif
-#endif
-}
-
-std::string AudioInput::GetCurrentDevice(){
-	return currentDevice;
-}
-
-void AudioInput::SetCurrentDevice(std::string deviceID){
-	
-}
-
-int32_t AudioInput::GetEstimatedDelay(){
-	return estimatedDelay;
-}
diff --git a/submodules/libtgvoip/audio/AudioInput.h b/submodules/libtgvoip/audio/AudioInput.h
deleted file mode 100644
index 3fa528dc2d..0000000000
--- a/submodules/libtgvoip/audio/AudioInput.h
+++ /dev/null
@@ -1,41 +0,0 @@
-//
-// libtgvoip is free and unencumbered public domain software.
-// For more information, see http://unlicense.org or the UNLICENSE file
-// you should have received with this source code distribution.
-//
-
-#ifndef LIBTGVOIP_AUDIOINPUT_H
-#define LIBTGVOIP_AUDIOINPUT_H
-
-#include <stdint.h>
-#include <vector>
-#include <string>
-#include "../MediaStreamItf.h"
-
-namespace tgvoip{
-
-class AudioInputDevice;
-class AudioOutputDevice;
-	
-namespace audio{
-class AudioInput : public MediaStreamItf{
-public:
-	AudioInput();
-	AudioInput(std::string deviceID);
-	virtual ~AudioInput();
-
-	bool IsInitialized();
-	virtual std::string GetCurrentDevice();
-	virtual void SetCurrentDevice(std::string deviceID);
-	//static AudioInput* Create(std::string deviceID, void* platformSpecific);
-	static void EnumerateDevices(std::vector<AudioInputDevice>& devs);
-	static int32_t GetEstimatedDelay();
-
-protected:
-	std::string currentDevice;
-	bool failed;
-	static int32_t estimatedDelay;
-};
-}}
-
-#endif //LIBTGVOIP_AUDIOINPUT_H
diff --git a/submodules/libtgvoip/audio/AudioOutput.cpp b/submodules/libtgvoip/audio/AudioOutput.cpp
deleted file mode 100644
index 458e8a5cd2..0000000000
--- a/submodules/libtgvoip/audio/AudioOutput.cpp
+++ /dev/null
@@ -1,109 +0,0 @@
-//
-// libtgvoip is free and unencumbered public domain software.
-// For more information, see http://unlicense.org or the UNLICENSE file
-// you should have received with this source code distribution.
-//
-
-#include "AudioOutput.h"
-#include "../logging.h"
-#include <stdlib.h>
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#if defined(TGVOIP_USE_CALLBACK_AUDIO_IO)
-// nothing
-#elif defined(__ANDROID__)
-#include "../os/android/AudioOutputOpenSLES.h"
-#include "../os/android/AudioOutputAndroid.h"
-#include <sys/system_properties.h>
-#elif defined(__APPLE__)
-#include <TargetConditionals.h>
-#include "../os/darwin/AudioOutputAudioUnit.h"
-#if TARGET_OS_OSX
-#include "../os/darwin/AudioOutputAudioUnitOSX.h"
-#endif
-#elif defined(_WIN32)
-#ifdef TGVOIP_WINXP_COMPAT
-#include "../os/windows/AudioOutputWave.h"
-#endif
-#include "../os/windows/AudioOutputWASAPI.h"
-#elif defined(__linux__) || defined(__FreeBSD_kernel__) || defined(__gnu_hurd__)
-#ifndef WITHOUT_ALSA
-#include "../os/linux/AudioOutputALSA.h"
-#endif
-#ifndef WITHOUT_PULSE
-#include "../os/linux/AudioOutputPulse.h"
-#include "../os/linux/AudioPulse.h"
-#endif
-#else
-#error "Unsupported operating system"
-#endif
-
-using namespace tgvoip;
-using namespace tgvoip::audio;
-
-int32_t AudioOutput::estimatedDelay=60;
-
-AudioOutput::AudioOutput() : currentDevice("default"){
-	failed=false;
-}
-
-AudioOutput::AudioOutput(std::string deviceID) : currentDevice(deviceID){
-	failed=false;
-}
-
-AudioOutput::~AudioOutput(){
-
-}
-
-
-int32_t AudioOutput::GetEstimatedDelay(){
-#if defined(__ANDROID__)
-	char sdkNum[PROP_VALUE_MAX];
-	__system_property_get("ro.build.version.sdk", sdkNum);
-	int systemVersion=atoi(sdkNum);
-	return systemVersion<21 ? 150 : 50;
-#endif
-	return estimatedDelay;
-}
-
-
-void AudioOutput::EnumerateDevices(std::vector<AudioOutputDevice>& devs){
-#if defined(TGVOIP_USE_CALLBACK_AUDIO_IO)
-	// not supported
-#elif defined(__APPLE__) && TARGET_OS_OSX
-	AudioOutputAudioUnitLegacy::EnumerateDevices(devs);
-#elif defined(_WIN32)
-#ifdef TGVOIP_WINXP_COMPAT
-	if(LOBYTE(LOWORD(GetVersion()))<6){
-		AudioOutputWave::EnumerateDevices(devs);
-		return;
-	}
-#endif
-	AudioOutputWASAPI::EnumerateDevices(devs);
-#elif defined(__linux__) && !defined(__ANDROID__)
-#if !defined(WITHOUT_PULSE) && !defined(WITHOUT_ALSA)
-	if(!AudioOutputPulse::EnumerateDevices(devs))
-		AudioOutputALSA::EnumerateDevices(devs);
-#elif defined(WITHOUT_PULSE)
-	AudioOutputALSA::EnumerateDevices(devs);
-#else
-	AudioOutputPulse::EnumerateDevices(devs)
-#endif
-#endif
-}
-
-
-std::string AudioOutput::GetCurrentDevice(){
-	return currentDevice;
-}
-
-void AudioOutput::SetCurrentDevice(std::string deviceID){
-	
-}
-
-bool AudioOutput::IsInitialized(){
-	return !failed;
-}
diff --git a/submodules/libtgvoip/audio/AudioOutput.h b/submodules/libtgvoip/audio/AudioOutput.h
deleted file mode 100644
index 6f66a9062f..0000000000
--- a/submodules/libtgvoip/audio/AudioOutput.h
+++ /dev/null
@@ -1,42 +0,0 @@
-//
-// libtgvoip is free and unencumbered public domain software.
-// For more information, see http://unlicense.org or the UNLICENSE file
-// you should have received with this source code distribution.
-//
-
-#ifndef LIBTGVOIP_AUDIOOUTPUT_H
-#define LIBTGVOIP_AUDIOOUTPUT_H
-
-#include <stdint.h>
-#include <string>
-#include <vector>
-#include <memory>
-#include "../MediaStreamItf.h"
-
-namespace tgvoip{
-
-class AudioInputDevice;
-class AudioOutputDevice;
-	
-namespace audio{
-class AudioOutput : public MediaStreamItf{
-public:
-	AudioOutput();
-	AudioOutput(std::string deviceID);
-	virtual ~AudioOutput();
-	virtual bool IsPlaying()=0;
-	static int32_t GetEstimatedDelay();
-	virtual std::string GetCurrentDevice();
-	virtual void SetCurrentDevice(std::string deviceID);
-	//static std::unique_ptr<AudioOutput> Create(std::string deviceID, void* platformSpecific);
-	static void EnumerateDevices(std::vector<AudioOutputDevice>& devs);
-	bool IsInitialized();
-
-protected:
-	std::string currentDevice;
-	bool failed;
-	static int32_t estimatedDelay;
-};
-}}
-
-#endif //LIBTGVOIP_AUDIOOUTPUT_H
diff --git a/submodules/libtgvoip/audio/Resampler.cpp b/submodules/libtgvoip/audio/Resampler.cpp
deleted file mode 100644
index 076d4ca789..0000000000
--- a/submodules/libtgvoip/audio/Resampler.cpp
+++ /dev/null
@@ -1,117 +0,0 @@
-//
-// Created by Grishka on 01.04.17.
-//
-
-#include <math.h>
-#include <string.h>
-#include "Resampler.h"
-
-using namespace tgvoip::audio;
-static const int16_t hann[960]={
-		0x0000, 0x0000, 0x0000, 0x0001, 0x0001, 0x0002, 0x0003, 0x0004, 0x0006, 0x0007, 0x0009, 0x000B, 0x000D, 0x000F, 0x0011, 0x0014, 0x0016, 0x0019, 0x001C, 0x0020,
-		0x0023, 0x0027, 0x002A, 0x002E, 0x0033, 0x0037, 0x003B, 0x0040, 0x0045, 0x004A, 0x004F, 0x0054, 0x005A, 0x0060, 0x0065, 0x006B, 0x0072, 0x0078, 0x007F, 0x0085,
-		0x008C, 0x0093, 0x009B, 0x00A2, 0x00AA, 0x00B2, 0x00B9, 0x00C2, 0x00CA, 0x00D2, 0x00DB, 0x00E4, 0x00ED, 0x00F6, 0x00FF, 0x0109, 0x0113, 0x011C, 0x0127, 0x0131,
-		0x013B, 0x0146, 0x0150, 0x015B, 0x0166, 0x0172, 0x017D, 0x0189, 0x0194, 0x01A0, 0x01AC, 0x01B9, 0x01C5, 0x01D2, 0x01DF, 0x01EC, 0x01F9, 0x0206, 0x0213, 0x0221,
-		0x022F, 0x023D, 0x024B, 0x0259, 0x0268, 0x0276, 0x0285, 0x0294, 0x02A3, 0x02B3, 0x02C2, 0x02D2, 0x02E2, 0x02F2, 0x0302, 0x0312, 0x0323, 0x0333, 0x0344, 0x0355,
-		0x0366, 0x0378, 0x0389, 0x039B, 0x03AD, 0x03BF, 0x03D1, 0x03E3, 0x03F6, 0x0408, 0x041B, 0x042E, 0x0441, 0x0455, 0x0468, 0x047C, 0x0490, 0x04A4, 0x04B8, 0x04CC,
-		0x04E0, 0x04F5, 0x050A, 0x051F, 0x0534, 0x0549, 0x055F, 0x0574, 0x058A, 0x05A0, 0x05B6, 0x05CC, 0x05E2, 0x05F9, 0x0610, 0x0627, 0x063E, 0x0655, 0x066C, 0x0684,
-		0x069B, 0x06B3, 0x06CB, 0x06E3, 0x06FC, 0x0714, 0x072D, 0x0745, 0x075E, 0x0777, 0x0791, 0x07AA, 0x07C3, 0x07DD, 0x07F7, 0x0811, 0x082B, 0x0845, 0x0860, 0x087A,
-		0x0895, 0x08B0, 0x08CB, 0x08E6, 0x0902, 0x091D, 0x0939, 0x0955, 0x0971, 0x098D, 0x09A9, 0x09C6, 0x09E2, 0x09FF, 0x0A1C, 0x0A39, 0x0A56, 0x0A73, 0x0A91, 0x0AAE,
-		0x0ACC, 0x0AEA, 0x0B08, 0x0B26, 0x0B44, 0x0B63, 0x0B81, 0x0BA0, 0x0BBF, 0x0BDE, 0x0BFD, 0x0C1D, 0x0C3C, 0x0C5C, 0x0C7B, 0x0C9B, 0x0CBB, 0x0CDC, 0x0CFC, 0x0D1C,
-		0x0D3D, 0x0D5E, 0x0D7F, 0x0DA0, 0x0DC1, 0x0DE2, 0x0E04, 0x0E25, 0x0E47, 0x0E69, 0x0E8B, 0x0EAD, 0x0ECF, 0x0EF1, 0x0F14, 0x0F37, 0x0F59, 0x0F7C, 0x0F9F, 0x0FC2,
-		0x0FE6, 0x1009, 0x102D, 0x1051, 0x1074, 0x1098, 0x10BC, 0x10E1, 0x1105, 0x112A, 0x114E, 0x1173, 0x1198, 0x11BD, 0x11E2, 0x1207, 0x122D, 0x1252, 0x1278, 0x129D,
-		0x12C3, 0x12E9, 0x130F, 0x1336, 0x135C, 0x1383, 0x13A9, 0x13D0, 0x13F7, 0x141E, 0x1445, 0x146C, 0x1494, 0x14BB, 0x14E3, 0x150A, 0x1532, 0x155A, 0x1582, 0x15AA,
-		0x15D3, 0x15FB, 0x1623, 0x164C, 0x1675, 0x169E, 0x16C7, 0x16F0, 0x1719, 0x1742, 0x176C, 0x1795, 0x17BF, 0x17E9, 0x1813, 0x183D, 0x1867, 0x1891, 0x18BB, 0x18E6,
-		0x1910, 0x193B, 0x1965, 0x1990, 0x19BB, 0x19E6, 0x1A11, 0x1A3D, 0x1A68, 0x1A93, 0x1ABF, 0x1AEB, 0x1B17, 0x1B42, 0x1B6E, 0x1B9A, 0x1BC7, 0x1BF3, 0x1C1F, 0x1C4C,
-		0x1C78, 0x1CA5, 0x1CD2, 0x1CFF, 0x1D2C, 0x1D59, 0x1D86, 0x1DB3, 0x1DE0, 0x1E0E, 0x1E3B, 0x1E69, 0x1E97, 0x1EC4, 0x1EF2, 0x1F20, 0x1F4E, 0x1F7C, 0x1FAB, 0x1FD9,
-		0x2007, 0x2036, 0x2065, 0x2093, 0x20C2, 0x20F1, 0x2120, 0x214F, 0x217E, 0x21AD, 0x21DD, 0x220C, 0x223B, 0x226B, 0x229A, 0x22CA, 0x22FA, 0x232A, 0x235A, 0x238A,
-		0x23BA, 0x23EA, 0x241A, 0x244B, 0x247B, 0x24AB, 0x24DC, 0x250D, 0x253D, 0x256E, 0x259F, 0x25D0, 0x2601, 0x2632, 0x2663, 0x2694, 0x26C5, 0x26F7, 0x2728, 0x275A,
-		0x278B, 0x27BD, 0x27EE, 0x2820, 0x2852, 0x2884, 0x28B6, 0x28E8, 0x291A, 0x294C, 0x297E, 0x29B0, 0x29E3, 0x2A15, 0x2A47, 0x2A7A, 0x2AAC, 0x2ADF, 0x2B12, 0x2B44,
-		0x2B77, 0x2BAA, 0x2BDD, 0x2C10, 0x2C43, 0x2C76, 0x2CA9, 0x2CDC, 0x2D0F, 0x2D43, 0x2D76, 0x2DA9, 0x2DDD, 0x2E10, 0x2E44, 0x2E77, 0x2EAB, 0x2EDF, 0x2F12, 0x2F46,
-		0x2F7A, 0x2FAE, 0x2FE2, 0x3016, 0x304A, 0x307E, 0x30B2, 0x30E6, 0x311A, 0x314E, 0x3182, 0x31B7, 0x31EB, 0x321F, 0x3254, 0x3288, 0x32BD, 0x32F1, 0x3326, 0x335A,
-		0x338F, 0x33C3, 0x33F8, 0x342D, 0x3461, 0x3496, 0x34CB, 0x3500, 0x3535, 0x356A, 0x359F, 0x35D4, 0x3608, 0x363D, 0x3673, 0x36A8, 0x36DD, 0x3712, 0x3747, 0x377C,
-		0x37B1, 0x37E6, 0x381C, 0x3851, 0x3886, 0x38BB, 0x38F1, 0x3926, 0x395B, 0x3991, 0x39C6, 0x39FC, 0x3A31, 0x3A66, 0x3A9C, 0x3AD1, 0x3B07, 0x3B3C, 0x3B72, 0x3BA7,
-		0x3BDD, 0x3C12, 0x3C48, 0x3C7D, 0x3CB3, 0x3CE9, 0x3D1E, 0x3D54, 0x3D89, 0x3DBF, 0x3DF5, 0x3E2A, 0x3E60, 0x3E95, 0x3ECB, 0x3F01, 0x3F36, 0x3F6C, 0x3FA2, 0x3FD7,
-		0x400D, 0x4043, 0x4078, 0x40AE, 0x40E3, 0x4119, 0x414F, 0x4184, 0x41BA, 0x41F0, 0x4225, 0x425B, 0x4290, 0x42C6, 0x42FC, 0x4331, 0x4367, 0x439C, 0x43D2, 0x4407,
-		0x443D, 0x4472, 0x44A8, 0x44DD, 0x4513, 0x4548, 0x457E, 0x45B3, 0x45E9, 0x461E, 0x4654, 0x4689, 0x46BE, 0x46F4, 0x4729, 0x475E, 0x4793, 0x47C9, 0x47FE, 0x4833,
-		0x4868, 0x489E, 0x48D3, 0x4908, 0x493D, 0x4972, 0x49A7, 0x49DC, 0x4A11, 0x4A46, 0x4A7B, 0x4AB0, 0x4AE5, 0x4B1A, 0x4B4E, 0x4B83, 0x4BB8, 0x4BED, 0x4C21, 0x4C56,
-		0x4C8B, 0x4CBF, 0x4CF4, 0x4D28, 0x4D5D, 0x4D91, 0x4DC6, 0x4DFA, 0x4E2E, 0x4E63, 0x4E97, 0x4ECB, 0x4EFF, 0x4F33, 0x4F67, 0x4F9B, 0x4FCF, 0x5003, 0x5037, 0x506B,
-		0x509F, 0x50D3, 0x5106, 0x513A, 0x516E, 0x51A1, 0x51D5, 0x5208, 0x523C, 0x526F, 0x52A3, 0x52D6, 0x5309, 0x533C, 0x536F, 0x53A3, 0x53D6, 0x5409, 0x543B, 0x546E,
-		0x54A1, 0x54D4, 0x5507, 0x5539, 0x556C, 0x559E, 0x55D1, 0x5603, 0x5636, 0x5668, 0x569A, 0x56CC, 0x56FE, 0x5730, 0x5762, 0x5794, 0x57C6, 0x57F8, 0x5829, 0x585B,
-		0x588D, 0x58BE, 0x58F0, 0x5921, 0x5952, 0x5984, 0x59B5, 0x59E6, 0x5A17, 0x5A48, 0x5A79, 0x5AA9, 0x5ADA, 0x5B0B, 0x5B3B, 0x5B6C, 0x5B9C, 0x5BCD, 0x5BFD, 0x5C2D,
-		0x5C5D, 0x5C8D, 0x5CBD, 0x5CED, 0x5D1D, 0x5D4D, 0x5D7C, 0x5DAC, 0x5DDB, 0x5E0B, 0x5E3A, 0x5E69, 0x5E99, 0x5EC8, 0x5EF7, 0x5F26, 0x5F54, 0x5F83, 0x5FB2, 0x5FE0,
-		0x600F, 0x603D, 0x606B, 0x609A, 0x60C8, 0x60F6, 0x6124, 0x6152, 0x617F, 0x61AD, 0x61DB, 0x6208, 0x6235, 0x6263, 0x6290, 0x62BD, 0x62EA, 0x6317, 0x6344, 0x6370,
-		0x639D, 0x63CA, 0x63F6, 0x6422, 0x644E, 0x647B, 0x64A7, 0x64D3, 0x64FE, 0x652A, 0x6556, 0x6581, 0x65AD, 0x65D8, 0x6603, 0x662E, 0x6659, 0x6684, 0x66AF, 0x66DA,
-		0x6704, 0x672F, 0x6759, 0x6783, 0x67AD, 0x67D7, 0x6801, 0x682B, 0x6855, 0x687E, 0x68A8, 0x68D1, 0x68FB, 0x6924, 0x694D, 0x6976, 0x699F, 0x69C7, 0x69F0, 0x6A18,
-		0x6A41, 0x6A69, 0x6A91, 0x6AB9, 0x6AE1, 0x6B09, 0x6B30, 0x6B58, 0x6B7F, 0x6BA6, 0x6BCE, 0x6BF5, 0x6C1C, 0x6C42, 0x6C69, 0x6C90, 0x6CB6, 0x6CDC, 0x6D03, 0x6D29,
-		0x6D4F, 0x6D74, 0x6D9A, 0x6DC0, 0x6DE5, 0x6E0A, 0x6E30, 0x6E55, 0x6E7A, 0x6E9E, 0x6EC3, 0x6EE8, 0x6F0C, 0x6F30, 0x6F55, 0x6F79, 0x6F9D, 0x6FC0, 0x6FE4, 0x7008,
-		0x702B, 0x704E, 0x7071, 0x7094, 0x70B7, 0x70DA, 0x70FC, 0x711F, 0x7141, 0x7163, 0x7185, 0x71A7, 0x71C9, 0x71EB, 0x720C, 0x722E, 0x724F, 0x7270, 0x7291, 0x72B2,
-		0x72D2, 0x72F3, 0x7313, 0x7333, 0x7354, 0x7374, 0x7393, 0x73B3, 0x73D3, 0x73F2, 0x7411, 0x7430, 0x744F, 0x746E, 0x748D, 0x74AB, 0x74CA, 0x74E8, 0x7506, 0x7524,
-		0x7542, 0x7560, 0x757D, 0x759B, 0x75B8, 0x75D5, 0x75F2, 0x760F, 0x762B, 0x7648, 0x7664, 0x7680, 0x769C, 0x76B8, 0x76D4, 0x76F0, 0x770B, 0x7726, 0x7741, 0x775C,
-		0x7777, 0x7792, 0x77AC, 0x77C7, 0x77E1, 0x77FB, 0x7815, 0x782F, 0x7848, 0x7862, 0x787B, 0x7894, 0x78AD, 0x78C6, 0x78DF, 0x78F7, 0x7910, 0x7928, 0x7940, 0x7958,
-		0x7970, 0x7987, 0x799F, 0x79B6, 0x79CD, 0x79E4, 0x79FB, 0x7A11, 0x7A28, 0x7A3E, 0x7A54, 0x7A6A, 0x7A80, 0x7A96, 0x7AAB, 0x7AC1, 0x7AD6, 0x7AEB, 0x7B00, 0x7B14,
-		0x7B29, 0x7B3D, 0x7B51, 0x7B65, 0x7B79, 0x7B8D, 0x7BA1, 0x7BB4, 0x7BC7, 0x7BDA, 0x7BED, 0x7C00, 0x7C13, 0x7C25, 0x7C37, 0x7C49, 0x7C5B, 0x7C6D, 0x7C7F, 0x7C90,
-		0x7CA1, 0x7CB2, 0x7CC3, 0x7CD4, 0x7CE5, 0x7CF5, 0x7D05, 0x7D15, 0x7D25, 0x7D35, 0x7D45, 0x7D54, 0x7D63, 0x7D72, 0x7D81, 0x7D90, 0x7D9F, 0x7DAD, 0x7DBB, 0x7DC9,
-		0x7DD7, 0x7DE5, 0x7DF2, 0x7E00, 0x7E0D, 0x7E1A, 0x7E27, 0x7E34, 0x7E40, 0x7E4C, 0x7E59, 0x7E65, 0x7E71, 0x7E7C, 0x7E88, 0x7E93, 0x7E9E, 0x7EA9, 0x7EB4, 0x7EBF,
-		0x7EC9, 0x7ED3, 0x7EDE, 0x7EE7, 0x7EF1, 0x7EFB, 0x7F04, 0x7F0E, 0x7F17, 0x7F20, 0x7F28, 0x7F31, 0x7F39, 0x7F41, 0x7F4A, 0x7F51, 0x7F59, 0x7F61, 0x7F68, 0x7F6F,
-		0x7F76, 0x7F7D, 0x7F84, 0x7F8A, 0x7F90, 0x7F97, 0x7F9D, 0x7FA2, 0x7FA8, 0x7FAD, 0x7FB3, 0x7FB8, 0x7FBD, 0x7FC1, 0x7FC6, 0x7FCA, 0x7FCF, 0x7FD3, 0x7FD6, 0x7FDA,
-		0x7FDE, 0x7FE1, 0x7FE4, 0x7FE7, 0x7FEA, 0x7FED, 0x7FEF, 0x7FF1, 0x7FF3, 0x7FF5, 0x7FF7, 0x7FF9, 0x7FFA, 0x7FFB, 0x7FFC, 0x7FFD, 0x7FFE, 0x7FFE, 0x7FFF, 0x7FFF
-};
-
-#define MIN(a, b) (a<b ? a : b)
-
-size_t Resampler::Convert48To44(int16_t *from, int16_t *to, size_t fromLen, size_t toLen){
-	size_t outLen=fromLen*147/160;
-	if(toLen<outLen)
-		outLen=toLen;
-	unsigned int offset;
-	for(offset=0;offset<outLen;offset++){
-		float offsetf=offset*160.0f/147.0f;
-		float factor=offsetf-floorf(offsetf);
-		to[offset]=(int16_t)((from[(int)floorf(offsetf)]*(1-factor))+(from[(int)ceilf(offsetf)]*(factor)));
-	}
-	return outLen;
-}
-
-size_t Resampler::Convert44To48(int16_t *from, int16_t *to, size_t fromLen, size_t toLen){
-	size_t outLen=fromLen*160/147;
-	if(toLen<outLen)
-		outLen=toLen;
-	unsigned int offset;
-	for(offset=0;offset<outLen;offset++){
-		float offsetf=offset*147.0f/160.0f;
-		float factor=offsetf-floorf(offsetf);
-		to[offset]=(int16_t)((from[(int)floorf(offsetf)]*(1-factor))+(from[(int)ceilf(offsetf)]*(factor)));
-	}
-	return outLen;
-}
-
-
-size_t Resampler::Convert(int16_t *from, int16_t *to, size_t fromLen, size_t toLen, int num, int denom){
-	size_t outLen=fromLen*num/denom;
-	if(toLen<outLen)
-		outLen=toLen;
-	unsigned int offset;
-	for(offset=0;offset<outLen;offset++){
-		float offsetf=offset*(float)denom/(float)num;
-		float factor=offsetf-floorf(offsetf);
-		to[offset]=(int16_t)((from[(int)floorf(offsetf)]*(1-factor))+(from[(int)ceilf(offsetf)]*(factor)));
-	}
-	return outLen;
-}
-
-void Resampler::Rescale60To80(int16_t *in, int16_t *out){
-	memcpy(out, in, 960*2);
-	memcpy(out+960*3, in+960*2, 960*2);
-	for(int i=0;i<960;i++){
-		out[960+i]=(int16_t)(((int32_t)in[960+i]*hann[959-i]) >> 15) + (int16_t)(((int32_t)in[480+i]*hann[i]) >> 15);
-		out[1920+i]=(int16_t)(((int32_t)in[960+480+i]*hann[959-i]) >> 15) + (int16_t)(((int32_t)in[960+i]*hann[i]) >> 15);
-	}
-}
-
-void Resampler::Rescale60To40(int16_t *in, int16_t *out){
-	for(int i=0;i<960;i++){
-		out[i]=(int16_t)(((int32_t)in[i]*hann[959-i]) >> 15) + (int16_t)(((int32_t)in[480+i]*hann[i]) >> 15);
-		out[960+i]=(int16_t)(((int32_t)in[1920+i]*hann[i]) >> 15) + (int16_t)(((int32_t)in[1440+i]*hann[959-i]) >> 15);
-	}
-}
diff --git a/submodules/libtgvoip/audio/Resampler.h b/submodules/libtgvoip/audio/Resampler.h
deleted file mode 100644
index b1fb7e4774..0000000000
--- a/submodules/libtgvoip/audio/Resampler.h
+++ /dev/null
@@ -1,22 +0,0 @@
-//
-// Created by Grishka on 01.04.17.
-//
-
-#ifndef LIBTGVOIP_RESAMPLER_H
-#define LIBTGVOIP_RESAMPLER_H
-
-#include <stdlib.h>
-#include <stdint.h>
-
-namespace tgvoip{ namespace audio{
-	class Resampler{
-	public:
-		static size_t Convert48To44(int16_t* from, int16_t* to, size_t fromLen, size_t toLen);
-		static size_t Convert44To48(int16_t* from, int16_t* to, size_t fromLen, size_t toLen);
-		static size_t Convert(int16_t* from, int16_t* to, size_t fromLen, size_t toLen, int num, int denom);
-		static void Rescale60To80(int16_t* in, int16_t* out);
-		static void Rescale60To40(int16_t* in, int16_t* out);
-	};
-}}
-
-#endif //LIBTGVOIP_RESAMPLER_H
diff --git a/submodules/libtgvoip/client/android/tg_voip_jni.cpp b/submodules/libtgvoip/client/android/tg_voip_jni.cpp
deleted file mode 100644
index 9d6eeff707..0000000000
--- a/submodules/libtgvoip/client/android/tg_voip_jni.cpp
+++ /dev/null
@@ -1,684 +0,0 @@
-//
-// libtgvoip is free and unencumbered public domain software.
-// For more information, see http://unlicense.org or the UNLICENSE file
-// you should have received with this source code distribution.
-//
-
-#include <jni.h>
-#include <string.h>
-#include <map>
-#include <string>
-#include <vector>
-#include "../../VoIPServerConfig.h"
-#include "../../VoIPController.h"
-#include "../../os/android/AudioOutputOpenSLES.h"
-#include "../../os/android/AudioInputOpenSLES.h"
-#include "../../os/android/AudioInputAndroid.h"
-#include "../../os/android/AudioOutputAndroid.h"
-#include "../../os/android/VideoSourceAndroid.h"
-#include "../../os/android/VideoRendererAndroid.h"
-#include "../../audio/Resampler.h"
-#include "../../os/android/JNIUtilities.h"
-#include "../../PrivateDefines.h"
-
-#ifdef TGVOIP_HAS_CONFIG
-#include <tgvoip_config.h>
-#endif
-
-JavaVM* sharedJVM;
-jfieldID audioRecordInstanceFld=NULL;
-jfieldID audioTrackInstanceFld=NULL;
-jmethodID setStateMethod=NULL;
-jmethodID setSignalBarsMethod=NULL;
-jmethodID setSelfStreamsMethod=NULL;
-jmethodID setParticipantAudioEnabledMethod=NULL;
-jmethodID groupCallKeyReceivedMethod=NULL;
-jmethodID groupCallKeySentMethod=NULL;
-jmethodID callUpgradeRequestReceivedMethod=NULL;
-jclass jniUtilitiesClass=NULL;
-
-struct ImplDataAndroid{
-	jobject javaObject;
-	std::string persistentStateFile="";
-};
-
-#ifndef TGVOIP_PACKAGE_PATH
-#define TGVOIP_PACKAGE_PATH "org/telegram/messenger/voip"
-#endif
-
-#ifndef TGVOIP_PEER_TAG_VARIABLE_NAME
-#define TGVOIP_PEER_TAG_VARIABLE_NAME "peer_tag"
-#endif
-
-#ifndef TGVOIP_ENDPOINT_CLASS
-#define TGVOIP_ENDPOINT_CLASS "org/telegram/tgnet/TLRPC$TL_phoneConnection"
-#endif
-
-using namespace tgvoip;
-using namespace tgvoip::audio;
-
-namespace tgvoip {
-#pragma mark - Callbacks
-
-	void updateConnectionState(VoIPController *cntrlr, int state){
-		ImplDataAndroid *impl=(ImplDataAndroid *) cntrlr->implData;
-		jni::AttachAndCallVoidMethod(setStateMethod, impl->javaObject, state);
-	}
-
-	void updateSignalBarCount(VoIPController *cntrlr, int count){
-		ImplDataAndroid *impl=(ImplDataAndroid *) cntrlr->implData;
-		jni::AttachAndCallVoidMethod(setSignalBarsMethod, impl->javaObject, count);
-	}
-
-	void updateGroupCallStreams(VoIPGroupController *cntrlr, unsigned char *streams, size_t len){
-		ImplDataAndroid *impl=(ImplDataAndroid *) cntrlr->implData;
-		if(!impl->javaObject)
-			return;
-		jni::DoWithJNI([streams, len, &impl](JNIEnv* env){
-			if(setSelfStreamsMethod){
-				jbyteArray jstreams=env->NewByteArray(static_cast<jsize>(len));
-				jbyte *el=env->GetByteArrayElements(jstreams, NULL);
-				memcpy(el, streams, len);
-				env->ReleaseByteArrayElements(jstreams, el, 0);
-				env->CallVoidMethod(impl->javaObject, setSelfStreamsMethod, jstreams);
-			}
-		});
-	}
-
-	void groupCallKeyReceived(VoIPController *cntrlr, const unsigned char *key){
-		ImplDataAndroid *impl=(ImplDataAndroid *) cntrlr->implData;
-		if(!impl->javaObject)
-			return;
-		jni::DoWithJNI([key, &impl](JNIEnv* env){
-			if(groupCallKeyReceivedMethod){
-				jbyteArray jkey=env->NewByteArray(256);
-				jbyte *el=env->GetByteArrayElements(jkey, NULL);
-				memcpy(el, key, 256);
-				env->ReleaseByteArrayElements(jkey, el, 0);
-				env->CallVoidMethod(impl->javaObject, groupCallKeyReceivedMethod, jkey);
-			}
-		});
-	}
-
-	void groupCallKeySent(VoIPController *cntrlr){
-		ImplDataAndroid *impl=(ImplDataAndroid *) cntrlr->implData;
-		jni::AttachAndCallVoidMethod(groupCallKeySentMethod, impl->javaObject);
-	}
-
-	void callUpgradeRequestReceived(VoIPController* cntrlr){
-		ImplDataAndroid *impl=(ImplDataAndroid *) cntrlr->implData;
-		jni::AttachAndCallVoidMethod(callUpgradeRequestReceivedMethod, impl->javaObject);
-	}
-
-	void updateParticipantAudioState(VoIPGroupController *cntrlr, int32_t userID, bool enabled){
-		ImplDataAndroid *impl=(ImplDataAndroid *) cntrlr->implData;
-		jni::AttachAndCallVoidMethod(setParticipantAudioEnabledMethod, impl->javaObject, userID, enabled);
-	}
-
-#pragma mark - VoIPController
-
-	uint32_t AndroidCodecToFOURCC(std::string mime){
-		if(mime=="video/avc")
-			return CODEC_AVC;
-		else if(mime=="video/hevc")
-			return CODEC_HEVC;
-		else if(mime=="video/x-vnd.on2.vp8")
-			return CODEC_VP8;
-		else if(mime=="video/x-vnd.on2.vp9")
-			return CODEC_VP9;
-		return 0;
-	}
-
-	jlong VoIPController_nativeInit(JNIEnv* env, jobject thiz, jstring persistentStateFile) {
-		ImplDataAndroid* impl=new ImplDataAndroid();
-		impl->javaObject=env->NewGlobalRef(thiz);
-		if(persistentStateFile){
-			impl->persistentStateFile=jni::JavaStringToStdString(env, persistentStateFile);
-		}
-		VoIPController* cntrlr=new VoIPController();
-		cntrlr->implData=impl;
-		VoIPController::Callbacks callbacks;
-		callbacks.connectionStateChanged=updateConnectionState;
-		callbacks.signalBarCountChanged=updateSignalBarCount;
-		callbacks.groupCallKeyReceived=groupCallKeyReceived;
-		callbacks.groupCallKeySent=groupCallKeySent;
-		callbacks.upgradeToGroupCallRequested=callUpgradeRequestReceived;
-		cntrlr->SetCallbacks(callbacks);
-		if(!impl->persistentStateFile.empty()){
-			FILE* f=fopen(impl->persistentStateFile.c_str(), "r");
-			if(f){
-				fseek(f, 0, SEEK_END);
-				size_t len=static_cast<size_t>(ftell(f));
-				fseek(f, 0, SEEK_SET);
-				if(len<1024*512 && len>0){
-					char *fbuf=static_cast<char *>(malloc(len));
-					fread(fbuf, 1, len, f);
-					std::vector<uint8_t> state(fbuf, fbuf+len);
-					free(fbuf);
-					cntrlr->SetPersistentState(state);
-				}
-				fclose(f);
-			}
-		}
-		/*if(video::VideoRendererAndroid::availableDecoders.empty() || video::VideoSourceAndroid::availableEncoders.empty()){
-			video::VideoRendererAndroid::availableDecoders.clear();
-			video::VideoSourceAndroid::availableEncoders.clear();
-			jmethodID getCodecsMethod=env->GetStaticMethodID(jniUtilitiesClass, "getSupportedVideoCodecs", "()[[Ljava/lang/String;");
-			jobjectArray codecs=static_cast<jobjectArray>(env->CallStaticObjectMethod(jniUtilitiesClass, getCodecsMethod));
-			jobjectArray encoders=static_cast<jobjectArray>(env->GetObjectArrayElement(codecs, 0));
-			jobjectArray decoders=static_cast<jobjectArray>(env->GetObjectArrayElement(codecs, 1));
-			for(jsize i=0;i<env->GetArrayLength(encoders);i++){
-				std::string codec=jni::JavaStringToStdString(env, static_cast<jstring>(env->GetObjectArrayElement(encoders, i)));
-				uint32_t id=AndroidCodecToFOURCC(codec);
-				if(id)
-					video::VideoSourceAndroid::availableEncoders.push_back(id);
-			}
-			for(jsize i=0;i<env->GetArrayLength(decoders);i++){
-				std::string codec=jni::JavaStringToStdString(env, static_cast<jstring>(env->GetObjectArrayElement(decoders, i)));
-				uint32_t id=AndroidCodecToFOURCC(codec);
-				if(id)
-					video::VideoRendererAndroid::availableDecoders.push_back(id);
-			}
-			jmethodID getMaxResolutionMethod=env->GetStaticMethodID(jniUtilitiesClass, "getMaxVideoResolution", "()I");
-			video::VideoRendererAndroid::maxResolution=env->CallStaticIntMethod(jniUtilitiesClass, getMaxResolutionMethod);
-		}*/
-		return (jlong)(intptr_t)cntrlr;
-	}
-
-	void VoIPController_nativeStart(JNIEnv* env, jobject thiz, jlong inst){
-		((VoIPController*)(intptr_t)inst)->Start();
-	}
-
-	void VoIPController_nativeConnect(JNIEnv* env, jobject thiz, jlong inst){
-		((VoIPController*)(intptr_t)inst)->Connect();
-	}
-
-	void VoIPController_nativeSetProxy(JNIEnv* env, jobject thiz, jlong inst, jstring _address, jint port, jstring _username, jstring _password){
-		((VoIPController*)(intptr_t)inst)->SetProxy(PROXY_SOCKS5, jni::JavaStringToStdString(env, _address), (uint16_t)port, jni::JavaStringToStdString(env, _username), jni::JavaStringToStdString(env, _password));
-	}
-
-	void VoIPController_nativeSetEncryptionKey(JNIEnv* env, jobject thiz, jlong inst, jbyteArray key, jboolean isOutgoing){
-		jbyte* akey=env->GetByteArrayElements(key, NULL);
-		((VoIPController*)(intptr_t)inst)->SetEncryptionKey((char *) akey, isOutgoing);
-		env->ReleaseByteArrayElements(key, akey, JNI_ABORT);
-	}
-
-	void VoIPController_nativeSetRemoteEndpoints(JNIEnv* env, jobject thiz, jlong inst, jobjectArray endpoints, jboolean allowP2p, jboolean tcp, jint connectionMaxLayer){
-		size_t len=(size_t) env->GetArrayLength(endpoints);
-		std::vector<Endpoint> eps;
-		/*public String ip;
-			public String ipv6;
-			public int port;
-			public byte[] peer_tag;*/
-		jclass epClass=env->GetObjectClass(env->GetObjectArrayElement(endpoints, 0));
-		jfieldID ipFld=env->GetFieldID(epClass, "ip", "Ljava/lang/String;");
-		jfieldID ipv6Fld=env->GetFieldID(epClass, "ipv6", "Ljava/lang/String;");
-		jfieldID portFld=env->GetFieldID(epClass, "port", "I");
-		jfieldID peerTagFld=env->GetFieldID(epClass, TGVOIP_PEER_TAG_VARIABLE_NAME, "[B");
-		jfieldID idFld=env->GetFieldID(epClass, "id", "J");
-		int i;
-		for(i=0;i<len;i++){
-			jobject endpoint=env->GetObjectArrayElement(endpoints, i);
-			jstring ip=(jstring) env->GetObjectField(endpoint, ipFld);
-			jstring ipv6=(jstring) env->GetObjectField(endpoint, ipv6Fld);
-			jint port=env->GetIntField(endpoint, portFld);
-			jlong id=env->GetLongField(endpoint, idFld);
-			jbyteArray peerTag=(jbyteArray) env->GetObjectField(endpoint, peerTagFld);
-			IPv4Address v4addr(jni::JavaStringToStdString(env, ip));
-			IPv6Address v6addr("::0");
-			if(ipv6 && env->GetStringLength(ipv6)){
-				v6addr=IPv6Address(jni::JavaStringToStdString(env, ipv6));
-			}
-			unsigned char pTag[16];
-			if(peerTag && env->GetArrayLength(peerTag)){
-				jbyte* peerTagBytes=env->GetByteArrayElements(peerTag, NULL);
-				memcpy(pTag, peerTagBytes, 16);
-				env->ReleaseByteArrayElements(peerTag, peerTagBytes, JNI_ABORT);
-			}
-			eps.push_back(Endpoint((int64_t)id, (uint16_t)port, v4addr, v6addr, tcp ? Endpoint::Type::TCP_RELAY : Endpoint::Type::UDP_RELAY, pTag));
-		}
-		((VoIPController*)(intptr_t)inst)->SetRemoteEndpoints(eps, allowP2p, connectionMaxLayer);
-	}
-
-	void VoIPController_nativeSetNativeBufferSize(JNIEnv* env, jclass thiz, jint size){
-		AudioOutputOpenSLES::nativeBufferSize=(unsigned int) size;
-		AudioInputOpenSLES::nativeBufferSize=(unsigned int) size;
-	}
-
-	void VoIPController_nativeRelease(JNIEnv* env, jobject thiz, jlong inst){
-		//env->DeleteGlobalRef(AudioInputAndroid::jniClass);
-
-		VoIPController* ctlr=((VoIPController*)(intptr_t)inst);
-		ImplDataAndroid* impl=(ImplDataAndroid*)ctlr->implData;
-		ctlr->Stop();
-		std::vector<uint8_t> state=ctlr->GetPersistentState();
-		delete ctlr;
-		env->DeleteGlobalRef(impl->javaObject);
-		if(!impl->persistentStateFile.empty()){
-			FILE* f=fopen(impl->persistentStateFile.c_str(), "w");
-			if(f){
-				fwrite(state.data(), 1, state.size(), f);
-				fclose(f);
-			}
-		}
-		delete impl;
-	}
-
-	jstring VoIPController_nativeGetDebugString(JNIEnv* env, jobject thiz, jlong inst){
-		std::string str=((VoIPController*)(intptr_t)inst)->GetDebugString();
-		return env->NewStringUTF(str.c_str());
-	}
-
-	void VoIPController_nativeSetNetworkType(JNIEnv* env, jobject thiz, jlong inst, jint type){
-		((VoIPController*)(intptr_t)inst)->SetNetworkType(type);
-	}
-
-	void VoIPController_nativeSetMicMute(JNIEnv* env, jobject thiz, jlong inst, jboolean mute){
-		((VoIPController*)(intptr_t)inst)->SetMicMute(mute);
-	}
-
-	void VoIPController_nativeSetConfig(JNIEnv* env, jobject thiz, jlong inst, jdouble recvTimeout, jdouble initTimeout, jint dataSavingMode, jboolean enableAEC, jboolean enableNS, jboolean enableAGC, jstring logFilePath, jstring statsDumpPath, jboolean logPacketStats){
-		VoIPController::Config cfg;
-		cfg.initTimeout=initTimeout;
-		cfg.recvTimeout=recvTimeout;
-		cfg.dataSaving=dataSavingMode;
-		cfg.enableAEC=enableAEC;
-		cfg.enableNS=enableNS;
-		cfg.enableAGC=enableAGC;
-		cfg.enableCallUpgrade=false;
-		cfg.logPacketStats=logPacketStats;
-		if(logFilePath){
-			cfg.logFilePath=jni::JavaStringToStdString(env, logFilePath);
-		}
-		if(statsDumpPath){
-			cfg.statsDumpFilePath=jni::JavaStringToStdString(env, statsDumpPath);
-		}
-
-		((VoIPController*)(intptr_t)inst)->SetConfig(cfg);
-	}
-
-	void VoIPController_nativeDebugCtl(JNIEnv* env, jobject thiz, jlong inst, jint request, jint param){
-		((VoIPController*)(intptr_t)inst)->DebugCtl(request, param);
-	}
-
-	jstring VoIPController_nativeGetVersion(JNIEnv* env, jclass clasz){
-		return env->NewStringUTF(VoIPController::GetVersion());
-	}
-
-	jlong VoIPController_nativeGetPreferredRelayID(JNIEnv* env, jclass clasz, jlong inst){
-		return ((VoIPController*)(intptr_t)inst)->GetPreferredRelayID();
-	}
-
-	jint VoIPController_nativeGetLastError(JNIEnv* env, jclass clasz, jlong inst){
-		return ((VoIPController*)(intptr_t)inst)->GetLastError();
-	}
-
-	void VoIPController_nativeGetStats(JNIEnv* env, jclass clasz, jlong inst, jobject stats){
-		VoIPController::TrafficStats _stats;
-		((VoIPController*)(intptr_t)inst)->GetStats(&_stats);
-		jclass cls=env->GetObjectClass(stats);
-		env->SetLongField(stats, env->GetFieldID(cls, "bytesSentWifi", "J"), _stats.bytesSentWifi);
-		env->SetLongField(stats, env->GetFieldID(cls, "bytesSentMobile", "J"), _stats.bytesSentMobile);
-		env->SetLongField(stats, env->GetFieldID(cls, "bytesRecvdWifi", "J"), _stats.bytesRecvdWifi);
-		env->SetLongField(stats, env->GetFieldID(cls, "bytesRecvdMobile", "J"), _stats.bytesRecvdMobile);
-	}
-
-	jstring VoIPController_nativeGetDebugLog(JNIEnv* env, jobject thiz, jlong inst){
-		VoIPController* ctlr=((VoIPController*)(intptr_t)inst);
-		std::string log=ctlr->GetDebugLog();
-		return env->NewStringUTF(log.c_str());
-	}
-
-	void VoIPController_nativeSetAudioOutputGainControlEnabled(JNIEnv* env, jclass clasz, jlong inst, jboolean enabled){
-		((VoIPController*)(intptr_t)inst)->SetAudioOutputGainControlEnabled(enabled);
-	}
-
-	void VoIPController_nativeSetEchoCancellationStrength(JNIEnv* env, jclass cls, jlong inst, jint strength){
-		((VoIPController*)(intptr_t)inst)->SetEchoCancellationStrength(strength);
-	}
-
-	jint VoIPController_nativeGetPeerCapabilities(JNIEnv* env, jclass cls, jlong inst){
-		return ((VoIPController*)(intptr_t)inst)->GetPeerCapabilities();
-	}
-
-	void VoIPController_nativeSendGroupCallKey(JNIEnv* env, jclass cls, jlong inst, jbyteArray _key){
-		jbyte* key=env->GetByteArrayElements(_key, NULL);
-		((VoIPController*)(intptr_t)inst)->SendGroupCallKey((unsigned char *) key);
-		env->ReleaseByteArrayElements(_key, key, JNI_ABORT);
-	}
-
-	void VoIPController_nativeRequestCallUpgrade(JNIEnv* env, jclass cls, jlong inst){
-		((VoIPController*)(intptr_t)inst)->RequestCallUpgrade();
-	}
-
-	void VoIPController_nativeSetVideoSource(JNIEnv* env, jobject thiz, jlong inst, jlong source){
-		((VoIPController*)(intptr_t)inst)->SetVideoSource((video::VideoSource*)(intptr_t)source);
-	}
-
-	void VoIPController_nativeSetVideoRenderer(JNIEnv* env, jobject thiz, jlong inst, jlong renderer){
-		((VoIPController*)(intptr_t)inst)->SetVideoRenderer((video::VideoRenderer*)(intptr_t)renderer);
-	}
-
-	jboolean VoIPController_nativeNeedRate(JNIEnv* env, jclass cls, jlong inst){
-		return static_cast<jboolean>(((VoIPController*)(intptr_t)inst)->NeedRate());
-	}
-
-	jint VoIPController_getConnectionMaxLayer(JNIEnv* env, jclass cls){
-		return VoIPController::GetConnectionMaxLayer();
-	}
-
-#pragma mark - AudioRecordJNI
-
-	void AudioRecordJNI_nativeCallback(JNIEnv* env, jobject thiz, jobject buffer){
-		jlong inst=env->GetLongField(thiz, audioRecordInstanceFld);
-		AudioInputAndroid* in=(AudioInputAndroid*)(intptr_t)inst;
-		in->HandleCallback(env, buffer);
-	}
-
-#pragma mark - AudioTrackJNI
-
-	void AudioTrackJNI_nativeCallback(JNIEnv* env, jobject thiz, jbyteArray buffer){
-		jlong inst=env->GetLongField(thiz, audioTrackInstanceFld);
-		AudioOutputAndroid* in=(AudioOutputAndroid*)(intptr_t)inst;
-		in->HandleCallback(env, buffer);
-	}
-
-#pragma mark - VoIPServerConfig
-
-	void VoIPServerConfig_nativeSetConfig(JNIEnv* env, jclass clasz, jstring jsonString){
-		ServerConfig::GetSharedInstance()->Update(jni::JavaStringToStdString(env, jsonString));
-	}
-
-#pragma mark - Resampler
-
-	jint Resampler_convert44to48(JNIEnv* env, jclass cls, jobject from, jobject to){
-		return (jint)tgvoip::audio::Resampler::Convert44To48((int16_t *) env->GetDirectBufferAddress(from), (int16_t *) env->GetDirectBufferAddress(to), (size_t) (env->GetDirectBufferCapacity(from)/2), (size_t) (env->GetDirectBufferCapacity(to)/2));
-	}
-
-	jint Resampler_convert48to44(JNIEnv* env, jclass cls, jobject from, jobject to){
-		return (jint)tgvoip::audio::Resampler::Convert48To44((int16_t *) env->GetDirectBufferAddress(from), (int16_t *) env->GetDirectBufferAddress(to), (size_t) (env->GetDirectBufferCapacity(from)/2), (size_t) (env->GetDirectBufferCapacity(to)/2));
-	}
-
-#pragma mark - VoIPGroupController
-
-#ifndef TGVOIP_NO_GROUP_CALLS
-	jlong VoIPGroupController_nativeInit(JNIEnv* env, jobject thiz, jint timeDifference){
-		ImplDataAndroid* impl=(ImplDataAndroid*) malloc(sizeof(ImplDataAndroid));
-		impl->javaObject=env->NewGlobalRef(thiz);
-		VoIPGroupController* cntrlr=new VoIPGroupController(timeDifference);
-		cntrlr->implData=impl;
-
-		VoIPGroupController::Callbacks callbacks;
-		callbacks.connectionStateChanged=updateConnectionState;
-		callbacks.updateStreams=updateGroupCallStreams;
-		callbacks.participantAudioStateChanged=updateParticipantAudioState;
-		callbacks.signalBarCountChanged=NULL;
-		cntrlr->SetCallbacks(callbacks);
-
-		return (jlong)(intptr_t)cntrlr;
-	}
-
-	void VoIPGroupController_nativeSetGroupCallInfo(JNIEnv* env, jclass cls, jlong inst, jbyteArray _encryptionKey, jbyteArray _reflectorGroupTag, jbyteArray _reflectorSelfTag, jbyteArray _reflectorSelfSecret, jbyteArray _reflectorSelfTagHash, jint selfUserID, jstring reflectorAddress, jstring reflectorAddressV6, jint reflectorPort){
-		VoIPGroupController* ctlr=((VoIPGroupController*)(intptr_t)inst);
-		jbyte* encryptionKey=env->GetByteArrayElements(_encryptionKey, NULL);
-		jbyte* reflectorGroupTag=env->GetByteArrayElements(_reflectorGroupTag, NULL);
-		jbyte* reflectorSelfTag=env->GetByteArrayElements(_reflectorSelfTag, NULL);
-		jbyte* reflectorSelfSecret=env->GetByteArrayElements(_reflectorSelfSecret, NULL);
-		jbyte* reflectorSelfTagHash=env->GetByteArrayElements(_reflectorSelfTagHash, NULL);
-
-
-		const char* ipChars=env->GetStringUTFChars(reflectorAddress, NULL);
-		std::string ipLiteral(ipChars);
-		IPv4Address v4addr(ipLiteral);
-		IPv6Address v6addr("::0");
-		env->ReleaseStringUTFChars(reflectorAddress, ipChars);
-		if(reflectorAddressV6 && env->GetStringLength(reflectorAddressV6)){
-			const char* ipv6Chars=env->GetStringUTFChars(reflectorAddressV6, NULL);
-			v6addr=IPv6Address(ipv6Chars);
-			env->ReleaseStringUTFChars(reflectorAddressV6, ipv6Chars);
-		}
-		ctlr->SetGroupCallInfo((unsigned char *) encryptionKey, (unsigned char *) reflectorGroupTag, (unsigned char *) reflectorSelfTag, (unsigned char *) reflectorSelfSecret, (unsigned char*) reflectorSelfTagHash, selfUserID, v4addr, v6addr, (uint16_t)reflectorPort);
-
-		env->ReleaseByteArrayElements(_encryptionKey, encryptionKey, JNI_ABORT);
-		env->ReleaseByteArrayElements(_reflectorGroupTag, reflectorGroupTag, JNI_ABORT);
-		env->ReleaseByteArrayElements(_reflectorSelfTag, reflectorSelfTag, JNI_ABORT);
-		env->ReleaseByteArrayElements(_reflectorSelfSecret, reflectorSelfSecret, JNI_ABORT);
-		env->ReleaseByteArrayElements(_reflectorSelfTagHash, reflectorSelfTagHash, JNI_ABORT);
-	}
-
-	void VoIPGroupController_nativeAddGroupCallParticipant(JNIEnv* env, jclass cls, jlong inst, jint userID, jbyteArray _memberTagHash, jbyteArray _streams){
-		VoIPGroupController* ctlr=((VoIPGroupController*)(intptr_t)inst);
-		jbyte* memberTagHash=env->GetByteArrayElements(_memberTagHash, NULL);
-		jbyte* streams=_streams ? env->GetByteArrayElements(_streams, NULL) : NULL;
-
-		ctlr->AddGroupCallParticipant(userID, (unsigned char *) memberTagHash, (unsigned char *) streams, (size_t) env->GetArrayLength(_streams));
-
-		env->ReleaseByteArrayElements(_memberTagHash, memberTagHash, JNI_ABORT);
-		if(_streams)
-			env->ReleaseByteArrayElements(_streams, streams, JNI_ABORT);
-
-	}
-
-	void VoIPGroupController_nativeRemoveGroupCallParticipant(JNIEnv* env, jclass cls, jlong inst, jint userID){
-		VoIPGroupController* ctlr=((VoIPGroupController*)(intptr_t)inst);
-		ctlr->RemoveGroupCallParticipant(userID);
-	}
-
-	jfloat VoIPGroupController_nativeGetParticipantAudioLevel(JNIEnv* env, jclass cls, jlong inst, jint userID){
-		return ((VoIPGroupController*)(intptr_t)inst)->GetParticipantAudioLevel(userID);
-	}
-
-	void VoIPGroupController_nativeSetParticipantVolume(JNIEnv* env, jclass cls, jlong inst, jint userID, jfloat volume){
-		((VoIPGroupController*)(intptr_t)inst)->SetParticipantVolume(userID, volume);
-	}
-
-	jbyteArray VoIPGroupController_getInitialStreams(JNIEnv* env, jclass cls){
-		unsigned char buf[1024];
-		size_t len=VoIPGroupController::GetInitialStreams(buf, sizeof(buf));
-		jbyteArray arr=env->NewByteArray(len);
-		jbyte* arrElems=env->GetByteArrayElements(arr, NULL);
-		memcpy(arrElems, buf, len);
-		env->ReleaseByteArrayElements(arr, arrElems, 0);
-		return arr;
-	}
-
-	void VoIPGroupController_nativeSetParticipantStreams(JNIEnv* env, jclass cls, jlong inst, jint userID, jbyteArray _streams){
-		jbyte* streams=env->GetByteArrayElements(_streams, NULL);
-
-		((VoIPGroupController*)(intptr_t)inst)->SetParticipantStreams(userID, (unsigned char *) streams, (size_t) env->GetArrayLength(_streams));
-
-		env->ReleaseByteArrayElements(_streams, streams, JNI_ABORT);
-	}
-#endif
-
-#pragma mark - VideoSource
-
-	jlong VideoSource_nativeInit(JNIEnv* env, jobject thiz){
-		return (jlong)(intptr_t)new video::VideoSourceAndroid(env->NewGlobalRef(thiz));
-	}
-
-	void VideoSource_nativeRelease(JNIEnv* env, jobject thiz, jlong inst){
-		delete (video::VideoSource*)(intptr_t)inst;
-	}
-
-	void VideoSource_nativeSetVideoStreamParameters(JNIEnv* env, jobject thiz, jlong inst, jobjectArray _csd, jint width, jint height){
-		std::vector<Buffer> csd;
-		if(_csd){
-			for(int i=0; i<env->GetArrayLength(_csd); i++){
-				jobject _buf=env->GetObjectArrayElement(_csd, i);
-				size_t len=static_cast<size_t>(env->GetDirectBufferCapacity(_buf));
-				Buffer buf(len);
-				buf.CopyFrom(env->GetDirectBufferAddress(_buf), 0, len);
-				csd.push_back(std::move(buf));
-			}
-		}
-		((video::VideoSourceAndroid*)(intptr_t)inst)->SetStreamParameters(std::move(csd), width, height);
-	}
-
-	void VideoSource_nativeSendFrame(JNIEnv* env, jobject thiz, jlong inst, jobject buffer, jint offset, jint length, jint flags){
-		size_t bufsize=(size_t)env->GetDirectBufferCapacity(buffer);
-		Buffer buf(static_cast<size_t>(length));
-		buf.CopyFrom(((char*)env->GetDirectBufferAddress(buffer))+offset, 0, static_cast<size_t>(length));
-		((video::VideoSourceAndroid*)(intptr_t)inst)->SendFrame(std::move(buf), static_cast<uint32_t>(flags));
-	}
-
-#pragma mark - VideoRenderer
-
-	jlong VideoRenderer_nativeInit(JNIEnv* env, jobject thiz){
-		return (jlong)(intptr_t)new video::VideoRendererAndroid(env->NewGlobalRef(thiz));
-	}
-}
-
-extern "C" void tgvoipRegisterNatives(JNIEnv* env){
-	jclass controller=env->FindClass(TGVOIP_PACKAGE_PATH "/VoIPController");
-	jclass groupController=env->FindClass(TGVOIP_PACKAGE_PATH "/VoIPGroupController");
-	if(env->ExceptionCheck()){
-		env->ExceptionClear(); // is returning NULL from FindClass not enough?
-	}
-	jclass audioRecordJNI=env->FindClass(TGVOIP_PACKAGE_PATH "/AudioRecordJNI");
-	jclass audioTrackJNI=env->FindClass(TGVOIP_PACKAGE_PATH "/AudioTrackJNI");
-	jclass serverConfig=env->FindClass(TGVOIP_PACKAGE_PATH "/VoIPServerConfig");
-	jclass resampler=env->FindClass(TGVOIP_PACKAGE_PATH "/Resampler");
-	jclass videoSource=env->FindClass(TGVOIP_PACKAGE_PATH "/VideoSource");
-	if(env->ExceptionCheck()){
-		env->ExceptionClear(); // is returning NULL from FindClass not enough?
-	}
-	jclass videoRenderer=env->FindClass(TGVOIP_PACKAGE_PATH "/VideoRenderer");
-	if(env->ExceptionCheck()){
-		env->ExceptionClear(); // is returning NULL from FindClass not enough?
-	}
-	assert(controller && audioRecordJNI && audioTrackJNI && serverConfig && resampler);
-
-	audioRecordInstanceFld=env->GetFieldID(audioRecordJNI, "nativeInst", "J");
-	audioTrackInstanceFld=env->GetFieldID(audioTrackJNI, "nativeInst", "J");
-
-	env->GetJavaVM(&sharedJVM);
-	if(!AudioInputAndroid::jniClass){
-		jclass cls=env->FindClass(TGVOIP_PACKAGE_PATH "/AudioRecordJNI");
-		AudioInputAndroid::jniClass=(jclass) env->NewGlobalRef(cls);
-		AudioInputAndroid::initMethod=env->GetMethodID(cls, "init", "(IIII)V");
-		AudioInputAndroid::releaseMethod=env->GetMethodID(cls, "release", "()V");
-		AudioInputAndroid::startMethod=env->GetMethodID(cls, "start", "()Z");
-		AudioInputAndroid::stopMethod=env->GetMethodID(cls, "stop", "()V");
-		AudioInputAndroid::getEnabledEffectsMaskMethod=env->GetMethodID(cls, "getEnabledEffectsMask", "()I");
-
-		cls=env->FindClass(TGVOIP_PACKAGE_PATH "/AudioTrackJNI");
-		AudioOutputAndroid::jniClass=(jclass) env->NewGlobalRef(cls);
-		AudioOutputAndroid::initMethod=env->GetMethodID(cls, "init", "(IIII)V");
-		AudioOutputAndroid::releaseMethod=env->GetMethodID(cls, "release", "()V");
-		AudioOutputAndroid::startMethod=env->GetMethodID(cls, "start", "()V");
-		AudioOutputAndroid::stopMethod=env->GetMethodID(cls, "stop", "()V");
-
-		if(videoRenderer){
-			video::VideoRendererAndroid::decodeAndDisplayMethod=env->GetMethodID(videoRenderer, "decodeAndDisplay", "(Ljava/nio/ByteBuffer;IJ)V");
-			video::VideoRendererAndroid::resetMethod=env->GetMethodID(videoRenderer, "reset", "(Ljava/lang/String;II[[B)V");
-			video::VideoRendererAndroid::setStreamEnabledMethod=env->GetMethodID(videoRenderer, "setStreamEnabled", "(Z)V");
-		}
-	}
-
-	setStateMethod=env->GetMethodID(controller, "handleStateChange", "(I)V");
-	setSignalBarsMethod=env->GetMethodID(controller, "handleSignalBarsChange", "(I)V");
-	groupCallKeyReceivedMethod=env->GetMethodID(controller, "groupCallKeyReceived", "([B)V");
-	groupCallKeySentMethod=env->GetMethodID(controller, "groupCallKeySent", "()V");
-	callUpgradeRequestReceivedMethod=env->GetMethodID(controller, "callUpgradeRequestReceived", "()V");
-
-	if(!jniUtilitiesClass)
-		jniUtilitiesClass=(jclass) env->NewGlobalRef(env->FindClass(TGVOIP_PACKAGE_PATH "/JNIUtilities"));
-
-	// VoIPController
-	JNINativeMethod controllerMethods[]={
-			{"nativeInit", "(Ljava/lang/String;)J", (void*)&tgvoip::VoIPController_nativeInit},
-			{"nativeStart", "(J)V", (void*)&tgvoip::VoIPController_nativeStart},
-			{"nativeConnect", "(J)V", (void*)&tgvoip::VoIPController_nativeConnect},
-			{"nativeSetProxy", "(JLjava/lang/String;ILjava/lang/String;Ljava/lang/String;)V", (void*)&tgvoip::VoIPController_nativeSetProxy},
-			{"nativeSetEncryptionKey", "(J[BZ)V", (void*)&tgvoip::VoIPController_nativeSetEncryptionKey},
-			{"nativeSetRemoteEndpoints", "(J[L" TGVOIP_ENDPOINT_CLASS ";ZZI)V", (void*)&tgvoip::VoIPController_nativeSetRemoteEndpoints},
-			{"nativeSetNativeBufferSize", "(I)V", (void*)&tgvoip::VoIPController_nativeSetNativeBufferSize},
-			{"nativeRelease", "(J)V", (void*)&tgvoip::VoIPController_nativeRelease},
-			{"nativeGetDebugString", "(J)Ljava/lang/String;", (void*)&tgvoip::VoIPController_nativeGetDebugString},
-			{"nativeSetNetworkType", "(JI)V", (void*)&tgvoip::VoIPController_nativeSetNetworkType},
-			{"nativeSetMicMute", "(JZ)V", (void*)&tgvoip::VoIPController_nativeSetMicMute},
-			{"nativeSetConfig", "(JDDIZZZLjava/lang/String;Ljava/lang/String;Z)V", (void*)&tgvoip::VoIPController_nativeSetConfig},
-			{"nativeDebugCtl", "(JII)V", (void*)&tgvoip::VoIPController_nativeDebugCtl},
-			{"nativeGetVersion", "()Ljava/lang/String;", (void*)&tgvoip::VoIPController_nativeGetVersion},
-			{"nativeGetPreferredRelayID", "(J)J", (void*)&tgvoip::VoIPController_nativeGetPreferredRelayID},
-			{"nativeGetLastError", "(J)I", (void*)&tgvoip::VoIPController_nativeGetLastError},
-			{"nativeGetStats", "(JL" TGVOIP_PACKAGE_PATH "/VoIPController$Stats;)V", (void*)&tgvoip::VoIPController_nativeGetStats},
-			{"nativeGetDebugLog", "(J)Ljava/lang/String;", (void*)&tgvoip::VoIPController_nativeGetDebugLog},
-			{"nativeSetAudioOutputGainControlEnabled", "(JZ)V", (void*)&tgvoip::VoIPController_nativeSetAudioOutputGainControlEnabled},
-			{"nativeSetEchoCancellationStrength", "(JI)V", (void*)&tgvoip::VoIPController_nativeSetEchoCancellationStrength},
-			{"nativeGetPeerCapabilities", "(J)I", (void*)&tgvoip::VoIPController_nativeGetPeerCapabilities},
-			{"nativeSendGroupCallKey", "(J[B)V", (void*)&tgvoip::VoIPController_nativeSendGroupCallKey},
-			{"nativeRequestCallUpgrade", "(J)V", (void*)&tgvoip::VoIPController_nativeRequestCallUpgrade},
-			{"nativeNeedRate", "(J)Z", (void*)&tgvoip::VoIPController_nativeNeedRate},
-			{"getConnectionMaxLayer", "()I", (void*)&tgvoip::VoIPController_getConnectionMaxLayer},
-			//{"nativeSetVideoSource", "(JJ)V", (void*)&tgvoip::VoIPController_nativeSetVideoSource},
-			//{"nativeSetVideoRenderer", "(JJ)V", (void*)&tgvoip::VoIPController_nativeSetVideoRenderer}
-	};
-	env->RegisterNatives(controller, controllerMethods, sizeof(controllerMethods)/sizeof(JNINativeMethod));
-
-	// VoIPGroupController
-#ifndef TGVOIP_NO_GROUP_CALLS
-	if(groupController){
-		setStateMethod=env->GetMethodID(groupController, "handleStateChange", "(I)V");
-		setParticipantAudioEnabledMethod=env->GetMethodID(groupController, "setParticipantAudioEnabled", "(IZ)V");
-		setSelfStreamsMethod=env->GetMethodID(groupController, "setSelfStreams", "([B)V");
-
-		JNINativeMethod groupControllerMethods[]={
-				{"nativeInit", "(I)J", (void*)&tgvoip::VoIPGroupController_nativeInit},
-				{"nativeSetGroupCallInfo", "(J[B[B[B[B[BILjava/lang/String;Ljava/lang/String;I)V", (void*)&tgvoip::VoIPGroupController_nativeSetGroupCallInfo},
-				{"nativeAddGroupCallParticipant", "(JI[B[B)V", (void*)&tgvoip::VoIPGroupController_nativeAddGroupCallParticipant},
-				{"nativeRemoveGroupCallParticipant", "(JI)V", (void*)&tgvoip::VoIPGroupController_nativeRemoveGroupCallParticipant},
-				{"nativeGetParticipantAudioLevel", "(JI)F", (void*)&tgvoip::VoIPGroupController_nativeGetParticipantAudioLevel},
-				{"nativeSetParticipantVolume", "(JIF)V", (void*)&tgvoip::VoIPGroupController_nativeSetParticipantVolume},
-				{"getInitialStreams", "()[B", (void*)&tgvoip::VoIPGroupController_getInitialStreams},
-				{"nativeSetParticipantStreams", "(JI[B)V", (void*)&tgvoip::VoIPGroupController_nativeSetParticipantStreams}
-		};
-		env->RegisterNatives(groupController, groupControllerMethods, sizeof(groupControllerMethods)/sizeof(JNINativeMethod));
-	}
-#endif
-
-	// AudioRecordJNI
-	JNINativeMethod audioRecordMethods[]={
-			{"nativeCallback", "(Ljava/nio/ByteBuffer;)V", (void*)&tgvoip::AudioRecordJNI_nativeCallback}
-	};
-	env->RegisterNatives(audioRecordJNI, audioRecordMethods, sizeof(audioRecordMethods)/sizeof(JNINativeMethod));
-
-	// AudioTrackJNI
-	JNINativeMethod audioTrackMethods[]={
-			{"nativeCallback", "([B)V", (void*)&tgvoip::AudioTrackJNI_nativeCallback}
-	};
-	env->RegisterNatives(audioTrackJNI, audioTrackMethods, sizeof(audioTrackMethods)/sizeof(JNINativeMethod));
-
-	// VoIPServerConfig
-	JNINativeMethod serverConfigMethods[]={
-			{"nativeSetConfig", "(Ljava/lang/String;)V", (void*)&tgvoip::VoIPServerConfig_nativeSetConfig}
-	};
-	env->RegisterNatives(serverConfig, serverConfigMethods, sizeof(serverConfigMethods)/sizeof(JNINativeMethod));
-
-	// Resampler
-	JNINativeMethod resamplerMethods[]={
-			{"convert44to48", "(Ljava/nio/ByteBuffer;Ljava/nio/ByteBuffer;)I", (void*)&tgvoip::Resampler_convert44to48},
-			{"convert48to44", "(Ljava/nio/ByteBuffer;Ljava/nio/ByteBuffer;)I", (void*)&tgvoip::Resampler_convert48to44}
-	};
-	env->RegisterNatives(resampler, resamplerMethods, sizeof(resamplerMethods)/sizeof(JNINativeMethod));
-
-	if(videoSource){
-		// VideoSource
-		JNINativeMethod videoSourceMethods[]={
-				{"nativeInit",                     "()J",                          (void *) &tgvoip::VideoSource_nativeInit},
-				{"nativeRelease",                  "(J)V",                         (void *) &tgvoip::VideoSource_nativeRelease},
-				{"nativeSetVideoStreamParameters", "(J[Ljava/nio/ByteBuffer;II)V", (void *) &tgvoip::VideoSource_nativeSetVideoStreamParameters},
-				{"nativeSendFrame",                "(JLjava/nio/ByteBuffer;III)V", (void *) &tgvoip::VideoSource_nativeSendFrame}
-		};
-		env->RegisterNatives(videoSource, videoSourceMethods, sizeof(videoSourceMethods)/sizeof(JNINativeMethod));
-	}
-
-	if(videoRenderer){
-		// VideoRenderer
-		JNINativeMethod videoRendererMethods[]={
-				{"nativeInit", "()J", (void *) &tgvoip::VideoRenderer_nativeInit}
-		};
-		env->RegisterNatives(videoRenderer, videoRendererMethods, sizeof(videoRendererMethods)/sizeof(JNINativeMethod));
-	}
-}
diff --git a/submodules/libtgvoip/client/android/tg_voip_jni.h b/submodules/libtgvoip/client/android/tg_voip_jni.h
deleted file mode 100644
index 8c85b69651..0000000000
--- a/submodules/libtgvoip/client/android/tg_voip_jni.h
+++ /dev/null
@@ -1,18 +0,0 @@
-//
-// Created by Grishka on 14.08.2018.
-//
-
-#ifndef TELEGRAM_TG_VOIP_JNI_H
-#define TELEGRAM_TG_VOIP_JNI_H
-
-#include <jni.h>
-
-#ifdef __cplusplus
-extern "C"{
-#endif
-void tgvoipRegisterNatives(JNIEnv* env);
-#ifdef __cplusplus
-}
-#endif
-
-#endif //TELEGRAM_TG_VOIP_JNI_H
diff --git a/submodules/libtgvoip/compile b/submodules/libtgvoip/compile
deleted file mode 100755
index 99e50524b3..0000000000
--- a/submodules/libtgvoip/compile
+++ /dev/null
@@ -1,348 +0,0 @@
-#! /bin/sh
-# Wrapper for compilers which do not understand '-c -o'.
-
-scriptversion=2018-03-07.03; # UTC
-
-# Copyright (C) 1999-2018 Free Software Foundation, Inc.
-# Written by Tom Tromey <tromey@cygnus.com>.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-# This file is maintained in Automake, please report
-# bugs to <bug-automake@gnu.org> or send patches to
-# <automake-patches@gnu.org>.
-
-nl='
-'
-
-# We need space, tab and new line, in precisely that order.  Quoting is
-# there to prevent tools from complaining about whitespace usage.
-IFS=" ""	$nl"
-
-file_conv=
-
-# func_file_conv build_file lazy
-# Convert a $build file to $host form and store it in $file
-# Currently only supports Windows hosts. If the determined conversion
-# type is listed in (the comma separated) LAZY, no conversion will
-# take place.
-func_file_conv ()
-{
-  file=$1
-  case $file in
-    / | /[!/]*) # absolute file, and not a UNC file
-      if test -z "$file_conv"; then
-	# lazily determine how to convert abs files
-	case `uname -s` in
-	  MINGW*)
-	    file_conv=mingw
-	    ;;
-	  CYGWIN*)
-	    file_conv=cygwin
-	    ;;
-	  *)
-	    file_conv=wine
-	    ;;
-	esac
-      fi
-      case $file_conv/,$2, in
-	*,$file_conv,*)
-	  ;;
-	mingw/*)
-	  file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'`
-	  ;;
-	cygwin/*)
-	  file=`cygpath -m "$file" || echo "$file"`
-	  ;;
-	wine/*)
-	  file=`winepath -w "$file" || echo "$file"`
-	  ;;
-      esac
-      ;;
-  esac
-}
-
-# func_cl_dashL linkdir
-# Make cl look for libraries in LINKDIR
-func_cl_dashL ()
-{
-  func_file_conv "$1"
-  if test -z "$lib_path"; then
-    lib_path=$file
-  else
-    lib_path="$lib_path;$file"
-  fi
-  linker_opts="$linker_opts -LIBPATH:$file"
-}
-
-# func_cl_dashl library
-# Do a library search-path lookup for cl
-func_cl_dashl ()
-{
-  lib=$1
-  found=no
-  save_IFS=$IFS
-  IFS=';'
-  for dir in $lib_path $LIB
-  do
-    IFS=$save_IFS
-    if $shared && test -f "$dir/$lib.dll.lib"; then
-      found=yes
-      lib=$dir/$lib.dll.lib
-      break
-    fi
-    if test -f "$dir/$lib.lib"; then
-      found=yes
-      lib=$dir/$lib.lib
-      break
-    fi
-    if test -f "$dir/lib$lib.a"; then
-      found=yes
-      lib=$dir/lib$lib.a
-      break
-    fi
-  done
-  IFS=$save_IFS
-
-  if test "$found" != yes; then
-    lib=$lib.lib
-  fi
-}
-
-# func_cl_wrapper cl arg...
-# Adjust compile command to suit cl
-func_cl_wrapper ()
-{
-  # Assume a capable shell
-  lib_path=
-  shared=:
-  linker_opts=
-  for arg
-  do
-    if test -n "$eat"; then
-      eat=
-    else
-      case $1 in
-	-o)
-	  # configure might choose to run compile as 'compile cc -o foo foo.c'.
-	  eat=1
-	  case $2 in
-	    *.o | *.[oO][bB][jJ])
-	      func_file_conv "$2"
-	      set x "$@" -Fo"$file"
-	      shift
-	      ;;
-	    *)
-	      func_file_conv "$2"
-	      set x "$@" -Fe"$file"
-	      shift
-	      ;;
-	  esac
-	  ;;
-	-I)
-	  eat=1
-	  func_file_conv "$2" mingw
-	  set x "$@" -I"$file"
-	  shift
-	  ;;
-	-I*)
-	  func_file_conv "${1#-I}" mingw
-	  set x "$@" -I"$file"
-	  shift
-	  ;;
-	-l)
-	  eat=1
-	  func_cl_dashl "$2"
-	  set x "$@" "$lib"
-	  shift
-	  ;;
-	-l*)
-	  func_cl_dashl "${1#-l}"
-	  set x "$@" "$lib"
-	  shift
-	  ;;
-	-L)
-	  eat=1
-	  func_cl_dashL "$2"
-	  ;;
-	-L*)
-	  func_cl_dashL "${1#-L}"
-	  ;;
-	-static)
-	  shared=false
-	  ;;
-	-Wl,*)
-	  arg=${1#-Wl,}
-	  save_ifs="$IFS"; IFS=','
-	  for flag in $arg; do
-	    IFS="$save_ifs"
-	    linker_opts="$linker_opts $flag"
-	  done
-	  IFS="$save_ifs"
-	  ;;
-	-Xlinker)
-	  eat=1
-	  linker_opts="$linker_opts $2"
-	  ;;
-	-*)
-	  set x "$@" "$1"
-	  shift
-	  ;;
-	*.cc | *.CC | *.cxx | *.CXX | *.[cC]++)
-	  func_file_conv "$1"
-	  set x "$@" -Tp"$file"
-	  shift
-	  ;;
-	*.c | *.cpp | *.CPP | *.lib | *.LIB | *.Lib | *.OBJ | *.obj | *.[oO])
-	  func_file_conv "$1" mingw
-	  set x "$@" "$file"
-	  shift
-	  ;;
-	*)
-	  set x "$@" "$1"
-	  shift
-	  ;;
-      esac
-    fi
-    shift
-  done
-  if test -n "$linker_opts"; then
-    linker_opts="-link$linker_opts"
-  fi
-  exec "$@" $linker_opts
-  exit 1
-}
-
-eat=
-
-case $1 in
-  '')
-     echo "$0: No command.  Try '$0 --help' for more information." 1>&2
-     exit 1;
-     ;;
-  -h | --h*)
-    cat <<\EOF
-Usage: compile [--help] [--version] PROGRAM [ARGS]
-
-Wrapper for compilers which do not understand '-c -o'.
-Remove '-o dest.o' from ARGS, run PROGRAM with the remaining
-arguments, and rename the output as expected.
-
-If you are trying to build a whole package this is not the
-right script to run: please start by reading the file 'INSTALL'.
-
-Report bugs to <bug-automake@gnu.org>.
-EOF
-    exit $?
-    ;;
-  -v | --v*)
-    echo "compile $scriptversion"
-    exit $?
-    ;;
-  cl | *[/\\]cl | cl.exe | *[/\\]cl.exe | \
-  icl | *[/\\]icl | icl.exe | *[/\\]icl.exe )
-    func_cl_wrapper "$@"      # Doesn't return...
-    ;;
-esac
-
-ofile=
-cfile=
-
-for arg
-do
-  if test -n "$eat"; then
-    eat=
-  else
-    case $1 in
-      -o)
-	# configure might choose to run compile as 'compile cc -o foo foo.c'.
-	# So we strip '-o arg' only if arg is an object.
-	eat=1
-	case $2 in
-	  *.o | *.obj)
-	    ofile=$2
-	    ;;
-	  *)
-	    set x "$@" -o "$2"
-	    shift
-	    ;;
-	esac
-	;;
-      *.c)
-	cfile=$1
-	set x "$@" "$1"
-	shift
-	;;
-      *)
-	set x "$@" "$1"
-	shift
-	;;
-    esac
-  fi
-  shift
-done
-
-if test -z "$ofile" || test -z "$cfile"; then
-  # If no '-o' option was seen then we might have been invoked from a
-  # pattern rule where we don't need one.  That is ok -- this is a
-  # normal compilation that the losing compiler can handle.  If no
-  # '.c' file was seen then we are probably linking.  That is also
-  # ok.
-  exec "$@"
-fi
-
-# Name of file we expect compiler to create.
-cofile=`echo "$cfile" | sed 's|^.*[\\/]||; s|^[a-zA-Z]:||; s/\.c$/.o/'`
-
-# Create the lock directory.
-# Note: use '[/\\:.-]' here to ensure that we don't use the same name
-# that we are using for the .o file.  Also, base the name on the expected
-# object file name, since that is what matters with a parallel build.
-lockdir=`echo "$cofile" | sed -e 's|[/\\:.-]|_|g'`.d
-while true; do
-  if mkdir "$lockdir" >/dev/null 2>&1; then
-    break
-  fi
-  sleep 1
-done
-# FIXME: race condition here if user kills between mkdir and trap.
-trap "rmdir '$lockdir'; exit 1" 1 2 15
-
-# Run the compile.
-"$@"
-ret=$?
-
-if test -f "$cofile"; then
-  test "$cofile" = "$ofile" || mv "$cofile" "$ofile"
-elif test -f "${cofile}bj"; then
-  test "${cofile}bj" = "$ofile" || mv "${cofile}bj" "$ofile"
-fi
-
-rmdir "$lockdir"
-exit $ret
-
-# Local Variables:
-# mode: shell-script
-# sh-indentation: 2
-# eval: (add-hook 'before-save-hook 'time-stamp)
-# time-stamp-start: "scriptversion="
-# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-time-zone: "UTC0"
-# time-stamp-end: "; # UTC"
-# End:
diff --git a/submodules/libtgvoip/config.guess b/submodules/libtgvoip/config.guess
deleted file mode 100755
index 256083a70d..0000000000
--- a/submodules/libtgvoip/config.guess
+++ /dev/null
@@ -1,1476 +0,0 @@
-#! /bin/sh
-# Attempt to guess a canonical system name.
-#   Copyright 1992-2018 Free Software Foundation, Inc.
-
-timestamp='2018-03-08'
-
-# This file is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, see <https://www.gnu.org/licenses/>.
-#
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that
-# program.  This Exception is an additional permission under section 7
-# of the GNU General Public License, version 3 ("GPLv3").
-#
-# Originally written by Per Bothner; maintained since 2000 by Ben Elliston.
-#
-# You can get the latest version of this script from:
-# https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess
-#
-# Please send patches to <config-patches@gnu.org>.
-
-
-me=`echo "$0" | sed -e 's,.*/,,'`
-
-usage="\
-Usage: $0 [OPTION]
-
-Output the configuration name of the system \`$me' is run on.
-
-Options:
-  -h, --help         print this help, then exit
-  -t, --time-stamp   print date of last modification, then exit
-  -v, --version      print version number, then exit
-
-Report bugs and patches to <config-patches@gnu.org>."
-
-version="\
-GNU config.guess ($timestamp)
-
-Originally written by Per Bothner.
-Copyright 1992-2018 Free Software Foundation, Inc.
-
-This is free software; see the source for copying conditions.  There is NO
-warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
-
-help="
-Try \`$me --help' for more information."
-
-# Parse command line
-while test $# -gt 0 ; do
-  case $1 in
-    --time-stamp | --time* | -t )
-       echo "$timestamp" ; exit ;;
-    --version | -v )
-       echo "$version" ; exit ;;
-    --help | --h* | -h )
-       echo "$usage"; exit ;;
-    -- )     # Stop option processing
-       shift; break ;;
-    - )	# Use stdin as input.
-       break ;;
-    -* )
-       echo "$me: invalid option $1$help" >&2
-       exit 1 ;;
-    * )
-       break ;;
-  esac
-done
-
-if test $# != 0; then
-  echo "$me: too many arguments$help" >&2
-  exit 1
-fi
-
-trap 'exit 1' 1 2 15
-
-# CC_FOR_BUILD -- compiler used by this script. Note that the use of a
-# compiler to aid in system detection is discouraged as it requires
-# temporary files to be created and, as you can see below, it is a
-# headache to deal with in a portable fashion.
-
-# Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still
-# use `HOST_CC' if defined, but it is deprecated.
-
-# Portable tmp directory creation inspired by the Autoconf team.
-
-set_cc_for_build='
-trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ;
-trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
-: ${TMPDIR=/tmp} ;
- { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
- { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||
- { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } ||
- { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ;
-dummy=$tmp/dummy ;
-tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ;
-case $CC_FOR_BUILD,$HOST_CC,$CC in
- ,,)    echo "int x;" > "$dummy.c" ;
-	for c in cc gcc c89 c99 ; do
-	  if ($c -c -o "$dummy.o" "$dummy.c") >/dev/null 2>&1 ; then
-	     CC_FOR_BUILD="$c"; break ;
-	  fi ;
-	done ;
-	if test x"$CC_FOR_BUILD" = x ; then
-	  CC_FOR_BUILD=no_compiler_found ;
-	fi
-	;;
- ,,*)   CC_FOR_BUILD=$CC ;;
- ,*,*)  CC_FOR_BUILD=$HOST_CC ;;
-esac ; set_cc_for_build= ;'
-
-# This is needed to find uname on a Pyramid OSx when run in the BSD universe.
-# (ghazi@noc.rutgers.edu 1994-08-24)
-if (test -f /.attbin/uname) >/dev/null 2>&1 ; then
-	PATH=$PATH:/.attbin ; export PATH
-fi
-
-UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown
-UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
-UNAME_SYSTEM=`(uname -s) 2>/dev/null`  || UNAME_SYSTEM=unknown
-UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
-
-case "$UNAME_SYSTEM" in
-Linux|GNU|GNU/*)
-	# If the system lacks a compiler, then just pick glibc.
-	# We could probably try harder.
-	LIBC=gnu
-
-	eval "$set_cc_for_build"
-	cat <<-EOF > "$dummy.c"
-	#include <features.h>
-	#if defined(__UCLIBC__)
-	LIBC=uclibc
-	#elif defined(__dietlibc__)
-	LIBC=dietlibc
-	#else
-	LIBC=gnu
-	#endif
-	EOF
-	eval "`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^LIBC' | sed 's, ,,g'`"
-
-	# If ldd exists, use it to detect musl libc.
-	if command -v ldd >/dev/null && \
-		ldd --version 2>&1 | grep -q ^musl
-	then
-	    LIBC=musl
-	fi
-	;;
-esac
-
-# Note: order is significant - the case branches are not exclusive.
-
-case "$UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION" in
-    *:NetBSD:*:*)
-	# NetBSD (nbsd) targets should (where applicable) match one or
-	# more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*,
-	# *-*-netbsdecoff* and *-*-netbsd*.  For targets that recently
-	# switched to ELF, *-*-netbsd* would select the old
-	# object file format.  This provides both forward
-	# compatibility and a consistent mechanism for selecting the
-	# object file format.
-	#
-	# Note: NetBSD doesn't particularly care about the vendor
-	# portion of the name.  We always set it to "unknown".
-	sysctl="sysctl -n hw.machine_arch"
-	UNAME_MACHINE_ARCH=`(uname -p 2>/dev/null || \
-	    "/sbin/$sysctl" 2>/dev/null || \
-	    "/usr/sbin/$sysctl" 2>/dev/null || \
-	    echo unknown)`
-	case "$UNAME_MACHINE_ARCH" in
-	    armeb) machine=armeb-unknown ;;
-	    arm*) machine=arm-unknown ;;
-	    sh3el) machine=shl-unknown ;;
-	    sh3eb) machine=sh-unknown ;;
-	    sh5el) machine=sh5le-unknown ;;
-	    earmv*)
-		arch=`echo "$UNAME_MACHINE_ARCH" | sed -e 's,^e\(armv[0-9]\).*$,\1,'`
-		endian=`echo "$UNAME_MACHINE_ARCH" | sed -ne 's,^.*\(eb\)$,\1,p'`
-		machine="${arch}${endian}"-unknown
-		;;
-	    *) machine="$UNAME_MACHINE_ARCH"-unknown ;;
-	esac
-	# The Operating System including object format, if it has switched
-	# to ELF recently (or will in the future) and ABI.
-	case "$UNAME_MACHINE_ARCH" in
-	    earm*)
-		os=netbsdelf
-		;;
-	    arm*|i386|m68k|ns32k|sh3*|sparc|vax)
-		eval "$set_cc_for_build"
-		if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
-			| grep -q __ELF__
-		then
-		    # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
-		    # Return netbsd for either.  FIX?
-		    os=netbsd
-		else
-		    os=netbsdelf
-		fi
-		;;
-	    *)
-		os=netbsd
-		;;
-	esac
-	# Determine ABI tags.
-	case "$UNAME_MACHINE_ARCH" in
-	    earm*)
-		expr='s/^earmv[0-9]/-eabi/;s/eb$//'
-		abi=`echo "$UNAME_MACHINE_ARCH" | sed -e "$expr"`
-		;;
-	esac
-	# The OS release
-	# Debian GNU/NetBSD machines have a different userland, and
-	# thus, need a distinct triplet. However, they do not need
-	# kernel version information, so it can be replaced with a
-	# suitable tag, in the style of linux-gnu.
-	case "$UNAME_VERSION" in
-	    Debian*)
-		release='-gnu'
-		;;
-	    *)
-		release=`echo "$UNAME_RELEASE" | sed -e 's/[-_].*//' | cut -d. -f1,2`
-		;;
-	esac
-	# Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
-	# contains redundant information, the shorter form:
-	# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
-	echo "$machine-${os}${release}${abi}"
-	exit ;;
-    *:Bitrig:*:*)
-	UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'`
-	echo "$UNAME_MACHINE_ARCH"-unknown-bitrig"$UNAME_RELEASE"
-	exit ;;
-    *:OpenBSD:*:*)
-	UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
-	echo "$UNAME_MACHINE_ARCH"-unknown-openbsd"$UNAME_RELEASE"
-	exit ;;
-    *:LibertyBSD:*:*)
-	UNAME_MACHINE_ARCH=`arch | sed 's/^.*BSD\.//'`
-	echo "$UNAME_MACHINE_ARCH"-unknown-libertybsd"$UNAME_RELEASE"
-	exit ;;
-    *:MidnightBSD:*:*)
-	echo "$UNAME_MACHINE"-unknown-midnightbsd"$UNAME_RELEASE"
-	exit ;;
-    *:ekkoBSD:*:*)
-	echo "$UNAME_MACHINE"-unknown-ekkobsd"$UNAME_RELEASE"
-	exit ;;
-    *:SolidBSD:*:*)
-	echo "$UNAME_MACHINE"-unknown-solidbsd"$UNAME_RELEASE"
-	exit ;;
-    macppc:MirBSD:*:*)
-	echo powerpc-unknown-mirbsd"$UNAME_RELEASE"
-	exit ;;
-    *:MirBSD:*:*)
-	echo "$UNAME_MACHINE"-unknown-mirbsd"$UNAME_RELEASE"
-	exit ;;
-    *:Sortix:*:*)
-	echo "$UNAME_MACHINE"-unknown-sortix
-	exit ;;
-    *:Redox:*:*)
-	echo "$UNAME_MACHINE"-unknown-redox
-	exit ;;
-    mips:OSF1:*.*)
-        echo mips-dec-osf1
-        exit ;;
-    alpha:OSF1:*:*)
-	case $UNAME_RELEASE in
-	*4.0)
-		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
-		;;
-	*5.*)
-		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
-		;;
-	esac
-	# According to Compaq, /usr/sbin/psrinfo has been available on
-	# OSF/1 and Tru64 systems produced since 1995.  I hope that
-	# covers most systems running today.  This code pipes the CPU
-	# types through head -n 1, so we only detect the type of CPU 0.
-	ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^  The alpha \(.*\) processor.*$/\1/p' | head -n 1`
-	case "$ALPHA_CPU_TYPE" in
-	    "EV4 (21064)")
-		UNAME_MACHINE=alpha ;;
-	    "EV4.5 (21064)")
-		UNAME_MACHINE=alpha ;;
-	    "LCA4 (21066/21068)")
-		UNAME_MACHINE=alpha ;;
-	    "EV5 (21164)")
-		UNAME_MACHINE=alphaev5 ;;
-	    "EV5.6 (21164A)")
-		UNAME_MACHINE=alphaev56 ;;
-	    "EV5.6 (21164PC)")
-		UNAME_MACHINE=alphapca56 ;;
-	    "EV5.7 (21164PC)")
-		UNAME_MACHINE=alphapca57 ;;
-	    "EV6 (21264)")
-		UNAME_MACHINE=alphaev6 ;;
-	    "EV6.7 (21264A)")
-		UNAME_MACHINE=alphaev67 ;;
-	    "EV6.8CB (21264C)")
-		UNAME_MACHINE=alphaev68 ;;
-	    "EV6.8AL (21264B)")
-		UNAME_MACHINE=alphaev68 ;;
-	    "EV6.8CX (21264D)")
-		UNAME_MACHINE=alphaev68 ;;
-	    "EV6.9A (21264/EV69A)")
-		UNAME_MACHINE=alphaev69 ;;
-	    "EV7 (21364)")
-		UNAME_MACHINE=alphaev7 ;;
-	    "EV7.9 (21364A)")
-		UNAME_MACHINE=alphaev79 ;;
-	esac
-	# A Pn.n version is a patched version.
-	# A Vn.n version is a released version.
-	# A Tn.n version is a released field test version.
-	# A Xn.n version is an unreleased experimental baselevel.
-	# 1.2 uses "1.2" for uname -r.
-	echo "$UNAME_MACHINE"-dec-osf"`echo "$UNAME_RELEASE" | sed -e 's/^[PVTX]//' | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz`"
-	# Reset EXIT trap before exiting to avoid spurious non-zero exit code.
-	exitcode=$?
-	trap '' 0
-	exit $exitcode ;;
-    Amiga*:UNIX_System_V:4.0:*)
-	echo m68k-unknown-sysv4
-	exit ;;
-    *:[Aa]miga[Oo][Ss]:*:*)
-	echo "$UNAME_MACHINE"-unknown-amigaos
-	exit ;;
-    *:[Mm]orph[Oo][Ss]:*:*)
-	echo "$UNAME_MACHINE"-unknown-morphos
-	exit ;;
-    *:OS/390:*:*)
-	echo i370-ibm-openedition
-	exit ;;
-    *:z/VM:*:*)
-	echo s390-ibm-zvmoe
-	exit ;;
-    *:OS400:*:*)
-	echo powerpc-ibm-os400
-	exit ;;
-    arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
-	echo arm-acorn-riscix"$UNAME_RELEASE"
-	exit ;;
-    arm*:riscos:*:*|arm*:RISCOS:*:*)
-	echo arm-unknown-riscos
-	exit ;;
-    SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
-	echo hppa1.1-hitachi-hiuxmpp
-	exit ;;
-    Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*)
-	# akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE.
-	if test "`(/bin/universe) 2>/dev/null`" = att ; then
-		echo pyramid-pyramid-sysv3
-	else
-		echo pyramid-pyramid-bsd
-	fi
-	exit ;;
-    NILE*:*:*:dcosx)
-	echo pyramid-pyramid-svr4
-	exit ;;
-    DRS?6000:unix:4.0:6*)
-	echo sparc-icl-nx6
-	exit ;;
-    DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*)
-	case `/usr/bin/uname -p` in
-	    sparc) echo sparc-icl-nx7; exit ;;
-	esac ;;
-    s390x:SunOS:*:*)
-	echo "$UNAME_MACHINE"-ibm-solaris2"`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'`"
-	exit ;;
-    sun4H:SunOS:5.*:*)
-	echo sparc-hal-solaris2"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`"
-	exit ;;
-    sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
-	echo sparc-sun-solaris2"`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'`"
-	exit ;;
-    i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*)
-	echo i386-pc-auroraux"$UNAME_RELEASE"
-	exit ;;
-    i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
-	eval "$set_cc_for_build"
-	SUN_ARCH=i386
-	# If there is a compiler, see if it is configured for 64-bit objects.
-	# Note that the Sun cc does not turn __LP64__ into 1 like gcc does.
-	# This test works for both compilers.
-	if [ "$CC_FOR_BUILD" != no_compiler_found ]; then
-	    if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \
-		(CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \
-		grep IS_64BIT_ARCH >/dev/null
-	    then
-		SUN_ARCH=x86_64
-	    fi
-	fi
-	echo "$SUN_ARCH"-pc-solaris2"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`"
-	exit ;;
-    sun4*:SunOS:6*:*)
-	# According to config.sub, this is the proper way to canonicalize
-	# SunOS6.  Hard to guess exactly what SunOS6 will be like, but
-	# it's likely to be more like Solaris than SunOS4.
-	echo sparc-sun-solaris3"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`"
-	exit ;;
-    sun4*:SunOS:*:*)
-	case "`/usr/bin/arch -k`" in
-	    Series*|S4*)
-		UNAME_RELEASE=`uname -v`
-		;;
-	esac
-	# Japanese Language versions have a version number like `4.1.3-JL'.
-	echo sparc-sun-sunos"`echo "$UNAME_RELEASE"|sed -e 's/-/_/'`"
-	exit ;;
-    sun3*:SunOS:*:*)
-	echo m68k-sun-sunos"$UNAME_RELEASE"
-	exit ;;
-    sun*:*:4.2BSD:*)
-	UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
-	test "x$UNAME_RELEASE" = x && UNAME_RELEASE=3
-	case "`/bin/arch`" in
-	    sun3)
-		echo m68k-sun-sunos"$UNAME_RELEASE"
-		;;
-	    sun4)
-		echo sparc-sun-sunos"$UNAME_RELEASE"
-		;;
-	esac
-	exit ;;
-    aushp:SunOS:*:*)
-	echo sparc-auspex-sunos"$UNAME_RELEASE"
-	exit ;;
-    # The situation for MiNT is a little confusing.  The machine name
-    # can be virtually everything (everything which is not
-    # "atarist" or "atariste" at least should have a processor
-    # > m68000).  The system name ranges from "MiNT" over "FreeMiNT"
-    # to the lowercase version "mint" (or "freemint").  Finally
-    # the system name "TOS" denotes a system which is actually not
-    # MiNT.  But MiNT is downward compatible to TOS, so this should
-    # be no problem.
-    atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
-	echo m68k-atari-mint"$UNAME_RELEASE"
-	exit ;;
-    atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
-	echo m68k-atari-mint"$UNAME_RELEASE"
-	exit ;;
-    *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
-	echo m68k-atari-mint"$UNAME_RELEASE"
-	exit ;;
-    milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
-	echo m68k-milan-mint"$UNAME_RELEASE"
-	exit ;;
-    hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
-	echo m68k-hades-mint"$UNAME_RELEASE"
-	exit ;;
-    *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
-	echo m68k-unknown-mint"$UNAME_RELEASE"
-	exit ;;
-    m68k:machten:*:*)
-	echo m68k-apple-machten"$UNAME_RELEASE"
-	exit ;;
-    powerpc:machten:*:*)
-	echo powerpc-apple-machten"$UNAME_RELEASE"
-	exit ;;
-    RISC*:Mach:*:*)
-	echo mips-dec-mach_bsd4.3
-	exit ;;
-    RISC*:ULTRIX:*:*)
-	echo mips-dec-ultrix"$UNAME_RELEASE"
-	exit ;;
-    VAX*:ULTRIX*:*:*)
-	echo vax-dec-ultrix"$UNAME_RELEASE"
-	exit ;;
-    2020:CLIX:*:* | 2430:CLIX:*:*)
-	echo clipper-intergraph-clix"$UNAME_RELEASE"
-	exit ;;
-    mips:*:*:UMIPS | mips:*:*:RISCos)
-	eval "$set_cc_for_build"
-	sed 's/^	//' << EOF > "$dummy.c"
-#ifdef __cplusplus
-#include <stdio.h>  /* for printf() prototype */
-	int main (int argc, char *argv[]) {
-#else
-	int main (argc, argv) int argc; char *argv[]; {
-#endif
-	#if defined (host_mips) && defined (MIPSEB)
-	#if defined (SYSTYPE_SYSV)
-	  printf ("mips-mips-riscos%ssysv\\n", argv[1]); exit (0);
-	#endif
-	#if defined (SYSTYPE_SVR4)
-	  printf ("mips-mips-riscos%ssvr4\\n", argv[1]); exit (0);
-	#endif
-	#if defined (SYSTYPE_BSD43) || defined(SYSTYPE_BSD)
-	  printf ("mips-mips-riscos%sbsd\\n", argv[1]); exit (0);
-	#endif
-	#endif
-	  exit (-1);
-	}
-EOF
-	$CC_FOR_BUILD -o "$dummy" "$dummy.c" &&
-	  dummyarg=`echo "$UNAME_RELEASE" | sed -n 's/\([0-9]*\).*/\1/p'` &&
-	  SYSTEM_NAME=`"$dummy" "$dummyarg"` &&
-	    { echo "$SYSTEM_NAME"; exit; }
-	echo mips-mips-riscos"$UNAME_RELEASE"
-	exit ;;
-    Motorola:PowerMAX_OS:*:*)
-	echo powerpc-motorola-powermax
-	exit ;;
-    Motorola:*:4.3:PL8-*)
-	echo powerpc-harris-powermax
-	exit ;;
-    Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*)
-	echo powerpc-harris-powermax
-	exit ;;
-    Night_Hawk:Power_UNIX:*:*)
-	echo powerpc-harris-powerunix
-	exit ;;
-    m88k:CX/UX:7*:*)
-	echo m88k-harris-cxux7
-	exit ;;
-    m88k:*:4*:R4*)
-	echo m88k-motorola-sysv4
-	exit ;;
-    m88k:*:3*:R3*)
-	echo m88k-motorola-sysv3
-	exit ;;
-    AViiON:dgux:*:*)
-	# DG/UX returns AViiON for all architectures
-	UNAME_PROCESSOR=`/usr/bin/uname -p`
-	if [ "$UNAME_PROCESSOR" = mc88100 ] || [ "$UNAME_PROCESSOR" = mc88110 ]
-	then
-	    if [ "$TARGET_BINARY_INTERFACE"x = m88kdguxelfx ] || \
-	       [ "$TARGET_BINARY_INTERFACE"x = x ]
-	    then
-		echo m88k-dg-dgux"$UNAME_RELEASE"
-	    else
-		echo m88k-dg-dguxbcs"$UNAME_RELEASE"
-	    fi
-	else
-	    echo i586-dg-dgux"$UNAME_RELEASE"
-	fi
-	exit ;;
-    M88*:DolphinOS:*:*)	# DolphinOS (SVR3)
-	echo m88k-dolphin-sysv3
-	exit ;;
-    M88*:*:R3*:*)
-	# Delta 88k system running SVR3
-	echo m88k-motorola-sysv3
-	exit ;;
-    XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3)
-	echo m88k-tektronix-sysv3
-	exit ;;
-    Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD)
-	echo m68k-tektronix-bsd
-	exit ;;
-    *:IRIX*:*:*)
-	echo mips-sgi-irix"`echo "$UNAME_RELEASE"|sed -e 's/-/_/g'`"
-	exit ;;
-    ????????:AIX?:[12].1:2)   # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX.
-	echo romp-ibm-aix     # uname -m gives an 8 hex-code CPU id
-	exit ;;               # Note that: echo "'`uname -s`'" gives 'AIX '
-    i*86:AIX:*:*)
-	echo i386-ibm-aix
-	exit ;;
-    ia64:AIX:*:*)
-	if [ -x /usr/bin/oslevel ] ; then
-		IBM_REV=`/usr/bin/oslevel`
-	else
-		IBM_REV="$UNAME_VERSION.$UNAME_RELEASE"
-	fi
-	echo "$UNAME_MACHINE"-ibm-aix"$IBM_REV"
-	exit ;;
-    *:AIX:2:3)
-	if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
-		eval "$set_cc_for_build"
-		sed 's/^		//' << EOF > "$dummy.c"
-		#include <sys/systemcfg.h>
-
-		main()
-			{
-			if (!__power_pc())
-				exit(1);
-			puts("powerpc-ibm-aix3.2.5");
-			exit(0);
-			}
-EOF
-		if $CC_FOR_BUILD -o "$dummy" "$dummy.c" && SYSTEM_NAME=`"$dummy"`
-		then
-			echo "$SYSTEM_NAME"
-		else
-			echo rs6000-ibm-aix3.2.5
-		fi
-	elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
-		echo rs6000-ibm-aix3.2.4
-	else
-		echo rs6000-ibm-aix3.2
-	fi
-	exit ;;
-    *:AIX:*:[4567])
-	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
-	if /usr/sbin/lsattr -El "$IBM_CPU_ID" | grep ' POWER' >/dev/null 2>&1; then
-		IBM_ARCH=rs6000
-	else
-		IBM_ARCH=powerpc
-	fi
-	if [ -x /usr/bin/lslpp ] ; then
-		IBM_REV=`/usr/bin/lslpp -Lqc bos.rte.libc |
-			   awk -F: '{ print $3 }' | sed s/[0-9]*$/0/`
-	else
-		IBM_REV="$UNAME_VERSION.$UNAME_RELEASE"
-	fi
-	echo "$IBM_ARCH"-ibm-aix"$IBM_REV"
-	exit ;;
-    *:AIX:*:*)
-	echo rs6000-ibm-aix
-	exit ;;
-    ibmrt:4.4BSD:*|romp-ibm:4.4BSD:*)
-	echo romp-ibm-bsd4.4
-	exit ;;
-    ibmrt:*BSD:*|romp-ibm:BSD:*)            # covers RT/PC BSD and
-	echo romp-ibm-bsd"$UNAME_RELEASE"   # 4.3 with uname added to
-	exit ;;                             # report: romp-ibm BSD 4.3
-    *:BOSX:*:*)
-	echo rs6000-bull-bosx
-	exit ;;
-    DPX/2?00:B.O.S.:*:*)
-	echo m68k-bull-sysv3
-	exit ;;
-    9000/[34]??:4.3bsd:1.*:*)
-	echo m68k-hp-bsd
-	exit ;;
-    hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*)
-	echo m68k-hp-bsd4.4
-	exit ;;
-    9000/[34678]??:HP-UX:*:*)
-	HPUX_REV=`echo "$UNAME_RELEASE"|sed -e 's/[^.]*.[0B]*//'`
-	case "$UNAME_MACHINE" in
-	    9000/31?)            HP_ARCH=m68000 ;;
-	    9000/[34]??)         HP_ARCH=m68k ;;
-	    9000/[678][0-9][0-9])
-		if [ -x /usr/bin/getconf ]; then
-		    sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
-		    sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
-		    case "$sc_cpu_version" in
-		      523) HP_ARCH=hppa1.0 ;; # CPU_PA_RISC1_0
-		      528) HP_ARCH=hppa1.1 ;; # CPU_PA_RISC1_1
-		      532)                      # CPU_PA_RISC2_0
-			case "$sc_kernel_bits" in
-			  32) HP_ARCH=hppa2.0n ;;
-			  64) HP_ARCH=hppa2.0w ;;
-			  '') HP_ARCH=hppa2.0 ;;   # HP-UX 10.20
-			esac ;;
-		    esac
-		fi
-		if [ "$HP_ARCH" = "" ]; then
-		    eval "$set_cc_for_build"
-		    sed 's/^		//' << EOF > "$dummy.c"
-
-		#define _HPUX_SOURCE
-		#include <stdlib.h>
-		#include <unistd.h>
-
-		int main ()
-		{
-		#if defined(_SC_KERNEL_BITS)
-		    long bits = sysconf(_SC_KERNEL_BITS);
-		#endif
-		    long cpu  = sysconf (_SC_CPU_VERSION);
-
-		    switch (cpu)
-			{
-			case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
-			case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
-			case CPU_PA_RISC2_0:
-		#if defined(_SC_KERNEL_BITS)
-			    switch (bits)
-				{
-				case 64: puts ("hppa2.0w"); break;
-				case 32: puts ("hppa2.0n"); break;
-				default: puts ("hppa2.0"); break;
-				} break;
-		#else  /* !defined(_SC_KERNEL_BITS) */
-			    puts ("hppa2.0"); break;
-		#endif
-			default: puts ("hppa1.0"); break;
-			}
-		    exit (0);
-		}
-EOF
-		    (CCOPTS="" $CC_FOR_BUILD -o "$dummy" "$dummy.c" 2>/dev/null) && HP_ARCH=`"$dummy"`
-		    test -z "$HP_ARCH" && HP_ARCH=hppa
-		fi ;;
-	esac
-	if [ "$HP_ARCH" = hppa2.0w ]
-	then
-	    eval "$set_cc_for_build"
-
-	    # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating
-	    # 32-bit code.  hppa64-hp-hpux* has the same kernel and a compiler
-	    # generating 64-bit code.  GNU and HP use different nomenclature:
-	    #
-	    # $ CC_FOR_BUILD=cc ./config.guess
-	    # => hppa2.0w-hp-hpux11.23
-	    # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess
-	    # => hppa64-hp-hpux11.23
-
-	    if echo __LP64__ | (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) |
-		grep -q __LP64__
-	    then
-		HP_ARCH=hppa2.0w
-	    else
-		HP_ARCH=hppa64
-	    fi
-	fi
-	echo "$HP_ARCH"-hp-hpux"$HPUX_REV"
-	exit ;;
-    ia64:HP-UX:*:*)
-	HPUX_REV=`echo "$UNAME_RELEASE"|sed -e 's/[^.]*.[0B]*//'`
-	echo ia64-hp-hpux"$HPUX_REV"
-	exit ;;
-    3050*:HI-UX:*:*)
-	eval "$set_cc_for_build"
-	sed 's/^	//' << EOF > "$dummy.c"
-	#include <unistd.h>
-	int
-	main ()
-	{
-	  long cpu = sysconf (_SC_CPU_VERSION);
-	  /* The order matters, because CPU_IS_HP_MC68K erroneously returns
-	     true for CPU_PA_RISC1_0.  CPU_IS_PA_RISC returns correct
-	     results, however.  */
-	  if (CPU_IS_PA_RISC (cpu))
-	    {
-	      switch (cpu)
-		{
-		  case CPU_PA_RISC1_0: puts ("hppa1.0-hitachi-hiuxwe2"); break;
-		  case CPU_PA_RISC1_1: puts ("hppa1.1-hitachi-hiuxwe2"); break;
-		  case CPU_PA_RISC2_0: puts ("hppa2.0-hitachi-hiuxwe2"); break;
-		  default: puts ("hppa-hitachi-hiuxwe2"); break;
-		}
-	    }
-	  else if (CPU_IS_HP_MC68K (cpu))
-	    puts ("m68k-hitachi-hiuxwe2");
-	  else puts ("unknown-hitachi-hiuxwe2");
-	  exit (0);
-	}
-EOF
-	$CC_FOR_BUILD -o "$dummy" "$dummy.c" && SYSTEM_NAME=`"$dummy"` &&
-		{ echo "$SYSTEM_NAME"; exit; }
-	echo unknown-hitachi-hiuxwe2
-	exit ;;
-    9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:*)
-	echo hppa1.1-hp-bsd
-	exit ;;
-    9000/8??:4.3bsd:*:*)
-	echo hppa1.0-hp-bsd
-	exit ;;
-    *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*)
-	echo hppa1.0-hp-mpeix
-	exit ;;
-    hp7??:OSF1:*:* | hp8?[79]:OSF1:*:*)
-	echo hppa1.1-hp-osf
-	exit ;;
-    hp8??:OSF1:*:*)
-	echo hppa1.0-hp-osf
-	exit ;;
-    i*86:OSF1:*:*)
-	if [ -x /usr/sbin/sysversion ] ; then
-	    echo "$UNAME_MACHINE"-unknown-osf1mk
-	else
-	    echo "$UNAME_MACHINE"-unknown-osf1
-	fi
-	exit ;;
-    parisc*:Lites*:*:*)
-	echo hppa1.1-hp-lites
-	exit ;;
-    C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
-	echo c1-convex-bsd
-	exit ;;
-    C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
-	if getsysinfo -f scalar_acc
-	then echo c32-convex-bsd
-	else echo c2-convex-bsd
-	fi
-	exit ;;
-    C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
-	echo c34-convex-bsd
-	exit ;;
-    C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
-	echo c38-convex-bsd
-	exit ;;
-    C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
-	echo c4-convex-bsd
-	exit ;;
-    CRAY*Y-MP:*:*:*)
-	echo ymp-cray-unicos"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/'
-	exit ;;
-    CRAY*[A-Z]90:*:*:*)
-	echo "$UNAME_MACHINE"-cray-unicos"$UNAME_RELEASE" \
-	| sed -e 's/CRAY.*\([A-Z]90\)/\1/' \
-	      -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \
-	      -e 's/\.[^.]*$/.X/'
-	exit ;;
-    CRAY*TS:*:*:*)
-	echo t90-cray-unicos"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/'
-	exit ;;
-    CRAY*T3E:*:*:*)
-	echo alphaev5-cray-unicosmk"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/'
-	exit ;;
-    CRAY*SV1:*:*:*)
-	echo sv1-cray-unicos"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/'
-	exit ;;
-    *:UNICOS/mp:*:*)
-	echo craynv-cray-unicosmp"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/'
-	exit ;;
-    F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
-	FUJITSU_PROC=`uname -m | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz`
-	FUJITSU_SYS=`uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/\///'`
-	FUJITSU_REL=`echo "$UNAME_RELEASE" | sed -e 's/ /_/'`
-	echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
-	exit ;;
-    5000:UNIX_System_V:4.*:*)
-	FUJITSU_SYS=`uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/\///'`
-	FUJITSU_REL=`echo "$UNAME_RELEASE" | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/ /_/'`
-	echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
-	exit ;;
-    i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
-	echo "$UNAME_MACHINE"-pc-bsdi"$UNAME_RELEASE"
-	exit ;;
-    sparc*:BSD/OS:*:*)
-	echo sparc-unknown-bsdi"$UNAME_RELEASE"
-	exit ;;
-    *:BSD/OS:*:*)
-	echo "$UNAME_MACHINE"-unknown-bsdi"$UNAME_RELEASE"
-	exit ;;
-    *:FreeBSD:*:*)
-	UNAME_PROCESSOR=`/usr/bin/uname -p`
-	case "$UNAME_PROCESSOR" in
-	    amd64)
-		UNAME_PROCESSOR=x86_64 ;;
-	    i386)
-		UNAME_PROCESSOR=i586 ;;
-	esac
-	echo "$UNAME_PROCESSOR"-unknown-freebsd"`echo "$UNAME_RELEASE"|sed -e 's/[-(].*//'`"
-	exit ;;
-    i*:CYGWIN*:*)
-	echo "$UNAME_MACHINE"-pc-cygwin
-	exit ;;
-    *:MINGW64*:*)
-	echo "$UNAME_MACHINE"-pc-mingw64
-	exit ;;
-    *:MINGW*:*)
-	echo "$UNAME_MACHINE"-pc-mingw32
-	exit ;;
-    *:MSYS*:*)
-	echo "$UNAME_MACHINE"-pc-msys
-	exit ;;
-    i*:PW*:*)
-	echo "$UNAME_MACHINE"-pc-pw32
-	exit ;;
-    *:Interix*:*)
-	case "$UNAME_MACHINE" in
-	    x86)
-		echo i586-pc-interix"$UNAME_RELEASE"
-		exit ;;
-	    authenticamd | genuineintel | EM64T)
-		echo x86_64-unknown-interix"$UNAME_RELEASE"
-		exit ;;
-	    IA64)
-		echo ia64-unknown-interix"$UNAME_RELEASE"
-		exit ;;
-	esac ;;
-    i*:UWIN*:*)
-	echo "$UNAME_MACHINE"-pc-uwin
-	exit ;;
-    amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
-	echo x86_64-unknown-cygwin
-	exit ;;
-    prep*:SunOS:5.*:*)
-	echo powerpcle-unknown-solaris2"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`"
-	exit ;;
-    *:GNU:*:*)
-	# the GNU system
-	echo "`echo "$UNAME_MACHINE"|sed -e 's,[-/].*$,,'`-unknown-$LIBC`echo "$UNAME_RELEASE"|sed -e 's,/.*$,,'`"
-	exit ;;
-    *:GNU/*:*:*)
-	# other systems with GNU libc and userland
-	echo "$UNAME_MACHINE-unknown-`echo "$UNAME_SYSTEM" | sed 's,^[^/]*/,,' | tr "[:upper:]" "[:lower:]"``echo "$UNAME_RELEASE"|sed -e 's/[-(].*//'`-$LIBC"
-	exit ;;
-    i*86:Minix:*:*)
-	echo "$UNAME_MACHINE"-pc-minix
-	exit ;;
-    aarch64:Linux:*:*)
-	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
-	exit ;;
-    aarch64_be:Linux:*:*)
-	UNAME_MACHINE=aarch64_be
-	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
-	exit ;;
-    alpha:Linux:*:*)
-	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
-	  EV5)   UNAME_MACHINE=alphaev5 ;;
-	  EV56)  UNAME_MACHINE=alphaev56 ;;
-	  PCA56) UNAME_MACHINE=alphapca56 ;;
-	  PCA57) UNAME_MACHINE=alphapca56 ;;
-	  EV6)   UNAME_MACHINE=alphaev6 ;;
-	  EV67)  UNAME_MACHINE=alphaev67 ;;
-	  EV68*) UNAME_MACHINE=alphaev68 ;;
-	esac
-	objdump --private-headers /bin/sh | grep -q ld.so.1
-	if test "$?" = 0 ; then LIBC=gnulibc1 ; fi
-	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
-	exit ;;
-    arc:Linux:*:* | arceb:Linux:*:*)
-	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
-	exit ;;
-    arm*:Linux:*:*)
-	eval "$set_cc_for_build"
-	if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
-	    | grep -q __ARM_EABI__
-	then
-	    echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
-	else
-	    if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \
-		| grep -q __ARM_PCS_VFP
-	    then
-		echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"eabi
-	    else
-		echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"eabihf
-	    fi
-	fi
-	exit ;;
-    avr32*:Linux:*:*)
-	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
-	exit ;;
-    cris:Linux:*:*)
-	echo "$UNAME_MACHINE"-axis-linux-"$LIBC"
-	exit ;;
-    crisv32:Linux:*:*)
-	echo "$UNAME_MACHINE"-axis-linux-"$LIBC"
-	exit ;;
-    e2k:Linux:*:*)
-	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
-	exit ;;
-    frv:Linux:*:*)
-	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
-	exit ;;
-    hexagon:Linux:*:*)
-	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
-	exit ;;
-    i*86:Linux:*:*)
-	echo "$UNAME_MACHINE"-pc-linux-"$LIBC"
-	exit ;;
-    ia64:Linux:*:*)
-	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
-	exit ;;
-    k1om:Linux:*:*)
-	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
-	exit ;;
-    m32r*:Linux:*:*)
-	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
-	exit ;;
-    m68*:Linux:*:*)
-	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
-	exit ;;
-    mips:Linux:*:* | mips64:Linux:*:*)
-	eval "$set_cc_for_build"
-	sed 's/^	//' << EOF > "$dummy.c"
-	#undef CPU
-	#undef ${UNAME_MACHINE}
-	#undef ${UNAME_MACHINE}el
-	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
-	CPU=${UNAME_MACHINE}el
-	#else
-	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
-	CPU=${UNAME_MACHINE}
-	#else
-	CPU=
-	#endif
-	#endif
-EOF
-	eval "`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^CPU'`"
-	test "x$CPU" != x && { echo "$CPU-unknown-linux-$LIBC"; exit; }
-	;;
-    mips64el:Linux:*:*)
-	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
-	exit ;;
-    openrisc*:Linux:*:*)
-	echo or1k-unknown-linux-"$LIBC"
-	exit ;;
-    or32:Linux:*:* | or1k*:Linux:*:*)
-	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
-	exit ;;
-    padre:Linux:*:*)
-	echo sparc-unknown-linux-"$LIBC"
-	exit ;;
-    parisc64:Linux:*:* | hppa64:Linux:*:*)
-	echo hppa64-unknown-linux-"$LIBC"
-	exit ;;
-    parisc:Linux:*:* | hppa:Linux:*:*)
-	# Look for CPU level
-	case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
-	  PA7*) echo hppa1.1-unknown-linux-"$LIBC" ;;
-	  PA8*) echo hppa2.0-unknown-linux-"$LIBC" ;;
-	  *)    echo hppa-unknown-linux-"$LIBC" ;;
-	esac
-	exit ;;
-    ppc64:Linux:*:*)
-	echo powerpc64-unknown-linux-"$LIBC"
-	exit ;;
-    ppc:Linux:*:*)
-	echo powerpc-unknown-linux-"$LIBC"
-	exit ;;
-    ppc64le:Linux:*:*)
-	echo powerpc64le-unknown-linux-"$LIBC"
-	exit ;;
-    ppcle:Linux:*:*)
-	echo powerpcle-unknown-linux-"$LIBC"
-	exit ;;
-    riscv32:Linux:*:* | riscv64:Linux:*:*)
-	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
-	exit ;;
-    s390:Linux:*:* | s390x:Linux:*:*)
-	echo "$UNAME_MACHINE"-ibm-linux-"$LIBC"
-	exit ;;
-    sh64*:Linux:*:*)
-	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
-	exit ;;
-    sh*:Linux:*:*)
-	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
-	exit ;;
-    sparc:Linux:*:* | sparc64:Linux:*:*)
-	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
-	exit ;;
-    tile*:Linux:*:*)
-	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
-	exit ;;
-    vax:Linux:*:*)
-	echo "$UNAME_MACHINE"-dec-linux-"$LIBC"
-	exit ;;
-    x86_64:Linux:*:*)
-	echo "$UNAME_MACHINE"-pc-linux-"$LIBC"
-	exit ;;
-    xtensa*:Linux:*:*)
-	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
-	exit ;;
-    i*86:DYNIX/ptx:4*:*)
-	# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
-	# earlier versions are messed up and put the nodename in both
-	# sysname and nodename.
-	echo i386-sequent-sysv4
-	exit ;;
-    i*86:UNIX_SV:4.2MP:2.*)
-	# Unixware is an offshoot of SVR4, but it has its own version
-	# number series starting with 2...
-	# I am not positive that other SVR4 systems won't match this,
-	# I just have to hope.  -- rms.
-	# Use sysv4.2uw... so that sysv4* matches it.
-	echo "$UNAME_MACHINE"-pc-sysv4.2uw"$UNAME_VERSION"
-	exit ;;
-    i*86:OS/2:*:*)
-	# If we were able to find `uname', then EMX Unix compatibility
-	# is probably installed.
-	echo "$UNAME_MACHINE"-pc-os2-emx
-	exit ;;
-    i*86:XTS-300:*:STOP)
-	echo "$UNAME_MACHINE"-unknown-stop
-	exit ;;
-    i*86:atheos:*:*)
-	echo "$UNAME_MACHINE"-unknown-atheos
-	exit ;;
-    i*86:syllable:*:*)
-	echo "$UNAME_MACHINE"-pc-syllable
-	exit ;;
-    i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*)
-	echo i386-unknown-lynxos"$UNAME_RELEASE"
-	exit ;;
-    i*86:*DOS:*:*)
-	echo "$UNAME_MACHINE"-pc-msdosdjgpp
-	exit ;;
-    i*86:*:4.*:*)
-	UNAME_REL=`echo "$UNAME_RELEASE" | sed 's/\/MP$//'`
-	if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
-		echo "$UNAME_MACHINE"-univel-sysv"$UNAME_REL"
-	else
-		echo "$UNAME_MACHINE"-pc-sysv"$UNAME_REL"
-	fi
-	exit ;;
-    i*86:*:5:[678]*)
-	# UnixWare 7.x, OpenUNIX and OpenServer 6.
-	case `/bin/uname -X | grep "^Machine"` in
-	    *486*)	     UNAME_MACHINE=i486 ;;
-	    *Pentium)	     UNAME_MACHINE=i586 ;;
-	    *Pent*|*Celeron) UNAME_MACHINE=i686 ;;
-	esac
-	echo "$UNAME_MACHINE-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}{$UNAME_VERSION}"
-	exit ;;
-    i*86:*:3.2:*)
-	if test -f /usr/options/cb.name; then
-		UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
-		echo "$UNAME_MACHINE"-pc-isc"$UNAME_REL"
-	elif /bin/uname -X 2>/dev/null >/dev/null ; then
-		UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')`
-		(/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486
-		(/bin/uname -X|grep '^Machine.*Pentium' >/dev/null) \
-			&& UNAME_MACHINE=i586
-		(/bin/uname -X|grep '^Machine.*Pent *II' >/dev/null) \
-			&& UNAME_MACHINE=i686
-		(/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \
-			&& UNAME_MACHINE=i686
-		echo "$UNAME_MACHINE"-pc-sco"$UNAME_REL"
-	else
-		echo "$UNAME_MACHINE"-pc-sysv32
-	fi
-	exit ;;
-    pc:*:*:*)
-	# Left here for compatibility:
-	# uname -m prints for DJGPP always 'pc', but it prints nothing about
-	# the processor, so we play safe by assuming i586.
-	# Note: whatever this is, it MUST be the same as what config.sub
-	# prints for the "djgpp" host, or else GDB configure will decide that
-	# this is a cross-build.
-	echo i586-pc-msdosdjgpp
-	exit ;;
-    Intel:Mach:3*:*)
-	echo i386-pc-mach3
-	exit ;;
-    paragon:*:*:*)
-	echo i860-intel-osf1
-	exit ;;
-    i860:*:4.*:*) # i860-SVR4
-	if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then
-	  echo i860-stardent-sysv"$UNAME_RELEASE" # Stardent Vistra i860-SVR4
-	else # Add other i860-SVR4 vendors below as they are discovered.
-	  echo i860-unknown-sysv"$UNAME_RELEASE"  # Unknown i860-SVR4
-	fi
-	exit ;;
-    mini*:CTIX:SYS*5:*)
-	# "miniframe"
-	echo m68010-convergent-sysv
-	exit ;;
-    mc68k:UNIX:SYSTEM5:3.51m)
-	echo m68k-convergent-sysv
-	exit ;;
-    M680?0:D-NIX:5.3:*)
-	echo m68k-diab-dnix
-	exit ;;
-    M68*:*:R3V[5678]*:*)
-	test -r /sysV68 && { echo 'm68k-motorola-sysv'; exit; } ;;
-    3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0)
-	OS_REL=''
-	test -r /etc/.relid \
-	&& OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
-	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
-	  && { echo i486-ncr-sysv4.3"$OS_REL"; exit; }
-	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
-	  && { echo i586-ncr-sysv4.3"$OS_REL"; exit; } ;;
-    3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
-	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
-	  && { echo i486-ncr-sysv4; exit; } ;;
-    NCR*:*:4.2:* | MPRAS*:*:4.2:*)
-	OS_REL='.3'
-	test -r /etc/.relid \
-	    && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
-	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
-	    && { echo i486-ncr-sysv4.3"$OS_REL"; exit; }
-	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
-	    && { echo i586-ncr-sysv4.3"$OS_REL"; exit; }
-	/bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \
-	    && { echo i586-ncr-sysv4.3"$OS_REL"; exit; } ;;
-    m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
-	echo m68k-unknown-lynxos"$UNAME_RELEASE"
-	exit ;;
-    mc68030:UNIX_System_V:4.*:*)
-	echo m68k-atari-sysv4
-	exit ;;
-    TSUNAMI:LynxOS:2.*:*)
-	echo sparc-unknown-lynxos"$UNAME_RELEASE"
-	exit ;;
-    rs6000:LynxOS:2.*:*)
-	echo rs6000-unknown-lynxos"$UNAME_RELEASE"
-	exit ;;
-    PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*)
-	echo powerpc-unknown-lynxos"$UNAME_RELEASE"
-	exit ;;
-    SM[BE]S:UNIX_SV:*:*)
-	echo mips-dde-sysv"$UNAME_RELEASE"
-	exit ;;
-    RM*:ReliantUNIX-*:*:*)
-	echo mips-sni-sysv4
-	exit ;;
-    RM*:SINIX-*:*:*)
-	echo mips-sni-sysv4
-	exit ;;
-    *:SINIX-*:*:*)
-	if uname -p 2>/dev/null >/dev/null ; then
-		UNAME_MACHINE=`(uname -p) 2>/dev/null`
-		echo "$UNAME_MACHINE"-sni-sysv4
-	else
-		echo ns32k-sni-sysv
-	fi
-	exit ;;
-    PENTIUM:*:4.0*:*)	# Unisys `ClearPath HMP IX 4000' SVR4/MP effort
-			# says <Richard.M.Bartel@ccMail.Census.GOV>
-	echo i586-unisys-sysv4
-	exit ;;
-    *:UNIX_System_V:4*:FTX*)
-	# From Gerald Hewes <hewes@openmarket.com>.
-	# How about differentiating between stratus architectures? -djm
-	echo hppa1.1-stratus-sysv4
-	exit ;;
-    *:*:*:FTX*)
-	# From seanf@swdc.stratus.com.
-	echo i860-stratus-sysv4
-	exit ;;
-    i*86:VOS:*:*)
-	# From Paul.Green@stratus.com.
-	echo "$UNAME_MACHINE"-stratus-vos
-	exit ;;
-    *:VOS:*:*)
-	# From Paul.Green@stratus.com.
-	echo hppa1.1-stratus-vos
-	exit ;;
-    mc68*:A/UX:*:*)
-	echo m68k-apple-aux"$UNAME_RELEASE"
-	exit ;;
-    news*:NEWS-OS:6*:*)
-	echo mips-sony-newsos6
-	exit ;;
-    R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
-	if [ -d /usr/nec ]; then
-		echo mips-nec-sysv"$UNAME_RELEASE"
-	else
-		echo mips-unknown-sysv"$UNAME_RELEASE"
-	fi
-	exit ;;
-    BeBox:BeOS:*:*)	# BeOS running on hardware made by Be, PPC only.
-	echo powerpc-be-beos
-	exit ;;
-    BeMac:BeOS:*:*)	# BeOS running on Mac or Mac clone, PPC only.
-	echo powerpc-apple-beos
-	exit ;;
-    BePC:BeOS:*:*)	# BeOS running on Intel PC compatible.
-	echo i586-pc-beos
-	exit ;;
-    BePC:Haiku:*:*)	# Haiku running on Intel PC compatible.
-	echo i586-pc-haiku
-	exit ;;
-    x86_64:Haiku:*:*)
-	echo x86_64-unknown-haiku
-	exit ;;
-    SX-4:SUPER-UX:*:*)
-	echo sx4-nec-superux"$UNAME_RELEASE"
-	exit ;;
-    SX-5:SUPER-UX:*:*)
-	echo sx5-nec-superux"$UNAME_RELEASE"
-	exit ;;
-    SX-6:SUPER-UX:*:*)
-	echo sx6-nec-superux"$UNAME_RELEASE"
-	exit ;;
-    SX-7:SUPER-UX:*:*)
-	echo sx7-nec-superux"$UNAME_RELEASE"
-	exit ;;
-    SX-8:SUPER-UX:*:*)
-	echo sx8-nec-superux"$UNAME_RELEASE"
-	exit ;;
-    SX-8R:SUPER-UX:*:*)
-	echo sx8r-nec-superux"$UNAME_RELEASE"
-	exit ;;
-    SX-ACE:SUPER-UX:*:*)
-	echo sxace-nec-superux"$UNAME_RELEASE"
-	exit ;;
-    Power*:Rhapsody:*:*)
-	echo powerpc-apple-rhapsody"$UNAME_RELEASE"
-	exit ;;
-    *:Rhapsody:*:*)
-	echo "$UNAME_MACHINE"-apple-rhapsody"$UNAME_RELEASE"
-	exit ;;
-    *:Darwin:*:*)
-	UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
-	eval "$set_cc_for_build"
-	if test "$UNAME_PROCESSOR" = unknown ; then
-	    UNAME_PROCESSOR=powerpc
-	fi
-	if test "`echo "$UNAME_RELEASE" | sed -e 's/\..*//'`" -le 10 ; then
-	    if [ "$CC_FOR_BUILD" != no_compiler_found ]; then
-		if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
-		       (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \
-		       grep IS_64BIT_ARCH >/dev/null
-		then
-		    case $UNAME_PROCESSOR in
-			i386) UNAME_PROCESSOR=x86_64 ;;
-			powerpc) UNAME_PROCESSOR=powerpc64 ;;
-		    esac
-		fi
-		# On 10.4-10.6 one might compile for PowerPC via gcc -arch ppc
-		if (echo '#ifdef __POWERPC__'; echo IS_PPC; echo '#endif') | \
-		       (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \
-		       grep IS_PPC >/dev/null
-		then
-		    UNAME_PROCESSOR=powerpc
-		fi
-	    fi
-	elif test "$UNAME_PROCESSOR" = i386 ; then
-	    # Avoid executing cc on OS X 10.9, as it ships with a stub
-	    # that puts up a graphical alert prompting to install
-	    # developer tools.  Any system running Mac OS X 10.7 or
-	    # later (Darwin 11 and later) is required to have a 64-bit
-	    # processor. This is not true of the ARM version of Darwin
-	    # that Apple uses in portable devices.
-	    UNAME_PROCESSOR=x86_64
-	fi
-	echo "$UNAME_PROCESSOR"-apple-darwin"$UNAME_RELEASE"
-	exit ;;
-    *:procnto*:*:* | *:QNX:[0123456789]*:*)
-	UNAME_PROCESSOR=`uname -p`
-	if test "$UNAME_PROCESSOR" = x86; then
-		UNAME_PROCESSOR=i386
-		UNAME_MACHINE=pc
-	fi
-	echo "$UNAME_PROCESSOR"-"$UNAME_MACHINE"-nto-qnx"$UNAME_RELEASE"
-	exit ;;
-    *:QNX:*:4*)
-	echo i386-pc-qnx
-	exit ;;
-    NEO-*:NONSTOP_KERNEL:*:*)
-	echo neo-tandem-nsk"$UNAME_RELEASE"
-	exit ;;
-    NSE-*:NONSTOP_KERNEL:*:*)
-	echo nse-tandem-nsk"$UNAME_RELEASE"
-	exit ;;
-    NSR-*:NONSTOP_KERNEL:*:*)
-	echo nsr-tandem-nsk"$UNAME_RELEASE"
-	exit ;;
-    NSV-*:NONSTOP_KERNEL:*:*)
-	echo nsv-tandem-nsk"$UNAME_RELEASE"
-	exit ;;
-    NSX-*:NONSTOP_KERNEL:*:*)
-	echo nsx-tandem-nsk"$UNAME_RELEASE"
-	exit ;;
-    *:NonStop-UX:*:*)
-	echo mips-compaq-nonstopux
-	exit ;;
-    BS2000:POSIX*:*:*)
-	echo bs2000-siemens-sysv
-	exit ;;
-    DS/*:UNIX_System_V:*:*)
-	echo "$UNAME_MACHINE"-"$UNAME_SYSTEM"-"$UNAME_RELEASE"
-	exit ;;
-    *:Plan9:*:*)
-	# "uname -m" is not consistent, so use $cputype instead. 386
-	# is converted to i386 for consistency with other x86
-	# operating systems.
-	if test "$cputype" = 386; then
-	    UNAME_MACHINE=i386
-	else
-	    UNAME_MACHINE="$cputype"
-	fi
-	echo "$UNAME_MACHINE"-unknown-plan9
-	exit ;;
-    *:TOPS-10:*:*)
-	echo pdp10-unknown-tops10
-	exit ;;
-    *:TENEX:*:*)
-	echo pdp10-unknown-tenex
-	exit ;;
-    KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*)
-	echo pdp10-dec-tops20
-	exit ;;
-    XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*)
-	echo pdp10-xkl-tops20
-	exit ;;
-    *:TOPS-20:*:*)
-	echo pdp10-unknown-tops20
-	exit ;;
-    *:ITS:*:*)
-	echo pdp10-unknown-its
-	exit ;;
-    SEI:*:*:SEIUX)
-	echo mips-sei-seiux"$UNAME_RELEASE"
-	exit ;;
-    *:DragonFly:*:*)
-	echo "$UNAME_MACHINE"-unknown-dragonfly"`echo "$UNAME_RELEASE"|sed -e 's/[-(].*//'`"
-	exit ;;
-    *:*VMS:*:*)
-	UNAME_MACHINE=`(uname -p) 2>/dev/null`
-	case "$UNAME_MACHINE" in
-	    A*) echo alpha-dec-vms ; exit ;;
-	    I*) echo ia64-dec-vms ; exit ;;
-	    V*) echo vax-dec-vms ; exit ;;
-	esac ;;
-    *:XENIX:*:SysV)
-	echo i386-pc-xenix
-	exit ;;
-    i*86:skyos:*:*)
-	echo "$UNAME_MACHINE"-pc-skyos"`echo "$UNAME_RELEASE" | sed -e 's/ .*$//'`"
-	exit ;;
-    i*86:rdos:*:*)
-	echo "$UNAME_MACHINE"-pc-rdos
-	exit ;;
-    i*86:AROS:*:*)
-	echo "$UNAME_MACHINE"-pc-aros
-	exit ;;
-    x86_64:VMkernel:*:*)
-	echo "$UNAME_MACHINE"-unknown-esx
-	exit ;;
-    amd64:Isilon\ OneFS:*:*)
-	echo x86_64-unknown-onefs
-	exit ;;
-esac
-
-echo "$0: unable to guess system type" >&2
-
-case "$UNAME_MACHINE:$UNAME_SYSTEM" in
-    mips:Linux | mips64:Linux)
-	# If we got here on MIPS GNU/Linux, output extra information.
-	cat >&2 <<EOF
-
-NOTE: MIPS GNU/Linux systems require a C compiler to fully recognize
-the system type. Please install a C compiler and try again.
-EOF
-	;;
-esac
-
-cat >&2 <<EOF
-
-This script (version $timestamp), has failed to recognize the
-operating system you are using. If your script is old, overwrite *all*
-copies of config.guess and config.sub with the latest versions from:
-
-  https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess
-and
-  https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub
-
-If $0 has already been updated, send the following data and any
-information you think might be pertinent to config-patches@gnu.org to
-provide the necessary information to handle your system.
-
-config.guess timestamp = $timestamp
-
-uname -m = `(uname -m) 2>/dev/null || echo unknown`
-uname -r = `(uname -r) 2>/dev/null || echo unknown`
-uname -s = `(uname -s) 2>/dev/null || echo unknown`
-uname -v = `(uname -v) 2>/dev/null || echo unknown`
-
-/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null`
-/bin/uname -X     = `(/bin/uname -X) 2>/dev/null`
-
-hostinfo               = `(hostinfo) 2>/dev/null`
-/bin/universe          = `(/bin/universe) 2>/dev/null`
-/usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null`
-/bin/arch              = `(/bin/arch) 2>/dev/null`
-/usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null`
-/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null`
-
-UNAME_MACHINE = "$UNAME_MACHINE"
-UNAME_RELEASE = "$UNAME_RELEASE"
-UNAME_SYSTEM  = "$UNAME_SYSTEM"
-UNAME_VERSION = "$UNAME_VERSION"
-EOF
-
-exit 1
-
-# Local variables:
-# eval: (add-hook 'before-save-hook 'time-stamp)
-# time-stamp-start: "timestamp='"
-# time-stamp-format: "%:y-%02m-%02d"
-# time-stamp-end: "'"
-# End:
diff --git a/submodules/libtgvoip/config.h.in b/submodules/libtgvoip/config.h.in
deleted file mode 100644
index 9499995fa7..0000000000
--- a/submodules/libtgvoip/config.h.in
+++ /dev/null
@@ -1,265 +0,0 @@
-/* config.h.in.  Generated from configure.ac by autoheader.  */
-
-/* Define to one of `_getb67', `GETB67', `getb67' for Cray-2 and Cray-YMP
-   systems. This function is required for `alloca.c' support on those systems.
-   */
-#undef CRAY_STACKSEG_END
-
-/* Define to 1 if using `alloca.c'. */
-#undef C_ALLOCA
-
-/* Define to 1 if you have `alloca', as a function or macro. */
-#undef HAVE_ALLOCA
-
-/* Define to 1 if you have <alloca.h> and it should be used (not on Ultrix).
-   */
-#undef HAVE_ALLOCA_H
-
-/* Define to 1 if you have the <arpa/inet.h> header file. */
-#undef HAVE_ARPA_INET_H
-
-/* Define to 1 if you have the `clock_gettime' function. */
-#undef HAVE_CLOCK_GETTIME
-
-/* Define to 1 if you have the <dlfcn.h> header file. */
-#undef HAVE_DLFCN_H
-
-/* Define to 1 if you have the <float.h> header file. */
-#undef HAVE_FLOAT_H
-
-/* Define to 1 if you have the `floor' function. */
-#undef HAVE_FLOOR
-
-/* Define to 1 if you have the `gettimeofday' function. */
-#undef HAVE_GETTIMEOFDAY
-
-/* Define to 1 if you have the `inet_ntoa' function. */
-#undef HAVE_INET_NTOA
-
-/* Define to 1 if you have the <inttypes.h> header file. */
-#undef HAVE_INTTYPES_H
-
-/* Define to 1 if you have the `crypto' library (-lcrypto). */
-#undef HAVE_LIBCRYPTO
-
-/* Define to 1 if you have the `dl' library (-ldl). */
-#undef HAVE_LIBDL
-
-/* Define to 1 if you have the `m' library (-lm). */
-#undef HAVE_LIBM
-
-/* Define to 1 if you have the `opus' library (-lopus). */
-#undef HAVE_LIBOPUS
-
-/* Define to 1 if you have the `pthread' library (-lpthread). */
-#undef HAVE_LIBPTHREAD
-
-/* Define to 1 if your system has a GNU libc compatible `malloc' function, and
-   to 0 otherwise. */
-#undef HAVE_MALLOC
-
-/* Define to 1 if you have the <malloc.h> header file. */
-#undef HAVE_MALLOC_H
-
-/* Define to 1 if you have the `memmove' function. */
-#undef HAVE_MEMMOVE
-
-/* Define to 1 if you have the <memory.h> header file. */
-#undef HAVE_MEMORY_H
-
-/* Define to 1 if you have the `memset' function. */
-#undef HAVE_MEMSET
-
-/* Define to 1 if you have the <netdb.h> header file. */
-#undef HAVE_NETDB_H
-
-/* Define to 1 if you have the <netinet/in.h> header file. */
-#undef HAVE_NETINET_IN_H
-
-/* Define to 1 if the system has the type `ptrdiff_t'. */
-#undef HAVE_PTRDIFF_T
-
-/* Define to 1 if your system has a GNU libc compatible `realloc' function,
-   and to 0 otherwise. */
-#undef HAVE_REALLOC
-
-/* Define to 1 if you have the `select' function. */
-#undef HAVE_SELECT
-
-/* Define to 1 if you have the `socket' function. */
-#undef HAVE_SOCKET
-
-/* Define to 1 if you have the `sqrt' function. */
-#undef HAVE_SQRT
-
-/* Define to 1 if you have the <stddef.h> header file. */
-#undef HAVE_STDDEF_H
-
-/* Define to 1 if you have the <stdint.h> header file. */
-#undef HAVE_STDINT_H
-
-/* Define to 1 if you have the <stdlib.h> header file. */
-#undef HAVE_STDLIB_H
-
-/* Define to 1 if you have the `strcasecmp' function. */
-#undef HAVE_STRCASECMP
-
-/* Define to 1 if you have the `strchr' function. */
-#undef HAVE_STRCHR
-
-/* Define to 1 if you have the `strerror' function. */
-#undef HAVE_STRERROR
-
-/* Define to 1 if you have the <strings.h> header file. */
-#undef HAVE_STRINGS_H
-
-/* Define to 1 if you have the <string.h> header file. */
-#undef HAVE_STRING_H
-
-/* Define to 1 if you have the `strncasecmp' function. */
-#undef HAVE_STRNCASECMP
-
-/* Define to 1 if you have the `strstr' function. */
-#undef HAVE_STRSTR
-
-/* Define to 1 if you have the `strtol' function. */
-#undef HAVE_STRTOL
-
-/* Define to 1 if you have the `strtoul' function. */
-#undef HAVE_STRTOUL
-
-/* Define to 1 if you have the <sys/ioctl.h> header file. */
-#undef HAVE_SYS_IOCTL_H
-
-/* Define to 1 if you have the <sys/socket.h> header file. */
-#undef HAVE_SYS_SOCKET_H
-
-/* Define to 1 if you have the <sys/stat.h> header file. */
-#undef HAVE_SYS_STAT_H
-
-/* Define to 1 if you have the <sys/time.h> header file. */
-#undef HAVE_SYS_TIME_H
-
-/* Define to 1 if you have the <sys/types.h> header file. */
-#undef HAVE_SYS_TYPES_H
-
-/* Define to 1 if you have the `uname' function. */
-#undef HAVE_UNAME
-
-/* Define to 1 if you have the <unistd.h> header file. */
-#undef HAVE_UNISTD_H
-
-/* Define to 1 if you have the <wchar.h> header file. */
-#undef HAVE_WCHAR_H
-
-/* Define to 1 if the system has the type `_Bool'. */
-#undef HAVE__BOOL
-
-/* Define to the sub-directory where libtool stores uninstalled libraries. */
-#undef LT_OBJDIR
-
-/* Name of package */
-#undef PACKAGE
-
-/* Define to the address where bug reports for this package should be sent. */
-#undef PACKAGE_BUGREPORT
-
-/* Define to the full name of this package. */
-#undef PACKAGE_NAME
-
-/* Define to the full name and version of this package. */
-#undef PACKAGE_STRING
-
-/* Define to the one symbol short name of this package. */
-#undef PACKAGE_TARNAME
-
-/* Define to the home page for this package. */
-#undef PACKAGE_URL
-
-/* Define to the version of this package. */
-#undef PACKAGE_VERSION
-
-/* If using the C implementation of alloca, define if you know the
-   direction of stack growth for your system; otherwise it will be
-   automatically deduced at runtime.
-	STACK_DIRECTION > 0 => grows toward higher addresses
-	STACK_DIRECTION < 0 => grows toward lower addresses
-	STACK_DIRECTION = 0 => direction of growth unknown */
-#undef STACK_DIRECTION
-
-/* Define to 1 if you have the ANSI C header files. */
-#undef STDC_HEADERS
-
-/* Version number of package */
-#undef VERSION
-
-/* Define to disable ALSA support */
-#undef WITHOUT_ALSA
-
-/* Define to disable PulseAudio support */
-#undef WITHOUT_PULSE
-
-/* Define for Solaris 2.5.1 so the uint32_t typedef from <sys/synch.h>,
-   <pthread.h>, or <semaphore.h> is not used. If the typedef were allowed, the
-   #define below would cause a syntax error. */
-#undef _UINT32_T
-
-/* Define for Solaris 2.5.1 so the uint64_t typedef from <sys/synch.h>,
-   <pthread.h>, or <semaphore.h> is not used. If the typedef were allowed, the
-   #define below would cause a syntax error. */
-#undef _UINT64_T
-
-/* Define for Solaris 2.5.1 so the uint8_t typedef from <sys/synch.h>,
-   <pthread.h>, or <semaphore.h> is not used. If the typedef were allowed, the
-   #define below would cause a syntax error. */
-#undef _UINT8_T
-
-/* Define to `__inline__' or `__inline' if that's what the C compiler
-   calls it, or to nothing if 'inline' is not supported under any name.  */
-#ifndef __cplusplus
-#undef inline
-#endif
-
-/* Define to the type of a signed integer type of width exactly 16 bits if
-   such a type exists and the standard includes do not define it. */
-#undef int16_t
-
-/* Define to the type of a signed integer type of width exactly 32 bits if
-   such a type exists and the standard includes do not define it. */
-#undef int32_t
-
-/* Define to the type of a signed integer type of width exactly 64 bits if
-   such a type exists and the standard includes do not define it. */
-#undef int64_t
-
-/* Define to the type of a signed integer type of width exactly 8 bits if such
-   a type exists and the standard includes do not define it. */
-#undef int8_t
-
-/* Define to rpl_malloc if the replacement function should be used. */
-#undef malloc
-
-/* Define to rpl_realloc if the replacement function should be used. */
-#undef realloc
-
-/* Define to `unsigned int' if <sys/types.h> does not define. */
-#undef size_t
-
-/* Define to `int' if <sys/types.h> does not define. */
-#undef ssize_t
-
-/* Define to the type of an unsigned integer type of width exactly 16 bits if
-   such a type exists and the standard includes do not define it. */
-#undef uint16_t
-
-/* Define to the type of an unsigned integer type of width exactly 32 bits if
-   such a type exists and the standard includes do not define it. */
-#undef uint32_t
-
-/* Define to the type of an unsigned integer type of width exactly 64 bits if
-   such a type exists and the standard includes do not define it. */
-#undef uint64_t
-
-/* Define to the type of an unsigned integer type of width exactly 8 bits if
-   such a type exists and the standard includes do not define it. */
-#undef uint8_t
diff --git a/submodules/libtgvoip/config.sub b/submodules/libtgvoip/config.sub
deleted file mode 100755
index 9ccf09a7a3..0000000000
--- a/submodules/libtgvoip/config.sub
+++ /dev/null
@@ -1,1801 +0,0 @@
-#! /bin/sh
-# Configuration validation subroutine script.
-#   Copyright 1992-2018 Free Software Foundation, Inc.
-
-timestamp='2018-03-08'
-
-# This file is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, see <https://www.gnu.org/licenses/>.
-#
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that
-# program.  This Exception is an additional permission under section 7
-# of the GNU General Public License, version 3 ("GPLv3").
-
-
-# Please send patches to <config-patches@gnu.org>.
-#
-# Configuration subroutine to validate and canonicalize a configuration type.
-# Supply the specified configuration type as an argument.
-# If it is invalid, we print an error message on stderr and exit with code 1.
-# Otherwise, we print the canonical config type on stdout and succeed.
-
-# You can get the latest version of this script from:
-# https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub
-
-# This file is supposed to be the same for all GNU packages
-# and recognize all the CPU types, system types and aliases
-# that are meaningful with *any* GNU software.
-# Each package is responsible for reporting which valid configurations
-# it does not support.  The user should be able to distinguish
-# a failure to support a valid configuration from a meaningless
-# configuration.
-
-# The goal of this file is to map all the various variations of a given
-# machine specification into a single specification in the form:
-#	CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM
-# or in some cases, the newer four-part form:
-#	CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
-# It is wrong to echo any other type of specification.
-
-me=`echo "$0" | sed -e 's,.*/,,'`
-
-usage="\
-Usage: $0 [OPTION] CPU-MFR-OPSYS or ALIAS
-
-Canonicalize a configuration name.
-
-Options:
-  -h, --help         print this help, then exit
-  -t, --time-stamp   print date of last modification, then exit
-  -v, --version      print version number, then exit
-
-Report bugs and patches to <config-patches@gnu.org>."
-
-version="\
-GNU config.sub ($timestamp)
-
-Copyright 1992-2018 Free Software Foundation, Inc.
-
-This is free software; see the source for copying conditions.  There is NO
-warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
-
-help="
-Try \`$me --help' for more information."
-
-# Parse command line
-while test $# -gt 0 ; do
-  case $1 in
-    --time-stamp | --time* | -t )
-       echo "$timestamp" ; exit ;;
-    --version | -v )
-       echo "$version" ; exit ;;
-    --help | --h* | -h )
-       echo "$usage"; exit ;;
-    -- )     # Stop option processing
-       shift; break ;;
-    - )	# Use stdin as input.
-       break ;;
-    -* )
-       echo "$me: invalid option $1$help"
-       exit 1 ;;
-
-    *local*)
-       # First pass through any local machine types.
-       echo "$1"
-       exit ;;
-
-    * )
-       break ;;
-  esac
-done
-
-case $# in
- 0) echo "$me: missing argument$help" >&2
-    exit 1;;
- 1) ;;
- *) echo "$me: too many arguments$help" >&2
-    exit 1;;
-esac
-
-# Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any).
-# Here we must recognize all the valid KERNEL-OS combinations.
-maybe_os=`echo "$1" | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
-case $maybe_os in
-  nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \
-  linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
-  knetbsd*-gnu* | netbsd*-gnu* | netbsd*-eabi* | \
-  kopensolaris*-gnu* | cloudabi*-eabi* | \
-  storm-chaos* | os2-emx* | rtmk-nova*)
-    os=-$maybe_os
-    basic_machine=`echo "$1" | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
-    ;;
-  android-linux)
-    os=-linux-android
-    basic_machine=`echo "$1" | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown
-    ;;
-  *)
-    basic_machine=`echo "$1" | sed 's/-[^-]*$//'`
-    if [ "$basic_machine" != "$1" ]
-    then os=`echo "$1" | sed 's/.*-/-/'`
-    else os=; fi
-    ;;
-esac
-
-### Let's recognize common machines as not being operating systems so
-### that things like config.sub decstation-3100 work.  We also
-### recognize some manufacturers as not being operating systems, so we
-### can provide default operating systems below.
-case $os in
-	-sun*os*)
-		# Prevent following clause from handling this invalid input.
-		;;
-	-dec* | -mips* | -sequent* | -encore* | -pc532* | -sgi* | -sony* | \
-	-att* | -7300* | -3300* | -delta* | -motorola* | -sun[234]* | \
-	-unicom* | -ibm* | -next | -hp | -isi* | -apollo | -altos* | \
-	-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
-	-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
-	-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
-	-apple | -axis | -knuth | -cray | -microblaze*)
-		os=
-		basic_machine=$1
-		;;
-	-bluegene*)
-		os=-cnk
-		;;
-	-sim | -cisco | -oki | -wec | -winbond)
-		os=
-		basic_machine=$1
-		;;
-	-scout)
-		;;
-	-wrs)
-		os=-vxworks
-		basic_machine=$1
-		;;
-	-chorusos*)
-		os=-chorusos
-		basic_machine=$1
-		;;
-	-chorusrdb)
-		os=-chorusrdb
-		basic_machine=$1
-		;;
-	-hiux*)
-		os=-hiuxwe2
-		;;
-	-sco6)
-		os=-sco5v6
-		basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco5)
-		os=-sco3.2v5
-		basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco4)
-		os=-sco3.2v4
-		basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco3.2.[4-9]*)
-		os=`echo $os | sed -e 's/sco3.2./sco3.2v/'`
-		basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco3.2v[4-9]*)
-		# Don't forget version if it is 3.2v4 or newer.
-		basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco5v6*)
-		# Don't forget version if it is 3.2v4 or newer.
-		basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco*)
-		os=-sco3.2v2
-		basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
-		;;
-	-udk*)
-		basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
-		;;
-	-isc)
-		os=-isc2.2
-		basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
-		;;
-	-clix*)
-		basic_machine=clipper-intergraph
-		;;
-	-isc*)
-		basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
-		;;
-	-lynx*178)
-		os=-lynxos178
-		;;
-	-lynx*5)
-		os=-lynxos5
-		;;
-	-lynx*)
-		os=-lynxos
-		;;
-	-ptx*)
-		basic_machine=`echo "$1" | sed -e 's/86-.*/86-sequent/'`
-		;;
-	-psos*)
-		os=-psos
-		;;
-	-mint | -mint[0-9]*)
-		basic_machine=m68k-atari
-		os=-mint
-		;;
-esac
-
-# Decode aliases for certain CPU-COMPANY combinations.
-case $basic_machine in
-	# Recognize the basic CPU types without company name.
-	# Some are omitted here because they have special meanings below.
-	1750a | 580 \
-	| a29k \
-	| aarch64 | aarch64_be \
-	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
-	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
-	| am33_2.0 \
-	| arc | arceb \
-	| arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \
-	| avr | avr32 \
-	| ba \
-	| be32 | be64 \
-	| bfin \
-	| c4x | c8051 | clipper \
-	| d10v | d30v | dlx | dsp16xx \
-	| e2k | epiphany \
-	| fido | fr30 | frv | ft32 \
-	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
-	| hexagon \
-	| i370 | i860 | i960 | ia16 | ia64 \
-	| ip2k | iq2000 \
-	| k1om \
-	| le32 | le64 \
-	| lm32 \
-	| m32c | m32r | m32rle | m68000 | m68k | m88k \
-	| maxq | mb | microblaze | microblazeel | mcore | mep | metag \
-	| mips | mipsbe | mipseb | mipsel | mipsle \
-	| mips16 \
-	| mips64 | mips64el \
-	| mips64octeon | mips64octeonel \
-	| mips64orion | mips64orionel \
-	| mips64r5900 | mips64r5900el \
-	| mips64vr | mips64vrel \
-	| mips64vr4100 | mips64vr4100el \
-	| mips64vr4300 | mips64vr4300el \
-	| mips64vr5000 | mips64vr5000el \
-	| mips64vr5900 | mips64vr5900el \
-	| mipsisa32 | mipsisa32el \
-	| mipsisa32r2 | mipsisa32r2el \
-	| mipsisa32r6 | mipsisa32r6el \
-	| mipsisa64 | mipsisa64el \
-	| mipsisa64r2 | mipsisa64r2el \
-	| mipsisa64r6 | mipsisa64r6el \
-	| mipsisa64sb1 | mipsisa64sb1el \
-	| mipsisa64sr71k | mipsisa64sr71kel \
-	| mipsr5900 | mipsr5900el \
-	| mipstx39 | mipstx39el \
-	| mn10200 | mn10300 \
-	| moxie \
-	| mt \
-	| msp430 \
-	| nds32 | nds32le | nds32be \
-	| nios | nios2 | nios2eb | nios2el \
-	| ns16k | ns32k \
-	| open8 | or1k | or1knd | or32 \
-	| pdp10 | pj | pjl \
-	| powerpc | powerpc64 | powerpc64le | powerpcle \
-	| pru \
-	| pyramid \
-	| riscv32 | riscv64 \
-	| rl78 | rx \
-	| score \
-	| sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[234]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
-	| sh64 | sh64le \
-	| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
-	| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
-	| spu \
-	| tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \
-	| ubicom32 \
-	| v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \
-	| visium \
-	| wasm32 \
-	| x86 | xc16x | xstormy16 | xtensa \
-	| z8k | z80)
-		basic_machine=$basic_machine-unknown
-		;;
-	c54x)
-		basic_machine=tic54x-unknown
-		;;
-	c55x)
-		basic_machine=tic55x-unknown
-		;;
-	c6x)
-		basic_machine=tic6x-unknown
-		;;
-	leon|leon[3-9])
-		basic_machine=sparc-$basic_machine
-		;;
-	m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | nvptx | picochip)
-		basic_machine=$basic_machine-unknown
-		os=-none
-		;;
-	m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65)
-		;;
-	ms1)
-		basic_machine=mt-unknown
-		;;
-
-	strongarm | thumb | xscale)
-		basic_machine=arm-unknown
-		;;
-	xgate)
-		basic_machine=$basic_machine-unknown
-		os=-none
-		;;
-	xscaleeb)
-		basic_machine=armeb-unknown
-		;;
-
-	xscaleel)
-		basic_machine=armel-unknown
-		;;
-
-	# We use `pc' rather than `unknown'
-	# because (1) that's what they normally are, and
-	# (2) the word "unknown" tends to confuse beginning users.
-	i*86 | x86_64)
-	  basic_machine=$basic_machine-pc
-	  ;;
-	# Object if more than one company name word.
-	*-*-*)
-		echo Invalid configuration \`"$1"\': machine \`"$basic_machine"\' not recognized 1>&2
-		exit 1
-		;;
-	# Recognize the basic CPU types with company name.
-	580-* \
-	| a29k-* \
-	| aarch64-* | aarch64_be-* \
-	| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
-	| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
-	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \
-	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
-	| avr-* | avr32-* \
-	| ba-* \
-	| be32-* | be64-* \
-	| bfin-* | bs2000-* \
-	| c[123]* | c30-* | [cjt]90-* | c4x-* \
-	| c8051-* | clipper-* | craynv-* | cydra-* \
-	| d10v-* | d30v-* | dlx-* \
-	| e2k-* | elxsi-* \
-	| f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
-	| h8300-* | h8500-* \
-	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
-	| hexagon-* \
-	| i*86-* | i860-* | i960-* | ia16-* | ia64-* \
-	| ip2k-* | iq2000-* \
-	| k1om-* \
-	| le32-* | le64-* \
-	| lm32-* \
-	| m32c-* | m32r-* | m32rle-* \
-	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
-	| m88110-* | m88k-* | maxq-* | mcore-* | metag-* \
-	| microblaze-* | microblazeel-* \
-	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
-	| mips16-* \
-	| mips64-* | mips64el-* \
-	| mips64octeon-* | mips64octeonel-* \
-	| mips64orion-* | mips64orionel-* \
-	| mips64r5900-* | mips64r5900el-* \
-	| mips64vr-* | mips64vrel-* \
-	| mips64vr4100-* | mips64vr4100el-* \
-	| mips64vr4300-* | mips64vr4300el-* \
-	| mips64vr5000-* | mips64vr5000el-* \
-	| mips64vr5900-* | mips64vr5900el-* \
-	| mipsisa32-* | mipsisa32el-* \
-	| mipsisa32r2-* | mipsisa32r2el-* \
-	| mipsisa32r6-* | mipsisa32r6el-* \
-	| mipsisa64-* | mipsisa64el-* \
-	| mipsisa64r2-* | mipsisa64r2el-* \
-	| mipsisa64r6-* | mipsisa64r6el-* \
-	| mipsisa64sb1-* | mipsisa64sb1el-* \
-	| mipsisa64sr71k-* | mipsisa64sr71kel-* \
-	| mipsr5900-* | mipsr5900el-* \
-	| mipstx39-* | mipstx39el-* \
-	| mmix-* \
-	| mt-* \
-	| msp430-* \
-	| nds32-* | nds32le-* | nds32be-* \
-	| nios-* | nios2-* | nios2eb-* | nios2el-* \
-	| none-* | np1-* | ns16k-* | ns32k-* \
-	| open8-* \
-	| or1k*-* \
-	| orion-* \
-	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
-	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
-	| pru-* \
-	| pyramid-* \
-	| riscv32-* | riscv64-* \
-	| rl78-* | romp-* | rs6000-* | rx-* \
-	| sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
-	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
-	| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
-	| sparclite-* \
-	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx*-* \
-	| tahoe-* \
-	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
-	| tile*-* \
-	| tron-* \
-	| ubicom32-* \
-	| v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \
-	| vax-* \
-	| visium-* \
-	| wasm32-* \
-	| we32k-* \
-	| x86-* | x86_64-* | xc16x-* | xps100-* \
-	| xstormy16-* | xtensa*-* \
-	| ymp-* \
-	| z8k-* | z80-*)
-		;;
-	# Recognize the basic CPU types without company name, with glob match.
-	xtensa*)
-		basic_machine=$basic_machine-unknown
-		;;
-	# Recognize the various machine names and aliases which stand
-	# for a CPU type and a company and sometimes even an OS.
-	386bsd)
-		basic_machine=i386-pc
-		os=-bsd
-		;;
-	3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc)
-		basic_machine=m68000-att
-		;;
-	3b*)
-		basic_machine=we32k-att
-		;;
-	a29khif)
-		basic_machine=a29k-amd
-		os=-udi
-		;;
-	abacus)
-		basic_machine=abacus-unknown
-		;;
-	adobe68k)
-		basic_machine=m68010-adobe
-		os=-scout
-		;;
-	alliant | fx80)
-		basic_machine=fx80-alliant
-		;;
-	altos | altos3068)
-		basic_machine=m68k-altos
-		;;
-	am29k)
-		basic_machine=a29k-none
-		os=-bsd
-		;;
-	amd64)
-		basic_machine=x86_64-pc
-		;;
-	amd64-*)
-		basic_machine=x86_64-`echo "$basic_machine" | sed 's/^[^-]*-//'`
-		;;
-	amdahl)
-		basic_machine=580-amdahl
-		os=-sysv
-		;;
-	amiga | amiga-*)
-		basic_machine=m68k-unknown
-		;;
-	amigaos | amigados)
-		basic_machine=m68k-unknown
-		os=-amigaos
-		;;
-	amigaunix | amix)
-		basic_machine=m68k-unknown
-		os=-sysv4
-		;;
-	apollo68)
-		basic_machine=m68k-apollo
-		os=-sysv
-		;;
-	apollo68bsd)
-		basic_machine=m68k-apollo
-		os=-bsd
-		;;
-	aros)
-		basic_machine=i386-pc
-		os=-aros
-		;;
-	asmjs)
-		basic_machine=asmjs-unknown
-		;;
-	aux)
-		basic_machine=m68k-apple
-		os=-aux
-		;;
-	balance)
-		basic_machine=ns32k-sequent
-		os=-dynix
-		;;
-	blackfin)
-		basic_machine=bfin-unknown
-		os=-linux
-		;;
-	blackfin-*)
-		basic_machine=bfin-`echo "$basic_machine" | sed 's/^[^-]*-//'`
-		os=-linux
-		;;
-	bluegene*)
-		basic_machine=powerpc-ibm
-		os=-cnk
-		;;
-	c54x-*)
-		basic_machine=tic54x-`echo "$basic_machine" | sed 's/^[^-]*-//'`
-		;;
-	c55x-*)
-		basic_machine=tic55x-`echo "$basic_machine" | sed 's/^[^-]*-//'`
-		;;
-	c6x-*)
-		basic_machine=tic6x-`echo "$basic_machine" | sed 's/^[^-]*-//'`
-		;;
-	c90)
-		basic_machine=c90-cray
-		os=-unicos
-		;;
-	cegcc)
-		basic_machine=arm-unknown
-		os=-cegcc
-		;;
-	convex-c1)
-		basic_machine=c1-convex
-		os=-bsd
-		;;
-	convex-c2)
-		basic_machine=c2-convex
-		os=-bsd
-		;;
-	convex-c32)
-		basic_machine=c32-convex
-		os=-bsd
-		;;
-	convex-c34)
-		basic_machine=c34-convex
-		os=-bsd
-		;;
-	convex-c38)
-		basic_machine=c38-convex
-		os=-bsd
-		;;
-	cray | j90)
-		basic_machine=j90-cray
-		os=-unicos
-		;;
-	craynv)
-		basic_machine=craynv-cray
-		os=-unicosmp
-		;;
-	cr16 | cr16-*)
-		basic_machine=cr16-unknown
-		os=-elf
-		;;
-	crds | unos)
-		basic_machine=m68k-crds
-		;;
-	crisv32 | crisv32-* | etraxfs*)
-		basic_machine=crisv32-axis
-		;;
-	cris | cris-* | etrax*)
-		basic_machine=cris-axis
-		;;
-	crx)
-		basic_machine=crx-unknown
-		os=-elf
-		;;
-	da30 | da30-*)
-		basic_machine=m68k-da30
-		;;
-	decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn)
-		basic_machine=mips-dec
-		;;
-	decsystem10* | dec10*)
-		basic_machine=pdp10-dec
-		os=-tops10
-		;;
-	decsystem20* | dec20*)
-		basic_machine=pdp10-dec
-		os=-tops20
-		;;
-	delta | 3300 | motorola-3300 | motorola-delta \
-	      | 3300-motorola | delta-motorola)
-		basic_machine=m68k-motorola
-		;;
-	delta88)
-		basic_machine=m88k-motorola
-		os=-sysv3
-		;;
-	dicos)
-		basic_machine=i686-pc
-		os=-dicos
-		;;
-	djgpp)
-		basic_machine=i586-pc
-		os=-msdosdjgpp
-		;;
-	dpx20 | dpx20-*)
-		basic_machine=rs6000-bull
-		os=-bosx
-		;;
-	dpx2*)
-		basic_machine=m68k-bull
-		os=-sysv3
-		;;
-	e500v[12])
-		basic_machine=powerpc-unknown
-		os=$os"spe"
-		;;
-	e500v[12]-*)
-		basic_machine=powerpc-`echo "$basic_machine" | sed 's/^[^-]*-//'`
-		os=$os"spe"
-		;;
-	ebmon29k)
-		basic_machine=a29k-amd
-		os=-ebmon
-		;;
-	elxsi)
-		basic_machine=elxsi-elxsi
-		os=-bsd
-		;;
-	encore | umax | mmax)
-		basic_machine=ns32k-encore
-		;;
-	es1800 | OSE68k | ose68k | ose | OSE)
-		basic_machine=m68k-ericsson
-		os=-ose
-		;;
-	fx2800)
-		basic_machine=i860-alliant
-		;;
-	genix)
-		basic_machine=ns32k-ns
-		;;
-	gmicro)
-		basic_machine=tron-gmicro
-		os=-sysv
-		;;
-	go32)
-		basic_machine=i386-pc
-		os=-go32
-		;;
-	h3050r* | hiux*)
-		basic_machine=hppa1.1-hitachi
-		os=-hiuxwe2
-		;;
-	h8300hms)
-		basic_machine=h8300-hitachi
-		os=-hms
-		;;
-	h8300xray)
-		basic_machine=h8300-hitachi
-		os=-xray
-		;;
-	h8500hms)
-		basic_machine=h8500-hitachi
-		os=-hms
-		;;
-	harris)
-		basic_machine=m88k-harris
-		os=-sysv3
-		;;
-	hp300-*)
-		basic_machine=m68k-hp
-		;;
-	hp300bsd)
-		basic_machine=m68k-hp
-		os=-bsd
-		;;
-	hp300hpux)
-		basic_machine=m68k-hp
-		os=-hpux
-		;;
-	hp3k9[0-9][0-9] | hp9[0-9][0-9])
-		basic_machine=hppa1.0-hp
-		;;
-	hp9k2[0-9][0-9] | hp9k31[0-9])
-		basic_machine=m68000-hp
-		;;
-	hp9k3[2-9][0-9])
-		basic_machine=m68k-hp
-		;;
-	hp9k6[0-9][0-9] | hp6[0-9][0-9])
-		basic_machine=hppa1.0-hp
-		;;
-	hp9k7[0-79][0-9] | hp7[0-79][0-9])
-		basic_machine=hppa1.1-hp
-		;;
-	hp9k78[0-9] | hp78[0-9])
-		# FIXME: really hppa2.0-hp
-		basic_machine=hppa1.1-hp
-		;;
-	hp9k8[67]1 | hp8[67]1 | hp9k80[24] | hp80[24] | hp9k8[78]9 | hp8[78]9 | hp9k893 | hp893)
-		# FIXME: really hppa2.0-hp
-		basic_machine=hppa1.1-hp
-		;;
-	hp9k8[0-9][13679] | hp8[0-9][13679])
-		basic_machine=hppa1.1-hp
-		;;
-	hp9k8[0-9][0-9] | hp8[0-9][0-9])
-		basic_machine=hppa1.0-hp
-		;;
-	hppaosf)
-		basic_machine=hppa1.1-hp
-		os=-osf
-		;;
-	hppro)
-		basic_machine=hppa1.1-hp
-		os=-proelf
-		;;
-	i370-ibm* | ibm*)
-		basic_machine=i370-ibm
-		;;
-	i*86v32)
-		basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'`
-		os=-sysv32
-		;;
-	i*86v4*)
-		basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'`
-		os=-sysv4
-		;;
-	i*86v)
-		basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'`
-		os=-sysv
-		;;
-	i*86sol2)
-		basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'`
-		os=-solaris2
-		;;
-	i386mach)
-		basic_machine=i386-mach
-		os=-mach
-		;;
-	vsta)
-		basic_machine=i386-unknown
-		os=-vsta
-		;;
-	iris | iris4d)
-		basic_machine=mips-sgi
-		case $os in
-		    -irix*)
-			;;
-		    *)
-			os=-irix4
-			;;
-		esac
-		;;
-	isi68 | isi)
-		basic_machine=m68k-isi
-		os=-sysv
-		;;
-	leon-*|leon[3-9]-*)
-		basic_machine=sparc-`echo "$basic_machine" | sed 's/-.*//'`
-		;;
-	m68knommu)
-		basic_machine=m68k-unknown
-		os=-linux
-		;;
-	m68knommu-*)
-		basic_machine=m68k-`echo "$basic_machine" | sed 's/^[^-]*-//'`
-		os=-linux
-		;;
-	magnum | m3230)
-		basic_machine=mips-mips
-		os=-sysv
-		;;
-	merlin)
-		basic_machine=ns32k-utek
-		os=-sysv
-		;;
-	microblaze*)
-		basic_machine=microblaze-xilinx
-		;;
-	mingw64)
-		basic_machine=x86_64-pc
-		os=-mingw64
-		;;
-	mingw32)
-		basic_machine=i686-pc
-		os=-mingw32
-		;;
-	mingw32ce)
-		basic_machine=arm-unknown
-		os=-mingw32ce
-		;;
-	miniframe)
-		basic_machine=m68000-convergent
-		;;
-	*mint | -mint[0-9]* | *MiNT | *MiNT[0-9]*)
-		basic_machine=m68k-atari
-		os=-mint
-		;;
-	mips3*-*)
-		basic_machine=`echo "$basic_machine" | sed -e 's/mips3/mips64/'`
-		;;
-	mips3*)
-		basic_machine=`echo "$basic_machine" | sed -e 's/mips3/mips64/'`-unknown
-		;;
-	monitor)
-		basic_machine=m68k-rom68k
-		os=-coff
-		;;
-	morphos)
-		basic_machine=powerpc-unknown
-		os=-morphos
-		;;
-	moxiebox)
-		basic_machine=moxie-unknown
-		os=-moxiebox
-		;;
-	msdos)
-		basic_machine=i386-pc
-		os=-msdos
-		;;
-	ms1-*)
-		basic_machine=`echo "$basic_machine" | sed -e 's/ms1-/mt-/'`
-		;;
-	msys)
-		basic_machine=i686-pc
-		os=-msys
-		;;
-	mvs)
-		basic_machine=i370-ibm
-		os=-mvs
-		;;
-	nacl)
-		basic_machine=le32-unknown
-		os=-nacl
-		;;
-	ncr3000)
-		basic_machine=i486-ncr
-		os=-sysv4
-		;;
-	netbsd386)
-		basic_machine=i386-unknown
-		os=-netbsd
-		;;
-	netwinder)
-		basic_machine=armv4l-rebel
-		os=-linux
-		;;
-	news | news700 | news800 | news900)
-		basic_machine=m68k-sony
-		os=-newsos
-		;;
-	news1000)
-		basic_machine=m68030-sony
-		os=-newsos
-		;;
-	news-3600 | risc-news)
-		basic_machine=mips-sony
-		os=-newsos
-		;;
-	necv70)
-		basic_machine=v70-nec
-		os=-sysv
-		;;
-	next | m*-next)
-		basic_machine=m68k-next
-		case $os in
-		    -nextstep* )
-			;;
-		    -ns2*)
-		      os=-nextstep2
-			;;
-		    *)
-		      os=-nextstep3
-			;;
-		esac
-		;;
-	nh3000)
-		basic_machine=m68k-harris
-		os=-cxux
-		;;
-	nh[45]000)
-		basic_machine=m88k-harris
-		os=-cxux
-		;;
-	nindy960)
-		basic_machine=i960-intel
-		os=-nindy
-		;;
-	mon960)
-		basic_machine=i960-intel
-		os=-mon960
-		;;
-	nonstopux)
-		basic_machine=mips-compaq
-		os=-nonstopux
-		;;
-	np1)
-		basic_machine=np1-gould
-		;;
-	neo-tandem)
-		basic_machine=neo-tandem
-		;;
-	nse-tandem)
-		basic_machine=nse-tandem
-		;;
-	nsr-tandem)
-		basic_machine=nsr-tandem
-		;;
-	nsv-tandem)
-		basic_machine=nsv-tandem
-		;;
-	nsx-tandem)
-		basic_machine=nsx-tandem
-		;;
-	op50n-* | op60c-*)
-		basic_machine=hppa1.1-oki
-		os=-proelf
-		;;
-	openrisc | openrisc-*)
-		basic_machine=or32-unknown
-		;;
-	os400)
-		basic_machine=powerpc-ibm
-		os=-os400
-		;;
-	OSE68000 | ose68000)
-		basic_machine=m68000-ericsson
-		os=-ose
-		;;
-	os68k)
-		basic_machine=m68k-none
-		os=-os68k
-		;;
-	pa-hitachi)
-		basic_machine=hppa1.1-hitachi
-		os=-hiuxwe2
-		;;
-	paragon)
-		basic_machine=i860-intel
-		os=-osf
-		;;
-	parisc)
-		basic_machine=hppa-unknown
-		os=-linux
-		;;
-	parisc-*)
-		basic_machine=hppa-`echo "$basic_machine" | sed 's/^[^-]*-//'`
-		os=-linux
-		;;
-	pbd)
-		basic_machine=sparc-tti
-		;;
-	pbb)
-		basic_machine=m68k-tti
-		;;
-	pc532 | pc532-*)
-		basic_machine=ns32k-pc532
-		;;
-	pc98)
-		basic_machine=i386-pc
-		;;
-	pc98-*)
-		basic_machine=i386-`echo "$basic_machine" | sed 's/^[^-]*-//'`
-		;;
-	pentium | p5 | k5 | k6 | nexgen | viac3)
-		basic_machine=i586-pc
-		;;
-	pentiumpro | p6 | 6x86 | athlon | athlon_*)
-		basic_machine=i686-pc
-		;;
-	pentiumii | pentium2 | pentiumiii | pentium3)
-		basic_machine=i686-pc
-		;;
-	pentium4)
-		basic_machine=i786-pc
-		;;
-	pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
-		basic_machine=i586-`echo "$basic_machine" | sed 's/^[^-]*-//'`
-		;;
-	pentiumpro-* | p6-* | 6x86-* | athlon-*)
-		basic_machine=i686-`echo "$basic_machine" | sed 's/^[^-]*-//'`
-		;;
-	pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*)
-		basic_machine=i686-`echo "$basic_machine" | sed 's/^[^-]*-//'`
-		;;
-	pentium4-*)
-		basic_machine=i786-`echo "$basic_machine" | sed 's/^[^-]*-//'`
-		;;
-	pn)
-		basic_machine=pn-gould
-		;;
-	power)	basic_machine=power-ibm
-		;;
-	ppc | ppcbe)	basic_machine=powerpc-unknown
-		;;
-	ppc-* | ppcbe-*)
-		basic_machine=powerpc-`echo "$basic_machine" | sed 's/^[^-]*-//'`
-		;;
-	ppcle | powerpclittle)
-		basic_machine=powerpcle-unknown
-		;;
-	ppcle-* | powerpclittle-*)
-		basic_machine=powerpcle-`echo "$basic_machine" | sed 's/^[^-]*-//'`
-		;;
-	ppc64)	basic_machine=powerpc64-unknown
-		;;
-	ppc64-*) basic_machine=powerpc64-`echo "$basic_machine" | sed 's/^[^-]*-//'`
-		;;
-	ppc64le | powerpc64little)
-		basic_machine=powerpc64le-unknown
-		;;
-	ppc64le-* | powerpc64little-*)
-		basic_machine=powerpc64le-`echo "$basic_machine" | sed 's/^[^-]*-//'`
-		;;
-	ps2)
-		basic_machine=i386-ibm
-		;;
-	pw32)
-		basic_machine=i586-unknown
-		os=-pw32
-		;;
-	rdos | rdos64)
-		basic_machine=x86_64-pc
-		os=-rdos
-		;;
-	rdos32)
-		basic_machine=i386-pc
-		os=-rdos
-		;;
-	rom68k)
-		basic_machine=m68k-rom68k
-		os=-coff
-		;;
-	rm[46]00)
-		basic_machine=mips-siemens
-		;;
-	rtpc | rtpc-*)
-		basic_machine=romp-ibm
-		;;
-	s390 | s390-*)
-		basic_machine=s390-ibm
-		;;
-	s390x | s390x-*)
-		basic_machine=s390x-ibm
-		;;
-	sa29200)
-		basic_machine=a29k-amd
-		os=-udi
-		;;
-	sb1)
-		basic_machine=mipsisa64sb1-unknown
-		;;
-	sb1el)
-		basic_machine=mipsisa64sb1el-unknown
-		;;
-	sde)
-		basic_machine=mipsisa32-sde
-		os=-elf
-		;;
-	sei)
-		basic_machine=mips-sei
-		os=-seiux
-		;;
-	sequent)
-		basic_machine=i386-sequent
-		;;
-	sh5el)
-		basic_machine=sh5le-unknown
-		;;
-	simso-wrs)
-		basic_machine=sparclite-wrs
-		os=-vxworks
-		;;
-	sps7)
-		basic_machine=m68k-bull
-		os=-sysv2
-		;;
-	spur)
-		basic_machine=spur-unknown
-		;;
-	st2000)
-		basic_machine=m68k-tandem
-		;;
-	stratus)
-		basic_machine=i860-stratus
-		os=-sysv4
-		;;
-	strongarm-* | thumb-*)
-		basic_machine=arm-`echo "$basic_machine" | sed 's/^[^-]*-//'`
-		;;
-	sun2)
-		basic_machine=m68000-sun
-		;;
-	sun2os3)
-		basic_machine=m68000-sun
-		os=-sunos3
-		;;
-	sun2os4)
-		basic_machine=m68000-sun
-		os=-sunos4
-		;;
-	sun3os3)
-		basic_machine=m68k-sun
-		os=-sunos3
-		;;
-	sun3os4)
-		basic_machine=m68k-sun
-		os=-sunos4
-		;;
-	sun4os3)
-		basic_machine=sparc-sun
-		os=-sunos3
-		;;
-	sun4os4)
-		basic_machine=sparc-sun
-		os=-sunos4
-		;;
-	sun4sol2)
-		basic_machine=sparc-sun
-		os=-solaris2
-		;;
-	sun3 | sun3-*)
-		basic_machine=m68k-sun
-		;;
-	sun4)
-		basic_machine=sparc-sun
-		;;
-	sun386 | sun386i | roadrunner)
-		basic_machine=i386-sun
-		;;
-	sv1)
-		basic_machine=sv1-cray
-		os=-unicos
-		;;
-	symmetry)
-		basic_machine=i386-sequent
-		os=-dynix
-		;;
-	t3e)
-		basic_machine=alphaev5-cray
-		os=-unicos
-		;;
-	t90)
-		basic_machine=t90-cray
-		os=-unicos
-		;;
-	tile*)
-		basic_machine=$basic_machine-unknown
-		os=-linux-gnu
-		;;
-	tx39)
-		basic_machine=mipstx39-unknown
-		;;
-	tx39el)
-		basic_machine=mipstx39el-unknown
-		;;
-	toad1)
-		basic_machine=pdp10-xkl
-		os=-tops20
-		;;
-	tower | tower-32)
-		basic_machine=m68k-ncr
-		;;
-	tpf)
-		basic_machine=s390x-ibm
-		os=-tpf
-		;;
-	udi29k)
-		basic_machine=a29k-amd
-		os=-udi
-		;;
-	ultra3)
-		basic_machine=a29k-nyu
-		os=-sym1
-		;;
-	v810 | necv810)
-		basic_machine=v810-nec
-		os=-none
-		;;
-	vaxv)
-		basic_machine=vax-dec
-		os=-sysv
-		;;
-	vms)
-		basic_machine=vax-dec
-		os=-vms
-		;;
-	vpp*|vx|vx-*)
-		basic_machine=f301-fujitsu
-		;;
-	vxworks960)
-		basic_machine=i960-wrs
-		os=-vxworks
-		;;
-	vxworks68)
-		basic_machine=m68k-wrs
-		os=-vxworks
-		;;
-	vxworks29k)
-		basic_machine=a29k-wrs
-		os=-vxworks
-		;;
-	w65*)
-		basic_machine=w65-wdc
-		os=-none
-		;;
-	w89k-*)
-		basic_machine=hppa1.1-winbond
-		os=-proelf
-		;;
-	x64)
-		basic_machine=x86_64-pc
-		;;
-	xbox)
-		basic_machine=i686-pc
-		os=-mingw32
-		;;
-	xps | xps100)
-		basic_machine=xps100-honeywell
-		;;
-	xscale-* | xscalee[bl]-*)
-		basic_machine=`echo "$basic_machine" | sed 's/^xscale/arm/'`
-		;;
-	ymp)
-		basic_machine=ymp-cray
-		os=-unicos
-		;;
-	none)
-		basic_machine=none-none
-		os=-none
-		;;
-
-# Here we handle the default manufacturer of certain CPU types.  It is in
-# some cases the only manufacturer, in others, it is the most popular.
-	w89k)
-		basic_machine=hppa1.1-winbond
-		;;
-	op50n)
-		basic_machine=hppa1.1-oki
-		;;
-	op60c)
-		basic_machine=hppa1.1-oki
-		;;
-	romp)
-		basic_machine=romp-ibm
-		;;
-	mmix)
-		basic_machine=mmix-knuth
-		;;
-	rs6000)
-		basic_machine=rs6000-ibm
-		;;
-	vax)
-		basic_machine=vax-dec
-		;;
-	pdp11)
-		basic_machine=pdp11-dec
-		;;
-	we32k)
-		basic_machine=we32k-att
-		;;
-	sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele)
-		basic_machine=sh-unknown
-		;;
-	cydra)
-		basic_machine=cydra-cydrome
-		;;
-	orion)
-		basic_machine=orion-highlevel
-		;;
-	orion105)
-		basic_machine=clipper-highlevel
-		;;
-	mac | mpw | mac-mpw)
-		basic_machine=m68k-apple
-		;;
-	pmac | pmac-mpw)
-		basic_machine=powerpc-apple
-		;;
-	*-unknown)
-		# Make sure to match an already-canonicalized machine name.
-		;;
-	*)
-		echo Invalid configuration \`"$1"\': machine \`"$basic_machine"\' not recognized 1>&2
-		exit 1
-		;;
-esac
-
-# Here we canonicalize certain aliases for manufacturers.
-case $basic_machine in
-	*-digital*)
-		basic_machine=`echo "$basic_machine" | sed 's/digital.*/dec/'`
-		;;
-	*-commodore*)
-		basic_machine=`echo "$basic_machine" | sed 's/commodore.*/cbm/'`
-		;;
-	*)
-		;;
-esac
-
-# Decode manufacturer-specific aliases for certain operating systems.
-
-if [ x"$os" != x"" ]
-then
-case $os in
-	# First match some system type aliases that might get confused
-	# with valid system types.
-	# -solaris* is a basic system type, with this one exception.
-	-auroraux)
-		os=-auroraux
-		;;
-	-solaris1 | -solaris1.*)
-		os=`echo $os | sed -e 's|solaris1|sunos4|'`
-		;;
-	-solaris)
-		os=-solaris2
-		;;
-	-unixware*)
-		os=-sysv4.2uw
-		;;
-	-gnu/linux*)
-		os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'`
-		;;
-	# es1800 is here to avoid being matched by es* (a different OS)
-	-es1800*)
-		os=-ose
-		;;
-	# Now accept the basic system types.
-	# The portable systems comes first.
-	# Each alternative MUST end in a * to match a version number.
-	# -sysv* is not here because it comes later, after sysvr4.
-	-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
-	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
-	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
-	      | -sym* | -kopensolaris* | -plan9* \
-	      | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
-	      | -aos* | -aros* | -cloudabi* | -sortix* \
-	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
-	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
-	      | -hiux* | -knetbsd* | -mirbsd* | -netbsd* \
-	      | -bitrig* | -openbsd* | -solidbsd* | -libertybsd* \
-	      | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
-	      | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
-	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
-	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* | -hcos* \
-	      | -chorusos* | -chorusrdb* | -cegcc* | -glidix* \
-	      | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
-	      | -midipix* | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \
-	      | -linux-newlib* | -linux-musl* | -linux-uclibc* \
-	      | -uxpv* | -beos* | -mpeix* | -udk* | -moxiebox* \
-	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* \
-	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
-	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
-	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
-	      | -morphos* | -superux* | -rtmk* | -windiss* \
-	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
-	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* \
-	      | -onefs* | -tirtos* | -phoenix* | -fuchsia* | -redox* | -bme* \
-	      | -midnightbsd*)
-	# Remember, each alternative MUST END IN *, to match a version number.
-		;;
-	-qnx*)
-		case $basic_machine in
-		    x86-* | i*86-*)
-			;;
-		    *)
-			os=-nto$os
-			;;
-		esac
-		;;
-	-nto-qnx*)
-		;;
-	-nto*)
-		os=`echo $os | sed -e 's|nto|nto-qnx|'`
-		;;
-	-sim | -xray | -os68k* | -v88r* \
-	      | -windows* | -osx | -abug | -netware* | -os9* \
-	      | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
-		;;
-	-mac*)
-		os=`echo "$os" | sed -e 's|mac|macos|'`
-		;;
-	-linux-dietlibc)
-		os=-linux-dietlibc
-		;;
-	-linux*)
-		os=`echo $os | sed -e 's|linux|linux-gnu|'`
-		;;
-	-sunos5*)
-		os=`echo "$os" | sed -e 's|sunos5|solaris2|'`
-		;;
-	-sunos6*)
-		os=`echo "$os" | sed -e 's|sunos6|solaris3|'`
-		;;
-	-opened*)
-		os=-openedition
-		;;
-	-os400*)
-		os=-os400
-		;;
-	-wince*)
-		os=-wince
-		;;
-	-utek*)
-		os=-bsd
-		;;
-	-dynix*)
-		os=-bsd
-		;;
-	-acis*)
-		os=-aos
-		;;
-	-atheos*)
-		os=-atheos
-		;;
-	-syllable*)
-		os=-syllable
-		;;
-	-386bsd)
-		os=-bsd
-		;;
-	-ctix* | -uts*)
-		os=-sysv
-		;;
-	-nova*)
-		os=-rtmk-nova
-		;;
-	-ns2)
-		os=-nextstep2
-		;;
-	-nsk*)
-		os=-nsk
-		;;
-	# Preserve the version number of sinix5.
-	-sinix5.*)
-		os=`echo $os | sed -e 's|sinix|sysv|'`
-		;;
-	-sinix*)
-		os=-sysv4
-		;;
-	-tpf*)
-		os=-tpf
-		;;
-	-triton*)
-		os=-sysv3
-		;;
-	-oss*)
-		os=-sysv3
-		;;
-	-svr4*)
-		os=-sysv4
-		;;
-	-svr3)
-		os=-sysv3
-		;;
-	-sysvr4)
-		os=-sysv4
-		;;
-	# This must come after -sysvr4.
-	-sysv*)
-		;;
-	-ose*)
-		os=-ose
-		;;
-	-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
-		os=-mint
-		;;
-	-zvmoe)
-		os=-zvmoe
-		;;
-	-dicos*)
-		os=-dicos
-		;;
-	-pikeos*)
-		# Until real need of OS specific support for
-		# particular features comes up, bare metal
-		# configurations are quite functional.
-		case $basic_machine in
-		    arm*)
-			os=-eabi
-			;;
-		    *)
-			os=-elf
-			;;
-		esac
-		;;
-	-nacl*)
-		;;
-	-ios)
-		;;
-	-none)
-		;;
-	*)
-		# Get rid of the `-' at the beginning of $os.
-		os=`echo $os | sed 's/[^-]*-//'`
-		echo Invalid configuration \`"$1"\': system \`"$os"\' not recognized 1>&2
-		exit 1
-		;;
-esac
-else
-
-# Here we handle the default operating systems that come with various machines.
-# The value should be what the vendor currently ships out the door with their
-# machine or put another way, the most popular os provided with the machine.
-
-# Note that if you're going to try to match "-MANUFACTURER" here (say,
-# "-sun"), then you have to tell the case statement up towards the top
-# that MANUFACTURER isn't an operating system.  Otherwise, code above
-# will signal an error saying that MANUFACTURER isn't an operating
-# system, and we'll never get to this point.
-
-case $basic_machine in
-	score-*)
-		os=-elf
-		;;
-	spu-*)
-		os=-elf
-		;;
-	*-acorn)
-		os=-riscix1.2
-		;;
-	arm*-rebel)
-		os=-linux
-		;;
-	arm*-semi)
-		os=-aout
-		;;
-	c4x-* | tic4x-*)
-		os=-coff
-		;;
-	c8051-*)
-		os=-elf
-		;;
-	hexagon-*)
-		os=-elf
-		;;
-	tic54x-*)
-		os=-coff
-		;;
-	tic55x-*)
-		os=-coff
-		;;
-	tic6x-*)
-		os=-coff
-		;;
-	# This must come before the *-dec entry.
-	pdp10-*)
-		os=-tops20
-		;;
-	pdp11-*)
-		os=-none
-		;;
-	*-dec | vax-*)
-		os=-ultrix4.2
-		;;
-	m68*-apollo)
-		os=-domain
-		;;
-	i386-sun)
-		os=-sunos4.0.2
-		;;
-	m68000-sun)
-		os=-sunos3
-		;;
-	m68*-cisco)
-		os=-aout
-		;;
-	mep-*)
-		os=-elf
-		;;
-	mips*-cisco)
-		os=-elf
-		;;
-	mips*-*)
-		os=-elf
-		;;
-	or32-*)
-		os=-coff
-		;;
-	*-tti)	# must be before sparc entry or we get the wrong os.
-		os=-sysv3
-		;;
-	sparc-* | *-sun)
-		os=-sunos4.1.1
-		;;
-	pru-*)
-		os=-elf
-		;;
-	*-be)
-		os=-beos
-		;;
-	*-ibm)
-		os=-aix
-		;;
-	*-knuth)
-		os=-mmixware
-		;;
-	*-wec)
-		os=-proelf
-		;;
-	*-winbond)
-		os=-proelf
-		;;
-	*-oki)
-		os=-proelf
-		;;
-	*-hp)
-		os=-hpux
-		;;
-	*-hitachi)
-		os=-hiux
-		;;
-	i860-* | *-att | *-ncr | *-altos | *-motorola | *-convergent)
-		os=-sysv
-		;;
-	*-cbm)
-		os=-amigaos
-		;;
-	*-dg)
-		os=-dgux
-		;;
-	*-dolphin)
-		os=-sysv3
-		;;
-	m68k-ccur)
-		os=-rtu
-		;;
-	m88k-omron*)
-		os=-luna
-		;;
-	*-next)
-		os=-nextstep
-		;;
-	*-sequent)
-		os=-ptx
-		;;
-	*-crds)
-		os=-unos
-		;;
-	*-ns)
-		os=-genix
-		;;
-	i370-*)
-		os=-mvs
-		;;
-	*-gould)
-		os=-sysv
-		;;
-	*-highlevel)
-		os=-bsd
-		;;
-	*-encore)
-		os=-bsd
-		;;
-	*-sgi)
-		os=-irix
-		;;
-	*-siemens)
-		os=-sysv4
-		;;
-	*-masscomp)
-		os=-rtu
-		;;
-	f30[01]-fujitsu | f700-fujitsu)
-		os=-uxpv
-		;;
-	*-rom68k)
-		os=-coff
-		;;
-	*-*bug)
-		os=-coff
-		;;
-	*-apple)
-		os=-macos
-		;;
-	*-atari*)
-		os=-mint
-		;;
-	*)
-		os=-none
-		;;
-esac
-fi
-
-# Here we handle the case where we know the os, and the CPU type, but not the
-# manufacturer.  We pick the logical manufacturer.
-vendor=unknown
-case $basic_machine in
-	*-unknown)
-		case $os in
-			-riscix*)
-				vendor=acorn
-				;;
-			-sunos*)
-				vendor=sun
-				;;
-			-cnk*|-aix*)
-				vendor=ibm
-				;;
-			-beos*)
-				vendor=be
-				;;
-			-hpux*)
-				vendor=hp
-				;;
-			-mpeix*)
-				vendor=hp
-				;;
-			-hiux*)
-				vendor=hitachi
-				;;
-			-unos*)
-				vendor=crds
-				;;
-			-dgux*)
-				vendor=dg
-				;;
-			-luna*)
-				vendor=omron
-				;;
-			-genix*)
-				vendor=ns
-				;;
-			-mvs* | -opened*)
-				vendor=ibm
-				;;
-			-os400*)
-				vendor=ibm
-				;;
-			-ptx*)
-				vendor=sequent
-				;;
-			-tpf*)
-				vendor=ibm
-				;;
-			-vxsim* | -vxworks* | -windiss*)
-				vendor=wrs
-				;;
-			-aux*)
-				vendor=apple
-				;;
-			-hms*)
-				vendor=hitachi
-				;;
-			-mpw* | -macos*)
-				vendor=apple
-				;;
-			-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
-				vendor=atari
-				;;
-			-vos*)
-				vendor=stratus
-				;;
-		esac
-		basic_machine=`echo "$basic_machine" | sed "s/unknown/$vendor/"`
-		;;
-esac
-
-echo "$basic_machine$os"
-exit
-
-# Local variables:
-# eval: (add-hook 'before-save-hook 'time-stamp)
-# time-stamp-start: "timestamp='"
-# time-stamp-format: "%:y-%02m-%02d"
-# time-stamp-end: "'"
-# End:
diff --git a/submodules/libtgvoip/configure b/submodules/libtgvoip/configure
deleted file mode 100755
index 2cdfbf6e8f..0000000000
--- a/submodules/libtgvoip/configure
+++ /dev/null
@@ -1,21185 +0,0 @@
-#! /bin/sh
-# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for libtgvoip 2.4.4.
-#
-# Report bugs to <https://github.com/grishka/libtgvoip/issues>.
-#
-#
-# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
-#
-#
-# This configure script is free software; the Free Software Foundation
-# gives unlimited permission to copy, distribute and modify it.
-## -------------------- ##
-## M4sh Initialization. ##
-## -------------------- ##
-
-# Be more Bourne compatible
-DUALCASE=1; export DUALCASE # for MKS sh
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
-  emulate sh
-  NULLCMD=:
-  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
-  # is contrary to our usage.  Disable this feature.
-  alias -g '${1+"$@"}'='"$@"'
-  setopt NO_GLOB_SUBST
-else
-  case `(set -o) 2>/dev/null` in #(
-  *posix*) :
-    set -o posix ;; #(
-  *) :
-     ;;
-esac
-fi
-
-
-as_nl='
-'
-export as_nl
-# Printing a long string crashes Solaris 7 /usr/bin/printf.
-as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
-as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
-as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
-# Prefer a ksh shell builtin over an external printf program on Solaris,
-# but without wasting forks for bash or zsh.
-if test -z "$BASH_VERSION$ZSH_VERSION" \
-    && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
-  as_echo='print -r --'
-  as_echo_n='print -rn --'
-elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
-  as_echo='printf %s\n'
-  as_echo_n='printf %s'
-else
-  if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
-    as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
-    as_echo_n='/usr/ucb/echo -n'
-  else
-    as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
-    as_echo_n_body='eval
-      arg=$1;
-      case $arg in #(
-      *"$as_nl"*)
-	expr "X$arg" : "X\\(.*\\)$as_nl";
-	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
-      esac;
-      expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
-    '
-    export as_echo_n_body
-    as_echo_n='sh -c $as_echo_n_body as_echo'
-  fi
-  export as_echo_body
-  as_echo='sh -c $as_echo_body as_echo'
-fi
-
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
-  PATH_SEPARATOR=:
-  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
-    (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
-      PATH_SEPARATOR=';'
-  }
-fi
-
-
-# IFS
-# We need space, tab and new line, in precisely that order.  Quoting is
-# there to prevent editors from complaining about space-tab.
-# (If _AS_PATH_WALK were called with IFS unset, it would disable word
-# splitting by setting IFS to empty value.)
-IFS=" ""	$as_nl"
-
-# Find who we are.  Look in the path if we contain no directory separator.
-as_myself=
-case $0 in #((
-  *[\\/]* ) as_myself=$0 ;;
-  *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
-  done
-IFS=$as_save_IFS
-
-     ;;
-esac
-# We did not find ourselves, most probably we were run as `sh COMMAND'
-# in which case we are not to be found in the path.
-if test "x$as_myself" = x; then
-  as_myself=$0
-fi
-if test ! -f "$as_myself"; then
-  $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
-  exit 1
-fi
-
-# Unset variables that we do not need and which cause bugs (e.g. in
-# pre-3.0 UWIN ksh).  But do not cause bugs in bash 2.01; the "|| exit 1"
-# suppresses any "Segmentation fault" message there.  '((' could
-# trigger a bug in pdksh 5.2.14.
-for as_var in BASH_ENV ENV MAIL MAILPATH
-do eval test x\${$as_var+set} = xset \
-  && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
-done
-PS1='$ '
-PS2='> '
-PS4='+ '
-
-# NLS nuisances.
-LC_ALL=C
-export LC_ALL
-LANGUAGE=C
-export LANGUAGE
-
-# CDPATH.
-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
-
-# Use a proper internal environment variable to ensure we don't fall
-  # into an infinite loop, continuously re-executing ourselves.
-  if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then
-    _as_can_reexec=no; export _as_can_reexec;
-    # We cannot yet assume a decent shell, so we have to provide a
-# neutralization value for shells without unset; and this also
-# works around shells that cannot unset nonexistent variables.
-# Preserve -v and -x to the replacement shell.
-BASH_ENV=/dev/null
-ENV=/dev/null
-(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
-case $- in # ((((
-  *v*x* | *x*v* ) as_opts=-vx ;;
-  *v* ) as_opts=-v ;;
-  *x* ) as_opts=-x ;;
-  * ) as_opts= ;;
-esac
-exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
-# Admittedly, this is quite paranoid, since all the known shells bail
-# out after a failed `exec'.
-$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
-as_fn_exit 255
-  fi
-  # We don't want this to propagate to other subprocesses.
-          { _as_can_reexec=; unset _as_can_reexec;}
-if test "x$CONFIG_SHELL" = x; then
-  as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then :
-  emulate sh
-  NULLCMD=:
-  # Pre-4.2 versions of Zsh do word splitting on \${1+\"\$@\"}, which
-  # is contrary to our usage.  Disable this feature.
-  alias -g '\${1+\"\$@\"}'='\"\$@\"'
-  setopt NO_GLOB_SUBST
-else
-  case \`(set -o) 2>/dev/null\` in #(
-  *posix*) :
-    set -o posix ;; #(
-  *) :
-     ;;
-esac
-fi
-"
-  as_required="as_fn_return () { (exit \$1); }
-as_fn_success () { as_fn_return 0; }
-as_fn_failure () { as_fn_return 1; }
-as_fn_ret_success () { return 0; }
-as_fn_ret_failure () { return 1; }
-
-exitcode=0
-as_fn_success || { exitcode=1; echo as_fn_success failed.; }
-as_fn_failure && { exitcode=1; echo as_fn_failure succeeded.; }
-as_fn_ret_success || { exitcode=1; echo as_fn_ret_success failed.; }
-as_fn_ret_failure && { exitcode=1; echo as_fn_ret_failure succeeded.; }
-if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then :
-
-else
-  exitcode=1; echo positional parameters were not saved.
-fi
-test x\$exitcode = x0 || exit 1
-test -x / || exit 1"
-  as_suggested="  as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO
-  as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
-  eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
-  test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1
-
-  test -n \"\${ZSH_VERSION+set}\${BASH_VERSION+set}\" || (
-    ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
-    ECHO=\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO
-    ECHO=\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO
-    PATH=/empty FPATH=/empty; export PATH FPATH
-    test \"X\`printf %s \$ECHO\`\" = \"X\$ECHO\" \\
-      || test \"X\`print -r -- \$ECHO\`\" = \"X\$ECHO\" ) || exit 1
-test \$(( 1 + 1 )) = 2 || exit 1"
-  if (eval "$as_required") 2>/dev/null; then :
-  as_have_required=yes
-else
-  as_have_required=no
-fi
-  if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null; then :
-
-else
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-as_found=false
-for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  as_found=:
-  case $as_dir in #(
-	 /*)
-	   for as_base in sh bash ksh sh5; do
-	     # Try only shells that exist, to save several forks.
-	     as_shell=$as_dir/$as_base
-	     if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
-		    { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$as_shell"; } 2>/dev/null; then :
-  CONFIG_SHELL=$as_shell as_have_required=yes
-		   if { $as_echo "$as_bourne_compatible""$as_suggested" | as_run=a "$as_shell"; } 2>/dev/null; then :
-  break 2
-fi
-fi
-	   done;;
-       esac
-  as_found=false
-done
-$as_found || { if { test -f "$SHELL" || test -f "$SHELL.exe"; } &&
-	      { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$SHELL"; } 2>/dev/null; then :
-  CONFIG_SHELL=$SHELL as_have_required=yes
-fi; }
-IFS=$as_save_IFS
-
-
-      if test "x$CONFIG_SHELL" != x; then :
-  export CONFIG_SHELL
-             # We cannot yet assume a decent shell, so we have to provide a
-# neutralization value for shells without unset; and this also
-# works around shells that cannot unset nonexistent variables.
-# Preserve -v and -x to the replacement shell.
-BASH_ENV=/dev/null
-ENV=/dev/null
-(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
-case $- in # ((((
-  *v*x* | *x*v* ) as_opts=-vx ;;
-  *v* ) as_opts=-v ;;
-  *x* ) as_opts=-x ;;
-  * ) as_opts= ;;
-esac
-exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
-# Admittedly, this is quite paranoid, since all the known shells bail
-# out after a failed `exec'.
-$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
-exit 255
-fi
-
-    if test x$as_have_required = xno; then :
-  $as_echo "$0: This script requires a shell more modern than all"
-  $as_echo "$0: the shells that I found on your system."
-  if test x${ZSH_VERSION+set} = xset ; then
-    $as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should"
-    $as_echo "$0: be upgraded to zsh 4.3.4 or later."
-  else
-    $as_echo "$0: Please tell bug-autoconf@gnu.org and
-$0: https://github.com/grishka/libtgvoip/issues about your
-$0: system, including any error possibly output before this
-$0: message. Then install a modern shell, or manually run
-$0: the script under such a shell if you do have one."
-  fi
-  exit 1
-fi
-fi
-fi
-SHELL=${CONFIG_SHELL-/bin/sh}
-export SHELL
-# Unset more variables known to interfere with behavior of common tools.
-CLICOLOR_FORCE= GREP_OPTIONS=
-unset CLICOLOR_FORCE GREP_OPTIONS
-
-## --------------------- ##
-## M4sh Shell Functions. ##
-## --------------------- ##
-# as_fn_unset VAR
-# ---------------
-# Portably unset VAR.
-as_fn_unset ()
-{
-  { eval $1=; unset $1;}
-}
-as_unset=as_fn_unset
-
-# as_fn_set_status STATUS
-# -----------------------
-# Set $? to STATUS, without forking.
-as_fn_set_status ()
-{
-  return $1
-} # as_fn_set_status
-
-# as_fn_exit STATUS
-# -----------------
-# Exit the shell with STATUS, even in a "trap 0" or "set -e" context.
-as_fn_exit ()
-{
-  set +e
-  as_fn_set_status $1
-  exit $1
-} # as_fn_exit
-
-# as_fn_mkdir_p
-# -------------
-# Create "$as_dir" as a directory, including parents if necessary.
-as_fn_mkdir_p ()
-{
-
-  case $as_dir in #(
-  -*) as_dir=./$as_dir;;
-  esac
-  test -d "$as_dir" || eval $as_mkdir_p || {
-    as_dirs=
-    while :; do
-      case $as_dir in #(
-      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
-      *) as_qdir=$as_dir;;
-      esac
-      as_dirs="'$as_qdir' $as_dirs"
-      as_dir=`$as_dirname -- "$as_dir" ||
-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$as_dir" : 'X\(//\)[^/]' \| \
-	 X"$as_dir" : 'X\(//\)$' \| \
-	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$as_dir" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)[^/].*/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-      test -d "$as_dir" && break
-    done
-    test -z "$as_dirs" || eval "mkdir $as_dirs"
-  } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
-
-
-} # as_fn_mkdir_p
-
-# as_fn_executable_p FILE
-# -----------------------
-# Test if FILE is an executable regular file.
-as_fn_executable_p ()
-{
-  test -f "$1" && test -x "$1"
-} # as_fn_executable_p
-# as_fn_append VAR VALUE
-# ----------------------
-# Append the text in VALUE to the end of the definition contained in VAR. Take
-# advantage of any shell optimizations that allow amortized linear growth over
-# repeated appends, instead of the typical quadratic growth present in naive
-# implementations.
-if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then :
-  eval 'as_fn_append ()
-  {
-    eval $1+=\$2
-  }'
-else
-  as_fn_append ()
-  {
-    eval $1=\$$1\$2
-  }
-fi # as_fn_append
-
-# as_fn_arith ARG...
-# ------------------
-# Perform arithmetic evaluation on the ARGs, and store the result in the
-# global $as_val. Take advantage of shells that can avoid forks. The arguments
-# must be portable across $(()) and expr.
-if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
-  eval 'as_fn_arith ()
-  {
-    as_val=$(( $* ))
-  }'
-else
-  as_fn_arith ()
-  {
-    as_val=`expr "$@" || test $? -eq 1`
-  }
-fi # as_fn_arith
-
-
-# as_fn_error STATUS ERROR [LINENO LOG_FD]
-# ----------------------------------------
-# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
-# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
-# script with STATUS, using 1 if that was 0.
-as_fn_error ()
-{
-  as_status=$1; test $as_status -eq 0 && as_status=1
-  if test "$4"; then
-    as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-    $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
-  fi
-  $as_echo "$as_me: error: $2" >&2
-  as_fn_exit $as_status
-} # as_fn_error
-
-if expr a : '\(a\)' >/dev/null 2>&1 &&
-   test "X`expr 00001 : '.*\(...\)'`" = X001; then
-  as_expr=expr
-else
-  as_expr=false
-fi
-
-if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
-  as_basename=basename
-else
-  as_basename=false
-fi
-
-if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
-  as_dirname=dirname
-else
-  as_dirname=false
-fi
-
-as_me=`$as_basename -- "$0" ||
-$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
-	 X"$0" : 'X\(//\)$' \| \
-	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X/"$0" |
-    sed '/^.*\/\([^/][^/]*\)\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\/\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\/\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-
-# Avoid depending upon Character Ranges.
-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
-as_cr_digits='0123456789'
-as_cr_alnum=$as_cr_Letters$as_cr_digits
-
-
-  as_lineno_1=$LINENO as_lineno_1a=$LINENO
-  as_lineno_2=$LINENO as_lineno_2a=$LINENO
-  eval 'test "x$as_lineno_1'$as_run'" != "x$as_lineno_2'$as_run'" &&
-  test "x`expr $as_lineno_1'$as_run' + 1`" = "x$as_lineno_2'$as_run'"' || {
-  # Blame Lee E. McMahon (1931-1989) for sed's syntax.  :-)
-  sed -n '
-    p
-    /[$]LINENO/=
-  ' <$as_myself |
-    sed '
-      s/[$]LINENO.*/&-/
-      t lineno
-      b
-      :lineno
-      N
-      :loop
-      s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/
-      t loop
-      s/-\n.*//
-    ' >$as_me.lineno &&
-  chmod +x "$as_me.lineno" ||
-    { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
-
-  # If we had to re-execute with $CONFIG_SHELL, we're ensured to have
-  # already done that, so ensure we don't try to do so again and fall
-  # in an infinite loop.  This has already happened in practice.
-  _as_can_reexec=no; export _as_can_reexec
-  # Don't try to exec as it changes $[0], causing all sort of problems
-  # (the dirname of $[0] is not the place where we might find the
-  # original and so on.  Autoconf is especially sensitive to this).
-  . "./$as_me.lineno"
-  # Exit status is that of the last command.
-  exit
-}
-
-ECHO_C= ECHO_N= ECHO_T=
-case `echo -n x` in #(((((
--n*)
-  case `echo 'xy\c'` in
-  *c*) ECHO_T='	';;	# ECHO_T is single tab character.
-  xy)  ECHO_C='\c';;
-  *)   echo `echo ksh88 bug on AIX 6.1` > /dev/null
-       ECHO_T='	';;
-  esac;;
-*)
-  ECHO_N='-n';;
-esac
-
-rm -f conf$$ conf$$.exe conf$$.file
-if test -d conf$$.dir; then
-  rm -f conf$$.dir/conf$$.file
-else
-  rm -f conf$$.dir
-  mkdir conf$$.dir 2>/dev/null
-fi
-if (echo >conf$$.file) 2>/dev/null; then
-  if ln -s conf$$.file conf$$ 2>/dev/null; then
-    as_ln_s='ln -s'
-    # ... but there are two gotchas:
-    # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
-    # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-    # In both cases, we have to default to `cp -pR'.
-    ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
-      as_ln_s='cp -pR'
-  elif ln conf$$.file conf$$ 2>/dev/null; then
-    as_ln_s=ln
-  else
-    as_ln_s='cp -pR'
-  fi
-else
-  as_ln_s='cp -pR'
-fi
-rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
-rmdir conf$$.dir 2>/dev/null
-
-if mkdir -p . 2>/dev/null; then
-  as_mkdir_p='mkdir -p "$as_dir"'
-else
-  test -d ./-p && rmdir ./-p
-  as_mkdir_p=false
-fi
-
-as_test_x='test -x'
-as_executable_p=as_fn_executable_p
-
-# Sed expression to map a string onto a valid CPP name.
-as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
-
-# Sed expression to map a string onto a valid variable name.
-as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
-
-SHELL=${CONFIG_SHELL-/bin/sh}
-
-
-test -n "$DJDIR" || exec 7<&0 </dev/null
-exec 6>&1
-
-# Name of the host.
-# hostname on some systems (SVR3.2, old GNU/Linux) returns a bogus exit status,
-# so uname gets run too.
-ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
-
-#
-# Initializations.
-#
-ac_default_prefix=/usr/local
-ac_clean_files=
-ac_config_libobj_dir=.
-LIBOBJS=
-cross_compiling=no
-subdirs=
-MFLAGS=
-MAKEFLAGS=
-
-# Identity of this package.
-PACKAGE_NAME='libtgvoip'
-PACKAGE_TARNAME='libtgvoip'
-PACKAGE_VERSION='2.4.4'
-PACKAGE_STRING='libtgvoip 2.4.4'
-PACKAGE_BUGREPORT='https://github.com/grishka/libtgvoip/issues'
-PACKAGE_URL=''
-
-ac_unique_file="config.h.in"
-# Factoring default headers for most tests.
-ac_includes_default="\
-#include <stdio.h>
-#ifdef HAVE_SYS_TYPES_H
-# include <sys/types.h>
-#endif
-#ifdef HAVE_SYS_STAT_H
-# include <sys/stat.h>
-#endif
-#ifdef STDC_HEADERS
-# include <stdlib.h>
-# include <stddef.h>
-#else
-# ifdef HAVE_STDLIB_H
-#  include <stdlib.h>
-# endif
-#endif
-#ifdef HAVE_STRING_H
-# if !defined STDC_HEADERS && defined HAVE_MEMORY_H
-#  include <memory.h>
-# endif
-# include <string.h>
-#endif
-#ifdef HAVE_STRINGS_H
-# include <strings.h>
-#endif
-#ifdef HAVE_INTTYPES_H
-# include <inttypes.h>
-#endif
-#ifdef HAVE_STDINT_H
-# include <stdint.h>
-#endif
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
-#endif"
-
-ac_subst_vars='am__EXEEXT_FALSE
-am__EXEEXT_TRUE
-LTLIBOBJS
-LIBOBJS
-ALLOCA
-ENABLE_DSP_FALSE
-ENABLE_DSP_TRUE
-WITH_ALSA_FALSE
-WITH_ALSA_TRUE
-WITH_PULSE_FALSE
-WITH_PULSE_TRUE
-ENABLE_AUDIO_CALLBACK_FALSE
-ENABLE_AUDIO_CALLBACK_TRUE
-TARGET_OS_OSX_FALSE
-TARGET_OS_OSX_TRUE
-TARGET_CPU_ARMV7_FALSE
-TARGET_CPU_ARMV7_TRUE
-TARGET_CPU_ARM_FALSE
-TARGET_CPU_ARM_TRUE
-TARGET_CPU_X86_FALSE
-TARGET_CPU_X86_TRUE
-am__fastdepCCAS_FALSE
-am__fastdepCCAS_TRUE
-CCASDEPMODE
-CCASFLAGS
-CCAS
-am__fastdepOBJCXX_FALSE
-am__fastdepOBJCXX_TRUE
-OBJCXXDEPMODE
-ac_ct_OBJCXX
-OBJCXXFLAGS
-OBJCXX
-CXXCPP
-am__fastdepCXX_FALSE
-am__fastdepCXX_TRUE
-CXXDEPMODE
-ac_ct_CXX
-CXXFLAGS
-CXX
-CPP
-LT_SYS_LIBRARY_PATH
-OTOOL64
-OTOOL
-LIPO
-NMEDIT
-DSYMUTIL
-MANIFEST_TOOL
-RANLIB
-ac_ct_AR
-AR
-DLLTOOL
-OBJDUMP
-LN_S
-NM
-ac_ct_DUMPBIN
-DUMPBIN
-LD
-FGREP
-EGREP
-GREP
-SED
-am__fastdepCC_FALSE
-am__fastdepCC_TRUE
-CCDEPMODE
-am__nodep
-AMDEPBACKSLASH
-AMDEP_FALSE
-AMDEP_TRUE
-am__include
-DEPDIR
-OBJEXT
-EXEEXT
-ac_ct_CC
-CPPFLAGS
-LDFLAGS
-CFLAGS
-CC
-host_os
-host_vendor
-host_cpu
-host
-build_os
-build_vendor
-build_cpu
-build
-LIBTOOL
-AM_BACKSLASH
-AM_DEFAULT_VERBOSITY
-AM_DEFAULT_V
-AM_V
-am__untar
-am__tar
-AMTAR
-am__leading_dot
-SET_MAKE
-AWK
-mkdir_p
-MKDIR_P
-INSTALL_STRIP_PROGRAM
-STRIP
-install_sh
-MAKEINFO
-AUTOHEADER
-AUTOMAKE
-AUTOCONF
-ACLOCAL
-VERSION
-PACKAGE
-CYGPATH_W
-am__isrc
-INSTALL_DATA
-INSTALL_SCRIPT
-INSTALL_PROGRAM
-target_alias
-host_alias
-build_alias
-LIBS
-ECHO_T
-ECHO_N
-ECHO_C
-DEFS
-mandir
-localedir
-libdir
-psdir
-pdfdir
-dvidir
-htmldir
-infodir
-docdir
-oldincludedir
-includedir
-localstatedir
-sharedstatedir
-sysconfdir
-datadir
-datarootdir
-libexecdir
-sbindir
-bindir
-program_transform_name
-prefix
-exec_prefix
-PACKAGE_URL
-PACKAGE_BUGREPORT
-PACKAGE_STRING
-PACKAGE_VERSION
-PACKAGE_TARNAME
-PACKAGE_NAME
-PATH_SEPARATOR
-SHELL
-am__quote'
-ac_subst_files=''
-ac_user_opts='
-enable_option_checking
-enable_silent_rules
-enable_shared
-enable_static
-with_pic
-enable_fast_install
-with_aix_soname
-enable_dependency_tracking
-with_gnu_ld
-with_sysroot
-enable_libtool_lock
-enable_audio_callback
-with_pulse
-with_alsa
-enable_dsp
-'
-      ac_precious_vars='build_alias
-host_alias
-target_alias
-CC
-CFLAGS
-LDFLAGS
-LIBS
-CPPFLAGS
-LT_SYS_LIBRARY_PATH
-CPP
-CXX
-CXXFLAGS
-CCC
-CXXCPP
-OBJCXX
-OBJCXXFLAGS
-CCAS
-CCASFLAGS'
-
-
-# Initialize some variables set by options.
-ac_init_help=
-ac_init_version=false
-ac_unrecognized_opts=
-ac_unrecognized_sep=
-# The variables have the same names as the options, with
-# dashes changed to underlines.
-cache_file=/dev/null
-exec_prefix=NONE
-no_create=
-no_recursion=
-prefix=NONE
-program_prefix=NONE
-program_suffix=NONE
-program_transform_name=s,x,x,
-silent=
-site=
-srcdir=
-verbose=
-x_includes=NONE
-x_libraries=NONE
-
-# Installation directory options.
-# These are left unexpanded so users can "make install exec_prefix=/foo"
-# and all the variables that are supposed to be based on exec_prefix
-# by default will actually change.
-# Use braces instead of parens because sh, perl, etc. also accept them.
-# (The list follows the same order as the GNU Coding Standards.)
-bindir='${exec_prefix}/bin'
-sbindir='${exec_prefix}/sbin'
-libexecdir='${exec_prefix}/libexec'
-datarootdir='${prefix}/share'
-datadir='${datarootdir}'
-sysconfdir='${prefix}/etc'
-sharedstatedir='${prefix}/com'
-localstatedir='${prefix}/var'
-includedir='${prefix}/include'
-oldincludedir='/usr/include'
-docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
-infodir='${datarootdir}/info'
-htmldir='${docdir}'
-dvidir='${docdir}'
-pdfdir='${docdir}'
-psdir='${docdir}'
-libdir='${exec_prefix}/lib'
-localedir='${datarootdir}/locale'
-mandir='${datarootdir}/man'
-
-ac_prev=
-ac_dashdash=
-for ac_option
-do
-  # If the previous option needs an argument, assign it.
-  if test -n "$ac_prev"; then
-    eval $ac_prev=\$ac_option
-    ac_prev=
-    continue
-  fi
-
-  case $ac_option in
-  *=?*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
-  *=)   ac_optarg= ;;
-  *)    ac_optarg=yes ;;
-  esac
-
-  # Accept the important Cygnus configure options, so we can diagnose typos.
-
-  case $ac_dashdash$ac_option in
-  --)
-    ac_dashdash=yes ;;
-
-  -bindir | --bindir | --bindi | --bind | --bin | --bi)
-    ac_prev=bindir ;;
-  -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*)
-    bindir=$ac_optarg ;;
-
-  -build | --build | --buil | --bui | --bu)
-    ac_prev=build_alias ;;
-  -build=* | --build=* | --buil=* | --bui=* | --bu=*)
-    build_alias=$ac_optarg ;;
-
-  -cache-file | --cache-file | --cache-fil | --cache-fi \
-  | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c)
-    ac_prev=cache_file ;;
-  -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \
-  | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*)
-    cache_file=$ac_optarg ;;
-
-  --config-cache | -C)
-    cache_file=config.cache ;;
-
-  -datadir | --datadir | --datadi | --datad)
-    ac_prev=datadir ;;
-  -datadir=* | --datadir=* | --datadi=* | --datad=*)
-    datadir=$ac_optarg ;;
-
-  -datarootdir | --datarootdir | --datarootdi | --datarootd | --dataroot \
-  | --dataroo | --dataro | --datar)
-    ac_prev=datarootdir ;;
-  -datarootdir=* | --datarootdir=* | --datarootdi=* | --datarootd=* \
-  | --dataroot=* | --dataroo=* | --dataro=* | --datar=*)
-    datarootdir=$ac_optarg ;;
-
-  -disable-* | --disable-*)
-    ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
-    # Reject names that are not valid shell variable names.
-    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      as_fn_error $? "invalid feature name: $ac_useropt"
-    ac_useropt_orig=$ac_useropt
-    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
-    case $ac_user_opts in
-      *"
-"enable_$ac_useropt"
-"*) ;;
-      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--disable-$ac_useropt_orig"
-	 ac_unrecognized_sep=', ';;
-    esac
-    eval enable_$ac_useropt=no ;;
-
-  -docdir | --docdir | --docdi | --doc | --do)
-    ac_prev=docdir ;;
-  -docdir=* | --docdir=* | --docdi=* | --doc=* | --do=*)
-    docdir=$ac_optarg ;;
-
-  -dvidir | --dvidir | --dvidi | --dvid | --dvi | --dv)
-    ac_prev=dvidir ;;
-  -dvidir=* | --dvidir=* | --dvidi=* | --dvid=* | --dvi=* | --dv=*)
-    dvidir=$ac_optarg ;;
-
-  -enable-* | --enable-*)
-    ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
-    # Reject names that are not valid shell variable names.
-    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      as_fn_error $? "invalid feature name: $ac_useropt"
-    ac_useropt_orig=$ac_useropt
-    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
-    case $ac_user_opts in
-      *"
-"enable_$ac_useropt"
-"*) ;;
-      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--enable-$ac_useropt_orig"
-	 ac_unrecognized_sep=', ';;
-    esac
-    eval enable_$ac_useropt=\$ac_optarg ;;
-
-  -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
-  | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
-  | --exec | --exe | --ex)
-    ac_prev=exec_prefix ;;
-  -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \
-  | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \
-  | --exec=* | --exe=* | --ex=*)
-    exec_prefix=$ac_optarg ;;
-
-  -gas | --gas | --ga | --g)
-    # Obsolete; use --with-gas.
-    with_gas=yes ;;
-
-  -help | --help | --hel | --he | -h)
-    ac_init_help=long ;;
-  -help=r* | --help=r* | --hel=r* | --he=r* | -hr*)
-    ac_init_help=recursive ;;
-  -help=s* | --help=s* | --hel=s* | --he=s* | -hs*)
-    ac_init_help=short ;;
-
-  -host | --host | --hos | --ho)
-    ac_prev=host_alias ;;
-  -host=* | --host=* | --hos=* | --ho=*)
-    host_alias=$ac_optarg ;;
-
-  -htmldir | --htmldir | --htmldi | --htmld | --html | --htm | --ht)
-    ac_prev=htmldir ;;
-  -htmldir=* | --htmldir=* | --htmldi=* | --htmld=* | --html=* | --htm=* \
-  | --ht=*)
-    htmldir=$ac_optarg ;;
-
-  -includedir | --includedir | --includedi | --included | --include \
-  | --includ | --inclu | --incl | --inc)
-    ac_prev=includedir ;;
-  -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \
-  | --includ=* | --inclu=* | --incl=* | --inc=*)
-    includedir=$ac_optarg ;;
-
-  -infodir | --infodir | --infodi | --infod | --info | --inf)
-    ac_prev=infodir ;;
-  -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*)
-    infodir=$ac_optarg ;;
-
-  -libdir | --libdir | --libdi | --libd)
-    ac_prev=libdir ;;
-  -libdir=* | --libdir=* | --libdi=* | --libd=*)
-    libdir=$ac_optarg ;;
-
-  -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \
-  | --libexe | --libex | --libe)
-    ac_prev=libexecdir ;;
-  -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \
-  | --libexe=* | --libex=* | --libe=*)
-    libexecdir=$ac_optarg ;;
-
-  -localedir | --localedir | --localedi | --localed | --locale)
-    ac_prev=localedir ;;
-  -localedir=* | --localedir=* | --localedi=* | --localed=* | --locale=*)
-    localedir=$ac_optarg ;;
-
-  -localstatedir | --localstatedir | --localstatedi | --localstated \
-  | --localstate | --localstat | --localsta | --localst | --locals)
-    ac_prev=localstatedir ;;
-  -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \
-  | --localstate=* | --localstat=* | --localsta=* | --localst=* | --locals=*)
-    localstatedir=$ac_optarg ;;
-
-  -mandir | --mandir | --mandi | --mand | --man | --ma | --m)
-    ac_prev=mandir ;;
-  -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*)
-    mandir=$ac_optarg ;;
-
-  -nfp | --nfp | --nf)
-    # Obsolete; use --without-fp.
-    with_fp=no ;;
-
-  -no-create | --no-create | --no-creat | --no-crea | --no-cre \
-  | --no-cr | --no-c | -n)
-    no_create=yes ;;
-
-  -no-recursion | --no-recursion | --no-recursio | --no-recursi \
-  | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r)
-    no_recursion=yes ;;
-
-  -oldincludedir | --oldincludedir | --oldincludedi | --oldincluded \
-  | --oldinclude | --oldinclud | --oldinclu | --oldincl | --oldinc \
-  | --oldin | --oldi | --old | --ol | --o)
-    ac_prev=oldincludedir ;;
-  -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \
-  | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \
-  | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*)
-    oldincludedir=$ac_optarg ;;
-
-  -prefix | --prefix | --prefi | --pref | --pre | --pr | --p)
-    ac_prev=prefix ;;
-  -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*)
-    prefix=$ac_optarg ;;
-
-  -program-prefix | --program-prefix | --program-prefi | --program-pref \
-  | --program-pre | --program-pr | --program-p)
-    ac_prev=program_prefix ;;
-  -program-prefix=* | --program-prefix=* | --program-prefi=* \
-  | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*)
-    program_prefix=$ac_optarg ;;
-
-  -program-suffix | --program-suffix | --program-suffi | --program-suff \
-  | --program-suf | --program-su | --program-s)
-    ac_prev=program_suffix ;;
-  -program-suffix=* | --program-suffix=* | --program-suffi=* \
-  | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*)
-    program_suffix=$ac_optarg ;;
-
-  -program-transform-name | --program-transform-name \
-  | --program-transform-nam | --program-transform-na \
-  | --program-transform-n | --program-transform- \
-  | --program-transform | --program-transfor \
-  | --program-transfo | --program-transf \
-  | --program-trans | --program-tran \
-  | --progr-tra | --program-tr | --program-t)
-    ac_prev=program_transform_name ;;
-  -program-transform-name=* | --program-transform-name=* \
-  | --program-transform-nam=* | --program-transform-na=* \
-  | --program-transform-n=* | --program-transform-=* \
-  | --program-transform=* | --program-transfor=* \
-  | --program-transfo=* | --program-transf=* \
-  | --program-trans=* | --program-tran=* \
-  | --progr-tra=* | --program-tr=* | --program-t=*)
-    program_transform_name=$ac_optarg ;;
-
-  -pdfdir | --pdfdir | --pdfdi | --pdfd | --pdf | --pd)
-    ac_prev=pdfdir ;;
-  -pdfdir=* | --pdfdir=* | --pdfdi=* | --pdfd=* | --pdf=* | --pd=*)
-    pdfdir=$ac_optarg ;;
-
-  -psdir | --psdir | --psdi | --psd | --ps)
-    ac_prev=psdir ;;
-  -psdir=* | --psdir=* | --psdi=* | --psd=* | --ps=*)
-    psdir=$ac_optarg ;;
-
-  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-  | -silent | --silent | --silen | --sile | --sil)
-    silent=yes ;;
-
-  -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
-    ac_prev=sbindir ;;
-  -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
-  | --sbi=* | --sb=*)
-    sbindir=$ac_optarg ;;
-
-  -sharedstatedir | --sharedstatedir | --sharedstatedi \
-  | --sharedstated | --sharedstate | --sharedstat | --sharedsta \
-  | --sharedst | --shareds | --shared | --share | --shar \
-  | --sha | --sh)
-    ac_prev=sharedstatedir ;;
-  -sharedstatedir=* | --sharedstatedir=* | --sharedstatedi=* \
-  | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \
-  | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \
-  | --sha=* | --sh=*)
-    sharedstatedir=$ac_optarg ;;
-
-  -site | --site | --sit)
-    ac_prev=site ;;
-  -site=* | --site=* | --sit=*)
-    site=$ac_optarg ;;
-
-  -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
-    ac_prev=srcdir ;;
-  -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
-    srcdir=$ac_optarg ;;
-
-  -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \
-  | --syscon | --sysco | --sysc | --sys | --sy)
-    ac_prev=sysconfdir ;;
-  -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \
-  | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*)
-    sysconfdir=$ac_optarg ;;
-
-  -target | --target | --targe | --targ | --tar | --ta | --t)
-    ac_prev=target_alias ;;
-  -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*)
-    target_alias=$ac_optarg ;;
-
-  -v | -verbose | --verbose | --verbos | --verbo | --verb)
-    verbose=yes ;;
-
-  -version | --version | --versio | --versi | --vers | -V)
-    ac_init_version=: ;;
-
-  -with-* | --with-*)
-    ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
-    # Reject names that are not valid shell variable names.
-    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      as_fn_error $? "invalid package name: $ac_useropt"
-    ac_useropt_orig=$ac_useropt
-    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
-    case $ac_user_opts in
-      *"
-"with_$ac_useropt"
-"*) ;;
-      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--with-$ac_useropt_orig"
-	 ac_unrecognized_sep=', ';;
-    esac
-    eval with_$ac_useropt=\$ac_optarg ;;
-
-  -without-* | --without-*)
-    ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
-    # Reject names that are not valid shell variable names.
-    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      as_fn_error $? "invalid package name: $ac_useropt"
-    ac_useropt_orig=$ac_useropt
-    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
-    case $ac_user_opts in
-      *"
-"with_$ac_useropt"
-"*) ;;
-      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--without-$ac_useropt_orig"
-	 ac_unrecognized_sep=', ';;
-    esac
-    eval with_$ac_useropt=no ;;
-
-  --x)
-    # Obsolete; use --with-x.
-    with_x=yes ;;
-
-  -x-includes | --x-includes | --x-include | --x-includ | --x-inclu \
-  | --x-incl | --x-inc | --x-in | --x-i)
-    ac_prev=x_includes ;;
-  -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \
-  | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*)
-    x_includes=$ac_optarg ;;
-
-  -x-libraries | --x-libraries | --x-librarie | --x-librari \
-  | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l)
-    ac_prev=x_libraries ;;
-  -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \
-  | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
-    x_libraries=$ac_optarg ;;
-
-  -*) as_fn_error $? "unrecognized option: \`$ac_option'
-Try \`$0 --help' for more information"
-    ;;
-
-  *=*)
-    ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='`
-    # Reject names that are not valid shell variable names.
-    case $ac_envvar in #(
-      '' | [0-9]* | *[!_$as_cr_alnum]* )
-      as_fn_error $? "invalid variable name: \`$ac_envvar'" ;;
-    esac
-    eval $ac_envvar=\$ac_optarg
-    export $ac_envvar ;;
-
-  *)
-    # FIXME: should be removed in autoconf 3.0.
-    $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2
-    expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-      $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2
-    : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}"
-    ;;
-
-  esac
-done
-
-if test -n "$ac_prev"; then
-  ac_option=--`echo $ac_prev | sed 's/_/-/g'`
-  as_fn_error $? "missing argument to $ac_option"
-fi
-
-if test -n "$ac_unrecognized_opts"; then
-  case $enable_option_checking in
-    no) ;;
-    fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;;
-    *)     $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
-  esac
-fi
-
-# Check all directory arguments for consistency.
-for ac_var in	exec_prefix prefix bindir sbindir libexecdir datarootdir \
-		datadir sysconfdir sharedstatedir localstatedir includedir \
-		oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
-		libdir localedir mandir
-do
-  eval ac_val=\$$ac_var
-  # Remove trailing slashes.
-  case $ac_val in
-    */ )
-      ac_val=`expr "X$ac_val" : 'X\(.*[^/]\)' \| "X$ac_val" : 'X\(.*\)'`
-      eval $ac_var=\$ac_val;;
-  esac
-  # Be sure to have absolute directory names.
-  case $ac_val in
-    [\\/$]* | ?:[\\/]* )  continue;;
-    NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
-  esac
-  as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val"
-done
-
-# There might be people who depend on the old broken behavior: `$host'
-# used to hold the argument of --host etc.
-# FIXME: To remove some day.
-build=$build_alias
-host=$host_alias
-target=$target_alias
-
-# FIXME: To remove some day.
-if test "x$host_alias" != x; then
-  if test "x$build_alias" = x; then
-    cross_compiling=maybe
-  elif test "x$build_alias" != "x$host_alias"; then
-    cross_compiling=yes
-  fi
-fi
-
-ac_tool_prefix=
-test -n "$host_alias" && ac_tool_prefix=$host_alias-
-
-test "$silent" = yes && exec 6>/dev/null
-
-
-ac_pwd=`pwd` && test -n "$ac_pwd" &&
-ac_ls_di=`ls -di .` &&
-ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
-  as_fn_error $? "working directory cannot be determined"
-test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
-  as_fn_error $? "pwd does not report name of working directory"
-
-
-# Find the source files, if location was not specified.
-if test -z "$srcdir"; then
-  ac_srcdir_defaulted=yes
-  # Try the directory containing this script, then the parent directory.
-  ac_confdir=`$as_dirname -- "$as_myself" ||
-$as_expr X"$as_myself" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$as_myself" : 'X\(//\)[^/]' \| \
-	 X"$as_myself" : 'X\(//\)$' \| \
-	 X"$as_myself" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$as_myself" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)[^/].*/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-  srcdir=$ac_confdir
-  if test ! -r "$srcdir/$ac_unique_file"; then
-    srcdir=..
-  fi
-else
-  ac_srcdir_defaulted=no
-fi
-if test ! -r "$srcdir/$ac_unique_file"; then
-  test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
-  as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir"
-fi
-ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
-ac_abs_confdir=`(
-	cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg"
-	pwd)`
-# When building in place, set srcdir=.
-if test "$ac_abs_confdir" = "$ac_pwd"; then
-  srcdir=.
-fi
-# Remove unnecessary trailing slashes from srcdir.
-# Double slashes in file names in object file debugging info
-# mess up M-x gdb in Emacs.
-case $srcdir in
-*/) srcdir=`expr "X$srcdir" : 'X\(.*[^/]\)' \| "X$srcdir" : 'X\(.*\)'`;;
-esac
-for ac_var in $ac_precious_vars; do
-  eval ac_env_${ac_var}_set=\${${ac_var}+set}
-  eval ac_env_${ac_var}_value=\$${ac_var}
-  eval ac_cv_env_${ac_var}_set=\${${ac_var}+set}
-  eval ac_cv_env_${ac_var}_value=\$${ac_var}
-done
-
-#
-# Report the --help message.
-#
-if test "$ac_init_help" = "long"; then
-  # Omit some internal or obsolete options to make the list less imposing.
-  # This message is too long to be a string in the A/UX 3.1 sh.
-  cat <<_ACEOF
-\`configure' configures libtgvoip 2.4.4 to adapt to many kinds of systems.
-
-Usage: $0 [OPTION]... [VAR=VALUE]...
-
-To assign environment variables (e.g., CC, CFLAGS...), specify them as
-VAR=VALUE.  See below for descriptions of some of the useful variables.
-
-Defaults for the options are specified in brackets.
-
-Configuration:
-  -h, --help              display this help and exit
-      --help=short        display options specific to this package
-      --help=recursive    display the short help of all the included packages
-  -V, --version           display version information and exit
-  -q, --quiet, --silent   do not print \`checking ...' messages
-      --cache-file=FILE   cache test results in FILE [disabled]
-  -C, --config-cache      alias for \`--cache-file=config.cache'
-  -n, --no-create         do not create output files
-      --srcdir=DIR        find the sources in DIR [configure dir or \`..']
-
-Installation directories:
-  --prefix=PREFIX         install architecture-independent files in PREFIX
-                          [$ac_default_prefix]
-  --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
-                          [PREFIX]
-
-By default, \`make install' will install all the files in
-\`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc.  You can specify
-an installation prefix other than \`$ac_default_prefix' using \`--prefix',
-for instance \`--prefix=\$HOME'.
-
-For better control, use the options below.
-
-Fine tuning of the installation directories:
-  --bindir=DIR            user executables [EPREFIX/bin]
-  --sbindir=DIR           system admin executables [EPREFIX/sbin]
-  --libexecdir=DIR        program executables [EPREFIX/libexec]
-  --sysconfdir=DIR        read-only single-machine data [PREFIX/etc]
-  --sharedstatedir=DIR    modifiable architecture-independent data [PREFIX/com]
-  --localstatedir=DIR     modifiable single-machine data [PREFIX/var]
-  --libdir=DIR            object code libraries [EPREFIX/lib]
-  --includedir=DIR        C header files [PREFIX/include]
-  --oldincludedir=DIR     C header files for non-gcc [/usr/include]
-  --datarootdir=DIR       read-only arch.-independent data root [PREFIX/share]
-  --datadir=DIR           read-only architecture-independent data [DATAROOTDIR]
-  --infodir=DIR           info documentation [DATAROOTDIR/info]
-  --localedir=DIR         locale-dependent data [DATAROOTDIR/locale]
-  --mandir=DIR            man documentation [DATAROOTDIR/man]
-  --docdir=DIR            documentation root [DATAROOTDIR/doc/libtgvoip]
-  --htmldir=DIR           html documentation [DOCDIR]
-  --dvidir=DIR            dvi documentation [DOCDIR]
-  --pdfdir=DIR            pdf documentation [DOCDIR]
-  --psdir=DIR             ps documentation [DOCDIR]
-_ACEOF
-
-  cat <<\_ACEOF
-
-Program names:
-  --program-prefix=PREFIX            prepend PREFIX to installed program names
-  --program-suffix=SUFFIX            append SUFFIX to installed program names
-  --program-transform-name=PROGRAM   run sed PROGRAM on installed program names
-
-System types:
-  --build=BUILD     configure for building on BUILD [guessed]
-  --host=HOST       cross-compile to build programs to run on HOST [BUILD]
-_ACEOF
-fi
-
-if test -n "$ac_init_help"; then
-  case $ac_init_help in
-     short | recursive ) echo "Configuration of libtgvoip 2.4.4:";;
-   esac
-  cat <<\_ACEOF
-
-Optional Features:
-  --disable-option-checking  ignore unrecognized --enable/--with options
-  --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
-  --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
-  --enable-silent-rules   less verbose build output (undo: "make V=1")
-  --disable-silent-rules  verbose build output (undo: "make V=0")
-  --enable-shared[=PKGS]  build shared libraries [default=yes]
-  --enable-static[=PKGS]  build static libraries [default=yes]
-  --enable-fast-install[=PKGS]
-                          optimize for fast installation [default=yes]
-  --enable-dependency-tracking
-                          do not reject slow dependency extractors
-  --disable-dependency-tracking
-                          speeds up one-time build
-  --disable-libtool-lock  avoid locking (might break parallel builds)
-  --enable-audio-callback enable callback-based audio I/O
-  --disable-dsp           disable signal processing (echo cancellation, noise
-                          suppression, and automatic gain control)
-
-Optional Packages:
-  --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
-  --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
-  --with-pic[=PKGS]       try to use only PIC/non-PIC objects [default=use
-                          both]
-  --with-aix-soname=aix|svr4|both
-                          shared library versioning (aka "SONAME") variant to
-                          provide on AIX, [default=aix].
-  --with-gnu-ld           assume the C compiler uses GNU ld [default=no]
-  --with-sysroot[=DIR]    Search for dependent libraries within DIR (or the
-                          compiler's sysroot if not specified).
-  --without-pulse         disable PulseAudio support
-  --without-alsa          disable ALSA support
-
-Some influential environment variables:
-  CC          C compiler command
-  CFLAGS      C compiler flags
-  LDFLAGS     linker flags, e.g. -L<lib dir> if you have libraries in a
-              nonstandard directory <lib dir>
-  LIBS        libraries to pass to the linker, e.g. -l<library>
-  CPPFLAGS    (Objective) C/C++ preprocessor flags, e.g. -I<include dir> if
-              you have headers in a nonstandard directory <include dir>
-  LT_SYS_LIBRARY_PATH
-              User-defined run-time library search path.
-  CPP         C preprocessor
-  CXX         C++ compiler command
-  CXXFLAGS    C++ compiler flags
-  CXXCPP      C++ preprocessor
-  OBJCXX      Objective C++ compiler command
-  OBJCXXFLAGS Objective C++ compiler flags
-  CCAS        assembler compiler command (defaults to CC)
-  CCASFLAGS   assembler compiler flags (defaults to CFLAGS)
-
-Use these variables to override the choices made by `configure' or to help
-it to find libraries and programs with nonstandard names/locations.
-
-Report bugs to <https://github.com/grishka/libtgvoip/issues>.
-_ACEOF
-ac_status=$?
-fi
-
-if test "$ac_init_help" = "recursive"; then
-  # If there are subdirs, report their specific --help.
-  for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue
-    test -d "$ac_dir" ||
-      { cd "$srcdir" && ac_pwd=`pwd` && srcdir=. && test -d "$ac_dir"; } ||
-      continue
-    ac_builddir=.
-
-case "$ac_dir" in
-.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
-*)
-  ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
-  # A ".." for each directory in $ac_dir_suffix.
-  ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
-  case $ac_top_builddir_sub in
-  "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
-  *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
-  esac ;;
-esac
-ac_abs_top_builddir=$ac_pwd
-ac_abs_builddir=$ac_pwd$ac_dir_suffix
-# for backward compatibility:
-ac_top_builddir=$ac_top_build_prefix
-
-case $srcdir in
-  .)  # We are building in place.
-    ac_srcdir=.
-    ac_top_srcdir=$ac_top_builddir_sub
-    ac_abs_top_srcdir=$ac_pwd ;;
-  [\\/]* | ?:[\\/]* )  # Absolute name.
-    ac_srcdir=$srcdir$ac_dir_suffix;
-    ac_top_srcdir=$srcdir
-    ac_abs_top_srcdir=$srcdir ;;
-  *) # Relative name.
-    ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
-    ac_top_srcdir=$ac_top_build_prefix$srcdir
-    ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
-esac
-ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
-
-    cd "$ac_dir" || { ac_status=$?; continue; }
-    # Check for guested configure.
-    if test -f "$ac_srcdir/configure.gnu"; then
-      echo &&
-      $SHELL "$ac_srcdir/configure.gnu" --help=recursive
-    elif test -f "$ac_srcdir/configure"; then
-      echo &&
-      $SHELL "$ac_srcdir/configure" --help=recursive
-    else
-      $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
-    fi || ac_status=$?
-    cd "$ac_pwd" || { ac_status=$?; break; }
-  done
-fi
-
-test -n "$ac_init_help" && exit $ac_status
-if $ac_init_version; then
-  cat <<\_ACEOF
-libtgvoip configure 2.4.4
-generated by GNU Autoconf 2.69
-
-Copyright (C) 2012 Free Software Foundation, Inc.
-This configure script is free software; the Free Software Foundation
-gives unlimited permission to copy, distribute and modify it.
-_ACEOF
-  exit
-fi
-
-## ------------------------ ##
-## Autoconf initialization. ##
-## ------------------------ ##
-
-# ac_fn_c_try_compile LINENO
-# --------------------------
-# Try to compile conftest.$ac_ext, and return whether this succeeded.
-ac_fn_c_try_compile ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  rm -f conftest.$ac_objext
-  if { { ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_compile") 2>conftest.err
-  ac_status=$?
-  if test -s conftest.err; then
-    grep -v '^ *+' conftest.err >conftest.er1
-    cat conftest.er1 >&5
-    mv -f conftest.er1 conftest.err
-  fi
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then :
-  ac_retval=0
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_retval=1
-fi
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
-  as_fn_set_status $ac_retval
-
-} # ac_fn_c_try_compile
-
-# ac_fn_c_try_link LINENO
-# -----------------------
-# Try to link conftest.$ac_ext, and return whether this succeeded.
-ac_fn_c_try_link ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  rm -f conftest.$ac_objext conftest$ac_exeext
-  if { { ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_link") 2>conftest.err
-  ac_status=$?
-  if test -s conftest.err; then
-    grep -v '^ *+' conftest.err >conftest.er1
-    cat conftest.er1 >&5
-    mv -f conftest.er1 conftest.err
-  fi
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 test -x conftest$ac_exeext
-       }; then :
-  ac_retval=0
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_retval=1
-fi
-  # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information
-  # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would
-  # interfere with the next link command; also delete a directory that is
-  # left behind by Apple's compiler.  We do this before executing the actions.
-  rm -rf conftest.dSYM conftest_ipa8_conftest.oo
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
-  as_fn_set_status $ac_retval
-
-} # ac_fn_c_try_link
-
-# ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES
-# -------------------------------------------------------
-# Tests whether HEADER exists and can be compiled using the include files in
-# INCLUDES, setting the cache variable VAR accordingly.
-ac_fn_c_check_header_compile ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
-$as_echo_n "checking for $2... " >&6; }
-if eval \${$3+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-$4
-#include <$2>
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  eval "$3=yes"
-else
-  eval "$3=no"
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-eval ac_res=\$$3
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
-
-} # ac_fn_c_check_header_compile
-
-# ac_fn_c_try_cpp LINENO
-# ----------------------
-# Try to preprocess conftest.$ac_ext, and return whether this succeeded.
-ac_fn_c_try_cpp ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  if { { ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err
-  ac_status=$?
-  if test -s conftest.err; then
-    grep -v '^ *+' conftest.err >conftest.er1
-    cat conftest.er1 >&5
-    mv -f conftest.er1 conftest.err
-  fi
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } > conftest.i && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       }; then :
-  ac_retval=0
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-    ac_retval=1
-fi
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
-  as_fn_set_status $ac_retval
-
-} # ac_fn_c_try_cpp
-
-# ac_fn_c_try_run LINENO
-# ----------------------
-# Try to link conftest.$ac_ext, and return whether this succeeded. Assumes
-# that executables *can* be run.
-ac_fn_c_try_run ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  if { { ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } && { ac_try='./conftest$ac_exeext'
-  { { case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; }; then :
-  ac_retval=0
-else
-  $as_echo "$as_me: program exited with status $ac_status" >&5
-       $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-       ac_retval=$ac_status
-fi
-  rm -rf conftest.dSYM conftest_ipa8_conftest.oo
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
-  as_fn_set_status $ac_retval
-
-} # ac_fn_c_try_run
-
-# ac_fn_c_check_func LINENO FUNC VAR
-# ----------------------------------
-# Tests whether FUNC exists, setting the cache variable VAR accordingly
-ac_fn_c_check_func ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
-$as_echo_n "checking for $2... " >&6; }
-if eval \${$3+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-/* Define $2 to an innocuous variant, in case <limits.h> declares $2.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define $2 innocuous_$2
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $2 (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef $2
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char $2 ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined __stub_$2 || defined __stub___$2
-choke me
-#endif
-
-int
-main ()
-{
-return $2 ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  eval "$3=yes"
-else
-  eval "$3=no"
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-fi
-eval ac_res=\$$3
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
-
-} # ac_fn_c_check_func
-
-# ac_fn_cxx_try_compile LINENO
-# ----------------------------
-# Try to compile conftest.$ac_ext, and return whether this succeeded.
-ac_fn_cxx_try_compile ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  rm -f conftest.$ac_objext
-  if { { ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_compile") 2>conftest.err
-  ac_status=$?
-  if test -s conftest.err; then
-    grep -v '^ *+' conftest.err >conftest.er1
-    cat conftest.er1 >&5
-    mv -f conftest.er1 conftest.err
-  fi
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } && {
-	 test -z "$ac_cxx_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then :
-  ac_retval=0
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_retval=1
-fi
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
-  as_fn_set_status $ac_retval
-
-} # ac_fn_cxx_try_compile
-
-# ac_fn_cxx_try_cpp LINENO
-# ------------------------
-# Try to preprocess conftest.$ac_ext, and return whether this succeeded.
-ac_fn_cxx_try_cpp ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  if { { ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err
-  ac_status=$?
-  if test -s conftest.err; then
-    grep -v '^ *+' conftest.err >conftest.er1
-    cat conftest.er1 >&5
-    mv -f conftest.er1 conftest.err
-  fi
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } > conftest.i && {
-	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
-	 test ! -s conftest.err
-       }; then :
-  ac_retval=0
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-    ac_retval=1
-fi
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
-  as_fn_set_status $ac_retval
-
-} # ac_fn_cxx_try_cpp
-
-# ac_fn_cxx_try_link LINENO
-# -------------------------
-# Try to link conftest.$ac_ext, and return whether this succeeded.
-ac_fn_cxx_try_link ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  rm -f conftest.$ac_objext conftest$ac_exeext
-  if { { ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_link") 2>conftest.err
-  ac_status=$?
-  if test -s conftest.err; then
-    grep -v '^ *+' conftest.err >conftest.er1
-    cat conftest.er1 >&5
-    mv -f conftest.er1 conftest.err
-  fi
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } && {
-	 test -z "$ac_cxx_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 test -x conftest$ac_exeext
-       }; then :
-  ac_retval=0
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_retval=1
-fi
-  # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information
-  # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would
-  # interfere with the next link command; also delete a directory that is
-  # left behind by Apple's compiler.  We do this before executing the actions.
-  rm -rf conftest.dSYM conftest_ipa8_conftest.oo
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
-  as_fn_set_status $ac_retval
-
-} # ac_fn_cxx_try_link
-
-# ac_fn_objcxx_try_compile LINENO
-# -------------------------------
-# Try to compile conftest.$ac_ext, and return whether this succeeded.
-ac_fn_objcxx_try_compile ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  rm -f conftest.$ac_objext
-  if { { ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_compile") 2>conftest.err
-  ac_status=$?
-  if test -s conftest.err; then
-    grep -v '^ *+' conftest.err >conftest.er1
-    cat conftest.er1 >&5
-    mv -f conftest.er1 conftest.err
-  fi
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } && {
-	 test -z "$ac_objcxx_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then :
-  ac_retval=0
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_retval=1
-fi
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
-  as_fn_set_status $ac_retval
-
-} # ac_fn_objcxx_try_compile
-
-# ac_fn_c_check_type LINENO TYPE VAR INCLUDES
-# -------------------------------------------
-# Tests whether TYPE exists after having included INCLUDES, setting cache
-# variable VAR accordingly.
-ac_fn_c_check_type ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
-$as_echo_n "checking for $2... " >&6; }
-if eval \${$3+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  eval "$3=no"
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-$4
-int
-main ()
-{
-if (sizeof ($2))
-	 return 0;
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-$4
-int
-main ()
-{
-if (sizeof (($2)))
-	    return 0;
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-
-else
-  eval "$3=yes"
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-eval ac_res=\$$3
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
-
-} # ac_fn_c_check_type
-
-# ac_fn_c_check_header_mongrel LINENO HEADER VAR INCLUDES
-# -------------------------------------------------------
-# Tests whether HEADER exists, giving a warning if it cannot be compiled using
-# the include files in INCLUDES and setting the cache variable VAR
-# accordingly.
-ac_fn_c_check_header_mongrel ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  if eval \${$3+:} false; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
-$as_echo_n "checking for $2... " >&6; }
-if eval \${$3+:} false; then :
-  $as_echo_n "(cached) " >&6
-fi
-eval ac_res=\$$3
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-else
-  # Is the header compilable?
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 usability" >&5
-$as_echo_n "checking $2 usability... " >&6; }
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-$4
-#include <$2>
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_header_compiler=yes
-else
-  ac_header_compiler=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_compiler" >&5
-$as_echo "$ac_header_compiler" >&6; }
-
-# Is the header present?
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 presence" >&5
-$as_echo_n "checking $2 presence... " >&6; }
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <$2>
-_ACEOF
-if ac_fn_c_try_cpp "$LINENO"; then :
-  ac_header_preproc=yes
-else
-  ac_header_preproc=no
-fi
-rm -f conftest.err conftest.i conftest.$ac_ext
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5
-$as_echo "$ac_header_preproc" >&6; }
-
-# So?  What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in #((
-  yes:no: )
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&5
-$as_echo "$as_me: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
-$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
-    ;;
-  no:yes:* )
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: present but cannot be compiled" >&5
-$as_echo "$as_me: WARNING: $2: present but cannot be compiled" >&2;}
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2:     check for missing prerequisite headers?" >&5
-$as_echo "$as_me: WARNING: $2:     check for missing prerequisite headers?" >&2;}
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: see the Autoconf documentation" >&5
-$as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;}
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2:     section \"Present But Cannot Be Compiled\"" >&5
-$as_echo "$as_me: WARNING: $2:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
-$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
-( $as_echo "## ---------------------------------------------------------- ##
-## Report this to https://github.com/grishka/libtgvoip/issues ##
-## ---------------------------------------------------------- ##"
-     ) | sed "s/^/$as_me: WARNING:     /" >&2
-    ;;
-esac
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
-$as_echo_n "checking for $2... " >&6; }
-if eval \${$3+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  eval "$3=\$ac_header_compiler"
-fi
-eval ac_res=\$$3
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-fi
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
-
-} # ac_fn_c_check_header_mongrel
-
-# ac_fn_c_find_intX_t LINENO BITS VAR
-# -----------------------------------
-# Finds a signed integer type with width BITS, setting cache variable VAR
-# accordingly.
-ac_fn_c_find_intX_t ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for int$2_t" >&5
-$as_echo_n "checking for int$2_t... " >&6; }
-if eval \${$3+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  eval "$3=no"
-     # Order is important - never check a type that is potentially smaller
-     # than half of the expected target width.
-     for ac_type in int$2_t 'int' 'long int' \
-	 'long long int' 'short int' 'signed char'; do
-       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-$ac_includes_default
-	     enum { N = $2 / 2 - 1 };
-int
-main ()
-{
-static int test_array [1 - 2 * !(0 < ($ac_type) ((((($ac_type) 1 << N) << N) - 1) * 2 + 1))];
-test_array [0] = 0;
-return test_array [0];
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-$ac_includes_default
-	        enum { N = $2 / 2 - 1 };
-int
-main ()
-{
-static int test_array [1 - 2 * !(($ac_type) ((((($ac_type) 1 << N) << N) - 1) * 2 + 1)
-		 < ($ac_type) ((((($ac_type) 1 << N) << N) - 1) * 2 + 2))];
-test_array [0] = 0;
-return test_array [0];
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-
-else
-  case $ac_type in #(
-  int$2_t) :
-    eval "$3=yes" ;; #(
-  *) :
-    eval "$3=\$ac_type" ;;
-esac
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-       if eval test \"x\$"$3"\" = x"no"; then :
-
-else
-  break
-fi
-     done
-fi
-eval ac_res=\$$3
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
-
-} # ac_fn_c_find_intX_t
-
-# ac_fn_c_find_uintX_t LINENO BITS VAR
-# ------------------------------------
-# Finds an unsigned integer type with width BITS, setting cache variable VAR
-# accordingly.
-ac_fn_c_find_uintX_t ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for uint$2_t" >&5
-$as_echo_n "checking for uint$2_t... " >&6; }
-if eval \${$3+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  eval "$3=no"
-     # Order is important - never check a type that is potentially smaller
-     # than half of the expected target width.
-     for ac_type in uint$2_t 'unsigned int' 'unsigned long int' \
-	 'unsigned long long int' 'unsigned short int' 'unsigned char'; do
-       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-static int test_array [1 - 2 * !((($ac_type) -1 >> ($2 / 2 - 1)) >> ($2 / 2 - 1) == 3)];
-test_array [0] = 0;
-return test_array [0];
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  case $ac_type in #(
-  uint$2_t) :
-    eval "$3=yes" ;; #(
-  *) :
-    eval "$3=\$ac_type" ;;
-esac
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-       if eval test \"x\$"$3"\" = x"no"; then :
-
-else
-  break
-fi
-     done
-fi
-eval ac_res=\$$3
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
-
-} # ac_fn_c_find_uintX_t
-cat >config.log <<_ACEOF
-This file contains any messages produced by compilers while
-running configure, to aid debugging if configure makes a mistake.
-
-It was created by libtgvoip $as_me 2.4.4, which was
-generated by GNU Autoconf 2.69.  Invocation command line was
-
-  $ $0 $@
-
-_ACEOF
-exec 5>>config.log
-{
-cat <<_ASUNAME
-## --------- ##
-## Platform. ##
-## --------- ##
-
-hostname = `(hostname || uname -n) 2>/dev/null | sed 1q`
-uname -m = `(uname -m) 2>/dev/null || echo unknown`
-uname -r = `(uname -r) 2>/dev/null || echo unknown`
-uname -s = `(uname -s) 2>/dev/null || echo unknown`
-uname -v = `(uname -v) 2>/dev/null || echo unknown`
-
-/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown`
-/bin/uname -X     = `(/bin/uname -X) 2>/dev/null     || echo unknown`
-
-/bin/arch              = `(/bin/arch) 2>/dev/null              || echo unknown`
-/usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null       || echo unknown`
-/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown`
-/usr/bin/hostinfo      = `(/usr/bin/hostinfo) 2>/dev/null      || echo unknown`
-/bin/machine           = `(/bin/machine) 2>/dev/null           || echo unknown`
-/usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null       || echo unknown`
-/bin/universe          = `(/bin/universe) 2>/dev/null          || echo unknown`
-
-_ASUNAME
-
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    $as_echo "PATH: $as_dir"
-  done
-IFS=$as_save_IFS
-
-} >&5
-
-cat >&5 <<_ACEOF
-
-
-## ----------- ##
-## Core tests. ##
-## ----------- ##
-
-_ACEOF
-
-
-# Keep a trace of the command line.
-# Strip out --no-create and --no-recursion so they do not pile up.
-# Strip out --silent because we don't want to record it for future runs.
-# Also quote any args containing shell meta-characters.
-# Make two passes to allow for proper duplicate-argument suppression.
-ac_configure_args=
-ac_configure_args0=
-ac_configure_args1=
-ac_must_keep_next=false
-for ac_pass in 1 2
-do
-  for ac_arg
-  do
-    case $ac_arg in
-    -no-create | --no-c* | -n | -no-recursion | --no-r*) continue ;;
-    -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-    | -silent | --silent | --silen | --sile | --sil)
-      continue ;;
-    *\'*)
-      ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
-    esac
-    case $ac_pass in
-    1) as_fn_append ac_configure_args0 " '$ac_arg'" ;;
-    2)
-      as_fn_append ac_configure_args1 " '$ac_arg'"
-      if test $ac_must_keep_next = true; then
-	ac_must_keep_next=false # Got value, back to normal.
-      else
-	case $ac_arg in
-	  *=* | --config-cache | -C | -disable-* | --disable-* \
-	  | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \
-	  | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \
-	  | -with-* | --with-* | -without-* | --without-* | --x)
-	    case "$ac_configure_args0 " in
-	      "$ac_configure_args1"*" '$ac_arg' "* ) continue ;;
-	    esac
-	    ;;
-	  -* ) ac_must_keep_next=true ;;
-	esac
-      fi
-      as_fn_append ac_configure_args " '$ac_arg'"
-      ;;
-    esac
-  done
-done
-{ ac_configure_args0=; unset ac_configure_args0;}
-{ ac_configure_args1=; unset ac_configure_args1;}
-
-# When interrupted or exit'd, cleanup temporary files, and complete
-# config.log.  We remove comments because anyway the quotes in there
-# would cause problems or look ugly.
-# WARNING: Use '\'' to represent an apostrophe within the trap.
-# WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug.
-trap 'exit_status=$?
-  # Save into config.log some information that might help in debugging.
-  {
-    echo
-
-    $as_echo "## ---------------- ##
-## Cache variables. ##
-## ---------------- ##"
-    echo
-    # The following way of writing the cache mishandles newlines in values,
-(
-  for ac_var in `(set) 2>&1 | sed -n '\''s/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'\''`; do
-    eval ac_val=\$$ac_var
-    case $ac_val in #(
-    *${as_nl}*)
-      case $ac_var in #(
-      *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
-$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
-      esac
-      case $ac_var in #(
-      _ | IFS | as_nl) ;; #(
-      BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
-      *) { eval $ac_var=; unset $ac_var;} ;;
-      esac ;;
-    esac
-  done
-  (set) 2>&1 |
-    case $as_nl`(ac_space='\'' '\''; set) 2>&1` in #(
-    *${as_nl}ac_space=\ *)
-      sed -n \
-	"s/'\''/'\''\\\\'\'''\''/g;
-	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\''\\2'\''/p"
-      ;; #(
-    *)
-      sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
-      ;;
-    esac |
-    sort
-)
-    echo
-
-    $as_echo "## ----------------- ##
-## Output variables. ##
-## ----------------- ##"
-    echo
-    for ac_var in $ac_subst_vars
-    do
-      eval ac_val=\$$ac_var
-      case $ac_val in
-      *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
-      esac
-      $as_echo "$ac_var='\''$ac_val'\''"
-    done | sort
-    echo
-
-    if test -n "$ac_subst_files"; then
-      $as_echo "## ------------------- ##
-## File substitutions. ##
-## ------------------- ##"
-      echo
-      for ac_var in $ac_subst_files
-      do
-	eval ac_val=\$$ac_var
-	case $ac_val in
-	*\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
-	esac
-	$as_echo "$ac_var='\''$ac_val'\''"
-      done | sort
-      echo
-    fi
-
-    if test -s confdefs.h; then
-      $as_echo "## ----------- ##
-## confdefs.h. ##
-## ----------- ##"
-      echo
-      cat confdefs.h
-      echo
-    fi
-    test "$ac_signal" != 0 &&
-      $as_echo "$as_me: caught signal $ac_signal"
-    $as_echo "$as_me: exit $exit_status"
-  } >&5
-  rm -f core *.core core.conftest.* &&
-    rm -f -r conftest* confdefs* conf$$* $ac_clean_files &&
-    exit $exit_status
-' 0
-for ac_signal in 1 2 13 15; do
-  trap 'ac_signal='$ac_signal'; as_fn_exit 1' $ac_signal
-done
-ac_signal=0
-
-# confdefs.h avoids OS command line length limits that DEFS can exceed.
-rm -f -r conftest* confdefs.h
-
-$as_echo "/* confdefs.h */" > confdefs.h
-
-# Predefined preprocessor variables.
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_NAME "$PACKAGE_NAME"
-_ACEOF
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_TARNAME "$PACKAGE_TARNAME"
-_ACEOF
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_VERSION "$PACKAGE_VERSION"
-_ACEOF
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_STRING "$PACKAGE_STRING"
-_ACEOF
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT"
-_ACEOF
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_URL "$PACKAGE_URL"
-_ACEOF
-
-
-# Let the site file select an alternate cache file if it wants to.
-# Prefer an explicitly selected file to automatically selected ones.
-ac_site_file1=NONE
-ac_site_file2=NONE
-if test -n "$CONFIG_SITE"; then
-  # We do not want a PATH search for config.site.
-  case $CONFIG_SITE in #((
-    -*)  ac_site_file1=./$CONFIG_SITE;;
-    */*) ac_site_file1=$CONFIG_SITE;;
-    *)   ac_site_file1=./$CONFIG_SITE;;
-  esac
-elif test "x$prefix" != xNONE; then
-  ac_site_file1=$prefix/share/config.site
-  ac_site_file2=$prefix/etc/config.site
-else
-  ac_site_file1=$ac_default_prefix/share/config.site
-  ac_site_file2=$ac_default_prefix/etc/config.site
-fi
-for ac_site_file in "$ac_site_file1" "$ac_site_file2"
-do
-  test "x$ac_site_file" = xNONE && continue
-  if test /dev/null != "$ac_site_file" && test -r "$ac_site_file"; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
-$as_echo "$as_me: loading site script $ac_site_file" >&6;}
-    sed 's/^/| /' "$ac_site_file" >&5
-    . "$ac_site_file" \
-      || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "failed to load site script $ac_site_file
-See \`config.log' for more details" "$LINENO" 5; }
-  fi
-done
-
-if test -r "$cache_file"; then
-  # Some versions of bash will fail to source /dev/null (special files
-  # actually), so we avoid doing that.  DJGPP emulates it as a regular file.
-  if test /dev/null != "$cache_file" && test -f "$cache_file"; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5
-$as_echo "$as_me: loading cache $cache_file" >&6;}
-    case $cache_file in
-      [\\/]* | ?:[\\/]* ) . "$cache_file";;
-      *)                      . "./$cache_file";;
-    esac
-  fi
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5
-$as_echo "$as_me: creating cache $cache_file" >&6;}
-  >$cache_file
-fi
-
-# Check that the precious variables saved in the cache have kept the same
-# value.
-ac_cache_corrupted=false
-for ac_var in $ac_precious_vars; do
-  eval ac_old_set=\$ac_cv_env_${ac_var}_set
-  eval ac_new_set=\$ac_env_${ac_var}_set
-  eval ac_old_val=\$ac_cv_env_${ac_var}_value
-  eval ac_new_val=\$ac_env_${ac_var}_value
-  case $ac_old_set,$ac_new_set in
-    set,)
-      { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
-$as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
-      ac_cache_corrupted=: ;;
-    ,set)
-      { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5
-$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
-      ac_cache_corrupted=: ;;
-    ,);;
-    *)
-      if test "x$ac_old_val" != "x$ac_new_val"; then
-	# differences in whitespace do not lead to failure.
-	ac_old_val_w=`echo x $ac_old_val`
-	ac_new_val_w=`echo x $ac_new_val`
-	if test "$ac_old_val_w" != "$ac_new_val_w"; then
-	  { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5
-$as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
-	  ac_cache_corrupted=:
-	else
-	  { $as_echo "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5
-$as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;}
-	  eval $ac_var=\$ac_old_val
-	fi
-	{ $as_echo "$as_me:${as_lineno-$LINENO}:   former value:  \`$ac_old_val'" >&5
-$as_echo "$as_me:   former value:  \`$ac_old_val'" >&2;}
-	{ $as_echo "$as_me:${as_lineno-$LINENO}:   current value: \`$ac_new_val'" >&5
-$as_echo "$as_me:   current value: \`$ac_new_val'" >&2;}
-      fi;;
-  esac
-  # Pass precious variables to config.status.
-  if test "$ac_new_set" = set; then
-    case $ac_new_val in
-    *\'*) ac_arg=$ac_var=`$as_echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
-    *) ac_arg=$ac_var=$ac_new_val ;;
-    esac
-    case " $ac_configure_args " in
-      *" '$ac_arg' "*) ;; # Avoid dups.  Use of quotes ensures accuracy.
-      *) as_fn_append ac_configure_args " '$ac_arg'" ;;
-    esac
-  fi
-done
-if $ac_cache_corrupted; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-  { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5
-$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
-  as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
-fi
-## -------------------- ##
-## Main body of script. ##
-## -------------------- ##
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-
-
-ac_config_headers="$ac_config_headers config.h"
-
-am__api_version='1.16'
-
-ac_aux_dir=
-for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
-  if test -f "$ac_dir/install-sh"; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install-sh -c"
-    break
-  elif test -f "$ac_dir/install.sh"; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install.sh -c"
-    break
-  elif test -f "$ac_dir/shtool"; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/shtool install -c"
-    break
-  fi
-done
-if test -z "$ac_aux_dir"; then
-  as_fn_error $? "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5
-fi
-
-# These three variables are undocumented and unsupported,
-# and are intended to be withdrawn in a future Autoconf release.
-# They can cause serious problems if a builder's source tree is in a directory
-# whose full name contains unusual characters.
-ac_config_guess="$SHELL $ac_aux_dir/config.guess"  # Please don't use this var.
-ac_config_sub="$SHELL $ac_aux_dir/config.sub"  # Please don't use this var.
-ac_configure="$SHELL $ac_aux_dir/configure"  # Please don't use this var.
-
-
-# Find a good install program.  We prefer a C program (faster),
-# so one script is as good as another.  But avoid the broken or
-# incompatible versions:
-# SysV /etc/install, /usr/sbin/install
-# SunOS /usr/etc/install
-# IRIX /sbin/install
-# AIX /bin/install
-# AmigaOS /C/install, which installs bootblocks on floppy discs
-# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
-# AFS /usr/afsws/bin/install, which mishandles nonexistent args
-# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
-# OS/2's system install, which has a completely different semantic
-# ./install, which can be erroneously created by make from ./install.sh.
-# Reject install programs that cannot install multiple files.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5
-$as_echo_n "checking for a BSD-compatible install... " >&6; }
-if test -z "$INSTALL"; then
-if ${ac_cv_path_install+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    # Account for people who put trailing slashes in PATH elements.
-case $as_dir/ in #((
-  ./ | .// | /[cC]/* | \
-  /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \
-  ?:[\\/]os2[\\/]install[\\/]* | ?:[\\/]OS2[\\/]INSTALL[\\/]* | \
-  /usr/ucb/* ) ;;
-  *)
-    # OSF1 and SCO ODT 3.0 have their own names for install.
-    # Don't use installbsd from OSF since it installs stuff as root
-    # by default.
-    for ac_prog in ginstall scoinst install; do
-      for ac_exec_ext in '' $ac_executable_extensions; do
-	if as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
-	  if test $ac_prog = install &&
-	    grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
-	    # AIX install.  It has an incompatible calling convention.
-	    :
-	  elif test $ac_prog = install &&
-	    grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
-	    # program-specific install script used by HP pwplus--don't use.
-	    :
-	  else
-	    rm -rf conftest.one conftest.two conftest.dir
-	    echo one > conftest.one
-	    echo two > conftest.two
-	    mkdir conftest.dir
-	    if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" &&
-	      test -s conftest.one && test -s conftest.two &&
-	      test -s conftest.dir/conftest.one &&
-	      test -s conftest.dir/conftest.two
-	    then
-	      ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
-	      break 3
-	    fi
-	  fi
-	fi
-      done
-    done
-    ;;
-esac
-
-  done
-IFS=$as_save_IFS
-
-rm -rf conftest.one conftest.two conftest.dir
-
-fi
-  if test "${ac_cv_path_install+set}" = set; then
-    INSTALL=$ac_cv_path_install
-  else
-    # As a last resort, use the slow shell script.  Don't cache a
-    # value for INSTALL within a source directory, because that will
-    # break other packages using the cache if that directory is
-    # removed, or if the value is a relative name.
-    INSTALL=$ac_install_sh
-  fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $INSTALL" >&5
-$as_echo "$INSTALL" >&6; }
-
-# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
-# It thinks the first close brace ends the variable substitution.
-test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
-
-test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
-
-test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5
-$as_echo_n "checking whether build environment is sane... " >&6; }
-# Reject unsafe characters in $srcdir or the absolute working directory
-# name.  Accept space and tab only in the latter.
-am_lf='
-'
-case `pwd` in
-  *[\\\"\#\$\&\'\`$am_lf]*)
-    as_fn_error $? "unsafe absolute working directory name" "$LINENO" 5;;
-esac
-case $srcdir in
-  *[\\\"\#\$\&\'\`$am_lf\ \	]*)
-    as_fn_error $? "unsafe srcdir value: '$srcdir'" "$LINENO" 5;;
-esac
-
-# Do 'set' in a subshell so we don't clobber the current shell's
-# arguments.  Must try -L first in case configure is actually a
-# symlink; some systems play weird games with the mod time of symlinks
-# (eg FreeBSD returns the mod time of the symlink's containing
-# directory).
-if (
-   am_has_slept=no
-   for am_try in 1 2; do
-     echo "timestamp, slept: $am_has_slept" > conftest.file
-     set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
-     if test "$*" = "X"; then
-	# -L didn't work.
-	set X `ls -t "$srcdir/configure" conftest.file`
-     fi
-     if test "$*" != "X $srcdir/configure conftest.file" \
-	&& test "$*" != "X conftest.file $srcdir/configure"; then
-
-	# If neither matched, then we have a broken ls.  This can happen
-	# if, for instance, CONFIG_SHELL is bash and it inherits a
-	# broken ls alias from the environment.  This has actually
-	# happened.  Such a system could not be considered "sane".
-	as_fn_error $? "ls -t appears to fail.  Make sure there is not a broken
-  alias in your environment" "$LINENO" 5
-     fi
-     if test "$2" = conftest.file || test $am_try -eq 2; then
-       break
-     fi
-     # Just in case.
-     sleep 1
-     am_has_slept=yes
-   done
-   test "$2" = conftest.file
-   )
-then
-   # Ok.
-   :
-else
-   as_fn_error $? "newly created file is older than distributed files!
-Check your system clock" "$LINENO" 5
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-# If we didn't sleep, we still need to ensure time stamps of config.status and
-# generated files are strictly newer.
-am_sleep_pid=
-if grep 'slept: no' conftest.file >/dev/null 2>&1; then
-  ( sleep 1 ) &
-  am_sleep_pid=$!
-fi
-
-rm -f conftest.file
-
-test "$program_prefix" != NONE &&
-  program_transform_name="s&^&$program_prefix&;$program_transform_name"
-# Use a double $ so make ignores it.
-test "$program_suffix" != NONE &&
-  program_transform_name="s&\$&$program_suffix&;$program_transform_name"
-# Double any \ or $.
-# By default was `s,x,x', remove it if useless.
-ac_script='s/[\\$]/&&/g;s/;s,x,x,$//'
-program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"`
-
-# Expand $ac_aux_dir to an absolute path.
-am_aux_dir=`cd "$ac_aux_dir" && pwd`
-
-if test x"${MISSING+set}" != xset; then
-  case $am_aux_dir in
-  *\ * | *\	*)
-    MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;;
-  *)
-    MISSING="\${SHELL} $am_aux_dir/missing" ;;
-  esac
-fi
-# Use eval to expand $SHELL
-if eval "$MISSING --is-lightweight"; then
-  am_missing_run="$MISSING "
-else
-  am_missing_run=
-  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: 'missing' script is too old or missing" >&5
-$as_echo "$as_me: WARNING: 'missing' script is too old or missing" >&2;}
-fi
-
-if test x"${install_sh+set}" != xset; then
-  case $am_aux_dir in
-  *\ * | *\	*)
-    install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
-  *)
-    install_sh="\${SHELL} $am_aux_dir/install-sh"
-  esac
-fi
-
-# Installed binaries are usually stripped using 'strip' when the user
-# run "make install-strip".  However 'strip' might not be the right
-# tool to use in cross-compilation environments, therefore Automake
-# will honor the 'STRIP' environment variable to overrule this program.
-if test "$cross_compiling" != no; then
-  if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
-set dummy ${ac_tool_prefix}strip; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_STRIP+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$STRIP"; then
-  ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_STRIP="${ac_tool_prefix}strip"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-STRIP=$ac_cv_prog_STRIP
-if test -n "$STRIP"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5
-$as_echo "$STRIP" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_STRIP"; then
-  ac_ct_STRIP=$STRIP
-  # Extract the first word of "strip", so it can be a program name with args.
-set dummy strip; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_STRIP+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_STRIP"; then
-  ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_STRIP="strip"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
-if test -n "$ac_ct_STRIP"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5
-$as_echo "$ac_ct_STRIP" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-  if test "x$ac_ct_STRIP" = x; then
-    STRIP=":"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    STRIP=$ac_ct_STRIP
-  fi
-else
-  STRIP="$ac_cv_prog_STRIP"
-fi
-
-fi
-INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a thread-safe mkdir -p" >&5
-$as_echo_n "checking for a thread-safe mkdir -p... " >&6; }
-if test -z "$MKDIR_P"; then
-  if ${ac_cv_path_mkdir+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_prog in mkdir gmkdir; do
-	 for ac_exec_ext in '' $ac_executable_extensions; do
-	   as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext" || continue
-	   case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #(
-	     'mkdir (GNU coreutils) '* | \
-	     'mkdir (coreutils) '* | \
-	     'mkdir (fileutils) '4.1*)
-	       ac_cv_path_mkdir=$as_dir/$ac_prog$ac_exec_ext
-	       break 3;;
-	   esac
-	 done
-       done
-  done
-IFS=$as_save_IFS
-
-fi
-
-  test -d ./--version && rmdir ./--version
-  if test "${ac_cv_path_mkdir+set}" = set; then
-    MKDIR_P="$ac_cv_path_mkdir -p"
-  else
-    # As a last resort, use the slow shell script.  Don't cache a
-    # value for MKDIR_P within a source directory, because that will
-    # break other packages using the cache if that directory is
-    # removed, or if the value is a relative name.
-    MKDIR_P="$ac_install_sh -d"
-  fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5
-$as_echo "$MKDIR_P" >&6; }
-
-for ac_prog in gawk mawk nawk awk
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_AWK+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$AWK"; then
-  ac_cv_prog_AWK="$AWK" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_AWK="$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-AWK=$ac_cv_prog_AWK
-if test -n "$AWK"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5
-$as_echo "$AWK" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  test -n "$AWK" && break
-done
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5
-$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
-set x ${MAKE-make}
-ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
-if eval \${ac_cv_prog_make_${ac_make}_set+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat >conftest.make <<\_ACEOF
-SHELL = /bin/sh
-all:
-	@echo '@@@%%%=$(MAKE)=@@@%%%'
-_ACEOF
-# GNU make sometimes prints "make[1]: Entering ...", which would confuse us.
-case `${MAKE-make} -f conftest.make 2>/dev/null` in
-  *@@@%%%=?*=@@@%%%*)
-    eval ac_cv_prog_make_${ac_make}_set=yes;;
-  *)
-    eval ac_cv_prog_make_${ac_make}_set=no;;
-esac
-rm -f conftest.make
-fi
-if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-  SET_MAKE=
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-  SET_MAKE="MAKE=${MAKE-make}"
-fi
-
-rm -rf .tst 2>/dev/null
-mkdir .tst 2>/dev/null
-if test -d .tst; then
-  am__leading_dot=.
-else
-  am__leading_dot=_
-fi
-rmdir .tst 2>/dev/null
-
-# Check whether --enable-silent-rules was given.
-if test "${enable_silent_rules+set}" = set; then :
-  enableval=$enable_silent_rules;
-fi
-
-case $enable_silent_rules in # (((
-  yes) AM_DEFAULT_VERBOSITY=0;;
-   no) AM_DEFAULT_VERBOSITY=1;;
-    *) AM_DEFAULT_VERBOSITY=1;;
-esac
-am_make=${MAKE-make}
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5
-$as_echo_n "checking whether $am_make supports nested variables... " >&6; }
-if ${am_cv_make_support_nested_variables+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if $as_echo 'TRUE=$(BAR$(V))
-BAR0=false
-BAR1=true
-V=1
-am__doit:
-	@$(TRUE)
-.PHONY: am__doit' | $am_make -f - >/dev/null 2>&1; then
-  am_cv_make_support_nested_variables=yes
-else
-  am_cv_make_support_nested_variables=no
-fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5
-$as_echo "$am_cv_make_support_nested_variables" >&6; }
-if test $am_cv_make_support_nested_variables = yes; then
-    AM_V='$(V)'
-  AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)'
-else
-  AM_V=$AM_DEFAULT_VERBOSITY
-  AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY
-fi
-AM_BACKSLASH='\'
-
-if test "`cd $srcdir && pwd`" != "`pwd`"; then
-  # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
-  # is not polluted with repeated "-I."
-  am__isrc=' -I$(srcdir)'
-  # test to see if srcdir already configured
-  if test -f $srcdir/config.status; then
-    as_fn_error $? "source directory already configured; run \"make distclean\" there first" "$LINENO" 5
-  fi
-fi
-
-# test whether we have cygpath
-if test -z "$CYGPATH_W"; then
-  if (cygpath --version) >/dev/null 2>/dev/null; then
-    CYGPATH_W='cygpath -w'
-  else
-    CYGPATH_W=echo
-  fi
-fi
-
-
-# Define the identity of the package.
- PACKAGE='libtgvoip'
- VERSION='2.4.4'
-
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE "$PACKAGE"
-_ACEOF
-
-
-cat >>confdefs.h <<_ACEOF
-#define VERSION "$VERSION"
-_ACEOF
-
-# Some tools Automake needs.
-
-ACLOCAL=${ACLOCAL-"${am_missing_run}aclocal-${am__api_version}"}
-
-
-AUTOCONF=${AUTOCONF-"${am_missing_run}autoconf"}
-
-
-AUTOMAKE=${AUTOMAKE-"${am_missing_run}automake-${am__api_version}"}
-
-
-AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"}
-
-
-MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
-
-# For better backward compatibility.  To be removed once Automake 1.9.x
-# dies out for good.  For more background, see:
-# <https://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
-# <https://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
-mkdir_p='$(MKDIR_P)'
-
-# We need awk for the "check" target (and possibly the TAP driver).  The
-# system "awk" is bad on some platforms.
-# Always define AMTAR for backward compatibility.  Yes, it's still used
-# in the wild :-(  We should find a proper way to deprecate it ...
-AMTAR='$${TAR-tar}'
-
-
-# We'll loop over all known methods to create a tar archive until one works.
-_am_tools='gnutar  pax cpio none'
-
-am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'
-
-
-
-
-
-
-# POSIX will say in a future version that running "rm -f" with no argument
-# is OK; and we want to be able to make that assumption in our Makefile
-# recipes.  So use an aggressive probe to check that the usage we want is
-# actually supported "in the wild" to an acceptable degree.
-# See automake bug#10828.
-# To make any issue more visible, cause the running configure to be aborted
-# by default if the 'rm' program in use doesn't match our expectations; the
-# user can still override this though.
-if rm -f && rm -fr && rm -rf; then : OK; else
-  cat >&2 <<'END'
-Oops!
-
-Your 'rm' program seems unable to run without file operands specified
-on the command line, even when the '-f' option is present.  This is contrary
-to the behaviour of most rm programs out there, and not conforming with
-the upcoming POSIX standard: <http://austingroupbugs.net/view.php?id=542>
-
-Please tell bug-automake@gnu.org about your system, including the value
-of your $PATH and any error possibly output before this message.  This
-can help us improve future automake versions.
-
-END
-  if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then
-    echo 'Configuration will proceed anyway, since you have set the' >&2
-    echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2
-    echo >&2
-  else
-    cat >&2 <<'END'
-Aborting the configuration process, to ensure you take notice of the issue.
-
-You can download and install GNU coreutils to get an 'rm' implementation
-that behaves properly: <https://www.gnu.org/software/coreutils/>.
-
-If you want to complete the configuration process using your problematic
-'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM
-to "yes", and re-run configure.
-
-END
-    as_fn_error $? "Your 'rm' program is bad, sorry." "$LINENO" 5
-  fi
-fi
-
-# Check whether --enable-silent-rules was given.
-if test "${enable_silent_rules+set}" = set; then :
-  enableval=$enable_silent_rules;
-fi
-
-case $enable_silent_rules in # (((
-  yes) AM_DEFAULT_VERBOSITY=0;;
-   no) AM_DEFAULT_VERBOSITY=1;;
-    *) AM_DEFAULT_VERBOSITY=0;;
-esac
-am_make=${MAKE-make}
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5
-$as_echo_n "checking whether $am_make supports nested variables... " >&6; }
-if ${am_cv_make_support_nested_variables+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if $as_echo 'TRUE=$(BAR$(V))
-BAR0=false
-BAR1=true
-V=1
-am__doit:
-	@$(TRUE)
-.PHONY: am__doit' | $am_make -f - >/dev/null 2>&1; then
-  am_cv_make_support_nested_variables=yes
-else
-  am_cv_make_support_nested_variables=no
-fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5
-$as_echo "$am_cv_make_support_nested_variables" >&6; }
-if test $am_cv_make_support_nested_variables = yes; then
-    AM_V='$(V)'
-  AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)'
-else
-  AM_V=$AM_DEFAULT_VERBOSITY
-  AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY
-fi
-AM_BACKSLASH='\'
-
-case `pwd` in
-  *\ * | *\	*)
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5
-$as_echo "$as_me: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&2;} ;;
-esac
-
-
-
-macro_version='2.4.6.42-b88ce'
-macro_revision='2.4.6.42'
-
-
-
-
-
-
-
-
-
-
-
-
-
-ltmain=$ac_aux_dir/ltmain.sh
-
-# Make sure we can run config.sub.
-$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
-  as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
-$as_echo_n "checking build system type... " >&6; }
-if ${ac_cv_build+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_build_alias=$build_alias
-test "x$ac_build_alias" = x &&
-  ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
-test "x$ac_build_alias" = x &&
-  as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5
-ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
-  as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5
-$as_echo "$ac_cv_build" >&6; }
-case $ac_cv_build in
-*-*-*) ;;
-*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;;
-esac
-build=$ac_cv_build
-ac_save_IFS=$IFS; IFS='-'
-set x $ac_cv_build
-shift
-build_cpu=$1
-build_vendor=$2
-shift; shift
-# Remember, the first character of IFS is used to create $*,
-# except with old shells:
-build_os=$*
-IFS=$ac_save_IFS
-case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5
-$as_echo_n "checking host system type... " >&6; }
-if ${ac_cv_host+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test "x$host_alias" = x; then
-  ac_cv_host=$ac_cv_build
-else
-  ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
-    as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
-fi
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5
-$as_echo "$ac_cv_host" >&6; }
-case $ac_cv_host in
-*-*-*) ;;
-*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;;
-esac
-host=$ac_cv_host
-ac_save_IFS=$IFS; IFS='-'
-set x $ac_cv_host
-shift
-host_cpu=$1
-host_vendor=$2
-shift; shift
-# Remember, the first character of IFS is used to create $*,
-# except with old shells:
-host_os=$*
-IFS=$ac_save_IFS
-case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
-
-
-# Backslashify metacharacters that are still active within
-# double-quoted strings.
-sed_quote_subst='s/\(["`$\\]\)/\\\1/g'
-
-# Same as above, but do not quote variable references.
-double_quote_subst='s/\(["`\\]\)/\\\1/g'
-
-# Sed substitution to delay expansion of an escaped shell variable in a
-# double_quote_subst'ed string.
-delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
-
-# Sed substitution to delay expansion of an escaped single quote.
-delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g'
-
-# Sed substitution to avoid accidental globbing in evaled expressions
-no_glob_subst='s/\*/\\\*/g'
-
-ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
-ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO
-ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5
-$as_echo_n "checking how to print strings... " >&6; }
-# Test print first, because it will be a builtin if present.
-if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \
-   test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
-  ECHO='print -r --'
-elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
-  ECHO='printf %s\n'
-else
-  # Use this function as a fallback that always works.
-  func_fallback_echo ()
-  {
-    eval 'cat <<_LTECHO_EOF
-$1
-_LTECHO_EOF'
-  }
-  ECHO='func_fallback_echo'
-fi
-
-# func_echo_all arg...
-# Invoke $ECHO with all args, space-separated.
-func_echo_all ()
-{
-    $ECHO ""
-}
-
-case $ECHO in
-  printf*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: printf" >&5
-$as_echo "printf" >&6; } ;;
-  print*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: print -r" >&5
-$as_echo "print -r" >&6; } ;;
-  *) { $as_echo "$as_me:${as_lineno-$LINENO}: result: cat" >&5
-$as_echo "cat" >&6; } ;;
-esac
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-DEPDIR="${am__leading_dot}deps"
-
-ac_config_commands="$ac_config_commands depfiles"
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} supports the include directive" >&5
-$as_echo_n "checking whether ${MAKE-make} supports the include directive... " >&6; }
-cat > confinc.mk << 'END'
-am__doit:
-	@echo this is the am__doit target >confinc.out
-.PHONY: am__doit
-END
-am__include="#"
-am__quote=
-# BSD make does it like this.
-echo '.include "confinc.mk" # ignored' > confmf.BSD
-# Other make implementations (GNU, Solaris 10, AIX) do it like this.
-echo 'include confinc.mk # ignored' > confmf.GNU
-_am_result=no
-for s in GNU BSD; do
-  { echo "$as_me:$LINENO: ${MAKE-make} -f confmf.$s && cat confinc.out" >&5
-   (${MAKE-make} -f confmf.$s && cat confinc.out) >&5 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }
-  case $?:`cat confinc.out 2>/dev/null` in #(
-  '0:this is the am__doit target') :
-    case $s in #(
-  BSD) :
-    am__include='.include' am__quote='"' ;; #(
-  *) :
-    am__include='include' am__quote='' ;;
-esac ;; #(
-  *) :
-     ;;
-esac
-  if test "$am__include" != "#"; then
-    _am_result="yes ($s style)"
-    break
-  fi
-done
-rm -f confinc.* confmf.*
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${_am_result}" >&5
-$as_echo "${_am_result}" >&6; }
-
-# Check whether --enable-dependency-tracking was given.
-if test "${enable_dependency_tracking+set}" = set; then :
-  enableval=$enable_dependency_tracking;
-fi
-
-if test "x$enable_dependency_tracking" != xno; then
-  am_depcomp="$ac_aux_dir/depcomp"
-  AMDEPBACKSLASH='\'
-  am__nodep='_no'
-fi
- if test "x$enable_dependency_tracking" != xno; then
-  AMDEP_TRUE=
-  AMDEP_FALSE='#'
-else
-  AMDEP_TRUE='#'
-  AMDEP_FALSE=
-fi
-
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
-set dummy ${ac_tool_prefix}gcc; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_CC+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_CC="${ac_tool_prefix}gcc"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-$as_echo "$CC" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_CC"; then
-  ac_ct_CC=$CC
-  # Extract the first word of "gcc", so it can be a program name with args.
-set dummy gcc; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_CC+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_CC"; then
-  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_CC="gcc"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_CC=$ac_cv_prog_ac_ct_CC
-if test -n "$ac_ct_CC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
-$as_echo "$ac_ct_CC" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-  if test "x$ac_ct_CC" = x; then
-    CC=""
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    CC=$ac_ct_CC
-  fi
-else
-  CC="$ac_cv_prog_CC"
-fi
-
-if test -z "$CC"; then
-          if test -n "$ac_tool_prefix"; then
-    # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
-set dummy ${ac_tool_prefix}cc; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_CC+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_CC="${ac_tool_prefix}cc"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-$as_echo "$CC" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  fi
-fi
-if test -z "$CC"; then
-  # Extract the first word of "cc", so it can be a program name with args.
-set dummy cc; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_CC+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-  ac_prog_rejected=no
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
-       ac_prog_rejected=yes
-       continue
-     fi
-    ac_cv_prog_CC="cc"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-if test $ac_prog_rejected = yes; then
-  # We found a bogon in the path, so make sure we never use it.
-  set dummy $ac_cv_prog_CC
-  shift
-  if test $# != 0; then
-    # We chose a different compiler from the bogus one.
-    # However, it has the same basename, so the bogon will be chosen
-    # first if we set CC to just the basename; use the full file name.
-    shift
-    ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@"
-  fi
-fi
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-$as_echo "$CC" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$CC"; then
-  if test -n "$ac_tool_prefix"; then
-  for ac_prog in cl.exe
-  do
-    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
-set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_CC+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-$as_echo "$CC" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-    test -n "$CC" && break
-  done
-fi
-if test -z "$CC"; then
-  ac_ct_CC=$CC
-  for ac_prog in cl.exe
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_CC+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_CC"; then
-  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_CC="$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_CC=$ac_cv_prog_ac_ct_CC
-if test -n "$ac_ct_CC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
-$as_echo "$ac_ct_CC" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  test -n "$ac_ct_CC" && break
-done
-
-  if test "x$ac_ct_CC" = x; then
-    CC=""
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    CC=$ac_ct_CC
-  fi
-fi
-
-fi
-
-
-test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "no acceptable C compiler found in \$PATH
-See \`config.log' for more details" "$LINENO" 5; }
-
-# Provide some information about the compiler.
-$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
-set X $ac_compile
-ac_compiler=$2
-for ac_option in --version -v -V -qversion; do
-  { { ac_try="$ac_compiler $ac_option >&5"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_compiler $ac_option >&5") 2>conftest.err
-  ac_status=$?
-  if test -s conftest.err; then
-    sed '10a\
-... rest of stderr output deleted ...
-         10q' conftest.err >conftest.er1
-    cat conftest.er1 >&5
-  fi
-  rm -f conftest.er1 conftest.err
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }
-done
-
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-ac_clean_files_save=$ac_clean_files
-ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out"
-# Try to create an executable without -o first, disregard a.out.
-# It will help us diagnose broken compilers, and finding out an intuition
-# of exeext.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5
-$as_echo_n "checking whether the C compiler works... " >&6; }
-ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
-
-# The possible output files:
-ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*"
-
-ac_rmfiles=
-for ac_file in $ac_files
-do
-  case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
-    * ) ac_rmfiles="$ac_rmfiles $ac_file";;
-  esac
-done
-rm -f $ac_rmfiles
-
-if { { ac_try="$ac_link_default"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_link_default") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then :
-  # Autoconf-2.13 could set the ac_cv_exeext variable to `no'.
-# So ignore a value of `no', otherwise this would lead to `EXEEXT = no'
-# in a Makefile.  We should not override ac_cv_exeext if it was cached,
-# so that the user can short-circuit this test for compilers unknown to
-# Autoconf.
-for ac_file in $ac_files ''
-do
-  test -f "$ac_file" || continue
-  case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj )
-	;;
-    [ab].out )
-	# We found the default executable, but exeext='' is most
-	# certainly right.
-	break;;
-    *.* )
-	if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no;
-	then :; else
-	   ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
-	fi
-	# We set ac_cv_exeext here because the later test for it is not
-	# safe: cross compilers may not add the suffix if given an `-o'
-	# argument, so we may need to know it at that point already.
-	# Even if this section looks crufty: it has the advantage of
-	# actually working.
-	break;;
-    * )
-	break;;
-  esac
-done
-test "$ac_cv_exeext" = no && ac_cv_exeext=
-
-else
-  ac_file=''
-fi
-if test -z "$ac_file"; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-$as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error 77 "C compiler cannot create executables
-See \`config.log' for more details" "$LINENO" 5; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5
-$as_echo_n "checking for C compiler default output file name... " >&6; }
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5
-$as_echo "$ac_file" >&6; }
-ac_exeext=$ac_cv_exeext
-
-rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out
-ac_clean_files=$ac_clean_files_save
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5
-$as_echo_n "checking for suffix of executables... " >&6; }
-if { { ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then :
-  # If both `conftest.exe' and `conftest' are `present' (well, observable)
-# catch `conftest.exe'.  For instance with Cygwin, `ls conftest' will
-# work properly (i.e., refer to `conftest.exe'), while it won't with
-# `rm'.
-for ac_file in conftest.exe conftest conftest.*; do
-  test -f "$ac_file" || continue
-  case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
-    *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
-	  break;;
-    * ) break;;
-  esac
-done
-else
-  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "cannot compute suffix of executables: cannot compile and link
-See \`config.log' for more details" "$LINENO" 5; }
-fi
-rm -f conftest conftest$ac_cv_exeext
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
-$as_echo "$ac_cv_exeext" >&6; }
-
-rm -f conftest.$ac_ext
-EXEEXT=$ac_cv_exeext
-ac_exeext=$EXEEXT
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <stdio.h>
-int
-main ()
-{
-FILE *f = fopen ("conftest.out", "w");
- return ferror (f) || fclose (f) != 0;
-
-  ;
-  return 0;
-}
-_ACEOF
-ac_clean_files="$ac_clean_files conftest.out"
-# Check that the compiler produces executables we can run.  If not, either
-# the compiler is broken, or we cross compile.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5
-$as_echo_n "checking whether we are cross compiling... " >&6; }
-if test "$cross_compiling" != yes; then
-  { { ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }
-  if { ac_try='./conftest$ac_cv_exeext'
-  { { case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; }; then
-    cross_compiling=no
-  else
-    if test "$cross_compiling" = maybe; then
-	cross_compiling=yes
-    else
-	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "cannot run C compiled programs.
-If you meant to cross compile, use \`--host'.
-See \`config.log' for more details" "$LINENO" 5; }
-    fi
-  fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
-$as_echo "$cross_compiling" >&6; }
-
-rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out
-ac_clean_files=$ac_clean_files_save
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
-$as_echo_n "checking for suffix of object files... " >&6; }
-if ${ac_cv_objext+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.o conftest.obj
-if { { ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_compile") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then :
-  for ac_file in conftest.o conftest.obj conftest.*; do
-  test -f "$ac_file" || continue;
-  case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM ) ;;
-    *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
-       break;;
-  esac
-done
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "cannot compute suffix of object files: cannot compile
-See \`config.log' for more details" "$LINENO" 5; }
-fi
-rm -f conftest.$ac_cv_objext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5
-$as_echo "$ac_cv_objext" >&6; }
-OBJEXT=$ac_cv_objext
-ac_objext=$OBJEXT
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
-$as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
-if ${ac_cv_c_compiler_gnu+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-#ifndef __GNUC__
-       choke me
-#endif
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_compiler_gnu=yes
-else
-  ac_compiler_gnu=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-ac_cv_c_compiler_gnu=$ac_compiler_gnu
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5
-$as_echo "$ac_cv_c_compiler_gnu" >&6; }
-if test $ac_compiler_gnu = yes; then
-  GCC=yes
-else
-  GCC=
-fi
-ac_test_CFLAGS=${CFLAGS+set}
-ac_save_CFLAGS=$CFLAGS
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
-$as_echo_n "checking whether $CC accepts -g... " >&6; }
-if ${ac_cv_prog_cc_g+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_save_c_werror_flag=$ac_c_werror_flag
-   ac_c_werror_flag=yes
-   ac_cv_prog_cc_g=no
-   CFLAGS="-g"
-   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_prog_cc_g=yes
-else
-  CFLAGS=""
-      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-
-else
-  ac_c_werror_flag=$ac_save_c_werror_flag
-	 CFLAGS="-g"
-	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_prog_cc_g=yes
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-   ac_c_werror_flag=$ac_save_c_werror_flag
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5
-$as_echo "$ac_cv_prog_cc_g" >&6; }
-if test "$ac_test_CFLAGS" = set; then
-  CFLAGS=$ac_save_CFLAGS
-elif test $ac_cv_prog_cc_g = yes; then
-  if test "$GCC" = yes; then
-    CFLAGS="-g -O2"
-  else
-    CFLAGS="-g"
-  fi
-else
-  if test "$GCC" = yes; then
-    CFLAGS="-O2"
-  else
-    CFLAGS=
-  fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
-$as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
-if ${ac_cv_prog_cc_c89+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_cv_prog_cc_c89=no
-ac_save_CC=$CC
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <stdarg.h>
-#include <stdio.h>
-struct stat;
-/* Most of the following tests are stolen from RCS 5.7's src/conf.sh.  */
-struct buf { int x; };
-FILE * (*rcsopen) (struct buf *, struct stat *, int);
-static char *e (p, i)
-     char **p;
-     int i;
-{
-  return p[i];
-}
-static char *f (char * (*g) (char **, int), char **p, ...)
-{
-  char *s;
-  va_list v;
-  va_start (v,p);
-  s = g (p, va_arg (v,int));
-  va_end (v);
-  return s;
-}
-
-/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default.  It has
-   function prototypes and stuff, but not '\xHH' hex character constants.
-   These don't provoke an error unfortunately, instead are silently treated
-   as 'x'.  The following induces an error, until -std is added to get
-   proper ANSI mode.  Curiously '\x00'!='x' always comes out true, for an
-   array size at least.  It's necessary to write '\x00'==0 to get something
-   that's true only with -std.  */
-int osf4_cc_array ['\x00' == 0 ? 1 : -1];
-
-/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters
-   inside strings and character constants.  */
-#define FOO(x) 'x'
-int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1];
-
-int test (int i, double x);
-struct s1 {int (*f) (int a);};
-struct s2 {int (*f) (double a);};
-int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
-int argc;
-char **argv;
-int
-main ()
-{
-return f (e, argv, 0) != argv[0]  ||  f (e, argv, 1) != argv[1];
-  ;
-  return 0;
-}
-_ACEOF
-for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \
-	-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
-do
-  CC="$ac_save_CC $ac_arg"
-  if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_prog_cc_c89=$ac_arg
-fi
-rm -f core conftest.err conftest.$ac_objext
-  test "x$ac_cv_prog_cc_c89" != "xno" && break
-done
-rm -f conftest.$ac_ext
-CC=$ac_save_CC
-
-fi
-# AC_CACHE_VAL
-case "x$ac_cv_prog_cc_c89" in
-  x)
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
-$as_echo "none needed" >&6; } ;;
-  xno)
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
-$as_echo "unsupported" >&6; } ;;
-  *)
-    CC="$CC $ac_cv_prog_cc_c89"
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5
-$as_echo "$ac_cv_prog_cc_c89" >&6; } ;;
-esac
-if test "x$ac_cv_prog_cc_c89" != xno; then :
-
-fi
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC understands -c and -o together" >&5
-$as_echo_n "checking whether $CC understands -c and -o together... " >&6; }
-if ${am_cv_prog_cc_c_o+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-  # Make sure it works both with $CC and with simple cc.
-  # Following AC_PROG_CC_C_O, we do the test twice because some
-  # compilers refuse to overwrite an existing .o file with -o,
-  # though they will create one.
-  am_cv_prog_cc_c_o=yes
-  for am_i in 1 2; do
-    if { echo "$as_me:$LINENO: $CC -c conftest.$ac_ext -o conftest2.$ac_objext" >&5
-   ($CC -c conftest.$ac_ext -o conftest2.$ac_objext) >&5 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } \
-         && test -f conftest2.$ac_objext; then
-      : OK
-    else
-      am_cv_prog_cc_c_o=no
-      break
-    fi
-  done
-  rm -f core conftest*
-  unset am_i
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_cc_c_o" >&5
-$as_echo "$am_cv_prog_cc_c_o" >&6; }
-if test "$am_cv_prog_cc_c_o" != yes; then
-   # Losing compiler, so override with the script.
-   # FIXME: It is wrong to rewrite CC.
-   # But if we don't then we get into trouble of one sort or another.
-   # A longer-term fix would be to have automake use am__CC in this case,
-   # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
-   CC="$am_aux_dir/compile $CC"
-fi
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-
-depcc="$CC"   am_compiler_list=
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
-$as_echo_n "checking dependency style of $depcc... " >&6; }
-if ${am_cv_CC_dependencies_compiler_type+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
-  # We make a subdir and do the tests there.  Otherwise we can end up
-  # making bogus files that we don't know about and never remove.  For
-  # instance it was reported that on HP-UX the gcc test will end up
-  # making a dummy file named 'D' -- because '-MD' means "put the output
-  # in D".
-  rm -rf conftest.dir
-  mkdir conftest.dir
-  # Copy depcomp to subdir because otherwise we won't find it if we're
-  # using a relative directory.
-  cp "$am_depcomp" conftest.dir
-  cd conftest.dir
-  # We will build objects and dependencies in a subdirectory because
-  # it helps to detect inapplicable dependency modes.  For instance
-  # both Tru64's cc and ICC support -MD to output dependencies as a
-  # side effect of compilation, but ICC will put the dependencies in
-  # the current directory while Tru64 will put them in the object
-  # directory.
-  mkdir sub
-
-  am_cv_CC_dependencies_compiler_type=none
-  if test "$am_compiler_list" = ""; then
-     am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
-  fi
-  am__universal=false
-  case " $depcc " in #(
-     *\ -arch\ *\ -arch\ *) am__universal=true ;;
-     esac
-
-  for depmode in $am_compiler_list; do
-    # Setup a source with many dependencies, because some compilers
-    # like to wrap large dependency lists on column 80 (with \), and
-    # we should not choose a depcomp mode which is confused by this.
-    #
-    # We need to recreate these files for each test, as the compiler may
-    # overwrite some of them when testing with obscure command lines.
-    # This happens at least with the AIX C compiler.
-    : > sub/conftest.c
-    for i in 1 2 3 4 5 6; do
-      echo '#include "conftst'$i'.h"' >> sub/conftest.c
-      # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with
-      # Solaris 10 /bin/sh.
-      echo '/* dummy */' > sub/conftst$i.h
-    done
-    echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
-
-    # We check with '-c' and '-o' for the sake of the "dashmstdout"
-    # mode.  It turns out that the SunPro C++ compiler does not properly
-    # handle '-M -o', and we need to detect this.  Also, some Intel
-    # versions had trouble with output in subdirs.
-    am__obj=sub/conftest.${OBJEXT-o}
-    am__minus_obj="-o $am__obj"
-    case $depmode in
-    gcc)
-      # This depmode causes a compiler race in universal mode.
-      test "$am__universal" = false || continue
-      ;;
-    nosideeffect)
-      # After this tag, mechanisms are not by side-effect, so they'll
-      # only be used when explicitly requested.
-      if test "x$enable_dependency_tracking" = xyes; then
-	continue
-      else
-	break
-      fi
-      ;;
-    msvc7 | msvc7msys | msvisualcpp | msvcmsys)
-      # This compiler won't grok '-c -o', but also, the minuso test has
-      # not run yet.  These depmodes are late enough in the game, and
-      # so weak that their functioning should not be impacted.
-      am__obj=conftest.${OBJEXT-o}
-      am__minus_obj=
-      ;;
-    none) break ;;
-    esac
-    if depmode=$depmode \
-       source=sub/conftest.c object=$am__obj \
-       depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
-       $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \
-         >/dev/null 2>conftest.err &&
-       grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
-       grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
-       grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&
-       ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
-      # icc doesn't choke on unknown options, it will just issue warnings
-      # or remarks (even with -Werror).  So we grep stderr for any message
-      # that says an option was ignored or not supported.
-      # When given -MP, icc 7.0 and 7.1 complain thusly:
-      #   icc: Command line warning: ignoring option '-M'; no argument required
-      # The diagnosis changed in icc 8.0:
-      #   icc: Command line remark: option '-MP' not supported
-      if (grep 'ignoring option' conftest.err ||
-          grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
-        am_cv_CC_dependencies_compiler_type=$depmode
-        break
-      fi
-    fi
-  done
-
-  cd ..
-  rm -rf conftest.dir
-else
-  am_cv_CC_dependencies_compiler_type=none
-fi
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CC_dependencies_compiler_type" >&5
-$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; }
-CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
-
- if
-  test "x$enable_dependency_tracking" != xno \
-  && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then
-  am__fastdepCC_TRUE=
-  am__fastdepCC_FALSE='#'
-else
-  am__fastdepCC_TRUE='#'
-  am__fastdepCC_FALSE=
-fi
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5
-$as_echo_n "checking for a sed that does not truncate output... " >&6; }
-if ${ac_cv_path_SED+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-            ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/
-     for ac_i in 1 2 3 4 5 6 7; do
-       ac_script="$ac_script$as_nl$ac_script"
-     done
-     echo "$ac_script" 2>/dev/null | sed 99q >conftest.sed
-     { ac_script=; unset ac_script;}
-     if test -z "$SED"; then
-  ac_path_SED_found=false
-  # Loop through the user's path and test for each of PROGNAME-LIST
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_prog in sed gsed; do
-    for ac_exec_ext in '' $ac_executable_extensions; do
-      ac_path_SED="$as_dir/$ac_prog$ac_exec_ext"
-      as_fn_executable_p "$ac_path_SED" || continue
-# Check for GNU ac_path_SED and select it if it is found.
-  # Check for GNU $ac_path_SED
-case `"$ac_path_SED" --version 2>&1` in
-*GNU*)
-  ac_cv_path_SED="$ac_path_SED" ac_path_SED_found=:;;
-*)
-  ac_count=0
-  $as_echo_n 0123456789 >"conftest.in"
-  while :
-  do
-    cat "conftest.in" "conftest.in" >"conftest.tmp"
-    mv "conftest.tmp" "conftest.in"
-    cp "conftest.in" "conftest.nl"
-    $as_echo '' >> "conftest.nl"
-    "$ac_path_SED" -f conftest.sed < "conftest.nl" >"conftest.out" 2>/dev/null || break
-    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
-    as_fn_arith $ac_count + 1 && ac_count=$as_val
-    if test $ac_count -gt ${ac_path_SED_max-0}; then
-      # Best one so far, save it but keep looking for a better one
-      ac_cv_path_SED="$ac_path_SED"
-      ac_path_SED_max=$ac_count
-    fi
-    # 10*(2^10) chars as input seems more than enough
-    test $ac_count -gt 10 && break
-  done
-  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
-esac
-
-      $ac_path_SED_found && break 3
-    done
-  done
-  done
-IFS=$as_save_IFS
-  if test -z "$ac_cv_path_SED"; then
-    as_fn_error $? "no acceptable sed could be found in \$PATH" "$LINENO" 5
-  fi
-else
-  ac_cv_path_SED=$SED
-fi
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_SED" >&5
-$as_echo "$ac_cv_path_SED" >&6; }
- SED="$ac_cv_path_SED"
-  rm -f conftest.sed
-
-test -z "$SED" && SED=sed
-Xsed="$SED -e 1s/^X//"
-
-
-
-
-
-
-
-
-
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
-$as_echo_n "checking for grep that handles long lines and -e... " >&6; }
-if ${ac_cv_path_GREP+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -z "$GREP"; then
-  ac_path_GREP_found=false
-  # Loop through the user's path and test for each of PROGNAME-LIST
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_prog in grep ggrep; do
-    for ac_exec_ext in '' $ac_executable_extensions; do
-      ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
-      as_fn_executable_p "$ac_path_GREP" || continue
-# Check for GNU ac_path_GREP and select it if it is found.
-  # Check for GNU $ac_path_GREP
-case `"$ac_path_GREP" --version 2>&1` in
-*GNU*)
-  ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;;
-*)
-  ac_count=0
-  $as_echo_n 0123456789 >"conftest.in"
-  while :
-  do
-    cat "conftest.in" "conftest.in" >"conftest.tmp"
-    mv "conftest.tmp" "conftest.in"
-    cp "conftest.in" "conftest.nl"
-    $as_echo 'GREP' >> "conftest.nl"
-    "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
-    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
-    as_fn_arith $ac_count + 1 && ac_count=$as_val
-    if test $ac_count -gt ${ac_path_GREP_max-0}; then
-      # Best one so far, save it but keep looking for a better one
-      ac_cv_path_GREP="$ac_path_GREP"
-      ac_path_GREP_max=$ac_count
-    fi
-    # 10*(2^10) chars as input seems more than enough
-    test $ac_count -gt 10 && break
-  done
-  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
-esac
-
-      $ac_path_GREP_found && break 3
-    done
-  done
-  done
-IFS=$as_save_IFS
-  if test -z "$ac_cv_path_GREP"; then
-    as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
-  fi
-else
-  ac_cv_path_GREP=$GREP
-fi
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5
-$as_echo "$ac_cv_path_GREP" >&6; }
- GREP="$ac_cv_path_GREP"
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
-$as_echo_n "checking for egrep... " >&6; }
-if ${ac_cv_path_EGREP+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
-   then ac_cv_path_EGREP="$GREP -E"
-   else
-     if test -z "$EGREP"; then
-  ac_path_EGREP_found=false
-  # Loop through the user's path and test for each of PROGNAME-LIST
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_prog in egrep; do
-    for ac_exec_ext in '' $ac_executable_extensions; do
-      ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
-      as_fn_executable_p "$ac_path_EGREP" || continue
-# Check for GNU ac_path_EGREP and select it if it is found.
-  # Check for GNU $ac_path_EGREP
-case `"$ac_path_EGREP" --version 2>&1` in
-*GNU*)
-  ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;;
-*)
-  ac_count=0
-  $as_echo_n 0123456789 >"conftest.in"
-  while :
-  do
-    cat "conftest.in" "conftest.in" >"conftest.tmp"
-    mv "conftest.tmp" "conftest.in"
-    cp "conftest.in" "conftest.nl"
-    $as_echo 'EGREP' >> "conftest.nl"
-    "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
-    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
-    as_fn_arith $ac_count + 1 && ac_count=$as_val
-    if test $ac_count -gt ${ac_path_EGREP_max-0}; then
-      # Best one so far, save it but keep looking for a better one
-      ac_cv_path_EGREP="$ac_path_EGREP"
-      ac_path_EGREP_max=$ac_count
-    fi
-    # 10*(2^10) chars as input seems more than enough
-    test $ac_count -gt 10 && break
-  done
-  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
-esac
-
-      $ac_path_EGREP_found && break 3
-    done
-  done
-  done
-IFS=$as_save_IFS
-  if test -z "$ac_cv_path_EGREP"; then
-    as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
-  fi
-else
-  ac_cv_path_EGREP=$EGREP
-fi
-
-   fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5
-$as_echo "$ac_cv_path_EGREP" >&6; }
- EGREP="$ac_cv_path_EGREP"
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for fgrep" >&5
-$as_echo_n "checking for fgrep... " >&6; }
-if ${ac_cv_path_FGREP+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if echo 'ab*c' | $GREP -F 'ab*c' >/dev/null 2>&1
-   then ac_cv_path_FGREP="$GREP -F"
-   else
-     if test -z "$FGREP"; then
-  ac_path_FGREP_found=false
-  # Loop through the user's path and test for each of PROGNAME-LIST
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_prog in fgrep; do
-    for ac_exec_ext in '' $ac_executable_extensions; do
-      ac_path_FGREP="$as_dir/$ac_prog$ac_exec_ext"
-      as_fn_executable_p "$ac_path_FGREP" || continue
-# Check for GNU ac_path_FGREP and select it if it is found.
-  # Check for GNU $ac_path_FGREP
-case `"$ac_path_FGREP" --version 2>&1` in
-*GNU*)
-  ac_cv_path_FGREP="$ac_path_FGREP" ac_path_FGREP_found=:;;
-*)
-  ac_count=0
-  $as_echo_n 0123456789 >"conftest.in"
-  while :
-  do
-    cat "conftest.in" "conftest.in" >"conftest.tmp"
-    mv "conftest.tmp" "conftest.in"
-    cp "conftest.in" "conftest.nl"
-    $as_echo 'FGREP' >> "conftest.nl"
-    "$ac_path_FGREP" FGREP < "conftest.nl" >"conftest.out" 2>/dev/null || break
-    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
-    as_fn_arith $ac_count + 1 && ac_count=$as_val
-    if test $ac_count -gt ${ac_path_FGREP_max-0}; then
-      # Best one so far, save it but keep looking for a better one
-      ac_cv_path_FGREP="$ac_path_FGREP"
-      ac_path_FGREP_max=$ac_count
-    fi
-    # 10*(2^10) chars as input seems more than enough
-    test $ac_count -gt 10 && break
-  done
-  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
-esac
-
-      $ac_path_FGREP_found && break 3
-    done
-  done
-  done
-IFS=$as_save_IFS
-  if test -z "$ac_cv_path_FGREP"; then
-    as_fn_error $? "no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
-  fi
-else
-  ac_cv_path_FGREP=$FGREP
-fi
-
-   fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_FGREP" >&5
-$as_echo "$ac_cv_path_FGREP" >&6; }
- FGREP="$ac_cv_path_FGREP"
-
-
-test -z "$GREP" && GREP=grep
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-# Check whether --with-gnu-ld was given.
-if test "${with_gnu_ld+set}" = set; then :
-  withval=$with_gnu_ld; test no = "$withval" || with_gnu_ld=yes
-else
-  with_gnu_ld=no
-fi
-
-ac_prog=ld
-if test yes = "$GCC"; then
-  # Check if gcc -print-prog-name=ld gives a path.
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5
-$as_echo_n "checking for ld used by $CC... " >&6; }
-  case $host in
-  *-*-mingw*)
-    # gcc leaves a trailing carriage return, which upsets mingw
-    ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
-  *)
-    ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
-  esac
-  case $ac_prog in
-    # Accept absolute paths.
-    [\\/]* | ?:[\\/]*)
-      re_direlt='/[^/][^/]*/\.\./'
-      # Canonicalize the pathname of ld
-      ac_prog=`$ECHO "$ac_prog"| $SED 's%\\\\%/%g'`
-      while $ECHO "$ac_prog" | $GREP "$re_direlt" > /dev/null 2>&1; do
-	ac_prog=`$ECHO $ac_prog| $SED "s%$re_direlt%/%"`
-      done
-      test -z "$LD" && LD=$ac_prog
-      ;;
-  "")
-    # If it fails, then pretend we aren't using GCC.
-    ac_prog=ld
-    ;;
-  *)
-    # If it is relative, then search for the first ld in PATH.
-    with_gnu_ld=unknown
-    ;;
-  esac
-elif test yes = "$with_gnu_ld"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5
-$as_echo_n "checking for GNU ld... " >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5
-$as_echo_n "checking for non-GNU ld... " >&6; }
-fi
-if ${lt_cv_path_LD+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -z "$LD"; then
-  lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR
-  for ac_dir in $PATH; do
-    IFS=$lt_save_ifs
-    test -z "$ac_dir" && ac_dir=.
-    if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
-      lt_cv_path_LD=$ac_dir/$ac_prog
-      # Check to see if the program is GNU ld.  I'd rather use --version,
-      # but apparently some variants of GNU ld only accept -v.
-      # Break only if it was the GNU/non-GNU ld that we prefer.
-      case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
-      *GNU* | *'with BFD'*)
-	test no != "$with_gnu_ld" && break
-	;;
-      *)
-	test yes != "$with_gnu_ld" && break
-	;;
-      esac
-    fi
-  done
-  IFS=$lt_save_ifs
-else
-  lt_cv_path_LD=$LD # Let the user override the test with a path.
-fi
-fi
-
-LD=$lt_cv_path_LD
-if test -n "$LD"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LD" >&5
-$as_echo "$LD" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5
-$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }
-if ${lt_cv_prog_gnu_ld+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  # I'd rather use --version here, but apparently some GNU lds only accept -v.
-case `$LD -v 2>&1 </dev/null` in
-*GNU* | *'with BFD'*)
-  lt_cv_prog_gnu_ld=yes
-  ;;
-*)
-  lt_cv_prog_gnu_ld=no
-  ;;
-esac
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_gnu_ld" >&5
-$as_echo "$lt_cv_prog_gnu_ld" >&6; }
-with_gnu_ld=$lt_cv_prog_gnu_ld
-
-
-
-
-
-
-
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for BSD- or MS-compatible name lister (nm)" >&5
-$as_echo_n "checking for BSD- or MS-compatible name lister (nm)... " >&6; }
-if ${lt_cv_path_NM+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$NM"; then
-  # Let the user override the test.
-  lt_cv_path_NM=$NM
-else
-  lt_nm_to_check=${ac_tool_prefix}nm
-  if test -n "$ac_tool_prefix" && test "$build" = "$host"; then
-    lt_nm_to_check="$lt_nm_to_check nm"
-  fi
-  for lt_tmp_nm in $lt_nm_to_check; do
-    lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR
-    for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do
-      IFS=$lt_save_ifs
-      test -z "$ac_dir" && ac_dir=.
-      tmp_nm=$ac_dir/$lt_tmp_nm
-      if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext"; then
-	# Check to see if the nm accepts a BSD-compat flag.
-	# Adding the 'sed 1q' prevents false positives on HP-UX, which says:
-	#   nm: unknown option "B" ignored
-	# Tru64's nm complains that /dev/null is an invalid object file
-	# MSYS converts /dev/null to NUL, MinGW nm treats NUL as empty
-	case $build_os in
-	mingw*) lt_bad_file=conftest.nm/nofile ;;
-	*) lt_bad_file=/dev/null ;;
-	esac
-	case `"$tmp_nm" -B $lt_bad_file 2>&1 | sed '1q'` in
-	*$lt_bad_file* | *'Invalid file or object type'*)
-	  lt_cv_path_NM="$tmp_nm -B"
-	  break 2
-	  ;;
-	*)
-	  case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in
-	  */dev/null*)
-	    lt_cv_path_NM="$tmp_nm -p"
-	    break 2
-	    ;;
-	  *)
-	    lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
-	    continue # so that we can try to find one that supports BSD flags
-	    ;;
-	  esac
-	  ;;
-	esac
-      fi
-    done
-    IFS=$lt_save_ifs
-  done
-  : ${lt_cv_path_NM=no}
-fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_NM" >&5
-$as_echo "$lt_cv_path_NM" >&6; }
-if test no != "$lt_cv_path_NM"; then
-  NM=$lt_cv_path_NM
-else
-  # Didn't find any BSD compatible name lister, look for dumpbin.
-  if test -n "$DUMPBIN"; then :
-    # Let the user override the test.
-  else
-    if test -n "$ac_tool_prefix"; then
-  for ac_prog in dumpbin "link -dump"
-  do
-    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
-set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_DUMPBIN+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$DUMPBIN"; then
-  ac_cv_prog_DUMPBIN="$DUMPBIN" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_DUMPBIN="$ac_tool_prefix$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-DUMPBIN=$ac_cv_prog_DUMPBIN
-if test -n "$DUMPBIN"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DUMPBIN" >&5
-$as_echo "$DUMPBIN" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-    test -n "$DUMPBIN" && break
-  done
-fi
-if test -z "$DUMPBIN"; then
-  ac_ct_DUMPBIN=$DUMPBIN
-  for ac_prog in dumpbin "link -dump"
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_DUMPBIN+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_DUMPBIN"; then
-  ac_cv_prog_ac_ct_DUMPBIN="$ac_ct_DUMPBIN" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_DUMPBIN="$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_DUMPBIN=$ac_cv_prog_ac_ct_DUMPBIN
-if test -n "$ac_ct_DUMPBIN"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DUMPBIN" >&5
-$as_echo "$ac_ct_DUMPBIN" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  test -n "$ac_ct_DUMPBIN" && break
-done
-
-  if test "x$ac_ct_DUMPBIN" = x; then
-    DUMPBIN=":"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    DUMPBIN=$ac_ct_DUMPBIN
-  fi
-fi
-
-    case `$DUMPBIN -symbols -headers /dev/null 2>&1 | sed '1q'` in
-    *COFF*)
-      DUMPBIN="$DUMPBIN -symbols -headers"
-      ;;
-    *)
-      DUMPBIN=:
-      ;;
-    esac
-  fi
-
-  if test : != "$DUMPBIN"; then
-    NM=$DUMPBIN
-  fi
-fi
-test -z "$NM" && NM=nm
-
-
-
-
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the name lister ($NM) interface" >&5
-$as_echo_n "checking the name lister ($NM) interface... " >&6; }
-if ${lt_cv_nm_interface+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_nm_interface="BSD nm"
-  echo "int some_variable = 0;" > conftest.$ac_ext
-  (eval echo "\"\$as_me:$LINENO: $ac_compile\"" >&5)
-  (eval "$ac_compile" 2>conftest.err)
-  cat conftest.err >&5
-  (eval echo "\"\$as_me:$LINENO: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
-  (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
-  cat conftest.err >&5
-  (eval echo "\"\$as_me:$LINENO: output\"" >&5)
-  cat conftest.out >&5
-  if $GREP 'External.*some_variable' conftest.out > /dev/null; then
-    lt_cv_nm_interface="MS dumpbin"
-  fi
-  rm -f conftest*
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_nm_interface" >&5
-$as_echo "$lt_cv_nm_interface" >&6; }
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ln -s works" >&5
-$as_echo_n "checking whether ln -s works... " >&6; }
-LN_S=$as_ln_s
-if test "$LN_S" = "ln -s"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, using $LN_S" >&5
-$as_echo "no, using $LN_S" >&6; }
-fi
-
-# find the maximum length of command line arguments
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the maximum length of command line arguments" >&5
-$as_echo_n "checking the maximum length of command line arguments... " >&6; }
-if ${lt_cv_sys_max_cmd_len+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-    i=0
-  teststring=ABCD
-
-  case $build_os in
-  msdosdjgpp*)
-    # On DJGPP, this test can blow up pretty badly due to problems in libc
-    # (any single argument exceeding 2000 bytes causes a buffer overrun
-    # during glob expansion).  Even if it were fixed, the result of this
-    # check would be larger than it should be.
-    lt_cv_sys_max_cmd_len=12288;    # 12K is about right
-    ;;
-
-  gnu*)
-    # Under GNU Hurd, this test is not required because there is
-    # no limit to the length of command line arguments.
-    # Libtool will interpret -1 as no limit whatsoever
-    lt_cv_sys_max_cmd_len=-1;
-    ;;
-
-  cygwin* | mingw* | cegcc*)
-    # On Win9x/ME, this test blows up -- it succeeds, but takes
-    # about 5 minutes as the teststring grows exponentially.
-    # Worse, since 9x/ME are not pre-emptively multitasking,
-    # you end up with a "frozen" computer, even though with patience
-    # the test eventually succeeds (with a max line length of 256k).
-    # Instead, let's just punt: use the minimum linelength reported by
-    # all of the supported platforms: 8192 (on NT/2K/XP).
-    lt_cv_sys_max_cmd_len=8192;
-    ;;
-
-  mint*)
-    # On MiNT this can take a long time and run out of memory.
-    lt_cv_sys_max_cmd_len=8192;
-    ;;
-
-  amigaos*)
-    # On AmigaOS with pdksh, this test takes hours, literally.
-    # So we just punt and use a minimum line length of 8192.
-    lt_cv_sys_max_cmd_len=8192;
-    ;;
-
-  bitrig* | darwin* | dragonfly* | freebsd* | netbsd* | openbsd*)
-    # This has been around since 386BSD, at least.  Likely further.
-    if test -x /sbin/sysctl; then
-      lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
-    elif test -x /usr/sbin/sysctl; then
-      lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax`
-    else
-      lt_cv_sys_max_cmd_len=65536	# usable default for all BSDs
-    fi
-    # And add a safety zone
-    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
-    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
-    ;;
-
-  interix*)
-    # We know the value 262144 and hardcode it with a safety zone (like BSD)
-    lt_cv_sys_max_cmd_len=196608
-    ;;
-
-  os2*)
-    # The test takes a long time on OS/2.
-    lt_cv_sys_max_cmd_len=8192
-    ;;
-
-  osf*)
-    # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure
-    # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not
-    # nice to cause kernel panics so lets avoid the loop below.
-    # First set a reasonable default.
-    lt_cv_sys_max_cmd_len=16384
-    #
-    if test -x /sbin/sysconfig; then
-      case `/sbin/sysconfig -q proc exec_disable_arg_limit` in
-        *1*) lt_cv_sys_max_cmd_len=-1 ;;
-      esac
-    fi
-    ;;
-  sco3.2v5*)
-    lt_cv_sys_max_cmd_len=102400
-    ;;
-  sysv5* | sco5v6* | sysv4.2uw2*)
-    kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null`
-    if test -n "$kargmax"; then
-      lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[	 ]//'`
-    else
-      lt_cv_sys_max_cmd_len=32768
-    fi
-    ;;
-  *)
-    lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null`
-    if test -n "$lt_cv_sys_max_cmd_len" && \
-       test undefined != "$lt_cv_sys_max_cmd_len"; then
-      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
-      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
-    else
-      # Make teststring a little bigger before we do anything with it.
-      # a 1K string should be a reasonable start.
-      for i in 1 2 3 4 5 6 7 8; do
-        teststring=$teststring$teststring
-      done
-      SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
-      # If test is not a shell built-in, we'll probably end up computing a
-      # maximum length that is only half of the actual maximum length, but
-      # we can't tell.
-      while { test X`env echo "$teststring$teststring" 2>/dev/null` \
-	         = "X$teststring$teststring"; } >/dev/null 2>&1 &&
-	      test 17 != "$i" # 1/2 MB should be enough
-      do
-        i=`expr $i + 1`
-        teststring=$teststring$teststring
-      done
-      # Only check the string length outside the loop.
-      lt_cv_sys_max_cmd_len=`expr "X$teststring" : ".*" 2>&1`
-      teststring=
-      # Add a significant safety factor because C++ compilers can tack on
-      # massive amounts of additional arguments before passing them to the
-      # linker.  It appears as though 1/2 is a usable value.
-      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
-    fi
-    ;;
-  esac
-
-fi
-
-if test -n "$lt_cv_sys_max_cmd_len"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sys_max_cmd_len" >&5
-$as_echo "$lt_cv_sys_max_cmd_len" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: none" >&5
-$as_echo "none" >&6; }
-fi
-max_cmd_len=$lt_cv_sys_max_cmd_len
-
-
-
-
-
-
-: ${CP="cp -f"}
-: ${MV="mv -f"}
-: ${RM="rm -f"}
-
-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
-  lt_unset=unset
-else
-  lt_unset=false
-fi
-
-
-
-
-
-# test EBCDIC or ASCII
-case `echo X|tr X '\101'` in
- A) # ASCII based system
-    # \n is not interpreted correctly by Solaris 8 /usr/ucb/tr
-  lt_SP2NL='tr \040 \012'
-  lt_NL2SP='tr \015\012 \040\040'
-  ;;
- *) # EBCDIC based system
-  lt_SP2NL='tr \100 \n'
-  lt_NL2SP='tr \r\n \100\100'
-  ;;
-esac
-
-
-
-
-
-
-
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5
-$as_echo_n "checking how to convert $build file names to $host format... " >&6; }
-if ${lt_cv_to_host_file_cmd+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $host in
-  *-*-mingw* )
-    case $build in
-      *-*-mingw* ) # actually msys
-        lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32
-        ;;
-      *-*-cygwin* )
-        lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32
-        ;;
-      * ) # otherwise, assume *nix
-        lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32
-        ;;
-    esac
-    ;;
-  *-*-cygwin* )
-    case $build in
-      *-*-mingw* ) # actually msys
-        lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin
-        ;;
-      *-*-cygwin* )
-        lt_cv_to_host_file_cmd=func_convert_file_noop
-        ;;
-      * ) # otherwise, assume *nix
-        lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin
-        ;;
-    esac
-    ;;
-  * ) # unhandled hosts (and "normal" native builds)
-    lt_cv_to_host_file_cmd=func_convert_file_noop
-    ;;
-esac
-
-fi
-
-to_host_file_cmd=$lt_cv_to_host_file_cmd
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5
-$as_echo "$lt_cv_to_host_file_cmd" >&6; }
-
-
-
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5
-$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; }
-if ${lt_cv_to_tool_file_cmd+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  #assume ordinary cross tools, or native build.
-lt_cv_to_tool_file_cmd=func_convert_file_noop
-case $host in
-  *-*-mingw* )
-    case $build in
-      *-*-mingw* ) # actually msys
-        lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32
-        ;;
-    esac
-    ;;
-esac
-
-fi
-
-to_tool_file_cmd=$lt_cv_to_tool_file_cmd
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5
-$as_echo "$lt_cv_to_tool_file_cmd" >&6; }
-
-
-
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
-$as_echo_n "checking for $LD option to reload object files... " >&6; }
-if ${lt_cv_ld_reload_flag+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_ld_reload_flag='-r'
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_reload_flag" >&5
-$as_echo "$lt_cv_ld_reload_flag" >&6; }
-reload_flag=$lt_cv_ld_reload_flag
-case $reload_flag in
-"" | " "*) ;;
-*) reload_flag=" $reload_flag" ;;
-esac
-reload_cmds='$LD$reload_flag -o $output$reload_objs'
-case $host_os in
-  cygwin* | mingw* | pw32* | cegcc*)
-    if test yes != "$GCC"; then
-      reload_cmds=false
-    fi
-    ;;
-  darwin*)
-    if test yes = "$GCC"; then
-      reload_cmds='$LTCC $LTCFLAGS -nostdlib $wl-r -o $output$reload_objs'
-    else
-      reload_cmds='$LD$reload_flag -o $output$reload_objs'
-    fi
-    ;;
-esac
-
-
-
-
-
-
-
-
-
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args.
-set dummy ${ac_tool_prefix}objdump; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_OBJDUMP+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$OBJDUMP"; then
-  ac_cv_prog_OBJDUMP="$OBJDUMP" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-OBJDUMP=$ac_cv_prog_OBJDUMP
-if test -n "$OBJDUMP"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OBJDUMP" >&5
-$as_echo "$OBJDUMP" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_OBJDUMP"; then
-  ac_ct_OBJDUMP=$OBJDUMP
-  # Extract the first word of "objdump", so it can be a program name with args.
-set dummy objdump; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_OBJDUMP+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_OBJDUMP"; then
-  ac_cv_prog_ac_ct_OBJDUMP="$ac_ct_OBJDUMP" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_OBJDUMP="objdump"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP
-if test -n "$ac_ct_OBJDUMP"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OBJDUMP" >&5
-$as_echo "$ac_ct_OBJDUMP" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-  if test "x$ac_ct_OBJDUMP" = x; then
-    OBJDUMP="false"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    OBJDUMP=$ac_ct_OBJDUMP
-  fi
-else
-  OBJDUMP="$ac_cv_prog_OBJDUMP"
-fi
-
-test -z "$OBJDUMP" && OBJDUMP=objdump
-
-
-
-
-
-
-
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to recognize dependent libraries" >&5
-$as_echo_n "checking how to recognize dependent libraries... " >&6; }
-if ${lt_cv_deplibs_check_method+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_file_magic_cmd='$MAGIC_CMD'
-lt_cv_file_magic_test_file=
-lt_cv_deplibs_check_method='unknown'
-# Need to set the preceding variable on all platforms that support
-# interlibrary dependencies.
-# 'none' -- dependencies not supported.
-# 'unknown' -- same as none, but documents that we really don't know.
-# 'pass_all' -- all dependencies passed with no checks.
-# 'test_compile' -- check by making test program.
-# 'file_magic [[regex]]' -- check by looking for files in library path
-# that responds to the $file_magic_cmd with a given extended regex.
-# If you have 'file' or equivalent on your system and you're not sure
-# whether 'pass_all' will *always* work, you probably want this one.
-
-case $host_os in
-aix[4-9]*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-beos*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-bsdi[45]*)
-  lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib)'
-  lt_cv_file_magic_cmd='/usr/bin/file -L'
-  lt_cv_file_magic_test_file=/shlib/libc.so
-  ;;
-
-cygwin*)
-  # func_win32_libid is a shell function defined in ltmain.sh
-  lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
-  lt_cv_file_magic_cmd='func_win32_libid'
-  ;;
-
-mingw* | pw32*)
-  # Base MSYS/MinGW do not provide the 'file' command needed by
-  # func_win32_libid shell function, so use a weaker test based on 'objdump',
-  # unless we find 'file', for example because we are cross-compiling.
-  if ( file / ) >/dev/null 2>&1; then
-    lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
-    lt_cv_file_magic_cmd='func_win32_libid'
-  else
-    # Keep this pattern in sync with the one in func_win32_libid.
-    lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)'
-    lt_cv_file_magic_cmd='$OBJDUMP -f'
-  fi
-  ;;
-
-cegcc*)
-  # use the weaker test based on 'objdump'. See mingw*.
-  lt_cv_deplibs_check_method='file_magic file format pe-arm-.*little(.*architecture: arm)?'
-  lt_cv_file_magic_cmd='$OBJDUMP -f'
-  ;;
-
-darwin* | rhapsody*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-freebsd* | dragonfly*)
-  if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
-    case $host_cpu in
-    i*86 )
-      # Not sure whether the presence of OpenBSD here was a mistake.
-      # Let's accept both of them until this is cleared up.
-      lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[3-9]86 (compact )?demand paged shared library'
-      lt_cv_file_magic_cmd=/usr/bin/file
-      lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
-      ;;
-    esac
-  else
-    lt_cv_deplibs_check_method=pass_all
-  fi
-  ;;
-
-haiku*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-hpux10.20* | hpux11*)
-  lt_cv_file_magic_cmd=/usr/bin/file
-  case $host_cpu in
-  ia64*)
-    lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - IA64'
-    lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
-    ;;
-  hppa*64*)
-    lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF[ -][0-9][0-9])(-bit)?( [LM]SB)? shared object( file)?[, -]* PA-RISC [0-9]\.[0-9]'
-    lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl
-    ;;
-  *)
-    lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9]\.[0-9]) shared library'
-    lt_cv_file_magic_test_file=/usr/lib/libc.sl
-    ;;
-  esac
-  ;;
-
-interix[3-9]*)
-  # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here
-  lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|\.a)$'
-  ;;
-
-irix5* | irix6* | nonstopux*)
-  case $LD in
-  *-32|*"-32 ") libmagic=32-bit;;
-  *-n32|*"-n32 ") libmagic=N32;;
-  *-64|*"-64 ") libmagic=64-bit;;
-  *) libmagic=never-match;;
-  esac
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-# This must be glibc/ELF.
-linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-netbsd*)
-  if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
-    lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
-  else
-    lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|_pic\.a)$'
-  fi
-  ;;
-
-newos6*)
-  lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (executable|dynamic lib)'
-  lt_cv_file_magic_cmd=/usr/bin/file
-  lt_cv_file_magic_test_file=/usr/lib/libnls.so
-  ;;
-
-*nto* | *qnx*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-openbsd* | bitrig*)
-  if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then
-    lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|\.so|_pic\.a)$'
-  else
-    lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
-  fi
-  ;;
-
-osf3* | osf4* | osf5*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-rdos*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-solaris*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-sysv4 | sysv4.3*)
-  case $host_vendor in
-  motorola)
-    lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib) M[0-9][0-9]* Version [0-9]'
-    lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*`
-    ;;
-  ncr)
-    lt_cv_deplibs_check_method=pass_all
-    ;;
-  sequent)
-    lt_cv_file_magic_cmd='/bin/file'
-    lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic lib )'
-    ;;
-  sni)
-    lt_cv_file_magic_cmd='/bin/file'
-    lt_cv_deplibs_check_method="file_magic ELF [0-9][0-9]*-bit [LM]SB dynamic lib"
-    lt_cv_file_magic_test_file=/lib/libc.so
-    ;;
-  siemens)
-    lt_cv_deplibs_check_method=pass_all
-    ;;
-  pc)
-    lt_cv_deplibs_check_method=pass_all
-    ;;
-  esac
-  ;;
-
-tpf*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-os2*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-esac
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
-$as_echo "$lt_cv_deplibs_check_method" >&6; }
-
-file_magic_glob=
-want_nocaseglob=no
-if test "$build" = "$host"; then
-  case $host_os in
-  mingw* | pw32*)
-    if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then
-      want_nocaseglob=yes
-    else
-      file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[\1]\/[\1]\/g;/g"`
-    fi
-    ;;
-  esac
-fi
-
-file_magic_cmd=$lt_cv_file_magic_cmd
-deplibs_check_method=$lt_cv_deplibs_check_method
-test -z "$deplibs_check_method" && deplibs_check_method=unknown
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
-set dummy ${ac_tool_prefix}dlltool; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_DLLTOOL+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$DLLTOOL"; then
-  ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-DLLTOOL=$ac_cv_prog_DLLTOOL
-if test -n "$DLLTOOL"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5
-$as_echo "$DLLTOOL" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_DLLTOOL"; then
-  ac_ct_DLLTOOL=$DLLTOOL
-  # Extract the first word of "dlltool", so it can be a program name with args.
-set dummy dlltool; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_DLLTOOL+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_DLLTOOL"; then
-  ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_DLLTOOL="dlltool"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL
-if test -n "$ac_ct_DLLTOOL"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5
-$as_echo "$ac_ct_DLLTOOL" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-  if test "x$ac_ct_DLLTOOL" = x; then
-    DLLTOOL="false"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    DLLTOOL=$ac_ct_DLLTOOL
-  fi
-else
-  DLLTOOL="$ac_cv_prog_DLLTOOL"
-fi
-
-test -z "$DLLTOOL" && DLLTOOL=dlltool
-
-
-
-
-
-
-
-
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5
-$as_echo_n "checking how to associate runtime and link libraries... " >&6; }
-if ${lt_cv_sharedlib_from_linklib_cmd+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_sharedlib_from_linklib_cmd='unknown'
-
-case $host_os in
-cygwin* | mingw* | pw32* | cegcc*)
-  # two different shell functions defined in ltmain.sh;
-  # decide which one to use based on capabilities of $DLLTOOL
-  case `$DLLTOOL --help 2>&1` in
-  *--identify-strict*)
-    lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib
-    ;;
-  *)
-    lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback
-    ;;
-  esac
-  ;;
-*)
-  # fallback: assume linklib IS sharedlib
-  lt_cv_sharedlib_from_linklib_cmd=$ECHO
-  ;;
-esac
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5
-$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; }
-sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd
-test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO
-
-
-
-
-
-
-
-
-if test -n "$ac_tool_prefix"; then
-  for ac_prog in ar
-  do
-    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
-set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_AR+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$AR"; then
-  ac_cv_prog_AR="$AR" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_AR="$ac_tool_prefix$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-AR=$ac_cv_prog_AR
-if test -n "$AR"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AR" >&5
-$as_echo "$AR" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-    test -n "$AR" && break
-  done
-fi
-if test -z "$AR"; then
-  ac_ct_AR=$AR
-  for ac_prog in ar
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_AR+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_AR"; then
-  ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_AR="$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_AR=$ac_cv_prog_ac_ct_AR
-if test -n "$ac_ct_AR"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5
-$as_echo "$ac_ct_AR" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  test -n "$ac_ct_AR" && break
-done
-
-  if test "x$ac_ct_AR" = x; then
-    AR="false"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    AR=$ac_ct_AR
-  fi
-fi
-
-: ${AR=ar}
-
-
-
-
-
-
-# Use ARFLAGS variable as AR's operation code to sync the variable naming with
-# Automake.  If both AR_FLAGS and ARFLAGS are specified, AR_FLAGS should have
-# higher priority because thats what people were doing historically (setting
-# ARFLAGS for automake and AR_FLAGS for libtool).  FIXME: Make the AR_FLAGS
-# variable obsoleted/removed.
-
-test ${AR_FLAGS+y} || AR_FLAGS=${ARFLAGS-cr}
-lt_ar_flags=$AR_FLAGS
-
-
-
-
-
-
-# Make AR_FLAGS overridable by 'make ARFLAGS='.  Don't try to run-time override
-# by AR_FLAGS because that was never working and AR_FLAGS is about to die.
-
-
-
-
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5
-$as_echo_n "checking for archiver @FILE support... " >&6; }
-if ${lt_cv_ar_at_file+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_ar_at_file=no
-   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  echo conftest.$ac_objext > conftest.lst
-      lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5'
-      { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
-  (eval $lt_ar_try) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }
-      if test 0 -eq "$ac_status"; then
-	# Ensure the archiver fails upon bogus file names.
-	rm -f conftest.$ac_objext libconftest.a
-	{ { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
-  (eval $lt_ar_try) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }
-	if test 0 -ne "$ac_status"; then
-          lt_cv_ar_at_file=@
-        fi
-      fi
-      rm -f conftest.* libconftest.a
-
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5
-$as_echo "$lt_cv_ar_at_file" >&6; }
-
-if test no = "$lt_cv_ar_at_file"; then
-  archiver_list_spec=
-else
-  archiver_list_spec=$lt_cv_ar_at_file
-fi
-
-
-
-
-
-
-
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
-set dummy ${ac_tool_prefix}strip; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_STRIP+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$STRIP"; then
-  ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_STRIP="${ac_tool_prefix}strip"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-STRIP=$ac_cv_prog_STRIP
-if test -n "$STRIP"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5
-$as_echo "$STRIP" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_STRIP"; then
-  ac_ct_STRIP=$STRIP
-  # Extract the first word of "strip", so it can be a program name with args.
-set dummy strip; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_STRIP+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_STRIP"; then
-  ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_STRIP="strip"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
-if test -n "$ac_ct_STRIP"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5
-$as_echo "$ac_ct_STRIP" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-  if test "x$ac_ct_STRIP" = x; then
-    STRIP=":"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    STRIP=$ac_ct_STRIP
-  fi
-else
-  STRIP="$ac_cv_prog_STRIP"
-fi
-
-test -z "$STRIP" && STRIP=:
-
-
-
-
-
-
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
-set dummy ${ac_tool_prefix}ranlib; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_RANLIB+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$RANLIB"; then
-  ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-RANLIB=$ac_cv_prog_RANLIB
-if test -n "$RANLIB"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5
-$as_echo "$RANLIB" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_RANLIB"; then
-  ac_ct_RANLIB=$RANLIB
-  # Extract the first word of "ranlib", so it can be a program name with args.
-set dummy ranlib; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_RANLIB+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_RANLIB"; then
-  ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_RANLIB="ranlib"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
-if test -n "$ac_ct_RANLIB"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5
-$as_echo "$ac_ct_RANLIB" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-  if test "x$ac_ct_RANLIB" = x; then
-    RANLIB=":"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    RANLIB=$ac_ct_RANLIB
-  fi
-else
-  RANLIB="$ac_cv_prog_RANLIB"
-fi
-
-test -z "$RANLIB" && RANLIB=:
-
-
-
-
-
-
-# Determine commands to create old-style static archives.
-old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs'
-old_postinstall_cmds='chmod 644 $oldlib'
-old_postuninstall_cmds=
-
-if test -n "$RANLIB"; then
-  case $host_os in
-  bitrig* | openbsd*)
-    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib"
-    ;;
-  *)
-    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$tool_oldlib"
-    ;;
-  esac
-  old_archive_cmds="$old_archive_cmds~\$RANLIB \$tool_oldlib"
-fi
-
-case $host_os in
-  darwin*)
-    lock_old_archive_extraction=yes ;;
-  *)
-    lock_old_archive_extraction=no ;;
-esac
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-# If no C compiler was specified, use CC.
-LTCC=${LTCC-"$CC"}
-
-# If no C compiler flags were specified, use CFLAGS.
-LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
-
-# Allow CC to be a program name with arguments.
-compiler=$CC
-
-
-# Check for command to grab the raw symbol name followed by C symbol from nm.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking command to parse $NM output from $compiler object" >&5
-$as_echo_n "checking command to parse $NM output from $compiler object... " >&6; }
-if ${lt_cv_sys_global_symbol_pipe+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-
-# These are sane defaults that work on at least a few old systems.
-# [They come from Ultrix.  What could be older than Ultrix?!! ;)]
-
-# Character class describing NM global symbol codes.
-symcode='[BCDEGRST]'
-
-# Regexp to match symbols that can be accessed directly from C.
-sympat='\([_A-Za-z][_A-Za-z0-9]*\)'
-
-# Define system-specific variables.
-case $host_os in
-aix*)
-  symcode='[BCDT]'
-  ;;
-cygwin* | mingw* | pw32* | cegcc*)
-  symcode='[ABCDGISTW]'
-  ;;
-hpux*)
-  if test ia64 = "$host_cpu"; then
-    symcode='[ABCDEGRST]'
-  fi
-  ;;
-irix* | nonstopux*)
-  symcode='[BCDEGRST]'
-  ;;
-osf*)
-  symcode='[BCDEGQRST]'
-  ;;
-solaris*)
-  symcode='[BDRT]'
-  ;;
-sco3.2v5*)
-  symcode='[DT]'
-  ;;
-sysv4.2uw2*)
-  symcode='[DT]'
-  ;;
-sysv5* | sco5v6* | unixware* | OpenUNIX*)
-  symcode='[ABDT]'
-  ;;
-sysv4)
-  symcode='[DFNSTU]'
-  ;;
-esac
-
-# If we're using GNU nm, then use its standard symbol codes.
-case `$NM -V 2>&1` in
-*GNU* | *'with BFD'*)
-  symcode='[ABCDGIRSTW]' ;;
-esac
-
-if test "$lt_cv_nm_interface" = "MS dumpbin"; then
-  # Gets list of data symbols to import.
-  lt_cv_sys_global_symbol_to_import="sed -n -e 's/^I .* \(.*\)$/\1/p'"
-  # Adjust the below global symbol transforms to fixup imported variables.
-  lt_cdecl_hook=" -e 's/^I .* \(.*\)$/extern __declspec(dllimport) char \1;/p'"
-  lt_c_name_hook=" -e 's/^I .* \(.*\)$/  {\"\1\", (void *) 0},/p'"
-  lt_c_name_lib_hook="\
-  -e 's/^I .* \(lib.*\)$/  {\"\1\", (void *) 0},/p'\
-  -e 's/^I .* \(.*\)$/  {\"lib\1\", (void *) 0},/p'"
-else
-  # Disable hooks by default.
-  lt_cv_sys_global_symbol_to_import=
-  lt_cdecl_hook=
-  lt_c_name_hook=
-  lt_c_name_lib_hook=
-fi
-
-# Transform an extracted symbol line into a proper C declaration.
-# Some systems (esp. on ia64) link data and code symbols differently,
-# so use this general approach.
-lt_cv_sys_global_symbol_to_cdecl="sed -n"\
-$lt_cdecl_hook\
-" -e 's/^T .* \(.*\)$/extern int \1();/p'"\
-" -e 's/^$symcode$symcode* .* \(.*\)$/extern char \1;/p'"
-
-# Transform an extracted symbol line into symbol name and symbol address
-lt_cv_sys_global_symbol_to_c_name_address="sed -n"\
-$lt_c_name_hook\
-" -e 's/^: \(.*\) .*$/  {\"\1\", (void *) 0},/p'"\
-" -e 's/^$symcode$symcode* .* \(.*\)$/  {\"\1\", (void *) \&\1},/p'"
-
-# Transform an extracted symbol line into symbol name with lib prefix and
-# symbol address.
-lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n"\
-$lt_c_name_lib_hook\
-" -e 's/^: \(.*\) .*$/  {\"\1\", (void *) 0},/p'"\
-" -e 's/^$symcode$symcode* .* \(lib.*\)$/  {\"\1\", (void *) \&\1},/p'"\
-" -e 's/^$symcode$symcode* .* \(.*\)$/  {\"lib\1\", (void *) \&\1},/p'"
-
-# Handle CRLF in mingw tool chain
-opt_cr=
-case $build_os in
-mingw*)
-  opt_cr=`$ECHO 'x\{0,1\}' | tr x '\015'` # option cr in regexp
-  ;;
-esac
-
-# Try without a prefix underscore, then with it.
-for ac_symprfx in "" "_"; do
-
-  # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol.
-  symxfrm="\\1 $ac_symprfx\\2 \\2"
-
-  # Write the raw and C identifiers.
-  if test "$lt_cv_nm_interface" = "MS dumpbin"; then
-    # Fake it for dumpbin and say T for any non-static function,
-    # D for any global variable and I for any imported variable.
-    # Also find C++ and __fastcall symbols from MSVC++ or ICC,
-    # which start with @ or ?.
-    lt_cv_sys_global_symbol_pipe="$AWK '"\
-"     {last_section=section; section=\$ 3};"\
-"     /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\
-"     /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\
-"     /^ *Symbol name *: /{split(\$ 0,sn,\":\"); si=substr(sn[2],2)};"\
-"     /^ *Type *: code/{print \"T\",si,substr(si,length(prfx))};"\
-"     /^ *Type *: data/{print \"I\",si,substr(si,length(prfx))};"\
-"     \$ 0!~/External *\|/{next};"\
-"     / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\
-"     {if(hide[section]) next};"\
-"     {f=\"D\"}; \$ 0~/\(\).*\|/{f=\"T\"};"\
-"     {split(\$ 0,a,/\||\r/); split(a[2],s)};"\
-"     s[1]~/^[@?]/{print f,s[1],s[1]; next};"\
-"     s[1]~prfx {split(s[1],t,\"@\"); print f,t[1],substr(t[1],length(prfx))}"\
-"     ' prfx=^$ac_symprfx"
-  else
-    lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[	 ]\($symcode$symcode*\)[	 ][	 ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
-  fi
-  lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'"
-
-  # Check to see that the pipe works correctly.
-  pipe_works=no
-
-  rm -f conftest*
-  cat > conftest.$ac_ext <<_LT_EOF
-#ifdef __cplusplus
-extern "C" {
-#endif
-char nm_test_var;
-void nm_test_func(void);
-void nm_test_func(void){}
-#ifdef __cplusplus
-}
-#endif
-int main(){nm_test_var='a';nm_test_func();return(0);}
-_LT_EOF
-
-  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-    # Now try to grab the symbols.
-    nlist=conftest.nm
-    if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist\""; } >&5
-  (eval $NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } && test -s "$nlist"; then
-      # Try sorting and uniquifying the output.
-      if sort "$nlist" | uniq > "$nlist"T; then
-	mv -f "$nlist"T "$nlist"
-      else
-	rm -f "$nlist"T
-      fi
-
-      # Make sure that we snagged all the symbols we need.
-      if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
-	if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
-	  cat <<_LT_EOF > conftest.$ac_ext
-/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests.  */
-#if defined _WIN32 || defined __CYGWIN__ || defined _WIN32_WCE
-/* DATA imports from DLLs on WIN32 can't be const, because runtime
-   relocations are performed -- see ld's documentation on pseudo-relocs.  */
-# define LT_DLSYM_CONST
-#elif defined __osf__
-/* This system does not cope well with relocations in const data.  */
-# define LT_DLSYM_CONST
-#else
-# define LT_DLSYM_CONST const
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-_LT_EOF
-	  # Now generate the symbol file.
-	  eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | $GREP -v main >> conftest.$ac_ext'
-
-	  cat <<_LT_EOF >> conftest.$ac_ext
-
-/* The mapping between symbol names and symbols.  */
-LT_DLSYM_CONST struct {
-  const char *name;
-  void       *address;
-}
-lt__PROGRAM__LTX_preloaded_symbols[] =
-{
-  { "@PROGRAM@", (void *) 0 },
-_LT_EOF
-	  $SED "s/^$symcode$symcode* .* \(.*\)$/  {\"\1\", (void *) \&\1},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext
-	  cat <<\_LT_EOF >> conftest.$ac_ext
-  {0, (void *) 0}
-};
-
-/* This works around a problem in FreeBSD linker */
-#ifdef FREEBSD_WORKAROUND
-static const void *lt_preloaded_setup() {
-  return lt__PROGRAM__LTX_preloaded_symbols;
-}
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-_LT_EOF
-	  # Now try linking the two files.
-	  mv conftest.$ac_objext conftstm.$ac_objext
-	  lt_globsym_save_LIBS=$LIBS
-	  lt_globsym_save_CFLAGS=$CFLAGS
-	  LIBS=conftstm.$ac_objext
-	  CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
-	  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } && test -s conftest$ac_exeext; then
-	    pipe_works=yes
-	  fi
-	  LIBS=$lt_globsym_save_LIBS
-	  CFLAGS=$lt_globsym_save_CFLAGS
-	else
-	  echo "cannot find nm_test_func in $nlist" >&5
-	fi
-      else
-	echo "cannot find nm_test_var in $nlist" >&5
-      fi
-    else
-      echo "cannot run $lt_cv_sys_global_symbol_pipe" >&5
-    fi
-  else
-    echo "$progname: failed program was:" >&5
-    cat conftest.$ac_ext >&5
-  fi
-  rm -rf conftest* conftst*
-
-  # Do not use the global_symbol_pipe unless it works.
-  if test yes = "$pipe_works"; then
-    break
-  else
-    lt_cv_sys_global_symbol_pipe=
-  fi
-done
-
-fi
-
-if test -z "$lt_cv_sys_global_symbol_pipe"; then
-  lt_cv_sys_global_symbol_to_cdecl=
-fi
-if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: failed" >&5
-$as_echo "failed" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
-$as_echo "ok" >&6; }
-fi
-
-# Response file support.
-if test "$lt_cv_nm_interface" = "MS dumpbin"; then
-  nm_file_list_spec='@'
-elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then
-  nm_file_list_spec='@'
-fi
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5
-$as_echo_n "checking for sysroot... " >&6; }
-
-# Check whether --with-sysroot was given.
-if test "${with_sysroot+set}" = set; then :
-  withval=$with_sysroot;
-else
-  with_sysroot=no
-fi
-
-
-lt_sysroot=
-case $with_sysroot in #(
- yes)
-   if test yes = "$GCC"; then
-     lt_sysroot=`$CC --print-sysroot 2>/dev/null`
-   fi
-   ;; #(
- /*)
-   lt_sysroot=`echo "$with_sysroot" | sed -e "$sed_quote_subst"`
-   ;; #(
- no|'')
-   ;; #(
- *)
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_sysroot" >&5
-$as_echo "$with_sysroot" >&6; }
-   as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5
-   ;;
-esac
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5
-$as_echo "${lt_sysroot:-no}" >&6; }
-
-
-
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a working dd" >&5
-$as_echo_n "checking for a working dd... " >&6; }
-if ${ac_cv_path_lt_DD+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  printf 0123456789abcdef0123456789abcdef >conftest.i
-cat conftest.i conftest.i >conftest2.i
-: ${lt_DD:=$DD}
-if test -z "$lt_DD"; then
-  ac_path_lt_DD_found=false
-  # Loop through the user's path and test for each of PROGNAME-LIST
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_prog in dd; do
-    for ac_exec_ext in '' $ac_executable_extensions; do
-      ac_path_lt_DD="$as_dir/$ac_prog$ac_exec_ext"
-      as_fn_executable_p "$ac_path_lt_DD" || continue
-if "$ac_path_lt_DD" bs=32 count=1 <conftest2.i >conftest.out 2>/dev/null; then
-  cmp -s conftest.i conftest.out \
-  && ac_cv_path_lt_DD="$ac_path_lt_DD" ac_path_lt_DD_found=:
-fi
-      $ac_path_lt_DD_found && break 3
-    done
-  done
-  done
-IFS=$as_save_IFS
-  if test -z "$ac_cv_path_lt_DD"; then
-    :
-  fi
-else
-  ac_cv_path_lt_DD=$lt_DD
-fi
-
-rm -f conftest.i conftest2.i conftest.out
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_lt_DD" >&5
-$as_echo "$ac_cv_path_lt_DD" >&6; }
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to truncate binary pipes" >&5
-$as_echo_n "checking how to truncate binary pipes... " >&6; }
-if ${lt_cv_truncate_bin+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  printf 0123456789abcdef0123456789abcdef >conftest.i
-cat conftest.i conftest.i >conftest2.i
-lt_cv_truncate_bin=
-if "$ac_cv_path_lt_DD" bs=32 count=1 <conftest2.i >conftest.out 2>/dev/null; then
-  cmp -s conftest.i conftest.out \
-  && lt_cv_truncate_bin="$ac_cv_path_lt_DD bs=4096 count=1"
-fi
-rm -f conftest.i conftest2.i conftest.out
-test -z "$lt_cv_truncate_bin" && lt_cv_truncate_bin="$SED -e 4q"
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_truncate_bin" >&5
-$as_echo "$lt_cv_truncate_bin" >&6; }
-
-
-
-
-
-
-
-# Calculate cc_basename.  Skip known compiler wrappers and cross-prefix.
-func_cc_basename ()
-{
-    for cc_temp in $*""; do
-      case $cc_temp in
-        compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
-        distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
-        \-*) ;;
-        *) break;;
-      esac
-    done
-    func_cc_basename_result=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`
-}
-
-# Check whether --enable-libtool-lock was given.
-if test "${enable_libtool_lock+set}" = set; then :
-  enableval=$enable_libtool_lock;
-fi
-
-test no = "$enable_libtool_lock" || enable_libtool_lock=yes
-
-# Some flags need to be propagated to the compiler or linker for good
-# libtool support.
-case $host in
-ia64-*-hpux*)
-  # Find out what ABI is being produced by ac_compile, and set mode
-  # options accordingly.
-  echo 'int i;' > conftest.$ac_ext
-  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-    case `/usr/bin/file conftest.$ac_objext` in
-      *ELF-32*)
-	HPUX_IA64_MODE=32
-	;;
-      *ELF-64*)
-	HPUX_IA64_MODE=64
-	;;
-    esac
-  fi
-  rm -rf conftest*
-  ;;
-*-*-irix6*)
-  # Find out what ABI is being produced by ac_compile, and set linker
-  # options accordingly.
-  echo '#line '$LINENO' "configure"' > conftest.$ac_ext
-  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-    if test yes = "$lt_cv_prog_gnu_ld"; then
-      case `/usr/bin/file conftest.$ac_objext` in
-	*32-bit*)
-	  LD="${LD-ld} -melf32bsmip"
-	  ;;
-	*N32*)
-	  LD="${LD-ld} -melf32bmipn32"
-	  ;;
-	*64-bit*)
-	  LD="${LD-ld} -melf64bmip"
-	;;
-      esac
-    else
-      case `/usr/bin/file conftest.$ac_objext` in
-	*32-bit*)
-	  LD="${LD-ld} -32"
-	  ;;
-	*N32*)
-	  LD="${LD-ld} -n32"
-	  ;;
-	*64-bit*)
-	  LD="${LD-ld} -64"
-	  ;;
-      esac
-    fi
-  fi
-  rm -rf conftest*
-  ;;
-
-mips64*-*linux*)
-  # Find out what ABI is being produced by ac_compile, and set linker
-  # options accordingly.
-  echo '#line '$LINENO' "configure"' > conftest.$ac_ext
-  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-    emul=elf
-    case `/usr/bin/file conftest.$ac_objext` in
-      *32-bit*)
-	emul="${emul}32"
-	;;
-      *64-bit*)
-	emul="${emul}64"
-	;;
-    esac
-    case `/usr/bin/file conftest.$ac_objext` in
-      *MSB*)
-	emul="${emul}btsmip"
-	;;
-      *LSB*)
-	emul="${emul}ltsmip"
-	;;
-    esac
-    case `/usr/bin/file conftest.$ac_objext` in
-      *N32*)
-	emul="${emul}n32"
-	;;
-    esac
-    LD="${LD-ld} -m $emul"
-  fi
-  rm -rf conftest*
-  ;;
-
-x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \
-s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
-  # Find out what ABI is being produced by ac_compile, and set linker
-  # options accordingly.  Note that the listed cases only cover the
-  # situations where additional linker options are needed (such as when
-  # doing 32-bit compilation for a host where ld defaults to 64-bit, or
-  # vice versa); the common cases where no linker options are needed do
-  # not appear in the list.
-  echo 'int i;' > conftest.$ac_ext
-  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-    case `/usr/bin/file conftest.o` in
-      *32-bit*)
-	case $host in
-	  x86_64-*kfreebsd*-gnu)
-	    LD="${LD-ld} -m elf_i386_fbsd"
-	    ;;
-	  x86_64-*linux*)
-	    case `/usr/bin/file conftest.o` in
-	      *x86-64*)
-		LD="${LD-ld} -m elf32_x86_64"
-		;;
-	      *)
-		LD="${LD-ld} -m elf_i386"
-		;;
-	    esac
-	    ;;
-	  powerpc64le-*linux*)
-	    LD="${LD-ld} -m elf32lppclinux"
-	    ;;
-	  powerpc64-*linux*)
-	    LD="${LD-ld} -m elf32ppclinux"
-	    ;;
-	  s390x-*linux*)
-	    LD="${LD-ld} -m elf_s390"
-	    ;;
-	  sparc64-*linux*)
-	    LD="${LD-ld} -m elf32_sparc"
-	    ;;
-	esac
-	;;
-      *64-bit*)
-	case $host in
-	  x86_64-*kfreebsd*-gnu)
-	    LD="${LD-ld} -m elf_x86_64_fbsd"
-	    ;;
-	  x86_64-*linux*)
-	    LD="${LD-ld} -m elf_x86_64"
-	    ;;
-	  powerpcle-*linux*)
-	    LD="${LD-ld} -m elf64lppc"
-	    ;;
-	  powerpc-*linux*)
-	    LD="${LD-ld} -m elf64ppc"
-	    ;;
-	  s390*-*linux*|s390*-*tpf*)
-	    LD="${LD-ld} -m elf64_s390"
-	    ;;
-	  sparc*-*linux*)
-	    LD="${LD-ld} -m elf64_sparc"
-	    ;;
-	esac
-	;;
-    esac
-  fi
-  rm -rf conftest*
-  ;;
-
-*-*-sco3.2v5*)
-  # On SCO OpenServer 5, we need -belf to get full-featured binaries.
-  SAVE_CFLAGS=$CFLAGS
-  CFLAGS="$CFLAGS -belf"
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler needs -belf" >&5
-$as_echo_n "checking whether the C compiler needs -belf... " >&6; }
-if ${lt_cv_cc_needs_belf+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  lt_cv_cc_needs_belf=yes
-else
-  lt_cv_cc_needs_belf=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-     ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_cc_needs_belf" >&5
-$as_echo "$lt_cv_cc_needs_belf" >&6; }
-  if test yes != "$lt_cv_cc_needs_belf"; then
-    # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
-    CFLAGS=$SAVE_CFLAGS
-  fi
-  ;;
-*-*solaris*)
-  # Find out what ABI is being produced by ac_compile, and set linker
-  # options accordingly.
-  echo 'int i;' > conftest.$ac_ext
-  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-    case `/usr/bin/file conftest.o` in
-    *64-bit*)
-      case $lt_cv_prog_gnu_ld in
-      yes*)
-        case $host in
-        i?86-*-solaris*|x86_64-*-solaris*)
-          LD="${LD-ld} -m elf_x86_64"
-          ;;
-        sparc*-*-solaris*)
-          LD="${LD-ld} -m elf64_sparc"
-          ;;
-        esac
-        # GNU ld 2.21 introduced _sol2 emulations.  Use them if available.
-        if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then
-          LD=${LD-ld}_sol2
-        fi
-        ;;
-      *)
-	if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then
-	  LD="${LD-ld} -64"
-	fi
-	;;
-      esac
-      ;;
-    esac
-  fi
-  rm -rf conftest*
-  ;;
-esac
-
-need_locks=$enable_libtool_lock
-
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args.
-set dummy ${ac_tool_prefix}mt; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_MANIFEST_TOOL+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$MANIFEST_TOOL"; then
-  ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL
-if test -n "$MANIFEST_TOOL"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5
-$as_echo "$MANIFEST_TOOL" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_MANIFEST_TOOL"; then
-  ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL
-  # Extract the first word of "mt", so it can be a program name with args.
-set dummy mt; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_MANIFEST_TOOL+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_MANIFEST_TOOL"; then
-  ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_MANIFEST_TOOL="mt"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL
-if test -n "$ac_ct_MANIFEST_TOOL"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5
-$as_echo "$ac_ct_MANIFEST_TOOL" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-  if test "x$ac_ct_MANIFEST_TOOL" = x; then
-    MANIFEST_TOOL=":"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL
-  fi
-else
-  MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL"
-fi
-
-test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5
-$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; }
-if ${lt_cv_path_mainfest_tool+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_path_mainfest_tool=no
-  echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5
-  $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out
-  cat conftest.err >&5
-  if $GREP 'Manifest Tool' conftest.out > /dev/null; then
-    lt_cv_path_mainfest_tool=yes
-  fi
-  rm -f conftest*
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5
-$as_echo "$lt_cv_path_mainfest_tool" >&6; }
-if test yes != "$lt_cv_path_mainfest_tool"; then
-  MANIFEST_TOOL=:
-fi
-
-
-
-
-
-
-  case $host_os in
-    rhapsody* | darwin*)
-    if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}dsymutil", so it can be a program name with args.
-set dummy ${ac_tool_prefix}dsymutil; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_DSYMUTIL+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$DSYMUTIL"; then
-  ac_cv_prog_DSYMUTIL="$DSYMUTIL" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-DSYMUTIL=$ac_cv_prog_DSYMUTIL
-if test -n "$DSYMUTIL"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DSYMUTIL" >&5
-$as_echo "$DSYMUTIL" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_DSYMUTIL"; then
-  ac_ct_DSYMUTIL=$DSYMUTIL
-  # Extract the first word of "dsymutil", so it can be a program name with args.
-set dummy dsymutil; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_DSYMUTIL+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_DSYMUTIL"; then
-  ac_cv_prog_ac_ct_DSYMUTIL="$ac_ct_DSYMUTIL" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_DSYMUTIL="dsymutil"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_DSYMUTIL=$ac_cv_prog_ac_ct_DSYMUTIL
-if test -n "$ac_ct_DSYMUTIL"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DSYMUTIL" >&5
-$as_echo "$ac_ct_DSYMUTIL" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-  if test "x$ac_ct_DSYMUTIL" = x; then
-    DSYMUTIL=":"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    DSYMUTIL=$ac_ct_DSYMUTIL
-  fi
-else
-  DSYMUTIL="$ac_cv_prog_DSYMUTIL"
-fi
-
-    if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}nmedit", so it can be a program name with args.
-set dummy ${ac_tool_prefix}nmedit; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_NMEDIT+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$NMEDIT"; then
-  ac_cv_prog_NMEDIT="$NMEDIT" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-NMEDIT=$ac_cv_prog_NMEDIT
-if test -n "$NMEDIT"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $NMEDIT" >&5
-$as_echo "$NMEDIT" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_NMEDIT"; then
-  ac_ct_NMEDIT=$NMEDIT
-  # Extract the first word of "nmedit", so it can be a program name with args.
-set dummy nmedit; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_NMEDIT+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_NMEDIT"; then
-  ac_cv_prog_ac_ct_NMEDIT="$ac_ct_NMEDIT" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_NMEDIT="nmedit"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_NMEDIT=$ac_cv_prog_ac_ct_NMEDIT
-if test -n "$ac_ct_NMEDIT"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_NMEDIT" >&5
-$as_echo "$ac_ct_NMEDIT" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-  if test "x$ac_ct_NMEDIT" = x; then
-    NMEDIT=":"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    NMEDIT=$ac_ct_NMEDIT
-  fi
-else
-  NMEDIT="$ac_cv_prog_NMEDIT"
-fi
-
-    if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}lipo", so it can be a program name with args.
-set dummy ${ac_tool_prefix}lipo; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_LIPO+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$LIPO"; then
-  ac_cv_prog_LIPO="$LIPO" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_LIPO="${ac_tool_prefix}lipo"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-LIPO=$ac_cv_prog_LIPO
-if test -n "$LIPO"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIPO" >&5
-$as_echo "$LIPO" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_LIPO"; then
-  ac_ct_LIPO=$LIPO
-  # Extract the first word of "lipo", so it can be a program name with args.
-set dummy lipo; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_LIPO+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_LIPO"; then
-  ac_cv_prog_ac_ct_LIPO="$ac_ct_LIPO" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_LIPO="lipo"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_LIPO=$ac_cv_prog_ac_ct_LIPO
-if test -n "$ac_ct_LIPO"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_LIPO" >&5
-$as_echo "$ac_ct_LIPO" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-  if test "x$ac_ct_LIPO" = x; then
-    LIPO=":"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    LIPO=$ac_ct_LIPO
-  fi
-else
-  LIPO="$ac_cv_prog_LIPO"
-fi
-
-    if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}otool", so it can be a program name with args.
-set dummy ${ac_tool_prefix}otool; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_OTOOL+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$OTOOL"; then
-  ac_cv_prog_OTOOL="$OTOOL" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_OTOOL="${ac_tool_prefix}otool"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-OTOOL=$ac_cv_prog_OTOOL
-if test -n "$OTOOL"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OTOOL" >&5
-$as_echo "$OTOOL" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_OTOOL"; then
-  ac_ct_OTOOL=$OTOOL
-  # Extract the first word of "otool", so it can be a program name with args.
-set dummy otool; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_OTOOL+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_OTOOL"; then
-  ac_cv_prog_ac_ct_OTOOL="$ac_ct_OTOOL" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_OTOOL="otool"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_OTOOL=$ac_cv_prog_ac_ct_OTOOL
-if test -n "$ac_ct_OTOOL"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL" >&5
-$as_echo "$ac_ct_OTOOL" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-  if test "x$ac_ct_OTOOL" = x; then
-    OTOOL=":"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    OTOOL=$ac_ct_OTOOL
-  fi
-else
-  OTOOL="$ac_cv_prog_OTOOL"
-fi
-
-    if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}otool64", so it can be a program name with args.
-set dummy ${ac_tool_prefix}otool64; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_OTOOL64+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$OTOOL64"; then
-  ac_cv_prog_OTOOL64="$OTOOL64" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_OTOOL64="${ac_tool_prefix}otool64"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-OTOOL64=$ac_cv_prog_OTOOL64
-if test -n "$OTOOL64"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OTOOL64" >&5
-$as_echo "$OTOOL64" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_OTOOL64"; then
-  ac_ct_OTOOL64=$OTOOL64
-  # Extract the first word of "otool64", so it can be a program name with args.
-set dummy otool64; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_OTOOL64+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_OTOOL64"; then
-  ac_cv_prog_ac_ct_OTOOL64="$ac_ct_OTOOL64" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_OTOOL64="otool64"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_OTOOL64=$ac_cv_prog_ac_ct_OTOOL64
-if test -n "$ac_ct_OTOOL64"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL64" >&5
-$as_echo "$ac_ct_OTOOL64" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-  if test "x$ac_ct_OTOOL64" = x; then
-    OTOOL64=":"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    OTOOL64=$ac_ct_OTOOL64
-  fi
-else
-  OTOOL64="$ac_cv_prog_OTOOL64"
-fi
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -single_module linker flag" >&5
-$as_echo_n "checking for -single_module linker flag... " >&6; }
-if ${lt_cv_apple_cc_single_mod+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_apple_cc_single_mod=no
-      if test -z "$LT_MULTI_MODULE"; then
-	# By default we will add the -single_module flag. You can override
-	# by either setting the environment variable LT_MULTI_MODULE
-	# non-empty at configure time, or by adding -multi_module to the
-	# link flags.
-	rm -rf libconftest.dylib*
-	echo "int foo(void){return 1;}" > conftest.c
-	echo "$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
--dynamiclib -Wl,-single_module conftest.c" >&5
-	$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
-	  -dynamiclib -Wl,-single_module conftest.c 2>conftest.err
-        _lt_result=$?
-	# If there is a non-empty error log, and "single_module"
-	# appears in it, assume the flag caused a linker warning
-        if test -s conftest.err && $GREP single_module conftest.err; then
-	  cat conftest.err >&5
-	# Otherwise, if the output was created with a 0 exit code from
-	# the compiler, it worked.
-	elif test -f libconftest.dylib && test 0 = "$_lt_result"; then
-	  lt_cv_apple_cc_single_mod=yes
-	else
-	  cat conftest.err >&5
-	fi
-	rm -rf libconftest.dylib*
-	rm -f conftest.*
-      fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_apple_cc_single_mod" >&5
-$as_echo "$lt_cv_apple_cc_single_mod" >&6; }
-
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -exported_symbols_list linker flag" >&5
-$as_echo_n "checking for -exported_symbols_list linker flag... " >&6; }
-if ${lt_cv_ld_exported_symbols_list+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_ld_exported_symbols_list=no
-      save_LDFLAGS=$LDFLAGS
-      echo "_main" > conftest.sym
-      LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym"
-      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  lt_cv_ld_exported_symbols_list=yes
-else
-  lt_cv_ld_exported_symbols_list=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-	LDFLAGS=$save_LDFLAGS
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5
-$as_echo "$lt_cv_ld_exported_symbols_list" >&6; }
-
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -force_load linker flag" >&5
-$as_echo_n "checking for -force_load linker flag... " >&6; }
-if ${lt_cv_ld_force_load+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_ld_force_load=no
-      cat > conftest.c << _LT_EOF
-int forced_loaded() { return 2;}
-_LT_EOF
-      echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&5
-      $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5
-      echo "$AR $AR_FLAGS libconftest.a conftest.o" >&5
-      $AR $AR_FLAGS libconftest.a conftest.o 2>&5
-      echo "$RANLIB libconftest.a" >&5
-      $RANLIB libconftest.a 2>&5
-      cat > conftest.c << _LT_EOF
-int main() { return 0;}
-_LT_EOF
-      echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&5
-      $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err
-      _lt_result=$?
-      if test -s conftest.err && $GREP force_load conftest.err; then
-	cat conftest.err >&5
-      elif test -f conftest && test 0 = "$_lt_result" && $GREP forced_load conftest >/dev/null 2>&1; then
-	lt_cv_ld_force_load=yes
-      else
-	cat conftest.err >&5
-      fi
-        rm -f conftest.err libconftest.a conftest conftest.c
-        rm -rf conftest.dSYM
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_force_load" >&5
-$as_echo "$lt_cv_ld_force_load" >&6; }
-    case $host_os in
-    rhapsody* | darwin1.[012])
-      _lt_dar_allow_undefined='$wl-undefined ${wl}suppress' ;;
-    darwin1.*)
-      _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;;
-    darwin*) # darwin 5.x on
-      # if running on 10.5 or later, the deployment target defaults
-      # to the OS version, if on x86, and 10.4, the deployment
-      # target defaults to 10.4. Don't you love it?
-      case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
-	10.0,*86*-darwin8*|10.0,*-darwin[91]*)
-	  _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;;
-	10.[012][,.]*)
-	  _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;;
-	10.*)
-	  _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;;
-      esac
-    ;;
-  esac
-    if test yes = "$lt_cv_apple_cc_single_mod"; then
-      _lt_dar_single_mod='$single_module'
-    fi
-    if test yes = "$lt_cv_ld_exported_symbols_list"; then
-      _lt_dar_export_syms=' $wl-exported_symbols_list,$output_objdir/$libname-symbols.expsym'
-    else
-      _lt_dar_export_syms='~$NMEDIT -s $output_objdir/$libname-symbols.expsym $lib'
-    fi
-    if test : != "$DSYMUTIL" && test no = "$lt_cv_ld_force_load"; then
-      _lt_dsymutil='~$DSYMUTIL $lib || :'
-    else
-      _lt_dsymutil=
-    fi
-    ;;
-  esac
-
-# func_munge_path_list VARIABLE PATH
-# -----------------------------------
-# VARIABLE is name of variable containing _space_ separated list of
-# directories to be munged by the contents of PATH, which is string
-# having a format:
-# "DIR[:DIR]:"
-#       string "DIR[ DIR]" will be prepended to VARIABLE
-# ":DIR[:DIR]"
-#       string "DIR[ DIR]" will be appended to VARIABLE
-# "DIRP[:DIRP]::[DIRA:]DIRA"
-#       string "DIRP[ DIRP]" will be prepended to VARIABLE and string
-#       "DIRA[ DIRA]" will be appended to VARIABLE
-# "DIR[:DIR]"
-#       VARIABLE will be replaced by "DIR[ DIR]"
-func_munge_path_list ()
-{
-    case x$2 in
-    x)
-        ;;
-    *:)
-        eval $1=\"`$ECHO $2 | $SED 's/:/ /g'` \$$1\"
-        ;;
-    x:*)
-        eval $1=\"\$$1 `$ECHO $2 | $SED 's/:/ /g'`\"
-        ;;
-    *::*)
-        eval $1=\"\$$1\ `$ECHO $2 | $SED -e 's/.*:://' -e 's/:/ /g'`\"
-        eval $1=\"`$ECHO $2 | $SED -e 's/::.*//' -e 's/:/ /g'`\ \$$1\"
-        ;;
-    *)
-        eval $1=\"`$ECHO $2 | $SED 's/:/ /g'`\"
-        ;;
-    esac
-}
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5
-$as_echo_n "checking how to run the C preprocessor... " >&6; }
-# On Suns, sometimes $CPP names a directory.
-if test -n "$CPP" && test -d "$CPP"; then
-  CPP=
-fi
-if test -z "$CPP"; then
-  if ${ac_cv_prog_CPP+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-      # Double quotes because CPP needs to be expanded
-    for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
-    do
-      ac_preproc_ok=false
-for ac_c_preproc_warn_flag in '' yes
-do
-  # Use a header file that comes with gcc, so configuring glibc
-  # with a fresh cross-compiler works.
-  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-  # <limits.h> exists even on freestanding compilers.
-  # On the NeXT, cc -E runs the code through the compiler's parser,
-  # not just through cpp. "Syntax error" is here to catch this case.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-		     Syntax error
-_ACEOF
-if ac_fn_c_try_cpp "$LINENO"; then :
-
-else
-  # Broken: fails on valid input.
-continue
-fi
-rm -f conftest.err conftest.i conftest.$ac_ext
-
-  # OK, works on sane cases.  Now check whether nonexistent headers
-  # can be detected and how.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <ac_nonexistent.h>
-_ACEOF
-if ac_fn_c_try_cpp "$LINENO"; then :
-  # Broken: success on invalid input.
-continue
-else
-  # Passes both tests.
-ac_preproc_ok=:
-break
-fi
-rm -f conftest.err conftest.i conftest.$ac_ext
-
-done
-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.i conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then :
-  break
-fi
-
-    done
-    ac_cv_prog_CPP=$CPP
-
-fi
-  CPP=$ac_cv_prog_CPP
-else
-  ac_cv_prog_CPP=$CPP
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5
-$as_echo "$CPP" >&6; }
-ac_preproc_ok=false
-for ac_c_preproc_warn_flag in '' yes
-do
-  # Use a header file that comes with gcc, so configuring glibc
-  # with a fresh cross-compiler works.
-  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-  # <limits.h> exists even on freestanding compilers.
-  # On the NeXT, cc -E runs the code through the compiler's parser,
-  # not just through cpp. "Syntax error" is here to catch this case.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-		     Syntax error
-_ACEOF
-if ac_fn_c_try_cpp "$LINENO"; then :
-
-else
-  # Broken: fails on valid input.
-continue
-fi
-rm -f conftest.err conftest.i conftest.$ac_ext
-
-  # OK, works on sane cases.  Now check whether nonexistent headers
-  # can be detected and how.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <ac_nonexistent.h>
-_ACEOF
-if ac_fn_c_try_cpp "$LINENO"; then :
-  # Broken: success on invalid input.
-continue
-else
-  # Passes both tests.
-ac_preproc_ok=:
-break
-fi
-rm -f conftest.err conftest.i conftest.$ac_ext
-
-done
-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.i conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then :
-
-else
-  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "C preprocessor \"$CPP\" fails sanity check
-See \`config.log' for more details" "$LINENO" 5; }
-fi
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
-$as_echo_n "checking for ANSI C header files... " >&6; }
-if ${ac_cv_header_stdc+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <stdlib.h>
-#include <stdarg.h>
-#include <string.h>
-#include <float.h>
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_header_stdc=yes
-else
-  ac_cv_header_stdc=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-
-if test $ac_cv_header_stdc = yes; then
-  # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <string.h>
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "memchr" >/dev/null 2>&1; then :
-
-else
-  ac_cv_header_stdc=no
-fi
-rm -f conftest*
-
-fi
-
-if test $ac_cv_header_stdc = yes; then
-  # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <stdlib.h>
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "free" >/dev/null 2>&1; then :
-
-else
-  ac_cv_header_stdc=no
-fi
-rm -f conftest*
-
-fi
-
-if test $ac_cv_header_stdc = yes; then
-  # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
-  if test "$cross_compiling" = yes; then :
-  :
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <ctype.h>
-#include <stdlib.h>
-#if ((' ' & 0x0FF) == 0x020)
-# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
-# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
-#else
-# define ISLOWER(c) \
-		   (('a' <= (c) && (c) <= 'i') \
-		     || ('j' <= (c) && (c) <= 'r') \
-		     || ('s' <= (c) && (c) <= 'z'))
-# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
-#endif
-
-#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
-int
-main ()
-{
-  int i;
-  for (i = 0; i < 256; i++)
-    if (XOR (islower (i), ISLOWER (i))
-	|| toupper (i) != TOUPPER (i))
-      return 2;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
-
-else
-  ac_cv_header_stdc=no
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
-fi
-
-fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5
-$as_echo "$ac_cv_header_stdc" >&6; }
-if test $ac_cv_header_stdc = yes; then
-
-$as_echo "#define STDC_HEADERS 1" >>confdefs.h
-
-fi
-
-# On IRIX 5.3, sys/types and inttypes.h are conflicting.
-for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
-		  inttypes.h stdint.h unistd.h
-do :
-  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
-"
-if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
-  cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
-
-fi
-
-done
-
-
-for ac_header in dlfcn.h
-do :
-  ac_fn_c_check_header_compile "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default
-"
-if test "x$ac_cv_header_dlfcn_h" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_DLFCN_H 1
-_ACEOF
-
-fi
-
-done
-
-
-
-
-
-# Set options
-
-
-
-        enable_dlopen=no
-
-
-  enable_win32_dll=no
-
-
-            # Check whether --enable-shared was given.
-if test "${enable_shared+set}" = set; then :
-  enableval=$enable_shared; p=${PACKAGE-default}
-    case $enableval in
-    yes) enable_shared=yes ;;
-    no) enable_shared=no ;;
-    *)
-      enable_shared=no
-      # Look at the argument we got.  We use all the common list separators.
-      lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
-      for pkg in $enableval; do
-	IFS=$lt_save_ifs
-	if test "X$pkg" = "X$p"; then
-	  enable_shared=yes
-	fi
-      done
-      IFS=$lt_save_ifs
-      ;;
-    esac
-else
-  enable_shared=yes
-fi
-
-
-
-
-
-
-
-
-
-  # Check whether --enable-static was given.
-if test "${enable_static+set}" = set; then :
-  enableval=$enable_static; p=${PACKAGE-default}
-    case $enableval in
-    yes) enable_static=yes ;;
-    no) enable_static=no ;;
-    *)
-     enable_static=no
-      # Look at the argument we got.  We use all the common list separators.
-      lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
-      for pkg in $enableval; do
-	IFS=$lt_save_ifs
-	if test "X$pkg" = "X$p"; then
-	  enable_static=yes
-	fi
-      done
-      IFS=$lt_save_ifs
-      ;;
-    esac
-else
-  enable_static=yes
-fi
-
-
-
-
-
-
-
-
-
-
-# Check whether --with-pic was given.
-if test "${with_pic+set}" = set; then :
-  withval=$with_pic; lt_p=${PACKAGE-default}
-    case $withval in
-    yes|no) pic_mode=$withval ;;
-    *)
-      pic_mode=default
-      # Look at the argument we got.  We use all the common list separators.
-      lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
-      for lt_pkg in $withval; do
-	IFS=$lt_save_ifs
-	if test "X$lt_pkg" = "X$lt_p"; then
-	  pic_mode=yes
-	fi
-      done
-      IFS=$lt_save_ifs
-      ;;
-    esac
-else
-  pic_mode=default
-fi
-
-
-
-
-
-
-
-
-  # Check whether --enable-fast-install was given.
-if test "${enable_fast_install+set}" = set; then :
-  enableval=$enable_fast_install; p=${PACKAGE-default}
-    case $enableval in
-    yes) enable_fast_install=yes ;;
-    no) enable_fast_install=no ;;
-    *)
-      enable_fast_install=no
-      # Look at the argument we got.  We use all the common list separators.
-      lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
-      for pkg in $enableval; do
-	IFS=$lt_save_ifs
-	if test "X$pkg" = "X$p"; then
-	  enable_fast_install=yes
-	fi
-      done
-      IFS=$lt_save_ifs
-      ;;
-    esac
-else
-  enable_fast_install=yes
-fi
-
-
-
-
-
-
-
-
-  shared_archive_member_spec=
-case $host,$enable_shared in
-power*-*-aix[5-9]*,yes)
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking which variant of shared library versioning to provide" >&5
-$as_echo_n "checking which variant of shared library versioning to provide... " >&6; }
-
-# Check whether --with-aix-soname was given.
-if test "${with_aix_soname+set}" = set; then :
-  withval=$with_aix_soname; case $withval in
-    aix|svr4|both)
-      ;;
-    *)
-      as_fn_error $? "Unknown argument to --with-aix-soname" "$LINENO" 5
-      ;;
-    esac
-    lt_cv_with_aix_soname=$with_aix_soname
-else
-  if ${lt_cv_with_aix_soname+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_with_aix_soname=aix
-fi
-
-    with_aix_soname=$lt_cv_with_aix_soname
-fi
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_aix_soname" >&5
-$as_echo "$with_aix_soname" >&6; }
-  if test aix != "$with_aix_soname"; then
-    # For the AIX way of multilib, we name the shared archive member
-    # based on the bitwidth used, traditionally 'shr.o' or 'shr_64.o',
-    # and 'shr.imp' or 'shr_64.imp', respectively, for the Import File.
-    # Even when GNU compilers ignore OBJECT_MODE but need '-maix64' flag,
-    # the AIX toolchain works better with OBJECT_MODE set (default 32).
-    if test 64 = "${OBJECT_MODE-32}"; then
-      shared_archive_member_spec=shr_64
-    else
-      shared_archive_member_spec=shr
-    fi
-  fi
-  ;;
-*)
-  with_aix_soname=aix
-  ;;
-esac
-
-
-
-
-
-
-
-
-
-
-# This can be used to rebuild libtool when needed
-LIBTOOL_DEPS=$ltmain
-
-# Always use our own libtool.
-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-test -z "$LN_S" && LN_S="ln -s"
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-if test -n "${ZSH_VERSION+set}"; then
-   setopt NO_GLOB_SUBST
-fi
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for objdir" >&5
-$as_echo_n "checking for objdir... " >&6; }
-if ${lt_cv_objdir+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  rm -f .libs 2>/dev/null
-mkdir .libs 2>/dev/null
-if test -d .libs; then
-  lt_cv_objdir=.libs
-else
-  # MS-DOS does not allow filenames that begin with a dot.
-  lt_cv_objdir=_libs
-fi
-rmdir .libs 2>/dev/null
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_objdir" >&5
-$as_echo "$lt_cv_objdir" >&6; }
-objdir=$lt_cv_objdir
-
-
-
-
-
-cat >>confdefs.h <<_ACEOF
-#define LT_OBJDIR "$lt_cv_objdir/"
-_ACEOF
-
-
-
-
-case $host_os in
-aix3*)
-  # AIX sometimes has problems with the GCC collect2 program.  For some
-  # reason, if we set the COLLECT_NAMES environment variable, the problems
-  # vanish in a puff of smoke.
-  if test set != "${COLLECT_NAMES+set}"; then
-    COLLECT_NAMES=
-    export COLLECT_NAMES
-  fi
-  ;;
-esac
-
-# Global variables:
-ofile=libtool
-can_build_shared=yes
-
-# All known linkers require a '.a' archive for static linking (except MSVC and
-# ICC, which need '.lib').
-libext=a
-
-with_gnu_ld=$lt_cv_prog_gnu_ld
-
-old_CC=$CC
-old_CFLAGS=$CFLAGS
-
-# Set sane defaults for various variables
-test -z "$CC" && CC=cc
-test -z "$LTCC" && LTCC=$CC
-test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS
-test -z "$LD" && LD=ld
-test -z "$ac_objext" && ac_objext=o
-
-func_cc_basename $compiler
-cc_basename=$func_cc_basename_result
-
-
-# Only perform the check for file, if the check method requires it
-test -z "$MAGIC_CMD" && MAGIC_CMD=file
-case $deplibs_check_method in
-file_magic*)
-  if test "$file_magic_cmd" = '$MAGIC_CMD'; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${ac_tool_prefix}file" >&5
-$as_echo_n "checking for ${ac_tool_prefix}file... " >&6; }
-if ${lt_cv_path_MAGIC_CMD+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $MAGIC_CMD in
-[\\/*] |  ?:[\\/]*)
-  lt_cv_path_MAGIC_CMD=$MAGIC_CMD # Let the user override the test with a path.
-  ;;
-*)
-  lt_save_MAGIC_CMD=$MAGIC_CMD
-  lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR
-  ac_dummy="/usr/bin$PATH_SEPARATOR$PATH"
-  for ac_dir in $ac_dummy; do
-    IFS=$lt_save_ifs
-    test -z "$ac_dir" && ac_dir=.
-    if test -f "$ac_dir/${ac_tool_prefix}file"; then
-      lt_cv_path_MAGIC_CMD=$ac_dir/"${ac_tool_prefix}file"
-      if test -n "$file_magic_test_file"; then
-	case $deplibs_check_method in
-	"file_magic "*)
-	  file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"`
-	  MAGIC_CMD=$lt_cv_path_MAGIC_CMD
-	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
-	    $EGREP "$file_magic_regex" > /dev/null; then
-	    :
-	  else
-	    cat <<_LT_EOF 1>&2
-
-*** Warning: the command libtool uses to detect shared libraries,
-*** $file_magic_cmd, produces output that libtool cannot recognize.
-*** The result is that libtool may fail to recognize shared libraries
-*** as such.  This will affect the creation of libtool libraries that
-*** depend on shared libraries, but programs linked with such libtool
-*** libraries will work regardless of this problem.  Nevertheless, you
-*** may want to report the problem to your system manager and/or to
-*** bug-libtool@gnu.org
-
-_LT_EOF
-	  fi ;;
-	esac
-      fi
-      break
-    fi
-  done
-  IFS=$lt_save_ifs
-  MAGIC_CMD=$lt_save_MAGIC_CMD
-  ;;
-esac
-fi
-
-MAGIC_CMD=$lt_cv_path_MAGIC_CMD
-if test -n "$MAGIC_CMD"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5
-$as_echo "$MAGIC_CMD" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-
-
-
-if test -z "$lt_cv_path_MAGIC_CMD"; then
-  if test -n "$ac_tool_prefix"; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for file" >&5
-$as_echo_n "checking for file... " >&6; }
-if ${lt_cv_path_MAGIC_CMD+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $MAGIC_CMD in
-[\\/*] |  ?:[\\/]*)
-  lt_cv_path_MAGIC_CMD=$MAGIC_CMD # Let the user override the test with a path.
-  ;;
-*)
-  lt_save_MAGIC_CMD=$MAGIC_CMD
-  lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR
-  ac_dummy="/usr/bin$PATH_SEPARATOR$PATH"
-  for ac_dir in $ac_dummy; do
-    IFS=$lt_save_ifs
-    test -z "$ac_dir" && ac_dir=.
-    if test -f "$ac_dir/file"; then
-      lt_cv_path_MAGIC_CMD=$ac_dir/"file"
-      if test -n "$file_magic_test_file"; then
-	case $deplibs_check_method in
-	"file_magic "*)
-	  file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"`
-	  MAGIC_CMD=$lt_cv_path_MAGIC_CMD
-	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
-	    $EGREP "$file_magic_regex" > /dev/null; then
-	    :
-	  else
-	    cat <<_LT_EOF 1>&2
-
-*** Warning: the command libtool uses to detect shared libraries,
-*** $file_magic_cmd, produces output that libtool cannot recognize.
-*** The result is that libtool may fail to recognize shared libraries
-*** as such.  This will affect the creation of libtool libraries that
-*** depend on shared libraries, but programs linked with such libtool
-*** libraries will work regardless of this problem.  Nevertheless, you
-*** may want to report the problem to your system manager and/or to
-*** bug-libtool@gnu.org
-
-_LT_EOF
-	  fi ;;
-	esac
-      fi
-      break
-    fi
-  done
-  IFS=$lt_save_ifs
-  MAGIC_CMD=$lt_save_MAGIC_CMD
-  ;;
-esac
-fi
-
-MAGIC_CMD=$lt_cv_path_MAGIC_CMD
-if test -n "$MAGIC_CMD"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5
-$as_echo "$MAGIC_CMD" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  else
-    MAGIC_CMD=:
-  fi
-fi
-
-  fi
-  ;;
-esac
-
-# Use C for the default configuration in the libtool script
-
-lt_save_CC=$CC
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-
-# Source file extension for C test sources.
-ac_ext=c
-
-# Object file extension for compiled C test sources.
-objext=o
-objext=$objext
-
-# Code to be used in simple compile tests
-lt_simple_compile_test_code="int some_variable = 0;"
-
-# Code to be used in simple link tests
-lt_simple_link_test_code='int main(){return(0);}'
-
-
-
-
-
-
-
-# If no C compiler was specified, use CC.
-LTCC=${LTCC-"$CC"}
-
-# If no C compiler flags were specified, use CFLAGS.
-LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
-
-# Allow CC to be a program name with arguments.
-compiler=$CC
-
-# Save the default compiler, since it gets overwritten when the other
-# tags are being tested, and _LT_TAGVAR(compiler, []) is a NOP.
-compiler_DEFAULT=$CC
-
-# save warnings/boilerplate of simple test code
-ac_outfile=conftest.$ac_objext
-echo "$lt_simple_compile_test_code" >conftest.$ac_ext
-eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
-_lt_compiler_boilerplate=`cat conftest.err`
-$RM conftest*
-
-ac_outfile=conftest.$ac_objext
-echo "$lt_simple_link_test_code" >conftest.$ac_ext
-eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
-_lt_linker_boilerplate=`cat conftest.err`
-$RM -r conftest*
-
-
-if test -n "$compiler"; then
-
-lt_prog_compiler_no_builtin_flag=
-
-if test yes = "$GCC"; then
-  case $cc_basename in
-  nvcc*)
-    lt_prog_compiler_no_builtin_flag=' -Xcompiler -fno-builtin' ;;
-  *)
-    lt_prog_compiler_no_builtin_flag=' -fno-builtin' ;;
-  esac
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
-$as_echo_n "checking if $compiler supports -fno-rtti -fno-exceptions... " >&6; }
-if ${lt_cv_prog_compiler_rtti_exceptions+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_prog_compiler_rtti_exceptions=no
-   ac_outfile=conftest.$ac_objext
-   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-   lt_compiler_flag="-fno-rtti -fno-exceptions"  ## exclude from sc_useless_quotes_in_assignment
-   # Insert the option either (1) after the last *FLAGS variable, or
-   # (2) before a word containing "conftest.", or (3) at the end.
-   # Note that $ac_compile itself does not contain backslashes and begins
-   # with a dollar sign (not a hyphen), so the echo should work correctly.
-   # The option is referenced via a variable to avoid confusing sed.
-   lt_compile=`echo "$ac_compile" | $SED \
-   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-   -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
-   (eval "$lt_compile" 2>conftest.err)
-   ac_status=$?
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   if (exit $ac_status) && test -s "$ac_outfile"; then
-     # The compiler can only warn and ignore the option if not recognized
-     # So say no if there are warnings other than the usual output.
-     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp
-     $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
-     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
-       lt_cv_prog_compiler_rtti_exceptions=yes
-     fi
-   fi
-   $RM conftest*
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
-$as_echo "$lt_cv_prog_compiler_rtti_exceptions" >&6; }
-
-if test yes = "$lt_cv_prog_compiler_rtti_exceptions"; then
-    lt_prog_compiler_no_builtin_flag="$lt_prog_compiler_no_builtin_flag -fno-rtti -fno-exceptions"
-else
-    :
-fi
-
-fi
-
-
-
-
-
-
-  lt_prog_compiler_wl=
-lt_prog_compiler_pic=
-lt_prog_compiler_static=
-
-
-  if test yes = "$GCC"; then
-    lt_prog_compiler_wl='-Wl,'
-    lt_prog_compiler_static='-static'
-
-    case $host_os in
-      aix*)
-      # All AIX code is PIC.
-      if test ia64 = "$host_cpu"; then
-	# AIX 5 now supports IA64 processor
-	lt_prog_compiler_static='-Bstatic'
-      fi
-      lt_prog_compiler_pic='-fPIC'
-      ;;
-
-    amigaos*)
-      case $host_cpu in
-      powerpc)
-            # see comment about AmigaOS4 .so support
-            lt_prog_compiler_pic='-fPIC'
-        ;;
-      m68k)
-            # FIXME: we need at least 68020 code to build shared libraries, but
-            # adding the '-m68020' flag to GCC prevents building anything better,
-            # like '-m68040'.
-            lt_prog_compiler_pic='-m68020 -resident32 -malways-restore-a4'
-        ;;
-      esac
-      ;;
-
-    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
-      # PIC is the default for these OSes.
-      ;;
-
-    mingw* | cygwin* | pw32* | os2* | cegcc*)
-      # This hack is so that the source file can tell whether it is being
-      # built for inclusion in a dll (and should export symbols for example).
-      # Although the cygwin gcc ignores -fPIC, still need this for old-style
-      # (--disable-auto-import) libraries
-      lt_prog_compiler_pic='-DDLL_EXPORT'
-      case $host_os in
-      os2*)
-	lt_prog_compiler_static='$wl-static'
-	;;
-      esac
-      ;;
-
-    darwin* | rhapsody*)
-      # PIC is the default on this platform
-      # Common symbols not allowed in MH_DYLIB files
-      lt_prog_compiler_pic='-fno-common'
-      ;;
-
-    haiku*)
-      # PIC is the default for Haiku.
-      # The "-static" flag exists, but is broken.
-      lt_prog_compiler_static=
-      ;;
-
-    hpux*)
-      # PIC is the default for 64-bit PA HP-UX, but not for 32-bit
-      # PA HP-UX.  On IA64 HP-UX, PIC is the default but the pic flag
-      # sets the default TLS model and affects inlining.
-      case $host_cpu in
-      hppa*64*)
-	# +Z the default
-	;;
-      *)
-	lt_prog_compiler_pic='-fPIC'
-	;;
-      esac
-      ;;
-
-    interix[3-9]*)
-      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
-      # Instead, we relocate shared libraries at runtime.
-      ;;
-
-    msdosdjgpp*)
-      # Just because we use GCC doesn't mean we suddenly get shared libraries
-      # on systems that don't support them.
-      lt_prog_compiler_can_build_shared=no
-      enable_shared=no
-      ;;
-
-    *nto* | *qnx*)
-      # QNX uses GNU C++, but need to define -shared option too, otherwise
-      # it will coredump.
-      lt_prog_compiler_pic='-fPIC -shared'
-      ;;
-
-    sysv4*MP*)
-      if test -d /usr/nec; then
-	lt_prog_compiler_pic=-Kconform_pic
-      fi
-      ;;
-
-    *)
-      lt_prog_compiler_pic='-fPIC'
-      ;;
-    esac
-
-    case $cc_basename in
-    nvcc*) # Cuda Compiler Driver 2.2
-      lt_prog_compiler_wl='-Xlinker '
-      if test -n "$lt_prog_compiler_pic"; then
-        lt_prog_compiler_pic="-Xcompiler $lt_prog_compiler_pic"
-      fi
-      ;;
-    esac
-  else
-    # PORTME Check for flag to pass linker flags through the system compiler.
-    case $host_os in
-    aix*)
-      lt_prog_compiler_wl='-Wl,'
-      if test ia64 = "$host_cpu"; then
-	# AIX 5 now supports IA64 processor
-	lt_prog_compiler_static='-Bstatic'
-      else
-	lt_prog_compiler_static='-bnso -bI:/lib/syscalls.exp'
-      fi
-      ;;
-
-    darwin* | rhapsody*)
-      # PIC is the default on this platform
-      # Common symbols not allowed in MH_DYLIB files
-      lt_prog_compiler_pic='-fno-common'
-      case $cc_basename in
-      nagfor*)
-        # NAG Fortran compiler
-        lt_prog_compiler_wl='-Wl,-Wl,,'
-        lt_prog_compiler_pic='-PIC'
-        lt_prog_compiler_static='-Bstatic'
-        ;;
-      esac
-      ;;
-
-    mingw* | cygwin* | pw32* | os2* | cegcc*)
-      # This hack is so that the source file can tell whether it is being
-      # built for inclusion in a dll (and should export symbols for example).
-      lt_prog_compiler_pic='-DDLL_EXPORT'
-      case $host_os in
-      os2*)
-	lt_prog_compiler_static='$wl-static'
-	;;
-      esac
-      ;;
-
-    hpux9* | hpux10* | hpux11*)
-      lt_prog_compiler_wl='-Wl,'
-      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
-      # not for PA HP-UX.
-      case $host_cpu in
-      hppa*64*|ia64*)
-	# +Z the default
-	;;
-      *)
-	lt_prog_compiler_pic='+Z'
-	;;
-      esac
-      # Is there a better lt_prog_compiler_static that works with the bundled CC?
-      lt_prog_compiler_static='$wl-a ${wl}archive'
-      ;;
-
-    irix5* | irix6* | nonstopux*)
-      lt_prog_compiler_wl='-Wl,'
-      # PIC (with -KPIC) is the default.
-      lt_prog_compiler_static='-non_shared'
-      ;;
-
-    linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
-      case $cc_basename in
-      # old Intel for x86_64, which still supported -KPIC.
-      ecc*)
-	lt_prog_compiler_wl='-Wl,'
-	lt_prog_compiler_pic='-KPIC'
-	lt_prog_compiler_static='-static'
-        ;;
-      # icc used to be incompatible with GCC.
-      # ICC 10 doesn't accept -KPIC any more.
-      icc* | ifort*)
-	lt_prog_compiler_wl='-Wl,'
-	lt_prog_compiler_pic='-fPIC'
-	lt_prog_compiler_static='-static'
-        ;;
-      # Lahey Fortran 8.1.
-      lf95*)
-	lt_prog_compiler_wl='-Wl,'
-	lt_prog_compiler_pic='--shared'
-	lt_prog_compiler_static='--static'
-	;;
-      nagfor*)
-	# NAG Fortran compiler
-	lt_prog_compiler_wl='-Wl,-Wl,,'
-	lt_prog_compiler_pic='-PIC'
-	lt_prog_compiler_static='-Bstatic'
-	;;
-      tcc*)
-	# Fabrice Bellard et al's Tiny C Compiler
-	lt_prog_compiler_wl='-Wl,'
-	lt_prog_compiler_pic='-fPIC'
-	lt_prog_compiler_static='-static'
-	;;
-      pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
-        # Portland Group compilers (*not* the Pentium gcc compiler,
-	# which looks to be a dead project)
-	lt_prog_compiler_wl='-Wl,'
-	lt_prog_compiler_pic='-fpic'
-	lt_prog_compiler_static='-Bstatic'
-        ;;
-      ccc*)
-        lt_prog_compiler_wl='-Wl,'
-        # All Alpha code is PIC.
-        lt_prog_compiler_static='-non_shared'
-        ;;
-      xl* | bgxl* | bgf* | mpixl*)
-	# IBM XL C 8.0/Fortran 10.1, 11.1 on PPC and BlueGene
-	lt_prog_compiler_wl='-Wl,'
-	lt_prog_compiler_pic='-qpic'
-	lt_prog_compiler_static='-qstaticlink'
-	;;
-      *)
-	case `$CC -V 2>&1 | sed 5q` in
-	*Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [1-7].* | *Sun*Fortran*\ 8.[0-3]*)
-	  # Sun Fortran 8.3 passes all unrecognized flags to the linker
-	  lt_prog_compiler_pic='-KPIC'
-	  lt_prog_compiler_static='-Bstatic'
-	  lt_prog_compiler_wl=''
-	  ;;
-	*Sun\ F* | *Sun*Fortran*)
-	  lt_prog_compiler_pic='-KPIC'
-	  lt_prog_compiler_static='-Bstatic'
-	  lt_prog_compiler_wl='-Qoption ld '
-	  ;;
-	*Sun\ C*)
-	  # Sun C 5.9
-	  lt_prog_compiler_pic='-KPIC'
-	  lt_prog_compiler_static='-Bstatic'
-	  lt_prog_compiler_wl='-Wl,'
-	  ;;
-        *Intel*\ [CF]*Compiler*)
-	  lt_prog_compiler_wl='-Wl,'
-	  lt_prog_compiler_pic='-fPIC'
-	  lt_prog_compiler_static='-static'
-	  ;;
-	*Portland\ Group*)
-	  lt_prog_compiler_wl='-Wl,'
-	  lt_prog_compiler_pic='-fpic'
-	  lt_prog_compiler_static='-Bstatic'
-	  ;;
-	esac
-	;;
-      esac
-      ;;
-
-    newsos6)
-      lt_prog_compiler_pic='-KPIC'
-      lt_prog_compiler_static='-Bstatic'
-      ;;
-
-    *nto* | *qnx*)
-      # QNX uses GNU C++, but need to define -shared option too, otherwise
-      # it will coredump.
-      lt_prog_compiler_pic='-fPIC -shared'
-      ;;
-
-    osf3* | osf4* | osf5*)
-      lt_prog_compiler_wl='-Wl,'
-      # All OSF/1 code is PIC.
-      lt_prog_compiler_static='-non_shared'
-      ;;
-
-    rdos*)
-      lt_prog_compiler_static='-non_shared'
-      ;;
-
-    solaris*)
-      lt_prog_compiler_pic='-KPIC'
-      lt_prog_compiler_static='-Bstatic'
-      case $cc_basename in
-      f77* | f90* | f95* | sunf77* | sunf90* | sunf95*)
-	lt_prog_compiler_wl='-Qoption ld ';;
-      *)
-	lt_prog_compiler_wl='-Wl,';;
-      esac
-      ;;
-
-    sunos4*)
-      lt_prog_compiler_wl='-Qoption ld '
-      lt_prog_compiler_pic='-PIC'
-      lt_prog_compiler_static='-Bstatic'
-      ;;
-
-    sysv4 | sysv4.2uw2* | sysv4.3*)
-      lt_prog_compiler_wl='-Wl,'
-      lt_prog_compiler_pic='-KPIC'
-      lt_prog_compiler_static='-Bstatic'
-      ;;
-
-    sysv4*MP*)
-      if test -d /usr/nec; then
-	lt_prog_compiler_pic='-Kconform_pic'
-	lt_prog_compiler_static='-Bstatic'
-      fi
-      ;;
-
-    sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
-      lt_prog_compiler_wl='-Wl,'
-      lt_prog_compiler_pic='-KPIC'
-      lt_prog_compiler_static='-Bstatic'
-      ;;
-
-    unicos*)
-      lt_prog_compiler_wl='-Wl,'
-      lt_prog_compiler_can_build_shared=no
-      ;;
-
-    uts4*)
-      lt_prog_compiler_pic='-pic'
-      lt_prog_compiler_static='-Bstatic'
-      ;;
-
-    *)
-      lt_prog_compiler_can_build_shared=no
-      ;;
-    esac
-  fi
-
-case $host_os in
-  # For platforms that do not support PIC, -DPIC is meaningless:
-  *djgpp*)
-    lt_prog_compiler_pic=
-    ;;
-  *)
-    lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
-    ;;
-esac
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
-$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
-if ${lt_cv_prog_compiler_pic+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_prog_compiler_pic=$lt_prog_compiler_pic
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5
-$as_echo "$lt_cv_prog_compiler_pic" >&6; }
-lt_prog_compiler_pic=$lt_cv_prog_compiler_pic
-
-#
-# Check to make sure the PIC flag actually works.
-#
-if test -n "$lt_prog_compiler_pic"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
-$as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic works... " >&6; }
-if ${lt_cv_prog_compiler_pic_works+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_prog_compiler_pic_works=no
-   ac_outfile=conftest.$ac_objext
-   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-   lt_compiler_flag="$lt_prog_compiler_pic -DPIC"  ## exclude from sc_useless_quotes_in_assignment
-   # Insert the option either (1) after the last *FLAGS variable, or
-   # (2) before a word containing "conftest.", or (3) at the end.
-   # Note that $ac_compile itself does not contain backslashes and begins
-   # with a dollar sign (not a hyphen), so the echo should work correctly.
-   # The option is referenced via a variable to avoid confusing sed.
-   lt_compile=`echo "$ac_compile" | $SED \
-   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-   -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
-   (eval "$lt_compile" 2>conftest.err)
-   ac_status=$?
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   if (exit $ac_status) && test -s "$ac_outfile"; then
-     # The compiler can only warn and ignore the option if not recognized
-     # So say no if there are warnings other than the usual output.
-     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp
-     $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
-     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
-       lt_cv_prog_compiler_pic_works=yes
-     fi
-   fi
-   $RM conftest*
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works" >&5
-$as_echo "$lt_cv_prog_compiler_pic_works" >&6; }
-
-if test yes = "$lt_cv_prog_compiler_pic_works"; then
-    case $lt_prog_compiler_pic in
-     "" | " "*) ;;
-     *) lt_prog_compiler_pic=" $lt_prog_compiler_pic" ;;
-     esac
-else
-    lt_prog_compiler_pic=
-     lt_prog_compiler_can_build_shared=no
-fi
-
-fi
-
-
-
-
-
-
-
-
-
-
-
-#
-# Check to make sure the static flag actually works.
-#
-wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\"
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" >&5
-$as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; }
-if ${lt_cv_prog_compiler_static_works+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_prog_compiler_static_works=no
-   save_LDFLAGS=$LDFLAGS
-   LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
-   echo "$lt_simple_link_test_code" > conftest.$ac_ext
-   if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
-     # The linker can only warn and ignore the option if not recognized
-     # So say no if there are warnings
-     if test -s conftest.err; then
-       # Append any errors to the config.log.
-       cat conftest.err 1>&5
-       $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp
-       $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
-       if diff conftest.exp conftest.er2 >/dev/null; then
-         lt_cv_prog_compiler_static_works=yes
-       fi
-     else
-       lt_cv_prog_compiler_static_works=yes
-     fi
-   fi
-   $RM -r conftest*
-   LDFLAGS=$save_LDFLAGS
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works" >&5
-$as_echo "$lt_cv_prog_compiler_static_works" >&6; }
-
-if test yes = "$lt_cv_prog_compiler_static_works"; then
-    :
-else
-    lt_prog_compiler_static=
-fi
-
-
-
-
-
-
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
-$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
-if ${lt_cv_prog_compiler_c_o+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_prog_compiler_c_o=no
-   $RM -r conftest 2>/dev/null
-   mkdir conftest
-   cd conftest
-   mkdir out
-   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-
-   lt_compiler_flag="-o out/conftest2.$ac_objext"
-   # Insert the option either (1) after the last *FLAGS variable, or
-   # (2) before a word containing "conftest.", or (3) at the end.
-   # Note that $ac_compile itself does not contain backslashes and begins
-   # with a dollar sign (not a hyphen), so the echo should work correctly.
-   lt_compile=`echo "$ac_compile" | $SED \
-   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-   -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
-   (eval "$lt_compile" 2>out/conftest.err)
-   ac_status=$?
-   cat out/conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   if (exit $ac_status) && test -s out/conftest2.$ac_objext
-   then
-     # The compiler can only warn and ignore the option if not recognized
-     # So say no if there are warnings
-     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp
-     $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
-     if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
-       lt_cv_prog_compiler_c_o=yes
-     fi
-   fi
-   chmod u+w . 2>&5
-   $RM conftest*
-   # SGI C++ compiler will create directory out/ii_files/ for
-   # template instantiation
-   test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files
-   $RM out/* && rmdir out
-   cd ..
-   $RM -r conftest
-   $RM conftest*
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5
-$as_echo "$lt_cv_prog_compiler_c_o" >&6; }
-
-
-
-
-
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
-$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
-if ${lt_cv_prog_compiler_c_o+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_prog_compiler_c_o=no
-   $RM -r conftest 2>/dev/null
-   mkdir conftest
-   cd conftest
-   mkdir out
-   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-
-   lt_compiler_flag="-o out/conftest2.$ac_objext"
-   # Insert the option either (1) after the last *FLAGS variable, or
-   # (2) before a word containing "conftest.", or (3) at the end.
-   # Note that $ac_compile itself does not contain backslashes and begins
-   # with a dollar sign (not a hyphen), so the echo should work correctly.
-   lt_compile=`echo "$ac_compile" | $SED \
-   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-   -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
-   (eval "$lt_compile" 2>out/conftest.err)
-   ac_status=$?
-   cat out/conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   if (exit $ac_status) && test -s out/conftest2.$ac_objext
-   then
-     # The compiler can only warn and ignore the option if not recognized
-     # So say no if there are warnings
-     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp
-     $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
-     if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
-       lt_cv_prog_compiler_c_o=yes
-     fi
-   fi
-   chmod u+w . 2>&5
-   $RM conftest*
-   # SGI C++ compiler will create directory out/ii_files/ for
-   # template instantiation
-   test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files
-   $RM out/* && rmdir out
-   cd ..
-   $RM -r conftest
-   $RM conftest*
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5
-$as_echo "$lt_cv_prog_compiler_c_o" >&6; }
-
-
-
-
-hard_links=nottested
-if test no = "$lt_cv_prog_compiler_c_o" && test no != "$need_locks"; then
-  # do not overwrite the value of need_locks provided by the user
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we can lock with hard links" >&5
-$as_echo_n "checking if we can lock with hard links... " >&6; }
-  hard_links=yes
-  $RM conftest*
-  ln conftest.a conftest.b 2>/dev/null && hard_links=no
-  touch conftest.a
-  ln conftest.a conftest.b 2>&5 || hard_links=no
-  ln conftest.a conftest.b 2>/dev/null && hard_links=no
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $hard_links" >&5
-$as_echo "$hard_links" >&6; }
-  if test no = "$hard_links"; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: '$CC' does not support '-c -o', so 'make -j' may be unsafe" >&5
-$as_echo "$as_me: WARNING: '$CC' does not support '-c -o', so 'make -j' may be unsafe" >&2;}
-    need_locks=warn
-  fi
-else
-  need_locks=no
-fi
-
-
-
-
-
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $compiler linker ($LD) supports shared libraries" >&5
-$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
-
-  runpath_var=
-  allow_undefined_flag=
-  always_export_symbols=no
-  archive_cmds=
-  archive_expsym_cmds=
-  compiler_needs_object=no
-  enable_shared_with_static_runtimes=no
-  export_dynamic_flag_spec=
-  export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-  hardcode_automatic=no
-  hardcode_direct=no
-  hardcode_direct_absolute=no
-  hardcode_libdir_flag_spec=
-  hardcode_libdir_separator=
-  hardcode_minus_L=no
-  hardcode_shlibpath_var=unsupported
-  inherit_rpath=no
-  link_all_deplibs=unknown
-  module_cmds=
-  module_expsym_cmds=
-  old_archive_from_new_cmds=
-  old_archive_from_expsyms_cmds=
-  thread_safe_flag_spec=
-  whole_archive_flag_spec=
-  # include_expsyms should be a list of space-separated symbols to be *always*
-  # included in the symbol list
-  include_expsyms=
-  # exclude_expsyms can be an extended regexp of symbols to exclude
-  # it will be wrapped by ' (' and ')$', so one must not match beginning or
-  # end of line.  Example: 'a|bc|.*d.*' will exclude the symbols 'a' and 'bc',
-  # as well as any symbol that contains 'd'.
-  exclude_expsyms='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'
-  # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
-  # platforms (ab)use it in PIC code, but their linkers get confused if
-  # the symbol is explicitly referenced.  Since portable code cannot
-  # rely on this symbol name, it's probably fine to never include it in
-  # preloaded symbol tables.
-  # Exclude shared library initialization/finalization symbols.
-  extract_expsyms_cmds=
-
-  case $host_os in
-  cygwin* | mingw* | pw32* | cegcc*)
-    # FIXME: the MSVC++ and ICC port hasn't been tested in a loooong time
-    # When not using gcc, we currently assume that we are using
-    # Microsoft Visual C++ or Intel C++ Compiler.
-    if test yes != "$GCC"; then
-      with_gnu_ld=no
-    fi
-    ;;
-  interix*)
-    # we just hope/assume this is gcc and not c89 (= MSVC++ or ICC)
-    with_gnu_ld=yes
-    ;;
-  openbsd* | bitrig*)
-    with_gnu_ld=no
-    ;;
-  esac
-
-  ld_shlibs=yes
-
-  # On some targets, GNU ld is compatible enough with the native linker
-  # that we're better off using the native interface for both.
-  lt_use_gnu_ld_interface=no
-  if test yes = "$with_gnu_ld"; then
-    case $host_os in
-      aix*)
-	# The AIX port of GNU ld has always aspired to compatibility
-	# with the native linker.  However, as the warning in the GNU ld
-	# block says, versions before 2.19.5* couldn't really create working
-	# shared libraries, regardless of the interface used.
-	case `$LD -v 2>&1` in
-	  *\ \(GNU\ Binutils\)\ 2.19.5*) ;;
-	  *\ \(GNU\ Binutils\)\ 2.[2-9]*) ;;
-	  *\ \(GNU\ Binutils\)\ [3-9]*) ;;
-	  *)
-	    lt_use_gnu_ld_interface=yes
-	    ;;
-	esac
-	;;
-      *)
-	lt_use_gnu_ld_interface=yes
-	;;
-    esac
-  fi
-
-  if test yes = "$lt_use_gnu_ld_interface"; then
-    # If archive_cmds runs LD, not CC, wlarc should be empty
-    wlarc='$wl'
-
-    # Set some defaults for GNU ld with shared library support. These
-    # are reset later if shared libraries are not supported. Putting them
-    # here allows them to be overridden if necessary.
-    runpath_var=LD_RUN_PATH
-    hardcode_libdir_flag_spec='$wl-rpath $wl$libdir'
-    export_dynamic_flag_spec='$wl--export-dynamic'
-    # ancient GNU ld didn't support --whole-archive et. al.
-    if $LD --help 2>&1 | $GREP 'no-whole-archive' > /dev/null; then
-      whole_archive_flag_spec=$wlarc'--whole-archive$convenience '$wlarc'--no-whole-archive'
-    else
-      whole_archive_flag_spec=
-    fi
-    supports_anon_versioning=no
-    case `$LD -v | $SED -e 's/(^)\+)\s\+//' 2>&1` in
-      *GNU\ gold*) supports_anon_versioning=yes ;;
-      *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
-      *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
-      *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
-      *\ 2.11.*) ;; # other 2.11 versions
-      *) supports_anon_versioning=yes ;;
-    esac
-
-    # See if GNU ld supports shared libraries.
-    case $host_os in
-    aix[3-9]*)
-      # On AIX/PPC, the GNU linker is very broken
-      if test ia64 != "$host_cpu"; then
-	ld_shlibs=no
-	cat <<_LT_EOF 1>&2
-
-*** Warning: the GNU linker, at least up to release 2.19, is reported
-*** to be unable to reliably create shared libraries on AIX.
-*** Therefore, libtool is disabling shared libraries support.  If you
-*** really care for shared libraries, you may want to install binutils
-*** 2.20 or above, or modify your PATH so that a non-GNU linker is found.
-*** You will then need to restart the configuration process.
-
-_LT_EOF
-      fi
-      ;;
-
-    amigaos*)
-      case $host_cpu in
-      powerpc)
-            # see comment about AmigaOS4 .so support
-            archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
-            archive_expsym_cmds=''
-        ;;
-      m68k)
-            archive_cmds='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
-            hardcode_libdir_flag_spec='-L$libdir'
-            hardcode_minus_L=yes
-        ;;
-      esac
-      ;;
-
-    beos*)
-      if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
-	allow_undefined_flag=unsupported
-	# Joseph Beckenbach <jrb3@best.com> says some releases of gcc
-	# support --undefined.  This deserves some investigation.  FIXME
-	archive_cmds='$CC -nostart $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
-      else
-	ld_shlibs=no
-      fi
-      ;;
-
-    cygwin* | mingw* | pw32* | cegcc*)
-      # _LT_TAGVAR(hardcode_libdir_flag_spec, ) is actually meaningless,
-      # as there is no search path for DLLs.
-      hardcode_libdir_flag_spec='-L$libdir'
-      export_dynamic_flag_spec='$wl--export-all-symbols'
-      allow_undefined_flag=unsupported
-      always_export_symbols=no
-      enable_shared_with_static_runtimes=yes
-      export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols'
-      exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'
-
-      if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
-        archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-	# If the export-symbols file already is a .def file, use it as
-	# is; otherwise, prepend EXPORTS...
-	archive_expsym_cmds='if   test DEF = "`$SED -n     -e '\''s/^[	 ]*//'\''     -e '\''/^\(;.*\)*$/d'\''     -e '\''s/^\(EXPORTS\|LIBRARY\)\([	 ].*\)*$/DEF/p'\''     -e q     $export_symbols`" ; then
-          cp $export_symbols $output_objdir/$soname.def;
-        else
-          echo EXPORTS > $output_objdir/$soname.def;
-          cat $export_symbols >> $output_objdir/$soname.def;
-        fi~
-        $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-      else
-	ld_shlibs=no
-      fi
-      ;;
-
-    haiku*)
-      archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
-      link_all_deplibs=yes
-      ;;
-
-    os2*)
-      hardcode_libdir_flag_spec='-L$libdir'
-      hardcode_minus_L=yes
-      allow_undefined_flag=unsupported
-      shrext_cmds=.dll
-      archive_cmds='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
-	$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
-	$ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
-	$ECHO EXPORTS >> $output_objdir/$libname.def~
-	emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~
-	$CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
-	emximp -o $lib $output_objdir/$libname.def'
-      archive_expsym_cmds='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
-	$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
-	$ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
-	$ECHO EXPORTS >> $output_objdir/$libname.def~
-	prefix_cmds="$SED"~
-	if test EXPORTS = "`$SED 1q $export_symbols`"; then
-	  prefix_cmds="$prefix_cmds -e 1d";
-	fi~
-	prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~
-	cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~
-	$CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
-	emximp -o $lib $output_objdir/$libname.def'
-      old_archive_From_new_cmds='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
-      enable_shared_with_static_runtimes=yes
-      file_list_spec='@'
-      ;;
-
-    interix[3-9]*)
-      hardcode_direct=no
-      hardcode_shlibpath_var=no
-      hardcode_libdir_flag_spec='$wl-rpath,$libdir'
-      export_dynamic_flag_spec='$wl-E'
-      # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
-      # Instead, shared libraries are loaded at an image base (0x10000000 by
-      # default) and relocated if they conflict, which is a slow very memory
-      # consuming and fragmenting process.  To avoid this, we pick a random,
-      # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
-      # time.  Moving up from 0x10000000 also allows more sbrk(2) space.
-      archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
-      archive_expsym_cmds='sed "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--retain-symbols-file,$output_objdir/$soname.expsym $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
-      ;;
-
-    gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu)
-      tmp_diet=no
-      if test linux-dietlibc = "$host_os"; then
-	case $cc_basename in
-	  diet\ *) tmp_diet=yes;;	# linux-dietlibc with static linking (!diet-dyn)
-	esac
-      fi
-      if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \
-	 && test no = "$tmp_diet"
-      then
-	tmp_addflag=' $pic_flag'
-	tmp_sharedflag='-shared'
-	case $cc_basename,$host_cpu in
-        pgcc*)				# Portland Group C compiler
-	  whole_archive_flag_spec='$wl--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
-	  tmp_addflag=' $pic_flag'
-	  ;;
-	pgf77* | pgf90* | pgf95* | pgfortran*)
-					# Portland Group f77 and f90 compilers
-	  whole_archive_flag_spec='$wl--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
-	  tmp_addflag=' $pic_flag -Mnomain' ;;
-	ecc*,ia64* | icc*,ia64*)	# Intel C compiler on ia64
-	  tmp_addflag=' -i_dynamic' ;;
-	efc*,ia64* | ifort*,ia64*)	# Intel Fortran compiler on ia64
-	  tmp_addflag=' -i_dynamic -nofor_main' ;;
-	ifc* | ifort*)			# Intel Fortran compiler
-	  tmp_addflag=' -nofor_main' ;;
-	lf95*)				# Lahey Fortran 8.1
-	  whole_archive_flag_spec=
-	  tmp_sharedflag='--shared' ;;
-        nagfor*)                        # NAGFOR 5.3
-          tmp_sharedflag='-Wl,-shared' ;;
-	xl[cC]* | bgxl[cC]* | mpixl[cC]*) # IBM XL C 8.0 on PPC (deal with xlf below)
-	  tmp_sharedflag='-qmkshrobj'
-	  tmp_addflag= ;;
-	nvcc*)	# Cuda Compiler Driver 2.2
-	  whole_archive_flag_spec='$wl--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
-	  compiler_needs_object=yes
-	  ;;
-	esac
-	case `$CC -V 2>&1 | sed 5q` in
-	*Sun\ C*)			# Sun C 5.9
-	  whole_archive_flag_spec='$wl--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
-	  compiler_needs_object=yes
-	  tmp_sharedflag='-G' ;;
-	*Sun\ F*)			# Sun Fortran 8.3
-	  tmp_sharedflag='-G' ;;
-	esac
-	archive_cmds='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
-
-        if test yes = "$supports_anon_versioning"; then
-          archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
-            cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
-            echo "local: *; };" >> $output_objdir/$libname.ver~
-            $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$output_objdir/$libname.ver -o $lib'
-        fi
-
-	case $cc_basename in
-	tcc*)
-	  export_dynamic_flag_spec='-rdynamic'
-	  ;;
-	xlf* | bgf* | bgxlf* | mpixlf*)
-	  # IBM XL Fortran 10.1 on PPC cannot create shared libs itself
-	  whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
-	  hardcode_libdir_flag_spec='$wl-rpath $wl$libdir'
-	  archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
-	  if test yes = "$supports_anon_versioning"; then
-	    archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
-              cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
-              echo "local: *; };" >> $output_objdir/$libname.ver~
-              $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
-	  fi
-	  ;;
-	esac
-      else
-        ld_shlibs=no
-      fi
-      ;;
-
-    netbsd*)
-      if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
-	archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
-	wlarc=
-      else
-	archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
-	archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
-      fi
-      ;;
-
-    solaris*)
-      if $LD -v 2>&1 | $GREP 'BFD 2\.8' > /dev/null; then
-	ld_shlibs=no
-	cat <<_LT_EOF 1>&2
-
-*** Warning: The releases 2.8.* of the GNU linker cannot reliably
-*** create shared libraries on Solaris systems.  Therefore, libtool
-*** is disabling shared libraries support.  We urge you to upgrade GNU
-*** binutils to release 2.9.1 or newer.  Another option is to modify
-*** your PATH or compiler configuration so that the native linker is
-*** used, and then restart.
-
-_LT_EOF
-      elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
-	archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
-	archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
-      else
-	ld_shlibs=no
-      fi
-      ;;
-
-    sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
-      case `$LD -v 2>&1` in
-        *\ [01].* | *\ 2.[0-9].* | *\ 2.1[0-5].*)
-	ld_shlibs=no
-	cat <<_LT_EOF 1>&2
-
-*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 cannot
-*** reliably create shared libraries on SCO systems.  Therefore, libtool
-*** is disabling shared libraries support.  We urge you to upgrade GNU
-*** binutils to release 2.16.91.0.3 or newer.  Another option is to modify
-*** your PATH or compiler configuration so that the native linker is
-*** used, and then restart.
-
-_LT_EOF
-	;;
-	*)
-	  # For security reasons, it is highly recommended that you always
-	  # use absolute paths for naming shared libraries, and exclude the
-	  # DT_RUNPATH tag from executables and libraries.  But doing so
-	  # requires that you compile everything twice, which is a pain.
-	  if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
-	    hardcode_libdir_flag_spec='$wl-rpath $wl$libdir'
-	    archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
-	    archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
-	  else
-	    ld_shlibs=no
-	  fi
-	;;
-      esac
-      ;;
-
-    sunos4*)
-      archive_cmds='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-      wlarc=
-      hardcode_direct=yes
-      hardcode_shlibpath_var=no
-      ;;
-
-    *)
-      if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
-	archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
-	archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
-      else
-	ld_shlibs=no
-      fi
-      ;;
-    esac
-
-    if test no = "$ld_shlibs"; then
-      runpath_var=
-      hardcode_libdir_flag_spec=
-      export_dynamic_flag_spec=
-      whole_archive_flag_spec=
-    fi
-  else
-    # PORTME fill in a description of your system's linker (not GNU ld)
-    case $host_os in
-    aix3*)
-      allow_undefined_flag=unsupported
-      always_export_symbols=yes
-      archive_expsym_cmds='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname'
-      # Note: this linker hardcodes the directories in LIBPATH if there
-      # are no directories specified by -L.
-      hardcode_minus_L=yes
-      if test yes = "$GCC" && test -z "$lt_prog_compiler_static"; then
-	# Neither direct hardcoding nor static linking is supported with a
-	# broken collect2.
-	hardcode_direct=unsupported
-      fi
-      ;;
-
-    aix[4-9]*)
-      if test ia64 = "$host_cpu"; then
-	# On IA64, the linker does run time linking by default, so we don't
-	# have to do anything special.
-	aix_use_runtimelinking=no
-	exp_sym_flag='-Bexport'
-	no_entry_flag=
-      else
-	# If we're using GNU nm, then we don't want the "-C" option.
-	# -C means demangle to GNU nm, but means don't demangle to AIX nm.
-	# Without the "-l" option, or with the "-B" option, AIX nm treats
-	# weak defined symbols like other global defined symbols, whereas
-	# GNU nm marks them as "W".
-	# While the 'weak' keyword is ignored in the Export File, we need
-	# it in the Import File for the 'aix-soname' feature, so we have
-	# to replace the "-B" option with "-P" for AIX nm.
-	if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
-	  export_symbols_cmds='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { if (\$ 2 == "W") { print \$ 3 " weak" } else { print \$ 3 } } }'\'' | sort -u > $export_symbols'
-	else
-	  export_symbols_cmds='`func_echo_all $NM | $SED -e '\''s/B\([^B]*\)$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "L") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && (substr(\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols'
-	fi
-	aix_use_runtimelinking=no
-
-	# Test if we are trying to use run time linking or normal
-	# AIX style linking. If -brtl is somewhere in LDFLAGS, we
-	# have runtime linking enabled, and use it for executables.
-	# For shared libraries, we enable/disable runtime linking
-	# depending on the kind of the shared library created -
-	# when "with_aix_soname,aix_use_runtimelinking" is:
-	# "aix,no"   lib.a(lib.so.V) shared, rtl:no,  for executables
-	# "aix,yes"  lib.so          shared, rtl:yes, for executables
-	#            lib.a           static archive
-	# "both,no"  lib.so.V(shr.o) shared, rtl:yes
-	#            lib.a(lib.so.V) shared, rtl:no,  for executables
-	# "both,yes" lib.so.V(shr.o) shared, rtl:yes, for executables
-	#            lib.a(lib.so.V) shared, rtl:no
-	# "svr4,*"   lib.so.V(shr.o) shared, rtl:yes, for executables
-	#            lib.a           static archive
-	case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*)
-	  for ld_flag in $LDFLAGS; do
-	  if (test x-brtl = "x$ld_flag" || test x-Wl,-brtl = "x$ld_flag"); then
-	    aix_use_runtimelinking=yes
-	    break
-	  fi
-	  done
-	  if test svr4,no = "$with_aix_soname,$aix_use_runtimelinking"; then
-	    # With aix-soname=svr4, we create the lib.so.V shared archives only,
-	    # so we don't have lib.a shared libs to link our executables.
-	    # We have to force runtime linking in this case.
-	    aix_use_runtimelinking=yes
-	    LDFLAGS="$LDFLAGS -Wl,-brtl"
-	  fi
-	  ;;
-	esac
-
-	exp_sym_flag='-bexport'
-	no_entry_flag='-bnoentry'
-      fi
-
-      # When large executables or shared objects are built, AIX ld can
-      # have problems creating the table of contents.  If linking a library
-      # or program results in "error TOC overflow" add -mminimal-toc to
-      # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
-      # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
-
-      archive_cmds=''
-      hardcode_direct=yes
-      hardcode_direct_absolute=yes
-      hardcode_libdir_separator=':'
-      link_all_deplibs=yes
-      file_list_spec='$wl-f,'
-      case $with_aix_soname,$aix_use_runtimelinking in
-      aix,*) ;; # traditional, no import file
-      svr4,* | *,yes) # use import file
-	# The Import File defines what to hardcode.
-	hardcode_direct=no
-	hardcode_direct_absolute=no
-	;;
-      esac
-
-      if test yes = "$GCC"; then
-	case $host_os in aix4.[012]|aix4.[012].*)
-	# We only want to do this on AIX 4.2 and lower, the check
-	# below for broken collect2 doesn't work under 4.3+
-	  collect2name=`$CC -print-prog-name=collect2`
-	  if test -f "$collect2name" &&
-	   strings "$collect2name" | $GREP resolve_lib_name >/dev/null
-	  then
-	  # We have reworked collect2
-	  :
-	  else
-	  # We have old collect2
-	  hardcode_direct=unsupported
-	  # It fails to find uninstalled libraries when the uninstalled
-	  # path is not listed in the libpath.  Setting hardcode_minus_L
-	  # to unsupported forces relinking
-	  hardcode_minus_L=yes
-	  hardcode_libdir_flag_spec='-L$libdir'
-	  hardcode_libdir_separator=
-	  fi
-	  ;;
-	esac
-	shared_flag='-shared'
-	if test yes = "$aix_use_runtimelinking"; then
-	  shared_flag="$shared_flag "'$wl-G'
-	fi
-	# Need to ensure runtime linking is disabled for the traditional
-	# shared library, or the linker may eventually find shared libraries
-	# /with/ Import File - we do not want to mix them.
-	shared_flag_aix='-shared'
-	shared_flag_svr4='-shared $wl-G'
-      else
-	# not using gcc
-	if test ia64 = "$host_cpu"; then
-	# VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
-	# chokes on -Wl,-G. The following line is correct:
-	  shared_flag='-G'
-	else
-	  if test yes = "$aix_use_runtimelinking"; then
-	    shared_flag='$wl-G'
-	  else
-	    shared_flag='$wl-bM:SRE'
-	  fi
-	  shared_flag_aix='$wl-bM:SRE'
-	  shared_flag_svr4='$wl-G'
-	fi
-      fi
-
-      export_dynamic_flag_spec='$wl-bexpall'
-      # It seems that -bexpall does not export symbols beginning with
-      # underscore (_), so it is better to generate a list of symbols to export.
-      always_export_symbols=yes
-      if test aix,yes = "$with_aix_soname,$aix_use_runtimelinking"; then
-	# Warning - without using the other runtime loading flags (-brtl),
-	# -berok will link without error, but may produce a broken library.
-	allow_undefined_flag='-berok'
-        # Determine the default libpath from the value encoded in an
-        # empty executable.
-        if test set = "${lt_cv_aix_libpath+set}"; then
-  aix_libpath=$lt_cv_aix_libpath
-else
-  if ${lt_cv_aix_libpath_+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-
-  lt_aix_libpath_sed='
-      /Import File Strings/,/^$/ {
-	  /^0/ {
-	      s/^0  *\([^ ]*\) *$/\1/
-	      p
-	  }
-      }'
-  lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-  # Check for a 64-bit object if we didn't find anything.
-  if test -z "$lt_cv_aix_libpath_"; then
-    lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-  fi
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-  if test -z "$lt_cv_aix_libpath_"; then
-    lt_cv_aix_libpath_=/usr/lib:/lib
-  fi
-
-fi
-
-  aix_libpath=$lt_cv_aix_libpath_
-fi
-
-        hardcode_libdir_flag_spec='$wl-blibpath:$libdir:'"$aix_libpath"
-        archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs $wl'$no_entry_flag' $compiler_flags `if test -n "$allow_undefined_flag"; then func_echo_all "$wl$allow_undefined_flag"; else :; fi` $wl'$exp_sym_flag:\$export_symbols' '$shared_flag
-      else
-	if test ia64 = "$host_cpu"; then
-	  hardcode_libdir_flag_spec='$wl-R $libdir:/usr/lib:/lib'
-	  allow_undefined_flag="-z nodefs"
-	  archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\$wl$no_entry_flag"' $compiler_flags $wl$allow_undefined_flag '"\$wl$exp_sym_flag:\$export_symbols"
-	else
-	 # Determine the default libpath from the value encoded in an
-	 # empty executable.
-	 if test set = "${lt_cv_aix_libpath+set}"; then
-  aix_libpath=$lt_cv_aix_libpath
-else
-  if ${lt_cv_aix_libpath_+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-
-  lt_aix_libpath_sed='
-      /Import File Strings/,/^$/ {
-	  /^0/ {
-	      s/^0  *\([^ ]*\) *$/\1/
-	      p
-	  }
-      }'
-  lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-  # Check for a 64-bit object if we didn't find anything.
-  if test -z "$lt_cv_aix_libpath_"; then
-    lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-  fi
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-  if test -z "$lt_cv_aix_libpath_"; then
-    lt_cv_aix_libpath_=/usr/lib:/lib
-  fi
-
-fi
-
-  aix_libpath=$lt_cv_aix_libpath_
-fi
-
-	 hardcode_libdir_flag_spec='$wl-blibpath:$libdir:'"$aix_libpath"
-	  # Warning - without using the other run time loading flags,
-	  # -berok will link without error, but may produce a broken library.
-	  no_undefined_flag=' $wl-bernotok'
-	  allow_undefined_flag=' $wl-berok'
-	  if test yes = "$with_gnu_ld"; then
-	    # We only use this code for GNU lds that support --whole-archive.
-	    whole_archive_flag_spec='$wl--whole-archive$convenience $wl--no-whole-archive'
-	  else
-	    # Exported symbols can be pulled into shared objects from archives
-	    whole_archive_flag_spec='$convenience'
-	  fi
-	  archive_cmds_need_lc=yes
-	  archive_expsym_cmds='$RM -r $output_objdir/$realname.d~$MKDIR $output_objdir/$realname.d'
-	  # -brtl affects multiple linker settings, -berok does not and is overridden later
-	  compiler_flags_filtered='`func_echo_all "$compiler_flags " | $SED -e "s%-brtl\\([, ]\\)%-berok\\1%g"`'
-	  if test svr4 != "$with_aix_soname"; then
-	    # This is similar to how AIX traditionally builds its shared libraries.
-	    archive_expsym_cmds="$archive_expsym_cmds"'~$CC '$shared_flag_aix' -o $output_objdir/$realname.d/$soname $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$realname.d/$soname'
-	  fi
-	  if test aix != "$with_aix_soname"; then
-	    archive_expsym_cmds="$archive_expsym_cmds"'~$CC '$shared_flag_svr4' -o $output_objdir/$realname.d/$shared_archive_member_spec.o $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$STRIP -e $output_objdir/$realname.d/$shared_archive_member_spec.o~( func_echo_all "#! $soname($shared_archive_member_spec.o)"; if test shr_64 = "$shared_archive_member_spec"; then func_echo_all "# 64"; else func_echo_all "# 32"; fi; cat $export_symbols ) > $output_objdir/$realname.d/$shared_archive_member_spec.imp~$AR $AR_FLAGS $output_objdir/$soname $output_objdir/$realname.d/$shared_archive_member_spec.o $output_objdir/$realname.d/$shared_archive_member_spec.imp'
-	  else
-	    # used by -dlpreopen to get the symbols
-	    archive_expsym_cmds="$archive_expsym_cmds"'~$MV  $output_objdir/$realname.d/$soname $output_objdir'
-	  fi
-	  archive_expsym_cmds="$archive_expsym_cmds"'~$RM -r $output_objdir/$realname.d'
-	fi
-      fi
-      ;;
-
-    amigaos*)
-      case $host_cpu in
-      powerpc)
-            # see comment about AmigaOS4 .so support
-            archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
-            archive_expsym_cmds=''
-        ;;
-      m68k)
-            archive_cmds='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
-            hardcode_libdir_flag_spec='-L$libdir'
-            hardcode_minus_L=yes
-        ;;
-      esac
-      ;;
-
-    bsdi[45]*)
-      export_dynamic_flag_spec=-rdynamic
-      ;;
-
-    cygwin* | mingw* | pw32* | cegcc*)
-      # When not using gcc, we currently assume that we are using
-      # Microsoft Visual C++ or Intel C++ Compiler.
-      # hardcode_libdir_flag_spec is actually meaningless, as there is
-      # no search path for DLLs.
-      case $cc_basename in
-      cl* | icl*)
-	# Native MSVC or ICC
-	hardcode_libdir_flag_spec=' '
-	allow_undefined_flag=unsupported
-	always_export_symbols=yes
-	file_list_spec='@'
-	# Tell ltmain to make .lib files, not .a files.
-	libext=lib
-	# Tell ltmain to make .dll files, not .so files.
-	shrext_cmds=.dll
-	# FIXME: Setting linknames here is a bad hack.
-	archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~linknames='
-	archive_expsym_cmds='if   test DEF = "`$SED -n     -e '\''s/^[	 ]*//'\''     -e '\''/^\(;.*\)*$/d'\''     -e '\''s/^\(EXPORTS\|LIBRARY\)\([	 ].*\)*$/DEF/p'\''     -e q     $export_symbols`" ; then
-            cp "$export_symbols" "$output_objdir/$soname.def";
-            echo "$tool_output_objdir$soname.def" > "$output_objdir/$soname.exp";
-          else
-            $SED -e '\''s/^/-link -EXPORT:/'\'' < $export_symbols > $output_objdir/$soname.exp;
-          fi~
-          $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
-          linknames='
-	# The linker will not automatically build a static lib if we build a DLL.
-	# _LT_TAGVAR(old_archive_from_new_cmds, )='true'
-	enable_shared_with_static_runtimes=yes
-	exclude_expsyms='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*'
-	export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
-	# Don't use ranlib
-	old_postinstall_cmds='chmod 644 $oldlib'
-	postlink_cmds='lt_outputfile="@OUTPUT@"~
-          lt_tool_outputfile="@TOOL_OUTPUT@"~
-          case $lt_outputfile in
-            *.exe|*.EXE) ;;
-            *)
-              lt_outputfile=$lt_outputfile.exe
-              lt_tool_outputfile=$lt_tool_outputfile.exe
-              ;;
-          esac~
-          if test : != "$MANIFEST_TOOL" && test -f "$lt_outputfile.manifest"; then
-            $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
-            $RM "$lt_outputfile.manifest";
-          fi'
-	;;
-      *)
-	# Assume MSVC and ICC wrapper
-	hardcode_libdir_flag_spec=' '
-	allow_undefined_flag=unsupported
-	# Tell ltmain to make .lib files, not .a files.
-	libext=lib
-	# Tell ltmain to make .dll files, not .so files.
-	shrext_cmds=.dll
-	# FIXME: Setting linknames here is a bad hack.
-	archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
-	# The linker will automatically build a .lib file if we build a DLL.
-	old_archive_from_new_cmds='true'
-	# FIXME: Should let the user specify the lib program.
-	old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
-	enable_shared_with_static_runtimes=yes
-	;;
-      esac
-      ;;
-
-    darwin* | rhapsody*)
-
-
-  archive_cmds_need_lc=no
-  hardcode_direct=no
-  hardcode_automatic=yes
-  hardcode_shlibpath_var=unsupported
-  if test yes = "$lt_cv_ld_force_load"; then
-    whole_archive_flag_spec='`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience $wl-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`'
-
-  else
-    whole_archive_flag_spec=''
-  fi
-  link_all_deplibs=yes
-  allow_undefined_flag=$_lt_dar_allow_undefined
-  case $cc_basename in
-     ifort*|nagfor*) _lt_dar_can_shared=yes ;;
-     *) _lt_dar_can_shared=$GCC ;;
-  esac
-  if test yes = "$_lt_dar_can_shared"; then
-    output_verbose_link_cmd=func_echo_all
-    archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dsymutil"
-    module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dsymutil"
-    archive_expsym_cmds="sed 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dar_export_syms$_lt_dsymutil"
-    module_expsym_cmds="sed -e 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dar_export_syms$_lt_dsymutil"
-
-  else
-  ld_shlibs=no
-  fi
-
-      ;;
-
-    dgux*)
-      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      hardcode_libdir_flag_spec='-L$libdir'
-      hardcode_shlibpath_var=no
-      ;;
-
-    # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
-    # support.  Future versions do this automatically, but an explicit c++rt0.o
-    # does not break anything, and helps significantly (at the cost of a little
-    # extra space).
-    freebsd2.2*)
-      archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o'
-      hardcode_libdir_flag_spec='-R$libdir'
-      hardcode_direct=yes
-      hardcode_shlibpath_var=no
-      ;;
-
-    # Unfortunately, older versions of FreeBSD 2 do not have this feature.
-    freebsd2.*)
-      archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-      hardcode_direct=yes
-      hardcode_minus_L=yes
-      hardcode_shlibpath_var=no
-      ;;
-
-    # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
-    freebsd* | dragonfly*)
-      archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-      hardcode_libdir_flag_spec='-R$libdir'
-      hardcode_direct=yes
-      hardcode_shlibpath_var=no
-      ;;
-
-    hpux9*)
-      if test yes = "$GCC"; then
-	archive_cmds='$RM $output_objdir/$soname~$CC -shared $pic_flag $wl+b $wl$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib'
-      else
-	archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib'
-      fi
-      hardcode_libdir_flag_spec='$wl+b $wl$libdir'
-      hardcode_libdir_separator=:
-      hardcode_direct=yes
-
-      # hardcode_minus_L: Not really in the search PATH,
-      # but as the default location of the library.
-      hardcode_minus_L=yes
-      export_dynamic_flag_spec='$wl-E'
-      ;;
-
-    hpux10*)
-      if test yes,no = "$GCC,$with_gnu_ld"; then
-	archive_cmds='$CC -shared $pic_flag $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
-      else
-	archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
-      fi
-      if test no = "$with_gnu_ld"; then
-	hardcode_libdir_flag_spec='$wl+b $wl$libdir'
-	hardcode_libdir_separator=:
-	hardcode_direct=yes
-	hardcode_direct_absolute=yes
-	export_dynamic_flag_spec='$wl-E'
-	# hardcode_minus_L: Not really in the search PATH,
-	# but as the default location of the library.
-	hardcode_minus_L=yes
-      fi
-      ;;
-
-    hpux11*)
-      if test yes,no = "$GCC,$with_gnu_ld"; then
-	case $host_cpu in
-	hppa*64*)
-	  archive_cmds='$CC -shared $wl+h $wl$soname -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	ia64*)
-	  archive_cmds='$CC -shared $pic_flag $wl+h $wl$soname $wl+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	*)
-	  archive_cmds='$CC -shared $pic_flag $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	esac
-      else
-	case $host_cpu in
-	hppa*64*)
-	  archive_cmds='$CC -b $wl+h $wl$soname -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	ia64*)
-	  archive_cmds='$CC -b $wl+h $wl$soname $wl+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	*)
-
-	  # Older versions of the 11.00 compiler do not understand -b yet
-	  # (HP92453-01 A.11.01.20 doesn't, HP92453-01 B.11.X.35175-35176.GP does)
-	  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC understands -b" >&5
-$as_echo_n "checking if $CC understands -b... " >&6; }
-if ${lt_cv_prog_compiler__b+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_prog_compiler__b=no
-   save_LDFLAGS=$LDFLAGS
-   LDFLAGS="$LDFLAGS -b"
-   echo "$lt_simple_link_test_code" > conftest.$ac_ext
-   if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
-     # The linker can only warn and ignore the option if not recognized
-     # So say no if there are warnings
-     if test -s conftest.err; then
-       # Append any errors to the config.log.
-       cat conftest.err 1>&5
-       $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp
-       $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
-       if diff conftest.exp conftest.er2 >/dev/null; then
-         lt_cv_prog_compiler__b=yes
-       fi
-     else
-       lt_cv_prog_compiler__b=yes
-     fi
-   fi
-   $RM -r conftest*
-   LDFLAGS=$save_LDFLAGS
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler__b" >&5
-$as_echo "$lt_cv_prog_compiler__b" >&6; }
-
-if test yes = "$lt_cv_prog_compiler__b"; then
-    archive_cmds='$CC -b $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
-else
-    archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
-fi
-
-	  ;;
-	esac
-      fi
-      if test no = "$with_gnu_ld"; then
-	hardcode_libdir_flag_spec='$wl+b $wl$libdir'
-	hardcode_libdir_separator=:
-
-	case $host_cpu in
-	hppa*64*|ia64*)
-	  hardcode_direct=no
-	  hardcode_shlibpath_var=no
-	  ;;
-	*)
-	  hardcode_direct=yes
-	  hardcode_direct_absolute=yes
-	  export_dynamic_flag_spec='$wl-E'
-
-	  # hardcode_minus_L: Not really in the search PATH,
-	  # but as the default location of the library.
-	  hardcode_minus_L=yes
-	  ;;
-	esac
-      fi
-      ;;
-
-    irix5* | irix6* | nonstopux*)
-      if test yes = "$GCC"; then
-	archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib'
-	# Try to use the -exported_symbol ld option, if it does not
-	# work, assume that -exports_file does not work either and
-	# implicitly export all symbols.
-	# This should be the same for all languages, so no per-tag cache variable.
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5
-$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; }
-if ${lt_cv_irix_exported_symbol+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  save_LDFLAGS=$LDFLAGS
-	   LDFLAGS="$LDFLAGS -shared $wl-exported_symbol ${wl}foo $wl-update_registry $wl/dev/null"
-	   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-int foo (void) { return 0; }
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  lt_cv_irix_exported_symbol=yes
-else
-  lt_cv_irix_exported_symbol=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-           LDFLAGS=$save_LDFLAGS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5
-$as_echo "$lt_cv_irix_exported_symbol" >&6; }
-	if test yes = "$lt_cv_irix_exported_symbol"; then
-          archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations $wl-exports_file $wl$export_symbols -o $lib'
-	fi
-      else
-	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
-	archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -exports_file $export_symbols -o $lib'
-      fi
-      archive_cmds_need_lc='no'
-      hardcode_libdir_flag_spec='$wl-rpath $wl$libdir'
-      hardcode_libdir_separator=:
-      inherit_rpath=yes
-      link_all_deplibs=yes
-      ;;
-
-    linux*)
-      case $cc_basename in
-      tcc*)
-	# Fabrice Bellard et al's Tiny C Compiler
-	ld_shlibs=yes
-	archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-	;;
-      esac
-      ;;
-
-    netbsd*)
-      if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
-	archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
-      else
-	archive_cmds='$LD -shared -o $lib $libobjs $deplibs $linker_flags'      # ELF
-      fi
-      hardcode_libdir_flag_spec='-R$libdir'
-      hardcode_direct=yes
-      hardcode_shlibpath_var=no
-      ;;
-
-    newsos6)
-      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      hardcode_direct=yes
-      hardcode_libdir_flag_spec='$wl-rpath $wl$libdir'
-      hardcode_libdir_separator=:
-      hardcode_shlibpath_var=no
-      ;;
-
-    *nto* | *qnx*)
-      ;;
-
-    openbsd* | bitrig*)
-      if test -f /usr/libexec/ld.so; then
-	hardcode_direct=yes
-	hardcode_shlibpath_var=no
-	hardcode_direct_absolute=yes
-	if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then
-	  archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-	  archive_expsym_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags $wl-retain-symbols-file,$export_symbols'
-	  hardcode_libdir_flag_spec='$wl-rpath,$libdir'
-	  export_dynamic_flag_spec='$wl-E'
-	else
-	  archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-	  hardcode_libdir_flag_spec='$wl-rpath,$libdir'
-	fi
-      else
-	ld_shlibs=no
-      fi
-      ;;
-
-    os2*)
-      hardcode_libdir_flag_spec='-L$libdir'
-      hardcode_minus_L=yes
-      allow_undefined_flag=unsupported
-      shrext_cmds=.dll
-      archive_cmds='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
-	$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
-	$ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
-	$ECHO EXPORTS >> $output_objdir/$libname.def~
-	emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~
-	$CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
-	emximp -o $lib $output_objdir/$libname.def'
-      archive_expsym_cmds='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
-	$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
-	$ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
-	$ECHO EXPORTS >> $output_objdir/$libname.def~
-	prefix_cmds="$SED"~
-	if test EXPORTS = "`$SED 1q $export_symbols`"; then
-	  prefix_cmds="$prefix_cmds -e 1d";
-	fi~
-	prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~
-	cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~
-	$CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
-	emximp -o $lib $output_objdir/$libname.def'
-      old_archive_From_new_cmds='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
-      enable_shared_with_static_runtimes=yes
-      file_list_spec='@'
-      ;;
-
-    osf3*)
-      if test yes = "$GCC"; then
-	allow_undefined_flag=' $wl-expect_unresolved $wl\*'
-	archive_cmds='$CC -shared$allow_undefined_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib'
-      else
-	allow_undefined_flag=' -expect_unresolved \*'
-	archive_cmds='$CC -shared$allow_undefined_flag $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
-      fi
-      archive_cmds_need_lc='no'
-      hardcode_libdir_flag_spec='$wl-rpath $wl$libdir'
-      hardcode_libdir_separator=:
-      ;;
-
-    osf4* | osf5*)	# as osf3* with the addition of -msym flag
-      if test yes = "$GCC"; then
-	allow_undefined_flag=' $wl-expect_unresolved $wl\*'
-	archive_cmds='$CC -shared$allow_undefined_flag $pic_flag $libobjs $deplibs $compiler_flags $wl-msym $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib'
-	hardcode_libdir_flag_spec='$wl-rpath $wl$libdir'
-      else
-	allow_undefined_flag=' -expect_unresolved \*'
-	archive_cmds='$CC -shared$allow_undefined_flag $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
-	archive_expsym_cmds='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~
-          $CC -shared$allow_undefined_flag $wl-input $wl$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib~$RM $lib.exp'
-
-	# Both c and cxx compiler support -rpath directly
-	hardcode_libdir_flag_spec='-rpath $libdir'
-      fi
-      archive_cmds_need_lc='no'
-      hardcode_libdir_separator=:
-      ;;
-
-    solaris*)
-      no_undefined_flag=' -z defs'
-      if test yes = "$GCC"; then
-	wlarc='$wl'
-	archive_cmds='$CC -shared $pic_flag $wl-z ${wl}text $wl-h $wl$soname -o $lib $libobjs $deplibs $compiler_flags'
-	archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-          $CC -shared $pic_flag $wl-z ${wl}text $wl-M $wl$lib.exp $wl-h $wl$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
-      else
-	case `$CC -V 2>&1` in
-	*"Compilers 5.0"*)
-	  wlarc=''
-	  archive_cmds='$LD -G$allow_undefined_flag -h $soname -o $lib $libobjs $deplibs $linker_flags'
-	  archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-            $LD -G$allow_undefined_flag -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp'
-	  ;;
-	*)
-	  wlarc='$wl'
-	  archive_cmds='$CC -G$allow_undefined_flag -h $soname -o $lib $libobjs $deplibs $compiler_flags'
-	  archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-            $CC -G$allow_undefined_flag -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
-	  ;;
-	esac
-      fi
-      hardcode_libdir_flag_spec='-R$libdir'
-      hardcode_shlibpath_var=no
-      case $host_os in
-      solaris2.[0-5] | solaris2.[0-5].*) ;;
-      *)
-	# The compiler driver will combine and reorder linker options,
-	# but understands '-z linker_flag'.  GCC discards it without '$wl',
-	# but is careful enough not to reorder.
-	# Supported since Solaris 2.6 (maybe 2.5.1?)
-	if test yes = "$GCC"; then
-	  whole_archive_flag_spec='$wl-z ${wl}allextract$convenience $wl-z ${wl}defaultextract'
-	else
-	  whole_archive_flag_spec='-z allextract$convenience -z defaultextract'
-	fi
-	;;
-      esac
-      link_all_deplibs=yes
-      ;;
-
-    sunos4*)
-      if test sequent = "$host_vendor"; then
-	# Use $CC to link under sequent, because it throws in some extra .o
-	# files that make .init and .fini sections work.
-	archive_cmds='$CC -G $wl-h $soname -o $lib $libobjs $deplibs $compiler_flags'
-      else
-	archive_cmds='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
-      fi
-      hardcode_libdir_flag_spec='-L$libdir'
-      hardcode_direct=yes
-      hardcode_minus_L=yes
-      hardcode_shlibpath_var=no
-      ;;
-
-    sysv4)
-      case $host_vendor in
-	sni)
-	  archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-	  hardcode_direct=yes # is this really true???
-	;;
-	siemens)
-	  ## LD is ld it makes a PLAMLIB
-	  ## CC just makes a GrossModule.
-	  archive_cmds='$LD -G -o $lib $libobjs $deplibs $linker_flags'
-	  reload_cmds='$CC -r -o $output$reload_objs'
-	  hardcode_direct=no
-        ;;
-	motorola)
-	  archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-	  hardcode_direct=no #Motorola manual says yes, but my tests say they lie
-	;;
-      esac
-      runpath_var='LD_RUN_PATH'
-      hardcode_shlibpath_var=no
-      ;;
-
-    sysv4.3*)
-      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      hardcode_shlibpath_var=no
-      export_dynamic_flag_spec='-Bexport'
-      ;;
-
-    sysv4*MP*)
-      if test -d /usr/nec; then
-	archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-	hardcode_shlibpath_var=no
-	runpath_var=LD_RUN_PATH
-	hardcode_runpath_var=yes
-	ld_shlibs=yes
-      fi
-      ;;
-
-    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*)
-      no_undefined_flag='$wl-z,text'
-      archive_cmds_need_lc=no
-      hardcode_shlibpath_var=no
-      runpath_var='LD_RUN_PATH'
-
-      if test yes = "$GCC"; then
-	archive_cmds='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	archive_expsym_cmds='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-      else
-	archive_cmds='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	archive_expsym_cmds='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-      fi
-      ;;
-
-    sysv5* | sco3.2v5* | sco5v6*)
-      # Note: We CANNOT use -z defs as we might desire, because we do not
-      # link with -lc, and that would cause any symbols used from libc to
-      # always be unresolved, which means just about no library would
-      # ever link correctly.  If we're not using GNU ld we use -z text
-      # though, which does catch some bad symbols but isn't as heavy-handed
-      # as -z defs.
-      no_undefined_flag='$wl-z,text'
-      allow_undefined_flag='$wl-z,nodefs'
-      archive_cmds_need_lc=no
-      hardcode_shlibpath_var=no
-      hardcode_libdir_flag_spec='$wl-R,$libdir'
-      hardcode_libdir_separator=':'
-      link_all_deplibs=yes
-      export_dynamic_flag_spec='$wl-Bexport'
-      runpath_var='LD_RUN_PATH'
-
-      if test yes = "$GCC"; then
-	archive_cmds='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	archive_expsym_cmds='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-      else
-	archive_cmds='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	archive_expsym_cmds='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-      fi
-      ;;
-
-    uts4*)
-      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      hardcode_libdir_flag_spec='-L$libdir'
-      hardcode_shlibpath_var=no
-      ;;
-
-    *)
-      ld_shlibs=no
-      ;;
-    esac
-
-    if test sni = "$host_vendor"; then
-      case $host in
-      sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-	export_dynamic_flag_spec='$wl-Blargedynsym'
-	;;
-      esac
-    fi
-  fi
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs" >&5
-$as_echo "$ld_shlibs" >&6; }
-test no = "$ld_shlibs" && can_build_shared=no
-
-with_gnu_ld=$with_gnu_ld
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-#
-# Do we need to explicitly link libc?
-#
-case "x$archive_cmds_need_lc" in
-x|xyes)
-  # Assume -lc should be added
-  archive_cmds_need_lc=yes
-
-  if test yes,yes = "$GCC,$enable_shared"; then
-    case $archive_cmds in
-    *'~'*)
-      # FIXME: we may have to deal with multi-command sequences.
-      ;;
-    '$CC '*)
-      # Test whether the compiler implicitly links with -lc since on some
-      # systems, -lgcc has to come before -lc. If gcc already passes -lc
-      # to ld, don't add -lc before -lgcc.
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5
-$as_echo_n "checking whether -lc should be explicitly linked in... " >&6; }
-if ${lt_cv_archive_cmds_need_lc+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  $RM conftest*
-	echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-
-	if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } 2>conftest.err; then
-	  soname=conftest
-	  lib=conftest
-	  libobjs=conftest.$ac_objext
-	  deplibs=
-	  wl=$lt_prog_compiler_wl
-	  pic_flag=$lt_prog_compiler_pic
-	  compiler_flags=-v
-	  linker_flags=-v
-	  verstring=
-	  output_objdir=.
-	  libname=conftest
-	  lt_save_allow_undefined_flag=$allow_undefined_flag
-	  allow_undefined_flag=
-	  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\""; } >&5
-  (eval $archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }
-	  then
-	    lt_cv_archive_cmds_need_lc=no
-	  else
-	    lt_cv_archive_cmds_need_lc=yes
-	  fi
-	  allow_undefined_flag=$lt_save_allow_undefined_flag
-	else
-	  cat conftest.err 1>&5
-	fi
-	$RM conftest*
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_archive_cmds_need_lc" >&5
-$as_echo "$lt_cv_archive_cmds_need_lc" >&6; }
-      archive_cmds_need_lc=$lt_cv_archive_cmds_need_lc
-      ;;
-    esac
-  fi
-  ;;
-esac
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5
-$as_echo_n "checking dynamic linker characteristics... " >&6; }
-
-if test yes = "$GCC"; then
-  case $host_os in
-    darwin*) lt_awk_arg='/^libraries:/,/LR/' ;;
-    *) lt_awk_arg='/^libraries:/' ;;
-  esac
-  case $host_os in
-    mingw* | cegcc*) lt_sed_strip_eq='s|=\([A-Za-z]:\)|\1|g' ;;
-    *) lt_sed_strip_eq='s|=/|/|g' ;;
-  esac
-  lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e $lt_sed_strip_eq`
-  case $lt_search_path_spec in
-  *\;*)
-    # if the path contains ";" then we assume it to be the separator
-    # otherwise default to the standard path separator (i.e. ":") - it is
-    # assumed that no part of a normal pathname contains ";" but that should
-    # okay in the real world where ";" in dirpaths is itself problematic.
-    lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED 's/;/ /g'`
-    ;;
-  *)
-    lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED "s/$PATH_SEPARATOR/ /g"`
-    ;;
-  esac
-  # Ok, now we have the path, separated by spaces, we can step through it
-  # and add multilib dir if necessary...
-  lt_tmp_lt_search_path_spec=
-  lt_multi_os_dir=/`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null`
-  # ...but if some path component already ends with the multilib dir we assume
-  # that all is fine and trust -print-search-dirs as is (GCC 4.2? or newer).
-  case "$lt_multi_os_dir; $lt_search_path_spec " in
-  "/; "* | "/.; "* | "/./; "* | *"$lt_multi_os_dir "* | *"$lt_multi_os_dir/ "*)
-    lt_multi_os_dir=
-    ;;
-  esac
-  for lt_sys_path in $lt_search_path_spec; do
-    if test -d "$lt_sys_path$lt_multi_os_dir"; then
-      lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path$lt_multi_os_dir"
-    elif test -n "$lt_multi_os_dir"; then
-      test -d "$lt_sys_path" && \
-	lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path"
-    fi
-  done
-  lt_search_path_spec=`$ECHO "$lt_tmp_lt_search_path_spec" | awk '
-BEGIN {RS = " "; FS = "/|\n";} {
-  lt_foo = "";
-  lt_count = 0;
-  for (lt_i = NF; lt_i > 0; lt_i--) {
-    if ($lt_i != "" && $lt_i != ".") {
-      if ($lt_i == "..") {
-        lt_count++;
-      } else {
-        if (lt_count == 0) {
-          lt_foo = "/" $lt_i lt_foo;
-        } else {
-          lt_count--;
-        }
-      }
-    }
-  }
-  if (lt_foo != "") { lt_freq[lt_foo]++; }
-  if (lt_freq[lt_foo] == 1) { print lt_foo; }
-}'`
-  # AWK program above erroneously prepends '/' to C:/dos/paths
-  # for these hosts.
-  case $host_os in
-    mingw* | cegcc*) lt_search_path_spec=`$ECHO "$lt_search_path_spec" |\
-      $SED 's|/\([A-Za-z]:\)|\1|g'` ;;
-  esac
-  sys_lib_search_path_spec=`$ECHO "$lt_search_path_spec" | $lt_NL2SP`
-else
-  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
-fi
-library_names_spec=
-libname_spec='lib$name'
-soname_spec=
-shrext_cmds=.so
-postinstall_cmds=
-postuninstall_cmds=
-finish_cmds=
-finish_eval=
-shlibpath_var=
-shlibpath_overrides_runpath=unknown
-version_type=none
-dynamic_linker="$host_os ld.so"
-sys_lib_dlsearch_path_spec="/lib /usr/lib"
-need_lib_prefix=unknown
-hardcode_into_libs=no
-
-# when you set need_version to no, make sure it does not cause -set_version
-# flags to be left without arguments
-need_version=unknown
-
-
-
-case $host_os in
-aix3*)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  library_names_spec='$libname$release$shared_ext$versuffix $libname.a'
-  shlibpath_var=LIBPATH
-
-  # AIX 3 has no versioning support, so we append a major version to the name.
-  soname_spec='$libname$release$shared_ext$major'
-  ;;
-
-aix[4-9]*)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  need_lib_prefix=no
-  need_version=no
-  hardcode_into_libs=yes
-  if test ia64 = "$host_cpu"; then
-    # AIX 5 supports IA64
-    library_names_spec='$libname$release$shared_ext$major $libname$release$shared_ext$versuffix $libname$shared_ext'
-    shlibpath_var=LD_LIBRARY_PATH
-  else
-    # With GCC up to 2.95.x, collect2 would create an import file
-    # for dependence libraries.  The import file would start with
-    # the line '#! .'.  This would cause the generated library to
-    # depend on '.', always an invalid library.  This was fixed in
-    # development snapshots of GCC prior to 3.0.
-    case $host_os in
-      aix4 | aix4.[01] | aix4.[01].*)
-      if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
-	   echo ' yes '
-	   echo '#endif'; } | $CC -E - | $GREP yes > /dev/null; then
-	:
-      else
-	can_build_shared=no
-      fi
-      ;;
-    esac
-    # Using Import Files as archive members, it is possible to support
-    # filename-based versioning of shared library archives on AIX. While
-    # this would work for both with and without runtime linking, it will
-    # prevent static linking of such archives. So we do filename-based
-    # shared library versioning with .so extension only, which is used
-    # when both runtime linking and shared linking is enabled.
-    # Unfortunately, runtime linking may impact performance, so we do
-    # not want this to be the default eventually. Also, we use the
-    # versioned .so libs for executables only if there is the -brtl
-    # linker flag in LDFLAGS as well, or --with-aix-soname=svr4 only.
-    # To allow for filename-based versioning support, we need to create
-    # libNAME.so.V as an archive file, containing:
-    # *) an Import File, referring to the versioned filename of the
-    #    archive as well as the shared archive member, telling the
-    #    bitwidth (32 or 64) of that shared object, and providing the
-    #    list of exported symbols of that shared object, eventually
-    #    decorated with the 'weak' keyword
-    # *) the shared object with the F_LOADONLY flag set, to really avoid
-    #    it being seen by the linker.
-    # At run time we better use the real file rather than another symlink,
-    # but for link time we create the symlink libNAME.so -> libNAME.so.V
-
-    case $with_aix_soname,$aix_use_runtimelinking in
-    # AIX (on Power*) has no versioning support, so currently we cannot hardcode correct
-    # soname into executable. Probably we can add versioning support to
-    # collect2, so additional links can be useful in future.
-    aix,yes) # traditional libtool
-      dynamic_linker='AIX unversionable lib.so'
-      # If using run time linking (on AIX 4.2 or later) use lib<name>.so
-      # instead of lib<name>.a to let people know that these are not
-      # typical AIX shared libraries.
-      library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
-      ;;
-    aix,no) # traditional AIX only
-      dynamic_linker='AIX lib.a(lib.so.V)'
-      # We preserve .a as extension for shared libraries through AIX4.2
-      # and later when we are not doing run time linking.
-      library_names_spec='$libname$release.a $libname.a'
-      soname_spec='$libname$release$shared_ext$major'
-      ;;
-    svr4,*) # full svr4 only
-      dynamic_linker="AIX lib.so.V($shared_archive_member_spec.o)"
-      library_names_spec='$libname$release$shared_ext$major $libname$shared_ext'
-      # We do not specify a path in Import Files, so LIBPATH fires.
-      shlibpath_overrides_runpath=yes
-      ;;
-    *,yes) # both, prefer svr4
-      dynamic_linker="AIX lib.so.V($shared_archive_member_spec.o), lib.a(lib.so.V)"
-      library_names_spec='$libname$release$shared_ext$major $libname$shared_ext'
-      # unpreferred sharedlib libNAME.a needs extra handling
-      postinstall_cmds='test -n "$linkname" || linkname="$realname"~func_stripname "" ".so" "$linkname"~$install_shared_prog "$dir/$func_stripname_result.$libext" "$destdir/$func_stripname_result.$libext"~test -z "$tstripme" || test -z "$striplib" || $striplib "$destdir/$func_stripname_result.$libext"'
-      postuninstall_cmds='for n in $library_names $old_library; do :; done~func_stripname "" ".so" "$n"~test "$func_stripname_result" = "$n" || func_append rmfiles " $odir/$func_stripname_result.$libext"'
-      # We do not specify a path in Import Files, so LIBPATH fires.
-      shlibpath_overrides_runpath=yes
-      ;;
-    *,no) # both, prefer aix
-      dynamic_linker="AIX lib.a(lib.so.V), lib.so.V($shared_archive_member_spec.o)"
-      library_names_spec='$libname$release.a $libname.a'
-      soname_spec='$libname$release$shared_ext$major'
-      # unpreferred sharedlib libNAME.so.V and symlink libNAME.so need extra handling
-      postinstall_cmds='test -z "$dlname" || $install_shared_prog $dir/$dlname $destdir/$dlname~test -z "$tstripme" || test -z "$striplib" || $striplib $destdir/$dlname~test -n "$linkname" || linkname=$realname~func_stripname "" ".a" "$linkname"~(cd "$destdir" && $LN_S -f $dlname $func_stripname_result.so)'
-      postuninstall_cmds='test -z "$dlname" || func_append rmfiles " $odir/$dlname"~for n in $old_library $library_names; do :; done~func_stripname "" ".a" "$n"~func_append rmfiles " $odir/$func_stripname_result.so"'
-      ;;
-    esac
-    shlibpath_var=LIBPATH
-  fi
-  ;;
-
-amigaos*)
-  case $host_cpu in
-  powerpc)
-    # Since July 2007 AmigaOS4 officially supports .so libraries.
-    # When compiling the executable, add -use-dynld -Lsobjs: to the compileline.
-    library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
-    ;;
-  m68k)
-    library_names_spec='$libname.ixlibrary $libname.a'
-    # Create ${libname}_ixlibrary.a entries in /sys/libs.
-    finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
-    ;;
-  esac
-  ;;
-
-beos*)
-  library_names_spec='$libname$shared_ext'
-  dynamic_linker="$host_os ld.so"
-  shlibpath_var=LIBRARY_PATH
-  ;;
-
-bsdi[45]*)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  need_version=no
-  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
-  soname_spec='$libname$release$shared_ext$major'
-  finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
-  sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
-  # the default ld.so.conf also contains /usr/contrib/lib and
-  # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
-  # libtool to hard-code these into programs
-  ;;
-
-cygwin* | mingw* | pw32* | cegcc*)
-  version_type=windows
-  shrext_cmds=.dll
-  need_version=no
-  need_lib_prefix=no
-
-  case $GCC,$cc_basename in
-  yes,*)
-    # gcc
-    library_names_spec='$libname.dll.a'
-    # DLL is installed to $(libdir)/../bin by postinstall_cmds
-    postinstall_cmds='base_file=`basename \$file`~
-      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; echo \$dlname'\''`~
-      dldir=$destdir/`dirname \$dlpath`~
-      test -d \$dldir || mkdir -p \$dldir~
-      $install_prog $dir/$dlname \$dldir/$dlname~
-      chmod a+x \$dldir/$dlname~
-      if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then
-        eval '\''$striplib \$dldir/$dlname'\'' || exit \$?;
-      fi'
-    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
-      dlpath=$dir/\$dldll~
-       $RM \$dlpath'
-    shlibpath_overrides_runpath=yes
-
-    case $host_os in
-    cygwin*)
-      # Cygwin DLLs use 'cyg' prefix rather than 'lib'
-      soname_spec='`echo $libname | sed -e 's/^lib/cyg/'``echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext'
-
-      sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"
-      ;;
-    mingw* | cegcc*)
-      # MinGW DLLs use traditional 'lib' prefix
-      soname_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext'
-      ;;
-    pw32*)
-      # pw32 DLLs use 'pw' prefix rather than 'lib'
-      library_names_spec='`echo $libname | sed -e 's/^lib/pw/'``echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext'
-      ;;
-    esac
-    dynamic_linker='Win32 ld.exe'
-    ;;
-
-  *,cl* | *,icl*)
-    # Native MSVC or ICC
-    libname_spec='$name'
-    soname_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext'
-    library_names_spec='$libname.dll.lib'
-
-    case $build_os in
-    mingw*)
-      sys_lib_search_path_spec=
-      lt_save_ifs=$IFS
-      IFS=';'
-      for lt_path in $LIB
-      do
-        IFS=$lt_save_ifs
-        # Let DOS variable expansion print the short 8.3 style file name.
-        lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"`
-        sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path"
-      done
-      IFS=$lt_save_ifs
-      # Convert to MSYS style.
-      sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'`
-      ;;
-    cygwin*)
-      # Convert to unix form, then to dos form, then back to unix form
-      # but this time dos style (no spaces!) so that the unix form looks
-      # like /cygdrive/c/PROGRA~1:/cygdr...
-      sys_lib_search_path_spec=`cygpath --path --unix "$LIB"`
-      sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null`
-      sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
-      ;;
-    *)
-      sys_lib_search_path_spec=$LIB
-      if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then
-        # It is most probably a Windows format PATH.
-        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
-      else
-        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
-      fi
-      # FIXME: find the short name or the path components, as spaces are
-      # common. (e.g. "Program Files" -> "PROGRA~1")
-      ;;
-    esac
-
-    # DLL is installed to $(libdir)/../bin by postinstall_cmds
-    postinstall_cmds='base_file=`basename \$file`~
-      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; echo \$dlname'\''`~
-      dldir=$destdir/`dirname \$dlpath`~
-      test -d \$dldir || mkdir -p \$dldir~
-      $install_prog $dir/$dlname \$dldir/$dlname'
-    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
-      dlpath=$dir/\$dldll~
-       $RM \$dlpath'
-    shlibpath_overrides_runpath=yes
-    dynamic_linker='Win32 link.exe'
-    ;;
-
-  *)
-    # Assume MSVC and ICC wrapper
-    library_names_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext $libname.lib'
-    dynamic_linker='Win32 ld.exe'
-    ;;
-  esac
-  # FIXME: first we should search . and the directory the executable is in
-  shlibpath_var=PATH
-  ;;
-
-darwin* | rhapsody*)
-  dynamic_linker="$host_os dyld"
-  version_type=darwin
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='$libname$release$major$shared_ext $libname$shared_ext'
-  soname_spec='$libname$release$major$shared_ext'
-  shlibpath_overrides_runpath=yes
-  shlibpath_var=DYLD_LIBRARY_PATH
-  shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
-
-  sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib"
-  sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
-  ;;
-
-dgux*)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
-  soname_spec='$libname$release$shared_ext$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  ;;
-
-freebsd* | dragonfly*)
-  # DragonFly does not have aout.  When/if they implement a new
-  # versioning mechanism, adjust this.
-  if test -x /usr/bin/objformat; then
-    objformat=`/usr/bin/objformat`
-  else
-    case $host_os in
-    freebsd[23].*) objformat=aout ;;
-    *) objformat=elf ;;
-    esac
-  fi
-  version_type=freebsd-$objformat
-  case $version_type in
-    freebsd-elf*)
-      library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
-      soname_spec='$libname$release$shared_ext$major'
-      need_version=no
-      need_lib_prefix=no
-      ;;
-    freebsd-*)
-      library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix'
-      need_version=yes
-      ;;
-  esac
-  shlibpath_var=LD_LIBRARY_PATH
-  case $host_os in
-  freebsd2.*)
-    shlibpath_overrides_runpath=yes
-    ;;
-  freebsd3.[01]* | freebsdelf3.[01]*)
-    shlibpath_overrides_runpath=yes
-    hardcode_into_libs=yes
-    ;;
-  freebsd3.[2-9]* | freebsdelf3.[2-9]* | \
-  freebsd4.[0-5] | freebsdelf4.[0-5] | freebsd4.1.1 | freebsdelf4.1.1)
-    shlibpath_overrides_runpath=no
-    hardcode_into_libs=yes
-    ;;
-  *) # from 4.6 on, and DragonFly
-    shlibpath_overrides_runpath=yes
-    hardcode_into_libs=yes
-    ;;
-  esac
-  ;;
-
-haiku*)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  need_lib_prefix=no
-  need_version=no
-  dynamic_linker="$host_os runtime_loader"
-  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
-  soname_spec='$libname$release$shared_ext$major'
-  shlibpath_var=LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
-  hardcode_into_libs=yes
-  ;;
-
-hpux9* | hpux10* | hpux11*)
-  # Give a soname corresponding to the major version so that dld.sl refuses to
-  # link against other versions.
-  version_type=sunos
-  need_lib_prefix=no
-  need_version=no
-  case $host_cpu in
-  ia64*)
-    shrext_cmds='.so'
-    hardcode_into_libs=yes
-    dynamic_linker="$host_os dld.so"
-    shlibpath_var=LD_LIBRARY_PATH
-    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
-    library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
-    soname_spec='$libname$release$shared_ext$major'
-    if test 32 = "$HPUX_IA64_MODE"; then
-      sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
-      sys_lib_dlsearch_path_spec=/usr/lib/hpux32
-    else
-      sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
-      sys_lib_dlsearch_path_spec=/usr/lib/hpux64
-    fi
-    ;;
-  hppa*64*)
-    shrext_cmds='.sl'
-    hardcode_into_libs=yes
-    dynamic_linker="$host_os dld.sl"
-    shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
-    library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
-    soname_spec='$libname$release$shared_ext$major'
-    sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
-    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
-    ;;
-  *)
-    shrext_cmds='.sl'
-    dynamic_linker="$host_os dld.sl"
-    shlibpath_var=SHLIB_PATH
-    shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-    library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
-    soname_spec='$libname$release$shared_ext$major'
-    ;;
-  esac
-  # HP-UX runs *really* slowly unless shared libraries are mode 555, ...
-  postinstall_cmds='chmod 555 $lib'
-  # or fails outright, so override atomically:
-  install_override_mode=555
-  ;;
-
-interix[3-9]*)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
-  soname_spec='$libname$release$shared_ext$major'
-  dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  ;;
-
-irix5* | irix6* | nonstopux*)
-  case $host_os in
-    nonstopux*) version_type=nonstopux ;;
-    *)
-	if test yes = "$lt_cv_prog_gnu_ld"; then
-		version_type=linux # correct to gnu/linux during the next big refactor
-	else
-		version_type=irix
-	fi ;;
-  esac
-  need_lib_prefix=no
-  need_version=no
-  soname_spec='$libname$release$shared_ext$major'
-  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$release$shared_ext $libname$shared_ext'
-  case $host_os in
-  irix5* | nonstopux*)
-    libsuff= shlibsuff=
-    ;;
-  *)
-    case $LD in # libtool.m4 will add one of these switches to LD
-    *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ")
-      libsuff= shlibsuff= libmagic=32-bit;;
-    *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ")
-      libsuff=32 shlibsuff=N32 libmagic=N32;;
-    *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ")
-      libsuff=64 shlibsuff=64 libmagic=64-bit;;
-    *) libsuff= shlibsuff= libmagic=never-match;;
-    esac
-    ;;
-  esac
-  shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
-  shlibpath_overrides_runpath=no
-  sys_lib_search_path_spec="/usr/lib$libsuff /lib$libsuff /usr/local/lib$libsuff"
-  sys_lib_dlsearch_path_spec="/usr/lib$libsuff /lib$libsuff"
-  hardcode_into_libs=yes
-  ;;
-
-# No shared lib support for Linux oldld, aout, or coff.
-linux*oldld* | linux*aout* | linux*coff*)
-  dynamic_linker=no
-  ;;
-
-linux*android*)
-  version_type=none # Android doesn't support versioned libraries.
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='$libname$release$shared_ext'
-  soname_spec='$libname$release$shared_ext'
-  finish_cmds=
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-
-  # This implies no fast_install, which is unacceptable.
-  # Some rework will be needed to allow for fast_install
-  # before this can be enabled.
-  hardcode_into_libs=yes
-
-  dynamic_linker='Android linker'
-  # Don't embed -rpath directories since the linker doesn't support them.
-  hardcode_libdir_flag_spec='-L$libdir'
-  ;;
-
-# This must be glibc/ELF.
-linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
-  soname_spec='$libname$release$shared_ext$major'
-  finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-
-  # Some binutils ld are patched to set DT_RUNPATH
-  if ${lt_cv_shlibpath_overrides_runpath+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_shlibpath_overrides_runpath=no
-    save_LDFLAGS=$LDFLAGS
-    save_libdir=$libdir
-    eval "libdir=/foo; wl=\"$lt_prog_compiler_wl\"; \
-	 LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec\""
-    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  if  ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then :
-  lt_cv_shlibpath_overrides_runpath=yes
-fi
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-    LDFLAGS=$save_LDFLAGS
-    libdir=$save_libdir
-
-fi
-
-  shlibpath_overrides_runpath=$lt_cv_shlibpath_overrides_runpath
-
-  # This implies no fast_install, which is unacceptable.
-  # Some rework will be needed to allow for fast_install
-  # before this can be enabled.
-  hardcode_into_libs=yes
-
-  # Ideally, we could use ldconfig to report *all* directores which are
-  # searched for libraries, however this is still not possible.  Aside from not
-  # being certain /sbin/ldconfig is available, command
-  # 'ldconfig -N -X -v | grep ^/' on 64bit Fedora does not report /usr/lib64,
-  # even though it is searched at run-time.  Try to do the best guess by
-  # appending ld.so.conf contents (and includes) to the search path.
-  if test -f /etc/ld.so.conf; then
-    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[	 ]*hwcap[	 ]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '`
-    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
-  fi
-
-  # We used to test for /lib/ld.so.1 and disable shared libraries on
-  # powerpc, because MkLinux only supported shared libraries with the
-  # GNU dynamic linker.  Since this was broken with cross compilers,
-  # most powerpc-linux boxes support dynamic linking these days and
-  # people can always --disable-shared, the test was removed, and we
-  # assume the GNU/Linux dynamic linker is in use.
-  dynamic_linker='GNU/Linux ld.so'
-  ;;
-
-netbsd*)
-  version_type=sunos
-  need_lib_prefix=no
-  need_version=no
-  if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
-    library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix'
-    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-    dynamic_linker='NetBSD (a.out) ld.so'
-  else
-    library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
-    soname_spec='$libname$release$shared_ext$major'
-    dynamic_linker='NetBSD ld.elf_so'
-  fi
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  hardcode_into_libs=yes
-  ;;
-
-newsos6)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  ;;
-
-*nto* | *qnx*)
-  version_type=qnx
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
-  soname_spec='$libname$release$shared_ext$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  dynamic_linker='ldqnx.so'
-  ;;
-
-openbsd* | bitrig*)
-  version_type=sunos
-  sys_lib_dlsearch_path_spec=/usr/lib
-  need_lib_prefix=no
-  if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then
-    need_version=no
-  else
-    need_version=yes
-  fi
-  library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix'
-  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  ;;
-
-os2*)
-  libname_spec='$name'
-  version_type=windows
-  shrext_cmds=.dll
-  need_version=no
-  need_lib_prefix=no
-  # OS/2 can only load a DLL with a base name of 8 characters or less.
-  soname_spec='`test -n "$os2dllname" && libname="$os2dllname";
-    v=$($ECHO $release$versuffix | tr -d .-);
-    n=$($ECHO $libname | cut -b -$((8 - ${#v})) | tr . _);
-    $ECHO $n$v`$shared_ext'
-  library_names_spec='${libname}_dll.$libext'
-  dynamic_linker='OS/2 ld.exe'
-  shlibpath_var=BEGINLIBPATH
-  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
-  sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
-  postinstall_cmds='base_file=`basename \$file`~
-    dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; $ECHO \$dlname'\''`~
-    dldir=$destdir/`dirname \$dlpath`~
-    test -d \$dldir || mkdir -p \$dldir~
-    $install_prog $dir/$dlname \$dldir/$dlname~
-    chmod a+x \$dldir/$dlname~
-    if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then
-      eval '\''$striplib \$dldir/$dlname'\'' || exit \$?;
-    fi'
-  postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; $ECHO \$dlname'\''`~
-    dlpath=$dir/\$dldll~
-    $RM \$dlpath'
-  ;;
-
-osf3* | osf4* | osf5*)
-  version_type=osf
-  need_lib_prefix=no
-  need_version=no
-  soname_spec='$libname$release$shared_ext$major'
-  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
-  shlibpath_var=LD_LIBRARY_PATH
-  sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
-  sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
-  ;;
-
-rdos*)
-  dynamic_linker=no
-  ;;
-
-solaris*)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
-  soname_spec='$libname$release$shared_ext$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  hardcode_into_libs=yes
-  # ldd complains unless libraries are executable
-  postinstall_cmds='chmod +x $lib'
-  ;;
-
-sunos4*)
-  version_type=sunos
-  library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix'
-  finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  if test yes = "$with_gnu_ld"; then
-    need_lib_prefix=no
-  fi
-  need_version=yes
-  ;;
-
-sysv4 | sysv4.3*)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
-  soname_spec='$libname$release$shared_ext$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  case $host_vendor in
-    sni)
-      shlibpath_overrides_runpath=no
-      need_lib_prefix=no
-      runpath_var=LD_RUN_PATH
-      ;;
-    siemens)
-      need_lib_prefix=no
-      ;;
-    motorola)
-      need_lib_prefix=no
-      need_version=no
-      shlibpath_overrides_runpath=no
-      sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
-      ;;
-  esac
-  ;;
-
-sysv4*MP*)
-  if test -d /usr/nec; then
-    version_type=linux # correct to gnu/linux during the next big refactor
-    library_names_spec='$libname$shared_ext.$versuffix $libname$shared_ext.$major $libname$shared_ext'
-    soname_spec='$libname$shared_ext.$major'
-    shlibpath_var=LD_LIBRARY_PATH
-  fi
-  ;;
-
-sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
-  version_type=sco
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext $libname$shared_ext'
-  soname_spec='$libname$release$shared_ext$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  hardcode_into_libs=yes
-  if test yes = "$with_gnu_ld"; then
-    sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
-  else
-    sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
-    case $host_os in
-      sco3.2v5*)
-        sys_lib_search_path_spec="$sys_lib_search_path_spec /lib"
-	;;
-    esac
-  fi
-  sys_lib_dlsearch_path_spec='/usr/lib'
-  ;;
-
-tpf*)
-  # TPF is a cross-target only.  Preferred cross-host = GNU/Linux.
-  version_type=linux # correct to gnu/linux during the next big refactor
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  ;;
-
-uts4*)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
-  soname_spec='$libname$release$shared_ext$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  ;;
-
-*)
-  dynamic_linker=no
-  ;;
-esac
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $dynamic_linker" >&5
-$as_echo "$dynamic_linker" >&6; }
-test no = "$dynamic_linker" && can_build_shared=no
-
-variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
-if test yes = "$GCC"; then
-  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
-fi
-
-if test set = "${lt_cv_sys_lib_search_path_spec+set}"; then
-  sys_lib_search_path_spec=$lt_cv_sys_lib_search_path_spec
-fi
-
-if test set = "${lt_cv_sys_lib_dlsearch_path_spec+set}"; then
-  sys_lib_dlsearch_path_spec=$lt_cv_sys_lib_dlsearch_path_spec
-fi
-
-# remember unaugmented sys_lib_dlsearch_path content for libtool script decls...
-configure_time_dlsearch_path=$sys_lib_dlsearch_path_spec
-
-# ... but it needs LT_SYS_LIBRARY_PATH munging for other configure-time code
-func_munge_path_list sys_lib_dlsearch_path_spec "$LT_SYS_LIBRARY_PATH"
-
-# to be used as default LT_SYS_LIBRARY_PATH value in generated libtool
-configure_time_lt_sys_library_path=$LT_SYS_LIBRARY_PATH
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to hardcode library paths into programs" >&5
-$as_echo_n "checking how to hardcode library paths into programs... " >&6; }
-hardcode_action=
-if test -n "$hardcode_libdir_flag_spec" ||
-   test -n "$runpath_var" ||
-   test yes = "$hardcode_automatic"; then
-
-  # We can hardcode non-existent directories.
-  if test no != "$hardcode_direct" &&
-     # If the only mechanism to avoid hardcoding is shlibpath_var, we
-     # have to relink, otherwise we might link with an installed library
-     # when we should be linking with a yet-to-be-installed one
-     ## test no != "$_LT_TAGVAR(hardcode_shlibpath_var, )" &&
-     test no != "$hardcode_minus_L"; then
-    # Linking always hardcodes the temporary library directory.
-    hardcode_action=relink
-  else
-    # We can link without hardcoding, and we can hardcode nonexisting dirs.
-    hardcode_action=immediate
-  fi
-else
-  # We cannot hardcode anything, or else we can only hardcode existing
-  # directories.
-  hardcode_action=unsupported
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $hardcode_action" >&5
-$as_echo "$hardcode_action" >&6; }
-
-if test relink = "$hardcode_action" ||
-   test yes = "$inherit_rpath"; then
-  # Fast installation is not supported
-  enable_fast_install=no
-elif test yes = "$shlibpath_overrides_runpath" ||
-     test no = "$enable_shared"; then
-  # Fast installation is not necessary
-  enable_fast_install=needless
-fi
-
-
-
-
-
-
-  if test yes != "$enable_dlopen"; then
-  enable_dlopen=unknown
-  enable_dlopen_self=unknown
-  enable_dlopen_self_static=unknown
-else
-  lt_cv_dlopen=no
-  lt_cv_dlopen_libs=
-
-  case $host_os in
-  beos*)
-    lt_cv_dlopen=load_add_on
-    lt_cv_dlopen_libs=
-    lt_cv_dlopen_self=yes
-    ;;
-
-  mingw* | pw32* | cegcc*)
-    lt_cv_dlopen=LoadLibrary
-    lt_cv_dlopen_libs=
-    ;;
-
-  cygwin*)
-    lt_cv_dlopen=dlopen
-    lt_cv_dlopen_libs=
-    ;;
-
-  darwin*)
-    # if libdl is installed we need to link against it
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
-$as_echo_n "checking for dlopen in -ldl... " >&6; }
-if ${ac_cv_lib_dl_dlopen+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-ldl  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char dlopen ();
-int
-main ()
-{
-return dlopen ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_dl_dlopen=yes
-else
-  ac_cv_lib_dl_dlopen=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
-$as_echo "$ac_cv_lib_dl_dlopen" >&6; }
-if test "x$ac_cv_lib_dl_dlopen" = xyes; then :
-  lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-ldl
-else
-
-    lt_cv_dlopen=dyld
-    lt_cv_dlopen_libs=
-    lt_cv_dlopen_self=yes
-
-fi
-
-    ;;
-
-  tpf*)
-    # Don't try to run any link tests for TPF.  We know it's impossible
-    # because TPF is a cross-compiler, and we know how we open DSOs.
-    lt_cv_dlopen=dlopen
-    lt_cv_dlopen_libs=
-    lt_cv_dlopen_self=no
-    ;;
-
-  *)
-    ac_fn_c_check_func "$LINENO" "shl_load" "ac_cv_func_shl_load"
-if test "x$ac_cv_func_shl_load" = xyes; then :
-  lt_cv_dlopen=shl_load
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shl_load in -ldld" >&5
-$as_echo_n "checking for shl_load in -ldld... " >&6; }
-if ${ac_cv_lib_dld_shl_load+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-ldld  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char shl_load ();
-int
-main ()
-{
-return shl_load ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_dld_shl_load=yes
-else
-  ac_cv_lib_dld_shl_load=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_shl_load" >&5
-$as_echo "$ac_cv_lib_dld_shl_load" >&6; }
-if test "x$ac_cv_lib_dld_shl_load" = xyes; then :
-  lt_cv_dlopen=shl_load lt_cv_dlopen_libs=-ldld
-else
-  ac_fn_c_check_func "$LINENO" "dlopen" "ac_cv_func_dlopen"
-if test "x$ac_cv_func_dlopen" = xyes; then :
-  lt_cv_dlopen=dlopen
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
-$as_echo_n "checking for dlopen in -ldl... " >&6; }
-if ${ac_cv_lib_dl_dlopen+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-ldl  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char dlopen ();
-int
-main ()
-{
-return dlopen ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_dl_dlopen=yes
-else
-  ac_cv_lib_dl_dlopen=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
-$as_echo "$ac_cv_lib_dl_dlopen" >&6; }
-if test "x$ac_cv_lib_dl_dlopen" = xyes; then :
-  lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-ldl
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -lsvld" >&5
-$as_echo_n "checking for dlopen in -lsvld... " >&6; }
-if ${ac_cv_lib_svld_dlopen+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lsvld  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char dlopen ();
-int
-main ()
-{
-return dlopen ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_svld_dlopen=yes
-else
-  ac_cv_lib_svld_dlopen=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_svld_dlopen" >&5
-$as_echo "$ac_cv_lib_svld_dlopen" >&6; }
-if test "x$ac_cv_lib_svld_dlopen" = xyes; then :
-  lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-lsvld
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dld_link in -ldld" >&5
-$as_echo_n "checking for dld_link in -ldld... " >&6; }
-if ${ac_cv_lib_dld_dld_link+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-ldld  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char dld_link ();
-int
-main ()
-{
-return dld_link ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_dld_dld_link=yes
-else
-  ac_cv_lib_dld_dld_link=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_dld_link" >&5
-$as_echo "$ac_cv_lib_dld_dld_link" >&6; }
-if test "x$ac_cv_lib_dld_dld_link" = xyes; then :
-  lt_cv_dlopen=dld_link lt_cv_dlopen_libs=-ldld
-fi
-
-
-fi
-
-
-fi
-
-
-fi
-
-
-fi
-
-
-fi
-
-    ;;
-  esac
-
-  if test no = "$lt_cv_dlopen"; then
-    enable_dlopen=no
-  else
-    enable_dlopen=yes
-  fi
-
-  case $lt_cv_dlopen in
-  dlopen)
-    save_CPPFLAGS=$CPPFLAGS
-    test yes = "$ac_cv_header_dlfcn_h" && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
-
-    save_LDFLAGS=$LDFLAGS
-    wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
-
-    save_LIBS=$LIBS
-    LIBS="$lt_cv_dlopen_libs $LIBS"
-
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a program can dlopen itself" >&5
-$as_echo_n "checking whether a program can dlopen itself... " >&6; }
-if ${lt_cv_dlopen_self+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  	  if test yes = "$cross_compiling"; then :
-  lt_cv_dlopen_self=cross
-else
-  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
-  lt_status=$lt_dlunknown
-  cat > conftest.$ac_ext <<_LT_EOF
-#line $LINENO "configure"
-#include "confdefs.h"
-
-#if HAVE_DLFCN_H
-#include <dlfcn.h>
-#endif
-
-#include <stdio.h>
-
-#ifdef RTLD_GLOBAL
-#  define LT_DLGLOBAL		RTLD_GLOBAL
-#else
-#  ifdef DL_GLOBAL
-#    define LT_DLGLOBAL		DL_GLOBAL
-#  else
-#    define LT_DLGLOBAL		0
-#  endif
-#endif
-
-/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
-   find out it does not work in some platform. */
-#ifndef LT_DLLAZY_OR_NOW
-#  ifdef RTLD_LAZY
-#    define LT_DLLAZY_OR_NOW		RTLD_LAZY
-#  else
-#    ifdef DL_LAZY
-#      define LT_DLLAZY_OR_NOW		DL_LAZY
-#    else
-#      ifdef RTLD_NOW
-#        define LT_DLLAZY_OR_NOW	RTLD_NOW
-#      else
-#        ifdef DL_NOW
-#          define LT_DLLAZY_OR_NOW	DL_NOW
-#        else
-#          define LT_DLLAZY_OR_NOW	0
-#        endif
-#      endif
-#    endif
-#  endif
-#endif
-
-/* When -fvisibility=hidden is used, assume the code has been annotated
-   correspondingly for the symbols needed.  */
-#if defined __GNUC__ && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
-int fnord () __attribute__((visibility("default")));
-#endif
-
-int fnord () { return 42; }
-int main ()
-{
-  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
-  int status = $lt_dlunknown;
-
-  if (self)
-    {
-      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
-      else
-        {
-	  if (dlsym( self,"_fnord"))  status = $lt_dlneed_uscore;
-          else puts (dlerror ());
-	}
-      /* dlclose (self); */
-    }
-  else
-    puts (dlerror ());
-
-  return status;
-}
-_LT_EOF
-  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } && test -s "conftest$ac_exeext" 2>/dev/null; then
-    (./conftest; exit; ) >&5 2>/dev/null
-    lt_status=$?
-    case x$lt_status in
-      x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;;
-      x$lt_dlneed_uscore) lt_cv_dlopen_self=yes ;;
-      x$lt_dlunknown|x*) lt_cv_dlopen_self=no ;;
-    esac
-  else :
-    # compilation failed
-    lt_cv_dlopen_self=no
-  fi
-fi
-rm -fr conftest*
-
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self" >&5
-$as_echo "$lt_cv_dlopen_self" >&6; }
-
-    if test yes = "$lt_cv_dlopen_self"; then
-      wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a statically linked program can dlopen itself" >&5
-$as_echo_n "checking whether a statically linked program can dlopen itself... " >&6; }
-if ${lt_cv_dlopen_self_static+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  	  if test yes = "$cross_compiling"; then :
-  lt_cv_dlopen_self_static=cross
-else
-  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
-  lt_status=$lt_dlunknown
-  cat > conftest.$ac_ext <<_LT_EOF
-#line $LINENO "configure"
-#include "confdefs.h"
-
-#if HAVE_DLFCN_H
-#include <dlfcn.h>
-#endif
-
-#include <stdio.h>
-
-#ifdef RTLD_GLOBAL
-#  define LT_DLGLOBAL		RTLD_GLOBAL
-#else
-#  ifdef DL_GLOBAL
-#    define LT_DLGLOBAL		DL_GLOBAL
-#  else
-#    define LT_DLGLOBAL		0
-#  endif
-#endif
-
-/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
-   find out it does not work in some platform. */
-#ifndef LT_DLLAZY_OR_NOW
-#  ifdef RTLD_LAZY
-#    define LT_DLLAZY_OR_NOW		RTLD_LAZY
-#  else
-#    ifdef DL_LAZY
-#      define LT_DLLAZY_OR_NOW		DL_LAZY
-#    else
-#      ifdef RTLD_NOW
-#        define LT_DLLAZY_OR_NOW	RTLD_NOW
-#      else
-#        ifdef DL_NOW
-#          define LT_DLLAZY_OR_NOW	DL_NOW
-#        else
-#          define LT_DLLAZY_OR_NOW	0
-#        endif
-#      endif
-#    endif
-#  endif
-#endif
-
-/* When -fvisibility=hidden is used, assume the code has been annotated
-   correspondingly for the symbols needed.  */
-#if defined __GNUC__ && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
-int fnord () __attribute__((visibility("default")));
-#endif
-
-int fnord () { return 42; }
-int main ()
-{
-  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
-  int status = $lt_dlunknown;
-
-  if (self)
-    {
-      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
-      else
-        {
-	  if (dlsym( self,"_fnord"))  status = $lt_dlneed_uscore;
-          else puts (dlerror ());
-	}
-      /* dlclose (self); */
-    }
-  else
-    puts (dlerror ());
-
-  return status;
-}
-_LT_EOF
-  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } && test -s "conftest$ac_exeext" 2>/dev/null; then
-    (./conftest; exit; ) >&5 2>/dev/null
-    lt_status=$?
-    case x$lt_status in
-      x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;;
-      x$lt_dlneed_uscore) lt_cv_dlopen_self_static=yes ;;
-      x$lt_dlunknown|x*) lt_cv_dlopen_self_static=no ;;
-    esac
-  else :
-    # compilation failed
-    lt_cv_dlopen_self_static=no
-  fi
-fi
-rm -fr conftest*
-
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self_static" >&5
-$as_echo "$lt_cv_dlopen_self_static" >&6; }
-    fi
-
-    CPPFLAGS=$save_CPPFLAGS
-    LDFLAGS=$save_LDFLAGS
-    LIBS=$save_LIBS
-    ;;
-  esac
-
-  case $lt_cv_dlopen_self in
-  yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
-  *) enable_dlopen_self=unknown ;;
-  esac
-
-  case $lt_cv_dlopen_self_static in
-  yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;;
-  *) enable_dlopen_self_static=unknown ;;
-  esac
-fi
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-striplib=
-old_striplib=
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stripping libraries is possible" >&5
-$as_echo_n "checking whether stripping libraries is possible... " >&6; }
-if test -z "$STRIP"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-else
-  if $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then
-    old_striplib="$STRIP --strip-debug"
-    striplib="$STRIP --strip-unneeded"
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-  else
-    case $host_os in
-    darwin*)
-      # FIXME - insert some real tests, host_os isn't really good enough
-      striplib="$STRIP -x"
-      old_striplib="$STRIP -S"
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-      ;;
-    freebsd*)
-      if $STRIP -V 2>&1 | $GREP "elftoolchain" >/dev/null; then
-        old_striplib="$STRIP --strip-debug"
-        striplib="$STRIP --strip-unneeded"
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-      else
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-      fi
-      ;;
-    *)
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-      ;;
-    esac
-  fi
-fi
-
-
-
-
-
-
-
-
-
-
-
-
-  # Report what library types will actually be built
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if libtool supports shared libraries" >&5
-$as_echo_n "checking if libtool supports shared libraries... " >&6; }
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $can_build_shared" >&5
-$as_echo "$can_build_shared" >&6; }
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build shared libraries" >&5
-$as_echo_n "checking whether to build shared libraries... " >&6; }
-  test no = "$can_build_shared" && enable_shared=no
-
-  # On AIX, shared libraries and static libraries use the same namespace, and
-  # are all built from PIC.
-  case $host_os in
-  aix3*)
-    test yes = "$enable_shared" && enable_static=no
-    if test -n "$RANLIB"; then
-      archive_cmds="$archive_cmds~\$RANLIB \$lib"
-      postinstall_cmds='$RANLIB $lib'
-    fi
-    ;;
-
-  aix[4-9]*)
-    if test ia64 != "$host_cpu"; then
-      case $enable_shared,$with_aix_soname,$aix_use_runtimelinking in
-      yes,aix,yes) ;;			# shared object as lib.so file only
-      yes,svr4,*) ;;			# shared object as lib.so archive member only
-      yes,*) enable_static=no ;;	# shared object in lib.a archive as well
-      esac
-    fi
-    ;;
-  esac
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_shared" >&5
-$as_echo "$enable_shared" >&6; }
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build static libraries" >&5
-$as_echo_n "checking whether to build static libraries... " >&6; }
-  # Make sure either enable_shared or enable_static is yes.
-  test yes = "$enable_shared" || enable_static=yes
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_static" >&5
-$as_echo "$enable_static" >&6; }
-
-
-
-
-fi
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-CC=$lt_save_CC
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-        ac_config_commands="$ac_config_commands libtool"
-
-
-
-
-# Only expand once:
-
-
-
-# Checks for programs.
-ac_ext=cpp
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-if test -z "$CXX"; then
-  if test -n "$CCC"; then
-    CXX=$CCC
-  else
-    if test -n "$ac_tool_prefix"; then
-  for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC
-  do
-    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
-set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_CXX+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$CXX"; then
-  ac_cv_prog_CXX="$CXX" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-CXX=$ac_cv_prog_CXX
-if test -n "$CXX"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXX" >&5
-$as_echo "$CXX" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-    test -n "$CXX" && break
-  done
-fi
-if test -z "$CXX"; then
-  ac_ct_CXX=$CXX
-  for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_CXX+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_CXX"; then
-  ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_CXX="$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_CXX=$ac_cv_prog_ac_ct_CXX
-if test -n "$ac_ct_CXX"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CXX" >&5
-$as_echo "$ac_ct_CXX" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  test -n "$ac_ct_CXX" && break
-done
-
-  if test "x$ac_ct_CXX" = x; then
-    CXX="g++"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    CXX=$ac_ct_CXX
-  fi
-fi
-
-  fi
-fi
-# Provide some information about the compiler.
-$as_echo "$as_me:${as_lineno-$LINENO}: checking for C++ compiler version" >&5
-set X $ac_compile
-ac_compiler=$2
-for ac_option in --version -v -V -qversion; do
-  { { ac_try="$ac_compiler $ac_option >&5"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_compiler $ac_option >&5") 2>conftest.err
-  ac_status=$?
-  if test -s conftest.err; then
-    sed '10a\
-... rest of stderr output deleted ...
-         10q' conftest.err >conftest.er1
-    cat conftest.er1 >&5
-  fi
-  rm -f conftest.er1 conftest.err
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }
-done
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C++ compiler" >&5
-$as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; }
-if ${ac_cv_cxx_compiler_gnu+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-#ifndef __GNUC__
-       choke me
-#endif
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_cxx_try_compile "$LINENO"; then :
-  ac_compiler_gnu=yes
-else
-  ac_compiler_gnu=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-ac_cv_cxx_compiler_gnu=$ac_compiler_gnu
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cxx_compiler_gnu" >&5
-$as_echo "$ac_cv_cxx_compiler_gnu" >&6; }
-if test $ac_compiler_gnu = yes; then
-  GXX=yes
-else
-  GXX=
-fi
-ac_test_CXXFLAGS=${CXXFLAGS+set}
-ac_save_CXXFLAGS=$CXXFLAGS
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX accepts -g" >&5
-$as_echo_n "checking whether $CXX accepts -g... " >&6; }
-if ${ac_cv_prog_cxx_g+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_save_cxx_werror_flag=$ac_cxx_werror_flag
-   ac_cxx_werror_flag=yes
-   ac_cv_prog_cxx_g=no
-   CXXFLAGS="-g"
-   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_cxx_try_compile "$LINENO"; then :
-  ac_cv_prog_cxx_g=yes
-else
-  CXXFLAGS=""
-      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_cxx_try_compile "$LINENO"; then :
-
-else
-  ac_cxx_werror_flag=$ac_save_cxx_werror_flag
-	 CXXFLAGS="-g"
-	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_cxx_try_compile "$LINENO"; then :
-  ac_cv_prog_cxx_g=yes
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-   ac_cxx_werror_flag=$ac_save_cxx_werror_flag
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_g" >&5
-$as_echo "$ac_cv_prog_cxx_g" >&6; }
-if test "$ac_test_CXXFLAGS" = set; then
-  CXXFLAGS=$ac_save_CXXFLAGS
-elif test $ac_cv_prog_cxx_g = yes; then
-  if test "$GXX" = yes; then
-    CXXFLAGS="-g -O2"
-  else
-    CXXFLAGS="-g"
-  fi
-else
-  if test "$GXX" = yes; then
-    CXXFLAGS="-O2"
-  else
-    CXXFLAGS=
-  fi
-fi
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-depcc="$CXX"  am_compiler_list=
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
-$as_echo_n "checking dependency style of $depcc... " >&6; }
-if ${am_cv_CXX_dependencies_compiler_type+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
-  # We make a subdir and do the tests there.  Otherwise we can end up
-  # making bogus files that we don't know about and never remove.  For
-  # instance it was reported that on HP-UX the gcc test will end up
-  # making a dummy file named 'D' -- because '-MD' means "put the output
-  # in D".
-  rm -rf conftest.dir
-  mkdir conftest.dir
-  # Copy depcomp to subdir because otherwise we won't find it if we're
-  # using a relative directory.
-  cp "$am_depcomp" conftest.dir
-  cd conftest.dir
-  # We will build objects and dependencies in a subdirectory because
-  # it helps to detect inapplicable dependency modes.  For instance
-  # both Tru64's cc and ICC support -MD to output dependencies as a
-  # side effect of compilation, but ICC will put the dependencies in
-  # the current directory while Tru64 will put them in the object
-  # directory.
-  mkdir sub
-
-  am_cv_CXX_dependencies_compiler_type=none
-  if test "$am_compiler_list" = ""; then
-     am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
-  fi
-  am__universal=false
-  case " $depcc " in #(
-     *\ -arch\ *\ -arch\ *) am__universal=true ;;
-     esac
-
-  for depmode in $am_compiler_list; do
-    # Setup a source with many dependencies, because some compilers
-    # like to wrap large dependency lists on column 80 (with \), and
-    # we should not choose a depcomp mode which is confused by this.
-    #
-    # We need to recreate these files for each test, as the compiler may
-    # overwrite some of them when testing with obscure command lines.
-    # This happens at least with the AIX C compiler.
-    : > sub/conftest.c
-    for i in 1 2 3 4 5 6; do
-      echo '#include "conftst'$i'.h"' >> sub/conftest.c
-      # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with
-      # Solaris 10 /bin/sh.
-      echo '/* dummy */' > sub/conftst$i.h
-    done
-    echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
-
-    # We check with '-c' and '-o' for the sake of the "dashmstdout"
-    # mode.  It turns out that the SunPro C++ compiler does not properly
-    # handle '-M -o', and we need to detect this.  Also, some Intel
-    # versions had trouble with output in subdirs.
-    am__obj=sub/conftest.${OBJEXT-o}
-    am__minus_obj="-o $am__obj"
-    case $depmode in
-    gcc)
-      # This depmode causes a compiler race in universal mode.
-      test "$am__universal" = false || continue
-      ;;
-    nosideeffect)
-      # After this tag, mechanisms are not by side-effect, so they'll
-      # only be used when explicitly requested.
-      if test "x$enable_dependency_tracking" = xyes; then
-	continue
-      else
-	break
-      fi
-      ;;
-    msvc7 | msvc7msys | msvisualcpp | msvcmsys)
-      # This compiler won't grok '-c -o', but also, the minuso test has
-      # not run yet.  These depmodes are late enough in the game, and
-      # so weak that their functioning should not be impacted.
-      am__obj=conftest.${OBJEXT-o}
-      am__minus_obj=
-      ;;
-    none) break ;;
-    esac
-    if depmode=$depmode \
-       source=sub/conftest.c object=$am__obj \
-       depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
-       $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \
-         >/dev/null 2>conftest.err &&
-       grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
-       grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
-       grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&
-       ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
-      # icc doesn't choke on unknown options, it will just issue warnings
-      # or remarks (even with -Werror).  So we grep stderr for any message
-      # that says an option was ignored or not supported.
-      # When given -MP, icc 7.0 and 7.1 complain thusly:
-      #   icc: Command line warning: ignoring option '-M'; no argument required
-      # The diagnosis changed in icc 8.0:
-      #   icc: Command line remark: option '-MP' not supported
-      if (grep 'ignoring option' conftest.err ||
-          grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
-        am_cv_CXX_dependencies_compiler_type=$depmode
-        break
-      fi
-    fi
-  done
-
-  cd ..
-  rm -rf conftest.dir
-else
-  am_cv_CXX_dependencies_compiler_type=none
-fi
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CXX_dependencies_compiler_type" >&5
-$as_echo "$am_cv_CXX_dependencies_compiler_type" >&6; }
-CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type
-
- if
-  test "x$enable_dependency_tracking" != xno \
-  && test "$am_cv_CXX_dependencies_compiler_type" = gcc3; then
-  am__fastdepCXX_TRUE=
-  am__fastdepCXX_FALSE='#'
-else
-  am__fastdepCXX_TRUE='#'
-  am__fastdepCXX_FALSE=
-fi
-
-
-
-
-func_stripname_cnf ()
-{
-  case $2 in
-  .*) func_stripname_result=`$ECHO "$3" | $SED "s%^$1%%; s%\\\\$2\$%%"`;;
-  *)  func_stripname_result=`$ECHO "$3" | $SED "s%^$1%%; s%$2\$%%"`;;
-  esac
-} # func_stripname_cnf
-
-      if test -n "$CXX" && ( test no != "$CXX" &&
-    ( (test g++ = "$CXX" && `g++ -v >/dev/null 2>&1` ) ||
-    (test g++ != "$CXX"))); then
-  ac_ext=cpp
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C++ preprocessor" >&5
-$as_echo_n "checking how to run the C++ preprocessor... " >&6; }
-if test -z "$CXXCPP"; then
-  if ${ac_cv_prog_CXXCPP+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-      # Double quotes because CXXCPP needs to be expanded
-    for CXXCPP in "$CXX -E" "/lib/cpp"
-    do
-      ac_preproc_ok=false
-for ac_cxx_preproc_warn_flag in '' yes
-do
-  # Use a header file that comes with gcc, so configuring glibc
-  # with a fresh cross-compiler works.
-  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-  # <limits.h> exists even on freestanding compilers.
-  # On the NeXT, cc -E runs the code through the compiler's parser,
-  # not just through cpp. "Syntax error" is here to catch this case.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-		     Syntax error
-_ACEOF
-if ac_fn_cxx_try_cpp "$LINENO"; then :
-
-else
-  # Broken: fails on valid input.
-continue
-fi
-rm -f conftest.err conftest.i conftest.$ac_ext
-
-  # OK, works on sane cases.  Now check whether nonexistent headers
-  # can be detected and how.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <ac_nonexistent.h>
-_ACEOF
-if ac_fn_cxx_try_cpp "$LINENO"; then :
-  # Broken: success on invalid input.
-continue
-else
-  # Passes both tests.
-ac_preproc_ok=:
-break
-fi
-rm -f conftest.err conftest.i conftest.$ac_ext
-
-done
-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.i conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then :
-  break
-fi
-
-    done
-    ac_cv_prog_CXXCPP=$CXXCPP
-
-fi
-  CXXCPP=$ac_cv_prog_CXXCPP
-else
-  ac_cv_prog_CXXCPP=$CXXCPP
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXXCPP" >&5
-$as_echo "$CXXCPP" >&6; }
-ac_preproc_ok=false
-for ac_cxx_preproc_warn_flag in '' yes
-do
-  # Use a header file that comes with gcc, so configuring glibc
-  # with a fresh cross-compiler works.
-  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-  # <limits.h> exists even on freestanding compilers.
-  # On the NeXT, cc -E runs the code through the compiler's parser,
-  # not just through cpp. "Syntax error" is here to catch this case.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-		     Syntax error
-_ACEOF
-if ac_fn_cxx_try_cpp "$LINENO"; then :
-
-else
-  # Broken: fails on valid input.
-continue
-fi
-rm -f conftest.err conftest.i conftest.$ac_ext
-
-  # OK, works on sane cases.  Now check whether nonexistent headers
-  # can be detected and how.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <ac_nonexistent.h>
-_ACEOF
-if ac_fn_cxx_try_cpp "$LINENO"; then :
-  # Broken: success on invalid input.
-continue
-else
-  # Passes both tests.
-ac_preproc_ok=:
-break
-fi
-rm -f conftest.err conftest.i conftest.$ac_ext
-
-done
-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.i conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then :
-
-else
-  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "C++ preprocessor \"$CXXCPP\" fails sanity check
-See \`config.log' for more details" "$LINENO" 5; }
-fi
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-else
-  _lt_caught_CXX_error=yes
-fi
-
-ac_ext=cpp
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-
-archive_cmds_need_lc_CXX=no
-allow_undefined_flag_CXX=
-always_export_symbols_CXX=no
-archive_expsym_cmds_CXX=
-compiler_needs_object_CXX=no
-export_dynamic_flag_spec_CXX=
-hardcode_direct_CXX=no
-hardcode_direct_absolute_CXX=no
-hardcode_libdir_flag_spec_CXX=
-hardcode_libdir_separator_CXX=
-hardcode_minus_L_CXX=no
-hardcode_shlibpath_var_CXX=unsupported
-hardcode_automatic_CXX=no
-inherit_rpath_CXX=no
-module_cmds_CXX=
-module_expsym_cmds_CXX=
-link_all_deplibs_CXX=unknown
-old_archive_cmds_CXX=$old_archive_cmds
-reload_flag_CXX=$reload_flag
-reload_cmds_CXX=$reload_cmds
-no_undefined_flag_CXX=
-whole_archive_flag_spec_CXX=
-enable_shared_with_static_runtimes_CXX=no
-
-# Source file extension for C++ test sources.
-ac_ext=cpp
-
-# Object file extension for compiled C++ test sources.
-objext=o
-objext_CXX=$objext
-
-# No sense in running all these tests if we already determined that
-# the CXX compiler isn't working.  Some variables (like enable_shared)
-# are currently assumed to apply to all compilers on this platform,
-# and will be corrupted by setting them based on a non-working compiler.
-if test yes != "$_lt_caught_CXX_error"; then
-  # Code to be used in simple compile tests
-  lt_simple_compile_test_code="int some_variable = 0;"
-
-  # Code to be used in simple link tests
-  lt_simple_link_test_code='int main(int, char *[]) { return(0); }'
-
-  # ltmain only uses $CC for tagged configurations so make sure $CC is set.
-
-
-
-
-
-
-# If no C compiler was specified, use CC.
-LTCC=${LTCC-"$CC"}
-
-# If no C compiler flags were specified, use CFLAGS.
-LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
-
-# Allow CC to be a program name with arguments.
-compiler=$CC
-
-
-  # save warnings/boilerplate of simple test code
-  ac_outfile=conftest.$ac_objext
-echo "$lt_simple_compile_test_code" >conftest.$ac_ext
-eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
-_lt_compiler_boilerplate=`cat conftest.err`
-$RM conftest*
-
-  ac_outfile=conftest.$ac_objext
-echo "$lt_simple_link_test_code" >conftest.$ac_ext
-eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
-_lt_linker_boilerplate=`cat conftest.err`
-$RM -r conftest*
-
-
-  # Allow CC to be a program name with arguments.
-  lt_save_CC=$CC
-  lt_save_CFLAGS=$CFLAGS
-  lt_save_LD=$LD
-  lt_save_GCC=$GCC
-  GCC=$GXX
-  lt_save_with_gnu_ld=$with_gnu_ld
-  lt_save_path_LD=$lt_cv_path_LD
-  if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then
-    lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx
-  else
-    $as_unset lt_cv_prog_gnu_ld
-  fi
-  if test -n "${lt_cv_path_LDCXX+set}"; then
-    lt_cv_path_LD=$lt_cv_path_LDCXX
-  else
-    $as_unset lt_cv_path_LD
-  fi
-  test -z "${LDCXX+set}" || LD=$LDCXX
-  CC=${CXX-"c++"}
-  CFLAGS=$CXXFLAGS
-  compiler=$CC
-  compiler_CXX=$CC
-  func_cc_basename $compiler
-cc_basename=$func_cc_basename_result
-
-
-  if test -n "$compiler"; then
-    # We don't want -fno-exception when compiling C++ code, so set the
-    # no_builtin_flag separately
-    if test yes = "$GXX"; then
-      lt_prog_compiler_no_builtin_flag_CXX=' -fno-builtin'
-    else
-      lt_prog_compiler_no_builtin_flag_CXX=
-    fi
-
-    if test yes = "$GXX"; then
-      # Set up default GNU C++ configuration
-
-
-
-# Check whether --with-gnu-ld was given.
-if test "${with_gnu_ld+set}" = set; then :
-  withval=$with_gnu_ld; test no = "$withval" || with_gnu_ld=yes
-else
-  with_gnu_ld=no
-fi
-
-ac_prog=ld
-if test yes = "$GCC"; then
-  # Check if gcc -print-prog-name=ld gives a path.
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5
-$as_echo_n "checking for ld used by $CC... " >&6; }
-  case $host in
-  *-*-mingw*)
-    # gcc leaves a trailing carriage return, which upsets mingw
-    ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
-  *)
-    ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
-  esac
-  case $ac_prog in
-    # Accept absolute paths.
-    [\\/]* | ?:[\\/]*)
-      re_direlt='/[^/][^/]*/\.\./'
-      # Canonicalize the pathname of ld
-      ac_prog=`$ECHO "$ac_prog"| $SED 's%\\\\%/%g'`
-      while $ECHO "$ac_prog" | $GREP "$re_direlt" > /dev/null 2>&1; do
-	ac_prog=`$ECHO $ac_prog| $SED "s%$re_direlt%/%"`
-      done
-      test -z "$LD" && LD=$ac_prog
-      ;;
-  "")
-    # If it fails, then pretend we aren't using GCC.
-    ac_prog=ld
-    ;;
-  *)
-    # If it is relative, then search for the first ld in PATH.
-    with_gnu_ld=unknown
-    ;;
-  esac
-elif test yes = "$with_gnu_ld"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5
-$as_echo_n "checking for GNU ld... " >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5
-$as_echo_n "checking for non-GNU ld... " >&6; }
-fi
-if ${lt_cv_path_LD+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -z "$LD"; then
-  lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR
-  for ac_dir in $PATH; do
-    IFS=$lt_save_ifs
-    test -z "$ac_dir" && ac_dir=.
-    if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
-      lt_cv_path_LD=$ac_dir/$ac_prog
-      # Check to see if the program is GNU ld.  I'd rather use --version,
-      # but apparently some variants of GNU ld only accept -v.
-      # Break only if it was the GNU/non-GNU ld that we prefer.
-      case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
-      *GNU* | *'with BFD'*)
-	test no != "$with_gnu_ld" && break
-	;;
-      *)
-	test yes != "$with_gnu_ld" && break
-	;;
-      esac
-    fi
-  done
-  IFS=$lt_save_ifs
-else
-  lt_cv_path_LD=$LD # Let the user override the test with a path.
-fi
-fi
-
-LD=$lt_cv_path_LD
-if test -n "$LD"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LD" >&5
-$as_echo "$LD" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5
-$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }
-if ${lt_cv_prog_gnu_ld+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  # I'd rather use --version here, but apparently some GNU lds only accept -v.
-case `$LD -v 2>&1 </dev/null` in
-*GNU* | *'with BFD'*)
-  lt_cv_prog_gnu_ld=yes
-  ;;
-*)
-  lt_cv_prog_gnu_ld=no
-  ;;
-esac
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_gnu_ld" >&5
-$as_echo "$lt_cv_prog_gnu_ld" >&6; }
-with_gnu_ld=$lt_cv_prog_gnu_ld
-
-
-
-
-
-
-
-      # Check if GNU C++ uses GNU ld as the underlying linker, since the
-      # archiving commands below assume that GNU ld is being used.
-      if test yes = "$with_gnu_ld"; then
-        archive_cmds_CXX='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib'
-        archive_expsym_cmds_CXX='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
-
-        hardcode_libdir_flag_spec_CXX='$wl-rpath $wl$libdir'
-        export_dynamic_flag_spec_CXX='$wl--export-dynamic'
-
-        # If archive_cmds runs LD, not CC, wlarc should be empty
-        # XXX I think wlarc can be eliminated in ltcf-cxx, but I need to
-        #     investigate it a little bit more. (MM)
-        wlarc='$wl'
-
-        # ancient GNU ld didn't support --whole-archive et. al.
-        if eval "`$CC -print-prog-name=ld` --help 2>&1" |
-	  $GREP 'no-whole-archive' > /dev/null; then
-          whole_archive_flag_spec_CXX=$wlarc'--whole-archive$convenience '$wlarc'--no-whole-archive'
-        else
-          whole_archive_flag_spec_CXX=
-        fi
-      else
-        with_gnu_ld=no
-        wlarc=
-
-        # A generic and very simple default shared library creation
-        # command for GNU C++ for the case where it uses the native
-        # linker, instead of GNU ld.  If possible, this setting should
-        # overridden to take advantage of the native linker features on
-        # the platform it is being used on.
-        archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
-      fi
-
-      # Commands to make compiler produce verbose output that lists
-      # what "hidden" libraries, object files and flags are used when
-      # linking a shared library.
-      output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
-
-    else
-      GXX=no
-      with_gnu_ld=no
-      wlarc=
-    fi
-
-    # PORTME: fill in a description of your system's C++ link characteristics
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $compiler linker ($LD) supports shared libraries" >&5
-$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
-    ld_shlibs_CXX=yes
-    case $host_os in
-      aix3*)
-        # FIXME: insert proper C++ library support
-        ld_shlibs_CXX=no
-        ;;
-      aix[4-9]*)
-        if test ia64 = "$host_cpu"; then
-          # On IA64, the linker does run time linking by default, so we don't
-          # have to do anything special.
-          aix_use_runtimelinking=no
-          exp_sym_flag='-Bexport'
-          no_entry_flag=
-        else
-          aix_use_runtimelinking=no
-
-          # Test if we are trying to use run time linking or normal
-          # AIX style linking. If -brtl is somewhere in LDFLAGS, we
-          # have runtime linking enabled, and use it for executables.
-          # For shared libraries, we enable/disable runtime linking
-          # depending on the kind of the shared library created -
-          # when "with_aix_soname,aix_use_runtimelinking" is:
-          # "aix,no"   lib.a(lib.so.V) shared, rtl:no,  for executables
-          # "aix,yes"  lib.so          shared, rtl:yes, for executables
-          #            lib.a           static archive
-          # "both,no"  lib.so.V(shr.o) shared, rtl:yes
-          #            lib.a(lib.so.V) shared, rtl:no,  for executables
-          # "both,yes" lib.so.V(shr.o) shared, rtl:yes, for executables
-          #            lib.a(lib.so.V) shared, rtl:no
-          # "svr4,*"   lib.so.V(shr.o) shared, rtl:yes, for executables
-          #            lib.a           static archive
-          case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*)
-	    for ld_flag in $LDFLAGS; do
-	      case $ld_flag in
-	      *-brtl*)
-	        aix_use_runtimelinking=yes
-	        break
-	        ;;
-	      esac
-	    done
-	    if test svr4,no = "$with_aix_soname,$aix_use_runtimelinking"; then
-	      # With aix-soname=svr4, we create the lib.so.V shared archives only,
-	      # so we don't have lib.a shared libs to link our executables.
-	      # We have to force runtime linking in this case.
-	      aix_use_runtimelinking=yes
-	      LDFLAGS="$LDFLAGS -Wl,-brtl"
-	    fi
-	    ;;
-          esac
-
-          exp_sym_flag='-bexport'
-          no_entry_flag='-bnoentry'
-        fi
-
-        # When large executables or shared objects are built, AIX ld can
-        # have problems creating the table of contents.  If linking a library
-        # or program results in "error TOC overflow" add -mminimal-toc to
-        # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
-        # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
-
-        archive_cmds_CXX=''
-        hardcode_direct_CXX=yes
-        hardcode_direct_absolute_CXX=yes
-        hardcode_libdir_separator_CXX=':'
-        link_all_deplibs_CXX=yes
-        file_list_spec_CXX='$wl-f,'
-        case $with_aix_soname,$aix_use_runtimelinking in
-        aix,*) ;;	# no import file
-        svr4,* | *,yes) # use import file
-          # The Import File defines what to hardcode.
-          hardcode_direct_CXX=no
-          hardcode_direct_absolute_CXX=no
-          ;;
-        esac
-
-        if test yes = "$GXX"; then
-          case $host_os in aix4.[012]|aix4.[012].*)
-          # We only want to do this on AIX 4.2 and lower, the check
-          # below for broken collect2 doesn't work under 4.3+
-	  collect2name=`$CC -print-prog-name=collect2`
-	  if test -f "$collect2name" &&
-	     strings "$collect2name" | $GREP resolve_lib_name >/dev/null
-	  then
-	    # We have reworked collect2
-	    :
-	  else
-	    # We have old collect2
-	    hardcode_direct_CXX=unsupported
-	    # It fails to find uninstalled libraries when the uninstalled
-	    # path is not listed in the libpath.  Setting hardcode_minus_L
-	    # to unsupported forces relinking
-	    hardcode_minus_L_CXX=yes
-	    hardcode_libdir_flag_spec_CXX='-L$libdir'
-	    hardcode_libdir_separator_CXX=
-	  fi
-          esac
-          shared_flag='-shared'
-	  if test yes = "$aix_use_runtimelinking"; then
-	    shared_flag=$shared_flag' $wl-G'
-	  fi
-	  # Need to ensure runtime linking is disabled for the traditional
-	  # shared library, or the linker may eventually find shared libraries
-	  # /with/ Import File - we do not want to mix them.
-	  shared_flag_aix='-shared'
-	  shared_flag_svr4='-shared $wl-G'
-        else
-          # not using gcc
-          if test ia64 = "$host_cpu"; then
-	  # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
-	  # chokes on -Wl,-G. The following line is correct:
-	  shared_flag='-G'
-          else
-	    if test yes = "$aix_use_runtimelinking"; then
-	      shared_flag='$wl-G'
-	    else
-	      shared_flag='$wl-bM:SRE'
-	    fi
-	    shared_flag_aix='$wl-bM:SRE'
-	    shared_flag_svr4='$wl-G'
-          fi
-        fi
-
-        export_dynamic_flag_spec_CXX='$wl-bexpall'
-        # It seems that -bexpall does not export symbols beginning with
-        # underscore (_), so it is better to generate a list of symbols to
-	# export.
-        always_export_symbols_CXX=yes
-	if test aix,yes = "$with_aix_soname,$aix_use_runtimelinking"; then
-          # Warning - without using the other runtime loading flags (-brtl),
-          # -berok will link without error, but may produce a broken library.
-          # The "-G" linker flag allows undefined symbols.
-          no_undefined_flag_CXX='-bernotok'
-          # Determine the default libpath from the value encoded in an empty
-          # executable.
-          if test set = "${lt_cv_aix_libpath+set}"; then
-  aix_libpath=$lt_cv_aix_libpath
-else
-  if ${lt_cv_aix_libpath__CXX+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_cxx_try_link "$LINENO"; then :
-
-  lt_aix_libpath_sed='
-      /Import File Strings/,/^$/ {
-	  /^0/ {
-	      s/^0  *\([^ ]*\) *$/\1/
-	      p
-	  }
-      }'
-  lt_cv_aix_libpath__CXX=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-  # Check for a 64-bit object if we didn't find anything.
-  if test -z "$lt_cv_aix_libpath__CXX"; then
-    lt_cv_aix_libpath__CXX=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-  fi
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-  if test -z "$lt_cv_aix_libpath__CXX"; then
-    lt_cv_aix_libpath__CXX=/usr/lib:/lib
-  fi
-
-fi
-
-  aix_libpath=$lt_cv_aix_libpath__CXX
-fi
-
-          hardcode_libdir_flag_spec_CXX='$wl-blibpath:$libdir:'"$aix_libpath"
-
-          archive_expsym_cmds_CXX='$CC -o $output_objdir/$soname $libobjs $deplibs $wl'$no_entry_flag' $compiler_flags `if test -n "$allow_undefined_flag"; then func_echo_all "$wl$allow_undefined_flag"; else :; fi` $wl'$exp_sym_flag:\$export_symbols' '$shared_flag
-        else
-          if test ia64 = "$host_cpu"; then
-	    hardcode_libdir_flag_spec_CXX='$wl-R $libdir:/usr/lib:/lib'
-	    allow_undefined_flag_CXX="-z nodefs"
-	    archive_expsym_cmds_CXX="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\$wl$no_entry_flag"' $compiler_flags $wl$allow_undefined_flag '"\$wl$exp_sym_flag:\$export_symbols"
-          else
-	    # Determine the default libpath from the value encoded in an
-	    # empty executable.
-	    if test set = "${lt_cv_aix_libpath+set}"; then
-  aix_libpath=$lt_cv_aix_libpath
-else
-  if ${lt_cv_aix_libpath__CXX+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_cxx_try_link "$LINENO"; then :
-
-  lt_aix_libpath_sed='
-      /Import File Strings/,/^$/ {
-	  /^0/ {
-	      s/^0  *\([^ ]*\) *$/\1/
-	      p
-	  }
-      }'
-  lt_cv_aix_libpath__CXX=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-  # Check for a 64-bit object if we didn't find anything.
-  if test -z "$lt_cv_aix_libpath__CXX"; then
-    lt_cv_aix_libpath__CXX=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-  fi
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-  if test -z "$lt_cv_aix_libpath__CXX"; then
-    lt_cv_aix_libpath__CXX=/usr/lib:/lib
-  fi
-
-fi
-
-  aix_libpath=$lt_cv_aix_libpath__CXX
-fi
-
-	    hardcode_libdir_flag_spec_CXX='$wl-blibpath:$libdir:'"$aix_libpath"
-	    # Warning - without using the other run time loading flags,
-	    # -berok will link without error, but may produce a broken library.
-	    no_undefined_flag_CXX=' $wl-bernotok'
-	    allow_undefined_flag_CXX=' $wl-berok'
-	    if test yes = "$with_gnu_ld"; then
-	      # We only use this code for GNU lds that support --whole-archive.
-	      whole_archive_flag_spec_CXX='$wl--whole-archive$convenience $wl--no-whole-archive'
-	    else
-	      # Exported symbols can be pulled into shared objects from archives
-	      whole_archive_flag_spec_CXX='$convenience'
-	    fi
-	    archive_cmds_need_lc_CXX=yes
-	    archive_expsym_cmds_CXX='$RM -r $output_objdir/$realname.d~$MKDIR $output_objdir/$realname.d'
-	    # -brtl affects multiple linker settings, -berok does not and is overridden later
-	    compiler_flags_filtered='`func_echo_all "$compiler_flags " | $SED -e "s%-brtl\\([, ]\\)%-berok\\1%g"`'
-	    if test svr4 != "$with_aix_soname"; then
-	      # This is similar to how AIX traditionally builds its shared
-	      # libraries. Need -bnortl late, we may have -brtl in LDFLAGS.
-	      archive_expsym_cmds_CXX="$archive_expsym_cmds_CXX"'~$CC '$shared_flag_aix' -o $output_objdir/$realname.d/$soname $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$realname.d/$soname'
-	    fi
-	    if test aix != "$with_aix_soname"; then
-	      archive_expsym_cmds_CXX="$archive_expsym_cmds_CXX"'~$CC '$shared_flag_svr4' -o $output_objdir/$realname.d/$shared_archive_member_spec.o $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$STRIP -e $output_objdir/$realname.d/$shared_archive_member_spec.o~( func_echo_all "#! $soname($shared_archive_member_spec.o)"; if test shr_64 = "$shared_archive_member_spec"; then func_echo_all "# 64"; else func_echo_all "# 32"; fi; cat $export_symbols ) > $output_objdir/$realname.d/$shared_archive_member_spec.imp~$AR $AR_FLAGS $output_objdir/$soname $output_objdir/$realname.d/$shared_archive_member_spec.o $output_objdir/$realname.d/$shared_archive_member_spec.imp'
-	    else
-	      # used by -dlpreopen to get the symbols
-	      archive_expsym_cmds_CXX="$archive_expsym_cmds_CXX"'~$MV  $output_objdir/$realname.d/$soname $output_objdir'
-	    fi
-	    archive_expsym_cmds_CXX="$archive_expsym_cmds_CXX"'~$RM -r $output_objdir/$realname.d'
-          fi
-        fi
-        ;;
-
-      beos*)
-	if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
-	  allow_undefined_flag_CXX=unsupported
-	  # Joseph Beckenbach <jrb3@best.com> says some releases of gcc
-	  # support --undefined.  This deserves some investigation.  FIXME
-	  archive_cmds_CXX='$CC -nostart $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
-	else
-	  ld_shlibs_CXX=no
-	fi
-	;;
-
-      chorus*)
-        case $cc_basename in
-          *)
-	  # FIXME: insert proper C++ library support
-	  ld_shlibs_CXX=no
-	  ;;
-        esac
-        ;;
-
-      cygwin* | mingw* | pw32* | cegcc*)
-	case $GXX,$cc_basename in
-	,cl* | no,cl* | ,icl* | no,icl*)
-	  # Native MSVC or ICC
-	  # hardcode_libdir_flag_spec is actually meaningless, as there is
-	  # no search path for DLLs.
-	  hardcode_libdir_flag_spec_CXX=' '
-	  allow_undefined_flag_CXX=unsupported
-	  always_export_symbols_CXX=yes
-	  file_list_spec_CXX='@'
-	  # Tell ltmain to make .lib files, not .a files.
-	  libext=lib
-	  # Tell ltmain to make .dll files, not .so files.
-	  shrext_cmds=.dll
-	  # FIXME: Setting linknames here is a bad hack.
-	  archive_cmds_CXX='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~linknames='
-	  archive_expsym_cmds_CXX='if   test DEF = "`$SED -n     -e '\''s/^[	 ]*//'\''     -e '\''/^\(;.*\)*$/d'\''     -e '\''s/^\(EXPORTS\|LIBRARY\)\([	 ].*\)*$/DEF/p'\''     -e q     $export_symbols`" ; then
-              cp "$export_symbols" "$output_objdir/$soname.def";
-              echo "$tool_output_objdir$soname.def" > "$output_objdir/$soname.exp";
-            else
-              $SED -e '\''s/^/-link -EXPORT:/'\'' < $export_symbols > $output_objdir/$soname.exp;
-            fi~
-            $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
-            linknames='
-	  # The linker will not automatically build a static lib if we build a DLL.
-	  # _LT_TAGVAR(old_archive_from_new_cmds, CXX)='true'
-	  enable_shared_with_static_runtimes_CXX=yes
-	  # Don't use ranlib
-	  old_postinstall_cmds_CXX='chmod 644 $oldlib'
-	  postlink_cmds_CXX='lt_outputfile="@OUTPUT@"~
-            lt_tool_outputfile="@TOOL_OUTPUT@"~
-            case $lt_outputfile in
-              *.exe|*.EXE) ;;
-              *)
-                lt_outputfile=$lt_outputfile.exe
-                lt_tool_outputfile=$lt_tool_outputfile.exe
-                ;;
-            esac~
-            func_to_tool_file "$lt_outputfile"~
-            if test : != "$MANIFEST_TOOL" && test -f "$lt_outputfile.manifest"; then
-              $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
-              $RM "$lt_outputfile.manifest";
-            fi'
-	  ;;
-	*)
-	  # g++
-	  # _LT_TAGVAR(hardcode_libdir_flag_spec, CXX) is actually meaningless,
-	  # as there is no search path for DLLs.
-	  hardcode_libdir_flag_spec_CXX='-L$libdir'
-	  export_dynamic_flag_spec_CXX='$wl--export-all-symbols'
-	  allow_undefined_flag_CXX=unsupported
-	  always_export_symbols_CXX=no
-	  enable_shared_with_static_runtimes_CXX=yes
-
-	  if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
-	    archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-	    # If the export-symbols file already is a .def file, use it as
-	    # is; otherwise, prepend EXPORTS...
-	    archive_expsym_cmds_CXX='if   test DEF = "`$SED -n     -e '\''s/^[	 ]*//'\''     -e '\''/^\(;.*\)*$/d'\''     -e '\''s/^\(EXPORTS\|LIBRARY\)\([	 ].*\)*$/DEF/p'\''     -e q     $export_symbols`" ; then
-              cp $export_symbols $output_objdir/$soname.def;
-            else
-              echo EXPORTS > $output_objdir/$soname.def;
-              cat $export_symbols >> $output_objdir/$soname.def;
-            fi~
-            $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-	  else
-	    ld_shlibs_CXX=no
-	  fi
-	  ;;
-	esac
-	;;
-      darwin* | rhapsody*)
-
-
-  archive_cmds_need_lc_CXX=no
-  hardcode_direct_CXX=no
-  hardcode_automatic_CXX=yes
-  hardcode_shlibpath_var_CXX=unsupported
-  if test yes = "$lt_cv_ld_force_load"; then
-    whole_archive_flag_spec_CXX='`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience $wl-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`'
-
-  else
-    whole_archive_flag_spec_CXX=''
-  fi
-  link_all_deplibs_CXX=yes
-  allow_undefined_flag_CXX=$_lt_dar_allow_undefined
-  case $cc_basename in
-     ifort*|nagfor*) _lt_dar_can_shared=yes ;;
-     *) _lt_dar_can_shared=$GCC ;;
-  esac
-  if test yes = "$_lt_dar_can_shared"; then
-    output_verbose_link_cmd=func_echo_all
-    archive_cmds_CXX="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dsymutil"
-    module_cmds_CXX="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dsymutil"
-    archive_expsym_cmds_CXX="sed 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dar_export_syms$_lt_dsymutil"
-    module_expsym_cmds_CXX="sed -e 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dar_export_syms$_lt_dsymutil"
-       if test yes != "$lt_cv_apple_cc_single_mod"; then
-      archive_cmds_CXX="\$CC -r -keep_private_externs -nostdlib -o \$lib-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$lib-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring$_lt_dsymutil"
-      archive_expsym_cmds_CXX="sed 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \$lib-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$lib-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring$_lt_dar_export_syms$_lt_dsymutil"
-    fi
-
-  else
-  ld_shlibs_CXX=no
-  fi
-
-	;;
-
-      os2*)
-	hardcode_libdir_flag_spec_CXX='-L$libdir'
-	hardcode_minus_L_CXX=yes
-	allow_undefined_flag_CXX=unsupported
-	shrext_cmds=.dll
-	archive_cmds_CXX='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
-	  $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
-	  $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
-	  $ECHO EXPORTS >> $output_objdir/$libname.def~
-	  emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~
-	  $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
-	  emximp -o $lib $output_objdir/$libname.def'
-	archive_expsym_cmds_CXX='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
-	  $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
-	  $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
-	  $ECHO EXPORTS >> $output_objdir/$libname.def~
-	  prefix_cmds="$SED"~
-	  if test EXPORTS = "`$SED 1q $export_symbols`"; then
-	    prefix_cmds="$prefix_cmds -e 1d";
-	  fi~
-	  prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~
-	  cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~
-	  $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
-	  emximp -o $lib $output_objdir/$libname.def'
-	old_archive_From_new_cmds_CXX='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
-	enable_shared_with_static_runtimes_CXX=yes
-	file_list_spec_CXX='@'
-	;;
-
-      dgux*)
-        case $cc_basename in
-          ec++*)
-	    # FIXME: insert proper C++ library support
-	    ld_shlibs_CXX=no
-	    ;;
-          ghcx*)
-	    # Green Hills C++ Compiler
-	    # FIXME: insert proper C++ library support
-	    ld_shlibs_CXX=no
-	    ;;
-          *)
-	    # FIXME: insert proper C++ library support
-	    ld_shlibs_CXX=no
-	    ;;
-        esac
-        ;;
-
-      freebsd2.*)
-        # C++ shared libraries reported to be fairly broken before
-	# switch to ELF
-        ld_shlibs_CXX=no
-        ;;
-
-      freebsd-elf*)
-        archive_cmds_need_lc_CXX=no
-        ;;
-
-      freebsd* | dragonfly*)
-        # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
-        # conventions
-        ld_shlibs_CXX=yes
-        ;;
-
-      haiku*)
-        archive_cmds_CXX='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
-        link_all_deplibs_CXX=yes
-        ;;
-
-      hpux9*)
-        hardcode_libdir_flag_spec_CXX='$wl+b $wl$libdir'
-        hardcode_libdir_separator_CXX=:
-        export_dynamic_flag_spec_CXX='$wl-E'
-        hardcode_direct_CXX=yes
-        hardcode_minus_L_CXX=yes # Not in the search PATH,
-				             # but as the default
-				             # location of the library.
-
-        case $cc_basename in
-          CC*)
-            # FIXME: insert proper C++ library support
-            ld_shlibs_CXX=no
-            ;;
-          aCC*)
-            archive_cmds_CXX='$RM $output_objdir/$soname~$CC -b $wl+b $wl$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib'
-            # Commands to make compiler produce verbose output that lists
-            # what "hidden" libraries, object files and flags are used when
-            # linking a shared library.
-            #
-            # There doesn't appear to be a way to prevent this compiler from
-            # explicitly linking system object files so we need to strip them
-            # from the output so that they don't get included in the library
-            # dependencies.
-            output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
-            ;;
-          *)
-            if test yes = "$GXX"; then
-              archive_cmds_CXX='$RM $output_objdir/$soname~$CC -shared -nostdlib $pic_flag $wl+b $wl$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib'
-            else
-              # FIXME: insert proper C++ library support
-              ld_shlibs_CXX=no
-            fi
-            ;;
-        esac
-        ;;
-
-      hpux10*|hpux11*)
-        if test no = "$with_gnu_ld"; then
-	  hardcode_libdir_flag_spec_CXX='$wl+b $wl$libdir'
-	  hardcode_libdir_separator_CXX=:
-
-          case $host_cpu in
-            hppa*64*|ia64*)
-              ;;
-            *)
-	      export_dynamic_flag_spec_CXX='$wl-E'
-              ;;
-          esac
-        fi
-        case $host_cpu in
-          hppa*64*|ia64*)
-            hardcode_direct_CXX=no
-            hardcode_shlibpath_var_CXX=no
-            ;;
-          *)
-            hardcode_direct_CXX=yes
-            hardcode_direct_absolute_CXX=yes
-            hardcode_minus_L_CXX=yes # Not in the search PATH,
-					         # but as the default
-					         # location of the library.
-            ;;
-        esac
-
-        case $cc_basename in
-          CC*)
-	    # FIXME: insert proper C++ library support
-	    ld_shlibs_CXX=no
-	    ;;
-          aCC*)
-	    case $host_cpu in
-	      hppa*64*)
-	        archive_cmds_CXX='$CC -b $wl+h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-	        ;;
-	      ia64*)
-	        archive_cmds_CXX='$CC -b $wl+h $wl$soname $wl+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-	        ;;
-	      *)
-	        archive_cmds_CXX='$CC -b $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-	        ;;
-	    esac
-	    # Commands to make compiler produce verbose output that lists
-	    # what "hidden" libraries, object files and flags are used when
-	    # linking a shared library.
-	    #
-	    # There doesn't appear to be a way to prevent this compiler from
-	    # explicitly linking system object files so we need to strip them
-	    # from the output so that they don't get included in the library
-	    # dependencies.
-	    output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
-	    ;;
-          *)
-	    if test yes = "$GXX"; then
-	      if test no = "$with_gnu_ld"; then
-	        case $host_cpu in
-	          hppa*64*)
-	            archive_cmds_CXX='$CC -shared -nostdlib -fPIC $wl+h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-	            ;;
-	          ia64*)
-	            archive_cmds_CXX='$CC -shared -nostdlib $pic_flag $wl+h $wl$soname $wl+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-	            ;;
-	          *)
-	            archive_cmds_CXX='$CC -shared -nostdlib $pic_flag $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-	            ;;
-	        esac
-	      fi
-	    else
-	      # FIXME: insert proper C++ library support
-	      ld_shlibs_CXX=no
-	    fi
-	    ;;
-        esac
-        ;;
-
-      interix[3-9]*)
-	hardcode_direct_CXX=no
-	hardcode_shlibpath_var_CXX=no
-	hardcode_libdir_flag_spec_CXX='$wl-rpath,$libdir'
-	export_dynamic_flag_spec_CXX='$wl-E'
-	# Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
-	# Instead, shared libraries are loaded at an image base (0x10000000 by
-	# default) and relocated if they conflict, which is a slow very memory
-	# consuming and fragmenting process.  To avoid this, we pick a random,
-	# 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
-	# time.  Moving up from 0x10000000 also allows more sbrk(2) space.
-	archive_cmds_CXX='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
-	archive_expsym_cmds_CXX='sed "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--retain-symbols-file,$output_objdir/$soname.expsym $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
-	;;
-      irix5* | irix6*)
-        case $cc_basename in
-          CC*)
-	    # SGI C++
-	    archive_cmds_CXX='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
-
-	    # Archives containing C++ object files must be created using
-	    # "CC -ar", where "CC" is the IRIX C++ compiler.  This is
-	    # necessary to make sure instantiated templates are included
-	    # in the archive.
-	    old_archive_cmds_CXX='$CC -ar -WR,-u -o $oldlib $oldobjs'
-	    ;;
-          *)
-	    if test yes = "$GXX"; then
-	      if test no = "$with_gnu_ld"; then
-	        archive_cmds_CXX='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib'
-	      else
-	        archive_cmds_CXX='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` -o $lib'
-	      fi
-	    fi
-	    link_all_deplibs_CXX=yes
-	    ;;
-        esac
-        hardcode_libdir_flag_spec_CXX='$wl-rpath $wl$libdir'
-        hardcode_libdir_separator_CXX=:
-        inherit_rpath_CXX=yes
-        ;;
-
-      linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
-        case $cc_basename in
-          KCC*)
-	    # Kuck and Associates, Inc. (KAI) C++ Compiler
-
-	    # KCC will only create a shared library if the output file
-	    # ends with ".so" (or ".sl" for HP-UX), so rename the library
-	    # to its proper name (with version) after linking.
-	    archive_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\$tempext\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
-	    archive_expsym_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\$tempext\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib $wl-retain-symbols-file,$export_symbols; mv \$templib $lib'
-	    # Commands to make compiler produce verbose output that lists
-	    # what "hidden" libraries, object files and flags are used when
-	    # linking a shared library.
-	    #
-	    # There doesn't appear to be a way to prevent this compiler from
-	    # explicitly linking system object files so we need to strip them
-	    # from the output so that they don't get included in the library
-	    # dependencies.
-	    output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
-
-	    hardcode_libdir_flag_spec_CXX='$wl-rpath,$libdir'
-	    export_dynamic_flag_spec_CXX='$wl--export-dynamic'
-
-	    # Archives containing C++ object files must be created using
-	    # "CC -Bstatic", where "CC" is the KAI C++ compiler.
-	    old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs'
-	    ;;
-	  icpc* | ecpc* )
-	    # Intel C++
-	    with_gnu_ld=yes
-	    # version 8.0 and above of icpc choke on multiply defined symbols
-	    # if we add $predep_objects and $postdep_objects, however 7.1 and
-	    # earlier do not add the objects themselves.
-	    case `$CC -V 2>&1` in
-	      *"Version 7."*)
-	        archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib'
-		archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
-		;;
-	      *)  # Version 8.0 or newer
-	        tmp_idyn=
-	        case $host_cpu in
-		  ia64*) tmp_idyn=' -i_dynamic';;
-		esac
-	        archive_cmds_CXX='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
-		archive_expsym_cmds_CXX='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
-		;;
-	    esac
-	    archive_cmds_need_lc_CXX=no
-	    hardcode_libdir_flag_spec_CXX='$wl-rpath,$libdir'
-	    export_dynamic_flag_spec_CXX='$wl--export-dynamic'
-	    whole_archive_flag_spec_CXX='$wl--whole-archive$convenience $wl--no-whole-archive'
-	    ;;
-          pgCC* | pgcpp*)
-            # Portland Group C++ compiler
-	    case `$CC -V` in
-	    *pgCC\ [1-5].* | *pgcpp\ [1-5].*)
-	      prelink_cmds_CXX='tpldir=Template.dir~
-               rm -rf $tpldir~
-               $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~
-               compile_command="$compile_command `find $tpldir -name \*.o | sort | $NL2SP`"'
-	      old_archive_cmds_CXX='tpldir=Template.dir~
-                rm -rf $tpldir~
-                $CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~
-                $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $NL2SP`~
-                $RANLIB $oldlib'
-	      archive_cmds_CXX='tpldir=Template.dir~
-                rm -rf $tpldir~
-                $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
-                $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib'
-	      archive_expsym_cmds_CXX='tpldir=Template.dir~
-                rm -rf $tpldir~
-                $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
-                $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
-	      ;;
-	    *) # Version 6 and above use weak symbols
-	      archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib'
-	      archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
-	      ;;
-	    esac
-
-	    hardcode_libdir_flag_spec_CXX='$wl--rpath $wl$libdir'
-	    export_dynamic_flag_spec_CXX='$wl--export-dynamic'
-	    whole_archive_flag_spec_CXX='$wl--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
-            ;;
-	  cxx*)
-	    # Compaq C++
-	    archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib'
-	    archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname  -o $lib $wl-retain-symbols-file $wl$export_symbols'
-
-	    runpath_var=LD_RUN_PATH
-	    hardcode_libdir_flag_spec_CXX='-rpath $libdir'
-	    hardcode_libdir_separator_CXX=:
-
-	    # Commands to make compiler produce verbose output that lists
-	    # what "hidden" libraries, object files and flags are used when
-	    # linking a shared library.
-	    #
-	    # There doesn't appear to be a way to prevent this compiler from
-	    # explicitly linking system object files so we need to strip them
-	    # from the output so that they don't get included in the library
-	    # dependencies.
-	    output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "X$list" | $Xsed'
-	    ;;
-	  xl* | mpixl* | bgxl*)
-	    # IBM XL 8.0 on PPC, with GNU ld
-	    hardcode_libdir_flag_spec_CXX='$wl-rpath $wl$libdir'
-	    export_dynamic_flag_spec_CXX='$wl--export-dynamic'
-	    archive_cmds_CXX='$CC -qmkshrobj $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
-	    if test yes = "$supports_anon_versioning"; then
-	      archive_expsym_cmds_CXX='echo "{ global:" > $output_objdir/$libname.ver~
-                cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
-                echo "local: *; };" >> $output_objdir/$libname.ver~
-                $CC -qmkshrobj $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$output_objdir/$libname.ver -o $lib'
-	    fi
-	    ;;
-	  *)
-	    case `$CC -V 2>&1 | sed 5q` in
-	    *Sun\ C*)
-	      # Sun C++ 5.9
-	      no_undefined_flag_CXX=' -zdefs'
-	      archive_cmds_CXX='$CC -G$allow_undefined_flag -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-	      archive_expsym_cmds_CXX='$CC -G$allow_undefined_flag -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-retain-symbols-file $wl$export_symbols'
-	      hardcode_libdir_flag_spec_CXX='-R$libdir'
-	      whole_archive_flag_spec_CXX='$wl--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
-	      compiler_needs_object_CXX=yes
-
-	      # Not sure whether something based on
-	      # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1
-	      # would be better.
-	      output_verbose_link_cmd='func_echo_all'
-
-	      # Archives containing C++ object files must be created using
-	      # "CC -xar", where "CC" is the Sun C++ compiler.  This is
-	      # necessary to make sure instantiated templates are included
-	      # in the archive.
-	      old_archive_cmds_CXX='$CC -xar -o $oldlib $oldobjs'
-	      ;;
-	    esac
-	    ;;
-	esac
-	;;
-
-      lynxos*)
-        # FIXME: insert proper C++ library support
-	ld_shlibs_CXX=no
-	;;
-
-      m88k*)
-        # FIXME: insert proper C++ library support
-        ld_shlibs_CXX=no
-	;;
-
-      mvs*)
-        case $cc_basename in
-          cxx*)
-	    # FIXME: insert proper C++ library support
-	    ld_shlibs_CXX=no
-	    ;;
-	  *)
-	    # FIXME: insert proper C++ library support
-	    ld_shlibs_CXX=no
-	    ;;
-	esac
-	;;
-
-      netbsd*)
-        if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
-	  archive_cmds_CXX='$LD -Bshareable  -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
-	  wlarc=
-	  hardcode_libdir_flag_spec_CXX='-R$libdir'
-	  hardcode_direct_CXX=yes
-	  hardcode_shlibpath_var_CXX=no
-	fi
-	# Workaround some broken pre-1.5 toolchains
-	output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"'
-	;;
-
-      *nto* | *qnx*)
-        ld_shlibs_CXX=yes
-	;;
-
-      openbsd* | bitrig*)
-	if test -f /usr/libexec/ld.so; then
-	  hardcode_direct_CXX=yes
-	  hardcode_shlibpath_var_CXX=no
-	  hardcode_direct_absolute_CXX=yes
-	  archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
-	  hardcode_libdir_flag_spec_CXX='$wl-rpath,$libdir'
-	  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`"; then
-	    archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-retain-symbols-file,$export_symbols -o $lib'
-	    export_dynamic_flag_spec_CXX='$wl-E'
-	    whole_archive_flag_spec_CXX=$wlarc'--whole-archive$convenience '$wlarc'--no-whole-archive'
-	  fi
-	  output_verbose_link_cmd=func_echo_all
-	else
-	  ld_shlibs_CXX=no
-	fi
-	;;
-
-      osf3* | osf4* | osf5*)
-        case $cc_basename in
-          KCC*)
-	    # Kuck and Associates, Inc. (KAI) C++ Compiler
-
-	    # KCC will only create a shared library if the output file
-	    # ends with ".so" (or ".sl" for HP-UX), so rename the library
-	    # to its proper name (with version) after linking.
-	    archive_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo "$lib" | $SED -e "s/\$tempext\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
-
-	    hardcode_libdir_flag_spec_CXX='$wl-rpath,$libdir'
-	    hardcode_libdir_separator_CXX=:
-
-	    # Archives containing C++ object files must be created using
-	    # the KAI C++ compiler.
-	    case $host in
-	      osf3*) old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs' ;;
-	      *) old_archive_cmds_CXX='$CC -o $oldlib $oldobjs' ;;
-	    esac
-	    ;;
-          RCC*)
-	    # Rational C++ 2.4.1
-	    # FIXME: insert proper C++ library support
-	    ld_shlibs_CXX=no
-	    ;;
-          cxx*)
-	    case $host in
-	      osf3*)
-	        allow_undefined_flag_CXX=' $wl-expect_unresolved $wl\*'
-	        archive_cmds_CXX='$CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $soname `test -n "$verstring" && func_echo_all "$wl-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
-	        hardcode_libdir_flag_spec_CXX='$wl-rpath $wl$libdir'
-		;;
-	      *)
-	        allow_undefined_flag_CXX=' -expect_unresolved \*'
-	        archive_cmds_CXX='$CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
-	        archive_expsym_cmds_CXX='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~
-                  echo "-hidden">> $lib.exp~
-                  $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname $wl-input $wl$lib.exp  `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib~
-                  $RM $lib.exp'
-	        hardcode_libdir_flag_spec_CXX='-rpath $libdir'
-		;;
-	    esac
-
-	    hardcode_libdir_separator_CXX=:
-
-	    # Commands to make compiler produce verbose output that lists
-	    # what "hidden" libraries, object files and flags are used when
-	    # linking a shared library.
-	    #
-	    # There doesn't appear to be a way to prevent this compiler from
-	    # explicitly linking system object files so we need to strip them
-	    # from the output so that they don't get included in the library
-	    # dependencies.
-	    output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
-	    ;;
-	  *)
-	    if test yes,no = "$GXX,$with_gnu_ld"; then
-	      allow_undefined_flag_CXX=' $wl-expect_unresolved $wl\*'
-	      case $host in
-	        osf3*)
-	          archive_cmds_CXX='$CC -shared -nostdlib $allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib'
-		  ;;
-	        *)
-	          archive_cmds_CXX='$CC -shared $pic_flag -nostdlib $allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-msym $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib'
-		  ;;
-	      esac
-
-	      hardcode_libdir_flag_spec_CXX='$wl-rpath $wl$libdir'
-	      hardcode_libdir_separator_CXX=:
-
-	      # Commands to make compiler produce verbose output that lists
-	      # what "hidden" libraries, object files and flags are used when
-	      # linking a shared library.
-	      output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
-
-	    else
-	      # FIXME: insert proper C++ library support
-	      ld_shlibs_CXX=no
-	    fi
-	    ;;
-        esac
-        ;;
-
-      psos*)
-        # FIXME: insert proper C++ library support
-        ld_shlibs_CXX=no
-        ;;
-
-      sunos4*)
-        case $cc_basename in
-          CC*)
-	    # Sun C++ 4.x
-	    # FIXME: insert proper C++ library support
-	    ld_shlibs_CXX=no
-	    ;;
-          lcc*)
-	    # Lucid
-	    # FIXME: insert proper C++ library support
-	    ld_shlibs_CXX=no
-	    ;;
-          *)
-	    # FIXME: insert proper C++ library support
-	    ld_shlibs_CXX=no
-	    ;;
-        esac
-        ;;
-
-      solaris*)
-        case $cc_basename in
-          CC* | sunCC*)
-	    # Sun C++ 4.2, 5.x and Centerline C++
-            archive_cmds_need_lc_CXX=yes
-	    no_undefined_flag_CXX=' -zdefs'
-	    archive_cmds_CXX='$CC -G$allow_undefined_flag -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-	    archive_expsym_cmds_CXX='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-              $CC -G$allow_undefined_flag $wl-M $wl$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
-
-	    hardcode_libdir_flag_spec_CXX='-R$libdir'
-	    hardcode_shlibpath_var_CXX=no
-	    case $host_os in
-	      solaris2.[0-5] | solaris2.[0-5].*) ;;
-	      *)
-		# The compiler driver will combine and reorder linker options,
-		# but understands '-z linker_flag'.
-	        # Supported since Solaris 2.6 (maybe 2.5.1?)
-		whole_archive_flag_spec_CXX='-z allextract$convenience -z defaultextract'
-	        ;;
-	    esac
-	    link_all_deplibs_CXX=yes
-
-	    output_verbose_link_cmd='func_echo_all'
-
-	    # Archives containing C++ object files must be created using
-	    # "CC -xar", where "CC" is the Sun C++ compiler.  This is
-	    # necessary to make sure instantiated templates are included
-	    # in the archive.
-	    old_archive_cmds_CXX='$CC -xar -o $oldlib $oldobjs'
-	    ;;
-          gcx*)
-	    # Green Hills C++ Compiler
-	    archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-h $wl$soname -o $lib'
-
-	    # The C++ compiler must be used to create the archive.
-	    old_archive_cmds_CXX='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
-	    ;;
-          *)
-	    # GNU C++ compiler with Solaris linker
-	    if test yes,no = "$GXX,$with_gnu_ld"; then
-	      no_undefined_flag_CXX=' $wl-z ${wl}defs'
-	      if $CC --version | $GREP -v '^2\.7' > /dev/null; then
-	        archive_cmds_CXX='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-h $wl$soname -o $lib'
-	        archive_expsym_cmds_CXX='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-                  $CC -shared $pic_flag -nostdlib $wl-M $wl$lib.exp $wl-h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
-
-	        # Commands to make compiler produce verbose output that lists
-	        # what "hidden" libraries, object files and flags are used when
-	        # linking a shared library.
-	        output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
-	      else
-	        # g++ 2.7 appears to require '-G' NOT '-shared' on this
-	        # platform.
-	        archive_cmds_CXX='$CC -G -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-h $wl$soname -o $lib'
-	        archive_expsym_cmds_CXX='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-                  $CC -G -nostdlib $wl-M $wl$lib.exp $wl-h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
-
-	        # Commands to make compiler produce verbose output that lists
-	        # what "hidden" libraries, object files and flags are used when
-	        # linking a shared library.
-	        output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
-	      fi
-
-	      hardcode_libdir_flag_spec_CXX='$wl-R $wl$libdir'
-	      case $host_os in
-		solaris2.[0-5] | solaris2.[0-5].*) ;;
-		*)
-		  whole_archive_flag_spec_CXX='$wl-z ${wl}allextract$convenience $wl-z ${wl}defaultextract'
-		  ;;
-	      esac
-	    fi
-	    ;;
-        esac
-        ;;
-
-    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*)
-      no_undefined_flag_CXX='$wl-z,text'
-      archive_cmds_need_lc_CXX=no
-      hardcode_shlibpath_var_CXX=no
-      runpath_var='LD_RUN_PATH'
-
-      case $cc_basename in
-        CC*)
-	  archive_cmds_CXX='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	  archive_expsym_cmds_CXX='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	*)
-	  archive_cmds_CXX='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	  archive_expsym_cmds_CXX='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-      esac
-      ;;
-
-      sysv5* | sco3.2v5* | sco5v6*)
-	# Note: We CANNOT use -z defs as we might desire, because we do not
-	# link with -lc, and that would cause any symbols used from libc to
-	# always be unresolved, which means just about no library would
-	# ever link correctly.  If we're not using GNU ld we use -z text
-	# though, which does catch some bad symbols but isn't as heavy-handed
-	# as -z defs.
-	no_undefined_flag_CXX='$wl-z,text'
-	allow_undefined_flag_CXX='$wl-z,nodefs'
-	archive_cmds_need_lc_CXX=no
-	hardcode_shlibpath_var_CXX=no
-	hardcode_libdir_flag_spec_CXX='$wl-R,$libdir'
-	hardcode_libdir_separator_CXX=':'
-	link_all_deplibs_CXX=yes
-	export_dynamic_flag_spec_CXX='$wl-Bexport'
-	runpath_var='LD_RUN_PATH'
-
-	case $cc_basename in
-          CC*)
-	    archive_cmds_CXX='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	    archive_expsym_cmds_CXX='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	    old_archive_cmds_CXX='$CC -Tprelink_objects $oldobjs~
-              '"$old_archive_cmds_CXX"
-	    reload_cmds_CXX='$CC -Tprelink_objects $reload_objs~
-              '"$reload_cmds_CXX"
-	    ;;
-	  *)
-	    archive_cmds_CXX='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	    archive_expsym_cmds_CXX='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	    ;;
-	esac
-      ;;
-
-      tandem*)
-        case $cc_basename in
-          NCC*)
-	    # NonStop-UX NCC 3.20
-	    # FIXME: insert proper C++ library support
-	    ld_shlibs_CXX=no
-	    ;;
-          *)
-	    # FIXME: insert proper C++ library support
-	    ld_shlibs_CXX=no
-	    ;;
-        esac
-        ;;
-
-      vxworks*)
-        # FIXME: insert proper C++ library support
-        ld_shlibs_CXX=no
-        ;;
-
-      *)
-        # FIXME: insert proper C++ library support
-        ld_shlibs_CXX=no
-        ;;
-    esac
-
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs_CXX" >&5
-$as_echo "$ld_shlibs_CXX" >&6; }
-    test no = "$ld_shlibs_CXX" && can_build_shared=no
-
-    GCC_CXX=$GXX
-    LD_CXX=$LD
-
-    ## CAVEAT EMPTOR:
-    ## There is no encapsulation within the following macros, do not change
-    ## the running order or otherwise move them around unless you know exactly
-    ## what you are doing...
-    # Dependencies to place before and after the object being linked:
-predep_objects_CXX=
-postdep_objects_CXX=
-predeps_CXX=
-postdeps_CXX=
-compiler_lib_search_path_CXX=
-
-cat > conftest.$ac_ext <<_LT_EOF
-class Foo
-{
-public:
-  Foo (void) { a = 0; }
-private:
-  int a;
-};
-_LT_EOF
-
-
-_lt_libdeps_save_CFLAGS=$CFLAGS
-case "$CC $CFLAGS " in #(
-*\ -flto*\ *) CFLAGS="$CFLAGS -fno-lto" ;;
-*\ -fwhopr*\ *) CFLAGS="$CFLAGS -fno-whopr" ;;
-*\ -fuse-linker-plugin*\ *) CFLAGS="$CFLAGS -fno-use-linker-plugin" ;;
-esac
-
-if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-  # Parse the compiler output and extract the necessary
-  # objects, libraries and library flags.
-
-  # Sentinel used to keep track of whether or not we are before
-  # the conftest object file.
-  pre_test_object_deps_done=no
-
-  for p in `eval "$output_verbose_link_cmd"`; do
-    case $prev$p in
-
-    -L* | -R* | -l*)
-       # Some compilers place space between "-{L,R}" and the path.
-       # Remove the space.
-       if test x-L = "$p" ||
-          test x-R = "$p"; then
-	 prev=$p
-	 continue
-       fi
-
-       # Expand the sysroot to ease extracting the directories later.
-       if test -z "$prev"; then
-         case $p in
-         -L*) func_stripname_cnf '-L' '' "$p"; prev=-L; p=$func_stripname_result ;;
-         -R*) func_stripname_cnf '-R' '' "$p"; prev=-R; p=$func_stripname_result ;;
-         -l*) func_stripname_cnf '-l' '' "$p"; prev=-l; p=$func_stripname_result ;;
-         esac
-       fi
-       case $p in
-       =*) func_stripname_cnf '=' '' "$p"; p=$lt_sysroot$func_stripname_result ;;
-       esac
-       if test no = "$pre_test_object_deps_done"; then
-	 case $prev in
-	 -L | -R)
-	   # Internal compiler library paths should come after those
-	   # provided the user.  The postdeps already come after the
-	   # user supplied libs so there is no need to process them.
-	   if test -z "$compiler_lib_search_path_CXX"; then
-	     compiler_lib_search_path_CXX=$prev$p
-	   else
-	     compiler_lib_search_path_CXX="${compiler_lib_search_path_CXX} $prev$p"
-	   fi
-	   ;;
-	 # The "-l" case would never come before the object being
-	 # linked, so don't bother handling this case.
-	 esac
-       else
-	 if test -z "$postdeps_CXX"; then
-	   postdeps_CXX=$prev$p
-	 else
-	   postdeps_CXX="${postdeps_CXX} $prev$p"
-	 fi
-       fi
-       prev=
-       ;;
-
-    *.lto.$objext) ;; # Ignore GCC LTO objects
-    *.$objext)
-       # This assumes that the test object file only shows up
-       # once in the compiler output.
-       if test "$p" = "conftest.$objext"; then
-	 pre_test_object_deps_done=yes
-	 continue
-       fi
-
-       if test no = "$pre_test_object_deps_done"; then
-	 if test -z "$predep_objects_CXX"; then
-	   predep_objects_CXX=$p
-	 else
-	   predep_objects_CXX="$predep_objects_CXX $p"
-	 fi
-       else
-	 if test -z "$postdep_objects_CXX"; then
-	   postdep_objects_CXX=$p
-	 else
-	   postdep_objects_CXX="$postdep_objects_CXX $p"
-	 fi
-       fi
-       ;;
-
-    *) ;; # Ignore the rest.
-
-    esac
-  done
-
-  # Clean up.
-  rm -f a.out a.exe
-else
-  echo "libtool.m4: error: problem compiling CXX test program"
-fi
-
-$RM -f confest.$objext
-CFLAGS=$_lt_libdeps_save_CFLAGS
-
-# PORTME: override above test on systems where it is broken
-case $host_os in
-interix[3-9]*)
-  # Interix 3.5 installs completely hosed .la files for C++, so rather than
-  # hack all around it, let's just trust "g++" to DTRT.
-  predep_objects_CXX=
-  postdep_objects_CXX=
-  postdeps_CXX=
-  ;;
-esac
-
-
-case " $postdeps_CXX " in
-*" -lc "*) archive_cmds_need_lc_CXX=no ;;
-esac
- compiler_lib_search_dirs_CXX=
-if test -n "${compiler_lib_search_path_CXX}"; then
- compiler_lib_search_dirs_CXX=`echo " ${compiler_lib_search_path_CXX}" | $SED -e 's! -L! !g' -e 's!^ !!'`
-fi
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-    lt_prog_compiler_wl_CXX=
-lt_prog_compiler_pic_CXX=
-lt_prog_compiler_static_CXX=
-
-
-  # C++ specific cases for pic, static, wl, etc.
-  if test yes = "$GXX"; then
-    lt_prog_compiler_wl_CXX='-Wl,'
-    lt_prog_compiler_static_CXX='-static'
-
-    case $host_os in
-    aix*)
-      # All AIX code is PIC.
-      if test ia64 = "$host_cpu"; then
-	# AIX 5 now supports IA64 processor
-	lt_prog_compiler_static_CXX='-Bstatic'
-      fi
-      lt_prog_compiler_pic_CXX='-fPIC'
-      ;;
-
-    amigaos*)
-      case $host_cpu in
-      powerpc)
-            # see comment about AmigaOS4 .so support
-            lt_prog_compiler_pic_CXX='-fPIC'
-        ;;
-      m68k)
-            # FIXME: we need at least 68020 code to build shared libraries, but
-            # adding the '-m68020' flag to GCC prevents building anything better,
-            # like '-m68040'.
-            lt_prog_compiler_pic_CXX='-m68020 -resident32 -malways-restore-a4'
-        ;;
-      esac
-      ;;
-
-    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
-      # PIC is the default for these OSes.
-      ;;
-    mingw* | cygwin* | os2* | pw32* | cegcc*)
-      # This hack is so that the source file can tell whether it is being
-      # built for inclusion in a dll (and should export symbols for example).
-      # Although the cygwin gcc ignores -fPIC, still need this for old-style
-      # (--disable-auto-import) libraries
-      lt_prog_compiler_pic_CXX='-DDLL_EXPORT'
-      case $host_os in
-      os2*)
-	lt_prog_compiler_static_CXX='$wl-static'
-	;;
-      esac
-      ;;
-    darwin* | rhapsody*)
-      # PIC is the default on this platform
-      # Common symbols not allowed in MH_DYLIB files
-      lt_prog_compiler_pic_CXX='-fno-common'
-      ;;
-    *djgpp*)
-      # DJGPP does not support shared libraries at all
-      lt_prog_compiler_pic_CXX=
-      ;;
-    haiku*)
-      # PIC is the default for Haiku.
-      # The "-static" flag exists, but is broken.
-      lt_prog_compiler_static_CXX=
-      ;;
-    interix[3-9]*)
-      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
-      # Instead, we relocate shared libraries at runtime.
-      ;;
-    sysv4*MP*)
-      if test -d /usr/nec; then
-	lt_prog_compiler_pic_CXX=-Kconform_pic
-      fi
-      ;;
-    hpux*)
-      # PIC is the default for 64-bit PA HP-UX, but not for 32-bit
-      # PA HP-UX.  On IA64 HP-UX, PIC is the default but the pic flag
-      # sets the default TLS model and affects inlining.
-      case $host_cpu in
-      hppa*64*)
-	;;
-      *)
-	lt_prog_compiler_pic_CXX='-fPIC'
-	;;
-      esac
-      ;;
-    *qnx* | *nto*)
-      # QNX uses GNU C++, but need to define -shared option too, otherwise
-      # it will coredump.
-      lt_prog_compiler_pic_CXX='-fPIC -shared'
-      ;;
-    *)
-      lt_prog_compiler_pic_CXX='-fPIC'
-      ;;
-    esac
-  else
-    case $host_os in
-      aix[4-9]*)
-	# All AIX code is PIC.
-	if test ia64 = "$host_cpu"; then
-	  # AIX 5 now supports IA64 processor
-	  lt_prog_compiler_static_CXX='-Bstatic'
-	else
-	  lt_prog_compiler_static_CXX='-bnso -bI:/lib/syscalls.exp'
-	fi
-	;;
-      chorus*)
-	case $cc_basename in
-	cxch68*)
-	  # Green Hills C++ Compiler
-	  # _LT_TAGVAR(lt_prog_compiler_static, CXX)="--no_auto_instantiation -u __main -u __premain -u _abort -r $COOL_DIR/lib/libOrb.a $MVME_DIR/lib/CC/libC.a $MVME_DIR/lib/classix/libcx.s.a"
-	  ;;
-	esac
-	;;
-      mingw* | cygwin* | os2* | pw32* | cegcc*)
-	# This hack is so that the source file can tell whether it is being
-	# built for inclusion in a dll (and should export symbols for example).
-	lt_prog_compiler_pic_CXX='-DDLL_EXPORT'
-	;;
-      dgux*)
-	case $cc_basename in
-	  ec++*)
-	    lt_prog_compiler_pic_CXX='-KPIC'
-	    ;;
-	  ghcx*)
-	    # Green Hills C++ Compiler
-	    lt_prog_compiler_pic_CXX='-pic'
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      freebsd* | dragonfly*)
-	# FreeBSD uses GNU C++
-	;;
-      hpux9* | hpux10* | hpux11*)
-	case $cc_basename in
-	  CC*)
-	    lt_prog_compiler_wl_CXX='-Wl,'
-	    lt_prog_compiler_static_CXX='$wl-a ${wl}archive'
-	    if test ia64 != "$host_cpu"; then
-	      lt_prog_compiler_pic_CXX='+Z'
-	    fi
-	    ;;
-	  aCC*)
-	    lt_prog_compiler_wl_CXX='-Wl,'
-	    lt_prog_compiler_static_CXX='$wl-a ${wl}archive'
-	    case $host_cpu in
-	    hppa*64*|ia64*)
-	      # +Z the default
-	      ;;
-	    *)
-	      lt_prog_compiler_pic_CXX='+Z'
-	      ;;
-	    esac
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      interix*)
-	# This is c89, which is MS Visual C++ (no shared libs)
-	# Anyone wants to do a port?
-	;;
-      irix5* | irix6* | nonstopux*)
-	case $cc_basename in
-	  CC*)
-	    lt_prog_compiler_wl_CXX='-Wl,'
-	    lt_prog_compiler_static_CXX='-non_shared'
-	    # CC pic flag -KPIC is the default.
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
-	case $cc_basename in
-	  KCC*)
-	    # KAI C++ Compiler
-	    lt_prog_compiler_wl_CXX='--backend -Wl,'
-	    lt_prog_compiler_pic_CXX='-fPIC'
-	    ;;
-	  ecpc* )
-	    # old Intel C++ for x86_64, which still supported -KPIC.
-	    lt_prog_compiler_wl_CXX='-Wl,'
-	    lt_prog_compiler_pic_CXX='-KPIC'
-	    lt_prog_compiler_static_CXX='-static'
-	    ;;
-	  icpc* )
-	    # Intel C++, used to be incompatible with GCC.
-	    # ICC 10 doesn't accept -KPIC any more.
-	    lt_prog_compiler_wl_CXX='-Wl,'
-	    lt_prog_compiler_pic_CXX='-fPIC'
-	    lt_prog_compiler_static_CXX='-static'
-	    ;;
-	  pgCC* | pgcpp*)
-	    # Portland Group C++ compiler
-	    lt_prog_compiler_wl_CXX='-Wl,'
-	    lt_prog_compiler_pic_CXX='-fpic'
-	    lt_prog_compiler_static_CXX='-Bstatic'
-	    ;;
-	  cxx*)
-	    # Compaq C++
-	    # Make sure the PIC flag is empty.  It appears that all Alpha
-	    # Linux and Compaq Tru64 Unix objects are PIC.
-	    lt_prog_compiler_pic_CXX=
-	    lt_prog_compiler_static_CXX='-non_shared'
-	    ;;
-	  xlc* | xlC* | bgxl[cC]* | mpixl[cC]*)
-	    # IBM XL 8.0, 9.0 on PPC and BlueGene
-	    lt_prog_compiler_wl_CXX='-Wl,'
-	    lt_prog_compiler_pic_CXX='-qpic'
-	    lt_prog_compiler_static_CXX='-qstaticlink'
-	    ;;
-	  *)
-	    case `$CC -V 2>&1 | sed 5q` in
-	    *Sun\ C*)
-	      # Sun C++ 5.9
-	      lt_prog_compiler_pic_CXX='-KPIC'
-	      lt_prog_compiler_static_CXX='-Bstatic'
-	      lt_prog_compiler_wl_CXX='-Qoption ld '
-	      ;;
-	    esac
-	    ;;
-	esac
-	;;
-      lynxos*)
-	;;
-      m88k*)
-	;;
-      mvs*)
-	case $cc_basename in
-	  cxx*)
-	    lt_prog_compiler_pic_CXX='-W c,exportall'
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      netbsd*)
-	;;
-      *qnx* | *nto*)
-        # QNX uses GNU C++, but need to define -shared option too, otherwise
-        # it will coredump.
-        lt_prog_compiler_pic_CXX='-fPIC -shared'
-        ;;
-      osf3* | osf4* | osf5*)
-	case $cc_basename in
-	  KCC*)
-	    lt_prog_compiler_wl_CXX='--backend -Wl,'
-	    ;;
-	  RCC*)
-	    # Rational C++ 2.4.1
-	    lt_prog_compiler_pic_CXX='-pic'
-	    ;;
-	  cxx*)
-	    # Digital/Compaq C++
-	    lt_prog_compiler_wl_CXX='-Wl,'
-	    # Make sure the PIC flag is empty.  It appears that all Alpha
-	    # Linux and Compaq Tru64 Unix objects are PIC.
-	    lt_prog_compiler_pic_CXX=
-	    lt_prog_compiler_static_CXX='-non_shared'
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      psos*)
-	;;
-      solaris*)
-	case $cc_basename in
-	  CC* | sunCC*)
-	    # Sun C++ 4.2, 5.x and Centerline C++
-	    lt_prog_compiler_pic_CXX='-KPIC'
-	    lt_prog_compiler_static_CXX='-Bstatic'
-	    lt_prog_compiler_wl_CXX='-Qoption ld '
-	    ;;
-	  gcx*)
-	    # Green Hills C++ Compiler
-	    lt_prog_compiler_pic_CXX='-PIC'
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      sunos4*)
-	case $cc_basename in
-	  CC*)
-	    # Sun C++ 4.x
-	    lt_prog_compiler_pic_CXX='-pic'
-	    lt_prog_compiler_static_CXX='-Bstatic'
-	    ;;
-	  lcc*)
-	    # Lucid
-	    lt_prog_compiler_pic_CXX='-pic'
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
-	case $cc_basename in
-	  CC*)
-	    lt_prog_compiler_wl_CXX='-Wl,'
-	    lt_prog_compiler_pic_CXX='-KPIC'
-	    lt_prog_compiler_static_CXX='-Bstatic'
-	    ;;
-	esac
-	;;
-      tandem*)
-	case $cc_basename in
-	  NCC*)
-	    # NonStop-UX NCC 3.20
-	    lt_prog_compiler_pic_CXX='-KPIC'
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      vxworks*)
-	;;
-      *)
-	lt_prog_compiler_can_build_shared_CXX=no
-	;;
-    esac
-  fi
-
-case $host_os in
-  # For platforms that do not support PIC, -DPIC is meaningless:
-  *djgpp*)
-    lt_prog_compiler_pic_CXX=
-    ;;
-  *)
-    lt_prog_compiler_pic_CXX="$lt_prog_compiler_pic_CXX -DPIC"
-    ;;
-esac
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
-$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
-if ${lt_cv_prog_compiler_pic_CXX+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_prog_compiler_pic_CXX=$lt_prog_compiler_pic_CXX
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_CXX" >&5
-$as_echo "$lt_cv_prog_compiler_pic_CXX" >&6; }
-lt_prog_compiler_pic_CXX=$lt_cv_prog_compiler_pic_CXX
-
-#
-# Check to make sure the PIC flag actually works.
-#
-if test -n "$lt_prog_compiler_pic_CXX"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5
-$as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works... " >&6; }
-if ${lt_cv_prog_compiler_pic_works_CXX+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_prog_compiler_pic_works_CXX=no
-   ac_outfile=conftest.$ac_objext
-   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-   lt_compiler_flag="$lt_prog_compiler_pic_CXX -DPIC"  ## exclude from sc_useless_quotes_in_assignment
-   # Insert the option either (1) after the last *FLAGS variable, or
-   # (2) before a word containing "conftest.", or (3) at the end.
-   # Note that $ac_compile itself does not contain backslashes and begins
-   # with a dollar sign (not a hyphen), so the echo should work correctly.
-   # The option is referenced via a variable to avoid confusing sed.
-   lt_compile=`echo "$ac_compile" | $SED \
-   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-   -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
-   (eval "$lt_compile" 2>conftest.err)
-   ac_status=$?
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   if (exit $ac_status) && test -s "$ac_outfile"; then
-     # The compiler can only warn and ignore the option if not recognized
-     # So say no if there are warnings other than the usual output.
-     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp
-     $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
-     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
-       lt_cv_prog_compiler_pic_works_CXX=yes
-     fi
-   fi
-   $RM conftest*
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works_CXX" >&5
-$as_echo "$lt_cv_prog_compiler_pic_works_CXX" >&6; }
-
-if test yes = "$lt_cv_prog_compiler_pic_works_CXX"; then
-    case $lt_prog_compiler_pic_CXX in
-     "" | " "*) ;;
-     *) lt_prog_compiler_pic_CXX=" $lt_prog_compiler_pic_CXX" ;;
-     esac
-else
-    lt_prog_compiler_pic_CXX=
-     lt_prog_compiler_can_build_shared_CXX=no
-fi
-
-fi
-
-
-
-
-
-#
-# Check to make sure the static flag actually works.
-#
-wl=$lt_prog_compiler_wl_CXX eval lt_tmp_static_flag=\"$lt_prog_compiler_static_CXX\"
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" >&5
-$as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; }
-if ${lt_cv_prog_compiler_static_works_CXX+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_prog_compiler_static_works_CXX=no
-   save_LDFLAGS=$LDFLAGS
-   LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
-   echo "$lt_simple_link_test_code" > conftest.$ac_ext
-   if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
-     # The linker can only warn and ignore the option if not recognized
-     # So say no if there are warnings
-     if test -s conftest.err; then
-       # Append any errors to the config.log.
-       cat conftest.err 1>&5
-       $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp
-       $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
-       if diff conftest.exp conftest.er2 >/dev/null; then
-         lt_cv_prog_compiler_static_works_CXX=yes
-       fi
-     else
-       lt_cv_prog_compiler_static_works_CXX=yes
-     fi
-   fi
-   $RM -r conftest*
-   LDFLAGS=$save_LDFLAGS
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works_CXX" >&5
-$as_echo "$lt_cv_prog_compiler_static_works_CXX" >&6; }
-
-if test yes = "$lt_cv_prog_compiler_static_works_CXX"; then
-    :
-else
-    lt_prog_compiler_static_CXX=
-fi
-
-
-
-
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
-$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
-if ${lt_cv_prog_compiler_c_o_CXX+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_prog_compiler_c_o_CXX=no
-   $RM -r conftest 2>/dev/null
-   mkdir conftest
-   cd conftest
-   mkdir out
-   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-
-   lt_compiler_flag="-o out/conftest2.$ac_objext"
-   # Insert the option either (1) after the last *FLAGS variable, or
-   # (2) before a word containing "conftest.", or (3) at the end.
-   # Note that $ac_compile itself does not contain backslashes and begins
-   # with a dollar sign (not a hyphen), so the echo should work correctly.
-   lt_compile=`echo "$ac_compile" | $SED \
-   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-   -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
-   (eval "$lt_compile" 2>out/conftest.err)
-   ac_status=$?
-   cat out/conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   if (exit $ac_status) && test -s out/conftest2.$ac_objext
-   then
-     # The compiler can only warn and ignore the option if not recognized
-     # So say no if there are warnings
-     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp
-     $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
-     if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
-       lt_cv_prog_compiler_c_o_CXX=yes
-     fi
-   fi
-   chmod u+w . 2>&5
-   $RM conftest*
-   # SGI C++ compiler will create directory out/ii_files/ for
-   # template instantiation
-   test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files
-   $RM out/* && rmdir out
-   cd ..
-   $RM -r conftest
-   $RM conftest*
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o_CXX" >&5
-$as_echo "$lt_cv_prog_compiler_c_o_CXX" >&6; }
-
-
-
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
-$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
-if ${lt_cv_prog_compiler_c_o_CXX+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_prog_compiler_c_o_CXX=no
-   $RM -r conftest 2>/dev/null
-   mkdir conftest
-   cd conftest
-   mkdir out
-   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-
-   lt_compiler_flag="-o out/conftest2.$ac_objext"
-   # Insert the option either (1) after the last *FLAGS variable, or
-   # (2) before a word containing "conftest.", or (3) at the end.
-   # Note that $ac_compile itself does not contain backslashes and begins
-   # with a dollar sign (not a hyphen), so the echo should work correctly.
-   lt_compile=`echo "$ac_compile" | $SED \
-   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-   -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
-   (eval "$lt_compile" 2>out/conftest.err)
-   ac_status=$?
-   cat out/conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   if (exit $ac_status) && test -s out/conftest2.$ac_objext
-   then
-     # The compiler can only warn and ignore the option if not recognized
-     # So say no if there are warnings
-     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp
-     $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
-     if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
-       lt_cv_prog_compiler_c_o_CXX=yes
-     fi
-   fi
-   chmod u+w . 2>&5
-   $RM conftest*
-   # SGI C++ compiler will create directory out/ii_files/ for
-   # template instantiation
-   test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files
-   $RM out/* && rmdir out
-   cd ..
-   $RM -r conftest
-   $RM conftest*
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o_CXX" >&5
-$as_echo "$lt_cv_prog_compiler_c_o_CXX" >&6; }
-
-
-
-
-hard_links=nottested
-if test no = "$lt_cv_prog_compiler_c_o_CXX" && test no != "$need_locks"; then
-  # do not overwrite the value of need_locks provided by the user
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we can lock with hard links" >&5
-$as_echo_n "checking if we can lock with hard links... " >&6; }
-  hard_links=yes
-  $RM conftest*
-  ln conftest.a conftest.b 2>/dev/null && hard_links=no
-  touch conftest.a
-  ln conftest.a conftest.b 2>&5 || hard_links=no
-  ln conftest.a conftest.b 2>/dev/null && hard_links=no
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $hard_links" >&5
-$as_echo "$hard_links" >&6; }
-  if test no = "$hard_links"; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: '$CC' does not support '-c -o', so 'make -j' may be unsafe" >&5
-$as_echo "$as_me: WARNING: '$CC' does not support '-c -o', so 'make -j' may be unsafe" >&2;}
-    need_locks=warn
-  fi
-else
-  need_locks=no
-fi
-
-
-
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $compiler linker ($LD) supports shared libraries" >&5
-$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
-
-  export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-  exclude_expsyms_CXX='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'
-  case $host_os in
-  aix[4-9]*)
-    # If we're using GNU nm, then we don't want the "-C" option.
-    # -C means demangle to GNU nm, but means don't demangle to AIX nm.
-    # Without the "-l" option, or with the "-B" option, AIX nm treats
-    # weak defined symbols like other global defined symbols, whereas
-    # GNU nm marks them as "W".
-    # While the 'weak' keyword is ignored in the Export File, we need
-    # it in the Import File for the 'aix-soname' feature, so we have
-    # to replace the "-B" option with "-P" for AIX nm.
-    if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
-      export_symbols_cmds_CXX='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { if (\$ 2 == "W") { print \$ 3 " weak" } else { print \$ 3 } } }'\'' | sort -u > $export_symbols'
-    else
-      export_symbols_cmds_CXX='`func_echo_all $NM | $SED -e '\''s/B\([^B]*\)$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "L") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && (substr(\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols'
-    fi
-    ;;
-  pw32*)
-    export_symbols_cmds_CXX=$ltdll_cmds
-    ;;
-  cygwin* | mingw* | cegcc*)
-    case $cc_basename in
-    cl* | icl*)
-      exclude_expsyms_CXX='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*'
-      ;;
-    *)
-      export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols'
-      exclude_expsyms_CXX='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'
-      ;;
-    esac
-    ;;
-  *)
-    export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-    ;;
-  esac
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs_CXX" >&5
-$as_echo "$ld_shlibs_CXX" >&6; }
-test no = "$ld_shlibs_CXX" && can_build_shared=no
-
-with_gnu_ld_CXX=$with_gnu_ld
-
-
-
-
-
-
-#
-# Do we need to explicitly link libc?
-#
-case "x$archive_cmds_need_lc_CXX" in
-x|xyes)
-  # Assume -lc should be added
-  archive_cmds_need_lc_CXX=yes
-
-  if test yes,yes = "$GCC,$enable_shared"; then
-    case $archive_cmds_CXX in
-    *'~'*)
-      # FIXME: we may have to deal with multi-command sequences.
-      ;;
-    '$CC '*)
-      # Test whether the compiler implicitly links with -lc since on some
-      # systems, -lgcc has to come before -lc. If gcc already passes -lc
-      # to ld, don't add -lc before -lgcc.
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5
-$as_echo_n "checking whether -lc should be explicitly linked in... " >&6; }
-if ${lt_cv_archive_cmds_need_lc_CXX+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  $RM conftest*
-	echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-
-	if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } 2>conftest.err; then
-	  soname=conftest
-	  lib=conftest
-	  libobjs=conftest.$ac_objext
-	  deplibs=
-	  wl=$lt_prog_compiler_wl_CXX
-	  pic_flag=$lt_prog_compiler_pic_CXX
-	  compiler_flags=-v
-	  linker_flags=-v
-	  verstring=
-	  output_objdir=.
-	  libname=conftest
-	  lt_save_allow_undefined_flag=$allow_undefined_flag_CXX
-	  allow_undefined_flag_CXX=
-	  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds_CXX 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\""; } >&5
-  (eval $archive_cmds_CXX 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }
-	  then
-	    lt_cv_archive_cmds_need_lc_CXX=no
-	  else
-	    lt_cv_archive_cmds_need_lc_CXX=yes
-	  fi
-	  allow_undefined_flag_CXX=$lt_save_allow_undefined_flag
-	else
-	  cat conftest.err 1>&5
-	fi
-	$RM conftest*
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_archive_cmds_need_lc_CXX" >&5
-$as_echo "$lt_cv_archive_cmds_need_lc_CXX" >&6; }
-      archive_cmds_need_lc_CXX=$lt_cv_archive_cmds_need_lc_CXX
-      ;;
-    esac
-  fi
-  ;;
-esac
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5
-$as_echo_n "checking dynamic linker characteristics... " >&6; }
-
-library_names_spec=
-libname_spec='lib$name'
-soname_spec=
-shrext_cmds=.so
-postinstall_cmds=
-postuninstall_cmds=
-finish_cmds=
-finish_eval=
-shlibpath_var=
-shlibpath_overrides_runpath=unknown
-version_type=none
-dynamic_linker="$host_os ld.so"
-sys_lib_dlsearch_path_spec="/lib /usr/lib"
-need_lib_prefix=unknown
-hardcode_into_libs=no
-
-# when you set need_version to no, make sure it does not cause -set_version
-# flags to be left without arguments
-need_version=unknown
-
-
-
-case $host_os in
-aix3*)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  library_names_spec='$libname$release$shared_ext$versuffix $libname.a'
-  shlibpath_var=LIBPATH
-
-  # AIX 3 has no versioning support, so we append a major version to the name.
-  soname_spec='$libname$release$shared_ext$major'
-  ;;
-
-aix[4-9]*)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  need_lib_prefix=no
-  need_version=no
-  hardcode_into_libs=yes
-  if test ia64 = "$host_cpu"; then
-    # AIX 5 supports IA64
-    library_names_spec='$libname$release$shared_ext$major $libname$release$shared_ext$versuffix $libname$shared_ext'
-    shlibpath_var=LD_LIBRARY_PATH
-  else
-    # With GCC up to 2.95.x, collect2 would create an import file
-    # for dependence libraries.  The import file would start with
-    # the line '#! .'.  This would cause the generated library to
-    # depend on '.', always an invalid library.  This was fixed in
-    # development snapshots of GCC prior to 3.0.
-    case $host_os in
-      aix4 | aix4.[01] | aix4.[01].*)
-      if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
-	   echo ' yes '
-	   echo '#endif'; } | $CC -E - | $GREP yes > /dev/null; then
-	:
-      else
-	can_build_shared=no
-      fi
-      ;;
-    esac
-    # Using Import Files as archive members, it is possible to support
-    # filename-based versioning of shared library archives on AIX. While
-    # this would work for both with and without runtime linking, it will
-    # prevent static linking of such archives. So we do filename-based
-    # shared library versioning with .so extension only, which is used
-    # when both runtime linking and shared linking is enabled.
-    # Unfortunately, runtime linking may impact performance, so we do
-    # not want this to be the default eventually. Also, we use the
-    # versioned .so libs for executables only if there is the -brtl
-    # linker flag in LDFLAGS as well, or --with-aix-soname=svr4 only.
-    # To allow for filename-based versioning support, we need to create
-    # libNAME.so.V as an archive file, containing:
-    # *) an Import File, referring to the versioned filename of the
-    #    archive as well as the shared archive member, telling the
-    #    bitwidth (32 or 64) of that shared object, and providing the
-    #    list of exported symbols of that shared object, eventually
-    #    decorated with the 'weak' keyword
-    # *) the shared object with the F_LOADONLY flag set, to really avoid
-    #    it being seen by the linker.
-    # At run time we better use the real file rather than another symlink,
-    # but for link time we create the symlink libNAME.so -> libNAME.so.V
-
-    case $with_aix_soname,$aix_use_runtimelinking in
-    # AIX (on Power*) has no versioning support, so currently we cannot hardcode correct
-    # soname into executable. Probably we can add versioning support to
-    # collect2, so additional links can be useful in future.
-    aix,yes) # traditional libtool
-      dynamic_linker='AIX unversionable lib.so'
-      # If using run time linking (on AIX 4.2 or later) use lib<name>.so
-      # instead of lib<name>.a to let people know that these are not
-      # typical AIX shared libraries.
-      library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
-      ;;
-    aix,no) # traditional AIX only
-      dynamic_linker='AIX lib.a(lib.so.V)'
-      # We preserve .a as extension for shared libraries through AIX4.2
-      # and later when we are not doing run time linking.
-      library_names_spec='$libname$release.a $libname.a'
-      soname_spec='$libname$release$shared_ext$major'
-      ;;
-    svr4,*) # full svr4 only
-      dynamic_linker="AIX lib.so.V($shared_archive_member_spec.o)"
-      library_names_spec='$libname$release$shared_ext$major $libname$shared_ext'
-      # We do not specify a path in Import Files, so LIBPATH fires.
-      shlibpath_overrides_runpath=yes
-      ;;
-    *,yes) # both, prefer svr4
-      dynamic_linker="AIX lib.so.V($shared_archive_member_spec.o), lib.a(lib.so.V)"
-      library_names_spec='$libname$release$shared_ext$major $libname$shared_ext'
-      # unpreferred sharedlib libNAME.a needs extra handling
-      postinstall_cmds='test -n "$linkname" || linkname="$realname"~func_stripname "" ".so" "$linkname"~$install_shared_prog "$dir/$func_stripname_result.$libext" "$destdir/$func_stripname_result.$libext"~test -z "$tstripme" || test -z "$striplib" || $striplib "$destdir/$func_stripname_result.$libext"'
-      postuninstall_cmds='for n in $library_names $old_library; do :; done~func_stripname "" ".so" "$n"~test "$func_stripname_result" = "$n" || func_append rmfiles " $odir/$func_stripname_result.$libext"'
-      # We do not specify a path in Import Files, so LIBPATH fires.
-      shlibpath_overrides_runpath=yes
-      ;;
-    *,no) # both, prefer aix
-      dynamic_linker="AIX lib.a(lib.so.V), lib.so.V($shared_archive_member_spec.o)"
-      library_names_spec='$libname$release.a $libname.a'
-      soname_spec='$libname$release$shared_ext$major'
-      # unpreferred sharedlib libNAME.so.V and symlink libNAME.so need extra handling
-      postinstall_cmds='test -z "$dlname" || $install_shared_prog $dir/$dlname $destdir/$dlname~test -z "$tstripme" || test -z "$striplib" || $striplib $destdir/$dlname~test -n "$linkname" || linkname=$realname~func_stripname "" ".a" "$linkname"~(cd "$destdir" && $LN_S -f $dlname $func_stripname_result.so)'
-      postuninstall_cmds='test -z "$dlname" || func_append rmfiles " $odir/$dlname"~for n in $old_library $library_names; do :; done~func_stripname "" ".a" "$n"~func_append rmfiles " $odir/$func_stripname_result.so"'
-      ;;
-    esac
-    shlibpath_var=LIBPATH
-  fi
-  ;;
-
-amigaos*)
-  case $host_cpu in
-  powerpc)
-    # Since July 2007 AmigaOS4 officially supports .so libraries.
-    # When compiling the executable, add -use-dynld -Lsobjs: to the compileline.
-    library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
-    ;;
-  m68k)
-    library_names_spec='$libname.ixlibrary $libname.a'
-    # Create ${libname}_ixlibrary.a entries in /sys/libs.
-    finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
-    ;;
-  esac
-  ;;
-
-beos*)
-  library_names_spec='$libname$shared_ext'
-  dynamic_linker="$host_os ld.so"
-  shlibpath_var=LIBRARY_PATH
-  ;;
-
-bsdi[45]*)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  need_version=no
-  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
-  soname_spec='$libname$release$shared_ext$major'
-  finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
-  sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
-  # the default ld.so.conf also contains /usr/contrib/lib and
-  # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
-  # libtool to hard-code these into programs
-  ;;
-
-cygwin* | mingw* | pw32* | cegcc*)
-  version_type=windows
-  shrext_cmds=.dll
-  need_version=no
-  need_lib_prefix=no
-
-  case $GCC,$cc_basename in
-  yes,*)
-    # gcc
-    library_names_spec='$libname.dll.a'
-    # DLL is installed to $(libdir)/../bin by postinstall_cmds
-    postinstall_cmds='base_file=`basename \$file`~
-      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; echo \$dlname'\''`~
-      dldir=$destdir/`dirname \$dlpath`~
-      test -d \$dldir || mkdir -p \$dldir~
-      $install_prog $dir/$dlname \$dldir/$dlname~
-      chmod a+x \$dldir/$dlname~
-      if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then
-        eval '\''$striplib \$dldir/$dlname'\'' || exit \$?;
-      fi'
-    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
-      dlpath=$dir/\$dldll~
-       $RM \$dlpath'
-    shlibpath_overrides_runpath=yes
-
-    case $host_os in
-    cygwin*)
-      # Cygwin DLLs use 'cyg' prefix rather than 'lib'
-      soname_spec='`echo $libname | sed -e 's/^lib/cyg/'``echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext'
-
-      ;;
-    mingw* | cegcc*)
-      # MinGW DLLs use traditional 'lib' prefix
-      soname_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext'
-      ;;
-    pw32*)
-      # pw32 DLLs use 'pw' prefix rather than 'lib'
-      library_names_spec='`echo $libname | sed -e 's/^lib/pw/'``echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext'
-      ;;
-    esac
-    dynamic_linker='Win32 ld.exe'
-    ;;
-
-  *,cl* | *,icl*)
-    # Native MSVC or ICC
-    libname_spec='$name'
-    soname_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext'
-    library_names_spec='$libname.dll.lib'
-
-    case $build_os in
-    mingw*)
-      sys_lib_search_path_spec=
-      lt_save_ifs=$IFS
-      IFS=';'
-      for lt_path in $LIB
-      do
-        IFS=$lt_save_ifs
-        # Let DOS variable expansion print the short 8.3 style file name.
-        lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"`
-        sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path"
-      done
-      IFS=$lt_save_ifs
-      # Convert to MSYS style.
-      sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'`
-      ;;
-    cygwin*)
-      # Convert to unix form, then to dos form, then back to unix form
-      # but this time dos style (no spaces!) so that the unix form looks
-      # like /cygdrive/c/PROGRA~1:/cygdr...
-      sys_lib_search_path_spec=`cygpath --path --unix "$LIB"`
-      sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null`
-      sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
-      ;;
-    *)
-      sys_lib_search_path_spec=$LIB
-      if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then
-        # It is most probably a Windows format PATH.
-        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
-      else
-        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
-      fi
-      # FIXME: find the short name or the path components, as spaces are
-      # common. (e.g. "Program Files" -> "PROGRA~1")
-      ;;
-    esac
-
-    # DLL is installed to $(libdir)/../bin by postinstall_cmds
-    postinstall_cmds='base_file=`basename \$file`~
-      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; echo \$dlname'\''`~
-      dldir=$destdir/`dirname \$dlpath`~
-      test -d \$dldir || mkdir -p \$dldir~
-      $install_prog $dir/$dlname \$dldir/$dlname'
-    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
-      dlpath=$dir/\$dldll~
-       $RM \$dlpath'
-    shlibpath_overrides_runpath=yes
-    dynamic_linker='Win32 link.exe'
-    ;;
-
-  *)
-    # Assume MSVC and ICC wrapper
-    library_names_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext $libname.lib'
-    dynamic_linker='Win32 ld.exe'
-    ;;
-  esac
-  # FIXME: first we should search . and the directory the executable is in
-  shlibpath_var=PATH
-  ;;
-
-darwin* | rhapsody*)
-  dynamic_linker="$host_os dyld"
-  version_type=darwin
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='$libname$release$major$shared_ext $libname$shared_ext'
-  soname_spec='$libname$release$major$shared_ext'
-  shlibpath_overrides_runpath=yes
-  shlibpath_var=DYLD_LIBRARY_PATH
-  shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
-
-  sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
-  ;;
-
-dgux*)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
-  soname_spec='$libname$release$shared_ext$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  ;;
-
-freebsd* | dragonfly*)
-  # DragonFly does not have aout.  When/if they implement a new
-  # versioning mechanism, adjust this.
-  if test -x /usr/bin/objformat; then
-    objformat=`/usr/bin/objformat`
-  else
-    case $host_os in
-    freebsd[23].*) objformat=aout ;;
-    *) objformat=elf ;;
-    esac
-  fi
-  version_type=freebsd-$objformat
-  case $version_type in
-    freebsd-elf*)
-      library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
-      soname_spec='$libname$release$shared_ext$major'
-      need_version=no
-      need_lib_prefix=no
-      ;;
-    freebsd-*)
-      library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix'
-      need_version=yes
-      ;;
-  esac
-  shlibpath_var=LD_LIBRARY_PATH
-  case $host_os in
-  freebsd2.*)
-    shlibpath_overrides_runpath=yes
-    ;;
-  freebsd3.[01]* | freebsdelf3.[01]*)
-    shlibpath_overrides_runpath=yes
-    hardcode_into_libs=yes
-    ;;
-  freebsd3.[2-9]* | freebsdelf3.[2-9]* | \
-  freebsd4.[0-5] | freebsdelf4.[0-5] | freebsd4.1.1 | freebsdelf4.1.1)
-    shlibpath_overrides_runpath=no
-    hardcode_into_libs=yes
-    ;;
-  *) # from 4.6 on, and DragonFly
-    shlibpath_overrides_runpath=yes
-    hardcode_into_libs=yes
-    ;;
-  esac
-  ;;
-
-haiku*)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  need_lib_prefix=no
-  need_version=no
-  dynamic_linker="$host_os runtime_loader"
-  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
-  soname_spec='$libname$release$shared_ext$major'
-  shlibpath_var=LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
-  hardcode_into_libs=yes
-  ;;
-
-hpux9* | hpux10* | hpux11*)
-  # Give a soname corresponding to the major version so that dld.sl refuses to
-  # link against other versions.
-  version_type=sunos
-  need_lib_prefix=no
-  need_version=no
-  case $host_cpu in
-  ia64*)
-    shrext_cmds='.so'
-    hardcode_into_libs=yes
-    dynamic_linker="$host_os dld.so"
-    shlibpath_var=LD_LIBRARY_PATH
-    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
-    library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
-    soname_spec='$libname$release$shared_ext$major'
-    if test 32 = "$HPUX_IA64_MODE"; then
-      sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
-      sys_lib_dlsearch_path_spec=/usr/lib/hpux32
-    else
-      sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
-      sys_lib_dlsearch_path_spec=/usr/lib/hpux64
-    fi
-    ;;
-  hppa*64*)
-    shrext_cmds='.sl'
-    hardcode_into_libs=yes
-    dynamic_linker="$host_os dld.sl"
-    shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
-    library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
-    soname_spec='$libname$release$shared_ext$major'
-    sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
-    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
-    ;;
-  *)
-    shrext_cmds='.sl'
-    dynamic_linker="$host_os dld.sl"
-    shlibpath_var=SHLIB_PATH
-    shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-    library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
-    soname_spec='$libname$release$shared_ext$major'
-    ;;
-  esac
-  # HP-UX runs *really* slowly unless shared libraries are mode 555, ...
-  postinstall_cmds='chmod 555 $lib'
-  # or fails outright, so override atomically:
-  install_override_mode=555
-  ;;
-
-interix[3-9]*)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
-  soname_spec='$libname$release$shared_ext$major'
-  dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  ;;
-
-irix5* | irix6* | nonstopux*)
-  case $host_os in
-    nonstopux*) version_type=nonstopux ;;
-    *)
-	if test yes = "$lt_cv_prog_gnu_ld"; then
-		version_type=linux # correct to gnu/linux during the next big refactor
-	else
-		version_type=irix
-	fi ;;
-  esac
-  need_lib_prefix=no
-  need_version=no
-  soname_spec='$libname$release$shared_ext$major'
-  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$release$shared_ext $libname$shared_ext'
-  case $host_os in
-  irix5* | nonstopux*)
-    libsuff= shlibsuff=
-    ;;
-  *)
-    case $LD in # libtool.m4 will add one of these switches to LD
-    *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ")
-      libsuff= shlibsuff= libmagic=32-bit;;
-    *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ")
-      libsuff=32 shlibsuff=N32 libmagic=N32;;
-    *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ")
-      libsuff=64 shlibsuff=64 libmagic=64-bit;;
-    *) libsuff= shlibsuff= libmagic=never-match;;
-    esac
-    ;;
-  esac
-  shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
-  shlibpath_overrides_runpath=no
-  sys_lib_search_path_spec="/usr/lib$libsuff /lib$libsuff /usr/local/lib$libsuff"
-  sys_lib_dlsearch_path_spec="/usr/lib$libsuff /lib$libsuff"
-  hardcode_into_libs=yes
-  ;;
-
-# No shared lib support for Linux oldld, aout, or coff.
-linux*oldld* | linux*aout* | linux*coff*)
-  dynamic_linker=no
-  ;;
-
-linux*android*)
-  version_type=none # Android doesn't support versioned libraries.
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='$libname$release$shared_ext'
-  soname_spec='$libname$release$shared_ext'
-  finish_cmds=
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-
-  # This implies no fast_install, which is unacceptable.
-  # Some rework will be needed to allow for fast_install
-  # before this can be enabled.
-  hardcode_into_libs=yes
-
-  dynamic_linker='Android linker'
-  # Don't embed -rpath directories since the linker doesn't support them.
-  hardcode_libdir_flag_spec_CXX='-L$libdir'
-  ;;
-
-# This must be glibc/ELF.
-linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
-  soname_spec='$libname$release$shared_ext$major'
-  finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-
-  # Some binutils ld are patched to set DT_RUNPATH
-  if ${lt_cv_shlibpath_overrides_runpath+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_shlibpath_overrides_runpath=no
-    save_LDFLAGS=$LDFLAGS
-    save_libdir=$libdir
-    eval "libdir=/foo; wl=\"$lt_prog_compiler_wl_CXX\"; \
-	 LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec_CXX\""
-    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_cxx_try_link "$LINENO"; then :
-  if  ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then :
-  lt_cv_shlibpath_overrides_runpath=yes
-fi
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-    LDFLAGS=$save_LDFLAGS
-    libdir=$save_libdir
-
-fi
-
-  shlibpath_overrides_runpath=$lt_cv_shlibpath_overrides_runpath
-
-  # This implies no fast_install, which is unacceptable.
-  # Some rework will be needed to allow for fast_install
-  # before this can be enabled.
-  hardcode_into_libs=yes
-
-  # Ideally, we could use ldconfig to report *all* directores which are
-  # searched for libraries, however this is still not possible.  Aside from not
-  # being certain /sbin/ldconfig is available, command
-  # 'ldconfig -N -X -v | grep ^/' on 64bit Fedora does not report /usr/lib64,
-  # even though it is searched at run-time.  Try to do the best guess by
-  # appending ld.so.conf contents (and includes) to the search path.
-  if test -f /etc/ld.so.conf; then
-    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[	 ]*hwcap[	 ]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '`
-    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
-  fi
-
-  # We used to test for /lib/ld.so.1 and disable shared libraries on
-  # powerpc, because MkLinux only supported shared libraries with the
-  # GNU dynamic linker.  Since this was broken with cross compilers,
-  # most powerpc-linux boxes support dynamic linking these days and
-  # people can always --disable-shared, the test was removed, and we
-  # assume the GNU/Linux dynamic linker is in use.
-  dynamic_linker='GNU/Linux ld.so'
-  ;;
-
-netbsd*)
-  version_type=sunos
-  need_lib_prefix=no
-  need_version=no
-  if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
-    library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix'
-    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-    dynamic_linker='NetBSD (a.out) ld.so'
-  else
-    library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
-    soname_spec='$libname$release$shared_ext$major'
-    dynamic_linker='NetBSD ld.elf_so'
-  fi
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  hardcode_into_libs=yes
-  ;;
-
-newsos6)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  ;;
-
-*nto* | *qnx*)
-  version_type=qnx
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
-  soname_spec='$libname$release$shared_ext$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  dynamic_linker='ldqnx.so'
-  ;;
-
-openbsd* | bitrig*)
-  version_type=sunos
-  sys_lib_dlsearch_path_spec=/usr/lib
-  need_lib_prefix=no
-  if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then
-    need_version=no
-  else
-    need_version=yes
-  fi
-  library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix'
-  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  ;;
-
-os2*)
-  libname_spec='$name'
-  version_type=windows
-  shrext_cmds=.dll
-  need_version=no
-  need_lib_prefix=no
-  # OS/2 can only load a DLL with a base name of 8 characters or less.
-  soname_spec='`test -n "$os2dllname" && libname="$os2dllname";
-    v=$($ECHO $release$versuffix | tr -d .-);
-    n=$($ECHO $libname | cut -b -$((8 - ${#v})) | tr . _);
-    $ECHO $n$v`$shared_ext'
-  library_names_spec='${libname}_dll.$libext'
-  dynamic_linker='OS/2 ld.exe'
-  shlibpath_var=BEGINLIBPATH
-  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
-  sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
-  postinstall_cmds='base_file=`basename \$file`~
-    dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; $ECHO \$dlname'\''`~
-    dldir=$destdir/`dirname \$dlpath`~
-    test -d \$dldir || mkdir -p \$dldir~
-    $install_prog $dir/$dlname \$dldir/$dlname~
-    chmod a+x \$dldir/$dlname~
-    if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then
-      eval '\''$striplib \$dldir/$dlname'\'' || exit \$?;
-    fi'
-  postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; $ECHO \$dlname'\''`~
-    dlpath=$dir/\$dldll~
-    $RM \$dlpath'
-  ;;
-
-osf3* | osf4* | osf5*)
-  version_type=osf
-  need_lib_prefix=no
-  need_version=no
-  soname_spec='$libname$release$shared_ext$major'
-  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
-  shlibpath_var=LD_LIBRARY_PATH
-  sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
-  sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
-  ;;
-
-rdos*)
-  dynamic_linker=no
-  ;;
-
-solaris*)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
-  soname_spec='$libname$release$shared_ext$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  hardcode_into_libs=yes
-  # ldd complains unless libraries are executable
-  postinstall_cmds='chmod +x $lib'
-  ;;
-
-sunos4*)
-  version_type=sunos
-  library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix'
-  finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  if test yes = "$with_gnu_ld"; then
-    need_lib_prefix=no
-  fi
-  need_version=yes
-  ;;
-
-sysv4 | sysv4.3*)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
-  soname_spec='$libname$release$shared_ext$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  case $host_vendor in
-    sni)
-      shlibpath_overrides_runpath=no
-      need_lib_prefix=no
-      runpath_var=LD_RUN_PATH
-      ;;
-    siemens)
-      need_lib_prefix=no
-      ;;
-    motorola)
-      need_lib_prefix=no
-      need_version=no
-      shlibpath_overrides_runpath=no
-      sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
-      ;;
-  esac
-  ;;
-
-sysv4*MP*)
-  if test -d /usr/nec; then
-    version_type=linux # correct to gnu/linux during the next big refactor
-    library_names_spec='$libname$shared_ext.$versuffix $libname$shared_ext.$major $libname$shared_ext'
-    soname_spec='$libname$shared_ext.$major'
-    shlibpath_var=LD_LIBRARY_PATH
-  fi
-  ;;
-
-sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
-  version_type=sco
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext $libname$shared_ext'
-  soname_spec='$libname$release$shared_ext$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  hardcode_into_libs=yes
-  if test yes = "$with_gnu_ld"; then
-    sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
-  else
-    sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
-    case $host_os in
-      sco3.2v5*)
-        sys_lib_search_path_spec="$sys_lib_search_path_spec /lib"
-	;;
-    esac
-  fi
-  sys_lib_dlsearch_path_spec='/usr/lib'
-  ;;
-
-tpf*)
-  # TPF is a cross-target only.  Preferred cross-host = GNU/Linux.
-  version_type=linux # correct to gnu/linux during the next big refactor
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  ;;
-
-uts4*)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
-  soname_spec='$libname$release$shared_ext$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  ;;
-
-*)
-  dynamic_linker=no
-  ;;
-esac
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $dynamic_linker" >&5
-$as_echo "$dynamic_linker" >&6; }
-test no = "$dynamic_linker" && can_build_shared=no
-
-variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
-if test yes = "$GCC"; then
-  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
-fi
-
-if test set = "${lt_cv_sys_lib_search_path_spec+set}"; then
-  sys_lib_search_path_spec=$lt_cv_sys_lib_search_path_spec
-fi
-
-if test set = "${lt_cv_sys_lib_dlsearch_path_spec+set}"; then
-  sys_lib_dlsearch_path_spec=$lt_cv_sys_lib_dlsearch_path_spec
-fi
-
-# remember unaugmented sys_lib_dlsearch_path content for libtool script decls...
-configure_time_dlsearch_path=$sys_lib_dlsearch_path_spec
-
-# ... but it needs LT_SYS_LIBRARY_PATH munging for other configure-time code
-func_munge_path_list sys_lib_dlsearch_path_spec "$LT_SYS_LIBRARY_PATH"
-
-# to be used as default LT_SYS_LIBRARY_PATH value in generated libtool
-configure_time_lt_sys_library_path=$LT_SYS_LIBRARY_PATH
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to hardcode library paths into programs" >&5
-$as_echo_n "checking how to hardcode library paths into programs... " >&6; }
-hardcode_action_CXX=
-if test -n "$hardcode_libdir_flag_spec_CXX" ||
-   test -n "$runpath_var_CXX" ||
-   test yes = "$hardcode_automatic_CXX"; then
-
-  # We can hardcode non-existent directories.
-  if test no != "$hardcode_direct_CXX" &&
-     # If the only mechanism to avoid hardcoding is shlibpath_var, we
-     # have to relink, otherwise we might link with an installed library
-     # when we should be linking with a yet-to-be-installed one
-     ## test no != "$_LT_TAGVAR(hardcode_shlibpath_var, CXX)" &&
-     test no != "$hardcode_minus_L_CXX"; then
-    # Linking always hardcodes the temporary library directory.
-    hardcode_action_CXX=relink
-  else
-    # We can link without hardcoding, and we can hardcode nonexisting dirs.
-    hardcode_action_CXX=immediate
-  fi
-else
-  # We cannot hardcode anything, or else we can only hardcode existing
-  # directories.
-  hardcode_action_CXX=unsupported
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $hardcode_action_CXX" >&5
-$as_echo "$hardcode_action_CXX" >&6; }
-
-if test relink = "$hardcode_action_CXX" ||
-   test yes = "$inherit_rpath_CXX"; then
-  # Fast installation is not supported
-  enable_fast_install=no
-elif test yes = "$shlibpath_overrides_runpath" ||
-     test no = "$enable_shared"; then
-  # Fast installation is not necessary
-  enable_fast_install=needless
-fi
-
-
-
-
-
-
-
-  fi # test -n "$compiler"
-
-  CC=$lt_save_CC
-  CFLAGS=$lt_save_CFLAGS
-  LDCXX=$LD
-  LD=$lt_save_LD
-  GCC=$lt_save_GCC
-  with_gnu_ld=$lt_save_with_gnu_ld
-  lt_cv_path_LDCXX=$lt_cv_path_LD
-  lt_cv_path_LD=$lt_save_path_LD
-  lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld
-  lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld
-fi # test yes != "$_lt_caught_CXX_error"
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
-set dummy ${ac_tool_prefix}gcc; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_CC+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_CC="${ac_tool_prefix}gcc"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-$as_echo "$CC" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_CC"; then
-  ac_ct_CC=$CC
-  # Extract the first word of "gcc", so it can be a program name with args.
-set dummy gcc; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_CC+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_CC"; then
-  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_CC="gcc"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_CC=$ac_cv_prog_ac_ct_CC
-if test -n "$ac_ct_CC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
-$as_echo "$ac_ct_CC" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-  if test "x$ac_ct_CC" = x; then
-    CC=""
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    CC=$ac_ct_CC
-  fi
-else
-  CC="$ac_cv_prog_CC"
-fi
-
-if test -z "$CC"; then
-          if test -n "$ac_tool_prefix"; then
-    # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
-set dummy ${ac_tool_prefix}cc; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_CC+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_CC="${ac_tool_prefix}cc"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-$as_echo "$CC" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  fi
-fi
-if test -z "$CC"; then
-  # Extract the first word of "cc", so it can be a program name with args.
-set dummy cc; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_CC+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-  ac_prog_rejected=no
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
-       ac_prog_rejected=yes
-       continue
-     fi
-    ac_cv_prog_CC="cc"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-if test $ac_prog_rejected = yes; then
-  # We found a bogon in the path, so make sure we never use it.
-  set dummy $ac_cv_prog_CC
-  shift
-  if test $# != 0; then
-    # We chose a different compiler from the bogus one.
-    # However, it has the same basename, so the bogon will be chosen
-    # first if we set CC to just the basename; use the full file name.
-    shift
-    ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@"
-  fi
-fi
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-$as_echo "$CC" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$CC"; then
-  if test -n "$ac_tool_prefix"; then
-  for ac_prog in cl.exe
-  do
-    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
-set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_CC+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-$as_echo "$CC" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-    test -n "$CC" && break
-  done
-fi
-if test -z "$CC"; then
-  ac_ct_CC=$CC
-  for ac_prog in cl.exe
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_CC+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_CC"; then
-  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_CC="$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_CC=$ac_cv_prog_ac_ct_CC
-if test -n "$ac_ct_CC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
-$as_echo "$ac_ct_CC" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  test -n "$ac_ct_CC" && break
-done
-
-  if test "x$ac_ct_CC" = x; then
-    CC=""
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    CC=$ac_ct_CC
-  fi
-fi
-
-fi
-
-
-test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "no acceptable C compiler found in \$PATH
-See \`config.log' for more details" "$LINENO" 5; }
-
-# Provide some information about the compiler.
-$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
-set X $ac_compile
-ac_compiler=$2
-for ac_option in --version -v -V -qversion; do
-  { { ac_try="$ac_compiler $ac_option >&5"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_compiler $ac_option >&5") 2>conftest.err
-  ac_status=$?
-  if test -s conftest.err; then
-    sed '10a\
-... rest of stderr output deleted ...
-         10q' conftest.err >conftest.er1
-    cat conftest.er1 >&5
-  fi
-  rm -f conftest.er1 conftest.err
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }
-done
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
-$as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
-if ${ac_cv_c_compiler_gnu+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-#ifndef __GNUC__
-       choke me
-#endif
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_compiler_gnu=yes
-else
-  ac_compiler_gnu=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-ac_cv_c_compiler_gnu=$ac_compiler_gnu
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5
-$as_echo "$ac_cv_c_compiler_gnu" >&6; }
-if test $ac_compiler_gnu = yes; then
-  GCC=yes
-else
-  GCC=
-fi
-ac_test_CFLAGS=${CFLAGS+set}
-ac_save_CFLAGS=$CFLAGS
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
-$as_echo_n "checking whether $CC accepts -g... " >&6; }
-if ${ac_cv_prog_cc_g+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_save_c_werror_flag=$ac_c_werror_flag
-   ac_c_werror_flag=yes
-   ac_cv_prog_cc_g=no
-   CFLAGS="-g"
-   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_prog_cc_g=yes
-else
-  CFLAGS=""
-      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-
-else
-  ac_c_werror_flag=$ac_save_c_werror_flag
-	 CFLAGS="-g"
-	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_prog_cc_g=yes
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-   ac_c_werror_flag=$ac_save_c_werror_flag
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5
-$as_echo "$ac_cv_prog_cc_g" >&6; }
-if test "$ac_test_CFLAGS" = set; then
-  CFLAGS=$ac_save_CFLAGS
-elif test $ac_cv_prog_cc_g = yes; then
-  if test "$GCC" = yes; then
-    CFLAGS="-g -O2"
-  else
-    CFLAGS="-g"
-  fi
-else
-  if test "$GCC" = yes; then
-    CFLAGS="-O2"
-  else
-    CFLAGS=
-  fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
-$as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
-if ${ac_cv_prog_cc_c89+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_cv_prog_cc_c89=no
-ac_save_CC=$CC
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <stdarg.h>
-#include <stdio.h>
-struct stat;
-/* Most of the following tests are stolen from RCS 5.7's src/conf.sh.  */
-struct buf { int x; };
-FILE * (*rcsopen) (struct buf *, struct stat *, int);
-static char *e (p, i)
-     char **p;
-     int i;
-{
-  return p[i];
-}
-static char *f (char * (*g) (char **, int), char **p, ...)
-{
-  char *s;
-  va_list v;
-  va_start (v,p);
-  s = g (p, va_arg (v,int));
-  va_end (v);
-  return s;
-}
-
-/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default.  It has
-   function prototypes and stuff, but not '\xHH' hex character constants.
-   These don't provoke an error unfortunately, instead are silently treated
-   as 'x'.  The following induces an error, until -std is added to get
-   proper ANSI mode.  Curiously '\x00'!='x' always comes out true, for an
-   array size at least.  It's necessary to write '\x00'==0 to get something
-   that's true only with -std.  */
-int osf4_cc_array ['\x00' == 0 ? 1 : -1];
-
-/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters
-   inside strings and character constants.  */
-#define FOO(x) 'x'
-int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1];
-
-int test (int i, double x);
-struct s1 {int (*f) (int a);};
-struct s2 {int (*f) (double a);};
-int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
-int argc;
-char **argv;
-int
-main ()
-{
-return f (e, argv, 0) != argv[0]  ||  f (e, argv, 1) != argv[1];
-  ;
-  return 0;
-}
-_ACEOF
-for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \
-	-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
-do
-  CC="$ac_save_CC $ac_arg"
-  if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_prog_cc_c89=$ac_arg
-fi
-rm -f core conftest.err conftest.$ac_objext
-  test "x$ac_cv_prog_cc_c89" != "xno" && break
-done
-rm -f conftest.$ac_ext
-CC=$ac_save_CC
-
-fi
-# AC_CACHE_VAL
-case "x$ac_cv_prog_cc_c89" in
-  x)
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
-$as_echo "none needed" >&6; } ;;
-  xno)
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
-$as_echo "unsupported" >&6; } ;;
-  *)
-    CC="$CC $ac_cv_prog_cc_c89"
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5
-$as_echo "$ac_cv_prog_cc_c89" >&6; } ;;
-esac
-if test "x$ac_cv_prog_cc_c89" != xno; then :
-
-fi
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC understands -c and -o together" >&5
-$as_echo_n "checking whether $CC understands -c and -o together... " >&6; }
-if ${am_cv_prog_cc_c_o+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-  # Make sure it works both with $CC and with simple cc.
-  # Following AC_PROG_CC_C_O, we do the test twice because some
-  # compilers refuse to overwrite an existing .o file with -o,
-  # though they will create one.
-  am_cv_prog_cc_c_o=yes
-  for am_i in 1 2; do
-    if { echo "$as_me:$LINENO: $CC -c conftest.$ac_ext -o conftest2.$ac_objext" >&5
-   ($CC -c conftest.$ac_ext -o conftest2.$ac_objext) >&5 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } \
-         && test -f conftest2.$ac_objext; then
-      : OK
-    else
-      am_cv_prog_cc_c_o=no
-      break
-    fi
-  done
-  rm -f core conftest*
-  unset am_i
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_cc_c_o" >&5
-$as_echo "$am_cv_prog_cc_c_o" >&6; }
-if test "$am_cv_prog_cc_c_o" != yes; then
-   # Losing compiler, so override with the script.
-   # FIXME: It is wrong to rewrite CC.
-   # But if we don't then we get into trouble of one sort or another.
-   # A longer-term fix would be to have automake use am__CC in this case,
-   # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
-   CC="$am_aux_dir/compile $CC"
-fi
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-
-depcc="$CC"   am_compiler_list=
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
-$as_echo_n "checking dependency style of $depcc... " >&6; }
-if ${am_cv_CC_dependencies_compiler_type+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
-  # We make a subdir and do the tests there.  Otherwise we can end up
-  # making bogus files that we don't know about and never remove.  For
-  # instance it was reported that on HP-UX the gcc test will end up
-  # making a dummy file named 'D' -- because '-MD' means "put the output
-  # in D".
-  rm -rf conftest.dir
-  mkdir conftest.dir
-  # Copy depcomp to subdir because otherwise we won't find it if we're
-  # using a relative directory.
-  cp "$am_depcomp" conftest.dir
-  cd conftest.dir
-  # We will build objects and dependencies in a subdirectory because
-  # it helps to detect inapplicable dependency modes.  For instance
-  # both Tru64's cc and ICC support -MD to output dependencies as a
-  # side effect of compilation, but ICC will put the dependencies in
-  # the current directory while Tru64 will put them in the object
-  # directory.
-  mkdir sub
-
-  am_cv_CC_dependencies_compiler_type=none
-  if test "$am_compiler_list" = ""; then
-     am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
-  fi
-  am__universal=false
-  case " $depcc " in #(
-     *\ -arch\ *\ -arch\ *) am__universal=true ;;
-     esac
-
-  for depmode in $am_compiler_list; do
-    # Setup a source with many dependencies, because some compilers
-    # like to wrap large dependency lists on column 80 (with \), and
-    # we should not choose a depcomp mode which is confused by this.
-    #
-    # We need to recreate these files for each test, as the compiler may
-    # overwrite some of them when testing with obscure command lines.
-    # This happens at least with the AIX C compiler.
-    : > sub/conftest.c
-    for i in 1 2 3 4 5 6; do
-      echo '#include "conftst'$i'.h"' >> sub/conftest.c
-      # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with
-      # Solaris 10 /bin/sh.
-      echo '/* dummy */' > sub/conftst$i.h
-    done
-    echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
-
-    # We check with '-c' and '-o' for the sake of the "dashmstdout"
-    # mode.  It turns out that the SunPro C++ compiler does not properly
-    # handle '-M -o', and we need to detect this.  Also, some Intel
-    # versions had trouble with output in subdirs.
-    am__obj=sub/conftest.${OBJEXT-o}
-    am__minus_obj="-o $am__obj"
-    case $depmode in
-    gcc)
-      # This depmode causes a compiler race in universal mode.
-      test "$am__universal" = false || continue
-      ;;
-    nosideeffect)
-      # After this tag, mechanisms are not by side-effect, so they'll
-      # only be used when explicitly requested.
-      if test "x$enable_dependency_tracking" = xyes; then
-	continue
-      else
-	break
-      fi
-      ;;
-    msvc7 | msvc7msys | msvisualcpp | msvcmsys)
-      # This compiler won't grok '-c -o', but also, the minuso test has
-      # not run yet.  These depmodes are late enough in the game, and
-      # so weak that their functioning should not be impacted.
-      am__obj=conftest.${OBJEXT-o}
-      am__minus_obj=
-      ;;
-    none) break ;;
-    esac
-    if depmode=$depmode \
-       source=sub/conftest.c object=$am__obj \
-       depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
-       $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \
-         >/dev/null 2>conftest.err &&
-       grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
-       grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
-       grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&
-       ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
-      # icc doesn't choke on unknown options, it will just issue warnings
-      # or remarks (even with -Werror).  So we grep stderr for any message
-      # that says an option was ignored or not supported.
-      # When given -MP, icc 7.0 and 7.1 complain thusly:
-      #   icc: Command line warning: ignoring option '-M'; no argument required
-      # The diagnosis changed in icc 8.0:
-      #   icc: Command line remark: option '-MP' not supported
-      if (grep 'ignoring option' conftest.err ||
-          grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
-        am_cv_CC_dependencies_compiler_type=$depmode
-        break
-      fi
-    fi
-  done
-
-  cd ..
-  rm -rf conftest.dir
-else
-  am_cv_CC_dependencies_compiler_type=none
-fi
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CC_dependencies_compiler_type" >&5
-$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; }
-CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
-
- if
-  test "x$enable_dependency_tracking" != xno \
-  && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then
-  am__fastdepCC_TRUE=
-  am__fastdepCC_FALSE='#'
-else
-  am__fastdepCC_TRUE='#'
-  am__fastdepCC_FALSE=
-fi
-
-
-ac_ext=mm
-ac_cpp='$OBJCXXCPP $CPPFLAGS'
-ac_compile='$OBJCXX -c $OBJCXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$OBJCXX -o conftest$ac_exeext $OBJCXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_objcxx_compiler_gnu
-if test -n "$ac_tool_prefix"; then
-  for ac_prog in g++ objc++ objcxx c++ CXX
-  do
-    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
-set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_OBJCXX+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$OBJCXX"; then
-  ac_cv_prog_OBJCXX="$OBJCXX" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_OBJCXX="$ac_tool_prefix$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-OBJCXX=$ac_cv_prog_OBJCXX
-if test -n "$OBJCXX"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OBJCXX" >&5
-$as_echo "$OBJCXX" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-    test -n "$OBJCXX" && break
-  done
-fi
-if test -z "$OBJCXX"; then
-  ac_ct_OBJCXX=$OBJCXX
-  for ac_prog in g++ objc++ objcxx c++ CXX
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_OBJCXX+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_OBJCXX"; then
-  ac_cv_prog_ac_ct_OBJCXX="$ac_ct_OBJCXX" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_OBJCXX="$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_OBJCXX=$ac_cv_prog_ac_ct_OBJCXX
-if test -n "$ac_ct_OBJCXX"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OBJCXX" >&5
-$as_echo "$ac_ct_OBJCXX" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  test -n "$ac_ct_OBJCXX" && break
-done
-
-  if test "x$ac_ct_OBJCXX" = x; then
-    OBJCXX="g++"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    OBJCXX=$ac_ct_OBJCXX
-  fi
-fi
-
-# Provide some information about the compiler.
-$as_echo "$as_me:${as_lineno-$LINENO}: checking for Objective C++ compiler version" >&5
-set X $ac_compile
-ac_compiler=$2
-for ac_option in --version -v -V -qversion; do
-  { { ac_try="$ac_compiler $ac_option >&5"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_compiler $ac_option >&5") 2>conftest.err
-  ac_status=$?
-  if test -s conftest.err; then
-    sed '10a\
-... rest of stderr output deleted ...
-         10q' conftest.err >conftest.er1
-    cat conftest.er1 >&5
-  fi
-  rm -f conftest.er1 conftest.err
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }
-done
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU Objective C++ compiler" >&5
-$as_echo_n "checking whether we are using the GNU Objective C++ compiler... " >&6; }
-if ${ac_cv_objcxx_compiler_gnu+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-#ifndef __GNUC__
-       choke me
-#endif
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_objcxx_try_compile "$LINENO"; then :
-  ac_compiler_gnu=yes
-else
-  ac_compiler_gnu=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-ac_cv_objcxx_compiler_gnu=$ac_compiler_gnu
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objcxx_compiler_gnu" >&5
-$as_echo "$ac_cv_objcxx_compiler_gnu" >&6; }
-if test $ac_compiler_gnu = yes; then
-  GOBJCXX=yes
-else
-  GOBJCXX=
-fi
-ac_test_OBJCXXFLAGS=${OBJCXXFLAGS+set}
-ac_save_OBJCXXFLAGS=$OBJCXXFLAGS
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $OBJCXX accepts -g" >&5
-$as_echo_n "checking whether $OBJCXX accepts -g... " >&6; }
-if ${ac_cv_prog_objcxx_g+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_save_objcxx_werror_flag=$ac_objcxx_werror_flag
-   ac_objcxx_werror_flag=yes
-   ac_cv_prog_objcxx_g=no
-   OBJCXXFLAGS="-g"
-   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_objcxx_try_compile "$LINENO"; then :
-  ac_cv_prog_objcxx_g=yes
-else
-  OBJCXXFLAGS=""
-      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_objcxx_try_compile "$LINENO"; then :
-
-else
-  ac_objcxx_werror_flag=$ac_save_objcxx_werror_flag
-	 OBJCXXFLAGS="-g"
-	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_objcxx_try_compile "$LINENO"; then :
-  ac_cv_prog_objcxx_g=yes
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-   ac_objcxx_werror_flag=$ac_save_objcx_werror_flag
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_objcxx_g" >&5
-$as_echo "$ac_cv_prog_objcxx_g" >&6; }
-if test "$ac_test_OBJCXXFLAGS" = set; then
-  OBJCXXFLAGS=$ac_save_OBJCXXFLAGS
-elif test $ac_cv_prog_objcxx_g = yes; then
-  if test "$GOBJCXX" = yes; then
-    OBJCXXFLAGS="-g -O2"
-  else
-    OBJCXXFLAGS="-g"
-  fi
-else
-  if test "$GOBJCXX" = yes; then
-    OBJCXXFLAGS="-O2"
-  else
-    OBJCXXFLAGS=
-  fi
-fi
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-depcc="$OBJCXX" am_compiler_list='gcc3 gcc'
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
-$as_echo_n "checking dependency style of $depcc... " >&6; }
-if ${am_cv_OBJCXX_dependencies_compiler_type+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
-  # We make a subdir and do the tests there.  Otherwise we can end up
-  # making bogus files that we don't know about and never remove.  For
-  # instance it was reported that on HP-UX the gcc test will end up
-  # making a dummy file named 'D' -- because '-MD' means "put the output
-  # in D".
-  rm -rf conftest.dir
-  mkdir conftest.dir
-  # Copy depcomp to subdir because otherwise we won't find it if we're
-  # using a relative directory.
-  cp "$am_depcomp" conftest.dir
-  cd conftest.dir
-  # We will build objects and dependencies in a subdirectory because
-  # it helps to detect inapplicable dependency modes.  For instance
-  # both Tru64's cc and ICC support -MD to output dependencies as a
-  # side effect of compilation, but ICC will put the dependencies in
-  # the current directory while Tru64 will put them in the object
-  # directory.
-  mkdir sub
-
-  am_cv_OBJCXX_dependencies_compiler_type=none
-  if test "$am_compiler_list" = ""; then
-     am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
-  fi
-  am__universal=false
-
-
-  for depmode in $am_compiler_list; do
-    # Setup a source with many dependencies, because some compilers
-    # like to wrap large dependency lists on column 80 (with \), and
-    # we should not choose a depcomp mode which is confused by this.
-    #
-    # We need to recreate these files for each test, as the compiler may
-    # overwrite some of them when testing with obscure command lines.
-    # This happens at least with the AIX C compiler.
-    : > sub/conftest.c
-    for i in 1 2 3 4 5 6; do
-      echo '#include "conftst'$i'.h"' >> sub/conftest.c
-      # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with
-      # Solaris 10 /bin/sh.
-      echo '/* dummy */' > sub/conftst$i.h
-    done
-    echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
-
-    # We check with '-c' and '-o' for the sake of the "dashmstdout"
-    # mode.  It turns out that the SunPro C++ compiler does not properly
-    # handle '-M -o', and we need to detect this.  Also, some Intel
-    # versions had trouble with output in subdirs.
-    am__obj=sub/conftest.${OBJEXT-o}
-    am__minus_obj="-o $am__obj"
-    case $depmode in
-    gcc)
-      # This depmode causes a compiler race in universal mode.
-      test "$am__universal" = false || continue
-      ;;
-    nosideeffect)
-      # After this tag, mechanisms are not by side-effect, so they'll
-      # only be used when explicitly requested.
-      if test "x$enable_dependency_tracking" = xyes; then
-	continue
-      else
-	break
-      fi
-      ;;
-    msvc7 | msvc7msys | msvisualcpp | msvcmsys)
-      # This compiler won't grok '-c -o', but also, the minuso test has
-      # not run yet.  These depmodes are late enough in the game, and
-      # so weak that their functioning should not be impacted.
-      am__obj=conftest.${OBJEXT-o}
-      am__minus_obj=
-      ;;
-    none) break ;;
-    esac
-    if depmode=$depmode \
-       source=sub/conftest.c object=$am__obj \
-       depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
-       $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \
-         >/dev/null 2>conftest.err &&
-       grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
-       grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
-       grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&
-       ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
-      # icc doesn't choke on unknown options, it will just issue warnings
-      # or remarks (even with -Werror).  So we grep stderr for any message
-      # that says an option was ignored or not supported.
-      # When given -MP, icc 7.0 and 7.1 complain thusly:
-      #   icc: Command line warning: ignoring option '-M'; no argument required
-      # The diagnosis changed in icc 8.0:
-      #   icc: Command line remark: option '-MP' not supported
-      if (grep 'ignoring option' conftest.err ||
-          grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
-        am_cv_OBJCXX_dependencies_compiler_type=$depmode
-        break
-      fi
-    fi
-  done
-
-  cd ..
-  rm -rf conftest.dir
-else
-  am_cv_OBJCXX_dependencies_compiler_type=none
-fi
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_OBJCXX_dependencies_compiler_type" >&5
-$as_echo "$am_cv_OBJCXX_dependencies_compiler_type" >&6; }
-OBJCXXDEPMODE=depmode=$am_cv_OBJCXX_dependencies_compiler_type
-
- if
-  test "x$enable_dependency_tracking" != xno \
-  && test "$am_cv_OBJCXX_dependencies_compiler_type" = gcc3; then
-  am__fastdepOBJCXX_TRUE=
-  am__fastdepOBJCXX_FALSE='#'
-else
-  am__fastdepOBJCXX_TRUE='#'
-  am__fastdepOBJCXX_FALSE=
-fi
-
-
-# By default we simply use the C compiler to build assembly code.
-
-test "${CCAS+set}" = set || CCAS=$CC
-test "${CCASFLAGS+set}" = set || CCASFLAGS=$CFLAGS
-
-
-
-depcc="$CCAS"   am_compiler_list=
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
-$as_echo_n "checking dependency style of $depcc... " >&6; }
-if ${am_cv_CCAS_dependencies_compiler_type+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
-  # We make a subdir and do the tests there.  Otherwise we can end up
-  # making bogus files that we don't know about and never remove.  For
-  # instance it was reported that on HP-UX the gcc test will end up
-  # making a dummy file named 'D' -- because '-MD' means "put the output
-  # in D".
-  rm -rf conftest.dir
-  mkdir conftest.dir
-  # Copy depcomp to subdir because otherwise we won't find it if we're
-  # using a relative directory.
-  cp "$am_depcomp" conftest.dir
-  cd conftest.dir
-  # We will build objects and dependencies in a subdirectory because
-  # it helps to detect inapplicable dependency modes.  For instance
-  # both Tru64's cc and ICC support -MD to output dependencies as a
-  # side effect of compilation, but ICC will put the dependencies in
-  # the current directory while Tru64 will put them in the object
-  # directory.
-  mkdir sub
-
-  am_cv_CCAS_dependencies_compiler_type=none
-  if test "$am_compiler_list" = ""; then
-     am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
-  fi
-  am__universal=false
-
-
-  for depmode in $am_compiler_list; do
-    # Setup a source with many dependencies, because some compilers
-    # like to wrap large dependency lists on column 80 (with \), and
-    # we should not choose a depcomp mode which is confused by this.
-    #
-    # We need to recreate these files for each test, as the compiler may
-    # overwrite some of them when testing with obscure command lines.
-    # This happens at least with the AIX C compiler.
-    : > sub/conftest.c
-    for i in 1 2 3 4 5 6; do
-      echo '#include "conftst'$i'.h"' >> sub/conftest.c
-      # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with
-      # Solaris 10 /bin/sh.
-      echo '/* dummy */' > sub/conftst$i.h
-    done
-    echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
-
-    # We check with '-c' and '-o' for the sake of the "dashmstdout"
-    # mode.  It turns out that the SunPro C++ compiler does not properly
-    # handle '-M -o', and we need to detect this.  Also, some Intel
-    # versions had trouble with output in subdirs.
-    am__obj=sub/conftest.${OBJEXT-o}
-    am__minus_obj="-o $am__obj"
-    case $depmode in
-    gcc)
-      # This depmode causes a compiler race in universal mode.
-      test "$am__universal" = false || continue
-      ;;
-    nosideeffect)
-      # After this tag, mechanisms are not by side-effect, so they'll
-      # only be used when explicitly requested.
-      if test "x$enable_dependency_tracking" = xyes; then
-	continue
-      else
-	break
-      fi
-      ;;
-    msvc7 | msvc7msys | msvisualcpp | msvcmsys)
-      # This compiler won't grok '-c -o', but also, the minuso test has
-      # not run yet.  These depmodes are late enough in the game, and
-      # so weak that their functioning should not be impacted.
-      am__obj=conftest.${OBJEXT-o}
-      am__minus_obj=
-      ;;
-    none) break ;;
-    esac
-    if depmode=$depmode \
-       source=sub/conftest.c object=$am__obj \
-       depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
-       $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \
-         >/dev/null 2>conftest.err &&
-       grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
-       grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
-       grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&
-       ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
-      # icc doesn't choke on unknown options, it will just issue warnings
-      # or remarks (even with -Werror).  So we grep stderr for any message
-      # that says an option was ignored or not supported.
-      # When given -MP, icc 7.0 and 7.1 complain thusly:
-      #   icc: Command line warning: ignoring option '-M'; no argument required
-      # The diagnosis changed in icc 8.0:
-      #   icc: Command line remark: option '-MP' not supported
-      if (grep 'ignoring option' conftest.err ||
-          grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
-        am_cv_CCAS_dependencies_compiler_type=$depmode
-        break
-      fi
-    fi
-  done
-
-  cd ..
-  rm -rf conftest.dir
-else
-  am_cv_CCAS_dependencies_compiler_type=none
-fi
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CCAS_dependencies_compiler_type" >&5
-$as_echo "$am_cv_CCAS_dependencies_compiler_type" >&6; }
-CCASDEPMODE=depmode=$am_cv_CCAS_dependencies_compiler_type
-
- if
-  test "x$enable_dependency_tracking" != xno \
-  && test "$am_cv_CCAS_dependencies_compiler_type" = gcc3; then
-  am__fastdepCCAS_TRUE=
-  am__fastdepCCAS_FALSE='#'
-else
-  am__fastdepCCAS_TRUE='#'
-  am__fastdepCCAS_FALSE=
-fi
-
-
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
-set dummy ${ac_tool_prefix}ranlib; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_RANLIB+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$RANLIB"; then
-  ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-RANLIB=$ac_cv_prog_RANLIB
-if test -n "$RANLIB"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5
-$as_echo "$RANLIB" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_RANLIB"; then
-  ac_ct_RANLIB=$RANLIB
-  # Extract the first word of "ranlib", so it can be a program name with args.
-set dummy ranlib; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_RANLIB+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_RANLIB"; then
-  ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_RANLIB="ranlib"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
-if test -n "$ac_ct_RANLIB"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5
-$as_echo "$ac_ct_RANLIB" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-  if test "x$ac_ct_RANLIB" = x; then
-    RANLIB=":"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    RANLIB=$ac_ct_RANLIB
-  fi
-else
-  RANLIB="$ac_cv_prog_RANLIB"
-fi
-
-
-# Checks for libraries.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SHA1 in -lcrypto" >&5
-$as_echo_n "checking for SHA1 in -lcrypto... " >&6; }
-if ${ac_cv_lib_crypto_SHA1+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lcrypto  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char SHA1 ();
-int
-main ()
-{
-return SHA1 ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_crypto_SHA1=yes
-else
-  ac_cv_lib_crypto_SHA1=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_crypto_SHA1" >&5
-$as_echo "$ac_cv_lib_crypto_SHA1" >&6; }
-if test "x$ac_cv_lib_crypto_SHA1" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBCRYPTO 1
-_ACEOF
-
-  LIBS="-lcrypto $LIBS"
-
-else
-  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "libssl-dev is required but not found
-See \`config.log' for more details" "$LINENO" 5; }
-fi
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for floorf in -lm" >&5
-$as_echo_n "checking for floorf in -lm... " >&6; }
-if ${ac_cv_lib_m_floorf+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lm  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char floorf ();
-int
-main ()
-{
-return floorf ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_m_floorf=yes
-else
-  ac_cv_lib_m_floorf=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_floorf" >&5
-$as_echo "$ac_cv_lib_m_floorf" >&6; }
-if test "x$ac_cv_lib_m_floorf" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBM 1
-_ACEOF
-
-  LIBS="-lm $LIBS"
-
-fi
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for opus_decoder_create in -lopus" >&5
-$as_echo_n "checking for opus_decoder_create in -lopus... " >&6; }
-if ${ac_cv_lib_opus_opus_decoder_create+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lopus  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char opus_decoder_create ();
-int
-main ()
-{
-return opus_decoder_create ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_opus_opus_decoder_create=yes
-else
-  ac_cv_lib_opus_opus_decoder_create=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_opus_opus_decoder_create" >&5
-$as_echo "$ac_cv_lib_opus_opus_decoder_create" >&6; }
-if test "x$ac_cv_lib_opus_opus_decoder_create" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBOPUS 1
-_ACEOF
-
-  LIBS="-lopus $LIBS"
-
-else
-  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "libopus-dev is required but not found
-See \`config.log' for more details" "$LINENO" 5; }
-fi
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_create in -lpthread" >&5
-$as_echo_n "checking for pthread_create in -lpthread... " >&6; }
-if ${ac_cv_lib_pthread_pthread_create+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lpthread  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char pthread_create ();
-int
-main ()
-{
-return pthread_create ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_pthread_pthread_create=yes
-else
-  ac_cv_lib_pthread_pthread_create=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pthread_pthread_create" >&5
-$as_echo "$ac_cv_lib_pthread_pthread_create" >&6; }
-if test "x$ac_cv_lib_pthread_pthread_create" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBPTHREAD 1
-_ACEOF
-
-  LIBS="-lpthread $LIBS"
-
-fi
-
-
-
-
-case $host_cpu in #(
-  i?86) :
-    cpu_x86=yes ;; #(
-  x86_64) :
-    cpu_x86=yes ;; #(
-  arm*) :
-    cpu_arm=yes ;; #(
-  *) :
-    $as_echo "!! WARNING: libtgvoip wasn't tested with your CPU architecture ($host_cpu)"
- ;;
-esac
-case $host_cpu in #(
-  armv7*) :
-    cpu_armv7=yes
- ;; #(
-  *) :
-     ;;
-esac
-$as_echo "Detected CPU: $host_cpu"
- if test "x$cpu_x86" == xyes; then
-  TARGET_CPU_X86_TRUE=
-  TARGET_CPU_X86_FALSE='#'
-else
-  TARGET_CPU_X86_TRUE='#'
-  TARGET_CPU_X86_FALSE=
-fi
-
- if test "x$cpu_arm" == xyes; then
-  TARGET_CPU_ARM_TRUE=
-  TARGET_CPU_ARM_FALSE='#'
-else
-  TARGET_CPU_ARM_TRUE='#'
-  TARGET_CPU_ARM_FALSE=
-fi
-
- if test "x$cpu_armv7" == xyes; then
-  TARGET_CPU_ARMV7_TRUE=
-  TARGET_CPU_ARMV7_FALSE='#'
-else
-  TARGET_CPU_ARMV7_TRUE='#'
-  TARGET_CPU_ARMV7_FALSE=
-fi
-
-$as_echo "Detected OS: $host_os"
-
-case $host_os in #(
-  darwin*) :
-    os_osx=yes
- ;; #(
-  *) :
-     ;;
-esac
- if test "x$os_osx" == xyes; then
-  TARGET_OS_OSX_TRUE=
-  TARGET_OS_OSX_FALSE='#'
-else
-  TARGET_OS_OSX_TRUE='#'
-  TARGET_OS_OSX_FALSE=
-fi
-
-
-# Check whether --enable-audio-callback was given.
-if test "${enable_audio_callback+set}" = set; then :
-  enableval=$enable_audio_callback;
-else
-  enable_audio_callback=no
-fi
-
- if test "x$enable_audio_callback" == xyes; then
-  ENABLE_AUDIO_CALLBACK_TRUE=
-  ENABLE_AUDIO_CALLBACK_FALSE='#'
-else
-  ENABLE_AUDIO_CALLBACK_TRUE='#'
-  ENABLE_AUDIO_CALLBACK_FALSE=
-fi
-
-
-if test "x$os_osx" != xyes && test "x$enable_audio_callback" != xyes; then :
-   # Linux
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
-$as_echo_n "checking for dlopen in -ldl... " >&6; }
-if ${ac_cv_lib_dl_dlopen+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-ldl  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char dlopen ();
-int
-main ()
-{
-return dlopen ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_dl_dlopen=yes
-else
-  ac_cv_lib_dl_dlopen=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
-$as_echo "$ac_cv_lib_dl_dlopen" >&6; }
-if test "x$ac_cv_lib_dl_dlopen" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBDL 1
-_ACEOF
-
-  LIBS="-ldl $LIBS"
-
-fi
-
-
-
-# Check whether --with-pulse was given.
-if test "${with_pulse+set}" = set; then :
-  withval=$with_pulse;
-else
-  with_pulse=yes
-fi
-
-
-# Check whether --with-alsa was given.
-if test "${with_alsa+set}" = set; then :
-  withval=$with_alsa;
-else
-  with_alsa=yes
-fi
-
-
-	if test "x$with_pulse" == xno && test "x$with_alsa" == xno; then :
-
-		{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "You can only disable either ALSA or PulseAudio, not both
-See \`config.log' for more details" "$LINENO" 5; };
-
-fi
-
-	if test "x$with_pulse" != xno; then :
-
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for pa_context_new in -lpulse" >&5
-$as_echo_n "checking for pa_context_new in -lpulse... " >&6; }
-if ${ac_cv_lib_pulse_pa_context_new+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lpulse  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char pa_context_new ();
-int
-main ()
-{
-return pa_context_new ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_pulse_pa_context_new=yes
-else
-  ac_cv_lib_pulse_pa_context_new=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pulse_pa_context_new" >&5
-$as_echo "$ac_cv_lib_pulse_pa_context_new" >&6; }
-if test "x$ac_cv_lib_pulse_pa_context_new" = xyes; then :
-
-			$as_echo_n  # what is the proper way to check for a library without linking it?
-
-else
-
-			{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "libpulse-dev is required during build, but you don't have it installed. Use --without-pulse to disable PulseAudio support.
-See \`config.log' for more details" "$LINENO" 5; }
-
-fi
-
-
-else
-
-
-$as_echo "#define WITHOUT_PULSE 1" >>confdefs.h
-
-
-fi
-
-	if test "x$with_alsa" != xno; then :
-
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for snd_pcm_open in -lasound" >&5
-$as_echo_n "checking for snd_pcm_open in -lasound... " >&6; }
-if ${ac_cv_lib_asound_snd_pcm_open+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lasound  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char snd_pcm_open ();
-int
-main ()
-{
-return snd_pcm_open ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_asound_snd_pcm_open=yes
-else
-  ac_cv_lib_asound_snd_pcm_open=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_asound_snd_pcm_open" >&5
-$as_echo "$ac_cv_lib_asound_snd_pcm_open" >&6; }
-if test "x$ac_cv_lib_asound_snd_pcm_open" = xyes; then :
-
-			$as_echo_n  # what is the proper way to check for a library without linking it?
-
-else
-
-			{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "libasound-dev is required during build, but you don't have it installed. Use --without-alsa to disable ALSA support.
-See \`config.log' for more details" "$LINENO" 5; }
-
-fi
-
-
-else
-
-
-$as_echo "#define WITHOUT_ALSA 1" >>confdefs.h
-
-
-fi
-
-fi;
-
- if test "x$with_pulse" == xyes; then
-  WITH_PULSE_TRUE=
-  WITH_PULSE_FALSE='#'
-else
-  WITH_PULSE_TRUE='#'
-  WITH_PULSE_FALSE=
-fi
-
- if test "x$with_alsa" == xyes; then
-  WITH_ALSA_TRUE=
-  WITH_ALSA_FALSE='#'
-else
-  WITH_ALSA_TRUE='#'
-  WITH_ALSA_FALSE=
-fi
-
-
-# Check whether --enable-dsp was given.
-if test "${enable_dsp+set}" = set; then :
-  enableval=$enable_dsp;
-else
-  enable_dsp=yes
-fi
-
- if test "x$enable_dsp" == xyes; then
-  ENABLE_DSP_TRUE=
-  ENABLE_DSP_FALSE='#'
-else
-  ENABLE_DSP_TRUE='#'
-  ENABLE_DSP_FALSE=
-fi
-
-
-# Checks for header files.
-ac_fn_c_check_type "$LINENO" "size_t" "ac_cv_type_size_t" "$ac_includes_default"
-if test "x$ac_cv_type_size_t" = xyes; then :
-
-else
-
-cat >>confdefs.h <<_ACEOF
-#define size_t unsigned int
-_ACEOF
-
-fi
-
-# The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
-# for constant arguments.  Useless!
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for working alloca.h" >&5
-$as_echo_n "checking for working alloca.h... " >&6; }
-if ${ac_cv_working_alloca_h+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <alloca.h>
-int
-main ()
-{
-char *p = (char *) alloca (2 * sizeof (int));
-			  if (p) return 0;
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_working_alloca_h=yes
-else
-  ac_cv_working_alloca_h=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_working_alloca_h" >&5
-$as_echo "$ac_cv_working_alloca_h" >&6; }
-if test $ac_cv_working_alloca_h = yes; then
-
-$as_echo "#define HAVE_ALLOCA_H 1" >>confdefs.h
-
-fi
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for alloca" >&5
-$as_echo_n "checking for alloca... " >&6; }
-if ${ac_cv_func_alloca_works+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#ifdef __GNUC__
-# define alloca __builtin_alloca
-#else
-# ifdef _MSC_VER
-#  include <malloc.h>
-#  define alloca _alloca
-# else
-#  ifdef HAVE_ALLOCA_H
-#   include <alloca.h>
-#  else
-#   ifdef _AIX
- #pragma alloca
-#   else
-#    ifndef alloca /* predefined by HP cc +Olibcalls */
-void *alloca (size_t);
-#    endif
-#   endif
-#  endif
-# endif
-#endif
-
-int
-main ()
-{
-char *p = (char *) alloca (1);
-				    if (p) return 0;
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_func_alloca_works=yes
-else
-  ac_cv_func_alloca_works=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_alloca_works" >&5
-$as_echo "$ac_cv_func_alloca_works" >&6; }
-
-if test $ac_cv_func_alloca_works = yes; then
-
-$as_echo "#define HAVE_ALLOCA 1" >>confdefs.h
-
-else
-  # The SVR3 libPW and SVR4 libucb both contain incompatible functions
-# that cause trouble.  Some versions do not even contain alloca or
-# contain a buggy version.  If you still want to use their alloca,
-# use ar to extract alloca.o from them instead of compiling alloca.c.
-
-ALLOCA=\${LIBOBJDIR}alloca.$ac_objext
-
-$as_echo "#define C_ALLOCA 1" >>confdefs.h
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether \`alloca.c' needs Cray hooks" >&5
-$as_echo_n "checking whether \`alloca.c' needs Cray hooks... " >&6; }
-if ${ac_cv_os_cray+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#if defined CRAY && ! defined CRAY2
-webecray
-#else
-wenotbecray
-#endif
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "webecray" >/dev/null 2>&1; then :
-  ac_cv_os_cray=yes
-else
-  ac_cv_os_cray=no
-fi
-rm -f conftest*
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_os_cray" >&5
-$as_echo "$ac_cv_os_cray" >&6; }
-if test $ac_cv_os_cray = yes; then
-  for ac_func in _getb67 GETB67 getb67; do
-    as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
-
-cat >>confdefs.h <<_ACEOF
-#define CRAY_STACKSEG_END $ac_func
-_ACEOF
-
-    break
-fi
-
-  done
-fi
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking stack direction for C alloca" >&5
-$as_echo_n "checking stack direction for C alloca... " >&6; }
-if ${ac_cv_c_stack_direction+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test "$cross_compiling" = yes; then :
-  ac_cv_c_stack_direction=0
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-$ac_includes_default
-int
-find_stack_direction (int *addr, int depth)
-{
-  int dir, dummy = 0;
-  if (! addr)
-    addr = &dummy;
-  *addr = addr < &dummy ? 1 : addr == &dummy ? 0 : -1;
-  dir = depth ? find_stack_direction (addr, depth - 1) : 0;
-  return dir + dummy;
-}
-
-int
-main (int argc, char **argv)
-{
-  return find_stack_direction (0, argc + !argv + 20) < 0;
-}
-_ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
-  ac_cv_c_stack_direction=1
-else
-  ac_cv_c_stack_direction=-1
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
-fi
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_stack_direction" >&5
-$as_echo "$ac_cv_c_stack_direction" >&6; }
-cat >>confdefs.h <<_ACEOF
-#define STACK_DIRECTION $ac_cv_c_stack_direction
-_ACEOF
-
-
-fi
-
-for ac_header in arpa/inet.h float.h malloc.h netdb.h netinet/in.h stddef.h stdint.h stdlib.h string.h sys/ioctl.h sys/socket.h sys/time.h unistd.h wchar.h
-do :
-  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
-if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
-  cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
-
-fi
-
-done
-
-
-# Checks for typedefs, structures, and compiler characteristics.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for stdbool.h that conforms to C99" >&5
-$as_echo_n "checking for stdbool.h that conforms to C99... " >&6; }
-if ${ac_cv_header_stdbool_h+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-             #include <stdbool.h>
-             #ifndef bool
-              "error: bool is not defined"
-             #endif
-             #ifndef false
-              "error: false is not defined"
-             #endif
-             #if false
-              "error: false is not 0"
-             #endif
-             #ifndef true
-              "error: true is not defined"
-             #endif
-             #if true != 1
-              "error: true is not 1"
-             #endif
-             #ifndef __bool_true_false_are_defined
-              "error: __bool_true_false_are_defined is not defined"
-             #endif
-
-             struct s { _Bool s: 1; _Bool t; } s;
-
-             char a[true == 1 ? 1 : -1];
-             char b[false == 0 ? 1 : -1];
-             char c[__bool_true_false_are_defined == 1 ? 1 : -1];
-             char d[(bool) 0.5 == true ? 1 : -1];
-             /* See body of main program for 'e'.  */
-             char f[(_Bool) 0.0 == false ? 1 : -1];
-             char g[true];
-             char h[sizeof (_Bool)];
-             char i[sizeof s.t];
-             enum { j = false, k = true, l = false * true, m = true * 256 };
-             /* The following fails for
-                HP aC++/ANSI C B3910B A.05.55 [Dec 04 2003]. */
-             _Bool n[m];
-             char o[sizeof n == m * sizeof n[0] ? 1 : -1];
-             char p[-1 - (_Bool) 0 < 0 && -1 - (bool) 0 < 0 ? 1 : -1];
-             /* Catch a bug in an HP-UX C compiler.  See
-                http://gcc.gnu.org/ml/gcc-patches/2003-12/msg02303.html
-                http://lists.gnu.org/archive/html/bug-coreutils/2005-11/msg00161.html
-              */
-             _Bool q = true;
-             _Bool *pq = &q;
-
-int
-main ()
-{
-
-             bool e = &s;
-             *pq |= q;
-             *pq |= ! q;
-             /* Refer to every declared value, to avoid compiler optimizations.  */
-             return (!a + !b + !c + !d + !e + !f + !g + !h + !i + !!j + !k + !!l
-                     + !m + !n + !o + !p + !q + !pq);
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_header_stdbool_h=yes
-else
-  ac_cv_header_stdbool_h=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdbool_h" >&5
-$as_echo "$ac_cv_header_stdbool_h" >&6; }
-   ac_fn_c_check_type "$LINENO" "_Bool" "ac_cv_type__Bool" "$ac_includes_default"
-if test "x$ac_cv_type__Bool" = xyes; then :
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE__BOOL 1
-_ACEOF
-
-
-fi
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for inline" >&5
-$as_echo_n "checking for inline... " >&6; }
-if ${ac_cv_c_inline+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_cv_c_inline=no
-for ac_kw in inline __inline__ __inline; do
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#ifndef __cplusplus
-typedef int foo_t;
-static $ac_kw foo_t static_foo () {return 0; }
-$ac_kw foo_t foo () {return 0; }
-#endif
-
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_c_inline=$ac_kw
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-  test "$ac_cv_c_inline" != no && break
-done
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_inline" >&5
-$as_echo "$ac_cv_c_inline" >&6; }
-
-case $ac_cv_c_inline in
-  inline | yes) ;;
-  *)
-    case $ac_cv_c_inline in
-      no) ac_val=;;
-      *) ac_val=$ac_cv_c_inline;;
-    esac
-    cat >>confdefs.h <<_ACEOF
-#ifndef __cplusplus
-#define inline $ac_val
-#endif
-_ACEOF
-    ;;
-esac
-
-ac_fn_c_find_intX_t "$LINENO" "16" "ac_cv_c_int16_t"
-case $ac_cv_c_int16_t in #(
-  no|yes) ;; #(
-  *)
-
-cat >>confdefs.h <<_ACEOF
-#define int16_t $ac_cv_c_int16_t
-_ACEOF
-;;
-esac
-
-ac_fn_c_find_intX_t "$LINENO" "32" "ac_cv_c_int32_t"
-case $ac_cv_c_int32_t in #(
-  no|yes) ;; #(
-  *)
-
-cat >>confdefs.h <<_ACEOF
-#define int32_t $ac_cv_c_int32_t
-_ACEOF
-;;
-esac
-
-ac_fn_c_find_intX_t "$LINENO" "64" "ac_cv_c_int64_t"
-case $ac_cv_c_int64_t in #(
-  no|yes) ;; #(
-  *)
-
-cat >>confdefs.h <<_ACEOF
-#define int64_t $ac_cv_c_int64_t
-_ACEOF
-;;
-esac
-
-ac_fn_c_find_intX_t "$LINENO" "8" "ac_cv_c_int8_t"
-case $ac_cv_c_int8_t in #(
-  no|yes) ;; #(
-  *)
-
-cat >>confdefs.h <<_ACEOF
-#define int8_t $ac_cv_c_int8_t
-_ACEOF
-;;
-esac
-
-ac_fn_c_check_type "$LINENO" "size_t" "ac_cv_type_size_t" "$ac_includes_default"
-if test "x$ac_cv_type_size_t" = xyes; then :
-
-else
-
-cat >>confdefs.h <<_ACEOF
-#define size_t unsigned int
-_ACEOF
-
-fi
-
-ac_fn_c_check_type "$LINENO" "ssize_t" "ac_cv_type_ssize_t" "$ac_includes_default"
-if test "x$ac_cv_type_ssize_t" = xyes; then :
-
-else
-
-cat >>confdefs.h <<_ACEOF
-#define ssize_t int
-_ACEOF
-
-fi
-
-ac_fn_c_find_uintX_t "$LINENO" "16" "ac_cv_c_uint16_t"
-case $ac_cv_c_uint16_t in #(
-  no|yes) ;; #(
-  *)
-
-
-cat >>confdefs.h <<_ACEOF
-#define uint16_t $ac_cv_c_uint16_t
-_ACEOF
-;;
-  esac
-
-ac_fn_c_find_uintX_t "$LINENO" "32" "ac_cv_c_uint32_t"
-case $ac_cv_c_uint32_t in #(
-  no|yes) ;; #(
-  *)
-
-$as_echo "#define _UINT32_T 1" >>confdefs.h
-
-
-cat >>confdefs.h <<_ACEOF
-#define uint32_t $ac_cv_c_uint32_t
-_ACEOF
-;;
-  esac
-
-ac_fn_c_find_uintX_t "$LINENO" "64" "ac_cv_c_uint64_t"
-case $ac_cv_c_uint64_t in #(
-  no|yes) ;; #(
-  *)
-
-$as_echo "#define _UINT64_T 1" >>confdefs.h
-
-
-cat >>confdefs.h <<_ACEOF
-#define uint64_t $ac_cv_c_uint64_t
-_ACEOF
-;;
-  esac
-
-ac_fn_c_find_uintX_t "$LINENO" "8" "ac_cv_c_uint8_t"
-case $ac_cv_c_uint8_t in #(
-  no|yes) ;; #(
-  *)
-
-$as_echo "#define _UINT8_T 1" >>confdefs.h
-
-
-cat >>confdefs.h <<_ACEOF
-#define uint8_t $ac_cv_c_uint8_t
-_ACEOF
-;;
-  esac
-
-ac_fn_c_check_type "$LINENO" "ptrdiff_t" "ac_cv_type_ptrdiff_t" "$ac_includes_default"
-if test "x$ac_cv_type_ptrdiff_t" = xyes; then :
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE_PTRDIFF_T 1
-_ACEOF
-
-
-fi
-
-
-# Checks for library functions.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for error_at_line" >&5
-$as_echo_n "checking for error_at_line... " >&6; }
-if ${ac_cv_lib_error_at_line+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <error.h>
-int
-main ()
-{
-error_at_line (0, 0, "", 0, "an error occurred");
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_error_at_line=yes
-else
-  ac_cv_lib_error_at_line=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_error_at_line" >&5
-$as_echo "$ac_cv_lib_error_at_line" >&6; }
-if test $ac_cv_lib_error_at_line = no; then
-  case " $LIBOBJS " in
-  *" error.$ac_objext "* ) ;;
-  *) LIBOBJS="$LIBOBJS error.$ac_objext"
- ;;
-esac
-
-fi
-
-for ac_header in stdlib.h
-do :
-  ac_fn_c_check_header_mongrel "$LINENO" "stdlib.h" "ac_cv_header_stdlib_h" "$ac_includes_default"
-if test "x$ac_cv_header_stdlib_h" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_STDLIB_H 1
-_ACEOF
-
-fi
-
-done
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU libc compatible malloc" >&5
-$as_echo_n "checking for GNU libc compatible malloc... " >&6; }
-if ${ac_cv_func_malloc_0_nonnull+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test "$cross_compiling" = yes; then :
-  ac_cv_func_malloc_0_nonnull=no
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#if defined STDC_HEADERS || defined HAVE_STDLIB_H
-# include <stdlib.h>
-#else
-char *malloc ();
-#endif
-
-int
-main ()
-{
-return ! malloc (0);
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
-  ac_cv_func_malloc_0_nonnull=yes
-else
-  ac_cv_func_malloc_0_nonnull=no
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
-fi
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_malloc_0_nonnull" >&5
-$as_echo "$ac_cv_func_malloc_0_nonnull" >&6; }
-if test $ac_cv_func_malloc_0_nonnull = yes; then :
-
-$as_echo "#define HAVE_MALLOC 1" >>confdefs.h
-
-else
-  $as_echo "#define HAVE_MALLOC 0" >>confdefs.h
-
-   case " $LIBOBJS " in
-  *" malloc.$ac_objext "* ) ;;
-  *) LIBOBJS="$LIBOBJS malloc.$ac_objext"
- ;;
-esac
-
-
-$as_echo "#define malloc rpl_malloc" >>confdefs.h
-
-fi
-
-
-for ac_header in stdlib.h
-do :
-  ac_fn_c_check_header_mongrel "$LINENO" "stdlib.h" "ac_cv_header_stdlib_h" "$ac_includes_default"
-if test "x$ac_cv_header_stdlib_h" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_STDLIB_H 1
-_ACEOF
-
-fi
-
-done
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU libc compatible realloc" >&5
-$as_echo_n "checking for GNU libc compatible realloc... " >&6; }
-if ${ac_cv_func_realloc_0_nonnull+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test "$cross_compiling" = yes; then :
-  ac_cv_func_realloc_0_nonnull=no
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#if defined STDC_HEADERS || defined HAVE_STDLIB_H
-# include <stdlib.h>
-#else
-char *realloc ();
-#endif
-
-int
-main ()
-{
-return ! realloc (0, 0);
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
-  ac_cv_func_realloc_0_nonnull=yes
-else
-  ac_cv_func_realloc_0_nonnull=no
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
-fi
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_realloc_0_nonnull" >&5
-$as_echo "$ac_cv_func_realloc_0_nonnull" >&6; }
-if test $ac_cv_func_realloc_0_nonnull = yes; then :
-
-$as_echo "#define HAVE_REALLOC 1" >>confdefs.h
-
-else
-  $as_echo "#define HAVE_REALLOC 0" >>confdefs.h
-
-   case " $LIBOBJS " in
-  *" realloc.$ac_objext "* ) ;;
-  *) LIBOBJS="$LIBOBJS realloc.$ac_objext"
- ;;
-esac
-
-
-$as_echo "#define realloc rpl_realloc" >>confdefs.h
-
-fi
-
-
-for ac_func in clock_gettime floor gettimeofday inet_ntoa memmove memset select socket sqrt strcasecmp strchr strerror strncasecmp strstr strtol strtoul uname
-do :
-  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
-  cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
-
-fi
-done
-
-
-ac_config_files="$ac_config_files Makefile"
-
-cat >confcache <<\_ACEOF
-# This file is a shell script that caches the results of configure
-# tests run on this system so they can be shared between configure
-# scripts and configure runs, see configure's option --config-cache.
-# It is not useful on other systems.  If it contains results you don't
-# want to keep, you may remove or edit it.
-#
-# config.status only pays attention to the cache file if you give it
-# the --recheck option to rerun configure.
-#
-# `ac_cv_env_foo' variables (set or unset) will be overridden when
-# loading this file, other *unset* `ac_cv_foo' will be assigned the
-# following values.
-
-_ACEOF
-
-# The following way of writing the cache mishandles newlines in values,
-# but we know of no workaround that is simple, portable, and efficient.
-# So, we kill variables containing newlines.
-# Ultrix sh set writes to stderr and can't be redirected directly,
-# and sets the high bit in the cache file unless we assign to the vars.
-(
-  for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do
-    eval ac_val=\$$ac_var
-    case $ac_val in #(
-    *${as_nl}*)
-      case $ac_var in #(
-      *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
-$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
-      esac
-      case $ac_var in #(
-      _ | IFS | as_nl) ;; #(
-      BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
-      *) { eval $ac_var=; unset $ac_var;} ;;
-      esac ;;
-    esac
-  done
-
-  (set) 2>&1 |
-    case $as_nl`(ac_space=' '; set) 2>&1` in #(
-    *${as_nl}ac_space=\ *)
-      # `set' does not quote correctly, so add quotes: double-quote
-      # substitution turns \\\\ into \\, and sed turns \\ into \.
-      sed -n \
-	"s/'/'\\\\''/g;
-	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
-      ;; #(
-    *)
-      # `set' quotes correctly as required by POSIX, so do not add quotes.
-      sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
-      ;;
-    esac |
-    sort
-) |
-  sed '
-     /^ac_cv_env_/b end
-     t clear
-     :clear
-     s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
-     t end
-     s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
-     :end' >>confcache
-if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
-  if test -w "$cache_file"; then
-    if test "x$cache_file" != "x/dev/null"; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
-$as_echo "$as_me: updating cache $cache_file" >&6;}
-      if test ! -f "$cache_file" || test -h "$cache_file"; then
-	cat confcache >"$cache_file"
-      else
-        case $cache_file in #(
-        */* | ?:*)
-	  mv -f confcache "$cache_file"$$ &&
-	  mv -f "$cache_file"$$ "$cache_file" ;; #(
-        *)
-	  mv -f confcache "$cache_file" ;;
-	esac
-      fi
-    fi
-  else
-    { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
-$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
-  fi
-fi
-rm -f confcache
-
-test "x$prefix" = xNONE && prefix=$ac_default_prefix
-# Let make expand exec_prefix.
-test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
-
-DEFS=-DHAVE_CONFIG_H
-
-ac_libobjs=
-ac_ltlibobjs=
-U=
-for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
-  # 1. Remove the extension, and $U if already installed.
-  ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
-  ac_i=`$as_echo "$ac_i" | sed "$ac_script"`
-  # 2. Prepend LIBOBJDIR.  When used with automake>=1.10 LIBOBJDIR
-  #    will be set to the directory where LIBOBJS objects are built.
-  as_fn_append ac_libobjs " \${LIBOBJDIR}$ac_i\$U.$ac_objext"
-  as_fn_append ac_ltlibobjs " \${LIBOBJDIR}$ac_i"'$U.lo'
-done
-LIBOBJS=$ac_libobjs
-
-LTLIBOBJS=$ac_ltlibobjs
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking that generated files are newer than configure" >&5
-$as_echo_n "checking that generated files are newer than configure... " >&6; }
-   if test -n "$am_sleep_pid"; then
-     # Hide warnings about reused PIDs.
-     wait $am_sleep_pid 2>/dev/null
-   fi
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: done" >&5
-$as_echo "done" >&6; }
- if test -n "$EXEEXT"; then
-  am__EXEEXT_TRUE=
-  am__EXEEXT_FALSE='#'
-else
-  am__EXEEXT_TRUE='#'
-  am__EXEEXT_FALSE=
-fi
-
-if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
-  as_fn_error $? "conditional \"AMDEP\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
-  as_fn_error $? "conditional \"am__fastdepCC\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then
-  as_fn_error $? "conditional \"am__fastdepCXX\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
-  as_fn_error $? "conditional \"am__fastdepCC\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${am__fastdepOBJCXX_TRUE}" && test -z "${am__fastdepOBJCXX_FALSE}"; then
-  as_fn_error $? "conditional \"am__fastdepOBJCXX\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${am__fastdepCCAS_TRUE}" && test -z "${am__fastdepCCAS_FALSE}"; then
-  as_fn_error $? "conditional \"am__fastdepCCAS\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${TARGET_CPU_X86_TRUE}" && test -z "${TARGET_CPU_X86_FALSE}"; then
-  as_fn_error $? "conditional \"TARGET_CPU_X86\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${TARGET_CPU_ARM_TRUE}" && test -z "${TARGET_CPU_ARM_FALSE}"; then
-  as_fn_error $? "conditional \"TARGET_CPU_ARM\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${TARGET_CPU_ARMV7_TRUE}" && test -z "${TARGET_CPU_ARMV7_FALSE}"; then
-  as_fn_error $? "conditional \"TARGET_CPU_ARMV7\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${TARGET_OS_OSX_TRUE}" && test -z "${TARGET_OS_OSX_FALSE}"; then
-  as_fn_error $? "conditional \"TARGET_OS_OSX\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${ENABLE_AUDIO_CALLBACK_TRUE}" && test -z "${ENABLE_AUDIO_CALLBACK_FALSE}"; then
-  as_fn_error $? "conditional \"ENABLE_AUDIO_CALLBACK\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${WITH_PULSE_TRUE}" && test -z "${WITH_PULSE_FALSE}"; then
-  as_fn_error $? "conditional \"WITH_PULSE\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${WITH_ALSA_TRUE}" && test -z "${WITH_ALSA_FALSE}"; then
-  as_fn_error $? "conditional \"WITH_ALSA\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${ENABLE_DSP_TRUE}" && test -z "${ENABLE_DSP_FALSE}"; then
-  as_fn_error $? "conditional \"ENABLE_DSP\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-
-: "${CONFIG_STATUS=./config.status}"
-ac_write_fail=0
-ac_clean_files_save=$ac_clean_files
-ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-{ $as_echo "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5
-$as_echo "$as_me: creating $CONFIG_STATUS" >&6;}
-as_write_fail=0
-cat >$CONFIG_STATUS <<_ASEOF || as_write_fail=1
-#! $SHELL
-# Generated by $as_me.
-# Run this file to recreate the current configuration.
-# Compiler output produced by configure, useful for debugging
-# configure, is in config.log if it exists.
-
-debug=false
-ac_cs_recheck=false
-ac_cs_silent=false
-
-SHELL=\${CONFIG_SHELL-$SHELL}
-export SHELL
-_ASEOF
-cat >>$CONFIG_STATUS <<\_ASEOF || as_write_fail=1
-## -------------------- ##
-## M4sh Initialization. ##
-## -------------------- ##
-
-# Be more Bourne compatible
-DUALCASE=1; export DUALCASE # for MKS sh
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
-  emulate sh
-  NULLCMD=:
-  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
-  # is contrary to our usage.  Disable this feature.
-  alias -g '${1+"$@"}'='"$@"'
-  setopt NO_GLOB_SUBST
-else
-  case `(set -o) 2>/dev/null` in #(
-  *posix*) :
-    set -o posix ;; #(
-  *) :
-     ;;
-esac
-fi
-
-
-as_nl='
-'
-export as_nl
-# Printing a long string crashes Solaris 7 /usr/bin/printf.
-as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
-as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
-as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
-# Prefer a ksh shell builtin over an external printf program on Solaris,
-# but without wasting forks for bash or zsh.
-if test -z "$BASH_VERSION$ZSH_VERSION" \
-    && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
-  as_echo='print -r --'
-  as_echo_n='print -rn --'
-elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
-  as_echo='printf %s\n'
-  as_echo_n='printf %s'
-else
-  if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
-    as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
-    as_echo_n='/usr/ucb/echo -n'
-  else
-    as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
-    as_echo_n_body='eval
-      arg=$1;
-      case $arg in #(
-      *"$as_nl"*)
-	expr "X$arg" : "X\\(.*\\)$as_nl";
-	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
-      esac;
-      expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
-    '
-    export as_echo_n_body
-    as_echo_n='sh -c $as_echo_n_body as_echo'
-  fi
-  export as_echo_body
-  as_echo='sh -c $as_echo_body as_echo'
-fi
-
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
-  PATH_SEPARATOR=:
-  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
-    (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
-      PATH_SEPARATOR=';'
-  }
-fi
-
-
-# IFS
-# We need space, tab and new line, in precisely that order.  Quoting is
-# there to prevent editors from complaining about space-tab.
-# (If _AS_PATH_WALK were called with IFS unset, it would disable word
-# splitting by setting IFS to empty value.)
-IFS=" ""	$as_nl"
-
-# Find who we are.  Look in the path if we contain no directory separator.
-as_myself=
-case $0 in #((
-  *[\\/]* ) as_myself=$0 ;;
-  *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
-  done
-IFS=$as_save_IFS
-
-     ;;
-esac
-# We did not find ourselves, most probably we were run as `sh COMMAND'
-# in which case we are not to be found in the path.
-if test "x$as_myself" = x; then
-  as_myself=$0
-fi
-if test ! -f "$as_myself"; then
-  $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
-  exit 1
-fi
-
-# Unset variables that we do not need and which cause bugs (e.g. in
-# pre-3.0 UWIN ksh).  But do not cause bugs in bash 2.01; the "|| exit 1"
-# suppresses any "Segmentation fault" message there.  '((' could
-# trigger a bug in pdksh 5.2.14.
-for as_var in BASH_ENV ENV MAIL MAILPATH
-do eval test x\${$as_var+set} = xset \
-  && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
-done
-PS1='$ '
-PS2='> '
-PS4='+ '
-
-# NLS nuisances.
-LC_ALL=C
-export LC_ALL
-LANGUAGE=C
-export LANGUAGE
-
-# CDPATH.
-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
-
-
-# as_fn_error STATUS ERROR [LINENO LOG_FD]
-# ----------------------------------------
-# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
-# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
-# script with STATUS, using 1 if that was 0.
-as_fn_error ()
-{
-  as_status=$1; test $as_status -eq 0 && as_status=1
-  if test "$4"; then
-    as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-    $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
-  fi
-  $as_echo "$as_me: error: $2" >&2
-  as_fn_exit $as_status
-} # as_fn_error
-
-
-# as_fn_set_status STATUS
-# -----------------------
-# Set $? to STATUS, without forking.
-as_fn_set_status ()
-{
-  return $1
-} # as_fn_set_status
-
-# as_fn_exit STATUS
-# -----------------
-# Exit the shell with STATUS, even in a "trap 0" or "set -e" context.
-as_fn_exit ()
-{
-  set +e
-  as_fn_set_status $1
-  exit $1
-} # as_fn_exit
-
-# as_fn_unset VAR
-# ---------------
-# Portably unset VAR.
-as_fn_unset ()
-{
-  { eval $1=; unset $1;}
-}
-as_unset=as_fn_unset
-# as_fn_append VAR VALUE
-# ----------------------
-# Append the text in VALUE to the end of the definition contained in VAR. Take
-# advantage of any shell optimizations that allow amortized linear growth over
-# repeated appends, instead of the typical quadratic growth present in naive
-# implementations.
-if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then :
-  eval 'as_fn_append ()
-  {
-    eval $1+=\$2
-  }'
-else
-  as_fn_append ()
-  {
-    eval $1=\$$1\$2
-  }
-fi # as_fn_append
-
-# as_fn_arith ARG...
-# ------------------
-# Perform arithmetic evaluation on the ARGs, and store the result in the
-# global $as_val. Take advantage of shells that can avoid forks. The arguments
-# must be portable across $(()) and expr.
-if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
-  eval 'as_fn_arith ()
-  {
-    as_val=$(( $* ))
-  }'
-else
-  as_fn_arith ()
-  {
-    as_val=`expr "$@" || test $? -eq 1`
-  }
-fi # as_fn_arith
-
-
-if expr a : '\(a\)' >/dev/null 2>&1 &&
-   test "X`expr 00001 : '.*\(...\)'`" = X001; then
-  as_expr=expr
-else
-  as_expr=false
-fi
-
-if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
-  as_basename=basename
-else
-  as_basename=false
-fi
-
-if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
-  as_dirname=dirname
-else
-  as_dirname=false
-fi
-
-as_me=`$as_basename -- "$0" ||
-$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
-	 X"$0" : 'X\(//\)$' \| \
-	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X/"$0" |
-    sed '/^.*\/\([^/][^/]*\)\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\/\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\/\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-
-# Avoid depending upon Character Ranges.
-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
-as_cr_digits='0123456789'
-as_cr_alnum=$as_cr_Letters$as_cr_digits
-
-ECHO_C= ECHO_N= ECHO_T=
-case `echo -n x` in #(((((
--n*)
-  case `echo 'xy\c'` in
-  *c*) ECHO_T='	';;	# ECHO_T is single tab character.
-  xy)  ECHO_C='\c';;
-  *)   echo `echo ksh88 bug on AIX 6.1` > /dev/null
-       ECHO_T='	';;
-  esac;;
-*)
-  ECHO_N='-n';;
-esac
-
-rm -f conf$$ conf$$.exe conf$$.file
-if test -d conf$$.dir; then
-  rm -f conf$$.dir/conf$$.file
-else
-  rm -f conf$$.dir
-  mkdir conf$$.dir 2>/dev/null
-fi
-if (echo >conf$$.file) 2>/dev/null; then
-  if ln -s conf$$.file conf$$ 2>/dev/null; then
-    as_ln_s='ln -s'
-    # ... but there are two gotchas:
-    # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
-    # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-    # In both cases, we have to default to `cp -pR'.
-    ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
-      as_ln_s='cp -pR'
-  elif ln conf$$.file conf$$ 2>/dev/null; then
-    as_ln_s=ln
-  else
-    as_ln_s='cp -pR'
-  fi
-else
-  as_ln_s='cp -pR'
-fi
-rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
-rmdir conf$$.dir 2>/dev/null
-
-
-# as_fn_mkdir_p
-# -------------
-# Create "$as_dir" as a directory, including parents if necessary.
-as_fn_mkdir_p ()
-{
-
-  case $as_dir in #(
-  -*) as_dir=./$as_dir;;
-  esac
-  test -d "$as_dir" || eval $as_mkdir_p || {
-    as_dirs=
-    while :; do
-      case $as_dir in #(
-      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
-      *) as_qdir=$as_dir;;
-      esac
-      as_dirs="'$as_qdir' $as_dirs"
-      as_dir=`$as_dirname -- "$as_dir" ||
-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$as_dir" : 'X\(//\)[^/]' \| \
-	 X"$as_dir" : 'X\(//\)$' \| \
-	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$as_dir" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)[^/].*/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-      test -d "$as_dir" && break
-    done
-    test -z "$as_dirs" || eval "mkdir $as_dirs"
-  } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
-
-
-} # as_fn_mkdir_p
-if mkdir -p . 2>/dev/null; then
-  as_mkdir_p='mkdir -p "$as_dir"'
-else
-  test -d ./-p && rmdir ./-p
-  as_mkdir_p=false
-fi
-
-
-# as_fn_executable_p FILE
-# -----------------------
-# Test if FILE is an executable regular file.
-as_fn_executable_p ()
-{
-  test -f "$1" && test -x "$1"
-} # as_fn_executable_p
-as_test_x='test -x'
-as_executable_p=as_fn_executable_p
-
-# Sed expression to map a string onto a valid CPP name.
-as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
-
-# Sed expression to map a string onto a valid variable name.
-as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
-
-
-exec 6>&1
-## ----------------------------------- ##
-## Main body of $CONFIG_STATUS script. ##
-## ----------------------------------- ##
-_ASEOF
-test $as_write_fail = 0 && chmod +x $CONFIG_STATUS || ac_write_fail=1
-
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-# Save the log message, to keep $0 and so on meaningful, and to
-# report actual input values of CONFIG_FILES etc. instead of their
-# values after options handling.
-ac_log="
-This file was extended by libtgvoip $as_me 2.4.4, which was
-generated by GNU Autoconf 2.69.  Invocation command line was
-
-  CONFIG_FILES    = $CONFIG_FILES
-  CONFIG_HEADERS  = $CONFIG_HEADERS
-  CONFIG_LINKS    = $CONFIG_LINKS
-  CONFIG_COMMANDS = $CONFIG_COMMANDS
-  $ $0 $@
-
-on `(hostname || uname -n) 2>/dev/null | sed 1q`
-"
-
-_ACEOF
-
-case $ac_config_files in *"
-"*) set x $ac_config_files; shift; ac_config_files=$*;;
-esac
-
-case $ac_config_headers in *"
-"*) set x $ac_config_headers; shift; ac_config_headers=$*;;
-esac
-
-
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-# Files that config.status was made for.
-config_files="$ac_config_files"
-config_headers="$ac_config_headers"
-config_commands="$ac_config_commands"
-
-_ACEOF
-
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-ac_cs_usage="\
-\`$as_me' instantiates files and other configuration actions
-from templates according to the current configuration.  Unless the files
-and actions are specified as TAGs, all are instantiated by default.
-
-Usage: $0 [OPTION]... [TAG]...
-
-  -h, --help       print this help, then exit
-  -V, --version    print version number and configuration settings, then exit
-      --config     print configuration, then exit
-  -q, --quiet, --silent
-                   do not print progress messages
-  -d, --debug      don't remove temporary files
-      --recheck    update $as_me by reconfiguring in the same conditions
-      --file=FILE[:TEMPLATE]
-                   instantiate the configuration file FILE
-      --header=FILE[:TEMPLATE]
-                   instantiate the configuration header FILE
-
-Configuration files:
-$config_files
-
-Configuration headers:
-$config_headers
-
-Configuration commands:
-$config_commands
-
-Report bugs to <https://github.com/grishka/libtgvoip/issues>."
-
-_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
-ac_cs_version="\\
-libtgvoip config.status 2.4.4
-configured by $0, generated by GNU Autoconf 2.69,
-  with options \\"\$ac_cs_config\\"
-
-Copyright (C) 2012 Free Software Foundation, Inc.
-This config.status script is free software; the Free Software Foundation
-gives unlimited permission to copy, distribute and modify it."
-
-ac_pwd='$ac_pwd'
-srcdir='$srcdir'
-INSTALL='$INSTALL'
-MKDIR_P='$MKDIR_P'
-AWK='$AWK'
-test -n "\$AWK" || AWK=awk
-_ACEOF
-
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-# The default lists apply if the user does not specify any file.
-ac_need_defaults=:
-while test $# != 0
-do
-  case $1 in
-  --*=?*)
-    ac_option=`expr "X$1" : 'X\([^=]*\)='`
-    ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'`
-    ac_shift=:
-    ;;
-  --*=)
-    ac_option=`expr "X$1" : 'X\([^=]*\)='`
-    ac_optarg=
-    ac_shift=:
-    ;;
-  *)
-    ac_option=$1
-    ac_optarg=$2
-    ac_shift=shift
-    ;;
-  esac
-
-  case $ac_option in
-  # Handling of the options.
-  -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
-    ac_cs_recheck=: ;;
-  --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
-    $as_echo "$ac_cs_version"; exit ;;
-  --config | --confi | --conf | --con | --co | --c )
-    $as_echo "$ac_cs_config"; exit ;;
-  --debug | --debu | --deb | --de | --d | -d )
-    debug=: ;;
-  --file | --fil | --fi | --f )
-    $ac_shift
-    case $ac_optarg in
-    *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
-    '') as_fn_error $? "missing file argument" ;;
-    esac
-    as_fn_append CONFIG_FILES " '$ac_optarg'"
-    ac_need_defaults=false;;
-  --header | --heade | --head | --hea )
-    $ac_shift
-    case $ac_optarg in
-    *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
-    esac
-    as_fn_append CONFIG_HEADERS " '$ac_optarg'"
-    ac_need_defaults=false;;
-  --he | --h)
-    # Conflict between --help and --header
-    as_fn_error $? "ambiguous option: \`$1'
-Try \`$0 --help' for more information.";;
-  --help | --hel | -h )
-    $as_echo "$ac_cs_usage"; exit ;;
-  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-  | -silent | --silent | --silen | --sile | --sil | --si | --s)
-    ac_cs_silent=: ;;
-
-  # This is an error.
-  -*) as_fn_error $? "unrecognized option: \`$1'
-Try \`$0 --help' for more information." ;;
-
-  *) as_fn_append ac_config_targets " $1"
-     ac_need_defaults=false ;;
-
-  esac
-  shift
-done
-
-ac_configure_extra_args=
-
-if $ac_cs_silent; then
-  exec 6>/dev/null
-  ac_configure_extra_args="$ac_configure_extra_args --silent"
-fi
-
-_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-if \$ac_cs_recheck; then
-  set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
-  shift
-  \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6
-  CONFIG_SHELL='$SHELL'
-  export CONFIG_SHELL
-  exec "\$@"
-fi
-
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-exec 5>>config.log
-{
-  echo
-  sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
-## Running $as_me. ##
-_ASBOX
-  $as_echo "$ac_log"
-} >&5
-
-_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-#
-# INIT-COMMANDS
-#
-AMDEP_TRUE="$AMDEP_TRUE" MAKE="${MAKE-make}"
-
-
-# The HP-UX ksh and POSIX shell print the target directory to stdout
-# if CDPATH is set.
-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
-
-sed_quote_subst='$sed_quote_subst'
-double_quote_subst='$double_quote_subst'
-delay_variable_subst='$delay_variable_subst'
-macro_version='`$ECHO "$macro_version" | $SED "$delay_single_quote_subst"`'
-macro_revision='`$ECHO "$macro_revision" | $SED "$delay_single_quote_subst"`'
-enable_shared='`$ECHO "$enable_shared" | $SED "$delay_single_quote_subst"`'
-enable_static='`$ECHO "$enable_static" | $SED "$delay_single_quote_subst"`'
-pic_mode='`$ECHO "$pic_mode" | $SED "$delay_single_quote_subst"`'
-enable_fast_install='`$ECHO "$enable_fast_install" | $SED "$delay_single_quote_subst"`'
-shared_archive_member_spec='`$ECHO "$shared_archive_member_spec" | $SED "$delay_single_quote_subst"`'
-SHELL='`$ECHO "$SHELL" | $SED "$delay_single_quote_subst"`'
-ECHO='`$ECHO "$ECHO" | $SED "$delay_single_quote_subst"`'
-PATH_SEPARATOR='`$ECHO "$PATH_SEPARATOR" | $SED "$delay_single_quote_subst"`'
-host_alias='`$ECHO "$host_alias" | $SED "$delay_single_quote_subst"`'
-host='`$ECHO "$host" | $SED "$delay_single_quote_subst"`'
-host_os='`$ECHO "$host_os" | $SED "$delay_single_quote_subst"`'
-build_alias='`$ECHO "$build_alias" | $SED "$delay_single_quote_subst"`'
-build='`$ECHO "$build" | $SED "$delay_single_quote_subst"`'
-build_os='`$ECHO "$build_os" | $SED "$delay_single_quote_subst"`'
-SED='`$ECHO "$SED" | $SED "$delay_single_quote_subst"`'
-Xsed='`$ECHO "$Xsed" | $SED "$delay_single_quote_subst"`'
-GREP='`$ECHO "$GREP" | $SED "$delay_single_quote_subst"`'
-EGREP='`$ECHO "$EGREP" | $SED "$delay_single_quote_subst"`'
-FGREP='`$ECHO "$FGREP" | $SED "$delay_single_quote_subst"`'
-LD='`$ECHO "$LD" | $SED "$delay_single_quote_subst"`'
-NM='`$ECHO "$NM" | $SED "$delay_single_quote_subst"`'
-LN_S='`$ECHO "$LN_S" | $SED "$delay_single_quote_subst"`'
-max_cmd_len='`$ECHO "$max_cmd_len" | $SED "$delay_single_quote_subst"`'
-ac_objext='`$ECHO "$ac_objext" | $SED "$delay_single_quote_subst"`'
-exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`'
-lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`'
-lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`'
-lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`'
-lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`'
-lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`'
-reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`'
-reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`'
-OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`'
-deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`'
-file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`'
-file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`'
-want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`'
-DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`'
-sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`'
-AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`'
-lt_ar_flags='`$ECHO "$lt_ar_flags" | $SED "$delay_single_quote_subst"`'
-AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`'
-archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`'
-STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`'
-RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`'
-old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`'
-old_postuninstall_cmds='`$ECHO "$old_postuninstall_cmds" | $SED "$delay_single_quote_subst"`'
-old_archive_cmds='`$ECHO "$old_archive_cmds" | $SED "$delay_single_quote_subst"`'
-lock_old_archive_extraction='`$ECHO "$lock_old_archive_extraction" | $SED "$delay_single_quote_subst"`'
-CC='`$ECHO "$CC" | $SED "$delay_single_quote_subst"`'
-CFLAGS='`$ECHO "$CFLAGS" | $SED "$delay_single_quote_subst"`'
-compiler='`$ECHO "$compiler" | $SED "$delay_single_quote_subst"`'
-GCC='`$ECHO "$GCC" | $SED "$delay_single_quote_subst"`'
-lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$delay_single_quote_subst"`'
-lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`'
-lt_cv_sys_global_symbol_to_import='`$ECHO "$lt_cv_sys_global_symbol_to_import" | $SED "$delay_single_quote_subst"`'
-lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`'
-lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`'
-lt_cv_nm_interface='`$ECHO "$lt_cv_nm_interface" | $SED "$delay_single_quote_subst"`'
-nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`'
-lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`'
-lt_cv_truncate_bin='`$ECHO "$lt_cv_truncate_bin" | $SED "$delay_single_quote_subst"`'
-objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`'
-MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`'
-lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`'
-lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`'
-lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`'
-lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`'
-lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`'
-need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`'
-MANIFEST_TOOL='`$ECHO "$MANIFEST_TOOL" | $SED "$delay_single_quote_subst"`'
-DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`'
-NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`'
-LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`'
-OTOOL='`$ECHO "$OTOOL" | $SED "$delay_single_quote_subst"`'
-OTOOL64='`$ECHO "$OTOOL64" | $SED "$delay_single_quote_subst"`'
-libext='`$ECHO "$libext" | $SED "$delay_single_quote_subst"`'
-shrext_cmds='`$ECHO "$shrext_cmds" | $SED "$delay_single_quote_subst"`'
-extract_expsyms_cmds='`$ECHO "$extract_expsyms_cmds" | $SED "$delay_single_quote_subst"`'
-archive_cmds_need_lc='`$ECHO "$archive_cmds_need_lc" | $SED "$delay_single_quote_subst"`'
-enable_shared_with_static_runtimes='`$ECHO "$enable_shared_with_static_runtimes" | $SED "$delay_single_quote_subst"`'
-export_dynamic_flag_spec='`$ECHO "$export_dynamic_flag_spec" | $SED "$delay_single_quote_subst"`'
-whole_archive_flag_spec='`$ECHO "$whole_archive_flag_spec" | $SED "$delay_single_quote_subst"`'
-compiler_needs_object='`$ECHO "$compiler_needs_object" | $SED "$delay_single_quote_subst"`'
-old_archive_from_new_cmds='`$ECHO "$old_archive_from_new_cmds" | $SED "$delay_single_quote_subst"`'
-old_archive_from_expsyms_cmds='`$ECHO "$old_archive_from_expsyms_cmds" | $SED "$delay_single_quote_subst"`'
-archive_cmds='`$ECHO "$archive_cmds" | $SED "$delay_single_quote_subst"`'
-archive_expsym_cmds='`$ECHO "$archive_expsym_cmds" | $SED "$delay_single_quote_subst"`'
-module_cmds='`$ECHO "$module_cmds" | $SED "$delay_single_quote_subst"`'
-module_expsym_cmds='`$ECHO "$module_expsym_cmds" | $SED "$delay_single_quote_subst"`'
-with_gnu_ld='`$ECHO "$with_gnu_ld" | $SED "$delay_single_quote_subst"`'
-allow_undefined_flag='`$ECHO "$allow_undefined_flag" | $SED "$delay_single_quote_subst"`'
-no_undefined_flag='`$ECHO "$no_undefined_flag" | $SED "$delay_single_quote_subst"`'
-hardcode_libdir_flag_spec='`$ECHO "$hardcode_libdir_flag_spec" | $SED "$delay_single_quote_subst"`'
-hardcode_libdir_separator='`$ECHO "$hardcode_libdir_separator" | $SED "$delay_single_quote_subst"`'
-hardcode_direct='`$ECHO "$hardcode_direct" | $SED "$delay_single_quote_subst"`'
-hardcode_direct_absolute='`$ECHO "$hardcode_direct_absolute" | $SED "$delay_single_quote_subst"`'
-hardcode_minus_L='`$ECHO "$hardcode_minus_L" | $SED "$delay_single_quote_subst"`'
-hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_quote_subst"`'
-hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`'
-inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`'
-link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`'
-always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`'
-export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`'
-exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`'
-include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`'
-prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`'
-postlink_cmds='`$ECHO "$postlink_cmds" | $SED "$delay_single_quote_subst"`'
-file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`'
-variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`'
-need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`'
-need_version='`$ECHO "$need_version" | $SED "$delay_single_quote_subst"`'
-version_type='`$ECHO "$version_type" | $SED "$delay_single_quote_subst"`'
-runpath_var='`$ECHO "$runpath_var" | $SED "$delay_single_quote_subst"`'
-shlibpath_var='`$ECHO "$shlibpath_var" | $SED "$delay_single_quote_subst"`'
-shlibpath_overrides_runpath='`$ECHO "$shlibpath_overrides_runpath" | $SED "$delay_single_quote_subst"`'
-libname_spec='`$ECHO "$libname_spec" | $SED "$delay_single_quote_subst"`'
-library_names_spec='`$ECHO "$library_names_spec" | $SED "$delay_single_quote_subst"`'
-soname_spec='`$ECHO "$soname_spec" | $SED "$delay_single_quote_subst"`'
-install_override_mode='`$ECHO "$install_override_mode" | $SED "$delay_single_quote_subst"`'
-postinstall_cmds='`$ECHO "$postinstall_cmds" | $SED "$delay_single_quote_subst"`'
-postuninstall_cmds='`$ECHO "$postuninstall_cmds" | $SED "$delay_single_quote_subst"`'
-finish_cmds='`$ECHO "$finish_cmds" | $SED "$delay_single_quote_subst"`'
-finish_eval='`$ECHO "$finish_eval" | $SED "$delay_single_quote_subst"`'
-hardcode_into_libs='`$ECHO "$hardcode_into_libs" | $SED "$delay_single_quote_subst"`'
-sys_lib_search_path_spec='`$ECHO "$sys_lib_search_path_spec" | $SED "$delay_single_quote_subst"`'
-configure_time_dlsearch_path='`$ECHO "$configure_time_dlsearch_path" | $SED "$delay_single_quote_subst"`'
-configure_time_lt_sys_library_path='`$ECHO "$configure_time_lt_sys_library_path" | $SED "$delay_single_quote_subst"`'
-hardcode_action='`$ECHO "$hardcode_action" | $SED "$delay_single_quote_subst"`'
-enable_dlopen='`$ECHO "$enable_dlopen" | $SED "$delay_single_quote_subst"`'
-enable_dlopen_self='`$ECHO "$enable_dlopen_self" | $SED "$delay_single_quote_subst"`'
-enable_dlopen_self_static='`$ECHO "$enable_dlopen_self_static" | $SED "$delay_single_quote_subst"`'
-old_striplib='`$ECHO "$old_striplib" | $SED "$delay_single_quote_subst"`'
-striplib='`$ECHO "$striplib" | $SED "$delay_single_quote_subst"`'
-compiler_lib_search_dirs='`$ECHO "$compiler_lib_search_dirs" | $SED "$delay_single_quote_subst"`'
-predep_objects='`$ECHO "$predep_objects" | $SED "$delay_single_quote_subst"`'
-postdep_objects='`$ECHO "$postdep_objects" | $SED "$delay_single_quote_subst"`'
-predeps='`$ECHO "$predeps" | $SED "$delay_single_quote_subst"`'
-postdeps='`$ECHO "$postdeps" | $SED "$delay_single_quote_subst"`'
-compiler_lib_search_path='`$ECHO "$compiler_lib_search_path" | $SED "$delay_single_quote_subst"`'
-LD_CXX='`$ECHO "$LD_CXX" | $SED "$delay_single_quote_subst"`'
-reload_flag_CXX='`$ECHO "$reload_flag_CXX" | $SED "$delay_single_quote_subst"`'
-reload_cmds_CXX='`$ECHO "$reload_cmds_CXX" | $SED "$delay_single_quote_subst"`'
-old_archive_cmds_CXX='`$ECHO "$old_archive_cmds_CXX" | $SED "$delay_single_quote_subst"`'
-compiler_CXX='`$ECHO "$compiler_CXX" | $SED "$delay_single_quote_subst"`'
-GCC_CXX='`$ECHO "$GCC_CXX" | $SED "$delay_single_quote_subst"`'
-lt_prog_compiler_no_builtin_flag_CXX='`$ECHO "$lt_prog_compiler_no_builtin_flag_CXX" | $SED "$delay_single_quote_subst"`'
-lt_prog_compiler_pic_CXX='`$ECHO "$lt_prog_compiler_pic_CXX" | $SED "$delay_single_quote_subst"`'
-lt_prog_compiler_wl_CXX='`$ECHO "$lt_prog_compiler_wl_CXX" | $SED "$delay_single_quote_subst"`'
-lt_prog_compiler_static_CXX='`$ECHO "$lt_prog_compiler_static_CXX" | $SED "$delay_single_quote_subst"`'
-lt_cv_prog_compiler_c_o_CXX='`$ECHO "$lt_cv_prog_compiler_c_o_CXX" | $SED "$delay_single_quote_subst"`'
-archive_cmds_need_lc_CXX='`$ECHO "$archive_cmds_need_lc_CXX" | $SED "$delay_single_quote_subst"`'
-enable_shared_with_static_runtimes_CXX='`$ECHO "$enable_shared_with_static_runtimes_CXX" | $SED "$delay_single_quote_subst"`'
-export_dynamic_flag_spec_CXX='`$ECHO "$export_dynamic_flag_spec_CXX" | $SED "$delay_single_quote_subst"`'
-whole_archive_flag_spec_CXX='`$ECHO "$whole_archive_flag_spec_CXX" | $SED "$delay_single_quote_subst"`'
-compiler_needs_object_CXX='`$ECHO "$compiler_needs_object_CXX" | $SED "$delay_single_quote_subst"`'
-old_archive_from_new_cmds_CXX='`$ECHO "$old_archive_from_new_cmds_CXX" | $SED "$delay_single_quote_subst"`'
-old_archive_from_expsyms_cmds_CXX='`$ECHO "$old_archive_from_expsyms_cmds_CXX" | $SED "$delay_single_quote_subst"`'
-archive_cmds_CXX='`$ECHO "$archive_cmds_CXX" | $SED "$delay_single_quote_subst"`'
-archive_expsym_cmds_CXX='`$ECHO "$archive_expsym_cmds_CXX" | $SED "$delay_single_quote_subst"`'
-module_cmds_CXX='`$ECHO "$module_cmds_CXX" | $SED "$delay_single_quote_subst"`'
-module_expsym_cmds_CXX='`$ECHO "$module_expsym_cmds_CXX" | $SED "$delay_single_quote_subst"`'
-with_gnu_ld_CXX='`$ECHO "$with_gnu_ld_CXX" | $SED "$delay_single_quote_subst"`'
-allow_undefined_flag_CXX='`$ECHO "$allow_undefined_flag_CXX" | $SED "$delay_single_quote_subst"`'
-no_undefined_flag_CXX='`$ECHO "$no_undefined_flag_CXX" | $SED "$delay_single_quote_subst"`'
-hardcode_libdir_flag_spec_CXX='`$ECHO "$hardcode_libdir_flag_spec_CXX" | $SED "$delay_single_quote_subst"`'
-hardcode_libdir_separator_CXX='`$ECHO "$hardcode_libdir_separator_CXX" | $SED "$delay_single_quote_subst"`'
-hardcode_direct_CXX='`$ECHO "$hardcode_direct_CXX" | $SED "$delay_single_quote_subst"`'
-hardcode_direct_absolute_CXX='`$ECHO "$hardcode_direct_absolute_CXX" | $SED "$delay_single_quote_subst"`'
-hardcode_minus_L_CXX='`$ECHO "$hardcode_minus_L_CXX" | $SED "$delay_single_quote_subst"`'
-hardcode_shlibpath_var_CXX='`$ECHO "$hardcode_shlibpath_var_CXX" | $SED "$delay_single_quote_subst"`'
-hardcode_automatic_CXX='`$ECHO "$hardcode_automatic_CXX" | $SED "$delay_single_quote_subst"`'
-inherit_rpath_CXX='`$ECHO "$inherit_rpath_CXX" | $SED "$delay_single_quote_subst"`'
-link_all_deplibs_CXX='`$ECHO "$link_all_deplibs_CXX" | $SED "$delay_single_quote_subst"`'
-always_export_symbols_CXX='`$ECHO "$always_export_symbols_CXX" | $SED "$delay_single_quote_subst"`'
-export_symbols_cmds_CXX='`$ECHO "$export_symbols_cmds_CXX" | $SED "$delay_single_quote_subst"`'
-exclude_expsyms_CXX='`$ECHO "$exclude_expsyms_CXX" | $SED "$delay_single_quote_subst"`'
-include_expsyms_CXX='`$ECHO "$include_expsyms_CXX" | $SED "$delay_single_quote_subst"`'
-prelink_cmds_CXX='`$ECHO "$prelink_cmds_CXX" | $SED "$delay_single_quote_subst"`'
-postlink_cmds_CXX='`$ECHO "$postlink_cmds_CXX" | $SED "$delay_single_quote_subst"`'
-file_list_spec_CXX='`$ECHO "$file_list_spec_CXX" | $SED "$delay_single_quote_subst"`'
-hardcode_action_CXX='`$ECHO "$hardcode_action_CXX" | $SED "$delay_single_quote_subst"`'
-compiler_lib_search_dirs_CXX='`$ECHO "$compiler_lib_search_dirs_CXX" | $SED "$delay_single_quote_subst"`'
-predep_objects_CXX='`$ECHO "$predep_objects_CXX" | $SED "$delay_single_quote_subst"`'
-postdep_objects_CXX='`$ECHO "$postdep_objects_CXX" | $SED "$delay_single_quote_subst"`'
-predeps_CXX='`$ECHO "$predeps_CXX" | $SED "$delay_single_quote_subst"`'
-postdeps_CXX='`$ECHO "$postdeps_CXX" | $SED "$delay_single_quote_subst"`'
-compiler_lib_search_path_CXX='`$ECHO "$compiler_lib_search_path_CXX" | $SED "$delay_single_quote_subst"`'
-
-LTCC='$LTCC'
-LTCFLAGS='$LTCFLAGS'
-compiler='$compiler_DEFAULT'
-
-# A function that is used when there is no print builtin or printf.
-func_fallback_echo ()
-{
-  eval 'cat <<_LTECHO_EOF
-\$1
-_LTECHO_EOF'
-}
-
-# Quote evaled strings.
-for var in SHELL \
-ECHO \
-PATH_SEPARATOR \
-SED \
-GREP \
-EGREP \
-FGREP \
-LD \
-NM \
-LN_S \
-lt_SP2NL \
-lt_NL2SP \
-reload_flag \
-OBJDUMP \
-deplibs_check_method \
-file_magic_cmd \
-file_magic_glob \
-want_nocaseglob \
-DLLTOOL \
-sharedlib_from_linklib_cmd \
-AR \
-archiver_list_spec \
-STRIP \
-RANLIB \
-CC \
-CFLAGS \
-compiler \
-lt_cv_sys_global_symbol_pipe \
-lt_cv_sys_global_symbol_to_cdecl \
-lt_cv_sys_global_symbol_to_import \
-lt_cv_sys_global_symbol_to_c_name_address \
-lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
-lt_cv_nm_interface \
-nm_file_list_spec \
-lt_cv_truncate_bin \
-lt_prog_compiler_no_builtin_flag \
-lt_prog_compiler_pic \
-lt_prog_compiler_wl \
-lt_prog_compiler_static \
-lt_cv_prog_compiler_c_o \
-need_locks \
-MANIFEST_TOOL \
-DSYMUTIL \
-NMEDIT \
-LIPO \
-OTOOL \
-OTOOL64 \
-shrext_cmds \
-export_dynamic_flag_spec \
-whole_archive_flag_spec \
-compiler_needs_object \
-with_gnu_ld \
-allow_undefined_flag \
-no_undefined_flag \
-hardcode_libdir_flag_spec \
-hardcode_libdir_separator \
-exclude_expsyms \
-include_expsyms \
-file_list_spec \
-variables_saved_for_relink \
-libname_spec \
-library_names_spec \
-soname_spec \
-install_override_mode \
-finish_eval \
-old_striplib \
-striplib \
-compiler_lib_search_dirs \
-predep_objects \
-postdep_objects \
-predeps \
-postdeps \
-compiler_lib_search_path \
-LD_CXX \
-reload_flag_CXX \
-compiler_CXX \
-lt_prog_compiler_no_builtin_flag_CXX \
-lt_prog_compiler_pic_CXX \
-lt_prog_compiler_wl_CXX \
-lt_prog_compiler_static_CXX \
-lt_cv_prog_compiler_c_o_CXX \
-export_dynamic_flag_spec_CXX \
-whole_archive_flag_spec_CXX \
-compiler_needs_object_CXX \
-with_gnu_ld_CXX \
-allow_undefined_flag_CXX \
-no_undefined_flag_CXX \
-hardcode_libdir_flag_spec_CXX \
-hardcode_libdir_separator_CXX \
-exclude_expsyms_CXX \
-include_expsyms_CXX \
-file_list_spec_CXX \
-compiler_lib_search_dirs_CXX \
-predep_objects_CXX \
-postdep_objects_CXX \
-predeps_CXX \
-postdeps_CXX \
-compiler_lib_search_path_CXX; do
-    case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
-    *[\\\\\\\`\\"\\\$]*)
-      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\"" ## exclude from sc_prohibit_nested_quotes
-      ;;
-    *)
-      eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
-      ;;
-    esac
-done
-
-# Double-quote double-evaled strings.
-for var in reload_cmds \
-old_postinstall_cmds \
-old_postuninstall_cmds \
-old_archive_cmds \
-extract_expsyms_cmds \
-old_archive_from_new_cmds \
-old_archive_from_expsyms_cmds \
-archive_cmds \
-archive_expsym_cmds \
-module_cmds \
-module_expsym_cmds \
-export_symbols_cmds \
-prelink_cmds \
-postlink_cmds \
-postinstall_cmds \
-postuninstall_cmds \
-finish_cmds \
-sys_lib_search_path_spec \
-configure_time_dlsearch_path \
-configure_time_lt_sys_library_path \
-reload_cmds_CXX \
-old_archive_cmds_CXX \
-old_archive_from_new_cmds_CXX \
-old_archive_from_expsyms_cmds_CXX \
-archive_cmds_CXX \
-archive_expsym_cmds_CXX \
-module_cmds_CXX \
-module_expsym_cmds_CXX \
-export_symbols_cmds_CXX \
-prelink_cmds_CXX \
-postlink_cmds_CXX; do
-    case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
-    *[\\\\\\\`\\"\\\$]*)
-      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" ## exclude from sc_prohibit_nested_quotes
-      ;;
-    *)
-      eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
-      ;;
-    esac
-done
-
-ac_aux_dir='$ac_aux_dir'
-
-# See if we are running on zsh, and set the options that allow our
-# commands through without removal of \ escapes INIT.
-if test -n "\${ZSH_VERSION+set}"; then
-   setopt NO_GLOB_SUBST
-fi
-
-
-    PACKAGE='$PACKAGE'
-    VERSION='$VERSION'
-    RM='$RM'
-    ofile='$ofile'
-
-
-
-
-
-
-_ACEOF
-
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-
-# Handling of arguments.
-for ac_config_target in $ac_config_targets
-do
-  case $ac_config_target in
-    "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
-    "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
-    "libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;;
-    "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
-
-  *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
-  esac
-done
-
-
-# If the user did not use the arguments to specify the items to instantiate,
-# then the envvar interface is used.  Set only those that are not.
-# We use the long form for the default assignment because of an extremely
-# bizarre bug on SunOS 4.1.3.
-if $ac_need_defaults; then
-  test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files
-  test "${CONFIG_HEADERS+set}" = set || CONFIG_HEADERS=$config_headers
-  test "${CONFIG_COMMANDS+set}" = set || CONFIG_COMMANDS=$config_commands
-fi
-
-# Have a temporary directory for convenience.  Make it in the build tree
-# simply because there is no reason against having it here, and in addition,
-# creating and moving files from /tmp can sometimes cause problems.
-# Hook for its removal unless debugging.
-# Note that there is a small window in which the directory will not be cleaned:
-# after its creation but before its name has been assigned to `$tmp'.
-$debug ||
-{
-  tmp= ac_tmp=
-  trap 'exit_status=$?
-  : "${ac_tmp:=$tmp}"
-  { test ! -d "$ac_tmp" || rm -fr "$ac_tmp"; } && exit $exit_status
-' 0
-  trap 'as_fn_exit 1' 1 2 13 15
-}
-# Create a (secure) tmp directory for tmp files.
-
-{
-  tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` &&
-  test -d "$tmp"
-}  ||
-{
-  tmp=./conf$$-$RANDOM
-  (umask 077 && mkdir "$tmp")
-} || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5
-ac_tmp=$tmp
-
-# Set up the scripts for CONFIG_FILES section.
-# No need to generate them if there are no CONFIG_FILES.
-# This happens for instance with `./config.status config.h'.
-if test -n "$CONFIG_FILES"; then
-
-
-ac_cr=`echo X | tr X '\015'`
-# On cygwin, bash can eat \r inside `` if the user requested igncr.
-# But we know of no other shell where ac_cr would be empty at this
-# point, so we can use a bashism as a fallback.
-if test "x$ac_cr" = x; then
-  eval ac_cr=\$\'\\r\'
-fi
-ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
-if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
-  ac_cs_awk_cr='\\r'
-else
-  ac_cs_awk_cr=$ac_cr
-fi
-
-echo 'BEGIN {' >"$ac_tmp/subs1.awk" &&
-_ACEOF
-
-
-{
-  echo "cat >conf$$subs.awk <<_ACEOF" &&
-  echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
-  echo "_ACEOF"
-} >conf$$subs.sh ||
-  as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
-ac_delim_num=`echo "$ac_subst_vars" | grep -c '^'`
-ac_delim='%!_!# '
-for ac_last_try in false false false false false :; do
-  . ./conf$$subs.sh ||
-    as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
-
-  ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X`
-  if test $ac_delim_n = $ac_delim_num; then
-    break
-  elif $ac_last_try; then
-    as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
-  else
-    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
-  fi
-done
-rm -f conf$$subs.sh
-
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-cat >>"\$ac_tmp/subs1.awk" <<\\_ACAWK &&
-_ACEOF
-sed -n '
-h
-s/^/S["/; s/!.*/"]=/
-p
-g
-s/^[^!]*!//
-:repl
-t repl
-s/'"$ac_delim"'$//
-t delim
-:nl
-h
-s/\(.\{148\}\)..*/\1/
-t more1
-s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/
-p
-n
-b repl
-:more1
-s/["\\]/\\&/g; s/^/"/; s/$/"\\/
-p
-g
-s/.\{148\}//
-t nl
-:delim
-h
-s/\(.\{148\}\)..*/\1/
-t more2
-s/["\\]/\\&/g; s/^/"/; s/$/"/
-p
-b
-:more2
-s/["\\]/\\&/g; s/^/"/; s/$/"\\/
-p
-g
-s/.\{148\}//
-t delim
-' <conf$$subs.awk | sed '
-/^[^""]/{
-  N
-  s/\n//
-}
-' >>$CONFIG_STATUS || ac_write_fail=1
-rm -f conf$$subs.awk
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-_ACAWK
-cat >>"\$ac_tmp/subs1.awk" <<_ACAWK &&
-  for (key in S) S_is_set[key] = 1
-  FS = ""
-
-}
-{
-  line = $ 0
-  nfields = split(line, field, "@")
-  substed = 0
-  len = length(field[1])
-  for (i = 2; i < nfields; i++) {
-    key = field[i]
-    keylen = length(key)
-    if (S_is_set[key]) {
-      value = S[key]
-      line = substr(line, 1, len) "" value "" substr(line, len + keylen + 3)
-      len += length(value) + length(field[++i])
-      substed = 1
-    } else
-      len += 1 + keylen
-  }
-
-  print line
-}
-
-_ACAWK
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then
-  sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g"
-else
-  cat
-fi < "$ac_tmp/subs1.awk" > "$ac_tmp/subs.awk" \
-  || as_fn_error $? "could not setup config files machinery" "$LINENO" 5
-_ACEOF
-
-# VPATH may cause trouble with some makes, so we remove sole $(srcdir),
-# ${srcdir} and @srcdir@ entries from VPATH if srcdir is ".", strip leading and
-# trailing colons and then remove the whole line if VPATH becomes empty
-# (actually we leave an empty line to preserve line numbers).
-if test "x$srcdir" = x.; then
-  ac_vpsub='/^[	 ]*VPATH[	 ]*=[	 ]*/{
-h
-s///
-s/^/:/
-s/[	 ]*$/:/
-s/:\$(srcdir):/:/g
-s/:\${srcdir}:/:/g
-s/:@srcdir@:/:/g
-s/^:*//
-s/:*$//
-x
-s/\(=[	 ]*\).*/\1/
-G
-s/\n//
-s/^[^=]*=[	 ]*$//
-}'
-fi
-
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-fi # test -n "$CONFIG_FILES"
-
-# Set up the scripts for CONFIG_HEADERS section.
-# No need to generate them if there are no CONFIG_HEADERS.
-# This happens for instance with `./config.status Makefile'.
-if test -n "$CONFIG_HEADERS"; then
-cat >"$ac_tmp/defines.awk" <<\_ACAWK ||
-BEGIN {
-_ACEOF
-
-# Transform confdefs.h into an awk script `defines.awk', embedded as
-# here-document in config.status, that substitutes the proper values into
-# config.h.in to produce config.h.
-
-# Create a delimiter string that does not exist in confdefs.h, to ease
-# handling of long lines.
-ac_delim='%!_!# '
-for ac_last_try in false false :; do
-  ac_tt=`sed -n "/$ac_delim/p" confdefs.h`
-  if test -z "$ac_tt"; then
-    break
-  elif $ac_last_try; then
-    as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5
-  else
-    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
-  fi
-done
-
-# For the awk script, D is an array of macro values keyed by name,
-# likewise P contains macro parameters if any.  Preserve backslash
-# newline sequences.
-
-ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]*
-sed -n '
-s/.\{148\}/&'"$ac_delim"'/g
-t rset
-:rset
-s/^[	 ]*#[	 ]*define[	 ][	 ]*/ /
-t def
-d
-:def
-s/\\$//
-t bsnl
-s/["\\]/\\&/g
-s/^ \('"$ac_word_re"'\)\(([^()]*)\)[	 ]*\(.*\)/P["\1"]="\2"\
-D["\1"]=" \3"/p
-s/^ \('"$ac_word_re"'\)[	 ]*\(.*\)/D["\1"]=" \2"/p
-d
-:bsnl
-s/["\\]/\\&/g
-s/^ \('"$ac_word_re"'\)\(([^()]*)\)[	 ]*\(.*\)/P["\1"]="\2"\
-D["\1"]=" \3\\\\\\n"\\/p
-t cont
-s/^ \('"$ac_word_re"'\)[	 ]*\(.*\)/D["\1"]=" \2\\\\\\n"\\/p
-t cont
-d
-:cont
-n
-s/.\{148\}/&'"$ac_delim"'/g
-t clear
-:clear
-s/\\$//
-t bsnlc
-s/["\\]/\\&/g; s/^/"/; s/$/"/p
-d
-:bsnlc
-s/["\\]/\\&/g; s/^/"/; s/$/\\\\\\n"\\/p
-b cont
-' <confdefs.h | sed '
-s/'"$ac_delim"'/"\\\
-"/g' >>$CONFIG_STATUS || ac_write_fail=1
-
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-  for (key in D) D_is_set[key] = 1
-  FS = ""
-}
-/^[\t ]*#[\t ]*(define|undef)[\t ]+$ac_word_re([\t (]|\$)/ {
-  line = \$ 0
-  split(line, arg, " ")
-  if (arg[1] == "#") {
-    defundef = arg[2]
-    mac1 = arg[3]
-  } else {
-    defundef = substr(arg[1], 2)
-    mac1 = arg[2]
-  }
-  split(mac1, mac2, "(") #)
-  macro = mac2[1]
-  prefix = substr(line, 1, index(line, defundef) - 1)
-  if (D_is_set[macro]) {
-    # Preserve the white space surrounding the "#".
-    print prefix "define", macro P[macro] D[macro]
-    next
-  } else {
-    # Replace #undef with comments.  This is necessary, for example,
-    # in the case of _POSIX_SOURCE, which is predefined and required
-    # on some systems where configure will not decide to define it.
-    if (defundef == "undef") {
-      print "/*", prefix defundef, macro, "*/"
-      next
-    }
-  }
-}
-{ print }
-_ACAWK
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-  as_fn_error $? "could not setup config headers machinery" "$LINENO" 5
-fi # test -n "$CONFIG_HEADERS"
-
-
-eval set X "  :F $CONFIG_FILES  :H $CONFIG_HEADERS    :C $CONFIG_COMMANDS"
-shift
-for ac_tag
-do
-  case $ac_tag in
-  :[FHLC]) ac_mode=$ac_tag; continue;;
-  esac
-  case $ac_mode$ac_tag in
-  :[FHL]*:*);;
-  :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;;
-  :[FH]-) ac_tag=-:-;;
-  :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
-  esac
-  ac_save_IFS=$IFS
-  IFS=:
-  set x $ac_tag
-  IFS=$ac_save_IFS
-  shift
-  ac_file=$1
-  shift
-
-  case $ac_mode in
-  :L) ac_source=$1;;
-  :[FH])
-    ac_file_inputs=
-    for ac_f
-    do
-      case $ac_f in
-      -) ac_f="$ac_tmp/stdin";;
-      *) # Look for the file first in the build tree, then in the source tree
-	 # (if the path is not absolute).  The absolute path cannot be DOS-style,
-	 # because $ac_f cannot contain `:'.
-	 test -f "$ac_f" ||
-	   case $ac_f in
-	   [\\/$]*) false;;
-	   *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
-	   esac ||
-	   as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;;
-      esac
-      case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
-      as_fn_append ac_file_inputs " '$ac_f'"
-    done
-
-    # Let's still pretend it is `configure' which instantiates (i.e., don't
-    # use $as_me), people would be surprised to read:
-    #    /* config.h.  Generated by config.status.  */
-    configure_input='Generated from '`
-	  $as_echo "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g'
-	`' by configure.'
-    if test x"$ac_file" != x-; then
-      configure_input="$ac_file.  $configure_input"
-      { $as_echo "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5
-$as_echo "$as_me: creating $ac_file" >&6;}
-    fi
-    # Neutralize special characters interpreted by sed in replacement strings.
-    case $configure_input in #(
-    *\&* | *\|* | *\\* )
-       ac_sed_conf_input=`$as_echo "$configure_input" |
-       sed 's/[\\\\&|]/\\\\&/g'`;; #(
-    *) ac_sed_conf_input=$configure_input;;
-    esac
-
-    case $ac_tag in
-    *:-:* | *:-) cat >"$ac_tmp/stdin" \
-      || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;;
-    esac
-    ;;
-  esac
-
-  ac_dir=`$as_dirname -- "$ac_file" ||
-$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$ac_file" : 'X\(//\)[^/]' \| \
-	 X"$ac_file" : 'X\(//\)$' \| \
-	 X"$ac_file" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$ac_file" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)[^/].*/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-  as_dir="$ac_dir"; as_fn_mkdir_p
-  ac_builddir=.
-
-case "$ac_dir" in
-.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
-*)
-  ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
-  # A ".." for each directory in $ac_dir_suffix.
-  ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
-  case $ac_top_builddir_sub in
-  "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
-  *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
-  esac ;;
-esac
-ac_abs_top_builddir=$ac_pwd
-ac_abs_builddir=$ac_pwd$ac_dir_suffix
-# for backward compatibility:
-ac_top_builddir=$ac_top_build_prefix
-
-case $srcdir in
-  .)  # We are building in place.
-    ac_srcdir=.
-    ac_top_srcdir=$ac_top_builddir_sub
-    ac_abs_top_srcdir=$ac_pwd ;;
-  [\\/]* | ?:[\\/]* )  # Absolute name.
-    ac_srcdir=$srcdir$ac_dir_suffix;
-    ac_top_srcdir=$srcdir
-    ac_abs_top_srcdir=$srcdir ;;
-  *) # Relative name.
-    ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
-    ac_top_srcdir=$ac_top_build_prefix$srcdir
-    ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
-esac
-ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
-
-
-  case $ac_mode in
-  :F)
-  #
-  # CONFIG_FILE
-  #
-
-  case $INSTALL in
-  [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;;
-  *) ac_INSTALL=$ac_top_build_prefix$INSTALL ;;
-  esac
-  ac_MKDIR_P=$MKDIR_P
-  case $MKDIR_P in
-  [\\/$]* | ?:[\\/]* ) ;;
-  */*) ac_MKDIR_P=$ac_top_build_prefix$MKDIR_P ;;
-  esac
-_ACEOF
-
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-# If the template does not know about datarootdir, expand it.
-# FIXME: This hack should be removed a few years after 2.60.
-ac_datarootdir_hack=; ac_datarootdir_seen=
-ac_sed_dataroot='
-/datarootdir/ {
-  p
-  q
-}
-/@datadir@/p
-/@docdir@/p
-/@infodir@/p
-/@localedir@/p
-/@mandir@/p'
-case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in
-*datarootdir*) ac_datarootdir_seen=yes;;
-*@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*)
-  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
-$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
-_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-  ac_datarootdir_hack='
-  s&@datadir@&$datadir&g
-  s&@docdir@&$docdir&g
-  s&@infodir@&$infodir&g
-  s&@localedir@&$localedir&g
-  s&@mandir@&$mandir&g
-  s&\\\${datarootdir}&$datarootdir&g' ;;
-esac
-_ACEOF
-
-# Neutralize VPATH when `$srcdir' = `.'.
-# Shell code in configure.ac might set extrasub.
-# FIXME: do we really want to maintain this feature?
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-ac_sed_extra="$ac_vpsub
-$extrasub
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-:t
-/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
-s|@configure_input@|$ac_sed_conf_input|;t t
-s&@top_builddir@&$ac_top_builddir_sub&;t t
-s&@top_build_prefix@&$ac_top_build_prefix&;t t
-s&@srcdir@&$ac_srcdir&;t t
-s&@abs_srcdir@&$ac_abs_srcdir&;t t
-s&@top_srcdir@&$ac_top_srcdir&;t t
-s&@abs_top_srcdir@&$ac_abs_top_srcdir&;t t
-s&@builddir@&$ac_builddir&;t t
-s&@abs_builddir@&$ac_abs_builddir&;t t
-s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
-s&@INSTALL@&$ac_INSTALL&;t t
-s&@MKDIR_P@&$ac_MKDIR_P&;t t
-$ac_datarootdir_hack
-"
-eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$ac_tmp/subs.awk" \
-  >$ac_tmp/out || as_fn_error $? "could not create $ac_file" "$LINENO" 5
-
-test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
-  { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } &&
-  { ac_out=`sed -n '/^[	 ]*datarootdir[	 ]*:*=/p' \
-      "$ac_tmp/out"`; test -z "$ac_out"; } &&
-  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir'
-which seems to be undefined.  Please make sure it is defined" >&5
-$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
-which seems to be undefined.  Please make sure it is defined" >&2;}
-
-  rm -f "$ac_tmp/stdin"
-  case $ac_file in
-  -) cat "$ac_tmp/out" && rm -f "$ac_tmp/out";;
-  *) rm -f "$ac_file" && mv "$ac_tmp/out" "$ac_file";;
-  esac \
-  || as_fn_error $? "could not create $ac_file" "$LINENO" 5
- ;;
-  :H)
-  #
-  # CONFIG_HEADER
-  #
-  if test x"$ac_file" != x-; then
-    {
-      $as_echo "/* $configure_input  */" \
-      && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs"
-    } >"$ac_tmp/config.h" \
-      || as_fn_error $? "could not create $ac_file" "$LINENO" 5
-    if diff "$ac_file" "$ac_tmp/config.h" >/dev/null 2>&1; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5
-$as_echo "$as_me: $ac_file is unchanged" >&6;}
-    else
-      rm -f "$ac_file"
-      mv "$ac_tmp/config.h" "$ac_file" \
-	|| as_fn_error $? "could not create $ac_file" "$LINENO" 5
-    fi
-  else
-    $as_echo "/* $configure_input  */" \
-      && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" \
-      || as_fn_error $? "could not create -" "$LINENO" 5
-  fi
-# Compute "$ac_file"'s index in $config_headers.
-_am_arg="$ac_file"
-_am_stamp_count=1
-for _am_header in $config_headers :; do
-  case $_am_header in
-    $_am_arg | $_am_arg:* )
-      break ;;
-    * )
-      _am_stamp_count=`expr $_am_stamp_count + 1` ;;
-  esac
-done
-echo "timestamp for $_am_arg" >`$as_dirname -- "$_am_arg" ||
-$as_expr X"$_am_arg" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$_am_arg" : 'X\(//\)[^/]' \| \
-	 X"$_am_arg" : 'X\(//\)$' \| \
-	 X"$_am_arg" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$_am_arg" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)[^/].*/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`/stamp-h$_am_stamp_count
- ;;
-
-  :C)  { $as_echo "$as_me:${as_lineno-$LINENO}: executing $ac_file commands" >&5
-$as_echo "$as_me: executing $ac_file commands" >&6;}
- ;;
-  esac
-
-
-  case $ac_file$ac_mode in
-    "depfiles":C) test x"$AMDEP_TRUE" != x"" || {
-  # Older Autoconf quotes --file arguments for eval, but not when files
-  # are listed without --file.  Let's play safe and only enable the eval
-  # if we detect the quoting.
-  # TODO: see whether this extra hack can be removed once we start
-  # requiring Autoconf 2.70 or later.
-  case $CONFIG_FILES in #(
-  *\'*) :
-    eval set x "$CONFIG_FILES" ;; #(
-  *) :
-    set x $CONFIG_FILES ;; #(
-  *) :
-     ;;
-esac
-  shift
-  # Used to flag and report bootstrapping failures.
-  am_rc=0
-  for am_mf
-  do
-    # Strip MF so we end up with the name of the file.
-    am_mf=`$as_echo "$am_mf" | sed -e 's/:.*$//'`
-    # Check whether this is an Automake generated Makefile which includes
-    # dependency-tracking related rules and includes.
-    # Grep'ing the whole file directly is not great: AIX grep has a line
-    # limit of 2048, but all sed's we know have understand at least 4000.
-    sed -n 's,^am--depfiles:.*,X,p' "$am_mf" | grep X >/dev/null 2>&1 \
-      || continue
-    am_dirpart=`$as_dirname -- "$am_mf" ||
-$as_expr X"$am_mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$am_mf" : 'X\(//\)[^/]' \| \
-	 X"$am_mf" : 'X\(//\)$' \| \
-	 X"$am_mf" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$am_mf" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)[^/].*/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-    am_filepart=`$as_basename -- "$am_mf" ||
-$as_expr X/"$am_mf" : '.*/\([^/][^/]*\)/*$' \| \
-	 X"$am_mf" : 'X\(//\)$' \| \
-	 X"$am_mf" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X/"$am_mf" |
-    sed '/^.*\/\([^/][^/]*\)\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\/\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\/\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-    { echo "$as_me:$LINENO: cd "$am_dirpart" \
-      && sed -e '/# am--include-marker/d' "$am_filepart" \
-        | $MAKE -f - am--depfiles" >&5
-   (cd "$am_dirpart" \
-      && sed -e '/# am--include-marker/d' "$am_filepart" \
-        | $MAKE -f - am--depfiles) >&5 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } || am_rc=$?
-  done
-  if test $am_rc -ne 0; then
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "Something went wrong bootstrapping makefile fragments
-    for automatic dependency tracking.  Try re-running configure with the
-    '--disable-dependency-tracking' option to at least be able to build
-    the package (albeit without support for automatic dependency tracking).
-See \`config.log' for more details" "$LINENO" 5; }
-  fi
-  { am_dirpart=; unset am_dirpart;}
-  { am_filepart=; unset am_filepart;}
-  { am_mf=; unset am_mf;}
-  { am_rc=; unset am_rc;}
-  rm -f conftest-deps.mk
-}
- ;;
-    "libtool":C)
-
-    # See if we are running on zsh, and set the options that allow our
-    # commands through without removal of \ escapes.
-    if test -n "${ZSH_VERSION+set}"; then
-      setopt NO_GLOB_SUBST
-    fi
-
-    cfgfile=${ofile}T
-    trap "$RM \"$cfgfile\"; exit 1" 1 2 15
-    $RM "$cfgfile"
-
-    cat <<_LT_EOF >> "$cfgfile"
-#! $SHELL
-# Generated automatically by $as_me ($PACKAGE) $VERSION
-# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
-# NOTE: Changes made to this file will be lost: look at ltmain.sh.
-
-# Provide generalized library-building support services.
-# Written by Gordon Matzigkeit, 1996
-
-# Copyright (C) 2014 Free Software Foundation, Inc.
-# This is free software; see the source for copying conditions.  There is NO
-# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-
-# GNU Libtool is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of of the License, or
-# (at your option) any later version.
-#
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program or library that is built
-# using GNU Libtool, you may include this file under the  same
-# distribution terms that you use for the rest of that program.
-#
-# GNU Libtool is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-
-# The names of the tagged configurations supported by this script.
-available_tags='CXX '
-
-# Configured defaults for sys_lib_dlsearch_path munging.
-: \${LT_SYS_LIBRARY_PATH="$configure_time_lt_sys_library_path"}
-
-# ### BEGIN LIBTOOL CONFIG
-
-# Which release of libtool.m4 was used?
-macro_version=$macro_version
-macro_revision=$macro_revision
-
-# Whether or not to build shared libraries.
-build_libtool_libs=$enable_shared
-
-# Whether or not to build static libraries.
-build_old_libs=$enable_static
-
-# What type of objects to build.
-pic_mode=$pic_mode
-
-# Whether or not to optimize for fast installation.
-fast_install=$enable_fast_install
-
-# Shared archive member basename,for filename based shared library versioning on AIX.
-shared_archive_member_spec=$shared_archive_member_spec
-
-# Shell to use when invoking shell scripts.
-SHELL=$lt_SHELL
-
-# An echo program that protects backslashes.
-ECHO=$lt_ECHO
-
-# The PATH separator for the build system.
-PATH_SEPARATOR=$lt_PATH_SEPARATOR
-
-# The host system.
-host_alias=$host_alias
-host=$host
-host_os=$host_os
-
-# The build system.
-build_alias=$build_alias
-build=$build
-build_os=$build_os
-
-# A sed program that does not truncate output.
-SED=$lt_SED
-
-# Sed that helps us avoid accidentally triggering echo(1) options like -n.
-Xsed="\$SED -e 1s/^X//"
-
-# A grep program that handles long lines.
-GREP=$lt_GREP
-
-# An ERE matcher.
-EGREP=$lt_EGREP
-
-# A literal string matcher.
-FGREP=$lt_FGREP
-
-# A BSD- or MS-compatible name lister.
-NM=$lt_NM
-
-# Whether we need soft or hard links.
-LN_S=$lt_LN_S
-
-# What is the maximum length of a command?
-max_cmd_len=$max_cmd_len
-
-# Object file suffix (normally "o").
-objext=$ac_objext
-
-# Executable file suffix (normally "").
-exeext=$exeext
-
-# whether the shell understands "unset".
-lt_unset=$lt_unset
-
-# turn spaces into newlines.
-SP2NL=$lt_lt_SP2NL
-
-# turn newlines into spaces.
-NL2SP=$lt_lt_NL2SP
-
-# convert \$build file names to \$host format.
-to_host_file_cmd=$lt_cv_to_host_file_cmd
-
-# convert \$build files to toolchain format.
-to_tool_file_cmd=$lt_cv_to_tool_file_cmd
-
-# An object symbol dumper.
-OBJDUMP=$lt_OBJDUMP
-
-# Method to check whether dependent libraries are shared objects.
-deplibs_check_method=$lt_deplibs_check_method
-
-# Command to use when deplibs_check_method = "file_magic".
-file_magic_cmd=$lt_file_magic_cmd
-
-# How to find potential files when deplibs_check_method = "file_magic".
-file_magic_glob=$lt_file_magic_glob
-
-# Find potential files using nocaseglob when deplibs_check_method = "file_magic".
-want_nocaseglob=$lt_want_nocaseglob
-
-# DLL creation program.
-DLLTOOL=$lt_DLLTOOL
-
-# Command to associate shared and link libraries.
-sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd
-
-# The archiver.
-AR=$lt_AR
-
-# Flags to create an archive (by configure).
-lt_ar_flags=$lt_ar_flags
-
-# Flags to create an archive.
-AR_FLAGS=\${ARFLAGS-"\$lt_ar_flags"}
-
-# How to feed a file listing to the archiver.
-archiver_list_spec=$lt_archiver_list_spec
-
-# A symbol stripping program.
-STRIP=$lt_STRIP
-
-# Commands used to install an old-style archive.
-RANLIB=$lt_RANLIB
-old_postinstall_cmds=$lt_old_postinstall_cmds
-old_postuninstall_cmds=$lt_old_postuninstall_cmds
-
-# Whether to use a lock for old archive extraction.
-lock_old_archive_extraction=$lock_old_archive_extraction
-
-# A C compiler.
-LTCC=$lt_CC
-
-# LTCC compiler flags.
-LTCFLAGS=$lt_CFLAGS
-
-# Take the output of nm and produce a listing of raw symbols and C names.
-global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe
-
-# Transform the output of nm in a proper C declaration.
-global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
-
-# Transform the output of nm into a list of symbols to manually relocate.
-global_symbol_to_import=$lt_lt_cv_sys_global_symbol_to_import
-
-# Transform the output of nm in a C name address pair.
-global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
-
-# Transform the output of nm in a C name address pair when lib prefix is needed.
-global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix
-
-# The name lister interface.
-nm_interface=$lt_lt_cv_nm_interface
-
-# Specify filename containing input files for \$NM.
-nm_file_list_spec=$lt_nm_file_list_spec
-
-# The root where to search for dependent libraries,and where our libraries should be installed.
-lt_sysroot=$lt_sysroot
-
-# Command to truncate a binary pipe.
-lt_truncate_bin=$lt_lt_cv_truncate_bin
-
-# The name of the directory that contains temporary libtool files.
-objdir=$objdir
-
-# Used to examine libraries when file_magic_cmd begins with "file".
-MAGIC_CMD=$MAGIC_CMD
-
-# Must we lock files when doing compilation?
-need_locks=$lt_need_locks
-
-# Manifest tool.
-MANIFEST_TOOL=$lt_MANIFEST_TOOL
-
-# Tool to manipulate archived DWARF debug symbol files on Mac OS X.
-DSYMUTIL=$lt_DSYMUTIL
-
-# Tool to change global to local symbols on Mac OS X.
-NMEDIT=$lt_NMEDIT
-
-# Tool to manipulate fat objects and archives on Mac OS X.
-LIPO=$lt_LIPO
-
-# ldd/readelf like tool for Mach-O binaries on Mac OS X.
-OTOOL=$lt_OTOOL
-
-# ldd/readelf like tool for 64 bit Mach-O binaries on Mac OS X 10.4.
-OTOOL64=$lt_OTOOL64
-
-# Old archive suffix (normally "a").
-libext=$libext
-
-# Shared library suffix (normally ".so").
-shrext_cmds=$lt_shrext_cmds
-
-# The commands to extract the exported symbol list from a shared archive.
-extract_expsyms_cmds=$lt_extract_expsyms_cmds
-
-# Variables whose values should be saved in libtool wrapper scripts and
-# restored at link time.
-variables_saved_for_relink=$lt_variables_saved_for_relink
-
-# Do we need the "lib" prefix for modules?
-need_lib_prefix=$need_lib_prefix
-
-# Do we need a version for libraries?
-need_version=$need_version
-
-# Library versioning type.
-version_type=$version_type
-
-# Shared library runtime path variable.
-runpath_var=$runpath_var
-
-# Shared library path variable.
-shlibpath_var=$shlibpath_var
-
-# Is shlibpath searched before the hard-coded library search path?
-shlibpath_overrides_runpath=$shlibpath_overrides_runpath
-
-# Format of library name prefix.
-libname_spec=$lt_libname_spec
-
-# List of archive names.  First name is the real one, the rest are links.
-# The last name is the one that the linker finds with -lNAME
-library_names_spec=$lt_library_names_spec
-
-# The coded name of the library, if different from the real name.
-soname_spec=$lt_soname_spec
-
-# Permission mode override for installation of shared libraries.
-install_override_mode=$lt_install_override_mode
-
-# Command to use after installation of a shared archive.
-postinstall_cmds=$lt_postinstall_cmds
-
-# Command to use after uninstallation of a shared archive.
-postuninstall_cmds=$lt_postuninstall_cmds
-
-# Commands used to finish a libtool library installation in a directory.
-finish_cmds=$lt_finish_cmds
-
-# As "finish_cmds", except a single script fragment to be evaled but
-# not shown.
-finish_eval=$lt_finish_eval
-
-# Whether we should hardcode library paths into libraries.
-hardcode_into_libs=$hardcode_into_libs
-
-# Compile-time system search path for libraries.
-sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
-
-# Detected run-time system search path for libraries.
-sys_lib_dlsearch_path_spec=$lt_configure_time_dlsearch_path
-
-# Explicit LT_SYS_LIBRARY_PATH set during ./configure time.
-configure_time_lt_sys_library_path=$lt_configure_time_lt_sys_library_path
-
-# Whether dlopen is supported.
-dlopen_support=$enable_dlopen
-
-# Whether dlopen of programs is supported.
-dlopen_self=$enable_dlopen_self
-
-# Whether dlopen of statically linked programs is supported.
-dlopen_self_static=$enable_dlopen_self_static
-
-# Commands to strip libraries.
-old_striplib=$lt_old_striplib
-striplib=$lt_striplib
-
-
-# The linker used to build libraries.
-LD=$lt_LD
-
-# How to create reloadable object files.
-reload_flag=$lt_reload_flag
-reload_cmds=$lt_reload_cmds
-
-# Commands used to build an old-style archive.
-old_archive_cmds=$lt_old_archive_cmds
-
-# A language specific compiler.
-CC=$lt_compiler
-
-# Is the compiler the GNU compiler?
-with_gcc=$GCC
-
-# Compiler flag to turn off builtin functions.
-no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
-
-# Additional compiler flags for building library objects.
-pic_flag=$lt_lt_prog_compiler_pic
-
-# How to pass a linker flag through the compiler.
-wl=$lt_lt_prog_compiler_wl
-
-# Compiler flag to prevent dynamic linking.
-link_static_flag=$lt_lt_prog_compiler_static
-
-# Does compiler simultaneously support -c and -o options?
-compiler_c_o=$lt_lt_cv_prog_compiler_c_o
-
-# Whether or not to add -lc for building shared libraries.
-build_libtool_need_lc=$archive_cmds_need_lc
-
-# Whether or not to disallow shared libs when runtime libs are static.
-allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes
-
-# Compiler flag to allow reflexive dlopens.
-export_dynamic_flag_spec=$lt_export_dynamic_flag_spec
-
-# Compiler flag to generate shared objects directly from archives.
-whole_archive_flag_spec=$lt_whole_archive_flag_spec
-
-# Whether the compiler copes with passing no objects directly.
-compiler_needs_object=$lt_compiler_needs_object
-
-# Create an old-style archive from a shared archive.
-old_archive_from_new_cmds=$lt_old_archive_from_new_cmds
-
-# Create a temporary old-style archive to link instead of a shared archive.
-old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds
-
-# Commands used to build a shared archive.
-archive_cmds=$lt_archive_cmds
-archive_expsym_cmds=$lt_archive_expsym_cmds
-
-# Commands used to build a loadable module if different from building
-# a shared archive.
-module_cmds=$lt_module_cmds
-module_expsym_cmds=$lt_module_expsym_cmds
-
-# Whether we are building with GNU ld or not.
-with_gnu_ld=$lt_with_gnu_ld
-
-# Flag that allows shared libraries with undefined symbols to be built.
-allow_undefined_flag=$lt_allow_undefined_flag
-
-# Flag that enforces no undefined symbols.
-no_undefined_flag=$lt_no_undefined_flag
-
-# Flag to hardcode \$libdir into a binary during linking.
-# This must work even if \$libdir does not exist
-hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec
-
-# Whether we need a single "-rpath" flag with a separated argument.
-hardcode_libdir_separator=$lt_hardcode_libdir_separator
-
-# Set to "yes" if using DIR/libNAME\$shared_ext during linking hardcodes
-# DIR into the resulting binary.
-hardcode_direct=$hardcode_direct
-
-# Set to "yes" if using DIR/libNAME\$shared_ext during linking hardcodes
-# DIR into the resulting binary and the resulting library dependency is
-# "absolute",i.e impossible to change by setting \$shlibpath_var if the
-# library is relocated.
-hardcode_direct_absolute=$hardcode_direct_absolute
-
-# Set to "yes" if using the -LDIR flag during linking hardcodes DIR
-# into the resulting binary.
-hardcode_minus_L=$hardcode_minus_L
-
-# Set to "yes" if using SHLIBPATH_VAR=DIR during linking hardcodes DIR
-# into the resulting binary.
-hardcode_shlibpath_var=$hardcode_shlibpath_var
-
-# Set to "yes" if building a shared library automatically hardcodes DIR
-# into the library and all subsequent libraries and executables linked
-# against it.
-hardcode_automatic=$hardcode_automatic
-
-# Set to yes if linker adds runtime paths of dependent libraries
-# to runtime path list.
-inherit_rpath=$inherit_rpath
-
-# Whether libtool must link a program against all its dependency libraries.
-link_all_deplibs=$link_all_deplibs
-
-# Set to "yes" if exported symbols are required.
-always_export_symbols=$always_export_symbols
-
-# The commands to list exported symbols.
-export_symbols_cmds=$lt_export_symbols_cmds
-
-# Symbols that should not be listed in the preloaded symbols.
-exclude_expsyms=$lt_exclude_expsyms
-
-# Symbols that must always be exported.
-include_expsyms=$lt_include_expsyms
-
-# Commands necessary for linking programs (against libraries) with templates.
-prelink_cmds=$lt_prelink_cmds
-
-# Commands necessary for finishing linking programs.
-postlink_cmds=$lt_postlink_cmds
-
-# Specify filename containing input files.
-file_list_spec=$lt_file_list_spec
-
-# How to hardcode a shared library path into an executable.
-hardcode_action=$hardcode_action
-
-# The directories searched by this compiler when creating a shared library.
-compiler_lib_search_dirs=$lt_compiler_lib_search_dirs
-
-# Dependencies to place before and after the objects being linked to
-# create a shared library.
-predep_objects=$lt_predep_objects
-postdep_objects=$lt_postdep_objects
-predeps=$lt_predeps
-postdeps=$lt_postdeps
-
-# The library search path used internally by the compiler when linking
-# a shared library.
-compiler_lib_search_path=$lt_compiler_lib_search_path
-
-# ### END LIBTOOL CONFIG
-
-_LT_EOF
-
-    cat <<'_LT_EOF' >> "$cfgfile"
-
-# ### BEGIN FUNCTIONS SHARED WITH CONFIGURE
-
-# func_munge_path_list VARIABLE PATH
-# -----------------------------------
-# VARIABLE is name of variable containing _space_ separated list of
-# directories to be munged by the contents of PATH, which is string
-# having a format:
-# "DIR[:DIR]:"
-#       string "DIR[ DIR]" will be prepended to VARIABLE
-# ":DIR[:DIR]"
-#       string "DIR[ DIR]" will be appended to VARIABLE
-# "DIRP[:DIRP]::[DIRA:]DIRA"
-#       string "DIRP[ DIRP]" will be prepended to VARIABLE and string
-#       "DIRA[ DIRA]" will be appended to VARIABLE
-# "DIR[:DIR]"
-#       VARIABLE will be replaced by "DIR[ DIR]"
-func_munge_path_list ()
-{
-    case x$2 in
-    x)
-        ;;
-    *:)
-        eval $1=\"`$ECHO $2 | $SED 's/:/ /g'` \$$1\"
-        ;;
-    x:*)
-        eval $1=\"\$$1 `$ECHO $2 | $SED 's/:/ /g'`\"
-        ;;
-    *::*)
-        eval $1=\"\$$1\ `$ECHO $2 | $SED -e 's/.*:://' -e 's/:/ /g'`\"
-        eval $1=\"`$ECHO $2 | $SED -e 's/::.*//' -e 's/:/ /g'`\ \$$1\"
-        ;;
-    *)
-        eval $1=\"`$ECHO $2 | $SED 's/:/ /g'`\"
-        ;;
-    esac
-}
-
-
-# Calculate cc_basename.  Skip known compiler wrappers and cross-prefix.
-func_cc_basename ()
-{
-    for cc_temp in $*""; do
-      case $cc_temp in
-        compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
-        distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
-        \-*) ;;
-        *) break;;
-      esac
-    done
-    func_cc_basename_result=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`
-}
-
-
-# ### END FUNCTIONS SHARED WITH CONFIGURE
-
-_LT_EOF
-
-  case $host_os in
-  aix3*)
-    cat <<\_LT_EOF >> "$cfgfile"
-# AIX sometimes has problems with the GCC collect2 program.  For some
-# reason, if we set the COLLECT_NAMES environment variable, the problems
-# vanish in a puff of smoke.
-if test set != "${COLLECT_NAMES+set}"; then
-  COLLECT_NAMES=
-  export COLLECT_NAMES
-fi
-_LT_EOF
-    ;;
-  esac
-
-
-ltmain=$ac_aux_dir/ltmain.sh
-
-
-  # We use sed instead of cat because bash on DJGPP gets confused if
-  # if finds mixed CR/LF and LF-only lines.  Since sed operates in
-  # text mode, it properly converts lines to CR/LF.  This bash problem
-  # is reportedly fixed, but why not run on old versions too?
-  sed '$q' "$ltmain" >> "$cfgfile" \
-     || (rm -f "$cfgfile"; exit 1)
-
-   mv -f "$cfgfile" "$ofile" ||
-    (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
-  chmod +x "$ofile"
-
-
-    cat <<_LT_EOF >> "$ofile"
-
-# ### BEGIN LIBTOOL TAG CONFIG: CXX
-
-# The linker used to build libraries.
-LD=$lt_LD_CXX
-
-# How to create reloadable object files.
-reload_flag=$lt_reload_flag_CXX
-reload_cmds=$lt_reload_cmds_CXX
-
-# Commands used to build an old-style archive.
-old_archive_cmds=$lt_old_archive_cmds_CXX
-
-# A language specific compiler.
-CC=$lt_compiler_CXX
-
-# Is the compiler the GNU compiler?
-with_gcc=$GCC_CXX
-
-# Compiler flag to turn off builtin functions.
-no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_CXX
-
-# Additional compiler flags for building library objects.
-pic_flag=$lt_lt_prog_compiler_pic_CXX
-
-# How to pass a linker flag through the compiler.
-wl=$lt_lt_prog_compiler_wl_CXX
-
-# Compiler flag to prevent dynamic linking.
-link_static_flag=$lt_lt_prog_compiler_static_CXX
-
-# Does compiler simultaneously support -c and -o options?
-compiler_c_o=$lt_lt_cv_prog_compiler_c_o_CXX
-
-# Whether or not to add -lc for building shared libraries.
-build_libtool_need_lc=$archive_cmds_need_lc_CXX
-
-# Whether or not to disallow shared libs when runtime libs are static.
-allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_CXX
-
-# Compiler flag to allow reflexive dlopens.
-export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_CXX
-
-# Compiler flag to generate shared objects directly from archives.
-whole_archive_flag_spec=$lt_whole_archive_flag_spec_CXX
-
-# Whether the compiler copes with passing no objects directly.
-compiler_needs_object=$lt_compiler_needs_object_CXX
-
-# Create an old-style archive from a shared archive.
-old_archive_from_new_cmds=$lt_old_archive_from_new_cmds_CXX
-
-# Create a temporary old-style archive to link instead of a shared archive.
-old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds_CXX
-
-# Commands used to build a shared archive.
-archive_cmds=$lt_archive_cmds_CXX
-archive_expsym_cmds=$lt_archive_expsym_cmds_CXX
-
-# Commands used to build a loadable module if different from building
-# a shared archive.
-module_cmds=$lt_module_cmds_CXX
-module_expsym_cmds=$lt_module_expsym_cmds_CXX
-
-# Whether we are building with GNU ld or not.
-with_gnu_ld=$lt_with_gnu_ld_CXX
-
-# Flag that allows shared libraries with undefined symbols to be built.
-allow_undefined_flag=$lt_allow_undefined_flag_CXX
-
-# Flag that enforces no undefined symbols.
-no_undefined_flag=$lt_no_undefined_flag_CXX
-
-# Flag to hardcode \$libdir into a binary during linking.
-# This must work even if \$libdir does not exist
-hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_CXX
-
-# Whether we need a single "-rpath" flag with a separated argument.
-hardcode_libdir_separator=$lt_hardcode_libdir_separator_CXX
-
-# Set to "yes" if using DIR/libNAME\$shared_ext during linking hardcodes
-# DIR into the resulting binary.
-hardcode_direct=$hardcode_direct_CXX
-
-# Set to "yes" if using DIR/libNAME\$shared_ext during linking hardcodes
-# DIR into the resulting binary and the resulting library dependency is
-# "absolute",i.e impossible to change by setting \$shlibpath_var if the
-# library is relocated.
-hardcode_direct_absolute=$hardcode_direct_absolute_CXX
-
-# Set to "yes" if using the -LDIR flag during linking hardcodes DIR
-# into the resulting binary.
-hardcode_minus_L=$hardcode_minus_L_CXX
-
-# Set to "yes" if using SHLIBPATH_VAR=DIR during linking hardcodes DIR
-# into the resulting binary.
-hardcode_shlibpath_var=$hardcode_shlibpath_var_CXX
-
-# Set to "yes" if building a shared library automatically hardcodes DIR
-# into the library and all subsequent libraries and executables linked
-# against it.
-hardcode_automatic=$hardcode_automatic_CXX
-
-# Set to yes if linker adds runtime paths of dependent libraries
-# to runtime path list.
-inherit_rpath=$inherit_rpath_CXX
-
-# Whether libtool must link a program against all its dependency libraries.
-link_all_deplibs=$link_all_deplibs_CXX
-
-# Set to "yes" if exported symbols are required.
-always_export_symbols=$always_export_symbols_CXX
-
-# The commands to list exported symbols.
-export_symbols_cmds=$lt_export_symbols_cmds_CXX
-
-# Symbols that should not be listed in the preloaded symbols.
-exclude_expsyms=$lt_exclude_expsyms_CXX
-
-# Symbols that must always be exported.
-include_expsyms=$lt_include_expsyms_CXX
-
-# Commands necessary for linking programs (against libraries) with templates.
-prelink_cmds=$lt_prelink_cmds_CXX
-
-# Commands necessary for finishing linking programs.
-postlink_cmds=$lt_postlink_cmds_CXX
-
-# Specify filename containing input files.
-file_list_spec=$lt_file_list_spec_CXX
-
-# How to hardcode a shared library path into an executable.
-hardcode_action=$hardcode_action_CXX
-
-# The directories searched by this compiler when creating a shared library.
-compiler_lib_search_dirs=$lt_compiler_lib_search_dirs_CXX
-
-# Dependencies to place before and after the objects being linked to
-# create a shared library.
-predep_objects=$lt_predep_objects_CXX
-postdep_objects=$lt_postdep_objects_CXX
-predeps=$lt_predeps_CXX
-postdeps=$lt_postdeps_CXX
-
-# The library search path used internally by the compiler when linking
-# a shared library.
-compiler_lib_search_path=$lt_compiler_lib_search_path_CXX
-
-# ### END LIBTOOL TAG CONFIG: CXX
-_LT_EOF
-
- ;;
-
-  esac
-done # for ac_tag
-
-
-as_fn_exit 0
-_ACEOF
-ac_clean_files=$ac_clean_files_save
-
-test $ac_write_fail = 0 ||
-  as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5
-
-
-# configure is writing to config.log, and then calls config.status.
-# config.status does its own redirection, appending to config.log.
-# Unfortunately, on DOS this fails, as config.log is still kept open
-# by configure, so config.status won't be able to write to it; its
-# output is simply discarded.  So we exec the FD to /dev/null,
-# effectively closing config.log, so it can be properly (re)opened and
-# appended to by config.status.  When coming back to configure, we
-# need to make the FD available again.
-if test "$no_create" != yes; then
-  ac_cs_success=:
-  ac_config_status_args=
-  test "$silent" = yes &&
-    ac_config_status_args="$ac_config_status_args --quiet"
-  exec 5>/dev/null
-  $SHELL $CONFIG_STATUS $ac_config_status_args || ac_cs_success=false
-  exec 5>>config.log
-  # Use ||, not &&, to avoid exiting from the if with $? = 1, which
-  # would make configure fail if this is the last instruction.
-  $ac_cs_success || as_fn_exit 1
-fi
-if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
-$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
-fi
-
diff --git a/submodules/libtgvoip/configure.ac b/submodules/libtgvoip/configure.ac
deleted file mode 100644
index 222f541e11..0000000000
--- a/submodules/libtgvoip/configure.ac
+++ /dev/null
@@ -1,113 +0,0 @@
-#                                               -*- Autoconf -*-
-# Process this file with autoconf to produce a configure script.
-
-AC_PREREQ([2.69])
-AC_INIT([libtgvoip], [2.4.4], [https://github.com/grishka/libtgvoip/issues])
-AC_CONFIG_SRCDIR([config.h.in])
-AC_CONFIG_HEADERS([config.h])
-AM_INIT_AUTOMAKE([subdir-objects])
-AM_SILENT_RULES([yes])
-LT_INIT
-
-# Checks for programs.
-AC_PROG_CXX
-AC_PROG_CC
-AC_PROG_OBJCXX
-AM_PROG_AS
-AC_PROG_RANLIB
-
-# Checks for libraries.
-AC_CHECK_LIB([crypto], [SHA1], [], [AC_MSG_FAILURE([libssl-dev is required but not found])])
-AC_CHECK_LIB([m], [floorf])
-AC_CHECK_LIB([opus], [opus_decoder_create], [], [AC_MSG_FAILURE([libopus-dev is required but not found])])
-AC_CHECK_LIB([pthread], [pthread_create])
-
-AC_CANONICAL_HOST
-
-AS_CASE([$host_cpu],
-	[i?86], [cpu_x86=yes],
-	[x86_64], [cpu_x86=yes],
-	[arm*], [cpu_arm=yes],
-	[AS_ECHO("!! WARNING: libtgvoip wasn't tested with your CPU architecture ($host_cpu)")]
-)
-AS_CASE([$host_cpu],
-	[armv7*], [cpu_armv7=yes]
-)
-AS_ECHO("Detected CPU: $host_cpu")
-AM_CONDITIONAL(TARGET_CPU_X86, test "x$cpu_x86" == xyes)
-AM_CONDITIONAL(TARGET_CPU_ARM, test "x$cpu_arm" == xyes)
-AM_CONDITIONAL(TARGET_CPU_ARMV7, test "x$cpu_armv7" == xyes)
-AS_ECHO("Detected OS: $host_os")
-
-AS_CASE([$host_os],
-	[darwin*], [os_osx=yes]
-)
-AM_CONDITIONAL(TARGET_OS_OSX, test "x$os_osx" == xyes)
-
-AC_ARG_ENABLE([audio-callback], [AS_HELP_STRING([--enable-audio-callback], [enable callback-based audio I/O])], [], [enable_audio_callback=no])
-AM_CONDITIONAL(ENABLE_AUDIO_CALLBACK, test "x$enable_audio_callback" == xyes)
-
-AS_IF([test "x$os_osx" != xyes && test "x$enable_audio_callback" != xyes], [ # Linux
-	AC_CHECK_LIB([dl], [dlopen])
-
-	AC_ARG_WITH([pulse], [AS_HELP_STRING([--without-pulse], [disable PulseAudio support])], [], [with_pulse=yes])
-	AC_ARG_WITH([alsa], [AS_HELP_STRING([--without-alsa], [disable ALSA support])], [], [with_alsa=yes])
-
-	AS_IF([test "x$with_pulse" == xno && test "x$with_alsa" == xno], [
-		AC_MSG_FAILURE([You can only disable either ALSA or PulseAudio, not both]);
-	])
-
-	AS_IF([test "x$with_pulse" != xno], [
-		AC_CHECK_LIB([pulse], [pa_context_new], [
-			AS_ECHO_N( ) # what is the proper way to check for a library without linking it?
-		], [
-			AC_MSG_FAILURE([libpulse-dev is required during build, but you don't have it installed. Use --without-pulse to disable PulseAudio support.])
-		])
-	], [
-		AC_DEFINE([WITHOUT_PULSE], [1], [Define to disable PulseAudio support])
-	])
-
-	AS_IF([test "x$with_alsa" != xno], [
-		AC_CHECK_LIB([asound], [snd_pcm_open], [
-			AS_ECHO_N( ) # what is the proper way to check for a library without linking it?
-		], [
-			AC_MSG_FAILURE([libasound-dev is required during build, but you don't have it installed. Use --without-alsa to disable ALSA support.])
-		])
-	], [
-		AC_DEFINE([WITHOUT_ALSA], [1], [Define to disable ALSA support])
-	])
-]);
-
-AM_CONDITIONAL(WITH_PULSE, test "x$with_pulse" == xyes)
-AM_CONDITIONAL(WITH_ALSA, test "x$with_alsa" == xyes)
-
-AC_ARG_ENABLE([dsp], [AS_HELP_STRING([--disable-dsp], [disable signal processing (echo cancellation, noise suppression, and automatic gain control)])], [], [enable_dsp=yes])
-AM_CONDITIONAL(ENABLE_DSP, test "x$enable_dsp" == xyes)
-
-# Checks for header files.
-AC_FUNC_ALLOCA
-AC_CHECK_HEADERS([arpa/inet.h float.h malloc.h netdb.h netinet/in.h stddef.h stdint.h stdlib.h string.h sys/ioctl.h sys/socket.h sys/time.h unistd.h wchar.h])
-
-# Checks for typedefs, structures, and compiler characteristics.
-AC_CHECK_HEADER_STDBOOL
-AC_C_INLINE
-AC_TYPE_INT16_T
-AC_TYPE_INT32_T
-AC_TYPE_INT64_T
-AC_TYPE_INT8_T
-AC_TYPE_SIZE_T
-AC_TYPE_SSIZE_T
-AC_TYPE_UINT16_T
-AC_TYPE_UINT32_T
-AC_TYPE_UINT64_T
-AC_TYPE_UINT8_T
-AC_CHECK_TYPES([ptrdiff_t])
-
-# Checks for library functions.
-AC_FUNC_ERROR_AT_LINE
-AC_FUNC_MALLOC
-AC_FUNC_REALLOC
-AC_CHECK_FUNCS([clock_gettime floor gettimeofday inet_ntoa memmove memset select socket sqrt strcasecmp strchr strerror strncasecmp strstr strtol strtoul uname])
-
-AC_CONFIG_FILES([Makefile])
-AC_OUTPUT
diff --git a/submodules/libtgvoip/depcomp b/submodules/libtgvoip/depcomp
deleted file mode 100755
index 65cbf7093a..0000000000
--- a/submodules/libtgvoip/depcomp
+++ /dev/null
@@ -1,791 +0,0 @@
-#! /bin/sh
-# depcomp - compile a program generating dependencies as side-effects
-
-scriptversion=2018-03-07.03; # UTC
-
-# Copyright (C) 1999-2018 Free Software Foundation, Inc.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-# Originally written by Alexandre Oliva <oliva@dcc.unicamp.br>.
-
-case $1 in
-  '')
-    echo "$0: No command.  Try '$0 --help' for more information." 1>&2
-    exit 1;
-    ;;
-  -h | --h*)
-    cat <<\EOF
-Usage: depcomp [--help] [--version] PROGRAM [ARGS]
-
-Run PROGRAMS ARGS to compile a file, generating dependencies
-as side-effects.
-
-Environment variables:
-  depmode     Dependency tracking mode.
-  source      Source file read by 'PROGRAMS ARGS'.
-  object      Object file output by 'PROGRAMS ARGS'.
-  DEPDIR      directory where to store dependencies.
-  depfile     Dependency file to output.
-  tmpdepfile  Temporary file to use when outputting dependencies.
-  libtool     Whether libtool is used (yes/no).
-
-Report bugs to <bug-automake@gnu.org>.
-EOF
-    exit $?
-    ;;
-  -v | --v*)
-    echo "depcomp $scriptversion"
-    exit $?
-    ;;
-esac
-
-# Get the directory component of the given path, and save it in the
-# global variables '$dir'.  Note that this directory component will
-# be either empty or ending with a '/' character.  This is deliberate.
-set_dir_from ()
-{
-  case $1 in
-    */*) dir=`echo "$1" | sed -e 's|/[^/]*$|/|'`;;
-      *) dir=;;
-  esac
-}
-
-# Get the suffix-stripped basename of the given path, and save it the
-# global variable '$base'.
-set_base_from ()
-{
-  base=`echo "$1" | sed -e 's|^.*/||' -e 's/\.[^.]*$//'`
-}
-
-# If no dependency file was actually created by the compiler invocation,
-# we still have to create a dummy depfile, to avoid errors with the
-# Makefile "include basename.Plo" scheme.
-make_dummy_depfile ()
-{
-  echo "#dummy" > "$depfile"
-}
-
-# Factor out some common post-processing of the generated depfile.
-# Requires the auxiliary global variable '$tmpdepfile' to be set.
-aix_post_process_depfile ()
-{
-  # If the compiler actually managed to produce a dependency file,
-  # post-process it.
-  if test -f "$tmpdepfile"; then
-    # Each line is of the form 'foo.o: dependency.h'.
-    # Do two passes, one to just change these to
-    #   $object: dependency.h
-    # and one to simply output
-    #   dependency.h:
-    # which is needed to avoid the deleted-header problem.
-    { sed -e "s,^.*\.[$lower]*:,$object:," < "$tmpdepfile"
-      sed -e "s,^.*\.[$lower]*:[$tab ]*,," -e 's,$,:,' < "$tmpdepfile"
-    } > "$depfile"
-    rm -f "$tmpdepfile"
-  else
-    make_dummy_depfile
-  fi
-}
-
-# A tabulation character.
-tab='	'
-# A newline character.
-nl='
-'
-# Character ranges might be problematic outside the C locale.
-# These definitions help.
-upper=ABCDEFGHIJKLMNOPQRSTUVWXYZ
-lower=abcdefghijklmnopqrstuvwxyz
-digits=0123456789
-alpha=${upper}${lower}
-
-if test -z "$depmode" || test -z "$source" || test -z "$object"; then
-  echo "depcomp: Variables source, object and depmode must be set" 1>&2
-  exit 1
-fi
-
-# Dependencies for sub/bar.o or sub/bar.obj go into sub/.deps/bar.Po.
-depfile=${depfile-`echo "$object" |
-  sed 's|[^\\/]*$|'${DEPDIR-.deps}'/&|;s|\.\([^.]*\)$|.P\1|;s|Pobj$|Po|'`}
-tmpdepfile=${tmpdepfile-`echo "$depfile" | sed 's/\.\([^.]*\)$/.T\1/'`}
-
-rm -f "$tmpdepfile"
-
-# Avoid interferences from the environment.
-gccflag= dashmflag=
-
-# Some modes work just like other modes, but use different flags.  We
-# parameterize here, but still list the modes in the big case below,
-# to make depend.m4 easier to write.  Note that we *cannot* use a case
-# here, because this file can only contain one case statement.
-if test "$depmode" = hp; then
-  # HP compiler uses -M and no extra arg.
-  gccflag=-M
-  depmode=gcc
-fi
-
-if test "$depmode" = dashXmstdout; then
-  # This is just like dashmstdout with a different argument.
-  dashmflag=-xM
-  depmode=dashmstdout
-fi
-
-cygpath_u="cygpath -u -f -"
-if test "$depmode" = msvcmsys; then
-  # This is just like msvisualcpp but w/o cygpath translation.
-  # Just convert the backslash-escaped backslashes to single forward
-  # slashes to satisfy depend.m4
-  cygpath_u='sed s,\\\\,/,g'
-  depmode=msvisualcpp
-fi
-
-if test "$depmode" = msvc7msys; then
-  # This is just like msvc7 but w/o cygpath translation.
-  # Just convert the backslash-escaped backslashes to single forward
-  # slashes to satisfy depend.m4
-  cygpath_u='sed s,\\\\,/,g'
-  depmode=msvc7
-fi
-
-if test "$depmode" = xlc; then
-  # IBM C/C++ Compilers xlc/xlC can output gcc-like dependency information.
-  gccflag=-qmakedep=gcc,-MF
-  depmode=gcc
-fi
-
-case "$depmode" in
-gcc3)
-## gcc 3 implements dependency tracking that does exactly what
-## we want.  Yay!  Note: for some reason libtool 1.4 doesn't like
-## it if -MD -MP comes after the -MF stuff.  Hmm.
-## Unfortunately, FreeBSD c89 acceptance of flags depends upon
-## the command line argument order; so add the flags where they
-## appear in depend2.am.  Note that the slowdown incurred here
-## affects only configure: in makefiles, %FASTDEP% shortcuts this.
-  for arg
-  do
-    case $arg in
-    -c) set fnord "$@" -MT "$object" -MD -MP -MF "$tmpdepfile" "$arg" ;;
-    *)  set fnord "$@" "$arg" ;;
-    esac
-    shift # fnord
-    shift # $arg
-  done
-  "$@"
-  stat=$?
-  if test $stat -ne 0; then
-    rm -f "$tmpdepfile"
-    exit $stat
-  fi
-  mv "$tmpdepfile" "$depfile"
-  ;;
-
-gcc)
-## Note that this doesn't just cater to obsosete pre-3.x GCC compilers.
-## but also to in-use compilers like IMB xlc/xlC and the HP C compiler.
-## (see the conditional assignment to $gccflag above).
-## There are various ways to get dependency output from gcc.  Here's
-## why we pick this rather obscure method:
-## - Don't want to use -MD because we'd like the dependencies to end
-##   up in a subdir.  Having to rename by hand is ugly.
-##   (We might end up doing this anyway to support other compilers.)
-## - The DEPENDENCIES_OUTPUT environment variable makes gcc act like
-##   -MM, not -M (despite what the docs say).  Also, it might not be
-##   supported by the other compilers which use the 'gcc' depmode.
-## - Using -M directly means running the compiler twice (even worse
-##   than renaming).
-  if test -z "$gccflag"; then
-    gccflag=-MD,
-  fi
-  "$@" -Wp,"$gccflag$tmpdepfile"
-  stat=$?
-  if test $stat -ne 0; then
-    rm -f "$tmpdepfile"
-    exit $stat
-  fi
-  rm -f "$depfile"
-  echo "$object : \\" > "$depfile"
-  # The second -e expression handles DOS-style file names with drive
-  # letters.
-  sed -e 's/^[^:]*: / /' \
-      -e 's/^['$alpha']:\/[^:]*: / /' < "$tmpdepfile" >> "$depfile"
-## This next piece of magic avoids the "deleted header file" problem.
-## The problem is that when a header file which appears in a .P file
-## is deleted, the dependency causes make to die (because there is
-## typically no way to rebuild the header).  We avoid this by adding
-## dummy dependencies for each header file.  Too bad gcc doesn't do
-## this for us directly.
-## Some versions of gcc put a space before the ':'.  On the theory
-## that the space means something, we add a space to the output as
-## well.  hp depmode also adds that space, but also prefixes the VPATH
-## to the object.  Take care to not repeat it in the output.
-## Some versions of the HPUX 10.20 sed can't process this invocation
-## correctly.  Breaking it into two sed invocations is a workaround.
-  tr ' ' "$nl" < "$tmpdepfile" \
-    | sed -e 's/^\\$//' -e '/^$/d' -e "s|.*$object$||" -e '/:$/d' \
-    | sed -e 's/$/ :/' >> "$depfile"
-  rm -f "$tmpdepfile"
-  ;;
-
-hp)
-  # This case exists only to let depend.m4 do its work.  It works by
-  # looking at the text of this script.  This case will never be run,
-  # since it is checked for above.
-  exit 1
-  ;;
-
-sgi)
-  if test "$libtool" = yes; then
-    "$@" "-Wp,-MDupdate,$tmpdepfile"
-  else
-    "$@" -MDupdate "$tmpdepfile"
-  fi
-  stat=$?
-  if test $stat -ne 0; then
-    rm -f "$tmpdepfile"
-    exit $stat
-  fi
-  rm -f "$depfile"
-
-  if test -f "$tmpdepfile"; then  # yes, the sourcefile depend on other files
-    echo "$object : \\" > "$depfile"
-    # Clip off the initial element (the dependent).  Don't try to be
-    # clever and replace this with sed code, as IRIX sed won't handle
-    # lines with more than a fixed number of characters (4096 in
-    # IRIX 6.2 sed, 8192 in IRIX 6.5).  We also remove comment lines;
-    # the IRIX cc adds comments like '#:fec' to the end of the
-    # dependency line.
-    tr ' ' "$nl" < "$tmpdepfile" \
-      | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' \
-      | tr "$nl" ' ' >> "$depfile"
-    echo >> "$depfile"
-    # The second pass generates a dummy entry for each header file.
-    tr ' ' "$nl" < "$tmpdepfile" \
-      | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \
-      >> "$depfile"
-  else
-    make_dummy_depfile
-  fi
-  rm -f "$tmpdepfile"
-  ;;
-
-xlc)
-  # This case exists only to let depend.m4 do its work.  It works by
-  # looking at the text of this script.  This case will never be run,
-  # since it is checked for above.
-  exit 1
-  ;;
-
-aix)
-  # The C for AIX Compiler uses -M and outputs the dependencies
-  # in a .u file.  In older versions, this file always lives in the
-  # current directory.  Also, the AIX compiler puts '$object:' at the
-  # start of each line; $object doesn't have directory information.
-  # Version 6 uses the directory in both cases.
-  set_dir_from "$object"
-  set_base_from "$object"
-  if test "$libtool" = yes; then
-    tmpdepfile1=$dir$base.u
-    tmpdepfile2=$base.u
-    tmpdepfile3=$dir.libs/$base.u
-    "$@" -Wc,-M
-  else
-    tmpdepfile1=$dir$base.u
-    tmpdepfile2=$dir$base.u
-    tmpdepfile3=$dir$base.u
-    "$@" -M
-  fi
-  stat=$?
-  if test $stat -ne 0; then
-    rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
-    exit $stat
-  fi
-
-  for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
-  do
-    test -f "$tmpdepfile" && break
-  done
-  aix_post_process_depfile
-  ;;
-
-tcc)
-  # tcc (Tiny C Compiler) understand '-MD -MF file' since version 0.9.26
-  # FIXME: That version still under development at the moment of writing.
-  #        Make that this statement remains true also for stable, released
-  #        versions.
-  # It will wrap lines (doesn't matter whether long or short) with a
-  # trailing '\', as in:
-  #
-  #   foo.o : \
-  #    foo.c \
-  #    foo.h \
-  #
-  # It will put a trailing '\' even on the last line, and will use leading
-  # spaces rather than leading tabs (at least since its commit 0394caf7
-  # "Emit spaces for -MD").
-  "$@" -MD -MF "$tmpdepfile"
-  stat=$?
-  if test $stat -ne 0; then
-    rm -f "$tmpdepfile"
-    exit $stat
-  fi
-  rm -f "$depfile"
-  # Each non-empty line is of the form 'foo.o : \' or ' dep.h \'.
-  # We have to change lines of the first kind to '$object: \'.
-  sed -e "s|.*:|$object :|" < "$tmpdepfile" > "$depfile"
-  # And for each line of the second kind, we have to emit a 'dep.h:'
-  # dummy dependency, to avoid the deleted-header problem.
-  sed -n -e 's|^  *\(.*\) *\\$|\1:|p' < "$tmpdepfile" >> "$depfile"
-  rm -f "$tmpdepfile"
-  ;;
-
-## The order of this option in the case statement is important, since the
-## shell code in configure will try each of these formats in the order
-## listed in this file.  A plain '-MD' option would be understood by many
-## compilers, so we must ensure this comes after the gcc and icc options.
-pgcc)
-  # Portland's C compiler understands '-MD'.
-  # Will always output deps to 'file.d' where file is the root name of the
-  # source file under compilation, even if file resides in a subdirectory.
-  # The object file name does not affect the name of the '.d' file.
-  # pgcc 10.2 will output
-  #    foo.o: sub/foo.c sub/foo.h
-  # and will wrap long lines using '\' :
-  #    foo.o: sub/foo.c ... \
-  #     sub/foo.h ... \
-  #     ...
-  set_dir_from "$object"
-  # Use the source, not the object, to determine the base name, since
-  # that's sadly what pgcc will do too.
-  set_base_from "$source"
-  tmpdepfile=$base.d
-
-  # For projects that build the same source file twice into different object
-  # files, the pgcc approach of using the *source* file root name can cause
-  # problems in parallel builds.  Use a locking strategy to avoid stomping on
-  # the same $tmpdepfile.
-  lockdir=$base.d-lock
-  trap "
-    echo '$0: caught signal, cleaning up...' >&2
-    rmdir '$lockdir'
-    exit 1
-  " 1 2 13 15
-  numtries=100
-  i=$numtries
-  while test $i -gt 0; do
-    # mkdir is a portable test-and-set.
-    if mkdir "$lockdir" 2>/dev/null; then
-      # This process acquired the lock.
-      "$@" -MD
-      stat=$?
-      # Release the lock.
-      rmdir "$lockdir"
-      break
-    else
-      # If the lock is being held by a different process, wait
-      # until the winning process is done or we timeout.
-      while test -d "$lockdir" && test $i -gt 0; do
-        sleep 1
-        i=`expr $i - 1`
-      done
-    fi
-    i=`expr $i - 1`
-  done
-  trap - 1 2 13 15
-  if test $i -le 0; then
-    echo "$0: failed to acquire lock after $numtries attempts" >&2
-    echo "$0: check lockdir '$lockdir'" >&2
-    exit 1
-  fi
-
-  if test $stat -ne 0; then
-    rm -f "$tmpdepfile"
-    exit $stat
-  fi
-  rm -f "$depfile"
-  # Each line is of the form `foo.o: dependent.h',
-  # or `foo.o: dep1.h dep2.h \', or ` dep3.h dep4.h \'.
-  # Do two passes, one to just change these to
-  # `$object: dependent.h' and one to simply `dependent.h:'.
-  sed "s,^[^:]*:,$object :," < "$tmpdepfile" > "$depfile"
-  # Some versions of the HPUX 10.20 sed can't process this invocation
-  # correctly.  Breaking it into two sed invocations is a workaround.
-  sed 's,^[^:]*: \(.*\)$,\1,;s/^\\$//;/^$/d;/:$/d' < "$tmpdepfile" \
-    | sed -e 's/$/ :/' >> "$depfile"
-  rm -f "$tmpdepfile"
-  ;;
-
-hp2)
-  # The "hp" stanza above does not work with aCC (C++) and HP's ia64
-  # compilers, which have integrated preprocessors.  The correct option
-  # to use with these is +Maked; it writes dependencies to a file named
-  # 'foo.d', which lands next to the object file, wherever that
-  # happens to be.
-  # Much of this is similar to the tru64 case; see comments there.
-  set_dir_from  "$object"
-  set_base_from "$object"
-  if test "$libtool" = yes; then
-    tmpdepfile1=$dir$base.d
-    tmpdepfile2=$dir.libs/$base.d
-    "$@" -Wc,+Maked
-  else
-    tmpdepfile1=$dir$base.d
-    tmpdepfile2=$dir$base.d
-    "$@" +Maked
-  fi
-  stat=$?
-  if test $stat -ne 0; then
-     rm -f "$tmpdepfile1" "$tmpdepfile2"
-     exit $stat
-  fi
-
-  for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2"
-  do
-    test -f "$tmpdepfile" && break
-  done
-  if test -f "$tmpdepfile"; then
-    sed -e "s,^.*\.[$lower]*:,$object:," "$tmpdepfile" > "$depfile"
-    # Add 'dependent.h:' lines.
-    sed -ne '2,${
-               s/^ *//
-               s/ \\*$//
-               s/$/:/
-               p
-             }' "$tmpdepfile" >> "$depfile"
-  else
-    make_dummy_depfile
-  fi
-  rm -f "$tmpdepfile" "$tmpdepfile2"
-  ;;
-
-tru64)
-  # The Tru64 compiler uses -MD to generate dependencies as a side
-  # effect.  'cc -MD -o foo.o ...' puts the dependencies into 'foo.o.d'.
-  # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put
-  # dependencies in 'foo.d' instead, so we check for that too.
-  # Subdirectories are respected.
-  set_dir_from  "$object"
-  set_base_from "$object"
-
-  if test "$libtool" = yes; then
-    # Libtool generates 2 separate objects for the 2 libraries.  These
-    # two compilations output dependencies in $dir.libs/$base.o.d and
-    # in $dir$base.o.d.  We have to check for both files, because
-    # one of the two compilations can be disabled.  We should prefer
-    # $dir$base.o.d over $dir.libs/$base.o.d because the latter is
-    # automatically cleaned when .libs/ is deleted, while ignoring
-    # the former would cause a distcleancheck panic.
-    tmpdepfile1=$dir$base.o.d          # libtool 1.5
-    tmpdepfile2=$dir.libs/$base.o.d    # Likewise.
-    tmpdepfile3=$dir.libs/$base.d      # Compaq CCC V6.2-504
-    "$@" -Wc,-MD
-  else
-    tmpdepfile1=$dir$base.d
-    tmpdepfile2=$dir$base.d
-    tmpdepfile3=$dir$base.d
-    "$@" -MD
-  fi
-
-  stat=$?
-  if test $stat -ne 0; then
-    rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
-    exit $stat
-  fi
-
-  for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
-  do
-    test -f "$tmpdepfile" && break
-  done
-  # Same post-processing that is required for AIX mode.
-  aix_post_process_depfile
-  ;;
-
-msvc7)
-  if test "$libtool" = yes; then
-    showIncludes=-Wc,-showIncludes
-  else
-    showIncludes=-showIncludes
-  fi
-  "$@" $showIncludes > "$tmpdepfile"
-  stat=$?
-  grep -v '^Note: including file: ' "$tmpdepfile"
-  if test $stat -ne 0; then
-    rm -f "$tmpdepfile"
-    exit $stat
-  fi
-  rm -f "$depfile"
-  echo "$object : \\" > "$depfile"
-  # The first sed program below extracts the file names and escapes
-  # backslashes for cygpath.  The second sed program outputs the file
-  # name when reading, but also accumulates all include files in the
-  # hold buffer in order to output them again at the end.  This only
-  # works with sed implementations that can handle large buffers.
-  sed < "$tmpdepfile" -n '
-/^Note: including file:  *\(.*\)/ {
-  s//\1/
-  s/\\/\\\\/g
-  p
-}' | $cygpath_u | sort -u | sed -n '
-s/ /\\ /g
-s/\(.*\)/'"$tab"'\1 \\/p
-s/.\(.*\) \\/\1:/
-H
-$ {
-  s/.*/'"$tab"'/
-  G
-  p
-}' >> "$depfile"
-  echo >> "$depfile" # make sure the fragment doesn't end with a backslash
-  rm -f "$tmpdepfile"
-  ;;
-
-msvc7msys)
-  # This case exists only to let depend.m4 do its work.  It works by
-  # looking at the text of this script.  This case will never be run,
-  # since it is checked for above.
-  exit 1
-  ;;
-
-#nosideeffect)
-  # This comment above is used by automake to tell side-effect
-  # dependency tracking mechanisms from slower ones.
-
-dashmstdout)
-  # Important note: in order to support this mode, a compiler *must*
-  # always write the preprocessed file to stdout, regardless of -o.
-  "$@" || exit $?
-
-  # Remove the call to Libtool.
-  if test "$libtool" = yes; then
-    while test "X$1" != 'X--mode=compile'; do
-      shift
-    done
-    shift
-  fi
-
-  # Remove '-o $object'.
-  IFS=" "
-  for arg
-  do
-    case $arg in
-    -o)
-      shift
-      ;;
-    $object)
-      shift
-      ;;
-    *)
-      set fnord "$@" "$arg"
-      shift # fnord
-      shift # $arg
-      ;;
-    esac
-  done
-
-  test -z "$dashmflag" && dashmflag=-M
-  # Require at least two characters before searching for ':'
-  # in the target name.  This is to cope with DOS-style filenames:
-  # a dependency such as 'c:/foo/bar' could be seen as target 'c' otherwise.
-  "$@" $dashmflag |
-    sed "s|^[$tab ]*[^:$tab ][^:][^:]*:[$tab ]*|$object: |" > "$tmpdepfile"
-  rm -f "$depfile"
-  cat < "$tmpdepfile" > "$depfile"
-  # Some versions of the HPUX 10.20 sed can't process this sed invocation
-  # correctly.  Breaking it into two sed invocations is a workaround.
-  tr ' ' "$nl" < "$tmpdepfile" \
-    | sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' \
-    | sed -e 's/$/ :/' >> "$depfile"
-  rm -f "$tmpdepfile"
-  ;;
-
-dashXmstdout)
-  # This case only exists to satisfy depend.m4.  It is never actually
-  # run, as this mode is specially recognized in the preamble.
-  exit 1
-  ;;
-
-makedepend)
-  "$@" || exit $?
-  # Remove any Libtool call
-  if test "$libtool" = yes; then
-    while test "X$1" != 'X--mode=compile'; do
-      shift
-    done
-    shift
-  fi
-  # X makedepend
-  shift
-  cleared=no eat=no
-  for arg
-  do
-    case $cleared in
-    no)
-      set ""; shift
-      cleared=yes ;;
-    esac
-    if test $eat = yes; then
-      eat=no
-      continue
-    fi
-    case "$arg" in
-    -D*|-I*)
-      set fnord "$@" "$arg"; shift ;;
-    # Strip any option that makedepend may not understand.  Remove
-    # the object too, otherwise makedepend will parse it as a source file.
-    -arch)
-      eat=yes ;;
-    -*|$object)
-      ;;
-    *)
-      set fnord "$@" "$arg"; shift ;;
-    esac
-  done
-  obj_suffix=`echo "$object" | sed 's/^.*\././'`
-  touch "$tmpdepfile"
-  ${MAKEDEPEND-makedepend} -o"$obj_suffix" -f"$tmpdepfile" "$@"
-  rm -f "$depfile"
-  # makedepend may prepend the VPATH from the source file name to the object.
-  # No need to regex-escape $object, excess matching of '.' is harmless.
-  sed "s|^.*\($object *:\)|\1|" "$tmpdepfile" > "$depfile"
-  # Some versions of the HPUX 10.20 sed can't process the last invocation
-  # correctly.  Breaking it into two sed invocations is a workaround.
-  sed '1,2d' "$tmpdepfile" \
-    | tr ' ' "$nl" \
-    | sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' \
-    | sed -e 's/$/ :/' >> "$depfile"
-  rm -f "$tmpdepfile" "$tmpdepfile".bak
-  ;;
-
-cpp)
-  # Important note: in order to support this mode, a compiler *must*
-  # always write the preprocessed file to stdout.
-  "$@" || exit $?
-
-  # Remove the call to Libtool.
-  if test "$libtool" = yes; then
-    while test "X$1" != 'X--mode=compile'; do
-      shift
-    done
-    shift
-  fi
-
-  # Remove '-o $object'.
-  IFS=" "
-  for arg
-  do
-    case $arg in
-    -o)
-      shift
-      ;;
-    $object)
-      shift
-      ;;
-    *)
-      set fnord "$@" "$arg"
-      shift # fnord
-      shift # $arg
-      ;;
-    esac
-  done
-
-  "$@" -E \
-    | sed -n -e '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \
-             -e '/^#line [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \
-    | sed '$ s: \\$::' > "$tmpdepfile"
-  rm -f "$depfile"
-  echo "$object : \\" > "$depfile"
-  cat < "$tmpdepfile" >> "$depfile"
-  sed < "$tmpdepfile" '/^$/d;s/^ //;s/ \\$//;s/$/ :/' >> "$depfile"
-  rm -f "$tmpdepfile"
-  ;;
-
-msvisualcpp)
-  # Important note: in order to support this mode, a compiler *must*
-  # always write the preprocessed file to stdout.
-  "$@" || exit $?
-
-  # Remove the call to Libtool.
-  if test "$libtool" = yes; then
-    while test "X$1" != 'X--mode=compile'; do
-      shift
-    done
-    shift
-  fi
-
-  IFS=" "
-  for arg
-  do
-    case "$arg" in
-    -o)
-      shift
-      ;;
-    $object)
-      shift
-      ;;
-    "-Gm"|"/Gm"|"-Gi"|"/Gi"|"-ZI"|"/ZI")
-        set fnord "$@"
-        shift
-        shift
-        ;;
-    *)
-        set fnord "$@" "$arg"
-        shift
-        shift
-        ;;
-    esac
-  done
-  "$@" -E 2>/dev/null |
-  sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::\1:p' | $cygpath_u | sort -u > "$tmpdepfile"
-  rm -f "$depfile"
-  echo "$object : \\" > "$depfile"
-  sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::'"$tab"'\1 \\:p' >> "$depfile"
-  echo "$tab" >> "$depfile"
-  sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::\1\::p' >> "$depfile"
-  rm -f "$tmpdepfile"
-  ;;
-
-msvcmsys)
-  # This case exists only to let depend.m4 do its work.  It works by
-  # looking at the text of this script.  This case will never be run,
-  # since it is checked for above.
-  exit 1
-  ;;
-
-none)
-  exec "$@"
-  ;;
-
-*)
-  echo "Unknown depmode $depmode" 1>&2
-  exit 1
-  ;;
-esac
-
-exit 0
-
-# Local Variables:
-# mode: shell-script
-# sh-indentation: 2
-# eval: (add-hook 'before-save-hook 'time-stamp)
-# time-stamp-start: "scriptversion="
-# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-time-zone: "UTC0"
-# time-stamp-end: "; # UTC"
-# End:
diff --git a/submodules/libtgvoip/install-sh b/submodules/libtgvoip/install-sh
deleted file mode 100755
index 8175c640fe..0000000000
--- a/submodules/libtgvoip/install-sh
+++ /dev/null
@@ -1,518 +0,0 @@
-#!/bin/sh
-# install - install a program, script, or datafile
-
-scriptversion=2018-03-11.20; # UTC
-
-# This originates from X11R5 (mit/util/scripts/install.sh), which was
-# later released in X11R6 (xc/config/util/install.sh) with the
-# following copyright and license.
-#
-# Copyright (C) 1994 X Consortium
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to
-# deal in the Software without restriction, including without limitation the
-# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-# sell copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-# X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-# AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC-
-# TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-#
-# Except as contained in this notice, the name of the X Consortium shall not
-# be used in advertising or otherwise to promote the sale, use or other deal-
-# ings in this Software without prior written authorization from the X Consor-
-# tium.
-#
-#
-# FSF changes to this file are in the public domain.
-#
-# Calling this script install-sh is preferred over install.sh, to prevent
-# 'make' implicit rules from creating a file called install from it
-# when there is no Makefile.
-#
-# This script is compatible with the BSD install script, but was written
-# from scratch.
-
-tab='	'
-nl='
-'
-IFS=" $tab$nl"
-
-# Set DOITPROG to "echo" to test this script.
-
-doit=${DOITPROG-}
-doit_exec=${doit:-exec}
-
-# Put in absolute file names if you don't have them in your path;
-# or use environment vars.
-
-chgrpprog=${CHGRPPROG-chgrp}
-chmodprog=${CHMODPROG-chmod}
-chownprog=${CHOWNPROG-chown}
-cmpprog=${CMPPROG-cmp}
-cpprog=${CPPROG-cp}
-mkdirprog=${MKDIRPROG-mkdir}
-mvprog=${MVPROG-mv}
-rmprog=${RMPROG-rm}
-stripprog=${STRIPPROG-strip}
-
-posix_mkdir=
-
-# Desired mode of installed file.
-mode=0755
-
-chgrpcmd=
-chmodcmd=$chmodprog
-chowncmd=
-mvcmd=$mvprog
-rmcmd="$rmprog -f"
-stripcmd=
-
-src=
-dst=
-dir_arg=
-dst_arg=
-
-copy_on_change=false
-is_target_a_directory=possibly
-
-usage="\
-Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE
-   or: $0 [OPTION]... SRCFILES... DIRECTORY
-   or: $0 [OPTION]... -t DIRECTORY SRCFILES...
-   or: $0 [OPTION]... -d DIRECTORIES...
-
-In the 1st form, copy SRCFILE to DSTFILE.
-In the 2nd and 3rd, copy all SRCFILES to DIRECTORY.
-In the 4th, create DIRECTORIES.
-
-Options:
-     --help     display this help and exit.
-     --version  display version info and exit.
-
-  -c            (ignored)
-  -C            install only if different (preserve the last data modification time)
-  -d            create directories instead of installing files.
-  -g GROUP      $chgrpprog installed files to GROUP.
-  -m MODE       $chmodprog installed files to MODE.
-  -o USER       $chownprog installed files to USER.
-  -s            $stripprog installed files.
-  -t DIRECTORY  install into DIRECTORY.
-  -T            report an error if DSTFILE is a directory.
-
-Environment variables override the default commands:
-  CHGRPPROG CHMODPROG CHOWNPROG CMPPROG CPPROG MKDIRPROG MVPROG
-  RMPROG STRIPPROG
-"
-
-while test $# -ne 0; do
-  case $1 in
-    -c) ;;
-
-    -C) copy_on_change=true;;
-
-    -d) dir_arg=true;;
-
-    -g) chgrpcmd="$chgrpprog $2"
-        shift;;
-
-    --help) echo "$usage"; exit $?;;
-
-    -m) mode=$2
-        case $mode in
-          *' '* | *"$tab"* | *"$nl"* | *'*'* | *'?'* | *'['*)
-            echo "$0: invalid mode: $mode" >&2
-            exit 1;;
-        esac
-        shift;;
-
-    -o) chowncmd="$chownprog $2"
-        shift;;
-
-    -s) stripcmd=$stripprog;;
-
-    -t)
-        is_target_a_directory=always
-        dst_arg=$2
-        # Protect names problematic for 'test' and other utilities.
-        case $dst_arg in
-          -* | [=\(\)!]) dst_arg=./$dst_arg;;
-        esac
-        shift;;
-
-    -T) is_target_a_directory=never;;
-
-    --version) echo "$0 $scriptversion"; exit $?;;
-
-    --) shift
-        break;;
-
-    -*) echo "$0: invalid option: $1" >&2
-        exit 1;;
-
-    *)  break;;
-  esac
-  shift
-done
-
-# We allow the use of options -d and -T together, by making -d
-# take the precedence; this is for compatibility with GNU install.
-
-if test -n "$dir_arg"; then
-  if test -n "$dst_arg"; then
-    echo "$0: target directory not allowed when installing a directory." >&2
-    exit 1
-  fi
-fi
-
-if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then
-  # When -d is used, all remaining arguments are directories to create.
-  # When -t is used, the destination is already specified.
-  # Otherwise, the last argument is the destination.  Remove it from $@.
-  for arg
-  do
-    if test -n "$dst_arg"; then
-      # $@ is not empty: it contains at least $arg.
-      set fnord "$@" "$dst_arg"
-      shift # fnord
-    fi
-    shift # arg
-    dst_arg=$arg
-    # Protect names problematic for 'test' and other utilities.
-    case $dst_arg in
-      -* | [=\(\)!]) dst_arg=./$dst_arg;;
-    esac
-  done
-fi
-
-if test $# -eq 0; then
-  if test -z "$dir_arg"; then
-    echo "$0: no input file specified." >&2
-    exit 1
-  fi
-  # It's OK to call 'install-sh -d' without argument.
-  # This can happen when creating conditional directories.
-  exit 0
-fi
-
-if test -z "$dir_arg"; then
-  if test $# -gt 1 || test "$is_target_a_directory" = always; then
-    if test ! -d "$dst_arg"; then
-      echo "$0: $dst_arg: Is not a directory." >&2
-      exit 1
-    fi
-  fi
-fi
-
-if test -z "$dir_arg"; then
-  do_exit='(exit $ret); exit $ret'
-  trap "ret=129; $do_exit" 1
-  trap "ret=130; $do_exit" 2
-  trap "ret=141; $do_exit" 13
-  trap "ret=143; $do_exit" 15
-
-  # Set umask so as not to create temps with too-generous modes.
-  # However, 'strip' requires both read and write access to temps.
-  case $mode in
-    # Optimize common cases.
-    *644) cp_umask=133;;
-    *755) cp_umask=22;;
-
-    *[0-7])
-      if test -z "$stripcmd"; then
-        u_plus_rw=
-      else
-        u_plus_rw='% 200'
-      fi
-      cp_umask=`expr '(' 777 - $mode % 1000 ')' $u_plus_rw`;;
-    *)
-      if test -z "$stripcmd"; then
-        u_plus_rw=
-      else
-        u_plus_rw=,u+rw
-      fi
-      cp_umask=$mode$u_plus_rw;;
-  esac
-fi
-
-for src
-do
-  # Protect names problematic for 'test' and other utilities.
-  case $src in
-    -* | [=\(\)!]) src=./$src;;
-  esac
-
-  if test -n "$dir_arg"; then
-    dst=$src
-    dstdir=$dst
-    test -d "$dstdir"
-    dstdir_status=$?
-  else
-
-    # Waiting for this to be detected by the "$cpprog $src $dsttmp" command
-    # might cause directories to be created, which would be especially bad
-    # if $src (and thus $dsttmp) contains '*'.
-    if test ! -f "$src" && test ! -d "$src"; then
-      echo "$0: $src does not exist." >&2
-      exit 1
-    fi
-
-    if test -z "$dst_arg"; then
-      echo "$0: no destination specified." >&2
-      exit 1
-    fi
-    dst=$dst_arg
-
-    # If destination is a directory, append the input filename.
-    if test -d "$dst"; then
-      if test "$is_target_a_directory" = never; then
-        echo "$0: $dst_arg: Is a directory" >&2
-        exit 1
-      fi
-      dstdir=$dst
-      dstbase=`basename "$src"`
-      case $dst in
-	*/) dst=$dst$dstbase;;
-	*)  dst=$dst/$dstbase;;
-      esac
-      dstdir_status=0
-    else
-      dstdir=`dirname "$dst"`
-      test -d "$dstdir"
-      dstdir_status=$?
-    fi
-  fi
-
-  case $dstdir in
-    */) dstdirslash=$dstdir;;
-    *)  dstdirslash=$dstdir/;;
-  esac
-
-  obsolete_mkdir_used=false
-
-  if test $dstdir_status != 0; then
-    case $posix_mkdir in
-      '')
-        # Create intermediate dirs using mode 755 as modified by the umask.
-        # This is like FreeBSD 'install' as of 1997-10-28.
-        umask=`umask`
-        case $stripcmd.$umask in
-          # Optimize common cases.
-          *[2367][2367]) mkdir_umask=$umask;;
-          .*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;;
-
-          *[0-7])
-            mkdir_umask=`expr $umask + 22 \
-              - $umask % 100 % 40 + $umask % 20 \
-              - $umask % 10 % 4 + $umask % 2
-            `;;
-          *) mkdir_umask=$umask,go-w;;
-        esac
-
-        # With -d, create the new directory with the user-specified mode.
-        # Otherwise, rely on $mkdir_umask.
-        if test -n "$dir_arg"; then
-          mkdir_mode=-m$mode
-        else
-          mkdir_mode=
-        fi
-
-        posix_mkdir=false
-        case $umask in
-          *[123567][0-7][0-7])
-            # POSIX mkdir -p sets u+wx bits regardless of umask, which
-            # is incompatible with FreeBSD 'install' when (umask & 300) != 0.
-            ;;
-          *)
-            # Note that $RANDOM variable is not portable (e.g. dash);  Use it
-            # here however when possible just to lower collision chance.
-            tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$
-
-            trap 'ret=$?; rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir" 2>/dev/null; exit $ret' 0
-
-            # Because "mkdir -p" follows existing symlinks and we likely work
-            # directly in world-writeable /tmp, make sure that the '$tmpdir'
-            # directory is successfully created first before we actually test
-            # 'mkdir -p' feature.
-            if (umask $mkdir_umask &&
-                $mkdirprog $mkdir_mode "$tmpdir" &&
-                exec $mkdirprog $mkdir_mode -p -- "$tmpdir/a/b") >/dev/null 2>&1
-            then
-              if test -z "$dir_arg" || {
-                   # Check for POSIX incompatibilities with -m.
-                   # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or
-                   # other-writable bit of parent directory when it shouldn't.
-                   # FreeBSD 6.1 mkdir -m -p sets mode of existing directory.
-                   test_tmpdir="$tmpdir/a"
-                   ls_ld_tmpdir=`ls -ld "$test_tmpdir"`
-                   case $ls_ld_tmpdir in
-                     d????-?r-*) different_mode=700;;
-                     d????-?--*) different_mode=755;;
-                     *) false;;
-                   esac &&
-                   $mkdirprog -m$different_mode -p -- "$test_tmpdir" && {
-                     ls_ld_tmpdir_1=`ls -ld "$test_tmpdir"`
-                     test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1"
-                   }
-                 }
-              then posix_mkdir=:
-              fi
-              rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir"
-            else
-              # Remove any dirs left behind by ancient mkdir implementations.
-              rmdir ./$mkdir_mode ./-p ./-- "$tmpdir" 2>/dev/null
-            fi
-            trap '' 0;;
-        esac;;
-    esac
-
-    if
-      $posix_mkdir && (
-        umask $mkdir_umask &&
-        $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir"
-      )
-    then :
-    else
-
-      # The umask is ridiculous, or mkdir does not conform to POSIX,
-      # or it failed possibly due to a race condition.  Create the
-      # directory the slow way, step by step, checking for races as we go.
-
-      case $dstdir in
-        /*) prefix='/';;
-        [-=\(\)!]*) prefix='./';;
-        *)  prefix='';;
-      esac
-
-      oIFS=$IFS
-      IFS=/
-      set -f
-      set fnord $dstdir
-      shift
-      set +f
-      IFS=$oIFS
-
-      prefixes=
-
-      for d
-      do
-        test X"$d" = X && continue
-
-        prefix=$prefix$d
-        if test -d "$prefix"; then
-          prefixes=
-        else
-          if $posix_mkdir; then
-            (umask=$mkdir_umask &&
-             $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break
-            # Don't fail if two instances are running concurrently.
-            test -d "$prefix" || exit 1
-          else
-            case $prefix in
-              *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;;
-              *) qprefix=$prefix;;
-            esac
-            prefixes="$prefixes '$qprefix'"
-          fi
-        fi
-        prefix=$prefix/
-      done
-
-      if test -n "$prefixes"; then
-        # Don't fail if two instances are running concurrently.
-        (umask $mkdir_umask &&
-         eval "\$doit_exec \$mkdirprog $prefixes") ||
-          test -d "$dstdir" || exit 1
-        obsolete_mkdir_used=true
-      fi
-    fi
-  fi
-
-  if test -n "$dir_arg"; then
-    { test -z "$chowncmd" || $doit $chowncmd "$dst"; } &&
-    { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } &&
-    { test "$obsolete_mkdir_used$chowncmd$chgrpcmd" = false ||
-      test -z "$chmodcmd" || $doit $chmodcmd $mode "$dst"; } || exit 1
-  else
-
-    # Make a couple of temp file names in the proper directory.
-    dsttmp=${dstdirslash}_inst.$$_
-    rmtmp=${dstdirslash}_rm.$$_
-
-    # Trap to clean up those temp files at exit.
-    trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0
-
-    # Copy the file name to the temp name.
-    (umask $cp_umask && $doit_exec $cpprog "$src" "$dsttmp") &&
-
-    # and set any options; do chmod last to preserve setuid bits.
-    #
-    # If any of these fail, we abort the whole thing.  If we want to
-    # ignore errors from any of these, just make sure not to ignore
-    # errors from the above "$doit $cpprog $src $dsttmp" command.
-    #
-    { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } &&
-    { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } &&
-    { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } &&
-    { test -z "$chmodcmd" || $doit $chmodcmd $mode "$dsttmp"; } &&
-
-    # If -C, don't bother to copy if it wouldn't change the file.
-    if $copy_on_change &&
-       old=`LC_ALL=C ls -dlL "$dst"     2>/dev/null` &&
-       new=`LC_ALL=C ls -dlL "$dsttmp"  2>/dev/null` &&
-       set -f &&
-       set X $old && old=:$2:$4:$5:$6 &&
-       set X $new && new=:$2:$4:$5:$6 &&
-       set +f &&
-       test "$old" = "$new" &&
-       $cmpprog "$dst" "$dsttmp" >/dev/null 2>&1
-    then
-      rm -f "$dsttmp"
-    else
-      # Rename the file to the real destination.
-      $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null ||
-
-      # The rename failed, perhaps because mv can't rename something else
-      # to itself, or perhaps because mv is so ancient that it does not
-      # support -f.
-      {
-        # Now remove or move aside any old file at destination location.
-        # We try this two ways since rm can't unlink itself on some
-        # systems and the destination file might be busy for other
-        # reasons.  In this case, the final cleanup might fail but the new
-        # file should still install successfully.
-        {
-          test ! -f "$dst" ||
-          $doit $rmcmd -f "$dst" 2>/dev/null ||
-          { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null &&
-            { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; }
-          } ||
-          { echo "$0: cannot unlink or rename $dst" >&2
-            (exit 1); exit 1
-          }
-        } &&
-
-        # Now rename the file to the real destination.
-        $doit $mvcmd "$dsttmp" "$dst"
-      }
-    fi || exit 1
-
-    trap '' 0
-  fi
-done
-
-# Local variables:
-# eval: (add-hook 'before-save-hook 'time-stamp)
-# time-stamp-start: "scriptversion="
-# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-time-zone: "UTC0"
-# time-stamp-end: "; # UTC"
-# End:
diff --git a/submodules/libtgvoip/json11.cpp b/submodules/libtgvoip/json11.cpp
deleted file mode 100755
index 812e610315..0000000000
--- a/submodules/libtgvoip/json11.cpp
+++ /dev/null
@@ -1,795 +0,0 @@
-/* Copyright (c) 2013 Dropbox, Inc.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-
-#include "json11.hpp"
-#include <cassert>
-#include <cmath>
-#include <cstdlib>
-#include <cstdio>
-#include <limits>
-#include <sstream>
-#include <locale>
-
-namespace json11 {
-
-static const int max_depth = 200;
-
-using std::string;
-using std::vector;
-using std::map;
-using std::make_shared;
-using std::initializer_list;
-using std::move;
-
-/* Helper for representing null - just a do-nothing struct, plus comparison
- * operators so the helpers in JsonValue work. We can't use nullptr_t because
- * it may not be orderable.
- */
-struct NullStruct {
-    bool operator==(NullStruct) const { return true; }
-    bool operator<(NullStruct) const { return false; }
-};
-
-/* * * * * * * * * * * * * * * * * * * *
- * Serialization
- */
-
-static void dump(NullStruct, string &out) {
-    out += "null";
-}
-
-static void dump(double value, string &out) {
-    if (std::isfinite(value)) {
-        std::ostringstream stm;
-        stm.imbue(std::locale("C"));
-        stm << value;
-        out += stm.str();
-    } else {
-        out += "null";
-    }
-}
-
-static void dump(int value, string &out) {
-    char buf[32];
-    snprintf(buf, sizeof buf, "%d", value);
-    out += buf;
-}
-
-static void dump(bool value, string &out) {
-    out += value ? "true" : "false";
-}
-
-static void dump(const string &value, string &out) {
-    out += '"';
-    for (size_t i = 0; i < value.length(); i++) {
-        const char ch = value[i];
-        if (ch == '\\') {
-            out += "\\\\";
-        } else if (ch == '"') {
-            out += "\\\"";
-        } else if (ch == '\b') {
-            out += "\\b";
-        } else if (ch == '\f') {
-            out += "\\f";
-        } else if (ch == '\n') {
-            out += "\\n";
-        } else if (ch == '\r') {
-            out += "\\r";
-        } else if (ch == '\t') {
-            out += "\\t";
-        } else if (static_cast<uint8_t>(ch) <= 0x1f) {
-            char buf[8];
-            snprintf(buf, sizeof buf, "\\u%04x", ch);
-            out += buf;
-        } else if (static_cast<uint8_t>(ch) == 0xe2 && static_cast<uint8_t>(value[i+1]) == 0x80
-                   && static_cast<uint8_t>(value[i+2]) == 0xa8) {
-            out += "\\u2028";
-            i += 2;
-        } else if (static_cast<uint8_t>(ch) == 0xe2 && static_cast<uint8_t>(value[i+1]) == 0x80
-                   && static_cast<uint8_t>(value[i+2]) == 0xa9) {
-            out += "\\u2029";
-            i += 2;
-        } else {
-            out += ch;
-        }
-    }
-    out += '"';
-}
-
-static void dump(const Json::array &values, string &out) {
-    bool first = true;
-    out += "[";
-    for (const auto &value : values) {
-        if (!first)
-            out += ", ";
-        value.dump(out);
-        first = false;
-    }
-    out += "]";
-}
-
-static void dump(const Json::object &values, string &out) {
-    bool first = true;
-    out += "{";
-    for (const auto &kv : values) {
-        if (!first)
-            out += ", ";
-        dump(kv.first, out);
-        out += ": ";
-        kv.second.dump(out);
-        first = false;
-    }
-    out += "}";
-}
-
-void Json::dump(string &out) const {
-    m_ptr->dump(out);
-}
-
-/* * * * * * * * * * * * * * * * * * * *
- * Value wrappers
- */
-
-template <Json::Type tag, typename T>
-class Value : public JsonValue {
-protected:
-
-    // Constructors
-    explicit Value(const T &value) : m_value(value) {}
-    explicit Value(T &&value)      : m_value(move(value)) {}
-
-    // Get type tag
-    Json::Type type() const override {
-        return tag;
-    }
-
-    // Comparisons
-    bool equals(const JsonValue * other) const override {
-        return m_value == static_cast<const Value<tag, T> *>(other)->m_value;
-    }
-    bool less(const JsonValue * other) const override {
-        return m_value < static_cast<const Value<tag, T> *>(other)->m_value;
-    }
-
-    const T m_value;
-    void dump(string &out) const override { json11::dump(m_value, out); }
-};
-
-class JsonDouble final : public Value<Json::NUMBER, double> {
-    double number_value() const override { return m_value; }
-    int int_value() const override { return static_cast<int>(m_value); }
-    bool equals(const JsonValue * other) const override { return m_value == other->number_value(); }
-    bool less(const JsonValue * other)   const override { return m_value <  other->number_value(); }
-public:
-    explicit JsonDouble(double value) : Value(value) {}
-};
-
-class JsonInt final : public Value<Json::NUMBER, int> {
-    double number_value() const override { return m_value; }
-    int int_value() const override { return m_value; }
-    bool equals(const JsonValue * other) const override { return m_value == other->number_value(); }
-    bool less(const JsonValue * other)   const override { return m_value <  other->number_value(); }
-public:
-    explicit JsonInt(int value) : Value(value) {}
-};
-
-class JsonBoolean final : public Value<Json::BOOL, bool> {
-    bool bool_value() const override { return m_value; }
-public:
-    explicit JsonBoolean(bool value) : Value(value) {}
-};
-
-class JsonString final : public Value<Json::STRING, string> {
-    const string &string_value() const override { return m_value; }
-public:
-    explicit JsonString(const string &value) : Value(value) {}
-    explicit JsonString(string &&value)      : Value(move(value)) {}
-};
-
-class JsonArray final : public Value<Json::ARRAY, Json::array> {
-    const Json::array &array_items() const override { return m_value; }
-    const Json & operator[](size_t i) const override;
-public:
-    explicit JsonArray(const Json::array &value) : Value(value) {}
-    explicit JsonArray(Json::array &&value)      : Value(move(value)) {}
-};
-
-class JsonObject final : public Value<Json::OBJECT, Json::object> {
-    const Json::object &object_items() const override { return m_value; }
-    const Json & operator[](const string &key) const override;
-public:
-    explicit JsonObject(const Json::object &value) : Value(value) {}
-    explicit JsonObject(Json::object &&value)      : Value(move(value)) {}
-};
-
-class JsonNull final : public Value<Json::NUL, NullStruct> {
-public:
-    JsonNull() : Value({}) {}
-};
-
-/* * * * * * * * * * * * * * * * * * * *
- * Static globals - static-init-safe
- */
-struct Statics {
-    const std::shared_ptr<JsonValue> null = make_shared<JsonNull>();
-    const std::shared_ptr<JsonValue> t = make_shared<JsonBoolean>(true);
-    const std::shared_ptr<JsonValue> f = make_shared<JsonBoolean>(false);
-    const string empty_string;
-    const vector<Json> empty_vector;
-    const map<string, Json> empty_map;
-    Statics() {}
-};
-
-static const Statics & statics() {
-    static const Statics s {};
-    return s;
-}
-
-static const Json & static_null() {
-    // This has to be separate, not in Statics, because Json() accesses statics().null.
-    static const Json json_null;
-    return json_null;
-}
-
-/* * * * * * * * * * * * * * * * * * * *
- * Constructors
- */
-
-Json::Json() noexcept                  : m_ptr(statics().null) {}
-Json::Json(std::nullptr_t) noexcept    : m_ptr(statics().null) {}
-Json::Json(double value)               : m_ptr(make_shared<JsonDouble>(value)) {}
-Json::Json(int value)                  : m_ptr(make_shared<JsonInt>(value)) {}
-Json::Json(bool value)                 : m_ptr(value ? statics().t : statics().f) {}
-Json::Json(const string &value)        : m_ptr(make_shared<JsonString>(value)) {}
-Json::Json(string &&value)             : m_ptr(make_shared<JsonString>(move(value))) {}
-Json::Json(const char * value)         : m_ptr(make_shared<JsonString>(value)) {}
-Json::Json(const Json::array &values)  : m_ptr(make_shared<JsonArray>(values)) {}
-Json::Json(Json::array &&values)       : m_ptr(make_shared<JsonArray>(move(values))) {}
-Json::Json(const Json::object &values) : m_ptr(make_shared<JsonObject>(values)) {}
-Json::Json(Json::object &&values)      : m_ptr(make_shared<JsonObject>(move(values))) {}
-
-/* * * * * * * * * * * * * * * * * * * *
- * Accessors
- */
-
-Json::Type Json::type()                           const { return m_ptr->type();         }
-double Json::number_value()                       const { return m_ptr->number_value(); }
-int Json::int_value()                             const { return m_ptr->int_value();    }
-bool Json::bool_value()                           const { return m_ptr->bool_value();   }
-const string & Json::string_value()               const { return m_ptr->string_value(); }
-const vector<Json> & Json::array_items()          const { return m_ptr->array_items();  }
-const map<string, Json> & Json::object_items()    const { return m_ptr->object_items(); }
-const Json & Json::operator[] (size_t i)          const { return (*m_ptr)[i];           }
-const Json & Json::operator[] (const string &key) const { return (*m_ptr)[key];         }
-
-double                    JsonValue::number_value()              const { return 0; }
-int                       JsonValue::int_value()                 const { return 0; }
-bool                      JsonValue::bool_value()                const { return false; }
-const string &            JsonValue::string_value()              const { return statics().empty_string; }
-const vector<Json> &      JsonValue::array_items()               const { return statics().empty_vector; }
-const map<string, Json> & JsonValue::object_items()              const { return statics().empty_map; }
-const Json &              JsonValue::operator[] (size_t)         const { return static_null(); }
-const Json &              JsonValue::operator[] (const string &) const { return static_null(); }
-
-const Json & JsonObject::operator[] (const string &key) const {
-    auto iter = m_value.find(key);
-    return (iter == m_value.end()) ? static_null() : iter->second;
-}
-const Json & JsonArray::operator[] (size_t i) const {
-    if (i >= m_value.size()) return static_null();
-    else return m_value[i];
-}
-
-/* * * * * * * * * * * * * * * * * * * *
- * Comparison
- */
-
-bool Json::operator== (const Json &other) const {
-    if (m_ptr == other.m_ptr)
-        return true;
-    if (m_ptr->type() != other.m_ptr->type())
-        return false;
-
-    return m_ptr->equals(other.m_ptr.get());
-}
-
-bool Json::operator< (const Json &other) const {
-    if (m_ptr == other.m_ptr)
-        return false;
-    if (m_ptr->type() != other.m_ptr->type())
-        return m_ptr->type() < other.m_ptr->type();
-
-    return m_ptr->less(other.m_ptr.get());
-}
-
-/* * * * * * * * * * * * * * * * * * * *
- * Parsing
- */
-
-/* esc(c)
- *
- * Format char c suitable for printing in an error message.
- */
-static inline string esc(char c) {
-    char buf[12];
-    if (static_cast<uint8_t>(c) >= 0x20 && static_cast<uint8_t>(c) <= 0x7f) {
-        snprintf(buf, sizeof buf, "'%c' (%d)", c, c);
-    } else {
-        snprintf(buf, sizeof buf, "(%d)", c);
-    }
-    return string(buf);
-}
-
-static inline bool in_range(long x, long lower, long upper) {
-    return (x >= lower && x <= upper);
-}
-
-namespace {
-/* JsonParser
- *
- * Object that tracks all state of an in-progress parse.
- */
-struct JsonParser final {
-
-    /* State
-     */
-    const string &str;
-    size_t i;
-    string &err;
-    bool failed;
-    const JsonParse strategy;
-
-    /* fail(msg, err_ret = Json())
-     *
-     * Mark this parse as failed.
-     */
-    Json fail(string &&msg) {
-        return fail(move(msg), Json());
-    }
-
-    template <typename T>
-    T fail(string &&msg, const T err_ret) {
-        if (!failed)
-            err = std::move(msg);
-        failed = true;
-        return err_ret;
-    }
-
-    /* consume_whitespace()
-     *
-     * Advance until the current character is non-whitespace.
-     */
-    void consume_whitespace() {
-        while (str[i] == ' ' || str[i] == '\r' || str[i] == '\n' || str[i] == '\t')
-            i++;
-    }
-
-    /* consume_comment()
-     *
-     * Advance comments (c-style inline and multiline).
-     */
-    bool consume_comment() {
-      bool comment_found = false;
-      if (str[i] == '/') {
-        i++;
-        if (i == str.size())
-          return fail("unexpected end of input after start of comment", false);
-        if (str[i] == '/') { // inline comment
-          i++;
-          // advance until next line, or end of input
-          while (i < str.size() && str[i] != '\n') {
-            i++;
-          }
-          comment_found = true;
-        }
-        else if (str[i] == '*') { // multiline comment
-          i++;
-          if (i > str.size()-2)
-            return fail("unexpected end of input inside multi-line comment", false);
-          // advance until closing tokens
-          while (!(str[i] == '*' && str[i+1] == '/')) {
-            i++;
-            if (i > str.size()-2)
-              return fail(
-                "unexpected end of input inside multi-line comment", false);
-          }
-          i += 2;
-          comment_found = true;
-        }
-        else
-          return fail("malformed comment", false);
-      }
-      return comment_found;
-    }
-
-    /* consume_garbage()
-     *
-     * Advance until the current character is non-whitespace and non-comment.
-     */
-    void consume_garbage() {
-      consume_whitespace();
-      if(strategy == JsonParse::COMMENTS) {
-        bool comment_found = false;
-        do {
-          comment_found = consume_comment();
-          if (failed) return;
-          consume_whitespace();
-        }
-        while(comment_found);
-      }
-    }
-
-    /* get_next_token()
-     *
-     * Return the next non-whitespace character. If the end of the input is reached,
-     * flag an error and return 0.
-     */
-    char get_next_token() {
-        consume_garbage();
-        if (failed) return (char)0;
-        if (i == str.size())
-            return fail("unexpected end of input", (char)0);
-
-        return str[i++];
-    }
-
-    /* encode_utf8(pt, out)
-     *
-     * Encode pt as UTF-8 and add it to out.
-     */
-    void encode_utf8(long pt, string & out) {
-        if (pt < 0)
-            return;
-
-        if (pt < 0x80) {
-            out += static_cast<char>(pt);
-        } else if (pt < 0x800) {
-            out += static_cast<char>((pt >> 6) | 0xC0);
-            out += static_cast<char>((pt & 0x3F) | 0x80);
-        } else if (pt < 0x10000) {
-            out += static_cast<char>((pt >> 12) | 0xE0);
-            out += static_cast<char>(((pt >> 6) & 0x3F) | 0x80);
-            out += static_cast<char>((pt & 0x3F) | 0x80);
-        } else {
-            out += static_cast<char>((pt >> 18) | 0xF0);
-            out += static_cast<char>(((pt >> 12) & 0x3F) | 0x80);
-            out += static_cast<char>(((pt >> 6) & 0x3F) | 0x80);
-            out += static_cast<char>((pt & 0x3F) | 0x80);
-        }
-    }
-
-    /* parse_string()
-     *
-     * Parse a string, starting at the current position.
-     */
-    string parse_string() {
-        string out;
-        long last_escaped_codepoint = -1;
-        while (true) {
-            if (i == str.size())
-                return fail("unexpected end of input in string", "");
-
-            char ch = str[i++];
-
-            if (ch == '"') {
-                encode_utf8(last_escaped_codepoint, out);
-                return out;
-            }
-
-            if (in_range(ch, 0, 0x1f))
-                return fail("unescaped " + esc(ch) + " in string", "");
-
-            // The usual case: non-escaped characters
-            if (ch != '\\') {
-                encode_utf8(last_escaped_codepoint, out);
-                last_escaped_codepoint = -1;
-                out += ch;
-                continue;
-            }
-
-            // Handle escapes
-            if (i == str.size())
-                return fail("unexpected end of input in string", "");
-
-            ch = str[i++];
-
-            if (ch == 'u') {
-                // Extract 4-byte escape sequence
-                string esc = str.substr(i, 4);
-                // Explicitly check length of the substring. The following loop
-                // relies on std::string returning the terminating NUL when
-                // accessing str[length]. Checking here reduces brittleness.
-                if (esc.length() < 4) {
-                    return fail("bad \\u escape: " + esc, "");
-                }
-                for (size_t j = 0; j < 4; j++) {
-                    if (!in_range(esc[j], 'a', 'f') && !in_range(esc[j], 'A', 'F')
-                            && !in_range(esc[j], '0', '9'))
-                        return fail("bad \\u escape: " + esc, "");
-                }
-
-                long codepoint = strtol(esc.data(), nullptr, 16);
-
-                // JSON specifies that characters outside the BMP shall be encoded as a pair
-                // of 4-hex-digit \u escapes encoding their surrogate pair components. Check
-                // whether we're in the middle of such a beast: the previous codepoint was an
-                // escaped lead (high) surrogate, and this is a trail (low) surrogate.
-                if (in_range(last_escaped_codepoint, 0xD800, 0xDBFF)
-                        && in_range(codepoint, 0xDC00, 0xDFFF)) {
-                    // Reassemble the two surrogate pairs into one astral-plane character, per
-                    // the UTF-16 algorithm.
-                    encode_utf8((((last_escaped_codepoint - 0xD800) << 10)
-                                 | (codepoint - 0xDC00)) + 0x10000, out);
-                    last_escaped_codepoint = -1;
-                } else {
-                    encode_utf8(last_escaped_codepoint, out);
-                    last_escaped_codepoint = codepoint;
-                }
-
-                i += 4;
-                continue;
-            }
-
-            encode_utf8(last_escaped_codepoint, out);
-            last_escaped_codepoint = -1;
-
-            if (ch == 'b') {
-                out += '\b';
-            } else if (ch == 'f') {
-                out += '\f';
-            } else if (ch == 'n') {
-                out += '\n';
-            } else if (ch == 'r') {
-                out += '\r';
-            } else if (ch == 't') {
-                out += '\t';
-            } else if (ch == '"' || ch == '\\' || ch == '/') {
-                out += ch;
-            } else {
-                return fail("invalid escape character " + esc(ch), "");
-            }
-        }
-    }
-
-    /* parse_number()
-     *
-     * Parse a double.
-     */
-    Json parse_number() {
-        size_t start_pos = i;
-
-        if (str[i] == '-')
-            i++;
-
-        // Integer part
-        if (str[i] == '0') {
-            i++;
-            if (in_range(str[i], '0', '9'))
-                return fail("leading 0s not permitted in numbers");
-        } else if (in_range(str[i], '1', '9')) {
-            i++;
-            while (in_range(str[i], '0', '9'))
-                i++;
-        } else {
-            return fail("invalid " + esc(str[i]) + " in number");
-        }
-
-        if (str[i] != '.' && str[i] != 'e' && str[i] != 'E'
-                && (i - start_pos) <= static_cast<size_t>(std::numeric_limits<int>::digits10)) {
-            return std::atoi(str.c_str() + start_pos);
-        }
-
-        // Decimal part
-        if (str[i] == '.') {
-            i++;
-            if (!in_range(str[i], '0', '9'))
-                return fail("at least one digit required in fractional part");
-
-            while (in_range(str[i], '0', '9'))
-                i++;
-        }
-
-        // Exponent part
-        if (str[i] == 'e' || str[i] == 'E') {
-            i++;
-
-            if (str[i] == '+' || str[i] == '-')
-                i++;
-
-            if (!in_range(str[i], '0', '9'))
-                return fail("at least one digit required in exponent");
-
-            while (in_range(str[i], '0', '9'))
-                i++;
-        }
-
-		std::istringstream stm(std::string(str.begin()+start_pos, str.end()));
-		stm.imbue(std::locale("C"));
-        double result;
-        stm >> result;
-        return result;
-    }
-
-    /* expect(str, res)
-     *
-     * Expect that 'str' starts at the character that was just read. If it does, advance
-     * the input and return res. If not, flag an error.
-     */
-    Json expect(const string &expected, Json res) {
-        assert(i != 0);
-        i--;
-        if (str.compare(i, expected.length(), expected) == 0) {
-            i += expected.length();
-            return res;
-        } else {
-            return fail("parse error: expected " + expected + ", got " + str.substr(i, expected.length()));
-        }
-    }
-
-    /* parse_json()
-     *
-     * Parse a JSON object.
-     */
-    Json parse_json(int depth) {
-        if (depth > max_depth) {
-            return fail("exceeded maximum nesting depth");
-        }
-
-        char ch = get_next_token();
-        if (failed)
-            return Json();
-
-        if (ch == '-' || (ch >= '0' && ch <= '9')) {
-            i--;
-            return parse_number();
-        }
-
-        if (ch == 't')
-            return expect("true", true);
-
-        if (ch == 'f')
-            return expect("false", false);
-
-        if (ch == 'n')
-            return expect("null", Json());
-
-        if (ch == '"')
-            return parse_string();
-
-        if (ch == '{') {
-            map<string, Json> data;
-            ch = get_next_token();
-            if (ch == '}')
-                return data;
-
-            while (1) {
-                if (ch != '"')
-                    return fail("expected '\"' in object, got " + esc(ch));
-
-                string key = parse_string();
-                if (failed)
-                    return Json();
-
-                ch = get_next_token();
-                if (ch != ':')
-                    return fail("expected ':' in object, got " + esc(ch));
-
-                data[std::move(key)] = parse_json(depth + 1);
-                if (failed)
-                    return Json();
-
-                ch = get_next_token();
-                if (ch == '}')
-                    break;
-                if (ch != ',')
-                    return fail("expected ',' in object, got " + esc(ch));
-
-                ch = get_next_token();
-            }
-            return data;
-        }
-
-        if (ch == '[') {
-            vector<Json> data;
-            ch = get_next_token();
-            if (ch == ']')
-                return data;
-
-            while (1) {
-                i--;
-                data.push_back(parse_json(depth + 1));
-                if (failed)
-                    return Json();
-
-                ch = get_next_token();
-                if (ch == ']')
-                    break;
-                if (ch != ',')
-                    return fail("expected ',' in list, got " + esc(ch));
-
-                ch = get_next_token();
-                (void)ch;
-            }
-            return data;
-        }
-
-        return fail("expected value, got " + esc(ch));
-    }
-};
-}//namespace {
-
-Json Json::parse(const string &in, string &err, JsonParse strategy) {
-    JsonParser parser { in, 0, err, false, strategy };
-    Json result = parser.parse_json(0);
-
-    // Check for any trailing garbage
-    parser.consume_garbage();
-    if (parser.failed)
-        return Json();
-    if (parser.i != in.size())
-        return parser.fail("unexpected trailing " + esc(in[parser.i]));
-
-    return result;
-}
-
-// Documented in json11.hpp
-vector<Json> Json::parse_multi(const string &in,
-                               std::string::size_type &parser_stop_pos,
-                               string &err,
-                               JsonParse strategy) {
-    JsonParser parser { in, 0, err, false, strategy };
-    parser_stop_pos = 0;
-    vector<Json> json_vec;
-    while (parser.i != in.size() && !parser.failed) {
-        json_vec.push_back(parser.parse_json(0));
-        if (parser.failed)
-            break;
-
-        // Check for another object
-        parser.consume_garbage();
-        if (parser.failed)
-            break;
-        parser_stop_pos = parser.i;
-    }
-    return json_vec;
-}
-
-/* * * * * * * * * * * * * * * * * * * *
- * Shape-checking
- */
-
-bool Json::has_shape(const shape & types, string & err) const {
-    if (!is_object()) {
-        err = "expected JSON object, got " + dump();
-        return false;
-    }
-
-    for (auto & item : types) {
-        if ((*this)[item.first].type() != item.second) {
-            err = "bad type for " + item.first + " in " + dump();
-            return false;
-        }
-    }
-
-    return true;
-}
-
-} // namespace json11
diff --git a/submodules/libtgvoip/json11.hpp b/submodules/libtgvoip/json11.hpp
deleted file mode 100755
index 0c47d05093..0000000000
--- a/submodules/libtgvoip/json11.hpp
+++ /dev/null
@@ -1,232 +0,0 @@
-/* json11
- *
- * json11 is a tiny JSON library for C++11, providing JSON parsing and serialization.
- *
- * The core object provided by the library is json11::Json. A Json object represents any JSON
- * value: null, bool, number (int or double), string (std::string), array (std::vector), or
- * object (std::map).
- *
- * Json objects act like values: they can be assigned, copied, moved, compared for equality or
- * order, etc. There are also helper methods Json::dump, to serialize a Json to a string, and
- * Json::parse (static) to parse a std::string as a Json object.
- *
- * Internally, the various types of Json object are represented by the JsonValue class
- * hierarchy.
- *
- * A note on numbers - JSON specifies the syntax of number formatting but not its semantics,
- * so some JSON implementations distinguish between integers and floating-point numbers, while
- * some don't. In json11, we choose the latter. Because some JSON implementations (namely
- * Javascript itself) treat all numbers as the same type, distinguishing the two leads
- * to JSON that will be *silently* changed by a round-trip through those implementations.
- * Dangerous! To avoid that risk, json11 stores all numbers as double internally, but also
- * provides integer helpers.
- *
- * Fortunately, double-precision IEEE754 ('double') can precisely store any integer in the
- * range +/-2^53, which includes every 'int' on most systems. (Timestamps often use int64
- * or long long to avoid the Y2038K problem; a double storing microseconds since some epoch
- * will be exact for +/- 275 years.)
- */
-
-/* Copyright (c) 2013 Dropbox, Inc.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-
-#pragma once
-
-#include <string>
-#include <vector>
-#include <map>
-#include <memory>
-#include <initializer_list>
-
-#ifdef _MSC_VER
-    #if _MSC_VER <= 1800 // VS 2013
-        #ifndef noexcept
-            #define noexcept throw()
-        #endif
-
-        #ifndef snprintf
-            #define snprintf _snprintf_s
-        #endif
-    #endif
-#endif
-
-namespace json11 {
-
-enum JsonParse {
-    STANDARD, COMMENTS
-};
-
-class JsonValue;
-
-class Json final {
-public:
-    // Types
-    enum Type {
-        NUL, NUMBER, BOOL, STRING, ARRAY, OBJECT
-    };
-
-    // Array and object typedefs
-    typedef std::vector<Json> array;
-    typedef std::map<std::string, Json> object;
-
-    // Constructors for the various types of JSON value.
-    Json() noexcept;                // NUL
-    Json(std::nullptr_t) noexcept;  // NUL
-    Json(double value);             // NUMBER
-    Json(int value);                // NUMBER
-    Json(bool value);               // BOOL
-    Json(const std::string &value); // STRING
-    Json(std::string &&value);      // STRING
-    Json(const char * value);       // STRING
-    Json(const array &values);      // ARRAY
-    Json(array &&values);           // ARRAY
-    Json(const object &values);     // OBJECT
-    Json(object &&values);          // OBJECT
-
-    // Implicit constructor: anything with a to_json() function.
-    template <class T, class = decltype(&T::to_json)>
-    Json(const T & t) : Json(t.to_json()) {}
-
-    // Implicit constructor: map-like objects (std::map, std::unordered_map, etc)
-    template <class M, typename std::enable_if<
-        std::is_constructible<std::string, decltype(std::declval<M>().begin()->first)>::value
-        && std::is_constructible<Json, decltype(std::declval<M>().begin()->second)>::value,
-            int>::type = 0>
-    Json(const M & m) : Json(object(m.begin(), m.end())) {}
-
-    // Implicit constructor: vector-like objects (std::list, std::vector, std::set, etc)
-    template <class V, typename std::enable_if<
-        std::is_constructible<Json, decltype(*std::declval<V>().begin())>::value,
-            int>::type = 0>
-    Json(const V & v) : Json(array(v.begin(), v.end())) {}
-
-    // This prevents Json(some_pointer) from accidentally producing a bool. Use
-    // Json(bool(some_pointer)) if that behavior is desired.
-    Json(void *) = delete;
-
-    // Accessors
-    Type type() const;
-
-    bool is_null()   const { return type() == NUL; }
-    bool is_number() const { return type() == NUMBER; }
-    bool is_bool()   const { return type() == BOOL; }
-    bool is_string() const { return type() == STRING; }
-    bool is_array()  const { return type() == ARRAY; }
-    bool is_object() const { return type() == OBJECT; }
-
-    // Return the enclosed value if this is a number, 0 otherwise. Note that json11 does not
-    // distinguish between integer and non-integer numbers - number_value() and int_value()
-    // can both be applied to a NUMBER-typed object.
-    double number_value() const;
-    int int_value() const;
-
-    // Return the enclosed value if this is a boolean, false otherwise.
-    bool bool_value() const;
-    // Return the enclosed string if this is a string, "" otherwise.
-    const std::string &string_value() const;
-    // Return the enclosed std::vector if this is an array, or an empty vector otherwise.
-    const array &array_items() const;
-    // Return the enclosed std::map if this is an object, or an empty map otherwise.
-    const object &object_items() const;
-
-    // Return a reference to arr[i] if this is an array, Json() otherwise.
-    const Json & operator[](size_t i) const;
-    // Return a reference to obj[key] if this is an object, Json() otherwise.
-    const Json & operator[](const std::string &key) const;
-
-    // Serialize.
-    void dump(std::string &out) const;
-    std::string dump() const {
-        std::string out;
-        dump(out);
-        return out;
-    }
-
-    // Parse. If parse fails, return Json() and assign an error message to err.
-    static Json parse(const std::string & in,
-                      std::string & err,
-                      JsonParse strategy = JsonParse::STANDARD);
-    static Json parse(const char * in,
-                      std::string & err,
-                      JsonParse strategy = JsonParse::STANDARD) {
-        if (in) {
-            return parse(std::string(in), err, strategy);
-        } else {
-            err = "null input";
-            return nullptr;
-        }
-    }
-    // Parse multiple objects, concatenated or separated by whitespace
-    static std::vector<Json> parse_multi(
-        const std::string & in,
-        std::string::size_type & parser_stop_pos,
-        std::string & err,
-        JsonParse strategy = JsonParse::STANDARD);
-
-    static inline std::vector<Json> parse_multi(
-        const std::string & in,
-        std::string & err,
-        JsonParse strategy = JsonParse::STANDARD) {
-        std::string::size_type parser_stop_pos;
-        return parse_multi(in, parser_stop_pos, err, strategy);
-    }
-
-    bool operator== (const Json &rhs) const;
-    bool operator<  (const Json &rhs) const;
-    bool operator!= (const Json &rhs) const { return !(*this == rhs); }
-    bool operator<= (const Json &rhs) const { return !(rhs < *this); }
-    bool operator>  (const Json &rhs) const { return  (rhs < *this); }
-    bool operator>= (const Json &rhs) const { return !(*this < rhs); }
-
-    /* has_shape(types, err)
-     *
-     * Return true if this is a JSON object and, for each item in types, has a field of
-     * the given type. If not, return false and set err to a descriptive message.
-     */
-    typedef std::initializer_list<std::pair<std::string, Type>> shape;
-    bool has_shape(const shape & types, std::string & err) const;
-
-private:
-    std::shared_ptr<JsonValue> m_ptr;
-};
-
-// Internal class hierarchy - JsonValue objects are not exposed to users of this API.
-class JsonValue {
-protected:
-    friend class Json;
-    friend class JsonInt;
-    friend class JsonDouble;
-    virtual Json::Type type() const = 0;
-    virtual bool equals(const JsonValue * other) const = 0;
-    virtual bool less(const JsonValue * other) const = 0;
-    virtual void dump(std::string &out) const = 0;
-    virtual double number_value() const;
-    virtual int int_value() const;
-    virtual bool bool_value() const;
-    virtual const std::string &string_value() const;
-    virtual const Json::array &array_items() const;
-    virtual const Json &operator[](size_t i) const;
-    virtual const Json::object &object_items() const;
-    virtual const Json &operator[](const std::string &key) const;
-    virtual ~JsonValue() {}
-};
-
-} // namespace json11
diff --git a/submodules/libtgvoip/libtgvoip.UWP.vcxproj b/submodules/libtgvoip/libtgvoip.UWP.vcxproj
deleted file mode 100644
index 71c3830500..0000000000
--- a/submodules/libtgvoip/libtgvoip.UWP.vcxproj
+++ /dev/null
@@ -1,1065 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|ARM">
-      <Configuration>Debug</Configuration>
-      <Platform>ARM</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|ARM">
-      <Configuration>Release</Configuration>
-      <Platform>ARM</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{88803693-7606-484b-9d2f-4bb789d57c29}</ProjectGuid>
-    <Keyword>WindowsRuntimeComponent</Keyword>
-    <RootNamespace>libtgvoip</RootNamespace>
-    <DefaultLanguage>en</DefaultLanguage>
-    <MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
-    <AppContainerApplication>true</AppContainerApplication>
-    <ApplicationType>Windows Store</ApplicationType>
-    <WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>
-    <WindowsTargetPlatformMinVersion>10.0.10240.0</WindowsTargetPlatformMinVersion>
-    <ApplicationTypeRevision>10.0</ApplicationTypeRevision>
-    <ProjectName>libtgvoip</ProjectName>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v141</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v141</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v141</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$([Microsoft.Build.Utilities.ToolLocationHelper]::GetPlatformExtensionSDKLocation(`WindowsMobile, Version=10.0.17134.0`, $(TargetPlatformIdentifier), $(TargetPlatformVersion),  $(SDKReferenceDirectoryRoot), $(SDKExtensionDirectoryRoot), $(SDKReferenceRegistryRoot)))\DesignTime\CommonConfiguration\Neutral\WindowsMobile.props" Condition="exists('$([Microsoft.Build.Utilities.ToolLocationHelper]::GetPlatformExtensionSDKLocation(`WindowsMobile, Version=10.0.17134.0`, $(TargetPlatformIdentifier), $(TargetPlatformVersion),  $(SDKReferenceDirectoryRoot), $(SDKExtensionDirectoryRoot), $(SDKReferenceRegistryRoot)))\DesignTime\CommonConfiguration\Neutral\WindowsMobile.props')" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$([Microsoft.Build.Utilities.ToolLocationHelper]::GetPlatformExtensionSDKLocation(`WindowsMobile, Version=10.0.17134.0`, $(TargetPlatformIdentifier), $(TargetPlatformVersion),  $(SDKReferenceDirectoryRoot), $(SDKExtensionDirectoryRoot), $(SDKReferenceRegistryRoot)))\DesignTime\CommonConfiguration\Neutral\WindowsMobile.props" Condition="exists('$([Microsoft.Build.Utilities.ToolLocationHelper]::GetPlatformExtensionSDKLocation(`WindowsMobile, Version=10.0.17134.0`, $(TargetPlatformIdentifier), $(TargetPlatformVersion),  $(SDKReferenceDirectoryRoot), $(SDKExtensionDirectoryRoot), $(SDKReferenceRegistryRoot)))\DesignTime\CommonConfiguration\Neutral\WindowsMobile.props')" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$([Microsoft.Build.Utilities.ToolLocationHelper]::GetPlatformExtensionSDKLocation(`WindowsMobile, Version=10.0.17134.0`, $(TargetPlatformIdentifier), $(TargetPlatformVersion),  $(SDKReferenceDirectoryRoot), $(SDKExtensionDirectoryRoot), $(SDKReferenceRegistryRoot)))\DesignTime\CommonConfiguration\Neutral\WindowsMobile.props" Condition="exists('$([Microsoft.Build.Utilities.ToolLocationHelper]::GetPlatformExtensionSDKLocation(`WindowsMobile, Version=10.0.17134.0`, $(TargetPlatformIdentifier), $(TargetPlatformVersion),  $(SDKReferenceDirectoryRoot), $(SDKExtensionDirectoryRoot), $(SDKReferenceRegistryRoot)))\DesignTime\CommonConfiguration\Neutral\WindowsMobile.props')" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$([Microsoft.Build.Utilities.ToolLocationHelper]::GetPlatformExtensionSDKLocation(`WindowsMobile, Version=10.0.17134.0`, $(TargetPlatformIdentifier), $(TargetPlatformVersion),  $(SDKReferenceDirectoryRoot), $(SDKExtensionDirectoryRoot), $(SDKReferenceRegistryRoot)))\DesignTime\CommonConfiguration\Neutral\WindowsMobile.props" Condition="exists('$([Microsoft.Build.Utilities.ToolLocationHelper]::GetPlatformExtensionSDKLocation(`WindowsMobile, Version=10.0.17134.0`, $(TargetPlatformIdentifier), $(TargetPlatformVersion),  $(SDKReferenceDirectoryRoot), $(SDKExtensionDirectoryRoot), $(SDKReferenceRegistryRoot)))\DesignTime\CommonConfiguration\Neutral\WindowsMobile.props')" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$([Microsoft.Build.Utilities.ToolLocationHelper]::GetPlatformExtensionSDKLocation(`WindowsMobile, Version=10.0.17134.0`, $(TargetPlatformIdentifier), $(TargetPlatformVersion),  $(SDKReferenceDirectoryRoot), $(SDKExtensionDirectoryRoot), $(SDKReferenceRegistryRoot)))\DesignTime\CommonConfiguration\Neutral\WindowsMobile.props" Condition="exists('$([Microsoft.Build.Utilities.ToolLocationHelper]::GetPlatformExtensionSDKLocation(`WindowsMobile, Version=10.0.17134.0`, $(TargetPlatformIdentifier), $(TargetPlatformVersion),  $(SDKReferenceDirectoryRoot), $(SDKExtensionDirectoryRoot), $(SDKReferenceRegistryRoot)))\DesignTime\CommonConfiguration\Neutral\WindowsMobile.props')" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$([Microsoft.Build.Utilities.ToolLocationHelper]::GetPlatformExtensionSDKLocation(`WindowsMobile, Version=10.0.17134.0`, $(TargetPlatformIdentifier), $(TargetPlatformVersion),  $(SDKReferenceDirectoryRoot), $(SDKExtensionDirectoryRoot), $(SDKReferenceRegistryRoot)))\DesignTime\CommonConfiguration\Neutral\WindowsMobile.props" Condition="exists('$([Microsoft.Build.Utilities.ToolLocationHelper]::GetPlatformExtensionSDKLocation(`WindowsMobile, Version=10.0.17134.0`, $(TargetPlatformIdentifier), $(TargetPlatformVersion),  $(SDKReferenceDirectoryRoot), $(SDKExtensionDirectoryRoot), $(SDKReferenceRegistryRoot)))\DesignTime\CommonConfiguration\Neutral\WindowsMobile.props')" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <GenerateManifest>false</GenerateManifest>
-    <MappedPlatform>Debug</MappedPlatform>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
-    <GenerateManifest>false</GenerateManifest>
-    <MappedPlatform>ARM\Debug</MappedPlatform>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <GenerateManifest>false</GenerateManifest>
-    <MappedPlatform>x64\Debug</MappedPlatform>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <GenerateManifest>false</GenerateManifest>
-    <MappedPlatform>Release</MappedPlatform>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
-    <GenerateManifest>false</GenerateManifest>
-    <MappedPlatform>ARM\Release</MappedPlatform>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <GenerateManifest>false</GenerateManifest>
-    <MappedPlatform>x64\Release</MappedPlatform>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <PreprocessorDefinitions>_WINRT_DLL;_CRT_SECURE_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;NOMINMAX;WEBRTC_APM_DEBUG_DUMP=0;TGVOIP_USE_CUSTOM_CRYPTO;WEBRTC_WIN;WEBRTC_UWP;WEBRTC_NS_FLOAT;%%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>$(IntDir)pch.pch</PrecompiledHeaderOutputFile>
-      <AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions>
-      <DisableSpecificWarnings>28204</DisableSpecificWarnings>
-      <AdditionalIncludeDirectories>webrtc_dsp;../libopus/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <CompileAsWinRT>true</CompileAsWinRT>
-      <ObjectFileName>$(IntDir)/%(RelativeDir)/</ObjectFileName>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
-      <AdditionalDependencies>libopus.lib;ws2_32.lib;mmdevapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(SolutionDir)$(MappedPlatform)\libopus\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
-    <ClCompile>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <PreprocessorDefinitions>_WINRT_DLL;_CRT_SECURE_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;NOMINMAX;WEBRTC_APM_DEBUG_DUMP=0;TGVOIP_USE_CUSTOM_CRYPTO;WEBRTC_WIN;WEBRTC_UWP;WEBRTC_NS_FLOAT;%%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>$(IntDir)pch.pch</PrecompiledHeaderOutputFile>
-      <AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions>
-      <DisableSpecificWarnings>28204</DisableSpecificWarnings>
-      <AdditionalIncludeDirectories>webrtc_dsp;../libopus/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <ObjectFileName>$(IntDir)/%(RelativeDir)/</ObjectFileName>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
-      <AdditionalDependencies>libopus.lib;ws2_32.lib;mmdevapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(SolutionDir)$(MappedPlatform)\libopus\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <PreprocessorDefinitions>_WINRT_DLL;_CRT_SECURE_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;NOMINMAX;WEBRTC_APM_DEBUG_DUMP=0;TGVOIP_USE_CUSTOM_CRYPTO;WEBRTC_WIN;WEBRTC_UWP;WEBRTC_NS_FLOAT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>$(IntDir)pch.pch</PrecompiledHeaderOutputFile>
-      <AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions>
-      <DisableSpecificWarnings>28204</DisableSpecificWarnings>
-      <AdditionalIncludeDirectories>webrtc_dsp;../libopus/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <ObjectFileName>$(IntDir)/%(RelativeDir)/</ObjectFileName>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
-      <AdditionalDependencies>libopus.lib;ws2_32.lib;mmdevapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(SolutionDir)$(MappedPlatform)\libopus\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <PreprocessorDefinitions>_WINRT_DLL;_CRT_SECURE_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;NOMINMAX;WEBRTC_APM_DEBUG_DUMP=0;NDEBUG;TGVOIP_USE_CUSTOM_CRYPTO;WEBRTC_WIN;WEBRTC_UWP;WEBRTC_NS_FLOAT;%%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>$(IntDir)pch.pch</PrecompiledHeaderOutputFile>
-      <AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions>
-      <DisableSpecificWarnings>28204</DisableSpecificWarnings>
-      <AdditionalIncludeDirectories>webrtc_dsp;../libopus/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <ObjectFileName>$(IntDir)/%(RelativeDir)/</ObjectFileName>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
-      <AdditionalDependencies>libopus.lib;ws2_32.lib;mmdevapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(SolutionDir)$(MappedPlatform)\libopus\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
-    <ClCompile>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <PreprocessorDefinitions>_WINRT_DLL;_CRT_SECURE_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;NOMINMAX;WEBRTC_APM_DEBUG_DUMP=0;NDEBUG;TGVOIP_USE_CUSTOM_CRYPTO;WEBRTC_WIN;WEBRTC_UWP;WEBRTC_NS_FLOAT;%%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>$(IntDir)pch.pch</PrecompiledHeaderOutputFile>
-      <AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions>
-      <DisableSpecificWarnings>28204</DisableSpecificWarnings>
-      <AdditionalIncludeDirectories>webrtc_dsp;../libopus/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <ObjectFileName>$(IntDir)/%(RelativeDir)/</ObjectFileName>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
-      <AdditionalDependencies>libopus.lib;ws2_32.lib;mmdevapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(SolutionDir)$(MappedPlatform)\libopus\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <PreprocessorDefinitions>_WINRT_DLL;_CRT_SECURE_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;NOMINMAX;WEBRTC_APM_DEBUG_DUMP=0;NDEBUG;TGVOIP_USE_CUSTOM_CRYPTO;WEBRTC_WIN;WEBRTC_UWP;WEBRTC_NS_FLOAT;%%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>$(IntDir)pch.pch</PrecompiledHeaderOutputFile>
-      <AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions>
-      <DisableSpecificWarnings>28204</DisableSpecificWarnings>
-      <AdditionalIncludeDirectories>webrtc_dsp;../libopus/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <ObjectFileName>$(IntDir)/%(RelativeDir)/</ObjectFileName>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
-      <AdditionalDependencies>libopus.lib;ws2_32.lib;mmdevapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(SolutionDir)$(MappedPlatform)\libopus\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClInclude Include="audio\AudioInput.h" />
-    <ClInclude Include="audio\AudioIO.h" />
-    <ClInclude Include="audio\AudioIOCallback.h" />
-    <ClInclude Include="audio\AudioOutput.h" />
-    <ClInclude Include="audio\Resampler.h" />
-    <ClInclude Include="BlockingQueue.h" />
-    <ClInclude Include="Buffers.h" />
-    <ClInclude Include="CongestionControl.h" />
-    <ClInclude Include="EchoCanceller.h" />
-    <ClInclude Include="JitterBuffer.h" />
-    <ClInclude Include="json11.hpp" />
-    <ClInclude Include="logging.h" />
-    <ClInclude Include="MediaStreamItf.h" />
-    <ClInclude Include="MessageThread.h" />
-    <ClInclude Include="NetworkSocket.h" />
-    <ClInclude Include="OpusDecoder.h" />
-    <ClInclude Include="OpusEncoder.h" />
-    <ClInclude Include="os\windows\AudioInputWASAPI.h" />
-    <ClInclude Include="os\windows\AudioOutputWASAPI.h" />
-    <ClInclude Include="os\windows\NetworkSocketWinsock.h" />
-    <ClInclude Include="os\windows\WindowsSandboxUtils.h" />
-    <ClInclude Include="os\windows\WindowsSpecific.h" />
-    <ClInclude Include="PacketReassembler.h" />
-    <ClInclude Include="PrivateDefines.h" />
-    <ClInclude Include="threading.h" />
-    <ClInclude Include="utils.h" />
-    <ClInclude Include="video\ScreamCongestionController.h" />
-    <ClInclude Include="video\VideoRenderer.h" />
-    <ClInclude Include="video\VideoSource.h" />
-    <ClInclude Include="VoIPController.h" />
-    <ClInclude Include="os\windows\CXWrapper.h" />
-    <ClInclude Include="VoIPServerConfig.h" />
-    <ClInclude Include="webrtc_dsp\absl\algorithm\algorithm.h" />
-    <ClInclude Include="webrtc_dsp\absl\base\attributes.h" />
-    <ClInclude Include="webrtc_dsp\absl\base\config.h" />
-    <ClInclude Include="webrtc_dsp\absl\base\internal\atomic_hook.h" />
-    <ClInclude Include="webrtc_dsp\absl\base\internal\identity.h" />
-    <ClInclude Include="webrtc_dsp\absl\base\internal\inline_variable.h" />
-    <ClInclude Include="webrtc_dsp\absl\base\internal\invoke.h" />
-    <ClInclude Include="webrtc_dsp\absl\base\internal\raw_logging.h" />
-    <ClInclude Include="webrtc_dsp\absl\base\internal\throw_delegate.h" />
-    <ClInclude Include="webrtc_dsp\absl\base\log_severity.h" />
-    <ClInclude Include="webrtc_dsp\absl\base\macros.h" />
-    <ClInclude Include="webrtc_dsp\absl\base\optimization.h" />
-    <ClInclude Include="webrtc_dsp\absl\base\policy_checks.h" />
-    <ClInclude Include="webrtc_dsp\absl\base\port.h" />
-    <ClInclude Include="webrtc_dsp\absl\container\inlined_vector.h" />
-    <ClInclude Include="webrtc_dsp\absl\memory\memory.h" />
-    <ClInclude Include="webrtc_dsp\absl\meta\type_traits.h" />
-    <ClInclude Include="webrtc_dsp\absl\strings\ascii.h" />
-    <ClInclude Include="webrtc_dsp\absl\strings\internal\memutil.h" />
-    <ClInclude Include="webrtc_dsp\absl\strings\string_view.h" />
-    <ClInclude Include="webrtc_dsp\absl\types\bad_optional_access.h" />
-    <ClInclude Include="webrtc_dsp\absl\types\optional.h" />
-    <ClInclude Include="webrtc_dsp\absl\utility\utility.h" />
-    <ClInclude Include="webrtc_dsp\api\array_view.h" />
-    <ClInclude Include="webrtc_dsp\api\audio\audio_frame.h" />
-    <ClInclude Include="webrtc_dsp\api\audio\echo_canceller3_config.h" />
-    <ClInclude Include="webrtc_dsp\api\audio\echo_canceller3_factory.h" />
-    <ClInclude Include="webrtc_dsp\api\audio\echo_control.h" />
-    <ClInclude Include="webrtc_dsp\common_audio\audio_converter.h" />
-    <ClInclude Include="webrtc_dsp\common_audio\channel_buffer.h" />
-    <ClInclude Include="webrtc_dsp\common_audio\fir_filter.h" />
-    <ClInclude Include="webrtc_dsp\common_audio\fir_filter_c.h" />
-    <ClInclude Include="webrtc_dsp\common_audio\fir_filter_factory.h" />
-    <ClInclude Include="webrtc_dsp\common_audio\fir_filter_neon.h" />
-    <ClInclude Include="webrtc_dsp\common_audio\fir_filter_sse.h" />
-    <ClInclude Include="webrtc_dsp\common_audio\include\audio_util.h" />
-    <ClInclude Include="webrtc_dsp\common_audio\mocks\mock_smoothing_filter.h" />
-    <ClInclude Include="webrtc_dsp\common_audio\real_fourier.h" />
-    <ClInclude Include="webrtc_dsp\common_audio\real_fourier_ooura.h" />
-    <ClInclude Include="webrtc_dsp\common_audio\resampler\include\push_resampler.h" />
-    <ClInclude Include="webrtc_dsp\common_audio\resampler\include\resampler.h" />
-    <ClInclude Include="webrtc_dsp\common_audio\resampler\push_sinc_resampler.h" />
-    <ClInclude Include="webrtc_dsp\common_audio\resampler\sinc_resampler.h" />
-    <ClInclude Include="webrtc_dsp\common_audio\resampler\sinusoidal_linear_chirp_source.h" />
-    <ClInclude Include="webrtc_dsp\common_audio\ring_buffer.h" />
-    <ClInclude Include="webrtc_dsp\common_audio\signal_processing\complex_fft_tables.h" />
-    <ClInclude Include="webrtc_dsp\common_audio\signal_processing\dot_product_with_scale.h" />
-    <ClInclude Include="webrtc_dsp\common_audio\signal_processing\include\real_fft.h" />
-    <ClInclude Include="webrtc_dsp\common_audio\signal_processing\include\signal_processing_library.h" />
-    <ClInclude Include="webrtc_dsp\common_audio\signal_processing\include\spl_inl.h" />
-    <ClInclude Include="webrtc_dsp\common_audio\signal_processing\include\spl_inl_armv7.h" />
-    <ClInclude Include="webrtc_dsp\common_audio\signal_processing\resample_by_2_internal.h" />
-    <ClInclude Include="webrtc_dsp\common_audio\smoothing_filter.h" />
-    <ClInclude Include="webrtc_dsp\common_audio\sparse_fir_filter.h" />
-    <ClInclude Include="webrtc_dsp\common_audio\third_party\fft4g\fft4g.h" />
-    <ClInclude Include="webrtc_dsp\common_audio\third_party\spl_sqrt_floor\spl_sqrt_floor.h" />
-    <ClInclude Include="webrtc_dsp\common_audio\vad\include\vad.h" />
-    <ClInclude Include="webrtc_dsp\common_audio\vad\include\webrtc_vad.h" />
-    <ClInclude Include="webrtc_dsp\common_audio\vad\vad_core.h" />
-    <ClInclude Include="webrtc_dsp\common_audio\vad\vad_filterbank.h" />
-    <ClInclude Include="webrtc_dsp\common_audio\vad\vad_gmm.h" />
-    <ClInclude Include="webrtc_dsp\common_audio\vad\vad_sp.h" />
-    <ClInclude Include="webrtc_dsp\common_audio\wav_file.h" />
-    <ClInclude Include="webrtc_dsp\common_audio\wav_header.h" />
-    <ClInclude Include="webrtc_dsp\common_audio\window_generator.h" />
-    <ClInclude Include="webrtc_dsp\modules\audio_coding\codecs\isac\bandwidth_info.h" />
-    <ClInclude Include="webrtc_dsp\modules\audio_coding\codecs\isac\main\include\isac.h" />
-    <ClInclude Include="webrtc_dsp\modules\audio_coding\codecs\isac\main\source\arith_routines.h" />
-    <ClInclude Include="webrtc_dsp\modules\audio_coding\codecs\isac\main\source\bandwidth_estimator.h" />
-    <ClInclude Include="webrtc_dsp\modules\audio_coding\codecs\isac\main\source\codec.h" />
-    <ClInclude Include="webrtc_dsp\modules\audio_coding\codecs\isac\main\source\crc.h" />
-    <ClInclude Include="webrtc_dsp\modules\audio_coding\codecs\isac\main\source\encode_lpc_swb.h" />
-    <ClInclude Include="webrtc_dsp\modules\audio_coding\codecs\isac\main\source\entropy_coding.h" />
-    <ClInclude Include="webrtc_dsp\modules\audio_coding\codecs\isac\main\source\filter_functions.h" />
-    <ClInclude Include="webrtc_dsp\modules\audio_coding\codecs\isac\main\source\isac_float_type.h" />
-    <ClInclude Include="webrtc_dsp\modules\audio_coding\codecs\isac\main\source\isac_vad.h" />
-    <ClInclude Include="webrtc_dsp\modules\audio_coding\codecs\isac\main\source\lpc_analysis.h" />
-    <ClInclude Include="webrtc_dsp\modules\audio_coding\codecs\isac\main\source\lpc_gain_swb_tables.h" />
-    <ClInclude Include="webrtc_dsp\modules\audio_coding\codecs\isac\main\source\lpc_shape_swb12_tables.h" />
-    <ClInclude Include="webrtc_dsp\modules\audio_coding\codecs\isac\main\source\lpc_shape_swb16_tables.h" />
-    <ClInclude Include="webrtc_dsp\modules\audio_coding\codecs\isac\main\source\lpc_tables.h" />
-    <ClInclude Include="webrtc_dsp\modules\audio_coding\codecs\isac\main\source\os_specific_inline.h" />
-    <ClInclude Include="webrtc_dsp\modules\audio_coding\codecs\isac\main\source\pitch_estimator.h" />
-    <ClInclude Include="webrtc_dsp\modules\audio_coding\codecs\isac\main\source\pitch_filter.h" />
-    <ClInclude Include="webrtc_dsp\modules\audio_coding\codecs\isac\main\source\pitch_gain_tables.h" />
-    <ClInclude Include="webrtc_dsp\modules\audio_coding\codecs\isac\main\source\pitch_lag_tables.h" />
-    <ClInclude Include="webrtc_dsp\modules\audio_coding\codecs\isac\main\source\settings.h" />
-    <ClInclude Include="webrtc_dsp\modules\audio_coding\codecs\isac\main\source\spectrum_ar_model_tables.h" />
-    <ClInclude Include="webrtc_dsp\modules\audio_coding\codecs\isac\main\source\structs.h" />
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\aec3\adaptive_fir_filter.h" />
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\aec3\aec3_common.h" />
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\aec3\aec3_fft.h" />
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\aec3\aec_state.h" />
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\aec3\block_delay_buffer.h" />
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\aec3\block_framer.h" />
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\aec3\block_processor.h" />
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\aec3\block_processor_metrics.h" />
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\aec3\cascaded_biquad_filter.h" />
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\aec3\comfort_noise_generator.h" />
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\aec3\decimator.h" />
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\aec3\delay_estimate.h" />
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\aec3\downsampled_render_buffer.h" />
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\aec3\echo_audibility.h" />
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\aec3\echo_canceller3.h" />
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\aec3\echo_path_delay_estimator.h" />
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\aec3\echo_path_variability.h" />
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\aec3\echo_remover.h" />
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\aec3\echo_remover_metrics.h" />
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\aec3\erle_estimator.h" />
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\aec3\erl_estimator.h" />
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\aec3\fft_buffer.h" />
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\aec3\fft_data.h" />
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\aec3\filter_analyzer.h" />
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\aec3\frame_blocker.h" />
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\aec3\fullband_erle_estimator.h" />
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\aec3\main_filter_update_gain.h" />
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\aec3\matched_filter.h" />
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\aec3\matched_filter_lag_aggregator.h" />
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\aec3\matrix_buffer.h" />
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\aec3\moving_average.h" />
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\aec3\render_buffer.h" />
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\aec3\render_delay_buffer.h" />
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\aec3\render_delay_controller.h" />
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\aec3\render_delay_controller_metrics.h" />
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\aec3\render_reverb_model.h" />
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\aec3\render_signal_analyzer.h" />
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\aec3\residual_echo_estimator.h" />
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\aec3\reverb_decay_estimator.h" />
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\aec3\reverb_frequency_response.h" />
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\aec3\reverb_model.h" />
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\aec3\reverb_model_estimator.h" />
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\aec3\reverb_model_fallback.h" />
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\aec3\shadow_filter_update_gain.h" />
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\aec3\skew_estimator.h" />
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\aec3\stationarity_estimator.h" />
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\aec3\subband_erle_estimator.h" />
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\aec3\subtractor.h" />
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\aec3\subtractor_output.h" />
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\aec3\subtractor_output_analyzer.h" />
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\aec3\suppression_filter.h" />
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\aec3\suppression_gain.h" />
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\aec3\suppression_gain_limiter.h" />
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\aec3\vector_buffer.h" />
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\aec3\vector_math.h" />
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\aecm\aecm_core.h" />
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\aecm\aecm_defines.h" />
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\aecm\echo_control_mobile.h" />
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\aec\aec_common.h" />
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\aec\aec_core.h" />
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\aec\aec_core_optimized_methods.h" />
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\aec\aec_resampler.h" />
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\aec\echo_cancellation.h" />
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\agc2\adaptive_agc.h" />
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\agc2\adaptive_digital_gain_applier.h" />
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\agc2\adaptive_mode_level_estimator.h" />
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\agc2\adaptive_mode_level_estimator_agc.h" />
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\agc2\agc2_common.h" />
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\agc2\agc2_testing_common.h" />
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\agc2\biquad_filter.h" />
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\agc2\compute_interpolated_gain_curve.h" />
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\agc2\down_sampler.h" />
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\agc2\fixed_digital_level_estimator.h" />
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\agc2\fixed_gain_controller.h" />
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\agc2\gain_applier.h" />
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\agc2\interpolated_gain_curve.h" />
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\agc2\limiter.h" />
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\agc2\limiter_db_gain_curve.h" />
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\agc2\noise_level_estimator.h" />
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\agc2\noise_spectrum_estimator.h" />
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\agc2\rnn_vad\common.h" />
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\agc2\rnn_vad\features_extraction.h" />
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\agc2\rnn_vad\fft_util.h" />
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\agc2\rnn_vad\lp_residual.h" />
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\agc2\rnn_vad\pitch_info.h" />
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\agc2\rnn_vad\pitch_search.h" />
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\agc2\rnn_vad\pitch_search_internal.h" />
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\agc2\rnn_vad\ring_buffer.h" />
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\agc2\rnn_vad\rnn.h" />
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\agc2\rnn_vad\sequence_buffer.h" />
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\agc2\rnn_vad\spectral_features.h" />
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\agc2\rnn_vad\spectral_features_internal.h" />
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\agc2\rnn_vad\symmetric_matrix_buffer.h" />
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\agc2\rnn_vad\test_utils.h" />
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\agc2\saturation_protector.h" />
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\agc2\signal_classifier.h" />
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\agc2\vad_with_level.h" />
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\agc2\vector_float_frame.h" />
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\agc\agc.h" />
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\agc\agc_manager_direct.h" />
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\agc\gain_map_internal.h" />
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\agc\legacy\analog_agc.h" />
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\agc\legacy\digital_agc.h" />
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\agc\legacy\gain_control.h" />
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\agc\loudness_histogram.h" />
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\agc\mock_agc.h" />
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\agc\utility.h" />
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\audio_buffer.h" />
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\audio_generator\file_audio_generator.h" />
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\audio_processing_impl.h" />
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\common.h" />
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\echo_cancellation_impl.h" />
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\echo_control_mobile_impl.h" />
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\echo_detector\circular_buffer.h" />
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\echo_detector\mean_variance_estimator.h" />
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\echo_detector\moving_max.h" />
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\echo_detector\normalized_covariance_estimator.h" />
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\gain_controller2.h" />
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\gain_control_for_experimental_agc.h" />
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\gain_control_impl.h" />
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\include\aec_dump.h" />
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\include\audio_frame_view.h" />
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\include\audio_generator.h" />
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\include\audio_generator_factory.h" />
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\include\audio_processing.h" />
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\include\audio_processing_statistics.h" />
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\include\config.h" />
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\include\gain_control.h" />
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\include\mock_audio_processing.h" />
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\level_estimator_impl.h" />
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\logging\apm_data_dumper.h" />
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\low_cut_filter.h" />
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\noise_suppression_impl.h" />
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\ns\defines.h" />
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\ns\noise_suppression.h" />
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\ns\noise_suppression_x.h" />
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\ns\nsx_core.h" />
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\ns\nsx_defines.h" />
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\ns\ns_core.h" />
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\ns\windows_private.h" />
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\render_queue_item_verifier.h" />
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\residual_echo_detector.h" />
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\rms_level.h" />
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\splitting_filter.h" />
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\three_band_filter_bank.h" />
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\transient\common.h" />
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\transient\daubechies_8_wavelet_coeffs.h" />
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\transient\dyadic_decimator.h" />
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\transient\moving_moments.h" />
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\transient\transient_detector.h" />
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\transient\transient_suppressor.h" />
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\transient\wpd_node.h" />
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\transient\wpd_tree.h" />
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\typing_detection.h" />
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\utility\block_mean_calculator.h" />
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\utility\delay_estimator.h" />
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\utility\delay_estimator_internal.h" />
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\utility\delay_estimator_wrapper.h" />
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\utility\ooura_fft.h" />
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\utility\ooura_fft_tables_common.h" />
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\utility\ooura_fft_tables_neon_sse2.h" />
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\vad\common.h" />
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\vad\gmm.h" />
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\vad\noise_gmm_tables.h" />
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\vad\pitch_based_vad.h" />
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\vad\pitch_internal.h" />
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\vad\pole_zero_filter.h" />
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\vad\standalone_vad.h" />
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\vad\vad_audio_proc.h" />
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\vad\vad_audio_proc_internal.h" />
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\vad\vad_circular_buffer.h" />
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\vad\voice_activity_detector.h" />
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\vad\voice_gmm_tables.h" />
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\voice_detection_impl.h" />
-    <ClInclude Include="webrtc_dsp\modules\third_party\fft\fft.h" />
-    <ClInclude Include="webrtc_dsp\rtc_base\arraysize.h" />
-    <ClInclude Include="webrtc_dsp\rtc_base\atomicops.h" />
-    <ClInclude Include="webrtc_dsp\rtc_base\checks.h" />
-    <ClInclude Include="webrtc_dsp\rtc_base\compile_assert_c.h" />
-    <ClInclude Include="webrtc_dsp\rtc_base\constructormagic.h" />
-    <ClInclude Include="webrtc_dsp\rtc_base\criticalsection.h" />
-    <ClInclude Include="webrtc_dsp\rtc_base\deprecation.h" />
-    <ClInclude Include="webrtc_dsp\rtc_base\event.h" />
-    <ClInclude Include="webrtc_dsp\rtc_base\event_tracer.h" />
-    <ClInclude Include="webrtc_dsp\rtc_base\function_view.h" />
-    <ClInclude Include="webrtc_dsp\rtc_base\gtest_prod_util.h" />
-    <ClInclude Include="webrtc_dsp\rtc_base\ignore_wundef.h" />
-    <ClInclude Include="webrtc_dsp\rtc_base\logging.h" />
-    <ClInclude Include="webrtc_dsp\rtc_base\logging_mac.h" />
-    <ClInclude Include="webrtc_dsp\rtc_base\memory\aligned_malloc.h" />
-    <ClInclude Include="webrtc_dsp\rtc_base\numerics\safe_compare.h" />
-    <ClInclude Include="webrtc_dsp\rtc_base\numerics\safe_conversions.h" />
-    <ClInclude Include="webrtc_dsp\rtc_base\numerics\safe_conversions_impl.h" />
-    <ClInclude Include="webrtc_dsp\rtc_base\numerics\safe_minmax.h" />
-    <ClInclude Include="webrtc_dsp\rtc_base\platform_file.h" />
-    <ClInclude Include="webrtc_dsp\rtc_base\platform_thread.h" />
-    <ClInclude Include="webrtc_dsp\rtc_base\platform_thread_types.h" />
-    <ClInclude Include="webrtc_dsp\rtc_base\protobuf_utils.h" />
-    <ClInclude Include="webrtc_dsp\rtc_base\race_checker.h" />
-    <ClInclude Include="webrtc_dsp\rtc_base\refcount.h" />
-    <ClInclude Include="webrtc_dsp\rtc_base\refcountedobject.h" />
-    <ClInclude Include="webrtc_dsp\rtc_base\refcounter.h" />
-    <ClInclude Include="webrtc_dsp\rtc_base\sanitizer.h" />
-    <ClInclude Include="webrtc_dsp\rtc_base\scoped_ref_ptr.h" />
-    <ClInclude Include="webrtc_dsp\rtc_base\stringencode.h" />
-    <ClInclude Include="webrtc_dsp\rtc_base\strings\string_builder.h" />
-    <ClInclude Include="webrtc_dsp\rtc_base\stringutils.h" />
-    <ClInclude Include="webrtc_dsp\rtc_base\string_to_number.h" />
-    <ClInclude Include="webrtc_dsp\rtc_base\swap_queue.h" />
-    <ClInclude Include="webrtc_dsp\rtc_base\system\arch.h" />
-    <ClInclude Include="webrtc_dsp\rtc_base\system\asm_defines.h" />
-    <ClInclude Include="webrtc_dsp\rtc_base\system\ignore_warnings.h" />
-    <ClInclude Include="webrtc_dsp\rtc_base\system\inline.h" />
-    <ClInclude Include="webrtc_dsp\rtc_base\system\rtc_export.h" />
-    <ClInclude Include="webrtc_dsp\rtc_base\system\unused.h" />
-    <ClInclude Include="webrtc_dsp\rtc_base\thread_annotations.h" />
-    <ClInclude Include="webrtc_dsp\rtc_base\thread_checker.h" />
-    <ClInclude Include="webrtc_dsp\rtc_base\thread_checker_impl.h" />
-    <ClInclude Include="webrtc_dsp\rtc_base\timeutils.h" />
-    <ClInclude Include="webrtc_dsp\rtc_base\trace_event.h" />
-    <ClInclude Include="webrtc_dsp\rtc_base\type_traits.h" />
-    <ClInclude Include="webrtc_dsp\system_wrappers\include\asm_defines.h" />
-    <ClInclude Include="webrtc_dsp\system_wrappers\include\compile_assert_c.h" />
-    <ClInclude Include="webrtc_dsp\system_wrappers\include\cpu_features_wrapper.h" />
-    <ClInclude Include="webrtc_dsp\system_wrappers\include\field_trial.h" />
-    <ClInclude Include="webrtc_dsp\system_wrappers\include\metrics.h" />
-    <ClInclude Include="webrtc_dsp\third_party\rnnoise\src\kiss_fft.h" />
-    <ClInclude Include="webrtc_dsp\third_party\rnnoise\src\rnn_activations.h" />
-    <ClInclude Include="webrtc_dsp\third_party\rnnoise\src\rnn_vad_weights.h" />
-    <ClInclude Include="webrtc_dsp\typedefs.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="audio\AudioInput.cpp" />
-    <ClCompile Include="audio\AudioIO.cpp" />
-    <ClCompile Include="audio\AudioIOCallback.cpp" />
-    <ClCompile Include="audio\AudioOutput.cpp" />
-    <ClCompile Include="audio\Resampler.cpp" />
-    <ClCompile Include="BlockingQueue.cpp" />
-    <ClCompile Include="Buffers.cpp" />
-    <ClCompile Include="CongestionControl.cpp" />
-    <ClCompile Include="EchoCanceller.cpp" />
-    <ClCompile Include="JitterBuffer.cpp" />
-    <ClCompile Include="json11.cpp" />
-    <ClCompile Include="logging.cpp" />
-    <ClCompile Include="MediaStreamItf.cpp" />
-    <ClCompile Include="MessageThread.cpp" />
-    <ClCompile Include="NetworkSocket.cpp" />
-    <ClCompile Include="OpusDecoder.cpp" />
-    <ClCompile Include="OpusEncoder.cpp" />
-    <ClCompile Include="os\windows\AudioInputWASAPI.cpp" />
-    <ClCompile Include="os\windows\AudioOutputWASAPI.cpp" />
-    <ClCompile Include="os\windows\NetworkSocketWinsock.cpp" />
-    <ClCompile Include="os\windows\WindowsSandboxUtils.cpp" />
-    <ClCompile Include="os\windows\WindowsSpecific.cpp" />
-    <ClCompile Include="PacketReassembler.cpp" />
-    <ClCompile Include="video\ScreamCongestionController.cpp" />
-    <ClCompile Include="video\VideoRenderer.cpp" />
-    <ClCompile Include="video\VideoSource.cpp" />
-    <ClCompile Include="VoIPController.cpp" />
-    <ClCompile Include="os\windows\CXWrapper.cpp" />
-    <ClCompile Include="VoIPGroupController.cpp" />
-    <ClCompile Include="VoIPServerConfig.cpp" />
-    <ClCompile Include="webrtc_dsp\absl\base\internal\raw_logging.cc" />
-    <ClCompile Include="webrtc_dsp\absl\base\internal\throw_delegate.cc" />
-    <ClCompile Include="webrtc_dsp\absl\strings\ascii.cc" />
-    <ClCompile Include="webrtc_dsp\absl\strings\internal\memutil.cc" />
-    <ClCompile Include="webrtc_dsp\absl\strings\string_view.cc" />
-    <ClCompile Include="webrtc_dsp\absl\types\bad_optional_access.cc" />
-    <ClCompile Include="webrtc_dsp\absl\types\optional.cc" />
-    <ClCompile Include="webrtc_dsp\api\audio\audio_frame.cc" />
-    <ClCompile Include="webrtc_dsp\api\audio\echo_canceller3_config.cc" />
-    <ClCompile Include="webrtc_dsp\api\audio\echo_canceller3_factory.cc" />
-    <ClCompile Include="webrtc_dsp\common_audio\audio_converter.cc" />
-    <ClCompile Include="webrtc_dsp\common_audio\audio_util.cc" />
-    <ClCompile Include="webrtc_dsp\common_audio\channel_buffer.cc" />
-    <ClCompile Include="webrtc_dsp\common_audio\fir_filter_c.cc" />
-    <ClCompile Include="webrtc_dsp\common_audio\fir_filter_factory.cc" />
-    <ClCompile Include="webrtc_dsp\common_audio\fir_filter_neon.cc" />
-    <ClCompile Include="webrtc_dsp\common_audio\fir_filter_sse.cc" />
-    <ClCompile Include="webrtc_dsp\common_audio\real_fourier.cc" />
-    <ClCompile Include="webrtc_dsp\common_audio\real_fourier_ooura.cc" />
-    <ClCompile Include="webrtc_dsp\common_audio\resampler\push_resampler.cc" />
-    <ClCompile Include="webrtc_dsp\common_audio\resampler\push_sinc_resampler.cc" />
-    <ClCompile Include="webrtc_dsp\common_audio\resampler\resampler.cc" />
-    <ClCompile Include="webrtc_dsp\common_audio\resampler\sinc_resampler.cc" />
-    <ClCompile Include="webrtc_dsp\common_audio\resampler\sinc_resampler_neon.cc" />
-    <ClCompile Include="webrtc_dsp\common_audio\resampler\sinc_resampler_sse.cc" />
-    <ClCompile Include="webrtc_dsp\common_audio\resampler\sinusoidal_linear_chirp_source.cc" />
-    <ClCompile Include="webrtc_dsp\common_audio\ring_buffer.c">
-      <CompileAsWinRT>false</CompileAsWinRT>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\common_audio\signal_processing\auto_correlation.c">
-      <CompileAsWinRT>false</CompileAsWinRT>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\common_audio\signal_processing\auto_corr_to_refl_coef.c">
-      <CompileAsWinRT>false</CompileAsWinRT>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\common_audio\signal_processing\complex_bit_reverse.c">
-      <CompileAsWinRT>false</CompileAsWinRT>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\common_audio\signal_processing\complex_fft.c">
-      <CompileAsWinRT>false</CompileAsWinRT>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\common_audio\signal_processing\copy_set_operations.c">
-      <CompileAsWinRT>false</CompileAsWinRT>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\common_audio\signal_processing\cross_correlation.c">
-      <CompileAsWinRT>false</CompileAsWinRT>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\common_audio\signal_processing\cross_correlation_neon.c">
-      <CompileAsWinRT>false</CompileAsWinRT>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\common_audio\signal_processing\division_operations.c">
-      <CompileAsWinRT>false</CompileAsWinRT>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\common_audio\signal_processing\dot_product_with_scale.cc" />
-    <ClCompile Include="webrtc_dsp\common_audio\signal_processing\downsample_fast.c">
-      <CompileAsWinRT>false</CompileAsWinRT>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\common_audio\signal_processing\downsample_fast_neon.c">
-      <CompileAsWinRT>false</CompileAsWinRT>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\common_audio\signal_processing\energy.c">
-      <CompileAsWinRT>false</CompileAsWinRT>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\common_audio\signal_processing\filter_ar.c">
-      <CompileAsWinRT>false</CompileAsWinRT>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\common_audio\signal_processing\filter_ar_fast_q12.c">
-      <CompileAsWinRT>false</CompileAsWinRT>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\common_audio\signal_processing\filter_ma_fast_q12.c">
-      <CompileAsWinRT>false</CompileAsWinRT>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\common_audio\signal_processing\get_hanning_window.c">
-      <CompileAsWinRT>false</CompileAsWinRT>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\common_audio\signal_processing\get_scaling_square.c">
-      <CompileAsWinRT>false</CompileAsWinRT>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\common_audio\signal_processing\ilbc_specific_functions.c">
-      <CompileAsWinRT>false</CompileAsWinRT>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\common_audio\signal_processing\levinson_durbin.c">
-      <CompileAsWinRT>false</CompileAsWinRT>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\common_audio\signal_processing\lpc_to_refl_coef.c">
-      <CompileAsWinRT>false</CompileAsWinRT>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\common_audio\signal_processing\min_max_operations.c">
-      <CompileAsWinRT>false</CompileAsWinRT>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\common_audio\signal_processing\min_max_operations_neon.c">
-      <CompileAsWinRT>false</CompileAsWinRT>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\common_audio\signal_processing\randomization_functions.c">
-      <CompileAsWinRT>false</CompileAsWinRT>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\common_audio\signal_processing\real_fft.c">
-      <CompileAsWinRT>false</CompileAsWinRT>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\common_audio\signal_processing\refl_coef_to_lpc.c">
-      <CompileAsWinRT>false</CompileAsWinRT>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\common_audio\signal_processing\resample.c">
-      <CompileAsWinRT>false</CompileAsWinRT>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\common_audio\signal_processing\resample_48khz.c">
-      <CompileAsWinRT>false</CompileAsWinRT>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\common_audio\signal_processing\resample_by_2.c">
-      <CompileAsWinRT>false</CompileAsWinRT>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\common_audio\signal_processing\resample_by_2_internal.c">
-      <CompileAsWinRT>false</CompileAsWinRT>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\common_audio\signal_processing\resample_fractional.c">
-      <CompileAsWinRT>false</CompileAsWinRT>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\common_audio\signal_processing\splitting_filter1.c">
-      <CompileAsWinRT>false</CompileAsWinRT>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\common_audio\signal_processing\spl_init.c">
-      <CompileAsWinRT>false</CompileAsWinRT>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\common_audio\signal_processing\spl_inl.c">
-      <CompileAsWinRT>false</CompileAsWinRT>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\common_audio\signal_processing\spl_sqrt.c">
-      <CompileAsWinRT>false</CompileAsWinRT>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\common_audio\signal_processing\sqrt_of_one_minus_x_squared.c">
-      <CompileAsWinRT>false</CompileAsWinRT>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\common_audio\signal_processing\vector_scaling_operations.c">
-      <CompileAsWinRT>false</CompileAsWinRT>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\common_audio\smoothing_filter.cc" />
-    <ClCompile Include="webrtc_dsp\common_audio\sparse_fir_filter.cc" />
-    <ClCompile Include="webrtc_dsp\common_audio\third_party\fft4g\fft4g.c">
-      <CompileAsWinRT>false</CompileAsWinRT>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\common_audio\third_party\spl_sqrt_floor\spl_sqrt_floor.c">
-      <CompileAsWinRT>false</CompileAsWinRT>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\common_audio\vad\vad.cc" />
-    <ClCompile Include="webrtc_dsp\common_audio\vad\vad_core.c">
-      <CompileAsWinRT>false</CompileAsWinRT>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\common_audio\vad\vad_filterbank.c">
-      <CompileAsWinRT>false</CompileAsWinRT>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\common_audio\vad\vad_gmm.c">
-      <CompileAsWinRT>false</CompileAsWinRT>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\common_audio\vad\vad_sp.c">
-      <CompileAsWinRT>false</CompileAsWinRT>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\common_audio\vad\webrtc_vad.c">
-      <CompileAsWinRT>false</CompileAsWinRT>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\common_audio\wav_file.cc" />
-    <ClCompile Include="webrtc_dsp\common_audio\wav_header.cc" />
-    <ClCompile Include="webrtc_dsp\common_audio\window_generator.cc" />
-    <ClCompile Include="webrtc_dsp\modules\audio_coding\codecs\isac\main\source\arith_routines.c">
-      <CompileAsWinRT>false</CompileAsWinRT>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\modules\audio_coding\codecs\isac\main\source\arith_routines_hist.c">
-      <CompileAsWinRT>false</CompileAsWinRT>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\modules\audio_coding\codecs\isac\main\source\arith_routines_logist.c">
-      <CompileAsWinRT>false</CompileAsWinRT>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\modules\audio_coding\codecs\isac\main\source\bandwidth_estimator.c">
-      <CompileAsWinRT>false</CompileAsWinRT>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\modules\audio_coding\codecs\isac\main\source\crc.c">
-      <CompileAsWinRT>false</CompileAsWinRT>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\modules\audio_coding\codecs\isac\main\source\decode.c">
-      <CompileAsWinRT>false</CompileAsWinRT>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\modules\audio_coding\codecs\isac\main\source\decode_bwe.c">
-      <CompileAsWinRT>false</CompileAsWinRT>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\modules\audio_coding\codecs\isac\main\source\encode.c">
-      <CompileAsWinRT>false</CompileAsWinRT>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\modules\audio_coding\codecs\isac\main\source\encode_lpc_swb.c">
-      <CompileAsWinRT>false</CompileAsWinRT>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\modules\audio_coding\codecs\isac\main\source\entropy_coding.c">
-      <CompileAsWinRT>false</CompileAsWinRT>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\modules\audio_coding\codecs\isac\main\source\filterbanks.c">
-      <CompileAsWinRT>false</CompileAsWinRT>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\modules\audio_coding\codecs\isac\main\source\filter_functions.c">
-      <CompileAsWinRT>false</CompileAsWinRT>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\modules\audio_coding\codecs\isac\main\source\intialize.c">
-      <CompileAsWinRT>false</CompileAsWinRT>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\modules\audio_coding\codecs\isac\main\source\isac.c">
-      <CompileAsWinRT>false</CompileAsWinRT>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\modules\audio_coding\codecs\isac\main\source\isac_vad.c">
-      <CompileAsWinRT>false</CompileAsWinRT>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\modules\audio_coding\codecs\isac\main\source\lattice.c">
-      <CompileAsWinRT>false</CompileAsWinRT>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\modules\audio_coding\codecs\isac\main\source\lpc_analysis.c">
-      <CompileAsWinRT>false</CompileAsWinRT>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\modules\audio_coding\codecs\isac\main\source\lpc_gain_swb_tables.c">
-      <CompileAsWinRT>false</CompileAsWinRT>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\modules\audio_coding\codecs\isac\main\source\lpc_shape_swb12_tables.c">
-      <CompileAsWinRT>false</CompileAsWinRT>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\modules\audio_coding\codecs\isac\main\source\lpc_shape_swb16_tables.c">
-      <CompileAsWinRT>false</CompileAsWinRT>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\modules\audio_coding\codecs\isac\main\source\lpc_tables.c">
-      <CompileAsWinRT>false</CompileAsWinRT>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\modules\audio_coding\codecs\isac\main\source\pitch_estimator.c">
-      <CompileAsWinRT>false</CompileAsWinRT>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\modules\audio_coding\codecs\isac\main\source\pitch_filter.c">
-      <CompileAsWinRT>false</CompileAsWinRT>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\modules\audio_coding\codecs\isac\main\source\pitch_gain_tables.c">
-      <CompileAsWinRT>false</CompileAsWinRT>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\modules\audio_coding\codecs\isac\main\source\pitch_lag_tables.c">
-      <CompileAsWinRT>false</CompileAsWinRT>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\modules\audio_coding\codecs\isac\main\source\spectrum_ar_model_tables.c">
-      <CompileAsWinRT>false</CompileAsWinRT>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\modules\audio_coding\codecs\isac\main\source\transform.c">
-      <CompileAsWinRT>false</CompileAsWinRT>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\modules\audio_processing\aec3\adaptive_fir_filter.cc" />
-    <ClCompile Include="webrtc_dsp\modules\audio_processing\aec3\aec3_common.cc" />
-    <ClCompile Include="webrtc_dsp\modules\audio_processing\aec3\aec3_fft.cc" />
-    <ClCompile Include="webrtc_dsp\modules\audio_processing\aec3\aec_state.cc" />
-    <ClCompile Include="webrtc_dsp\modules\audio_processing\aec3\block_delay_buffer.cc" />
-    <ClCompile Include="webrtc_dsp\modules\audio_processing\aec3\block_framer.cc" />
-    <ClCompile Include="webrtc_dsp\modules\audio_processing\aec3\block_processor.cc" />
-    <ClCompile Include="webrtc_dsp\modules\audio_processing\aec3\block_processor2.cc" />
-    <ClCompile Include="webrtc_dsp\modules\audio_processing\aec3\block_processor_metrics.cc" />
-    <ClCompile Include="webrtc_dsp\modules\audio_processing\aec3\cascaded_biquad_filter.cc" />
-    <ClCompile Include="webrtc_dsp\modules\audio_processing\aec3\comfort_noise_generator.cc" />
-    <ClCompile Include="webrtc_dsp\modules\audio_processing\aec3\decimator.cc" />
-    <ClCompile Include="webrtc_dsp\modules\audio_processing\aec3\downsampled_render_buffer.cc" />
-    <ClCompile Include="webrtc_dsp\modules\audio_processing\aec3\echo_audibility.cc" />
-    <ClCompile Include="webrtc_dsp\modules\audio_processing\aec3\echo_canceller3.cc" />
-    <ClCompile Include="webrtc_dsp\modules\audio_processing\aec3\echo_path_delay_estimator.cc" />
-    <ClCompile Include="webrtc_dsp\modules\audio_processing\aec3\echo_path_variability.cc" />
-    <ClCompile Include="webrtc_dsp\modules\audio_processing\aec3\echo_remover.cc" />
-    <ClCompile Include="webrtc_dsp\modules\audio_processing\aec3\echo_remover_metrics.cc" />
-    <ClCompile Include="webrtc_dsp\modules\audio_processing\aec3\erle_estimator.cc" />
-    <ClCompile Include="webrtc_dsp\modules\audio_processing\aec3\erl_estimator.cc" />
-    <ClCompile Include="webrtc_dsp\modules\audio_processing\aec3\fft_buffer.cc" />
-    <ClCompile Include="webrtc_dsp\modules\audio_processing\aec3\filter_analyzer.cc" />
-    <ClCompile Include="webrtc_dsp\modules\audio_processing\aec3\frame_blocker.cc" />
-    <ClCompile Include="webrtc_dsp\modules\audio_processing\aec3\fullband_erle_estimator.cc" />
-    <ClCompile Include="webrtc_dsp\modules\audio_processing\aec3\main_filter_update_gain.cc" />
-    <ClCompile Include="webrtc_dsp\modules\audio_processing\aec3\matched_filter.cc" />
-    <ClCompile Include="webrtc_dsp\modules\audio_processing\aec3\matched_filter_lag_aggregator.cc" />
-    <ClCompile Include="webrtc_dsp\modules\audio_processing\aec3\matrix_buffer.cc" />
-    <ClCompile Include="webrtc_dsp\modules\audio_processing\aec3\moving_average.cc" />
-    <ClCompile Include="webrtc_dsp\modules\audio_processing\aec3\render_buffer.cc" />
-    <ClCompile Include="webrtc_dsp\modules\audio_processing\aec3\render_delay_buffer.cc" />
-    <ClCompile Include="webrtc_dsp\modules\audio_processing\aec3\render_delay_buffer2.cc" />
-    <ClCompile Include="webrtc_dsp\modules\audio_processing\aec3\render_delay_controller.cc" />
-    <ClCompile Include="webrtc_dsp\modules\audio_processing\aec3\render_delay_controller2.cc" />
-    <ClCompile Include="webrtc_dsp\modules\audio_processing\aec3\render_delay_controller_metrics.cc" />
-    <ClCompile Include="webrtc_dsp\modules\audio_processing\aec3\render_reverb_model.cc" />
-    <ClCompile Include="webrtc_dsp\modules\audio_processing\aec3\render_signal_analyzer.cc" />
-    <ClCompile Include="webrtc_dsp\modules\audio_processing\aec3\residual_echo_estimator.cc" />
-    <ClCompile Include="webrtc_dsp\modules\audio_processing\aec3\reverb_decay_estimator.cc" />
-    <ClCompile Include="webrtc_dsp\modules\audio_processing\aec3\reverb_frequency_response.cc" />
-    <ClCompile Include="webrtc_dsp\modules\audio_processing\aec3\reverb_model.cc" />
-    <ClCompile Include="webrtc_dsp\modules\audio_processing\aec3\reverb_model_estimator.cc" />
-    <ClCompile Include="webrtc_dsp\modules\audio_processing\aec3\reverb_model_fallback.cc" />
-    <ClCompile Include="webrtc_dsp\modules\audio_processing\aec3\shadow_filter_update_gain.cc" />
-    <ClCompile Include="webrtc_dsp\modules\audio_processing\aec3\skew_estimator.cc" />
-    <ClCompile Include="webrtc_dsp\modules\audio_processing\aec3\stationarity_estimator.cc" />
-    <ClCompile Include="webrtc_dsp\modules\audio_processing\aec3\subband_erle_estimator.cc" />
-    <ClCompile Include="webrtc_dsp\modules\audio_processing\aec3\subtractor.cc" />
-    <ClCompile Include="webrtc_dsp\modules\audio_processing\aec3\subtractor_output.cc" />
-    <ClCompile Include="webrtc_dsp\modules\audio_processing\aec3\subtractor_output_analyzer.cc" />
-    <ClCompile Include="webrtc_dsp\modules\audio_processing\aec3\suppression_filter.cc" />
-    <ClCompile Include="webrtc_dsp\modules\audio_processing\aec3\suppression_gain.cc" />
-    <ClCompile Include="webrtc_dsp\modules\audio_processing\aec3\suppression_gain_limiter.cc" />
-    <ClCompile Include="webrtc_dsp\modules\audio_processing\aec3\vector_buffer.cc" />
-    <ClCompile Include="webrtc_dsp\modules\audio_processing\aecm\aecm_core.cc" />
-    <ClCompile Include="webrtc_dsp\modules\audio_processing\aecm\aecm_core_c.cc" />
-    <ClCompile Include="webrtc_dsp\modules\audio_processing\aecm\aecm_core_neon.cc" />
-    <ClCompile Include="webrtc_dsp\modules\audio_processing\aecm\echo_control_mobile.cc" />
-    <ClCompile Include="webrtc_dsp\modules\audio_processing\aec\aec_core.cc" />
-    <ClCompile Include="webrtc_dsp\modules\audio_processing\aec\aec_core_neon.cc" />
-    <ClCompile Include="webrtc_dsp\modules\audio_processing\aec\aec_core_sse2.cc" />
-    <ClCompile Include="webrtc_dsp\modules\audio_processing\aec\aec_resampler.cc" />
-    <ClCompile Include="webrtc_dsp\modules\audio_processing\aec\echo_cancellation.cc" />
-    <ClCompile Include="webrtc_dsp\modules\audio_processing\agc2\adaptive_agc.cc" />
-    <ClCompile Include="webrtc_dsp\modules\audio_processing\agc2\adaptive_digital_gain_applier.cc" />
-    <ClCompile Include="webrtc_dsp\modules\audio_processing\agc2\adaptive_mode_level_estimator.cc" />
-    <ClCompile Include="webrtc_dsp\modules\audio_processing\agc2\adaptive_mode_level_estimator_agc.cc" />
-    <ClCompile Include="webrtc_dsp\modules\audio_processing\agc2\agc2_common.cc" />
-    <ClCompile Include="webrtc_dsp\modules\audio_processing\agc2\agc2_testing_common.cc" />
-    <ClCompile Include="webrtc_dsp\modules\audio_processing\agc2\biquad_filter.cc" />
-    <ClCompile Include="webrtc_dsp\modules\audio_processing\agc2\compute_interpolated_gain_curve.cc" />
-    <ClCompile Include="webrtc_dsp\modules\audio_processing\agc2\down_sampler.cc" />
-    <ClCompile Include="webrtc_dsp\modules\audio_processing\agc2\fixed_digital_level_estimator.cc" />
-    <ClCompile Include="webrtc_dsp\modules\audio_processing\agc2\fixed_gain_controller.cc" />
-    <ClCompile Include="webrtc_dsp\modules\audio_processing\agc2\gain_applier.cc" />
-    <ClCompile Include="webrtc_dsp\modules\audio_processing\agc2\interpolated_gain_curve.cc" />
-    <ClCompile Include="webrtc_dsp\modules\audio_processing\agc2\limiter.cc" />
-    <ClCompile Include="webrtc_dsp\modules\audio_processing\agc2\limiter_db_gain_curve.cc" />
-    <ClCompile Include="webrtc_dsp\modules\audio_processing\agc2\noise_level_estimator.cc" />
-    <ClCompile Include="webrtc_dsp\modules\audio_processing\agc2\noise_spectrum_estimator.cc" />
-    <ClCompile Include="webrtc_dsp\modules\audio_processing\agc2\rnn_vad\features_extraction.cc" />
-    <ClCompile Include="webrtc_dsp\modules\audio_processing\agc2\rnn_vad\fft_util.cc" />
-    <ClCompile Include="webrtc_dsp\modules\audio_processing\agc2\rnn_vad\lp_residual.cc" />
-    <ClCompile Include="webrtc_dsp\modules\audio_processing\agc2\rnn_vad\pitch_search.cc" />
-    <ClCompile Include="webrtc_dsp\modules\audio_processing\agc2\rnn_vad\pitch_search_internal.cc" />
-    <ClCompile Include="webrtc_dsp\modules\audio_processing\agc2\rnn_vad\rnn.cc" />
-    <ClCompile Include="webrtc_dsp\modules\audio_processing\agc2\rnn_vad\spectral_features.cc" />
-    <ClCompile Include="webrtc_dsp\modules\audio_processing\agc2\rnn_vad\spectral_features_internal.cc" />
-    <ClCompile Include="webrtc_dsp\modules\audio_processing\agc2\saturation_protector.cc" />
-    <ClCompile Include="webrtc_dsp\modules\audio_processing\agc2\signal_classifier.cc" />
-    <ClCompile Include="webrtc_dsp\modules\audio_processing\agc2\vad_with_level.cc" />
-    <ClCompile Include="webrtc_dsp\modules\audio_processing\agc2\vector_float_frame.cc" />
-    <ClCompile Include="webrtc_dsp\modules\audio_processing\agc\agc.cc" />
-    <ClCompile Include="webrtc_dsp\modules\audio_processing\agc\agc_manager_direct.cc" />
-    <ClCompile Include="webrtc_dsp\modules\audio_processing\agc\legacy\analog_agc.c">
-      <CompileAsWinRT>false</CompileAsWinRT>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\modules\audio_processing\agc\legacy\digital_agc.c">
-      <CompileAsWinRT>false</CompileAsWinRT>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\modules\audio_processing\agc\loudness_histogram.cc" />
-    <ClCompile Include="webrtc_dsp\modules\audio_processing\agc\utility.cc" />
-    <ClCompile Include="webrtc_dsp\modules\audio_processing\audio_buffer.cc" />
-    <ClCompile Include="webrtc_dsp\modules\audio_processing\audio_generator\file_audio_generator.cc" />
-    <ClCompile Include="webrtc_dsp\modules\audio_processing\audio_processing_impl.cc" />
-    <ClCompile Include="webrtc_dsp\modules\audio_processing\echo_cancellation_impl.cc" />
-    <ClCompile Include="webrtc_dsp\modules\audio_processing\echo_control_mobile_impl.cc" />
-    <ClCompile Include="webrtc_dsp\modules\audio_processing\echo_detector\circular_buffer.cc" />
-    <ClCompile Include="webrtc_dsp\modules\audio_processing\echo_detector\mean_variance_estimator.cc" />
-    <ClCompile Include="webrtc_dsp\modules\audio_processing\echo_detector\moving_max.cc" />
-    <ClCompile Include="webrtc_dsp\modules\audio_processing\echo_detector\normalized_covariance_estimator.cc" />
-    <ClCompile Include="webrtc_dsp\modules\audio_processing\gain_controller2.cc" />
-    <ClCompile Include="webrtc_dsp\modules\audio_processing\gain_control_for_experimental_agc.cc" />
-    <ClCompile Include="webrtc_dsp\modules\audio_processing\gain_control_impl.cc" />
-    <ClCompile Include="webrtc_dsp\modules\audio_processing\include\aec_dump.cc" />
-    <ClCompile Include="webrtc_dsp\modules\audio_processing\include\audio_generator_factory.cc" />
-    <ClCompile Include="webrtc_dsp\modules\audio_processing\include\audio_processing.cc" />
-    <ClCompile Include="webrtc_dsp\modules\audio_processing\include\audio_processing_statistics.cc" />
-    <ClCompile Include="webrtc_dsp\modules\audio_processing\include\config.cc" />
-    <ClCompile Include="webrtc_dsp\modules\audio_processing\level_estimator_impl.cc" />
-    <ClCompile Include="webrtc_dsp\modules\audio_processing\logging\apm_data_dumper.cc" />
-    <ClCompile Include="webrtc_dsp\modules\audio_processing\low_cut_filter.cc" />
-    <ClCompile Include="webrtc_dsp\modules\audio_processing\noise_suppression_impl.cc" />
-    <ClCompile Include="webrtc_dsp\modules\audio_processing\ns\noise_suppression.c">
-      <CompileAsWinRT>false</CompileAsWinRT>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\modules\audio_processing\ns\noise_suppression_x.c">
-      <CompileAsWinRT>false</CompileAsWinRT>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\modules\audio_processing\ns\nsx_core.c">
-      <CompileAsWinRT>false</CompileAsWinRT>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\modules\audio_processing\ns\nsx_core_c.c">
-      <CompileAsWinRT>false</CompileAsWinRT>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\modules\audio_processing\ns\nsx_core_neon.c">
-      <CompileAsWinRT>false</CompileAsWinRT>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\modules\audio_processing\ns\ns_core.c">
-      <CompileAsWinRT>false</CompileAsWinRT>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\modules\audio_processing\residual_echo_detector.cc" />
-    <ClCompile Include="webrtc_dsp\modules\audio_processing\rms_level.cc" />
-    <ClCompile Include="webrtc_dsp\modules\audio_processing\splitting_filter.cc" />
-    <ClCompile Include="webrtc_dsp\modules\audio_processing\three_band_filter_bank.cc" />
-    <ClCompile Include="webrtc_dsp\modules\audio_processing\transient\moving_moments.cc" />
-    <ClCompile Include="webrtc_dsp\modules\audio_processing\transient\transient_detector.cc" />
-    <ClCompile Include="webrtc_dsp\modules\audio_processing\transient\transient_suppressor.cc" />
-    <ClCompile Include="webrtc_dsp\modules\audio_processing\transient\wpd_node.cc" />
-    <ClCompile Include="webrtc_dsp\modules\audio_processing\transient\wpd_tree.cc" />
-    <ClCompile Include="webrtc_dsp\modules\audio_processing\typing_detection.cc" />
-    <ClCompile Include="webrtc_dsp\modules\audio_processing\utility\block_mean_calculator.cc" />
-    <ClCompile Include="webrtc_dsp\modules\audio_processing\utility\delay_estimator.cc" />
-    <ClCompile Include="webrtc_dsp\modules\audio_processing\utility\delay_estimator_wrapper.cc" />
-    <ClCompile Include="webrtc_dsp\modules\audio_processing\utility\ooura_fft.cc" />
-    <ClCompile Include="webrtc_dsp\modules\audio_processing\utility\ooura_fft_neon.cc" />
-    <ClCompile Include="webrtc_dsp\modules\audio_processing\utility\ooura_fft_sse2.cc" />
-    <ClCompile Include="webrtc_dsp\modules\audio_processing\vad\gmm.cc" />
-    <ClCompile Include="webrtc_dsp\modules\audio_processing\vad\pitch_based_vad.cc" />
-    <ClCompile Include="webrtc_dsp\modules\audio_processing\vad\pitch_internal.cc" />
-    <ClCompile Include="webrtc_dsp\modules\audio_processing\vad\pole_zero_filter.cc" />
-    <ClCompile Include="webrtc_dsp\modules\audio_processing\vad\standalone_vad.cc" />
-    <ClCompile Include="webrtc_dsp\modules\audio_processing\vad\vad_audio_proc.cc" />
-    <ClCompile Include="webrtc_dsp\modules\audio_processing\vad\vad_circular_buffer.cc" />
-    <ClCompile Include="webrtc_dsp\modules\audio_processing\vad\voice_activity_detector.cc" />
-    <ClCompile Include="webrtc_dsp\modules\audio_processing\voice_detection_impl.cc" />
-    <ClCompile Include="webrtc_dsp\modules\third_party\fft\fft.c">
-      <CompileAsWinRT>false</CompileAsWinRT>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\rtc_base\checks.cc" />
-    <ClCompile Include="webrtc_dsp\rtc_base\criticalsection.cc" />
-    <ClCompile Include="webrtc_dsp\rtc_base\event.cc" />
-    <ClCompile Include="webrtc_dsp\rtc_base\event_tracer.cc" />
-    <ClCompile Include="webrtc_dsp\rtc_base\logging_webrtc.cc" />
-    <ClCompile Include="webrtc_dsp\rtc_base\memory\aligned_malloc.cc" />
-    <ClCompile Include="webrtc_dsp\rtc_base\platform_file.cc" />
-    <ClCompile Include="webrtc_dsp\rtc_base\platform_thread.cc" />
-    <ClCompile Include="webrtc_dsp\rtc_base\platform_thread_types.cc" />
-    <ClCompile Include="webrtc_dsp\rtc_base\race_checker.cc" />
-    <ClCompile Include="webrtc_dsp\rtc_base\stringencode.cc" />
-    <ClCompile Include="webrtc_dsp\rtc_base\strings\string_builder.cc" />
-    <ClCompile Include="webrtc_dsp\rtc_base\stringutils.cc" />
-    <ClCompile Include="webrtc_dsp\rtc_base\string_to_number.cc" />
-    <ClCompile Include="webrtc_dsp\rtc_base\thread_checker_impl.cc" />
-    <ClCompile Include="webrtc_dsp\rtc_base\timeutils.cc" />
-    <ClCompile Include="webrtc_dsp\system_wrappers\source\cpu_features.cc" />
-    <ClCompile Include="webrtc_dsp\system_wrappers\source\field_trial.cc" />
-    <ClCompile Include="webrtc_dsp\system_wrappers\source\metrics.cc" />
-    <ClCompile Include="webrtc_dsp\third_party\rnnoise\src\kiss_fft.cc" />
-    <ClCompile Include="webrtc_dsp\third_party\rnnoise\src\rnn_vad_weights.cc" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\libopus\libopus.vcxproj">
-      <Project>{904ac506-51a0-474e-9f55-ec3febbcccd9}</Project>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <SDKReference Include="WindowsMobile, Version=10.0.17134.0" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets" />
-</Project>
\ No newline at end of file
diff --git a/submodules/libtgvoip/libtgvoip.UWP.vcxproj.filters b/submodules/libtgvoip/libtgvoip.UWP.vcxproj.filters
deleted file mode 100644
index 8075ff4cb5..0000000000
--- a/submodules/libtgvoip/libtgvoip.UWP.vcxproj.filters
+++ /dev/null
@@ -1,1924 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Resources">
-      <UniqueIdentifier>11199e80-17a0-460f-a780-9bfde20eb11c</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tga;tiff;tif;png;wav;mfcribbon-ms</Extensions>
-    </Filter>
-    <Filter Include="audio">
-      <UniqueIdentifier>{c5b75146-c75a-4c56-aeb2-2781658d7b0a}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="windows">
-      <UniqueIdentifier>{de1527d9-7564-4e96-9653-6e023b90d2bc}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="video">
-      <UniqueIdentifier>{e4d2de92-03ad-43d9-8861-d69f64610ba5}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="webrtc_dsp">
-      <UniqueIdentifier>{365b5ef0-7ccb-4aca-bcd6-ae11baae57f6}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="VoIPController.cpp" />
-    <ClCompile Include="VoIPServerConfig.cpp" />
-    <ClCompile Include="BlockingQueue.cpp" />
-    <ClCompile Include="Buffers.cpp" />
-    <ClCompile Include="CongestionControl.cpp" />
-    <ClCompile Include="EchoCanceller.cpp" />
-    <ClCompile Include="JitterBuffer.cpp" />
-    <ClCompile Include="logging.cpp" />
-    <ClCompile Include="MediaStreamItf.cpp" />
-    <ClCompile Include="NetworkSocket.cpp" />
-    <ClCompile Include="OpusDecoder.cpp" />
-    <ClCompile Include="OpusEncoder.cpp" />
-    <ClCompile Include="audio\AudioInput.cpp">
-      <Filter>audio</Filter>
-    </ClCompile>
-    <ClCompile Include="audio\AudioOutput.cpp">
-      <Filter>audio</Filter>
-    </ClCompile>
-    <ClCompile Include="audio\Resampler.cpp">
-      <Filter>audio</Filter>
-    </ClCompile>
-    <ClCompile Include="os\windows\AudioInputWASAPI.cpp">
-      <Filter>windows</Filter>
-    </ClCompile>
-    <ClCompile Include="os\windows\AudioOutputWASAPI.cpp">
-      <Filter>windows</Filter>
-    </ClCompile>
-    <ClCompile Include="os\windows\NetworkSocketWinsock.cpp">
-      <Filter>windows</Filter>
-    </ClCompile>
-    <ClCompile Include="os\windows\WindowsSandboxUtils.cpp">
-      <Filter>windows</Filter>
-    </ClCompile>
-    <ClCompile Include="os\windows\CXWrapper.cpp">
-      <Filter>windows</Filter>
-    </ClCompile>
-    <ClCompile Include="VoIPGroupController.cpp" />
-    <ClCompile Include="PacketReassembler.cpp" />
-    <ClCompile Include="MessageThread.cpp" />
-    <ClCompile Include="audio\AudioIO.cpp">
-      <Filter>audio</Filter>
-    </ClCompile>
-    <ClCompile Include="os\windows\WindowsSpecific.cpp">
-      <Filter>windows</Filter>
-    </ClCompile>
-    <ClCompile Include="video\VideoRenderer.cpp">
-      <Filter>video</Filter>
-    </ClCompile>
-    <ClCompile Include="video\VideoSource.cpp">
-      <Filter>video</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\rtc_base\checks.cc">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\rtc_base\criticalsection.cc">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\rtc_base\event.cc">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\rtc_base\event_tracer.cc">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\rtc_base\logging_webrtc.cc">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\rtc_base\memory\aligned_malloc.cc">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\rtc_base\platform_thread.cc">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\rtc_base\platform_thread_types.cc">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\rtc_base\race_checker.cc">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\rtc_base\stringencode.cc">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\rtc_base\strings\string_builder.cc">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\rtc_base\stringutils.cc">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\rtc_base\string_to_number.cc">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\rtc_base\thread_checker_impl.cc">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\rtc_base\timeutils.cc">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\system_wrappers\source\cpu_features.cc">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\system_wrappers\source\field_trial.cc">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\system_wrappers\source\metrics.cc">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\third_party\rnnoise\src\kiss_fft.cc">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\third_party\rnnoise\src\rnn_vad_weights.cc">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\absl\base\internal\raw_logging.cc">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\absl\base\internal\throw_delegate.cc">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\absl\strings\ascii.cc">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\absl\strings\internal\memutil.cc">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\absl\strings\string_view.cc">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\absl\types\bad_optional_access.cc">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\absl\types\optional.cc">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\api\audio\audio_frame.cc">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\api\audio\echo_canceller3_config.cc">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\api\audio\echo_canceller3_factory.cc">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\common_audio\audio_converter.cc">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\common_audio\audio_util.cc">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\common_audio\channel_buffer.cc">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\common_audio\fir_filter_c.cc">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\common_audio\fir_filter_factory.cc">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\common_audio\fir_filter_neon.cc">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\common_audio\fir_filter_sse.cc">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\common_audio\real_fourier.cc">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\common_audio\real_fourier_ooura.cc">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\common_audio\resampler\push_resampler.cc">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\common_audio\resampler\push_sinc_resampler.cc">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\common_audio\resampler\resampler.cc">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\common_audio\resampler\sinc_resampler.cc">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\common_audio\resampler\sinc_resampler_neon.cc">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\common_audio\resampler\sinc_resampler_sse.cc">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\common_audio\resampler\sinusoidal_linear_chirp_source.cc">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\common_audio\ring_buffer.c">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\common_audio\signal_processing\auto_correlation.c">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\common_audio\signal_processing\auto_corr_to_refl_coef.c">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\common_audio\signal_processing\complex_bit_reverse.c">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\common_audio\signal_processing\complex_fft.c">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\common_audio\signal_processing\copy_set_operations.c">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\common_audio\signal_processing\cross_correlation.c">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\common_audio\signal_processing\cross_correlation_neon.c">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\common_audio\signal_processing\division_operations.c">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\common_audio\signal_processing\dot_product_with_scale.cc">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\common_audio\signal_processing\downsample_fast.c">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\common_audio\signal_processing\downsample_fast_neon.c">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\common_audio\signal_processing\energy.c">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\common_audio\signal_processing\filter_ar.c">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\common_audio\signal_processing\filter_ar_fast_q12.c">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\common_audio\signal_processing\filter_ma_fast_q12.c">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\common_audio\signal_processing\get_hanning_window.c">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\common_audio\signal_processing\get_scaling_square.c">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\common_audio\signal_processing\ilbc_specific_functions.c">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\common_audio\signal_processing\levinson_durbin.c">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\common_audio\signal_processing\lpc_to_refl_coef.c">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\common_audio\signal_processing\min_max_operations.c">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\common_audio\signal_processing\min_max_operations_neon.c">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\common_audio\signal_processing\randomization_functions.c">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\common_audio\signal_processing\real_fft.c">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\common_audio\signal_processing\refl_coef_to_lpc.c">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\common_audio\signal_processing\resample.c">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\common_audio\signal_processing\resample_48khz.c">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\common_audio\signal_processing\resample_by_2.c">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\common_audio\signal_processing\resample_by_2_internal.c">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\common_audio\signal_processing\resample_fractional.c">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\common_audio\signal_processing\splitting_filter1.c">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\common_audio\signal_processing\spl_init.c">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\common_audio\signal_processing\spl_inl.c">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\common_audio\signal_processing\spl_sqrt.c">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\common_audio\signal_processing\sqrt_of_one_minus_x_squared.c">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\common_audio\signal_processing\vector_scaling_operations.c">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\common_audio\smoothing_filter.cc">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\common_audio\sparse_fir_filter.cc">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\common_audio\third_party\fft4g\fft4g.c">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\common_audio\third_party\spl_sqrt_floor\spl_sqrt_floor.c">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\common_audio\vad\vad.cc">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\common_audio\vad\vad_core.c">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\common_audio\vad\vad_filterbank.c">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\common_audio\vad\vad_gmm.c">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\common_audio\vad\vad_sp.c">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\common_audio\vad\webrtc_vad.c">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\common_audio\wav_file.cc">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\common_audio\wav_header.cc">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\common_audio\window_generator.cc">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\modules\audio_coding\codecs\isac\main\source\arith_routines.c">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\modules\audio_coding\codecs\isac\main\source\arith_routines_hist.c">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\modules\audio_coding\codecs\isac\main\source\arith_routines_logist.c">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\modules\audio_coding\codecs\isac\main\source\bandwidth_estimator.c">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\modules\audio_coding\codecs\isac\main\source\crc.c">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\modules\audio_coding\codecs\isac\main\source\decode.c">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\modules\audio_coding\codecs\isac\main\source\decode_bwe.c">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\modules\audio_coding\codecs\isac\main\source\encode.c">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\modules\audio_coding\codecs\isac\main\source\encode_lpc_swb.c">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\modules\audio_coding\codecs\isac\main\source\entropy_coding.c">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\modules\audio_coding\codecs\isac\main\source\filterbanks.c">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\modules\audio_coding\codecs\isac\main\source\filter_functions.c">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\modules\audio_coding\codecs\isac\main\source\intialize.c">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\modules\audio_coding\codecs\isac\main\source\isac.c">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\modules\audio_coding\codecs\isac\main\source\isac_vad.c">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\modules\audio_coding\codecs\isac\main\source\lattice.c">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\modules\audio_coding\codecs\isac\main\source\lpc_analysis.c">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\modules\audio_coding\codecs\isac\main\source\lpc_gain_swb_tables.c">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\modules\audio_coding\codecs\isac\main\source\lpc_shape_swb12_tables.c">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\modules\audio_coding\codecs\isac\main\source\lpc_shape_swb16_tables.c">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\modules\audio_coding\codecs\isac\main\source\lpc_tables.c">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\modules\audio_coding\codecs\isac\main\source\pitch_estimator.c">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\modules\audio_coding\codecs\isac\main\source\pitch_filter.c">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\modules\audio_coding\codecs\isac\main\source\pitch_gain_tables.c">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\modules\audio_coding\codecs\isac\main\source\pitch_lag_tables.c">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\modules\audio_coding\codecs\isac\main\source\spectrum_ar_model_tables.c">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\modules\audio_coding\codecs\isac\main\source\transform.c">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\modules\audio_processing\aec\aec_core.cc">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\modules\audio_processing\aec\aec_core_neon.cc">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\modules\audio_processing\aec\aec_core_sse2.cc">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\modules\audio_processing\aec\aec_resampler.cc">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\modules\audio_processing\aec\echo_cancellation.cc">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\modules\audio_processing\aec3\adaptive_fir_filter.cc">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\modules\audio_processing\aec3\aec3_common.cc">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\modules\audio_processing\aec3\aec3_fft.cc">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\modules\audio_processing\aec3\aec_state.cc">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\modules\audio_processing\aec3\block_delay_buffer.cc">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\modules\audio_processing\aec3\block_framer.cc">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\modules\audio_processing\aec3\block_processor.cc">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\modules\audio_processing\aec3\block_processor2.cc">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\modules\audio_processing\aec3\block_processor_metrics.cc">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\modules\audio_processing\aec3\cascaded_biquad_filter.cc">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\modules\audio_processing\aec3\comfort_noise_generator.cc">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\modules\audio_processing\aec3\decimator.cc">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\modules\audio_processing\aec3\downsampled_render_buffer.cc">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\modules\audio_processing\aec3\echo_audibility.cc">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\modules\audio_processing\aec3\echo_canceller3.cc">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\modules\audio_processing\aec3\echo_path_delay_estimator.cc">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\modules\audio_processing\aec3\echo_path_variability.cc">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\modules\audio_processing\aec3\echo_remover.cc">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\modules\audio_processing\aec3\echo_remover_metrics.cc">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\modules\audio_processing\aec3\erle_estimator.cc">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\modules\audio_processing\aec3\erl_estimator.cc">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\modules\audio_processing\aec3\fft_buffer.cc">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\modules\audio_processing\aec3\filter_analyzer.cc">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\modules\audio_processing\aec3\frame_blocker.cc">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\modules\audio_processing\aec3\fullband_erle_estimator.cc">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\modules\audio_processing\aec3\main_filter_update_gain.cc">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\modules\audio_processing\aec3\matched_filter.cc">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\modules\audio_processing\aec3\matched_filter_lag_aggregator.cc">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\modules\audio_processing\aec3\matrix_buffer.cc">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\modules\audio_processing\aec3\moving_average.cc">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\modules\audio_processing\aec3\render_buffer.cc">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\modules\audio_processing\aec3\render_delay_buffer.cc">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\modules\audio_processing\aec3\render_delay_buffer2.cc">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\modules\audio_processing\aec3\render_delay_controller.cc">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\modules\audio_processing\aec3\render_delay_controller2.cc">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\modules\audio_processing\aec3\render_delay_controller_metrics.cc">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\modules\audio_processing\aec3\render_reverb_model.cc">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\modules\audio_processing\aec3\render_signal_analyzer.cc">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\modules\audio_processing\aec3\residual_echo_estimator.cc">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\modules\audio_processing\aec3\reverb_decay_estimator.cc">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\modules\audio_processing\aec3\reverb_frequency_response.cc">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\modules\audio_processing\aec3\reverb_model.cc">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\modules\audio_processing\aec3\reverb_model_estimator.cc">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\modules\audio_processing\aec3\reverb_model_fallback.cc">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\modules\audio_processing\aec3\shadow_filter_update_gain.cc">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\modules\audio_processing\aec3\skew_estimator.cc">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\modules\audio_processing\aec3\stationarity_estimator.cc">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\modules\audio_processing\aec3\subband_erle_estimator.cc">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\modules\audio_processing\aec3\subtractor.cc">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\modules\audio_processing\aec3\subtractor_output.cc">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\modules\audio_processing\aec3\subtractor_output_analyzer.cc">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\modules\audio_processing\aec3\suppression_filter.cc">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\modules\audio_processing\aec3\suppression_gain.cc">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\modules\audio_processing\aec3\suppression_gain_limiter.cc">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\modules\audio_processing\aec3\vector_buffer.cc">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\modules\audio_processing\aecm\aecm_core.cc">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\modules\audio_processing\aecm\aecm_core_c.cc">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\modules\audio_processing\aecm\aecm_core_neon.cc">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\modules\audio_processing\aecm\echo_control_mobile.cc">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\modules\audio_processing\agc\agc.cc">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\modules\audio_processing\agc\agc_manager_direct.cc">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\modules\audio_processing\agc\legacy\analog_agc.c">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\modules\audio_processing\agc\legacy\digital_agc.c">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\modules\audio_processing\agc\loudness_histogram.cc">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\modules\audio_processing\agc\utility.cc">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\modules\audio_processing\agc2\adaptive_agc.cc">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\modules\audio_processing\agc2\adaptive_digital_gain_applier.cc">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\modules\audio_processing\agc2\adaptive_mode_level_estimator.cc">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\modules\audio_processing\agc2\adaptive_mode_level_estimator_agc.cc">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\modules\audio_processing\agc2\agc2_common.cc">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\modules\audio_processing\agc2\agc2_testing_common.cc">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\modules\audio_processing\agc2\biquad_filter.cc">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\modules\audio_processing\agc2\compute_interpolated_gain_curve.cc">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\modules\audio_processing\agc2\down_sampler.cc">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\modules\audio_processing\agc2\fixed_digital_level_estimator.cc">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\modules\audio_processing\agc2\fixed_gain_controller.cc">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\modules\audio_processing\agc2\gain_applier.cc">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\modules\audio_processing\agc2\interpolated_gain_curve.cc">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\modules\audio_processing\agc2\limiter.cc">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\modules\audio_processing\agc2\limiter_db_gain_curve.cc">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\modules\audio_processing\agc2\noise_level_estimator.cc">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\modules\audio_processing\agc2\noise_spectrum_estimator.cc">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\modules\audio_processing\agc2\rnn_vad\features_extraction.cc">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\modules\audio_processing\agc2\rnn_vad\fft_util.cc">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\modules\audio_processing\agc2\rnn_vad\lp_residual.cc">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\modules\audio_processing\agc2\rnn_vad\pitch_search.cc">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\modules\audio_processing\agc2\rnn_vad\pitch_search_internal.cc">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\modules\audio_processing\agc2\rnn_vad\rnn.cc">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\modules\audio_processing\agc2\rnn_vad\spectral_features.cc">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\modules\audio_processing\agc2\rnn_vad\spectral_features_internal.cc">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\modules\audio_processing\agc2\saturation_protector.cc">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\modules\audio_processing\agc2\signal_classifier.cc">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\modules\audio_processing\agc2\vad_with_level.cc">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\modules\audio_processing\agc2\vector_float_frame.cc">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\modules\audio_processing\audio_buffer.cc">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\modules\audio_processing\audio_generator\file_audio_generator.cc">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\modules\audio_processing\audio_processing_impl.cc">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\modules\audio_processing\echo_cancellation_impl.cc">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\modules\audio_processing\echo_control_mobile_impl.cc">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\modules\audio_processing\echo_detector\circular_buffer.cc">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\modules\audio_processing\echo_detector\mean_variance_estimator.cc">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\modules\audio_processing\echo_detector\moving_max.cc">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\modules\audio_processing\echo_detector\normalized_covariance_estimator.cc">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\modules\audio_processing\gain_controller2.cc">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\modules\audio_processing\gain_control_for_experimental_agc.cc">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\modules\audio_processing\gain_control_impl.cc">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\modules\audio_processing\include\aec_dump.cc">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\modules\audio_processing\include\audio_generator_factory.cc">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\modules\audio_processing\include\audio_processing.cc">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\modules\audio_processing\include\audio_processing_statistics.cc">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\modules\audio_processing\include\config.cc">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\modules\audio_processing\level_estimator_impl.cc">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\modules\audio_processing\logging\apm_data_dumper.cc">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\modules\audio_processing\low_cut_filter.cc">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\modules\audio_processing\noise_suppression_impl.cc">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\modules\audio_processing\ns\noise_suppression.c">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\modules\audio_processing\ns\noise_suppression_x.c">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\modules\audio_processing\ns\nsx_core.c">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\modules\audio_processing\ns\nsx_core_c.c">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\modules\audio_processing\ns\nsx_core_neon.c">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\modules\audio_processing\ns\ns_core.c">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\modules\audio_processing\residual_echo_detector.cc">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\modules\audio_processing\rms_level.cc">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\modules\audio_processing\splitting_filter.cc">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\modules\audio_processing\three_band_filter_bank.cc">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\modules\audio_processing\transient\moving_moments.cc">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\modules\audio_processing\transient\transient_detector.cc">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\modules\audio_processing\transient\transient_suppressor.cc">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\modules\audio_processing\transient\wpd_node.cc">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\modules\audio_processing\transient\wpd_tree.cc">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\modules\audio_processing\typing_detection.cc">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\modules\audio_processing\utility\block_mean_calculator.cc">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\modules\audio_processing\utility\delay_estimator.cc">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\modules\audio_processing\utility\delay_estimator_wrapper.cc">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\modules\audio_processing\utility\ooura_fft.cc">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\modules\audio_processing\utility\ooura_fft_neon.cc">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\modules\audio_processing\utility\ooura_fft_sse2.cc">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\modules\audio_processing\vad\gmm.cc">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\modules\audio_processing\vad\pitch_based_vad.cc">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\modules\audio_processing\vad\pitch_internal.cc">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\modules\audio_processing\vad\pole_zero_filter.cc">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\modules\audio_processing\vad\standalone_vad.cc">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\modules\audio_processing\vad\vad_audio_proc.cc">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\modules\audio_processing\vad\vad_circular_buffer.cc">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\modules\audio_processing\vad\voice_activity_detector.cc">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\modules\audio_processing\voice_detection_impl.cc">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\modules\third_party\fft\fft.c">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="json11.cpp" />
-    <ClCompile Include="video\ScreamCongestionController.cpp">
-      <Filter>video</Filter>
-    </ClCompile>
-    <ClCompile Include="audio\AudioIOCallback.cpp">
-      <Filter>audio</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\rtc_base\platform_file.cc" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="VoIPController.h" />
-    <ClInclude Include="VoIPServerConfig.h" />
-    <ClInclude Include="BlockingQueue.h" />
-    <ClInclude Include="Buffers.h" />
-    <ClInclude Include="CongestionControl.h" />
-    <ClInclude Include="EchoCanceller.h" />
-    <ClInclude Include="JitterBuffer.h" />
-    <ClInclude Include="logging.h" />
-    <ClInclude Include="MediaStreamItf.h" />
-    <ClInclude Include="NetworkSocket.h" />
-    <ClInclude Include="OpusDecoder.h" />
-    <ClInclude Include="OpusEncoder.h" />
-    <ClInclude Include="threading.h" />
-    <ClInclude Include="audio\AudioInput.h">
-      <Filter>audio</Filter>
-    </ClInclude>
-    <ClInclude Include="audio\AudioOutput.h">
-      <Filter>audio</Filter>
-    </ClInclude>
-    <ClInclude Include="audio\Resampler.h">
-      <Filter>audio</Filter>
-    </ClInclude>
-    <ClInclude Include="os\windows\AudioInputWASAPI.h">
-      <Filter>windows</Filter>
-    </ClInclude>
-    <ClInclude Include="os\windows\AudioOutputWASAPI.h">
-      <Filter>windows</Filter>
-    </ClInclude>
-    <ClInclude Include="os\windows\NetworkSocketWinsock.h">
-      <Filter>windows</Filter>
-    </ClInclude>
-    <ClInclude Include="os\windows\WindowsSandboxUtils.h">
-      <Filter>windows</Filter>
-    </ClInclude>
-    <ClInclude Include="os\windows\CXWrapper.h">
-      <Filter>windows</Filter>
-    </ClInclude>
-    <ClInclude Include="PacketReassembler.h" />
-    <ClInclude Include="MessageThread.h" />
-    <ClInclude Include="audio\AudioIO.h">
-      <Filter>audio</Filter>
-    </ClInclude>
-    <ClInclude Include="utils.h" />
-    <ClInclude Include="os\windows\WindowsSpecific.h">
-      <Filter>windows</Filter>
-    </ClInclude>
-    <ClInclude Include="video\VideoRenderer.h">
-      <Filter>video</Filter>
-    </ClInclude>
-    <ClInclude Include="video\VideoSource.h">
-      <Filter>video</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\rtc_base\arraysize.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\rtc_base\atomicops.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\rtc_base\checks.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\rtc_base\compile_assert_c.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\rtc_base\constructormagic.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\rtc_base\criticalsection.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\rtc_base\deprecation.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\rtc_base\event.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\rtc_base\event_tracer.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\rtc_base\function_view.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\rtc_base\gtest_prod_util.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\rtc_base\ignore_wundef.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\rtc_base\logging.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\rtc_base\logging_mac.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\rtc_base\memory\aligned_malloc.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\rtc_base\numerics\safe_compare.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\rtc_base\numerics\safe_conversions.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\rtc_base\numerics\safe_conversions_impl.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\rtc_base\numerics\safe_minmax.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\rtc_base\platform_thread.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\rtc_base\platform_thread_types.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\rtc_base\protobuf_utils.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\rtc_base\race_checker.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\rtc_base\refcount.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\rtc_base\refcountedobject.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\rtc_base\refcounter.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\rtc_base\sanitizer.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\rtc_base\scoped_ref_ptr.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\rtc_base\stringencode.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\rtc_base\strings\string_builder.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\rtc_base\stringutils.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\rtc_base\string_to_number.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\rtc_base\swap_queue.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\rtc_base\system\arch.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\rtc_base\system\asm_defines.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\rtc_base\system\ignore_warnings.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\rtc_base\system\inline.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\rtc_base\system\rtc_export.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\rtc_base\system\unused.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\rtc_base\thread_annotations.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\rtc_base\thread_checker.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\rtc_base\thread_checker_impl.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\rtc_base\timeutils.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\rtc_base\trace_event.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\rtc_base\type_traits.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\system_wrappers\include\asm_defines.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\system_wrappers\include\compile_assert_c.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\system_wrappers\include\cpu_features_wrapper.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\system_wrappers\include\field_trial.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\system_wrappers\include\metrics.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\third_party\rnnoise\src\kiss_fft.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\third_party\rnnoise\src\rnn_activations.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\third_party\rnnoise\src\rnn_vad_weights.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\typedefs.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\absl\algorithm\algorithm.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\absl\base\attributes.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\absl\base\config.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\absl\base\internal\atomic_hook.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\absl\base\internal\identity.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\absl\base\internal\inline_variable.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\absl\base\internal\invoke.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\absl\base\internal\raw_logging.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\absl\base\internal\throw_delegate.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\absl\base\log_severity.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\absl\base\macros.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\absl\base\optimization.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\absl\base\policy_checks.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\absl\base\port.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\absl\container\inlined_vector.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\absl\memory\memory.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\absl\meta\type_traits.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\absl\strings\ascii.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\absl\strings\internal\memutil.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\absl\strings\string_view.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\absl\types\bad_optional_access.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\absl\types\optional.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\absl\utility\utility.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\api\array_view.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\api\audio\audio_frame.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\api\audio\echo_canceller3_config.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\api\audio\echo_canceller3_factory.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\api\audio\echo_control.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\common_audio\audio_converter.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\common_audio\channel_buffer.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\common_audio\fir_filter.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\common_audio\fir_filter_c.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\common_audio\fir_filter_factory.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\common_audio\fir_filter_neon.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\common_audio\fir_filter_sse.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\common_audio\include\audio_util.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\common_audio\mocks\mock_smoothing_filter.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\common_audio\real_fourier.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\common_audio\real_fourier_ooura.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\common_audio\resampler\include\push_resampler.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\common_audio\resampler\include\resampler.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\common_audio\resampler\push_sinc_resampler.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\common_audio\resampler\sinc_resampler.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\common_audio\resampler\sinusoidal_linear_chirp_source.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\common_audio\ring_buffer.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\common_audio\signal_processing\complex_fft_tables.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\common_audio\signal_processing\dot_product_with_scale.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\common_audio\signal_processing\include\real_fft.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\common_audio\signal_processing\include\signal_processing_library.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\common_audio\signal_processing\include\spl_inl.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\common_audio\signal_processing\include\spl_inl_armv7.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\common_audio\signal_processing\resample_by_2_internal.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\common_audio\smoothing_filter.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\common_audio\sparse_fir_filter.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\common_audio\third_party\fft4g\fft4g.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\common_audio\third_party\spl_sqrt_floor\spl_sqrt_floor.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\common_audio\vad\include\vad.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\common_audio\vad\include\webrtc_vad.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\common_audio\vad\vad_core.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\common_audio\vad\vad_filterbank.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\common_audio\vad\vad_gmm.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\common_audio\vad\vad_sp.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\common_audio\wav_file.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\common_audio\wav_header.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\common_audio\window_generator.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\modules\audio_coding\codecs\isac\bandwidth_info.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\modules\audio_coding\codecs\isac\main\include\isac.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\modules\audio_coding\codecs\isac\main\source\arith_routines.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\modules\audio_coding\codecs\isac\main\source\bandwidth_estimator.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\modules\audio_coding\codecs\isac\main\source\codec.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\modules\audio_coding\codecs\isac\main\source\crc.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\modules\audio_coding\codecs\isac\main\source\encode_lpc_swb.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\modules\audio_coding\codecs\isac\main\source\entropy_coding.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\modules\audio_coding\codecs\isac\main\source\filter_functions.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\modules\audio_coding\codecs\isac\main\source\isac_float_type.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\modules\audio_coding\codecs\isac\main\source\isac_vad.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\modules\audio_coding\codecs\isac\main\source\lpc_analysis.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\modules\audio_coding\codecs\isac\main\source\lpc_gain_swb_tables.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\modules\audio_coding\codecs\isac\main\source\lpc_shape_swb12_tables.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\modules\audio_coding\codecs\isac\main\source\lpc_shape_swb16_tables.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\modules\audio_coding\codecs\isac\main\source\lpc_tables.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\modules\audio_coding\codecs\isac\main\source\os_specific_inline.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\modules\audio_coding\codecs\isac\main\source\pitch_estimator.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\modules\audio_coding\codecs\isac\main\source\pitch_filter.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\modules\audio_coding\codecs\isac\main\source\pitch_gain_tables.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\modules\audio_coding\codecs\isac\main\source\pitch_lag_tables.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\modules\audio_coding\codecs\isac\main\source\settings.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\modules\audio_coding\codecs\isac\main\source\spectrum_ar_model_tables.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\modules\audio_coding\codecs\isac\main\source\structs.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\aec\aec_common.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\aec\aec_core.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\aec\aec_core_optimized_methods.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\aec\aec_resampler.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\aec\echo_cancellation.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\aec3\adaptive_fir_filter.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\aec3\aec3_common.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\aec3\aec3_fft.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\aec3\aec_state.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\aec3\block_delay_buffer.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\aec3\block_framer.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\aec3\block_processor.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\aec3\block_processor_metrics.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\aec3\cascaded_biquad_filter.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\aec3\comfort_noise_generator.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\aec3\decimator.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\aec3\delay_estimate.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\aec3\downsampled_render_buffer.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\aec3\echo_audibility.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\aec3\echo_canceller3.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\aec3\echo_path_delay_estimator.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\aec3\echo_path_variability.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\aec3\echo_remover.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\aec3\echo_remover_metrics.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\aec3\erle_estimator.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\aec3\erl_estimator.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\aec3\fft_buffer.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\aec3\fft_data.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\aec3\filter_analyzer.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\aec3\frame_blocker.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\aec3\fullband_erle_estimator.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\aec3\main_filter_update_gain.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\aec3\matched_filter.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\aec3\matched_filter_lag_aggregator.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\aec3\matrix_buffer.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\aec3\moving_average.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\aec3\render_buffer.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\aec3\render_delay_buffer.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\aec3\render_delay_controller.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\aec3\render_delay_controller_metrics.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\aec3\render_reverb_model.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\aec3\render_signal_analyzer.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\aec3\residual_echo_estimator.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\aec3\reverb_decay_estimator.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\aec3\reverb_frequency_response.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\aec3\reverb_model.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\aec3\reverb_model_estimator.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\aec3\reverb_model_fallback.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\aec3\shadow_filter_update_gain.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\aec3\skew_estimator.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\aec3\stationarity_estimator.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\aec3\subband_erle_estimator.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\aec3\subtractor.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\aec3\subtractor_output.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\aec3\subtractor_output_analyzer.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\aec3\suppression_filter.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\aec3\suppression_gain.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\aec3\suppression_gain_limiter.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\aec3\vector_buffer.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\aec3\vector_math.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\aecm\aecm_core.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\aecm\aecm_defines.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\aecm\echo_control_mobile.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\agc\agc.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\agc\agc_manager_direct.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\agc\gain_map_internal.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\agc\legacy\analog_agc.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\agc\legacy\digital_agc.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\agc\legacy\gain_control.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\agc\loudness_histogram.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\agc\mock_agc.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\agc\utility.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\agc2\adaptive_agc.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\agc2\adaptive_digital_gain_applier.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\agc2\adaptive_mode_level_estimator.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\agc2\adaptive_mode_level_estimator_agc.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\agc2\agc2_common.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\agc2\agc2_testing_common.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\agc2\biquad_filter.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\agc2\compute_interpolated_gain_curve.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\agc2\down_sampler.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\agc2\fixed_digital_level_estimator.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\agc2\fixed_gain_controller.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\agc2\gain_applier.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\agc2\interpolated_gain_curve.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\agc2\limiter.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\agc2\limiter_db_gain_curve.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\agc2\noise_level_estimator.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\agc2\noise_spectrum_estimator.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\agc2\rnn_vad\common.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\agc2\rnn_vad\features_extraction.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\agc2\rnn_vad\fft_util.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\agc2\rnn_vad\lp_residual.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\agc2\rnn_vad\pitch_info.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\agc2\rnn_vad\pitch_search.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\agc2\rnn_vad\pitch_search_internal.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\agc2\rnn_vad\ring_buffer.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\agc2\rnn_vad\rnn.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\agc2\rnn_vad\sequence_buffer.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\agc2\rnn_vad\spectral_features.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\agc2\rnn_vad\spectral_features_internal.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\agc2\rnn_vad\symmetric_matrix_buffer.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\agc2\rnn_vad\test_utils.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\agc2\saturation_protector.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\agc2\signal_classifier.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\agc2\vad_with_level.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\agc2\vector_float_frame.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\audio_buffer.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\audio_generator\file_audio_generator.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\audio_processing_impl.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\common.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\echo_cancellation_impl.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\echo_control_mobile_impl.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\echo_detector\circular_buffer.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\echo_detector\mean_variance_estimator.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\echo_detector\moving_max.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\echo_detector\normalized_covariance_estimator.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\gain_controller2.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\gain_control_for_experimental_agc.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\gain_control_impl.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\include\aec_dump.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\include\audio_frame_view.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\include\audio_generator.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\include\audio_generator_factory.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\include\audio_processing.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\include\audio_processing_statistics.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\include\config.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\include\gain_control.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\include\mock_audio_processing.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\level_estimator_impl.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\logging\apm_data_dumper.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\low_cut_filter.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\noise_suppression_impl.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\ns\defines.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\ns\noise_suppression.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\ns\noise_suppression_x.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\ns\nsx_core.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\ns\nsx_defines.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\ns\ns_core.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\ns\windows_private.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\render_queue_item_verifier.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\residual_echo_detector.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\rms_level.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\splitting_filter.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\three_band_filter_bank.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\transient\common.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\transient\daubechies_8_wavelet_coeffs.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\transient\dyadic_decimator.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\transient\moving_moments.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\transient\transient_detector.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\transient\transient_suppressor.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\transient\wpd_node.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\transient\wpd_tree.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\typing_detection.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\utility\block_mean_calculator.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\utility\delay_estimator.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\utility\delay_estimator_internal.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\utility\delay_estimator_wrapper.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\utility\ooura_fft.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\utility\ooura_fft_tables_common.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\utility\ooura_fft_tables_neon_sse2.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\vad\common.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\vad\gmm.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\vad\noise_gmm_tables.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\vad\pitch_based_vad.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\vad\pitch_internal.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\vad\pole_zero_filter.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\vad\standalone_vad.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\vad\vad_audio_proc.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\vad\vad_audio_proc_internal.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\vad\vad_circular_buffer.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\vad\voice_activity_detector.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\vad\voice_gmm_tables.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\modules\audio_processing\voice_detection_impl.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\modules\third_party\fft\fft.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="json11.hpp" />
-    <ClInclude Include="video\ScreamCongestionController.h">
-      <Filter>video</Filter>
-    </ClInclude>
-    <ClInclude Include="audio\AudioIOCallback.h">
-      <Filter>audio</Filter>
-    </ClInclude>
-    <ClInclude Include="PrivateDefines.h" />
-    <ClInclude Include="webrtc_dsp\rtc_base\platform_file.h" />
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/submodules/libtgvoip/libtgvoip.WP81.vcxproj b/submodules/libtgvoip/libtgvoip.WP81.vcxproj
deleted file mode 100644
index ab0ba47933..0000000000
--- a/submodules/libtgvoip/libtgvoip.WP81.vcxproj
+++ /dev/null
@@ -1,423 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|ARM">
-      <Configuration>Debug</Configuration>
-      <Platform>ARM</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|ARM">
-      <Configuration>Release</Configuration>
-      <Platform>ARM</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{21f10158-c078-4bd7-a82a-9c4aeb8e2f8e}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
-    <ProjectName>libtgvoip</ProjectName>
-    <RootNamespace>libtgvoip</RootNamespace>
-    <DefaultLanguage>en-US</DefaultLanguage>
-    <MinimumVisualStudioVersion>12.0</MinimumVisualStudioVersion>
-    <AppContainerApplication>true</AppContainerApplication>
-    <ApplicationType>Windows Phone Silverlight</ApplicationType>
-    <ApplicationTypeRevision>8.1</ApplicationTypeRevision>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <PreprocessorDefinitions>_WINRT_DLL;TGVOIP_WP_SILVERLIGHT;_CRT_SECURE_NO_WARNINGS;NOMINMAX;WEBRTC_APM_DEBUG_DUMP=0;TGVOIP_USE_CUSTOM_CRYPTO;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>$(IntDir)pch.pch</PrecompiledHeaderOutputFile>
-      <AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions>
-      <SDLCheck>true</SDLCheck>
-      <AdditionalIncludeDirectories>webrtc_dsp;../TelegramClient/TelegramClient.Opus/opus/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
-      <AdditionalDependencies>ws2_32.lib;phoneaudioses.lib;../TelegramClient/$(Platform)/$(Configuration)/TelegramClient.Opus/TelegramClient.Opus.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <PreprocessorDefinitions>_WINRT_DLL;TGVOIP_WP_SILVERLIGHT;NDEBUG;_CRT_SECURE_NO_WARNINGS;NOMINMAX;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>$(IntDir)pch.pch</PrecompiledHeaderOutputFile>
-      <AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions>
-      <SDLCheck>true</SDLCheck>
-      <AdditionalIncludeDirectories>webrtc_dsp;../TelegramClient/TelegramClient.Opus/opus/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
-      <AdditionalDependencies>ws2_32.lib;phoneaudioses.lib;../TelegramClient/$(Platform)/$(Configuration)/TelegramClient.Opus/TelegramClient.Opus.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
-    <ClCompile>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <PreprocessorDefinitions>_WINRT_DLL;TGVOIP_WP_SILVERLIGHT;_CRT_SECURE_NO_WARNINGS;NOMINMAX;WEBRTC_APM_DEBUG_DUMP=0;TGVOIP_USE_CUSTOM_CRYPTO;noexcept=;_ALLOW_KEYWORD_MACROS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>$(IntDir)pch.pch</PrecompiledHeaderOutputFile>
-      <AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions>
-      <SDLCheck>true</SDLCheck>
-      <AdditionalIncludeDirectories>webrtc_dsp;../TelegramClient/TelegramClient.Opus/opus/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <DisableSpecificWarnings>4068;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
-      <AdditionalDependencies>ws2_32.lib;phoneaudioses.lib;../TelegramClient/$(Platform)/$(Configuration)/TelegramClient.Opus/TelegramClient.Opus.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
-    <ClCompile>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <PreprocessorDefinitions>_WINRT_DLL;TGVOIP_WP_SILVERLIGHT;NDEBUG;_CRT_SECURE_NO_WARNINGS;NOMINMAX;WEBRTC_APM_DEBUG_DUMP=0;TGVOIP_USE_CUSTOM_CRYPTO;noexcept=;_ALLOW_KEYWORD_MACROS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>$(IntDir)pch.pch</PrecompiledHeaderOutputFile>
-      <AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions>
-      <SDLCheck>true</SDLCheck>
-      <AdditionalIncludeDirectories>webrtc_dsp;../TelegramClient/TelegramClient.Opus/opus/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
-      <AdditionalDependencies>ws2_32.lib;phoneaudioses.lib;../TelegramClient/$(Platform)/$(Configuration)/TelegramClient.Opus/TelegramClient.Opus.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClInclude Include="audio\AudioInput.h" />
-    <ClInclude Include="audio\AudioIO.h" />
-    <ClInclude Include="audio\AudioOutput.h" />
-    <ClInclude Include="audio\Resampler.h" />
-    <ClInclude Include="BlockingQueue.h" />
-    <ClInclude Include="Buffers.h" />
-    <ClInclude Include="CongestionControl.h" />
-    <ClInclude Include="EchoCanceller.h" />
-    <ClInclude Include="JitterBuffer.h" />
-    <ClInclude Include="logging.h" />
-    <ClInclude Include="MediaStreamItf.h" />
-    <ClInclude Include="MessageThread.h" />
-    <ClInclude Include="NetworkSocket.h" />
-    <ClInclude Include="OpusDecoder.h" />
-    <ClInclude Include="OpusEncoder.h" />
-    <ClInclude Include="os\windows\AudioInputWASAPI.h" />
-    <ClInclude Include="os\windows\AudioOutputWASAPI.h" />
-    <ClInclude Include="os\windows\NetworkSocketWinsock.h" />
-    <ClInclude Include="os\windows\WindowsSandboxUtils.h" />
-    <ClInclude Include="PacketReassembler.h" />
-    <ClInclude Include="threading.h" />
-    <ClInclude Include="VoIPController.h" />
-    <ClInclude Include="os\windows\CXWrapper.h" />
-    <ClInclude Include="VoIPServerConfig.h" />
-    <ClInclude Include="webrtc_dsp\webrtc\base\array_view.h" />
-    <ClInclude Include="webrtc_dsp\webrtc\base\atomicops.h" />
-    <ClInclude Include="webrtc_dsp\webrtc\base\basictypes.h" />
-    <ClInclude Include="webrtc_dsp\webrtc\base\checks.h" />
-    <ClInclude Include="webrtc_dsp\webrtc\base\constructormagic.h" />
-    <ClInclude Include="webrtc_dsp\webrtc\base\safe_compare.h" />
-    <ClInclude Include="webrtc_dsp\webrtc\base\safe_conversions.h" />
-    <ClInclude Include="webrtc_dsp\webrtc\base\safe_conversions_impl.h" />
-    <ClInclude Include="webrtc_dsp\webrtc\base\sanitizer.h" />
-    <ClInclude Include="webrtc_dsp\webrtc\base\stringutils.h" />
-    <ClInclude Include="webrtc_dsp\webrtc\base\type_traits.h" />
-    <ClInclude Include="webrtc_dsp\webrtc\common_audio\channel_buffer.h" />
-    <ClInclude Include="webrtc_dsp\webrtc\common_audio\fft4g.h" />
-    <ClInclude Include="webrtc_dsp\webrtc\common_audio\include\audio_util.h" />
-    <ClInclude Include="webrtc_dsp\webrtc\common_audio\ring_buffer.h" />
-    <ClInclude Include="webrtc_dsp\webrtc\common_audio\signal_processing\complex_fft_tables.h" />
-    <ClInclude Include="webrtc_dsp\webrtc\common_audio\signal_processing\include\real_fft.h" />
-    <ClInclude Include="webrtc_dsp\webrtc\common_audio\signal_processing\include\signal_processing_library.h" />
-    <ClInclude Include="webrtc_dsp\webrtc\common_audio\signal_processing\include\spl_inl.h" />
-    <ClInclude Include="webrtc_dsp\webrtc\common_audio\signal_processing\include\spl_inl_armv7.h" />
-    <ClInclude Include="webrtc_dsp\webrtc\common_audio\signal_processing\include\spl_inl_mips.h" />
-    <ClInclude Include="webrtc_dsp\webrtc\common_audio\signal_processing\resample_by_2_internal.h" />
-    <ClInclude Include="webrtc_dsp\webrtc\common_audio\sparse_fir_filter.h" />
-    <ClInclude Include="webrtc_dsp\webrtc\common_audio\wav_file.h" />
-    <ClInclude Include="webrtc_dsp\webrtc\common_audio\wav_header.h" />
-    <ClInclude Include="webrtc_dsp\webrtc\modules\audio_processing\aecm\aecm_core.h" />
-    <ClInclude Include="webrtc_dsp\webrtc\modules\audio_processing\aecm\aecm_defines.h" />
-    <ClInclude Include="webrtc_dsp\webrtc\modules\audio_processing\aecm\echo_control_mobile.h" />
-    <ClInclude Include="webrtc_dsp\webrtc\modules\audio_processing\aec\aec_common.h" />
-    <ClInclude Include="webrtc_dsp\webrtc\modules\audio_processing\aec\aec_core.h" />
-    <ClInclude Include="webrtc_dsp\webrtc\modules\audio_processing\aec\aec_core_optimized_methods.h" />
-    <ClInclude Include="webrtc_dsp\webrtc\modules\audio_processing\aec\aec_resampler.h" />
-    <ClInclude Include="webrtc_dsp\webrtc\modules\audio_processing\aec\echo_cancellation.h" />
-    <ClInclude Include="webrtc_dsp\webrtc\modules\audio_processing\agc\legacy\analog_agc.h" />
-    <ClInclude Include="webrtc_dsp\webrtc\modules\audio_processing\agc\legacy\digital_agc.h" />
-    <ClInclude Include="webrtc_dsp\webrtc\modules\audio_processing\agc\legacy\gain_control.h" />
-    <ClInclude Include="webrtc_dsp\webrtc\modules\audio_processing\logging\apm_data_dumper.h" />
-    <ClInclude Include="webrtc_dsp\webrtc\modules\audio_processing\ns\defines.h" />
-    <ClInclude Include="webrtc_dsp\webrtc\modules\audio_processing\ns\noise_suppression.h" />
-    <ClInclude Include="webrtc_dsp\webrtc\modules\audio_processing\ns\noise_suppression_x.h" />
-    <ClInclude Include="webrtc_dsp\webrtc\modules\audio_processing\ns\nsx_core.h" />
-    <ClInclude Include="webrtc_dsp\webrtc\modules\audio_processing\ns\nsx_defines.h" />
-    <ClInclude Include="webrtc_dsp\webrtc\modules\audio_processing\ns\ns_core.h" />
-    <ClInclude Include="webrtc_dsp\webrtc\modules\audio_processing\ns\windows_private.h" />
-    <ClInclude Include="webrtc_dsp\webrtc\modules\audio_processing\splitting_filter.h" />
-    <ClInclude Include="webrtc_dsp\webrtc\modules\audio_processing\three_band_filter_bank.h" />
-    <ClInclude Include="webrtc_dsp\webrtc\modules\audio_processing\utility\block_mean_calculator.h" />
-    <ClInclude Include="webrtc_dsp\webrtc\modules\audio_processing\utility\delay_estimator.h" />
-    <ClInclude Include="webrtc_dsp\webrtc\modules\audio_processing\utility\delay_estimator_internal.h" />
-    <ClInclude Include="webrtc_dsp\webrtc\modules\audio_processing\utility\delay_estimator_wrapper.h" />
-    <ClInclude Include="webrtc_dsp\webrtc\modules\audio_processing\utility\ooura_fft.h" />
-    <ClInclude Include="webrtc_dsp\webrtc\modules\audio_processing\utility\ooura_fft_tables_common.h" />
-    <ClInclude Include="webrtc_dsp\webrtc\modules\audio_processing\utility\ooura_fft_tables_neon_sse2.h" />
-    <ClInclude Include="webrtc_dsp\webrtc\system_wrappers\include\asm_defines.h" />
-    <ClInclude Include="webrtc_dsp\webrtc\system_wrappers\include\compile_assert_c.h" />
-    <ClInclude Include="webrtc_dsp\webrtc\system_wrappers\include\cpu_features_wrapper.h" />
-    <ClInclude Include="webrtc_dsp\webrtc\system_wrappers\include\metrics.h" />
-    <ClInclude Include="webrtc_dsp\webrtc\typedefs.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="audio\AudioInput.cpp" />
-    <ClCompile Include="audio\AudioIO.cpp" />
-    <ClCompile Include="audio\AudioOutput.cpp" />
-    <ClCompile Include="audio\Resampler.cpp" />
-    <ClCompile Include="BlockingQueue.cpp" />
-    <ClCompile Include="Buffers.cpp" />
-    <ClCompile Include="CongestionControl.cpp" />
-    <ClCompile Include="EchoCanceller.cpp" />
-    <ClCompile Include="JitterBuffer.cpp" />
-    <ClCompile Include="logging.cpp" />
-    <ClCompile Include="MediaStreamItf.cpp" />
-    <ClCompile Include="MessageThread.cpp" />
-    <ClCompile Include="NetworkSocket.cpp" />
-    <ClCompile Include="OpusDecoder.cpp" />
-    <ClCompile Include="OpusEncoder.cpp" />
-    <ClCompile Include="os\windows\AudioInputWASAPI.cpp" />
-    <ClCompile Include="os\windows\AudioOutputWASAPI.cpp" />
-    <ClCompile Include="os\windows\NetworkSocketWinsock.cpp" />
-    <ClCompile Include="os\windows\WindowsSandboxUtils.cpp" />
-    <ClCompile Include="PacketReassembler.cpp" />
-    <ClCompile Include="VoIPController.cpp" />
-    <ClCompile Include="os\windows\CXWrapper.cpp" />
-    <ClCompile Include="VoIPServerConfig.cpp" />
-    <ClCompile Include="webrtc_dsp\webrtc\base\checks.cc" />
-    <ClCompile Include="webrtc_dsp\webrtc\base\stringutils.cc" />
-    <ClCompile Include="webrtc_dsp\webrtc\common_audio\audio_util.cc" />
-    <ClCompile Include="webrtc_dsp\webrtc\common_audio\channel_buffer.cc" />
-    <ClCompile Include="webrtc_dsp\webrtc\common_audio\fft4g.c">
-      <CompileAsWinRT>false</CompileAsWinRT>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\webrtc\common_audio\ring_buffer.c">
-      <CompileAsWinRT>false</CompileAsWinRT>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\webrtc\common_audio\signal_processing\auto_correlation.c">
-      <CompileAsWinRT>false</CompileAsWinRT>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\webrtc\common_audio\signal_processing\auto_corr_to_refl_coef.c">
-      <CompileAsWinRT>false</CompileAsWinRT>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\webrtc\common_audio\signal_processing\complex_bit_reverse.c">
-      <CompileAsWinRT>false</CompileAsWinRT>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\webrtc\common_audio\signal_processing\complex_fft.c">
-      <CompileAsWinRT>false</CompileAsWinRT>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\webrtc\common_audio\signal_processing\copy_set_operations.c">
-      <CompileAsWinRT>false</CompileAsWinRT>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\webrtc\common_audio\signal_processing\cross_correlation.c">
-      <CompileAsWinRT>false</CompileAsWinRT>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\webrtc\common_audio\signal_processing\cross_correlation_neon.c">
-      <CompileAsWinRT>false</CompileAsWinRT>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\webrtc\common_audio\signal_processing\division_operations.c">
-      <CompileAsWinRT>false</CompileAsWinRT>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\webrtc\common_audio\signal_processing\dot_product_with_scale.c">
-      <CompileAsWinRT>false</CompileAsWinRT>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\webrtc\common_audio\signal_processing\downsample_fast.c">
-      <CompileAsWinRT>false</CompileAsWinRT>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\webrtc\common_audio\signal_processing\downsample_fast_neon.c">
-      <CompileAsWinRT>false</CompileAsWinRT>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\webrtc\common_audio\signal_processing\energy.c">
-      <CompileAsWinRT>false</CompileAsWinRT>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\webrtc\common_audio\signal_processing\filter_ar.c">
-      <CompileAsWinRT>false</CompileAsWinRT>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\webrtc\common_audio\signal_processing\filter_ar_fast_q12.c">
-      <CompileAsWinRT>false</CompileAsWinRT>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\webrtc\common_audio\signal_processing\filter_ma_fast_q12.c">
-      <CompileAsWinRT>false</CompileAsWinRT>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\webrtc\common_audio\signal_processing\get_hanning_window.c">
-      <CompileAsWinRT>false</CompileAsWinRT>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\webrtc\common_audio\signal_processing\get_scaling_square.c">
-      <CompileAsWinRT>false</CompileAsWinRT>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\webrtc\common_audio\signal_processing\ilbc_specific_functions.c">
-      <CompileAsWinRT>false</CompileAsWinRT>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\webrtc\common_audio\signal_processing\levinson_durbin.c">
-      <CompileAsWinRT>false</CompileAsWinRT>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\webrtc\common_audio\signal_processing\lpc_to_refl_coef.c">
-      <CompileAsWinRT>false</CompileAsWinRT>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\webrtc\common_audio\signal_processing\min_max_operations.c">
-      <CompileAsWinRT>false</CompileAsWinRT>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\webrtc\common_audio\signal_processing\min_max_operations_neon.c">
-      <CompileAsWinRT>false</CompileAsWinRT>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\webrtc\common_audio\signal_processing\randomization_functions.c">
-      <CompileAsWinRT>false</CompileAsWinRT>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\webrtc\common_audio\signal_processing\real_fft.c">
-      <CompileAsWinRT>false</CompileAsWinRT>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\webrtc\common_audio\signal_processing\refl_coef_to_lpc.c">
-      <CompileAsWinRT>false</CompileAsWinRT>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\webrtc\common_audio\signal_processing\resample.c">
-      <CompileAsWinRT>false</CompileAsWinRT>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\webrtc\common_audio\signal_processing\resample_48khz.c">
-      <CompileAsWinRT>false</CompileAsWinRT>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\webrtc\common_audio\signal_processing\resample_by_2.c">
-      <CompileAsWinRT>false</CompileAsWinRT>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\webrtc\common_audio\signal_processing\resample_by_2_internal.c">
-      <CompileAsWinRT>false</CompileAsWinRT>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\webrtc\common_audio\signal_processing\resample_fractional.c">
-      <CompileAsWinRT>false</CompileAsWinRT>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\webrtc\common_audio\signal_processing\splitting_filter_impl.c">
-      <CompileAsWinRT>false</CompileAsWinRT>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\webrtc\common_audio\signal_processing\spl_init.c">
-      <CompileAsWinRT>false</CompileAsWinRT>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\webrtc\common_audio\signal_processing\spl_inl.c">
-      <CompileAsWinRT>false</CompileAsWinRT>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\webrtc\common_audio\signal_processing\spl_sqrt.c">
-      <CompileAsWinRT>false</CompileAsWinRT>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\webrtc\common_audio\signal_processing\spl_sqrt_floor.c">
-      <CompileAsWinRT>false</CompileAsWinRT>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\webrtc\common_audio\signal_processing\sqrt_of_one_minus_x_squared.c">
-      <CompileAsWinRT>false</CompileAsWinRT>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\webrtc\common_audio\signal_processing\vector_scaling_operations.c">
-      <CompileAsWinRT>false</CompileAsWinRT>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\webrtc\common_audio\sparse_fir_filter.cc" />
-    <ClCompile Include="webrtc_dsp\webrtc\common_audio\wav_file.cc" />
-    <ClCompile Include="webrtc_dsp\webrtc\common_audio\wav_header.cc" />
-    <ClCompile Include="webrtc_dsp\webrtc\modules\audio_processing\aecm\aecm_core.cc" />
-    <ClCompile Include="webrtc_dsp\webrtc\modules\audio_processing\aecm\aecm_core_c.cc" />
-    <ClCompile Include="webrtc_dsp\webrtc\modules\audio_processing\aecm\aecm_core_neon.cc" />
-    <ClCompile Include="webrtc_dsp\webrtc\modules\audio_processing\aecm\echo_control_mobile.cc" />
-    <ClCompile Include="webrtc_dsp\webrtc\modules\audio_processing\aec\aec_core.cc" />
-    <ClCompile Include="webrtc_dsp\webrtc\modules\audio_processing\aec\aec_core_neon.cc" />
-    <ClCompile Include="webrtc_dsp\webrtc\modules\audio_processing\aec\aec_core_sse2.cc" />
-    <ClCompile Include="webrtc_dsp\webrtc\modules\audio_processing\aec\aec_resampler.cc" />
-    <ClCompile Include="webrtc_dsp\webrtc\modules\audio_processing\aec\echo_cancellation.cc" />
-    <ClCompile Include="webrtc_dsp\webrtc\modules\audio_processing\agc\legacy\analog_agc.c">
-      <CompileAsWinRT>false</CompileAsWinRT>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\webrtc\modules\audio_processing\agc\legacy\digital_agc.c">
-      <CompileAsWinRT>false</CompileAsWinRT>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\webrtc\modules\audio_processing\logging\apm_data_dumper.cc" />
-    <ClCompile Include="webrtc_dsp\webrtc\modules\audio_processing\ns\noise_suppression.c">
-      <CompileAsWinRT>false</CompileAsWinRT>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\webrtc\modules\audio_processing\ns\noise_suppression_x.c">
-      <CompileAsWinRT>false</CompileAsWinRT>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\webrtc\modules\audio_processing\ns\nsx_core.c">
-      <CompileAsWinRT>false</CompileAsWinRT>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\webrtc\modules\audio_processing\ns\nsx_core_c.c">
-      <CompileAsWinRT>false</CompileAsWinRT>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\webrtc\modules\audio_processing\ns\nsx_core_neon.c">
-      <CompileAsWinRT>false</CompileAsWinRT>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\webrtc\modules\audio_processing\ns\ns_core.c">
-      <CompileAsWinRT>false</CompileAsWinRT>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\webrtc\modules\audio_processing\splitting_filter.cc" />
-    <ClCompile Include="webrtc_dsp\webrtc\modules\audio_processing\three_band_filter_bank.cc" />
-    <ClCompile Include="webrtc_dsp\webrtc\modules\audio_processing\utility\block_mean_calculator.cc" />
-    <ClCompile Include="webrtc_dsp\webrtc\modules\audio_processing\utility\delay_estimator.cc" />
-    <ClCompile Include="webrtc_dsp\webrtc\modules\audio_processing\utility\delay_estimator_wrapper.cc" />
-    <ClCompile Include="webrtc_dsp\webrtc\modules\audio_processing\utility\ooura_fft.cc" />
-    <ClCompile Include="webrtc_dsp\webrtc\modules\audio_processing\utility\ooura_fft_neon.cc" />
-    <ClCompile Include="webrtc_dsp\webrtc\modules\audio_processing\utility\ooura_fft_sse2.cc" />
-    <ClCompile Include="webrtc_dsp\webrtc\system_wrappers\source\cpu_features.cc" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/submodules/libtgvoip/libtgvoip.WP81.vcxproj.filters b/submodules/libtgvoip/libtgvoip.WP81.vcxproj.filters
deleted file mode 100755
index 11034a4112..0000000000
--- a/submodules/libtgvoip/libtgvoip.WP81.vcxproj.filters
+++ /dev/null
@@ -1,488 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Resources">
-      <UniqueIdentifier>11199e80-17a0-460f-a780-9bfde20eb11c</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tga;tiff;tif;png;wav;mfcribbon-ms</Extensions>
-    </Filter>
-    <Filter Include="audio">
-      <UniqueIdentifier>{c5b75146-c75a-4c56-aeb2-2781658d7b0a}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="windows">
-      <UniqueIdentifier>{de1527d9-7564-4e96-9653-6e023b90d2bc}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="webrtc_dsp">
-      <UniqueIdentifier>{3b15701a-65dd-4d52-92d4-a7b64a73b293}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="VoIPController.cpp" />
-    <ClCompile Include="VoIPServerConfig.cpp" />
-    <ClCompile Include="BlockingQueue.cpp" />
-    <ClCompile Include="CongestionControl.cpp" />
-    <ClCompile Include="EchoCanceller.cpp" />
-    <ClCompile Include="JitterBuffer.cpp" />
-    <ClCompile Include="logging.cpp" />
-    <ClCompile Include="MediaStreamItf.cpp" />
-    <ClCompile Include="NetworkSocket.cpp" />
-    <ClCompile Include="OpusDecoder.cpp" />
-    <ClCompile Include="OpusEncoder.cpp" />
-    <ClCompile Include="audio\AudioInput.cpp">
-      <Filter>audio</Filter>
-    </ClCompile>
-    <ClCompile Include="audio\AudioOutput.cpp">
-      <Filter>audio</Filter>
-    </ClCompile>
-    <ClCompile Include="audio\Resampler.cpp">
-      <Filter>audio</Filter>
-    </ClCompile>
-    <ClCompile Include="os\windows\AudioInputWASAPI.cpp">
-      <Filter>windows</Filter>
-    </ClCompile>
-    <ClCompile Include="os\windows\AudioOutputWASAPI.cpp">
-      <Filter>windows</Filter>
-    </ClCompile>
-    <ClCompile Include="os\windows\NetworkSocketWinsock.cpp">
-      <Filter>windows</Filter>
-    </ClCompile>
-    <ClCompile Include="os\windows\WindowsSandboxUtils.cpp">
-      <Filter>windows</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\webrtc\base\checks.cc">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\webrtc\base\stringutils.cc">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\webrtc\common_audio\audio_util.cc">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\webrtc\common_audio\channel_buffer.cc">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\webrtc\common_audio\fft4g.c">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\webrtc\common_audio\ring_buffer.c">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\webrtc\common_audio\signal_processing\auto_correlation.c">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\webrtc\common_audio\signal_processing\auto_corr_to_refl_coef.c">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\webrtc\common_audio\signal_processing\complex_bit_reverse.c">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\webrtc\common_audio\signal_processing\complex_fft.c">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\webrtc\common_audio\signal_processing\copy_set_operations.c">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\webrtc\common_audio\signal_processing\cross_correlation.c">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\webrtc\common_audio\signal_processing\cross_correlation_neon.c">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\webrtc\common_audio\signal_processing\division_operations.c">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\webrtc\common_audio\signal_processing\dot_product_with_scale.c">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\webrtc\common_audio\signal_processing\downsample_fast.c">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\webrtc\common_audio\signal_processing\downsample_fast_neon.c">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\webrtc\common_audio\signal_processing\energy.c">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\webrtc\common_audio\signal_processing\filter_ar.c">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\webrtc\common_audio\signal_processing\filter_ar_fast_q12.c">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\webrtc\common_audio\signal_processing\filter_ma_fast_q12.c">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\webrtc\common_audio\signal_processing\get_hanning_window.c">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\webrtc\common_audio\signal_processing\get_scaling_square.c">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\webrtc\common_audio\signal_processing\ilbc_specific_functions.c">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\webrtc\common_audio\signal_processing\levinson_durbin.c">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\webrtc\common_audio\signal_processing\lpc_to_refl_coef.c">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\webrtc\common_audio\signal_processing\min_max_operations.c">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\webrtc\common_audio\signal_processing\min_max_operations_neon.c">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\webrtc\common_audio\signal_processing\randomization_functions.c">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\webrtc\common_audio\signal_processing\real_fft.c">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\webrtc\common_audio\signal_processing\refl_coef_to_lpc.c">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\webrtc\common_audio\signal_processing\resample.c">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\webrtc\common_audio\signal_processing\resample_48khz.c">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\webrtc\common_audio\signal_processing\resample_by_2.c">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\webrtc\common_audio\signal_processing\resample_by_2_internal.c">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\webrtc\common_audio\signal_processing\resample_fractional.c">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\webrtc\common_audio\signal_processing\splitting_filter_impl.c">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\webrtc\common_audio\signal_processing\spl_init.c">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\webrtc\common_audio\signal_processing\spl_inl.c">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\webrtc\common_audio\signal_processing\spl_sqrt.c">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\webrtc\common_audio\signal_processing\spl_sqrt_floor.c">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\webrtc\common_audio\signal_processing\sqrt_of_one_minus_x_squared.c">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\webrtc\common_audio\signal_processing\vector_scaling_operations.c">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\webrtc\common_audio\sparse_fir_filter.cc">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\webrtc\common_audio\wav_file.cc">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\webrtc\common_audio\wav_header.cc">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\webrtc\modules\audio_processing\aec\aec_core.cc">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\webrtc\modules\audio_processing\aec\aec_core_neon.cc">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\webrtc\modules\audio_processing\aec\aec_core_sse2.cc">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\webrtc\modules\audio_processing\aec\aec_resampler.cc">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\webrtc\modules\audio_processing\aec\echo_cancellation.cc">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\webrtc\modules\audio_processing\aecm\aecm_core.cc">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\webrtc\modules\audio_processing\aecm\aecm_core_c.cc">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\webrtc\modules\audio_processing\aecm\aecm_core_neon.cc">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\webrtc\modules\audio_processing\aecm\echo_control_mobile.cc">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\webrtc\modules\audio_processing\agc\legacy\analog_agc.c">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\webrtc\modules\audio_processing\agc\legacy\digital_agc.c">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\webrtc\modules\audio_processing\logging\apm_data_dumper.cc">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\webrtc\modules\audio_processing\ns\noise_suppression.c">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\webrtc\modules\audio_processing\ns\noise_suppression_x.c">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\webrtc\modules\audio_processing\ns\nsx_core.c">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\webrtc\modules\audio_processing\ns\nsx_core_c.c">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\webrtc\modules\audio_processing\ns\nsx_core_neon.c">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\webrtc\modules\audio_processing\ns\ns_core.c">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\webrtc\modules\audio_processing\splitting_filter.cc">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\webrtc\modules\audio_processing\three_band_filter_bank.cc">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\webrtc\modules\audio_processing\utility\block_mean_calculator.cc">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\webrtc\modules\audio_processing\utility\delay_estimator.cc">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\webrtc\modules\audio_processing\utility\delay_estimator_wrapper.cc">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\webrtc\modules\audio_processing\utility\ooura_fft.cc">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\webrtc\modules\audio_processing\utility\ooura_fft_neon.cc">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\webrtc\modules\audio_processing\utility\ooura_fft_sse2.cc">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="webrtc_dsp\webrtc\system_wrappers\source\cpu_features.cc">
-      <Filter>webrtc_dsp</Filter>
-    </ClCompile>
-    <ClCompile Include="os\windows\CXWrapper.cpp">
-      <Filter>windows</Filter>
-    </ClCompile>
-    <ClCompile Include="Buffers.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="VoIPController.h" />
-    <ClInclude Include="VoIPServerConfig.h" />
-    <ClInclude Include="BlockingQueue.h" />
-    <ClInclude Include="CongestionControl.h" />
-    <ClInclude Include="EchoCanceller.h" />
-    <ClInclude Include="JitterBuffer.h" />
-    <ClInclude Include="logging.h" />
-    <ClInclude Include="MediaStreamItf.h" />
-    <ClInclude Include="NetworkSocket.h" />
-    <ClInclude Include="OpusDecoder.h" />
-    <ClInclude Include="OpusEncoder.h" />
-    <ClInclude Include="threading.h" />
-    <ClInclude Include="audio\AudioInput.h">
-      <Filter>audio</Filter>
-    </ClInclude>
-    <ClInclude Include="audio\AudioOutput.h">
-      <Filter>audio</Filter>
-    </ClInclude>
-    <ClInclude Include="audio\Resampler.h">
-      <Filter>audio</Filter>
-    </ClInclude>
-    <ClInclude Include="os\windows\AudioInputWASAPI.h">
-      <Filter>windows</Filter>
-    </ClInclude>
-    <ClInclude Include="os\windows\AudioOutputWASAPI.h">
-      <Filter>windows</Filter>
-    </ClInclude>
-    <ClInclude Include="os\windows\NetworkSocketWinsock.h">
-      <Filter>windows</Filter>
-    </ClInclude>
-    <ClInclude Include="os\windows\WindowsSandboxUtils.h">
-      <Filter>windows</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\webrtc\base\array_view.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\webrtc\base\atomicops.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\webrtc\base\basictypes.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\webrtc\base\checks.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\webrtc\base\constructormagic.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\webrtc\base\safe_compare.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\webrtc\base\safe_conversions.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\webrtc\base\safe_conversions_impl.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\webrtc\base\sanitizer.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\webrtc\base\stringutils.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\webrtc\base\type_traits.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\webrtc\common_audio\channel_buffer.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\webrtc\common_audio\fft4g.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\webrtc\common_audio\include\audio_util.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\webrtc\common_audio\ring_buffer.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\webrtc\common_audio\signal_processing\complex_fft_tables.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\webrtc\common_audio\signal_processing\include\real_fft.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\webrtc\common_audio\signal_processing\include\signal_processing_library.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\webrtc\common_audio\signal_processing\include\spl_inl.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\webrtc\common_audio\signal_processing\include\spl_inl_armv7.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\webrtc\common_audio\signal_processing\include\spl_inl_mips.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\webrtc\common_audio\signal_processing\resample_by_2_internal.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\webrtc\common_audio\sparse_fir_filter.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\webrtc\common_audio\wav_file.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\webrtc\common_audio\wav_header.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\webrtc\modules\audio_processing\aec\aec_common.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\webrtc\modules\audio_processing\aec\aec_core.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\webrtc\modules\audio_processing\aec\aec_core_optimized_methods.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\webrtc\modules\audio_processing\aec\aec_resampler.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\webrtc\modules\audio_processing\aec\echo_cancellation.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\webrtc\modules\audio_processing\aecm\aecm_core.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\webrtc\modules\audio_processing\aecm\aecm_defines.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\webrtc\modules\audio_processing\aecm\echo_control_mobile.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\webrtc\modules\audio_processing\agc\legacy\analog_agc.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\webrtc\modules\audio_processing\agc\legacy\digital_agc.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\webrtc\modules\audio_processing\agc\legacy\gain_control.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\webrtc\modules\audio_processing\logging\apm_data_dumper.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\webrtc\modules\audio_processing\ns\defines.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\webrtc\modules\audio_processing\ns\noise_suppression.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\webrtc\modules\audio_processing\ns\noise_suppression_x.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\webrtc\modules\audio_processing\ns\nsx_core.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\webrtc\modules\audio_processing\ns\nsx_defines.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\webrtc\modules\audio_processing\ns\ns_core.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\webrtc\modules\audio_processing\ns\windows_private.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\webrtc\modules\audio_processing\splitting_filter.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\webrtc\modules\audio_processing\three_band_filter_bank.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\webrtc\modules\audio_processing\utility\block_mean_calculator.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\webrtc\modules\audio_processing\utility\delay_estimator.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\webrtc\modules\audio_processing\utility\delay_estimator_internal.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\webrtc\modules\audio_processing\utility\delay_estimator_wrapper.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\webrtc\modules\audio_processing\utility\ooura_fft.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\webrtc\modules\audio_processing\utility\ooura_fft_tables_common.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\webrtc\modules\audio_processing\utility\ooura_fft_tables_neon_sse2.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\webrtc\system_wrappers\include\asm_defines.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\webrtc\system_wrappers\include\compile_assert_c.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\webrtc\system_wrappers\include\cpu_features_wrapper.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\webrtc\system_wrappers\include\metrics.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="webrtc_dsp\webrtc\typedefs.h">
-      <Filter>webrtc_dsp</Filter>
-    </ClInclude>
-    <ClInclude Include="os\windows\CXWrapper.h">
-      <Filter>windows</Filter>
-    </ClInclude>
-    <ClInclude Include="Buffers.h" />
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/submodules/libtgvoip/libtgvoip.gyp b/submodules/libtgvoip/libtgvoip.gyp
deleted file mode 100644
index cb1352bebd..0000000000
--- a/submodules/libtgvoip/libtgvoip.gyp
+++ /dev/null
@@ -1,916 +0,0 @@
-# GYP project file for TDesktop
-
-{
-    'targets': [
-      {
-        'target_name': 'libtgvoip',
-        'type': 'static_library',
-        'dependencies': [],
-        'defines': [
-          'WEBRTC_APM_DEBUG_DUMP=0',
-          'TGVOIP_USE_DESKTOP_DSP',
-          'WEBRTC_NS_FLOAT',
-        ],
-        'variables': {
-          'tgvoip_src_loc': '.',
-          'official_build_target%': '',
-          'linux_path_opus_include%': '<(DEPTH)/../../../Libraries/opus/include',
-        },
-        'include_dirs': [
-          '<(tgvoip_src_loc)/webrtc_dsp',
-          '<(linux_path_opus_include)',
-        ],
-        'direct_dependent_settings': {
-          'include_dirs': [
-            '<(tgvoip_src_loc)',
-          ],
-        },
-        'export_dependent_settings': [],
-        'sources': [
-          '<(tgvoip_src_loc)/BlockingQueue.cpp',
-          '<(tgvoip_src_loc)/BlockingQueue.h',
-          '<(tgvoip_src_loc)/Buffers.cpp',
-          '<(tgvoip_src_loc)/Buffers.h',
-          '<(tgvoip_src_loc)/CongestionControl.cpp',
-          '<(tgvoip_src_loc)/CongestionControl.h',
-          '<(tgvoip_src_loc)/EchoCanceller.cpp',
-          '<(tgvoip_src_loc)/EchoCanceller.h',
-          '<(tgvoip_src_loc)/JitterBuffer.cpp',
-          '<(tgvoip_src_loc)/JitterBuffer.h',
-          '<(tgvoip_src_loc)/logging.cpp',
-          '<(tgvoip_src_loc)/logging.h',
-          '<(tgvoip_src_loc)/MediaStreamItf.cpp',
-          '<(tgvoip_src_loc)/MediaStreamItf.h',
-          '<(tgvoip_src_loc)/OpusDecoder.cpp',
-          '<(tgvoip_src_loc)/OpusDecoder.h',
-          '<(tgvoip_src_loc)/OpusEncoder.cpp',
-          '<(tgvoip_src_loc)/OpusEncoder.h',
-          '<(tgvoip_src_loc)/threading.h',
-          '<(tgvoip_src_loc)/VoIPController.cpp',
-          '<(tgvoip_src_loc)/VoIPGroupController.cpp',
-          '<(tgvoip_src_loc)/VoIPController.h',
-          '<(tgvoip_src_loc)/PrivateDefines.h',
-          '<(tgvoip_src_loc)/VoIPServerConfig.cpp',
-          '<(tgvoip_src_loc)/VoIPServerConfig.h',
-          '<(tgvoip_src_loc)/audio/AudioInput.cpp',
-          '<(tgvoip_src_loc)/audio/AudioInput.h',
-          '<(tgvoip_src_loc)/audio/AudioOutput.cpp',
-          '<(tgvoip_src_loc)/audio/AudioOutput.h',
-          '<(tgvoip_src_loc)/audio/Resampler.cpp',
-          '<(tgvoip_src_loc)/audio/Resampler.h',
-          '<(tgvoip_src_loc)/NetworkSocket.cpp',
-          '<(tgvoip_src_loc)/NetworkSocket.h',
-          '<(tgvoip_src_loc)/PacketReassembler.cpp',
-          '<(tgvoip_src_loc)/PacketReassembler.h',
-          '<(tgvoip_src_loc)/MessageThread.cpp',
-          '<(tgvoip_src_loc)/MessageThread.h',
-          '<(tgvoip_src_loc)/audio/AudioIO.cpp',
-          '<(tgvoip_src_loc)/audio/AudioIO.h',
-          '<(tgvoip_src_loc)/video/ScreamCongestionController.cpp',
-          '<(tgvoip_src_loc)/video/ScreamCongestionController.h',
-          '<(tgvoip_src_loc)/video/VideoSource.cpp',
-          '<(tgvoip_src_loc)/video/VideoSource.h',
-          '<(tgvoip_src_loc)/video/VideoRenderer.cpp',
-          '<(tgvoip_src_loc)/video/VideoRenderer.h',
-          '<(tgvoip_src_loc)/json11.cpp',
-          '<(tgvoip_src_loc)/json11.hpp',
-
-          # Windows
-          '<(tgvoip_src_loc)/os/windows/NetworkSocketWinsock.cpp',
-          '<(tgvoip_src_loc)/os/windows/NetworkSocketWinsock.h',
-          '<(tgvoip_src_loc)/os/windows/AudioInputWave.cpp',
-          '<(tgvoip_src_loc)/os/windows/AudioInputWave.h',
-          '<(tgvoip_src_loc)/os/windows/AudioOutputWave.cpp',
-          '<(tgvoip_src_loc)/os/windows/AudioOutputWave.h',
-          '<(tgvoip_src_loc)/os/windows/AudioOutputWASAPI.cpp',
-          '<(tgvoip_src_loc)/os/windows/AudioOutputWASAPI.h',
-          '<(tgvoip_src_loc)/os/windows/AudioInputWASAPI.cpp',
-          '<(tgvoip_src_loc)/os/windows/AudioInputWASAPI.h',
-          '<(tgvoip_src_loc)/os/windows/WindowsSpecific.cpp',
-          '<(tgvoip_src_loc)/os/windows/WindowsSpecific.h',
-
-          # macOS
-          '<(tgvoip_src_loc)/os/darwin/AudioInputAudioUnit.cpp',
-          '<(tgvoip_src_loc)/os/darwin/AudioInputAudioUnit.h',
-          '<(tgvoip_src_loc)/os/darwin/AudioOutputAudioUnit.cpp',
-          '<(tgvoip_src_loc)/os/darwin/AudioOutputAudioUnit.h',
-          '<(tgvoip_src_loc)/os/darwin/AudioInputAudioUnitOSX.cpp',
-          '<(tgvoip_src_loc)/os/darwin/AudioInputAudioUnitOSX.h',
-          '<(tgvoip_src_loc)/os/darwin/AudioOutputAudioUnitOSX.cpp',
-          '<(tgvoip_src_loc)/os/darwin/AudioOutputAudioUnitOSX.h',
-          '<(tgvoip_src_loc)/os/darwin/AudioUnitIO.cpp',
-          '<(tgvoip_src_loc)/os/darwin/AudioUnitIO.h',
-          '<(tgvoip_src_loc)/os/darwin/DarwinSpecific.mm',
-          '<(tgvoip_src_loc)/os/darwin/DarwinSpecific.h',
-
-          # Linux
-          '<(tgvoip_src_loc)/os/linux/AudioInputALSA.cpp',
-          '<(tgvoip_src_loc)/os/linux/AudioInputALSA.h',
-          '<(tgvoip_src_loc)/os/linux/AudioOutputALSA.cpp',
-          '<(tgvoip_src_loc)/os/linux/AudioOutputALSA.h',
-          '<(tgvoip_src_loc)/os/linux/AudioOutputPulse.cpp',
-          '<(tgvoip_src_loc)/os/linux/AudioOutputPulse.h',
-          '<(tgvoip_src_loc)/os/linux/AudioInputPulse.cpp',
-          '<(tgvoip_src_loc)/os/linux/AudioInputPulse.h',
-          '<(tgvoip_src_loc)/os/linux/AudioPulse.cpp',
-          '<(tgvoip_src_loc)/os/linux/AudioPulse.h',
-
-          # POSIX
-          '<(tgvoip_src_loc)/os/posix/NetworkSocketPosix.cpp',
-          '<(tgvoip_src_loc)/os/posix/NetworkSocketPosix.h',
-
-          # WebRTC APM
-          '<(tgvoip_src_loc)/webrtc_dsp/system_wrappers/include/field_trial.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/system_wrappers/include/cpu_features_wrapper.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/system_wrappers/include/asm_defines.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/system_wrappers/include/metrics.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/system_wrappers/include/compile_assert_c.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/system_wrappers/source/field_trial.cc',
-          '<(tgvoip_src_loc)/webrtc_dsp/system_wrappers/source/metrics.cc',
-          '<(tgvoip_src_loc)/webrtc_dsp/system_wrappers/source/cpu_features.cc',
-          '<(tgvoip_src_loc)/webrtc_dsp/typedefs.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/absl/strings/internal/memutil.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/absl/strings/internal/memutil.cc',
-          '<(tgvoip_src_loc)/webrtc_dsp/absl/strings/string_view.cc',
-          '<(tgvoip_src_loc)/webrtc_dsp/absl/strings/ascii.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/absl/strings/ascii.cc',
-          '<(tgvoip_src_loc)/webrtc_dsp/absl/strings/string_view.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/absl/types/optional.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/absl/types/bad_optional_access.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/absl/types/bad_optional_access.cc',
-          '<(tgvoip_src_loc)/webrtc_dsp/absl/types/optional.cc',
-          '<(tgvoip_src_loc)/webrtc_dsp/absl/memory/memory.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/absl/meta/type_traits.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/absl/algorithm/algorithm.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/absl/container/inlined_vector.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/absl/base/policy_checks.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/absl/base/port.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/absl/base/config.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/absl/base/internal/raw_logging.cc',
-          '<(tgvoip_src_loc)/webrtc_dsp/absl/base/internal/throw_delegate.cc',
-          '<(tgvoip_src_loc)/webrtc_dsp/absl/base/internal/invoke.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/absl/base/internal/inline_variable.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/absl/base/internal/atomic_hook.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/absl/base/internal/identity.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/absl/base/internal/raw_logging.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/absl/base/internal/throw_delegate.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/absl/base/attributes.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/absl/base/macros.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/absl/base/optimization.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/absl/base/log_severity.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/absl/utility/utility.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/rtc_base/string_to_number.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/rtc_base/constructormagic.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/rtc_base/race_checker.cc',
-          '<(tgvoip_src_loc)/webrtc_dsp/rtc_base/strings/string_builder.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/rtc_base/strings/string_builder.cc',
-          '<(tgvoip_src_loc)/webrtc_dsp/rtc_base/event_tracer.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/rtc_base/stringencode.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/rtc_base/memory/aligned_malloc.cc',
-          '<(tgvoip_src_loc)/webrtc_dsp/rtc_base/memory/aligned_malloc.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/rtc_base/timeutils.cc',
-          '<(tgvoip_src_loc)/webrtc_dsp/rtc_base/event.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/rtc_base/ignore_wundef.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/rtc_base/stringutils.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/rtc_base/arraysize.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/rtc_base/platform_file.cc',
-          '<(tgvoip_src_loc)/webrtc_dsp/rtc_base/swap_queue.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/rtc_base/string_to_number.cc',
-          '<(tgvoip_src_loc)/webrtc_dsp/rtc_base/trace_event.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/rtc_base/checks.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/rtc_base/deprecation.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/rtc_base/thread_checker_impl.cc',
-          '<(tgvoip_src_loc)/webrtc_dsp/rtc_base/sanitizer.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/rtc_base/scoped_ref_ptr.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/rtc_base/logging.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/rtc_base/timeutils.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/rtc_base/atomicops.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/rtc_base/stringencode.cc',
-          '<(tgvoip_src_loc)/webrtc_dsp/rtc_base/stringutils.cc',
-          '<(tgvoip_src_loc)/webrtc_dsp/rtc_base/checks.cc',
-          '<(tgvoip_src_loc)/webrtc_dsp/rtc_base/numerics/safe_minmax.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/rtc_base/numerics/safe_conversions.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/rtc_base/numerics/safe_conversions_impl.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/rtc_base/numerics/safe_compare.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/rtc_base/system/unused.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/rtc_base/system/inline.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/rtc_base/system/ignore_warnings.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/rtc_base/system/asm_defines.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/rtc_base/system/rtc_export.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/rtc_base/system/arch.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/rtc_base/platform_thread.cc',
-          '<(tgvoip_src_loc)/webrtc_dsp/rtc_base/platform_thread.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/rtc_base/platform_thread_types.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/rtc_base/protobuf_utils.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/rtc_base/thread_annotations.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/rtc_base/gtest_prod_util.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/rtc_base/function_view.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/rtc_base/criticalsection.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/rtc_base/criticalsection.cc',
-          '<(tgvoip_src_loc)/webrtc_dsp/rtc_base/platform_thread_types.cc',
-          '<(tgvoip_src_loc)/webrtc_dsp/rtc_base/refcount.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/rtc_base/event.cc',
-          '<(tgvoip_src_loc)/webrtc_dsp/rtc_base/thread_checker_impl.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/rtc_base/event_tracer.cc',
-          '<(tgvoip_src_loc)/webrtc_dsp/rtc_base/compile_assert_c.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/rtc_base/logging_webrtc.cc',
-          '<(tgvoip_src_loc)/webrtc_dsp/rtc_base/type_traits.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/rtc_base/platform_file.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/rtc_base/refcounter.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/rtc_base/logging_mac.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/rtc_base/thread_checker.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/rtc_base/race_checker.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/rtc_base/refcountedobject.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/third_party/rnnoise/src/rnn_vad_weights.cc',
-          '<(tgvoip_src_loc)/webrtc_dsp/third_party/rnnoise/src/rnn_activations.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/third_party/rnnoise/src/kiss_fft.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/third_party/rnnoise/src/kiss_fft.cc',
-          '<(tgvoip_src_loc)/webrtc_dsp/third_party/rnnoise/src/rnn_vad_weights.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/api/audio/audio_frame.cc',
-          '<(tgvoip_src_loc)/webrtc_dsp/api/audio/echo_canceller3_config.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/api/audio/echo_control.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/api/audio/audio_frame.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/api/audio/echo_canceller3_config.cc',
-          '<(tgvoip_src_loc)/webrtc_dsp/api/audio/echo_canceller3_factory.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/api/audio/echo_canceller3_factory.cc',
-          '<(tgvoip_src_loc)/webrtc_dsp/api/array_view.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/third_party/fft/fft.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/third_party/fft/fft.c',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_coding/codecs/isac/bandwidth_info.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_coding/codecs/isac/main/include/isac.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_coding/codecs/isac/main/source/pitch_estimator.c',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_coding/codecs/isac/main/source/lpc_shape_swb16_tables.c',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_coding/codecs/isac/main/source/pitch_gain_tables.c',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_coding/codecs/isac/main/source/arith_routines_logist.c',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_coding/codecs/isac/main/source/os_specific_inline.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_coding/codecs/isac/main/source/filterbanks.c',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_coding/codecs/isac/main/source/entropy_coding.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_coding/codecs/isac/main/source/isac_vad.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_coding/codecs/isac/main/source/settings.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_coding/codecs/isac/main/source/transform.c',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_coding/codecs/isac/main/source/lpc_shape_swb12_tables.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_coding/codecs/isac/main/source/arith_routines.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_coding/codecs/isac/main/source/crc.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_coding/codecs/isac/main/source/pitch_filter.c',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_coding/codecs/isac/main/source/encode_lpc_swb.c',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_coding/codecs/isac/main/source/filter_functions.c',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_coding/codecs/isac/main/source/decode.c',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_coding/codecs/isac/main/source/lattice.c',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_coding/codecs/isac/main/source/intialize.c',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_coding/codecs/isac/main/source/lpc_tables.c',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_coding/codecs/isac/main/source/lpc_gain_swb_tables.c',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_coding/codecs/isac/main/source/bandwidth_estimator.c',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_coding/codecs/isac/main/source/isac_float_type.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_coding/codecs/isac/main/source/pitch_lag_tables.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_coding/codecs/isac/main/source/encode.c',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_coding/codecs/isac/main/source/lpc_analysis.c',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_coding/codecs/isac/main/source/spectrum_ar_model_tables.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_coding/codecs/isac/main/source/arith_routines_hist.c',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_coding/codecs/isac/main/source/codec.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_coding/codecs/isac/main/source/pitch_gain_tables.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_coding/codecs/isac/main/source/lpc_shape_swb16_tables.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_coding/codecs/isac/main/source/pitch_estimator.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_coding/codecs/isac/main/source/entropy_coding.c',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_coding/codecs/isac/main/source/isac_vad.c',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_coding/codecs/isac/main/source/structs.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_coding/codecs/isac/main/source/filter_functions.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_coding/codecs/isac/main/source/encode_lpc_swb.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_coding/codecs/isac/main/source/pitch_filter.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_coding/codecs/isac/main/source/arith_routines.c',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_coding/codecs/isac/main/source/crc.c',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_coding/codecs/isac/main/source/lpc_shape_swb12_tables.c',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_coding/codecs/isac/main/source/lpc_analysis.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_coding/codecs/isac/main/source/decode_bwe.c',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_coding/codecs/isac/main/source/spectrum_ar_model_tables.c',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_coding/codecs/isac/main/source/bandwidth_estimator.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_coding/codecs/isac/main/source/pitch_lag_tables.c',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_coding/codecs/isac/main/source/isac.c',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_coding/codecs/isac/main/source/lpc_gain_swb_tables.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_coding/codecs/isac/main/source/lpc_tables.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/rms_level.cc',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/echo_detector/moving_max.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/echo_detector/circular_buffer.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/echo_detector/normalized_covariance_estimator.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/echo_detector/normalized_covariance_estimator.cc',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/echo_detector/moving_max.cc',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/echo_detector/circular_buffer.cc',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/echo_detector/mean_variance_estimator.cc',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/echo_detector/mean_variance_estimator.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/gain_control_for_experimental_agc.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/splitting_filter.cc',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/gain_control_impl.cc',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/rms_level.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/ns/ns_core.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/ns/nsx_core.c',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/ns/noise_suppression_x.c',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/ns/nsx_core_c.c',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/ns/defines.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/ns/noise_suppression.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/ns/ns_core.c',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/ns/nsx_core.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/ns/windows_private.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/ns/noise_suppression_x.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/ns/noise_suppression.c',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/ns/nsx_defines.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/residual_echo_detector.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/audio_processing_impl.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/audio_buffer.cc',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/typing_detection.cc',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/render_queue_item_verifier.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/include/audio_generator.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/include/config.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/include/audio_frame_view.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/include/mock_audio_processing.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/include/gain_control.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/include/audio_generator_factory.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/include/audio_processing_statistics.cc',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/include/audio_generator_factory.cc',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/include/aec_dump.cc',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/include/aec_dump.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/include/audio_processing_statistics.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/include/audio_processing.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/include/audio_processing.cc',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/include/config.cc',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/agc2/interpolated_gain_curve.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/agc2/biquad_filter.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/agc2/interpolated_gain_curve.cc',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/agc2/agc2_common.cc',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/agc2/agc2_testing_common.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/agc2/adaptive_mode_level_estimator.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/agc2/gain_applier.cc',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/agc2/signal_classifier.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/agc2/adaptive_agc.cc',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/agc2/adaptive_digital_gain_applier.cc',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/agc2/limiter.cc',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/agc2/saturation_protector.cc',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/agc2/vector_float_frame.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/agc2/rnn_vad/spectral_features_internal.cc',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/agc2/rnn_vad/sequence_buffer.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/agc2/rnn_vad/rnn.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/agc2/rnn_vad/rnn.cc',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/agc2/rnn_vad/test_utils.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/agc2/rnn_vad/pitch_info.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/agc2/rnn_vad/lp_residual.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/agc2/rnn_vad/ring_buffer.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/agc2/rnn_vad/pitch_search_internal.cc',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/agc2/rnn_vad/symmetric_matrix_buffer.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/agc2/rnn_vad/spectral_features.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/agc2/rnn_vad/features_extraction.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/agc2/rnn_vad/common.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/agc2/rnn_vad/spectral_features_internal.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/agc2/rnn_vad/fft_util.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/agc2/rnn_vad/spectral_features.cc',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/agc2/rnn_vad/pitch_search_internal.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/agc2/rnn_vad/pitch_search.cc',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/agc2/rnn_vad/pitch_search.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/agc2/rnn_vad/features_extraction.cc',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/agc2/rnn_vad/fft_util.cc',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/agc2/rnn_vad/lp_residual.cc',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/agc2/fixed_gain_controller.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/agc2/adaptive_mode_level_estimator_agc.cc',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/agc2/vector_float_frame.cc',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/agc2/down_sampler.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/agc2/noise_level_estimator.cc',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/agc2/agc2_testing_common.cc',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/agc2/fixed_digital_level_estimator.cc',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/agc2/fixed_gain_controller.cc',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/agc2/saturation_protector.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/agc2/vad_with_level.cc',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/agc2/limiter_db_gain_curve.cc',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/agc2/agc2_common.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/agc2/adaptive_mode_level_estimator_agc.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/agc2/adaptive_digital_gain_applier.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/agc2/vad_with_level.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/agc2/limiter_db_gain_curve.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/agc2/fixed_digital_level_estimator.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/agc2/adaptive_agc.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/agc2/gain_applier.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/agc2/down_sampler.cc',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/agc2/noise_level_estimator.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/agc2/signal_classifier.cc',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/agc2/noise_spectrum_estimator.cc',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/agc2/compute_interpolated_gain_curve.cc',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/agc2/compute_interpolated_gain_curve.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/agc2/biquad_filter.cc',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/agc2/noise_spectrum_estimator.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/agc2/limiter.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/agc2/adaptive_mode_level_estimator.cc',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/transient/moving_moments.cc',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/transient/transient_detector.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/transient/wpd_tree.cc',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/transient/transient_suppressor.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/transient/daubechies_8_wavelet_coeffs.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/transient/common.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/transient/wpd_node.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/transient/moving_moments.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/transient/wpd_tree.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/transient/wpd_node.cc',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/transient/transient_suppressor.cc',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/transient/transient_detector.cc',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/transient/dyadic_decimator.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/low_cut_filter.cc',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/noise_suppression_impl.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/level_estimator_impl.cc',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/three_band_filter_bank.cc',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/aec/echo_cancellation.cc',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/aec/aec_resampler.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/aec/aec_resampler.cc',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/aec/echo_cancellation.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/aec/aec_core.cc',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/aec/aec_core.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/aec/aec_core_optimized_methods.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/aec/aec_core_sse2.cc',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/aec/aec_common.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/voice_detection_impl.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/voice_detection_impl.cc',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/echo_cancellation_impl.cc',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/gain_control_for_experimental_agc.cc',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/agc/agc.cc',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/agc/loudness_histogram.cc',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/agc/agc_manager_direct.cc',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/agc/legacy/analog_agc.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/agc/legacy/gain_control.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/agc/legacy/digital_agc.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/agc/legacy/analog_agc.c',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/agc/legacy/digital_agc.c',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/agc/utility.cc',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/agc/mock_agc.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/agc/loudness_histogram.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/agc/gain_map_internal.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/agc/utility.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/agc/agc_manager_direct.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/agc/agc.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/common.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/audio_processing_impl.cc',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/audio_buffer.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/echo_control_mobile_impl.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/splitting_filter.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/low_cut_filter.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/audio_generator/file_audio_generator.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/audio_generator/file_audio_generator.cc',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/gain_controller2.cc',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/three_band_filter_bank.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/residual_echo_detector.cc',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/echo_cancellation_impl.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/noise_suppression_impl.cc',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/level_estimator_impl.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/gain_controller2.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/aecm/aecm_core.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/aecm/aecm_defines.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/aecm/aecm_core.cc',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/aecm/aecm_core_c.cc',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/aecm/echo_control_mobile.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/aecm/echo_control_mobile.cc',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/aec3/render_reverb_model.cc',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/aec3/downsampled_render_buffer.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/aec3/subtractor_output_analyzer.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/aec3/reverb_model_fallback.cc',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/aec3/residual_echo_estimator.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/aec3/shadow_filter_update_gain.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/aec3/echo_remover_metrics.cc',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/aec3/matched_filter_lag_aggregator.cc',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/aec3/render_delay_buffer2.cc',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/aec3/aec_state.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/aec3/suppression_filter.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/aec3/echo_path_variability.cc',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/aec3/frame_blocker.cc',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/aec3/subtractor.cc',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/aec3/block_delay_buffer.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/aec3/adaptive_fir_filter.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/aec3/cascaded_biquad_filter.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/aec3/matched_filter.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/aec3/subtractor_output.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/aec3/render_signal_analyzer.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/aec3/aec3_fft.cc',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/aec3/aec3_fft.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/aec3/echo_remover_metrics.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/aec3/fullband_erle_estimator.cc',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/aec3/suppression_filter.cc',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/aec3/block_processor.cc',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/aec3/filter_analyzer.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/aec3/subtractor.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/aec3/echo_path_delay_estimator.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/aec3/subband_erle_estimator.cc',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/aec3/render_delay_controller_metrics.cc',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/aec3/render_delay_buffer.cc',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/aec3/block_processor_metrics.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/aec3/vector_buffer.cc',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/aec3/erl_estimator.cc',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/aec3/aec_state.cc',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/aec3/adaptive_fir_filter.cc',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/aec3/fft_data.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/aec3/render_delay_controller.cc',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/aec3/skew_estimator.cc',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/aec3/render_delay_controller_metrics.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/aec3/comfort_noise_generator.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/aec3/echo_path_delay_estimator.cc',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/aec3/erl_estimator.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/aec3/echo_remover.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/aec3/block_framer.cc',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/aec3/erle_estimator.cc',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/aec3/reverb_model.cc',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/aec3/cascaded_biquad_filter.cc',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/aec3/matrix_buffer.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/aec3/render_buffer.cc',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/aec3/reverb_model_estimator.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/aec3/subtractor_output.cc',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/aec3/stationarity_estimator.cc',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/aec3/render_signal_analyzer.cc',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/aec3/echo_path_variability.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/aec3/moving_average.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/aec3/render_reverb_model.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/aec3/subtractor_output_analyzer.cc',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/aec3/suppression_gain.cc',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/aec3/echo_audibility.cc',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/aec3/block_processor_metrics.cc',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/aec3/render_delay_controller.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/aec3/suppression_gain.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/aec3/moving_average.cc',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/aec3/erle_estimator.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/aec3/subband_erle_estimator.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/aec3/reverb_model_estimator.cc',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/aec3/aec3_common.cc',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/aec3/residual_echo_estimator.cc',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/aec3/block_processor.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/aec3/fullband_erle_estimator.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/aec3/matched_filter.cc',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/aec3/stationarity_estimator.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/aec3/echo_canceller3.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/aec3/skew_estimator.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/aec3/reverb_decay_estimator.cc',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/aec3/render_delay_controller2.cc',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/aec3/render_buffer.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/aec3/suppression_gain_limiter.cc',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/aec3/main_filter_update_gain.cc',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/aec3/echo_remover.cc',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/aec3/reverb_model_fallback.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/aec3/downsampled_render_buffer.cc',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/aec3/vector_buffer.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/aec3/matrix_buffer.cc',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/aec3/reverb_frequency_response.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/aec3/echo_audibility.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/aec3/fft_buffer.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/aec3/block_processor2.cc',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/aec3/echo_canceller3.cc',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/aec3/block_delay_buffer.cc',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/aec3/aec3_common.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/aec3/fft_buffer.cc',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/aec3/vector_math.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/aec3/decimator.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/aec3/frame_blocker.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/aec3/block_framer.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/aec3/suppression_gain_limiter.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/aec3/delay_estimate.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/aec3/comfort_noise_generator.cc',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/aec3/reverb_model.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/aec3/main_filter_update_gain.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/aec3/matched_filter_lag_aggregator.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/aec3/shadow_filter_update_gain.cc',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/aec3/filter_analyzer.cc',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/aec3/reverb_decay_estimator.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/aec3/reverb_frequency_response.cc',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/aec3/decimator.cc',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/aec3/render_delay_buffer.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/echo_control_mobile_impl.cc',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/gain_control_impl.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/typing_detection.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/logging/apm_data_dumper.cc',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/logging/apm_data_dumper.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/vad/voice_activity_detector.cc',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/vad/standalone_vad.cc',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/vad/vad_audio_proc_internal.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/vad/pitch_internal.cc',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/vad/vad_circular_buffer.cc',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/vad/vad_circular_buffer.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/vad/pitch_based_vad.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/vad/vad_audio_proc.cc',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/vad/pole_zero_filter.cc',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/vad/pole_zero_filter.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/vad/pitch_based_vad.cc',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/vad/gmm.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/vad/common.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/vad/vad_audio_proc.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/vad/voice_gmm_tables.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/vad/noise_gmm_tables.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/vad/pitch_internal.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/vad/gmm.cc',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/vad/standalone_vad.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/vad/voice_activity_detector.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/utility/delay_estimator_internal.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/utility/ooura_fft.cc',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/utility/ooura_fft.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/utility/delay_estimator_wrapper.cc',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/utility/ooura_fft_sse2.cc',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/utility/delay_estimator.cc',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/utility/block_mean_calculator.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/utility/block_mean_calculator.cc',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/utility/delay_estimator.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/utility/ooura_fft_tables_common.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/utility/delay_estimator_wrapper.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/common_audio/mocks/mock_smoothing_filter.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/common_audio/wav_file.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/common_audio/window_generator.cc',
-          '<(tgvoip_src_loc)/webrtc_dsp/common_audio/channel_buffer.cc',
-          '<(tgvoip_src_loc)/webrtc_dsp/common_audio/fir_filter_factory.cc',
-          '<(tgvoip_src_loc)/webrtc_dsp/common_audio/sparse_fir_filter.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/common_audio/fir_filter_sse.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/common_audio/window_generator.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/common_audio/ring_buffer.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/common_audio/fir_filter.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/common_audio/include/audio_util.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/common_audio/wav_header.cc',
-          '<(tgvoip_src_loc)/webrtc_dsp/common_audio/real_fourier_ooura.cc',
-          '<(tgvoip_src_loc)/webrtc_dsp/common_audio/audio_util.cc',
-          '<(tgvoip_src_loc)/webrtc_dsp/common_audio/real_fourier_ooura.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/common_audio/fir_filter_sse.cc',
-          '<(tgvoip_src_loc)/webrtc_dsp/common_audio/smoothing_filter.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/common_audio/resampler/push_sinc_resampler.cc',
-          '<(tgvoip_src_loc)/webrtc_dsp/common_audio/resampler/sinc_resampler.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/common_audio/resampler/resampler.cc',
-          '<(tgvoip_src_loc)/webrtc_dsp/common_audio/resampler/sinc_resampler_sse.cc',
-          '<(tgvoip_src_loc)/webrtc_dsp/common_audio/resampler/include/push_resampler.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/common_audio/resampler/include/resampler.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/common_audio/resampler/push_sinc_resampler.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/common_audio/resampler/push_resampler.cc',
-          '<(tgvoip_src_loc)/webrtc_dsp/common_audio/resampler/sinusoidal_linear_chirp_source.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/common_audio/resampler/sinc_resampler.cc',
-          '<(tgvoip_src_loc)/webrtc_dsp/common_audio/resampler/sinusoidal_linear_chirp_source.cc',
-          '<(tgvoip_src_loc)/webrtc_dsp/common_audio/fir_filter_factory.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/common_audio/audio_converter.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/common_audio/wav_file.cc',
-          '<(tgvoip_src_loc)/webrtc_dsp/common_audio/third_party/spl_sqrt_floor/spl_sqrt_floor.c',
-          '<(tgvoip_src_loc)/webrtc_dsp/common_audio/third_party/spl_sqrt_floor/spl_sqrt_floor.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/common_audio/third_party/fft4g/fft4g.c',
-          '<(tgvoip_src_loc)/webrtc_dsp/common_audio/third_party/fft4g/fft4g.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/common_audio/audio_converter.cc',
-          '<(tgvoip_src_loc)/webrtc_dsp/common_audio/real_fourier.cc',
-          '<(tgvoip_src_loc)/webrtc_dsp/common_audio/channel_buffer.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/common_audio/real_fourier.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/common_audio/sparse_fir_filter.cc',
-          '<(tgvoip_src_loc)/webrtc_dsp/common_audio/smoothing_filter.cc',
-          '<(tgvoip_src_loc)/webrtc_dsp/common_audio/fir_filter_c.cc',
-          '<(tgvoip_src_loc)/webrtc_dsp/common_audio/ring_buffer.c',
-          '<(tgvoip_src_loc)/webrtc_dsp/common_audio/fir_filter_c.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/common_audio/signal_processing/complex_fft_tables.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/common_audio/signal_processing/complex_fft.c',
-          '<(tgvoip_src_loc)/webrtc_dsp/common_audio/signal_processing/filter_ma_fast_q12.c',
-          '<(tgvoip_src_loc)/webrtc_dsp/common_audio/signal_processing/levinson_durbin.c',
-          '<(tgvoip_src_loc)/webrtc_dsp/common_audio/signal_processing/dot_product_with_scale.cc',
-          '<(tgvoip_src_loc)/webrtc_dsp/common_audio/signal_processing/auto_corr_to_refl_coef.c',
-          '<(tgvoip_src_loc)/webrtc_dsp/common_audio/signal_processing/resample_by_2_internal.c',
-          '<(tgvoip_src_loc)/webrtc_dsp/common_audio/signal_processing/energy.c',
-          '<(tgvoip_src_loc)/webrtc_dsp/common_audio/signal_processing/sqrt_of_one_minus_x_squared.c',
-          '<(tgvoip_src_loc)/webrtc_dsp/common_audio/signal_processing/downsample_fast.c',
-          '<(tgvoip_src_loc)/webrtc_dsp/common_audio/signal_processing/splitting_filter1.c',
-          '<(tgvoip_src_loc)/webrtc_dsp/common_audio/signal_processing/filter_ar_fast_q12.c',
-          '<(tgvoip_src_loc)/webrtc_dsp/common_audio/signal_processing/spl_init.c',
-          '<(tgvoip_src_loc)/webrtc_dsp/common_audio/signal_processing/lpc_to_refl_coef.c',
-          '<(tgvoip_src_loc)/webrtc_dsp/common_audio/signal_processing/cross_correlation.c',
-          '<(tgvoip_src_loc)/webrtc_dsp/common_audio/signal_processing/include/signal_processing_library.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/common_audio/signal_processing/include/real_fft.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/common_audio/signal_processing/include/spl_inl.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/common_audio/signal_processing/division_operations.c',
-          '<(tgvoip_src_loc)/webrtc_dsp/common_audio/signal_processing/auto_correlation.c',
-          '<(tgvoip_src_loc)/webrtc_dsp/common_audio/signal_processing/get_scaling_square.c',
-          '<(tgvoip_src_loc)/webrtc_dsp/common_audio/signal_processing/dot_product_with_scale.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/common_audio/signal_processing/resample_by_2_internal.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/common_audio/signal_processing/resample.c',
-          '<(tgvoip_src_loc)/webrtc_dsp/common_audio/signal_processing/min_max_operations.c',
-          '<(tgvoip_src_loc)/webrtc_dsp/common_audio/signal_processing/refl_coef_to_lpc.c',
-          '<(tgvoip_src_loc)/webrtc_dsp/common_audio/signal_processing/filter_ar.c',
-          '<(tgvoip_src_loc)/webrtc_dsp/common_audio/signal_processing/vector_scaling_operations.c',
-          '<(tgvoip_src_loc)/webrtc_dsp/common_audio/signal_processing/resample_fractional.c',
-          '<(tgvoip_src_loc)/webrtc_dsp/common_audio/signal_processing/real_fft.c',
-          '<(tgvoip_src_loc)/webrtc_dsp/common_audio/signal_processing/ilbc_specific_functions.c',
-          '<(tgvoip_src_loc)/webrtc_dsp/common_audio/signal_processing/complex_bit_reverse.c',
-          '<(tgvoip_src_loc)/webrtc_dsp/common_audio/signal_processing/randomization_functions.c',
-          '<(tgvoip_src_loc)/webrtc_dsp/common_audio/signal_processing/copy_set_operations.c',
-          '<(tgvoip_src_loc)/webrtc_dsp/common_audio/signal_processing/resample_by_2.c',
-          '<(tgvoip_src_loc)/webrtc_dsp/common_audio/signal_processing/get_hanning_window.c',
-          '<(tgvoip_src_loc)/webrtc_dsp/common_audio/signal_processing/resample_48khz.c',
-          '<(tgvoip_src_loc)/webrtc_dsp/common_audio/signal_processing/spl_inl.c',
-          '<(tgvoip_src_loc)/webrtc_dsp/common_audio/signal_processing/spl_sqrt.c',
-          '<(tgvoip_src_loc)/webrtc_dsp/common_audio/wav_header.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/common_audio/vad/vad_sp.c',
-          '<(tgvoip_src_loc)/webrtc_dsp/common_audio/vad/vad.cc',
-          '<(tgvoip_src_loc)/webrtc_dsp/common_audio/vad/webrtc_vad.c',
-          '<(tgvoip_src_loc)/webrtc_dsp/common_audio/vad/vad_core.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/common_audio/vad/include/vad.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/common_audio/vad/include/webrtc_vad.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/common_audio/vad/vad_gmm.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/common_audio/vad/vad_filterbank.c',
-          '<(tgvoip_src_loc)/webrtc_dsp/common_audio/vad/vad_core.c',
-          '<(tgvoip_src_loc)/webrtc_dsp/common_audio/vad/vad_sp.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/common_audio/vad/vad_filterbank.h',
-          '<(tgvoip_src_loc)/webrtc_dsp/common_audio/vad/vad_gmm.c', 
-
-          # ARM/NEON sources
-          # TODO check if there's a good way to make these compile with ARM ports of TDesktop
-          #'<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/ns/nsx_core_neon.c',
-          #'<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/aec/aec_core_neon.cc',
-          #'<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/aecm/aecm_core_neon.cc',
-          #'<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/utility/ooura_fft_tables_neon_sse2.h',
-          #'<(tgvoip_src_loc)/webrtc_dsp/modules/audio_processing/utility/ooura_fft_neon.cc',
-          #'<(tgvoip_src_loc)/webrtc_dsp/common_audio/fir_filter_neon.cc',
-          #'<(tgvoip_src_loc)/webrtc_dsp/common_audio/resampler/sinc_resampler_neon.cc',
-          #'<(tgvoip_src_loc)/webrtc_dsp/common_audio/third_party/spl_sqrt_floor/spl_sqrt_floor_arm.S',
-          #'<(tgvoip_src_loc)/webrtc_dsp/common_audio/fir_filter_neon.h',
-          #'<(tgvoip_src_loc)/webrtc_dsp/common_audio/signal_processing/downsample_fast_neon.c',
-          #'<(tgvoip_src_loc)/webrtc_dsp/common_audio/signal_processing/complex_bit_reverse_arm.S',
-          #'<(tgvoip_src_loc)/webrtc_dsp/common_audio/signal_processing/include/spl_inl_armv7.h',
-          #'<(tgvoip_src_loc)/webrtc_dsp/common_audio/signal_processing/min_max_operations_neon.c',
-          #'<(tgvoip_src_loc)/webrtc_dsp/common_audio/signal_processing/cross_correlation_neon.c',
-          #'<(tgvoip_src_loc)/webrtc_dsp/common_audio/signal_processing/filter_ar_fast_q12_armv7.S',
-
-
-        ],
-        'libraries': [],
-        'configurations': {
-          'Debug': {},
-          'Release': {},
-        },
-        'conditions': [
-          [
-            '"<(OS)" != "win"', {
-              'sources/': [['exclude', '<(tgvoip_src_loc)/os/windows/']],
-            }, {
-              'sources/': [['exclude', '<(tgvoip_src_loc)/os/posix/']],
-            },
-          ],
-          [
-            '"<(OS)" != "mac"', {
-              'sources/': [['exclude', '<(tgvoip_src_loc)/os/darwin/']],
-            },
-          ],
-          [
-            '"<(OS)" != "linux"', {
-              'sources/': [['exclude', '<(tgvoip_src_loc)/os/linux/']],
-            },
-          ],
-          [
-            '"<(OS)" == "mac"', {
-              'xcode_settings': {
-                'CLANG_CXX_LANGUAGE_STANDARD': 'c++11',
-                'ALWAYS_SEARCH_USER_PATHS': 'NO',
-              },
-              'defines': [
-                'WEBRTC_POSIX',
-                'WEBRTC_MAC',
-                'TARGET_OS_OSX',
-              ],
-              'sources': [
-                '<(tgvoip_src_loc)/webrtc_dsp/rtc_base/logging_mac.mm',
-                '<(tgvoip_src_loc)/webrtc_dsp/rtc_base/logging_mac.h',
-              ],
-              'conditions': [
-                [ '"<(official_build_target)" == "mac32"', {
-                  'xcode_settings': {
-                    'MACOSX_DEPLOYMENT_TARGET': '10.6',
-                    'OTHER_CPLUSPLUSFLAGS': [ '-nostdinc++' ],
-                  },
-                  'include_dirs': [
-                    '/usr/local/macold/include/c++/v1',
-                    '<(DEPTH)/../../../Libraries/macold/openssl/include',
-                  ],
-                  'defines': [
-                    'TARGET_OSX32',
-                  ],
-                }, {
-                  'xcode_settings': {
-                    'MACOSX_DEPLOYMENT_TARGET': '10.8',
-                    'CLANG_CXX_LIBRARY': 'libc++',
-                  },
-                  'include_dirs': [
-                    '<(DEPTH)/../../../Libraries/openssl/include',
-                  ],
-                  'direct_dependent_settings': {
-                    'linkflags': [
-                      '-framework VideoToolbox',
-                    ],
-                  },
-                  'sources': [
-                   '<(tgvoip_src_loc)/os/darwin/TGVVideoRenderer.mm',
-                   '<(tgvoip_src_loc)/os/darwin/TGVVideoRenderer.h',
-                   '<(tgvoip_src_loc)/os/darwin/TGVVideoSource.mm',
-                   '<(tgvoip_src_loc)/os/darwin/TGVVideoSource.h',
-                   '<(tgvoip_src_loc)/os/darwin/VideoToolboxEncoderSource.mm',
-                   '<(tgvoip_src_loc)/os/darwin/VideoToolboxEncoderSource.h',
-                   '<(tgvoip_src_loc)/os/darwin/SampleBufferDisplayLayerRenderer.mm',
-                   '<(tgvoip_src_loc)/os/darwin/SampleBufferDisplayLayerRenderer.h',
-                  ],
-                }],
-                ['"<(official_build_target)" == "macstore"', {
-                 'defines': [
-                  'TGVOIP_NO_OSX_PRIVATE_API',
-                 ],
-                }],
-              ],
-            },
-          ],
-          [
-            '"<(OS)" == "win"', {
-              'msbuild_toolset': 'v141',
-              'defines': [
-                'NOMINMAX',
-                '_USING_V110_SDK71_',
-                'TGVOIP_WINXP_COMPAT',
-                'WEBRTC_WIN',
-              ],
-              'libraries': [
-                'winmm',
-                'ws2_32',
-                'kernel32',
-                'user32',
-              ],
-              'msvs_cygwin_shell': 0,
-              'msvs_settings': {
-                'VCCLCompilerTool': {
-                  'ProgramDataBaseFileName': '$(OutDir)\\$(ProjectName).pdb',
-                  'DebugInformationFormat': '3',          # Program Database (/Zi)
-                  'AdditionalOptions': [
-                    '/MP',   # Enable multi process build.
-                    '/EHsc', # Catch C++ exceptions only, extern C functions never throw a C++ exception.
-                    '/wd4068', # Disable "warning C4068: unknown pragma"
-                  ],
-                  'TreatWChar_tAsBuiltInType': 'false',
-                },
-              },
-              'msvs_external_builder_build_cmd': [
-                'ninja.exe',
-                '-C',
-                '$(OutDir)',
-                '-k0',
-                '$(ProjectName)',
-              ],
-              'configurations': {
-                'Debug': {
-                  'defines': [
-                    '_DEBUG',
-                  ],
-                  'include_dirs': [
-                    '<(DEPTH)/../../../Libraries/openssl/Debug/include',
-                  ],
-                  'msvs_settings': {
-                    'VCCLCompilerTool': {
-                      'Optimization': '0',                # Disabled (/Od)
-                      'RuntimeLibrary': '1',              # Multi-threaded Debug (/MTd)
-                      'RuntimeTypeInfo': 'true',
-                    },
-                    'VCLibrarianTool': {
-                      'AdditionalOptions': [
-                        '/NODEFAULTLIB:LIBCMT'
-                      ]
-                    }
-                  },
-                },
-                'Release': {
-                  'defines': [
-                    'NDEBUG',
-                  ],
-                  'include_dirs': [
-                     '<(DEPTH)/../../../Libraries/openssl/Release/include',
-                  ],
-                  'msvs_settings': {
-                    'VCCLCompilerTool': {
-                      'Optimization': '2',                 # Maximize Speed (/O2)
-                      'InlineFunctionExpansion': '2',      # Any suitable (/Ob2)
-                      'EnableIntrinsicFunctions': 'true',  # Yes (/Oi)
-                      'FavorSizeOrSpeed': '1',             # Favor fast code (/Ot)
-                      'RuntimeLibrary': '0',               # Multi-threaded (/MT)
-                      'EnableEnhancedInstructionSet': '2', # Streaming SIMD Extensions 2 (/arch:SSE2)
-                      'WholeProgramOptimization': 'true',  # /GL
-                    },
-                    'VCLibrarianTool': {
-                      'AdditionalOptions': [
-                        '/LTCG',
-                      ]
-                    },
-                  },
-                },
-              },
-            },
-          ],
-          [
-            '"<(OS)" == "linux"', {
-              'defines': [
-                'WEBRTC_POSIX',
-                'WEBRTC_LINUX',
-              ],
-              'conditions': [
-                [ '"<!(uname -m)" == "i686"', {
-                  'cflags_cc': [
-                    '-msse2',
-                  ],
-                }]
-              ],
-              'direct_dependent_settings': {
-                'libraries': [
-
-                ],
-              },
-            },
-          ],
-        ],
-      },
-    ],
-  }
diff --git a/submodules/libtgvoip/libtgvoip.h b/submodules/libtgvoip/libtgvoip.h
deleted file mode 100644
index b5feb06ea7..0000000000
--- a/submodules/libtgvoip/libtgvoip.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef libtgvoip_h
-#define libtgvoip_h
-
-#import <libtgvoip/OngoingCallThreadLocalContext.h>
-
-#endif /* libtgvoip_h */
diff --git a/submodules/libtgvoip/logging.cpp b/submodules/libtgvoip/logging.cpp
deleted file mode 100644
index 78724eef8d..0000000000
--- a/submodules/libtgvoip/logging.cpp
+++ /dev/null
@@ -1,104 +0,0 @@
-//
-// libtgvoip is free and unencumbered public domain software.
-// For more information, see http://unlicense.org or the UNLICENSE file
-// you should have received with this source code distribution.
-//
-
-
-#include <stdio.h>
-#include <stdarg.h>
-#include <time.h>
-
-#include "VoIPController.h"
-
-#ifdef __ANDROID__
-#include <sys/system_properties.h>
-#elif defined(__linux__)
-#include <sys/utsname.h>
-#endif
-
-#ifdef __APPLE__
-#include <TargetConditionals.h>
-#include "os/darwin/DarwinSpecific.h"
-#endif
-
-FILE* tgvoipLogFile=NULL;
-
-void tgvoip_log_file_printf(char level, const char* msg, ...){
-	if(tgvoipLogFile){
-		va_list argptr;
-		va_start(argptr, msg);
-		time_t t = time(0);
-		struct tm *now = localtime(&t);
-		fprintf(tgvoipLogFile, "%02d-%02d %02d:%02d:%02d %c: ", now->tm_mon + 1, now->tm_mday, now->tm_hour, now->tm_min, now->tm_sec, level);
-		vfprintf(tgvoipLogFile, msg, argptr);
-		fprintf(tgvoipLogFile, "\n");
-		fflush(tgvoipLogFile);
-	}
-}
-
-void tgvoip_log_file_write_header(FILE* file){
-	if(file){
-		time_t t = time(0);
-		struct tm *now = localtime(&t);
-#if defined(_WIN32)
-		#if WINAPI_PARTITION_DESKTOP
-			char systemVersion[64];
-			OSVERSIONINFOA vInfo;
-			vInfo.dwOSVersionInfoSize=sizeof(vInfo);
-			GetVersionExA(&vInfo);
-			snprintf(systemVersion, sizeof(systemVersion), "Windows %d.%d.%d %s", vInfo.dwMajorVersion, vInfo.dwMinorVersion, vInfo.dwBuildNumber, vInfo.szCSDVersion);
-#else
-			char* systemVersion="Windows RT";
-#endif
-#elif defined(__linux__)
-#ifdef __ANDROID__
-		char systemVersion[128];
-		char sysRel[PROP_VALUE_MAX];
-		char deviceVendor[PROP_VALUE_MAX];
-		char deviceModel[PROP_VALUE_MAX];
-		__system_property_get("ro.build.version.release", sysRel);
-		__system_property_get("ro.product.manufacturer", deviceVendor);
-		__system_property_get("ro.product.model", deviceModel);
-		snprintf(systemVersion, sizeof(systemVersion), "Android %s (%s %s)", sysRel, deviceVendor, deviceModel);
-#else
-		struct utsname sysname;
-		uname(&sysname);
-		std::string sysver(sysname.sysname);
-		sysver+=" ";
-		sysver+=sysname.release;
-		sysver+=" (";
-		sysver+=sysname.version;
-		sysver+=")";
-		const char* systemVersion=sysver.c_str();
-#endif
-#elif defined(__APPLE__)
-		char osxVer[128];
-		tgvoip::DarwinSpecific::GetSystemName(osxVer, sizeof(osxVer));
-		char systemVersion[128];
-#if TARGET_OS_OSX
-		snprintf(systemVersion, sizeof(systemVersion), "OS X %s", osxVer);
-#elif TARGET_OS_IPHONE
-		snprintf(systemVersion, sizeof(systemVersion), "iOS %s", osxVer);
-#else
-		snprintf(systemVersion, sizeof(systemVersion), "Unknown Darwin %s", osxVer);
-#endif
-#else
-		const char* systemVersion="Unknown OS";
-#endif
-
-#if defined(__aarch64__)
-		const char* cpuArch="ARM64";
-#elif defined(__arm__) || defined(_M_ARM)
-		const char* cpuArch="ARM";
-#elif defined(_M_X64) || defined(__x86_64__)
-		const char* cpuArch="x86_64";
-#elif defined(_M_IX86) || defined(__i386__)
-		const char* cpuArch="x86";
-#else
-		const char* cpuArch="Unknown CPU";
-#endif
-
-		fprintf(file, "---------------\nlibtgvoip v" LIBTGVOIP_VERSION " on %s %s\nLog started on %d/%02d/%d at %d:%02d:%02d\n---------------\n", systemVersion, cpuArch, now->tm_mday, now->tm_mon+1, now->tm_year+1900, now->tm_hour, now->tm_min, now->tm_sec);
-	}
-}
diff --git a/submodules/libtgvoip/logging.h b/submodules/libtgvoip/logging.h
deleted file mode 100644
index 2ddae18167..0000000000
--- a/submodules/libtgvoip/logging.h
+++ /dev/null
@@ -1,98 +0,0 @@
-//
-// libtgvoip is free and unencumbered public domain software.
-// For more information, see http://unlicense.org or the UNLICENSE file
-// you should have received with this source code distribution.
-//
-
-#ifndef __LOGGING_H
-#define __LOGGING_H
-#define LSTR_INT(x) LSTR_DO_INT(x)
-#define LSTR_DO_INT(x) #x
-
-#ifdef __APPLE__
-#include <TargetConditionals.h>
-#endif
-
-#include <stdio.h>
-
-void tgvoip_log_file_printf(char level, const char* msg, ...);
-void tgvoip_log_file_write_header(FILE* file);
-
-#if defined(__ANDROID__)
-
-#include <android/log.h>
-
-//#define _LOG_WRAP(...) __BASE_FILE__":"LSTR_INT(__LINE__)": "__VA_ARGS__
-#define _LOG_WRAP(...) __VA_ARGS__
-#define TAG "tg-voip-native"
-#define LOGV(...) {__android_log_print(ANDROID_LOG_VERBOSE, TAG, _LOG_WRAP(__VA_ARGS__)); tgvoip_log_file_printf('V', __VA_ARGS__);}
-#define LOGD(...) {__android_log_print(ANDROID_LOG_DEBUG, TAG, _LOG_WRAP(__VA_ARGS__)); tgvoip_log_file_printf('D', __VA_ARGS__);}
-#define LOGI(...) {__android_log_print(ANDROID_LOG_INFO, TAG, _LOG_WRAP(__VA_ARGS__)); tgvoip_log_file_printf('I', __VA_ARGS__);}
-#define LOGW(...) {__android_log_print(ANDROID_LOG_WARN, TAG, _LOG_WRAP(__VA_ARGS__)); tgvoip_log_file_printf('W', __VA_ARGS__);}
-#define LOGE(...) {__android_log_print(ANDROID_LOG_ERROR, TAG, _LOG_WRAP(__VA_ARGS__)); tgvoip_log_file_printf('E', __VA_ARGS__);}
-
-#elif defined(__APPLE__) && TARGET_OS_IPHONE && defined(TGVOIP_HAVE_TGLOG)
-
-#include "os/darwin/TGLogWrapper.h"
-
-#define LOGV(msg, ...) {__tgvoip_call_tglog("V/tgvoip: " msg, ##__VA_ARGS__); tgvoip_log_file_printf('V', msg, ##__VA_ARGS__);}
-#define LOGD(msg, ...) {__tgvoip_call_tglog("D/tgvoip: " msg, ##__VA_ARGS__); tgvoip_log_file_printf('D', msg, ##__VA_ARGS__);}
-#define LOGI(msg, ...) {__tgvoip_call_tglog("I/tgvoip: " msg, ##__VA_ARGS__); tgvoip_log_file_printf('I', msg, ##__VA_ARGS__);}
-#define LOGW(msg, ...) {__tgvoip_call_tglog("W/tgvoip: " msg, ##__VA_ARGS__); tgvoip_log_file_printf('W', msg, ##__VA_ARGS__);}
-#define LOGE(msg, ...) {__tgvoip_call_tglog("E/tgvoip: " msg, ##__VA_ARGS__); tgvoip_log_file_printf('E', msg, ##__VA_ARGS__);}
-
-#elif defined(_WIN32) && defined(_DEBUG)
-
-#include <windows.h>
-#include <stdio.h>
-
-#define _TGVOIP_W32_LOG_PRINT(verb, msg, ...){ char __log_buf[1024]; snprintf(__log_buf, 1024, "%c/tgvoip: " msg "\n", verb, ##__VA_ARGS__); OutputDebugStringA(__log_buf); tgvoip_log_file_printf((char)verb, msg, __VA_ARGS__);}
-
-#define LOGV(msg, ...) _TGVOIP_W32_LOG_PRINT('V', msg, ##__VA_ARGS__)
-#define LOGD(msg, ...) _TGVOIP_W32_LOG_PRINT('D', msg, ##__VA_ARGS__)
-#define LOGI(msg, ...) _TGVOIP_W32_LOG_PRINT('I', msg, ##__VA_ARGS__)
-#define LOGW(msg, ...) _TGVOIP_W32_LOG_PRINT('W', msg, ##__VA_ARGS__)
-#define LOGE(msg, ...) _TGVOIP_W32_LOG_PRINT('E', msg, ##__VA_ARGS__)
-
-#else
-
-#include <stdio.h>
-
-#define _TGVOIP_LOG_PRINT(verb, msg, ...) {printf("%c/tgvoip: " msg "\n", verb, ##__VA_ARGS__); tgvoip_log_file_printf(verb, msg, ##__VA_ARGS__);}
-
-#define LOGV(msg, ...) _TGVOIP_LOG_PRINT('V', msg, ##__VA_ARGS__)
-#define LOGD(msg, ...) _TGVOIP_LOG_PRINT('D', msg, ##__VA_ARGS__)
-#define LOGI(msg, ...) _TGVOIP_LOG_PRINT('I', msg, ##__VA_ARGS__)
-#define LOGW(msg, ...) _TGVOIP_LOG_PRINT('W', msg, ##__VA_ARGS__)
-#define LOGE(msg, ...) _TGVOIP_LOG_PRINT('E', msg, ##__VA_ARGS__)
-
-#endif
-
-#if !defined(snprintf) && defined(_WIN32) && defined(__cplusplus_winrt)
-#define snprintf _snprintf
-#endif
-
-#ifdef TGVOIP_LOG_VERBOSITY
-#if TGVOIP_LOG_VERBOSITY<5
-#undef LOGV
-#define LOGV(msg, ...)
-#endif
-#if TGVOIP_LOG_VERBOSITY<4
-#undef LOGD
-#define LOGD(msg, ...)
-#endif
-#if TGVOIP_LOG_VERBOSITY<3
-#undef LOGI
-#define LOGI(msg, ...)
-#endif
-#if TGVOIP_LOG_VERBOSITY<2
-#undef LOGW
-#define LOGW(msg, ...)
-#endif
-#if TGVOIP_LOG_VERBOSITY<1
-#undef LOGE
-#define LOGE(msg, ...)
-#endif
-#endif
-
-#endif //__LOGGING_H
diff --git a/submodules/libtgvoip/ltmain.sh b/submodules/libtgvoip/ltmain.sh
deleted file mode 100644
index d3ab94d6f4..0000000000
--- a/submodules/libtgvoip/ltmain.sh
+++ /dev/null
@@ -1,11369 +0,0 @@
-#! /bin/sh
-## DO NOT EDIT - This file generated from ./build-aux/ltmain.in
-##               by inline-source v2018-07-24.06
-
-# libtool (GNU libtool) 2.4.6.42-b88ce
-# Provide generalized library-building support services.
-# Written by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
-
-# Copyright (C) 1996-2018 Free Software Foundation, Inc.
-# This is free software; see the source for copying conditions.  There is NO
-# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-
-# GNU Libtool is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# As a special exception to the GNU General Public License,
-# if you distribute this file as part of a program or library that
-# is built using GNU Libtool, you may include this file under the
-# same distribution terms that you use for the rest of that program.
-#
-# GNU Libtool is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-
-PROGRAM=libtool
-PACKAGE=libtool
-VERSION=2.4.6.42-b88ce
-package_revision=2.4.6.42
-
-
-## ------ ##
-## Usage. ##
-## ------ ##
-
-# Run './libtool --help' for help with using this script from the
-# command line.
-
-
-## ------------------------------- ##
-## User overridable command paths. ##
-## ------------------------------- ##
-
-# After configure completes, it has a better idea of some of the
-# shell tools we need than the defaults used by the functions shared
-# with bootstrap, so set those here where they can still be over-
-# ridden by the user, but otherwise take precedence.
-
-: ${AUTOCONF="autoconf"}
-: ${AUTOMAKE="automake"}
-
-
-## -------------------------- ##
-## Source external libraries. ##
-## -------------------------- ##
-
-# Much of our low-level functionality needs to be sourced from external
-# libraries, which are installed to $pkgauxdir.
-
-# Set a version string for this script.
-scriptversion=2018-07-24.06; # UTC
-
-# General shell script boiler plate, and helper functions.
-# Written by Gary V. Vaughan, 2004
-
-# This is free software.  There is NO warranty; not even for
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-#
-# Copyright (C) 2004-2018 Bootstrap Authors
-#
-# This file is dual licensed under the terms of the MIT license
-# <https://opensource.org/license/MIT>, and GPL version 3 or later
-# <http://www.gnu.org/licenses/gpl-2.0.html>.  You must apply one of
-# these licenses when using or redistributing this software or any of
-# the files within it.  See the URLs above, or the file `LICENSE`
-# included in the Bootstrap distribution for the full license texts.
-
-# Please report bugs or propose patches to:
-# <https://github.com/gnulib-modules/bootstrap/issues>
-
-
-## ------ ##
-## Usage. ##
-## ------ ##
-
-# Evaluate this file near the top of your script to gain access to
-# the functions and variables defined here:
-#
-#   . `echo "$0" | ${SED-sed} 's|[^/]*$||'`/build-aux/funclib.sh
-#
-# If you need to override any of the default environment variable
-# settings, do that before evaluating this file.
-
-
-## -------------------- ##
-## Shell normalisation. ##
-## -------------------- ##
-
-# Some shells need a little help to be as Bourne compatible as possible.
-# Before doing anything else, make sure all that help has been provided!
-
-DUALCASE=1; export DUALCASE # for MKS sh
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
-  emulate sh
-  NULLCMD=:
-  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
-  # is contrary to our usage.  Disable this feature.
-  alias -g '${1+"$@"}'='"$@"'
-  setopt NO_GLOB_SUBST
-else
-  case `(set -o) 2>/dev/null` in *posix*) set -o posix ;; esac
-fi
-
-# NLS nuisances: We save the old values in case they are required later.
-_G_user_locale=
-_G_safe_locale=
-for _G_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
-do
-  eval "if test set = \"\${$_G_var+set}\"; then
-          save_$_G_var=\$$_G_var
-          $_G_var=C
-	  export $_G_var
-	  _G_user_locale=\"$_G_var=\\\$save_\$_G_var; \$_G_user_locale\"
-	  _G_safe_locale=\"$_G_var=C; \$_G_safe_locale\"
-	fi"
-done
-
-# Make sure IFS has a sensible default
-sp=' '
-nl='
-'
-IFS="$sp	$nl"
-
-# There are apparently some retarded systems that use ';' as a PATH separator!
-if test "${PATH_SEPARATOR+set}" != set; then
-  PATH_SEPARATOR=:
-  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
-    (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
-      PATH_SEPARATOR=';'
-  }
-fi
-
-
-# func_unset VAR
-# --------------
-# Portably unset VAR.
-# In some shells, an 'unset VAR' statement leaves a non-zero return
-# status if VAR is already unset, which might be problematic if the
-# statement is used at the end of a function (thus poisoning its return
-# value) or when 'set -e' is active (causing even a spurious abort of
-# the script in this case).
-func_unset ()
-{
-    { eval $1=; (eval unset $1) >/dev/null 2>&1 && eval unset $1 || : ; }
-}
-
-
-# Make sure CDPATH doesn't cause `cd` commands to output the target dir.
-func_unset CDPATH
-
-# Make sure ${,E,F}GREP behave sanely.
-func_unset GREP_OPTIONS
-
-
-## ------------------------- ##
-## Locate command utilities. ##
-## ------------------------- ##
-
-
-# func_executable_p FILE
-# ----------------------
-# Check that FILE is an executable regular file.
-func_executable_p ()
-{
-    test -f "$1" && test -x "$1"
-}
-
-
-# func_path_progs PROGS_LIST CHECK_FUNC [PATH]
-# --------------------------------------------
-# Search for either a program that responds to --version with output
-# containing "GNU", or else returned by CHECK_FUNC otherwise, by
-# trying all the directories in PATH with each of the elements of
-# PROGS_LIST.
-#
-# CHECK_FUNC should accept the path to a candidate program, and
-# set $func_check_prog_result if it truncates its output less than
-# $_G_path_prog_max characters.
-func_path_progs ()
-{
-    _G_progs_list=$1
-    _G_check_func=$2
-    _G_PATH=${3-"$PATH"}
-
-    _G_path_prog_max=0
-    _G_path_prog_found=false
-    _G_save_IFS=$IFS; IFS=${PATH_SEPARATOR-:}
-    for _G_dir in $_G_PATH; do
-      IFS=$_G_save_IFS
-      test -z "$_G_dir" && _G_dir=.
-      for _G_prog_name in $_G_progs_list; do
-        for _exeext in '' .EXE; do
-          _G_path_prog=$_G_dir/$_G_prog_name$_exeext
-          func_executable_p "$_G_path_prog" || continue
-          case `"$_G_path_prog" --version 2>&1` in
-            *GNU*) func_path_progs_result=$_G_path_prog _G_path_prog_found=: ;;
-            *)     $_G_check_func $_G_path_prog
-		   func_path_progs_result=$func_check_prog_result
-		   ;;
-          esac
-          $_G_path_prog_found && break 3
-        done
-      done
-    done
-    IFS=$_G_save_IFS
-    test -z "$func_path_progs_result" && {
-      echo "no acceptable sed could be found in \$PATH" >&2
-      exit 1
-    }
-}
-
-
-# We want to be able to use the functions in this file before configure
-# has figured out where the best binaries are kept, which means we have
-# to search for them ourselves - except when the results are already set
-# where we skip the searches.
-
-# Unless the user overrides by setting SED, search the path for either GNU
-# sed, or the sed that truncates its output the least.
-test -z "$SED" && {
-  _G_sed_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/
-  for _G_i in 1 2 3 4 5 6 7; do
-    _G_sed_script=$_G_sed_script$nl$_G_sed_script
-  done
-  echo "$_G_sed_script" 2>/dev/null | sed 99q >conftest.sed
-  _G_sed_script=
-
-  func_check_prog_sed ()
-  {
-    _G_path_prog=$1
-
-    _G_count=0
-    printf 0123456789 >conftest.in
-    while :
-    do
-      cat conftest.in conftest.in >conftest.tmp
-      mv conftest.tmp conftest.in
-      cp conftest.in conftest.nl
-      echo '' >> conftest.nl
-      "$_G_path_prog" -f conftest.sed <conftest.nl >conftest.out 2>/dev/null || break
-      diff conftest.out conftest.nl >/dev/null 2>&1 || break
-      _G_count=`expr $_G_count + 1`
-      if test "$_G_count" -gt "$_G_path_prog_max"; then
-        # Best one so far, save it but keep looking for a better one
-        func_check_prog_result=$_G_path_prog
-        _G_path_prog_max=$_G_count
-      fi
-      # 10*(2^10) chars as input seems more than enough
-      test 10 -lt "$_G_count" && break
-    done
-    rm -f conftest.in conftest.tmp conftest.nl conftest.out
-  }
-
-  func_path_progs "sed gsed" func_check_prog_sed "$PATH:/usr/xpg4/bin"
-  rm -f conftest.sed
-  SED=$func_path_progs_result
-}
-
-
-# Unless the user overrides by setting GREP, search the path for either GNU
-# grep, or the grep that truncates its output the least.
-test -z "$GREP" && {
-  func_check_prog_grep ()
-  {
-    _G_path_prog=$1
-
-    _G_count=0
-    _G_path_prog_max=0
-    printf 0123456789 >conftest.in
-    while :
-    do
-      cat conftest.in conftest.in >conftest.tmp
-      mv conftest.tmp conftest.in
-      cp conftest.in conftest.nl
-      echo 'GREP' >> conftest.nl
-      "$_G_path_prog" -e 'GREP$' -e '-(cannot match)-' <conftest.nl >conftest.out 2>/dev/null || break
-      diff conftest.out conftest.nl >/dev/null 2>&1 || break
-      _G_count=`expr $_G_count + 1`
-      if test "$_G_count" -gt "$_G_path_prog_max"; then
-        # Best one so far, save it but keep looking for a better one
-        func_check_prog_result=$_G_path_prog
-        _G_path_prog_max=$_G_count
-      fi
-      # 10*(2^10) chars as input seems more than enough
-      test 10 -lt "$_G_count" && break
-    done
-    rm -f conftest.in conftest.tmp conftest.nl conftest.out
-  }
-
-  func_path_progs "grep ggrep" func_check_prog_grep "$PATH:/usr/xpg4/bin"
-  GREP=$func_path_progs_result
-}
-
-
-## ------------------------------- ##
-## User overridable command paths. ##
-## ------------------------------- ##
-
-# All uppercase variable names are used for environment variables.  These
-# variables can be overridden by the user before calling a script that
-# uses them if a suitable command of that name is not already available
-# in the command search PATH.
-
-: ${CP="cp -f"}
-: ${ECHO="printf %s\n"}
-: ${EGREP="$GREP -E"}
-: ${FGREP="$GREP -F"}
-: ${LN_S="ln -s"}
-: ${MAKE="make"}
-: ${MKDIR="mkdir"}
-: ${MV="mv -f"}
-: ${RM="rm -f"}
-: ${SHELL="${CONFIG_SHELL-/bin/sh}"}
-
-
-## -------------------- ##
-## Useful sed snippets. ##
-## -------------------- ##
-
-sed_dirname='s|/[^/]*$||'
-sed_basename='s|^.*/||'
-
-# Sed substitution that helps us do robust quoting.  It backslashifies
-# metacharacters that are still active within double-quoted strings.
-sed_quote_subst='s|\([`"$\\]\)|\\\1|g'
-
-# Same as above, but do not quote variable references.
-sed_double_quote_subst='s/\(["`\\]\)/\\\1/g'
-
-# Sed substitution that turns a string into a regex matching for the
-# string literally.
-sed_make_literal_regex='s|[].[^$\\*\/]|\\&|g'
-
-# Sed substitution that converts a w32 file name or path
-# that contains forward slashes, into one that contains
-# (escaped) backslashes.  A very naive implementation.
-sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g'
-
-# Re-'\' parameter expansions in output of sed_double_quote_subst that
-# were '\'-ed in input to the same.  If an odd number of '\' preceded a
-# '$' in input to sed_double_quote_subst, that '$' was protected from
-# expansion.  Since each input '\' is now two '\'s, look for any number
-# of runs of four '\'s followed by two '\'s and then a '$'.  '\' that '$'.
-_G_bs='\\'
-_G_bs2='\\\\'
-_G_bs4='\\\\\\\\'
-_G_dollar='\$'
-sed_double_backslash="\
-  s/$_G_bs4/&\\
-/g
-  s/^$_G_bs2$_G_dollar/$_G_bs&/
-  s/\\([^$_G_bs]\\)$_G_bs2$_G_dollar/\\1$_G_bs2$_G_bs$_G_dollar/g
-  s/\n//g"
-
-
-## ----------------- ##
-## Global variables. ##
-## ----------------- ##
-
-# Except for the global variables explicitly listed below, the following
-# functions in the '^func_' namespace, and the '^require_' namespace
-# variables initialised in the 'Resource management' section, sourcing
-# this file will not pollute your global namespace with anything
-# else. There's no portable way to scope variables in Bourne shell
-# though, so actually running these functions will sometimes place
-# results into a variable named after the function, and often use
-# temporary variables in the '^_G_' namespace. If you are careful to
-# avoid using those namespaces casually in your sourcing script, things
-# should continue to work as you expect. And, of course, you can freely
-# overwrite any of the functions or variables defined here before
-# calling anything to customize them.
-
-EXIT_SUCCESS=0
-EXIT_FAILURE=1
-EXIT_MISMATCH=63  # $? = 63 is used to indicate version mismatch to missing.
-EXIT_SKIP=77	  # $? = 77 is used to indicate a skipped test to automake.
-
-# Allow overriding, eg assuming that you follow the convention of
-# putting '$debug_cmd' at the start of all your functions, you can get
-# bash to show function call trace with:
-#
-#    debug_cmd='eval echo "${FUNCNAME[0]} $*" >&2' bash your-script-name
-debug_cmd=${debug_cmd-":"}
-exit_cmd=:
-
-# By convention, finish your script with:
-#
-#    exit $exit_status
-#
-# so that you can set exit_status to non-zero if you want to indicate
-# something went wrong during execution without actually bailing out at
-# the point of failure.
-exit_status=$EXIT_SUCCESS
-
-# Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh
-# is ksh but when the shell is invoked as "sh" and the current value of
-# the _XPG environment variable is not equal to 1 (one), the special
-# positional parameter $0, within a function call, is the name of the
-# function.
-progpath=$0
-
-# The name of this program.
-progname=`$ECHO "$progpath" |$SED "$sed_basename"`
-
-# Make sure we have an absolute progpath for reexecution:
-case $progpath in
-  [\\/]*|[A-Za-z]:\\*) ;;
-  *[\\/]*)
-     progdir=`$ECHO "$progpath" |$SED "$sed_dirname"`
-     progdir=`cd "$progdir" && pwd`
-     progpath=$progdir/$progname
-     ;;
-  *)
-     _G_IFS=$IFS
-     IFS=${PATH_SEPARATOR-:}
-     for progdir in $PATH; do
-       IFS=$_G_IFS
-       test -x "$progdir/$progname" && break
-     done
-     IFS=$_G_IFS
-     test -n "$progdir" || progdir=`pwd`
-     progpath=$progdir/$progname
-     ;;
-esac
-
-
-## ----------------- ##
-## Standard options. ##
-## ----------------- ##
-
-# The following options affect the operation of the functions defined
-# below, and should be set appropriately depending on run-time para-
-# meters passed on the command line.
-
-opt_dry_run=false
-opt_quiet=false
-opt_verbose=false
-
-# Categories 'all' and 'none' are always available.  Append any others
-# you will pass as the first argument to func_warning from your own
-# code.
-warning_categories=
-
-# By default, display warnings according to 'opt_warning_types'.  Set
-# 'warning_func'  to ':' to elide all warnings, or func_fatal_error to
-# treat the next displayed warning as a fatal error.
-warning_func=func_warn_and_continue
-
-# Set to 'all' to display all warnings, 'none' to suppress all
-# warnings, or a space delimited list of some subset of
-# 'warning_categories' to display only the listed warnings.
-opt_warning_types=all
-
-
-## -------------------- ##
-## Resource management. ##
-## -------------------- ##
-
-# This section contains definitions for functions that each ensure a
-# particular resource (a file, or a non-empty configuration variable for
-# example) is available, and if appropriate to extract default values
-# from pertinent package files. Call them using their associated
-# 'require_*' variable to ensure that they are executed, at most, once.
-#
-# It's entirely deliberate that calling these functions can set
-# variables that don't obey the namespace limitations obeyed by the rest
-# of this file, in order that that they be as useful as possible to
-# callers.
-
-
-# require_term_colors
-# -------------------
-# Allow display of bold text on terminals that support it.
-require_term_colors=func_require_term_colors
-func_require_term_colors ()
-{
-    $debug_cmd
-
-    test -t 1 && {
-      # COLORTERM and USE_ANSI_COLORS environment variables take
-      # precedence, because most terminfo databases neglect to describe
-      # whether color sequences are supported.
-      test -n "${COLORTERM+set}" && : ${USE_ANSI_COLORS="1"}
-
-      if test 1 = "$USE_ANSI_COLORS"; then
-        # Standard ANSI escape sequences
-        tc_reset=''
-        tc_bold='';   tc_standout=''
-        tc_red='';   tc_green=''
-        tc_blue='';  tc_cyan=''
-      else
-        # Otherwise trust the terminfo database after all.
-        test -n "`tput sgr0 2>/dev/null`" && {
-          tc_reset=`tput sgr0`
-          test -n "`tput bold 2>/dev/null`" && tc_bold=`tput bold`
-          tc_standout=$tc_bold
-          test -n "`tput smso 2>/dev/null`" && tc_standout=`tput smso`
-          test -n "`tput setaf 1 2>/dev/null`" && tc_red=`tput setaf 1`
-          test -n "`tput setaf 2 2>/dev/null`" && tc_green=`tput setaf 2`
-          test -n "`tput setaf 4 2>/dev/null`" && tc_blue=`tput setaf 4`
-          test -n "`tput setaf 5 2>/dev/null`" && tc_cyan=`tput setaf 5`
-        }
-      fi
-    }
-
-    require_term_colors=:
-}
-
-
-## ----------------- ##
-## Function library. ##
-## ----------------- ##
-
-# This section contains a variety of useful functions to call in your
-# scripts. Take note of the portable wrappers for features provided by
-# some modern shells, which will fall back to slower equivalents on
-# less featureful shells.
-
-
-# func_append VAR VALUE
-# ---------------------
-# Append VALUE onto the existing contents of VAR.
-
-  # We should try to minimise forks, especially on Windows where they are
-  # unreasonably slow, so skip the feature probes when bash or zsh are
-  # being used:
-  if test set = "${BASH_VERSION+set}${ZSH_VERSION+set}"; then
-    : ${_G_HAVE_ARITH_OP="yes"}
-    : ${_G_HAVE_XSI_OPS="yes"}
-    # The += operator was introduced in bash 3.1
-    case $BASH_VERSION in
-      [12].* | 3.0 | 3.0*) ;;
-      *)
-        : ${_G_HAVE_PLUSEQ_OP="yes"}
-        ;;
-    esac
-  fi
-
-  # _G_HAVE_PLUSEQ_OP
-  # Can be empty, in which case the shell is probed, "yes" if += is
-  # useable or anything else if it does not work.
-  test -z "$_G_HAVE_PLUSEQ_OP" \
-    && (eval 'x=a; x+=" b"; test "a b" = "$x"') 2>/dev/null \
-    && _G_HAVE_PLUSEQ_OP=yes
-
-if test yes = "$_G_HAVE_PLUSEQ_OP"
-then
-  # This is an XSI compatible shell, allowing a faster implementation...
-  eval 'func_append ()
-  {
-    $debug_cmd
-
-    eval "$1+=\$2"
-  }'
-else
-  # ...otherwise fall back to using expr, which is often a shell builtin.
-  func_append ()
-  {
-    $debug_cmd
-
-    eval "$1=\$$1\$2"
-  }
-fi
-
-
-# func_append_quoted VAR VALUE
-# ----------------------------
-# Quote VALUE and append to the end of shell variable VAR, separated
-# by a space.
-if test yes = "$_G_HAVE_PLUSEQ_OP"; then
-  eval 'func_append_quoted ()
-  {
-    $debug_cmd
-
-    func_quote_arg pretty "$2"
-    eval "$1+=\\ \$func_quote_arg_result"
-  }'
-else
-  func_append_quoted ()
-  {
-    $debug_cmd
-
-    func_quote_arg pretty "$2"
-    eval "$1=\$$1\\ \$func_quote_arg_result"
-  }
-fi
-
-
-# func_append_uniq VAR VALUE
-# --------------------------
-# Append unique VALUE onto the existing contents of VAR, assuming
-# entries are delimited by the first character of VALUE.  For example:
-#
-#   func_append_uniq options " --another-option option-argument"
-#
-# will only append to $options if " --another-option option-argument "
-# is not already present somewhere in $options already (note spaces at
-# each end implied by leading space in second argument).
-func_append_uniq ()
-{
-    $debug_cmd
-
-    eval _G_current_value='`$ECHO $'$1'`'
-    _G_delim=`expr "$2" : '\(.\)'`
-
-    case $_G_delim$_G_current_value$_G_delim in
-      *"$2$_G_delim"*) ;;
-      *) func_append "$@" ;;
-    esac
-}
-
-
-# func_arith TERM...
-# ------------------
-# Set func_arith_result to the result of evaluating TERMs.
-  test -z "$_G_HAVE_ARITH_OP" \
-    && (eval 'test 2 = $(( 1 + 1 ))') 2>/dev/null \
-    && _G_HAVE_ARITH_OP=yes
-
-if test yes = "$_G_HAVE_ARITH_OP"; then
-  eval 'func_arith ()
-  {
-    $debug_cmd
-
-    func_arith_result=$(( $* ))
-  }'
-else
-  func_arith ()
-  {
-    $debug_cmd
-
-    func_arith_result=`expr "$@"`
-  }
-fi
-
-
-# func_basename FILE
-# ------------------
-# Set func_basename_result to FILE with everything up to and including
-# the last / stripped.
-if test yes = "$_G_HAVE_XSI_OPS"; then
-  # If this shell supports suffix pattern removal, then use it to avoid
-  # forking. Hide the definitions single quotes in case the shell chokes
-  # on unsupported syntax...
-  _b='func_basename_result=${1##*/}'
-  _d='case $1 in
-        */*) func_dirname_result=${1%/*}$2 ;;
-        *  ) func_dirname_result=$3        ;;
-      esac'
-
-else
-  # ...otherwise fall back to using sed.
-  _b='func_basename_result=`$ECHO "$1" |$SED "$sed_basename"`'
-  _d='func_dirname_result=`$ECHO "$1"  |$SED "$sed_dirname"`
-      if test "X$func_dirname_result" = "X$1"; then
-        func_dirname_result=$3
-      else
-        func_append func_dirname_result "$2"
-      fi'
-fi
-
-eval 'func_basename ()
-{
-    $debug_cmd
-
-    '"$_b"'
-}'
-
-
-# func_dirname FILE APPEND NONDIR_REPLACEMENT
-# -------------------------------------------
-# Compute the dirname of FILE.  If nonempty, add APPEND to the result,
-# otherwise set result to NONDIR_REPLACEMENT.
-eval 'func_dirname ()
-{
-    $debug_cmd
-
-    '"$_d"'
-}'
-
-
-# func_dirname_and_basename FILE APPEND NONDIR_REPLACEMENT
-# --------------------------------------------------------
-# Perform func_basename and func_dirname in a single function
-# call:
-#   dirname:  Compute the dirname of FILE.  If nonempty,
-#             add APPEND to the result, otherwise set result
-#             to NONDIR_REPLACEMENT.
-#             value returned in "$func_dirname_result"
-#   basename: Compute filename of FILE.
-#             value retuned in "$func_basename_result"
-# For efficiency, we do not delegate to the functions above but instead
-# duplicate the functionality here.
-eval 'func_dirname_and_basename ()
-{
-    $debug_cmd
-
-    '"$_b"'
-    '"$_d"'
-}'
-
-
-# func_echo ARG...
-# ----------------
-# Echo program name prefixed message.
-func_echo ()
-{
-    $debug_cmd
-
-    _G_message=$*
-
-    func_echo_IFS=$IFS
-    IFS=$nl
-    for _G_line in $_G_message; do
-      IFS=$func_echo_IFS
-      $ECHO "$progname: $_G_line"
-    done
-    IFS=$func_echo_IFS
-}
-
-
-# func_echo_all ARG...
-# --------------------
-# Invoke $ECHO with all args, space-separated.
-func_echo_all ()
-{
-    $ECHO "$*"
-}
-
-
-# func_echo_infix_1 INFIX ARG...
-# ------------------------------
-# Echo program name, followed by INFIX on the first line, with any
-# additional lines not showing INFIX.
-func_echo_infix_1 ()
-{
-    $debug_cmd
-
-    $require_term_colors
-
-    _G_infix=$1; shift
-    _G_indent=$_G_infix
-    _G_prefix="$progname: $_G_infix: "
-    _G_message=$*
-
-    # Strip color escape sequences before counting printable length
-    for _G_tc in "$tc_reset" "$tc_bold" "$tc_standout" "$tc_red" "$tc_green" "$tc_blue" "$tc_cyan"
-    do
-      test -n "$_G_tc" && {
-        _G_esc_tc=`$ECHO "$_G_tc" | $SED "$sed_make_literal_regex"`
-        _G_indent=`$ECHO "$_G_indent" | $SED "s|$_G_esc_tc||g"`
-      }
-    done
-    _G_indent="$progname: "`echo "$_G_indent" | $SED 's|.| |g'`"  " ## exclude from sc_prohibit_nested_quotes
-
-    func_echo_infix_1_IFS=$IFS
-    IFS=$nl
-    for _G_line in $_G_message; do
-      IFS=$func_echo_infix_1_IFS
-      $ECHO "$_G_prefix$tc_bold$_G_line$tc_reset" >&2
-      _G_prefix=$_G_indent
-    done
-    IFS=$func_echo_infix_1_IFS
-}
-
-
-# func_error ARG...
-# -----------------
-# Echo program name prefixed message to standard error.
-func_error ()
-{
-    $debug_cmd
-
-    $require_term_colors
-
-    func_echo_infix_1 "  $tc_standout${tc_red}error$tc_reset" "$*" >&2
-}
-
-
-# func_fatal_error ARG...
-# -----------------------
-# Echo program name prefixed message to standard error, and exit.
-func_fatal_error ()
-{
-    $debug_cmd
-
-    func_error "$*"
-    exit $EXIT_FAILURE
-}
-
-
-# func_grep EXPRESSION FILENAME
-# -----------------------------
-# Check whether EXPRESSION matches any line of FILENAME, without output.
-func_grep ()
-{
-    $debug_cmd
-
-    $GREP "$1" "$2" >/dev/null 2>&1
-}
-
-
-# func_len STRING
-# ---------------
-# Set func_len_result to the length of STRING. STRING may not
-# start with a hyphen.
-  test -z "$_G_HAVE_XSI_OPS" \
-    && (eval 'x=a/b/c;
-      test 5aa/bb/cc = "${#x}${x%%/*}${x%/*}${x#*/}${x##*/}"') 2>/dev/null \
-    && _G_HAVE_XSI_OPS=yes
-
-if test yes = "$_G_HAVE_XSI_OPS"; then
-  eval 'func_len ()
-  {
-    $debug_cmd
-
-    func_len_result=${#1}
-  }'
-else
-  func_len ()
-  {
-    $debug_cmd
-
-    func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len`
-  }
-fi
-
-
-# func_mkdir_p DIRECTORY-PATH
-# ---------------------------
-# Make sure the entire path to DIRECTORY-PATH is available.
-func_mkdir_p ()
-{
-    $debug_cmd
-
-    _G_directory_path=$1
-    _G_dir_list=
-
-    if test -n "$_G_directory_path" && test : != "$opt_dry_run"; then
-
-      # Protect directory names starting with '-'
-      case $_G_directory_path in
-        -*) _G_directory_path=./$_G_directory_path ;;
-      esac
-
-      # While some portion of DIR does not yet exist...
-      while test ! -d "$_G_directory_path"; do
-        # ...make a list in topmost first order.  Use a colon delimited
-	# list incase some portion of path contains whitespace.
-        _G_dir_list=$_G_directory_path:$_G_dir_list
-
-        # If the last portion added has no slash in it, the list is done
-        case $_G_directory_path in */*) ;; *) break ;; esac
-
-        # ...otherwise throw away the child directory and loop
-        _G_directory_path=`$ECHO "$_G_directory_path" | $SED -e "$sed_dirname"`
-      done
-      _G_dir_list=`$ECHO "$_G_dir_list" | $SED 's|:*$||'`
-
-      func_mkdir_p_IFS=$IFS; IFS=:
-      for _G_dir in $_G_dir_list; do
-	IFS=$func_mkdir_p_IFS
-        # mkdir can fail with a 'File exist' error if two processes
-        # try to create one of the directories concurrently.  Don't
-        # stop in that case!
-        $MKDIR "$_G_dir" 2>/dev/null || :
-      done
-      IFS=$func_mkdir_p_IFS
-
-      # Bail out if we (or some other process) failed to create a directory.
-      test -d "$_G_directory_path" || \
-        func_fatal_error "Failed to create '$1'"
-    fi
-}
-
-
-# func_mktempdir [BASENAME]
-# -------------------------
-# Make a temporary directory that won't clash with other running
-# libtool processes, and avoids race conditions if possible.  If
-# given, BASENAME is the basename for that directory.
-func_mktempdir ()
-{
-    $debug_cmd
-
-    _G_template=${TMPDIR-/tmp}/${1-$progname}
-
-    if test : = "$opt_dry_run"; then
-      # Return a directory name, but don't create it in dry-run mode
-      _G_tmpdir=$_G_template-$$
-    else
-
-      # If mktemp works, use that first and foremost
-      _G_tmpdir=`mktemp -d "$_G_template-XXXXXXXX" 2>/dev/null`
-
-      if test ! -d "$_G_tmpdir"; then
-        # Failing that, at least try and use $RANDOM to avoid a race
-        _G_tmpdir=$_G_template-${RANDOM-0}$$
-
-        func_mktempdir_umask=`umask`
-        umask 0077
-        $MKDIR "$_G_tmpdir"
-        umask $func_mktempdir_umask
-      fi
-
-      # If we're not in dry-run mode, bomb out on failure
-      test -d "$_G_tmpdir" || \
-        func_fatal_error "cannot create temporary directory '$_G_tmpdir'"
-    fi
-
-    $ECHO "$_G_tmpdir"
-}
-
-
-# func_normal_abspath PATH
-# ------------------------
-# Remove doubled-up and trailing slashes, "." path components,
-# and cancel out any ".." path components in PATH after making
-# it an absolute path.
-func_normal_abspath ()
-{
-    $debug_cmd
-
-    # These SED scripts presuppose an absolute path with a trailing slash.
-    _G_pathcar='s|^/\([^/]*\).*$|\1|'
-    _G_pathcdr='s|^/[^/]*||'
-    _G_removedotparts=':dotsl
-		s|/\./|/|g
-		t dotsl
-		s|/\.$|/|'
-    _G_collapseslashes='s|/\{1,\}|/|g'
-    _G_finalslash='s|/*$|/|'
-
-    # Start from root dir and reassemble the path.
-    func_normal_abspath_result=
-    func_normal_abspath_tpath=$1
-    func_normal_abspath_altnamespace=
-    case $func_normal_abspath_tpath in
-      "")
-        # Empty path, that just means $cwd.
-        func_stripname '' '/' "`pwd`"
-        func_normal_abspath_result=$func_stripname_result
-        return
-        ;;
-      # The next three entries are used to spot a run of precisely
-      # two leading slashes without using negated character classes;
-      # we take advantage of case's first-match behaviour.
-      ///*)
-        # Unusual form of absolute path, do nothing.
-        ;;
-      //*)
-        # Not necessarily an ordinary path; POSIX reserves leading '//'
-        # and for example Cygwin uses it to access remote file shares
-        # over CIFS/SMB, so we conserve a leading double slash if found.
-        func_normal_abspath_altnamespace=/
-        ;;
-      /*)
-        # Absolute path, do nothing.
-        ;;
-      *)
-        # Relative path, prepend $cwd.
-        func_normal_abspath_tpath=`pwd`/$func_normal_abspath_tpath
-        ;;
-    esac
-
-    # Cancel out all the simple stuff to save iterations.  We also want
-    # the path to end with a slash for ease of parsing, so make sure
-    # there is one (and only one) here.
-    func_normal_abspath_tpath=`$ECHO "$func_normal_abspath_tpath" | $SED \
-          -e "$_G_removedotparts" -e "$_G_collapseslashes" -e "$_G_finalslash"`
-    while :; do
-      # Processed it all yet?
-      if test / = "$func_normal_abspath_tpath"; then
-        # If we ascended to the root using ".." the result may be empty now.
-        if test -z "$func_normal_abspath_result"; then
-          func_normal_abspath_result=/
-        fi
-        break
-      fi
-      func_normal_abspath_tcomponent=`$ECHO "$func_normal_abspath_tpath" | $SED \
-          -e "$_G_pathcar"`
-      func_normal_abspath_tpath=`$ECHO "$func_normal_abspath_tpath" | $SED \
-          -e "$_G_pathcdr"`
-      # Figure out what to do with it
-      case $func_normal_abspath_tcomponent in
-        "")
-          # Trailing empty path component, ignore it.
-          ;;
-        ..)
-          # Parent dir; strip last assembled component from result.
-          func_dirname "$func_normal_abspath_result"
-          func_normal_abspath_result=$func_dirname_result
-          ;;
-        *)
-          # Actual path component, append it.
-          func_append func_normal_abspath_result "/$func_normal_abspath_tcomponent"
-          ;;
-      esac
-    done
-    # Restore leading double-slash if one was found on entry.
-    func_normal_abspath_result=$func_normal_abspath_altnamespace$func_normal_abspath_result
-}
-
-
-# func_notquiet ARG...
-# --------------------
-# Echo program name prefixed message only when not in quiet mode.
-func_notquiet ()
-{
-    $debug_cmd
-
-    $opt_quiet || func_echo ${1+"$@"}
-
-    # A bug in bash halts the script if the last line of a function
-    # fails when set -e is in force, so we need another command to
-    # work around that:
-    :
-}
-
-
-# func_relative_path SRCDIR DSTDIR
-# --------------------------------
-# Set func_relative_path_result to the relative path from SRCDIR to DSTDIR.
-func_relative_path ()
-{
-    $debug_cmd
-
-    func_relative_path_result=
-    func_normal_abspath "$1"
-    func_relative_path_tlibdir=$func_normal_abspath_result
-    func_normal_abspath "$2"
-    func_relative_path_tbindir=$func_normal_abspath_result
-
-    # Ascend the tree starting from libdir
-    while :; do
-      # check if we have found a prefix of bindir
-      case $func_relative_path_tbindir in
-        $func_relative_path_tlibdir)
-          # found an exact match
-          func_relative_path_tcancelled=
-          break
-          ;;
-        $func_relative_path_tlibdir*)
-          # found a matching prefix
-          func_stripname "$func_relative_path_tlibdir" '' "$func_relative_path_tbindir"
-          func_relative_path_tcancelled=$func_stripname_result
-          if test -z "$func_relative_path_result"; then
-            func_relative_path_result=.
-          fi
-          break
-          ;;
-        *)
-          func_dirname $func_relative_path_tlibdir
-          func_relative_path_tlibdir=$func_dirname_result
-          if test -z "$func_relative_path_tlibdir"; then
-            # Have to descend all the way to the root!
-            func_relative_path_result=../$func_relative_path_result
-            func_relative_path_tcancelled=$func_relative_path_tbindir
-            break
-          fi
-          func_relative_path_result=../$func_relative_path_result
-          ;;
-      esac
-    done
-
-    # Now calculate path; take care to avoid doubling-up slashes.
-    func_stripname '' '/' "$func_relative_path_result"
-    func_relative_path_result=$func_stripname_result
-    func_stripname '/' '/' "$func_relative_path_tcancelled"
-    if test -n "$func_stripname_result"; then
-      func_append func_relative_path_result "/$func_stripname_result"
-    fi
-
-    # Normalisation. If bindir is libdir, return '.' else relative path.
-    if test -n "$func_relative_path_result"; then
-      func_stripname './' '' "$func_relative_path_result"
-      func_relative_path_result=$func_stripname_result
-    fi
-
-    test -n "$func_relative_path_result" || func_relative_path_result=.
-
-    :
-}
-
-
-# func_quote_portable EVAL ARG
-# ----------------------------
-# Internal function to portably implement func_quote_arg.  Note that we still
-# keep attention to performance here so we as much as possible try to avoid
-# calling sed binary (so far O(N) complexity as long as func_append is O(1)).
-func_quote_portable ()
-{
-    $debug_cmd
-
-    func_quote_portable_result=$2
-
-    # one-time-loop (easy break)
-    while true
-    do
-      if $1; then
-        func_quote_portable_result=`$ECHO "$2" | $SED \
-          -e "$sed_double_quote_subst" -e "$sed_double_backslash"`
-        break
-      fi
-
-      # Quote for eval.
-      case $func_quote_portable_result in
-        *[\\\`\"\$]*)
-          case $func_quote_portable_result in
-            *[\[\*\?]*)
-              func_quote_portable_result=`$ECHO "$func_quote_portable_result" \
-                  | $SED "$sed_quote_subst"`
-              break
-              ;;
-          esac
-
-          func_quote_portable_old_IFS=$IFS
-          for _G_char in '\' '`' '"' '$'
-          do
-            # STATE($1) PREV($2) SEPARATOR($3)
-            set start "" ""
-            func_quote_portable_result=dummy"$_G_char$func_quote_portable_result$_G_char"dummy
-            IFS=$_G_char
-            for _G_part in $func_quote_portable_result
-            do
-              case $1 in
-              quote)
-                func_append func_quote_portable_result "$3$2"
-                set quote "$_G_part" "\\$_G_char"
-                ;;
-              start)
-                set first "" ""
-                func_quote_portable_result=
-                ;;
-              first)
-                set quote "$_G_part" ""
-                ;;
-              esac
-            done
-          done
-          IFS=$func_quote_portable_old_IFS
-          ;;
-        *) ;;
-      esac
-      break
-    done
-
-    func_quote_portable_unquoted_result=$func_quote_portable_result
-    case $func_quote_portable_result in
-      # double-quote args containing shell metacharacters to delay
-      # word splitting, command substitution and variable expansion
-      # for a subsequent eval.
-      # many bourne shells cannot handle close brackets correctly
-      # in scan sets, so we specify it separately.
-      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-        func_quote_portable_result=\"$func_quote_portable_result\"
-        ;;
-    esac
-}
-
-
-# func_quotefast_eval ARG
-# -----------------------
-# Quote one ARG (internal).  This is equivalent to 'func_quote_arg eval ARG',
-# but optimized for speed.  Result is stored in $func_quotefast_eval.
-if test xyes = `(x=; printf -v x %q yes; echo x"$x") 2>/dev/null`; then
-  printf -v _GL_test_printf_tilde %q '~'
-  if test '\~' = "$_GL_test_printf_tilde"; then
-    func_quotefast_eval ()
-    {
-      printf -v func_quotefast_eval_result %q "$1"
-    }
-  else
-    # Broken older Bash implementations.  Make those faster too if possible.
-    func_quotefast_eval ()
-    {
-      case $1 in
-        '~'*)
-          func_quote_portable false "$1"
-          func_quotefast_eval_result=$func_quote_portable_result
-          ;;
-        *)
-          printf -v func_quotefast_eval_result %q "$1"
-          ;;
-      esac
-    }
-  fi
-else
-  func_quotefast_eval ()
-  {
-    func_quote_portable false "$1"
-    func_quotefast_eval_result=$func_quote_portable_result
-  }
-fi
-
-
-# func_quote_arg MODEs ARG
-# ------------------------
-# Quote one ARG to be evaled later.  MODEs argument may contain zero or more
-# specifiers listed below separated by ',' character.  This function returns two
-# values:
-#   i) func_quote_arg_result
-#      double-quoted (when needed), suitable for a subsequent eval
-#  ii) func_quote_arg_unquoted_result
-#      has all characters that are still active within double
-#      quotes backslashified.  Available only if 'unquoted' is specified.
-#
-# Available modes:
-# ----------------
-# 'eval' (default)
-#       - escape shell special characters
-# 'expand'
-#       - the same as 'eval';  but do not quote variable references
-# 'pretty'
-#       - request aesthetic output, i.e. '"a b"' instead of 'a\ b'.  This might
-#         be used later in func_quote to get output like: 'echo "a b"' instead
-#         of 'echo a\ b'.  This is slower than default on some shells.
-# 'unquoted'
-#       - produce also $func_quote_arg_unquoted_result which does not contain
-#         wrapping double-quotes.
-#
-# Examples for 'func_quote_arg pretty,unquoted string':
-#
-#   string      | *_result              | *_unquoted_result
-#   ------------+-----------------------+-------------------
-#   "           | \"                    | \"
-#   a b         | "a b"                 | a b
-#   "a b"       | "\"a b\""             | \"a b\"
-#   *           | "*"                   | *
-#   z="${x-$y}" | "z=\"\${x-\$y}\""     | z=\"\${x-\$y}\"
-#
-# Examples for 'func_quote_arg pretty,unquoted,expand string':
-#
-#   string        |   *_result          |  *_unquoted_result
-#   --------------+---------------------+--------------------
-#   z="${x-$y}"   | "z=\"${x-$y}\""     | z=\"${x-$y}\"
-func_quote_arg ()
-{
-    _G_quote_expand=false
-    case ,$1, in
-      *,expand,*)
-        _G_quote_expand=:
-        ;;
-    esac
-
-    case ,$1, in
-      *,pretty,*|*,expand,*|*,unquoted,*)
-        func_quote_portable $_G_quote_expand "$2"
-        func_quote_arg_result=$func_quote_portable_result
-        func_quote_arg_unquoted_result=$func_quote_portable_unquoted_result
-        ;;
-      *)
-        # Faster quote-for-eval for some shells.
-        func_quotefast_eval "$2"
-        func_quote_arg_result=$func_quotefast_eval_result
-        ;;
-    esac
-}
-
-
-# func_quote MODEs ARGs...
-# ------------------------
-# Quote all ARGs to be evaled later and join them into single command.  See
-# func_quote_arg's description for more info.
-func_quote ()
-{
-    $debug_cmd
-    _G_func_quote_mode=$1 ; shift
-    func_quote_result=
-    while test 0 -lt $#; do
-      func_quote_arg "$_G_func_quote_mode" "$1"
-      if test -n "$func_quote_result"; then
-        func_append func_quote_result " $func_quote_arg_result"
-      else
-        func_append func_quote_result "$func_quote_arg_result"
-      fi
-      shift
-    done
-}
-
-
-# func_stripname PREFIX SUFFIX NAME
-# ---------------------------------
-# strip PREFIX and SUFFIX from NAME, and store in func_stripname_result.
-# PREFIX and SUFFIX must not contain globbing or regex special
-# characters, hashes, percent signs, but SUFFIX may contain a leading
-# dot (in which case that matches only a dot).
-if test yes = "$_G_HAVE_XSI_OPS"; then
-  eval 'func_stripname ()
-  {
-    $debug_cmd
-
-    # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
-    # positional parameters, so assign one to ordinary variable first.
-    func_stripname_result=$3
-    func_stripname_result=${func_stripname_result#"$1"}
-    func_stripname_result=${func_stripname_result%"$2"}
-  }'
-else
-  func_stripname ()
-  {
-    $debug_cmd
-
-    case $2 in
-      .*) func_stripname_result=`$ECHO "$3" | $SED -e "s%^$1%%" -e "s%\\\\$2\$%%"`;;
-      *)  func_stripname_result=`$ECHO "$3" | $SED -e "s%^$1%%" -e "s%$2\$%%"`;;
-    esac
-  }
-fi
-
-
-# func_show_eval CMD [FAIL_EXP]
-# -----------------------------
-# Unless opt_quiet is true, then output CMD.  Then, if opt_dryrun is
-# not true, evaluate CMD.  If the evaluation of CMD fails, and FAIL_EXP
-# is given, then evaluate it.
-func_show_eval ()
-{
-    $debug_cmd
-
-    _G_cmd=$1
-    _G_fail_exp=${2-':'}
-
-    func_quote_arg pretty,expand "$_G_cmd"
-    eval "func_notquiet $func_quote_arg_result"
-
-    $opt_dry_run || {
-      eval "$_G_cmd"
-      _G_status=$?
-      if test 0 -ne "$_G_status"; then
-	eval "(exit $_G_status); $_G_fail_exp"
-      fi
-    }
-}
-
-
-# func_show_eval_locale CMD [FAIL_EXP]
-# ------------------------------------
-# Unless opt_quiet is true, then output CMD.  Then, if opt_dryrun is
-# not true, evaluate CMD.  If the evaluation of CMD fails, and FAIL_EXP
-# is given, then evaluate it.  Use the saved locale for evaluation.
-func_show_eval_locale ()
-{
-    $debug_cmd
-
-    _G_cmd=$1
-    _G_fail_exp=${2-':'}
-
-    $opt_quiet || {
-      func_quote_arg expand,pretty "$_G_cmd"
-      eval "func_echo $func_quote_arg_result"
-    }
-
-    $opt_dry_run || {
-      eval "$_G_user_locale
-	    $_G_cmd"
-      _G_status=$?
-      eval "$_G_safe_locale"
-      if test 0 -ne "$_G_status"; then
-	eval "(exit $_G_status); $_G_fail_exp"
-      fi
-    }
-}
-
-
-# func_tr_sh
-# ----------
-# Turn $1 into a string suitable for a shell variable name.
-# Result is stored in $func_tr_sh_result.  All characters
-# not in the set a-zA-Z0-9_ are replaced with '_'. Further,
-# if $1 begins with a digit, a '_' is prepended as well.
-func_tr_sh ()
-{
-    $debug_cmd
-
-    case $1 in
-    [0-9]* | *[!a-zA-Z0-9_]*)
-      func_tr_sh_result=`$ECHO "$1" | $SED -e 's/^\([0-9]\)/_\1/' -e 's/[^a-zA-Z0-9_]/_/g'`
-      ;;
-    * )
-      func_tr_sh_result=$1
-      ;;
-    esac
-}
-
-
-# func_verbose ARG...
-# -------------------
-# Echo program name prefixed message in verbose mode only.
-func_verbose ()
-{
-    $debug_cmd
-
-    $opt_verbose && func_echo "$*"
-
-    :
-}
-
-
-# func_warn_and_continue ARG...
-# -----------------------------
-# Echo program name prefixed warning message to standard error.
-func_warn_and_continue ()
-{
-    $debug_cmd
-
-    $require_term_colors
-
-    func_echo_infix_1 "${tc_red}warning$tc_reset" "$*" >&2
-}
-
-
-# func_warning CATEGORY ARG...
-# ----------------------------
-# Echo program name prefixed warning message to standard error. Warning
-# messages can be filtered according to CATEGORY, where this function
-# elides messages where CATEGORY is not listed in the global variable
-# 'opt_warning_types'.
-func_warning ()
-{
-    $debug_cmd
-
-    # CATEGORY must be in the warning_categories list!
-    case " $warning_categories " in
-      *" $1 "*) ;;
-      *) func_internal_error "invalid warning category '$1'" ;;
-    esac
-
-    _G_category=$1
-    shift
-
-    case " $opt_warning_types " in
-      *" $_G_category "*) $warning_func ${1+"$@"} ;;
-    esac
-}
-
-
-# func_sort_ver VER1 VER2
-# -----------------------
-# 'sort -V' is not generally available.
-# Note this deviates from the version comparison in automake
-# in that it treats 1.5 < 1.5.0, and treats 1.4.4a < 1.4-p3a
-# but this should suffice as we won't be specifying old
-# version formats or redundant trailing .0 in bootstrap.conf.
-# If we did want full compatibility then we should probably
-# use m4_version_compare from autoconf.
-func_sort_ver ()
-{
-    $debug_cmd
-
-    printf '%s\n%s\n' "$1" "$2" \
-      | sort -t. -k 1,1n -k 2,2n -k 3,3n -k 4,4n -k 5,5n -k 6,6n -k 7,7n -k 8,8n -k 9,9n
-}
-
-# func_lt_ver PREV CURR
-# ---------------------
-# Return true if PREV and CURR are in the correct order according to
-# func_sort_ver, otherwise false.  Use it like this:
-#
-#  func_lt_ver "$prev_ver" "$proposed_ver" || func_fatal_error "..."
-func_lt_ver ()
-{
-    $debug_cmd
-
-    test "x$1" = x`func_sort_ver "$1" "$2" | $SED 1q`
-}
-
-
-# Local variables:
-# mode: shell-script
-# sh-indentation: 2
-# eval: (add-hook 'before-save-hook 'time-stamp)
-# time-stamp-pattern: "10/scriptversion=%:y-%02m-%02d.%02H; # UTC"
-# time-stamp-time-zone: "UTC"
-# End:
-#! /bin/sh
-
-# A portable, pluggable option parser for Bourne shell.
-# Written by Gary V. Vaughan, 2010
-
-# This is free software.  There is NO warranty; not even for
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-#
-# Copyright (C) 2010-2018 Bootstrap Authors
-#
-# This file is dual licensed under the terms of the MIT license
-# <https://opensource.org/license/MIT>, and GPL version 3 or later
-# <http://www.gnu.org/licenses/gpl-2.0.html>.  You must apply one of
-# these licenses when using or redistributing this software or any of
-# the files within it.  See the URLs above, or the file `LICENSE`
-# included in the Bootstrap distribution for the full license texts.
-
-# Please report bugs or propose patches to:
-# <https://github.com/gnulib-modules/bootstrap/issues>
-
-# Set a version string for this script.
-scriptversion=2018-07-24.06; # UTC
-
-
-## ------ ##
-## Usage. ##
-## ------ ##
-
-# This file is a library for parsing options in your shell scripts along
-# with assorted other useful supporting features that you can make use
-# of too.
-#
-# For the simplest scripts you might need only:
-#
-#   #!/bin/sh
-#   . relative/path/to/funclib.sh
-#   . relative/path/to/options-parser
-#   scriptversion=1.0
-#   func_options ${1+"$@"}
-#   eval set dummy "$func_options_result"; shift
-#   ...rest of your script...
-#
-# In order for the '--version' option to work, you will need to have a
-# suitably formatted comment like the one at the top of this file
-# starting with '# Written by ' and ending with '# Copyright'.
-#
-# For '-h' and '--help' to work, you will also need a one line
-# description of your script's purpose in a comment directly above the
-# '# Written by ' line, like the one at the top of this file.
-#
-# The default options also support '--debug', which will turn on shell
-# execution tracing (see the comment above debug_cmd below for another
-# use), and '--verbose' and the func_verbose function to allow your script
-# to display verbose messages only when your user has specified
-# '--verbose'.
-#
-# After sourcing this file, you can plug in processing for additional
-# options by amending the variables from the 'Configuration' section
-# below, and following the instructions in the 'Option parsing'
-# section further down.
-
-## -------------- ##
-## Configuration. ##
-## -------------- ##
-
-# You should override these variables in your script after sourcing this
-# file so that they reflect the customisations you have added to the
-# option parser.
-
-# The usage line for option parsing errors and the start of '-h' and
-# '--help' output messages. You can embed shell variables for delayed
-# expansion at the time the message is displayed, but you will need to
-# quote other shell meta-characters carefully to prevent them being
-# expanded when the contents are evaled.
-usage='$progpath [OPTION]...'
-
-# Short help message in response to '-h' and '--help'.  Add to this or
-# override it after sourcing this library to reflect the full set of
-# options your script accepts.
-usage_message="\
-       --debug        enable verbose shell tracing
-   -W, --warnings=CATEGORY
-                      report the warnings falling in CATEGORY [all]
-   -v, --verbose      verbosely report processing
-       --version      print version information and exit
-   -h, --help         print short or long help message and exit
-"
-
-# Additional text appended to 'usage_message' in response to '--help'.
-long_help_message="
-Warning categories include:
-       'all'          show all warnings
-       'none'         turn off all the warnings
-       'error'        warnings are treated as fatal errors"
-
-# Help message printed before fatal option parsing errors.
-fatal_help="Try '\$progname --help' for more information."
-
-
-
-## ------------------------- ##
-## Hook function management. ##
-## ------------------------- ##
-
-# This section contains functions for adding, removing, and running hooks
-# in the main code.  A hook is just a list of function names that can be
-# run in order later on.
-
-# func_hookable FUNC_NAME
-# -----------------------
-# Declare that FUNC_NAME will run hooks added with
-# 'func_add_hook FUNC_NAME ...'.
-func_hookable ()
-{
-    $debug_cmd
-
-    func_append hookable_fns " $1"
-}
-
-
-# func_add_hook FUNC_NAME HOOK_FUNC
-# ---------------------------------
-# Request that FUNC_NAME call HOOK_FUNC before it returns.  FUNC_NAME must
-# first have been declared "hookable" by a call to 'func_hookable'.
-func_add_hook ()
-{
-    $debug_cmd
-
-    case " $hookable_fns " in
-      *" $1 "*) ;;
-      *) func_fatal_error "'$1' does not accept hook functions." ;;
-    esac
-
-    eval func_append ${1}_hooks '" $2"'
-}
-
-
-# func_remove_hook FUNC_NAME HOOK_FUNC
-# ------------------------------------
-# Remove HOOK_FUNC from the list of hook functions to be called by
-# FUNC_NAME.
-func_remove_hook ()
-{
-    $debug_cmd
-
-    eval ${1}_hooks='`$ECHO "\$'$1'_hooks" |$SED "s| '$2'||"`'
-}
-
-
-# func_propagate_result FUNC_NAME_A FUNC_NAME_B
-# ---------------------------------------------
-# If the *_result variable of FUNC_NAME_A _is set_, assign its value to
-# *_result variable of FUNC_NAME_B.
-func_propagate_result ()
-{
-    $debug_cmd
-
-    func_propagate_result_result=:
-    if eval "test \"\${${1}_result+set}\" = set"
-    then
-      eval "${2}_result=\$${1}_result"
-    else
-      func_propagate_result_result=false
-    fi
-}
-
-
-# func_run_hooks FUNC_NAME [ARG]...
-# ---------------------------------
-# Run all hook functions registered to FUNC_NAME.
-# It's assumed that the list of hook functions contains nothing more
-# than a whitespace-delimited list of legal shell function names, and
-# no effort is wasted trying to catch shell meta-characters or preserve
-# whitespace.
-func_run_hooks ()
-{
-    $debug_cmd
-
-    case " $hookable_fns " in
-      *" $1 "*) ;;
-      *) func_fatal_error "'$1' does not support hook functions." ;;
-    esac
-
-    eval _G_hook_fns=\$$1_hooks; shift
-
-    for _G_hook in $_G_hook_fns; do
-      func_unset "${_G_hook}_result"
-      eval $_G_hook '${1+"$@"}'
-      func_propagate_result $_G_hook func_run_hooks
-      if $func_propagate_result_result; then
-        eval set dummy "$func_run_hooks_result"; shift
-      fi
-    done
-}
-
-
-
-## --------------- ##
-## Option parsing. ##
-## --------------- ##
-
-# In order to add your own option parsing hooks, you must accept the
-# full positional parameter list from your hook function.  You may remove
-# or edit any options that you action, and then pass back the remaining
-# unprocessed options in '<hooked_function_name>_result', escaped
-# suitably for 'eval'.
-#
-# The '<hooked_function_name>_result' variable is automatically unset
-# before your hook gets called; for best performance, only set the
-# *_result variable when necessary (i.e. don't call the 'func_quote'
-# function unnecessarily because it can be an expensive operation on some
-# machines).
-#
-# Like this:
-#
-#    my_options_prep ()
-#    {
-#        $debug_cmd
-#
-#        # Extend the existing usage message.
-#        usage_message=$usage_message'
-#      -s, --silent       don'\''t print informational messages
-#    '
-#        # No change in '$@' (ignored completely by this hook).  Leave
-#        # my_options_prep_result variable intact.
-#    }
-#    func_add_hook func_options_prep my_options_prep
-#
-#
-#    my_silent_option ()
-#    {
-#        $debug_cmd
-#
-#        args_changed=false
-#
-#        # Note that, for efficiency, we parse as many options as we can
-#        # recognise in a loop before passing the remainder back to the
-#        # caller on the first unrecognised argument we encounter.
-#        while test $# -gt 0; do
-#          opt=$1; shift
-#          case $opt in
-#            --silent|-s) opt_silent=:
-#                         args_changed=:
-#                         ;;
-#            # Separate non-argument short options:
-#            -s*)         func_split_short_opt "$_G_opt"
-#                         set dummy "$func_split_short_opt_name" \
-#                             "-$func_split_short_opt_arg" ${1+"$@"}
-#                         shift
-#                         args_changed=:
-#                         ;;
-#            *)           # Make sure the first unrecognised option "$_G_opt"
-#                         # is added back to "$@" in case we need it later,
-#                         # if $args_changed was set to 'true'.
-#                         set dummy "$_G_opt" ${1+"$@"}; shift; break ;;
-#          esac
-#        done
-#
-#        # Only call 'func_quote' here if we processed at least one argument.
-#        if $args_changed; then
-#          func_quote eval ${1+"$@"}
-#          my_silent_option_result=$func_quote_result
-#        fi
-#    }
-#    func_add_hook func_parse_options my_silent_option
-#
-#
-#    my_option_validation ()
-#    {
-#        $debug_cmd
-#
-#        $opt_silent && $opt_verbose && func_fatal_help "\
-#    '--silent' and '--verbose' options are mutually exclusive."
-#    }
-#    func_add_hook func_validate_options my_option_validation
-#
-# You'll also need to manually amend $usage_message to reflect the extra
-# options you parse.  It's preferable to append if you can, so that
-# multiple option parsing hooks can be added safely.
-
-
-# func_options_finish [ARG]...
-# ----------------------------
-# Finishing the option parse loop (call 'func_options' hooks ATM).
-func_options_finish ()
-{
-    $debug_cmd
-
-    func_run_hooks func_options ${1+"$@"}
-    func_propagate_result func_run_hooks func_options_finish
-}
-
-
-# func_options [ARG]...
-# ---------------------
-# All the functions called inside func_options are hookable. See the
-# individual implementations for details.
-func_hookable func_options
-func_options ()
-{
-    $debug_cmd
-
-    _G_options_quoted=false
-
-    for my_func in options_prep parse_options validate_options options_finish
-    do
-      func_unset func_${my_func}_result
-      func_unset func_run_hooks_result
-      eval func_$my_func '${1+"$@"}'
-      func_propagate_result func_$my_func func_options
-      if $func_propagate_result_result; then
-        eval set dummy "$func_options_result"; shift
-        _G_options_quoted=:
-      fi
-    done
-
-    $_G_options_quoted || {
-      # As we (func_options) are top-level options-parser function and
-      # nobody quoted "$@" for us yet, we need to do it explicitly for
-      # caller.
-      func_quote eval ${1+"$@"}
-      func_options_result=$func_quote_result
-    }
-}
-
-
-# func_options_prep [ARG]...
-# --------------------------
-# All initialisations required before starting the option parse loop.
-# Note that when calling hook functions, we pass through the list of
-# positional parameters.  If a hook function modifies that list, and
-# needs to propagate that back to rest of this script, then the complete
-# modified list must be put in 'func_run_hooks_result' before returning.
-func_hookable func_options_prep
-func_options_prep ()
-{
-    $debug_cmd
-
-    # Option defaults:
-    opt_verbose=false
-    opt_warning_types=
-
-    func_run_hooks func_options_prep ${1+"$@"}
-    func_propagate_result func_run_hooks func_options_prep
-}
-
-
-# func_parse_options [ARG]...
-# ---------------------------
-# The main option parsing loop.
-func_hookable func_parse_options
-func_parse_options ()
-{
-    $debug_cmd
-
-    _G_parse_options_requote=false
-    # this just eases exit handling
-    while test $# -gt 0; do
-      # Defer to hook functions for initial option parsing, so they
-      # get priority in the event of reusing an option name.
-      func_run_hooks func_parse_options ${1+"$@"}
-      func_propagate_result func_run_hooks func_parse_options
-      if $func_propagate_result_result; then
-        eval set dummy "$func_parse_options_result"; shift
-        # Even though we may have changed "$@", we passed the "$@" array
-        # down into the hook and it quoted it for us (because we are in
-        # this if-branch).  No need to quote it again.
-        _G_parse_options_requote=false
-      fi
-
-      # Break out of the loop if we already parsed every option.
-      test $# -gt 0 || break
-
-      # We expect that one of the options parsed in this function matches
-      # and thus we remove _G_opt from "$@" and need to re-quote.
-      _G_match_parse_options=:
-      _G_opt=$1
-      shift
-      case $_G_opt in
-        --debug|-x)   debug_cmd='set -x'
-                      func_echo "enabling shell trace mode" >&2
-                      $debug_cmd
-                      ;;
-
-        --no-warnings|--no-warning|--no-warn)
-                      set dummy --warnings none ${1+"$@"}
-                      shift
-		      ;;
-
-        --warnings|--warning|-W)
-                      if test $# = 0 && func_missing_arg $_G_opt; then
-                        _G_parse_options_requote=:
-                        break
-                      fi
-                      case " $warning_categories $1" in
-                        *" $1 "*)
-                          # trailing space prevents matching last $1 above
-                          func_append_uniq opt_warning_types " $1"
-                          ;;
-                        *all)
-                          opt_warning_types=$warning_categories
-                          ;;
-                        *none)
-                          opt_warning_types=none
-                          warning_func=:
-                          ;;
-                        *error)
-                          opt_warning_types=$warning_categories
-                          warning_func=func_fatal_error
-                          ;;
-                        *)
-                          func_fatal_error \
-                             "unsupported warning category: '$1'"
-                          ;;
-                      esac
-                      shift
-                      ;;
-
-        --verbose|-v) opt_verbose=: ;;
-        --version)    func_version ;;
-        -\?|-h)       func_usage ;;
-        --help)       func_help ;;
-
-	# Separate optargs to long options (plugins may need this):
-	--*=*)        func_split_equals "$_G_opt"
-	              set dummy "$func_split_equals_lhs" \
-                          "$func_split_equals_rhs" ${1+"$@"}
-                      shift
-                      ;;
-
-       # Separate optargs to short options:
-        -W*)
-                      func_split_short_opt "$_G_opt"
-                      set dummy "$func_split_short_opt_name" \
-                          "$func_split_short_opt_arg" ${1+"$@"}
-                      shift
-                      ;;
-
-        # Separate non-argument short options:
-        -\?*|-h*|-v*|-x*)
-                      func_split_short_opt "$_G_opt"
-                      set dummy "$func_split_short_opt_name" \
-                          "-$func_split_short_opt_arg" ${1+"$@"}
-                      shift
-                      ;;
-
-        --)           _G_parse_options_requote=: ; break ;;
-        -*)           func_fatal_help "unrecognised option: '$_G_opt'" ;;
-        *)            set dummy "$_G_opt" ${1+"$@"}; shift
-                      _G_match_parse_options=false
-                      break
-                      ;;
-      esac
-
-      if $_G_match_parse_options; then
-        _G_parse_options_requote=:
-      fi
-    done
-
-    if $_G_parse_options_requote; then
-      # save modified positional parameters for caller
-      func_quote eval ${1+"$@"}
-      func_parse_options_result=$func_quote_result
-    fi
-}
-
-
-# func_validate_options [ARG]...
-# ------------------------------
-# Perform any sanity checks on option settings and/or unconsumed
-# arguments.
-func_hookable func_validate_options
-func_validate_options ()
-{
-    $debug_cmd
-
-    # Display all warnings if -W was not given.
-    test -n "$opt_warning_types" || opt_warning_types=" $warning_categories"
-
-    func_run_hooks func_validate_options ${1+"$@"}
-    func_propagate_result func_run_hooks func_validate_options
-
-    # Bail if the options were screwed!
-    $exit_cmd $EXIT_FAILURE
-}
-
-
-
-## ----------------- ##
-## Helper functions. ##
-## ----------------- ##
-
-# This section contains the helper functions used by the rest of the
-# hookable option parser framework in ascii-betical order.
-
-
-# func_fatal_help ARG...
-# ----------------------
-# Echo program name prefixed message to standard error, followed by
-# a help hint, and exit.
-func_fatal_help ()
-{
-    $debug_cmd
-
-    eval \$ECHO \""Usage: $usage"\"
-    eval \$ECHO \""$fatal_help"\"
-    func_error ${1+"$@"}
-    exit $EXIT_FAILURE
-}
-
-
-# func_help
-# ---------
-# Echo long help message to standard output and exit.
-func_help ()
-{
-    $debug_cmd
-
-    func_usage_message
-    $ECHO "$long_help_message"
-    exit 0
-}
-
-
-# func_missing_arg ARGNAME
-# ------------------------
-# Echo program name prefixed message to standard error and set global
-# exit_cmd.
-func_missing_arg ()
-{
-    $debug_cmd
-
-    func_error "Missing argument for '$1'."
-    exit_cmd=exit
-}
-
-
-# func_split_equals STRING
-# ------------------------
-# Set func_split_equals_lhs and func_split_equals_rhs shell variables
-# after splitting STRING at the '=' sign.
-test -z "$_G_HAVE_XSI_OPS" \
-    && (eval 'x=a/b/c;
-      test 5aa/bb/cc = "${#x}${x%%/*}${x%/*}${x#*/}${x##*/}"') 2>/dev/null \
-    && _G_HAVE_XSI_OPS=yes
-
-if test yes = "$_G_HAVE_XSI_OPS"
-then
-  # This is an XSI compatible shell, allowing a faster implementation...
-  eval 'func_split_equals ()
-  {
-      $debug_cmd
-
-      func_split_equals_lhs=${1%%=*}
-      func_split_equals_rhs=${1#*=}
-      if test "x$func_split_equals_lhs" = "x$1"; then
-        func_split_equals_rhs=
-      fi
-  }'
-else
-  # ...otherwise fall back to using expr, which is often a shell builtin.
-  func_split_equals ()
-  {
-      $debug_cmd
-
-      func_split_equals_lhs=`expr "x$1" : 'x\([^=]*\)'`
-      func_split_equals_rhs=
-      test "x$func_split_equals_lhs" = "x$1" \
-        || func_split_equals_rhs=`expr "x$1" : 'x[^=]*=\(.*\)$'`
-  }
-fi #func_split_equals
-
-
-# func_split_short_opt SHORTOPT
-# -----------------------------
-# Set func_split_short_opt_name and func_split_short_opt_arg shell
-# variables after splitting SHORTOPT after the 2nd character.
-if test yes = "$_G_HAVE_XSI_OPS"
-then
-  # This is an XSI compatible shell, allowing a faster implementation...
-  eval 'func_split_short_opt ()
-  {
-      $debug_cmd
-
-      func_split_short_opt_arg=${1#??}
-      func_split_short_opt_name=${1%"$func_split_short_opt_arg"}
-  }'
-else
-  # ...otherwise fall back to using expr, which is often a shell builtin.
-  func_split_short_opt ()
-  {
-      $debug_cmd
-
-      func_split_short_opt_name=`expr "x$1" : 'x-\(.\)'`
-      func_split_short_opt_arg=`expr "x$1" : 'x-.\(.*\)$'`
-  }
-fi #func_split_short_opt
-
-
-# func_usage
-# ----------
-# Echo short help message to standard output and exit.
-func_usage ()
-{
-    $debug_cmd
-
-    func_usage_message
-    $ECHO "Run '$progname --help |${PAGER-more}' for full usage"
-    exit 0
-}
-
-
-# func_usage_message
-# ------------------
-# Echo short help message to standard output.
-func_usage_message ()
-{
-    $debug_cmd
-
-    eval \$ECHO \""Usage: $usage"\"
-    echo
-    $SED -n 's|^# ||
-        /^Written by/{
-          x;p;x
-        }
-	h
-	/^Written by/q' < "$progpath"
-    echo
-    eval \$ECHO \""$usage_message"\"
-}
-
-
-# func_version
-# ------------
-# Echo version message to standard output and exit.
-# The version message is extracted from the calling file's header
-# comments, with leading '# ' stripped:
-#   1. First display the progname and version
-#   2. Followed by the header comment line matching  /^# Written by /
-#   3. Then a blank line followed by the first following line matching
-#      /^# Copyright /
-#   4. Immediately followed by any lines between the previous matches,
-#      except lines preceding the intervening completely blank line.
-# For example, see the header comments of this file.
-func_version ()
-{
-    $debug_cmd
-
-    printf '%s\n' "$progname $scriptversion"
-    $SED -n '
-        /^# Written by /!b
-        s|^# ||; p; n
-
-        :fwd2blnk
-        /./ {
-          n
-          b fwd2blnk
-        }
-        p; n
-
-        :holdwrnt
-        s|^# ||
-        s|^# *$||
-        /^Copyright /!{
-          /./H
-          n
-          b holdwrnt
-        }
-
-        s|\((C)\)[ 0-9,-]*[ ,-]\([1-9][0-9]* \)|\1 \2|
-        G
-        s|\(\n\)\n*|\1|g
-        p; q' < "$progpath"
-
-    exit $?
-}
-
-
-# Local variables:
-# mode: shell-script
-# sh-indentation: 2
-# eval: (add-hook 'before-save-hook 'time-stamp)
-# time-stamp-pattern: "30/scriptversion=%:y-%02m-%02d.%02H; # UTC"
-# time-stamp-time-zone: "UTC"
-# End:
-
-# Set a version string.
-scriptversion='(GNU libtool) 2.4.6.42-b88ce'
-
-
-# func_echo ARG...
-# ----------------
-# Libtool also displays the current mode in messages, so override
-# funclib.sh func_echo with this custom definition.
-func_echo ()
-{
-    $debug_cmd
-
-    _G_message=$*
-
-    func_echo_IFS=$IFS
-    IFS=$nl
-    for _G_line in $_G_message; do
-      IFS=$func_echo_IFS
-      $ECHO "$progname${opt_mode+: $opt_mode}: $_G_line"
-    done
-    IFS=$func_echo_IFS
-}
-
-
-# func_warning ARG...
-# -------------------
-# Libtool warnings are not categorized, so override funclib.sh
-# func_warning with this simpler definition.
-func_warning ()
-{
-    $debug_cmd
-
-    $warning_func ${1+"$@"}
-}
-
-
-## ---------------- ##
-## Options parsing. ##
-## ---------------- ##
-
-# Hook in the functions to make sure our own options are parsed during
-# the option parsing loop.
-
-usage='$progpath [OPTION]... [MODE-ARG]...'
-
-# Short help message in response to '-h'.
-usage_message="Options:
-       --config             show all configuration variables
-       --debug              enable verbose shell tracing
-   -n, --dry-run            display commands without modifying any files
-       --features           display basic configuration information and exit
-       --mode=MODE          use operation mode MODE
-       --no-warnings        equivalent to '-Wnone'
-       --preserve-dup-deps  don't remove duplicate dependency libraries
-       --quiet, --silent    don't print informational messages
-       --tag=TAG            use configuration variables from tag TAG
-   -v, --verbose            print more informational messages than default
-       --version            print version information
-   -W, --warnings=CATEGORY  report the warnings falling in CATEGORY [all]
-   -h, --help, --help-all   print short, long, or detailed help message
-"
-
-# Additional text appended to 'usage_message' in response to '--help'.
-func_help ()
-{
-    $debug_cmd
-
-    func_usage_message
-    $ECHO "$long_help_message
-
-MODE must be one of the following:
-
-       clean           remove files from the build directory
-       compile         compile a source file into a libtool object
-       execute         automatically set library path, then run a program
-       finish          complete the installation of libtool libraries
-       install         install libraries or executables
-       link            create a library or an executable
-       uninstall       remove libraries from an installed directory
-
-MODE-ARGS vary depending on the MODE.  When passed as first option,
-'--mode=MODE' may be abbreviated as 'MODE' or a unique abbreviation of that.
-Try '$progname --help --mode=MODE' for a more detailed description of MODE.
-
-When reporting a bug, please describe a test case to reproduce it and
-include the following information:
-
-       host-triplet:   $host
-       shell:          $SHELL
-       compiler:       $LTCC
-       compiler flags: $LTCFLAGS
-       linker:         $LD (gnu? $with_gnu_ld)
-       version:        $progname (GNU libtool) 2.4.6.42-b88ce
-       automake:       `($AUTOMAKE --version) 2>/dev/null |$SED 1q`
-       autoconf:       `($AUTOCONF --version) 2>/dev/null |$SED 1q`
-
-Report bugs to <bug-libtool@gnu.org>.
-GNU libtool home page: <http://www.gnu.org/s/libtool/>.
-General help using GNU software: <http://www.gnu.org/gethelp/>."
-    exit 0
-}
-
-
-# func_lo2o OBJECT-NAME
-# ---------------------
-# Transform OBJECT-NAME from a '.lo' suffix to the platform specific
-# object suffix.
-
-lo2o=s/\\.lo\$/.$objext/
-o2lo=s/\\.$objext\$/.lo/
-
-if test yes = "$_G_HAVE_XSI_OPS"; then
-  eval 'func_lo2o ()
-  {
-    case $1 in
-      *.lo) func_lo2o_result=${1%.lo}.$objext ;;
-      *   ) func_lo2o_result=$1               ;;
-    esac
-  }'
-
-  # func_xform LIBOBJ-OR-SOURCE
-  # ---------------------------
-  # Transform LIBOBJ-OR-SOURCE from a '.o' or '.c' (or otherwise)
-  # suffix to a '.lo' libtool-object suffix.
-  eval 'func_xform ()
-  {
-    func_xform_result=${1%.*}.lo
-  }'
-else
-  # ...otherwise fall back to using sed.
-  func_lo2o ()
-  {
-    func_lo2o_result=`$ECHO "$1" | $SED "$lo2o"`
-  }
-
-  func_xform ()
-  {
-    func_xform_result=`$ECHO "$1" | $SED 's|\.[^.]*$|.lo|'`
-  }
-fi
-
-
-# func_fatal_configuration ARG...
-# -------------------------------
-# Echo program name prefixed message to standard error, followed by
-# a configuration failure hint, and exit.
-func_fatal_configuration ()
-{
-    func_fatal_error ${1+"$@"} \
-      "See the $PACKAGE documentation for more information." \
-      "Fatal configuration error."
-}
-
-
-# func_config
-# -----------
-# Display the configuration for all the tags in this script.
-func_config ()
-{
-    re_begincf='^# ### BEGIN LIBTOOL'
-    re_endcf='^# ### END LIBTOOL'
-
-    # Default configuration.
-    $SED "1,/$re_begincf CONFIG/d;/$re_endcf CONFIG/,\$d" < "$progpath"
-
-    # Now print the configurations for the tags.
-    for tagname in $taglist; do
-      $SED -n "/$re_begincf TAG CONFIG: $tagname\$/,/$re_endcf TAG CONFIG: $tagname\$/p" < "$progpath"
-    done
-
-    exit $?
-}
-
-
-# func_features
-# -------------
-# Display the features supported by this script.
-func_features ()
-{
-    echo "host: $host"
-    if test yes = "$build_libtool_libs"; then
-      echo "enable shared libraries"
-    else
-      echo "disable shared libraries"
-    fi
-    if test yes = "$build_old_libs"; then
-      echo "enable static libraries"
-    else
-      echo "disable static libraries"
-    fi
-
-    exit $?
-}
-
-
-# func_enable_tag TAGNAME
-# -----------------------
-# Verify that TAGNAME is valid, and either flag an error and exit, or
-# enable the TAGNAME tag.  We also add TAGNAME to the global $taglist
-# variable here.
-func_enable_tag ()
-{
-    # Global variable:
-    tagname=$1
-
-    re_begincf="^# ### BEGIN LIBTOOL TAG CONFIG: $tagname\$"
-    re_endcf="^# ### END LIBTOOL TAG CONFIG: $tagname\$"
-    sed_extractcf=/$re_begincf/,/$re_endcf/p
-
-    # Validate tagname.
-    case $tagname in
-      *[!-_A-Za-z0-9,/]*)
-        func_fatal_error "invalid tag name: $tagname"
-        ;;
-    esac
-
-    # Don't test for the "default" C tag, as we know it's
-    # there but not specially marked.
-    case $tagname in
-        CC) ;;
-    *)
-        if $GREP "$re_begincf" "$progpath" >/dev/null 2>&1; then
-	  taglist="$taglist $tagname"
-
-	  # Evaluate the configuration.  Be careful to quote the path
-	  # and the sed script, to avoid splitting on whitespace, but
-	  # also don't use non-portable quotes within backquotes within
-	  # quotes we have to do it in 2 steps:
-	  extractedcf=`$SED -n -e "$sed_extractcf" < "$progpath"`
-	  eval "$extractedcf"
-        else
-	  func_error "ignoring unknown tag $tagname"
-        fi
-        ;;
-    esac
-}
-
-
-# func_check_version_match
-# ------------------------
-# Ensure that we are using m4 macros, and libtool script from the same
-# release of libtool.
-func_check_version_match ()
-{
-    if test "$package_revision" != "$macro_revision"; then
-      if test "$VERSION" != "$macro_version"; then
-        if test -z "$macro_version"; then
-          cat >&2 <<_LT_EOF
-$progname: Version mismatch error.  This is $PACKAGE $VERSION, but the
-$progname: definition of this LT_INIT comes from an older release.
-$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION
-$progname: and run autoconf again.
-_LT_EOF
-        else
-          cat >&2 <<_LT_EOF
-$progname: Version mismatch error.  This is $PACKAGE $VERSION, but the
-$progname: definition of this LT_INIT comes from $PACKAGE $macro_version.
-$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION
-$progname: and run autoconf again.
-_LT_EOF
-        fi
-      else
-        cat >&2 <<_LT_EOF
-$progname: Version mismatch error.  This is $PACKAGE $VERSION, revision $package_revision,
-$progname: but the definition of this LT_INIT comes from revision $macro_revision.
-$progname: You should recreate aclocal.m4 with macros from revision $package_revision
-$progname: of $PACKAGE $VERSION and run autoconf again.
-_LT_EOF
-      fi
-
-      exit $EXIT_MISMATCH
-    fi
-}
-
-
-# libtool_options_prep [ARG]...
-# -----------------------------
-# Preparation for options parsed by libtool.
-libtool_options_prep ()
-{
-    $debug_mode
-
-    # Option defaults:
-    opt_config=false
-    opt_dlopen=
-    opt_dry_run=false
-    opt_help=false
-    opt_mode=
-    opt_preserve_dup_deps=false
-    opt_quiet=false
-
-    nonopt=
-    preserve_args=
-
-    _G_rc_lt_options_prep=:
-
-    # Shorthand for --mode=foo, only valid as the first argument
-    case $1 in
-    clean|clea|cle|cl)
-      shift; set dummy --mode clean ${1+"$@"}; shift
-      ;;
-    compile|compil|compi|comp|com|co|c)
-      shift; set dummy --mode compile ${1+"$@"}; shift
-      ;;
-    execute|execut|execu|exec|exe|ex|e)
-      shift; set dummy --mode execute ${1+"$@"}; shift
-      ;;
-    finish|finis|fini|fin|fi|f)
-      shift; set dummy --mode finish ${1+"$@"}; shift
-      ;;
-    install|instal|insta|inst|ins|in|i)
-      shift; set dummy --mode install ${1+"$@"}; shift
-      ;;
-    link|lin|li|l)
-      shift; set dummy --mode link ${1+"$@"}; shift
-      ;;
-    uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u)
-      shift; set dummy --mode uninstall ${1+"$@"}; shift
-      ;;
-    *)
-      _G_rc_lt_options_prep=false
-      ;;
-    esac
-
-    if $_G_rc_lt_options_prep; then
-      # Pass back the list of options.
-      func_quote eval ${1+"$@"}
-      libtool_options_prep_result=$func_quote_result
-    fi
-}
-func_add_hook func_options_prep libtool_options_prep
-
-
-# libtool_parse_options [ARG]...
-# ---------------------------------
-# Provide handling for libtool specific options.
-libtool_parse_options ()
-{
-    $debug_cmd
-
-    _G_rc_lt_parse_options=false
-
-    # Perform our own loop to consume as many options as possible in
-    # each iteration.
-    while test $# -gt 0; do
-      _G_match_lt_parse_options=:
-      _G_opt=$1
-      shift
-      case $_G_opt in
-        --dry-run|--dryrun|-n)
-                        opt_dry_run=:
-                        ;;
-
-        --config)       func_config ;;
-
-        --dlopen|-dlopen)
-                        opt_dlopen="${opt_dlopen+$opt_dlopen
-}$1"
-                        shift
-                        ;;
-
-        --preserve-dup-deps)
-                        opt_preserve_dup_deps=: ;;
-
-        --features)     func_features ;;
-
-        --finish)       set dummy --mode finish ${1+"$@"}; shift ;;
-
-        --help)         opt_help=: ;;
-
-        --help-all)     opt_help=': help-all' ;;
-
-        --mode)         test $# = 0 && func_missing_arg $_G_opt && break
-                        opt_mode=$1
-                        case $1 in
-                          # Valid mode arguments:
-                          clean|compile|execute|finish|install|link|relink|uninstall) ;;
-
-                          # Catch anything else as an error
-                          *) func_error "invalid argument for $_G_opt"
-                             exit_cmd=exit
-                             break
-                             ;;
-                        esac
-                        shift
-                        ;;
-
-        --no-silent|--no-quiet)
-                        opt_quiet=false
-                        func_append preserve_args " $_G_opt"
-                        ;;
-
-        --no-warnings|--no-warning|--no-warn)
-                        opt_warning=false
-                        func_append preserve_args " $_G_opt"
-                        ;;
-
-        --no-verbose)
-                        opt_verbose=false
-                        func_append preserve_args " $_G_opt"
-                        ;;
-
-        --silent|--quiet)
-                        opt_quiet=:
-                        opt_verbose=false
-                        func_append preserve_args " $_G_opt"
-                        ;;
-
-        --tag)          test $# = 0 && func_missing_arg $_G_opt && break
-                        opt_tag=$1
-                        func_append preserve_args " $_G_opt $1"
-                        func_enable_tag "$1"
-                        shift
-                        ;;
-
-        --verbose|-v)   opt_quiet=false
-                        opt_verbose=:
-                        func_append preserve_args " $_G_opt"
-                        ;;
-
-        # An option not handled by this hook function:
-        *)              set dummy "$_G_opt" ${1+"$@"} ; shift
-                        _G_match_lt_parse_options=false
-                        break
-                        ;;
-      esac
-      $_G_match_lt_parse_options && _G_rc_lt_parse_options=:
-    done
-
-    if $_G_rc_lt_parse_options; then
-      # save modified positional parameters for caller
-      func_quote eval ${1+"$@"}
-      libtool_parse_options_result=$func_quote_result
-    fi
-}
-func_add_hook func_parse_options libtool_parse_options
-
-
-
-# libtool_validate_options [ARG]...
-# ---------------------------------
-# Perform any sanity checks on option settings and/or unconsumed
-# arguments.
-libtool_validate_options ()
-{
-    # save first non-option argument
-    if test 0 -lt $#; then
-      nonopt=$1
-      shift
-    fi
-
-    # preserve --debug
-    test : = "$debug_cmd" || func_append preserve_args " --debug"
-
-    case $host in
-      # Solaris2 added to fix http://debbugs.gnu.org/cgi/bugreport.cgi?bug=16452
-      # see also: http://gcc.gnu.org/bugzilla/show_bug.cgi?id=59788
-      *cygwin* | *mingw* | *pw32* | *cegcc* | *solaris2* | *os2*)
-        # don't eliminate duplications in $postdeps and $predeps
-        opt_duplicate_compiler_generated_deps=:
-        ;;
-      *)
-        opt_duplicate_compiler_generated_deps=$opt_preserve_dup_deps
-        ;;
-    esac
-
-    $opt_help || {
-      # Sanity checks first:
-      func_check_version_match
-
-      test yes != "$build_libtool_libs" \
-        && test yes != "$build_old_libs" \
-        && func_fatal_configuration "not configured to build any kind of library"
-
-      # Darwin sucks
-      eval std_shrext=\"$shrext_cmds\"
-
-      # Only execute mode is allowed to have -dlopen flags.
-      if test -n "$opt_dlopen" && test execute != "$opt_mode"; then
-        func_error "unrecognized option '-dlopen'"
-        $ECHO "$help" 1>&2
-        exit $EXIT_FAILURE
-      fi
-
-      # Change the help message to a mode-specific one.
-      generic_help=$help
-      help="Try '$progname --help --mode=$opt_mode' for more information."
-    }
-
-    # Pass back the unparsed argument list
-    func_quote eval ${1+"$@"}
-    libtool_validate_options_result=$func_quote_result
-}
-func_add_hook func_validate_options libtool_validate_options
-
-
-# Process options as early as possible so that --help and --version
-# can return quickly.
-func_options ${1+"$@"}
-eval set dummy "$func_options_result"; shift
-
-
-
-## ----------- ##
-##    Main.    ##
-## ----------- ##
-
-magic='%%%MAGIC variable%%%'
-magic_exe='%%%MAGIC EXE variable%%%'
-
-# Global variables.
-extracted_archives=
-extracted_serial=0
-
-# If this variable is set in any of the actions, the command in it
-# will be execed at the end.  This prevents here-documents from being
-# left over by shells.
-exec_cmd=
-
-
-# A function that is used when there is no print builtin or printf.
-func_fallback_echo ()
-{
-  eval 'cat <<_LTECHO_EOF
-$1
-_LTECHO_EOF'
-}
-
-# func_generated_by_libtool
-# True iff stdin has been generated by Libtool. This function is only
-# a basic sanity check; it will hardly flush out determined imposters.
-func_generated_by_libtool_p ()
-{
-  $GREP "^# Generated by .*$PACKAGE" > /dev/null 2>&1
-}
-
-# func_lalib_p file
-# True iff FILE is a libtool '.la' library or '.lo' object file.
-# This function is only a basic sanity check; it will hardly flush out
-# determined imposters.
-func_lalib_p ()
-{
-    test -f "$1" &&
-      $SED -e 4q "$1" 2>/dev/null | func_generated_by_libtool_p
-}
-
-# func_lalib_unsafe_p file
-# True iff FILE is a libtool '.la' library or '.lo' object file.
-# This function implements the same check as func_lalib_p without
-# resorting to external programs.  To this end, it redirects stdin and
-# closes it afterwards, without saving the original file descriptor.
-# As a safety measure, use it only where a negative result would be
-# fatal anyway.  Works if 'file' does not exist.
-func_lalib_unsafe_p ()
-{
-    lalib_p=no
-    if test -f "$1" && test -r "$1" && exec 5<&0 <"$1"; then
-	for lalib_p_l in 1 2 3 4
-	do
-	    read lalib_p_line
-	    case $lalib_p_line in
-		\#\ Generated\ by\ *$PACKAGE* ) lalib_p=yes; break;;
-	    esac
-	done
-	exec 0<&5 5<&-
-    fi
-    test yes = "$lalib_p"
-}
-
-# func_ltwrapper_script_p file
-# True iff FILE is a libtool wrapper script
-# This function is only a basic sanity check; it will hardly flush out
-# determined imposters.
-func_ltwrapper_script_p ()
-{
-    test -f "$1" &&
-      $lt_truncate_bin < "$1" 2>/dev/null | func_generated_by_libtool_p
-}
-
-# func_ltwrapper_executable_p file
-# True iff FILE is a libtool wrapper executable
-# This function is only a basic sanity check; it will hardly flush out
-# determined imposters.
-func_ltwrapper_executable_p ()
-{
-    func_ltwrapper_exec_suffix=
-    case $1 in
-    *.exe) ;;
-    *) func_ltwrapper_exec_suffix=.exe ;;
-    esac
-    $GREP "$magic_exe" "$1$func_ltwrapper_exec_suffix" >/dev/null 2>&1
-}
-
-# func_ltwrapper_scriptname file
-# Assumes file is an ltwrapper_executable
-# uses $file to determine the appropriate filename for a
-# temporary ltwrapper_script.
-func_ltwrapper_scriptname ()
-{
-    func_dirname_and_basename "$1" "" "."
-    func_stripname '' '.exe' "$func_basename_result"
-    func_ltwrapper_scriptname_result=$func_dirname_result/$objdir/${func_stripname_result}_ltshwrapper
-}
-
-# func_ltwrapper_p file
-# True iff FILE is a libtool wrapper script or wrapper executable
-# This function is only a basic sanity check; it will hardly flush out
-# determined imposters.
-func_ltwrapper_p ()
-{
-    func_ltwrapper_script_p "$1" || func_ltwrapper_executable_p "$1"
-}
-
-
-# func_execute_cmds commands fail_cmd
-# Execute tilde-delimited COMMANDS.
-# If FAIL_CMD is given, eval that upon failure.
-# FAIL_CMD may read-access the current command in variable CMD!
-func_execute_cmds ()
-{
-    $debug_cmd
-
-    save_ifs=$IFS; IFS='~'
-    for cmd in $1; do
-      IFS=$sp$nl
-      eval cmd=\"$cmd\"
-      IFS=$save_ifs
-      func_show_eval "$cmd" "${2-:}"
-    done
-    IFS=$save_ifs
-}
-
-
-# func_source file
-# Source FILE, adding directory component if necessary.
-# Note that it is not necessary on cygwin/mingw to append a dot to
-# FILE even if both FILE and FILE.exe exist: automatic-append-.exe
-# behavior happens only for exec(3), not for open(2)!  Also, sourcing
-# 'FILE.' does not work on cygwin managed mounts.
-func_source ()
-{
-    $debug_cmd
-
-    case $1 in
-    */* | *\\*)	. "$1" ;;
-    *)		. "./$1" ;;
-    esac
-}
-
-
-# func_resolve_sysroot PATH
-# Replace a leading = in PATH with a sysroot.  Store the result into
-# func_resolve_sysroot_result
-func_resolve_sysroot ()
-{
-  func_resolve_sysroot_result=$1
-  case $func_resolve_sysroot_result in
-  =*)
-    func_stripname '=' '' "$func_resolve_sysroot_result"
-    func_resolve_sysroot_result=$lt_sysroot$func_stripname_result
-    ;;
-  esac
-}
-
-# func_replace_sysroot PATH
-# If PATH begins with the sysroot, replace it with = and
-# store the result into func_replace_sysroot_result.
-func_replace_sysroot ()
-{
-  case $lt_sysroot:$1 in
-  ?*:"$lt_sysroot"*)
-    func_stripname "$lt_sysroot" '' "$1"
-    func_replace_sysroot_result='='$func_stripname_result
-    ;;
-  *)
-    # Including no sysroot.
-    func_replace_sysroot_result=$1
-    ;;
-  esac
-}
-
-# func_infer_tag arg
-# Infer tagged configuration to use if any are available and
-# if one wasn't chosen via the "--tag" command line option.
-# Only attempt this if the compiler in the base compile
-# command doesn't match the default compiler.
-# arg is usually of the form 'gcc ...'
-func_infer_tag ()
-{
-    $debug_cmd
-
-    if test -n "$available_tags" && test -z "$tagname"; then
-      CC_quoted=
-      for arg in $CC; do
-	func_append_quoted CC_quoted "$arg"
-      done
-      CC_expanded=`func_echo_all $CC`
-      CC_quoted_expanded=`func_echo_all $CC_quoted`
-      case $@ in
-      # Blanks in the command may have been stripped by the calling shell,
-      # but not from the CC environment variable when configure was run.
-      " $CC "* | "$CC "* | " $CC_expanded "* | "$CC_expanded "* | \
-      " $CC_quoted"* | "$CC_quoted "* | " $CC_quoted_expanded "* | "$CC_quoted_expanded "*) ;;
-      # Blanks at the start of $base_compile will cause this to fail
-      # if we don't check for them as well.
-      *)
-	for z in $available_tags; do
-	  if $GREP "^# ### BEGIN LIBTOOL TAG CONFIG: $z$" < "$progpath" > /dev/null; then
-	    # Evaluate the configuration.
-	    eval "`$SED -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $progpath`"
-	    CC_quoted=
-	    for arg in $CC; do
-	      # Double-quote args containing other shell metacharacters.
-	      func_append_quoted CC_quoted "$arg"
-	    done
-	    CC_expanded=`func_echo_all $CC`
-	    CC_quoted_expanded=`func_echo_all $CC_quoted`
-	    case "$@ " in
-	    " $CC "* | "$CC "* | " $CC_expanded "* | "$CC_expanded "* | \
-	    " $CC_quoted"* | "$CC_quoted "* | " $CC_quoted_expanded "* | "$CC_quoted_expanded "*)
-	      # The compiler in the base compile command matches
-	      # the one in the tagged configuration.
-	      # Assume this is the tagged configuration we want.
-	      tagname=$z
-	      break
-	      ;;
-	    esac
-	  fi
-	done
-	# If $tagname still isn't set, then no tagged configuration
-	# was found and let the user know that the "--tag" command
-	# line option must be used.
-	if test -z "$tagname"; then
-	  func_echo "unable to infer tagged configuration"
-	  func_fatal_error "specify a tag with '--tag'"
-#	else
-#	  func_verbose "using $tagname tagged configuration"
-	fi
-	;;
-      esac
-    fi
-}
-
-
-
-# func_write_libtool_object output_name pic_name nonpic_name
-# Create a libtool object file (analogous to a ".la" file),
-# but don't create it if we're doing a dry run.
-func_write_libtool_object ()
-{
-    write_libobj=$1
-    if test yes = "$build_libtool_libs"; then
-      write_lobj=\'$2\'
-    else
-      write_lobj=none
-    fi
-
-    if test yes = "$build_old_libs"; then
-      write_oldobj=\'$3\'
-    else
-      write_oldobj=none
-    fi
-
-    $opt_dry_run || {
-      cat >${write_libobj}T <<EOF
-# $write_libobj - a libtool object file
-# Generated by $PROGRAM (GNU $PACKAGE) $VERSION
-#
-# Please DO NOT delete this file!
-# It is necessary for linking the library.
-
-# Name of the PIC object.
-pic_object=$write_lobj
-
-# Name of the non-PIC object
-non_pic_object=$write_oldobj
-
-EOF
-      $MV "${write_libobj}T" "$write_libobj"
-    }
-}
-
-
-##################################################
-# FILE NAME AND PATH CONVERSION HELPER FUNCTIONS #
-##################################################
-
-# func_convert_core_file_wine_to_w32 ARG
-# Helper function used by file name conversion functions when $build is *nix,
-# and $host is mingw, cygwin, or some other w32 environment. Relies on a
-# correctly configured wine environment available, with the winepath program
-# in $build's $PATH.
-#
-# ARG is the $build file name to be converted to w32 format.
-# Result is available in $func_convert_core_file_wine_to_w32_result, and will
-# be empty on error (or when ARG is empty)
-func_convert_core_file_wine_to_w32 ()
-{
-  $debug_cmd
-
-  func_convert_core_file_wine_to_w32_result=$1
-  if test -n "$1"; then
-    # Unfortunately, winepath does not exit with a non-zero error code, so we
-    # are forced to check the contents of stdout. On the other hand, if the
-    # command is not found, the shell will set an exit code of 127 and print
-    # *an error message* to stdout. So we must check for both error code of
-    # zero AND non-empty stdout, which explains the odd construction:
-    func_convert_core_file_wine_to_w32_tmp=`winepath -w "$1" 2>/dev/null`
-    if test "$?" -eq 0 && test -n "$func_convert_core_file_wine_to_w32_tmp"; then
-      func_convert_core_file_wine_to_w32_result=`$ECHO "$func_convert_core_file_wine_to_w32_tmp" |
-        $SED -e "$sed_naive_backslashify"`
-    else
-      func_convert_core_file_wine_to_w32_result=
-    fi
-  fi
-}
-# end: func_convert_core_file_wine_to_w32
-
-
-# func_convert_core_path_wine_to_w32 ARG
-# Helper function used by path conversion functions when $build is *nix, and
-# $host is mingw, cygwin, or some other w32 environment. Relies on a correctly
-# configured wine environment available, with the winepath program in $build's
-# $PATH. Assumes ARG has no leading or trailing path separator characters.
-#
-# ARG is path to be converted from $build format to win32.
-# Result is available in $func_convert_core_path_wine_to_w32_result.
-# Unconvertible file (directory) names in ARG are skipped; if no directory names
-# are convertible, then the result may be empty.
-func_convert_core_path_wine_to_w32 ()
-{
-  $debug_cmd
-
-  # unfortunately, winepath doesn't convert paths, only file names
-  func_convert_core_path_wine_to_w32_result=
-  if test -n "$1"; then
-    oldIFS=$IFS
-    IFS=:
-    for func_convert_core_path_wine_to_w32_f in $1; do
-      IFS=$oldIFS
-      func_convert_core_file_wine_to_w32 "$func_convert_core_path_wine_to_w32_f"
-      if test -n "$func_convert_core_file_wine_to_w32_result"; then
-        if test -z "$func_convert_core_path_wine_to_w32_result"; then
-          func_convert_core_path_wine_to_w32_result=$func_convert_core_file_wine_to_w32_result
-        else
-          func_append func_convert_core_path_wine_to_w32_result ";$func_convert_core_file_wine_to_w32_result"
-        fi
-      fi
-    done
-    IFS=$oldIFS
-  fi
-}
-# end: func_convert_core_path_wine_to_w32
-
-
-# func_cygpath ARGS...
-# Wrapper around calling the cygpath program via LT_CYGPATH. This is used when
-# when (1) $build is *nix and Cygwin is hosted via a wine environment; or (2)
-# $build is MSYS and $host is Cygwin, or (3) $build is Cygwin. In case (1) or
-# (2), returns the Cygwin file name or path in func_cygpath_result (input
-# file name or path is assumed to be in w32 format, as previously converted
-# from $build's *nix or MSYS format). In case (3), returns the w32 file name
-# or path in func_cygpath_result (input file name or path is assumed to be in
-# Cygwin format). Returns an empty string on error.
-#
-# ARGS are passed to cygpath, with the last one being the file name or path to
-# be converted.
-#
-# Specify the absolute *nix (or w32) name to cygpath in the LT_CYGPATH
-# environment variable; do not put it in $PATH.
-func_cygpath ()
-{
-  $debug_cmd
-
-  if test -n "$LT_CYGPATH" && test -f "$LT_CYGPATH"; then
-    func_cygpath_result=`$LT_CYGPATH "$@" 2>/dev/null`
-    if test "$?" -ne 0; then
-      # on failure, ensure result is empty
-      func_cygpath_result=
-    fi
-  else
-    func_cygpath_result=
-    func_error "LT_CYGPATH is empty or specifies non-existent file: '$LT_CYGPATH'"
-  fi
-}
-#end: func_cygpath
-
-
-# func_convert_core_msys_to_w32 ARG
-# Convert file name or path ARG from MSYS format to w32 format.  Return
-# result in func_convert_core_msys_to_w32_result.
-func_convert_core_msys_to_w32 ()
-{
-  $debug_cmd
-
-  # awkward: cmd appends spaces to result
-  func_convert_core_msys_to_w32_result=`( cmd //c echo "$1" ) 2>/dev/null |
-    $SED -e 's/[ ]*$//' -e "$sed_naive_backslashify"`
-}
-#end: func_convert_core_msys_to_w32
-
-
-# func_convert_file_check ARG1 ARG2
-# Verify that ARG1 (a file name in $build format) was converted to $host
-# format in ARG2. Otherwise, emit an error message, but continue (resetting
-# func_to_host_file_result to ARG1).
-func_convert_file_check ()
-{
-  $debug_cmd
-
-  if test -z "$2" && test -n "$1"; then
-    func_error "Could not determine host file name corresponding to"
-    func_error "  '$1'"
-    func_error "Continuing, but uninstalled executables may not work."
-    # Fallback:
-    func_to_host_file_result=$1
-  fi
-}
-# end func_convert_file_check
-
-
-# func_convert_path_check FROM_PATHSEP TO_PATHSEP FROM_PATH TO_PATH
-# Verify that FROM_PATH (a path in $build format) was converted to $host
-# format in TO_PATH. Otherwise, emit an error message, but continue, resetting
-# func_to_host_file_result to a simplistic fallback value (see below).
-func_convert_path_check ()
-{
-  $debug_cmd
-
-  if test -z "$4" && test -n "$3"; then
-    func_error "Could not determine the host path corresponding to"
-    func_error "  '$3'"
-    func_error "Continuing, but uninstalled executables may not work."
-    # Fallback.  This is a deliberately simplistic "conversion" and
-    # should not be "improved".  See libtool.info.
-    if test "x$1" != "x$2"; then
-      lt_replace_pathsep_chars="s|$1|$2|g"
-      func_to_host_path_result=`echo "$3" |
-        $SED -e "$lt_replace_pathsep_chars"`
-    else
-      func_to_host_path_result=$3
-    fi
-  fi
-}
-# end func_convert_path_check
-
-
-# func_convert_path_front_back_pathsep FRONTPAT BACKPAT REPL ORIG
-# Modifies func_to_host_path_result by prepending REPL if ORIG matches FRONTPAT
-# and appending REPL if ORIG matches BACKPAT.
-func_convert_path_front_back_pathsep ()
-{
-  $debug_cmd
-
-  case $4 in
-  $1 ) func_to_host_path_result=$3$func_to_host_path_result
-    ;;
-  esac
-  case $4 in
-  $2 ) func_append func_to_host_path_result "$3"
-    ;;
-  esac
-}
-# end func_convert_path_front_back_pathsep
-
-
-##################################################
-# $build to $host FILE NAME CONVERSION FUNCTIONS #
-##################################################
-# invoked via '$to_host_file_cmd ARG'
-#
-# In each case, ARG is the path to be converted from $build to $host format.
-# Result will be available in $func_to_host_file_result.
-
-
-# func_to_host_file ARG
-# Converts the file name ARG from $build format to $host format. Return result
-# in func_to_host_file_result.
-func_to_host_file ()
-{
-  $debug_cmd
-
-  $to_host_file_cmd "$1"
-}
-# end func_to_host_file
-
-
-# func_to_tool_file ARG LAZY
-# converts the file name ARG from $build format to toolchain format. Return
-# result in func_to_tool_file_result.  If the conversion in use is listed
-# in (the comma separated) LAZY, no conversion takes place.
-func_to_tool_file ()
-{
-  $debug_cmd
-
-  case ,$2, in
-    *,"$to_tool_file_cmd",*)
-      func_to_tool_file_result=$1
-      ;;
-    *)
-      $to_tool_file_cmd "$1"
-      func_to_tool_file_result=$func_to_host_file_result
-      ;;
-  esac
-}
-# end func_to_tool_file
-
-
-# func_convert_file_noop ARG
-# Copy ARG to func_to_host_file_result.
-func_convert_file_noop ()
-{
-  func_to_host_file_result=$1
-}
-# end func_convert_file_noop
-
-
-# func_convert_file_msys_to_w32 ARG
-# Convert file name ARG from (mingw) MSYS to (mingw) w32 format; automatic
-# conversion to w32 is not available inside the cwrapper.  Returns result in
-# func_to_host_file_result.
-func_convert_file_msys_to_w32 ()
-{
-  $debug_cmd
-
-  func_to_host_file_result=$1
-  if test -n "$1"; then
-    func_convert_core_msys_to_w32 "$1"
-    func_to_host_file_result=$func_convert_core_msys_to_w32_result
-  fi
-  func_convert_file_check "$1" "$func_to_host_file_result"
-}
-# end func_convert_file_msys_to_w32
-
-
-# func_convert_file_cygwin_to_w32 ARG
-# Convert file name ARG from Cygwin to w32 format.  Returns result in
-# func_to_host_file_result.
-func_convert_file_cygwin_to_w32 ()
-{
-  $debug_cmd
-
-  func_to_host_file_result=$1
-  if test -n "$1"; then
-    # because $build is cygwin, we call "the" cygpath in $PATH; no need to use
-    # LT_CYGPATH in this case.
-    func_to_host_file_result=`cygpath -m "$1"`
-  fi
-  func_convert_file_check "$1" "$func_to_host_file_result"
-}
-# end func_convert_file_cygwin_to_w32
-
-
-# func_convert_file_nix_to_w32 ARG
-# Convert file name ARG from *nix to w32 format.  Requires a wine environment
-# and a working winepath. Returns result in func_to_host_file_result.
-func_convert_file_nix_to_w32 ()
-{
-  $debug_cmd
-
-  func_to_host_file_result=$1
-  if test -n "$1"; then
-    func_convert_core_file_wine_to_w32 "$1"
-    func_to_host_file_result=$func_convert_core_file_wine_to_w32_result
-  fi
-  func_convert_file_check "$1" "$func_to_host_file_result"
-}
-# end func_convert_file_nix_to_w32
-
-
-# func_convert_file_msys_to_cygwin ARG
-# Convert file name ARG from MSYS to Cygwin format.  Requires LT_CYGPATH set.
-# Returns result in func_to_host_file_result.
-func_convert_file_msys_to_cygwin ()
-{
-  $debug_cmd
-
-  func_to_host_file_result=$1
-  if test -n "$1"; then
-    func_convert_core_msys_to_w32 "$1"
-    func_cygpath -u "$func_convert_core_msys_to_w32_result"
-    func_to_host_file_result=$func_cygpath_result
-  fi
-  func_convert_file_check "$1" "$func_to_host_file_result"
-}
-# end func_convert_file_msys_to_cygwin
-
-
-# func_convert_file_nix_to_cygwin ARG
-# Convert file name ARG from *nix to Cygwin format.  Requires Cygwin installed
-# in a wine environment, working winepath, and LT_CYGPATH set.  Returns result
-# in func_to_host_file_result.
-func_convert_file_nix_to_cygwin ()
-{
-  $debug_cmd
-
-  func_to_host_file_result=$1
-  if test -n "$1"; then
-    # convert from *nix to w32, then use cygpath to convert from w32 to cygwin.
-    func_convert_core_file_wine_to_w32 "$1"
-    func_cygpath -u "$func_convert_core_file_wine_to_w32_result"
-    func_to_host_file_result=$func_cygpath_result
-  fi
-  func_convert_file_check "$1" "$func_to_host_file_result"
-}
-# end func_convert_file_nix_to_cygwin
-
-
-#############################################
-# $build to $host PATH CONVERSION FUNCTIONS #
-#############################################
-# invoked via '$to_host_path_cmd ARG'
-#
-# In each case, ARG is the path to be converted from $build to $host format.
-# The result will be available in $func_to_host_path_result.
-#
-# Path separators are also converted from $build format to $host format.  If
-# ARG begins or ends with a path separator character, it is preserved (but
-# converted to $host format) on output.
-#
-# All path conversion functions are named using the following convention:
-#   file name conversion function    : func_convert_file_X_to_Y ()
-#   path conversion function         : func_convert_path_X_to_Y ()
-# where, for any given $build/$host combination the 'X_to_Y' value is the
-# same.  If conversion functions are added for new $build/$host combinations,
-# the two new functions must follow this pattern, or func_init_to_host_path_cmd
-# will break.
-
-
-# func_init_to_host_path_cmd
-# Ensures that function "pointer" variable $to_host_path_cmd is set to the
-# appropriate value, based on the value of $to_host_file_cmd.
-to_host_path_cmd=
-func_init_to_host_path_cmd ()
-{
-  $debug_cmd
-
-  if test -z "$to_host_path_cmd"; then
-    func_stripname 'func_convert_file_' '' "$to_host_file_cmd"
-    to_host_path_cmd=func_convert_path_$func_stripname_result
-  fi
-}
-
-
-# func_to_host_path ARG
-# Converts the path ARG from $build format to $host format. Return result
-# in func_to_host_path_result.
-func_to_host_path ()
-{
-  $debug_cmd
-
-  func_init_to_host_path_cmd
-  $to_host_path_cmd "$1"
-}
-# end func_to_host_path
-
-
-# func_convert_path_noop ARG
-# Copy ARG to func_to_host_path_result.
-func_convert_path_noop ()
-{
-  func_to_host_path_result=$1
-}
-# end func_convert_path_noop
-
-
-# func_convert_path_msys_to_w32 ARG
-# Convert path ARG from (mingw) MSYS to (mingw) w32 format; automatic
-# conversion to w32 is not available inside the cwrapper.  Returns result in
-# func_to_host_path_result.
-func_convert_path_msys_to_w32 ()
-{
-  $debug_cmd
-
-  func_to_host_path_result=$1
-  if test -n "$1"; then
-    # Remove leading and trailing path separator characters from ARG.  MSYS
-    # behavior is inconsistent here; cygpath turns them into '.;' and ';.';
-    # and winepath ignores them completely.
-    func_stripname : : "$1"
-    func_to_host_path_tmp1=$func_stripname_result
-    func_convert_core_msys_to_w32 "$func_to_host_path_tmp1"
-    func_to_host_path_result=$func_convert_core_msys_to_w32_result
-    func_convert_path_check : ";" \
-      "$func_to_host_path_tmp1" "$func_to_host_path_result"
-    func_convert_path_front_back_pathsep ":*" "*:" ";" "$1"
-  fi
-}
-# end func_convert_path_msys_to_w32
-
-
-# func_convert_path_cygwin_to_w32 ARG
-# Convert path ARG from Cygwin to w32 format.  Returns result in
-# func_to_host_file_result.
-func_convert_path_cygwin_to_w32 ()
-{
-  $debug_cmd
-
-  func_to_host_path_result=$1
-  if test -n "$1"; then
-    # See func_convert_path_msys_to_w32:
-    func_stripname : : "$1"
-    func_to_host_path_tmp1=$func_stripname_result
-    func_to_host_path_result=`cygpath -m -p "$func_to_host_path_tmp1"`
-    func_convert_path_check : ";" \
-      "$func_to_host_path_tmp1" "$func_to_host_path_result"
-    func_convert_path_front_back_pathsep ":*" "*:" ";" "$1"
-  fi
-}
-# end func_convert_path_cygwin_to_w32
-
-
-# func_convert_path_nix_to_w32 ARG
-# Convert path ARG from *nix to w32 format.  Requires a wine environment and
-# a working winepath.  Returns result in func_to_host_file_result.
-func_convert_path_nix_to_w32 ()
-{
-  $debug_cmd
-
-  func_to_host_path_result=$1
-  if test -n "$1"; then
-    # See func_convert_path_msys_to_w32:
-    func_stripname : : "$1"
-    func_to_host_path_tmp1=$func_stripname_result
-    func_convert_core_path_wine_to_w32 "$func_to_host_path_tmp1"
-    func_to_host_path_result=$func_convert_core_path_wine_to_w32_result
-    func_convert_path_check : ";" \
-      "$func_to_host_path_tmp1" "$func_to_host_path_result"
-    func_convert_path_front_back_pathsep ":*" "*:" ";" "$1"
-  fi
-}
-# end func_convert_path_nix_to_w32
-
-
-# func_convert_path_msys_to_cygwin ARG
-# Convert path ARG from MSYS to Cygwin format.  Requires LT_CYGPATH set.
-# Returns result in func_to_host_file_result.
-func_convert_path_msys_to_cygwin ()
-{
-  $debug_cmd
-
-  func_to_host_path_result=$1
-  if test -n "$1"; then
-    # See func_convert_path_msys_to_w32:
-    func_stripname : : "$1"
-    func_to_host_path_tmp1=$func_stripname_result
-    func_convert_core_msys_to_w32 "$func_to_host_path_tmp1"
-    func_cygpath -u -p "$func_convert_core_msys_to_w32_result"
-    func_to_host_path_result=$func_cygpath_result
-    func_convert_path_check : : \
-      "$func_to_host_path_tmp1" "$func_to_host_path_result"
-    func_convert_path_front_back_pathsep ":*" "*:" : "$1"
-  fi
-}
-# end func_convert_path_msys_to_cygwin
-
-
-# func_convert_path_nix_to_cygwin ARG
-# Convert path ARG from *nix to Cygwin format.  Requires Cygwin installed in a
-# a wine environment, working winepath, and LT_CYGPATH set.  Returns result in
-# func_to_host_file_result.
-func_convert_path_nix_to_cygwin ()
-{
-  $debug_cmd
-
-  func_to_host_path_result=$1
-  if test -n "$1"; then
-    # Remove leading and trailing path separator characters from
-    # ARG. msys behavior is inconsistent here, cygpath turns them
-    # into '.;' and ';.', and winepath ignores them completely.
-    func_stripname : : "$1"
-    func_to_host_path_tmp1=$func_stripname_result
-    func_convert_core_path_wine_to_w32 "$func_to_host_path_tmp1"
-    func_cygpath -u -p "$func_convert_core_path_wine_to_w32_result"
-    func_to_host_path_result=$func_cygpath_result
-    func_convert_path_check : : \
-      "$func_to_host_path_tmp1" "$func_to_host_path_result"
-    func_convert_path_front_back_pathsep ":*" "*:" : "$1"
-  fi
-}
-# end func_convert_path_nix_to_cygwin
-
-
-# func_dll_def_p FILE
-# True iff FILE is a Windows DLL '.def' file.
-# Keep in sync with _LT_DLL_DEF_P in libtool.m4
-func_dll_def_p ()
-{
-  $debug_cmd
-
-  func_dll_def_p_tmp=`$SED -n \
-    -e 's/^[	 ]*//' \
-    -e '/^\(;.*\)*$/d' \
-    -e 's/^\(EXPORTS\|LIBRARY\)\([	 ].*\)*$/DEF/p' \
-    -e q \
-    "$1"`
-  test DEF = "$func_dll_def_p_tmp"
-}
-
-
-# func_mode_compile arg...
-func_mode_compile ()
-{
-    $debug_cmd
-
-    # Get the compilation command and the source file.
-    base_compile=
-    srcfile=$nonopt  #  always keep a non-empty value in "srcfile"
-    suppress_opt=yes
-    suppress_output=
-    arg_mode=normal
-    libobj=
-    later=
-    pie_flag=
-
-    for arg
-    do
-      case $arg_mode in
-      arg  )
-	# do not "continue".  Instead, add this to base_compile
-	lastarg=$arg
-	arg_mode=normal
-	;;
-
-      target )
-	libobj=$arg
-	arg_mode=normal
-	continue
-	;;
-
-      normal )
-	# Accept any command-line options.
-	case $arg in
-	-o)
-	  test -n "$libobj" && \
-	    func_fatal_error "you cannot specify '-o' more than once"
-	  arg_mode=target
-	  continue
-	  ;;
-
-	-pie | -fpie | -fPIE)
-          func_append pie_flag " $arg"
-	  continue
-	  ;;
-
-	-shared | -static | -prefer-pic | -prefer-non-pic)
-	  func_append later " $arg"
-	  continue
-	  ;;
-
-	-no-suppress)
-	  suppress_opt=no
-	  continue
-	  ;;
-
-	-Xcompiler)
-	  arg_mode=arg  #  the next one goes into the "base_compile" arg list
-	  continue      #  The current "srcfile" will either be retained or
-	  ;;            #  replaced later.  I would guess that would be a bug.
-
-	-Wc,*)
-	  func_stripname '-Wc,' '' "$arg"
-	  args=$func_stripname_result
-	  lastarg=
-	  save_ifs=$IFS; IFS=,
-	  for arg in $args; do
-	    IFS=$save_ifs
-	    func_append_quoted lastarg "$arg"
-	  done
-	  IFS=$save_ifs
-	  func_stripname ' ' '' "$lastarg"
-	  lastarg=$func_stripname_result
-
-	  # Add the arguments to base_compile.
-	  func_append base_compile " $lastarg"
-	  continue
-	  ;;
-
-	*)
-	  # Accept the current argument as the source file.
-	  # The previous "srcfile" becomes the current argument.
-	  #
-	  lastarg=$srcfile
-	  srcfile=$arg
-	  ;;
-	esac  #  case $arg
-	;;
-      esac    #  case $arg_mode
-
-      # Aesthetically quote the previous argument.
-      func_append_quoted base_compile "$lastarg"
-    done # for arg
-
-    case $arg_mode in
-    arg)
-      func_fatal_error "you must specify an argument for -Xcompile"
-      ;;
-    target)
-      func_fatal_error "you must specify a target with '-o'"
-      ;;
-    *)
-      # Get the name of the library object.
-      test -z "$libobj" && {
-	func_basename "$srcfile"
-	libobj=$func_basename_result
-      }
-      ;;
-    esac
-
-    # Recognize several different file suffixes.
-    # If the user specifies -o file.o, it is replaced with file.lo
-    case $libobj in
-    *.[cCFSifmso] | \
-    *.ada | *.adb | *.ads | *.asm | \
-    *.c++ | *.cc | *.ii | *.class | *.cpp | *.cxx | \
-    *.[fF][09]? | *.for | *.java | *.go | *.obj | *.sx | *.cu | *.cup)
-      func_xform "$libobj"
-      libobj=$func_xform_result
-      ;;
-    esac
-
-    case $libobj in
-    *.lo) func_lo2o "$libobj"; obj=$func_lo2o_result ;;
-    *)
-      func_fatal_error "cannot determine name of library object from '$libobj'"
-      ;;
-    esac
-
-    func_infer_tag $base_compile
-
-    for arg in $later; do
-      case $arg in
-      -shared)
-	test yes = "$build_libtool_libs" \
-	  || func_fatal_configuration "cannot build a shared library"
-	build_old_libs=no
-	continue
-	;;
-
-      -static)
-	build_libtool_libs=no
-	build_old_libs=yes
-	continue
-	;;
-
-      -prefer-pic)
-	pic_mode=yes
-	continue
-	;;
-
-      -prefer-non-pic)
-	pic_mode=no
-	continue
-	;;
-      esac
-    done
-
-    func_quote_arg pretty "$libobj"
-    test "X$libobj" != "X$func_quote_arg_result" \
-      && $ECHO "X$libobj" | $GREP '[]~#^*{};<>?"'"'"'	 &()|`$[]' \
-      && func_warning "libobj name '$libobj' may not contain shell special characters."
-    func_dirname_and_basename "$obj" "/" ""
-    objname=$func_basename_result
-    xdir=$func_dirname_result
-    lobj=$xdir$objdir/$objname
-
-    test -z "$base_compile" && \
-      func_fatal_help "you must specify a compilation command"
-
-    # Delete any leftover library objects.
-    if test yes = "$build_old_libs"; then
-      removelist="$obj $lobj $libobj ${libobj}T"
-    else
-      removelist="$lobj $libobj ${libobj}T"
-    fi
-
-    # On Cygwin there's no "real" PIC flag so we must build both object types
-    case $host_os in
-    cygwin* | mingw* | pw32* | os2* | cegcc*)
-      pic_mode=default
-      ;;
-    esac
-    if test no = "$pic_mode" && test pass_all != "$deplibs_check_method"; then
-      # non-PIC code in shared libraries is not supported
-      pic_mode=default
-    fi
-
-    # Calculate the filename of the output object if compiler does
-    # not support -o with -c
-    if test no = "$compiler_c_o"; then
-      output_obj=`$ECHO "$srcfile" | $SED 's%^.*/%%; s%\.[^.]*$%%'`.$objext
-      lockfile=$output_obj.lock
-    else
-      output_obj=
-      need_locks=no
-      lockfile=
-    fi
-
-    # Lock this critical section if it is needed
-    # We use this script file to make the link, it avoids creating a new file
-    if test yes = "$need_locks"; then
-      until $opt_dry_run || ln "$progpath" "$lockfile" 2>/dev/null; do
-	func_echo "Waiting for $lockfile to be removed"
-	sleep 2
-      done
-    elif test warn = "$need_locks"; then
-      if test -f "$lockfile"; then
-	$ECHO "\
-*** ERROR, $lockfile exists and contains:
-`cat $lockfile 2>/dev/null`
-
-This indicates that another process is trying to use the same
-temporary object file, and libtool could not work around it because
-your compiler does not support '-c' and '-o' together.  If you
-repeat this compilation, it may succeed, by chance, but you had better
-avoid parallel builds (make -j) in this platform, or get a better
-compiler."
-
-	$opt_dry_run || $RM $removelist
-	exit $EXIT_FAILURE
-      fi
-      func_append removelist " $output_obj"
-      $ECHO "$srcfile" > "$lockfile"
-    fi
-
-    $opt_dry_run || $RM $removelist
-    func_append removelist " $lockfile"
-    trap '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE' 1 2 15
-
-    func_to_tool_file "$srcfile" func_convert_file_msys_to_w32
-    srcfile=$func_to_tool_file_result
-    func_quote_arg pretty "$srcfile"
-    qsrcfile=$func_quote_arg_result
-
-    # Only build a PIC object if we are building libtool libraries.
-    if test yes = "$build_libtool_libs"; then
-      # Without this assignment, base_compile gets emptied.
-      fbsd_hideous_sh_bug=$base_compile
-
-      if test no != "$pic_mode"; then
-	command="$base_compile $qsrcfile $pic_flag"
-      else
-	# Don't build PIC code
-	command="$base_compile $qsrcfile"
-      fi
-
-      func_mkdir_p "$xdir$objdir"
-
-      if test -z "$output_obj"; then
-	# Place PIC objects in $objdir
-	func_append command " -o $lobj"
-      fi
-
-      func_show_eval_locale "$command"	\
-          'test -n "$output_obj" && $RM $removelist; exit $EXIT_FAILURE'
-
-      if test warn = "$need_locks" &&
-	 test "X`cat $lockfile 2>/dev/null`" != "X$srcfile"; then
-	$ECHO "\
-*** ERROR, $lockfile contains:
-`cat $lockfile 2>/dev/null`
-
-but it should contain:
-$srcfile
-
-This indicates that another process is trying to use the same
-temporary object file, and libtool could not work around it because
-your compiler does not support '-c' and '-o' together.  If you
-repeat this compilation, it may succeed, by chance, but you had better
-avoid parallel builds (make -j) in this platform, or get a better
-compiler."
-
-	$opt_dry_run || $RM $removelist
-	exit $EXIT_FAILURE
-      fi
-
-      # Just move the object if needed, then go on to compile the next one
-      if test -n "$output_obj" && test "X$output_obj" != "X$lobj"; then
-	func_show_eval '$MV "$output_obj" "$lobj"' \
-	  'error=$?; $opt_dry_run || $RM $removelist; exit $error'
-      fi
-
-      # Allow error messages only from the first compilation.
-      if test yes = "$suppress_opt"; then
-	suppress_output=' >/dev/null 2>&1'
-      fi
-    fi
-
-    # Only build a position-dependent object if we build old libraries.
-    if test yes = "$build_old_libs"; then
-      if test yes != "$pic_mode"; then
-	# Don't build PIC code
-	command="$base_compile $qsrcfile$pie_flag"
-      else
-	command="$base_compile $qsrcfile $pic_flag"
-      fi
-      if test yes = "$compiler_c_o"; then
-	func_append command " -o $obj"
-      fi
-
-      # Suppress compiler output if we already did a PIC compilation.
-      func_append command "$suppress_output"
-      func_show_eval_locale "$command" \
-        '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE'
-
-      if test warn = "$need_locks" &&
-	 test "X`cat $lockfile 2>/dev/null`" != "X$srcfile"; then
-	$ECHO "\
-*** ERROR, $lockfile contains:
-`cat $lockfile 2>/dev/null`
-
-but it should contain:
-$srcfile
-
-This indicates that another process is trying to use the same
-temporary object file, and libtool could not work around it because
-your compiler does not support '-c' and '-o' together.  If you
-repeat this compilation, it may succeed, by chance, but you had better
-avoid parallel builds (make -j) in this platform, or get a better
-compiler."
-
-	$opt_dry_run || $RM $removelist
-	exit $EXIT_FAILURE
-      fi
-
-      # Just move the object if needed
-      if test -n "$output_obj" && test "X$output_obj" != "X$obj"; then
-	func_show_eval '$MV "$output_obj" "$obj"' \
-	  'error=$?; $opt_dry_run || $RM $removelist; exit $error'
-      fi
-    fi
-
-    $opt_dry_run || {
-      func_write_libtool_object "$libobj" "$objdir/$objname" "$objname"
-
-      # Unlock the critical section if it was locked
-      if test no != "$need_locks"; then
-	removelist=$lockfile
-        $RM "$lockfile"
-      fi
-    }
-
-    exit $EXIT_SUCCESS
-}
-
-$opt_help || {
-  test compile = "$opt_mode" && func_mode_compile ${1+"$@"}
-}
-
-func_mode_help ()
-{
-    # We need to display help for each of the modes.
-    case $opt_mode in
-      "")
-        # Generic help is extracted from the usage comments
-        # at the start of this file.
-        func_help
-        ;;
-
-      clean)
-        $ECHO \
-"Usage: $progname [OPTION]... --mode=clean RM [RM-OPTION]... FILE...
-
-Remove files from the build directory.
-
-RM is the name of the program to use to delete files associated with each FILE
-(typically '/bin/rm').  RM-OPTIONS are options (such as '-f') to be passed
-to RM.
-
-If FILE is a libtool library, object or program, all the files associated
-with it are deleted. Otherwise, only FILE itself is deleted using RM."
-        ;;
-
-      compile)
-      $ECHO \
-"Usage: $progname [OPTION]... --mode=compile COMPILE-COMMAND... SOURCEFILE
-
-Compile a source file into a libtool library object.
-
-This mode accepts the following additional options:
-
-  -o OUTPUT-FILE    set the output file name to OUTPUT-FILE
-  -no-suppress      do not suppress compiler output for multiple passes
-  -prefer-pic       try to build PIC objects only
-  -prefer-non-pic   try to build non-PIC objects only
-  -shared           do not build a '.o' file suitable for static linking
-  -static           only build a '.o' file suitable for static linking
-  -Wc,FLAG          pass FLAG directly to the compiler
-
-COMPILE-COMMAND is a command to be used in creating a 'standard' object file
-from the given SOURCEFILE.
-
-The output file name is determined by removing the directory component from
-SOURCEFILE, then substituting the C source code suffix '.c' with the
-library object suffix, '.lo'."
-        ;;
-
-      execute)
-        $ECHO \
-"Usage: $progname [OPTION]... --mode=execute COMMAND [ARGS]...
-
-Automatically set library path, then run a program.
-
-This mode accepts the following additional options:
-
-  -dlopen FILE      add the directory containing FILE to the library path
-
-This mode sets the library path environment variable according to '-dlopen'
-flags.
-
-If any of the ARGS are libtool executable wrappers, then they are translated
-into their corresponding uninstalled binary, and any of their required library
-directories are added to the library path.
-
-Then, COMMAND is executed, with ARGS as arguments."
-        ;;
-
-      finish)
-        $ECHO \
-"Usage: $progname [OPTION]... --mode=finish [LIBDIR]...
-
-Complete the installation of libtool libraries.
-
-Each LIBDIR is a directory that contains libtool libraries.
-
-The commands that this mode executes may require superuser privileges.  Use
-the '--dry-run' option if you just want to see what would be executed."
-        ;;
-
-      install)
-        $ECHO \
-"Usage: $progname [OPTION]... --mode=install INSTALL-COMMAND...
-
-Install executables or libraries.
-
-INSTALL-COMMAND is the installation command.  The first component should be
-either the 'install' or 'cp' program.
-
-The following components of INSTALL-COMMAND are treated specially:
-
-  -inst-prefix-dir PREFIX-DIR  Use PREFIX-DIR as a staging area for installation
-
-The rest of the components are interpreted as arguments to that command (only
-BSD-compatible install options are recognized)."
-        ;;
-
-      link)
-        $ECHO \
-"Usage: $progname [OPTION]... --mode=link LINK-COMMAND...
-
-Link object files or libraries together to form another library, or to
-create an executable program.
-
-LINK-COMMAND is a command using the C compiler that you would use to create
-a program from several object files.
-
-The following components of LINK-COMMAND are treated specially:
-
-  -all-static       do not do any dynamic linking at all
-  -avoid-version    do not add a version suffix if possible
-  -bindir BINDIR    specify path to binaries directory (for systems where
-                    libraries must be found in the PATH setting at runtime)
-  -dlopen FILE      '-dlpreopen' FILE if it cannot be dlopened at runtime
-  -dlpreopen FILE   link in FILE and add its symbols to lt_preloaded_symbols
-  -export-dynamic   allow symbols from OUTPUT-FILE to be resolved with dlsym(3)
-  -export-symbols SYMFILE
-                    try to export only the symbols listed in SYMFILE
-  -export-symbols-regex REGEX
-                    try to export only the symbols matching REGEX
-  -LLIBDIR          search LIBDIR for required installed libraries
-  -lNAME            OUTPUT-FILE requires the installed library libNAME
-  -module           build a library that can dlopened
-  -no-fast-install  disable the fast-install mode
-  -no-install       link a not-installable executable
-  -no-undefined     declare that a library does not refer to external symbols
-  -o OUTPUT-FILE    create OUTPUT-FILE from the specified objects
-  -objectlist FILE  use a list of object files found in FILE to specify objects
-  -os2dllname NAME  force a short DLL name on OS/2 (no effect on other OSes)
-  -precious-files-regex REGEX
-                    don't remove output files matching REGEX
-  -release RELEASE  specify package release information
-  -rpath LIBDIR     the created library will eventually be installed in LIBDIR
-  -R[ ]LIBDIR       add LIBDIR to the runtime path of programs and libraries
-  -shared           only do dynamic linking of libtool libraries
-  -shrext SUFFIX    override the standard shared library file extension
-  -static           do not do any dynamic linking of uninstalled libtool libraries
-  -static-libtool-libs
-                    do not do any dynamic linking of libtool libraries
-  -version-info CURRENT[:REVISION[:AGE]]
-                    specify library version info [each variable defaults to 0]
-  -weak LIBNAME     declare that the target provides the LIBNAME interface
-  -Wc,FLAG
-  -Xcompiler FLAG   pass linker-specific FLAG directly to the compiler
-  -Wl,FLAG
-  -Xlinker FLAG     pass linker-specific FLAG directly to the linker
-  -XCClinker FLAG   pass link-specific FLAG to the compiler driver (CC)
-
-All other options (arguments beginning with '-') are ignored.
-
-Every other argument is treated as a filename.  Files ending in '.la' are
-treated as uninstalled libtool libraries, other files are standard or library
-object files.
-
-If the OUTPUT-FILE ends in '.la', then a libtool library is created,
-only library objects ('.lo' files) may be specified, and '-rpath' is
-required, except when creating a convenience library.
-
-If OUTPUT-FILE ends in '.a' or '.lib', then a standard library is created
-using 'ar' and 'ranlib', or on Windows using 'lib'.
-
-If OUTPUT-FILE ends in '.lo' or '.$objext', then a reloadable object file
-is created, otherwise an executable program is created."
-        ;;
-
-      uninstall)
-        $ECHO \
-"Usage: $progname [OPTION]... --mode=uninstall RM [RM-OPTION]... FILE...
-
-Remove libraries from an installation directory.
-
-RM is the name of the program to use to delete files associated with each FILE
-(typically '/bin/rm').  RM-OPTIONS are options (such as '-f') to be passed
-to RM.
-
-If FILE is a libtool library, all the files associated with it are deleted.
-Otherwise, only FILE itself is deleted using RM."
-        ;;
-
-      *)
-        func_fatal_help "invalid operation mode '$opt_mode'"
-        ;;
-    esac
-
-    echo
-    $ECHO "Try '$progname --help' for more information about other modes."
-}
-
-# Now that we've collected a possible --mode arg, show help if necessary
-if $opt_help; then
-  if test : = "$opt_help"; then
-    func_mode_help
-  else
-    {
-      func_help noexit
-      for opt_mode in compile link execute install finish uninstall clean; do
-	func_mode_help
-      done
-    } | $SED -n '1p; 2,$s/^Usage:/  or: /p'
-    {
-      func_help noexit
-      for opt_mode in compile link execute install finish uninstall clean; do
-	echo
-	func_mode_help
-      done
-    } |
-    $SED '1d
-      /^When reporting/,/^Report/{
-	H
-	d
-      }
-      $x
-      /information about other modes/d
-      /more detailed .*MODE/d
-      s/^Usage:.*--mode=\([^ ]*\) .*/Description of \1 mode:/'
-  fi
-  exit $?
-fi
-
-
-# func_mode_execute arg...
-func_mode_execute ()
-{
-    $debug_cmd
-
-    # The first argument is the command name.
-    cmd=$nonopt
-    test -z "$cmd" && \
-      func_fatal_help "you must specify a COMMAND"
-
-    # Handle -dlopen flags immediately.
-    for file in $opt_dlopen; do
-      test -f "$file" \
-	|| func_fatal_help "'$file' is not a file"
-
-      dir=
-      case $file in
-      *.la)
-	func_resolve_sysroot "$file"
-	file=$func_resolve_sysroot_result
-
-	# Check to see that this really is a libtool archive.
-	func_lalib_unsafe_p "$file" \
-	  || func_fatal_help "'$lib' is not a valid libtool archive"
-
-	# Read the libtool library.
-	dlname=
-	library_names=
-	func_source "$file"
-
-	# Skip this library if it cannot be dlopened.
-	if test -z "$dlname"; then
-	  # Warn if it was a shared library.
-	  test -n "$library_names" && \
-	    func_warning "'$file' was not linked with '-export-dynamic'"
-	  continue
-	fi
-
-	func_dirname "$file" "" "."
-	dir=$func_dirname_result
-
-	if test -f "$dir/$objdir/$dlname"; then
-	  func_append dir "/$objdir"
-	else
-	  if test ! -f "$dir/$dlname"; then
-	    func_fatal_error "cannot find '$dlname' in '$dir' or '$dir/$objdir'"
-	  fi
-	fi
-	;;
-
-      *.lo)
-	# Just add the directory containing the .lo file.
-	func_dirname "$file" "" "."
-	dir=$func_dirname_result
-	;;
-
-      *)
-	func_warning "'-dlopen' is ignored for non-libtool libraries and objects"
-	continue
-	;;
-      esac
-
-      # Get the absolute pathname.
-      absdir=`cd "$dir" && pwd`
-      test -n "$absdir" && dir=$absdir
-
-      # Now add the directory to shlibpath_var.
-      if eval "test -z \"\$$shlibpath_var\""; then
-	eval "$shlibpath_var=\"\$dir\""
-      else
-	eval "$shlibpath_var=\"\$dir:\$$shlibpath_var\""
-      fi
-    done
-
-    # This variable tells wrapper scripts just to set shlibpath_var
-    # rather than running their programs.
-    libtool_execute_magic=$magic
-
-    # Check if any of the arguments is a wrapper script.
-    args=
-    for file
-    do
-      case $file in
-      -* | *.la | *.lo ) ;;
-      *)
-	# Do a test to see if this is really a libtool program.
-	if func_ltwrapper_script_p "$file"; then
-	  func_source "$file"
-	  # Transform arg to wrapped name.
-	  file=$progdir/$program
-	elif func_ltwrapper_executable_p "$file"; then
-	  func_ltwrapper_scriptname "$file"
-	  func_source "$func_ltwrapper_scriptname_result"
-	  # Transform arg to wrapped name.
-	  file=$progdir/$program
-	fi
-	;;
-      esac
-      # Quote arguments (to preserve shell metacharacters).
-      func_append_quoted args "$file"
-    done
-
-    if $opt_dry_run; then
-      # Display what would be done.
-      if test -n "$shlibpath_var"; then
-	eval "\$ECHO \"\$shlibpath_var=\$$shlibpath_var\""
-	echo "export $shlibpath_var"
-      fi
-      $ECHO "$cmd$args"
-      exit $EXIT_SUCCESS
-    else
-      if test -n "$shlibpath_var"; then
-	# Export the shlibpath_var.
-	eval "export $shlibpath_var"
-      fi
-
-      # Restore saved environment variables
-      for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
-      do
-	eval "if test \"\${save_$lt_var+set}\" = set; then
-                $lt_var=\$save_$lt_var; export $lt_var
-	      else
-		$lt_unset $lt_var
-	      fi"
-      done
-
-      # Now prepare to actually exec the command.
-      exec_cmd=\$cmd$args
-    fi
-}
-
-test execute = "$opt_mode" && func_mode_execute ${1+"$@"}
-
-
-# func_mode_finish arg...
-func_mode_finish ()
-{
-    $debug_cmd
-
-    libs=
-    libdirs=
-    admincmds=
-
-    for opt in "$nonopt" ${1+"$@"}
-    do
-      if test -d "$opt"; then
-	func_append libdirs " $opt"
-
-      elif test -f "$opt"; then
-	if func_lalib_unsafe_p "$opt"; then
-	  func_append libs " $opt"
-	else
-	  func_warning "'$opt' is not a valid libtool archive"
-	fi
-
-      else
-	func_fatal_error "invalid argument '$opt'"
-      fi
-    done
-
-    if test -n "$libs"; then
-      if test -n "$lt_sysroot"; then
-        sysroot_regex=`$ECHO "$lt_sysroot" | $SED "$sed_make_literal_regex"`
-        sysroot_cmd="s/\([ ']\)$sysroot_regex/\1/g;"
-      else
-        sysroot_cmd=
-      fi
-
-      # Remove sysroot references
-      if $opt_dry_run; then
-        for lib in $libs; do
-          echo "removing references to $lt_sysroot and '=' prefixes from $lib"
-        done
-      else
-        tmpdir=`func_mktempdir`
-        for lib in $libs; do
-	  $SED -e "$sysroot_cmd s/\([ ']-[LR]\)=/\1/g; s/\([ ']\)=/\1/g" $lib \
-	    > $tmpdir/tmp-la
-	  mv -f $tmpdir/tmp-la $lib
-	done
-        ${RM}r "$tmpdir"
-      fi
-    fi
-
-    if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then
-      for libdir in $libdirs; do
-	if test -n "$finish_cmds"; then
-	  # Do each command in the finish commands.
-	  func_execute_cmds "$finish_cmds" 'admincmds="$admincmds
-'"$cmd"'"'
-	fi
-	if test -n "$finish_eval"; then
-	  # Do the single finish_eval.
-	  eval cmds=\"$finish_eval\"
-	  $opt_dry_run || eval "$cmds" || func_append admincmds "
-       $cmds"
-	fi
-      done
-    fi
-
-    # Exit here if they wanted silent mode.
-    $opt_quiet && exit $EXIT_SUCCESS
-
-    if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then
-      echo "----------------------------------------------------------------------"
-      echo "Libraries have been installed in:"
-      for libdir in $libdirs; do
-	$ECHO "   $libdir"
-      done
-      echo
-      echo "If you ever happen to want to link against installed libraries"
-      echo "in a given directory, LIBDIR, you must either use libtool, and"
-      echo "specify the full pathname of the library, or use the '-LLIBDIR'"
-      echo "flag during linking and do at least one of the following:"
-      if test -n "$shlibpath_var"; then
-	echo "   - add LIBDIR to the '$shlibpath_var' environment variable"
-	echo "     during execution"
-      fi
-      if test -n "$runpath_var"; then
-	echo "   - add LIBDIR to the '$runpath_var' environment variable"
-	echo "     during linking"
-      fi
-      if test -n "$hardcode_libdir_flag_spec"; then
-	libdir=LIBDIR
-	eval flag=\"$hardcode_libdir_flag_spec\"
-
-	$ECHO "   - use the '$flag' linker flag"
-      fi
-      if test -n "$admincmds"; then
-	$ECHO "   - have your system administrator run these commands:$admincmds"
-      fi
-      if test -f /etc/ld.so.conf; then
-	echo "   - have your system administrator add LIBDIR to '/etc/ld.so.conf'"
-      fi
-      echo
-
-      echo "See any operating system documentation about shared libraries for"
-      case $host in
-	solaris2.[6789]|solaris2.1[0-9])
-	  echo "more information, such as the ld(1), crle(1) and ld.so(8) manual"
-	  echo "pages."
-	  ;;
-	*)
-	  echo "more information, such as the ld(1) and ld.so(8) manual pages."
-	  ;;
-      esac
-      echo "----------------------------------------------------------------------"
-    fi
-    exit $EXIT_SUCCESS
-}
-
-test finish = "$opt_mode" && func_mode_finish ${1+"$@"}
-
-
-# func_mode_install arg...
-func_mode_install ()
-{
-    $debug_cmd
-
-    # There may be an optional sh(1) argument at the beginning of
-    # install_prog (especially on Windows NT).
-    if test "$SHELL" = "$nonopt" || test /bin/sh = "$nonopt" ||
-       # Allow the use of GNU shtool's install command.
-       case $nonopt in *shtool*) :;; *) false;; esac
-    then
-      # Aesthetically quote it.
-      func_quote_arg pretty "$nonopt"
-      install_prog="$func_quote_arg_result "
-      arg=$1
-      shift
-    else
-      install_prog=
-      arg=$nonopt
-    fi
-
-    # The real first argument should be the name of the installation program.
-    # Aesthetically quote it.
-    func_quote_arg pretty "$arg"
-    func_append install_prog "$func_quote_arg_result"
-    install_shared_prog=$install_prog
-    case " $install_prog " in
-      *[\\\ /]cp\ *) install_cp=: ;;
-      *) install_cp=false ;;
-    esac
-
-    # We need to accept at least all the BSD install flags.
-    dest=
-    files=
-    opts=
-    prev=
-    install_type=
-    isdir=false
-    stripme=
-    no_mode=:
-    for arg
-    do
-      arg2=
-      if test -n "$dest"; then
-	func_append files " $dest"
-	dest=$arg
-	continue
-      fi
-
-      case $arg in
-      -d) isdir=: ;;
-      -f)
-	if $install_cp; then :; else
-	  prev=$arg
-	fi
-	;;
-      -g | -m | -o)
-	prev=$arg
-	;;
-      -s)
-	stripme=" -s"
-	continue
-	;;
-      -*)
-	;;
-      *)
-	# If the previous option needed an argument, then skip it.
-	if test -n "$prev"; then
-	  if test X-m = "X$prev" && test -n "$install_override_mode"; then
-	    arg2=$install_override_mode
-	    no_mode=false
-	  fi
-	  prev=
-	else
-	  dest=$arg
-	  continue
-	fi
-	;;
-      esac
-
-      # Aesthetically quote the argument.
-      func_quote_arg pretty "$arg"
-      func_append install_prog " $func_quote_arg_result"
-      if test -n "$arg2"; then
-	func_quote_arg pretty "$arg2"
-      fi
-      func_append install_shared_prog " $func_quote_arg_result"
-    done
-
-    test -z "$install_prog" && \
-      func_fatal_help "you must specify an install program"
-
-    test -n "$prev" && \
-      func_fatal_help "the '$prev' option requires an argument"
-
-    if test -n "$install_override_mode" && $no_mode; then
-      if $install_cp; then :; else
-	func_quote_arg pretty "$install_override_mode"
-	func_append install_shared_prog " -m $func_quote_arg_result"
-      fi
-    fi
-
-    if test -z "$files"; then
-      if test -z "$dest"; then
-	func_fatal_help "no file or destination specified"
-      else
-	func_fatal_help "you must specify a destination"
-      fi
-    fi
-
-    # Strip any trailing slash from the destination.
-    func_stripname '' '/' "$dest"
-    dest=$func_stripname_result
-
-    # Check to see that the destination is a directory.
-    test -d "$dest" && isdir=:
-    if $isdir; then
-      destdir=$dest
-      destname=
-    else
-      func_dirname_and_basename "$dest" "" "."
-      destdir=$func_dirname_result
-      destname=$func_basename_result
-
-      # Not a directory, so check to see that there is only one file specified.
-      set dummy $files; shift
-      test "$#" -gt 1 && \
-	func_fatal_help "'$dest' is not a directory"
-    fi
-    case $destdir in
-    [\\/]* | [A-Za-z]:[\\/]*) ;;
-    *)
-      for file in $files; do
-	case $file in
-	*.lo) ;;
-	*)
-	  func_fatal_help "'$destdir' must be an absolute directory name"
-	  ;;
-	esac
-      done
-      ;;
-    esac
-
-    # This variable tells wrapper scripts just to set variables rather
-    # than running their programs.
-    libtool_install_magic=$magic
-
-    staticlibs=
-    future_libdirs=
-    current_libdirs=
-    for file in $files; do
-
-      # Do each installation.
-      case $file in
-      *.$libext)
-	# Do the static libraries later.
-	func_append staticlibs " $file"
-	;;
-
-      *.la)
-	func_resolve_sysroot "$file"
-	file=$func_resolve_sysroot_result
-
-	# Check to see that this really is a libtool archive.
-	func_lalib_unsafe_p "$file" \
-	  || func_fatal_help "'$file' is not a valid libtool archive"
-
-	library_names=
-	old_library=
-	relink_command=
-	func_source "$file"
-
-	# Add the libdir to current_libdirs if it is the destination.
-	if test "X$destdir" = "X$libdir"; then
-	  case "$current_libdirs " in
-	  *" $libdir "*) ;;
-	  *) func_append current_libdirs " $libdir" ;;
-	  esac
-	else
-	  # Note the libdir as a future libdir.
-	  case "$future_libdirs " in
-	  *" $libdir "*) ;;
-	  *) func_append future_libdirs " $libdir" ;;
-	  esac
-	fi
-
-	func_dirname "$file" "/" ""
-	dir=$func_dirname_result
-	func_append dir "$objdir"
-
-	if test -n "$relink_command"; then
-	  # Determine the prefix the user has applied to our future dir.
-	  inst_prefix_dir=`$ECHO "$destdir" | $SED -e "s%$libdir\$%%"`
-
-	  # Don't allow the user to place us outside of our expected
-	  # location b/c this prevents finding dependent libraries that
-	  # are installed to the same prefix.
-	  # At present, this check doesn't affect windows .dll's that
-	  # are installed into $libdir/../bin (currently, that works fine)
-	  # but it's something to keep an eye on.
-	  test "$inst_prefix_dir" = "$destdir" && \
-	    func_fatal_error "error: cannot install '$file' to a directory not ending in $libdir"
-
-	  if test -n "$inst_prefix_dir"; then
-	    # Stick the inst_prefix_dir data into the link command.
-	    relink_command=`$ECHO "$relink_command" | $SED "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"`
-	  else
-	    relink_command=`$ECHO "$relink_command" | $SED "s%@inst_prefix_dir@%%"`
-	  fi
-
-	  func_warning "relinking '$file'"
-	  func_show_eval "$relink_command" \
-	    'func_fatal_error "error: relink '\''$file'\'' with the above command before installing it"'
-	fi
-
-	# See the names of the shared library.
-	set dummy $library_names; shift
-	if test -n "$1"; then
-	  realname=$1
-	  shift
-
-	  srcname=$realname
-	  test -n "$relink_command" && srcname=${realname}T
-
-	  # Install the shared library and build the symlinks.
-	  func_show_eval "$install_shared_prog $dir/$srcname $destdir/$realname" \
-	      'exit $?'
-	  tstripme=$stripme
-	  case $host_os in
-	  cygwin* | mingw* | pw32* | cegcc*)
-	    case $realname in
-	    *.dll.a)
-	      tstripme=
-	      ;;
-	    esac
-	    ;;
-	  os2*)
-	    case $realname in
-	    *_dll.a)
-	      tstripme=
-	      ;;
-	    esac
-	    ;;
-	  esac
-	  if test -n "$tstripme" && test -n "$striplib"; then
-	    func_show_eval "$striplib $destdir/$realname" 'exit $?'
-	  fi
-
-	  if test "$#" -gt 0; then
-	    # Delete the old symlinks, and create new ones.
-	    # Try 'ln -sf' first, because the 'ln' binary might depend on
-	    # the symlink we replace!  Solaris /bin/ln does not understand -f,
-	    # so we also need to try rm && ln -s.
-	    for linkname
-	    do
-	      test "$linkname" != "$realname" \
-		&& func_show_eval "(cd $destdir && { $LN_S -f $realname $linkname || { $RM $linkname && $LN_S $realname $linkname; }; })"
-	    done
-	  fi
-
-	  # Do each command in the postinstall commands.
-	  lib=$destdir/$realname
-	  func_execute_cmds "$postinstall_cmds" 'exit $?'
-	fi
-
-	# Install the pseudo-library for information purposes.
-	func_basename "$file"
-	name=$func_basename_result
-	instname=$dir/${name}i
-	func_show_eval "$install_prog $instname $destdir/$name" 'exit $?'
-
-	# Maybe install the static library, too.
-	test -n "$old_library" && func_append staticlibs " $dir/$old_library"
-	;;
-
-      *.lo)
-	# Install (i.e. copy) a libtool object.
-
-	# Figure out destination file name, if it wasn't already specified.
-	if test -n "$destname"; then
-	  destfile=$destdir/$destname
-	else
-	  func_basename "$file"
-	  destfile=$func_basename_result
-	  destfile=$destdir/$destfile
-	fi
-
-	# Deduce the name of the destination old-style object file.
-	case $destfile in
-	*.lo)
-	  func_lo2o "$destfile"
-	  staticdest=$func_lo2o_result
-	  ;;
-	*.$objext)
-	  staticdest=$destfile
-	  destfile=
-	  ;;
-	*)
-	  func_fatal_help "cannot copy a libtool object to '$destfile'"
-	  ;;
-	esac
-
-	# Install the libtool object if requested.
-	test -n "$destfile" && \
-	  func_show_eval "$install_prog $file $destfile" 'exit $?'
-
-	# Install the old object if enabled.
-	if test yes = "$build_old_libs"; then
-	  # Deduce the name of the old-style object file.
-	  func_lo2o "$file"
-	  staticobj=$func_lo2o_result
-	  func_show_eval "$install_prog \$staticobj \$staticdest" 'exit $?'
-	fi
-	exit $EXIT_SUCCESS
-	;;
-
-      *)
-	# Figure out destination file name, if it wasn't already specified.
-	if test -n "$destname"; then
-	  destfile=$destdir/$destname
-	else
-	  func_basename "$file"
-	  destfile=$func_basename_result
-	  destfile=$destdir/$destfile
-	fi
-
-	# If the file is missing, and there is a .exe on the end, strip it
-	# because it is most likely a libtool script we actually want to
-	# install
-	stripped_ext=
-	case $file in
-	  *.exe)
-	    if test ! -f "$file"; then
-	      func_stripname '' '.exe' "$file"
-	      file=$func_stripname_result
-	      stripped_ext=.exe
-	    fi
-	    ;;
-	esac
-
-	# Do a test to see if this is really a libtool program.
-	case $host in
-	*cygwin* | *mingw*)
-	    if func_ltwrapper_executable_p "$file"; then
-	      func_ltwrapper_scriptname "$file"
-	      wrapper=$func_ltwrapper_scriptname_result
-	    else
-	      func_stripname '' '.exe' "$file"
-	      wrapper=$func_stripname_result
-	    fi
-	    ;;
-	*)
-	    wrapper=$file
-	    ;;
-	esac
-	if func_ltwrapper_script_p "$wrapper"; then
-	  notinst_deplibs=
-	  relink_command=
-
-	  func_source "$wrapper"
-
-	  # Check the variables that should have been set.
-	  test -z "$generated_by_libtool_version" && \
-	    func_fatal_error "invalid libtool wrapper script '$wrapper'"
-
-	  finalize=:
-	  for lib in $notinst_deplibs; do
-	    # Check to see that each library is installed.
-	    libdir=
-	    if test -f "$lib"; then
-	      func_source "$lib"
-	    fi
-	    libfile=$libdir/`$ECHO "$lib" | $SED 's%^.*/%%g'`
-	    if test -n "$libdir" && test ! -f "$libfile"; then
-	      func_warning "'$lib' has not been installed in '$libdir'"
-	      finalize=false
-	    fi
-	  done
-
-	  relink_command=
-	  func_source "$wrapper"
-
-	  outputname=
-	  if test no = "$fast_install" && test -n "$relink_command"; then
-	    $opt_dry_run || {
-	      if $finalize; then
-	        tmpdir=`func_mktempdir`
-		func_basename "$file$stripped_ext"
-		file=$func_basename_result
-	        outputname=$tmpdir/$file
-	        # Replace the output file specification.
-	        relink_command=`$ECHO "$relink_command" | $SED 's%@OUTPUT@%'"$outputname"'%g'`
-
-	        $opt_quiet || {
-	          func_quote_arg expand,pretty "$relink_command"
-		  eval "func_echo $func_quote_arg_result"
-	        }
-	        if eval "$relink_command"; then :
-	          else
-		  func_error "error: relink '$file' with the above command before installing it"
-		  $opt_dry_run || ${RM}r "$tmpdir"
-		  continue
-	        fi
-	        file=$outputname
-	      else
-	        func_warning "cannot relink '$file'"
-	      fi
-	    }
-	  else
-	    # Install the binary that we compiled earlier.
-	    file=`$ECHO "$file$stripped_ext" | $SED "s%\([^/]*\)$%$objdir/\1%"`
-	  fi
-	fi
-
-	# remove .exe since cygwin /usr/bin/install will append another
-	# one anyway
-	case $install_prog,$host in
-	*/usr/bin/install*,*cygwin*)
-	  case $file:$destfile in
-	  *.exe:*.exe)
-	    # this is ok
-	    ;;
-	  *.exe:*)
-	    destfile=$destfile.exe
-	    ;;
-	  *:*.exe)
-	    func_stripname '' '.exe' "$destfile"
-	    destfile=$func_stripname_result
-	    ;;
-	  esac
-	  ;;
-	esac
-	func_show_eval "$install_prog\$stripme \$file \$destfile" 'exit $?'
-	$opt_dry_run || if test -n "$outputname"; then
-	  ${RM}r "$tmpdir"
-	fi
-	;;
-      esac
-    done
-
-    for file in $staticlibs; do
-      func_basename "$file"
-      name=$func_basename_result
-
-      # Set up the ranlib parameters.
-      oldlib=$destdir/$name
-      func_to_tool_file "$oldlib" func_convert_file_msys_to_w32
-      tool_oldlib=$func_to_tool_file_result
-
-      func_show_eval "$install_prog \$file \$oldlib" 'exit $?'
-
-      if test -n "$stripme" && test -n "$old_striplib"; then
-	func_show_eval "$old_striplib $tool_oldlib" 'exit $?'
-      fi
-
-      # Do each command in the postinstall commands.
-      func_execute_cmds "$old_postinstall_cmds" 'exit $?'
-    done
-
-    test -n "$future_libdirs" && \
-      func_warning "remember to run '$progname --finish$future_libdirs'"
-
-    if test -n "$current_libdirs"; then
-      # Maybe just do a dry run.
-      $opt_dry_run && current_libdirs=" -n$current_libdirs"
-      exec_cmd='$SHELL "$progpath" $preserve_args --finish$current_libdirs'
-    else
-      exit $EXIT_SUCCESS
-    fi
-}
-
-test install = "$opt_mode" && func_mode_install ${1+"$@"}
-
-
-# func_generate_dlsyms outputname originator pic_p
-# Extract symbols from dlprefiles and create ${outputname}S.o with
-# a dlpreopen symbol table.
-func_generate_dlsyms ()
-{
-    $debug_cmd
-
-    my_outputname=$1
-    my_originator=$2
-    my_pic_p=${3-false}
-    my_prefix=`$ECHO "$my_originator" | $SED 's%[^a-zA-Z0-9]%_%g'`
-    my_dlsyms=
-
-    if test -n "$dlfiles$dlprefiles" || test no != "$dlself"; then
-      if test -n "$NM" && test -n "$global_symbol_pipe"; then
-	my_dlsyms=${my_outputname}S.c
-      else
-	func_error "not configured to extract global symbols from dlpreopened files"
-      fi
-    fi
-
-    if test -n "$my_dlsyms"; then
-      case $my_dlsyms in
-      "") ;;
-      *.c)
-	# Discover the nlist of each of the dlfiles.
-	nlist=$output_objdir/$my_outputname.nm
-
-	func_show_eval "$RM $nlist ${nlist}S ${nlist}T"
-
-	# Parse the name list into a source file.
-	func_verbose "creating $output_objdir/$my_dlsyms"
-
-	$opt_dry_run || $ECHO > "$output_objdir/$my_dlsyms" "\
-/* $my_dlsyms - symbol resolution table for '$my_outputname' dlsym emulation. */
-/* Generated by $PROGRAM (GNU $PACKAGE) $VERSION */
-
-#ifdef __cplusplus
-extern \"C\" {
-#endif
-
-#if defined __GNUC__ && (((__GNUC__ == 4) && (__GNUC_MINOR__ >= 4)) || (__GNUC__ > 4))
-#pragma GCC diagnostic ignored \"-Wstrict-prototypes\"
-#endif
-
-/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests.  */
-#if defined _WIN32 || defined __CYGWIN__ || defined _WIN32_WCE
-/* DATA imports from DLLs on WIN32 can't be const, because runtime
-   relocations are performed -- see ld's documentation on pseudo-relocs.  */
-# define LT_DLSYM_CONST
-#elif defined __osf__
-/* This system does not cope well with relocations in const data.  */
-# define LT_DLSYM_CONST
-#else
-# define LT_DLSYM_CONST const
-#endif
-
-#define STREQ(s1, s2) (strcmp ((s1), (s2)) == 0)
-
-/* External symbol declarations for the compiler. */\
-"
-
-	if test yes = "$dlself"; then
-	  func_verbose "generating symbol list for '$output'"
-
-	  $opt_dry_run || echo ': @PROGRAM@ ' > "$nlist"
-
-	  # Add our own program objects to the symbol list.
-	  progfiles=`$ECHO "$objs$old_deplibs" | $SP2NL | $SED "$lo2o" | $NL2SP`
-	  for progfile in $progfiles; do
-	    func_to_tool_file "$progfile" func_convert_file_msys_to_w32
-	    func_verbose "extracting global C symbols from '$func_to_tool_file_result'"
-	    $opt_dry_run || eval "$NM $func_to_tool_file_result | $global_symbol_pipe >> '$nlist'"
-	  done
-
-	  if test -n "$exclude_expsyms"; then
-	    $opt_dry_run || {
-	      eval '$EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T'
-	      eval '$MV "$nlist"T "$nlist"'
-	    }
-	  fi
-
-	  if test -n "$export_symbols_regex"; then
-	    $opt_dry_run || {
-	      eval '$EGREP -e "$export_symbols_regex" "$nlist" > "$nlist"T'
-	      eval '$MV "$nlist"T "$nlist"'
-	    }
-	  fi
-
-	  # Prepare the list of exported symbols
-	  if test -z "$export_symbols"; then
-	    export_symbols=$output_objdir/$outputname.exp
-	    $opt_dry_run || {
-	      $RM $export_symbols
-	      eval "$SED -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"'
-	      case $host in
-	      *cygwin* | *mingw* | *cegcc* )
-                eval "echo EXPORTS "'> "$output_objdir/$outputname.def"'
-                eval 'cat "$export_symbols" >> "$output_objdir/$outputname.def"'
-	        ;;
-	      esac
-	    }
-	  else
-	    $opt_dry_run || {
-	      eval "$SED -e 's/\([].[*^$]\)/\\\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$outputname.exp"'
-	      eval '$GREP -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T'
-	      eval '$MV "$nlist"T "$nlist"'
-	      case $host in
-	        *cygwin* | *mingw* | *cegcc* )
-	          eval "echo EXPORTS "'> "$output_objdir/$outputname.def"'
-	          eval 'cat "$nlist" >> "$output_objdir/$outputname.def"'
-	          ;;
-	      esac
-	    }
-	  fi
-	fi
-
-	for dlprefile in $dlprefiles; do
-	  func_verbose "extracting global C symbols from '$dlprefile'"
-	  func_basename "$dlprefile"
-	  name=$func_basename_result
-          case $host in
-	    *cygwin* | *mingw* | *cegcc* )
-	      # if an import library, we need to obtain dlname
-	      if func_win32_import_lib_p "$dlprefile"; then
-	        func_tr_sh "$dlprefile"
-	        eval "curr_lafile=\$libfile_$func_tr_sh_result"
-	        dlprefile_dlbasename=
-	        if test -n "$curr_lafile" && func_lalib_p "$curr_lafile"; then
-	          # Use subshell, to avoid clobbering current variable values
-	          dlprefile_dlname=`source "$curr_lafile" && echo "$dlname"`
-	          if test -n "$dlprefile_dlname"; then
-	            func_basename "$dlprefile_dlname"
-	            dlprefile_dlbasename=$func_basename_result
-	          else
-	            # no lafile. user explicitly requested -dlpreopen <import library>.
-	            $sharedlib_from_linklib_cmd "$dlprefile"
-	            dlprefile_dlbasename=$sharedlib_from_linklib_result
-	          fi
-	        fi
-	        $opt_dry_run || {
-	          if test -n "$dlprefile_dlbasename"; then
-	            eval '$ECHO ": $dlprefile_dlbasename" >> "$nlist"'
-	          else
-	            func_warning "Could not compute DLL name from $name"
-	            eval '$ECHO ": $name " >> "$nlist"'
-	          fi
-	          func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32
-	          eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe |
-	            $SED -e '/I __imp/d' -e 's/I __nm_/D /;s/_nm__//' >> '$nlist'"
-	        }
-	      else # not an import lib
-	        $opt_dry_run || {
-	          eval '$ECHO ": $name " >> "$nlist"'
-	          func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32
-	          eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe >> '$nlist'"
-	        }
-	      fi
-	    ;;
-	    *)
-	      $opt_dry_run || {
-	        eval '$ECHO ": $name " >> "$nlist"'
-	        func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32
-	        eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe >> '$nlist'"
-	      }
-	    ;;
-          esac
-	done
-
-	$opt_dry_run || {
-	  # Make sure we have at least an empty file.
-	  test -f "$nlist" || : > "$nlist"
-
-	  if test -n "$exclude_expsyms"; then
-	    $EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T
-	    $MV "$nlist"T "$nlist"
-	  fi
-
-	  # Try sorting and uniquifying the output.
-	  if $GREP -v "^: " < "$nlist" |
-	      if sort -k 3 </dev/null >/dev/null 2>&1; then
-		sort -k 3
-	      else
-		sort +2
-	      fi |
-	      uniq > "$nlist"S; then
-	    :
-	  else
-	    $GREP -v "^: " < "$nlist" > "$nlist"S
-	  fi
-
-	  if test -f "$nlist"S; then
-	    eval "$global_symbol_to_cdecl"' < "$nlist"S >> "$output_objdir/$my_dlsyms"'
-	  else
-	    echo '/* NONE */' >> "$output_objdir/$my_dlsyms"
-	  fi
-
-	  func_show_eval '$RM "${nlist}I"'
-	  if test -n "$global_symbol_to_import"; then
-	    eval "$global_symbol_to_import"' < "$nlist"S > "$nlist"I'
-	  fi
-
-	  echo >> "$output_objdir/$my_dlsyms" "\
-
-/* The mapping between symbol names and symbols.  */
-typedef struct {
-  const char *name;
-  void *address;
-} lt_dlsymlist;
-extern LT_DLSYM_CONST lt_dlsymlist
-lt_${my_prefix}_LTX_preloaded_symbols[];\
-"
-
-	  if test -s "$nlist"I; then
-	    echo >> "$output_objdir/$my_dlsyms" "\
-static void lt_syminit(void)
-{
-  LT_DLSYM_CONST lt_dlsymlist *symbol = lt_${my_prefix}_LTX_preloaded_symbols;
-  for (; symbol->name; ++symbol)
-    {"
-	    $SED 's/.*/      if (STREQ (symbol->name, \"&\")) symbol->address = (void *) \&&;/' < "$nlist"I >> "$output_objdir/$my_dlsyms"
-	    echo >> "$output_objdir/$my_dlsyms" "\
-    }
-}"
-	  fi
-	  echo >> "$output_objdir/$my_dlsyms" "\
-LT_DLSYM_CONST lt_dlsymlist
-lt_${my_prefix}_LTX_preloaded_symbols[] =
-{ {\"$my_originator\", (void *) 0},"
-
-	  if test -s "$nlist"I; then
-	    echo >> "$output_objdir/$my_dlsyms" "\
-  {\"@INIT@\", (void *) &lt_syminit},"
-	  fi
-
-	  case $need_lib_prefix in
-	  no)
-	    eval "$global_symbol_to_c_name_address" < "$nlist" >> "$output_objdir/$my_dlsyms"
-	    ;;
-	  *)
-	    eval "$global_symbol_to_c_name_address_lib_prefix" < "$nlist" >> "$output_objdir/$my_dlsyms"
-	    ;;
-	  esac
-	  echo >> "$output_objdir/$my_dlsyms" "\
-  {0, (void *) 0}
-};
-
-/* This works around a problem in FreeBSD linker */
-#ifdef FREEBSD_WORKAROUND
-static const void *lt_preloaded_setup() {
-  return lt_${my_prefix}_LTX_preloaded_symbols;
-}
-#endif
-
-#ifdef __cplusplus
-}
-#endif\
-"
-	} # !$opt_dry_run
-
-	pic_flag_for_symtable=
-	case "$compile_command " in
-	*" -static "*) ;;
-	*)
-	  case $host in
-	  # compiling the symbol table file with pic_flag works around
-	  # a FreeBSD bug that causes programs to crash when -lm is
-	  # linked before any other PIC object.  But we must not use
-	  # pic_flag when linking with -static.  The problem exists in
-	  # FreeBSD 2.2.6 and is fixed in FreeBSD 3.1.
-	  *-*-freebsd2.*|*-*-freebsd3.0*|*-*-freebsdelf3.0*)
-	    pic_flag_for_symtable=" $pic_flag -DFREEBSD_WORKAROUND" ;;
-	  *-*-hpux*)
-	    pic_flag_for_symtable=" $pic_flag"  ;;
-	  *)
-	    $my_pic_p && pic_flag_for_symtable=" $pic_flag"
-	    ;;
-	  esac
-	  ;;
-	esac
-	symtab_cflags=
-	for arg in $LTCFLAGS; do
-	  case $arg in
-	  -pie | -fpie | -fPIE) ;;
-	  *) func_append symtab_cflags " $arg" ;;
-	  esac
-	done
-
-	# Now compile the dynamic symbol file.
-	func_show_eval '(cd $output_objdir && $LTCC$symtab_cflags -c$no_builtin_flag$pic_flag_for_symtable "$my_dlsyms")' 'exit $?'
-
-	# Clean up the generated files.
-	func_show_eval '$RM "$output_objdir/$my_dlsyms" "$nlist" "${nlist}S" "${nlist}T" "${nlist}I"'
-
-	# Transform the symbol file into the correct name.
-	symfileobj=$output_objdir/${my_outputname}S.$objext
-	case $host in
-	*cygwin* | *mingw* | *cegcc* )
-	  if test -f "$output_objdir/$my_outputname.def"; then
-	    compile_command=`$ECHO "$compile_command" | $SED "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"`
-	    finalize_command=`$ECHO "$finalize_command" | $SED "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"`
-	  else
-	    compile_command=`$ECHO "$compile_command" | $SED "s%@SYMFILE@%$symfileobj%"`
-	    finalize_command=`$ECHO "$finalize_command" | $SED "s%@SYMFILE@%$symfileobj%"`
-	  fi
-	  ;;
-	*)
-	  compile_command=`$ECHO "$compile_command" | $SED "s%@SYMFILE@%$symfileobj%"`
-	  finalize_command=`$ECHO "$finalize_command" | $SED "s%@SYMFILE@%$symfileobj%"`
-	  ;;
-	esac
-	;;
-      *)
-	func_fatal_error "unknown suffix for '$my_dlsyms'"
-	;;
-      esac
-    else
-      # We keep going just in case the user didn't refer to
-      # lt_preloaded_symbols.  The linker will fail if global_symbol_pipe
-      # really was required.
-
-      # Nullify the symbol file.
-      compile_command=`$ECHO "$compile_command" | $SED "s% @SYMFILE@%%"`
-      finalize_command=`$ECHO "$finalize_command" | $SED "s% @SYMFILE@%%"`
-    fi
-}
-
-# func_cygming_gnu_implib_p ARG
-# This predicate returns with zero status (TRUE) if
-# ARG is a GNU/binutils-style import library. Returns
-# with nonzero status (FALSE) otherwise.
-func_cygming_gnu_implib_p ()
-{
-  $debug_cmd
-
-  func_to_tool_file "$1" func_convert_file_msys_to_w32
-  func_cygming_gnu_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $EGREP ' (_head_[A-Za-z0-9_]+_[ad]l*|[A-Za-z0-9_]+_[ad]l*_iname)$'`
-  test -n "$func_cygming_gnu_implib_tmp"
-}
-
-# func_cygming_ms_implib_p ARG
-# This predicate returns with zero status (TRUE) if
-# ARG is an MS-style import library. Returns
-# with nonzero status (FALSE) otherwise.
-func_cygming_ms_implib_p ()
-{
-  $debug_cmd
-
-  func_to_tool_file "$1" func_convert_file_msys_to_w32
-  func_cygming_ms_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $GREP '_NULL_IMPORT_DESCRIPTOR'`
-  test -n "$func_cygming_ms_implib_tmp"
-}
-
-# func_win32_libid arg
-# return the library type of file 'arg'
-#
-# Need a lot of goo to handle *both* DLLs and import libs
-# Has to be a shell function in order to 'eat' the argument
-# that is supplied when $file_magic_command is called.
-# Despite the name, also deal with 64 bit binaries.
-func_win32_libid ()
-{
-  $debug_cmd
-
-  win32_libid_type=unknown
-  win32_fileres=`file -L $1 2>/dev/null`
-  case $win32_fileres in
-  *ar\ archive\ import\ library*) # definitely import
-    win32_libid_type="x86 archive import"
-    ;;
-  *ar\ archive*) # could be an import, or static
-    # Keep the egrep pattern in sync with the one in _LT_CHECK_MAGIC_METHOD.
-    if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null |
-       $EGREP 'file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' >/dev/null; then
-      case $nm_interface in
-      "MS dumpbin")
-	if func_cygming_ms_implib_p "$1" ||
-	   func_cygming_gnu_implib_p "$1"
-	then
-	  win32_nmres=import
-	else
-	  win32_nmres=
-	fi
-	;;
-      *)
-	func_to_tool_file "$1" func_convert_file_msys_to_w32
-	win32_nmres=`eval $NM -f posix -A \"$func_to_tool_file_result\" |
-	  $SED -n -e '
-	    1,100{
-		/ I /{
-		    s|.*|import|
-		    p
-		    q
-		}
-	    }'`
-	;;
-      esac
-      case $win32_nmres in
-      import*)  win32_libid_type="x86 archive import";;
-      *)        win32_libid_type="x86 archive static";;
-      esac
-    fi
-    ;;
-  *DLL*)
-    win32_libid_type="x86 DLL"
-    ;;
-  *executable*) # but shell scripts are "executable" too...
-    case $win32_fileres in
-    *MS\ Windows\ PE\ Intel*)
-      win32_libid_type="x86 DLL"
-      ;;
-    esac
-    ;;
-  esac
-  $ECHO "$win32_libid_type"
-}
-
-# func_cygming_dll_for_implib ARG
-#
-# Platform-specific function to extract the
-# name of the DLL associated with the specified
-# import library ARG.
-# Invoked by eval'ing the libtool variable
-#    $sharedlib_from_linklib_cmd
-# Result is available in the variable
-#    $sharedlib_from_linklib_result
-func_cygming_dll_for_implib ()
-{
-  $debug_cmd
-
-  sharedlib_from_linklib_result=`$DLLTOOL --identify-strict --identify "$1"`
-}
-
-# func_cygming_dll_for_implib_fallback_core SECTION_NAME LIBNAMEs
-#
-# The is the core of a fallback implementation of a
-# platform-specific function to extract the name of the
-# DLL associated with the specified import library LIBNAME.
-#
-# SECTION_NAME is either .idata$6 or .idata$7, depending
-# on the platform and compiler that created the implib.
-#
-# Echos the name of the DLL associated with the
-# specified import library.
-func_cygming_dll_for_implib_fallback_core ()
-{
-  $debug_cmd
-
-  match_literal=`$ECHO "$1" | $SED "$sed_make_literal_regex"`
-  $OBJDUMP -s --section "$1" "$2" 2>/dev/null |
-    $SED '/^Contents of section '"$match_literal"':/{
-      # Place marker at beginning of archive member dllname section
-      s/.*/====MARK====/
-      p
-      d
-    }
-    # These lines can sometimes be longer than 43 characters, but
-    # are always uninteresting
-    /:[	 ]*file format pe[i]\{,1\}-/d
-    /^In archive [^:]*:/d
-    # Ensure marker is printed
-    /^====MARK====/p
-    # Remove all lines with less than 43 characters
-    /^.\{43\}/!d
-    # From remaining lines, remove first 43 characters
-    s/^.\{43\}//' |
-    $SED -n '
-      # Join marker and all lines until next marker into a single line
-      /^====MARK====/ b para
-      H
-      $ b para
-      b
-      :para
-      x
-      s/\n//g
-      # Remove the marker
-      s/^====MARK====//
-      # Remove trailing dots and whitespace
-      s/[\. \t]*$//
-      # Print
-      /./p' |
-    # we now have a list, one entry per line, of the stringified
-    # contents of the appropriate section of all members of the
-    # archive that possess that section. Heuristic: eliminate
-    # all those that have a first or second character that is
-    # a '.' (that is, objdump's representation of an unprintable
-    # character.) This should work for all archives with less than
-    # 0x302f exports -- but will fail for DLLs whose name actually
-    # begins with a literal '.' or a single character followed by
-    # a '.'.
-    #
-    # Of those that remain, print the first one.
-    $SED -e '/^\./d;/^.\./d;q'
-}
-
-# func_cygming_dll_for_implib_fallback ARG
-# Platform-specific function to extract the
-# name of the DLL associated with the specified
-# import library ARG.
-#
-# This fallback implementation is for use when $DLLTOOL
-# does not support the --identify-strict option.
-# Invoked by eval'ing the libtool variable
-#    $sharedlib_from_linklib_cmd
-# Result is available in the variable
-#    $sharedlib_from_linklib_result
-func_cygming_dll_for_implib_fallback ()
-{
-  $debug_cmd
-
-  if func_cygming_gnu_implib_p "$1"; then
-    # binutils import library
-    sharedlib_from_linklib_result=`func_cygming_dll_for_implib_fallback_core '.idata$7' "$1"`
-  elif func_cygming_ms_implib_p "$1"; then
-    # ms-generated import library
-    sharedlib_from_linklib_result=`func_cygming_dll_for_implib_fallback_core '.idata$6' "$1"`
-  else
-    # unknown
-    sharedlib_from_linklib_result=
-  fi
-}
-
-
-# func_extract_an_archive dir oldlib
-func_extract_an_archive ()
-{
-    $debug_cmd
-
-    f_ex_an_ar_dir=$1; shift
-    f_ex_an_ar_oldlib=$1
-    if test yes = "$lock_old_archive_extraction"; then
-      lockfile=$f_ex_an_ar_oldlib.lock
-      until $opt_dry_run || ln "$progpath" "$lockfile" 2>/dev/null; do
-	func_echo "Waiting for $lockfile to be removed"
-	sleep 2
-      done
-    fi
-    func_show_eval "(cd \$f_ex_an_ar_dir && $AR x \"\$f_ex_an_ar_oldlib\")" \
-		   'stat=$?; rm -f "$lockfile"; exit $stat'
-    if test yes = "$lock_old_archive_extraction"; then
-      $opt_dry_run || rm -f "$lockfile"
-    fi
-    if ($AR t "$f_ex_an_ar_oldlib" | sort | sort -uc >/dev/null 2>&1); then
-     :
-    else
-      func_fatal_error "object name conflicts in archive: $f_ex_an_ar_dir/$f_ex_an_ar_oldlib"
-    fi
-}
-
-
-# func_extract_archives gentop oldlib ...
-func_extract_archives ()
-{
-    $debug_cmd
-
-    my_gentop=$1; shift
-    my_oldlibs=${1+"$@"}
-    my_oldobjs=
-    my_xlib=
-    my_xabs=
-    my_xdir=
-
-    for my_xlib in $my_oldlibs; do
-      # Extract the objects.
-      case $my_xlib in
-	[\\/]* | [A-Za-z]:[\\/]*) my_xabs=$my_xlib ;;
-	*) my_xabs=`pwd`"/$my_xlib" ;;
-      esac
-      func_basename "$my_xlib"
-      my_xlib=$func_basename_result
-      my_xlib_u=$my_xlib
-      while :; do
-        case " $extracted_archives " in
-	*" $my_xlib_u "*)
-	  func_arith $extracted_serial + 1
-	  extracted_serial=$func_arith_result
-	  my_xlib_u=lt$extracted_serial-$my_xlib ;;
-	*) break ;;
-	esac
-      done
-      extracted_archives="$extracted_archives $my_xlib_u"
-      my_xdir=$my_gentop/$my_xlib_u
-
-      func_mkdir_p "$my_xdir"
-
-      case $host in
-      *-darwin*)
-	func_verbose "Extracting $my_xabs"
-	# Do not bother doing anything if just a dry run
-	$opt_dry_run || {
-	  darwin_orig_dir=`pwd`
-	  cd $my_xdir || exit $?
-	  darwin_archive=$my_xabs
-	  darwin_curdir=`pwd`
-	  func_basename "$darwin_archive"
-	  darwin_base_archive=$func_basename_result
-	  darwin_arches=`$LIPO -info "$darwin_archive" 2>/dev/null | $GREP Architectures 2>/dev/null || true`
-	  if test -n "$darwin_arches"; then
-	    darwin_arches=`$ECHO "$darwin_arches" | $SED -e 's/.*are://'`
-	    darwin_arch=
-	    func_verbose "$darwin_base_archive has multiple architectures $darwin_arches"
-	    for darwin_arch in  $darwin_arches; do
-	      func_mkdir_p "unfat-$$/$darwin_base_archive-$darwin_arch"
-	      $LIPO -thin $darwin_arch -output "unfat-$$/$darwin_base_archive-$darwin_arch/$darwin_base_archive" "$darwin_archive"
-	      cd "unfat-$$/$darwin_base_archive-$darwin_arch"
-	      func_extract_an_archive "`pwd`" "$darwin_base_archive"
-	      cd "$darwin_curdir"
-	      $RM "unfat-$$/$darwin_base_archive-$darwin_arch/$darwin_base_archive"
-	    done # $darwin_arches
-            ## Okay now we've a bunch of thin objects, gotta fatten them up :)
-	    darwin_filelist=`find unfat-$$ -type f -name \*.o -print -o -name \*.lo -print | $SED -e "$sed_basename" | sort -u`
-	    darwin_file=
-	    darwin_files=
-	    for darwin_file in $darwin_filelist; do
-	      darwin_files=`find unfat-$$ -name $darwin_file -print | sort | $NL2SP`
-	      $LIPO -create -output "$darwin_file" $darwin_files
-	    done # $darwin_filelist
-	    $RM -rf unfat-$$
-	    cd "$darwin_orig_dir"
-	  else
-	    cd $darwin_orig_dir
-	    func_extract_an_archive "$my_xdir" "$my_xabs"
-	  fi # $darwin_arches
-	} # !$opt_dry_run
-	;;
-      *)
-        func_extract_an_archive "$my_xdir" "$my_xabs"
-	;;
-      esac
-      my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | sort | $NL2SP`
-    done
-
-    func_extract_archives_result=$my_oldobjs
-}
-
-
-# func_emit_wrapper [arg=no]
-#
-# Emit a libtool wrapper script on stdout.
-# Don't directly open a file because we may want to
-# incorporate the script contents within a cygwin/mingw
-# wrapper executable.  Must ONLY be called from within
-# func_mode_link because it depends on a number of variables
-# set therein.
-#
-# ARG is the value that the WRAPPER_SCRIPT_BELONGS_IN_OBJDIR
-# variable will take.  If 'yes', then the emitted script
-# will assume that the directory where it is stored is
-# the $objdir directory.  This is a cygwin/mingw-specific
-# behavior.
-func_emit_wrapper ()
-{
-	func_emit_wrapper_arg1=${1-no}
-
-	$ECHO "\
-#! $SHELL
-
-# $output - temporary wrapper script for $objdir/$outputname
-# Generated by $PROGRAM (GNU $PACKAGE) $VERSION
-#
-# The $output program cannot be directly executed until all the libtool
-# libraries that it depends on are installed.
-#
-# This wrapper script should never be moved out of the build directory.
-# If it is, it will not operate correctly.
-
-# Sed substitution that helps us do robust quoting.  It backslashifies
-# metacharacters that are still active within double-quoted strings.
-sed_quote_subst='$sed_quote_subst'
-
-# Be Bourne compatible
-if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then
-  emulate sh
-  NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on \${1+\"\$@\"}, which
-  # is contrary to our usage.  Disable this feature.
-  alias -g '\${1+\"\$@\"}'='\"\$@\"'
-  setopt NO_GLOB_SUBST
-else
-  case \`(set -o) 2>/dev/null\` in *posix*) set -o posix;; esac
-fi
-BIN_SH=xpg4; export BIN_SH # for Tru64
-DUALCASE=1; export DUALCASE # for MKS sh
-
-# The HP-UX ksh and POSIX shell print the target directory to stdout
-# if CDPATH is set.
-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
-
-relink_command=\"$relink_command\"
-
-# This environment variable determines our operation mode.
-if test \"\$libtool_install_magic\" = \"$magic\"; then
-  # install mode needs the following variables:
-  generated_by_libtool_version='$macro_version'
-  notinst_deplibs='$notinst_deplibs'
-else
-  # When we are sourced in execute mode, \$file and \$ECHO are already set.
-  if test \"\$libtool_execute_magic\" != \"$magic\"; then
-    file=\"\$0\""
-
-    func_quote_arg pretty "$ECHO"
-    qECHO=$func_quote_arg_result
-    $ECHO "\
-
-# A function that is used when there is no print builtin or printf.
-func_fallback_echo ()
-{
-  eval 'cat <<_LTECHO_EOF
-\$1
-_LTECHO_EOF'
-}
-    ECHO=$qECHO
-  fi
-
-# Very basic option parsing. These options are (a) specific to
-# the libtool wrapper, (b) are identical between the wrapper
-# /script/ and the wrapper /executable/ that is used only on
-# windows platforms, and (c) all begin with the string "--lt-"
-# (application programs are unlikely to have options that match
-# this pattern).
-#
-# There are only two supported options: --lt-debug and
-# --lt-dump-script. There is, deliberately, no --lt-help.
-#
-# The first argument to this parsing function should be the
-# script's $0 value, followed by "$@".
-lt_option_debug=
-func_parse_lt_options ()
-{
-  lt_script_arg0=\$0
-  shift
-  for lt_opt
-  do
-    case \"\$lt_opt\" in
-    --lt-debug) lt_option_debug=1 ;;
-    --lt-dump-script)
-        lt_dump_D=\`\$ECHO \"X\$lt_script_arg0\" | $SED -e 's/^X//' -e 's%/[^/]*$%%'\`
-        test \"X\$lt_dump_D\" = \"X\$lt_script_arg0\" && lt_dump_D=.
-        lt_dump_F=\`\$ECHO \"X\$lt_script_arg0\" | $SED -e 's/^X//' -e 's%^.*/%%'\`
-        cat \"\$lt_dump_D/\$lt_dump_F\"
-        exit 0
-      ;;
-    --lt-*)
-        \$ECHO \"Unrecognized --lt- option: '\$lt_opt'\" 1>&2
-        exit 1
-      ;;
-    esac
-  done
-
-  # Print the debug banner immediately:
-  if test -n \"\$lt_option_debug\"; then
-    echo \"$outputname:$output:\$LINENO: libtool wrapper (GNU $PACKAGE) $VERSION\" 1>&2
-  fi
-}
-
-# Used when --lt-debug. Prints its arguments to stdout
-# (redirection is the responsibility of the caller)
-func_lt_dump_args ()
-{
-  lt_dump_args_N=1;
-  for lt_arg
-  do
-    \$ECHO \"$outputname:$output:\$LINENO: newargv[\$lt_dump_args_N]: \$lt_arg\"
-    lt_dump_args_N=\`expr \$lt_dump_args_N + 1\`
-  done
-}
-
-# Core function for launching the target application
-func_exec_program_core ()
-{
-"
-  case $host in
-  # Backslashes separate directories on plain windows
-  *-*-mingw | *-*-os2* | *-cegcc*)
-    $ECHO "\
-      if test -n \"\$lt_option_debug\"; then
-        \$ECHO \"$outputname:$output:\$LINENO: newargv[0]: \$progdir\\\\\$program\" 1>&2
-        func_lt_dump_args \${1+\"\$@\"} 1>&2
-      fi
-      exec \"\$progdir\\\\\$program\" \${1+\"\$@\"}
-"
-    ;;
-
-  *)
-    $ECHO "\
-      if test -n \"\$lt_option_debug\"; then
-        \$ECHO \"$outputname:$output:\$LINENO: newargv[0]: \$progdir/\$program\" 1>&2
-        func_lt_dump_args \${1+\"\$@\"} 1>&2
-      fi
-      exec \"\$progdir/\$program\" \${1+\"\$@\"}
-"
-    ;;
-  esac
-  $ECHO "\
-      \$ECHO \"\$0: cannot exec \$program \$*\" 1>&2
-      exit 1
-}
-
-# A function to encapsulate launching the target application
-# Strips options in the --lt-* namespace from \$@ and
-# launches target application with the remaining arguments.
-func_exec_program ()
-{
-  case \" \$* \" in
-  *\\ --lt-*)
-    for lt_wr_arg
-    do
-      case \$lt_wr_arg in
-      --lt-*) ;;
-      *) set x \"\$@\" \"\$lt_wr_arg\"; shift;;
-      esac
-      shift
-    done ;;
-  esac
-  func_exec_program_core \${1+\"\$@\"}
-}
-
-  # Parse options
-  func_parse_lt_options \"\$0\" \${1+\"\$@\"}
-
-  # Find the directory that this script lives in.
-  thisdir=\`\$ECHO \"\$file\" | $SED 's%/[^/]*$%%'\`
-  test \"x\$thisdir\" = \"x\$file\" && thisdir=.
-
-  # Follow symbolic links until we get to the real thisdir.
-  file=\`ls -ld \"\$file\" | $SED -n 's/.*-> //p'\`
-  while test -n \"\$file\"; do
-    destdir=\`\$ECHO \"\$file\" | $SED 's%/[^/]*\$%%'\`
-
-    # If there was a directory component, then change thisdir.
-    if test \"x\$destdir\" != \"x\$file\"; then
-      case \"\$destdir\" in
-      [\\\\/]* | [A-Za-z]:[\\\\/]*) thisdir=\"\$destdir\" ;;
-      *) thisdir=\"\$thisdir/\$destdir\" ;;
-      esac
-    fi
-
-    file=\`\$ECHO \"\$file\" | $SED 's%^.*/%%'\`
-    file=\`ls -ld \"\$thisdir/\$file\" | $SED -n 's/.*-> //p'\`
-  done
-
-  # Usually 'no', except on cygwin/mingw when embedded into
-  # the cwrapper.
-  WRAPPER_SCRIPT_BELONGS_IN_OBJDIR=$func_emit_wrapper_arg1
-  if test \"\$WRAPPER_SCRIPT_BELONGS_IN_OBJDIR\" = \"yes\"; then
-    # special case for '.'
-    if test \"\$thisdir\" = \".\"; then
-      thisdir=\`pwd\`
-    fi
-    # remove .libs from thisdir
-    case \"\$thisdir\" in
-    *[\\\\/]$objdir ) thisdir=\`\$ECHO \"\$thisdir\" | $SED 's%[\\\\/][^\\\\/]*$%%'\` ;;
-    $objdir )   thisdir=. ;;
-    esac
-  fi
-
-  # Try to get the absolute directory name.
-  absdir=\`cd \"\$thisdir\" && pwd\`
-  test -n \"\$absdir\" && thisdir=\"\$absdir\"
-"
-
-	if test yes = "$fast_install"; then
-	  $ECHO "\
-  program=lt-'$outputname'$exeext
-  progdir=\"\$thisdir/$objdir\"
-
-  if test ! -f \"\$progdir/\$program\" ||
-     { file=\`ls -1dt \"\$progdir/\$program\" \"\$progdir/../\$program\" 2>/dev/null | $SED 1q\`; \\
-       test \"X\$file\" != \"X\$progdir/\$program\"; }; then
-
-    file=\"\$\$-\$program\"
-
-    if test ! -d \"\$progdir\"; then
-      $MKDIR \"\$progdir\"
-    else
-      $RM \"\$progdir/\$file\"
-    fi"
-
-	  $ECHO "\
-
-    # relink executable if necessary
-    if test -n \"\$relink_command\"; then
-      if relink_command_output=\`eval \$relink_command 2>&1\`; then :
-      else
-	\$ECHO \"\$relink_command_output\" >&2
-	$RM \"\$progdir/\$file\"
-	exit 1
-      fi
-    fi
-
-    $MV \"\$progdir/\$file\" \"\$progdir/\$program\" 2>/dev/null ||
-    { $RM \"\$progdir/\$program\";
-      $MV \"\$progdir/\$file\" \"\$progdir/\$program\"; }
-    $RM \"\$progdir/\$file\"
-  fi"
-	else
-	  $ECHO "\
-  program='$outputname'
-  progdir=\"\$thisdir/$objdir\"
-"
-	fi
-
-	$ECHO "\
-
-  if test -f \"\$progdir/\$program\"; then"
-
-	# fixup the dll searchpath if we need to.
-	#
-	# Fix the DLL searchpath if we need to.  Do this before prepending
-	# to shlibpath, because on Windows, both are PATH and uninstalled
-	# libraries must come first.
-	if test -n "$dllsearchpath"; then
-	  $ECHO "\
-    # Add the dll search path components to the executable PATH
-    PATH=$dllsearchpath:\$PATH
-"
-	fi
-
-	# Export our shlibpath_var if we have one.
-	if test yes = "$shlibpath_overrides_runpath" && test -n "$shlibpath_var" && test -n "$temp_rpath"; then
-	  $ECHO "\
-    # Add our own library path to $shlibpath_var
-    $shlibpath_var=\"$temp_rpath\$$shlibpath_var\"
-
-    # Some systems cannot cope with colon-terminated $shlibpath_var
-    # The second colon is a workaround for a bug in BeOS R4 sed
-    $shlibpath_var=\`\$ECHO \"\$$shlibpath_var\" | $SED 's/::*\$//'\`
-
-    export $shlibpath_var
-"
-	fi
-
-	$ECHO "\
-    if test \"\$libtool_execute_magic\" != \"$magic\"; then
-      # Run the actual program with our arguments.
-      func_exec_program \${1+\"\$@\"}
-    fi
-  else
-    # The program doesn't exist.
-    \$ECHO \"\$0: error: '\$progdir/\$program' does not exist\" 1>&2
-    \$ECHO \"This script is just a wrapper for \$program.\" 1>&2
-    \$ECHO \"See the $PACKAGE documentation for more information.\" 1>&2
-    exit 1
-  fi
-fi\
-"
-}
-
-
-# func_emit_cwrapperexe_src
-# emit the source code for a wrapper executable on stdout
-# Must ONLY be called from within func_mode_link because
-# it depends on a number of variable set therein.
-func_emit_cwrapperexe_src ()
-{
-	cat <<EOF
-
-/* $cwrappersource - temporary wrapper executable for $objdir/$outputname
-   Generated by $PROGRAM (GNU $PACKAGE) $VERSION
-
-   The $output program cannot be directly executed until all the libtool
-   libraries that it depends on are installed.
-
-   This wrapper executable should never be moved out of the build directory.
-   If it is, it will not operate correctly.
-*/
-EOF
-	    cat <<"EOF"
-#ifdef _MSC_VER
-# define _CRT_SECURE_NO_DEPRECATE 1
-#endif
-#include <stdio.h>
-#include <stdlib.h>
-#ifdef _MSC_VER
-# include <direct.h>
-# include <process.h>
-# include <io.h>
-#else
-# include <unistd.h>
-# include <stdint.h>
-# ifdef __CYGWIN__
-#  include <io.h>
-# endif
-#endif
-#include <malloc.h>
-#include <stdarg.h>
-#include <assert.h>
-#include <string.h>
-#include <ctype.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <sys/stat.h>
-
-#define STREQ(s1, s2) (strcmp ((s1), (s2)) == 0)
-
-/* declarations of non-ANSI functions */
-#if defined __MINGW32__
-# ifdef __STRICT_ANSI__
-int _putenv (const char *);
-# endif
-#elif defined __CYGWIN__
-# ifdef __STRICT_ANSI__
-char *realpath (const char *, char *);
-int putenv (char *);
-int setenv (const char *, const char *, int);
-# endif
-/* #elif defined other_platform || defined ... */
-#endif
-
-/* portability defines, excluding path handling macros */
-#if defined _MSC_VER
-# define setmode _setmode
-# define stat    _stat
-# define chmod   _chmod
-# define getcwd  _getcwd
-# define putenv  _putenv
-# define S_IXUSR _S_IEXEC
-#elif defined __MINGW32__
-# define setmode _setmode
-# define stat    _stat
-# define chmod   _chmod
-# define getcwd  _getcwd
-# define putenv  _putenv
-#elif defined __CYGWIN__
-# define HAVE_SETENV
-# define FOPEN_WB "wb"
-/* #elif defined other platforms ... */
-#endif
-
-#if defined PATH_MAX
-# define LT_PATHMAX PATH_MAX
-#elif defined MAXPATHLEN
-# define LT_PATHMAX MAXPATHLEN
-#else
-# define LT_PATHMAX 1024
-#endif
-
-#ifndef S_IXOTH
-# define S_IXOTH 0
-#endif
-#ifndef S_IXGRP
-# define S_IXGRP 0
-#endif
-
-/* path handling portability macros */
-#ifndef DIR_SEPARATOR
-# define DIR_SEPARATOR '/'
-# define PATH_SEPARATOR ':'
-#endif
-
-#if defined _WIN32 || defined __MSDOS__ || defined __DJGPP__ || \
-  defined __OS2__
-# define HAVE_DOS_BASED_FILE_SYSTEM
-# define FOPEN_WB "wb"
-# ifndef DIR_SEPARATOR_2
-#  define DIR_SEPARATOR_2 '\\'
-# endif
-# ifndef PATH_SEPARATOR_2
-#  define PATH_SEPARATOR_2 ';'
-# endif
-#endif
-
-#ifndef DIR_SEPARATOR_2
-# define IS_DIR_SEPARATOR(ch) ((ch) == DIR_SEPARATOR)
-#else /* DIR_SEPARATOR_2 */
-# define IS_DIR_SEPARATOR(ch) \
-	(((ch) == DIR_SEPARATOR) || ((ch) == DIR_SEPARATOR_2))
-#endif /* DIR_SEPARATOR_2 */
-
-#ifndef PATH_SEPARATOR_2
-# define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR)
-#else /* PATH_SEPARATOR_2 */
-# define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR_2)
-#endif /* PATH_SEPARATOR_2 */
-
-#ifndef FOPEN_WB
-# define FOPEN_WB "w"
-#endif
-#ifndef _O_BINARY
-# define _O_BINARY 0
-#endif
-
-#define XMALLOC(type, num)      ((type *) xmalloc ((num) * sizeof(type)))
-#define XFREE(stale) do { \
-  if (stale) { free (stale); stale = 0; } \
-} while (0)
-
-#if defined LT_DEBUGWRAPPER
-static int lt_debug = 1;
-#else
-static int lt_debug = 0;
-#endif
-
-const char *program_name = "libtool-wrapper"; /* in case xstrdup fails */
-
-void *xmalloc (size_t num);
-char *xstrdup (const char *string);
-const char *base_name (const char *name);
-char *find_executable (const char *wrapper);
-char *chase_symlinks (const char *pathspec);
-int make_executable (const char *path);
-int check_executable (const char *path);
-char *strendzap (char *str, const char *pat);
-void lt_debugprintf (const char *file, int line, const char *fmt, ...);
-void lt_fatal (const char *file, int line, const char *message, ...);
-static const char *nonnull (const char *s);
-static const char *nonempty (const char *s);
-void lt_setenv (const char *name, const char *value);
-char *lt_extend_str (const char *orig_value, const char *add, int to_end);
-void lt_update_exe_path (const char *name, const char *value);
-void lt_update_lib_path (const char *name, const char *value);
-char **prepare_spawn (char **argv);
-void lt_dump_script (FILE *f);
-EOF
-
-	    cat <<EOF
-#if __GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 5)
-# define externally_visible volatile
-#else
-# define externally_visible __attribute__((externally_visible)) volatile
-#endif
-externally_visible const char * MAGIC_EXE = "$magic_exe";
-const char * LIB_PATH_VARNAME = "$shlibpath_var";
-EOF
-
-	    if test yes = "$shlibpath_overrides_runpath" && test -n "$shlibpath_var" && test -n "$temp_rpath"; then
-              func_to_host_path "$temp_rpath"
-	      cat <<EOF
-const char * LIB_PATH_VALUE   = "$func_to_host_path_result";
-EOF
-	    else
-	      cat <<"EOF"
-const char * LIB_PATH_VALUE   = "";
-EOF
-	    fi
-
-	    if test -n "$dllsearchpath"; then
-              func_to_host_path "$dllsearchpath:"
-	      cat <<EOF
-const char * EXE_PATH_VARNAME = "PATH";
-const char * EXE_PATH_VALUE   = "$func_to_host_path_result";
-EOF
-	    else
-	      cat <<"EOF"
-const char * EXE_PATH_VARNAME = "";
-const char * EXE_PATH_VALUE   = "";
-EOF
-	    fi
-
-	    if test yes = "$fast_install"; then
-	      cat <<EOF
-const char * TARGET_PROGRAM_NAME = "lt-$outputname"; /* hopefully, no .exe */
-EOF
-	    else
-	      cat <<EOF
-const char * TARGET_PROGRAM_NAME = "$outputname"; /* hopefully, no .exe */
-EOF
-	    fi
-
-
-	    cat <<"EOF"
-
-#define LTWRAPPER_OPTION_PREFIX         "--lt-"
-
-static const char *ltwrapper_option_prefix = LTWRAPPER_OPTION_PREFIX;
-static const char *dumpscript_opt       = LTWRAPPER_OPTION_PREFIX "dump-script";
-static const char *debug_opt            = LTWRAPPER_OPTION_PREFIX "debug";
-
-int
-main (int argc, char *argv[])
-{
-  char **newargz;
-  int  newargc;
-  char *tmp_pathspec;
-  char *actual_cwrapper_path;
-  char *actual_cwrapper_name;
-  char *target_name;
-  char *lt_argv_zero;
-  int rval = 127;
-
-  int i;
-
-  program_name = (char *) xstrdup (base_name (argv[0]));
-  newargz = XMALLOC (char *, (size_t) argc + 1);
-
-  /* very simple arg parsing; don't want to rely on getopt
-   * also, copy all non cwrapper options to newargz, except
-   * argz[0], which is handled differently
-   */
-  newargc=0;
-  for (i = 1; i < argc; i++)
-    {
-      if (STREQ (argv[i], dumpscript_opt))
-	{
-EOF
-	    case $host in
-	      *mingw* | *cygwin* )
-		# make stdout use "unix" line endings
-		echo "          setmode(1,_O_BINARY);"
-		;;
-	      esac
-
-	    cat <<"EOF"
-	  lt_dump_script (stdout);
-	  return 0;
-	}
-      if (STREQ (argv[i], debug_opt))
-	{
-          lt_debug = 1;
-          continue;
-	}
-      if (STREQ (argv[i], ltwrapper_option_prefix))
-        {
-          /* however, if there is an option in the LTWRAPPER_OPTION_PREFIX
-             namespace, but it is not one of the ones we know about and
-             have already dealt with, above (inluding dump-script), then
-             report an error. Otherwise, targets might begin to believe
-             they are allowed to use options in the LTWRAPPER_OPTION_PREFIX
-             namespace. The first time any user complains about this, we'll
-             need to make LTWRAPPER_OPTION_PREFIX a configure-time option
-             or a configure.ac-settable value.
-           */
-          lt_fatal (__FILE__, __LINE__,
-		    "unrecognized %s option: '%s'",
-                    ltwrapper_option_prefix, argv[i]);
-        }
-      /* otherwise ... */
-      newargz[++newargc] = xstrdup (argv[i]);
-    }
-  newargz[++newargc] = NULL;
-
-EOF
-	    cat <<EOF
-  /* The GNU banner must be the first non-error debug message */
-  lt_debugprintf (__FILE__, __LINE__, "libtool wrapper (GNU $PACKAGE) $VERSION\n");
-EOF
-	    cat <<"EOF"
-  lt_debugprintf (__FILE__, __LINE__, "(main) argv[0]: %s\n", argv[0]);
-  lt_debugprintf (__FILE__, __LINE__, "(main) program_name: %s\n", program_name);
-
-  tmp_pathspec = find_executable (argv[0]);
-  if (tmp_pathspec == NULL)
-    lt_fatal (__FILE__, __LINE__, "couldn't find %s", argv[0]);
-  lt_debugprintf (__FILE__, __LINE__,
-                  "(main) found exe (before symlink chase) at: %s\n",
-		  tmp_pathspec);
-
-  actual_cwrapper_path = chase_symlinks (tmp_pathspec);
-  lt_debugprintf (__FILE__, __LINE__,
-                  "(main) found exe (after symlink chase) at: %s\n",
-		  actual_cwrapper_path);
-  XFREE (tmp_pathspec);
-
-  actual_cwrapper_name = xstrdup (base_name (actual_cwrapper_path));
-  strendzap (actual_cwrapper_path, actual_cwrapper_name);
-
-  /* wrapper name transforms */
-  strendzap (actual_cwrapper_name, ".exe");
-  tmp_pathspec = lt_extend_str (actual_cwrapper_name, ".exe", 1);
-  XFREE (actual_cwrapper_name);
-  actual_cwrapper_name = tmp_pathspec;
-  tmp_pathspec = 0;
-
-  /* target_name transforms -- use actual target program name; might have lt- prefix */
-  target_name = xstrdup (base_name (TARGET_PROGRAM_NAME));
-  strendzap (target_name, ".exe");
-  tmp_pathspec = lt_extend_str (target_name, ".exe", 1);
-  XFREE (target_name);
-  target_name = tmp_pathspec;
-  tmp_pathspec = 0;
-
-  lt_debugprintf (__FILE__, __LINE__,
-		  "(main) libtool target name: %s\n",
-		  target_name);
-EOF
-
-	    cat <<EOF
-  newargz[0] =
-    XMALLOC (char, (strlen (actual_cwrapper_path) +
-		    strlen ("$objdir") + 1 + strlen (actual_cwrapper_name) + 1));
-  strcpy (newargz[0], actual_cwrapper_path);
-  strcat (newargz[0], "$objdir");
-  strcat (newargz[0], "/");
-EOF
-
-	    cat <<"EOF"
-  /* stop here, and copy so we don't have to do this twice */
-  tmp_pathspec = xstrdup (newargz[0]);
-
-  /* do NOT want the lt- prefix here, so use actual_cwrapper_name */
-  strcat (newargz[0], actual_cwrapper_name);
-
-  /* DO want the lt- prefix here if it exists, so use target_name */
-  lt_argv_zero = lt_extend_str (tmp_pathspec, target_name, 1);
-  XFREE (tmp_pathspec);
-  tmp_pathspec = NULL;
-EOF
-
-	    case $host_os in
-	      mingw*)
-	    cat <<"EOF"
-  {
-    char* p;
-    while ((p = strchr (newargz[0], '\\')) != NULL)
-      {
-	*p = '/';
-      }
-    while ((p = strchr (lt_argv_zero, '\\')) != NULL)
-      {
-	*p = '/';
-      }
-  }
-EOF
-	    ;;
-	    esac
-
-	    cat <<"EOF"
-  XFREE (target_name);
-  XFREE (actual_cwrapper_path);
-  XFREE (actual_cwrapper_name);
-
-  lt_setenv ("BIN_SH", "xpg4"); /* for Tru64 */
-  lt_setenv ("DUALCASE", "1");  /* for MSK sh */
-  /* Update the DLL searchpath.  EXE_PATH_VALUE ($dllsearchpath) must
-     be prepended before (that is, appear after) LIB_PATH_VALUE ($temp_rpath)
-     because on Windows, both *_VARNAMEs are PATH but uninstalled
-     libraries must come first. */
-  lt_update_exe_path (EXE_PATH_VARNAME, EXE_PATH_VALUE);
-  lt_update_lib_path (LIB_PATH_VARNAME, LIB_PATH_VALUE);
-
-  lt_debugprintf (__FILE__, __LINE__, "(main) lt_argv_zero: %s\n",
-		  nonnull (lt_argv_zero));
-  for (i = 0; i < newargc; i++)
-    {
-      lt_debugprintf (__FILE__, __LINE__, "(main) newargz[%d]: %s\n",
-		      i, nonnull (newargz[i]));
-    }
-
-EOF
-
-	    case $host_os in
-	      mingw*)
-		cat <<"EOF"
-  /* execv doesn't actually work on mingw as expected on unix */
-  newargz = prepare_spawn (newargz);
-  rval = (int) _spawnv (_P_WAIT, lt_argv_zero, (const char * const *) newargz);
-  if (rval == -1)
-    {
-      /* failed to start process */
-      lt_debugprintf (__FILE__, __LINE__,
-		      "(main) failed to launch target \"%s\": %s\n",
-		      lt_argv_zero, nonnull (strerror (errno)));
-      return 127;
-    }
-  return rval;
-EOF
-		;;
-	      *)
-		cat <<"EOF"
-  execv (lt_argv_zero, newargz);
-  return rval; /* =127, but avoids unused variable warning */
-EOF
-		;;
-	    esac
-
-	    cat <<"EOF"
-}
-
-void *
-xmalloc (size_t num)
-{
-  void *p = (void *) malloc (num);
-  if (!p)
-    lt_fatal (__FILE__, __LINE__, "memory exhausted");
-
-  return p;
-}
-
-char *
-xstrdup (const char *string)
-{
-  return string ? strcpy ((char *) xmalloc (strlen (string) + 1),
-			  string) : NULL;
-}
-
-const char *
-base_name (const char *name)
-{
-  const char *base;
-
-#if defined HAVE_DOS_BASED_FILE_SYSTEM
-  /* Skip over the disk name in MSDOS pathnames. */
-  if (isalpha ((unsigned char) name[0]) && name[1] == ':')
-    name += 2;
-#endif
-
-  for (base = name; *name; name++)
-    if (IS_DIR_SEPARATOR (*name))
-      base = name + 1;
-  return base;
-}
-
-int
-check_executable (const char *path)
-{
-  struct stat st;
-
-  lt_debugprintf (__FILE__, __LINE__, "(check_executable): %s\n",
-                  nonempty (path));
-  if ((!path) || (!*path))
-    return 0;
-
-  if ((stat (path, &st) >= 0)
-      && (st.st_mode & (S_IXUSR | S_IXGRP | S_IXOTH)))
-    return 1;
-  else
-    return 0;
-}
-
-int
-make_executable (const char *path)
-{
-  int rval = 0;
-  struct stat st;
-
-  lt_debugprintf (__FILE__, __LINE__, "(make_executable): %s\n",
-                  nonempty (path));
-  if ((!path) || (!*path))
-    return 0;
-
-  if (stat (path, &st) >= 0)
-    {
-      rval = chmod (path, st.st_mode | S_IXOTH | S_IXGRP | S_IXUSR);
-    }
-  return rval;
-}
-
-/* Searches for the full path of the wrapper.  Returns
-   newly allocated full path name if found, NULL otherwise
-   Does not chase symlinks, even on platforms that support them.
-*/
-char *
-find_executable (const char *wrapper)
-{
-  int has_slash = 0;
-  const char *p;
-  const char *p_next;
-  /* static buffer for getcwd */
-  char tmp[LT_PATHMAX + 1];
-  size_t tmp_len;
-  char *concat_name;
-
-  lt_debugprintf (__FILE__, __LINE__, "(find_executable): %s\n",
-                  nonempty (wrapper));
-
-  if ((wrapper == NULL) || (*wrapper == '\0'))
-    return NULL;
-
-  /* Absolute path? */
-#if defined HAVE_DOS_BASED_FILE_SYSTEM
-  if (isalpha ((unsigned char) wrapper[0]) && wrapper[1] == ':')
-    {
-      concat_name = xstrdup (wrapper);
-      if (check_executable (concat_name))
-	return concat_name;
-      XFREE (concat_name);
-    }
-  else
-    {
-#endif
-      if (IS_DIR_SEPARATOR (wrapper[0]))
-	{
-	  concat_name = xstrdup (wrapper);
-	  if (check_executable (concat_name))
-	    return concat_name;
-	  XFREE (concat_name);
-	}
-#if defined HAVE_DOS_BASED_FILE_SYSTEM
-    }
-#endif
-
-  for (p = wrapper; *p; p++)
-    if (*p == '/')
-      {
-	has_slash = 1;
-	break;
-      }
-  if (!has_slash)
-    {
-      /* no slashes; search PATH */
-      const char *path = getenv ("PATH");
-      if (path != NULL)
-	{
-	  for (p = path; *p; p = p_next)
-	    {
-	      const char *q;
-	      size_t p_len;
-	      for (q = p; *q; q++)
-		if (IS_PATH_SEPARATOR (*q))
-		  break;
-	      p_len = (size_t) (q - p);
-	      p_next = (*q == '\0' ? q : q + 1);
-	      if (p_len == 0)
-		{
-		  /* empty path: current directory */
-		  if (getcwd (tmp, LT_PATHMAX) == NULL)
-		    lt_fatal (__FILE__, __LINE__, "getcwd failed: %s",
-                              nonnull (strerror (errno)));
-		  tmp_len = strlen (tmp);
-		  concat_name =
-		    XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1);
-		  memcpy (concat_name, tmp, tmp_len);
-		  concat_name[tmp_len] = '/';
-		  strcpy (concat_name + tmp_len + 1, wrapper);
-		}
-	      else
-		{
-		  concat_name =
-		    XMALLOC (char, p_len + 1 + strlen (wrapper) + 1);
-		  memcpy (concat_name, p, p_len);
-		  concat_name[p_len] = '/';
-		  strcpy (concat_name + p_len + 1, wrapper);
-		}
-	      if (check_executable (concat_name))
-		return concat_name;
-	      XFREE (concat_name);
-	    }
-	}
-      /* not found in PATH; assume curdir */
-    }
-  /* Relative path | not found in path: prepend cwd */
-  if (getcwd (tmp, LT_PATHMAX) == NULL)
-    lt_fatal (__FILE__, __LINE__, "getcwd failed: %s",
-              nonnull (strerror (errno)));
-  tmp_len = strlen (tmp);
-  concat_name = XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1);
-  memcpy (concat_name, tmp, tmp_len);
-  concat_name[tmp_len] = '/';
-  strcpy (concat_name + tmp_len + 1, wrapper);
-
-  if (check_executable (concat_name))
-    return concat_name;
-  XFREE (concat_name);
-  return NULL;
-}
-
-char *
-chase_symlinks (const char *pathspec)
-{
-#ifndef S_ISLNK
-  return xstrdup (pathspec);
-#else
-  char buf[LT_PATHMAX];
-  struct stat s;
-  char *tmp_pathspec = xstrdup (pathspec);
-  char *p;
-  int has_symlinks = 0;
-  while (strlen (tmp_pathspec) && !has_symlinks)
-    {
-      lt_debugprintf (__FILE__, __LINE__,
-		      "checking path component for symlinks: %s\n",
-		      tmp_pathspec);
-      if (lstat (tmp_pathspec, &s) == 0)
-	{
-	  if (S_ISLNK (s.st_mode) != 0)
-	    {
-	      has_symlinks = 1;
-	      break;
-	    }
-
-	  /* search backwards for last DIR_SEPARATOR */
-	  p = tmp_pathspec + strlen (tmp_pathspec) - 1;
-	  while ((p > tmp_pathspec) && (!IS_DIR_SEPARATOR (*p)))
-	    p--;
-	  if ((p == tmp_pathspec) && (!IS_DIR_SEPARATOR (*p)))
-	    {
-	      /* no more DIR_SEPARATORS left */
-	      break;
-	    }
-	  *p = '\0';
-	}
-      else
-	{
-	  lt_fatal (__FILE__, __LINE__,
-		    "error accessing file \"%s\": %s",
-		    tmp_pathspec, nonnull (strerror (errno)));
-	}
-    }
-  XFREE (tmp_pathspec);
-
-  if (!has_symlinks)
-    {
-      return xstrdup (pathspec);
-    }
-
-  tmp_pathspec = realpath (pathspec, buf);
-  if (tmp_pathspec == 0)
-    {
-      lt_fatal (__FILE__, __LINE__,
-		"could not follow symlinks for %s", pathspec);
-    }
-  return xstrdup (tmp_pathspec);
-#endif
-}
-
-char *
-strendzap (char *str, const char *pat)
-{
-  size_t len, patlen;
-
-  assert (str != NULL);
-  assert (pat != NULL);
-
-  len = strlen (str);
-  patlen = strlen (pat);
-
-  if (patlen <= len)
-    {
-      str += len - patlen;
-      if (STREQ (str, pat))
-	*str = '\0';
-    }
-  return str;
-}
-
-void
-lt_debugprintf (const char *file, int line, const char *fmt, ...)
-{
-  va_list args;
-  if (lt_debug)
-    {
-      (void) fprintf (stderr, "%s:%s:%d: ", program_name, file, line);
-      va_start (args, fmt);
-      (void) vfprintf (stderr, fmt, args);
-      va_end (args);
-    }
-}
-
-static void
-lt_error_core (int exit_status, const char *file,
-	       int line, const char *mode,
-	       const char *message, va_list ap)
-{
-  fprintf (stderr, "%s:%s:%d: %s: ", program_name, file, line, mode);
-  vfprintf (stderr, message, ap);
-  fprintf (stderr, ".\n");
-
-  if (exit_status >= 0)
-    exit (exit_status);
-}
-
-void
-lt_fatal (const char *file, int line, const char *message, ...)
-{
-  va_list ap;
-  va_start (ap, message);
-  lt_error_core (EXIT_FAILURE, file, line, "FATAL", message, ap);
-  va_end (ap);
-}
-
-static const char *
-nonnull (const char *s)
-{
-  return s ? s : "(null)";
-}
-
-static const char *
-nonempty (const char *s)
-{
-  return (s && !*s) ? "(empty)" : nonnull (s);
-}
-
-void
-lt_setenv (const char *name, const char *value)
-{
-  lt_debugprintf (__FILE__, __LINE__,
-		  "(lt_setenv) setting '%s' to '%s'\n",
-                  nonnull (name), nonnull (value));
-  {
-#ifdef HAVE_SETENV
-    /* always make a copy, for consistency with !HAVE_SETENV */
-    char *str = xstrdup (value);
-    setenv (name, str, 1);
-#else
-    size_t len = strlen (name) + 1 + strlen (value) + 1;
-    char *str = XMALLOC (char, len);
-    sprintf (str, "%s=%s", name, value);
-    if (putenv (str) != EXIT_SUCCESS)
-      {
-        XFREE (str);
-      }
-#endif
-  }
-}
-
-char *
-lt_extend_str (const char *orig_value, const char *add, int to_end)
-{
-  char *new_value;
-  if (orig_value && *orig_value)
-    {
-      size_t orig_value_len = strlen (orig_value);
-      size_t add_len = strlen (add);
-      new_value = XMALLOC (char, add_len + orig_value_len + 1);
-      if (to_end)
-        {
-          strcpy (new_value, orig_value);
-          strcpy (new_value + orig_value_len, add);
-        }
-      else
-        {
-          strcpy (new_value, add);
-          strcpy (new_value + add_len, orig_value);
-        }
-    }
-  else
-    {
-      new_value = xstrdup (add);
-    }
-  return new_value;
-}
-
-void
-lt_update_exe_path (const char *name, const char *value)
-{
-  lt_debugprintf (__FILE__, __LINE__,
-		  "(lt_update_exe_path) modifying '%s' by prepending '%s'\n",
-                  nonnull (name), nonnull (value));
-
-  if (name && *name && value && *value)
-    {
-      char *new_value = lt_extend_str (getenv (name), value, 0);
-      /* some systems can't cope with a ':'-terminated path #' */
-      size_t len = strlen (new_value);
-      while ((len > 0) && IS_PATH_SEPARATOR (new_value[len-1]))
-        {
-          new_value[--len] = '\0';
-        }
-      lt_setenv (name, new_value);
-      XFREE (new_value);
-    }
-}
-
-void
-lt_update_lib_path (const char *name, const char *value)
-{
-  lt_debugprintf (__FILE__, __LINE__,
-		  "(lt_update_lib_path) modifying '%s' by prepending '%s'\n",
-                  nonnull (name), nonnull (value));
-
-  if (name && *name && value && *value)
-    {
-      char *new_value = lt_extend_str (getenv (name), value, 0);
-      lt_setenv (name, new_value);
-      XFREE (new_value);
-    }
-}
-
-EOF
-	    case $host_os in
-	      mingw*)
-		cat <<"EOF"
-
-/* Prepares an argument vector before calling spawn().
-   Note that spawn() does not by itself call the command interpreter
-     (getenv ("COMSPEC") != NULL ? getenv ("COMSPEC") :
-      ({ OSVERSIONINFO v; v.dwOSVersionInfoSize = sizeof(OSVERSIONINFO);
-         GetVersionEx(&v);
-         v.dwPlatformId == VER_PLATFORM_WIN32_NT;
-      }) ? "cmd.exe" : "command.com").
-   Instead it simply concatenates the arguments, separated by ' ', and calls
-   CreateProcess().  We must quote the arguments since Win32 CreateProcess()
-   interprets characters like ' ', '\t', '\\', '"' (but not '<' and '>') in a
-   special way:
-   - Space and tab are interpreted as delimiters. They are not treated as
-     delimiters if they are surrounded by double quotes: "...".
-   - Unescaped double quotes are removed from the input. Their only effect is
-     that within double quotes, space and tab are treated like normal
-     characters.
-   - Backslashes not followed by double quotes are not special.
-   - But 2*n+1 backslashes followed by a double quote become
-     n backslashes followed by a double quote (n >= 0):
-       \" -> "
-       \\\" -> \"
-       \\\\\" -> \\"
- */
-#define SHELL_SPECIAL_CHARS "\"\\ \001\002\003\004\005\006\007\010\011\012\013\014\015\016\017\020\021\022\023\024\025\026\027\030\031\032\033\034\035\036\037"
-#define SHELL_SPACE_CHARS " \001\002\003\004\005\006\007\010\011\012\013\014\015\016\017\020\021\022\023\024\025\026\027\030\031\032\033\034\035\036\037"
-char **
-prepare_spawn (char **argv)
-{
-  size_t argc;
-  char **new_argv;
-  size_t i;
-
-  /* Count number of arguments.  */
-  for (argc = 0; argv[argc] != NULL; argc++)
-    ;
-
-  /* Allocate new argument vector.  */
-  new_argv = XMALLOC (char *, argc + 1);
-
-  /* Put quoted arguments into the new argument vector.  */
-  for (i = 0; i < argc; i++)
-    {
-      const char *string = argv[i];
-
-      if (string[0] == '\0')
-	new_argv[i] = xstrdup ("\"\"");
-      else if (strpbrk (string, SHELL_SPECIAL_CHARS) != NULL)
-	{
-	  int quote_around = (strpbrk (string, SHELL_SPACE_CHARS) != NULL);
-	  size_t length;
-	  unsigned int backslashes;
-	  const char *s;
-	  char *quoted_string;
-	  char *p;
-
-	  length = 0;
-	  backslashes = 0;
-	  if (quote_around)
-	    length++;
-	  for (s = string; *s != '\0'; s++)
-	    {
-	      char c = *s;
-	      if (c == '"')
-		length += backslashes + 1;
-	      length++;
-	      if (c == '\\')
-		backslashes++;
-	      else
-		backslashes = 0;
-	    }
-	  if (quote_around)
-	    length += backslashes + 1;
-
-	  quoted_string = XMALLOC (char, length + 1);
-
-	  p = quoted_string;
-	  backslashes = 0;
-	  if (quote_around)
-	    *p++ = '"';
-	  for (s = string; *s != '\0'; s++)
-	    {
-	      char c = *s;
-	      if (c == '"')
-		{
-		  unsigned int j;
-		  for (j = backslashes + 1; j > 0; j--)
-		    *p++ = '\\';
-		}
-	      *p++ = c;
-	      if (c == '\\')
-		backslashes++;
-	      else
-		backslashes = 0;
-	    }
-	  if (quote_around)
-	    {
-	      unsigned int j;
-	      for (j = backslashes; j > 0; j--)
-		*p++ = '\\';
-	      *p++ = '"';
-	    }
-	  *p = '\0';
-
-	  new_argv[i] = quoted_string;
-	}
-      else
-	new_argv[i] = (char *) string;
-    }
-  new_argv[argc] = NULL;
-
-  return new_argv;
-}
-EOF
-		;;
-	    esac
-
-            cat <<"EOF"
-void lt_dump_script (FILE* f)
-{
-EOF
-	    func_emit_wrapper yes |
-	      $SED -n -e '
-s/^\(.\{79\}\)\(..*\)/\1\
-\2/
-h
-s/\([\\"]\)/\\\1/g
-s/$/\\n/
-s/\([^\n]*\).*/  fputs ("\1", f);/p
-g
-D'
-            cat <<"EOF"
-}
-EOF
-}
-# end: func_emit_cwrapperexe_src
-
-# func_win32_import_lib_p ARG
-# True if ARG is an import lib, as indicated by $file_magic_cmd
-func_win32_import_lib_p ()
-{
-    $debug_cmd
-
-    case `eval $file_magic_cmd \"\$1\" 2>/dev/null | $SED -e 10q` in
-    *import*) : ;;
-    *) false ;;
-    esac
-}
-
-# func_suncc_cstd_abi
-# !!ONLY CALL THIS FOR SUN CC AFTER $compile_command IS FULLY EXPANDED!!
-# Several compiler flags select an ABI that is incompatible with the
-# Cstd library. Avoid specifying it if any are in CXXFLAGS.
-func_suncc_cstd_abi ()
-{
-    $debug_cmd
-
-    case " $compile_command " in
-    *" -compat=g "*|*\ -std=c++[0-9][0-9]\ *|*" -library=stdcxx4 "*|*" -library=stlport4 "*)
-      suncc_use_cstd_abi=no
-      ;;
-    *)
-      suncc_use_cstd_abi=yes
-      ;;
-    esac
-}
-
-# func_mode_link arg...
-func_mode_link ()
-{
-    $debug_cmd
-
-    case $host in
-    *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*)
-      # It is impossible to link a dll without this setting, and
-      # we shouldn't force the makefile maintainer to figure out
-      # what system we are compiling for in order to pass an extra
-      # flag for every libtool invocation.
-      # allow_undefined=no
-
-      # FIXME: Unfortunately, there are problems with the above when trying
-      # to make a dll that has undefined symbols, in which case not
-      # even a static library is built.  For now, we need to specify
-      # -no-undefined on the libtool link line when we can be certain
-      # that all symbols are satisfied, otherwise we get a static library.
-      allow_undefined=yes
-      ;;
-    *)
-      allow_undefined=yes
-      ;;
-    esac
-    libtool_args=$nonopt
-    base_compile="$nonopt $@"
-    compile_command=$nonopt
-    finalize_command=$nonopt
-
-    compile_rpath=
-    finalize_rpath=
-    compile_shlibpath=
-    finalize_shlibpath=
-    convenience=
-    old_convenience=
-    deplibs=
-    old_deplibs=
-    compiler_flags=
-    linker_flags=
-    dllsearchpath=
-    lib_search_path=`pwd`
-    inst_prefix_dir=
-    new_inherited_linker_flags=
-
-    avoid_version=no
-    bindir=
-    dlfiles=
-    dlprefiles=
-    dlself=no
-    export_dynamic=no
-    export_symbols=
-    export_symbols_regex=
-    generated=
-    libobjs=
-    ltlibs=
-    module=no
-    no_install=no
-    objs=
-    os2dllname=
-    non_pic_objects=
-    precious_files_regex=
-    prefer_static_libs=no
-    preload=false
-    prev=
-    prevarg=
-    release=
-    rpath=
-    xrpath=
-    perm_rpath=
-    temp_rpath=
-    thread_safe=no
-    vinfo=
-    vinfo_number=no
-    weak_libs=
-    single_module=$wl-single_module
-    func_infer_tag $base_compile
-
-    # We need to know -static, to get the right output filenames.
-    for arg
-    do
-      case $arg in
-      -shared)
-	test yes != "$build_libtool_libs" \
-	  && func_fatal_configuration "cannot build a shared library"
-	build_old_libs=no
-	break
-	;;
-      -all-static | -static | -static-libtool-libs)
-	case $arg in
-	-all-static)
-	  if test yes = "$build_libtool_libs" && test -z "$link_static_flag"; then
-	    func_warning "complete static linking is impossible in this configuration"
-	  fi
-	  if test -n "$link_static_flag"; then
-	    dlopen_self=$dlopen_self_static
-	  fi
-	  prefer_static_libs=yes
-	  ;;
-	-static)
-	  if test -z "$pic_flag" && test -n "$link_static_flag"; then
-	    dlopen_self=$dlopen_self_static
-	  fi
-	  prefer_static_libs=built
-	  ;;
-	-static-libtool-libs)
-	  if test -z "$pic_flag" && test -n "$link_static_flag"; then
-	    dlopen_self=$dlopen_self_static
-	  fi
-	  prefer_static_libs=yes
-	  ;;
-	esac
-	build_libtool_libs=no
-	build_old_libs=yes
-	break
-	;;
-      esac
-    done
-
-    # See if our shared archives depend on static archives.
-    test -n "$old_archive_from_new_cmds" && build_old_libs=yes
-
-    # Go through the arguments, transforming them on the way.
-    while test "$#" -gt 0; do
-      arg=$1
-      shift
-      func_quote_arg pretty,unquoted "$arg"
-      qarg=$func_quote_arg_unquoted_result
-      func_append libtool_args " $func_quote_arg_result"
-
-      # If the previous option needs an argument, assign it.
-      if test -n "$prev"; then
-	case $prev in
-	output)
-	  func_append compile_command " @OUTPUT@"
-	  func_append finalize_command " @OUTPUT@"
-	  ;;
-	esac
-
-	case $prev in
-	bindir)
-	  bindir=$arg
-	  prev=
-	  continue
-	  ;;
-	dlfiles|dlprefiles)
-	  $preload || {
-	    # Add the symbol object into the linking commands.
-	    func_append compile_command " @SYMFILE@"
-	    func_append finalize_command " @SYMFILE@"
-	    preload=:
-	  }
-	  case $arg in
-	  *.la | *.lo) ;;  # We handle these cases below.
-	  force)
-	    if test no = "$dlself"; then
-	      dlself=needless
-	      export_dynamic=yes
-	    fi
-	    prev=
-	    continue
-	    ;;
-	  self)
-	    if test dlprefiles = "$prev"; then
-	      dlself=yes
-	    elif test dlfiles = "$prev" && test yes != "$dlopen_self"; then
-	      dlself=yes
-	    else
-	      dlself=needless
-	      export_dynamic=yes
-	    fi
-	    prev=
-	    continue
-	    ;;
-	  *)
-	    if test dlfiles = "$prev"; then
-	      func_append dlfiles " $arg"
-	    else
-	      func_append dlprefiles " $arg"
-	    fi
-	    prev=
-	    continue
-	    ;;
-	  esac
-	  ;;
-	expsyms)
-	  export_symbols=$arg
-	  test -f "$arg" \
-	    || func_fatal_error "symbol file '$arg' does not exist"
-	  prev=
-	  continue
-	  ;;
-	expsyms_regex)
-	  export_symbols_regex=$arg
-	  prev=
-	  continue
-	  ;;
-	framework)
-	  case $host in
-	    *-*-darwin*)
-	      case "$deplibs " in
-		*" $qarg.ltframework "*) ;;
-		*) func_append deplibs " $qarg.ltframework" # this is fixed later
-		   ;;
-	      esac
-	      ;;
-	  esac
-	  prev=
-	  continue
-	  ;;
-	inst_prefix)
-	  inst_prefix_dir=$arg
-	  prev=
-	  continue
-	  ;;
-	mllvm)
-	  # Clang does not use LLVM to link, so we can simply discard any
-	  # '-mllvm $arg' options when doing the link step.
-	  prev=
-	  continue
-	  ;;
-	objectlist)
-	  if test -f "$arg"; then
-	    save_arg=$arg
-	    moreargs=
-	    for fil in `cat "$save_arg"`
-	    do
-#	      func_append moreargs " $fil"
-	      arg=$fil
-	      # A libtool-controlled object.
-
-	      # Check to see that this really is a libtool object.
-	      if func_lalib_unsafe_p "$arg"; then
-		pic_object=
-		non_pic_object=
-
-		# Read the .lo file
-		func_source "$arg"
-
-		if test -z "$pic_object" ||
-		   test -z "$non_pic_object" ||
-		   test none = "$pic_object" &&
-		   test none = "$non_pic_object"; then
-		  func_fatal_error "cannot find name of object for '$arg'"
-		fi
-
-		# Extract subdirectory from the argument.
-		func_dirname "$arg" "/" ""
-		xdir=$func_dirname_result
-
-		if test none != "$pic_object"; then
-		  # Prepend the subdirectory the object is found in.
-		  pic_object=$xdir$pic_object
-
-		  if test dlfiles = "$prev"; then
-		    if test yes = "$build_libtool_libs" && test yes = "$dlopen_support"; then
-		      func_append dlfiles " $pic_object"
-		      prev=
-		      continue
-		    else
-		      # If libtool objects are unsupported, then we need to preload.
-		      prev=dlprefiles
-		    fi
-		  fi
-
-		  # CHECK ME:  I think I busted this.  -Ossama
-		  if test dlprefiles = "$prev"; then
-		    # Preload the old-style object.
-		    func_append dlprefiles " $pic_object"
-		    prev=
-		  fi
-
-		  # A PIC object.
-		  func_append libobjs " $pic_object"
-		  arg=$pic_object
-		fi
-
-		# Non-PIC object.
-		if test none != "$non_pic_object"; then
-		  # Prepend the subdirectory the object is found in.
-		  non_pic_object=$xdir$non_pic_object
-
-		  # A standard non-PIC object
-		  func_append non_pic_objects " $non_pic_object"
-		  if test -z "$pic_object" || test none = "$pic_object"; then
-		    arg=$non_pic_object
-		  fi
-		else
-		  # If the PIC object exists, use it instead.
-		  # $xdir was prepended to $pic_object above.
-		  non_pic_object=$pic_object
-		  func_append non_pic_objects " $non_pic_object"
-		fi
-	      else
-		# Only an error if not doing a dry-run.
-		if $opt_dry_run; then
-		  # Extract subdirectory from the argument.
-		  func_dirname "$arg" "/" ""
-		  xdir=$func_dirname_result
-
-		  func_lo2o "$arg"
-		  pic_object=$xdir$objdir/$func_lo2o_result
-		  non_pic_object=$xdir$func_lo2o_result
-		  func_append libobjs " $pic_object"
-		  func_append non_pic_objects " $non_pic_object"
-	        else
-		  func_fatal_error "'$arg' is not a valid libtool object"
-		fi
-	      fi
-	    done
-	  else
-	    func_fatal_error "link input file '$arg' does not exist"
-	  fi
-	  arg=$save_arg
-	  prev=
-	  continue
-	  ;;
-	os2dllname)
-	  os2dllname=$arg
-	  prev=
-	  continue
-	  ;;
-	precious_regex)
-	  precious_files_regex=$arg
-	  prev=
-	  continue
-	  ;;
-	release)
-	  release=-$arg
-	  prev=
-	  continue
-	  ;;
-	rpath | xrpath)
-	  # We need an absolute path.
-	  case $arg in
-	  [\\/]* | [A-Za-z]:[\\/]*) ;;
-	  *)
-	    func_fatal_error "only absolute run-paths are allowed"
-	    ;;
-	  esac
-	  if test rpath = "$prev"; then
-	    case "$rpath " in
-	    *" $arg "*) ;;
-	    *) func_append rpath " $arg" ;;
-	    esac
-	  else
-	    case "$xrpath " in
-	    *" $arg "*) ;;
-	    *) func_append xrpath " $arg" ;;
-	    esac
-	  fi
-	  prev=
-	  continue
-	  ;;
-	shrext)
-	  shrext_cmds=$arg
-	  prev=
-	  continue
-	  ;;
-	weak)
-	  func_append weak_libs " $arg"
-	  prev=
-	  continue
-	  ;;
-	xcclinker)
-	  func_append linker_flags " $qarg"
-	  func_append compiler_flags " $qarg"
-	  prev=
-	  func_append compile_command " $qarg"
-	  func_append finalize_command " $qarg"
-	  continue
-	  ;;
-	xcompiler)
-	  func_append compiler_flags " $qarg"
-	  prev=
-	  func_append compile_command " $qarg"
-	  func_append finalize_command " $qarg"
-	  continue
-	  ;;
-	xlinker)
-	  func_append linker_flags " $qarg"
-	  func_append compiler_flags " $wl$qarg"
-	  prev=
-	  func_append compile_command " $wl$qarg"
-	  func_append finalize_command " $wl$qarg"
-	  continue
-	  ;;
-	*)
-	  eval "$prev=\"\$arg\""
-	  prev=
-	  continue
-	  ;;
-	esac
-      fi # test -n "$prev"
-
-      prevarg=$arg
-
-      case $arg in
-      -all-static)
-	if test -n "$link_static_flag"; then
-	  # See comment for -static flag below, for more details.
-	  func_append compile_command " $link_static_flag"
-	  func_append finalize_command " $link_static_flag"
-	fi
-	continue
-	;;
-
-      -allow-undefined)
-	# FIXME: remove this flag sometime in the future.
-	func_fatal_error "'-allow-undefined' must not be used because it is the default"
-	;;
-
-      -avoid-version)
-	avoid_version=yes
-	continue
-	;;
-
-      -bindir)
-	prev=bindir
-	continue
-	;;
-
-      -dlopen)
-	prev=dlfiles
-	continue
-	;;
-
-      -dlpreopen)
-	prev=dlprefiles
-	continue
-	;;
-
-      -export-dynamic)
-	export_dynamic=yes
-	continue
-	;;
-
-      -export-symbols | -export-symbols-regex)
-	if test -n "$export_symbols" || test -n "$export_symbols_regex"; then
-	  func_fatal_error "more than one -exported-symbols argument is not allowed"
-	fi
-	if test X-export-symbols = "X$arg"; then
-	  prev=expsyms
-	else
-	  prev=expsyms_regex
-	fi
-	continue
-	;;
-
-      -framework)
-	prev=framework
-	continue
-	;;
-
-      -inst-prefix-dir)
-	prev=inst_prefix
-	continue
-	;;
-
-      # The native IRIX linker understands -LANG:*, -LIST:* and -LNO:*
-      # so, if we see these flags be careful not to treat them like -L
-      -L[A-Z][A-Z]*:*)
-	case $with_gcc/$host in
-	no/*-*-irix* | /*-*-irix*)
-	  func_append compile_command " $arg"
-	  func_append finalize_command " $arg"
-	  ;;
-	esac
-	continue
-	;;
-
-      -L*)
-	func_stripname "-L" '' "$arg"
-	if test -z "$func_stripname_result"; then
-	  if test "$#" -gt 0; then
-	    func_fatal_error "require no space between '-L' and '$1'"
-	  else
-	    func_fatal_error "need path for '-L' option"
-	  fi
-	fi
-	func_resolve_sysroot "$func_stripname_result"
-	dir=$func_resolve_sysroot_result
-	# We need an absolute path.
-	case $dir in
-	[\\/]* | [A-Za-z]:[\\/]*) ;;
-	*)
-	  absdir=`cd "$dir" && pwd`
-	  test -z "$absdir" && \
-	    func_fatal_error "cannot determine absolute directory name of '$dir'"
-	  dir=$absdir
-	  ;;
-	esac
-	case "$deplibs " in
-	*" -L$dir "* | *" $arg "*)
-	  # Will only happen for absolute or sysroot arguments
-	  ;;
-	*)
-	  # Preserve sysroot, but never include relative directories
-	  case $dir in
-	    [\\/]* | [A-Za-z]:[\\/]* | =*) func_append deplibs " $arg" ;;
-	    *) func_append deplibs " -L$dir" ;;
-	  esac
-	  func_append lib_search_path " $dir"
-	  ;;
-	esac
-	case $host in
-	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*)
-	  testbindir=`$ECHO "$dir" | $SED 's*/lib$*/bin*'`
-	  case :$dllsearchpath: in
-	  *":$dir:"*) ;;
-	  ::) dllsearchpath=$dir;;
-	  *) func_append dllsearchpath ":$dir";;
-	  esac
-	  case :$dllsearchpath: in
-	  *":$testbindir:"*) ;;
-	  ::) dllsearchpath=$testbindir;;
-	  *) func_append dllsearchpath ":$testbindir";;
-	  esac
-	  ;;
-	esac
-	continue
-	;;
-
-      -l*)
-	if test X-lc = "X$arg" || test X-lm = "X$arg"; then
-	  case $host in
-	  *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos* | *-cegcc* | *-*-haiku*)
-	    # These systems don't actually have a C or math library (as such)
-	    continue
-	    ;;
-	  *-*-os2*)
-	    # These systems don't actually have a C library (as such)
-	    test X-lc = "X$arg" && continue
-	    ;;
-	  *-*-openbsd* | *-*-freebsd* | *-*-dragonfly* | *-*-bitrig*)
-	    # Do not include libc due to us having libc/libc_r.
-	    test X-lc = "X$arg" && continue
-	    ;;
-	  *-*-rhapsody* | *-*-darwin1.[012])
-	    # Rhapsody C and math libraries are in the System framework
-	    func_append deplibs " System.ltframework"
-	    continue
-	    ;;
-	  *-*-sco3.2v5* | *-*-sco5v6*)
-	    # Causes problems with __ctype
-	    test X-lc = "X$arg" && continue
-	    ;;
-	  *-*-sysv4.2uw2* | *-*-sysv5* | *-*-unixware* | *-*-OpenUNIX*)
-	    # Compiler inserts libc in the correct place for threads to work
-	    test X-lc = "X$arg" && continue
-	    ;;
-	  esac
-	elif test X-lc_r = "X$arg"; then
-	 case $host in
-	 *-*-openbsd* | *-*-freebsd* | *-*-dragonfly* | *-*-bitrig*)
-	   # Do not include libc_r directly, use -pthread flag.
-	   continue
-	   ;;
-	 esac
-	fi
-	func_append deplibs " $arg"
-	continue
-	;;
-
-      -mllvm)
-	prev=mllvm
-	continue
-	;;
-
-      -module)
-	module=yes
-	continue
-	;;
-
-      # Tru64 UNIX uses -model [arg] to determine the layout of C++
-      # classes, name mangling, and exception handling.
-      # Darwin uses the -arch flag to determine output architecture.
-      -model|-arch|-isysroot|--sysroot)
-	func_append compiler_flags " $arg"
-	func_append compile_command " $arg"
-	func_append finalize_command " $arg"
-	prev=xcompiler
-	continue
-	;;
-
-      -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \
-      |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*)
-	func_append compiler_flags " $arg"
-	func_append compile_command " $arg"
-	func_append finalize_command " $arg"
-	case "$new_inherited_linker_flags " in
-	    *" $arg "*) ;;
-	    * ) func_append new_inherited_linker_flags " $arg" ;;
-	esac
-	continue
-	;;
-
-      -multi_module)
-	single_module=$wl-multi_module
-	continue
-	;;
-
-      -no-fast-install)
-	fast_install=no
-	continue
-	;;
-
-      -no-install)
-	case $host in
-	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-darwin* | *-cegcc*)
-	  # The PATH hackery in wrapper scripts is required on Windows
-	  # and Darwin in order for the loader to find any dlls it needs.
-	  func_warning "'-no-install' is ignored for $host"
-	  func_warning "assuming '-no-fast-install' instead"
-	  fast_install=no
-	  ;;
-	*) no_install=yes ;;
-	esac
-	continue
-	;;
-
-      -no-undefined)
-	allow_undefined=no
-	continue
-	;;
-
-      -objectlist)
-	prev=objectlist
-	continue
-	;;
-
-      -os2dllname)
-	prev=os2dllname
-	continue
-	;;
-
-      -o) prev=output ;;
-
-      -precious-files-regex)
-	prev=precious_regex
-	continue
-	;;
-
-      -release)
-	prev=release
-	continue
-	;;
-
-      -rpath)
-	prev=rpath
-	continue
-	;;
-
-      -R)
-	prev=xrpath
-	continue
-	;;
-
-      -R*)
-	func_stripname '-R' '' "$arg"
-	dir=$func_stripname_result
-	# We need an absolute path.
-	case $dir in
-	[\\/]* | [A-Za-z]:[\\/]*) ;;
-	=*)
-	  func_stripname '=' '' "$dir"
-	  dir=$lt_sysroot$func_stripname_result
-	  ;;
-	*)
-	  func_fatal_error "only absolute run-paths are allowed"
-	  ;;
-	esac
-	case "$xrpath " in
-	*" $dir "*) ;;
-	*) func_append xrpath " $dir" ;;
-	esac
-	continue
-	;;
-
-      -shared)
-	# The effects of -shared are defined in a previous loop.
-	continue
-	;;
-
-      -shrext)
-	prev=shrext
-	continue
-	;;
-
-      -static | -static-libtool-libs)
-	# The effects of -static are defined in a previous loop.
-	# We used to do the same as -all-static on platforms that
-	# didn't have a PIC flag, but the assumption that the effects
-	# would be equivalent was wrong.  It would break on at least
-	# Digital Unix and AIX.
-	continue
-	;;
-
-      -thread-safe)
-	thread_safe=yes
-	continue
-	;;
-
-      -version-info)
-	prev=vinfo
-	continue
-	;;
-
-      -version-number)
-	prev=vinfo
-	vinfo_number=yes
-	continue
-	;;
-
-      -weak)
-        prev=weak
-	continue
-	;;
-
-      -Wc,*)
-	func_stripname '-Wc,' '' "$arg"
-	args=$func_stripname_result
-	arg=
-	save_ifs=$IFS; IFS=,
-	for flag in $args; do
-	  IFS=$save_ifs
-          func_quote_arg pretty "$flag"
-	  func_append arg " $func_quote_arg_result"
-	  func_append compiler_flags " $func_quote_arg_result"
-	done
-	IFS=$save_ifs
-	func_stripname ' ' '' "$arg"
-	arg=$func_stripname_result
-	;;
-
-      -Wl,*)
-	func_stripname '-Wl,' '' "$arg"
-	args=$func_stripname_result
-	arg=
-	save_ifs=$IFS; IFS=,
-	for flag in $args; do
-	  IFS=$save_ifs
-          func_quote_arg pretty "$flag"
-	  func_append arg " $wl$func_quote_arg_result"
-	  func_append compiler_flags " $wl$func_quote_arg_result"
-	  func_append linker_flags " $func_quote_arg_result"
-	done
-	IFS=$save_ifs
-	func_stripname ' ' '' "$arg"
-	arg=$func_stripname_result
-	;;
-
-      -Xcompiler)
-	prev=xcompiler
-	continue
-	;;
-
-      -Xlinker)
-	prev=xlinker
-	continue
-	;;
-
-      -XCClinker)
-	prev=xcclinker
-	continue
-	;;
-
-      # -msg_* for osf cc
-      -msg_*)
-	func_quote_arg pretty "$arg"
-	arg=$func_quote_arg_result
-	;;
-
-      # Flags to be passed through unchanged, with rationale:
-      # -64, -mips[0-9]      enable 64-bit mode for the SGI compiler
-      # -r[0-9][0-9]*        specify processor for the SGI compiler
-      # -xarch=*, -xtarget=* enable 64-bit mode for the Sun compiler
-      # +DA*, +DD*           enable 64-bit mode for the HP compiler
-      # -q*                  compiler args for the IBM compiler
-      # -m*, -t[45]*, -txscale* architecture-specific flags for GCC
-      # -F/path              path to uninstalled frameworks, gcc on darwin
-      # -p, -pg, --coverage, -fprofile-*  profiling flags for GCC
-      # -fstack-protector*   stack protector flags for GCC
-      # @file                GCC response files
-      # -tp=*                Portland pgcc target processor selection
-      # --sysroot=*          for sysroot support
-      # -O*, -g*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization
-      # -specs=*             GCC specs files
-      # -stdlib=*            select c++ std lib with clang
-      # -fsanitize=*         Clang/GCC memory and address sanitizer
-      # -fuse-ld=*           Linker select flags for GCC
-      -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
-      -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \
-      -O*|-g*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*|-stdlib=*| \
-      -specs=*|-fsanitize=*|-fuse-ld=*)
-        func_quote_arg pretty "$arg"
-	arg=$func_quote_arg_result
-        func_append compile_command " $arg"
-        func_append finalize_command " $arg"
-        func_append compiler_flags " $arg"
-        continue
-        ;;
-
-      -Z*)
-        if test os2 = "`expr $host : '.*\(os2\)'`"; then
-          # OS/2 uses -Zxxx to specify OS/2-specific options
-	  compiler_flags="$compiler_flags $arg"
-	  func_append compile_command " $arg"
-	  func_append finalize_command " $arg"
-	  case $arg in
-	  -Zlinker | -Zstack)
-	    prev=xcompiler
-	    ;;
-	  esac
-	  continue
-        else
-	  # Otherwise treat like 'Some other compiler flag' below
-	  func_quote_arg pretty "$arg"
-	  arg=$func_quote_arg_result
-        fi
-	;;
-
-      # Some other compiler flag.
-      -* | +*)
-        func_quote_arg pretty "$arg"
-	arg=$func_quote_arg_result
-	;;
-
-      *.$objext)
-	# A standard object.
-	func_append objs " $arg"
-	;;
-
-      *.lo)
-	# A libtool-controlled object.
-
-	# Check to see that this really is a libtool object.
-	if func_lalib_unsafe_p "$arg"; then
-	  pic_object=
-	  non_pic_object=
-
-	  # Read the .lo file
-	  func_source "$arg"
-
-	  if test -z "$pic_object" ||
-	     test -z "$non_pic_object" ||
-	     test none = "$pic_object" &&
-	     test none = "$non_pic_object"; then
-	    func_fatal_error "cannot find name of object for '$arg'"
-	  fi
-
-	  # Extract subdirectory from the argument.
-	  func_dirname "$arg" "/" ""
-	  xdir=$func_dirname_result
-
-	  test none = "$pic_object" || {
-	    # Prepend the subdirectory the object is found in.
-	    pic_object=$xdir$pic_object
-
-	    if test dlfiles = "$prev"; then
-	      if test yes = "$build_libtool_libs" && test yes = "$dlopen_support"; then
-		func_append dlfiles " $pic_object"
-		prev=
-		continue
-	      else
-		# If libtool objects are unsupported, then we need to preload.
-		prev=dlprefiles
-	      fi
-	    fi
-
-	    # CHECK ME:  I think I busted this.  -Ossama
-	    if test dlprefiles = "$prev"; then
-	      # Preload the old-style object.
-	      func_append dlprefiles " $pic_object"
-	      prev=
-	    fi
-
-	    # A PIC object.
-	    func_append libobjs " $pic_object"
-	    arg=$pic_object
-	  }
-
-	  # Non-PIC object.
-	  if test none != "$non_pic_object"; then
-	    # Prepend the subdirectory the object is found in.
-	    non_pic_object=$xdir$non_pic_object
-
-	    # A standard non-PIC object
-	    func_append non_pic_objects " $non_pic_object"
-	    if test -z "$pic_object" || test none = "$pic_object"; then
-	      arg=$non_pic_object
-	    fi
-	  else
-	    # If the PIC object exists, use it instead.
-	    # $xdir was prepended to $pic_object above.
-	    non_pic_object=$pic_object
-	    func_append non_pic_objects " $non_pic_object"
-	  fi
-	else
-	  # Only an error if not doing a dry-run.
-	  if $opt_dry_run; then
-	    # Extract subdirectory from the argument.
-	    func_dirname "$arg" "/" ""
-	    xdir=$func_dirname_result
-
-	    func_lo2o "$arg"
-	    pic_object=$xdir$objdir/$func_lo2o_result
-	    non_pic_object=$xdir$func_lo2o_result
-	    func_append libobjs " $pic_object"
-	    func_append non_pic_objects " $non_pic_object"
-	  else
-	    func_fatal_error "'$arg' is not a valid libtool object"
-	  fi
-	fi
-	;;
-
-      *.$libext)
-	# An archive.
-	func_append deplibs " $arg"
-	func_append old_deplibs " $arg"
-	continue
-	;;
-
-      *.la)
-	# A libtool-controlled library.
-
-	func_resolve_sysroot "$arg"
-	if test dlfiles = "$prev"; then
-	  # This library was specified with -dlopen.
-	  func_append dlfiles " $func_resolve_sysroot_result"
-	  prev=
-	elif test dlprefiles = "$prev"; then
-	  # The library was specified with -dlpreopen.
-	  func_append dlprefiles " $func_resolve_sysroot_result"
-	  prev=
-	else
-	  func_append deplibs " $func_resolve_sysroot_result"
-	fi
-	continue
-	;;
-
-      # Some other compiler argument.
-      *)
-	# Unknown arguments in both finalize_command and compile_command need
-	# to be aesthetically quoted because they are evaled later.
-	func_quote_arg pretty "$arg"
-	arg=$func_quote_arg_result
-	;;
-      esac # arg
-
-      # Now actually substitute the argument into the commands.
-      if test -n "$arg"; then
-	func_append compile_command " $arg"
-	func_append finalize_command " $arg"
-      fi
-    done # argument parsing loop
-
-    test -n "$prev" && \
-      func_fatal_help "the '$prevarg' option requires an argument"
-
-    if test yes = "$export_dynamic" && test -n "$export_dynamic_flag_spec"; then
-      eval arg=\"$export_dynamic_flag_spec\"
-      func_append compile_command " $arg"
-      func_append finalize_command " $arg"
-    fi
-
-    oldlibs=
-    # calculate the name of the file, without its directory
-    func_basename "$output"
-    outputname=$func_basename_result
-    libobjs_save=$libobjs
-
-    if test -n "$shlibpath_var"; then
-      # get the directories listed in $shlibpath_var
-      eval shlib_search_path=\`\$ECHO \"\$$shlibpath_var\" \| \$SED \'s/:/ /g\'\`
-    else
-      shlib_search_path=
-    fi
-    eval sys_lib_search_path=\"$sys_lib_search_path_spec\"
-    eval sys_lib_dlsearch_path=\"$sys_lib_dlsearch_path_spec\"
-
-    # Definition is injected by LT_CONFIG during libtool generation.
-    func_munge_path_list sys_lib_dlsearch_path "$LT_SYS_LIBRARY_PATH"
-
-    func_dirname "$output" "/" ""
-    output_objdir=$func_dirname_result$objdir
-    func_to_tool_file "$output_objdir/"
-    tool_output_objdir=$func_to_tool_file_result
-    # Create the object directory.
-    func_mkdir_p "$output_objdir"
-
-    # Determine the type of output
-    case $output in
-    "")
-      func_fatal_help "you must specify an output file"
-      ;;
-    *.$libext) linkmode=oldlib ;;
-    *.lo | *.$objext) linkmode=obj ;;
-    *.la) linkmode=lib ;;
-    *) linkmode=prog ;; # Anything else should be a program.
-    esac
-
-    specialdeplibs=
-
-    libs=
-    # Find all interdependent deplibs by searching for libraries
-    # that are linked more than once (e.g. -la -lb -la)
-    for deplib in $deplibs; do
-      if $opt_preserve_dup_deps; then
-	case "$libs " in
-	*" $deplib "*) func_append specialdeplibs " $deplib" ;;
-	esac
-      fi
-      func_append libs " $deplib"
-    done
-
-    if test lib = "$linkmode"; then
-      libs="$predeps $libs $compiler_lib_search_path $postdeps"
-
-      # Compute libraries that are listed more than once in $predeps
-      # $postdeps and mark them as special (i.e., whose duplicates are
-      # not to be eliminated).
-      pre_post_deps=
-      if $opt_duplicate_compiler_generated_deps; then
-	for pre_post_dep in $predeps $postdeps; do
-	  case "$pre_post_deps " in
-	  *" $pre_post_dep "*) func_append specialdeplibs " $pre_post_deps" ;;
-	  esac
-	  func_append pre_post_deps " $pre_post_dep"
-	done
-      fi
-      pre_post_deps=
-    fi
-
-    deplibs=
-    newdependency_libs=
-    newlib_search_path=
-    need_relink=no # whether we're linking any uninstalled libtool libraries
-    notinst_deplibs= # not-installed libtool libraries
-    notinst_path= # paths that contain not-installed libtool libraries
-
-    case $linkmode in
-    lib)
-	passes="conv dlpreopen link"
-	for file in $dlfiles $dlprefiles; do
-	  case $file in
-	  *.la) ;;
-	  *)
-	    func_fatal_help "libraries can '-dlopen' only libtool libraries: $file"
-	    ;;
-	  esac
-	done
-	;;
-    prog)
-	compile_deplibs=
-	finalize_deplibs=
-	alldeplibs=false
-	newdlfiles=
-	newdlprefiles=
-	passes="conv scan dlopen dlpreopen link"
-	;;
-    *)  passes="conv"
-	;;
-    esac
-
-    for pass in $passes; do
-      # The preopen pass in lib mode reverses $deplibs; put it back here
-      # so that -L comes before libs that need it for instance...
-      if test lib,link = "$linkmode,$pass"; then
-	## FIXME: Find the place where the list is rebuilt in the wrong
-	##        order, and fix it there properly
-        tmp_deplibs=
-	for deplib in $deplibs; do
-	  tmp_deplibs="$deplib $tmp_deplibs"
-	done
-	deplibs=$tmp_deplibs
-      fi
-
-      if test lib,link = "$linkmode,$pass" ||
-	 test prog,scan = "$linkmode,$pass"; then
-	libs=$deplibs
-	deplibs=
-      fi
-      if test prog = "$linkmode"; then
-	case $pass in
-	dlopen) libs=$dlfiles ;;
-	dlpreopen) libs=$dlprefiles ;;
-	link) libs="$deplibs %DEPLIBS% $dependency_libs" ;;
-	esac
-      fi
-      if test lib,dlpreopen = "$linkmode,$pass"; then
-	# Collect and forward deplibs of preopened libtool libs
-	for lib in $dlprefiles; do
-	  # Ignore non-libtool-libs
-	  dependency_libs=
-	  func_resolve_sysroot "$lib"
-	  case $lib in
-	  *.la)	func_source "$func_resolve_sysroot_result" ;;
-	  esac
-
-	  # Collect preopened libtool deplibs, except any this library
-	  # has declared as weak libs
-	  for deplib in $dependency_libs; do
-	    func_basename "$deplib"
-            deplib_base=$func_basename_result
-	    case " $weak_libs " in
-	    *" $deplib_base "*) ;;
-	    *) func_append deplibs " $deplib" ;;
-	    esac
-	  done
-	done
-	libs=$dlprefiles
-      fi
-      if test dlopen = "$pass"; then
-	# Collect dlpreopened libraries
-	save_deplibs=$deplibs
-	deplibs=
-      fi
-
-      for deplib in $libs; do
-	lib=
-	found=false
-	case $deplib in
-	-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \
-        |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*)
-	  if test prog,link = "$linkmode,$pass"; then
-	    compile_deplibs="$deplib $compile_deplibs"
-	    finalize_deplibs="$deplib $finalize_deplibs"
-	  else
-	    func_append compiler_flags " $deplib"
-	    if test lib = "$linkmode"; then
-		case "$new_inherited_linker_flags " in
-		    *" $deplib "*) ;;
-		    * ) func_append new_inherited_linker_flags " $deplib" ;;
-		esac
-	    fi
-	  fi
-	  continue
-	  ;;
-	-l*)
-	  if test lib != "$linkmode" && test prog != "$linkmode"; then
-	    func_warning "'-l' is ignored for archives/objects"
-	    continue
-	  fi
-	  func_stripname '-l' '' "$deplib"
-	  name=$func_stripname_result
-	  if test lib = "$linkmode"; then
-	    searchdirs="$newlib_search_path $lib_search_path $compiler_lib_search_dirs $sys_lib_search_path $shlib_search_path"
-	  else
-	    searchdirs="$newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path"
-	  fi
-	  for searchdir in $searchdirs; do
-	    for search_ext in .la $std_shrext .so .a; do
-	      # Search the libtool library
-	      lib=$searchdir/lib$name$search_ext
-	      if test -f "$lib"; then
-		if test .la = "$search_ext"; then
-		  found=:
-		else
-		  found=false
-		fi
-		break 2
-	      fi
-	    done
-	  done
-	  if $found; then
-	    # deplib is a libtool library
-	    # If $allow_libtool_libs_with_static_runtimes && $deplib is a stdlib,
-	    # We need to do some special things here, and not later.
-	    if test yes = "$allow_libtool_libs_with_static_runtimes"; then
-	      case " $predeps $postdeps " in
-	      *" $deplib "*)
-		if func_lalib_p "$lib"; then
-		  library_names=
-		  old_library=
-		  func_source "$lib"
-		  for l in $old_library $library_names; do
-		    ll=$l
-		  done
-		  if test "X$ll" = "X$old_library"; then # only static version available
-		    found=false
-		    func_dirname "$lib" "" "."
-		    ladir=$func_dirname_result
-		    lib=$ladir/$old_library
-		    if test prog,link = "$linkmode,$pass"; then
-		      compile_deplibs="$deplib $compile_deplibs"
-		      finalize_deplibs="$deplib $finalize_deplibs"
-		    else
-		      deplibs="$deplib $deplibs"
-		      test lib = "$linkmode" && newdependency_libs="$deplib $newdependency_libs"
-		    fi
-		    continue
-		  fi
-		fi
-		;;
-	      *) ;;
-	      esac
-	    fi
-	  else
-	    # deplib doesn't seem to be a libtool library
-	    if test prog,link = "$linkmode,$pass"; then
-	      compile_deplibs="$deplib $compile_deplibs"
-	      finalize_deplibs="$deplib $finalize_deplibs"
-	    else
-	      deplibs="$deplib $deplibs"
-	      test lib = "$linkmode" && newdependency_libs="$deplib $newdependency_libs"
-	    fi
-	    continue
-	  fi
-	  ;; # -l
-	*.ltframework)
-	  if test prog,link = "$linkmode,$pass"; then
-	    compile_deplibs="$deplib $compile_deplibs"
-	    finalize_deplibs="$deplib $finalize_deplibs"
-	  else
-	    deplibs="$deplib $deplibs"
-	    if test lib = "$linkmode"; then
-		case "$new_inherited_linker_flags " in
-		    *" $deplib "*) ;;
-		    * ) func_append new_inherited_linker_flags " $deplib" ;;
-		esac
-	    fi
-	  fi
-	  continue
-	  ;;
-	-L*)
-	  case $linkmode in
-	  lib)
-	    deplibs="$deplib $deplibs"
-	    test conv = "$pass" && continue
-	    newdependency_libs="$deplib $newdependency_libs"
-	    func_stripname '-L' '' "$deplib"
-	    func_resolve_sysroot "$func_stripname_result"
-	    func_append newlib_search_path " $func_resolve_sysroot_result"
-	    ;;
-	  prog)
-	    if test conv = "$pass"; then
-	      deplibs="$deplib $deplibs"
-	      continue
-	    fi
-	    if test scan = "$pass"; then
-	      deplibs="$deplib $deplibs"
-	    else
-	      compile_deplibs="$deplib $compile_deplibs"
-	      finalize_deplibs="$deplib $finalize_deplibs"
-	    fi
-	    func_stripname '-L' '' "$deplib"
-	    func_resolve_sysroot "$func_stripname_result"
-	    func_append newlib_search_path " $func_resolve_sysroot_result"
-	    ;;
-	  *)
-	    func_warning "'-L' is ignored for archives/objects"
-	    ;;
-	  esac # linkmode
-	  continue
-	  ;; # -L
-	-R*)
-	  if test link = "$pass"; then
-	    func_stripname '-R' '' "$deplib"
-	    func_resolve_sysroot "$func_stripname_result"
-	    dir=$func_resolve_sysroot_result
-	    # Make sure the xrpath contains only unique directories.
-	    case "$xrpath " in
-	    *" $dir "*) ;;
-	    *) func_append xrpath " $dir" ;;
-	    esac
-	  fi
-	  deplibs="$deplib $deplibs"
-	  continue
-	  ;;
-	*.la)
-	  func_resolve_sysroot "$deplib"
-	  lib=$func_resolve_sysroot_result
-	  ;;
-	*.$libext)
-	  if test conv = "$pass"; then
-	    deplibs="$deplib $deplibs"
-	    continue
-	  fi
-	  case $linkmode in
-	  lib)
-	    # Linking convenience modules into shared libraries is allowed,
-	    # but linking other static libraries is non-portable.
-	    case " $dlpreconveniencelibs " in
-	    *" $deplib "*) ;;
-	    *)
-	      valid_a_lib=false
-	      case $deplibs_check_method in
-		match_pattern*)
-		  set dummy $deplibs_check_method; shift
-		  match_pattern_regex=`expr "$deplibs_check_method" : "$1 \(.*\)"`
-		  if eval "\$ECHO \"$deplib\"" 2>/dev/null | $SED 10q \
-		    | $EGREP "$match_pattern_regex" > /dev/null; then
-		    valid_a_lib=:
-		  fi
-		;;
-		pass_all)
-		  valid_a_lib=:
-		;;
-	      esac
-	      if $valid_a_lib; then
-		echo
-		$ECHO "*** Warning: Linking the shared library $output against the"
-		$ECHO "*** static library $deplib is not portable!"
-		deplibs="$deplib $deplibs"
-	      else
-		echo
-		$ECHO "*** Warning: Trying to link with static lib archive $deplib."
-		echo "*** I have the capability to make that library automatically link in when"
-		echo "*** you link to this library.  But I can only do this if you have a"
-		echo "*** shared version of the library, which you do not appear to have"
-		echo "*** because the file extensions .$libext of this argument makes me believe"
-		echo "*** that it is just a static archive that I should not use here."
-	      fi
-	      ;;
-	    esac
-	    continue
-	    ;;
-	  prog)
-	    if test link != "$pass"; then
-	      deplibs="$deplib $deplibs"
-	    else
-	      compile_deplibs="$deplib $compile_deplibs"
-	      finalize_deplibs="$deplib $finalize_deplibs"
-	    fi
-	    continue
-	    ;;
-	  esac # linkmode
-	  ;; # *.$libext
-	*.lo | *.$objext)
-	  if test conv = "$pass"; then
-	    deplibs="$deplib $deplibs"
-	  elif test prog = "$linkmode"; then
-	    if test dlpreopen = "$pass" || test yes != "$dlopen_support" || test no = "$build_libtool_libs"; then
-	      # If there is no dlopen support or we're linking statically,
-	      # we need to preload.
-	      func_append newdlprefiles " $deplib"
-	      compile_deplibs="$deplib $compile_deplibs"
-	      finalize_deplibs="$deplib $finalize_deplibs"
-	    else
-	      func_append newdlfiles " $deplib"
-	    fi
-	  fi
-	  continue
-	  ;;
-	%DEPLIBS%)
-	  alldeplibs=:
-	  continue
-	  ;;
-	esac # case $deplib
-
-	$found || test -f "$lib" \
-	  || func_fatal_error "cannot find the library '$lib' or unhandled argument '$deplib'"
-
-	# Check to see that this really is a libtool archive.
-	func_lalib_unsafe_p "$lib" \
-	  || func_fatal_error "'$lib' is not a valid libtool archive"
-
-	func_dirname "$lib" "" "."
-	ladir=$func_dirname_result
-
-	dlname=
-	dlopen=
-	dlpreopen=
-	libdir=
-	library_names=
-	old_library=
-	inherited_linker_flags=
-	# If the library was installed with an old release of libtool,
-	# it will not redefine variables installed, or shouldnotlink
-	installed=yes
-	shouldnotlink=no
-	avoidtemprpath=
-
-
-	# Read the .la file
-	func_source "$lib"
-
-	# Convert "-framework foo" to "foo.ltframework"
-	if test -n "$inherited_linker_flags"; then
-	  tmp_inherited_linker_flags=`$ECHO "$inherited_linker_flags" | $SED 's/-framework \([^ $]*\)/\1.ltframework/g'`
-	  for tmp_inherited_linker_flag in $tmp_inherited_linker_flags; do
-	    case " $new_inherited_linker_flags " in
-	      *" $tmp_inherited_linker_flag "*) ;;
-	      *) func_append new_inherited_linker_flags " $tmp_inherited_linker_flag";;
-	    esac
-	  done
-	fi
-	dependency_libs=`$ECHO " $dependency_libs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
-	if test lib,link = "$linkmode,$pass" ||
-	   test prog,scan = "$linkmode,$pass" ||
-	   { test prog != "$linkmode" && test lib != "$linkmode"; }; then
-	  test -n "$dlopen" && func_append dlfiles " $dlopen"
-	  test -n "$dlpreopen" && func_append dlprefiles " $dlpreopen"
-	fi
-
-	if test conv = "$pass"; then
-	  # Only check for convenience libraries
-	  deplibs="$lib $deplibs"
-	  if test -z "$libdir"; then
-	    if test -z "$old_library"; then
-	      func_fatal_error "cannot find name of link library for '$lib'"
-	    fi
-	    # It is a libtool convenience library, so add in its objects.
-	    func_append convenience " $ladir/$objdir/$old_library"
-	    func_append old_convenience " $ladir/$objdir/$old_library"
-	  elif test prog != "$linkmode" && test lib != "$linkmode"; then
-	    func_fatal_error "'$lib' is not a convenience library"
-	  fi
-	  tmp_libs=
-	  for deplib in $dependency_libs; do
-	    deplibs="$deplib $deplibs"
-	    if $opt_preserve_dup_deps; then
-	      case "$tmp_libs " in
-	      *" $deplib "*) func_append specialdeplibs " $deplib" ;;
-	      esac
-	    fi
-	    func_append tmp_libs " $deplib"
-	  done
-	  continue
-	fi # $pass = conv
-
-
-	# Get the name of the library we link against.
-	linklib=
-	if test -n "$old_library" &&
-	   { test yes = "$prefer_static_libs" ||
-	     test built,no = "$prefer_static_libs,$installed"; }; then
-	  linklib=$old_library
-	else
-	  for l in $old_library $library_names; do
-	    linklib=$l
-	  done
-	fi
-	if test -z "$linklib"; then
-	  func_fatal_error "cannot find name of link library for '$lib'"
-	fi
-
-	# This library was specified with -dlopen.
-	if test dlopen = "$pass"; then
-	  test -z "$libdir" \
-	    && func_fatal_error "cannot -dlopen a convenience library: '$lib'"
-	  if test -z "$dlname" ||
-	     test yes != "$dlopen_support" ||
-	     test no = "$build_libtool_libs"
-	  then
-	    # If there is no dlname, no dlopen support or we're linking
-	    # statically, we need to preload.  We also need to preload any
-	    # dependent libraries so libltdl's deplib preloader doesn't
-	    # bomb out in the load deplibs phase.
-	    func_append dlprefiles " $lib $dependency_libs"
-	  else
-	    func_append newdlfiles " $lib"
-	  fi
-	  continue
-	fi # $pass = dlopen
-
-	# We need an absolute path.
-	case $ladir in
-	[\\/]* | [A-Za-z]:[\\/]*) abs_ladir=$ladir ;;
-	*)
-	  abs_ladir=`cd "$ladir" && pwd`
-	  if test -z "$abs_ladir"; then
-	    func_warning "cannot determine absolute directory name of '$ladir'"
-	    func_warning "passing it literally to the linker, although it might fail"
-	    abs_ladir=$ladir
-	  fi
-	  ;;
-	esac
-	func_basename "$lib"
-	laname=$func_basename_result
-
-	# Find the relevant object directory and library name.
-	if test yes = "$installed"; then
-	  if test ! -f "$lt_sysroot$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then
-	    func_warning "library '$lib' was moved."
-	    dir=$ladir
-	    absdir=$abs_ladir
-	    libdir=$abs_ladir
-	  else
-	    dir=$lt_sysroot$libdir
-	    absdir=$lt_sysroot$libdir
-	  fi
-	  test yes = "$hardcode_automatic" && avoidtemprpath=yes
-	else
-	  if test ! -f "$ladir/$objdir/$linklib" && test -f "$abs_ladir/$linklib"; then
-	    dir=$ladir
-	    absdir=$abs_ladir
-	    # Remove this search path later
-	    func_append notinst_path " $abs_ladir"
-	  else
-	    dir=$ladir/$objdir
-	    absdir=$abs_ladir/$objdir
-	    # Remove this search path later
-	    func_append notinst_path " $abs_ladir"
-	  fi
-	fi # $installed = yes
-	func_stripname 'lib' '.la' "$laname"
-	name=$func_stripname_result
-
-	# This library was specified with -dlpreopen.
-	if test dlpreopen = "$pass"; then
-	  if test -z "$libdir" && test prog = "$linkmode"; then
-	    func_fatal_error "only libraries may -dlpreopen a convenience library: '$lib'"
-	  fi
-	  case $host in
-	    # special handling for platforms with PE-DLLs.
-	    *cygwin* | *mingw* | *cegcc* )
-	      # Linker will automatically link against shared library if both
-	      # static and shared are present.  Therefore, ensure we extract
-	      # symbols from the import library if a shared library is present
-	      # (otherwise, the dlopen module name will be incorrect).  We do
-	      # this by putting the import library name into $newdlprefiles.
-	      # We recover the dlopen module name by 'saving' the la file
-	      # name in a special purpose variable, and (later) extracting the
-	      # dlname from the la file.
-	      if test -n "$dlname"; then
-	        func_tr_sh "$dir/$linklib"
-	        eval "libfile_$func_tr_sh_result=\$abs_ladir/\$laname"
-	        func_append newdlprefiles " $dir/$linklib"
-	      else
-	        func_append newdlprefiles " $dir/$old_library"
-	        # Keep a list of preopened convenience libraries to check
-	        # that they are being used correctly in the link pass.
-	        test -z "$libdir" && \
-	          func_append dlpreconveniencelibs " $dir/$old_library"
-	      fi
-	    ;;
-	    * )
-	      # Prefer using a static library (so that no silly _DYNAMIC symbols
-	      # are required to link).
-	      if test -n "$old_library"; then
-	        func_append newdlprefiles " $dir/$old_library"
-	        # Keep a list of preopened convenience libraries to check
-	        # that they are being used correctly in the link pass.
-	        test -z "$libdir" && \
-	          func_append dlpreconveniencelibs " $dir/$old_library"
-	      # Otherwise, use the dlname, so that lt_dlopen finds it.
-	      elif test -n "$dlname"; then
-	        func_append newdlprefiles " $dir/$dlname"
-	      else
-	        func_append newdlprefiles " $dir/$linklib"
-	      fi
-	    ;;
-	  esac
-	fi # $pass = dlpreopen
-
-	if test -z "$libdir"; then
-	  # Link the convenience library
-	  if test lib = "$linkmode"; then
-	    deplibs="$dir/$old_library $deplibs"
-	  elif test prog,link = "$linkmode,$pass"; then
-	    compile_deplibs="$dir/$old_library $compile_deplibs"
-	    finalize_deplibs="$dir/$old_library $finalize_deplibs"
-	  else
-	    deplibs="$lib $deplibs" # used for prog,scan pass
-	  fi
-	  continue
-	fi
-
-
-	if test prog = "$linkmode" && test link != "$pass"; then
-	  func_append newlib_search_path " $ladir"
-	  deplibs="$lib $deplibs"
-
-	  linkalldeplibs=false
-	  if test no != "$link_all_deplibs" || test -z "$library_names" ||
-	     test no = "$build_libtool_libs"; then
-	    linkalldeplibs=:
-	  fi
-
-	  tmp_libs=
-	  for deplib in $dependency_libs; do
-	    case $deplib in
-	    -L*) func_stripname '-L' '' "$deplib"
-	         func_resolve_sysroot "$func_stripname_result"
-	         func_append newlib_search_path " $func_resolve_sysroot_result"
-		 ;;
-	    esac
-	    # Need to link against all dependency_libs?
-	    if $linkalldeplibs; then
-	      deplibs="$deplib $deplibs"
-	    else
-	      # Need to hardcode shared library paths
-	      # or/and link against static libraries
-	      newdependency_libs="$deplib $newdependency_libs"
-	    fi
-	    if $opt_preserve_dup_deps; then
-	      case "$tmp_libs " in
-	      *" $deplib "*) func_append specialdeplibs " $deplib" ;;
-	      esac
-	    fi
-	    func_append tmp_libs " $deplib"
-	  done # for deplib
-	  continue
-	fi # $linkmode = prog...
-
-	if test prog,link = "$linkmode,$pass"; then
-	  if test -n "$library_names" &&
-	     { { test no = "$prefer_static_libs" ||
-	         test built,yes = "$prefer_static_libs,$installed"; } ||
-	       test -z "$old_library"; }; then
-	    # We need to hardcode the library path
-	    if test -n "$shlibpath_var" && test -z "$avoidtemprpath"; then
-	      # Make sure the rpath contains only unique directories.
-	      case $temp_rpath: in
-	      *"$absdir:"*) ;;
-	      *) func_append temp_rpath "$absdir:" ;;
-	      esac
-	    fi
-
-	    # Hardcode the library path.
-	    # Skip directories that are in the system default run-time
-	    # search path.
-	    case " $sys_lib_dlsearch_path " in
-	    *" $absdir "*) ;;
-	    *)
-	      case "$compile_rpath " in
-	      *" $absdir "*) ;;
-	      *) func_append compile_rpath " $absdir" ;;
-	      esac
-	      ;;
-	    esac
-	    case " $sys_lib_dlsearch_path " in
-	    *" $libdir "*) ;;
-	    *)
-	      case "$finalize_rpath " in
-	      *" $libdir "*) ;;
-	      *) func_append finalize_rpath " $libdir" ;;
-	      esac
-	      ;;
-	    esac
-	  fi # $linkmode,$pass = prog,link...
-
-	  if $alldeplibs &&
-	     { test pass_all = "$deplibs_check_method" ||
-	       { test yes = "$build_libtool_libs" &&
-		 test -n "$library_names"; }; }; then
-	    # We only need to search for static libraries
-	    continue
-	  fi
-	fi
-
-	link_static=no # Whether the deplib will be linked statically
-	use_static_libs=$prefer_static_libs
-	if test built = "$use_static_libs" && test yes = "$installed"; then
-	  use_static_libs=no
-	fi
-	if test -n "$library_names" &&
-	   { test no = "$use_static_libs" || test -z "$old_library"; }; then
-	  case $host in
-	  *cygwin* | *mingw* | *cegcc* | *os2*)
-	      # No point in relinking DLLs because paths are not encoded
-	      func_append notinst_deplibs " $lib"
-	      need_relink=no
-	    ;;
-	  *)
-	    if test no = "$installed"; then
-	      func_append notinst_deplibs " $lib"
-	      need_relink=yes
-	    fi
-	    ;;
-	  esac
-	  # This is a shared library
-
-	  # Warn about portability, can't link against -module's on some
-	  # systems (darwin).  Don't bleat about dlopened modules though!
-	  dlopenmodule=
-	  for dlpremoduletest in $dlprefiles; do
-	    if test "X$dlpremoduletest" = "X$lib"; then
-	      dlopenmodule=$dlpremoduletest
-	      break
-	    fi
-	  done
-	  if test -z "$dlopenmodule" && test yes = "$shouldnotlink" && test link = "$pass"; then
-	    echo
-	    if test prog = "$linkmode"; then
-	      $ECHO "*** Warning: Linking the executable $output against the loadable module"
-	    else
-	      $ECHO "*** Warning: Linking the shared library $output against the loadable module"
-	    fi
-	    $ECHO "*** $linklib is not portable!"
-	  fi
-	  if test lib = "$linkmode" &&
-	     test yes = "$hardcode_into_libs"; then
-	    # Hardcode the library path.
-	    # Skip directories that are in the system default run-time
-	    # search path.
-	    case " $sys_lib_dlsearch_path " in
-	    *" $absdir "*) ;;
-	    *)
-	      case "$compile_rpath " in
-	      *" $absdir "*) ;;
-	      *) func_append compile_rpath " $absdir" ;;
-	      esac
-	      ;;
-	    esac
-	    case " $sys_lib_dlsearch_path " in
-	    *" $libdir "*) ;;
-	    *)
-	      case "$finalize_rpath " in
-	      *" $libdir "*) ;;
-	      *) func_append finalize_rpath " $libdir" ;;
-	      esac
-	      ;;
-	    esac
-	  fi
-
-	  if test -n "$old_archive_from_expsyms_cmds"; then
-	    # figure out the soname
-	    set dummy $library_names
-	    shift
-	    realname=$1
-	    shift
-	    libname=`eval "\\$ECHO \"$libname_spec\""`
-	    # use dlname if we got it. it's perfectly good, no?
-	    if test -n "$dlname"; then
-	      soname=$dlname
-	    elif test -n "$soname_spec"; then
-	      # bleh windows
-	      case $host in
-	      *cygwin* | mingw* | *cegcc* | *os2*)
-	        func_arith $current - $age
-		major=$func_arith_result
-		versuffix=-$major
-		;;
-	      esac
-	      eval soname=\"$soname_spec\"
-	    else
-	      soname=$realname
-	    fi
-
-	    # Make a new name for the extract_expsyms_cmds to use
-	    soroot=$soname
-	    func_basename "$soroot"
-	    soname=$func_basename_result
-	    func_stripname 'lib' '.dll' "$soname"
-	    newlib=libimp-$func_stripname_result.a
-
-	    # If the library has no export list, then create one now
-	    if test -f "$output_objdir/$soname-def"; then :
-	    else
-	      func_verbose "extracting exported symbol list from '$soname'"
-	      func_execute_cmds "$extract_expsyms_cmds" 'exit $?'
-	    fi
-
-	    # Create $newlib
-	    if test -f "$output_objdir/$newlib"; then :; else
-	      func_verbose "generating import library for '$soname'"
-	      func_execute_cmds "$old_archive_from_expsyms_cmds" 'exit $?'
-	    fi
-	    # make sure the library variables are pointing to the new library
-	    dir=$output_objdir
-	    linklib=$newlib
-	  fi # test -n "$old_archive_from_expsyms_cmds"
-
-	  if test prog = "$linkmode" || test relink != "$opt_mode"; then
-	    add_shlibpath=
-	    add_dir=
-	    add=
-	    lib_linked=yes
-	    case $hardcode_action in
-	    immediate | unsupported)
-	      if test no = "$hardcode_direct"; then
-		add=$dir/$linklib
-		case $host in
-		  *-*-sco3.2v5.0.[024]*) add_dir=-L$dir ;;
-		  *-*-sysv4*uw2*) add_dir=-L$dir ;;
-		  *-*-sysv5OpenUNIX* | *-*-sysv5UnixWare7.[01].[10]* | \
-		    *-*-unixware7*) add_dir=-L$dir ;;
-		  *-*-darwin* )
-		    # if the lib is a (non-dlopened) module then we cannot
-		    # link against it, someone is ignoring the earlier warnings
-		    if /usr/bin/file -L $add 2> /dev/null |
-			 $GREP ": [^:]* bundle" >/dev/null; then
-		      if test "X$dlopenmodule" != "X$lib"; then
-			$ECHO "*** Warning: lib $linklib is a module, not a shared library"
-			if test -z "$old_library"; then
-			  echo
-			  echo "*** And there doesn't seem to be a static archive available"
-			  echo "*** The link will probably fail, sorry"
-			else
-			  add=$dir/$old_library
-			fi
-		      elif test -n "$old_library"; then
-			add=$dir/$old_library
-		      fi
-		    fi
-		esac
-	      elif test no = "$hardcode_minus_L"; then
-		case $host in
-		*-*-sunos*) add_shlibpath=$dir ;;
-		esac
-		add_dir=-L$dir
-		add=-l$name
-	      elif test no = "$hardcode_shlibpath_var"; then
-		add_shlibpath=$dir
-		add=-l$name
-	      else
-		lib_linked=no
-	      fi
-	      ;;
-	    relink)
-	      if test yes = "$hardcode_direct" &&
-	         test no = "$hardcode_direct_absolute"; then
-		add=$dir/$linklib
-	      elif test yes = "$hardcode_minus_L"; then
-		add_dir=-L$absdir
-		# Try looking first in the location we're being installed to.
-		if test -n "$inst_prefix_dir"; then
-		  case $libdir in
-		    [\\/]*)
-		      func_append add_dir " -L$inst_prefix_dir$libdir"
-		      ;;
-		  esac
-		fi
-		add=-l$name
-	      elif test yes = "$hardcode_shlibpath_var"; then
-		add_shlibpath=$dir
-		add=-l$name
-	      else
-		lib_linked=no
-	      fi
-	      ;;
-	    *) lib_linked=no ;;
-	    esac
-
-	    if test yes != "$lib_linked"; then
-	      func_fatal_configuration "unsupported hardcode properties"
-	    fi
-
-	    if test -n "$add_shlibpath"; then
-	      case :$compile_shlibpath: in
-	      *":$add_shlibpath:"*) ;;
-	      *) func_append compile_shlibpath "$add_shlibpath:" ;;
-	      esac
-	    fi
-	    if test prog = "$linkmode"; then
-	      test -n "$add_dir" && compile_deplibs="$add_dir $compile_deplibs"
-	      test -n "$add" && compile_deplibs="$add $compile_deplibs"
-	    else
-	      test -n "$add_dir" && deplibs="$add_dir $deplibs"
-	      test -n "$add" && deplibs="$add $deplibs"
-	      if test yes != "$hardcode_direct" &&
-		 test yes != "$hardcode_minus_L" &&
-		 test yes = "$hardcode_shlibpath_var"; then
-		case :$finalize_shlibpath: in
-		*":$libdir:"*) ;;
-		*) func_append finalize_shlibpath "$libdir:" ;;
-		esac
-	      fi
-	    fi
-	  fi
-
-	  if test prog = "$linkmode" || test relink = "$opt_mode"; then
-	    add_shlibpath=
-	    add_dir=
-	    add=
-	    # Finalize command for both is simple: just hardcode it.
-	    if test yes = "$hardcode_direct" &&
-	       test no = "$hardcode_direct_absolute"; then
-	      add=$libdir/$linklib
-	    elif test yes = "$hardcode_minus_L"; then
-	      add_dir=-L$libdir
-	      add=-l$name
-	    elif test yes = "$hardcode_shlibpath_var"; then
-	      case :$finalize_shlibpath: in
-	      *":$libdir:"*) ;;
-	      *) func_append finalize_shlibpath "$libdir:" ;;
-	      esac
-	      add=-l$name
-	    elif test yes = "$hardcode_automatic"; then
-	      if test -n "$inst_prefix_dir" &&
-		 test -f "$inst_prefix_dir$libdir/$linklib"; then
-		add=$inst_prefix_dir$libdir/$linklib
-	      else
-		add=$libdir/$linklib
-	      fi
-	    else
-	      # We cannot seem to hardcode it, guess we'll fake it.
-	      add_dir=-L$libdir
-	      # Try looking first in the location we're being installed to.
-	      if test -n "$inst_prefix_dir"; then
-		case $libdir in
-		  [\\/]*)
-		    func_append add_dir " -L$inst_prefix_dir$libdir"
-		    ;;
-		esac
-	      fi
-	      add=-l$name
-	    fi
-
-	    if test prog = "$linkmode"; then
-	      test -n "$add_dir" && finalize_deplibs="$add_dir $finalize_deplibs"
-	      test -n "$add" && finalize_deplibs="$add $finalize_deplibs"
-	    else
-	      test -n "$add_dir" && deplibs="$add_dir $deplibs"
-	      test -n "$add" && deplibs="$add $deplibs"
-	    fi
-	  fi
-	elif test prog = "$linkmode"; then
-	  # Here we assume that one of hardcode_direct or hardcode_minus_L
-	  # is not unsupported.  This is valid on all known static and
-	  # shared platforms.
-	  if test unsupported != "$hardcode_direct"; then
-	    test -n "$old_library" && linklib=$old_library
-	    compile_deplibs="$dir/$linklib $compile_deplibs"
-	    finalize_deplibs="$dir/$linklib $finalize_deplibs"
-	  else
-	    compile_deplibs="-l$name -L$dir $compile_deplibs"
-	    finalize_deplibs="-l$name -L$dir $finalize_deplibs"
-	  fi
-	elif test yes = "$build_libtool_libs"; then
-	  # Not a shared library
-	  if test pass_all != "$deplibs_check_method"; then
-	    # We're trying link a shared library against a static one
-	    # but the system doesn't support it.
-
-	    # Just print a warning and add the library to dependency_libs so
-	    # that the program can be linked against the static library.
-	    echo
-	    $ECHO "*** Warning: This system cannot link to static lib archive $lib."
-	    echo "*** I have the capability to make that library automatically link in when"
-	    echo "*** you link to this library.  But I can only do this if you have a"
-	    echo "*** shared version of the library, which you do not appear to have."
-	    if test yes = "$module"; then
-	      echo "*** But as you try to build a module library, libtool will still create "
-	      echo "*** a static module, that should work as long as the dlopening application"
-	      echo "*** is linked with the -dlopen flag to resolve symbols at runtime."
-	      if test -z "$global_symbol_pipe"; then
-		echo
-		echo "*** However, this would only work if libtool was able to extract symbol"
-		echo "*** lists from a program, using 'nm' or equivalent, but libtool could"
-		echo "*** not find such a program.  So, this module is probably useless."
-		echo "*** 'nm' from GNU binutils and a full rebuild may help."
-	      fi
-	      if test no = "$build_old_libs"; then
-		build_libtool_libs=module
-		build_old_libs=yes
-	      else
-		build_libtool_libs=no
-	      fi
-	    fi
-	  else
-	    deplibs="$dir/$old_library $deplibs"
-	    link_static=yes
-	  fi
-	fi # link shared/static library?
-
-	if test lib = "$linkmode"; then
-	  if test -n "$dependency_libs" &&
-	     { test yes != "$hardcode_into_libs" ||
-	       test yes = "$build_old_libs" ||
-	       test yes = "$link_static"; }; then
-	    # Extract -R from dependency_libs
-	    temp_deplibs=
-	    for libdir in $dependency_libs; do
-	      case $libdir in
-	      -R*) func_stripname '-R' '' "$libdir"
-	           temp_xrpath=$func_stripname_result
-		   case " $xrpath " in
-		   *" $temp_xrpath "*) ;;
-		   *) func_append xrpath " $temp_xrpath";;
-		   esac;;
-	      *) func_append temp_deplibs " $libdir";;
-	      esac
-	    done
-	    dependency_libs=$temp_deplibs
-	  fi
-
-	  func_append newlib_search_path " $absdir"
-	  # Link against this library
-	  test no = "$link_static" && newdependency_libs="$abs_ladir/$laname $newdependency_libs"
-	  # ... and its dependency_libs
-	  tmp_libs=
-	  for deplib in $dependency_libs; do
-	    newdependency_libs="$deplib $newdependency_libs"
-	    case $deplib in
-              -L*) func_stripname '-L' '' "$deplib"
-                   func_resolve_sysroot "$func_stripname_result";;
-              *) func_resolve_sysroot "$deplib" ;;
-            esac
-	    if $opt_preserve_dup_deps; then
-	      case "$tmp_libs " in
-	      *" $func_resolve_sysroot_result "*)
-                func_append specialdeplibs " $func_resolve_sysroot_result" ;;
-	      esac
-	    fi
-	    func_append tmp_libs " $func_resolve_sysroot_result"
-	  done
-
-	  if test no != "$link_all_deplibs"; then
-	    # Add the search paths of all dependency libraries
-	    for deplib in $dependency_libs; do
-	      path=
-	      case $deplib in
-	      -L*) path=$deplib ;;
-	      *.la)
-	        func_resolve_sysroot "$deplib"
-	        deplib=$func_resolve_sysroot_result
-	        func_dirname "$deplib" "" "."
-		dir=$func_dirname_result
-		# We need an absolute path.
-		case $dir in
-		[\\/]* | [A-Za-z]:[\\/]*) absdir=$dir ;;
-		*)
-		  absdir=`cd "$dir" && pwd`
-		  if test -z "$absdir"; then
-		    func_warning "cannot determine absolute directory name of '$dir'"
-		    absdir=$dir
-		  fi
-		  ;;
-		esac
-		if $GREP "^installed=no" $deplib > /dev/null; then
-		case $host in
-		*-*-darwin*)
-		  depdepl=
-		  eval deplibrary_names=`$SED -n -e 's/^library_names=\(.*\)$/\1/p' $deplib`
-		  if test -n "$deplibrary_names"; then
-		    for tmp in $deplibrary_names; do
-		      depdepl=$tmp
-		    done
-		    if test -f "$absdir/$objdir/$depdepl"; then
-		      depdepl=$absdir/$objdir/$depdepl
-		      darwin_install_name=`$OTOOL -L $depdepl | awk '{if (NR == 2) {print $1;exit}}'`
-                      if test -z "$darwin_install_name"; then
-                          darwin_install_name=`$OTOOL64 -L $depdepl  | awk '{if (NR == 2) {print $1;exit}}'`
-                      fi
-		      func_append compiler_flags " $wl-dylib_file $wl$darwin_install_name:$depdepl"
-		      func_append linker_flags " -dylib_file $darwin_install_name:$depdepl"
-		      path=
-		    fi
-		  fi
-		  ;;
-		*)
-		  path=-L$absdir/$objdir
-		  ;;
-		esac
-		else
-		  eval libdir=`$SED -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
-		  test -z "$libdir" && \
-		    func_fatal_error "'$deplib' is not a valid libtool archive"
-		  test "$absdir" != "$libdir" && \
-		    func_warning "'$deplib' seems to be moved"
-
-		  path=-L$absdir
-		fi
-		;;
-	      esac
-	      case " $deplibs " in
-	      *" $path "*) ;;
-	      *) deplibs="$path $deplibs" ;;
-	      esac
-	    done
-	  fi # link_all_deplibs != no
-	fi # linkmode = lib
-      done # for deplib in $libs
-      if test link = "$pass"; then
-	if test prog = "$linkmode"; then
-	  compile_deplibs="$new_inherited_linker_flags $compile_deplibs"
-	  finalize_deplibs="$new_inherited_linker_flags $finalize_deplibs"
-	else
-	  compiler_flags="$compiler_flags "`$ECHO " $new_inherited_linker_flags" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
-	fi
-      fi
-      dependency_libs=$newdependency_libs
-      if test dlpreopen = "$pass"; then
-	# Link the dlpreopened libraries before other libraries
-	for deplib in $save_deplibs; do
-	  deplibs="$deplib $deplibs"
-	done
-      fi
-      if test dlopen != "$pass"; then
-	test conv = "$pass" || {
-	  # Make sure lib_search_path contains only unique directories.
-	  lib_search_path=
-	  for dir in $newlib_search_path; do
-	    case "$lib_search_path " in
-	    *" $dir "*) ;;
-	    *) func_append lib_search_path " $dir" ;;
-	    esac
-	  done
-	  newlib_search_path=
-	}
-
-	if test prog,link = "$linkmode,$pass"; then
-	  vars="compile_deplibs finalize_deplibs"
-	else
-	  vars=deplibs
-	fi
-	for var in $vars dependency_libs; do
-	  # Add libraries to $var in reverse order
-	  eval tmp_libs=\"\$$var\"
-	  new_libs=
-	  for deplib in $tmp_libs; do
-	    # FIXME: Pedantically, this is the right thing to do, so
-	    #        that some nasty dependency loop isn't accidentally
-	    #        broken:
-	    #new_libs="$deplib $new_libs"
-	    # Pragmatically, this seems to cause very few problems in
-	    # practice:
-	    case $deplib in
-	    -L*) new_libs="$deplib $new_libs" ;;
-	    -R*) ;;
-	    *)
-	      # And here is the reason: when a library appears more
-	      # than once as an explicit dependence of a library, or
-	      # is implicitly linked in more than once by the
-	      # compiler, it is considered special, and multiple
-	      # occurrences thereof are not removed.  Compare this
-	      # with having the same library being listed as a
-	      # dependency of multiple other libraries: in this case,
-	      # we know (pedantically, we assume) the library does not
-	      # need to be listed more than once, so we keep only the
-	      # last copy.  This is not always right, but it is rare
-	      # enough that we require users that really mean to play
-	      # such unportable linking tricks to link the library
-	      # using -Wl,-lname, so that libtool does not consider it
-	      # for duplicate removal.
-	      case " $specialdeplibs " in
-	      *" $deplib "*) new_libs="$deplib $new_libs" ;;
-	      *)
-		case " $new_libs " in
-		*" $deplib "*) ;;
-		*) new_libs="$deplib $new_libs" ;;
-		esac
-		;;
-	      esac
-	      ;;
-	    esac
-	  done
-	  tmp_libs=
-	  for deplib in $new_libs; do
-	    case $deplib in
-	    -L*)
-	      case " $tmp_libs " in
-	      *" $deplib "*) ;;
-	      *) func_append tmp_libs " $deplib" ;;
-	      esac
-	      ;;
-	    *) func_append tmp_libs " $deplib" ;;
-	    esac
-	  done
-	  eval $var=\"$tmp_libs\"
-	done # for var
-      fi
-
-      # Add Sun CC postdeps if required:
-      test CXX = "$tagname" && {
-        case $host_os in
-        linux*)
-          case `$CC -V 2>&1 | sed 5q` in
-          *Sun\ C*) # Sun C++ 5.9
-            func_suncc_cstd_abi
-
-            if test no != "$suncc_use_cstd_abi"; then
-              func_append postdeps ' -library=Cstd -library=Crun'
-            fi
-            ;;
-          esac
-          ;;
-
-        solaris*)
-          func_cc_basename "$CC"
-          case $func_cc_basename_result in
-          CC* | sunCC*)
-            func_suncc_cstd_abi
-
-            if test no != "$suncc_use_cstd_abi"; then
-              func_append postdeps ' -library=Cstd -library=Crun'
-            fi
-            ;;
-          esac
-          ;;
-        esac
-      }
-
-      # Last step: remove runtime libs from dependency_libs
-      # (they stay in deplibs)
-      tmp_libs=
-      for i in $dependency_libs; do
-	case " $predeps $postdeps $compiler_lib_search_path " in
-	*" $i "*)
-	  i=
-	  ;;
-	esac
-	if test -n "$i"; then
-	  func_append tmp_libs " $i"
-	fi
-      done
-      dependency_libs=$tmp_libs
-    done # for pass
-    if test prog = "$linkmode"; then
-      dlfiles=$newdlfiles
-    fi
-    if test prog = "$linkmode" || test lib = "$linkmode"; then
-      dlprefiles=$newdlprefiles
-    fi
-
-    case $linkmode in
-    oldlib)
-      if test -n "$dlfiles$dlprefiles" || test no != "$dlself"; then
-	func_warning "'-dlopen' is ignored for archives"
-      fi
-
-      case " $deplibs" in
-      *\ -l* | *\ -L*)
-	func_warning "'-l' and '-L' are ignored for archives" ;;
-      esac
-
-      test -n "$rpath" && \
-	func_warning "'-rpath' is ignored for archives"
-
-      test -n "$xrpath" && \
-	func_warning "'-R' is ignored for archives"
-
-      test -n "$vinfo" && \
-	func_warning "'-version-info/-version-number' is ignored for archives"
-
-      test -n "$release" && \
-	func_warning "'-release' is ignored for archives"
-
-      test -n "$export_symbols$export_symbols_regex" && \
-	func_warning "'-export-symbols' is ignored for archives"
-
-      # Now set the variables for building old libraries.
-      build_libtool_libs=no
-      oldlibs=$output
-      func_append objs "$old_deplibs"
-      ;;
-
-    lib)
-      # Make sure we only generate libraries of the form 'libNAME.la'.
-      case $outputname in
-      lib*)
-	func_stripname 'lib' '.la' "$outputname"
-	name=$func_stripname_result
-	eval shared_ext=\"$shrext_cmds\"
-	eval libname=\"$libname_spec\"
-	;;
-      *)
-	test no = "$module" \
-	  && func_fatal_help "libtool library '$output' must begin with 'lib'"
-
-	if test no != "$need_lib_prefix"; then
-	  # Add the "lib" prefix for modules if required
-	  func_stripname '' '.la' "$outputname"
-	  name=$func_stripname_result
-	  eval shared_ext=\"$shrext_cmds\"
-	  eval libname=\"$libname_spec\"
-	else
-	  func_stripname '' '.la' "$outputname"
-	  libname=$func_stripname_result
-	fi
-	;;
-      esac
-
-      if test -n "$objs"; then
-	if test pass_all != "$deplibs_check_method"; then
-	  func_fatal_error "cannot build libtool library '$output' from non-libtool objects on this host:$objs"
-	else
-	  echo
-	  $ECHO "*** Warning: Linking the shared library $output against the non-libtool"
-	  $ECHO "*** objects $objs is not portable!"
-	  func_append libobjs " $objs"
-	fi
-      fi
-
-      test no = "$dlself" \
-	|| func_warning "'-dlopen self' is ignored for libtool libraries"
-
-      set dummy $rpath
-      shift
-      test 1 -lt "$#" \
-	&& func_warning "ignoring multiple '-rpath's for a libtool library"
-
-      install_libdir=$1
-
-      oldlibs=
-      if test -z "$rpath"; then
-	if test yes = "$build_libtool_libs"; then
-	  # Building a libtool convenience library.
-	  # Some compilers have problems with a '.al' extension so
-	  # convenience libraries should have the same extension an
-	  # archive normally would.
-	  oldlibs="$output_objdir/$libname.$libext $oldlibs"
-	  build_libtool_libs=convenience
-	  build_old_libs=yes
-	fi
-
-	test -n "$vinfo" && \
-	  func_warning "'-version-info/-version-number' is ignored for convenience libraries"
-
-	test -n "$release" && \
-	  func_warning "'-release' is ignored for convenience libraries"
-      else
-
-	# Parse the version information argument.
-	save_ifs=$IFS; IFS=:
-	set dummy $vinfo 0 0 0
-	shift
-	IFS=$save_ifs
-
-	test -n "$7" && \
-	  func_fatal_help "too many parameters to '-version-info'"
-
-	# convert absolute version numbers to libtool ages
-	# this retains compatibility with .la files and attempts
-	# to make the code below a bit more comprehensible
-
-	case $vinfo_number in
-	yes)
-	  number_major=$1
-	  number_minor=$2
-	  number_revision=$3
-	  #
-	  # There are really only two kinds -- those that
-	  # use the current revision as the major version
-	  # and those that subtract age and use age as
-	  # a minor version.  But, then there is irix
-	  # that has an extra 1 added just for fun
-	  #
-	  case $version_type in
-	  # correct linux to gnu/linux during the next big refactor
-	  darwin|freebsd-elf|linux|osf|windows|none)
-	    func_arith $number_major + $number_minor
-	    current=$func_arith_result
-	    age=$number_minor
-	    revision=$number_revision
-	    ;;
-	  freebsd-aout|qnx|sunos)
-	    current=$number_major
-	    revision=$number_minor
-	    age=0
-	    ;;
-	  irix|nonstopux)
-	    func_arith $number_major + $number_minor
-	    current=$func_arith_result
-	    age=$number_minor
-	    revision=$number_minor
-	    lt_irix_increment=no
-	    ;;
-	  esac
-	  ;;
-	no)
-	  current=$1
-	  revision=$2
-	  age=$3
-	  ;;
-	esac
-
-	# Check that each of the things are valid numbers.
-	case $current in
-	0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
-	*)
-	  func_error "CURRENT '$current' must be a nonnegative integer"
-	  func_fatal_error "'$vinfo' is not valid version information"
-	  ;;
-	esac
-
-	case $revision in
-	0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
-	*)
-	  func_error "REVISION '$revision' must be a nonnegative integer"
-	  func_fatal_error "'$vinfo' is not valid version information"
-	  ;;
-	esac
-
-	case $age in
-	0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
-	*)
-	  func_error "AGE '$age' must be a nonnegative integer"
-	  func_fatal_error "'$vinfo' is not valid version information"
-	  ;;
-	esac
-
-	if test "$age" -gt "$current"; then
-	  func_error "AGE '$age' is greater than the current interface number '$current'"
-	  func_fatal_error "'$vinfo' is not valid version information"
-	fi
-
-	# Calculate the version variables.
-	major=
-	versuffix=
-	verstring=
-	case $version_type in
-	none) ;;
-
-	darwin)
-	  # Like Linux, but with the current version available in
-	  # verstring for coding it into the library header
-	  func_arith $current - $age
-	  major=.$func_arith_result
-	  versuffix=$major.$age.$revision
-	  # Darwin ld doesn't like 0 for these options...
-	  func_arith $current + 1
-	  minor_current=$func_arith_result
-	  xlcverstring="$wl-compatibility_version $wl$minor_current $wl-current_version $wl$minor_current.$revision"
-	  verstring="-compatibility_version $minor_current -current_version $minor_current.$revision"
-          # On Darwin other compilers
-          case $CC in
-              nagfor*)
-                  verstring="$wl-compatibility_version $wl$minor_current $wl-current_version $wl$minor_current.$revision"
-                  ;;
-              *)
-                  verstring="-compatibility_version $minor_current -current_version $minor_current.$revision"
-                  ;;
-          esac
-	  ;;
-
-	freebsd-aout)
-	  major=.$current
-	  versuffix=.$current.$revision
-	  ;;
-
-	freebsd-elf)
-	  func_arith $current - $age
-	  major=.$func_arith_result
-	  versuffix=$major.$age.$revision
-	  ;;
-
-	irix | nonstopux)
-	  if test no = "$lt_irix_increment"; then
-	    func_arith $current - $age
-	  else
-	    func_arith $current - $age + 1
-	  fi
-	  major=$func_arith_result
-
-	  case $version_type in
-	    nonstopux) verstring_prefix=nonstopux ;;
-	    *)         verstring_prefix=sgi ;;
-	  esac
-	  verstring=$verstring_prefix$major.$revision
-
-	  # Add in all the interfaces that we are compatible with.
-	  loop=$revision
-	  while test 0 -ne "$loop"; do
-	    func_arith $revision - $loop
-	    iface=$func_arith_result
-	    func_arith $loop - 1
-	    loop=$func_arith_result
-	    verstring=$verstring_prefix$major.$iface:$verstring
-	  done
-
-	  # Before this point, $major must not contain '.'.
-	  major=.$major
-	  versuffix=$major.$revision
-	  ;;
-
-	linux) # correct to gnu/linux during the next big refactor
-	  func_arith $current - $age
-	  major=.$func_arith_result
-	  versuffix=$major.$age.$revision
-	  ;;
-
-	osf)
-	  func_arith $current - $age
-	  major=.$func_arith_result
-	  versuffix=.$current.$age.$revision
-	  verstring=$current.$age.$revision
-
-	  # Add in all the interfaces that we are compatible with.
-	  loop=$age
-	  while test 0 -ne "$loop"; do
-	    func_arith $current - $loop
-	    iface=$func_arith_result
-	    func_arith $loop - 1
-	    loop=$func_arith_result
-	    verstring=$verstring:$iface.0
-	  done
-
-	  # Make executables depend on our current version.
-	  func_append verstring ":$current.0"
-	  ;;
-
-	qnx)
-	  major=.$current
-	  versuffix=.$current
-	  ;;
-
-	sco)
-	  major=.$current
-	  versuffix=.$current
-	  ;;
-
-	sunos)
-	  major=.$current
-	  versuffix=.$current.$revision
-	  ;;
-
-	windows)
-	  # Use '-' rather than '.', since we only want one
-	  # extension on DOS 8.3 file systems.
-	  func_arith $current - $age
-	  major=$func_arith_result
-	  versuffix=-$major
-	  ;;
-
-	*)
-	  func_fatal_configuration "unknown library version type '$version_type'"
-	  ;;
-	esac
-
-	# Clear the version info if we defaulted, and they specified a release.
-	if test -z "$vinfo" && test -n "$release"; then
-	  major=
-	  case $version_type in
-	  darwin)
-	    # we can't check for "0.0" in archive_cmds due to quoting
-	    # problems, so we reset it completely
-	    verstring=
-	    ;;
-	  *)
-	    verstring=0.0
-	    ;;
-	  esac
-	  if test no = "$need_version"; then
-	    versuffix=
-	  else
-	    versuffix=.0.0
-	  fi
-	fi
-
-	# Remove version info from name if versioning should be avoided
-	if test yes,no = "$avoid_version,$need_version"; then
-	  major=
-	  versuffix=
-	  verstring=
-	fi
-
-	# Check to see if the archive will have undefined symbols.
-	if test yes = "$allow_undefined"; then
-	  if test unsupported = "$allow_undefined_flag"; then
-	    if test yes = "$build_old_libs"; then
-	      func_warning "undefined symbols not allowed in $host shared libraries; building static only"
-	      build_libtool_libs=no
-	    else
-	      func_fatal_error "can't build $host shared library unless -no-undefined is specified"
-	    fi
-	  fi
-	else
-	  # Don't allow undefined symbols.
-	  allow_undefined_flag=$no_undefined_flag
-	fi
-
-      fi
-
-      func_generate_dlsyms "$libname" "$libname" :
-      func_append libobjs " $symfileobj"
-      test " " = "$libobjs" && libobjs=
-
-      if test relink != "$opt_mode"; then
-	# Remove our outputs, but don't remove object files since they
-	# may have been created when compiling PIC objects.
-	removelist=
-	tempremovelist=`$ECHO "$output_objdir/*"`
-	for p in $tempremovelist; do
-	  case $p in
-	    *.$objext | *.gcno)
-	       ;;
-	    $output_objdir/$outputname | $output_objdir/$libname.* | $output_objdir/$libname$release.*)
-	       if test -n "$precious_files_regex"; then
-		 if $ECHO "$p" | $EGREP -e "$precious_files_regex" >/dev/null 2>&1
-		 then
-		   continue
-		 fi
-	       fi
-	       func_append removelist " $p"
-	       ;;
-	    *) ;;
-	  esac
-	done
-	test -n "$removelist" && \
-	  func_show_eval "${RM}r \$removelist"
-      fi
-
-      # Now set the variables for building old libraries.
-      if test yes = "$build_old_libs" && test convenience != "$build_libtool_libs"; then
-	func_append oldlibs " $output_objdir/$libname.$libext"
-
-	# Transform .lo files to .o files.
-	oldobjs="$objs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.$libext$/d; $lo2o" | $NL2SP`
-      fi
-
-      # Eliminate all temporary directories.
-      #for path in $notinst_path; do
-      #	lib_search_path=`$ECHO "$lib_search_path " | $SED "s% $path % %g"`
-      #	deplibs=`$ECHO "$deplibs " | $SED "s% -L$path % %g"`
-      #	dependency_libs=`$ECHO "$dependency_libs " | $SED "s% -L$path % %g"`
-      #done
-
-      if test -n "$xrpath"; then
-	# If the user specified any rpath flags, then add them.
-	temp_xrpath=
-	for libdir in $xrpath; do
-	  func_replace_sysroot "$libdir"
-	  func_append temp_xrpath " -R$func_replace_sysroot_result"
-	  case "$finalize_rpath " in
-	  *" $libdir "*) ;;
-	  *) func_append finalize_rpath " $libdir" ;;
-	  esac
-	done
-	if test yes != "$hardcode_into_libs" || test yes = "$build_old_libs"; then
-	  dependency_libs="$temp_xrpath $dependency_libs"
-	fi
-      fi
-
-      # Make sure dlfiles contains only unique files that won't be dlpreopened
-      old_dlfiles=$dlfiles
-      dlfiles=
-      for lib in $old_dlfiles; do
-	case " $dlprefiles $dlfiles " in
-	*" $lib "*) ;;
-	*) func_append dlfiles " $lib" ;;
-	esac
-      done
-
-      # Make sure dlprefiles contains only unique files
-      old_dlprefiles=$dlprefiles
-      dlprefiles=
-      for lib in $old_dlprefiles; do
-	case "$dlprefiles " in
-	*" $lib "*) ;;
-	*) func_append dlprefiles " $lib" ;;
-	esac
-      done
-
-      if test yes = "$build_libtool_libs"; then
-	if test -n "$rpath"; then
-	  case $host in
-	  *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos* | *-cegcc* | *-*-haiku*)
-	    # these systems don't actually have a c library (as such)!
-	    ;;
-	  *-*-rhapsody* | *-*-darwin1.[012])
-	    # Rhapsody C library is in the System framework
-	    func_append deplibs " System.ltframework"
-	    ;;
-	  *-*-netbsd*)
-	    # Don't link with libc until the a.out ld.so is fixed.
-	    ;;
-	  *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
-	    # Do not include libc due to us having libc/libc_r.
-	    ;;
-	  *-*-sco3.2v5* | *-*-sco5v6*)
-	    # Causes problems with __ctype
-	    ;;
-	  *-*-sysv4.2uw2* | *-*-sysv5* | *-*-unixware* | *-*-OpenUNIX*)
-	    # Compiler inserts libc in the correct place for threads to work
-	    ;;
-	  *)
-	    # Add libc to deplibs on all other systems if necessary.
-	    if test yes = "$build_libtool_need_lc"; then
-	      func_append deplibs " -lc"
-	    fi
-	    ;;
-	  esac
-	fi
-
-	# Transform deplibs into only deplibs that can be linked in shared.
-	name_save=$name
-	libname_save=$libname
-	release_save=$release
-	versuffix_save=$versuffix
-	major_save=$major
-	# I'm not sure if I'm treating the release correctly.  I think
-	# release should show up in the -l (ie -lgmp5) so we don't want to
-	# add it in twice.  Is that correct?
-	release=
-	versuffix=
-	major=
-	newdeplibs=
-	droppeddeps=no
-	case $deplibs_check_method in
-	pass_all)
-	  # Don't check for shared/static.  Everything works.
-	  # This might be a little naive.  We might want to check
-	  # whether the library exists or not.  But this is on
-	  # osf3 & osf4 and I'm not really sure... Just
-	  # implementing what was already the behavior.
-	  newdeplibs=$deplibs
-	  ;;
-	test_compile)
-	  # This code stresses the "libraries are programs" paradigm to its
-	  # limits. Maybe even breaks it.  We compile a program, linking it
-	  # against the deplibs as a proxy for the library.  Then we can check
-	  # whether they linked in statically or dynamically with ldd.
-	  $opt_dry_run || $RM conftest.c
-	  cat > conftest.c <<EOF
-	  int main() { return 0; }
-EOF
-	  $opt_dry_run || $RM conftest
-	  if $LTCC $LTCFLAGS -o conftest conftest.c $deplibs; then
-	    ldd_output=`ldd conftest`
-	    for i in $deplibs; do
-	      case $i in
-	      -l*)
-		func_stripname -l '' "$i"
-		name=$func_stripname_result
-		if test yes = "$allow_libtool_libs_with_static_runtimes"; then
-		  case " $predeps $postdeps " in
-		  *" $i "*)
-		    func_append newdeplibs " $i"
-		    i=
-		    ;;
-		  esac
-		fi
-		if test -n "$i"; then
-		  libname=`eval "\\$ECHO \"$libname_spec\""`
-		  deplib_matches=`eval "\\$ECHO \"$library_names_spec\""`
-		  set dummy $deplib_matches; shift
-		  deplib_match=$1
-		  if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0; then
-		    func_append newdeplibs " $i"
-		  else
-		    droppeddeps=yes
-		    echo
-		    $ECHO "*** Warning: dynamic linker does not accept needed library $i."
-		    echo "*** I have the capability to make that library automatically link in when"
-		    echo "*** you link to this library.  But I can only do this if you have a"
-		    echo "*** shared version of the library, which I believe you do not have"
-		    echo "*** because a test_compile did reveal that the linker did not use it for"
-		    echo "*** its dynamic dependency list that programs get resolved with at runtime."
-		  fi
-		fi
-		;;
-	      *)
-		func_append newdeplibs " $i"
-		;;
-	      esac
-	    done
-	  else
-	    # Error occurred in the first compile.  Let's try to salvage
-	    # the situation: Compile a separate program for each library.
-	    for i in $deplibs; do
-	      case $i in
-	      -l*)
-		func_stripname -l '' "$i"
-		name=$func_stripname_result
-		$opt_dry_run || $RM conftest
-		if $LTCC $LTCFLAGS -o conftest conftest.c $i; then
-		  ldd_output=`ldd conftest`
-		  if test yes = "$allow_libtool_libs_with_static_runtimes"; then
-		    case " $predeps $postdeps " in
-		    *" $i "*)
-		      func_append newdeplibs " $i"
-		      i=
-		      ;;
-		    esac
-		  fi
-		  if test -n "$i"; then
-		    libname=`eval "\\$ECHO \"$libname_spec\""`
-		    deplib_matches=`eval "\\$ECHO \"$library_names_spec\""`
-		    set dummy $deplib_matches; shift
-		    deplib_match=$1
-		    if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0; then
-		      func_append newdeplibs " $i"
-		    else
-		      droppeddeps=yes
-		      echo
-		      $ECHO "*** Warning: dynamic linker does not accept needed library $i."
-		      echo "*** I have the capability to make that library automatically link in when"
-		      echo "*** you link to this library.  But I can only do this if you have a"
-		      echo "*** shared version of the library, which you do not appear to have"
-		      echo "*** because a test_compile did reveal that the linker did not use this one"
-		      echo "*** as a dynamic dependency that programs can get resolved with at runtime."
-		    fi
-		  fi
-		else
-		  droppeddeps=yes
-		  echo
-		  $ECHO "*** Warning!  Library $i is needed by this library but I was not able to"
-		  echo "*** make it link in!  You will probably need to install it or some"
-		  echo "*** library that it depends on before this library will be fully"
-		  echo "*** functional.  Installing it before continuing would be even better."
-		fi
-		;;
-	      *)
-		func_append newdeplibs " $i"
-		;;
-	      esac
-	    done
-	  fi
-	  ;;
-	file_magic*)
-	  set dummy $deplibs_check_method; shift
-	  file_magic_regex=`expr "$deplibs_check_method" : "$1 \(.*\)"`
-	  for a_deplib in $deplibs; do
-	    case $a_deplib in
-	    -l*)
-	      func_stripname -l '' "$a_deplib"
-	      name=$func_stripname_result
-	      if test yes = "$allow_libtool_libs_with_static_runtimes"; then
-		case " $predeps $postdeps " in
-		*" $a_deplib "*)
-		  func_append newdeplibs " $a_deplib"
-		  a_deplib=
-		  ;;
-		esac
-	      fi
-	      if test -n "$a_deplib"; then
-		libname=`eval "\\$ECHO \"$libname_spec\""`
-		if test -n "$file_magic_glob"; then
-		  libnameglob=`func_echo_all "$libname" | $SED -e $file_magic_glob`
-		else
-		  libnameglob=$libname
-		fi
-		test yes = "$want_nocaseglob" && nocaseglob=`shopt -p nocaseglob`
-		for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do
-		  if test yes = "$want_nocaseglob"; then
-		    shopt -s nocaseglob
-		    potential_libs=`ls $i/$libnameglob[.-]* 2>/dev/null`
-		    $nocaseglob
-		  else
-		    potential_libs=`ls $i/$libnameglob[.-]* 2>/dev/null`
-		  fi
-		  for potent_lib in $potential_libs; do
-		      # Follow soft links.
-		      if ls -lLd "$potent_lib" 2>/dev/null |
-			 $GREP " -> " >/dev/null; then
-			continue
-		      fi
-		      # The statement above tries to avoid entering an
-		      # endless loop below, in case of cyclic links.
-		      # We might still enter an endless loop, since a link
-		      # loop can be closed while we follow links,
-		      # but so what?
-		      potlib=$potent_lib
-		      while test -h "$potlib" 2>/dev/null; do
-			potliblink=`ls -ld $potlib | $SED 's/.* -> //'`
-			case $potliblink in
-			[\\/]* | [A-Za-z]:[\\/]*) potlib=$potliblink;;
-			*) potlib=`$ECHO "$potlib" | $SED 's|[^/]*$||'`"$potliblink";;
-			esac
-		      done
-		      if eval $file_magic_cmd \"\$potlib\" 2>/dev/null |
-			 $SED -e 10q |
-			 $EGREP "$file_magic_regex" > /dev/null; then
-			func_append newdeplibs " $a_deplib"
-			a_deplib=
-			break 2
-		      fi
-		  done
-		done
-	      fi
-	      if test -n "$a_deplib"; then
-		droppeddeps=yes
-		echo
-		$ECHO "*** Warning: linker path does not have real file for library $a_deplib."
-		echo "*** I have the capability to make that library automatically link in when"
-		echo "*** you link to this library.  But I can only do this if you have a"
-		echo "*** shared version of the library, which you do not appear to have"
-		echo "*** because I did check the linker path looking for a file starting"
-		if test -z "$potlib"; then
-		  $ECHO "*** with $libname but no candidates were found. (...for file magic test)"
-		else
-		  $ECHO "*** with $libname and none of the candidates passed a file format test"
-		  $ECHO "*** using a file magic. Last file checked: $potlib"
-		fi
-	      fi
-	      ;;
-	    *)
-	      # Add a -L argument.
-	      func_append newdeplibs " $a_deplib"
-	      ;;
-	    esac
-	  done # Gone through all deplibs.
-	  ;;
-	match_pattern*)
-	  set dummy $deplibs_check_method; shift
-	  match_pattern_regex=`expr "$deplibs_check_method" : "$1 \(.*\)"`
-	  for a_deplib in $deplibs; do
-	    case $a_deplib in
-	    -l*)
-	      func_stripname -l '' "$a_deplib"
-	      name=$func_stripname_result
-	      if test yes = "$allow_libtool_libs_with_static_runtimes"; then
-		case " $predeps $postdeps " in
-		*" $a_deplib "*)
-		  func_append newdeplibs " $a_deplib"
-		  a_deplib=
-		  ;;
-		esac
-	      fi
-	      if test -n "$a_deplib"; then
-		libname=`eval "\\$ECHO \"$libname_spec\""`
-		for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do
-		  potential_libs=`ls $i/$libname[.-]* 2>/dev/null`
-		  for potent_lib in $potential_libs; do
-		    potlib=$potent_lib # see symlink-check above in file_magic test
-		    if eval "\$ECHO \"$potent_lib\"" 2>/dev/null | $SED 10q | \
-		       $EGREP "$match_pattern_regex" > /dev/null; then
-		      func_append newdeplibs " $a_deplib"
-		      a_deplib=
-		      break 2
-		    fi
-		  done
-		done
-	      fi
-	      if test -n "$a_deplib"; then
-		droppeddeps=yes
-		echo
-		$ECHO "*** Warning: linker path does not have real file for library $a_deplib."
-		echo "*** I have the capability to make that library automatically link in when"
-		echo "*** you link to this library.  But I can only do this if you have a"
-		echo "*** shared version of the library, which you do not appear to have"
-		echo "*** because I did check the linker path looking for a file starting"
-		if test -z "$potlib"; then
-		  $ECHO "*** with $libname but no candidates were found. (...for regex pattern test)"
-		else
-		  $ECHO "*** with $libname and none of the candidates passed a file format test"
-		  $ECHO "*** using a regex pattern. Last file checked: $potlib"
-		fi
-	      fi
-	      ;;
-	    *)
-	      # Add a -L argument.
-	      func_append newdeplibs " $a_deplib"
-	      ;;
-	    esac
-	  done # Gone through all deplibs.
-	  ;;
-	none | unknown | *)
-	  newdeplibs=
-	  tmp_deplibs=`$ECHO " $deplibs" | $SED 's/ -lc$//; s/ -[LR][^ ]*//g'`
-	  if test yes = "$allow_libtool_libs_with_static_runtimes"; then
-	    for i in $predeps $postdeps; do
-	      # can't use Xsed below, because $i might contain '/'
-	      tmp_deplibs=`$ECHO " $tmp_deplibs" | $SED "s|$i||"`
-	    done
-	  fi
-	  case $tmp_deplibs in
-	  *[!\	\ ]*)
-	    echo
-	    if test none = "$deplibs_check_method"; then
-	      echo "*** Warning: inter-library dependencies are not supported in this platform."
-	    else
-	      echo "*** Warning: inter-library dependencies are not known to be supported."
-	    fi
-	    echo "*** All declared inter-library dependencies are being dropped."
-	    droppeddeps=yes
-	    ;;
-	  esac
-	  ;;
-	esac
-	versuffix=$versuffix_save
-	major=$major_save
-	release=$release_save
-	libname=$libname_save
-	name=$name_save
-
-	case $host in
-	*-*-rhapsody* | *-*-darwin1.[012])
-	  # On Rhapsody replace the C library with the System framework
-	  newdeplibs=`$ECHO " $newdeplibs" | $SED 's/ -lc / System.ltframework /'`
-	  ;;
-	esac
-
-	if test yes = "$droppeddeps"; then
-	  if test yes = "$module"; then
-	    echo
-	    echo "*** Warning: libtool could not satisfy all declared inter-library"
-	    $ECHO "*** dependencies of module $libname.  Therefore, libtool will create"
-	    echo "*** a static module, that should work as long as the dlopening"
-	    echo "*** application is linked with the -dlopen flag."
-	    if test -z "$global_symbol_pipe"; then
-	      echo
-	      echo "*** However, this would only work if libtool was able to extract symbol"
-	      echo "*** lists from a program, using 'nm' or equivalent, but libtool could"
-	      echo "*** not find such a program.  So, this module is probably useless."
-	      echo "*** 'nm' from GNU binutils and a full rebuild may help."
-	    fi
-	    if test no = "$build_old_libs"; then
-	      oldlibs=$output_objdir/$libname.$libext
-	      build_libtool_libs=module
-	      build_old_libs=yes
-	    else
-	      build_libtool_libs=no
-	    fi
-	  else
-	    echo "*** The inter-library dependencies that have been dropped here will be"
-	    echo "*** automatically added whenever a program is linked with this library"
-	    echo "*** or is declared to -dlopen it."
-
-	    if test no = "$allow_undefined"; then
-	      echo
-	      echo "*** Since this library must not contain undefined symbols,"
-	      echo "*** because either the platform does not support them or"
-	      echo "*** it was explicitly requested with -no-undefined,"
-	      echo "*** libtool will only create a static version of it."
-	      if test no = "$build_old_libs"; then
-		oldlibs=$output_objdir/$libname.$libext
-		build_libtool_libs=module
-		build_old_libs=yes
-	      else
-		build_libtool_libs=no
-	      fi
-	    fi
-	  fi
-	fi
-	# Done checking deplibs!
-	deplibs=$newdeplibs
-      fi
-      # Time to change all our "foo.ltframework" stuff back to "-framework foo"
-      case $host in
-	*-*-darwin*)
-	  newdeplibs=`$ECHO " $newdeplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
-	  new_inherited_linker_flags=`$ECHO " $new_inherited_linker_flags" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
-	  deplibs=`$ECHO " $deplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
-	  ;;
-      esac
-
-      # move library search paths that coincide with paths to not yet
-      # installed libraries to the beginning of the library search list
-      new_libs=
-      for path in $notinst_path; do
-	case " $new_libs " in
-	*" -L$path/$objdir "*) ;;
-	*)
-	  case " $deplibs " in
-	  *" -L$path/$objdir "*)
-	    func_append new_libs " -L$path/$objdir" ;;
-	  esac
-	  ;;
-	esac
-      done
-      for deplib in $deplibs; do
-	case $deplib in
-	-L*)
-	  case " $new_libs " in
-	  *" $deplib "*) ;;
-	  *) func_append new_libs " $deplib" ;;
-	  esac
-	  ;;
-	*) func_append new_libs " $deplib" ;;
-	esac
-      done
-      deplibs=$new_libs
-
-      # All the library-specific variables (install_libdir is set above).
-      library_names=
-      old_library=
-      dlname=
-
-      # Test again, we may have decided not to build it any more
-      if test yes = "$build_libtool_libs"; then
-	# Remove $wl instances when linking with ld.
-	# FIXME: should test the right _cmds variable.
-	case $archive_cmds in
-	  *\$LD\ *) wl= ;;
-        esac
-	if test yes = "$hardcode_into_libs"; then
-	  # Hardcode the library paths
-	  hardcode_libdirs=
-	  dep_rpath=
-	  rpath=$finalize_rpath
-	  test relink = "$opt_mode" || rpath=$compile_rpath$rpath
-	  for libdir in $rpath; do
-	    if test -n "$hardcode_libdir_flag_spec"; then
-	      if test -n "$hardcode_libdir_separator"; then
-		func_replace_sysroot "$libdir"
-		libdir=$func_replace_sysroot_result
-		if test -z "$hardcode_libdirs"; then
-		  hardcode_libdirs=$libdir
-		else
-		  # Just accumulate the unique libdirs.
-		  case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in
-		  *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
-		    ;;
-		  *)
-		    func_append hardcode_libdirs "$hardcode_libdir_separator$libdir"
-		    ;;
-		  esac
-		fi
-	      else
-		eval flag=\"$hardcode_libdir_flag_spec\"
-		func_append dep_rpath " $flag"
-	      fi
-	    elif test -n "$runpath_var"; then
-	      case "$perm_rpath " in
-	      *" $libdir "*) ;;
-	      *) func_append perm_rpath " $libdir" ;;
-	      esac
-	    fi
-	  done
-	  # Substitute the hardcoded libdirs into the rpath.
-	  if test -n "$hardcode_libdir_separator" &&
-	     test -n "$hardcode_libdirs"; then
-	    libdir=$hardcode_libdirs
-	    eval "dep_rpath=\"$hardcode_libdir_flag_spec\""
-	  fi
-	  if test -n "$runpath_var" && test -n "$perm_rpath"; then
-	    # We should set the runpath_var.
-	    rpath=
-	    for dir in $perm_rpath; do
-	      func_append rpath "$dir:"
-	    done
-	    eval "$runpath_var='$rpath\$$runpath_var'; export $runpath_var"
-	  fi
-	  test -n "$dep_rpath" && deplibs="$dep_rpath $deplibs"
-	fi
-
-	shlibpath=$finalize_shlibpath
-	test relink = "$opt_mode" || shlibpath=$compile_shlibpath$shlibpath
-	if test -n "$shlibpath"; then
-	  eval "$shlibpath_var='$shlibpath\$$shlibpath_var'; export $shlibpath_var"
-	fi
-
-	# Get the real and link names of the library.
-	eval shared_ext=\"$shrext_cmds\"
-	eval library_names=\"$library_names_spec\"
-	set dummy $library_names
-	shift
-	realname=$1
-	shift
-
-	if test -n "$soname_spec"; then
-	  eval soname=\"$soname_spec\"
-	else
-	  soname=$realname
-	fi
-	if test -z "$dlname"; then
-	  dlname=$soname
-	fi
-
-	lib=$output_objdir/$realname
-	linknames=
-	for link
-	do
-	  func_append linknames " $link"
-	done
-
-	# Use standard objects if they are pic
-	test -z "$pic_flag" && libobjs=`$ECHO "$libobjs" | $SP2NL | $SED "$lo2o" | $NL2SP`
-	test "X$libobjs" = "X " && libobjs=
-
-	delfiles=
-	if test -n "$export_symbols" && test -n "$include_expsyms"; then
-	  $opt_dry_run || cp "$export_symbols" "$output_objdir/$libname.uexp"
-	  export_symbols=$output_objdir/$libname.uexp
-	  func_append delfiles " $export_symbols"
-	fi
-
-	orig_export_symbols=
-	case $host_os in
-	cygwin* | mingw* | cegcc*)
-	  if test -n "$export_symbols" && test -z "$export_symbols_regex"; then
-	    # exporting using user supplied symfile
-	    func_dll_def_p "$export_symbols" || {
-	      # and it's NOT already a .def file. Must figure out
-	      # which of the given symbols are data symbols and tag
-	      # them as such. So, trigger use of export_symbols_cmds.
-	      # export_symbols gets reassigned inside the "prepare
-	      # the list of exported symbols" if statement, so the
-	      # include_expsyms logic still works.
-	      orig_export_symbols=$export_symbols
-	      export_symbols=
-	      always_export_symbols=yes
-	    }
-	  fi
-	  ;;
-	esac
-
-	# Prepare the list of exported symbols
-	if test -z "$export_symbols"; then
-	  if test yes = "$always_export_symbols" || test -n "$export_symbols_regex"; then
-	    func_verbose "generating symbol list for '$libname.la'"
-	    export_symbols=$output_objdir/$libname.exp
-	    $opt_dry_run || $RM $export_symbols
-	    cmds=$export_symbols_cmds
-	    save_ifs=$IFS; IFS='~'
-	    for cmd1 in $cmds; do
-	      IFS=$save_ifs
-	      # Take the normal branch if the nm_file_list_spec branch
-	      # doesn't work or if tool conversion is not needed.
-	      case $nm_file_list_spec~$to_tool_file_cmd in
-		*~func_convert_file_noop | *~func_convert_file_msys_to_w32 | ~*)
-		  try_normal_branch=yes
-		  eval cmd=\"$cmd1\"
-		  func_len " $cmd"
-		  len=$func_len_result
-		  ;;
-		*)
-		  try_normal_branch=no
-		  ;;
-	      esac
-	      if test yes = "$try_normal_branch" \
-		 && { test "$len" -lt "$max_cmd_len" \
-		      || test "$max_cmd_len" -le -1; }
-	      then
-		func_show_eval "$cmd" 'exit $?'
-		skipped_export=false
-	      elif test -n "$nm_file_list_spec"; then
-		func_basename "$output"
-		output_la=$func_basename_result
-		save_libobjs=$libobjs
-		save_output=$output
-		output=$output_objdir/$output_la.nm
-		func_to_tool_file "$output"
-		libobjs=$nm_file_list_spec$func_to_tool_file_result
-		func_append delfiles " $output"
-		func_verbose "creating $NM input file list: $output"
-		for obj in $save_libobjs; do
-		  func_to_tool_file "$obj"
-		  $ECHO "$func_to_tool_file_result"
-		done > "$output"
-		eval cmd=\"$cmd1\"
-		func_show_eval "$cmd" 'exit $?'
-		output=$save_output
-		libobjs=$save_libobjs
-		skipped_export=false
-	      else
-		# The command line is too long to execute in one step.
-		func_verbose "using reloadable object file for export list..."
-		skipped_export=:
-		# Break out early, otherwise skipped_export may be
-		# set to false by a later but shorter cmd.
-		break
-	      fi
-	    done
-	    IFS=$save_ifs
-	    if test -n "$export_symbols_regex" && test : != "$skipped_export"; then
-	      func_show_eval '$EGREP -e "$export_symbols_regex" "$export_symbols" > "${export_symbols}T"'
-	      func_show_eval '$MV "${export_symbols}T" "$export_symbols"'
-	    fi
-	  fi
-	fi
-
-	if test -n "$export_symbols" && test -n "$include_expsyms"; then
-	  tmp_export_symbols=$export_symbols
-	  test -n "$orig_export_symbols" && tmp_export_symbols=$orig_export_symbols
-	  $opt_dry_run || eval '$ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"'
-	fi
-
-	if test : != "$skipped_export" && test -n "$orig_export_symbols"; then
-	  # The given exports_symbols file has to be filtered, so filter it.
-	  func_verbose "filter symbol list for '$libname.la' to tag DATA exports"
-	  # FIXME: $output_objdir/$libname.filter potentially contains lots of
-	  # 's' commands, which not all seds can handle. GNU sed should be fine
-	  # though. Also, the filter scales superlinearly with the number of
-	  # global variables. join(1) would be nice here, but unfortunately
-	  # isn't a blessed tool.
-	  $opt_dry_run || $SED -e '/[ ,]DATA/!d;s,\(.*\)\([ \,].*\),s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter
-	  func_append delfiles " $export_symbols $output_objdir/$libname.filter"
-	  export_symbols=$output_objdir/$libname.def
-	  $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols
-	fi
-
-	tmp_deplibs=
-	for test_deplib in $deplibs; do
-	  case " $convenience " in
-	  *" $test_deplib "*) ;;
-	  *)
-	    func_append tmp_deplibs " $test_deplib"
-	    ;;
-	  esac
-	done
-	deplibs=$tmp_deplibs
-
-	if test -n "$convenience"; then
-	  if test -n "$whole_archive_flag_spec" &&
-	    test yes = "$compiler_needs_object" &&
-	    test -z "$libobjs"; then
-	    # extract the archives, so we have objects to list.
-	    # TODO: could optimize this to just extract one archive.
-	    whole_archive_flag_spec=
-	  fi
-	  if test -n "$whole_archive_flag_spec"; then
-	    save_libobjs=$libobjs
-	    eval libobjs=\"\$libobjs $whole_archive_flag_spec\"
-	    test "X$libobjs" = "X " && libobjs=
-	  else
-	    gentop=$output_objdir/${outputname}x
-	    func_append generated " $gentop"
-
-	    func_extract_archives $gentop $convenience
-	    func_append libobjs " $func_extract_archives_result"
-	    test "X$libobjs" = "X " && libobjs=
-	  fi
-	fi
-
-	if test yes = "$thread_safe" && test -n "$thread_safe_flag_spec"; then
-	  eval flag=\"$thread_safe_flag_spec\"
-	  func_append linker_flags " $flag"
-	fi
-
-	# Make a backup of the uninstalled library when relinking
-	if test relink = "$opt_mode"; then
-	  $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}U && $MV $realname ${realname}U)' || exit $?
-	fi
-
-	# Do each of the archive commands.
-	if test yes = "$module" && test -n "$module_cmds"; then
-	  if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then
-	    eval test_cmds=\"$module_expsym_cmds\"
-	    cmds=$module_expsym_cmds
-	  else
-	    eval test_cmds=\"$module_cmds\"
-	    cmds=$module_cmds
-	  fi
-	else
-	  if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then
-	    eval test_cmds=\"$archive_expsym_cmds\"
-	    cmds=$archive_expsym_cmds
-	  else
-	    eval test_cmds=\"$archive_cmds\"
-	    cmds=$archive_cmds
-	  fi
-	fi
-
-	if test : != "$skipped_export" &&
-	   func_len " $test_cmds" &&
-	   len=$func_len_result &&
-	   test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then
-	  :
-	else
-	  # The command line is too long to link in one step, link piecewise
-	  # or, if using GNU ld and skipped_export is not :, use a linker
-	  # script.
-
-	  # Save the value of $output and $libobjs because we want to
-	  # use them later.  If we have whole_archive_flag_spec, we
-	  # want to use save_libobjs as it was before
-	  # whole_archive_flag_spec was expanded, because we can't
-	  # assume the linker understands whole_archive_flag_spec.
-	  # This may have to be revisited, in case too many
-	  # convenience libraries get linked in and end up exceeding
-	  # the spec.
-	  if test -z "$convenience" || test -z "$whole_archive_flag_spec"; then
-	    save_libobjs=$libobjs
-	  fi
-	  save_output=$output
-	  func_basename "$output"
-	  output_la=$func_basename_result
-
-	  # Clear the reloadable object creation command queue and
-	  # initialize k to one.
-	  test_cmds=
-	  concat_cmds=
-	  objlist=
-	  last_robj=
-	  k=1
-
-	  if test -n "$save_libobjs" && test : != "$skipped_export" && test yes = "$with_gnu_ld"; then
-	    output=$output_objdir/$output_la.lnkscript
-	    func_verbose "creating GNU ld script: $output"
-	    echo 'INPUT (' > $output
-	    for obj in $save_libobjs
-	    do
-	      func_to_tool_file "$obj"
-	      $ECHO "$func_to_tool_file_result" >> $output
-	    done
-	    echo ')' >> $output
-	    func_append delfiles " $output"
-	    func_to_tool_file "$output"
-	    output=$func_to_tool_file_result
-	  elif test -n "$save_libobjs" && test : != "$skipped_export" && test -n "$file_list_spec"; then
-	    output=$output_objdir/$output_la.lnk
-	    func_verbose "creating linker input file list: $output"
-	    : > $output
-	    set x $save_libobjs
-	    shift
-	    firstobj=
-	    if test yes = "$compiler_needs_object"; then
-	      firstobj="$1 "
-	      shift
-	    fi
-	    for obj
-	    do
-	      func_to_tool_file "$obj"
-	      $ECHO "$func_to_tool_file_result" >> $output
-	    done
-	    func_append delfiles " $output"
-	    func_to_tool_file "$output"
-	    output=$firstobj\"$file_list_spec$func_to_tool_file_result\"
-	  else
-	    if test -n "$save_libobjs"; then
-	      func_verbose "creating reloadable object files..."
-	      output=$output_objdir/$output_la-$k.$objext
-	      eval test_cmds=\"$reload_cmds\"
-	      func_len " $test_cmds"
-	      len0=$func_len_result
-	      len=$len0
-
-	      # Loop over the list of objects to be linked.
-	      for obj in $save_libobjs
-	      do
-		func_len " $obj"
-		func_arith $len + $func_len_result
-		len=$func_arith_result
-		if test -z "$objlist" ||
-		   test "$len" -lt "$max_cmd_len"; then
-		  func_append objlist " $obj"
-		else
-		  # The command $test_cmds is almost too long, add a
-		  # command to the queue.
-		  if test 1 -eq "$k"; then
-		    # The first file doesn't have a previous command to add.
-		    reload_objs=$objlist
-		    eval concat_cmds=\"$reload_cmds\"
-		  else
-		    # All subsequent reloadable object files will link in
-		    # the last one created.
-		    reload_objs="$objlist $last_robj"
-		    eval concat_cmds=\"\$concat_cmds~$reload_cmds~\$RM $last_robj\"
-		  fi
-		  last_robj=$output_objdir/$output_la-$k.$objext
-		  func_arith $k + 1
-		  k=$func_arith_result
-		  output=$output_objdir/$output_la-$k.$objext
-		  objlist=" $obj"
-		  func_len " $last_robj"
-		  func_arith $len0 + $func_len_result
-		  len=$func_arith_result
-		fi
-	      done
-	      # Handle the remaining objects by creating one last
-	      # reloadable object file.  All subsequent reloadable object
-	      # files will link in the last one created.
-	      test -z "$concat_cmds" || concat_cmds=$concat_cmds~
-	      reload_objs="$objlist $last_robj"
-	      eval concat_cmds=\"\$concat_cmds$reload_cmds\"
-	      if test -n "$last_robj"; then
-	        eval concat_cmds=\"\$concat_cmds~\$RM $last_robj\"
-	      fi
-	      func_append delfiles " $output"
-
-	    else
-	      output=
-	    fi
-
-	    ${skipped_export-false} && {
-	      func_verbose "generating symbol list for '$libname.la'"
-	      export_symbols=$output_objdir/$libname.exp
-	      $opt_dry_run || $RM $export_symbols
-	      libobjs=$output
-	      # Append the command to create the export file.
-	      test -z "$concat_cmds" || concat_cmds=$concat_cmds~
-	      eval concat_cmds=\"\$concat_cmds$export_symbols_cmds\"
-	      if test -n "$last_robj"; then
-		eval concat_cmds=\"\$concat_cmds~\$RM $last_robj\"
-	      fi
-	    }
-
-	    test -n "$save_libobjs" &&
-	      func_verbose "creating a temporary reloadable object file: $output"
-
-	    # Loop through the commands generated above and execute them.
-	    save_ifs=$IFS; IFS='~'
-	    for cmd in $concat_cmds; do
-	      IFS=$save_ifs
-	      $opt_quiet || {
-		  func_quote_arg expand,pretty "$cmd"
-		  eval "func_echo $func_quote_arg_result"
-	      }
-	      $opt_dry_run || eval "$cmd" || {
-		lt_exit=$?
-
-		# Restore the uninstalled library and exit
-		if test relink = "$opt_mode"; then
-		  ( cd "$output_objdir" && \
-		    $RM "${realname}T" && \
-		    $MV "${realname}U" "$realname" )
-		fi
-
-		exit $lt_exit
-	      }
-	    done
-	    IFS=$save_ifs
-
-	    if test -n "$export_symbols_regex" && ${skipped_export-false}; then
-	      func_show_eval '$EGREP -e "$export_symbols_regex" "$export_symbols" > "${export_symbols}T"'
-	      func_show_eval '$MV "${export_symbols}T" "$export_symbols"'
-	    fi
-	  fi
-
-          ${skipped_export-false} && {
-	    if test -n "$export_symbols" && test -n "$include_expsyms"; then
-	      tmp_export_symbols=$export_symbols
-	      test -n "$orig_export_symbols" && tmp_export_symbols=$orig_export_symbols
-	      $opt_dry_run || eval '$ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"'
-	    fi
-
-	    if test -n "$orig_export_symbols"; then
-	      # The given exports_symbols file has to be filtered, so filter it.
-	      func_verbose "filter symbol list for '$libname.la' to tag DATA exports"
-	      # FIXME: $output_objdir/$libname.filter potentially contains lots of
-	      # 's' commands, which not all seds can handle. GNU sed should be fine
-	      # though. Also, the filter scales superlinearly with the number of
-	      # global variables. join(1) would be nice here, but unfortunately
-	      # isn't a blessed tool.
-	      $opt_dry_run || $SED -e '/[ ,]DATA/!d;s,\(.*\)\([ \,].*\),s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter
-	      func_append delfiles " $export_symbols $output_objdir/$libname.filter"
-	      export_symbols=$output_objdir/$libname.def
-	      $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols
-	    fi
-	  }
-
-	  libobjs=$output
-	  # Restore the value of output.
-	  output=$save_output
-
-	  if test -n "$convenience" && test -n "$whole_archive_flag_spec"; then
-	    eval libobjs=\"\$libobjs $whole_archive_flag_spec\"
-	    test "X$libobjs" = "X " && libobjs=
-	  fi
-	  # Expand the library linking commands again to reset the
-	  # value of $libobjs for piecewise linking.
-
-	  # Do each of the archive commands.
-	  if test yes = "$module" && test -n "$module_cmds"; then
-	    if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then
-	      cmds=$module_expsym_cmds
-	    else
-	      cmds=$module_cmds
-	    fi
-	  else
-	    if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then
-	      cmds=$archive_expsym_cmds
-	    else
-	      cmds=$archive_cmds
-	    fi
-	  fi
-	fi
-
-	if test -n "$delfiles"; then
-	  # Append the command to remove temporary files to $cmds.
-	  eval cmds=\"\$cmds~\$RM $delfiles\"
-	fi
-
-	# Add any objects from preloaded convenience libraries
-	if test -n "$dlprefiles"; then
-	  gentop=$output_objdir/${outputname}x
-	  func_append generated " $gentop"
-
-	  func_extract_archives $gentop $dlprefiles
-	  func_append libobjs " $func_extract_archives_result"
-	  test "X$libobjs" = "X " && libobjs=
-	fi
-
-	save_ifs=$IFS; IFS='~'
-	for cmd in $cmds; do
-	  IFS=$sp$nl
-	  eval cmd=\"$cmd\"
-	  IFS=$save_ifs
-	  $opt_quiet || {
-	    func_quote_arg expand,pretty "$cmd"
-	    eval "func_echo $func_quote_arg_result"
-	  }
-	  $opt_dry_run || eval "$cmd" || {
-	    lt_exit=$?
-
-	    # Restore the uninstalled library and exit
-	    if test relink = "$opt_mode"; then
-	      ( cd "$output_objdir" && \
-	        $RM "${realname}T" && \
-		$MV "${realname}U" "$realname" )
-	    fi
-
-	    exit $lt_exit
-	  }
-	done
-	IFS=$save_ifs
-
-	# Restore the uninstalled library and exit
-	if test relink = "$opt_mode"; then
-	  $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}T && $MV $realname ${realname}T && $MV ${realname}U $realname)' || exit $?
-
-	  if test -n "$convenience"; then
-	    if test -z "$whole_archive_flag_spec"; then
-	      func_show_eval '${RM}r "$gentop"'
-	    fi
-	  fi
-
-	  exit $EXIT_SUCCESS
-	fi
-
-	# Create links to the real library.
-	for linkname in $linknames; do
-	  if test "$realname" != "$linkname"; then
-	    func_show_eval '(cd "$output_objdir" && $RM "$linkname" && $LN_S "$realname" "$linkname")' 'exit $?'
-	  fi
-	done
-
-	# If -module or -export-dynamic was specified, set the dlname.
-	if test yes = "$module" || test yes = "$export_dynamic"; then
-	  # On all known operating systems, these are identical.
-	  dlname=$soname
-	fi
-      fi
-      ;;
-
-    obj)
-      if test -n "$dlfiles$dlprefiles" || test no != "$dlself"; then
-	func_warning "'-dlopen' is ignored for objects"
-      fi
-
-      case " $deplibs" in
-      *\ -l* | *\ -L*)
-	func_warning "'-l' and '-L' are ignored for objects" ;;
-      esac
-
-      test -n "$rpath" && \
-	func_warning "'-rpath' is ignored for objects"
-
-      test -n "$xrpath" && \
-	func_warning "'-R' is ignored for objects"
-
-      test -n "$vinfo" && \
-	func_warning "'-version-info' is ignored for objects"
-
-      test -n "$release" && \
-	func_warning "'-release' is ignored for objects"
-
-      case $output in
-      *.lo)
-	test -n "$objs$old_deplibs" && \
-	  func_fatal_error "cannot build library object '$output' from non-libtool objects"
-
-	libobj=$output
-	func_lo2o "$libobj"
-	obj=$func_lo2o_result
-	;;
-      *)
-	libobj=
-	obj=$output
-	;;
-      esac
-
-      # Delete the old objects.
-      $opt_dry_run || $RM $obj $libobj
-
-      # Objects from convenience libraries.  This assumes
-      # single-version convenience libraries.  Whenever we create
-      # different ones for PIC/non-PIC, this we'll have to duplicate
-      # the extraction.
-      reload_conv_objs=
-      gentop=
-      # if reload_cmds runs $LD directly, get rid of -Wl from
-      # whole_archive_flag_spec and hope we can get by with turning comma
-      # into space.
-      case $reload_cmds in
-        *\$LD[\ \$]*) wl= ;;
-      esac
-      if test -n "$convenience"; then
-	if test -n "$whole_archive_flag_spec"; then
-	  eval tmp_whole_archive_flags=\"$whole_archive_flag_spec\"
-	  test -n "$wl" || tmp_whole_archive_flags=`$ECHO "$tmp_whole_archive_flags" | $SED 's|,| |g'`
-	  reload_conv_objs=$reload_objs\ $tmp_whole_archive_flags
-	else
-	  gentop=$output_objdir/${obj}x
-	  func_append generated " $gentop"
-
-	  func_extract_archives $gentop $convenience
-	  reload_conv_objs="$reload_objs $func_extract_archives_result"
-	fi
-      fi
-
-      # If we're not building shared, we need to use non_pic_objs
-      test yes = "$build_libtool_libs" || libobjs=$non_pic_objects
-
-      # Create the old-style object.
-      reload_objs=$objs$old_deplibs' '`$ECHO "$libobjs" | $SP2NL | $SED "/\.$libext$/d; /\.lib$/d; $lo2o" | $NL2SP`' '$reload_conv_objs
-
-      output=$obj
-      func_execute_cmds "$reload_cmds" 'exit $?'
-
-      # Exit if we aren't doing a library object file.
-      if test -z "$libobj"; then
-	if test -n "$gentop"; then
-	  func_show_eval '${RM}r "$gentop"'
-	fi
-
-	exit $EXIT_SUCCESS
-      fi
-
-      test yes = "$build_libtool_libs" || {
-	if test -n "$gentop"; then
-	  func_show_eval '${RM}r "$gentop"'
-	fi
-
-	# Create an invalid libtool object if no PIC, so that we don't
-	# accidentally link it into a program.
-	# $show "echo timestamp > $libobj"
-	# $opt_dry_run || eval "echo timestamp > $libobj" || exit $?
-	exit $EXIT_SUCCESS
-      }
-
-      if test -n "$pic_flag" || test default != "$pic_mode"; then
-	# Only do commands if we really have different PIC objects.
-	reload_objs="$libobjs $reload_conv_objs"
-	output=$libobj
-	func_execute_cmds "$reload_cmds" 'exit $?'
-      fi
-
-      if test -n "$gentop"; then
-	func_show_eval '${RM}r "$gentop"'
-      fi
-
-      exit $EXIT_SUCCESS
-      ;;
-
-    prog)
-      case $host in
-	*cygwin*) func_stripname '' '.exe' "$output"
-	          output=$func_stripname_result.exe;;
-      esac
-      test -n "$vinfo" && \
-	func_warning "'-version-info' is ignored for programs"
-
-      test -n "$release" && \
-	func_warning "'-release' is ignored for programs"
-
-      $preload \
-	&& test unknown,unknown,unknown = "$dlopen_support,$dlopen_self,$dlopen_self_static" \
-	&& func_warning "'LT_INIT([dlopen])' not used. Assuming no dlopen support."
-
-      case $host in
-      *-*-rhapsody* | *-*-darwin1.[012])
-	# On Rhapsody replace the C library is the System framework
-	compile_deplibs=`$ECHO " $compile_deplibs" | $SED 's/ -lc / System.ltframework /'`
-	finalize_deplibs=`$ECHO " $finalize_deplibs" | $SED 's/ -lc / System.ltframework /'`
-	;;
-      esac
-
-      case $host in
-      *-*-darwin*)
-	# Don't allow lazy linking, it breaks C++ global constructors
-	# But is supposedly fixed on 10.4 or later (yay!).
-	if test CXX = "$tagname"; then
-	  case ${MACOSX_DEPLOYMENT_TARGET-10.0} in
-	    10.[0123])
-	      func_append compile_command " $wl-bind_at_load"
-	      func_append finalize_command " $wl-bind_at_load"
-	    ;;
-	  esac
-	fi
-	# Time to change all our "foo.ltframework" stuff back to "-framework foo"
-	compile_deplibs=`$ECHO " $compile_deplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
-	finalize_deplibs=`$ECHO " $finalize_deplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
-	;;
-      esac
-
-
-      # move library search paths that coincide with paths to not yet
-      # installed libraries to the beginning of the library search list
-      new_libs=
-      for path in $notinst_path; do
-	case " $new_libs " in
-	*" -L$path/$objdir "*) ;;
-	*)
-	  case " $compile_deplibs " in
-	  *" -L$path/$objdir "*)
-	    func_append new_libs " -L$path/$objdir" ;;
-	  esac
-	  ;;
-	esac
-      done
-      for deplib in $compile_deplibs; do
-	case $deplib in
-	-L*)
-	  case " $new_libs " in
-	  *" $deplib "*) ;;
-	  *) func_append new_libs " $deplib" ;;
-	  esac
-	  ;;
-	*) func_append new_libs " $deplib" ;;
-	esac
-      done
-      compile_deplibs=$new_libs
-
-
-      func_append compile_command " $compile_deplibs"
-      func_append finalize_command " $finalize_deplibs"
-
-      if test -n "$rpath$xrpath"; then
-	# If the user specified any rpath flags, then add them.
-	for libdir in $rpath $xrpath; do
-	  # This is the magic to use -rpath.
-	  case "$finalize_rpath " in
-	  *" $libdir "*) ;;
-	  *) func_append finalize_rpath " $libdir" ;;
-	  esac
-	done
-      fi
-
-      # Now hardcode the library paths
-      rpath=
-      hardcode_libdirs=
-      for libdir in $compile_rpath $finalize_rpath; do
-	if test -n "$hardcode_libdir_flag_spec"; then
-	  if test -n "$hardcode_libdir_separator"; then
-	    if test -z "$hardcode_libdirs"; then
-	      hardcode_libdirs=$libdir
-	    else
-	      # Just accumulate the unique libdirs.
-	      case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in
-	      *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
-		;;
-	      *)
-		func_append hardcode_libdirs "$hardcode_libdir_separator$libdir"
-		;;
-	      esac
-	    fi
-	  else
-	    eval flag=\"$hardcode_libdir_flag_spec\"
-	    func_append rpath " $flag"
-	  fi
-	elif test -n "$runpath_var"; then
-	  case "$perm_rpath " in
-	  *" $libdir "*) ;;
-	  *) func_append perm_rpath " $libdir" ;;
-	  esac
-	fi
-	case $host in
-	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*)
-	  testbindir=`$ECHO "$libdir" | $SED -e 's*/lib$*/bin*'`
-	  case :$dllsearchpath: in
-	  *":$libdir:"*) ;;
-	  ::) dllsearchpath=$libdir;;
-	  *) func_append dllsearchpath ":$libdir";;
-	  esac
-	  case :$dllsearchpath: in
-	  *":$testbindir:"*) ;;
-	  ::) dllsearchpath=$testbindir;;
-	  *) func_append dllsearchpath ":$testbindir";;
-	  esac
-	  ;;
-	esac
-      done
-      # Substitute the hardcoded libdirs into the rpath.
-      if test -n "$hardcode_libdir_separator" &&
-	 test -n "$hardcode_libdirs"; then
-	libdir=$hardcode_libdirs
-	eval rpath=\" $hardcode_libdir_flag_spec\"
-      fi
-      compile_rpath=$rpath
-
-      rpath=
-      hardcode_libdirs=
-      for libdir in $finalize_rpath; do
-	if test -n "$hardcode_libdir_flag_spec"; then
-	  if test -n "$hardcode_libdir_separator"; then
-	    if test -z "$hardcode_libdirs"; then
-	      hardcode_libdirs=$libdir
-	    else
-	      # Just accumulate the unique libdirs.
-	      case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in
-	      *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
-		;;
-	      *)
-		func_append hardcode_libdirs "$hardcode_libdir_separator$libdir"
-		;;
-	      esac
-	    fi
-	  else
-	    eval flag=\"$hardcode_libdir_flag_spec\"
-	    func_append rpath " $flag"
-	  fi
-	elif test -n "$runpath_var"; then
-	  case "$finalize_perm_rpath " in
-	  *" $libdir "*) ;;
-	  *) func_append finalize_perm_rpath " $libdir" ;;
-	  esac
-	fi
-      done
-      # Substitute the hardcoded libdirs into the rpath.
-      if test -n "$hardcode_libdir_separator" &&
-	 test -n "$hardcode_libdirs"; then
-	libdir=$hardcode_libdirs
-	eval rpath=\" $hardcode_libdir_flag_spec\"
-      fi
-      finalize_rpath=$rpath
-
-      if test -n "$libobjs" && test yes = "$build_old_libs"; then
-	# Transform all the library objects into standard objects.
-	compile_command=`$ECHO "$compile_command" | $SP2NL | $SED "$lo2o" | $NL2SP`
-	finalize_command=`$ECHO "$finalize_command" | $SP2NL | $SED "$lo2o" | $NL2SP`
-      fi
-
-      func_generate_dlsyms "$outputname" "@PROGRAM@" false
-
-      # template prelinking step
-      if test -n "$prelink_cmds"; then
-	func_execute_cmds "$prelink_cmds" 'exit $?'
-      fi
-
-      wrappers_required=:
-      case $host in
-      *cegcc* | *mingw32ce*)
-        # Disable wrappers for cegcc and mingw32ce hosts, we are cross compiling anyway.
-        wrappers_required=false
-        ;;
-      *cygwin* | *mingw* )
-        test yes = "$build_libtool_libs" || wrappers_required=false
-        ;;
-      *)
-        if test no = "$need_relink" || test yes != "$build_libtool_libs"; then
-          wrappers_required=false
-        fi
-        ;;
-      esac
-      $wrappers_required || {
-	# Replace the output file specification.
-	compile_command=`$ECHO "$compile_command" | $SED 's%@OUTPUT@%'"$output"'%g'`
-	link_command=$compile_command$compile_rpath
-
-	# We have no uninstalled library dependencies, so finalize right now.
-	exit_status=0
-	func_show_eval "$link_command" 'exit_status=$?'
-
-	if test -n "$postlink_cmds"; then
-	  func_to_tool_file "$output"
-	  postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'`
-	  func_execute_cmds "$postlink_cmds" 'exit $?'
-	fi
-
-	# Delete the generated files.
-	if test -f "$output_objdir/${outputname}S.$objext"; then
-	  func_show_eval '$RM "$output_objdir/${outputname}S.$objext"'
-	fi
-
-	exit $exit_status
-      }
-
-      if test -n "$compile_shlibpath$finalize_shlibpath"; then
-	compile_command="$shlibpath_var=\"$compile_shlibpath$finalize_shlibpath\$$shlibpath_var\" $compile_command"
-      fi
-      if test -n "$finalize_shlibpath"; then
-	finalize_command="$shlibpath_var=\"$finalize_shlibpath\$$shlibpath_var\" $finalize_command"
-      fi
-
-      compile_var=
-      finalize_var=
-      if test -n "$runpath_var"; then
-	if test -n "$perm_rpath"; then
-	  # We should set the runpath_var.
-	  rpath=
-	  for dir in $perm_rpath; do
-	    func_append rpath "$dir:"
-	  done
-	  compile_var="$runpath_var=\"$rpath\$$runpath_var\" "
-	fi
-	if test -n "$finalize_perm_rpath"; then
-	  # We should set the runpath_var.
-	  rpath=
-	  for dir in $finalize_perm_rpath; do
-	    func_append rpath "$dir:"
-	  done
-	  finalize_var="$runpath_var=\"$rpath\$$runpath_var\" "
-	fi
-      fi
-
-      if test yes = "$no_install"; then
-	# We don't need to create a wrapper script.
-	link_command=$compile_var$compile_command$compile_rpath
-	# Replace the output file specification.
-	link_command=`$ECHO "$link_command" | $SED 's%@OUTPUT@%'"$output"'%g'`
-	# Delete the old output file.
-	$opt_dry_run || $RM $output
-	# Link the executable and exit
-	func_show_eval "$link_command" 'exit $?'
-
-	if test -n "$postlink_cmds"; then
-	  func_to_tool_file "$output"
-	  postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'`
-	  func_execute_cmds "$postlink_cmds" 'exit $?'
-	fi
-
-	exit $EXIT_SUCCESS
-      fi
-
-      case $hardcode_action,$fast_install in
-        relink,*)
-	  # Fast installation is not supported
-	  link_command=$compile_var$compile_command$compile_rpath
-	  relink_command=$finalize_var$finalize_command$finalize_rpath
-
-	  func_warning "this platform does not like uninstalled shared libraries"
-	  func_warning "'$output' will be relinked during installation"
-	  ;;
-        *,yes)
-	  link_command=$finalize_var$compile_command$finalize_rpath
-	  relink_command=`$ECHO "$compile_var$compile_command$compile_rpath" | $SED 's%@OUTPUT@%\$progdir/\$file%g'`
-          ;;
-	*,no)
-	  link_command=$compile_var$compile_command$compile_rpath
-	  relink_command=$finalize_var$finalize_command$finalize_rpath
-          ;;
-	*,needless)
-	  link_command=$finalize_var$compile_command$finalize_rpath
-	  relink_command=
-          ;;
-      esac
-
-      # Replace the output file specification.
-      link_command=`$ECHO "$link_command" | $SED 's%@OUTPUT@%'"$output_objdir/$outputname"'%g'`
-
-      # Delete the old output files.
-      $opt_dry_run || $RM $output $output_objdir/$outputname $output_objdir/lt-$outputname
-
-      func_show_eval "$link_command" 'exit $?'
-
-      if test -n "$postlink_cmds"; then
-	func_to_tool_file "$output_objdir/$outputname"
-	postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output_objdir/$outputname"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'`
-	func_execute_cmds "$postlink_cmds" 'exit $?'
-      fi
-
-      # Now create the wrapper script.
-      func_verbose "creating $output"
-
-      # Quote the relink command for shipping.
-      if test -n "$relink_command"; then
-	# Preserve any variables that may affect compiler behavior
-	for var in $variables_saved_for_relink; do
-	  if eval test -z \"\${$var+set}\"; then
-	    relink_command="{ test -z \"\${$var+set}\" || $lt_unset $var || { $var=; export $var; }; }; $relink_command"
-	  elif eval var_value=\$$var; test -z "$var_value"; then
-	    relink_command="$var=; export $var; $relink_command"
-	  else
-	    func_quote_arg pretty "$var_value"
-	    relink_command="$var=$func_quote_arg_result; export $var; $relink_command"
-	  fi
-	done
-	func_quote eval cd "`pwd`"
-	func_quote_arg pretty,unquoted "($func_quote_result; $relink_command)"
-	relink_command=$func_quote_arg_unquoted_result
-      fi
-
-      # Only actually do things if not in dry run mode.
-      $opt_dry_run || {
-	# win32 will think the script is a binary if it has
-	# a .exe suffix, so we strip it off here.
-	case $output in
-	  *.exe) func_stripname '' '.exe' "$output"
-	         output=$func_stripname_result ;;
-	esac
-	# test for cygwin because mv fails w/o .exe extensions
-	case $host in
-	  *cygwin*)
-	    exeext=.exe
-	    func_stripname '' '.exe' "$outputname"
-	    outputname=$func_stripname_result ;;
-	  *) exeext= ;;
-	esac
-	case $host in
-	  *cygwin* | *mingw* )
-	    func_dirname_and_basename "$output" "" "."
-	    output_name=$func_basename_result
-	    output_path=$func_dirname_result
-	    cwrappersource=$output_path/$objdir/lt-$output_name.c
-	    cwrapper=$output_path/$output_name.exe
-	    $RM $cwrappersource $cwrapper
-	    trap "$RM $cwrappersource $cwrapper; exit $EXIT_FAILURE" 1 2 15
-
-	    func_emit_cwrapperexe_src > $cwrappersource
-
-	    # The wrapper executable is built using the $host compiler,
-	    # because it contains $host paths and files. If cross-
-	    # compiling, it, like the target executable, must be
-	    # executed on the $host or under an emulation environment.
-	    $opt_dry_run || {
-	      $LTCC $LTCFLAGS -o $cwrapper $cwrappersource
-	      $STRIP $cwrapper
-	    }
-
-	    # Now, create the wrapper script for func_source use:
-	    func_ltwrapper_scriptname $cwrapper
-	    $RM $func_ltwrapper_scriptname_result
-	    trap "$RM $func_ltwrapper_scriptname_result; exit $EXIT_FAILURE" 1 2 15
-	    $opt_dry_run || {
-	      # note: this script will not be executed, so do not chmod.
-	      if test "x$build" = "x$host"; then
-		$cwrapper --lt-dump-script > $func_ltwrapper_scriptname_result
-	      else
-		func_emit_wrapper no > $func_ltwrapper_scriptname_result
-	      fi
-	    }
-	  ;;
-	  * )
-	    $RM $output
-	    trap "$RM $output; exit $EXIT_FAILURE" 1 2 15
-
-	    func_emit_wrapper no > $output
-	    chmod +x $output
-	  ;;
-	esac
-      }
-      exit $EXIT_SUCCESS
-      ;;
-    esac
-
-    # See if we need to build an old-fashioned archive.
-    for oldlib in $oldlibs; do
-
-      case $build_libtool_libs in
-        convenience)
-	  oldobjs="$libobjs_save $symfileobj"
-	  addlibs=$convenience
-	  build_libtool_libs=no
-	  ;;
-	module)
-	  oldobjs=$libobjs_save
-	  addlibs=$old_convenience
-	  build_libtool_libs=no
-          ;;
-	*)
-	  oldobjs="$old_deplibs $non_pic_objects"
-	  $preload && test -f "$symfileobj" \
-	    && func_append oldobjs " $symfileobj"
-	  addlibs=$old_convenience
-	  ;;
-      esac
-
-      if test -n "$addlibs"; then
-	gentop=$output_objdir/${outputname}x
-	func_append generated " $gentop"
-
-	func_extract_archives $gentop $addlibs
-	func_append oldobjs " $func_extract_archives_result"
-      fi
-
-      # Do each command in the archive commands.
-      if test -n "$old_archive_from_new_cmds" && test yes = "$build_libtool_libs"; then
-	cmds=$old_archive_from_new_cmds
-      else
-
-	# Add any objects from preloaded convenience libraries
-	if test -n "$dlprefiles"; then
-	  gentop=$output_objdir/${outputname}x
-	  func_append generated " $gentop"
-
-	  func_extract_archives $gentop $dlprefiles
-	  func_append oldobjs " $func_extract_archives_result"
-	fi
-
-	# POSIX demands no paths to be encoded in archives.  We have
-	# to avoid creating archives with duplicate basenames if we
-	# might have to extract them afterwards, e.g., when creating a
-	# static archive out of a convenience library, or when linking
-	# the entirety of a libtool archive into another (currently
-	# not supported by libtool).
-	if (for obj in $oldobjs
-	    do
-	      func_basename "$obj"
-	      $ECHO "$func_basename_result"
-	    done | sort | sort -uc >/dev/null 2>&1); then
-	  :
-	else
-	  echo "copying selected object files to avoid basename conflicts..."
-	  gentop=$output_objdir/${outputname}x
-	  func_append generated " $gentop"
-	  func_mkdir_p "$gentop"
-	  save_oldobjs=$oldobjs
-	  oldobjs=
-	  counter=1
-	  for obj in $save_oldobjs
-	  do
-	    func_basename "$obj"
-	    objbase=$func_basename_result
-	    case " $oldobjs " in
-	    " ") oldobjs=$obj ;;
-	    *[\ /]"$objbase "*)
-	      while :; do
-		# Make sure we don't pick an alternate name that also
-		# overlaps.
-		newobj=lt$counter-$objbase
-		func_arith $counter + 1
-		counter=$func_arith_result
-		case " $oldobjs " in
-		*[\ /]"$newobj "*) ;;
-		*) if test ! -f "$gentop/$newobj"; then break; fi ;;
-		esac
-	      done
-	      func_show_eval "ln $obj $gentop/$newobj || cp $obj $gentop/$newobj"
-	      func_append oldobjs " $gentop/$newobj"
-	      ;;
-	    *) func_append oldobjs " $obj" ;;
-	    esac
-	  done
-	fi
-	func_to_tool_file "$oldlib" func_convert_file_msys_to_w32
-	tool_oldlib=$func_to_tool_file_result
-	eval cmds=\"$old_archive_cmds\"
-
-	func_len " $cmds"
-	len=$func_len_result
-	if test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then
-	  cmds=$old_archive_cmds
-	elif test -n "$archiver_list_spec"; then
-	  func_verbose "using command file archive linking..."
-	  for obj in $oldobjs
-	  do
-	    func_to_tool_file "$obj"
-	    $ECHO "$func_to_tool_file_result"
-	  done > $output_objdir/$libname.libcmd
-	  func_to_tool_file "$output_objdir/$libname.libcmd"
-	  oldobjs=" $archiver_list_spec$func_to_tool_file_result"
-	  cmds=$old_archive_cmds
-	else
-	  # the command line is too long to link in one step, link in parts
-	  func_verbose "using piecewise archive linking..."
-	  save_RANLIB=$RANLIB
-	  RANLIB=:
-	  objlist=
-	  concat_cmds=
-	  save_oldobjs=$oldobjs
-	  oldobjs=
-	  # Is there a better way of finding the last object in the list?
-	  for obj in $save_oldobjs
-	  do
-	    last_oldobj=$obj
-	  done
-	  eval test_cmds=\"$old_archive_cmds\"
-	  func_len " $test_cmds"
-	  len0=$func_len_result
-	  len=$len0
-	  for obj in $save_oldobjs
-	  do
-	    func_len " $obj"
-	    func_arith $len + $func_len_result
-	    len=$func_arith_result
-	    func_append objlist " $obj"
-	    if test "$len" -lt "$max_cmd_len"; then
-	      :
-	    else
-	      # the above command should be used before it gets too long
-	      oldobjs=$objlist
-	      if test "$obj" = "$last_oldobj"; then
-		RANLIB=$save_RANLIB
-	      fi
-	      test -z "$concat_cmds" || concat_cmds=$concat_cmds~
-	      eval concat_cmds=\"\$concat_cmds$old_archive_cmds\"
-	      objlist=
-	      len=$len0
-	    fi
-	  done
-	  RANLIB=$save_RANLIB
-	  oldobjs=$objlist
-	  if test -z "$oldobjs"; then
-	    eval cmds=\"\$concat_cmds\"
-	  else
-	    eval cmds=\"\$concat_cmds~\$old_archive_cmds\"
-	  fi
-	fi
-      fi
-      func_execute_cmds "$cmds" 'exit $?'
-    done
-
-    test -n "$generated" && \
-      func_show_eval "${RM}r$generated"
-
-    # Now create the libtool archive.
-    case $output in
-    *.la)
-      old_library=
-      test yes = "$build_old_libs" && old_library=$libname.$libext
-      func_verbose "creating $output"
-
-      # Preserve any variables that may affect compiler behavior
-      for var in $variables_saved_for_relink; do
-	if eval test -z \"\${$var+set}\"; then
-	  relink_command="{ test -z \"\${$var+set}\" || $lt_unset $var || { $var=; export $var; }; }; $relink_command"
-	elif eval var_value=\$$var; test -z "$var_value"; then
-	  relink_command="$var=; export $var; $relink_command"
-	else
-	  func_quote_arg pretty,unquoted "$var_value"
-	  relink_command="$var=$func_quote_arg_unquoted_result; export $var; $relink_command"
-	fi
-      done
-      # Quote the link command for shipping.
-      func_quote eval cd "`pwd`"
-      relink_command="($func_quote_result; $SHELL \"$progpath\" $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)"
-      func_quote_arg pretty,unquoted "$relink_command"
-      relink_command=$func_quote_arg_unquoted_result
-      if test yes = "$hardcode_automatic"; then
-	relink_command=
-      fi
-
-      # Only create the output if not a dry run.
-      $opt_dry_run || {
-	for installed in no yes; do
-	  if test yes = "$installed"; then
-	    if test -z "$install_libdir"; then
-	      break
-	    fi
-	    output=$output_objdir/${outputname}i
-	    # Replace all uninstalled libtool libraries with the installed ones
-	    newdependency_libs=
-	    for deplib in $dependency_libs; do
-	      case $deplib in
-	      *.la)
-		func_basename "$deplib"
-		name=$func_basename_result
-		func_resolve_sysroot "$deplib"
-		eval libdir=`$SED -n -e 's/^libdir=\(.*\)$/\1/p' $func_resolve_sysroot_result`
-		test -z "$libdir" && \
-		  func_fatal_error "'$deplib' is not a valid libtool archive"
-		func_append newdependency_libs " ${lt_sysroot:+=}$libdir/$name"
-		;;
-	      -L*)
-		func_stripname -L '' "$deplib"
-		func_replace_sysroot "$func_stripname_result"
-		func_append newdependency_libs " -L$func_replace_sysroot_result"
-		;;
-	      -R*)
-		func_stripname -R '' "$deplib"
-		func_replace_sysroot "$func_stripname_result"
-		func_append newdependency_libs " -R$func_replace_sysroot_result"
-		;;
-	      *) func_append newdependency_libs " $deplib" ;;
-	      esac
-	    done
-	    dependency_libs=$newdependency_libs
-	    newdlfiles=
-
-	    for lib in $dlfiles; do
-	      case $lib in
-	      *.la)
-	        func_basename "$lib"
-		name=$func_basename_result
-		eval libdir=`$SED -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
-		test -z "$libdir" && \
-		  func_fatal_error "'$lib' is not a valid libtool archive"
-		func_append newdlfiles " ${lt_sysroot:+=}$libdir/$name"
-		;;
-	      *) func_append newdlfiles " $lib" ;;
-	      esac
-	    done
-	    dlfiles=$newdlfiles
-	    newdlprefiles=
-	    for lib in $dlprefiles; do
-	      case $lib in
-	      *.la)
-		# Only pass preopened files to the pseudo-archive (for
-		# eventual linking with the app. that links it) if we
-		# didn't already link the preopened objects directly into
-		# the library:
-		func_basename "$lib"
-		name=$func_basename_result
-		eval libdir=`$SED -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
-		test -z "$libdir" && \
-		  func_fatal_error "'$lib' is not a valid libtool archive"
-		func_append newdlprefiles " ${lt_sysroot:+=}$libdir/$name"
-		;;
-	      esac
-	    done
-	    dlprefiles=$newdlprefiles
-	  else
-	    newdlfiles=
-	    for lib in $dlfiles; do
-	      case $lib in
-		[\\/]* | [A-Za-z]:[\\/]*) abs=$lib ;;
-		*) abs=`pwd`"/$lib" ;;
-	      esac
-	      func_append newdlfiles " $abs"
-	    done
-	    dlfiles=$newdlfiles
-	    newdlprefiles=
-	    for lib in $dlprefiles; do
-	      case $lib in
-		[\\/]* | [A-Za-z]:[\\/]*) abs=$lib ;;
-		*) abs=`pwd`"/$lib" ;;
-	      esac
-	      func_append newdlprefiles " $abs"
-	    done
-	    dlprefiles=$newdlprefiles
-	  fi
-	  $RM $output
-	  # place dlname in correct position for cygwin
-	  # In fact, it would be nice if we could use this code for all target
-	  # systems that can't hard-code library paths into their executables
-	  # and that have no shared library path variable independent of PATH,
-	  # but it turns out we can't easily determine that from inspecting
-	  # libtool variables, so we have to hard-code the OSs to which it
-	  # applies here; at the moment, that means platforms that use the PE
-	  # object format with DLL files.  See the long comment at the top of
-	  # tests/bindir.at for full details.
-	  tdlname=$dlname
-	  case $host,$output,$installed,$module,$dlname in
-	    *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll | *cegcc*,*lai,yes,no,*.dll)
-	      # If a -bindir argument was supplied, place the dll there.
-	      if test -n "$bindir"; then
-		func_relative_path "$install_libdir" "$bindir"
-		tdlname=$func_relative_path_result/$dlname
-	      else
-		# Otherwise fall back on heuristic.
-		tdlname=../bin/$dlname
-	      fi
-	      ;;
-	  esac
-	  $ECHO > $output "\
-# $outputname - a libtool library file
-# Generated by $PROGRAM (GNU $PACKAGE) $VERSION
-#
-# Please DO NOT delete this file!
-# It is necessary for linking the library.
-
-# The name that we can dlopen(3).
-dlname='$tdlname'
-
-# Names of this library.
-library_names='$library_names'
-
-# The name of the static archive.
-old_library='$old_library'
-
-# Linker flags that cannot go in dependency_libs.
-inherited_linker_flags='$new_inherited_linker_flags'
-
-# Libraries that this one depends upon.
-dependency_libs='$dependency_libs'
-
-# Names of additional weak libraries provided by this library
-weak_library_names='$weak_libs'
-
-# Version information for $libname.
-current=$current
-age=$age
-revision=$revision
-
-# Is this an already installed library?
-installed=$installed
-
-# Should we warn about portability when linking against -modules?
-shouldnotlink=$module
-
-# Files to dlopen/dlpreopen
-dlopen='$dlfiles'
-dlpreopen='$dlprefiles'
-
-# Directory that this library needs to be installed in:
-libdir='$install_libdir'"
-	  if test no,yes = "$installed,$need_relink"; then
-	    $ECHO >> $output "\
-relink_command=\"$relink_command\""
-	  fi
-	done
-      }
-
-      # Do a symbolic link so that the libtool archive can be found in
-      # LD_LIBRARY_PATH before the program is installed.
-      func_show_eval '( cd "$output_objdir" && $RM "$outputname" && $LN_S "../$outputname" "$outputname" )' 'exit $?'
-      ;;
-    esac
-    exit $EXIT_SUCCESS
-}
-
-if test link = "$opt_mode" || test relink = "$opt_mode"; then
-  func_mode_link ${1+"$@"}
-fi
-
-
-# func_mode_uninstall arg...
-func_mode_uninstall ()
-{
-    $debug_cmd
-
-    RM=$nonopt
-    files=
-    rmforce=false
-    exit_status=0
-
-    # This variable tells wrapper scripts just to set variables rather
-    # than running their programs.
-    libtool_install_magic=$magic
-
-    for arg
-    do
-      case $arg in
-      -f) func_append RM " $arg"; rmforce=: ;;
-      -*) func_append RM " $arg" ;;
-      *) func_append files " $arg" ;;
-      esac
-    done
-
-    test -z "$RM" && \
-      func_fatal_help "you must specify an RM program"
-
-    rmdirs=
-
-    for file in $files; do
-      func_dirname "$file" "" "."
-      dir=$func_dirname_result
-      if test . = "$dir"; then
-	odir=$objdir
-      else
-	odir=$dir/$objdir
-      fi
-      func_basename "$file"
-      name=$func_basename_result
-      test uninstall = "$opt_mode" && odir=$dir
-
-      # Remember odir for removal later, being careful to avoid duplicates
-      if test clean = "$opt_mode"; then
-	case " $rmdirs " in
-	  *" $odir "*) ;;
-	  *) func_append rmdirs " $odir" ;;
-	esac
-      fi
-
-      # Don't error if the file doesn't exist and rm -f was used.
-      if { test -L "$file"; } >/dev/null 2>&1 ||
-	 { test -h "$file"; } >/dev/null 2>&1 ||
-	 test -f "$file"; then
-	:
-      elif test -d "$file"; then
-	exit_status=1
-	continue
-      elif $rmforce; then
-	continue
-      fi
-
-      rmfiles=$file
-
-      case $name in
-      *.la)
-	# Possibly a libtool archive, so verify it.
-	if func_lalib_p "$file"; then
-	  func_source $dir/$name
-
-	  # Delete the libtool libraries and symlinks.
-	  for n in $library_names; do
-	    func_append rmfiles " $odir/$n"
-	  done
-	  test -n "$old_library" && func_append rmfiles " $odir/$old_library"
-
-	  case $opt_mode in
-	  clean)
-	    case " $library_names " in
-	    *" $dlname "*) ;;
-	    *) test -n "$dlname" && func_append rmfiles " $odir/$dlname" ;;
-	    esac
-	    test -n "$libdir" && func_append rmfiles " $odir/$name $odir/${name}i"
-	    ;;
-	  uninstall)
-	    if test -n "$library_names"; then
-	      # Do each command in the postuninstall commands.
-	      func_execute_cmds "$postuninstall_cmds" '$rmforce || exit_status=1'
-	    fi
-
-	    if test -n "$old_library"; then
-	      # Do each command in the old_postuninstall commands.
-	      func_execute_cmds "$old_postuninstall_cmds" '$rmforce || exit_status=1'
-	    fi
-	    # FIXME: should reinstall the best remaining shared library.
-	    ;;
-	  esac
-	fi
-	;;
-
-      *.lo)
-	# Possibly a libtool object, so verify it.
-	if func_lalib_p "$file"; then
-
-	  # Read the .lo file
-	  func_source $dir/$name
-
-	  # Add PIC object to the list of files to remove.
-	  if test -n "$pic_object" && test none != "$pic_object"; then
-	    func_append rmfiles " $dir/$pic_object"
-	  fi
-
-	  # Add non-PIC object to the list of files to remove.
-	  if test -n "$non_pic_object" && test none != "$non_pic_object"; then
-	    func_append rmfiles " $dir/$non_pic_object"
-	  fi
-	fi
-	;;
-
-      *)
-	if test clean = "$opt_mode"; then
-	  noexename=$name
-	  case $file in
-	  *.exe)
-	    func_stripname '' '.exe' "$file"
-	    file=$func_stripname_result
-	    func_stripname '' '.exe' "$name"
-	    noexename=$func_stripname_result
-	    # $file with .exe has already been added to rmfiles,
-	    # add $file without .exe
-	    func_append rmfiles " $file"
-	    ;;
-	  esac
-	  # Do a test to see if this is a libtool program.
-	  if func_ltwrapper_p "$file"; then
-	    if func_ltwrapper_executable_p "$file"; then
-	      func_ltwrapper_scriptname "$file"
-	      relink_command=
-	      func_source $func_ltwrapper_scriptname_result
-	      func_append rmfiles " $func_ltwrapper_scriptname_result"
-	    else
-	      relink_command=
-	      func_source $dir/$noexename
-	    fi
-
-	    # note $name still contains .exe if it was in $file originally
-	    # as does the version of $file that was added into $rmfiles
-	    func_append rmfiles " $odir/$name $odir/${name}S.$objext"
-	    if test yes = "$fast_install" && test -n "$relink_command"; then
-	      func_append rmfiles " $odir/lt-$name"
-	    fi
-	    if test "X$noexename" != "X$name"; then
-	      func_append rmfiles " $odir/lt-$noexename.c"
-	    fi
-	  fi
-	fi
-	;;
-      esac
-      func_show_eval "$RM $rmfiles" 'exit_status=1'
-    done
-
-    # Try to remove the $objdir's in the directories where we deleted files
-    for dir in $rmdirs; do
-      if test -d "$dir"; then
-	func_show_eval "rmdir $dir >/dev/null 2>&1"
-      fi
-    done
-
-    exit $exit_status
-}
-
-if test uninstall = "$opt_mode" || test clean = "$opt_mode"; then
-  func_mode_uninstall ${1+"$@"}
-fi
-
-test -z "$opt_mode" && {
-  help=$generic_help
-  func_fatal_help "you must specify a MODE"
-}
-
-test -z "$exec_cmd" && \
-  func_fatal_help "invalid operation mode '$opt_mode'"
-
-if test -n "$exec_cmd"; then
-  eval exec "$exec_cmd"
-  exit $EXIT_FAILURE
-fi
-
-exit $exit_status
-
-
-# The TAGs below are defined such that we never get into a situation
-# where we disable both kinds of libraries.  Given conflicting
-# choices, we go for a static library, that is the most portable,
-# since we can't tell whether shared libraries were disabled because
-# the user asked for that or because the platform doesn't support
-# them.  This is particularly important on AIX, because we don't
-# support having both static and shared libraries enabled at the same
-# time on that platform, so we default to a shared-only configuration.
-# If a disable-shared tag is given, we'll fallback to a static-only
-# configuration.  But we'll never go from static-only to shared-only.
-
-# ### BEGIN LIBTOOL TAG CONFIG: disable-shared
-build_libtool_libs=no
-build_old_libs=yes
-# ### END LIBTOOL TAG CONFIG: disable-shared
-
-# ### BEGIN LIBTOOL TAG CONFIG: disable-static
-build_old_libs=`case $build_libtool_libs in yes) echo no;; *) echo yes;; esac`
-# ### END LIBTOOL TAG CONFIG: disable-static
-
-# Local Variables:
-# mode:shell-script
-# sh-indentation:2
-# End:
diff --git a/submodules/libtgvoip/missing b/submodules/libtgvoip/missing
deleted file mode 100755
index 625aeb1189..0000000000
--- a/submodules/libtgvoip/missing
+++ /dev/null
@@ -1,215 +0,0 @@
-#! /bin/sh
-# Common wrapper for a few potentially missing GNU programs.
-
-scriptversion=2018-03-07.03; # UTC
-
-# Copyright (C) 1996-2018 Free Software Foundation, Inc.
-# Originally written by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-if test $# -eq 0; then
-  echo 1>&2 "Try '$0 --help' for more information"
-  exit 1
-fi
-
-case $1 in
-
-  --is-lightweight)
-    # Used by our autoconf macros to check whether the available missing
-    # script is modern enough.
-    exit 0
-    ;;
-
-  --run)
-    # Back-compat with the calling convention used by older automake.
-    shift
-    ;;
-
-  -h|--h|--he|--hel|--help)
-    echo "\
-$0 [OPTION]... PROGRAM [ARGUMENT]...
-
-Run 'PROGRAM [ARGUMENT]...', returning a proper advice when this fails due
-to PROGRAM being missing or too old.
-
-Options:
-  -h, --help      display this help and exit
-  -v, --version   output version information and exit
-
-Supported PROGRAM values:
-  aclocal   autoconf  autoheader   autom4te  automake  makeinfo
-  bison     yacc      flex         lex       help2man
-
-Version suffixes to PROGRAM as well as the prefixes 'gnu-', 'gnu', and
-'g' are ignored when checking the name.
-
-Send bug reports to <bug-automake@gnu.org>."
-    exit $?
-    ;;
-
-  -v|--v|--ve|--ver|--vers|--versi|--versio|--version)
-    echo "missing $scriptversion (GNU Automake)"
-    exit $?
-    ;;
-
-  -*)
-    echo 1>&2 "$0: unknown '$1' option"
-    echo 1>&2 "Try '$0 --help' for more information"
-    exit 1
-    ;;
-
-esac
-
-# Run the given program, remember its exit status.
-"$@"; st=$?
-
-# If it succeeded, we are done.
-test $st -eq 0 && exit 0
-
-# Also exit now if we it failed (or wasn't found), and '--version' was
-# passed; such an option is passed most likely to detect whether the
-# program is present and works.
-case $2 in --version|--help) exit $st;; esac
-
-# Exit code 63 means version mismatch.  This often happens when the user
-# tries to use an ancient version of a tool on a file that requires a
-# minimum version.
-if test $st -eq 63; then
-  msg="probably too old"
-elif test $st -eq 127; then
-  # Program was missing.
-  msg="missing on your system"
-else
-  # Program was found and executed, but failed.  Give up.
-  exit $st
-fi
-
-perl_URL=https://www.perl.org/
-flex_URL=https://github.com/westes/flex
-gnu_software_URL=https://www.gnu.org/software
-
-program_details ()
-{
-  case $1 in
-    aclocal|automake)
-      echo "The '$1' program is part of the GNU Automake package:"
-      echo "<$gnu_software_URL/automake>"
-      echo "It also requires GNU Autoconf, GNU m4 and Perl in order to run:"
-      echo "<$gnu_software_URL/autoconf>"
-      echo "<$gnu_software_URL/m4/>"
-      echo "<$perl_URL>"
-      ;;
-    autoconf|autom4te|autoheader)
-      echo "The '$1' program is part of the GNU Autoconf package:"
-      echo "<$gnu_software_URL/autoconf/>"
-      echo "It also requires GNU m4 and Perl in order to run:"
-      echo "<$gnu_software_URL/m4/>"
-      echo "<$perl_URL>"
-      ;;
-  esac
-}
-
-give_advice ()
-{
-  # Normalize program name to check for.
-  normalized_program=`echo "$1" | sed '
-    s/^gnu-//; t
-    s/^gnu//; t
-    s/^g//; t'`
-
-  printf '%s\n' "'$1' is $msg."
-
-  configure_deps="'configure.ac' or m4 files included by 'configure.ac'"
-  case $normalized_program in
-    autoconf*)
-      echo "You should only need it if you modified 'configure.ac',"
-      echo "or m4 files included by it."
-      program_details 'autoconf'
-      ;;
-    autoheader*)
-      echo "You should only need it if you modified 'acconfig.h' or"
-      echo "$configure_deps."
-      program_details 'autoheader'
-      ;;
-    automake*)
-      echo "You should only need it if you modified 'Makefile.am' or"
-      echo "$configure_deps."
-      program_details 'automake'
-      ;;
-    aclocal*)
-      echo "You should only need it if you modified 'acinclude.m4' or"
-      echo "$configure_deps."
-      program_details 'aclocal'
-      ;;
-   autom4te*)
-      echo "You might have modified some maintainer files that require"
-      echo "the 'autom4te' program to be rebuilt."
-      program_details 'autom4te'
-      ;;
-    bison*|yacc*)
-      echo "You should only need it if you modified a '.y' file."
-      echo "You may want to install the GNU Bison package:"
-      echo "<$gnu_software_URL/bison/>"
-      ;;
-    lex*|flex*)
-      echo "You should only need it if you modified a '.l' file."
-      echo "You may want to install the Fast Lexical Analyzer package:"
-      echo "<$flex_URL>"
-      ;;
-    help2man*)
-      echo "You should only need it if you modified a dependency" \
-           "of a man page."
-      echo "You may want to install the GNU Help2man package:"
-      echo "<$gnu_software_URL/help2man/>"
-    ;;
-    makeinfo*)
-      echo "You should only need it if you modified a '.texi' file, or"
-      echo "any other file indirectly affecting the aspect of the manual."
-      echo "You might want to install the Texinfo package:"
-      echo "<$gnu_software_URL/texinfo/>"
-      echo "The spurious makeinfo call might also be the consequence of"
-      echo "using a buggy 'make' (AIX, DU, IRIX), in which case you might"
-      echo "want to install GNU make:"
-      echo "<$gnu_software_URL/make/>"
-      ;;
-    *)
-      echo "You might have modified some files without having the proper"
-      echo "tools for further handling them.  Check the 'README' file, it"
-      echo "often tells you about the needed prerequisites for installing"
-      echo "this package.  You may also peek at any GNU archive site, in"
-      echo "case some other package contains this missing '$1' program."
-      ;;
-  esac
-}
-
-give_advice "$1" | sed -e '1s/^/WARNING: /' \
-                       -e '2,$s/^/         /' >&2
-
-# Propagate the correct exit status (expected to be 127 for a program
-# not found, 63 for a program that failed due to version mismatch).
-exit $st
-
-# Local variables:
-# eval: (add-hook 'before-save-hook 'time-stamp)
-# time-stamp-start: "scriptversion="
-# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-time-zone: "UTC0"
-# time-stamp-end: "; # UTC"
-# End:
diff --git a/submodules/libtgvoip/os/android/AudioInputAndroid.cpp b/submodules/libtgvoip/os/android/AudioInputAndroid.cpp
deleted file mode 100644
index 313a244526..0000000000
--- a/submodules/libtgvoip/os/android/AudioInputAndroid.cpp
+++ /dev/null
@@ -1,73 +0,0 @@
-//
-// libtgvoip is free and unencumbered public domain software.
-// For more information, see http://unlicense.org or the UNLICENSE file
-// you should have received with this source code distribution.
-//
-
-#include "AudioInputAndroid.h"
-#include <stdio.h>
-#include "../../logging.h"
-#include "JNIUtilities.h"
-
-extern JavaVM* sharedJVM;
-
-using namespace tgvoip;
-using namespace tgvoip::audio;
-
-jmethodID AudioInputAndroid::initMethod=NULL;
-jmethodID AudioInputAndroid::releaseMethod=NULL;
-jmethodID AudioInputAndroid::startMethod=NULL;
-jmethodID AudioInputAndroid::stopMethod=NULL;
-jmethodID AudioInputAndroid::getEnabledEffectsMaskMethod=NULL;
-jclass AudioInputAndroid::jniClass=NULL;
-
-AudioInputAndroid::AudioInputAndroid(){
-	jni::DoWithJNI([this](JNIEnv* env){
-		jmethodID ctor=env->GetMethodID(jniClass, "<init>", "(J)V");
-		jobject obj=env->NewObject(jniClass, ctor, (jlong)(intptr_t)this);
-		javaObject=env->NewGlobalRef(obj);
-
-		env->CallVoidMethod(javaObject, initMethod, 48000, 16, 1, 960*2);
-		enabledEffects=(unsigned int)env->CallIntMethod(javaObject, getEnabledEffectsMaskMethod);
-	});
-	running=false;
-}
-
-AudioInputAndroid::~AudioInputAndroid(){
-	{
-		MutexGuard guard(mutex);
-		jni::DoWithJNI([this](JNIEnv* env){
-			env->CallVoidMethod(javaObject, releaseMethod);
-			env->DeleteGlobalRef(javaObject);
-			javaObject=NULL;
-		});
-	}
-}
-
-void AudioInputAndroid::Start(){
-	MutexGuard guard(mutex);
-	jni::DoWithJNI([this](JNIEnv* env){
-		failed=!env->CallBooleanMethod(javaObject, startMethod);
-	});
-	running=true;
-}
-
-void AudioInputAndroid::Stop(){
-	MutexGuard guard(mutex);
-	running=false;
-	jni::DoWithJNI([this](JNIEnv* env){
-		env->CallVoidMethod(javaObject, stopMethod);
-	});
-}
-
-void AudioInputAndroid::HandleCallback(JNIEnv* env, jobject buffer){
-	if(!running)
-		return;
-	unsigned char* buf=(unsigned char*) env->GetDirectBufferAddress(buffer);
-	size_t len=(size_t) env->GetDirectBufferCapacity(buffer);
-	InvokeCallback(buf, len);
-}
-
-unsigned int AudioInputAndroid::GetEnabledEffects(){
-	return enabledEffects;
-}
diff --git a/submodules/libtgvoip/os/android/AudioInputAndroid.h b/submodules/libtgvoip/os/android/AudioInputAndroid.h
deleted file mode 100644
index 8ee7615743..0000000000
--- a/submodules/libtgvoip/os/android/AudioInputAndroid.h
+++ /dev/null
@@ -1,43 +0,0 @@
-//
-// libtgvoip is free and unencumbered public domain software.
-// For more information, see http://unlicense.org or the UNLICENSE file
-// you should have received with this source code distribution.
-//
-
-#ifndef LIBTGVOIP_AUDIOINPUTANDROID_H
-#define LIBTGVOIP_AUDIOINPUTANDROID_H
-
-#include <jni.h>
-#include "../../audio/AudioInput.h"
-#include "../../threading.h"
-
-namespace tgvoip{ namespace audio{
-class AudioInputAndroid : public AudioInput{
-
-public:
-	AudioInputAndroid();
-	virtual ~AudioInputAndroid();
-	virtual void Start();
-	virtual void Stop();
-	void HandleCallback(JNIEnv* env, jobject buffer);
-	unsigned int GetEnabledEffects();
-	static jmethodID initMethod;
-	static jmethodID releaseMethod;
-	static jmethodID startMethod;
-	static jmethodID stopMethod;
-	static jmethodID getEnabledEffectsMaskMethod;
-	static jclass jniClass;
-
-	static constexpr unsigned int EFFECT_AEC=1;
-	static constexpr unsigned int EFFECT_NS=2;
-
-private:
-	jobject javaObject;
-	bool running;
-	Mutex mutex;
-	unsigned int enabledEffects=0;
-
-};
-}}
-
-#endif //LIBTGVOIP_AUDIOINPUTANDROID_H
diff --git a/submodules/libtgvoip/os/android/AudioInputOpenSLES.cpp b/submodules/libtgvoip/os/android/AudioInputOpenSLES.cpp
deleted file mode 100644
index 70e7cbafe4..0000000000
--- a/submodules/libtgvoip/os/android/AudioInputOpenSLES.cpp
+++ /dev/null
@@ -1,137 +0,0 @@
-//
-// libtgvoip is free and unencumbered public domain software.
-// For more information, see http://unlicense.org or the UNLICENSE file
-// you should have received with this source code distribution.
-//
-
-#include <stdlib.h>
-#include <stdio.h>
-#include <assert.h>
-
-#include "AudioInputOpenSLES.h"
-#include "../../logging.h"
-#include "OpenSLEngineWrapper.h"
-
-#define CHECK_SL_ERROR(res, msg) if(res!=SL_RESULT_SUCCESS){ LOGE(msg); return; }
-#define BUFFER_SIZE 960 // 20 ms
-
-using namespace tgvoip;
-using namespace tgvoip::audio;
-
-unsigned int AudioInputOpenSLES::nativeBufferSize;
-
-AudioInputOpenSLES::AudioInputOpenSLES(){
-	slEngine=OpenSLEngineWrapper::CreateEngine();
-
-	LOGI("Native buffer size is %u samples", nativeBufferSize);
-	if(nativeBufferSize<BUFFER_SIZE && BUFFER_SIZE % nativeBufferSize!=0){
-		LOGE("20ms is not divisible by native buffer size!!");
-	}else if(nativeBufferSize>BUFFER_SIZE && nativeBufferSize%BUFFER_SIZE!=0){
-		LOGE("native buffer size is not multiple of 20ms!!");
-		nativeBufferSize+=nativeBufferSize%BUFFER_SIZE;
-	}
-	if(nativeBufferSize==BUFFER_SIZE)
-		nativeBufferSize*=2;
-	LOGI("Adjusted native buffer size is %u", nativeBufferSize);
-
-	buffer=(int16_t*)calloc(BUFFER_SIZE, sizeof(int16_t));
-	nativeBuffer=(int16_t*)calloc((size_t) nativeBufferSize, sizeof(int16_t));
-	slRecorderObj=NULL;
-}
-
-AudioInputOpenSLES::~AudioInputOpenSLES(){
-	//Stop();
-	(*slBufferQueue)->Clear(slBufferQueue);
-	(*slRecorderObj)->Destroy(slRecorderObj);
-	slRecorderObj=NULL;
-	slRecorder=NULL;
-	slBufferQueue=NULL;
-	slEngine=NULL;
-	OpenSLEngineWrapper::DestroyEngine();
-	free(buffer);
-	buffer=NULL;
-	free(nativeBuffer);
-	nativeBuffer=NULL;
-}
-
-void AudioInputOpenSLES::BufferCallback(SLAndroidSimpleBufferQueueItf bq, void *context){
-	((AudioInputOpenSLES*)context)->HandleSLCallback();
-}
-
-void AudioInputOpenSLES::Configure(uint32_t sampleRate, uint32_t bitsPerSample, uint32_t channels){
-	assert(slRecorderObj==NULL);
-	SLDataLocator_IODevice loc_dev = {SL_DATALOCATOR_IODEVICE,
-									  SL_IODEVICE_AUDIOINPUT,
-									  SL_DEFAULTDEVICEID_AUDIOINPUT, NULL};
-	SLDataSource audioSrc = {&loc_dev, NULL};
-	SLDataLocator_AndroidSimpleBufferQueue loc_bq =
-			{SL_DATALOCATOR_ANDROIDSIMPLEBUFFERQUEUE, 1};
-	SLDataFormat_PCM format_pcm = {SL_DATAFORMAT_PCM, channels, sampleRate*1000,
-								   SL_PCMSAMPLEFORMAT_FIXED_16, SL_PCMSAMPLEFORMAT_FIXED_16,
-								   channels==2 ? (SL_SPEAKER_FRONT_LEFT | SL_SPEAKER_FRONT_RIGHT) : SL_SPEAKER_FRONT_CENTER, SL_BYTEORDER_LITTLEENDIAN};
-	SLDataSink audioSnk = {&loc_bq, &format_pcm};
-
-	const SLInterfaceID id[2] = {SL_IID_ANDROIDSIMPLEBUFFERQUEUE, SL_IID_ANDROIDCONFIGURATION};
-	const SLboolean req[2] = {SL_BOOLEAN_TRUE, SL_BOOLEAN_TRUE};
-	SLresult result = (*slEngine)->CreateAudioRecorder(slEngine, &slRecorderObj, &audioSrc, &audioSnk, 2, id, req);
-	CHECK_SL_ERROR(result, "Error creating recorder");
-
-	SLAndroidConfigurationItf recorderConfig;
-	result = (*slRecorderObj)->GetInterface(slRecorderObj, SL_IID_ANDROIDCONFIGURATION, &recorderConfig);
-	SLint32 streamType = SL_ANDROID_RECORDING_PRESET_VOICE_RECOGNITION;
-	result = (*recorderConfig)->SetConfiguration(recorderConfig, SL_ANDROID_KEY_RECORDING_PRESET, &streamType, sizeof(SLint32));
-
-	result=(*slRecorderObj)->Realize(slRecorderObj, SL_BOOLEAN_FALSE);
-	CHECK_SL_ERROR(result, "Error realizing recorder");
-
-	result=(*slRecorderObj)->GetInterface(slRecorderObj, SL_IID_RECORD, &slRecorder);
-	CHECK_SL_ERROR(result, "Error getting recorder interface");
-
-	result=(*slRecorderObj)->GetInterface(slRecorderObj, SL_IID_ANDROIDSIMPLEBUFFERQUEUE, &slBufferQueue);
-	CHECK_SL_ERROR(result, "Error getting buffer queue");
-
-	result=(*slBufferQueue)->RegisterCallback(slBufferQueue, AudioInputOpenSLES::BufferCallback, this);
-	CHECK_SL_ERROR(result, "Error setting buffer queue callback");
-
-	(*slBufferQueue)->Enqueue(slBufferQueue, nativeBuffer, nativeBufferSize*sizeof(int16_t));
-}
-
-void AudioInputOpenSLES::Start(){
-	SLresult result=(*slRecorder)->SetRecordState(slRecorder, SL_RECORDSTATE_RECORDING);
-	CHECK_SL_ERROR(result, "Error starting record");
-}
-
-void AudioInputOpenSLES::Stop(){
-	SLresult result=(*slRecorder)->SetRecordState(slRecorder, SL_RECORDSTATE_STOPPED);
-	CHECK_SL_ERROR(result, "Error stopping record");
-}
-
-
-void AudioInputOpenSLES::HandleSLCallback(){
-	//SLmillisecond pMsec = 0;
-	//(*slRecorder)->GetPosition(slRecorder, &pMsec);
-	//LOGI("Callback! pos=%lu", pMsec);
-	//InvokeCallback((unsigned char*)buffer, BUFFER_SIZE*sizeof(int16_t));
-	//fwrite(nativeBuffer, 1, nativeBufferSize*2, test);
-
-	if(nativeBufferSize==BUFFER_SIZE){
-		//LOGV("nativeBufferSize==BUFFER_SIZE");
-		InvokeCallback((unsigned char *) nativeBuffer, BUFFER_SIZE*sizeof(int16_t));
-	}else if(nativeBufferSize<BUFFER_SIZE){
-		//LOGV("nativeBufferSize<BUFFER_SIZE");
-		if(positionInBuffer>=BUFFER_SIZE){
-			InvokeCallback((unsigned char *) buffer, BUFFER_SIZE*sizeof(int16_t));
-			positionInBuffer=0;
-		}
-		memcpy(((unsigned char*)buffer)+positionInBuffer*2, nativeBuffer, (size_t)nativeBufferSize*2);
-		positionInBuffer+=nativeBufferSize;
-	}else if(nativeBufferSize>BUFFER_SIZE){
-		//LOGV("nativeBufferSize>BUFFER_SIZE");
-		for(unsigned int offset=0;offset<nativeBufferSize;offset+=BUFFER_SIZE){
-			InvokeCallback(((unsigned char *) nativeBuffer)+offset*2, BUFFER_SIZE*sizeof(int16_t));
-		}
-	}
-
-	(*slBufferQueue)->Enqueue(slBufferQueue, nativeBuffer, nativeBufferSize*sizeof(int16_t));
-}
-
diff --git a/submodules/libtgvoip/os/android/AudioInputOpenSLES.h b/submodules/libtgvoip/os/android/AudioInputOpenSLES.h
deleted file mode 100644
index 64e196e2e0..0000000000
--- a/submodules/libtgvoip/os/android/AudioInputOpenSLES.h
+++ /dev/null
@@ -1,40 +0,0 @@
-//
-// libtgvoip is free and unencumbered public domain software.
-// For more information, see http://unlicense.org or the UNLICENSE file
-// you should have received with this source code distribution.
-//
-
-#ifndef LIBTGVOIP_AUDIOINPUTOPENSLES_H
-#define LIBTGVOIP_AUDIOINPUTOPENSLES_H
-
-#include <SLES/OpenSLES.h>
-#include <SLES/OpenSLES_Android.h>
-
-#include "../../audio/AudioInput.h"
-
-namespace tgvoip{ namespace audio{
-class AudioInputOpenSLES : public AudioInput{
-
-public:
-	AudioInputOpenSLES();
-	virtual ~AudioInputOpenSLES();
-	virtual void Configure(uint32_t sampleRate, uint32_t bitsPerSample, uint32_t channels);
-	virtual void Start();
-	virtual void Stop();
-
-	static unsigned int nativeBufferSize;
-
-private:
-	static void BufferCallback(SLAndroidSimpleBufferQueueItf bq, void *context);
-	void HandleSLCallback();
-	SLEngineItf slEngine;
-	SLObjectItf slRecorderObj;
-	SLRecordItf slRecorder;
-	SLAndroidSimpleBufferQueueItf slBufferQueue;
-	int16_t* buffer;
-	int16_t* nativeBuffer;
-	size_t positionInBuffer;
-};
-}}
-
-#endif //LIBTGVOIP_AUDIOINPUTOPENSLES_H
diff --git a/submodules/libtgvoip/os/android/AudioOutputAndroid.cpp b/submodules/libtgvoip/os/android/AudioOutputAndroid.cpp
deleted file mode 100644
index c1dc2d5df1..0000000000
--- a/submodules/libtgvoip/os/android/AudioOutputAndroid.cpp
+++ /dev/null
@@ -1,107 +0,0 @@
-//
-// libtgvoip is free and unencumbered public domain software.
-// For more information, see http://unlicense.org or the UNLICENSE file
-// you should have received with this source code distribution.
-//
-
-#include "AudioOutputAndroid.h"
-#include <stdio.h>
-#include "../../logging.h"
-
-extern JavaVM* sharedJVM;
-
-using namespace tgvoip;
-using namespace tgvoip::audio;
-
-jmethodID AudioOutputAndroid::initMethod=NULL;
-jmethodID AudioOutputAndroid::releaseMethod=NULL;
-jmethodID AudioOutputAndroid::startMethod=NULL;
-jmethodID AudioOutputAndroid::stopMethod=NULL;
-jclass AudioOutputAndroid::jniClass=NULL;
-
-AudioOutputAndroid::AudioOutputAndroid(){
-	JNIEnv* env=NULL;
-	bool didAttach=false;
-	sharedJVM->GetEnv((void**) &env, JNI_VERSION_1_6);
-	if(!env){
-		sharedJVM->AttachCurrentThread(&env, NULL);
-		didAttach=true;
-	}
-
-	jmethodID ctor=env->GetMethodID(jniClass, "<init>", "(J)V");
-	jobject obj=env->NewObject(jniClass, ctor, (jlong)(intptr_t)this);
-	javaObject=env->NewGlobalRef(obj);
-
-	env->CallVoidMethod(javaObject, initMethod, 48000, 16, 1, 960*2);
-
-	if(didAttach){
-		sharedJVM->DetachCurrentThread();
-	}
-	running=false;
-}
-
-AudioOutputAndroid::~AudioOutputAndroid(){
-	JNIEnv* env=NULL;
-	bool didAttach=false;
-	sharedJVM->GetEnv((void**) &env, JNI_VERSION_1_6);
-	if(!env){
-		sharedJVM->AttachCurrentThread(&env, NULL);
-		didAttach=true;
-	}
-
-	env->CallVoidMethod(javaObject, releaseMethod);
-	env->DeleteGlobalRef(javaObject);
-	javaObject=NULL;
-
-	if(didAttach){
-		sharedJVM->DetachCurrentThread();
-	}
-}
-
-void AudioOutputAndroid::Start(){
-	JNIEnv* env=NULL;
-	bool didAttach=false;
-	sharedJVM->GetEnv((void**) &env, JNI_VERSION_1_6);
-	if(!env){
-		sharedJVM->AttachCurrentThread(&env, NULL);
-		didAttach=true;
-	}
-
-	env->CallVoidMethod(javaObject, startMethod);
-
-	if(didAttach){
-		sharedJVM->DetachCurrentThread();
-	}
-	running=true;
-}
-
-void AudioOutputAndroid::Stop(){
-	running=false;
-	JNIEnv* env=NULL;
-	bool didAttach=false;
-	sharedJVM->GetEnv((void**) &env, JNI_VERSION_1_6);
-	if(!env){
-		sharedJVM->AttachCurrentThread(&env, NULL);
-		didAttach=true;
-	}
-
-	env->CallVoidMethod(javaObject, stopMethod);
-
-	if(didAttach){
-		sharedJVM->DetachCurrentThread();
-	}
-}
-
-void AudioOutputAndroid::HandleCallback(JNIEnv* env, jbyteArray buffer){
-	if(!running)
-		return;
-	unsigned char* buf=(unsigned char*) env->GetByteArrayElements(buffer, NULL);
-	size_t len=(size_t) env->GetArrayLength(buffer);
-	InvokeCallback(buf, len);
-	env->ReleaseByteArrayElements(buffer, (jbyte *) buf, 0);
-}
-
-
-bool AudioOutputAndroid::IsPlaying(){
-	return running;
-}
diff --git a/submodules/libtgvoip/os/android/AudioOutputAndroid.h b/submodules/libtgvoip/os/android/AudioOutputAndroid.h
deleted file mode 100644
index dded47fb49..0000000000
--- a/submodules/libtgvoip/os/android/AudioOutputAndroid.h
+++ /dev/null
@@ -1,37 +0,0 @@
-//
-// libtgvoip is free and unencumbered public domain software.
-// For more information, see http://unlicense.org or the UNLICENSE file
-// you should have received with this source code distribution.
-//
-
-#ifndef LIBTGVOIP_AUDIOOUTPUTANDROID_H
-#define LIBTGVOIP_AUDIOOUTPUTANDROID_H
-
-#include <jni.h>
-#include "../../audio/AudioOutput.h"
-
-namespace tgvoip{ namespace audio{
-class AudioOutputAndroid : public AudioOutput{
-
-public:
-
-	AudioOutputAndroid();
-	virtual ~AudioOutputAndroid();
-	virtual void Start();
-	virtual void Stop();
-	virtual bool IsPlaying() override;
-	void HandleCallback(JNIEnv* env, jbyteArray buffer);
-	static jmethodID initMethod;
-	static jmethodID releaseMethod;
-	static jmethodID startMethod;
-	static jmethodID stopMethod;
-	static jclass jniClass;
-
-private:
-	jobject javaObject;
-	bool running;
-
-};
-}}
-
-#endif //LIBTGVOIP_AUDIOOUTPUTANDROID_H
diff --git a/submodules/libtgvoip/os/android/AudioOutputOpenSLES.cpp b/submodules/libtgvoip/os/android/AudioOutputOpenSLES.cpp
deleted file mode 100644
index 94ccf12717..0000000000
--- a/submodules/libtgvoip/os/android/AudioOutputOpenSLES.cpp
+++ /dev/null
@@ -1,171 +0,0 @@
-//
-// libtgvoip is free and unencumbered public domain software.
-// For more information, see http://unlicense.org or the UNLICENSE file
-// you should have received with this source code distribution.
-//
-
-#include <sys/time.h>
-#include <unistd.h>
-#include <assert.h>
-#include "AudioOutputOpenSLES.h"
-#include "../../logging.h"
-#include "../../VoIPController.h"
-#include "OpenSLEngineWrapper.h"
-#include "AudioInputAndroid.h"
-
-#define CHECK_SL_ERROR(res, msg) if(res!=SL_RESULT_SUCCESS){ LOGE(msg); failed=true; return; }
-#define BUFFER_SIZE 960 // 20 ms
-
-using namespace tgvoip;
-using namespace tgvoip::audio;
-
-unsigned int AudioOutputOpenSLES::nativeBufferSize;
-
-AudioOutputOpenSLES::AudioOutputOpenSLES(){
-	SLresult result;
-	slEngine=OpenSLEngineWrapper::CreateEngine();
-
-	const SLInterfaceID pOutputMixIDs[] = {};
-	const SLboolean pOutputMixRequired[] = {};
-	result = (*slEngine)->CreateOutputMix(slEngine, &slOutputMixObj, 0, pOutputMixIDs, pOutputMixRequired);
-	CHECK_SL_ERROR(result, "Error creating output mix");
-
-	result = (*slOutputMixObj)->Realize(slOutputMixObj, SL_BOOLEAN_FALSE);
-	CHECK_SL_ERROR(result, "Error realizing output mix");
-
-	LOGI("Native buffer size is %u samples", nativeBufferSize);
-	/*if(nativeBufferSize<BUFFER_SIZE && BUFFER_SIZE % nativeBufferSize!=0){
-		LOGE("20ms is not divisible by native buffer size!!");
-		nativeBufferSize=BUFFER_SIZE;
-	}else if(nativeBufferSize>BUFFER_SIZE && nativeBufferSize%BUFFER_SIZE!=0){
-		LOGE("native buffer size is not multiple of 20ms!!");
-		nativeBufferSize+=nativeBufferSize%BUFFER_SIZE;
-	}
-	LOGI("Adjusted native buffer size is %u", nativeBufferSize);*/
-
-	buffer=(int16_t*)calloc(BUFFER_SIZE, sizeof(int16_t));
-	nativeBuffer=(int16_t*)calloc((size_t) nativeBufferSize, sizeof(int16_t));
-	slPlayerObj=NULL;
-	remainingDataSize=0;
-}
-
-AudioOutputOpenSLES::~AudioOutputOpenSLES(){
-	if(!stopped)
-		Stop();
-	(*slBufferQueue)->Clear(slBufferQueue);
-	LOGV("destroy slPlayerObj");
-	(*slPlayerObj)->Destroy(slPlayerObj);
-	LOGV("destroy slOutputMixObj");
-	(*slOutputMixObj)->Destroy(slOutputMixObj);
-	OpenSLEngineWrapper::DestroyEngine();
-	free(buffer);
-	free(nativeBuffer);
-}
-
-
-void AudioOutputOpenSLES::SetNativeBufferSize(unsigned int size){
-	AudioOutputOpenSLES::nativeBufferSize=size;
-}
-
-void AudioOutputOpenSLES::BufferCallback(SLAndroidSimpleBufferQueueItf bq, void *context){
-	((AudioOutputOpenSLES*)context)->HandleSLCallback();
-}
-
-void AudioOutputOpenSLES::Configure(uint32_t sampleRate, uint32_t bitsPerSample, uint32_t channels){
-	assert(slPlayerObj==NULL);
-	SLDataLocator_AndroidSimpleBufferQueue locatorBufferQueue =
-			{SL_DATALOCATOR_ANDROIDSIMPLEBUFFERQUEUE, 1};
-	SLDataFormat_PCM formatPCM = {SL_DATAFORMAT_PCM, channels, sampleRate*1000,
-								   SL_PCMSAMPLEFORMAT_FIXED_16, SL_PCMSAMPLEFORMAT_FIXED_16,
-								   channels==2 ? (SL_SPEAKER_FRONT_LEFT | SL_SPEAKER_FRONT_RIGHT) : SL_SPEAKER_FRONT_CENTER, SL_BYTEORDER_LITTLEENDIAN};
-	SLDataSource audioSrc = {&locatorBufferQueue, &formatPCM};
-	SLDataLocator_OutputMix locatorOutMix = {SL_DATALOCATOR_OUTPUTMIX, slOutputMixObj};
-	SLDataSink audioSnk = {&locatorOutMix, NULL};
-
-	const SLInterfaceID id[2] = {SL_IID_BUFFERQUEUE, SL_IID_ANDROIDCONFIGURATION};
-	const SLboolean req[2] = {SL_BOOLEAN_TRUE, SL_BOOLEAN_TRUE};
-	SLresult result = (*slEngine)->CreateAudioPlayer(slEngine, &slPlayerObj, &audioSrc, &audioSnk, 2, id, req);
-	CHECK_SL_ERROR(result, "Error creating player");
-
-
-	SLAndroidConfigurationItf playerConfig;
-	result = (*slPlayerObj)->GetInterface(slPlayerObj, SL_IID_ANDROIDCONFIGURATION, &playerConfig);
-	SLint32 streamType = SL_ANDROID_STREAM_VOICE;
-	result = (*playerConfig)->SetConfiguration(playerConfig, SL_ANDROID_KEY_STREAM_TYPE, &streamType, sizeof(SLint32));
-
-
-	result=(*slPlayerObj)->Realize(slPlayerObj, SL_BOOLEAN_FALSE);
-	CHECK_SL_ERROR(result, "Error realizing player");
-
-	result=(*slPlayerObj)->GetInterface(slPlayerObj, SL_IID_PLAY, &slPlayer);
-	CHECK_SL_ERROR(result, "Error getting player interface");
-
-	result=(*slPlayerObj)->GetInterface(slPlayerObj, SL_IID_ANDROIDSIMPLEBUFFERQUEUE, &slBufferQueue);
-	CHECK_SL_ERROR(result, "Error getting buffer queue");
-
-	result=(*slBufferQueue)->RegisterCallback(slBufferQueue, AudioOutputOpenSLES::BufferCallback, this);
-	CHECK_SL_ERROR(result, "Error setting buffer queue callback");
-
-	(*slBufferQueue)->Enqueue(slBufferQueue, nativeBuffer, nativeBufferSize*sizeof(int16_t));
-}
-
-bool AudioOutputOpenSLES::IsPhone(){
-	return false;
-}
-
-void AudioOutputOpenSLES::EnableLoudspeaker(bool enabled){
-
-}
-
-void AudioOutputOpenSLES::Start(){
-	stopped=false;
-	SLresult result=(*slPlayer)->SetPlayState(slPlayer, SL_PLAYSTATE_PLAYING);
-	CHECK_SL_ERROR(result, "Error starting player");
-}
-
-void AudioOutputOpenSLES::Stop(){
-	stopped=true;
-	LOGV("Stopping OpenSL output");
-	SLresult result=(*slPlayer)->SetPlayState(slPlayer, SL_PLAYSTATE_PAUSED);
-	CHECK_SL_ERROR(result, "Error starting player");
-}
-
-void AudioOutputOpenSLES::HandleSLCallback(){
-	/*if(stopped){
-		//LOGV("left HandleSLCallback early");
-		return;
-	}*/
-	//LOGV("before InvokeCallback");
-	if(!stopped){
-		while(remainingDataSize<nativeBufferSize*2){
-			assert(remainingDataSize+BUFFER_SIZE*2<10240);
-			InvokeCallback(remainingData+remainingDataSize, BUFFER_SIZE*2);
-			remainingDataSize+=BUFFER_SIZE*2;
-		}
-		memcpy(nativeBuffer, remainingData, nativeBufferSize*2);
-		remainingDataSize-=nativeBufferSize*2;
-		if(remainingDataSize>0)
-			memmove(remainingData, remainingData+nativeBufferSize*2, remainingDataSize);
-		//InvokeCallback((unsigned char *) nativeBuffer, nativeBufferSize*sizeof(int16_t));
-	}else{
-		memset(nativeBuffer, 0, nativeBufferSize*2);
-	}
-
-	(*slBufferQueue)->Enqueue(slBufferQueue, nativeBuffer, nativeBufferSize*sizeof(int16_t));
-	//LOGV("left HandleSLCallback");
-}
-
-
-bool AudioOutputOpenSLES::IsPlaying(){
-	if(slPlayer){
-		uint32_t state;
-		(*slPlayer)->GetPlayState(slPlayer, &state);
-		return state==SL_PLAYSTATE_PLAYING;
-	}
-	return false;
-}
-
-
-float AudioOutputOpenSLES::GetLevel(){
-	return 0; // we don't use this anyway
-}
\ No newline at end of file
diff --git a/submodules/libtgvoip/os/android/AudioOutputOpenSLES.h b/submodules/libtgvoip/os/android/AudioOutputOpenSLES.h
deleted file mode 100644
index cfca089095..0000000000
--- a/submodules/libtgvoip/os/android/AudioOutputOpenSLES.h
+++ /dev/null
@@ -1,47 +0,0 @@
-//
-// libtgvoip is free and unencumbered public domain software.
-// For more information, see http://unlicense.org or the UNLICENSE file
-// you should have received with this source code distribution.
-//
-
-#ifndef LIBTGVOIP_AUDIOOUTPUTOPENSLES_H
-#define LIBTGVOIP_AUDIOOUTPUTOPENSLES_H
-
-#include <SLES/OpenSLES.h>
-#include <SLES/OpenSLES_Android.h>
-
-#include "../../audio/AudioOutput.h"
-
-namespace tgvoip{ namespace audio{
-class AudioOutputOpenSLES : public AudioOutput{
-public:
-	AudioOutputOpenSLES();
-	virtual ~AudioOutputOpenSLES();
-	virtual void Configure(uint32_t sampleRate, uint32_t bitsPerSample, uint32_t channels);
-	virtual bool IsPhone();
-	virtual void EnableLoudspeaker(bool enabled);
-	virtual void Start();
-	virtual void Stop();
-	virtual bool IsPlaying();
-	virtual float GetLevel();
-
-	static void SetNativeBufferSize(unsigned int size);
-	static unsigned int nativeBufferSize;
-
-private:
-	static void BufferCallback(SLAndroidSimpleBufferQueueItf bq, void *context);
-	void HandleSLCallback();
-	SLEngineItf slEngine;
-	SLObjectItf slPlayerObj;
-	SLObjectItf slOutputMixObj;
-	SLPlayItf slPlayer;
-	SLAndroidSimpleBufferQueueItf slBufferQueue;
-	int16_t* buffer;
-	int16_t* nativeBuffer;
-	bool stopped;
-	unsigned char remainingData[10240];
-	size_t remainingDataSize;
-};
-}}
-
-#endif //LIBTGVOIP_AUDIOOUTPUTANDROID_H
diff --git a/submodules/libtgvoip/os/android/JNIUtilities.h b/submodules/libtgvoip/os/android/JNIUtilities.h
deleted file mode 100644
index 0735e88f4e..0000000000
--- a/submodules/libtgvoip/os/android/JNIUtilities.h
+++ /dev/null
@@ -1,66 +0,0 @@
-//
-// Created by Grishka on 15.08.2018.
-//
-
-#ifndef LIBTGVOIP_JNIUTILITIES_H
-#define LIBTGVOIP_JNIUTILITIES_H
-
-#include <functional>
-#include <jni.h>
-#include <stdarg.h>
-#include <string>
-#include "../../Buffers.h"
-
-extern JavaVM* sharedJVM;
-
-namespace tgvoip{
-	namespace jni{
-
-		inline void DoWithJNI(std::function<void(JNIEnv*)> f){
-			JNIEnv *env=NULL;
-			bool didAttach=false;
-			sharedJVM->GetEnv((void **) &env, JNI_VERSION_1_6);
-			if(!env){
-				sharedJVM->AttachCurrentThread(&env, NULL);
-				didAttach=true;
-			}
-
-			f(env);
-
-			if(didAttach){
-				sharedJVM->DetachCurrentThread();
-			}
-		}
-
-		inline void AttachAndCallVoidMethod(jmethodID method, jobject obj, ...){
-			if(!method || !obj)
-				return;
-			va_list va;
-			va_start(va, obj);
-			DoWithJNI([&va, method, obj](JNIEnv* env){
-				env->CallVoidMethodV(obj, method, va);
-			});
-			va_end(va);
-		}
-
-		inline std::string JavaStringToStdString(JNIEnv* env, jstring jstr){
-			if(!jstr)
-				return "";
-			const char* jchars=env->GetStringUTFChars(jstr, NULL);
-			std::string str(jchars);
-			env->ReleaseStringUTFChars(jstr, jchars);
-			return str;
-		}
-
-		inline jbyteArray BufferToByteArray(JNIEnv* env, Buffer& buf){
-			jbyteArray arr=env->NewByteArray((jsize)buf.Length());
-			jbyte* elements=env->GetByteArrayElements(arr, NULL);
-			memcpy(elements, *buf, buf.Length());
-			env->ReleaseByteArrayElements(arr, elements, 0);
-			return arr;
-		}
-
-	}
-}
-
-#endif //LIBTGVOIP_JNIUTILITIES_H
diff --git a/submodules/libtgvoip/os/android/OpenSLEngineWrapper.cpp b/submodules/libtgvoip/os/android/OpenSLEngineWrapper.cpp
deleted file mode 100644
index 0869707261..0000000000
--- a/submodules/libtgvoip/os/android/OpenSLEngineWrapper.cpp
+++ /dev/null
@@ -1,48 +0,0 @@
-//
-// libtgvoip is free and unencumbered public domain software.
-// For more information, see http://unlicense.org or the UNLICENSE file
-// you should have received with this source code distribution.
-//
-
-#include <cstddef>
-#include "OpenSLEngineWrapper.h"
-#include "../../logging.h"
-
-#define CHECK_SL_ERROR(res, msg) if(res!=SL_RESULT_SUCCESS){ LOGE(msg); return NULL; }
-
-using namespace tgvoip;
-using namespace tgvoip::audio;
-
-
-SLObjectItf OpenSLEngineWrapper::sharedEngineObj=NULL;
-SLEngineItf OpenSLEngineWrapper::sharedEngine=NULL;
-int OpenSLEngineWrapper::count=0;
-
-void OpenSLEngineWrapper::DestroyEngine(){
-	count--;
-	LOGI("release: engine instance count %d", count);
-	if(count==0){
-		(*sharedEngineObj)->Destroy(sharedEngineObj);
-		sharedEngineObj=NULL;
-		sharedEngine=NULL;
-	}
-	LOGI("after release");
-}
-
-SLEngineItf OpenSLEngineWrapper::CreateEngine(){
-	count++;
-	if(sharedEngine)
-		return sharedEngine;
-	const SLInterfaceID pIDs[1] = {SL_IID_ENGINE};
-	const SLboolean pIDsRequired[1]  = {SL_BOOLEAN_TRUE};
-	SLresult result = slCreateEngine(&sharedEngineObj, 0, NULL, 1, pIDs, pIDsRequired);
-	CHECK_SL_ERROR(result, "Error creating engine");
-
-	result=(*sharedEngineObj)->Realize(sharedEngineObj, SL_BOOLEAN_FALSE);
-	CHECK_SL_ERROR(result, "Error realizing engine");
-
-	result = (*sharedEngineObj)->GetInterface(sharedEngineObj, SL_IID_ENGINE, &sharedEngine);
-	CHECK_SL_ERROR(result, "Error getting engine interface");
-	return sharedEngine;
-}
-
diff --git a/submodules/libtgvoip/os/android/OpenSLEngineWrapper.h b/submodules/libtgvoip/os/android/OpenSLEngineWrapper.h
deleted file mode 100644
index ff09586027..0000000000
--- a/submodules/libtgvoip/os/android/OpenSLEngineWrapper.h
+++ /dev/null
@@ -1,26 +0,0 @@
-//
-// libtgvoip is free and unencumbered public domain software.
-// For more information, see http://unlicense.org or the UNLICENSE file
-// you should have received with this source code distribution.
-//
-
-#ifndef LIBTGVOIP_OPENSLENGINEWRAPPER_H
-#define LIBTGVOIP_OPENSLENGINEWRAPPER_H
-
-#include <SLES/OpenSLES.h>
-#include <SLES/OpenSLES_Android.h>
-
-namespace tgvoip{ namespace audio{
-class OpenSLEngineWrapper{
-public:
-	static SLEngineItf CreateEngine();
-	static void DestroyEngine();
-
-private:
-	static SLObjectItf sharedEngineObj;
-	static SLEngineItf sharedEngine;
-	static int count;
-};
-}}
-
-#endif //LIBTGVOIP_OPENSLENGINEWRAPPER_H
diff --git a/submodules/libtgvoip/os/android/VideoRendererAndroid.cpp b/submodules/libtgvoip/os/android/VideoRendererAndroid.cpp
deleted file mode 100644
index 2d097db6ae..0000000000
--- a/submodules/libtgvoip/os/android/VideoRendererAndroid.cpp
+++ /dev/null
@@ -1,137 +0,0 @@
-//
-// Created by Grishka on 12.08.2018.
-//
-
-#include "VideoRendererAndroid.h"
-#include "JNIUtilities.h"
-#include "../../PrivateDefines.h"
-#include "../../logging.h"
-
-using namespace tgvoip;
-using namespace tgvoip::video;
-
-jmethodID VideoRendererAndroid::resetMethod=NULL;
-jmethodID VideoRendererAndroid::decodeAndDisplayMethod=NULL;
-jmethodID VideoRendererAndroid::setStreamEnabledMethod=NULL;
-std::vector<uint32_t> VideoRendererAndroid::availableDecoders;
-int VideoRendererAndroid::maxResolution;
-
-extern JavaVM* sharedJVM;
-
-VideoRendererAndroid::VideoRendererAndroid(jobject jobj) : queue(50){
-	this->jobj=jobj;
-}
-
-VideoRendererAndroid::~VideoRendererAndroid(){
-	running=false;
-	Request req{
-		Buffer(0),
-		Request::Type::Shutdown
-	};
-	queue.Put(std::move(req));
-	thread->Join();
-	delete thread;
-	/*decoderThread.Post([this]{
-		decoderEnv->DeleteGlobalRef(jobj);
-	});*/
-}
-
-void VideoRendererAndroid::Reset(uint32_t codec, unsigned int width, unsigned int height, std::vector<Buffer> &_csd){
-	csd.clear();
-	for(Buffer& b:_csd){
-		csd.push_back(Buffer::CopyOf(b));
-	}
-	this->codec=codec;
-	this->width=width;
-	this->height=height;
-	Request req{
-			Buffer(0),
-			Request::Type::ResetDecoder
-	};
-	queue.Put(std::move(req));
-	Request req2{
-		Buffer(0),
-		Request::Type::UpdateStreamState
-	};
-	queue.Put(std::move(req2));
-	
-	if(!thread){
-		thread=new Thread(std::bind(&VideoRendererAndroid::RunThread, this));
-		thread->Start();
-	}
-}
-
-void VideoRendererAndroid::DecodeAndDisplay(Buffer frame, uint32_t pts){
-	/*decoderThread.Post(std::bind([this](Buffer frame){
-	}, std::move(frame)));*/
-	//LOGV("2 before decode %u", (unsigned int)frame.Length());
-	Request req{
-		std::move(frame),
-		Request::Type::DecodeFrame
-	};
-	queue.Put(std::move(req));
-}
-
-void VideoRendererAndroid::RunThread(){
-	JNIEnv* env;
-	sharedJVM->AttachCurrentThread(&env, NULL);
-
-	constexpr size_t bufferSize=200*1024;
-	unsigned char* buf=reinterpret_cast<unsigned char*>(malloc(bufferSize));
-	jobject jbuf=env->NewDirectByteBuffer(buf, bufferSize);
-
-	while(running){
-		//LOGV("before get from queue");
-		Request request=std::move(queue.GetBlocking());
-		//LOGV("1 before decode %u", (unsigned int)request.Length());
-		if(request.type==Request::Type::Shutdown){
-			LOGI("Shutting down video decoder thread");
-			break;
-		}else if(request.type==Request::Type::DecodeFrame){
-			if(request.buffer.Length()>bufferSize){
-				LOGE("Frame data is too long (%u, max %u)", (int) request.buffer.Length(), (int) bufferSize);
-			}else{
-				memcpy(buf, *request.buffer, request.buffer.Length());
-				env->CallVoidMethod(jobj, decodeAndDisplayMethod, jbuf, (jint) request.buffer.Length(), 0);
-			}
-		}else if(request.type==Request::Type::ResetDecoder){
-			jobjectArray jcsd=NULL;
-			if(!csd.empty()){
-				jcsd=env->NewObjectArray((jsize)csd.size(), env->FindClass("[B"), NULL);
-				jsize i=0;
-				for(Buffer& b:csd){
-					env->SetObjectArrayElement(jcsd, i, jni::BufferToByteArray(env, b));
-					i++;
-				}
-			}
-			std::string codecStr="";
-			switch(codec){
-				case CODEC_AVC:
-					codecStr="video/avc";
-					break;
-				case CODEC_HEVC:
-					codecStr="video/hevc";
-					break;
-				case CODEC_VP8:
-					codecStr="video/x-vnd.on2.vp8";
-					break;
-				case CODEC_VP9:
-					codecStr="video/x-vnd.on2.vp9";
-					break;
-			}
-			env->CallVoidMethod(jobj, resetMethod, env->NewStringUTF(codecStr.c_str()), (jint)width, (jint)height, jcsd);
-		}else if(request.type==Request::Type::UpdateStreamState){
-			env->CallVoidMethod(jobj, setStreamEnabledMethod, streamEnabled);
-		}
-	}
-	free(buf);
-	sharedJVM->DetachCurrentThread();
-	LOGI("==== decoder thread exiting ====");
-}
-
-void VideoRendererAndroid::SetStreamEnabled(bool enabled){
-	LOGI("Video stream state: %d", enabled);
-	/*decoderThread.Post([=](){
-		decoderEnv->CallVoidMethod(jobj, setStreamEnabledMethod, enabled);
-	});*/
-}
diff --git a/submodules/libtgvoip/os/android/VideoRendererAndroid.h b/submodules/libtgvoip/os/android/VideoRendererAndroid.h
deleted file mode 100644
index 595346a2ac..0000000000
--- a/submodules/libtgvoip/os/android/VideoRendererAndroid.h
+++ /dev/null
@@ -1,55 +0,0 @@
-//
-// Created by Grishka on 12.08.2018.
-//
-
-#ifndef LIBTGVOIP_VIDEORENDERERANDROID_H
-#define LIBTGVOIP_VIDEORENDERERANDROID_H
-
-#include "../../video/VideoRenderer.h"
-#include "../../MessageThread.h"
-
-#include <jni.h>
-#include "../../BlockingQueue.h"
-
-namespace tgvoip{
-	namespace video{
-		class VideoRendererAndroid : public VideoRenderer{
-		public:
-			VideoRendererAndroid(jobject jobj);
-			virtual ~VideoRendererAndroid();
-			virtual void Reset(uint32_t codec, unsigned int width, unsigned int height, std::vector<Buffer>& csd) override;
-			virtual void DecodeAndDisplay(Buffer frame, uint32_t pts) override;
-			virtual void SetStreamEnabled(bool enabled) override;
-
-			static jmethodID resetMethod;
-			static jmethodID decodeAndDisplayMethod;
-			static jmethodID setStreamEnabledMethod;
-			static std::vector<uint32_t> availableDecoders;
-			static int maxResolution;
-		private:
-			struct Request{
-				enum Type{
-					DecodeFrame,
-					ResetDecoder,
-					UpdateStreamState,
-					Shutdown
-				};
-
-				Buffer buffer;
-				Type type;
-			};
-			void RunThread();
-			Thread* thread=NULL;
-			bool running=true;
-			BlockingQueue<Request> queue;
-			std::vector<Buffer> csd;
-			int width;
-			int height;
-			bool streamEnabled=true;
-			uint32_t codec;
-			jobject jobj;
-		};
-	}
-}
-
-#endif //LIBTGVOIP_VIDEORENDERERANDROID_H
diff --git a/submodules/libtgvoip/os/android/VideoSourceAndroid.cpp b/submodules/libtgvoip/os/android/VideoSourceAndroid.cpp
deleted file mode 100644
index 904278b06f..0000000000
--- a/submodules/libtgvoip/os/android/VideoSourceAndroid.cpp
+++ /dev/null
@@ -1,88 +0,0 @@
-//
-// Created by Grishka on 12.08.2018.
-//
-
-#include "VideoSourceAndroid.h"
-#include "JNIUtilities.h"
-#include "../../logging.h"
-#include "../../PrivateDefines.h"
-
-using namespace tgvoip;
-using namespace tgvoip::video;
-
-extern JavaVM* sharedJVM;
-
-std::vector<uint32_t> VideoSourceAndroid::availableEncoders;
-
-VideoSourceAndroid::VideoSourceAndroid(jobject jobj) : javaObject(jobj){
-	jni::DoWithJNI([&](JNIEnv* env){
-		jclass cls=env->GetObjectClass(javaObject);
-		startMethod=env->GetMethodID(cls, "start", "()V");
-		stopMethod=env->GetMethodID(cls, "stop", "()V");
-		prepareEncoderMethod=env->GetMethodID(cls, "prepareEncoder", "(Ljava/lang/String;I)V");
-		requestKeyFrameMethod=env->GetMethodID(cls, "requestKeyFrame", "()V");
-		setBitrateMethod=env->GetMethodID(cls, "setBitrate", "(I)V");
-	});
-}
-
-VideoSourceAndroid::~VideoSourceAndroid(){
-	jni::DoWithJNI([this](JNIEnv* env){
-		env->DeleteGlobalRef(javaObject);
-	});
-}
-
-void VideoSourceAndroid::Start(){
-	jni::DoWithJNI([this](JNIEnv* env){
-		env->CallVoidMethod(javaObject, startMethod);
-	});
-}
-
-void VideoSourceAndroid::Stop(){
-	jni::DoWithJNI([this](JNIEnv* env){
-		env->CallVoidMethod(javaObject, stopMethod);
-	});
-}
-
-void VideoSourceAndroid::SendFrame(Buffer frame, uint32_t flags){
-	callback(frame, flags);
-}
-
-void VideoSourceAndroid::SetStreamParameters(std::vector<Buffer> csd, unsigned int width, unsigned int height){
-	LOGD("Video stream parameters: %d x %d", width, height);
-	this->width=width;
-	this->height=height;
-	this->csd=std::move(csd);
-}
-
-void VideoSourceAndroid::Reset(uint32_t codec, int maxResolution){
-	jni::DoWithJNI([&](JNIEnv* env){
-		std::string codecStr="";
-		switch(codec){
-			case CODEC_AVC:
-				codecStr="video/avc";
-				break;
-			case CODEC_HEVC:
-				codecStr="video/hevc";
-				break;
-			case CODEC_VP8:
-				codecStr="video/x-vnd.on2.vp8";
-				break;
-			case CODEC_VP9:
-				codecStr="video/x-vnd.on2.vp9";
-				break;
-		}
-		env->CallVoidMethod(javaObject, prepareEncoderMethod, env->NewStringUTF(codecStr.c_str()), maxResolution);
-	});
-}
-
-void VideoSourceAndroid::RequestKeyFrame(){
-	jni::DoWithJNI([this](JNIEnv* env){
-		env->CallVoidMethod(javaObject, requestKeyFrameMethod);
-	});
-}
-
-void VideoSourceAndroid::SetBitrate(uint32_t bitrate){
-	jni::DoWithJNI([&](JNIEnv* env){
-		env->CallVoidMethod(javaObject, setBitrateMethod, (jint)bitrate);
-	});
-}
diff --git a/submodules/libtgvoip/os/android/VideoSourceAndroid.h b/submodules/libtgvoip/os/android/VideoSourceAndroid.h
deleted file mode 100644
index b67bc8e686..0000000000
--- a/submodules/libtgvoip/os/android/VideoSourceAndroid.h
+++ /dev/null
@@ -1,40 +0,0 @@
-//
-// Created by Grishka on 12.08.2018.
-//
-
-#ifndef LIBTGVOIP_VIDEOSOURCEANDROID_H
-#define LIBTGVOIP_VIDEOSOURCEANDROID_H
-
-#include "../../video/VideoSource.h"
-#include "../../Buffers.h"
-#include <jni.h>
-#include <vector>
-
-namespace tgvoip{
-	namespace video{
-		class VideoSourceAndroid : public VideoSource{
-		public:
-			VideoSourceAndroid(jobject jobj);
-			virtual ~VideoSourceAndroid();
-			virtual void Start() override;
-			virtual void Stop() override;
-			virtual void Reset(uint32_t codec, int maxResolution) override;
-			void SendFrame(Buffer frame, uint32_t flags);
-			void SetStreamParameters(std::vector<Buffer> csd, unsigned int width, unsigned int height);
-			virtual void RequestKeyFrame() override;
-			virtual void SetBitrate(uint32_t bitrate) override;
-
-			static std::vector<uint32_t> availableEncoders;
-		private:
-			jobject javaObject;
-			jmethodID prepareEncoderMethod;
-			jmethodID startMethod;
-			jmethodID stopMethod;
-			jmethodID requestKeyFrameMethod;
-			jmethodID setBitrateMethod;
-		};
-	}
-}
-
-
-#endif //LIBTGVOIP_VIDEOSOURCEANDROID_H
diff --git a/submodules/libtgvoip/os/darwin/AudioInputAudioUnit.cpp b/submodules/libtgvoip/os/darwin/AudioInputAudioUnit.cpp
deleted file mode 100644
index 3f8042677c..0000000000
--- a/submodules/libtgvoip/os/darwin/AudioInputAudioUnit.cpp
+++ /dev/null
@@ -1,73 +0,0 @@
-//
-// libtgvoip is free and unencumbered public domain software.
-// For more information, see http://unlicense.org or the UNLICENSE file
-// you should have received with this source code distribution.
-//
-
-#include <stdlib.h>
-#include <stdio.h>
-#include <assert.h>
-#include "AudioUnitIO.h"
-#include "AudioInputAudioUnit.h"
-#include "../../logging.h"
-
-#define BUFFER_SIZE 960
-
-using namespace tgvoip;
-using namespace tgvoip::audio;
-
-AudioInputAudioUnit::AudioInputAudioUnit(std::string deviceID, AudioUnitIO* io){
-	remainingDataSize=0;
-	isRecording=false;
-	this->io=io;
-#if TARGET_OS_OSX
-	io->SetCurrentDevice(true, deviceID);
-#endif
-}
-
-AudioInputAudioUnit::~AudioInputAudioUnit(){
-	
-}
-
-void AudioInputAudioUnit::Start(){
-	isRecording=true;
-	io->EnableInput(true);
-}
-
-void AudioInputAudioUnit::Stop(){
-	isRecording=false;
-	io->EnableInput(false);
-}
-
-void AudioInputAudioUnit::HandleBufferCallback(AudioBufferList *ioData){
-	int i;
-	for(i=0;i<ioData->mNumberBuffers;i++){
-		AudioBuffer buf=ioData->mBuffers[i];
-#if TARGET_OS_OSX
-		assert(remainingDataSize+buf.mDataByteSize/2<10240);
-		float* src=reinterpret_cast<float*>(buf.mData);
-		int16_t* dst=reinterpret_cast<int16_t*>(remainingData+remainingDataSize);
-		for(int j=0;j<buf.mDataByteSize/4;j++){
-			dst[j]=(int16_t)(src[j]*INT16_MAX);
-		}
-		remainingDataSize+=buf.mDataByteSize/2;
-#else
-		assert(remainingDataSize+buf.mDataByteSize<10240);
-		memcpy(remainingData+remainingDataSize, buf.mData, buf.mDataByteSize);
-		remainingDataSize+=buf.mDataByteSize;
-#endif
-		while(remainingDataSize>=BUFFER_SIZE*2){
-			InvokeCallback((unsigned char*)remainingData, BUFFER_SIZE*2);
-			remainingDataSize-=BUFFER_SIZE*2;
-			if(remainingDataSize>0){
-				memmove(remainingData, remainingData+(BUFFER_SIZE*2), remainingDataSize);
-			}
-		}
-	}
-}
-
-#if TARGET_OS_OSX
-void AudioInputAudioUnit::SetCurrentDevice(std::string deviceID){
-	io->SetCurrentDevice(true, deviceID);
-}
-#endif
diff --git a/submodules/libtgvoip/os/darwin/AudioInputAudioUnit.h b/submodules/libtgvoip/os/darwin/AudioInputAudioUnit.h
deleted file mode 100644
index a00b50064c..0000000000
--- a/submodules/libtgvoip/os/darwin/AudioInputAudioUnit.h
+++ /dev/null
@@ -1,38 +0,0 @@
-//
-// libtgvoip is free and unencumbered public domain software.
-// For more information, see http://unlicense.org or the UNLICENSE file
-// you should have received with this source code distribution.
-//
-
-#ifndef LIBTGVOIP_AUDIOINPUTAUDIOUNIT_H
-#define LIBTGVOIP_AUDIOINPUTAUDIOUNIT_H
-
-#include <AudioUnit/AudioUnit.h>
-#include "../../audio/AudioInput.h"
-#include "../../utils.h"
-
-namespace tgvoip{ namespace audio{
-class AudioUnitIO;
-
-class AudioInputAudioUnit : public AudioInput{
-
-public:
-	TGVOIP_DISALLOW_COPY_AND_ASSIGN(AudioInputAudioUnit);
-	AudioInputAudioUnit(std::string deviceID, AudioUnitIO* io);
-	virtual ~AudioInputAudioUnit();
-	virtual void Start();
-	virtual void Stop();
-	void HandleBufferCallback(AudioBufferList* ioData);
-#if TARGET_OS_OSX
-	virtual void SetCurrentDevice(std::string deviceID);
-#endif
-
-private:
-	unsigned char remainingData[10240];
-	size_t remainingDataSize;
-	bool isRecording;
-	AudioUnitIO* io;
-};
-}}
-
-#endif //LIBTGVOIP_AUDIOINPUTAUDIOUNIT_H
diff --git a/submodules/libtgvoip/os/darwin/AudioInputAudioUnitOSX.cpp b/submodules/libtgvoip/os/darwin/AudioInputAudioUnitOSX.cpp
deleted file mode 100644
index e9218b1891..0000000000
--- a/submodules/libtgvoip/os/darwin/AudioInputAudioUnitOSX.cpp
+++ /dev/null
@@ -1,308 +0,0 @@
-//
-// libtgvoip is free and unencumbered public domain software.
-// For more information, see http://unlicense.org or the UNLICENSE file
-// you should have received with this source code distribution.
-//
-
-#include <stdlib.h>
-#include <stdio.h>
-#include "AudioInputAudioUnitOSX.h"
-#include "../../logging.h"
-#include "../../audio/Resampler.h"
-#include "../../VoIPController.h"
-
-#define BUFFER_SIZE 960
-#define CHECK_AU_ERROR(res, msg) if(res!=noErr){ LOGE("input: " msg": OSStatus=%d", (int)res); failed=true; return; }
-
-#define kOutputBus 0
-#define kInputBus 1
-
-using namespace tgvoip;
-using namespace tgvoip::audio;
-
-AudioInputAudioUnitLegacy::AudioInputAudioUnitLegacy(std::string deviceID) : AudioInput(deviceID){
-	remainingDataSize=0;
-	isRecording=false;
-
-	inBufferList.mBuffers[0].mData=malloc(10240);
-	inBufferList.mBuffers[0].mDataByteSize=10240;
-	inBufferList.mNumberBuffers=1;
-	
-	OSStatus status;
-	AudioComponentDescription inputDesc={
-		.componentType = kAudioUnitType_Output, .componentSubType = kAudioUnitSubType_HALOutput, .componentFlags = 0, .componentFlagsMask = 0,
-		.componentManufacturer = kAudioUnitManufacturer_Apple
-	};
-	AudioComponent component=AudioComponentFindNext(NULL, &inputDesc);
-	status=AudioComponentInstanceNew(component, &unit);
-	CHECK_AU_ERROR(status, "Error creating AudioUnit");
-	
-	UInt32 flag=0;
-	status = AudioUnitSetProperty(unit, kAudioOutputUnitProperty_EnableIO, kAudioUnitScope_Output, kOutputBus, &flag, sizeof(flag));
-	CHECK_AU_ERROR(status, "Error enabling AudioUnit output");
-	flag=1;
-	status = AudioUnitSetProperty(unit, kAudioOutputUnitProperty_EnableIO, kAudioUnitScope_Input, kInputBus, &flag, sizeof(flag));
-	CHECK_AU_ERROR(status, "Error enabling AudioUnit input");
-	
-	SetCurrentDevice(deviceID);
-	
-	CFRunLoopRef theRunLoop = NULL;
-	AudioObjectPropertyAddress propertyAddress = { kAudioHardwarePropertyRunLoop,
-		kAudioObjectPropertyScopeGlobal,
-		kAudioObjectPropertyElementMaster };
-	status = AudioObjectSetPropertyData(kAudioObjectSystemObject, &propertyAddress, 0, NULL, sizeof(CFRunLoopRef), &theRunLoop);
-	
-	propertyAddress.mSelector = kAudioHardwarePropertyDefaultInputDevice;
-	propertyAddress.mScope = kAudioObjectPropertyScopeGlobal;
-	propertyAddress.mElement = kAudioObjectPropertyElementMaster;
-	AudioObjectAddPropertyListener(kAudioObjectSystemObject, &propertyAddress, AudioInputAudioUnitLegacy::DefaultDeviceChangedCallback, this);
-	
-	AURenderCallbackStruct callbackStruct;
-	callbackStruct.inputProc = AudioInputAudioUnitLegacy::BufferCallback;
-	callbackStruct.inputProcRefCon=this;
-	status = AudioUnitSetProperty(unit, kAudioOutputUnitProperty_SetInputCallback, kAudioUnitScope_Global, kInputBus, &callbackStruct, sizeof(callbackStruct));
-	CHECK_AU_ERROR(status, "Error setting input buffer callback");
-	status=AudioUnitInitialize(unit);
-	CHECK_AU_ERROR(status, "Error initializing unit");
-}
-
-AudioInputAudioUnitLegacy::~AudioInputAudioUnitLegacy(){
-	AudioObjectPropertyAddress propertyAddress;
-	propertyAddress.mSelector = kAudioHardwarePropertyDefaultInputDevice;
-	propertyAddress.mScope = kAudioObjectPropertyScopeGlobal;
-	propertyAddress.mElement = kAudioObjectPropertyElementMaster;
-	AudioObjectRemovePropertyListener(kAudioObjectSystemObject, &propertyAddress, AudioInputAudioUnitLegacy::DefaultDeviceChangedCallback, this);
-	
-	AudioUnitUninitialize(unit);
-	AudioComponentInstanceDispose(unit);
-	free(inBufferList.mBuffers[0].mData);
-}
-
-void AudioInputAudioUnitLegacy::Start(){
-	isRecording=true;
-	OSStatus status=AudioOutputUnitStart(unit);
-	CHECK_AU_ERROR(status, "Error starting AudioUnit");
-}
-
-void AudioInputAudioUnitLegacy::Stop(){
-	isRecording=false;
-	OSStatus status=AudioOutputUnitStart(unit);
-	CHECK_AU_ERROR(status, "Error stopping AudioUnit");
-}
-
-OSStatus AudioInputAudioUnitLegacy::BufferCallback(void *inRefCon, AudioUnitRenderActionFlags *ioActionFlags, const AudioTimeStamp *inTimeStamp, UInt32 inBusNumber, UInt32 inNumberFrames, AudioBufferList *ioData){
-	AudioInputAudioUnitLegacy* input=(AudioInputAudioUnitLegacy*) inRefCon;
-	input->inBufferList.mBuffers[0].mDataByteSize=10240;
-	AudioUnitRender(input->unit, ioActionFlags, inTimeStamp, inBusNumber, inNumberFrames, &input->inBufferList);
-	input->HandleBufferCallback(&input->inBufferList);
-	return noErr;
-}
-
-void AudioInputAudioUnitLegacy::HandleBufferCallback(AudioBufferList *ioData){
-	int i;
-	for(i=0;i<ioData->mNumberBuffers;i++){
-		AudioBuffer buf=ioData->mBuffers[i];
-		size_t len=buf.mDataByteSize;
-		if(hardwareSampleRate!=48000){
-			len=tgvoip::audio::Resampler::Convert((int16_t*)buf.mData, (int16_t*)(remainingData+remainingDataSize), buf.mDataByteSize/2, (10240-(buf.mDataByteSize+remainingDataSize))/2, 48000, hardwareSampleRate)*2;
-		}else{
-			assert(remainingDataSize+buf.mDataByteSize<10240);
-			memcpy(remainingData+remainingDataSize, buf.mData, buf.mDataByteSize);
-		}
-		remainingDataSize+=len;
-		while(remainingDataSize>=BUFFER_SIZE*2){
-			InvokeCallback((unsigned char*)remainingData, BUFFER_SIZE*2);
-			remainingDataSize-=BUFFER_SIZE*2;
-			if(remainingDataSize>0){
-				memmove(remainingData, remainingData+(BUFFER_SIZE*2), remainingDataSize);
-			}
-		}
-	}
-}
-
-
-void AudioInputAudioUnitLegacy::EnumerateDevices(std::vector<AudioInputDevice>& devs){
-	AudioObjectPropertyAddress propertyAddress = {
-		kAudioHardwarePropertyDevices,
-		kAudioObjectPropertyScopeGlobal,
-		kAudioObjectPropertyElementMaster
-	};
-	
-	UInt32 dataSize = 0;
-	OSStatus status = AudioObjectGetPropertyDataSize(kAudioObjectSystemObject, &propertyAddress, 0, NULL, &dataSize);
-	if(kAudioHardwareNoError != status) {
-		LOGE("AudioObjectGetPropertyDataSize (kAudioHardwarePropertyDevices) failed: %i", status);
-		return;
-	}
-	
-	UInt32 deviceCount = (UInt32)(dataSize / sizeof(AudioDeviceID));
-	
-
-	AudioDeviceID *audioDevices = (AudioDeviceID*)(malloc(dataSize));
-	
-	status = AudioObjectGetPropertyData(kAudioObjectSystemObject, &propertyAddress, 0, NULL, &dataSize, audioDevices);
-	if(kAudioHardwareNoError != status) {
-		LOGE("AudioObjectGetPropertyData (kAudioHardwarePropertyDevices) failed: %i", status);
-		free(audioDevices);
-		audioDevices = NULL;
-		return;
-	}
-	
-	
-	// Iterate through all the devices and determine which are input-capable
-	propertyAddress.mScope = kAudioDevicePropertyScopeInput;
-	for(UInt32 i = 0; i < deviceCount; ++i) {
-		// Query device UID
-		CFStringRef deviceUID = NULL;
-		dataSize = sizeof(deviceUID);
-		propertyAddress.mSelector = kAudioDevicePropertyDeviceUID;
-		status = AudioObjectGetPropertyData(audioDevices[i], &propertyAddress, 0, NULL, &dataSize, &deviceUID);
-		if(kAudioHardwareNoError != status) {
-			LOGE("AudioObjectGetPropertyData (kAudioDevicePropertyDeviceUID) failed: %i", status);
-			continue;
-		}
-		
-		// Query device name
-		CFStringRef deviceName = NULL;
-		dataSize = sizeof(deviceName);
-		propertyAddress.mSelector = kAudioDevicePropertyDeviceNameCFString;
-		status = AudioObjectGetPropertyData(audioDevices[i], &propertyAddress, 0, NULL, &dataSize, &deviceName);
-		if(kAudioHardwareNoError != status) {
-			LOGE("AudioObjectGetPropertyData (kAudioDevicePropertyDeviceNameCFString) failed: %i", status);
-			continue;
-		}
-		
-		// Determine if the device is an input device (it is an input device if it has input channels)
-		dataSize = 0;
-		propertyAddress.mSelector = kAudioDevicePropertyStreamConfiguration;
-		status = AudioObjectGetPropertyDataSize(audioDevices[i], &propertyAddress, 0, NULL, &dataSize);
-		if(kAudioHardwareNoError != status) {
-			LOGE("AudioObjectGetPropertyDataSize (kAudioDevicePropertyStreamConfiguration) failed: %i", status);
-			continue;
-		}
-		
-		AudioBufferList *bufferList = (AudioBufferList*)(malloc(dataSize));
-		
-		status = AudioObjectGetPropertyData(audioDevices[i], &propertyAddress, 0, NULL, &dataSize, bufferList);
-		if(kAudioHardwareNoError != status || 0 == bufferList->mNumberBuffers) {
-			if(kAudioHardwareNoError != status)
-				LOGE("AudioObjectGetPropertyData (kAudioDevicePropertyStreamConfiguration) failed: %i", status);
-			free(bufferList);
-			bufferList = NULL;
-			continue;
-		}
-		
-		free(bufferList);
-		bufferList = NULL;
-		
-		AudioInputDevice dev;
-		char buf[1024];
-		CFStringGetCString(deviceName, buf, 1024, kCFStringEncodingUTF8);
-		dev.displayName=std::string(buf);
-		CFStringGetCString(deviceUID, buf, 1024, kCFStringEncodingUTF8);
-		dev.id=std::string(buf);
-		if(dev.id.rfind("VPAUAggregateAudioDevice-0x")==0)
-			continue;
-		devs.push_back(dev);
-	}
-	
-	free(audioDevices);
-	audioDevices = NULL;
-}
-
-void AudioInputAudioUnitLegacy::SetCurrentDevice(std::string deviceID){
-	UInt32 size=sizeof(AudioDeviceID);
-	AudioDeviceID inputDevice=0;
-	OSStatus status;
-	
-	if(deviceID=="default"){
-		AudioObjectPropertyAddress propertyAddress;
-		propertyAddress.mSelector = kAudioHardwarePropertyDefaultInputDevice;
-		propertyAddress.mScope = kAudioObjectPropertyScopeGlobal;
-		propertyAddress.mElement = kAudioObjectPropertyElementMaster;
-		UInt32 propsize = sizeof(AudioDeviceID);
-		status = AudioObjectGetPropertyData(kAudioObjectSystemObject, &propertyAddress, 0, NULL, &propsize, &inputDevice);
-		CHECK_AU_ERROR(status, "Error getting default input device");
-	}else{
-		AudioObjectPropertyAddress propertyAddress = {
-			kAudioHardwarePropertyDevices,
-			kAudioObjectPropertyScopeGlobal,
-			kAudioObjectPropertyElementMaster
-		};
-		UInt32 dataSize = 0;
-		status = AudioObjectGetPropertyDataSize(kAudioObjectSystemObject, &propertyAddress, 0, NULL, &dataSize);
-		CHECK_AU_ERROR(status, "Error getting devices size");
-		UInt32 deviceCount = (UInt32)(dataSize / sizeof(AudioDeviceID));
-		AudioDeviceID audioDevices[deviceCount];
-		status = AudioObjectGetPropertyData(kAudioObjectSystemObject, &propertyAddress, 0, NULL, &dataSize, audioDevices);
-		CHECK_AU_ERROR(status, "Error getting device list");
-		for(UInt32 i = 0; i < deviceCount; ++i) {
-			// Query device UID
-			CFStringRef deviceUID = NULL;
-			dataSize = sizeof(deviceUID);
-			propertyAddress.mSelector = kAudioDevicePropertyDeviceUID;
-			status = AudioObjectGetPropertyData(audioDevices[i], &propertyAddress, 0, NULL, &dataSize, &deviceUID);
-			CHECK_AU_ERROR(status, "Error getting device uid");
-			char buf[1024];
-			CFStringGetCString(deviceUID, buf, 1024, kCFStringEncodingUTF8);
-			if(deviceID==buf){
-				LOGV("Found device for id %s", buf);
-				inputDevice=audioDevices[i];
-				break;
-			}
-		}
-		if(!inputDevice){
-			LOGW("Requested device not found, using default");
-			SetCurrentDevice("default");
-			return;
-		}
-	}
- 
-	status =AudioUnitSetProperty(unit,
-							  kAudioOutputUnitProperty_CurrentDevice,
-							  kAudioUnitScope_Global,
-							  kInputBus,
-							  &inputDevice,
-							  size);
-	CHECK_AU_ERROR(status, "Error setting input device");
-	
-	AudioStreamBasicDescription hardwareFormat;
-	size=sizeof(hardwareFormat);
-	status=AudioUnitGetProperty(unit, kAudioUnitProperty_StreamFormat, kAudioUnitScope_Input, kInputBus, &hardwareFormat, &size);
-	CHECK_AU_ERROR(status, "Error getting hardware format");
-	hardwareSampleRate=hardwareFormat.mSampleRate;
-	
-	AudioStreamBasicDescription desiredFormat={
-		.mSampleRate=hardwareFormat.mSampleRate, .mFormatID=kAudioFormatLinearPCM, .mFormatFlags=kAudioFormatFlagIsSignedInteger | kAudioFormatFlagIsPacked | kAudioFormatFlagsNativeEndian,
-		.mFramesPerPacket=1, .mChannelsPerFrame=1, .mBitsPerChannel=16, .mBytesPerPacket=2, .mBytesPerFrame=2
-	};
-	
-	status=AudioUnitSetProperty(unit, kAudioUnitProperty_StreamFormat, kAudioUnitScope_Output, kInputBus, &desiredFormat, sizeof(desiredFormat));
-	CHECK_AU_ERROR(status, "Error setting format");
-	
-	LOGD("Switched capture device, new sample rate %d", hardwareSampleRate);
-	
-	this->currentDevice=deviceID;
-	
-	AudioObjectPropertyAddress propertyAddress = {
-		kAudioDevicePropertyBufferFrameSize,
-		kAudioObjectPropertyScopeGlobal,
-		kAudioObjectPropertyElementMaster
-	};
-	size=4;
-	UInt32 bufferFrameSize;
-	status=AudioObjectGetPropertyData(inputDevice, &propertyAddress, 0, NULL, &size, &bufferFrameSize);
-	if(status==noErr){
-		estimatedDelay=bufferFrameSize/48;
-		LOGD("CoreAudio buffer size for output device is %u frames (%u ms)", bufferFrameSize, estimatedDelay);
-	}
-}
-
-OSStatus AudioInputAudioUnitLegacy::DefaultDeviceChangedCallback(AudioObjectID inObjectID, UInt32 inNumberAddresses, const AudioObjectPropertyAddress *inAddresses, void *inClientData){
-	LOGV("System default input device changed");
-	AudioInputAudioUnitLegacy* self=(AudioInputAudioUnitLegacy*)inClientData;
-	if(self->currentDevice=="default"){
-		self->SetCurrentDevice(self->currentDevice);
-	}
-	return noErr;
-}
diff --git a/submodules/libtgvoip/os/darwin/AudioInputAudioUnitOSX.h b/submodules/libtgvoip/os/darwin/AudioInputAudioUnitOSX.h
deleted file mode 100644
index ee4295b683..0000000000
--- a/submodules/libtgvoip/os/darwin/AudioInputAudioUnitOSX.h
+++ /dev/null
@@ -1,39 +0,0 @@
-//
-// libtgvoip is free and unencumbered public domain software.
-// For more information, see http://unlicense.org or the UNLICENSE file
-// you should have received with this source code distribution.
-//
-
-#ifndef LIBTGVOIP_AUDIOINPUTAUDIOUNIT_OSX_H
-#define LIBTGVOIP_AUDIOINPUTAUDIOUNIT_OSX_H
-
-#include <AudioUnit/AudioUnit.h>
-#import <AudioToolbox/AudioToolbox.h>
-#import <CoreAudio/CoreAudio.h>
-#include "../../audio/AudioInput.h"
-
-namespace tgvoip{ namespace audio{
-class AudioInputAudioUnitLegacy : public AudioInput{
-
-public:
-	AudioInputAudioUnitLegacy(std::string deviceID);
-	virtual ~AudioInputAudioUnitLegacy();
-	virtual void Start();
-	virtual void Stop();
-	void HandleBufferCallback(AudioBufferList* ioData);
-	static void EnumerateDevices(std::vector<AudioInputDevice>& devs);
-	virtual void SetCurrentDevice(std::string deviceID);
-
-private:
-	static OSStatus BufferCallback(void *inRefCon, AudioUnitRenderActionFlags *ioActionFlags, const AudioTimeStamp *inTimeStamp, UInt32 inBusNumber, UInt32 inNumberFrames, AudioBufferList *ioData);
-	static OSStatus DefaultDeviceChangedCallback(AudioObjectID inObjectID, UInt32 inNumberAddresses, const AudioObjectPropertyAddress *inAddresses, void *inClientData);
-	unsigned char remainingData[10240];
-	size_t remainingDataSize;
-	bool isRecording;
-	AudioUnit unit;
-	AudioBufferList inBufferList;
-	int hardwareSampleRate;
-};
-}}
-
-#endif //LIBTGVOIP_AUDIOINPUTAUDIOUNIT_OSX_H
diff --git a/submodules/libtgvoip/os/darwin/AudioOutputAudioUnit.cpp b/submodules/libtgvoip/os/darwin/AudioOutputAudioUnit.cpp
deleted file mode 100644
index c7c34ab80a..0000000000
--- a/submodules/libtgvoip/os/darwin/AudioOutputAudioUnit.cpp
+++ /dev/null
@@ -1,84 +0,0 @@
-//
-// libtgvoip is free and unencumbered public domain software.
-// For more information, see http://unlicense.org or the UNLICENSE file
-// you should have received with this source code distribution.
-//
-
-#include <sys/time.h>
-#include <unistd.h>
-#include <assert.h>
-#include "AudioOutputAudioUnit.h"
-#include "../../logging.h"
-#include "AudioUnitIO.h"
-
-#define BUFFER_SIZE 960
-
-using namespace tgvoip;
-using namespace tgvoip::audio;
-
-AudioOutputAudioUnit::AudioOutputAudioUnit(std::string deviceID, AudioUnitIO* io){
-	isPlaying=false;
-	remainingDataSize=0;
-	this->io=io;
-#if TARGET_OS_OSX
-	io->SetCurrentDevice(false, deviceID);
-#endif
-}
-
-AudioOutputAudioUnit::~AudioOutputAudioUnit(){
-}
-
-void AudioOutputAudioUnit::Start(){
-	isPlaying=true;
-	io->EnableOutput(true);
-}
-
-void AudioOutputAudioUnit::Stop(){
-	isPlaying=false;
-	io->EnableOutput(false);
-}
-
-bool AudioOutputAudioUnit::IsPlaying(){
-	return isPlaying;
-}
-
-void AudioOutputAudioUnit::HandleBufferCallback(AudioBufferList *ioData){
-	int i;
-	for(i=0;i<ioData->mNumberBuffers;i++){
-		AudioBuffer buf=ioData->mBuffers[i];
-		if(!isPlaying){
-			memset(buf.mData, 0, buf.mDataByteSize);
-			return;
-		}
-#if TARGET_OS_OSX
-        unsigned int k;
-		while(remainingDataSize<buf.mDataByteSize/2){
-			assert(remainingDataSize+BUFFER_SIZE*2<sizeof(remainingData));
-			InvokeCallback(remainingData+remainingDataSize, BUFFER_SIZE*2);
-			remainingDataSize+=BUFFER_SIZE*2;
-		}
-		float* dst=reinterpret_cast<float*>(buf.mData);
-		int16_t* src=reinterpret_cast<int16_t*>(remainingData);
-		for(k=0;k<buf.mDataByteSize/4;k++){
-			dst[k]=src[k]/(float)INT16_MAX;
-		}
-		remainingDataSize-=buf.mDataByteSize/2;
-		memmove(remainingData, remainingData+buf.mDataByteSize/2, remainingDataSize);
-#else
-		while(remainingDataSize<buf.mDataByteSize){
-			assert(remainingDataSize+BUFFER_SIZE*2<sizeof(remainingData));
-			InvokeCallback(remainingData+remainingDataSize, BUFFER_SIZE*2);
-			remainingDataSize+=BUFFER_SIZE*2;
-		}
-		memcpy(buf.mData, remainingData, buf.mDataByteSize);
-		remainingDataSize-=buf.mDataByteSize;
-		memmove(remainingData, remainingData+buf.mDataByteSize, remainingDataSize);
-#endif
-	}
-}
-
-#if TARGET_OS_OSX
-void AudioOutputAudioUnit::SetCurrentDevice(std::string deviceID){
-	io->SetCurrentDevice(false, deviceID);
-}
-#endif
diff --git a/submodules/libtgvoip/os/darwin/AudioOutputAudioUnit.h b/submodules/libtgvoip/os/darwin/AudioOutputAudioUnit.h
deleted file mode 100644
index e6b5294b72..0000000000
--- a/submodules/libtgvoip/os/darwin/AudioOutputAudioUnit.h
+++ /dev/null
@@ -1,38 +0,0 @@
-//
-// libtgvoip is free and unencumbered public domain software.
-// For more information, see http://unlicense.org or the UNLICENSE file
-// you should have received with this source code distribution.
-//
-
-#ifndef LIBTGVOIP_AUDIOOUTPUTAUDIOUNIT_H
-#define LIBTGVOIP_AUDIOOUTPUTAUDIOUNIT_H
-
-#include <AudioUnit/AudioUnit.h>
-#include "../../audio/AudioOutput.h"
-#include "../../utils.h"
-
-namespace tgvoip{ namespace audio{
-class AudioUnitIO;
-
-class AudioOutputAudioUnit : public AudioOutput{
-public:
-	TGVOIP_DISALLOW_COPY_AND_ASSIGN(AudioOutputAudioUnit);
-	AudioOutputAudioUnit(std::string deviceID, AudioUnitIO* io);
-	virtual ~AudioOutputAudioUnit();
-	virtual void Start();
-	virtual void Stop();
-	virtual bool IsPlaying();
-	void HandleBufferCallback(AudioBufferList* ioData);
-#if TARGET_OS_OSX
-	virtual void SetCurrentDevice(std::string deviceID);
-#endif
-
-private:
-	bool isPlaying;
-	unsigned char remainingData[10240];
-	size_t remainingDataSize;
-	AudioUnitIO* io;
-};
-}}
-
-#endif //LIBTGVOIP_AUDIOOUTPUTAUDIOUNIT_H
diff --git a/submodules/libtgvoip/os/darwin/AudioOutputAudioUnitOSX.cpp b/submodules/libtgvoip/os/darwin/AudioOutputAudioUnitOSX.cpp
deleted file mode 100644
index cc023f8ebd..0000000000
--- a/submodules/libtgvoip/os/darwin/AudioOutputAudioUnitOSX.cpp
+++ /dev/null
@@ -1,365 +0,0 @@
-//
-// libtgvoip is free and unencumbered public domain software.
-// For more information, see http://unlicense.org or the UNLICENSE file
-// you should have received with this source code distribution.
-//
-
-#include <stdlib.h>
-#include <stdio.h>
-#include <sys/sysctl.h>
-#include "AudioOutputAudioUnitOSX.h"
-#include "../../logging.h"
-#include "../../VoIPController.h"
-
-#define BUFFER_SIZE 960
-#define CHECK_AU_ERROR(res, msg) if(res!=noErr){ LOGE("output: " msg": OSStatus=%d", (int)res); return; }
-
-#define kOutputBus 0
-#define kInputBus 1
-
-using namespace tgvoip;
-using namespace tgvoip::audio;
-
-AudioOutputAudioUnitLegacy::AudioOutputAudioUnitLegacy(std::string deviceID){
-	remainingDataSize=0;
-	isPlaying=false;
-	sysDevID=0;
-	
-	OSStatus status;
-	AudioComponentDescription inputDesc={
-		.componentType = kAudioUnitType_Output, .componentSubType = kAudioUnitSubType_HALOutput, .componentFlags = 0, .componentFlagsMask = 0,
-		.componentManufacturer = kAudioUnitManufacturer_Apple
-	};
-	AudioComponent component=AudioComponentFindNext(NULL, &inputDesc);
-	status=AudioComponentInstanceNew(component, &unit);
-	CHECK_AU_ERROR(status, "Error creating AudioUnit");
-	
-	UInt32 flag=1;
-	status = AudioUnitSetProperty(unit, kAudioOutputUnitProperty_EnableIO, kAudioUnitScope_Output, kOutputBus, &flag, sizeof(flag));
-	CHECK_AU_ERROR(status, "Error enabling AudioUnit output");
-	flag=0;
-	status = AudioUnitSetProperty(unit, kAudioOutputUnitProperty_EnableIO, kAudioUnitScope_Input, kInputBus, &flag, sizeof(flag));
-	CHECK_AU_ERROR(status, "Error enabling AudioUnit input");
-	
-	char model[128];
-	memset(model, 0, sizeof(model));
-	size_t msize=sizeof(model);
-	int mres=sysctlbyname("hw.model", model, &msize, NULL, 0);
-	if(mres==0){
-		LOGV("Mac model: %s", model);
-		isMacBookPro=(strncmp("MacBookPro", model, 10)==0);
-	}
-	
-	SetCurrentDevice(deviceID);
-	
-	CFRunLoopRef theRunLoop = NULL;
-	AudioObjectPropertyAddress propertyAddress = { kAudioHardwarePropertyRunLoop,
-		kAudioObjectPropertyScopeGlobal,
-		kAudioObjectPropertyElementMaster };
-	status = AudioObjectSetPropertyData(kAudioObjectSystemObject, &propertyAddress, 0, NULL, sizeof(CFRunLoopRef), &theRunLoop);
-	
-	propertyAddress.mSelector = kAudioHardwarePropertyDefaultOutputDevice;
-	propertyAddress.mScope = kAudioObjectPropertyScopeGlobal;
-	propertyAddress.mElement = kAudioObjectPropertyElementMaster;
-	AudioObjectAddPropertyListener(kAudioObjectSystemObject, &propertyAddress, AudioOutputAudioUnitLegacy::DefaultDeviceChangedCallback, this);
-	
-	AudioStreamBasicDescription desiredFormat={
-		.mSampleRate=/*hardwareFormat.mSampleRate*/48000, .mFormatID=kAudioFormatLinearPCM, .mFormatFlags=kAudioFormatFlagIsSignedInteger | kAudioFormatFlagIsPacked | kAudioFormatFlagsNativeEndian,
-		.mFramesPerPacket=1, .mChannelsPerFrame=1, .mBitsPerChannel=16, .mBytesPerPacket=2, .mBytesPerFrame=2
-	};
-	
-	status=AudioUnitSetProperty(unit, kAudioUnitProperty_StreamFormat, kAudioUnitScope_Input, kOutputBus, &desiredFormat, sizeof(desiredFormat));
-	CHECK_AU_ERROR(status, "Error setting format");
-	
-	AURenderCallbackStruct callbackStruct;
-	callbackStruct.inputProc = AudioOutputAudioUnitLegacy::BufferCallback;
-	callbackStruct.inputProcRefCon=this;
-	status = AudioUnitSetProperty(unit, kAudioUnitProperty_SetRenderCallback, kAudioUnitScope_Global, kOutputBus, &callbackStruct, sizeof(callbackStruct));
-	CHECK_AU_ERROR(status, "Error setting input buffer callback");
-	status=AudioUnitInitialize(unit);
-	CHECK_AU_ERROR(status, "Error initializing unit");
-}
-
-AudioOutputAudioUnitLegacy::~AudioOutputAudioUnitLegacy(){
-	AudioObjectPropertyAddress propertyAddress;
-	propertyAddress.mSelector = kAudioHardwarePropertyDefaultOutputDevice;
-	propertyAddress.mScope = kAudioObjectPropertyScopeGlobal;
-	propertyAddress.mElement = kAudioObjectPropertyElementMaster;
-	AudioObjectRemovePropertyListener(kAudioObjectSystemObject, &propertyAddress, AudioOutputAudioUnitLegacy::DefaultDeviceChangedCallback, this);
-	
-	AudioObjectPropertyAddress dataSourceProp={
-		kAudioDevicePropertyDataSource,
-		kAudioDevicePropertyScopeOutput,
-		kAudioObjectPropertyElementMaster
-	};
-	if(isMacBookPro && sysDevID && AudioObjectHasProperty(sysDevID, &dataSourceProp)){
-		AudioObjectRemovePropertyListener(sysDevID, &dataSourceProp, AudioOutputAudioUnitLegacy::DefaultDeviceChangedCallback, this);
-	}
-	
-	AudioUnitUninitialize(unit);
-	AudioComponentInstanceDispose(unit);
-}
-
-void AudioOutputAudioUnitLegacy::Start(){
-	isPlaying=true;
-	OSStatus status=AudioOutputUnitStart(unit);
-	CHECK_AU_ERROR(status, "Error starting AudioUnit");
-}
-
-void AudioOutputAudioUnitLegacy::Stop(){
-	isPlaying=false;
-	OSStatus status=AudioOutputUnitStart(unit);
-	CHECK_AU_ERROR(status, "Error stopping AudioUnit");
-}
-
-OSStatus AudioOutputAudioUnitLegacy::BufferCallback(void *inRefCon, AudioUnitRenderActionFlags *ioActionFlags, const AudioTimeStamp *inTimeStamp, UInt32 inBusNumber, UInt32 inNumberFrames, AudioBufferList *ioData){
-	AudioOutputAudioUnitLegacy* input=(AudioOutputAudioUnitLegacy*) inRefCon;
-	input->HandleBufferCallback(ioData);
-	return noErr;
-}
-
-bool AudioOutputAudioUnitLegacy::IsPlaying(){
-	return isPlaying;
-}
-
-void AudioOutputAudioUnitLegacy::HandleBufferCallback(AudioBufferList *ioData){
-	int i;
-	for(i=0;i<ioData->mNumberBuffers;i++){
-		AudioBuffer buf=ioData->mBuffers[i];
-		if(!isPlaying){
-			memset(buf.mData, 0, buf.mDataByteSize);
-			return;
-		}
-		while(remainingDataSize<buf.mDataByteSize){
-			assert(remainingDataSize+BUFFER_SIZE*2<10240);
-			InvokeCallback(remainingData+remainingDataSize, BUFFER_SIZE*2);
-			remainingDataSize+=BUFFER_SIZE*2;
-		}
-		memcpy(buf.mData, remainingData, buf.mDataByteSize);
-		remainingDataSize-=buf.mDataByteSize;
-		memmove(remainingData, remainingData+buf.mDataByteSize, remainingDataSize);
-	}
-}
-
-
-void AudioOutputAudioUnitLegacy::EnumerateDevices(std::vector<AudioOutputDevice>& devs){
-	AudioObjectPropertyAddress propertyAddress = {
-		kAudioHardwarePropertyDevices,
-		kAudioObjectPropertyScopeGlobal,
-		kAudioObjectPropertyElementMaster
-	};
-	
-	UInt32 dataSize = 0;
-	OSStatus status = AudioObjectGetPropertyDataSize(kAudioObjectSystemObject, &propertyAddress, 0, NULL, &dataSize);
-	if(kAudioHardwareNoError != status) {
-		LOGE("AudioObjectGetPropertyDataSize (kAudioHardwarePropertyDevices) failed: %i", status);
-		return;
-	}
-	
-	UInt32 deviceCount = (UInt32)(dataSize / sizeof(AudioDeviceID));
-	
-	
-	AudioDeviceID *audioDevices = (AudioDeviceID*)(malloc(dataSize));
-	
-	status = AudioObjectGetPropertyData(kAudioObjectSystemObject, &propertyAddress, 0, NULL, &dataSize, audioDevices);
-	if(kAudioHardwareNoError != status) {
-		LOGE("AudioObjectGetPropertyData (kAudioHardwarePropertyDevices) failed: %i", status);
-		free(audioDevices);
-		audioDevices = NULL;
-		return;
-	}
-	
-	
-	// Iterate through all the devices and determine which are input-capable
-	propertyAddress.mScope = kAudioDevicePropertyScopeOutput;
-	for(UInt32 i = 0; i < deviceCount; ++i) {
-		// Query device UID
-		CFStringRef deviceUID = NULL;
-		dataSize = sizeof(deviceUID);
-		propertyAddress.mSelector = kAudioDevicePropertyDeviceUID;
-		status = AudioObjectGetPropertyData(audioDevices[i], &propertyAddress, 0, NULL, &dataSize, &deviceUID);
-		if(kAudioHardwareNoError != status) {
-			LOGE("AudioObjectGetPropertyData (kAudioDevicePropertyDeviceUID) failed: %i", status);
-			continue;
-		}
-		
-		// Query device name
-		CFStringRef deviceName = NULL;
-		dataSize = sizeof(deviceName);
-		propertyAddress.mSelector = kAudioDevicePropertyDeviceNameCFString;
-		status = AudioObjectGetPropertyData(audioDevices[i], &propertyAddress, 0, NULL, &dataSize, &deviceName);
-		if(kAudioHardwareNoError != status) {
-			LOGE("AudioObjectGetPropertyData (kAudioDevicePropertyDeviceNameCFString) failed: %i", status);
-			continue;
-		}
-		
-		// Determine if the device is an input device (it is an input device if it has input channels)
-		dataSize = 0;
-		propertyAddress.mSelector = kAudioDevicePropertyStreamConfiguration;
-		status = AudioObjectGetPropertyDataSize(audioDevices[i], &propertyAddress, 0, NULL, &dataSize);
-		if(kAudioHardwareNoError != status) {
-			LOGE("AudioObjectGetPropertyDataSize (kAudioDevicePropertyStreamConfiguration) failed: %i", status);
-			continue;
-		}
-		
-		AudioBufferList *bufferList = (AudioBufferList*)(malloc(dataSize));
-		
-		status = AudioObjectGetPropertyData(audioDevices[i], &propertyAddress, 0, NULL, &dataSize, bufferList);
-		if(kAudioHardwareNoError != status || 0 == bufferList->mNumberBuffers) {
-			if(kAudioHardwareNoError != status)
-				LOGE("AudioObjectGetPropertyData (kAudioDevicePropertyStreamConfiguration) failed: %i", status);
-			free(bufferList);
-			bufferList = NULL;
-			continue;
-		}
-		
-		free(bufferList);
-		bufferList = NULL;
-		
-		AudioOutputDevice dev;
-		char buf[1024];
-		CFStringGetCString(deviceName, buf, 1024, kCFStringEncodingUTF8);
-		dev.displayName=std::string(buf);
-		CFStringGetCString(deviceUID, buf, 1024, kCFStringEncodingUTF8);
-		dev.id=std::string(buf);
-		if(dev.id.rfind("VPAUAggregateAudioDevice-0x")==0)
-			continue;
-		devs.push_back(dev);
-	}
-	
-	free(audioDevices);
-	audioDevices = NULL;
-}
-
-void AudioOutputAudioUnitLegacy::SetCurrentDevice(std::string deviceID){
-	UInt32 size=sizeof(AudioDeviceID);
-	AudioDeviceID outputDevice=0;
-	OSStatus status;
-	AudioObjectPropertyAddress dataSourceProp={
-		kAudioDevicePropertyDataSource,
-		kAudioDevicePropertyScopeOutput,
-		kAudioObjectPropertyElementMaster
-	};
-	
-	if(isMacBookPro && sysDevID && AudioObjectHasProperty(sysDevID, &dataSourceProp)){
-		AudioObjectRemovePropertyListener(sysDevID, &dataSourceProp, AudioOutputAudioUnitLegacy::DefaultDeviceChangedCallback, this);
-	}
-	
-	if(deviceID=="default"){
-		AudioObjectPropertyAddress propertyAddress;
-		propertyAddress.mSelector = kAudioHardwarePropertyDefaultOutputDevice;
-		propertyAddress.mScope = kAudioObjectPropertyScopeGlobal;
-		propertyAddress.mElement = kAudioObjectPropertyElementMaster;
-		UInt32 propsize = sizeof(AudioDeviceID);
-		status = AudioObjectGetPropertyData(kAudioObjectSystemObject, &propertyAddress, 0, NULL, &propsize, &outputDevice);
-		CHECK_AU_ERROR(status, "Error getting default input device");
-	}else{
-		AudioObjectPropertyAddress propertyAddress = {
-			kAudioHardwarePropertyDevices,
-			kAudioObjectPropertyScopeGlobal,
-			kAudioObjectPropertyElementMaster
-		};
-		UInt32 dataSize = 0;
-		status = AudioObjectGetPropertyDataSize(kAudioObjectSystemObject, &propertyAddress, 0, NULL, &dataSize);
-		CHECK_AU_ERROR(status, "Error getting devices size");
-		UInt32 deviceCount = (UInt32)(dataSize / sizeof(AudioDeviceID));
-		AudioDeviceID audioDevices[deviceCount];
-		status = AudioObjectGetPropertyData(kAudioObjectSystemObject, &propertyAddress, 0, NULL, &dataSize, audioDevices);
-		CHECK_AU_ERROR(status, "Error getting device list");
-		for(UInt32 i = 0; i < deviceCount; ++i) {
-			// Query device UID
-			CFStringRef deviceUID = NULL;
-			dataSize = sizeof(deviceUID);
-			propertyAddress.mSelector = kAudioDevicePropertyDeviceUID;
-			status = AudioObjectGetPropertyData(audioDevices[i], &propertyAddress, 0, NULL, &dataSize, &deviceUID);
-			CHECK_AU_ERROR(status, "Error getting device uid");
-			char buf[1024];
-			CFStringGetCString(deviceUID, buf, 1024, kCFStringEncodingUTF8);
-			if(deviceID==buf){
-				LOGV("Found device for id %s", buf);
-				outputDevice=audioDevices[i];
-				break;
-			}
-		}
-		if(!outputDevice){
-			LOGW("Requested device not found, using default");
-			SetCurrentDevice("default");
-			return;
-		}
-	}
- 
-	status =AudioUnitSetProperty(unit,
-							  kAudioOutputUnitProperty_CurrentDevice,
-							  kAudioUnitScope_Global,
-							  kOutputBus,
-							  &outputDevice,
-							  size);
-	CHECK_AU_ERROR(status, "Error setting output device");
-	
-	AudioStreamBasicDescription hardwareFormat;
-	size=sizeof(hardwareFormat);
-	status=AudioUnitGetProperty(unit, kAudioUnitProperty_StreamFormat, kAudioUnitScope_Output, kOutputBus, &hardwareFormat, &size);
-	CHECK_AU_ERROR(status, "Error getting hardware format");
-	hardwareSampleRate=hardwareFormat.mSampleRate;
-	
-	AudioStreamBasicDescription desiredFormat={
-		.mSampleRate=48000, .mFormatID=kAudioFormatLinearPCM, .mFormatFlags=kAudioFormatFlagIsSignedInteger | kAudioFormatFlagIsPacked | kAudioFormatFlagsNativeEndian,
-		.mFramesPerPacket=1, .mChannelsPerFrame=1, .mBitsPerChannel=16, .mBytesPerPacket=2, .mBytesPerFrame=2
-	};
-	
-	status=AudioUnitSetProperty(unit, kAudioUnitProperty_StreamFormat, kAudioUnitScope_Input, kOutputBus, &desiredFormat, sizeof(desiredFormat));
-	CHECK_AU_ERROR(status, "Error setting format");
-	
-	LOGD("Switched playback device, new sample rate %d", hardwareSampleRate);
-	
-	this->currentDevice=deviceID;
-	sysDevID=outputDevice;
-	
-	AudioObjectPropertyAddress propertyAddress = {
-		kAudioDevicePropertyBufferFrameSize,
-		kAudioObjectPropertyScopeGlobal,
-		kAudioObjectPropertyElementMaster
-	};
-	size=4;
-	UInt32 bufferFrameSize;
-	status=AudioObjectGetPropertyData(outputDevice, &propertyAddress, 0, NULL, &size, &bufferFrameSize);
-	if(status==noErr){
-		estimatedDelay=bufferFrameSize/48;
-		LOGD("CoreAudio buffer size for output device is %u frames (%u ms)", bufferFrameSize, estimatedDelay);
-	}
-	
-	if(isMacBookPro){
-		if(AudioObjectHasProperty(outputDevice, &dataSourceProp)){
-			UInt32 dataSource;
-			size=4;
-			AudioObjectGetPropertyData(outputDevice, &dataSourceProp, 0, NULL, &size, &dataSource);
-			SetPanRight(dataSource=='ispk');
-			AudioObjectAddPropertyListener(outputDevice, &dataSourceProp, AudioOutputAudioUnitLegacy::DefaultDeviceChangedCallback, this);
-		}else{
-			SetPanRight(false);
-		}
-	}
-}
-
-void AudioOutputAudioUnitLegacy::SetPanRight(bool panRight){
-	LOGI("%sabling pan right on macbook pro", panRight ? "En" : "Dis");
-	int32_t channelMap[]={panRight ? -1 : 0, 0};
-	OSStatus status=AudioUnitSetProperty(unit, kAudioOutputUnitProperty_ChannelMap, kAudioUnitScope_Global, kOutputBus, channelMap, sizeof(channelMap));
-	CHECK_AU_ERROR(status, "Error setting channel map");
-}
-
-OSStatus AudioOutputAudioUnitLegacy::DefaultDeviceChangedCallback(AudioObjectID inObjectID, UInt32 inNumberAddresses, const AudioObjectPropertyAddress *inAddresses, void *inClientData){
-	AudioOutputAudioUnitLegacy* self=(AudioOutputAudioUnitLegacy*)inClientData;
-	if(inAddresses[0].mSelector==kAudioHardwarePropertyDefaultOutputDevice){
-		LOGV("System default input device changed");
-		if(self->currentDevice=="default"){
-			self->SetCurrentDevice(self->currentDevice);
-		}
-	}else if(inAddresses[0].mSelector==kAudioDevicePropertyDataSource){
-		UInt32 dataSource;
-		UInt32 size=4;
-		AudioObjectGetPropertyData(inObjectID, inAddresses, 0, NULL, &size, &dataSource);
-		self->SetPanRight(dataSource=='ispk');
-	}
-	return noErr;
-}
diff --git a/submodules/libtgvoip/os/darwin/AudioOutputAudioUnitOSX.h b/submodules/libtgvoip/os/darwin/AudioOutputAudioUnitOSX.h
deleted file mode 100644
index 0405b2f1f3..0000000000
--- a/submodules/libtgvoip/os/darwin/AudioOutputAudioUnitOSX.h
+++ /dev/null
@@ -1,42 +0,0 @@
-//
-// libtgvoip is free and unencumbered public domain software.
-// For more information, see http://unlicense.org or the UNLICENSE file
-// you should have received with this source code distribution.
-//
-
-#ifndef LIBTGVOIP_AUDIOOUTPUTAUDIOUNIT_OSX_H
-#define LIBTGVOIP_AUDIOOUTPUTAUDIOUNIT_OSX_H
-
-#include <AudioUnit/AudioUnit.h>
-#import <AudioToolbox/AudioToolbox.h>
-#import <CoreAudio/CoreAudio.h>
-#include "../../audio/AudioOutput.h"
-
-namespace tgvoip{ namespace audio{
-class AudioOutputAudioUnitLegacy : public AudioOutput{
-
-public:
-	AudioOutputAudioUnitLegacy(std::string deviceID);
-	virtual ~AudioOutputAudioUnitLegacy();
-	virtual void Start();
-	virtual void Stop();
-	virtual bool IsPlaying();
-	void HandleBufferCallback(AudioBufferList* ioData);
-	static void EnumerateDevices(std::vector<AudioOutputDevice>& devs);
-	virtual void SetCurrentDevice(std::string deviceID);
-	
-private:
-	static OSStatus BufferCallback(void *inRefCon, AudioUnitRenderActionFlags *ioActionFlags, const AudioTimeStamp *inTimeStamp, UInt32 inBusNumber, UInt32 inNumberFrames, AudioBufferList *ioData);
-	static OSStatus DefaultDeviceChangedCallback(AudioObjectID inObjectID, UInt32 inNumberAddresses, const AudioObjectPropertyAddress *inAddresses, void *inClientData);
-	void SetPanRight(bool panRight);
-	unsigned char remainingData[10240];
-	size_t remainingDataSize;
-	bool isPlaying;
-	AudioUnit unit;
-	int hardwareSampleRate;
-	bool isMacBookPro;
-	AudioDeviceID sysDevID;
-};
-}}
-
-#endif //LIBTGVOIP_AUDIOOUTPUTAUDIOUNIT_OSX_H
diff --git a/submodules/libtgvoip/os/darwin/AudioUnitIO.cpp b/submodules/libtgvoip/os/darwin/AudioUnitIO.cpp
deleted file mode 100644
index 86b3fa43bc..0000000000
--- a/submodules/libtgvoip/os/darwin/AudioUnitIO.cpp
+++ /dev/null
@@ -1,321 +0,0 @@
-//
-// libtgvoip is free and unencumbered public domain software.
-// For more information, see http://unlicense.org or the UNLICENSE file
-// you should have received with this source code distribution.
-//
-#include <stdio.h>
-#include "AudioUnitIO.h"
-#include "AudioInputAudioUnit.h"
-#include "AudioOutputAudioUnit.h"
-#include "../../logging.h"
-#include "../../VoIPController.h"
-#include "../../VoIPServerConfig.h"
-
-#define CHECK_AU_ERROR(res, msg) if(res!=noErr){ LOGE(msg": OSStatus=%d", (int)res); failed=true; return; }
-#define BUFFER_SIZE 960 // 20 ms
-
-#if TARGET_OS_OSX
-#define INPUT_BUFFER_SIZE 20480
-#else
-#define INPUT_BUFFER_SIZE 10240
-#endif
-
-#define kOutputBus 0
-#define kInputBus 1
-
-#if TARGET_OS_OSX && !defined(TGVOIP_NO_OSX_PRIVATE_API)
-extern "C" {
-OSStatus AudioDeviceDuck(AudioDeviceID inDevice,
-                         Float32 inDuckedLevel,
-                         const AudioTimeStamp* __nullable inStartTime,
-                         Float32 inRampDuration) __attribute__((weak_import));
-}
-#endif
-
-using namespace tgvoip;
-using namespace tgvoip::audio;
-
-AudioUnitIO::AudioUnitIO(std::string inputDeviceID, std::string outputDeviceID){
-	input=NULL;
-	output=NULL;
-	inputEnabled=false;
-	outputEnabled=false;
-	failed=false;
-	started=false;
-	inBufferList.mBuffers[0].mData=malloc(INPUT_BUFFER_SIZE);
-	inBufferList.mBuffers[0].mDataByteSize=INPUT_BUFFER_SIZE;
-	inBufferList.mNumberBuffers=1;
-	
-#if TARGET_OS_IPHONE
-	DarwinSpecific::ConfigureAudioSession();
-#endif
-	
-	OSStatus status;
-	AudioComponentDescription desc;
-	AudioComponent inputComponent;
-	desc.componentType = kAudioUnitType_Output;
-	desc.componentSubType = kAudioUnitSubType_VoiceProcessingIO;
-	desc.componentFlags = 0;
-	desc.componentFlagsMask = 0;
-	desc.componentManufacturer = kAudioUnitManufacturer_Apple;
-	inputComponent = AudioComponentFindNext(NULL, &desc);
-	status = AudioComponentInstanceNew(inputComponent, &unit);
-	
-	UInt32 flag=1;
-#if TARGET_OS_IPHONE
-	status = AudioUnitSetProperty(unit, kAudioOutputUnitProperty_EnableIO, kAudioUnitScope_Output, kOutputBus, &flag, sizeof(flag));
-	CHECK_AU_ERROR(status, "Error enabling AudioUnit output");
-	status = AudioUnitSetProperty(unit, kAudioOutputUnitProperty_EnableIO, kAudioUnitScope_Input, kInputBus, &flag, sizeof(flag));
-	CHECK_AU_ERROR(status, "Error enabling AudioUnit input");
-#endif
-	
-#if TARGET_OS_IPHONE
-	flag=ServerConfig::GetSharedInstance()->GetBoolean("use_ios_vpio_agc", true) ? 1 : 0;
-#else
-	flag=ServerConfig::GetSharedInstance()->GetBoolean("use_osx_vpio_agc", true) ? 1 : 0;
-#endif
-	status=AudioUnitSetProperty(unit, kAUVoiceIOProperty_VoiceProcessingEnableAGC, kAudioUnitScope_Global, kInputBus, &flag, sizeof(flag));
-	CHECK_AU_ERROR(status, "Error disabling AGC");
-	
-	AudioStreamBasicDescription audioFormat;
-	audioFormat.mSampleRate			= 48000;
-	audioFormat.mFormatID			= kAudioFormatLinearPCM;
-#if TARGET_OS_IPHONE
-	audioFormat.mFormatFlags		= kAudioFormatFlagIsSignedInteger | kAudioFormatFlagIsPacked | kAudioFormatFlagsNativeEndian;
-	audioFormat.mBitsPerChannel		= 16;
-	audioFormat.mBytesPerPacket		= 2;
-	audioFormat.mBytesPerFrame		= 2;
-#else // OS X
-	audioFormat.mFormatFlags		= kAudioFormatFlagIsFloat | kAudioFormatFlagIsPacked | kAudioFormatFlagsNativeEndian;
-	audioFormat.mBitsPerChannel		= 32;
-	audioFormat.mBytesPerPacket		= 4;
-	audioFormat.mBytesPerFrame		= 4;
-#endif
-	audioFormat.mFramesPerPacket	= 1;
-	audioFormat.mChannelsPerFrame	= 1;
-	
-	status = AudioUnitSetProperty(unit, kAudioUnitProperty_StreamFormat, kAudioUnitScope_Input, kOutputBus, &audioFormat, sizeof(audioFormat));
-	CHECK_AU_ERROR(status, "Error setting output format");
-	status = AudioUnitSetProperty(unit, kAudioUnitProperty_StreamFormat, kAudioUnitScope_Output, kInputBus, &audioFormat, sizeof(audioFormat));
-	CHECK_AU_ERROR(status, "Error setting input format");
-	
-	AURenderCallbackStruct callbackStruct;
-	
-	callbackStruct.inputProc = AudioUnitIO::BufferCallback;
-	callbackStruct.inputProcRefCon = this;
-	status = AudioUnitSetProperty(unit, kAudioUnitProperty_SetRenderCallback, kAudioUnitScope_Global, kOutputBus, &callbackStruct, sizeof(callbackStruct));
-	CHECK_AU_ERROR(status, "Error setting output buffer callback");
-	status = AudioUnitSetProperty(unit, kAudioOutputUnitProperty_SetInputCallback, kAudioUnitScope_Global, kInputBus, &callbackStruct, sizeof(callbackStruct));
-	CHECK_AU_ERROR(status, "Error setting input buffer callback");
-	
-#if TARGET_OS_OSX
-	CFRunLoopRef theRunLoop = NULL;
-	AudioObjectPropertyAddress propertyAddress = { kAudioHardwarePropertyRunLoop,
-		kAudioObjectPropertyScopeGlobal,
-		kAudioObjectPropertyElementMaster };
-	status = AudioObjectSetPropertyData(kAudioObjectSystemObject, &propertyAddress, 0, NULL, sizeof(CFRunLoopRef), &theRunLoop);
-	
-	propertyAddress.mSelector = kAudioHardwarePropertyDefaultOutputDevice;
-	propertyAddress.mScope = kAudioObjectPropertyScopeGlobal;
-	propertyAddress.mElement = kAudioObjectPropertyElementMaster;
-	AudioObjectAddPropertyListener(kAudioObjectSystemObject, &propertyAddress, AudioUnitIO::DefaultDeviceChangedCallback, this);
-	propertyAddress.mSelector = kAudioHardwarePropertyDefaultInputDevice;
-	AudioObjectAddPropertyListener(kAudioObjectSystemObject, &propertyAddress, AudioUnitIO::DefaultDeviceChangedCallback, this);
-	
-	
-#endif
-	
-	
-	input=new AudioInputAudioUnit(inputDeviceID, this);
-	output=new AudioOutputAudioUnit(outputDeviceID, this);
-}
-
-AudioUnitIO::~AudioUnitIO(){
-#if TARGET_OS_OSX
-	AudioObjectPropertyAddress propertyAddress;
-	propertyAddress.mSelector = kAudioHardwarePropertyDefaultOutputDevice;
-	propertyAddress.mScope = kAudioObjectPropertyScopeGlobal;
-	propertyAddress.mElement = kAudioObjectPropertyElementMaster;
-	AudioObjectRemovePropertyListener(kAudioObjectSystemObject, &propertyAddress, AudioUnitIO::DefaultDeviceChangedCallback, this);
-	propertyAddress.mSelector = kAudioHardwarePropertyDefaultInputDevice;
-	AudioObjectRemovePropertyListener(kAudioObjectSystemObject, &propertyAddress, AudioUnitIO::DefaultDeviceChangedCallback, this);
-#endif
-	AudioOutputUnitStop(unit);
-	AudioUnitUninitialize(unit);
-	AudioComponentInstanceDispose(unit);
-	free(inBufferList.mBuffers[0].mData);
-	delete input;
-	delete output;
-}
-
-OSStatus AudioUnitIO::BufferCallback(void *inRefCon, AudioUnitRenderActionFlags *ioActionFlags, const AudioTimeStamp *inTimeStamp, UInt32 inBusNumber, UInt32 inNumberFrames, AudioBufferList *ioData){
-	((AudioUnitIO*)inRefCon)->BufferCallback(ioActionFlags, inTimeStamp, inBusNumber, inNumberFrames, ioData);
-	return noErr;
-}
-
-void AudioUnitIO::BufferCallback(AudioUnitRenderActionFlags *ioActionFlags, const AudioTimeStamp *inTimeStamp, UInt32 bus, UInt32 numFrames, AudioBufferList *ioData){
-	if(bus==kOutputBus){
-		if(output && outputEnabled){
-			output->HandleBufferCallback(ioData);
-		}else{
-			memset(ioData->mBuffers[0].mData, 0, ioData->mBuffers[0].mDataByteSize);
-		}
-	}else if(bus==kInputBus){
-		inBufferList.mBuffers[0].mDataByteSize=INPUT_BUFFER_SIZE;
-		AudioUnitRender(unit, ioActionFlags, inTimeStamp, bus, numFrames, &inBufferList);
-		if(input && inputEnabled){
-			input->HandleBufferCallback(&inBufferList);
-		}
-	}
-}
-
-void AudioUnitIO::EnableInput(bool enabled){
-	inputEnabled=enabled;
-	StartIfNeeded();
-}
-
-void AudioUnitIO::EnableOutput(bool enabled){
-	outputEnabled=enabled;
-	StartIfNeeded();
-#if TARGET_OS_OSX && !defined(TGVOIP_NO_OSX_PRIVATE_API)
-	if(actualDuckingEnabled!=duckingEnabled){
-		actualDuckingEnabled=duckingEnabled;
-    	AudioDeviceDuck(currentOutputDeviceID, duckingEnabled ? 0.177828f : 1.0f, NULL, 0.1f);
-	}
-#endif
-}
-
-void AudioUnitIO::StartIfNeeded(){
-	if(started)
-		return;
-	started=true;
-	OSStatus status = AudioUnitInitialize(unit);
-	CHECK_AU_ERROR(status, "Error initializing AudioUnit");
-	status=AudioOutputUnitStart(unit);
-	CHECK_AU_ERROR(status, "Error starting AudioUnit");
-}
-
-AudioInput* AudioUnitIO::GetInput(){
-	return input;
-}
-
-AudioOutput* AudioUnitIO::GetOutput(){
-	return output;
-}
-
-#if TARGET_OS_OSX
-OSStatus AudioUnitIO::DefaultDeviceChangedCallback(AudioObjectID inObjectID, UInt32 inNumberAddresses, const AudioObjectPropertyAddress *inAddresses, void *inClientData){
-	AudioUnitIO* self=(AudioUnitIO*)inClientData;
-	if(inAddresses[0].mSelector==kAudioHardwarePropertyDefaultOutputDevice){
-		LOGV("System default output device changed");
-		if(self->currentOutputDevice=="default"){
-			self->SetCurrentDevice(false, self->currentOutputDevice);
-		}
-	}else if(inAddresses[0].mSelector==kAudioHardwarePropertyDefaultInputDevice){
-		LOGV("System default input device changed");
-		if(self->currentInputDevice=="default"){
-			self->SetCurrentDevice(true, self->currentInputDevice);
-		}
-	}
-	return noErr;
-}
-
-void AudioUnitIO::SetCurrentDevice(bool input, std::string deviceID){
-	LOGV("Setting current %sput device: %s", input ? "in" : "out", deviceID.c_str());
-	if(started){
-		AudioOutputUnitStop(unit);
-		AudioUnitUninitialize(unit);
-	}
-	UInt32 size=sizeof(AudioDeviceID);
-	AudioDeviceID device=0;
-	OSStatus status;
-	
-	if(deviceID=="default"){
-		AudioObjectPropertyAddress propertyAddress;
-		propertyAddress.mSelector = input ? kAudioHardwarePropertyDefaultInputDevice : kAudioHardwarePropertyDefaultOutputDevice;
-		propertyAddress.mScope = kAudioObjectPropertyScopeGlobal;
-		propertyAddress.mElement = kAudioObjectPropertyElementMaster;
-		UInt32 propsize = sizeof(AudioDeviceID);
-		status = AudioObjectGetPropertyData(kAudioObjectSystemObject, &propertyAddress, 0, NULL, &propsize, &device);
-		CHECK_AU_ERROR(status, "Error getting default device");
-	}else{
-		AudioObjectPropertyAddress propertyAddress = {
-			kAudioHardwarePropertyDevices,
-			kAudioObjectPropertyScopeGlobal,
-			kAudioObjectPropertyElementMaster
-		};
-		UInt32 dataSize = 0;
-		status = AudioObjectGetPropertyDataSize(kAudioObjectSystemObject, &propertyAddress, 0, NULL, &dataSize);
-		CHECK_AU_ERROR(status, "Error getting devices size");
-		UInt32 deviceCount = (UInt32)(dataSize / sizeof(AudioDeviceID));
-		AudioDeviceID audioDevices[deviceCount];
-		status = AudioObjectGetPropertyData(kAudioObjectSystemObject, &propertyAddress, 0, NULL, &dataSize, audioDevices);
-		CHECK_AU_ERROR(status, "Error getting device list");
-		for(UInt32 i = 0; i < deviceCount; ++i) {
-			// Query device UID
-			CFStringRef deviceUID = NULL;
-			dataSize = sizeof(deviceUID);
-			propertyAddress.mSelector = kAudioDevicePropertyDeviceUID;
-			status = AudioObjectGetPropertyData(audioDevices[i], &propertyAddress, 0, NULL, &dataSize, &deviceUID);
-			CHECK_AU_ERROR(status, "Error getting device uid");
-			char buf[1024];
-			CFStringGetCString(deviceUID, buf, 1024, kCFStringEncodingUTF8);
-			if(deviceID==buf){
-				LOGV("Found device for id %s", buf);
-				device=audioDevices[i];
-				break;
-			}
-		}
-		if(!device){
-			LOGW("Requested device not found, using default");
-			SetCurrentDevice(input, "default");
-			return;
-		}
-	}
- 
-	status=AudioUnitSetProperty(unit,
-							  kAudioOutputUnitProperty_CurrentDevice,
-							  kAudioUnitScope_Global,
-								input ? kInputBus : kOutputBus,
-							  &device,
-							  size);
-	CHECK_AU_ERROR(status, "Error setting input device");
-	
-	if(input)
-		currentInputDevice=deviceID;
-	else
-		currentOutputDevice=deviceID;
-	
-	/*AudioObjectPropertyAddress propertyAddress = {
-		kAudioDevicePropertyBufferFrameSize,
-		kAudioObjectPropertyScopeGlobal,
-		kAudioObjectPropertyElementMaster
-	};
-	size=4;
-	UInt32 bufferFrameSize;
-	status=AudioObjectGetPropertyData(device, &propertyAddress, 0, NULL, &size, &bufferFrameSize);
-	if(status==noErr){
-		estimatedDelay=bufferFrameSize/48;
-		LOGD("CoreAudio buffer size for device is %u frames (%u ms)", bufferFrameSize, estimatedDelay);
-	}*/
-	if(started){
-		started=false;
-		StartIfNeeded();
-	}
-	if(!input){
-		currentOutputDeviceID=device;
-	}
-	LOGV("Set current %sput device done", input ? "in" : "out");
-}
-
-void AudioUnitIO::SetDuckingEnabled(bool enabled){
-	duckingEnabled=enabled;
-#ifndef TGVOIP_NO_OSX_PRIVATE_API
-	if(outputEnabled && duckingEnabled!=actualDuckingEnabled){
-		actualDuckingEnabled=enabled;
-    	AudioDeviceDuck(currentOutputDeviceID, enabled ? 0.177828f : 1.0f, NULL, 0.1f);
-	}
-#endif
-}
-
-#endif
diff --git a/submodules/libtgvoip/os/darwin/AudioUnitIO.h b/submodules/libtgvoip/os/darwin/AudioUnitIO.h
deleted file mode 100644
index 981a7e95a1..0000000000
--- a/submodules/libtgvoip/os/darwin/AudioUnitIO.h
+++ /dev/null
@@ -1,55 +0,0 @@
-//
-// libtgvoip is free and unencumbered public domain software.
-// For more information, see http://unlicense.org or the UNLICENSE file
-// you should have received with this source code distribution.
-//
-
-#ifndef LIBTGVOIP_AUDIOUNITIO_H
-#define LIBTGVOIP_AUDIOUNITIO_H
-
-#include <AudioUnit/AudioUnit.h>
-#include <AudioToolbox/AudioToolbox.h>
-#include "../../threading.h"
-#include <string>
-#include "../../audio/AudioIO.h"
-
-namespace tgvoip{ namespace audio{
-class AudioInputAudioUnit;
-class AudioOutputAudioUnit;
-
-	class AudioUnitIO : public AudioIO{
-	public:
-		AudioUnitIO(std::string inputDeviceID, std::string outputDeviceID);
-		~AudioUnitIO();
-		void EnableInput(bool enabled);
-		void EnableOutput(bool enabled);
-		virtual AudioInput* GetInput();
-		virtual AudioOutput* GetOutput();
-#if TARGET_OS_OSX
-		void SetCurrentDevice(bool input, std::string deviceID);
-		void SetDuckingEnabled(bool enabled);
-#endif
-	
-	private:
-		static OSStatus BufferCallback(void *inRefCon, AudioUnitRenderActionFlags *ioActionFlags, const AudioTimeStamp *inTimeStamp, UInt32 inBusNumber, UInt32 inNumberFrames, AudioBufferList *ioData);
-		void BufferCallback(AudioUnitRenderActionFlags *ioActionFlags, const AudioTimeStamp *inTimeStamp, UInt32 bus, UInt32 numFrames, AudioBufferList* ioData);
-		void StartIfNeeded();
-#if TARGET_OS_OSX
-		static OSStatus DefaultDeviceChangedCallback(AudioObjectID inObjectID, UInt32 inNumberAddresses, const AudioObjectPropertyAddress *inAddresses, void *inClientData);
-		std::string currentInputDevice;
-		std::string currentOutputDevice;
-		bool duckingEnabled=true;
-		bool actualDuckingEnabled=true;
-		AudioDeviceID currentOutputDeviceID;
-#endif
-		AudioComponentInstance unit;
-		AudioInputAudioUnit* input;
-		AudioOutputAudioUnit* output;
-		AudioBufferList inBufferList;
-		bool inputEnabled;
-		bool outputEnabled;
-		bool started;
-	};
-}}
-
-#endif /* LIBTGVOIP_AUDIOUNITIO_H */
diff --git a/submodules/libtgvoip/os/darwin/DarwinSpecific.h b/submodules/libtgvoip/os/darwin/DarwinSpecific.h
deleted file mode 100644
index 87cd878edc..0000000000
--- a/submodules/libtgvoip/os/darwin/DarwinSpecific.h
+++ /dev/null
@@ -1,32 +0,0 @@
-//
-// libtgvoip is free and unencumbered public domain software.
-// For more information, see http://unlicense.org or the UNLICENSE file
-// you should have received with this source code distribution.
-//
-
-#ifndef TGVOIP_DARWINSPECIFIC_H
-#define TGVOIP_DARWINSPECIFIC_H
-
-#include <string>
-
-namespace tgvoip {
-	
-	struct CellularCarrierInfo;
-	
-class DarwinSpecific{
-public:
-	enum{
-		THREAD_PRIO_USER_INTERACTIVE,
-		THREAD_PRIO_USER_INITIATED,
-		THREAD_PRIO_UTILITY,
-		THREAD_PRIO_BACKGROUND,
-		THREAD_PRIO_DEFAULT
-	};
-	static void GetSystemName(char* buf, size_t len);
-	static void SetCurrentThreadPriority(int priority);
-	static CellularCarrierInfo GetCarrierInfo();
-	static void ConfigureAudioSession();
-};
-}
-
-#endif //TGVOIP_DARWINSPECIFIC_H
diff --git a/submodules/libtgvoip/os/darwin/DarwinSpecific.mm b/submodules/libtgvoip/os/darwin/DarwinSpecific.mm
deleted file mode 100644
index e0fb63dbd2..0000000000
--- a/submodules/libtgvoip/os/darwin/DarwinSpecific.mm
+++ /dev/null
@@ -1,110 +0,0 @@
-//
-// libtgvoip is free and unencumbered public domain software.
-// For more information, see http://unlicense.org or the UNLICENSE file
-// you should have received with this source code distribution.
-//
-
-#include "DarwinSpecific.h"
-#include "../../VoIPController.h"
-#include "../../logging.h"
-
-#import <Foundation/Foundation.h>
-#if TARGET_OS_IOS
-#import <CoreTelephony/CTTelephonyNetworkInfo.h>
-#import <CoreTelephony/CTCarrier.h>
-#import <AVFoundation/AVFoundation.h>
-#endif
-
-using namespace tgvoip;
-
-void DarwinSpecific::GetSystemName(char* buf, size_t len){
-	NSString* v=[[NSProcessInfo processInfo] operatingSystemVersionString];
-	strcpy(buf, [v UTF8String]);
-	//[v getCString:buf maxLength:sizeof(buf) encoding:NSUTF8StringEncoding];
-}
-
-void DarwinSpecific::SetCurrentThreadPriority(int priority){
-	NSThread* thread=[NSThread currentThread];
-	if([thread respondsToSelector:@selector(setQualityOfService:)]){
-		NSQualityOfService qos;
-		switch(priority){
-			case THREAD_PRIO_USER_INTERACTIVE:
-				qos=NSQualityOfServiceUserInteractive;
-				break;
-			case THREAD_PRIO_USER_INITIATED:
-				qos=NSQualityOfServiceUserInitiated;
-				break;
-			case THREAD_PRIO_UTILITY:
-				qos=NSQualityOfServiceUtility;
-				break;
-			case THREAD_PRIO_BACKGROUND:
-				qos=NSQualityOfServiceBackground;
-				break;
-			case THREAD_PRIO_DEFAULT:
-			default:
-				qos=NSQualityOfServiceDefault;
-				break;
-		}
-		[thread setQualityOfService:qos];
-	}else{
-		double p;
-		switch(priority){
-			case THREAD_PRIO_USER_INTERACTIVE:
-				p=1.0;
-				break;
-			case THREAD_PRIO_USER_INITIATED:
-				p=0.8;
-				break;
-			case THREAD_PRIO_UTILITY:
-				p=0.4;
-				break;
-			case THREAD_PRIO_BACKGROUND:
-				p=0.2;
-				break;
-			case THREAD_PRIO_DEFAULT:
-			default:
-				p=0.5;
-				break;
-		}
-		[NSThread setThreadPriority:p];
-	}
-}
-
-CellularCarrierInfo DarwinSpecific::GetCarrierInfo(){
-	CellularCarrierInfo info;
-#if TARGET_OS_IOS
-	CTTelephonyNetworkInfo* netinfo=[CTTelephonyNetworkInfo new];
-	CTCarrier* carrier=[netinfo subscriberCellularProvider];
-	if(carrier){
-		NSString* name=[carrier carrierName];
-		NSString* mcc=[carrier mobileCountryCode];
-		NSString* mnc=[carrier mobileNetworkCode];
-		NSString* countryCode=[carrier isoCountryCode];
-		if(name && mcc && mnc && countryCode){
-        	info.name=[name cStringUsingEncoding:NSUTF8StringEncoding];
-        	info.mcc=[mcc cStringUsingEncoding:NSUTF8StringEncoding];
-        	info.mnc=[mnc cStringUsingEncoding:NSUTF8StringEncoding];
-        	info.countryCode=[[countryCode uppercaseString] cStringUsingEncoding:NSUTF8StringEncoding];
-		}
-	}
-#endif
-	return info;
-}
-
-void DarwinSpecific::ConfigureAudioSession(){
-#if TARGET_OS_IOS
-	AVAudioSession* session=[AVAudioSession sharedInstance];
-	NSError* error=nil;
-	[session setPreferredSampleRate:48000.0 error:&error];
-	if(error){
-		LOGE("Failed to set preferred sample rate on AVAudioSession: %s", [[error localizedDescription] cStringUsingEncoding:NSUTF8StringEncoding]);
-		return;
-	}
-	[session setPreferredIOBufferDuration:0.020 error:&error];
-	if(error){
-		LOGE("Failed to set preferred IO buffer duration on AVAudioSession: %s", [[error localizedDescription] cStringUsingEncoding:NSUTF8StringEncoding]);
-		return;
-	}
-	LOGI("Configured AVAudioSession: sampleRate=%f, IOBufferDuration=%f", session.sampleRate, session.IOBufferDuration);
-#endif
-}
diff --git a/submodules/libtgvoip/os/darwin/SampleBufferDisplayLayerRenderer.h b/submodules/libtgvoip/os/darwin/SampleBufferDisplayLayerRenderer.h
deleted file mode 100644
index 3cb1b18d95..0000000000
--- a/submodules/libtgvoip/os/darwin/SampleBufferDisplayLayerRenderer.h
+++ /dev/null
@@ -1,40 +0,0 @@
-//
-// libtgvoip is free and unencumbered public domain software.
-// For more information, see http://unlicense.org or the UNLICENSE file
-// you should have received with this source code distribution.
-//
-
-#ifndef TGVOIP_SAMPLEBUFFERDISPLAYLAYERRENDERER
-#define TGVOIP_SAMPLEBUFFERDISPLAYLAYERRENDERER
-
-#include "../../video/VideoRenderer.h"
-#include <vector>
-#include <objc/objc.h>
-#include <VideoToolbox/VideoToolbox.h>
-
-#ifdef __OBJC__
-@class TGVVideoRenderer;
-#else
-typedef struct objc_object TGVVideoRenderer;
-#endif
-
-namespace tgvoip{
-	namespace video{
-		class SampleBufferDisplayLayerRenderer : public VideoRenderer{
-		public:
-			SampleBufferDisplayLayerRenderer(TGVVideoRenderer* renderer);
-			virtual ~SampleBufferDisplayLayerRenderer();
-			virtual void Reset(uint32_t codec, unsigned int width, unsigned int height, std::vector<Buffer>& csd) override;
-			virtual void DecodeAndDisplay(Buffer frame, uint32_t pts) override;
-			virtual void SetStreamEnabled(bool enabled) override;
-			static int GetMaximumResolution();
-			static std::vector<uint32_t> GetAvailableDecoders();
-		private:
-			TGVVideoRenderer* renderer;
-			CMFormatDescriptionRef formatDesc=NULL;
-			bool needReset=false;
-		};
-	}
-}
-
-#endif /* TGVOIP_SAMPLEBUFFERDISPLAYLAYERRENDERER */
diff --git a/submodules/libtgvoip/os/darwin/SampleBufferDisplayLayerRenderer.mm b/submodules/libtgvoip/os/darwin/SampleBufferDisplayLayerRenderer.mm
deleted file mode 100644
index 2df98ba156..0000000000
--- a/submodules/libtgvoip/os/darwin/SampleBufferDisplayLayerRenderer.mm
+++ /dev/null
@@ -1,144 +0,0 @@
-//
-// libtgvoip is free and unencumbered public domain software.
-// For more information, see http://unlicense.org or the UNLICENSE file
-// you should have received with this source code distribution.
-//
-
-#include <TargetConditionals.h>
-#if TARGET_OS_IPHONE
-#include <UIKit/UIKit.h>
-#endif
-#include "SampleBufferDisplayLayerRenderer.h"
-#include "../../PrivateDefines.h"
-#include "../../logging.h"
-#include "TGVVideoRenderer.h"
-
-using namespace tgvoip;
-using namespace tgvoip::video;
-
-SampleBufferDisplayLayerRenderer::SampleBufferDisplayLayerRenderer(TGVVideoRenderer* renderer) : renderer(renderer){
-
-}
-
-SampleBufferDisplayLayerRenderer::~SampleBufferDisplayLayerRenderer(){
-
-}
-
-void SampleBufferDisplayLayerRenderer::Reset(uint32_t codec, unsigned int width, unsigned int height, std::vector<Buffer>& csd){
-	LOGI("video renderer reset: %d x %d", width, height);
-	if(formatDesc){
-		CFRelease(formatDesc);
-	}
-	if(codec==CODEC_AVC){
-		if(csd.size()!=2){
-			LOGE("H264 requires exactly 2 CSD buffers");
-			return;
-		}
-		const uint8_t* params[]={*csd[0]+4, *csd[1]+4};
-		size_t paramSizes[]={csd[0].Length()-4, csd[1].Length()-4};
-		OSStatus status=CMVideoFormatDescriptionCreateFromH264ParameterSets(NULL, 2, params, paramSizes, 4, &formatDesc);
-		if(status!=noErr){
-			LOGE("CMVideoFormatDescriptionCreateFromH264ParameterSets failed: %d", status);
-			return;
-		}
-		CGRect rect=CMVideoFormatDescriptionGetCleanAperture(formatDesc, true);
-		LOGI("size from formatDesc: %f x %f", rect.size.width, rect.size.height);
-	}else if(codec==CODEC_HEVC){
-		if(@available(iOS 11.0, *)){
-    		if(csd.size()!=1){
-    			LOGE("HEVC requires exactly 1 CSD buffer");
-    			return;
-    		}
-    		int offsets[]={0, 0, 0};
-    		Buffer& buf=csd[0];
-    		int currentNAL=0;
-    		for(int i=0;i<buf.Length()-4;i++){
-    			if(buf[i]==0 && buf[i+1]==0 && buf[i+2]==0 && buf[i+3]==1){
-    				offsets[currentNAL]=i+4;
-    				currentNAL++;
-    			}
-    		}
-    		LOGV("CSD NAL offsets: %d %d %d", offsets[0], offsets[1], offsets[2]);
-    		if(offsets[0]==0 || offsets[1]==0 || offsets[2]==0){
-    			LOGE("Error splitting CSD buffer");
-    			return;
-    		}
-    		const uint8_t* params[]={*buf+offsets[0], *buf+offsets[1], *buf+offsets[2]};
-    		size_t paramSizes[]={(size_t)((offsets[1]-4)-offsets[0]), (size_t)((offsets[2]-4)-offsets[1]), (size_t)(buf.Length()-offsets[2])};
-    		OSStatus status=CMVideoFormatDescriptionCreateFromHEVCParameterSets(NULL, 3, params, paramSizes, 4, NULL, &formatDesc);
-    		if(status!=noErr){
-				LOGE("CMVideoFormatDescriptionCreateFromHEVCParameterSets failed: %d", status);
-				return;
-			}
-    		CGRect rect=CMVideoFormatDescriptionGetCleanAperture(formatDesc, true);
-    		LOGI("size from formatDesc: %f x %f", rect.size.width, rect.size.height);
-		}else{
-			LOGE("HEVC not available on this OS");
-		}
-	}
-	needReset=true;
-}
-
-void SampleBufferDisplayLayerRenderer::DecodeAndDisplay(Buffer frame, uint32_t pts){
-	CMBlockBufferRef blockBuffer;
-
-	OSStatus status=CMBlockBufferCreateWithMemoryBlock(kCFAllocatorDefault, *frame, frame.Length(), kCFAllocatorNull, NULL, 0, frame.Length(), 0, &blockBuffer);
-	if(status!=noErr){
-		LOGE("CMBlockBufferCreateWithMemoryBlock failed: %d", status);
-		return;
-	}
-	uint32_t _len=(uint32_t)(frame.Length()-4);
-	uint8_t lenBytes[]={(uint8_t)(_len >> 24), (uint8_t)(_len >> 16), (uint8_t)(_len >> 8), (uint8_t)_len};
-	status=CMBlockBufferReplaceDataBytes(lenBytes, blockBuffer, 0, 4);
-	if(status!=noErr){
-		LOGE("CMBlockBufferReplaceDataBytes failed: %d", status);
-		return;
-	}
-	CMSampleBufferRef sampleBuffer;
-	status=CMSampleBufferCreate(kCFAllocatorDefault, blockBuffer, true, NULL, NULL, formatDesc, 1, 0, NULL, 0, NULL, &sampleBuffer);
-	if(status!=noErr){
-		LOGE("CMSampleBufferCreate failed: %d", status);
-		return;
-	}
-
-	CFRelease(blockBuffer);
-	CFArrayRef attachments=CMSampleBufferGetSampleAttachmentsArray(sampleBuffer, true);
-	CFMutableDictionaryRef dict=(CFMutableDictionaryRef)CFArrayGetValueAtIndex(attachments, 0);
-	CFDictionarySetValue(dict, kCMSampleAttachmentKey_DisplayImmediately, kCFBooleanTrue);
-	
-	[renderer _enqueueBuffer:sampleBuffer reset:needReset];
-	needReset=false;
-	CFRelease(sampleBuffer);
-}
-
-void SampleBufferDisplayLayerRenderer::SetStreamEnabled(bool enabled){
-
-}
-
-int SampleBufferDisplayLayerRenderer::GetMaximumResolution(){
-#if TARGET_OS_IPHONE
-	CGRect screenSize=[UIScreen mainScreen].nativeBounds;
-	CGFloat minSize=std::min(screenSize.size.width, screenSize.size.height);
-	if(minSize>720.f){
-		return INIT_VIDEO_RES_1080;
-	}else if(minSize>480.f){
-		return INIT_VIDEO_RES_720;
-	}else{
-		return INIT_VIDEO_RES_480;
-	}
-#else // OS X
-	// TODO support OS X
-#endif
-	return INIT_VIDEO_RES_1080;
-}
-
-std::vector<uint32_t> SampleBufferDisplayLayerRenderer::GetAvailableDecoders(){
-	std::vector<uint32_t> res;
-	res.push_back(CODEC_AVC);
-	if(@available(iOS 11.0, *)){
-		if(VTIsHardwareDecodeSupported(kCMVideoCodecType_HEVC)){
-			res.push_back(CODEC_HEVC);
-		}
-	}
-	return res;
-}
diff --git a/submodules/libtgvoip/os/darwin/SetupLogging.h b/submodules/libtgvoip/os/darwin/SetupLogging.h
deleted file mode 100644
index ad10754e41..0000000000
--- a/submodules/libtgvoip/os/darwin/SetupLogging.h
+++ /dev/null
@@ -1,3 +0,0 @@
-#import <Foundation/Foundation.h>
-
-extern void (*TGVoipLoggingFunction)(NSString *);
diff --git a/submodules/libtgvoip/os/darwin/TGLogWrapper.h b/submodules/libtgvoip/os/darwin/TGLogWrapper.h
deleted file mode 100644
index 8f111774ff..0000000000
--- a/submodules/libtgvoip/os/darwin/TGLogWrapper.h
+++ /dev/null
@@ -1,20 +0,0 @@
-//
-// libtgvoip is free and unencumbered public domain software.
-// For more information, see http://unlicense.org or the UNLICENSE file
-// you should have received with this source code distribution.
-//
-
-#ifndef TGVOIP_TGLOGWRAPPER_H
-#define TGVOIP_TGLOGWRAPPER_H
-
-#if defined __cplusplus
-extern "C" {
-#endif
-
-void __tgvoip_call_tglog(const char* format, ...);
-	
-#if defined __cplusplus
-};
-#endif
-
-#endif //TGVOIP_TGLOGWRAPPER_H
diff --git a/submodules/libtgvoip/os/darwin/TGLogWrapper.m b/submodules/libtgvoip/os/darwin/TGLogWrapper.m
deleted file mode 100644
index 4739ec8e45..0000000000
--- a/submodules/libtgvoip/os/darwin/TGLogWrapper.m
+++ /dev/null
@@ -1,13 +0,0 @@
-#import <Foundation/Foundation.h>
-
-void (*TGVoipLoggingFunction)(NSString *) = NULL;
-
-void __tgvoip_call_tglog(const char* format, ...){
-	va_list args;
-	va_start(args, format);
-    NSString *string = [[NSString alloc] initWithFormat:[[NSString alloc]initWithUTF8String:format] arguments:args];
-	va_end(args);
-    if (TGVoipLoggingFunction) {
-        TGVoipLoggingFunction(string);
-    }
-}
diff --git a/submodules/libtgvoip/os/darwin/TGVVideoRenderer.h b/submodules/libtgvoip/os/darwin/TGVVideoRenderer.h
deleted file mode 100644
index cbc72188e3..0000000000
--- a/submodules/libtgvoip/os/darwin/TGVVideoRenderer.h
+++ /dev/null
@@ -1,43 +0,0 @@
-//
-// libtgvoip is free and unencumbered public domain software.
-// For more information, see http://unlicense.org or the UNLICENSE file
-// you should have received with this source code distribution.
-//
-
-#import <Foundation/Foundation.h>
-#import <AVFoundation/AVFoundation.h>
-
-namespace tgvoip{
-namespace video{
-class VideoRenderer;
-}
-}
-
-typedef NS_ENUM(int, TGVStreamPauseReason){
-	TGVStreamPauseReasonBackground,
-	TGVStreamPauseReasonPoorConnection
-};
-
-typedef NS_ENUM(int, TGVStreamStopReason){
-	TGVStreamStopReasonUser,
-	TGVStreamStopReasonPoorConnection
-};
-
-@protocol TGVVideoRendererDelegate <NSObject>
-
-- (void)incomingVideoRotationDidChange: (int)rotation;
-- (void)incomingVideoStreamWillStartWithFrameSize: (CGSize)size;
-- (void)incomingVideoStreamDidStopWithReason: (TGVStreamStopReason)reason;
-- (void)incomingVideoStreamDidPauseWithReason: (TGVStreamPauseReason)reason;
-- (void)incomingVideoStreamWillResume;
-
-@end
-
-@interface TGVVideoRenderer : NSObject
-
-- (instancetype)initWithDisplayLayer: (AVSampleBufferDisplayLayer *)layer delegate: (id<TGVVideoRendererDelegate>)delegate;
-- (tgvoip::video::VideoRenderer*)nativeVideoRenderer;
-
-- (void)_enqueueBuffer: (CMSampleBufferRef)buffer reset: (BOOL)reset;
-
-@end
diff --git a/submodules/libtgvoip/os/darwin/TGVVideoRenderer.mm b/submodules/libtgvoip/os/darwin/TGVVideoRenderer.mm
deleted file mode 100644
index f2ccbbfea4..0000000000
--- a/submodules/libtgvoip/os/darwin/TGVVideoRenderer.mm
+++ /dev/null
@@ -1,47 +0,0 @@
-//
-// libtgvoip is free and unencumbered public domain software.
-// For more information, see http://unlicense.org or the UNLICENSE file
-// you should have received with this source code distribution.
-//
-
-#import "TGVVideoRenderer.h"
-#include "SampleBufferDisplayLayerRenderer.h"
-#include "../../logging.h"
-
-@implementation TGVVideoRenderer{
-	AVSampleBufferDisplayLayer* layer;
-	id<TGVVideoRendererDelegate> delegate;
-	tgvoip::video::SampleBufferDisplayLayerRenderer* nativeRenderer;
-}
-
-- (instancetype)initWithDisplayLayer:(AVSampleBufferDisplayLayer *)layer delegate:(nonnull id<TGVVideoRendererDelegate>)delegate{
-	self=[super init];
-	self->layer=layer;
-	self->delegate=delegate;
-	nativeRenderer=new tgvoip::video::SampleBufferDisplayLayerRenderer(self);
-	layer.videoGravity=AVLayerVideoGravityResizeAspect;
-	return self;
-}
-
-- (void)dealloc{
-	delete nativeRenderer;
-}
-
-- (tgvoip::video::VideoRenderer *)nativeVideoRenderer{
-	return nativeRenderer;
-}
-
-- (void)_enqueueBuffer: (CMSampleBufferRef)buffer reset: (BOOL)reset{
-	if(reset){
-		LOGV("Resetting layer");
-		[layer flush];
-	}
-	LOGV("Enqueue buffer");
-    [layer enqueueSampleBuffer:buffer];
-    NSError* error=[layer error];
-    if(error){
-    	LOGE("enqueueSampleBuffer failed: %s", [error.description cStringUsingEncoding:NSUTF8StringEncoding]);
-    }
-}
-
-@end
diff --git a/submodules/libtgvoip/os/darwin/TGVVideoSource.h b/submodules/libtgvoip/os/darwin/TGVVideoSource.h
deleted file mode 100644
index f54de19c4a..0000000000
--- a/submodules/libtgvoip/os/darwin/TGVVideoSource.h
+++ /dev/null
@@ -1,39 +0,0 @@
-//
-// libtgvoip is free and unencumbered public domain software.
-// For more information, see http://unlicense.org or the UNLICENSE file
-// you should have received with this source code distribution.
-//
-
-#import <Foundation/Foundation.h>
-#import <CoreMedia/CoreMedia.h>
-
-namespace tgvoip{
-namespace video{
-class VideoSource;
-}
-}
-
-typedef NS_ENUM(int, TGVVideoResolution){
-	TGVVideoResolution1080,
-	TGVVideoResolution720,
-	TGVVideoResolution480,
-	TGVVideoResolution360
-};
-
-@protocol TGVVideoSourceDelegate <NSObject>
-
-- (void)setFrameRate: (unsigned int)frameRate;
-
-@end
-
-@interface TGVVideoSource : NSObject
-
-- (instancetype)initWithDelegate: (id<TGVVideoSourceDelegate>)delegate;
-- (void)sendVideoFrame: (CMSampleBufferRef)buffer;
-- (TGVVideoResolution)maximumSupportedVideoResolution;
-- (void)setVideoRotation: (int)rotation;
-- (void)pauseStream;
-- (void)resumeStream;
-- (tgvoip::video::VideoSource*)nativeVideoSource;
-
-@end
diff --git a/submodules/libtgvoip/os/darwin/TGVVideoSource.mm b/submodules/libtgvoip/os/darwin/TGVVideoSource.mm
deleted file mode 100644
index 4e40b57c9b..0000000000
--- a/submodules/libtgvoip/os/darwin/TGVVideoSource.mm
+++ /dev/null
@@ -1,51 +0,0 @@
-//
-// libtgvoip is free and unencumbered public domain software.
-// For more information, see http://unlicense.org or the UNLICENSE file
-// you should have received with this source code distribution.
-//
-
-#import "TGVVideoSource.h"
-#include "VideoToolboxEncoderSource.h"
-
-@implementation TGVVideoSource{
-	tgvoip::video::VideoToolboxEncoderSource* nativeSource;
-	id<TGVVideoSourceDelegate> delegate;
-}
-
-
-- (instancetype)initWithDelegate: (id<TGVVideoSourceDelegate>)delegate{
-	self=[super init];
-	nativeSource=new tgvoip::video::VideoToolboxEncoderSource();
-	self->delegate=delegate;
-	return self;
-}
-
-- (void)dealloc{
-	delete nativeSource;
-}
-
-- (void)sendVideoFrame: (CMSampleBufferRef)buffer{
-	nativeSource->EncodeFrame(buffer);
-}
-
-- (TGVVideoResolution)maximumSupportedVideoResolution{
-	return TGVVideoResolution1080;
-}
-
-- (void)setVideoRotation: (int)rotation{
-
-}
-
-- (void)pauseStream{
-
-}
-
-- (void)resumeStream{
-
-}
-
-- (tgvoip::video::VideoSource*)nativeVideoSource{
-	return nativeSource;
-}
-
-@end
diff --git a/submodules/libtgvoip/os/darwin/VideoToolboxEncoderSource.h b/submodules/libtgvoip/os/darwin/VideoToolboxEncoderSource.h
deleted file mode 100644
index d1d2a687cc..0000000000
--- a/submodules/libtgvoip/os/darwin/VideoToolboxEncoderSource.h
+++ /dev/null
@@ -1,41 +0,0 @@
-//
-// libtgvoip is free and unencumbered public domain software.
-// For more information, see http://unlicense.org or the UNLICENSE file
-// you should have received with this source code distribution.
-//
-
-#ifndef LIBTGVOIP_VIDEOTOOLBOXENCODERSOURCE
-#define LIBTGVOIP_VIDEOTOOLBOXENCODERSOURCE
-
-#include "../../video/VideoSource.h"
-#include <CoreMedia/CoreMedia.h>
-#include <VideoToolbox/VideoToolbox.h>
-#include <vector>
-
-namespace tgvoip{
-	namespace video{
-		class VideoToolboxEncoderSource : public VideoSource{
-		public:
-			VideoToolboxEncoderSource();
-			virtual ~VideoToolboxEncoderSource();
-			virtual void Start() override;
-			virtual void Stop() override;
-			virtual void Reset(uint32_t codec, int maxResolution) override;
-			virtual void RequestKeyFrame() override;
-			virtual void SetBitrate(uint32_t bitrate) override;
-			void EncodeFrame(CMSampleBufferRef frame);
-			static std::vector<uint32_t> GetAvailableEncoders();
-		private:
-			void EncoderCallback(OSStatus status, CMSampleBufferRef buffer, VTEncodeInfoFlags flags);
-			void SetEncoderBitrateAndLimit(uint32_t bitrate);
-			bool needUpdateStreamParams=true;
-			uint32_t codec=0;
-			VTCompressionSessionRef session=NULL;
-			bool keyframeRequested=false;
-			uint32_t bitrateChangeRequested=0;
-			uint32_t lastBitrate=512*1024;
-		};
-	}
-}
-
-#endif /* LIBTGVOIP_VIDEOTOOLBOXENCODERSOURCE */
diff --git a/submodules/libtgvoip/os/darwin/VideoToolboxEncoderSource.mm b/submodules/libtgvoip/os/darwin/VideoToolboxEncoderSource.mm
deleted file mode 100644
index dc996c6f91..0000000000
--- a/submodules/libtgvoip/os/darwin/VideoToolboxEncoderSource.mm
+++ /dev/null
@@ -1,255 +0,0 @@
-//
-// libtgvoip is free and unencumbered public domain software.
-// For more information, see http://unlicense.org or the UNLICENSE file
-// you should have received with this source code distribution.
-//
-
-#import <Foundation/Foundation.h>
-#include "VideoToolboxEncoderSource.h"
-#include "../../PrivateDefines.h"
-#include "../../logging.h"
-
-using namespace tgvoip;
-using namespace tgvoip::video;
-
-#define CHECK_ERR(err, msg) if(err!=noErr){LOGE("VideoToolboxEncoder: " msg " failed: %d", err); return;}
-
-VideoToolboxEncoderSource::VideoToolboxEncoderSource(){
-
-}
-
-VideoToolboxEncoderSource::~VideoToolboxEncoderSource(){
-	if(session){
-		CFRelease(session);
-		session=NULL;
-	}
-}
-
-void VideoToolboxEncoderSource::Start(){
-
-}
-
-void VideoToolboxEncoderSource::Stop(){
-
-}
-
-void VideoToolboxEncoderSource::Reset(uint32_t codec, int maxResolution){
-	if(session){
-		LOGV("Releasing old compression session");
-		//VTCompressionSessionCompleteFrames(session, kCMTimeInvalid);
-		VTCompressionSessionInvalidate(session);
-		CFRelease(session);
-		session=NULL;
-		LOGV("Released compression session");
-	}
-	CMVideoCodecType codecType;
-	switch(codec){
-	case CODEC_AVC:
-		codecType=kCMVideoCodecType_H264;
-		break;
-	case CODEC_HEVC:
-		codecType=kCMVideoCodecType_HEVC;
-		break;
-	default:
-		LOGE("VideoToolboxEncoder: Unsupported codec");
-		return;
-	}
-	needUpdateStreamParams=true;
-	this->codec=codec;
-	// typedef void (*VTCompressionOutputCallback)(void *outputCallbackRefCon, void *sourceFrameRefCon, OSStatus status, VTEncodeInfoFlags infoFlags, CMSampleBufferRef sampleBuffer);
-	uint32_t width, height;
-	switch(maxResolution){
-		case INIT_VIDEO_RES_1080:
-			width=1920;
-			height=1080;
-			break;
-		case INIT_VIDEO_RES_720:
-			width=1280;
-			height=720;
-			break;
-		case INIT_VIDEO_RES_480:
-			width=854;
-			height=480;
-			break;
-		case INIT_VIDEO_RES_360:
-		default:
-			width=640;
-			height=360;
-			break;
-	}
-	OSStatus status=VTCompressionSessionCreate(NULL, width, height, codecType, NULL, NULL, NULL, [](void *outputCallbackRefCon, void *sourceFrameRefCon, OSStatus status, VTEncodeInfoFlags infoFlags, CMSampleBufferRef sampleBuffer){
-		reinterpret_cast<VideoToolboxEncoderSource*>(outputCallbackRefCon)->EncoderCallback(status, sampleBuffer, infoFlags);
-	}, this, &session);
-	if(status!=noErr){
-		LOGE("VTCompressionSessionCreate failed: %d", status);
-		return;
-	}
-	LOGD("Created VTCompressionSession");
-	status=VTSessionSetProperty(session, kVTCompressionPropertyKey_AllowFrameReordering, kCFBooleanFalse);
-	CHECK_ERR(status, "VTSessionSetProperty(AllowFrameReordering)");
-	int64_t interval=15;
-	status=VTSessionSetProperty(session, kVTCompressionPropertyKey_MaxKeyFrameIntervalDuration, (__bridge CFTypeRef)@(interval));
-	CHECK_ERR(status, "VTSessionSetProperty(MaxKeyFrameIntervalDuration)");
-	SetEncoderBitrateAndLimit(lastBitrate);
-	status=VTSessionSetProperty(session, kVTCompressionPropertyKey_RealTime, kCFBooleanTrue);
-	CHECK_ERR(status, "VTSessionSetProperty(RealTime)");
-	LOGD("VTCompressionSession initialized");
-	
-	// TODO change camera frame rate dynamically based on resolution + codec
-}
-
-void VideoToolboxEncoderSource::RequestKeyFrame(){
-	keyframeRequested=true;
-}
-
-void VideoToolboxEncoderSource::EncodeFrame(CMSampleBufferRef frame){
-	if(!session)
-		return;
-	CMFormatDescriptionRef format=CMSampleBufferGetFormatDescription(frame);
-	CMMediaType type=CMFormatDescriptionGetMediaType(format);
-	if(type!=kCMMediaType_Video){
-		//LOGW("Received non-video CMSampleBuffer");
-		return;
-	}
-	if(bitrateChangeRequested){
-		LOGI("VideoToolboxEocnder: setting bitrate to %u", bitrateChangeRequested);
-		SetEncoderBitrateAndLimit(bitrateChangeRequested);
-    	lastBitrate=bitrateChangeRequested;
-    	bitrateChangeRequested=0;
-	}
-	CFDictionaryRef frameProps=NULL;
-	if(keyframeRequested){
-		LOGI("VideoToolboxEncoder: requesting keyframe");
-		const void* keys[]={kVTEncodeFrameOptionKey_ForceKeyFrame};
-		const void* values[]={kCFBooleanTrue};
-		frameProps=CFDictionaryCreate(NULL, keys, values, 1, NULL, NULL);
-		keyframeRequested=false;
-	}
-	
-	//CMVideoDimensions size=CMVideoFormatDescriptionGetDimensions(format);
-	//LOGD("EncodeFrame %d x %d", size.width, size.height);
-	CVImageBufferRef imgBuffer=CMSampleBufferGetImageBuffer(frame);
-	//OSType pixFmt=CVPixelBufferGetPixelFormatType(imgBuffer);
-	//LOGV("pixel format: %c%c%c%c", PRINT_FOURCC(pixFmt));
-	OSStatus status=VTCompressionSessionEncodeFrame(session, imgBuffer, CMSampleBufferGetPresentationTimeStamp(frame), CMSampleBufferGetDuration(frame), frameProps, NULL, NULL);
-	CHECK_ERR(status, "VTCompressionSessionEncodeFrame");
-	if(frameProps)
-		CFRelease(frameProps);
-}
-
-void VideoToolboxEncoderSource::SetBitrate(uint32_t bitrate){
-	bitrateChangeRequested=bitrate;
-}
-
-void VideoToolboxEncoderSource::EncoderCallback(OSStatus status, CMSampleBufferRef buffer, VTEncodeInfoFlags flags){
-	if(status!=noErr){
-		LOGE("EncoderCallback error: %d", status);
-		return;
-	}
-	if(flags & kVTEncodeInfo_FrameDropped){
-		LOGW("VideoToolboxEncoder: Frame dropped");
-	}
-	if(!CMSampleBufferGetNumSamples(buffer)){
-		LOGW("Empty CMSampleBuffer");
-		return;
-	}
-	const uint8_t startCode[]={0, 0, 0, 1};
-	if(needUpdateStreamParams){
-		LOGI("VideoToolboxEncoder: Updating stream params");
-		CMFormatDescriptionRef format=CMSampleBufferGetFormatDescription(buffer);
-    	CMVideoDimensions size=CMVideoFormatDescriptionGetDimensions(format);
-    	width=size.width;
-    	height=size.height;
-    	csd.clear();
-    	if(codec==CODEC_AVC){
-			for(size_t i=0;i<2;i++){
-				const uint8_t* ps=NULL;
-				size_t pl=0;
-    			status=CMVideoFormatDescriptionGetH264ParameterSetAtIndex(format, i, &ps, &pl, NULL, NULL);
-    			CHECK_ERR(status, "CMVideoFormatDescriptionGetH264ParameterSetAtIndex");
-				Buffer b(pl+4);
-				b.CopyFrom(ps, 4, pl);
-				b.CopyFrom(startCode, 0, 4);
-				csd.push_back(std::move(b));
-			}
-		}else if(codec==CODEC_HEVC){
-			LOGD("here1");
-			BufferOutputStream csdBuf(1024);
-			for(size_t i=0;i<3;i++){
-				const uint8_t* ps=NULL;
-				size_t pl=0;
-				status=CMVideoFormatDescriptionGetHEVCParameterSetAtIndex(format, i, &ps, &pl, NULL, NULL);
-				CHECK_ERR(status, "CMVideoFormatDescriptionGetHEVCParameterSetAtIndex");
-				csdBuf.WriteBytes(startCode, 4);
-				csdBuf.WriteBytes(ps, pl);
-			}
-			csd.push_back(std::move(csdBuf));
-		}
-		needUpdateStreamParams=false;
-	}
-	CMBlockBufferRef blockBuffer=CMSampleBufferGetDataBuffer(buffer);
-	size_t len=CMBlockBufferGetDataLength(blockBuffer);
-
-	int frameFlags=0;
-	CFArrayRef attachmentsArray=CMSampleBufferGetSampleAttachmentsArray(buffer, 0);
-	if(attachmentsArray && CFArrayGetCount(attachmentsArray)){
-		CFBooleanRef notSync;
-        CFDictionaryRef dict=(CFDictionaryRef)CFArrayGetValueAtIndex(attachmentsArray, 0);
-        BOOL keyExists=CFDictionaryGetValueIfPresent(dict, kCMSampleAttachmentKey_NotSync, (const void **)&notSync);
-        if(!keyExists || !CFBooleanGetValue(notSync)){
-			frameFlags |= VIDEO_FRAME_FLAG_KEYFRAME;
-		}
-	}else{
-		frameFlags |= VIDEO_FRAME_FLAG_KEYFRAME;
-	}
-	
-	Buffer frame(len);
-	CMBlockBufferCopyDataBytes(blockBuffer, 0, len, *frame);
-	uint32_t offset=0;
-	while(offset<len){
-		uint32_t nalLen=CFSwapInt32BigToHost(*reinterpret_cast<uint32_t*>(*frame+offset));
-		//LOGV("NAL length %u", nalLen);
-		frame.CopyFrom(startCode, offset, 4);
-		offset+=nalLen+4;
-	}
-	callback(std::move(frame), frameFlags);
-	
-	//LOGV("EncoderCallback: %u bytes total", (unsigned int)len);
-}
-
-void VideoToolboxEncoderSource::SetEncoderBitrateAndLimit(uint32_t bitrate){
-	OSStatus status=VTSessionSetProperty(session, kVTCompressionPropertyKey_AverageBitRate, (__bridge CFTypeRef)@(bitrate));
-	CHECK_ERR(status, "VTSessionSetProperty(AverageBitRate)");
-	
-	int64_t dataLimitValue=(int64_t)(bitrate/8);
-	CFNumberRef bytesPerSecond=CFNumberCreate(kCFAllocatorDefault, kCFNumberSInt64Type, &dataLimitValue);
-	int64_t oneValue=1;
-	CFNumberRef one=CFNumberCreate(kCFAllocatorDefault, kCFNumberSInt64Type, &oneValue);
-	const void* numbers[]={bytesPerSecond, one};
-	CFArrayRef limits=CFArrayCreate(NULL, numbers, 2, &kCFTypeArrayCallBacks);
-	status=VTSessionSetProperty(session, kVTCompressionPropertyKey_DataRateLimits, limits);
-	CFRelease(bytesPerSecond);
-	CFRelease(one);
-	CFRelease(limits);
-	CHECK_ERR(status, "VTSessionSetProperty(DataRateLimits");
-}
-
-std::vector<uint32_t> VideoToolboxEncoderSource::GetAvailableEncoders(){
-	std::vector<uint32_t> res;
-	res.push_back(CODEC_AVC);
-	CFArrayRef encoders;
-	OSStatus status=VTCopyVideoEncoderList(NULL, &encoders);
-	for(CFIndex i=0;i<CFArrayGetCount(encoders);i++){
-		CFDictionaryRef v=(CFDictionaryRef)CFArrayGetValueAtIndex(encoders, i);
-		NSDictionary* encoder=(__bridge NSDictionary*)v;
-		//NSString* name=(NSString*)CFDictionaryGetValue(v, kVTVideoEncoderList_EncoderName);
-		uint32_t codecType=[(NSNumber*)encoder[(NSString*)kVTVideoEncoderList_CodecType] intValue];
-		//LOGV("Encoders[%u]: %s, %c%c%c%c", i, [(NSString*)encoder[(NSString*)kVTVideoEncoderList_EncoderName] cStringUsingEncoding:NSUTF8StringEncoding], PRINT_FOURCC(codecType));
-		if(codecType==kCMVideoCodecType_HEVC){
-			res.push_back(CODEC_HEVC);
-			break;
-		}
-	}
-	CFRelease(encoders);
-	return res;
-}
diff --git a/submodules/libtgvoip/os/linux/AudioInputALSA.cpp b/submodules/libtgvoip/os/linux/AudioInputALSA.cpp
deleted file mode 100644
index 422dd39528..0000000000
--- a/submodules/libtgvoip/os/linux/AudioInputALSA.cpp
+++ /dev/null
@@ -1,175 +0,0 @@
-//
-// libtgvoip is free and unencumbered public domain software.
-// For more information, see http://unlicense.org or the UNLICENSE file
-// you should have received with this source code distribution.
-//
-
-#include <stdlib.h>
-#include <stdio.h>
-#include <assert.h>
-#include <dlfcn.h>
-#include "AudioInputALSA.h"
-#include "../../logging.h"
-#include "../../VoIPController.h"
-
-using namespace tgvoip::audio;
-
-#define BUFFER_SIZE 960
-#define CHECK_ERROR(res, msg) if(res<0){LOGE(msg ": %s", _snd_strerror(res)); failed=true; return;}
-#define CHECK_DL_ERROR(res, msg) if(!res){LOGE(msg ": %s", dlerror()); failed=true; return;}
-#define LOAD_FUNCTION(lib, name, ref) {ref=(typeof(ref))dlsym(lib, name); CHECK_DL_ERROR(ref, "Error getting entry point for " name);}
-
-AudioInputALSA::AudioInputALSA(std::string devID){
-	isRecording=false;
-	handle=NULL;
-
-	lib=dlopen("libasound.so.2", RTLD_LAZY);
-	if(!lib)
-		lib=dlopen("libasound.so", RTLD_LAZY);
-	if(!lib){
-		LOGE("Error loading libasound: %s", dlerror());
-		failed=true;
-		return;
-	}
-
-	LOAD_FUNCTION(lib, "snd_pcm_open", _snd_pcm_open);
-	LOAD_FUNCTION(lib, "snd_pcm_set_params", _snd_pcm_set_params);
-	LOAD_FUNCTION(lib, "snd_pcm_close", _snd_pcm_close);
-	LOAD_FUNCTION(lib, "snd_pcm_readi", _snd_pcm_readi);
-	LOAD_FUNCTION(lib, "snd_pcm_recover", _snd_pcm_recover);
-	LOAD_FUNCTION(lib, "snd_strerror", _snd_strerror);
-
-	SetCurrentDevice(devID);
-}
-
-AudioInputALSA::~AudioInputALSA(){
-	if(handle)
-		_snd_pcm_close(handle);
-	if(lib)
-		dlclose(lib);
-}
-
-void AudioInputALSA::Start(){
-	if(failed || isRecording)
-		return;
-
-	isRecording=true;
-	thread=new Thread(std::bind(&AudioInputALSA::RunThread, this));
-	thread->SetName("AudioInputALSA");
-	thread->Start();
-}
-
-void AudioInputALSA::Stop(){
-	if(!isRecording)
-		return;
-
-	isRecording=false;
-	thread->Join();
-	delete thread;
-	thread=NULL;
-}
-
-void AudioInputALSA::RunThread(){
-	unsigned char buffer[BUFFER_SIZE*2];
-	snd_pcm_sframes_t frames;
-	while(isRecording){
-		frames=_snd_pcm_readi(handle, buffer, BUFFER_SIZE);
-		if (frames < 0){
-			frames = _snd_pcm_recover(handle, frames, 0);
-		}
-		if (frames < 0) {
-			LOGE("snd_pcm_readi failed: %s\n", _snd_strerror(frames));
-			break;
-		}
-		InvokeCallback(buffer, sizeof(buffer));
-	}
-}
-
-void AudioInputALSA::SetCurrentDevice(std::string devID){
-	bool wasRecording=isRecording;
-	isRecording=false;
-	if(handle){
-		thread->Join();
-		_snd_pcm_close(handle);
-	}
-	currentDevice=devID;
-
-	int res=_snd_pcm_open(&handle, devID.c_str(), SND_PCM_STREAM_CAPTURE, 0);
-	if(res<0)
-		res=_snd_pcm_open(&handle, "default", SND_PCM_STREAM_CAPTURE, 0);
-	CHECK_ERROR(res, "snd_pcm_open failed");
-
-	res=_snd_pcm_set_params(handle, SND_PCM_FORMAT_S16, SND_PCM_ACCESS_RW_INTERLEAVED, 1, 48000, 1, 100000);
-	CHECK_ERROR(res, "snd_pcm_set_params failed");
-
-	if(wasRecording){
-		isRecording=true;
-		thread->Start();
-	}
-}
-
-void AudioInputALSA::EnumerateDevices(std::vector<AudioInputDevice>& devs){
-	int (*_snd_device_name_hint)(int card, const char* iface, void*** hints);
-	char* (*_snd_device_name_get_hint)(const void* hint, const char* id);
-	int (*_snd_device_name_free_hint)(void** hinst);
-	void* lib=dlopen("libasound.so.2", RTLD_LAZY);
-	if(!lib)
-		dlopen("libasound.so", RTLD_LAZY);
-	if(!lib)
-		return;
-
-	_snd_device_name_hint=(typeof(_snd_device_name_hint))dlsym(lib, "snd_device_name_hint");
-	_snd_device_name_get_hint=(typeof(_snd_device_name_get_hint))dlsym(lib, "snd_device_name_get_hint");
-	_snd_device_name_free_hint=(typeof(_snd_device_name_free_hint))dlsym(lib, "snd_device_name_free_hint");
-
-	if(!_snd_device_name_hint || !_snd_device_name_get_hint || !_snd_device_name_free_hint){
-		dlclose(lib);
-		return;
-	}
-
-	char** hints;
-	int err=_snd_device_name_hint(-1, "pcm", (void***)&hints);
-	if(err!=0){
-		dlclose(lib);
-		return;
-	}
-
-	char** n=hints;
-	while(*n){
-		char* name=_snd_device_name_get_hint(*n, "NAME");
-		if(strncmp(name, "surround", 8)==0 || strcmp(name, "null")==0){
-			free(name);
-			n++;
-			continue;
-		}
-		char* desc=_snd_device_name_get_hint(*n, "DESC");
-		char* ioid=_snd_device_name_get_hint(*n, "IOID");
-		if(!ioid || strcmp(ioid, "Input")==0){
-			char* l1=strtok(desc, "\n");
-			char* l2=strtok(NULL, "\n");
-			char* tmp=strtok(l1, ",");
-			char* actualName=tmp;
-			while((tmp=strtok(NULL, ","))){
-				actualName=tmp;
-			}
-			if(actualName[0]==' ')
-				actualName++;
-			AudioInputDevice dev;
-			dev.id=std::string(name);
-			if(l2){
-				char buf[256];
-				snprintf(buf, sizeof(buf), "%s (%s)", actualName, l2);
-				dev.displayName=std::string(buf);
-			}else{
-				dev.displayName=std::string(actualName);
-			}
-			devs.push_back(dev);
-		}
-		free(name);
-		free(desc);
-		free(ioid);
-		n++;
-	}
-
-	dlclose(lib);
-}
diff --git a/submodules/libtgvoip/os/linux/AudioInputALSA.h b/submodules/libtgvoip/os/linux/AudioInputALSA.h
deleted file mode 100644
index 09888ddddf..0000000000
--- a/submodules/libtgvoip/os/linux/AudioInputALSA.h
+++ /dev/null
@@ -1,46 +0,0 @@
-//
-// libtgvoip is free and unencumbered public domain software.
-// For more information, see http://unlicense.org or the UNLICENSE file
-// you should have received with this source code distribution.
-//
-
-#ifndef LIBTGVOIP_AUDIOINPUTALSA_H
-#define LIBTGVOIP_AUDIOINPUTALSA_H
-
-#include "../../audio/AudioInput.h"
-#include "../../threading.h"
-#include <alsa/asoundlib.h>
-
-namespace tgvoip{
-namespace audio{
-
-class AudioInputALSA : public AudioInput{
-
-public:
-	AudioInputALSA(std::string devID);
-	virtual ~AudioInputALSA();
-	virtual void Start();
-	virtual void Stop();
-	virtual void SetCurrentDevice(std::string devID);
-	static void EnumerateDevices(std::vector<AudioInputDevice>& devs);
-
-private:
-	void RunThread();
-
-	int (*_snd_pcm_open)(snd_pcm_t** pcm, const char* name, snd_pcm_stream_t stream, int mode);
-	int (*_snd_pcm_set_params)(snd_pcm_t* pcm, snd_pcm_format_t format, snd_pcm_access_t access, unsigned int channels, unsigned int rate, int soft_resample, unsigned int latency);
-	int (*_snd_pcm_close)(snd_pcm_t* pcm);
-	snd_pcm_sframes_t (*_snd_pcm_readi)(snd_pcm_t *pcm, const void *buffer, snd_pcm_uframes_t size);
-	int (*_snd_pcm_recover)(snd_pcm_t* pcm, int err, int silent);
-	const char* (*_snd_strerror)(int errnum);
-	void* lib;
-
-	snd_pcm_t* handle;
-	Thread* thread;
-	bool isRecording;
-};
-
-}
-}
-
-#endif //LIBTGVOIP_AUDIOINPUTALSA_H
diff --git a/submodules/libtgvoip/os/linux/AudioInputPulse.cpp b/submodules/libtgvoip/os/linux/AudioInputPulse.cpp
deleted file mode 100644
index be7366b260..0000000000
--- a/submodules/libtgvoip/os/linux/AudioInputPulse.cpp
+++ /dev/null
@@ -1,204 +0,0 @@
-//
-// libtgvoip is free and unencumbered public domain software.
-// For more information, see http://unlicense.org or the UNLICENSE file
-// you should have received with this source code distribution.
-//
-
-
-#include <assert.h>
-#include <dlfcn.h>
-#include <unistd.h>
-#include "AudioInputPulse.h"
-#include "../../logging.h"
-#include "../../VoIPController.h"
-#include "AudioPulse.h"
-#include "PulseFunctions.h"
-#if !defined(__GLIBC__)
-#include <libgen.h>
-#endif
-
-#define BUFFER_SIZE 960
-#define CHECK_ERROR(res, msg) if(res!=0){LOGE(msg " failed: %s", pa_strerror(res)); failed=true; return;}
-
-using namespace tgvoip::audio;
-
-AudioInputPulse::AudioInputPulse(pa_context* context, pa_threaded_mainloop* mainloop, std::string devID){
-	isRecording=false;
-	isConnected=false;
-	didStart=false;
-
-	this->mainloop=mainloop;
-	this->context=context;
-	stream=NULL;
-	remainingDataSize=0;
-
-	pa_threaded_mainloop_lock(mainloop);
-
-	stream=CreateAndInitStream();
-	pa_threaded_mainloop_unlock(mainloop);
-	isLocked=false;
-	if(!stream){
-		return;
-	}
-
-	SetCurrentDevice(devID);
-}
-
-AudioInputPulse::~AudioInputPulse(){
-	if(stream){
-		pa_stream_disconnect(stream);
-		pa_stream_unref(stream);
-	}
-}
-
-pa_stream* AudioInputPulse::CreateAndInitStream(){
-	pa_sample_spec sampleSpec{
-		.format=PA_SAMPLE_S16LE,
-		.rate=48000,
-		.channels=1
-	};
-	pa_proplist* proplist=pa_proplist_new();
-	pa_proplist_sets(proplist, PA_PROP_FILTER_APPLY, ""); // according to PA sources, this disables any possible filters
-	pa_stream* stream=pa_stream_new_with_proplist(context, "libtgvoip capture", &sampleSpec, NULL, proplist);
-	pa_proplist_free(proplist);
-	if(!stream){
-		LOGE("Error initializing PulseAudio (pa_stream_new)");
-		failed=true;
-		return NULL;
-	}
-	pa_stream_set_state_callback(stream, AudioInputPulse::StreamStateCallback, this);
-	pa_stream_set_read_callback(stream, AudioInputPulse::StreamReadCallback, this);
-	return stream;
-}
-
-void AudioInputPulse::Start(){
-	if(failed || isRecording)
-		return;
-
-	pa_threaded_mainloop_lock(mainloop);
-	isRecording=true;
-	pa_operation_unref(pa_stream_cork(stream, 0, NULL, NULL));
-	pa_threaded_mainloop_unlock(mainloop);
-}
-
-void AudioInputPulse::Stop(){
-	if(!isRecording)
-		return;
-
-	isRecording=false;
-	pa_threaded_mainloop_lock(mainloop);
-	pa_operation_unref(pa_stream_cork(stream, 1, NULL, NULL));
-	pa_threaded_mainloop_unlock(mainloop);
-}
-
-bool AudioInputPulse::IsRecording(){
-	return isRecording;
-}
-
-void AudioInputPulse::SetCurrentDevice(std::string devID){
-	pa_threaded_mainloop_lock(mainloop);
-	currentDevice=devID;
-	if(isRecording && isConnected){
-		pa_stream_disconnect(stream);
-		pa_stream_unref(stream);
-		isConnected=false;
-		stream=CreateAndInitStream();
-	}
-
-	pa_buffer_attr bufferAttr={
-		.maxlength=(uint32_t)-1,
-		.tlength=(uint32_t)-1,
-		.prebuf=(uint32_t)-1,
-		.minreq=(uint32_t)-1,
-		.fragsize=960*2
-	};
-	int streamFlags=PA_STREAM_START_CORKED | PA_STREAM_INTERPOLATE_TIMING | PA_STREAM_AUTO_TIMING_UPDATE | PA_STREAM_ADJUST_LATENCY;
-
-	int err=pa_stream_connect_record(stream, devID=="default" ? NULL : devID.c_str(), &bufferAttr, (pa_stream_flags_t)streamFlags);
-	if(err!=0){
-		pa_threaded_mainloop_unlock(mainloop);
-		/*if(devID!="default"){
-			SetCurrentDevice("default");
-			return;
-		}*/
-	}
-	CHECK_ERROR(err, "pa_stream_connect_record");
-
-	while(true){
-		pa_stream_state_t streamState=pa_stream_get_state(stream);
-		if(!PA_STREAM_IS_GOOD(streamState)){
-			LOGE("Error connecting to audio device '%s'", devID.c_str());
-			pa_threaded_mainloop_unlock(mainloop);
-			failed=true;
-			return;
-		}
-		if(streamState==PA_STREAM_READY)
-			break;
-		pa_threaded_mainloop_wait(mainloop);
-	}
-
-	isConnected=true;
-
-	if(isRecording){
-		pa_operation_unref(pa_stream_cork(stream, 0, NULL, NULL));
-	}
-	pa_threaded_mainloop_unlock(mainloop);
-}
-
-bool AudioInputPulse::EnumerateDevices(std::vector<AudioInputDevice>& devs){
-	return AudioPulse::DoOneOperation([&](pa_context* ctx){
-		return pa_context_get_source_info_list(ctx, [](pa_context* ctx, const pa_source_info* info, int eol, void* userdata){
-			if(eol>0)
-				return;
-			std::vector<AudioInputDevice>* devs=(std::vector<AudioInputDevice>*)userdata;
-			AudioInputDevice dev;
-			dev.id=std::string(info->name);
-			dev.displayName=std::string(info->description);
-			devs->push_back(dev);
-		}, &devs);
-	});
-}
-
-void AudioInputPulse::StreamStateCallback(pa_stream *s, void* arg) {
-	AudioInputPulse* self=(AudioInputPulse*) arg;
-	pa_threaded_mainloop_signal(self->mainloop, 0);
-}
-
-void AudioInputPulse::StreamReadCallback(pa_stream *stream, size_t requestedBytes, void *userdata){
-	((AudioInputPulse*)userdata)->StreamReadCallback(stream, requestedBytes);
-}
-
-void AudioInputPulse::StreamReadCallback(pa_stream *stream, size_t requestedBytes) {
-	size_t bytesRemaining = requestedBytes;
-	uint8_t *buffer = NULL;
-	pa_usec_t latency;
-	if(pa_stream_get_latency(stream, &latency, NULL)==0){
-		estimatedDelay=(int32_t)(latency/100);
-	}
-	while (bytesRemaining > 0) {
-		size_t bytesToFill = 102400;
-
-		if (bytesToFill > bytesRemaining) bytesToFill = bytesRemaining;
-
-		int err=pa_stream_peek(stream, (const void**) &buffer, &bytesToFill);
-		CHECK_ERROR(err, "pa_stream_peek");
-
-		if(isRecording){
-			if(remainingDataSize+bytesToFill>sizeof(remainingData)){
-				LOGE("Capture buffer is too big (%d)", (int)bytesToFill);
-			}
-			memcpy(remainingData+remainingDataSize, buffer, bytesToFill);
-			remainingDataSize+=bytesToFill;
-			while(remainingDataSize>=960*2){
-				InvokeCallback(remainingData, 960*2);
-				memmove(remainingData, remainingData+960*2, remainingDataSize-960*2);
-				remainingDataSize-=960*2;
-			}
-		}
-
-		err=pa_stream_drop(stream);
-		CHECK_ERROR(err, "pa_stream_drop");
-
-		bytesRemaining -= bytesToFill;
-	}
-}
diff --git a/submodules/libtgvoip/os/linux/AudioInputPulse.h b/submodules/libtgvoip/os/linux/AudioInputPulse.h
deleted file mode 100644
index e1d29948b3..0000000000
--- a/submodules/libtgvoip/os/linux/AudioInputPulse.h
+++ /dev/null
@@ -1,52 +0,0 @@
-//
-// libtgvoip is free and unencumbered public domain software.
-// For more information, see http://unlicense.org or the UNLICENSE file
-// you should have received with this source code distribution.
-//
-
-#ifndef LIBTGVOIP_AUDIOINPUTPULSE_H
-#define LIBTGVOIP_AUDIOINPUTPULSE_H
-
-#include "../../audio/AudioInput.h"
-#include "../../threading.h"
-#include <pulse/pulseaudio.h>
-
-#define DECLARE_DL_FUNCTION(name) typeof(name)* _import_##name
-
-namespace tgvoip{
-namespace audio{
-
-class AudioInputPulse : public AudioInput{
-public:
-	AudioInputPulse(pa_context* context, pa_threaded_mainloop* mainloop, std::string devID);
-	virtual ~AudioInputPulse();
-	virtual void Start();
-	virtual void Stop();
-	virtual bool IsRecording();
-	virtual void SetCurrentDevice(std::string devID);
-	static bool EnumerateDevices(std::vector<AudioInputDevice>& devs);
-
-private:
-	static void StreamStateCallback(pa_stream* s, void* arg);
-	static void StreamReadCallback(pa_stream* stream, size_t requested_bytes, void* userdata);
-	void StreamReadCallback(pa_stream* stream, size_t requestedBytes);
-	pa_stream* CreateAndInitStream();
-
-	pa_threaded_mainloop* mainloop;
-	pa_context* context;
-	pa_stream* stream;
-
-	bool isRecording;
-	bool isConnected;
-	bool didStart;
-	bool isLocked;
-	unsigned char remainingData[960*8*2];
-	size_t remainingDataSize;
-};
-
-}
-}
-
-#undef DECLARE_DL_FUNCTION
-
-#endif //LIBTGVOIP_AUDIOINPUTPULSE_H
diff --git a/submodules/libtgvoip/os/linux/AudioOutputALSA.cpp b/submodules/libtgvoip/os/linux/AudioOutputALSA.cpp
deleted file mode 100644
index dd2f436d56..0000000000
--- a/submodules/libtgvoip/os/linux/AudioOutputALSA.cpp
+++ /dev/null
@@ -1,177 +0,0 @@
-//
-// libtgvoip is free and unencumbered public domain software.
-// For more information, see http://unlicense.org or the UNLICENSE file
-// you should have received with this source code distribution.
-//
-
-
-#include <assert.h>
-#include <dlfcn.h>
-#include "AudioOutputALSA.h"
-#include "../../logging.h"
-#include "../../VoIPController.h"
-
-#define BUFFER_SIZE 960
-#define CHECK_ERROR(res, msg) if(res<0){LOGE(msg ": %s", _snd_strerror(res)); failed=true; return;}
-#define CHECK_DL_ERROR(res, msg) if(!res){LOGE(msg ": %s", dlerror()); failed=true; return;}
-#define LOAD_FUNCTION(lib, name, ref) {ref=(typeof(ref))dlsym(lib, name); CHECK_DL_ERROR(ref, "Error getting entry point for " name);}
-
-using namespace tgvoip::audio;
-
-AudioOutputALSA::AudioOutputALSA(std::string devID){
-	isPlaying=false;
-	handle=NULL;
-
-	lib=dlopen("libasound.so.2", RTLD_LAZY);
-	if(!lib)
-		lib=dlopen("libasound.so", RTLD_LAZY);
-	if(!lib){
-		LOGE("Error loading libasound: %s", dlerror());
-		failed=true;
-		return;
-	}
-
-	LOAD_FUNCTION(lib, "snd_pcm_open", _snd_pcm_open);
-	LOAD_FUNCTION(lib, "snd_pcm_set_params", _snd_pcm_set_params);
-	LOAD_FUNCTION(lib, "snd_pcm_close", _snd_pcm_close);
-	LOAD_FUNCTION(lib, "snd_pcm_writei", _snd_pcm_writei);
-	LOAD_FUNCTION(lib, "snd_pcm_recover", _snd_pcm_recover);
-	LOAD_FUNCTION(lib, "snd_strerror", _snd_strerror);
-
-	SetCurrentDevice(devID);
-}
-
-AudioOutputALSA::~AudioOutputALSA(){
-	if(handle)
-		_snd_pcm_close(handle);
-	if(lib)
-		dlclose(lib);
-}
-
-void AudioOutputALSA::Start(){
-	if(failed || isPlaying)
-		return;
-
-	isPlaying=true;
-	thread=new Thread(std::bind(&AudioOutputALSA::RunThread, this));
-	thread->SetName("AudioOutputALSA");
-	thread->Start();
-}
-
-void AudioOutputALSA::Stop(){
-	if(!isPlaying)
-		return;
-
-	isPlaying=false;
-	thread->Join();
-	delete thread;
-	thread=NULL;
-}
-
-bool AudioOutputALSA::IsPlaying(){
-	return isPlaying;
-}
-void AudioOutputALSA::RunThread(){
-	unsigned char buffer[BUFFER_SIZE*2];
-	snd_pcm_sframes_t frames;
-	while(isPlaying){
-		InvokeCallback(buffer, sizeof(buffer));
-		frames=_snd_pcm_writei(handle, buffer, BUFFER_SIZE);
-		if (frames < 0){
-			frames = _snd_pcm_recover(handle, frames, 0);
-		}
-		if (frames < 0) {
-			LOGE("snd_pcm_writei failed: %s\n", _snd_strerror(frames));
-			break;
-		}
-	}
-}
-
-void AudioOutputALSA::SetCurrentDevice(std::string devID){
-	bool wasPlaying=isPlaying;
-	isPlaying=false;
-	if(handle){
-		thread->Join();
-		_snd_pcm_close(handle);
-	}
-	currentDevice=devID;
-
-	int res=_snd_pcm_open(&handle, devID.c_str(), SND_PCM_STREAM_PLAYBACK, 0);
-	if(res<0)
-		res=_snd_pcm_open(&handle, "default", SND_PCM_STREAM_PLAYBACK, 0);
-	CHECK_ERROR(res, "snd_pcm_open failed");
-
-	res=_snd_pcm_set_params(handle, SND_PCM_FORMAT_S16, SND_PCM_ACCESS_RW_INTERLEAVED, 1, 48000, 1, 100000);
-	CHECK_ERROR(res, "snd_pcm_set_params failed");
-
-	if(wasPlaying){
-		isPlaying=true;
-		thread->Start();
-	}
-}
-
-void AudioOutputALSA::EnumerateDevices(std::vector<AudioOutputDevice>& devs){
-	int (*_snd_device_name_hint)(int card, const char* iface, void*** hints);
-	char* (*_snd_device_name_get_hint)(const void* hint, const char* id);
-	int (*_snd_device_name_free_hint)(void** hinst);
-	void* lib=dlopen("libasound.so.2", RTLD_LAZY);
-	if(!lib)
-		dlopen("libasound.so", RTLD_LAZY);
-	if(!lib)
-		return;
-
-	_snd_device_name_hint=(typeof(_snd_device_name_hint))dlsym(lib, "snd_device_name_hint");
-	_snd_device_name_get_hint=(typeof(_snd_device_name_get_hint))dlsym(lib, "snd_device_name_get_hint");
-	_snd_device_name_free_hint=(typeof(_snd_device_name_free_hint))dlsym(lib, "snd_device_name_free_hint");
-
-	if(!_snd_device_name_hint || !_snd_device_name_get_hint || !_snd_device_name_free_hint){
-		dlclose(lib);
-		return;
-	}
-
-	char** hints;
-	int err=_snd_device_name_hint(-1, "pcm", (void***)&hints);
-	if(err!=0){
-		dlclose(lib);
-		return;
-	}
-
-	char** n=hints;
-	while(*n){
-		char* name=_snd_device_name_get_hint(*n, "NAME");
-		if(strncmp(name, "surround", 8)==0 || strcmp(name, "null")==0){
-			free(name);
-			n++;
-			continue;
-		}
-		char* desc=_snd_device_name_get_hint(*n, "DESC");
-		char* ioid=_snd_device_name_get_hint(*n, "IOID");
-		if(!ioid || strcmp(ioid, "Output")==0){
-			char* l1=strtok(desc, "\n");
-			char* l2=strtok(NULL, "\n");
-			char* tmp=strtok(l1, ",");
-			char* actualName=tmp;
-			while((tmp=strtok(NULL, ","))){
-				actualName=tmp;
-			}
-			if(actualName[0]==' ')
-				actualName++;
-			AudioOutputDevice dev;
-			dev.id=std::string(name);
-			if(l2){
-				char buf[256];
-				snprintf(buf, sizeof(buf), "%s (%s)", actualName, l2);
-				dev.displayName=std::string(buf);
-			}else{
-				dev.displayName=std::string(actualName);
-			}
-			devs.push_back(dev);
-		}
-		free(name);
-		free(desc);
-		free(ioid);
-		n++;
-	}
-
-	dlclose(lib);
-}
diff --git a/submodules/libtgvoip/os/linux/AudioOutputALSA.h b/submodules/libtgvoip/os/linux/AudioOutputALSA.h
deleted file mode 100644
index 7cf80fb9ab..0000000000
--- a/submodules/libtgvoip/os/linux/AudioOutputALSA.h
+++ /dev/null
@@ -1,46 +0,0 @@
-//
-// libtgvoip is free and unencumbered public domain software.
-// For more information, see http://unlicense.org or the UNLICENSE file
-// you should have received with this source code distribution.
-//
-
-#ifndef LIBTGVOIP_AUDIOOUTPUTALSA_H
-#define LIBTGVOIP_AUDIOOUTPUTALSA_H
-
-#include "../../audio/AudioOutput.h"
-#include "../../threading.h"
-#include <alsa/asoundlib.h>
-
-namespace tgvoip{
-namespace audio{
-
-class AudioOutputALSA : public AudioOutput{
-public:
-	AudioOutputALSA(std::string devID);
-	virtual ~AudioOutputALSA();
-	virtual void Start();
-	virtual void Stop();
-	virtual bool IsPlaying();
-	virtual void SetCurrentDevice(std::string devID);
-	static void EnumerateDevices(std::vector<AudioOutputDevice>& devs);
-
-private:
-	void RunThread();
-
-	int (*_snd_pcm_open)(snd_pcm_t** pcm, const char* name, snd_pcm_stream_t stream, int mode);
-	int (*_snd_pcm_set_params)(snd_pcm_t* pcm, snd_pcm_format_t format, snd_pcm_access_t access, unsigned int channels, unsigned int rate, int soft_resample, unsigned int latency);
-	int (*_snd_pcm_close)(snd_pcm_t* pcm);
-	snd_pcm_sframes_t (*_snd_pcm_writei)(snd_pcm_t *pcm, const void *buffer, snd_pcm_uframes_t size);
-	int (*_snd_pcm_recover)(snd_pcm_t* pcm, int err, int silent);
-	const char* (*_snd_strerror)(int errnum);
-	void* lib;
-
-	snd_pcm_t* handle;
-	Thread* thread;
-	bool isPlaying;
-};
-
-}
-}
-
-#endif //LIBTGVOIP_AUDIOOUTPUTALSA_H
diff --git a/submodules/libtgvoip/os/linux/AudioOutputPulse.cpp b/submodules/libtgvoip/os/linux/AudioOutputPulse.cpp
deleted file mode 100644
index bcdacb7050..0000000000
--- a/submodules/libtgvoip/os/linux/AudioOutputPulse.cpp
+++ /dev/null
@@ -1,187 +0,0 @@
-//
-// libtgvoip is free and unencumbered public domain software.
-// For more information, see http://unlicense.org or the UNLICENSE file
-// you should have received with this source code distribution.
-//
-
-
-#include <assert.h>
-#include <dlfcn.h>
-#include <unistd.h>
-#include "AudioOutputPulse.h"
-#include "../../logging.h"
-#include "../../VoIPController.h"
-#include "AudioPulse.h"
-#include "PulseFunctions.h"
-#if !defined(__GLIBC__)
-#include <libgen.h>
-#endif
-
-#define BUFFER_SIZE 960
-#define CHECK_ERROR(res, msg) if(res!=0){LOGE(msg " failed: %s", pa_strerror(res)); failed=true; return;}
-
-using namespace tgvoip;
-using namespace tgvoip::audio;
-
-AudioOutputPulse::AudioOutputPulse(pa_context* context, pa_threaded_mainloop* mainloop, std::string devID){
-	isPlaying=false;
-	isConnected=false;
-	didStart=false;
-	isLocked=false;
-
-	this->mainloop=mainloop;
-	this->context=context;
-	stream=NULL;
-	remainingDataSize=0;
-
-	pa_threaded_mainloop_lock(mainloop);
-	stream=CreateAndInitStream();
-	pa_threaded_mainloop_unlock(mainloop);
-
-	SetCurrentDevice(devID);
-}
-
-AudioOutputPulse::~AudioOutputPulse(){
-	if(stream){
-		pa_stream_disconnect(stream);
-		pa_stream_unref(stream);
-	}
-}
-
-pa_stream* AudioOutputPulse::CreateAndInitStream(){
-	pa_sample_spec sampleSpec{
-		.format=PA_SAMPLE_S16LE,
-		.rate=48000,
-		.channels=1
-	};
-	pa_proplist* proplist=pa_proplist_new();
-	pa_proplist_sets(proplist, PA_PROP_FILTER_APPLY, ""); // according to PA sources, this disables any possible filters
-	pa_stream* stream=pa_stream_new_with_proplist(context, "libtgvoip playback", &sampleSpec, NULL, proplist);
-	pa_proplist_free(proplist);
-	if(!stream){
-		LOGE("Error initializing PulseAudio (pa_stream_new)");
-		failed=true;
-		return NULL;
-	}
-	pa_stream_set_state_callback(stream, AudioOutputPulse::StreamStateCallback, this);
-	pa_stream_set_write_callback(stream, AudioOutputPulse::StreamWriteCallback, this);
-	return stream;
-}
-
-void AudioOutputPulse::Start(){
-	if(failed || isPlaying)
-		return;
-
-	isPlaying=true;
-	pa_threaded_mainloop_lock(mainloop);
-	pa_operation_unref(pa_stream_cork(stream, 0, NULL, NULL));
-	pa_threaded_mainloop_unlock(mainloop);
-}
-
-void AudioOutputPulse::Stop(){
-	if(!isPlaying)
-		return;
-
-	isPlaying=false;
-	pa_threaded_mainloop_lock(mainloop);
-	pa_operation_unref(pa_stream_cork(stream, 1, NULL, NULL));
-	pa_threaded_mainloop_unlock(mainloop);
-}
-
-bool AudioOutputPulse::IsPlaying(){
-	return isPlaying;
-}
-
-void AudioOutputPulse::SetCurrentDevice(std::string devID){
-	pa_threaded_mainloop_lock(mainloop);
-	currentDevice=devID;
-	if(isPlaying && isConnected){
-		pa_stream_disconnect(stream);
-		pa_stream_unref(stream);
-		isConnected=false;
-		stream=CreateAndInitStream();
-	}
-
-	pa_buffer_attr bufferAttr={
-		.maxlength=(uint32_t)-1,
-		.tlength=960*2,
-		.prebuf=(uint32_t)-1,
-		.minreq=(uint32_t)-1,
-		.fragsize=(uint32_t)-1
-	};
-	int streamFlags=PA_STREAM_START_CORKED | PA_STREAM_INTERPOLATE_TIMING | PA_STREAM_AUTO_TIMING_UPDATE | PA_STREAM_ADJUST_LATENCY;
-
-	int err=pa_stream_connect_playback(stream, devID=="default" ? NULL : devID.c_str(), &bufferAttr, (pa_stream_flags_t)streamFlags, NULL, NULL);
-	if(err!=0 && devID!="default"){
-		SetCurrentDevice("default");
-		return;
-	}
-	CHECK_ERROR(err, "pa_stream_connect_playback");
-
-	while(true){
-		pa_stream_state_t streamState=pa_stream_get_state(stream);
-		if(!PA_STREAM_IS_GOOD(streamState)){
-			LOGE("Error connecting to audio device '%s'", devID.c_str());
-			failed=true;
-			return;
-		}
-		if(streamState==PA_STREAM_READY)
-			break;
-		pa_threaded_mainloop_wait(mainloop);
-	}
-
-	isConnected=true;
-
-	if(isPlaying){
-		pa_operation_unref(pa_stream_cork(stream, 0, NULL, NULL));
-	}
-	pa_threaded_mainloop_unlock(mainloop);
-}
-
-bool AudioOutputPulse::EnumerateDevices(std::vector<AudioOutputDevice>& devs){
-	return AudioPulse::DoOneOperation([&](pa_context* ctx){
-		return pa_context_get_sink_info_list(ctx, [](pa_context* ctx, const pa_sink_info* info, int eol, void* userdata){
-			if(eol>0)
-				return;
-			std::vector<AudioOutputDevice>* devs=(std::vector<AudioOutputDevice>*)userdata;
-			AudioOutputDevice dev;
-			dev.id=std::string(info->name);
-			dev.displayName=std::string(info->description);
-			devs->push_back(dev);
-		}, &devs);
-	});
-}
-
-void AudioOutputPulse::StreamStateCallback(pa_stream *s, void* arg) {
-	AudioOutputPulse* self=(AudioOutputPulse*) arg;
-	pa_threaded_mainloop_signal(self->mainloop, 0);
-}
-
-void AudioOutputPulse::StreamWriteCallback(pa_stream *stream, size_t requestedBytes, void *userdata){
-	((AudioOutputPulse*)userdata)->StreamWriteCallback(stream, requestedBytes);
-}
-
-void AudioOutputPulse::StreamWriteCallback(pa_stream *stream, size_t requestedBytes) {
-	//assert(requestedBytes<=sizeof(remainingData));
-	if(requestedBytes>sizeof(remainingData)){
-		requestedBytes=960*2; // force buffer size to 20ms. This probably wrecks the jitter buffer, but still better than crashing
-	}
-	pa_usec_t latency;
-	if(pa_stream_get_latency(stream, &latency, NULL)==0){
-		estimatedDelay=(int32_t)(latency/100);
-	}
-	while(requestedBytes>remainingDataSize){
-		if(isPlaying){
-			InvokeCallback(remainingData+remainingDataSize, 960*2);
-			remainingDataSize+=960*2;
-		}else{
-			memset(remainingData+remainingDataSize, 0, requestedBytes-remainingDataSize);
-			remainingDataSize=requestedBytes;
-		}
-	}
-	int err=pa_stream_write(stream, remainingData, requestedBytes, NULL, 0, PA_SEEK_RELATIVE);
-	CHECK_ERROR(err, "pa_stream_write");
-	remainingDataSize-=requestedBytes;
-	if(remainingDataSize>0)
-		memmove(remainingData, remainingData+requestedBytes, remainingDataSize);
-}
diff --git a/submodules/libtgvoip/os/linux/AudioOutputPulse.h b/submodules/libtgvoip/os/linux/AudioOutputPulse.h
deleted file mode 100644
index 496cf85f51..0000000000
--- a/submodules/libtgvoip/os/linux/AudioOutputPulse.h
+++ /dev/null
@@ -1,48 +0,0 @@
-//
-// libtgvoip is free and unencumbered public domain software.
-// For more information, see http://unlicense.org or the UNLICENSE file
-// you should have received with this source code distribution.
-//
-
-#ifndef LIBTGVOIP_AUDIOOUTPUTPULSE_H
-#define LIBTGVOIP_AUDIOOUTPUTPULSE_H
-
-#include "../../audio/AudioOutput.h"
-#include "../../threading.h"
-#include <pulse/pulseaudio.h>
-
-namespace tgvoip{
-namespace audio{
-
-class AudioOutputPulse : public AudioOutput{
-public:
-	AudioOutputPulse(pa_context* context, pa_threaded_mainloop* mainloop, std::string devID);
-	virtual ~AudioOutputPulse();
-	virtual void Start();
-	virtual void Stop();
-	virtual bool IsPlaying();
-	virtual void SetCurrentDevice(std::string devID);
-	static bool EnumerateDevices(std::vector<AudioOutputDevice>& devs);
-
-private:
-	static void StreamStateCallback(pa_stream* s, void* arg);
-	static void StreamWriteCallback(pa_stream* stream, size_t requested_bytes, void* userdata);
-	void StreamWriteCallback(pa_stream* stream, size_t requestedBytes);
-	pa_stream* CreateAndInitStream();
-
-	pa_threaded_mainloop* mainloop;
-	pa_context* context;
-	pa_stream* stream;
-
-	bool isPlaying;
-	bool isConnected;
-	bool didStart;
-	bool isLocked;
-	unsigned char remainingData[960*8*2];
-	size_t remainingDataSize;
-};
-
-}
-}
-
-#endif //LIBTGVOIP_AUDIOOUTPUTPULSE_H
diff --git a/submodules/libtgvoip/os/linux/AudioPulse.cpp b/submodules/libtgvoip/os/linux/AudioPulse.cpp
deleted file mode 100644
index 701d851556..0000000000
--- a/submodules/libtgvoip/os/linux/AudioPulse.cpp
+++ /dev/null
@@ -1,288 +0,0 @@
-//
-// libtgvoip is free and unencumbered public domain software.
-// For more information, see http://unlicense.org or the UNLICENSE file
-// you should have received with this source code distribution.
-//
-
-#include "AudioPulse.h"
-#include <dlfcn.h>
-#include "../../logging.h"
-
-#define DECLARE_DL_FUNCTION(name) typeof(name)* AudioPulse::_import_##name=NULL
-#define CHECK_DL_ERROR(res, msg) if(!res){LOGE(msg ": %s", dlerror()); return false;}
-#define LOAD_DL_FUNCTION(name) {_import_##name=(typeof(_import_##name))dlsym(lib, #name); CHECK_DL_ERROR(_import_##name, "Error getting entry point for " #name);}
-#define CHECK_ERROR(res, msg) if(res!=0){LOGE(msg " failed: %s", pa_strerror(res)); failed=true; return;}
-
-using namespace tgvoip;
-using namespace tgvoip::audio;
-
-bool AudioPulse::loaded=false;
-void* AudioPulse::lib=NULL;
-
-DECLARE_DL_FUNCTION(pa_threaded_mainloop_new);
-DECLARE_DL_FUNCTION(pa_threaded_mainloop_get_api);
-DECLARE_DL_FUNCTION(pa_context_new);
-DECLARE_DL_FUNCTION(pa_context_new_with_proplist);
-DECLARE_DL_FUNCTION(pa_context_set_state_callback);
-DECLARE_DL_FUNCTION(pa_threaded_mainloop_lock);
-DECLARE_DL_FUNCTION(pa_threaded_mainloop_unlock);
-DECLARE_DL_FUNCTION(pa_threaded_mainloop_start);
-DECLARE_DL_FUNCTION(pa_context_connect);
-DECLARE_DL_FUNCTION(pa_context_get_state);
-DECLARE_DL_FUNCTION(pa_threaded_mainloop_wait);
-DECLARE_DL_FUNCTION(pa_stream_new_with_proplist);
-DECLARE_DL_FUNCTION(pa_stream_set_state_callback);
-DECLARE_DL_FUNCTION(pa_stream_set_write_callback);
-DECLARE_DL_FUNCTION(pa_stream_connect_playback);
-DECLARE_DL_FUNCTION(pa_operation_unref);
-DECLARE_DL_FUNCTION(pa_stream_cork);
-DECLARE_DL_FUNCTION(pa_threaded_mainloop_stop);
-DECLARE_DL_FUNCTION(pa_stream_disconnect);
-DECLARE_DL_FUNCTION(pa_stream_unref);
-DECLARE_DL_FUNCTION(pa_context_disconnect);
-DECLARE_DL_FUNCTION(pa_context_unref);
-DECLARE_DL_FUNCTION(pa_threaded_mainloop_free);
-DECLARE_DL_FUNCTION(pa_threaded_mainloop_signal);
-DECLARE_DL_FUNCTION(pa_stream_begin_write);
-DECLARE_DL_FUNCTION(pa_stream_write);
-DECLARE_DL_FUNCTION(pa_stream_get_state);
-DECLARE_DL_FUNCTION(pa_strerror);
-DECLARE_DL_FUNCTION(pa_stream_set_read_callback);
-DECLARE_DL_FUNCTION(pa_stream_connect_record);
-DECLARE_DL_FUNCTION(pa_stream_peek);
-DECLARE_DL_FUNCTION(pa_stream_drop);
-DECLARE_DL_FUNCTION(pa_mainloop_new);
-DECLARE_DL_FUNCTION(pa_mainloop_get_api);
-DECLARE_DL_FUNCTION(pa_mainloop_iterate);
-DECLARE_DL_FUNCTION(pa_mainloop_free);
-DECLARE_DL_FUNCTION(pa_context_get_sink_info_list);
-DECLARE_DL_FUNCTION(pa_context_get_source_info_list);
-DECLARE_DL_FUNCTION(pa_operation_get_state);
-DECLARE_DL_FUNCTION(pa_proplist_new);
-DECLARE_DL_FUNCTION(pa_proplist_sets);
-DECLARE_DL_FUNCTION(pa_proplist_free);
-DECLARE_DL_FUNCTION(pa_stream_get_latency);
-
-#include "PulseFunctions.h"
-
-bool AudioPulse::Load(){
-	if(loaded)
-		return true;
-
-	lib=dlopen("libpulse.so.0", RTLD_LAZY);
-	if(!lib)
-		lib=dlopen("libpulse.so", RTLD_LAZY);
-	if(!lib){
-		LOGE("Error loading libpulse: %s", dlerror());
-		return false;
-	}
-
-	LOAD_DL_FUNCTION(pa_threaded_mainloop_new);
-	LOAD_DL_FUNCTION(pa_threaded_mainloop_get_api);
-	LOAD_DL_FUNCTION(pa_context_new);
-	LOAD_DL_FUNCTION(pa_context_new_with_proplist);
-	LOAD_DL_FUNCTION(pa_context_set_state_callback);
-	LOAD_DL_FUNCTION(pa_threaded_mainloop_lock);
-	LOAD_DL_FUNCTION(pa_threaded_mainloop_unlock);
-	LOAD_DL_FUNCTION(pa_threaded_mainloop_start);
-	LOAD_DL_FUNCTION(pa_context_connect);
-	LOAD_DL_FUNCTION(pa_context_get_state);
-	LOAD_DL_FUNCTION(pa_threaded_mainloop_wait);
-	LOAD_DL_FUNCTION(pa_stream_new_with_proplist);
-	LOAD_DL_FUNCTION(pa_stream_set_state_callback);
-	LOAD_DL_FUNCTION(pa_stream_set_write_callback);
-	LOAD_DL_FUNCTION(pa_stream_connect_playback);
-	LOAD_DL_FUNCTION(pa_operation_unref);
-	LOAD_DL_FUNCTION(pa_stream_cork);
-	LOAD_DL_FUNCTION(pa_threaded_mainloop_stop);
-	LOAD_DL_FUNCTION(pa_stream_disconnect);
-	LOAD_DL_FUNCTION(pa_stream_unref);
-	LOAD_DL_FUNCTION(pa_context_disconnect);
-	LOAD_DL_FUNCTION(pa_context_unref);
-	LOAD_DL_FUNCTION(pa_threaded_mainloop_free);
-	LOAD_DL_FUNCTION(pa_threaded_mainloop_signal);
-	LOAD_DL_FUNCTION(pa_stream_begin_write);
-	LOAD_DL_FUNCTION(pa_stream_write);
-	LOAD_DL_FUNCTION(pa_stream_get_state);
-	LOAD_DL_FUNCTION(pa_strerror);
-	LOAD_DL_FUNCTION(pa_stream_set_read_callback);
-	LOAD_DL_FUNCTION(pa_stream_connect_record);
-	LOAD_DL_FUNCTION(pa_stream_peek);
-	LOAD_DL_FUNCTION(pa_stream_drop);
-	LOAD_DL_FUNCTION(pa_mainloop_new);
-	LOAD_DL_FUNCTION(pa_mainloop_get_api);
-	LOAD_DL_FUNCTION(pa_mainloop_iterate);
-	LOAD_DL_FUNCTION(pa_mainloop_free);
-	LOAD_DL_FUNCTION(pa_context_get_sink_info_list);
-	LOAD_DL_FUNCTION(pa_context_get_source_info_list);
-	LOAD_DL_FUNCTION(pa_operation_get_state);
-	LOAD_DL_FUNCTION(pa_proplist_new);
-	LOAD_DL_FUNCTION(pa_proplist_sets);
-	LOAD_DL_FUNCTION(pa_proplist_free);
-	LOAD_DL_FUNCTION(pa_stream_get_latency);
-
-	loaded=true;
-	return true;
-}
-
-AudioPulse::AudioPulse(std::string inputDevice, std::string outputDevice){
-	if(!Load()){
-		failed=true;
-		LOGE("Failed to load libpulse");
-		return;
-	}
-		
-	mainloop=pa_threaded_mainloop_new();
-	if(!mainloop){
-		LOGE("Error initializing PulseAudio (pa_threaded_mainloop_new)");
-		failed=true;
-		return;
-	}
-	mainloopApi=pa_threaded_mainloop_get_api(mainloop);
-#ifndef MAXPATHLEN
-	char exeName[20];
-#else
-	char exePath[MAXPATHLEN];
-	char exeName[MAXPATHLEN];
-	ssize_t lres=readlink("/proc/self/exe", exePath, sizeof(exePath));
-	if(lres==-1)
-		lres=readlink("/proc/curproc/file", exePath, sizeof(exePath));
-	if(lres==-1)
-		lres=readlink("/proc/curproc/exe", exePath, sizeof(exePath));
-	if(lres>0){
-		strcpy(exeName, basename(exePath));
-	}else
-#endif
-	{
-		snprintf(exeName, sizeof(exeName), "Process %d", getpid());
-	}
-	pa_proplist* proplist=pa_proplist_new();
-	pa_proplist_sets(proplist, PA_PROP_MEDIA_ROLE, "phone");
-	context=pa_context_new_with_proplist(mainloopApi, exeName, proplist);
-	pa_proplist_free(proplist);
-	if(!context){
-		LOGE("Error initializing PulseAudio (pa_context_new)");
-		failed=true;
-		return;
-	}
-	pa_context_set_state_callback(context, [](pa_context* context, void* arg){
-		AudioPulse* self=reinterpret_cast<AudioPulse*>(arg);
-		pa_threaded_mainloop_signal(self->mainloop, 0);
-	}, this);
-	pa_threaded_mainloop_lock(mainloop);
-	isLocked=true;
-	int err=pa_threaded_mainloop_start(mainloop);
-	CHECK_ERROR(err, "pa_threaded_mainloop_start");
-	didStart=true;
-
-	err=pa_context_connect(context, NULL, PA_CONTEXT_NOAUTOSPAWN, NULL);
-	CHECK_ERROR(err, "pa_context_connect");
-
-	while(true){
-		pa_context_state_t contextState=pa_context_get_state(context);
-		if(!PA_CONTEXT_IS_GOOD(contextState)){
-			LOGE("Error initializing PulseAudio (PA_CONTEXT_IS_GOOD)");
-			failed=true;
-			return;
-		}
-		if(contextState==PA_CONTEXT_READY)
-			break;
-		pa_threaded_mainloop_wait(mainloop);
-	}
-	pa_threaded_mainloop_unlock(mainloop);
-	isLocked=false;
-
-	output=new AudioOutputPulse(context, mainloop, outputDevice);
-	input=new AudioInputPulse(context, mainloop, outputDevice);
-}
-
-AudioPulse::~AudioPulse(){
-	if(mainloop && didStart){
-		if(isLocked)
-			pa_threaded_mainloop_unlock(mainloop);
-		pa_threaded_mainloop_stop(mainloop);
-	}
-	
-	if(input)
-		delete input;
-	if(output)
-		delete output;
-
-	if(context){
-		pa_context_disconnect(context);
-		pa_context_unref(context);
-	}
-	if(mainloop)
-		pa_threaded_mainloop_free(mainloop);
-}
-
-AudioOutput* AudioPulse::GetOutput(){
-	return output;
-}
-
-AudioInput* AudioPulse::GetInput(){
-	return input;
-}
-
-bool AudioPulse::DoOneOperation(std::function<pa_operation*(pa_context*)> f){
-	if(!Load())
-		return false;
-
-	pa_mainloop* ml;
-	pa_mainloop_api* mlAPI;
-	pa_context* ctx;
-	pa_operation* op=NULL;
-	int paReady=0;
-
-	ml=pa_mainloop_new();
-	mlAPI=pa_mainloop_get_api(ml);
-	ctx=pa_context_new(mlAPI, "libtgvoip");
-
-	pa_context_connect(ctx, NULL, PA_CONTEXT_NOFLAGS, NULL);
-	pa_context_set_state_callback(ctx, [](pa_context* context, void* arg){
-		pa_context_state_t state;
-		int* pa_ready=(int*)arg;
-
-		state=pa_context_get_state(context);
-		switch(state){
-			case PA_CONTEXT_UNCONNECTED:
-			case PA_CONTEXT_CONNECTING:
-			case PA_CONTEXT_AUTHORIZING:
-			case PA_CONTEXT_SETTING_NAME:
-			default:
-				break;
-			case PA_CONTEXT_FAILED:
-			case PA_CONTEXT_TERMINATED:
-				*pa_ready=2;
-				break;
-			case PA_CONTEXT_READY:
-				*pa_ready=1;
-				break;
-		}
-	}, &paReady);
-
-	while(true){
-		if(paReady==0){
-			pa_mainloop_iterate(ml, 1, NULL);
-			continue;
-		}
-		if(paReady==2){
-			pa_context_disconnect(ctx);
-			pa_context_unref(ctx);
-			pa_mainloop_free(ml);
-			return false;
-		}
-		if(!op){
-			op=f(ctx);
-			continue;
-		}
-		if(pa_operation_get_state(op)==PA_OPERATION_DONE){
-			pa_operation_unref(op);
-			pa_context_disconnect(ctx);
-			pa_context_unref(ctx);
-			pa_mainloop_free(ml);
-			return true;
-		}
-		pa_mainloop_iterate(ml, 1, NULL);
-	}
-}
diff --git a/submodules/libtgvoip/os/linux/AudioPulse.h b/submodules/libtgvoip/os/linux/AudioPulse.h
deleted file mode 100644
index 26fb2b7b2a..0000000000
--- a/submodules/libtgvoip/os/linux/AudioPulse.h
+++ /dev/null
@@ -1,95 +0,0 @@
-//
-// libtgvoip is free and unencumbered public domain software.
-// For more information, see http://unlicense.org or the UNLICENSE file
-// you should have received with this source code distribution.
-//
-
-#ifndef LIBTGVOIP_PULSEAUDIOLOADER_H
-#define LIBTGVOIP_PULSEAUDIOLOADER_H
-
-#include <string>
-#include <functional>
-#include <pulse/pulseaudio.h>
-#include "../../audio/AudioIO.h"
-#include "AudioInputPulse.h"
-#include "AudioOutputPulse.h"
-
-#define DECLARE_DL_FUNCTION(name) static typeof(name)* _import_##name
-
-namespace tgvoip{
-	namespace audio{
-		class AudioPulse : public AudioIO{
-		public:
-			AudioPulse(std::string inputDevice, std::string outputDevice);
-			virtual ~AudioPulse();
-			virtual AudioInput* GetInput();
-			virtual AudioOutput* GetOutput();
-
-			static bool Load();
-			static bool DoOneOperation(std::function<pa_operation*(pa_context*)> f);
-
-			DECLARE_DL_FUNCTION(pa_threaded_mainloop_new);
-			DECLARE_DL_FUNCTION(pa_threaded_mainloop_get_api);
-			DECLARE_DL_FUNCTION(pa_context_new);
-			DECLARE_DL_FUNCTION(pa_context_new_with_proplist);
-			DECLARE_DL_FUNCTION(pa_context_set_state_callback);
-			DECLARE_DL_FUNCTION(pa_threaded_mainloop_lock);
-			DECLARE_DL_FUNCTION(pa_threaded_mainloop_unlock);
-			DECLARE_DL_FUNCTION(pa_threaded_mainloop_start);
-			DECLARE_DL_FUNCTION(pa_context_connect);
-			DECLARE_DL_FUNCTION(pa_context_get_state);
-			DECLARE_DL_FUNCTION(pa_threaded_mainloop_wait);
-			DECLARE_DL_FUNCTION(pa_stream_new_with_proplist);
-			DECLARE_DL_FUNCTION(pa_stream_set_state_callback);
-			DECLARE_DL_FUNCTION(pa_stream_set_write_callback);
-			DECLARE_DL_FUNCTION(pa_stream_connect_playback);
-			DECLARE_DL_FUNCTION(pa_operation_unref);
-			DECLARE_DL_FUNCTION(pa_stream_cork);
-			DECLARE_DL_FUNCTION(pa_threaded_mainloop_stop);
-			DECLARE_DL_FUNCTION(pa_stream_disconnect);
-			DECLARE_DL_FUNCTION(pa_stream_unref);
-			DECLARE_DL_FUNCTION(pa_context_disconnect);
-			DECLARE_DL_FUNCTION(pa_context_unref);
-			DECLARE_DL_FUNCTION(pa_threaded_mainloop_free);
-			DECLARE_DL_FUNCTION(pa_threaded_mainloop_signal);
-			DECLARE_DL_FUNCTION(pa_stream_begin_write);
-			DECLARE_DL_FUNCTION(pa_stream_write);
-			DECLARE_DL_FUNCTION(pa_stream_get_state);
-			DECLARE_DL_FUNCTION(pa_strerror);
-			DECLARE_DL_FUNCTION(pa_stream_set_read_callback);
-			DECLARE_DL_FUNCTION(pa_stream_connect_record);
-			DECLARE_DL_FUNCTION(pa_stream_peek);
-			DECLARE_DL_FUNCTION(pa_stream_drop);
-
-			DECLARE_DL_FUNCTION(pa_mainloop_new);
-			DECLARE_DL_FUNCTION(pa_mainloop_get_api);
-			DECLARE_DL_FUNCTION(pa_mainloop_iterate);
-			DECLARE_DL_FUNCTION(pa_mainloop_free);
-			DECLARE_DL_FUNCTION(pa_context_get_sink_info_list);
-			DECLARE_DL_FUNCTION(pa_context_get_source_info_list);
-			DECLARE_DL_FUNCTION(pa_operation_get_state);
-
-			DECLARE_DL_FUNCTION(pa_proplist_new);
-			DECLARE_DL_FUNCTION(pa_proplist_sets);
-			DECLARE_DL_FUNCTION(pa_proplist_free);
-
-			DECLARE_DL_FUNCTION(pa_stream_get_latency);
-
-		private:
-			static void* lib;
-			static bool loaded;
-			AudioInputPulse* input=NULL;
-			AudioOutputPulse* output=NULL;
-
-			pa_threaded_mainloop* mainloop;
-			pa_mainloop_api* mainloopApi;
-			pa_context* context;
-			bool isLocked=false;
-			bool didStart=false;
-		};
-	}
-}
-
-#undef DECLARE_DL_FUNCTION
-
-#endif // LIBTGVOIP_PULSEAUDIOLOADER_H
diff --git a/submodules/libtgvoip/os/linux/PulseFunctions.h b/submodules/libtgvoip/os/linux/PulseFunctions.h
deleted file mode 100644
index 9e754f99ac..0000000000
--- a/submodules/libtgvoip/os/linux/PulseFunctions.h
+++ /dev/null
@@ -1,48 +0,0 @@
-#ifndef LIBTGVOIP_PULSE_FUNCTIONS_H
-#define LIBTGVOIP_PULSE_FUNCTIONS_H
-
-#define pa_threaded_mainloop_new AudioPulse::_import_pa_threaded_mainloop_new
-#define pa_threaded_mainloop_get_api AudioPulse::_import_pa_threaded_mainloop_get_api
-#define pa_context_new AudioPulse::_import_pa_context_new
-#define pa_context_new_with_proplist AudioPulse::_import_pa_context_new_with_proplist
-#define pa_context_set_state_callback AudioPulse::_import_pa_context_set_state_callback
-#define pa_threaded_mainloop_lock AudioPulse::_import_pa_threaded_mainloop_lock
-#define pa_threaded_mainloop_unlock AudioPulse::_import_pa_threaded_mainloop_unlock
-#define pa_threaded_mainloop_start AudioPulse::_import_pa_threaded_mainloop_start
-#define pa_context_connect AudioPulse::_import_pa_context_connect
-#define pa_context_get_state AudioPulse::_import_pa_context_get_state
-#define pa_threaded_mainloop_wait AudioPulse::_import_pa_threaded_mainloop_wait
-#define pa_stream_new_with_proplist AudioPulse::_import_pa_stream_new_with_proplist
-#define pa_stream_set_state_callback AudioPulse::_import_pa_stream_set_state_callback
-#define pa_stream_set_write_callback AudioPulse::_import_pa_stream_set_write_callback
-#define pa_stream_connect_playback AudioPulse::_import_pa_stream_connect_playback
-#define pa_operation_unref AudioPulse::_import_pa_operation_unref
-#define pa_stream_cork AudioPulse::_import_pa_stream_cork
-#define pa_threaded_mainloop_stop AudioPulse::_import_pa_threaded_mainloop_stop
-#define pa_stream_disconnect AudioPulse::_import_pa_stream_disconnect
-#define pa_stream_unref AudioPulse::_import_pa_stream_unref
-#define pa_context_disconnect AudioPulse::_import_pa_context_disconnect
-#define pa_context_unref AudioPulse::_import_pa_context_unref
-#define pa_threaded_mainloop_free AudioPulse::_import_pa_threaded_mainloop_free
-#define pa_threaded_mainloop_signal AudioPulse::_import_pa_threaded_mainloop_signal
-#define pa_stream_begin_write AudioPulse::_import_pa_stream_begin_write
-#define pa_stream_write AudioPulse::_import_pa_stream_write
-#define pa_strerror AudioPulse::_import_pa_strerror
-#define pa_stream_get_state AudioPulse::_import_pa_stream_get_state
-#define pa_stream_set_read_callback AudioPulse::_import_pa_stream_set_read_callback
-#define pa_stream_connect_record AudioPulse::_import_pa_stream_connect_record
-#define pa_stream_peek AudioPulse::_import_pa_stream_peek
-#define pa_stream_drop AudioPulse::_import_pa_stream_drop
-#define pa_mainloop_new AudioPulse::_import_pa_mainloop_new
-#define pa_mainloop_get_api AudioPulse::_import_pa_mainloop_get_api
-#define pa_mainloop_iterate AudioPulse::_import_pa_mainloop_iterate
-#define pa_mainloop_free AudioPulse::_import_pa_mainloop_free
-#define pa_context_get_sink_info_list AudioPulse::_import_pa_context_get_sink_info_list
-#define pa_context_get_source_info_list AudioPulse::_import_pa_context_get_source_info_list
-#define pa_operation_get_state AudioPulse::_import_pa_operation_get_state
-#define pa_proplist_new AudioPulse::_import_pa_proplist_new
-#define pa_proplist_sets AudioPulse::_import_pa_proplist_sets
-#define pa_proplist_free AudioPulse::_import_pa_proplist_free
-#define pa_stream_get_latency AudioPulse::_import_pa_stream_get_latency
-
-#endif //LIBTGVOIP_PULSE_FUNCTIONS_H
diff --git a/submodules/libtgvoip/os/posix/NetworkSocketPosix.cpp b/submodules/libtgvoip/os/posix/NetworkSocketPosix.cpp
deleted file mode 100644
index 52eef76df6..0000000000
--- a/submodules/libtgvoip/os/posix/NetworkSocketPosix.cpp
+++ /dev/null
@@ -1,643 +0,0 @@
-//
-// libtgvoip is free and unencumbered public domain software.
-// For more information, see http://unlicense.org or the UNLICENSE file
-// you should have received with this source code distribution.
-//
-
-#include "NetworkSocketPosix.h"
-#include <sys/socket.h>
-#include <errno.h>
-#include <assert.h>
-#include <netdb.h>
-#include <net/if.h>
-#include <sys/ioctl.h>
-#include <fcntl.h>
-#include <unistd.h>
-#include <netinet/tcp.h>
-#include "../../logging.h"
-#include "../../VoIPController.h"
-#include "../../Buffers.h"
-
-#ifdef __ANDROID__
-#include <jni.h>
-#include <sys/system_properties.h>
-extern JavaVM* sharedJVM;
-extern jclass jniUtilitiesClass;
-#else
-#include <ifaddrs.h>
-#endif
-
-using namespace tgvoip;
-
-
-NetworkSocketPosix::NetworkSocketPosix(NetworkProtocol protocol) : NetworkSocket(protocol), lastRecvdV4(0), lastRecvdV6("::0"){
-	needUpdateNat64Prefix=true;
-	nat64Present=false;
-	switchToV6at=0;
-	isV4Available=false;
-    fd=-1;
-	useTCP=false;
-	closing=false;
-
-	tcpConnectedAddress=NULL;
-	tcpConnectedPort=0;
-
-	if(protocol==PROTO_TCP)
-		timeout=10.0;
-	lastSuccessfulOperationTime=VoIPController::GetCurrentTime();
-}
-
-NetworkSocketPosix::~NetworkSocketPosix(){
-	if(fd>=0){
-		Close();
-	}
-	if(tcpConnectedAddress)
-		delete tcpConnectedAddress;
-	if(pendingOutgoingPacket)
-		delete pendingOutgoingPacket;
-}
-
-void NetworkSocketPosix::SetMaxPriority(){
-#ifdef __APPLE__
-	int prio=NET_SERVICE_TYPE_VO;
-	int res=setsockopt(fd, SOL_SOCKET, SO_NET_SERVICE_TYPE, &prio, sizeof(prio));
-	if(res<0){
-		LOGE("error setting darwin-specific net priority: %d / %s", errno, strerror(errno));
-	}
-#elif defined(__linux__)
-	int prio=6;
-	int res=setsockopt(fd, SOL_SOCKET, SO_PRIORITY, &prio, sizeof(prio));
-	if(res<0){
-		LOGE("error setting priority: %d / %s", errno, strerror(errno));
-	}
-	prio=46 << 2;
-	res=setsockopt(fd, SOL_IP, IP_TOS, &prio, sizeof(prio));
-	if(res<0){
-		LOGE("error setting ip tos: %d / %s", errno, strerror(errno));
-	}
-#else
-	LOGI("cannot set socket priority");
-#endif
-}
-
-void NetworkSocketPosix::Send(NetworkPacket *packet){
-	if(!packet || (protocol==PROTO_UDP && !packet->address)){
-		LOGW("tried to send null packet");
-		return;
-	}
-	int res;
-	if(protocol==PROTO_UDP){
-		sockaddr_in6 addr;
-		IPv4Address *v4addr=dynamic_cast<IPv4Address *>(packet->address);
-		if(v4addr){
-			if(needUpdateNat64Prefix && !isV4Available && VoIPController::GetCurrentTime()>switchToV6at && switchToV6at!=0){
-				LOGV("Updating NAT64 prefix");
-				nat64Present=false;
-				addrinfo *addr0;
-				int res=getaddrinfo("ipv4only.arpa", NULL, NULL, &addr0);
-				if(res!=0){
-					LOGW("Error updating NAT64 prefix: %d / %s", res, gai_strerror(res));
-				}else{
-					addrinfo *addrPtr;
-					unsigned char *addr170=NULL;
-					unsigned char *addr171=NULL;
-					for(addrPtr=addr0; addrPtr; addrPtr=addrPtr->ai_next){
-						if(addrPtr->ai_family==AF_INET6){
-							sockaddr_in6 *translatedAddr=(sockaddr_in6 *) addrPtr->ai_addr;
-							uint32_t v4part=*((uint32_t *) &translatedAddr->sin6_addr.s6_addr[12]);
-							if(v4part==0xAA0000C0 && !addr170){
-								addr170=translatedAddr->sin6_addr.s6_addr;
-							}
-							if(v4part==0xAB0000C0 && !addr171){
-								addr171=translatedAddr->sin6_addr.s6_addr;
-							}
-							char buf[INET6_ADDRSTRLEN];
-							LOGV("Got translated address: %s", inet_ntop(AF_INET6, &translatedAddr->sin6_addr, buf, sizeof(buf)));
-						}
-					}
-					if(addr170 && addr171 && memcmp(addr170, addr171, 12)==0){
-						nat64Present=true;
-						memcpy(nat64Prefix, addr170, 12);
-						char buf[INET6_ADDRSTRLEN];
-						LOGV("Found nat64 prefix from %s", inet_ntop(AF_INET6, addr170, buf, sizeof(buf)));
-					}else{
-						LOGV("Didn't find nat64");
-					}
-					freeaddrinfo(addr0);
-				}
-				needUpdateNat64Prefix=false;
-			}
-			memset(&addr, 0, sizeof(sockaddr_in6));
-			addr.sin6_family=AF_INET6;
-			*((uint32_t *) &addr.sin6_addr.s6_addr[12])=v4addr->GetAddress();
-			if(nat64Present)
-				memcpy(addr.sin6_addr.s6_addr, nat64Prefix, 12);
-			else
-				addr.sin6_addr.s6_addr[11]=addr.sin6_addr.s6_addr[10]=0xFF;
-
-		}else{
-			IPv6Address *v6addr=dynamic_cast<IPv6Address *>(packet->address);
-			assert(v6addr!=NULL);
-			memcpy(addr.sin6_addr.s6_addr, v6addr->GetAddress(), 16);
-			addr.sin6_family=AF_INET6;
-		}
-		addr.sin6_port=htons(packet->port);
-		res=(int)sendto(fd, packet->data, packet->length, 0, (const sockaddr *) &addr, sizeof(addr));
-	}else{
-		res=(int)send(fd, packet->data, packet->length, 0);
-	}
-	if(res<=0){
-		if(errno==EAGAIN || errno==EWOULDBLOCK){
-			if(pendingOutgoingPacket){
-				LOGE("Got EAGAIN but there's already a pending packet");
-				failed=true;
-			}else{
-				LOGV("Socket %d not ready to send", fd);
-				pendingOutgoingPacket=new Buffer(packet->length);
-				pendingOutgoingPacket->CopyFrom(packet->data, 0, packet->length);
-				readyToSend=false;
-			}
-		}else{
-    		LOGE("error sending: %d / %s", errno, strerror(errno));
-    		if(errno==ENETUNREACH && !isV4Available && VoIPController::GetCurrentTime()<switchToV6at){
-    			switchToV6at=VoIPController::GetCurrentTime();
-    			LOGI("Network unreachable, trying NAT64");
-    		}
-		}
-	}else if((size_t)res!=packet->length && packet->protocol==PROTO_TCP){
-		if(pendingOutgoingPacket){
-			LOGE("send returned less than packet length but there's already a pending packet");
-			failed=true;
-		}else{
-			LOGV("Socket %d not ready to send", fd);
-			pendingOutgoingPacket=new Buffer(packet->length-res);
-			pendingOutgoingPacket->CopyFrom(packet->data+res, 0, packet->length-res);
-			readyToSend=false;
-		}
-	}
-}
-
-bool NetworkSocketPosix::OnReadyToSend(){
-	if(pendingOutgoingPacket){
-		NetworkPacket pkt={0};
-		pkt.data=**pendingOutgoingPacket;
-		pkt.length=pendingOutgoingPacket->Length();
-		Send(&pkt);
-		delete pendingOutgoingPacket;
-		pendingOutgoingPacket=NULL;
-		return false;
-	}
-	readyToSend=true;
-	return true;
-}
-
-void NetworkSocketPosix::Receive(NetworkPacket *packet){
-	if(failed){
-		packet->length=0;
-		return;
-	}
-	if(protocol==PROTO_UDP){
-		int addrLen=sizeof(sockaddr_in6);
-		sockaddr_in6 srcAddr;
-		ssize_t len=recvfrom(fd, packet->data, packet->length, 0, (sockaddr *) &srcAddr, (socklen_t *) &addrLen);
-		if(len>0)
-			packet->length=(size_t) len;
-		else{
-			LOGE("error receiving %d / %s", errno, strerror(errno));
-			packet->length=0;
-			return;
-		}
-		//LOGV("Received %d bytes from %s:%d at %.5lf", len, inet_ntoa(srcAddr.sin_addr), ntohs(srcAddr.sin_port), GetCurrentTime());
-		if(!isV4Available && IN6_IS_ADDR_V4MAPPED(&srcAddr.sin6_addr)){
-			isV4Available=true;
-			LOGI("Detected IPv4 connectivity, will not try IPv6");
-		}
-		if(IN6_IS_ADDR_V4MAPPED(&srcAddr.sin6_addr) || (nat64Present && memcmp(nat64Prefix, srcAddr.sin6_addr.s6_addr, 12)==0)){
-			in_addr v4addr=*((in_addr *) &srcAddr.sin6_addr.s6_addr[12]);
-			lastRecvdV4=IPv4Address(v4addr.s_addr);
-			packet->address=&lastRecvdV4;
-		}else{
-			lastRecvdV6=IPv6Address(srcAddr.sin6_addr.s6_addr);
-			packet->address=&lastRecvdV6;
-		}
-		packet->protocol=PROTO_UDP;
-		packet->port=ntohs(srcAddr.sin6_port);
-	}else if(protocol==PROTO_TCP){
-		int res=(int)recv(fd, packet->data, packet->length, 0);
-		if(res<=0){
-			LOGE("Error receiving from TCP socket: %d / %s", errno, strerror(errno));
-			failed=true;
-			packet->length=0;
-		}else{
-			packet->length=(size_t)res;
-			packet->address=tcpConnectedAddress;
-			packet->port=tcpConnectedPort;
-			packet->protocol=PROTO_TCP;
-		}
-	}
-}
-
-void NetworkSocketPosix::Open(){
-	if(protocol!=PROTO_UDP)
-		return;
-	fd=socket(PF_INET6, SOCK_DGRAM, IPPROTO_UDP);
-	if(fd<0){
-		LOGE("error creating socket: %d / %s", errno, strerror(errno));
-		failed=true;
-		return;
-	}
-	int flag=0;
-	int res=setsockopt(fd, IPPROTO_IPV6, IPV6_V6ONLY, &flag, sizeof(flag));
-	if(res<0){
-		LOGE("error enabling dual stack socket: %d / %s", errno, strerror(errno));
-		failed=true;
-		return;
-	}
-
-	SetMaxPriority();
-	fcntl(fd, F_SETFL, O_NONBLOCK);
-
-	int tries=0;
-	sockaddr_in6 addr;
-	//addr.sin6_addr.s_addr=0;
-	memset(&addr, 0, sizeof(sockaddr_in6));
-	//addr.sin6_len=sizeof(sa_family_t);
-	addr.sin6_family=AF_INET6;
-	for(tries=0;tries<10;tries++){
-		addr.sin6_port=htons(GenerateLocalPort());
-		res=::bind(fd, (sockaddr *) &addr, sizeof(sockaddr_in6));
-		LOGV("trying bind to port %u", ntohs(addr.sin6_port));
-		if(res<0){
-			LOGE("error binding to port %u: %d / %s", ntohs(addr.sin6_port), errno, strerror(errno));
-		}else{
-			break;
-		}
-	}
-	if(tries==10){
-		addr.sin6_port=0;
-		res=::bind(fd, (sockaddr *) &addr, sizeof(sockaddr_in6));
-		if(res<0){
-			LOGE("error binding to port %u: %d / %s", ntohs(addr.sin6_port), errno, strerror(errno));
-			//SetState(STATE_FAILED);
-			failed=true;
-			return;
-		}
-	}
-	size_t addrLen=sizeof(sockaddr_in6);
-	getsockname(fd, (sockaddr*)&addr, (socklen_t*) &addrLen);
-	LOGD("Bound to local UDP port %u", ntohs(addr.sin6_port));
-
-	needUpdateNat64Prefix=true;
-	isV4Available=false;
-	switchToV6at=VoIPController::GetCurrentTime()+ipv6Timeout;
-}
-
-void NetworkSocketPosix::Close(){
-	closing=true;
-	failed=true;
-	
-    if (fd>=0) {
-        shutdown(fd, SHUT_RDWR);
-        close(fd);
-		fd=-1;
-    }
-}
-
-void NetworkSocketPosix::Connect(const NetworkAddress *address, uint16_t port){
-	const IPv4Address* v4addr=dynamic_cast<const IPv4Address*>(address);
-	const IPv6Address* v6addr=dynamic_cast<const IPv6Address*>(address);
-	struct sockaddr_in v4={0};
-	struct sockaddr_in6 v6={0};
-	struct sockaddr* addr=NULL;
-	size_t addrLen=0;
-	if(v4addr){
-		v4.sin_family=AF_INET;
-		v4.sin_addr.s_addr=v4addr->GetAddress();
-		v4.sin_port=htons(port);
-		addr=reinterpret_cast<sockaddr*>(&v4);
-		addrLen=sizeof(v4);
-	}else if(v6addr){
-		v6.sin6_family=AF_INET6;
-		memcpy(v6.sin6_addr.s6_addr, v6addr->GetAddress(), 16);
-		v6.sin6_flowinfo=0;
-		v6.sin6_scope_id=0;
-		v6.sin6_port=htons(port);
-		addr=reinterpret_cast<sockaddr*>(&v6);
-		addrLen=sizeof(v6);
-	}else{
-		LOGE("Unknown address type in TCP connect");
-		failed=true;
-		return;
-	}
-	fd=socket(addr->sa_family, SOCK_STREAM, IPPROTO_TCP);
-	if(fd<0){
-		LOGE("Error creating TCP socket: %d / %s", errno, strerror(errno));
-		failed=true;
-		return;
-	}
-	int opt=1;
-	setsockopt(fd, IPPROTO_TCP, TCP_NODELAY, &opt, sizeof(opt));
-	timeval timeout;
-	timeout.tv_sec=5;
-	timeout.tv_usec=0;
-	setsockopt(fd, SOL_SOCKET, SO_SNDTIMEO, &timeout, sizeof(timeout));
-	timeout.tv_sec=60;
-	setsockopt(fd, SOL_SOCKET, SO_RCVTIMEO, &timeout, sizeof(timeout));
-	fcntl(fd, F_SETFL, O_NONBLOCK);
-	int res=(int)connect(fd, (const sockaddr*) addr, (socklen_t)addrLen);
-	if(res!=0 && errno!=EINVAL && errno!=EINPROGRESS){
-		LOGW("error connecting TCP socket to %s:%u: %d / %s; %d / %s", address->ToString().c_str(), port, res, strerror(res), errno, strerror(errno));
-		close(fd);
-		failed=true;
-		return;
-	}
-	tcpConnectedAddress=v4addr ? (NetworkAddress*)new IPv4Address(*v4addr) : (NetworkAddress*)new IPv6Address(*v6addr);
-	tcpConnectedPort=port;
-	LOGI("successfully connected to %s:%d", tcpConnectedAddress->ToString().c_str(), tcpConnectedPort);
-}
-
-void NetworkSocketPosix::OnActiveInterfaceChanged(){
-	needUpdateNat64Prefix=true;
-	isV4Available=false;
-	switchToV6at=VoIPController::GetCurrentTime()+ipv6Timeout;
-}
-
-std::string NetworkSocketPosix::GetLocalInterfaceInfo(IPv4Address *v4addr, IPv6Address *v6addr){
-	std::string name="";
-	// Android doesn't support ifaddrs
-#ifdef __ANDROID__
-	JNIEnv *env=NULL;
-	bool didAttach=false;
-	sharedJVM->GetEnv((void **) &env, JNI_VERSION_1_6);
-	if(!env){
-		sharedJVM->AttachCurrentThread(&env, NULL);
-		didAttach=true;
-	}
-
-	jmethodID getLocalNetworkAddressesAndInterfaceNameMethod=env->GetStaticMethodID(jniUtilitiesClass, "getLocalNetworkAddressesAndInterfaceName", "()[Ljava/lang/String;");
-	jobjectArray jinfo=(jobjectArray) env->CallStaticObjectMethod(jniUtilitiesClass, getLocalNetworkAddressesAndInterfaceNameMethod);
-	if(jinfo){
-		jstring jitfName=static_cast<jstring>(env->GetObjectArrayElement(jinfo, 0));
-		jstring jipv4=static_cast<jstring>(env->GetObjectArrayElement(jinfo, 1));
-		jstring jipv6=static_cast<jstring>(env->GetObjectArrayElement(jinfo, 2));
-		if(jitfName){
-			const char *itfchars=env->GetStringUTFChars(jitfName, NULL);
-			name=std::string(itfchars);
-			env->ReleaseStringUTFChars(jitfName, itfchars);
-		}
-
-		if(v4addr && jipv4){
-			const char* ipchars=env->GetStringUTFChars(jipv4, NULL);
-			*v4addr=IPv4Address(ipchars);
-			env->ReleaseStringUTFChars(jipv4, ipchars);
-		}
-		if(v6addr && jipv6){
-			const char* ipchars=env->GetStringUTFChars(jipv6, NULL);
-			*v6addr=IPv6Address(ipchars);
-			env->ReleaseStringUTFChars(jipv6, ipchars);
-		}
-	}else{
-		LOGW("Failed to get android network interface info");
-	}
-
-	if(didAttach){
-		sharedJVM->DetachCurrentThread();
-	}
-#else
-	struct ifaddrs* interfaces;
-	if(!getifaddrs(&interfaces)){
-		struct ifaddrs* interface;
-		for(interface=interfaces;interface;interface=interface->ifa_next){
-			if(!(interface->ifa_flags & IFF_UP) || !(interface->ifa_flags & IFF_RUNNING) || (interface->ifa_flags & IFF_LOOPBACK))
-				continue;
-			const struct sockaddr_in* addr=(const struct sockaddr_in*)interface->ifa_addr;
-			if(addr){
-				if(addr->sin_family==AF_INET){
-					if((ntohl(addr->sin_addr.s_addr) & 0xFFFF0000)==0xA9FE0000)
-						continue;
-					if(v4addr)
-						*v4addr=IPv4Address(addr->sin_addr.s_addr);
-					name=interface->ifa_name;
-				}else if(addr->sin_family==AF_INET6){
-					const struct sockaddr_in6* addr6=(const struct sockaddr_in6*)addr;
-					if((addr6->sin6_addr.s6_addr[0] & 0xF0)==0xF0)
-						continue;
-					if(v6addr)
-						*v6addr=IPv6Address(addr6->sin6_addr.s6_addr);
-					name=interface->ifa_name;
-				}
-			}
-		}
-		freeifaddrs(interfaces);
-	}
-#endif
-	return name;
-}
-
-uint16_t NetworkSocketPosix::GetLocalPort(){
-	sockaddr_in6 addr;
-	size_t addrLen=sizeof(sockaddr_in6);
-	getsockname(fd, (sockaddr*)&addr, (socklen_t*) &addrLen);
-	return ntohs(addr.sin6_port);
-}
-
-std::string NetworkSocketPosix::V4AddressToString(uint32_t address){
-	char buf[INET_ADDRSTRLEN];
-	in_addr addr;
-	addr.s_addr=address;
-	inet_ntop(AF_INET, &addr, buf, sizeof(buf));
-	return std::string(buf);
-}
-
-std::string NetworkSocketPosix::V6AddressToString(const unsigned char *address){
-	char buf[INET6_ADDRSTRLEN];
-	in6_addr addr;
-	memcpy(addr.s6_addr, address, 16);
-	inet_ntop(AF_INET6, &addr, buf, sizeof(buf));
-	return std::string(buf);
-}
-
-uint32_t NetworkSocketPosix::StringToV4Address(std::string address){
-	in_addr addr;
-	inet_pton(AF_INET, address.c_str(), &addr);
-	return addr.s_addr;
-}
-
-void NetworkSocketPosix::StringToV6Address(std::string address, unsigned char *out){
-	in6_addr addr;
-	inet_pton(AF_INET6, address.c_str(), &addr);
-	memcpy(out, addr.s6_addr, 16);
-}
-
-IPv4Address *NetworkSocketPosix::ResolveDomainName(std::string name){
-	addrinfo* addr0;
-	IPv4Address* ret=NULL;
-	int res=getaddrinfo(name.c_str(), NULL, NULL, &addr0);
-	if(res!=0){
-		LOGW("Error updating NAT64 prefix: %d / %s", res, gai_strerror(res));
-	}else{
-		addrinfo* addrPtr;
-		for(addrPtr=addr0;addrPtr;addrPtr=addrPtr->ai_next){
-			if(addrPtr->ai_family==AF_INET){
-				sockaddr_in* addr=(sockaddr_in*)addrPtr->ai_addr;
-				ret=new IPv4Address(addr->sin_addr.s_addr);
-				break;
-			}
-		}
-		freeaddrinfo(addr0);
-	}
-	return ret;
-}
-
-NetworkAddress *NetworkSocketPosix::GetConnectedAddress(){
-	return tcpConnectedAddress;
-}
-
-uint16_t NetworkSocketPosix::GetConnectedPort(){
-	return tcpConnectedPort;
-}
-
-void NetworkSocketPosix::SetTimeouts(int sendTimeout, int recvTimeout){
-	timeval timeout;
-	timeout.tv_sec=sendTimeout;
-	timeout.tv_usec=0;
-	setsockopt(fd, SOL_SOCKET, SO_SNDTIMEO, &timeout, sizeof(timeout));
-	timeout.tv_sec=recvTimeout;
-	setsockopt(fd, SOL_SOCKET, SO_RCVTIMEO, &timeout, sizeof(timeout));
-}
-
-bool NetworkSocketPosix::Select(std::vector<NetworkSocket *> &readFds, std::vector<NetworkSocket*>& writeFds, std::vector<NetworkSocket *> &errorFds, SocketSelectCanceller* _canceller){
-	fd_set readSet;
-	fd_set writeSet;
-	fd_set errorSet;
-	FD_ZERO(&readSet);
-	FD_ZERO(&writeSet);
-	FD_ZERO(&errorSet);
-	SocketSelectCancellerPosix* canceller=dynamic_cast<SocketSelectCancellerPosix*>(_canceller);
-	if(canceller)
-		FD_SET(canceller->pipeRead, &readSet);
-
-	int maxfd=canceller ? canceller->pipeRead : 0;
-
-	for(NetworkSocket*& s:readFds){
-		int sfd=GetDescriptorFromSocket(s);
-		if(sfd==0){
-			LOGW("can't select on one of sockets because it's not a NetworkSocketPosix instance");
-			continue;
-		}
-		FD_SET(sfd, &readSet);
-		if(maxfd<sfd)
-			maxfd=sfd;
-	}
-
-	for(NetworkSocket*& s:writeFds){
-		int sfd=GetDescriptorFromSocket(s);
-		if(sfd==0){
-			LOGW("can't select on one of sockets because it's not a NetworkSocketPosix instance");
-			continue;
-		}
-		FD_SET(sfd, &writeSet);
-		if(maxfd<sfd)
-			maxfd=sfd;
-	}
-
-	bool anyFailed=false;
-
-	for(NetworkSocket*& s:errorFds){
-		int sfd=GetDescriptorFromSocket(s);
-		if(sfd==0){
-			LOGW("can't select on one of sockets because it's not a NetworkSocketPosix instance");
-			continue;
-		}
-		if(s->timeout>0 && VoIPController::GetCurrentTime()-s->lastSuccessfulOperationTime>s->timeout){
-			LOGW("Socket %d timed out", sfd);
-			s->failed=true;
-		}
-		anyFailed |= s->IsFailed();
-		FD_SET(sfd, &errorSet);
-		if(maxfd<sfd)
-			maxfd=sfd;
-	}
-
-	select(maxfd+1, &readSet, &writeSet, &errorSet, NULL);
-
-	if(canceller && FD_ISSET(canceller->pipeRead, &readSet) && !anyFailed){
-		char c;
-		(void) read(canceller->pipeRead, &c, 1);
-		return false;
-	}else if(anyFailed){
-		FD_ZERO(&readSet);
-		FD_ZERO(&writeSet);
-	}
-
-	std::vector<NetworkSocket*>::iterator itr=readFds.begin();
-	while(itr!=readFds.end()){
-		int sfd=GetDescriptorFromSocket(*itr);
-		if(FD_ISSET(sfd, &readSet))
-			(*itr)->lastSuccessfulOperationTime=VoIPController::GetCurrentTime();
-		if(sfd==0 || !FD_ISSET(sfd, &readSet) || !(*itr)->OnReadyToReceive()){
-			itr=readFds.erase(itr);
-		}else{
-			++itr;
-		}
-	}
-
-	itr=writeFds.begin();
-	while(itr!=writeFds.end()){
-		int sfd=GetDescriptorFromSocket(*itr);
-		if(sfd==0 || !FD_ISSET(sfd, &writeSet)){
-			itr=writeFds.erase(itr);
-		}else{
-			LOGV("Socket %d is ready to send", sfd);
-			(*itr)->lastSuccessfulOperationTime=VoIPController::GetCurrentTime();
-			if((*itr)->OnReadyToSend())
-				++itr;
-			else
-				itr=writeFds.erase(itr);
-		}
-	}
-
-	itr=errorFds.begin();
-	while(itr!=errorFds.end()){
-		int sfd=GetDescriptorFromSocket(*itr);
-		if((sfd==0 || !FD_ISSET(sfd, &errorSet)) && !(*itr)->IsFailed()){
-			itr=errorFds.erase(itr);
-		}else{
-			++itr;
-		}
-	}
-	//LOGV("select fds left: read=%d, write=%d, error=%d", (int)readFds.size(), (int)writeFds.size(), (int)errorFds.size());
-
-	return readFds.size()>0 || errorFds.size()>0 || writeFds.size()>0;
-}
-
-SocketSelectCancellerPosix::SocketSelectCancellerPosix(){
-	int p[2];
-	int pipeRes=pipe(p);
-	if(pipeRes!=0){
-		LOGE("pipe() failed");
-		abort();
-	}
-	pipeRead=p[0];
-	pipeWrite=p[1];
-}
-
-SocketSelectCancellerPosix::~SocketSelectCancellerPosix(){
-	close(pipeRead);
-	close(pipeWrite);
-}
-
-void SocketSelectCancellerPosix::CancelSelect(){
-	char c=1;
-	(void) write(pipeWrite, &c, 1);
-}
-
-int NetworkSocketPosix::GetDescriptorFromSocket(NetworkSocket *socket){
-	NetworkSocketPosix* sp=dynamic_cast<NetworkSocketPosix*>(socket);
-	if(sp)
-		return sp->fd;
-	NetworkSocketWrapper* sw=dynamic_cast<NetworkSocketWrapper*>(socket);
-	if(sw)
-		return GetDescriptorFromSocket(sw->GetWrapped());
-	return 0;
-}
diff --git a/submodules/libtgvoip/os/posix/NetworkSocketPosix.h b/submodules/libtgvoip/os/posix/NetworkSocketPosix.h
deleted file mode 100644
index 1a9b0fce13..0000000000
--- a/submodules/libtgvoip/os/posix/NetworkSocketPosix.h
+++ /dev/null
@@ -1,77 +0,0 @@
-//
-// libtgvoip is free and unencumbered public domain software.
-// For more information, see http://unlicense.org or the UNLICENSE file
-// you should have received with this source code distribution.
-//
-
-#ifndef LIBTGVOIP_NETWORKSOCKETPOSIX_H
-#define LIBTGVOIP_NETWORKSOCKETPOSIX_H
-
-#include "../../NetworkSocket.h"
-#include "../../Buffers.h"
-#include <vector>
-#include <sys/select.h>
-#include <pthread.h>
-
-namespace tgvoip {
-
-class SocketSelectCancellerPosix : public SocketSelectCanceller{
-friend class NetworkSocketPosix;
-public:
-	SocketSelectCancellerPosix();
-	virtual ~SocketSelectCancellerPosix();
-	virtual void CancelSelect();
-private:
-	int pipeRead;
-	int pipeWrite;
-};
-
-class NetworkSocketPosix : public NetworkSocket{
-public:
-	NetworkSocketPosix(NetworkProtocol protocol);
-	virtual ~NetworkSocketPosix();
-	virtual void Send(NetworkPacket* packet) override;
-	virtual void Receive(NetworkPacket* packet) override;
-	virtual void Open() override;
-	virtual void Close() override;
-	virtual void Connect(const NetworkAddress* address, uint16_t port) override;
-	virtual std::string GetLocalInterfaceInfo(IPv4Address* v4addr, IPv6Address* v6addr) override;
-	virtual void OnActiveInterfaceChanged() override;
-	virtual uint16_t GetLocalPort() override;
-
-	static std::string V4AddressToString(uint32_t address);
-	static std::string V6AddressToString(const unsigned char address[16]);
-	static uint32_t StringToV4Address(std::string address);
-	static void StringToV6Address(std::string address, unsigned char* out);
-	static IPv4Address* ResolveDomainName(std::string name);
-	static bool Select(std::vector<NetworkSocket*>& readFds, std::vector<NetworkSocket*>& writeFds, std::vector<NetworkSocket*>& errorFds, SocketSelectCanceller* canceller);
-
-	virtual NetworkAddress *GetConnectedAddress() override;
-
-	virtual uint16_t GetConnectedPort() override;
-
-	virtual void SetTimeouts(int sendTimeout, int recvTimeout) override;
-	virtual bool OnReadyToSend() override;
-
-protected:
-	virtual void SetMaxPriority() override;
-
-private:
-	static int GetDescriptorFromSocket(NetworkSocket* socket);
-	int fd;
-	bool needUpdateNat64Prefix;
-	bool nat64Present;
-	double switchToV6at;
-	bool isV4Available;
-	bool useTCP;
-	bool closing;
-	IPv4Address lastRecvdV4;
-	IPv6Address lastRecvdV6;
-	NetworkAddress* tcpConnectedAddress;
-	uint16_t tcpConnectedPort;
-	Buffer* pendingOutgoingPacket=NULL;
-};
-
-}
-
-#endif //LIBTGVOIP_NETWORKSOCKETPOSIX_H
diff --git a/submodules/libtgvoip/os/windows/AudioInputWASAPI.cpp b/submodules/libtgvoip/os/windows/AudioInputWASAPI.cpp
deleted file mode 100755
index 97179c242b..0000000000
--- a/submodules/libtgvoip/os/windows/AudioInputWASAPI.cpp
+++ /dev/null
@@ -1,459 +0,0 @@
-//
-// libtgvoip is free and unencumbered public domain software.
-// For more information, see http://unlicense.org or the UNLICENSE file
-// you should have received with this source code distribution.
-//
-
-
-#include <assert.h>
-#include "AudioInputWASAPI.h"
-#include "../../logging.h"
-#include "../../VoIPController.h"
-
-#define BUFFER_SIZE 960
-#define CHECK_RES(res, msg) {if(FAILED(res)){LOGE("%s failed: HRESULT=0x%08X", msg, res); failed=true; return;}}
-#define SCHECK_RES(res, msg) {if(FAILED(res)){LOGE("%s failed: HRESULT=0x%08X", msg, res); return;}}
-
-template <class T> void SafeRelease(T **ppT)
-{
-	if(*ppT)
-	{
-		(*ppT)->Release();
-		*ppT = NULL;
-	}
-}
-
-using namespace tgvoip::audio;
-
-AudioInputWASAPI::AudioInputWASAPI(std::string deviceID){
-	isRecording=false;
-	remainingDataLen=0;
-	refCount=1;
-	HRESULT res;
-	res=CoInitializeEx(NULL, COINIT_MULTITHREADED);
-	if(FAILED(res) && res!=RPC_E_CHANGED_MODE){
-		CHECK_RES(res, "CoInitializeEx");
-	}
-#ifdef TGVOIP_WINXP_COMPAT
-	HANDLE (WINAPI *__CreateEventExA)(LPSECURITY_ATTRIBUTES lpEventAttributes, LPCSTR lpName, DWORD dwFlags, DWORD dwDesiredAccess);
-	__CreateEventExA=(HANDLE (WINAPI *)(LPSECURITY_ATTRIBUTES, LPCSTR, DWORD, DWORD))GetProcAddress(GetModuleHandleA("kernel32.dll"), "CreateEventExA");
-#undef CreateEventEx
-#define CreateEventEx __CreateEventExA
-#endif
-	shutdownEvent=CreateEventEx(NULL, NULL, 0, EVENT_MODIFY_STATE | SYNCHRONIZE);
-	audioSamplesReadyEvent=CreateEventEx(NULL, NULL, 0, EVENT_MODIFY_STATE | SYNCHRONIZE);
-	streamSwitchEvent=CreateEventEx(NULL, NULL, 0, EVENT_MODIFY_STATE | SYNCHRONIZE);
-	ZeroMemory(&format, sizeof(format));
-	format.wFormatTag=WAVE_FORMAT_PCM;
-	format.nChannels=1;
-	format.nSamplesPerSec=48000;
-	format.nBlockAlign=2;
-	format.nAvgBytesPerSec=format.nSamplesPerSec*format.nBlockAlign;
-	format.wBitsPerSample=16;
-
-#ifdef TGVOIP_WINDOWS_DESKTOP
-	res=CoCreateInstance(__uuidof(MMDeviceEnumerator), NULL, CLSCTX_INPROC_SERVER, IID_PPV_ARGS(&enumerator));
-	CHECK_RES(res, "CoCreateInstance(MMDeviceEnumerator)");
-	res=enumerator->RegisterEndpointNotificationCallback(this);
-	CHECK_RES(res, "enumerator->RegisterEndpointNotificationCallback");
-	audioSessionControl=NULL;
-	device=NULL;
-#endif
-
-	audioClient=NULL;
-	captureClient=NULL;
-	thread=NULL;
-	started=false;
-
-	SetCurrentDevice(deviceID);
-}
-
-AudioInputWASAPI::~AudioInputWASAPI(){
-	if(audioClient && started){
-		audioClient->Stop();
-	}
-
-#ifdef TGVOIP_WINDOWS_DESKTOP
-	if(audioSessionControl){
-		audioSessionControl->UnregisterAudioSessionNotification(this);
-	}
-#endif
-
-	SetEvent(shutdownEvent);
-	if(thread){
-		WaitForSingleObjectEx(thread, INFINITE, false);
-		CloseHandle(thread);
-	}
-#ifdef TGVOIP_WINDOWS_DESKTOP
-	SafeRelease(&audioSessionControl);
-#endif
-	SafeRelease(&captureClient);
-	SafeRelease(&audioClient);
-#ifdef TGVOIP_WINDOWS_DESKTOP
-	SafeRelease(&device);
-#endif
-	CloseHandle(shutdownEvent);
-	CloseHandle(audioSamplesReadyEvent);
-	CloseHandle(streamSwitchEvent);
-#ifdef TGVOIP_WINDOWS_DESKTOP
-	if(enumerator)
-		enumerator->UnregisterEndpointNotificationCallback(this);
-	SafeRelease(&enumerator);
-#endif
-}
-void AudioInputWASAPI::Start(){
-	isRecording=true;
-	if(!thread){
-		thread=CreateThread(NULL, 0, AudioInputWASAPI::StartThread, this, 0, NULL);
-	}
-	
-	if(audioClient && !started){
-		LOGI("audioClient->Start");
-		audioClient->Start();
-		started=true;
-	}
-}
-
-void AudioInputWASAPI::Stop(){
-	isRecording=false;
-}
-
-bool AudioInputWASAPI::IsRecording(){
-	return isRecording;
-}
-
-void AudioInputWASAPI::EnumerateDevices(std::vector<tgvoip::AudioInputDevice>& devs){
-#ifdef TGVOIP_WINDOWS_DESKTOP
-	HRESULT res;
-	res=CoInitializeEx(NULL, COINIT_MULTITHREADED);
-	if(FAILED(res) && res!=RPC_E_CHANGED_MODE){
-		SCHECK_RES(res, "CoInitializeEx");
-	}
-
-	IMMDeviceEnumerator *deviceEnumerator = NULL;
-	IMMDeviceCollection *deviceCollection = NULL;
-
-	res=CoCreateInstance(__uuidof(MMDeviceEnumerator), NULL, CLSCTX_INPROC_SERVER, IID_PPV_ARGS(&deviceEnumerator));
-	SCHECK_RES(res, "CoCreateInstance(MMDeviceEnumerator)");
-
-	res=deviceEnumerator->EnumAudioEndpoints(eCapture, DEVICE_STATE_ACTIVE, &deviceCollection);
-	SCHECK_RES(res, "EnumAudioEndpoints");
-
-	UINT devCount;
-	res=deviceCollection->GetCount(&devCount);
-	SCHECK_RES(res, "GetCount");
-
-	for(UINT i=0;i<devCount;i++){
-		IMMDevice* device;
-		res=deviceCollection->Item(i, &device);
-		SCHECK_RES(res, "GetDeviceItem");
-		wchar_t* devID;
-		res=device->GetId(&devID);
-		SCHECK_RES(res, "get device id");
-
-		IPropertyStore* propStore;
-		res=device->OpenPropertyStore(STGM_READ, &propStore);
-		SafeRelease(&device);
-		SCHECK_RES(res, "OpenPropertyStore");
-		
-		PROPVARIANT friendlyName;
-		PropVariantInit(&friendlyName);
-		res=propStore->GetValue(PKEY_Device_FriendlyName, &friendlyName);
-		SafeRelease(&propStore);
-
-		AudioInputDevice dev;
-
-		wchar_t actualFriendlyName[128];
-		if(friendlyName.vt==VT_LPWSTR){
-			wcsncpy(actualFriendlyName, friendlyName.pwszVal, sizeof(actualFriendlyName)/sizeof(wchar_t));
-		}else{
-			wcscpy(actualFriendlyName, L"Unknown");
-		}
-		PropVariantClear(&friendlyName);
-
-		char buf[256];
-		WideCharToMultiByte(CP_UTF8, 0, devID, -1, buf, sizeof(buf), NULL, NULL);
-		dev.id=buf;
-		WideCharToMultiByte(CP_UTF8, 0, actualFriendlyName, -1, buf, sizeof(buf), NULL, NULL);
-		dev.displayName=buf;
-		devs.push_back(dev);
-
-		CoTaskMemFree(devID);
-	}
-
-	SafeRelease(&deviceCollection);
-	SafeRelease(&deviceEnumerator);
-#endif
-}
-
-void AudioInputWASAPI::SetCurrentDevice(std::string deviceID){
-	if(thread){
-		streamChangeToDevice=deviceID;
-		SetEvent(streamSwitchEvent);
-	}else{
-		ActuallySetCurrentDevice(deviceID);
-	}
-}
-
-void AudioInputWASAPI::ActuallySetCurrentDevice(std::string deviceID){
-	currentDevice=deviceID;
-	HRESULT res;
-
-	if(audioClient){
-		res=audioClient->Stop();
-		CHECK_RES(res, "audioClient->Stop");
-	}
-
-#ifdef TGVOIP_WINDOWS_DESKTOP
-	if(audioSessionControl){
-		res=audioSessionControl->UnregisterAudioSessionNotification(this);
-		CHECK_RES(res, "audioSessionControl->UnregisterAudioSessionNotification");
-	}
-
-	SafeRelease(&audioSessionControl);
-#endif
-	SafeRelease(&captureClient);
-	SafeRelease(&audioClient);
-#ifdef TGVOIP_WINDOWS_DESKTOP
-	SafeRelease(&device);
-
-	IMMDeviceCollection *deviceCollection = NULL;
-
-	if(deviceID=="default"){
-		isDefaultDevice=true;
-		res=enumerator->GetDefaultAudioEndpoint(eCapture, eCommunications, &device);
-		CHECK_RES(res, "GetDefaultAudioEndpoint");
-	}else{
-		isDefaultDevice=false;
-		res=enumerator->EnumAudioEndpoints(eCapture, DEVICE_STATE_ACTIVE, &deviceCollection);
-		CHECK_RES(res, "EnumAudioEndpoints");
-
-		UINT devCount;
-		res=deviceCollection->GetCount(&devCount);
-		CHECK_RES(res, "GetCount");
-
-		for(UINT i=0;i<devCount;i++){
-			IMMDevice* device;
-			res=deviceCollection->Item(i, &device);
-			CHECK_RES(res, "GetDeviceItem");
-			wchar_t* _devID;
-			res=device->GetId(&_devID);
-			CHECK_RES(res, "get device id");
-
-			char devID[128];
-			WideCharToMultiByte(CP_UTF8, 0, _devID, -1, devID, 128, NULL, NULL);
-
-			CoTaskMemFree(_devID);
-			if(deviceID==devID){
-				this->device=device;
-				//device->AddRef();
-				break;
-			}
-		}
-	}
-
-	if(deviceCollection)
-		SafeRelease(&deviceCollection);
-
-	if(!device){
-		LOGE("Didn't find capture device; failing");
-		failed=true;
-		return;
-	}
-	
-	res=device->Activate(__uuidof(IAudioClient), CLSCTX_INPROC_SERVER, NULL, (void**)&audioClient);
-	CHECK_RES(res, "device->Activate");
-#else
-	std::wstring devID;
-
-	if (deviceID=="default"){
-		Platform::String^ defaultDevID=Windows::Media::Devices::MediaDevice::GetDefaultAudioCaptureId(Windows::Media::Devices::AudioDeviceRole::Communications);
-		if(defaultDevID==nullptr){
-			LOGE("Didn't find capture device; failing");
-			failed=true;
-			return;
-		}else{
-			isDefaultDevice=true;
-			devID=defaultDevID->Data();
-		}
-	}else{
-		int wchars_num=MultiByteToWideChar(CP_UTF8, 0, deviceID.c_str(), -1, NULL, 0);
-		wchar_t* wstr=new wchar_t[wchars_num];
-		MultiByteToWideChar(CP_UTF8, 0, deviceID.c_str(), -1, wstr, wchars_num);
-		devID=wstr;
-	}
-
-	HRESULT res1, res2;
-	IAudioClient2* audioClient2=WindowsSandboxUtils::ActivateAudioDevice(devID.c_str(), &res1, &res2);
-	CHECK_RES(res1, "activate1");
-	CHECK_RES(res2, "activate2");
-
-	AudioClientProperties properties={};
-	properties.cbSize=sizeof AudioClientProperties;
-	properties.eCategory=AudioCategory_Communications;
-	res = audioClient2->SetClientProperties(&properties);
-	CHECK_RES(res, "audioClient2->SetClientProperties");
-
-	audioClient=audioClient2;
-#endif
-
-	// {2C693079-3F59-49FD-964F-61C005EAA5D3}
-	const GUID guid = { 0x2c693079, 0x3f59, 0x49fd, { 0x96, 0x4f, 0x61, 0xc0, 0x5, 0xea, 0xa5, 0xd3 } };
-	// Use 1000ms buffer to avoid resampling glitches on Windows 8.1 and older. This should not increase latency.
-	res = audioClient->Initialize(AUDCLNT_SHAREMODE_SHARED, AUDCLNT_STREAMFLAGS_EVENTCALLBACK | AUDCLNT_STREAMFLAGS_NOPERSIST | AUDCLNT_STREAMFLAGS_AUTOCONVERTPCM | AUDCLNT_STREAMFLAGS_SRC_DEFAULT_QUALITY, 1000*10000, 0, &format, &guid);
-	CHECK_RES(res, "audioClient->Initialize");
-
-	uint32_t bufSize;
-	res = audioClient->GetBufferSize(&bufSize);
-	CHECK_RES(res, "audioClient->GetBufferSize");
-
-	LOGV("buffer size: %u", bufSize);
-	estimatedDelay=0;
-	REFERENCE_TIME latency, devicePeriod;
-	if(SUCCEEDED(audioClient->GetStreamLatency(&latency))){
-		if(SUCCEEDED(audioClient->GetDevicePeriod(&devicePeriod, NULL))){
-			estimatedDelay=(int32_t)(latency/10000+devicePeriod/10000);
-		}
-	}
-
-	res = audioClient->SetEventHandle(audioSamplesReadyEvent);
-	CHECK_RES(res, "audioClient->SetEventHandle");
-
-	res = audioClient->GetService(IID_PPV_ARGS(&captureClient));
-	CHECK_RES(res, "audioClient->GetService");
-
-#ifdef TGVOIP_WINDOWS_DESKTOP
-	res=audioClient->GetService(IID_PPV_ARGS(&audioSessionControl));
-	CHECK_RES(res, "audioClient->GetService(IAudioSessionControl)");
-
-	res=audioSessionControl->RegisterAudioSessionNotification(this);
-	CHECK_RES(res, "audioSessionControl->RegisterAudioSessionNotification");
-#endif
-
-	if(isRecording)
-		audioClient->Start();
-
-	LOGV("set current input device done");
-}
-
-DWORD WINAPI AudioInputWASAPI::StartThread(void* arg) {
-	LOGV("WASAPI capture thread starting");
-	((AudioInputWASAPI*)arg)->RunThread();
-	return 0;
-}
-
-void AudioInputWASAPI::RunThread() {
-	if(failed)
-		return;
-	SetThreadPriority(GetCurrentThread(), THREAD_PRIORITY_HIGHEST);
-
-	HANDLE waitArray[]={shutdownEvent, streamSwitchEvent, audioSamplesReadyEvent};
-	HRESULT res=CoInitializeEx(NULL, COINIT_MULTITHREADED);
-	CHECK_RES(res, "CoInitializeEx in capture thread");
-
-	uint32_t bufferSize=0;
-	uint64_t framesWritten=0;
-
-	bool running=true;
-	//double prevCallback=VoIPController::GetCurrentTime();
-
-	while(running){
-		DWORD waitResult=WaitForMultipleObjectsEx(3, waitArray, false, INFINITE, false);
-		if(waitResult==WAIT_OBJECT_0){ // shutdownEvent
-			LOGV("capture thread shutting down");
-			running=false;
-		}else if(waitResult==WAIT_OBJECT_0+1){ // streamSwitchEvent
-			LOGV("stream switch");
-			ActuallySetCurrentDevice(streamChangeToDevice);
-			ResetEvent(streamSwitchEvent);
-			bufferSize=0;
-			LOGV("stream switch done");
-		}else if(waitResult==WAIT_OBJECT_0+2){ // audioSamplesReadyEvent
-			if(!audioClient)
-				continue;
-			res=captureClient->GetNextPacketSize(&bufferSize);
-			CHECK_RES(res, "captureClient->GetNextPacketSize");
-			BYTE* data;
-			uint32_t framesAvailable=0;
-			DWORD flags;
-
-			res=captureClient->GetBuffer(&data, &framesAvailable, &flags, NULL, NULL);
-			CHECK_RES(res, "captureClient->GetBuffer");
-			size_t dataLen=framesAvailable*2;
-			assert(remainingDataLen+dataLen<sizeof(remainingData));
-
-			if(flags & AUDCLNT_BUFFERFLAGS_DATA_DISCONTINUITY){
-				LOGW("Audio capture data discontinuity");
-			}
-
-			//double t=VoIPController::GetCurrentTime();
-			//LOGV("audio capture: %u, time %f, flags %u", framesAvailable, t-prevCallback, flags);
-			//prevCallback=t;
-
-			memcpy(remainingData+remainingDataLen, data, dataLen);
-			remainingDataLen+=dataLen;
-			while(remainingDataLen>960*2){
-				if(isRecording)
-					InvokeCallback(remainingData, 960*2);
-
-				//LOGV("remaining data len %u", remainingDataLen);
-				memmove(remainingData, remainingData+(960*2), remainingDataLen-960*2);
-				remainingDataLen-=960*2;
-			}
-
-			res=captureClient->ReleaseBuffer(framesAvailable);
-			CHECK_RES(res, "captureClient->ReleaseBuffer");
-			//estimatedDelay=(int32_t)((devicePosition-framesWritten)/48);
-
-			framesWritten+=framesAvailable;
-		}
-	}
-}
-
-#ifdef TGVOIP_WINDOWS_DESKTOP
-HRESULT AudioInputWASAPI::OnSessionDisconnected(AudioSessionDisconnectReason reason) {
-	if(!isDefaultDevice){
-		streamChangeToDevice="default";
-		SetEvent(streamSwitchEvent);
-	}
-	return S_OK;
-}
-
-HRESULT AudioInputWASAPI::OnDefaultDeviceChanged(EDataFlow flow, ERole role, LPCWSTR newDevID) {
-	if(flow==eCapture && role==eCommunications && isDefaultDevice){
-		streamChangeToDevice="default";
-		SetEvent(streamSwitchEvent);
-	}
-	return S_OK;
-}
-
-ULONG AudioInputWASAPI::AddRef(){
-	return InterlockedIncrement(&refCount);
-}
-
-ULONG AudioInputWASAPI::Release(){
-	return InterlockedDecrement(&refCount);
-}
-
-HRESULT AudioInputWASAPI::QueryInterface(REFIID iid, void** obj){
-	if(!obj){
-		return E_POINTER;
-	}
-	*obj=NULL;
-
-	if(iid==IID_IUnknown){
-		*obj=static_cast<IUnknown*>(static_cast<IAudioSessionEvents*>(this));
-		AddRef();
-	}else if(iid==__uuidof(IMMNotificationClient)){
-		*obj=static_cast<IMMNotificationClient*>(this);
-		AddRef();
-	}else if(iid==__uuidof(IAudioSessionEvents)){
-		*obj=static_cast<IAudioSessionEvents*>(this);
-		AddRef();
-	}else{
-		return E_NOINTERFACE;
-	}
-
-	return S_OK;
-}
-#endif
\ No newline at end of file
diff --git a/submodules/libtgvoip/os/windows/AudioInputWASAPI.h b/submodules/libtgvoip/os/windows/AudioInputWASAPI.h
deleted file mode 100755
index b92ef25ed2..0000000000
--- a/submodules/libtgvoip/os/windows/AudioInputWASAPI.h
+++ /dev/null
@@ -1,105 +0,0 @@
-//
-// libtgvoip is free and unencumbered public domain software.
-// For more information, see http://unlicense.org or the UNLICENSE file
-// you should have received with this source code distribution.
-//
-
-#ifndef LIBTGVOIP_AUDIOINPUTWASAPI_H
-#define LIBTGVOIP_AUDIOINPUTWASAPI_H
-
-#if WINAPI_FAMILY==WINAPI_FAMILY_PHONE_APP
-#define TGVOIP_WINDOWS_PHONE
-#endif
-#if !defined(WINAPI_FAMILY) || WINAPI_FAMILY==WINAPI_FAMILY_DESKTOP_APP
-#define TGVOIP_WINDOWS_DESKTOP
-#endif
-
-#include <windows.h>
-#include <string>
-#include <vector>
-#pragma warning(push)
-#pragma warning(disable : 4201)
-#ifndef TGVOIP_WP_SILVERLIGHT
-#include <mmdeviceapi.h>
-#endif
-#ifdef TGVOIP_WINDOWS_DESKTOP
-#include <audiopolicy.h>
-#include <functiondiscoverykeys.h>
-#else
-#include <audioclient.h>
-#include "WindowsSandboxUtils.h"
-#endif
-#pragma warning(pop)
-#include "../../audio/AudioInput.h"
-
-namespace tgvoip{
-namespace audio{
-
-#ifdef TGVOIP_WINDOWS_DESKTOP
-class AudioInputWASAPI : public AudioInput, IMMNotificationClient, IAudioSessionEvents{
-#else
-class AudioInputWASAPI : public AudioInput{
-#endif
-
-public:
-	AudioInputWASAPI(std::string deviceID);
-	virtual ~AudioInputWASAPI();
-	virtual void Start();
-	virtual void Stop();
-	virtual bool IsRecording();
-	virtual void SetCurrentDevice(std::string deviceID);
-	static void EnumerateDevices(std::vector<AudioInputDevice>& devs);
-#ifdef TGVOIP_WINDOWS_DESKTOP
-	STDMETHOD_(ULONG, AddRef)();
-	STDMETHOD_(ULONG, Release)();
-#endif
-
-private:
-	void ActuallySetCurrentDevice(std::string deviceID);
-	static DWORD WINAPI StartThread(void* arg);
-	void RunThread();
-	WAVEFORMATEX format;
-	bool isRecording;
-	HANDLE shutdownEvent;
-	HANDLE audioSamplesReadyEvent;
-	HANDLE streamSwitchEvent;
-	HANDLE thread;
-	IAudioClient* audioClient=NULL;
-	IAudioCaptureClient* captureClient=NULL;
-#ifdef TGVOIP_WINDOWS_DESKTOP
-	IMMDeviceEnumerator* enumerator;
-	IAudioSessionControl* audioSessionControl;
-	IMMDevice* device;
-#endif
-	unsigned char remainingData[10240];
-	size_t remainingDataLen;
-	bool isDefaultDevice;
-	ULONG refCount;
-	std::string streamChangeToDevice;
-	bool started;
-
-#ifdef TGVOIP_WINDOWS_DESKTOP
-	STDMETHOD(OnDisplayNameChanged) (LPCWSTR /*NewDisplayName*/, LPCGUID /*EventContext*/) { return S_OK; };
-	STDMETHOD(OnIconPathChanged) (LPCWSTR /*NewIconPath*/, LPCGUID /*EventContext*/) { return S_OK; };
-	STDMETHOD(OnSimpleVolumeChanged) (float /*NewSimpleVolume*/, BOOL /*NewMute*/, LPCGUID /*EventContext*/) { return S_OK; }
-	STDMETHOD(OnChannelVolumeChanged) (DWORD /*ChannelCount*/, float /*NewChannelVolumes*/[], DWORD /*ChangedChannel*/, LPCGUID /*EventContext*/) { return S_OK; };
-	STDMETHOD(OnGroupingParamChanged) (LPCGUID /*NewGroupingParam*/, LPCGUID /*EventContext*/) { return S_OK; };
-	STDMETHOD(OnStateChanged) (AudioSessionState /*NewState*/) { return S_OK; };
-	STDMETHOD(OnSessionDisconnected) (AudioSessionDisconnectReason DisconnectReason);
-	STDMETHOD(OnDeviceStateChanged) (LPCWSTR /*DeviceId*/, DWORD /*NewState*/) { return S_OK; }
-	STDMETHOD(OnDeviceAdded) (LPCWSTR /*DeviceId*/) { return S_OK; };
-	STDMETHOD(OnDeviceRemoved) (LPCWSTR /*DeviceId(*/) { return S_OK; };
-	STDMETHOD(OnDefaultDeviceChanged) (EDataFlow Flow, ERole Role, LPCWSTR NewDefaultDeviceId);
-	STDMETHOD(OnPropertyValueChanged) (LPCWSTR /*DeviceId*/, const PROPERTYKEY /*Key*/) { return S_OK; };
-
-	//
-	//  IUnknown
-	//
-	STDMETHOD(QueryInterface)(REFIID iid, void **pvObject);
-#endif
-};
-
-}
-}
-
-#endif //LIBTGVOIP_AUDIOINPUTWASAPI_H
diff --git a/submodules/libtgvoip/os/windows/AudioInputWave.cpp b/submodules/libtgvoip/os/windows/AudioInputWave.cpp
deleted file mode 100755
index aaf12bf379..0000000000
--- a/submodules/libtgvoip/os/windows/AudioInputWave.cpp
+++ /dev/null
@@ -1,170 +0,0 @@
-//
-// libtgvoip is free and unencumbered public domain software.
-// For more information, see http://unlicense.org or the UNLICENSE file
-// you should have received with this source code distribution.
-//
-
-#include <stdlib.h>
-#include <stdio.h>
-#include <assert.h>
-#include "AudioInputWave.h"
-#include "../../logging.h"
-#include "../../VoIPController.h"
-
-using namespace tgvoip::audio;
-
-#define BUFFER_SIZE 960
-#define CHECK_ERROR(res, msg) if(res!=MMSYSERR_NOERROR){wchar_t _buf[1024]; waveInGetErrorTextW(res, _buf, 1024); LOGE(msg ": %ws (MMRESULT=0x%08X)", _buf, res); failed=true;}
-
-AudioInputWave::AudioInputWave(std::string deviceID){
-	isRecording=false;
-
-	for(int i=0;i<4;i++){
-		ZeroMemory(&buffers[i], sizeof(WAVEHDR));
-		buffers[i].dwBufferLength=960*2;
-		buffers[i].lpData=(char*)malloc(960*2);
-	}
-
-	hWaveIn=NULL;
-
-	SetCurrentDevice(deviceID);
-}
-
-AudioInputWave::~AudioInputWave(){
-	for(int i=0;i<4;i++){
-		free(buffers[i].lpData);
-	}
-	waveInClose(hWaveIn);
-}
-
-void AudioInputWave::Start(){
-	if(!isRecording){
-		isRecording=true;
-			
-		MMRESULT res;
-		for(int i=0;i<4;i++){
-			res=waveInPrepareHeader(hWaveIn, &buffers[i], sizeof(WAVEHDR));
-			CHECK_ERROR(res, "waveInPrepareHeader failed");
-			res=waveInAddBuffer(hWaveIn, &buffers[i], sizeof(WAVEHDR));
-			CHECK_ERROR(res, "waveInAddBuffer failed");
-		}
-		res=waveInStart(hWaveIn);
-		CHECK_ERROR(res, "waveInStart failed");
-	}
-}
-
-void AudioInputWave::Stop(){
-	if(isRecording){
-		isRecording=false;
-		
-		MMRESULT res=waveInStop(hWaveIn);
-		CHECK_ERROR(res, "waveInStop failed");
-		res=waveInReset(hWaveIn);
-		CHECK_ERROR(res, "waveInReset failed");
-		for(int i=0;i<4;i++){
-			res=waveInUnprepareHeader(hWaveIn, &buffers[i], sizeof(WAVEHDR));
-			CHECK_ERROR(res, "waveInUnprepareHeader failed");
-		}
-	}
-}
-
-void CALLBACK AudioInputWave::WaveInProc(HWAVEIN hwi, UINT uMsg, DWORD_PTR dwInstance, DWORD_PTR dwParam1, DWORD_PTR dwParam2){
-	if(uMsg==WIM_DATA){
-		((AudioInputWave*)dwInstance)->OnData((WAVEHDR*)dwParam1);
-	}
-}
-
-void AudioInputWave::OnData(WAVEHDR* hdr){
-	if(!isRecording)
-		return;
-
-	InvokeCallback((unsigned char*)hdr->lpData, hdr->dwBufferLength);
-	hdr->dwFlags&= ~WHDR_DONE;
-	MMRESULT res=waveInAddBuffer(hWaveIn, hdr, sizeof(WAVEHDR));
-	CHECK_ERROR(res, "waveInAddBuffer failed");
-}
-
-void AudioInputWave::EnumerateDevices(std::vector<tgvoip::AudioInputDevice>& devs){
-	UINT num=waveInGetNumDevs();
-	WAVEINCAPSW caps;
-	char nameBuf[512];
-	for(UINT i=0;i<num;i++){
-		waveInGetDevCapsW(i, &caps, sizeof(caps));
-		AudioInputDevice dev;
-		WideCharToMultiByte(CP_UTF8, 0, caps.szPname, -1, nameBuf, sizeof(nameBuf), NULL, NULL);
-		dev.displayName=std::string(nameBuf);
-		dev.id=std::string(nameBuf);
-		devs.push_back(dev);
-	}
-}
-
-void AudioInputWave::SetCurrentDevice(std::string deviceID){
-	currentDevice=deviceID;
-
-	bool wasRecording=isRecording;
-	isRecording=false;
-	if(hWaveIn){
-		MMRESULT res;
-		if(isRecording){
-			res=waveInStop(hWaveIn);
-			CHECK_ERROR(res, "waveInStop failed");
-			res=waveInReset(hWaveIn);
-			CHECK_ERROR(res, "waveInReset failed");
-			for(int i=0;i<4;i++){
-				res=waveInUnprepareHeader(hWaveIn, &buffers[i], sizeof(WAVEHDR));
-				CHECK_ERROR(res, "waveInUnprepareHeader failed");
-			}
-		}
-		res=waveInClose(hWaveIn);
-		CHECK_ERROR(res, "waveInClose failed");
-	}
-
-	ZeroMemory(&format, sizeof(format));
-	format.cbSize=0;
-	format.wFormatTag=WAVE_FORMAT_PCM;
-	format.nSamplesPerSec=48000;
-	format.wBitsPerSample=16;
-	format.nChannels=1;
-	format.nBlockAlign=2;
-
-	LOGV("before open device %s", deviceID.c_str());
-
-	if(deviceID=="default"){
-		MMRESULT res=waveInOpen(&hWaveIn, WAVE_MAPPER, &format, (DWORD_PTR)AudioInputWave::WaveInProc, (DWORD_PTR)this, CALLBACK_FUNCTION);
-		CHECK_ERROR(res, "waveInOpen failed");
-	}else{
-		UINT num=waveInGetNumDevs();
-		WAVEINCAPSW caps;
-		char nameBuf[512];
-		hWaveIn=NULL;
-		for(UINT i=0;i<num;i++){
-			waveInGetDevCapsW(i, &caps, sizeof(caps));
-			WideCharToMultiByte(CP_UTF8, 0, caps.szPname, -1, nameBuf, sizeof(nameBuf), NULL, NULL);
-			std::string name=std::string(nameBuf);
-			if(name==deviceID){
-				MMRESULT res=waveInOpen(&hWaveIn, i, &format, (DWORD_PTR)AudioInputWave::WaveInProc, (DWORD_PTR)this, CALLBACK_FUNCTION | WAVE_MAPPED);
-				CHECK_ERROR(res, "waveInOpen failed");
-				LOGD("Opened device %s", nameBuf);
-				break;
-			}
-		}
-		if(!hWaveIn){
-			SetCurrentDevice("default");
-			return;
-		}
-	}
-
-	isRecording=wasRecording;
-
-	if(isRecording){
-		MMRESULT res;
-		for(int i=0;i<4;i++){
-			res=waveInPrepareHeader(hWaveIn, &buffers[i], sizeof(WAVEHDR));
-			CHECK_ERROR(res, "waveInPrepareHeader failed");
-			res=waveInAddBuffer(hWaveIn, &buffers[i], sizeof(WAVEHDR));
-			CHECK_ERROR(res, "waveInAddBuffer failed");
-		}
-		res=waveInStart(hWaveIn);
-		CHECK_ERROR(res, "waveInStart failed");
-	}
-}
\ No newline at end of file
diff --git a/submodules/libtgvoip/os/windows/AudioInputWave.h b/submodules/libtgvoip/os/windows/AudioInputWave.h
deleted file mode 100644
index 74b03221ec..0000000000
--- a/submodules/libtgvoip/os/windows/AudioInputWave.h
+++ /dev/null
@@ -1,40 +0,0 @@
-//
-// libtgvoip is free and unencumbered public domain software.
-// For more information, see http://unlicense.org or the UNLICENSE file
-// you should have received with this source code distribution.
-//
-
-#ifndef LIBTGVOIP_AUDIOINPUTWAVE_H
-#define LIBTGVOIP_AUDIOINPUTWAVE_H
-
-#include <windows.h>
-#include <string>
-#include <vector>
-#include "../../audio/AudioInput.h"
-
-namespace tgvoip{
-namespace audio{
-
-class AudioInputWave : public AudioInput{
-
-public:
-	AudioInputWave(std::string deviceID);
-	virtual ~AudioInputWave();
-	virtual void Start();
-	virtual void Stop();
-	virtual void SetCurrentDevice(std::string deviceID);
-	static void EnumerateDevices(std::vector<AudioInputDevice>& devs);
-
-private:
-	static void CALLBACK WaveInProc(HWAVEIN hwi, UINT uMsg, DWORD_PTR dwInstance, DWORD_PTR dwParam1, DWORD_PTR dwParam2);
-	void OnData(WAVEHDR* hdr);
-	HWAVEIN hWaveIn;
-	WAVEFORMATEX format;
-	WAVEHDR buffers[4];
-	bool isRecording;
-};
-
-}
-}
-
-#endif //LIBTGVOIP_AUDIOINPUTWAVE_H
diff --git a/submodules/libtgvoip/os/windows/AudioOutputWASAPI.cpp b/submodules/libtgvoip/os/windows/AudioOutputWASAPI.cpp
deleted file mode 100755
index 65d99c3e10..0000000000
--- a/submodules/libtgvoip/os/windows/AudioOutputWASAPI.cpp
+++ /dev/null
@@ -1,455 +0,0 @@
-//
-// libtgvoip is free and unencumbered public domain software.
-// For more information, see http://unlicense.org or the UNLICENSE file
-// you should have received with this source code distribution.
-//
-
-
-#include <assert.h>
-#include "AudioOutputWASAPI.h"
-#include "../../logging.h"
-#include "../../VoIPController.h"
-
-#define BUFFER_SIZE 960
-#define CHECK_RES(res, msg) {if(FAILED(res)){LOGE("%s failed: HRESULT=0x%08X", msg, res); failed=true; return;}}
-#define SCHECK_RES(res, msg) {if(FAILED(res)){LOGE("%s failed: HRESULT=0x%08X", msg, res); return;}}
-
-template <class T> void SafeRelease(T **ppT)
-{
-	if(*ppT)
-	{
-		(*ppT)->Release();
-		*ppT = NULL;
-	}
-}
-
-#ifdef TGVOIP_WINXP_COMPAT
-
-#endif
-
-using namespace tgvoip::audio;
-
-AudioOutputWASAPI::AudioOutputWASAPI(std::string deviceID){
-	isPlaying=false;
-	remainingDataLen=0;
-	refCount=1;
-	HRESULT res;
-	res=CoInitializeEx(NULL, COINIT_MULTITHREADED);
-	if(FAILED(res) && res!=RPC_E_CHANGED_MODE){
-		CHECK_RES(res, "CoInitializeEx");
-	}
-#ifdef TGVOIP_WINXP_COMPAT
-	HANDLE (WINAPI *__CreateEventExA)(LPSECURITY_ATTRIBUTES lpEventAttributes, LPCSTR lpName, DWORD dwFlags, DWORD dwDesiredAccess);
-	__CreateEventExA=(HANDLE (WINAPI *)(LPSECURITY_ATTRIBUTES, LPCSTR, DWORD, DWORD))GetProcAddress(GetModuleHandleA("kernel32.dll"), "CreateEventExA");
-#undef CreateEventEx
-#define CreateEventEx __CreateEventExA
-#endif
-	shutdownEvent=CreateEventEx(NULL, NULL, 0, EVENT_MODIFY_STATE | SYNCHRONIZE);
-	audioSamplesReadyEvent=CreateEventEx(NULL, NULL, 0, EVENT_MODIFY_STATE | SYNCHRONIZE);
-	streamSwitchEvent=CreateEventEx(NULL, NULL, 0, EVENT_MODIFY_STATE | SYNCHRONIZE);
-	ZeroMemory(&format, sizeof(format));
-	format.wFormatTag=WAVE_FORMAT_PCM;
-	format.nChannels=1;
-	format.nSamplesPerSec=48000;
-	format.nBlockAlign=2;
-	format.nAvgBytesPerSec=format.nSamplesPerSec*format.nBlockAlign;
-	format.wBitsPerSample=16;
-
-#ifdef TGVOIP_WINDOWS_DESKTOP
-	res=CoCreateInstance(__uuidof(MMDeviceEnumerator), NULL, CLSCTX_INPROC_SERVER, IID_PPV_ARGS(&enumerator));
-	CHECK_RES(res, "CoCreateInstance(MMDeviceEnumerator)");
-	res=enumerator->RegisterEndpointNotificationCallback(this);
-	CHECK_RES(res, "enumerator->RegisterEndpointNotificationCallback");
-	audioSessionControl=NULL;
-	device=NULL;
-#endif
-
-	audioClient=NULL;
-	renderClient=NULL;
-	thread=NULL;
-
-	SetCurrentDevice(deviceID);
-}
-
-AudioOutputWASAPI::~AudioOutputWASAPI(){
-	if(audioClient){
-		audioClient->Stop();
-	}
-
-#ifdef TGVOIP_WINDOWS_DESKTOP
-	if(audioSessionControl){
-		audioSessionControl->UnregisterAudioSessionNotification(this);
-	}
-#endif
-
-	SetEvent(shutdownEvent);
-	if(thread){
-		WaitForSingleObjectEx(thread, INFINITE, false);
-		CloseHandle(thread);
-	}
-	SafeRelease(&renderClient);
-	SafeRelease(&audioClient);
-#ifdef TGVOIP_WINDOWS_DESKTOP
-	SafeRelease(&device);
-	SafeRelease(&audioSessionControl);
-#endif
-	CloseHandle(shutdownEvent);
-	CloseHandle(audioSamplesReadyEvent);
-	CloseHandle(streamSwitchEvent);
-#ifdef TGVOIP_WINDOWS_DESKTOP
-	if(enumerator)
-		enumerator->UnregisterEndpointNotificationCallback(this);
-	SafeRelease(&enumerator);
-#endif
-}
-
-void AudioOutputWASAPI::Start(){
-	isPlaying=true;
-	if(!thread){
-		thread=CreateThread(NULL, 0, AudioOutputWASAPI::StartThread, this, 0, NULL);
-	}
-}
-
-void AudioOutputWASAPI::Stop(){
-	isPlaying=false;
-}
-
-bool AudioOutputWASAPI::IsPlaying(){
-	return isPlaying;
-}
-
-void AudioOutputWASAPI::EnumerateDevices(std::vector<tgvoip::AudioOutputDevice>& devs){
-#ifdef TGVOIP_WINDOWS_DESKTOP
-	HRESULT res;
-	res=CoInitializeEx(NULL, COINIT_MULTITHREADED);
-	if(FAILED(res) && res!=RPC_E_CHANGED_MODE){
-		SCHECK_RES(res, "CoInitializeEx");
-	}
-
-	IMMDeviceEnumerator *deviceEnumerator = NULL;
-	IMMDeviceCollection *deviceCollection = NULL;
-
-	res=CoCreateInstance(__uuidof(MMDeviceEnumerator), NULL, CLSCTX_INPROC_SERVER, IID_PPV_ARGS(&deviceEnumerator));
-	SCHECK_RES(res, "CoCreateInstance(MMDeviceEnumerator)");
-
-	res=deviceEnumerator->EnumAudioEndpoints(eRender, DEVICE_STATE_ACTIVE, &deviceCollection);
-	SCHECK_RES(res, "EnumAudioEndpoints");
-
-	UINT devCount;
-	res=deviceCollection->GetCount(&devCount);
-	SCHECK_RES(res, "GetCount");
-
-	for(UINT i=0;i<devCount;i++){
-		IMMDevice* device;
-		res=deviceCollection->Item(i, &device);
-		SCHECK_RES(res, "GetDeviceItem");
-		wchar_t* devID;
-		res=device->GetId(&devID);
-		SCHECK_RES(res, "get device id");
-
-		IPropertyStore* propStore;
-		res=device->OpenPropertyStore(STGM_READ, &propStore);
-		SafeRelease(&device);
-		SCHECK_RES(res, "OpenPropertyStore");
-		
-		PROPVARIANT friendlyName;
-		PropVariantInit(&friendlyName);
-		res=propStore->GetValue(PKEY_Device_FriendlyName, &friendlyName);
-		SafeRelease(&propStore);
-
-		AudioOutputDevice dev;
-
-		wchar_t actualFriendlyName[128];
-		if(friendlyName.vt==VT_LPWSTR){
-			wcsncpy(actualFriendlyName, friendlyName.pwszVal, sizeof(actualFriendlyName)/sizeof(wchar_t));
-		}else{
-			wcscpy(actualFriendlyName, L"Unknown");
-		}
-		PropVariantClear(&friendlyName);
-
-		char buf[256];
-		WideCharToMultiByte(CP_UTF8, 0, devID, -1, buf, sizeof(buf), NULL, NULL);
-		dev.id=buf;
-		WideCharToMultiByte(CP_UTF8, 0, actualFriendlyName, -1, buf, sizeof(buf), NULL, NULL);
-		dev.displayName=buf;
-		devs.push_back(dev);
-
-		CoTaskMemFree(devID);
-	}
-
-	SafeRelease(&deviceCollection);
-	SafeRelease(&deviceEnumerator);
-#endif
-}
-
-void AudioOutputWASAPI::SetCurrentDevice(std::string deviceID){
-	if(thread){
-		streamChangeToDevice=deviceID;
-		SetEvent(streamSwitchEvent);
-	}else{
-		ActuallySetCurrentDevice(deviceID);
-	}
-}
-
-void AudioOutputWASAPI::ActuallySetCurrentDevice(std::string deviceID){
-	currentDevice=deviceID;
-	HRESULT res;
-
-	if(audioClient){
-		res=audioClient->Stop();
-		CHECK_RES(res, "audioClient->Stop");
-	}
-
-#ifdef TGVOIP_WINDOWS_DESKTOP
-	if(audioSessionControl){
-		res=audioSessionControl->UnregisterAudioSessionNotification(this);
-		CHECK_RES(res, "audioSessionControl->UnregisterAudioSessionNotification");
-	}
-
-	SafeRelease(&audioSessionControl);
-#endif
-	SafeRelease(&renderClient);
-	SafeRelease(&audioClient);
-#ifdef TGVOIP_WINDOWS_DESKTOP
-	SafeRelease(&device);
-
-
-	IMMDeviceCollection *deviceCollection = NULL;
-
-	if(deviceID=="default"){
-		isDefaultDevice=true;
-		res=enumerator->GetDefaultAudioEndpoint(eRender, eCommunications, &device);
-		CHECK_RES(res, "GetDefaultAudioEndpoint");
-	}else{
-		isDefaultDevice=false;
-		res=enumerator->EnumAudioEndpoints(eRender, DEVICE_STATE_ACTIVE, &deviceCollection);
-		CHECK_RES(res, "EnumAudioEndpoints");
-
-		UINT devCount;
-		res=deviceCollection->GetCount(&devCount);
-		CHECK_RES(res, "GetCount");
-
-		for(UINT i=0;i<devCount;i++){
-			IMMDevice* device;
-			res=deviceCollection->Item(i, &device);
-			CHECK_RES(res, "GetDeviceItem");
-			wchar_t* _devID;
-			res=device->GetId(&_devID);
-			CHECK_RES(res, "get device id");
-
-			char devID[128];
-			WideCharToMultiByte(CP_UTF8, 0, _devID, -1, devID, 128, NULL, NULL);
-
-			CoTaskMemFree(_devID);
-			if(deviceID==devID){
-				this->device=device;
-				break;
-			}
-		}
-	}
-
-	if(deviceCollection)
-		SafeRelease(&deviceCollection);
-
-	if(!device){
-		LOGE("Didn't find playback device; failing");
-		failed=true;
-		return;
-	}
-	
-	res=device->Activate(__uuidof(IAudioClient), CLSCTX_INPROC_SERVER, NULL, (void**)&audioClient);
-	CHECK_RES(res, "device->Activate");
-#else
-	std::wstring devID;
-
-	if (deviceID=="default"){
-		Platform::String^ defaultDevID=Windows::Media::Devices::MediaDevice::GetDefaultAudioRenderId(Windows::Media::Devices::AudioDeviceRole::Communications);
-		if(defaultDevID==nullptr){
-			LOGE("Didn't find playback device; failing");
-			failed=true;
-			return;
-		}else{
-			isDefaultDevice=true;
-			devID=defaultDevID->Data();
-		}
-	}else{
-		int wchars_num=MultiByteToWideChar(CP_UTF8, 0, deviceID.c_str(), -1, NULL, 0);
-		wchar_t* wstr=new wchar_t[wchars_num];
-		MultiByteToWideChar(CP_UTF8, 0, deviceID.c_str(), -1, wstr, wchars_num);
-		devID=wstr;
-	}
-
-	HRESULT res1, res2;
-	IAudioClient2* audioClient2=WindowsSandboxUtils::ActivateAudioDevice(devID.c_str(), &res1, &res2);
-	CHECK_RES(res1, "activate1");
-	CHECK_RES(res2, "activate2");
-
-	AudioClientProperties properties={};
-	properties.cbSize=sizeof AudioClientProperties;
-	properties.eCategory=AudioCategory_Communications;
-	res = audioClient2->SetClientProperties(&properties);
-	CHECK_RES(res, "audioClient2->SetClientProperties");
-
-	audioClient = audioClient2;
-#endif
-
-	// {2C693079-3F59-49FD-964F-61C005EAA5D3}
-	const GUID guid = { 0x2c693079, 0x3f59, 0x49fd, { 0x96, 0x4f, 0x61, 0xc0, 0x5, 0xea, 0xa5, 0xd3 } };
-	res = audioClient->Initialize(AUDCLNT_SHAREMODE_SHARED, AUDCLNT_STREAMFLAGS_EVENTCALLBACK | AUDCLNT_STREAMFLAGS_NOPERSIST | AUDCLNT_STREAMFLAGS_AUTOCONVERTPCM | AUDCLNT_STREAMFLAGS_SRC_DEFAULT_QUALITY, 60 * 10000, 0, &format, &guid);
-	CHECK_RES(res, "audioClient->Initialize");
-
-	uint32_t bufSize;
-	res = audioClient->GetBufferSize(&bufSize);
-	CHECK_RES(res, "audioClient->GetBufferSize");
-
-	LOGV("buffer size: %u", bufSize);
-	estimatedDelay=0;
-	REFERENCE_TIME latency, devicePeriod;
-	if(SUCCEEDED(audioClient->GetStreamLatency(&latency))){
-		if(SUCCEEDED(audioClient->GetDevicePeriod(&devicePeriod, NULL))){
-			estimatedDelay=(int32_t)(latency/10000+devicePeriod/10000);
-		}
-	}
-
-	res = audioClient->SetEventHandle(audioSamplesReadyEvent);
-	CHECK_RES(res, "audioClient->SetEventHandle");
-
-	res = audioClient->GetService(IID_PPV_ARGS(&renderClient));
-	CHECK_RES(res, "audioClient->GetService");
-
-	BYTE* data;
-	res = renderClient->GetBuffer(bufSize, &data);
-	CHECK_RES(res, "renderClient->GetBuffer");
-
-	res = renderClient->ReleaseBuffer(bufSize, AUDCLNT_BUFFERFLAGS_SILENT);
-	CHECK_RES(res, "renderClient->ReleaseBuffer");
-
-#ifdef TGVOIP_WINDOWS_DESKTOP
-	res=audioClient->GetService(IID_PPV_ARGS(&audioSessionControl));
-	CHECK_RES(res, "audioClient->GetService(IAudioSessionControl)");
-
-	res=audioSessionControl->RegisterAudioSessionNotification(this);
-	CHECK_RES(res, "audioSessionControl->RegisterAudioSessionNotification");
-#endif
-
-	audioClient->Start();
-
-	LOGV("set current output device done");
-}
-
-DWORD WINAPI AudioOutputWASAPI::StartThread(void* arg) {
-	((AudioOutputWASAPI*)arg)->RunThread();
-	return 0;
-}
-
-void AudioOutputWASAPI::RunThread() {
-	SetThreadPriority(GetCurrentThread(), THREAD_PRIORITY_HIGHEST);
-
-	HANDLE waitArray[]={shutdownEvent, streamSwitchEvent, audioSamplesReadyEvent};
-	HRESULT res=CoInitializeEx(NULL, COINIT_MULTITHREADED);
-	CHECK_RES(res, "CoInitializeEx in render thread");
-
-	uint32_t bufferSize;
-	res=audioClient->GetBufferSize(&bufferSize);
-	CHECK_RES(res, "audioClient->GetBufferSize");
-	uint64_t framesWritten=0;
-
-	bool running=true;
-	//double prevCallback=VoIPController::GetCurrentTime();
-
-	while(running){
-		DWORD waitResult=WaitForMultipleObjectsEx(3, waitArray, false, INFINITE, false);
-		if(waitResult==WAIT_OBJECT_0){ // shutdownEvent
-			LOGV("render thread shutting down");
-			running=false;
-		}else if(waitResult==WAIT_OBJECT_0+1){ // streamSwitchEvent
-			LOGV("stream switch");
-			ActuallySetCurrentDevice(streamChangeToDevice);
-			ResetEvent(streamSwitchEvent);
-			LOGV("stream switch done");
-		}else if(waitResult==WAIT_OBJECT_0+2){ // audioSamplesReadyEvent
-			if(!audioClient)
-				continue;
-
-			BYTE* data;
-			uint32_t padding;
-			uint32_t framesAvailable;
-			res=audioClient->GetCurrentPadding(&padding);
-			CHECK_RES(res, "audioClient->GetCurrentPadding");
-			framesAvailable=bufferSize-padding;
-			res=renderClient->GetBuffer(framesAvailable, &data);
-			CHECK_RES(res, "renderClient->GetBuffer");
-
-			//double t=VoIPController::GetCurrentTime();
-			//LOGV("framesAvail: %u, time: %f, isPlaying: %d", framesAvailable, t-prevCallback, isPlaying);
-			//prevCallback=t;
-			
-			size_t bytesAvailable=framesAvailable*2;
-			while(bytesAvailable>remainingDataLen){
-				if(isPlaying){
-					InvokeCallback(remainingData+remainingDataLen, 960*2);
-				}else{
-					memset(remainingData+remainingDataLen, 0, 960*2);
-				}
-				remainingDataLen+=960*2;
-			}
-			memcpy(data, remainingData, bytesAvailable);
-			if(remainingDataLen>bytesAvailable){
-				memmove(remainingData, remainingData+bytesAvailable, remainingDataLen-bytesAvailable);
-			}
-			remainingDataLen-=bytesAvailable;
-
-			res=renderClient->ReleaseBuffer(framesAvailable, 0);
-			CHECK_RES(res, "renderClient->ReleaseBuffer");
-			framesWritten+=framesAvailable;
-		}
-	}
-}
-
-#ifdef TGVOIP_WINDOWS_DESKTOP
-HRESULT AudioOutputWASAPI::OnSessionDisconnected(AudioSessionDisconnectReason reason) {
-	if(!isDefaultDevice){
-		streamChangeToDevice="default";
-		SetEvent(streamSwitchEvent);
-	}
-	return S_OK;
-}
-
-HRESULT AudioOutputWASAPI::OnDefaultDeviceChanged(EDataFlow flow, ERole role, LPCWSTR newDevID) {
-	if(flow==eRender && role==eCommunications && isDefaultDevice){
-		streamChangeToDevice="default";
-		SetEvent(streamSwitchEvent);
-	}
-	return S_OK;
-}
-
-ULONG AudioOutputWASAPI::AddRef(){
-	return InterlockedIncrement(&refCount);
-}
-
-ULONG AudioOutputWASAPI::Release(){
-	return InterlockedDecrement(&refCount);
-}
-
-HRESULT AudioOutputWASAPI::QueryInterface(REFIID iid, void** obj){
-	if(!obj){
-		return E_POINTER;
-	}
-	*obj=NULL;
-
-	if(iid==IID_IUnknown){
-		*obj=static_cast<IUnknown*>(static_cast<IAudioSessionEvents*>(this));
-		AddRef();
-	}else if(iid==__uuidof(IMMNotificationClient)){
-		*obj=static_cast<IMMNotificationClient*>(this);
-		AddRef();
-	}else if(iid==__uuidof(IAudioSessionEvents)){
-		*obj=static_cast<IAudioSessionEvents*>(this);
-		AddRef();
-	}else{
-		return E_NOINTERFACE;
-	}
-
-	return S_OK;
-}
-#endif
\ No newline at end of file
diff --git a/submodules/libtgvoip/os/windows/AudioOutputWASAPI.h b/submodules/libtgvoip/os/windows/AudioOutputWASAPI.h
deleted file mode 100755
index f3b9d559d4..0000000000
--- a/submodules/libtgvoip/os/windows/AudioOutputWASAPI.h
+++ /dev/null
@@ -1,103 +0,0 @@
-//
-// libtgvoip is free and unencumbered public domain software.
-// For more information, see http://unlicense.org or the UNLICENSE file
-// you should have received with this source code distribution.
-//
-
-#ifndef LIBTGVOIP_AUDIOOUTPUTWASAPI_H
-#define LIBTGVOIP_AUDIOOUTPUTWASAPI_H
-
-#if WINAPI_FAMILY==WINAPI_FAMILY_PHONE_APP
-#define TGVOIP_WINDOWS_PHONE
-#endif
-#if !defined(WINAPI_FAMILY) || WINAPI_FAMILY==WINAPI_FAMILY_DESKTOP_APP
-#define TGVOIP_WINDOWS_DESKTOP
-#endif
-
-#include <windows.h>
-#include <string>
-#include <vector>
-#pragma warning(push)
-#pragma warning(disable : 4201)
-#ifndef TGVOIP_WP_SILVERLIGHT
-#include <mmdeviceapi.h>
-#endif
-#ifdef TGVOIP_WINDOWS_DESKTOP
-#include <audiopolicy.h>
-#include <functiondiscoverykeys.h>
-#else
-#include <audioclient.h>
-#include "WindowsSandboxUtils.h"
-#endif
-#pragma warning(pop)
-#include "../../audio/AudioOutput.h"
-
-namespace tgvoip{
-namespace audio{
-
-#ifdef TGVOIP_WINDOWS_DESKTOP
-class AudioOutputWASAPI : public AudioOutput, IMMNotificationClient, IAudioSessionEvents{
-#else
-class AudioOutputWASAPI : public AudioOutput{
-#endif
-public:
-	AudioOutputWASAPI(std::string deviceID);
-	virtual ~AudioOutputWASAPI();
-	virtual void Start();
-	virtual void Stop();
-	virtual bool IsPlaying();
-	virtual void SetCurrentDevice(std::string deviceID);
-	static void EnumerateDevices(std::vector<AudioOutputDevice>& devs);
-#ifdef TGVOIP_WINDOWS_DESKTOP
-	STDMETHOD_(ULONG, AddRef)();
-	STDMETHOD_(ULONG, Release)();
-#endif
-
-private:
-	void ActuallySetCurrentDevice(std::string deviceID);
-	static DWORD WINAPI StartThread(void* arg);
-	void RunThread();
-	WAVEFORMATEX format;
-	bool isPlaying;
-	HANDLE shutdownEvent;
-	HANDLE audioSamplesReadyEvent;
-	HANDLE streamSwitchEvent;
-	HANDLE thread;
-	IAudioClient* audioClient=NULL;
-	IAudioRenderClient* renderClient=NULL;
-#ifdef TGVOIP_WINDOWS_DESKTOP
-	IMMDeviceEnumerator* enumerator;
-	IAudioSessionControl* audioSessionControl;
-	IMMDevice* device;
-#endif
-	unsigned char remainingData[10240];
-	size_t remainingDataLen;
-	bool isDefaultDevice;
-	ULONG refCount;
-	std::string streamChangeToDevice;
-
-#ifdef TGVOIP_WINDOWS_DESKTOP
-	STDMETHOD(OnDisplayNameChanged) (LPCWSTR /*NewDisplayName*/, LPCGUID /*EventContext*/) { return S_OK; };
-	STDMETHOD(OnIconPathChanged) (LPCWSTR /*NewIconPath*/, LPCGUID /*EventContext*/) { return S_OK; };
-	STDMETHOD(OnSimpleVolumeChanged) (float /*NewSimpleVolume*/, BOOL /*NewMute*/, LPCGUID /*EventContext*/) { return S_OK; }
-	STDMETHOD(OnChannelVolumeChanged) (DWORD /*ChannelCount*/, float /*NewChannelVolumes*/[], DWORD /*ChangedChannel*/, LPCGUID /*EventContext*/) { return S_OK; };
-	STDMETHOD(OnGroupingParamChanged) (LPCGUID /*NewGroupingParam*/, LPCGUID /*EventContext*/) { return S_OK; };
-	STDMETHOD(OnStateChanged) (AudioSessionState /*NewState*/) { return S_OK; };
-	STDMETHOD(OnSessionDisconnected) (AudioSessionDisconnectReason DisconnectReason);
-	STDMETHOD(OnDeviceStateChanged) (LPCWSTR /*DeviceId*/, DWORD /*NewState*/) { return S_OK; }
-	STDMETHOD(OnDeviceAdded) (LPCWSTR /*DeviceId*/) { return S_OK; };
-	STDMETHOD(OnDeviceRemoved) (LPCWSTR /*DeviceId(*/) { return S_OK; };
-	STDMETHOD(OnDefaultDeviceChanged) (EDataFlow Flow, ERole Role, LPCWSTR NewDefaultDeviceId);
-	STDMETHOD(OnPropertyValueChanged) (LPCWSTR /*DeviceId*/, const PROPERTYKEY /*Key*/) { return S_OK; };
-
-	//
-	//  IUnknown
-	//
-	STDMETHOD(QueryInterface)(REFIID iid, void **pvObject);
-#endif
-};
-
-}
-}
-
-#endif //LIBTGVOIP_AUDIOOUTPUTWASAPI_H
diff --git a/submodules/libtgvoip/os/windows/AudioOutputWave.cpp b/submodules/libtgvoip/os/windows/AudioOutputWave.cpp
deleted file mode 100755
index 604f40311c..0000000000
--- a/submodules/libtgvoip/os/windows/AudioOutputWave.cpp
+++ /dev/null
@@ -1,165 +0,0 @@
-//
-// libtgvoip is free and unencumbered public domain software.
-// For more information, see http://unlicense.org or the UNLICENSE file
-// you should have received with this source code distribution.
-//
-
-
-#include <assert.h>
-#include "AudioOutputWave.h"
-#include "../../logging.h"
-#include "../../VoIPController.h"
-
-#define BUFFER_SIZE 960
-#define CHECK_ERROR(res, msg) if(res!=MMSYSERR_NOERROR){wchar_t _buf[1024]; waveOutGetErrorTextW(res, _buf, 1024); LOGE(msg ": %ws (MMRESULT=0x%08X)", _buf, res); failed=true;}
-
-using namespace tgvoip::audio;
-
-AudioOutputWave::AudioOutputWave(std::string deviceID){
-	isPlaying=false;
-	hWaveOut=NULL;
-
-	for(int i=0;i<4;i++){
-		ZeroMemory(&buffers[i], sizeof(WAVEHDR));
-		buffers[i].dwBufferLength=960*2;
-		buffers[i].lpData=(char*)malloc(960*2);
-	}
-
-	SetCurrentDevice(deviceID);
-}
-
-AudioOutputWave::~AudioOutputWave(){
-	for(int i=0;i<4;i++){
-		free(buffers[i].lpData);
-	}
-	waveOutClose(hWaveOut);
-}
-
-void AudioOutputWave::Start(){
-	if(!isPlaying){
-		isPlaying=true;
-		
-		for(int i=0;i<4;i++){
-			MMRESULT res=waveOutPrepareHeader(hWaveOut, &buffers[i], sizeof(WAVEHDR));
-			CHECK_ERROR(res, "waveOutPrepareHeader failed");
-			//InvokeCallback((unsigned char*)buffers[i].lpData, buffers[i].dwBufferLength);
-			ZeroMemory(buffers[i].lpData, buffers[i].dwBufferLength);
-			res=waveOutWrite(hWaveOut, &buffers[i], sizeof(WAVEHDR));
-			CHECK_ERROR(res, "waveOutWrite failed");
-		}
-	}
-}
-
-void AudioOutputWave::Stop(){
-	if(isPlaying){
-		isPlaying=false;
-
-		MMRESULT res=waveOutReset(hWaveOut);
-		CHECK_ERROR(res, "waveOutReset failed");
-		for(int i=0;i<4;i++){
-			res=waveOutUnprepareHeader(hWaveOut, &buffers[i], sizeof(WAVEHDR));
-			CHECK_ERROR(res, "waveOutUnprepareHeader failed");
-		}
-	}
-}
-
-bool AudioOutputWave::IsPlaying(){
-	return isPlaying;
-}
-
-void AudioOutputWave::WaveOutProc(HWAVEOUT hwo, UINT uMsg, DWORD_PTR dwInstance, DWORD_PTR dwParam1, DWORD_PTR dwParam2) {
-	if(uMsg==WOM_DONE){
-		((AudioOutputWave*)dwInstance)->OnBufferDone((WAVEHDR*)dwParam1);
-	}
-}
-
-void AudioOutputWave::OnBufferDone(WAVEHDR* hdr){
-	if(!isPlaying)
-		return;
-
-	InvokeCallback((unsigned char*)hdr->lpData, hdr->dwBufferLength);
-	hdr->dwFlags&= ~WHDR_DONE;
-	MMRESULT res=waveOutWrite(hWaveOut, hdr, sizeof(WAVEHDR));
-}
-
-void AudioOutputWave::EnumerateDevices(std::vector<tgvoip::AudioOutputDevice>& devs){
-	UINT num=waveOutGetNumDevs();
-	WAVEOUTCAPSW caps;
-	char nameBuf[512];
-	for(UINT i=0;i<num;i++){
-		waveOutGetDevCapsW(i, &caps, sizeof(caps));
-		AudioOutputDevice dev;
-		WideCharToMultiByte(CP_UTF8, 0, caps.szPname, -1, nameBuf, sizeof(nameBuf), NULL, NULL);
-		dev.displayName=std::string(nameBuf);
-		dev.id=std::string(nameBuf);
-		devs.push_back(dev);
-	}
-}
-
-void AudioOutputWave::SetCurrentDevice(std::string deviceID){
-	currentDevice=deviceID;
-
-	bool wasPlaying=isPlaying;
-	isPlaying=false;
-	LOGV("closing, hWaveOut=%d", (int)hWaveOut);
-	if(hWaveOut){
-		MMRESULT res;
-		if(isPlaying){
-			res=waveOutReset(hWaveOut);
-			CHECK_ERROR(res, "waveOutReset failed");
-			for(int i=0;i<4;i++){
-				res=waveOutUnprepareHeader(hWaveOut, &buffers[i], sizeof(WAVEHDR));
-				CHECK_ERROR(res, "waveOutUnprepareHeader failed");
-			}
-		}
-		res=waveOutClose(hWaveOut);
-		CHECK_ERROR(res, "waveOutClose failed");
-	}
-
-	ZeroMemory(&format, sizeof(format));
-	format.cbSize=0;
-	format.wFormatTag=WAVE_FORMAT_PCM;
-	format.nSamplesPerSec=48000;
-	format.wBitsPerSample=16;
-	format.nChannels=1;
-	format.nBlockAlign=2;
-
-	LOGV("before open device %s", deviceID.c_str());
-
-	if(deviceID=="default"){
-		MMRESULT res=waveOutOpen(&hWaveOut, WAVE_MAPPER, &format, (DWORD_PTR)AudioOutputWave::WaveOutProc, (DWORD_PTR)this, CALLBACK_FUNCTION);
-		CHECK_ERROR(res, "waveOutOpen failed");
-	}else{
-		UINT num=waveOutGetNumDevs();
-		WAVEOUTCAPSW caps;
-		char nameBuf[512];
-		hWaveOut=NULL;
-		for(UINT i=0;i<num;i++){
-			waveOutGetDevCapsW(i, &caps, sizeof(caps));
-			WideCharToMultiByte(CP_UTF8, 0, caps.szPname, -1, nameBuf, sizeof(nameBuf), NULL, NULL);
-			std::string name=std::string(nameBuf);
-			if(name==deviceID){
-				MMRESULT res=waveOutOpen(&hWaveOut, i, &format, (DWORD_PTR)AudioOutputWave::WaveOutProc, (DWORD_PTR)this, CALLBACK_FUNCTION | WAVE_MAPPED);
-				CHECK_ERROR(res, "waveOutOpen failed");
-				LOGD("Opened device %s", nameBuf);
-				break;
-			}
-		}
-		if(!hWaveOut){
-			SetCurrentDevice("default");
-			return;
-		}
-	}
-
-	isPlaying=wasPlaying;
-
-	if(isPlaying){
-		MMRESULT res;
-		for(int i=0;i<4;i++){
-			res=waveOutPrepareHeader(hWaveOut, &buffers[i], sizeof(WAVEHDR));
-			CHECK_ERROR(res, "waveOutPrepareHeader failed");
-			res=waveOutWrite(hWaveOut, &buffers[i], sizeof(WAVEHDR));
-			CHECK_ERROR(res, "waveOutWrite failed");
-		}
-	}
-}
diff --git a/submodules/libtgvoip/os/windows/AudioOutputWave.h b/submodules/libtgvoip/os/windows/AudioOutputWave.h
deleted file mode 100644
index 259a479bc1..0000000000
--- a/submodules/libtgvoip/os/windows/AudioOutputWave.h
+++ /dev/null
@@ -1,40 +0,0 @@
-//
-// libtgvoip is free and unencumbered public domain software.
-// For more information, see http://unlicense.org or the UNLICENSE file
-// you should have received with this source code distribution.
-//
-
-#ifndef LIBTGVOIP_AUDIOOUTPUTWAVE_H
-#define LIBTGVOIP_AUDIOOUTPUTWAVE_H
-
-#include <windows.h>
-#include <string>
-#include <vector>
-#include "../../audio/AudioOutput.h"
-
-namespace tgvoip{
-namespace audio{
-
-class AudioOutputWave : public AudioOutput{
-public:
-	AudioOutputWave(std::string deviceID);
-	virtual ~AudioOutputWave();
-	virtual void Start();
-	virtual void Stop();
-	virtual bool IsPlaying();
-	virtual void SetCurrentDevice(std::string deviceID);
-	static void EnumerateDevices(std::vector<AudioOutputDevice>& devs);
-
-private:
-	HWAVEOUT hWaveOut;
-	WAVEFORMATEX format;
-	WAVEHDR buffers[4];
-	static void CALLBACK WaveOutProc(HWAVEOUT hwo, UINT uMsg, DWORD_PTR dwInstance, DWORD_PTR dwParam1, DWORD_PTR dwParam2);
-	void OnBufferDone(WAVEHDR* hdr);
-	bool isPlaying;
-};
-
-}
-}
-
-#endif //LIBTGVOIP_AUDIOOUTPUTWAVE_H
diff --git a/submodules/libtgvoip/os/windows/CXWrapper.cpp b/submodules/libtgvoip/os/windows/CXWrapper.cpp
deleted file mode 100755
index 4af2d07914..0000000000
--- a/submodules/libtgvoip/os/windows/CXWrapper.cpp
+++ /dev/null
@@ -1,469 +0,0 @@
-#include <stdlib.h>
-#include <string.h>
-#include <windows.h>
-#include <vector>
-#include <string>
-#include <collection.h>
-#include "CXWrapper.h"
-#include <wrl.h>  
-#include <robuffer.h>  
-
-using namespace Windows::Storage::Streams;
-using namespace Microsoft::WRL;
-using namespace libtgvoip;
-using namespace Platform;
-using namespace tgvoip;
-using namespace Windows::Security::Cryptography;
-using namespace Windows::Security::Cryptography::Core;
-using namespace Windows::Storage::Streams;
-using namespace Windows::Data::Json;
-using namespace Windows::Phone::Media::Devices;
-
-//CryptographicHash^ MicrosoftCryptoImpl::sha1Hash;
-//CryptographicHash^ MicrosoftCryptoImpl::sha256Hash;
-HashAlgorithmProvider^ MicrosoftCryptoImpl::sha1Provider;
-HashAlgorithmProvider^ MicrosoftCryptoImpl::sha256Provider;
-SymmetricKeyAlgorithmProvider^ MicrosoftCryptoImpl::aesKeyProvider;
-
-/*struct tgvoip_cx_data{
-	VoIPControllerWrapper^ self;
-};*/
-
-VoIPControllerWrapper::VoIPControllerWrapper(){
-	VoIPController::crypto.aes_ige_decrypt=MicrosoftCryptoImpl::AesIgeDecrypt;
-	VoIPController::crypto.aes_ige_encrypt=MicrosoftCryptoImpl::AesIgeEncrypt;
-	VoIPController::crypto.aes_ctr_encrypt = MicrosoftCryptoImpl::AesCtrEncrypt;
-	VoIPController::crypto.sha1=MicrosoftCryptoImpl::SHA1;
-	VoIPController::crypto.sha256=MicrosoftCryptoImpl::SHA256;
-	VoIPController::crypto.rand_bytes=MicrosoftCryptoImpl::RandBytes;
-	MicrosoftCryptoImpl::Init();
-	controller=new VoIPController();
-	controller->implData=(void*)this;
-	VoIPController::Callbacks callbacks={0};
-	callbacks.connectionStateChanged=VoIPControllerWrapper::OnStateChanged;
-	callbacks.signalBarCountChanged=VoIPControllerWrapper::OnSignalBarsChanged;
-	controller->SetCallbacks(callbacks);
-}
-
-VoIPControllerWrapper::~VoIPControllerWrapper(){
-	controller->Stop();
-	delete controller;
-}
-
-void VoIPControllerWrapper::Start(){
-	controller->Start();
-}
-
-void VoIPControllerWrapper::Connect(){
-	controller->Connect();
-}
-
-void VoIPControllerWrapper::SetPublicEndpoints(const Platform::Array<libtgvoip::Endpoint^>^ endpoints, bool allowP2P, int32_t connectionMaxLayer){
-	std::vector<tgvoip::Endpoint> eps;
-	for (unsigned int i = 0; i < endpoints->Length; i++)
-	{
-		libtgvoip::Endpoint^ _ep = endpoints[i];
-		tgvoip::Endpoint ep;
-		ep.id = _ep->id;
-		ep.type = tgvoip::Endpoint::Type::UDP_RELAY;
-		char buf[128];
-		if (_ep->ipv4){
-			WideCharToMultiByte(CP_UTF8, 0, _ep->ipv4->Data(), -1, buf, sizeof(buf), NULL, NULL);
-			ep.address = IPv4Address(buf);
-		}
-		if (_ep->ipv6){
-			WideCharToMultiByte(CP_UTF8, 0, _ep->ipv6->Data(), -1, buf, sizeof(buf), NULL, NULL);
-			ep.v6address = IPv6Address(buf);
-		}
-		ep.port = _ep->port;
-		if (_ep->peerTag->Length != 16)
-			throw ref new Platform::InvalidArgumentException("Peer tag must be exactly 16 bytes long");
-		memcpy(ep.peerTag, _ep->peerTag->Data, 16);
-		eps.push_back(ep);
-	}
-	controller->SetRemoteEndpoints(eps, allowP2P, connectionMaxLayer);
-}
-
-void VoIPControllerWrapper::SetNetworkType(NetworkType type){
-	controller->SetNetworkType((int)type);
-}
-
-void VoIPControllerWrapper::SetMicMute(bool mute){
-	controller->SetMicMute(mute);
-}
-
-int64 VoIPControllerWrapper::GetPreferredRelayID(){
-	return controller->GetPreferredRelayID();
-}
-
-int32_t VoIPControllerWrapper::GetConnectionMaxLayer(){
-	return tgvoip::VoIPController::GetConnectionMaxLayer();
-}
-
-void VoIPControllerWrapper::SetEncryptionKey(const Platform::Array<uint8>^ key, bool isOutgoing){
-	if(key->Length!=256)
-		throw ref new Platform::InvalidArgumentException("Encryption key must be exactly 256 bytes long");
-	controller->SetEncryptionKey((char*)key->Data, isOutgoing);
-}
-
-int VoIPControllerWrapper::GetSignalBarsCount(){
-	return controller->GetSignalBarsCount();
-}
-
-CallState VoIPControllerWrapper::GetConnectionState(){
-	return (CallState)controller->GetConnectionState();
-}
-
-TrafficStats^ VoIPControllerWrapper::GetStats(){
-	tgvoip::VoIPController::TrafficStats _stats;
-	controller->GetStats(&_stats);
-
-	TrafficStats^ stats = ref new TrafficStats();
-	stats->bytesSentWifi = _stats.bytesSentWifi;
-	stats->bytesSentMobile = _stats.bytesSentMobile;
-	stats->bytesRecvdWifi = _stats.bytesRecvdWifi;
-	stats->bytesRecvdMobile = _stats.bytesRecvdMobile;
-
-	return stats;
-}
-
-Platform::String^ VoIPControllerWrapper::GetDebugString(){
-	std::string log = controller->GetDebugString();
-	size_t len = sizeof(wchar_t)*(log.length() + 1);
-	wchar_t* wlog = (wchar_t*)malloc(len);
-	MultiByteToWideChar(CP_UTF8, 0, log.c_str(), -1, wlog, len / sizeof(wchar_t));
-	Platform::String^ res = ref new Platform::String(wlog);
-	free(wlog);
-	return res;
-}
-
-Platform::String^ VoIPControllerWrapper::GetDebugLog(){
-	std::string log=controller->GetDebugLog();
-	size_t len=sizeof(wchar_t)*(log.length()+1);
-	wchar_t* wlog=(wchar_t*)malloc(len);
-	MultiByteToWideChar(CP_UTF8, 0, log.c_str(), -1, wlog, len/sizeof(wchar_t));
-	Platform::String^ res=ref new Platform::String(wlog);
-	free(wlog);
-	return res;
-}
-
-Error VoIPControllerWrapper::GetLastError(){
-	return (Error)controller->GetLastError();
-}
-
-Platform::String^ VoIPControllerWrapper::GetVersion(){
-	const char* v=VoIPController::GetVersion();
-	wchar_t buf[32];
-	MultiByteToWideChar(CP_UTF8, 0, v, -1, buf, sizeof(buf));
-	return ref new Platform::String(buf);
-}
-
-void VoIPControllerWrapper::OnStateChanged(VoIPController* c, int state){
-	reinterpret_cast<VoIPControllerWrapper^>(c->implData)->OnStateChangedInternal(state);
-}
-
-void VoIPControllerWrapper::OnSignalBarsChanged(VoIPController* c, int count){
-	reinterpret_cast<VoIPControllerWrapper^>(c->implData)->OnSignalBarsChangedInternal(count);
-}
-
-void VoIPControllerWrapper::OnStateChangedInternal(int state){
-	CallStateChanged(this, (CallState)state);
-}
-
-void VoIPControllerWrapper::OnSignalBarsChangedInternal(int count){
-	SignalBarsChanged(this, count);
-}
-
-void VoIPControllerWrapper::SetConfig(VoIPConfig^ wrapper){
-	VoIPController::Config config{0};
-	config.initTimeout=wrapper->initTimeout;
-	config.recvTimeout=wrapper->recvTimeout;
-	config.dataSaving=(int)wrapper->dataSaving;
-	config.logFilePath;
-	config.statsDumpFilePath;
-
-	config.enableAEC=wrapper->enableAEC;
-	config.enableNS=wrapper->enableNS;
-	config.enableAGC=wrapper->enableAGC;
-
-	config.enableCallUpgrade=wrapper->enableCallUpgrade;
-
-	config.logPacketStats=wrapper->logPacketStats;
-	config.enableVolumeControl=wrapper->enableVolumeControl;
-
-	config.enableVideoSend=wrapper->enableVideoSend;
-	config.enableVideoReceive=wrapper->enableVideoReceive;
-
-	if(wrapper->logFilePath!=nullptr&&!wrapper->logFilePath->IsEmpty()){
-		config.logFilePath = wstring(wrapper->logFilePath->Data());
-	}
-	if (wrapper->statsDumpFilePath != nullptr&&!wrapper->statsDumpFilePath->IsEmpty()){
-		config.statsDumpFilePath = wstring(wrapper->statsDumpFilePath->Data());
-	}
-
-	controller->SetConfig(config);
-}
-
-void VoIPControllerWrapper::SetProxy(ProxyProtocol protocol, Platform::String^ address, uint16_t port, Platform::String^ username, Platform::String^ password){
-	char _address[2000];
-	char _username[256];
-	char _password[256];
-
-	WideCharToMultiByte(CP_UTF8, 0, address->Data(), -1, _address, sizeof(_address), NULL, NULL);
-	WideCharToMultiByte(CP_UTF8, 0, username->Data(), -1, _username, sizeof(_username), NULL, NULL);
-	WideCharToMultiByte(CP_UTF8, 0, password->Data(), -1, _password, sizeof(_password), NULL, NULL);
-
-	controller->SetProxy((int)protocol, _address, port, _username, _password);
-}
-
-void VoIPControllerWrapper::SetAudioOutputGainControlEnabled(bool enabled){
-	controller->SetAudioOutputGainControlEnabled(enabled);
-}
-
-void VoIPControllerWrapper::SetInputVolume(float level){
-	controller->SetInputVolume(level);
-}
-
-void VoIPControllerWrapper::SetOutputVolume(float level){
-	controller->SetOutputVolume(level);
-}
-
-void VoIPControllerWrapper::UpdateServerConfig(Platform::String^ json){
-	std::string config=ToUtf8(json->Data(), json->Length());
-	ServerConfig::GetSharedInstance()->Update(config);
-}
-
-void VoIPControllerWrapper::SwitchSpeaker(bool external){
-	auto routingManager = AudioRoutingManager::GetDefault();
-	if (external){
-		routingManager->SetAudioEndpoint(AudioRoutingEndpoint::Speakerphone);
-	}
-	else{
-		if ((routingManager->AvailableAudioEndpoints & AvailableAudioRoutingEndpoints::Bluetooth) == AvailableAudioRoutingEndpoints::Bluetooth){
-			routingManager->SetAudioEndpoint(AudioRoutingEndpoint::Bluetooth);
-		}
-		else if ((routingManager->AvailableAudioEndpoints & AvailableAudioRoutingEndpoints::Earpiece) == AvailableAudioRoutingEndpoints::Earpiece){
-			routingManager->SetAudioEndpoint(AudioRoutingEndpoint::Earpiece);
-		}
-	}
-}
-
-void MicrosoftCryptoImpl::AesIgeEncrypt(uint8_t* in, uint8_t* out, size_t len, uint8_t* key, uint8_t* iv){
-	IBuffer^ keybuf=IBufferFromPtr(key, 32);
-	CryptographicKey^ _key=aesKeyProvider->CreateSymmetricKey(keybuf);
-	uint8_t tmpOut[16];
-	uint8_t* xPrev=iv+16;
-	uint8_t* yPrev=iv;
-	uint8_t x[16];
-	uint8_t y[16];
-	for(size_t offset=0;offset<len;offset+=16){
-		for (size_t i=0;i<16;i++){
-			if (offset+i < len){
-				x[i] = in[offset+i];
-			}
-			else{
-				x[i]=0;
-			}
-		}
-		XorInt128(x, yPrev, y);
-		IBuffer^ inbuf=IBufferFromPtr(y, 16);
-		IBuffer^ outbuf=CryptographicEngine::Encrypt(_key, inbuf, nullptr);
-		IBufferToPtr(outbuf, 16, tmpOut);
-		XorInt128(tmpOut, xPrev, y);
-		memcpy(xPrev, x, 16);
-		memcpy(yPrev, y, 16);
-		memcpy(out+offset, y, 16);
-	}
-}
-
-void MicrosoftCryptoImpl::AesIgeDecrypt(uint8_t* in, uint8_t* out, size_t len, uint8_t* key, uint8_t* iv){
-	IBuffer^ keybuf=IBufferFromPtr(key, 32);
-	CryptographicKey^ _key=aesKeyProvider->CreateSymmetricKey(keybuf);
-	uint8_t tmpOut[16];
-	uint8_t* xPrev=iv;
-	uint8_t* yPrev=iv+16;
-	uint8_t x[16];
-	uint8_t y[16];
-	for(size_t offset=0;offset<len;offset+=16){
-		for (size_t i=0;i<16;i++){
-			if (offset+i < len){
-				x[i] = in[offset+i];
-			}
-			else{
-				x[i]=0;
-			}
-		}
-		XorInt128(x, yPrev, y);
-		IBuffer^ inbuf=IBufferFromPtr(y, 16);
-		IBuffer^ outbuf=CryptographicEngine::Decrypt(_key, inbuf, nullptr);
-		IBufferToPtr(outbuf, 16, tmpOut);
-		XorInt128(tmpOut, xPrev, y);
-		memcpy(xPrev, x, 16);
-		memcpy(yPrev, y, 16);
-		memcpy(out+offset, y, 16);
-	}
-}
-
-#define GETU32(pt) (((uint32_t)(pt)[0] << 24) ^ ((uint32_t)(pt)[1] << 16) ^ ((uint32_t)(pt)[2] <<  8) ^ ((uint32_t)(pt)[3]))
-#define PUTU32(ct, st) { (ct)[0] = (u8)((st) >> 24); (ct)[1] = (u8)((st) >> 16); (ct)[2] = (u8)((st) >> 8); (ct)[3] = (u8)(st); }
-
-typedef  uint8_t u8;
-
-#define L_ENDIAN
-
-/* increment counter (128-bit int) by 2^64 */
-static void AES_ctr128_inc(unsigned char *counter) {
-	unsigned long c;
-
-	/* Grab 3rd dword of counter and increment */
-#ifdef L_ENDIAN
-	c = GETU32(counter + 8);
-	c++;
-	PUTU32(counter + 8, c);
-#else
-	c = GETU32(counter + 4);
-	c++;
-	PUTU32(counter + 4, c);
-#endif
-
-	/* if no overflow, we're done */
-	if (c)
-		return;
-
-	/* Grab top dword of counter and increment */
-#ifdef L_ENDIAN
-	c = GETU32(counter + 12);
-	c++;
-	PUTU32(counter + 12, c);
-#else
-	c = GETU32(counter + 0);
-	c++;
-	PUTU32(counter + 0, c);
-#endif
-
-}
-
-void MicrosoftCryptoImpl::AesCtrEncrypt(uint8_t* inout, size_t len, uint8_t* key, uint8_t* counter, uint8_t* ecount_buf, uint32_t* num){
-	unsigned int n;
-	unsigned long l = len;
-
-	//assert(in && out && key && counter && num);
-	//assert(*num < AES_BLOCK_SIZE);
-
-	IBuffer^ keybuf = IBufferFromPtr(key, 32);
-	CryptographicKey^ _key = aesKeyProvider->CreateSymmetricKey(keybuf);
-
-	n = *num;
-
-	while (l--) {
-		if (n == 0) {
-			IBuffer^ inbuf = IBufferFromPtr(counter, 16);
-			IBuffer^ outbuf = CryptographicEngine::Encrypt(_key, inbuf, nullptr);
-			IBufferToPtr(outbuf, 16, ecount_buf);
-			//AES_encrypt(counter, ecount_buf, key);
-			AES_ctr128_inc(counter);
-		}
-		*inout = *(inout++) ^ ecount_buf[n];
-		n = (n + 1) % 16;
-	}
-
-	*num = n;
-}
-
-void MicrosoftCryptoImpl::SHA1(uint8_t* msg, size_t len, uint8_t* out){
-	//EnterCriticalSection(&hashMutex);
-
-	IBuffer^ arr=IBufferFromPtr(msg, len);
-	CryptographicHash^ hash=sha1Provider->CreateHash();
-	hash->Append(arr);
-	IBuffer^ res=hash->GetValueAndReset();
-	IBufferToPtr(res, 20, out);
-
-	//LeaveCriticalSection(&hashMutex);
-}
-
-void MicrosoftCryptoImpl::SHA256(uint8_t* msg, size_t len, uint8_t* out){
-	//EnterCriticalSection(&hashMutex);
-
-	IBuffer^ arr=IBufferFromPtr(msg, len);
-	CryptographicHash^ hash=sha256Provider->CreateHash();
-	hash->Append(arr);
-	IBuffer^ res=hash->GetValueAndReset();
-	IBufferToPtr(res, 32, out);
-	//LeaveCriticalSection(&hashMutex);
-}
-
-void MicrosoftCryptoImpl::RandBytes(uint8_t* buffer, size_t len){
-	IBuffer^ res=CryptographicBuffer::GenerateRandom(len);
-	IBufferToPtr(res, len, buffer);
-}
-
-void MicrosoftCryptoImpl::Init(){
-	/*sha1Hash=HashAlgorithmProvider::OpenAlgorithm(HashAlgorithmNames::Sha1)->CreateHash();
-	sha256Hash=HashAlgorithmProvider::OpenAlgorithm(HashAlgorithmNames::Sha256)->CreateHash();*/
-	sha1Provider=HashAlgorithmProvider::OpenAlgorithm(HashAlgorithmNames::Sha1);
-	sha256Provider=HashAlgorithmProvider::OpenAlgorithm(HashAlgorithmNames::Sha256);
-	aesKeyProvider=SymmetricKeyAlgorithmProvider::OpenAlgorithm(SymmetricAlgorithmNames::AesEcb);
-}
-
-void MicrosoftCryptoImpl::XorInt128(uint8_t* a, uint8_t* b, uint8_t* out){
-	uint64_t* _a=reinterpret_cast<uint64_t*>(a);
-	uint64_t* _b=reinterpret_cast<uint64_t*>(b);
-	uint64_t* _out=reinterpret_cast<uint64_t*>(out);
-	_out[0]=_a[0]^_b[0];
-	_out[1]=_a[1]^_b[1];
-}
-
-void MicrosoftCryptoImpl::IBufferToPtr(IBuffer^ buffer, size_t len, uint8_t* out)
-{
-	ComPtr<IBufferByteAccess> bufferByteAccess;
-	reinterpret_cast<IInspectable*>(buffer)->QueryInterface(IID_PPV_ARGS(&bufferByteAccess));
-
-	byte* hashBuffer;
-	bufferByteAccess->Buffer(&hashBuffer);
-	CopyMemory(out, hashBuffer, len);
-}
-
-IBuffer^ MicrosoftCryptoImpl::IBufferFromPtr(uint8_t* msg, size_t len)
-{
-	ComPtr<NativeBuffer> nativeBuffer=Make<NativeBuffer>((byte *)msg, len);
-	return reinterpret_cast<IBuffer^>(nativeBuffer.Get());
-}
-
-/*Platform::String^ VoIPControllerWrapper::TestAesIge(){
-	MicrosoftCryptoImpl::Init();
-	Platform::String^ res="";
-	Platform::Array<uint8>^ data=ref new Platform::Array<uint8>(32);
-	Platform::Array<uint8>^ out=ref new Platform::Array<uint8>(32);
-	Platform::Array<uint8>^ key=ref new Platform::Array<uint8>(16);
-	Platform::Array<uint8>^ iv=ref new Platform::Array<uint8>(32);
-	
-	
-	CryptographicBuffer::CopyToByteArray(CryptographicBuffer::DecodeFromHexString("0000000000000000000000000000000000000000000000000000000000000000"), &data);
-	CryptographicBuffer::CopyToByteArray(CryptographicBuffer::DecodeFromHexString("000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f"), &iv);
-	CryptographicBuffer::CopyToByteArray(CryptographicBuffer::DecodeFromHexString("000102030405060708090a0b0c0d0e0f"), &key);
-	MicrosoftCryptoImpl::AesIgeEncrypt(data->Data, out->Data, 32, key->Data, iv->Data);
-	res+=CryptographicBuffer::EncodeToHexString(CryptographicBuffer::CreateFromByteArray(out));
-	res+="\n";
-
-	CryptographicBuffer::CopyToByteArray(CryptographicBuffer::DecodeFromHexString("1A8519A6557BE652E9DA8E43DA4EF4453CF456B4CA488AA383C79C98B34797CB"), &data);
-	CryptographicBuffer::CopyToByteArray(CryptographicBuffer::DecodeFromHexString("000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f"), &iv);
-	CryptographicBuffer::CopyToByteArray(CryptographicBuffer::DecodeFromHexString("000102030405060708090a0b0c0d0e0f"), &key);
-	MicrosoftCryptoImpl::AesIgeDecrypt(data->Data, out->Data, 32, key->Data, iv->Data);
-	res+=CryptographicBuffer::EncodeToHexString(CryptographicBuffer::CreateFromByteArray(out));
-	res+="\n";
-
-	CryptographicBuffer::CopyToByteArray(CryptographicBuffer::DecodeFromHexString("99706487A1CDE613BC6DE0B6F24B1C7AA448C8B9C3403E3467A8CAD89340F53B"), &data);
-	CryptographicBuffer::CopyToByteArray(CryptographicBuffer::DecodeFromHexString("6D656E746174696F6E206F6620494745206D6F646520666F72204F70656E5353"), &iv);
-	CryptographicBuffer::CopyToByteArray(CryptographicBuffer::DecodeFromHexString("5468697320697320616E20696D706C65"), &key);
-	MicrosoftCryptoImpl::AesIgeEncrypt(data->Data, out->Data, 32, key->Data, iv->Data);
-	res+=CryptographicBuffer::EncodeToHexString(CryptographicBuffer::CreateFromByteArray(out));
-	res+="\n";
-
-	CryptographicBuffer::CopyToByteArray(CryptographicBuffer::DecodeFromHexString("4C2E204C6574277320686F70652042656E20676F74206974207269676874210A"), &data);
-	CryptographicBuffer::CopyToByteArray(CryptographicBuffer::DecodeFromHexString("6D656E746174696F6E206F6620494745206D6F646520666F72204F70656E5353"), &iv);
-	CryptographicBuffer::CopyToByteArray(CryptographicBuffer::DecodeFromHexString("5468697320697320616E20696D706C65"), &key);
-	MicrosoftCryptoImpl::AesIgeDecrypt(data->Data, out->Data, 32, key->Data, iv->Data);
-	res+=CryptographicBuffer::EncodeToHexString(CryptographicBuffer::CreateFromByteArray(out));
-	return res;
-}*/
\ No newline at end of file
diff --git a/submodules/libtgvoip/os/windows/CXWrapper.h b/submodules/libtgvoip/os/windows/CXWrapper.h
deleted file mode 100644
index edcf7c0f21..0000000000
--- a/submodules/libtgvoip/os/windows/CXWrapper.h
+++ /dev/null
@@ -1,273 +0,0 @@
-#pragma once
-
-#include <wrl.h>
-#include <wrl/implements.h>
-#include <windows.storage.streams.h>
-#include <robuffer.h>
-#include <vector>
-#include "../../VoIPController.h"
-#include "../../VoIPServerConfig.h"
-
-using namespace Platform;
-
-#define STACK_ARRAY(TYPE, LEN) \
-  static_cast<TYPE*>(::alloca((LEN) * sizeof(TYPE)))
-
-inline std::wstring ToUtf16(const char* utf8, size_t len) {
-	int len16 = ::MultiByteToWideChar(CP_UTF8, 0, utf8, static_cast<int>(len),
-		nullptr, 0);
-	wchar_t* ws = STACK_ARRAY(wchar_t, len16);
-	::MultiByteToWideChar(CP_UTF8, 0, utf8, static_cast<int>(len), ws, len16);
-	return std::wstring(ws, len16);
-}
-
-inline std::wstring ToUtf16(const std::string& str) {
-	return ToUtf16(str.data(), str.length());
-}
-
-inline std::string ToUtf8(const wchar_t* wide, size_t len) {
-	int len8 = ::WideCharToMultiByte(CP_UTF8, 0, wide, static_cast<int>(len),
-		nullptr, 0, nullptr, nullptr);
-	char* ns = STACK_ARRAY(char, len8);
-	::WideCharToMultiByte(CP_UTF8, 0, wide, static_cast<int>(len), ns, len8,
-		nullptr, nullptr);
-	return std::string(ns, len8);
-}
-
-inline std::string ToUtf8(const wchar_t* wide) {
-	return ToUtf8(wide, wcslen(wide));
-}
-
-inline std::string ToUtf8(const std::wstring& wstr) {
-	return ToUtf8(wstr.data(), wstr.length());
-}
-
-namespace libtgvoip{
-	public ref class Endpoint sealed{
-	public:
-		property int64 id;
-		property uint16 port;
-		property Platform::String^ ipv4;
-		property Platform::String^ ipv6;
-		property Platform::Array<uint8>^ peerTag;
-	};
-
-	public ref class TrafficStats sealed{
-	public:
-		property uint64_t bytesSentWifi;
-		property uint64_t bytesRecvdWifi;
-		property uint64_t bytesSentMobile;
-		property uint64_t bytesRecvdMobile;
-	};
-
-	public enum class CallState : int{
-		WaitInit=1,
-		WaitInitAck,
-		Established,
-		Failed
-	};
-
-	public enum class Error : int{
-		Unknown=0,
-		Incompatible,
-		Timeout,
-		AudioIO
-	};
-
-	public enum class NetworkType : int{
-		Unknown=0,
-		GPRS,
-		EDGE,
-		UMTS,
-		HSPA,
-		LTE,
-		WiFi,
-		Ethernet,
-		OtherHighSpeed,
-		OtherLowSpeed,
-		Dialup,
-		OtherMobile
-	};
-
-	public enum class DataSavingMode{
-		Never=0,
-		MobileOnly,
-		Always
-	};
-
-	public enum class ProxyProtocol{
-		None=0,
-		SOCKS5
-	};
-
-	public ref class VoIPConfig sealed {
-	public:
-		VoIPConfig() {
-			logPacketStats = false;
-			enableVolumeControl = false;
-			enableVideoSend = false;
-			enableVideoReceive = false;
-		}
-
-		property double initTimeout;
-		property double recvTimeout;
-		property DataSavingMode dataSaving;
-		property String^ logFilePath;
-		property String^ statsDumpFilePath;
-
-		property bool enableAEC;
-		property bool enableNS;
-		property bool enableAGC;
-
-		property bool enableCallUpgrade;
-
-		property bool logPacketStats;
-		property bool enableVolumeControl;
-
-		property bool enableVideoSend;
-		property bool enableVideoReceive;
-	};
-
-	ref class VoIPControllerWrapper;
-	public delegate void CallStateChangedEventHandler(VoIPControllerWrapper^ sender, CallState newState);
-
-	ref class VoIPControllerWrapper;
-	public delegate void SignalBarsChangedEventHandler(VoIPControllerWrapper^ sender, int newCount);
-
-    public ref class VoIPControllerWrapper sealed{
-    public:
-        VoIPControllerWrapper();
-		virtual ~VoIPControllerWrapper();
-		void Start();
-		void Connect();
-		void SetPublicEndpoints(const Platform::Array<Endpoint^>^ endpoints, bool allowP2P, int32_t connectionMaxLayer);
-		void SetNetworkType(NetworkType type);
-		void SetMicMute(bool mute);
-		void SetEncryptionKey(const Platform::Array<uint8>^ key, bool isOutgoing);
-		void SetConfig(VoIPConfig^ config);
-		void SetProxy(ProxyProtocol protocol, Platform::String^ address, uint16_t port, Platform::String^ username, Platform::String^ password);
-		int GetSignalBarsCount();
-		CallState GetConnectionState();
-		TrafficStats^ GetStats();
-		Platform::String^ GetDebugString();
-		Platform::String^ GetDebugLog();
-		Error GetLastError();
-		static Platform::String^ GetVersion();
-		int64 GetPreferredRelayID();
-		void SetAudioOutputGainControlEnabled(bool enabled);
-
-		void SetInputVolume(float level);
-		void SetOutputVolume(float level);
-
-		property String^ CurrentAudioInput
-		{
-			String^ get()
-			{
-				return ref new String(ToUtf16(controller->GetCurrentAudioInputID()).data());
-			}
-			void set(String^ value)
-			{
-				controller->SetCurrentAudioInput(ToUtf8(value->Data()));
-			}
-		}
-
-		property String^ CurrentAudioOutput
-		{
-			String^ get()
-			{
-				return ref new String(ToUtf16(controller->GetCurrentAudioOutputID()).data());
-			}
-			void set(String^ value)
-			{
-				controller->SetCurrentAudioOutput(ToUtf8(value->Data()));
-			}
-		}
-
-		static int32_t GetConnectionMaxLayer();
-		static void UpdateServerConfig(Platform::String^ json);
-		static void SwitchSpeaker(bool external);
-		//static Platform::String^ TestAesIge();
-
-		event CallStateChangedEventHandler^ CallStateChanged;
-		event SignalBarsChangedEventHandler^ SignalBarsChanged;
-
-	private:
-		static void OnStateChanged(tgvoip::VoIPController* c, int state);
-		static void OnSignalBarsChanged(tgvoip::VoIPController* c, int count);
-		void OnStateChangedInternal(int state);
-		void OnSignalBarsChangedInternal(int count);
-		tgvoip::VoIPController* controller;
-    };
-
-	ref class MicrosoftCryptoImpl{
-	public:
-		static void AesIgeEncrypt(uint8_t* in, uint8_t* out, size_t len, uint8_t* key, uint8_t* iv);
-		static void AesIgeDecrypt(uint8_t* in, uint8_t* out, size_t len, uint8_t* key, uint8_t* iv);
-		static void AesCtrEncrypt(uint8_t* inout, size_t len, uint8_t* key, uint8_t* iv, uint8_t* ecount, uint32_t* num);
-		static void SHA1(uint8_t* msg, size_t len, uint8_t* out);
-		static void SHA256(uint8_t* msg, size_t len, uint8_t* out);
-		static void RandBytes(uint8_t* buffer, size_t len);
-		static void Init();
-	private:
-		static inline void XorInt128(uint8_t* a, uint8_t* b, uint8_t* out);
-		static void IBufferToPtr(Windows::Storage::Streams::IBuffer^ buffer, size_t len, uint8_t* out);
-		static Windows::Storage::Streams::IBuffer^ IBufferFromPtr(uint8_t* msg, size_t len);
-		/*static Windows::Security::Cryptography::Core::CryptographicHash^ sha1Hash;
-		static Windows::Security::Cryptography::Core::CryptographicHash^ sha256Hash;*/
-		static Windows::Security::Cryptography::Core::HashAlgorithmProvider^ sha1Provider;
-		static Windows::Security::Cryptography::Core::HashAlgorithmProvider^ sha256Provider;
-		static Windows::Security::Cryptography::Core::SymmetricKeyAlgorithmProvider^ aesKeyProvider;
-	};
-
-	class NativeBuffer :
-		public Microsoft::WRL::RuntimeClass<Microsoft::WRL::RuntimeClassFlags<Microsoft::WRL::RuntimeClassType::WinRtClassicComMix>,
-		ABI::Windows::Storage::Streams::IBuffer,
-		Windows::Storage::Streams::IBufferByteAccess>
-	{
-	public:
-		NativeBuffer(byte *buffer, UINT totalSize)
-		{
-			m_length=totalSize;
-			m_buffer=buffer;
-		}
-
-		virtual ~NativeBuffer()
-		{
-		}
-
-		STDMETHODIMP RuntimeClassInitialize(byte *buffer, UINT totalSize)
-		{
-			m_length=totalSize;
-			m_buffer=buffer;
-			return S_OK;
-		}
-
-		STDMETHODIMP Buffer(byte **value)
-		{
-			*value=m_buffer;
-			return S_OK;
-		}
-
-		STDMETHODIMP get_Capacity(UINT32 *value)
-		{
-			*value=m_length;
-			return S_OK;
-		}
-
-		STDMETHODIMP get_Length(UINT32 *value)
-		{
-			*value=m_length;
-			return S_OK;
-		}
-
-		STDMETHODIMP put_Length(UINT32 value)
-		{
-			m_length=value;
-			return S_OK;
-		}
-
-	private:
-		UINT32 m_length;
-		byte *m_buffer;
-	};
-}
\ No newline at end of file
diff --git a/submodules/libtgvoip/os/windows/NetworkSocketWinsock.cpp b/submodules/libtgvoip/os/windows/NetworkSocketWinsock.cpp
deleted file mode 100644
index 04e0d48330..0000000000
--- a/submodules/libtgvoip/os/windows/NetworkSocketWinsock.cpp
+++ /dev/null
@@ -1,719 +0,0 @@
-//
-// libtgvoip is free and unencumbered public domain software.
-// For more information, see http://unlicense.org or the UNLICENSE file
-// you should have received with this source code distribution.
-//
-
-#include <winsock2.h>
-#include <ws2tcpip.h>
-#include "NetworkSocketWinsock.h"
-#if WINAPI_FAMILY==WINAPI_FAMILY_PHONE_APP
-
-#else
-#include <IPHlpApi.h>
-#endif
-#include <assert.h>
-#include "../../logging.h"
-#include "../../VoIPController.h"
-#include "WindowsSpecific.h"
-#include "../../Buffers.h"
-
-using namespace tgvoip;
-
-NetworkSocketWinsock::NetworkSocketWinsock(NetworkProtocol protocol) : NetworkSocket(protocol), lastRecvdV4(0), lastRecvdV6("::0"){
-	needUpdateNat64Prefix=true;
-	nat64Present=false;
-	switchToV6at=0;
-	isV4Available=false;
-	closing=false;
-	fd=INVALID_SOCKET;
-
-#ifdef TGVOIP_WINXP_COMPAT
-	DWORD version=GetVersion();
-	isAtLeastVista=LOBYTE(LOWORD(version))>=6; // Vista is 6.0, XP is 5.1 and 5.2
-#else
-	isAtLeastVista=true;
-#endif
-
-	WSADATA wsaData;
-	WSAStartup(MAKEWORD(2, 2), &wsaData);
-	LOGD("Initialized winsock, version %d.%d", wsaData.wHighVersion, wsaData.wVersion);
-	tcpConnectedAddress=NULL;
-
-	if(protocol==PROTO_TCP)
-		timeout=10.0;
-	lastSuccessfulOperationTime=VoIPController::GetCurrentTime();
-}
-
-NetworkSocketWinsock::~NetworkSocketWinsock(){
-	if(tcpConnectedAddress)
-		delete tcpConnectedAddress;
-	if(pendingOutgoingPacket)
-		delete pendingOutgoingPacket;
-}
-
-void NetworkSocketWinsock::SetMaxPriority(){
-	
-}
-
-void NetworkSocketWinsock::Send(NetworkPacket *packet){
-	if(!packet || (protocol==PROTO_UDP && !packet->address)){
-		LOGW("tried to send null packet");
-		return;
-	}
-	int res;
-	if(protocol==PROTO_UDP){
-		IPv4Address *v4addr=dynamic_cast<IPv4Address *>(packet->address);
-		if(isAtLeastVista){
-			sockaddr_in6 addr;
-			if(v4addr){
-				if(needUpdateNat64Prefix && !isV4Available && VoIPController::GetCurrentTime()>switchToV6at && switchToV6at!=0){
-					LOGV("Updating NAT64 prefix");
-					nat64Present=false;
-					addrinfo *addr0;
-					int res=getaddrinfo("ipv4only.arpa", NULL, NULL, &addr0);
-					if(res!=0){
-						LOGW("Error updating NAT64 prefix: %d / %s", res, gai_strerror(res));
-					}else{
-						addrinfo *addrPtr;
-						unsigned char *addr170=NULL;
-						unsigned char *addr171=NULL;
-						for(addrPtr=addr0; addrPtr; addrPtr=addrPtr->ai_next){
-							if(addrPtr->ai_family==AF_INET6){
-								sockaddr_in6 *translatedAddr=(sockaddr_in6 *) addrPtr->ai_addr;
-								uint32_t v4part=*((uint32_t *) &translatedAddr->sin6_addr.s6_addr[12]);
-								if(v4part==0xAA0000C0 && !addr170){
-									addr170=translatedAddr->sin6_addr.s6_addr;
-								}
-								if(v4part==0xAB0000C0 && !addr171){
-									addr171=translatedAddr->sin6_addr.s6_addr;
-								}
-								char buf[INET6_ADDRSTRLEN];
-								//LOGV("Got translated address: %s", inet_ntop(AF_INET6, &translatedAddr->sin6_addr, buf, sizeof(buf)));
-							}
-						}
-						if(addr170 && addr171 && memcmp(addr170, addr171, 12)==0){
-							nat64Present=true;
-							memcpy(nat64Prefix, addr170, 12);
-							char buf[INET6_ADDRSTRLEN];
-							//LOGV("Found nat64 prefix from %s", inet_ntop(AF_INET6, addr170, buf, sizeof(buf)));
-						}else{
-							LOGV("Didn't find nat64");
-						}
-						freeaddrinfo(addr0);
-					}
-					needUpdateNat64Prefix=false;
-				}
-				memset(&addr, 0, sizeof(sockaddr_in6));
-				addr.sin6_family=AF_INET6;
-				*((uint32_t *) &addr.sin6_addr.s6_addr[12])=v4addr->GetAddress();
-				if(nat64Present)
-					memcpy(addr.sin6_addr.s6_addr, nat64Prefix, 12);
-				else
-					addr.sin6_addr.s6_addr[11]=addr.sin6_addr.s6_addr[10]=0xFF;
-
-			}else{
-				IPv6Address *v6addr=dynamic_cast<IPv6Address *>(packet->address);
-				assert(v6addr!=NULL);
-				memcpy(addr.sin6_addr.s6_addr, v6addr->GetAddress(), 16);
-			}
-			addr.sin6_port=htons(packet->port);
-			res=sendto(fd, (const char*)packet->data, packet->length, 0, (const sockaddr *) &addr, sizeof(addr));
-		}else if(v4addr){
-			sockaddr_in addr;
-			addr.sin_addr.s_addr=v4addr->GetAddress();
-			addr.sin_port=htons(packet->port);
-			addr.sin_family=AF_INET;
-			res=sendto(fd, (const char*)packet->data, packet->length, 0, (const sockaddr*)&addr, sizeof(addr));
-		}
-	}else{
-		res=send(fd, (const char*)packet->data, packet->length, 0);
-	}
-	if(res==SOCKET_ERROR){
-		int error=WSAGetLastError();
-		if(error==WSAEWOULDBLOCK){
-			if(pendingOutgoingPacket){
-				LOGE("Got EAGAIN but there's already a pending packet");
-				failed=true;
-			}else{
-				LOGV("Socket %d not ready to send", fd);
-				pendingOutgoingPacket=new Buffer(packet->length);
-				pendingOutgoingPacket->CopyFrom(packet->data, 0, packet->length);
-				readyToSend=false;
-			}
-		}else{
-			LOGE("error sending: %d / %s", error, WindowsSpecific::GetErrorMessage(error).c_str());
-			if(error==WSAENETUNREACH && !isV4Available && VoIPController::GetCurrentTime()<switchToV6at){
-				switchToV6at=VoIPController::GetCurrentTime();
-				LOGI("Network unreachable, trying NAT64");
-			}
-		}
-	}else if(res<packet->length && protocol==PROTO_TCP){
-		if(pendingOutgoingPacket){
-			LOGE("send returned less than packet length but there's already a pending packet");
-			failed=true;
-		}else{
-			LOGV("Socket %d not ready to send", fd);
-			pendingOutgoingPacket=new Buffer(packet->length-res);
-			pendingOutgoingPacket->CopyFrom(packet->data+res, 0, packet->length-res);
-			readyToSend=false;
-		}
-	}
-}
-
-bool NetworkSocketWinsock::OnReadyToSend(){
-	if(pendingOutgoingPacket){
-		NetworkPacket pkt={0};
-		pkt.data=**pendingOutgoingPacket;
-		pkt.length=pendingOutgoingPacket->Length();
-		Send(&pkt);
-		delete pendingOutgoingPacket;
-		pendingOutgoingPacket=NULL;
-		return false;
-	}
-	readyToSend=true;
-	return true;
-}
-
-void NetworkSocketWinsock::Receive(NetworkPacket *packet){
-	if(protocol==PROTO_UDP){
-		if(isAtLeastVista){
-			int addrLen=sizeof(sockaddr_in6);
-			sockaddr_in6 srcAddr;
-			int res=recvfrom(fd, (char*)packet->data, packet->length, 0, (sockaddr *) &srcAddr, (socklen_t *) &addrLen);
-			if(res!=SOCKET_ERROR)
-				packet->length=(size_t) res;
-			else{
-				int error=WSAGetLastError();
-				LOGE("error receiving %d / %s", error, WindowsSpecific::GetErrorMessage(error).c_str());
-				packet->length=0;
-				return;
-			}
-			//LOGV("Received %d bytes from %s:%d at %.5lf", len, inet_ntoa(srcAddr.sin_addr), ntohs(srcAddr.sin_port), GetCurrentTime());
-			if(!isV4Available && IN6_IS_ADDR_V4MAPPED(&srcAddr.sin6_addr)){
-				isV4Available=true;
-				LOGI("Detected IPv4 connectivity, will not try IPv6");
-			}
-			if(IN6_IS_ADDR_V4MAPPED(&srcAddr.sin6_addr) || (nat64Present && memcmp(nat64Prefix, srcAddr.sin6_addr.s6_addr, 12)==0)){
-				in_addr v4addr=*((in_addr *) &srcAddr.sin6_addr.s6_addr[12]);
-				lastRecvdV4=IPv4Address(v4addr.s_addr);
-				packet->address=&lastRecvdV4;
-			}else{
-				lastRecvdV6=IPv6Address(srcAddr.sin6_addr.s6_addr);
-				packet->address=&lastRecvdV6;
-			}
-			packet->port=ntohs(srcAddr.sin6_port);
-		}else{
-			int addrLen=sizeof(sockaddr_in);
-			sockaddr_in srcAddr;
-			int res=recvfrom(fd, (char*)packet->data, packet->length, 0, (sockaddr *) &srcAddr, (socklen_t *) &addrLen);
-			if(res!=SOCKET_ERROR)
-				packet->length=(size_t) res;
-			else{
-				LOGE("error receiving %d", WSAGetLastError());
-				packet->length=0;
-				return;
-			}
-			lastRecvdV4=IPv4Address(srcAddr.sin_addr.s_addr);
-			packet->address=&lastRecvdV4;
-			packet->port=ntohs(srcAddr.sin_port);
-		}
-		packet->protocol=PROTO_UDP;
-	}else if(protocol==PROTO_TCP){
-		int res=recv(fd, (char*)packet->data, packet->length, 0);
-		if(res==SOCKET_ERROR){
-			int error=WSAGetLastError();
-			LOGE("Error receiving from TCP socket: %d / %s", error, WindowsSpecific::GetErrorMessage(error).c_str());
-			failed=true;
-		}else{
-			packet->length=(size_t)res;
-			packet->address=tcpConnectedAddress;
-			packet->port=tcpConnectedPort;
-			packet->protocol=PROTO_TCP;
-		}
-	}
-}
-
-void NetworkSocketWinsock::Open(){
-	if(protocol==PROTO_UDP){
-		fd=socket(isAtLeastVista ? AF_INET6 : AF_INET, SOCK_DGRAM, IPPROTO_UDP);
-		if(fd==INVALID_SOCKET){
-			int error=WSAGetLastError();
-			LOGE("error creating socket: %d", error);
-			failed=true;
-			return;
-		}
-		
-		int res;
-		if(isAtLeastVista){
-			DWORD flag=0;
-			res=setsockopt(fd, IPPROTO_IPV6, IPV6_V6ONLY, (const char*)&flag, sizeof(flag));
-			if(res==SOCKET_ERROR){
-				LOGE("error enabling dual stack socket: %d", WSAGetLastError());
-				failed=true;
-				return;
-			}
-		}
-
-		u_long one=1;
-		ioctlsocket(fd, FIONBIO, &one);
-
-		SetMaxPriority();
-
-		int tries=0;
-		sockaddr* addr;
-		sockaddr_in addr4;
-		sockaddr_in6 addr6;
-		int addrLen;
-		if(isAtLeastVista){
-			//addr.sin6_addr.s_addr=0;
-			memset(&addr6, 0, sizeof(sockaddr_in6));
-			//addr.sin6_len=sizeof(sa_family_t);
-			addr6.sin6_family=AF_INET6;
-			addr=(sockaddr*)&addr6;
-			addrLen=sizeof(addr6);
-		}else{
-			sockaddr_in addr4;
-			addr4.sin_addr.s_addr=0;
-			addr4.sin_family=AF_INET;
-			addr=(sockaddr*)&addr4;
-			addrLen=sizeof(addr4);
-		}
-		for(tries=0;tries<10;tries++){
-			uint16_t port=htons(GenerateLocalPort());
-			if(isAtLeastVista)
-				((sockaddr_in6*)addr)->sin6_port=port;
-			else
-				((sockaddr_in*)addr)->sin_port=port;
-			res=::bind(fd, addr, addrLen);
-			LOGV("trying bind to port %u", ntohs(port));
-			if(res<0){
-				LOGE("error binding to port %u: %d / %s", ntohs(port), errno, strerror(errno));
-			}else{
-				break;
-			}
-		}
-		if(tries==10){
-			if(isAtLeastVista)
-				((sockaddr_in6*)addr)->sin6_port=0;
-			else
-				((sockaddr_in*)addr)->sin_port=0;
-			res=::bind(fd, addr, addrLen);
-			if(res<0){
-				LOGE("error binding to port %u: %d / %s", 0, errno, strerror(errno));
-				//SetState(STATE_FAILED);
-				return;
-			}
-		}
-		getsockname(fd, addr, (socklen_t*) &addrLen);
-		uint16_t localUdpPort;
-		if(isAtLeastVista)
-			localUdpPort=ntohs(((sockaddr_in6*)addr)->sin6_port);
-		else
-			localUdpPort=ntohs(((sockaddr_in*)addr)->sin_port);
-		LOGD("Bound to local UDP port %u", localUdpPort);
-
-		needUpdateNat64Prefix=true;
-		isV4Available=false;
-		switchToV6at=VoIPController::GetCurrentTime()+ipv6Timeout;
-	}
-}
-
-void NetworkSocketWinsock::Close(){
-	closing=true;
-	failed=true;
-	if(fd!=INVALID_SOCKET)
-		closesocket(fd);
-}
-
-void NetworkSocketWinsock::OnActiveInterfaceChanged(){
-	needUpdateNat64Prefix=true;
-	isV4Available=false;
-	switchToV6at=VoIPController::GetCurrentTime()+ipv6Timeout;
-}
-
-std::string NetworkSocketWinsock::GetLocalInterfaceInfo(IPv4Address *v4addr, IPv6Address *v6addr){
-#if WINAPI_FAMILY==WINAPI_FAMILY_PHONE_APP
-	Windows::Networking::Connectivity::ConnectionProfile^ profile=Windows::Networking::Connectivity::NetworkInformation::GetInternetConnectionProfile();
-	if(profile){
-		Windows::Foundation::Collections::IVectorView<Windows::Networking::HostName^>^ hostnames=Windows::Networking::Connectivity::NetworkInformation::GetHostNames();
-		for(unsigned int i=0;i<hostnames->Size;i++){
-			Windows::Networking::HostName^ n = hostnames->GetAt(i);
-			if(n->Type!=Windows::Networking::HostNameType::Ipv4 && n->Type!=Windows::Networking::HostNameType::Ipv6)
-				continue;
-			if(n->IPInformation->NetworkAdapter->Equals(profile->NetworkAdapter)){
-				if(v4addr && n->Type==Windows::Networking::HostNameType::Ipv4){
-					char buf[INET_ADDRSTRLEN];
-					WideCharToMultiByte(CP_UTF8, 0, n->RawName->Data(), -1, buf, sizeof(buf), NULL, NULL);
-					*v4addr=IPv4Address(buf);
-				}else if(v6addr && n->Type==Windows::Networking::HostNameType::Ipv6){
-					char buf[INET6_ADDRSTRLEN];
-					WideCharToMultiByte(CP_UTF8, 0, n->RawName->Data(), -1, buf, sizeof(buf), NULL, NULL);
-					*v6addr=IPv6Address(buf);
-				}
-			}
-		}
-		char buf[128];
-		WideCharToMultiByte(CP_UTF8, 0, profile->NetworkAdapter->NetworkAdapterId.ToString()->Data(), -1, buf, sizeof(buf), NULL, NULL);
-		return std::string(buf);
-	}
-	return "";
-#else
-	IP_ADAPTER_ADDRESSES* addrs=(IP_ADAPTER_ADDRESSES*)malloc(15*1024);
-	ULONG size=15*1024;
-	ULONG flags=GAA_FLAG_SKIP_ANYCAST | GAA_FLAG_SKIP_MULTICAST | GAA_FLAG_SKIP_DNS_SERVER | GAA_FLAG_SKIP_FRIENDLY_NAME;
-	
-	ULONG res=GetAdaptersAddresses(AF_UNSPEC, flags, NULL, addrs, &size);
-	if(res==ERROR_BUFFER_OVERFLOW){
-		addrs=(IP_ADAPTER_ADDRESSES*)realloc(addrs, size);
-		res=GetAdaptersAddresses(AF_UNSPEC, flags, NULL, addrs, &size);
-	}
-
-	ULONG bestMetric=0;
-	std::string bestName("");
-
-	if(res==ERROR_SUCCESS){
-		IP_ADAPTER_ADDRESSES* current=addrs;
-		while(current){
-			char* name=current->AdapterName;
-			LOGV("Adapter '%s':", name);
-			IP_ADAPTER_UNICAST_ADDRESS* curAddr=current->FirstUnicastAddress;
-			if(current->OperStatus!=IfOperStatusUp){
-				LOGV("-> (down)");
-				current=current->Next;
-				continue;
-			}
-			if(current->IfType==IF_TYPE_SOFTWARE_LOOPBACK){
-				LOGV("-> (loopback)");
-				current=current->Next;
-				continue;
-			}
-			if(isAtLeastVista)
-				LOGV("v4 metric: %u, v6 metric: %u", current->Ipv4Metric, current->Ipv6Metric);
-			while(curAddr){
-				sockaddr* addr=curAddr->Address.lpSockaddr;
-				if(addr->sa_family==AF_INET && v4addr){
-					sockaddr_in* ipv4=(sockaddr_in*)addr;
-					LOGV("-> V4: %s", V4AddressToString(ipv4->sin_addr.s_addr).c_str());
-					uint32_t ip=ntohl(ipv4->sin_addr.s_addr);
-					if((ip & 0xFFFF0000)!=0xA9FE0000){
-						if(isAtLeastVista){
-							if(current->Ipv4Metric>bestMetric){
-								bestMetric=current->Ipv4Metric;
-								bestName=std::string(current->AdapterName);
-								*v4addr=IPv4Address(ipv4->sin_addr.s_addr);
-							}
-						}else{
-							bestName=std::string(current->AdapterName);
-							*v4addr=IPv4Address(ipv4->sin_addr.s_addr);
-						}
-					}
-				}else if(addr->sa_family==AF_INET6 && v6addr){
-					sockaddr_in6* ipv6=(sockaddr_in6*)addr;
-					LOGV("-> V6: %s", V6AddressToString(ipv6->sin6_addr.s6_addr).c_str());
-					if(!IN6_IS_ADDR_LINKLOCAL(&ipv6->sin6_addr)){
-						*v6addr=IPv6Address(ipv6->sin6_addr.s6_addr);
-					}
-				}
-				curAddr=curAddr->Next;
-			}
-			current=current->Next;
-		}
-	}
-
-	free(addrs);
-	return bestName;
-#endif
-}
-
-uint16_t NetworkSocketWinsock::GetLocalPort(){
-	if(!isAtLeastVista){
-		sockaddr_in addr;
-		size_t addrLen=sizeof(sockaddr_in);
-		getsockname(fd, (sockaddr*)&addr, (socklen_t*)&addrLen);
-		return ntohs(addr.sin_port);
-	}
-	sockaddr_in6 addr;
-	size_t addrLen=sizeof(sockaddr_in6);
-	getsockname(fd, (sockaddr*)&addr, (socklen_t*) &addrLen);
-	return ntohs(addr.sin6_port);
-}
-
-std::string NetworkSocketWinsock::V4AddressToString(uint32_t address){
-	char buf[INET_ADDRSTRLEN];
-	sockaddr_in addr;
-	ZeroMemory(&addr, sizeof(addr));
-	addr.sin_family=AF_INET;
-	addr.sin_addr.s_addr=address;
-	DWORD len=sizeof(buf);
-#if WINAPI_FAMILY==WINAPI_FAMILY_PHONE_APP
-	wchar_t wbuf[INET_ADDRSTRLEN];
-	ZeroMemory(wbuf, sizeof(wbuf));
-	WSAAddressToStringW((sockaddr*)&addr, sizeof(addr), NULL, wbuf, &len);
-	WideCharToMultiByte(CP_UTF8, 0, wbuf, -1, buf, sizeof(buf), NULL, NULL);
-#else
-	WSAAddressToStringA((sockaddr*)&addr, sizeof(addr), NULL, buf, &len);
-#endif
-	return std::string(buf);
-}
-
-std::string NetworkSocketWinsock::V6AddressToString(const unsigned char *address){
-	char buf[INET6_ADDRSTRLEN];
-	sockaddr_in6 addr;
-	ZeroMemory(&addr, sizeof(addr));
-	addr.sin6_family=AF_INET6;
-	memcpy(addr.sin6_addr.s6_addr, address, 16);
-	DWORD len=sizeof(buf);
-#if WINAPI_FAMILY==WINAPI_FAMILY_PHONE_APP
-	wchar_t wbuf[INET6_ADDRSTRLEN];
-	ZeroMemory(wbuf, sizeof(wbuf));
-	WSAAddressToStringW((sockaddr*)&addr, sizeof(addr), NULL, wbuf, &len);
-	WideCharToMultiByte(CP_UTF8, 0, wbuf, -1, buf, sizeof(buf), NULL, NULL);
-#else
-	WSAAddressToStringA((sockaddr*)&addr, sizeof(addr), NULL, buf, &len);
-#endif
-	return std::string(buf);
-}
-
-uint32_t NetworkSocketWinsock::StringToV4Address(std::string address){
-	sockaddr_in addr;
-	ZeroMemory(&addr, sizeof(addr));
-	addr.sin_family=AF_INET;
-	int size=sizeof(addr);
-#if WINAPI_FAMILY==WINAPI_FAMILY_PHONE_APP
-	wchar_t buf[INET_ADDRSTRLEN];
-	MultiByteToWideChar(CP_UTF8, 0, address.c_str(), -1, buf, INET_ADDRSTRLEN);
-	WSAStringToAddressW(buf, AF_INET, NULL, (sockaddr*)&addr, &size);
-#else
-	WSAStringToAddressA((char*)address.c_str(), AF_INET, NULL, (sockaddr*)&addr, &size);
-#endif
-	return addr.sin_addr.s_addr;
-}
-
-void NetworkSocketWinsock::StringToV6Address(std::string address, unsigned char *out){
-	sockaddr_in6 addr;
-	ZeroMemory(&addr, sizeof(addr));
-	addr.sin6_family=AF_INET6;
-	int size=sizeof(addr);
-#if WINAPI_FAMILY==WINAPI_FAMILY_PHONE_APP
-	wchar_t buf[INET6_ADDRSTRLEN];
-	MultiByteToWideChar(CP_UTF8, 0, address.c_str(), -1, buf, INET6_ADDRSTRLEN);
-	WSAStringToAddressW(buf, AF_INET, NULL, (sockaddr*)&addr, &size);
-#else
-	WSAStringToAddressA((char*)address.c_str(), AF_INET, NULL, (sockaddr*)&addr, &size);
-#endif
-	memcpy(out, addr.sin6_addr.s6_addr, 16);
-}
-
-void NetworkSocketWinsock::Connect(const NetworkAddress *address, uint16_t port){
-	const IPv4Address* v4addr=dynamic_cast<const IPv4Address*>(address);
-	const IPv6Address* v6addr=dynamic_cast<const IPv6Address*>(address);
-	sockaddr_in v4;
-	sockaddr_in6 v6;
-	sockaddr* addr=NULL;
-	size_t addrLen=0;
-	if(v4addr){
-		v4.sin_family=AF_INET;
-		v4.sin_addr.s_addr=v4addr->GetAddress();
-		v4.sin_port=htons(port);
-		addr=reinterpret_cast<sockaddr*>(&v4);
-		addrLen=sizeof(v4);
-	}else if(v6addr){
-		v6.sin6_family=AF_INET6;
-		memcpy(v6.sin6_addr.s6_addr, v6addr->GetAddress(), 16);
-		v6.sin6_flowinfo=0;
-		v6.sin6_scope_id=0;
-		v6.sin6_port=htons(port);
-		addr=reinterpret_cast<sockaddr*>(&v6);
-		addrLen=sizeof(v6);
-	}else{
-		LOGE("Unknown address type in TCP connect");
-		failed=true;
-		return;
-	}
-	fd=socket(addr->sa_family, SOCK_STREAM, IPPROTO_TCP);
-	if(fd==INVALID_SOCKET){
-		LOGE("Error creating TCP socket: %d", WSAGetLastError());
-		failed=true;
-		return;
-	}
-	u_long one=1;
-	ioctlsocket(fd, FIONBIO, &one);
-	int opt=1;
-	setsockopt(fd, IPPROTO_TCP, TCP_NODELAY, (const char*)&opt, sizeof(opt));
-	DWORD timeout=5000;
-	setsockopt(fd, SOL_SOCKET, SO_SNDTIMEO, (const char*)&timeout, sizeof(timeout));
-	timeout=60000;
-	setsockopt(fd, SOL_SOCKET, SO_RCVTIMEO, (const char*)&timeout, sizeof(timeout));
-	int res=connect(fd, (const sockaddr*) addr, addrLen);
-	if(res!=0){
-		int error=WSAGetLastError();
-		if(error!=WSAEINPROGRESS && error!=WSAEWOULDBLOCK){
-			LOGW("error connecting TCP socket to %s:%u: %d / %s", address->ToString().c_str(), port, error, WindowsSpecific::GetErrorMessage(error).c_str());
-			closesocket(fd);
-			failed=true;
-			return;
-		}
-	}
-	tcpConnectedAddress=v4addr ? (NetworkAddress*)new IPv4Address(*v4addr) : (NetworkAddress*)new IPv6Address(*v6addr);
-	tcpConnectedPort=port;
-	LOGI("successfully connected to %s:%d", tcpConnectedAddress->ToString().c_str(), tcpConnectedPort);
-}
-
-IPv4Address *NetworkSocketWinsock::ResolveDomainName(std::string name){
-	addrinfo* addr0;
-	IPv4Address* ret=NULL;
-	int res=getaddrinfo(name.c_str(), NULL, NULL, &addr0);
-	if(res!=0){
-		LOGW("Error updating NAT64 prefix: %d / %s", res, gai_strerror(res));
-	}else{
-		addrinfo* addrPtr;
-		for(addrPtr=addr0;addrPtr;addrPtr=addrPtr->ai_next){
-			if(addrPtr->ai_family==AF_INET){
-				sockaddr_in* addr=(sockaddr_in*)addrPtr->ai_addr;
-				ret=new IPv4Address(addr->sin_addr.s_addr);
-				break;
-			}
-		}
-		freeaddrinfo(addr0);
-	}
-	return ret;
-}
-
-NetworkAddress *NetworkSocketWinsock::GetConnectedAddress(){
-	return tcpConnectedAddress;
-}
-
-uint16_t NetworkSocketWinsock::GetConnectedPort(){
-	return tcpConnectedPort;
-}
-
-void NetworkSocketWinsock::SetTimeouts(int sendTimeout, int recvTimeout){
-	DWORD timeout=sendTimeout*1000;
-	setsockopt(fd, SOL_SOCKET, SO_SNDTIMEO, (const char*)&timeout, sizeof(timeout));
-	timeout=recvTimeout*1000;
-	setsockopt(fd, SOL_SOCKET, SO_RCVTIMEO, (const char*)&timeout, sizeof(timeout));
-}
-
-bool NetworkSocketWinsock::Select(std::vector<NetworkSocket*> &readFds, std::vector<NetworkSocket*>& writeFds, std::vector<NetworkSocket*> &errorFds, SocketSelectCanceller* _canceller){
-	fd_set readSet;
-	fd_set errorSet;
-	fd_set writeSet;
-	SocketSelectCancellerWin32* canceller=dynamic_cast<SocketSelectCancellerWin32*>(_canceller);
-	timeval timeout={0, 10000};
-	bool anyFailed=false;
-	int res=0;
-
-	do{
-		FD_ZERO(&readSet);
-		FD_ZERO(&writeSet);
-		FD_ZERO(&errorSet);
-
-		for(std::vector<NetworkSocket*>::iterator itr=readFds.begin();itr!=readFds.end();++itr){
-			int sfd=GetDescriptorFromSocket(*itr);
-			if(sfd==0){
-				LOGW("can't select on one of sockets because it's not a NetworkSocketWinsock instance");
-				continue;
-			}
-			FD_SET(sfd, &readSet);
-		}
-
-		for(NetworkSocket*& s:writeFds){
-			int sfd=GetDescriptorFromSocket(s);
-			if(sfd==0){
-				LOGW("can't select on one of sockets because it's not a NetworkSocketWinsock instance");
-				continue;
-			}
-			FD_SET(sfd, &writeSet);
-		}
-
-		for(std::vector<NetworkSocket*>::iterator itr=errorFds.begin();itr!=errorFds.end();++itr){
-			int sfd=GetDescriptorFromSocket(*itr);
-			if(sfd==0){
-				LOGW("can't select on one of sockets because it's not a NetworkSocketWinsock instance");
-				continue;
-			}
-			if((*itr)->timeout>0 && VoIPController::GetCurrentTime()-(*itr)->lastSuccessfulOperationTime>(*itr)->timeout){
-				LOGW("Socket %d timed out", sfd);
-				(*itr)->failed=true;
-			}
-			anyFailed |= (*itr)->IsFailed();
-			FD_SET(sfd, &errorSet);
-		}
-		if(canceller && canceller->canceled)
-			break;
-		res=select(0, &readSet, &writeSet, &errorSet, &timeout);
-		//LOGV("select result %d", res);
-		if(res==SOCKET_ERROR)
-			LOGE("SELECT ERROR %d", WSAGetLastError());
-	}while(res==0);
-
-
-	if(canceller && canceller->canceled && !anyFailed){
-		canceller->canceled=false;
-		return false;
-	}else if(anyFailed){
-		FD_ZERO(&readSet);
-		FD_ZERO(&errorSet);
-	}
-
-	std::vector<NetworkSocket*>::iterator itr=readFds.begin();
-	while(itr!=readFds.end()){
-		int sfd=GetDescriptorFromSocket(*itr);
-		if(FD_ISSET(sfd, &readSet))
-			(*itr)->lastSuccessfulOperationTime=VoIPController::GetCurrentTime();
-		if(sfd==0 || !FD_ISSET(sfd, &readSet) || !(*itr)->OnReadyToReceive()){
-			itr=readFds.erase(itr);
-		}else{
-			++itr;
-		}
-	}
-
-	itr=writeFds.begin();
-	while(itr!=writeFds.end()){
-		int sfd=GetDescriptorFromSocket(*itr);
-		if(FD_ISSET(sfd, &writeSet)){
-			(*itr)->lastSuccessfulOperationTime=VoIPController::GetCurrentTime();
-			LOGI("Socket %d is ready to send", sfd);
-		}
-		if(sfd==0 || !FD_ISSET(sfd, &writeSet) || !(*itr)->OnReadyToSend()){
-			itr=writeFds.erase(itr);
-		}else{
-			++itr;
-		}
-	}
-
-	itr=errorFds.begin();
-	while(itr!=errorFds.end()){
-		int sfd=GetDescriptorFromSocket(*itr);
-		if((sfd==0 || !FD_ISSET(sfd, &errorSet)) && !(*itr)->IsFailed()){
-			itr=errorFds.erase(itr);
-		}else{
-			++itr;
-		}
-	}
-	//LOGV("select fds left: read=%d, error=%d", readFds.size(), errorFds.size());
-
-	return readFds.size()>0 || errorFds.size()>0;
-}
-
-SocketSelectCancellerWin32::SocketSelectCancellerWin32(){
-	canceled=false;
-}
-
-SocketSelectCancellerWin32::~SocketSelectCancellerWin32(){
-}
-
-void SocketSelectCancellerWin32::CancelSelect(){
-	canceled=true;
-}
-
-int NetworkSocketWinsock::GetDescriptorFromSocket(NetworkSocket *socket){
-	NetworkSocketWinsock* sp=dynamic_cast<NetworkSocketWinsock*>(socket);
-	if(sp)
-		return sp->fd;
-	NetworkSocketWrapper* sw=dynamic_cast<NetworkSocketWrapper*>(socket);
-	if(sw)
-		return GetDescriptorFromSocket(sw->GetWrapped());
-	return 0;
-}
diff --git a/submodules/libtgvoip/os/windows/NetworkSocketWinsock.h b/submodules/libtgvoip/os/windows/NetworkSocketWinsock.h
deleted file mode 100644
index 6e94b4f701..0000000000
--- a/submodules/libtgvoip/os/windows/NetworkSocketWinsock.h
+++ /dev/null
@@ -1,72 +0,0 @@
-//
-// libtgvoip is free and unencumbered public domain software.
-// For more information, see http://unlicense.org or the UNLICENSE file
-// you should have received with this source code distribution.
-//
-
-#ifndef LIBTGVOIP_NETWORKSOCKETWINSOCK_H
-#define LIBTGVOIP_NETWORKSOCKETWINSOCK_H
-
-#include "../../NetworkSocket.h"
-#include <stdint.h>
-#include <vector>
-
-namespace tgvoip {
-class Buffer;
-
-class SocketSelectCancellerWin32 : public SocketSelectCanceller{
-friend class NetworkSocketWinsock;
-public:
-	SocketSelectCancellerWin32();
-	virtual ~SocketSelectCancellerWin32();
-	virtual void CancelSelect();
-private:
-	bool canceled;
-};
-
-class NetworkSocketWinsock : public NetworkSocket{
-public:
-	NetworkSocketWinsock(NetworkProtocol protocol);
-	virtual ~NetworkSocketWinsock();
-	virtual void Send(NetworkPacket* packet);
-	virtual void Receive(NetworkPacket* packet);
-	virtual void Open();
-	virtual void Close();
-	virtual std::string GetLocalInterfaceInfo(IPv4Address* v4addr, IPv6Address* v6addr);
-	virtual void OnActiveInterfaceChanged();
-	virtual uint16_t GetLocalPort();
-	virtual void Connect(const NetworkAddress* address, uint16_t port);
-
-	static std::string V4AddressToString(uint32_t address);
-	static std::string V6AddressToString(const unsigned char address[16]);
-	static uint32_t StringToV4Address(std::string address);
-	static void StringToV6Address(std::string address, unsigned char* out);
-	static IPv4Address* ResolveDomainName(std::string name);
-	static bool Select(std::vector<NetworkSocket*>& readFds, std::vector<NetworkSocket*>& writeFds, std::vector<NetworkSocket*>& errorFds, SocketSelectCanceller* canceller);
-	virtual NetworkAddress *GetConnectedAddress();
-	virtual uint16_t GetConnectedPort();
-	virtual void SetTimeouts(int sendTimeout, int recvTimeout);
-	virtual bool OnReadyToSend() override;
-
-protected:
-	virtual void SetMaxPriority();
-
-private:
-	static int GetDescriptorFromSocket(NetworkSocket* socket);
-	uintptr_t fd;
-	bool needUpdateNat64Prefix;
-	bool nat64Present;
-	double switchToV6at;
-	bool isV4Available;
-	IPv4Address lastRecvdV4;
-	IPv6Address lastRecvdV6;
-	bool isAtLeastVista;
-	bool closing;
-	NetworkAddress* tcpConnectedAddress;
-	uint16_t tcpConnectedPort;
-	Buffer* pendingOutgoingPacket=NULL;
-};
-
-}
-
-#endif //LIBTGVOIP_NETWORKSOCKETWINSOCK_H
diff --git a/submodules/libtgvoip/os/windows/WindowsSandboxUtils.cpp b/submodules/libtgvoip/os/windows/WindowsSandboxUtils.cpp
deleted file mode 100644
index 8fbba664e4..0000000000
--- a/submodules/libtgvoip/os/windows/WindowsSandboxUtils.cpp
+++ /dev/null
@@ -1,68 +0,0 @@
-
-//
-// libtgvoip is free and unencumbered public domain software.
-// For more information, see http://unlicense.org or the UNLICENSE file
-// you should have received with this source code distribution.
-//
-
-#include "WindowsSandboxUtils.h"
-#include <audioclient.h>
-#include <windows.h>
-#ifdef TGVOIP_WP_SILVERLIGHT
-#include <phoneaudioclient.h>
-#endif
-
-using namespace tgvoip;
-using namespace Microsoft::WRL;
-
-
-IAudioClient2* WindowsSandboxUtils::ActivateAudioDevice(const wchar_t* devID, HRESULT* callRes, HRESULT* actRes) {
-#ifndef TGVOIP_WP_SILVERLIGHT
-	// Did I say that I hate pointlessly asynchronous things?
-	HANDLE event = CreateEventEx(NULL, NULL, 0, EVENT_ALL_ACCESS);
-	ActivationHandler activationHandler(event);
-	IActivateAudioInterfaceAsyncOperation* actHandler;
-	HRESULT cr = ActivateAudioInterfaceAsync(devID, __uuidof(IAudioClient2), NULL, (IActivateAudioInterfaceCompletionHandler*)&activationHandler, &actHandler);
-	if (callRes)
-		*callRes = cr;
-	DWORD resulttt = WaitForSingleObjectEx(event, INFINITE, false);
-	DWORD last = GetLastError();
-	CloseHandle(event);
-	if (actRes)
-		*actRes = activationHandler.actResult;
-	return activationHandler.client;
-#else
-	IAudioClient2* client;
-	HRESULT res=ActivateAudioInterface(devID, __uuidof(IAudioClient2), (void**)&client);
-	if(callRes)
-		*callRes=S_OK;
-	if(actRes)
-		*actRes=res;
-	return client;
-#endif
-}
-
-#ifndef TGVOIP_WP_SILVERLIGHT
-ActivationHandler::ActivationHandler(HANDLE _event) : event(_event)
-{
-
-}
-
-STDMETHODIMP ActivationHandler::ActivateCompleted(IActivateAudioInterfaceAsyncOperation * operation)
-{
-	HRESULT hr = S_OK;
-	HRESULT hrActivateResult = S_OK;
-	IUnknown *punkAudioInterface = nullptr;
-
-	hr = operation->GetActivateResult(&hrActivateResult, &punkAudioInterface);
-	if (SUCCEEDED(hr) && SUCCEEDED(hrActivateResult))
-	{
-		punkAudioInterface->QueryInterface(IID_PPV_ARGS(&client));
-	}
-
-	SetEvent(event);
-
-	return hr;
-}
-
-#endif
\ No newline at end of file
diff --git a/submodules/libtgvoip/os/windows/WindowsSandboxUtils.h b/submodules/libtgvoip/os/windows/WindowsSandboxUtils.h
deleted file mode 100644
index aeddca0767..0000000000
--- a/submodules/libtgvoip/os/windows/WindowsSandboxUtils.h
+++ /dev/null
@@ -1,42 +0,0 @@
-//
-// libtgvoip is free and unencumbered public domain software.
-// For more information, see http://unlicense.org or the UNLICENSE file
-// you should have received with this source code distribution.
-//
-
-#ifndef LIBTGVOIP_WINDOWS_SANDBOX_UTILS
-#define LIBTGVOIP_WINDOWS_SANDBOX_UTILS
-
-#include <audioclient.h>
-#include <windows.h>
-#ifndef TGVOIP_WP_SILVERLIGHT
-#include <mmdeviceapi.h>
-#endif
-#include <wrl.h>
-#include <wrl/implements.h>
-
-using namespace Microsoft::WRL;
-
-namespace tgvoip {
-
-#ifndef TGVOIP_WP_SILVERLIGHT
-	class ActivationHandler :
-		public RuntimeClass< RuntimeClassFlags< ClassicCom >, FtmBase, IActivateAudioInterfaceCompletionHandler >
-	{
-	public:
-		STDMETHOD(ActivateCompleted)(IActivateAudioInterfaceAsyncOperation *operation);
-
-		ActivationHandler(HANDLE _event);
-		HANDLE event;
-		IAudioClient2* client;
-		HRESULT actResult;
-	};
-#endif
-
-	class WindowsSandboxUtils {
-	public:
-		static IAudioClient2* ActivateAudioDevice(const wchar_t* devID, HRESULT* callResult, HRESULT* actResult);
-	};
-}
-
-#endif // LIBTGVOIP_WINDOWS_SANDBOX_UTILS
diff --git a/submodules/libtgvoip/os/windows/WindowsSpecific.cpp b/submodules/libtgvoip/os/windows/WindowsSpecific.cpp
deleted file mode 100755
index 3a1a23f9f4..0000000000
--- a/submodules/libtgvoip/os/windows/WindowsSpecific.cpp
+++ /dev/null
@@ -1,9 +0,0 @@
-#include "WindowsSpecific.h"
-
-using namespace tgvoip;
-
-std::string WindowsSpecific::GetErrorMessage(DWORD code){
-	char buf[1024]={0};
-	FormatMessageA(FORMAT_MESSAGE_FROM_SYSTEM, NULL, code, MAKELANGID(LANG_ENGLISH, SUBLANG_ENGLISH_US), buf, sizeof(buf), NULL);
-	return std::string(buf);
-}
\ No newline at end of file
diff --git a/submodules/libtgvoip/os/windows/WindowsSpecific.h b/submodules/libtgvoip/os/windows/WindowsSpecific.h
deleted file mode 100755
index 617e0d598e..0000000000
--- a/submodules/libtgvoip/os/windows/WindowsSpecific.h
+++ /dev/null
@@ -1,16 +0,0 @@
-#ifndef LIBTGVOIP_WINDOWS_SPECIFIC_H
-#define LIBTGVOIP_WINDOWS_SPECIFIC_H
-
-#include <string>
-#include <Windows.h>
-
-namespace tgvoip{
-
-	class WindowsSpecific{
-	public:
-		static std::string GetErrorMessage(DWORD code);
-	};
-
-}
-
-#endif // LIBTGVOIP_WINDOWS_SPECIFIC_H
\ No newline at end of file
diff --git a/submodules/libtgvoip/tests/Info.plist b/submodules/libtgvoip/tests/Info.plist
deleted file mode 100644
index 6c40a6cd0c..0000000000
--- a/submodules/libtgvoip/tests/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>BNDL</string>
-	<key>CFBundleShortVersionString</key>
-	<string>1.0</string>
-	<key>CFBundleVersion</key>
-	<string>1</string>
-</dict>
-</plist>
diff --git a/submodules/libtgvoip/tests/MockReflector.cpp b/submodules/libtgvoip/tests/MockReflector.cpp
deleted file mode 100644
index d12b28c29c..0000000000
--- a/submodules/libtgvoip/tests/MockReflector.cpp
+++ /dev/null
@@ -1,129 +0,0 @@
-//
-// libtgvoip is free and unencumbered public domain software.
-// For more information, see http://unlicense.org or the UNLICENSE file
-// you should have received with this source code distribution.
-//
-
-#include "MockReflector.h"
-#include <arpa/inet.h>
-#include <assert.h>
-#include <stdio.h>
-
-using namespace tgvoip;
-using namespace tgvoip::test;
-
-struct UdpReflectorSelfInfo{
-	uint8_t peerTag[16];
-	uint64_t _id1=0xFFFFFFFFFFFFFFFFLL;
-	uint32_t _id2=0xFFFFFFFF;
-	uint32_t magic=0xc01572c7;
-	int32_t date;
-	uint64_t query_id;
-	uint64_t my_ip_padding1;
-	uint32_t my_ip_padding2;
-	uint32_t my_ip;
-	uint32_t my_port;
-} __attribute__((packed));
-
-MockReflector::MockReflector(std::string bindAddress, uint16_t bindPort){
-	sfd=socket(PF_INET, SOCK_DGRAM, IPPROTO_UDP);
-	assert(sfd!=-1);
-	sockaddr_in bindAddr={0};
-	bindAddr.sin_family=AF_INET;
-	bindAddr.sin_port=htons(bindPort);
-	inet_aton(bindAddress.c_str(), &bindAddr.sin_addr);
-	int res=bind(sfd, (struct sockaddr*)&bindAddr, sizeof(bindAddr));
-	assert(res==0);
-}
-
-MockReflector::~MockReflector(){
-	
-}
-
-std::array<std::array<uint8_t, 16>, 2> MockReflector::GeneratePeerTags(){
-	std::array<uint8_t, 16> tag1;
-	for(int i=0;i<16;i++){
-		tag1[i]=(uint8_t)rand();
-	}
-	tag1[15] &= 0xFE;
-	std::array<std::array<uint8_t, 16>, 2> res;
-	res[0]=tag1;
-	std::copy(tag1.begin(), tag1.end(), res[1].begin());
-	res[1][15] |= 1;
-	return res;
-}
-
-void MockReflector::Start(){
-	if(running)
-		return;
-	running=true;
-	pthread_create(&thread, NULL, [](void* arg) -> void* {
-		reinterpret_cast<MockReflector*>(arg)->RunThread();
-		return NULL;
-	}, this);
-}
-
-void MockReflector::Stop(){
-	running=false;
-	shutdown(sfd, SHUT_RDWR);
-	close(sfd);
-	pthread_join(thread, NULL);
-}
-
-void MockReflector::SetDropAllPackets(bool drop){
-	dropAllPackets=drop;
-}
-
-void MockReflector::RunThread(){
-	while(running){
-		std::array<uint8_t, 1500> buf;
-		sockaddr_in addr;
-		socklen_t addrlen=sizeof(addr);
-		ssize_t len=recvfrom(sfd, buf.data(), sizeof(buf), 0, (struct sockaddr*)&addr, &addrlen);
-		if(len<=0)
-			return;
-		if(len>=32){
-			std::array<uint8_t, 16> peerTag;
-			int32_t specialID[4];
-			std::copy(buf.begin(), buf.begin()+16, peerTag.begin());
-			memcpy(specialID, buf.data()+16, 16);
-			uint64_t tagID=*reinterpret_cast<uint64_t*>(peerTag.data());
-			ClientPair c=clients[tagID];
-			sockaddr_in* dest;
-			if(peerTag[15] & 1){
-				c.addr1=addr;
-				dest=&c.addr0;
-			}else{
-				c.addr0=addr;
-				dest=&c.addr1;
-			}
-			clients[tagID]=c;
-			
-			if(specialID[0]==-1 && specialID[1]==-1 && specialID[2]==-1){
-				if(specialID[3]==-1){
-					continue;
-				}else if(specialID[3]==-2){
-					UdpReflectorSelfInfo response;
-					memcpy(response.peerTag, peerTag.data(), 16);
-					response.date=(int32_t)time(NULL);
-					response.query_id=*reinterpret_cast<uint64_t*>(buf.data()+32);
-					response.my_ip_padding1=0;
-					response.my_ip_padding2=0xFFFF0000;
-					response.my_ip=(uint32_t)addr.sin_addr.s_addr;
-					response.my_port=ntohs(addr.sin_port);
-					sendto(sfd, &response, sizeof(response), 0, (struct sockaddr*)&addr, sizeof(addr));
-					continue;
-				}
-			}
-			
-			if(dest->sin_family==AF_INET && !dropAllPackets){
-				if(peerTag[15] & 1)
-					buf[15] &= 0xFE;
-				else
-					buf[15] |= 1;
-				
-				sendto(sfd, buf.data(), len, 0, (struct sockaddr*)dest, sizeof(sockaddr_in));
-			}
-		}
-	}
-}
diff --git a/submodules/libtgvoip/tests/MockReflector.h b/submodules/libtgvoip/tests/MockReflector.h
deleted file mode 100644
index b52219aee4..0000000000
--- a/submodules/libtgvoip/tests/MockReflector.h
+++ /dev/null
@@ -1,50 +0,0 @@
-//
-// libtgvoip is free and unencumbered public domain software.
-// For more information, see http://unlicense.org or the UNLICENSE file
-// you should have received with this source code distribution.
-//
-#ifndef TGVOIP_MOCK_REFLECTOR
-#define TGVOIP_MOCK_REFLECTOR
-
-#include <string>
-#include <unordered_map>
-#include <array>
-#include <stdint.h>
-#include <pthread.h>
-
-#include <sys/socket.h>
-#include <errno.h>
-#include <assert.h>
-#include <netdb.h>
-#include <net/if.h>
-#include <sys/ioctl.h>
-#include <unistd.h>
-#include <netinet/tcp.h>
-
-namespace tgvoip{
-	namespace test{
-		class MockReflector{
-		public:
-			MockReflector(std::string bindAddress, uint16_t bindPort);
-			~MockReflector();
-			void Start();
-			void Stop();
-			void SetDropAllPackets(bool drop);
-			static std::array<std::array<uint8_t, 16>, 2> GeneratePeerTags();
-			
-		private:
-			void RunThread();
-			struct ClientPair{
-				sockaddr_in addr0={0};
-				sockaddr_in addr1={0};
-			};
-			std::unordered_map<uint64_t, ClientPair> clients; // clients are identified by the first half of their peer_tag
-			int sfd;
-			pthread_t thread;
-			bool running=false;
-			bool dropAllPackets=false;
-		};
-	}
-}
-
-#endif //TGVOIP_MOCK_REFLECTOR
diff --git a/submodules/libtgvoip/tests/libtgvoipTests.mm b/submodules/libtgvoip/tests/libtgvoipTests.mm
deleted file mode 100644
index cbb9c54915..0000000000
--- a/submodules/libtgvoip/tests/libtgvoipTests.mm
+++ /dev/null
@@ -1,192 +0,0 @@
-//
-// libtgvoip is free and unencumbered public domain software.
-// For more information, see http://unlicense.org or the UNLICENSE file
-// you should have received with this source code distribution.
-//
-
-#import <XCTest/XCTest.h>
-
-#import "MockReflector.h"
-#include "../VoIPController.h"
-#include <openssl/rand.h>
-#include "../webrtc_dsp/common_audio/wav_file.h"
-
-@interface libtgvoipTests : XCTestCase
-
-@end
-
-using namespace tgvoip;
-
-@implementation libtgvoipTests{
-	VoIPController* controller1;
-	VoIPController* controller2;
-	std::string testWavFilePath;
-}
-
-- (void)setUp {
-    [super setUp];
-	// this file must be mono 16-bit 48000hz
-	NSString* path=[NSString stringWithFormat:@"%@/Downloads/voip_test_input.wav", NSHomeDirectory()];
-	testWavFilePath=[path UTF8String];
-}
-
-- (void)tearDown {
-	
-	
-    [super tearDown];
-}
-
-- (void)initControllers{
-	controller1=new VoIPController();
-	controller2=new VoIPController();
-	
-	std::array<std::array<uint8_t, 16>, 2> peerTags=test::MockReflector::GeneratePeerTags();
-	std::vector<Endpoint> endpoints1;
-	IPv4Address localhost("127.0.0.1");
-	IPv6Address emptyV6;
-	endpoints1.push_back(Endpoint(1, 1033, localhost, emptyV6, Endpoint::Type::UDP_RELAY, peerTags[0].data()));
-	controller1->SetRemoteEndpoints(endpoints1, false, 76);
-	std::vector<Endpoint> endpoints2;
-	endpoints2.push_back(Endpoint(1, 1033, localhost, emptyV6, Endpoint::Type::UDP_RELAY, peerTags[1].data()));
-	controller2->SetRemoteEndpoints(endpoints2, false, 76);
-	
-	char encryptionKey[256];
-	RAND_bytes((uint8_t*)encryptionKey, sizeof(encryptionKey));
-	controller1->SetEncryptionKey(encryptionKey, true);
-	controller2->SetEncryptionKey(encryptionKey, false);
-}
-
-- (void)destroyControllers{
-	controller1->Stop();
-	delete controller1;
-	controller2->Stop();
-	delete controller2;
-}
-
-- (void)testBasicOperation {
-	webrtc::WavReader wavReader1(testWavFilePath);
-	webrtc::WavReader wavReader2(testWavFilePath);
-	webrtc::WavWriter wavWriter("output.wav", 48000, 1);
-	
-	test::MockReflector reflector("127.0.0.1", 1033);
-	reflector.Start();
-	
-	[self initControllers];
-	
-	controller1->SetAudioDataCallbacks([&wavReader1](int16_t* data, size_t len){
-		wavReader1.ReadSamples(len, data);
-	}, [](int16_t* data, size_t len){
-		
-	});
-	
-	controller2->SetAudioDataCallbacks([&wavReader2](int16_t* data, size_t len){
-		wavReader2.ReadSamples(len, data);
-	}, [&wavWriter](int16_t* data, size_t len){
-		wavWriter.WriteSamples(data, len);
-	});
-	
-	controller1->Start();
-	controller2->Start();
-	controller1->Connect();
-	controller2->Connect();
-	[NSThread sleepForTimeInterval:10.0];
-	
-	[self destroyControllers];
-	
-	reflector.Stop();
-}
-
-- (void)testAllocationAndDeallocation{
-	test::MockReflector reflector("127.0.0.1", 1033);
-	reflector.Start();
-	
-	for(int i=0;i<10;i++){
-		webrtc::WavReader wavReader(testWavFilePath);
-		[self initControllers];
-		
-		controller1->SetAudioDataCallbacks([&wavReader](int16_t* data, size_t len){
-			wavReader.ReadSamples(len, data);
-		}, [](int16_t* data, size_t len){
-			
-		});
-		
-		controller2->SetAudioDataCallbacks([](int16_t* data, size_t len){
-			
-		}, [](int16_t* data, size_t len){
-			
-		});
-		
-		controller1->Start();
-		controller2->Start();
-		controller1->Connect();
-		controller2->Connect();
-		[NSThread sleepForTimeInterval:3.0];
-		
-		[self destroyControllers];
-	}
-	
-	reflector.Stop();
-}
-
-- (void)testInitTimeout{
-	[self initControllers];
-	VoIPController::Config config;
-	config.enableNS=config.enableAEC=config.enableAGC=false;
-	config.enableCallUpgrade=false;
-	config.initTimeout=3.0;
-	controller1->SetConfig(config);
-	controller1->Start();
-	controller1->Connect();
-	[NSThread sleepForTimeInterval:1.5];
-	XCTAssertEqual(controller1->GetConnectionState(), STATE_WAIT_INIT_ACK);
-	[NSThread sleepForTimeInterval:2.0];
-	XCTAssertEqual(controller1->GetConnectionState(), STATE_FAILED);
-	XCTAssertEqual(controller1->GetLastError(), ERROR_TIMEOUT);
-	[self destroyControllers];
-}
-
-- (void)testPacketTimeout{
-	test::MockReflector reflector("127.0.0.1", 1033);
-	reflector.Start();
-	[self initControllers];
-	
-	webrtc::WavReader wavReader(testWavFilePath);
-	controller1->SetAudioDataCallbacks([&wavReader](int16_t* data, size_t len){
-		wavReader.ReadSamples(len, data);
-	}, [](int16_t* data, size_t len){
-		
-	});
-	
-	controller2->SetAudioDataCallbacks([](int16_t* data, size_t len){
-		
-	}, [](int16_t* data, size_t len){
-		
-	});
-	
-	VoIPController::Config config;
-	config.enableNS=config.enableAEC=config.enableAGC=false;
-	config.enableCallUpgrade=false;
-	config.initTimeout=3.0;
-	config.recvTimeout=1.5;
-	controller1->SetConfig(config);
-	config.recvTimeout=5.0;
-	controller2->SetConfig(config);
-	
-	controller1->Start();
-	controller2->Start();
-	controller1->Connect();
-	controller2->Connect();
-	[NSThread sleepForTimeInterval:2.5];
-	XCTAssertEqual(controller1->GetConnectionState(), STATE_ESTABLISHED);
-	XCTAssertEqual(controller2->GetConnectionState(), STATE_ESTABLISHED);
-	reflector.SetDropAllPackets(true);
-	[NSThread sleepForTimeInterval:2.5];
-	XCTAssertEqual(controller1->GetConnectionState(), STATE_FAILED);
-	XCTAssertEqual(controller1->GetLastError(), ERROR_TIMEOUT);
-	XCTAssertEqual(controller2->GetConnectionState(), STATE_RECONNECTING);
-	
-	[self destroyControllers];
-	reflector.Stop();
-}
-
-@end
diff --git a/submodules/libtgvoip/threading.h b/submodules/libtgvoip/threading.h
deleted file mode 100755
index 9dc255483c..0000000000
--- a/submodules/libtgvoip/threading.h
+++ /dev/null
@@ -1,354 +0,0 @@
-//
-// libtgvoip is free and unencumbered public domain software.
-// For more information, see http://unlicense.org or the UNLICENSE file
-// you should have received with this source code distribution.
-//
-
-#ifndef __THREADING_H
-#define __THREADING_H
-
-#include <functional>
-
-#if defined(_POSIX_THREADS) || defined(_POSIX_VERSION) || defined(__unix__) || defined(__unix) || (defined(__APPLE__) && defined(__MACH__))
-
-#include <pthread.h>
-#include <semaphore.h>
-#include <sched.h>
-#include <unistd.h>
-#ifdef __APPLE__
-#include "os/darwin/DarwinSpecific.h"
-#endif
-
-namespace tgvoip{
-	class Mutex{
-	public:
-		Mutex(){
-			pthread_mutex_init(&mtx, NULL);
-		}
-
-		~Mutex(){
-			pthread_mutex_destroy(&mtx);
-		}
-
-		void Lock(){
-			pthread_mutex_lock(&mtx);
-		}
-
-		void Unlock(){
-			pthread_mutex_unlock(&mtx);
-		}
-
-		pthread_mutex_t* NativeHandle(){
-			return &mtx;
-		}
-
-	private:
-		Mutex(const Mutex& other);
-		pthread_mutex_t mtx;
-	};
-
-	class Thread{
-	public:
-		Thread(std::function<void()> entry) : entry(entry){
-			name=NULL;
-			thread=0;
-		}
-
-		virtual ~Thread(){
-
-		}
-
-		void Start(){
-			if(pthread_create(&thread, NULL, Thread::ActualEntryPoint, this)==0){
-				valid=true;
-			}
-		}
-
-		void Join(){
-			if(valid)
-				pthread_join(thread, NULL);
-		}
-
-		void SetName(const char* name){
-			this->name=name;
-		}
-
-
-		void SetMaxPriority(){
-#ifdef __APPLE__
-			maxPriority=true;
-#endif
-		}
-
-		static void Sleep(double seconds){
-			usleep((useconds_t)(seconds*1000000.0));
-		}
-
-		bool IsCurrent(){
-			return pthread_equal(thread, pthread_self())!=0;
-		}
-
-	private:
-		static void* ActualEntryPoint(void* arg){
-			Thread* self=reinterpret_cast<Thread*>(arg);
-			if(self->name){
-#if !defined(__APPLE__) && !defined(__gnu_hurd__)
-				pthread_setname_np(self->thread, self->name);
-#elif !defined(__gnu_hurd__)
-				pthread_setname_np(self->name);
-				if(self->maxPriority){
-					DarwinSpecific::SetCurrentThreadPriority(DarwinSpecific::THREAD_PRIO_USER_INTERACTIVE);
-				}
-#endif
-			}
-			self->entry();
-			return NULL;
-		}
-		std::function<void()> entry;
-		pthread_t thread;
-		const char* name;
-		bool maxPriority=false;
-		bool valid=false;
-	};
-}
-
-#ifdef __APPLE__
-#include <dispatch/dispatch.h>
-namespace tgvoip{
-class Semaphore{
-public:
-	Semaphore(unsigned int maxCount, unsigned int initValue){
-		sem = dispatch_semaphore_create(initValue);
-	}
-	
-	~Semaphore(){
-#if ! __has_feature(objc_arc)
-        dispatch_release(sem);
-#endif
-	}
-	
-	void Acquire(){
-		dispatch_semaphore_wait(sem, DISPATCH_TIME_FOREVER);
-	}
-	
-	void Release(){
-		dispatch_semaphore_signal(sem);
-	}
-	
-	void Acquire(int count){
-		for(int i=0;i<count;i++)
-			Acquire();
-	}
-	
-	void Release(int count){
-		for(int i=0;i<count;i++)
-			Release();
-	}
-	
-private:
-	dispatch_semaphore_t sem;
-};
-}
-#else
-namespace tgvoip{
-class Semaphore{
-public:
-	Semaphore(unsigned int maxCount, unsigned int initValue){
-		sem_init(&sem, 0, initValue);
-	}
-
-	~Semaphore(){
-		sem_destroy(&sem);
-	}
-
-	void Acquire(){
-		sem_wait(&sem);
-	}
-
-	void Release(){
-		sem_post(&sem);
-	}
-
-	void Acquire(int count){
-		for(int i=0;i<count;i++)
-			Acquire();
-	}
-
-	void Release(int count){
-		for(int i=0;i<count;i++)
-			Release();
-	}
-
-private:
-	sem_t sem;
-};
-}
-#endif
-
-#elif defined(_WIN32)
-
-#include <Windows.h>
-#include <assert.h>
-
-namespace tgvoip{
-	class Mutex{
-	public:
-		Mutex(){
-#if !defined(WINAPI_FAMILY) || WINAPI_FAMILY!=WINAPI_FAMILY_PHONE_APP
-			InitializeCriticalSection(&section);
-#else
-			InitializeCriticalSectionEx(&section, 0, 0);
-#endif
-		}
-
-		~Mutex(){
-			DeleteCriticalSection(&section);
-		}
-
-		void Lock(){
-			EnterCriticalSection(&section);
-		}
-
-		void Unlock(){
-			LeaveCriticalSection(&section);
-		}
-
-	private:
-		Mutex(const Mutex& other);
-		CRITICAL_SECTION section;
-	};
-
-	class Thread{
-	public:
-		Thread(std::function<void()> entry) : entry(entry){
-			name=NULL;
-			thread=NULL;
-		}
-
-		~Thread(){
-		}
-
-		void Start(){
-			thread=CreateThread(NULL, 0, Thread::ActualEntryPoint, this, 0, &id);
-		}
-
-		void Join(){
-			if(!thread)
-				return;
-#if !defined(WINAPI_FAMILY) || WINAPI_FAMILY!=WINAPI_FAMILY_PHONE_APP
-			WaitForSingleObject(thread, INFINITE);
-#else
-			WaitForSingleObjectEx(thread, INFINITE, false);
-#endif
-			CloseHandle(thread);
-		}
-
-		void SetName(const char* name){
-			this->name=name;
-		}
-
-		void SetMaxPriority(){
-			SetThreadPriority(thread, THREAD_PRIORITY_HIGHEST);
-		}
-
-		static void Sleep(double seconds){
-			::Sleep((DWORD)(seconds*1000));
-		}
-
-		bool IsCurrent(){
-			return id==GetCurrentThreadId();
-		}
-
-	private:
-		static const DWORD MS_VC_EXCEPTION=0x406D1388;
-
-		#pragma pack(push,8)
-		typedef struct tagTHREADNAME_INFO
-		{
-		   DWORD dwType; // Must be 0x1000.
-		   LPCSTR szName; // Pointer to name (in user addr space).
-		   DWORD dwThreadID; // Thread ID (-1=caller thread).
-		  DWORD dwFlags; // Reserved for future use, must be zero.
-		} THREADNAME_INFO;
-		#pragma pack(pop)
-
-		static DWORD WINAPI ActualEntryPoint(void* arg){
-			Thread* self=reinterpret_cast<Thread*>(arg);
-			if(self->name){
-				THREADNAME_INFO info;
-				info.dwType=0x1000;
-				info.szName=self->name;
-				info.dwThreadID=-1;
-				info.dwFlags=0;
-				__try{
-					RaiseException(MS_VC_EXCEPTION, 0, sizeof(info)/sizeof(ULONG_PTR), (ULONG_PTR*)&info);
-				}__except(EXCEPTION_EXECUTE_HANDLER){}
-			}
-			self->entry();
-			return 0;
-		}
-		std::function<void()> entry;
-		HANDLE thread;
-		DWORD id;
-		const char* name;
-	};
-
-class Semaphore{
-public:
-	Semaphore(unsigned int maxCount, unsigned int initValue){
-#if !defined(WINAPI_FAMILY) || WINAPI_FAMILY!=WINAPI_FAMILY_PHONE_APP
-		h=CreateSemaphore(NULL, initValue, maxCount, NULL);
-#else
-		h=CreateSemaphoreEx(NULL, initValue, maxCount, NULL, 0, SEMAPHORE_ALL_ACCESS);
-		assert(h);
-#endif
-	}
-
-	~Semaphore(){
-		CloseHandle(h);
-	}
-
-	void Acquire(){
-#if !defined(WINAPI_FAMILY) || WINAPI_FAMILY!=WINAPI_FAMILY_PHONE_APP
-		WaitForSingleObject(h, INFINITE);
-#else
-		WaitForSingleObjectEx(h, INFINITE, false);
-#endif
-	}
-
-	void Release(){
-		ReleaseSemaphore(h, 1, NULL);
-	}
-
-	void Acquire(int count){
-		for(int i=0;i<count;i++)
-			Acquire();
-	}
-
-	void Release(int count){
-		ReleaseSemaphore(h, count, NULL);
-	}
-
-private:
-	HANDLE h;
-};
-}
-#else
-#error "No threading implementation for your operating system"
-#endif
-
-namespace tgvoip{
-class MutexGuard{
-public:
-    MutexGuard(Mutex &mutex) : mutex(mutex) {
-		mutex.Lock();
-	}
-	~MutexGuard(){
-		mutex.Unlock();
-	}
-private:
-	Mutex &mutex;
-};
-}
-	
-#endif //__THREADING_H
diff --git a/submodules/libtgvoip/utils.h b/submodules/libtgvoip/utils.h
deleted file mode 100644
index 51414942bb..0000000000
--- a/submodules/libtgvoip/utils.h
+++ /dev/null
@@ -1,14 +0,0 @@
-//
-// libtgvoip is free and unencumbered public domain software.
-// For more information, see http://unlicense.org or the UNLICENSE file
-// you should have received with this source code distribution.
-//
-
-#ifndef LIBTGVOIP_UTILS_H
-#define LIBTGVOIP_UTILS_H
-
-#define TGVOIP_DISALLOW_COPY_AND_ASSIGN(TypeName) \
-TypeName(const TypeName&) = delete;   \
-void operator=(TypeName&) = delete
-
-#endif /* LIBTGVOIP_UTILS_H */
diff --git a/submodules/libtgvoip/video/ScreamCongestionController.cpp b/submodules/libtgvoip/video/ScreamCongestionController.cpp
deleted file mode 100644
index 2eab5d1b55..0000000000
--- a/submodules/libtgvoip/video/ScreamCongestionController.cpp
+++ /dev/null
@@ -1,276 +0,0 @@
-//
-// Created by Grishka on 25/02/2019.
-//
-
-#include <algorithm>
-#include <math.h>
-#include "ScreamCongestionController.h"
-#include "../logging.h"
-#include "../VoIPController.h"
-
-using namespace tgvoip;
-using namespace tgvoip::video;
-
-namespace{
-	/*static*/ constexpr float QDELAY_TARGET_LO=0.1f; // seconds
-	/*static*/ constexpr float QDELAY_TARGET_HI=0.4f; // seconds
-	/*static*/ constexpr float QDELAY_WEIGHT=0.1f;
-	/*static*/ constexpr float QDELAY_TREND_TH=0.2f;
-	/*static*/ constexpr uint32_t MIN_CWND=3000; // bytes
-	/*static*/ constexpr float MAX_BYTES_IN_FLIGHT_HEAD_ROOM=1.1f;
-	/*static*/ constexpr float GAIN=1.0f;
-	/*static*/ constexpr float BETA_LOSS=0.8f;
-	/*static*/ constexpr float BETA_ECN=0.9f;
-	/*static*/ constexpr float BETA_R=0.9f;
-	/*static*/ constexpr uint32_t MSS=1024;
-	/*static*/ constexpr float RATE_ADJUST_INTERVAL=0.2f;
-	/*static*/ constexpr uint32_t TARGET_BITRATE_MIN=50*1024; // bps
-	/*static*/ constexpr uint32_t TARGET_BITRATE_MAX=500*1024; // bps
-	/*static*/ constexpr uint32_t RAMP_UP_SPEED=200000; // bps/s
-	/*static*/ constexpr float PRE_CONGESTION_GUARD=0.1f;
-	/*static*/ constexpr float TX_QUEUE_SIZE_FACTOR=1.0f;
-	/*static*/ constexpr float RTP_QDELAY_TH=0.02f; // seconds
-	/*static*/ constexpr float TARGET_RATE_SCALE_RTP_QDELAY=0.95f;
-	/*static*/ constexpr float QDELAY_TREND_LO=0.2f;
-	/*static*/ constexpr float T_RESUME_FAST_INCREASE=5.0f; // seconds
-	/*static*/ constexpr uint32_t RATE_PACE_MIN=50000; // bps
-}
-
-ScreamCongestionController::ScreamCongestionController() : qdelayTarget(QDELAY_TARGET_LO), cwnd(MIN_CWND) {
-	
-}
-
-void ScreamCongestionController::UpdateVariables(float qdelay){
-	float qdelayFraction=qdelay/qdelayTarget;
-	qdelayFractionAvg=(1.0f-QDELAY_WEIGHT)*qdelayFractionAvg+qdelayFraction*QDELAY_WEIGHT;
-	qdelayFractionHist.Add(qdelayFraction);
-	float avg=qdelayFractionHist.Average();
-
-	float r1=0.0, r0=0.0;
-	for(int i=(int)qdelayFractionHist.Size()-1;i>=0;i--){
-		float v=qdelayFractionHist[i]-avg;
-		r0+=v*v;
-	}
-	for(int i=(int)qdelayFractionHist.Size()-1;i>=1;i--){
-		float v1=qdelayFractionHist[i]-avg;
-		float v2=qdelayFractionHist[i-1]-avg;
-		r1+=v1*v2;
-	}
-	float a=r1/r0;
-	qdelayTrend=std::min(1.0f, std::max(0.0f, a*qdelayFractionAvg));
-	qdelayTrendMem=std::max(0.99f*qdelayTrendMem, qdelayTrend);
-
-	if(qdelayTrend>QDELAY_TREND_LO){
-		lastTimeQDelayTrendWasGreaterThanLo=VoIPController::GetCurrentTime();
-	}
-}
-
-void ScreamCongestionController::UpdateCWnd(float qdelay){
-	if(inFastIncrease){
-		if(qdelayTrend>=QDELAY_TREND_TH){
-			inFastIncrease=false;
-		}else{
-			if((float)bytesInFlight*1.5f+bytesNewlyAcked>cwnd){
-				LOGD("HERE");
-				cwnd+=bytesNewlyAcked;
-			}
-			return;
-		}
-	}
-
-	float offTarget=(qdelayTarget-qdelay)/qdelayTarget;
-
-	float gain=GAIN;
-	float cwndDelta=gain*offTarget*bytesNewlyAcked*MSS/(float)cwnd;
-	if(offTarget>0 && (float)bytesInFlight*1.25f+bytesNewlyAcked<=cwnd){
-		cwndDelta=0.0;
-	}
-	cwnd+=cwndDelta;
-	cwnd=std::min(cwnd, (uint32_t)(maxBytesInFlight*MAX_BYTES_IN_FLIGHT_HEAD_ROOM));
-	cwnd=std::max(cwnd, MIN_CWND);
-}
-
-void ScreamCongestionController::AdjustQDelayTarget(float qdelay){
-	float qdelayNorm=qdelay/QDELAY_TARGET_LO;
-	qdelayNormHist.Add(qdelayNorm);
-
-	float qdelayNormAvg=qdelayNormHist.Average();
-	float qdelayNormVar=0.0;
-	for(uint32_t i=0;i<qdelayNormHist.Size();i++){
-		float tmp=qdelayNormHist[i]-qdelayNormAvg;
-		qdelayNormVar+=tmp*tmp;
-	}
-	qdelayNormVar/=qdelayNormHist.Size();
-
-	float newTarget=qdelayNormAvg+sqrt(qdelayNormVar);
-	newTarget*=QDELAY_TARGET_LO;
-
-	if(lossEventRate>0.002f){
-		qdelayTarget=1.5f*newTarget;
-	}else{
-		if(qdelayNormVar<0.2f){
-			qdelayTarget=newTarget;
-		}else{
-			if(newTarget<QDELAY_TARGET_LO){
-				qdelayTarget=std::max(qdelayTarget*0.5f, newTarget);
-			}else{
-				qdelayTarget*=0.9;
-			}
-		}
-	}
-
-	qdelayTarget=std::min(QDELAY_TARGET_HI, qdelayTarget);
-	qdelayTarget=std::max(QDELAY_TARGET_LO, qdelayTarget);
-}
-
-void ScreamCongestionController::AdjustBitrate(){
-	if(lossPending){
-		lossPending=false;
-		targetBitrate=std::max((uint32_t)(BETA_R*(float)targetBitrate), TARGET_BITRATE_MIN);
-		return;
-	}
-
-	float rampUpSpeed=std::min(RAMP_UP_SPEED, targetBitrate/2);
-	float scale=(float)(targetBitrate-targetBitrateLastMax)/(float)targetBitrateLastMax;
-	scale=std::max(0.2f, std::min(1.0f, (scale*4)*(scale*4)));
-	float currentRate=std::max(rateTransmit, rateAck);
-
-	if(inFastIncrease){
-		float increment=(rampUpSpeed*RATE_ADJUST_INTERVAL)*scale;
-		targetBitrate+=increment;
-	}else{
-		float deltaRate=currentRate*(1.0f-PRE_CONGESTION_GUARD*qdelayTrend)-TX_QUEUE_SIZE_FACTOR*(float)rtpQueueSize;
-		if(deltaRate>0.0f){
-			deltaRate*=scale;
-			deltaRate=std::min(deltaRate, rampUpSpeed*RATE_ADJUST_INTERVAL);
-		}
-		targetBitrate+=deltaRate;
-		float rtpQueueDelay=(float)rtpQueueSize/currentRate;
-		if(rtpQueueDelay>RTP_QDELAY_TH){
-			targetBitrate=(uint32_t)((float)targetBitrate*TARGET_RATE_SCALE_RTP_QDELAY);
-		}
-	}
-
-	float rateMediaLimit=std::max(currentRate, std::max(rateMedia, rateMediaMedian));
-	rateMediaLimit*=(2.0-qdelayTrendMem);
-	targetBitrate=std::min(targetBitrate, (uint32_t)rateMediaLimit);
-	targetBitrate=std::min(TARGET_BITRATE_MAX, std::max(TARGET_BITRATE_MIN, targetBitrate));
-}
-
-void ScreamCongestionController::CalculateSendWindow(float qdelay){
-	if(qdelay<=qdelayTarget)
-		sendWnd=cwnd+MSS-bytesInFlight;
-	else
-		sendWnd=cwnd-bytesInFlight;
-}
-
-void ScreamCongestionController::ProcessAcks(float oneWayDelay, uint32_t bytesNewlyAcked, uint32_t lossCount, double rtt){
-    if(prevOneWayDelay!=0.0f){
-    	double currentTime=VoIPController::GetCurrentTime();
-    	float qdelay=oneWayDelay-prevOneWayDelay;
-    	sRTT=(float)rtt;
-		bytesInFlight-=bytesNewlyAcked;
-		rtpQueueSize-=(bytesNewlyAcked*8);
-		UpdateBytesInFlightHistory();
-		bytesAcked+=bytesNewlyAcked;
-    	//LOGV("Scream: qdelay = %f, newly acked = %u, in flight = %u, losses = %u", qdelay, bytesNewlyAcked, bytesInFlight, lossCount);
-		if(currentTime-lastVariablesUpdateTime>=0.050){
-			lastVariablesUpdateTime=currentTime;
-			UpdateVariables(qdelay);
-		}
-		if(currentTime-lastRateAdjustmentTime>=RATE_ADJUST_INTERVAL){
-			lastRateAdjustmentTime=currentTime;
-			AdjustBitrate();
-			//LOGV("Scream: target bitrate = %u", targetBitrate);
-		}
-    	if(lossCount>prevLossCount && currentTime>ignoreLossesUntil){
-    		LOGD("Scream: loss detected");
-    		ignoreLossesUntil=currentTime+rtt;
-    		inFastIncrease=false;
-    		cwnd=std::max(MIN_CWND, (uint32_t)(cwnd*BETA_LOSS));
-    		AdjustQDelayTarget(qdelay);
-			CalculateSendWindow(qdelay);
-			lossPending=true;
-			prevLossCount=lossCount;
-			lastTimeQDelayTrendWasGreaterThanLo=currentTime;
-    	}else{
-    		this->bytesNewlyAcked+=bytesNewlyAcked;
-    		if(currentTime-lastCWndUpdateTime>=0.15){
-    			lastCWndUpdateTime=currentTime;
-				UpdateCWnd(qdelay);
-				//LOGI("Scream: cwnd = %u", cwnd);
-				this->bytesNewlyAcked=0;
-			}
-    		AdjustQDelayTarget(qdelay);
-    		CalculateSendWindow(qdelay);
-    		if(!inFastIncrease){
-    			if(currentTime-lastTimeQDelayTrendWasGreaterThanLo>=T_RESUME_FAST_INCREASE){
-    				inFastIncrease=true;
-    			}
-    		}
-    	}
-    }
-    prevOneWayDelay=oneWayDelay;
-}
-
-void ScreamCongestionController::ProcessPacketSent(uint32_t size){
-	bytesInFlight+=size;
-	rtpQueueSize+=(size*8);
-	bytesSent+=size;
-	double currentTime=VoIPController::GetCurrentTime();
-	if(currentTime-rateTransmitUpdateTime>=0.2){
-		rateTransmit=(float)(bytesSent*8)/(float)(currentTime-rateTransmitUpdateTime);
-		rateAck=(float)(bytesAcked*8)/(float)(currentTime-rateTransmitUpdateTime);
-		rateTransmitUpdateTime=currentTime;
-		bytesSent=0;
-		bytesAcked=0;
-		//LOGV("rateTransmit %f, rateAck %f", rateTransmit, rateAck);
-	}
-	UpdateBytesInFlightHistory();
-}
-
-void ScreamCongestionController::ProcessPacketLost(uint32_t size){
-	bytesInFlight-=size;
-	rtpQueueSize-=(size*8);
-	UpdateBytesInFlightHistory();
-}
-
-double ScreamCongestionController::GetPacingInterval(){
-	float paceBitrate=std::max((float)RATE_PACE_MIN, cwnd*8.0f/sRTT);
-	//LOGV("RTT=%f cwnd=%u paceBitrate=%f fastIncrease=%d", sRTT, cwnd, paceBitrate, inFastIncrease);
-	double pacingInterval=rtpSize*8.0f/paceBitrate;
-	return std::min(0.010, pacingInterval);
-}
-
-void ScreamCongestionController::UpdateBytesInFlightHistory(){
-	double currentTime=VoIPController::GetCurrentTime();
-	ValueSample now={bytesInFlight, currentTime};
-	bytesInFlightHistory.push_back(now);
-	uint32_t max=0;
-	for(std::vector<ValueSample>::iterator i=bytesInFlightHistory.begin();i!=bytesInFlightHistory.end();){
-		if(currentTime-i->time>=5.0){
-			i=bytesInFlightHistory.erase(i);
-		}else{
-			max=std::max(max, i->sample);
-			++i;
-		}
-	}
-	maxBytesInFlight=max;
-}
-
-void ScreamCongestionController::UpdateMediaRate(uint32_t frameSize){
-	bytesMedia+=frameSize;
-	double currentTime=VoIPController::GetCurrentTime();
-	if(currentTime-rateMediaUpdateTime>=0.5){
-		rateMedia=(float)(bytesMedia*8)/(float)(currentTime-rateMediaUpdateTime);
-		bytesMedia=0;
-		rateMediaUpdateTime=currentTime;
-		LOGV("rateMedia %f", rateMedia);
-		rateMediaHistory.Add(rateMedia);
-		rateMediaMedian=rateMediaHistory.NonZeroAverage();
-	}
-}
-
-uint32_t ScreamCongestionController::GetBitrate(){
-	return targetBitrate;
-}
diff --git a/submodules/libtgvoip/video/ScreamCongestionController.h b/submodules/libtgvoip/video/ScreamCongestionController.h
deleted file mode 100644
index 30d3ff1e81..0000000000
--- a/submodules/libtgvoip/video/ScreamCongestionController.h
+++ /dev/null
@@ -1,80 +0,0 @@
-//
-// Created by Grishka on 25/02/2019.
-//
-
-#ifndef LIBTGVOIP_SCREAMCONGESTIONCONTROLLER_H
-#define LIBTGVOIP_SCREAMCONGESTIONCONTROLLER_H
-
-#include "../Buffers.h"
-#include <vector>
-#include <stdint.h>
-
-namespace tgvoip{
-	namespace video{
-		class ScreamCongestionController{
-		public:
-			ScreamCongestionController();
-			void AdjustBitrate();
-			void ProcessAcks(float oneWayDelay, uint32_t bytesNewlyAcked, uint32_t lossCount, double rtt);
-			void ProcessPacketSent(uint32_t size);
-			void ProcessPacketLost(uint32_t size);
-			double GetPacingInterval();
-			void UpdateMediaRate(uint32_t frameSize);
-			uint32_t GetBitrate();
-
-		private:
-			void UpdateVariables(float qdelay);
-			void UpdateCWnd(float qdelay);
-			void AdjustQDelayTarget(float qdelay);
-			void CalculateSendWindow(float qdelay);
-
-			void UpdateBytesInFlightHistory();
-
-			struct ValueSample{
-				uint32_t sample;
-				double time;
-			};
-
-			float qdelayTarget;
-			float qdelayFractionAvg=0.0f;
-			HistoricBuffer<float, 20> qdelayFractionHist;
-			float qdelayTrend=0.0f;
-			float qdelayTrendMem=0.0f;
-			HistoricBuffer<float, 100> qdelayNormHist;
-			bool inFastIncrease=true;
-			uint32_t cwnd;
-			uint32_t bytesNewlyAcked=0;
-			uint32_t maxBytesInFlight=0;
-			uint32_t sendWnd=0;
-			uint32_t targetBitrate=0;
-			uint32_t targetBitrateLastMax=1;
-			float rateTransmit=0.0f;
-			float rateAck=0.0f;
-			float rateMedia=0.0f;
-			float rateMediaMedian=0.0f;
-			float sRTT=0.0f;
-			uint32_t rtpQueueSize=0;
-			uint32_t rtpSize=1024; //0;
-			float lossEventRate=0.0f;
-
-			bool lossPending=false;
-			float prevOneWayDelay=0.0f;
-			double ignoreLossesUntil=0.0;
-			uint32_t prevLossCount=0;
-			double lastTimeQDelayTrendWasGreaterThanLo=0.0;
-			double lastVariablesUpdateTime=0.0;
-			double lastRateAdjustmentTime=0.0;
-			double lastCWndUpdateTime=0.0;
-			uint32_t bytesInFlight=0;
-			std::vector<ValueSample> bytesInFlightHistory;
-			uint32_t bytesSent=0;
-			uint32_t bytesAcked=0;
-			uint32_t bytesMedia=0;
-			double rateTransmitUpdateTime=0.0;
-			double rateMediaUpdateTime=0.0;
-			HistoricBuffer<float, 25> rateMediaHistory;
-		};
-	}
-}
-
-#endif //LIBTGVOIP_SCREAMCONGESTIONCONTROLLER_H
diff --git a/submodules/libtgvoip/video/VideoRenderer.cpp b/submodules/libtgvoip/video/VideoRenderer.cpp
deleted file mode 100644
index 0813f8ea68..0000000000
--- a/submodules/libtgvoip/video/VideoRenderer.cpp
+++ /dev/null
@@ -1,29 +0,0 @@
-//
-// Created by Grishka on 10.08.2018.
-//
-
-#include "VideoRenderer.h"
-
-#ifdef __ANDROID__
-#include "../os/android/VideoRendererAndroid.h"
-#elif defined(__APPLE__) && !defined(TARGET_OSX32)
-#include "../os/darwin/SampleBufferDisplayLayerRenderer.h"
-#endif
-
-std::vector<uint32_t> tgvoip::video::VideoRenderer::GetAvailableDecoders(){
-#ifdef __ANDROID__
-	return VideoRendererAndroid::availableDecoders;
-#elif defined(__APPLE__) && !defined(TARGET_OSX32)
-	return SampleBufferDisplayLayerRenderer::GetAvailableDecoders();
-#endif
-	return std::vector<uint32_t>();
-}
-
-int tgvoip::video::VideoRenderer::GetMaximumResolution(){
-#ifdef __ANDROID__
-	return VideoRendererAndroid::maxResolution;
-#elif defined(__APPLE__) && !defined(TARGET_OSX32)
-	return SampleBufferDisplayLayerRenderer::GetMaximumResolution();
-#endif
-	return 0;
-}
diff --git a/submodules/libtgvoip/video/VideoRenderer.h b/submodules/libtgvoip/video/VideoRenderer.h
deleted file mode 100644
index 96d64d01d1..0000000000
--- a/submodules/libtgvoip/video/VideoRenderer.h
+++ /dev/null
@@ -1,25 +0,0 @@
-//
-// Created by Grishka on 10.08.2018.
-//
-
-#ifndef LIBTGVOIP_VIDEORENDERER_H
-#define LIBTGVOIP_VIDEORENDERER_H
-
-#include <vector>
-#include "../Buffers.h"
-
-namespace tgvoip{
-	namespace video{
-		class VideoRenderer{
-		public:
-			static std::vector<uint32_t> GetAvailableDecoders();
-			virtual ~VideoRenderer(){};
-			virtual void Reset(uint32_t codec, unsigned int width, unsigned int height, std::vector<Buffer>& csd)=0;
-			virtual void DecodeAndDisplay(Buffer frame, uint32_t pts)=0;
-			virtual void SetStreamEnabled(bool enabled)=0;
-			static int GetMaximumResolution();
-		};
-	}
-}
-
-#endif //LIBTGVOIP_VIDEORENDERER_H
diff --git a/submodules/libtgvoip/video/VideoSource.cpp b/submodules/libtgvoip/video/VideoSource.cpp
deleted file mode 100755
index fd5b05702c..0000000000
--- a/submodules/libtgvoip/video/VideoSource.cpp
+++ /dev/null
@@ -1,44 +0,0 @@
-//
-// Created by Grishka on 10.08.2018.
-//
-
-#include "VideoSource.h"
-
-#ifdef __ANDROID__
-#include "../os/android/VideoSourceAndroid.h"
-#elif defined(__APPLE__) && !defined(TARGET_OSX32)
-#include "../os/darwin/VideoToolboxEncoderSource.h"
-#endif
-
-using namespace tgvoip;
-using namespace tgvoip::video;
-
-std::shared_ptr<VideoSource> VideoSource::Create(){
-#ifdef __ANDROID__
-	//return std::make_shared<VideoSourceAndroid>();
-	return nullptr;
-#endif
-	return nullptr;
-}
-
-
-void VideoSource::SetCallback(std::function<void(const Buffer &, uint32_t)> callback){
-	this->callback=callback;
-}
-
-bool VideoSource::Failed(){
-	return failed;
-}
-
-std::string VideoSource::GetErrorDescription(){
-	return error;
-}
-
-std::vector<uint32_t> VideoSource::GetAvailableEncoders(){
-#ifdef __ANDROID__
-	return VideoSourceAndroid::availableEncoders;
-#elif defined(__APPLE__) && !defined(TARGET_OSX32)
-	return VideoToolboxEncoderSource::GetAvailableEncoders();
-#endif
-	return std::vector<uint32_t>();
-}
diff --git a/submodules/libtgvoip/video/VideoSource.h b/submodules/libtgvoip/video/VideoSource.h
deleted file mode 100644
index 6a93926a03..0000000000
--- a/submodules/libtgvoip/video/VideoSource.h
+++ /dev/null
@@ -1,50 +0,0 @@
-//
-// Created by Grishka on 10.08.2018.
-//
-
-#ifndef LIBTGVOIP_VIDEOSOURCE_H
-#define LIBTGVOIP_VIDEOSOURCE_H
-
-#include <vector>
-#include <functional>
-#include <memory>
-#include <string>
-#include "../Buffers.h"
-
-namespace tgvoip{
-	namespace video {
-		class VideoSource{
-		public:
-			virtual ~VideoSource(){};
-			static std::shared_ptr<VideoSource> Create();
-			static std::vector<uint32_t> GetAvailableEncoders();
-			void SetCallback(std::function<void(const Buffer& buffer, uint32_t flags)> callback);
-			virtual void Start()=0;
-			virtual void Stop()=0;
-			virtual void Reset(uint32_t codec, int maxResolution)=0;
-			virtual void RequestKeyFrame()=0;
-			virtual void SetBitrate(uint32_t bitrate)=0;
-			bool Failed();
-			std::string GetErrorDescription();
-			std::vector<Buffer>& GetCodecSpecificData(){
-				return csd;
-			}
-			unsigned int GetFrameWidth(){
-				return width;
-			}
-			unsigned int GetFrameHeight(){
-				return height;
-			}
-
-		protected:
-			std::function<void(const Buffer &, uint32_t)> callback;
-			bool failed;
-			std::string error;
-			unsigned int width=0;
-			unsigned int height=0;
-			std::vector<Buffer> csd;
-		};
-	}
-}
-
-#endif //LIBTGVOIP_VIDEOSOURCE_H
diff --git a/submodules/libtgvoip/webrtc_dsp/absl/algorithm/algorithm.h b/submodules/libtgvoip/webrtc_dsp/absl/algorithm/algorithm.h
deleted file mode 100755
index 3d6586439f..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/absl/algorithm/algorithm.h
+++ /dev/null
@@ -1,150 +0,0 @@
-// Copyright 2017 The Abseil Authors.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-// -----------------------------------------------------------------------------
-// File: algorithm.h
-// -----------------------------------------------------------------------------
-//
-// This header file contains Google extensions to the standard <algorithm> C++
-// header.
-
-#ifndef ABSL_ALGORITHM_ALGORITHM_H_
-#define ABSL_ALGORITHM_ALGORITHM_H_
-
-#include <algorithm>
-#include <iterator>
-#include <type_traits>
-
-namespace absl {
-
-namespace algorithm_internal {
-
-// Performs comparisons with operator==, similar to C++14's `std::equal_to<>`.
-struct EqualTo {
-  template <typename T, typename U>
-  bool operator()(const T& a, const U& b) const {
-    return a == b;
-  }
-};
-
-template <typename InputIter1, typename InputIter2, typename Pred>
-bool EqualImpl(InputIter1 first1, InputIter1 last1, InputIter2 first2,
-               InputIter2 last2, Pred pred, std::input_iterator_tag,
-               std::input_iterator_tag) {
-  while (true) {
-    if (first1 == last1) return first2 == last2;
-    if (first2 == last2) return false;
-    if (!pred(*first1, *first2)) return false;
-    ++first1;
-    ++first2;
-  }
-}
-
-template <typename InputIter1, typename InputIter2, typename Pred>
-bool EqualImpl(InputIter1 first1, InputIter1 last1, InputIter2 first2,
-               InputIter2 last2, Pred&& pred, std::random_access_iterator_tag,
-               std::random_access_iterator_tag) {
-  return (last1 - first1 == last2 - first2) &&
-         std::equal(first1, last1, first2, std::forward<Pred>(pred));
-}
-
-// When we are using our own internal predicate that just applies operator==, we
-// forward to the non-predicate form of std::equal. This enables an optimization
-// in libstdc++ that can result in std::memcmp being used for integer types.
-template <typename InputIter1, typename InputIter2>
-bool EqualImpl(InputIter1 first1, InputIter1 last1, InputIter2 first2,
-               InputIter2 last2, algorithm_internal::EqualTo /* unused */,
-               std::random_access_iterator_tag,
-               std::random_access_iterator_tag) {
-  return (last1 - first1 == last2 - first2) &&
-         std::equal(first1, last1, first2);
-}
-
-template <typename It>
-It RotateImpl(It first, It middle, It last, std::true_type) {
-  return std::rotate(first, middle, last);
-}
-
-template <typename It>
-It RotateImpl(It first, It middle, It last, std::false_type) {
-  std::rotate(first, middle, last);
-  return std::next(first, std::distance(middle, last));
-}
-
-}  // namespace algorithm_internal
-
-// Compares the equality of two ranges specified by pairs of iterators, using
-// the given predicate, returning true iff for each corresponding iterator i1
-// and i2 in the first and second range respectively, pred(*i1, *i2) == true
-//
-// This comparison takes at most min(`last1` - `first1`, `last2` - `first2`)
-// invocations of the predicate. Additionally, if InputIter1 and InputIter2 are
-// both random-access iterators, and `last1` - `first1` != `last2` - `first2`,
-// then the predicate is never invoked and the function returns false.
-//
-// This is a C++11-compatible implementation of C++14 `std::equal`.  See
-// http://en.cppreference.com/w/cpp/algorithm/equal for more information.
-template <typename InputIter1, typename InputIter2, typename Pred>
-bool equal(InputIter1 first1, InputIter1 last1, InputIter2 first2,
-           InputIter2 last2, Pred&& pred) {
-  return algorithm_internal::EqualImpl(
-      first1, last1, first2, last2, std::forward<Pred>(pred),
-      typename std::iterator_traits<InputIter1>::iterator_category{},
-      typename std::iterator_traits<InputIter2>::iterator_category{});
-}
-
-// Performs comparison of two ranges specified by pairs of iterators using
-// operator==.
-template <typename InputIter1, typename InputIter2>
-bool equal(InputIter1 first1, InputIter1 last1, InputIter2 first2,
-           InputIter2 last2) {
-  return absl::equal(first1, last1, first2, last2,
-                     algorithm_internal::EqualTo{});
-}
-
-// Performs a linear search for `value` using the iterator `first` up to
-// but not including `last`, returning true if [`first`, `last`) contains an
-// element equal to `value`.
-//
-// A linear search is of O(n) complexity which is guaranteed to make at most
-// n = (`last` - `first`) comparisons. A linear search over short containers
-// may be faster than a binary search, even when the container is sorted.
-template <typename InputIterator, typename EqualityComparable>
-bool linear_search(InputIterator first, InputIterator last,
-                   const EqualityComparable& value) {
-  return std::find(first, last, value) != last;
-}
-
-// Performs a left rotation on a range of elements (`first`, `last`) such that
-// `middle` is now the first element. `rotate()` returns an iterator pointing to
-// the first element before rotation. This function is exactly the same as
-// `std::rotate`, but fixes a bug in gcc
-// <= 4.9 where `std::rotate` returns `void` instead of an iterator.
-//
-// The complexity of this algorithm is the same as that of `std::rotate`, but if
-// `ForwardIterator` is not a random-access iterator, then `absl::rotate`
-// performs an additional pass over the range to construct the return value.
-
-template <typename ForwardIterator>
-ForwardIterator rotate(ForwardIterator first, ForwardIterator middle,
-                       ForwardIterator last) {
-  return algorithm_internal::RotateImpl(
-      first, middle, last,
-      std::is_same<decltype(std::rotate(first, middle, last)),
-                   ForwardIterator>());
-}
-
-}  // namespace absl
-
-#endif  // ABSL_ALGORITHM_ALGORITHM_H_
diff --git a/submodules/libtgvoip/webrtc_dsp/absl/base/attributes.h b/submodules/libtgvoip/webrtc_dsp/absl/base/attributes.h
deleted file mode 100755
index 291ad89ee7..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/absl/base/attributes.h
+++ /dev/null
@@ -1,597 +0,0 @@
-// Copyright 2017 The Abseil Authors.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-// This header file defines macros for declaring attributes for functions,
-// types, and variables.
-//
-// These macros are used within Abseil and allow the compiler to optimize, where
-// applicable, certain function calls.
-//
-// This file is used for both C and C++!
-//
-// Most macros here are exposing GCC or Clang features, and are stubbed out for
-// other compilers.
-//
-// GCC attributes documentation:
-//   https://gcc.gnu.org/onlinedocs/gcc-4.7.0/gcc/Function-Attributes.html
-//   https://gcc.gnu.org/onlinedocs/gcc-4.7.0/gcc/Variable-Attributes.html
-//   https://gcc.gnu.org/onlinedocs/gcc-4.7.0/gcc/Type-Attributes.html
-//
-// Most attributes in this file are already supported by GCC 4.7. However, some
-// of them are not supported in older version of Clang. Thus, we check
-// `__has_attribute()` first. If the check fails, we check if we are on GCC and
-// assume the attribute exists on GCC (which is verified on GCC 4.7).
-//
-// -----------------------------------------------------------------------------
-// Sanitizer Attributes
-// -----------------------------------------------------------------------------
-//
-// Sanitizer-related attributes are not "defined" in this file (and indeed
-// are not defined as such in any file). To utilize the following
-// sanitizer-related attributes within your builds, define the following macros
-// within your build using a `-D` flag, along with the given value for
-// `-fsanitize`:
-//
-//   * `ADDRESS_SANITIZER` + `-fsanitize=address` (Clang, GCC 4.8)
-//   * `MEMORY_SANITIZER` + `-fsanitize=memory` (Clang-only)
-//   * `THREAD_SANITIZER + `-fsanitize=thread` (Clang, GCC 4.8+)
-//   * `UNDEFINED_BEHAVIOR_SANITIZER` + `-fsanitize=undefined` (Clang, GCC 4.9+)
-//   * `CONTROL_FLOW_INTEGRITY` + -fsanitize=cfi (Clang-only)
-//
-// Example:
-//
-//   // Enable branches in the Abseil code that are tagged for ASan:
-//   $ bazel build --copt=-DADDRESS_SANITIZER --copt=-fsanitize=address
-//     --linkopt=-fsanitize=address *target*
-//
-// Since these macro names are only supported by GCC and Clang, we only check
-// for `__GNUC__` (GCC or Clang) and the above macros.
-#ifndef ABSL_BASE_ATTRIBUTES_H_
-#define ABSL_BASE_ATTRIBUTES_H_
-
-// ABSL_HAVE_ATTRIBUTE
-//
-// A function-like feature checking macro that is a wrapper around
-// `__has_attribute`, which is defined by GCC 5+ and Clang and evaluates to a
-// nonzero constant integer if the attribute is supported or 0 if not.
-//
-// It evaluates to zero if `__has_attribute` is not defined by the compiler.
-//
-// GCC: https://gcc.gnu.org/gcc-5/changes.html
-// Clang: https://clang.llvm.org/docs/LanguageExtensions.html
-#ifdef __has_attribute
-#define ABSL_HAVE_ATTRIBUTE(x) __has_attribute(x)
-#else
-#define ABSL_HAVE_ATTRIBUTE(x) 0
-#endif
-
-// ABSL_HAVE_CPP_ATTRIBUTE
-//
-// A function-like feature checking macro that accepts C++11 style attributes.
-// It's a wrapper around `__has_cpp_attribute`, defined by ISO C++ SD-6
-// (http://en.cppreference.com/w/cpp/experimental/feature_test). If we don't
-// find `__has_cpp_attribute`, will evaluate to 0.
-#if defined(__cplusplus) && defined(__has_cpp_attribute)
-// NOTE: requiring __cplusplus above should not be necessary, but
-// works around https://bugs.llvm.org/show_bug.cgi?id=23435.
-#define ABSL_HAVE_CPP_ATTRIBUTE(x) __has_cpp_attribute(x)
-#else
-#define ABSL_HAVE_CPP_ATTRIBUTE(x) 0
-#endif
-
-// -----------------------------------------------------------------------------
-// Function Attributes
-// -----------------------------------------------------------------------------
-//
-// GCC: https://gcc.gnu.org/onlinedocs/gcc/Function-Attributes.html
-// Clang: https://clang.llvm.org/docs/AttributeReference.html
-
-// ABSL_PRINTF_ATTRIBUTE
-// ABSL_SCANF_ATTRIBUTE
-//
-// Tells the compiler to perform `printf` format string checking if the
-// compiler supports it; see the 'format' attribute in
-// <http://gcc.gnu.org/onlinedocs/gcc-4.7.0/gcc/Function-Attributes.html>.
-//
-// Note: As the GCC manual states, "[s]ince non-static C++ methods
-// have an implicit 'this' argument, the arguments of such methods
-// should be counted from two, not one."
-#if ABSL_HAVE_ATTRIBUTE(format) || (defined(__GNUC__) && !defined(__clang__))
-#define ABSL_PRINTF_ATTRIBUTE(string_index, first_to_check) \
-  __attribute__((__format__(__printf__, string_index, first_to_check)))
-#define ABSL_SCANF_ATTRIBUTE(string_index, first_to_check) \
-  __attribute__((__format__(__scanf__, string_index, first_to_check)))
-#else
-#define ABSL_PRINTF_ATTRIBUTE(string_index, first_to_check)
-#define ABSL_SCANF_ATTRIBUTE(string_index, first_to_check)
-#endif
-
-// ABSL_ATTRIBUTE_ALWAYS_INLINE
-// ABSL_ATTRIBUTE_NOINLINE
-//
-// Forces functions to either inline or not inline. Introduced in gcc 3.1.
-#if ABSL_HAVE_ATTRIBUTE(always_inline) || \
-    (defined(__GNUC__) && !defined(__clang__))
-#define ABSL_ATTRIBUTE_ALWAYS_INLINE __attribute__((always_inline))
-#define ABSL_HAVE_ATTRIBUTE_ALWAYS_INLINE 1
-#else
-#define ABSL_ATTRIBUTE_ALWAYS_INLINE
-#endif
-
-#if ABSL_HAVE_ATTRIBUTE(noinline) || (defined(__GNUC__) && !defined(__clang__))
-#define ABSL_ATTRIBUTE_NOINLINE __attribute__((noinline))
-#define ABSL_HAVE_ATTRIBUTE_NOINLINE 1
-#else
-#define ABSL_ATTRIBUTE_NOINLINE
-#endif
-
-// ABSL_ATTRIBUTE_NO_TAIL_CALL
-//
-// Prevents the compiler from optimizing away stack frames for functions which
-// end in a call to another function.
-#if ABSL_HAVE_ATTRIBUTE(disable_tail_calls)
-#define ABSL_HAVE_ATTRIBUTE_NO_TAIL_CALL 1
-#define ABSL_ATTRIBUTE_NO_TAIL_CALL __attribute__((disable_tail_calls))
-#elif defined(__GNUC__) && !defined(__clang__)
-#define ABSL_HAVE_ATTRIBUTE_NO_TAIL_CALL 1
-#define ABSL_ATTRIBUTE_NO_TAIL_CALL \
-  __attribute__((optimize("no-optimize-sibling-calls")))
-#else
-#define ABSL_ATTRIBUTE_NO_TAIL_CALL
-#define ABSL_HAVE_ATTRIBUTE_NO_TAIL_CALL 0
-#endif
-
-// ABSL_ATTRIBUTE_WEAK
-//
-// Tags a function as weak for the purposes of compilation and linking.
-// Weak attributes currently do not work properly in LLVM's Windows backend,
-// so disable them there. See https://bugs.llvm.org/show_bug.cgi?id=37598
-// for futher information.
-#if (ABSL_HAVE_ATTRIBUTE(weak) || \
-     (defined(__GNUC__) && !defined(__clang__))) && \
-    !(defined(__llvm__) && defined(_WIN32))
-#undef ABSL_ATTRIBUTE_WEAK
-#define ABSL_ATTRIBUTE_WEAK __attribute__((weak))
-#define ABSL_HAVE_ATTRIBUTE_WEAK 1
-#else
-#define ABSL_ATTRIBUTE_WEAK
-#define ABSL_HAVE_ATTRIBUTE_WEAK 0
-#endif
-
-// ABSL_ATTRIBUTE_NONNULL
-//
-// Tells the compiler either (a) that a particular function parameter
-// should be a non-null pointer, or (b) that all pointer arguments should
-// be non-null.
-//
-// Note: As the GCC manual states, "[s]ince non-static C++ methods
-// have an implicit 'this' argument, the arguments of such methods
-// should be counted from two, not one."
-//
-// Args are indexed starting at 1.
-//
-// For non-static class member functions, the implicit `this` argument
-// is arg 1, and the first explicit argument is arg 2. For static class member
-// functions, there is no implicit `this`, and the first explicit argument is
-// arg 1.
-//
-// Example:
-//
-//   /* arg_a cannot be null, but arg_b can */
-//   void Function(void* arg_a, void* arg_b) ABSL_ATTRIBUTE_NONNULL(1);
-//
-//   class C {
-//     /* arg_a cannot be null, but arg_b can */
-//     void Method(void* arg_a, void* arg_b) ABSL_ATTRIBUTE_NONNULL(2);
-//
-//     /* arg_a cannot be null, but arg_b can */
-//     static void StaticMethod(void* arg_a, void* arg_b)
-//     ABSL_ATTRIBUTE_NONNULL(1);
-//   };
-//
-// If no arguments are provided, then all pointer arguments should be non-null.
-//
-//  /* No pointer arguments may be null. */
-//  void Function(void* arg_a, void* arg_b, int arg_c) ABSL_ATTRIBUTE_NONNULL();
-//
-// NOTE: The GCC nonnull attribute actually accepts a list of arguments, but
-// ABSL_ATTRIBUTE_NONNULL does not.
-#if ABSL_HAVE_ATTRIBUTE(nonnull) || (defined(__GNUC__) && !defined(__clang__))
-#define ABSL_ATTRIBUTE_NONNULL(arg_index) __attribute__((nonnull(arg_index)))
-#else
-#define ABSL_ATTRIBUTE_NONNULL(...)
-#endif
-
-// ABSL_ATTRIBUTE_NORETURN
-//
-// Tells the compiler that a given function never returns.
-#if ABSL_HAVE_ATTRIBUTE(noreturn) || (defined(__GNUC__) && !defined(__clang__))
-#define ABSL_ATTRIBUTE_NORETURN __attribute__((noreturn))
-#elif defined(_MSC_VER)
-#define ABSL_ATTRIBUTE_NORETURN __declspec(noreturn)
-#else
-#define ABSL_ATTRIBUTE_NORETURN
-#endif
-
-// ABSL_ATTRIBUTE_NO_SANITIZE_ADDRESS
-//
-// Tells the AddressSanitizer (or other memory testing tools) to ignore a given
-// function. Useful for cases when a function reads random locations on stack,
-// calls _exit from a cloned subprocess, deliberately accesses buffer
-// out of bounds or does other scary things with memory.
-// NOTE: GCC supports AddressSanitizer(asan) since 4.8.
-// https://gcc.gnu.org/gcc-4.8/changes.html
-#if defined(__GNUC__) && defined(ADDRESS_SANITIZER)
-#define ABSL_ATTRIBUTE_NO_SANITIZE_ADDRESS __attribute__((no_sanitize_address))
-#else
-#define ABSL_ATTRIBUTE_NO_SANITIZE_ADDRESS
-#endif
-
-// ABSL_ATTRIBUTE_NO_SANITIZE_MEMORY
-//
-// Tells the  MemorySanitizer to relax the handling of a given function. All
-// "Use of uninitialized value" warnings from such functions will be suppressed,
-// and all values loaded from memory will be considered fully initialized.
-// This attribute is similar to the ADDRESS_SANITIZER attribute above, but deals
-// with initialized-ness rather than addressability issues.
-// NOTE: MemorySanitizer(msan) is supported by Clang but not GCC.
-#if defined(__GNUC__) && defined(MEMORY_SANITIZER)
-#define ABSL_ATTRIBUTE_NO_SANITIZE_MEMORY __attribute__((no_sanitize_memory))
-#else
-#define ABSL_ATTRIBUTE_NO_SANITIZE_MEMORY
-#endif
-
-// ABSL_ATTRIBUTE_NO_SANITIZE_THREAD
-//
-// Tells the ThreadSanitizer to not instrument a given function.
-// NOTE: GCC supports ThreadSanitizer(tsan) since 4.8.
-// https://gcc.gnu.org/gcc-4.8/changes.html
-#if defined(__GNUC__) && defined(THREAD_SANITIZER)
-#define ABSL_ATTRIBUTE_NO_SANITIZE_THREAD __attribute__((no_sanitize_thread))
-#else
-#define ABSL_ATTRIBUTE_NO_SANITIZE_THREAD
-#endif
-
-// ABSL_ATTRIBUTE_NO_SANITIZE_UNDEFINED
-//
-// Tells the UndefinedSanitizer to ignore a given function. Useful for cases
-// where certain behavior (eg. division by zero) is being used intentionally.
-// NOTE: GCC supports UndefinedBehaviorSanitizer(ubsan) since 4.9.
-// https://gcc.gnu.org/gcc-4.9/changes.html
-#if defined(__GNUC__) && \
-    (defined(UNDEFINED_BEHAVIOR_SANITIZER) || defined(ADDRESS_SANITIZER))
-#define ABSL_ATTRIBUTE_NO_SANITIZE_UNDEFINED \
-  __attribute__((no_sanitize("undefined")))
-#else
-#define ABSL_ATTRIBUTE_NO_SANITIZE_UNDEFINED
-#endif
-
-// ABSL_ATTRIBUTE_NO_SANITIZE_CFI
-//
-// Tells the ControlFlowIntegrity sanitizer to not instrument a given function.
-// See https://clang.llvm.org/docs/ControlFlowIntegrity.html for details.
-#if defined(__GNUC__) && defined(CONTROL_FLOW_INTEGRITY)
-#define ABSL_ATTRIBUTE_NO_SANITIZE_CFI __attribute__((no_sanitize("cfi")))
-#else
-#define ABSL_ATTRIBUTE_NO_SANITIZE_CFI
-#endif
-
-// ABSL_ATTRIBUTE_RETURNS_NONNULL
-//
-// Tells the compiler that a particular function never returns a null pointer.
-#if ABSL_HAVE_ATTRIBUTE(returns_nonnull) || \
-    (defined(__GNUC__) && \
-     (__GNUC__ > 5 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 9)) && \
-     !defined(__clang__))
-#define ABSL_ATTRIBUTE_RETURNS_NONNULL __attribute__((returns_nonnull))
-#else
-#define ABSL_ATTRIBUTE_RETURNS_NONNULL
-#endif
-
-// ABSL_HAVE_ATTRIBUTE_SECTION
-//
-// Indicates whether labeled sections are supported. Weak symbol support is
-// a prerequisite. Labeled sections are not supported on Darwin/iOS.
-#ifdef ABSL_HAVE_ATTRIBUTE_SECTION
-#error ABSL_HAVE_ATTRIBUTE_SECTION cannot be directly set
-#elif (ABSL_HAVE_ATTRIBUTE(section) ||                \
-       (defined(__GNUC__) && !defined(__clang__))) && \
-    !defined(__APPLE__) && ABSL_HAVE_ATTRIBUTE_WEAK
-#define ABSL_HAVE_ATTRIBUTE_SECTION 1
-
-// ABSL_ATTRIBUTE_SECTION
-//
-// Tells the compiler/linker to put a given function into a section and define
-// `__start_ ## name` and `__stop_ ## name` symbols to bracket the section.
-// This functionality is supported by GNU linker.  Any function annotated with
-// `ABSL_ATTRIBUTE_SECTION` must not be inlined, or it will be placed into
-// whatever section its caller is placed into.
-//
-#ifndef ABSL_ATTRIBUTE_SECTION
-#define ABSL_ATTRIBUTE_SECTION(name) \
-  __attribute__((section(#name))) __attribute__((noinline))
-#endif
-
-
-// ABSL_ATTRIBUTE_SECTION_VARIABLE
-//
-// Tells the compiler/linker to put a given variable into a section and define
-// `__start_ ## name` and `__stop_ ## name` symbols to bracket the section.
-// This functionality is supported by GNU linker.
-#ifndef ABSL_ATTRIBUTE_SECTION_VARIABLE
-#define ABSL_ATTRIBUTE_SECTION_VARIABLE(name) __attribute__((section(#name)))
-#endif
-
-// ABSL_DECLARE_ATTRIBUTE_SECTION_VARS
-//
-// A weak section declaration to be used as a global declaration
-// for ABSL_ATTRIBUTE_SECTION_START|STOP(name) to compile and link
-// even without functions with ABSL_ATTRIBUTE_SECTION(name).
-// ABSL_DEFINE_ATTRIBUTE_SECTION should be in the exactly one file; it's
-// a no-op on ELF but not on Mach-O.
-//
-#ifndef ABSL_DECLARE_ATTRIBUTE_SECTION_VARS
-#define ABSL_DECLARE_ATTRIBUTE_SECTION_VARS(name) \
-  extern char __start_##name[] ABSL_ATTRIBUTE_WEAK;    \
-  extern char __stop_##name[] ABSL_ATTRIBUTE_WEAK
-#endif
-#ifndef ABSL_DEFINE_ATTRIBUTE_SECTION_VARS
-#define ABSL_INIT_ATTRIBUTE_SECTION_VARS(name)
-#define ABSL_DEFINE_ATTRIBUTE_SECTION_VARS(name)
-#endif
-
-// ABSL_ATTRIBUTE_SECTION_START
-//
-// Returns `void*` pointers to start/end of a section of code with
-// functions having ABSL_ATTRIBUTE_SECTION(name).
-// Returns 0 if no such functions exist.
-// One must ABSL_DECLARE_ATTRIBUTE_SECTION_VARS(name) for this to compile and
-// link.
-//
-#define ABSL_ATTRIBUTE_SECTION_START(name) \
-  (reinterpret_cast<void *>(__start_##name))
-#define ABSL_ATTRIBUTE_SECTION_STOP(name) \
-  (reinterpret_cast<void *>(__stop_##name))
-
-#else  // !ABSL_HAVE_ATTRIBUTE_SECTION
-
-#define ABSL_HAVE_ATTRIBUTE_SECTION 0
-
-// provide dummy definitions
-#define ABSL_ATTRIBUTE_SECTION(name)
-#define ABSL_ATTRIBUTE_SECTION_VARIABLE(name)
-#define ABSL_INIT_ATTRIBUTE_SECTION_VARS(name)
-#define ABSL_DEFINE_ATTRIBUTE_SECTION_VARS(name)
-#define ABSL_DECLARE_ATTRIBUTE_SECTION_VARS(name)
-#define ABSL_ATTRIBUTE_SECTION_START(name) (reinterpret_cast<void *>(0))
-#define ABSL_ATTRIBUTE_SECTION_STOP(name) (reinterpret_cast<void *>(0))
-
-#endif  // ABSL_ATTRIBUTE_SECTION
-
-// ABSL_ATTRIBUTE_STACK_ALIGN_FOR_OLD_LIBC
-//
-// Support for aligning the stack on 32-bit x86.
-#if ABSL_HAVE_ATTRIBUTE(force_align_arg_pointer) || \
-    (defined(__GNUC__) && !defined(__clang__))
-#if defined(__i386__)
-#define ABSL_ATTRIBUTE_STACK_ALIGN_FOR_OLD_LIBC \
-  __attribute__((force_align_arg_pointer))
-#define ABSL_REQUIRE_STACK_ALIGN_TRAMPOLINE (0)
-#elif defined(__x86_64__)
-#define ABSL_REQUIRE_STACK_ALIGN_TRAMPOLINE (1)
-#define ABSL_ATTRIBUTE_STACK_ALIGN_FOR_OLD_LIBC
-#else  // !__i386__ && !__x86_64
-#define ABSL_REQUIRE_STACK_ALIGN_TRAMPOLINE (0)
-#define ABSL_ATTRIBUTE_STACK_ALIGN_FOR_OLD_LIBC
-#endif  // __i386__
-#else
-#define ABSL_ATTRIBUTE_STACK_ALIGN_FOR_OLD_LIBC
-#define ABSL_REQUIRE_STACK_ALIGN_TRAMPOLINE (0)
-#endif
-
-// ABSL_MUST_USE_RESULT
-//
-// Tells the compiler to warn about unused results.
-//
-// When annotating a function, it must appear as the first part of the
-// declaration or definition. The compiler will warn if the return value from
-// such a function is unused:
-//
-//   ABSL_MUST_USE_RESULT Sprocket* AllocateSprocket();
-//   AllocateSprocket();  // Triggers a warning.
-//
-// When annotating a class, it is equivalent to annotating every function which
-// returns an instance.
-//
-//   class ABSL_MUST_USE_RESULT Sprocket {};
-//   Sprocket();  // Triggers a warning.
-//
-//   Sprocket MakeSprocket();
-//   MakeSprocket();  // Triggers a warning.
-//
-// Note that references and pointers are not instances:
-//
-//   Sprocket* SprocketPointer();
-//   SprocketPointer();  // Does *not* trigger a warning.
-//
-// ABSL_MUST_USE_RESULT allows using cast-to-void to suppress the unused result
-// warning. For that, warn_unused_result is used only for clang but not for gcc.
-// https://gcc.gnu.org/bugzilla/show_bug.cgi?id=66425
-//
-// Note: past advice was to place the macro after the argument list.
-#if ABSL_HAVE_ATTRIBUTE(nodiscard)
-#define ABSL_MUST_USE_RESULT [[nodiscard]]
-#elif defined(__clang__) && ABSL_HAVE_ATTRIBUTE(warn_unused_result)
-#define ABSL_MUST_USE_RESULT __attribute__((warn_unused_result))
-#else
-#define ABSL_MUST_USE_RESULT
-#endif
-
-// ABSL_ATTRIBUTE_HOT, ABSL_ATTRIBUTE_COLD
-//
-// Tells GCC that a function is hot or cold. GCC can use this information to
-// improve static analysis, i.e. a conditional branch to a cold function
-// is likely to be not-taken.
-// This annotation is used for function declarations.
-//
-// Example:
-//
-//   int foo() ABSL_ATTRIBUTE_HOT;
-#if ABSL_HAVE_ATTRIBUTE(hot) || (defined(__GNUC__) && !defined(__clang__))
-#define ABSL_ATTRIBUTE_HOT __attribute__((hot))
-#else
-#define ABSL_ATTRIBUTE_HOT
-#endif
-
-#if ABSL_HAVE_ATTRIBUTE(cold) || (defined(__GNUC__) && !defined(__clang__))
-#define ABSL_ATTRIBUTE_COLD __attribute__((cold))
-#else
-#define ABSL_ATTRIBUTE_COLD
-#endif
-
-// ABSL_XRAY_ALWAYS_INSTRUMENT, ABSL_XRAY_NEVER_INSTRUMENT, ABSL_XRAY_LOG_ARGS
-//
-// We define the ABSL_XRAY_ALWAYS_INSTRUMENT and ABSL_XRAY_NEVER_INSTRUMENT
-// macro used as an attribute to mark functions that must always or never be
-// instrumented by XRay. Currently, this is only supported in Clang/LLVM.
-//
-// For reference on the LLVM XRay instrumentation, see
-// http://llvm.org/docs/XRay.html.
-//
-// A function with the XRAY_ALWAYS_INSTRUMENT macro attribute in its declaration
-// will always get the XRay instrumentation sleds. These sleds may introduce
-// some binary size and runtime overhead and must be used sparingly.
-//
-// These attributes only take effect when the following conditions are met:
-//
-//   * The file/target is built in at least C++11 mode, with a Clang compiler
-//     that supports XRay attributes.
-//   * The file/target is built with the -fxray-instrument flag set for the
-//     Clang/LLVM compiler.
-//   * The function is defined in the translation unit (the compiler honors the
-//     attribute in either the definition or the declaration, and must match).
-//
-// There are cases when, even when building with XRay instrumentation, users
-// might want to control specifically which functions are instrumented for a
-// particular build using special-case lists provided to the compiler. These
-// special case lists are provided to Clang via the
-// -fxray-always-instrument=... and -fxray-never-instrument=... flags. The
-// attributes in source take precedence over these special-case lists.
-//
-// To disable the XRay attributes at build-time, users may define
-// ABSL_NO_XRAY_ATTRIBUTES. Do NOT define ABSL_NO_XRAY_ATTRIBUTES on specific
-// packages/targets, as this may lead to conflicting definitions of functions at
-// link-time.
-//
-#if ABSL_HAVE_CPP_ATTRIBUTE(clang::xray_always_instrument) && \
-    !defined(ABSL_NO_XRAY_ATTRIBUTES)
-#define ABSL_XRAY_ALWAYS_INSTRUMENT [[clang::xray_always_instrument]]
-#define ABSL_XRAY_NEVER_INSTRUMENT [[clang::xray_never_instrument]]
-#if ABSL_HAVE_CPP_ATTRIBUTE(clang::xray_log_args)
-#define ABSL_XRAY_LOG_ARGS(N) \
-    [[clang::xray_always_instrument, clang::xray_log_args(N)]]
-#else
-#define ABSL_XRAY_LOG_ARGS(N) [[clang::xray_always_instrument]]
-#endif
-#else
-#define ABSL_XRAY_ALWAYS_INSTRUMENT
-#define ABSL_XRAY_NEVER_INSTRUMENT
-#define ABSL_XRAY_LOG_ARGS(N)
-#endif
-
-// ABSL_ATTRIBUTE_REINITIALIZES
-//
-// Indicates that a member function reinitializes the entire object to a known
-// state, independent of the previous state of the object.
-//
-// The clang-tidy check bugprone-use-after-move allows member functions marked
-// with this attribute to be called on objects that have been moved from;
-// without the attribute, this would result in a use-after-move warning.
-#if ABSL_HAVE_CPP_ATTRIBUTE(clang::reinitializes)
-#define ABSL_ATTRIBUTE_REINITIALIZES [[clang::reinitializes]]
-#else
-#define ABSL_ATTRIBUTE_REINITIALIZES
-#endif
-
-// -----------------------------------------------------------------------------
-// Variable Attributes
-// -----------------------------------------------------------------------------
-
-// ABSL_ATTRIBUTE_UNUSED
-//
-// Prevents the compiler from complaining about variables that appear unused.
-#if ABSL_HAVE_ATTRIBUTE(unused) || (defined(__GNUC__) && !defined(__clang__))
-#undef ABSL_ATTRIBUTE_UNUSED
-#define ABSL_ATTRIBUTE_UNUSED __attribute__((__unused__))
-#else
-#define ABSL_ATTRIBUTE_UNUSED
-#endif
-
-// ABSL_ATTRIBUTE_INITIAL_EXEC
-//
-// Tells the compiler to use "initial-exec" mode for a thread-local variable.
-// See http://people.redhat.com/drepper/tls.pdf for the gory details.
-#if ABSL_HAVE_ATTRIBUTE(tls_model) || (defined(__GNUC__) && !defined(__clang__))
-#define ABSL_ATTRIBUTE_INITIAL_EXEC __attribute__((tls_model("initial-exec")))
-#else
-#define ABSL_ATTRIBUTE_INITIAL_EXEC
-#endif
-
-// ABSL_ATTRIBUTE_PACKED
-//
-// Prevents the compiler from padding a structure to natural alignment
-#if ABSL_HAVE_ATTRIBUTE(packed) || (defined(__GNUC__) && !defined(__clang__))
-#define ABSL_ATTRIBUTE_PACKED __attribute__((__packed__))
-#else
-#define ABSL_ATTRIBUTE_PACKED
-#endif
-
-// ABSL_ATTRIBUTE_FUNC_ALIGN
-//
-// Tells the compiler to align the function start at least to certain
-// alignment boundary
-#if ABSL_HAVE_ATTRIBUTE(aligned) || (defined(__GNUC__) && !defined(__clang__))
-#define ABSL_ATTRIBUTE_FUNC_ALIGN(bytes) __attribute__((aligned(bytes)))
-#else
-#define ABSL_ATTRIBUTE_FUNC_ALIGN(bytes)
-#endif
-
-// ABSL_CONST_INIT
-//
-// A variable declaration annotated with the `ABSL_CONST_INIT` attribute will
-// not compile (on supported platforms) unless the variable has a constant
-// initializer. This is useful for variables with static and thread storage
-// duration, because it guarantees that they will not suffer from the so-called
-// "static init order fiasco".  Prefer to put this attribute on the most visible
-// declaration of the variable, if there's more than one, because code that
-// accesses the variable can then use the attribute for optimization.
-//
-// Example:
-//
-//   class MyClass {
-//    public:
-//     ABSL_CONST_INIT static MyType my_var;
-//   };
-//
-//   MyType MyClass::my_var = MakeMyType(...);
-//
-// Note that this attribute is redundant if the variable is declared constexpr.
-#if ABSL_HAVE_CPP_ATTRIBUTE(clang::require_constant_initialization)
-// NOLINTNEXTLINE(whitespace/braces)
-#define ABSL_CONST_INIT [[clang::require_constant_initialization]]
-#else
-#define ABSL_CONST_INIT
-#endif  // ABSL_HAVE_CPP_ATTRIBUTE(clang::require_constant_initialization)
-
-#endif  // ABSL_BASE_ATTRIBUTES_H_
diff --git a/submodules/libtgvoip/webrtc_dsp/absl/base/config.h b/submodules/libtgvoip/webrtc_dsp/absl/base/config.h
deleted file mode 100755
index ca089f6d06..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/absl/base/config.h
+++ /dev/null
@@ -1,443 +0,0 @@
-//
-// Copyright 2017 The Abseil Authors.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-// -----------------------------------------------------------------------------
-// File: config.h
-// -----------------------------------------------------------------------------
-//
-// This header file defines a set of macros for checking the presence of
-// important compiler and platform features. Such macros can be used to
-// produce portable code by parameterizing compilation based on the presence or
-// lack of a given feature.
-//
-// We define a "feature" as some interface we wish to program to: for example,
-// a library function or system call. A value of `1` indicates support for
-// that feature; any other value indicates the feature support is undefined.
-//
-// Example:
-//
-// Suppose a programmer wants to write a program that uses the 'mmap()' system
-// call. The Abseil macro for that feature (`ABSL_HAVE_MMAP`) allows you to
-// selectively include the `mmap.h` header and bracket code using that feature
-// in the macro:
-//
-//   #include "absl/base/config.h"
-//
-//   #ifdef ABSL_HAVE_MMAP
-//   #include "sys/mman.h"
-//   #endif  //ABSL_HAVE_MMAP
-//
-//   ...
-//   #ifdef ABSL_HAVE_MMAP
-//   void *ptr = mmap(...);
-//   ...
-//   #endif  // ABSL_HAVE_MMAP
-
-#ifndef ABSL_BASE_CONFIG_H_
-#define ABSL_BASE_CONFIG_H_
-
-// Included for the __GLIBC__ macro (or similar macros on other systems).
-#include <limits.h>
-
-#ifdef __cplusplus
-// Included for __GLIBCXX__, _LIBCPP_VERSION
-#include <cstddef>
-#endif  // __cplusplus
-
-#if defined(__APPLE__)
-// Included for TARGET_OS_IPHONE, __IPHONE_OS_VERSION_MIN_REQUIRED,
-// __IPHONE_8_0.
-#include <Availability.h>
-#include <TargetConditionals.h>
-#endif
-
-#include "absl/base/policy_checks.h"
-
-// -----------------------------------------------------------------------------
-// Compiler Feature Checks
-// -----------------------------------------------------------------------------
-
-// ABSL_HAVE_BUILTIN()
-//
-// Checks whether the compiler supports a Clang Feature Checking Macro, and if
-// so, checks whether it supports the provided builtin function "x" where x
-// is one of the functions noted in
-// https://clang.llvm.org/docs/LanguageExtensions.html
-//
-// Note: Use this macro to avoid an extra level of #ifdef __has_builtin check.
-// http://releases.llvm.org/3.3/tools/clang/docs/LanguageExtensions.html
-#ifdef __has_builtin
-#define ABSL_HAVE_BUILTIN(x) __has_builtin(x)
-#else
-#define ABSL_HAVE_BUILTIN(x) 0
-#endif
-
-// ABSL_HAVE_TLS is defined to 1 when __thread should be supported.
-// We assume __thread is supported on Linux when compiled with Clang or compiled
-// against libstdc++ with _GLIBCXX_HAVE_TLS defined.
-#ifdef ABSL_HAVE_TLS
-#error ABSL_HAVE_TLS cannot be directly set
-#elif defined(__linux__) && (defined(__clang__) || defined(_GLIBCXX_HAVE_TLS))
-#define ABSL_HAVE_TLS 1
-#endif
-
-// ABSL_HAVE_STD_IS_TRIVIALLY_DESTRUCTIBLE
-//
-// Checks whether `std::is_trivially_destructible<T>` is supported.
-//
-// Notes: All supported compilers using libc++ support this feature, as does
-// gcc >= 4.8.1 using libstdc++, and Visual Studio.
-#ifdef ABSL_HAVE_STD_IS_TRIVIALLY_DESTRUCTIBLE
-#error ABSL_HAVE_STD_IS_TRIVIALLY_DESTRUCTIBLE cannot be directly set
-#elif defined(_LIBCPP_VERSION) ||                                        \
-    (!defined(__clang__) && defined(__GNUC__) && defined(__GLIBCXX__) && \
-     (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 8))) ||        \
-    defined(_MSC_VER)
-#define ABSL_HAVE_STD_IS_TRIVIALLY_DESTRUCTIBLE 1
-#endif
-
-// ABSL_HAVE_STD_IS_TRIVIALLY_CONSTRUCTIBLE
-//
-// Checks whether `std::is_trivially_default_constructible<T>` and
-// `std::is_trivially_copy_constructible<T>` are supported.
-
-// ABSL_HAVE_STD_IS_TRIVIALLY_ASSIGNABLE
-//
-// Checks whether `std::is_trivially_copy_assignable<T>` is supported.
-
-// Notes: Clang with libc++ supports these features, as does gcc >= 5.1 with
-// either libc++ or libstdc++, and Visual Studio.
-#if defined(ABSL_HAVE_STD_IS_TRIVIALLY_CONSTRUCTIBLE)
-#error ABSL_HAVE_STD_IS_TRIVIALLY_CONSTRUCTIBLE cannot be directly set
-#elif defined(ABSL_HAVE_STD_IS_TRIVIALLY_ASSIGNABLE)
-#error ABSL_HAVE_STD_IS_TRIVIALLY_ASSIGNABLE cannot directly set
-#elif (defined(__clang__) && defined(_LIBCPP_VERSION)) ||        \
-    (!defined(__clang__) && defined(__GNUC__) &&                 \
-     (__GNUC__ > 5 || (__GNUC__ == 5 && __GNUC_MINOR__ >= 1)) && \
-     (defined(_LIBCPP_VERSION) || defined(__GLIBCXX__))) ||      \
-    defined(_MSC_VER)
-#define ABSL_HAVE_STD_IS_TRIVIALLY_CONSTRUCTIBLE 1
-#define ABSL_HAVE_STD_IS_TRIVIALLY_ASSIGNABLE 1
-#endif
-
-// ABSL_HAVE_THREAD_LOCAL
-//
-// Checks whether C++11's `thread_local` storage duration specifier is
-// supported.
-#ifdef ABSL_HAVE_THREAD_LOCAL
-#error ABSL_HAVE_THREAD_LOCAL cannot be directly set
-#elif defined(__APPLE__)
-// Notes:
-// * Xcode's clang did not support `thread_local` until version 8, and
-//   even then not for all iOS < 9.0.
-// * Xcode 9.3 started disallowing `thread_local` for 32-bit iOS simulator
-//   targeting iOS 9.x.
-// * Xcode 10 moves the deployment target check for iOS < 9.0 to link time
-//   making __has_feature unreliable there.
-//
-// Otherwise, `__has_feature` is only supported by Clang so it has be inside
-// `defined(__APPLE__)` check.
-#if __has_feature(cxx_thread_local) && \
-    !(TARGET_OS_IPHONE && __IPHONE_OS_VERSION_MIN_REQUIRED < __IPHONE_9_0)
-#define ABSL_HAVE_THREAD_LOCAL 1
-#endif
-#else  // !defined(__APPLE__)
-#define ABSL_HAVE_THREAD_LOCAL 1
-#endif
-
-// There are platforms for which TLS should not be used even though the compiler
-// makes it seem like it's supported (Android NDK < r12b for example).
-// This is primarily because of linker problems and toolchain misconfiguration:
-// Abseil does not intend to support this indefinitely. Currently, the newest
-// toolchain that we intend to support that requires this behavior is the
-// r11 NDK - allowing for a 5 year support window on that means this option
-// is likely to be removed around June of 2021.
-// TLS isn't supported until NDK r12b per
-// https://developer.android.com/ndk/downloads/revision_history.html
-// Since NDK r16, `__NDK_MAJOR__` and `__NDK_MINOR__` are defined in
-// <android/ndk-version.h>. For NDK < r16, users should define these macros,
-// e.g. `-D__NDK_MAJOR__=11 -D__NKD_MINOR__=0` for NDK r11.
-#if defined(__ANDROID__) && defined(__clang__)
-#if __has_include(<android/ndk-version.h>)
-#include <android/ndk-version.h>
-#endif  // __has_include(<android/ndk-version.h>)
-#if defined(__ANDROID__) && defined(__clang__) && defined(__NDK_MAJOR__) && \
-    defined(__NDK_MINOR__) &&                                               \
-    ((__NDK_MAJOR__ < 12) || ((__NDK_MAJOR__ == 12) && (__NDK_MINOR__ < 1)))
-#undef ABSL_HAVE_TLS
-#undef ABSL_HAVE_THREAD_LOCAL
-#endif
-#endif  // defined(__ANDROID__) && defined(__clang__)
-
-// ABSL_HAVE_INTRINSIC_INT128
-//
-// Checks whether the __int128 compiler extension for a 128-bit integral type is
-// supported.
-//
-// Note: __SIZEOF_INT128__ is defined by Clang and GCC when __int128 is
-// supported, but we avoid using it in certain cases:
-// * On Clang:
-//   * Building using Clang for Windows, where the Clang runtime library has
-//     128-bit support only on LP64 architectures, but Windows is LLP64.
-//   * Building for aarch64, where __int128 exists but has exhibits a sporadic
-//     compiler crashing bug.
-// * On Nvidia's nvcc:
-//   * nvcc also defines __GNUC__ and __SIZEOF_INT128__, but not all versions
-//     actually support __int128.
-#ifdef ABSL_HAVE_INTRINSIC_INT128
-#error ABSL_HAVE_INTRINSIC_INT128 cannot be directly set
-#elif defined(__SIZEOF_INT128__)
-#if (defined(__clang__) && !defined(_WIN32) && !defined(__aarch64__)) || \
-    (defined(__CUDACC__) && __CUDACC_VER_MAJOR__ >= 9) ||                \
-    (defined(__GNUC__) && !defined(__clang__) && !defined(__CUDACC__))
-#define ABSL_HAVE_INTRINSIC_INT128 1
-#elif defined(__CUDACC__)
-// __CUDACC_VER__ is a full version number before CUDA 9, and is defined to a
-// string explaining that it has been removed starting with CUDA 9. We use
-// nested #ifs because there is no short-circuiting in the preprocessor.
-// NOTE: `__CUDACC__` could be undefined while `__CUDACC_VER__` is defined.
-#if __CUDACC_VER__ >= 70000
-#define ABSL_HAVE_INTRINSIC_INT128 1
-#endif  // __CUDACC_VER__ >= 70000
-#endif  // defined(__CUDACC__)
-#endif  // ABSL_HAVE_INTRINSIC_INT128
-
-// ABSL_HAVE_EXCEPTIONS
-//
-// Checks whether the compiler both supports and enables exceptions. Many
-// compilers support a "no exceptions" mode that disables exceptions.
-//
-// Generally, when ABSL_HAVE_EXCEPTIONS is not defined:
-//
-// * Code using `throw` and `try` may not compile.
-// * The `noexcept` specifier will still compile and behave as normal.
-// * The `noexcept` operator may still return `false`.
-//
-// For further details, consult the compiler's documentation.
-#ifdef ABSL_HAVE_EXCEPTIONS
-#error ABSL_HAVE_EXCEPTIONS cannot be directly set.
-
-#elif defined(__clang__)
-// TODO(calabrese)
-// Switch to using __cpp_exceptions when we no longer support versions < 3.6.
-// For details on this check, see:
-//   http://releases.llvm.org/3.6.0/tools/clang/docs/ReleaseNotes.html#the-exceptions-macro
-#if defined(__EXCEPTIONS) && __has_feature(cxx_exceptions)
-#define ABSL_HAVE_EXCEPTIONS 1
-#endif  // defined(__EXCEPTIONS) && __has_feature(cxx_exceptions)
-
-// Handle remaining special cases and default to exceptions being supported.
-#elif !(defined(__GNUC__) && (__GNUC__ < 5) && !defined(__EXCEPTIONS)) &&    \
-    !(defined(__GNUC__) && (__GNUC__ >= 5) && !defined(__cpp_exceptions)) && \
-    !(defined(_MSC_VER) && !defined(_CPPUNWIND))
-#define ABSL_HAVE_EXCEPTIONS 1
-#endif
-
-// -----------------------------------------------------------------------------
-// Platform Feature Checks
-// -----------------------------------------------------------------------------
-
-// Currently supported operating systems and associated preprocessor
-// symbols:
-//
-//   Linux and Linux-derived           __linux__
-//   Android                           __ANDROID__ (implies __linux__)
-//   Linux (non-Android)               __linux__ && !__ANDROID__
-//   Darwin (Mac OS X and iOS)         __APPLE__
-//   Akaros (http://akaros.org)        __ros__
-//   Windows                           _WIN32
-//   NaCL                              __native_client__
-//   AsmJS                             __asmjs__
-//   WebAssembly                       __wasm__
-//   Fuchsia                           __Fuchsia__
-//
-// Note that since Android defines both __ANDROID__ and __linux__, one
-// may probe for either Linux or Android by simply testing for __linux__.
-
-// ABSL_HAVE_MMAP
-//
-// Checks whether the platform has an mmap(2) implementation as defined in
-// POSIX.1-2001.
-#ifdef ABSL_HAVE_MMAP
-#error ABSL_HAVE_MMAP cannot be directly set
-#elif defined(__linux__) || defined(__APPLE__) || defined(__FreeBSD__) ||   \
-    defined(__ros__) || defined(__native_client__) || defined(__asmjs__) || \
-    defined(__wasm__) || defined(__Fuchsia__) || defined(__sun) || \
-    defined(__ASYLO__)
-#define ABSL_HAVE_MMAP 1
-#endif
-
-// ABSL_HAVE_PTHREAD_GETSCHEDPARAM
-//
-// Checks whether the platform implements the pthread_(get|set)schedparam(3)
-// functions as defined in POSIX.1-2001.
-#ifdef ABSL_HAVE_PTHREAD_GETSCHEDPARAM
-#error ABSL_HAVE_PTHREAD_GETSCHEDPARAM cannot be directly set
-#elif defined(__linux__) || defined(__APPLE__) || defined(__FreeBSD__) || \
-    defined(__ros__)
-#define ABSL_HAVE_PTHREAD_GETSCHEDPARAM 1
-#endif
-
-// ABSL_HAVE_SCHED_YIELD
-//
-// Checks whether the platform implements sched_yield(2) as defined in
-// POSIX.1-2001.
-#ifdef ABSL_HAVE_SCHED_YIELD
-#error ABSL_HAVE_SCHED_YIELD cannot be directly set
-#elif defined(__linux__) || defined(__ros__) || defined(__native_client__)
-#define ABSL_HAVE_SCHED_YIELD 1
-#endif
-
-// ABSL_HAVE_SEMAPHORE_H
-//
-// Checks whether the platform supports the <semaphore.h> header and sem_open(3)
-// family of functions as standardized in POSIX.1-2001.
-//
-// Note: While Apple provides <semaphore.h> for both iOS and macOS, it is
-// explicitly deprecated and will cause build failures if enabled for those
-// platforms.  We side-step the issue by not defining it here for Apple
-// platforms.
-#ifdef ABSL_HAVE_SEMAPHORE_H
-#error ABSL_HAVE_SEMAPHORE_H cannot be directly set
-#elif defined(__linux__) || defined(__ros__)
-#define ABSL_HAVE_SEMAPHORE_H 1
-#endif
-
-// ABSL_HAVE_ALARM
-//
-// Checks whether the platform supports the <signal.h> header and alarm(2)
-// function as standardized in POSIX.1-2001.
-#ifdef ABSL_HAVE_ALARM
-#error ABSL_HAVE_ALARM cannot be directly set
-#elif defined(__GOOGLE_GRTE_VERSION__)
-// feature tests for Google's GRTE
-#define ABSL_HAVE_ALARM 1
-#elif defined(__GLIBC__)
-// feature test for glibc
-#define ABSL_HAVE_ALARM 1
-#elif defined(_MSC_VER)
-// feature tests for Microsoft's library
-#elif defined(__EMSCRIPTEN__)
-// emscripten doesn't support signals
-#elif defined(__native_client__)
-#else
-// other standard libraries
-#define ABSL_HAVE_ALARM 1
-#endif
-
-// ABSL_IS_LITTLE_ENDIAN
-// ABSL_IS_BIG_ENDIAN
-//
-// Checks the endianness of the platform.
-//
-// Notes: uses the built in endian macros provided by GCC (since 4.6) and
-// Clang (since 3.2); see
-// https://gcc.gnu.org/onlinedocs/cpp/Common-Predefined-Macros.html.
-// Otherwise, if _WIN32, assume little endian. Otherwise, bail with an error.
-#if defined(ABSL_IS_BIG_ENDIAN)
-#error "ABSL_IS_BIG_ENDIAN cannot be directly set."
-#endif
-#if defined(ABSL_IS_LITTLE_ENDIAN)
-#error "ABSL_IS_LITTLE_ENDIAN cannot be directly set."
-#endif
-
-#if (defined(__BYTE_ORDER__) && defined(__ORDER_LITTLE_ENDIAN__) && \
-     __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__)
-#define ABSL_IS_LITTLE_ENDIAN 1
-#elif defined(__BYTE_ORDER__) && defined(__ORDER_BIG_ENDIAN__) && \
-    __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
-#define ABSL_IS_BIG_ENDIAN 1
-#elif defined(_WIN32)
-#define ABSL_IS_LITTLE_ENDIAN 1
-#else
-#error "absl endian detection needs to be set up for your compiler"
-#endif
-
-// ABSL_HAVE_STD_ANY
-//
-// Checks whether C++17 std::any is available by checking whether <any> exists.
-#ifdef ABSL_HAVE_STD_ANY
-#error "ABSL_HAVE_STD_ANY cannot be directly set."
-#endif
-
-#ifdef __has_include
-#if __has_include(<any>) && __cplusplus >= 201703L
-#define ABSL_HAVE_STD_ANY 1
-#endif
-#endif
-
-// ABSL_HAVE_STD_OPTIONAL
-//
-// Checks whether C++17 std::optional is available.
-#ifdef ABSL_HAVE_STD_OPTIONAL
-#error "ABSL_HAVE_STD_OPTIONAL cannot be directly set."
-#endif
-
-#ifdef __has_include
-#if __has_include(<optional>) && __cplusplus >= 201703L
-#define ABSL_HAVE_STD_OPTIONAL 1
-#endif
-#endif
-
-// ABSL_HAVE_STD_VARIANT
-//
-// Checks whether C++17 std::variant is available.
-#ifdef ABSL_HAVE_STD_VARIANT
-#error "ABSL_HAVE_STD_VARIANT cannot be directly set."
-#endif
-
-#ifdef __has_include
-#if __has_include(<variant>) && __cplusplus >= 201703L
-#define ABSL_HAVE_STD_VARIANT 1
-#endif
-#endif
-
-// ABSL_HAVE_STD_STRING_VIEW
-//
-// Checks whether C++17 std::string_view is available.
-#ifdef ABSL_HAVE_STD_STRING_VIEW
-#error "ABSL_HAVE_STD_STRING_VIEW cannot be directly set."
-#endif
-
-#ifdef __has_include
-#if __has_include(<string_view>) && __cplusplus >= 201703L
-#define ABSL_HAVE_STD_STRING_VIEW 1
-#endif
-#endif
-
-// For MSVC, `__has_include` is supported in VS 2017 15.3, which is later than
-// the support for <optional>, <any>, <string_view>, <variant>. So we use
-// _MSC_VER to check whether we have VS 2017 RTM (when <optional>, <any>,
-// <string_view>, <variant> is implemented) or higher. Also, `__cplusplus` is
-// not correctly set by MSVC, so we use `_MSVC_LANG` to check the language
-// version.
-// TODO(zhangxy): fix tests before enabling aliasing for `std::any`.
-#if defined(_MSC_VER) && _MSC_VER >= 1910 && \
-    ((defined(_MSVC_LANG) && _MSVC_LANG > 201402) || __cplusplus > 201402)
-// #define ABSL_HAVE_STD_ANY 1
-#define ABSL_HAVE_STD_OPTIONAL 1
-#define ABSL_HAVE_STD_VARIANT 1
-#define ABSL_HAVE_STD_STRING_VIEW 1
-#endif
-
-// In debug mode, MSVC 2017's std::variant throws a EXCEPTION_ACCESS_VIOLATION
-// SEH exception from emplace for variant<SomeStruct> when constructing the
-// struct can throw. This defeats some of variant_test and
-// variant_exception_safety_test.
-#if defined(_MSC_VER) && _MSC_VER >= 1700 && defined(_DEBUG)
-#define ABSL_INTERNAL_MSVC_2017_DBG_MODE
-#endif
-
-#endif  // ABSL_BASE_CONFIG_H_
diff --git a/submodules/libtgvoip/webrtc_dsp/absl/base/internal/atomic_hook.h b/submodules/libtgvoip/webrtc_dsp/absl/base/internal/atomic_hook.h
deleted file mode 100755
index b458511b0c..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/absl/base/internal/atomic_hook.h
+++ /dev/null
@@ -1,165 +0,0 @@
-// Copyright 2017 The Abseil Authors.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-
-#ifndef ABSL_BASE_INTERNAL_ATOMIC_HOOK_H_
-#define ABSL_BASE_INTERNAL_ATOMIC_HOOK_H_
-
-#include <atomic>
-#include <cassert>
-#include <cstdint>
-#include <utility>
-
-#ifdef _MSC_FULL_VER
-#define ABSL_HAVE_WORKING_ATOMIC_POINTER 0
-#else
-#define ABSL_HAVE_WORKING_ATOMIC_POINTER 1
-#endif
-
-namespace absl {
-namespace base_internal {
-
-template <typename T>
-class AtomicHook;
-
-// AtomicHook is a helper class, templatized on a raw function pointer type, for
-// implementing Abseil customization hooks.  It is a callable object that
-// dispatches to the registered hook.
-//
-// A default constructed object performs a no-op (and returns a default
-// constructed object) if no hook has been registered.
-//
-// Hooks can be pre-registered via constant initialization, for example,
-// ABSL_CONST_INIT static AtomicHook<void(*)()> my_hook(DefaultAction);
-// and then changed at runtime via a call to Store().
-//
-// Reads and writes guarantee memory_order_acquire/memory_order_release
-// semantics.
-template <typename ReturnType, typename... Args>
-class AtomicHook<ReturnType (*)(Args...)> {
- public:
-  using FnPtr = ReturnType (*)(Args...);
-
-  // Constructs an object that by default performs a no-op (and
-  // returns a default constructed object) when no hook as been registered.
-  constexpr AtomicHook() : AtomicHook(DummyFunction) {}
-
-  // Constructs an object that by default dispatches to/returns the
-  // pre-registered default_fn when no hook has been registered at runtime.
-#if ABSL_HAVE_WORKING_ATOMIC_POINTER
-  explicit constexpr AtomicHook(FnPtr default_fn)
-      : hook_(default_fn), default_fn_(default_fn) {}
-#else
-  explicit constexpr AtomicHook(FnPtr default_fn)
-      : hook_(kUninitialized), default_fn_(default_fn) {}
-#endif
-
-  // Stores the provided function pointer as the value for this hook.
-  //
-  // This is intended to be called once.  Multiple calls are legal only if the
-  // same function pointer is provided for each call.  The store is implemented
-  // as a memory_order_release operation, and read accesses are implemented as
-  // memory_order_acquire.
-  void Store(FnPtr fn) {
-    bool success = DoStore(fn);
-    static_cast<void>(success);
-    assert(success);
-  }
-
-  // Invokes the registered callback.  If no callback has yet been registered, a
-  // default-constructed object of the appropriate type is returned instead.
-  template <typename... CallArgs>
-  ReturnType operator()(CallArgs&&... args) const {
-    return DoLoad()(std::forward<CallArgs>(args)...);
-  }
-
-  // Returns the registered callback, or nullptr if none has been registered.
-  // Useful if client code needs to conditionalize behavior based on whether a
-  // callback was registered.
-  //
-  // Note that atomic_hook.Load()() and atomic_hook() have different semantics:
-  // operator()() will perform a no-op if no callback was registered, while
-  // Load()() will dereference a null function pointer.  Prefer operator()() to
-  // Load()() unless you must conditionalize behavior on whether a hook was
-  // registered.
-  FnPtr Load() const {
-    FnPtr ptr = DoLoad();
-    return (ptr == DummyFunction) ? nullptr : ptr;
-  }
-
- private:
-  static ReturnType DummyFunction(Args...) {
-    return ReturnType();
-  }
-
-  // Current versions of MSVC (as of September 2017) have a broken
-  // implementation of std::atomic<T*>:  Its constructor attempts to do the
-  // equivalent of a reinterpret_cast in a constexpr context, which is not
-  // allowed.
-  //
-  // This causes an issue when building with LLVM under Windows.  To avoid this,
-  // we use a less-efficient, intptr_t-based implementation on Windows.
-#if ABSL_HAVE_WORKING_ATOMIC_POINTER
-  // Return the stored value, or DummyFunction if no value has been stored.
-  FnPtr DoLoad() const { return hook_.load(std::memory_order_acquire); }
-
-  // Store the given value.  Returns false if a different value was already
-  // stored to this object.
-  bool DoStore(FnPtr fn) {
-    assert(fn);
-    FnPtr expected = default_fn_;
-    const bool store_succeeded = hook_.compare_exchange_strong(
-        expected, fn, std::memory_order_acq_rel, std::memory_order_acquire);
-    const bool same_value_already_stored = (expected == fn);
-    return store_succeeded || same_value_already_stored;
-  }
-
-  std::atomic<FnPtr> hook_;
-#else  // !ABSL_HAVE_WORKING_ATOMIC_POINTER
-  // Use a sentinel value unlikely to be the address of an actual function.
-  static constexpr intptr_t kUninitialized = 0;
-
-  static_assert(sizeof(intptr_t) >= sizeof(FnPtr),
-                "intptr_t can't contain a function pointer");
-
-  FnPtr DoLoad() const {
-    const intptr_t value = hook_.load(std::memory_order_acquire);
-    if (value == kUninitialized) {
-      return default_fn_;
-    }
-    return reinterpret_cast<FnPtr>(value);
-  }
-
-  bool DoStore(FnPtr fn) {
-    assert(fn);
-    const auto value = reinterpret_cast<intptr_t>(fn);
-    intptr_t expected = kUninitialized;
-    const bool store_succeeded = hook_.compare_exchange_strong(
-        expected, value, std::memory_order_acq_rel, std::memory_order_acquire);
-    const bool same_value_already_stored = (expected == value);
-    return store_succeeded || same_value_already_stored;
-  }
-
-  std::atomic<intptr_t> hook_;
-#endif
-
-  const FnPtr default_fn_;
-};
-
-#undef ABSL_HAVE_WORKING_ATOMIC_POINTER
-
-}  // namespace base_internal
-}  // namespace absl
-
-#endif  // ABSL_BASE_INTERNAL_ATOMIC_HOOK_H_
diff --git a/submodules/libtgvoip/webrtc_dsp/absl/base/internal/identity.h b/submodules/libtgvoip/webrtc_dsp/absl/base/internal/identity.h
deleted file mode 100755
index a1a5d70a84..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/absl/base/internal/identity.h
+++ /dev/null
@@ -1,33 +0,0 @@
-// Copyright 2017 The Abseil Authors.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-
-#ifndef ABSL_BASE_INTERNAL_IDENTITY_H_
-#define ABSL_BASE_INTERNAL_IDENTITY_H_
-
-namespace absl {
-namespace internal {
-
-template <typename T>
-struct identity {
-  typedef T type;
-};
-
-template <typename T>
-using identity_t = typename identity<T>::type;
-
-}  // namespace internal
-}  // namespace absl
-
-#endif  // ABSL_BASE_INTERNAL_IDENTITY_H_
diff --git a/submodules/libtgvoip/webrtc_dsp/absl/base/internal/inline_variable.h b/submodules/libtgvoip/webrtc_dsp/absl/base/internal/inline_variable.h
deleted file mode 100755
index f7bb8c5652..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/absl/base/internal/inline_variable.h
+++ /dev/null
@@ -1,107 +0,0 @@
-// Copyright 2017 The Abseil Authors.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef ABSL_BASE_INTERNAL_INLINE_VARIABLE_EMULATION_H_
-#define ABSL_BASE_INTERNAL_INLINE_VARIABLE_EMULATION_H_
-
-#include <type_traits>
-
-#include "absl/base/internal/identity.h"
-
-// File:
-//   This file define a macro that allows the creation of or emulation of C++17
-//   inline variables based on whether or not the feature is supported.
-
-////////////////////////////////////////////////////////////////////////////////
-// Macro: ABSL_INTERNAL_INLINE_CONSTEXPR(type, name, init)
-//
-// Description:
-//   Expands to the equivalent of an inline constexpr instance of the specified
-//   `type` and `name`, initialized to the value `init`. If the compiler being
-//   used is detected as supporting actual inline variables as a language
-//   feature, then the macro expands to an actual inline variable definition.
-//
-// Requires:
-//   `type` is a type that is usable in an extern variable declaration.
-//
-// Requires: `name` is a valid identifier
-//
-// Requires:
-//   `init` is an expression that can be used in the following definition:
-//     constexpr type name = init;
-//
-// Usage:
-//
-//   // Equivalent to: `inline constexpr size_t variant_npos = -1;`
-//   ABSL_INTERNAL_INLINE_CONSTEXPR(size_t, variant_npos, -1);
-//
-// Differences in implementation:
-//   For a direct, language-level inline variable, decltype(name) will be the
-//   type that was specified along with const qualification, whereas for
-//   emulated inline variables, decltype(name) may be different (in practice
-//   it will likely be a reference type).
-////////////////////////////////////////////////////////////////////////////////
-
-#ifdef __cpp_inline_variables
-
-// Clang's -Wmissing-variable-declarations option erroneously warned that
-// inline constexpr objects need to be pre-declared. This has now been fixed,
-// but we will need to support this workaround for people building with older
-// versions of clang.
-//
-// Bug: https://bugs.llvm.org/show_bug.cgi?id=35862
-//
-// Note:
-//   identity_t is used here so that the const and name are in the
-//   appropriate place for pointer types, reference types, function pointer
-//   types, etc..
-#if defined(__clang__)
-#define ABSL_INTERNAL_EXTERN_DECL(type, name) \
-  extern const ::absl::internal::identity_t<type> name;
-#else  // Otherwise, just define the macro to do nothing.
-#define ABSL_INTERNAL_EXTERN_DECL(type, name)
-#endif  // defined(__clang__)
-
-// See above comment at top of file for details.
-#define ABSL_INTERNAL_INLINE_CONSTEXPR(type, name, init) \
-  ABSL_INTERNAL_EXTERN_DECL(type, name)                  \
-  inline constexpr ::absl::internal::identity_t<type> name = init
-
-#else
-
-// See above comment at top of file for details.
-//
-// Note:
-//   identity_t is used here so that the const and name are in the
-//   appropriate place for pointer types, reference types, function pointer
-//   types, etc..
-#define ABSL_INTERNAL_INLINE_CONSTEXPR(var_type, name, init)                  \
-  template <class /*AbslInternalDummy*/ = void>                               \
-  struct AbslInternalInlineVariableHolder##name {                             \
-    static constexpr ::absl::internal::identity_t<var_type> kInstance = init; \
-  };                                                                          \
-                                                                              \
-  template <class AbslInternalDummy>                                          \
-  constexpr ::absl::internal::identity_t<var_type>                            \
-      AbslInternalInlineVariableHolder##name<AbslInternalDummy>::kInstance;   \
-                                                                              \
-  static constexpr const ::absl::internal::identity_t<var_type>&              \
-      name = /* NOLINT */                                                     \
-      AbslInternalInlineVariableHolder##name<>::kInstance;                    \
-  static_assert(sizeof(void (*)(decltype(name))) != 0,                        \
-                "Silence unused variable warnings.")
-
-#endif  // __cpp_inline_variables
-
-#endif  // ABSL_BASE_INTERNAL_INLINE_VARIABLE_EMULATION_H_
diff --git a/submodules/libtgvoip/webrtc_dsp/absl/base/internal/invoke.h b/submodules/libtgvoip/webrtc_dsp/absl/base/internal/invoke.h
deleted file mode 100755
index 8c3f4f6063..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/absl/base/internal/invoke.h
+++ /dev/null
@@ -1,188 +0,0 @@
-// Copyright 2017 The Abseil Authors.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-// absl::base_internal::Invoke(f, args...) is an implementation of
-// INVOKE(f, args...) from section [func.require] of the C++ standard.
-//
-// [func.require]
-// Define INVOKE (f, t1, t2, ..., tN) as follows:
-// 1. (t1.*f)(t2, ..., tN) when f is a pointer to a member function of a class T
-//    and t1 is an object of type T or a reference to an object of type T or a
-//    reference to an object of a type derived from T;
-// 2. ((*t1).*f)(t2, ..., tN) when f is a pointer to a member function of a
-//    class T and t1 is not one of the types described in the previous item;
-// 3. t1.*f when N == 1 and f is a pointer to member data of a class T and t1 is
-//    an object of type T or a reference to an object of type T or a reference
-//    to an object of a type derived from T;
-// 4. (*t1).*f when N == 1 and f is a pointer to member data of a class T and t1
-//    is not one of the types described in the previous item;
-// 5. f(t1, t2, ..., tN) in all other cases.
-//
-// The implementation is SFINAE-friendly: substitution failure within Invoke()
-// isn't an error.
-
-#ifndef ABSL_BASE_INTERNAL_INVOKE_H_
-#define ABSL_BASE_INTERNAL_INVOKE_H_
-
-#include <algorithm>
-#include <type_traits>
-#include <utility>
-
-// The following code is internal implementation detail.  See the comment at the
-// top of this file for the API documentation.
-
-namespace absl {
-namespace base_internal {
-
-// The five classes below each implement one of the clauses from the definition
-// of INVOKE. The inner class template Accept<F, Args...> checks whether the
-// clause is applicable; static function template Invoke(f, args...) does the
-// invocation.
-//
-// By separating the clause selection logic from invocation we make sure that
-// Invoke() does exactly what the standard says.
-
-template <typename Derived>
-struct StrippedAccept {
-  template <typename... Args>
-  struct Accept : Derived::template AcceptImpl<typename std::remove_cv<
-                      typename std::remove_reference<Args>::type>::type...> {};
-};
-
-// (t1.*f)(t2, ..., tN) when f is a pointer to a member function of a class T
-// and t1 is an object of type T or a reference to an object of type T or a
-// reference to an object of a type derived from T.
-struct MemFunAndRef : StrippedAccept<MemFunAndRef> {
-  template <typename... Args>
-  struct AcceptImpl : std::false_type {};
-
-  template <typename R, typename C, typename... Params, typename Obj,
-            typename... Args>
-  struct AcceptImpl<R (C::*)(Params...), Obj, Args...>
-      : std::is_base_of<C, Obj> {};
-
-  template <typename R, typename C, typename... Params, typename Obj,
-            typename... Args>
-  struct AcceptImpl<R (C::*)(Params...) const, Obj, Args...>
-      : std::is_base_of<C, Obj> {};
-
-  template <typename MemFun, typename Obj, typename... Args>
-  static decltype((std::declval<Obj>().*
-                   std::declval<MemFun>())(std::declval<Args>()...))
-  Invoke(MemFun&& mem_fun, Obj&& obj, Args&&... args) {
-    return (std::forward<Obj>(obj).*
-            std::forward<MemFun>(mem_fun))(std::forward<Args>(args)...);
-  }
-};
-
-// ((*t1).*f)(t2, ..., tN) when f is a pointer to a member function of a
-// class T and t1 is not one of the types described in the previous item.
-struct MemFunAndPtr : StrippedAccept<MemFunAndPtr> {
-  template <typename... Args>
-  struct AcceptImpl : std::false_type {};
-
-  template <typename R, typename C, typename... Params, typename Ptr,
-            typename... Args>
-  struct AcceptImpl<R (C::*)(Params...), Ptr, Args...>
-      : std::integral_constant<bool, !std::is_base_of<C, Ptr>::value> {};
-
-  template <typename R, typename C, typename... Params, typename Ptr,
-            typename... Args>
-  struct AcceptImpl<R (C::*)(Params...) const, Ptr, Args...>
-      : std::integral_constant<bool, !std::is_base_of<C, Ptr>::value> {};
-
-  template <typename MemFun, typename Ptr, typename... Args>
-  static decltype(((*std::declval<Ptr>()).*
-                   std::declval<MemFun>())(std::declval<Args>()...))
-  Invoke(MemFun&& mem_fun, Ptr&& ptr, Args&&... args) {
-    return ((*std::forward<Ptr>(ptr)).*
-            std::forward<MemFun>(mem_fun))(std::forward<Args>(args)...);
-  }
-};
-
-// t1.*f when N == 1 and f is a pointer to member data of a class T and t1 is
-// an object of type T or a reference to an object of type T or a reference
-// to an object of a type derived from T.
-struct DataMemAndRef : StrippedAccept<DataMemAndRef> {
-  template <typename... Args>
-  struct AcceptImpl : std::false_type {};
-
-  template <typename R, typename C, typename Obj>
-  struct AcceptImpl<R C::*, Obj> : std::is_base_of<C, Obj> {};
-
-  template <typename DataMem, typename Ref>
-  static decltype(std::declval<Ref>().*std::declval<DataMem>()) Invoke(
-      DataMem&& data_mem, Ref&& ref) {
-    return std::forward<Ref>(ref).*std::forward<DataMem>(data_mem);
-  }
-};
-
-// (*t1).*f when N == 1 and f is a pointer to member data of a class T and t1
-// is not one of the types described in the previous item.
-struct DataMemAndPtr : StrippedAccept<DataMemAndPtr> {
-  template <typename... Args>
-  struct AcceptImpl : std::false_type {};
-
-  template <typename R, typename C, typename Ptr>
-  struct AcceptImpl<R C::*, Ptr>
-      : std::integral_constant<bool, !std::is_base_of<C, Ptr>::value> {};
-
-  template <typename DataMem, typename Ptr>
-  static decltype((*std::declval<Ptr>()).*std::declval<DataMem>()) Invoke(
-      DataMem&& data_mem, Ptr&& ptr) {
-    return (*std::forward<Ptr>(ptr)).*std::forward<DataMem>(data_mem);
-  }
-};
-
-// f(t1, t2, ..., tN) in all other cases.
-struct Callable {
-  // Callable doesn't have Accept because it's the last clause that gets picked
-  // when none of the previous clauses are applicable.
-  template <typename F, typename... Args>
-  static decltype(std::declval<F>()(std::declval<Args>()...)) Invoke(
-      F&& f, Args&&... args) {
-    return std::forward<F>(f)(std::forward<Args>(args)...);
-  }
-};
-
-// Resolves to the first matching clause.
-template <typename... Args>
-struct Invoker {
-  typedef typename std::conditional<
-      MemFunAndRef::Accept<Args...>::value, MemFunAndRef,
-      typename std::conditional<
-          MemFunAndPtr::Accept<Args...>::value, MemFunAndPtr,
-          typename std::conditional<
-              DataMemAndRef::Accept<Args...>::value, DataMemAndRef,
-              typename std::conditional<DataMemAndPtr::Accept<Args...>::value,
-                                        DataMemAndPtr, Callable>::type>::type>::
-          type>::type type;
-};
-
-// The result type of Invoke<F, Args...>.
-template <typename F, typename... Args>
-using InvokeT = decltype(Invoker<F, Args...>::type::Invoke(
-    std::declval<F>(), std::declval<Args>()...));
-
-// Invoke(f, args...) is an implementation of INVOKE(f, args...) from section
-// [func.require] of the C++ standard.
-template <typename F, typename... Args>
-InvokeT<F, Args...> Invoke(F&& f, Args&&... args) {
-  return Invoker<F, Args...>::type::Invoke(std::forward<F>(f),
-                                           std::forward<Args>(args)...);
-}
-}  // namespace base_internal
-}  // namespace absl
-
-#endif  // ABSL_BASE_INTERNAL_INVOKE_H_
diff --git a/submodules/libtgvoip/webrtc_dsp/absl/base/internal/raw_logging.cc b/submodules/libtgvoip/webrtc_dsp/absl/base/internal/raw_logging.cc
deleted file mode 100755
index d9485a66cc..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/absl/base/internal/raw_logging.cc
+++ /dev/null
@@ -1,234 +0,0 @@
-// Copyright 2017 The Abseil Authors.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#include "absl/base/internal/raw_logging.h"
-
-#include <stddef.h>
-#include <cstdarg>
-#include <cstdio>
-#include <cstdlib>
-#include <cstring>
-
-#include "absl/base/attributes.h"
-#include "absl/base/config.h"
-#include "absl/base/internal/atomic_hook.h"
-#include "absl/base/log_severity.h"
-
-// We know how to perform low-level writes to stderr in POSIX and Windows.  For
-// these platforms, we define the token ABSL_LOW_LEVEL_WRITE_SUPPORTED.
-// Much of raw_logging.cc becomes a no-op when we can't output messages,
-// although a FATAL ABSL_RAW_LOG message will still abort the process.
-
-// ABSL_HAVE_POSIX_WRITE is defined when the platform provides posix write()
-// (as from unistd.h)
-//
-// This preprocessor token is also defined in raw_io.cc.  If you need to copy
-// this, consider moving both to config.h instead.
-#if defined(__linux__) || defined(__APPLE__) || defined(__FreeBSD__) || \
-    defined(__Fuchsia__) || defined(__native_client__)
-#include <unistd.h>
-
-
-#define ABSL_HAVE_POSIX_WRITE 1
-#define ABSL_LOW_LEVEL_WRITE_SUPPORTED 1
-#else
-#undef ABSL_HAVE_POSIX_WRITE
-#endif
-
-// ABSL_HAVE_SYSCALL_WRITE is defined when the platform provides the syscall
-//   syscall(SYS_write, /*int*/ fd, /*char* */ buf, /*size_t*/ len);
-// for low level operations that want to avoid libc.
-#if (defined(__linux__) || defined(__FreeBSD__)) && !defined(__ANDROID__)
-#include <sys/syscall.h>
-#define ABSL_HAVE_SYSCALL_WRITE 1
-#define ABSL_LOW_LEVEL_WRITE_SUPPORTED 1
-#else
-#undef ABSL_HAVE_SYSCALL_WRITE
-#endif
-
-#ifdef _WIN32
-#include <io.h>
-
-#define ABSL_HAVE_RAW_IO 1
-#define ABSL_LOW_LEVEL_WRITE_SUPPORTED 1
-#else
-#undef ABSL_HAVE_RAW_IO
-#endif
-
-// TODO(gfalcon): We want raw-logging to work on as many platforms as possible.
-// Explicitly #error out when not ABSL_LOW_LEVEL_WRITE_SUPPORTED, except for a
-// whitelisted set of platforms for which we expect not to be able to raw log.
-
-ABSL_CONST_INIT static absl::base_internal::AtomicHook<
-    absl::raw_logging_internal::LogPrefixHook> log_prefix_hook;
-ABSL_CONST_INIT static absl::base_internal::AtomicHook<
-    absl::raw_logging_internal::AbortHook> abort_hook;
-
-#ifdef ABSL_LOW_LEVEL_WRITE_SUPPORTED
-static const char kTruncated[] = " ... (message truncated)\n";
-
-// sprintf the format to the buffer, adjusting *buf and *size to reflect the
-// consumed bytes, and return whether the message fit without truncation.  If
-// truncation occurred, if possible leave room in the buffer for the message
-// kTruncated[].
-inline static bool VADoRawLog(char** buf, int* size, const char* format,
-                              va_list ap) ABSL_PRINTF_ATTRIBUTE(3, 0);
-inline static bool VADoRawLog(char** buf, int* size,
-                              const char* format, va_list ap) {
-  int n = vsnprintf(*buf, *size, format, ap);
-  bool result = true;
-  if (n < 0 || n > *size) {
-    result = false;
-    if (static_cast<size_t>(*size) > sizeof(kTruncated)) {
-      n = *size - sizeof(kTruncated);  // room for truncation message
-    } else {
-      n = 0;                           // no room for truncation message
-    }
-  }
-  *size -= n;
-  *buf += n;
-  return result;
-}
-#endif  // ABSL_LOW_LEVEL_WRITE_SUPPORTED
-
-static constexpr int kLogBufSize = 3000;
-
-namespace {
-
-// CAVEAT: vsnprintf called from *DoRawLog below has some (exotic) code paths
-// that invoke malloc() and getenv() that might acquire some locks.
-
-// Helper for RawLog below.
-// *DoRawLog writes to *buf of *size and move them past the written portion.
-// It returns true iff there was no overflow or error.
-bool DoRawLog(char** buf, int* size, const char* format, ...)
-    ABSL_PRINTF_ATTRIBUTE(3, 4);
-bool DoRawLog(char** buf, int* size, const char* format, ...) {
-  va_list ap;
-  va_start(ap, format);
-  int n = vsnprintf(*buf, *size, format, ap);
-  va_end(ap);
-  if (n < 0 || n > *size) return false;
-  *size -= n;
-  *buf += n;
-  return true;
-}
-
-void RawLogVA(absl::LogSeverity severity, const char* file, int line,
-              const char* format, va_list ap) ABSL_PRINTF_ATTRIBUTE(4, 0);
-void RawLogVA(absl::LogSeverity severity, const char* file, int line,
-              const char* format, va_list ap) {
-  char buffer[kLogBufSize];
-  char* buf = buffer;
-  int size = sizeof(buffer);
-#ifdef ABSL_LOW_LEVEL_WRITE_SUPPORTED
-  bool enabled = true;
-#else
-  bool enabled = false;
-#endif
-
-#ifdef ABSL_MIN_LOG_LEVEL
-  if (severity < static_cast<absl::LogSeverity>(ABSL_MIN_LOG_LEVEL) &&
-      severity < absl::LogSeverity::kFatal) {
-    enabled = false;
-  }
-#endif
-
-  auto log_prefix_hook_ptr = log_prefix_hook.Load();
-  if (log_prefix_hook_ptr) {
-    enabled = log_prefix_hook_ptr(severity, file, line, &buf, &size);
-  } else {
-    if (enabled) {
-      DoRawLog(&buf, &size, "[%s : %d] RAW: ", file, line);
-    }
-  }
-  const char* const prefix_end = buf;
-
-#ifdef ABSL_LOW_LEVEL_WRITE_SUPPORTED
-  if (enabled) {
-    bool no_chop = VADoRawLog(&buf, &size, format, ap);
-    if (no_chop) {
-      DoRawLog(&buf, &size, "\n");
-    } else {
-      DoRawLog(&buf, &size, "%s", kTruncated);
-    }
-    absl::raw_logging_internal::SafeWriteToStderr(buffer, strlen(buffer));
-  }
-#else
-  static_cast<void>(format);
-  static_cast<void>(ap);
-#endif
-
-  // Abort the process after logging a FATAL message, even if the output itself
-  // was suppressed.
-  if (severity == absl::LogSeverity::kFatal) {
-    abort_hook(file, line, buffer, prefix_end, buffer + kLogBufSize);
-    abort();
-  }
-}
-
-}  // namespace
-
-namespace absl {
-namespace raw_logging_internal {
-void SafeWriteToStderr(const char *s, size_t len) {
-#if defined(ABSL_HAVE_SYSCALL_WRITE)
-  syscall(SYS_write, STDERR_FILENO, s, len);
-#elif defined(ABSL_HAVE_POSIX_WRITE)
-  write(STDERR_FILENO, s, len);
-#elif defined(ABSL_HAVE_RAW_IO)
-  _write(/* stderr */ 2, s, len);
-#else
-  // stderr logging unsupported on this platform
-  (void) s;
-  (void) len;
-#endif
-}
-
-void RawLog(absl::LogSeverity severity, const char* file, int line,
-            const char* format, ...) ABSL_PRINTF_ATTRIBUTE(4, 5);
-void RawLog(absl::LogSeverity severity, const char* file, int line,
-            const char* format, ...) {
-  va_list ap;
-  va_start(ap, format);
-  RawLogVA(severity, file, line, format, ap);
-  va_end(ap);
-}
-
-// Non-formatting version of RawLog().
-//
-// TODO(gfalcon): When string_view no longer depends on base, change this
-// interface to take its message as a string_view instead.
-static void DefaultInternalLog(absl::LogSeverity severity, const char* file,
-                               int line, const std::string& message) {
-  RawLog(severity, file, line, "%s", message.c_str());
-}
-
-bool RawLoggingFullySupported() {
-#ifdef ABSL_LOW_LEVEL_WRITE_SUPPORTED
-  return true;
-#else  // !ABSL_LOW_LEVEL_WRITE_SUPPORTED
-  return false;
-#endif  // !ABSL_LOW_LEVEL_WRITE_SUPPORTED
-}
-
-ABSL_CONST_INIT absl::base_internal::AtomicHook<InternalLogFunction>
-    internal_log_function(DefaultInternalLog);
-
-void RegisterInternalLogFunction(InternalLogFunction func) {
-  internal_log_function.Store(func);
-}
-
-}  // namespace raw_logging_internal
-}  // namespace absl
diff --git a/submodules/libtgvoip/webrtc_dsp/absl/base/internal/raw_logging.h b/submodules/libtgvoip/webrtc_dsp/absl/base/internal/raw_logging.h
deleted file mode 100755
index 79a7bb9b2f..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/absl/base/internal/raw_logging.h
+++ /dev/null
@@ -1,180 +0,0 @@
-// Copyright 2017 The Abseil Authors.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-// Thread-safe logging routines that do not allocate any memory or
-// acquire any locks, and can therefore be used by low-level memory
-// allocation, synchronization, and signal-handling code.
-
-#ifndef ABSL_BASE_INTERNAL_RAW_LOGGING_H_
-#define ABSL_BASE_INTERNAL_RAW_LOGGING_H_
-
-#include <string>
-
-#include "absl/base/attributes.h"
-#include "absl/base/internal/atomic_hook.h"
-#include "absl/base/log_severity.h"
-#include "absl/base/macros.h"
-#include "absl/base/port.h"
-
-// This is similar to LOG(severity) << format..., but
-// * it is to be used ONLY by low-level modules that can't use normal LOG()
-// * it is designed to be a low-level logger that does not allocate any
-//   memory and does not need any locks, hence:
-// * it logs straight and ONLY to STDERR w/o buffering
-// * it uses an explicit printf-format and arguments list
-// * it will silently chop off really long message strings
-// Usage example:
-//   ABSL_RAW_LOG(ERROR, "Failed foo with %i: %s", status, error);
-// This will print an almost standard log line like this to stderr only:
-//   E0821 211317 file.cc:123] RAW: Failed foo with 22: bad_file
-#define ABSL_RAW_LOG(severity, ...)                                            \
-  do {                                                                         \
-    constexpr const char* absl_raw_logging_internal_basename =                 \
-        ::absl::raw_logging_internal::Basename(__FILE__,                       \
-                                               sizeof(__FILE__) - 1);          \
-    ::absl::raw_logging_internal::RawLog(ABSL_RAW_LOGGING_INTERNAL_##severity, \
-                                         absl_raw_logging_internal_basename,   \
-                                         __LINE__, __VA_ARGS__);               \
-  } while (0)
-
-// Similar to CHECK(condition) << message, but for low-level modules:
-// we use only ABSL_RAW_LOG that does not allocate memory.
-// We do not want to provide args list here to encourage this usage:
-//   if (!cond)  ABSL_RAW_LOG(FATAL, "foo ...", hard_to_compute_args);
-// so that the args are not computed when not needed.
-#define ABSL_RAW_CHECK(condition, message)                             \
-  do {                                                                 \
-    if (ABSL_PREDICT_FALSE(!(condition))) {                            \
-      ABSL_RAW_LOG(FATAL, "Check %s failed: %s", #condition, message); \
-    }                                                                  \
-  } while (0)
-
-// ABSL_INTERNAL_LOG and ABSL_INTERNAL_CHECK work like the RAW variants above,
-// except that if the richer log library is linked into the binary, we dispatch
-// to that instead.  This is potentially useful for internal logging and
-// assertions, where we are using RAW_LOG neither for its async-signal-safety
-// nor for its non-allocating nature, but rather because raw logging has very
-// few other dependencies.
-//
-// The API is a subset of the above: each macro only takes two arguments.  Use
-// StrCat if you need to build a richer message.
-#define ABSL_INTERNAL_LOG(severity, message)                          \
-  do {                                                                \
-    constexpr const char* absl_raw_logging_internal_basename =        \
-        ::absl::raw_logging_internal::Basename(__FILE__,              \
-                                               sizeof(__FILE__) - 1); \
-    ::absl::raw_logging_internal::internal_log_function(              \
-        ABSL_RAW_LOGGING_INTERNAL_##severity,                         \
-        absl_raw_logging_internal_basename, __LINE__, message);       \
-  } while (0)
-
-#define ABSL_INTERNAL_CHECK(condition, message)               \
-  do {                                                        \
-    if (ABSL_PREDICT_FALSE(!(condition))) {                   \
-      std::string death_message = "Check " #condition " failed: "; \
-      death_message += std::string(message);                       \
-      ABSL_INTERNAL_LOG(FATAL, death_message);                \
-    }                                                         \
-  } while (0)
-
-#define ABSL_RAW_LOGGING_INTERNAL_INFO ::absl::LogSeverity::kInfo
-#define ABSL_RAW_LOGGING_INTERNAL_WARNING ::absl::LogSeverity::kWarning
-#define ABSL_RAW_LOGGING_INTERNAL_ERROR ::absl::LogSeverity::kError
-#define ABSL_RAW_LOGGING_INTERNAL_FATAL ::absl::LogSeverity::kFatal
-#define ABSL_RAW_LOGGING_INTERNAL_LEVEL(severity) \
-  ::absl::NormalizeLogSeverity(severity)
-
-namespace absl {
-namespace raw_logging_internal {
-
-// Helper function to implement ABSL_RAW_LOG
-// Logs format... at "severity" level, reporting it
-// as called from file:line.
-// This does not allocate memory or acquire locks.
-void RawLog(absl::LogSeverity severity, const char* file, int line,
-            const char* format, ...) ABSL_PRINTF_ATTRIBUTE(4, 5);
-
-// Writes the provided buffer directly to stderr, in a safe, low-level manner.
-//
-// In POSIX this means calling write(), which is async-signal safe and does
-// not malloc.  If the platform supports the SYS_write syscall, we invoke that
-// directly to side-step any libc interception.
-void SafeWriteToStderr(const char *s, size_t len);
-
-// compile-time function to get the "base" filename, that is, the part of
-// a filename after the last "/" or "\" path separator.  The search starts at
-// the end of the string; the second parameter is the length of the string.
-constexpr const char* Basename(const char* fname, int offset) {
-  return offset == 0 || fname[offset - 1] == '/' || fname[offset - 1] == '\\'
-             ? fname + offset
-             : Basename(fname, offset - 1);
-}
-
-// For testing only.
-// Returns true if raw logging is fully supported. When it is not
-// fully supported, no messages will be emitted, but a log at FATAL
-// severity will cause an abort.
-//
-// TODO(gfalcon): Come up with a better name for this method.
-bool RawLoggingFullySupported();
-
-// Function type for a raw_logging customization hook for suppressing messages
-// by severity, and for writing custom prefixes on non-suppressed messages.
-//
-// The installed hook is called for every raw log invocation.  The message will
-// be logged to stderr only if the hook returns true.  FATAL errors will cause
-// the process to abort, even if writing to stderr is suppressed.  The hook is
-// also provided with an output buffer, where it can write a custom log message
-// prefix.
-//
-// The raw_logging system does not allocate memory or grab locks.  User-provided
-// hooks must avoid these operations, and must not throw exceptions.
-//
-// 'severity' is the severity level of the message being written.
-// 'file' and 'line' are the file and line number where the ABSL_RAW_LOG macro
-// was located.
-// 'buffer' and 'buf_size' are pointers to the buffer and buffer size.  If the
-// hook writes a prefix, it must increment *buffer and decrement *buf_size
-// accordingly.
-using LogPrefixHook = bool (*)(absl::LogSeverity severity, const char* file,
-                               int line, char** buffer, int* buf_size);
-
-// Function type for a raw_logging customization hook called to abort a process
-// when a FATAL message is logged.  If the provided AbortHook() returns, the
-// logging system will call abort().
-//
-// 'file' and 'line' are the file and line number where the ABSL_RAW_LOG macro
-// was located.
-// The null-terminated logged message lives in the buffer between 'buf_start'
-// and 'buf_end'.  'prefix_end' points to the first non-prefix character of the
-// buffer (as written by the LogPrefixHook.)
-using AbortHook = void (*)(const char* file, int line, const char* buf_start,
-                           const char* prefix_end, const char* buf_end);
-
-// Internal logging function for ABSL_INTERNAL_LOG to dispatch to.
-//
-// TODO(gfalcon): When string_view no longer depends on base, change this
-// interface to take its message as a string_view instead.
-using InternalLogFunction = void (*)(absl::LogSeverity severity,
-                                     const char* file, int line,
-                                     const std::string& message);
-
-extern base_internal::AtomicHook<InternalLogFunction> internal_log_function;
-
-void RegisterInternalLogFunction(InternalLogFunction func);
-
-}  // namespace raw_logging_internal
-}  // namespace absl
-
-#endif  // ABSL_BASE_INTERNAL_RAW_LOGGING_H_
diff --git a/submodules/libtgvoip/webrtc_dsp/absl/base/internal/throw_delegate.cc b/submodules/libtgvoip/webrtc_dsp/absl/base/internal/throw_delegate.cc
deleted file mode 100755
index 46dc573cfa..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/absl/base/internal/throw_delegate.cc
+++ /dev/null
@@ -1,106 +0,0 @@
-// Copyright 2017 The Abseil Authors.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#include "absl/base/internal/throw_delegate.h"
-
-#include <cstdlib>
-#include <functional>
-#include <new>
-#include <stdexcept>
-#include "absl/base/config.h"
-#include "absl/base/internal/raw_logging.h"
-
-namespace absl {
-namespace base_internal {
-
-namespace {
-template <typename T>
-[[noreturn]] void Throw(const T& error) {
-#ifdef ABSL_HAVE_EXCEPTIONS
-  throw error;
-#else
-  ABSL_RAW_LOG(ERROR, "%s", error.what());
-  abort();
-#endif
-}
-}  // namespace
-
-void ThrowStdLogicError(const std::string& what_arg) {
-  Throw(std::logic_error(what_arg));
-}
-void ThrowStdLogicError(const char* what_arg) {
-  Throw(std::logic_error(what_arg));
-}
-void ThrowStdInvalidArgument(const std::string& what_arg) {
-  Throw(std::invalid_argument(what_arg));
-}
-void ThrowStdInvalidArgument(const char* what_arg) {
-  Throw(std::invalid_argument(what_arg));
-}
-
-void ThrowStdDomainError(const std::string& what_arg) {
-  Throw(std::domain_error(what_arg));
-}
-void ThrowStdDomainError(const char* what_arg) {
-  Throw(std::domain_error(what_arg));
-}
-
-void ThrowStdLengthError(const std::string& what_arg) {
-  Throw(std::length_error(what_arg));
-}
-void ThrowStdLengthError(const char* what_arg) {
-  Throw(std::length_error(what_arg));
-}
-
-void ThrowStdOutOfRange(const std::string& what_arg) {
-  Throw(std::out_of_range(what_arg));
-}
-void ThrowStdOutOfRange(const char* what_arg) {
-  Throw(std::out_of_range(what_arg));
-}
-
-void ThrowStdRuntimeError(const std::string& what_arg) {
-  Throw(std::runtime_error(what_arg));
-}
-void ThrowStdRuntimeError(const char* what_arg) {
-  Throw(std::runtime_error(what_arg));
-}
-
-void ThrowStdRangeError(const std::string& what_arg) {
-  Throw(std::range_error(what_arg));
-}
-void ThrowStdRangeError(const char* what_arg) {
-  Throw(std::range_error(what_arg));
-}
-
-void ThrowStdOverflowError(const std::string& what_arg) {
-  Throw(std::overflow_error(what_arg));
-}
-void ThrowStdOverflowError(const char* what_arg) {
-  Throw(std::overflow_error(what_arg));
-}
-
-void ThrowStdUnderflowError(const std::string& what_arg) {
-  Throw(std::underflow_error(what_arg));
-}
-void ThrowStdUnderflowError(const char* what_arg) {
-  Throw(std::underflow_error(what_arg));
-}
-
-void ThrowStdBadFunctionCall() { Throw(std::bad_function_call()); }
-
-void ThrowStdBadAlloc() { Throw(std::bad_alloc()); }
-
-}  // namespace base_internal
-}  // namespace absl
diff --git a/submodules/libtgvoip/webrtc_dsp/absl/base/internal/throw_delegate.h b/submodules/libtgvoip/webrtc_dsp/absl/base/internal/throw_delegate.h
deleted file mode 100755
index 70e2d7709e..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/absl/base/internal/throw_delegate.h
+++ /dev/null
@@ -1,71 +0,0 @@
-//
-// Copyright 2017 The Abseil Authors.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-
-#ifndef ABSL_BASE_INTERNAL_THROW_DELEGATE_H_
-#define ABSL_BASE_INTERNAL_THROW_DELEGATE_H_
-
-#include <string>
-
-namespace absl {
-namespace base_internal {
-
-// Helper functions that allow throwing exceptions consistently from anywhere.
-// The main use case is for header-based libraries (eg templates), as they will
-// be built by many different targets with their own compiler options.
-// In particular, this will allow a safe way to throw exceptions even if the
-// caller is compiled with -fno-exceptions.  This is intended for implementing
-// things like map<>::at(), which the standard documents as throwing an
-// exception on error.
-//
-// Using other techniques like #if tricks could lead to ODR violations.
-//
-// You shouldn't use it unless you're writing code that you know will be built
-// both with and without exceptions and you need to conform to an interface
-// that uses exceptions.
-
-[[noreturn]] void ThrowStdLogicError(const std::string& what_arg);
-[[noreturn]] void ThrowStdLogicError(const char* what_arg);
-[[noreturn]] void ThrowStdInvalidArgument(const std::string& what_arg);
-[[noreturn]] void ThrowStdInvalidArgument(const char* what_arg);
-[[noreturn]] void ThrowStdDomainError(const std::string& what_arg);
-[[noreturn]] void ThrowStdDomainError(const char* what_arg);
-[[noreturn]] void ThrowStdLengthError(const std::string& what_arg);
-[[noreturn]] void ThrowStdLengthError(const char* what_arg);
-[[noreturn]] void ThrowStdOutOfRange(const std::string& what_arg);
-[[noreturn]] void ThrowStdOutOfRange(const char* what_arg);
-[[noreturn]] void ThrowStdRuntimeError(const std::string& what_arg);
-[[noreturn]] void ThrowStdRuntimeError(const char* what_arg);
-[[noreturn]] void ThrowStdRangeError(const std::string& what_arg);
-[[noreturn]] void ThrowStdRangeError(const char* what_arg);
-[[noreturn]] void ThrowStdOverflowError(const std::string& what_arg);
-[[noreturn]] void ThrowStdOverflowError(const char* what_arg);
-[[noreturn]] void ThrowStdUnderflowError(const std::string& what_arg);
-[[noreturn]] void ThrowStdUnderflowError(const char* what_arg);
-
-[[noreturn]] void ThrowStdBadFunctionCall();
-[[noreturn]] void ThrowStdBadAlloc();
-
-// ThrowStdBadArrayNewLength() cannot be consistently supported because
-// std::bad_array_new_length is missing in libstdc++ until 4.9.0.
-// https://gcc.gnu.org/onlinedocs/gcc-4.8.3/libstdc++/api/a01379_source.html
-// https://gcc.gnu.org/onlinedocs/gcc-4.9.0/libstdc++/api/a01327_source.html
-// libcxx (as of 3.2) and msvc (as of 2015) both have it.
-// [[noreturn]] void ThrowStdBadArrayNewLength();
-
-}  // namespace base_internal
-}  // namespace absl
-
-#endif  // ABSL_BASE_INTERNAL_THROW_DELEGATE_H_
diff --git a/submodules/libtgvoip/webrtc_dsp/absl/base/log_severity.h b/submodules/libtgvoip/webrtc_dsp/absl/base/log_severity.h
deleted file mode 100755
index 5770d3629e..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/absl/base/log_severity.h
+++ /dev/null
@@ -1,67 +0,0 @@
-// Copyright 2017 The Abseil Authors.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-
-#ifndef ABSL_BASE_INTERNAL_LOG_SEVERITY_H_
-#define ABSL_BASE_INTERNAL_LOG_SEVERITY_H_
-
-#include <array>
-
-#include "absl/base/attributes.h"
-
-namespace absl {
-
-// Four severity levels are defined.  Logging APIs should terminate the program
-// when a message is logged at severity `kFatal`; the other levels have no
-// special semantics.
-enum class LogSeverity : int {
-  kInfo = 0,
-  kWarning = 1,
-  kError = 2,
-  kFatal = 3,
-};
-
-// Returns an iterable of all standard `absl::LogSeverity` values, ordered from
-// least to most severe.
-constexpr std::array<absl::LogSeverity, 4> LogSeverities() {
-  return {{absl::LogSeverity::kInfo, absl::LogSeverity::kWarning,
-           absl::LogSeverity::kError, absl::LogSeverity::kFatal}};
-}
-
-// Returns the all-caps string representation (e.g. "INFO") of the specified
-// severity level if it is one of the normal levels and "UNKNOWN" otherwise.
-constexpr const char* LogSeverityName(absl::LogSeverity s) {
-  return s == absl::LogSeverity::kInfo
-             ? "INFO"
-             : s == absl::LogSeverity::kWarning
-                   ? "WARNING"
-                   : s == absl::LogSeverity::kError
-                         ? "ERROR"
-                         : s == absl::LogSeverity::kFatal ? "FATAL" : "UNKNOWN";
-}
-
-// Values less than `kInfo` normalize to `kInfo`; values greater than `kFatal`
-// normalize to `kError` (**NOT** `kFatal`).
-constexpr absl::LogSeverity NormalizeLogSeverity(absl::LogSeverity s) {
-  return s < absl::LogSeverity::kInfo
-             ? absl::LogSeverity::kInfo
-             : s > absl::LogSeverity::kFatal ? absl::LogSeverity::kError : s;
-}
-constexpr absl::LogSeverity NormalizeLogSeverity(int s) {
-  return NormalizeLogSeverity(static_cast<absl::LogSeverity>(s));
-}
-
-}  // namespace absl
-
-#endif  // ABSL_BASE_INTERNAL_LOG_SEVERITY_H_
diff --git a/submodules/libtgvoip/webrtc_dsp/absl/base/macros.h b/submodules/libtgvoip/webrtc_dsp/absl/base/macros.h
deleted file mode 100755
index 9e7ab375ee..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/absl/base/macros.h
+++ /dev/null
@@ -1,212 +0,0 @@
-//
-// Copyright 2017 The Abseil Authors.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-// -----------------------------------------------------------------------------
-// File: macros.h
-// -----------------------------------------------------------------------------
-//
-// This header file defines the set of language macros used within Abseil code.
-// For the set of macros used to determine supported compilers and platforms,
-// see absl/base/config.h instead.
-//
-// This code is compiled directly on many platforms, including client
-// platforms like Windows, Mac, and embedded systems.  Before making
-// any changes here, make sure that you're not breaking any platforms.
-//
-
-#ifndef ABSL_BASE_MACROS_H_
-#define ABSL_BASE_MACROS_H_
-
-#include <cassert>
-#include <cstddef>
-
-#include "absl/base/port.h"
-
-// ABSL_ARRAYSIZE()
-//
-// Returns the number of elements in an array as a compile-time constant, which
-// can be used in defining new arrays. If you use this macro on a pointer by
-// mistake, you will get a compile-time error.
-#define ABSL_ARRAYSIZE(array) \
-  (sizeof(::absl::macros_internal::ArraySizeHelper(array)))
-
-namespace absl {
-namespace macros_internal {
-// Note: this internal template function declaration is used by ABSL_ARRAYSIZE.
-// The function doesn't need a definition, as we only use its type.
-template <typename T, size_t N>
-auto ArraySizeHelper(const T (&array)[N]) -> char (&)[N];
-}  // namespace macros_internal
-}  // namespace absl
-
-// kLinkerInitialized
-//
-// An enum used only as a constructor argument to indicate that a variable has
-// static storage duration, and that the constructor should do nothing to its
-// state. Use of this macro indicates to the reader that it is legal to
-// declare a static instance of the class, provided the constructor is given
-// the absl::base_internal::kLinkerInitialized argument.
-//
-// Normally, it is unsafe to declare a static variable that has a constructor or
-// a destructor because invocation order is undefined. However, if the type can
-// be zero-initialized (which the loader does for static variables) into a valid
-// state and the type's destructor does not affect storage, then a constructor
-// for static initialization can be declared.
-//
-// Example:
-//       // Declaration
-//       explicit MyClass(absl::base_internal:LinkerInitialized x) {}
-//
-//       // Invocation
-//       static MyClass my_global(absl::base_internal::kLinkerInitialized);
-namespace absl {
-namespace base_internal {
-enum LinkerInitialized {
-  kLinkerInitialized = 0,
-};
-}  // namespace base_internal
-}  // namespace absl
-
-// ABSL_FALLTHROUGH_INTENDED
-//
-// Annotates implicit fall-through between switch labels, allowing a case to
-// indicate intentional fallthrough and turn off warnings about any lack of a
-// `break` statement. The ABSL_FALLTHROUGH_INTENDED macro should be followed by
-// a semicolon and can be used in most places where `break` can, provided that
-// no statements exist between it and the next switch label.
-//
-// Example:
-//
-//  switch (x) {
-//    case 40:
-//    case 41:
-//      if (truth_is_out_there) {
-//        ++x;
-//        ABSL_FALLTHROUGH_INTENDED;  // Use instead of/along with annotations
-//                                    // in comments
-//      } else {
-//        return x;
-//      }
-//    case 42:
-//      ...
-//
-// Notes: when compiled with clang in C++11 mode, the ABSL_FALLTHROUGH_INTENDED
-// macro is expanded to the [[clang::fallthrough]] attribute, which is analysed
-// when  performing switch labels fall-through diagnostic
-// (`-Wimplicit-fallthrough`). See clang documentation on language extensions
-// for details:
-// http://clang.llvm.org/docs/AttributeReference.html#fallthrough-clang-fallthrough
-//
-// When used with unsupported compilers, the ABSL_FALLTHROUGH_INTENDED macro
-// has no effect on diagnostics. In any case this macro has no effect on runtime
-// behavior and performance of code.
-#ifdef ABSL_FALLTHROUGH_INTENDED
-#error "ABSL_FALLTHROUGH_INTENDED should not be defined."
-#endif
-
-// TODO(zhangxy): Use c++17 standard [[fallthrough]] macro, when supported.
-#if defined(__clang__) && defined(__has_warning)
-#if __has_feature(cxx_attributes) && __has_warning("-Wimplicit-fallthrough")
-#define ABSL_FALLTHROUGH_INTENDED [[clang::fallthrough]]
-#endif
-#elif defined(__GNUC__) && __GNUC__ >= 7
-#define ABSL_FALLTHROUGH_INTENDED [[gnu::fallthrough]]
-#endif
-
-#ifndef ABSL_FALLTHROUGH_INTENDED
-#define ABSL_FALLTHROUGH_INTENDED \
-  do {                            \
-  } while (0)
-#endif
-
-// ABSL_DEPRECATED()
-//
-// Marks a deprecated class, struct, enum, function, method and variable
-// declarations. The macro argument is used as a custom diagnostic message (e.g.
-// suggestion of a better alternative).
-//
-// Example:
-//
-//   class ABSL_DEPRECATED("Use Bar instead") Foo {...};
-//   ABSL_DEPRECATED("Use Baz instead") void Bar() {...}
-//
-// Every usage of a deprecated entity will trigger a warning when compiled with
-// clang's `-Wdeprecated-declarations` option. This option is turned off by
-// default, but the warnings will be reported by clang-tidy.
-#if defined(__clang__) && __cplusplus >= 201103L
-#define ABSL_DEPRECATED(message) __attribute__((deprecated(message)))
-#endif
-
-#ifndef ABSL_DEPRECATED
-#define ABSL_DEPRECATED(message)
-#endif
-
-// ABSL_BAD_CALL_IF()
-//
-// Used on a function overload to trap bad calls: any call that matches the
-// overload will cause a compile-time error. This macro uses a clang-specific
-// "enable_if" attribute, as described at
-// http://clang.llvm.org/docs/AttributeReference.html#enable-if
-//
-// Overloads which use this macro should be bracketed by
-// `#ifdef ABSL_BAD_CALL_IF`.
-//
-// Example:
-//
-//   int isdigit(int c);
-//   #ifdef ABSL_BAD_CALL_IF
-//   int isdigit(int c)
-//     ABSL_BAD_CALL_IF(c <= -1 || c > 255,
-//                       "'c' must have the value of an unsigned char or EOF");
-//   #endif // ABSL_BAD_CALL_IF
-
-#if defined(__clang__)
-# if __has_attribute(enable_if)
-#  define ABSL_BAD_CALL_IF(expr, msg) \
-    __attribute__((enable_if(expr, "Bad call trap"), unavailable(msg)))
-# endif
-#endif
-
-// ABSL_ASSERT()
-//
-// In C++11, `assert` can't be used portably within constexpr functions.
-// ABSL_ASSERT functions as a runtime assert but works in C++11 constexpr
-// functions.  Example:
-//
-// constexpr double Divide(double a, double b) {
-//   return ABSL_ASSERT(b != 0), a / b;
-// }
-//
-// This macro is inspired by
-// https://akrzemi1.wordpress.com/2017/05/18/asserts-in-constexpr-functions/
-#if defined(NDEBUG)
-#define ABSL_ASSERT(expr) (false ? (void)(expr) : (void)0)
-#else
-#define ABSL_ASSERT(expr)              \
-  (ABSL_PREDICT_TRUE((expr)) ? (void)0 \
-                             : [] { assert(false && #expr); }())  // NOLINT
-#endif
-
-#ifdef ABSL_HAVE_EXCEPTIONS
-#define ABSL_INTERNAL_TRY try
-#define ABSL_INTERNAL_CATCH_ANY catch (...)
-#define ABSL_INTERNAL_RETHROW do { throw; } while (false)
-#else  // ABSL_HAVE_EXCEPTIONS
-#define ABSL_INTERNAL_TRY if (true)
-#define ABSL_INTERNAL_CATCH_ANY else if (false)
-#define ABSL_INTERNAL_RETHROW do {} while (false)
-#endif  // ABSL_HAVE_EXCEPTIONS
-
-#endif  // ABSL_BASE_MACROS_H_
diff --git a/submodules/libtgvoip/webrtc_dsp/absl/base/optimization.h b/submodules/libtgvoip/webrtc_dsp/absl/base/optimization.h
deleted file mode 100755
index 2fddfc800c..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/absl/base/optimization.h
+++ /dev/null
@@ -1,165 +0,0 @@
-//
-// Copyright 2017 The Abseil Authors.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-// -----------------------------------------------------------------------------
-// File: optimization.h
-// -----------------------------------------------------------------------------
-//
-// This header file defines portable macros for performance optimization.
-
-#ifndef ABSL_BASE_OPTIMIZATION_H_
-#define ABSL_BASE_OPTIMIZATION_H_
-
-#include "absl/base/config.h"
-
-// ABSL_BLOCK_TAIL_CALL_OPTIMIZATION
-//
-// Instructs the compiler to avoid optimizing tail-call recursion. Use of this
-// macro is useful when you wish to preserve the existing function order within
-// a stack trace for logging, debugging, or profiling purposes.
-//
-// Example:
-//
-//   int f() {
-//     int result = g();
-//     ABSL_BLOCK_TAIL_CALL_OPTIMIZATION();
-//     return result;
-//   }
-#if defined(__pnacl__)
-#define ABSL_BLOCK_TAIL_CALL_OPTIMIZATION() if (volatile int x = 0) { (void)x; }
-#elif defined(__clang__)
-// Clang will not tail call given inline volatile assembly.
-#define ABSL_BLOCK_TAIL_CALL_OPTIMIZATION() __asm__ __volatile__("")
-#elif defined(__GNUC__)
-// GCC will not tail call given inline volatile assembly.
-#define ABSL_BLOCK_TAIL_CALL_OPTIMIZATION() __asm__ __volatile__("")
-#elif defined(_MSC_VER)
-#include <intrin.h>
-// The __nop() intrinsic blocks the optimisation.
-#define ABSL_BLOCK_TAIL_CALL_OPTIMIZATION() __nop()
-#else
-#define ABSL_BLOCK_TAIL_CALL_OPTIMIZATION() if (volatile int x = 0) { (void)x; }
-#endif
-
-// ABSL_CACHELINE_SIZE
-//
-// Explicitly defines the size of the L1 cache for purposes of alignment.
-// Setting the cacheline size allows you to specify that certain objects be
-// aligned on a cacheline boundary with `ABSL_CACHELINE_ALIGNED` declarations.
-// (See below.)
-//
-// NOTE: this macro should be replaced with the following C++17 features, when
-// those are generally available:
-//
-//   * `std::hardware_constructive_interference_size`
-//   * `std::hardware_destructive_interference_size`
-//
-// See http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2016/p0154r1.html
-// for more information.
-#if defined(__GNUC__)
-// Cache line alignment
-#if defined(__i386__) || defined(__x86_64__)
-#define ABSL_CACHELINE_SIZE 64
-#elif defined(__powerpc64__)
-#define ABSL_CACHELINE_SIZE 128
-#elif defined(__aarch64__)
-// We would need to read special register ctr_el0 to find out L1 dcache size.
-// This value is a good estimate based on a real aarch64 machine.
-#define ABSL_CACHELINE_SIZE 64
-#elif defined(__arm__)
-// Cache line sizes for ARM: These values are not strictly correct since
-// cache line sizes depend on implementations, not architectures.  There
-// are even implementations with cache line sizes configurable at boot
-// time.
-#if defined(__ARM_ARCH_5T__)
-#define ABSL_CACHELINE_SIZE 32
-#elif defined(__ARM_ARCH_7A__)
-#define ABSL_CACHELINE_SIZE 64
-#endif
-#endif
-
-#ifndef ABSL_CACHELINE_SIZE
-// A reasonable default guess.  Note that overestimates tend to waste more
-// space, while underestimates tend to waste more time.
-#define ABSL_CACHELINE_SIZE 64
-#endif
-
-// ABSL_CACHELINE_ALIGNED
-//
-// Indicates that the declared object be cache aligned using
-// `ABSL_CACHELINE_SIZE` (see above). Cacheline aligning objects allows you to
-// load a set of related objects in the L1 cache for performance improvements.
-// Cacheline aligning objects properly allows constructive memory sharing and
-// prevents destructive (or "false") memory sharing.
-//
-// NOTE: this macro should be replaced with usage of `alignas()` using
-// `std::hardware_constructive_interference_size` and/or
-// `std::hardware_destructive_interference_size` when available within C++17.
-//
-// See http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2016/p0154r1.html
-// for more information.
-//
-// On some compilers, `ABSL_CACHELINE_ALIGNED` expands to
-// `__attribute__((aligned(ABSL_CACHELINE_SIZE)))`. For compilers where this is
-// not known to work, the macro expands to nothing.
-//
-// No further guarantees are made here. The result of applying the macro
-// to variables and types is always implementation-defined.
-//
-// WARNING: It is easy to use this attribute incorrectly, even to the point
-// of causing bugs that are difficult to diagnose, crash, etc. It does not
-// of itself guarantee that objects are aligned to a cache line.
-//
-// Recommendations:
-//
-// 1) Consult compiler documentation; this comment is not kept in sync as
-//    toolchains evolve.
-// 2) Verify your use has the intended effect. This often requires inspecting
-//    the generated machine code.
-// 3) Prefer applying this attribute to individual variables. Avoid
-//    applying it to types. This tends to localize the effect.
-#define ABSL_CACHELINE_ALIGNED __attribute__((aligned(ABSL_CACHELINE_SIZE)))
-
-#else  // not GCC
-#define ABSL_CACHELINE_SIZE 64
-#define ABSL_CACHELINE_ALIGNED
-#endif
-
-// ABSL_PREDICT_TRUE, ABSL_PREDICT_FALSE
-//
-// Enables the compiler to prioritize compilation using static analysis for
-// likely paths within a boolean branch.
-//
-// Example:
-//
-//   if (ABSL_PREDICT_TRUE(expression)) {
-//     return result;                        // Faster if more likely
-//   } else {
-//     return 0;
-//   }
-//
-// Compilers can use the information that a certain branch is not likely to be
-// taken (for instance, a CHECK failure) to optimize for the common case in
-// the absence of better information (ie. compiling gcc with `-fprofile-arcs`).
-#if ABSL_HAVE_BUILTIN(__builtin_expect) || \
-    (defined(__GNUC__) && !defined(__clang__))
-#define ABSL_PREDICT_FALSE(x) (__builtin_expect(x, 0))
-#define ABSL_PREDICT_TRUE(x) (__builtin_expect(!!(x), 1))
-#else
-#define ABSL_PREDICT_FALSE(x) (x)
-#define ABSL_PREDICT_TRUE(x) (x)
-#endif
-
-#endif  // ABSL_BASE_OPTIMIZATION_H_
diff --git a/submodules/libtgvoip/webrtc_dsp/absl/base/policy_checks.h b/submodules/libtgvoip/webrtc_dsp/absl/base/policy_checks.h
deleted file mode 100755
index 0a07fc035e..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/absl/base/policy_checks.h
+++ /dev/null
@@ -1,121 +0,0 @@
-// Copyright 2017 The Abseil Authors.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-// -----------------------------------------------------------------------------
-// File: policy_checks.h
-// -----------------------------------------------------------------------------
-//
-// This header enforces a minimum set of policies at build time, such as the
-// supported compiler and library versions. Unsupported configurations are
-// reported with `#error`. This enforcement is best effort, so successfully
-// compiling this header does not guarantee a supported configuration.
-
-#ifndef ABSL_BASE_POLICY_CHECKS_H_
-#define ABSL_BASE_POLICY_CHECKS_H_
-
-// Included for the __GLIBC_PREREQ macro used below.
-#include <limits.h>
-
-// Included for the _STLPORT_VERSION macro used below.
-#if defined(__cplusplus)
-#include <cstddef>
-#endif
-
-// -----------------------------------------------------------------------------
-// Operating System Check
-// -----------------------------------------------------------------------------
-
-#if defined(__CYGWIN__)
-#error "Cygwin is not supported."
-#endif
-
-// -----------------------------------------------------------------------------
-// Compiler Check
-// -----------------------------------------------------------------------------
-
-// We support MSVC++ 14.0 update 2 and later.
-// This minimum will go up.
-#if defined(_MSC_FULL_VER) && _MSC_FULL_VER < 190023918 && !defined(__clang__)
-#error "This package requires Visual Studio 2015 Update 2 or higher."
-#endif
-
-// We support gcc 4.7 and later.
-// This minimum will go up.
-#if defined(__GNUC__) && !defined(__clang__)
-#if __GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 7)
-#error "This package requires gcc 4.7 or higher."
-#endif
-#endif
-
-// We support Apple Xcode clang 4.2.1 (version 421.11.65) and later.
-// This corresponds to Apple Xcode version 4.5.
-// This minimum will go up.
-#if defined(__apple_build_version__) && __apple_build_version__ < 4211165
-#error "This package requires __apple_build_version__ of 4211165 or higher."
-#endif
-
-// -----------------------------------------------------------------------------
-// C++ Version Check
-// -----------------------------------------------------------------------------
-
-// Enforce C++11 as the minimum.  Note that Visual Studio has not
-// advanced __cplusplus despite being good enough for our purposes, so
-// so we exempt it from the check.
-#if defined(__cplusplus) && !defined(_MSC_VER)
-#if __cplusplus < 201103L
-#error "C++ versions less than C++11 are not supported."
-#endif
-#endif
-
-// -----------------------------------------------------------------------------
-// Standard Library Check
-// -----------------------------------------------------------------------------
-
-// We have chosen glibc 2.12 as the minimum as it was tagged for release
-// in May, 2010 and includes some functionality used in Google software
-// (for instance pthread_setname_np):
-// https://sourceware.org/ml/libc-alpha/2010-05/msg00000.html
-#if defined(__GLIBC__) && defined(__GLIBC_PREREQ)
-#if !__GLIBC_PREREQ(2, 12)
-#error "Minimum required version of glibc is 2.12."
-#endif
-#endif
-
-#if defined(_STLPORT_VERSION)
-#error "STLPort is not supported."
-#endif
-
-// -----------------------------------------------------------------------------
-// `char` Size Check
-// -----------------------------------------------------------------------------
-
-// Abseil currently assumes CHAR_BIT == 8. If you would like to use Abseil on a
-// platform where this is not the case, please provide us with the details about
-// your platform so we can consider relaxing this requirement.
-#if CHAR_BIT != 8
-#error "Abseil assumes CHAR_BIT == 8."
-#endif
-
-// -----------------------------------------------------------------------------
-// `int` Size Check
-// -----------------------------------------------------------------------------
-
-// Abseil currently assumes that an int is 4 bytes. If you would like to use
-// Abseil on a platform where this is not the case, please provide us with the
-// details about your platform so we can consider relaxing this requirement.
-#if INT_MAX < 2147483647
-#error "Abseil assumes that int is at least 4 bytes. "
-#endif
-
-#endif  // ABSL_BASE_POLICY_CHECKS_H_
diff --git a/submodules/libtgvoip/webrtc_dsp/absl/base/port.h b/submodules/libtgvoip/webrtc_dsp/absl/base/port.h
deleted file mode 100755
index 1c67257fd8..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/absl/base/port.h
+++ /dev/null
@@ -1,26 +0,0 @@
-// Copyright 2017 The Abseil Authors.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-// This files is a forwarding header for other headers containing various
-// portability macros and functions.
-// This file is used for both C and C++!
-
-#ifndef ABSL_BASE_PORT_H_
-#define ABSL_BASE_PORT_H_
-
-#include "absl/base/attributes.h"
-#include "absl/base/config.h"
-#include "absl/base/optimization.h"
-
-#endif  // ABSL_BASE_PORT_H_
diff --git a/submodules/libtgvoip/webrtc_dsp/absl/container/inlined_vector.h b/submodules/libtgvoip/webrtc_dsp/absl/container/inlined_vector.h
deleted file mode 100755
index 642dae6cb9..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/absl/container/inlined_vector.h
+++ /dev/null
@@ -1,1451 +0,0 @@
-// Copyright 2018 The Abseil Authors.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-// -----------------------------------------------------------------------------
-// File: inlined_vector.h
-// -----------------------------------------------------------------------------
-//
-// This header file contains the declaration and definition of an "inlined
-// vector" which behaves in an equivalent fashion to a `std::vector`, except
-// that storage for small sequences of the vector are provided inline without
-// requiring any heap allocation.
-//
-// An `absl::InlinedVector<T, N>` specifies the default capacity `N` as one of
-// its template parameters. Instances where `size() <= N` hold contained
-// elements in inline space. Typically `N` is very small so that sequences that
-// are expected to be short do not require allocations.
-//
-// An `absl::InlinedVector` does not usually require a specific allocator. If
-// the inlined vector grows beyond its initial constraints, it will need to
-// allocate (as any normal `std::vector` would). This is usually performed with
-// the default allocator (defined as `std::allocator<T>`). Optionally, a custom
-// allocator type may be specified as `A` in `absl::InlinedVector<T, N, A>`.
-
-#ifndef ABSL_CONTAINER_INLINED_VECTOR_H_
-#define ABSL_CONTAINER_INLINED_VECTOR_H_
-
-#include <algorithm>
-#include <cassert>
-#include <cstddef>
-#include <cstdlib>
-#include <cstring>
-#include <initializer_list>
-#include <iterator>
-#include <memory>
-#include <type_traits>
-#include <utility>
-
-#include "absl/algorithm/algorithm.h"
-#include "absl/base/internal/throw_delegate.h"
-#include "absl/base/optimization.h"
-#include "absl/base/port.h"
-#include "absl/memory/memory.h"
-
-namespace absl {
-
-// -----------------------------------------------------------------------------
-// InlinedVector
-// -----------------------------------------------------------------------------
-//
-// An `absl::InlinedVector` is designed to be a drop-in replacement for
-// `std::vector` for use cases where the vector's size is sufficiently small
-// that it can be inlined. If the inlined vector does grow beyond its estimated
-// capacity, it will trigger an initial allocation on the heap, and will behave
-// as a `std:vector`. The API of the `absl::InlinedVector` within this file is
-// designed to cover the same API footprint as covered by `std::vector`.
-template <typename T, size_t N, typename A = std::allocator<T>>
-class InlinedVector {
-  constexpr static typename A::size_type inlined_capacity() {
-    return static_cast<typename A::size_type>(N);
-  }
-
-  static_assert(inlined_capacity() > 0, "InlinedVector needs inlined capacity");
-
-  template <typename Iterator>
-  using DisableIfIntegral =
-      absl::enable_if_t<!std::is_integral<Iterator>::value>;
-
-  template <typename Iterator>
-  using EnableIfInputIterator = absl::enable_if_t<std::is_convertible<
-      typename std::iterator_traits<Iterator>::iterator_category,
-      std::input_iterator_tag>::value>;
-
-  template <typename Iterator>
-  using IteratorCategory =
-      typename std::iterator_traits<Iterator>::iterator_category;
-
-  using rvalue_reference = typename A::value_type&&;
-
- public:
-  using allocator_type = A;
-  using value_type = typename allocator_type::value_type;
-  using pointer = typename allocator_type::pointer;
-  using const_pointer = typename allocator_type::const_pointer;
-  using reference = typename allocator_type::reference;
-  using const_reference = typename allocator_type::const_reference;
-  using size_type = typename allocator_type::size_type;
-  using difference_type = typename allocator_type::difference_type;
-  using iterator = pointer;
-  using const_iterator = const_pointer;
-  using reverse_iterator = std::reverse_iterator<iterator>;
-  using const_reverse_iterator = std::reverse_iterator<const_iterator>;
-
-  // ---------------------------------------------------------------------------
-  // InlinedVector Constructors and Destructor
-  // ---------------------------------------------------------------------------
-
-  // Creates an empty inlined vector with a default initialized allocator.
-  InlinedVector() noexcept(noexcept(allocator_type()))
-      : allocator_and_tag_(allocator_type()) {}
-
-  // Creates an empty inlined vector with a specified allocator.
-  explicit InlinedVector(const allocator_type& alloc) noexcept
-      : allocator_and_tag_(alloc) {}
-
-  // Creates an inlined vector with `n` copies of `value_type()`.
-  explicit InlinedVector(size_type n,
-                         const allocator_type& alloc = allocator_type())
-      : allocator_and_tag_(alloc) {
-    InitAssign(n);
-  }
-
-  // Creates an inlined vector with `n` copies of `v`.
-  InlinedVector(size_type n, const_reference v,
-                const allocator_type& alloc = allocator_type())
-      : allocator_and_tag_(alloc) {
-    InitAssign(n, v);
-  }
-
-  // Creates an inlined vector of copies of the values in `init_list`.
-  InlinedVector(std::initializer_list<value_type> init_list,
-                const allocator_type& alloc = allocator_type())
-      : allocator_and_tag_(alloc) {
-    AppendRange(init_list.begin(), init_list.end());
-  }
-
-  // Creates an inlined vector with elements constructed from the provided
-  // Iterator range [`first`, `last`).
-  //
-  // NOTE: The `enable_if` prevents ambiguous interpretation between a call to
-  // this constructor with two integral arguments and a call to the above
-  // `InlinedVector(size_type, const_reference)` constructor.
-  template <typename InputIterator, DisableIfIntegral<InputIterator>* = nullptr>
-  InlinedVector(InputIterator first, InputIterator last,
-                const allocator_type& alloc = allocator_type())
-      : allocator_and_tag_(alloc) {
-    AppendRange(first, last);
-  }
-
-  // Creates a copy of `other` using `other`'s allocator.
-  InlinedVector(const InlinedVector& other);
-
-  // Creates a copy of `other` but with a specified allocator.
-  InlinedVector(const InlinedVector& other, const allocator_type& alloc);
-
-  // Creates an inlined vector by moving in the contents of `other`.
-  //
-  // NOTE: This move constructor does not allocate and only moves the underlying
-  // objects, so its `noexcept` specification depends on whether moving the
-  // underlying objects can throw or not. We assume:
-  //  a) move constructors should only throw due to allocation failure and
-  //  b) if `value_type`'s move constructor allocates, it uses the same
-  //     allocation function as the `InlinedVector`'s allocator, so the move
-  //     constructor is non-throwing if the allocator is non-throwing or
-  //     `value_type`'s move constructor is specified as `noexcept`.
-  InlinedVector(InlinedVector&& v) noexcept(
-      absl::allocator_is_nothrow<allocator_type>::value ||
-      std::is_nothrow_move_constructible<value_type>::value);
-
-  // Creates an inlined vector by moving in the contents of `other`.
-  //
-  // NOTE: This move constructor allocates and subsequently moves the underlying
-  // objects, so its `noexcept` specification depends on whether the allocation
-  // can throw and whether moving the underlying objects can throw. Based on the
-  // same assumptions as above, the `noexcept` specification is dominated by
-  // whether the allocation can throw regardless of whether `value_type`'s move
-  // constructor is specified as `noexcept`.
-  InlinedVector(InlinedVector&& v, const allocator_type& alloc) noexcept(
-      absl::allocator_is_nothrow<allocator_type>::value);
-
-  ~InlinedVector() { clear(); }
-
-  // ---------------------------------------------------------------------------
-  // InlinedVector Member Accessors
-  // ---------------------------------------------------------------------------
-
-  // `InlinedVector::empty()`
-  //
-  // Checks if the inlined vector has no elements.
-  bool empty() const noexcept { return !size(); }
-
-  // `InlinedVector::size()`
-  //
-  // Returns the number of elements in the inlined vector.
-  size_type size() const noexcept { return tag().size(); }
-
-  // `InlinedVector::max_size()`
-  //
-  // Returns the maximum number of elements the vector can hold.
-  size_type max_size() const noexcept {
-    // One bit of the size storage is used to indicate whether the inlined
-    // vector is allocated. As a result, the maximum size of the container that
-    // we can express is half of the max for `size_type`.
-    return (std::numeric_limits<size_type>::max)() / 2;
-  }
-
-  // `InlinedVector::capacity()`
-  //
-  // Returns the number of elements that can be stored in the inlined vector
-  // without requiring a reallocation of underlying memory.
-  //
-  // NOTE: For most inlined vectors, `capacity()` should equal
-  // `inlined_capacity()`. For inlined vectors which exceed this capacity, they
-  // will no longer be inlined and `capacity()` will equal its capacity on the
-  // allocated heap.
-  size_type capacity() const noexcept {
-    return allocated() ? allocation().capacity() : inlined_capacity();
-  }
-
-  // `InlinedVector::data()`
-  //
-  // Returns a `pointer` to elements of the inlined vector. This pointer can be
-  // used to access and modify the contained elements.
-  // Only results within the range [`0`, `size()`) are defined.
-  pointer data() noexcept {
-    return allocated() ? allocated_space() : inlined_space();
-  }
-
-  // Overload of `InlinedVector::data()` to return a `const_pointer` to elements
-  // of the inlined vector. This pointer can be used to access (but not modify)
-  // the contained elements.
-  const_pointer data() const noexcept {
-    return allocated() ? allocated_space() : inlined_space();
-  }
-
-  // `InlinedVector::operator[]()`
-  //
-  // Returns a `reference` to the `i`th element of the inlined vector using the
-  // array operator.
-  reference operator[](size_type i) {
-    assert(i < size());
-    return data()[i];
-  }
-
-  // Overload of `InlinedVector::operator[]()` to return a `const_reference` to
-  // the `i`th element of the inlined vector.
-  const_reference operator[](size_type i) const {
-    assert(i < size());
-    return data()[i];
-  }
-
-  // `InlinedVector::at()`
-  //
-  // Returns a `reference` to the `i`th element of the inlined vector.
-  reference at(size_type i) {
-    if (ABSL_PREDICT_FALSE(i >= size())) {
-      base_internal::ThrowStdOutOfRange(
-          "InlinedVector::at() failed bounds check");
-    }
-    return data()[i];
-  }
-
-  // Overload of `InlinedVector::at()` to return a `const_reference` to the
-  // `i`th element of the inlined vector.
-  const_reference at(size_type i) const {
-    if (ABSL_PREDICT_FALSE(i >= size())) {
-      base_internal::ThrowStdOutOfRange(
-          "InlinedVector::at() failed bounds check");
-    }
-    return data()[i];
-  }
-
-  // `InlinedVector::front()`
-  //
-  // Returns a `reference` to the first element of the inlined vector.
-  reference front() {
-    assert(!empty());
-    return at(0);
-  }
-
-  // Overload of `InlinedVector::front()` returns a `const_reference` to the
-  // first element of the inlined vector.
-  const_reference front() const {
-    assert(!empty());
-    return at(0);
-  }
-
-  // `InlinedVector::back()`
-  //
-  // Returns a `reference` to the last element of the inlined vector.
-  reference back() {
-    assert(!empty());
-    return at(size() - 1);
-  }
-
-  // Overload of `InlinedVector::back()` to return a `const_reference` to the
-  // last element of the inlined vector.
-  const_reference back() const {
-    assert(!empty());
-    return at(size() - 1);
-  }
-
-  // `InlinedVector::begin()`
-  //
-  // Returns an `iterator` to the beginning of the inlined vector.
-  iterator begin() noexcept { return data(); }
-
-  // Overload of `InlinedVector::begin()` to return a `const_iterator` to
-  // the beginning of the inlined vector.
-  const_iterator begin() const noexcept { return data(); }
-
-  // `InlinedVector::end()`
-  //
-  // Returns an `iterator` to the end of the inlined vector.
-  iterator end() noexcept { return data() + size(); }
-
-  // Overload of `InlinedVector::end()` to return a `const_iterator` to the
-  // end of the inlined vector.
-  const_iterator end() const noexcept { return data() + size(); }
-
-  // `InlinedVector::cbegin()`
-  //
-  // Returns a `const_iterator` to the beginning of the inlined vector.
-  const_iterator cbegin() const noexcept { return begin(); }
-
-  // `InlinedVector::cend()`
-  //
-  // Returns a `const_iterator` to the end of the inlined vector.
-  const_iterator cend() const noexcept { return end(); }
-
-  // `InlinedVector::rbegin()`
-  //
-  // Returns a `reverse_iterator` from the end of the inlined vector.
-  reverse_iterator rbegin() noexcept { return reverse_iterator(end()); }
-
-  // Overload of `InlinedVector::rbegin()` to return a
-  // `const_reverse_iterator` from the end of the inlined vector.
-  const_reverse_iterator rbegin() const noexcept {
-    return const_reverse_iterator(end());
-  }
-
-  // `InlinedVector::rend()`
-  //
-  // Returns a `reverse_iterator` from the beginning of the inlined vector.
-  reverse_iterator rend() noexcept { return reverse_iterator(begin()); }
-
-  // Overload of `InlinedVector::rend()` to return a `const_reverse_iterator`
-  // from the beginning of the inlined vector.
-  const_reverse_iterator rend() const noexcept {
-    return const_reverse_iterator(begin());
-  }
-
-  // `InlinedVector::crbegin()`
-  //
-  // Returns a `const_reverse_iterator` from the end of the inlined vector.
-  const_reverse_iterator crbegin() const noexcept { return rbegin(); }
-
-  // `InlinedVector::crend()`
-  //
-  // Returns a `const_reverse_iterator` from the beginning of the inlined
-  // vector.
-  const_reverse_iterator crend() const noexcept { return rend(); }
-
-  // `InlinedVector::get_allocator()`
-  //
-  // Returns a copy of the allocator of the inlined vector.
-  allocator_type get_allocator() const { return allocator(); }
-
-
-  // ---------------------------------------------------------------------------
-  // InlinedVector Member Mutators
-  // ---------------------------------------------------------------------------
-
-  // `InlinedVector::operator=()`
-  //
-  // Replaces the contents of the inlined vector with copies of the elements in
-  // the provided `std::initializer_list`.
-  InlinedVector& operator=(std::initializer_list<value_type> init_list) {
-    AssignRange(init_list.begin(), init_list.end());
-    return *this;
-  }
-
-  // Overload of `InlinedVector::operator=()` to replace the contents of the
-  // inlined vector with the contents of `other`.
-  InlinedVector& operator=(const InlinedVector& other) {
-    if (ABSL_PREDICT_FALSE(this == &other)) return *this;
-
-    // Optimized to avoid reallocation.
-    // Prefer reassignment to copy construction for elements.
-    if (size() < other.size()) {  // grow
-      reserve(other.size());
-      std::copy(other.begin(), other.begin() + size(), begin());
-      std::copy(other.begin() + size(), other.end(), std::back_inserter(*this));
-    } else {  // maybe shrink
-      erase(begin() + other.size(), end());
-      std::copy(other.begin(), other.end(), begin());
-    }
-    return *this;
-  }
-
-  // Overload of `InlinedVector::operator=()` to replace the contents of the
-  // inlined vector with the contents of `other`.
-  //
-  // NOTE: As a result of calling this overload, `other` may be empty or it's
-  // contents may be left in a moved-from state.
-  InlinedVector& operator=(InlinedVector&& other) {
-    if (ABSL_PREDICT_FALSE(this == &other)) return *this;
-
-    if (other.allocated()) {
-      clear();
-      tag().set_allocated_size(other.size());
-      init_allocation(other.allocation());
-      other.tag() = Tag();
-    } else {
-      if (allocated()) clear();
-      // Both are inlined now.
-      if (size() < other.size()) {
-        auto mid = std::make_move_iterator(other.begin() + size());
-        std::copy(std::make_move_iterator(other.begin()), mid, begin());
-        UninitializedCopy(mid, std::make_move_iterator(other.end()), end());
-      } else {
-        auto new_end = std::copy(std::make_move_iterator(other.begin()),
-                                 std::make_move_iterator(other.end()), begin());
-        Destroy(new_end, end());
-      }
-      tag().set_inline_size(other.size());
-    }
-    return *this;
-  }
-
-  // `InlinedVector::assign()`
-  //
-  // Replaces the contents of the inlined vector with `n` copies of `v`.
-  void assign(size_type n, const_reference v) {
-    if (n <= size()) {  // Possibly shrink
-      std::fill_n(begin(), n, v);
-      erase(begin() + n, end());
-      return;
-    }
-    // Grow
-    reserve(n);
-    std::fill_n(begin(), size(), v);
-    if (allocated()) {
-      UninitializedFill(allocated_space() + size(), allocated_space() + n, v);
-      tag().set_allocated_size(n);
-    } else {
-      UninitializedFill(inlined_space() + size(), inlined_space() + n, v);
-      tag().set_inline_size(n);
-    }
-  }
-
-  // Overload of `InlinedVector::assign()` to replace the contents of the
-  // inlined vector with copies of the values in the provided
-  // `std::initializer_list`.
-  void assign(std::initializer_list<value_type> init_list) {
-    AssignRange(init_list.begin(), init_list.end());
-  }
-
-  // Overload of `InlinedVector::assign()` to replace the contents of the
-  // inlined vector with values constructed from the range [`first`, `last`).
-  template <typename InputIterator, DisableIfIntegral<InputIterator>* = nullptr>
-  void assign(InputIterator first, InputIterator last) {
-    AssignRange(first, last);
-  }
-
-  // `InlinedVector::resize()`
-  //
-  // Resizes the inlined vector to contain `n` elements. If `n` is smaller than
-  // the inlined vector's current size, extra elements are destroyed. If `n` is
-  // larger than the initial size, new elements are value-initialized.
-  void resize(size_type n);
-
-  // Overload of `InlinedVector::resize()` to resize the inlined vector to
-  // contain `n` elements where, if `n` is larger than `size()`, the new values
-  // will be copy-constructed from `v`.
-  void resize(size_type n, const_reference v);
-
-  // `InlinedVector::insert()`
-  //
-  // Copies `v` into `position`, returning an `iterator` pointing to the newly
-  // inserted element.
-  iterator insert(const_iterator position, const_reference v) {
-    return emplace(position, v);
-  }
-
-  // Overload of `InlinedVector::insert()` for moving `v` into `position`,
-  // returning an iterator pointing to the newly inserted element.
-  iterator insert(const_iterator position, rvalue_reference v) {
-    return emplace(position, std::move(v));
-  }
-
-  // Overload of `InlinedVector::insert()` for inserting `n` contiguous copies
-  // of `v` starting at `position`. Returns an `iterator` pointing to the first
-  // of the newly inserted elements.
-  iterator insert(const_iterator position, size_type n, const_reference v) {
-    return InsertWithCount(position, n, v);
-  }
-
-  // Overload of `InlinedVector::insert()` for copying the contents of the
-  // `std::initializer_list` into the vector starting at `position`. Returns an
-  // `iterator` pointing to the first of the newly inserted elements.
-  iterator insert(const_iterator position,
-                  std::initializer_list<value_type> init_list) {
-    return insert(position, init_list.begin(), init_list.end());
-  }
-
-  // Overload of `InlinedVector::insert()` for inserting elements constructed
-  // from the range [`first`, `last`). Returns an `iterator` pointing to the
-  // first of the newly inserted elements.
-  //
-  // NOTE: The `enable_if` is intended to disambiguate the two three-argument
-  // overloads of `insert()`.
-  template <typename InputIterator,
-            typename = EnableIfInputIterator<InputIterator>>
-  iterator insert(const_iterator position, InputIterator first,
-                  InputIterator last) {
-    return InsertWithRange(position, first, last,
-                           IteratorCategory<InputIterator>());
-  }
-
-  // `InlinedVector::emplace()`
-  //
-  // Constructs and inserts an object in the inlined vector at the given
-  // `position`, returning an `iterator` pointing to the newly emplaced element.
-  template <typename... Args>
-  iterator emplace(const_iterator position, Args&&... args);
-
-  // `InlinedVector::emplace_back()`
-  //
-  // Constructs and appends a new element to the end of the inlined vector,
-  // returning a `reference` to the emplaced element.
-  template <typename... Args>
-  reference emplace_back(Args&&... args) {
-    size_type s = size();
-    assert(s <= capacity());
-    if (ABSL_PREDICT_FALSE(s == capacity())) {
-      return GrowAndEmplaceBack(std::forward<Args>(args)...);
-    }
-    assert(s < capacity());
-
-    pointer space;
-    if (allocated()) {
-      tag().set_allocated_size(s + 1);
-      space = allocated_space();
-    } else {
-      tag().set_inline_size(s + 1);
-      space = inlined_space();
-    }
-    return Construct(space + s, std::forward<Args>(args)...);
-  }
-
-  // `InlinedVector::push_back()`
-  //
-  // Appends a copy of `v` to the end of the inlined vector.
-  void push_back(const_reference v) { static_cast<void>(emplace_back(v)); }
-
-  // Overload of `InlinedVector::push_back()` for moving `v` into a newly
-  // appended element.
-  void push_back(rvalue_reference v) {
-    static_cast<void>(emplace_back(std::move(v)));
-  }
-
-  // `InlinedVector::pop_back()`
-  //
-  // Destroys the element at the end of the inlined vector and shrinks the size
-  // by `1` (unless the inlined vector is empty, in which case this is a no-op).
-  void pop_back() noexcept {
-    assert(!empty());
-    size_type s = size();
-    if (allocated()) {
-      Destroy(allocated_space() + s - 1, allocated_space() + s);
-      tag().set_allocated_size(s - 1);
-    } else {
-      Destroy(inlined_space() + s - 1, inlined_space() + s);
-      tag().set_inline_size(s - 1);
-    }
-  }
-
-  // `InlinedVector::erase()`
-  //
-  // Erases the element at `position` of the inlined vector, returning an
-  // `iterator` pointing to the first element following the erased element.
-  //
-  // NOTE: May return the end iterator, which is not dereferencable.
-  iterator erase(const_iterator position) {
-    assert(position >= begin());
-    assert(position < end());
-
-    iterator pos = const_cast<iterator>(position);
-    std::move(pos + 1, end(), pos);
-    pop_back();
-    return pos;
-  }
-
-  // Overload of `InlinedVector::erase()` for erasing all elements in the
-  // range [`from`, `to`) in the inlined vector. Returns an `iterator` pointing
-  // to the first element following the range erased or the end iterator if `to`
-  // was the end iterator.
-  iterator erase(const_iterator from, const_iterator to);
-
-  // `InlinedVector::clear()`
-  //
-  // Destroys all elements in the inlined vector, sets the size of `0` and
-  // deallocates the heap allocation if the inlined vector was allocated.
-  void clear() noexcept {
-    size_type s = size();
-    if (allocated()) {
-      Destroy(allocated_space(), allocated_space() + s);
-      allocation().Dealloc(allocator());
-    } else if (s != 0) {  // do nothing for empty vectors
-      Destroy(inlined_space(), inlined_space() + s);
-    }
-    tag() = Tag();
-  }
-
-  // `InlinedVector::reserve()`
-  //
-  // Enlarges the underlying representation of the inlined vector so it can hold
-  // at least `n` elements. This method does not change `size()` or the actual
-  // contents of the vector.
-  //
-  // NOTE: If `n` does not exceed `capacity()`, `reserve()` will have no
-  // effects. Otherwise, `reserve()` will reallocate, performing an n-time
-  // element-wise move of everything contained.
-  void reserve(size_type n) {
-    if (n > capacity()) {
-      // Make room for new elements
-      EnlargeBy(n - size());
-    }
-  }
-
-  // `InlinedVector::shrink_to_fit()`
-  //
-  // Reduces memory usage by freeing unused memory. After this call, calls to
-  // `capacity()` will be equal to `(std::max)(inlined_capacity(), size())`.
-  //
-  // If `size() <= inlined_capacity()` and the elements are currently stored on
-  // the heap, they will be moved to the inlined storage and the heap memory
-  // will be deallocated.
-  //
-  // If `size() > inlined_capacity()` and `size() < capacity()` the elements
-  // will be moved to a smaller heap allocation.
-  void shrink_to_fit() {
-    const auto s = size();
-    if (ABSL_PREDICT_FALSE(!allocated() || s == capacity())) return;
-
-    if (s <= inlined_capacity()) {
-      // Move the elements to the inlined storage.
-      // We have to do this using a temporary, because `inlined_storage` and
-      // `allocation_storage` are in a union field.
-      auto temp = std::move(*this);
-      assign(std::make_move_iterator(temp.begin()),
-             std::make_move_iterator(temp.end()));
-      return;
-    }
-
-    // Reallocate storage and move elements.
-    // We can't simply use the same approach as above, because `assign()` would
-    // call into `reserve()` internally and reserve larger capacity than we need
-    Allocation new_allocation(allocator(), s);
-    UninitializedCopy(std::make_move_iterator(allocated_space()),
-                      std::make_move_iterator(allocated_space() + s),
-                      new_allocation.buffer());
-    ResetAllocation(new_allocation, s);
-  }
-
-  // `InlinedVector::swap()`
-  //
-  // Swaps the contents of this inlined vector with the contents of `other`.
-  void swap(InlinedVector& other);
-
-  template <typename Hash>
-  friend Hash AbslHashValue(Hash hash, const InlinedVector& inlined_vector) {
-    const_pointer p = inlined_vector.data();
-    size_type n = inlined_vector.size();
-    return Hash::combine(Hash::combine_contiguous(std::move(hash), p, n), n);
-  }
-
- private:
-  // Holds whether the vector is allocated or not in the lowest bit and the size
-  // in the high bits:
-  //   `size_ = (size << 1) | is_allocated;`
-  class Tag {
-   public:
-    Tag() : size_(0) {}
-    size_type size() const { return size_ / 2; }
-    void add_size(size_type n) { size_ += n * 2; }
-    void set_inline_size(size_type n) { size_ = n * 2; }
-    void set_allocated_size(size_type n) { size_ = (n * 2) + 1; }
-    bool allocated() const { return size_ % 2; }
-
-   private:
-    size_type size_;
-  };
-
-  // Derives from `allocator_type` to use the empty base class optimization.
-  // If the `allocator_type` is stateless, we can store our instance for free.
-  class AllocatorAndTag : private allocator_type {
-   public:
-    explicit AllocatorAndTag(const allocator_type& a) : allocator_type(a) {}
-
-    Tag& tag() { return tag_; }
-    const Tag& tag() const { return tag_; }
-
-    allocator_type& allocator() { return *this; }
-    const allocator_type& allocator() const { return *this; }
-
-   private:
-    Tag tag_;
-  };
-
-  class Allocation {
-   public:
-    Allocation(allocator_type& a, size_type capacity)
-        : capacity_(capacity), buffer_(Create(a, capacity)) {}
-
-    void Dealloc(allocator_type& a) {
-      std::allocator_traits<allocator_type>::deallocate(a, buffer_, capacity_);
-    }
-
-    size_type capacity() const { return capacity_; }
-
-    const_pointer buffer() const { return buffer_; }
-
-    pointer buffer() { return buffer_; }
-
-   private:
-    static pointer Create(allocator_type& a, size_type n) {
-      return std::allocator_traits<allocator_type>::allocate(a, n);
-    }
-
-    size_type capacity_;
-    pointer buffer_;
-  };
-
-  const Tag& tag() const { return allocator_and_tag_.tag(); }
-
-  Tag& tag() { return allocator_and_tag_.tag(); }
-
-  Allocation& allocation() {
-    return reinterpret_cast<Allocation&>(rep_.allocation_storage.allocation);
-  }
-
-  const Allocation& allocation() const {
-    return reinterpret_cast<const Allocation&>(
-        rep_.allocation_storage.allocation);
-  }
-
-  void init_allocation(const Allocation& allocation) {
-    new (&rep_.allocation_storage.allocation) Allocation(allocation);
-  }
-
-  // TODO(absl-team): investigate whether the reinterpret_cast is appropriate.
-  pointer inlined_space() {
-    return reinterpret_cast<pointer>(
-        std::addressof(rep_.inlined_storage.inlined[0]));
-  }
-
-  const_pointer inlined_space() const {
-    return reinterpret_cast<const_pointer>(
-        std::addressof(rep_.inlined_storage.inlined[0]));
-  }
-
-  pointer allocated_space() { return allocation().buffer(); }
-
-  const_pointer allocated_space() const { return allocation().buffer(); }
-
-  const allocator_type& allocator() const {
-    return allocator_and_tag_.allocator();
-  }
-
-  allocator_type& allocator() { return allocator_and_tag_.allocator(); }
-
-  bool allocated() const { return tag().allocated(); }
-
-  // Enlarge the underlying representation so we can store `size_ + delta` elems
-  // in allocated space. The size is not changed, and any newly added memory is
-  // not initialized.
-  void EnlargeBy(size_type delta);
-
-  // Shift all elements from `position` to `end()` by `n` places to the right.
-  // If the vector needs to be enlarged, memory will be allocated.
-  // Returns `iterator`s pointing to the start of the previously-initialized
-  // portion and the start of the uninitialized portion of the created gap.
-  // The number of initialized spots is `pair.second - pair.first`. The number
-  // of raw spots is `n - (pair.second - pair.first)`.
-  //
-  // Updates the size of the InlinedVector internally.
-  std::pair<iterator, iterator> ShiftRight(const_iterator position,
-                                           size_type n);
-
-  void ResetAllocation(Allocation new_allocation, size_type new_size) {
-    if (allocated()) {
-      Destroy(allocated_space(), allocated_space() + size());
-      assert(begin() == allocated_space());
-      allocation().Dealloc(allocator());
-      allocation() = new_allocation;
-    } else {
-      Destroy(inlined_space(), inlined_space() + size());
-      init_allocation(new_allocation);  // bug: only init once
-    }
-    tag().set_allocated_size(new_size);
-  }
-
-  template <typename... Args>
-  reference GrowAndEmplaceBack(Args&&... args) {
-    assert(size() == capacity());
-    const size_type s = size();
-
-    Allocation new_allocation(allocator(), 2 * capacity());
-
-    reference new_element =
-        Construct(new_allocation.buffer() + s, std::forward<Args>(args)...);
-    UninitializedCopy(std::make_move_iterator(data()),
-                      std::make_move_iterator(data() + s),
-                      new_allocation.buffer());
-
-    ResetAllocation(new_allocation, s + 1);
-
-    return new_element;
-  }
-
-  void InitAssign(size_type n);
-
-  void InitAssign(size_type n, const_reference v);
-
-  template <typename... Args>
-  reference Construct(pointer p, Args&&... args) {
-    std::allocator_traits<allocator_type>::construct(
-        allocator(), p, std::forward<Args>(args)...);
-    return *p;
-  }
-
-  template <typename Iterator>
-  void UninitializedCopy(Iterator src, Iterator src_last, pointer dst) {
-    for (; src != src_last; ++dst, ++src) Construct(dst, *src);
-  }
-
-  template <typename... Args>
-  void UninitializedFill(pointer dst, pointer dst_last, const Args&... args) {
-    for (; dst != dst_last; ++dst) Construct(dst, args...);
-  }
-
-  // Destroy [`from`, `to`) in place.
-  void Destroy(pointer from, pointer to);
-
-  template <typename Iterator>
-  void AppendRange(Iterator first, Iterator last, std::input_iterator_tag) {
-    std::copy(first, last, std::back_inserter(*this));
-  }
-
-  template <typename Iterator>
-  void AppendRange(Iterator first, Iterator last, std::forward_iterator_tag);
-
-  template <typename Iterator>
-  void AppendRange(Iterator first, Iterator last) {
-    AppendRange(first, last, IteratorCategory<Iterator>());
-  }
-
-  template <typename Iterator>
-  void AssignRange(Iterator first, Iterator last, std::input_iterator_tag);
-
-  template <typename Iterator>
-  void AssignRange(Iterator first, Iterator last, std::forward_iterator_tag);
-
-  template <typename Iterator>
-  void AssignRange(Iterator first, Iterator last) {
-    AssignRange(first, last, IteratorCategory<Iterator>());
-  }
-
-  iterator InsertWithCount(const_iterator position, size_type n,
-                           const_reference v);
-
-  template <typename InputIterator>
-  iterator InsertWithRange(const_iterator position, InputIterator first,
-                           InputIterator last, std::input_iterator_tag);
-
-  template <typename ForwardIterator>
-  iterator InsertWithRange(const_iterator position, ForwardIterator first,
-                           ForwardIterator last, std::forward_iterator_tag);
-
-  // Stores either the inlined or allocated representation
-  union Rep {
-    using ValueTypeBuffer =
-        absl::aligned_storage_t<sizeof(value_type), alignof(value_type)>;
-    using AllocationBuffer =
-        absl::aligned_storage_t<sizeof(Allocation), alignof(Allocation)>;
-
-    // Structs wrap the buffers to perform indirection that solves a bizarre
-    // compilation error on Visual Studio (all known versions).
-    struct InlinedRep {
-      ValueTypeBuffer inlined[inlined_capacity()];
-    };
-    struct AllocatedRep {
-      AllocationBuffer allocation;
-    };
-
-    InlinedRep inlined_storage;
-    AllocatedRep allocation_storage;
-  };
-
-  AllocatorAndTag allocator_and_tag_;
-  Rep rep_;
-};
-
-// -----------------------------------------------------------------------------
-// InlinedVector Non-Member Functions
-// -----------------------------------------------------------------------------
-
-// `swap()`
-//
-// Swaps the contents of two inlined vectors. This convenience function
-// simply calls `InlinedVector::swap()`.
-template <typename T, size_t N, typename A>
-void swap(InlinedVector<T, N, A>& a,
-          InlinedVector<T, N, A>& b) noexcept(noexcept(a.swap(b))) {
-  a.swap(b);
-}
-
-// `operator==()`
-//
-// Tests the equivalency of the contents of two inlined vectors.
-template <typename T, size_t N, typename A>
-bool operator==(const InlinedVector<T, N, A>& a,
-                const InlinedVector<T, N, A>& b) {
-  return absl::equal(a.begin(), a.end(), b.begin(), b.end());
-}
-
-// `operator!=()`
-//
-// Tests the inequality of the contents of two inlined vectors.
-template <typename T, size_t N, typename A>
-bool operator!=(const InlinedVector<T, N, A>& a,
-                const InlinedVector<T, N, A>& b) {
-  return !(a == b);
-}
-
-// `operator<()`
-//
-// Tests whether the contents of one inlined vector are less than the contents
-// of another through a lexicographical comparison operation.
-template <typename T, size_t N, typename A>
-bool operator<(const InlinedVector<T, N, A>& a,
-               const InlinedVector<T, N, A>& b) {
-  return std::lexicographical_compare(a.begin(), a.end(), b.begin(), b.end());
-}
-
-// `operator>()`
-//
-// Tests whether the contents of one inlined vector are greater than the
-// contents of another through a lexicographical comparison operation.
-template <typename T, size_t N, typename A>
-bool operator>(const InlinedVector<T, N, A>& a,
-               const InlinedVector<T, N, A>& b) {
-  return b < a;
-}
-
-// `operator<=()`
-//
-// Tests whether the contents of one inlined vector are less than or equal to
-// the contents of another through a lexicographical comparison operation.
-template <typename T, size_t N, typename A>
-bool operator<=(const InlinedVector<T, N, A>& a,
-                const InlinedVector<T, N, A>& b) {
-  return !(b < a);
-}
-
-// `operator>=()`
-//
-// Tests whether the contents of one inlined vector are greater than or equal to
-// the contents of another through a lexicographical comparison operation.
-template <typename T, size_t N, typename A>
-bool operator>=(const InlinedVector<T, N, A>& a,
-                const InlinedVector<T, N, A>& b) {
-  return !(a < b);
-}
-
-// -----------------------------------------------------------------------------
-// Implementation of InlinedVector
-//
-// Do not depend on any below implementation details!
-// -----------------------------------------------------------------------------
-
-template <typename T, size_t N, typename A>
-InlinedVector<T, N, A>::InlinedVector(const InlinedVector& other)
-    : allocator_and_tag_(other.allocator()) {
-  reserve(other.size());
-  if (allocated()) {
-    UninitializedCopy(other.begin(), other.end(), allocated_space());
-    tag().set_allocated_size(other.size());
-  } else {
-    UninitializedCopy(other.begin(), other.end(), inlined_space());
-    tag().set_inline_size(other.size());
-  }
-}
-
-template <typename T, size_t N, typename A>
-InlinedVector<T, N, A>::InlinedVector(const InlinedVector& other,
-                                      const allocator_type& alloc)
-    : allocator_and_tag_(alloc) {
-  reserve(other.size());
-  if (allocated()) {
-    UninitializedCopy(other.begin(), other.end(), allocated_space());
-    tag().set_allocated_size(other.size());
-  } else {
-    UninitializedCopy(other.begin(), other.end(), inlined_space());
-    tag().set_inline_size(other.size());
-  }
-}
-
-template <typename T, size_t N, typename A>
-InlinedVector<T, N, A>::InlinedVector(InlinedVector&& other) noexcept(
-    absl::allocator_is_nothrow<allocator_type>::value ||
-    std::is_nothrow_move_constructible<value_type>::value)
-    : allocator_and_tag_(other.allocator_and_tag_) {
-  if (other.allocated()) {
-    // We can just steal the underlying buffer from the source.
-    // That leaves the source empty, so we clear its size.
-    init_allocation(other.allocation());
-    other.tag() = Tag();
-  } else {
-    UninitializedCopy(
-        std::make_move_iterator(other.inlined_space()),
-        std::make_move_iterator(other.inlined_space() + other.size()),
-        inlined_space());
-  }
-}
-
-template <typename T, size_t N, typename A>
-InlinedVector<T, N, A>::InlinedVector(InlinedVector&& other,
-                                      const allocator_type& alloc) noexcept(  //
-    absl::allocator_is_nothrow<allocator_type>::value)
-    : allocator_and_tag_(alloc) {
-  if (other.allocated()) {
-    if (alloc == other.allocator()) {
-      // We can just steal the allocation from the source.
-      tag() = other.tag();
-      init_allocation(other.allocation());
-      other.tag() = Tag();
-    } else {
-      // We need to use our own allocator
-      reserve(other.size());
-      UninitializedCopy(std::make_move_iterator(other.begin()),
-                        std::make_move_iterator(other.end()),
-                        allocated_space());
-      tag().set_allocated_size(other.size());
-    }
-  } else {
-    UninitializedCopy(
-        std::make_move_iterator(other.inlined_space()),
-        std::make_move_iterator(other.inlined_space() + other.size()),
-        inlined_space());
-    tag().set_inline_size(other.size());
-  }
-}
-
-template <typename T, size_t N, typename A>
-void InlinedVector<T, N, A>::InitAssign(size_type n, const_reference v) {
-  if (n > inlined_capacity()) {
-    Allocation new_allocation(allocator(), n);
-    init_allocation(new_allocation);
-    UninitializedFill(allocated_space(), allocated_space() + n, v);
-    tag().set_allocated_size(n);
-  } else {
-    UninitializedFill(inlined_space(), inlined_space() + n, v);
-    tag().set_inline_size(n);
-  }
-}
-
-template <typename T, size_t N, typename A>
-void InlinedVector<T, N, A>::InitAssign(size_type n) {
-  if (n > inlined_capacity()) {
-    Allocation new_allocation(allocator(), n);
-    init_allocation(new_allocation);
-    UninitializedFill(allocated_space(), allocated_space() + n);
-    tag().set_allocated_size(n);
-  } else {
-    UninitializedFill(inlined_space(), inlined_space() + n);
-    tag().set_inline_size(n);
-  }
-}
-
-template <typename T, size_t N, typename A>
-void InlinedVector<T, N, A>::resize(size_type n) {
-  size_type s = size();
-  if (n < s) {
-    erase(begin() + n, end());
-    return;
-  }
-  reserve(n);
-  assert(capacity() >= n);
-
-  // Fill new space with elements constructed in-place.
-  if (allocated()) {
-    UninitializedFill(allocated_space() + s, allocated_space() + n);
-    tag().set_allocated_size(n);
-  } else {
-    UninitializedFill(inlined_space() + s, inlined_space() + n);
-    tag().set_inline_size(n);
-  }
-}
-
-template <typename T, size_t N, typename A>
-void InlinedVector<T, N, A>::resize(size_type n, const_reference v) {
-  size_type s = size();
-  if (n < s) {
-    erase(begin() + n, end());
-    return;
-  }
-  reserve(n);
-  assert(capacity() >= n);
-
-  // Fill new space with copies of 'v'.
-  if (allocated()) {
-    UninitializedFill(allocated_space() + s, allocated_space() + n, v);
-    tag().set_allocated_size(n);
-  } else {
-    UninitializedFill(inlined_space() + s, inlined_space() + n, v);
-    tag().set_inline_size(n);
-  }
-}
-
-template <typename T, size_t N, typename A>
-template <typename... Args>
-auto InlinedVector<T, N, A>::emplace(const_iterator position, Args&&... args)
-    -> iterator {
-  assert(position >= begin());
-  assert(position <= end());
-  if (ABSL_PREDICT_FALSE(position == end())) {
-    emplace_back(std::forward<Args>(args)...);
-    return end() - 1;
-  }
-
-  T new_t = T(std::forward<Args>(args)...);
-
-  auto range = ShiftRight(position, 1);
-  if (range.first == range.second) {
-    // constructing into uninitialized memory
-    Construct(range.first, std::move(new_t));
-  } else {
-    // assigning into moved-from object
-    *range.first = T(std::move(new_t));
-  }
-
-  return range.first;
-}
-
-template <typename T, size_t N, typename A>
-auto InlinedVector<T, N, A>::erase(const_iterator from, const_iterator to)
-    -> iterator {
-  assert(begin() <= from);
-  assert(from <= to);
-  assert(to <= end());
-
-  iterator range_start = const_cast<iterator>(from);
-  iterator range_end = const_cast<iterator>(to);
-
-  size_type s = size();
-  ptrdiff_t erase_gap = std::distance(range_start, range_end);
-  if (erase_gap > 0) {
-    pointer space;
-    if (allocated()) {
-      space = allocated_space();
-      tag().set_allocated_size(s - erase_gap);
-    } else {
-      space = inlined_space();
-      tag().set_inline_size(s - erase_gap);
-    }
-    std::move(range_end, space + s, range_start);
-    Destroy(space + s - erase_gap, space + s);
-  }
-  return range_start;
-}
-
-template <typename T, size_t N, typename A>
-void InlinedVector<T, N, A>::swap(InlinedVector& other) {
-  using std::swap;  // Augment ADL with `std::swap`.
-  if (ABSL_PREDICT_FALSE(this == &other)) return;
-
-  if (allocated() && other.allocated()) {
-    // Both out of line, so just swap the tag, allocation, and allocator.
-    swap(tag(), other.tag());
-    swap(allocation(), other.allocation());
-    swap(allocator(), other.allocator());
-    return;
-  }
-  if (!allocated() && !other.allocated()) {
-    // Both inlined: swap up to smaller size, then move remaining elements.
-    InlinedVector* a = this;
-    InlinedVector* b = &other;
-    if (size() < other.size()) {
-      swap(a, b);
-    }
-
-    const size_type a_size = a->size();
-    const size_type b_size = b->size();
-    assert(a_size >= b_size);
-    // `a` is larger. Swap the elements up to the smaller array size.
-    std::swap_ranges(a->inlined_space(), a->inlined_space() + b_size,
-                     b->inlined_space());
-
-    // Move the remaining elements:
-    //   [`b_size`, `a_size`) from `a` -> [`b_size`, `a_size`) from `b`
-    b->UninitializedCopy(a->inlined_space() + b_size,
-                         a->inlined_space() + a_size,
-                         b->inlined_space() + b_size);
-    a->Destroy(a->inlined_space() + b_size, a->inlined_space() + a_size);
-
-    swap(a->tag(), b->tag());
-    swap(a->allocator(), b->allocator());
-    assert(b->size() == a_size);
-    assert(a->size() == b_size);
-    return;
-  }
-
-  // One is out of line, one is inline.
-  // We first move the elements from the inlined vector into the
-  // inlined space in the other vector.  We then put the other vector's
-  // pointer/capacity into the originally inlined vector and swap
-  // the tags.
-  InlinedVector* a = this;
-  InlinedVector* b = &other;
-  if (a->allocated()) {
-    swap(a, b);
-  }
-  assert(!a->allocated());
-  assert(b->allocated());
-  const size_type a_size = a->size();
-  const size_type b_size = b->size();
-  // In an optimized build, `b_size` would be unused.
-  static_cast<void>(b_size);
-
-  // Made Local copies of `size()`, don't need `tag()` accurate anymore
-  swap(a->tag(), b->tag());
-
-  // Copy `b_allocation` out before `b`'s union gets clobbered by `inline_space`
-  Allocation b_allocation = b->allocation();
-
-  b->UninitializedCopy(a->inlined_space(), a->inlined_space() + a_size,
-                       b->inlined_space());
-  a->Destroy(a->inlined_space(), a->inlined_space() + a_size);
-
-  a->allocation() = b_allocation;
-
-  if (a->allocator() != b->allocator()) {
-    swap(a->allocator(), b->allocator());
-  }
-
-  assert(b->size() == a_size);
-  assert(a->size() == b_size);
-}
-
-template <typename T, size_t N, typename A>
-void InlinedVector<T, N, A>::EnlargeBy(size_type delta) {
-  const size_type s = size();
-  assert(s <= capacity());
-
-  size_type target = std::max(inlined_capacity(), s + delta);
-
-  // Compute new capacity by repeatedly doubling current capacity
-  // TODO(psrc): Check and avoid overflow?
-  size_type new_capacity = capacity();
-  while (new_capacity < target) {
-    new_capacity <<= 1;
-  }
-
-  Allocation new_allocation(allocator(), new_capacity);
-
-  UninitializedCopy(std::make_move_iterator(data()),
-                    std::make_move_iterator(data() + s),
-                    new_allocation.buffer());
-
-  ResetAllocation(new_allocation, s);
-}
-
-template <typename T, size_t N, typename A>
-auto InlinedVector<T, N, A>::ShiftRight(const_iterator position, size_type n)
-    -> std::pair<iterator, iterator> {
-  iterator start_used = const_cast<iterator>(position);
-  iterator start_raw = const_cast<iterator>(position);
-  size_type s = size();
-  size_type required_size = s + n;
-
-  if (required_size > capacity()) {
-    // Compute new capacity by repeatedly doubling current capacity
-    size_type new_capacity = capacity();
-    while (new_capacity < required_size) {
-      new_capacity <<= 1;
-    }
-    // Move everyone into the new allocation, leaving a gap of `n` for the
-    // requested shift.
-    Allocation new_allocation(allocator(), new_capacity);
-    size_type index = position - begin();
-    UninitializedCopy(std::make_move_iterator(data()),
-                      std::make_move_iterator(data() + index),
-                      new_allocation.buffer());
-    UninitializedCopy(std::make_move_iterator(data() + index),
-                      std::make_move_iterator(data() + s),
-                      new_allocation.buffer() + index + n);
-    ResetAllocation(new_allocation, s);
-
-    // New allocation means our iterator is invalid, so we'll recalculate.
-    // Since the entire gap is in new space, there's no used space to reuse.
-    start_raw = begin() + index;
-    start_used = start_raw;
-  } else {
-    // If we had enough space, it's a two-part move. Elements going into
-    // previously-unoccupied space need an `UninitializedCopy()`. Elements
-    // going into a previously-occupied space are just a `std::move()`.
-    iterator pos = const_cast<iterator>(position);
-    iterator raw_space = end();
-    size_type slots_in_used_space = raw_space - pos;
-    size_type new_elements_in_used_space = std::min(n, slots_in_used_space);
-    size_type new_elements_in_raw_space = n - new_elements_in_used_space;
-    size_type old_elements_in_used_space =
-        slots_in_used_space - new_elements_in_used_space;
-
-    UninitializedCopy(std::make_move_iterator(pos + old_elements_in_used_space),
-                      std::make_move_iterator(raw_space),
-                      raw_space + new_elements_in_raw_space);
-    std::move_backward(pos, pos + old_elements_in_used_space, raw_space);
-
-    // If the gap is entirely in raw space, the used space starts where the raw
-    // space starts, leaving no elements in used space. If the gap is entirely
-    // in used space, the raw space starts at the end of the gap, leaving all
-    // elements accounted for within the used space.
-    start_used = pos;
-    start_raw = pos + new_elements_in_used_space;
-  }
-  tag().add_size(n);
-  return std::make_pair(start_used, start_raw);
-}
-
-template <typename T, size_t N, typename A>
-void InlinedVector<T, N, A>::Destroy(pointer from, pointer to) {
-  for (pointer cur = from; cur != to; ++cur) {
-    std::allocator_traits<allocator_type>::destroy(allocator(), cur);
-  }
-#ifndef NDEBUG
-  // Overwrite unused memory with `0xab` so we can catch uninitialized usage.
-  // Cast to `void*` to tell the compiler that we don't care that we might be
-  // scribbling on a vtable pointer.
-  if (from != to) {
-    auto len = sizeof(value_type) * std::distance(from, to);
-    std::memset(reinterpret_cast<void*>(from), 0xab, len);
-  }
-#endif
-}
-
-template <typename T, size_t N, typename A>
-template <typename Iterator>
-void InlinedVector<T, N, A>::AppendRange(Iterator first, Iterator last,
-                                         std::forward_iterator_tag) {
-  auto length = std::distance(first, last);
-  reserve(size() + length);
-  if (allocated()) {
-    UninitializedCopy(first, last, allocated_space() + size());
-    tag().set_allocated_size(size() + length);
-  } else {
-    UninitializedCopy(first, last, inlined_space() + size());
-    tag().set_inline_size(size() + length);
-  }
-}
-
-template <typename T, size_t N, typename A>
-template <typename Iterator>
-void InlinedVector<T, N, A>::AssignRange(Iterator first, Iterator last,
-                                         std::input_iterator_tag) {
-  // Optimized to avoid reallocation.
-  // Prefer reassignment to copy construction for elements.
-  iterator out = begin();
-  for (; first != last && out != end(); ++first, ++out) {
-    *out = *first;
-  }
-  erase(out, end());
-  std::copy(first, last, std::back_inserter(*this));
-}
-
-template <typename T, size_t N, typename A>
-template <typename Iterator>
-void InlinedVector<T, N, A>::AssignRange(Iterator first, Iterator last,
-                                         std::forward_iterator_tag) {
-  auto length = std::distance(first, last);
-  // Prefer reassignment to copy construction for elements.
-  if (static_cast<size_type>(length) <= size()) {
-    erase(std::copy(first, last, begin()), end());
-    return;
-  }
-  reserve(length);
-  iterator out = begin();
-  for (; out != end(); ++first, ++out) *out = *first;
-  if (allocated()) {
-    UninitializedCopy(first, last, out);
-    tag().set_allocated_size(length);
-  } else {
-    UninitializedCopy(first, last, out);
-    tag().set_inline_size(length);
-  }
-}
-
-template <typename T, size_t N, typename A>
-auto InlinedVector<T, N, A>::InsertWithCount(const_iterator position,
-                                             size_type n, const_reference v)
-    -> iterator {
-  assert(position >= begin() && position <= end());
-  if (ABSL_PREDICT_FALSE(n == 0)) return const_cast<iterator>(position);
-
-  value_type copy = v;
-  std::pair<iterator, iterator> it_pair = ShiftRight(position, n);
-  std::fill(it_pair.first, it_pair.second, copy);
-  UninitializedFill(it_pair.second, it_pair.first + n, copy);
-
-  return it_pair.first;
-}
-
-template <typename T, size_t N, typename A>
-template <typename InputIterator>
-auto InlinedVector<T, N, A>::InsertWithRange(const_iterator position,
-                                             InputIterator first,
-                                             InputIterator last,
-                                             std::input_iterator_tag)
-    -> iterator {
-  assert(position >= begin() && position <= end());
-  size_type index = position - cbegin();
-  size_type i = index;
-  while (first != last) insert(begin() + i++, *first++);
-  return begin() + index;
-}
-
-template <typename T, size_t N, typename A>
-template <typename ForwardIterator>
-auto InlinedVector<T, N, A>::InsertWithRange(const_iterator position,
-                                             ForwardIterator first,
-                                             ForwardIterator last,
-                                             std::forward_iterator_tag)
-    -> iterator {
-  assert(position >= begin() && position <= end());
-  if (ABSL_PREDICT_FALSE(first == last)) return const_cast<iterator>(position);
-
-  auto n = std::distance(first, last);
-  std::pair<iterator, iterator> it_pair = ShiftRight(position, n);
-  size_type used_spots = it_pair.second - it_pair.first;
-  ForwardIterator open_spot = std::next(first, used_spots);
-  std::copy(first, open_spot, it_pair.first);
-  UninitializedCopy(open_spot, last, it_pair.second);
-  return it_pair.first;
-}
-
-}  // namespace absl
-
-#endif  // ABSL_CONTAINER_INLINED_VECTOR_H_
diff --git a/submodules/libtgvoip/webrtc_dsp/absl/memory/memory.h b/submodules/libtgvoip/webrtc_dsp/absl/memory/memory.h
deleted file mode 100755
index 8bf4fe82ad..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/absl/memory/memory.h
+++ /dev/null
@@ -1,697 +0,0 @@
-// Copyright 2017 The Abseil Authors.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-// -----------------------------------------------------------------------------
-// File: memory.h
-// -----------------------------------------------------------------------------
-//
-// This header file contains utility functions for managing the creation and
-// conversion of smart pointers. This file is an extension to the C++
-// standard <memory> library header file.
-
-#ifndef ABSL_MEMORY_MEMORY_H_
-#define ABSL_MEMORY_MEMORY_H_
-
-#include <cstddef>
-#include <limits>
-#include <memory>
-#include <new>
-#include <type_traits>
-#include <utility>
-
-#include "absl/base/macros.h"
-#include "absl/meta/type_traits.h"
-
-namespace absl {
-
-// -----------------------------------------------------------------------------
-// Function Template: WrapUnique()
-// -----------------------------------------------------------------------------
-//
-// Adopts ownership from a raw pointer and transfers it to the returned
-// `std::unique_ptr`, whose type is deduced. Because of this deduction, *do not*
-// specify the template type `T` when calling `WrapUnique`.
-//
-// Example:
-//   X* NewX(int, int);
-//   auto x = WrapUnique(NewX(1, 2));  // 'x' is std::unique_ptr<X>.
-//
-// The purpose of WrapUnique is to automatically deduce the pointer type. If you
-// wish to make the type explicit, for readability reasons or because you prefer
-// to use a base-class pointer rather than a derived one, just use
-// `std::unique_ptr` directly.
-//
-// Example:
-//   X* Factory(int, int);
-//   auto x = std::unique_ptr<X>(Factory(1, 2));
-//                  - or -
-//   std::unique_ptr<X> x(Factory(1, 2));
-//
-// This has the added advantage of working whether Factory returns a raw
-// pointer or a `std::unique_ptr`.
-//
-// While `absl::WrapUnique` is useful for capturing the output of a raw
-// pointer factory, prefer 'absl::make_unique<T>(args...)' over
-// 'absl::WrapUnique(new T(args...))'.
-//
-//   auto x = WrapUnique(new X(1, 2));  // works, but nonideal.
-//   auto x = make_unique<X>(1, 2);     // safer, standard, avoids raw 'new'.
-//
-// Note that `absl::WrapUnique(p)` is valid only if `delete p` is a valid
-// expression. In particular, `absl::WrapUnique()` cannot wrap pointers to
-// arrays, functions or void, and it must not be used to capture pointers
-// obtained from array-new expressions (even though that would compile!).
-template <typename T>
-std::unique_ptr<T> WrapUnique(T* ptr) {
-  static_assert(!std::is_array<T>::value, "array types are unsupported");
-  static_assert(std::is_object<T>::value, "non-object types are unsupported");
-  return std::unique_ptr<T>(ptr);
-}
-
-namespace memory_internal {
-
-// Traits to select proper overload and return type for `absl::make_unique<>`.
-template <typename T>
-struct MakeUniqueResult {
-  using scalar = std::unique_ptr<T>;
-};
-template <typename T>
-struct MakeUniqueResult<T[]> {
-  using array = std::unique_ptr<T[]>;
-};
-template <typename T, size_t N>
-struct MakeUniqueResult<T[N]> {
-  using invalid = void;
-};
-
-}  // namespace memory_internal
-
-// gcc 4.8 has __cplusplus at 201301 but doesn't define make_unique.  Other
-// supported compilers either just define __cplusplus as 201103 but have
-// make_unique (msvc), or have make_unique whenever __cplusplus > 201103 (clang)
-#if (__cplusplus > 201103L || defined(_MSC_VER)) && \
-    !(defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ == 8)
-using std::make_unique;
-#else
-// -----------------------------------------------------------------------------
-// Function Template: make_unique<T>()
-// -----------------------------------------------------------------------------
-//
-// Creates a `std::unique_ptr<>`, while avoiding issues creating temporaries
-// during the construction process. `absl::make_unique<>` also avoids redundant
-// type declarations, by avoiding the need to explicitly use the `new` operator.
-//
-// This implementation of `absl::make_unique<>` is designed for C++11 code and
-// will be replaced in C++14 by the equivalent `std::make_unique<>` abstraction.
-// `absl::make_unique<>` is designed to be 100% compatible with
-// `std::make_unique<>` so that the eventual migration will involve a simple
-// rename operation.
-//
-// For more background on why `std::unique_ptr<T>(new T(a,b))` is problematic,
-// see Herb Sutter's explanation on
-// (Exception-Safe Function Calls)[http://herbsutter.com/gotw/_102/].
-// (In general, reviewers should treat `new T(a,b)` with scrutiny.)
-//
-// Example usage:
-//
-//    auto p = make_unique<X>(args...);  // 'p'  is a std::unique_ptr<X>
-//    auto pa = make_unique<X[]>(5);     // 'pa' is a std::unique_ptr<X[]>
-//
-// Three overloads of `absl::make_unique` are required:
-//
-//   - For non-array T:
-//
-//       Allocates a T with `new T(std::forward<Args> args...)`,
-//       forwarding all `args` to T's constructor.
-//       Returns a `std::unique_ptr<T>` owning that object.
-//
-//   - For an array of unknown bounds T[]:
-//
-//       `absl::make_unique<>` will allocate an array T of type U[] with
-//       `new U[n]()` and return a `std::unique_ptr<U[]>` owning that array.
-//
-//       Note that 'U[n]()' is different from 'U[n]', and elements will be
-//       value-initialized. Note as well that `std::unique_ptr` will perform its
-//       own destruction of the array elements upon leaving scope, even though
-//       the array [] does not have a default destructor.
-//
-//       NOTE: an array of unknown bounds T[] may still be (and often will be)
-//       initialized to have a size, and will still use this overload. E.g:
-//
-//         auto my_array = absl::make_unique<int[]>(10);
-//
-//   - For an array of known bounds T[N]:
-//
-//       `absl::make_unique<>` is deleted (like with `std::make_unique<>`) as
-//       this overload is not useful.
-//
-//       NOTE: an array of known bounds T[N] is not considered a useful
-//       construction, and may cause undefined behavior in templates. E.g:
-//
-//         auto my_array = absl::make_unique<int[10]>();
-//
-//       In those cases, of course, you can still use the overload above and
-//       simply initialize it to its desired size:
-//
-//         auto my_array = absl::make_unique<int[]>(10);
-
-// `absl::make_unique` overload for non-array types.
-template <typename T, typename... Args>
-typename memory_internal::MakeUniqueResult<T>::scalar make_unique(
-    Args&&... args) {
-  return std::unique_ptr<T>(new T(std::forward<Args>(args)...));
-}
-
-// `absl::make_unique` overload for an array T[] of unknown bounds.
-// The array allocation needs to use the `new T[size]` form and cannot take
-// element constructor arguments. The `std::unique_ptr` will manage destructing
-// these array elements.
-template <typename T>
-typename memory_internal::MakeUniqueResult<T>::array make_unique(size_t n) {
-  return std::unique_ptr<T>(new typename absl::remove_extent_t<T>[n]());
-}
-
-// `absl::make_unique` overload for an array T[N] of known bounds.
-// This construction will be rejected.
-template <typename T, typename... Args>
-typename memory_internal::MakeUniqueResult<T>::invalid make_unique(
-    Args&&... /* args */) = delete;
-#endif
-
-// -----------------------------------------------------------------------------
-// Function Template: RawPtr()
-// -----------------------------------------------------------------------------
-//
-// Extracts the raw pointer from a pointer-like value `ptr`. `absl::RawPtr` is
-// useful within templates that need to handle a complement of raw pointers,
-// `std::nullptr_t`, and smart pointers.
-template <typename T>
-auto RawPtr(T&& ptr) -> decltype(std::addressof(*ptr)) {
-  // ptr is a forwarding reference to support Ts with non-const operators.
-  return (ptr != nullptr) ? std::addressof(*ptr) : nullptr;
-}
-inline std::nullptr_t RawPtr(std::nullptr_t) { return nullptr; }
-
-// -----------------------------------------------------------------------------
-// Function Template: ShareUniquePtr()
-// -----------------------------------------------------------------------------
-//
-// Adopts a `std::unique_ptr` rvalue and returns a `std::shared_ptr` of deduced
-// type. Ownership (if any) of the held value is transferred to the returned
-// shared pointer.
-//
-// Example:
-//
-//     auto up = absl::make_unique<int>(10);
-//     auto sp = absl::ShareUniquePtr(std::move(up));  // shared_ptr<int>
-//     CHECK_EQ(*sp, 10);
-//     CHECK(up == nullptr);
-//
-// Note that this conversion is correct even when T is an array type, and more
-// generally it works for *any* deleter of the `unique_ptr` (single-object
-// deleter, array deleter, or any custom deleter), since the deleter is adopted
-// by the shared pointer as well. The deleter is copied (unless it is a
-// reference).
-//
-// Implements the resolution of [LWG 2415](http://wg21.link/lwg2415), by which a
-// null shared pointer does not attempt to call the deleter.
-template <typename T, typename D>
-std::shared_ptr<T> ShareUniquePtr(std::unique_ptr<T, D>&& ptr) {
-  return ptr ? std::shared_ptr<T>(std::move(ptr)) : std::shared_ptr<T>();
-}
-
-// -----------------------------------------------------------------------------
-// Function Template: WeakenPtr()
-// -----------------------------------------------------------------------------
-//
-// Creates a weak pointer associated with a given shared pointer. The returned
-// value is a `std::weak_ptr` of deduced type.
-//
-// Example:
-//
-//    auto sp = std::make_shared<int>(10);
-//    auto wp = absl::WeakenPtr(sp);
-//    CHECK_EQ(sp.get(), wp.lock().get());
-//    sp.reset();
-//    CHECK(wp.lock() == nullptr);
-//
-template <typename T>
-std::weak_ptr<T> WeakenPtr(const std::shared_ptr<T>& ptr) {
-  return std::weak_ptr<T>(ptr);
-}
-
-namespace memory_internal {
-
-// ExtractOr<E, O, D>::type evaluates to E<O> if possible. Otherwise, D.
-template <template <typename> class Extract, typename Obj, typename Default,
-          typename>
-struct ExtractOr {
-  using type = Default;
-};
-
-template <template <typename> class Extract, typename Obj, typename Default>
-struct ExtractOr<Extract, Obj, Default, void_t<Extract<Obj>>> {
-  using type = Extract<Obj>;
-};
-
-template <template <typename> class Extract, typename Obj, typename Default>
-using ExtractOrT = typename ExtractOr<Extract, Obj, Default, void>::type;
-
-// Extractors for the features of allocators.
-template <typename T>
-using GetPointer = typename T::pointer;
-
-template <typename T>
-using GetConstPointer = typename T::const_pointer;
-
-template <typename T>
-using GetVoidPointer = typename T::void_pointer;
-
-template <typename T>
-using GetConstVoidPointer = typename T::const_void_pointer;
-
-template <typename T>
-using GetDifferenceType = typename T::difference_type;
-
-template <typename T>
-using GetSizeType = typename T::size_type;
-
-template <typename T>
-using GetPropagateOnContainerCopyAssignment =
-    typename T::propagate_on_container_copy_assignment;
-
-template <typename T>
-using GetPropagateOnContainerMoveAssignment =
-    typename T::propagate_on_container_move_assignment;
-
-template <typename T>
-using GetPropagateOnContainerSwap = typename T::propagate_on_container_swap;
-
-template <typename T>
-using GetIsAlwaysEqual = typename T::is_always_equal;
-
-template <typename T>
-struct GetFirstArg;
-
-template <template <typename...> class Class, typename T, typename... Args>
-struct GetFirstArg<Class<T, Args...>> {
-  using type = T;
-};
-
-template <typename Ptr, typename = void>
-struct ElementType {
-  using type = typename GetFirstArg<Ptr>::type;
-};
-
-template <typename T>
-struct ElementType<T, void_t<typename T::element_type>> {
-  using type = typename T::element_type;
-};
-
-template <typename T, typename U>
-struct RebindFirstArg;
-
-template <template <typename...> class Class, typename T, typename... Args,
-          typename U>
-struct RebindFirstArg<Class<T, Args...>, U> {
-  using type = Class<U, Args...>;
-};
-
-template <typename T, typename U, typename = void>
-struct RebindPtr {
-  using type = typename RebindFirstArg<T, U>::type;
-};
-
-template <typename T, typename U>
-struct RebindPtr<T, U, void_t<typename T::template rebind<U>>> {
-  using type = typename T::template rebind<U>;
-};
-
-template <typename T, typename U>
-constexpr bool HasRebindAlloc(...) {
-  return false;
-}
-
-template <typename T, typename U>
-constexpr bool HasRebindAlloc(typename T::template rebind<U>::other*) {
-  return true;
-}
-
-template <typename T, typename U, bool = HasRebindAlloc<T, U>(nullptr)>
-struct RebindAlloc {
-  using type = typename RebindFirstArg<T, U>::type;
-};
-
-template <typename T, typename U>
-struct RebindAlloc<T, U, true> {
-  using type = typename T::template rebind<U>::other;
-};
-
-}  // namespace memory_internal
-
-// -----------------------------------------------------------------------------
-// Class Template: pointer_traits
-// -----------------------------------------------------------------------------
-//
-// An implementation of C++11's std::pointer_traits.
-//
-// Provided for portability on toolchains that have a working C++11 compiler,
-// but the standard library is lacking in C++11 support. For example, some
-// version of the Android NDK.
-//
-
-template <typename Ptr>
-struct pointer_traits {
-  using pointer = Ptr;
-
-  // element_type:
-  // Ptr::element_type if present. Otherwise T if Ptr is a template
-  // instantiation Template<T, Args...>
-  using element_type = typename memory_internal::ElementType<Ptr>::type;
-
-  // difference_type:
-  // Ptr::difference_type if present, otherwise std::ptrdiff_t
-  using difference_type =
-      memory_internal::ExtractOrT<memory_internal::GetDifferenceType, Ptr,
-                                  std::ptrdiff_t>;
-
-  // rebind:
-  // Ptr::rebind<U> if exists, otherwise Template<U, Args...> if Ptr is a
-  // template instantiation Template<T, Args...>
-  template <typename U>
-  using rebind = typename memory_internal::RebindPtr<Ptr, U>::type;
-
-  // pointer_to:
-  // Calls Ptr::pointer_to(r)
-  static pointer pointer_to(element_type& r) {  // NOLINT(runtime/references)
-    return Ptr::pointer_to(r);
-  }
-};
-
-// Specialization for T*.
-template <typename T>
-struct pointer_traits<T*> {
-  using pointer = T*;
-  using element_type = T;
-  using difference_type = std::ptrdiff_t;
-
-  template <typename U>
-  using rebind = U*;
-
-  // pointer_to:
-  // Calls std::addressof(r)
-  static pointer pointer_to(
-      element_type& r) noexcept {  // NOLINT(runtime/references)
-    return std::addressof(r);
-  }
-};
-
-// -----------------------------------------------------------------------------
-// Class Template: allocator_traits
-// -----------------------------------------------------------------------------
-//
-// A C++11 compatible implementation of C++17's std::allocator_traits.
-//
-template <typename Alloc>
-struct allocator_traits {
-  using allocator_type = Alloc;
-
-  // value_type:
-  // Alloc::value_type
-  using value_type = typename Alloc::value_type;
-
-  // pointer:
-  // Alloc::pointer if present, otherwise value_type*
-  using pointer = memory_internal::ExtractOrT<memory_internal::GetPointer,
-                                              Alloc, value_type*>;
-
-  // const_pointer:
-  // Alloc::const_pointer if present, otherwise
-  // absl::pointer_traits<pointer>::rebind<const value_type>
-  using const_pointer =
-      memory_internal::ExtractOrT<memory_internal::GetConstPointer, Alloc,
-                                  typename absl::pointer_traits<pointer>::
-                                      template rebind<const value_type>>;
-
-  // void_pointer:
-  // Alloc::void_pointer if present, otherwise
-  // absl::pointer_traits<pointer>::rebind<void>
-  using void_pointer = memory_internal::ExtractOrT<
-      memory_internal::GetVoidPointer, Alloc,
-      typename absl::pointer_traits<pointer>::template rebind<void>>;
-
-  // const_void_pointer:
-  // Alloc::const_void_pointer if present, otherwise
-  // absl::pointer_traits<pointer>::rebind<const void>
-  using const_void_pointer = memory_internal::ExtractOrT<
-      memory_internal::GetConstVoidPointer, Alloc,
-      typename absl::pointer_traits<pointer>::template rebind<const void>>;
-
-  // difference_type:
-  // Alloc::difference_type if present, otherwise
-  // absl::pointer_traits<pointer>::difference_type
-  using difference_type = memory_internal::ExtractOrT<
-      memory_internal::GetDifferenceType, Alloc,
-      typename absl::pointer_traits<pointer>::difference_type>;
-
-  // size_type:
-  // Alloc::size_type if present, otherwise
-  // std::make_unsigned<difference_type>::type
-  using size_type = memory_internal::ExtractOrT<
-      memory_internal::GetSizeType, Alloc,
-      typename std::make_unsigned<difference_type>::type>;
-
-  // propagate_on_container_copy_assignment:
-  // Alloc::propagate_on_container_copy_assignment if present, otherwise
-  // std::false_type
-  using propagate_on_container_copy_assignment = memory_internal::ExtractOrT<
-      memory_internal::GetPropagateOnContainerCopyAssignment, Alloc,
-      std::false_type>;
-
-  // propagate_on_container_move_assignment:
-  // Alloc::propagate_on_container_move_assignment if present, otherwise
-  // std::false_type
-  using propagate_on_container_move_assignment = memory_internal::ExtractOrT<
-      memory_internal::GetPropagateOnContainerMoveAssignment, Alloc,
-      std::false_type>;
-
-  // propagate_on_container_swap:
-  // Alloc::propagate_on_container_swap if present, otherwise std::false_type
-  using propagate_on_container_swap =
-      memory_internal::ExtractOrT<memory_internal::GetPropagateOnContainerSwap,
-                                  Alloc, std::false_type>;
-
-  // is_always_equal:
-  // Alloc::is_always_equal if present, otherwise std::is_empty<Alloc>::type
-  using is_always_equal =
-      memory_internal::ExtractOrT<memory_internal::GetIsAlwaysEqual, Alloc,
-                                  typename std::is_empty<Alloc>::type>;
-
-  // rebind_alloc:
-  // Alloc::rebind<T>::other if present, otherwise Alloc<T, Args> if this Alloc
-  // is Alloc<U, Args>
-  template <typename T>
-  using rebind_alloc = typename memory_internal::RebindAlloc<Alloc, T>::type;
-
-  // rebind_traits:
-  // absl::allocator_traits<rebind_alloc<T>>
-  template <typename T>
-  using rebind_traits = absl::allocator_traits<rebind_alloc<T>>;
-
-  // allocate(Alloc& a, size_type n):
-  // Calls a.allocate(n)
-  static pointer allocate(Alloc& a,  // NOLINT(runtime/references)
-                          size_type n) {
-    return a.allocate(n);
-  }
-
-  // allocate(Alloc& a, size_type n, const_void_pointer hint):
-  // Calls a.allocate(n, hint) if possible.
-  // If not possible, calls a.allocate(n)
-  static pointer allocate(Alloc& a, size_type n,  // NOLINT(runtime/references)
-                          const_void_pointer hint) {
-    return allocate_impl(0, a, n, hint);
-  }
-
-  // deallocate(Alloc& a, pointer p, size_type n):
-  // Calls a.deallocate(p, n)
-  static void deallocate(Alloc& a, pointer p,  // NOLINT(runtime/references)
-                         size_type n) {
-    a.deallocate(p, n);
-  }
-
-  // construct(Alloc& a, T* p, Args&&... args):
-  // Calls a.construct(p, std::forward<Args>(args)...) if possible.
-  // If not possible, calls
-  //   ::new (static_cast<void*>(p)) T(std::forward<Args>(args)...)
-  template <typename T, typename... Args>
-  static void construct(Alloc& a, T* p,  // NOLINT(runtime/references)
-                        Args&&... args) {
-    construct_impl(0, a, p, std::forward<Args>(args)...);
-  }
-
-  // destroy(Alloc& a, T* p):
-  // Calls a.destroy(p) if possible. If not possible, calls p->~T().
-  template <typename T>
-  static void destroy(Alloc& a, T* p) {  // NOLINT(runtime/references)
-    destroy_impl(0, a, p);
-  }
-
-  // max_size(const Alloc& a):
-  // Returns a.max_size() if possible. If not possible, returns
-  //   std::numeric_limits<size_type>::max() / sizeof(value_type)
-  static size_type max_size(const Alloc& a) { return max_size_impl(0, a); }
-
-  // select_on_container_copy_construction(const Alloc& a):
-  // Returns a.select_on_container_copy_construction() if possible.
-  // If not possible, returns a.
-  static Alloc select_on_container_copy_construction(const Alloc& a) {
-    return select_on_container_copy_construction_impl(0, a);
-  }
-
- private:
-  template <typename A>
-  static auto allocate_impl(int, A& a,  // NOLINT(runtime/references)
-                            size_type n, const_void_pointer hint)
-      -> decltype(a.allocate(n, hint)) {
-    return a.allocate(n, hint);
-  }
-  static pointer allocate_impl(char, Alloc& a,  // NOLINT(runtime/references)
-                               size_type n, const_void_pointer) {
-    return a.allocate(n);
-  }
-
-  template <typename A, typename... Args>
-  static auto construct_impl(int, A& a,  // NOLINT(runtime/references)
-                             Args&&... args)
-      -> decltype(a.construct(std::forward<Args>(args)...)) {
-    a.construct(std::forward<Args>(args)...);
-  }
-
-  template <typename T, typename... Args>
-  static void construct_impl(char, Alloc&, T* p, Args&&... args) {
-    ::new (static_cast<void*>(p)) T(std::forward<Args>(args)...);
-  }
-
-  template <typename A, typename T>
-  static auto destroy_impl(int, A& a,  // NOLINT(runtime/references)
-                           T* p) -> decltype(a.destroy(p)) {
-    a.destroy(p);
-  }
-  template <typename T>
-  static void destroy_impl(char, Alloc&, T* p) {
-    p->~T();
-  }
-
-  template <typename A>
-  static auto max_size_impl(int, const A& a) -> decltype(a.max_size()) {
-    return a.max_size();
-  }
-  static size_type max_size_impl(char, const Alloc&) {
-    return (std::numeric_limits<size_type>::max)() / sizeof(value_type);
-  }
-
-  template <typename A>
-  static auto select_on_container_copy_construction_impl(int, const A& a)
-      -> decltype(a.select_on_container_copy_construction()) {
-    return a.select_on_container_copy_construction();
-  }
-  static Alloc select_on_container_copy_construction_impl(char,
-                                                          const Alloc& a) {
-    return a;
-  }
-};
-
-namespace memory_internal {
-
-// This template alias transforms Alloc::is_nothrow into a metafunction with
-// Alloc as a parameter so it can be used with ExtractOrT<>.
-template <typename Alloc>
-using GetIsNothrow = typename Alloc::is_nothrow;
-
-}  // namespace memory_internal
-
-// ABSL_ALLOCATOR_NOTHROW is a build time configuration macro for user to
-// specify whether the default allocation function can throw or never throws.
-// If the allocation function never throws, user should define it to a non-zero
-// value (e.g. via `-DABSL_ALLOCATOR_NOTHROW`).
-// If the allocation function can throw, user should leave it undefined or
-// define it to zero.
-//
-// allocator_is_nothrow<Alloc> is a traits class that derives from
-// Alloc::is_nothrow if present, otherwise std::false_type. It's specialized
-// for Alloc = std::allocator<T> for any type T according to the state of
-// ABSL_ALLOCATOR_NOTHROW.
-//
-// default_allocator_is_nothrow is a class that derives from std::true_type
-// when the default allocator (global operator new) never throws, and
-// std::false_type when it can throw. It is a convenience shorthand for writing
-// allocator_is_nothrow<std::allocator<T>> (T can be any type).
-// NOTE: allocator_is_nothrow<std::allocator<T>> is guaranteed to derive from
-// the same type for all T, because users should specialize neither
-// allocator_is_nothrow nor std::allocator.
-template <typename Alloc>
-struct allocator_is_nothrow
-    : memory_internal::ExtractOrT<memory_internal::GetIsNothrow, Alloc,
-                                  std::false_type> {};
-
-#if ABSL_ALLOCATOR_NOTHROW
-template <typename T>
-struct allocator_is_nothrow<std::allocator<T>> : std::true_type {};
-struct default_allocator_is_nothrow : std::true_type {};
-#else
-struct default_allocator_is_nothrow : std::false_type {};
-#endif
-
-namespace memory_internal {
-template <typename Allocator, typename Iterator, typename... Args>
-void ConstructRange(Allocator& alloc, Iterator first, Iterator last,
-                    const Args&... args) {
-  for (Iterator cur = first; cur != last; ++cur) {
-    ABSL_INTERNAL_TRY {
-      std::allocator_traits<Allocator>::construct(alloc, std::addressof(*cur),
-                                                  args...);
-    }
-    ABSL_INTERNAL_CATCH_ANY {
-      while (cur != first) {
-        --cur;
-        std::allocator_traits<Allocator>::destroy(alloc, std::addressof(*cur));
-      }
-      ABSL_INTERNAL_RETHROW;
-    }
-  }
-}
-
-template <typename Allocator, typename Iterator, typename InputIterator>
-void CopyRange(Allocator& alloc, Iterator destination, InputIterator first,
-               InputIterator last) {
-  for (Iterator cur = destination; first != last;
-       static_cast<void>(++cur), static_cast<void>(++first)) {
-    ABSL_INTERNAL_TRY {
-      std::allocator_traits<Allocator>::construct(alloc, std::addressof(*cur),
-                                                  *first);
-    }
-    ABSL_INTERNAL_CATCH_ANY {
-      while (cur != destination) {
-        --cur;
-        std::allocator_traits<Allocator>::destroy(alloc, std::addressof(*cur));
-      }
-      ABSL_INTERNAL_RETHROW;
-    }
-  }
-}
-}  // namespace memory_internal
-}  // namespace absl
-
-#endif  // ABSL_MEMORY_MEMORY_H_
diff --git a/submodules/libtgvoip/webrtc_dsp/absl/meta/type_traits.h b/submodules/libtgvoip/webrtc_dsp/absl/meta/type_traits.h
deleted file mode 100755
index 23ebd6ed09..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/absl/meta/type_traits.h
+++ /dev/null
@@ -1,436 +0,0 @@
-//
-// Copyright 2017 The Abseil Authors.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-// -----------------------------------------------------------------------------
-// type_traits.h
-// -----------------------------------------------------------------------------
-//
-// This file contains C++11-compatible versions of standard <type_traits> API
-// functions for determining the characteristics of types. Such traits can
-// support type inference, classification, and transformation, as well as
-// make it easier to write templates based on generic type behavior.
-//
-// See http://en.cppreference.com/w/cpp/header/type_traits
-//
-// WARNING: use of many of the constructs in this header will count as "complex
-// template metaprogramming", so before proceeding, please carefully consider
-// https://google.github.io/styleguide/cppguide.html#Template_metaprogramming
-//
-// WARNING: using template metaprogramming to detect or depend on API
-// features is brittle and not guaranteed. Neither the standard library nor
-// Abseil provides any guarantee that APIs are stable in the face of template
-// metaprogramming. Use with caution.
-#ifndef ABSL_META_TYPE_TRAITS_H_
-#define ABSL_META_TYPE_TRAITS_H_
-
-#include <stddef.h>
-#include <functional>
-#include <type_traits>
-
-#include "absl/base/config.h"
-
-namespace absl {
-
-namespace type_traits_internal {
-
-template <typename... Ts>
-struct VoidTImpl {
-  using type = void;
-};
-
-// This trick to retrieve a default alignment is necessary for our
-// implementation of aligned_storage_t to be consistent with any implementation
-// of std::aligned_storage.
-template <size_t Len, typename T = std::aligned_storage<Len>>
-struct default_alignment_of_aligned_storage;
-
-template <size_t Len, size_t Align>
-struct default_alignment_of_aligned_storage<Len,
-                                            std::aligned_storage<Len, Align>> {
-  static constexpr size_t value = Align;
-};
-
-////////////////////////////////
-// Library Fundamentals V2 TS //
-////////////////////////////////
-
-// NOTE: The `is_detected` family of templates here differ from the library
-// fundamentals specification in that for library fundamentals, `Op<Args...>` is
-// evaluated as soon as the type `is_detected<Op, Args...>` undergoes
-// substitution, regardless of whether or not the `::value` is accessed. That
-// is inconsistent with all other standard traits and prevents lazy evaluation
-// in larger contexts (such as if the `is_detected` check is a trailing argument
-// of a `conjunction`. This implementation opts to instead be lazy in the same
-// way that the standard traits are (this "defect" of the detection idiom
-// specifications has been reported).
-
-template <class Enabler, template <class...> class Op, class... Args>
-struct is_detected_impl {
-  using type = std::false_type;
-};
-
-template <template <class...> class Op, class... Args>
-struct is_detected_impl<typename VoidTImpl<Op<Args...>>::type, Op, Args...> {
-  using type = std::true_type;
-};
-
-template <template <class...> class Op, class... Args>
-struct is_detected : is_detected_impl<void, Op, Args...>::type {};
-
-template <class Enabler, class To, template <class...> class Op, class... Args>
-struct is_detected_convertible_impl {
-  using type = std::false_type;
-};
-
-template <class To, template <class...> class Op, class... Args>
-struct is_detected_convertible_impl<
-    typename std::enable_if<std::is_convertible<Op<Args...>, To>::value>::type,
-    To, Op, Args...> {
-  using type = std::true_type;
-};
-
-template <class To, template <class...> class Op, class... Args>
-struct is_detected_convertible
-    : is_detected_convertible_impl<void, To, Op, Args...>::type {};
-
-template <typename T>
-using IsCopyAssignableImpl =
-    decltype(std::declval<T&>() = std::declval<const T&>());
-
-template <typename T>
-using IsMoveAssignableImpl = decltype(std::declval<T&>() = std::declval<T&&>());
-
-}  // namespace type_traits_internal
-
-template <typename T>
-struct is_copy_assignable : type_traits_internal::is_detected<
-                                type_traits_internal::IsCopyAssignableImpl, T> {
-};
-
-template <typename T>
-struct is_move_assignable : type_traits_internal::is_detected<
-                                type_traits_internal::IsMoveAssignableImpl, T> {
-};
-
-// void_t()
-//
-// Ignores the type of any its arguments and returns `void`. In general, this
-// metafunction allows you to create a general case that maps to `void` while
-// allowing specializations that map to specific types.
-//
-// This metafunction is designed to be a drop-in replacement for the C++17
-// `std::void_t` metafunction.
-//
-// NOTE: `absl::void_t` does not use the standard-specified implementation so
-// that it can remain compatible with gcc < 5.1. This can introduce slightly
-// different behavior, such as when ordering partial specializations.
-template <typename... Ts>
-using void_t = typename type_traits_internal::VoidTImpl<Ts...>::type;
-
-// conjunction
-//
-// Performs a compile-time logical AND operation on the passed types (which
-// must have  `::value` members convertible to `bool`. Short-circuits if it
-// encounters any `false` members (and does not compare the `::value` members
-// of any remaining arguments).
-//
-// This metafunction is designed to be a drop-in replacement for the C++17
-// `std::conjunction` metafunction.
-template <typename... Ts>
-struct conjunction;
-
-template <typename T, typename... Ts>
-struct conjunction<T, Ts...>
-    : std::conditional<T::value, conjunction<Ts...>, T>::type {};
-
-template <typename T>
-struct conjunction<T> : T {};
-
-template <>
-struct conjunction<> : std::true_type {};
-
-// disjunction
-//
-// Performs a compile-time logical OR operation on the passed types (which
-// must have  `::value` members convertible to `bool`. Short-circuits if it
-// encounters any `true` members (and does not compare the `::value` members
-// of any remaining arguments).
-//
-// This metafunction is designed to be a drop-in replacement for the C++17
-// `std::disjunction` metafunction.
-template <typename... Ts>
-struct disjunction;
-
-template <typename T, typename... Ts>
-struct disjunction<T, Ts...> :
-      std::conditional<T::value, T, disjunction<Ts...>>::type {};
-
-template <typename T>
-struct disjunction<T> : T {};
-
-template <>
-struct disjunction<> : std::false_type {};
-
-// negation
-//
-// Performs a compile-time logical NOT operation on the passed type (which
-// must have  `::value` members convertible to `bool`.
-//
-// This metafunction is designed to be a drop-in replacement for the C++17
-// `std::negation` metafunction.
-template <typename T>
-struct negation : std::integral_constant<bool, !T::value> {};
-
-// is_trivially_destructible()
-//
-// Determines whether the passed type `T` is trivially destructable.
-//
-// This metafunction is designed to be a drop-in replacement for the C++11
-// `std::is_trivially_destructible()` metafunction for platforms that have
-// incomplete C++11 support (such as libstdc++ 4.x). On any platforms that do
-// fully support C++11, we check whether this yields the same result as the std
-// implementation.
-//
-// NOTE: the extensions (__has_trivial_xxx) are implemented in gcc (version >=
-// 4.3) and clang. Since we are supporting libstdc++ > 4.7, they should always
-// be present. These  extensions are documented at
-// https://gcc.gnu.org/onlinedocs/gcc/Type-Traits.html#Type-Traits.
-template <typename T>
-struct is_trivially_destructible
-    : std::integral_constant<bool, __has_trivial_destructor(T) &&
-                                   std::is_destructible<T>::value> {
-#ifdef ABSL_HAVE_STD_IS_TRIVIALLY_DESTRUCTIBLE
- private:
-  static constexpr bool compliant = std::is_trivially_destructible<T>::value ==
-                                    is_trivially_destructible::value;
-  static_assert(compliant || std::is_trivially_destructible<T>::value,
-                "Not compliant with std::is_trivially_destructible; "
-                "Standard: false, Implementation: true");
-  static_assert(compliant || !std::is_trivially_destructible<T>::value,
-                "Not compliant with std::is_trivially_destructible; "
-                "Standard: true, Implementation: false");
-#endif  // ABSL_HAVE_STD_IS_TRIVIALLY_DESTRUCTIBLE
-};
-
-// is_trivially_default_constructible()
-//
-// Determines whether the passed type `T` is trivially default constructible.
-//
-// This metafunction is designed to be a drop-in replacement for the C++11
-// `std::is_trivially_default_constructible()` metafunction for platforms that
-// have incomplete C++11 support (such as libstdc++ 4.x). On any platforms that
-// do fully support C++11, we check whether this yields the same result as the
-// std implementation.
-//
-// NOTE: according to the C++ standard, Section: 20.15.4.3 [meta.unary.prop]
-// "The predicate condition for a template specialization is_constructible<T,
-// Args...> shall be satisfied if and only if the following variable
-// definition would be well-formed for some invented variable t:
-//
-// T t(declval<Args>()...);
-//
-// is_trivially_constructible<T, Args...> additionally requires that the
-// variable definition does not call any operation that is not trivial.
-// For the purposes of this check, the call to std::declval is considered
-// trivial."
-//
-// Notes from http://en.cppreference.com/w/cpp/types/is_constructible:
-// In many implementations, is_nothrow_constructible also checks if the
-// destructor throws because it is effectively noexcept(T(arg)). Same
-// applies to is_trivially_constructible, which, in these implementations, also
-// requires that the destructor is trivial.
-// GCC bug 51452: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=51452
-// LWG issue 2116: http://cplusplus.github.io/LWG/lwg-active.html#2116.
-//
-// "T obj();" need to be well-formed and not call any nontrivial operation.
-// Nontrivially destructible types will cause the expression to be nontrivial.
-template <typename T>
-struct is_trivially_default_constructible
-    : std::integral_constant<bool, __has_trivial_constructor(T) &&
-                                   std::is_default_constructible<T>::value &&
-                                   is_trivially_destructible<T>::value> {
-#ifdef ABSL_HAVE_STD_IS_TRIVIALLY_CONSTRUCTIBLE
- private:
-  static constexpr bool compliant =
-      std::is_trivially_default_constructible<T>::value ==
-      is_trivially_default_constructible::value;
-  static_assert(compliant || std::is_trivially_default_constructible<T>::value,
-                "Not compliant with std::is_trivially_default_constructible; "
-                "Standard: false, Implementation: true");
-  static_assert(compliant || !std::is_trivially_default_constructible<T>::value,
-                "Not compliant with std::is_trivially_default_constructible; "
-                "Standard: true, Implementation: false");
-#endif  // ABSL_HAVE_STD_IS_TRIVIALLY_CONSTRUCTIBLE
-};
-
-// is_trivially_copy_constructible()
-//
-// Determines whether the passed type `T` is trivially copy constructible.
-//
-// This metafunction is designed to be a drop-in replacement for the C++11
-// `std::is_trivially_copy_constructible()` metafunction for platforms that have
-// incomplete C++11 support (such as libstdc++ 4.x). On any platforms that do
-// fully support C++11, we check whether this yields the same result as the std
-// implementation.
-//
-// NOTE: `T obj(declval<const T&>());` needs to be well-formed and not call any
-// nontrivial operation.  Nontrivially destructible types will cause the
-// expression to be nontrivial.
-template <typename T>
-struct is_trivially_copy_constructible
-    : std::integral_constant<bool, __has_trivial_copy(T) &&
-                                   std::is_copy_constructible<T>::value &&
-                                   is_trivially_destructible<T>::value> {
-#ifdef ABSL_HAVE_STD_IS_TRIVIALLY_CONSTRUCTIBLE
- private:
-  static constexpr bool compliant =
-      std::is_trivially_copy_constructible<T>::value ==
-      is_trivially_copy_constructible::value;
-  static_assert(compliant || std::is_trivially_copy_constructible<T>::value,
-                "Not compliant with std::is_trivially_copy_constructible; "
-                "Standard: false, Implementation: true");
-  static_assert(compliant || !std::is_trivially_copy_constructible<T>::value,
-                "Not compliant with std::is_trivially_copy_constructible; "
-                "Standard: true, Implementation: false");
-#endif  // ABSL_HAVE_STD_IS_TRIVIALLY_CONSTRUCTIBLE
-};
-
-// is_trivially_copy_assignable()
-//
-// Determines whether the passed type `T` is trivially copy assignable.
-//
-// This metafunction is designed to be a drop-in replacement for the C++11
-// `std::is_trivially_copy_assignable()` metafunction for platforms that have
-// incomplete C++11 support (such as libstdc++ 4.x). On any platforms that do
-// fully support C++11, we check whether this yields the same result as the std
-// implementation.
-//
-// NOTE: `is_assignable<T, U>::value` is `true` if the expression
-// `declval<T>() = declval<U>()` is well-formed when treated as an unevaluated
-// operand. `is_trivially_assignable<T, U>` requires the assignment to call no
-// operation that is not trivial. `is_trivially_copy_assignable<T>` is simply
-// `is_trivially_assignable<T&, const T&>`.
-template <typename T>
-struct is_trivially_copy_assignable
-    : std::integral_constant<
-          bool, __has_trivial_assign(typename std::remove_reference<T>::type) &&
-                    absl::is_copy_assignable<T>::value> {
-#ifdef ABSL_HAVE_STD_IS_TRIVIALLY_ASSIGNABLE
- private:
-  static constexpr bool compliant =
-      std::is_trivially_copy_assignable<T>::value ==
-      is_trivially_copy_assignable::value;
-  static_assert(compliant || std::is_trivially_copy_assignable<T>::value,
-                "Not compliant with std::is_trivially_copy_assignable; "
-                "Standard: false, Implementation: true");
-  static_assert(compliant || !std::is_trivially_copy_assignable<T>::value,
-                "Not compliant with std::is_trivially_copy_assignable; "
-                "Standard: true, Implementation: false");
-#endif  // ABSL_HAVE_STD_IS_TRIVIALLY_ASSIGNABLE
-};
-
-// -----------------------------------------------------------------------------
-// C++14 "_t" trait aliases
-// -----------------------------------------------------------------------------
-
-template <typename T>
-using remove_cv_t = typename std::remove_cv<T>::type;
-
-template <typename T>
-using remove_const_t = typename std::remove_const<T>::type;
-
-template <typename T>
-using remove_volatile_t = typename std::remove_volatile<T>::type;
-
-template <typename T>
-using add_cv_t = typename std::add_cv<T>::type;
-
-template <typename T>
-using add_const_t = typename std::add_const<T>::type;
-
-template <typename T>
-using add_volatile_t = typename std::add_volatile<T>::type;
-
-template <typename T>
-using remove_reference_t = typename std::remove_reference<T>::type;
-
-template <typename T>
-using add_lvalue_reference_t = typename std::add_lvalue_reference<T>::type;
-
-template <typename T>
-using add_rvalue_reference_t = typename std::add_rvalue_reference<T>::type;
-
-template <typename T>
-using remove_pointer_t = typename std::remove_pointer<T>::type;
-
-template <typename T>
-using add_pointer_t = typename std::add_pointer<T>::type;
-
-template <typename T>
-using make_signed_t = typename std::make_signed<T>::type;
-
-template <typename T>
-using make_unsigned_t = typename std::make_unsigned<T>::type;
-
-template <typename T>
-using remove_extent_t = typename std::remove_extent<T>::type;
-
-template <typename T>
-using remove_all_extents_t = typename std::remove_all_extents<T>::type;
-
-template <size_t Len, size_t Align = type_traits_internal::
-                          default_alignment_of_aligned_storage<Len>::value>
-using aligned_storage_t = typename std::aligned_storage<Len, Align>::type;
-
-template <typename T>
-using decay_t = typename std::decay<T>::type;
-
-template <bool B, typename T = void>
-using enable_if_t = typename std::enable_if<B, T>::type;
-
-template <bool B, typename T, typename F>
-using conditional_t = typename std::conditional<B, T, F>::type;
-
-template <typename... T>
-using common_type_t = typename std::common_type<T...>::type;
-
-template <typename T>
-using underlying_type_t = typename std::underlying_type<T>::type;
-
-template <typename T>
-using result_of_t = typename std::result_of<T>::type;
-
-namespace type_traits_internal {
-template <typename Key, typename = size_t>
-struct IsHashable : std::false_type {};
-
-template <typename Key>
-struct IsHashable<Key,
-                  decltype(std::declval<std::hash<Key>>()(std::declval<Key>()))>
-    : std::true_type {};
-
-template <typename Key>
-struct IsHashEnabled
-    : absl::conjunction<std::is_default_constructible<std::hash<Key>>,
-                        std::is_copy_constructible<std::hash<Key>>,
-                        std::is_destructible<std::hash<Key>>,
-                        absl::is_copy_assignable<std::hash<Key>>,
-                        IsHashable<Key>> {};
-
-}  // namespace type_traits_internal
-
-}  // namespace absl
-
-#endif  // ABSL_META_TYPE_TRAITS_H_
diff --git a/submodules/libtgvoip/webrtc_dsp/absl/strings/ascii.cc b/submodules/libtgvoip/webrtc_dsp/absl/strings/ascii.cc
deleted file mode 100755
index c9481e8865..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/absl/strings/ascii.cc
+++ /dev/null
@@ -1,198 +0,0 @@
-// Copyright 2017 The Abseil Authors.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#include "absl/strings/ascii.h"
-
-namespace absl {
-namespace ascii_internal {
-
-// # Table generated by this Python code (bit 0x02 is currently unused):
-// TODO(mbar) Move Python code for generation of table to BUILD and link here.
-
-// NOTE: The kAsciiPropertyBits table used within this code was generated by
-// Python code of the following form. (Bit 0x02 is currently unused and
-// available.)
-//
-// def Hex2(n):
-//   return '0x' + hex(n/16)[2:] + hex(n%16)[2:]
-// def IsPunct(ch):
-//   return (ord(ch) >= 32 and ord(ch) < 127 and
-//           not ch.isspace() and not ch.isalnum())
-// def IsBlank(ch):
-//   return ch in ' \t'
-// def IsCntrl(ch):
-//   return ord(ch) < 32 or ord(ch) == 127
-// def IsXDigit(ch):
-//   return ch.isdigit() or ch.lower() in 'abcdef'
-// for i in range(128):
-//   ch = chr(i)
-//   mask = ((ch.isalpha() and 0x01 or 0) |
-//           (ch.isalnum() and 0x04 or 0) |
-//           (ch.isspace() and 0x08 or 0) |
-//           (IsPunct(ch) and 0x10 or 0) |
-//           (IsBlank(ch) and 0x20 or 0) |
-//           (IsCntrl(ch) and 0x40 or 0) |
-//           (IsXDigit(ch) and 0x80 or 0))
-//   print Hex2(mask) + ',',
-//   if i % 16 == 7:
-//     print ' //', Hex2(i & 0x78)
-//   elif i % 16 == 15:
-//     print
-
-// clang-format off
-// Array of bitfields holding character information. Each bit value corresponds
-// to a particular character feature. For readability, and because the value
-// of these bits is tightly coupled to this implementation, the individual bits
-// are not named. Note that bitfields for all characters above ASCII 127 are
-// zero-initialized.
-const unsigned char kPropertyBits[256] = {
-    0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40,  // 0x00
-    0x40, 0x68, 0x48, 0x48, 0x48, 0x48, 0x40, 0x40,
-    0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40,  // 0x10
-    0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40,
-    0x28, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10,  // 0x20
-    0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10,
-    0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 0x84,  // 0x30
-    0x84, 0x84, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10,
-    0x10, 0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 0x05,  // 0x40
-    0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05,
-    0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05,  // 0x50
-    0x05, 0x05, 0x05, 0x10, 0x10, 0x10, 0x10, 0x10,
-    0x10, 0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 0x05,  // 0x60
-    0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05,
-    0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05,  // 0x70
-    0x05, 0x05, 0x05, 0x10, 0x10, 0x10, 0x10, 0x40,
-};
-
-// Array of characters for the ascii_tolower() function. For values 'A'
-// through 'Z', return the lower-case character; otherwise, return the
-// identity of the passed character.
-const char kToLower[256] = {
-  '\x00', '\x01', '\x02', '\x03', '\x04', '\x05', '\x06', '\x07',
-  '\x08', '\x09', '\x0a', '\x0b', '\x0c', '\x0d', '\x0e', '\x0f',
-  '\x10', '\x11', '\x12', '\x13', '\x14', '\x15', '\x16', '\x17',
-  '\x18', '\x19', '\x1a', '\x1b', '\x1c', '\x1d', '\x1e', '\x1f',
-  '\x20', '\x21', '\x22', '\x23', '\x24', '\x25', '\x26', '\x27',
-  '\x28', '\x29', '\x2a', '\x2b', '\x2c', '\x2d', '\x2e', '\x2f',
-  '\x30', '\x31', '\x32', '\x33', '\x34', '\x35', '\x36', '\x37',
-  '\x38', '\x39', '\x3a', '\x3b', '\x3c', '\x3d', '\x3e', '\x3f',
-  '\x40',    'a',    'b',    'c',    'd',    'e',    'f',    'g',
-     'h',    'i',    'j',    'k',    'l',    'm',    'n',    'o',
-     'p',    'q',    'r',    's',    't',    'u',    'v',    'w',
-     'x',    'y',    'z', '\x5b', '\x5c', '\x5d', '\x5e', '\x5f',
-  '\x60', '\x61', '\x62', '\x63', '\x64', '\x65', '\x66', '\x67',
-  '\x68', '\x69', '\x6a', '\x6b', '\x6c', '\x6d', '\x6e', '\x6f',
-  '\x70', '\x71', '\x72', '\x73', '\x74', '\x75', '\x76', '\x77',
-  '\x78', '\x79', '\x7a', '\x7b', '\x7c', '\x7d', '\x7e', '\x7f',
-  '\x80', '\x81', '\x82', '\x83', '\x84', '\x85', '\x86', '\x87',
-  '\x88', '\x89', '\x8a', '\x8b', '\x8c', '\x8d', '\x8e', '\x8f',
-  '\x90', '\x91', '\x92', '\x93', '\x94', '\x95', '\x96', '\x97',
-  '\x98', '\x99', '\x9a', '\x9b', '\x9c', '\x9d', '\x9e', '\x9f',
-  '\xa0', '\xa1', '\xa2', '\xa3', '\xa4', '\xa5', '\xa6', '\xa7',
-  '\xa8', '\xa9', '\xaa', '\xab', '\xac', '\xad', '\xae', '\xaf',
-  '\xb0', '\xb1', '\xb2', '\xb3', '\xb4', '\xb5', '\xb6', '\xb7',
-  '\xb8', '\xb9', '\xba', '\xbb', '\xbc', '\xbd', '\xbe', '\xbf',
-  '\xc0', '\xc1', '\xc2', '\xc3', '\xc4', '\xc5', '\xc6', '\xc7',
-  '\xc8', '\xc9', '\xca', '\xcb', '\xcc', '\xcd', '\xce', '\xcf',
-  '\xd0', '\xd1', '\xd2', '\xd3', '\xd4', '\xd5', '\xd6', '\xd7',
-  '\xd8', '\xd9', '\xda', '\xdb', '\xdc', '\xdd', '\xde', '\xdf',
-  '\xe0', '\xe1', '\xe2', '\xe3', '\xe4', '\xe5', '\xe6', '\xe7',
-  '\xe8', '\xe9', '\xea', '\xeb', '\xec', '\xed', '\xee', '\xef',
-  '\xf0', '\xf1', '\xf2', '\xf3', '\xf4', '\xf5', '\xf6', '\xf7',
-  '\xf8', '\xf9', '\xfa', '\xfb', '\xfc', '\xfd', '\xfe', '\xff',
-};
-
-// Array of characters for the ascii_toupper() function. For values 'a'
-// through 'z', return the upper-case character; otherwise, return the
-// identity of the passed character.
-const char kToUpper[256] = {
-  '\x00', '\x01', '\x02', '\x03', '\x04', '\x05', '\x06', '\x07',
-  '\x08', '\x09', '\x0a', '\x0b', '\x0c', '\x0d', '\x0e', '\x0f',
-  '\x10', '\x11', '\x12', '\x13', '\x14', '\x15', '\x16', '\x17',
-  '\x18', '\x19', '\x1a', '\x1b', '\x1c', '\x1d', '\x1e', '\x1f',
-  '\x20', '\x21', '\x22', '\x23', '\x24', '\x25', '\x26', '\x27',
-  '\x28', '\x29', '\x2a', '\x2b', '\x2c', '\x2d', '\x2e', '\x2f',
-  '\x30', '\x31', '\x32', '\x33', '\x34', '\x35', '\x36', '\x37',
-  '\x38', '\x39', '\x3a', '\x3b', '\x3c', '\x3d', '\x3e', '\x3f',
-  '\x40', '\x41', '\x42', '\x43', '\x44', '\x45', '\x46', '\x47',
-  '\x48', '\x49', '\x4a', '\x4b', '\x4c', '\x4d', '\x4e', '\x4f',
-  '\x50', '\x51', '\x52', '\x53', '\x54', '\x55', '\x56', '\x57',
-  '\x58', '\x59', '\x5a', '\x5b', '\x5c', '\x5d', '\x5e', '\x5f',
-  '\x60',    'A',    'B',    'C',    'D',    'E',    'F',    'G',
-     'H',    'I',    'J',    'K',    'L',    'M',    'N',    'O',
-     'P',    'Q',    'R',    'S',    'T',    'U',    'V',    'W',
-     'X',    'Y',    'Z', '\x7b', '\x7c', '\x7d', '\x7e', '\x7f',
-  '\x80', '\x81', '\x82', '\x83', '\x84', '\x85', '\x86', '\x87',
-  '\x88', '\x89', '\x8a', '\x8b', '\x8c', '\x8d', '\x8e', '\x8f',
-  '\x90', '\x91', '\x92', '\x93', '\x94', '\x95', '\x96', '\x97',
-  '\x98', '\x99', '\x9a', '\x9b', '\x9c', '\x9d', '\x9e', '\x9f',
-  '\xa0', '\xa1', '\xa2', '\xa3', '\xa4', '\xa5', '\xa6', '\xa7',
-  '\xa8', '\xa9', '\xaa', '\xab', '\xac', '\xad', '\xae', '\xaf',
-  '\xb0', '\xb1', '\xb2', '\xb3', '\xb4', '\xb5', '\xb6', '\xb7',
-  '\xb8', '\xb9', '\xba', '\xbb', '\xbc', '\xbd', '\xbe', '\xbf',
-  '\xc0', '\xc1', '\xc2', '\xc3', '\xc4', '\xc5', '\xc6', '\xc7',
-  '\xc8', '\xc9', '\xca', '\xcb', '\xcc', '\xcd', '\xce', '\xcf',
-  '\xd0', '\xd1', '\xd2', '\xd3', '\xd4', '\xd5', '\xd6', '\xd7',
-  '\xd8', '\xd9', '\xda', '\xdb', '\xdc', '\xdd', '\xde', '\xdf',
-  '\xe0', '\xe1', '\xe2', '\xe3', '\xe4', '\xe5', '\xe6', '\xe7',
-  '\xe8', '\xe9', '\xea', '\xeb', '\xec', '\xed', '\xee', '\xef',
-  '\xf0', '\xf1', '\xf2', '\xf3', '\xf4', '\xf5', '\xf6', '\xf7',
-  '\xf8', '\xf9', '\xfa', '\xfb', '\xfc', '\xfd', '\xfe', '\xff',
-};
-// clang-format on
-
-}  // namespace ascii_internal
-
-void AsciiStrToLower(std::string* s) {
-  for (auto& ch : *s) {
-    ch = absl::ascii_tolower(ch);
-  }
-}
-
-void AsciiStrToUpper(std::string* s) {
-  for (auto& ch : *s) {
-    ch = absl::ascii_toupper(ch);
-  }
-}
-
-void RemoveExtraAsciiWhitespace(std::string* str) {
-  auto stripped = StripAsciiWhitespace(*str);
-
-  if (stripped.empty()) {
-    str->clear();
-    return;
-  }
-
-  auto input_it = stripped.begin();
-  auto input_end = stripped.end();
-  auto output_it = &(*str)[0];
-  bool is_ws = false;
-
-  for (; input_it < input_end; ++input_it) {
-    if (is_ws) {
-      // Consecutive whitespace?  Keep only the last.
-      is_ws = absl::ascii_isspace(*input_it);
-      if (is_ws) --output_it;
-    } else {
-      is_ws = absl::ascii_isspace(*input_it);
-    }
-
-    *output_it = *input_it;
-    ++output_it;
-  }
-
-  str->erase(output_it - &(*str)[0]);
-}
-
-}  // namespace absl
diff --git a/submodules/libtgvoip/webrtc_dsp/absl/strings/ascii.h b/submodules/libtgvoip/webrtc_dsp/absl/strings/ascii.h
deleted file mode 100755
index 48a9da22e7..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/absl/strings/ascii.h
+++ /dev/null
@@ -1,239 +0,0 @@
-//
-// Copyright 2017 The Abseil Authors.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-// -----------------------------------------------------------------------------
-// File: ascii.h
-// -----------------------------------------------------------------------------
-//
-// This package contains functions operating on characters and strings
-// restricted to standard ASCII. These include character classification
-// functions analogous to those found in the ANSI C Standard Library <ctype.h>
-// header file.
-//
-// C++ implementations provide <ctype.h> functionality based on their
-// C environment locale. In general, reliance on such a locale is not ideal, as
-// the locale standard is problematic (and may not return invariant information
-// for the same character set, for example). These `ascii_*()` functions are
-// hard-wired for standard ASCII, much faster, and guaranteed to behave
-// consistently.  They will never be overloaded, nor will their function
-// signature change.
-//
-// `ascii_isalnum()`, `ascii_isalpha()`, `ascii_isascii()`, `ascii_isblank()`,
-// `ascii_iscntrl()`, `ascii_isdigit()`, `ascii_isgraph()`, `ascii_islower()`,
-// `ascii_isprint()`, `ascii_ispunct()`, `ascii_isspace()`, `ascii_isupper()`,
-// `ascii_isxdigit()`
-//   Analogous to the <ctype.h> functions with similar names, these
-//   functions take an unsigned char and return a bool, based on whether the
-//   character matches the condition specified.
-//
-//   If the input character has a numerical value greater than 127, these
-//   functions return `false`.
-//
-// `ascii_tolower()`, `ascii_toupper()`
-//   Analogous to the <ctype.h> functions with similar names, these functions
-//   take an unsigned char and return a char.
-//
-//   If the input character is not an ASCII {lower,upper}-case letter (including
-//   numerical values greater than 127) then the functions return the same value
-//   as the input character.
-
-#ifndef ABSL_STRINGS_ASCII_H_
-#define ABSL_STRINGS_ASCII_H_
-
-#include <algorithm>
-#include <string>
-
-#include "absl/base/attributes.h"
-#include "absl/strings/string_view.h"
-
-namespace absl {
-namespace ascii_internal {
-
-// Declaration for an array of bitfields holding character information.
-extern const unsigned char kPropertyBits[256];
-
-// Declaration for the array of characters to upper-case characters.
-extern const char kToUpper[256];
-
-// Declaration for the array of characters to lower-case characters.
-extern const char kToLower[256];
-
-}  // namespace ascii_internal
-
-// ascii_isalpha()
-//
-// Determines whether the given character is an alphabetic character.
-inline bool ascii_isalpha(unsigned char c) {
-  return (ascii_internal::kPropertyBits[c] & 0x01) != 0;
-}
-
-// ascii_isalnum()
-//
-// Determines whether the given character is an alphanumeric character.
-inline bool ascii_isalnum(unsigned char c) {
-  return (ascii_internal::kPropertyBits[c] & 0x04) != 0;
-}
-
-// ascii_isspace()
-//
-// Determines whether the given character is a whitespace character (space,
-// tab, vertical tab, formfeed, linefeed, or carriage return).
-inline bool ascii_isspace(unsigned char c) {
-  return (ascii_internal::kPropertyBits[c] & 0x08) != 0;
-}
-
-// ascii_ispunct()
-//
-// Determines whether the given character is a punctuation character.
-inline bool ascii_ispunct(unsigned char c) {
-  return (ascii_internal::kPropertyBits[c] & 0x10) != 0;
-}
-
-// ascii_isblank()
-//
-// Determines whether the given character is a blank character (tab or space).
-inline bool ascii_isblank(unsigned char c) {
-  return (ascii_internal::kPropertyBits[c] & 0x20) != 0;
-}
-
-// ascii_iscntrl()
-//
-// Determines whether the given character is a control character.
-inline bool ascii_iscntrl(unsigned char c) {
-  return (ascii_internal::kPropertyBits[c] & 0x40) != 0;
-}
-
-// ascii_isxdigit()
-//
-// Determines whether the given character can be represented as a hexadecimal
-// digit character (i.e. {0-9} or {A-F}).
-inline bool ascii_isxdigit(unsigned char c) {
-  return (ascii_internal::kPropertyBits[c] & 0x80) != 0;
-}
-
-// ascii_isdigit()
-//
-// Determines whether the given character can be represented as a decimal
-// digit character (i.e. {0-9}).
-inline bool ascii_isdigit(unsigned char c) { return c >= '0' && c <= '9'; }
-
-// ascii_isprint()
-//
-// Determines whether the given character is printable, including whitespace.
-inline bool ascii_isprint(unsigned char c) { return c >= 32 && c < 127; }
-
-// ascii_isgraph()
-//
-// Determines whether the given character has a graphical representation.
-inline bool ascii_isgraph(unsigned char c) { return c > 32 && c < 127; }
-
-// ascii_isupper()
-//
-// Determines whether the given character is uppercase.
-inline bool ascii_isupper(unsigned char c) { return c >= 'A' && c <= 'Z'; }
-
-// ascii_islower()
-//
-// Determines whether the given character is lowercase.
-inline bool ascii_islower(unsigned char c) { return c >= 'a' && c <= 'z'; }
-
-// ascii_isascii()
-//
-// Determines whether the given character is ASCII.
-inline bool ascii_isascii(unsigned char c) { return c < 128; }
-
-// ascii_tolower()
-//
-// Returns an ASCII character, converting to lowercase if uppercase is
-// passed. Note that character values > 127 are simply returned.
-inline char ascii_tolower(unsigned char c) {
-  return ascii_internal::kToLower[c];
-}
-
-// Converts the characters in `s` to lowercase, changing the contents of `s`.
-void AsciiStrToLower(std::string* s);
-
-// Creates a lowercase string from a given absl::string_view.
-ABSL_MUST_USE_RESULT inline std::string AsciiStrToLower(absl::string_view s) {
-  std::string result(s);
-  absl::AsciiStrToLower(&result);
-  return result;
-}
-
-// ascii_toupper()
-//
-// Returns the ASCII character, converting to upper-case if lower-case is
-// passed. Note that characters values > 127 are simply returned.
-inline char ascii_toupper(unsigned char c) {
-  return ascii_internal::kToUpper[c];
-}
-
-// Converts the characters in `s` to uppercase, changing the contents of `s`.
-void AsciiStrToUpper(std::string* s);
-
-// Creates an uppercase string from a given absl::string_view.
-ABSL_MUST_USE_RESULT inline std::string AsciiStrToUpper(absl::string_view s) {
-  std::string result(s);
-  absl::AsciiStrToUpper(&result);
-  return result;
-}
-
-// Returns absl::string_view with whitespace stripped from the beginning of the
-// given string_view.
-ABSL_MUST_USE_RESULT inline absl::string_view StripLeadingAsciiWhitespace(
-    absl::string_view str) {
-  auto it = std::find_if_not(str.begin(), str.end(), absl::ascii_isspace);
-  return str.substr(it - str.begin());
-}
-
-// Strips in place whitespace from the beginning of the given string.
-inline void StripLeadingAsciiWhitespace(std::string* str) {
-  auto it = std::find_if_not(str->begin(), str->end(), absl::ascii_isspace);
-  str->erase(str->begin(), it);
-}
-
-// Returns absl::string_view with whitespace stripped from the end of the given
-// string_view.
-ABSL_MUST_USE_RESULT inline absl::string_view StripTrailingAsciiWhitespace(
-    absl::string_view str) {
-  auto it = std::find_if_not(str.rbegin(), str.rend(), absl::ascii_isspace);
-  return str.substr(0, str.rend() - it);
-}
-
-// Strips in place whitespace from the end of the given string
-inline void StripTrailingAsciiWhitespace(std::string* str) {
-  auto it = std::find_if_not(str->rbegin(), str->rend(), absl::ascii_isspace);
-  str->erase(str->rend() - it);
-}
-
-// Returns absl::string_view with whitespace stripped from both ends of the
-// given string_view.
-ABSL_MUST_USE_RESULT inline absl::string_view StripAsciiWhitespace(
-    absl::string_view str) {
-  return StripTrailingAsciiWhitespace(StripLeadingAsciiWhitespace(str));
-}
-
-// Strips in place whitespace from both ends of the given string
-inline void StripAsciiWhitespace(std::string* str) {
-  StripTrailingAsciiWhitespace(str);
-  StripLeadingAsciiWhitespace(str);
-}
-
-// Removes leading, trailing, and consecutive internal whitespace.
-void RemoveExtraAsciiWhitespace(std::string*);
-
-}  // namespace absl
-
-#endif  // ABSL_STRINGS_ASCII_H_
diff --git a/submodules/libtgvoip/webrtc_dsp/absl/strings/internal/memutil.cc b/submodules/libtgvoip/webrtc_dsp/absl/strings/internal/memutil.cc
deleted file mode 100755
index a0de70dffd..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/absl/strings/internal/memutil.cc
+++ /dev/null
@@ -1,110 +0,0 @@
-// Copyright 2017 The Abseil Authors.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#include "absl/strings/internal/memutil.h"
-
-#include <cstdlib>
-
-namespace absl {
-namespace strings_internal {
-
-int memcasecmp(const char* s1, const char* s2, size_t len) {
-  const unsigned char* us1 = reinterpret_cast<const unsigned char*>(s1);
-  const unsigned char* us2 = reinterpret_cast<const unsigned char*>(s2);
-
-  for (size_t i = 0; i < len; i++) {
-    const int diff =
-        int{static_cast<unsigned char>(absl::ascii_tolower(us1[i]))} -
-        int{static_cast<unsigned char>(absl::ascii_tolower(us2[i]))};
-    if (diff != 0) return diff;
-  }
-  return 0;
-}
-
-char* memdup(const char* s, size_t slen) {
-  void* copy;
-  if ((copy = malloc(slen)) == nullptr) return nullptr;
-  memcpy(copy, s, slen);
-  return reinterpret_cast<char*>(copy);
-}
-
-char* memrchr(const char* s, int c, size_t slen) {
-  for (const char* e = s + slen - 1; e >= s; e--) {
-    if (*e == c) return const_cast<char*>(e);
-  }
-  return nullptr;
-}
-
-size_t memspn(const char* s, size_t slen, const char* accept) {
-  const char* p = s;
-  const char* spanp;
-  char c, sc;
-
-cont:
-  c = *p++;
-  if (slen-- == 0) return p - 1 - s;
-  for (spanp = accept; (sc = *spanp++) != '\0';)
-    if (sc == c) goto cont;
-  return p - 1 - s;
-}
-
-size_t memcspn(const char* s, size_t slen, const char* reject) {
-  const char* p = s;
-  const char* spanp;
-  char c, sc;
-
-  while (slen-- != 0) {
-    c = *p++;
-    for (spanp = reject; (sc = *spanp++) != '\0';)
-      if (sc == c) return p - 1 - s;
-  }
-  return p - s;
-}
-
-char* mempbrk(const char* s, size_t slen, const char* accept) {
-  const char* scanp;
-  int sc;
-
-  for (; slen; ++s, --slen) {
-    for (scanp = accept; (sc = *scanp++) != '\0';)
-      if (sc == *s) return const_cast<char*>(s);
-  }
-  return nullptr;
-}
-
-// This is significantly faster for case-sensitive matches with very
-// few possible matches.  See unit test for benchmarks.
-const char* memmatch(const char* phaystack, size_t haylen, const char* pneedle,
-                     size_t neelen) {
-  if (0 == neelen) {
-    return phaystack;  // even if haylen is 0
-  }
-  if (haylen < neelen) return nullptr;
-
-  const char* match;
-  const char* hayend = phaystack + haylen - neelen + 1;
-  // A static cast is used here to work around the fact that memchr returns
-  // a void* on Posix-compliant systems and const void* on Windows.
-  while ((match = static_cast<const char*>(
-              memchr(phaystack, pneedle[0], hayend - phaystack)))) {
-    if (memcmp(match, pneedle, neelen) == 0)
-      return match;
-    else
-      phaystack = match + 1;
-  }
-  return nullptr;
-}
-
-}  // namespace strings_internal
-}  // namespace absl
diff --git a/submodules/libtgvoip/webrtc_dsp/absl/strings/internal/memutil.h b/submodules/libtgvoip/webrtc_dsp/absl/strings/internal/memutil.h
deleted file mode 100755
index 7de383b19e..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/absl/strings/internal/memutil.h
+++ /dev/null
@@ -1,146 +0,0 @@
-//
-// Copyright 2017 The Abseil Authors.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-
-// These routines provide mem versions of standard C string routines,
-// such as strpbrk.  They function exactly the same as the str versions,
-// so if you wonder what they are, replace the word "mem" by
-// "str" and check out the man page.  I could return void*, as the
-// strutil.h mem*() routines tend to do, but I return char* instead
-// since this is by far the most common way these functions are called.
-//
-// The difference between the mem and str versions is the mem version
-// takes a pointer and a length, rather than a '\0'-terminated string.
-// The memcase* routines defined here assume the locale is "C"
-// (they use absl::ascii_tolower instead of tolower).
-//
-// These routines are based on the BSD library.
-//
-// Here's a list of routines from string.h, and their mem analogues.
-// Functions in lowercase are defined in string.h; those in UPPERCASE
-// are defined here:
-//
-// strlen                  --
-// strcat strncat          MEMCAT
-// strcpy strncpy          memcpy
-// --                      memccpy   (very cool function, btw)
-// --                      memmove
-// --                      memset
-// strcmp strncmp          memcmp
-// strcasecmp strncasecmp  MEMCASECMP
-// strchr                  memchr
-// strcoll                 --
-// strxfrm                 --
-// strdup strndup          MEMDUP
-// strrchr                 MEMRCHR
-// strspn                  MEMSPN
-// strcspn                 MEMCSPN
-// strpbrk                 MEMPBRK
-// strstr                  MEMSTR MEMMEM
-// (g)strcasestr           MEMCASESTR MEMCASEMEM
-// strtok                  --
-// strprefix               MEMPREFIX      (strprefix is from strutil.h)
-// strcaseprefix           MEMCASEPREFIX  (strcaseprefix is from strutil.h)
-// strsuffix               MEMSUFFIX      (strsuffix is from strutil.h)
-// strcasesuffix           MEMCASESUFFIX  (strcasesuffix is from strutil.h)
-// --                      MEMIS
-// --                      MEMCASEIS
-// strcount                MEMCOUNT       (strcount is from strutil.h)
-
-#ifndef ABSL_STRINGS_INTERNAL_MEMUTIL_H_
-#define ABSL_STRINGS_INTERNAL_MEMUTIL_H_
-
-#include <cstddef>
-#include <cstring>
-
-#include "absl/base/port.h"  // disable some warnings on Windows
-#include "absl/strings/ascii.h"  // for absl::ascii_tolower
-
-namespace absl {
-namespace strings_internal {
-
-inline char* memcat(char* dest, size_t destlen, const char* src,
-                    size_t srclen) {
-  return reinterpret_cast<char*>(memcpy(dest + destlen, src, srclen));
-}
-
-int memcasecmp(const char* s1, const char* s2, size_t len);
-char* memdup(const char* s, size_t slen);
-char* memrchr(const char* s, int c, size_t slen);
-size_t memspn(const char* s, size_t slen, const char* accept);
-size_t memcspn(const char* s, size_t slen, const char* reject);
-char* mempbrk(const char* s, size_t slen, const char* accept);
-
-// This is for internal use only.  Don't call this directly
-template <bool case_sensitive>
-const char* int_memmatch(const char* haystack, size_t haylen,
-                         const char* needle, size_t neelen) {
-  if (0 == neelen) {
-    return haystack;  // even if haylen is 0
-  }
-  const char* hayend = haystack + haylen;
-  const char* needlestart = needle;
-  const char* needleend = needlestart + neelen;
-
-  for (; haystack < hayend; ++haystack) {
-    char hay = case_sensitive
-                   ? *haystack
-                   : absl::ascii_tolower(static_cast<unsigned char>(*haystack));
-    char nee = case_sensitive
-                   ? *needle
-                   : absl::ascii_tolower(static_cast<unsigned char>(*needle));
-    if (hay == nee) {
-      if (++needle == needleend) {
-        return haystack + 1 - neelen;
-      }
-    } else if (needle != needlestart) {
-      // must back up haystack in case a prefix matched (find "aab" in "aaab")
-      haystack -= needle - needlestart;  // for loop will advance one more
-      needle = needlestart;
-    }
-  }
-  return nullptr;
-}
-
-// These are the guys you can call directly
-inline const char* memstr(const char* phaystack, size_t haylen,
-                          const char* pneedle) {
-  return int_memmatch<true>(phaystack, haylen, pneedle, strlen(pneedle));
-}
-
-inline const char* memcasestr(const char* phaystack, size_t haylen,
-                              const char* pneedle) {
-  return int_memmatch<false>(phaystack, haylen, pneedle, strlen(pneedle));
-}
-
-inline const char* memmem(const char* phaystack, size_t haylen,
-                          const char* pneedle, size_t needlelen) {
-  return int_memmatch<true>(phaystack, haylen, pneedle, needlelen);
-}
-
-inline const char* memcasemem(const char* phaystack, size_t haylen,
-                              const char* pneedle, size_t needlelen) {
-  return int_memmatch<false>(phaystack, haylen, pneedle, needlelen);
-}
-
-// This is significantly faster for case-sensitive matches with very
-// few possible matches.  See unit test for benchmarks.
-const char* memmatch(const char* phaystack, size_t haylen, const char* pneedle,
-                     size_t neelen);
-
-}  // namespace strings_internal
-}  // namespace absl
-
-#endif  // ABSL_STRINGS_INTERNAL_MEMUTIL_H_
diff --git a/submodules/libtgvoip/webrtc_dsp/absl/strings/string_view.cc b/submodules/libtgvoip/webrtc_dsp/absl/strings/string_view.cc
deleted file mode 100755
index 4ceeb6bff5..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/absl/strings/string_view.cc
+++ /dev/null
@@ -1,245 +0,0 @@
-// Copyright 2017 The Abseil Authors.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#include "absl/strings/string_view.h"
-
-#ifndef ABSL_HAVE_STD_STRING_VIEW
-
-#include <algorithm>
-#include <climits>
-#include <cstring>
-#include <ostream>
-
-#include "absl/strings/internal/memutil.h"
-
-namespace absl {
-
-namespace {
-void WritePadding(std::ostream& o, size_t pad) {
-  char fill_buf[32];
-  memset(fill_buf, o.fill(), sizeof(fill_buf));
-  while (pad) {
-    size_t n = std::min(pad, sizeof(fill_buf));
-    o.write(fill_buf, n);
-    pad -= n;
-  }
-}
-
-class LookupTable {
- public:
-  // For each character in wanted, sets the index corresponding
-  // to the ASCII code of that character. This is used by
-  // the find_.*_of methods below to tell whether or not a character is in
-  // the lookup table in constant time.
-  explicit LookupTable(string_view wanted) {
-    for (char c : wanted) {
-      table_[Index(c)] = true;
-    }
-  }
-  bool operator[](char c) const { return table_[Index(c)]; }
-
- private:
-  static unsigned char Index(char c) { return static_cast<unsigned char>(c); }
-  bool table_[UCHAR_MAX + 1] = {};
-};
-
-}  // namespace
-
-std::ostream& operator<<(std::ostream& o, string_view piece) {
-  std::ostream::sentry sentry(o);
-  if (sentry) {
-    size_t lpad = 0;
-    size_t rpad = 0;
-    if (static_cast<size_t>(o.width()) > piece.size()) {
-      size_t pad = o.width() - piece.size();
-      if ((o.flags() & o.adjustfield) == o.left) {
-        rpad = pad;
-      } else {
-        lpad = pad;
-      }
-    }
-    if (lpad) WritePadding(o, lpad);
-    o.write(piece.data(), piece.size());
-    if (rpad) WritePadding(o, rpad);
-    o.width(0);
-  }
-  return o;
-}
-
-string_view::size_type string_view::copy(char* buf, size_type n,
-                                         size_type pos) const {
-  size_type ulen = length_;
-  assert(pos <= ulen);
-  size_type rlen = std::min(ulen - pos, n);
-  if (rlen > 0) {
-    const char* start = ptr_ + pos;
-    std::copy(start, start + rlen, buf);
-  }
-  return rlen;
-}
-
-string_view::size_type string_view::find(string_view s, size_type pos) const
-    noexcept {
-  if (empty() || pos > length_) {
-    if (empty() && pos == 0 && s.empty()) return 0;
-    return npos;
-  }
-  const char* result =
-      strings_internal::memmatch(ptr_ + pos, length_ - pos, s.ptr_, s.length_);
-  return result ? result - ptr_ : npos;
-}
-
-string_view::size_type string_view::find(char c, size_type pos) const noexcept {
-  if (empty() || pos >= length_) {
-    return npos;
-  }
-  const char* result =
-      static_cast<const char*>(memchr(ptr_ + pos, c, length_ - pos));
-  return result != nullptr ? result - ptr_ : npos;
-}
-
-string_view::size_type string_view::rfind(string_view s, size_type pos) const
-    noexcept {
-  if (length_ < s.length_) return npos;
-  if (s.empty()) return std::min(length_, pos);
-  const char* last = ptr_ + std::min(length_ - s.length_, pos) + s.length_;
-  const char* result = std::find_end(ptr_, last, s.ptr_, s.ptr_ + s.length_);
-  return result != last ? result - ptr_ : npos;
-}
-
-// Search range is [0..pos] inclusive.  If pos == npos, search everything.
-string_view::size_type string_view::rfind(char c, size_type pos) const
-    noexcept {
-  // Note: memrchr() is not available on Windows.
-  if (empty()) return npos;
-  for (size_type i = std::min(pos, length_ - 1);; --i) {
-    if (ptr_[i] == c) {
-      return i;
-    }
-    if (i == 0) break;
-  }
-  return npos;
-}
-
-string_view::size_type string_view::find_first_of(string_view s,
-                                                  size_type pos) const
-    noexcept {
-  if (empty() || s.empty()) {
-    return npos;
-  }
-  // Avoid the cost of LookupTable() for a single-character search.
-  if (s.length_ == 1) return find_first_of(s.ptr_[0], pos);
-  LookupTable tbl(s);
-  for (size_type i = pos; i < length_; ++i) {
-    if (tbl[ptr_[i]]) {
-      return i;
-    }
-  }
-  return npos;
-}
-
-string_view::size_type string_view::find_first_not_of(string_view s,
-                                                      size_type pos) const
-    noexcept {
-  if (empty()) return npos;
-  // Avoid the cost of LookupTable() for a single-character search.
-  if (s.length_ == 1) return find_first_not_of(s.ptr_[0], pos);
-  LookupTable tbl(s);
-  for (size_type i = pos; i < length_; ++i) {
-    if (!tbl[ptr_[i]]) {
-      return i;
-    }
-  }
-  return npos;
-}
-
-string_view::size_type string_view::find_first_not_of(char c,
-                                                      size_type pos) const
-    noexcept {
-  if (empty()) return npos;
-  for (; pos < length_; ++pos) {
-    if (ptr_[pos] != c) {
-      return pos;
-    }
-  }
-  return npos;
-}
-
-string_view::size_type string_view::find_last_of(string_view s,
-                                                 size_type pos) const noexcept {
-  if (empty() || s.empty()) return npos;
-  // Avoid the cost of LookupTable() for a single-character search.
-  if (s.length_ == 1) return find_last_of(s.ptr_[0], pos);
-  LookupTable tbl(s);
-  for (size_type i = std::min(pos, length_ - 1);; --i) {
-    if (tbl[ptr_[i]]) {
-      return i;
-    }
-    if (i == 0) break;
-  }
-  return npos;
-}
-
-string_view::size_type string_view::find_last_not_of(string_view s,
-                                                     size_type pos) const
-    noexcept {
-  if (empty()) return npos;
-  size_type i = std::min(pos, length_ - 1);
-  if (s.empty()) return i;
-  // Avoid the cost of LookupTable() for a single-character search.
-  if (s.length_ == 1) return find_last_not_of(s.ptr_[0], pos);
-  LookupTable tbl(s);
-  for (;; --i) {
-    if (!tbl[ptr_[i]]) {
-      return i;
-    }
-    if (i == 0) break;
-  }
-  return npos;
-}
-
-string_view::size_type string_view::find_last_not_of(char c,
-                                                     size_type pos) const
-    noexcept {
-  if (empty()) return npos;
-  size_type i = std::min(pos, length_ - 1);
-  for (;; --i) {
-    if (ptr_[i] != c) {
-      return i;
-    }
-    if (i == 0) break;
-  }
-  return npos;
-}
-
-// MSVC has non-standard behavior that implicitly creates definitions for static
-// const members. These implicit definitions conflict with explicit out-of-class
-// member definitions that are required by the C++ standard, resulting in
-// LNK1169 "multiply defined" errors at link time. __declspec(selectany) asks
-// MSVC to choose only one definition for the symbol it decorates. See details
-// at http://msdn.microsoft.com/en-us/library/34h23df8(v=vs.100).aspx
-#ifdef _MSC_VER
-#define ABSL_STRING_VIEW_SELECTANY __declspec(selectany)
-#else
-#define ABSL_STRING_VIEW_SELECTANY
-#endif
-
-ABSL_STRING_VIEW_SELECTANY
-constexpr string_view::size_type string_view::npos;
-ABSL_STRING_VIEW_SELECTANY
-constexpr string_view::size_type string_view::kMaxSize;
-
-}  // namespace absl
-
-#endif  // ABSL_HAVE_STD_STRING_VIEW
diff --git a/submodules/libtgvoip/webrtc_dsp/absl/strings/string_view.h b/submodules/libtgvoip/webrtc_dsp/absl/strings/string_view.h
deleted file mode 100755
index 2cc10f522e..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/absl/strings/string_view.h
+++ /dev/null
@@ -1,565 +0,0 @@
-//
-// Copyright 2017 The Abseil Authors.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-// -----------------------------------------------------------------------------
-// File: string_view.h
-// -----------------------------------------------------------------------------
-//
-// This file contains the definition of the `absl::string_view` class. A
-// `string_view` points to a contiguous span of characters, often part or all of
-// another `std::string`, double-quoted string literal, character array, or even
-// another `string_view`.
-//
-// This `absl::string_view` abstraction is designed to be a drop-in
-// replacement for the C++17 `std::string_view` abstraction.
-#ifndef ABSL_STRINGS_STRING_VIEW_H_
-#define ABSL_STRINGS_STRING_VIEW_H_
-
-#include <algorithm>
-#include "absl/base/config.h"
-
-#ifdef ABSL_HAVE_STD_STRING_VIEW
-
-#include <string_view>
-
-namespace absl {
-using std::string_view;
-}  // namespace absl
-
-#else  // ABSL_HAVE_STD_STRING_VIEW
-
-#include <cassert>
-#include <cstddef>
-#include <cstring>
-#include <iosfwd>
-#include <iterator>
-#include <limits>
-#include <string>
-
-#include "absl/base/internal/throw_delegate.h"
-#include "absl/base/macros.h"
-#include "absl/base/port.h"
-
-namespace absl {
-
-// absl::string_view
-//
-// A `string_view` provides a lightweight view into the string data provided by
-// a `std::string`, double-quoted string literal, character array, or even
-// another `string_view`. A `string_view` does *not* own the string to which it
-// points, and that data cannot be modified through the view.
-//
-// You can use `string_view` as a function or method parameter anywhere a
-// parameter can receive a double-quoted string literal, `const char*`,
-// `std::string`, or another `absl::string_view` argument with no need to copy
-// the string data. Systematic use of `string_view` within function arguments
-// reduces data copies and `strlen()` calls.
-//
-// Because of its small size, prefer passing `string_view` by value:
-//
-//   void MyFunction(absl::string_view arg);
-//
-// If circumstances require, you may also pass one by const reference:
-//
-//   void MyFunction(const absl::string_view& arg);  // not preferred
-//
-// Passing by value generates slightly smaller code for many architectures.
-//
-// In either case, the source data of the `string_view` must outlive the
-// `string_view` itself.
-//
-// A `string_view` is also suitable for local variables if you know that the
-// lifetime of the underlying object is longer than the lifetime of your
-// `string_view` variable. However, beware of binding a `string_view` to a
-// temporary value:
-//
-//   // BAD use of string_view: lifetime problem
-//   absl::string_view sv = obj.ReturnAString();
-//
-//   // GOOD use of string_view: str outlives sv
-//   std::string str = obj.ReturnAString();
-//   absl::string_view sv = str;
-//
-// Due to lifetime issues, a `string_view` is sometimes a poor choice for a
-// return value and usually a poor choice for a data member. If you do use a
-// `string_view` this way, it is your responsibility to ensure that the object
-// pointed to by the `string_view` outlives the `string_view`.
-//
-// A `string_view` may represent a whole string or just part of a string. For
-// example, when splitting a string, `std::vector<absl::string_view>` is a
-// natural data type for the output.
-//
-//
-// When constructed from a source which is nul-terminated, the `string_view`
-// itself will not include the nul-terminator unless a specific size (including
-// the nul) is passed to the constructor. As a result, common idioms that work
-// on nul-terminated strings do not work on `string_view` objects. If you write
-// code that scans a `string_view`, you must check its length rather than test
-// for nul, for example. Note, however, that nuls may still be embedded within
-// a `string_view` explicitly.
-//
-// You may create a null `string_view` in two ways:
-//
-//   absl::string_view sv();
-//   absl::string_view sv(nullptr, 0);
-//
-// For the above, `sv.data() == nullptr`, `sv.length() == 0`, and
-// `sv.empty() == true`. Also, if you create a `string_view` with a non-null
-// pointer then `sv.data() != nullptr`. Thus, you can use `string_view()` to
-// signal an undefined value that is different from other `string_view` values
-// in a similar fashion to how `const char* p1 = nullptr;` is different from
-// `const char* p2 = "";`. However, in practice, it is not recommended to rely
-// on this behavior.
-//
-// Be careful not to confuse a null `string_view` with an empty one. A null
-// `string_view` is an empty `string_view`, but some empty `string_view`s are
-// not null. Prefer checking for emptiness over checking for null.
-//
-// There are many ways to create an empty string_view:
-//
-//   const char* nullcp = nullptr;
-//   // string_view.size() will return 0 in all cases.
-//   absl::string_view();
-//   absl::string_view(nullcp, 0);
-//   absl::string_view("");
-//   absl::string_view("", 0);
-//   absl::string_view("abcdef", 0);
-//   absl::string_view("abcdef" + 6, 0);
-//
-// All empty `string_view` objects whether null or not, are equal:
-//
-//   absl::string_view() == absl::string_view("", 0)
-//   absl::string_view(nullptr, 0) == absl::string_view("abcdef"+6, 0)
-class string_view {
- public:
-  using traits_type = std::char_traits<char>;
-  using value_type = char;
-  using pointer = char*;
-  using const_pointer = const char*;
-  using reference = char&;
-  using const_reference = const char&;
-  using const_iterator = const char*;
-  using iterator = const_iterator;
-  using const_reverse_iterator = std::reverse_iterator<const_iterator>;
-  using reverse_iterator = const_reverse_iterator;
-  using size_type = size_t;
-  using difference_type = std::ptrdiff_t;
-
-  static constexpr size_type npos = static_cast<size_type>(-1);
-
-  // Null `string_view` constructor
-  constexpr string_view() noexcept : ptr_(nullptr), length_(0) {}
-
-  // Implicit constructors
-
-  template <typename Allocator>
-  string_view(  // NOLINT(runtime/explicit)
-      const std::basic_string<char, std::char_traits<char>, Allocator>&
-          str) noexcept
-      : ptr_(str.data()), length_(CheckLengthInternal(str.size())) {}
-
-  // Implicit constructor of a `string_view` from nul-terminated `str`. When
-  // accepting possibly null strings, use `absl::NullSafeStringView(str)`
-  // instead (see below).
-#if ABSL_HAVE_BUILTIN(__builtin_strlen) || \
-    (defined(__GNUC__) && !defined(__clang__))
-  // GCC has __builtin_strlen according to
-  // https://gcc.gnu.org/onlinedocs/gcc-4.7.0/gcc/Other-Builtins.html, but
-  // ABSL_HAVE_BUILTIN doesn't detect that, so we use the extra checks above.
-  // __builtin_strlen is constexpr.
-  constexpr string_view(const char* str)  // NOLINT(runtime/explicit)
-      : ptr_(str),
-        length_(CheckLengthInternal(str ? __builtin_strlen(str) : 0)) {}
-#else
-  constexpr string_view(const char* str)  // NOLINT(runtime/explicit)
-      : ptr_(str), length_(CheckLengthInternal(str ? strlen(str) : 0)) {}
-#endif
-
-  // Implicit constructor of a `string_view` from a `const char*` and length.
-  constexpr string_view(const char* data, size_type len)
-      : ptr_(data), length_(CheckLengthInternal(len)) {}
-
-  // NOTE: Harmlessly omitted to work around gdb bug.
-  //   constexpr string_view(const string_view&) noexcept = default;
-  //   string_view& operator=(const string_view&) noexcept = default;
-
-  // Iterators
-
-  // string_view::begin()
-  //
-  // Returns an iterator pointing to the first character at the beginning of the
-  // `string_view`, or `end()` if the `string_view` is empty.
-  constexpr const_iterator begin() const noexcept { return ptr_; }
-
-  // string_view::end()
-  //
-  // Returns an iterator pointing just beyond the last character at the end of
-  // the `string_view`. This iterator acts as a placeholder; attempting to
-  // access it results in undefined behavior.
-  constexpr const_iterator end() const noexcept { return ptr_ + length_; }
-
-  // string_view::cbegin()
-  //
-  // Returns a const iterator pointing to the first character at the beginning
-  // of the `string_view`, or `end()` if the `string_view` is empty.
-  constexpr const_iterator cbegin() const noexcept { return begin(); }
-
-  // string_view::cend()
-  //
-  // Returns a const iterator pointing just beyond the last character at the end
-  // of the `string_view`. This pointer acts as a placeholder; attempting to
-  // access its element results in undefined behavior.
-  constexpr const_iterator cend() const noexcept { return end(); }
-
-  // string_view::rbegin()
-  //
-  // Returns a reverse iterator pointing to the last character at the end of the
-  // `string_view`, or `rend()` if the `string_view` is empty.
-  const_reverse_iterator rbegin() const noexcept {
-    return const_reverse_iterator(end());
-  }
-
-  // string_view::rend()
-  //
-  // Returns a reverse iterator pointing just before the first character at the
-  // beginning of the `string_view`. This pointer acts as a placeholder;
-  // attempting to access its element results in undefined behavior.
-  const_reverse_iterator rend() const noexcept {
-    return const_reverse_iterator(begin());
-  }
-
-  // string_view::crbegin()
-  //
-  // Returns a const reverse iterator pointing to the last character at the end
-  // of the `string_view`, or `crend()` if the `string_view` is empty.
-  const_reverse_iterator crbegin() const noexcept { return rbegin(); }
-
-  // string_view::crend()
-  //
-  // Returns a const reverse iterator pointing just before the first character
-  // at the beginning of the `string_view`. This pointer acts as a placeholder;
-  // attempting to access its element results in undefined behavior.
-  const_reverse_iterator crend() const noexcept { return rend(); }
-
-  // Capacity Utilities
-
-  // string_view::size()
-  //
-  // Returns the number of characters in the `string_view`.
-  constexpr size_type size() const noexcept {
-    return length_;
-  }
-
-  // string_view::length()
-  //
-  // Returns the number of characters in the `string_view`. Alias for `size()`.
-  constexpr size_type length() const noexcept { return size(); }
-
-  // string_view::max_size()
-  //
-  // Returns the maximum number of characters the `string_view` can hold.
-  constexpr size_type max_size() const noexcept { return kMaxSize; }
-
-  // string_view::empty()
-  //
-  // Checks if the `string_view` is empty (refers to no characters).
-  constexpr bool empty() const noexcept { return length_ == 0; }
-
-  // std::string:view::operator[]
-  //
-  // Returns the ith element of an `string_view` using the array operator.
-  // Note that this operator does not perform any bounds checking.
-  constexpr const_reference operator[](size_type i) const { return ptr_[i]; }
-
-  // string_view::front()
-  //
-  // Returns the first element of a `string_view`.
-  constexpr const_reference front() const { return ptr_[0]; }
-
-  // string_view::back()
-  //
-  // Returns the last element of a `string_view`.
-  constexpr const_reference back() const { return ptr_[size() - 1]; }
-
-  // string_view::data()
-  //
-  // Returns a pointer to the underlying character array (which is of course
-  // stored elsewhere). Note that `string_view::data()` may contain embedded nul
-  // characters, but the returned buffer may or may not be nul-terminated;
-  // therefore, do not pass `data()` to a routine that expects a nul-terminated
-  // std::string.
-  constexpr const_pointer data() const noexcept { return ptr_; }
-
-  // Modifiers
-
-  // string_view::remove_prefix()
-  //
-  // Removes the first `n` characters from the `string_view`. Note that the
-  // underlying std::string is not changed, only the view.
-  void remove_prefix(size_type n) {
-    assert(n <= length_);
-    ptr_ += n;
-    length_ -= n;
-  }
-
-  // string_view::remove_suffix()
-  //
-  // Removes the last `n` characters from the `string_view`. Note that the
-  // underlying std::string is not changed, only the view.
-  void remove_suffix(size_type n) {
-    assert(n <= length_);
-    length_ -= n;
-  }
-
-  // string_view::swap()
-  //
-  // Swaps this `string_view` with another `string_view`.
-  void swap(string_view& s) noexcept {
-    auto t = *this;
-    *this = s;
-    s = t;
-  }
-
-  // Explicit conversion operators
-
-  // Converts to `std::basic_string`.
-  template <typename A>
-  explicit operator std::basic_string<char, traits_type, A>() const {
-    if (!data()) return {};
-    return std::basic_string<char, traits_type, A>(data(), size());
-  }
-
-  // string_view::copy()
-  //
-  // Copies the contents of the `string_view` at offset `pos` and length `n`
-  // into `buf`.
-  size_type copy(char* buf, size_type n, size_type pos = 0) const;
-
-  // string_view::substr()
-  //
-  // Returns a "substring" of the `string_view` (at offset `pos` and length
-  // `n`) as another string_view. This function throws `std::out_of_bounds` if
-  // `pos > size`.
-  string_view substr(size_type pos, size_type n = npos) const {
-    if (ABSL_PREDICT_FALSE(pos > length_))
-      base_internal::ThrowStdOutOfRange("absl::string_view::substr");
-    n = std::min(n, length_ - pos);
-    return string_view(ptr_ + pos, n);
-  }
-
-  // string_view::compare()
-  //
-  // Performs a lexicographical comparison between the `string_view` and
-  // another `absl::string_view`, returning -1 if `this` is less than, 0 if
-  // `this` is equal to, and 1 if `this` is greater than the passed std::string
-  // view. Note that in the case of data equality, a further comparison is made
-  // on the respective sizes of the two `string_view`s to determine which is
-  // smaller, equal, or greater.
-  int compare(string_view x) const noexcept {
-    auto min_length = std::min(length_, x.length_);
-    if (min_length > 0) {
-      int r = memcmp(ptr_, x.ptr_, min_length);
-      if (r < 0) return -1;
-      if (r > 0) return 1;
-    }
-    if (length_ < x.length_) return -1;
-    if (length_ > x.length_) return 1;
-    return 0;
-  }
-
-  // Overload of `string_view::compare()` for comparing a substring of the
-  // 'string_view` and another `absl::string_view`.
-  int compare(size_type pos1, size_type count1, string_view v) const {
-    return substr(pos1, count1).compare(v);
-  }
-
-  // Overload of `string_view::compare()` for comparing a substring of the
-  // `string_view` and a substring of another `absl::string_view`.
-  int compare(size_type pos1, size_type count1, string_view v, size_type pos2,
-              size_type count2) const {
-    return substr(pos1, count1).compare(v.substr(pos2, count2));
-  }
-
-  // Overload of `string_view::compare()` for comparing a `string_view` and a
-  // a different  C-style std::string `s`.
-  int compare(const char* s) const { return compare(string_view(s)); }
-
-  // Overload of `string_view::compare()` for comparing a substring of the
-  // `string_view` and a different std::string C-style std::string `s`.
-  int compare(size_type pos1, size_type count1, const char* s) const {
-    return substr(pos1, count1).compare(string_view(s));
-  }
-
-  // Overload of `string_view::compare()` for comparing a substring of the
-  // `string_view` and a substring of a different C-style std::string `s`.
-  int compare(size_type pos1, size_type count1, const char* s,
-              size_type count2) const {
-    return substr(pos1, count1).compare(string_view(s, count2));
-  }
-
-  // Find Utilities
-
-  // string_view::find()
-  //
-  // Finds the first occurrence of the substring `s` within the `string_view`,
-  // returning the position of the first character's match, or `npos` if no
-  // match was found.
-  size_type find(string_view s, size_type pos = 0) const noexcept;
-
-  // Overload of `string_view::find()` for finding the given character `c`
-  // within the `string_view`.
-  size_type find(char c, size_type pos = 0) const noexcept;
-
-  // string_view::rfind()
-  //
-  // Finds the last occurrence of a substring `s` within the `string_view`,
-  // returning the position of the first character's match, or `npos` if no
-  // match was found.
-  size_type rfind(string_view s, size_type pos = npos) const
-      noexcept;
-
-  // Overload of `string_view::rfind()` for finding the last given character `c`
-  // within the `string_view`.
-  size_type rfind(char c, size_type pos = npos) const noexcept;
-
-  // string_view::find_first_of()
-  //
-  // Finds the first occurrence of any of the characters in `s` within the
-  // `string_view`, returning the start position of the match, or `npos` if no
-  // match was found.
-  size_type find_first_of(string_view s, size_type pos = 0) const
-      noexcept;
-
-  // Overload of `string_view::find_first_of()` for finding a character `c`
-  // within the `string_view`.
-  size_type find_first_of(char c, size_type pos = 0) const
-      noexcept {
-    return find(c, pos);
-  }
-
-  // string_view::find_last_of()
-  //
-  // Finds the last occurrence of any of the characters in `s` within the
-  // `string_view`, returning the start position of the match, or `npos` if no
-  // match was found.
-  size_type find_last_of(string_view s, size_type pos = npos) const
-      noexcept;
-
-  // Overload of `string_view::find_last_of()` for finding a character `c`
-  // within the `string_view`.
-  size_type find_last_of(char c, size_type pos = npos) const
-      noexcept {
-    return rfind(c, pos);
-  }
-
-  // string_view::find_first_not_of()
-  //
-  // Finds the first occurrence of any of the characters not in `s` within the
-  // `string_view`, returning the start position of the first non-match, or
-  // `npos` if no non-match was found.
-  size_type find_first_not_of(string_view s, size_type pos = 0) const noexcept;
-
-  // Overload of `string_view::find_first_not_of()` for finding a character
-  // that is not `c` within the `string_view`.
-  size_type find_first_not_of(char c, size_type pos = 0) const noexcept;
-
-  // string_view::find_last_not_of()
-  //
-  // Finds the last occurrence of any of the characters not in `s` within the
-  // `string_view`, returning the start position of the last non-match, or
-  // `npos` if no non-match was found.
-  size_type find_last_not_of(string_view s,
-                                          size_type pos = npos) const noexcept;
-
-  // Overload of `string_view::find_last_not_of()` for finding a character
-  // that is not `c` within the `string_view`.
-  size_type find_last_not_of(char c, size_type pos = npos) const
-      noexcept;
-
- private:
-  static constexpr size_type kMaxSize =
-      (std::numeric_limits<difference_type>::max)();
-
-  static constexpr size_type CheckLengthInternal(size_type len) {
-    return ABSL_ASSERT(len <= kMaxSize), len;
-  }
-
-  const char* ptr_;
-  size_type length_;
-};
-
-// This large function is defined inline so that in a fairly common case where
-// one of the arguments is a literal, the compiler can elide a lot of the
-// following comparisons.
-inline bool operator==(string_view x, string_view y) noexcept {
-  auto len = x.size();
-  if (len != y.size()) {
-    return false;
-  }
-  return x.data() == y.data() || len <= 0 ||
-         memcmp(x.data(), y.data(), len) == 0;
-}
-
-inline bool operator!=(string_view x, string_view y) noexcept {
-  return !(x == y);
-}
-
-inline bool operator<(string_view x, string_view y) noexcept {
-  auto min_size = std::min(x.size(), y.size());
-  const int r = min_size == 0 ? 0 : memcmp(x.data(), y.data(), min_size);
-  return (r < 0) || (r == 0 && x.size() < y.size());
-}
-
-inline bool operator>(string_view x, string_view y) noexcept { return y < x; }
-
-inline bool operator<=(string_view x, string_view y) noexcept {
-  return !(y < x);
-}
-
-inline bool operator>=(string_view x, string_view y) noexcept {
-  return !(x < y);
-}
-
-// IO Insertion Operator
-std::ostream& operator<<(std::ostream& o, string_view piece);
-
-}  // namespace absl
-
-#endif  // ABSL_HAVE_STD_STRING_VIEW
-
-namespace absl {
-
-// ClippedSubstr()
-//
-// Like `s.substr(pos, n)`, but clips `pos` to an upper bound of `s.size()`.
-// Provided because std::string_view::substr throws if `pos > size()`
-inline string_view ClippedSubstr(string_view s, size_t pos,
-                                 size_t n = string_view::npos) {
-  pos = std::min(pos, static_cast<size_t>(s.size()));
-  return s.substr(pos, n);
-}
-
-// NullSafeStringView()
-//
-// Creates an `absl::string_view` from a pointer `p` even if it's null-valued.
-// This function should be used where an `absl::string_view` can be created from
-// a possibly-null pointer.
-inline string_view NullSafeStringView(const char* p) {
-  return p ? string_view(p) : string_view();
-}
-
-}  // namespace absl
-
-#endif  // ABSL_STRINGS_STRING_VIEW_H_
diff --git a/submodules/libtgvoip/webrtc_dsp/absl/types/bad_optional_access.cc b/submodules/libtgvoip/webrtc_dsp/absl/types/bad_optional_access.cc
deleted file mode 100755
index 558707760e..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/absl/types/bad_optional_access.cc
+++ /dev/null
@@ -1,46 +0,0 @@
-// Copyright 2017 The Abseil Authors.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#include "absl/types/bad_optional_access.h"
-
-#ifndef ABSL_HAVE_STD_OPTIONAL
-
-#include <cstdlib>
-
-#include "absl/base/config.h"
-#include "absl/base/internal/raw_logging.h"
-
-namespace absl {
-
-bad_optional_access::~bad_optional_access() = default;
-
-const char* bad_optional_access::what() const noexcept {
-  return "optional has no value";
-}
-
-namespace optional_internal {
-
-void throw_bad_optional_access() {
-#ifdef ABSL_HAVE_EXCEPTIONS
-  throw bad_optional_access();
-#else
-  ABSL_RAW_LOG(FATAL, "Bad optional access");
-  abort();
-#endif
-}
-
-}  // namespace optional_internal
-}  // namespace absl
-
-#endif  // ABSL_HAVE_STD_OPTIONAL
diff --git a/submodules/libtgvoip/webrtc_dsp/absl/types/bad_optional_access.h b/submodules/libtgvoip/webrtc_dsp/absl/types/bad_optional_access.h
deleted file mode 100755
index c6c27460a7..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/absl/types/bad_optional_access.h
+++ /dev/null
@@ -1,74 +0,0 @@
-// Copyright 2018 The Abseil Authors.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-// -----------------------------------------------------------------------------
-// bad_optional_access.h
-// -----------------------------------------------------------------------------
-//
-// This header file defines the `absl::bad_optional_access` type.
-
-#ifndef ABSL_TYPES_BAD_OPTIONAL_ACCESS_H_
-#define ABSL_TYPES_BAD_OPTIONAL_ACCESS_H_
-
-#include <stdexcept>
-
-#include "absl/base/config.h"
-
-#ifdef ABSL_HAVE_STD_OPTIONAL
-
-#include <optional>
-
-namespace absl {
-using std::bad_optional_access;
-}  // namespace absl
-
-#else  // ABSL_HAVE_STD_OPTIONAL
-
-namespace absl {
-
-// -----------------------------------------------------------------------------
-// bad_optional_access
-// -----------------------------------------------------------------------------
-//
-// An `absl::bad_optional_access` type is an exception type that is thrown when
-// attempting to access an `absl::optional` object that does not contain a
-// value.
-//
-// Example:
-//
-//   absl::optional<int> o;
-//
-//   try {
-//     int n = o.value();
-//   } catch(const absl::bad_optional_access& e) {
-//     std::cout << "Bad optional access: " << e.what() << '\n';
-//   }
-class bad_optional_access : public std::exception {
- public:
-  bad_optional_access() = default;
-  ~bad_optional_access() override;
-  const char* what() const noexcept override;
-};
-
-namespace optional_internal {
-
-// throw delegator
-[[noreturn]] void throw_bad_optional_access();
-
-}  // namespace optional_internal
-}  // namespace absl
-
-#endif  // ABSL_HAVE_STD_OPTIONAL
-
-#endif  // ABSL_TYPES_BAD_OPTIONAL_ACCESS_H_
diff --git a/submodules/libtgvoip/webrtc_dsp/absl/types/optional.cc b/submodules/libtgvoip/webrtc_dsp/absl/types/optional.cc
deleted file mode 100755
index ef27290419..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/absl/types/optional.cc
+++ /dev/null
@@ -1,24 +0,0 @@
-// Copyright 2017 The Abseil Authors.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#include "absl/types/optional.h"
-
-#ifndef ABSL_HAVE_STD_OPTIONAL
-namespace absl {
-
-nullopt_t::init_t nullopt_t::init;
-extern const nullopt_t nullopt{nullopt_t::init};
-
-}  // namespace absl
-#endif  // ABSL_HAVE_STD_OPTIONAL
diff --git a/submodules/libtgvoip/webrtc_dsp/absl/types/optional.h b/submodules/libtgvoip/webrtc_dsp/absl/types/optional.h
deleted file mode 100755
index 7677fe52c0..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/absl/types/optional.h
+++ /dev/null
@@ -1,1142 +0,0 @@
-// Copyright 2017 The Abseil Authors.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-// -----------------------------------------------------------------------------
-// optional.h
-// -----------------------------------------------------------------------------
-//
-// This header file defines the `absl::optional` type for holding a value which
-// may or may not be present. This type is useful for providing value semantics
-// for operations that may either wish to return or hold "something-or-nothing".
-//
-// Example:
-//
-//   // A common way to signal operation failure is to provide an output
-//   // parameter and a bool return type:
-//   bool AcquireResource(const Input&, Resource * out);
-//
-//   // Providing an absl::optional return type provides a cleaner API:
-//   absl::optional<Resource> AcquireResource(const Input&);
-//
-// `absl::optional` is a C++11 compatible version of the C++17 `std::optional`
-// abstraction and is designed to be a drop-in replacement for code compliant
-// with C++17.
-#ifndef ABSL_TYPES_OPTIONAL_H_
-#define ABSL_TYPES_OPTIONAL_H_
-
-#include "absl/base/config.h"
-#include "absl/utility/utility.h"
-
-#ifdef ABSL_HAVE_STD_OPTIONAL
-
-#include <optional>
-
-namespace absl {
-using std::bad_optional_access;
-using std::optional;
-using std::make_optional;
-using std::nullopt_t;
-using std::nullopt;
-}  // namespace absl
-
-#else  // ABSL_HAVE_STD_OPTIONAL
-
-#include <cassert>
-#include <functional>
-#include <initializer_list>
-#include <new>
-#include <type_traits>
-#include <utility>
-
-#include "absl/base/attributes.h"
-#include "absl/memory/memory.h"
-#include "absl/meta/type_traits.h"
-#include "absl/types/bad_optional_access.h"
-
-// ABSL_OPTIONAL_USE_INHERITING_CONSTRUCTORS
-//
-// Inheriting constructors is supported in GCC 4.8+, Clang 3.3+ and MSVC 2015.
-// __cpp_inheriting_constructors is a predefined macro and a recommended way to
-// check for this language feature, but GCC doesn't support it until 5.0 and
-// Clang doesn't support it until 3.6.
-// Also, MSVC 2015 has a bug: it doesn't inherit the constexpr template
-// constructor. For example, the following code won't work on MSVC 2015 Update3:
-// struct Base {
-//   int t;
-//   template <typename T>
-//   constexpr Base(T t_) : t(t_) {}
-// };
-// struct Foo : Base {
-//   using Base::Base;
-// }
-// constexpr Foo foo(0);  // doesn't work on MSVC 2015
-#if defined(__clang__)
-#if __has_feature(cxx_inheriting_constructors)
-#define ABSL_OPTIONAL_USE_INHERITING_CONSTRUCTORS 1
-#endif
-#elif (defined(__GNUC__) &&                                       \
-       (__GNUC__ > 4 || __GNUC__ == 4 && __GNUC_MINOR__ >= 8)) || \
-    (__cpp_inheriting_constructors >= 200802) ||                  \
-    (defined(_MSC_VER) && _MSC_VER >= 1910)
-#define ABSL_OPTIONAL_USE_INHERITING_CONSTRUCTORS 1
-#endif
-
-namespace absl {
-
-// -----------------------------------------------------------------------------
-// absl::optional
-// -----------------------------------------------------------------------------
-//
-// A value of type `absl::optional<T>` holds either a value of `T` or an
-// "empty" value.  When it holds a value of `T`, it stores it as a direct
-// sub-object, so `sizeof(optional<T>)` is approximately
-// `sizeof(T) + sizeof(bool)`.
-//
-// This implementation is based on the specification in the latest draft of the
-// C++17 `std::optional` specification as of May 2017, section 20.6.
-//
-// Differences between `absl::optional<T>` and `std::optional<T>` include:
-//
-//    * `constexpr` is not used for non-const member functions.
-//      (dependency on some differences between C++11 and C++14.)
-//    * `absl::nullopt` and `absl::in_place` are not declared `constexpr`. We
-//      need the inline variable support in C++17 for external linkage.
-//    * Throws `absl::bad_optional_access` instead of
-//      `std::bad_optional_access`.
-//    * `optional::swap()` and `absl::swap()` relies on
-//      `std::is_(nothrow_)swappable()`, which has been introduced in C++17.
-//      As a workaround, we assume `is_swappable()` is always `true`
-//      and `is_nothrow_swappable()` is the same as `std::is_trivial()`.
-//    * `make_optional()` cannot be declared `constexpr` due to the absence of
-//      guaranteed copy elision.
-//    * The move constructor's `noexcept` specification is stronger, i.e. if the
-//      default allocator is non-throwing (via setting
-//      `ABSL_ALLOCATOR_NOTHROW`), it evaluates to `noexcept(true)`, because
-//      we assume
-//       a) move constructors should only throw due to allocation failure and
-//       b) if T's move constructor allocates, it uses the same allocation
-//          function as the default allocator.
-template <typename T>
-class optional;
-
-// nullopt_t
-//
-// Class type for `absl::nullopt` used to indicate an `absl::optional<T>` type
-// that does not contain a value.
-struct nullopt_t {
-  struct init_t {};
-  static init_t init;
-
-  // It must not be default-constructible to avoid ambiguity for opt = {}.
-  // Note the non-const reference, which is to eliminate ambiguity for code
-  // like:
-  //
-  // struct S { int value; };
-  //
-  // void Test() {
-  //   optional<S> opt;
-  //   opt = {{}};
-  // }
-  explicit constexpr nullopt_t(init_t& /*unused*/) {}
-};
-
-// nullopt
-//
-// A tag constant of type `absl::nullopt_t` used to indicate an empty
-// `absl::optional` in certain functions, such as construction or assignment.
-extern const nullopt_t nullopt;
-
-namespace optional_internal {
-
-struct empty_struct {};
-// This class stores the data in optional<T>.
-// It is specialized based on whether T is trivially destructible.
-// This is the specialization for non trivially destructible type.
-template <typename T, bool unused = std::is_trivially_destructible<T>::value>
-class optional_data_dtor_base {
-  struct dummy_type {
-    static_assert(sizeof(T) % sizeof(empty_struct) == 0, "");
-    // Use an array to avoid GCC 6 placement-new warning.
-    empty_struct data[sizeof(T) / sizeof(empty_struct)];
-  };
-
- protected:
-  // Whether there is data or not.
-  bool engaged_;
-  // Data storage
-  union {
-    dummy_type dummy_;
-    T data_;
-  };
-
-  void destruct() noexcept {
-    if (engaged_) {
-      data_.~T();
-      engaged_ = false;
-    }
-  }
-
-  // dummy_ must be initialized for constexpr constructor.
-  constexpr optional_data_dtor_base() noexcept : engaged_(false), dummy_{{}} {}
-
-  template <typename... Args>
-  constexpr explicit optional_data_dtor_base(in_place_t, Args&&... args)
-      : engaged_(true), data_(absl::forward<Args>(args)...) {}
-
-  ~optional_data_dtor_base() { destruct(); }
-};
-
-// Specialization for trivially destructible type.
-template <typename T>
-class optional_data_dtor_base<T, true> {
-  struct dummy_type {
-    static_assert(sizeof(T) % sizeof(empty_struct) == 0, "");
-    // Use array to avoid GCC 6 placement-new warning.
-    empty_struct data[sizeof(T) / sizeof(empty_struct)];
-  };
-
- protected:
-  // Whether there is data or not.
-  bool engaged_;
-  // Data storage
-  union {
-    dummy_type dummy_;
-    T data_;
-  };
-  void destruct() noexcept { engaged_ = false; }
-
-  // dummy_ must be initialized for constexpr constructor.
-  constexpr optional_data_dtor_base() noexcept : engaged_(false), dummy_{{}} {}
-
-  template <typename... Args>
-  constexpr explicit optional_data_dtor_base(in_place_t, Args&&... args)
-      : engaged_(true), data_(absl::forward<Args>(args)...) {}
-};
-
-template <typename T>
-class optional_data_base : public optional_data_dtor_base<T> {
- protected:
-  using base = optional_data_dtor_base<T>;
-#if ABSL_OPTIONAL_USE_INHERITING_CONSTRUCTORS
-  using base::base;
-#else
-  optional_data_base() = default;
-
-  template <typename... Args>
-  constexpr explicit optional_data_base(in_place_t t, Args&&... args)
-      : base(t, absl::forward<Args>(args)...) {}
-#endif
-
-  template <typename... Args>
-  void construct(Args&&... args) {
-    // Use dummy_'s address to work around casting cv-qualified T* to void*.
-    ::new (static_cast<void*>(&this->dummy_)) T(std::forward<Args>(args)...);
-    this->engaged_ = true;
-  }
-
-  template <typename U>
-  void assign(U&& u) {
-    if (this->engaged_) {
-      this->data_ = std::forward<U>(u);
-    } else {
-      construct(std::forward<U>(u));
-    }
-  }
-};
-
-// TODO(absl-team): Add another class using
-// std::is_trivially_move_constructible trait when available to match
-// http://cplusplus.github.io/LWG/lwg-defects.html#2900, for types that
-// have trivial move but nontrivial copy.
-// Also, we should be checking is_trivially_copyable here, which is not
-// supported now, so we use is_trivially_* traits instead.
-template <typename T,
-          bool unused = absl::is_trivially_copy_constructible<T>::value&&
-              absl::is_trivially_copy_assignable<typename std::remove_cv<
-                  T>::type>::value&& std::is_trivially_destructible<T>::value>
-class optional_data;
-
-// Trivially copyable types
-template <typename T>
-class optional_data<T, true> : public optional_data_base<T> {
- protected:
-#if ABSL_OPTIONAL_USE_INHERITING_CONSTRUCTORS
-  using optional_data_base<T>::optional_data_base;
-#else
-  optional_data() = default;
-
-  template <typename... Args>
-  constexpr explicit optional_data(in_place_t t, Args&&... args)
-      : optional_data_base<T>(t, absl::forward<Args>(args)...) {}
-#endif
-};
-
-template <typename T>
-class optional_data<T, false> : public optional_data_base<T> {
- protected:
-#if ABSL_OPTIONAL_USE_INHERITING_CONSTRUCTORS
-  using optional_data_base<T>::optional_data_base;
-#else
-  template <typename... Args>
-  constexpr explicit optional_data(in_place_t t, Args&&... args)
-      : optional_data_base<T>(t, absl::forward<Args>(args)...) {}
-#endif
-
-  optional_data() = default;
-
-  optional_data(const optional_data& rhs) {
-    if (rhs.engaged_) {
-      this->construct(rhs.data_);
-    }
-  }
-
-  optional_data(optional_data&& rhs) noexcept(
-      absl::default_allocator_is_nothrow::value ||
-      std::is_nothrow_move_constructible<T>::value) {
-    if (rhs.engaged_) {
-      this->construct(std::move(rhs.data_));
-    }
-  }
-
-  optional_data& operator=(const optional_data& rhs) {
-    if (rhs.engaged_) {
-      this->assign(rhs.data_);
-    } else {
-      this->destruct();
-    }
-    return *this;
-  }
-
-  optional_data& operator=(optional_data&& rhs) noexcept(
-      std::is_nothrow_move_assignable<T>::value&&
-          std::is_nothrow_move_constructible<T>::value) {
-    if (rhs.engaged_) {
-      this->assign(std::move(rhs.data_));
-    } else {
-      this->destruct();
-    }
-    return *this;
-  }
-};
-
-// Ordered by level of restriction, from low to high.
-// Copyable implies movable.
-enum class copy_traits { copyable = 0, movable = 1, non_movable = 2 };
-
-// Base class for enabling/disabling copy/move constructor.
-template <copy_traits>
-class optional_ctor_base;
-
-template <>
-class optional_ctor_base<copy_traits::copyable> {
- public:
-  constexpr optional_ctor_base() = default;
-  optional_ctor_base(const optional_ctor_base&) = default;
-  optional_ctor_base(optional_ctor_base&&) = default;
-  optional_ctor_base& operator=(const optional_ctor_base&) = default;
-  optional_ctor_base& operator=(optional_ctor_base&&) = default;
-};
-
-template <>
-class optional_ctor_base<copy_traits::movable> {
- public:
-  constexpr optional_ctor_base() = default;
-  optional_ctor_base(const optional_ctor_base&) = delete;
-  optional_ctor_base(optional_ctor_base&&) = default;
-  optional_ctor_base& operator=(const optional_ctor_base&) = default;
-  optional_ctor_base& operator=(optional_ctor_base&&) = default;
-};
-
-template <>
-class optional_ctor_base<copy_traits::non_movable> {
- public:
-  constexpr optional_ctor_base() = default;
-  optional_ctor_base(const optional_ctor_base&) = delete;
-  optional_ctor_base(optional_ctor_base&&) = delete;
-  optional_ctor_base& operator=(const optional_ctor_base&) = default;
-  optional_ctor_base& operator=(optional_ctor_base&&) = default;
-};
-
-// Base class for enabling/disabling copy/move assignment.
-template <copy_traits>
-class optional_assign_base;
-
-template <>
-class optional_assign_base<copy_traits::copyable> {
- public:
-  constexpr optional_assign_base() = default;
-  optional_assign_base(const optional_assign_base&) = default;
-  optional_assign_base(optional_assign_base&&) = default;
-  optional_assign_base& operator=(const optional_assign_base&) = default;
-  optional_assign_base& operator=(optional_assign_base&&) = default;
-};
-
-template <>
-class optional_assign_base<copy_traits::movable> {
- public:
-  constexpr optional_assign_base() = default;
-  optional_assign_base(const optional_assign_base&) = default;
-  optional_assign_base(optional_assign_base&&) = default;
-  optional_assign_base& operator=(const optional_assign_base&) = delete;
-  optional_assign_base& operator=(optional_assign_base&&) = default;
-};
-
-template <>
-class optional_assign_base<copy_traits::non_movable> {
- public:
-  constexpr optional_assign_base() = default;
-  optional_assign_base(const optional_assign_base&) = default;
-  optional_assign_base(optional_assign_base&&) = default;
-  optional_assign_base& operator=(const optional_assign_base&) = delete;
-  optional_assign_base& operator=(optional_assign_base&&) = delete;
-};
-
-template <typename T>
-constexpr copy_traits get_ctor_copy_traits() {
-  return std::is_copy_constructible<T>::value
-             ? copy_traits::copyable
-             : std::is_move_constructible<T>::value ? copy_traits::movable
-                                                    : copy_traits::non_movable;
-}
-
-template <typename T>
-constexpr copy_traits get_assign_copy_traits() {
-  return absl::is_copy_assignable<T>::value &&
-                 std::is_copy_constructible<T>::value
-             ? copy_traits::copyable
-             : absl::is_move_assignable<T>::value &&
-                       std::is_move_constructible<T>::value
-                   ? copy_traits::movable
-                   : copy_traits::non_movable;
-}
-
-// Whether T is constructible or convertible from optional<U>.
-template <typename T, typename U>
-struct is_constructible_convertible_from_optional
-    : std::integral_constant<
-          bool, std::is_constructible<T, optional<U>&>::value ||
-                    std::is_constructible<T, optional<U>&&>::value ||
-                    std::is_constructible<T, const optional<U>&>::value ||
-                    std::is_constructible<T, const optional<U>&&>::value ||
-                    std::is_convertible<optional<U>&, T>::value ||
-                    std::is_convertible<optional<U>&&, T>::value ||
-                    std::is_convertible<const optional<U>&, T>::value ||
-                    std::is_convertible<const optional<U>&&, T>::value> {};
-
-// Whether T is constructible or convertible or assignable from optional<U>.
-template <typename T, typename U>
-struct is_constructible_convertible_assignable_from_optional
-    : std::integral_constant<
-          bool, is_constructible_convertible_from_optional<T, U>::value ||
-                    std::is_assignable<T&, optional<U>&>::value ||
-                    std::is_assignable<T&, optional<U>&&>::value ||
-                    std::is_assignable<T&, const optional<U>&>::value ||
-                    std::is_assignable<T&, const optional<U>&&>::value> {};
-
-// Helper function used by [optional.relops], [optional.comp_with_t],
-// for checking whether an expression is convertible to bool.
-bool convertible_to_bool(bool);
-
-// Base class for std::hash<absl::optional<T>>:
-// If std::hash<std::remove_const_t<T>> is enabled, it provides operator() to
-// compute the hash; Otherwise, it is disabled.
-// Reference N4659 23.14.15 [unord.hash].
-template <typename T, typename = size_t>
-struct optional_hash_base {
-  optional_hash_base() = delete;
-  optional_hash_base(const optional_hash_base&) = delete;
-  optional_hash_base(optional_hash_base&&) = delete;
-  optional_hash_base& operator=(const optional_hash_base&) = delete;
-  optional_hash_base& operator=(optional_hash_base&&) = delete;
-};
-
-template <typename T>
-struct optional_hash_base<T, decltype(std::hash<absl::remove_const_t<T> >()(
-                                 std::declval<absl::remove_const_t<T> >()))> {
-  using argument_type = absl::optional<T>;
-  using result_type = size_t;
-  size_t operator()(const absl::optional<T>& opt) const {
-    if (opt) {
-      return std::hash<absl::remove_const_t<T> >()(*opt);
-    } else {
-      return static_cast<size_t>(0x297814aaad196e6dULL);
-    }
-  }
-};
-
-}  // namespace optional_internal
-
-// -----------------------------------------------------------------------------
-// absl::optional class definition
-// -----------------------------------------------------------------------------
-
-template <typename T>
-class optional : private optional_internal::optional_data<T>,
-                 private optional_internal::optional_ctor_base<
-                     optional_internal::get_ctor_copy_traits<T>()>,
-                 private optional_internal::optional_assign_base<
-                     optional_internal::get_assign_copy_traits<T>()> {
-  using data_base = optional_internal::optional_data<T>;
-
- public:
-  typedef T value_type;
-
-  // Constructors
-
-  // Constructs an `optional` holding an empty value, NOT a default constructed
-  // `T`.
-  constexpr optional() noexcept {}
-
-  // Constructs an `optional` initialized with `nullopt` to hold an empty value.
-  constexpr optional(nullopt_t) noexcept {}  // NOLINT(runtime/explicit)
-
-  // Copy constructor, standard semantics
-  optional(const optional& src) = default;
-
-  // Move constructor, standard semantics
-  optional(optional&& src) = default;
-
-  // Constructs a non-empty `optional` direct-initialized value of type `T` from
-  // the arguments `std::forward<Args>(args)...`  within the `optional`.
-  // (The `in_place_t` is a tag used to indicate that the contained object
-  // should be constructed in-place.)
-  //
-  // TODO(absl-team): Add std::is_constructible<T, Args&&...> SFINAE.
-  template <typename... Args>
-  constexpr explicit optional(in_place_t, Args&&... args)
-      : data_base(in_place_t(), absl::forward<Args>(args)...) {}
-
-  // Constructs a non-empty `optional` direct-initialized value of type `T` from
-  // the arguments of an initializer_list and `std::forward<Args>(args)...`.
-  // (The `in_place_t` is a tag used to indicate that the contained object
-  // should be constructed in-place.)
-  template <typename U, typename... Args,
-            typename = typename std::enable_if<std::is_constructible<
-                T, std::initializer_list<U>&, Args&&...>::value>::type>
-  constexpr explicit optional(in_place_t, std::initializer_list<U> il,
-                              Args&&... args)
-      : data_base(in_place_t(), il, absl::forward<Args>(args)...) {
-  }
-
-  // Value constructor (implicit)
-  template <
-      typename U = T,
-      typename std::enable_if<
-          absl::conjunction<absl::negation<std::is_same<
-                                in_place_t, typename std::decay<U>::type> >,
-                            absl::negation<std::is_same<
-                                optional<T>, typename std::decay<U>::type> >,
-                            std::is_convertible<U&&, T>,
-                            std::is_constructible<T, U&&> >::value,
-          bool>::type = false>
-  constexpr optional(U&& v) : data_base(in_place_t(), absl::forward<U>(v)) {}
-
-  // Value constructor (explicit)
-  template <
-      typename U = T,
-      typename std::enable_if<
-          absl::conjunction<absl::negation<std::is_same<
-                                in_place_t, typename std::decay<U>::type>>,
-                            absl::negation<std::is_same<
-                                optional<T>, typename std::decay<U>::type>>,
-                            absl::negation<std::is_convertible<U&&, T>>,
-                            std::is_constructible<T, U&&>>::value,
-          bool>::type = false>
-  explicit constexpr optional(U&& v)
-      : data_base(in_place_t(), absl::forward<U>(v)) {}
-
-  // Converting copy constructor (implicit)
-  template <typename U,
-            typename std::enable_if<
-                absl::conjunction<
-                    absl::negation<std::is_same<T, U> >,
-                    std::is_constructible<T, const U&>,
-                    absl::negation<
-                        optional_internal::
-                            is_constructible_convertible_from_optional<T, U> >,
-                    std::is_convertible<const U&, T> >::value,
-                bool>::type = false>
-  optional(const optional<U>& rhs) {
-    if (rhs) {
-      this->construct(*rhs);
-    }
-  }
-
-  // Converting copy constructor (explicit)
-  template <typename U,
-            typename std::enable_if<
-                absl::conjunction<
-                    absl::negation<std::is_same<T, U>>,
-                    std::is_constructible<T, const U&>,
-                    absl::negation<
-                        optional_internal::
-                            is_constructible_convertible_from_optional<T, U>>,
-                    absl::negation<std::is_convertible<const U&, T>>>::value,
-                bool>::type = false>
-  explicit optional(const optional<U>& rhs) {
-    if (rhs) {
-      this->construct(*rhs);
-    }
-  }
-
-  // Converting move constructor (implicit)
-  template <typename U,
-            typename std::enable_if<
-                absl::conjunction<
-                    absl::negation<std::is_same<T, U> >,
-                    std::is_constructible<T, U&&>,
-                    absl::negation<
-                        optional_internal::
-                            is_constructible_convertible_from_optional<T, U> >,
-                    std::is_convertible<U&&, T> >::value,
-                bool>::type = false>
-  optional(optional<U>&& rhs) {
-    if (rhs) {
-      this->construct(std::move(*rhs));
-    }
-  }
-
-  // Converting move constructor (explicit)
-  template <
-      typename U,
-      typename std::enable_if<
-          absl::conjunction<
-              absl::negation<std::is_same<T, U>>, std::is_constructible<T, U&&>,
-              absl::negation<
-                  optional_internal::is_constructible_convertible_from_optional<
-                      T, U>>,
-              absl::negation<std::is_convertible<U&&, T>>>::value,
-          bool>::type = false>
-  explicit optional(optional<U>&& rhs) {
-    if (rhs) {
-      this->construct(std::move(*rhs));
-    }
-  }
-
-  // Destructor. Trivial if `T` is trivially destructible.
-  ~optional() = default;
-
-  // Assignment Operators
-
-  // Assignment from `nullopt`
-  //
-  // Example:
-  //
-  //   struct S { int value; };
-  //   optional<S> opt = absl::nullopt;  // Could also use opt = { };
-  optional& operator=(nullopt_t) noexcept {
-    this->destruct();
-    return *this;
-  }
-
-  // Copy assignment operator, standard semantics
-  optional& operator=(const optional& src) = default;
-
-  // Move assignment operator, standard semantics
-  optional& operator=(optional&& src) = default;
-
-  // Value assignment operators
-  template <
-      typename U = T,
-      typename = typename std::enable_if<absl::conjunction<
-          absl::negation<
-              std::is_same<optional<T>, typename std::decay<U>::type>>,
-          absl::negation<
-              absl::conjunction<std::is_scalar<T>,
-                                std::is_same<T, typename std::decay<U>::type>>>,
-          std::is_constructible<T, U>, std::is_assignable<T&, U>>::value>::type>
-  optional& operator=(U&& v) {
-    this->assign(std::forward<U>(v));
-    return *this;
-  }
-
-  template <
-      typename U,
-      typename = typename std::enable_if<absl::conjunction<
-          absl::negation<std::is_same<T, U>>,
-          std::is_constructible<T, const U&>, std::is_assignable<T&, const U&>,
-          absl::negation<
-              optional_internal::
-                  is_constructible_convertible_assignable_from_optional<
-                      T, U>>>::value>::type>
-  optional& operator=(const optional<U>& rhs) {
-    if (rhs) {
-      this->assign(*rhs);
-    } else {
-      this->destruct();
-    }
-    return *this;
-  }
-
-  template <typename U,
-            typename = typename std::enable_if<absl::conjunction<
-                absl::negation<std::is_same<T, U>>, std::is_constructible<T, U>,
-                std::is_assignable<T&, U>,
-                absl::negation<
-                    optional_internal::
-                        is_constructible_convertible_assignable_from_optional<
-                            T, U>>>::value>::type>
-  optional& operator=(optional<U>&& rhs) {
-    if (rhs) {
-      this->assign(std::move(*rhs));
-    } else {
-      this->destruct();
-    }
-    return *this;
-  }
-
-  // Modifiers
-
-  // optional::reset()
-  //
-  // Destroys the inner `T` value of an `absl::optional` if one is present.
-  ABSL_ATTRIBUTE_REINITIALIZES void reset() noexcept { this->destruct(); }
-
-  // optional::emplace()
-  //
-  // (Re)constructs the underlying `T` in-place with the given forwarded
-  // arguments.
-  //
-  // Example:
-  //
-  //   optional<Foo> opt;
-  //   opt.emplace(arg1,arg2,arg3);  // Constructs Foo(arg1,arg2,arg3)
-  //
-  // If the optional is non-empty, and the `args` refer to subobjects of the
-  // current object, then behaviour is undefined, because the current object
-  // will be destructed before the new object is constructed with `args`.
-  template <typename... Args,
-            typename = typename std::enable_if<
-                std::is_constructible<T, Args&&...>::value>::type>
-  T& emplace(Args&&... args) {
-    this->destruct();
-    this->construct(std::forward<Args>(args)...);
-    return reference();
-  }
-
-  // Emplace reconstruction overload for an initializer list and the given
-  // forwarded arguments.
-  //
-  // Example:
-  //
-  //   struct Foo {
-  //     Foo(std::initializer_list<int>);
-  //   };
-  //
-  //   optional<Foo> opt;
-  //   opt.emplace({1,2,3});  // Constructs Foo({1,2,3})
-  template <typename U, typename... Args,
-            typename = typename std::enable_if<std::is_constructible<
-                T, std::initializer_list<U>&, Args&&...>::value>::type>
-  T& emplace(std::initializer_list<U> il, Args&&... args) {
-    this->destruct();
-    this->construct(il, std::forward<Args>(args)...);
-    return reference();
-  }
-
-  // Swaps
-
-  // Swap, standard semantics
-  void swap(optional& rhs) noexcept(
-      std::is_nothrow_move_constructible<T>::value&&
-          std::is_trivial<T>::value) {
-    if (*this) {
-      if (rhs) {
-        using std::swap;
-        swap(**this, *rhs);
-      } else {
-        rhs.construct(std::move(**this));
-        this->destruct();
-      }
-    } else {
-      if (rhs) {
-        this->construct(std::move(*rhs));
-        rhs.destruct();
-      } else {
-        // No effect (swap(disengaged, disengaged)).
-      }
-    }
-  }
-
-  // Observers
-
-  // optional::operator->()
-  //
-  // Accesses the underlying `T` value's member `m` of an `optional`. If the
-  // `optional` is empty, behavior is undefined.
-  //
-  // If you need myOpt->foo in constexpr, use (*myOpt).foo instead.
-  const T* operator->() const {
-    assert(this->engaged_);
-    return std::addressof(this->data_);
-  }
-  T* operator->() {
-    assert(this->engaged_);
-    return std::addressof(this->data_);
-  }
-
-  // optional::operator*()
-  //
-  // Accesses the underlying `T` value of an `optional`. If the `optional` is
-  // empty, behavior is undefined.
-  constexpr const T& operator*() const & { return reference(); }
-  T& operator*() & {
-    assert(this->engaged_);
-    return reference();
-  }
-  constexpr const T&& operator*() const && {
-    return absl::move(reference());
-  }
-  T&& operator*() && {
-    assert(this->engaged_);
-    return std::move(reference());
-  }
-
-  // optional::operator bool()
-  //
-  // Returns false if and only if the `optional` is empty.
-  //
-  //   if (opt) {
-  //     // do something with opt.value();
-  //   } else {
-  //     // opt is empty.
-  //   }
-  //
-  constexpr explicit operator bool() const noexcept { return this->engaged_; }
-
-  // optional::has_value()
-  //
-  // Determines whether the `optional` contains a value. Returns `false` if and
-  // only if `*this` is empty.
-  constexpr bool has_value() const noexcept { return this->engaged_; }
-
-// Suppress bogus warning on MSVC: MSVC complains call to reference() after
-// throw_bad_optional_access() is unreachable.
-#ifdef _MSC_VER
-#pragma warning(push)
-#pragma warning(disable : 4702)
-#endif  // _MSC_VER
-  // optional::value()
-  //
-  // Returns a reference to an `optional`s underlying value. The constness
-  // and lvalue/rvalue-ness of the `optional` is preserved to the view of
-  // the `T` sub-object. Throws `absl::bad_optional_access` when the `optional`
-  // is empty.
-  constexpr const T& value() const & {
-    return static_cast<bool>(*this)
-               ? reference()
-               : (optional_internal::throw_bad_optional_access(), reference());
-  }
-  T& value() & {
-    return static_cast<bool>(*this)
-               ? reference()
-               : (optional_internal::throw_bad_optional_access(), reference());
-  }
-  T&& value() && {  // NOLINT(build/c++11)
-    return std::move(
-        static_cast<bool>(*this)
-            ? reference()
-            : (optional_internal::throw_bad_optional_access(), reference()));
-  }
-  constexpr const T&& value() const && {  // NOLINT(build/c++11)
-    return absl::move(
-        static_cast<bool>(*this)
-            ? reference()
-            : (optional_internal::throw_bad_optional_access(), reference()));
-  }
-#ifdef _MSC_VER
-#pragma warning(pop)
-#endif  // _MSC_VER
-
-  // optional::value_or()
-  //
-  // Returns either the value of `T` or a passed default `v` if the `optional`
-  // is empty.
-  template <typename U>
-  constexpr T value_or(U&& v) const& {
-    static_assert(std::is_copy_constructible<value_type>::value,
-                  "optional<T>::value_or: T must by copy constructible");
-    static_assert(std::is_convertible<U&&, value_type>::value,
-                  "optional<T>::value_or: U must be convertible to T");
-    return static_cast<bool>(*this)
-               ? **this
-               : static_cast<T>(absl::forward<U>(v));
-  }
-  template <typename U>
-  T value_or(U&& v) && {  // NOLINT(build/c++11)
-    static_assert(std::is_move_constructible<value_type>::value,
-                  "optional<T>::value_or: T must by copy constructible");
-    static_assert(std::is_convertible<U&&, value_type>::value,
-                  "optional<T>::value_or: U must be convertible to T");
-    return static_cast<bool>(*this) ? std::move(**this)
-                                    : static_cast<T>(std::forward<U>(v));
-  }
-
- private:
-  // Private accessors for internal storage viewed as reference to T.
-  constexpr const T& reference() const { return this->data_; }
-  T& reference() { return this->data_; }
-
-  // T constraint checks.  You can't have an optional of nullopt_t, in_place_t
-  // or a reference.
-  static_assert(
-      !std::is_same<nullopt_t, typename std::remove_cv<T>::type>::value,
-      "optional<nullopt_t> is not allowed.");
-  static_assert(
-      !std::is_same<in_place_t, typename std::remove_cv<T>::type>::value,
-      "optional<in_place_t> is not allowed.");
-  static_assert(!std::is_reference<T>::value,
-                "optional<reference> is not allowed.");
-};
-
-// Non-member functions
-
-// swap()
-//
-// Performs a swap between two `absl::optional` objects, using standard
-// semantics.
-//
-// NOTE: we assume `is_swappable()` is always `true`. A compile error will
-// result if this is not the case.
-template <typename T,
-          typename std::enable_if<std::is_move_constructible<T>::value,
-                                  bool>::type = false>
-void swap(optional<T>& a, optional<T>& b) noexcept(noexcept(a.swap(b))) {
-  a.swap(b);
-}
-
-// make_optional()
-//
-// Creates a non-empty `optional<T>` where the type of `T` is deduced. An
-// `absl::optional` can also be explicitly instantiated with
-// `make_optional<T>(v)`.
-//
-// Note: `make_optional()` constructions may be declared `constexpr` for
-// trivially copyable types `T`. Non-trivial types require copy elision
-// support in C++17 for `make_optional` to support `constexpr` on such
-// non-trivial types.
-//
-// Example:
-//
-//   constexpr absl::optional<int> opt = absl::make_optional(1);
-//   static_assert(opt.value() == 1, "");
-template <typename T>
-constexpr optional<typename std::decay<T>::type> make_optional(T&& v) {
-  return optional<typename std::decay<T>::type>(absl::forward<T>(v));
-}
-
-template <typename T, typename... Args>
-constexpr optional<T> make_optional(Args&&... args) {
-  return optional<T>(in_place_t(), absl::forward<Args>(args)...);
-}
-
-template <typename T, typename U, typename... Args>
-constexpr optional<T> make_optional(std::initializer_list<U> il,
-                                    Args&&... args) {
-  return optional<T>(in_place_t(), il,
-                     absl::forward<Args>(args)...);
-}
-
-// Relational operators [optional.relops]
-
-// Empty optionals are considered equal to each other and less than non-empty
-// optionals. Supports relations between optional<T> and optional<U>, between
-// optional<T> and U, and between optional<T> and nullopt.
-//
-// Note: We're careful to support T having non-bool relationals.
-
-// Requires: The expression, e.g. "*x == *y" shall be well-formed and its result
-// shall be convertible to bool.
-// The C++17 (N4606) "Returns:" statements are translated into
-// code in an obvious way here, and the original text retained as function docs.
-// Returns: If bool(x) != bool(y), false; otherwise if bool(x) == false, true;
-// otherwise *x == *y.
-template <typename T, typename U>
-constexpr auto operator==(const optional<T>& x, const optional<U>& y)
-    -> decltype(optional_internal::convertible_to_bool(*x == *y)) {
-  return static_cast<bool>(x) != static_cast<bool>(y)
-             ? false
-             : static_cast<bool>(x) == false ? true
-                                             : static_cast<bool>(*x == *y);
-}
-
-// Returns: If bool(x) != bool(y), true; otherwise, if bool(x) == false, false;
-// otherwise *x != *y.
-template <typename T, typename U>
-constexpr auto operator!=(const optional<T>& x, const optional<U>& y)
-    -> decltype(optional_internal::convertible_to_bool(*x != *y)) {
-  return static_cast<bool>(x) != static_cast<bool>(y)
-             ? true
-             : static_cast<bool>(x) == false ? false
-                                             : static_cast<bool>(*x != *y);
-}
-// Returns: If !y, false; otherwise, if !x, true; otherwise *x < *y.
-template <typename T, typename U>
-constexpr auto operator<(const optional<T>& x, const optional<U>& y)
-    -> decltype(optional_internal::convertible_to_bool(*x < *y)) {
-  return !y ? false : !x ? true : static_cast<bool>(*x < *y);
-}
-// Returns: If !x, false; otherwise, if !y, true; otherwise *x > *y.
-template <typename T, typename U>
-constexpr auto operator>(const optional<T>& x, const optional<U>& y)
-    -> decltype(optional_internal::convertible_to_bool(*x > *y)) {
-  return !x ? false : !y ? true : static_cast<bool>(*x > *y);
-}
-// Returns: If !x, true; otherwise, if !y, false; otherwise *x <= *y.
-template <typename T, typename U>
-constexpr auto operator<=(const optional<T>& x, const optional<U>& y)
-    -> decltype(optional_internal::convertible_to_bool(*x <= *y)) {
-  return !x ? true : !y ? false : static_cast<bool>(*x <= *y);
-}
-// Returns: If !y, true; otherwise, if !x, false; otherwise *x >= *y.
-template <typename T, typename U>
-constexpr auto operator>=(const optional<T>& x, const optional<U>& y)
-    -> decltype(optional_internal::convertible_to_bool(*x >= *y)) {
-  return !y ? true : !x ? false : static_cast<bool>(*x >= *y);
-}
-
-// Comparison with nullopt [optional.nullops]
-// The C++17 (N4606) "Returns:" statements are used directly here.
-template <typename T>
-constexpr bool operator==(const optional<T>& x, nullopt_t) noexcept {
-  return !x;
-}
-template <typename T>
-constexpr bool operator==(nullopt_t, const optional<T>& x) noexcept {
-  return !x;
-}
-template <typename T>
-constexpr bool operator!=(const optional<T>& x, nullopt_t) noexcept {
-  return static_cast<bool>(x);
-}
-template <typename T>
-constexpr bool operator!=(nullopt_t, const optional<T>& x) noexcept {
-  return static_cast<bool>(x);
-}
-template <typename T>
-constexpr bool operator<(const optional<T>&, nullopt_t) noexcept {
-  return false;
-}
-template <typename T>
-constexpr bool operator<(nullopt_t, const optional<T>& x) noexcept {
-  return static_cast<bool>(x);
-}
-template <typename T>
-constexpr bool operator<=(const optional<T>& x, nullopt_t) noexcept {
-  return !x;
-}
-template <typename T>
-constexpr bool operator<=(nullopt_t, const optional<T>&) noexcept {
-  return true;
-}
-template <typename T>
-constexpr bool operator>(const optional<T>& x, nullopt_t) noexcept {
-  return static_cast<bool>(x);
-}
-template <typename T>
-constexpr bool operator>(nullopt_t, const optional<T>&) noexcept {
-  return false;
-}
-template <typename T>
-constexpr bool operator>=(const optional<T>&, nullopt_t) noexcept {
-  return true;
-}
-template <typename T>
-constexpr bool operator>=(nullopt_t, const optional<T>& x) noexcept {
-  return !x;
-}
-
-// Comparison with T [optional.comp_with_t]
-
-// Requires: The expression, e.g. "*x == v" shall be well-formed and its result
-// shall be convertible to bool.
-// The C++17 (N4606) "Equivalent to:" statements are used directly here.
-template <typename T, typename U>
-constexpr auto operator==(const optional<T>& x, const U& v)
-    -> decltype(optional_internal::convertible_to_bool(*x == v)) {
-  return static_cast<bool>(x) ? static_cast<bool>(*x == v) : false;
-}
-template <typename T, typename U>
-constexpr auto operator==(const U& v, const optional<T>& x)
-    -> decltype(optional_internal::convertible_to_bool(v == *x)) {
-  return static_cast<bool>(x) ? static_cast<bool>(v == *x) : false;
-}
-template <typename T, typename U>
-constexpr auto operator!=(const optional<T>& x, const U& v)
-    -> decltype(optional_internal::convertible_to_bool(*x != v)) {
-  return static_cast<bool>(x) ? static_cast<bool>(*x != v) : true;
-}
-template <typename T, typename U>
-constexpr auto operator!=(const U& v, const optional<T>& x)
-    -> decltype(optional_internal::convertible_to_bool(v != *x)) {
-  return static_cast<bool>(x) ? static_cast<bool>(v != *x) : true;
-}
-template <typename T, typename U>
-constexpr auto operator<(const optional<T>& x, const U& v)
-    -> decltype(optional_internal::convertible_to_bool(*x < v)) {
-  return static_cast<bool>(x) ? static_cast<bool>(*x < v) : true;
-}
-template <typename T, typename U>
-constexpr auto operator<(const U& v, const optional<T>& x)
-    -> decltype(optional_internal::convertible_to_bool(v < *x)) {
-  return static_cast<bool>(x) ? static_cast<bool>(v < *x) : false;
-}
-template <typename T, typename U>
-constexpr auto operator<=(const optional<T>& x, const U& v)
-    -> decltype(optional_internal::convertible_to_bool(*x <= v)) {
-  return static_cast<bool>(x) ? static_cast<bool>(*x <= v) : true;
-}
-template <typename T, typename U>
-constexpr auto operator<=(const U& v, const optional<T>& x)
-    -> decltype(optional_internal::convertible_to_bool(v <= *x)) {
-  return static_cast<bool>(x) ? static_cast<bool>(v <= *x) : false;
-}
-template <typename T, typename U>
-constexpr auto operator>(const optional<T>& x, const U& v)
-    -> decltype(optional_internal::convertible_to_bool(*x > v)) {
-  return static_cast<bool>(x) ? static_cast<bool>(*x > v) : false;
-}
-template <typename T, typename U>
-constexpr auto operator>(const U& v, const optional<T>& x)
-    -> decltype(optional_internal::convertible_to_bool(v > *x)) {
-  return static_cast<bool>(x) ? static_cast<bool>(v > *x) : true;
-}
-template <typename T, typename U>
-constexpr auto operator>=(const optional<T>& x, const U& v)
-    -> decltype(optional_internal::convertible_to_bool(*x >= v)) {
-  return static_cast<bool>(x) ? static_cast<bool>(*x >= v) : false;
-}
-template <typename T, typename U>
-constexpr auto operator>=(const U& v, const optional<T>& x)
-    -> decltype(optional_internal::convertible_to_bool(v >= *x)) {
-  return static_cast<bool>(x) ? static_cast<bool>(v >= *x) : true;
-}
-
-}  // namespace absl
-
-namespace std {
-
-// std::hash specialization for absl::optional.
-template <typename T>
-struct hash<absl::optional<T> >
-    : absl::optional_internal::optional_hash_base<T> {};
-
-}  // namespace std
-
-#undef ABSL_OPTIONAL_USE_INHERITING_CONSTRUCTORS
-#undef ABSL_MSVC_CONSTEXPR_BUG_IN_UNION_LIKE_CLASS
-
-#endif  // ABSL_HAVE_STD_OPTIONAL
-
-#endif  // ABSL_TYPES_OPTIONAL_H_
diff --git a/submodules/libtgvoip/webrtc_dsp/absl/utility/utility.h b/submodules/libtgvoip/webrtc_dsp/absl/utility/utility.h
deleted file mode 100755
index aef4baa02d..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/absl/utility/utility.h
+++ /dev/null
@@ -1,291 +0,0 @@
-// Copyright 2017 The Abseil Authors.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-// This header file contains C++11 versions of standard <utility> header
-// abstractions available within C++14 and C++17, and are designed to be drop-in
-// replacement for code compliant with C++14 and C++17.
-//
-// The following abstractions are defined:
-//
-//   * integer_sequence<T, Ints...>  == std::integer_sequence<T, Ints...>
-//   * index_sequence<Ints...>       == std::index_sequence<Ints...>
-//   * make_integer_sequence<T, N>   == std::make_integer_sequence<T, N>
-//   * make_index_sequence<N>        == std::make_index_sequence<N>
-//   * index_sequence_for<Ts...>     == std::index_sequence_for<Ts...>
-//   * apply<Functor, Tuple>         == std::apply<Functor, Tuple>
-//   * exchange<T>                   == std::exchange<T>
-//
-// This header file also provides the tag types `in_place_t`, `in_place_type_t`,
-// and `in_place_index_t`, as well as the constant `in_place`, and
-// `constexpr` `std::move()` and `std::forward()` implementations in C++11.
-//
-// References:
-//
-//  http://en.cppreference.com/w/cpp/utility/integer_sequence
-//  http://en.cppreference.com/w/cpp/utility/apply
-//  http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2013/n3658.html
-//
-
-#ifndef ABSL_UTILITY_UTILITY_H_
-#define ABSL_UTILITY_UTILITY_H_
-
-#include <cstddef>
-#include <cstdlib>
-#include <tuple>
-#include <utility>
-
-#include "absl/base/config.h"
-#include "absl/base/internal/inline_variable.h"
-#include "absl/base/internal/invoke.h"
-#include "absl/meta/type_traits.h"
-
-namespace absl {
-
-// integer_sequence
-//
-// Class template representing a compile-time integer sequence. An instantiation
-// of `integer_sequence<T, Ints...>` has a sequence of integers encoded in its
-// type through its template arguments (which is a common need when
-// working with C++11 variadic templates). `absl::integer_sequence` is designed
-// to be a drop-in replacement for C++14's `std::integer_sequence`.
-//
-// Example:
-//
-//   template< class T, T... Ints >
-//   void user_function(integer_sequence<T, Ints...>);
-//
-//   int main()
-//   {
-//     // user_function's `T` will be deduced to `int` and `Ints...`
-//     // will be deduced to `0, 1, 2, 3, 4`.
-//     user_function(make_integer_sequence<int, 5>());
-//   }
-template <typename T, T... Ints>
-struct integer_sequence {
-  using value_type = T;
-  static constexpr size_t size() noexcept { return sizeof...(Ints); }
-};
-
-// index_sequence
-//
-// A helper template for an `integer_sequence` of `size_t`,
-// `absl::index_sequence` is designed to be a drop-in replacement for C++14's
-// `std::index_sequence`.
-template <size_t... Ints>
-using index_sequence = integer_sequence<size_t, Ints...>;
-
-namespace utility_internal {
-
-template <typename Seq, size_t SeqSize, size_t Rem>
-struct Extend;
-
-// Note that SeqSize == sizeof...(Ints). It's passed explicitly for efficiency.
-template <typename T, T... Ints, size_t SeqSize>
-struct Extend<integer_sequence<T, Ints...>, SeqSize, 0> {
-  using type = integer_sequence<T, Ints..., (Ints + SeqSize)...>;
-};
-
-template <typename T, T... Ints, size_t SeqSize>
-struct Extend<integer_sequence<T, Ints...>, SeqSize, 1> {
-  using type = integer_sequence<T, Ints..., (Ints + SeqSize)..., 2 * SeqSize>;
-};
-
-// Recursion helper for 'make_integer_sequence<T, N>'.
-// 'Gen<T, N>::type' is an alias for 'integer_sequence<T, 0, 1, ... N-1>'.
-template <typename T, size_t N>
-struct Gen {
-  using type =
-      typename Extend<typename Gen<T, N / 2>::type, N / 2, N % 2>::type;
-};
-
-template <typename T>
-struct Gen<T, 0> {
-  using type = integer_sequence<T>;
-};
-
-}  // namespace utility_internal
-
-// Compile-time sequences of integers
-
-// make_integer_sequence
-//
-// This template alias is equivalent to
-// `integer_sequence<int, 0, 1, ..., N-1>`, and is designed to be a drop-in
-// replacement for C++14's `std::make_integer_sequence`.
-template <typename T, T N>
-using make_integer_sequence = typename utility_internal::Gen<T, N>::type;
-
-// make_index_sequence
-//
-// This template alias is equivalent to `index_sequence<0, 1, ..., N-1>`,
-// and is designed to be a drop-in replacement for C++14's
-// `std::make_index_sequence`.
-template <size_t N>
-using make_index_sequence = make_integer_sequence<size_t, N>;
-
-// index_sequence_for
-//
-// Converts a typename pack into an index sequence of the same length, and
-// is designed to be a drop-in replacement for C++14's
-// `std::index_sequence_for()`
-template <typename... Ts>
-using index_sequence_for = make_index_sequence<sizeof...(Ts)>;
-
-// Tag types
-
-#ifdef ABSL_HAVE_STD_OPTIONAL
-
-using std::in_place_t;
-using std::in_place;
-
-#else  // ABSL_HAVE_STD_OPTIONAL
-
-// in_place_t
-//
-// Tag type used to specify in-place construction, such as with
-// `absl::optional`, designed to be a drop-in replacement for C++17's
-// `std::in_place_t`.
-struct in_place_t {};
-
-ABSL_INTERNAL_INLINE_CONSTEXPR(in_place_t, in_place, {});
-
-#endif  // ABSL_HAVE_STD_OPTIONAL
-
-#if defined(ABSL_HAVE_STD_ANY) || defined(ABSL_HAVE_STD_VARIANT)
-using std::in_place_type_t;
-#else
-
-// in_place_type_t
-//
-// Tag type used for in-place construction when the type to construct needs to
-// be specified, such as with `absl::any`, designed to be a drop-in replacement
-// for C++17's `std::in_place_type_t`.
-template <typename T>
-struct in_place_type_t {};
-#endif  // ABSL_HAVE_STD_ANY || ABSL_HAVE_STD_VARIANT
-
-#ifdef ABSL_HAVE_STD_VARIANT
-using std::in_place_index_t;
-#else
-
-// in_place_index_t
-//
-// Tag type used for in-place construction when the type to construct needs to
-// be specified, such as with `absl::any`, designed to be a drop-in replacement
-// for C++17's `std::in_place_index_t`.
-template <size_t I>
-struct in_place_index_t {};
-#endif  // ABSL_HAVE_STD_VARIANT
-
-// Constexpr move and forward
-
-// move()
-//
-// A constexpr version of `std::move()`, designed to be a drop-in replacement
-// for C++14's `std::move()`.
-template <typename T>
-constexpr absl::remove_reference_t<T>&& move(T&& t) noexcept {
-  return static_cast<absl::remove_reference_t<T>&&>(t);
-}
-
-// forward()
-//
-// A constexpr version of `std::forward()`, designed to be a drop-in replacement
-// for C++14's `std::forward()`.
-template <typename T>
-constexpr T&& forward(
-    absl::remove_reference_t<T>& t) noexcept {  // NOLINT(runtime/references)
-  return static_cast<T&&>(t);
-}
-
-namespace utility_internal {
-// Helper method for expanding tuple into a called method.
-template <typename Functor, typename Tuple, std::size_t... Indexes>
-auto apply_helper(Functor&& functor, Tuple&& t, index_sequence<Indexes...>)
-    -> decltype(absl::base_internal::Invoke(
-        absl::forward<Functor>(functor),
-        std::get<Indexes>(absl::forward<Tuple>(t))...)) {
-  return absl::base_internal::Invoke(
-      absl::forward<Functor>(functor),
-      std::get<Indexes>(absl::forward<Tuple>(t))...);
-}
-
-}  // namespace utility_internal
-
-// apply
-//
-// Invokes a Callable using elements of a tuple as its arguments.
-// Each element of the tuple corresponds to an argument of the call (in order).
-// Both the Callable argument and the tuple argument are perfect-forwarded.
-// For member-function Callables, the first tuple element acts as the `this`
-// pointer. `absl::apply` is designed to be a drop-in replacement for C++17's
-// `std::apply`. Unlike C++17's `std::apply`, this is not currently `constexpr`.
-//
-// Example:
-//
-//   class Foo{void Bar(int);};
-//   void user_function(int, string);
-//   void user_function(std::unique_ptr<Foo>);
-//
-//   int main()
-//   {
-//       std::tuple<int, string> tuple1(42, "bar");
-//       // Invokes the user function overload on int, string.
-//       absl::apply(&user_function, tuple1);
-//
-//       auto foo = absl::make_unique<Foo>();
-//       std::tuple<Foo*, int> tuple2(foo.get(), 42);
-//       // Invokes the method Bar on foo with one argument 42.
-//       absl::apply(&Foo::Bar, foo.get(), 42);
-//
-//       std::tuple<std::unique_ptr<Foo>> tuple3(absl::make_unique<Foo>());
-//       // Invokes the user function that takes ownership of the unique
-//       // pointer.
-//       absl::apply(&user_function, std::move(tuple));
-//   }
-template <typename Functor, typename Tuple>
-auto apply(Functor&& functor, Tuple&& t)
-    -> decltype(utility_internal::apply_helper(
-        absl::forward<Functor>(functor), absl::forward<Tuple>(t),
-        absl::make_index_sequence<std::tuple_size<
-            typename std::remove_reference<Tuple>::type>::value>{})) {
-  return utility_internal::apply_helper(
-      absl::forward<Functor>(functor), absl::forward<Tuple>(t),
-      absl::make_index_sequence<std::tuple_size<
-          typename std::remove_reference<Tuple>::type>::value>{});
-}
-
-// exchange
-//
-// Replaces the value of `obj` with `new_value` and returns the old value of
-// `obj`.  `absl::exchange` is designed to be a drop-in replacement for C++14's
-// `std::exchange`.
-//
-// Example:
-//
-//   Foo& operator=(Foo&& other) {
-//     ptr1_ = absl::exchange(other.ptr1_, nullptr);
-//     int1_ = absl::exchange(other.int1_, -1);
-//     return *this;
-//   }
-template <typename T, typename U = T>
-T exchange(T& obj, U&& new_value) {
-  T old_value = absl::move(obj);
-  obj = absl::forward<U>(new_value);
-  return old_value;
-}
-
-}  // namespace absl
-
-#endif  // ABSL_UTILITY_UTILITY_H_
diff --git a/submodules/libtgvoip/webrtc_dsp/api/array_view.h b/submodules/libtgvoip/webrtc_dsp/api/array_view.h
deleted file mode 100644
index efc642d6fc..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/api/array_view.h
+++ /dev/null
@@ -1,284 +0,0 @@
-/*
- *  Copyright 2015 The WebRTC Project Authors. All rights reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#ifndef API_ARRAY_VIEW_H_
-#define API_ARRAY_VIEW_H_
-
-#include <algorithm>
-#include <array>
-#include <type_traits>
-
-#include "rtc_base/checks.h"
-#include "rtc_base/type_traits.h"
-
-namespace rtc {
-
-// tl;dr: rtc::ArrayView is the same thing as gsl::span from the Guideline
-//        Support Library.
-//
-// Many functions read from or write to arrays. The obvious way to do this is
-// to use two arguments, a pointer to the first element and an element count:
-//
-//   bool Contains17(const int* arr, size_t size) {
-//     for (size_t i = 0; i < size; ++i) {
-//       if (arr[i] == 17)
-//         return true;
-//     }
-//     return false;
-//   }
-//
-// This is flexible, since it doesn't matter how the array is stored (C array,
-// std::vector, rtc::Buffer, ...), but it's error-prone because the caller has
-// to correctly specify the array length:
-//
-//   Contains17(arr, arraysize(arr));     // C array
-//   Contains17(arr.data(), arr.size());  // std::vector
-//   Contains17(arr, size);               // pointer + size
-//   ...
-//
-// It's also kind of messy to have two separate arguments for what is
-// conceptually a single thing.
-//
-// Enter rtc::ArrayView<T>. It contains a T pointer (to an array it doesn't
-// own) and a count, and supports the basic things you'd expect, such as
-// indexing and iteration. It allows us to write our function like this:
-//
-//   bool Contains17(rtc::ArrayView<const int> arr) {
-//     for (auto e : arr) {
-//       if (e == 17)
-//         return true;
-//     }
-//     return false;
-//   }
-//
-// And even better, because a bunch of things will implicitly convert to
-// ArrayView, we can call it like this:
-//
-//   Contains17(arr);                             // C array
-//   Contains17(arr);                             // std::vector
-//   Contains17(rtc::ArrayView<int>(arr, size));  // pointer + size
-//   Contains17(nullptr);                         // nullptr -> empty ArrayView
-//   ...
-//
-// ArrayView<T> stores both a pointer and a size, but you may also use
-// ArrayView<T, N>, which has a size that's fixed at compile time (which means
-// it only has to store the pointer).
-//
-// One important point is that ArrayView<T> and ArrayView<const T> are
-// different types, which allow and don't allow mutation of the array elements,
-// respectively. The implicit conversions work just like you'd hope, so that
-// e.g. vector<int> will convert to either ArrayView<int> or ArrayView<const
-// int>, but const vector<int> will convert only to ArrayView<const int>.
-// (ArrayView itself can be the source type in such conversions, so
-// ArrayView<int> will convert to ArrayView<const int>.)
-//
-// Note: ArrayView is tiny (just a pointer and a count if variable-sized, just
-// a pointer if fix-sized) and trivially copyable, so it's probably cheaper to
-// pass it by value than by const reference.
-
-namespace impl {
-
-// Magic constant for indicating that the size of an ArrayView is variable
-// instead of fixed.
-enum : std::ptrdiff_t { kArrayViewVarSize = -4711 };
-
-// Base class for ArrayViews of fixed nonzero size.
-template <typename T, std::ptrdiff_t Size>
-class ArrayViewBase {
-  static_assert(Size > 0, "ArrayView size must be variable or non-negative");
-
- public:
-  ArrayViewBase(T* data, size_t size) : data_(data) {}
-
-  static constexpr size_t size() { return Size; }
-  static constexpr bool empty() { return false; }
-  T* data() const { return data_; }
-
- protected:
-  static constexpr bool fixed_size() { return true; }
-
- private:
-  T* data_;
-};
-
-// Specialized base class for ArrayViews of fixed zero size.
-template <typename T>
-class ArrayViewBase<T, 0> {
- public:
-  explicit ArrayViewBase(T* data, size_t size) {}
-
-  static constexpr size_t size() { return 0; }
-  static constexpr bool empty() { return true; }
-  T* data() const { return nullptr; }
-
- protected:
-  static constexpr bool fixed_size() { return true; }
-};
-
-// Specialized base class for ArrayViews of variable size.
-template <typename T>
-class ArrayViewBase<T, impl::kArrayViewVarSize> {
- public:
-  ArrayViewBase(T* data, size_t size)
-      : data_(size == 0 ? nullptr : data), size_(size) {}
-
-  size_t size() const { return size_; }
-  bool empty() const { return size_ == 0; }
-  T* data() const { return data_; }
-
- protected:
-  static constexpr bool fixed_size() { return false; }
-
- private:
-  T* data_;
-  size_t size_;
-};
-
-}  // namespace impl
-
-template <typename T, std::ptrdiff_t Size = impl::kArrayViewVarSize>
-class ArrayView final : public impl::ArrayViewBase<T, Size> {
- public:
-  using value_type = T;
-  using const_iterator = const T*;
-
-  // Construct an ArrayView from a pointer and a length.
-  template <typename U>
-  ArrayView(U* data, size_t size)
-      : impl::ArrayViewBase<T, Size>::ArrayViewBase(data, size) {
-    RTC_DCHECK_EQ(size == 0 ? nullptr : data, this->data());
-    RTC_DCHECK_EQ(size, this->size());
-    RTC_DCHECK_EQ(!this->data(),
-                  this->size() == 0);  // data is null iff size == 0.
-  }
-
-  // Construct an empty ArrayView. Note that fixed-size ArrayViews of size > 0
-  // cannot be empty.
-  ArrayView() : ArrayView(nullptr, 0) {}
-  ArrayView(std::nullptr_t)  // NOLINT
-      : ArrayView() {}
-  ArrayView(std::nullptr_t, size_t size)
-      : ArrayView(static_cast<T*>(nullptr), size) {
-    static_assert(Size == 0 || Size == impl::kArrayViewVarSize, "");
-    RTC_DCHECK_EQ(0, size);
-  }
-
-  // Construct an ArrayView from a C-style array.
-  template <typename U, size_t N>
-  ArrayView(U (&array)[N])  // NOLINT
-      : ArrayView(array, N) {
-    static_assert(Size == N || Size == impl::kArrayViewVarSize,
-                  "Array size must match ArrayView size");
-  }
-
-  // (Only if size is fixed.) Construct a fixed size ArrayView<T, N> from a
-  // non-const std::array instance. For an ArrayView with variable size, the
-  // used ctor is ArrayView(U& u) instead.
-  template <typename U,
-            size_t N,
-            typename std::enable_if<
-                Size == static_cast<std::ptrdiff_t>(N)>::type* = nullptr>
-  ArrayView(std::array<U, N>& u)  // NOLINT
-      : ArrayView(u.data(), u.size()) {}
-
-  // (Only if size is fixed.) Construct a fixed size ArrayView<T, N> where T is
-  // const from a const(expr) std::array instance. For an ArrayView with
-  // variable size, the used ctor is ArrayView(U& u) instead.
-  template <typename U,
-            size_t N,
-            typename std::enable_if<
-                Size == static_cast<std::ptrdiff_t>(N)>::type* = nullptr>
-  ArrayView(const std::array<U, N>& u)  // NOLINT
-      : ArrayView(u.data(), u.size()) {}
-
-  // (Only if size is fixed.) Construct an ArrayView from any type U that has a
-  // static constexpr size() method whose return value is equal to Size, and a
-  // data() method whose return value converts implicitly to T*. In particular,
-  // this means we allow conversion from ArrayView<T, N> to ArrayView<const T,
-  // N>, but not the other way around. We also don't allow conversion from
-  // ArrayView<T> to ArrayView<T, N>, or from ArrayView<T, M> to ArrayView<T,
-  // N> when M != N.
-  template <
-      typename U,
-      typename std::enable_if<Size != impl::kArrayViewVarSize &&
-                              HasDataAndSize<U, T>::value>::type* = nullptr>
-  ArrayView(U& u)  // NOLINT
-      : ArrayView(u.data(), u.size()) {
-    static_assert(U::size() == Size, "Sizes must match exactly");
-  }
-
-  // (Only if size is variable.) Construct an ArrayView from any type U that
-  // has a size() method whose return value converts implicitly to size_t, and
-  // a data() method whose return value converts implicitly to T*. In
-  // particular, this means we allow conversion from ArrayView<T> to
-  // ArrayView<const T>, but not the other way around. Other allowed
-  // conversions include
-  // ArrayView<T, N> to ArrayView<T> or ArrayView<const T>,
-  // std::vector<T> to ArrayView<T> or ArrayView<const T>,
-  // const std::vector<T> to ArrayView<const T>,
-  // rtc::Buffer to ArrayView<uint8_t> or ArrayView<const uint8_t>, and
-  // const rtc::Buffer to ArrayView<const uint8_t>.
-  template <
-      typename U,
-      typename std::enable_if<Size == impl::kArrayViewVarSize &&
-                              HasDataAndSize<U, T>::value>::type* = nullptr>
-  ArrayView(U& u)  // NOLINT
-      : ArrayView(u.data(), u.size()) {}
-
-  // Indexing and iteration. These allow mutation even if the ArrayView is
-  // const, because the ArrayView doesn't own the array. (To prevent mutation,
-  // use a const element type.)
-  T& operator[](size_t idx) const {
-    RTC_DCHECK_LT(idx, this->size());
-    RTC_DCHECK(this->data());
-    return this->data()[idx];
-  }
-  T* begin() const { return this->data(); }
-  T* end() const { return this->data() + this->size(); }
-  const T* cbegin() const { return this->data(); }
-  const T* cend() const { return this->data() + this->size(); }
-
-  ArrayView<T> subview(size_t offset, size_t size) const {
-    return offset < this->size()
-               ? ArrayView<T>(this->data() + offset,
-                              std::min(size, this->size() - offset))
-               : ArrayView<T>();
-  }
-  ArrayView<T> subview(size_t offset) const {
-    return subview(offset, this->size());
-  }
-};
-
-// Comparing two ArrayViews compares their (pointer,size) pairs; it does *not*
-// dereference the pointers.
-template <typename T, std::ptrdiff_t Size1, std::ptrdiff_t Size2>
-bool operator==(const ArrayView<T, Size1>& a, const ArrayView<T, Size2>& b) {
-  return a.data() == b.data() && a.size() == b.size();
-}
-template <typename T, std::ptrdiff_t Size1, std::ptrdiff_t Size2>
-bool operator!=(const ArrayView<T, Size1>& a, const ArrayView<T, Size2>& b) {
-  return !(a == b);
-}
-
-// Variable-size ArrayViews are the size of two pointers; fixed-size ArrayViews
-// are the size of one pointer. (And as a special case, fixed-size ArrayViews
-// of size 0 require no storage.)
-static_assert(sizeof(ArrayView<int>) == 2 * sizeof(int*), "");
-static_assert(sizeof(ArrayView<int, 17>) == sizeof(int*), "");
-static_assert(std::is_empty<ArrayView<int, 0>>::value, "");
-
-template <typename T>
-inline ArrayView<T> MakeArrayView(T* data, size_t size) {
-  return ArrayView<T>(data, size);
-}
-
-}  // namespace rtc
-
-#endif  // API_ARRAY_VIEW_H_
diff --git a/submodules/libtgvoip/webrtc_dsp/api/audio/audio_frame.cc b/submodules/libtgvoip/webrtc_dsp/api/audio/audio_frame.cc
deleted file mode 100644
index 75d30b0ba2..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/api/audio/audio_frame.cc
+++ /dev/null
@@ -1,130 +0,0 @@
-/*
- *  Copyright (c) 2018 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#include "api/audio/audio_frame.h"
-
-#include <string.h>
-
-#include "rtc_base/checks.h"
-#include "rtc_base/timeutils.h"
-
-namespace webrtc {
-
-AudioFrame::AudioFrame() {
-  // Visual Studio doesn't like this in the class definition.
-  static_assert(sizeof(data_) == kMaxDataSizeBytes, "kMaxDataSizeBytes");
-}
-
-void AudioFrame::Reset() {
-  ResetWithoutMuting();
-  muted_ = true;
-}
-
-void AudioFrame::ResetWithoutMuting() {
-  // TODO(wu): Zero is a valid value for |timestamp_|. We should initialize
-  // to an invalid value, or add a new member to indicate invalidity.
-  timestamp_ = 0;
-  elapsed_time_ms_ = -1;
-  ntp_time_ms_ = -1;
-  samples_per_channel_ = 0;
-  sample_rate_hz_ = 0;
-  num_channels_ = 0;
-  speech_type_ = kUndefined;
-  vad_activity_ = kVadUnknown;
-  profile_timestamp_ms_ = 0;
-}
-
-void AudioFrame::UpdateFrame(uint32_t timestamp,
-                             const int16_t* data,
-                             size_t samples_per_channel,
-                             int sample_rate_hz,
-                             SpeechType speech_type,
-                             VADActivity vad_activity,
-                             size_t num_channels) {
-  timestamp_ = timestamp;
-  samples_per_channel_ = samples_per_channel;
-  sample_rate_hz_ = sample_rate_hz;
-  speech_type_ = speech_type;
-  vad_activity_ = vad_activity;
-  num_channels_ = num_channels;
-
-  const size_t length = samples_per_channel * num_channels;
-  RTC_CHECK_LE(length, kMaxDataSizeSamples);
-  if (data != nullptr) {
-    memcpy(data_, data, sizeof(int16_t) * length);
-    muted_ = false;
-  } else {
-    muted_ = true;
-  }
-}
-
-void AudioFrame::CopyFrom(const AudioFrame& src) {
-  if (this == &src)
-    return;
-
-  timestamp_ = src.timestamp_;
-  elapsed_time_ms_ = src.elapsed_time_ms_;
-  ntp_time_ms_ = src.ntp_time_ms_;
-  muted_ = src.muted();
-  samples_per_channel_ = src.samples_per_channel_;
-  sample_rate_hz_ = src.sample_rate_hz_;
-  speech_type_ = src.speech_type_;
-  vad_activity_ = src.vad_activity_;
-  num_channels_ = src.num_channels_;
-
-  const size_t length = samples_per_channel_ * num_channels_;
-  RTC_CHECK_LE(length, kMaxDataSizeSamples);
-  if (!src.muted()) {
-    memcpy(data_, src.data(), sizeof(int16_t) * length);
-    muted_ = false;
-  }
-}
-
-void AudioFrame::UpdateProfileTimeStamp() {
-  profile_timestamp_ms_ = rtc::TimeMillis();
-}
-
-int64_t AudioFrame::ElapsedProfileTimeMs() const {
-  if (profile_timestamp_ms_ == 0) {
-    // Profiling has not been activated.
-    return -1;
-  }
-  return rtc::TimeSince(profile_timestamp_ms_);
-}
-
-const int16_t* AudioFrame::data() const {
-  return muted_ ? empty_data() : data_;
-}
-
-// TODO(henrik.lundin) Can we skip zeroing the buffer?
-// See https://bugs.chromium.org/p/webrtc/issues/detail?id=5647.
-int16_t* AudioFrame::mutable_data() {
-  if (muted_) {
-    memset(data_, 0, kMaxDataSizeBytes);
-    muted_ = false;
-  }
-  return data_;
-}
-
-void AudioFrame::Mute() {
-  muted_ = true;
-}
-
-bool AudioFrame::muted() const {
-  return muted_;
-}
-
-// static
-const int16_t* AudioFrame::empty_data() {
-  static int16_t* null_data = new int16_t[kMaxDataSizeSamples]();
-  return &null_data[0];
-}
-
-}  // namespace webrtc
diff --git a/submodules/libtgvoip/webrtc_dsp/api/audio/audio_frame.h b/submodules/libtgvoip/webrtc_dsp/api/audio/audio_frame.h
deleted file mode 100644
index dd6ac021a7..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/api/audio/audio_frame.h
+++ /dev/null
@@ -1,132 +0,0 @@
-/*
- *  Copyright (c) 2018 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#ifndef API_AUDIO_AUDIO_FRAME_H_
-#define API_AUDIO_AUDIO_FRAME_H_
-
-#include <stddef.h>
-#include <stdint.h>
-
-#include "rtc_base/constructormagic.h"
-
-namespace webrtc {
-
-/* This class holds up to 120 ms of super-wideband (32 kHz) stereo audio. It
- * allows for adding and subtracting frames while keeping track of the resulting
- * states.
- *
- * Notes
- * - This is a de-facto api, not designed for external use. The AudioFrame class
- *   is in need of overhaul or even replacement, and anyone depending on it
- *   should be prepared for that.
- * - The total number of samples is samples_per_channel_ * num_channels_.
- * - Stereo data is interleaved starting with the left channel.
- */
-class AudioFrame {
- public:
-  // Using constexpr here causes linker errors unless the variable also has an
-  // out-of-class definition, which is impractical in this header-only class.
-  // (This makes no sense because it compiles as an enum value, which we most
-  // certainly cannot take the address of, just fine.) C++17 introduces inline
-  // variables which should allow us to switch to constexpr and keep this a
-  // header-only class.
-  enum : size_t {
-    // Stereo, 32 kHz, 120 ms (2 * 32 * 120)
-    // Stereo, 192 kHz, 20 ms (2 * 192 * 20)
-    kMaxDataSizeSamples = 7680,
-    kMaxDataSizeBytes = kMaxDataSizeSamples * sizeof(int16_t),
-  };
-
-  enum VADActivity { kVadActive = 0, kVadPassive = 1, kVadUnknown = 2 };
-  enum SpeechType {
-    kNormalSpeech = 0,
-    kPLC = 1,
-    kCNG = 2,
-    kPLCCNG = 3,
-    kUndefined = 4
-  };
-
-  AudioFrame();
-
-  // Resets all members to their default state.
-  void Reset();
-  // Same as Reset(), but leaves mute state unchanged. Muting a frame requires
-  // the buffer to be zeroed on the next call to mutable_data(). Callers
-  // intending to write to the buffer immediately after Reset() can instead use
-  // ResetWithoutMuting() to skip this wasteful zeroing.
-  void ResetWithoutMuting();
-
-  void UpdateFrame(uint32_t timestamp,
-                   const int16_t* data,
-                   size_t samples_per_channel,
-                   int sample_rate_hz,
-                   SpeechType speech_type,
-                   VADActivity vad_activity,
-                   size_t num_channels = 1);
-
-  void CopyFrom(const AudioFrame& src);
-
-  // Sets a wall-time clock timestamp in milliseconds to be used for profiling
-  // of time between two points in the audio chain.
-  // Example:
-  //   t0: UpdateProfileTimeStamp()
-  //   t1: ElapsedProfileTimeMs() => t1 - t0 [msec]
-  void UpdateProfileTimeStamp();
-  // Returns the time difference between now and when UpdateProfileTimeStamp()
-  // was last called. Returns -1 if UpdateProfileTimeStamp() has not yet been
-  // called.
-  int64_t ElapsedProfileTimeMs() const;
-
-  // data() returns a zeroed static buffer if the frame is muted.
-  // mutable_frame() always returns a non-static buffer; the first call to
-  // mutable_frame() zeros the non-static buffer and marks the frame unmuted.
-  const int16_t* data() const;
-  int16_t* mutable_data();
-
-  // Prefer to mute frames using AudioFrameOperations::Mute.
-  void Mute();
-  // Frame is muted by default.
-  bool muted() const;
-
-  // RTP timestamp of the first sample in the AudioFrame.
-  uint32_t timestamp_ = 0;
-  // Time since the first frame in milliseconds.
-  // -1 represents an uninitialized value.
-  int64_t elapsed_time_ms_ = -1;
-  // NTP time of the estimated capture time in local timebase in milliseconds.
-  // -1 represents an uninitialized value.
-  int64_t ntp_time_ms_ = -1;
-  size_t samples_per_channel_ = 0;
-  int sample_rate_hz_ = 0;
-  size_t num_channels_ = 0;
-  SpeechType speech_type_ = kUndefined;
-  VADActivity vad_activity_ = kVadUnknown;
-  // Monotonically increasing timestamp intended for profiling of audio frames.
-  // Typically used for measuring elapsed time between two different points in
-  // the audio path. No lock is used to save resources and we are thread safe
-  // by design. Also, absl::optional is not used since it will cause a "complex
-  // class/struct needs an explicit out-of-line destructor" build error.
-  int64_t profile_timestamp_ms_ = 0;
-
- private:
-  // A permamently zeroed out buffer to represent muted frames. This is a
-  // header-only class, so the only way to avoid creating a separate empty
-  // buffer per translation unit is to wrap a static in an inline function.
-  static const int16_t* empty_data();
-
-  int16_t data_[kMaxDataSizeSamples];
-  bool muted_ = true;
-
-  RTC_DISALLOW_COPY_AND_ASSIGN(AudioFrame);
-};
-
-}  // namespace webrtc
-
-#endif  // API_AUDIO_AUDIO_FRAME_H_
diff --git a/submodules/libtgvoip/webrtc_dsp/api/audio/echo_canceller3_config.cc b/submodules/libtgvoip/webrtc_dsp/api/audio/echo_canceller3_config.cc
deleted file mode 100644
index 29d0b9a01a..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/api/audio/echo_canceller3_config.cc
+++ /dev/null
@@ -1,248 +0,0 @@
-/*
- *  Copyright (c) 2018 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-#include "api/audio/echo_canceller3_config.h"
-
-#include <algorithm>
-#include <cmath>
-
-#include "rtc_base/checks.h"
-#include "rtc_base/numerics/safe_minmax.h"
-
-namespace webrtc {
-namespace {
-bool Limit(float* value, float min, float max) {
-  float clamped = rtc::SafeClamp(*value, min, max);
-  clamped = std::isfinite(clamped) ? clamped : min;
-  bool res = *value == clamped;
-  *value = clamped;
-  return res;
-}
-
-bool Limit(size_t* value, size_t min, size_t max) {
-  size_t clamped = rtc::SafeClamp(*value, min, max);
-  bool res = *value == clamped;
-  *value = clamped;
-  return res;
-}
-
-bool Limit(int* value, int min, int max) {
-  int clamped = rtc::SafeClamp(*value, min, max);
-  bool res = *value == clamped;
-  *value = clamped;
-  return res;
-}
-}  // namespace
-
-EchoCanceller3Config::EchoCanceller3Config() = default;
-EchoCanceller3Config::EchoCanceller3Config(const EchoCanceller3Config& e) =
-    default;
-EchoCanceller3Config::Delay::Delay() = default;
-EchoCanceller3Config::Delay::Delay(const EchoCanceller3Config::Delay& e) =
-    default;
-
-EchoCanceller3Config::EchoModel::EchoModel() = default;
-EchoCanceller3Config::EchoModel::EchoModel(
-    const EchoCanceller3Config::EchoModel& e) = default;
-
-EchoCanceller3Config::Suppressor::Suppressor() = default;
-EchoCanceller3Config::Suppressor::Suppressor(
-    const EchoCanceller3Config::Suppressor& e) = default;
-
-EchoCanceller3Config::Suppressor::MaskingThresholds::MaskingThresholds(
-    float enr_transparent,
-    float enr_suppress,
-    float emr_transparent)
-    : enr_transparent(enr_transparent),
-      enr_suppress(enr_suppress),
-      emr_transparent(emr_transparent) {}
-EchoCanceller3Config::Suppressor::Suppressor::MaskingThresholds::
-    MaskingThresholds(
-        const EchoCanceller3Config::Suppressor::MaskingThresholds& e) = default;
-
-EchoCanceller3Config::Suppressor::Tuning::Tuning(MaskingThresholds mask_lf,
-                                                 MaskingThresholds mask_hf,
-                                                 float max_inc_factor,
-                                                 float max_dec_factor_lf)
-    : mask_lf(mask_lf),
-      mask_hf(mask_hf),
-      max_inc_factor(max_inc_factor),
-      max_dec_factor_lf(max_dec_factor_lf) {}
-EchoCanceller3Config::Suppressor::Tuning::Tuning(
-    const EchoCanceller3Config::Suppressor::Tuning& e) = default;
-
-bool EchoCanceller3Config::Validate(EchoCanceller3Config* config) {
-  RTC_DCHECK(config);
-  EchoCanceller3Config* c = config;
-  bool res = true;
-
-  if (c->delay.down_sampling_factor != 4 &&
-      c->delay.down_sampling_factor != 8) {
-    c->delay.down_sampling_factor = 4;
-    res = false;
-  }
-  if (c->delay.delay_headroom_blocks <= 1 &&
-      c->delay.hysteresis_limit_1_blocks == 1) {
-    c->delay.hysteresis_limit_1_blocks = 0;
-    res = false;
-  }
-  res = res & Limit(&c->delay.default_delay, 0, 5000);
-  res = res & Limit(&c->delay.num_filters, 0, 5000);
-  res = res & Limit(&c->delay.api_call_jitter_blocks, 1, 5000);
-  res = res & Limit(&c->delay.min_echo_path_delay_blocks, 0, 5000);
-  res = res & Limit(&c->delay.delay_headroom_blocks, 0, 5000);
-  res = res & Limit(&c->delay.hysteresis_limit_1_blocks, 0, 5000);
-  res = res & Limit(&c->delay.hysteresis_limit_2_blocks, 0, 5000);
-  res = res & Limit(&c->delay.skew_hysteresis_blocks, 0, 5000);
-  res = res & Limit(&c->delay.fixed_capture_delay_samples, 0, 5000);
-  res = res & Limit(&c->delay.delay_estimate_smoothing, 0.f, 1.f);
-  res = res & Limit(&c->delay.delay_candidate_detection_threshold, 0.f, 1.f);
-  res = res & Limit(&c->delay.delay_selection_thresholds.initial, 1, 250);
-  res = res & Limit(&c->delay.delay_selection_thresholds.converged, 1, 250);
-
-  res = res & Limit(&c->filter.main.length_blocks, 1, 50);
-  res = res & Limit(&c->filter.main.leakage_converged, 0.f, 1000.f);
-  res = res & Limit(&c->filter.main.leakage_diverged, 0.f, 1000.f);
-  res = res & Limit(&c->filter.main.error_floor, 0.f, 1000.f);
-  res = res & Limit(&c->filter.main.error_ceil, 0.f, 100000000.f);
-  res = res & Limit(&c->filter.main.noise_gate, 0.f, 100000000.f);
-
-  res = res & Limit(&c->filter.main_initial.length_blocks, 1, 50);
-  res = res & Limit(&c->filter.main_initial.leakage_converged, 0.f, 1000.f);
-  res = res & Limit(&c->filter.main_initial.leakage_diverged, 0.f, 1000.f);
-  res = res & Limit(&c->filter.main_initial.error_floor, 0.f, 1000.f);
-  res = res & Limit(&c->filter.main_initial.error_ceil, 0.f, 100000000.f);
-  res = res & Limit(&c->filter.main_initial.noise_gate, 0.f, 100000000.f);
-
-  if (c->filter.main.length_blocks < c->filter.main_initial.length_blocks) {
-    c->filter.main_initial.length_blocks = c->filter.main.length_blocks;
-    res = false;
-  }
-
-  res = res & Limit(&c->filter.shadow.length_blocks, 1, 50);
-  res = res & Limit(&c->filter.shadow.rate, 0.f, 1.f);
-  res = res & Limit(&c->filter.shadow.noise_gate, 0.f, 100000000.f);
-
-  res = res & Limit(&c->filter.shadow_initial.length_blocks, 1, 50);
-  res = res & Limit(&c->filter.shadow_initial.rate, 0.f, 1.f);
-  res = res & Limit(&c->filter.shadow_initial.noise_gate, 0.f, 100000000.f);
-
-  if (c->filter.shadow.length_blocks < c->filter.shadow_initial.length_blocks) {
-    c->filter.shadow_initial.length_blocks = c->filter.shadow.length_blocks;
-    res = false;
-  }
-
-  res = res & Limit(&c->filter.config_change_duration_blocks, 0, 100000);
-  res = res & Limit(&c->filter.initial_state_seconds, 0.f, 100.f);
-
-  res = res & Limit(&c->erle.min, 1.f, 100000.f);
-  res = res & Limit(&c->erle.max_l, 1.f, 100000.f);
-  res = res & Limit(&c->erle.max_h, 1.f, 100000.f);
-  if (c->erle.min > c->erle.max_l || c->erle.min > c->erle.max_h) {
-    c->erle.min = std::min(c->erle.max_l, c->erle.max_h);
-    res = false;
-  }
-
-  res = res & Limit(&c->ep_strength.lf, 0.f, 1000000.f);
-  res = res & Limit(&c->ep_strength.mf, 0.f, 1000000.f);
-  res = res & Limit(&c->ep_strength.hf, 0.f, 1000000.f);
-  res = res & Limit(&c->ep_strength.default_len, 0.f, 1.f);
-
-  res =
-      res & Limit(&c->echo_audibility.low_render_limit, 0.f, 32768.f * 32768.f);
-  res = res &
-        Limit(&c->echo_audibility.normal_render_limit, 0.f, 32768.f * 32768.f);
-  res = res & Limit(&c->echo_audibility.floor_power, 0.f, 32768.f * 32768.f);
-  res = res & Limit(&c->echo_audibility.audibility_threshold_lf, 0.f,
-                    32768.f * 32768.f);
-  res = res & Limit(&c->echo_audibility.audibility_threshold_mf, 0.f,
-                    32768.f * 32768.f);
-  res = res & Limit(&c->echo_audibility.audibility_threshold_hf, 0.f,
-                    32768.f * 32768.f);
-
-  res = res &
-        Limit(&c->render_levels.active_render_limit, 0.f, 32768.f * 32768.f);
-  res = res & Limit(&c->render_levels.poor_excitation_render_limit, 0.f,
-                    32768.f * 32768.f);
-  res = res & Limit(&c->render_levels.poor_excitation_render_limit_ds8, 0.f,
-                    32768.f * 32768.f);
-
-  res =
-      res & Limit(&c->echo_removal_control.gain_rampup.initial_gain, 0.f, 1.f);
-  res = res & Limit(&c->echo_removal_control.gain_rampup.first_non_zero_gain,
-                    0.f, 1.f);
-  res = res & Limit(&c->echo_removal_control.gain_rampup.non_zero_gain_blocks,
-                    0, 100000);
-  res = res &
-        Limit(&c->echo_removal_control.gain_rampup.full_gain_blocks, 0, 100000);
-
-  res = res & Limit(&c->echo_model.noise_floor_hold, 0, 1000);
-  res = res & Limit(&c->echo_model.min_noise_floor_power, 0, 2000000.f);
-  res = res & Limit(&c->echo_model.stationary_gate_slope, 0, 1000000.f);
-  res = res & Limit(&c->echo_model.noise_gate_power, 0, 1000000.f);
-  res = res & Limit(&c->echo_model.noise_gate_slope, 0, 1000000.f);
-  res = res & Limit(&c->echo_model.render_pre_window_size, 0, 100);
-  res = res & Limit(&c->echo_model.render_post_window_size, 0, 100);
-  res = res & Limit(&c->echo_model.render_pre_window_size_init, 0, 100);
-  res = res & Limit(&c->echo_model.render_post_window_size_init, 0, 100);
-  res = res & Limit(&c->echo_model.nonlinear_hold, 0, 100);
-  res = res & Limit(&c->echo_model.nonlinear_release, 0, 1.f);
-
-  res = res & Limit(&c->suppressor.nearend_average_blocks, 1, 5000);
-
-  res = res &
-        Limit(&c->suppressor.normal_tuning.mask_lf.enr_transparent, 0.f, 100.f);
-  res = res &
-        Limit(&c->suppressor.normal_tuning.mask_lf.enr_suppress, 0.f, 100.f);
-  res = res &
-        Limit(&c->suppressor.normal_tuning.mask_lf.emr_transparent, 0.f, 100.f);
-  res = res &
-        Limit(&c->suppressor.normal_tuning.mask_hf.enr_transparent, 0.f, 100.f);
-  res = res &
-        Limit(&c->suppressor.normal_tuning.mask_hf.enr_suppress, 0.f, 100.f);
-  res = res &
-        Limit(&c->suppressor.normal_tuning.mask_hf.emr_transparent, 0.f, 100.f);
-  res = res & Limit(&c->suppressor.normal_tuning.max_inc_factor, 0.f, 100.f);
-  res = res & Limit(&c->suppressor.normal_tuning.max_dec_factor_lf, 0.f, 100.f);
-
-  res = res & Limit(&c->suppressor.nearend_tuning.mask_lf.enr_transparent, 0.f,
-                    100.f);
-  res = res &
-        Limit(&c->suppressor.nearend_tuning.mask_lf.enr_suppress, 0.f, 100.f);
-  res = res & Limit(&c->suppressor.nearend_tuning.mask_lf.emr_transparent, 0.f,
-                    100.f);
-  res = res & Limit(&c->suppressor.nearend_tuning.mask_hf.enr_transparent, 0.f,
-                    100.f);
-  res = res &
-        Limit(&c->suppressor.nearend_tuning.mask_hf.enr_suppress, 0.f, 100.f);
-  res = res & Limit(&c->suppressor.nearend_tuning.mask_hf.emr_transparent, 0.f,
-                    100.f);
-  res = res & Limit(&c->suppressor.nearend_tuning.max_inc_factor, 0.f, 100.f);
-  res =
-      res & Limit(&c->suppressor.nearend_tuning.max_dec_factor_lf, 0.f, 100.f);
-
-  res = res & Limit(&c->suppressor.dominant_nearend_detection.enr_threshold,
-                    0.f, 1000000.f);
-  res = res & Limit(&c->suppressor.dominant_nearend_detection.snr_threshold,
-                    0.f, 1000000.f);
-  res = res & Limit(&c->suppressor.dominant_nearend_detection.hold_duration, 0,
-                    10000);
-  res = res & Limit(&c->suppressor.dominant_nearend_detection.trigger_threshold,
-                    0, 10000);
-
-  res = res & Limit(&c->suppressor.high_bands_suppression.enr_threshold, 0.f,
-                    1000000.f);
-  res = res & Limit(&c->suppressor.high_bands_suppression.max_gain_during_echo,
-                    0.f, 1.f);
-
-  res = res & Limit(&c->suppressor.floor_first_increase, 0.f, 1000000.f);
-
-  return res;
-}
-}  // namespace webrtc
diff --git a/submodules/libtgvoip/webrtc_dsp/api/audio/echo_canceller3_config.h b/submodules/libtgvoip/webrtc_dsp/api/audio/echo_canceller3_config.h
deleted file mode 100644
index 9939e6e4ff..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/api/audio/echo_canceller3_config.h
+++ /dev/null
@@ -1,204 +0,0 @@
-/*
- *  Copyright (c) 2018 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#ifndef API_AUDIO_ECHO_CANCELLER3_CONFIG_H_
-#define API_AUDIO_ECHO_CANCELLER3_CONFIG_H_
-
-#include <stddef.h>  // size_t
-
-#include "rtc_base/system/rtc_export.h"
-
-namespace webrtc {
-
-// Configuration struct for EchoCanceller3
-struct RTC_EXPORT EchoCanceller3Config {
-  // Checks and updates the config parameters to lie within (mostly) reasonable
-  // ranges. Returns true if and only of the config did not need to be changed.
-  static bool Validate(EchoCanceller3Config* config);
-
-  EchoCanceller3Config();
-  EchoCanceller3Config(const EchoCanceller3Config& e);
-
-  struct Buffering {
-    bool use_new_render_buffering = true;
-    size_t excess_render_detection_interval_blocks = 250;
-    size_t max_allowed_excess_render_blocks = 8;
-  } buffering;
-
-  struct Delay {
-    Delay();
-    Delay(const Delay& e);
-    size_t default_delay = 5;
-    size_t down_sampling_factor = 4;
-    size_t num_filters = 5;
-    size_t api_call_jitter_blocks = 26;
-    size_t min_echo_path_delay_blocks = 0;
-    size_t delay_headroom_blocks = 2;
-    size_t hysteresis_limit_1_blocks = 1;
-    size_t hysteresis_limit_2_blocks = 1;
-    size_t skew_hysteresis_blocks = 3;
-    size_t fixed_capture_delay_samples = 0;
-    float delay_estimate_smoothing = 0.7f;
-    float delay_candidate_detection_threshold = 0.2f;
-    struct DelaySelectionThresholds {
-      int initial;
-      int converged;
-    } delay_selection_thresholds = {5, 20};
-  } delay;
-
-  struct Filter {
-    struct MainConfiguration {
-      size_t length_blocks;
-      float leakage_converged;
-      float leakage_diverged;
-      float error_floor;
-      float error_ceil;
-      float noise_gate;
-    };
-
-    struct ShadowConfiguration {
-      size_t length_blocks;
-      float rate;
-      float noise_gate;
-    };
-
-    MainConfiguration main = {13, 0.00005f, 0.05f, 0.001f, 2.f, 20075344.f};
-    ShadowConfiguration shadow = {13, 0.7f, 20075344.f};
-
-    MainConfiguration main_initial = {12,     0.005f, 0.5f,
-                                      0.001f, 2.f,    20075344.f};
-    ShadowConfiguration shadow_initial = {12, 0.9f, 20075344.f};
-
-    size_t config_change_duration_blocks = 250;
-    float initial_state_seconds = 2.5f;
-    bool conservative_initial_phase = false;
-    bool enable_shadow_filter_output_usage = true;
-  } filter;
-
-  struct Erle {
-    float min = 1.f;
-    float max_l = 4.f;
-    float max_h = 1.5f;
-    bool onset_detection = true;
-  } erle;
-
-  struct EpStrength {
-    float lf = 1.f;
-    float mf = 1.f;
-    float hf = 1.f;
-    float default_len = 0.83f;
-    bool reverb_based_on_render = true;
-    bool echo_can_saturate = true;
-    bool bounded_erl = false;
-  } ep_strength;
-
-  struct EchoAudibility {
-    float low_render_limit = 4 * 64.f;
-    float normal_render_limit = 64.f;
-    float floor_power = 2 * 64.f;
-    float audibility_threshold_lf = 10;
-    float audibility_threshold_mf = 10;
-    float audibility_threshold_hf = 10;
-    bool use_stationary_properties = false;
-    bool use_stationarity_properties_at_init = false;
-  } echo_audibility;
-
-  struct RenderLevels {
-    float active_render_limit = 100.f;
-    float poor_excitation_render_limit = 150.f;
-    float poor_excitation_render_limit_ds8 = 20.f;
-  } render_levels;
-
-  struct EchoRemovalControl {
-    struct GainRampup {
-      float initial_gain = 0.0f;
-      float first_non_zero_gain = 0.001f;
-      int non_zero_gain_blocks = 187;
-      int full_gain_blocks = 312;
-    } gain_rampup;
-    bool has_clock_drift = false;
-    bool linear_and_stable_echo_path = false;
-  } echo_removal_control;
-
-  struct EchoModel {
-    EchoModel();
-    EchoModel(const EchoModel& e);
-    size_t noise_floor_hold = 50;
-    float min_noise_floor_power = 1638400.f;
-    float stationary_gate_slope = 10.f;
-    float noise_gate_power = 27509.42f;
-    float noise_gate_slope = 0.3f;
-    size_t render_pre_window_size = 1;
-    size_t render_post_window_size = 1;
-    size_t render_pre_window_size_init = 10;
-    size_t render_post_window_size_init = 10;
-    float nonlinear_hold = 1;
-    float nonlinear_release = 0.001f;
-  } echo_model;
-
-  struct Suppressor {
-    Suppressor();
-    Suppressor(const Suppressor& e);
-
-    size_t nearend_average_blocks = 4;
-
-    struct MaskingThresholds {
-      MaskingThresholds(float enr_transparent,
-                        float enr_suppress,
-                        float emr_transparent);
-      MaskingThresholds(const MaskingThresholds& e);
-      float enr_transparent;
-      float enr_suppress;
-      float emr_transparent;
-    };
-
-    struct Tuning {
-      Tuning(MaskingThresholds mask_lf,
-             MaskingThresholds mask_hf,
-             float max_inc_factor,
-             float max_dec_factor_lf);
-      Tuning(const Tuning& e);
-      MaskingThresholds mask_lf;
-      MaskingThresholds mask_hf;
-      float max_inc_factor;
-      float max_dec_factor_lf;
-    };
-
-    Tuning normal_tuning = Tuning(MaskingThresholds(.3f, .4f, .3f),
-                                  MaskingThresholds(.07f, .1f, .3f),
-                                  2.0f,
-                                  0.25f);
-    Tuning nearend_tuning = Tuning(MaskingThresholds(1.09f, 1.1f, .3f),
-                                   MaskingThresholds(.1f, .3f, .3f),
-                                   2.0f,
-                                   0.25f);
-
-    struct DominantNearendDetection {
-      float enr_threshold = 4.f;
-      float enr_exit_threshold = .1f;
-      float snr_threshold = 30.f;
-      int hold_duration = 50;
-      int trigger_threshold = 12;
-      bool use_during_initial_phase = true;
-    } dominant_nearend_detection;
-
-    struct HighBandsSuppression {
-      float enr_threshold = 1.f;
-      float max_gain_during_echo = 1.f;
-    } high_bands_suppression;
-
-    float floor_first_increase = 0.00001f;
-    bool enforce_transparent = false;
-    bool enforce_empty_higher_bands = false;
-  } suppressor;
-};
-}  // namespace webrtc
-
-#endif  // API_AUDIO_ECHO_CANCELLER3_CONFIG_H_
diff --git a/submodules/libtgvoip/webrtc_dsp/api/audio/echo_canceller3_factory.cc b/submodules/libtgvoip/webrtc_dsp/api/audio/echo_canceller3_factory.cc
deleted file mode 100644
index 07f295f2ea..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/api/audio/echo_canceller3_factory.cc
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- *  Copyright (c) 2018 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-#include "api/audio/echo_canceller3_factory.h"
-
-#include <memory>
-
-#include "absl/memory/memory.h"
-#include "modules/audio_processing/aec3/echo_canceller3.h"
-
-namespace webrtc {
-
-EchoCanceller3Factory::EchoCanceller3Factory() {}
-
-EchoCanceller3Factory::EchoCanceller3Factory(const EchoCanceller3Config& config)
-    : config_(config) {}
-
-std::unique_ptr<EchoControl> EchoCanceller3Factory::Create(int sample_rate_hz) {
-  return absl::make_unique<EchoCanceller3>(config_, sample_rate_hz, true);
-}
-}  // namespace webrtc
diff --git a/submodules/libtgvoip/webrtc_dsp/api/audio/echo_canceller3_factory.h b/submodules/libtgvoip/webrtc_dsp/api/audio/echo_canceller3_factory.h
deleted file mode 100644
index 9052d99bb1..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/api/audio/echo_canceller3_factory.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- *  Copyright (c) 2018 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#ifndef API_AUDIO_ECHO_CANCELLER3_FACTORY_H_
-#define API_AUDIO_ECHO_CANCELLER3_FACTORY_H_
-
-#include <memory>
-
-#include "api/audio/echo_canceller3_config.h"
-#include "api/audio/echo_control.h"
-#include "rtc_base/system/rtc_export.h"
-
-namespace webrtc {
-
-class RTC_EXPORT EchoCanceller3Factory : public EchoControlFactory {
- public:
-  // Factory producing EchoCanceller3 instances with the default configuration.
-  EchoCanceller3Factory();
-
-  // Factory producing EchoCanceller3 instances with the specified
-  // configuration.
-  explicit EchoCanceller3Factory(const EchoCanceller3Config& config);
-
-  // Creates an EchoCanceller3 running at the specified sampling rate.
-  std::unique_ptr<EchoControl> Create(int sample_rate_hz) override;
-
- private:
-  const EchoCanceller3Config config_;
-};
-}  // namespace webrtc
-
-#endif  // API_AUDIO_ECHO_CANCELLER3_FACTORY_H_
diff --git a/submodules/libtgvoip/webrtc_dsp/api/audio/echo_control.h b/submodules/libtgvoip/webrtc_dsp/api/audio/echo_control.h
deleted file mode 100644
index f549f40fbb..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/api/audio/echo_control.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- *  Copyright (c) 2018 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#ifndef API_AUDIO_ECHO_CONTROL_H_
-#define API_AUDIO_ECHO_CONTROL_H_
-
-#include <memory>
-
-namespace webrtc {
-
-class AudioBuffer;
-
-// Interface for an acoustic echo cancellation (AEC) submodule.
-class EchoControl {
- public:
-  // Analysis (not changing) of the render signal.
-  virtual void AnalyzeRender(AudioBuffer* render) = 0;
-
-  // Analysis (not changing) of the capture signal.
-  virtual void AnalyzeCapture(AudioBuffer* capture) = 0;
-
-  // Processes the capture signal in order to remove the echo.
-  virtual void ProcessCapture(AudioBuffer* capture, bool echo_path_change) = 0;
-
-  struct Metrics {
-    double echo_return_loss;
-    double echo_return_loss_enhancement;
-    int delay_ms;
-  };
-
-  // Collect current metrics from the echo controller.
-  virtual Metrics GetMetrics() const = 0;
-
-  // Provides an optional external estimate of the audio buffer delay.
-  virtual void SetAudioBufferDelay(size_t delay_ms) = 0;
-
-  virtual ~EchoControl() {}
-};
-
-// Interface for a factory that creates EchoControllers.
-class EchoControlFactory {
- public:
-  virtual std::unique_ptr<EchoControl> Create(int sample_rate_hz) = 0;
-  virtual ~EchoControlFactory() = default;
-};
-}  // namespace webrtc
-
-#endif  // API_AUDIO_ECHO_CONTROL_H_
diff --git a/submodules/libtgvoip/webrtc_dsp/common_audio/audio_converter.cc b/submodules/libtgvoip/webrtc_dsp/common_audio/audio_converter.cc
deleted file mode 100644
index 0f97abb86a..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/common_audio/audio_converter.cc
+++ /dev/null
@@ -1,221 +0,0 @@
-/*
- *  Copyright (c) 2014 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#include "common_audio/audio_converter.h"
-
-#include <cstring>
-#include <memory>
-#include <utility>
-#include <vector>
-
-#include "common_audio/channel_buffer.h"
-#include "common_audio/resampler/push_sinc_resampler.h"
-#include "rtc_base/checks.h"
-#include "rtc_base/numerics/safe_conversions.h"
-
-using rtc::checked_cast;
-
-namespace webrtc {
-
-class CopyConverter : public AudioConverter {
- public:
-  CopyConverter(size_t src_channels,
-                size_t src_frames,
-                size_t dst_channels,
-                size_t dst_frames)
-      : AudioConverter(src_channels, src_frames, dst_channels, dst_frames) {}
-  ~CopyConverter() override{};
-
-  void Convert(const float* const* src,
-               size_t src_size,
-               float* const* dst,
-               size_t dst_capacity) override {
-    CheckSizes(src_size, dst_capacity);
-    if (src != dst) {
-      for (size_t i = 0; i < src_channels(); ++i)
-        std::memcpy(dst[i], src[i], dst_frames() * sizeof(*dst[i]));
-    }
-  }
-};
-
-class UpmixConverter : public AudioConverter {
- public:
-  UpmixConverter(size_t src_channels,
-                 size_t src_frames,
-                 size_t dst_channels,
-                 size_t dst_frames)
-      : AudioConverter(src_channels, src_frames, dst_channels, dst_frames) {}
-  ~UpmixConverter() override{};
-
-  void Convert(const float* const* src,
-               size_t src_size,
-               float* const* dst,
-               size_t dst_capacity) override {
-    CheckSizes(src_size, dst_capacity);
-    for (size_t i = 0; i < dst_frames(); ++i) {
-      const float value = src[0][i];
-      for (size_t j = 0; j < dst_channels(); ++j)
-        dst[j][i] = value;
-    }
-  }
-};
-
-class DownmixConverter : public AudioConverter {
- public:
-  DownmixConverter(size_t src_channels,
-                   size_t src_frames,
-                   size_t dst_channels,
-                   size_t dst_frames)
-      : AudioConverter(src_channels, src_frames, dst_channels, dst_frames) {}
-  ~DownmixConverter() override{};
-
-  void Convert(const float* const* src,
-               size_t src_size,
-               float* const* dst,
-               size_t dst_capacity) override {
-    CheckSizes(src_size, dst_capacity);
-    float* dst_mono = dst[0];
-    for (size_t i = 0; i < src_frames(); ++i) {
-      float sum = 0;
-      for (size_t j = 0; j < src_channels(); ++j)
-        sum += src[j][i];
-      dst_mono[i] = sum / src_channels();
-    }
-  }
-};
-
-class ResampleConverter : public AudioConverter {
- public:
-  ResampleConverter(size_t src_channels,
-                    size_t src_frames,
-                    size_t dst_channels,
-                    size_t dst_frames)
-      : AudioConverter(src_channels, src_frames, dst_channels, dst_frames) {
-    resamplers_.reserve(src_channels);
-    for (size_t i = 0; i < src_channels; ++i)
-      resamplers_.push_back(std::unique_ptr<PushSincResampler>(
-          new PushSincResampler(src_frames, dst_frames)));
-  }
-  ~ResampleConverter() override{};
-
-  void Convert(const float* const* src,
-               size_t src_size,
-               float* const* dst,
-               size_t dst_capacity) override {
-    CheckSizes(src_size, dst_capacity);
-    for (size_t i = 0; i < resamplers_.size(); ++i)
-      resamplers_[i]->Resample(src[i], src_frames(), dst[i], dst_frames());
-  }
-
- private:
-  std::vector<std::unique_ptr<PushSincResampler>> resamplers_;
-};
-
-// Apply a vector of converters in serial, in the order given. At least two
-// converters must be provided.
-class CompositionConverter : public AudioConverter {
- public:
-  explicit CompositionConverter(
-      std::vector<std::unique_ptr<AudioConverter>> converters)
-      : converters_(std::move(converters)) {
-    RTC_CHECK_GE(converters_.size(), 2);
-    // We need an intermediate buffer after every converter.
-    for (auto it = converters_.begin(); it != converters_.end() - 1; ++it)
-      buffers_.push_back(
-          std::unique_ptr<ChannelBuffer<float>>(new ChannelBuffer<float>(
-              (*it)->dst_frames(), (*it)->dst_channels())));
-  }
-  ~CompositionConverter() override{};
-
-  void Convert(const float* const* src,
-               size_t src_size,
-               float* const* dst,
-               size_t dst_capacity) override {
-    converters_.front()->Convert(src, src_size, buffers_.front()->channels(),
-                                 buffers_.front()->size());
-    for (size_t i = 2; i < converters_.size(); ++i) {
-      auto& src_buffer = buffers_[i - 2];
-      auto& dst_buffer = buffers_[i - 1];
-      converters_[i]->Convert(src_buffer->channels(), src_buffer->size(),
-                              dst_buffer->channels(), dst_buffer->size());
-    }
-    converters_.back()->Convert(buffers_.back()->channels(),
-                                buffers_.back()->size(), dst, dst_capacity);
-  }
-
- private:
-  std::vector<std::unique_ptr<AudioConverter>> converters_;
-  std::vector<std::unique_ptr<ChannelBuffer<float>>> buffers_;
-};
-
-std::unique_ptr<AudioConverter> AudioConverter::Create(size_t src_channels,
-                                                       size_t src_frames,
-                                                       size_t dst_channels,
-                                                       size_t dst_frames) {
-  std::unique_ptr<AudioConverter> sp;
-  if (src_channels > dst_channels) {
-    if (src_frames != dst_frames) {
-      std::vector<std::unique_ptr<AudioConverter>> converters;
-      converters.push_back(std::unique_ptr<AudioConverter>(new DownmixConverter(
-          src_channels, src_frames, dst_channels, src_frames)));
-      converters.push_back(
-          std::unique_ptr<AudioConverter>(new ResampleConverter(
-              dst_channels, src_frames, dst_channels, dst_frames)));
-      sp.reset(new CompositionConverter(std::move(converters)));
-    } else {
-      sp.reset(new DownmixConverter(src_channels, src_frames, dst_channels,
-                                    dst_frames));
-    }
-  } else if (src_channels < dst_channels) {
-    if (src_frames != dst_frames) {
-      std::vector<std::unique_ptr<AudioConverter>> converters;
-      converters.push_back(
-          std::unique_ptr<AudioConverter>(new ResampleConverter(
-              src_channels, src_frames, src_channels, dst_frames)));
-      converters.push_back(std::unique_ptr<AudioConverter>(new UpmixConverter(
-          src_channels, dst_frames, dst_channels, dst_frames)));
-      sp.reset(new CompositionConverter(std::move(converters)));
-    } else {
-      sp.reset(new UpmixConverter(src_channels, src_frames, dst_channels,
-                                  dst_frames));
-    }
-  } else if (src_frames != dst_frames) {
-    sp.reset(new ResampleConverter(src_channels, src_frames, dst_channels,
-                                   dst_frames));
-  } else {
-    sp.reset(
-        new CopyConverter(src_channels, src_frames, dst_channels, dst_frames));
-  }
-
-  return sp;
-}
-
-// For CompositionConverter.
-AudioConverter::AudioConverter()
-    : src_channels_(0), src_frames_(0), dst_channels_(0), dst_frames_(0) {}
-
-AudioConverter::AudioConverter(size_t src_channels,
-                               size_t src_frames,
-                               size_t dst_channels,
-                               size_t dst_frames)
-    : src_channels_(src_channels),
-      src_frames_(src_frames),
-      dst_channels_(dst_channels),
-      dst_frames_(dst_frames) {
-  RTC_CHECK(dst_channels == src_channels || dst_channels == 1 ||
-            src_channels == 1);
-}
-
-void AudioConverter::CheckSizes(size_t src_size, size_t dst_capacity) const {
-  RTC_CHECK_EQ(src_size, src_channels() * src_frames());
-  RTC_CHECK_GE(dst_capacity, dst_channels() * dst_frames());
-}
-
-}  // namespace webrtc
diff --git a/submodules/libtgvoip/webrtc_dsp/common_audio/audio_converter.h b/submodules/libtgvoip/webrtc_dsp/common_audio/audio_converter.h
deleted file mode 100644
index 24a5e72cee..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/common_audio/audio_converter.h
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- *  Copyright (c) 2014 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#ifndef COMMON_AUDIO_AUDIO_CONVERTER_H_
-#define COMMON_AUDIO_AUDIO_CONVERTER_H_
-
-#include <stddef.h>
-#include <memory>
-
-#include "rtc_base/constructormagic.h"
-
-namespace webrtc {
-
-// Format conversion (remixing and resampling) for audio. Only simple remixing
-// conversions are supported: downmix to mono (i.e. |dst_channels| == 1) or
-// upmix from mono (i.e. |src_channels == 1|).
-//
-// The source and destination chunks have the same duration in time; specifying
-// the number of frames is equivalent to specifying the sample rates.
-class AudioConverter {
- public:
-  // Returns a new AudioConverter, which will use the supplied format for its
-  // lifetime. Caller is responsible for the memory.
-  static std::unique_ptr<AudioConverter> Create(size_t src_channels,
-                                                size_t src_frames,
-                                                size_t dst_channels,
-                                                size_t dst_frames);
-  virtual ~AudioConverter() {}
-
-  // Convert |src|, containing |src_size| samples, to |dst|, having a sample
-  // capacity of |dst_capacity|. Both point to a series of buffers containing
-  // the samples for each channel. The sizes must correspond to the format
-  // passed to Create().
-  virtual void Convert(const float* const* src,
-                       size_t src_size,
-                       float* const* dst,
-                       size_t dst_capacity) = 0;
-
-  size_t src_channels() const { return src_channels_; }
-  size_t src_frames() const { return src_frames_; }
-  size_t dst_channels() const { return dst_channels_; }
-  size_t dst_frames() const { return dst_frames_; }
-
- protected:
-  AudioConverter();
-  AudioConverter(size_t src_channels,
-                 size_t src_frames,
-                 size_t dst_channels,
-                 size_t dst_frames);
-
-  // Helper to RTC_CHECK that inputs are correctly sized.
-  void CheckSizes(size_t src_size, size_t dst_capacity) const;
-
- private:
-  const size_t src_channels_;
-  const size_t src_frames_;
-  const size_t dst_channels_;
-  const size_t dst_frames_;
-
-  RTC_DISALLOW_COPY_AND_ASSIGN(AudioConverter);
-};
-
-}  // namespace webrtc
-
-#endif  // COMMON_AUDIO_AUDIO_CONVERTER_H_
diff --git a/submodules/libtgvoip/webrtc_dsp/common_audio/audio_util.cc b/submodules/libtgvoip/webrtc_dsp/common_audio/audio_util.cc
deleted file mode 100644
index 735ba5f188..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/common_audio/audio_util.cc
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- *  Copyright (c) 2013 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#include "common_audio/include/audio_util.h"
-
-namespace webrtc {
-
-void FloatToS16(const float* src, size_t size, int16_t* dest) {
-  for (size_t i = 0; i < size; ++i)
-    dest[i] = FloatToS16(src[i]);
-}
-
-void S16ToFloat(const int16_t* src, size_t size, float* dest) {
-  for (size_t i = 0; i < size; ++i)
-    dest[i] = S16ToFloat(src[i]);
-}
-
-void FloatS16ToS16(const float* src, size_t size, int16_t* dest) {
-  for (size_t i = 0; i < size; ++i)
-    dest[i] = FloatS16ToS16(src[i]);
-}
-
-void FloatToFloatS16(const float* src, size_t size, float* dest) {
-  for (size_t i = 0; i < size; ++i)
-    dest[i] = FloatToFloatS16(src[i]);
-}
-
-void FloatS16ToFloat(const float* src, size_t size, float* dest) {
-  for (size_t i = 0; i < size; ++i)
-    dest[i] = FloatS16ToFloat(src[i]);
-}
-
-template <>
-void DownmixInterleavedToMono<int16_t>(const int16_t* interleaved,
-                                       size_t num_frames,
-                                       int num_channels,
-                                       int16_t* deinterleaved) {
-  DownmixInterleavedToMonoImpl<int16_t, int32_t>(interleaved, num_frames,
-                                                 num_channels, deinterleaved);
-}
-
-}  // namespace webrtc
diff --git a/submodules/libtgvoip/webrtc_dsp/common_audio/channel_buffer.cc b/submodules/libtgvoip/webrtc_dsp/common_audio/channel_buffer.cc
deleted file mode 100644
index b9b8c25e37..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/common_audio/channel_buffer.cc
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- *  Copyright (c) 2014 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#include "common_audio/channel_buffer.h"
-
-#include <cstdint>
-
-#include "common_audio/include/audio_util.h"
-#include "rtc_base/checks.h"
-
-namespace webrtc {
-
-IFChannelBuffer::IFChannelBuffer(size_t num_frames,
-                                 size_t num_channels,
-                                 size_t num_bands)
-    : ivalid_(true),
-      ibuf_(num_frames, num_channels, num_bands),
-      fvalid_(true),
-      fbuf_(num_frames, num_channels, num_bands) {}
-
-IFChannelBuffer::~IFChannelBuffer() = default;
-
-ChannelBuffer<int16_t>* IFChannelBuffer::ibuf() {
-  RefreshI();
-  fvalid_ = false;
-  return &ibuf_;
-}
-
-ChannelBuffer<float>* IFChannelBuffer::fbuf() {
-  RefreshF();
-  ivalid_ = false;
-  return &fbuf_;
-}
-
-const ChannelBuffer<int16_t>* IFChannelBuffer::ibuf_const() const {
-  RefreshI();
-  return &ibuf_;
-}
-
-const ChannelBuffer<float>* IFChannelBuffer::fbuf_const() const {
-  RefreshF();
-  return &fbuf_;
-}
-
-void IFChannelBuffer::RefreshF() const {
-  if (!fvalid_) {
-    RTC_DCHECK(ivalid_);
-    fbuf_.set_num_channels(ibuf_.num_channels());
-    const int16_t* const* int_channels = ibuf_.channels();
-    float* const* float_channels = fbuf_.channels();
-    for (size_t i = 0; i < ibuf_.num_channels(); ++i) {
-      for (size_t j = 0; j < ibuf_.num_frames(); ++j) {
-        float_channels[i][j] = int_channels[i][j];
-      }
-    }
-    fvalid_ = true;
-  }
-}
-
-void IFChannelBuffer::RefreshI() const {
-  if (!ivalid_) {
-    RTC_DCHECK(fvalid_);
-    int16_t* const* int_channels = ibuf_.channels();
-    ibuf_.set_num_channels(fbuf_.num_channels());
-    const float* const* float_channels = fbuf_.channels();
-    for (size_t i = 0; i < fbuf_.num_channels(); ++i) {
-      FloatS16ToS16(float_channels[i], ibuf_.num_frames(), int_channels[i]);
-    }
-    ivalid_ = true;
-  }
-}
-
-}  // namespace webrtc
diff --git a/submodules/libtgvoip/webrtc_dsp/common_audio/channel_buffer.h b/submodules/libtgvoip/webrtc_dsp/common_audio/channel_buffer.h
deleted file mode 100644
index 3f9ba9c0e1..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/common_audio/channel_buffer.h
+++ /dev/null
@@ -1,184 +0,0 @@
-/*
- *  Copyright (c) 2014 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#ifndef COMMON_AUDIO_CHANNEL_BUFFER_H_
-#define COMMON_AUDIO_CHANNEL_BUFFER_H_
-
-#include <string.h>
-
-#include <memory>
-
-#include "common_audio/include/audio_util.h"
-#include "rtc_base/checks.h"
-#include "rtc_base/gtest_prod_util.h"
-
-namespace webrtc {
-
-// Helper to encapsulate a contiguous data buffer, full or split into frequency
-// bands, with access to a pointer arrays of the deinterleaved channels and
-// bands. The buffer is zero initialized at creation.
-//
-// The buffer structure is showed below for a 2 channel and 2 bands case:
-//
-// |data_|:
-// { [ --- b1ch1 --- ] [ --- b2ch1 --- ] [ --- b1ch2 --- ] [ --- b2ch2 --- ] }
-//
-// The pointer arrays for the same example are as follows:
-//
-// |channels_|:
-// { [ b1ch1* ] [ b1ch2* ] [ b2ch1* ] [ b2ch2* ] }
-//
-// |bands_|:
-// { [ b1ch1* ] [ b2ch1* ] [ b1ch2* ] [ b2ch2* ] }
-template <typename T>
-class ChannelBuffer {
- public:
-  ChannelBuffer(size_t num_frames, size_t num_channels, size_t num_bands = 1)
-      : data_(new T[num_frames * num_channels]()),
-        channels_(new T*[num_channels * num_bands]),
-        bands_(new T*[num_channels * num_bands]),
-        num_frames_(num_frames),
-        num_frames_per_band_(num_frames / num_bands),
-        num_allocated_channels_(num_channels),
-        num_channels_(num_channels),
-        num_bands_(num_bands) {
-    for (size_t i = 0; i < num_allocated_channels_; ++i) {
-      for (size_t j = 0; j < num_bands_; ++j) {
-        channels_[j * num_allocated_channels_ + i] =
-            &data_[i * num_frames_ + j * num_frames_per_band_];
-        bands_[i * num_bands_ + j] = channels_[j * num_allocated_channels_ + i];
-      }
-    }
-  }
-
-  // Returns a pointer array to the full-band channels (or lower band channels).
-  // Usage:
-  // channels()[channel][sample].
-  // Where:
-  // 0 <= channel < |num_allocated_channels_|
-  // 0 <= sample < |num_frames_|
-  T* const* channels() { return channels(0); }
-  const T* const* channels() const { return channels(0); }
-
-  // Returns a pointer array to the channels for a specific band.
-  // Usage:
-  // channels(band)[channel][sample].
-  // Where:
-  // 0 <= band < |num_bands_|
-  // 0 <= channel < |num_allocated_channels_|
-  // 0 <= sample < |num_frames_per_band_|
-  const T* const* channels(size_t band) const {
-    RTC_DCHECK_LT(band, num_bands_);
-    return &channels_[band * num_allocated_channels_];
-  }
-  T* const* channels(size_t band) {
-    const ChannelBuffer<T>* t = this;
-    return const_cast<T* const*>(t->channels(band));
-  }
-
-  // Returns a pointer array to the bands for a specific channel.
-  // Usage:
-  // bands(channel)[band][sample].
-  // Where:
-  // 0 <= channel < |num_channels_|
-  // 0 <= band < |num_bands_|
-  // 0 <= sample < |num_frames_per_band_|
-  const T* const* bands(size_t channel) const {
-    RTC_DCHECK_LT(channel, num_channels_);
-    RTC_DCHECK_GE(channel, 0);
-    return &bands_[channel * num_bands_];
-  }
-  T* const* bands(size_t channel) {
-    const ChannelBuffer<T>* t = this;
-    return const_cast<T* const*>(t->bands(channel));
-  }
-
-  // Sets the |slice| pointers to the |start_frame| position for each channel.
-  // Returns |slice| for convenience.
-  const T* const* Slice(T** slice, size_t start_frame) const {
-    RTC_DCHECK_LT(start_frame, num_frames_);
-    for (size_t i = 0; i < num_channels_; ++i)
-      slice[i] = &channels_[i][start_frame];
-    return slice;
-  }
-  T** Slice(T** slice, size_t start_frame) {
-    const ChannelBuffer<T>* t = this;
-    return const_cast<T**>(t->Slice(slice, start_frame));
-  }
-
-  size_t num_frames() const { return num_frames_; }
-  size_t num_frames_per_band() const { return num_frames_per_band_; }
-  size_t num_channels() const { return num_channels_; }
-  size_t num_bands() const { return num_bands_; }
-  size_t size() const { return num_frames_ * num_allocated_channels_; }
-
-  void set_num_channels(size_t num_channels) {
-    RTC_DCHECK_LE(num_channels, num_allocated_channels_);
-    num_channels_ = num_channels;
-  }
-
-  void SetDataForTesting(const T* data, size_t size) {
-    RTC_CHECK_EQ(size, this->size());
-    memcpy(data_.get(), data, size * sizeof(*data));
-  }
-
- private:
-  std::unique_ptr<T[]> data_;
-  std::unique_ptr<T* []> channels_;
-  std::unique_ptr<T* []> bands_;
-  const size_t num_frames_;
-  const size_t num_frames_per_band_;
-  // Number of channels the internal buffer holds.
-  const size_t num_allocated_channels_;
-  // Number of channels the user sees.
-  size_t num_channels_;
-  const size_t num_bands_;
-};
-
-// One int16_t and one float ChannelBuffer that are kept in sync. The sync is
-// broken when someone requests write access to either ChannelBuffer, and
-// reestablished when someone requests the outdated ChannelBuffer. It is
-// therefore safe to use the return value of ibuf_const() and fbuf_const()
-// until the next call to ibuf() or fbuf(), and the return value of ibuf() and
-// fbuf() until the next call to any of the other functions.
-class IFChannelBuffer {
- public:
-  IFChannelBuffer(size_t num_frames, size_t num_channels, size_t num_bands = 1);
-  ~IFChannelBuffer();
-
-  ChannelBuffer<int16_t>* ibuf();
-  ChannelBuffer<float>* fbuf();
-  const ChannelBuffer<int16_t>* ibuf_const() const;
-  const ChannelBuffer<float>* fbuf_const() const;
-
-  size_t num_frames() const { return ibuf_.num_frames(); }
-  size_t num_frames_per_band() const { return ibuf_.num_frames_per_band(); }
-  size_t num_channels() const {
-    return ivalid_ ? ibuf_.num_channels() : fbuf_.num_channels();
-  }
-  void set_num_channels(size_t num_channels) {
-    ibuf_.set_num_channels(num_channels);
-    fbuf_.set_num_channels(num_channels);
-  }
-  size_t num_bands() const { return ibuf_.num_bands(); }
-
- private:
-  void RefreshF() const;
-  void RefreshI() const;
-
-  mutable bool ivalid_;
-  mutable ChannelBuffer<int16_t> ibuf_;
-  mutable bool fvalid_;
-  mutable ChannelBuffer<float> fbuf_;
-};
-
-}  // namespace webrtc
-
-#endif  // COMMON_AUDIO_CHANNEL_BUFFER_H_
diff --git a/submodules/libtgvoip/webrtc_dsp/common_audio/fir_filter.h b/submodules/libtgvoip/webrtc_dsp/common_audio/fir_filter.h
deleted file mode 100644
index a76e936e1e..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/common_audio/fir_filter.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- *  Copyright (c) 2014 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#ifndef COMMON_AUDIO_FIR_FILTER_H_
-#define COMMON_AUDIO_FIR_FILTER_H_
-
-#include <string.h>
-
-namespace webrtc {
-
-// Finite Impulse Response filter using floating-point arithmetic.
-class FIRFilter {
- public:
-  virtual ~FIRFilter() {}
-
-  // Filters the |in| data supplied.
-  // |out| must be previously allocated and it must be at least of |length|.
-  virtual void Filter(const float* in, size_t length, float* out) = 0;
-};
-
-}  // namespace webrtc
-
-#endif  // COMMON_AUDIO_FIR_FILTER_H_
diff --git a/submodules/libtgvoip/webrtc_dsp/common_audio/fir_filter_c.cc b/submodules/libtgvoip/webrtc_dsp/common_audio/fir_filter_c.cc
deleted file mode 100644
index b6ec27ad26..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/common_audio/fir_filter_c.cc
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- *  Copyright (c) 2014 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#include "common_audio/fir_filter_c.h"
-
-#include <string.h>
-#include <memory>
-
-#include "rtc_base/checks.h"
-
-namespace webrtc {
-
-FIRFilterC::~FIRFilterC() {}
-
-FIRFilterC::FIRFilterC(const float* coefficients, size_t coefficients_length)
-    : coefficients_length_(coefficients_length),
-      state_length_(coefficients_length - 1),
-      coefficients_(new float[coefficients_length_]),
-      state_(new float[state_length_]) {
-  for (size_t i = 0; i < coefficients_length_; ++i) {
-    coefficients_[i] = coefficients[coefficients_length_ - i - 1];
-  }
-  memset(state_.get(), 0, state_length_ * sizeof(state_[0]));
-}
-
-void FIRFilterC::Filter(const float* in, size_t length, float* out) {
-  RTC_DCHECK_GT(length, 0);
-
-  // Convolves the input signal |in| with the filter kernel |coefficients_|
-  // taking into account the previous state.
-  for (size_t i = 0; i < length; ++i) {
-    out[i] = 0.f;
-    size_t j;
-    for (j = 0; state_length_ > i && j < state_length_ - i; ++j) {
-      out[i] += state_[i + j] * coefficients_[j];
-    }
-    for (; j < coefficients_length_; ++j) {
-      out[i] += in[j + i - state_length_] * coefficients_[j];
-    }
-  }
-
-  // Update current state.
-  if (length >= state_length_) {
-    memcpy(state_.get(), &in[length - state_length_],
-           state_length_ * sizeof(*in));
-  } else {
-    memmove(state_.get(), &state_[length],
-            (state_length_ - length) * sizeof(state_[0]));
-    memcpy(&state_[state_length_ - length], in, length * sizeof(*in));
-  }
-}
-
-}  // namespace webrtc
diff --git a/submodules/libtgvoip/webrtc_dsp/common_audio/fir_filter_c.h b/submodules/libtgvoip/webrtc_dsp/common_audio/fir_filter_c.h
deleted file mode 100644
index d263e1ba60..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/common_audio/fir_filter_c.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- *  Copyright (c) 2017 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#ifndef COMMON_AUDIO_FIR_FILTER_C_H_
-#define COMMON_AUDIO_FIR_FILTER_C_H_
-
-#include <string.h>
-#include <memory>
-
-#include "common_audio/fir_filter.h"
-
-namespace webrtc {
-
-class FIRFilterC : public FIRFilter {
- public:
-  FIRFilterC(const float* coefficients, size_t coefficients_length);
-  ~FIRFilterC() override;
-
-  void Filter(const float* in, size_t length, float* out) override;
-
- private:
-  size_t coefficients_length_;
-  size_t state_length_;
-  std::unique_ptr<float[]> coefficients_;
-  std::unique_ptr<float[]> state_;
-};
-
-}  // namespace webrtc
-
-#endif  // COMMON_AUDIO_FIR_FILTER_C_H_
diff --git a/submodules/libtgvoip/webrtc_dsp/common_audio/fir_filter_factory.cc b/submodules/libtgvoip/webrtc_dsp/common_audio/fir_filter_factory.cc
deleted file mode 100644
index ac6efb52dc..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/common_audio/fir_filter_factory.cc
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- *  Copyright (c) 2017 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#include "common_audio/fir_filter_factory.h"
-
-#include "common_audio/fir_filter_c.h"
-#include "rtc_base/checks.h"
-#include "rtc_base/system/arch.h"
-
-#if defined(WEBRTC_ARCH_ARM_FAMILY) && defined(WEBRTC_HAS_NEON)
-#include "common_audio/fir_filter_neon.h"
-#elif defined(WEBRTC_ARCH_X86_FAMILY)
-#include "common_audio/fir_filter_sse.h"
-#include "system_wrappers/include/cpu_features_wrapper.h"  // kSSE2, WebRtc_G...
-#endif
-
-namespace webrtc {
-
-FIRFilter* CreateFirFilter(const float* coefficients,
-                           size_t coefficients_length,
-                           size_t max_input_length) {
-  if (!coefficients || coefficients_length <= 0 || max_input_length <= 0) {
-    RTC_NOTREACHED();
-    return nullptr;
-  }
-
-  FIRFilter* filter = nullptr;
-// If we know the minimum architecture at compile time, avoid CPU detection.
-#if defined(WEBRTC_ARCH_X86_FAMILY)
-#if defined(__SSE2__)
-  filter =
-      new FIRFilterSSE2(coefficients, coefficients_length, max_input_length);
-#else
-  // x86 CPU detection required.
-  if (WebRtc_GetCPUInfo(kSSE2)) {
-    filter =
-        new FIRFilterSSE2(coefficients, coefficients_length, max_input_length);
-  } else {
-    filter = new FIRFilterC(coefficients, coefficients_length);
-  }
-#endif
-#elif defined(WEBRTC_HAS_NEON)
-  filter =
-      new FIRFilterNEON(coefficients, coefficients_length, max_input_length);
-#else
-  filter = new FIRFilterC(coefficients, coefficients_length);
-#endif
-
-  return filter;
-}
-
-}  // namespace webrtc
diff --git a/submodules/libtgvoip/webrtc_dsp/common_audio/fir_filter_factory.h b/submodules/libtgvoip/webrtc_dsp/common_audio/fir_filter_factory.h
deleted file mode 100644
index a952541035..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/common_audio/fir_filter_factory.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- *  Copyright (c) 2014 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#ifndef COMMON_AUDIO_FIR_FILTER_FACTORY_H_
-#define COMMON_AUDIO_FIR_FILTER_FACTORY_H_
-
-#include <string.h>
-
-namespace webrtc {
-
-class FIRFilter;
-
-// Creates a filter with the given coefficients. All initial state values will
-// be zeros.
-// The length of the chunks fed to the filter should never be greater than
-// |max_input_length|. This is needed because, when vectorizing it is
-// necessary to concatenate the input after the state, and resizing this array
-// dynamically is expensive.
-FIRFilter* CreateFirFilter(const float* coefficients,
-                           size_t coefficients_length,
-                           size_t max_input_length);
-
-}  // namespace webrtc
-
-#endif  // COMMON_AUDIO_FIR_FILTER_FACTORY_H_
diff --git a/submodules/libtgvoip/webrtc_dsp/common_audio/fir_filter_neon.cc b/submodules/libtgvoip/webrtc_dsp/common_audio/fir_filter_neon.cc
deleted file mode 100644
index 8aaef6ebc8..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/common_audio/fir_filter_neon.cc
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- *  Copyright (c) 2014 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-#if defined(__arm__) || defined(_M_ARM) || defined(__aarch64__)
-
-#include "common_audio/fir_filter_neon.h"
-
-#include <arm_neon.h>
-#include <string.h>
-
-#include "rtc_base/checks.h"
-#include "rtc_base/memory/aligned_malloc.h"
-
-namespace webrtc {
-
-FIRFilterNEON::~FIRFilterNEON() {}
-
-FIRFilterNEON::FIRFilterNEON(const float* coefficients,
-                             size_t coefficients_length,
-                             size_t max_input_length)
-    :  // Closest higher multiple of four.
-      coefficients_length_((coefficients_length + 3) & ~0x03),
-      state_length_(coefficients_length_ - 1),
-      coefficients_(static_cast<float*>(
-          AlignedMalloc(sizeof(float) * coefficients_length_, 16))),
-      state_(static_cast<float*>(
-          AlignedMalloc(sizeof(float) * (max_input_length + state_length_),
-                        16))) {
-  // Add zeros at the end of the coefficients.
-  size_t padding = coefficients_length_ - coefficients_length;
-  memset(coefficients_.get(), 0.f, padding * sizeof(coefficients_[0]));
-  // The coefficients are reversed to compensate for the order in which the
-  // input samples are acquired (most recent last).
-  for (size_t i = 0; i < coefficients_length; ++i) {
-    coefficients_[i + padding] = coefficients[coefficients_length - i - 1];
-  }
-  memset(state_.get(), 0.f,
-         (max_input_length + state_length_) * sizeof(state_[0]));
-}
-
-void FIRFilterNEON::Filter(const float* in, size_t length, float* out) {
-  RTC_DCHECK_GT(length, 0);
-
-  memcpy(&state_[state_length_], in, length * sizeof(*in));
-
-  // Convolves the input signal |in| with the filter kernel |coefficients_|
-  // taking into account the previous state.
-  for (size_t i = 0; i < length; ++i) {
-    float* in_ptr = &state_[i];
-    float* coef_ptr = coefficients_.get();
-
-    float32x4_t m_sum = vmovq_n_f32(0);
-    float32x4_t m_in;
-
-    for (size_t j = 0; j < coefficients_length_; j += 4) {
-      m_in = vld1q_f32(in_ptr + j);
-      m_sum = vmlaq_f32(m_sum, m_in, vld1q_f32(coef_ptr + j));
-    }
-
-    float32x2_t m_half = vadd_f32(vget_high_f32(m_sum), vget_low_f32(m_sum));
-    out[i] = vget_lane_f32(vpadd_f32(m_half, m_half), 0);
-  }
-
-  // Update current state.
-  memmove(state_.get(), &state_[length], state_length_ * sizeof(state_[0]));
-}
-
-}  // namespace webrtc
-
-#endif
diff --git a/submodules/libtgvoip/webrtc_dsp/common_audio/fir_filter_neon.h b/submodules/libtgvoip/webrtc_dsp/common_audio/fir_filter_neon.h
deleted file mode 100644
index 1ffefd80dc..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/common_audio/fir_filter_neon.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- *  Copyright (c) 2014 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#ifndef COMMON_AUDIO_FIR_FILTER_NEON_H_
-#define COMMON_AUDIO_FIR_FILTER_NEON_H_
-
-#include <memory>
-
-#include "common_audio/fir_filter.h"
-#include "rtc_base/memory/aligned_malloc.h"
-
-namespace webrtc {
-
-class FIRFilterNEON : public FIRFilter {
- public:
-  FIRFilterNEON(const float* coefficients,
-                size_t coefficients_length,
-                size_t max_input_length);
-  ~FIRFilterNEON() override;
-
-  void Filter(const float* in, size_t length, float* out) override;
-
- private:
-  size_t coefficients_length_;
-  size_t state_length_;
-  std::unique_ptr<float[], AlignedFreeDeleter> coefficients_;
-  std::unique_ptr<float[], AlignedFreeDeleter> state_;
-};
-
-}  // namespace webrtc
-
-#endif  // COMMON_AUDIO_FIR_FILTER_NEON_H_
diff --git a/submodules/libtgvoip/webrtc_dsp/common_audio/fir_filter_sse.cc b/submodules/libtgvoip/webrtc_dsp/common_audio/fir_filter_sse.cc
deleted file mode 100644
index c30995fdda..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/common_audio/fir_filter_sse.cc
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
- *  Copyright (c) 2014 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-#include "rtc_base/system/arch.h"
-#ifdef WEBRTC_ARCH_X86_FAMILY
-
-#include "common_audio/fir_filter_sse.h"
-
-#include <stdint.h>
-#include <string.h>
-#include <xmmintrin.h>
-
-#include "rtc_base/checks.h"
-#include "rtc_base/memory/aligned_malloc.h"
-
-namespace webrtc {
-
-FIRFilterSSE2::~FIRFilterSSE2() {}
-
-FIRFilterSSE2::FIRFilterSSE2(const float* coefficients,
-                             size_t coefficients_length,
-                             size_t max_input_length)
-    :  // Closest higher multiple of four.
-      coefficients_length_((coefficients_length + 3) & ~0x03),
-      state_length_(coefficients_length_ - 1),
-      coefficients_(static_cast<float*>(
-          AlignedMalloc(sizeof(float) * coefficients_length_, 16))),
-      state_(static_cast<float*>(
-          AlignedMalloc(sizeof(float) * (max_input_length + state_length_),
-                        16))) {
-  // Add zeros at the end of the coefficients.
-  size_t padding = coefficients_length_ - coefficients_length;
-  memset(coefficients_.get(), 0, padding * sizeof(coefficients_[0]));
-  // The coefficients are reversed to compensate for the order in which the
-  // input samples are acquired (most recent last).
-  for (size_t i = 0; i < coefficients_length; ++i) {
-    coefficients_[i + padding] = coefficients[coefficients_length - i - 1];
-  }
-  memset(state_.get(), 0,
-         (max_input_length + state_length_) * sizeof(state_[0]));
-}
-
-void FIRFilterSSE2::Filter(const float* in, size_t length, float* out) {
-  RTC_DCHECK_GT(length, 0);
-
-  memcpy(&state_[state_length_], in, length * sizeof(*in));
-
-  // Convolves the input signal |in| with the filter kernel |coefficients_|
-  // taking into account the previous state.
-  for (size_t i = 0; i < length; ++i) {
-    float* in_ptr = &state_[i];
-    float* coef_ptr = coefficients_.get();
-
-    __m128 m_sum = _mm_setzero_ps();
-    __m128 m_in;
-
-    // Depending on if the pointer is aligned with 16 bytes or not it is loaded
-    // differently.
-    if (reinterpret_cast<uintptr_t>(in_ptr) & 0x0F) {
-      for (size_t j = 0; j < coefficients_length_; j += 4) {
-        m_in = _mm_loadu_ps(in_ptr + j);
-        m_sum = _mm_add_ps(m_sum, _mm_mul_ps(m_in, _mm_load_ps(coef_ptr + j)));
-      }
-    } else {
-      for (size_t j = 0; j < coefficients_length_; j += 4) {
-        m_in = _mm_load_ps(in_ptr + j);
-        m_sum = _mm_add_ps(m_sum, _mm_mul_ps(m_in, _mm_load_ps(coef_ptr + j)));
-      }
-    }
-    m_sum = _mm_add_ps(_mm_movehl_ps(m_sum, m_sum), m_sum);
-    _mm_store_ss(out + i, _mm_add_ss(m_sum, _mm_shuffle_ps(m_sum, m_sum, 1)));
-  }
-
-  // Update current state.
-  memmove(state_.get(), &state_[length], state_length_ * sizeof(state_[0]));
-}
-
-}  // namespace webrtc
-
-#endif
diff --git a/submodules/libtgvoip/webrtc_dsp/common_audio/fir_filter_sse.h b/submodules/libtgvoip/webrtc_dsp/common_audio/fir_filter_sse.h
deleted file mode 100644
index b768a37aa1..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/common_audio/fir_filter_sse.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- *  Copyright (c) 2014 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#ifndef COMMON_AUDIO_FIR_FILTER_SSE_H_
-#define COMMON_AUDIO_FIR_FILTER_SSE_H_
-
-#include <stddef.h>
-#include <memory>
-
-#include "common_audio/fir_filter.h"
-#include "rtc_base/memory/aligned_malloc.h"
-
-namespace webrtc {
-
-class FIRFilterSSE2 : public FIRFilter {
- public:
-  FIRFilterSSE2(const float* coefficients,
-                size_t coefficients_length,
-                size_t max_input_length);
-  ~FIRFilterSSE2() override;
-
-  void Filter(const float* in, size_t length, float* out) override;
-
- private:
-  size_t coefficients_length_;
-  size_t state_length_;
-  std::unique_ptr<float[], AlignedFreeDeleter> coefficients_;
-  std::unique_ptr<float[], AlignedFreeDeleter> state_;
-};
-
-}  // namespace webrtc
-
-#endif  // COMMON_AUDIO_FIR_FILTER_SSE_H_
diff --git a/submodules/libtgvoip/webrtc_dsp/common_audio/include/audio_util.h b/submodules/libtgvoip/webrtc_dsp/common_audio/include/audio_util.h
deleted file mode 100644
index bca5718044..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/common_audio/include/audio_util.h
+++ /dev/null
@@ -1,214 +0,0 @@
-/*
- *  Copyright (c) 2013 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#ifndef COMMON_AUDIO_INCLUDE_AUDIO_UTIL_H_
-#define COMMON_AUDIO_INCLUDE_AUDIO_UTIL_H_
-
-#include <stdint.h>
-#include <algorithm>
-#include <cmath>
-#include <cstring>
-#include <limits>
-
-#include "rtc_base/checks.h"
-
-namespace webrtc {
-
-typedef std::numeric_limits<int16_t> limits_int16;
-
-// The conversion functions use the following naming convention:
-// S16:      int16_t [-32768, 32767]
-// Float:    float   [-1.0, 1.0]
-// FloatS16: float   [-32768.0, 32767.0]
-// Dbfs: float [-20.0*log(10, 32768), 0] = [-90.3, 0]
-// The ratio conversion functions use this naming convention:
-// Ratio: float (0, +inf)
-// Db: float (-inf, +inf)
-static inline int16_t FloatToS16(float v) {
-  if (v > 0)
-    return v >= 1 ? limits_int16::max()
-                  : static_cast<int16_t>(v * limits_int16::max() + 0.5f);
-  return v <= -1 ? limits_int16::min()
-                 : static_cast<int16_t>(-v * limits_int16::min() - 0.5f);
-}
-
-static inline float S16ToFloat(int16_t v) {
-  static const float kMaxInt16Inverse = 1.f / limits_int16::max();
-  static const float kMinInt16Inverse = 1.f / limits_int16::min();
-  return v * (v > 0 ? kMaxInt16Inverse : -kMinInt16Inverse);
-}
-
-static inline int16_t FloatS16ToS16(float v) {
-  static const float kMaxRound = limits_int16::max() - 0.5f;
-  static const float kMinRound = limits_int16::min() + 0.5f;
-  if (v > 0)
-    return v >= kMaxRound ? limits_int16::max()
-                          : static_cast<int16_t>(v + 0.5f);
-  return v <= kMinRound ? limits_int16::min() : static_cast<int16_t>(v - 0.5f);
-}
-
-static inline float FloatToFloatS16(float v) {
-  return v * (v > 0 ? limits_int16::max() : -limits_int16::min());
-}
-
-static inline float FloatS16ToFloat(float v) {
-  static const float kMaxInt16Inverse = 1.f / limits_int16::max();
-  static const float kMinInt16Inverse = 1.f / limits_int16::min();
-  return v * (v > 0 ? kMaxInt16Inverse : -kMinInt16Inverse);
-}
-
-void FloatToS16(const float* src, size_t size, int16_t* dest);
-void S16ToFloat(const int16_t* src, size_t size, float* dest);
-void FloatS16ToS16(const float* src, size_t size, int16_t* dest);
-void FloatToFloatS16(const float* src, size_t size, float* dest);
-void FloatS16ToFloat(const float* src, size_t size, float* dest);
-
-inline float DbToRatio(float v) {
-  return std::pow(10.0f, v / 20.0f);
-}
-
-inline float DbfsToFloatS16(float v) {
-  static constexpr float kMaximumAbsFloatS16 = -limits_int16::min();
-  return DbToRatio(v) * kMaximumAbsFloatS16;
-}
-
-inline float FloatS16ToDbfs(float v) {
-  RTC_DCHECK_GE(v, 0);
-
-  // kMinDbfs is equal to -20.0 * log10(-limits_int16::min())
-  static constexpr float kMinDbfs = -90.30899869919436f;
-  if (v <= 1.0f) {
-    return kMinDbfs;
-  }
-  // Equal to 20 * log10(v / (-limits_int16::min()))
-  return 20.0f * std::log10(v) + kMinDbfs;
-}
-
-// Copy audio from |src| channels to |dest| channels unless |src| and |dest|
-// point to the same address. |src| and |dest| must have the same number of
-// channels, and there must be sufficient space allocated in |dest|.
-template <typename T>
-void CopyAudioIfNeeded(const T* const* src,
-                       int num_frames,
-                       int num_channels,
-                       T* const* dest) {
-  for (int i = 0; i < num_channels; ++i) {
-    if (src[i] != dest[i]) {
-      std::copy(src[i], src[i] + num_frames, dest[i]);
-    }
-  }
-}
-
-// Deinterleave audio from |interleaved| to the channel buffers pointed to
-// by |deinterleaved|. There must be sufficient space allocated in the
-// |deinterleaved| buffers (|num_channel| buffers with |samples_per_channel|
-// per buffer).
-template <typename T>
-void Deinterleave(const T* interleaved,
-                  size_t samples_per_channel,
-                  size_t num_channels,
-                  T* const* deinterleaved) {
-  for (size_t i = 0; i < num_channels; ++i) {
-    T* channel = deinterleaved[i];
-    size_t interleaved_idx = i;
-    for (size_t j = 0; j < samples_per_channel; ++j) {
-      channel[j] = interleaved[interleaved_idx];
-      interleaved_idx += num_channels;
-    }
-  }
-}
-
-// Interleave audio from the channel buffers pointed to by |deinterleaved| to
-// |interleaved|. There must be sufficient space allocated in |interleaved|
-// (|samples_per_channel| * |num_channels|).
-template <typename T>
-void Interleave(const T* const* deinterleaved,
-                size_t samples_per_channel,
-                size_t num_channels,
-                T* interleaved) {
-  for (size_t i = 0; i < num_channels; ++i) {
-    const T* channel = deinterleaved[i];
-    size_t interleaved_idx = i;
-    for (size_t j = 0; j < samples_per_channel; ++j) {
-      interleaved[interleaved_idx] = channel[j];
-      interleaved_idx += num_channels;
-    }
-  }
-}
-
-// Copies audio from a single channel buffer pointed to by |mono| to each
-// channel of |interleaved|. There must be sufficient space allocated in
-// |interleaved| (|samples_per_channel| * |num_channels|).
-template <typename T>
-void UpmixMonoToInterleaved(const T* mono,
-                            int num_frames,
-                            int num_channels,
-                            T* interleaved) {
-  int interleaved_idx = 0;
-  for (int i = 0; i < num_frames; ++i) {
-    for (int j = 0; j < num_channels; ++j) {
-      interleaved[interleaved_idx++] = mono[i];
-    }
-  }
-}
-
-template <typename T, typename Intermediate>
-void DownmixToMono(const T* const* input_channels,
-                   size_t num_frames,
-                   int num_channels,
-                   T* out) {
-  for (size_t i = 0; i < num_frames; ++i) {
-    Intermediate value = input_channels[0][i];
-    for (int j = 1; j < num_channels; ++j) {
-      value += input_channels[j][i];
-    }
-    out[i] = value / num_channels;
-  }
-}
-
-// Downmixes an interleaved multichannel signal to a single channel by averaging
-// all channels.
-template <typename T, typename Intermediate>
-void DownmixInterleavedToMonoImpl(const T* interleaved,
-                                  size_t num_frames,
-                                  int num_channels,
-                                  T* deinterleaved) {
-  RTC_DCHECK_GT(num_channels, 0);
-  RTC_DCHECK_GT(num_frames, 0);
-
-  const T* const end = interleaved + num_frames * num_channels;
-
-  while (interleaved < end) {
-    const T* const frame_end = interleaved + num_channels;
-
-    Intermediate value = *interleaved++;
-    while (interleaved < frame_end) {
-      value += *interleaved++;
-    }
-
-    *deinterleaved++ = value / num_channels;
-  }
-}
-
-template <typename T>
-void DownmixInterleavedToMono(const T* interleaved,
-                              size_t num_frames,
-                              int num_channels,
-                              T* deinterleaved);
-
-template <>
-void DownmixInterleavedToMono<int16_t>(const int16_t* interleaved,
-                                       size_t num_frames,
-                                       int num_channels,
-                                       int16_t* deinterleaved);
-
-}  // namespace webrtc
-
-#endif  // COMMON_AUDIO_INCLUDE_AUDIO_UTIL_H_
diff --git a/submodules/libtgvoip/webrtc_dsp/common_audio/mocks/mock_smoothing_filter.h b/submodules/libtgvoip/webrtc_dsp/common_audio/mocks/mock_smoothing_filter.h
deleted file mode 100644
index 712049fa6a..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/common_audio/mocks/mock_smoothing_filter.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- *  Copyright (c) 2016 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#ifndef COMMON_AUDIO_MOCKS_MOCK_SMOOTHING_FILTER_H_
-#define COMMON_AUDIO_MOCKS_MOCK_SMOOTHING_FILTER_H_
-
-#include "common_audio/smoothing_filter.h"
-#include "test/gmock.h"
-
-namespace webrtc {
-
-class MockSmoothingFilter : public SmoothingFilter {
- public:
-  MOCK_METHOD1(AddSample, void(float));
-  MOCK_METHOD0(GetAverage, absl::optional<float>());
-  MOCK_METHOD1(SetTimeConstantMs, bool(int));
-};
-
-}  // namespace webrtc
-
-#endif  // COMMON_AUDIO_MOCKS_MOCK_SMOOTHING_FILTER_H_
diff --git a/submodules/libtgvoip/webrtc_dsp/common_audio/real_fourier.cc b/submodules/libtgvoip/webrtc_dsp/common_audio/real_fourier.cc
deleted file mode 100644
index 7365844e8d..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/common_audio/real_fourier.cc
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- *  Copyright (c) 2014 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#include "common_audio/real_fourier.h"
-
-#include "common_audio/real_fourier_ooura.h"
-#include "common_audio/signal_processing/include/signal_processing_library.h"
-#include "rtc_base/checks.h"
-
-namespace webrtc {
-
-using std::complex;
-
-const size_t RealFourier::kFftBufferAlignment = 32;
-
-std::unique_ptr<RealFourier> RealFourier::Create(int fft_order) {
-  return std::unique_ptr<RealFourier>(new RealFourierOoura(fft_order));
-}
-
-int RealFourier::FftOrder(size_t length) {
-  RTC_CHECK_GT(length, 0U);
-  return WebRtcSpl_GetSizeInBits(static_cast<uint32_t>(length - 1));
-}
-
-size_t RealFourier::FftLength(int order) {
-  RTC_CHECK_GE(order, 0);
-  return size_t{1} << order;
-}
-
-size_t RealFourier::ComplexLength(int order) {
-  return FftLength(order) / 2 + 1;
-}
-
-RealFourier::fft_real_scoper RealFourier::AllocRealBuffer(int count) {
-  return fft_real_scoper(static_cast<float*>(
-      AlignedMalloc(sizeof(float) * count, kFftBufferAlignment)));
-}
-
-RealFourier::fft_cplx_scoper RealFourier::AllocCplxBuffer(int count) {
-  return fft_cplx_scoper(static_cast<complex<float>*>(
-      AlignedMalloc(sizeof(complex<float>) * count, kFftBufferAlignment)));
-}
-
-}  // namespace webrtc
diff --git a/submodules/libtgvoip/webrtc_dsp/common_audio/real_fourier.h b/submodules/libtgvoip/webrtc_dsp/common_audio/real_fourier.h
deleted file mode 100644
index 4d0d8bf38e..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/common_audio/real_fourier.h
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- *  Copyright (c) 2014 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#ifndef COMMON_AUDIO_REAL_FOURIER_H_
-#define COMMON_AUDIO_REAL_FOURIER_H_
-
-#include <stddef.h>
-#include <complex>
-#include <memory>
-
-#include "rtc_base/memory/aligned_malloc.h"
-
-// Uniform interface class for the real DFT and its inverse, for power-of-2
-// input lengths. Also contains helper functions for buffer allocation, taking
-// care of any memory alignment requirements the underlying library might have.
-
-namespace webrtc {
-
-class RealFourier {
- public:
-  // Shorthand typenames for the scopers used by the buffer allocation helpers.
-  typedef std::unique_ptr<float[], AlignedFreeDeleter> fft_real_scoper;
-  typedef std::unique_ptr<std::complex<float>[], AlignedFreeDeleter>
-      fft_cplx_scoper;
-
-  // The alignment required for all input and output buffers, in bytes.
-  static const size_t kFftBufferAlignment;
-
-  // Construct a wrapper instance for the given input order, which must be
-  // between 1 and kMaxFftOrder, inclusively.
-  static std::unique_ptr<RealFourier> Create(int fft_order);
-  virtual ~RealFourier() {}
-
-  // Helper to compute the smallest FFT order (a power of 2) which will contain
-  // the given input length.
-  static int FftOrder(size_t length);
-
-  // Helper to compute the input length from the FFT order.
-  static size_t FftLength(int order);
-
-  // Helper to compute the exact length, in complex floats, of the transform
-  // output (i.e. |2^order / 2 + 1|).
-  static size_t ComplexLength(int order);
-
-  // Buffer allocation helpers. The buffers are large enough to hold |count|
-  // floats/complexes and suitably aligned for use by the implementation.
-  // The returned scopers are set up with proper deleters; the caller owns
-  // the allocated memory.
-  static fft_real_scoper AllocRealBuffer(int count);
-  static fft_cplx_scoper AllocCplxBuffer(int count);
-
-  // Main forward transform interface. The output array need only be big
-  // enough for |2^order / 2 + 1| elements - the conjugate pairs are not
-  // returned. Input and output must be properly aligned (e.g. through
-  // AllocRealBuffer and AllocCplxBuffer) and input length must be
-  // |2^order| (same as given at construction time).
-  virtual void Forward(const float* src, std::complex<float>* dest) const = 0;
-
-  // Inverse transform. Same input format as output above, conjugate pairs
-  // not needed.
-  virtual void Inverse(const std::complex<float>* src, float* dest) const = 0;
-
-  virtual int order() const = 0;
-};
-
-}  // namespace webrtc
-
-#endif  // COMMON_AUDIO_REAL_FOURIER_H_
diff --git a/submodules/libtgvoip/webrtc_dsp/common_audio/real_fourier_ooura.cc b/submodules/libtgvoip/webrtc_dsp/common_audio/real_fourier_ooura.cc
deleted file mode 100644
index 89694c1667..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/common_audio/real_fourier_ooura.cc
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
- *  Copyright (c) 2015 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#include "common_audio/real_fourier_ooura.h"
-
-#include <algorithm>
-#include <cmath>
-
-#include "common_audio/third_party/fft4g/fft4g.h"
-#include "rtc_base/checks.h"
-
-namespace webrtc {
-
-using std::complex;
-
-namespace {
-
-void Conjugate(complex<float>* array, size_t complex_length) {
-  std::for_each(array, array + complex_length,
-                [=](complex<float>& v) { v = std::conj(v); });
-}
-
-size_t ComputeWorkIpSize(size_t fft_length) {
-  return static_cast<size_t>(
-      2 + std::ceil(std::sqrt(static_cast<float>(fft_length))));
-}
-
-}  // namespace
-
-RealFourierOoura::RealFourierOoura(int fft_order)
-    : order_(fft_order),
-      length_(FftLength(order_)),
-      complex_length_(ComplexLength(order_)),
-      // Zero-initializing work_ip_ will cause rdft to initialize these work
-      // arrays on the first call.
-      work_ip_(new size_t[ComputeWorkIpSize(length_)]()),
-      work_w_(new float[complex_length_]()) {
-  RTC_CHECK_GE(fft_order, 1);
-}
-
-RealFourierOoura::~RealFourierOoura() = default;
-
-void RealFourierOoura::Forward(const float* src, complex<float>* dest) const {
-  {
-    // This cast is well-defined since C++11. See "Non-static data members" at:
-    // http://en.cppreference.com/w/cpp/numeric/complex
-    auto* dest_float = reinterpret_cast<float*>(dest);
-    std::copy(src, src + length_, dest_float);
-    WebRtc_rdft(length_, 1, dest_float, work_ip_.get(), work_w_.get());
-  }
-
-  // Ooura places real[n/2] in imag[0].
-  dest[complex_length_ - 1] = complex<float>(dest[0].imag(), 0.0f);
-  dest[0] = complex<float>(dest[0].real(), 0.0f);
-  // Ooura returns the conjugate of the usual Fourier definition.
-  Conjugate(dest, complex_length_);
-}
-
-void RealFourierOoura::Inverse(const complex<float>* src, float* dest) const {
-  {
-    auto* dest_complex = reinterpret_cast<complex<float>*>(dest);
-    // The real output array is shorter than the input complex array by one
-    // complex element.
-    const size_t dest_complex_length = complex_length_ - 1;
-    std::copy(src, src + dest_complex_length, dest_complex);
-    // Restore Ooura's conjugate definition.
-    Conjugate(dest_complex, dest_complex_length);
-    // Restore real[n/2] to imag[0].
-    dest_complex[0] =
-        complex<float>(dest_complex[0].real(), src[complex_length_ - 1].real());
-  }
-
-  WebRtc_rdft(length_, -1, dest, work_ip_.get(), work_w_.get());
-
-  // Ooura returns a scaled version.
-  const float scale = 2.0f / length_;
-  std::for_each(dest, dest + length_, [scale](float& v) { v *= scale; });
-}
-
-int RealFourierOoura::order() const {
-  return order_;
-}
-
-}  // namespace webrtc
diff --git a/submodules/libtgvoip/webrtc_dsp/common_audio/real_fourier_ooura.h b/submodules/libtgvoip/webrtc_dsp/common_audio/real_fourier_ooura.h
deleted file mode 100644
index b36c84f10b..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/common_audio/real_fourier_ooura.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- *  Copyright (c) 2015 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#ifndef COMMON_AUDIO_REAL_FOURIER_OOURA_H_
-#define COMMON_AUDIO_REAL_FOURIER_OOURA_H_
-
-#include <stddef.h>
-#include <complex>
-#include <memory>
-
-#include "common_audio/real_fourier.h"
-
-namespace webrtc {
-
-class RealFourierOoura : public RealFourier {
- public:
-  explicit RealFourierOoura(int fft_order);
-  ~RealFourierOoura() override;
-
-  void Forward(const float* src, std::complex<float>* dest) const override;
-  void Inverse(const std::complex<float>* src, float* dest) const override;
-
-  int order() const override;
-
- private:
-  const int order_;
-  const size_t length_;
-  const size_t complex_length_;
-  // These are work arrays for Ooura. The names are based on the comments in
-  // fft4g.c.
-  const std::unique_ptr<size_t[]> work_ip_;
-  const std::unique_ptr<float[]> work_w_;
-};
-
-}  // namespace webrtc
-
-#endif  // COMMON_AUDIO_REAL_FOURIER_OOURA_H_
diff --git a/submodules/libtgvoip/webrtc_dsp/common_audio/resampler/include/push_resampler.h b/submodules/libtgvoip/webrtc_dsp/common_audio/resampler/include/push_resampler.h
deleted file mode 100644
index 232ad2a79f..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/common_audio/resampler/include/push_resampler.h
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- *  Copyright (c) 2013 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#ifndef COMMON_AUDIO_RESAMPLER_INCLUDE_PUSH_RESAMPLER_H_
-#define COMMON_AUDIO_RESAMPLER_INCLUDE_PUSH_RESAMPLER_H_
-
-#include <memory>
-#include <vector>
-
-namespace webrtc {
-
-class PushSincResampler;
-
-// Wraps PushSincResampler to provide stereo support.
-// TODO(ajm): add support for an arbitrary number of channels.
-template <typename T>
-class PushResampler {
- public:
-  PushResampler();
-  virtual ~PushResampler();
-
-  // Must be called whenever the parameters change. Free to be called at any
-  // time as it is a no-op if parameters have not changed since the last call.
-  int InitializeIfNeeded(int src_sample_rate_hz,
-                         int dst_sample_rate_hz,
-                         size_t num_channels);
-
-  // Returns the total number of samples provided in destination (e.g. 32 kHz,
-  // 2 channel audio gives 640 samples).
-  int Resample(const T* src, size_t src_length, T* dst, size_t dst_capacity);
-
- private:
-  int src_sample_rate_hz_;
-  int dst_sample_rate_hz_;
-  size_t num_channels_;
-
-  struct ChannelResampler {
-    std::unique_ptr<PushSincResampler> resampler;
-    std::vector<T> source;
-    std::vector<T> destination;
-  };
-
-  std::vector<ChannelResampler> channel_resamplers_;
-};
-}  // namespace webrtc
-
-#endif  // COMMON_AUDIO_RESAMPLER_INCLUDE_PUSH_RESAMPLER_H_
diff --git a/submodules/libtgvoip/webrtc_dsp/common_audio/resampler/include/resampler.h b/submodules/libtgvoip/webrtc_dsp/common_audio/resampler/include/resampler.h
deleted file mode 100644
index 04c487b331..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/common_audio/resampler/include/resampler.h
+++ /dev/null
@@ -1,99 +0,0 @@
-/*
- *  Copyright (c) 2011 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-/*
- * A wrapper for resampling a numerous amount of sampling combinations.
- */
-
-#ifndef COMMON_AUDIO_RESAMPLER_INCLUDE_RESAMPLER_H_
-#define COMMON_AUDIO_RESAMPLER_INCLUDE_RESAMPLER_H_
-
-#include <stddef.h>
-#include <stdint.h>
-
-namespace webrtc {
-
-// All methods return 0 on success and -1 on failure.
-class Resampler {
- public:
-  Resampler();
-  Resampler(int inFreq, int outFreq, size_t num_channels);
-  ~Resampler();
-
-  // Reset all states
-  int Reset(int inFreq, int outFreq, size_t num_channels);
-
-  // Reset all states if any parameter has changed
-  int ResetIfNeeded(int inFreq, int outFreq, size_t num_channels);
-
-  // Resample samplesIn to samplesOut.
-  int Push(const int16_t* samplesIn,
-           size_t lengthIn,
-           int16_t* samplesOut,
-           size_t maxLen,
-           size_t& outLen);  // NOLINT: to avoid changing APIs
-
- private:
-  enum ResamplerMode {
-    kResamplerMode1To1,
-    kResamplerMode1To2,
-    kResamplerMode1To3,
-    kResamplerMode1To4,
-    kResamplerMode1To6,
-    kResamplerMode1To12,
-    kResamplerMode2To3,
-    kResamplerMode2To11,
-    kResamplerMode4To11,
-    kResamplerMode8To11,
-    kResamplerMode11To16,
-    kResamplerMode11To32,
-    kResamplerMode2To1,
-    kResamplerMode3To1,
-    kResamplerMode4To1,
-    kResamplerMode6To1,
-    kResamplerMode12To1,
-    kResamplerMode3To2,
-    kResamplerMode11To2,
-    kResamplerMode11To4,
-    kResamplerMode11To8
-  };
-
-  // Computes the resampler mode for a given sampling frequency pair.
-  // Returns -1 for unsupported frequency pairs.
-  static int ComputeResamplerMode(int in_freq_hz,
-                                  int out_freq_hz,
-                                  ResamplerMode* mode);
-
-  // Generic pointers since we don't know what states we'll need
-  void* state1_;
-  void* state2_;
-  void* state3_;
-
-  // Storage if needed
-  int16_t* in_buffer_;
-  int16_t* out_buffer_;
-  size_t in_buffer_size_;
-  size_t out_buffer_size_;
-  size_t in_buffer_size_max_;
-  size_t out_buffer_size_max_;
-
-  int my_in_frequency_khz_;
-  int my_out_frequency_khz_;
-  ResamplerMode my_mode_;
-  size_t num_channels_;
-
-  // Extra instance for stereo
-  Resampler* slave_left_;
-  Resampler* slave_right_;
-};
-
-}  // namespace webrtc
-
-#endif  // COMMON_AUDIO_RESAMPLER_INCLUDE_RESAMPLER_H_
diff --git a/submodules/libtgvoip/webrtc_dsp/common_audio/resampler/push_resampler.cc b/submodules/libtgvoip/webrtc_dsp/common_audio/resampler/push_resampler.cc
deleted file mode 100644
index 9b89867e5a..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/common_audio/resampler/push_resampler.cc
+++ /dev/null
@@ -1,151 +0,0 @@
-/*
- *  Copyright (c) 2013 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#include "common_audio/resampler/include/push_resampler.h"
-
-#include <stdint.h>
-#include <string.h>
-
-#include "absl/container/inlined_vector.h"
-#include "absl/memory/memory.h"
-#include "common_audio/include/audio_util.h"
-#include "common_audio/resampler/push_sinc_resampler.h"
-#include "rtc_base/checks.h"
-
-namespace webrtc {
-namespace {
-// These checks were factored out into a non-templatized function
-// due to problems with clang on Windows in debug builds.
-// For some reason having the DCHECKs inline in the template code
-// caused the compiler to generate code that threw off the linker.
-// TODO(tommi): Re-enable when we've figured out what the problem is.
-// http://crbug.com/615050
-void CheckValidInitParams(int src_sample_rate_hz,
-                          int dst_sample_rate_hz,
-                          size_t num_channels) {
-// The below checks are temporarily disabled on WEBRTC_WIN due to problems
-// with clang debug builds.
-#if !defined(WEBRTC_WIN) && defined(__clang__)
-  RTC_DCHECK_GT(src_sample_rate_hz, 0);
-  RTC_DCHECK_GT(dst_sample_rate_hz, 0);
-  RTC_DCHECK_GT(num_channels, 0);
-#endif
-}
-
-void CheckExpectedBufferSizes(size_t src_length,
-                              size_t dst_capacity,
-                              size_t num_channels,
-                              int src_sample_rate,
-                              int dst_sample_rate) {
-// The below checks are temporarily disabled on WEBRTC_WIN due to problems
-// with clang debug builds.
-// TODO(tommi): Re-enable when we've figured out what the problem is.
-// http://crbug.com/615050
-#if !defined(WEBRTC_WIN) && defined(__clang__)
-  const size_t src_size_10ms = src_sample_rate * num_channels / 100;
-  const size_t dst_size_10ms = dst_sample_rate * num_channels / 100;
-  RTC_DCHECK_EQ(src_length, src_size_10ms);
-  RTC_DCHECK_GE(dst_capacity, dst_size_10ms);
-#endif
-}
-}  // namespace
-
-template <typename T>
-PushResampler<T>::PushResampler()
-    : src_sample_rate_hz_(0), dst_sample_rate_hz_(0), num_channels_(0) {}
-
-template <typename T>
-PushResampler<T>::~PushResampler() {}
-
-template <typename T>
-int PushResampler<T>::InitializeIfNeeded(int src_sample_rate_hz,
-                                         int dst_sample_rate_hz,
-                                         size_t num_channels) {
-  CheckValidInitParams(src_sample_rate_hz, dst_sample_rate_hz, num_channels);
-
-  if (src_sample_rate_hz == src_sample_rate_hz_ &&
-      dst_sample_rate_hz == dst_sample_rate_hz_ &&
-      num_channels == num_channels_) {
-    // No-op if settings haven't changed.
-    return 0;
-  }
-
-  if (src_sample_rate_hz <= 0 || dst_sample_rate_hz <= 0 || num_channels <= 0) {
-    return -1;
-  }
-
-  src_sample_rate_hz_ = src_sample_rate_hz;
-  dst_sample_rate_hz_ = dst_sample_rate_hz;
-  num_channels_ = num_channels;
-
-  const size_t src_size_10ms_mono =
-      static_cast<size_t>(src_sample_rate_hz / 100);
-  const size_t dst_size_10ms_mono =
-      static_cast<size_t>(dst_sample_rate_hz / 100);
-  channel_resamplers_.clear();
-  for (size_t i = 0; i < num_channels; ++i) {
-    channel_resamplers_.push_back(ChannelResampler());
-    auto channel_resampler = channel_resamplers_.rbegin();
-    channel_resampler->resampler = absl::make_unique<PushSincResampler>(
-        src_size_10ms_mono, dst_size_10ms_mono);
-    channel_resampler->source.resize(src_size_10ms_mono);
-    channel_resampler->destination.resize(dst_size_10ms_mono);
-  }
-
-  return 0;
-}
-
-template <typename T>
-int PushResampler<T>::Resample(const T* src,
-                               size_t src_length,
-                               T* dst,
-                               size_t dst_capacity) {
-  CheckExpectedBufferSizes(src_length, dst_capacity, num_channels_,
-                           src_sample_rate_hz_, dst_sample_rate_hz_);
-
-  if (src_sample_rate_hz_ == dst_sample_rate_hz_) {
-    // The old resampler provides this memcpy facility in the case of matching
-    // sample rates, so reproduce it here for the sinc resampler.
-    memcpy(dst, src, src_length * sizeof(T));
-    return static_cast<int>(src_length);
-  }
-
-  const size_t src_length_mono = src_length / num_channels_;
-  const size_t dst_capacity_mono = dst_capacity / num_channels_;
-
-  absl::InlinedVector<T*, 8> source_pointers;
-  for (auto& resampler : channel_resamplers_) {
-    source_pointers.push_back(resampler.source.data());
-  }
-
-  Deinterleave(src, src_length_mono, num_channels_, source_pointers.data());
-
-  size_t dst_length_mono = 0;
-
-  for (auto& resampler : channel_resamplers_) {
-    dst_length_mono = resampler.resampler->Resample(
-        resampler.source.data(), src_length_mono, resampler.destination.data(),
-        dst_capacity_mono);
-  }
-
-  absl::InlinedVector<T*, 8> destination_pointers;
-  for (auto& resampler : channel_resamplers_) {
-    destination_pointers.push_back(resampler.destination.data());
-  }
-
-  Interleave(destination_pointers.data(), dst_length_mono, num_channels_, dst);
-  return static_cast<int>(dst_length_mono * num_channels_);
-}
-
-// Explictly generate required instantiations.
-template class PushResampler<int16_t>;
-template class PushResampler<float>;
-
-}  // namespace webrtc
diff --git a/submodules/libtgvoip/webrtc_dsp/common_audio/resampler/push_sinc_resampler.cc b/submodules/libtgvoip/webrtc_dsp/common_audio/resampler/push_sinc_resampler.cc
deleted file mode 100644
index 3bfead26e7..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/common_audio/resampler/push_sinc_resampler.cc
+++ /dev/null
@@ -1,102 +0,0 @@
-/*
- *  Copyright (c) 2013 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#include "common_audio/resampler/push_sinc_resampler.h"
-
-#include <cstring>
-
-#include "common_audio/include/audio_util.h"
-#include "rtc_base/checks.h"
-
-namespace webrtc {
-
-PushSincResampler::PushSincResampler(size_t source_frames,
-                                     size_t destination_frames)
-    : resampler_(new SincResampler(source_frames * 1.0 / destination_frames,
-                                   source_frames,
-                                   this)),
-      source_ptr_(nullptr),
-      source_ptr_int_(nullptr),
-      destination_frames_(destination_frames),
-      first_pass_(true),
-      source_available_(0) {}
-
-PushSincResampler::~PushSincResampler() {}
-
-size_t PushSincResampler::Resample(const int16_t* source,
-                                   size_t source_length,
-                                   int16_t* destination,
-                                   size_t destination_capacity) {
-  if (!float_buffer_.get())
-    float_buffer_.reset(new float[destination_frames_]);
-
-  source_ptr_int_ = source;
-  // Pass nullptr as the float source to have Run() read from the int16 source.
-  Resample(nullptr, source_length, float_buffer_.get(), destination_frames_);
-  FloatS16ToS16(float_buffer_.get(), destination_frames_, destination);
-  source_ptr_int_ = nullptr;
-  return destination_frames_;
-}
-
-size_t PushSincResampler::Resample(const float* source,
-                                   size_t source_length,
-                                   float* destination,
-                                   size_t destination_capacity) {
-  RTC_CHECK_EQ(source_length, resampler_->request_frames());
-  RTC_CHECK_GE(destination_capacity, destination_frames_);
-  // Cache the source pointer. Calling Resample() will immediately trigger
-  // the Run() callback whereupon we provide the cached value.
-  source_ptr_ = source;
-  source_available_ = source_length;
-
-  // On the first pass, we call Resample() twice. During the first call, we
-  // provide dummy input and discard the output. This is done to prime the
-  // SincResampler buffer with the correct delay (half the kernel size), thereby
-  // ensuring that all later Resample() calls will only result in one input
-  // request through Run().
-  //
-  // If this wasn't done, SincResampler would call Run() twice on the first
-  // pass, and we'd have to introduce an entire |source_frames| of delay, rather
-  // than the minimum half kernel.
-  //
-  // It works out that ChunkSize() is exactly the amount of output we need to
-  // request in order to prime the buffer with a single Run() request for
-  // |source_frames|.
-  if (first_pass_)
-    resampler_->Resample(resampler_->ChunkSize(), destination);
-
-  resampler_->Resample(destination_frames_, destination);
-  source_ptr_ = nullptr;
-  return destination_frames_;
-}
-
-void PushSincResampler::Run(size_t frames, float* destination) {
-  // Ensure we are only asked for the available samples. This would fail if
-  // Run() was triggered more than once per Resample() call.
-  RTC_CHECK_EQ(source_available_, frames);
-
-  if (first_pass_) {
-    // Provide dummy input on the first pass, the output of which will be
-    // discarded, as described in Resample().
-    std::memset(destination, 0, frames * sizeof(*destination));
-    first_pass_ = false;
-    return;
-  }
-
-  if (source_ptr_) {
-    std::memcpy(destination, source_ptr_, frames * sizeof(*destination));
-  } else {
-    for (size_t i = 0; i < frames; ++i)
-      destination[i] = static_cast<float>(source_ptr_int_[i]);
-  }
-  source_available_ -= frames;
-}
-
-}  // namespace webrtc
diff --git a/submodules/libtgvoip/webrtc_dsp/common_audio/resampler/push_sinc_resampler.h b/submodules/libtgvoip/webrtc_dsp/common_audio/resampler/push_sinc_resampler.h
deleted file mode 100644
index db9cdc1fd4..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/common_audio/resampler/push_sinc_resampler.h
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- *  Copyright (c) 2013 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#ifndef COMMON_AUDIO_RESAMPLER_PUSH_SINC_RESAMPLER_H_
-#define COMMON_AUDIO_RESAMPLER_PUSH_SINC_RESAMPLER_H_
-
-#include <stddef.h>
-#include <stdint.h>
-#include <memory>
-
-#include "common_audio/resampler/sinc_resampler.h"
-#include "rtc_base/constructormagic.h"
-
-namespace webrtc {
-
-// A thin wrapper over SincResampler to provide a push-based interface as
-// required by WebRTC. SincResampler uses a pull-based interface, and will
-// use SincResamplerCallback::Run() to request data upon a call to Resample().
-// These Run() calls will happen on the same thread Resample() is called on.
-class PushSincResampler : public SincResamplerCallback {
- public:
-  // Provide the size of the source and destination blocks in samples. These
-  // must correspond to the same time duration (typically 10 ms) as the sample
-  // ratio is inferred from them.
-  PushSincResampler(size_t source_frames, size_t destination_frames);
-  ~PushSincResampler() override;
-
-  // Perform the resampling. |source_frames| must always equal the
-  // |source_frames| provided at construction. |destination_capacity| must be
-  // at least as large as |destination_frames|. Returns the number of samples
-  // provided in destination (for convenience, since this will always be equal
-  // to |destination_frames|).
-  size_t Resample(const int16_t* source,
-                  size_t source_frames,
-                  int16_t* destination,
-                  size_t destination_capacity);
-  size_t Resample(const float* source,
-                  size_t source_frames,
-                  float* destination,
-                  size_t destination_capacity);
-
-  // Delay due to the filter kernel. Essentially, the time after which an input
-  // sample will appear in the resampled output.
-  static float AlgorithmicDelaySeconds(int source_rate_hz) {
-    return 1.f / source_rate_hz * SincResampler::kKernelSize / 2;
-  }
-
- protected:
-  // Implements SincResamplerCallback.
-  void Run(size_t frames, float* destination) override;
-
- private:
-  friend class PushSincResamplerTest;
-  SincResampler* get_resampler_for_testing() { return resampler_.get(); }
-
-  std::unique_ptr<SincResampler> resampler_;
-  std::unique_ptr<float[]> float_buffer_;
-  const float* source_ptr_;
-  const int16_t* source_ptr_int_;
-  const size_t destination_frames_;
-
-  // True on the first call to Resample(), to prime the SincResampler buffer.
-  bool first_pass_;
-
-  // Used to assert we are only requested for as much data as is available.
-  size_t source_available_;
-
-  RTC_DISALLOW_COPY_AND_ASSIGN(PushSincResampler);
-};
-
-}  // namespace webrtc
-
-#endif  // COMMON_AUDIO_RESAMPLER_PUSH_SINC_RESAMPLER_H_
diff --git a/submodules/libtgvoip/webrtc_dsp/common_audio/resampler/resampler.cc b/submodules/libtgvoip/webrtc_dsp/common_audio/resampler/resampler.cc
deleted file mode 100644
index e4d2aa2b61..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/common_audio/resampler/resampler.cc
+++ /dev/null
@@ -1,923 +0,0 @@
-/*
- *  Copyright (c) 2011 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-/*
- * A wrapper for resampling a numerous amount of sampling combinations.
- */
-
-#include <stdint.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "common_audio/resampler/include/resampler.h"
-#include "common_audio/signal_processing/include/signal_processing_library.h"
-#include "rtc_base/logging.h"
-
-namespace webrtc {
-
-Resampler::Resampler()
-    : state1_(nullptr),
-      state2_(nullptr),
-      state3_(nullptr),
-      in_buffer_(nullptr),
-      out_buffer_(nullptr),
-      in_buffer_size_(0),
-      out_buffer_size_(0),
-      in_buffer_size_max_(0),
-      out_buffer_size_max_(0),
-      my_in_frequency_khz_(0),
-      my_out_frequency_khz_(0),
-      my_mode_(kResamplerMode1To1),
-      num_channels_(0),
-      slave_left_(nullptr),
-      slave_right_(nullptr) {}
-
-Resampler::Resampler(int inFreq, int outFreq, size_t num_channels)
-    : Resampler() {
-  Reset(inFreq, outFreq, num_channels);
-}
-
-Resampler::~Resampler() {
-  if (state1_) {
-    free(state1_);
-  }
-  if (state2_) {
-    free(state2_);
-  }
-  if (state3_) {
-    free(state3_);
-  }
-  if (in_buffer_) {
-    free(in_buffer_);
-  }
-  if (out_buffer_) {
-    free(out_buffer_);
-  }
-  if (slave_left_) {
-    delete slave_left_;
-  }
-  if (slave_right_) {
-    delete slave_right_;
-  }
-}
-
-int Resampler::ResetIfNeeded(int inFreq, int outFreq, size_t num_channels) {
-  int tmpInFreq_kHz = inFreq / 1000;
-  int tmpOutFreq_kHz = outFreq / 1000;
-
-  if ((tmpInFreq_kHz != my_in_frequency_khz_) ||
-      (tmpOutFreq_kHz != my_out_frequency_khz_) ||
-      (num_channels != num_channels_)) {
-    return Reset(inFreq, outFreq, num_channels);
-  } else {
-    return 0;
-  }
-}
-
-int Resampler::Reset(int inFreq, int outFreq, size_t num_channels) {
-  if (num_channels != 1 && num_channels != 2) {
-    RTC_LOG(LS_WARNING)
-        << "Reset() called with unsupported channel count, num_channels = "
-        << num_channels;
-    return -1;
-  }
-  ResamplerMode mode;
-  if (ComputeResamplerMode(inFreq, outFreq, &mode) != 0) {
-    RTC_LOG(LS_WARNING)
-        << "Reset() called with unsupported sample rates, inFreq = " << inFreq
-        << ", outFreq = " << outFreq;
-    return -1;
-  }
-  // Reinitialize internal state for the frequencies and sample rates.
-  num_channels_ = num_channels;
-  my_mode_ = mode;
-
-  if (state1_) {
-    free(state1_);
-    state1_ = nullptr;
-  }
-  if (state2_) {
-    free(state2_);
-    state2_ = nullptr;
-  }
-  if (state3_) {
-    free(state3_);
-    state3_ = nullptr;
-  }
-  if (in_buffer_) {
-    free(in_buffer_);
-    in_buffer_ = nullptr;
-  }
-  if (out_buffer_) {
-    free(out_buffer_);
-    out_buffer_ = nullptr;
-  }
-  if (slave_left_) {
-    delete slave_left_;
-    slave_left_ = nullptr;
-  }
-  if (slave_right_) {
-    delete slave_right_;
-    slave_right_ = nullptr;
-  }
-
-  in_buffer_size_ = 0;
-  out_buffer_size_ = 0;
-  in_buffer_size_max_ = 0;
-  out_buffer_size_max_ = 0;
-
-  // We need to track what domain we're in.
-  my_in_frequency_khz_ = inFreq / 1000;
-  my_out_frequency_khz_ = outFreq / 1000;
-
-  if (num_channels_ == 2) {
-    // Create two mono resamplers.
-    slave_left_ = new Resampler(inFreq, outFreq, 1);
-    slave_right_ = new Resampler(inFreq, outFreq, 1);
-  }
-
-  // Now create the states we need.
-  switch (my_mode_) {
-    case kResamplerMode1To1:
-      // No state needed;
-      break;
-    case kResamplerMode1To2:
-      state1_ = malloc(8 * sizeof(int32_t));
-      memset(state1_, 0, 8 * sizeof(int32_t));
-      break;
-    case kResamplerMode1To3:
-      state1_ = malloc(sizeof(WebRtcSpl_State16khzTo48khz));
-      WebRtcSpl_ResetResample16khzTo48khz(
-          static_cast<WebRtcSpl_State16khzTo48khz*>(state1_));
-      break;
-    case kResamplerMode1To4:
-      // 1:2
-      state1_ = malloc(8 * sizeof(int32_t));
-      memset(state1_, 0, 8 * sizeof(int32_t));
-      // 2:4
-      state2_ = malloc(8 * sizeof(int32_t));
-      memset(state2_, 0, 8 * sizeof(int32_t));
-      break;
-    case kResamplerMode1To6:
-      // 1:2
-      state1_ = malloc(8 * sizeof(int32_t));
-      memset(state1_, 0, 8 * sizeof(int32_t));
-      // 2:6
-      state2_ = malloc(sizeof(WebRtcSpl_State16khzTo48khz));
-      WebRtcSpl_ResetResample16khzTo48khz(
-          static_cast<WebRtcSpl_State16khzTo48khz*>(state2_));
-      break;
-    case kResamplerMode1To12:
-      // 1:2
-      state1_ = malloc(8 * sizeof(int32_t));
-      memset(state1_, 0, 8 * sizeof(int32_t));
-      // 2:4
-      state2_ = malloc(8 * sizeof(int32_t));
-      memset(state2_, 0, 8 * sizeof(int32_t));
-      // 4:12
-      state3_ = malloc(sizeof(WebRtcSpl_State16khzTo48khz));
-      WebRtcSpl_ResetResample16khzTo48khz(
-          static_cast<WebRtcSpl_State16khzTo48khz*>(state3_));
-      break;
-    case kResamplerMode2To3:
-      // 2:6
-      state1_ = malloc(sizeof(WebRtcSpl_State16khzTo48khz));
-      WebRtcSpl_ResetResample16khzTo48khz(
-          static_cast<WebRtcSpl_State16khzTo48khz*>(state1_));
-      // 6:3
-      state2_ = malloc(8 * sizeof(int32_t));
-      memset(state2_, 0, 8 * sizeof(int32_t));
-      break;
-    case kResamplerMode2To11:
-      state1_ = malloc(8 * sizeof(int32_t));
-      memset(state1_, 0, 8 * sizeof(int32_t));
-
-      state2_ = malloc(sizeof(WebRtcSpl_State8khzTo22khz));
-      WebRtcSpl_ResetResample8khzTo22khz(
-          static_cast<WebRtcSpl_State8khzTo22khz*>(state2_));
-      break;
-    case kResamplerMode4To11:
-      state1_ = malloc(sizeof(WebRtcSpl_State8khzTo22khz));
-      WebRtcSpl_ResetResample8khzTo22khz(
-          static_cast<WebRtcSpl_State8khzTo22khz*>(state1_));
-      break;
-    case kResamplerMode8To11:
-      state1_ = malloc(sizeof(WebRtcSpl_State16khzTo22khz));
-      WebRtcSpl_ResetResample16khzTo22khz(
-          static_cast<WebRtcSpl_State16khzTo22khz*>(state1_));
-      break;
-    case kResamplerMode11To16:
-      state1_ = malloc(8 * sizeof(int32_t));
-      memset(state1_, 0, 8 * sizeof(int32_t));
-
-      state2_ = malloc(sizeof(WebRtcSpl_State22khzTo16khz));
-      WebRtcSpl_ResetResample22khzTo16khz(
-          static_cast<WebRtcSpl_State22khzTo16khz*>(state2_));
-      break;
-    case kResamplerMode11To32:
-      // 11 -> 22
-      state1_ = malloc(8 * sizeof(int32_t));
-      memset(state1_, 0, 8 * sizeof(int32_t));
-
-      // 22 -> 16
-      state2_ = malloc(sizeof(WebRtcSpl_State22khzTo16khz));
-      WebRtcSpl_ResetResample22khzTo16khz(
-          static_cast<WebRtcSpl_State22khzTo16khz*>(state2_));
-
-      // 16 -> 32
-      state3_ = malloc(8 * sizeof(int32_t));
-      memset(state3_, 0, 8 * sizeof(int32_t));
-
-      break;
-    case kResamplerMode2To1:
-      state1_ = malloc(8 * sizeof(int32_t));
-      memset(state1_, 0, 8 * sizeof(int32_t));
-      break;
-    case kResamplerMode3To1:
-      state1_ = malloc(sizeof(WebRtcSpl_State48khzTo16khz));
-      WebRtcSpl_ResetResample48khzTo16khz(
-          static_cast<WebRtcSpl_State48khzTo16khz*>(state1_));
-      break;
-    case kResamplerMode4To1:
-      // 4:2
-      state1_ = malloc(8 * sizeof(int32_t));
-      memset(state1_, 0, 8 * sizeof(int32_t));
-      // 2:1
-      state2_ = malloc(8 * sizeof(int32_t));
-      memset(state2_, 0, 8 * sizeof(int32_t));
-      break;
-    case kResamplerMode6To1:
-      // 6:2
-      state1_ = malloc(sizeof(WebRtcSpl_State48khzTo16khz));
-      WebRtcSpl_ResetResample48khzTo16khz(
-          static_cast<WebRtcSpl_State48khzTo16khz*>(state1_));
-      // 2:1
-      state2_ = malloc(8 * sizeof(int32_t));
-      memset(state2_, 0, 8 * sizeof(int32_t));
-      break;
-    case kResamplerMode12To1:
-      // 12:4
-      state1_ = malloc(sizeof(WebRtcSpl_State48khzTo16khz));
-      WebRtcSpl_ResetResample48khzTo16khz(
-          static_cast<WebRtcSpl_State48khzTo16khz*>(state1_));
-      // 4:2
-      state2_ = malloc(8 * sizeof(int32_t));
-      memset(state2_, 0, 8 * sizeof(int32_t));
-      // 2:1
-      state3_ = malloc(8 * sizeof(int32_t));
-      memset(state3_, 0, 8 * sizeof(int32_t));
-      break;
-    case kResamplerMode3To2:
-      // 3:6
-      state1_ = malloc(8 * sizeof(int32_t));
-      memset(state1_, 0, 8 * sizeof(int32_t));
-      // 6:2
-      state2_ = malloc(sizeof(WebRtcSpl_State48khzTo16khz));
-      WebRtcSpl_ResetResample48khzTo16khz(
-          static_cast<WebRtcSpl_State48khzTo16khz*>(state2_));
-      break;
-    case kResamplerMode11To2:
-      state1_ = malloc(sizeof(WebRtcSpl_State22khzTo8khz));
-      WebRtcSpl_ResetResample22khzTo8khz(
-          static_cast<WebRtcSpl_State22khzTo8khz*>(state1_));
-
-      state2_ = malloc(8 * sizeof(int32_t));
-      memset(state2_, 0, 8 * sizeof(int32_t));
-
-      break;
-    case kResamplerMode11To4:
-      state1_ = malloc(sizeof(WebRtcSpl_State22khzTo8khz));
-      WebRtcSpl_ResetResample22khzTo8khz(
-          static_cast<WebRtcSpl_State22khzTo8khz*>(state1_));
-      break;
-    case kResamplerMode11To8:
-      state1_ = malloc(sizeof(WebRtcSpl_State22khzTo16khz));
-      WebRtcSpl_ResetResample22khzTo16khz(
-          static_cast<WebRtcSpl_State22khzTo16khz*>(state1_));
-      break;
-  }
-
-  return 0;
-}
-
-int Resampler::ComputeResamplerMode(int in_freq_hz,
-                                    int out_freq_hz,
-                                    ResamplerMode* mode) {
-  // Start with a math exercise, Euclid's algorithm to find the gcd:
-  int a = in_freq_hz;
-  int b = out_freq_hz;
-  int c = a % b;
-  while (c != 0) {
-    a = b;
-    b = c;
-    c = a % b;
-  }
-  // b is now the gcd;
-
-  // Scale with GCD
-  const int reduced_in_freq = in_freq_hz / b;
-  const int reduced_out_freq = out_freq_hz / b;
-
-  if (reduced_in_freq == reduced_out_freq) {
-    *mode = kResamplerMode1To1;
-  } else if (reduced_in_freq == 1) {
-    switch (reduced_out_freq) {
-      case 2:
-        *mode = kResamplerMode1To2;
-        break;
-      case 3:
-        *mode = kResamplerMode1To3;
-        break;
-      case 4:
-        *mode = kResamplerMode1To4;
-        break;
-      case 6:
-        *mode = kResamplerMode1To6;
-        break;
-      case 12:
-        *mode = kResamplerMode1To12;
-        break;
-      default:
-        return -1;
-    }
-  } else if (reduced_out_freq == 1) {
-    switch (reduced_in_freq) {
-      case 2:
-        *mode = kResamplerMode2To1;
-        break;
-      case 3:
-        *mode = kResamplerMode3To1;
-        break;
-      case 4:
-        *mode = kResamplerMode4To1;
-        break;
-      case 6:
-        *mode = kResamplerMode6To1;
-        break;
-      case 12:
-        *mode = kResamplerMode12To1;
-        break;
-      default:
-        return -1;
-    }
-  } else if ((reduced_in_freq == 2) && (reduced_out_freq == 3)) {
-    *mode = kResamplerMode2To3;
-  } else if ((reduced_in_freq == 2) && (reduced_out_freq == 11)) {
-    *mode = kResamplerMode2To11;
-  } else if ((reduced_in_freq == 4) && (reduced_out_freq == 11)) {
-    *mode = kResamplerMode4To11;
-  } else if ((reduced_in_freq == 8) && (reduced_out_freq == 11)) {
-    *mode = kResamplerMode8To11;
-  } else if ((reduced_in_freq == 3) && (reduced_out_freq == 2)) {
-    *mode = kResamplerMode3To2;
-  } else if ((reduced_in_freq == 11) && (reduced_out_freq == 2)) {
-    *mode = kResamplerMode11To2;
-  } else if ((reduced_in_freq == 11) && (reduced_out_freq == 4)) {
-    *mode = kResamplerMode11To4;
-  } else if ((reduced_in_freq == 11) && (reduced_out_freq == 16)) {
-    *mode = kResamplerMode11To16;
-  } else if ((reduced_in_freq == 11) && (reduced_out_freq == 32)) {
-    *mode = kResamplerMode11To32;
-  } else if ((reduced_in_freq == 11) && (reduced_out_freq == 8)) {
-    *mode = kResamplerMode11To8;
-  } else {
-    return -1;
-  }
-  return 0;
-}
-
-// Synchronous resampling, all output samples are written to samplesOut
-int Resampler::Push(const int16_t* samplesIn,
-                    size_t lengthIn,
-                    int16_t* samplesOut,
-                    size_t maxLen,
-                    size_t& outLen) {
-  if (num_channels_ == 2) {
-    // Split up the signal and call the slave object for each channel
-    int16_t* left =
-        static_cast<int16_t*>(malloc(lengthIn * sizeof(int16_t) / 2));
-    int16_t* right =
-        static_cast<int16_t*>(malloc(lengthIn * sizeof(int16_t) / 2));
-    int16_t* out_left =
-        static_cast<int16_t*>(malloc(maxLen / 2 * sizeof(int16_t)));
-    int16_t* out_right =
-        static_cast<int16_t*>(malloc(maxLen / 2 * sizeof(int16_t)));
-    int res = 0;
-    for (size_t i = 0; i < lengthIn; i += 2) {
-      left[i >> 1] = samplesIn[i];
-      right[i >> 1] = samplesIn[i + 1];
-    }
-
-    // It's OK to overwrite the local parameter, since it's just a copy
-    lengthIn = lengthIn / 2;
-
-    size_t actualOutLen_left = 0;
-    size_t actualOutLen_right = 0;
-    // Do resampling for right channel
-    res |= slave_left_->Push(left, lengthIn, out_left, maxLen / 2,
-                             actualOutLen_left);
-    res |= slave_right_->Push(right, lengthIn, out_right, maxLen / 2,
-                              actualOutLen_right);
-    if (res || (actualOutLen_left != actualOutLen_right)) {
-      free(left);
-      free(right);
-      free(out_left);
-      free(out_right);
-      return -1;
-    }
-
-    // Reassemble the signal
-    for (size_t i = 0; i < actualOutLen_left; i++) {
-      samplesOut[i * 2] = out_left[i];
-      samplesOut[i * 2 + 1] = out_right[i];
-    }
-    outLen = 2 * actualOutLen_left;
-
-    free(left);
-    free(right);
-    free(out_left);
-    free(out_right);
-
-    return 0;
-  }
-
-  // Containers for temp samples
-  int16_t* tmp;
-  int16_t* tmp_2;
-  // tmp data for resampling routines
-  int32_t* tmp_mem;
-
-  switch (my_mode_) {
-    case kResamplerMode1To1:
-      memcpy(samplesOut, samplesIn, lengthIn * sizeof(int16_t));
-      outLen = lengthIn;
-      break;
-    case kResamplerMode1To2:
-      if (maxLen < (lengthIn * 2)) {
-        return -1;
-      }
-      WebRtcSpl_UpsampleBy2(samplesIn, lengthIn, samplesOut,
-                            static_cast<int32_t*>(state1_));
-      outLen = lengthIn * 2;
-      return 0;
-    case kResamplerMode1To3:
-
-      // We can only handle blocks of 160 samples
-      // Can be fixed, but I don't think it's needed
-      if ((lengthIn % 160) != 0) {
-        return -1;
-      }
-      if (maxLen < (lengthIn * 3)) {
-        return -1;
-      }
-      tmp_mem = static_cast<int32_t*>(malloc(336 * sizeof(int32_t)));
-
-      for (size_t i = 0; i < lengthIn; i += 160) {
-        WebRtcSpl_Resample16khzTo48khz(
-            samplesIn + i, samplesOut + i * 3,
-            static_cast<WebRtcSpl_State16khzTo48khz*>(state1_), tmp_mem);
-      }
-      outLen = lengthIn * 3;
-      free(tmp_mem);
-      return 0;
-    case kResamplerMode1To4:
-      if (maxLen < (lengthIn * 4)) {
-        return -1;
-      }
-
-      tmp = static_cast<int16_t*>(malloc(sizeof(int16_t) * 2 * lengthIn));
-      // 1:2
-      WebRtcSpl_UpsampleBy2(samplesIn, lengthIn, tmp,
-                            static_cast<int32_t*>(state1_));
-      // 2:4
-      WebRtcSpl_UpsampleBy2(tmp, lengthIn * 2, samplesOut,
-                            static_cast<int32_t*>(state2_));
-      outLen = lengthIn * 4;
-      free(tmp);
-      return 0;
-    case kResamplerMode1To6:
-      // We can only handle blocks of 80 samples
-      // Can be fixed, but I don't think it's needed
-      if ((lengthIn % 80) != 0) {
-        return -1;
-      }
-      if (maxLen < (lengthIn * 6)) {
-        return -1;
-      }
-
-      // 1:2
-
-      tmp_mem = static_cast<int32_t*>(malloc(336 * sizeof(int32_t)));
-      tmp = static_cast<int16_t*>(malloc(sizeof(int16_t) * 2 * lengthIn));
-
-      WebRtcSpl_UpsampleBy2(samplesIn, lengthIn, tmp,
-                            static_cast<int32_t*>(state1_));
-      outLen = lengthIn * 2;
-
-      for (size_t i = 0; i < outLen; i += 160) {
-        WebRtcSpl_Resample16khzTo48khz(
-            tmp + i, samplesOut + i * 3,
-            static_cast<WebRtcSpl_State16khzTo48khz*>(state2_), tmp_mem);
-      }
-      outLen = outLen * 3;
-      free(tmp_mem);
-      free(tmp);
-
-      return 0;
-    case kResamplerMode1To12:
-      // We can only handle blocks of 40 samples
-      // Can be fixed, but I don't think it's needed
-      if ((lengthIn % 40) != 0) {
-        return -1;
-      }
-      if (maxLen < (lengthIn * 12)) {
-        return -1;
-      }
-
-      tmp_mem = static_cast<int32_t*>(malloc(336 * sizeof(int32_t)));
-      tmp = static_cast<int16_t*>(malloc(sizeof(int16_t) * 4 * lengthIn));
-      // 1:2
-      WebRtcSpl_UpsampleBy2(samplesIn, lengthIn, samplesOut,
-                            static_cast<int32_t*>(state1_));
-      outLen = lengthIn * 2;
-      // 2:4
-      WebRtcSpl_UpsampleBy2(samplesOut, outLen, tmp,
-                            static_cast<int32_t*>(state2_));
-      outLen = outLen * 2;
-      // 4:12
-      for (size_t i = 0; i < outLen; i += 160) {
-        // WebRtcSpl_Resample16khzTo48khz() takes a block of 160 samples
-        // as input and outputs a resampled block of 480 samples. The
-        // data is now actually in 32 kHz sampling rate, despite the
-        // function name, and with a resampling factor of three becomes
-        // 96 kHz.
-        WebRtcSpl_Resample16khzTo48khz(
-            tmp + i, samplesOut + i * 3,
-            static_cast<WebRtcSpl_State16khzTo48khz*>(state3_), tmp_mem);
-      }
-      outLen = outLen * 3;
-      free(tmp_mem);
-      free(tmp);
-
-      return 0;
-    case kResamplerMode2To3:
-      if (maxLen < (lengthIn * 3 / 2)) {
-        return -1;
-      }
-      // 2:6
-      // We can only handle blocks of 160 samples
-      // Can be fixed, but I don't think it's needed
-      if ((lengthIn % 160) != 0) {
-        return -1;
-      }
-      tmp = static_cast<int16_t*>(malloc(sizeof(int16_t) * lengthIn * 3));
-      tmp_mem = static_cast<int32_t*>(malloc(336 * sizeof(int32_t)));
-      for (size_t i = 0; i < lengthIn; i += 160) {
-        WebRtcSpl_Resample16khzTo48khz(
-            samplesIn + i, tmp + i * 3,
-            static_cast<WebRtcSpl_State16khzTo48khz*>(state1_), tmp_mem);
-      }
-      lengthIn = lengthIn * 3;
-      // 6:3
-      WebRtcSpl_DownsampleBy2(tmp, lengthIn, samplesOut,
-                              static_cast<int32_t*>(state2_));
-      outLen = lengthIn / 2;
-      free(tmp);
-      free(tmp_mem);
-      return 0;
-    case kResamplerMode2To11:
-
-      // We can only handle blocks of 80 samples
-      // Can be fixed, but I don't think it's needed
-      if ((lengthIn % 80) != 0) {
-        return -1;
-      }
-      if (maxLen < ((lengthIn * 11) / 2)) {
-        return -1;
-      }
-      tmp = static_cast<int16_t*>(malloc(sizeof(int16_t) * 2 * lengthIn));
-      // 1:2
-      WebRtcSpl_UpsampleBy2(samplesIn, lengthIn, tmp,
-                            static_cast<int32_t*>(state1_));
-      lengthIn *= 2;
-
-      tmp_mem = static_cast<int32_t*>(malloc(98 * sizeof(int32_t)));
-
-      for (size_t i = 0; i < lengthIn; i += 80) {
-        WebRtcSpl_Resample8khzTo22khz(
-            tmp + i, samplesOut + (i * 11) / 4,
-            static_cast<WebRtcSpl_State8khzTo22khz*>(state2_), tmp_mem);
-      }
-      outLen = (lengthIn * 11) / 4;
-      free(tmp_mem);
-      free(tmp);
-      return 0;
-    case kResamplerMode4To11:
-
-      // We can only handle blocks of 80 samples
-      // Can be fixed, but I don't think it's needed
-      if ((lengthIn % 80) != 0) {
-        return -1;
-      }
-      if (maxLen < ((lengthIn * 11) / 4)) {
-        return -1;
-      }
-      tmp_mem = static_cast<int32_t*>(malloc(98 * sizeof(int32_t)));
-
-      for (size_t i = 0; i < lengthIn; i += 80) {
-        WebRtcSpl_Resample8khzTo22khz(
-            samplesIn + i, samplesOut + (i * 11) / 4,
-            static_cast<WebRtcSpl_State8khzTo22khz*>(state1_), tmp_mem);
-      }
-      outLen = (lengthIn * 11) / 4;
-      free(tmp_mem);
-      return 0;
-    case kResamplerMode8To11:
-      // We can only handle blocks of 160 samples
-      // Can be fixed, but I don't think it's needed
-      if ((lengthIn % 160) != 0) {
-        return -1;
-      }
-      if (maxLen < ((lengthIn * 11) / 8)) {
-        return -1;
-      }
-      tmp_mem = static_cast<int32_t*>(malloc(88 * sizeof(int32_t)));
-
-      for (size_t i = 0; i < lengthIn; i += 160) {
-        WebRtcSpl_Resample16khzTo22khz(
-            samplesIn + i, samplesOut + (i * 11) / 8,
-            static_cast<WebRtcSpl_State16khzTo22khz*>(state1_), tmp_mem);
-      }
-      outLen = (lengthIn * 11) / 8;
-      free(tmp_mem);
-      return 0;
-
-    case kResamplerMode11To16:
-      // We can only handle blocks of 110 samples
-      if ((lengthIn % 110) != 0) {
-        return -1;
-      }
-      if (maxLen < ((lengthIn * 16) / 11)) {
-        return -1;
-      }
-
-      tmp_mem = static_cast<int32_t*>(malloc(104 * sizeof(int32_t)));
-      tmp = static_cast<int16_t*>(malloc((sizeof(int16_t) * lengthIn * 2)));
-
-      WebRtcSpl_UpsampleBy2(samplesIn, lengthIn, tmp,
-                            static_cast<int32_t*>(state1_));
-
-      for (size_t i = 0; i < (lengthIn * 2); i += 220) {
-        WebRtcSpl_Resample22khzTo16khz(
-            tmp + i, samplesOut + (i / 220) * 160,
-            static_cast<WebRtcSpl_State22khzTo16khz*>(state2_), tmp_mem);
-      }
-
-      outLen = (lengthIn * 16) / 11;
-
-      free(tmp_mem);
-      free(tmp);
-      return 0;
-
-    case kResamplerMode11To32:
-
-      // We can only handle blocks of 110 samples
-      if ((lengthIn % 110) != 0) {
-        return -1;
-      }
-      if (maxLen < ((lengthIn * 32) / 11)) {
-        return -1;
-      }
-
-      tmp_mem = static_cast<int32_t*>(malloc(104 * sizeof(int32_t)));
-      tmp = static_cast<int16_t*>(malloc((sizeof(int16_t) * lengthIn * 2)));
-
-      // 11 -> 22 kHz in samplesOut
-      WebRtcSpl_UpsampleBy2(samplesIn, lengthIn, samplesOut,
-                            static_cast<int32_t*>(state1_));
-
-      // 22 -> 16 in tmp
-      for (size_t i = 0; i < (lengthIn * 2); i += 220) {
-        WebRtcSpl_Resample22khzTo16khz(
-            samplesOut + i, tmp + (i / 220) * 160,
-            static_cast<WebRtcSpl_State22khzTo16khz*>(state2_), tmp_mem);
-      }
-
-      // 16 -> 32 in samplesOut
-      WebRtcSpl_UpsampleBy2(tmp, (lengthIn * 16) / 11, samplesOut,
-                            static_cast<int32_t*>(state3_));
-
-      outLen = (lengthIn * 32) / 11;
-
-      free(tmp_mem);
-      free(tmp);
-      return 0;
-
-    case kResamplerMode2To1:
-      if (maxLen < (lengthIn / 2)) {
-        return -1;
-      }
-      WebRtcSpl_DownsampleBy2(samplesIn, lengthIn, samplesOut,
-                              static_cast<int32_t*>(state1_));
-      outLen = lengthIn / 2;
-      return 0;
-    case kResamplerMode3To1:
-      // We can only handle blocks of 480 samples
-      // Can be fixed, but I don't think it's needed
-      if ((lengthIn % 480) != 0) {
-        return -1;
-      }
-      if (maxLen < (lengthIn / 3)) {
-        return -1;
-      }
-      tmp_mem = static_cast<int32_t*>(malloc(496 * sizeof(int32_t)));
-
-      for (size_t i = 0; i < lengthIn; i += 480) {
-        WebRtcSpl_Resample48khzTo16khz(
-            samplesIn + i, samplesOut + i / 3,
-            static_cast<WebRtcSpl_State48khzTo16khz*>(state1_), tmp_mem);
-      }
-      outLen = lengthIn / 3;
-      free(tmp_mem);
-      return 0;
-    case kResamplerMode4To1:
-      if (maxLen < (lengthIn / 4)) {
-        return -1;
-      }
-      tmp = static_cast<int16_t*>(malloc(sizeof(int16_t) * lengthIn / 2));
-      // 4:2
-      WebRtcSpl_DownsampleBy2(samplesIn, lengthIn, tmp,
-                              static_cast<int32_t*>(state1_));
-      // 2:1
-      WebRtcSpl_DownsampleBy2(tmp, lengthIn / 2, samplesOut,
-                              static_cast<int32_t*>(state2_));
-      outLen = lengthIn / 4;
-      free(tmp);
-      return 0;
-
-    case kResamplerMode6To1:
-      // We can only handle blocks of 480 samples
-      // Can be fixed, but I don't think it's needed
-      if ((lengthIn % 480) != 0) {
-        return -1;
-      }
-      if (maxLen < (lengthIn / 6)) {
-        return -1;
-      }
-
-      tmp_mem = static_cast<int32_t*>(malloc(496 * sizeof(int32_t)));
-      tmp = static_cast<int16_t*>(malloc((sizeof(int16_t) * lengthIn) / 3));
-
-      for (size_t i = 0; i < lengthIn; i += 480) {
-        WebRtcSpl_Resample48khzTo16khz(
-            samplesIn + i, tmp + i / 3,
-            static_cast<WebRtcSpl_State48khzTo16khz*>(state1_), tmp_mem);
-      }
-      outLen = lengthIn / 3;
-      free(tmp_mem);
-      WebRtcSpl_DownsampleBy2(tmp, outLen, samplesOut,
-                              static_cast<int32_t*>(state2_));
-      free(tmp);
-      outLen = outLen / 2;
-      return 0;
-    case kResamplerMode12To1:
-      // We can only handle blocks of 480 samples
-      // Can be fixed, but I don't think it's needed
-      if ((lengthIn % 480) != 0) {
-        return -1;
-      }
-      if (maxLen < (lengthIn / 12)) {
-        return -1;
-      }
-
-      tmp_mem = static_cast<int32_t*>(malloc(496 * sizeof(int32_t)));
-      tmp = static_cast<int16_t*>(malloc((sizeof(int16_t) * lengthIn) / 3));
-      tmp_2 = static_cast<int16_t*>(malloc((sizeof(int16_t) * lengthIn) / 6));
-      // 12:4
-      for (size_t i = 0; i < lengthIn; i += 480) {
-        // WebRtcSpl_Resample48khzTo16khz() takes a block of 480 samples
-        // as input and outputs a resampled block of 160 samples. The
-        // data is now actually in 96 kHz sampling rate, despite the
-        // function name, and with a resampling factor of 1/3 becomes
-        // 32 kHz.
-        WebRtcSpl_Resample48khzTo16khz(
-            samplesIn + i, tmp + i / 3,
-            static_cast<WebRtcSpl_State48khzTo16khz*>(state1_), tmp_mem);
-      }
-      outLen = lengthIn / 3;
-      free(tmp_mem);
-      // 4:2
-      WebRtcSpl_DownsampleBy2(tmp, outLen, tmp_2,
-                              static_cast<int32_t*>(state2_));
-      outLen = outLen / 2;
-      free(tmp);
-      // 2:1
-      WebRtcSpl_DownsampleBy2(tmp_2, outLen, samplesOut,
-                              static_cast<int32_t*>(state3_));
-      free(tmp_2);
-      outLen = outLen / 2;
-      return 0;
-    case kResamplerMode3To2:
-      if (maxLen < (lengthIn * 2 / 3)) {
-        return -1;
-      }
-      // 3:6
-      tmp = static_cast<int16_t*>(malloc(sizeof(int16_t) * lengthIn * 2));
-      WebRtcSpl_UpsampleBy2(samplesIn, lengthIn, tmp,
-                            static_cast<int32_t*>(state1_));
-      lengthIn *= 2;
-      // 6:2
-      // We can only handle blocks of 480 samples
-      // Can be fixed, but I don't think it's needed
-      if ((lengthIn % 480) != 0) {
-        free(tmp);
-        return -1;
-      }
-      tmp_mem = static_cast<int32_t*>(malloc(496 * sizeof(int32_t)));
-      for (size_t i = 0; i < lengthIn; i += 480) {
-        WebRtcSpl_Resample48khzTo16khz(
-            tmp + i, samplesOut + i / 3,
-            static_cast<WebRtcSpl_State48khzTo16khz*>(state2_), tmp_mem);
-      }
-      outLen = lengthIn / 3;
-      free(tmp);
-      free(tmp_mem);
-      return 0;
-    case kResamplerMode11To2:
-      // We can only handle blocks of 220 samples
-      // Can be fixed, but I don't think it's needed
-      if ((lengthIn % 220) != 0) {
-        return -1;
-      }
-      if (maxLen < ((lengthIn * 2) / 11)) {
-        return -1;
-      }
-      tmp_mem = static_cast<int32_t*>(malloc(126 * sizeof(int32_t)));
-      tmp =
-          static_cast<int16_t*>(malloc((lengthIn * 4) / 11 * sizeof(int16_t)));
-
-      for (size_t i = 0; i < lengthIn; i += 220) {
-        WebRtcSpl_Resample22khzTo8khz(
-            samplesIn + i, tmp + (i * 4) / 11,
-            static_cast<WebRtcSpl_State22khzTo8khz*>(state1_), tmp_mem);
-      }
-      lengthIn = (lengthIn * 4) / 11;
-
-      WebRtcSpl_DownsampleBy2(tmp, lengthIn, samplesOut,
-                              static_cast<int32_t*>(state2_));
-      outLen = lengthIn / 2;
-
-      free(tmp_mem);
-      free(tmp);
-      return 0;
-    case kResamplerMode11To4:
-      // We can only handle blocks of 220 samples
-      // Can be fixed, but I don't think it's needed
-      if ((lengthIn % 220) != 0) {
-        return -1;
-      }
-      if (maxLen < ((lengthIn * 4) / 11)) {
-        return -1;
-      }
-      tmp_mem = static_cast<int32_t*>(malloc(126 * sizeof(int32_t)));
-
-      for (size_t i = 0; i < lengthIn; i += 220) {
-        WebRtcSpl_Resample22khzTo8khz(
-            samplesIn + i, samplesOut + (i * 4) / 11,
-            static_cast<WebRtcSpl_State22khzTo8khz*>(state1_), tmp_mem);
-      }
-      outLen = (lengthIn * 4) / 11;
-      free(tmp_mem);
-      return 0;
-    case kResamplerMode11To8:
-      // We can only handle blocks of 160 samples
-      // Can be fixed, but I don't think it's needed
-      if ((lengthIn % 220) != 0) {
-        return -1;
-      }
-      if (maxLen < ((lengthIn * 8) / 11)) {
-        return -1;
-      }
-      tmp_mem = static_cast<int32_t*>(malloc(104 * sizeof(int32_t)));
-
-      for (size_t i = 0; i < lengthIn; i += 220) {
-        WebRtcSpl_Resample22khzTo16khz(
-            samplesIn + i, samplesOut + (i * 8) / 11,
-            static_cast<WebRtcSpl_State22khzTo16khz*>(state1_), tmp_mem);
-      }
-      outLen = (lengthIn * 8) / 11;
-      free(tmp_mem);
-      return 0;
-      break;
-  }
-  return 0;
-}
-
-}  // namespace webrtc
diff --git a/submodules/libtgvoip/webrtc_dsp/common_audio/resampler/sinc_resampler.cc b/submodules/libtgvoip/webrtc_dsp/common_audio/resampler/sinc_resampler.cc
deleted file mode 100644
index 4601514030..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/common_audio/resampler/sinc_resampler.cc
+++ /dev/null
@@ -1,375 +0,0 @@
-/*
- *  Copyright (c) 2013 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-// Modified from the Chromium original:
-// src/media/base/sinc_resampler.cc
-
-// Initial input buffer layout, dividing into regions r0_ to r4_ (note: r0_, r3_
-// and r4_ will move after the first load):
-//
-// |----------------|-----------------------------------------|----------------|
-//
-//                                        request_frames_
-//                   <--------------------------------------------------------->
-//                                    r0_ (during first load)
-//
-//  kKernelSize / 2   kKernelSize / 2         kKernelSize / 2   kKernelSize / 2
-// <---------------> <--------------->       <---------------> <--------------->
-//        r1_               r2_                     r3_               r4_
-//
-//                             block_size_ == r4_ - r2_
-//                   <--------------------------------------->
-//
-//                                                  request_frames_
-//                                    <------------------ ... ----------------->
-//                                               r0_ (during second load)
-//
-// On the second request r0_ slides to the right by kKernelSize / 2 and r3_, r4_
-// and block_size_ are reinitialized via step (3) in the algorithm below.
-//
-// These new regions remain constant until a Flush() occurs.  While complicated,
-// this allows us to reduce jitter by always requesting the same amount from the
-// provided callback.
-//
-// The algorithm:
-//
-// 1) Allocate input_buffer of size: request_frames_ + kKernelSize; this ensures
-//    there's enough room to read request_frames_ from the callback into region
-//    r0_ (which will move between the first and subsequent passes).
-//
-// 2) Let r1_, r2_ each represent half the kernel centered around r0_:
-//
-//        r0_ = input_buffer_ + kKernelSize / 2
-//        r1_ = input_buffer_
-//        r2_ = r0_
-//
-//    r0_ is always request_frames_ in size.  r1_, r2_ are kKernelSize / 2 in
-//    size.  r1_ must be zero initialized to avoid convolution with garbage (see
-//    step (5) for why).
-//
-// 3) Let r3_, r4_ each represent half the kernel right aligned with the end of
-//    r0_ and choose block_size_ as the distance in frames between r4_ and r2_:
-//
-//        r3_ = r0_ + request_frames_ - kKernelSize
-//        r4_ = r0_ + request_frames_ - kKernelSize / 2
-//        block_size_ = r4_ - r2_ = request_frames_ - kKernelSize / 2
-//
-// 4) Consume request_frames_ frames into r0_.
-//
-// 5) Position kernel centered at start of r2_ and generate output frames until
-//    the kernel is centered at the start of r4_ or we've finished generating
-//    all the output frames.
-//
-// 6) Wrap left over data from the r3_ to r1_ and r4_ to r2_.
-//
-// 7) If we're on the second load, in order to avoid overwriting the frames we
-//    just wrapped from r4_ we need to slide r0_ to the right by the size of
-//    r4_, which is kKernelSize / 2:
-//
-//        r0_ = r0_ + kKernelSize / 2 = input_buffer_ + kKernelSize
-//
-//    r3_, r4_, and block_size_ then need to be reinitialized, so goto (3).
-//
-// 8) Else, if we're not on the second load, goto (4).
-//
-// Note: we're glossing over how the sub-sample handling works with
-// |virtual_source_idx_|, etc.
-
-// MSVC++ requires this to be set before any other includes to get M_PI.
-#define _USE_MATH_DEFINES
-
-#include "common_audio/resampler/sinc_resampler.h"
-
-#include <math.h>
-#include <stdint.h>
-#include <string.h>
-#include <limits>
-
-#include "rtc_base/checks.h"
-#include "rtc_base/system/arch.h"
-#include "system_wrappers/include/cpu_features_wrapper.h"  // kSSE2, WebRtc_G...
-
-namespace webrtc {
-
-namespace {
-
-double SincScaleFactor(double io_ratio) {
-  // |sinc_scale_factor| is basically the normalized cutoff frequency of the
-  // low-pass filter.
-  double sinc_scale_factor = io_ratio > 1.0 ? 1.0 / io_ratio : 1.0;
-
-  // The sinc function is an idealized brick-wall filter, but since we're
-  // windowing it the transition from pass to stop does not happen right away.
-  // So we should adjust the low pass filter cutoff slightly downward to avoid
-  // some aliasing at the very high-end.
-  // TODO(crogers): this value is empirical and to be more exact should vary
-  // depending on kKernelSize.
-  sinc_scale_factor *= 0.9;
-
-  return sinc_scale_factor;
-}
-
-}  // namespace
-
-const size_t SincResampler::kKernelSize;
-
-// If we know the minimum architecture at compile time, avoid CPU detection.
-#if defined(WEBRTC_ARCH_X86_FAMILY)
-#if defined(__SSE2__)
-#define CONVOLVE_FUNC Convolve_SSE
-void SincResampler::InitializeCPUSpecificFeatures() {}
-#else
-// x86 CPU detection required.  Function will be set by
-// InitializeCPUSpecificFeatures().
-// TODO(dalecurtis): Once Chrome moves to an SSE baseline this can be removed.
-#define CONVOLVE_FUNC convolve_proc_
-
-void SincResampler::InitializeCPUSpecificFeatures() {
-  convolve_proc_ = WebRtc_GetCPUInfo(kSSE2) ? Convolve_SSE : Convolve_C;
-}
-#endif
-#elif defined(WEBRTC_HAS_NEON)
-#define CONVOLVE_FUNC Convolve_NEON
-void SincResampler::InitializeCPUSpecificFeatures() {}
-#else
-// Unknown architecture.
-#define CONVOLVE_FUNC Convolve_C
-void SincResampler::InitializeCPUSpecificFeatures() {}
-#endif
-
-SincResampler::SincResampler(double io_sample_rate_ratio,
-                             size_t request_frames,
-                             SincResamplerCallback* read_cb)
-    : io_sample_rate_ratio_(io_sample_rate_ratio),
-      read_cb_(read_cb),
-      request_frames_(request_frames),
-      input_buffer_size_(request_frames_ + kKernelSize),
-      // Create input buffers with a 16-byte alignment for SSE optimizations.
-      kernel_storage_(static_cast<float*>(
-          AlignedMalloc(sizeof(float) * kKernelStorageSize, 16))),
-      kernel_pre_sinc_storage_(static_cast<float*>(
-          AlignedMalloc(sizeof(float) * kKernelStorageSize, 16))),
-      kernel_window_storage_(static_cast<float*>(
-          AlignedMalloc(sizeof(float) * kKernelStorageSize, 16))),
-      input_buffer_(static_cast<float*>(
-          AlignedMalloc(sizeof(float) * input_buffer_size_, 16))),
-#if defined(WEBRTC_ARCH_X86_FAMILY) && !defined(__SSE2__)
-      convolve_proc_(nullptr),
-#endif
-      r1_(input_buffer_.get()),
-      r2_(input_buffer_.get() + kKernelSize / 2) {
-#if defined(WEBRTC_ARCH_X86_FAMILY) && !defined(__SSE2__)
-  InitializeCPUSpecificFeatures();
-  RTC_DCHECK(convolve_proc_);
-#endif
-  RTC_DCHECK_GT(request_frames_, 0);
-  Flush();
-  RTC_DCHECK_GT(block_size_, kKernelSize);
-
-  memset(kernel_storage_.get(), 0,
-         sizeof(*kernel_storage_.get()) * kKernelStorageSize);
-  memset(kernel_pre_sinc_storage_.get(), 0,
-         sizeof(*kernel_pre_sinc_storage_.get()) * kKernelStorageSize);
-  memset(kernel_window_storage_.get(), 0,
-         sizeof(*kernel_window_storage_.get()) * kKernelStorageSize);
-
-  InitializeKernel();
-}
-
-SincResampler::~SincResampler() {}
-
-void SincResampler::UpdateRegions(bool second_load) {
-  // Setup various region pointers in the buffer (see diagram above).  If we're
-  // on the second load we need to slide r0_ to the right by kKernelSize / 2.
-  r0_ = input_buffer_.get() + (second_load ? kKernelSize : kKernelSize / 2);
-  r3_ = r0_ + request_frames_ - kKernelSize;
-  r4_ = r0_ + request_frames_ - kKernelSize / 2;
-  block_size_ = r4_ - r2_;
-
-  // r1_ at the beginning of the buffer.
-  RTC_DCHECK_EQ(r1_, input_buffer_.get());
-  // r1_ left of r2_, r4_ left of r3_ and size correct.
-  RTC_DCHECK_EQ(r2_ - r1_, r4_ - r3_);
-  // r2_ left of r3.
-  RTC_DCHECK_LT(r2_, r3_);
-}
-
-void SincResampler::InitializeKernel() {
-  // Blackman window parameters.
-  static const double kAlpha = 0.16;
-  static const double kA0 = 0.5 * (1.0 - kAlpha);
-  static const double kA1 = 0.5;
-  static const double kA2 = 0.5 * kAlpha;
-
-  // Generates a set of windowed sinc() kernels.
-  // We generate a range of sub-sample offsets from 0.0 to 1.0.
-  const double sinc_scale_factor = SincScaleFactor(io_sample_rate_ratio_);
-  for (size_t offset_idx = 0; offset_idx <= kKernelOffsetCount; ++offset_idx) {
-    const float subsample_offset =
-        static_cast<float>(offset_idx) / kKernelOffsetCount;
-
-    for (size_t i = 0; i < kKernelSize; ++i) {
-      const size_t idx = i + offset_idx * kKernelSize;
-      const float pre_sinc = static_cast<float>(
-          M_PI * (static_cast<int>(i) - static_cast<int>(kKernelSize / 2) -
-                  subsample_offset));
-      kernel_pre_sinc_storage_[idx] = pre_sinc;
-
-      // Compute Blackman window, matching the offset of the sinc().
-      const float x = (i - subsample_offset) / kKernelSize;
-      const float window = static_cast<float>(kA0 - kA1 * cos(2.0 * M_PI * x) +
-                                              kA2 * cos(4.0 * M_PI * x));
-      kernel_window_storage_[idx] = window;
-
-      // Compute the sinc with offset, then window the sinc() function and store
-      // at the correct offset.
-      kernel_storage_[idx] = static_cast<float>(
-          window * ((pre_sinc == 0)
-                        ? sinc_scale_factor
-                        : (sin(sinc_scale_factor * pre_sinc) / pre_sinc)));
-    }
-  }
-}
-
-void SincResampler::SetRatio(double io_sample_rate_ratio) {
-  if (fabs(io_sample_rate_ratio_ - io_sample_rate_ratio) <
-      std::numeric_limits<double>::epsilon()) {
-    return;
-  }
-
-  io_sample_rate_ratio_ = io_sample_rate_ratio;
-
-  // Optimize reinitialization by reusing values which are independent of
-  // |sinc_scale_factor|.  Provides a 3x speedup.
-  const double sinc_scale_factor = SincScaleFactor(io_sample_rate_ratio_);
-  for (size_t offset_idx = 0; offset_idx <= kKernelOffsetCount; ++offset_idx) {
-    for (size_t i = 0; i < kKernelSize; ++i) {
-      const size_t idx = i + offset_idx * kKernelSize;
-      const float window = kernel_window_storage_[idx];
-      const float pre_sinc = kernel_pre_sinc_storage_[idx];
-
-      kernel_storage_[idx] = static_cast<float>(
-          window * ((pre_sinc == 0)
-                        ? sinc_scale_factor
-                        : (sin(sinc_scale_factor * pre_sinc) / pre_sinc)));
-    }
-  }
-}
-
-void SincResampler::Resample(size_t frames, float* destination) {
-  size_t remaining_frames = frames;
-
-  // Step (1) -- Prime the input buffer at the start of the input stream.
-  if (!buffer_primed_ && remaining_frames) {
-    read_cb_->Run(request_frames_, r0_);
-    buffer_primed_ = true;
-  }
-
-  // Step (2) -- Resample!  const what we can outside of the loop for speed.  It
-  // actually has an impact on ARM performance.  See inner loop comment below.
-  const double current_io_ratio = io_sample_rate_ratio_;
-  const float* const kernel_ptr = kernel_storage_.get();
-  while (remaining_frames) {
-    // |i| may be negative if the last Resample() call ended on an iteration
-    // that put |virtual_source_idx_| over the limit.
-    //
-    // Note: The loop construct here can severely impact performance on ARM
-    // or when built with clang.  See https://codereview.chromium.org/18566009/
-    for (int i = static_cast<int>(
-             ceil((block_size_ - virtual_source_idx_) / current_io_ratio));
-         i > 0; --i) {
-      RTC_DCHECK_LT(virtual_source_idx_, block_size_);
-
-      // |virtual_source_idx_| lies in between two kernel offsets so figure out
-      // what they are.
-      const int source_idx = static_cast<int>(virtual_source_idx_);
-      const double subsample_remainder = virtual_source_idx_ - source_idx;
-
-      const double virtual_offset_idx =
-          subsample_remainder * kKernelOffsetCount;
-      const int offset_idx = static_cast<int>(virtual_offset_idx);
-
-      // We'll compute "convolutions" for the two kernels which straddle
-      // |virtual_source_idx_|.
-      const float* const k1 = kernel_ptr + offset_idx * kKernelSize;
-      const float* const k2 = k1 + kKernelSize;
-
-      // Ensure |k1|, |k2| are 16-byte aligned for SIMD usage.  Should always be
-      // true so long as kKernelSize is a multiple of 16.
-      RTC_DCHECK_EQ(0, reinterpret_cast<uintptr_t>(k1) % 16);
-      RTC_DCHECK_EQ(0, reinterpret_cast<uintptr_t>(k2) % 16);
-
-      // Initialize input pointer based on quantized |virtual_source_idx_|.
-      const float* const input_ptr = r1_ + source_idx;
-
-      // Figure out how much to weight each kernel's "convolution".
-      const double kernel_interpolation_factor =
-          virtual_offset_idx - offset_idx;
-      *destination++ =
-          CONVOLVE_FUNC(input_ptr, k1, k2, kernel_interpolation_factor);
-
-      // Advance the virtual index.
-      virtual_source_idx_ += current_io_ratio;
-
-      if (!--remaining_frames)
-        return;
-    }
-
-    // Wrap back around to the start.
-    virtual_source_idx_ -= block_size_;
-
-    // Step (3) -- Copy r3_, r4_ to r1_, r2_.
-    // This wraps the last input frames back to the start of the buffer.
-    memcpy(r1_, r3_, sizeof(*input_buffer_.get()) * kKernelSize);
-
-    // Step (4) -- Reinitialize regions if necessary.
-    if (r0_ == r2_)
-      UpdateRegions(true);
-
-    // Step (5) -- Refresh the buffer with more input.
-    read_cb_->Run(request_frames_, r0_);
-  }
-}
-
-#undef CONVOLVE_FUNC
-
-size_t SincResampler::ChunkSize() const {
-  return static_cast<size_t>(block_size_ / io_sample_rate_ratio_);
-}
-
-void SincResampler::Flush() {
-  virtual_source_idx_ = 0;
-  buffer_primed_ = false;
-  memset(input_buffer_.get(), 0,
-         sizeof(*input_buffer_.get()) * input_buffer_size_);
-  UpdateRegions(false);
-}
-
-float SincResampler::Convolve_C(const float* input_ptr,
-                                const float* k1,
-                                const float* k2,
-                                double kernel_interpolation_factor) {
-  float sum1 = 0;
-  float sum2 = 0;
-
-  // Generate a single output sample.  Unrolling this loop hurt performance in
-  // local testing.
-  size_t n = kKernelSize;
-  while (n--) {
-    sum1 += *input_ptr * *k1++;
-    sum2 += *input_ptr++ * *k2++;
-  }
-
-  // Linearly interpolate the two "convolutions".
-  return static_cast<float>((1.0 - kernel_interpolation_factor) * sum1 +
-                            kernel_interpolation_factor * sum2);
-}
-
-}  // namespace webrtc
diff --git a/submodules/libtgvoip/webrtc_dsp/common_audio/resampler/sinc_resampler.h b/submodules/libtgvoip/webrtc_dsp/common_audio/resampler/sinc_resampler.h
deleted file mode 100644
index 0be4318e33..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/common_audio/resampler/sinc_resampler.h
+++ /dev/null
@@ -1,178 +0,0 @@
-/*
- *  Copyright (c) 2013 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-// Modified from the Chromium original here:
-// src/media/base/sinc_resampler.h
-
-#ifndef COMMON_AUDIO_RESAMPLER_SINC_RESAMPLER_H_
-#define COMMON_AUDIO_RESAMPLER_SINC_RESAMPLER_H_
-
-#include <stddef.h>
-#include <memory>
-
-#include "rtc_base/constructormagic.h"
-#include "rtc_base/gtest_prod_util.h"
-#include "rtc_base/memory/aligned_malloc.h"
-#include "rtc_base/system/arch.h"
-
-namespace webrtc {
-
-// Callback class for providing more data into the resampler.  Expects |frames|
-// of data to be rendered into |destination|; zero padded if not enough frames
-// are available to satisfy the request.
-class SincResamplerCallback {
- public:
-  virtual ~SincResamplerCallback() {}
-  virtual void Run(size_t frames, float* destination) = 0;
-};
-
-// SincResampler is a high-quality single-channel sample-rate converter.
-class SincResampler {
- public:
-  // The kernel size can be adjusted for quality (higher is better) at the
-  // expense of performance.  Must be a multiple of 32.
-  // TODO(dalecurtis): Test performance to see if we can jack this up to 64+.
-  static const size_t kKernelSize = 32;
-
-  // Default request size.  Affects how often and for how much SincResampler
-  // calls back for input.  Must be greater than kKernelSize.
-  static const size_t kDefaultRequestSize = 512;
-
-  // The kernel offset count is used for interpolation and is the number of
-  // sub-sample kernel shifts.  Can be adjusted for quality (higher is better)
-  // at the expense of allocating more memory.
-  static const size_t kKernelOffsetCount = 32;
-  static const size_t kKernelStorageSize =
-      kKernelSize * (kKernelOffsetCount + 1);
-
-  // Constructs a SincResampler with the specified |read_cb|, which is used to
-  // acquire audio data for resampling.  |io_sample_rate_ratio| is the ratio
-  // of input / output sample rates.  |request_frames| controls the size in
-  // frames of the buffer requested by each |read_cb| call.  The value must be
-  // greater than kKernelSize.  Specify kDefaultRequestSize if there are no
-  // request size constraints.
-  SincResampler(double io_sample_rate_ratio,
-                size_t request_frames,
-                SincResamplerCallback* read_cb);
-  virtual ~SincResampler();
-
-  // Resample |frames| of data from |read_cb_| into |destination|.
-  void Resample(size_t frames, float* destination);
-
-  // The maximum size in frames that guarantees Resample() will only make a
-  // single call to |read_cb_| for more data.
-  size_t ChunkSize() const;
-
-  size_t request_frames() const { return request_frames_; }
-
-  // Flush all buffered data and reset internal indices.  Not thread safe, do
-  // not call while Resample() is in progress.
-  void Flush();
-
-  // Update |io_sample_rate_ratio_|.  SetRatio() will cause a reconstruction of
-  // the kernels used for resampling.  Not thread safe, do not call while
-  // Resample() is in progress.
-  //
-  // TODO(ajm): Use this in PushSincResampler rather than reconstructing
-  // SincResampler.  We would also need a way to update |request_frames_|.
-  void SetRatio(double io_sample_rate_ratio);
-
-  float* get_kernel_for_testing() { return kernel_storage_.get(); }
-
- private:
-  FRIEND_TEST_ALL_PREFIXES(SincResamplerTest, Convolve);
-  FRIEND_TEST_ALL_PREFIXES(SincResamplerTest, ConvolveBenchmark);
-
-  void InitializeKernel();
-  void UpdateRegions(bool second_load);
-
-  // Selects runtime specific CPU features like SSE.  Must be called before
-  // using SincResampler.
-  // TODO(ajm): Currently managed by the class internally. See the note with
-  // |convolve_proc_| below.
-  void InitializeCPUSpecificFeatures();
-
-  // Compute convolution of |k1| and |k2| over |input_ptr|, resultant sums are
-  // linearly interpolated using |kernel_interpolation_factor|.  On x86 and ARM
-  // the underlying implementation is chosen at run time.
-  static float Convolve_C(const float* input_ptr,
-                          const float* k1,
-                          const float* k2,
-                          double kernel_interpolation_factor);
-#if defined(WEBRTC_ARCH_X86_FAMILY)
-  static float Convolve_SSE(const float* input_ptr,
-                            const float* k1,
-                            const float* k2,
-                            double kernel_interpolation_factor);
-#elif defined(WEBRTC_HAS_NEON)
-  static float Convolve_NEON(const float* input_ptr,
-                             const float* k1,
-                             const float* k2,
-                             double kernel_interpolation_factor);
-#endif
-
-  // The ratio of input / output sample rates.
-  double io_sample_rate_ratio_;
-
-  // An index on the source input buffer with sub-sample precision.  It must be
-  // double precision to avoid drift.
-  double virtual_source_idx_;
-
-  // The buffer is primed once at the very beginning of processing.
-  bool buffer_primed_;
-
-  // Source of data for resampling.
-  SincResamplerCallback* read_cb_;
-
-  // The size (in samples) to request from each |read_cb_| execution.
-  const size_t request_frames_;
-
-  // The number of source frames processed per pass.
-  size_t block_size_;
-
-  // The size (in samples) of the internal buffer used by the resampler.
-  const size_t input_buffer_size_;
-
-  // Contains kKernelOffsetCount kernels back-to-back, each of size kKernelSize.
-  // The kernel offsets are sub-sample shifts of a windowed sinc shifted from
-  // 0.0 to 1.0 sample.
-  std::unique_ptr<float[], AlignedFreeDeleter> kernel_storage_;
-  std::unique_ptr<float[], AlignedFreeDeleter> kernel_pre_sinc_storage_;
-  std::unique_ptr<float[], AlignedFreeDeleter> kernel_window_storage_;
-
-  // Data from the source is copied into this buffer for each processing pass.
-  std::unique_ptr<float[], AlignedFreeDeleter> input_buffer_;
-
-// Stores the runtime selection of which Convolve function to use.
-// TODO(ajm): Move to using a global static which must only be initialized
-// once by the user. We're not doing this initially, because we don't have
-// e.g. a LazyInstance helper in webrtc.
-#if defined(WEBRTC_ARCH_X86_FAMILY) && !defined(__SSE2__)
-  typedef float (*ConvolveProc)(const float*,
-                                const float*,
-                                const float*,
-                                double);
-  ConvolveProc convolve_proc_;
-#endif
-
-  // Pointers to the various regions inside |input_buffer_|.  See the diagram at
-  // the top of the .cc file for more information.
-  float* r0_;
-  float* const r1_;
-  float* const r2_;
-  float* r3_;
-  float* r4_;
-
-  RTC_DISALLOW_COPY_AND_ASSIGN(SincResampler);
-};
-
-}  // namespace webrtc
-
-#endif  // COMMON_AUDIO_RESAMPLER_SINC_RESAMPLER_H_
diff --git a/submodules/libtgvoip/webrtc_dsp/common_audio/resampler/sinc_resampler_neon.cc b/submodules/libtgvoip/webrtc_dsp/common_audio/resampler/sinc_resampler_neon.cc
deleted file mode 100644
index 0f5e0457ff..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/common_audio/resampler/sinc_resampler_neon.cc
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- *  Copyright (c) 2013 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-// Modified from the Chromium original:
-// src/media/base/sinc_resampler.cc
-#if defined(__arm__) || defined(_M_ARM) || defined(__aarch64__)
-
-#include "common_audio/resampler/sinc_resampler.h"
-
-#include <arm_neon.h>
-
-namespace webrtc {
-
-float SincResampler::Convolve_NEON(const float* input_ptr,
-                                   const float* k1,
-                                   const float* k2,
-                                   double kernel_interpolation_factor) {
-  float32x4_t m_input;
-  float32x4_t m_sums1 = vmovq_n_f32(0);
-  float32x4_t m_sums2 = vmovq_n_f32(0);
-
-  const float* upper = input_ptr + kKernelSize;
-  for (; input_ptr < upper;) {
-    m_input = vld1q_f32(input_ptr);
-    input_ptr += 4;
-    m_sums1 = vmlaq_f32(m_sums1, m_input, vld1q_f32(k1));
-    k1 += 4;
-    m_sums2 = vmlaq_f32(m_sums2, m_input, vld1q_f32(k2));
-    k2 += 4;
-  }
-
-  // Linearly interpolate the two "convolutions".
-  m_sums1 = vmlaq_f32(
-      vmulq_f32(m_sums1, vmovq_n_f32(1.0 - kernel_interpolation_factor)),
-      m_sums2, vmovq_n_f32(kernel_interpolation_factor));
-
-  // Sum components together.
-  float32x2_t m_half = vadd_f32(vget_high_f32(m_sums1), vget_low_f32(m_sums1));
-  return vget_lane_f32(vpadd_f32(m_half, m_half), 0);
-}
-
-}  // namespace webrtc
-
-#endif
diff --git a/submodules/libtgvoip/webrtc_dsp/common_audio/resampler/sinc_resampler_sse.cc b/submodules/libtgvoip/webrtc_dsp/common_audio/resampler/sinc_resampler_sse.cc
deleted file mode 100644
index 5d7c473176..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/common_audio/resampler/sinc_resampler_sse.cc
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- *  Copyright (c) 2013 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-// Modified from the Chromium original:
-// src/media/base/simd/sinc_resampler_sse.cc
-#include "rtc_base/system/arch.h"
-#ifdef WEBRTC_ARCH_X86_FAMILY
-
-#include <stddef.h>
-#include <stdint.h>
-#include <xmmintrin.h>
-
-#include "common_audio/resampler/sinc_resampler.h"
-
-namespace webrtc {
-
-float SincResampler::Convolve_SSE(const float* input_ptr,
-                                  const float* k1,
-                                  const float* k2,
-                                  double kernel_interpolation_factor) {
-  __m128 m_input;
-  __m128 m_sums1 = _mm_setzero_ps();
-  __m128 m_sums2 = _mm_setzero_ps();
-
-  // Based on |input_ptr| alignment, we need to use loadu or load.  Unrolling
-  // these loops hurt performance in local testing.
-  if (reinterpret_cast<uintptr_t>(input_ptr) & 0x0F) {
-    for (size_t i = 0; i < kKernelSize; i += 4) {
-      m_input = _mm_loadu_ps(input_ptr + i);
-      m_sums1 = _mm_add_ps(m_sums1, _mm_mul_ps(m_input, _mm_load_ps(k1 + i)));
-      m_sums2 = _mm_add_ps(m_sums2, _mm_mul_ps(m_input, _mm_load_ps(k2 + i)));
-    }
-  } else {
-    for (size_t i = 0; i < kKernelSize; i += 4) {
-      m_input = _mm_load_ps(input_ptr + i);
-      m_sums1 = _mm_add_ps(m_sums1, _mm_mul_ps(m_input, _mm_load_ps(k1 + i)));
-      m_sums2 = _mm_add_ps(m_sums2, _mm_mul_ps(m_input, _mm_load_ps(k2 + i)));
-    }
-  }
-
-  // Linearly interpolate the two "convolutions".
-  m_sums1 = _mm_mul_ps(
-      m_sums1,
-      _mm_set_ps1(static_cast<float>(1.0 - kernel_interpolation_factor)));
-  m_sums2 = _mm_mul_ps(
-      m_sums2, _mm_set_ps1(static_cast<float>(kernel_interpolation_factor)));
-  m_sums1 = _mm_add_ps(m_sums1, m_sums2);
-
-  // Sum components together.
-  float result;
-  m_sums2 = _mm_add_ps(_mm_movehl_ps(m_sums1, m_sums1), m_sums1);
-  _mm_store_ss(&result,
-               _mm_add_ss(m_sums2, _mm_shuffle_ps(m_sums2, m_sums2, 1)));
-
-  return result;
-}
-
-}  // namespace webrtc
-
-#endif
diff --git a/submodules/libtgvoip/webrtc_dsp/common_audio/resampler/sinusoidal_linear_chirp_source.cc b/submodules/libtgvoip/webrtc_dsp/common_audio/resampler/sinusoidal_linear_chirp_source.cc
deleted file mode 100644
index 2afdd1be47..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/common_audio/resampler/sinusoidal_linear_chirp_source.cc
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- *  Copyright (c) 2013 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-// MSVC++ requires this to be set before any other includes to get M_PI.
-#define _USE_MATH_DEFINES
-
-#include "common_audio/resampler/sinusoidal_linear_chirp_source.h"
-
-#include <math.h>
-
-namespace webrtc {
-
-SinusoidalLinearChirpSource::SinusoidalLinearChirpSource(int sample_rate,
-                                                         size_t samples,
-                                                         double max_frequency,
-                                                         double delay_samples)
-    : sample_rate_(sample_rate),
-      total_samples_(samples),
-      max_frequency_(max_frequency),
-      current_index_(0),
-      delay_samples_(delay_samples) {
-  // Chirp rate.
-  double duration = static_cast<double>(total_samples_) / sample_rate_;
-  k_ = (max_frequency_ - kMinFrequency) / duration;
-}
-
-void SinusoidalLinearChirpSource::Run(size_t frames, float* destination) {
-  for (size_t i = 0; i < frames; ++i, ++current_index_) {
-    // Filter out frequencies higher than Nyquist.
-    if (Frequency(current_index_) > 0.5 * sample_rate_) {
-      destination[i] = 0;
-    } else {
-      // Calculate time in seconds.
-      if (current_index_ < delay_samples_) {
-        destination[i] = 0;
-      } else {
-        // Sinusoidal linear chirp.
-        double t = (current_index_ - delay_samples_) / sample_rate_;
-        destination[i] = sin(2 * M_PI * (kMinFrequency * t + (k_ / 2) * t * t));
-      }
-    }
-  }
-}
-
-double SinusoidalLinearChirpSource::Frequency(size_t position) {
-  return kMinFrequency + (position - delay_samples_) *
-                             (max_frequency_ - kMinFrequency) / total_samples_;
-}
-
-}  // namespace webrtc
diff --git a/submodules/libtgvoip/webrtc_dsp/common_audio/resampler/sinusoidal_linear_chirp_source.h b/submodules/libtgvoip/webrtc_dsp/common_audio/resampler/sinusoidal_linear_chirp_source.h
deleted file mode 100644
index 71dcff5eb9..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/common_audio/resampler/sinusoidal_linear_chirp_source.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- *  Copyright (c) 2013 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-// Modified from the Chromium original here:
-// src/media/base/sinc_resampler_unittest.cc
-
-#ifndef COMMON_AUDIO_RESAMPLER_SINUSOIDAL_LINEAR_CHIRP_SOURCE_H_
-#define COMMON_AUDIO_RESAMPLER_SINUSOIDAL_LINEAR_CHIRP_SOURCE_H_
-
-#include "common_audio/resampler/sinc_resampler.h"
-#include "rtc_base/constructormagic.h"
-
-namespace webrtc {
-
-// Fake audio source for testing the resampler.  Generates a sinusoidal linear
-// chirp (http://en.wikipedia.org/wiki/Chirp) which can be tuned to stress the
-// resampler for the specific sample rate conversion being used.
-class SinusoidalLinearChirpSource : public SincResamplerCallback {
- public:
-  // |delay_samples| can be used to insert a fractional sample delay into the
-  // source.  It will produce zeros until non-negative time is reached.
-  SinusoidalLinearChirpSource(int sample_rate,
-                              size_t samples,
-                              double max_frequency,
-                              double delay_samples);
-
-  ~SinusoidalLinearChirpSource() override {}
-
-  void Run(size_t frames, float* destination) override;
-
-  double Frequency(size_t position);
-
- private:
-  enum { kMinFrequency = 5 };
-
-  int sample_rate_;
-  size_t total_samples_;
-  double max_frequency_;
-  double k_;
-  size_t current_index_;
-  double delay_samples_;
-
-  RTC_DISALLOW_COPY_AND_ASSIGN(SinusoidalLinearChirpSource);
-};
-
-}  // namespace webrtc
-
-#endif  // COMMON_AUDIO_RESAMPLER_SINUSOIDAL_LINEAR_CHIRP_SOURCE_H_
diff --git a/submodules/libtgvoip/webrtc_dsp/common_audio/ring_buffer.c b/submodules/libtgvoip/webrtc_dsp/common_audio/ring_buffer.c
deleted file mode 100644
index a20ada51bf..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/common_audio/ring_buffer.c
+++ /dev/null
@@ -1,232 +0,0 @@
-/*
- *  Copyright (c) 2011 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-// A ring buffer to hold arbitrary data. Provides no thread safety. Unless
-// otherwise specified, functions return 0 on success and -1 on error.
-
-#include "common_audio/ring_buffer.h"
-
-#include <stddef.h>  // size_t
-#include <stdlib.h>
-#include <string.h>
-
-// Get address of region(s) from which we can read data.
-// If the region is contiguous, |data_ptr_bytes_2| will be zero.
-// If non-contiguous, |data_ptr_bytes_2| will be the size in bytes of the second
-// region. Returns room available to be read or |element_count|, whichever is
-// smaller.
-static size_t GetBufferReadRegions(RingBuffer* buf,
-                                   size_t element_count,
-                                   void** data_ptr_1,
-                                   size_t* data_ptr_bytes_1,
-                                   void** data_ptr_2,
-                                   size_t* data_ptr_bytes_2) {
-
-  const size_t readable_elements = WebRtc_available_read(buf);
-  const size_t read_elements = (readable_elements < element_count ?
-      readable_elements : element_count);
-  const size_t margin = buf->element_count - buf->read_pos;
-
-  // Check to see if read is not contiguous.
-  if (read_elements > margin) {
-    // Write data in two blocks that wrap the buffer.
-    *data_ptr_1 = buf->data + buf->read_pos * buf->element_size;
-    *data_ptr_bytes_1 = margin * buf->element_size;
-    *data_ptr_2 = buf->data;
-    *data_ptr_bytes_2 = (read_elements - margin) * buf->element_size;
-  } else {
-    *data_ptr_1 = buf->data + buf->read_pos * buf->element_size;
-    *data_ptr_bytes_1 = read_elements * buf->element_size;
-    *data_ptr_2 = NULL;
-    *data_ptr_bytes_2 = 0;
-  }
-
-  return read_elements;
-}
-
-RingBuffer* WebRtc_CreateBuffer(size_t element_count, size_t element_size) {
-  RingBuffer* self = NULL;
-  if (element_count == 0 || element_size == 0) {
-    return NULL;
-  }
-
-  self = malloc(sizeof(RingBuffer));
-  if (!self) {
-    return NULL;
-  }
-
-  self->data = malloc(element_count * element_size);
-  if (!self->data) {
-    free(self);
-    self = NULL;
-    return NULL;
-  }
-
-  self->element_count = element_count;
-  self->element_size = element_size;
-  WebRtc_InitBuffer(self);
-
-  return self;
-}
-
-void WebRtc_InitBuffer(RingBuffer* self) {
-  self->read_pos = 0;
-  self->write_pos = 0;
-  self->rw_wrap = SAME_WRAP;
-
-  // Initialize buffer to zeros
-  memset(self->data, 0, self->element_count * self->element_size);
-}
-
-void WebRtc_FreeBuffer(void* handle) {
-  RingBuffer* self = (RingBuffer*)handle;
-  if (!self) {
-    return;
-  }
-
-  free(self->data);
-  free(self);
-}
-
-size_t WebRtc_ReadBuffer(RingBuffer* self,
-                         void** data_ptr,
-                         void* data,
-                         size_t element_count) {
-
-  if (self == NULL) {
-    return 0;
-  }
-  if (data == NULL) {
-    return 0;
-  }
-
-  {
-    void* buf_ptr_1 = NULL;
-    void* buf_ptr_2 = NULL;
-    size_t buf_ptr_bytes_1 = 0;
-    size_t buf_ptr_bytes_2 = 0;
-    const size_t read_count = GetBufferReadRegions(self,
-                                                   element_count,
-                                                   &buf_ptr_1,
-                                                   &buf_ptr_bytes_1,
-                                                   &buf_ptr_2,
-                                                   &buf_ptr_bytes_2);
-    if (buf_ptr_bytes_2 > 0) {
-      // We have a wrap around when reading the buffer. Copy the buffer data to
-      // |data| and point to it.
-      memcpy(data, buf_ptr_1, buf_ptr_bytes_1);
-      memcpy(((char*) data) + buf_ptr_bytes_1, buf_ptr_2, buf_ptr_bytes_2);
-      buf_ptr_1 = data;
-    } else if (!data_ptr) {
-      // No wrap, but a memcpy was requested.
-      memcpy(data, buf_ptr_1, buf_ptr_bytes_1);
-    }
-    if (data_ptr) {
-      // |buf_ptr_1| == |data| in the case of a wrap.
-      *data_ptr = read_count == 0 ? NULL : buf_ptr_1;
-    }
-
-    // Update read position
-    WebRtc_MoveReadPtr(self, (int) read_count);
-
-    return read_count;
-  }
-}
-
-size_t WebRtc_WriteBuffer(RingBuffer* self,
-                          const void* data,
-                          size_t element_count) {
-  if (!self) {
-    return 0;
-  }
-  if (!data) {
-    return 0;
-  }
-
-  {
-    const size_t free_elements = WebRtc_available_write(self);
-    const size_t write_elements = (free_elements < element_count ? free_elements
-        : element_count);
-    size_t n = write_elements;
-    const size_t margin = self->element_count - self->write_pos;
-
-    if (write_elements > margin) {
-      // Buffer wrap around when writing.
-      memcpy(self->data + self->write_pos * self->element_size,
-             data, margin * self->element_size);
-      self->write_pos = 0;
-      n -= margin;
-      self->rw_wrap = DIFF_WRAP;
-    }
-    memcpy(self->data + self->write_pos * self->element_size,
-           ((const char*) data) + ((write_elements - n) * self->element_size),
-           n * self->element_size);
-    self->write_pos += n;
-
-    return write_elements;
-  }
-}
-
-int WebRtc_MoveReadPtr(RingBuffer* self, int element_count) {
-  if (!self) {
-    return 0;
-  }
-
-  {
-    // We need to be able to take care of negative changes, hence use "int"
-    // instead of "size_t".
-    const int free_elements = (int) WebRtc_available_write(self);
-    const int readable_elements = (int) WebRtc_available_read(self);
-    int read_pos = (int) self->read_pos;
-
-    if (element_count > readable_elements) {
-      element_count = readable_elements;
-    }
-    if (element_count < -free_elements) {
-      element_count = -free_elements;
-    }
-
-    read_pos += element_count;
-    if (read_pos > (int) self->element_count) {
-      // Buffer wrap around. Restart read position and wrap indicator.
-      read_pos -= (int) self->element_count;
-      self->rw_wrap = SAME_WRAP;
-    }
-    if (read_pos < 0) {
-      // Buffer wrap around. Restart read position and wrap indicator.
-      read_pos += (int) self->element_count;
-      self->rw_wrap = DIFF_WRAP;
-    }
-
-    self->read_pos = (size_t) read_pos;
-
-    return element_count;
-  }
-}
-
-size_t WebRtc_available_read(const RingBuffer* self) {
-  if (!self) {
-    return 0;
-  }
-
-  if (self->rw_wrap == SAME_WRAP) {
-    return self->write_pos - self->read_pos;
-  } else {
-    return self->element_count - self->read_pos + self->write_pos;
-  }
-}
-
-size_t WebRtc_available_write(const RingBuffer* self) {
-  if (!self) {
-    return 0;
-  }
-
-  return self->element_count - WebRtc_available_read(self);
-}
diff --git a/submodules/libtgvoip/webrtc_dsp/common_audio/ring_buffer.h b/submodules/libtgvoip/webrtc_dsp/common_audio/ring_buffer.h
deleted file mode 100644
index bcc40e107f..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/common_audio/ring_buffer.h
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- *  Copyright (c) 2011 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-// A ring buffer to hold arbitrary data. Provides no thread safety. Unless
-// otherwise specified, functions return 0 on success and -1 on error.
-
-#ifndef COMMON_AUDIO_RING_BUFFER_H_
-#define COMMON_AUDIO_RING_BUFFER_H_
-
-// TODO(alessiob): Used by AEC, AECm and AudioRingBuffer. Remove when possible.
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <stddef.h>  // size_t
-
-enum Wrap { SAME_WRAP, DIFF_WRAP };
-
-typedef struct RingBuffer {
-  size_t read_pos;
-  size_t write_pos;
-  size_t element_count;
-  size_t element_size;
-  enum Wrap rw_wrap;
-  char* data;
-} RingBuffer;
-
-// Creates and initializes the buffer. Returns null on failure.
-RingBuffer* WebRtc_CreateBuffer(size_t element_count, size_t element_size);
-void WebRtc_InitBuffer(RingBuffer* handle);
-void WebRtc_FreeBuffer(void* handle);
-
-// Reads data from the buffer. Returns the number of elements that were read.
-// The |data_ptr| will point to the address where the read data is located.
-// If no data can be read, |data_ptr| is set to |NULL|. If all data can be read
-// without buffer wrap around then |data_ptr| will point to the location in the
-// buffer. Otherwise, the data will be copied to |data| (memory allocation done
-// by the user) and |data_ptr| points to the address of |data|. |data_ptr| is
-// only guaranteed to be valid until the next call to WebRtc_WriteBuffer().
-//
-// To force a copying to |data|, pass a null |data_ptr|.
-//
-// Returns number of elements read.
-size_t WebRtc_ReadBuffer(RingBuffer* handle,
-                         void** data_ptr,
-                         void* data,
-                         size_t element_count);
-
-// Writes |data| to buffer and returns the number of elements written.
-size_t WebRtc_WriteBuffer(RingBuffer* handle,
-                          const void* data,
-                          size_t element_count);
-
-// Moves the buffer read position and returns the number of elements moved.
-// Positive |element_count| moves the read position towards the write position,
-// that is, flushing the buffer. Negative |element_count| moves the read
-// position away from the the write position, that is, stuffing the buffer.
-// Returns number of elements moved.
-int WebRtc_MoveReadPtr(RingBuffer* handle, int element_count);
-
-// Returns number of available elements to read.
-size_t WebRtc_available_read(const RingBuffer* handle);
-
-// Returns number of available elements for write.
-size_t WebRtc_available_write(const RingBuffer* handle);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif  // COMMON_AUDIO_RING_BUFFER_H_
diff --git a/submodules/libtgvoip/webrtc_dsp/common_audio/signal_processing/auto_corr_to_refl_coef.c b/submodules/libtgvoip/webrtc_dsp/common_audio/signal_processing/auto_corr_to_refl_coef.c
deleted file mode 100644
index a3ec24f5da..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/common_audio/signal_processing/auto_corr_to_refl_coef.c
+++ /dev/null
@@ -1,103 +0,0 @@
-/*
- *  Copyright (c) 2011 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-
-/*
- * This file contains the function WebRtcSpl_AutoCorrToReflCoef().
- * The description header can be found in signal_processing_library.h
- *
- */
-
-#include "common_audio/signal_processing/include/signal_processing_library.h"
-
-void WebRtcSpl_AutoCorrToReflCoef(const int32_t *R, int use_order, int16_t *K)
-{
-    int i, n;
-    int16_t tmp;
-    const int32_t *rptr;
-    int32_t L_num, L_den;
-    int16_t *acfptr, *pptr, *wptr, *p1ptr, *w1ptr, ACF[WEBRTC_SPL_MAX_LPC_ORDER],
-            P[WEBRTC_SPL_MAX_LPC_ORDER], W[WEBRTC_SPL_MAX_LPC_ORDER];
-
-    // Initialize loop and pointers.
-    acfptr = ACF;
-    rptr = R;
-    pptr = P;
-    p1ptr = &P[1];
-    w1ptr = &W[1];
-    wptr = w1ptr;
-
-    // First loop; n=0. Determine shifting.
-    tmp = WebRtcSpl_NormW32(*R);
-    *acfptr = (int16_t)((*rptr++ << tmp) >> 16);
-    *pptr++ = *acfptr++;
-
-    // Initialize ACF, P and W.
-    for (i = 1; i <= use_order; i++)
-    {
-        *acfptr = (int16_t)((*rptr++ << tmp) >> 16);
-        *wptr++ = *acfptr;
-        *pptr++ = *acfptr++;
-    }
-
-    // Compute reflection coefficients.
-    for (n = 1; n <= use_order; n++, K++)
-    {
-        tmp = WEBRTC_SPL_ABS_W16(*p1ptr);
-        if (*P < tmp)
-        {
-            for (i = n; i <= use_order; i++)
-                *K++ = 0;
-
-            return;
-        }
-
-        // Division: WebRtcSpl_div(tmp, *P)
-        *K = 0;
-        if (tmp != 0)
-        {
-            L_num = tmp;
-            L_den = *P;
-            i = 15;
-            while (i--)
-            {
-                (*K) <<= 1;
-                L_num <<= 1;
-                if (L_num >= L_den)
-                {
-                    L_num -= L_den;
-                    (*K)++;
-                }
-            }
-            if (*p1ptr > 0)
-                *K = -*K;
-        }
-
-        // Last iteration; don't do Schur recursion.
-        if (n == use_order)
-            return;
-
-        // Schur recursion.
-        pptr = P;
-        wptr = w1ptr;
-        tmp = (int16_t)(((int32_t)*p1ptr * (int32_t)*K + 16384) >> 15);
-        *pptr = WebRtcSpl_AddSatW16(*pptr, tmp);
-        pptr++;
-        for (i = 1; i <= use_order - n; i++)
-        {
-            tmp = (int16_t)(((int32_t)*wptr * (int32_t)*K + 16384) >> 15);
-            *pptr = WebRtcSpl_AddSatW16(*(pptr + 1), tmp);
-            pptr++;
-            tmp = (int16_t)(((int32_t)*pptr * (int32_t)*K + 16384) >> 15);
-            *wptr = WebRtcSpl_AddSatW16(*wptr, tmp);
-            wptr++;
-        }
-    }
-}
diff --git a/submodules/libtgvoip/webrtc_dsp/common_audio/signal_processing/auto_correlation.c b/submodules/libtgvoip/webrtc_dsp/common_audio/signal_processing/auto_correlation.c
deleted file mode 100644
index 1455820e8f..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/common_audio/signal_processing/auto_correlation.c
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- *  Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#include "common_audio/signal_processing/include/signal_processing_library.h"
-
-#include "rtc_base/checks.h"
-
-size_t WebRtcSpl_AutoCorrelation(const int16_t* in_vector,
-                                 size_t in_vector_length,
-                                 size_t order,
-                                 int32_t* result,
-                                 int* scale) {
-  int32_t sum = 0;
-  size_t i = 0, j = 0;
-  int16_t smax = 0;
-  int scaling = 0;
-
-  RTC_DCHECK_LE(order, in_vector_length);
-
-  // Find the maximum absolute value of the samples.
-  smax = WebRtcSpl_MaxAbsValueW16(in_vector, in_vector_length);
-
-  // In order to avoid overflow when computing the sum we should scale the
-  // samples so that (in_vector_length * smax * smax) will not overflow.
-  if (smax == 0) {
-    scaling = 0;
-  } else {
-    // Number of bits in the sum loop.
-    int nbits = WebRtcSpl_GetSizeInBits((uint32_t)in_vector_length);
-    // Number of bits to normalize smax.
-    int t = WebRtcSpl_NormW32(WEBRTC_SPL_MUL(smax, smax));
-
-    if (t > nbits) {
-      scaling = 0;
-    } else {
-      scaling = nbits - t;
-    }
-  }
-
-  // Perform the actual correlation calculation.
-  for (i = 0; i < order + 1; i++) {
-    sum = 0;
-    /* Unroll the loop to improve performance. */
-    for (j = 0; i + j + 3 < in_vector_length; j += 4) {
-      sum += (in_vector[j + 0] * in_vector[i + j + 0]) >> scaling;
-      sum += (in_vector[j + 1] * in_vector[i + j + 1]) >> scaling;
-      sum += (in_vector[j + 2] * in_vector[i + j + 2]) >> scaling;
-      sum += (in_vector[j + 3] * in_vector[i + j + 3]) >> scaling;
-    }
-    for (; j < in_vector_length - i; j++) {
-      sum += (in_vector[j] * in_vector[i + j]) >> scaling;
-    }
-    *result++ = sum;
-  }
-
-  *scale = scaling;
-  return order + 1;
-}
diff --git a/submodules/libtgvoip/webrtc_dsp/common_audio/signal_processing/complex_bit_reverse.c b/submodules/libtgvoip/webrtc_dsp/common_audio/signal_processing/complex_bit_reverse.c
deleted file mode 100644
index 1c82cff50f..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/common_audio/signal_processing/complex_bit_reverse.c
+++ /dev/null
@@ -1,108 +0,0 @@
-/*
- *  Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#include "common_audio/signal_processing/include/signal_processing_library.h"
-
-/* Tables for data buffer indexes that are bit reversed and thus need to be
- * swapped. Note that, index_7[{0, 2, 4, ...}] are for the left side of the swap
- * operations, while index_7[{1, 3, 5, ...}] are for the right side of the
- * operation. Same for index_8.
- */
-
-/* Indexes for the case of stages == 7. */
-static const int16_t index_7[112] = {
-  1, 64, 2, 32, 3, 96, 4, 16, 5, 80, 6, 48, 7, 112, 9, 72, 10, 40, 11, 104,
-  12, 24, 13, 88, 14, 56, 15, 120, 17, 68, 18, 36, 19, 100, 21, 84, 22, 52,
-  23, 116, 25, 76, 26, 44, 27, 108, 29, 92, 30, 60, 31, 124, 33, 66, 35, 98,
-  37, 82, 38, 50, 39, 114, 41, 74, 43, 106, 45, 90, 46, 58, 47, 122, 49, 70,
-  51, 102, 53, 86, 55, 118, 57, 78, 59, 110, 61, 94, 63, 126, 67, 97, 69,
-  81, 71, 113, 75, 105, 77, 89, 79, 121, 83, 101, 87, 117, 91, 109, 95, 125,
-  103, 115, 111, 123
-};
-
-/* Indexes for the case of stages == 8. */
-static const int16_t index_8[240] = {
-  1, 128, 2, 64, 3, 192, 4, 32, 5, 160, 6, 96, 7, 224, 8, 16, 9, 144, 10, 80,
-  11, 208, 12, 48, 13, 176, 14, 112, 15, 240, 17, 136, 18, 72, 19, 200, 20,
-  40, 21, 168, 22, 104, 23, 232, 25, 152, 26, 88, 27, 216, 28, 56, 29, 184,
-  30, 120, 31, 248, 33, 132, 34, 68, 35, 196, 37, 164, 38, 100, 39, 228, 41,
-  148, 42, 84, 43, 212, 44, 52, 45, 180, 46, 116, 47, 244, 49, 140, 50, 76,
-  51, 204, 53, 172, 54, 108, 55, 236, 57, 156, 58, 92, 59, 220, 61, 188, 62,
-  124, 63, 252, 65, 130, 67, 194, 69, 162, 70, 98, 71, 226, 73, 146, 74, 82,
-  75, 210, 77, 178, 78, 114, 79, 242, 81, 138, 83, 202, 85, 170, 86, 106, 87,
-  234, 89, 154, 91, 218, 93, 186, 94, 122, 95, 250, 97, 134, 99, 198, 101,
-  166, 103, 230, 105, 150, 107, 214, 109, 182, 110, 118, 111, 246, 113, 142,
-  115, 206, 117, 174, 119, 238, 121, 158, 123, 222, 125, 190, 127, 254, 131,
-  193, 133, 161, 135, 225, 137, 145, 139, 209, 141, 177, 143, 241, 147, 201,
-  149, 169, 151, 233, 155, 217, 157, 185, 159, 249, 163, 197, 167, 229, 171,
-  213, 173, 181, 175, 245, 179, 205, 183, 237, 187, 221, 191, 253, 199, 227,
-  203, 211, 207, 243, 215, 235, 223, 251, 239, 247
-};
-
-void WebRtcSpl_ComplexBitReverse(int16_t* __restrict complex_data, int stages) {
-  /* For any specific value of stages, we know exactly the indexes that are
-   * bit reversed. Currently (Feb. 2012) in WebRTC the only possible values of
-   * stages are 7 and 8, so we use tables to save unnecessary iterations and
-   * calculations for these two cases.
-   */
-  if (stages == 7 || stages == 8) {
-    int m = 0;
-    int length = 112;
-    const int16_t* index = index_7;
-
-    if (stages == 8) {
-      length = 240;
-      index = index_8;
-    }
-
-    /* Decimation in time. Swap the elements with bit-reversed indexes. */
-    for (m = 0; m < length; m += 2) {
-      /* We declare a int32_t* type pointer, to load both the 16-bit real
-       * and imaginary elements from complex_data in one instruction, reducing
-       * complexity.
-       */
-      int32_t* complex_data_ptr = (int32_t*)complex_data;
-      int32_t temp = 0;
-
-      temp = complex_data_ptr[index[m]];  /* Real and imaginary */
-      complex_data_ptr[index[m]] = complex_data_ptr[index[m + 1]];
-      complex_data_ptr[index[m + 1]] = temp;
-    }
-  }
-  else {
-    int m = 0, mr = 0, l = 0;
-    int n = 1 << stages;
-    int nn = n - 1;
-
-    /* Decimation in time - re-order data */
-    for (m = 1; m <= nn; ++m) {
-      int32_t* complex_data_ptr = (int32_t*)complex_data;
-      int32_t temp = 0;
-
-      /* Find out indexes that are bit-reversed. */
-      l = n;
-      do {
-        l >>= 1;
-      } while (l > nn - mr);
-      mr = (mr & (l - 1)) + l;
-
-      if (mr <= m) {
-        continue;
-      }
-
-      /* Swap the elements with bit-reversed indexes.
-       * This is similar to the loop in the stages == 7 or 8 cases.
-       */
-      temp = complex_data_ptr[m];  /* Real and imaginary */
-      complex_data_ptr[m] = complex_data_ptr[mr];
-      complex_data_ptr[mr] = temp;
-    }
-  }
-}
diff --git a/submodules/libtgvoip/webrtc_dsp/common_audio/signal_processing/complex_bit_reverse_arm.S b/submodules/libtgvoip/webrtc_dsp/common_audio/signal_processing/complex_bit_reverse_arm.S
deleted file mode 100644
index c2dabf1809..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/common_audio/signal_processing/complex_bit_reverse_arm.S
+++ /dev/null
@@ -1,122 +0,0 @@
-@
-@ Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
-@
-@ Use of this source code is governed by a BSD-style license
-@ that can be found in the LICENSE file in the root of the source
-@ tree. An additional intellectual property rights grant can be found
-@ in the file PATENTS.  All contributing project authors may
-@ be found in the AUTHORS file in the root of the source tree.
-@
-
-@ This file contains the function WebRtcSpl_ComplexBitReverse(), optimized
-@ for ARMv5 platforms.
-@ Reference C code is in file complex_bit_reverse.c. Bit-exact.
-#if defined(__arm__) || defined(_M_ARM) || defined(__aarch64__)
-
-#include "rtc_base/system/asm_defines.h"
-
-GLOBAL_FUNCTION WebRtcSpl_ComplexBitReverse
-.align  2
-DEFINE_FUNCTION WebRtcSpl_ComplexBitReverse
-  push {r4-r7}
-
-  cmp r1, #7
-  adr r3, index_7                 @ Table pointer.
-  mov r4, #112                    @ Number of interations.
-  beq PRE_LOOP_STAGES_7_OR_8
-
-  cmp r1, #8
-  adr r3, index_8                 @ Table pointer.
-  mov r4, #240                    @ Number of interations.
-  beq PRE_LOOP_STAGES_7_OR_8
-
-  mov r3, #1                      @ Initialize m.
-  mov r1, r3, asl r1              @ n = 1 << stages;
-  subs r6, r1, #1                 @ nn = n - 1;
-  ble END
-
-  mov r5, r0                      @ &complex_data
-  mov r4, #0                      @ ml
-
-LOOP_GENERIC:
-  rsb r12, r4, r6                 @ l > nn - mr
-  mov r2, r1                      @ n
-
-LOOP_SHIFT:
-  asr r2, #1                      @ l >>= 1;
-  cmp r2, r12
-  bgt LOOP_SHIFT
-
-  sub r12, r2, #1
-  and r4, r12, r4
-  add r4, r2                      @ mr = (mr & (l - 1)) + l;
-  cmp r4, r3                      @ mr <= m ?
-  ble UPDATE_REGISTERS
-
-  mov r12, r4, asl #2
-  ldr r7, [r5, #4]                @ complex_data[2 * m, 2 * m + 1].
-                                  @   Offset 4 due to m incrementing from 1.
-  ldr r2, [r0, r12]               @ complex_data[2 * mr, 2 * mr + 1].
-  str r7, [r0, r12]
-  str r2, [r5, #4]
-
-UPDATE_REGISTERS:
-  add r3, r3, #1
-  add r5, #4
-  cmp r3, r1
-  bne LOOP_GENERIC
-
-  b END
-
-PRE_LOOP_STAGES_7_OR_8:
-  add r4, r3, r4, asl #1
-
-LOOP_STAGES_7_OR_8:
-  ldrsh r2, [r3], #2              @ index[m]
-  ldrsh r5, [r3], #2              @ index[m + 1]
-  ldr r1, [r0, r2]                @ complex_data[index[m], index[m] + 1]
-  ldr r12, [r0, r5]               @ complex_data[index[m + 1], index[m + 1] + 1]
-  cmp r3, r4
-  str r1, [r0, r5]
-  str r12, [r0, r2]
-  bne LOOP_STAGES_7_OR_8
-
-END:
-  pop {r4-r7}
-  bx lr
-
-@ The index tables. Note the values are doubles of the actual indexes for 16-bit
-@ elements, different from the generic C code. It actually provides byte offsets
-@ for the indexes.
-
-.align  2
-index_7:  @ Indexes for stages == 7.
-  .short 4, 256, 8, 128, 12, 384, 16, 64, 20, 320, 24, 192, 28, 448, 36, 288
-  .short 40, 160, 44, 416, 48, 96, 52, 352, 56, 224, 60, 480, 68, 272, 72, 144
-  .short 76, 400, 84, 336, 88, 208, 92, 464, 100, 304, 104, 176, 108, 432, 116
-  .short 368, 120, 240, 124, 496, 132, 264, 140, 392, 148, 328, 152, 200, 156
-  .short 456, 164, 296, 172, 424, 180, 360, 184, 232, 188, 488, 196, 280, 204
-  .short 408, 212, 344, 220, 472, 228, 312, 236, 440, 244, 376, 252, 504, 268
-  .short 388, 276, 324, 284, 452, 300, 420, 308, 356, 316, 484, 332, 404, 348
-  .short 468, 364, 436, 380, 500, 412, 460, 444, 492
-
-index_8:  @ Indexes for stages == 8.
-  .short 4, 512, 8, 256, 12, 768, 16, 128, 20, 640, 24, 384, 28, 896, 32, 64
-  .short 36, 576, 40, 320, 44, 832, 48, 192, 52, 704, 56, 448, 60, 960, 68, 544
-  .short 72, 288, 76, 800, 80, 160, 84, 672, 88, 416, 92, 928, 100, 608, 104
-  .short 352, 108, 864, 112, 224, 116, 736, 120, 480, 124, 992, 132, 528, 136
-  .short 272, 140, 784, 148, 656, 152, 400, 156, 912, 164, 592, 168, 336, 172
-  .short 848, 176, 208, 180, 720, 184, 464, 188, 976, 196, 560, 200, 304, 204
-  .short 816, 212, 688, 216, 432, 220, 944, 228, 624, 232, 368, 236, 880, 244
-  .short 752, 248, 496, 252, 1008, 260, 520, 268, 776, 276, 648, 280, 392, 284
-  .short 904, 292, 584, 296, 328, 300, 840, 308, 712, 312, 456, 316, 968, 324
-  .short 552, 332, 808, 340, 680, 344, 424, 348, 936, 356, 616, 364, 872, 372
-  .short 744, 376, 488, 380, 1000, 388, 536, 396, 792, 404, 664, 412, 920, 420
-  .short 600, 428, 856, 436, 728, 440, 472, 444, 984, 452, 568, 460, 824, 468
-  .short 696, 476, 952, 484, 632, 492, 888, 500, 760, 508, 1016, 524, 772, 532
-  .short 644, 540, 900, 548, 580, 556, 836, 564, 708, 572, 964, 588, 804, 596
-  .short 676, 604, 932, 620, 868, 628, 740, 636, 996, 652, 788, 668, 916, 684
-  .short 852, 692, 724, 700, 980, 716, 820, 732, 948, 748, 884, 764, 1012, 796
-  .short 908, 812, 844, 828, 972, 860, 940, 892, 1004, 956, 988
-
-#endif
diff --git a/submodules/libtgvoip/webrtc_dsp/common_audio/signal_processing/complex_fft.c b/submodules/libtgvoip/webrtc_dsp/common_audio/signal_processing/complex_fft.c
deleted file mode 100644
index ddc9a97b59..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/common_audio/signal_processing/complex_fft.c
+++ /dev/null
@@ -1,299 +0,0 @@
-/*
- *  Copyright (c) 2011 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-
-/*
- * This file contains the function WebRtcSpl_ComplexFFT().
- * The description header can be found in signal_processing_library.h
- *
- */
-
-#include "common_audio/signal_processing/complex_fft_tables.h"
-#include "common_audio/signal_processing/include/signal_processing_library.h"
-#include "rtc_base/system/arch.h"
-
-#define CFFTSFT 14
-#define CFFTRND 1
-#define CFFTRND2 16384
-
-#define CIFFTSFT 14
-#define CIFFTRND 1
-
-
-int WebRtcSpl_ComplexFFT(int16_t frfi[], int stages, int mode)
-{
-    int i, j, l, k, istep, n, m;
-    int16_t wr, wi;
-    int32_t tr32, ti32, qr32, qi32;
-
-    /* The 1024-value is a constant given from the size of kSinTable1024[],
-     * and should not be changed depending on the input parameter 'stages'
-     */
-    n = 1 << stages;
-    if (n > 1024)
-        return -1;
-
-    l = 1;
-    k = 10 - 1; /* Constant for given kSinTable1024[]. Do not change
-         depending on the input parameter 'stages' */
-
-    if (mode == 0)
-    {
-        // mode==0: Low-complexity and Low-accuracy mode
-        while (l < n)
-        {
-            istep = l << 1;
-
-            for (m = 0; m < l; ++m)
-            {
-                j = m << k;
-
-                /* The 256-value is a constant given as 1/4 of the size of
-                 * kSinTable1024[], and should not be changed depending on the input
-                 * parameter 'stages'. It will result in 0 <= j < N_SINE_WAVE/2
-                 */
-                wr = kSinTable1024[j + 256];
-                wi = -kSinTable1024[j];
-
-                for (i = m; i < n; i += istep)
-                {
-                    j = i + l;
-
-                    tr32 = (wr * frfi[2 * j] - wi * frfi[2 * j + 1]) >> 15;
-
-                    ti32 = (wr * frfi[2 * j + 1] + wi * frfi[2 * j]) >> 15;
-
-                    qr32 = (int32_t)frfi[2 * i];
-                    qi32 = (int32_t)frfi[2 * i + 1];
-                    frfi[2 * j] = (int16_t)((qr32 - tr32) >> 1);
-                    frfi[2 * j + 1] = (int16_t)((qi32 - ti32) >> 1);
-                    frfi[2 * i] = (int16_t)((qr32 + tr32) >> 1);
-                    frfi[2 * i + 1] = (int16_t)((qi32 + ti32) >> 1);
-                }
-            }
-
-            --k;
-            l = istep;
-
-        }
-
-    } else
-    {
-        // mode==1: High-complexity and High-accuracy mode
-        while (l < n)
-        {
-            istep = l << 1;
-
-            for (m = 0; m < l; ++m)
-            {
-                j = m << k;
-
-                /* The 256-value is a constant given as 1/4 of the size of
-                 * kSinTable1024[], and should not be changed depending on the input
-                 * parameter 'stages'. It will result in 0 <= j < N_SINE_WAVE/2
-                 */
-                wr = kSinTable1024[j + 256];
-                wi = -kSinTable1024[j];
-
-#ifdef WEBRTC_ARCH_ARM_V7
-                int32_t wri = 0;
-                __asm __volatile("pkhbt %0, %1, %2, lsl #16" : "=r"(wri) :
-                    "r"((int32_t)wr), "r"((int32_t)wi));
-#endif
-
-                for (i = m; i < n; i += istep)
-                {
-                    j = i + l;
-
-#ifdef WEBRTC_ARCH_ARM_V7
-                    register int32_t frfi_r;
-                    __asm __volatile(
-                        "pkhbt %[frfi_r], %[frfi_even], %[frfi_odd],"
-                        " lsl #16\n\t"
-                        "smlsd %[tr32], %[wri], %[frfi_r], %[cfftrnd]\n\t"
-                        "smladx %[ti32], %[wri], %[frfi_r], %[cfftrnd]\n\t"
-                        :[frfi_r]"=&r"(frfi_r),
-                         [tr32]"=&r"(tr32),
-                         [ti32]"=r"(ti32)
-                        :[frfi_even]"r"((int32_t)frfi[2*j]),
-                         [frfi_odd]"r"((int32_t)frfi[2*j +1]),
-                         [wri]"r"(wri),
-                         [cfftrnd]"r"(CFFTRND));
-#else
-                    tr32 = wr * frfi[2 * j] - wi * frfi[2 * j + 1] + CFFTRND;
-
-                    ti32 = wr * frfi[2 * j + 1] + wi * frfi[2 * j] + CFFTRND;
-#endif
-
-                    tr32 >>= 15 - CFFTSFT;
-                    ti32 >>= 15 - CFFTSFT;
-
-                    qr32 = ((int32_t)frfi[2 * i]) * (1 << CFFTSFT);
-                    qi32 = ((int32_t)frfi[2 * i + 1]) * (1 << CFFTSFT);
-
-                    frfi[2 * j] = (int16_t)(
-                        (qr32 - tr32 + CFFTRND2) >> (1 + CFFTSFT));
-                    frfi[2 * j + 1] = (int16_t)(
-                        (qi32 - ti32 + CFFTRND2) >> (1 + CFFTSFT));
-                    frfi[2 * i] = (int16_t)(
-                        (qr32 + tr32 + CFFTRND2) >> (1 + CFFTSFT));
-                    frfi[2 * i + 1] = (int16_t)(
-                        (qi32 + ti32 + CFFTRND2) >> (1 + CFFTSFT));
-                }
-            }
-
-            --k;
-            l = istep;
-        }
-    }
-    return 0;
-}
-
-int WebRtcSpl_ComplexIFFT(int16_t frfi[], int stages, int mode)
-{
-    size_t i, j, l, istep, n, m;
-    int k, scale, shift;
-    int16_t wr, wi;
-    int32_t tr32, ti32, qr32, qi32;
-    int32_t tmp32, round2;
-
-    /* The 1024-value is a constant given from the size of kSinTable1024[],
-     * and should not be changed depending on the input parameter 'stages'
-     */
-    n = ((size_t)1) << stages;
-    if (n > 1024)
-        return -1;
-
-    scale = 0;
-
-    l = 1;
-    k = 10 - 1; /* Constant for given kSinTable1024[]. Do not change
-         depending on the input parameter 'stages' */
-
-    while (l < n)
-    {
-        // variable scaling, depending upon data
-        shift = 0;
-        round2 = 8192;
-
-        tmp32 = WebRtcSpl_MaxAbsValueW16(frfi, 2 * n);
-        if (tmp32 > 13573)
-        {
-            shift++;
-            scale++;
-            round2 <<= 1;
-        }
-        if (tmp32 > 27146)
-        {
-            shift++;
-            scale++;
-            round2 <<= 1;
-        }
-
-        istep = l << 1;
-
-        if (mode == 0)
-        {
-            // mode==0: Low-complexity and Low-accuracy mode
-            for (m = 0; m < l; ++m)
-            {
-                j = m << k;
-
-                /* The 256-value is a constant given as 1/4 of the size of
-                 * kSinTable1024[], and should not be changed depending on the input
-                 * parameter 'stages'. It will result in 0 <= j < N_SINE_WAVE/2
-                 */
-                wr = kSinTable1024[j + 256];
-                wi = kSinTable1024[j];
-
-                for (i = m; i < n; i += istep)
-                {
-                    j = i + l;
-
-                    tr32 = (wr * frfi[2 * j] - wi * frfi[2 * j + 1]) >> 15;
-
-                    ti32 = (wr * frfi[2 * j + 1] + wi * frfi[2 * j]) >> 15;
-
-                    qr32 = (int32_t)frfi[2 * i];
-                    qi32 = (int32_t)frfi[2 * i + 1];
-                    frfi[2 * j] = (int16_t)((qr32 - tr32) >> shift);
-                    frfi[2 * j + 1] = (int16_t)((qi32 - ti32) >> shift);
-                    frfi[2 * i] = (int16_t)((qr32 + tr32) >> shift);
-                    frfi[2 * i + 1] = (int16_t)((qi32 + ti32) >> shift);
-                }
-            }
-        } else
-        {
-            // mode==1: High-complexity and High-accuracy mode
-
-            for (m = 0; m < l; ++m)
-            {
-                j = m << k;
-
-                /* The 256-value is a constant given as 1/4 of the size of
-                 * kSinTable1024[], and should not be changed depending on the input
-                 * parameter 'stages'. It will result in 0 <= j < N_SINE_WAVE/2
-                 */
-                wr = kSinTable1024[j + 256];
-                wi = kSinTable1024[j];
-
-#ifdef WEBRTC_ARCH_ARM_V7
-                int32_t wri = 0;
-                __asm __volatile("pkhbt %0, %1, %2, lsl #16" : "=r"(wri) :
-                    "r"((int32_t)wr), "r"((int32_t)wi));
-#endif
-
-                for (i = m; i < n; i += istep)
-                {
-                    j = i + l;
-
-#ifdef WEBRTC_ARCH_ARM_V7
-                    register int32_t frfi_r;
-                    __asm __volatile(
-                      "pkhbt %[frfi_r], %[frfi_even], %[frfi_odd], lsl #16\n\t"
-                      "smlsd %[tr32], %[wri], %[frfi_r], %[cifftrnd]\n\t"
-                      "smladx %[ti32], %[wri], %[frfi_r], %[cifftrnd]\n\t"
-                      :[frfi_r]"=&r"(frfi_r),
-                       [tr32]"=&r"(tr32),
-                       [ti32]"=r"(ti32)
-                      :[frfi_even]"r"((int32_t)frfi[2*j]),
-                       [frfi_odd]"r"((int32_t)frfi[2*j +1]),
-                       [wri]"r"(wri),
-                       [cifftrnd]"r"(CIFFTRND)
-                    );
-#else
-
-                    tr32 = wr * frfi[2 * j] - wi * frfi[2 * j + 1] + CIFFTRND;
-
-                    ti32 = wr * frfi[2 * j + 1] + wi * frfi[2 * j] + CIFFTRND;
-#endif
-                    tr32 >>= 15 - CIFFTSFT;
-                    ti32 >>= 15 - CIFFTSFT;
-
-                    qr32 = ((int32_t)frfi[2 * i]) * (1 << CIFFTSFT);
-                    qi32 = ((int32_t)frfi[2 * i + 1]) * (1 << CIFFTSFT);
-
-                    frfi[2 * j] = (int16_t)(
-                        (qr32 - tr32 + round2) >> (shift + CIFFTSFT));
-                    frfi[2 * j + 1] = (int16_t)(
-                        (qi32 - ti32 + round2) >> (shift + CIFFTSFT));
-                    frfi[2 * i] = (int16_t)(
-                        (qr32 + tr32 + round2) >> (shift + CIFFTSFT));
-                    frfi[2 * i + 1] = (int16_t)(
-                        (qi32 + ti32 + round2) >> (shift + CIFFTSFT));
-                }
-            }
-
-        }
-        --k;
-        l = istep;
-    }
-    return scale;
-}
diff --git a/submodules/libtgvoip/webrtc_dsp/common_audio/signal_processing/complex_fft_tables.h b/submodules/libtgvoip/webrtc_dsp/common_audio/signal_processing/complex_fft_tables.h
deleted file mode 100644
index 90fac072d2..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/common_audio/signal_processing/complex_fft_tables.h
+++ /dev/null
@@ -1,132 +0,0 @@
-/*
- *  Copyright (c) 2013 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#ifndef COMMON_AUDIO_SIGNAL_PROCESSING_COMPLEX_FFT_TABLES_H_
-#define COMMON_AUDIO_SIGNAL_PROCESSING_COMPLEX_FFT_TABLES_H_
-
-#include <stdint.h>
-
-static const int16_t kSinTable1024[] = {
-    0,      201,    402,    603,    804,    1005,   1206,   1406,   1607,
-    1808,   2009,   2209,   2410,   2610,   2811,   3011,   3211,   3411,
-    3611,   3811,   4011,   4210,   4409,   4608,   4807,   5006,   5205,
-    5403,   5601,   5799,   5997,   6195,   6392,   6589,   6786,   6982,
-    7179,   7375,   7571,   7766,   7961,   8156,   8351,   8545,   8739,
-    8932,   9126,   9319,   9511,   9703,   9895,   10087,  10278,  10469,
-    10659,  10849,  11038,  11227,  11416,  11604,  11792,  11980,  12166,
-    12353,  12539,  12724,  12909,  13094,  13278,  13462,  13645,  13827,
-    14009,  14191,  14372,  14552,  14732,  14911,  15090,  15268,  15446,
-    15623,  15799,  15975,  16150,  16325,  16499,  16672,  16845,  17017,
-    17189,  17360,  17530,  17699,  17868,  18036,  18204,  18371,  18537,
-    18702,  18867,  19031,  19194,  19357,  19519,  19680,  19840,  20000,
-    20159,  20317,  20474,  20631,  20787,  20942,  21096,  21249,  21402,
-    21554,  21705,  21855,  22004,  22153,  22301,  22448,  22594,  22739,
-    22883,  23027,  23169,  23311,  23452,  23592,  23731,  23869,  24006,
-    24143,  24278,  24413,  24546,  24679,  24811,  24942,  25072,  25201,
-    25329,  25456,  25582,  25707,  25831,  25954,  26077,  26198,  26318,
-    26437,  26556,  26673,  26789,  26905,  27019,  27132,  27244,  27355,
-    27466,  27575,  27683,  27790,  27896,  28001,  28105,  28208,  28309,
-    28410,  28510,  28608,  28706,  28802,  28897,  28992,  29085,  29177,
-    29268,  29358,  29446,  29534,  29621,  29706,  29790,  29873,  29955,
-    30036,  30116,  30195,  30272,  30349,  30424,  30498,  30571,  30643,
-    30713,  30783,  30851,  30918,  30984,  31049,  31113,  31175,  31236,
-    31297,  31356,  31413,  31470,  31525,  31580,  31633,  31684,  31735,
-    31785,  31833,  31880,  31926,  31970,  32014,  32056,  32097,  32137,
-    32176,  32213,  32249,  32284,  32318,  32350,  32382,  32412,  32441,
-    32468,  32495,  32520,  32544,  32567,  32588,  32609,  32628,  32646,
-    32662,  32678,  32692,  32705,  32717,  32727,  32736,  32744,  32751,
-    32757,  32761,  32764,  32766,  32767,  32766,  32764,  32761,  32757,
-    32751,  32744,  32736,  32727,  32717,  32705,  32692,  32678,  32662,
-    32646,  32628,  32609,  32588,  32567,  32544,  32520,  32495,  32468,
-    32441,  32412,  32382,  32350,  32318,  32284,  32249,  32213,  32176,
-    32137,  32097,  32056,  32014,  31970,  31926,  31880,  31833,  31785,
-    31735,  31684,  31633,  31580,  31525,  31470,  31413,  31356,  31297,
-    31236,  31175,  31113,  31049,  30984,  30918,  30851,  30783,  30713,
-    30643,  30571,  30498,  30424,  30349,  30272,  30195,  30116,  30036,
-    29955,  29873,  29790,  29706,  29621,  29534,  29446,  29358,  29268,
-    29177,  29085,  28992,  28897,  28802,  28706,  28608,  28510,  28410,
-    28309,  28208,  28105,  28001,  27896,  27790,  27683,  27575,  27466,
-    27355,  27244,  27132,  27019,  26905,  26789,  26673,  26556,  26437,
-    26318,  26198,  26077,  25954,  25831,  25707,  25582,  25456,  25329,
-    25201,  25072,  24942,  24811,  24679,  24546,  24413,  24278,  24143,
-    24006,  23869,  23731,  23592,  23452,  23311,  23169,  23027,  22883,
-    22739,  22594,  22448,  22301,  22153,  22004,  21855,  21705,  21554,
-    21402,  21249,  21096,  20942,  20787,  20631,  20474,  20317,  20159,
-    20000,  19840,  19680,  19519,  19357,  19194,  19031,  18867,  18702,
-    18537,  18371,  18204,  18036,  17868,  17699,  17530,  17360,  17189,
-    17017,  16845,  16672,  16499,  16325,  16150,  15975,  15799,  15623,
-    15446,  15268,  15090,  14911,  14732,  14552,  14372,  14191,  14009,
-    13827,  13645,  13462,  13278,  13094,  12909,  12724,  12539,  12353,
-    12166,  11980,  11792,  11604,  11416,  11227,  11038,  10849,  10659,
-    10469,  10278,  10087,  9895,   9703,   9511,   9319,   9126,   8932,
-    8739,   8545,   8351,   8156,   7961,   7766,   7571,   7375,   7179,
-    6982,   6786,   6589,   6392,   6195,   5997,   5799,   5601,   5403,
-    5205,   5006,   4807,   4608,   4409,   4210,   4011,   3811,   3611,
-    3411,   3211,   3011,   2811,   2610,   2410,   2209,   2009,   1808,
-    1607,   1406,   1206,   1005,   804,    603,    402,    201,    0,
-    -201,   -402,   -603,   -804,   -1005,  -1206,  -1406,  -1607,  -1808,
-    -2009,  -2209,  -2410,  -2610,  -2811,  -3011,  -3211,  -3411,  -3611,
-    -3811,  -4011,  -4210,  -4409,  -4608,  -4807,  -5006,  -5205,  -5403,
-    -5601,  -5799,  -5997,  -6195,  -6392,  -6589,  -6786,  -6982,  -7179,
-    -7375,  -7571,  -7766,  -7961,  -8156,  -8351,  -8545,  -8739,  -8932,
-    -9126,  -9319,  -9511,  -9703,  -9895,  -10087, -10278, -10469, -10659,
-    -10849, -11038, -11227, -11416, -11604, -11792, -11980, -12166, -12353,
-    -12539, -12724, -12909, -13094, -13278, -13462, -13645, -13827, -14009,
-    -14191, -14372, -14552, -14732, -14911, -15090, -15268, -15446, -15623,
-    -15799, -15975, -16150, -16325, -16499, -16672, -16845, -17017, -17189,
-    -17360, -17530, -17699, -17868, -18036, -18204, -18371, -18537, -18702,
-    -18867, -19031, -19194, -19357, -19519, -19680, -19840, -20000, -20159,
-    -20317, -20474, -20631, -20787, -20942, -21096, -21249, -21402, -21554,
-    -21705, -21855, -22004, -22153, -22301, -22448, -22594, -22739, -22883,
-    -23027, -23169, -23311, -23452, -23592, -23731, -23869, -24006, -24143,
-    -24278, -24413, -24546, -24679, -24811, -24942, -25072, -25201, -25329,
-    -25456, -25582, -25707, -25831, -25954, -26077, -26198, -26318, -26437,
-    -26556, -26673, -26789, -26905, -27019, -27132, -27244, -27355, -27466,
-    -27575, -27683, -27790, -27896, -28001, -28105, -28208, -28309, -28410,
-    -28510, -28608, -28706, -28802, -28897, -28992, -29085, -29177, -29268,
-    -29358, -29446, -29534, -29621, -29706, -29790, -29873, -29955, -30036,
-    -30116, -30195, -30272, -30349, -30424, -30498, -30571, -30643, -30713,
-    -30783, -30851, -30918, -30984, -31049, -31113, -31175, -31236, -31297,
-    -31356, -31413, -31470, -31525, -31580, -31633, -31684, -31735, -31785,
-    -31833, -31880, -31926, -31970, -32014, -32056, -32097, -32137, -32176,
-    -32213, -32249, -32284, -32318, -32350, -32382, -32412, -32441, -32468,
-    -32495, -32520, -32544, -32567, -32588, -32609, -32628, -32646, -32662,
-    -32678, -32692, -32705, -32717, -32727, -32736, -32744, -32751, -32757,
-    -32761, -32764, -32766, -32767, -32766, -32764, -32761, -32757, -32751,
-    -32744, -32736, -32727, -32717, -32705, -32692, -32678, -32662, -32646,
-    -32628, -32609, -32588, -32567, -32544, -32520, -32495, -32468, -32441,
-    -32412, -32382, -32350, -32318, -32284, -32249, -32213, -32176, -32137,
-    -32097, -32056, -32014, -31970, -31926, -31880, -31833, -31785, -31735,
-    -31684, -31633, -31580, -31525, -31470, -31413, -31356, -31297, -31236,
-    -31175, -31113, -31049, -30984, -30918, -30851, -30783, -30713, -30643,
-    -30571, -30498, -30424, -30349, -30272, -30195, -30116, -30036, -29955,
-    -29873, -29790, -29706, -29621, -29534, -29446, -29358, -29268, -29177,
-    -29085, -28992, -28897, -28802, -28706, -28608, -28510, -28410, -28309,
-    -28208, -28105, -28001, -27896, -27790, -27683, -27575, -27466, -27355,
-    -27244, -27132, -27019, -26905, -26789, -26673, -26556, -26437, -26318,
-    -26198, -26077, -25954, -25831, -25707, -25582, -25456, -25329, -25201,
-    -25072, -24942, -24811, -24679, -24546, -24413, -24278, -24143, -24006,
-    -23869, -23731, -23592, -23452, -23311, -23169, -23027, -22883, -22739,
-    -22594, -22448, -22301, -22153, -22004, -21855, -21705, -21554, -21402,
-    -21249, -21096, -20942, -20787, -20631, -20474, -20317, -20159, -20000,
-    -19840, -19680, -19519, -19357, -19194, -19031, -18867, -18702, -18537,
-    -18371, -18204, -18036, -17868, -17699, -17530, -17360, -17189, -17017,
-    -16845, -16672, -16499, -16325, -16150, -15975, -15799, -15623, -15446,
-    -15268, -15090, -14911, -14732, -14552, -14372, -14191, -14009, -13827,
-    -13645, -13462, -13278, -13094, -12909, -12724, -12539, -12353, -12166,
-    -11980, -11792, -11604, -11416, -11227, -11038, -10849, -10659, -10469,
-    -10278, -10087, -9895,  -9703,  -9511,  -9319,  -9126,  -8932,  -8739,
-    -8545,  -8351,  -8156,  -7961,  -7766,  -7571,  -7375,  -7179,  -6982,
-    -6786,  -6589,  -6392,  -6195,  -5997,  -5799,  -5601,  -5403,  -5205,
-    -5006,  -4807,  -4608,  -4409,  -4210,  -4011,  -3811,  -3611,  -3411,
-    -3211,  -3011,  -2811,  -2610,  -2410,  -2209,  -2009,  -1808,  -1607,
-    -1406,  -1206,  -1005,  -804,   -603,   -402,   -201};
-
-#endif  // COMMON_AUDIO_SIGNAL_PROCESSING_COMPLEX_FFT_TABLES_H_
diff --git a/submodules/libtgvoip/webrtc_dsp/common_audio/signal_processing/copy_set_operations.c b/submodules/libtgvoip/webrtc_dsp/common_audio/signal_processing/copy_set_operations.c
deleted file mode 100644
index ae709d40f0..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/common_audio/signal_processing/copy_set_operations.c
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
- *  Copyright (c) 2011 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-
-/*
- * This file contains the implementation of functions
- * WebRtcSpl_MemSetW16()
- * WebRtcSpl_MemSetW32()
- * WebRtcSpl_MemCpyReversedOrder()
- * WebRtcSpl_CopyFromEndW16()
- * WebRtcSpl_ZerosArrayW16()
- * WebRtcSpl_ZerosArrayW32()
- *
- * The description header can be found in signal_processing_library.h
- *
- */
-
-#include <string.h>
-#include "common_audio/signal_processing/include/signal_processing_library.h"
-
-
-void WebRtcSpl_MemSetW16(int16_t *ptr, int16_t set_value, size_t length)
-{
-    size_t j;
-    int16_t *arrptr = ptr;
-
-    for (j = length; j > 0; j--)
-    {
-        *arrptr++ = set_value;
-    }
-}
-
-void WebRtcSpl_MemSetW32(int32_t *ptr, int32_t set_value, size_t length)
-{
-    size_t j;
-    int32_t *arrptr = ptr;
-
-    for (j = length; j > 0; j--)
-    {
-        *arrptr++ = set_value;
-    }
-}
-
-void WebRtcSpl_MemCpyReversedOrder(int16_t* dest,
-                                   int16_t* source,
-                                   size_t length)
-{
-    size_t j;
-    int16_t* destPtr = dest;
-    int16_t* sourcePtr = source;
-
-    for (j = 0; j < length; j++)
-    {
-        *destPtr-- = *sourcePtr++;
-    }
-}
-
-void WebRtcSpl_CopyFromEndW16(const int16_t *vector_in,
-                              size_t length,
-                              size_t samples,
-                              int16_t *vector_out)
-{
-    // Copy the last <samples> of the input vector to vector_out
-    WEBRTC_SPL_MEMCPY_W16(vector_out, &vector_in[length - samples], samples);
-}
-
-void WebRtcSpl_ZerosArrayW16(int16_t *vector, size_t length)
-{
-    WebRtcSpl_MemSetW16(vector, 0, length);
-}
-
-void WebRtcSpl_ZerosArrayW32(int32_t *vector, size_t length)
-{
-    WebRtcSpl_MemSetW32(vector, 0, length);
-}
diff --git a/submodules/libtgvoip/webrtc_dsp/common_audio/signal_processing/cross_correlation.c b/submodules/libtgvoip/webrtc_dsp/common_audio/signal_processing/cross_correlation.c
deleted file mode 100644
index c6267c92c2..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/common_audio/signal_processing/cross_correlation.c
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- *  Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#include "common_audio/signal_processing/include/signal_processing_library.h"
-
-/* C version of WebRtcSpl_CrossCorrelation() for generic platforms. */
-void WebRtcSpl_CrossCorrelationC(int32_t* cross_correlation,
-                                 const int16_t* seq1,
-                                 const int16_t* seq2,
-                                 size_t dim_seq,
-                                 size_t dim_cross_correlation,
-                                 int right_shifts,
-                                 int step_seq2) {
-  size_t i = 0, j = 0;
-
-  for (i = 0; i < dim_cross_correlation; i++) {
-    int32_t corr = 0;
-    for (j = 0; j < dim_seq; j++)
-      corr += (seq1[j] * seq2[j]) >> right_shifts;
-    seq2 += step_seq2;
-    *cross_correlation++ = corr;
-  }
-}
diff --git a/submodules/libtgvoip/webrtc_dsp/common_audio/signal_processing/cross_correlation_neon.c b/submodules/libtgvoip/webrtc_dsp/common_audio/signal_processing/cross_correlation_neon.c
deleted file mode 100644
index 0a073b24a3..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/common_audio/signal_processing/cross_correlation_neon.c
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
- *  Copyright (c) 2014 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-#if defined(__arm__) || defined(_M_ARM) || defined(__aarch64__)
-
-#include "common_audio/signal_processing/include/signal_processing_library.h"
-#include "rtc_base/system/arch.h"
-
-#include <arm_neon.h>
-
-static inline void DotProductWithScaleNeon(int32_t* cross_correlation,
-                                           const int16_t* vector1,
-                                           const int16_t* vector2,
-                                           size_t length,
-                                           int scaling) {
-  size_t i = 0;
-  size_t len1 = length >> 3;
-  size_t len2 = length & 7;
-  int64x2_t sum0 = vdupq_n_s64(0);
-  int64x2_t sum1 = vdupq_n_s64(0);
-
-  for (i = len1; i > 0; i -= 1) {
-    int16x8_t seq1_16x8 = vld1q_s16(vector1);
-    int16x8_t seq2_16x8 = vld1q_s16(vector2);
-#if defined(WEBRTC_ARCH_ARM64)
-    int32x4_t tmp0 = vmull_s16(vget_low_s16(seq1_16x8),
-                               vget_low_s16(seq2_16x8));
-    int32x4_t tmp1 = vmull_high_s16(seq1_16x8, seq2_16x8);
-#else
-    int32x4_t tmp0 = vmull_s16(vget_low_s16(seq1_16x8),
-                               vget_low_s16(seq2_16x8));
-    int32x4_t tmp1 = vmull_s16(vget_high_s16(seq1_16x8),
-                               vget_high_s16(seq2_16x8));
-#endif
-    sum0 = vpadalq_s32(sum0, tmp0);
-    sum1 = vpadalq_s32(sum1, tmp1);
-    vector1 += 8;
-    vector2 += 8;
-  }
-
-  // Calculate the rest of the samples.
-  int64_t sum_res = 0;
-  for (i = len2; i > 0; i -= 1) {
-    sum_res += WEBRTC_SPL_MUL_16_16(*vector1, *vector2);
-    vector1++;
-    vector2++;
-  }
-
-  sum0 = vaddq_s64(sum0, sum1);
-#if defined(WEBRTC_ARCH_ARM64)
-  int64_t sum2 = vaddvq_s64(sum0);
-  *cross_correlation = (int32_t)((sum2 + sum_res) >> scaling);
-#else
-  int64x1_t shift = vdup_n_s64(-scaling);
-  int64x1_t sum2 = vadd_s64(vget_low_s64(sum0), vget_high_s64(sum0));
-  sum2 = vadd_s64(sum2, vdup_n_s64(sum_res));
-  sum2 = vshl_s64(sum2, shift);
-  vst1_lane_s32(cross_correlation, vreinterpret_s32_s64(sum2), 0);
-#endif
-}
-
-/* NEON version of WebRtcSpl_CrossCorrelation() for ARM32/64 platforms. */
-void WebRtcSpl_CrossCorrelationNeon(int32_t* cross_correlation,
-                                    const int16_t* seq1,
-                                    const int16_t* seq2,
-                                    size_t dim_seq,
-                                    size_t dim_cross_correlation,
-                                    int right_shifts,
-                                    int step_seq2) {
-  size_t i = 0;
-
-  for (i = 0; i < dim_cross_correlation; i++) {
-    const int16_t* seq1_ptr = seq1;
-    const int16_t* seq2_ptr = seq2 + (step_seq2 * i);
-
-    DotProductWithScaleNeon(cross_correlation,
-                            seq1_ptr,
-                            seq2_ptr,
-                            dim_seq,
-                            right_shifts);
-    cross_correlation++;
-  }
-}
-
-#endif
diff --git a/submodules/libtgvoip/webrtc_dsp/common_audio/signal_processing/division_operations.c b/submodules/libtgvoip/webrtc_dsp/common_audio/signal_processing/division_operations.c
deleted file mode 100644
index c6195e7999..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/common_audio/signal_processing/division_operations.c
+++ /dev/null
@@ -1,141 +0,0 @@
-/*
- *  Copyright (c) 2011 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-
-/*
- * This file contains implementations of the divisions
- * WebRtcSpl_DivU32U16()
- * WebRtcSpl_DivW32W16()
- * WebRtcSpl_DivW32W16ResW16()
- * WebRtcSpl_DivResultInQ31()
- * WebRtcSpl_DivW32HiLow()
- *
- * The description header can be found in signal_processing_library.h
- *
- */
-
-#include "common_audio/signal_processing/include/signal_processing_library.h"
-#include "rtc_base/sanitizer.h"
-
-uint32_t WebRtcSpl_DivU32U16(uint32_t num, uint16_t den)
-{
-    // Guard against division with 0
-    if (den != 0)
-    {
-        return (uint32_t)(num / den);
-    } else
-    {
-        return (uint32_t)0xFFFFFFFF;
-    }
-}
-
-int32_t WebRtcSpl_DivW32W16(int32_t num, int16_t den)
-{
-    // Guard against division with 0
-    if (den != 0)
-    {
-        return (int32_t)(num / den);
-    } else
-    {
-        return (int32_t)0x7FFFFFFF;
-    }
-}
-
-int16_t WebRtcSpl_DivW32W16ResW16(int32_t num, int16_t den)
-{
-    // Guard against division with 0
-    if (den != 0)
-    {
-        return (int16_t)(num / den);
-    } else
-    {
-        return (int16_t)0x7FFF;
-    }
-}
-
-int32_t WebRtcSpl_DivResultInQ31(int32_t num, int32_t den)
-{
-    int32_t L_num = num;
-    int32_t L_den = den;
-    int32_t div = 0;
-    int k = 31;
-    int change_sign = 0;
-
-    if (num == 0)
-        return 0;
-
-    if (num < 0)
-    {
-        change_sign++;
-        L_num = -num;
-    }
-    if (den < 0)
-    {
-        change_sign++;
-        L_den = -den;
-    }
-    while (k--)
-    {
-        div <<= 1;
-        L_num <<= 1;
-        if (L_num >= L_den)
-        {
-            L_num -= L_den;
-            div++;
-        }
-    }
-    if (change_sign == 1)
-    {
-        div = -div;
-    }
-    return div;
-}
-
-int32_t RTC_NO_SANITIZE("signed-integer-overflow")  // bugs.webrtc.org/5486
-WebRtcSpl_DivW32HiLow(int32_t num, int16_t den_hi, int16_t den_low)
-{
-    int16_t approx, tmp_hi, tmp_low, num_hi, num_low;
-    int32_t tmpW32;
-
-    approx = (int16_t)WebRtcSpl_DivW32W16((int32_t)0x1FFFFFFF, den_hi);
-    // result in Q14 (Note: 3FFFFFFF = 0.5 in Q30)
-
-    // tmpW32 = 1/den = approx * (2.0 - den * approx) (in Q30)
-    tmpW32 = (den_hi * approx << 1) + ((den_low * approx >> 15) << 1);
-    // tmpW32 = den * approx
-
-    tmpW32 = (int32_t)0x7fffffffL - tmpW32; // result in Q30 (tmpW32 = 2.0-(den*approx))
-    // UBSan: 2147483647 - -2 cannot be represented in type 'int'
-
-    // Store tmpW32 in hi and low format
-    tmp_hi = (int16_t)(tmpW32 >> 16);
-    tmp_low = (int16_t)((tmpW32 - ((int32_t)tmp_hi << 16)) >> 1);
-
-    // tmpW32 = 1/den in Q29
-    tmpW32 = (tmp_hi * approx + (tmp_low * approx >> 15)) << 1;
-
-    // 1/den in hi and low format
-    tmp_hi = (int16_t)(tmpW32 >> 16);
-    tmp_low = (int16_t)((tmpW32 - ((int32_t)tmp_hi << 16)) >> 1);
-
-    // Store num in hi and low format
-    num_hi = (int16_t)(num >> 16);
-    num_low = (int16_t)((num - ((int32_t)num_hi << 16)) >> 1);
-
-    // num * (1/den) by 32 bit multiplication (result in Q28)
-
-    tmpW32 = num_hi * tmp_hi + (num_hi * tmp_low >> 15) +
-        (num_low * tmp_hi >> 15);
-
-    // Put result in Q31 (convert from Q28)
-    tmpW32 = WEBRTC_SPL_LSHIFT_W32(tmpW32, 3);
-
-    return tmpW32;
-}
diff --git a/submodules/libtgvoip/webrtc_dsp/common_audio/signal_processing/dot_product_with_scale.cc b/submodules/libtgvoip/webrtc_dsp/common_audio/signal_processing/dot_product_with_scale.cc
deleted file mode 100644
index 00799dae02..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/common_audio/signal_processing/dot_product_with_scale.cc
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- *  Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#include "common_audio/signal_processing/dot_product_with_scale.h"
-
-#include "rtc_base/numerics/safe_conversions.h"
-
-int32_t WebRtcSpl_DotProductWithScale(const int16_t* vector1,
-                                      const int16_t* vector2,
-                                      size_t length,
-                                      int scaling) {
-  int64_t sum = 0;
-  size_t i = 0;
-
-  /* Unroll the loop to improve performance. */
-  for (i = 0; i + 3 < length; i += 4) {
-    sum += (vector1[i + 0] * vector2[i + 0]) >> scaling;
-    sum += (vector1[i + 1] * vector2[i + 1]) >> scaling;
-    sum += (vector1[i + 2] * vector2[i + 2]) >> scaling;
-    sum += (vector1[i + 3] * vector2[i + 3]) >> scaling;
-  }
-  for (; i < length; i++) {
-    sum += (vector1[i] * vector2[i]) >> scaling;
-  }
-
-  return rtc::saturated_cast<int32_t>(sum);
-}
diff --git a/submodules/libtgvoip/webrtc_dsp/common_audio/signal_processing/dot_product_with_scale.h b/submodules/libtgvoip/webrtc_dsp/common_audio/signal_processing/dot_product_with_scale.h
deleted file mode 100644
index bb892d40cb..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/common_audio/signal_processing/dot_product_with_scale.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- *  Copyright (c) 2017 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#ifndef COMMON_AUDIO_SIGNAL_PROCESSING_DOT_PRODUCT_WITH_SCALE_H_
-#define COMMON_AUDIO_SIGNAL_PROCESSING_DOT_PRODUCT_WITH_SCALE_H_
-
-#include <stdint.h>
-#include <string.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-// Calculates the dot product between two (int16_t) vectors.
-//
-// Input:
-//      - vector1       : Vector 1
-//      - vector2       : Vector 2
-//      - vector_length : Number of samples used in the dot product
-//      - scaling       : The number of right bit shifts to apply on each term
-//                        during calculation to avoid overflow, i.e., the
-//                        output will be in Q(-|scaling|)
-//
-// Return value         : The dot product in Q(-scaling)
-int32_t WebRtcSpl_DotProductWithScale(const int16_t* vector1,
-                                      const int16_t* vector2,
-                                      size_t length,
-                                      int scaling);
-
-#ifdef __cplusplus
-}
-#endif  // __cplusplus
-#endif  // COMMON_AUDIO_SIGNAL_PROCESSING_DOT_PRODUCT_WITH_SCALE_H_
diff --git a/submodules/libtgvoip/webrtc_dsp/common_audio/signal_processing/downsample_fast.c b/submodules/libtgvoip/webrtc_dsp/common_audio/signal_processing/downsample_fast.c
deleted file mode 100644
index 80fdc58a49..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/common_audio/signal_processing/downsample_fast.c
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- *  Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#include "common_audio/signal_processing/include/signal_processing_library.h"
-
-#include "rtc_base/checks.h"
-#include "rtc_base/sanitizer.h"
-
-// TODO(Bjornv): Change the function parameter order to WebRTC code style.
-// C version of WebRtcSpl_DownsampleFast() for generic platforms.
-int WebRtcSpl_DownsampleFastC(const int16_t* data_in,
-                              size_t data_in_length,
-                              int16_t* data_out,
-                              size_t data_out_length,
-                              const int16_t* __restrict coefficients,
-                              size_t coefficients_length,
-                              int factor,
-                              size_t delay) {
-  int16_t* const original_data_out = data_out;
-  size_t i = 0;
-  size_t j = 0;
-  int32_t out_s32 = 0;
-  size_t endpos = delay + factor * (data_out_length - 1) + 1;
-
-  // Return error if any of the running conditions doesn't meet.
-  if (data_out_length == 0 || coefficients_length == 0
-                           || data_in_length < endpos) {
-    return -1;
-  }
-
-  rtc_MsanCheckInitialized(coefficients, sizeof(coefficients[0]),
-                           coefficients_length);
-
-  for (i = delay; i < endpos; i += factor) {
-    out_s32 = 2048;  // Round value, 0.5 in Q12.
-
-    for (j = 0; j < coefficients_length; j++) {
-      // Negative overflow is permitted here, because this is
-      // auto-regressive filters, and the state for each batch run is
-      // stored in the "negative" positions of the output vector.
-      rtc_MsanCheckInitialized(&data_in[(ptrdiff_t) i - (ptrdiff_t) j],
-          sizeof(data_in[0]), 1);
-      // out_s32 is in Q12 domain.
-      out_s32 += coefficients[j] * data_in[(ptrdiff_t) i - (ptrdiff_t) j];
-    }
-
-    out_s32 >>= 12;  // Q0.
-
-    // Saturate and store the output.
-    *data_out++ = WebRtcSpl_SatW32ToW16(out_s32);
-  }
-
-  RTC_DCHECK_EQ(original_data_out + data_out_length, data_out);
-  rtc_MsanCheckInitialized(original_data_out, sizeof(original_data_out[0]),
-                           data_out_length);
-
-  return 0;
-}
diff --git a/submodules/libtgvoip/webrtc_dsp/common_audio/signal_processing/downsample_fast_neon.c b/submodules/libtgvoip/webrtc_dsp/common_audio/signal_processing/downsample_fast_neon.c
deleted file mode 100644
index 5e72b9e2fb..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/common_audio/signal_processing/downsample_fast_neon.c
+++ /dev/null
@@ -1,220 +0,0 @@
-/*
- *  Copyright (c) 2014 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-#if defined(__arm__) || defined(_M_ARM) || defined(__aarch64__)
-
-#include "common_audio/signal_processing/include/signal_processing_library.h"
-
-#include <arm_neon.h>
-
-// NEON intrinsics version of WebRtcSpl_DownsampleFast()
-// for ARM 32-bit/64-bit platforms.
-int WebRtcSpl_DownsampleFastNeon(const int16_t* data_in,
-                                 size_t data_in_length,
-                                 int16_t* data_out,
-                                 size_t data_out_length,
-                                 const int16_t* __restrict coefficients,
-                                 size_t coefficients_length,
-                                 int factor,
-                                 size_t delay) {
-  size_t i = 0;
-  size_t j = 0;
-  int32_t out_s32 = 0;
-  size_t endpos = delay + factor * (data_out_length - 1) + 1;
-  size_t res = data_out_length & 0x7;
-  size_t endpos1 = endpos - factor * res;
-
-  // Return error if any of the running conditions doesn't meet.
-  if (data_out_length == 0 || coefficients_length == 0
-                           || data_in_length < endpos) {
-    return -1;
-  }
-
-  // First part, unroll the loop 8 times, with 3 subcases
-  // (factor == 2, 4, others).
-  switch (factor) {
-    case 2: {
-      for (i = delay; i < endpos1; i += 16) {
-        // Round value, 0.5 in Q12.
-        int32x4_t out32x4_0 = vdupq_n_s32(2048);
-        int32x4_t out32x4_1 = vdupq_n_s32(2048);
-
-#if defined(WEBRTC_ARCH_ARM64)
-        // Unroll the loop 2 times.
-        for (j = 0; j < coefficients_length - 1; j += 2) {
-          int32x2_t coeff32 = vld1_dup_s32((int32_t*)&coefficients[j]);
-          int16x4_t coeff16x4 = vreinterpret_s16_s32(coeff32);
-          int16x8x2_t in16x8x2 = vld2q_s16(&data_in[i - j - 1]);
-
-          // Mul and accumulate low 64-bit data.
-          int16x4_t in16x4_0 = vget_low_s16(in16x8x2.val[0]);
-          int16x4_t in16x4_1 = vget_low_s16(in16x8x2.val[1]);
-          out32x4_0 = vmlal_lane_s16(out32x4_0, in16x4_0, coeff16x4, 1);
-          out32x4_0 = vmlal_lane_s16(out32x4_0, in16x4_1, coeff16x4, 0);
-
-          // Mul and accumulate high 64-bit data.
-          // TODO: vget_high_s16 need extra cost on ARM64. This could be
-          // replaced by vmlal_high_lane_s16. But for the interface of
-          // vmlal_high_lane_s16, there is a bug in gcc 4.9.
-          // This issue need to be tracked in the future.
-          int16x4_t in16x4_2 = vget_high_s16(in16x8x2.val[0]);
-          int16x4_t in16x4_3 = vget_high_s16(in16x8x2.val[1]);
-          out32x4_1 = vmlal_lane_s16(out32x4_1, in16x4_2, coeff16x4, 1);
-          out32x4_1 = vmlal_lane_s16(out32x4_1, in16x4_3, coeff16x4, 0);
-        }
-
-        for (; j < coefficients_length; j++) {
-          int16x4_t coeff16x4 = vld1_dup_s16(&coefficients[j]);
-          int16x8x2_t in16x8x2 = vld2q_s16(&data_in[i - j]);
-
-          // Mul and accumulate low 64-bit data.
-          int16x4_t in16x4_0 = vget_low_s16(in16x8x2.val[0]);
-          out32x4_0 = vmlal_lane_s16(out32x4_0, in16x4_0, coeff16x4, 0);
-
-          // Mul and accumulate high 64-bit data.
-          // TODO: vget_high_s16 need extra cost on ARM64. This could be
-          // replaced by vmlal_high_lane_s16. But for the interface of
-          // vmlal_high_lane_s16, there is a bug in gcc 4.9.
-          // This issue need to be tracked in the future.
-          int16x4_t in16x4_1 = vget_high_s16(in16x8x2.val[0]);
-          out32x4_1 = vmlal_lane_s16(out32x4_1, in16x4_1, coeff16x4, 0);
-        }
-#else
-        // On ARMv7, the loop unrolling 2 times results in performance
-        // regression.
-        for (j = 0; j < coefficients_length; j++) {
-          int16x4_t coeff16x4 = vld1_dup_s16(&coefficients[j]);
-          int16x8x2_t in16x8x2 = vld2q_s16(&data_in[i - j]);
-
-          // Mul and accumulate.
-          int16x4_t in16x4_0 = vget_low_s16(in16x8x2.val[0]);
-          int16x4_t in16x4_1 = vget_high_s16(in16x8x2.val[0]);
-          out32x4_0 = vmlal_lane_s16(out32x4_0, in16x4_0, coeff16x4, 0);
-          out32x4_1 = vmlal_lane_s16(out32x4_1, in16x4_1, coeff16x4, 0);
-        }
-#endif
-
-        // Saturate and store the output.
-        int16x4_t out16x4_0 = vqshrn_n_s32(out32x4_0, 12);
-        int16x4_t out16x4_1 = vqshrn_n_s32(out32x4_1, 12);
-        vst1q_s16(data_out, vcombine_s16(out16x4_0, out16x4_1));
-        data_out += 8;
-      }
-      break;
-    }
-    case 4: {
-      for (i = delay; i < endpos1; i += 32) {
-        // Round value, 0.5 in Q12.
-        int32x4_t out32x4_0 = vdupq_n_s32(2048);
-        int32x4_t out32x4_1 = vdupq_n_s32(2048);
-
-        // Unroll the loop 4 times.
-        for (j = 0; j < coefficients_length - 3; j += 4) {
-          int16x4_t coeff16x4 = vld1_s16(&coefficients[j]);
-          int16x8x4_t in16x8x4 = vld4q_s16(&data_in[i - j - 3]);
-
-          // Mul and accumulate low 64-bit data.
-          int16x4_t in16x4_0 = vget_low_s16(in16x8x4.val[0]);
-          int16x4_t in16x4_2 = vget_low_s16(in16x8x4.val[1]);
-          int16x4_t in16x4_4 = vget_low_s16(in16x8x4.val[2]);
-          int16x4_t in16x4_6 = vget_low_s16(in16x8x4.val[3]);
-          out32x4_0 = vmlal_lane_s16(out32x4_0, in16x4_0, coeff16x4, 3);
-          out32x4_0 = vmlal_lane_s16(out32x4_0, in16x4_2, coeff16x4, 2);
-          out32x4_0 = vmlal_lane_s16(out32x4_0, in16x4_4, coeff16x4, 1);
-          out32x4_0 = vmlal_lane_s16(out32x4_0, in16x4_6, coeff16x4, 0);
-
-          // Mul and accumulate high 64-bit data.
-          // TODO: vget_high_s16 need extra cost on ARM64. This could be
-          // replaced by vmlal_high_lane_s16. But for the interface of
-          // vmlal_high_lane_s16, there is a bug in gcc 4.9.
-          // This issue need to be tracked in the future.
-          int16x4_t in16x4_1 = vget_high_s16(in16x8x4.val[0]);
-          int16x4_t in16x4_3 = vget_high_s16(in16x8x4.val[1]);
-          int16x4_t in16x4_5 = vget_high_s16(in16x8x4.val[2]);
-          int16x4_t in16x4_7 = vget_high_s16(in16x8x4.val[3]);
-          out32x4_1 = vmlal_lane_s16(out32x4_1, in16x4_1, coeff16x4, 3);
-          out32x4_1 = vmlal_lane_s16(out32x4_1, in16x4_3, coeff16x4, 2);
-          out32x4_1 = vmlal_lane_s16(out32x4_1, in16x4_5, coeff16x4, 1);
-          out32x4_1 = vmlal_lane_s16(out32x4_1, in16x4_7, coeff16x4, 0);
-        }
-
-        for (; j < coefficients_length; j++) {
-          int16x4_t coeff16x4 = vld1_dup_s16(&coefficients[j]);
-          int16x8x4_t in16x8x4 = vld4q_s16(&data_in[i - j]);
-
-          // Mul and accumulate low 64-bit data.
-          int16x4_t in16x4_0 = vget_low_s16(in16x8x4.val[0]);
-          out32x4_0 = vmlal_lane_s16(out32x4_0, in16x4_0, coeff16x4, 0);
-
-          // Mul and accumulate high 64-bit data.
-          // TODO: vget_high_s16 need extra cost on ARM64. This could be
-          // replaced by vmlal_high_lane_s16. But for the interface of
-          // vmlal_high_lane_s16, there is a bug in gcc 4.9.
-          // This issue need to be tracked in the future.
-          int16x4_t in16x4_1 = vget_high_s16(in16x8x4.val[0]);
-          out32x4_1 = vmlal_lane_s16(out32x4_1, in16x4_1, coeff16x4, 0);
-        }
-
-        // Saturate and store the output.
-        int16x4_t out16x4_0 = vqshrn_n_s32(out32x4_0, 12);
-        int16x4_t out16x4_1 = vqshrn_n_s32(out32x4_1, 12);
-        vst1q_s16(data_out, vcombine_s16(out16x4_0, out16x4_1));
-        data_out += 8;
-      }
-      break;
-    }
-    default: {
-      for (i = delay; i < endpos1; i += factor * 8) {
-        // Round value, 0.5 in Q12.
-        int32x4_t out32x4_0 = vdupq_n_s32(2048);
-        int32x4_t out32x4_1 = vdupq_n_s32(2048);
-
-        for (j = 0; j < coefficients_length; j++) {
-          int16x4_t coeff16x4 = vld1_dup_s16(&coefficients[j]);
-          int16x4_t in16x4_0 = vld1_dup_s16(&data_in[i - j]);
-          in16x4_0 = vld1_lane_s16(&data_in[i + factor - j], in16x4_0, 1);
-          in16x4_0 = vld1_lane_s16(&data_in[i + factor * 2 - j], in16x4_0, 2);
-          in16x4_0 = vld1_lane_s16(&data_in[i + factor * 3 - j], in16x4_0, 3);
-          int16x4_t in16x4_1 = vld1_dup_s16(&data_in[i + factor * 4 - j]);
-          in16x4_1 = vld1_lane_s16(&data_in[i + factor * 5 - j], in16x4_1, 1);
-          in16x4_1 = vld1_lane_s16(&data_in[i + factor * 6 - j], in16x4_1, 2);
-          in16x4_1 = vld1_lane_s16(&data_in[i + factor * 7 - j], in16x4_1, 3);
-
-          // Mul and accumulate.
-          out32x4_0 = vmlal_lane_s16(out32x4_0, in16x4_0, coeff16x4, 0);
-          out32x4_1 = vmlal_lane_s16(out32x4_1, in16x4_1, coeff16x4, 0);
-        }
-
-        // Saturate and store the output.
-        int16x4_t out16x4_0 = vqshrn_n_s32(out32x4_0, 12);
-        int16x4_t out16x4_1 = vqshrn_n_s32(out32x4_1, 12);
-        vst1q_s16(data_out, vcombine_s16(out16x4_0, out16x4_1));
-        data_out += 8;
-      }
-      break;
-    }
-  }
-
-  // Second part, do the rest iterations (if any).
-  for (; i < endpos; i += factor) {
-    out_s32 = 2048;  // Round value, 0.5 in Q12.
-
-    for (j = 0; j < coefficients_length; j++) {
-      out_s32 = WebRtc_MulAccumW16(coefficients[j], data_in[i - j], out_s32);
-    }
-
-    // Saturate and store the output.
-    out_s32 >>= 12;
-    *data_out++ = WebRtcSpl_SatW32ToW16(out_s32);
-  }
-
-  return 0;
-}
-
-#endif
diff --git a/submodules/libtgvoip/webrtc_dsp/common_audio/signal_processing/energy.c b/submodules/libtgvoip/webrtc_dsp/common_audio/signal_processing/energy.c
deleted file mode 100644
index 5cce6b8777..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/common_audio/signal_processing/energy.c
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- *  Copyright (c) 2011 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-
-/*
- * This file contains the function WebRtcSpl_Energy().
- * The description header can be found in signal_processing_library.h
- *
- */
-
-#include "common_audio/signal_processing/include/signal_processing_library.h"
-
-int32_t WebRtcSpl_Energy(int16_t* vector,
-                         size_t vector_length,
-                         int* scale_factor)
-{
-    int32_t en = 0;
-    size_t i;
-    int scaling =
-        WebRtcSpl_GetScalingSquare(vector, vector_length, vector_length);
-    size_t looptimes = vector_length;
-    int16_t *vectorptr = vector;
-
-    for (i = 0; i < looptimes; i++)
-    {
-      en += (*vectorptr * *vectorptr) >> scaling;
-      vectorptr++;
-    }
-    *scale_factor = scaling;
-
-    return en;
-}
diff --git a/submodules/libtgvoip/webrtc_dsp/common_audio/signal_processing/filter_ar.c b/submodules/libtgvoip/webrtc_dsp/common_audio/signal_processing/filter_ar.c
deleted file mode 100644
index 2471cd1117..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/common_audio/signal_processing/filter_ar.c
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- *  Copyright (c) 2011 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-
-/*
- * This file contains the function WebRtcSpl_FilterAR().
- * The description header can be found in signal_processing_library.h
- *
- */
-
-#include "common_audio/signal_processing/include/signal_processing_library.h"
-
-#include "rtc_base/checks.h"
-
-size_t WebRtcSpl_FilterAR(const int16_t* a,
-                          size_t a_length,
-                          const int16_t* x,
-                          size_t x_length,
-                          int16_t* state,
-                          size_t state_length,
-                          int16_t* state_low,
-                          size_t state_low_length,
-                          int16_t* filtered,
-                          int16_t* filtered_low,
-                          size_t filtered_low_length)
-{
-    int64_t o;
-    int32_t oLOW;
-    size_t i, j, stop;
-    const int16_t* x_ptr = &x[0];
-    int16_t* filteredFINAL_ptr = filtered;
-    int16_t* filteredFINAL_LOW_ptr = filtered_low;
-
-    for (i = 0; i < x_length; i++)
-    {
-        // Calculate filtered[i] and filtered_low[i]
-        const int16_t* a_ptr = &a[1];
-        // The index can become negative, but the arrays will never be indexed
-        // with it when negative. Nevertheless, the index cannot be a size_t
-        // because of this.
-        int filtered_ix = (int)i - 1;
-        int16_t* state_ptr = &state[state_length - 1];
-        int16_t* state_low_ptr = &state_low[state_length - 1];
-
-        o = (int32_t)(*x_ptr++) * (1 << 12);
-        oLOW = (int32_t)0;
-
-        stop = (i < a_length) ? i + 1 : a_length;
-        for (j = 1; j < stop; j++)
-        {
-          RTC_DCHECK_GE(filtered_ix, 0);
-          o -= *a_ptr * filtered[filtered_ix];
-          oLOW -= *a_ptr++ * filtered_low[filtered_ix];
-          --filtered_ix;
-        }
-        for (j = i + 1; j < a_length; j++)
-        {
-          o -= *a_ptr * *state_ptr--;
-          oLOW -= *a_ptr++ * *state_low_ptr--;
-        }
-
-        o += (oLOW >> 12);
-        *filteredFINAL_ptr = (int16_t)((o + (int32_t)2048) >> 12);
-        *filteredFINAL_LOW_ptr++ =
-            (int16_t)(o - ((int32_t)(*filteredFINAL_ptr++) * (1 << 12)));
-    }
-
-    // Save the filter state
-    if (x_length >= state_length)
-    {
-        WebRtcSpl_CopyFromEndW16(filtered, x_length, a_length - 1, state);
-        WebRtcSpl_CopyFromEndW16(filtered_low, x_length, a_length - 1, state_low);
-    } else
-    {
-        for (i = 0; i < state_length - x_length; i++)
-        {
-            state[i] = state[i + x_length];
-            state_low[i] = state_low[i + x_length];
-        }
-        for (i = 0; i < x_length; i++)
-        {
-            state[state_length - x_length + i] = filtered[i];
-            state[state_length - x_length + i] = filtered_low[i];
-        }
-    }
-
-    return x_length;
-}
diff --git a/submodules/libtgvoip/webrtc_dsp/common_audio/signal_processing/filter_ar_fast_q12.c b/submodules/libtgvoip/webrtc_dsp/common_audio/signal_processing/filter_ar_fast_q12.c
deleted file mode 100644
index 8b8bdb1af5..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/common_audio/signal_processing/filter_ar_fast_q12.c
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- *  Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#include "stddef.h"
-
-#include "rtc_base/checks.h"
-#include "common_audio/signal_processing/include/signal_processing_library.h"
-
-// TODO(bjornv): Change the return type to report errors.
-
-void WebRtcSpl_FilterARFastQ12(const int16_t* data_in,
-                               int16_t* data_out,
-                               const int16_t* __restrict coefficients,
-                               size_t coefficients_length,
-                               size_t data_length) {
-  size_t i = 0;
-  size_t j = 0;
-
-  RTC_DCHECK_GT(data_length, 0);
-  RTC_DCHECK_GT(coefficients_length, 1);
-
-  for (i = 0; i < data_length; i++) {
-    int64_t output = 0;
-    int64_t sum = 0;
-
-    for (j = coefficients_length - 1; j > 0; j--) {
-      // Negative overflow is permitted here, because this is
-      // auto-regressive filters, and the state for each batch run is
-      // stored in the "negative" positions of the output vector.
-      sum += coefficients[j] * data_out[(ptrdiff_t) i - (ptrdiff_t) j];
-    }
-
-    output = coefficients[0] * data_in[i];
-    output -= sum;
-
-    // Saturate and store the output.
-    output = WEBRTC_SPL_SAT(134215679, output, -134217728);
-    data_out[i] = (int16_t)((output + 2048) >> 12);
-  }
-}
diff --git a/submodules/libtgvoip/webrtc_dsp/common_audio/signal_processing/filter_ar_fast_q12_armv7.S b/submodules/libtgvoip/webrtc_dsp/common_audio/signal_processing/filter_ar_fast_q12_armv7.S
deleted file mode 100644
index 9e20072cbc..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/common_audio/signal_processing/filter_ar_fast_q12_armv7.S
+++ /dev/null
@@ -1,221 +0,0 @@
-@
-@ Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
-@
-@ Use of this source code is governed by a BSD-style license
-@ that can be found in the LICENSE file in the root of the source
-@ tree. An additional intellectual property rights grant can be found
-@ in the file PATENTS.  All contributing project authors may
-@ be found in the AUTHORS file in the root of the source tree.
-@
-
-@ This file contains the function WebRtcSpl_FilterARFastQ12(), optimized for
-@ ARMv7  platform. The description header can be found in
-@ signal_processing_library.h
-@
-@ Output is bit-exact with the generic C code as in filter_ar_fast_q12.c, and
-@ the reference C code at end of this file.
-
-@ Assumptions:
-@ (1) data_length > 0
-@ (2) coefficients_length > 1
-
-@ Register usage:
-@
-@ r0:  &data_in[i]
-@ r1:  &data_out[i], for result ouput
-@ r2:  &coefficients[0]
-@ r3:  coefficients_length
-@ r4:  Iteration counter for the outer loop.
-@ r5:  data_out[j] as multiplication inputs
-@ r6:  Calculated value for output data_out[]; interation counter for inner loop
-@ r7:  Partial sum of a filtering multiplication results
-@ r8:  Partial sum of a filtering multiplication results
-@ r9:  &data_out[], for filtering input; data_in[i]
-@ r10: coefficients[j]
-@ r11: Scratch
-@ r12: &coefficients[j]
-#if defined(__arm__) || defined(_M_ARM) || defined(__aarch64__)
-
-#include "rtc_base/system/asm_defines.h"
-
-GLOBAL_FUNCTION WebRtcSpl_FilterARFastQ12
-.align  2
-DEFINE_FUNCTION WebRtcSpl_FilterARFastQ12
-  push {r4-r11}
-
-  ldrsh r12, [sp, #32]         @ data_length
-  subs r4, r12, #1
-  beq ODD_LENGTH               @ jump if data_length == 1
-
-LOOP_LENGTH:
-  add r12, r2, r3, lsl #1
-  sub r12, #4                  @ &coefficients[coefficients_length - 2]
-  sub r9, r1, r3, lsl #1
-  add r9, #2                   @ &data_out[i - coefficients_length + 1]
-  ldr r5, [r9], #4             @ data_out[i - coefficients_length + {1,2}]
-
-  mov r7, #0                   @ sum1
-  mov r8, #0                   @ sum2
-  subs r6, r3, #3              @ Iteration counter for inner loop.
-  beq ODD_A_LENGTH             @ branch if coefficients_length == 3
-  blt POST_LOOP_A_LENGTH       @ branch if coefficients_length == 2
-
-LOOP_A_LENGTH:
-  ldr r10, [r12], #-4          @ coefficients[j - 1], coefficients[j]
-  subs r6, #2
-  smlatt r8, r10, r5, r8       @ sum2 += coefficients[j] * data_out[i - j + 1];
-  smlatb r7, r10, r5, r7       @ sum1 += coefficients[j] * data_out[i - j];
-  smlabt r7, r10, r5, r7       @ coefficients[j - 1] * data_out[i - j + 1];
-  ldr r5, [r9], #4             @ data_out[i - j + 2],  data_out[i - j + 3]
-  smlabb r8, r10, r5, r8       @ coefficients[j - 1] * data_out[i - j + 2];
-  bgt LOOP_A_LENGTH
-  blt POST_LOOP_A_LENGTH
-
-ODD_A_LENGTH:
-  ldrsh r10, [r12, #2]         @ Filter coefficients coefficients[2]
-  sub r12, #2                  @ &coefficients[0]
-  smlabb r7, r10, r5, r7       @ sum1 += coefficients[2] * data_out[i - 2];
-  smlabt r8, r10, r5, r8       @ sum2 += coefficients[2] * data_out[i - 1];
-  ldr r5, [r9, #-2]            @ data_out[i - 1],  data_out[i]
-
-POST_LOOP_A_LENGTH:
-  ldr r10, [r12]               @ coefficients[0], coefficients[1]
-  smlatb r7, r10, r5, r7       @ sum1 += coefficients[1] * data_out[i - 1];
-
-  ldr r9, [r0], #4             @ data_in[i], data_in[i + 1]
-  smulbb r6, r10, r9           @ output1 = coefficients[0] * data_in[i];
-  sub r6, r7                   @ output1 -= sum1;
-
-  sbfx r11, r6, #12, #16
-  ssat r7, #16, r6, asr #12
-  cmp r7, r11
-  addeq r6, r6, #2048
-  ssat r6, #16, r6, asr #12
-  strh r6, [r1], #2            @ Store data_out[i]
-
-  smlatb r8, r10, r6, r8       @ sum2 += coefficients[1] * data_out[i];
-  smulbt r6, r10, r9           @ output2 = coefficients[0] * data_in[i + 1];
-  sub r6, r8                   @ output1 -= sum1;
-
-  sbfx r11, r6, #12, #16
-  ssat r7, #16, r6, asr #12
-  cmp r7, r11
-  addeq r6, r6, #2048
-  ssat r6, #16, r6, asr #12
-  strh r6, [r1], #2            @ Store data_out[i + 1]
-
-  subs r4, #2
-  bgt LOOP_LENGTH
-  blt END                      @ For even data_length, it's done. Jump to END.
-
-@ Process i = data_length -1, for the case of an odd length.
-ODD_LENGTH:
-  add r12, r2, r3, lsl #1
-  sub r12, #4                  @ &coefficients[coefficients_length - 2]
-  sub r9, r1, r3, lsl #1
-  add r9, #2                   @ &data_out[i - coefficients_length + 1]
-  mov r7, #0                   @ sum1
-  mov r8, #0                   @ sum1
-  subs r6, r3, #2              @ inner loop counter
-  beq EVEN_A_LENGTH            @ branch if coefficients_length == 2
-
-LOOP2_A_LENGTH:
-  ldr r10, [r12], #-4          @ coefficients[j - 1], coefficients[j]
-  ldr r5, [r9], #4             @ data_out[i - j],  data_out[i - j + 1]
-  subs r6, #2
-  smlatb r7, r10, r5, r7       @ sum1 += coefficients[j] * data_out[i - j];
-  smlabt r8, r10, r5, r8       @ coefficients[j - 1] * data_out[i - j + 1];
-  bgt LOOP2_A_LENGTH
-  addlt r12, #2
-  blt POST_LOOP2_A_LENGTH
-
-EVEN_A_LENGTH:
-  ldrsh r10, [r12, #2]         @ Filter coefficients coefficients[1]
-  ldrsh r5, [r9]               @ data_out[i - 1]
-  smlabb r7, r10, r5, r7       @ sum1 += coefficients[1] * data_out[i - 1];
-
-POST_LOOP2_A_LENGTH:
-  ldrsh r10, [r12]             @ Filter coefficients coefficients[0]
-  ldrsh r9, [r0]               @ data_in[i]
-  smulbb r6, r10, r9           @ output1 = coefficients[0] * data_in[i];
-  sub r6, r7                   @ output1 -= sum1;
-  sub r6, r8                   @ output1 -= sum1;
-  sbfx r8, r6, #12, #16
-  ssat r7, #16, r6, asr #12
-  cmp r7, r8
-  addeq r6, r6, #2048
-  ssat r6, #16, r6, asr #12
-  strh r6, [r1]                @ Store the data_out[i]
-
-END:
-  pop {r4-r11}
-  bx  lr
-
-@Reference C code:
-@
-@void WebRtcSpl_FilterARFastQ12(int16_t* data_in,
-@                               int16_t* data_out,
-@                               int16_t* __restrict coefficients,
-@                               size_t coefficients_length,
-@                               size_t data_length) {
-@  size_t i = 0;
-@  size_t j = 0;
-@
-@  assert(data_length > 0);
-@  assert(coefficients_length > 1);
-@
-@  for (i = 0; i < data_length - 1; i += 2) {
-@    int32_t output1 = 0;
-@    int32_t sum1 = 0;
-@    int32_t output2 = 0;
-@    int32_t sum2 = 0;
-@
-@    for (j = coefficients_length - 1; j > 2; j -= 2) {
-@      sum1 += coefficients[j]      * data_out[i - j];
-@      sum1 += coefficients[j - 1]  * data_out[i - j + 1];
-@      sum2 += coefficients[j]     * data_out[i - j + 1];
-@      sum2 += coefficients[j - 1] * data_out[i - j + 2];
-@    }
-@
-@    if (j == 2) {
-@      sum1 += coefficients[2] * data_out[i - 2];
-@      sum2 += coefficients[2] * data_out[i - 1];
-@    }
-@
-@    sum1 += coefficients[1] * data_out[i - 1];
-@    output1 = coefficients[0] * data_in[i];
-@    output1 -= sum1;
-@    // Saturate and store the output.
-@    output1 = WEBRTC_SPL_SAT(134215679, output1, -134217728);
-@    data_out[i] = (int16_t)((output1 + 2048) >> 12);
-@
-@    sum2 += coefficients[1] * data_out[i];
-@    output2 = coefficients[0] * data_in[i + 1];
-@    output2 -= sum2;
-@    // Saturate and store the output.
-@    output2 = WEBRTC_SPL_SAT(134215679, output2, -134217728);
-@    data_out[i + 1] = (int16_t)((output2 + 2048) >> 12);
-@  }
-@
-@  if (i == data_length - 1) {
-@    int32_t output1 = 0;
-@    int32_t sum1 = 0;
-@
-@    for (j = coefficients_length - 1; j > 1; j -= 2) {
-@      sum1 += coefficients[j]      * data_out[i - j];
-@      sum1 += coefficients[j - 1]  * data_out[i - j + 1];
-@    }
-@
-@    if (j == 1) {
-@      sum1 += coefficients[1] * data_out[i - 1];
-@    }
-@
-@    output1 = coefficients[0] * data_in[i];
-@    output1 -= sum1;
-@    // Saturate and store the output.
-@    output1 = WEBRTC_SPL_SAT(134215679, output1, -134217728);
-@    data_out[i] = (int16_t)((output1 + 2048) >> 12);
-@  }
-@}
-
-#endif
diff --git a/submodules/libtgvoip/webrtc_dsp/common_audio/signal_processing/filter_ma_fast_q12.c b/submodules/libtgvoip/webrtc_dsp/common_audio/signal_processing/filter_ma_fast_q12.c
deleted file mode 100644
index 329d47e14f..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/common_audio/signal_processing/filter_ma_fast_q12.c
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- *  Copyright (c) 2011 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-
-/*
- * This file contains the function WebRtcSpl_FilterMAFastQ12().
- * The description header can be found in signal_processing_library.h
- *
- */
-
-#include "common_audio/signal_processing/include/signal_processing_library.h"
-
-#include "rtc_base/sanitizer.h"
-
-void WebRtcSpl_FilterMAFastQ12(const int16_t* in_ptr,
-                               int16_t* out_ptr,
-                               const int16_t* B,
-                               size_t B_length,
-                               size_t length)
-{
-    size_t i, j;
-
-    rtc_MsanCheckInitialized(B, sizeof(B[0]), B_length);
-    rtc_MsanCheckInitialized(in_ptr - B_length + 1, sizeof(in_ptr[0]),
-                             B_length + length - 1);
-
-    for (i = 0; i < length; i++)
-    {
-        int32_t o = 0;
-
-        for (j = 0; j < B_length; j++)
-        {
-          // Negative overflow is permitted here, because this is
-          // auto-regressive filters, and the state for each batch run is
-          // stored in the "negative" positions of the output vector.
-          o += B[j] * in_ptr[(ptrdiff_t) i - (ptrdiff_t) j];
-        }
-
-        // If output is higher than 32768, saturate it. Same with negative side
-        // 2^27 = 134217728, which corresponds to 32768 in Q12
-
-        // Saturate the output
-        o = WEBRTC_SPL_SAT((int32_t)134215679, o, (int32_t)-134217728);
-
-        *out_ptr++ = (int16_t)((o + (int32_t)2048) >> 12);
-    }
-    return;
-}
diff --git a/submodules/libtgvoip/webrtc_dsp/common_audio/signal_processing/get_hanning_window.c b/submodules/libtgvoip/webrtc_dsp/common_audio/signal_processing/get_hanning_window.c
deleted file mode 100644
index 8f29da8d9b..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/common_audio/signal_processing/get_hanning_window.c
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- *  Copyright (c) 2011 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-
-/*
- * This file contains the function WebRtcSpl_GetHanningWindow().
- * The description header can be found in signal_processing_library.h
- *
- */
-
-#include "common_audio/signal_processing/include/signal_processing_library.h"
-
-// Hanning table with 256 entries
-static const int16_t kHanningTable[] = {
-    1,      2,      6,     10,     15,     22,     30,     39,
-   50,     62,     75,     89,    104,    121,    138,    157,
-  178,    199,    222,    246,    271,    297,    324,    353,
-  383,    413,    446,    479,    513,    549,    586,    624,
-  663,    703,    744,    787,    830,    875,    920,    967,
- 1015,   1064,   1114,   1165,   1218,   1271,   1325,   1381,
- 1437,   1494,   1553,   1612,   1673,   1734,   1796,   1859,
- 1924,   1989,   2055,   2122,   2190,   2259,   2329,   2399,
- 2471,   2543,   2617,   2691,   2765,   2841,   2918,   2995,
- 3073,   3152,   3232,   3312,   3393,   3475,   3558,   3641,
- 3725,   3809,   3895,   3980,   4067,   4154,   4242,   4330,
- 4419,   4509,   4599,   4689,   4781,   4872,   4964,   5057,
- 5150,   5244,   5338,   5432,   5527,   5622,   5718,   5814,
- 5910,   6007,   6104,   6202,   6299,   6397,   6495,   6594,
- 6693,   6791,   6891,   6990,   7090,   7189,   7289,   7389,
- 7489,   7589,   7690,   7790,   7890,   7991,   8091,   8192,
- 8293,   8393,   8494,   8594,   8694,   8795,   8895,   8995,
- 9095,   9195,   9294,   9394,   9493,   9593,   9691,   9790,
- 9889,   9987,  10085,  10182,  10280,  10377,  10474,  10570,
-10666,  10762,  10857,  10952,  11046,  11140,  11234,  11327,
-11420,  11512,  11603,  11695,  11785,  11875,  11965,  12054,
-12142,  12230,  12317,  12404,  12489,  12575,  12659,  12743,
-12826,  12909,  12991,  13072,  13152,  13232,  13311,  13389,
-13466,  13543,  13619,  13693,  13767,  13841,  13913,  13985,
-14055,  14125,  14194,  14262,  14329,  14395,  14460,  14525,
-14588,  14650,  14711,  14772,  14831,  14890,  14947,  15003,
-15059,  15113,  15166,  15219,  15270,  15320,  15369,  15417,
-15464,  15509,  15554,  15597,  15640,  15681,  15721,  15760,
-15798,  15835,  15871,  15905,  15938,  15971,  16001,  16031,
-16060,  16087,  16113,  16138,  16162,  16185,  16206,  16227,
-16246,  16263,  16280,  16295,  16309,  16322,  16334,  16345,
-16354,  16362,  16369,  16374,  16378,  16382,  16383,  16384
-};
-
-void WebRtcSpl_GetHanningWindow(int16_t *v, size_t size)
-{
-    size_t jj;
-    int16_t *vptr1;
-
-    int32_t index;
-    int32_t factor = ((int32_t)0x40000000);
-
-    factor = WebRtcSpl_DivW32W16(factor, (int16_t)size);
-    if (size < 513)
-        index = (int32_t)-0x200000;
-    else
-        index = (int32_t)-0x100000;
-    vptr1 = v;
-
-    for (jj = 0; jj < size; jj++)
-    {
-        index += factor;
-        (*vptr1++) = kHanningTable[index >> 22];
-    }
-
-}
diff --git a/submodules/libtgvoip/webrtc_dsp/common_audio/signal_processing/get_scaling_square.c b/submodules/libtgvoip/webrtc_dsp/common_audio/signal_processing/get_scaling_square.c
deleted file mode 100644
index 4eb126941e..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/common_audio/signal_processing/get_scaling_square.c
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- *  Copyright (c) 2011 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-
-/*
- * This file contains the function WebRtcSpl_GetScalingSquare().
- * The description header can be found in signal_processing_library.h
- *
- */
-
-#include "common_audio/signal_processing/include/signal_processing_library.h"
-
-int16_t WebRtcSpl_GetScalingSquare(int16_t* in_vector,
-                                   size_t in_vector_length,
-                                   size_t times)
-{
-    int16_t nbits = WebRtcSpl_GetSizeInBits((uint32_t)times);
-    size_t i;
-    int16_t smax = -1;
-    int16_t sabs;
-    int16_t *sptr = in_vector;
-    int16_t t;
-    size_t looptimes = in_vector_length;
-
-    for (i = looptimes; i > 0; i--)
-    {
-        sabs = (*sptr > 0 ? *sptr++ : -*sptr++);
-        smax = (sabs > smax ? sabs : smax);
-    }
-    t = WebRtcSpl_NormW32(WEBRTC_SPL_MUL(smax, smax));
-
-    if (smax == 0)
-    {
-        return 0; // Since norm(0) returns 0
-    } else
-    {
-        return (t > nbits) ? 0 : nbits - t;
-    }
-}
diff --git a/submodules/libtgvoip/webrtc_dsp/common_audio/signal_processing/ilbc_specific_functions.c b/submodules/libtgvoip/webrtc_dsp/common_audio/signal_processing/ilbc_specific_functions.c
deleted file mode 100644
index b75b705902..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/common_audio/signal_processing/ilbc_specific_functions.c
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
- *  Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-
-/*
- * This file contains implementations of the iLBC specific functions
- * WebRtcSpl_ReverseOrderMultArrayElements()
- * WebRtcSpl_ElementwiseVectorMult()
- * WebRtcSpl_AddVectorsAndShift()
- * WebRtcSpl_AddAffineVectorToVector()
- * WebRtcSpl_AffineTransformVector()
- *
- */
-
-#include "common_audio/signal_processing/include/signal_processing_library.h"
-
-void WebRtcSpl_ReverseOrderMultArrayElements(int16_t *out, const int16_t *in,
-                                             const int16_t *win,
-                                             size_t vector_length,
-                                             int16_t right_shifts)
-{
-    size_t i;
-    int16_t *outptr = out;
-    const int16_t *inptr = in;
-    const int16_t *winptr = win;
-    for (i = 0; i < vector_length; i++)
-    {
-      *outptr++ = (int16_t)((*inptr++ * *winptr--) >> right_shifts);
-    }
-}
-
-void WebRtcSpl_ElementwiseVectorMult(int16_t *out, const int16_t *in,
-                                     const int16_t *win, size_t vector_length,
-                                     int16_t right_shifts)
-{
-    size_t i;
-    int16_t *outptr = out;
-    const int16_t *inptr = in;
-    const int16_t *winptr = win;
-    for (i = 0; i < vector_length; i++)
-    {
-      *outptr++ = (int16_t)((*inptr++ * *winptr++) >> right_shifts);
-    }
-}
-
-void WebRtcSpl_AddVectorsAndShift(int16_t *out, const int16_t *in1,
-                                  const int16_t *in2, size_t vector_length,
-                                  int16_t right_shifts)
-{
-    size_t i;
-    int16_t *outptr = out;
-    const int16_t *in1ptr = in1;
-    const int16_t *in2ptr = in2;
-    for (i = vector_length; i > 0; i--)
-    {
-        (*outptr++) = (int16_t)(((*in1ptr++) + (*in2ptr++)) >> right_shifts);
-    }
-}
-
-void WebRtcSpl_AddAffineVectorToVector(int16_t *out, int16_t *in,
-                                       int16_t gain, int32_t add_constant,
-                                       int16_t right_shifts,
-                                       size_t vector_length)
-{
-    size_t i;
-
-    for (i = 0; i < vector_length; i++)
-    {
-      out[i] += (int16_t)((in[i] * gain + add_constant) >> right_shifts);
-    }
-}
-
-void WebRtcSpl_AffineTransformVector(int16_t *out, int16_t *in,
-                                     int16_t gain, int32_t add_constant,
-                                     int16_t right_shifts, size_t vector_length)
-{
-    size_t i;
-
-    for (i = 0; i < vector_length; i++)
-    {
-      out[i] = (int16_t)((in[i] * gain + add_constant) >> right_shifts);
-    }
-}
diff --git a/submodules/libtgvoip/webrtc_dsp/common_audio/signal_processing/include/real_fft.h b/submodules/libtgvoip/webrtc_dsp/common_audio/signal_processing/include/real_fft.h
deleted file mode 100644
index 84450667d1..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/common_audio/signal_processing/include/real_fft.h
+++ /dev/null
@@ -1,96 +0,0 @@
-/*
- *  Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#ifndef COMMON_AUDIO_SIGNAL_PROCESSING_INCLUDE_REAL_FFT_H_
-#define COMMON_AUDIO_SIGNAL_PROCESSING_INCLUDE_REAL_FFT_H_
-
-#include <stdint.h>
-
-// For ComplexFFT(), the maximum fft order is 10;
-// WebRTC APM uses orders of only 7 and 8.
-enum { kMaxFFTOrder = 10 };
-
-struct RealFFT;
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-struct RealFFT* WebRtcSpl_CreateRealFFT(int order);
-void WebRtcSpl_FreeRealFFT(struct RealFFT* self);
-
-// Compute an FFT for a real-valued signal of length of 2^order,
-// where 1 < order <= MAX_FFT_ORDER. Transform length is determined by the
-// specification structure, which must be initialized prior to calling the FFT
-// function with WebRtcSpl_CreateRealFFT().
-// The relationship between the input and output sequences can
-// be expressed in terms of the DFT, i.e.:
-//     x[n] = (2^(-scalefactor)/N)  . SUM[k=0,...,N-1] X[k].e^(jnk.2.pi/N)
-//     n=0,1,2,...N-1
-//     N=2^order.
-// The conjugate-symmetric output sequence is represented using a CCS vector,
-// which is of length N+2, and is organized as follows:
-//     Index:      0  1  2  3  4  5   . . .   N-2       N-1       N       N+1
-//     Component:  R0 0  R1 I1 R2 I2  . . .   R[N/2-1]  I[N/2-1]  R[N/2]  0
-// where R[n] and I[n], respectively, denote the real and imaginary components
-// for FFT bin 'n'. Bins  are numbered from 0 to N/2, where N is the FFT length.
-// Bin index 0 corresponds to the DC component, and bin index N/2 corresponds to
-// the foldover frequency.
-//
-// Input Arguments:
-//   self - pointer to preallocated and initialized FFT specification structure.
-//   real_data_in - the input signal. For an ARM Neon platform, it must be
-//                  aligned on a 32-byte boundary.
-//
-// Output Arguments:
-//   complex_data_out - the output complex signal with (2^order + 2) 16-bit
-//                      elements. For an ARM Neon platform, it must be different
-//                      from real_data_in, and aligned on a 32-byte boundary.
-//
-// Return Value:
-//   0  - FFT calculation is successful.
-//   -1 - Error with bad arguments (null pointers).
-int WebRtcSpl_RealForwardFFT(struct RealFFT* self,
-                             const int16_t* real_data_in,
-                             int16_t* complex_data_out);
-
-// Compute the inverse FFT for a conjugate-symmetric input sequence of length of
-// 2^order, where 1 < order <= MAX_FFT_ORDER. Transform length is determined by
-// the specification structure, which must be initialized prior to calling the
-// FFT function with WebRtcSpl_CreateRealFFT().
-// For a transform of length M, the input sequence is represented using a packed
-// CCS vector of length M+2, which is explained in the comments for
-// WebRtcSpl_RealForwardFFTC above.
-//
-// Input Arguments:
-//   self - pointer to preallocated and initialized FFT specification structure.
-//   complex_data_in - the input complex signal with (2^order + 2) 16-bit
-//                     elements. For an ARM Neon platform, it must be aligned on
-//                     a 32-byte boundary.
-//
-// Output Arguments:
-//   real_data_out - the output real signal. For an ARM Neon platform, it must
-//                   be different to complex_data_in, and aligned on a 32-byte
-//                   boundary.
-//
-// Return Value:
-//   0 or a positive number - a value that the elements in the |real_data_out|
-//                            should be shifted left with in order to get
-//                            correct physical values.
-//   -1 - Error with bad arguments (null pointers).
-int WebRtcSpl_RealInverseFFT(struct RealFFT* self,
-                             const int16_t* complex_data_in,
-                             int16_t* real_data_out);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif  // COMMON_AUDIO_SIGNAL_PROCESSING_INCLUDE_REAL_FFT_H_
diff --git a/submodules/libtgvoip/webrtc_dsp/common_audio/signal_processing/include/signal_processing_library.h b/submodules/libtgvoip/webrtc_dsp/common_audio/signal_processing/include/signal_processing_library.h
deleted file mode 100644
index 33469d429b..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/common_audio/signal_processing/include/signal_processing_library.h
+++ /dev/null
@@ -1,1612 +0,0 @@
-/*
- *  Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-/*
- * This header file includes all of the fix point signal processing library
- * (SPL) function descriptions and declarations. For specific function calls,
- * see bottom of file.
- */
-
-#ifndef COMMON_AUDIO_SIGNAL_PROCESSING_INCLUDE_SIGNAL_PROCESSING_LIBRARY_H_
-#define COMMON_AUDIO_SIGNAL_PROCESSING_INCLUDE_SIGNAL_PROCESSING_LIBRARY_H_
-
-#include <string.h>
-#include "common_audio/signal_processing/dot_product_with_scale.h"
-
-// Macros specific for the fixed point implementation
-#define WEBRTC_SPL_WORD16_MAX 32767
-#define WEBRTC_SPL_WORD16_MIN -32768
-#define WEBRTC_SPL_WORD32_MAX (int32_t)0x7fffffff
-#define WEBRTC_SPL_WORD32_MIN (int32_t)0x80000000
-#define WEBRTC_SPL_MAX_LPC_ORDER 14
-#define WEBRTC_SPL_MIN(A, B) (A < B ? A : B)  // Get min value
-#define WEBRTC_SPL_MAX(A, B) (A > B ? A : B)  // Get max value
-// TODO(kma/bjorn): For the next two macros, investigate how to correct the code
-// for inputs of a = WEBRTC_SPL_WORD16_MIN or WEBRTC_SPL_WORD32_MIN.
-#define WEBRTC_SPL_ABS_W16(a) (((int16_t)a >= 0) ? ((int16_t)a) : -((int16_t)a))
-#define WEBRTC_SPL_ABS_W32(a) (((int32_t)a >= 0) ? ((int32_t)a) : -((int32_t)a))
-
-#define WEBRTC_SPL_MUL(a, b) ((int32_t)((int32_t)(a) * (int32_t)(b)))
-#define WEBRTC_SPL_UMUL(a, b) ((uint32_t)((uint32_t)(a) * (uint32_t)(b)))
-#define WEBRTC_SPL_UMUL_32_16(a, b) ((uint32_t)((uint32_t)(a) * (uint16_t)(b)))
-#define WEBRTC_SPL_MUL_16_U16(a, b) ((int32_t)(int16_t)(a) * (uint16_t)(b))
-
-// clang-format off
-// clang-format would choose some identation
-// leading to presubmit error (cpplint.py)
-#ifndef WEBRTC_ARCH_ARM_V7
-// For ARMv7 platforms, these are inline functions in spl_inl_armv7.h
-#ifndef MIPS32_LE
-// For MIPS platforms, these are inline functions in spl_inl_mips.h
-#define WEBRTC_SPL_MUL_16_16(a, b) ((int32_t)(((int16_t)(a)) * ((int16_t)(b))))
-#define WEBRTC_SPL_MUL_16_32_RSFT16(a, b) \
-        (WEBRTC_SPL_MUL_16_16(a, b >> 16) +     \
-        ((WEBRTC_SPL_MUL_16_16(a, (b & 0xffff) >> 1) + 0x4000) >> 15))
-#endif
-#endif
-
-#define WEBRTC_SPL_MUL_16_32_RSFT11(a, b)          \
-        (WEBRTC_SPL_MUL_16_16(a, (b) >> 16) * (1 << 5) + \
-        (((WEBRTC_SPL_MUL_16_U16(a, (uint16_t)(b)) >> 1) + 0x0200) >> 10))
-#define WEBRTC_SPL_MUL_16_32_RSFT14(a, b)          \
-        (WEBRTC_SPL_MUL_16_16(a, (b) >> 16) * (1 << 2) + \
-        (((WEBRTC_SPL_MUL_16_U16(a, (uint16_t)(b)) >> 1) + 0x1000) >> 13))
-#define WEBRTC_SPL_MUL_16_32_RSFT15(a, b)            \
-        ((WEBRTC_SPL_MUL_16_16(a, (b) >> 16) * (1 << 1)) + \
-        (((WEBRTC_SPL_MUL_16_U16(a, (uint16_t)(b)) >> 1) + 0x2000) >> 14))
-// clang-format on
-
-#define WEBRTC_SPL_MUL_16_16_RSFT(a, b, c) (WEBRTC_SPL_MUL_16_16(a, b) >> (c))
-
-#define WEBRTC_SPL_MUL_16_16_RSFT_WITH_ROUND(a, b, c) \
-  ((WEBRTC_SPL_MUL_16_16(a, b) + ((int32_t)(((int32_t)1) << ((c)-1)))) >> (c))
-
-// C + the 32 most significant bits of A * B
-#define WEBRTC_SPL_SCALEDIFF32(A, B, C) \
-  (C + (B >> 16) * A + (((uint32_t)(B & 0x0000FFFF) * A) >> 16))
-
-#define WEBRTC_SPL_SAT(a, b, c) (b > a ? a : b < c ? c : b)
-
-// Shifting with negative numbers allowed
-// Positive means left shift
-#define WEBRTC_SPL_SHIFT_W32(x, c) ((c) >= 0 ? (x) * (1 << (c)) : (x) >> -(c))
-
-// Shifting with negative numbers not allowed
-// We cannot do casting here due to signed/unsigned problem
-#define WEBRTC_SPL_LSHIFT_W32(x, c) ((x) << (c))
-
-#define WEBRTC_SPL_RSHIFT_U32(x, c) ((uint32_t)(x) >> (c))
-
-#define WEBRTC_SPL_RAND(a) ((int16_t)((((int16_t)a * 18816) >> 7) & 0x00007fff))
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define WEBRTC_SPL_MEMCPY_W16(v1, v2, length) \
-  memcpy(v1, v2, (length) * sizeof(int16_t))
-
-// inline functions:
-#include "common_audio/signal_processing/include/spl_inl.h"
-
-// third party math functions
-#include "common_audio/third_party/spl_sqrt_floor/spl_sqrt_floor.h"
-
-// Initialize SPL. Currently it contains only function pointer initialization.
-// If the underlying platform is known to be ARM-Neon (WEBRTC_HAS_NEON defined),
-// the pointers will be assigned to code optimized for Neon; otherwise, generic
-// C code will be assigned.
-// Note that this function MUST be called in any application that uses SPL
-// functions.
-void WebRtcSpl_Init(void);
-
-int16_t WebRtcSpl_GetScalingSquare(int16_t* in_vector,
-                                   size_t in_vector_length,
-                                   size_t times);
-
-// Copy and set operations. Implementation in copy_set_operations.c.
-// Descriptions at bottom of file.
-void WebRtcSpl_MemSetW16(int16_t* vector,
-                         int16_t set_value,
-                         size_t vector_length);
-void WebRtcSpl_MemSetW32(int32_t* vector,
-                         int32_t set_value,
-                         size_t vector_length);
-void WebRtcSpl_MemCpyReversedOrder(int16_t* out_vector,
-                                   int16_t* in_vector,
-                                   size_t vector_length);
-void WebRtcSpl_CopyFromEndW16(const int16_t* in_vector,
-                              size_t in_vector_length,
-                              size_t samples,
-                              int16_t* out_vector);
-void WebRtcSpl_ZerosArrayW16(int16_t* vector, size_t vector_length);
-void WebRtcSpl_ZerosArrayW32(int32_t* vector, size_t vector_length);
-// End: Copy and set operations.
-
-// Minimum and maximum operation functions and their pointers.
-// Implementation in min_max_operations.c.
-
-// Returns the largest absolute value in a signed 16-bit vector.
-//
-// Input:
-//      - vector : 16-bit input vector.
-//      - length : Number of samples in vector.
-//
-// Return value  : Maximum absolute value in vector.
-typedef int16_t (*MaxAbsValueW16)(const int16_t* vector, size_t length);
-extern MaxAbsValueW16 WebRtcSpl_MaxAbsValueW16;
-int16_t WebRtcSpl_MaxAbsValueW16C(const int16_t* vector, size_t length);
-#if defined(WEBRTC_HAS_NEON)
-int16_t WebRtcSpl_MaxAbsValueW16Neon(const int16_t* vector, size_t length);
-#endif
-#if defined(MIPS32_LE)
-int16_t WebRtcSpl_MaxAbsValueW16_mips(const int16_t* vector, size_t length);
-#endif
-
-// Returns the largest absolute value in a signed 32-bit vector.
-//
-// Input:
-//      - vector : 32-bit input vector.
-//      - length : Number of samples in vector.
-//
-// Return value  : Maximum absolute value in vector.
-typedef int32_t (*MaxAbsValueW32)(const int32_t* vector, size_t length);
-extern MaxAbsValueW32 WebRtcSpl_MaxAbsValueW32;
-int32_t WebRtcSpl_MaxAbsValueW32C(const int32_t* vector, size_t length);
-#if defined(WEBRTC_HAS_NEON)
-int32_t WebRtcSpl_MaxAbsValueW32Neon(const int32_t* vector, size_t length);
-#endif
-#if defined(MIPS_DSP_R1_LE)
-int32_t WebRtcSpl_MaxAbsValueW32_mips(const int32_t* vector, size_t length);
-#endif
-
-// Returns the maximum value of a 16-bit vector.
-//
-// Input:
-//      - vector : 16-bit input vector.
-//      - length : Number of samples in vector.
-//
-// Return value  : Maximum sample value in |vector|.
-typedef int16_t (*MaxValueW16)(const int16_t* vector, size_t length);
-extern MaxValueW16 WebRtcSpl_MaxValueW16;
-int16_t WebRtcSpl_MaxValueW16C(const int16_t* vector, size_t length);
-#if defined(WEBRTC_HAS_NEON)
-int16_t WebRtcSpl_MaxValueW16Neon(const int16_t* vector, size_t length);
-#endif
-#if defined(MIPS32_LE)
-int16_t WebRtcSpl_MaxValueW16_mips(const int16_t* vector, size_t length);
-#endif
-
-// Returns the maximum value of a 32-bit vector.
-//
-// Input:
-//      - vector : 32-bit input vector.
-//      - length : Number of samples in vector.
-//
-// Return value  : Maximum sample value in |vector|.
-typedef int32_t (*MaxValueW32)(const int32_t* vector, size_t length);
-extern MaxValueW32 WebRtcSpl_MaxValueW32;
-int32_t WebRtcSpl_MaxValueW32C(const int32_t* vector, size_t length);
-#if defined(WEBRTC_HAS_NEON)
-int32_t WebRtcSpl_MaxValueW32Neon(const int32_t* vector, size_t length);
-#endif
-#if defined(MIPS32_LE)
-int32_t WebRtcSpl_MaxValueW32_mips(const int32_t* vector, size_t length);
-#endif
-
-// Returns the minimum value of a 16-bit vector.
-//
-// Input:
-//      - vector : 16-bit input vector.
-//      - length : Number of samples in vector.
-//
-// Return value  : Minimum sample value in |vector|.
-typedef int16_t (*MinValueW16)(const int16_t* vector, size_t length);
-extern MinValueW16 WebRtcSpl_MinValueW16;
-int16_t WebRtcSpl_MinValueW16C(const int16_t* vector, size_t length);
-#if defined(WEBRTC_HAS_NEON)
-int16_t WebRtcSpl_MinValueW16Neon(const int16_t* vector, size_t length);
-#endif
-#if defined(MIPS32_LE)
-int16_t WebRtcSpl_MinValueW16_mips(const int16_t* vector, size_t length);
-#endif
-
-// Returns the minimum value of a 32-bit vector.
-//
-// Input:
-//      - vector : 32-bit input vector.
-//      - length : Number of samples in vector.
-//
-// Return value  : Minimum sample value in |vector|.
-typedef int32_t (*MinValueW32)(const int32_t* vector, size_t length);
-extern MinValueW32 WebRtcSpl_MinValueW32;
-int32_t WebRtcSpl_MinValueW32C(const int32_t* vector, size_t length);
-#if defined(WEBRTC_HAS_NEON)
-int32_t WebRtcSpl_MinValueW32Neon(const int32_t* vector, size_t length);
-#endif
-#if defined(MIPS32_LE)
-int32_t WebRtcSpl_MinValueW32_mips(const int32_t* vector, size_t length);
-#endif
-
-// Returns the vector index to the largest absolute value of a 16-bit vector.
-//
-// Input:
-//      - vector : 16-bit input vector.
-//      - length : Number of samples in vector.
-//
-// Return value  : Index to the maximum absolute value in vector.
-//                 If there are multiple equal maxima, return the index of the
-//                 first. -32768 will always have precedence over 32767 (despite
-//                 -32768 presenting an int16 absolute value of 32767).
-size_t WebRtcSpl_MaxAbsIndexW16(const int16_t* vector, size_t length);
-
-// Returns the vector index to the maximum sample value of a 16-bit vector.
-//
-// Input:
-//      - vector : 16-bit input vector.
-//      - length : Number of samples in vector.
-//
-// Return value  : Index to the maximum value in vector (if multiple
-//                 indexes have the maximum, return the first).
-size_t WebRtcSpl_MaxIndexW16(const int16_t* vector, size_t length);
-
-// Returns the vector index to the maximum sample value of a 32-bit vector.
-//
-// Input:
-//      - vector : 32-bit input vector.
-//      - length : Number of samples in vector.
-//
-// Return value  : Index to the maximum value in vector (if multiple
-//                 indexes have the maximum, return the first).
-size_t WebRtcSpl_MaxIndexW32(const int32_t* vector, size_t length);
-
-// Returns the vector index to the minimum sample value of a 16-bit vector.
-//
-// Input:
-//      - vector : 16-bit input vector.
-//      - length : Number of samples in vector.
-//
-// Return value  : Index to the mimimum value in vector  (if multiple
-//                 indexes have the minimum, return the first).
-size_t WebRtcSpl_MinIndexW16(const int16_t* vector, size_t length);
-
-// Returns the vector index to the minimum sample value of a 32-bit vector.
-//
-// Input:
-//      - vector : 32-bit input vector.
-//      - length : Number of samples in vector.
-//
-// Return value  : Index to the mimimum value in vector  (if multiple
-//                 indexes have the minimum, return the first).
-size_t WebRtcSpl_MinIndexW32(const int32_t* vector, size_t length);
-
-// End: Minimum and maximum operations.
-
-// Vector scaling operations. Implementation in vector_scaling_operations.c.
-// Description at bottom of file.
-void WebRtcSpl_VectorBitShiftW16(int16_t* out_vector,
-                                 size_t vector_length,
-                                 const int16_t* in_vector,
-                                 int16_t right_shifts);
-void WebRtcSpl_VectorBitShiftW32(int32_t* out_vector,
-                                 size_t vector_length,
-                                 const int32_t* in_vector,
-                                 int16_t right_shifts);
-void WebRtcSpl_VectorBitShiftW32ToW16(int16_t* out_vector,
-                                      size_t vector_length,
-                                      const int32_t* in_vector,
-                                      int right_shifts);
-void WebRtcSpl_ScaleVector(const int16_t* in_vector,
-                           int16_t* out_vector,
-                           int16_t gain,
-                           size_t vector_length,
-                           int16_t right_shifts);
-void WebRtcSpl_ScaleVectorWithSat(const int16_t* in_vector,
-                                  int16_t* out_vector,
-                                  int16_t gain,
-                                  size_t vector_length,
-                                  int16_t right_shifts);
-void WebRtcSpl_ScaleAndAddVectors(const int16_t* in_vector1,
-                                  int16_t gain1,
-                                  int right_shifts1,
-                                  const int16_t* in_vector2,
-                                  int16_t gain2,
-                                  int right_shifts2,
-                                  int16_t* out_vector,
-                                  size_t vector_length);
-
-// The functions (with related pointer) perform the vector operation:
-//   out_vector[k] = ((scale1 * in_vector1[k]) + (scale2 * in_vector2[k])
-//        + round_value) >> right_shifts,
-//   where  round_value = (1 << right_shifts) >> 1.
-//
-// Input:
-//      - in_vector1       : Input vector 1
-//      - in_vector1_scale : Gain to be used for vector 1
-//      - in_vector2       : Input vector 2
-//      - in_vector2_scale : Gain to be used for vector 2
-//      - right_shifts     : Number of right bit shifts to be applied
-//      - length           : Number of elements in the input vectors
-//
-// Output:
-//      - out_vector       : Output vector
-// Return value            : 0 if OK, -1 if (in_vector1 == null
-//                           || in_vector2 == null || out_vector == null
-//                           || length <= 0 || right_shift < 0).
-typedef int (*ScaleAndAddVectorsWithRound)(const int16_t* in_vector1,
-                                           int16_t in_vector1_scale,
-                                           const int16_t* in_vector2,
-                                           int16_t in_vector2_scale,
-                                           int right_shifts,
-                                           int16_t* out_vector,
-                                           size_t length);
-extern ScaleAndAddVectorsWithRound WebRtcSpl_ScaleAndAddVectorsWithRound;
-int WebRtcSpl_ScaleAndAddVectorsWithRoundC(const int16_t* in_vector1,
-                                           int16_t in_vector1_scale,
-                                           const int16_t* in_vector2,
-                                           int16_t in_vector2_scale,
-                                           int right_shifts,
-                                           int16_t* out_vector,
-                                           size_t length);
-#if defined(MIPS_DSP_R1_LE)
-int WebRtcSpl_ScaleAndAddVectorsWithRound_mips(const int16_t* in_vector1,
-                                               int16_t in_vector1_scale,
-                                               const int16_t* in_vector2,
-                                               int16_t in_vector2_scale,
-                                               int right_shifts,
-                                               int16_t* out_vector,
-                                               size_t length);
-#endif
-// End: Vector scaling operations.
-
-// iLBC specific functions. Implementations in ilbc_specific_functions.c.
-// Description at bottom of file.
-void WebRtcSpl_ReverseOrderMultArrayElements(int16_t* out_vector,
-                                             const int16_t* in_vector,
-                                             const int16_t* window,
-                                             size_t vector_length,
-                                             int16_t right_shifts);
-void WebRtcSpl_ElementwiseVectorMult(int16_t* out_vector,
-                                     const int16_t* in_vector,
-                                     const int16_t* window,
-                                     size_t vector_length,
-                                     int16_t right_shifts);
-void WebRtcSpl_AddVectorsAndShift(int16_t* out_vector,
-                                  const int16_t* in_vector1,
-                                  const int16_t* in_vector2,
-                                  size_t vector_length,
-                                  int16_t right_shifts);
-void WebRtcSpl_AddAffineVectorToVector(int16_t* out_vector,
-                                       int16_t* in_vector,
-                                       int16_t gain,
-                                       int32_t add_constant,
-                                       int16_t right_shifts,
-                                       size_t vector_length);
-void WebRtcSpl_AffineTransformVector(int16_t* out_vector,
-                                     int16_t* in_vector,
-                                     int16_t gain,
-                                     int32_t add_constant,
-                                     int16_t right_shifts,
-                                     size_t vector_length);
-// End: iLBC specific functions.
-
-// Signal processing operations.
-
-// A 32-bit fix-point implementation of auto-correlation computation
-//
-// Input:
-//      - in_vector        : Vector to calculate autocorrelation upon
-//      - in_vector_length : Length (in samples) of |vector|
-//      - order            : The order up to which the autocorrelation should be
-//                           calculated
-//
-// Output:
-//      - result           : auto-correlation values (values should be seen
-//                           relative to each other since the absolute values
-//                           might have been down shifted to avoid overflow)
-//
-//      - scale            : The number of left shifts required to obtain the
-//                           auto-correlation in Q0
-//
-// Return value            : Number of samples in |result|, i.e. (order+1)
-size_t WebRtcSpl_AutoCorrelation(const int16_t* in_vector,
-                                 size_t in_vector_length,
-                                 size_t order,
-                                 int32_t* result,
-                                 int* scale);
-
-// A 32-bit fix-point implementation of the Levinson-Durbin algorithm that
-// does NOT use the 64 bit class
-//
-// Input:
-//      - auto_corr : Vector with autocorrelation values of length >= |order|+1
-//      - order     : The LPC filter order (support up to order 20)
-//
-// Output:
-//      - lpc_coef  : lpc_coef[0..order] LPC coefficients in Q12
-//      - refl_coef : refl_coef[0...order-1]| Reflection coefficients in Q15
-//
-// Return value     : 1 for stable 0 for unstable
-int16_t WebRtcSpl_LevinsonDurbin(const int32_t* auto_corr,
-                                 int16_t* lpc_coef,
-                                 int16_t* refl_coef,
-                                 size_t order);
-
-// Converts reflection coefficients |refl_coef| to LPC coefficients |lpc_coef|.
-// This version is a 16 bit operation.
-//
-// NOTE: The 16 bit refl_coef -> lpc_coef conversion might result in a
-// "slightly unstable" filter (i.e., a pole just outside the unit circle) in
-// "rare" cases even if the reflection coefficients are stable.
-//
-// Input:
-//      - refl_coef : Reflection coefficients in Q15 that should be converted
-//                    to LPC coefficients
-//      - use_order : Number of coefficients in |refl_coef|
-//
-// Output:
-//      - lpc_coef  : LPC coefficients in Q12
-void WebRtcSpl_ReflCoefToLpc(const int16_t* refl_coef,
-                             int use_order,
-                             int16_t* lpc_coef);
-
-// Converts LPC coefficients |lpc_coef| to reflection coefficients |refl_coef|.
-// This version is a 16 bit operation.
-// The conversion is implemented by the step-down algorithm.
-//
-// Input:
-//      - lpc_coef  : LPC coefficients in Q12, that should be converted to
-//                    reflection coefficients
-//      - use_order : Number of coefficients in |lpc_coef|
-//
-// Output:
-//      - refl_coef : Reflection coefficients in Q15.
-void WebRtcSpl_LpcToReflCoef(int16_t* lpc_coef,
-                             int use_order,
-                             int16_t* refl_coef);
-
-// Calculates reflection coefficients (16 bit) from auto-correlation values
-//
-// Input:
-//      - auto_corr : Auto-correlation values
-//      - use_order : Number of coefficients wanted be calculated
-//
-// Output:
-//      - refl_coef : Reflection coefficients in Q15.
-void WebRtcSpl_AutoCorrToReflCoef(const int32_t* auto_corr,
-                                  int use_order,
-                                  int16_t* refl_coef);
-
-// The functions (with related pointer) calculate the cross-correlation between
-// two sequences |seq1| and |seq2|.
-// |seq1| is fixed and |seq2| slides as the pointer is increased with the
-// amount |step_seq2|. Note the arguments should obey the relationship:
-// |dim_seq| - 1 + |step_seq2| * (|dim_cross_correlation| - 1) <
-//      buffer size of |seq2|
-//
-// Input:
-//      - seq1           : First sequence (fixed throughout the correlation)
-//      - seq2           : Second sequence (slides |step_vector2| for each
-//                            new correlation)
-//      - dim_seq        : Number of samples to use in the cross-correlation
-//      - dim_cross_correlation : Number of cross-correlations to calculate (the
-//                            start position for |vector2| is updated for each
-//                            new one)
-//      - right_shifts   : Number of right bit shifts to use. This will
-//                            become the output Q-domain.
-//      - step_seq2      : How many (positive or negative) steps the
-//                            |vector2| pointer should be updated for each new
-//                            cross-correlation value.
-//
-// Output:
-//      - cross_correlation : The cross-correlation in Q(-right_shifts)
-typedef void (*CrossCorrelation)(int32_t* cross_correlation,
-                                 const int16_t* seq1,
-                                 const int16_t* seq2,
-                                 size_t dim_seq,
-                                 size_t dim_cross_correlation,
-                                 int right_shifts,
-                                 int step_seq2);
-extern CrossCorrelation WebRtcSpl_CrossCorrelation;
-void WebRtcSpl_CrossCorrelationC(int32_t* cross_correlation,
-                                 const int16_t* seq1,
-                                 const int16_t* seq2,
-                                 size_t dim_seq,
-                                 size_t dim_cross_correlation,
-                                 int right_shifts,
-                                 int step_seq2);
-#if defined(WEBRTC_HAS_NEON)
-void WebRtcSpl_CrossCorrelationNeon(int32_t* cross_correlation,
-                                    const int16_t* seq1,
-                                    const int16_t* seq2,
-                                    size_t dim_seq,
-                                    size_t dim_cross_correlation,
-                                    int right_shifts,
-                                    int step_seq2);
-#endif
-#if defined(MIPS32_LE)
-void WebRtcSpl_CrossCorrelation_mips(int32_t* cross_correlation,
-                                     const int16_t* seq1,
-                                     const int16_t* seq2,
-                                     size_t dim_seq,
-                                     size_t dim_cross_correlation,
-                                     int right_shifts,
-                                     int step_seq2);
-#endif
-
-// Creates (the first half of) a Hanning window. Size must be at least 1 and
-// at most 512.
-//
-// Input:
-//      - size      : Length of the requested Hanning window (1 to 512)
-//
-// Output:
-//      - window    : Hanning vector in Q14.
-void WebRtcSpl_GetHanningWindow(int16_t* window, size_t size);
-
-// Calculates y[k] = sqrt(1 - x[k]^2) for each element of the input vector
-// |in_vector|. Input and output values are in Q15.
-//
-// Inputs:
-//      - in_vector     : Values to calculate sqrt(1 - x^2) of
-//      - vector_length : Length of vector |in_vector|
-//
-// Output:
-//      - out_vector    : Output values in Q15
-void WebRtcSpl_SqrtOfOneMinusXSquared(int16_t* in_vector,
-                                      size_t vector_length,
-                                      int16_t* out_vector);
-// End: Signal processing operations.
-
-// Randomization functions. Implementations collected in
-// randomization_functions.c and descriptions at bottom of this file.
-int16_t WebRtcSpl_RandU(uint32_t* seed);
-int16_t WebRtcSpl_RandN(uint32_t* seed);
-int16_t WebRtcSpl_RandUArray(int16_t* vector,
-                             int16_t vector_length,
-                             uint32_t* seed);
-// End: Randomization functions.
-
-// Math functions
-int32_t WebRtcSpl_Sqrt(int32_t value);
-
-// Divisions. Implementations collected in division_operations.c and
-// descriptions at bottom of this file.
-uint32_t WebRtcSpl_DivU32U16(uint32_t num, uint16_t den);
-int32_t WebRtcSpl_DivW32W16(int32_t num, int16_t den);
-int16_t WebRtcSpl_DivW32W16ResW16(int32_t num, int16_t den);
-int32_t WebRtcSpl_DivResultInQ31(int32_t num, int32_t den);
-int32_t WebRtcSpl_DivW32HiLow(int32_t num, int16_t den_hi, int16_t den_low);
-// End: Divisions.
-
-int32_t WebRtcSpl_Energy(int16_t* vector,
-                         size_t vector_length,
-                         int* scale_factor);
-
-// Filter operations.
-size_t WebRtcSpl_FilterAR(const int16_t* ar_coef,
-                          size_t ar_coef_length,
-                          const int16_t* in_vector,
-                          size_t in_vector_length,
-                          int16_t* filter_state,
-                          size_t filter_state_length,
-                          int16_t* filter_state_low,
-                          size_t filter_state_low_length,
-                          int16_t* out_vector,
-                          int16_t* out_vector_low,
-                          size_t out_vector_low_length);
-
-// WebRtcSpl_FilterMAFastQ12(...)
-//
-// Performs a MA filtering on a vector in Q12
-//
-// Input:
-//      - in_vector         : Input samples (state in positions
-//                            in_vector[-order] .. in_vector[-1])
-//      - ma_coef           : Filter coefficients (in Q12)
-//      - ma_coef_length    : Number of B coefficients (order+1)
-//      - vector_length     : Number of samples to be filtered
-//
-// Output:
-//      - out_vector        : Filtered samples
-//
-void WebRtcSpl_FilterMAFastQ12(const int16_t* in_vector,
-                               int16_t* out_vector,
-                               const int16_t* ma_coef,
-                               size_t ma_coef_length,
-                               size_t vector_length);
-
-// Performs a AR filtering on a vector in Q12
-// Input:
-//      - data_in            : Input samples
-//      - data_out           : State information in positions
-//                               data_out[-order] .. data_out[-1]
-//      - coefficients       : Filter coefficients (in Q12)
-//      - coefficients_length: Number of coefficients (order+1)
-//      - data_length        : Number of samples to be filtered
-// Output:
-//      - data_out           : Filtered samples
-void WebRtcSpl_FilterARFastQ12(const int16_t* data_in,
-                               int16_t* data_out,
-                               const int16_t* __restrict coefficients,
-                               size_t coefficients_length,
-                               size_t data_length);
-
-// The functions (with related pointer) perform a MA down sampling filter
-// on a vector.
-// Input:
-//      - data_in            : Input samples (state in positions
-//                               data_in[-order] .. data_in[-1])
-//      - data_in_length     : Number of samples in |data_in| to be filtered.
-//                               This must be at least
-//                               |delay| + |factor|*(|out_vector_length|-1) + 1)
-//      - data_out_length    : Number of down sampled samples desired
-//      - coefficients       : Filter coefficients (in Q12)
-//      - coefficients_length: Number of coefficients (order+1)
-//      - factor             : Decimation factor
-//      - delay              : Delay of filter (compensated for in out_vector)
-// Output:
-//      - data_out           : Filtered samples
-// Return value              : 0 if OK, -1 if |in_vector| is too short
-typedef int (*DownsampleFast)(const int16_t* data_in,
-                              size_t data_in_length,
-                              int16_t* data_out,
-                              size_t data_out_length,
-                              const int16_t* __restrict coefficients,
-                              size_t coefficients_length,
-                              int factor,
-                              size_t delay);
-extern DownsampleFast WebRtcSpl_DownsampleFast;
-int WebRtcSpl_DownsampleFastC(const int16_t* data_in,
-                              size_t data_in_length,
-                              int16_t* data_out,
-                              size_t data_out_length,
-                              const int16_t* __restrict coefficients,
-                              size_t coefficients_length,
-                              int factor,
-                              size_t delay);
-#if defined(WEBRTC_HAS_NEON)
-int WebRtcSpl_DownsampleFastNeon(const int16_t* data_in,
-                                 size_t data_in_length,
-                                 int16_t* data_out,
-                                 size_t data_out_length,
-                                 const int16_t* __restrict coefficients,
-                                 size_t coefficients_length,
-                                 int factor,
-                                 size_t delay);
-#endif
-#if defined(MIPS32_LE)
-int WebRtcSpl_DownsampleFast_mips(const int16_t* data_in,
-                                  size_t data_in_length,
-                                  int16_t* data_out,
-                                  size_t data_out_length,
-                                  const int16_t* __restrict coefficients,
-                                  size_t coefficients_length,
-                                  int factor,
-                                  size_t delay);
-#endif
-
-// End: Filter operations.
-
-// FFT operations
-
-int WebRtcSpl_ComplexFFT(int16_t vector[], int stages, int mode);
-int WebRtcSpl_ComplexIFFT(int16_t vector[], int stages, int mode);
-
-// Treat a 16-bit complex data buffer |complex_data| as an array of 32-bit
-// values, and swap elements whose indexes are bit-reverses of each other.
-//
-// Input:
-//      - complex_data  : Complex data buffer containing 2^|stages| real
-//                        elements interleaved with 2^|stages| imaginary
-//                        elements: [Re Im Re Im Re Im....]
-//      - stages        : Number of FFT stages. Must be at least 3 and at most
-//                        10, since the table WebRtcSpl_kSinTable1024[] is 1024
-//                        elements long.
-//
-// Output:
-//      - complex_data  : The complex data buffer.
-
-void WebRtcSpl_ComplexBitReverse(int16_t* __restrict complex_data, int stages);
-
-// End: FFT operations
-
-/************************************************************
- *
- * RESAMPLING FUNCTIONS AND THEIR STRUCTS ARE DEFINED BELOW
- *
- ************************************************************/
-
-/*******************************************************************
- * resample.c
- *
- * Includes the following resampling combinations
- * 22 kHz -> 16 kHz
- * 16 kHz -> 22 kHz
- * 22 kHz ->  8 kHz
- *  8 kHz -> 22 kHz
- *
- ******************************************************************/
-
-// state structure for 22 -> 16 resampler
-typedef struct {
-  int32_t S_22_44[8];
-  int32_t S_44_32[8];
-  int32_t S_32_16[8];
-} WebRtcSpl_State22khzTo16khz;
-
-void WebRtcSpl_Resample22khzTo16khz(const int16_t* in,
-                                    int16_t* out,
-                                    WebRtcSpl_State22khzTo16khz* state,
-                                    int32_t* tmpmem);
-
-void WebRtcSpl_ResetResample22khzTo16khz(WebRtcSpl_State22khzTo16khz* state);
-
-// state structure for 16 -> 22 resampler
-typedef struct {
-  int32_t S_16_32[8];
-  int32_t S_32_22[8];
-} WebRtcSpl_State16khzTo22khz;
-
-void WebRtcSpl_Resample16khzTo22khz(const int16_t* in,
-                                    int16_t* out,
-                                    WebRtcSpl_State16khzTo22khz* state,
-                                    int32_t* tmpmem);
-
-void WebRtcSpl_ResetResample16khzTo22khz(WebRtcSpl_State16khzTo22khz* state);
-
-// state structure for 22 -> 8 resampler
-typedef struct {
-  int32_t S_22_22[16];
-  int32_t S_22_16[8];
-  int32_t S_16_8[8];
-} WebRtcSpl_State22khzTo8khz;
-
-void WebRtcSpl_Resample22khzTo8khz(const int16_t* in,
-                                   int16_t* out,
-                                   WebRtcSpl_State22khzTo8khz* state,
-                                   int32_t* tmpmem);
-
-void WebRtcSpl_ResetResample22khzTo8khz(WebRtcSpl_State22khzTo8khz* state);
-
-// state structure for 8 -> 22 resampler
-typedef struct {
-  int32_t S_8_16[8];
-  int32_t S_16_11[8];
-  int32_t S_11_22[8];
-} WebRtcSpl_State8khzTo22khz;
-
-void WebRtcSpl_Resample8khzTo22khz(const int16_t* in,
-                                   int16_t* out,
-                                   WebRtcSpl_State8khzTo22khz* state,
-                                   int32_t* tmpmem);
-
-void WebRtcSpl_ResetResample8khzTo22khz(WebRtcSpl_State8khzTo22khz* state);
-
-/*******************************************************************
- * resample_fractional.c
- * Functions for internal use in the other resample functions
- *
- * Includes the following resampling combinations
- * 48 kHz -> 32 kHz
- * 32 kHz -> 24 kHz
- * 44 kHz -> 32 kHz
- *
- ******************************************************************/
-
-void WebRtcSpl_Resample48khzTo32khz(const int32_t* In, int32_t* Out, size_t K);
-
-void WebRtcSpl_Resample32khzTo24khz(const int32_t* In, int32_t* Out, size_t K);
-
-void WebRtcSpl_Resample44khzTo32khz(const int32_t* In, int32_t* Out, size_t K);
-
-/*******************************************************************
- * resample_48khz.c
- *
- * Includes the following resampling combinations
- * 48 kHz -> 16 kHz
- * 16 kHz -> 48 kHz
- * 48 kHz ->  8 kHz
- *  8 kHz -> 48 kHz
- *
- ******************************************************************/
-
-typedef struct {
-  int32_t S_48_48[16];
-  int32_t S_48_32[8];
-  int32_t S_32_16[8];
-} WebRtcSpl_State48khzTo16khz;
-
-void WebRtcSpl_Resample48khzTo16khz(const int16_t* in,
-                                    int16_t* out,
-                                    WebRtcSpl_State48khzTo16khz* state,
-                                    int32_t* tmpmem);
-
-void WebRtcSpl_ResetResample48khzTo16khz(WebRtcSpl_State48khzTo16khz* state);
-
-typedef struct {
-  int32_t S_16_32[8];
-  int32_t S_32_24[8];
-  int32_t S_24_48[8];
-} WebRtcSpl_State16khzTo48khz;
-
-void WebRtcSpl_Resample16khzTo48khz(const int16_t* in,
-                                    int16_t* out,
-                                    WebRtcSpl_State16khzTo48khz* state,
-                                    int32_t* tmpmem);
-
-void WebRtcSpl_ResetResample16khzTo48khz(WebRtcSpl_State16khzTo48khz* state);
-
-typedef struct {
-  int32_t S_48_24[8];
-  int32_t S_24_24[16];
-  int32_t S_24_16[8];
-  int32_t S_16_8[8];
-} WebRtcSpl_State48khzTo8khz;
-
-void WebRtcSpl_Resample48khzTo8khz(const int16_t* in,
-                                   int16_t* out,
-                                   WebRtcSpl_State48khzTo8khz* state,
-                                   int32_t* tmpmem);
-
-void WebRtcSpl_ResetResample48khzTo8khz(WebRtcSpl_State48khzTo8khz* state);
-
-typedef struct {
-  int32_t S_8_16[8];
-  int32_t S_16_12[8];
-  int32_t S_12_24[8];
-  int32_t S_24_48[8];
-} WebRtcSpl_State8khzTo48khz;
-
-void WebRtcSpl_Resample8khzTo48khz(const int16_t* in,
-                                   int16_t* out,
-                                   WebRtcSpl_State8khzTo48khz* state,
-                                   int32_t* tmpmem);
-
-void WebRtcSpl_ResetResample8khzTo48khz(WebRtcSpl_State8khzTo48khz* state);
-
-/*******************************************************************
- * resample_by_2.c
- *
- * Includes down and up sampling by a factor of two.
- *
- ******************************************************************/
-
-void WebRtcSpl_DownsampleBy2(const int16_t* in,
-                             size_t len,
-                             int16_t* out,
-                             int32_t* filtState);
-
-void WebRtcSpl_UpsampleBy2(const int16_t* in,
-                           size_t len,
-                           int16_t* out,
-                           int32_t* filtState);
-
-/************************************************************
- * END OF RESAMPLING FUNCTIONS
- ************************************************************/
-void WebRtcSpl_AnalysisQMF(const int16_t* in_data,
-                           size_t in_data_length,
-                           int16_t* low_band,
-                           int16_t* high_band,
-                           int32_t* filter_state1,
-                           int32_t* filter_state2);
-void WebRtcSpl_SynthesisQMF(const int16_t* low_band,
-                            const int16_t* high_band,
-                            size_t band_length,
-                            int16_t* out_data,
-                            int32_t* filter_state1,
-                            int32_t* filter_state2);
-
-#ifdef __cplusplus
-}
-#endif  // __cplusplus
-#endif  // COMMON_AUDIO_SIGNAL_PROCESSING_INCLUDE_SIGNAL_PROCESSING_LIBRARY_H_
-
-//
-// WebRtcSpl_AddSatW16(...)
-// WebRtcSpl_AddSatW32(...)
-//
-// Returns the result of a saturated 16-bit, respectively 32-bit, addition of
-// the numbers specified by the |var1| and |var2| parameters.
-//
-// Input:
-//      - var1      : Input variable 1
-//      - var2      : Input variable 2
-//
-// Return value     : Added and saturated value
-//
-
-//
-// WebRtcSpl_SubSatW16(...)
-// WebRtcSpl_SubSatW32(...)
-//
-// Returns the result of a saturated 16-bit, respectively 32-bit, subtraction
-// of the numbers specified by the |var1| and |var2| parameters.
-//
-// Input:
-//      - var1      : Input variable 1
-//      - var2      : Input variable 2
-//
-// Returned value   : Subtracted and saturated value
-//
-
-//
-// WebRtcSpl_GetSizeInBits(...)
-//
-// Returns the # of bits that are needed at the most to represent the number
-// specified by the |value| parameter.
-//
-// Input:
-//      - value     : Input value
-//
-// Return value     : Number of bits needed to represent |value|
-//
-
-//
-// WebRtcSpl_NormW32(...)
-//
-// Norm returns the # of left shifts required to 32-bit normalize the 32-bit
-// signed number specified by the |value| parameter.
-//
-// Input:
-//      - value     : Input value
-//
-// Return value     : Number of bit shifts needed to 32-bit normalize |value|
-//
-
-//
-// WebRtcSpl_NormW16(...)
-//
-// Norm returns the # of left shifts required to 16-bit normalize the 16-bit
-// signed number specified by the |value| parameter.
-//
-// Input:
-//      - value     : Input value
-//
-// Return value     : Number of bit shifts needed to 32-bit normalize |value|
-//
-
-//
-// WebRtcSpl_NormU32(...)
-//
-// Norm returns the # of left shifts required to 32-bit normalize the unsigned
-// 32-bit number specified by the |value| parameter.
-//
-// Input:
-//      - value     : Input value
-//
-// Return value     : Number of bit shifts needed to 32-bit normalize |value|
-//
-
-//
-// WebRtcSpl_GetScalingSquare(...)
-//
-// Returns the # of bits required to scale the samples specified in the
-// |in_vector| parameter so that, if the squares of the samples are added the
-// # of times specified by the |times| parameter, the 32-bit addition will not
-// overflow (result in int32_t).
-//
-// Input:
-//      - in_vector         : Input vector to check scaling on
-//      - in_vector_length  : Samples in |in_vector|
-//      - times             : Number of additions to be performed
-//
-// Return value             : Number of right bit shifts needed to avoid
-//                            overflow in the addition calculation
-//
-
-//
-// WebRtcSpl_MemSetW16(...)
-//
-// Sets all the values in the int16_t vector |vector| of length
-// |vector_length| to the specified value |set_value|
-//
-// Input:
-//      - vector        : Pointer to the int16_t vector
-//      - set_value     : Value specified
-//      - vector_length : Length of vector
-//
-
-//
-// WebRtcSpl_MemSetW32(...)
-//
-// Sets all the values in the int32_t vector |vector| of length
-// |vector_length| to the specified value |set_value|
-//
-// Input:
-//      - vector        : Pointer to the int16_t vector
-//      - set_value     : Value specified
-//      - vector_length : Length of vector
-//
-
-//
-// WebRtcSpl_MemCpyReversedOrder(...)
-//
-// Copies all the values from the source int16_t vector |in_vector| to a
-// destination int16_t vector |out_vector|. It is done in reversed order,
-// meaning that the first sample of |in_vector| is copied to the last sample of
-// the |out_vector|. The procedure continues until the last sample of
-// |in_vector| has been copied to the first sample of |out_vector|. This
-// creates a reversed vector. Used in e.g. prediction in iLBC.
-//
-// Input:
-//      - in_vector     : Pointer to the first sample in a int16_t vector
-//                        of length |length|
-//      - vector_length : Number of elements to copy
-//
-// Output:
-//      - out_vector    : Pointer to the last sample in a int16_t vector
-//                        of length |length|
-//
-
-//
-// WebRtcSpl_CopyFromEndW16(...)
-//
-// Copies the rightmost |samples| of |in_vector| (of length |in_vector_length|)
-// to the vector |out_vector|.
-//
-// Input:
-//      - in_vector         : Input vector
-//      - in_vector_length  : Number of samples in |in_vector|
-//      - samples           : Number of samples to extract (from right side)
-//                            from |in_vector|
-//
-// Output:
-//      - out_vector        : Vector with the requested samples
-//
-
-//
-// WebRtcSpl_ZerosArrayW16(...)
-// WebRtcSpl_ZerosArrayW32(...)
-//
-// Inserts the value "zero" in all positions of a w16 and a w32 vector
-// respectively.
-//
-// Input:
-//      - vector_length : Number of samples in vector
-//
-// Output:
-//      - vector        : Vector containing all zeros
-//
-
-//
-// WebRtcSpl_VectorBitShiftW16(...)
-// WebRtcSpl_VectorBitShiftW32(...)
-//
-// Bit shifts all the values in a vector up or downwards. Different calls for
-// int16_t and int32_t vectors respectively.
-//
-// Input:
-//      - vector_length : Length of vector
-//      - in_vector     : Pointer to the vector that should be bit shifted
-//      - right_shifts  : Number of right bit shifts (negative value gives left
-//                        shifts)
-//
-// Output:
-//      - out_vector    : Pointer to the result vector (can be the same as
-//                        |in_vector|)
-//
-
-//
-// WebRtcSpl_VectorBitShiftW32ToW16(...)
-//
-// Bit shifts all the values in a int32_t vector up or downwards and
-// stores the result as an int16_t vector. The function will saturate the
-// signal if needed, before storing in the output vector.
-//
-// Input:
-//      - vector_length : Length of vector
-//      - in_vector     : Pointer to the vector that should be bit shifted
-//      - right_shifts  : Number of right bit shifts (negative value gives left
-//                        shifts)
-//
-// Output:
-//      - out_vector    : Pointer to the result vector (can be the same as
-//                        |in_vector|)
-//
-
-//
-// WebRtcSpl_ScaleVector(...)
-//
-// Performs the vector operation:
-//  out_vector[k] = (gain*in_vector[k])>>right_shifts
-//
-// Input:
-//      - in_vector     : Input vector
-//      - gain          : Scaling gain
-//      - vector_length : Elements in the |in_vector|
-//      - right_shifts  : Number of right bit shifts applied
-//
-// Output:
-//      - out_vector    : Output vector (can be the same as |in_vector|)
-//
-
-//
-// WebRtcSpl_ScaleVectorWithSat(...)
-//
-// Performs the vector operation:
-//  out_vector[k] = SATURATE( (gain*in_vector[k])>>right_shifts )
-//
-// Input:
-//      - in_vector     : Input vector
-//      - gain          : Scaling gain
-//      - vector_length : Elements in the |in_vector|
-//      - right_shifts  : Number of right bit shifts applied
-//
-// Output:
-//      - out_vector    : Output vector (can be the same as |in_vector|)
-//
-
-//
-// WebRtcSpl_ScaleAndAddVectors(...)
-//
-// Performs the vector operation:
-//  out_vector[k] = (gain1*in_vector1[k])>>right_shifts1
-//                  + (gain2*in_vector2[k])>>right_shifts2
-//
-// Input:
-//      - in_vector1    : Input vector 1
-//      - gain1         : Gain to be used for vector 1
-//      - right_shifts1 : Right bit shift to be used for vector 1
-//      - in_vector2    : Input vector 2
-//      - gain2         : Gain to be used for vector 2
-//      - right_shifts2 : Right bit shift to be used for vector 2
-//      - vector_length : Elements in the input vectors
-//
-// Output:
-//      - out_vector    : Output vector
-//
-
-//
-// WebRtcSpl_ReverseOrderMultArrayElements(...)
-//
-// Performs the vector operation:
-//  out_vector[n] = (in_vector[n]*window[-n])>>right_shifts
-//
-// Input:
-//      - in_vector     : Input vector
-//      - window        : Window vector (should be reversed). The pointer
-//                        should be set to the last value in the vector
-//      - right_shifts  : Number of right bit shift to be applied after the
-//                        multiplication
-//      - vector_length : Number of elements in |in_vector|
-//
-// Output:
-//      - out_vector    : Output vector (can be same as |in_vector|)
-//
-
-//
-// WebRtcSpl_ElementwiseVectorMult(...)
-//
-// Performs the vector operation:
-//  out_vector[n] = (in_vector[n]*window[n])>>right_shifts
-//
-// Input:
-//      - in_vector     : Input vector
-//      - window        : Window vector.
-//      - right_shifts  : Number of right bit shift to be applied after the
-//                        multiplication
-//      - vector_length : Number of elements in |in_vector|
-//
-// Output:
-//      - out_vector    : Output vector (can be same as |in_vector|)
-//
-
-//
-// WebRtcSpl_AddVectorsAndShift(...)
-//
-// Performs the vector operation:
-//  out_vector[k] = (in_vector1[k] + in_vector2[k])>>right_shifts
-//
-// Input:
-//      - in_vector1    : Input vector 1
-//      - in_vector2    : Input vector 2
-//      - right_shifts  : Number of right bit shift to be applied after the
-//                        multiplication
-//      - vector_length : Number of elements in |in_vector1| and |in_vector2|
-//
-// Output:
-//      - out_vector    : Output vector (can be same as |in_vector1|)
-//
-
-//
-// WebRtcSpl_AddAffineVectorToVector(...)
-//
-// Adds an affine transformed vector to another vector |out_vector|, i.e,
-// performs
-//  out_vector[k] += (in_vector[k]*gain+add_constant)>>right_shifts
-//
-// Input:
-//      - in_vector     : Input vector
-//      - gain          : Gain value, used to multiply the in vector with
-//      - add_constant  : Constant value to add (usually 1<<(right_shifts-1),
-//                        but others can be used as well
-//      - right_shifts  : Number of right bit shifts (0-16)
-//      - vector_length : Number of samples in |in_vector| and |out_vector|
-//
-// Output:
-//      - out_vector    : Vector with the output
-//
-
-//
-// WebRtcSpl_AffineTransformVector(...)
-//
-// Affine transforms a vector, i.e, performs
-//  out_vector[k] = (in_vector[k]*gain+add_constant)>>right_shifts
-//
-// Input:
-//      - in_vector     : Input vector
-//      - gain          : Gain value, used to multiply the in vector with
-//      - add_constant  : Constant value to add (usually 1<<(right_shifts-1),
-//                        but others can be used as well
-//      - right_shifts  : Number of right bit shifts (0-16)
-//      - vector_length : Number of samples in |in_vector| and |out_vector|
-//
-// Output:
-//      - out_vector    : Vector with the output
-//
-
-//
-// WebRtcSpl_IncreaseSeed(...)
-//
-// Increases the seed (and returns the new value)
-//
-// Input:
-//      - seed      : Seed for random calculation
-//
-// Output:
-//      - seed      : Updated seed value
-//
-// Return value     : The new seed value
-//
-
-//
-// WebRtcSpl_RandU(...)
-//
-// Produces a uniformly distributed value in the int16_t range
-//
-// Input:
-//      - seed      : Seed for random calculation
-//
-// Output:
-//      - seed      : Updated seed value
-//
-// Return value     : Uniformly distributed value in the range
-//                    [Word16_MIN...Word16_MAX]
-//
-
-//
-// WebRtcSpl_RandN(...)
-//
-// Produces a normal distributed value in the int16_t range
-//
-// Input:
-//      - seed      : Seed for random calculation
-//
-// Output:
-//      - seed      : Updated seed value
-//
-// Return value     : N(0,1) value in the Q13 domain
-//
-
-//
-// WebRtcSpl_RandUArray(...)
-//
-// Produces a uniformly distributed vector with elements in the int16_t
-// range
-//
-// Input:
-//      - vector_length : Samples wanted in the vector
-//      - seed          : Seed for random calculation
-//
-// Output:
-//      - vector        : Vector with the uniform values
-//      - seed          : Updated seed value
-//
-// Return value         : Number of samples in vector, i.e., |vector_length|
-//
-
-//
-// WebRtcSpl_Sqrt(...)
-//
-// Returns the square root of the input value |value|. The precision of this
-// function is integer precision, i.e., sqrt(8) gives 2 as answer.
-// If |value| is a negative number then 0 is returned.
-//
-// Algorithm:
-//
-// A sixth order Taylor Series expansion is used here to compute the square
-// root of a number y^0.5 = (1+x)^0.5
-// where
-// x = y-1
-//   = 1+(x/2)-0.5*((x/2)^2+0.5*((x/2)^3-0.625*((x/2)^4+0.875*((x/2)^5)
-// 0.5 <= x < 1
-//
-// Input:
-//      - value     : Value to calculate sqrt of
-//
-// Return value     : Result of the sqrt calculation
-//
-
-//
-// WebRtcSpl_DivU32U16(...)
-//
-// Divides a uint32_t |num| by a uint16_t |den|.
-//
-// If |den|==0, (uint32_t)0xFFFFFFFF is returned.
-//
-// Input:
-//      - num       : Numerator
-//      - den       : Denominator
-//
-// Return value     : Result of the division (as a uint32_t), i.e., the
-//                    integer part of num/den.
-//
-
-//
-// WebRtcSpl_DivW32W16(...)
-//
-// Divides a int32_t |num| by a int16_t |den|.
-//
-// If |den|==0, (int32_t)0x7FFFFFFF is returned.
-//
-// Input:
-//      - num       : Numerator
-//      - den       : Denominator
-//
-// Return value     : Result of the division (as a int32_t), i.e., the
-//                    integer part of num/den.
-//
-
-//
-// WebRtcSpl_DivW32W16ResW16(...)
-//
-// Divides a int32_t |num| by a int16_t |den|, assuming that the
-// result is less than 32768, otherwise an unpredictable result will occur.
-//
-// If |den|==0, (int16_t)0x7FFF is returned.
-//
-// Input:
-//      - num       : Numerator
-//      - den       : Denominator
-//
-// Return value     : Result of the division (as a int16_t), i.e., the
-//                    integer part of num/den.
-//
-
-//
-// WebRtcSpl_DivResultInQ31(...)
-//
-// Divides a int32_t |num| by a int16_t |den|, assuming that the
-// absolute value of the denominator is larger than the numerator, otherwise
-// an unpredictable result will occur.
-//
-// Input:
-//      - num       : Numerator
-//      - den       : Denominator
-//
-// Return value     : Result of the division in Q31.
-//
-
-//
-// WebRtcSpl_DivW32HiLow(...)
-//
-// Divides a int32_t |num| by a denominator in hi, low format. The
-// absolute value of the denominator has to be larger (or equal to) the
-// numerator.
-//
-// Input:
-//      - num       : Numerator
-//      - den_hi    : High part of denominator
-//      - den_low   : Low part of denominator
-//
-// Return value     : Divided value in Q31
-//
-
-//
-// WebRtcSpl_Energy(...)
-//
-// Calculates the energy of a vector
-//
-// Input:
-//      - vector        : Vector which the energy should be calculated on
-//      - vector_length : Number of samples in vector
-//
-// Output:
-//      - scale_factor  : Number of left bit shifts needed to get the physical
-//                        energy value, i.e, to get the Q0 value
-//
-// Return value         : Energy value in Q(-|scale_factor|)
-//
-
-//
-// WebRtcSpl_FilterAR(...)
-//
-// Performs a 32-bit AR filtering on a vector in Q12
-//
-// Input:
-//  - ar_coef                   : AR-coefficient vector (values in Q12),
-//                                ar_coef[0] must be 4096.
-//  - ar_coef_length            : Number of coefficients in |ar_coef|.
-//  - in_vector                 : Vector to be filtered.
-//  - in_vector_length          : Number of samples in |in_vector|.
-//  - filter_state              : Current state (higher part) of the filter.
-//  - filter_state_length       : Length (in samples) of |filter_state|.
-//  - filter_state_low          : Current state (lower part) of the filter.
-//  - filter_state_low_length   : Length (in samples) of |filter_state_low|.
-//  - out_vector_low_length     : Maximum length (in samples) of
-//                                |out_vector_low|.
-//
-// Output:
-//  - filter_state              : Updated state (upper part) vector.
-//  - filter_state_low          : Updated state (lower part) vector.
-//  - out_vector                : Vector containing the upper part of the
-//                                filtered values.
-//  - out_vector_low            : Vector containing the lower part of the
-//                                filtered values.
-//
-// Return value                 : Number of samples in the |out_vector|.
-//
-
-//
-// WebRtcSpl_ComplexIFFT(...)
-//
-// Complex Inverse FFT
-//
-// Computes an inverse complex 2^|stages|-point FFT on the input vector, which
-// is in bit-reversed order. The original content of the vector is destroyed in
-// the process, since the input is overwritten by the output, normal-ordered,
-// FFT vector. With X as the input complex vector, y as the output complex
-// vector and with M = 2^|stages|, the following is computed:
-//
-//        M-1
-// y(k) = sum[X(i)*[cos(2*pi*i*k/M) + j*sin(2*pi*i*k/M)]]
-//        i=0
-//
-// The implementations are optimized for speed, not for code size. It uses the
-// decimation-in-time algorithm with radix-2 butterfly technique.
-//
-// Input:
-//      - vector    : In pointer to complex vector containing 2^|stages|
-//                    real elements interleaved with 2^|stages| imaginary
-//                    elements.
-//                    [ReImReImReIm....]
-//                    The elements are in Q(-scale) domain, see more on Return
-//                    Value below.
-//
-//      - stages    : Number of FFT stages. Must be at least 3 and at most 10,
-//                    since the table WebRtcSpl_kSinTable1024[] is 1024
-//                    elements long.
-//
-//      - mode      : This parameter gives the user to choose how the FFT
-//                    should work.
-//                    mode==0: Low-complexity and Low-accuracy mode
-//                    mode==1: High-complexity and High-accuracy mode
-//
-// Output:
-//      - vector    : Out pointer to the FFT vector (the same as input).
-//
-// Return Value     : The scale value that tells the number of left bit shifts
-//                    that the elements in the |vector| should be shifted with
-//                    in order to get Q0 values, i.e. the physically correct
-//                    values. The scale parameter is always 0 or positive,
-//                    except if N>1024 (|stages|>10), which returns a scale
-//                    value of -1, indicating error.
-//
-
-//
-// WebRtcSpl_ComplexFFT(...)
-//
-// Complex FFT
-//
-// Computes a complex 2^|stages|-point FFT on the input vector, which is in
-// bit-reversed order. The original content of the vector is destroyed in
-// the process, since the input is overwritten by the output, normal-ordered,
-// FFT vector. With x as the input complex vector, Y as the output complex
-// vector and with M = 2^|stages|, the following is computed:
-//
-//              M-1
-// Y(k) = 1/M * sum[x(i)*[cos(2*pi*i*k/M) + j*sin(2*pi*i*k/M)]]
-//              i=0
-//
-// The implementations are optimized for speed, not for code size. It uses the
-// decimation-in-time algorithm with radix-2 butterfly technique.
-//
-// This routine prevents overflow by scaling by 2 before each FFT stage. This is
-// a fixed scaling, for proper normalization - there will be log2(n) passes, so
-// this results in an overall factor of 1/n, distributed to maximize arithmetic
-// accuracy.
-//
-// Input:
-//      - vector    : In pointer to complex vector containing 2^|stages| real
-//                    elements interleaved with 2^|stages| imaginary elements.
-//                    [ReImReImReIm....]
-//                    The output is in the Q0 domain.
-//
-//      - stages    : Number of FFT stages. Must be at least 3 and at most 10,
-//                    since the table WebRtcSpl_kSinTable1024[] is 1024
-//                    elements long.
-//
-//      - mode      : This parameter gives the user to choose how the FFT
-//                    should work.
-//                    mode==0: Low-complexity and Low-accuracy mode
-//                    mode==1: High-complexity and High-accuracy mode
-//
-// Output:
-//      - vector    : The output FFT vector is in the Q0 domain.
-//
-// Return value     : The scale parameter is always 0, except if N>1024,
-//                    which returns a scale value of -1, indicating error.
-//
-
-//
-// WebRtcSpl_AnalysisQMF(...)
-//
-// Splits a 0-2*F Hz signal into two sub bands: 0-F Hz and F-2*F Hz. The
-// current version has F = 8000, therefore, a super-wideband audio signal is
-// split to lower-band 0-8 kHz and upper-band 8-16 kHz.
-//
-// Input:
-//      - in_data       : Wide band speech signal, 320 samples (10 ms)
-//
-// Input & Output:
-//      - filter_state1 : Filter state for first All-pass filter
-//      - filter_state2 : Filter state for second All-pass filter
-//
-// Output:
-//      - low_band      : Lower-band signal 0-8 kHz band, 160 samples (10 ms)
-//      - high_band     : Upper-band signal 8-16 kHz band (flipped in frequency
-//                        domain), 160 samples (10 ms)
-//
-
-//
-// WebRtcSpl_SynthesisQMF(...)
-//
-// Combines the two sub bands (0-F and F-2*F Hz) into a signal of 0-2*F
-// Hz, (current version has F = 8000 Hz). So the filter combines lower-band
-// (0-8 kHz) and upper-band (8-16 kHz) channels to obtain super-wideband 0-16
-// kHz audio.
-//
-// Input:
-//      - low_band      : The signal with the 0-8 kHz band, 160 samples (10 ms)
-//      - high_band     : The signal with the 8-16 kHz band, 160 samples (10 ms)
-//
-// Input & Output:
-//      - filter_state1 : Filter state for first All-pass filter
-//      - filter_state2 : Filter state for second All-pass filter
-//
-// Output:
-//      - out_data      : Super-wideband speech signal, 0-16 kHz
-//
-
-// int16_t WebRtcSpl_SatW32ToW16(...)
-//
-// This function saturates a 32-bit word into a 16-bit word.
-//
-// Input:
-//      - value32   : The value of a 32-bit word.
-//
-// Output:
-//      - out16     : the saturated 16-bit word.
-//
-
-// int32_t WebRtc_MulAccumW16(...)
-//
-// This function multiply a 16-bit word by a 16-bit word, and accumulate this
-// value to a 32-bit integer.
-//
-// Input:
-//      - a    : The value of the first 16-bit word.
-//      - b    : The value of the second 16-bit word.
-//      - c    : The value of an 32-bit integer.
-//
-// Return Value: The value of a * b + c.
-//
diff --git a/submodules/libtgvoip/webrtc_dsp/common_audio/signal_processing/include/spl_inl.h b/submodules/libtgvoip/webrtc_dsp/common_audio/signal_processing/include/spl_inl.h
deleted file mode 100644
index 656a3125bb..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/common_audio/signal_processing/include/spl_inl.h
+++ /dev/null
@@ -1,153 +0,0 @@
-/*
- *  Copyright (c) 2011 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-// This header file includes the inline functions in
-// the fix point signal processing library.
-
-#ifndef COMMON_AUDIO_SIGNAL_PROCESSING_INCLUDE_SPL_INL_H_
-#define COMMON_AUDIO_SIGNAL_PROCESSING_INCLUDE_SPL_INL_H_
-
-#include "rtc_base/compile_assert_c.h"
-
-extern const int8_t kWebRtcSpl_CountLeadingZeros32_Table[64];
-
-// Don't call this directly except in tests!
-static __inline int WebRtcSpl_CountLeadingZeros32_NotBuiltin(uint32_t n) {
-  // Normalize n by rounding up to the nearest number that is a sequence of 0
-  // bits followed by a sequence of 1 bits. This number has the same number of
-  // leading zeros as the original n. There are exactly 33 such values.
-  n |= n >> 1;
-  n |= n >> 2;
-  n |= n >> 4;
-  n |= n >> 8;
-  n |= n >> 16;
-
-  // Multiply the modified n with a constant selected (by exhaustive search)
-  // such that each of the 33 possible values of n give a product whose 6 most
-  // significant bits are unique. Then look up the answer in the table.
-  return kWebRtcSpl_CountLeadingZeros32_Table[(n * 0x8c0b2891) >> 26];
-}
-
-// Don't call this directly except in tests!
-static __inline int WebRtcSpl_CountLeadingZeros64_NotBuiltin(uint64_t n) {
-  const int leading_zeros = n >> 32 == 0 ? 32 : 0;
-  return leading_zeros + WebRtcSpl_CountLeadingZeros32_NotBuiltin(
-                             (uint32_t)(n >> (32 - leading_zeros)));
-}
-
-// Returns the number of leading zero bits in the argument.
-static __inline int WebRtcSpl_CountLeadingZeros32(uint32_t n) {
-#ifdef __GNUC__
-  RTC_COMPILE_ASSERT(sizeof(unsigned int) == sizeof(uint32_t));
-  return n == 0 ? 32 : __builtin_clz(n);
-#else
-  return WebRtcSpl_CountLeadingZeros32_NotBuiltin(n);
-#endif
-}
-
-// Returns the number of leading zero bits in the argument.
-static __inline int WebRtcSpl_CountLeadingZeros64(uint64_t n) {
-#ifdef __GNUC__
-  RTC_COMPILE_ASSERT(sizeof(unsigned long long) == sizeof(uint64_t));  // NOLINT
-  return n == 0 ? 64 : __builtin_clzll(n);
-#else
-  return WebRtcSpl_CountLeadingZeros64_NotBuiltin(n);
-#endif
-}
-
-#ifdef WEBRTC_ARCH_ARM_V7
-#include "common_audio/signal_processing/include/spl_inl_armv7.h"
-#else
-
-#if defined(MIPS32_LE)
-#include "common_audio/signal_processing/include/spl_inl_mips.h"
-#endif
-
-#if !defined(MIPS_DSP_R1_LE)
-static __inline int16_t WebRtcSpl_SatW32ToW16(int32_t value32) {
-  int16_t out16 = (int16_t)value32;
-
-  if (value32 > 32767)
-    out16 = 32767;
-  else if (value32 < -32768)
-    out16 = -32768;
-
-  return out16;
-}
-
-static __inline int32_t WebRtcSpl_AddSatW32(int32_t a, int32_t b) {
-  // Do the addition in unsigned numbers, since signed overflow is undefined
-  // behavior.
-  const int32_t sum = (int32_t)((uint32_t)a + (uint32_t)b);
-
-  // a + b can't overflow if a and b have different signs. If they have the
-  // same sign, a + b also has the same sign iff it didn't overflow.
-  if ((a < 0) == (b < 0) && (a < 0) != (sum < 0)) {
-    // The direction of the overflow is obvious from the sign of a + b.
-    return sum < 0 ? INT32_MAX : INT32_MIN;
-  }
-  return sum;
-}
-
-static __inline int32_t WebRtcSpl_SubSatW32(int32_t a, int32_t b) {
-  // Do the subtraction in unsigned numbers, since signed overflow is undefined
-  // behavior.
-  const int32_t diff = (int32_t)((uint32_t)a - (uint32_t)b);
-
-  // a - b can't overflow if a and b have the same sign. If they have different
-  // signs, a - b has the same sign as a iff it didn't overflow.
-  if ((a < 0) != (b < 0) && (a < 0) != (diff < 0)) {
-    // The direction of the overflow is obvious from the sign of a - b.
-    return diff < 0 ? INT32_MAX : INT32_MIN;
-  }
-  return diff;
-}
-
-static __inline int16_t WebRtcSpl_AddSatW16(int16_t a, int16_t b) {
-  return WebRtcSpl_SatW32ToW16((int32_t)a + (int32_t)b);
-}
-
-static __inline int16_t WebRtcSpl_SubSatW16(int16_t var1, int16_t var2) {
-  return WebRtcSpl_SatW32ToW16((int32_t)var1 - (int32_t)var2);
-}
-#endif  // #if !defined(MIPS_DSP_R1_LE)
-
-#if !defined(MIPS32_LE)
-static __inline int16_t WebRtcSpl_GetSizeInBits(uint32_t n) {
-  return 32 - WebRtcSpl_CountLeadingZeros32(n);
-}
-
-// Return the number of steps a can be left-shifted without overflow,
-// or 0 if a == 0.
-static __inline int16_t WebRtcSpl_NormW32(int32_t a) {
-  return a == 0 ? 0 : WebRtcSpl_CountLeadingZeros32(a < 0 ? ~a : a) - 1;
-}
-
-// Return the number of steps a can be left-shifted without overflow,
-// or 0 if a == 0.
-static __inline int16_t WebRtcSpl_NormU32(uint32_t a) {
-  return a == 0 ? 0 : WebRtcSpl_CountLeadingZeros32(a);
-}
-
-// Return the number of steps a can be left-shifted without overflow,
-// or 0 if a == 0.
-static __inline int16_t WebRtcSpl_NormW16(int16_t a) {
-  const int32_t a32 = a;
-  return a == 0 ? 0 : WebRtcSpl_CountLeadingZeros32(a < 0 ? ~a32 : a32) - 17;
-}
-
-static __inline int32_t WebRtc_MulAccumW16(int16_t a, int16_t b, int32_t c) {
-  return (a * b + c);
-}
-#endif  // #if !defined(MIPS32_LE)
-
-#endif  // WEBRTC_ARCH_ARM_V7
-
-#endif  // COMMON_AUDIO_SIGNAL_PROCESSING_INCLUDE_SPL_INL_H_
diff --git a/submodules/libtgvoip/webrtc_dsp/common_audio/signal_processing/include/spl_inl_armv7.h b/submodules/libtgvoip/webrtc_dsp/common_audio/signal_processing/include/spl_inl_armv7.h
deleted file mode 100644
index 930e91e2b3..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/common_audio/signal_processing/include/spl_inl_armv7.h
+++ /dev/null
@@ -1,136 +0,0 @@
-/*
- *  Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-/* This header file includes the inline functions for ARM processors in
- * the fix point signal processing library.
- */
-
-#ifndef COMMON_AUDIO_SIGNAL_PROCESSING_INCLUDE_SPL_INL_ARMV7_H_
-#define COMMON_AUDIO_SIGNAL_PROCESSING_INCLUDE_SPL_INL_ARMV7_H_
-
-/* TODO(kma): Replace some assembly code with GCC intrinsics
- * (e.g. __builtin_clz).
- */
-
-/* This function produces result that is not bit exact with that by the generic
- * C version in some cases, although the former is at least as accurate as the
- * later.
- */
-static __inline int32_t WEBRTC_SPL_MUL_16_32_RSFT16(int16_t a, int32_t b) {
-  int32_t tmp = 0;
-  __asm __volatile("smulwb %0, %1, %2" : "=r"(tmp) : "r"(b), "r"(a));
-  return tmp;
-}
-
-static __inline int32_t WEBRTC_SPL_MUL_16_16(int16_t a, int16_t b) {
-  int32_t tmp = 0;
-  __asm __volatile("smulbb %0, %1, %2" : "=r"(tmp) : "r"(a), "r"(b));
-  return tmp;
-}
-
-// TODO(kma): add unit test.
-static __inline int32_t WebRtc_MulAccumW16(int16_t a, int16_t b, int32_t c) {
-  int32_t tmp = 0;
-  __asm __volatile("smlabb %0, %1, %2, %3"
-                   : "=r"(tmp)
-                   : "r"(a), "r"(b), "r"(c));
-  return tmp;
-}
-
-static __inline int16_t WebRtcSpl_AddSatW16(int16_t a, int16_t b) {
-  int32_t s_sum = 0;
-
-  __asm __volatile("qadd16 %0, %1, %2" : "=r"(s_sum) : "r"(a), "r"(b));
-
-  return (int16_t)s_sum;
-}
-
-static __inline int32_t WebRtcSpl_AddSatW32(int32_t l_var1, int32_t l_var2) {
-  int32_t l_sum = 0;
-
-  __asm __volatile("qadd %0, %1, %2" : "=r"(l_sum) : "r"(l_var1), "r"(l_var2));
-
-  return l_sum;
-}
-
-static __inline int32_t WebRtcSpl_SubSatW32(int32_t l_var1, int32_t l_var2) {
-  int32_t l_sub = 0;
-
-  __asm __volatile("qsub %0, %1, %2" : "=r"(l_sub) : "r"(l_var1), "r"(l_var2));
-
-  return l_sub;
-}
-
-static __inline int16_t WebRtcSpl_SubSatW16(int16_t var1, int16_t var2) {
-  int32_t s_sub = 0;
-
-  __asm __volatile("qsub16 %0, %1, %2" : "=r"(s_sub) : "r"(var1), "r"(var2));
-
-  return (int16_t)s_sub;
-}
-
-static __inline int16_t WebRtcSpl_GetSizeInBits(uint32_t n) {
-  int32_t tmp = 0;
-
-  __asm __volatile("clz %0, %1" : "=r"(tmp) : "r"(n));
-
-  return (int16_t)(32 - tmp);
-}
-
-static __inline int16_t WebRtcSpl_NormW32(int32_t a) {
-  int32_t tmp = 0;
-
-  if (a == 0) {
-    return 0;
-  } else if (a < 0) {
-    a ^= 0xFFFFFFFF;
-  }
-
-  __asm __volatile("clz %0, %1" : "=r"(tmp) : "r"(a));
-
-  return (int16_t)(tmp - 1);
-}
-
-static __inline int16_t WebRtcSpl_NormU32(uint32_t a) {
-  int tmp = 0;
-
-  if (a == 0)
-    return 0;
-
-  __asm __volatile("clz %0, %1" : "=r"(tmp) : "r"(a));
-
-  return (int16_t)tmp;
-}
-
-static __inline int16_t WebRtcSpl_NormW16(int16_t a) {
-  int32_t tmp = 0;
-  int32_t a_32 = a;
-
-  if (a_32 == 0) {
-    return 0;
-  } else if (a_32 < 0) {
-    a_32 ^= 0xFFFFFFFF;
-  }
-
-  __asm __volatile("clz %0, %1" : "=r"(tmp) : "r"(a_32));
-
-  return (int16_t)(tmp - 17);
-}
-
-// TODO(kma): add unit test.
-static __inline int16_t WebRtcSpl_SatW32ToW16(int32_t value32) {
-  int32_t out = 0;
-
-  __asm __volatile("ssat %0, #16, %1" : "=r"(out) : "r"(value32));
-
-  return (int16_t)out;
-}
-
-#endif  // COMMON_AUDIO_SIGNAL_PROCESSING_INCLUDE_SPL_INL_ARMV7_H_
diff --git a/submodules/libtgvoip/webrtc_dsp/common_audio/signal_processing/levinson_durbin.c b/submodules/libtgvoip/webrtc_dsp/common_audio/signal_processing/levinson_durbin.c
deleted file mode 100644
index 2c5cbaeeaa..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/common_audio/signal_processing/levinson_durbin.c
+++ /dev/null
@@ -1,249 +0,0 @@
-/*
- *  Copyright (c) 2011 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-
-/*
- * This file contains the function WebRtcSpl_LevinsonDurbin().
- * The description header can be found in signal_processing_library.h
- *
- */
-
-#include "common_audio/signal_processing/include/signal_processing_library.h"
-#include "rtc_base/sanitizer.h"
-
-#define SPL_LEVINSON_MAXORDER 20
-
-int16_t RTC_NO_SANITIZE("signed-integer-overflow")  // bugs.webrtc.org/5486
-WebRtcSpl_LevinsonDurbin(const int32_t* R, int16_t* A, int16_t* K,
-                         size_t order)
-{
-    size_t i, j;
-    // Auto-correlation coefficients in high precision
-    int16_t R_hi[SPL_LEVINSON_MAXORDER + 1], R_low[SPL_LEVINSON_MAXORDER + 1];
-    // LPC coefficients in high precision
-    int16_t A_hi[SPL_LEVINSON_MAXORDER + 1], A_low[SPL_LEVINSON_MAXORDER + 1];
-    // LPC coefficients for next iteration
-    int16_t A_upd_hi[SPL_LEVINSON_MAXORDER + 1], A_upd_low[SPL_LEVINSON_MAXORDER + 1];
-    // Reflection coefficient in high precision
-    int16_t K_hi, K_low;
-    // Prediction gain Alpha in high precision and with scale factor
-    int16_t Alpha_hi, Alpha_low, Alpha_exp;
-    int16_t tmp_hi, tmp_low;
-    int32_t temp1W32, temp2W32, temp3W32;
-    int16_t norm;
-
-    // Normalize the autocorrelation R[0]...R[order+1]
-
-    norm = WebRtcSpl_NormW32(R[0]);
-
-    for (i = 0; i <= order; ++i)
-    {
-        temp1W32 = R[i] * (1 << norm);
-        // UBSan: 12 * 268435456 cannot be represented in type 'int'
-
-        // Put R in hi and low format
-        R_hi[i] = (int16_t)(temp1W32 >> 16);
-        R_low[i] = (int16_t)((temp1W32 - ((int32_t)R_hi[i] * 65536)) >> 1);
-    }
-
-    // K = A[1] = -R[1] / R[0]
-
-    temp2W32 = R[1] * (1 << norm); // R[1] in Q31
-    temp3W32 = WEBRTC_SPL_ABS_W32(temp2W32); // abs R[1]
-    temp1W32 = WebRtcSpl_DivW32HiLow(temp3W32, R_hi[0], R_low[0]); // abs(R[1])/R[0] in Q31
-    // Put back the sign on R[1]
-    if (temp2W32 > 0)
-    {
-        temp1W32 = -temp1W32;
-    }
-
-    // Put K in hi and low format
-    K_hi = (int16_t)(temp1W32 >> 16);
-    K_low = (int16_t)((temp1W32 - ((int32_t)K_hi * 65536)) >> 1);
-
-    // Store first reflection coefficient
-    K[0] = K_hi;
-
-    temp1W32 >>= 4;  // A[1] in Q27.
-
-    // Put A[1] in hi and low format
-    A_hi[1] = (int16_t)(temp1W32 >> 16);
-    A_low[1] = (int16_t)((temp1W32 - ((int32_t)A_hi[1] * 65536)) >> 1);
-
-    // Alpha = R[0] * (1-K^2)
-
-    temp1W32 = ((K_hi * K_low >> 14) + K_hi * K_hi) * 2;  // = k^2 in Q31
-
-    temp1W32 = WEBRTC_SPL_ABS_W32(temp1W32); // Guard against <0
-    temp1W32 = (int32_t)0x7fffffffL - temp1W32; // temp1W32 = (1 - K[0]*K[0]) in Q31
-
-    // Store temp1W32 = 1 - K[0]*K[0] on hi and low format
-    tmp_hi = (int16_t)(temp1W32 >> 16);
-    tmp_low = (int16_t)((temp1W32 - ((int32_t)tmp_hi << 16)) >> 1);
-
-    // Calculate Alpha in Q31
-    temp1W32 = (R_hi[0] * tmp_hi + (R_hi[0] * tmp_low >> 15) +
-        (R_low[0] * tmp_hi >> 15)) << 1;
-
-    // Normalize Alpha and put it in hi and low format
-
-    Alpha_exp = WebRtcSpl_NormW32(temp1W32);
-    temp1W32 = WEBRTC_SPL_LSHIFT_W32(temp1W32, Alpha_exp);
-    Alpha_hi = (int16_t)(temp1W32 >> 16);
-    Alpha_low = (int16_t)((temp1W32 - ((int32_t)Alpha_hi << 16)) >> 1);
-
-    // Perform the iterative calculations in the Levinson-Durbin algorithm
-
-    for (i = 2; i <= order; i++)
-    {
-        /*                    ----
-         temp1W32 =  R[i] + > R[j]*A[i-j]
-         /
-         ----
-         j=1..i-1
-         */
-
-        temp1W32 = 0;
-
-        for (j = 1; j < i; j++)
-        {
-          // temp1W32 is in Q31
-          temp1W32 += (R_hi[j] * A_hi[i - j] * 2) +
-              (((R_hi[j] * A_low[i - j] >> 15) +
-              (R_low[j] * A_hi[i - j] >> 15)) * 2);
-        }
-
-        temp1W32 = temp1W32 * 16;
-        temp1W32 += ((int32_t)R_hi[i] * 65536)
-                + WEBRTC_SPL_LSHIFT_W32((int32_t)R_low[i], 1);
-
-        // K = -temp1W32 / Alpha
-        temp2W32 = WEBRTC_SPL_ABS_W32(temp1W32); // abs(temp1W32)
-        temp3W32 = WebRtcSpl_DivW32HiLow(temp2W32, Alpha_hi, Alpha_low); // abs(temp1W32)/Alpha
-
-        // Put the sign of temp1W32 back again
-        if (temp1W32 > 0)
-        {
-            temp3W32 = -temp3W32;
-        }
-
-        // Use the Alpha shifts from earlier to de-normalize
-        norm = WebRtcSpl_NormW32(temp3W32);
-        if ((Alpha_exp <= norm) || (temp3W32 == 0))
-        {
-            temp3W32 = temp3W32 * (1 << Alpha_exp);
-        } else
-        {
-            if (temp3W32 > 0)
-            {
-                temp3W32 = (int32_t)0x7fffffffL;
-            } else
-            {
-                temp3W32 = (int32_t)0x80000000L;
-            }
-        }
-
-        // Put K on hi and low format
-        K_hi = (int16_t)(temp3W32 >> 16);
-        K_low = (int16_t)((temp3W32 - ((int32_t)K_hi * 65536)) >> 1);
-
-        // Store Reflection coefficient in Q15
-        K[i - 1] = K_hi;
-
-        // Test for unstable filter.
-        // If unstable return 0 and let the user decide what to do in that case
-
-        if ((int32_t)WEBRTC_SPL_ABS_W16(K_hi) > (int32_t)32750)
-        {
-            return 0; // Unstable filter
-        }
-
-        /*
-         Compute updated LPC coefficient: Anew[i]
-         Anew[j]= A[j] + K*A[i-j]   for j=1..i-1
-         Anew[i]= K
-         */
-
-        for (j = 1; j < i; j++)
-        {
-            // temp1W32 = A[j] in Q27
-            temp1W32 = (int32_t)A_hi[j] * 65536
-                    + WEBRTC_SPL_LSHIFT_W32((int32_t)A_low[j],1);
-
-            // temp1W32 += K*A[i-j] in Q27
-            temp1W32 += (K_hi * A_hi[i - j] + (K_hi * A_low[i - j] >> 15) +
-                (K_low * A_hi[i - j] >> 15)) * 2;
-
-            // Put Anew in hi and low format
-            A_upd_hi[j] = (int16_t)(temp1W32 >> 16);
-            A_upd_low[j] = (int16_t)(
-                (temp1W32 - ((int32_t)A_upd_hi[j] * 65536)) >> 1);
-        }
-
-        // temp3W32 = K in Q27 (Convert from Q31 to Q27)
-        temp3W32 >>= 4;
-
-        // Store Anew in hi and low format
-        A_upd_hi[i] = (int16_t)(temp3W32 >> 16);
-        A_upd_low[i] = (int16_t)(
-            (temp3W32 - ((int32_t)A_upd_hi[i] * 65536)) >> 1);
-
-        // Alpha = Alpha * (1-K^2)
-
-        temp1W32 = ((K_hi * K_low >> 14) + K_hi * K_hi) * 2;  // K*K in Q31
-
-        temp1W32 = WEBRTC_SPL_ABS_W32(temp1W32); // Guard against <0
-        temp1W32 = (int32_t)0x7fffffffL - temp1W32; // 1 - K*K  in Q31
-
-        // Convert 1- K^2 in hi and low format
-        tmp_hi = (int16_t)(temp1W32 >> 16);
-        tmp_low = (int16_t)((temp1W32 - ((int32_t)tmp_hi << 16)) >> 1);
-
-        // Calculate Alpha = Alpha * (1-K^2) in Q31
-        temp1W32 = (Alpha_hi * tmp_hi + (Alpha_hi * tmp_low >> 15) +
-            (Alpha_low * tmp_hi >> 15)) << 1;
-
-        // Normalize Alpha and store it on hi and low format
-
-        norm = WebRtcSpl_NormW32(temp1W32);
-        temp1W32 = WEBRTC_SPL_LSHIFT_W32(temp1W32, norm);
-
-        Alpha_hi = (int16_t)(temp1W32 >> 16);
-        Alpha_low = (int16_t)((temp1W32 - ((int32_t)Alpha_hi << 16)) >> 1);
-
-        // Update the total normalization of Alpha
-        Alpha_exp = Alpha_exp + norm;
-
-        // Update A[]
-
-        for (j = 1; j <= i; j++)
-        {
-            A_hi[j] = A_upd_hi[j];
-            A_low[j] = A_upd_low[j];
-        }
-    }
-
-    /*
-     Set A[0] to 1.0 and store the A[i] i=1...order in Q12
-     (Convert from Q27 and use rounding)
-     */
-
-    A[0] = 4096;
-
-    for (i = 1; i <= order; i++)
-    {
-        // temp1W32 in Q27
-        temp1W32 = (int32_t)A_hi[i] * 65536
-                + WEBRTC_SPL_LSHIFT_W32((int32_t)A_low[i], 1);
-        // Round and store upper word
-        A[i] = (int16_t)(((temp1W32 * 2) + 32768) >> 16);
-    }
-    return 1; // Stable filters
-}
diff --git a/submodules/libtgvoip/webrtc_dsp/common_audio/signal_processing/lpc_to_refl_coef.c b/submodules/libtgvoip/webrtc_dsp/common_audio/signal_processing/lpc_to_refl_coef.c
deleted file mode 100644
index 7a5e25191b..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/common_audio/signal_processing/lpc_to_refl_coef.c
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- *  Copyright (c) 2011 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-
-/*
- * This file contains the function WebRtcSpl_LpcToReflCoef().
- * The description header can be found in signal_processing_library.h
- *
- */
-
-#include "common_audio/signal_processing/include/signal_processing_library.h"
-
-#define SPL_LPC_TO_REFL_COEF_MAX_AR_MODEL_ORDER 50
-
-void WebRtcSpl_LpcToReflCoef(int16_t* a16, int use_order, int16_t* k16)
-{
-    int m, k;
-    int32_t tmp32[SPL_LPC_TO_REFL_COEF_MAX_AR_MODEL_ORDER];
-    int32_t tmp_inv_denom32;
-    int16_t tmp_inv_denom16;
-
-    k16[use_order - 1] = a16[use_order] << 3;  // Q12<<3 => Q15
-    for (m = use_order - 1; m > 0; m--)
-    {
-        // (1 - k^2) in Q30
-        tmp_inv_denom32 = 1073741823 - k16[m] * k16[m];
-        // (1 - k^2) in Q15
-        tmp_inv_denom16 = (int16_t)(tmp_inv_denom32 >> 15);
-
-        for (k = 1; k <= m; k++)
-        {
-            // tmp[k] = (a[k] - RC[m] * a[m-k+1]) / (1.0 - RC[m]*RC[m]);
-
-            // [Q12<<16 - (Q15*Q12)<<1] = [Q28 - Q28] = Q28
-            tmp32[k] = (a16[k] << 16) - (k16[m] * a16[m - k + 1] << 1);
-
-            tmp32[k] = WebRtcSpl_DivW32W16(tmp32[k], tmp_inv_denom16); //Q28/Q15 = Q13
-        }
-
-        for (k = 1; k < m; k++)
-        {
-            a16[k] = (int16_t)(tmp32[k] >> 1);  // Q13>>1 => Q12
-        }
-
-        tmp32[m] = WEBRTC_SPL_SAT(8191, tmp32[m], -8191);
-        k16[m - 1] = (int16_t)WEBRTC_SPL_LSHIFT_W32(tmp32[m], 2); //Q13<<2 => Q15
-    }
-    return;
-}
diff --git a/submodules/libtgvoip/webrtc_dsp/common_audio/signal_processing/min_max_operations.c b/submodules/libtgvoip/webrtc_dsp/common_audio/signal_processing/min_max_operations.c
deleted file mode 100644
index d249a02d40..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/common_audio/signal_processing/min_max_operations.c
+++ /dev/null
@@ -1,224 +0,0 @@
-/*
- *  Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-/*
- * This file contains the implementation of functions
- * WebRtcSpl_MaxAbsValueW16C()
- * WebRtcSpl_MaxAbsValueW32C()
- * WebRtcSpl_MaxValueW16C()
- * WebRtcSpl_MaxValueW32C()
- * WebRtcSpl_MinValueW16C()
- * WebRtcSpl_MinValueW32C()
- * WebRtcSpl_MaxAbsIndexW16()
- * WebRtcSpl_MaxIndexW16()
- * WebRtcSpl_MaxIndexW32()
- * WebRtcSpl_MinIndexW16()
- * WebRtcSpl_MinIndexW32()
- *
- */
-
-#include <stdlib.h>
-
-#include "rtc_base/checks.h"
-#include "common_audio/signal_processing/include/signal_processing_library.h"
-
-// TODO(bjorn/kma): Consolidate function pairs (e.g. combine
-//   WebRtcSpl_MaxAbsValueW16C and WebRtcSpl_MaxAbsIndexW16 into a single one.)
-// TODO(kma): Move the next six functions into min_max_operations_c.c.
-
-// Maximum absolute value of word16 vector. C version for generic platforms.
-int16_t WebRtcSpl_MaxAbsValueW16C(const int16_t* vector, size_t length) {
-  size_t i = 0;
-  int absolute = 0, maximum = 0;
-
-  RTC_DCHECK_GT(length, 0);
-
-  for (i = 0; i < length; i++) {
-    absolute = abs((int)vector[i]);
-
-    if (absolute > maximum) {
-      maximum = absolute;
-    }
-  }
-
-  // Guard the case for abs(-32768).
-  if (maximum > WEBRTC_SPL_WORD16_MAX) {
-    maximum = WEBRTC_SPL_WORD16_MAX;
-  }
-
-  return (int16_t)maximum;
-}
-
-// Maximum absolute value of word32 vector. C version for generic platforms.
-int32_t WebRtcSpl_MaxAbsValueW32C(const int32_t* vector, size_t length) {
-  // Use uint32_t for the local variables, to accommodate the return value
-  // of abs(0x80000000), which is 0x80000000.
-
-  uint32_t absolute = 0, maximum = 0;
-  size_t i = 0;
-
-  RTC_DCHECK_GT(length, 0);
-
-  for (i = 0; i < length; i++) {
-    absolute = abs((int)vector[i]);
-    if (absolute > maximum) {
-      maximum = absolute;
-    }
-  }
-
-  maximum = WEBRTC_SPL_MIN(maximum, WEBRTC_SPL_WORD32_MAX);
-
-  return (int32_t)maximum;
-}
-
-// Maximum value of word16 vector. C version for generic platforms.
-int16_t WebRtcSpl_MaxValueW16C(const int16_t* vector, size_t length) {
-  int16_t maximum = WEBRTC_SPL_WORD16_MIN;
-  size_t i = 0;
-
-  RTC_DCHECK_GT(length, 0);
-
-  for (i = 0; i < length; i++) {
-    if (vector[i] > maximum)
-      maximum = vector[i];
-  }
-  return maximum;
-}
-
-// Maximum value of word32 vector. C version for generic platforms.
-int32_t WebRtcSpl_MaxValueW32C(const int32_t* vector, size_t length) {
-  int32_t maximum = WEBRTC_SPL_WORD32_MIN;
-  size_t i = 0;
-
-  RTC_DCHECK_GT(length, 0);
-
-  for (i = 0; i < length; i++) {
-    if (vector[i] > maximum)
-      maximum = vector[i];
-  }
-  return maximum;
-}
-
-// Minimum value of word16 vector. C version for generic platforms.
-int16_t WebRtcSpl_MinValueW16C(const int16_t* vector, size_t length) {
-  int16_t minimum = WEBRTC_SPL_WORD16_MAX;
-  size_t i = 0;
-
-  RTC_DCHECK_GT(length, 0);
-
-  for (i = 0; i < length; i++) {
-    if (vector[i] < minimum)
-      minimum = vector[i];
-  }
-  return minimum;
-}
-
-// Minimum value of word32 vector. C version for generic platforms.
-int32_t WebRtcSpl_MinValueW32C(const int32_t* vector, size_t length) {
-  int32_t minimum = WEBRTC_SPL_WORD32_MAX;
-  size_t i = 0;
-
-  RTC_DCHECK_GT(length, 0);
-
-  for (i = 0; i < length; i++) {
-    if (vector[i] < minimum)
-      minimum = vector[i];
-  }
-  return minimum;
-}
-
-// Index of maximum absolute value in a word16 vector.
-size_t WebRtcSpl_MaxAbsIndexW16(const int16_t* vector, size_t length) {
-  // Use type int for local variables, to accomodate the value of abs(-32768).
-
-  size_t i = 0, index = 0;
-  int absolute = 0, maximum = 0;
-
-  RTC_DCHECK_GT(length, 0);
-
-  for (i = 0; i < length; i++) {
-    absolute = abs((int)vector[i]);
-
-    if (absolute > maximum) {
-      maximum = absolute;
-      index = i;
-    }
-  }
-
-  return index;
-}
-
-// Index of maximum value in a word16 vector.
-size_t WebRtcSpl_MaxIndexW16(const int16_t* vector, size_t length) {
-  size_t i = 0, index = 0;
-  int16_t maximum = WEBRTC_SPL_WORD16_MIN;
-
-  RTC_DCHECK_GT(length, 0);
-
-  for (i = 0; i < length; i++) {
-    if (vector[i] > maximum) {
-      maximum = vector[i];
-      index = i;
-    }
-  }
-
-  return index;
-}
-
-// Index of maximum value in a word32 vector.
-size_t WebRtcSpl_MaxIndexW32(const int32_t* vector, size_t length) {
-  size_t i = 0, index = 0;
-  int32_t maximum = WEBRTC_SPL_WORD32_MIN;
-
-  RTC_DCHECK_GT(length, 0);
-
-  for (i = 0; i < length; i++) {
-    if (vector[i] > maximum) {
-      maximum = vector[i];
-      index = i;
-    }
-  }
-
-  return index;
-}
-
-// Index of minimum value in a word16 vector.
-size_t WebRtcSpl_MinIndexW16(const int16_t* vector, size_t length) {
-  size_t i = 0, index = 0;
-  int16_t minimum = WEBRTC_SPL_WORD16_MAX;
-
-  RTC_DCHECK_GT(length, 0);
-
-  for (i = 0; i < length; i++) {
-    if (vector[i] < minimum) {
-      minimum = vector[i];
-      index = i;
-    }
-  }
-
-  return index;
-}
-
-// Index of minimum value in a word32 vector.
-size_t WebRtcSpl_MinIndexW32(const int32_t* vector, size_t length) {
-  size_t i = 0, index = 0;
-  int32_t minimum = WEBRTC_SPL_WORD32_MAX;
-
-  RTC_DCHECK_GT(length, 0);
-
-  for (i = 0; i < length; i++) {
-    if (vector[i] < minimum) {
-      minimum = vector[i];
-      index = i;
-    }
-  }
-
-  return index;
-}
diff --git a/submodules/libtgvoip/webrtc_dsp/common_audio/signal_processing/min_max_operations_neon.c b/submodules/libtgvoip/webrtc_dsp/common_audio/signal_processing/min_max_operations_neon.c
deleted file mode 100644
index 399bac5495..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/common_audio/signal_processing/min_max_operations_neon.c
+++ /dev/null
@@ -1,285 +0,0 @@
-/*
- *  Copyright (c) 2014 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-#if defined(__arm__) || defined(_M_ARM) || defined(__aarch64__)
-
-#include <arm_neon.h>
-#include <stdlib.h>
-
-#include "rtc_base/checks.h"
-#include "common_audio/signal_processing/include/signal_processing_library.h"
-
-// Maximum absolute value of word16 vector. C version for generic platforms.
-int16_t WebRtcSpl_MaxAbsValueW16Neon(const int16_t* vector, size_t length) {
-  int absolute = 0, maximum = 0;
-
-  RTC_DCHECK_GT(length, 0);
-
-  const int16_t* p_start = vector;
-  size_t rest = length & 7;
-  const int16_t* p_end = vector + length - rest;
-
-  int16x8_t v;
-  uint16x8_t max_qv;
-  max_qv = vdupq_n_u16(0);
-
-  while (p_start < p_end) {
-    v = vld1q_s16(p_start);
-    // Note vabs doesn't change the value of -32768.
-    v = vabsq_s16(v);
-    // Use u16 so we don't lose the value -32768.
-    max_qv = vmaxq_u16(max_qv, vreinterpretq_u16_s16(v));
-    p_start += 8;
-  }
-
-#ifdef WEBRTC_ARCH_ARM64
-  maximum = (int)vmaxvq_u16(max_qv);
-#else
-  uint16x4_t max_dv;
-  max_dv = vmax_u16(vget_low_u16(max_qv), vget_high_u16(max_qv));
-  max_dv = vpmax_u16(max_dv, max_dv);
-  max_dv = vpmax_u16(max_dv, max_dv);
-
-  maximum = (int)vget_lane_u16(max_dv, 0);
-#endif
-
-  p_end = vector + length;
-  while (p_start < p_end) {
-    absolute = abs((int)(*p_start));
-
-    if (absolute > maximum) {
-      maximum = absolute;
-    }
-    p_start++;
-  }
-
-  // Guard the case for abs(-32768).
-  if (maximum > WEBRTC_SPL_WORD16_MAX) {
-    maximum = WEBRTC_SPL_WORD16_MAX;
-  }
-
-  return (int16_t)maximum;
-}
-
-// Maximum absolute value of word32 vector. NEON intrinsics version for
-// ARM 32-bit/64-bit platforms.
-int32_t WebRtcSpl_MaxAbsValueW32Neon(const int32_t* vector, size_t length) {
-  // Use uint32_t for the local variables, to accommodate the return value
-  // of abs(0x80000000), which is 0x80000000.
-
-  uint32_t absolute = 0, maximum = 0;
-  size_t i = 0;
-  size_t residual = length & 0x7;
-
-  RTC_DCHECK_GT(length, 0);
-
-  const int32_t* p_start = vector;
-  uint32x4_t max32x4_0 = vdupq_n_u32(0);
-  uint32x4_t max32x4_1 = vdupq_n_u32(0);
-
-  // First part, unroll the loop 8 times.
-  for (i = 0; i < length - residual; i += 8) {
-    int32x4_t in32x4_0 = vld1q_s32(p_start);
-    p_start += 4;
-    int32x4_t in32x4_1 = vld1q_s32(p_start);
-    p_start += 4;
-    in32x4_0 = vabsq_s32(in32x4_0);
-    in32x4_1 = vabsq_s32(in32x4_1);
-    // vabs doesn't change the value of 0x80000000.
-    // Use u32 so we don't lose the value 0x80000000.
-    max32x4_0 = vmaxq_u32(max32x4_0, vreinterpretq_u32_s32(in32x4_0));
-    max32x4_1 = vmaxq_u32(max32x4_1, vreinterpretq_u32_s32(in32x4_1));
-  }
-
-  uint32x4_t max32x4 = vmaxq_u32(max32x4_0, max32x4_1);
-#if defined(WEBRTC_ARCH_ARM64)
-  maximum = vmaxvq_u32(max32x4);
-#else
-  uint32x2_t max32x2 = vmax_u32(vget_low_u32(max32x4), vget_high_u32(max32x4));
-  max32x2 = vpmax_u32(max32x2, max32x2);
-
-  maximum = vget_lane_u32(max32x2, 0);
-#endif
-
-  // Second part, do the remaining iterations (if any).
-  for (i = residual; i > 0; i--) {
-    absolute = abs((int)(*p_start));
-    if (absolute > maximum) {
-      maximum = absolute;
-    }
-    p_start++;
-  }
-
-  // Guard against the case for 0x80000000.
-  maximum = WEBRTC_SPL_MIN(maximum, WEBRTC_SPL_WORD32_MAX);
-
-  return (int32_t)maximum;
-}
-
-// Maximum value of word16 vector. NEON intrinsics version for
-// ARM 32-bit/64-bit platforms.
-int16_t WebRtcSpl_MaxValueW16Neon(const int16_t* vector, size_t length) {
-  int16_t maximum = WEBRTC_SPL_WORD16_MIN;
-  size_t i = 0;
-  size_t residual = length & 0x7;
-
-  RTC_DCHECK_GT(length, 0);
-
-  const int16_t* p_start = vector;
-  int16x8_t max16x8 = vdupq_n_s16(WEBRTC_SPL_WORD16_MIN);
-
-  // First part, unroll the loop 8 times.
-  for (i = 0; i < length - residual; i += 8) {
-    int16x8_t in16x8 = vld1q_s16(p_start);
-    max16x8 = vmaxq_s16(max16x8, in16x8);
-    p_start += 8;
-  }
-
-#if defined(WEBRTC_ARCH_ARM64)
-  maximum = vmaxvq_s16(max16x8);
-#else
-  int16x4_t max16x4 = vmax_s16(vget_low_s16(max16x8), vget_high_s16(max16x8));
-  max16x4 = vpmax_s16(max16x4, max16x4);
-  max16x4 = vpmax_s16(max16x4, max16x4);
-
-  maximum = vget_lane_s16(max16x4, 0);
-#endif
-
-  // Second part, do the remaining iterations (if any).
-  for (i = residual; i > 0; i--) {
-    if (*p_start > maximum)
-      maximum = *p_start;
-    p_start++;
-  }
-  return maximum;
-}
-
-// Maximum value of word32 vector. NEON intrinsics version for
-// ARM 32-bit/64-bit platforms.
-int32_t WebRtcSpl_MaxValueW32Neon(const int32_t* vector, size_t length) {
-  int32_t maximum = WEBRTC_SPL_WORD32_MIN;
-  size_t i = 0;
-  size_t residual = length & 0x7;
-
-  RTC_DCHECK_GT(length, 0);
-
-  const int32_t* p_start = vector;
-  int32x4_t max32x4_0 = vdupq_n_s32(WEBRTC_SPL_WORD32_MIN);
-  int32x4_t max32x4_1 = vdupq_n_s32(WEBRTC_SPL_WORD32_MIN);
-
-  // First part, unroll the loop 8 times.
-  for (i = 0; i < length - residual; i += 8) {
-    int32x4_t in32x4_0 = vld1q_s32(p_start);
-    p_start += 4;
-    int32x4_t in32x4_1 = vld1q_s32(p_start);
-    p_start += 4;
-    max32x4_0 = vmaxq_s32(max32x4_0, in32x4_0);
-    max32x4_1 = vmaxq_s32(max32x4_1, in32x4_1);
-  }
-
-  int32x4_t max32x4 = vmaxq_s32(max32x4_0, max32x4_1);
-#if defined(WEBRTC_ARCH_ARM64)
-  maximum = vmaxvq_s32(max32x4);
-#else
-  int32x2_t max32x2 = vmax_s32(vget_low_s32(max32x4), vget_high_s32(max32x4));
-  max32x2 = vpmax_s32(max32x2, max32x2);
-
-  maximum = vget_lane_s32(max32x2, 0);
-#endif
-
-  // Second part, do the remaining iterations (if any).
-  for (i = residual; i > 0; i--) {
-    if (*p_start > maximum)
-      maximum = *p_start;
-    p_start++;
-  }
-  return maximum;
-}
-
-// Minimum value of word16 vector. NEON intrinsics version for
-// ARM 32-bit/64-bit platforms.
-int16_t WebRtcSpl_MinValueW16Neon(const int16_t* vector, size_t length) {
-  int16_t minimum = WEBRTC_SPL_WORD16_MAX;
-  size_t i = 0;
-  size_t residual = length & 0x7;
-
-  RTC_DCHECK_GT(length, 0);
-
-  const int16_t* p_start = vector;
-  int16x8_t min16x8 = vdupq_n_s16(WEBRTC_SPL_WORD16_MAX);
-
-  // First part, unroll the loop 8 times.
-  for (i = 0; i < length - residual; i += 8) {
-    int16x8_t in16x8 = vld1q_s16(p_start);
-    min16x8 = vminq_s16(min16x8, in16x8);
-    p_start += 8;
-  }
-
-#if defined(WEBRTC_ARCH_ARM64)
-  minimum = vminvq_s16(min16x8);
-#else
-  int16x4_t min16x4 = vmin_s16(vget_low_s16(min16x8), vget_high_s16(min16x8));
-  min16x4 = vpmin_s16(min16x4, min16x4);
-  min16x4 = vpmin_s16(min16x4, min16x4);
-
-  minimum = vget_lane_s16(min16x4, 0);
-#endif
-
-  // Second part, do the remaining iterations (if any).
-  for (i = residual; i > 0; i--) {
-    if (*p_start < minimum)
-      minimum = *p_start;
-    p_start++;
-  }
-  return minimum;
-}
-
-// Minimum value of word32 vector. NEON intrinsics version for
-// ARM 32-bit/64-bit platforms.
-int32_t WebRtcSpl_MinValueW32Neon(const int32_t* vector, size_t length) {
-  int32_t minimum = WEBRTC_SPL_WORD32_MAX;
-  size_t i = 0;
-  size_t residual = length & 0x7;
-
-  RTC_DCHECK_GT(length, 0);
-
-  const int32_t* p_start = vector;
-  int32x4_t min32x4_0 = vdupq_n_s32(WEBRTC_SPL_WORD32_MAX);
-  int32x4_t min32x4_1 = vdupq_n_s32(WEBRTC_SPL_WORD32_MAX);
-
-  // First part, unroll the loop 8 times.
-  for (i = 0; i < length - residual; i += 8) {
-    int32x4_t in32x4_0 = vld1q_s32(p_start);
-    p_start += 4;
-    int32x4_t in32x4_1 = vld1q_s32(p_start);
-    p_start += 4;
-    min32x4_0 = vminq_s32(min32x4_0, in32x4_0);
-    min32x4_1 = vminq_s32(min32x4_1, in32x4_1);
-  }
-
-  int32x4_t min32x4 = vminq_s32(min32x4_0, min32x4_1);
-#if defined(WEBRTC_ARCH_ARM64)
-  minimum = vminvq_s32(min32x4);
-#else
-  int32x2_t min32x2 = vmin_s32(vget_low_s32(min32x4), vget_high_s32(min32x4));
-  min32x2 = vpmin_s32(min32x2, min32x2);
-
-  minimum = vget_lane_s32(min32x2, 0);
-#endif
-
-  // Second part, do the remaining iterations (if any).
-  for (i = residual; i > 0; i--) {
-    if (*p_start < minimum)
-      minimum = *p_start;
-    p_start++;
-  }
-  return minimum;
-}
-
-#endif
diff --git a/submodules/libtgvoip/webrtc_dsp/common_audio/signal_processing/randomization_functions.c b/submodules/libtgvoip/webrtc_dsp/common_audio/signal_processing/randomization_functions.c
deleted file mode 100644
index a445c572c7..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/common_audio/signal_processing/randomization_functions.c
+++ /dev/null
@@ -1,115 +0,0 @@
-/*
- *  Copyright (c) 2011 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-
-/*
- * This file contains implementations of the randomization functions
- * WebRtcSpl_RandU()
- * WebRtcSpl_RandN()
- * WebRtcSpl_RandUArray()
- *
- * The description header can be found in signal_processing_library.h
- *
- */
-
-#include "common_audio/signal_processing/include/signal_processing_library.h"
-
-static const uint32_t kMaxSeedUsed = 0x80000000;
-
-static const int16_t kRandNTable[] = {
-    9178,    -7260,       40,    10189,     4894,    -3531,   -13779,    14764,
-   -4008,    -8884,    -8990,     1008,     7368,     5184,     3251,    -5817,
-   -9786,     5963,     1770,     8066,    -7135,    10772,    -2298,     1361,
-    6484,     2241,    -8633,      792,      199,    -3344,     6553,   -10079,
-  -15040,       95,    11608,   -12469,    14161,    -4176,     2476,     6403,
-   13685,   -16005,     6646,     2239,    10916,    -3004,     -602,    -3141,
-    2142,    14144,    -5829,     5305,     8209,     4713,     2697,    -5112,
-   16092,    -1210,    -2891,    -6631,    -5360,   -11878,    -6781,    -2739,
-   -6392,      536,    10923,    10872,     5059,    -4748,    -7770,     5477,
-      38,    -1025,    -2892,     1638,     6304,    14375,   -11028,     1553,
-   -1565,    10762,     -393,     4040,     5257,    12310,     6554,    -4799,
-    4899,    -6354,     1603,    -1048,    -2220,     8247,     -186,    -8944,
-  -12004,     2332,     4801,    -4933,     6371,      131,     8614,    -5927,
-   -8287,   -22760,     4033,   -15162,     3385,     3246,     3153,    -5250,
-    3766,      784,     6494,      -62,     3531,    -1582,    15572,      662,
-   -3952,     -330,    -3196,      669,     7236,    -2678,    -6569,    23319,
-   -8645,     -741,    14830,   -15976,     4903,      315,   -11342,    10311,
-    1858,    -7777,     2145,     5436,     5677,     -113,   -10033,      826,
-   -1353,    17210,     7768,      986,    -1471,     8291,    -4982,     8207,
-  -14911,    -6255,    -2449,   -11881,    -7059,   -11703,    -4338,     8025,
-    7538,    -2823,   -12490,     9470,    -1613,    -2529,   -10092,    -7807,
-    9480,     6970,   -12844,     5123,     3532,     4816,     4803,    -8455,
-   -5045,    14032,    -4378,    -1643,     5756,   -11041,    -2732,   -16618,
-   -6430,   -18375,    -3320,     6098,     5131,    -4269,    -8840,     2482,
-   -7048,     1547,   -21890,    -6505,    -7414,     -424,   -11722,     7955,
-    1653,   -17299,     1823,      473,    -9232,     3337,     1111,      873,
-    4018,    -8982,     9889,     3531,   -11763,    -3799,     7373,    -4539,
-    3231,     7054,    -8537,     7616,     6244,    16635,      447,    -2915,
-   13967,      705,    -2669,    -1520,    -1771,   -16188,     5956,     5117,
-    6371,    -9936,    -1448,     2480,     5128,     7550,    -8130,     5236,
-    8213,    -6443,     7707,    -1950,   -13811,     7218,     7031,    -3883,
-      67,     5731,    -2874,    13480,    -3743,     9298,    -3280,     3552,
-   -4425,      -18,    -3785,    -9988,    -5357,     5477,   -11794,     2117,
-    1416,    -9935,     3376,      802,    -5079,    -8243,    12652,       66,
-    3653,    -2368,     6781,   -21895,    -7227,     2487,     7839,     -385,
-    6646,    -7016,    -4658,     5531,    -1705,      834,      129,     3694,
-   -1343,     2238,   -22640,    -6417,   -11139,    11301,    -2945,    -3494,
-   -5626,      185,    -3615,    -2041,    -7972,    -3106,      -60,   -23497,
-   -1566,    17064,     3519,     2518,      304,    -6805,   -10269,     2105,
-    1936,     -426,     -736,    -8122,    -1467,     4238,    -6939,   -13309,
-     360,     7402,    -7970,    12576,     3287,    12194,    -6289,   -16006,
-    9171,     4042,    -9193,     9123,    -2512,     6388,    -4734,    -8739,
-    1028,    -5406,    -1696,     5889,     -666,    -4736,     4971,     3565,
-    9362,    -6292,     3876,    -3652,   -19666,     7523,    -4061,      391,
-  -11773,     7502,    -3763,     4929,    -9478,    13278,     2805,     4496,
-    7814,    16419,    12455,   -14773,     2127,    -2746,     3763,     4847,
-    3698,     6978,     4751,    -6957,    -3581,      -45,     6252,     1513,
-   -4797,    -7925,    11270,    16188,    -2359,    -5269,     9376,   -10777,
-    7262,    20031,    -6515,    -2208,    -5353,     8085,    -1341,    -1303,
-    7333,     5576,     3625,     5763,    -7931,     9833,    -3371,   -10305,
-    6534,   -13539,    -9971,      997,     8464,    -4064,    -1495,     1857,
-   13624,     5458,     9490,   -11086,    -4524,    12022,     -550,     -198,
-     408,    -8455,    -7068,    10289,     9712,    -3366,     9028,    -7621,
-   -5243,     2362,     6909,     4672,    -4933,    -1799,     4709,    -4563,
-     -62,     -566,     1624,    -7010,    14730,   -17791,    -3697,    -2344,
-   -1741,     7099,    -9509,    -6855,    -1989,     3495,    -2289,     2031,
-   12784,      891,    14189,    -3963,    -5683,      421,   -12575,     1724,
-  -12682,    -5970,    -8169,     3143,    -1824,    -5488,    -5130,     8536,
-   12799,      794,     5738,     3459,   -11689,     -258,    -3738,    -3775,
-   -8742,     2333,     8312,    -9383,    10331,    13119,     8398,    10644,
-  -19433,    -6446,   -16277,   -11793,    16284,     9345,    15222,    15834,
-    2009,    -7349,      130,   -14547,      338,    -5998,     3337,    21492,
-    2406,     7703,     -951,    11196,     -564,     3406,     2217,     4806,
-    2374,    -5797,    11839,     8940,   -11874,    18213,     2855,    10492
-};
-
-static uint32_t IncreaseSeed(uint32_t* seed) {
-  seed[0] = (seed[0] * ((int32_t)69069) + 1) & (kMaxSeedUsed - 1);
-  return seed[0];
-}
-
-int16_t WebRtcSpl_RandU(uint32_t* seed) {
-  return (int16_t)(IncreaseSeed(seed) >> 16);
-}
-
-int16_t WebRtcSpl_RandN(uint32_t* seed) {
-  return kRandNTable[IncreaseSeed(seed) >> 23];
-}
-
-// Creates an array of uniformly distributed variables.
-int16_t WebRtcSpl_RandUArray(int16_t* vector,
-                             int16_t vector_length,
-                             uint32_t* seed) {
-  int i;
-  for (i = 0; i < vector_length; i++) {
-    vector[i] = WebRtcSpl_RandU(seed);
-  }
-  return vector_length;
-}
diff --git a/submodules/libtgvoip/webrtc_dsp/common_audio/signal_processing/real_fft.c b/submodules/libtgvoip/webrtc_dsp/common_audio/signal_processing/real_fft.c
deleted file mode 100644
index 780e517a15..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/common_audio/signal_processing/real_fft.c
+++ /dev/null
@@ -1,102 +0,0 @@
-/*
- *  Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#include "common_audio/signal_processing/include/real_fft.h"
-
-#include <stdlib.h>
-
-#include "common_audio/signal_processing/include/signal_processing_library.h"
-
-struct RealFFT {
-  int order;
-};
-
-struct RealFFT* WebRtcSpl_CreateRealFFT(int order) {
-  struct RealFFT* self = NULL;
-
-  if (order > kMaxFFTOrder || order < 0) {
-    return NULL;
-  }
-
-  self = malloc(sizeof(struct RealFFT));
-  if (self == NULL) {
-    return NULL;
-  }
-  self->order = order;
-
-  return self;
-}
-
-void WebRtcSpl_FreeRealFFT(struct RealFFT* self) {
-  if (self != NULL) {
-    free(self);
-  }
-}
-
-// The C version FFT functions (i.e. WebRtcSpl_RealForwardFFT and
-// WebRtcSpl_RealInverseFFT) are real-valued FFT wrappers for complex-valued
-// FFT implementation in SPL.
-
-int WebRtcSpl_RealForwardFFT(struct RealFFT* self,
-                             const int16_t* real_data_in,
-                             int16_t* complex_data_out) {
-  int i = 0;
-  int j = 0;
-  int result = 0;
-  int n = 1 << self->order;
-  // The complex-value FFT implementation needs a buffer to hold 2^order
-  // 16-bit COMPLEX numbers, for both time and frequency data.
-  int16_t complex_buffer[2 << kMaxFFTOrder];
-
-  // Insert zeros to the imaginary parts for complex forward FFT input.
-  for (i = 0, j = 0; i < n; i += 1, j += 2) {
-    complex_buffer[j] = real_data_in[i];
-    complex_buffer[j + 1] = 0;
-  };
-
-  WebRtcSpl_ComplexBitReverse(complex_buffer, self->order);
-  result = WebRtcSpl_ComplexFFT(complex_buffer, self->order, 1);
-
-  // For real FFT output, use only the first N + 2 elements from
-  // complex forward FFT.
-  memcpy(complex_data_out, complex_buffer, sizeof(int16_t) * (n + 2));
-
-  return result;
-}
-
-int WebRtcSpl_RealInverseFFT(struct RealFFT* self,
-                             const int16_t* complex_data_in,
-                             int16_t* real_data_out) {
-  int i = 0;
-  int j = 0;
-  int result = 0;
-  int n = 1 << self->order;
-  // Create the buffer specific to complex-valued FFT implementation.
-  int16_t complex_buffer[2 << kMaxFFTOrder];
-
-  // For n-point FFT, first copy the first n + 2 elements into complex
-  // FFT, then construct the remaining n - 2 elements by real FFT's
-  // conjugate-symmetric properties.
-  memcpy(complex_buffer, complex_data_in, sizeof(int16_t) * (n + 2));
-  for (i = n + 2; i < 2 * n; i += 2) {
-    complex_buffer[i] = complex_data_in[2 * n - i];
-    complex_buffer[i + 1] = -complex_data_in[2 * n - i + 1];
-  }
-
-  WebRtcSpl_ComplexBitReverse(complex_buffer, self->order);
-  result = WebRtcSpl_ComplexIFFT(complex_buffer, self->order, 1);
-
-  // Strip out the imaginary parts of the complex inverse FFT output.
-  for (i = 0, j = 0; i < n; i += 1, j += 2) {
-    real_data_out[i] = complex_buffer[j];
-  }
-
-  return result;
-}
diff --git a/submodules/libtgvoip/webrtc_dsp/common_audio/signal_processing/refl_coef_to_lpc.c b/submodules/libtgvoip/webrtc_dsp/common_audio/signal_processing/refl_coef_to_lpc.c
deleted file mode 100644
index b0858b2b0e..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/common_audio/signal_processing/refl_coef_to_lpc.c
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- *  Copyright (c) 2011 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-
-/*
- * This file contains the function WebRtcSpl_ReflCoefToLpc().
- * The description header can be found in signal_processing_library.h
- *
- */
-
-#include "common_audio/signal_processing/include/signal_processing_library.h"
-
-void WebRtcSpl_ReflCoefToLpc(const int16_t *k, int use_order, int16_t *a)
-{
-    int16_t any[WEBRTC_SPL_MAX_LPC_ORDER + 1];
-    int16_t *aptr, *aptr2, *anyptr;
-    const int16_t *kptr;
-    int m, i;
-
-    kptr = k;
-    *a = 4096; // i.e., (Word16_MAX >> 3)+1.
-    *any = *a;
-    a[1] = *k >> 3;
-
-    for (m = 1; m < use_order; m++)
-    {
-        kptr++;
-        aptr = a;
-        aptr++;
-        aptr2 = &a[m];
-        anyptr = any;
-        anyptr++;
-
-        any[m + 1] = *kptr >> 3;
-        for (i = 0; i < m; i++)
-        {
-            *anyptr = *aptr + (int16_t)((*aptr2 * *kptr) >> 15);
-            anyptr++;
-            aptr++;
-            aptr2--;
-        }
-
-        aptr = a;
-        anyptr = any;
-        for (i = 0; i < (m + 2); i++)
-        {
-            *aptr = *anyptr;
-            aptr++;
-            anyptr++;
-        }
-    }
-}
diff --git a/submodules/libtgvoip/webrtc_dsp/common_audio/signal_processing/resample.c b/submodules/libtgvoip/webrtc_dsp/common_audio/signal_processing/resample.c
deleted file mode 100644
index d4b2736476..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/common_audio/signal_processing/resample.c
+++ /dev/null
@@ -1,505 +0,0 @@
-/*
- *  Copyright (c) 2011 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-
-/*
- * This file contains the resampling functions for 22 kHz.
- * The description header can be found in signal_processing_library.h
- *
- */
-
-#include "common_audio/signal_processing/include/signal_processing_library.h"
-#include "common_audio/signal_processing/resample_by_2_internal.h"
-
-// Declaration of internally used functions
-static void WebRtcSpl_32khzTo22khzIntToShort(const int32_t *In, int16_t *Out,
-                                             int32_t K);
-
-void WebRtcSpl_32khzTo22khzIntToInt(const int32_t *In, int32_t *Out,
-                                    int32_t K);
-
-// interpolation coefficients
-static const int16_t kCoefficients32To22[5][9] = {
-        {127, -712,  2359, -6333, 23456, 16775, -3695,  945, -154},
-        {-39,  230,  -830,  2785, 32366, -2324,   760, -218,   38},
-        {117, -663,  2222, -6133, 26634, 13070, -3174,  831, -137},
-        {-77,  457, -1677,  5958, 31175, -4136,  1405, -408,   71},
-        { 98, -560,  1900, -5406, 29240,  9423, -2480,  663, -110}
-};
-
-//////////////////////
-// 22 kHz -> 16 kHz //
-//////////////////////
-
-// number of subblocks; options: 1, 2, 4, 5, 10
-#define SUB_BLOCKS_22_16    5
-
-// 22 -> 16 resampler
-void WebRtcSpl_Resample22khzTo16khz(const int16_t* in, int16_t* out,
-                                    WebRtcSpl_State22khzTo16khz* state, int32_t* tmpmem)
-{
-    int k;
-
-    // process two blocks of 10/SUB_BLOCKS_22_16 ms (to reduce temp buffer size)
-    for (k = 0; k < SUB_BLOCKS_22_16; k++)
-    {
-        ///// 22 --> 44 /////
-        // int16_t  in[220/SUB_BLOCKS_22_16]
-        // int32_t out[440/SUB_BLOCKS_22_16]
-        /////
-        WebRtcSpl_UpBy2ShortToInt(in, 220 / SUB_BLOCKS_22_16, tmpmem + 16, state->S_22_44);
-
-        ///// 44 --> 32 /////
-        // int32_t  in[440/SUB_BLOCKS_22_16]
-        // int32_t out[320/SUB_BLOCKS_22_16]
-        /////
-        // copy state to and from input array
-        tmpmem[8] = state->S_44_32[0];
-        tmpmem[9] = state->S_44_32[1];
-        tmpmem[10] = state->S_44_32[2];
-        tmpmem[11] = state->S_44_32[3];
-        tmpmem[12] = state->S_44_32[4];
-        tmpmem[13] = state->S_44_32[5];
-        tmpmem[14] = state->S_44_32[6];
-        tmpmem[15] = state->S_44_32[7];
-        state->S_44_32[0] = tmpmem[440 / SUB_BLOCKS_22_16 + 8];
-        state->S_44_32[1] = tmpmem[440 / SUB_BLOCKS_22_16 + 9];
-        state->S_44_32[2] = tmpmem[440 / SUB_BLOCKS_22_16 + 10];
-        state->S_44_32[3] = tmpmem[440 / SUB_BLOCKS_22_16 + 11];
-        state->S_44_32[4] = tmpmem[440 / SUB_BLOCKS_22_16 + 12];
-        state->S_44_32[5] = tmpmem[440 / SUB_BLOCKS_22_16 + 13];
-        state->S_44_32[6] = tmpmem[440 / SUB_BLOCKS_22_16 + 14];
-        state->S_44_32[7] = tmpmem[440 / SUB_BLOCKS_22_16 + 15];
-
-        WebRtcSpl_Resample44khzTo32khz(tmpmem + 8, tmpmem, 40 / SUB_BLOCKS_22_16);
-
-        ///// 32 --> 16 /////
-        // int32_t  in[320/SUB_BLOCKS_22_16]
-        // int32_t out[160/SUB_BLOCKS_22_16]
-        /////
-        WebRtcSpl_DownBy2IntToShort(tmpmem, 320 / SUB_BLOCKS_22_16, out, state->S_32_16);
-
-        // move input/output pointers 10/SUB_BLOCKS_22_16 ms seconds ahead
-        in += 220 / SUB_BLOCKS_22_16;
-        out += 160 / SUB_BLOCKS_22_16;
-    }
-}
-
-// initialize state of 22 -> 16 resampler
-void WebRtcSpl_ResetResample22khzTo16khz(WebRtcSpl_State22khzTo16khz* state)
-{
-    int k;
-    for (k = 0; k < 8; k++)
-    {
-        state->S_22_44[k] = 0;
-        state->S_44_32[k] = 0;
-        state->S_32_16[k] = 0;
-    }
-}
-
-//////////////////////
-// 16 kHz -> 22 kHz //
-//////////////////////
-
-// number of subblocks; options: 1, 2, 4, 5, 10
-#define SUB_BLOCKS_16_22    4
-
-// 16 -> 22 resampler
-void WebRtcSpl_Resample16khzTo22khz(const int16_t* in, int16_t* out,
-                                    WebRtcSpl_State16khzTo22khz* state, int32_t* tmpmem)
-{
-    int k;
-
-    // process two blocks of 10/SUB_BLOCKS_16_22 ms (to reduce temp buffer size)
-    for (k = 0; k < SUB_BLOCKS_16_22; k++)
-    {
-        ///// 16 --> 32 /////
-        // int16_t  in[160/SUB_BLOCKS_16_22]
-        // int32_t out[320/SUB_BLOCKS_16_22]
-        /////
-        WebRtcSpl_UpBy2ShortToInt(in, 160 / SUB_BLOCKS_16_22, tmpmem + 8, state->S_16_32);
-
-        ///// 32 --> 22 /////
-        // int32_t  in[320/SUB_BLOCKS_16_22]
-        // int32_t out[220/SUB_BLOCKS_16_22]
-        /////
-        // copy state to and from input array
-        tmpmem[0] = state->S_32_22[0];
-        tmpmem[1] = state->S_32_22[1];
-        tmpmem[2] = state->S_32_22[2];
-        tmpmem[3] = state->S_32_22[3];
-        tmpmem[4] = state->S_32_22[4];
-        tmpmem[5] = state->S_32_22[5];
-        tmpmem[6] = state->S_32_22[6];
-        tmpmem[7] = state->S_32_22[7];
-        state->S_32_22[0] = tmpmem[320 / SUB_BLOCKS_16_22];
-        state->S_32_22[1] = tmpmem[320 / SUB_BLOCKS_16_22 + 1];
-        state->S_32_22[2] = tmpmem[320 / SUB_BLOCKS_16_22 + 2];
-        state->S_32_22[3] = tmpmem[320 / SUB_BLOCKS_16_22 + 3];
-        state->S_32_22[4] = tmpmem[320 / SUB_BLOCKS_16_22 + 4];
-        state->S_32_22[5] = tmpmem[320 / SUB_BLOCKS_16_22 + 5];
-        state->S_32_22[6] = tmpmem[320 / SUB_BLOCKS_16_22 + 6];
-        state->S_32_22[7] = tmpmem[320 / SUB_BLOCKS_16_22 + 7];
-
-        WebRtcSpl_32khzTo22khzIntToShort(tmpmem, out, 20 / SUB_BLOCKS_16_22);
-
-        // move input/output pointers 10/SUB_BLOCKS_16_22 ms seconds ahead
-        in += 160 / SUB_BLOCKS_16_22;
-        out += 220 / SUB_BLOCKS_16_22;
-    }
-}
-
-// initialize state of 16 -> 22 resampler
-void WebRtcSpl_ResetResample16khzTo22khz(WebRtcSpl_State16khzTo22khz* state)
-{
-    int k;
-    for (k = 0; k < 8; k++)
-    {
-        state->S_16_32[k] = 0;
-        state->S_32_22[k] = 0;
-    }
-}
-
-//////////////////////
-// 22 kHz ->  8 kHz //
-//////////////////////
-
-// number of subblocks; options: 1, 2, 5, 10
-#define SUB_BLOCKS_22_8     2
-
-// 22 -> 8 resampler
-void WebRtcSpl_Resample22khzTo8khz(const int16_t* in, int16_t* out,
-                                   WebRtcSpl_State22khzTo8khz* state, int32_t* tmpmem)
-{
-    int k;
-
-    // process two blocks of 10/SUB_BLOCKS_22_8 ms (to reduce temp buffer size)
-    for (k = 0; k < SUB_BLOCKS_22_8; k++)
-    {
-        ///// 22 --> 22 lowpass /////
-        // int16_t  in[220/SUB_BLOCKS_22_8]
-        // int32_t out[220/SUB_BLOCKS_22_8]
-        /////
-        WebRtcSpl_LPBy2ShortToInt(in, 220 / SUB_BLOCKS_22_8, tmpmem + 16, state->S_22_22);
-
-        ///// 22 --> 16 /////
-        // int32_t  in[220/SUB_BLOCKS_22_8]
-        // int32_t out[160/SUB_BLOCKS_22_8]
-        /////
-        // copy state to and from input array
-        tmpmem[8] = state->S_22_16[0];
-        tmpmem[9] = state->S_22_16[1];
-        tmpmem[10] = state->S_22_16[2];
-        tmpmem[11] = state->S_22_16[3];
-        tmpmem[12] = state->S_22_16[4];
-        tmpmem[13] = state->S_22_16[5];
-        tmpmem[14] = state->S_22_16[6];
-        tmpmem[15] = state->S_22_16[7];
-        state->S_22_16[0] = tmpmem[220 / SUB_BLOCKS_22_8 + 8];
-        state->S_22_16[1] = tmpmem[220 / SUB_BLOCKS_22_8 + 9];
-        state->S_22_16[2] = tmpmem[220 / SUB_BLOCKS_22_8 + 10];
-        state->S_22_16[3] = tmpmem[220 / SUB_BLOCKS_22_8 + 11];
-        state->S_22_16[4] = tmpmem[220 / SUB_BLOCKS_22_8 + 12];
-        state->S_22_16[5] = tmpmem[220 / SUB_BLOCKS_22_8 + 13];
-        state->S_22_16[6] = tmpmem[220 / SUB_BLOCKS_22_8 + 14];
-        state->S_22_16[7] = tmpmem[220 / SUB_BLOCKS_22_8 + 15];
-
-        WebRtcSpl_Resample44khzTo32khz(tmpmem + 8, tmpmem, 20 / SUB_BLOCKS_22_8);
-
-        ///// 16 --> 8 /////
-        // int32_t in[160/SUB_BLOCKS_22_8]
-        // int32_t out[80/SUB_BLOCKS_22_8]
-        /////
-        WebRtcSpl_DownBy2IntToShort(tmpmem, 160 / SUB_BLOCKS_22_8, out, state->S_16_8);
-
-        // move input/output pointers 10/SUB_BLOCKS_22_8 ms seconds ahead
-        in += 220 / SUB_BLOCKS_22_8;
-        out += 80 / SUB_BLOCKS_22_8;
-    }
-}
-
-// initialize state of 22 -> 8 resampler
-void WebRtcSpl_ResetResample22khzTo8khz(WebRtcSpl_State22khzTo8khz* state)
-{
-    int k;
-    for (k = 0; k < 8; k++)
-    {
-        state->S_22_22[k] = 0;
-        state->S_22_22[k + 8] = 0;
-        state->S_22_16[k] = 0;
-        state->S_16_8[k] = 0;
-    }
-}
-
-//////////////////////
-//  8 kHz -> 22 kHz //
-//////////////////////
-
-// number of subblocks; options: 1, 2, 5, 10
-#define SUB_BLOCKS_8_22     2
-
-// 8 -> 22 resampler
-void WebRtcSpl_Resample8khzTo22khz(const int16_t* in, int16_t* out,
-                                   WebRtcSpl_State8khzTo22khz* state, int32_t* tmpmem)
-{
-    int k;
-
-    // process two blocks of 10/SUB_BLOCKS_8_22 ms (to reduce temp buffer size)
-    for (k = 0; k < SUB_BLOCKS_8_22; k++)
-    {
-        ///// 8 --> 16 /////
-        // int16_t  in[80/SUB_BLOCKS_8_22]
-        // int32_t out[160/SUB_BLOCKS_8_22]
-        /////
-        WebRtcSpl_UpBy2ShortToInt(in, 80 / SUB_BLOCKS_8_22, tmpmem + 18, state->S_8_16);
-
-        ///// 16 --> 11 /////
-        // int32_t  in[160/SUB_BLOCKS_8_22]
-        // int32_t out[110/SUB_BLOCKS_8_22]
-        /////
-        // copy state to and from input array
-        tmpmem[10] = state->S_16_11[0];
-        tmpmem[11] = state->S_16_11[1];
-        tmpmem[12] = state->S_16_11[2];
-        tmpmem[13] = state->S_16_11[3];
-        tmpmem[14] = state->S_16_11[4];
-        tmpmem[15] = state->S_16_11[5];
-        tmpmem[16] = state->S_16_11[6];
-        tmpmem[17] = state->S_16_11[7];
-        state->S_16_11[0] = tmpmem[160 / SUB_BLOCKS_8_22 + 10];
-        state->S_16_11[1] = tmpmem[160 / SUB_BLOCKS_8_22 + 11];
-        state->S_16_11[2] = tmpmem[160 / SUB_BLOCKS_8_22 + 12];
-        state->S_16_11[3] = tmpmem[160 / SUB_BLOCKS_8_22 + 13];
-        state->S_16_11[4] = tmpmem[160 / SUB_BLOCKS_8_22 + 14];
-        state->S_16_11[5] = tmpmem[160 / SUB_BLOCKS_8_22 + 15];
-        state->S_16_11[6] = tmpmem[160 / SUB_BLOCKS_8_22 + 16];
-        state->S_16_11[7] = tmpmem[160 / SUB_BLOCKS_8_22 + 17];
-
-        WebRtcSpl_32khzTo22khzIntToInt(tmpmem + 10, tmpmem, 10 / SUB_BLOCKS_8_22);
-
-        ///// 11 --> 22 /////
-        // int32_t  in[110/SUB_BLOCKS_8_22]
-        // int16_t out[220/SUB_BLOCKS_8_22]
-        /////
-        WebRtcSpl_UpBy2IntToShort(tmpmem, 110 / SUB_BLOCKS_8_22, out, state->S_11_22);
-
-        // move input/output pointers 10/SUB_BLOCKS_8_22 ms seconds ahead
-        in += 80 / SUB_BLOCKS_8_22;
-        out += 220 / SUB_BLOCKS_8_22;
-    }
-}
-
-// initialize state of 8 -> 22 resampler
-void WebRtcSpl_ResetResample8khzTo22khz(WebRtcSpl_State8khzTo22khz* state)
-{
-    int k;
-    for (k = 0; k < 8; k++)
-    {
-        state->S_8_16[k] = 0;
-        state->S_16_11[k] = 0;
-        state->S_11_22[k] = 0;
-    }
-}
-
-// compute two inner-products and store them to output array
-static void WebRtcSpl_DotProdIntToInt(const int32_t* in1, const int32_t* in2,
-                                      const int16_t* coef_ptr, int32_t* out1,
-                                      int32_t* out2)
-{
-    int32_t tmp1 = 16384;
-    int32_t tmp2 = 16384;
-    int16_t coef;
-
-    coef = coef_ptr[0];
-    tmp1 += coef * in1[0];
-    tmp2 += coef * in2[-0];
-
-    coef = coef_ptr[1];
-    tmp1 += coef * in1[1];
-    tmp2 += coef * in2[-1];
-
-    coef = coef_ptr[2];
-    tmp1 += coef * in1[2];
-    tmp2 += coef * in2[-2];
-
-    coef = coef_ptr[3];
-    tmp1 += coef * in1[3];
-    tmp2 += coef * in2[-3];
-
-    coef = coef_ptr[4];
-    tmp1 += coef * in1[4];
-    tmp2 += coef * in2[-4];
-
-    coef = coef_ptr[5];
-    tmp1 += coef * in1[5];
-    tmp2 += coef * in2[-5];
-
-    coef = coef_ptr[6];
-    tmp1 += coef * in1[6];
-    tmp2 += coef * in2[-6];
-
-    coef = coef_ptr[7];
-    tmp1 += coef * in1[7];
-    tmp2 += coef * in2[-7];
-
-    coef = coef_ptr[8];
-    *out1 = tmp1 + coef * in1[8];
-    *out2 = tmp2 + coef * in2[-8];
-}
-
-// compute two inner-products and store them to output array
-static void WebRtcSpl_DotProdIntToShort(const int32_t* in1, const int32_t* in2,
-                                        const int16_t* coef_ptr, int16_t* out1,
-                                        int16_t* out2)
-{
-    int32_t tmp1 = 16384;
-    int32_t tmp2 = 16384;
-    int16_t coef;
-
-    coef = coef_ptr[0];
-    tmp1 += coef * in1[0];
-    tmp2 += coef * in2[-0];
-
-    coef = coef_ptr[1];
-    tmp1 += coef * in1[1];
-    tmp2 += coef * in2[-1];
-
-    coef = coef_ptr[2];
-    tmp1 += coef * in1[2];
-    tmp2 += coef * in2[-2];
-
-    coef = coef_ptr[3];
-    tmp1 += coef * in1[3];
-    tmp2 += coef * in2[-3];
-
-    coef = coef_ptr[4];
-    tmp1 += coef * in1[4];
-    tmp2 += coef * in2[-4];
-
-    coef = coef_ptr[5];
-    tmp1 += coef * in1[5];
-    tmp2 += coef * in2[-5];
-
-    coef = coef_ptr[6];
-    tmp1 += coef * in1[6];
-    tmp2 += coef * in2[-6];
-
-    coef = coef_ptr[7];
-    tmp1 += coef * in1[7];
-    tmp2 += coef * in2[-7];
-
-    coef = coef_ptr[8];
-    tmp1 += coef * in1[8];
-    tmp2 += coef * in2[-8];
-
-    // scale down, round and saturate
-    tmp1 >>= 15;
-    if (tmp1 > (int32_t)0x00007FFF)
-        tmp1 = 0x00007FFF;
-    if (tmp1 < (int32_t)0xFFFF8000)
-        tmp1 = 0xFFFF8000;
-    tmp2 >>= 15;
-    if (tmp2 > (int32_t)0x00007FFF)
-        tmp2 = 0x00007FFF;
-    if (tmp2 < (int32_t)0xFFFF8000)
-        tmp2 = 0xFFFF8000;
-    *out1 = (int16_t)tmp1;
-    *out2 = (int16_t)tmp2;
-}
-
-//   Resampling ratio: 11/16
-// input:  int32_t (normalized, not saturated) :: size 16 * K
-// output: int32_t (shifted 15 positions to the left, + offset 16384) :: size 11 * K
-//      K: Number of blocks
-
-void WebRtcSpl_32khzTo22khzIntToInt(const int32_t* In,
-                                    int32_t* Out,
-                                    int32_t K)
-{
-    /////////////////////////////////////////////////////////////
-    // Filter operation:
-    //
-    // Perform resampling (16 input samples -> 11 output samples);
-    // process in sub blocks of size 16 samples.
-    int32_t m;
-
-    for (m = 0; m < K; m++)
-    {
-        // first output sample
-        Out[0] = ((int32_t)In[3] << 15) + (1 << 14);
-
-        // sum and accumulate filter coefficients and input samples
-        WebRtcSpl_DotProdIntToInt(&In[0], &In[22], kCoefficients32To22[0], &Out[1], &Out[10]);
-
-        // sum and accumulate filter coefficients and input samples
-        WebRtcSpl_DotProdIntToInt(&In[2], &In[20], kCoefficients32To22[1], &Out[2], &Out[9]);
-
-        // sum and accumulate filter coefficients and input samples
-        WebRtcSpl_DotProdIntToInt(&In[3], &In[19], kCoefficients32To22[2], &Out[3], &Out[8]);
-
-        // sum and accumulate filter coefficients and input samples
-        WebRtcSpl_DotProdIntToInt(&In[5], &In[17], kCoefficients32To22[3], &Out[4], &Out[7]);
-
-        // sum and accumulate filter coefficients and input samples
-        WebRtcSpl_DotProdIntToInt(&In[6], &In[16], kCoefficients32To22[4], &Out[5], &Out[6]);
-
-        // update pointers
-        In += 16;
-        Out += 11;
-    }
-}
-
-//   Resampling ratio: 11/16
-// input:  int32_t (normalized, not saturated) :: size 16 * K
-// output: int16_t (saturated) :: size 11 * K
-//      K: Number of blocks
-
-void WebRtcSpl_32khzTo22khzIntToShort(const int32_t *In,
-                                      int16_t *Out,
-                                      int32_t K)
-{
-    /////////////////////////////////////////////////////////////
-    // Filter operation:
-    //
-    // Perform resampling (16 input samples -> 11 output samples);
-    // process in sub blocks of size 16 samples.
-    int32_t tmp;
-    int32_t m;
-
-    for (m = 0; m < K; m++)
-    {
-        // first output sample
-        tmp = In[3];
-        if (tmp > (int32_t)0x00007FFF)
-            tmp = 0x00007FFF;
-        if (tmp < (int32_t)0xFFFF8000)
-            tmp = 0xFFFF8000;
-        Out[0] = (int16_t)tmp;
-
-        // sum and accumulate filter coefficients and input samples
-        WebRtcSpl_DotProdIntToShort(&In[0], &In[22], kCoefficients32To22[0], &Out[1], &Out[10]);
-
-        // sum and accumulate filter coefficients and input samples
-        WebRtcSpl_DotProdIntToShort(&In[2], &In[20], kCoefficients32To22[1], &Out[2], &Out[9]);
-
-        // sum and accumulate filter coefficients and input samples
-        WebRtcSpl_DotProdIntToShort(&In[3], &In[19], kCoefficients32To22[2], &Out[3], &Out[8]);
-
-        // sum and accumulate filter coefficients and input samples
-        WebRtcSpl_DotProdIntToShort(&In[5], &In[17], kCoefficients32To22[3], &Out[4], &Out[7]);
-
-        // sum and accumulate filter coefficients and input samples
-        WebRtcSpl_DotProdIntToShort(&In[6], &In[16], kCoefficients32To22[4], &Out[5], &Out[6]);
-
-        // update pointers
-        In += 16;
-        Out += 11;
-    }
-}
diff --git a/submodules/libtgvoip/webrtc_dsp/common_audio/signal_processing/resample_48khz.c b/submodules/libtgvoip/webrtc_dsp/common_audio/signal_processing/resample_48khz.c
deleted file mode 100644
index 8518e7b1ce..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/common_audio/signal_processing/resample_48khz.c
+++ /dev/null
@@ -1,186 +0,0 @@
-/*
- *  Copyright (c) 2011 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-
-/*
- * This file contains resampling functions between 48 kHz and nb/wb.
- * The description header can be found in signal_processing_library.h
- *
- */
-
-#include <string.h>
-#include "common_audio/signal_processing/include/signal_processing_library.h"
-#include "common_audio/signal_processing/resample_by_2_internal.h"
-
-////////////////////////////
-///// 48 kHz -> 16 kHz /////
-////////////////////////////
-
-// 48 -> 16 resampler
-void WebRtcSpl_Resample48khzTo16khz(const int16_t* in, int16_t* out,
-                                    WebRtcSpl_State48khzTo16khz* state, int32_t* tmpmem)
-{
-    ///// 48 --> 48(LP) /////
-    // int16_t  in[480]
-    // int32_t out[480]
-    /////
-    WebRtcSpl_LPBy2ShortToInt(in, 480, tmpmem + 16, state->S_48_48);
-
-    ///// 48 --> 32 /////
-    // int32_t  in[480]
-    // int32_t out[320]
-    /////
-    // copy state to and from input array
-    memcpy(tmpmem + 8, state->S_48_32, 8 * sizeof(int32_t));
-    memcpy(state->S_48_32, tmpmem + 488, 8 * sizeof(int32_t));
-    WebRtcSpl_Resample48khzTo32khz(tmpmem + 8, tmpmem, 160);
-
-    ///// 32 --> 16 /////
-    // int32_t  in[320]
-    // int16_t out[160]
-    /////
-    WebRtcSpl_DownBy2IntToShort(tmpmem, 320, out, state->S_32_16);
-}
-
-// initialize state of 48 -> 16 resampler
-void WebRtcSpl_ResetResample48khzTo16khz(WebRtcSpl_State48khzTo16khz* state)
-{
-    memset(state->S_48_48, 0, 16 * sizeof(int32_t));
-    memset(state->S_48_32, 0, 8 * sizeof(int32_t));
-    memset(state->S_32_16, 0, 8 * sizeof(int32_t));
-}
-
-////////////////////////////
-///// 16 kHz -> 48 kHz /////
-////////////////////////////
-
-// 16 -> 48 resampler
-void WebRtcSpl_Resample16khzTo48khz(const int16_t* in, int16_t* out,
-                                    WebRtcSpl_State16khzTo48khz* state, int32_t* tmpmem)
-{
-    ///// 16 --> 32 /////
-    // int16_t  in[160]
-    // int32_t out[320]
-    /////
-    WebRtcSpl_UpBy2ShortToInt(in, 160, tmpmem + 16, state->S_16_32);
-
-    ///// 32 --> 24 /////
-    // int32_t  in[320]
-    // int32_t out[240]
-    // copy state to and from input array
-    /////
-    memcpy(tmpmem + 8, state->S_32_24, 8 * sizeof(int32_t));
-    memcpy(state->S_32_24, tmpmem + 328, 8 * sizeof(int32_t));
-    WebRtcSpl_Resample32khzTo24khz(tmpmem + 8, tmpmem, 80);
-
-    ///// 24 --> 48 /////
-    // int32_t  in[240]
-    // int16_t out[480]
-    /////
-    WebRtcSpl_UpBy2IntToShort(tmpmem, 240, out, state->S_24_48);
-}
-
-// initialize state of 16 -> 48 resampler
-void WebRtcSpl_ResetResample16khzTo48khz(WebRtcSpl_State16khzTo48khz* state)
-{
-    memset(state->S_16_32, 0, 8 * sizeof(int32_t));
-    memset(state->S_32_24, 0, 8 * sizeof(int32_t));
-    memset(state->S_24_48, 0, 8 * sizeof(int32_t));
-}
-
-////////////////////////////
-///// 48 kHz ->  8 kHz /////
-////////////////////////////
-
-// 48 -> 8 resampler
-void WebRtcSpl_Resample48khzTo8khz(const int16_t* in, int16_t* out,
-                                   WebRtcSpl_State48khzTo8khz* state, int32_t* tmpmem)
-{
-    ///// 48 --> 24 /////
-    // int16_t  in[480]
-    // int32_t out[240]
-    /////
-    WebRtcSpl_DownBy2ShortToInt(in, 480, tmpmem + 256, state->S_48_24);
-
-    ///// 24 --> 24(LP) /////
-    // int32_t  in[240]
-    // int32_t out[240]
-    /////
-    WebRtcSpl_LPBy2IntToInt(tmpmem + 256, 240, tmpmem + 16, state->S_24_24);
-
-    ///// 24 --> 16 /////
-    // int32_t  in[240]
-    // int32_t out[160]
-    /////
-    // copy state to and from input array
-    memcpy(tmpmem + 8, state->S_24_16, 8 * sizeof(int32_t));
-    memcpy(state->S_24_16, tmpmem + 248, 8 * sizeof(int32_t));
-    WebRtcSpl_Resample48khzTo32khz(tmpmem + 8, tmpmem, 80);
-
-    ///// 16 --> 8 /////
-    // int32_t  in[160]
-    // int16_t out[80]
-    /////
-    WebRtcSpl_DownBy2IntToShort(tmpmem, 160, out, state->S_16_8);
-}
-
-// initialize state of 48 -> 8 resampler
-void WebRtcSpl_ResetResample48khzTo8khz(WebRtcSpl_State48khzTo8khz* state)
-{
-    memset(state->S_48_24, 0, 8 * sizeof(int32_t));
-    memset(state->S_24_24, 0, 16 * sizeof(int32_t));
-    memset(state->S_24_16, 0, 8 * sizeof(int32_t));
-    memset(state->S_16_8, 0, 8 * sizeof(int32_t));
-}
-
-////////////////////////////
-/////  8 kHz -> 48 kHz /////
-////////////////////////////
-
-// 8 -> 48 resampler
-void WebRtcSpl_Resample8khzTo48khz(const int16_t* in, int16_t* out,
-                                   WebRtcSpl_State8khzTo48khz* state, int32_t* tmpmem)
-{
-    ///// 8 --> 16 /////
-    // int16_t  in[80]
-    // int32_t out[160]
-    /////
-    WebRtcSpl_UpBy2ShortToInt(in, 80, tmpmem + 264, state->S_8_16);
-
-    ///// 16 --> 12 /////
-    // int32_t  in[160]
-    // int32_t out[120]
-    /////
-    // copy state to and from input array
-    memcpy(tmpmem + 256, state->S_16_12, 8 * sizeof(int32_t));
-    memcpy(state->S_16_12, tmpmem + 416, 8 * sizeof(int32_t));
-    WebRtcSpl_Resample32khzTo24khz(tmpmem + 256, tmpmem + 240, 40);
-
-    ///// 12 --> 24 /////
-    // int32_t  in[120]
-    // int16_t out[240]
-    /////
-    WebRtcSpl_UpBy2IntToInt(tmpmem + 240, 120, tmpmem, state->S_12_24);
-
-    ///// 24 --> 48 /////
-    // int32_t  in[240]
-    // int16_t out[480]
-    /////
-    WebRtcSpl_UpBy2IntToShort(tmpmem, 240, out, state->S_24_48);
-}
-
-// initialize state of 8 -> 48 resampler
-void WebRtcSpl_ResetResample8khzTo48khz(WebRtcSpl_State8khzTo48khz* state)
-{
-    memset(state->S_8_16, 0, 8 * sizeof(int32_t));
-    memset(state->S_16_12, 0, 8 * sizeof(int32_t));
-    memset(state->S_12_24, 0, 8 * sizeof(int32_t));
-    memset(state->S_24_48, 0, 8 * sizeof(int32_t));
-}
diff --git a/submodules/libtgvoip/webrtc_dsp/common_audio/signal_processing/resample_by_2.c b/submodules/libtgvoip/webrtc_dsp/common_audio/signal_processing/resample_by_2.c
deleted file mode 100644
index 73e1950654..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/common_audio/signal_processing/resample_by_2.c
+++ /dev/null
@@ -1,183 +0,0 @@
-/*
- *  Copyright (c) 2011 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-
-/*
- * This file contains the resampling by two functions.
- * The description header can be found in signal_processing_library.h
- *
- */
-
-#include "common_audio/signal_processing/include/signal_processing_library.h"
-
-#ifdef WEBRTC_ARCH_ARM_V7
-
-// allpass filter coefficients.
-static const uint32_t kResampleAllpass1[3] = {3284, 24441, 49528 << 15};
-static const uint32_t kResampleAllpass2[3] =
-  {12199, 37471 << 15, 60255 << 15};
-
-// Multiply two 32-bit values and accumulate to another input value.
-// Return: state + ((diff * tbl_value) >> 16)
-
-static __inline int32_t MUL_ACCUM_1(int32_t tbl_value,
-                                    int32_t diff,
-                                    int32_t state) {
-  int32_t result;
-  __asm __volatile ("smlawb %0, %1, %2, %3": "=r"(result): "r"(diff),
-                                   "r"(tbl_value), "r"(state));
-  return result;
-}
-
-// Multiply two 32-bit values and accumulate to another input value.
-// Return: Return: state + (((diff << 1) * tbl_value) >> 32)
-//
-// The reason to introduce this function is that, in case we can't use smlawb
-// instruction (in MUL_ACCUM_1) due to input value range, we can still use 
-// smmla to save some cycles.
-
-static __inline int32_t MUL_ACCUM_2(int32_t tbl_value,
-                                    int32_t diff,
-                                    int32_t state) {
-  int32_t result;
-  __asm __volatile ("smmla %0, %1, %2, %3": "=r"(result): "r"(diff << 1),
-                                  "r"(tbl_value), "r"(state));
-  return result;
-}
-
-#else
-
-// allpass filter coefficients.
-static const uint16_t kResampleAllpass1[3] = {3284, 24441, 49528};
-static const uint16_t kResampleAllpass2[3] = {12199, 37471, 60255};
-
-// Multiply a 32-bit value with a 16-bit value and accumulate to another input:
-#define MUL_ACCUM_1(a, b, c) WEBRTC_SPL_SCALEDIFF32(a, b, c)
-#define MUL_ACCUM_2(a, b, c) WEBRTC_SPL_SCALEDIFF32(a, b, c)
-
-#endif  // WEBRTC_ARCH_ARM_V7
-
-
-// decimator
-#if !defined(MIPS32_LE)
-void WebRtcSpl_DownsampleBy2(const int16_t* in, size_t len,
-                             int16_t* out, int32_t* filtState) {
-  int32_t tmp1, tmp2, diff, in32, out32;
-  size_t i;
-
-  register int32_t state0 = filtState[0];
-  register int32_t state1 = filtState[1];
-  register int32_t state2 = filtState[2];
-  register int32_t state3 = filtState[3];
-  register int32_t state4 = filtState[4];
-  register int32_t state5 = filtState[5];
-  register int32_t state6 = filtState[6];
-  register int32_t state7 = filtState[7];
-
-  for (i = (len >> 1); i > 0; i--) {
-    // lower allpass filter
-    in32 = (int32_t)(*in++) * (1 << 10);
-    diff = in32 - state1;
-    tmp1 = MUL_ACCUM_1(kResampleAllpass2[0], diff, state0);
-    state0 = in32;
-    diff = tmp1 - state2;
-    tmp2 = MUL_ACCUM_2(kResampleAllpass2[1], diff, state1);
-    state1 = tmp1;
-    diff = tmp2 - state3;
-    state3 = MUL_ACCUM_2(kResampleAllpass2[2], diff, state2);
-    state2 = tmp2;
-
-    // upper allpass filter
-    in32 = (int32_t)(*in++) * (1 << 10);
-    diff = in32 - state5;
-    tmp1 = MUL_ACCUM_1(kResampleAllpass1[0], diff, state4);
-    state4 = in32;
-    diff = tmp1 - state6;
-    tmp2 = MUL_ACCUM_1(kResampleAllpass1[1], diff, state5);
-    state5 = tmp1;
-    diff = tmp2 - state7;
-    state7 = MUL_ACCUM_2(kResampleAllpass1[2], diff, state6);
-    state6 = tmp2;
-
-    // add two allpass outputs, divide by two and round
-    out32 = (state3 + state7 + 1024) >> 11;
-
-    // limit amplitude to prevent wrap-around, and write to output array
-    *out++ = WebRtcSpl_SatW32ToW16(out32);
-  }
-
-  filtState[0] = state0;
-  filtState[1] = state1;
-  filtState[2] = state2;
-  filtState[3] = state3;
-  filtState[4] = state4;
-  filtState[5] = state5;
-  filtState[6] = state6;
-  filtState[7] = state7;
-}
-#endif  // #if defined(MIPS32_LE)
-
-
-void WebRtcSpl_UpsampleBy2(const int16_t* in, size_t len,
-                           int16_t* out, int32_t* filtState) {
-  int32_t tmp1, tmp2, diff, in32, out32;
-  size_t i;
-
-  register int32_t state0 = filtState[0];
-  register int32_t state1 = filtState[1];
-  register int32_t state2 = filtState[2];
-  register int32_t state3 = filtState[3];
-  register int32_t state4 = filtState[4];
-  register int32_t state5 = filtState[5];
-  register int32_t state6 = filtState[6];
-  register int32_t state7 = filtState[7];
-
-  for (i = len; i > 0; i--) {
-    // lower allpass filter
-    in32 = (int32_t)(*in++) * (1 << 10);
-    diff = in32 - state1;
-    tmp1 = MUL_ACCUM_1(kResampleAllpass1[0], diff, state0);
-    state0 = in32;
-    diff = tmp1 - state2;
-    tmp2 = MUL_ACCUM_1(kResampleAllpass1[1], diff, state1);
-    state1 = tmp1;
-    diff = tmp2 - state3;
-    state3 = MUL_ACCUM_2(kResampleAllpass1[2], diff, state2);
-    state2 = tmp2;
-
-    // round; limit amplitude to prevent wrap-around; write to output array
-    out32 = (state3 + 512) >> 10;
-    *out++ = WebRtcSpl_SatW32ToW16(out32);
-
-    // upper allpass filter
-    diff = in32 - state5;
-    tmp1 = MUL_ACCUM_1(kResampleAllpass2[0], diff, state4);
-    state4 = in32;
-    diff = tmp1 - state6;
-    tmp2 = MUL_ACCUM_2(kResampleAllpass2[1], diff, state5);
-    state5 = tmp1;
-    diff = tmp2 - state7;
-    state7 = MUL_ACCUM_2(kResampleAllpass2[2], diff, state6);
-    state6 = tmp2;
-
-    // round; limit amplitude to prevent wrap-around; write to output array
-    out32 = (state7 + 512) >> 10;
-    *out++ = WebRtcSpl_SatW32ToW16(out32);
-  }
-
-  filtState[0] = state0;
-  filtState[1] = state1;
-  filtState[2] = state2;
-  filtState[3] = state3;
-  filtState[4] = state4;
-  filtState[5] = state5;
-  filtState[6] = state6;
-  filtState[7] = state7;
-}
diff --git a/submodules/libtgvoip/webrtc_dsp/common_audio/signal_processing/resample_by_2_internal.c b/submodules/libtgvoip/webrtc_dsp/common_audio/signal_processing/resample_by_2_internal.c
deleted file mode 100644
index 99592b20b5..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/common_audio/signal_processing/resample_by_2_internal.c
+++ /dev/null
@@ -1,689 +0,0 @@
-/*
- *  Copyright (c) 2011 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-
-/*
- * This header file contains some internal resampling functions.
- *
- */
-
-#include "common_audio/signal_processing/resample_by_2_internal.h"
-#include "rtc_base/sanitizer.h"
-
-// allpass filter coefficients.
-static const int16_t kResampleAllpass[2][3] = {
-        {821, 6110, 12382},
-        {3050, 9368, 15063}
-};
-
-//
-//   decimator
-// input:  int32_t (shifted 15 positions to the left, + offset 16384) OVERWRITTEN!
-// output: int16_t (saturated) (of length len/2)
-// state:  filter state array; length = 8
-
-void RTC_NO_SANITIZE("signed-integer-overflow")  // bugs.webrtc.org/5486
-WebRtcSpl_DownBy2IntToShort(int32_t *in, int32_t len, int16_t *out,
-                            int32_t *state)
-{
-    int32_t tmp0, tmp1, diff;
-    int32_t i;
-
-    len >>= 1;
-
-    // lower allpass filter (operates on even input samples)
-    for (i = 0; i < len; i++)
-    {
-        tmp0 = in[i << 1];
-        diff = tmp0 - state[1];
-        // UBSan: -1771017321 - 999586185 cannot be represented in type 'int'
-
-        // scale down and round
-        diff = (diff + (1 << 13)) >> 14;
-        tmp1 = state[0] + diff * kResampleAllpass[1][0];
-        state[0] = tmp0;
-        diff = tmp1 - state[2];
-        // scale down and truncate
-        diff = diff >> 14;
-        if (diff < 0)
-            diff += 1;
-        tmp0 = state[1] + diff * kResampleAllpass[1][1];
-        state[1] = tmp1;
-        diff = tmp0 - state[3];
-        // scale down and truncate
-        diff = diff >> 14;
-        if (diff < 0)
-            diff += 1;
-        state[3] = state[2] + diff * kResampleAllpass[1][2];
-        state[2] = tmp0;
-
-        // divide by two and store temporarily
-        in[i << 1] = (state[3] >> 1);
-    }
-
-    in++;
-
-    // upper allpass filter (operates on odd input samples)
-    for (i = 0; i < len; i++)
-    {
-        tmp0 = in[i << 1];
-        diff = tmp0 - state[5];
-        // scale down and round
-        diff = (diff + (1 << 13)) >> 14;
-        tmp1 = state[4] + diff * kResampleAllpass[0][0];
-        state[4] = tmp0;
-        diff = tmp1 - state[6];
-        // scale down and round
-        diff = diff >> 14;
-        if (diff < 0)
-            diff += 1;
-        tmp0 = state[5] + diff * kResampleAllpass[0][1];
-        state[5] = tmp1;
-        diff = tmp0 - state[7];
-        // scale down and truncate
-        diff = diff >> 14;
-        if (diff < 0)
-            diff += 1;
-        state[7] = state[6] + diff * kResampleAllpass[0][2];
-        state[6] = tmp0;
-
-        // divide by two and store temporarily
-        in[i << 1] = (state[7] >> 1);
-    }
-
-    in--;
-
-    // combine allpass outputs
-    for (i = 0; i < len; i += 2)
-    {
-        // divide by two, add both allpass outputs and round
-        tmp0 = (in[i << 1] + in[(i << 1) + 1]) >> 15;
-        tmp1 = (in[(i << 1) + 2] + in[(i << 1) + 3]) >> 15;
-        if (tmp0 > (int32_t)0x00007FFF)
-            tmp0 = 0x00007FFF;
-        if (tmp0 < (int32_t)0xFFFF8000)
-            tmp0 = 0xFFFF8000;
-        out[i] = (int16_t)tmp0;
-        if (tmp1 > (int32_t)0x00007FFF)
-            tmp1 = 0x00007FFF;
-        if (tmp1 < (int32_t)0xFFFF8000)
-            tmp1 = 0xFFFF8000;
-        out[i + 1] = (int16_t)tmp1;
-    }
-}
-
-//
-//   decimator
-// input:  int16_t
-// output: int32_t (shifted 15 positions to the left, + offset 16384) (of length len/2)
-// state:  filter state array; length = 8
-
-void RTC_NO_SANITIZE("signed-integer-overflow")  // bugs.webrtc.org/5486
-WebRtcSpl_DownBy2ShortToInt(const int16_t *in,
-                            int32_t len,
-                            int32_t *out,
-                            int32_t *state)
-{
-    int32_t tmp0, tmp1, diff;
-    int32_t i;
-
-    len >>= 1;
-
-    // lower allpass filter (operates on even input samples)
-    for (i = 0; i < len; i++)
-    {
-        tmp0 = ((int32_t)in[i << 1] << 15) + (1 << 14);
-        diff = tmp0 - state[1];
-        // scale down and round
-        diff = (diff + (1 << 13)) >> 14;
-        tmp1 = state[0] + diff * kResampleAllpass[1][0];
-        state[0] = tmp0;
-        diff = tmp1 - state[2];
-        // UBSan: -1379909682 - 834099714 cannot be represented in type 'int'
-
-        // scale down and truncate
-        diff = diff >> 14;
-        if (diff < 0)
-            diff += 1;
-        tmp0 = state[1] + diff * kResampleAllpass[1][1];
-        state[1] = tmp1;
-        diff = tmp0 - state[3];
-        // scale down and truncate
-        diff = diff >> 14;
-        if (diff < 0)
-            diff += 1;
-        state[3] = state[2] + diff * kResampleAllpass[1][2];
-        state[2] = tmp0;
-
-        // divide by two and store temporarily
-        out[i] = (state[3] >> 1);
-    }
-
-    in++;
-
-    // upper allpass filter (operates on odd input samples)
-    for (i = 0; i < len; i++)
-    {
-        tmp0 = ((int32_t)in[i << 1] << 15) + (1 << 14);
-        diff = tmp0 - state[5];
-        // scale down and round
-        diff = (diff + (1 << 13)) >> 14;
-        tmp1 = state[4] + diff * kResampleAllpass[0][0];
-        state[4] = tmp0;
-        diff = tmp1 - state[6];
-        // scale down and round
-        diff = diff >> 14;
-        if (diff < 0)
-            diff += 1;
-        tmp0 = state[5] + diff * kResampleAllpass[0][1];
-        state[5] = tmp1;
-        diff = tmp0 - state[7];
-        // scale down and truncate
-        diff = diff >> 14;
-        if (diff < 0)
-            diff += 1;
-        state[7] = state[6] + diff * kResampleAllpass[0][2];
-        state[6] = tmp0;
-
-        // divide by two and store temporarily
-        out[i] += (state[7] >> 1);
-    }
-
-    in--;
-}
-
-//
-//   interpolator
-// input:  int16_t
-// output: int32_t (normalized, not saturated) (of length len*2)
-// state:  filter state array; length = 8
-void WebRtcSpl_UpBy2ShortToInt(const int16_t *in, int32_t len, int32_t *out,
-                               int32_t *state)
-{
-    int32_t tmp0, tmp1, diff;
-    int32_t i;
-
-    // upper allpass filter (generates odd output samples)
-    for (i = 0; i < len; i++)
-    {
-        tmp0 = ((int32_t)in[i] << 15) + (1 << 14);
-        diff = tmp0 - state[5];
-        // scale down and round
-        diff = (diff + (1 << 13)) >> 14;
-        tmp1 = state[4] + diff * kResampleAllpass[0][0];
-        state[4] = tmp0;
-        diff = tmp1 - state[6];
-        // scale down and truncate
-        diff = diff >> 14;
-        if (diff < 0)
-            diff += 1;
-        tmp0 = state[5] + diff * kResampleAllpass[0][1];
-        state[5] = tmp1;
-        diff = tmp0 - state[7];
-        // scale down and truncate
-        diff = diff >> 14;
-        if (diff < 0)
-            diff += 1;
-        state[7] = state[6] + diff * kResampleAllpass[0][2];
-        state[6] = tmp0;
-
-        // scale down, round and store
-        out[i << 1] = state[7] >> 15;
-    }
-
-    out++;
-
-    // lower allpass filter (generates even output samples)
-    for (i = 0; i < len; i++)
-    {
-        tmp0 = ((int32_t)in[i] << 15) + (1 << 14);
-        diff = tmp0 - state[1];
-        // scale down and round
-        diff = (diff + (1 << 13)) >> 14;
-        tmp1 = state[0] + diff * kResampleAllpass[1][0];
-        state[0] = tmp0;
-        diff = tmp1 - state[2];
-        // scale down and truncate
-        diff = diff >> 14;
-        if (diff < 0)
-            diff += 1;
-        tmp0 = state[1] + diff * kResampleAllpass[1][1];
-        state[1] = tmp1;
-        diff = tmp0 - state[3];
-        // scale down and truncate
-        diff = diff >> 14;
-        if (diff < 0)
-            diff += 1;
-        state[3] = state[2] + diff * kResampleAllpass[1][2];
-        state[2] = tmp0;
-
-        // scale down, round and store
-        out[i << 1] = state[3] >> 15;
-    }
-}
-
-//
-//   interpolator
-// input:  int32_t (shifted 15 positions to the left, + offset 16384)
-// output: int32_t (shifted 15 positions to the left, + offset 16384) (of length len*2)
-// state:  filter state array; length = 8
-void WebRtcSpl_UpBy2IntToInt(const int32_t *in, int32_t len, int32_t *out,
-                             int32_t *state)
-{
-    int32_t tmp0, tmp1, diff;
-    int32_t i;
-
-    // upper allpass filter (generates odd output samples)
-    for (i = 0; i < len; i++)
-    {
-        tmp0 = in[i];
-        diff = tmp0 - state[5];
-        // scale down and round
-        diff = (diff + (1 << 13)) >> 14;
-        tmp1 = state[4] + diff * kResampleAllpass[0][0];
-        state[4] = tmp0;
-        diff = tmp1 - state[6];
-        // scale down and truncate
-        diff = diff >> 14;
-        if (diff < 0)
-            diff += 1;
-        tmp0 = state[5] + diff * kResampleAllpass[0][1];
-        state[5] = tmp1;
-        diff = tmp0 - state[7];
-        // scale down and truncate
-        diff = diff >> 14;
-        if (diff < 0)
-            diff += 1;
-        state[7] = state[6] + diff * kResampleAllpass[0][2];
-        state[6] = tmp0;
-
-        // scale down, round and store
-        out[i << 1] = state[7];
-    }
-
-    out++;
-
-    // lower allpass filter (generates even output samples)
-    for (i = 0; i < len; i++)
-    {
-        tmp0 = in[i];
-        diff = tmp0 - state[1];
-        // scale down and round
-        diff = (diff + (1 << 13)) >> 14;
-        tmp1 = state[0] + diff * kResampleAllpass[1][0];
-        state[0] = tmp0;
-        diff = tmp1 - state[2];
-        // scale down and truncate
-        diff = diff >> 14;
-        if (diff < 0)
-            diff += 1;
-        tmp0 = state[1] + diff * kResampleAllpass[1][1];
-        state[1] = tmp1;
-        diff = tmp0 - state[3];
-        // scale down and truncate
-        diff = diff >> 14;
-        if (diff < 0)
-            diff += 1;
-        state[3] = state[2] + diff * kResampleAllpass[1][2];
-        state[2] = tmp0;
-
-        // scale down, round and store
-        out[i << 1] = state[3];
-    }
-}
-
-//
-//   interpolator
-// input:  int32_t (shifted 15 positions to the left, + offset 16384)
-// output: int16_t (saturated) (of length len*2)
-// state:  filter state array; length = 8
-void WebRtcSpl_UpBy2IntToShort(const int32_t *in, int32_t len, int16_t *out,
-                               int32_t *state)
-{
-    int32_t tmp0, tmp1, diff;
-    int32_t i;
-
-    // upper allpass filter (generates odd output samples)
-    for (i = 0; i < len; i++)
-    {
-        tmp0 = in[i];
-        diff = tmp0 - state[5];
-        // scale down and round
-        diff = (diff + (1 << 13)) >> 14;
-        tmp1 = state[4] + diff * kResampleAllpass[0][0];
-        state[4] = tmp0;
-        diff = tmp1 - state[6];
-        // scale down and round
-        diff = diff >> 14;
-        if (diff < 0)
-            diff += 1;
-        tmp0 = state[5] + diff * kResampleAllpass[0][1];
-        state[5] = tmp1;
-        diff = tmp0 - state[7];
-        // scale down and truncate
-        diff = diff >> 14;
-        if (diff < 0)
-            diff += 1;
-        state[7] = state[6] + diff * kResampleAllpass[0][2];
-        state[6] = tmp0;
-
-        // scale down, saturate and store
-        tmp1 = state[7] >> 15;
-        if (tmp1 > (int32_t)0x00007FFF)
-            tmp1 = 0x00007FFF;
-        if (tmp1 < (int32_t)0xFFFF8000)
-            tmp1 = 0xFFFF8000;
-        out[i << 1] = (int16_t)tmp1;
-    }
-
-    out++;
-
-    // lower allpass filter (generates even output samples)
-    for (i = 0; i < len; i++)
-    {
-        tmp0 = in[i];
-        diff = tmp0 - state[1];
-        // scale down and round
-        diff = (diff + (1 << 13)) >> 14;
-        tmp1 = state[0] + diff * kResampleAllpass[1][0];
-        state[0] = tmp0;
-        diff = tmp1 - state[2];
-        // scale down and truncate
-        diff = diff >> 14;
-        if (diff < 0)
-            diff += 1;
-        tmp0 = state[1] + diff * kResampleAllpass[1][1];
-        state[1] = tmp1;
-        diff = tmp0 - state[3];
-        // scale down and truncate
-        diff = diff >> 14;
-        if (diff < 0)
-            diff += 1;
-        state[3] = state[2] + diff * kResampleAllpass[1][2];
-        state[2] = tmp0;
-
-        // scale down, saturate and store
-        tmp1 = state[3] >> 15;
-        if (tmp1 > (int32_t)0x00007FFF)
-            tmp1 = 0x00007FFF;
-        if (tmp1 < (int32_t)0xFFFF8000)
-            tmp1 = 0xFFFF8000;
-        out[i << 1] = (int16_t)tmp1;
-    }
-}
-
-//   lowpass filter
-// input:  int16_t
-// output: int32_t (normalized, not saturated)
-// state:  filter state array; length = 8
-void WebRtcSpl_LPBy2ShortToInt(const int16_t* in, int32_t len, int32_t* out,
-                               int32_t* state)
-{
-    int32_t tmp0, tmp1, diff;
-    int32_t i;
-
-    len >>= 1;
-
-    // lower allpass filter: odd input -> even output samples
-    in++;
-    // initial state of polyphase delay element
-    tmp0 = state[12];
-    for (i = 0; i < len; i++)
-    {
-        diff = tmp0 - state[1];
-        // scale down and round
-        diff = (diff + (1 << 13)) >> 14;
-        tmp1 = state[0] + diff * kResampleAllpass[1][0];
-        state[0] = tmp0;
-        diff = tmp1 - state[2];
-        // scale down and truncate
-        diff = diff >> 14;
-        if (diff < 0)
-            diff += 1;
-        tmp0 = state[1] + diff * kResampleAllpass[1][1];
-        state[1] = tmp1;
-        diff = tmp0 - state[3];
-        // scale down and truncate
-        diff = diff >> 14;
-        if (diff < 0)
-            diff += 1;
-        state[3] = state[2] + diff * kResampleAllpass[1][2];
-        state[2] = tmp0;
-
-        // scale down, round and store
-        out[i << 1] = state[3] >> 1;
-        tmp0 = ((int32_t)in[i << 1] << 15) + (1 << 14);
-    }
-    in--;
-
-    // upper allpass filter: even input -> even output samples
-    for (i = 0; i < len; i++)
-    {
-        tmp0 = ((int32_t)in[i << 1] << 15) + (1 << 14);
-        diff = tmp0 - state[5];
-        // scale down and round
-        diff = (diff + (1 << 13)) >> 14;
-        tmp1 = state[4] + diff * kResampleAllpass[0][0];
-        state[4] = tmp0;
-        diff = tmp1 - state[6];
-        // scale down and round
-        diff = diff >> 14;
-        if (diff < 0)
-            diff += 1;
-        tmp0 = state[5] + diff * kResampleAllpass[0][1];
-        state[5] = tmp1;
-        diff = tmp0 - state[7];
-        // scale down and truncate
-        diff = diff >> 14;
-        if (diff < 0)
-            diff += 1;
-        state[7] = state[6] + diff * kResampleAllpass[0][2];
-        state[6] = tmp0;
-
-        // average the two allpass outputs, scale down and store
-        out[i << 1] = (out[i << 1] + (state[7] >> 1)) >> 15;
-    }
-
-    // switch to odd output samples
-    out++;
-
-    // lower allpass filter: even input -> odd output samples
-    for (i = 0; i < len; i++)
-    {
-        tmp0 = ((int32_t)in[i << 1] << 15) + (1 << 14);
-        diff = tmp0 - state[9];
-        // scale down and round
-        diff = (diff + (1 << 13)) >> 14;
-        tmp1 = state[8] + diff * kResampleAllpass[1][0];
-        state[8] = tmp0;
-        diff = tmp1 - state[10];
-        // scale down and truncate
-        diff = diff >> 14;
-        if (diff < 0)
-            diff += 1;
-        tmp0 = state[9] + diff * kResampleAllpass[1][1];
-        state[9] = tmp1;
-        diff = tmp0 - state[11];
-        // scale down and truncate
-        diff = diff >> 14;
-        if (diff < 0)
-            diff += 1;
-        state[11] = state[10] + diff * kResampleAllpass[1][2];
-        state[10] = tmp0;
-
-        // scale down, round and store
-        out[i << 1] = state[11] >> 1;
-    }
-
-    // upper allpass filter: odd input -> odd output samples
-    in++;
-    for (i = 0; i < len; i++)
-    {
-        tmp0 = ((int32_t)in[i << 1] << 15) + (1 << 14);
-        diff = tmp0 - state[13];
-        // scale down and round
-        diff = (diff + (1 << 13)) >> 14;
-        tmp1 = state[12] + diff * kResampleAllpass[0][0];
-        state[12] = tmp0;
-        diff = tmp1 - state[14];
-        // scale down and round
-        diff = diff >> 14;
-        if (diff < 0)
-            diff += 1;
-        tmp0 = state[13] + diff * kResampleAllpass[0][1];
-        state[13] = tmp1;
-        diff = tmp0 - state[15];
-        // scale down and truncate
-        diff = diff >> 14;
-        if (diff < 0)
-            diff += 1;
-        state[15] = state[14] + diff * kResampleAllpass[0][2];
-        state[14] = tmp0;
-
-        // average the two allpass outputs, scale down and store
-        out[i << 1] = (out[i << 1] + (state[15] >> 1)) >> 15;
-    }
-}
-
-//   lowpass filter
-// input:  int32_t (shifted 15 positions to the left, + offset 16384)
-// output: int32_t (normalized, not saturated)
-// state:  filter state array; length = 8
-void RTC_NO_SANITIZE("signed-integer-overflow")  // bugs.webrtc.org/5486
-WebRtcSpl_LPBy2IntToInt(const int32_t* in, int32_t len, int32_t* out,
-                        int32_t* state)
-{
-    int32_t tmp0, tmp1, diff;
-    int32_t i;
-
-    len >>= 1;
-
-    // lower allpass filter: odd input -> even output samples
-    in++;
-    // initial state of polyphase delay element
-    tmp0 = state[12];
-    for (i = 0; i < len; i++)
-    {
-        diff = tmp0 - state[1];
-        // scale down and round
-        diff = (diff + (1 << 13)) >> 14;
-        tmp1 = state[0] + diff * kResampleAllpass[1][0];
-        state[0] = tmp0;
-        diff = tmp1 - state[2];
-        // scale down and truncate
-        diff = diff >> 14;
-        if (diff < 0)
-            diff += 1;
-        tmp0 = state[1] + diff * kResampleAllpass[1][1];
-        state[1] = tmp1;
-        diff = tmp0 - state[3];
-        // scale down and truncate
-        diff = diff >> 14;
-        if (diff < 0)
-            diff += 1;
-        state[3] = state[2] + diff * kResampleAllpass[1][2];
-        state[2] = tmp0;
-
-        // scale down, round and store
-        out[i << 1] = state[3] >> 1;
-        tmp0 = in[i << 1];
-    }
-    in--;
-
-    // upper allpass filter: even input -> even output samples
-    for (i = 0; i < len; i++)
-    {
-        tmp0 = in[i << 1];
-        diff = tmp0 - state[5];
-        // UBSan: -794814117 - 1566149201 cannot be represented in type 'int'
-
-        // scale down and round
-        diff = (diff + (1 << 13)) >> 14;
-        tmp1 = state[4] + diff * kResampleAllpass[0][0];
-        state[4] = tmp0;
-        diff = tmp1 - state[6];
-        // scale down and round
-        diff = diff >> 14;
-        if (diff < 0)
-            diff += 1;
-        tmp0 = state[5] + diff * kResampleAllpass[0][1];
-        state[5] = tmp1;
-        diff = tmp0 - state[7];
-        // scale down and truncate
-        diff = diff >> 14;
-        if (diff < 0)
-            diff += 1;
-        state[7] = state[6] + diff * kResampleAllpass[0][2];
-        state[6] = tmp0;
-
-        // average the two allpass outputs, scale down and store
-        out[i << 1] = (out[i << 1] + (state[7] >> 1)) >> 15;
-    }
-
-    // switch to odd output samples
-    out++;
-
-    // lower allpass filter: even input -> odd output samples
-    for (i = 0; i < len; i++)
-    {
-        tmp0 = in[i << 1];
-        diff = tmp0 - state[9];
-        // scale down and round
-        diff = (diff + (1 << 13)) >> 14;
-        tmp1 = state[8] + diff * kResampleAllpass[1][0];
-        state[8] = tmp0;
-        diff = tmp1 - state[10];
-        // scale down and truncate
-        diff = diff >> 14;
-        if (diff < 0)
-            diff += 1;
-        tmp0 = state[9] + diff * kResampleAllpass[1][1];
-        state[9] = tmp1;
-        diff = tmp0 - state[11];
-        // scale down and truncate
-        diff = diff >> 14;
-        if (diff < 0)
-            diff += 1;
-        state[11] = state[10] + diff * kResampleAllpass[1][2];
-        state[10] = tmp0;
-
-        // scale down, round and store
-        out[i << 1] = state[11] >> 1;
-    }
-
-    // upper allpass filter: odd input -> odd output samples
-    in++;
-    for (i = 0; i < len; i++)
-    {
-        tmp0 = in[i << 1];
-        diff = tmp0 - state[13];
-        // scale down and round
-        diff = (diff + (1 << 13)) >> 14;
-        tmp1 = state[12] + diff * kResampleAllpass[0][0];
-        state[12] = tmp0;
-        diff = tmp1 - state[14];
-        // scale down and round
-        diff = diff >> 14;
-        if (diff < 0)
-            diff += 1;
-        tmp0 = state[13] + diff * kResampleAllpass[0][1];
-        state[13] = tmp1;
-        diff = tmp0 - state[15];
-        // scale down and truncate
-        diff = diff >> 14;
-        if (diff < 0)
-            diff += 1;
-        state[15] = state[14] + diff * kResampleAllpass[0][2];
-        state[14] = tmp0;
-
-        // average the two allpass outputs, scale down and store
-        out[i << 1] = (out[i << 1] + (state[15] >> 1)) >> 15;
-    }
-}
diff --git a/submodules/libtgvoip/webrtc_dsp/common_audio/signal_processing/resample_by_2_internal.h b/submodules/libtgvoip/webrtc_dsp/common_audio/signal_processing/resample_by_2_internal.h
deleted file mode 100644
index 145395a4cb..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/common_audio/signal_processing/resample_by_2_internal.h
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- *  Copyright (c) 2011 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-/*
- * This header file contains some internal resampling functions.
- *
- */
-
-#ifndef COMMON_AUDIO_SIGNAL_PROCESSING_RESAMPLE_BY_2_INTERNAL_H_
-#define COMMON_AUDIO_SIGNAL_PROCESSING_RESAMPLE_BY_2_INTERNAL_H_
-
-#include <stdint.h>
-
-/*******************************************************************
- * resample_by_2_fast.c
- * Functions for internal use in the other resample functions
- ******************************************************************/
-void WebRtcSpl_DownBy2IntToShort(int32_t* in,
-                                 int32_t len,
-                                 int16_t* out,
-                                 int32_t* state);
-
-void WebRtcSpl_DownBy2ShortToInt(const int16_t* in,
-                                 int32_t len,
-                                 int32_t* out,
-                                 int32_t* state);
-
-void WebRtcSpl_UpBy2ShortToInt(const int16_t* in,
-                               int32_t len,
-                               int32_t* out,
-                               int32_t* state);
-
-void WebRtcSpl_UpBy2IntToInt(const int32_t* in,
-                             int32_t len,
-                             int32_t* out,
-                             int32_t* state);
-
-void WebRtcSpl_UpBy2IntToShort(const int32_t* in,
-                               int32_t len,
-                               int16_t* out,
-                               int32_t* state);
-
-void WebRtcSpl_LPBy2ShortToInt(const int16_t* in,
-                               int32_t len,
-                               int32_t* out,
-                               int32_t* state);
-
-void WebRtcSpl_LPBy2IntToInt(const int32_t* in,
-                             int32_t len,
-                             int32_t* out,
-                             int32_t* state);
-
-#endif  // COMMON_AUDIO_SIGNAL_PROCESSING_RESAMPLE_BY_2_INTERNAL_H_
diff --git a/submodules/libtgvoip/webrtc_dsp/common_audio/signal_processing/resample_fractional.c b/submodules/libtgvoip/webrtc_dsp/common_audio/signal_processing/resample_fractional.c
deleted file mode 100644
index 9ffe0aca60..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/common_audio/signal_processing/resample_fractional.c
+++ /dev/null
@@ -1,239 +0,0 @@
-/*
- *  Copyright (c) 2011 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-
-/*
- * This file contains the resampling functions between 48, 44, 32 and 24 kHz.
- * The description headers can be found in signal_processing_library.h
- *
- */
-
-#include "common_audio/signal_processing/include/signal_processing_library.h"
-
-// interpolation coefficients
-static const int16_t kCoefficients48To32[2][8] = {
-        {778, -2050, 1087, 23285, 12903, -3783, 441, 222},
-        {222, 441, -3783, 12903, 23285, 1087, -2050, 778}
-};
-
-static const int16_t kCoefficients32To24[3][8] = {
-        {767, -2362, 2434, 24406, 10620, -3838, 721, 90},
-        {386, -381, -2646, 19062, 19062, -2646, -381, 386},
-        {90, 721, -3838, 10620, 24406, 2434, -2362, 767}
-};
-
-static const int16_t kCoefficients44To32[4][9] = {
-        {117, -669, 2245, -6183, 26267, 13529, -3245, 845, -138},
-        {-101, 612, -2283, 8532, 29790, -5138, 1789, -524, 91},
-        {50, -292, 1016, -3064, 32010, 3933, -1147, 315, -53},
-        {-156, 974, -3863, 18603, 21691, -6246, 2353, -712, 126}
-};
-
-//   Resampling ratio: 2/3
-// input:  int32_t (normalized, not saturated) :: size 3 * K
-// output: int32_t (shifted 15 positions to the left, + offset 16384) :: size 2 * K
-//      K: number of blocks
-
-void WebRtcSpl_Resample48khzTo32khz(const int32_t *In, int32_t *Out, size_t K)
-{
-    /////////////////////////////////////////////////////////////
-    // Filter operation:
-    //
-    // Perform resampling (3 input samples -> 2 output samples);
-    // process in sub blocks of size 3 samples.
-    int32_t tmp;
-    size_t m;
-
-    for (m = 0; m < K; m++)
-    {
-        tmp = 1 << 14;
-        tmp += kCoefficients48To32[0][0] * In[0];
-        tmp += kCoefficients48To32[0][1] * In[1];
-        tmp += kCoefficients48To32[0][2] * In[2];
-        tmp += kCoefficients48To32[0][3] * In[3];
-        tmp += kCoefficients48To32[0][4] * In[4];
-        tmp += kCoefficients48To32[0][5] * In[5];
-        tmp += kCoefficients48To32[0][6] * In[6];
-        tmp += kCoefficients48To32[0][7] * In[7];
-        Out[0] = tmp;
-
-        tmp = 1 << 14;
-        tmp += kCoefficients48To32[1][0] * In[1];
-        tmp += kCoefficients48To32[1][1] * In[2];
-        tmp += kCoefficients48To32[1][2] * In[3];
-        tmp += kCoefficients48To32[1][3] * In[4];
-        tmp += kCoefficients48To32[1][4] * In[5];
-        tmp += kCoefficients48To32[1][5] * In[6];
-        tmp += kCoefficients48To32[1][6] * In[7];
-        tmp += kCoefficients48To32[1][7] * In[8];
-        Out[1] = tmp;
-
-        // update pointers
-        In += 3;
-        Out += 2;
-    }
-}
-
-//   Resampling ratio: 3/4
-// input:  int32_t (normalized, not saturated) :: size 4 * K
-// output: int32_t (shifted 15 positions to the left, + offset 16384) :: size 3 * K
-//      K: number of blocks
-
-void WebRtcSpl_Resample32khzTo24khz(const int32_t *In, int32_t *Out, size_t K)
-{
-    /////////////////////////////////////////////////////////////
-    // Filter operation:
-    //
-    // Perform resampling (4 input samples -> 3 output samples);
-    // process in sub blocks of size 4 samples.
-    size_t m;
-    int32_t tmp;
-
-    for (m = 0; m < K; m++)
-    {
-        tmp = 1 << 14;
-        tmp += kCoefficients32To24[0][0] * In[0];
-        tmp += kCoefficients32To24[0][1] * In[1];
-        tmp += kCoefficients32To24[0][2] * In[2];
-        tmp += kCoefficients32To24[0][3] * In[3];
-        tmp += kCoefficients32To24[0][4] * In[4];
-        tmp += kCoefficients32To24[0][5] * In[5];
-        tmp += kCoefficients32To24[0][6] * In[6];
-        tmp += kCoefficients32To24[0][7] * In[7];
-        Out[0] = tmp;
-
-        tmp = 1 << 14;
-        tmp += kCoefficients32To24[1][0] * In[1];
-        tmp += kCoefficients32To24[1][1] * In[2];
-        tmp += kCoefficients32To24[1][2] * In[3];
-        tmp += kCoefficients32To24[1][3] * In[4];
-        tmp += kCoefficients32To24[1][4] * In[5];
-        tmp += kCoefficients32To24[1][5] * In[6];
-        tmp += kCoefficients32To24[1][6] * In[7];
-        tmp += kCoefficients32To24[1][7] * In[8];
-        Out[1] = tmp;
-
-        tmp = 1 << 14;
-        tmp += kCoefficients32To24[2][0] * In[2];
-        tmp += kCoefficients32To24[2][1] * In[3];
-        tmp += kCoefficients32To24[2][2] * In[4];
-        tmp += kCoefficients32To24[2][3] * In[5];
-        tmp += kCoefficients32To24[2][4] * In[6];
-        tmp += kCoefficients32To24[2][5] * In[7];
-        tmp += kCoefficients32To24[2][6] * In[8];
-        tmp += kCoefficients32To24[2][7] * In[9];
-        Out[2] = tmp;
-
-        // update pointers
-        In += 4;
-        Out += 3;
-    }
-}
-
-//
-// fractional resampling filters
-//   Fout = 11/16 * Fin
-//   Fout =  8/11 * Fin
-//
-
-// compute two inner-products and store them to output array
-static void WebRtcSpl_ResampDotProduct(const int32_t *in1, const int32_t *in2,
-                                       const int16_t *coef_ptr, int32_t *out1,
-                                       int32_t *out2)
-{
-    int32_t tmp1 = 16384;
-    int32_t tmp2 = 16384;
-    int16_t coef;
-
-    coef = coef_ptr[0];
-    tmp1 += coef * in1[0];
-    tmp2 += coef * in2[-0];
-
-    coef = coef_ptr[1];
-    tmp1 += coef * in1[1];
-    tmp2 += coef * in2[-1];
-
-    coef = coef_ptr[2];
-    tmp1 += coef * in1[2];
-    tmp2 += coef * in2[-2];
-
-    coef = coef_ptr[3];
-    tmp1 += coef * in1[3];
-    tmp2 += coef * in2[-3];
-
-    coef = coef_ptr[4];
-    tmp1 += coef * in1[4];
-    tmp2 += coef * in2[-4];
-
-    coef = coef_ptr[5];
-    tmp1 += coef * in1[5];
-    tmp2 += coef * in2[-5];
-
-    coef = coef_ptr[6];
-    tmp1 += coef * in1[6];
-    tmp2 += coef * in2[-6];
-
-    coef = coef_ptr[7];
-    tmp1 += coef * in1[7];
-    tmp2 += coef * in2[-7];
-
-    coef = coef_ptr[8];
-    *out1 = tmp1 + coef * in1[8];
-    *out2 = tmp2 + coef * in2[-8];
-}
-
-//   Resampling ratio: 8/11
-// input:  int32_t (normalized, not saturated) :: size 11 * K
-// output: int32_t (shifted 15 positions to the left, + offset 16384) :: size  8 * K
-//      K: number of blocks
-
-void WebRtcSpl_Resample44khzTo32khz(const int32_t *In, int32_t *Out, size_t K)
-{
-    /////////////////////////////////////////////////////////////
-    // Filter operation:
-    //
-    // Perform resampling (11 input samples -> 8 output samples);
-    // process in sub blocks of size 11 samples.
-    int32_t tmp;
-    size_t m;
-
-    for (m = 0; m < K; m++)
-    {
-        tmp = 1 << 14;
-
-        // first output sample
-        Out[0] = ((int32_t)In[3] << 15) + tmp;
-
-        // sum and accumulate filter coefficients and input samples
-        tmp += kCoefficients44To32[3][0] * In[5];
-        tmp += kCoefficients44To32[3][1] * In[6];
-        tmp += kCoefficients44To32[3][2] * In[7];
-        tmp += kCoefficients44To32[3][3] * In[8];
-        tmp += kCoefficients44To32[3][4] * In[9];
-        tmp += kCoefficients44To32[3][5] * In[10];
-        tmp += kCoefficients44To32[3][6] * In[11];
-        tmp += kCoefficients44To32[3][7] * In[12];
-        tmp += kCoefficients44To32[3][8] * In[13];
-        Out[4] = tmp;
-
-        // sum and accumulate filter coefficients and input samples
-        WebRtcSpl_ResampDotProduct(&In[0], &In[17], kCoefficients44To32[0], &Out[1], &Out[7]);
-
-        // sum and accumulate filter coefficients and input samples
-        WebRtcSpl_ResampDotProduct(&In[2], &In[15], kCoefficients44To32[1], &Out[2], &Out[6]);
-
-        // sum and accumulate filter coefficients and input samples
-        WebRtcSpl_ResampDotProduct(&In[3], &In[14], kCoefficients44To32[2], &Out[3], &Out[5]);
-
-        // update pointers
-        In += 11;
-        Out += 8;
-    }
-}
diff --git a/submodules/libtgvoip/webrtc_dsp/common_audio/signal_processing/spl_init.c b/submodules/libtgvoip/webrtc_dsp/common_audio/signal_processing/spl_init.c
deleted file mode 100644
index d031abf92a..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/common_audio/signal_processing/spl_init.c
+++ /dev/null
@@ -1,133 +0,0 @@
-/*
- *  Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-/* The global function contained in this file initializes SPL function
- * pointers, currently only for ARM platforms.
- *
- * Some code came from common/rtcd.c in the WebM project.
- */
-
-#include "common_audio/signal_processing/include/signal_processing_library.h"
-#include "system_wrappers/include/cpu_features_wrapper.h"
-
-/* Declare function pointers. */
-MaxAbsValueW16 WebRtcSpl_MaxAbsValueW16;
-MaxAbsValueW32 WebRtcSpl_MaxAbsValueW32;
-MaxValueW16 WebRtcSpl_MaxValueW16;
-MaxValueW32 WebRtcSpl_MaxValueW32;
-MinValueW16 WebRtcSpl_MinValueW16;
-MinValueW32 WebRtcSpl_MinValueW32;
-CrossCorrelation WebRtcSpl_CrossCorrelation;
-DownsampleFast WebRtcSpl_DownsampleFast;
-ScaleAndAddVectorsWithRound WebRtcSpl_ScaleAndAddVectorsWithRound;
-
-#if (!(defined(WEBRTC_ARCH_ARM_FAMILY) && defined(WEBRTC_HAS_NEON))) && !defined(MIPS32_LE)
-/* Initialize function pointers to the generic C version. */
-static void InitPointersToC(void) {
-  WebRtcSpl_MaxAbsValueW16 = WebRtcSpl_MaxAbsValueW16C;
-  WebRtcSpl_MaxAbsValueW32 = WebRtcSpl_MaxAbsValueW32C;
-  WebRtcSpl_MaxValueW16 = WebRtcSpl_MaxValueW16C;
-  WebRtcSpl_MaxValueW32 = WebRtcSpl_MaxValueW32C;
-  WebRtcSpl_MinValueW16 = WebRtcSpl_MinValueW16C;
-  WebRtcSpl_MinValueW32 = WebRtcSpl_MinValueW32C;
-  WebRtcSpl_CrossCorrelation = WebRtcSpl_CrossCorrelationC;
-  WebRtcSpl_DownsampleFast = WebRtcSpl_DownsampleFastC;
-  WebRtcSpl_ScaleAndAddVectorsWithRound =
-      WebRtcSpl_ScaleAndAddVectorsWithRoundC;
-}
-#endif
-
-#if defined(WEBRTC_ARCH_ARM_FAMILY) && defined(WEBRTC_HAS_NEON)
-/* Initialize function pointers to the Neon version. */
-static void InitPointersToNeon(void) {
-  WebRtcSpl_MaxAbsValueW16 = WebRtcSpl_MaxAbsValueW16Neon;
-  WebRtcSpl_MaxAbsValueW32 = WebRtcSpl_MaxAbsValueW32Neon;
-  WebRtcSpl_MaxValueW16 = WebRtcSpl_MaxValueW16Neon;
-  WebRtcSpl_MaxValueW32 = WebRtcSpl_MaxValueW32Neon;
-  WebRtcSpl_MinValueW16 = WebRtcSpl_MinValueW16Neon;
-  WebRtcSpl_MinValueW32 = WebRtcSpl_MinValueW32Neon;
-  WebRtcSpl_CrossCorrelation = WebRtcSpl_CrossCorrelationNeon;
-  WebRtcSpl_DownsampleFast = WebRtcSpl_DownsampleFastNeon;
-  WebRtcSpl_ScaleAndAddVectorsWithRound =
-      WebRtcSpl_ScaleAndAddVectorsWithRoundC;
-}
-#endif
-
-#if defined(MIPS32_LE)
-/* Initialize function pointers to the MIPS version. */
-static void InitPointersToMIPS(void) {
-  WebRtcSpl_MaxAbsValueW16 = WebRtcSpl_MaxAbsValueW16_mips;
-  WebRtcSpl_MaxValueW16 = WebRtcSpl_MaxValueW16_mips;
-  WebRtcSpl_MaxValueW32 = WebRtcSpl_MaxValueW32_mips;
-  WebRtcSpl_MinValueW16 = WebRtcSpl_MinValueW16_mips;
-  WebRtcSpl_MinValueW32 = WebRtcSpl_MinValueW32_mips;
-  WebRtcSpl_CrossCorrelation = WebRtcSpl_CrossCorrelation_mips;
-  WebRtcSpl_DownsampleFast = WebRtcSpl_DownsampleFast_mips;
-#if defined(MIPS_DSP_R1_LE)
-  WebRtcSpl_MaxAbsValueW32 = WebRtcSpl_MaxAbsValueW32_mips;
-  WebRtcSpl_ScaleAndAddVectorsWithRound =
-      WebRtcSpl_ScaleAndAddVectorsWithRound_mips;
-#else
-  WebRtcSpl_MaxAbsValueW32 = WebRtcSpl_MaxAbsValueW32C;
-  WebRtcSpl_ScaleAndAddVectorsWithRound =
-      WebRtcSpl_ScaleAndAddVectorsWithRoundC;
-#endif
-}
-#endif
-
-static void InitFunctionPointers(void) {
-#if defined(WEBRTC_ARCH_ARM_FAMILY) && defined(WEBRTC_HAS_NEON)
-  InitPointersToNeon();
-#elif defined(MIPS32_LE)
-  InitPointersToMIPS();
-#else
-  InitPointersToC();
-#endif  /* WEBRTC_HAS_NEON */
-}
-
-#if defined(WEBRTC_POSIX)
-#include <pthread.h>
-
-static void once(void (*func)(void)) {
-  static pthread_once_t lock = PTHREAD_ONCE_INIT;
-  pthread_once(&lock, func);
-}
-
-#elif defined(_WIN32)
-#include <windows.h>
-
-static void once(void (*func)(void)) {
-  /* Didn't use InitializeCriticalSection() since there's no race-free context
-   * in which to execute it.
-   *
-   * TODO(kma): Change to different implementation (e.g.
-   * InterlockedCompareExchangePointer) to avoid issues similar to
-   * http://code.google.com/p/webm/issues/detail?id=467.
-   */
-  static CRITICAL_SECTION lock = {(void *)((size_t)-1), -1, 0, 0, 0, 0};
-  static int done = 0;
-
-  EnterCriticalSection(&lock);
-  if (!done) {
-    func();
-    done = 1;
-  }
-  LeaveCriticalSection(&lock);
-}
-
-/* There's no fallback version as an #else block here to ensure thread safety.
- * In case of neither pthread for WEBRTC_POSIX nor _WIN32 is present, build
- * system should pick it up.
- */
-#endif  /* WEBRTC_POSIX */
-
-void WebRtcSpl_Init(void) {
-  once(InitFunctionPointers);
-}
diff --git a/submodules/libtgvoip/webrtc_dsp/common_audio/signal_processing/spl_inl.c b/submodules/libtgvoip/webrtc_dsp/common_audio/signal_processing/spl_inl.c
deleted file mode 100644
index d09e308ed3..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/common_audio/signal_processing/spl_inl.c
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- *  Copyright (c) 2016 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#include <stdint.h>
-
-#include "common_audio/signal_processing/include/spl_inl.h"
-
-// Table used by WebRtcSpl_CountLeadingZeros32_NotBuiltin. For each uint32_t n
-// that's a sequence of 0 bits followed by a sequence of 1 bits, the entry at
-// index (n * 0x8c0b2891) >> 26 in this table gives the number of zero bits in
-// n.
-const int8_t kWebRtcSpl_CountLeadingZeros32_Table[64] = {
-    32, 8,  17, -1, -1, 14, -1, -1, -1, 20, -1, -1, -1, 28, -1, 18,
-    -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 0,  26, 25, 24,
-    4,  11, 23, 31, 3,  7,  10, 16, 22, 30, -1, -1, 2,  6,  13, 9,
-    -1, 15, -1, 21, -1, 29, 19, -1, -1, -1, -1, -1, 1,  27, 5,  12,
-};
diff --git a/submodules/libtgvoip/webrtc_dsp/common_audio/signal_processing/spl_sqrt.c b/submodules/libtgvoip/webrtc_dsp/common_audio/signal_processing/spl_sqrt.c
deleted file mode 100644
index cf9448ac97..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/common_audio/signal_processing/spl_sqrt.c
+++ /dev/null
@@ -1,194 +0,0 @@
-/*
- *  Copyright (c) 2011 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-
-/*
- * This file contains the function WebRtcSpl_Sqrt().
- * The description header can be found in signal_processing_library.h
- *
- */
-
-#include "rtc_base/checks.h"
-#include "common_audio/signal_processing/include/signal_processing_library.h"
-
-int32_t WebRtcSpl_SqrtLocal(int32_t in);
-
-int32_t WebRtcSpl_SqrtLocal(int32_t in)
-{
-
-    int16_t x_half, t16;
-    int32_t A, B, x2;
-
-    /* The following block performs:
-     y=in/2
-     x=y-2^30
-     x_half=x/2^31
-     t = 1 + (x_half) - 0.5*((x_half)^2) + 0.5*((x_half)^3) - 0.625*((x_half)^4)
-         + 0.875*((x_half)^5)
-     */
-
-    B = in / 2;
-
-    B = B - ((int32_t)0x40000000); // B = in/2 - 1/2
-    x_half = (int16_t)(B >> 16);  // x_half = x/2 = (in-1)/2
-    B = B + ((int32_t)0x40000000); // B = 1 + x/2
-    B = B + ((int32_t)0x40000000); // Add 0.5 twice (since 1.0 does not exist in Q31)
-
-    x2 = ((int32_t)x_half) * ((int32_t)x_half) * 2; // A = (x/2)^2
-    A = -x2; // A = -(x/2)^2
-    B = B + (A >> 1); // B = 1 + x/2 - 0.5*(x/2)^2
-
-    A >>= 16;
-    A = A * A * 2; // A = (x/2)^4
-    t16 = (int16_t)(A >> 16);
-    B += -20480 * t16 * 2;  // B = B - 0.625*A
-    // After this, B = 1 + x/2 - 0.5*(x/2)^2 - 0.625*(x/2)^4
-
-    A = x_half * t16 * 2;  // A = (x/2)^5
-    t16 = (int16_t)(A >> 16);
-    B += 28672 * t16 * 2;  // B = B + 0.875*A
-    // After this, B = 1 + x/2 - 0.5*(x/2)^2 - 0.625*(x/2)^4 + 0.875*(x/2)^5
-
-    t16 = (int16_t)(x2 >> 16);
-    A = x_half * t16 * 2;  // A = x/2^3
-
-    B = B + (A >> 1); // B = B + 0.5*A
-    // After this, B = 1 + x/2 - 0.5*(x/2)^2 + 0.5*(x/2)^3 - 0.625*(x/2)^4 + 0.875*(x/2)^5
-
-    B = B + ((int32_t)32768); // Round off bit
-
-    return B;
-}
-
-int32_t WebRtcSpl_Sqrt(int32_t value)
-{
-    /*
-     Algorithm:
-
-     Six term Taylor Series is used here to compute the square root of a number
-     y^0.5 = (1+x)^0.5 where x = y-1
-     = 1+(x/2)-0.5*((x/2)^2+0.5*((x/2)^3-0.625*((x/2)^4+0.875*((x/2)^5)
-     0.5 <= x < 1
-
-     Example of how the algorithm works, with ut=sqrt(in), and
-     with in=73632 and ut=271 (even shift value case):
-
-     in=73632
-     y= in/131072
-     x=y-1
-     t = 1 + (x/2) - 0.5*((x/2)^2) + 0.5*((x/2)^3) - 0.625*((x/2)^4) + 0.875*((x/2)^5)
-     ut=t*(1/sqrt(2))*512
-
-     or:
-
-     in=73632
-     in2=73632*2^14
-     y= in2/2^31
-     x=y-1
-     t = 1 + (x/2) - 0.5*((x/2)^2) + 0.5*((x/2)^3) - 0.625*((x/2)^4) + 0.875*((x/2)^5)
-     ut=t*(1/sqrt(2))
-     ut2=ut*2^9
-
-     which gives:
-
-     in  = 73632
-     in2 = 1206386688
-     y   = 0.56176757812500
-     x   = -0.43823242187500
-     t   = 0.74973506527313
-     ut  = 0.53014274874797
-     ut2 = 2.714330873589594e+002
-
-     or:
-
-     in=73632
-     in2=73632*2^14
-     y=in2/2
-     x=y-2^30
-     x_half=x/2^31
-     t = 1 + (x_half) - 0.5*((x_half)^2) + 0.5*((x_half)^3) - 0.625*((x_half)^4)
-         + 0.875*((x_half)^5)
-     ut=t*(1/sqrt(2))
-     ut2=ut*2^9
-
-     which gives:
-
-     in  = 73632
-     in2 = 1206386688
-     y   = 603193344
-     x   = -470548480
-     x_half =  -0.21911621093750
-     t   = 0.74973506527313
-     ut  = 0.53014274874797
-     ut2 = 2.714330873589594e+002
-
-     */
-
-    int16_t x_norm, nshift, t16, sh;
-    int32_t A;
-
-    int16_t k_sqrt_2 = 23170; // 1/sqrt2 (==5a82)
-
-    A = value;
-
-    // The convention in this function is to calculate sqrt(abs(A)). Negate the
-    // input if it is negative.
-    if (A < 0) {
-        if (A == WEBRTC_SPL_WORD32_MIN) {
-            // This number cannot be held in an int32_t after negating.
-            // Map it to the maximum positive value.
-            A = WEBRTC_SPL_WORD32_MAX;
-        } else {
-            A = -A;
-        }
-    } else if (A == 0) {
-        return 0;  // sqrt(0) = 0
-    }
-
-    sh = WebRtcSpl_NormW32(A); // # shifts to normalize A
-    A = WEBRTC_SPL_LSHIFT_W32(A, sh); // Normalize A
-    if (A < (WEBRTC_SPL_WORD32_MAX - 32767))
-    {
-        A = A + ((int32_t)32768); // Round off bit
-    } else
-    {
-        A = WEBRTC_SPL_WORD32_MAX;
-    }
-
-    x_norm = (int16_t)(A >> 16);  // x_norm = AH
-
-    nshift = (sh / 2);
-    RTC_DCHECK_GE(nshift, 0);
-
-    A = (int32_t)WEBRTC_SPL_LSHIFT_W32((int32_t)x_norm, 16);
-    A = WEBRTC_SPL_ABS_W32(A); // A = abs(x_norm<<16)
-    A = WebRtcSpl_SqrtLocal(A); // A = sqrt(A)
-
-    if (2 * nshift == sh) {
-        // Even shift value case
-
-        t16 = (int16_t)(A >> 16);  // t16 = AH
-
-        A = k_sqrt_2 * t16 * 2;  // A = 1/sqrt(2)*t16
-        A = A + ((int32_t)32768); // Round off
-        A = A & ((int32_t)0x7fff0000); // Round off
-
-        A >>= 15;  // A = A>>16
-
-    } else
-    {
-        A >>= 16;  // A = A>>16
-    }
-
-    A = A & ((int32_t)0x0000ffff);
-    A >>= nshift;  // De-normalize the result.
-
-    return A;
-}
diff --git a/submodules/libtgvoip/webrtc_dsp/common_audio/signal_processing/splitting_filter1.c b/submodules/libtgvoip/webrtc_dsp/common_audio/signal_processing/splitting_filter1.c
deleted file mode 100644
index 399433f0fb..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/common_audio/signal_processing/splitting_filter1.c
+++ /dev/null
@@ -1,207 +0,0 @@
-/*
- *  Copyright (c) 2011 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-/*
- * This file contains the splitting filter functions.
- *
- */
-
-#include "rtc_base/checks.h"
-#include "common_audio/signal_processing/include/signal_processing_library.h"
-
-// Maximum number of samples in a low/high-band frame.
-enum
-{
-    kMaxBandFrameLength = 320  // 10 ms at 64 kHz.
-};
-
-// QMF filter coefficients in Q16.
-static const uint16_t WebRtcSpl_kAllPassFilter1[3] = {6418, 36982, 57261};
-static const uint16_t WebRtcSpl_kAllPassFilter2[3] = {21333, 49062, 63010};
-
-///////////////////////////////////////////////////////////////////////////////////////////////
-// WebRtcSpl_AllPassQMF(...)
-//
-// Allpass filter used by the analysis and synthesis parts of the QMF filter.
-//
-// Input:
-//    - in_data             : Input data sequence (Q10)
-//    - data_length         : Length of data sequence (>2)
-//    - filter_coefficients : Filter coefficients (length 3, Q16)
-//
-// Input & Output:
-//    - filter_state        : Filter state (length 6, Q10).
-//
-// Output:
-//    - out_data            : Output data sequence (Q10), length equal to
-//                            |data_length|
-//
-
-void WebRtcSpl_AllPassQMF(int32_t* in_data, size_t data_length,
-                          int32_t* out_data, const uint16_t* filter_coefficients,
-                          int32_t* filter_state)
-{
-    // The procedure is to filter the input with three first order all pass filters
-    // (cascade operations).
-    //
-    //         a_3 + q^-1    a_2 + q^-1    a_1 + q^-1
-    // y[n] =  -----------   -----------   -----------   x[n]
-    //         1 + a_3q^-1   1 + a_2q^-1   1 + a_1q^-1
-    //
-    // The input vector |filter_coefficients| includes these three filter coefficients.
-    // The filter state contains the in_data state, in_data[-1], followed by
-    // the out_data state, out_data[-1]. This is repeated for each cascade.
-    // The first cascade filter will filter the |in_data| and store the output in
-    // |out_data|. The second will the take the |out_data| as input and make an
-    // intermediate storage in |in_data|, to save memory. The third, and final, cascade
-    // filter operation takes the |in_data| (which is the output from the previous cascade
-    // filter) and store the output in |out_data|.
-    // Note that the input vector values are changed during the process.
-    size_t k;
-    int32_t diff;
-    // First all-pass cascade; filter from in_data to out_data.
-
-    // Let y_i[n] indicate the output of cascade filter i (with filter coefficient a_i) at
-    // vector position n. Then the final output will be y[n] = y_3[n]
-
-    // First loop, use the states stored in memory.
-    // "diff" should be safe from wrap around since max values are 2^25
-    // diff = (x[0] - y_1[-1])
-    diff = WebRtcSpl_SubSatW32(in_data[0], filter_state[1]);
-    // y_1[0] =  x[-1] + a_1 * (x[0] - y_1[-1])
-    out_data[0] = WEBRTC_SPL_SCALEDIFF32(filter_coefficients[0], diff, filter_state[0]);
-
-    // For the remaining loops, use previous values.
-    for (k = 1; k < data_length; k++)
-    {
-        // diff = (x[n] - y_1[n-1])
-        diff = WebRtcSpl_SubSatW32(in_data[k], out_data[k - 1]);
-        // y_1[n] =  x[n-1] + a_1 * (x[n] - y_1[n-1])
-        out_data[k] = WEBRTC_SPL_SCALEDIFF32(filter_coefficients[0], diff, in_data[k - 1]);
-    }
-
-    // Update states.
-    filter_state[0] = in_data[data_length - 1]; // x[N-1], becomes x[-1] next time
-    filter_state[1] = out_data[data_length - 1]; // y_1[N-1], becomes y_1[-1] next time
-
-    // Second all-pass cascade; filter from out_data to in_data.
-    // diff = (y_1[0] - y_2[-1])
-    diff = WebRtcSpl_SubSatW32(out_data[0], filter_state[3]);
-    // y_2[0] =  y_1[-1] + a_2 * (y_1[0] - y_2[-1])
-    in_data[0] = WEBRTC_SPL_SCALEDIFF32(filter_coefficients[1], diff, filter_state[2]);
-    for (k = 1; k < data_length; k++)
-    {
-        // diff = (y_1[n] - y_2[n-1])
-        diff = WebRtcSpl_SubSatW32(out_data[k], in_data[k - 1]);
-        // y_2[0] =  y_1[-1] + a_2 * (y_1[0] - y_2[-1])
-        in_data[k] = WEBRTC_SPL_SCALEDIFF32(filter_coefficients[1], diff, out_data[k-1]);
-    }
-
-    filter_state[2] = out_data[data_length - 1]; // y_1[N-1], becomes y_1[-1] next time
-    filter_state[3] = in_data[data_length - 1]; // y_2[N-1], becomes y_2[-1] next time
-
-    // Third all-pass cascade; filter from in_data to out_data.
-    // diff = (y_2[0] - y[-1])
-    diff = WebRtcSpl_SubSatW32(in_data[0], filter_state[5]);
-    // y[0] =  y_2[-1] + a_3 * (y_2[0] - y[-1])
-    out_data[0] = WEBRTC_SPL_SCALEDIFF32(filter_coefficients[2], diff, filter_state[4]);
-    for (k = 1; k < data_length; k++)
-    {
-        // diff = (y_2[n] - y[n-1])
-        diff = WebRtcSpl_SubSatW32(in_data[k], out_data[k - 1]);
-        // y[n] =  y_2[n-1] + a_3 * (y_2[n] - y[n-1])
-        out_data[k] = WEBRTC_SPL_SCALEDIFF32(filter_coefficients[2], diff, in_data[k-1]);
-    }
-    filter_state[4] = in_data[data_length - 1]; // y_2[N-1], becomes y_2[-1] next time
-    filter_state[5] = out_data[data_length - 1]; // y[N-1], becomes y[-1] next time
-}
-
-void WebRtcSpl_AnalysisQMF(const int16_t* in_data, size_t in_data_length,
-                           int16_t* low_band, int16_t* high_band,
-                           int32_t* filter_state1, int32_t* filter_state2)
-{
-    size_t i;
-    int16_t k;
-    int32_t tmp;
-    int32_t half_in1[kMaxBandFrameLength];
-    int32_t half_in2[kMaxBandFrameLength];
-    int32_t filter1[kMaxBandFrameLength];
-    int32_t filter2[kMaxBandFrameLength];
-    const size_t band_length = in_data_length / 2;
-    RTC_DCHECK_EQ(0, in_data_length % 2);
-    RTC_DCHECK_LE(band_length, kMaxBandFrameLength);
-
-    // Split even and odd samples. Also shift them to Q10.
-    for (i = 0, k = 0; i < band_length; i++, k += 2)
-    {
-        half_in2[i] = ((int32_t)in_data[k]) * (1 << 10);
-        half_in1[i] = ((int32_t)in_data[k + 1]) * (1 << 10);
-    }
-
-    // All pass filter even and odd samples, independently.
-    WebRtcSpl_AllPassQMF(half_in1, band_length, filter1,
-                         WebRtcSpl_kAllPassFilter1, filter_state1);
-    WebRtcSpl_AllPassQMF(half_in2, band_length, filter2,
-                         WebRtcSpl_kAllPassFilter2, filter_state2);
-
-    // Take the sum and difference of filtered version of odd and even
-    // branches to get upper & lower band.
-    for (i = 0; i < band_length; i++)
-    {
-        tmp = (filter1[i] + filter2[i] + 1024) >> 11;
-        low_band[i] = WebRtcSpl_SatW32ToW16(tmp);
-
-        tmp = (filter1[i] - filter2[i] + 1024) >> 11;
-        high_band[i] = WebRtcSpl_SatW32ToW16(tmp);
-    }
-}
-
-void WebRtcSpl_SynthesisQMF(const int16_t* low_band, const int16_t* high_band,
-                            size_t band_length, int16_t* out_data,
-                            int32_t* filter_state1, int32_t* filter_state2)
-{
-    int32_t tmp;
-    int32_t half_in1[kMaxBandFrameLength];
-    int32_t half_in2[kMaxBandFrameLength];
-    int32_t filter1[kMaxBandFrameLength];
-    int32_t filter2[kMaxBandFrameLength];
-    size_t i;
-    int16_t k;
-    RTC_DCHECK_LE(band_length, kMaxBandFrameLength);
-
-    // Obtain the sum and difference channels out of upper and lower-band channels.
-    // Also shift to Q10 domain.
-    for (i = 0; i < band_length; i++)
-    {
-        tmp = (int32_t)low_band[i] + (int32_t)high_band[i];
-        half_in1[i] = tmp * (1 << 10);
-        tmp = (int32_t)low_band[i] - (int32_t)high_band[i];
-        half_in2[i] = tmp * (1 << 10);
-    }
-
-    // all-pass filter the sum and difference channels
-    WebRtcSpl_AllPassQMF(half_in1, band_length, filter1,
-                         WebRtcSpl_kAllPassFilter2, filter_state1);
-    WebRtcSpl_AllPassQMF(half_in2, band_length, filter2,
-                         WebRtcSpl_kAllPassFilter1, filter_state2);
-
-    // The filtered signals are even and odd samples of the output. Combine
-    // them. The signals are Q10 should shift them back to Q0 and take care of
-    // saturation.
-    for (i = 0, k = 0; i < band_length; i++)
-    {
-        tmp = (filter2[i] + 512) >> 10;
-        out_data[k++] = WebRtcSpl_SatW32ToW16(tmp);
-
-        tmp = (filter1[i] + 512) >> 10;
-        out_data[k++] = WebRtcSpl_SatW32ToW16(tmp);
-    }
-
-}
diff --git a/submodules/libtgvoip/webrtc_dsp/common_audio/signal_processing/sqrt_of_one_minus_x_squared.c b/submodules/libtgvoip/webrtc_dsp/common_audio/signal_processing/sqrt_of_one_minus_x_squared.c
deleted file mode 100644
index a77fd4063f..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/common_audio/signal_processing/sqrt_of_one_minus_x_squared.c
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- *  Copyright (c) 2011 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-
-/*
- * This file contains the function WebRtcSpl_SqrtOfOneMinusXSquared().
- * The description header can be found in signal_processing_library.h
- *
- */
-
-#include "common_audio/signal_processing/include/signal_processing_library.h"
-
-void WebRtcSpl_SqrtOfOneMinusXSquared(int16_t *xQ15, size_t vector_length,
-                                      int16_t *yQ15)
-{
-    int32_t sq;
-    size_t m;
-    int16_t tmp;
-
-    for (m = 0; m < vector_length; m++)
-    {
-        tmp = xQ15[m];
-        sq = tmp * tmp;  // x^2 in Q30
-        sq = 1073741823 - sq; // 1-x^2, where 1 ~= 0.99999999906 is 1073741823 in Q30
-        sq = WebRtcSpl_Sqrt(sq); // sqrt(1-x^2) in Q15
-        yQ15[m] = (int16_t)sq;
-    }
-}
diff --git a/submodules/libtgvoip/webrtc_dsp/common_audio/signal_processing/vector_scaling_operations.c b/submodules/libtgvoip/webrtc_dsp/common_audio/signal_processing/vector_scaling_operations.c
deleted file mode 100644
index 7307dc78ff..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/common_audio/signal_processing/vector_scaling_operations.c
+++ /dev/null
@@ -1,165 +0,0 @@
-/*
- *  Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-
-/*
- * This file contains implementations of the functions
- * WebRtcSpl_VectorBitShiftW16()
- * WebRtcSpl_VectorBitShiftW32()
- * WebRtcSpl_VectorBitShiftW32ToW16()
- * WebRtcSpl_ScaleVector()
- * WebRtcSpl_ScaleVectorWithSat()
- * WebRtcSpl_ScaleAndAddVectors()
- * WebRtcSpl_ScaleAndAddVectorsWithRoundC()
- */
-
-#include "common_audio/signal_processing/include/signal_processing_library.h"
-
-void WebRtcSpl_VectorBitShiftW16(int16_t *res, size_t length,
-                                 const int16_t *in, int16_t right_shifts)
-{
-    size_t i;
-
-    if (right_shifts > 0)
-    {
-        for (i = length; i > 0; i--)
-        {
-            (*res++) = ((*in++) >> right_shifts);
-        }
-    } else
-    {
-        for (i = length; i > 0; i--)
-        {
-            (*res++) = ((*in++) * (1 << (-right_shifts)));
-        }
-    }
-}
-
-void WebRtcSpl_VectorBitShiftW32(int32_t *out_vector,
-                                 size_t vector_length,
-                                 const int32_t *in_vector,
-                                 int16_t right_shifts)
-{
-    size_t i;
-
-    if (right_shifts > 0)
-    {
-        for (i = vector_length; i > 0; i--)
-        {
-            (*out_vector++) = ((*in_vector++) >> right_shifts);
-        }
-    } else
-    {
-        for (i = vector_length; i > 0; i--)
-        {
-            (*out_vector++) = ((*in_vector++) << (-right_shifts));
-        }
-    }
-}
-
-void WebRtcSpl_VectorBitShiftW32ToW16(int16_t* out, size_t length,
-                                      const int32_t* in, int right_shifts) {
-  size_t i;
-  int32_t tmp_w32;
-
-  if (right_shifts >= 0) {
-    for (i = length; i > 0; i--) {
-      tmp_w32 = (*in++) >> right_shifts;
-      (*out++) = WebRtcSpl_SatW32ToW16(tmp_w32);
-    }
-  } else {
-    int left_shifts = -right_shifts;
-    for (i = length; i > 0; i--) {
-      tmp_w32 = (*in++) << left_shifts;
-      (*out++) = WebRtcSpl_SatW32ToW16(tmp_w32);
-    }
-  }
-}
-
-void WebRtcSpl_ScaleVector(const int16_t *in_vector, int16_t *out_vector,
-                           int16_t gain, size_t in_vector_length,
-                           int16_t right_shifts)
-{
-    // Performs vector operation: out_vector = (gain*in_vector)>>right_shifts
-    size_t i;
-    const int16_t *inptr;
-    int16_t *outptr;
-
-    inptr = in_vector;
-    outptr = out_vector;
-
-    for (i = 0; i < in_vector_length; i++)
-    {
-      *outptr++ = (int16_t)((*inptr++ * gain) >> right_shifts);
-    }
-}
-
-void WebRtcSpl_ScaleVectorWithSat(const int16_t *in_vector, int16_t *out_vector,
-                                 int16_t gain, size_t in_vector_length,
-                                 int16_t right_shifts)
-{
-    // Performs vector operation: out_vector = (gain*in_vector)>>right_shifts
-    size_t i;
-    const int16_t *inptr;
-    int16_t *outptr;
-
-    inptr = in_vector;
-    outptr = out_vector;
-
-    for (i = 0; i < in_vector_length; i++) {
-      *outptr++ = WebRtcSpl_SatW32ToW16((*inptr++ * gain) >> right_shifts);
-    }
-}
-
-void WebRtcSpl_ScaleAndAddVectors(const int16_t *in1, int16_t gain1, int shift1,
-                                  const int16_t *in2, int16_t gain2, int shift2,
-                                  int16_t *out, size_t vector_length)
-{
-    // Performs vector operation: out = (gain1*in1)>>shift1 + (gain2*in2)>>shift2
-    size_t i;
-    const int16_t *in1ptr;
-    const int16_t *in2ptr;
-    int16_t *outptr;
-
-    in1ptr = in1;
-    in2ptr = in2;
-    outptr = out;
-
-    for (i = 0; i < vector_length; i++)
-    {
-      *outptr++ = (int16_t)((gain1 * *in1ptr++) >> shift1) +
-          (int16_t)((gain2 * *in2ptr++) >> shift2);
-    }
-}
-
-// C version of WebRtcSpl_ScaleAndAddVectorsWithRound() for generic platforms.
-int WebRtcSpl_ScaleAndAddVectorsWithRoundC(const int16_t* in_vector1,
-                                           int16_t in_vector1_scale,
-                                           const int16_t* in_vector2,
-                                           int16_t in_vector2_scale,
-                                           int right_shifts,
-                                           int16_t* out_vector,
-                                           size_t length) {
-  size_t i = 0;
-  int round_value = (1 << right_shifts) >> 1;
-
-  if (in_vector1 == NULL || in_vector2 == NULL || out_vector == NULL ||
-      length == 0 || right_shifts < 0) {
-    return -1;
-  }
-
-  for (i = 0; i < length; i++) {
-    out_vector[i] = (int16_t)((
-        in_vector1[i] * in_vector1_scale + in_vector2[i] * in_vector2_scale +
-        round_value) >> right_shifts);
-  }
-
-  return 0;
-}
diff --git a/submodules/libtgvoip/webrtc_dsp/common_audio/smoothing_filter.cc b/submodules/libtgvoip/webrtc_dsp/common_audio/smoothing_filter.cc
deleted file mode 100644
index 0d5aaa4854..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/common_audio/smoothing_filter.cc
+++ /dev/null
@@ -1,145 +0,0 @@
-/*
- *  Copyright (c) 2016 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#include "common_audio/smoothing_filter.h"
-
-#include <cmath>
-
-#include "rtc_base/checks.h"
-#include "rtc_base/timeutils.h"
-
-namespace webrtc {
-
-SmoothingFilterImpl::SmoothingFilterImpl(int init_time_ms)
-    : init_time_ms_(init_time_ms),
-      // Duing the initalization time, we use an increasing alpha. Specifically,
-      //   alpha(n) = exp(-powf(init_factor_, n)),
-      // where |init_factor_| is chosen such that
-      //   alpha(init_time_ms_) = exp(-1.0f / init_time_ms_),
-      init_factor_(init_time_ms_ == 0
-                       ? 0.0f
-                       : powf(init_time_ms_, -1.0f / init_time_ms_)),
-      // |init_const_| is to a factor to help the calculation during
-      // initialization phase.
-      init_const_(init_time_ms_ == 0
-                      ? 0.0f
-                      : init_time_ms_ -
-                            powf(init_time_ms_, 1.0f - 1.0f / init_time_ms_)) {
-  UpdateAlpha(init_time_ms_);
-}
-
-SmoothingFilterImpl::~SmoothingFilterImpl() = default;
-
-void SmoothingFilterImpl::AddSample(float sample) {
-  const int64_t now_ms = rtc::TimeMillis();
-
-  if (!init_end_time_ms_) {
-    // This is equivalent to assuming the filter has been receiving the same
-    // value as the first sample since time -infinity.
-    state_ = last_sample_ = sample;
-    init_end_time_ms_ = now_ms + init_time_ms_;
-    last_state_time_ms_ = now_ms;
-    return;
-  }
-
-  ExtrapolateLastSample(now_ms);
-  last_sample_ = sample;
-}
-
-absl::optional<float> SmoothingFilterImpl::GetAverage() {
-  if (!init_end_time_ms_) {
-    // |init_end_time_ms_| undefined since we have not received any sample.
-    return absl::nullopt;
-  }
-  ExtrapolateLastSample(rtc::TimeMillis());
-  return state_;
-}
-
-bool SmoothingFilterImpl::SetTimeConstantMs(int time_constant_ms) {
-  if (!init_end_time_ms_ || last_state_time_ms_ < *init_end_time_ms_) {
-    return false;
-  }
-  UpdateAlpha(time_constant_ms);
-  return true;
-}
-
-void SmoothingFilterImpl::UpdateAlpha(int time_constant_ms) {
-  alpha_ = time_constant_ms == 0 ? 0.0f : exp(-1.0f / time_constant_ms);
-}
-
-void SmoothingFilterImpl::ExtrapolateLastSample(int64_t time_ms) {
-  RTC_DCHECK_GE(time_ms, last_state_time_ms_);
-  RTC_DCHECK(init_end_time_ms_);
-
-  float multiplier = 0.0f;
-
-  if (time_ms <= *init_end_time_ms_) {
-    // Current update is to be made during initialization phase.
-    // We update the state as if the |alpha| has been increased according
-    //   alpha(n) = exp(-powf(init_factor_, n)),
-    // where n is the time (in millisecond) since the first sample received.
-    // With algebraic derivation as shown in the Appendix, we can find that the
-    // state can be updated in a similar manner as if alpha is a constant,
-    // except for a different multiplier.
-    if (init_time_ms_ == 0) {
-      // This means |init_factor_| = 0.
-      multiplier = 0.0f;
-    } else if (init_time_ms_ == 1) {
-      // This means |init_factor_| = 1.
-      multiplier = exp(last_state_time_ms_ - time_ms);
-    } else {
-      multiplier =
-          exp(-(powf(init_factor_, last_state_time_ms_ - *init_end_time_ms_) -
-                powf(init_factor_, time_ms - *init_end_time_ms_)) /
-              init_const_);
-    }
-  } else {
-    if (last_state_time_ms_ < *init_end_time_ms_) {
-      // The latest state update was made during initialization phase.
-      // We first extrapolate to the initialization time.
-      ExtrapolateLastSample(*init_end_time_ms_);
-      // Then extrapolate the rest by the following.
-    }
-    multiplier = powf(alpha_, time_ms - last_state_time_ms_);
-  }
-
-  state_ = multiplier * state_ + (1.0f - multiplier) * last_sample_;
-  last_state_time_ms_ = time_ms;
-}
-
-}  // namespace webrtc
-
-// Appendix: derivation of extrapolation during initialization phase.
-// (LaTeX syntax)
-// Assuming
-//   \begin{align}
-//     y(n) &= \alpha_{n-1} y(n-1) + \left(1 - \alpha_{n-1}\right) x(m) \\*
-//          &= \left(\prod_{i=m}^{n-1} \alpha_i\right) y(m) +
-//             \left(1 - \prod_{i=m}^{n-1} \alpha_i \right) x(m)
-//   \end{align}
-// Taking $\alpha_{n} = \exp(-\gamma^n)$, $\gamma$ denotes init\_factor\_, the
-// multiplier becomes
-//   \begin{align}
-//     \prod_{i=m}^{n-1} \alpha_i
-//     &= \exp\left(-\sum_{i=m}^{n-1} \gamma^i \right) \\*
-//     &= \begin{cases}
-//          \exp\left(-\frac{\gamma^m - \gamma^n}{1 - \gamma} \right)
-//          & \gamma \neq 1 \\*
-//          m-n & \gamma = 1
-//        \end{cases}
-//   \end{align}
-// We know $\gamma = T^{-\frac{1}{T}}$, where $T$ denotes init\_time\_ms\_. Then
-// $1 - \gamma$ approaches zero when $T$ increases. This can cause numerical
-// difficulties. We multiply $T$ (if $T > 0$) to both numerator and denominator
-// in the fraction. See.
-//   \begin{align}
-//     \frac{\gamma^m - \gamma^n}{1 - \gamma}
-//     &= \frac{T^\frac{T-m}{T} - T^\frac{T-n}{T}}{T - T^{1-\frac{1}{T}}}
-//   \end{align}
diff --git a/submodules/libtgvoip/webrtc_dsp/common_audio/smoothing_filter.h b/submodules/libtgvoip/webrtc_dsp/common_audio/smoothing_filter.h
deleted file mode 100644
index c467d85426..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/common_audio/smoothing_filter.h
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- *  Copyright (c) 2016 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#ifndef COMMON_AUDIO_SMOOTHING_FILTER_H_
-#define COMMON_AUDIO_SMOOTHING_FILTER_H_
-
-#include <stdint.h>
-
-#include "absl/types/optional.h"
-#include "rtc_base/constructormagic.h"
-
-namespace webrtc {
-
-class SmoothingFilter {
- public:
-  virtual ~SmoothingFilter() = default;
-  virtual void AddSample(float sample) = 0;
-  virtual absl::optional<float> GetAverage() = 0;
-  virtual bool SetTimeConstantMs(int time_constant_ms) = 0;
-};
-
-// SmoothingFilterImpl applies an exponential filter
-//   alpha = exp(-1.0 / time_constant_ms);
-//   y[t] = alpha * y[t-1] + (1 - alpha) * sample;
-// This implies a sample rate of 1000 Hz, i.e., 1 sample / ms.
-// But SmoothingFilterImpl allows sparse samples. All missing samples will be
-// assumed to equal the last received sample.
-class SmoothingFilterImpl final : public SmoothingFilter {
- public:
-  // |init_time_ms| is initialization time. It defines a period starting from
-  // the arriving time of the first sample. During this period, the exponential
-  // filter uses a varying time constant so that a smaller time constant will be
-  // applied to the earlier samples. This is to allow the the filter to adapt to
-  // earlier samples quickly. After the initialization period, the time constant
-  // will be set to |init_time_ms| first and can be changed through
-  // |SetTimeConstantMs|.
-  explicit SmoothingFilterImpl(int init_time_ms);
-  ~SmoothingFilterImpl() override;
-
-  void AddSample(float sample) override;
-  absl::optional<float> GetAverage() override;
-  bool SetTimeConstantMs(int time_constant_ms) override;
-
-  // Methods used for unittests.
-  float alpha() const { return alpha_; }
-
- private:
-  void UpdateAlpha(int time_constant_ms);
-  void ExtrapolateLastSample(int64_t time_ms);
-
-  const int init_time_ms_;
-  const float init_factor_;
-  const float init_const_;
-
-  absl::optional<int64_t> init_end_time_ms_;
-  float last_sample_;
-  float alpha_;
-  float state_;
-  int64_t last_state_time_ms_;
-
-  RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(SmoothingFilterImpl);
-};
-
-}  // namespace webrtc
-
-#endif  // COMMON_AUDIO_SMOOTHING_FILTER_H_
diff --git a/submodules/libtgvoip/webrtc_dsp/common_audio/sparse_fir_filter.cc b/submodules/libtgvoip/webrtc_dsp/common_audio/sparse_fir_filter.cc
deleted file mode 100644
index 0fc032722e..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/common_audio/sparse_fir_filter.cc
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- *  Copyright (c) 2015 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#include "common_audio/sparse_fir_filter.h"
-
-#include "rtc_base/checks.h"
-
-namespace webrtc {
-
-SparseFIRFilter::SparseFIRFilter(const float* nonzero_coeffs,
-                                 size_t num_nonzero_coeffs,
-                                 size_t sparsity,
-                                 size_t offset)
-    : sparsity_(sparsity),
-      offset_(offset),
-      nonzero_coeffs_(nonzero_coeffs, nonzero_coeffs + num_nonzero_coeffs),
-      state_(sparsity_ * (num_nonzero_coeffs - 1) + offset_, 0.f) {
-  RTC_CHECK_GE(num_nonzero_coeffs, 1);
-  RTC_CHECK_GE(sparsity, 1);
-}
-
-SparseFIRFilter::~SparseFIRFilter() = default;
-
-void SparseFIRFilter::Filter(const float* in, size_t length, float* out) {
-  // Convolves the input signal |in| with the filter kernel |nonzero_coeffs_|
-  // taking into account the previous state.
-  for (size_t i = 0; i < length; ++i) {
-    out[i] = 0.f;
-    size_t j;
-    for (j = 0; i >= j * sparsity_ + offset_ && j < nonzero_coeffs_.size();
-         ++j) {
-      out[i] += in[i - j * sparsity_ - offset_] * nonzero_coeffs_[j];
-    }
-    for (; j < nonzero_coeffs_.size(); ++j) {
-      out[i] += state_[i + (nonzero_coeffs_.size() - j - 1) * sparsity_] *
-                nonzero_coeffs_[j];
-    }
-  }
-
-  // Update current state.
-  if (state_.size() > 0u) {
-    if (length >= state_.size()) {
-      std::memcpy(&state_[0], &in[length - state_.size()],
-                  state_.size() * sizeof(*in));
-    } else {
-      std::memmove(&state_[0], &state_[length],
-                   (state_.size() - length) * sizeof(state_[0]));
-      std::memcpy(&state_[state_.size() - length], in, length * sizeof(*in));
-    }
-  }
-}
-
-}  // namespace webrtc
diff --git a/submodules/libtgvoip/webrtc_dsp/common_audio/sparse_fir_filter.h b/submodules/libtgvoip/webrtc_dsp/common_audio/sparse_fir_filter.h
deleted file mode 100644
index 22bcdff788..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/common_audio/sparse_fir_filter.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- *  Copyright (c) 2015 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#ifndef COMMON_AUDIO_SPARSE_FIR_FILTER_H_
-#define COMMON_AUDIO_SPARSE_FIR_FILTER_H_
-
-#include <cstring>
-#include <vector>
-
-#include "rtc_base/constructormagic.h"
-
-namespace webrtc {
-
-// A Finite Impulse Response filter implementation which takes advantage of a
-// sparse structure with uniformly distributed non-zero coefficients.
-class SparseFIRFilter final {
- public:
-  // |num_nonzero_coeffs| is the number of non-zero coefficients,
-  // |nonzero_coeffs|. They are assumed to be uniformly distributed every
-  // |sparsity| samples and with an initial |offset|. The rest of the filter
-  // coefficients will be assumed zeros. For example, with sparsity = 3, and
-  // offset = 1 the filter coefficients will be:
-  // B = [0 coeffs[0] 0 0 coeffs[1] 0 0 coeffs[2] ... ]
-  // All initial state values will be zeros.
-  SparseFIRFilter(const float* nonzero_coeffs,
-                  size_t num_nonzero_coeffs,
-                  size_t sparsity,
-                  size_t offset);
-  ~SparseFIRFilter();
-
-  // Filters the |in| data supplied.
-  // |out| must be previously allocated and it must be at least of |length|.
-  void Filter(const float* in, size_t length, float* out);
-
- private:
-  const size_t sparsity_;
-  const size_t offset_;
-  const std::vector<float> nonzero_coeffs_;
-  std::vector<float> state_;
-
-  RTC_DISALLOW_COPY_AND_ASSIGN(SparseFIRFilter);
-};
-
-}  // namespace webrtc
-
-#endif  // COMMON_AUDIO_SPARSE_FIR_FILTER_H_
diff --git a/submodules/libtgvoip/webrtc_dsp/common_audio/third_party/fft4g/fft4g.c b/submodules/libtgvoip/webrtc_dsp/common_audio/third_party/fft4g/fft4g.c
deleted file mode 100644
index 9cf7b9f6ca..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/common_audio/third_party/fft4g/fft4g.c
+++ /dev/null
@@ -1,1332 +0,0 @@
-/*
- * http://www.kurims.kyoto-u.ac.jp/~ooura/fft.html
- * Copyright Takuya OOURA, 1996-2001
- *
- * You may use, copy, modify and distribute this code for any purpose (include
- * commercial use) and without fee. Please refer to this package when you modify
- * this code.
- *
- * Changes:
- * Trivial type modifications by the WebRTC authors.
- */
-
-/*
-Fast Fourier/Cosine/Sine Transform
-    dimension   :one
-    data length :power of 2
-    decimation  :frequency
-    radix       :4, 2
-    data        :inplace
-    table       :use
-functions
-    cdft: Complex Discrete Fourier Transform
-    rdft: Real Discrete Fourier Transform
-    ddct: Discrete Cosine Transform
-    ddst: Discrete Sine Transform
-    dfct: Cosine Transform of RDFT (Real Symmetric DFT)
-    dfst: Sine Transform of RDFT (Real Anti-symmetric DFT)
-function prototypes
-    void cdft(int, int, float *, int *, float *);
-    void rdft(size_t, int, float *, size_t *, float *);
-    void ddct(int, int, float *, int *, float *);
-    void ddst(int, int, float *, int *, float *);
-    void dfct(int, float *, float *, int *, float *);
-    void dfst(int, float *, float *, int *, float *);
-
-
--------- Complex DFT (Discrete Fourier Transform) --------
-    [definition]
-        <case1>
-            X[k] = sum_j=0^n-1 x[j]*exp(2*pi*i*j*k/n), 0<=k<n
-        <case2>
-            X[k] = sum_j=0^n-1 x[j]*exp(-2*pi*i*j*k/n), 0<=k<n
-        (notes: sum_j=0^n-1 is a summation from j=0 to n-1)
-    [usage]
-        <case1>
-            ip[0] = 0; // first time only
-            cdft(2*n, 1, a, ip, w);
-        <case2>
-            ip[0] = 0; // first time only
-            cdft(2*n, -1, a, ip, w);
-    [parameters]
-        2*n            :data length (int)
-                        n >= 1, n = power of 2
-        a[0...2*n-1]   :input/output data (float *)
-                        input data
-                            a[2*j] = Re(x[j]),
-                            a[2*j+1] = Im(x[j]), 0<=j<n
-                        output data
-                            a[2*k] = Re(X[k]),
-                            a[2*k+1] = Im(X[k]), 0<=k<n
-        ip[0...*]      :work area for bit reversal (int *)
-                        length of ip >= 2+sqrt(n)
-                        strictly,
-                        length of ip >=
-                            2+(1<<(int)(log(n+0.5)/log(2))/2).
-                        ip[0],ip[1] are pointers of the cos/sin table.
-        w[0...n/2-1]   :cos/sin table (float *)
-                        w[],ip[] are initialized if ip[0] == 0.
-    [remark]
-        Inverse of
-            cdft(2*n, -1, a, ip, w);
-        is
-            cdft(2*n, 1, a, ip, w);
-            for (j = 0; j <= 2 * n - 1; j++) {
-                a[j] *= 1.0 / n;
-            }
-        .
-
-
--------- Real DFT / Inverse of Real DFT --------
-    [definition]
-        <case1> RDFT
-            R[k] = sum_j=0^n-1 a[j]*cos(2*pi*j*k/n), 0<=k<=n/2
-            I[k] = sum_j=0^n-1 a[j]*sin(2*pi*j*k/n), 0<k<n/2
-        <case2> IRDFT (excluding scale)
-            a[k] = (R[0] + R[n/2]*cos(pi*k))/2 +
-                   sum_j=1^n/2-1 R[j]*cos(2*pi*j*k/n) +
-                   sum_j=1^n/2-1 I[j]*sin(2*pi*j*k/n), 0<=k<n
-    [usage]
-        <case1>
-            ip[0] = 0; // first time only
-            rdft(n, 1, a, ip, w);
-        <case2>
-            ip[0] = 0; // first time only
-            rdft(n, -1, a, ip, w);
-    [parameters]
-        n              :data length (size_t)
-                        n >= 2, n = power of 2
-        a[0...n-1]     :input/output data (float *)
-                        <case1>
-                            output data
-                                a[2*k] = R[k], 0<=k<n/2
-                                a[2*k+1] = I[k], 0<k<n/2
-                                a[1] = R[n/2]
-                        <case2>
-                            input data
-                                a[2*j] = R[j], 0<=j<n/2
-                                a[2*j+1] = I[j], 0<j<n/2
-                                a[1] = R[n/2]
-        ip[0...*]      :work area for bit reversal (size_t *)
-                        length of ip >= 2+sqrt(n/2)
-                        strictly,
-                        length of ip >=
-                            2+(1<<(int)(log(n/2+0.5)/log(2))/2).
-                        ip[0],ip[1] are pointers of the cos/sin table.
-        w[0...n/2-1]   :cos/sin table (float *)
-                        w[],ip[] are initialized if ip[0] == 0.
-    [remark]
-        Inverse of
-            rdft(n, 1, a, ip, w);
-        is
-            rdft(n, -1, a, ip, w);
-            for (j = 0; j <= n - 1; j++) {
-                a[j] *= 2.0 / n;
-            }
-        .
-
-
--------- DCT (Discrete Cosine Transform) / Inverse of DCT --------
-    [definition]
-        <case1> IDCT (excluding scale)
-            C[k] = sum_j=0^n-1 a[j]*cos(pi*j*(k+1/2)/n), 0<=k<n
-        <case2> DCT
-            C[k] = sum_j=0^n-1 a[j]*cos(pi*(j+1/2)*k/n), 0<=k<n
-    [usage]
-        <case1>
-            ip[0] = 0; // first time only
-            ddct(n, 1, a, ip, w);
-        <case2>
-            ip[0] = 0; // first time only
-            ddct(n, -1, a, ip, w);
-    [parameters]
-        n              :data length (int)
-                        n >= 2, n = power of 2
-        a[0...n-1]     :input/output data (float *)
-                        output data
-                            a[k] = C[k], 0<=k<n
-        ip[0...*]      :work area for bit reversal (int *)
-                        length of ip >= 2+sqrt(n/2)
-                        strictly,
-                        length of ip >=
-                            2+(1<<(int)(log(n/2+0.5)/log(2))/2).
-                        ip[0],ip[1] are pointers of the cos/sin table.
-        w[0...n*5/4-1] :cos/sin table (float *)
-                        w[],ip[] are initialized if ip[0] == 0.
-    [remark]
-        Inverse of
-            ddct(n, -1, a, ip, w);
-        is
-            a[0] *= 0.5;
-            ddct(n, 1, a, ip, w);
-            for (j = 0; j <= n - 1; j++) {
-                a[j] *= 2.0 / n;
-            }
-        .
-
-
--------- DST (Discrete Sine Transform) / Inverse of DST --------
-    [definition]
-        <case1> IDST (excluding scale)
-            S[k] = sum_j=1^n A[j]*sin(pi*j*(k+1/2)/n), 0<=k<n
-        <case2> DST
-            S[k] = sum_j=0^n-1 a[j]*sin(pi*(j+1/2)*k/n), 0<k<=n
-    [usage]
-        <case1>
-            ip[0] = 0; // first time only
-            ddst(n, 1, a, ip, w);
-        <case2>
-            ip[0] = 0; // first time only
-            ddst(n, -1, a, ip, w);
-    [parameters]
-        n              :data length (int)
-                        n >= 2, n = power of 2
-        a[0...n-1]     :input/output data (float *)
-                        <case1>
-                            input data
-                                a[j] = A[j], 0<j<n
-                                a[0] = A[n]
-                            output data
-                                a[k] = S[k], 0<=k<n
-                        <case2>
-                            output data
-                                a[k] = S[k], 0<k<n
-                                a[0] = S[n]
-        ip[0...*]      :work area for bit reversal (int *)
-                        length of ip >= 2+sqrt(n/2)
-                        strictly,
-                        length of ip >=
-                            2+(1<<(int)(log(n/2+0.5)/log(2))/2).
-                        ip[0],ip[1] are pointers of the cos/sin table.
-        w[0...n*5/4-1] :cos/sin table (float *)
-                        w[],ip[] are initialized if ip[0] == 0.
-    [remark]
-        Inverse of
-            ddst(n, -1, a, ip, w);
-        is
-            a[0] *= 0.5;
-            ddst(n, 1, a, ip, w);
-            for (j = 0; j <= n - 1; j++) {
-                a[j] *= 2.0 / n;
-            }
-        .
-
-
--------- Cosine Transform of RDFT (Real Symmetric DFT) --------
-    [definition]
-        C[k] = sum_j=0^n a[j]*cos(pi*j*k/n), 0<=k<=n
-    [usage]
-        ip[0] = 0; // first time only
-        dfct(n, a, t, ip, w);
-    [parameters]
-        n              :data length - 1 (int)
-                        n >= 2, n = power of 2
-        a[0...n]       :input/output data (float *)
-                        output data
-                            a[k] = C[k], 0<=k<=n
-        t[0...n/2]     :work area (float *)
-        ip[0...*]      :work area for bit reversal (int *)
-                        length of ip >= 2+sqrt(n/4)
-                        strictly,
-                        length of ip >=
-                            2+(1<<(int)(log(n/4+0.5)/log(2))/2).
-                        ip[0],ip[1] are pointers of the cos/sin table.
-        w[0...n*5/8-1] :cos/sin table (float *)
-                        w[],ip[] are initialized if ip[0] == 0.
-    [remark]
-        Inverse of
-            a[0] *= 0.5;
-            a[n] *= 0.5;
-            dfct(n, a, t, ip, w);
-        is
-            a[0] *= 0.5;
-            a[n] *= 0.5;
-            dfct(n, a, t, ip, w);
-            for (j = 0; j <= n; j++) {
-                a[j] *= 2.0 / n;
-            }
-        .
-
-
--------- Sine Transform of RDFT (Real Anti-symmetric DFT) --------
-    [definition]
-        S[k] = sum_j=1^n-1 a[j]*sin(pi*j*k/n), 0<k<n
-    [usage]
-        ip[0] = 0; // first time only
-        dfst(n, a, t, ip, w);
-    [parameters]
-        n              :data length + 1 (int)
-                        n >= 2, n = power of 2
-        a[0...n-1]     :input/output data (float *)
-                        output data
-                            a[k] = S[k], 0<k<n
-                        (a[0] is used for work area)
-        t[0...n/2-1]   :work area (float *)
-        ip[0...*]      :work area for bit reversal (int *)
-                        length of ip >= 2+sqrt(n/4)
-                        strictly,
-                        length of ip >=
-                            2+(1<<(int)(log(n/4+0.5)/log(2))/2).
-                        ip[0],ip[1] are pointers of the cos/sin table.
-        w[0...n*5/8-1] :cos/sin table (float *)
-                        w[],ip[] are initialized if ip[0] == 0.
-    [remark]
-        Inverse of
-            dfst(n, a, t, ip, w);
-        is
-            dfst(n, a, t, ip, w);
-            for (j = 1; j <= n - 1; j++) {
-                a[j] *= 2.0 / n;
-            }
-        .
-
-
-Appendix :
-    The cos/sin table is recalculated when the larger table required.
-    w[] and ip[] are compatible with all routines.
-*/
-
-#include <stddef.h>
-
-static void makewt(size_t nw, size_t *ip, float *w);
-static void makect(size_t nc, size_t *ip, float *c);
-static void bitrv2(size_t n, size_t *ip, float *a);
-#if 0  // Not used.
-static void bitrv2conj(int n, int *ip, float *a);
-#endif
-static void cftfsub(size_t n, float *a, float *w);
-static void cftbsub(size_t n, float *a, float *w);
-static void cft1st(size_t n, float *a, float *w);
-static void cftmdl(size_t n, size_t l, float *a, float *w);
-static void rftfsub(size_t n, float *a, size_t nc, float *c);
-static void rftbsub(size_t n, float *a, size_t nc, float *c);
-#if 0  // Not used.
-static void dctsub(int n, float *a, int nc, float *c)
-static void dstsub(int n, float *a, int nc, float *c)
-#endif
-
-
-#if 0  // Not used.
-void WebRtc_cdft(int n, int isgn, float *a, int *ip, float *w)
-{
-    if (n > (ip[0] << 2)) {
-        makewt(n >> 2, ip, w);
-    }
-    if (n > 4) {
-        if (isgn >= 0) {
-            bitrv2(n, ip + 2, a);
-            cftfsub(n, a, w);
-        } else {
-            bitrv2conj(n, ip + 2, a);
-            cftbsub(n, a, w);
-        }
-    } else if (n == 4) {
-        cftfsub(n, a, w);
-    }
-}
-#endif
-
-
-void WebRtc_rdft(size_t n, int isgn, float *a, size_t *ip, float *w)
-{
-    size_t nw, nc;
-    float xi;
-
-    nw = ip[0];
-    if (n > (nw << 2)) {
-        nw = n >> 2;
-        makewt(nw, ip, w);
-    }
-    nc = ip[1];
-    if (n > (nc << 2)) {
-        nc = n >> 2;
-        makect(nc, ip, w + nw);
-    }
-    if (isgn >= 0) {
-        if (n > 4) {
-            bitrv2(n, ip + 2, a);
-            cftfsub(n, a, w);
-            rftfsub(n, a, nc, w + nw);
-        } else if (n == 4) {
-            cftfsub(n, a, w);
-        }
-        xi = a[0] - a[1];
-        a[0] += a[1];
-        a[1] = xi;
-    } else {
-        a[1] = 0.5f * (a[0] - a[1]);
-        a[0] -= a[1];
-        if (n > 4) {
-            rftbsub(n, a, nc, w + nw);
-            bitrv2(n, ip + 2, a);
-            cftbsub(n, a, w);
-        } else if (n == 4) {
-            cftfsub(n, a, w);
-        }
-    }
-}
-
-#if 0  // Not used.
-static void ddct(int n, int isgn, float *a, int *ip, float *w)
-{
-    int j, nw, nc;
-    float xr;
-
-    nw = ip[0];
-    if (n > (nw << 2)) {
-        nw = n >> 2;
-        makewt(nw, ip, w);
-    }
-    nc = ip[1];
-    if (n > nc) {
-        nc = n;
-        makect(nc, ip, w + nw);
-    }
-    if (isgn < 0) {
-        xr = a[n - 1];
-        for (j = n - 2; j >= 2; j -= 2) {
-            a[j + 1] = a[j] - a[j - 1];
-            a[j] += a[j - 1];
-        }
-        a[1] = a[0] - xr;
-        a[0] += xr;
-        if (n > 4) {
-            rftbsub(n, a, nc, w + nw);
-            bitrv2(n, ip + 2, a);
-            cftbsub(n, a, w);
-        } else if (n == 4) {
-            cftfsub(n, a, w);
-        }
-    }
-    dctsub(n, a, nc, w + nw);
-    if (isgn >= 0) {
-        if (n > 4) {
-            bitrv2(n, ip + 2, a);
-            cftfsub(n, a, w);
-            rftfsub(n, a, nc, w + nw);
-        } else if (n == 4) {
-            cftfsub(n, a, w);
-        }
-        xr = a[0] - a[1];
-        a[0] += a[1];
-        for (j = 2; j < n; j += 2) {
-            a[j - 1] = a[j] - a[j + 1];
-            a[j] += a[j + 1];
-        }
-        a[n - 1] = xr;
-    }
-}
-
-
-static void ddst(int n, int isgn, float *a, int *ip, float *w)
-{
-    int j, nw, nc;
-    float xr;
-
-    nw = ip[0];
-    if (n > (nw << 2)) {
-        nw = n >> 2;
-        makewt(nw, ip, w);
-    }
-    nc = ip[1];
-    if (n > nc) {
-        nc = n;
-        makect(nc, ip, w + nw);
-    }
-    if (isgn < 0) {
-        xr = a[n - 1];
-        for (j = n - 2; j >= 2; j -= 2) {
-            a[j + 1] = -a[j] - a[j - 1];
-            a[j] -= a[j - 1];
-        }
-        a[1] = a[0] + xr;
-        a[0] -= xr;
-        if (n > 4) {
-            rftbsub(n, a, nc, w + nw);
-            bitrv2(n, ip + 2, a);
-            cftbsub(n, a, w);
-        } else if (n == 4) {
-            cftfsub(n, a, w);
-        }
-    }
-    dstsub(n, a, nc, w + nw);
-    if (isgn >= 0) {
-        if (n > 4) {
-            bitrv2(n, ip + 2, a);
-            cftfsub(n, a, w);
-            rftfsub(n, a, nc, w + nw);
-        } else if (n == 4) {
-            cftfsub(n, a, w);
-        }
-        xr = a[0] - a[1];
-        a[0] += a[1];
-        for (j = 2; j < n; j += 2) {
-            a[j - 1] = -a[j] - a[j + 1];
-            a[j] -= a[j + 1];
-        }
-        a[n - 1] = -xr;
-    }
-}
-
-
-static void dfct(int n, float *a, float *t, int *ip, float *w)
-{
-    int j, k, l, m, mh, nw, nc;
-    float xr, xi, yr, yi;
-
-    nw = ip[0];
-    if (n > (nw << 3)) {
-        nw = n >> 3;
-        makewt(nw, ip, w);
-    }
-    nc = ip[1];
-    if (n > (nc << 1)) {
-        nc = n >> 1;
-        makect(nc, ip, w + nw);
-    }
-    m = n >> 1;
-    yi = a[m];
-    xi = a[0] + a[n];
-    a[0] -= a[n];
-    t[0] = xi - yi;
-    t[m] = xi + yi;
-    if (n > 2) {
-        mh = m >> 1;
-        for (j = 1; j < mh; j++) {
-            k = m - j;
-            xr = a[j] - a[n - j];
-            xi = a[j] + a[n - j];
-            yr = a[k] - a[n - k];
-            yi = a[k] + a[n - k];
-            a[j] = xr;
-            a[k] = yr;
-            t[j] = xi - yi;
-            t[k] = xi + yi;
-        }
-        t[mh] = a[mh] + a[n - mh];
-        a[mh] -= a[n - mh];
-        dctsub(m, a, nc, w + nw);
-        if (m > 4) {
-            bitrv2(m, ip + 2, a);
-            cftfsub(m, a, w);
-            rftfsub(m, a, nc, w + nw);
-        } else if (m == 4) {
-            cftfsub(m, a, w);
-        }
-        a[n - 1] = a[0] - a[1];
-        a[1] = a[0] + a[1];
-        for (j = m - 2; j >= 2; j -= 2) {
-            a[2 * j + 1] = a[j] + a[j + 1];
-            a[2 * j - 1] = a[j] - a[j + 1];
-        }
-        l = 2;
-        m = mh;
-        while (m >= 2) {
-            dctsub(m, t, nc, w + nw);
-            if (m > 4) {
-                bitrv2(m, ip + 2, t);
-                cftfsub(m, t, w);
-                rftfsub(m, t, nc, w + nw);
-            } else if (m == 4) {
-                cftfsub(m, t, w);
-            }
-            a[n - l] = t[0] - t[1];
-            a[l] = t[0] + t[1];
-            k = 0;
-            for (j = 2; j < m; j += 2) {
-                k += l << 2;
-                a[k - l] = t[j] - t[j + 1];
-                a[k + l] = t[j] + t[j + 1];
-            }
-            l <<= 1;
-            mh = m >> 1;
-            for (j = 0; j < mh; j++) {
-                k = m - j;
-                t[j] = t[m + k] - t[m + j];
-                t[k] = t[m + k] + t[m + j];
-            }
-            t[mh] = t[m + mh];
-            m = mh;
-        }
-        a[l] = t[0];
-        a[n] = t[2] - t[1];
-        a[0] = t[2] + t[1];
-    } else {
-        a[1] = a[0];
-        a[2] = t[0];
-        a[0] = t[1];
-    }
-}
-
-static void dfst(int n, float *a, float *t, int *ip, float *w)
-{
-    int j, k, l, m, mh, nw, nc;
-    float xr, xi, yr, yi;
-
-    nw = ip[0];
-    if (n > (nw << 3)) {
-        nw = n >> 3;
-        makewt(nw, ip, w);
-    }
-    nc = ip[1];
-    if (n > (nc << 1)) {
-        nc = n >> 1;
-        makect(nc, ip, w + nw);
-    }
-    if (n > 2) {
-        m = n >> 1;
-        mh = m >> 1;
-        for (j = 1; j < mh; j++) {
-            k = m - j;
-            xr = a[j] + a[n - j];
-            xi = a[j] - a[n - j];
-            yr = a[k] + a[n - k];
-            yi = a[k] - a[n - k];
-            a[j] = xr;
-            a[k] = yr;
-            t[j] = xi + yi;
-            t[k] = xi - yi;
-        }
-        t[0] = a[mh] - a[n - mh];
-        a[mh] += a[n - mh];
-        a[0] = a[m];
-        dstsub(m, a, nc, w + nw);
-        if (m > 4) {
-            bitrv2(m, ip + 2, a);
-            cftfsub(m, a, w);
-            rftfsub(m, a, nc, w + nw);
-        } else if (m == 4) {
-            cftfsub(m, a, w);
-        }
-        a[n - 1] = a[1] - a[0];
-        a[1] = a[0] + a[1];
-        for (j = m - 2; j >= 2; j -= 2) {
-            a[2 * j + 1] = a[j] - a[j + 1];
-            a[2 * j - 1] = -a[j] - a[j + 1];
-        }
-        l = 2;
-        m = mh;
-        while (m >= 2) {
-            dstsub(m, t, nc, w + nw);
-            if (m > 4) {
-                bitrv2(m, ip + 2, t);
-                cftfsub(m, t, w);
-                rftfsub(m, t, nc, w + nw);
-            } else if (m == 4) {
-                cftfsub(m, t, w);
-            }
-            a[n - l] = t[1] - t[0];
-            a[l] = t[0] + t[1];
-            k = 0;
-            for (j = 2; j < m; j += 2) {
-                k += l << 2;
-                a[k - l] = -t[j] - t[j + 1];
-                a[k + l] = t[j] - t[j + 1];
-            }
-            l <<= 1;
-            mh = m >> 1;
-            for (j = 1; j < mh; j++) {
-                k = m - j;
-                t[j] = t[m + k] + t[m + j];
-                t[k] = t[m + k] - t[m + j];
-            }
-            t[0] = t[m + mh];
-            m = mh;
-        }
-        a[l] = t[0];
-    }
-    a[0] = 0;
-}
-#endif  // Not used.
-
-
-/* -------- initializing routines -------- */
-
-
-#include <math.h>
-
-static void makewt(size_t nw, size_t *ip, float *w)
-{
-    size_t j, nwh;
-    float delta, x, y;
-
-    ip[0] = nw;
-    ip[1] = 1;
-    if (nw > 2) {
-        nwh = nw >> 1;
-        delta = atanf(1.0f) / nwh;
-        w[0] = 1;
-        w[1] = 0;
-        w[nwh] = (float)cos(delta * nwh);
-        w[nwh + 1] = w[nwh];
-        if (nwh > 2) {
-            for (j = 2; j < nwh; j += 2) {
-                x = (float)cos(delta * j);
-                y = (float)sin(delta * j);
-                w[j] = x;
-                w[j + 1] = y;
-                w[nw - j] = y;
-                w[nw - j + 1] = x;
-            }
-            bitrv2(nw, ip + 2, w);
-        }
-    }
-}
-
-
-static void makect(size_t nc, size_t *ip, float *c)
-{
-    size_t j, nch;
-    float delta;
-
-    ip[1] = nc;
-    if (nc > 1) {
-        nch = nc >> 1;
-        delta = atanf(1.0f) / nch;
-        c[0] = (float)cos(delta * nch);
-        c[nch] = 0.5f * c[0];
-        for (j = 1; j < nch; j++) {
-            c[j] = 0.5f * (float)cos(delta * j);
-            c[nc - j] = 0.5f * (float)sin(delta * j);
-        }
-    }
-}
-
-
-/* -------- child routines -------- */
-
-
-static void bitrv2(size_t n, size_t *ip, float *a)
-{
-    size_t j, j1, k, k1, l, m, m2;
-    float xr, xi, yr, yi;
-
-    ip[0] = 0;
-    l = n;
-    m = 1;
-    while ((m << 3) < l) {
-        l >>= 1;
-        for (j = 0; j < m; j++) {
-            ip[m + j] = ip[j] + l;
-        }
-        m <<= 1;
-    }
-    m2 = 2 * m;
-    if ((m << 3) == l) {
-        for (k = 0; k < m; k++) {
-            for (j = 0; j < k; j++) {
-                j1 = 2 * j + ip[k];
-                k1 = 2 * k + ip[j];
-                xr = a[j1];
-                xi = a[j1 + 1];
-                yr = a[k1];
-                yi = a[k1 + 1];
-                a[j1] = yr;
-                a[j1 + 1] = yi;
-                a[k1] = xr;
-                a[k1 + 1] = xi;
-                j1 += m2;
-                k1 += 2 * m2;
-                xr = a[j1];
-                xi = a[j1 + 1];
-                yr = a[k1];
-                yi = a[k1 + 1];
-                a[j1] = yr;
-                a[j1 + 1] = yi;
-                a[k1] = xr;
-                a[k1 + 1] = xi;
-                j1 += m2;
-                k1 -= m2;
-                xr = a[j1];
-                xi = a[j1 + 1];
-                yr = a[k1];
-                yi = a[k1 + 1];
-                a[j1] = yr;
-                a[j1 + 1] = yi;
-                a[k1] = xr;
-                a[k1 + 1] = xi;
-                j1 += m2;
-                k1 += 2 * m2;
-                xr = a[j1];
-                xi = a[j1 + 1];
-                yr = a[k1];
-                yi = a[k1 + 1];
-                a[j1] = yr;
-                a[j1 + 1] = yi;
-                a[k1] = xr;
-                a[k1 + 1] = xi;
-            }
-            j1 = 2 * k + m2 + ip[k];
-            k1 = j1 + m2;
-            xr = a[j1];
-            xi = a[j1 + 1];
-            yr = a[k1];
-            yi = a[k1 + 1];
-            a[j1] = yr;
-            a[j1 + 1] = yi;
-            a[k1] = xr;
-            a[k1 + 1] = xi;
-        }
-    } else {
-        for (k = 1; k < m; k++) {
-            for (j = 0; j < k; j++) {
-                j1 = 2 * j + ip[k];
-                k1 = 2 * k + ip[j];
-                xr = a[j1];
-                xi = a[j1 + 1];
-                yr = a[k1];
-                yi = a[k1 + 1];
-                a[j1] = yr;
-                a[j1 + 1] = yi;
-                a[k1] = xr;
-                a[k1 + 1] = xi;
-                j1 += m2;
-                k1 += m2;
-                xr = a[j1];
-                xi = a[j1 + 1];
-                yr = a[k1];
-                yi = a[k1 + 1];
-                a[j1] = yr;
-                a[j1 + 1] = yi;
-                a[k1] = xr;
-                a[k1 + 1] = xi;
-            }
-        }
-    }
-}
-
-#if 0  // Not used.
-static void bitrv2conj(int n, int *ip, float *a)
-{
-    int j, j1, k, k1, l, m, m2;
-    float xr, xi, yr, yi;
-
-    ip[0] = 0;
-    l = n;
-    m = 1;
-    while ((m << 3) < l) {
-        l >>= 1;
-        for (j = 0; j < m; j++) {
-            ip[m + j] = ip[j] + l;
-        }
-        m <<= 1;
-    }
-    m2 = 2 * m;
-    if ((m << 3) == l) {
-        for (k = 0; k < m; k++) {
-            for (j = 0; j < k; j++) {
-                j1 = 2 * j + ip[k];
-                k1 = 2 * k + ip[j];
-                xr = a[j1];
-                xi = -a[j1 + 1];
-                yr = a[k1];
-                yi = -a[k1 + 1];
-                a[j1] = yr;
-                a[j1 + 1] = yi;
-                a[k1] = xr;
-                a[k1 + 1] = xi;
-                j1 += m2;
-                k1 += 2 * m2;
-                xr = a[j1];
-                xi = -a[j1 + 1];
-                yr = a[k1];
-                yi = -a[k1 + 1];
-                a[j1] = yr;
-                a[j1 + 1] = yi;
-                a[k1] = xr;
-                a[k1 + 1] = xi;
-                j1 += m2;
-                k1 -= m2;
-                xr = a[j1];
-                xi = -a[j1 + 1];
-                yr = a[k1];
-                yi = -a[k1 + 1];
-                a[j1] = yr;
-                a[j1 + 1] = yi;
-                a[k1] = xr;
-                a[k1 + 1] = xi;
-                j1 += m2;
-                k1 += 2 * m2;
-                xr = a[j1];
-                xi = -a[j1 + 1];
-                yr = a[k1];
-                yi = -a[k1 + 1];
-                a[j1] = yr;
-                a[j1 + 1] = yi;
-                a[k1] = xr;
-                a[k1 + 1] = xi;
-            }
-            k1 = 2 * k + ip[k];
-            a[k1 + 1] = -a[k1 + 1];
-            j1 = k1 + m2;
-            k1 = j1 + m2;
-            xr = a[j1];
-            xi = -a[j1 + 1];
-            yr = a[k1];
-            yi = -a[k1 + 1];
-            a[j1] = yr;
-            a[j1 + 1] = yi;
-            a[k1] = xr;
-            a[k1 + 1] = xi;
-            k1 += m2;
-            a[k1 + 1] = -a[k1 + 1];
-        }
-    } else {
-        a[1] = -a[1];
-        a[m2 + 1] = -a[m2 + 1];
-        for (k = 1; k < m; k++) {
-            for (j = 0; j < k; j++) {
-                j1 = 2 * j + ip[k];
-                k1 = 2 * k + ip[j];
-                xr = a[j1];
-                xi = -a[j1 + 1];
-                yr = a[k1];
-                yi = -a[k1 + 1];
-                a[j1] = yr;
-                a[j1 + 1] = yi;
-                a[k1] = xr;
-                a[k1 + 1] = xi;
-                j1 += m2;
-                k1 += m2;
-                xr = a[j1];
-                xi = -a[j1 + 1];
-                yr = a[k1];
-                yi = -a[k1 + 1];
-                a[j1] = yr;
-                a[j1 + 1] = yi;
-                a[k1] = xr;
-                a[k1 + 1] = xi;
-            }
-            k1 = 2 * k + ip[k];
-            a[k1 + 1] = -a[k1 + 1];
-            a[k1 + m2 + 1] = -a[k1 + m2 + 1];
-        }
-    }
-}
-#endif
-
-static void cftfsub(size_t n, float *a, float *w)
-{
-    size_t j, j1, j2, j3, l;
-    float x0r, x0i, x1r, x1i, x2r, x2i, x3r, x3i;
-
-    l = 2;
-    if (n > 8) {
-        cft1st(n, a, w);
-        l = 8;
-        while ((l << 2) < n) {
-            cftmdl(n, l, a, w);
-            l <<= 2;
-        }
-    }
-    if ((l << 2) == n) {
-        for (j = 0; j < l; j += 2) {
-            j1 = j + l;
-            j2 = j1 + l;
-            j3 = j2 + l;
-            x0r = a[j] + a[j1];
-            x0i = a[j + 1] + a[j1 + 1];
-            x1r = a[j] - a[j1];
-            x1i = a[j + 1] - a[j1 + 1];
-            x2r = a[j2] + a[j3];
-            x2i = a[j2 + 1] + a[j3 + 1];
-            x3r = a[j2] - a[j3];
-            x3i = a[j2 + 1] - a[j3 + 1];
-            a[j] = x0r + x2r;
-            a[j + 1] = x0i + x2i;
-            a[j2] = x0r - x2r;
-            a[j2 + 1] = x0i - x2i;
-            a[j1] = x1r - x3i;
-            a[j1 + 1] = x1i + x3r;
-            a[j3] = x1r + x3i;
-            a[j3 + 1] = x1i - x3r;
-        }
-    } else {
-        for (j = 0; j < l; j += 2) {
-            j1 = j + l;
-            x0r = a[j] - a[j1];
-            x0i = a[j + 1] - a[j1 + 1];
-            a[j] += a[j1];
-            a[j + 1] += a[j1 + 1];
-            a[j1] = x0r;
-            a[j1 + 1] = x0i;
-        }
-    }
-}
-
-
-static void cftbsub(size_t n, float *a, float *w)
-{
-    size_t j, j1, j2, j3, l;
-    float x0r, x0i, x1r, x1i, x2r, x2i, x3r, x3i;
-
-    l = 2;
-    if (n > 8) {
-        cft1st(n, a, w);
-        l = 8;
-        while ((l << 2) < n) {
-            cftmdl(n, l, a, w);
-            l <<= 2;
-        }
-    }
-    if ((l << 2) == n) {
-        for (j = 0; j < l; j += 2) {
-            j1 = j + l;
-            j2 = j1 + l;
-            j3 = j2 + l;
-            x0r = a[j] + a[j1];
-            x0i = -a[j + 1] - a[j1 + 1];
-            x1r = a[j] - a[j1];
-            x1i = -a[j + 1] + a[j1 + 1];
-            x2r = a[j2] + a[j3];
-            x2i = a[j2 + 1] + a[j3 + 1];
-            x3r = a[j2] - a[j3];
-            x3i = a[j2 + 1] - a[j3 + 1];
-            a[j] = x0r + x2r;
-            a[j + 1] = x0i - x2i;
-            a[j2] = x0r - x2r;
-            a[j2 + 1] = x0i + x2i;
-            a[j1] = x1r - x3i;
-            a[j1 + 1] = x1i - x3r;
-            a[j3] = x1r + x3i;
-            a[j3 + 1] = x1i + x3r;
-        }
-    } else {
-        for (j = 0; j < l; j += 2) {
-            j1 = j + l;
-            x0r = a[j] - a[j1];
-            x0i = -a[j + 1] + a[j1 + 1];
-            a[j] += a[j1];
-            a[j + 1] = -a[j + 1] - a[j1 + 1];
-            a[j1] = x0r;
-            a[j1 + 1] = x0i;
-        }
-    }
-}
-
-
-static void cft1st(size_t n, float *a, float *w)
-{
-    size_t j, k1, k2;
-    float wk1r, wk1i, wk2r, wk2i, wk3r, wk3i;
-    float x0r, x0i, x1r, x1i, x2r, x2i, x3r, x3i;
-
-    x0r = a[0] + a[2];
-    x0i = a[1] + a[3];
-    x1r = a[0] - a[2];
-    x1i = a[1] - a[3];
-    x2r = a[4] + a[6];
-    x2i = a[5] + a[7];
-    x3r = a[4] - a[6];
-    x3i = a[5] - a[7];
-    a[0] = x0r + x2r;
-    a[1] = x0i + x2i;
-    a[4] = x0r - x2r;
-    a[5] = x0i - x2i;
-    a[2] = x1r - x3i;
-    a[3] = x1i + x3r;
-    a[6] = x1r + x3i;
-    a[7] = x1i - x3r;
-    wk1r = w[2];
-    x0r = a[8] + a[10];
-    x0i = a[9] + a[11];
-    x1r = a[8] - a[10];
-    x1i = a[9] - a[11];
-    x2r = a[12] + a[14];
-    x2i = a[13] + a[15];
-    x3r = a[12] - a[14];
-    x3i = a[13] - a[15];
-    a[8] = x0r + x2r;
-    a[9] = x0i + x2i;
-    a[12] = x2i - x0i;
-    a[13] = x0r - x2r;
-    x0r = x1r - x3i;
-    x0i = x1i + x3r;
-    a[10] = wk1r * (x0r - x0i);
-    a[11] = wk1r * (x0r + x0i);
-    x0r = x3i + x1r;
-    x0i = x3r - x1i;
-    a[14] = wk1r * (x0i - x0r);
-    a[15] = wk1r * (x0i + x0r);
-    k1 = 0;
-    for (j = 16; j < n; j += 16) {
-        k1 += 2;
-        k2 = 2 * k1;
-        wk2r = w[k1];
-        wk2i = w[k1 + 1];
-        wk1r = w[k2];
-        wk1i = w[k2 + 1];
-        wk3r = wk1r - 2 * wk2i * wk1i;
-        wk3i = 2 * wk2i * wk1r - wk1i;
-        x0r = a[j] + a[j + 2];
-        x0i = a[j + 1] + a[j + 3];
-        x1r = a[j] - a[j + 2];
-        x1i = a[j + 1] - a[j + 3];
-        x2r = a[j + 4] + a[j + 6];
-        x2i = a[j + 5] + a[j + 7];
-        x3r = a[j + 4] - a[j + 6];
-        x3i = a[j + 5] - a[j + 7];
-        a[j] = x0r + x2r;
-        a[j + 1] = x0i + x2i;
-        x0r -= x2r;
-        x0i -= x2i;
-        a[j + 4] = wk2r * x0r - wk2i * x0i;
-        a[j + 5] = wk2r * x0i + wk2i * x0r;
-        x0r = x1r - x3i;
-        x0i = x1i + x3r;
-        a[j + 2] = wk1r * x0r - wk1i * x0i;
-        a[j + 3] = wk1r * x0i + wk1i * x0r;
-        x0r = x1r + x3i;
-        x0i = x1i - x3r;
-        a[j + 6] = wk3r * x0r - wk3i * x0i;
-        a[j + 7] = wk3r * x0i + wk3i * x0r;
-        wk1r = w[k2 + 2];
-        wk1i = w[k2 + 3];
-        wk3r = wk1r - 2 * wk2r * wk1i;
-        wk3i = 2 * wk2r * wk1r - wk1i;
-        x0r = a[j + 8] + a[j + 10];
-        x0i = a[j + 9] + a[j + 11];
-        x1r = a[j + 8] - a[j + 10];
-        x1i = a[j + 9] - a[j + 11];
-        x2r = a[j + 12] + a[j + 14];
-        x2i = a[j + 13] + a[j + 15];
-        x3r = a[j + 12] - a[j + 14];
-        x3i = a[j + 13] - a[j + 15];
-        a[j + 8] = x0r + x2r;
-        a[j + 9] = x0i + x2i;
-        x0r -= x2r;
-        x0i -= x2i;
-        a[j + 12] = -wk2i * x0r - wk2r * x0i;
-        a[j + 13] = -wk2i * x0i + wk2r * x0r;
-        x0r = x1r - x3i;
-        x0i = x1i + x3r;
-        a[j + 10] = wk1r * x0r - wk1i * x0i;
-        a[j + 11] = wk1r * x0i + wk1i * x0r;
-        x0r = x1r + x3i;
-        x0i = x1i - x3r;
-        a[j + 14] = wk3r * x0r - wk3i * x0i;
-        a[j + 15] = wk3r * x0i + wk3i * x0r;
-    }
-}
-
-
-static void cftmdl(size_t n, size_t l, float *a, float *w)
-{
-    size_t j, j1, j2, j3, k, k1, k2, m, m2;
-    float wk1r, wk1i, wk2r, wk2i, wk3r, wk3i;
-    float x0r, x0i, x1r, x1i, x2r, x2i, x3r, x3i;
-
-    m = l << 2;
-    for (j = 0; j < l; j += 2) {
-        j1 = j + l;
-        j2 = j1 + l;
-        j3 = j2 + l;
-        x0r = a[j] + a[j1];
-        x0i = a[j + 1] + a[j1 + 1];
-        x1r = a[j] - a[j1];
-        x1i = a[j + 1] - a[j1 + 1];
-        x2r = a[j2] + a[j3];
-        x2i = a[j2 + 1] + a[j3 + 1];
-        x3r = a[j2] - a[j3];
-        x3i = a[j2 + 1] - a[j3 + 1];
-        a[j] = x0r + x2r;
-        a[j + 1] = x0i + x2i;
-        a[j2] = x0r - x2r;
-        a[j2 + 1] = x0i - x2i;
-        a[j1] = x1r - x3i;
-        a[j1 + 1] = x1i + x3r;
-        a[j3] = x1r + x3i;
-        a[j3 + 1] = x1i - x3r;
-    }
-    wk1r = w[2];
-    for (j = m; j < l + m; j += 2) {
-        j1 = j + l;
-        j2 = j1 + l;
-        j3 = j2 + l;
-        x0r = a[j] + a[j1];
-        x0i = a[j + 1] + a[j1 + 1];
-        x1r = a[j] - a[j1];
-        x1i = a[j + 1] - a[j1 + 1];
-        x2r = a[j2] + a[j3];
-        x2i = a[j2 + 1] + a[j3 + 1];
-        x3r = a[j2] - a[j3];
-        x3i = a[j2 + 1] - a[j3 + 1];
-        a[j] = x0r + x2r;
-        a[j + 1] = x0i + x2i;
-        a[j2] = x2i - x0i;
-        a[j2 + 1] = x0r - x2r;
-        x0r = x1r - x3i;
-        x0i = x1i + x3r;
-        a[j1] = wk1r * (x0r - x0i);
-        a[j1 + 1] = wk1r * (x0r + x0i);
-        x0r = x3i + x1r;
-        x0i = x3r - x1i;
-        a[j3] = wk1r * (x0i - x0r);
-        a[j3 + 1] = wk1r * (x0i + x0r);
-    }
-    k1 = 0;
-    m2 = 2 * m;
-    for (k = m2; k < n; k += m2) {
-        k1 += 2;
-        k2 = 2 * k1;
-        wk2r = w[k1];
-        wk2i = w[k1 + 1];
-        wk1r = w[k2];
-        wk1i = w[k2 + 1];
-        wk3r = wk1r - 2 * wk2i * wk1i;
-        wk3i = 2 * wk2i * wk1r - wk1i;
-        for (j = k; j < l + k; j += 2) {
-            j1 = j + l;
-            j2 = j1 + l;
-            j3 = j2 + l;
-            x0r = a[j] + a[j1];
-            x0i = a[j + 1] + a[j1 + 1];
-            x1r = a[j] - a[j1];
-            x1i = a[j + 1] - a[j1 + 1];
-            x2r = a[j2] + a[j3];
-            x2i = a[j2 + 1] + a[j3 + 1];
-            x3r = a[j2] - a[j3];
-            x3i = a[j2 + 1] - a[j3 + 1];
-            a[j] = x0r + x2r;
-            a[j + 1] = x0i + x2i;
-            x0r -= x2r;
-            x0i -= x2i;
-            a[j2] = wk2r * x0r - wk2i * x0i;
-            a[j2 + 1] = wk2r * x0i + wk2i * x0r;
-            x0r = x1r - x3i;
-            x0i = x1i + x3r;
-            a[j1] = wk1r * x0r - wk1i * x0i;
-            a[j1 + 1] = wk1r * x0i + wk1i * x0r;
-            x0r = x1r + x3i;
-            x0i = x1i - x3r;
-            a[j3] = wk3r * x0r - wk3i * x0i;
-            a[j3 + 1] = wk3r * x0i + wk3i * x0r;
-        }
-        wk1r = w[k2 + 2];
-        wk1i = w[k2 + 3];
-        wk3r = wk1r - 2 * wk2r * wk1i;
-        wk3i = 2 * wk2r * wk1r - wk1i;
-        for (j = k + m; j < l + (k + m); j += 2) {
-            j1 = j + l;
-            j2 = j1 + l;
-            j3 = j2 + l;
-            x0r = a[j] + a[j1];
-            x0i = a[j + 1] + a[j1 + 1];
-            x1r = a[j] - a[j1];
-            x1i = a[j + 1] - a[j1 + 1];
-            x2r = a[j2] + a[j3];
-            x2i = a[j2 + 1] + a[j3 + 1];
-            x3r = a[j2] - a[j3];
-            x3i = a[j2 + 1] - a[j3 + 1];
-            a[j] = x0r + x2r;
-            a[j + 1] = x0i + x2i;
-            x0r -= x2r;
-            x0i -= x2i;
-            a[j2] = -wk2i * x0r - wk2r * x0i;
-            a[j2 + 1] = -wk2i * x0i + wk2r * x0r;
-            x0r = x1r - x3i;
-            x0i = x1i + x3r;
-            a[j1] = wk1r * x0r - wk1i * x0i;
-            a[j1 + 1] = wk1r * x0i + wk1i * x0r;
-            x0r = x1r + x3i;
-            x0i = x1i - x3r;
-            a[j3] = wk3r * x0r - wk3i * x0i;
-            a[j3 + 1] = wk3r * x0i + wk3i * x0r;
-        }
-    }
-}
-
-
-static void rftfsub(size_t n, float *a, size_t nc, float *c)
-{
-    size_t j, k, kk, ks, m;
-    float wkr, wki, xr, xi, yr, yi;
-
-    m = n >> 1;
-    ks = 2 * nc / m;
-    kk = 0;
-    for (j = 2; j < m; j += 2) {
-        k = n - j;
-        kk += ks;
-        wkr = 0.5f - c[nc - kk];
-        wki = c[kk];
-        xr = a[j] - a[k];
-        xi = a[j + 1] + a[k + 1];
-        yr = wkr * xr - wki * xi;
-        yi = wkr * xi + wki * xr;
-        a[j] -= yr;
-        a[j + 1] -= yi;
-        a[k] += yr;
-        a[k + 1] -= yi;
-    }
-}
-
-
-static void rftbsub(size_t n, float *a, size_t nc, float *c)
-{
-    size_t j, k, kk, ks, m;
-    float wkr, wki, xr, xi, yr, yi;
-
-    a[1] = -a[1];
-    m = n >> 1;
-    ks = 2 * nc / m;
-    kk = 0;
-    for (j = 2; j < m; j += 2) {
-        k = n - j;
-        kk += ks;
-        wkr = 0.5f - c[nc - kk];
-        wki = c[kk];
-        xr = a[j] - a[k];
-        xi = a[j + 1] + a[k + 1];
-        yr = wkr * xr + wki * xi;
-        yi = wkr * xi - wki * xr;
-        a[j] -= yr;
-        a[j + 1] = yi - a[j + 1];
-        a[k] += yr;
-        a[k + 1] = yi - a[k + 1];
-    }
-    a[m + 1] = -a[m + 1];
-}
-
-#if 0  // Not used.
-static void dctsub(int n, float *a, int nc, float *c)
-{
-    int j, k, kk, ks, m;
-    float wkr, wki, xr;
-
-    m = n >> 1;
-    ks = nc / n;
-    kk = 0;
-    for (j = 1; j < m; j++) {
-        k = n - j;
-        kk += ks;
-        wkr = c[kk] - c[nc - kk];
-        wki = c[kk] + c[nc - kk];
-        xr = wki * a[j] - wkr * a[k];
-        a[j] = wkr * a[j] + wki * a[k];
-        a[k] = xr;
-    }
-    a[m] *= c[0];
-}
-
-
-static void dstsub(int n, float *a, int nc, float *c)
-{
-    int j, k, kk, ks, m;
-    float wkr, wki, xr;
-
-    m = n >> 1;
-    ks = nc / n;
-    kk = 0;
-    for (j = 1; j < m; j++) {
-        k = n - j;
-        kk += ks;
-        wkr = c[kk] - c[nc - kk];
-        wki = c[kk] + c[nc - kk];
-        xr = wki * a[k] - wkr * a[j];
-        a[k] = wkr * a[k] + wki * a[j];
-        a[j] = xr;
-    }
-    a[m] *= c[0];
-}
-#endif  // Not used.
diff --git a/submodules/libtgvoip/webrtc_dsp/common_audio/third_party/fft4g/fft4g.h b/submodules/libtgvoip/webrtc_dsp/common_audio/third_party/fft4g/fft4g.h
deleted file mode 100644
index f1f31a182d..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/common_audio/third_party/fft4g/fft4g.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- *  Copyright (c) 2018 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the ../../../LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#ifndef COMMON_AUDIO_THIRD_PARTY_FFT4G_FFT4G_H_
-#define COMMON_AUDIO_THIRD_PARTY_FFT4G_FFT4G_H_
-
-#if defined(__cplusplus)
-extern "C" {
-#endif
-
-// Refer to fft4g.c for documentation.
-void WebRtc_rdft(size_t n, int isgn, float* a, size_t* ip, float* w);
-
-#if defined(__cplusplus)
-}
-#endif
-
-#endif  /* COMMON_AUDIO_THIRD_PARTY_FFT4G_FFT4G_H_ */
diff --git a/submodules/libtgvoip/webrtc_dsp/common_audio/third_party/spl_sqrt_floor/spl_sqrt_floor.c b/submodules/libtgvoip/webrtc_dsp/common_audio/third_party/spl_sqrt_floor/spl_sqrt_floor.c
deleted file mode 100644
index b478a41b96..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/common_audio/third_party/spl_sqrt_floor/spl_sqrt_floor.c
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- * Written by Wilco Dijkstra, 1996. The following email exchange establishes the
- * license.
- *
- * From: Wilco Dijkstra <Wilco.Dijkstra@ntlworld.com>
- * Date: Fri, Jun 24, 2011 at 3:20 AM
- * Subject: Re: sqrt routine
- * To: Kevin Ma <kma@google.com>
- * Hi Kevin,
- * Thanks for asking. Those routines are public domain (originally posted to
- * comp.sys.arm a long time ago), so you can use them freely for any purpose.
- * Cheers,
- * Wilco
- *
- * ----- Original Message -----
- * From: "Kevin Ma" <kma@google.com>
- * To: <Wilco.Dijkstra@ntlworld.com>
- * Sent: Thursday, June 23, 2011 11:44 PM
- * Subject: Fwd: sqrt routine
- * Hi Wilco,
- * I saw your sqrt routine from several web sites, including
- * http://www.finesse.demon.co.uk/steven/sqrt.html.
- * Just wonder if there's any copyright information with your Successive
- * approximation routines, or if I can freely use it for any purpose.
- * Thanks.
- * Kevin
- */
-
-// Minor modifications in code style for WebRTC, 2012.
-
-#include "common_audio/third_party/spl_sqrt_floor/spl_sqrt_floor.h"
-
-/*
- * Algorithm:
- * Successive approximation of the equation (root + delta) ^ 2 = N
- * until delta < 1. If delta < 1 we have the integer part of SQRT (N).
- * Use delta = 2^i for i = 15 .. 0.
- *
- * Output precision is 16 bits. Note for large input values (close to
- * 0x7FFFFFFF), bit 15 (the highest bit of the low 16-bit half word)
- * contains the MSB information (a non-sign value). Do with caution
- * if you need to cast the output to int16_t type.
- *
- * If the input value is negative, it returns 0.
- */
-
-#define WEBRTC_SPL_SQRT_ITER(N)                 \
-  try1 = root + (1 << (N));                     \
-  if (value >= try1 << (N))                     \
-  {                                             \
-    value -= try1 << (N);                       \
-    root |= 2 << (N);                           \
-  }
-
-int32_t WebRtcSpl_SqrtFloor(int32_t value)
-{
-  int32_t root = 0, try1;
-
-  WEBRTC_SPL_SQRT_ITER (15);
-  WEBRTC_SPL_SQRT_ITER (14);
-  WEBRTC_SPL_SQRT_ITER (13);
-  WEBRTC_SPL_SQRT_ITER (12);
-  WEBRTC_SPL_SQRT_ITER (11);
-  WEBRTC_SPL_SQRT_ITER (10);
-  WEBRTC_SPL_SQRT_ITER ( 9);
-  WEBRTC_SPL_SQRT_ITER ( 8);
-  WEBRTC_SPL_SQRT_ITER ( 7);
-  WEBRTC_SPL_SQRT_ITER ( 6);
-  WEBRTC_SPL_SQRT_ITER ( 5);
-  WEBRTC_SPL_SQRT_ITER ( 4);
-  WEBRTC_SPL_SQRT_ITER ( 3);
-  WEBRTC_SPL_SQRT_ITER ( 2);
-  WEBRTC_SPL_SQRT_ITER ( 1);
-  WEBRTC_SPL_SQRT_ITER ( 0);
-
-  return root >> 1;
-}
diff --git a/submodules/libtgvoip/webrtc_dsp/common_audio/third_party/spl_sqrt_floor/spl_sqrt_floor.h b/submodules/libtgvoip/webrtc_dsp/common_audio/third_party/spl_sqrt_floor/spl_sqrt_floor.h
deleted file mode 100644
index eaa58e30a4..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/common_audio/third_party/spl_sqrt_floor/spl_sqrt_floor.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- *  Copyright (c) 2018 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#include <stdint.h>
-
-//
-// WebRtcSpl_SqrtFloor(...)
-//
-// Returns the square root of the input value |value|. The precision of this
-// function is rounding down integer precision, i.e., sqrt(8) gives 2 as answer.
-// If |value| is a negative number then 0 is returned.
-//
-// Algorithm:
-//
-// An iterative 4 cylce/bit routine
-//
-// Input:
-//      - value     : Value to calculate sqrt of
-//
-// Return value     : Result of the sqrt calculation
-//
-int32_t WebRtcSpl_SqrtFloor(int32_t value);
diff --git a/submodules/libtgvoip/webrtc_dsp/common_audio/third_party/spl_sqrt_floor/spl_sqrt_floor_arm.S b/submodules/libtgvoip/webrtc_dsp/common_audio/third_party/spl_sqrt_floor/spl_sqrt_floor_arm.S
deleted file mode 100644
index b50bfca870..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/common_audio/third_party/spl_sqrt_floor/spl_sqrt_floor_arm.S
+++ /dev/null
@@ -1,113 +0,0 @@
-@
-@ Written by Wilco Dijkstra, 1996. The following email exchange establishes the
-@ license.
-@
-@ From: Wilco Dijkstra <Wilco.Dijkstra@ntlworld.com>
-@ Date: Fri, Jun 24, 2011 at 3:20 AM
-@ Subject: Re: sqrt routine
-@ To: Kevin Ma <kma@google.com>
-@ Hi Kevin,
-@ Thanks for asking. Those routines are public domain (originally posted to
-@ comp.sys.arm a long time ago), so you can use them freely for any purpose.
-@ Cheers,
-@ Wilco
-@
-@ ----- Original Message -----
-@ From: "Kevin Ma" <kma@google.com>
-@ To: <Wilco.Dijkstra@ntlworld.com>
-@ Sent: Thursday, June 23, 2011 11:44 PM
-@ Subject: Fwd: sqrt routine
-@ Hi Wilco,
-@ I saw your sqrt routine from several web sites, including
-@ http://www.finesse.demon.co.uk/steven/sqrt.html.
-@ Just wonder if there's any copyright information with your Successive
-@ approximation routines, or if I can freely use it for any purpose.
-@ Thanks.
-@ Kevin
-
-@ Minor modifications in code style for WebRTC, 2012.
-@ Output is bit-exact with the reference C code in spl_sqrt_floor.c.
-
-@ Input :             r0 32 bit unsigned integer
-@ Output:             r0 = INT (SQRT (r0)), precision is 16 bits
-@ Registers touched:  r1, r2
-#if defined(__arm__) || defined(_M_ARM) || defined(__aarch64__)
-
-#include "rtc_base/system/asm_defines.h"
-
-GLOBAL_FUNCTION WebRtcSpl_SqrtFloor
-.align  2
-DEFINE_FUNCTION WebRtcSpl_SqrtFloor
-  mov    r1, #3 << 30
-  mov    r2, #1 << 30
-
-  @ unroll for i = 0 .. 15
-
-  cmp    r0, r2, ror #2 * 0
-  subhs  r0, r0, r2, ror #2 * 0
-  adc    r2, r1, r2, lsl #1
-
-  cmp    r0, r2, ror #2 * 1
-  subhs  r0, r0, r2, ror #2 * 1
-  adc    r2, r1, r2, lsl #1
-
-  cmp    r0, r2, ror #2 * 2
-  subhs  r0, r0, r2, ror #2 * 2
-  adc    r2, r1, r2, lsl #1
-
-  cmp    r0, r2, ror #2 * 3
-  subhs  r0, r0, r2, ror #2 * 3
-  adc    r2, r1, r2, lsl #1
-
-  cmp    r0, r2, ror #2 * 4
-  subhs  r0, r0, r2, ror #2 * 4
-  adc    r2, r1, r2, lsl #1
-
-  cmp    r0, r2, ror #2 * 5
-  subhs  r0, r0, r2, ror #2 * 5
-  adc    r2, r1, r2, lsl #1
-
-  cmp    r0, r2, ror #2 * 6
-  subhs  r0, r0, r2, ror #2 * 6
-  adc    r2, r1, r2, lsl #1
-
-  cmp    r0, r2, ror #2 * 7
-  subhs  r0, r0, r2, ror #2 * 7
-  adc    r2, r1, r2, lsl #1
-
-  cmp    r0, r2, ror #2 * 8
-  subhs  r0, r0, r2, ror #2 * 8
-  adc    r2, r1, r2, lsl #1
-
-  cmp    r0, r2, ror #2 * 9
-  subhs  r0, r0, r2, ror #2 * 9
-  adc    r2, r1, r2, lsl #1
-
-  cmp    r0, r2, ror #2 * 10
-  subhs  r0, r0, r2, ror #2 * 10
-  adc    r2, r1, r2, lsl #1
-
-  cmp    r0, r2, ror #2 * 11
-  subhs  r0, r0, r2, ror #2 * 11
-  adc    r2, r1, r2, lsl #1
-
-  cmp    r0, r2, ror #2 * 12
-  subhs  r0, r0, r2, ror #2 * 12
-  adc    r2, r1, r2, lsl #1
-
-  cmp    r0, r2, ror #2 * 13
-  subhs  r0, r0, r2, ror #2 * 13
-  adc    r2, r1, r2, lsl #1
-
-  cmp    r0, r2, ror #2 * 14
-  subhs  r0, r0, r2, ror #2 * 14
-  adc    r2, r1, r2, lsl #1
-
-  cmp    r0, r2, ror #2 * 15
-  subhs  r0, r0, r2, ror #2 * 15
-  adc    r2, r1, r2, lsl #1
-
-  bic    r0, r2, #3 << 30  @ for rounding add: cmp r0, r2  adc r2, #1
-  bx lr
-
-#endif
diff --git a/submodules/libtgvoip/webrtc_dsp/common_audio/vad/include/vad.h b/submodules/libtgvoip/webrtc_dsp/common_audio/vad/include/vad.h
deleted file mode 100644
index b15275b166..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/common_audio/vad/include/vad.h
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- *  Copyright (c) 2014 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#ifndef COMMON_AUDIO_VAD_INCLUDE_VAD_H_
-#define COMMON_AUDIO_VAD_INCLUDE_VAD_H_
-
-#include <memory>
-
-#include "common_audio/vad/include/webrtc_vad.h"
-#include "rtc_base/checks.h"
-
-namespace webrtc {
-
-class Vad {
- public:
-  enum Aggressiveness {
-    kVadNormal = 0,
-    kVadLowBitrate = 1,
-    kVadAggressive = 2,
-    kVadVeryAggressive = 3
-  };
-
-  enum Activity { kPassive = 0, kActive = 1, kError = -1 };
-
-  virtual ~Vad() = default;
-
-  // Calculates a VAD decision for the given audio frame. Valid sample rates
-  // are 8000, 16000, and 32000 Hz; the number of samples must be such that the
-  // frame is 10, 20, or 30 ms long.
-  virtual Activity VoiceActivity(const int16_t* audio,
-                                 size_t num_samples,
-                                 int sample_rate_hz) = 0;
-
-  // Resets VAD state.
-  virtual void Reset() = 0;
-};
-
-// Returns a Vad instance that's implemented on top of WebRtcVad.
-std::unique_ptr<Vad> CreateVad(Vad::Aggressiveness aggressiveness);
-
-}  // namespace webrtc
-
-#endif  // COMMON_AUDIO_VAD_INCLUDE_VAD_H_
diff --git a/submodules/libtgvoip/webrtc_dsp/common_audio/vad/include/webrtc_vad.h b/submodules/libtgvoip/webrtc_dsp/common_audio/vad/include/webrtc_vad.h
deleted file mode 100644
index f5bbadf5b7..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/common_audio/vad/include/webrtc_vad.h
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
- *  Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-/*
- * This header file includes the VAD API calls. Specific function calls are
- * given below.
- */
-
-#ifndef COMMON_AUDIO_VAD_INCLUDE_WEBRTC_VAD_H_  // NOLINT
-#define COMMON_AUDIO_VAD_INCLUDE_WEBRTC_VAD_H_
-
-#include <stddef.h>
-#include <stdint.h>
-
-typedef struct WebRtcVadInst VadInst;
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-// Creates an instance to the VAD structure.
-VadInst* WebRtcVad_Create(void);
-
-// Frees the dynamic memory of a specified VAD instance.
-//
-// - handle [i] : Pointer to VAD instance that should be freed.
-void WebRtcVad_Free(VadInst* handle);
-
-// Initializes a VAD instance.
-//
-// - handle [i/o] : Instance that should be initialized.
-//
-// returns        : 0 - (OK),
-//                 -1 - (null pointer or Default mode could not be set).
-int WebRtcVad_Init(VadInst* handle);
-
-// Sets the VAD operating mode. A more aggressive (higher mode) VAD is more
-// restrictive in reporting speech. Put in other words the probability of being
-// speech when the VAD returns 1 is increased with increasing mode. As a
-// consequence also the missed detection rate goes up.
-//
-// - handle [i/o] : VAD instance.
-// - mode   [i]   : Aggressiveness mode (0, 1, 2, or 3).
-//
-// returns        : 0 - (OK),
-//                 -1 - (null pointer, mode could not be set or the VAD instance
-//                       has not been initialized).
-int WebRtcVad_set_mode(VadInst* handle, int mode);
-
-// Calculates a VAD decision for the |audio_frame|. For valid sampling rates
-// frame lengths, see the description of WebRtcVad_ValidRatesAndFrameLengths().
-//
-// - handle       [i/o] : VAD Instance. Needs to be initialized by
-//                        WebRtcVad_Init() before call.
-// - fs           [i]   : Sampling frequency (Hz): 8000, 16000, or 32000
-// - audio_frame  [i]   : Audio frame buffer.
-// - frame_length [i]   : Length of audio frame buffer in number of samples.
-//
-// returns              : 1 - (Active Voice),
-//                        0 - (Non-active Voice),
-//                       -1 - (Error)
-int WebRtcVad_Process(VadInst* handle,
-                      int fs,
-                      const int16_t* audio_frame,
-                      size_t frame_length);
-
-// Checks for valid combinations of |rate| and |frame_length|. We support 10,
-// 20 and 30 ms frames and the rates 8000, 16000 and 32000 Hz.
-//
-// - rate         [i] : Sampling frequency (Hz).
-// - frame_length [i] : Speech frame buffer length in number of samples.
-//
-// returns            : 0 - (valid combination), -1 - (invalid combination)
-int WebRtcVad_ValidRateAndFrameLength(int rate, size_t frame_length);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif  // COMMON_AUDIO_VAD_INCLUDE_WEBRTC_VAD_H_  // NOLINT
diff --git a/submodules/libtgvoip/webrtc_dsp/common_audio/vad/vad.cc b/submodules/libtgvoip/webrtc_dsp/common_audio/vad/vad.cc
deleted file mode 100644
index 987ed526c0..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/common_audio/vad/vad.cc
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- *  Copyright (c) 2014 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#include "common_audio/vad/include/vad.h"
-
-#include <memory>
-
-#include "common_audio/vad/include/webrtc_vad.h"
-#include "rtc_base/checks.h"
-
-namespace webrtc {
-
-namespace {
-
-class VadImpl final : public Vad {
- public:
-  explicit VadImpl(Aggressiveness aggressiveness)
-      : handle_(nullptr), aggressiveness_(aggressiveness) {
-    Reset();
-  }
-
-  ~VadImpl() override { WebRtcVad_Free(handle_); }
-
-  Activity VoiceActivity(const int16_t* audio,
-                         size_t num_samples,
-                         int sample_rate_hz) override {
-    int ret = WebRtcVad_Process(handle_, sample_rate_hz, audio, num_samples);
-    switch (ret) {
-      case 0:
-        return kPassive;
-      case 1:
-        return kActive;
-      default:
-        RTC_NOTREACHED() << "WebRtcVad_Process returned an error.";
-        return kError;
-    }
-  }
-
-  void Reset() override {
-    if (handle_)
-      WebRtcVad_Free(handle_);
-    handle_ = WebRtcVad_Create();
-    RTC_CHECK(handle_);
-    RTC_CHECK_EQ(WebRtcVad_Init(handle_), 0);
-    RTC_CHECK_EQ(WebRtcVad_set_mode(handle_, aggressiveness_), 0);
-  }
-
- private:
-  VadInst* handle_;
-  Aggressiveness aggressiveness_;
-};
-
-}  // namespace
-
-std::unique_ptr<Vad> CreateVad(Vad::Aggressiveness aggressiveness) {
-  return std::unique_ptr<Vad>(new VadImpl(aggressiveness));
-}
-
-}  // namespace webrtc
diff --git a/submodules/libtgvoip/webrtc_dsp/common_audio/vad/vad_core.c b/submodules/libtgvoip/webrtc_dsp/common_audio/vad/vad_core.c
deleted file mode 100644
index 55927cea40..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/common_audio/vad/vad_core.c
+++ /dev/null
@@ -1,685 +0,0 @@
-/*
- *  Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#include "common_audio/vad/vad_core.h"
-
-#include "rtc_base/sanitizer.h"
-#include "common_audio/signal_processing/include/signal_processing_library.h"
-#include "common_audio/vad/vad_filterbank.h"
-#include "common_audio/vad/vad_gmm.h"
-#include "common_audio/vad/vad_sp.h"
-
-// Spectrum Weighting
-static const int16_t kSpectrumWeight[kNumChannels] = { 6, 8, 10, 12, 14, 16 };
-static const int16_t kNoiseUpdateConst = 655; // Q15
-static const int16_t kSpeechUpdateConst = 6554; // Q15
-static const int16_t kBackEta = 154; // Q8
-// Minimum difference between the two models, Q5
-static const int16_t kMinimumDifference[kNumChannels] = {
-    544, 544, 576, 576, 576, 576 };
-// Upper limit of mean value for speech model, Q7
-static const int16_t kMaximumSpeech[kNumChannels] = {
-    11392, 11392, 11520, 11520, 11520, 11520 };
-// Minimum value for mean value
-static const int16_t kMinimumMean[kNumGaussians] = { 640, 768 };
-// Upper limit of mean value for noise model, Q7
-static const int16_t kMaximumNoise[kNumChannels] = {
-    9216, 9088, 8960, 8832, 8704, 8576 };
-// Start values for the Gaussian models, Q7
-// Weights for the two Gaussians for the six channels (noise)
-static const int16_t kNoiseDataWeights[kTableSize] = {
-    34, 62, 72, 66, 53, 25, 94, 66, 56, 62, 75, 103 };
-// Weights for the two Gaussians for the six channels (speech)
-static const int16_t kSpeechDataWeights[kTableSize] = {
-    48, 82, 45, 87, 50, 47, 80, 46, 83, 41, 78, 81 };
-// Means for the two Gaussians for the six channels (noise)
-static const int16_t kNoiseDataMeans[kTableSize] = {
-    6738, 4892, 7065, 6715, 6771, 3369, 7646, 3863, 7820, 7266, 5020, 4362 };
-// Means for the two Gaussians for the six channels (speech)
-static const int16_t kSpeechDataMeans[kTableSize] = {
-    8306, 10085, 10078, 11823, 11843, 6309, 9473, 9571, 10879, 7581, 8180, 7483
-};
-// Stds for the two Gaussians for the six channels (noise)
-static const int16_t kNoiseDataStds[kTableSize] = {
-    378, 1064, 493, 582, 688, 593, 474, 697, 475, 688, 421, 455 };
-// Stds for the two Gaussians for the six channels (speech)
-static const int16_t kSpeechDataStds[kTableSize] = {
-    555, 505, 567, 524, 585, 1231, 509, 828, 492, 1540, 1079, 850 };
-
-// Constants used in GmmProbability().
-//
-// Maximum number of counted speech (VAD = 1) frames in a row.
-static const int16_t kMaxSpeechFrames = 6;
-// Minimum standard deviation for both speech and noise.
-static const int16_t kMinStd = 384;
-
-// Constants in WebRtcVad_InitCore().
-// Default aggressiveness mode.
-static const short kDefaultMode = 0;
-static const int kInitCheck = 42;
-
-// Constants used in WebRtcVad_set_mode_core().
-//
-// Thresholds for different frame lengths (10 ms, 20 ms and 30 ms).
-//
-// Mode 0, Quality.
-static const int16_t kOverHangMax1Q[3] = { 8, 4, 3 };
-static const int16_t kOverHangMax2Q[3] = { 14, 7, 5 };
-static const int16_t kLocalThresholdQ[3] = { 24, 21, 24 };
-static const int16_t kGlobalThresholdQ[3] = { 57, 48, 57 };
-// Mode 1, Low bitrate.
-static const int16_t kOverHangMax1LBR[3] = { 8, 4, 3 };
-static const int16_t kOverHangMax2LBR[3] = { 14, 7, 5 };
-static const int16_t kLocalThresholdLBR[3] = { 37, 32, 37 };
-static const int16_t kGlobalThresholdLBR[3] = { 100, 80, 100 };
-// Mode 2, Aggressive.
-static const int16_t kOverHangMax1AGG[3] = { 6, 3, 2 };
-static const int16_t kOverHangMax2AGG[3] = { 9, 5, 3 };
-static const int16_t kLocalThresholdAGG[3] = { 82, 78, 82 };
-static const int16_t kGlobalThresholdAGG[3] = { 285, 260, 285 };
-// Mode 3, Very aggressive.
-static const int16_t kOverHangMax1VAG[3] = { 6, 3, 2 };
-static const int16_t kOverHangMax2VAG[3] = { 9, 5, 3 };
-static const int16_t kLocalThresholdVAG[3] = { 94, 94, 94 };
-static const int16_t kGlobalThresholdVAG[3] = { 1100, 1050, 1100 };
-
-// Calculates the weighted average w.r.t. number of Gaussians. The |data| are
-// updated with an |offset| before averaging.
-//
-// - data     [i/o] : Data to average.
-// - offset   [i]   : An offset added to |data|.
-// - weights  [i]   : Weights used for averaging.
-//
-// returns          : The weighted average.
-static int32_t WeightedAverage(int16_t* data, int16_t offset,
-                               const int16_t* weights) {
-  int k;
-  int32_t weighted_average = 0;
-
-  for (k = 0; k < kNumGaussians; k++) {
-    data[k * kNumChannels] += offset;
-    weighted_average += data[k * kNumChannels] * weights[k * kNumChannels];
-  }
-  return weighted_average;
-}
-
-// An s16 x s32 -> s32 multiplication that's allowed to overflow. (It's still
-// undefined behavior, so not a good idea; this just makes UBSan ignore the
-// violation, so that our old code can continue to do what it's always been
-// doing.)
-static inline int32_t RTC_NO_SANITIZE("signed-integer-overflow")
-    OverflowingMulS16ByS32ToS32(int16_t a, int32_t b) {
-  return a * b;
-}
-
-// Calculates the probabilities for both speech and background noise using
-// Gaussian Mixture Models (GMM). A hypothesis-test is performed to decide which
-// type of signal is most probable.
-//
-// - self           [i/o] : Pointer to VAD instance
-// - features       [i]   : Feature vector of length |kNumChannels|
-//                          = log10(energy in frequency band)
-// - total_power    [i]   : Total power in audio frame.
-// - frame_length   [i]   : Number of input samples
-//
-// - returns              : the VAD decision (0 - noise, 1 - speech).
-static int16_t GmmProbability(VadInstT* self, int16_t* features,
-                              int16_t total_power, size_t frame_length) {
-  int channel, k;
-  int16_t feature_minimum;
-  int16_t h0, h1;
-  int16_t log_likelihood_ratio;
-  int16_t vadflag = 0;
-  int16_t shifts_h0, shifts_h1;
-  int16_t tmp_s16, tmp1_s16, tmp2_s16;
-  int16_t diff;
-  int gaussian;
-  int16_t nmk, nmk2, nmk3, smk, smk2, nsk, ssk;
-  int16_t delt, ndelt;
-  int16_t maxspe, maxmu;
-  int16_t deltaN[kTableSize], deltaS[kTableSize];
-  int16_t ngprvec[kTableSize] = { 0 };  // Conditional probability = 0.
-  int16_t sgprvec[kTableSize] = { 0 };  // Conditional probability = 0.
-  int32_t h0_test, h1_test;
-  int32_t tmp1_s32, tmp2_s32;
-  int32_t sum_log_likelihood_ratios = 0;
-  int32_t noise_global_mean, speech_global_mean;
-  int32_t noise_probability[kNumGaussians], speech_probability[kNumGaussians];
-  int16_t overhead1, overhead2, individualTest, totalTest;
-
-  // Set various thresholds based on frame lengths (80, 160 or 240 samples).
-  if (frame_length == 80) {
-    overhead1 = self->over_hang_max_1[0];
-    overhead2 = self->over_hang_max_2[0];
-    individualTest = self->individual[0];
-    totalTest = self->total[0];
-  } else if (frame_length == 160) {
-    overhead1 = self->over_hang_max_1[1];
-    overhead2 = self->over_hang_max_2[1];
-    individualTest = self->individual[1];
-    totalTest = self->total[1];
-  } else {
-    overhead1 = self->over_hang_max_1[2];
-    overhead2 = self->over_hang_max_2[2];
-    individualTest = self->individual[2];
-    totalTest = self->total[2];
-  }
-
-  if (total_power > kMinEnergy) {
-    // The signal power of current frame is large enough for processing. The
-    // processing consists of two parts:
-    // 1) Calculating the likelihood of speech and thereby a VAD decision.
-    // 2) Updating the underlying model, w.r.t., the decision made.
-
-    // The detection scheme is an LRT with hypothesis
-    // H0: Noise
-    // H1: Speech
-    //
-    // We combine a global LRT with local tests, for each frequency sub-band,
-    // here defined as |channel|.
-    for (channel = 0; channel < kNumChannels; channel++) {
-      // For each channel we model the probability with a GMM consisting of
-      // |kNumGaussians|, with different means and standard deviations depending
-      // on H0 or H1.
-      h0_test = 0;
-      h1_test = 0;
-      for (k = 0; k < kNumGaussians; k++) {
-        gaussian = channel + k * kNumChannels;
-        // Probability under H0, that is, probability of frame being noise.
-        // Value given in Q27 = Q7 * Q20.
-        tmp1_s32 = WebRtcVad_GaussianProbability(features[channel],
-                                                 self->noise_means[gaussian],
-                                                 self->noise_stds[gaussian],
-                                                 &deltaN[gaussian]);
-        noise_probability[k] = kNoiseDataWeights[gaussian] * tmp1_s32;
-        h0_test += noise_probability[k];  // Q27
-
-        // Probability under H1, that is, probability of frame being speech.
-        // Value given in Q27 = Q7 * Q20.
-        tmp1_s32 = WebRtcVad_GaussianProbability(features[channel],
-                                                 self->speech_means[gaussian],
-                                                 self->speech_stds[gaussian],
-                                                 &deltaS[gaussian]);
-        speech_probability[k] = kSpeechDataWeights[gaussian] * tmp1_s32;
-        h1_test += speech_probability[k];  // Q27
-      }
-
-      // Calculate the log likelihood ratio: log2(Pr{X|H1} / Pr{X|H1}).
-      // Approximation:
-      // log2(Pr{X|H1} / Pr{X|H1}) = log2(Pr{X|H1}*2^Q) - log2(Pr{X|H1}*2^Q)
-      //                           = log2(h1_test) - log2(h0_test)
-      //                           = log2(2^(31-shifts_h1)*(1+b1))
-      //                             - log2(2^(31-shifts_h0)*(1+b0))
-      //                           = shifts_h0 - shifts_h1
-      //                             + log2(1+b1) - log2(1+b0)
-      //                          ~= shifts_h0 - shifts_h1
-      //
-      // Note that b0 and b1 are values less than 1, hence, 0 <= log2(1+b0) < 1.
-      // Further, b0 and b1 are independent and on the average the two terms
-      // cancel.
-      shifts_h0 = WebRtcSpl_NormW32(h0_test);
-      shifts_h1 = WebRtcSpl_NormW32(h1_test);
-      if (h0_test == 0) {
-        shifts_h0 = 31;
-      }
-      if (h1_test == 0) {
-        shifts_h1 = 31;
-      }
-      log_likelihood_ratio = shifts_h0 - shifts_h1;
-
-      // Update |sum_log_likelihood_ratios| with spectrum weighting. This is
-      // used for the global VAD decision.
-      sum_log_likelihood_ratios +=
-          (int32_t) (log_likelihood_ratio * kSpectrumWeight[channel]);
-
-      // Local VAD decision.
-      if ((log_likelihood_ratio * 4) > individualTest) {
-        vadflag = 1;
-      }
-
-      // TODO(bjornv): The conditional probabilities below are applied on the
-      // hard coded number of Gaussians set to two. Find a way to generalize.
-      // Calculate local noise probabilities used later when updating the GMM.
-      h0 = (int16_t) (h0_test >> 12);  // Q15
-      if (h0 > 0) {
-        // High probability of noise. Assign conditional probabilities for each
-        // Gaussian in the GMM.
-        tmp1_s32 = (noise_probability[0] & 0xFFFFF000) << 2;  // Q29
-        ngprvec[channel] = (int16_t) WebRtcSpl_DivW32W16(tmp1_s32, h0);  // Q14
-        ngprvec[channel + kNumChannels] = 16384 - ngprvec[channel];
-      } else {
-        // Low noise probability. Assign conditional probability 1 to the first
-        // Gaussian and 0 to the rest (which is already set at initialization).
-        ngprvec[channel] = 16384;
-      }
-
-      // Calculate local speech probabilities used later when updating the GMM.
-      h1 = (int16_t) (h1_test >> 12);  // Q15
-      if (h1 > 0) {
-        // High probability of speech. Assign conditional probabilities for each
-        // Gaussian in the GMM. Otherwise use the initialized values, i.e., 0.
-        tmp1_s32 = (speech_probability[0] & 0xFFFFF000) << 2;  // Q29
-        sgprvec[channel] = (int16_t) WebRtcSpl_DivW32W16(tmp1_s32, h1);  // Q14
-        sgprvec[channel + kNumChannels] = 16384 - sgprvec[channel];
-      }
-    }
-
-    // Make a global VAD decision.
-    vadflag |= (sum_log_likelihood_ratios >= totalTest);
-
-    // Update the model parameters.
-    maxspe = 12800;
-    for (channel = 0; channel < kNumChannels; channel++) {
-
-      // Get minimum value in past which is used for long term correction in Q4.
-      feature_minimum = WebRtcVad_FindMinimum(self, features[channel], channel);
-
-      // Compute the "global" mean, that is the sum of the two means weighted.
-      noise_global_mean = WeightedAverage(&self->noise_means[channel], 0,
-                                          &kNoiseDataWeights[channel]);
-      tmp1_s16 = (int16_t) (noise_global_mean >> 6);  // Q8
-
-      for (k = 0; k < kNumGaussians; k++) {
-        gaussian = channel + k * kNumChannels;
-
-        nmk = self->noise_means[gaussian];
-        smk = self->speech_means[gaussian];
-        nsk = self->noise_stds[gaussian];
-        ssk = self->speech_stds[gaussian];
-
-        // Update noise mean vector if the frame consists of noise only.
-        nmk2 = nmk;
-        if (!vadflag) {
-          // deltaN = (x-mu)/sigma^2
-          // ngprvec[k] = |noise_probability[k]| /
-          //   (|noise_probability[0]| + |noise_probability[1]|)
-
-          // (Q14 * Q11 >> 11) = Q14.
-          delt = (int16_t)((ngprvec[gaussian] * deltaN[gaussian]) >> 11);
-          // Q7 + (Q14 * Q15 >> 22) = Q7.
-          nmk2 = nmk + (int16_t)((delt * kNoiseUpdateConst) >> 22);
-        }
-
-        // Long term correction of the noise mean.
-        // Q8 - Q8 = Q8.
-        ndelt = (feature_minimum << 4) - tmp1_s16;
-        // Q7 + (Q8 * Q8) >> 9 = Q7.
-        nmk3 = nmk2 + (int16_t)((ndelt * kBackEta) >> 9);
-
-        // Control that the noise mean does not drift to much.
-        tmp_s16 = (int16_t) ((k + 5) << 7);
-        if (nmk3 < tmp_s16) {
-          nmk3 = tmp_s16;
-        }
-        tmp_s16 = (int16_t) ((72 + k - channel) << 7);
-        if (nmk3 > tmp_s16) {
-          nmk3 = tmp_s16;
-        }
-        self->noise_means[gaussian] = nmk3;
-
-        if (vadflag) {
-          // Update speech mean vector:
-          // |deltaS| = (x-mu)/sigma^2
-          // sgprvec[k] = |speech_probability[k]| /
-          //   (|speech_probability[0]| + |speech_probability[1]|)
-
-          // (Q14 * Q11) >> 11 = Q14.
-          delt = (int16_t)((sgprvec[gaussian] * deltaS[gaussian]) >> 11);
-          // Q14 * Q15 >> 21 = Q8.
-          tmp_s16 = (int16_t)((delt * kSpeechUpdateConst) >> 21);
-          // Q7 + (Q8 >> 1) = Q7. With rounding.
-          smk2 = smk + ((tmp_s16 + 1) >> 1);
-
-          // Control that the speech mean does not drift to much.
-          maxmu = maxspe + 640;
-          if (smk2 < kMinimumMean[k]) {
-            smk2 = kMinimumMean[k];
-          }
-          if (smk2 > maxmu) {
-            smk2 = maxmu;
-          }
-          self->speech_means[gaussian] = smk2;  // Q7.
-
-          // (Q7 >> 3) = Q4. With rounding.
-          tmp_s16 = ((smk + 4) >> 3);
-
-          tmp_s16 = features[channel] - tmp_s16;  // Q4
-          // (Q11 * Q4 >> 3) = Q12.
-          tmp1_s32 = (deltaS[gaussian] * tmp_s16) >> 3;
-          tmp2_s32 = tmp1_s32 - 4096;
-          tmp_s16 = sgprvec[gaussian] >> 2;
-          // (Q14 >> 2) * Q12 = Q24.
-          tmp1_s32 = tmp_s16 * tmp2_s32;
-
-          tmp2_s32 = tmp1_s32 >> 4;  // Q20
-
-          // 0.1 * Q20 / Q7 = Q13.
-          if (tmp2_s32 > 0) {
-            tmp_s16 = (int16_t) WebRtcSpl_DivW32W16(tmp2_s32, ssk * 10);
-          } else {
-            tmp_s16 = (int16_t) WebRtcSpl_DivW32W16(-tmp2_s32, ssk * 10);
-            tmp_s16 = -tmp_s16;
-          }
-          // Divide by 4 giving an update factor of 0.025 (= 0.1 / 4).
-          // Note that division by 4 equals shift by 2, hence,
-          // (Q13 >> 8) = (Q13 >> 6) / 4 = Q7.
-          tmp_s16 += 128;  // Rounding.
-          ssk += (tmp_s16 >> 8);
-          if (ssk < kMinStd) {
-            ssk = kMinStd;
-          }
-          self->speech_stds[gaussian] = ssk;
-        } else {
-          // Update GMM variance vectors.
-          // deltaN * (features[channel] - nmk) - 1
-          // Q4 - (Q7 >> 3) = Q4.
-          tmp_s16 = features[channel] - (nmk >> 3);
-          // (Q11 * Q4 >> 3) = Q12.
-          tmp1_s32 = (deltaN[gaussian] * tmp_s16) >> 3;
-          tmp1_s32 -= 4096;
-
-          // (Q14 >> 2) * Q12 = Q24.
-          tmp_s16 = (ngprvec[gaussian] + 2) >> 2;
-          tmp2_s32 = OverflowingMulS16ByS32ToS32(tmp_s16, tmp1_s32);
-          // Q20  * approx 0.001 (2^-10=0.0009766), hence,
-          // (Q24 >> 14) = (Q24 >> 4) / 2^10 = Q20.
-          tmp1_s32 = tmp2_s32 >> 14;
-
-          // Q20 / Q7 = Q13.
-          if (tmp1_s32 > 0) {
-            tmp_s16 = (int16_t) WebRtcSpl_DivW32W16(tmp1_s32, nsk);
-          } else {
-            tmp_s16 = (int16_t) WebRtcSpl_DivW32W16(-tmp1_s32, nsk);
-            tmp_s16 = -tmp_s16;
-          }
-          tmp_s16 += 32;  // Rounding
-          nsk += tmp_s16 >> 6;  // Q13 >> 6 = Q7.
-          if (nsk < kMinStd) {
-            nsk = kMinStd;
-          }
-          self->noise_stds[gaussian] = nsk;
-        }
-      }
-
-      // Separate models if they are too close.
-      // |noise_global_mean| in Q14 (= Q7 * Q7).
-      noise_global_mean = WeightedAverage(&self->noise_means[channel], 0,
-                                          &kNoiseDataWeights[channel]);
-
-      // |speech_global_mean| in Q14 (= Q7 * Q7).
-      speech_global_mean = WeightedAverage(&self->speech_means[channel], 0,
-                                           &kSpeechDataWeights[channel]);
-
-      // |diff| = "global" speech mean - "global" noise mean.
-      // (Q14 >> 9) - (Q14 >> 9) = Q5.
-      diff = (int16_t) (speech_global_mean >> 9) -
-          (int16_t) (noise_global_mean >> 9);
-      if (diff < kMinimumDifference[channel]) {
-        tmp_s16 = kMinimumDifference[channel] - diff;
-
-        // |tmp1_s16| = ~0.8 * (kMinimumDifference - diff) in Q7.
-        // |tmp2_s16| = ~0.2 * (kMinimumDifference - diff) in Q7.
-        tmp1_s16 = (int16_t)((13 * tmp_s16) >> 2);
-        tmp2_s16 = (int16_t)((3 * tmp_s16) >> 2);
-
-        // Move Gaussian means for speech model by |tmp1_s16| and update
-        // |speech_global_mean|. Note that |self->speech_means[channel]| is
-        // changed after the call.
-        speech_global_mean = WeightedAverage(&self->speech_means[channel],
-                                             tmp1_s16,
-                                             &kSpeechDataWeights[channel]);
-
-        // Move Gaussian means for noise model by -|tmp2_s16| and update
-        // |noise_global_mean|. Note that |self->noise_means[channel]| is
-        // changed after the call.
-        noise_global_mean = WeightedAverage(&self->noise_means[channel],
-                                            -tmp2_s16,
-                                            &kNoiseDataWeights[channel]);
-      }
-
-      // Control that the speech & noise means do not drift to much.
-      maxspe = kMaximumSpeech[channel];
-      tmp2_s16 = (int16_t) (speech_global_mean >> 7);
-      if (tmp2_s16 > maxspe) {
-        // Upper limit of speech model.
-        tmp2_s16 -= maxspe;
-
-        for (k = 0; k < kNumGaussians; k++) {
-          self->speech_means[channel + k * kNumChannels] -= tmp2_s16;
-        }
-      }
-
-      tmp2_s16 = (int16_t) (noise_global_mean >> 7);
-      if (tmp2_s16 > kMaximumNoise[channel]) {
-        tmp2_s16 -= kMaximumNoise[channel];
-
-        for (k = 0; k < kNumGaussians; k++) {
-          self->noise_means[channel + k * kNumChannels] -= tmp2_s16;
-        }
-      }
-    }
-    self->frame_counter++;
-  }
-
-  // Smooth with respect to transition hysteresis.
-  if (!vadflag) {
-    if (self->over_hang > 0) {
-      vadflag = 2 + self->over_hang;
-      self->over_hang--;
-    }
-    self->num_of_speech = 0;
-  } else {
-    self->num_of_speech++;
-    if (self->num_of_speech > kMaxSpeechFrames) {
-      self->num_of_speech = kMaxSpeechFrames;
-      self->over_hang = overhead2;
-    } else {
-      self->over_hang = overhead1;
-    }
-  }
-  return vadflag;
-}
-
-// Initialize the VAD. Set aggressiveness mode to default value.
-int WebRtcVad_InitCore(VadInstT* self) {
-  int i;
-
-  if (self == NULL) {
-    return -1;
-  }
-
-  // Initialization of general struct variables.
-  self->vad = 1;  // Speech active (=1).
-  self->frame_counter = 0;
-  self->over_hang = 0;
-  self->num_of_speech = 0;
-
-  // Initialization of downsampling filter state.
-  memset(self->downsampling_filter_states, 0,
-         sizeof(self->downsampling_filter_states));
-
-  // Initialization of 48 to 8 kHz downsampling.
-  WebRtcSpl_ResetResample48khzTo8khz(&self->state_48_to_8);
-
-  // Read initial PDF parameters.
-  for (i = 0; i < kTableSize; i++) {
-    self->noise_means[i] = kNoiseDataMeans[i];
-    self->speech_means[i] = kSpeechDataMeans[i];
-    self->noise_stds[i] = kNoiseDataStds[i];
-    self->speech_stds[i] = kSpeechDataStds[i];
-  }
-
-  // Initialize Index and Minimum value vectors.
-  for (i = 0; i < 16 * kNumChannels; i++) {
-    self->low_value_vector[i] = 10000;
-    self->index_vector[i] = 0;
-  }
-
-  // Initialize splitting filter states.
-  memset(self->upper_state, 0, sizeof(self->upper_state));
-  memset(self->lower_state, 0, sizeof(self->lower_state));
-
-  // Initialize high pass filter states.
-  memset(self->hp_filter_state, 0, sizeof(self->hp_filter_state));
-
-  // Initialize mean value memory, for WebRtcVad_FindMinimum().
-  for (i = 0; i < kNumChannels; i++) {
-    self->mean_value[i] = 1600;
-  }
-
-  // Set aggressiveness mode to default (=|kDefaultMode|).
-  if (WebRtcVad_set_mode_core(self, kDefaultMode) != 0) {
-    return -1;
-  }
-
-  self->init_flag = kInitCheck;
-
-  return 0;
-}
-
-// Set aggressiveness mode
-int WebRtcVad_set_mode_core(VadInstT* self, int mode) {
-  int return_value = 0;
-
-  switch (mode) {
-    case 0:
-      // Quality mode.
-      memcpy(self->over_hang_max_1, kOverHangMax1Q,
-             sizeof(self->over_hang_max_1));
-      memcpy(self->over_hang_max_2, kOverHangMax2Q,
-             sizeof(self->over_hang_max_2));
-      memcpy(self->individual, kLocalThresholdQ,
-             sizeof(self->individual));
-      memcpy(self->total, kGlobalThresholdQ,
-             sizeof(self->total));
-      break;
-    case 1:
-      // Low bitrate mode.
-      memcpy(self->over_hang_max_1, kOverHangMax1LBR,
-             sizeof(self->over_hang_max_1));
-      memcpy(self->over_hang_max_2, kOverHangMax2LBR,
-             sizeof(self->over_hang_max_2));
-      memcpy(self->individual, kLocalThresholdLBR,
-             sizeof(self->individual));
-      memcpy(self->total, kGlobalThresholdLBR,
-             sizeof(self->total));
-      break;
-    case 2:
-      // Aggressive mode.
-      memcpy(self->over_hang_max_1, kOverHangMax1AGG,
-             sizeof(self->over_hang_max_1));
-      memcpy(self->over_hang_max_2, kOverHangMax2AGG,
-             sizeof(self->over_hang_max_2));
-      memcpy(self->individual, kLocalThresholdAGG,
-             sizeof(self->individual));
-      memcpy(self->total, kGlobalThresholdAGG,
-             sizeof(self->total));
-      break;
-    case 3:
-      // Very aggressive mode.
-      memcpy(self->over_hang_max_1, kOverHangMax1VAG,
-             sizeof(self->over_hang_max_1));
-      memcpy(self->over_hang_max_2, kOverHangMax2VAG,
-             sizeof(self->over_hang_max_2));
-      memcpy(self->individual, kLocalThresholdVAG,
-             sizeof(self->individual));
-      memcpy(self->total, kGlobalThresholdVAG,
-             sizeof(self->total));
-      break;
-    default:
-      return_value = -1;
-      break;
-  }
-
-  return return_value;
-}
-
-// Calculate VAD decision by first extracting feature values and then calculate
-// probability for both speech and background noise.
-
-int WebRtcVad_CalcVad48khz(VadInstT* inst, const int16_t* speech_frame,
-                           size_t frame_length) {
-  int vad;
-  size_t i;
-  int16_t speech_nb[240];  // 30 ms in 8 kHz.
-  // |tmp_mem| is a temporary memory used by resample function, length is
-  // frame length in 10 ms (480 samples) + 256 extra.
-  int32_t tmp_mem[480 + 256] = { 0 };
-  const size_t kFrameLen10ms48khz = 480;
-  const size_t kFrameLen10ms8khz = 80;
-  size_t num_10ms_frames = frame_length / kFrameLen10ms48khz;
-
-  for (i = 0; i < num_10ms_frames; i++) {
-    WebRtcSpl_Resample48khzTo8khz(speech_frame,
-                                  &speech_nb[i * kFrameLen10ms8khz],
-                                  &inst->state_48_to_8,
-                                  tmp_mem);
-  }
-
-  // Do VAD on an 8 kHz signal
-  vad = WebRtcVad_CalcVad8khz(inst, speech_nb, frame_length / 6);
-
-  return vad;
-}
-
-int WebRtcVad_CalcVad32khz(VadInstT* inst, const int16_t* speech_frame,
-                           size_t frame_length)
-{
-    size_t len;
-    int vad;
-    int16_t speechWB[480]; // Downsampled speech frame: 960 samples (30ms in SWB)
-    int16_t speechNB[240]; // Downsampled speech frame: 480 samples (30ms in WB)
-
-
-    // Downsample signal 32->16->8 before doing VAD
-    WebRtcVad_Downsampling(speech_frame, speechWB, &(inst->downsampling_filter_states[2]),
-                           frame_length);
-    len = frame_length / 2;
-
-    WebRtcVad_Downsampling(speechWB, speechNB, inst->downsampling_filter_states, len);
-    len /= 2;
-
-    // Do VAD on an 8 kHz signal
-    vad = WebRtcVad_CalcVad8khz(inst, speechNB, len);
-
-    return vad;
-}
-
-int WebRtcVad_CalcVad16khz(VadInstT* inst, const int16_t* speech_frame,
-                           size_t frame_length)
-{
-    size_t len;
-    int vad;
-    int16_t speechNB[240]; // Downsampled speech frame: 480 samples (30ms in WB)
-
-    // Wideband: Downsample signal before doing VAD
-    WebRtcVad_Downsampling(speech_frame, speechNB, inst->downsampling_filter_states,
-                           frame_length);
-
-    len = frame_length / 2;
-    vad = WebRtcVad_CalcVad8khz(inst, speechNB, len);
-
-    return vad;
-}
-
-int WebRtcVad_CalcVad8khz(VadInstT* inst, const int16_t* speech_frame,
-                          size_t frame_length)
-{
-    int16_t feature_vector[kNumChannels], total_power;
-
-    // Get power in the bands
-    total_power = WebRtcVad_CalculateFeatures(inst, speech_frame, frame_length,
-                                              feature_vector);
-
-    // Make a VAD
-    inst->vad = GmmProbability(inst, feature_vector, total_power, frame_length);
-
-    return inst->vad;
-}
diff --git a/submodules/libtgvoip/webrtc_dsp/common_audio/vad/vad_core.h b/submodules/libtgvoip/webrtc_dsp/common_audio/vad/vad_core.h
deleted file mode 100644
index e79696cef0..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/common_audio/vad/vad_core.h
+++ /dev/null
@@ -1,114 +0,0 @@
-/*
- *  Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-/*
- * This header file includes the descriptions of the core VAD calls.
- */
-
-#ifndef COMMON_AUDIO_VAD_VAD_CORE_H_
-#define COMMON_AUDIO_VAD_VAD_CORE_H_
-
-#include "common_audio/signal_processing/include/signal_processing_library.h"
-
-enum { kNumChannels = 6 };   // Number of frequency bands (named channels).
-enum { kNumGaussians = 2 };  // Number of Gaussians per channel in the GMM.
-enum { kTableSize = kNumChannels * kNumGaussians };
-enum { kMinEnergy = 10 };  // Minimum energy required to trigger audio signal.
-
-typedef struct VadInstT_ {
-  int vad;
-  int32_t downsampling_filter_states[4];
-  WebRtcSpl_State48khzTo8khz state_48_to_8;
-  int16_t noise_means[kTableSize];
-  int16_t speech_means[kTableSize];
-  int16_t noise_stds[kTableSize];
-  int16_t speech_stds[kTableSize];
-  // TODO(bjornv): Change to |frame_count|.
-  int32_t frame_counter;
-  int16_t over_hang;  // Over Hang
-  int16_t num_of_speech;
-  // TODO(bjornv): Change to |age_vector|.
-  int16_t index_vector[16 * kNumChannels];
-  int16_t low_value_vector[16 * kNumChannels];
-  // TODO(bjornv): Change to |median|.
-  int16_t mean_value[kNumChannels];
-  int16_t upper_state[5];
-  int16_t lower_state[5];
-  int16_t hp_filter_state[4];
-  int16_t over_hang_max_1[3];
-  int16_t over_hang_max_2[3];
-  int16_t individual[3];
-  int16_t total[3];
-
-  int init_flag;
-} VadInstT;
-
-// Initializes the core VAD component. The default aggressiveness mode is
-// controlled by |kDefaultMode| in vad_core.c.
-//
-// - self [i/o] : Instance that should be initialized
-//
-// returns      : 0 (OK), -1 (null pointer in or if the default mode can't be
-//                set)
-int WebRtcVad_InitCore(VadInstT* self);
-
-/****************************************************************************
- * WebRtcVad_set_mode_core(...)
- *
- * This function changes the VAD settings
- *
- * Input:
- *      - inst      : VAD instance
- *      - mode      : Aggressiveness degree
- *                    0 (High quality) - 3 (Highly aggressive)
- *
- * Output:
- *      - inst      : Changed  instance
- *
- * Return value     :  0 - Ok
- *                    -1 - Error
- */
-
-int WebRtcVad_set_mode_core(VadInstT* self, int mode);
-
-/****************************************************************************
- * WebRtcVad_CalcVad48khz(...)
- * WebRtcVad_CalcVad32khz(...)
- * WebRtcVad_CalcVad16khz(...)
- * WebRtcVad_CalcVad8khz(...)
- *
- * Calculate probability for active speech and make VAD decision.
- *
- * Input:
- *      - inst          : Instance that should be initialized
- *      - speech_frame  : Input speech frame
- *      - frame_length  : Number of input samples
- *
- * Output:
- *      - inst          : Updated filter states etc.
- *
- * Return value         : VAD decision
- *                        0 - No active speech
- *                        1-6 - Active speech
- */
-int WebRtcVad_CalcVad48khz(VadInstT* inst,
-                           const int16_t* speech_frame,
-                           size_t frame_length);
-int WebRtcVad_CalcVad32khz(VadInstT* inst,
-                           const int16_t* speech_frame,
-                           size_t frame_length);
-int WebRtcVad_CalcVad16khz(VadInstT* inst,
-                           const int16_t* speech_frame,
-                           size_t frame_length);
-int WebRtcVad_CalcVad8khz(VadInstT* inst,
-                          const int16_t* speech_frame,
-                          size_t frame_length);
-
-#endif  // COMMON_AUDIO_VAD_VAD_CORE_H_
diff --git a/submodules/libtgvoip/webrtc_dsp/common_audio/vad/vad_filterbank.c b/submodules/libtgvoip/webrtc_dsp/common_audio/vad/vad_filterbank.c
deleted file mode 100644
index 1513153c48..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/common_audio/vad/vad_filterbank.c
+++ /dev/null
@@ -1,329 +0,0 @@
-/*
- *  Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#include "common_audio/vad/vad_filterbank.h"
-
-#include "rtc_base/checks.h"
-#include "common_audio/signal_processing/include/signal_processing_library.h"
-
-// Constants used in LogOfEnergy().
-static const int16_t kLogConst = 24660;  // 160*log10(2) in Q9.
-static const int16_t kLogEnergyIntPart = 14336;  // 14 in Q10
-
-// Coefficients used by HighPassFilter, Q14.
-static const int16_t kHpZeroCoefs[3] = { 6631, -13262, 6631 };
-static const int16_t kHpPoleCoefs[3] = { 16384, -7756, 5620 };
-
-// Allpass filter coefficients, upper and lower, in Q15.
-// Upper: 0.64, Lower: 0.17
-static const int16_t kAllPassCoefsQ15[2] = { 20972, 5571 };
-
-// Adjustment for division with two in SplitFilter.
-static const int16_t kOffsetVector[6] = { 368, 368, 272, 176, 176, 176 };
-
-// High pass filtering, with a cut-off frequency at 80 Hz, if the |data_in| is
-// sampled at 500 Hz.
-//
-// - data_in      [i]   : Input audio data sampled at 500 Hz.
-// - data_length  [i]   : Length of input and output data.
-// - filter_state [i/o] : State of the filter.
-// - data_out     [o]   : Output audio data in the frequency interval
-//                        80 - 250 Hz.
-static void HighPassFilter(const int16_t* data_in, size_t data_length,
-                           int16_t* filter_state, int16_t* data_out) {
-  size_t i;
-  const int16_t* in_ptr = data_in;
-  int16_t* out_ptr = data_out;
-  int32_t tmp32 = 0;
-
-
-  // The sum of the absolute values of the impulse response:
-  // The zero/pole-filter has a max amplification of a single sample of: 1.4546
-  // Impulse response: 0.4047 -0.6179 -0.0266  0.1993  0.1035  -0.0194
-  // The all-zero section has a max amplification of a single sample of: 1.6189
-  // Impulse response: 0.4047 -0.8094  0.4047  0       0        0
-  // The all-pole section has a max amplification of a single sample of: 1.9931
-  // Impulse response: 1.0000  0.4734 -0.1189 -0.2187 -0.0627   0.04532
-
-  for (i = 0; i < data_length; i++) {
-    // All-zero section (filter coefficients in Q14).
-    tmp32 = kHpZeroCoefs[0] * *in_ptr;
-    tmp32 += kHpZeroCoefs[1] * filter_state[0];
-    tmp32 += kHpZeroCoefs[2] * filter_state[1];
-    filter_state[1] = filter_state[0];
-    filter_state[0] = *in_ptr++;
-
-    // All-pole section (filter coefficients in Q14).
-    tmp32 -= kHpPoleCoefs[1] * filter_state[2];
-    tmp32 -= kHpPoleCoefs[2] * filter_state[3];
-    filter_state[3] = filter_state[2];
-    filter_state[2] = (int16_t) (tmp32 >> 14);
-    *out_ptr++ = filter_state[2];
-  }
-}
-
-// All pass filtering of |data_in|, used before splitting the signal into two
-// frequency bands (low pass vs high pass).
-// Note that |data_in| and |data_out| can NOT correspond to the same address.
-//
-// - data_in            [i]   : Input audio signal given in Q0.
-// - data_length        [i]   : Length of input and output data.
-// - filter_coefficient [i]   : Given in Q15.
-// - filter_state       [i/o] : State of the filter given in Q(-1).
-// - data_out           [o]   : Output audio signal given in Q(-1).
-static void AllPassFilter(const int16_t* data_in, size_t data_length,
-                          int16_t filter_coefficient, int16_t* filter_state,
-                          int16_t* data_out) {
-  // The filter can only cause overflow (in the w16 output variable)
-  // if more than 4 consecutive input numbers are of maximum value and
-  // has the the same sign as the impulse responses first taps.
-  // First 6 taps of the impulse response:
-  // 0.6399 0.5905 -0.3779 0.2418 -0.1547 0.0990
-
-  size_t i;
-  int16_t tmp16 = 0;
-  int32_t tmp32 = 0;
-  int32_t state32 = ((int32_t) (*filter_state) * (1 << 16));  // Q15
-
-  for (i = 0; i < data_length; i++) {
-    tmp32 = state32 + filter_coefficient * *data_in;
-    tmp16 = (int16_t) (tmp32 >> 16);  // Q(-1)
-    *data_out++ = tmp16;
-    state32 = (*data_in * (1 << 14)) - filter_coefficient * tmp16;  // Q14
-    state32 *= 2;  // Q15.
-    data_in += 2;
-  }
-
-  *filter_state = (int16_t) (state32 >> 16);  // Q(-1)
-}
-
-// Splits |data_in| into |hp_data_out| and |lp_data_out| corresponding to
-// an upper (high pass) part and a lower (low pass) part respectively.
-//
-// - data_in      [i]   : Input audio data to be split into two frequency bands.
-// - data_length  [i]   : Length of |data_in|.
-// - upper_state  [i/o] : State of the upper filter, given in Q(-1).
-// - lower_state  [i/o] : State of the lower filter, given in Q(-1).
-// - hp_data_out  [o]   : Output audio data of the upper half of the spectrum.
-//                        The length is |data_length| / 2.
-// - lp_data_out  [o]   : Output audio data of the lower half of the spectrum.
-//                        The length is |data_length| / 2.
-static void SplitFilter(const int16_t* data_in, size_t data_length,
-                        int16_t* upper_state, int16_t* lower_state,
-                        int16_t* hp_data_out, int16_t* lp_data_out) {
-  size_t i;
-  size_t half_length = data_length >> 1;  // Downsampling by 2.
-  int16_t tmp_out;
-
-  // All-pass filtering upper branch.
-  AllPassFilter(&data_in[0], half_length, kAllPassCoefsQ15[0], upper_state,
-                hp_data_out);
-
-  // All-pass filtering lower branch.
-  AllPassFilter(&data_in[1], half_length, kAllPassCoefsQ15[1], lower_state,
-                lp_data_out);
-
-  // Make LP and HP signals.
-  for (i = 0; i < half_length; i++) {
-    tmp_out = *hp_data_out;
-    *hp_data_out++ -= *lp_data_out;
-    *lp_data_out++ += tmp_out;
-  }
-}
-
-// Calculates the energy of |data_in| in dB, and also updates an overall
-// |total_energy| if necessary.
-//
-// - data_in      [i]   : Input audio data for energy calculation.
-// - data_length  [i]   : Length of input data.
-// - offset       [i]   : Offset value added to |log_energy|.
-// - total_energy [i/o] : An external energy updated with the energy of
-//                        |data_in|.
-//                        NOTE: |total_energy| is only updated if
-//                        |total_energy| <= |kMinEnergy|.
-// - log_energy   [o]   : 10 * log10("energy of |data_in|") given in Q4.
-static void LogOfEnergy(const int16_t* data_in, size_t data_length,
-                        int16_t offset, int16_t* total_energy,
-                        int16_t* log_energy) {
-  // |tot_rshifts| accumulates the number of right shifts performed on |energy|.
-  int tot_rshifts = 0;
-  // The |energy| will be normalized to 15 bits. We use unsigned integer because
-  // we eventually will mask out the fractional part.
-  uint32_t energy = 0;
-
-  RTC_DCHECK(data_in);
-  RTC_DCHECK_GT(data_length, 0);
-
-  energy = (uint32_t) WebRtcSpl_Energy((int16_t*) data_in, data_length,
-                                       &tot_rshifts);
-
-  if (energy != 0) {
-    // By construction, normalizing to 15 bits is equivalent with 17 leading
-    // zeros of an unsigned 32 bit value.
-    int normalizing_rshifts = 17 - WebRtcSpl_NormU32(energy);
-    // In a 15 bit representation the leading bit is 2^14. log2(2^14) in Q10 is
-    // (14 << 10), which is what we initialize |log2_energy| with. For a more
-    // detailed derivations, see below.
-    int16_t log2_energy = kLogEnergyIntPart;
-
-    tot_rshifts += normalizing_rshifts;
-    // Normalize |energy| to 15 bits.
-    // |tot_rshifts| is now the total number of right shifts performed on
-    // |energy| after normalization. This means that |energy| is in
-    // Q(-tot_rshifts).
-    if (normalizing_rshifts < 0) {
-      energy <<= -normalizing_rshifts;
-    } else {
-      energy >>= normalizing_rshifts;
-    }
-
-    // Calculate the energy of |data_in| in dB, in Q4.
-    //
-    // 10 * log10("true energy") in Q4 = 2^4 * 10 * log10("true energy") =
-    // 160 * log10(|energy| * 2^|tot_rshifts|) =
-    // 160 * log10(2) * log2(|energy| * 2^|tot_rshifts|) =
-    // 160 * log10(2) * (log2(|energy|) + log2(2^|tot_rshifts|)) =
-    // (160 * log10(2)) * (log2(|energy|) + |tot_rshifts|) =
-    // |kLogConst| * (|log2_energy| + |tot_rshifts|)
-    //
-    // We know by construction that |energy| is normalized to 15 bits. Hence,
-    // |energy| = 2^14 + frac_Q15, where frac_Q15 is a fractional part in Q15.
-    // Further, we'd like |log2_energy| in Q10
-    // log2(|energy|) in Q10 = 2^10 * log2(2^14 + frac_Q15) =
-    // 2^10 * log2(2^14 * (1 + frac_Q15 * 2^-14)) =
-    // 2^10 * (14 + log2(1 + frac_Q15 * 2^-14)) ~=
-    // (14 << 10) + 2^10 * (frac_Q15 * 2^-14) =
-    // (14 << 10) + (frac_Q15 * 2^-4) = (14 << 10) + (frac_Q15 >> 4)
-    //
-    // Note that frac_Q15 = (|energy| & 0x00003FFF)
-
-    // Calculate and add the fractional part to |log2_energy|.
-    log2_energy += (int16_t) ((energy & 0x00003FFF) >> 4);
-
-    // |kLogConst| is in Q9, |log2_energy| in Q10 and |tot_rshifts| in Q0.
-    // Note that we in our derivation above have accounted for an output in Q4.
-    *log_energy = (int16_t)(((kLogConst * log2_energy) >> 19) +
-        ((tot_rshifts * kLogConst) >> 9));
-
-    if (*log_energy < 0) {
-      *log_energy = 0;
-    }
-  } else {
-    *log_energy = offset;
-    return;
-  }
-
-  *log_energy += offset;
-
-  // Update the approximate |total_energy| with the energy of |data_in|, if
-  // |total_energy| has not exceeded |kMinEnergy|. |total_energy| is used as an
-  // energy indicator in WebRtcVad_GmmProbability() in vad_core.c.
-  if (*total_energy <= kMinEnergy) {
-    if (tot_rshifts >= 0) {
-      // We know by construction that the |energy| > |kMinEnergy| in Q0, so add
-      // an arbitrary value such that |total_energy| exceeds |kMinEnergy|.
-      *total_energy += kMinEnergy + 1;
-    } else {
-      // By construction |energy| is represented by 15 bits, hence any number of
-      // right shifted |energy| will fit in an int16_t. In addition, adding the
-      // value to |total_energy| is wrap around safe as long as
-      // |kMinEnergy| < 8192.
-      *total_energy += (int16_t) (energy >> -tot_rshifts);  // Q0.
-    }
-  }
-}
-
-int16_t WebRtcVad_CalculateFeatures(VadInstT* self, const int16_t* data_in,
-                                    size_t data_length, int16_t* features) {
-  int16_t total_energy = 0;
-  // We expect |data_length| to be 80, 160 or 240 samples, which corresponds to
-  // 10, 20 or 30 ms in 8 kHz. Therefore, the intermediate downsampled data will
-  // have at most 120 samples after the first split and at most 60 samples after
-  // the second split.
-  int16_t hp_120[120], lp_120[120];
-  int16_t hp_60[60], lp_60[60];
-  const size_t half_data_length = data_length >> 1;
-  size_t length = half_data_length;  // |data_length| / 2, corresponds to
-                                     // bandwidth = 2000 Hz after downsampling.
-
-  // Initialize variables for the first SplitFilter().
-  int frequency_band = 0;
-  const int16_t* in_ptr = data_in;  // [0 - 4000] Hz.
-  int16_t* hp_out_ptr = hp_120;  // [2000 - 4000] Hz.
-  int16_t* lp_out_ptr = lp_120;  // [0 - 2000] Hz.
-
-  RTC_DCHECK_LE(data_length, 240);
-  RTC_DCHECK_LT(4, kNumChannels - 1);  // Checking maximum |frequency_band|.
-
-  // Split at 2000 Hz and downsample.
-  SplitFilter(in_ptr, data_length, &self->upper_state[frequency_band],
-              &self->lower_state[frequency_band], hp_out_ptr, lp_out_ptr);
-
-  // For the upper band (2000 Hz - 4000 Hz) split at 3000 Hz and downsample.
-  frequency_band = 1;
-  in_ptr = hp_120;  // [2000 - 4000] Hz.
-  hp_out_ptr = hp_60;  // [3000 - 4000] Hz.
-  lp_out_ptr = lp_60;  // [2000 - 3000] Hz.
-  SplitFilter(in_ptr, length, &self->upper_state[frequency_band],
-              &self->lower_state[frequency_band], hp_out_ptr, lp_out_ptr);
-
-  // Energy in 3000 Hz - 4000 Hz.
-  length >>= 1;  // |data_length| / 4 <=> bandwidth = 1000 Hz.
-
-  LogOfEnergy(hp_60, length, kOffsetVector[5], &total_energy, &features[5]);
-
-  // Energy in 2000 Hz - 3000 Hz.
-  LogOfEnergy(lp_60, length, kOffsetVector[4], &total_energy, &features[4]);
-
-  // For the lower band (0 Hz - 2000 Hz) split at 1000 Hz and downsample.
-  frequency_band = 2;
-  in_ptr = lp_120;  // [0 - 2000] Hz.
-  hp_out_ptr = hp_60;  // [1000 - 2000] Hz.
-  lp_out_ptr = lp_60;  // [0 - 1000] Hz.
-  length = half_data_length;  // |data_length| / 2 <=> bandwidth = 2000 Hz.
-  SplitFilter(in_ptr, length, &self->upper_state[frequency_band],
-              &self->lower_state[frequency_band], hp_out_ptr, lp_out_ptr);
-
-  // Energy in 1000 Hz - 2000 Hz.
-  length >>= 1;  // |data_length| / 4 <=> bandwidth = 1000 Hz.
-  LogOfEnergy(hp_60, length, kOffsetVector[3], &total_energy, &features[3]);
-
-  // For the lower band (0 Hz - 1000 Hz) split at 500 Hz and downsample.
-  frequency_band = 3;
-  in_ptr = lp_60;  // [0 - 1000] Hz.
-  hp_out_ptr = hp_120;  // [500 - 1000] Hz.
-  lp_out_ptr = lp_120;  // [0 - 500] Hz.
-  SplitFilter(in_ptr, length, &self->upper_state[frequency_band],
-              &self->lower_state[frequency_band], hp_out_ptr, lp_out_ptr);
-
-  // Energy in 500 Hz - 1000 Hz.
-  length >>= 1;  // |data_length| / 8 <=> bandwidth = 500 Hz.
-  LogOfEnergy(hp_120, length, kOffsetVector[2], &total_energy, &features[2]);
-
-  // For the lower band (0 Hz - 500 Hz) split at 250 Hz and downsample.
-  frequency_band = 4;
-  in_ptr = lp_120;  // [0 - 500] Hz.
-  hp_out_ptr = hp_60;  // [250 - 500] Hz.
-  lp_out_ptr = lp_60;  // [0 - 250] Hz.
-  SplitFilter(in_ptr, length, &self->upper_state[frequency_band],
-              &self->lower_state[frequency_band], hp_out_ptr, lp_out_ptr);
-
-  // Energy in 250 Hz - 500 Hz.
-  length >>= 1;  // |data_length| / 16 <=> bandwidth = 250 Hz.
-  LogOfEnergy(hp_60, length, kOffsetVector[1], &total_energy, &features[1]);
-
-  // Remove 0 Hz - 80 Hz, by high pass filtering the lower band.
-  HighPassFilter(lp_60, length, self->hp_filter_state, hp_120);
-
-  // Energy in 80 Hz - 250 Hz.
-  LogOfEnergy(hp_120, length, kOffsetVector[0], &total_energy, &features[0]);
-
-  return total_energy;
-}
diff --git a/submodules/libtgvoip/webrtc_dsp/common_audio/vad/vad_filterbank.h b/submodules/libtgvoip/webrtc_dsp/common_audio/vad/vad_filterbank.h
deleted file mode 100644
index 53bbbe10fd..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/common_audio/vad/vad_filterbank.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- *  Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-/*
- * This file includes feature calculating functionality used in vad_core.c.
- */
-
-#ifndef COMMON_AUDIO_VAD_VAD_FILTERBANK_H_
-#define COMMON_AUDIO_VAD_VAD_FILTERBANK_H_
-
-#include "common_audio/vad/vad_core.h"
-
-// Takes |data_length| samples of |data_in| and calculates the logarithm of the
-// energy of each of the |kNumChannels| = 6 frequency bands used by the VAD:
-//        80 Hz - 250 Hz
-//        250 Hz - 500 Hz
-//        500 Hz - 1000 Hz
-//        1000 Hz - 2000 Hz
-//        2000 Hz - 3000 Hz
-//        3000 Hz - 4000 Hz
-//
-// The values are given in Q4 and written to |features|. Further, an approximate
-// overall energy is returned. The return value is used in
-// WebRtcVad_GmmProbability() as a signal indicator, hence it is arbitrary above
-// the threshold |kMinEnergy|.
-//
-// - self         [i/o] : State information of the VAD.
-// - data_in      [i]   : Input audio data, for feature extraction.
-// - data_length  [i]   : Audio data size, in number of samples.
-// - features     [o]   : 10 * log10(energy in each frequency band), Q4.
-// - returns            : Total energy of the signal (NOTE! This value is not
-//                        exact. It is only used in a comparison.)
-int16_t WebRtcVad_CalculateFeatures(VadInstT* self,
-                                    const int16_t* data_in,
-                                    size_t data_length,
-                                    int16_t* features);
-
-#endif  // COMMON_AUDIO_VAD_VAD_FILTERBANK_H_
diff --git a/submodules/libtgvoip/webrtc_dsp/common_audio/vad/vad_gmm.c b/submodules/libtgvoip/webrtc_dsp/common_audio/vad/vad_gmm.c
deleted file mode 100644
index ddc87b6edd..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/common_audio/vad/vad_gmm.c
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
- *  Copyright (c) 2011 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#include "common_audio/vad/vad_gmm.h"
-
-#include "common_audio/signal_processing/include/signal_processing_library.h"
-
-static const int32_t kCompVar = 22005;
-static const int16_t kLog2Exp = 5909;  // log2(exp(1)) in Q12.
-
-// For a normal distribution, the probability of |input| is calculated and
-// returned (in Q20). The formula for normal distributed probability is
-//
-// 1 / s * exp(-(x - m)^2 / (2 * s^2))
-//
-// where the parameters are given in the following Q domains:
-// m = |mean| (Q7)
-// s = |std| (Q7)
-// x = |input| (Q4)
-// in addition to the probability we output |delta| (in Q11) used when updating
-// the noise/speech model.
-int32_t WebRtcVad_GaussianProbability(int16_t input,
-                                      int16_t mean,
-                                      int16_t std,
-                                      int16_t* delta) {
-  int16_t tmp16, inv_std, inv_std2, exp_value = 0;
-  int32_t tmp32;
-
-  // Calculate |inv_std| = 1 / s, in Q10.
-  // 131072 = 1 in Q17, and (|std| >> 1) is for rounding instead of truncation.
-  // Q-domain: Q17 / Q7 = Q10.
-  tmp32 = (int32_t) 131072 + (int32_t) (std >> 1);
-  inv_std = (int16_t) WebRtcSpl_DivW32W16(tmp32, std);
-
-  // Calculate |inv_std2| = 1 / s^2, in Q14.
-  tmp16 = (inv_std >> 2);  // Q10 -> Q8.
-  // Q-domain: (Q8 * Q8) >> 2 = Q14.
-  inv_std2 = (int16_t)((tmp16 * tmp16) >> 2);
-  // TODO(bjornv): Investigate if changing to
-  // inv_std2 = (int16_t)((inv_std * inv_std) >> 6);
-  // gives better accuracy.
-
-  tmp16 = (input << 3);  // Q4 -> Q7
-  tmp16 = tmp16 - mean;  // Q7 - Q7 = Q7
-
-  // To be used later, when updating noise/speech model.
-  // |delta| = (x - m) / s^2, in Q11.
-  // Q-domain: (Q14 * Q7) >> 10 = Q11.
-  *delta = (int16_t)((inv_std2 * tmp16) >> 10);
-
-  // Calculate the exponent |tmp32| = (x - m)^2 / (2 * s^2), in Q10. Replacing
-  // division by two with one shift.
-  // Q-domain: (Q11 * Q7) >> 8 = Q10.
-  tmp32 = (*delta * tmp16) >> 9;
-
-  // If the exponent is small enough to give a non-zero probability we calculate
-  // |exp_value| ~= exp(-(x - m)^2 / (2 * s^2))
-  //             ~= exp2(-log2(exp(1)) * |tmp32|).
-  if (tmp32 < kCompVar) {
-    // Calculate |tmp16| = log2(exp(1)) * |tmp32|, in Q10.
-    // Q-domain: (Q12 * Q10) >> 12 = Q10.
-    tmp16 = (int16_t)((kLog2Exp * tmp32) >> 12);
-    tmp16 = -tmp16;
-    exp_value = (0x0400 | (tmp16 & 0x03FF));
-    tmp16 ^= 0xFFFF;
-    tmp16 >>= 10;
-    tmp16 += 1;
-    // Get |exp_value| = exp(-|tmp32|) in Q10.
-    exp_value >>= tmp16;
-  }
-
-  // Calculate and return (1 / s) * exp(-(x - m)^2 / (2 * s^2)), in Q20.
-  // Q-domain: Q10 * Q10 = Q20.
-  return inv_std * exp_value;
-}
diff --git a/submodules/libtgvoip/webrtc_dsp/common_audio/vad/vad_gmm.h b/submodules/libtgvoip/webrtc_dsp/common_audio/vad/vad_gmm.h
deleted file mode 100644
index 6b2d11ba33..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/common_audio/vad/vad_gmm.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- *  Copyright (c) 2011 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-// Gaussian probability calculations internally used in vad_core.c.
-
-#ifndef COMMON_AUDIO_VAD_VAD_GMM_H_
-#define COMMON_AUDIO_VAD_VAD_GMM_H_
-
-#include <stdint.h>
-
-// Calculates the probability for |input|, given that |input| comes from a
-// normal distribution with mean and standard deviation (|mean|, |std|).
-//
-// Inputs:
-//      - input         : input sample in Q4.
-//      - mean          : mean input in the statistical model, Q7.
-//      - std           : standard deviation, Q7.
-//
-// Output:
-//
-//      - delta         : input used when updating the model, Q11.
-//                        |delta| = (|input| - |mean|) / |std|^2.
-//
-// Return:
-//   (probability for |input|) =
-//    1 / |std| * exp(-(|input| - |mean|)^2 / (2 * |std|^2));
-int32_t WebRtcVad_GaussianProbability(int16_t input,
-                                      int16_t mean,
-                                      int16_t std,
-                                      int16_t* delta);
-
-#endif  // COMMON_AUDIO_VAD_VAD_GMM_H_
diff --git a/submodules/libtgvoip/webrtc_dsp/common_audio/vad/vad_sp.c b/submodules/libtgvoip/webrtc_dsp/common_audio/vad/vad_sp.c
deleted file mode 100644
index d367c8b0af..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/common_audio/vad/vad_sp.c
+++ /dev/null
@@ -1,176 +0,0 @@
-/*
- *  Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#include "common_audio/vad/vad_sp.h"
-
-#include "rtc_base/checks.h"
-#include "common_audio/signal_processing/include/signal_processing_library.h"
-#include "common_audio/vad/vad_core.h"
-
-// Allpass filter coefficients, upper and lower, in Q13.
-// Upper: 0.64, Lower: 0.17.
-static const int16_t kAllPassCoefsQ13[2] = { 5243, 1392 };  // Q13.
-static const int16_t kSmoothingDown = 6553;  // 0.2 in Q15.
-static const int16_t kSmoothingUp = 32439;  // 0.99 in Q15.
-
-// TODO(bjornv): Move this function to vad_filterbank.c.
-// Downsampling filter based on splitting filter and allpass functions.
-void WebRtcVad_Downsampling(const int16_t* signal_in,
-                            int16_t* signal_out,
-                            int32_t* filter_state,
-                            size_t in_length) {
-  int16_t tmp16_1 = 0, tmp16_2 = 0;
-  int32_t tmp32_1 = filter_state[0];
-  int32_t tmp32_2 = filter_state[1];
-  size_t n = 0;
-  // Downsampling by 2 gives half length.
-  size_t half_length = (in_length >> 1);
-
-  // Filter coefficients in Q13, filter state in Q0.
-  for (n = 0; n < half_length; n++) {
-    // All-pass filtering upper branch.
-    tmp16_1 = (int16_t) ((tmp32_1 >> 1) +
-        ((kAllPassCoefsQ13[0] * *signal_in) >> 14));
-    *signal_out = tmp16_1;
-    tmp32_1 = (int32_t)(*signal_in++) - ((kAllPassCoefsQ13[0] * tmp16_1) >> 12);
-
-    // All-pass filtering lower branch.
-    tmp16_2 = (int16_t) ((tmp32_2 >> 1) +
-        ((kAllPassCoefsQ13[1] * *signal_in) >> 14));
-    *signal_out++ += tmp16_2;
-    tmp32_2 = (int32_t)(*signal_in++) - ((kAllPassCoefsQ13[1] * tmp16_2) >> 12);
-  }
-  // Store the filter states.
-  filter_state[0] = tmp32_1;
-  filter_state[1] = tmp32_2;
-}
-
-// Inserts |feature_value| into |low_value_vector|, if it is one of the 16
-// smallest values the last 100 frames. Then calculates and returns the median
-// of the five smallest values.
-int16_t WebRtcVad_FindMinimum(VadInstT* self,
-                              int16_t feature_value,
-                              int channel) {
-  int i = 0, j = 0;
-  int position = -1;
-  // Offset to beginning of the 16 minimum values in memory.
-  const int offset = (channel << 4);
-  int16_t current_median = 1600;
-  int16_t alpha = 0;
-  int32_t tmp32 = 0;
-  // Pointer to memory for the 16 minimum values and the age of each value of
-  // the |channel|.
-  int16_t* age = &self->index_vector[offset];
-  int16_t* smallest_values = &self->low_value_vector[offset];
-
-  RTC_DCHECK_LT(channel, kNumChannels);
-
-  // Each value in |smallest_values| is getting 1 loop older. Update |age|, and
-  // remove old values.
-  for (i = 0; i < 16; i++) {
-    if (age[i] != 100) {
-      age[i]++;
-    } else {
-      // Too old value. Remove from memory and shift larger values downwards.
-      for (j = i; j < 16; j++) {
-        smallest_values[j] = smallest_values[j + 1];
-        age[j] = age[j + 1];
-      }
-      age[15] = 101;
-      smallest_values[15] = 10000;
-    }
-  }
-
-  // Check if |feature_value| is smaller than any of the values in
-  // |smallest_values|. If so, find the |position| where to insert the new value
-  // (|feature_value|).
-  if (feature_value < smallest_values[7]) {
-    if (feature_value < smallest_values[3]) {
-      if (feature_value < smallest_values[1]) {
-        if (feature_value < smallest_values[0]) {
-          position = 0;
-        } else {
-          position = 1;
-        }
-      } else if (feature_value < smallest_values[2]) {
-        position = 2;
-      } else {
-        position = 3;
-      }
-    } else if (feature_value < smallest_values[5]) {
-      if (feature_value < smallest_values[4]) {
-        position = 4;
-      } else {
-        position = 5;
-      }
-    } else if (feature_value < smallest_values[6]) {
-      position = 6;
-    } else {
-      position = 7;
-    }
-  } else if (feature_value < smallest_values[15]) {
-    if (feature_value < smallest_values[11]) {
-      if (feature_value < smallest_values[9]) {
-        if (feature_value < smallest_values[8]) {
-          position = 8;
-        } else {
-          position = 9;
-        }
-      } else if (feature_value < smallest_values[10]) {
-        position = 10;
-      } else {
-        position = 11;
-      }
-    } else if (feature_value < smallest_values[13]) {
-      if (feature_value < smallest_values[12]) {
-        position = 12;
-      } else {
-        position = 13;
-      }
-    } else if (feature_value < smallest_values[14]) {
-      position = 14;
-    } else {
-      position = 15;
-    }
-  }
-
-  // If we have detected a new small value, insert it at the correct position
-  // and shift larger values up.
-  if (position > -1) {
-    for (i = 15; i > position; i--) {
-      smallest_values[i] = smallest_values[i - 1];
-      age[i] = age[i - 1];
-    }
-    smallest_values[position] = feature_value;
-    age[position] = 1;
-  }
-
-  // Get |current_median|.
-  if (self->frame_counter > 2) {
-    current_median = smallest_values[2];
-  } else if (self->frame_counter > 0) {
-    current_median = smallest_values[0];
-  }
-
-  // Smooth the median value.
-  if (self->frame_counter > 0) {
-    if (current_median < self->mean_value[channel]) {
-      alpha = kSmoothingDown;  // 0.2 in Q15.
-    } else {
-      alpha = kSmoothingUp;  // 0.99 in Q15.
-    }
-  }
-  tmp32 = (alpha + 1) * self->mean_value[channel];
-  tmp32 += (WEBRTC_SPL_WORD16_MAX - alpha) * current_median;
-  tmp32 += 16384;
-  self->mean_value[channel] = (int16_t) (tmp32 >> 15);
-
-  return self->mean_value[channel];
-}
diff --git a/submodules/libtgvoip/webrtc_dsp/common_audio/vad/vad_sp.h b/submodules/libtgvoip/webrtc_dsp/common_audio/vad/vad_sp.h
deleted file mode 100644
index ff367603c5..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/common_audio/vad/vad_sp.h
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- *  Copyright (c) 2011 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-// This file includes specific signal processing tools used in vad_core.c.
-
-#ifndef COMMON_AUDIO_VAD_VAD_SP_H_
-#define COMMON_AUDIO_VAD_VAD_SP_H_
-
-#include "common_audio/vad/vad_core.h"
-
-// Downsamples the signal by a factor 2, eg. 32->16 or 16->8.
-//
-// Inputs:
-//      - signal_in     : Input signal.
-//      - in_length     : Length of input signal in samples.
-//
-// Input & Output:
-//      - filter_state  : Current filter states of the two all-pass filters. The
-//                        |filter_state| is updated after all samples have been
-//                        processed.
-//
-// Output:
-//      - signal_out    : Downsampled signal (of length |in_length| / 2).
-void WebRtcVad_Downsampling(const int16_t* signal_in,
-                            int16_t* signal_out,
-                            int32_t* filter_state,
-                            size_t in_length);
-
-// Updates and returns the smoothed feature minimum. As minimum we use the
-// median of the five smallest feature values in a 100 frames long window.
-// As long as |handle->frame_counter| is zero, that is, we haven't received any
-// "valid" data, FindMinimum() outputs the default value of 1600.
-//
-// Inputs:
-//      - feature_value : New feature value to update with.
-//      - channel       : Channel number.
-//
-// Input & Output:
-//      - handle        : State information of the VAD.
-//
-// Returns:
-//                      : Smoothed minimum value for a moving window.
-int16_t WebRtcVad_FindMinimum(VadInstT* handle,
-                              int16_t feature_value,
-                              int channel);
-
-#endif  // COMMON_AUDIO_VAD_VAD_SP_H_
diff --git a/submodules/libtgvoip/webrtc_dsp/common_audio/vad/webrtc_vad.c b/submodules/libtgvoip/webrtc_dsp/common_audio/vad/webrtc_vad.c
deleted file mode 100644
index d8457eeebe..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/common_audio/vad/webrtc_vad.c
+++ /dev/null
@@ -1,115 +0,0 @@
-/*
- *  Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#include "common_audio/vad/include/webrtc_vad.h"
-
-#include <stdlib.h>
-#include <string.h>
-
-#include "common_audio/signal_processing/include/signal_processing_library.h"
-#include "common_audio/vad/vad_core.h"
-
-static const int kInitCheck = 42;
-static const int kValidRates[] = { 8000, 16000, 32000, 48000 };
-static const size_t kRatesSize = sizeof(kValidRates) / sizeof(*kValidRates);
-static const int kMaxFrameLengthMs = 30;
-
-VadInst* WebRtcVad_Create() {
-  VadInstT* self = (VadInstT*)malloc(sizeof(VadInstT));
-
-  WebRtcSpl_Init();
-  self->init_flag = 0;
-
-  return (VadInst*)self;
-}
-
-void WebRtcVad_Free(VadInst* handle) {
-  free(handle);
-}
-
-// TODO(bjornv): Move WebRtcVad_InitCore() code here.
-int WebRtcVad_Init(VadInst* handle) {
-  // Initialize the core VAD component.
-  return WebRtcVad_InitCore((VadInstT*) handle);
-}
-
-// TODO(bjornv): Move WebRtcVad_set_mode_core() code here.
-int WebRtcVad_set_mode(VadInst* handle, int mode) {
-  VadInstT* self = (VadInstT*) handle;
-
-  if (handle == NULL) {
-    return -1;
-  }
-  if (self->init_flag != kInitCheck) {
-    return -1;
-  }
-
-  return WebRtcVad_set_mode_core(self, mode);
-}
-
-int WebRtcVad_Process(VadInst* handle, int fs, const int16_t* audio_frame,
-                      size_t frame_length) {
-  int vad = -1;
-  VadInstT* self = (VadInstT*) handle;
-
-  if (handle == NULL) {
-    return -1;
-  }
-
-  if (self->init_flag != kInitCheck) {
-    return -1;
-  }
-  if (audio_frame == NULL) {
-    return -1;
-  }
-  if (WebRtcVad_ValidRateAndFrameLength(fs, frame_length) != 0) {
-    return -1;
-  }
-
-  if (fs == 48000) {
-      vad = WebRtcVad_CalcVad48khz(self, audio_frame, frame_length);
-  } else if (fs == 32000) {
-    vad = WebRtcVad_CalcVad32khz(self, audio_frame, frame_length);
-  } else if (fs == 16000) {
-    vad = WebRtcVad_CalcVad16khz(self, audio_frame, frame_length);
-  } else if (fs == 8000) {
-    vad = WebRtcVad_CalcVad8khz(self, audio_frame, frame_length);
-  }
-
-  if (vad > 0) {
-    vad = 1;
-  }
-  return vad;
-}
-
-int WebRtcVad_ValidRateAndFrameLength(int rate, size_t frame_length) {
-  int return_value = -1;
-  size_t i;
-  int valid_length_ms;
-  size_t valid_length;
-
-  // We only allow 10, 20 or 30 ms frames. Loop through valid frame rates and
-  // see if we have a matching pair.
-  for (i = 0; i < kRatesSize; i++) {
-    if (kValidRates[i] == rate) {
-      for (valid_length_ms = 10; valid_length_ms <= kMaxFrameLengthMs;
-          valid_length_ms += 10) {
-        valid_length = (size_t)(kValidRates[i] / 1000 * valid_length_ms);
-        if (frame_length == valid_length) {
-          return_value = 0;
-          break;
-        }
-      }
-      break;
-    }
-  }
-
-  return return_value;
-}
diff --git a/submodules/libtgvoip/webrtc_dsp/common_audio/wav_file.cc b/submodules/libtgvoip/webrtc_dsp/common_audio/wav_file.cc
deleted file mode 100644
index 9ebf635dfd..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/common_audio/wav_file.cc
+++ /dev/null
@@ -1,249 +0,0 @@
-/*
- *  Copyright (c) 2014 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#include "common_audio/wav_file.h"
-
-#include <errno.h>
-#include <algorithm>
-#include <cstdio>
-#include <type_traits>
-
-#include "common_audio/include/audio_util.h"
-#include "common_audio/wav_header.h"
-#include "rtc_base/checks.h"
-#include "rtc_base/logging.h"
-#include "rtc_base/system/arch.h"
-
-namespace webrtc {
-namespace {
-
-// We write 16-bit PCM WAV files.
-constexpr WavFormat kWavFormat = kWavFormatPcm;
-static_assert(std::is_trivially_destructible<WavFormat>::value, "");
-constexpr size_t kBytesPerSample = 2;
-
-// Doesn't take ownership of the file handle and won't close it.
-class ReadableWavFile : public ReadableWav {
- public:
-  explicit ReadableWavFile(FILE* file) : file_(file) {}
-  ReadableWavFile(const ReadableWavFile&) = delete;
-  ReadableWavFile& operator=(const ReadableWavFile&) = delete;
-  size_t Read(void* buf, size_t num_bytes) override {
-    return fread(buf, 1, num_bytes, file_);
-  }
-  bool Eof() const override { return feof(file_) != 0; }
-  bool SeekForward(uint32_t num_bytes) override {
-    return fseek(file_, num_bytes, SEEK_CUR) == 0;
-  }
-
- private:
-  FILE* file_;
-};
-
-}  // namespace
-
-WavReader::WavReader(const std::string& filename)
-    : WavReader(rtc::OpenPlatformFileReadOnly(filename)) {}
-
-WavReader::WavReader(rtc::PlatformFile file) {
-  RTC_CHECK_NE(file, rtc::kInvalidPlatformFileValue)
-      << "Invalid file. Could not create file handle for wav file.";
-  file_handle_ = rtc::FdopenPlatformFile(file, "rb");
-  if (!file_handle_) {
-    RTC_LOG(LS_ERROR) << "Could not open wav file for reading: " << errno;
-    // Even though we failed to open a FILE*, the file is still open
-    // and needs to be closed.
-    if (!rtc::ClosePlatformFile(file)) {
-      RTC_LOG(LS_ERROR) << "Can't close file.";
-    }
-    FATAL() << "Could not open wav file for reading.";
-  }
-
-  ReadableWavFile readable(file_handle_);
-  WavFormat format;
-  size_t bytes_per_sample;
-  RTC_CHECK(ReadWavHeader(&readable, &num_channels_, &sample_rate_, &format,
-                          &bytes_per_sample, &num_samples_));
-  num_samples_remaining_ = num_samples_;
-  RTC_CHECK_EQ(kWavFormat, format);
-  RTC_CHECK_EQ(kBytesPerSample, bytes_per_sample);
-}
-
-WavReader::~WavReader() {
-  Close();
-}
-
-int WavReader::sample_rate() const {
-  return sample_rate_;
-}
-
-size_t WavReader::num_channels() const {
-  return num_channels_;
-}
-
-size_t WavReader::num_samples() const {
-  return num_samples_;
-}
-
-size_t WavReader::ReadSamples(size_t num_samples, int16_t* samples) {
-  // There could be metadata after the audio; ensure we don't read it.
-  num_samples = std::min(num_samples, num_samples_remaining_);
-  const size_t read =
-      fread(samples, sizeof(*samples), num_samples, file_handle_);
-  // If we didn't read what was requested, ensure we've reached the EOF.
-  RTC_CHECK(read == num_samples || feof(file_handle_));
-  RTC_CHECK_LE(read, num_samples_remaining_);
-  num_samples_remaining_ -= read;
-#ifndef WEBRTC_ARCH_LITTLE_ENDIAN
-  //convert to big-endian
-  for(size_t idx = 0; idx < num_samples; idx++) {
-    samples[idx] = (samples[idx]<<8) | (samples[idx]>>8);
-  }
-#endif
-  return read;
-}
-
-size_t WavReader::ReadSamples(size_t num_samples, float* samples) {
-  static const size_t kChunksize = 4096 / sizeof(uint16_t);
-  size_t read = 0;
-  for (size_t i = 0; i < num_samples; i += kChunksize) {
-    int16_t isamples[kChunksize];
-    size_t chunk = std::min(kChunksize, num_samples - i);
-    chunk = ReadSamples(chunk, isamples);
-    for (size_t j = 0; j < chunk; ++j)
-      samples[i + j] = isamples[j];
-    read += chunk;
-  }
-  return read;
-}
-
-void WavReader::Close() {
-  RTC_CHECK_EQ(0, fclose(file_handle_));
-  file_handle_ = nullptr;
-}
-
-WavWriter::WavWriter(const std::string& filename,
-                     int sample_rate,
-                     size_t num_channels)
-    // Unlike plain fopen, CreatePlatformFile takes care of filename utf8 ->
-    // wchar conversion on windows.
-    : WavWriter(rtc::CreatePlatformFile(filename), sample_rate, num_channels) {}
-
-WavWriter::WavWriter(rtc::PlatformFile file,
-                     int sample_rate,
-                     size_t num_channels)
-    : sample_rate_(sample_rate), num_channels_(num_channels), num_samples_(0) {
-  // Handle errors from the CreatePlatformFile call in above constructor.
-  RTC_CHECK_NE(file, rtc::kInvalidPlatformFileValue)
-      << "Invalid file. Could not create wav file.";
-  file_handle_ = rtc::FdopenPlatformFile(file, "wb");
-  if (!file_handle_) {
-    RTC_LOG(LS_ERROR) << "Could not open wav file for writing.";
-    // Even though we failed to open a FILE*, the file is still open
-    // and needs to be closed.
-    if (!rtc::ClosePlatformFile(file)) {
-      RTC_LOG(LS_ERROR) << "Can't close file.";
-    }
-    FATAL() << "Could not open wav file for writing.";
-  }
-
-  RTC_CHECK(CheckWavParameters(num_channels_, sample_rate_, kWavFormat,
-                               kBytesPerSample, num_samples_));
-
-  // Write a blank placeholder header, since we need to know the total number
-  // of samples before we can fill in the real data.
-  static const uint8_t blank_header[kWavHeaderSize] = {0};
-  RTC_CHECK_EQ(1, fwrite(blank_header, kWavHeaderSize, 1, file_handle_));
-}
-
-WavWriter::~WavWriter() {
-  Close();
-}
-
-int WavWriter::sample_rate() const {
-  return sample_rate_;
-}
-
-size_t WavWriter::num_channels() const {
-  return num_channels_;
-}
-
-size_t WavWriter::num_samples() const {
-  return num_samples_;
-}
-
-void WavWriter::WriteSamples(const int16_t* samples, size_t num_samples) {
-#ifndef WEBRTC_ARCH_LITTLE_ENDIAN
-  int16_t * le_samples = new int16_t[num_samples];
-  for(size_t idx = 0; idx < num_samples; idx++) {
-    le_samples[idx] = (samples[idx]<<8) | (samples[idx]>>8);
-  }
-  const size_t written =
-      fwrite(le_samples, sizeof(*le_samples), num_samples, file_handle_);
-  delete []le_samples;
-#else
-  const size_t written =
-      fwrite(samples, sizeof(*samples), num_samples, file_handle_);
-#endif
-  RTC_CHECK_EQ(num_samples, written);
-  num_samples_ += written;
-  RTC_CHECK(num_samples_ >= written);  // detect size_t overflow
-}
-
-void WavWriter::WriteSamples(const float* samples, size_t num_samples) {
-  static const size_t kChunksize = 4096 / sizeof(uint16_t);
-  for (size_t i = 0; i < num_samples; i += kChunksize) {
-    int16_t isamples[kChunksize];
-    const size_t chunk = std::min(kChunksize, num_samples - i);
-    FloatS16ToS16(samples + i, chunk, isamples);
-    WriteSamples(isamples, chunk);
-  }
-}
-
-void WavWriter::Close() {
-  RTC_CHECK_EQ(0, fseek(file_handle_, 0, SEEK_SET));
-  uint8_t header[kWavHeaderSize];
-  WriteWavHeader(header, num_channels_, sample_rate_, kWavFormat,
-                 kBytesPerSample, num_samples_);
-  RTC_CHECK_EQ(1, fwrite(header, kWavHeaderSize, 1, file_handle_));
-  RTC_CHECK_EQ(0, fclose(file_handle_));
-  file_handle_ = nullptr;
-}
-
-}  // namespace webrtc
-
-rtc_WavWriter* rtc_WavOpen(const char* filename,
-                           int sample_rate,
-                           size_t num_channels) {
-  return reinterpret_cast<rtc_WavWriter*>(
-      new webrtc::WavWriter(filename, sample_rate, num_channels));
-}
-
-void rtc_WavClose(rtc_WavWriter* wf) {
-  delete reinterpret_cast<webrtc::WavWriter*>(wf);
-}
-
-void rtc_WavWriteSamples(rtc_WavWriter* wf,
-                         const float* samples,
-                         size_t num_samples) {
-  reinterpret_cast<webrtc::WavWriter*>(wf)->WriteSamples(samples, num_samples);
-}
-
-int rtc_WavSampleRate(const rtc_WavWriter* wf) {
-  return reinterpret_cast<const webrtc::WavWriter*>(wf)->sample_rate();
-}
-
-size_t rtc_WavNumChannels(const rtc_WavWriter* wf) {
-  return reinterpret_cast<const webrtc::WavWriter*>(wf)->num_channels();
-}
-
-size_t rtc_WavNumSamples(const rtc_WavWriter* wf) {
-  return reinterpret_cast<const webrtc::WavWriter*>(wf)->num_samples();
-}
diff --git a/submodules/libtgvoip/webrtc_dsp/common_audio/wav_file.h b/submodules/libtgvoip/webrtc_dsp/common_audio/wav_file.h
deleted file mode 100644
index cbce59d364..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/common_audio/wav_file.h
+++ /dev/null
@@ -1,122 +0,0 @@
-/*
- *  Copyright (c) 2014 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#ifndef COMMON_AUDIO_WAV_FILE_H_
-#define COMMON_AUDIO_WAV_FILE_H_
-
-#ifdef __cplusplus
-
-#include <stdint.h>
-#include <cstddef>
-#include <string>
-
-#include "rtc_base/constructormagic.h"
-#include "rtc_base/platform_file.h"
-
-namespace webrtc {
-
-// Interface to provide access to WAV file parameters.
-class WavFile {
- public:
-  virtual ~WavFile() {}
-
-  virtual int sample_rate() const = 0;
-  virtual size_t num_channels() const = 0;
-  virtual size_t num_samples() const = 0;
-};
-
-// Simple C++ class for writing 16-bit PCM WAV files. All error handling is
-// by calls to RTC_CHECK(), making it unsuitable for anything but debug code.
-class WavWriter final : public WavFile {
- public:
-  // Open a new WAV file for writing.
-  WavWriter(const std::string& filename, int sample_rate, size_t num_channels);
-
-  // Open a new WAV file for writing.
-  WavWriter(rtc::PlatformFile file, int sample_rate, size_t num_channels);
-
-  // Close the WAV file, after writing its header.
-  ~WavWriter() override;
-
-  // Write additional samples to the file. Each sample is in the range
-  // [-32768,32767], and there must be the previously specified number of
-  // interleaved channels.
-  void WriteSamples(const float* samples, size_t num_samples);
-  void WriteSamples(const int16_t* samples, size_t num_samples);
-
-  int sample_rate() const override;
-  size_t num_channels() const override;
-  size_t num_samples() const override;
-
- private:
-  void Close();
-  const int sample_rate_;
-  const size_t num_channels_;
-  size_t num_samples_;  // Total number of samples written to file.
-  FILE* file_handle_;   // Output file, owned by this class
-
-  RTC_DISALLOW_COPY_AND_ASSIGN(WavWriter);
-};
-
-// Follows the conventions of WavWriter.
-class WavReader final : public WavFile {
- public:
-  // Opens an existing WAV file for reading.
-  explicit WavReader(const std::string& filename);
-
-  // Opens an existing WAV file for reading.
-  explicit WavReader(rtc::PlatformFile file);
-
-  // Close the WAV file.
-  ~WavReader() override;
-
-  // Returns the number of samples read. If this is less than requested,
-  // verifies that the end of the file was reached.
-  size_t ReadSamples(size_t num_samples, float* samples);
-  size_t ReadSamples(size_t num_samples, int16_t* samples);
-
-  int sample_rate() const override;
-  size_t num_channels() const override;
-  size_t num_samples() const override;
-
- private:
-  void Close();
-  int sample_rate_;
-  size_t num_channels_;
-  size_t num_samples_;  // Total number of samples in the file.
-  size_t num_samples_remaining_;
-  FILE* file_handle_;  // Input file, owned by this class.
-
-  RTC_DISALLOW_COPY_AND_ASSIGN(WavReader);
-};
-
-}  // namespace webrtc
-
-extern "C" {
-#endif  // __cplusplus
-
-// C wrappers for the WavWriter class.
-typedef struct rtc_WavWriter rtc_WavWriter;
-rtc_WavWriter* rtc_WavOpen(const char* filename,
-                           int sample_rate,
-                           size_t num_channels);
-void rtc_WavClose(rtc_WavWriter* wf);
-void rtc_WavWriteSamples(rtc_WavWriter* wf,
-                         const float* samples,
-                         size_t num_samples);
-int rtc_WavSampleRate(const rtc_WavWriter* wf);
-size_t rtc_WavNumChannels(const rtc_WavWriter* wf);
-size_t rtc_WavNumSamples(const rtc_WavWriter* wf);
-
-#ifdef __cplusplus
-}  // extern "C"
-#endif
-
-#endif  // COMMON_AUDIO_WAV_FILE_H_
diff --git a/submodules/libtgvoip/webrtc_dsp/common_audio/wav_header.cc b/submodules/libtgvoip/webrtc_dsp/common_audio/wav_header.cc
deleted file mode 100644
index 68a2620fcd..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/common_audio/wav_header.cc
+++ /dev/null
@@ -1,331 +0,0 @@
-/*
- *  Copyright (c) 2014 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-// Based on the WAV file format documentation at
-// https://ccrma.stanford.edu/courses/422/projects/WaveFormat/ and
-// http://www-mmsp.ece.mcgill.ca/Documents/AudioFormats/WAVE/WAVE.html
-
-#include "common_audio/wav_header.h"
-
-#include <cstring>
-#include <limits>
-#include <string>
-
-#include "rtc_base/checks.h"
-#include "rtc_base/logging.h"
-#include "rtc_base/sanitizer.h"
-#include "rtc_base/system/arch.h"
-
-namespace webrtc {
-namespace {
-
-struct ChunkHeader {
-  uint32_t ID;
-  uint32_t Size;
-};
-static_assert(sizeof(ChunkHeader) == 8, "ChunkHeader size");
-
-struct RiffHeader {
-  ChunkHeader header;
-  uint32_t Format;
-};
-
-// We can't nest this definition in WavHeader, because VS2013 gives an error
-// on sizeof(WavHeader::fmt): "error C2070: 'unknown': illegal sizeof operand".
-struct FmtSubchunk {
-  ChunkHeader header;
-  uint16_t AudioFormat;
-  uint16_t NumChannels;
-  uint32_t SampleRate;
-  uint32_t ByteRate;
-  uint16_t BlockAlign;
-  uint16_t BitsPerSample;
-};
-static_assert(sizeof(FmtSubchunk) == 24, "FmtSubchunk size");
-const uint32_t kFmtSubchunkSize = sizeof(FmtSubchunk) - sizeof(ChunkHeader);
-
-// Simple wav header. It does not include chunks that are not essential to read
-// audio samples.
-struct WavHeader {
-  WavHeader(const WavHeader&) = default;
-  WavHeader& operator=(const WavHeader&) = default;
-  RiffHeader riff;
-  FmtSubchunk fmt;
-  struct {
-    ChunkHeader header;
-  } data;
-};
-static_assert(sizeof(WavHeader) == kWavHeaderSize, "no padding in header");
-
-#ifdef WEBRTC_ARCH_LITTLE_ENDIAN
-static inline void WriteLE16(uint16_t* f, uint16_t x) {
-  *f = x;
-}
-static inline void WriteLE32(uint32_t* f, uint32_t x) {
-  *f = x;
-}
-static inline void WriteFourCC(uint32_t* f, char a, char b, char c, char d) {
-  *f = static_cast<uint32_t>(a) | static_cast<uint32_t>(b) << 8 |
-       static_cast<uint32_t>(c) << 16 | static_cast<uint32_t>(d) << 24;
-}
-
-static inline uint16_t ReadLE16(uint16_t x) {
-  return x;
-}
-static inline uint32_t ReadLE32(uint32_t x) {
-  return x;
-}
-static inline std::string ReadFourCC(uint32_t x) {
-  return std::string(reinterpret_cast<char*>(&x), 4);
-}
-#else
-static inline void WriteLE16(uint16_t* f, uint16_t x) {
-  *f = ((x << 8) & 0xff00)  | ( ( x >> 8) & 0x00ff);
-}
-
-static inline void WriteLE32(uint32_t* f, uint32_t x) {
-    *f = ( (x & 0x000000ff) << 24 )
-      | ((x & 0x0000ff00) << 8)
-      | ((x & 0x00ff0000) >> 8)
-      | ((x & 0xff000000) >> 24 );
-}
-
-static inline void WriteFourCC(uint32_t* f, char a, char b, char c, char d) {
-    *f = (static_cast<uint32_t>(a) << 24 )
-      |  (static_cast<uint32_t>(b) << 16)
-      |  (static_cast<uint32_t>(c) << 8)
-      |  (static_cast<uint32_t>(d) );
-}
-
-static inline uint16_t ReadLE16(uint16_t x) {
-  return  (( x & 0x00ff) << 8 )| ((x & 0xff00)>>8);
-}
-
-static inline uint32_t ReadLE32(uint32_t x) {
-  return   ( (x & 0x000000ff) << 24 )
-         | ( (x & 0x0000ff00) << 8 )
-         | ( (x & 0x00ff0000) >> 8)
-         | ( (x & 0xff000000) >> 24 );
-}
-
-static inline std::string ReadFourCC(uint32_t x) {
-  x = ReadLE32(x);
-  return std::string(reinterpret_cast<char*>(&x), 4);
-}
-#endif
-
-static inline uint32_t RiffChunkSize(size_t bytes_in_payload) {
-  return static_cast<uint32_t>(bytes_in_payload + kWavHeaderSize -
-                               sizeof(ChunkHeader));
-}
-
-static inline uint32_t ByteRate(size_t num_channels,
-                                int sample_rate,
-                                size_t bytes_per_sample) {
-  return static_cast<uint32_t>(num_channels * sample_rate * bytes_per_sample);
-}
-
-static inline uint16_t BlockAlign(size_t num_channels,
-                                  size_t bytes_per_sample) {
-  return static_cast<uint16_t>(num_channels * bytes_per_sample);
-}
-
-// Finds a chunk having the sought ID. If found, then |readable| points to the
-// first byte of the sought chunk data. If not found, the end of the file is
-// reached.
-void FindWaveChunk(ChunkHeader* chunk_header,
-                   ReadableWav* readable,
-                   const std::string sought_chunk_id) {
-  RTC_DCHECK_EQ(sought_chunk_id.size(), 4);
-  while (!readable->Eof()) {
-    if (readable->Read(chunk_header, sizeof(*chunk_header)) !=
-        sizeof(*chunk_header))
-      return;  // EOF.
-    if (ReadFourCC(chunk_header->ID) == sought_chunk_id)
-      return;  // Sought chunk found.
-    // Ignore current chunk by skipping its payload.
-    if (!readable->SeekForward(chunk_header->Size))
-      return;  // EOF or error.
-  }
-  return;  // EOF.
-}
-
-bool ReadFmtChunkData(FmtSubchunk* fmt_subchunk, ReadableWav* readable) {
-  // Reads "fmt " chunk payload.
-  if (readable->Read(&(fmt_subchunk->AudioFormat), kFmtSubchunkSize) !=
-      kFmtSubchunkSize)
-    return false;
-  const uint32_t fmt_size = ReadLE32(fmt_subchunk->header.Size);
-  if (fmt_size != kFmtSubchunkSize) {
-    // There is an optional two-byte extension field permitted to be present
-    // with PCM, but which must be zero.
-    int16_t ext_size;
-    if (kFmtSubchunkSize + sizeof(ext_size) != fmt_size)
-      return false;
-    if (readable->Read(&ext_size, sizeof(ext_size)) != sizeof(ext_size))
-      return false;
-    if (ext_size != 0)
-      return false;
-  }
-  return true;
-}
-
-}  // namespace
-
-bool CheckWavParameters(size_t num_channels,
-                        int sample_rate,
-                        WavFormat format,
-                        size_t bytes_per_sample,
-                        size_t num_samples) {
-  // num_channels, sample_rate, and bytes_per_sample must be positive, must fit
-  // in their respective fields, and their product must fit in the 32-bit
-  // ByteRate field.
-  if (num_channels == 0 || sample_rate <= 0 || bytes_per_sample == 0)
-    return false;
-  if (static_cast<uint64_t>(sample_rate) > std::numeric_limits<uint32_t>::max())
-    return false;
-  if (num_channels > std::numeric_limits<uint16_t>::max())
-    return false;
-  if (static_cast<uint64_t>(bytes_per_sample) * 8 >
-      std::numeric_limits<uint16_t>::max())
-    return false;
-  if (static_cast<uint64_t>(sample_rate) * num_channels * bytes_per_sample >
-      std::numeric_limits<uint32_t>::max())
-    return false;
-
-  // format and bytes_per_sample must agree.
-  switch (format) {
-    case kWavFormatPcm:
-      // Other values may be OK, but for now we're conservative:
-      if (bytes_per_sample != 1 && bytes_per_sample != 2)
-        return false;
-      break;
-    case kWavFormatALaw:
-    case kWavFormatMuLaw:
-      if (bytes_per_sample != 1)
-        return false;
-      break;
-    default:
-      return false;
-  }
-
-  // The number of bytes in the file, not counting the first ChunkHeader, must
-  // be less than 2^32; otherwise, the ChunkSize field overflows.
-  const size_t header_size = kWavHeaderSize - sizeof(ChunkHeader);
-  const size_t max_samples =
-      (std::numeric_limits<uint32_t>::max() - header_size) / bytes_per_sample;
-  if (num_samples > max_samples)
-    return false;
-
-  // Each channel must have the same number of samples.
-  if (num_samples % num_channels != 0)
-    return false;
-
-  return true;
-}
-
-void WriteWavHeader(uint8_t* buf,
-                    size_t num_channels,
-                    int sample_rate,
-                    WavFormat format,
-                    size_t bytes_per_sample,
-                    size_t num_samples) {
-  RTC_CHECK(CheckWavParameters(num_channels, sample_rate, format,
-                               bytes_per_sample, num_samples));
-
-  auto header = rtc::MsanUninitialized<WavHeader>({});
-  const size_t bytes_in_payload = bytes_per_sample * num_samples;
-
-  WriteFourCC(&header.riff.header.ID, 'R', 'I', 'F', 'F');
-  WriteLE32(&header.riff.header.Size, RiffChunkSize(bytes_in_payload));
-  WriteFourCC(&header.riff.Format, 'W', 'A', 'V', 'E');
-
-  WriteFourCC(&header.fmt.header.ID, 'f', 'm', 't', ' ');
-  WriteLE32(&header.fmt.header.Size, kFmtSubchunkSize);
-  WriteLE16(&header.fmt.AudioFormat, format);
-  WriteLE16(&header.fmt.NumChannels, static_cast<uint16_t>(num_channels));
-  WriteLE32(&header.fmt.SampleRate, sample_rate);
-  WriteLE32(&header.fmt.ByteRate,
-            ByteRate(num_channels, sample_rate, bytes_per_sample));
-  WriteLE16(&header.fmt.BlockAlign, BlockAlign(num_channels, bytes_per_sample));
-  WriteLE16(&header.fmt.BitsPerSample,
-            static_cast<uint16_t>(8 * bytes_per_sample));
-
-  WriteFourCC(&header.data.header.ID, 'd', 'a', 't', 'a');
-  WriteLE32(&header.data.header.Size, static_cast<uint32_t>(bytes_in_payload));
-
-  // Do an extra copy rather than writing everything to buf directly, since buf
-  // might not be correctly aligned.
-  memcpy(buf, &header, kWavHeaderSize);
-}
-
-bool ReadWavHeader(ReadableWav* readable,
-                   size_t* num_channels,
-                   int* sample_rate,
-                   WavFormat* format,
-                   size_t* bytes_per_sample,
-                   size_t* num_samples) {
-  auto header = rtc::MsanUninitialized<WavHeader>({});
-
-  // Read RIFF chunk.
-  if (readable->Read(&header.riff, sizeof(header.riff)) != sizeof(header.riff))
-    return false;
-  if (ReadFourCC(header.riff.header.ID) != "RIFF")
-    return false;
-  if (ReadFourCC(header.riff.Format) != "WAVE")
-    return false;
-
-  // Find "fmt " and "data" chunks. While the official Wave file specification
-  // does not put requirements on the chunks order, it is uncommon to find the
-  // "data" chunk before the "fmt " one. The code below fails if this is not the
-  // case.
-  FindWaveChunk(&header.fmt.header, readable, "fmt ");
-  if (ReadFourCC(header.fmt.header.ID) != "fmt ") {
-    RTC_LOG(LS_ERROR) << "Cannot find 'fmt ' chunk.";
-    return false;
-  }
-  if (!ReadFmtChunkData(&header.fmt, readable)) {
-    RTC_LOG(LS_ERROR) << "Cannot read 'fmt ' chunk.";
-    return false;
-  }
-  if (readable->Eof()) {
-    RTC_LOG(LS_ERROR) << "'fmt ' chunk placed after 'data' chunk.";
-    return false;
-  }
-  FindWaveChunk(&header.data.header, readable, "data");
-  if (ReadFourCC(header.data.header.ID) != "data") {
-    RTC_LOG(LS_ERROR) << "Cannot find 'data' chunk.";
-    return false;
-  }
-
-  // Parse needed fields.
-  *format = static_cast<WavFormat>(ReadLE16(header.fmt.AudioFormat));
-  *num_channels = ReadLE16(header.fmt.NumChannels);
-  *sample_rate = ReadLE32(header.fmt.SampleRate);
-  *bytes_per_sample = ReadLE16(header.fmt.BitsPerSample) / 8;
-  const size_t bytes_in_payload = ReadLE32(header.data.header.Size);
-  if (*bytes_per_sample == 0)
-    return false;
-  *num_samples = bytes_in_payload / *bytes_per_sample;
-
-  if (ReadLE32(header.riff.header.Size) < RiffChunkSize(bytes_in_payload))
-    return false;
-  if (ReadLE32(header.fmt.ByteRate) !=
-      ByteRate(*num_channels, *sample_rate, *bytes_per_sample))
-    return false;
-  if (ReadLE16(header.fmt.BlockAlign) !=
-      BlockAlign(*num_channels, *bytes_per_sample))
-    return false;
-
-  return CheckWavParameters(*num_channels, *sample_rate, *format,
-                            *bytes_per_sample, *num_samples);
-}
-
-}  // namespace webrtc
diff --git a/submodules/libtgvoip/webrtc_dsp/common_audio/wav_header.h b/submodules/libtgvoip/webrtc_dsp/common_audio/wav_header.h
deleted file mode 100644
index a519ba556f..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/common_audio/wav_header.h
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- *  Copyright (c) 2014 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#ifndef COMMON_AUDIO_WAV_HEADER_H_
-#define COMMON_AUDIO_WAV_HEADER_H_
-
-#include <stddef.h>
-#include <stdint.h>
-
-namespace webrtc {
-
-static const size_t kWavHeaderSize = 44;
-
-class ReadableWav {
- public:
-  // Returns the number of bytes read.
-  virtual size_t Read(void* buf, size_t num_bytes) = 0;
-  // Returns true if the end-of-file has been reached.
-  virtual bool Eof() const = 0;
-  virtual bool SeekForward(uint32_t num_bytes) = 0;
-  virtual ~ReadableWav() = default;
-};
-
-enum WavFormat {
-  kWavFormatPcm = 1,    // PCM, each sample of size bytes_per_sample
-  kWavFormatALaw = 6,   // 8-bit ITU-T G.711 A-law
-  kWavFormatMuLaw = 7,  // 8-bit ITU-T G.711 mu-law
-};
-
-// Return true if the given parameters will make a well-formed WAV header.
-bool CheckWavParameters(size_t num_channels,
-                        int sample_rate,
-                        WavFormat format,
-                        size_t bytes_per_sample,
-                        size_t num_samples);
-
-// Write a kWavHeaderSize bytes long WAV header to buf. The payload that
-// follows the header is supposed to have the specified number of interleaved
-// channels and contain the specified total number of samples of the specified
-// type. CHECKs the input parameters for validity.
-void WriteWavHeader(uint8_t* buf,
-                    size_t num_channels,
-                    int sample_rate,
-                    WavFormat format,
-                    size_t bytes_per_sample,
-                    size_t num_samples);
-
-// Read a WAV header from an implemented ReadableWav and parse the values into
-// the provided output parameters. ReadableWav is used because the header can
-// be variably sized. Returns false if the header is invalid.
-bool ReadWavHeader(ReadableWav* readable,
-                   size_t* num_channels,
-                   int* sample_rate,
-                   WavFormat* format,
-                   size_t* bytes_per_sample,
-                   size_t* num_samples);
-
-}  // namespace webrtc
-
-#endif  // COMMON_AUDIO_WAV_HEADER_H_
diff --git a/submodules/libtgvoip/webrtc_dsp/common_audio/window_generator.cc b/submodules/libtgvoip/webrtc_dsp/common_audio/window_generator.cc
deleted file mode 100644
index da5603d9e7..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/common_audio/window_generator.cc
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- *  Copyright (c) 2014 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#define _USE_MATH_DEFINES
-
-#include "common_audio/window_generator.h"
-
-#include <cmath>
-#include <complex>
-
-#include "rtc_base/checks.h"
-
-using std::complex;
-
-namespace {
-
-// Modified Bessel function of order 0 for complex inputs.
-complex<float> I0(complex<float> x) {
-  complex<float> y = x / 3.75f;
-  y *= y;
-  return 1.0f + y * (3.5156229f +
-                     y * (3.0899424f +
-                          y * (1.2067492f +
-                               y * (0.2659732f +
-                                    y * (0.360768e-1f + y * 0.45813e-2f)))));
-}
-
-}  // namespace
-
-namespace webrtc {
-
-void WindowGenerator::Hanning(int length, float* window) {
-  RTC_CHECK_GT(length, 1);
-  RTC_CHECK(window != nullptr);
-  for (int i = 0; i < length; ++i) {
-    window[i] =
-        0.5f * (1 - cosf(2 * static_cast<float>(M_PI) * i / (length - 1)));
-  }
-}
-
-void WindowGenerator::KaiserBesselDerived(float alpha,
-                                          size_t length,
-                                          float* window) {
-  RTC_CHECK_GT(length, 1U);
-  RTC_CHECK(window != nullptr);
-
-  const size_t half = (length + 1) / 2;
-  float sum = 0.0f;
-
-  for (size_t i = 0; i <= half; ++i) {
-    complex<float> r = (4.0f * i) / length - 1.0f;
-    sum += I0(static_cast<float>(M_PI) * alpha * sqrt(1.0f - r * r)).real();
-    window[i] = sum;
-  }
-  for (size_t i = length - 1; i >= half; --i) {
-    window[length - i - 1] = sqrtf(window[length - i - 1] / sum);
-    window[i] = window[length - i - 1];
-  }
-  if (length % 2 == 1) {
-    window[half - 1] = sqrtf(window[half - 1] / sum);
-  }
-}
-
-}  // namespace webrtc
diff --git a/submodules/libtgvoip/webrtc_dsp/common_audio/window_generator.h b/submodules/libtgvoip/webrtc_dsp/common_audio/window_generator.h
deleted file mode 100644
index ad3b4456b9..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/common_audio/window_generator.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- *  Copyright (c) 2014 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#ifndef COMMON_AUDIO_WINDOW_GENERATOR_H_
-#define COMMON_AUDIO_WINDOW_GENERATOR_H_
-
-#include <stddef.h>
-
-#include "rtc_base/constructormagic.h"
-
-namespace webrtc {
-
-// Helper class with generators for various signal transform windows.
-class WindowGenerator {
- public:
-  static void Hanning(int length, float* window);
-  static void KaiserBesselDerived(float alpha, size_t length, float* window);
-
- private:
-  RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(WindowGenerator);
-};
-
-}  // namespace webrtc
-
-#endif  // COMMON_AUDIO_WINDOW_GENERATOR_H_
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_coding/codecs/isac/bandwidth_info.h b/submodules/libtgvoip/webrtc_dsp/modules/audio_coding/codecs/isac/bandwidth_info.h
deleted file mode 100644
index c3830a5f7c..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_coding/codecs/isac/bandwidth_info.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- *  Copyright (c) 2015 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#ifndef MODULES_AUDIO_CODING_CODECS_ISAC_BANDWIDTH_INFO_H_
-#define MODULES_AUDIO_CODING_CODECS_ISAC_BANDWIDTH_INFO_H_
-
-#include <stdint.h>
-
-typedef struct {
-  int in_use;
-  int32_t send_bw_avg;
-  int32_t send_max_delay_avg;
-  int16_t bottleneck_idx;
-  int16_t jitter_info;
-} IsacBandwidthInfo;
-
-#endif  // MODULES_AUDIO_CODING_CODECS_ISAC_BANDWIDTH_INFO_H_
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_coding/codecs/isac/main/include/isac.h b/submodules/libtgvoip/webrtc_dsp/modules/audio_coding/codecs/isac/main/include/isac.h
deleted file mode 100644
index 6cd70a6419..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_coding/codecs/isac/main/include/isac.h
+++ /dev/null
@@ -1,661 +0,0 @@
-/*
- *  Copyright (c) 2011 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#ifndef MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_INCLUDE_ISAC_H_
-#define MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_INCLUDE_ISAC_H_
-
-#include <stddef.h>
-
-#include "modules/audio_coding/codecs/isac/bandwidth_info.h"
-
-typedef struct WebRtcISACStruct ISACStruct;
-
-#if defined(__cplusplus)
-extern "C" {
-#endif
-
-/******************************************************************************
- * WebRtcIsac_AssignSize(...)
- *
- * This function returns the size of the ISAC instance, so that the instance
- * can be created outside iSAC.
- *
- * Input:
- *        - samplingRate      : sampling rate of the input/output audio.
- *
- * Output:
- *        - sizeinbytes       : number of bytes needed to allocate for the
- *                              instance.
- *
- * Return value               : 0 - Ok
- *                             -1 - Error
- */
-
-int16_t WebRtcIsac_AssignSize(int* sizeinbytes);
-
-/******************************************************************************
- * WebRtcIsac_Assign(...)
- *
- * This function assignes the memory already created to the ISAC instance.
- *
- * Input:
- *        - *ISAC_main_inst   : a pointer to the coder instance.
- *        - samplingRate      : sampling rate of the input/output audio.
- *        - ISAC_inst_Addr    : the already allocated memory, where we put the
- *                              iSAC structure.
- *
- * Return value               : 0 - Ok
- *                             -1 - Error
- */
-
-int16_t WebRtcIsac_Assign(ISACStruct** ISAC_main_inst, void* ISAC_inst_Addr);
-
-/******************************************************************************
- * WebRtcIsac_Create(...)
- *
- * This function creates an ISAC instance, which will contain the state
- * information for one coding/decoding channel.
- *
- * Input:
- *        - *ISAC_main_inst   : a pointer to the coder instance.
- *
- * Return value               : 0 - Ok
- *                             -1 - Error
- */
-
-int16_t WebRtcIsac_Create(ISACStruct** ISAC_main_inst);
-
-/******************************************************************************
- * WebRtcIsac_Free(...)
- *
- * This function frees the ISAC instance created at the beginning.
- *
- * Input:
- *        - ISAC_main_inst    : an ISAC instance.
- *
- * Return value               : 0 - Ok
- *                             -1 - Error
- */
-
-int16_t WebRtcIsac_Free(ISACStruct* ISAC_main_inst);
-
-/******************************************************************************
- * WebRtcIsac_EncoderInit(...)
- *
- * This function initializes an ISAC instance prior to the encoder calls.
- *
- * Input:
- *        - ISAC_main_inst    : ISAC instance.
- *        - CodingMode        : 0 -> Bit rate and frame length are
- *                                automatically adjusted to available bandwidth
- *                                on transmission channel, just valid if codec
- *                                is created to work in wideband mode.
- *                              1 -> User sets a frame length and a target bit
- *                                rate which is taken as the maximum
- *                                short-term average bit rate.
- *
- * Return value               : 0 - Ok
- *                             -1 - Error
- */
-
-int16_t WebRtcIsac_EncoderInit(ISACStruct* ISAC_main_inst, int16_t CodingMode);
-
-/******************************************************************************
- * WebRtcIsac_Encode(...)
- *
- * This function encodes 10ms audio blocks and inserts it into a package.
- * Input speech length has 160 samples if operating at 16 kHz sampling
- * rate, or 320 if operating at 32 kHz sampling rate. The encoder buffers the
- * input audio until the whole frame is buffered then proceeds with encoding.
- *
- *
- * Input:
- *        - ISAC_main_inst    : ISAC instance.
- *        - speechIn          : input speech vector.
- *
- * Output:
- *        - encoded           : the encoded data vector
- *
- * Return value:
- *                            : >0 - Length (in bytes) of coded data
- *                            :  0 - The buffer didn't reach the chosen
- *                               frame-size so it keeps buffering speech
- *                               samples.
- *                            : -1 - Error
- */
-
-int WebRtcIsac_Encode(ISACStruct* ISAC_main_inst,
-                      const int16_t* speechIn,
-                      uint8_t* encoded);
-
-/******************************************************************************
- * WebRtcIsac_DecoderInit(...)
- *
- * This function initializes an ISAC instance prior to the decoder calls.
- *
- * Input:
- *        - ISAC_main_inst    : ISAC instance.
- */
-
-void WebRtcIsac_DecoderInit(ISACStruct* ISAC_main_inst);
-
-/******************************************************************************
- * WebRtcIsac_UpdateBwEstimate(...)
- *
- * This function updates the estimate of the bandwidth.
- *
- * Input:
- *        - ISAC_main_inst    : ISAC instance.
- *        - encoded           : encoded ISAC frame(s).
- *        - packet_size       : size of the packet.
- *        - rtp_seq_number    : the RTP number of the packet.
- *        - send_ts           : the RTP send timestamp, given in samples
- *        - arr_ts            : the arrival time of the packet (from NetEq)
- *                              in samples.
- *
- * Return value               : 0 - Ok
- *                             -1 - Error
- */
-
-int16_t WebRtcIsac_UpdateBwEstimate(ISACStruct* ISAC_main_inst,
-                                    const uint8_t* encoded,
-                                    size_t packet_size,
-                                    uint16_t rtp_seq_number,
-                                    uint32_t send_ts,
-                                    uint32_t arr_ts);
-
-/******************************************************************************
- * WebRtcIsac_Decode(...)
- *
- * This function decodes an ISAC frame. At 16 kHz sampling rate, the length
- * of the output audio could be either 480 or 960 samples, equivalent to
- * 30 or 60 ms respectively. At 32 kHz sampling rate, the length of the
- * output audio is 960 samples, which is 30 ms.
- *
- * Input:
- *        - ISAC_main_inst    : ISAC instance.
- *        - encoded           : encoded ISAC frame(s).
- *        - len               : bytes in encoded vector.
- *
- * Output:
- *        - decoded           : The decoded vector.
- *
- * Return value               : >0 - number of samples in decoded vector.
- *                              -1 - Error.
- */
-
-int WebRtcIsac_Decode(ISACStruct* ISAC_main_inst,
-                      const uint8_t* encoded,
-                      size_t len,
-                      int16_t* decoded,
-                      int16_t* speechType);
-
-/******************************************************************************
- * WebRtcIsac_DecodePlc(...)
- *
- * This function conducts PLC for ISAC frame(s). Output speech length
- * will be a multiple of frames, i.e. multiples of 30 ms audio. Therefore,
- * the output is multiple of 480 samples if operating at 16 kHz and multiple
- * of 960 if operating at 32 kHz.
- *
- * Input:
- *        - ISAC_main_inst    : ISAC instance.
- *        - noOfLostFrames    : Number of PLC frames to produce.
- *
- * Output:
- *        - decoded           : The decoded vector.
- *
- * Return value               : Number of samples in decoded PLC vector
- */
-
-size_t WebRtcIsac_DecodePlc(ISACStruct* ISAC_main_inst,
-                            int16_t* decoded,
-                            size_t noOfLostFrames);
-
-/******************************************************************************
- * WebRtcIsac_Control(...)
- *
- * This function sets the limit on the short-term average bit-rate and the
- * frame length. Should be used only in Instantaneous mode. At 16 kHz sampling
- * rate, an average bit-rate between 10000 to 32000 bps is valid and a
- * frame-size of 30 or 60 ms is acceptable. At 32 kHz, an average bit-rate
- * between 10000 to 56000 is acceptable, and the valid frame-size is 30 ms.
- *
- * Input:
- *        - ISAC_main_inst    : ISAC instance.
- *        - rate              : limit on the short-term average bit rate,
- *                              in bits/second.
- *        - framesize         : frame-size in millisecond.
- *
- * Return value               : 0  - ok
- *                             -1 - Error
- */
-
-int16_t WebRtcIsac_Control(ISACStruct* ISAC_main_inst,
-                           int32_t rate,
-                           int framesize);
-
-void WebRtcIsac_SetInitialBweBottleneck(ISACStruct* ISAC_main_inst,
-                                        int bottleneck_bits_per_second);
-
-/******************************************************************************
- * WebRtcIsac_ControlBwe(...)
- *
- * This function sets the initial values of bottleneck and frame-size if
- * iSAC is used in channel-adaptive mode. Therefore, this API is not
- * applicable if the codec is created to operate in super-wideband mode.
- *
- * Through this API, users can enforce a frame-size for all values of
- * bottleneck. Then iSAC will not automatically change the frame-size.
- *
- *
- * Input:
- *        - ISAC_main_inst    : ISAC instance.
- *        - rateBPS           : initial value of bottleneck in bits/second
- *                              10000 <= rateBPS <= 56000 is accepted
- *                              For default bottleneck set rateBPS = 0
- *        - frameSizeMs       : number of milliseconds per frame (30 or 60)
- *        - enforceFrameSize  : 1 to enforce the given frame-size through
- *                              out the adaptation process, 0 to let iSAC
- *                              change the frame-size if required.
- *
- * Return value               : 0  - ok
- *                             -1 - Error
- */
-
-int16_t WebRtcIsac_ControlBwe(ISACStruct* ISAC_main_inst,
-                              int32_t rateBPS,
-                              int frameSizeMs,
-                              int16_t enforceFrameSize);
-
-/******************************************************************************
- * WebRtcIsac_ReadFrameLen(...)
- *
- * This function returns the length of the frame represented in the packet.
- *
- * Input:
- *        - encoded           : Encoded bit-stream
- *
- * Output:
- *        - frameLength       : Length of frame in packet (in samples)
- *
- */
-
-int16_t WebRtcIsac_ReadFrameLen(ISACStruct* ISAC_main_inst,
-                                const uint8_t* encoded,
-                                int16_t* frameLength);
-
-/******************************************************************************
- * WebRtcIsac_version(...)
- *
- * This function returns the version number.
- *
- * Output:
- *        - version      : Pointer to character string
- *
- */
-
-void WebRtcIsac_version(char* version);
-
-/******************************************************************************
- * WebRtcIsac_GetErrorCode(...)
- *
- * This function can be used to check the error code of an iSAC instance. When
- * a function returns -1 a error code will be set for that instance. The
- * function below extract the code of the last error that occurred in the
- * specified instance.
- *
- * Input:
- *        - ISAC_main_inst    : ISAC instance
- *
- * Return value               : Error code
- */
-
-int16_t WebRtcIsac_GetErrorCode(ISACStruct* ISAC_main_inst);
-
-/****************************************************************************
- * WebRtcIsac_GetUplinkBw(...)
- *
- * This function outputs the target bottleneck of the codec. In
- * channel-adaptive mode, the target bottleneck is specified through in-band
- * signalling retreived by bandwidth estimator.
- * In channel-independent, also called instantaneous mode, the target
- * bottleneck is provided to the encoder by calling xxx_control(...). If
- * xxx_control is never called the default values is returned. The default
- * value for bottleneck at 16 kHz encoder sampling rate is 32000 bits/sec,
- * and it is 56000 bits/sec for 32 kHz sampling rate.
- * Note that the output is the iSAC internal operating bottleneck which might
- * differ slightly from the one provided through xxx_control().
- *
- * Input:
- *        - ISAC_main_inst    : iSAC instance
- *
- * Output:
- *        - *bottleneck       : bottleneck in bits/sec
- *
- * Return value               : -1 if error happens
- *                               0 bit-rates computed correctly.
- */
-
-int16_t WebRtcIsac_GetUplinkBw(ISACStruct* ISAC_main_inst, int32_t* bottleneck);
-
-/******************************************************************************
- * WebRtcIsac_SetMaxPayloadSize(...)
- *
- * This function sets a limit for the maximum payload size of iSAC. The same
- * value is used both for 30 and 60 ms packets. If the encoder sampling rate
- * is 16 kHz the maximum payload size is between 120 and 400 bytes. If the
- * encoder sampling rate is 32 kHz the maximum payload size is between 120
- * and 600 bytes.
- *
- * If an out of range limit is used, the function returns -1, but the closest
- * valid value will be applied.
- *
- * ---------------
- * IMPORTANT NOTES
- * ---------------
- * The size of a packet is limited to the minimum of 'max-payload-size' and
- * 'max-rate.' For instance, let's assume the max-payload-size is set to
- * 170 bytes, and max-rate is set to 40 kbps. Note that a limit of 40 kbps
- * translates to 150 bytes for 30ms frame-size & 300 bytes for 60ms
- * frame-size. Then a packet with a frame-size of 30 ms is limited to 150,
- * i.e. min(170, 150), and a packet with 60 ms frame-size is limited to
- * 170 bytes, i.e. min(170, 300).
- *
- * Input:
- *        - ISAC_main_inst    : iSAC instance
- *        - maxPayloadBytes   : maximum size of the payload in bytes
- *                              valid values are between 120 and 400 bytes
- *                              if encoder sampling rate is 16 kHz. For
- *                              32 kHz encoder sampling rate valid values
- *                              are between 120 and 600 bytes.
- *
- * Return value               : 0 if successful
- *                             -1 if error happens
- */
-
-int16_t WebRtcIsac_SetMaxPayloadSize(ISACStruct* ISAC_main_inst,
-                                     int16_t maxPayloadBytes);
-
-/******************************************************************************
- * WebRtcIsac_SetMaxRate(...)
- *
- * This function sets the maximum rate which the codec may not exceed for
- * any signal packet. The maximum rate is defined and payload-size per
- * frame-size in bits per second.
- *
- * The codec has a maximum rate of 53400 bits per second (200 bytes per 30
- * ms) if the encoder sampling rate is 16kHz, and 160 kbps (600 bytes/30 ms)
- * if the encoder sampling rate is 32 kHz.
- *
- * It is possible to set a maximum rate between 32000 and 53400 bits/sec
- * in wideband mode, and 32000 to 160000 bits/sec in super-wideband mode.
- *
- * If an out of range limit is used, the function returns -1, but the closest
- * valid value will be applied.
- *
- * ---------------
- * IMPORTANT NOTES
- * ---------------
- * The size of a packet is limited to the minimum of 'max-payload-size' and
- * 'max-rate.' For instance, let's assume the max-payload-size is set to
- * 170 bytes, and max-rate is set to 40 kbps. Note that a limit of 40 kbps
- * translates to 150 bytes for 30ms frame-size & 300 bytes for 60ms
- * frame-size. Then a packet with a frame-size of 30 ms is limited to 150,
- * i.e. min(170, 150), and a packet with 60 ms frame-size is limited to
- * 170 bytes, min(170, 300).
- *
- * Input:
- *        - ISAC_main_inst    : iSAC instance
- *        - maxRate           : maximum rate in bits per second,
- *                              valid values are 32000 to 53400 bits/sec in
- *                              wideband mode, and 32000 to 160000 bits/sec in
- *                              super-wideband mode.
- *
- * Return value               : 0 if successful
- *                             -1 if error happens
- */
-
-int16_t WebRtcIsac_SetMaxRate(ISACStruct* ISAC_main_inst, int32_t maxRate);
-
-/******************************************************************************
- * WebRtcIsac_DecSampRate()
- * Return the sampling rate of the decoded audio.
- *
- * Input:
- *        - ISAC_main_inst    : iSAC instance
- *
- * Return value               : sampling frequency in Hertz.
- *
- */
-
-uint16_t WebRtcIsac_DecSampRate(ISACStruct* ISAC_main_inst);
-
-/******************************************************************************
- * WebRtcIsac_EncSampRate()
- *
- * Input:
- *        - ISAC_main_inst    : iSAC instance
- *
- * Return value               : sampling rate in Hertz.
- *
- */
-
-uint16_t WebRtcIsac_EncSampRate(ISACStruct* ISAC_main_inst);
-
-/******************************************************************************
- * WebRtcIsac_SetDecSampRate()
- * Set the sampling rate of the decoder.  Initialization of the decoder WILL
- * NOT overwrite the sampling rate of the encoder. The default value is 16 kHz
- * which is set when the instance is created.
- *
- * Input:
- *        - ISAC_main_inst    : iSAC instance
- *        - sampRate          : sampling rate in Hertz.
- *
- * Return value               : 0 if successful
- *                             -1 if failed.
- */
-
-int16_t WebRtcIsac_SetDecSampRate(ISACStruct* ISAC_main_inst,
-                                  uint16_t samp_rate_hz);
-
-/******************************************************************************
- * WebRtcIsac_SetEncSampRate()
- * Set the sampling rate of the encoder. Initialization of the encoder WILL
- * NOT overwrite the sampling rate of the encoder. The default value is 16 kHz
- * which is set when the instance is created. The encoding-mode and the
- * bottleneck remain unchanged by this call, however, the maximum rate and
- * maximum payload-size will reset to their default value.
- *
- * Input:
- *        - ISAC_main_inst    : iSAC instance
- *        - sampRate          : sampling rate in Hertz.
- *
- * Return value               : 0 if successful
- *                             -1 if failed.
- */
-
-int16_t WebRtcIsac_SetEncSampRate(ISACStruct* ISAC_main_inst,
-                                  uint16_t sample_rate_hz);
-
-/******************************************************************************
- * WebRtcIsac_GetNewBitStream(...)
- *
- * This function returns encoded data, with the recieved bwe-index in the
- * stream. If the rate is set to a value less than bottleneck of codec
- * the new bistream will be re-encoded with the given target rate.
- * It should always return a complete packet, i.e. only called once
- * even for 60 msec frames.
- *
- * NOTE 1! This function does not write in the ISACStruct, it is not allowed.
- * NOTE 2! Currently not implemented for SWB mode.
- * NOTE 3! Rates larger than the bottleneck of the codec will be limited
- *         to the current bottleneck.
- *
- * Input:
- *        - ISAC_main_inst    : ISAC instance.
- *        - bweIndex          : Index of bandwidth estimate to put in new
- *                              bitstream
- *        - rate              : target rate of the transcoder is bits/sec.
- *                              Valid values are the accepted rate in iSAC,
- *                              i.e. 10000 to 56000.
- *        - isRCU                       : if the new bit-stream is an RCU
- * stream. Note that the rate parameter always indicates the target rate of the
- * main payload, regardless of 'isRCU' value.
- *
- * Output:
- *        - encoded           : The encoded data vector
- *
- * Return value               : >0 - Length (in bytes) of coded data
- *                              -1 - Error  or called in SWB mode
- *                                 NOTE! No error code is written to
- *                                 the struct since it is only allowed to read
- *                                 the struct.
- */
-int16_t WebRtcIsac_GetNewBitStream(ISACStruct* ISAC_main_inst,
-                                   int16_t bweIndex,
-                                   int16_t jitterInfo,
-                                   int32_t rate,
-                                   uint8_t* encoded,
-                                   int16_t isRCU);
-
-/****************************************************************************
- * WebRtcIsac_GetDownLinkBwIndex(...)
- *
- * This function returns index representing the Bandwidth estimate from
- * other side to this side.
- *
- * Input:
- *        - ISAC_main_inst    : iSAC struct
- *
- * Output:
- *        - bweIndex          : Bandwidth estimate to transmit to other side.
- *
- */
-
-int16_t WebRtcIsac_GetDownLinkBwIndex(ISACStruct* ISAC_main_inst,
-                                      int16_t* bweIndex,
-                                      int16_t* jitterInfo);
-
-/****************************************************************************
- * WebRtcIsac_UpdateUplinkBw(...)
- *
- * This function takes an index representing the Bandwidth estimate from
- * this side to other side and updates BWE.
- *
- * Input:
- *        - ISAC_main_inst    : iSAC struct
- *        - bweIndex          : Bandwidth estimate from other side.
- *
- */
-
-int16_t WebRtcIsac_UpdateUplinkBw(ISACStruct* ISAC_main_inst, int16_t bweIndex);
-
-/****************************************************************************
- * WebRtcIsac_ReadBwIndex(...)
- *
- * This function returns the index of the Bandwidth estimate from the bitstream.
- *
- * Input:
- *        - encoded           : Encoded bitstream
- *
- * Output:
- *        - frameLength       : Length of frame in packet (in samples)
- *        - bweIndex         : Bandwidth estimate in bitstream
- *
- */
-
-int16_t WebRtcIsac_ReadBwIndex(const uint8_t* encoded, int16_t* bweIndex);
-
-/*******************************************************************************
- * WebRtcIsac_GetNewFrameLen(...)
- *
- * returns the frame lenght (in samples) of the next packet. In the case of
- * channel-adaptive mode, iSAC decides on its frame lenght based on the
- * estimated bottleneck this allows a user to prepare for the next packet (at
- * the encoder)
- *
- * The primary usage is in CE to make the iSAC works in channel-adaptive mode
- *
- * Input:
- *        - ISAC_main_inst     : iSAC struct
- *
- * Return Value                : frame lenght in samples
- *
- */
-
-int16_t WebRtcIsac_GetNewFrameLen(ISACStruct* ISAC_main_inst);
-
-/****************************************************************************
- *  WebRtcIsac_GetRedPayload(...)
- *
- *  Populates "encoded" with the redundant payload of the recently encoded
- *  frame. This function has to be called once that WebRtcIsac_Encode(...)
- *  returns a positive value. Regardless of the frame-size this function will
- *  be called only once after encoding is completed.
- *
- * Input:
- *      - ISAC_main_inst    : iSAC struct
- *
- * Output:
- *        - encoded            : the encoded data vector
- *
- *
- * Return value:
- *                              : >0 - Length (in bytes) of coded data
- *                              : -1 - Error
- *
- *
- */
-int16_t WebRtcIsac_GetRedPayload(ISACStruct* ISAC_main_inst, uint8_t* encoded);
-
-/****************************************************************************
- * WebRtcIsac_DecodeRcu(...)
- *
- * This function decodes a redundant (RCU) iSAC frame. Function is called in
- * NetEq with a stored RCU payload i case of packet loss. Output speech length
- * will be a multiple of 480 samples: 480 or 960 samples,
- * depending on the framesize (30 or 60 ms).
- *
- * Input:
- *      - ISAC_main_inst     : ISAC instance.
- *      - encoded            : encoded ISAC RCU frame(s)
- *      - len                : bytes in encoded vector
- *
- * Output:
- *      - decoded            : The decoded vector
- *
- * Return value              : >0 - number of samples in decoded vector
- *                             -1 - Error
- */
-int WebRtcIsac_DecodeRcu(ISACStruct* ISAC_main_inst,
-                         const uint8_t* encoded,
-                         size_t len,
-                         int16_t* decoded,
-                         int16_t* speechType);
-
-/* Fills in an IsacBandwidthInfo struct. |inst| should be a decoder. */
-void WebRtcIsac_GetBandwidthInfo(ISACStruct* inst, IsacBandwidthInfo* bwinfo);
-
-/* Uses the values from an IsacBandwidthInfo struct. |inst| should be an
-   encoder. */
-void WebRtcIsac_SetBandwidthInfo(ISACStruct* inst,
-                                 const IsacBandwidthInfo* bwinfo);
-
-/* If |inst| is a decoder but not an encoder: tell it what sample rate the
-   encoder is using, for bandwidth estimation purposes. */
-void WebRtcIsac_SetEncSampRateInDecoder(ISACStruct* inst, int sample_rate_hz);
-
-#if defined(__cplusplus)
-}
-#endif
-
-#endif /* MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_INCLUDE_ISAC_H_ */
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_coding/codecs/isac/main/source/arith_routines.c b/submodules/libtgvoip/webrtc_dsp/modules/audio_coding/codecs/isac/main/source/arith_routines.c
deleted file mode 100644
index 9d5c6930b1..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_coding/codecs/isac/main/source/arith_routines.c
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- *  Copyright (c) 2011 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#include "modules/audio_coding/codecs/isac/main/source/arith_routines.h"
-#include "modules/audio_coding/codecs/isac/main/source/settings.h"
-
-
-/*
- * terminate and return byte stream;
- * returns the number of bytes in the stream
- */
-int WebRtcIsac_EncTerminate(Bitstr *streamdata) /* in-/output struct containing bitstream */
-{
-  uint8_t *stream_ptr;
-
-
-  /* point to the right place in the stream buffer */
-  stream_ptr = streamdata->stream + streamdata->stream_index;
-
-  /* find minimum length (determined by current interval width) */
-  if ( streamdata->W_upper > 0x01FFFFFF )
-  {
-    streamdata->streamval += 0x01000000;
-    /* add carry to buffer */
-    if (streamdata->streamval < 0x01000000)
-    {
-      /* propagate carry */
-      while ( !(++(*--stream_ptr)) );
-      /* put pointer back to the old value */
-      stream_ptr = streamdata->stream + streamdata->stream_index;
-    }
-    /* write remaining data to bitstream */
-    *stream_ptr++ = (uint8_t) (streamdata->streamval >> 24);
-  }
-  else
-  {
-    streamdata->streamval += 0x00010000;
-    /* add carry to buffer */
-    if (streamdata->streamval < 0x00010000)
-    {
-      /* propagate carry */
-      while ( !(++(*--stream_ptr)) );
-      /* put pointer back to the old value */
-      stream_ptr = streamdata->stream + streamdata->stream_index;
-    }
-    /* write remaining data to bitstream */
-    *stream_ptr++ = (uint8_t) (streamdata->streamval >> 24);
-    *stream_ptr++ = (uint8_t) ((streamdata->streamval >> 16) & 0x00FF);
-  }
-
-  /* calculate stream length */
-  return (int)(stream_ptr - streamdata->stream);
-}
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_coding/codecs/isac/main/source/arith_routines.h b/submodules/libtgvoip/webrtc_dsp/modules/audio_coding/codecs/isac/main/source/arith_routines.h
deleted file mode 100644
index 6e7ea1da5e..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_coding/codecs/isac/main/source/arith_routines.h
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- *  Copyright (c) 2011 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-/*
- * arith_routines.h
- *
- * Functions for arithmetic coding.
- *
- */
-
-#ifndef MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_ARITH_ROUTINES_H_
-#define MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_ARITH_ROUTINES_H_
-
-#include "modules/audio_coding/codecs/isac/main/source/structs.h"
-
-int WebRtcIsac_EncLogisticMulti2(
-    Bitstr* streamdata, /* in-/output struct containing bitstream */
-    int16_t* dataQ7,    /* input: data vector */
-    const uint16_t*
-        env,     /* input: side info vector defining the width of the pdf */
-    const int N, /* input: data vector length */
-    const int16_t isSWB12kHz); /* if the codec is working in 12kHz bandwidth */
-
-/* returns the number of bytes in the stream */
-int WebRtcIsac_EncTerminate(
-    Bitstr* streamdata); /* in-/output struct containing bitstream */
-
-/* returns the number of bytes in the stream so far */
-int WebRtcIsac_DecLogisticMulti2(
-    int16_t* data,      /* output: data vector */
-    Bitstr* streamdata, /* in-/output struct containing bitstream */
-    const uint16_t*
-        env, /* input: side info vector defining the width of the pdf */
-    const int16_t* dither,     /* input: dither vector */
-    const int N,               /* input: data vector length */
-    const int16_t isSWB12kHz); /* if the codec is working in 12kHz bandwidth */
-
-void WebRtcIsac_EncHistMulti(
-    Bitstr* streamdata,         /* in-/output struct containing bitstream */
-    const int* data,            /* input: data vector */
-    const uint16_t* const* cdf, /* input: array of cdf arrays */
-    const int N);               /* input: data vector length */
-
-int WebRtcIsac_DecHistBisectMulti(
-    int* data,                  /* output: data vector */
-    Bitstr* streamdata,         /* in-/output struct containing bitstream */
-    const uint16_t* const* cdf, /* input: array of cdf arrays */
-    const uint16_t*
-        cdf_size, /* input: array of cdf table sizes+1 (power of two: 2^k) */
-    const int N); /* input: data vector length */
-
-int WebRtcIsac_DecHistOneStepMulti(
-    int* data,                  /* output: data vector */
-    Bitstr* streamdata,         /* in-/output struct containing bitstream */
-    const uint16_t* const* cdf, /* input: array of cdf arrays */
-    const uint16_t*
-        init_index, /* input: vector of initial cdf table search entries */
-    const int N);   /* input: data vector length */
-
-#endif /* MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_ARITH_ROUTINES_H_ */
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_coding/codecs/isac/main/source/arith_routines_hist.c b/submodules/libtgvoip/webrtc_dsp/modules/audio_coding/codecs/isac/main/source/arith_routines_hist.c
deleted file mode 100644
index e948979fd7..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_coding/codecs/isac/main/source/arith_routines_hist.c
+++ /dev/null
@@ -1,291 +0,0 @@
-/*
- *  Copyright (c) 2011 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#include "modules/audio_coding/codecs/isac/main/source/settings.h"
-#include "modules/audio_coding/codecs/isac/main/source/arith_routines.h"
-
-
-/*
- * code symbols into arithmetic bytestream
- */
-void WebRtcIsac_EncHistMulti(Bitstr *streamdata, /* in-/output struct containing bitstream */
-                             const int *data,  /* input: data vector */
-                             const uint16_t *const *cdf, /* input: array of cdf arrays */
-                             const int N)   /* input: data vector length */
-{
-  uint32_t W_lower, W_upper;
-  uint32_t W_upper_LSB, W_upper_MSB;
-  uint8_t *stream_ptr;
-  uint8_t *stream_ptr_carry;
-  uint32_t cdf_lo, cdf_hi;
-  int k;
-
-
-  /* point to beginning of stream buffer */
-  stream_ptr = streamdata->stream + streamdata->stream_index;
-  W_upper = streamdata->W_upper;
-
-  for (k=N; k>0; k--)
-  {
-    /* fetch cdf_lower and cdf_upper from cdf tables */
-    cdf_lo = (uint32_t) *(*cdf + *data);
-    cdf_hi = (uint32_t) *(*cdf++ + *data++ + 1);
-
-    /* update interval */
-    W_upper_LSB = W_upper & 0x0000FFFF;
-    W_upper_MSB = W_upper >> 16;
-    W_lower = W_upper_MSB * cdf_lo;
-    W_lower += (W_upper_LSB * cdf_lo) >> 16;
-    W_upper = W_upper_MSB * cdf_hi;
-    W_upper += (W_upper_LSB * cdf_hi) >> 16;
-
-    /* shift interval such that it begins at zero */
-    W_upper -= ++W_lower;
-
-    /* add integer to bitstream */
-    streamdata->streamval += W_lower;
-
-    /* handle carry */
-    if (streamdata->streamval < W_lower)
-    {
-      /* propagate carry */
-      stream_ptr_carry = stream_ptr;
-      while (!(++(*--stream_ptr_carry)));
-    }
-
-    /* renormalize interval, store most significant byte of streamval and update streamval */
-    while ( !(W_upper & 0xFF000000) )      /* W_upper < 2^24 */
-    {
-      W_upper <<= 8;
-      *stream_ptr++ = (uint8_t) (streamdata->streamval >> 24);
-      streamdata->streamval <<= 8;
-    }
-  }
-
-  /* calculate new stream_index */
-  streamdata->stream_index = (int)(stream_ptr - streamdata->stream);
-  streamdata->W_upper = W_upper;
-
-  return;
-}
-
-
-
-/*
- * function to decode more symbols from the arithmetic bytestream, using method of bisection
- * cdf tables should be of size 2^k-1 (which corresponds to an alphabet size of 2^k-2)
- */
-int WebRtcIsac_DecHistBisectMulti(int *data,     /* output: data vector */
-                                  Bitstr *streamdata,   /* in-/output struct containing bitstream */
-                                  const uint16_t *const *cdf,  /* input: array of cdf arrays */
-                                  const uint16_t *cdf_size, /* input: array of cdf table sizes+1 (power of two: 2^k) */
-                                  const int N)    /* input: data vector length */
-{
-  uint32_t    W_lower, W_upper;
-  uint32_t    W_tmp;
-  uint32_t    W_upper_LSB, W_upper_MSB;
-  uint32_t    streamval;
-  const   uint8_t *stream_ptr;
-  const   uint16_t *cdf_ptr;
-  int     size_tmp;
-  int     k;
-
-  W_lower = 0; //to remove warning -DH
-  stream_ptr = streamdata->stream + streamdata->stream_index;
-  W_upper = streamdata->W_upper;
-  if (W_upper == 0)
-    /* Should not be possible in normal operation */
-    return -2;
-
-  if (streamdata->stream_index == 0)   /* first time decoder is called for this stream */
-  {
-    /* read first word from bytestream */
-    streamval = *stream_ptr << 24;
-    streamval |= *++stream_ptr << 16;
-    streamval |= *++stream_ptr << 8;
-    streamval |= *++stream_ptr;
-  } else {
-    streamval = streamdata->streamval;
-  }
-
-  for (k=N; k>0; k--)
-  {
-    /* find the integer *data for which streamval lies in [W_lower+1, W_upper] */
-    W_upper_LSB = W_upper & 0x0000FFFF;
-    W_upper_MSB = W_upper >> 16;
-
-    /* start halfway the cdf range */
-    size_tmp = *cdf_size++ >> 1;
-    cdf_ptr = *cdf + (size_tmp - 1);
-
-    /* method of bisection */
-    for ( ;; )
-    {
-      W_tmp = W_upper_MSB * *cdf_ptr;
-      W_tmp += (W_upper_LSB * *cdf_ptr) >> 16;
-      size_tmp >>= 1;
-      if (size_tmp == 0) break;
-      if (streamval > W_tmp)
-      {
-        W_lower = W_tmp;
-        cdf_ptr += size_tmp;
-      } else {
-        W_upper = W_tmp;
-        cdf_ptr -= size_tmp;
-      }
-    }
-    if (streamval > W_tmp)
-    {
-      W_lower = W_tmp;
-      *data++ = (int)(cdf_ptr - *cdf++);
-    } else {
-      W_upper = W_tmp;
-      *data++ = (int)(cdf_ptr - *cdf++ - 1);
-    }
-
-    /* shift interval to start at zero */
-    W_upper -= ++W_lower;
-
-    /* add integer to bitstream */
-    streamval -= W_lower;
-
-    /* renormalize interval and update streamval */
-    while ( !(W_upper & 0xFF000000) )    /* W_upper < 2^24 */
-    {
-      /* read next byte from stream */
-      streamval = (streamval << 8) | *++stream_ptr;
-      W_upper <<= 8;
-    }
-
-    if (W_upper == 0)
-      /* Should not be possible in normal operation */
-      return -2;
-
-
-  }
-
-  streamdata->stream_index = (int)(stream_ptr - streamdata->stream);
-  streamdata->W_upper = W_upper;
-  streamdata->streamval = streamval;
-
-
-  /* find number of bytes in original stream (determined by current interval width) */
-  if ( W_upper > 0x01FFFFFF )
-    return streamdata->stream_index - 2;
-  else
-    return streamdata->stream_index - 1;
-}
-
-
-
-/*
- * function to decode more symbols from the arithmetic bytestream, taking single step up or
- * down at a time
- * cdf tables can be of arbitrary size, but large tables may take a lot of iterations
- */
-int WebRtcIsac_DecHistOneStepMulti(int *data,        /* output: data vector */
-                                   Bitstr *streamdata,      /* in-/output struct containing bitstream */
-                                   const uint16_t *const *cdf,   /* input: array of cdf arrays */
-                                   const uint16_t *init_index, /* input: vector of initial cdf table search entries */
-                                   const int N)     /* input: data vector length */
-{
-  uint32_t    W_lower, W_upper;
-  uint32_t    W_tmp;
-  uint32_t    W_upper_LSB, W_upper_MSB;
-  uint32_t    streamval;
-  const   uint8_t *stream_ptr;
-  const   uint16_t *cdf_ptr;
-  int     k;
-
-
-  stream_ptr = streamdata->stream + streamdata->stream_index;
-  W_upper = streamdata->W_upper;
-  if (W_upper == 0)
-    /* Should not be possible in normal operation */
-    return -2;
-
-  if (streamdata->stream_index == 0)   /* first time decoder is called for this stream */
-  {
-    /* read first word from bytestream */
-    streamval = (uint32_t)(*stream_ptr) << 24;
-    streamval |= (uint32_t)(*++stream_ptr) << 16;
-    streamval |= (uint32_t)(*++stream_ptr) << 8;
-    streamval |= (uint32_t)(*++stream_ptr);
-  } else {
-    streamval = streamdata->streamval;
-  }
-
-
-  for (k=N; k>0; k--)
-  {
-    /* find the integer *data for which streamval lies in [W_lower+1, W_upper] */
-    W_upper_LSB = W_upper & 0x0000FFFF;
-    W_upper_MSB = W_upper >> 16;
-
-    /* start at the specified table entry */
-    cdf_ptr = *cdf + (*init_index++);
-    W_tmp = W_upper_MSB * *cdf_ptr;
-    W_tmp += (W_upper_LSB * *cdf_ptr) >> 16;
-    if (streamval > W_tmp)
-    {
-      for ( ;; )
-      {
-        W_lower = W_tmp;
-        if (cdf_ptr[0]==65535)
-          /* range check */
-          return -3;
-        W_tmp = W_upper_MSB * *++cdf_ptr;
-        W_tmp += (W_upper_LSB * *cdf_ptr) >> 16;
-        if (streamval <= W_tmp) break;
-      }
-      W_upper = W_tmp;
-      *data++ = (int)(cdf_ptr - *cdf++ - 1);
-    } else {
-      for ( ;; )
-      {
-        W_upper = W_tmp;
-        --cdf_ptr;
-        if (cdf_ptr<*cdf) {
-          /* range check */
-          return -3;
-        }
-        W_tmp = W_upper_MSB * *cdf_ptr;
-        W_tmp += (W_upper_LSB * *cdf_ptr) >> 16;
-        if (streamval > W_tmp) break;
-      }
-      W_lower = W_tmp;
-      *data++ = (int)(cdf_ptr - *cdf++);
-    }
-
-    /* shift interval to start at zero */
-    W_upper -= ++W_lower;
-    /* add integer to bitstream */
-    streamval -= W_lower;
-
-    /* renormalize interval and update streamval */
-    while ( !(W_upper & 0xFF000000) )    /* W_upper < 2^24 */
-    {
-      /* read next byte from stream */
-      streamval = (streamval << 8) | *++stream_ptr;
-      W_upper <<= 8;
-    }
-  }
-
-  streamdata->stream_index = (int)(stream_ptr - streamdata->stream);
-  streamdata->W_upper = W_upper;
-  streamdata->streamval = streamval;
-
-
-  /* find number of bytes in original stream (determined by current interval width) */
-  if ( W_upper > 0x01FFFFFF )
-    return streamdata->stream_index - 2;
-  else
-    return streamdata->stream_index - 1;
-}
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_coding/codecs/isac/main/source/arith_routines_logist.c b/submodules/libtgvoip/webrtc_dsp/modules/audio_coding/codecs/isac/main/source/arith_routines_logist.c
deleted file mode 100644
index 777780f54f..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_coding/codecs/isac/main/source/arith_routines_logist.c
+++ /dev/null
@@ -1,303 +0,0 @@
-/*
- *  Copyright (c) 2011 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-/*
- * arith_routines.h
- *
- * This file contains functions for arithmatically encoding and
- * decoding DFT coefficients.
- *
- */
-
-
-#include "modules/audio_coding/codecs/isac/main/source/arith_routines.h"
-
-
-
-static const int32_t kHistEdgesQ15[51] = {
-  -327680, -314573, -301466, -288359, -275252, -262144, -249037, -235930, -222823, -209716,
-  -196608, -183501, -170394, -157287, -144180, -131072, -117965, -104858, -91751, -78644,
-  -65536, -52429, -39322, -26215, -13108,  0,  13107,  26214,  39321,  52428,
-  65536,  78643,  91750,  104857,  117964,  131072,  144179,  157286,  170393,  183500,
-  196608,  209715,  222822,  235929,  249036,  262144,  275251,  288358,  301465,  314572,
-  327680};
-
-
-static const int kCdfSlopeQ0[51] = {  /* Q0 */
-  5,  5,  5,  5,  5,  5,  5,  5,  5,  5,
-  5,  5,  13,  23,  47,  87,  154,  315,  700,  1088,
-  2471,  6064,  14221,  21463,  36634,  36924,  19750,  13270,  5806,  2312,
-  1095,  660,  316,  145,  86,  41,  32,  5,  5,  5,
-  5,  5,  5,  5,  5,  5,  5,  5,  5,  2, 0};
-
-
-static const int kCdfQ16[51] = {  /* Q16 */
-  0,  2,  4,  6,  8,  10,  12,  14,  16,  18,
-  20,  22,  24,  29,  38,  57,  92,  153,  279,  559,
-  994,  1983,  4408,  10097,  18682,  33336,  48105,  56005,  61313,  63636,
-  64560,  64998,  65262,  65389,  65447,  65481,  65497,  65510,  65512,  65514,
-  65516,  65518,  65520,  65522,  65524,  65526,  65528,  65530,  65532,  65534,
-  65535};
-
-
-
-/* function to be converted to fixed point */
-static __inline uint32_t piecewise(int32_t xinQ15) {
-
-  int32_t ind, qtmp1, qtmp2, qtmp3;
-  uint32_t tmpUW32;
-
-
-  qtmp2 = xinQ15;
-
-  if (qtmp2 < kHistEdgesQ15[0]) {
-    qtmp2 = kHistEdgesQ15[0];
-  }
-  if (qtmp2 > kHistEdgesQ15[50]) {
-    qtmp2 = kHistEdgesQ15[50];
-  }
-
-  qtmp1 = qtmp2 - kHistEdgesQ15[0];       /* Q15 - Q15 = Q15        */
-  ind = (qtmp1 * 5) >> 16;              /* 2^16 / 5 = 0.4 in Q15  */
-  /* Q15 -> Q0              */
-  qtmp1 = qtmp2 - kHistEdgesQ15[ind];     /* Q15 - Q15 = Q15        */
-  qtmp2 = kCdfSlopeQ0[ind] * qtmp1;      /* Q0 * Q15 = Q15         */
-  qtmp3 = qtmp2>>15;                    /* Q15 -> Q0              */
-
-  tmpUW32 = kCdfQ16[ind] + qtmp3;    /* Q0 + Q0 = Q0           */
-  return tmpUW32;
-}
-
-
-
-int WebRtcIsac_EncLogisticMulti2(
-    Bitstr *streamdata,      /* in-/output struct containing bitstream */
-    int16_t *dataQ7,    /* input: data vector */
-    const uint16_t *envQ8, /* input: side info vector defining the width of the pdf */
-    const int N,       /* input: data vector length / 2 */
-    const int16_t isSWB12kHz)
-{
-  uint32_t W_lower, W_upper;
-  uint32_t W_upper_LSB, W_upper_MSB;
-  uint8_t *stream_ptr;
-  uint8_t *maxStreamPtr;
-  uint8_t *stream_ptr_carry;
-  uint32_t cdf_lo, cdf_hi;
-  int k;
-
-  /* point to beginning of stream buffer */
-  stream_ptr = streamdata->stream + streamdata->stream_index;
-  W_upper = streamdata->W_upper;
-
-  maxStreamPtr = streamdata->stream + STREAM_SIZE_MAX_60 - 1;
-  for (k = 0; k < N; k++)
-  {
-    /* compute cdf_lower and cdf_upper by evaluating the piecewise linear cdf */
-    cdf_lo = piecewise((*dataQ7 - 64) * *envQ8);
-    cdf_hi = piecewise((*dataQ7 + 64) * *envQ8);
-
-    /* test and clip if probability gets too small */
-    while (cdf_lo+1 >= cdf_hi) {
-      /* clip */
-      if (*dataQ7 > 0) {
-        *dataQ7 -= 128;
-        cdf_hi = cdf_lo;
-        cdf_lo = piecewise((*dataQ7 - 64) * *envQ8);
-      } else {
-        *dataQ7 += 128;
-        cdf_lo = cdf_hi;
-        cdf_hi = piecewise((*dataQ7 + 64) * *envQ8);
-      }
-    }
-
-    dataQ7++;
-    // increment only once per 4 iterations for SWB-16kHz or WB
-    // increment only once per 2 iterations for SWB-12kHz
-    envQ8 += (isSWB12kHz)? (k & 1):((k & 1) & (k >> 1));
-
-
-    /* update interval */
-    W_upper_LSB = W_upper & 0x0000FFFF;
-    W_upper_MSB = W_upper >> 16;
-    W_lower = W_upper_MSB * cdf_lo;
-    W_lower += (W_upper_LSB * cdf_lo) >> 16;
-    W_upper = W_upper_MSB * cdf_hi;
-    W_upper += (W_upper_LSB * cdf_hi) >> 16;
-
-    /* shift interval such that it begins at zero */
-    W_upper -= ++W_lower;
-
-    /* add integer to bitstream */
-    streamdata->streamval += W_lower;
-
-    /* handle carry */
-    if (streamdata->streamval < W_lower)
-    {
-      /* propagate carry */
-      stream_ptr_carry = stream_ptr;
-      while (!(++(*--stream_ptr_carry)));
-    }
-
-    /* renormalize interval, store most significant byte of streamval and update streamval */
-    while ( !(W_upper & 0xFF000000) )      /* W_upper < 2^24 */
-    {
-      W_upper <<= 8;
-      *stream_ptr++ = (uint8_t) (streamdata->streamval >> 24);
-
-      if(stream_ptr > maxStreamPtr)
-      {
-        return -ISAC_DISALLOWED_BITSTREAM_LENGTH;
-      }
-      streamdata->streamval <<= 8;
-    }
-  }
-
-  /* calculate new stream_index */
-  streamdata->stream_index = (int)(stream_ptr - streamdata->stream);
-  streamdata->W_upper = W_upper;
-
-  return 0;
-}
-
-
-
-int WebRtcIsac_DecLogisticMulti2(
-    int16_t *dataQ7,       /* output: data vector */
-    Bitstr *streamdata,      /* in-/output struct containing bitstream */
-    const uint16_t *envQ8, /* input: side info vector defining the width of the pdf */
-    const int16_t *ditherQ7,/* input: dither vector */
-    const int N,         /* input: data vector length */
-    const int16_t isSWB12kHz)
-{
-  uint32_t    W_lower, W_upper;
-  uint32_t    W_tmp;
-  uint32_t    W_upper_LSB, W_upper_MSB;
-  uint32_t    streamval;
-  const uint8_t *stream_ptr;
-  uint32_t    cdf_tmp;
-  int16_t     candQ7;
-  int             k;
-
-  // Position just past the end of the stream. STREAM_SIZE_MAX_60 instead of
-  // STREAM_SIZE_MAX (which is the size of the allocated buffer) because that's
-  // the limit to how much data is filled in.
-  const uint8_t* const stream_end = streamdata->stream + STREAM_SIZE_MAX_60;
-
-  stream_ptr = streamdata->stream + streamdata->stream_index;
-  W_upper = streamdata->W_upper;
-  if (streamdata->stream_index == 0)   /* first time decoder is called for this stream */
-  {
-    /* read first word from bytestream */
-    if (stream_ptr + 3 >= stream_end)
-      return -1;  // Would read out of bounds. Malformed input?
-    streamval = *stream_ptr << 24;
-    streamval |= *++stream_ptr << 16;
-    streamval |= *++stream_ptr << 8;
-    streamval |= *++stream_ptr;
-  } else {
-    streamval = streamdata->streamval;
-  }
-
-
-  for (k = 0; k < N; k++)
-  {
-    /* find the integer *data for which streamval lies in [W_lower+1, W_upper] */
-    W_upper_LSB = W_upper & 0x0000FFFF;
-    W_upper_MSB = W_upper >> 16;
-
-    /* find first candidate by inverting the logistic cdf */
-    candQ7 = - *ditherQ7 + 64;
-    cdf_tmp = piecewise(candQ7 * *envQ8);
-
-    W_tmp = W_upper_MSB * cdf_tmp;
-    W_tmp += (W_upper_LSB * cdf_tmp) >> 16;
-    if (streamval > W_tmp)
-    {
-      W_lower = W_tmp;
-      candQ7 += 128;
-      cdf_tmp = piecewise(candQ7 * *envQ8);
-
-      W_tmp = W_upper_MSB * cdf_tmp;
-      W_tmp += (W_upper_LSB * cdf_tmp) >> 16;
-      while (streamval > W_tmp)
-      {
-        W_lower = W_tmp;
-        candQ7 += 128;
-        cdf_tmp = piecewise(candQ7 * *envQ8);
-
-        W_tmp = W_upper_MSB * cdf_tmp;
-        W_tmp += (W_upper_LSB * cdf_tmp) >> 16;
-
-        /* error check */
-        if (W_lower == W_tmp) return -1;
-      }
-      W_upper = W_tmp;
-
-      /* another sample decoded */
-      *dataQ7 = candQ7 - 64;
-    }
-    else
-    {
-      W_upper = W_tmp;
-      candQ7 -= 128;
-      cdf_tmp = piecewise(candQ7 * *envQ8);
-
-      W_tmp = W_upper_MSB * cdf_tmp;
-      W_tmp += (W_upper_LSB * cdf_tmp) >> 16;
-      while ( !(streamval > W_tmp) )
-      {
-        W_upper = W_tmp;
-        candQ7 -= 128;
-        cdf_tmp = piecewise(candQ7 * *envQ8);
-
-        W_tmp = W_upper_MSB * cdf_tmp;
-        W_tmp += (W_upper_LSB * cdf_tmp) >> 16;
-
-        /* error check */
-        if (W_upper == W_tmp) return -1;
-      }
-      W_lower = W_tmp;
-
-      /* another sample decoded */
-      *dataQ7 = candQ7 + 64;
-    }
-    ditherQ7++;
-    dataQ7++;
-    // increment only once per 4 iterations for SWB-16kHz or WB
-    // increment only once per 2 iterations for SWB-12kHz
-    envQ8 += (isSWB12kHz)? (k & 1):((k & 1) & (k >> 1));
-
-    /* shift interval to start at zero */
-    W_upper -= ++W_lower;
-
-    /* add integer to bitstream */
-    streamval -= W_lower;
-
-    /* renormalize interval and update streamval */
-    while ( !(W_upper & 0xFF000000) )    /* W_upper < 2^24 */
-    {
-      /* read next byte from stream */
-      if (stream_ptr + 1 >= stream_end)
-        return -1;  // Would read out of bounds. Malformed input?
-      streamval = (streamval << 8) | *++stream_ptr;
-      W_upper <<= 8;
-    }
-  }
-
-  streamdata->stream_index = (int)(stream_ptr - streamdata->stream);
-  streamdata->W_upper = W_upper;
-  streamdata->streamval = streamval;
-
-  /* find number of bytes in original stream (determined by current interval width) */
-  if ( W_upper > 0x01FFFFFF )
-    return streamdata->stream_index - 2;
-  else
-    return streamdata->stream_index - 1;
-}
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_coding/codecs/isac/main/source/bandwidth_estimator.c b/submodules/libtgvoip/webrtc_dsp/modules/audio_coding/codecs/isac/main/source/bandwidth_estimator.c
deleted file mode 100644
index 673f10d446..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_coding/codecs/isac/main/source/bandwidth_estimator.c
+++ /dev/null
@@ -1,1031 +0,0 @@
-/*
- *  Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-/*
- * BwEstimator.c
- *
- * This file contains the code for the Bandwidth Estimator designed
- * for iSAC.
- *
- */
-
-#include <math.h>
-#include <string.h>
-
-#include "modules/audio_coding/codecs/isac/main/source/bandwidth_estimator.h"
-#include "modules/audio_coding/codecs/isac/main/source/settings.h"
-#include "modules/audio_coding/codecs/isac/main/include/isac.h"
-#include "rtc_base/checks.h"
-
-/* array of quantization levels for bottle neck info; Matlab code: */
-/* sprintf('%4.1ff, ', logspace(log10(5000), log10(40000), 12)) */
-static const float kQRateTableWb[12] =
-{
-  10000.0f, 11115.3f, 12355.1f, 13733.1f, 15264.8f, 16967.3f,
-  18859.8f, 20963.3f, 23301.4f, 25900.3f, 28789.0f, 32000.0f};
-
-
-static const float kQRateTableSwb[24] =
-{
-  10000.0f, 11115.3f, 12355.1f, 13733.1f, 15264.8f, 16967.3f,
-  18859.8f, 20963.3f, 23153.1f, 25342.9f, 27532.7f, 29722.5f,
-  31912.3f, 34102.1f, 36291.9f, 38481.7f, 40671.4f, 42861.2f,
-  45051.0f, 47240.8f, 49430.6f, 51620.4f, 53810.2f, 56000.0f,
-};
-
-
-
-
-int32_t WebRtcIsac_InitBandwidthEstimator(
-    BwEstimatorstr*              bwest_str,
-    enum IsacSamplingRate encoderSampRate,
-    enum IsacSamplingRate decoderSampRate)
-{
-  switch(encoderSampRate)
-  {
-    case kIsacWideband:
-      {
-        bwest_str->send_bw_avg       = INIT_BN_EST_WB;
-        break;
-      }
-    case kIsacSuperWideband:
-      {
-        bwest_str->send_bw_avg       = INIT_BN_EST_SWB;
-        break;
-      }
-  }
-
-  switch(decoderSampRate)
-  {
-    case kIsacWideband:
-      {
-        bwest_str->prev_frame_length = INIT_FRAME_LEN_WB;
-        bwest_str->rec_bw_inv        = 1.0f /
-            (INIT_BN_EST_WB + INIT_HDR_RATE_WB);
-        bwest_str->rec_bw            = (int32_t)INIT_BN_EST_WB;
-        bwest_str->rec_bw_avg_Q      = INIT_BN_EST_WB;
-        bwest_str->rec_bw_avg        = INIT_BN_EST_WB + INIT_HDR_RATE_WB;
-        bwest_str->rec_header_rate   = INIT_HDR_RATE_WB;
-        break;
-      }
-    case kIsacSuperWideband:
-      {
-        bwest_str->prev_frame_length = INIT_FRAME_LEN_SWB;
-        bwest_str->rec_bw_inv        = 1.0f /
-            (INIT_BN_EST_SWB + INIT_HDR_RATE_SWB);
-        bwest_str->rec_bw            = (int32_t)INIT_BN_EST_SWB;
-        bwest_str->rec_bw_avg_Q      = INIT_BN_EST_SWB;
-        bwest_str->rec_bw_avg        = INIT_BN_EST_SWB + INIT_HDR_RATE_SWB;
-        bwest_str->rec_header_rate   = INIT_HDR_RATE_SWB;
-        break;
-      }
-  }
-
-  bwest_str->prev_rec_rtp_number       = 0;
-  bwest_str->prev_rec_arr_ts           = 0;
-  bwest_str->prev_rec_send_ts          = 0;
-  bwest_str->prev_rec_rtp_rate         = 1.0f;
-  bwest_str->last_update_ts            = 0;
-  bwest_str->last_reduction_ts         = 0;
-  bwest_str->count_tot_updates_rec     = -9;
-  bwest_str->rec_jitter                = 10.0f;
-  bwest_str->rec_jitter_short_term     = 0.0f;
-  bwest_str->rec_jitter_short_term_abs = 5.0f;
-  bwest_str->rec_max_delay             = 10.0f;
-  bwest_str->rec_max_delay_avg_Q       = 10.0f;
-  bwest_str->num_pkts_rec              = 0;
-
-  bwest_str->send_max_delay_avg        = 10.0f;
-
-  bwest_str->hsn_detect_rec = 0;
-
-  bwest_str->num_consec_rec_pkts_over_30k = 0;
-
-  bwest_str->hsn_detect_snd = 0;
-
-  bwest_str->num_consec_snt_pkts_over_30k = 0;
-
-  bwest_str->in_wait_period = 0;
-
-  bwest_str->change_to_WB = 0;
-
-  bwest_str->numConsecLatePkts = 0;
-  bwest_str->consecLatency = 0;
-  bwest_str->inWaitLatePkts = 0;
-  bwest_str->senderTimestamp = 0;
-  bwest_str->receiverTimestamp = 0;
-
-  bwest_str->external_bw_info.in_use = 0;
-
-  return 0;
-}
-
-/* This function updates both bottle neck rates                                                      */
-/* Parameters:                                                                                       */
-/* rtp_number    - value from RTP packet, from NetEq                                                 */
-/* frame length  - length of signal frame in ms, from iSAC decoder                                   */
-/* send_ts       - value in RTP header giving send time in samples                                     */
-/* arr_ts        - value given by timeGetTime() time of arrival in samples of packet from NetEq      */
-/* pksize        - size of packet in bytes, from NetEq                                               */
-/* Index         - integer (range 0...23) indicating bottle neck & jitter as estimated by other side */
-/* returns 0 if everything went fine, -1 otherwise                                                   */
-int16_t WebRtcIsac_UpdateBandwidthEstimator(
-    BwEstimatorstr* bwest_str,
-    const uint16_t rtp_number,
-    const int32_t frame_length,
-    const uint32_t send_ts,
-    const uint32_t arr_ts,
-    const size_t pksize
-    /*,    const uint16_t Index*/)
-{
-  float weight = 0.0f;
-  float curr_bw_inv = 0.0f;
-  float rec_rtp_rate;
-  float t_diff_proj;
-  float arr_ts_diff;
-  float send_ts_diff;
-  float arr_time_noise;
-  float arr_time_noise_abs;
-
-  float delay_correction_factor = 1;
-  float late_diff = 0.0f;
-  int immediate_set = 0;
-  int num_pkts_expected;
-
-  RTC_DCHECK(!bwest_str->external_bw_info.in_use);
-
-  // We have to adjust the header-rate if the first packet has a
-  // frame-size different than the initialized value.
-  if ( frame_length != bwest_str->prev_frame_length )
-  {
-    bwest_str->rec_header_rate = (float)HEADER_SIZE * 8.0f *
-        1000.0f / (float)frame_length;     /* bits/s */
-  }
-
-  /* UPDATE ESTIMATES ON THIS SIDE */
-  /* compute far-side transmission rate */
-  rec_rtp_rate = ((float)pksize * 8.0f * 1000.0f / (float)frame_length) +
-      bwest_str->rec_header_rate;
-  // rec_rtp_rate packet bits/s + header bits/s
-
-  /* check for timer wrap-around */
-  if (arr_ts < bwest_str->prev_rec_arr_ts)
-  {
-    bwest_str->prev_rec_arr_ts   = arr_ts;
-    bwest_str->last_update_ts    = arr_ts;
-    bwest_str->last_reduction_ts = arr_ts + 3*FS;
-    bwest_str->num_pkts_rec      = 0;
-
-    /* store frame length */
-    bwest_str->prev_frame_length = frame_length;
-
-    /* store far-side transmission rate */
-    bwest_str->prev_rec_rtp_rate = rec_rtp_rate;
-
-    /* store far-side RTP time stamp */
-    bwest_str->prev_rec_rtp_number = rtp_number;
-
-    return 0;
-  }
-
-  bwest_str->num_pkts_rec++;
-
-  /* check that it's not one of the first 9 packets */
-  if ( bwest_str->count_tot_updates_rec > 0 )
-  {
-    if(bwest_str->in_wait_period > 0 )
-    {
-      bwest_str->in_wait_period--;
-    }
-
-    bwest_str->inWaitLatePkts -= ((bwest_str->inWaitLatePkts > 0)? 1:0);
-    send_ts_diff = (float)(send_ts - bwest_str->prev_rec_send_ts);
-
-    if (send_ts_diff <= (16 * frame_length)*2)
-      //doesn't allow for a dropped packet, not sure necessary to be
-      // that strict -DH
-    {
-      /* if not been updated for a long time, reduce the BN estimate */
-      if((uint32_t)(arr_ts - bwest_str->last_update_ts) *
-         1000.0f / FS > 3000)
-      {
-        //how many frames should have been received since the last
-        // update if too many have been dropped or there have been
-        // big delays won't allow this reduction may no longer need
-        // the send_ts_diff here
-        num_pkts_expected = (int)(((float)(arr_ts -
-                                           bwest_str->last_update_ts) * 1000.0f /(float) FS) /
-                                  (float)frame_length);
-
-        if(((float)bwest_str->num_pkts_rec/(float)num_pkts_expected) >
-           0.9)
-        {
-          float inv_bitrate = (float) pow( 0.99995,
-                                           (double)((uint32_t)(arr_ts -
-                                                                     bwest_str->last_reduction_ts)*1000.0f/FS) );
-
-          if ( inv_bitrate )
-          {
-            bwest_str->rec_bw_inv /= inv_bitrate;
-
-            //precautionary, likely never necessary
-            if (bwest_str->hsn_detect_snd &&
-                bwest_str->hsn_detect_rec)
-            {
-              if (bwest_str->rec_bw_inv > 0.000066f)
-              {
-                bwest_str->rec_bw_inv = 0.000066f;
-              }
-            }
-          }
-          else
-          {
-            bwest_str->rec_bw_inv = 1.0f /
-                (INIT_BN_EST_WB + INIT_HDR_RATE_WB);
-          }
-          /* reset time-since-update counter */
-          bwest_str->last_reduction_ts = arr_ts;
-        }
-        else
-          //reset here?
-        {
-          bwest_str->last_reduction_ts = arr_ts + 3*FS;
-          bwest_str->last_update_ts = arr_ts;
-          bwest_str->num_pkts_rec = 0;
-        }
-      }
-    }
-    else
-    {
-      bwest_str->last_reduction_ts = arr_ts + 3*FS;
-      bwest_str->last_update_ts = arr_ts;
-      bwest_str->num_pkts_rec = 0;
-    }
-
-
-    /* temporarily speed up adaptation if frame length has changed */
-    if ( frame_length != bwest_str->prev_frame_length )
-    {
-      bwest_str->count_tot_updates_rec = 10;
-      bwest_str->rec_header_rate = (float)HEADER_SIZE * 8.0f *
-          1000.0f / (float)frame_length;     /* bits/s */
-
-      bwest_str->rec_bw_inv = 1.0f /((float)bwest_str->rec_bw +
-                                     bwest_str->rec_header_rate);
-    }
-
-    ////////////////////////
-    arr_ts_diff = (float)(arr_ts - bwest_str->prev_rec_arr_ts);
-
-    if (send_ts_diff > 0 )
-    {
-      late_diff = arr_ts_diff - send_ts_diff;
-    }
-    else
-    {
-      late_diff = arr_ts_diff - (float)(16 * frame_length);
-    }
-
-    if((late_diff > 0) && !bwest_str->inWaitLatePkts)
-    {
-      bwest_str->numConsecLatePkts++;
-      bwest_str->consecLatency += late_diff;
-    }
-    else
-    {
-      bwest_str->numConsecLatePkts = 0;
-      bwest_str->consecLatency = 0;
-    }
-    if(bwest_str->numConsecLatePkts > 50)
-    {
-      float latencyMs = bwest_str->consecLatency/(FS/1000);
-      float averageLatencyMs = latencyMs / bwest_str->numConsecLatePkts;
-      delay_correction_factor = frame_length / (frame_length + averageLatencyMs);
-      immediate_set = 1;
-      bwest_str->inWaitLatePkts = (int16_t)((bwest_str->consecLatency/(FS/1000)) / 30);// + 150;
-      bwest_str->start_wait_period = arr_ts;
-    }
-    ///////////////////////////////////////////////
-
-
-
-    /*   update only if previous packet was not lost */
-    if ( rtp_number == bwest_str->prev_rec_rtp_number + 1 )
-    {
-
-
-      if (!(bwest_str->hsn_detect_snd && bwest_str->hsn_detect_rec))
-      {
-        if ((arr_ts_diff > (float)(16 * frame_length)))
-        {
-          //1/2 second
-          if ((late_diff > 8000.0f) && !bwest_str->in_wait_period)
-          {
-            delay_correction_factor = 0.7f;
-            bwest_str->in_wait_period = 55;
-            bwest_str->start_wait_period = arr_ts;
-            immediate_set = 1;
-          }
-          //320 ms
-          else if (late_diff > 5120.0f && !bwest_str->in_wait_period)
-          {
-            delay_correction_factor = 0.8f;
-            immediate_set = 1;
-            bwest_str->in_wait_period = 44;
-            bwest_str->start_wait_period = arr_ts;
-          }
-        }
-      }
-
-
-      if ((bwest_str->prev_rec_rtp_rate > bwest_str->rec_bw_avg) &&
-          (rec_rtp_rate > bwest_str->rec_bw_avg)                 &&
-          !bwest_str->in_wait_period)
-      {
-        /* test if still in initiation period and increment counter */
-        if (bwest_str->count_tot_updates_rec++ > 99)
-        {
-          /* constant weight after initiation part */
-          weight = 0.01f;
-        }
-        else
-        {
-          /* weight decreases with number of updates */
-          weight = 1.0f / (float) bwest_str->count_tot_updates_rec;
-        }
-        /* Bottle Neck Estimation */
-
-        /* limit outliers */
-        /* if more than 25 ms too much */
-        if (arr_ts_diff > frame_length * FS/1000 + 400.0f)
-        {
-          // in samples,  why 25ms??
-          arr_ts_diff = frame_length * FS/1000 + 400.0f;
-        }
-        if(arr_ts_diff < (frame_length * FS/1000) - 160.0f)
-        {
-          /* don't allow it to be less than frame rate - 10 ms */
-          arr_ts_diff = (float)frame_length * FS/1000 - 160.0f;
-        }
-
-        /* compute inverse receiving rate for last packet */
-        curr_bw_inv = arr_ts_diff / ((float)(pksize + HEADER_SIZE) *
-                                     8.0f * FS); // (180+35)*8*16000 = 27.5 Mbit....
-
-
-        if(curr_bw_inv <
-           (1.0f / (MAX_ISAC_BW + bwest_str->rec_header_rate)))
-        {
-          // don't allow inv rate to be larger than MAX
-          curr_bw_inv = (1.0f /
-                         (MAX_ISAC_BW + bwest_str->rec_header_rate));
-        }
-
-        /* update bottle neck rate estimate */
-        bwest_str->rec_bw_inv = weight * curr_bw_inv +
-            (1.0f - weight) * bwest_str->rec_bw_inv;
-
-        /* reset time-since-update counter */
-        bwest_str->last_update_ts    = arr_ts;
-        bwest_str->last_reduction_ts = arr_ts + 3 * FS;
-        bwest_str->num_pkts_rec = 0;
-
-        /* Jitter Estimation */
-        /* projected difference between arrival times */
-        t_diff_proj = ((float)(pksize + HEADER_SIZE) * 8.0f *
-                       1000.0f) / bwest_str->rec_bw_avg;
-
-
-        // difference between projected and actual
-        //   arrival time differences
-        arr_time_noise = (float)(arr_ts_diff*1000.0f/FS) -
-            t_diff_proj;
-        arr_time_noise_abs = (float) fabs( arr_time_noise );
-
-        /* long term averaged absolute jitter */
-        bwest_str->rec_jitter = weight * arr_time_noise_abs +
-            (1.0f - weight) * bwest_str->rec_jitter;
-        if (bwest_str->rec_jitter > 10.0f)
-        {
-          bwest_str->rec_jitter = 10.0f;
-        }
-        /* short term averaged absolute jitter */
-        bwest_str->rec_jitter_short_term_abs = 0.05f *
-            arr_time_noise_abs + 0.95f *
-            bwest_str->rec_jitter_short_term_abs;
-
-        /* short term averaged jitter */
-        bwest_str->rec_jitter_short_term = 0.05f * arr_time_noise +
-            0.95f * bwest_str->rec_jitter_short_term;
-      }
-    }
-  }
-  else
-  {
-    // reset time-since-update counter when
-    // receiving the first 9 packets
-    bwest_str->last_update_ts    = arr_ts;
-    bwest_str->last_reduction_ts = arr_ts + 3*FS;
-    bwest_str->num_pkts_rec = 0;
-
-    bwest_str->count_tot_updates_rec++;
-  }
-
-  /* limit minimum bottle neck rate */
-  if (bwest_str->rec_bw_inv > 1.0f / ((float)MIN_ISAC_BW +
-                                      bwest_str->rec_header_rate))
-  {
-    bwest_str->rec_bw_inv = 1.0f / ((float)MIN_ISAC_BW +
-                                    bwest_str->rec_header_rate);
-  }
-
-  // limit maximum bitrate
-  if (bwest_str->rec_bw_inv < 1.0f / ((float)MAX_ISAC_BW +
-                                      bwest_str->rec_header_rate))
-  {
-    bwest_str->rec_bw_inv = 1.0f / ((float)MAX_ISAC_BW +
-                                    bwest_str->rec_header_rate);
-  }
-
-  /* store frame length */
-  bwest_str->prev_frame_length = frame_length;
-
-  /* store far-side transmission rate */
-  bwest_str->prev_rec_rtp_rate = rec_rtp_rate;
-
-  /* store far-side RTP time stamp */
-  bwest_str->prev_rec_rtp_number = rtp_number;
-
-  // Replace bwest_str->rec_max_delay by the new
-  // value (atomic operation)
-  bwest_str->rec_max_delay = 3.0f * bwest_str->rec_jitter;
-
-  /* store send and arrival time stamp */
-  bwest_str->prev_rec_arr_ts = arr_ts ;
-  bwest_str->prev_rec_send_ts = send_ts;
-
-  /* Replace bwest_str->rec_bw by the new value (atomic operation) */
-  bwest_str->rec_bw = (int32_t)(1.0f / bwest_str->rec_bw_inv -
-                                      bwest_str->rec_header_rate);
-
-  if (immediate_set)
-  {
-    bwest_str->rec_bw = (int32_t) (delay_correction_factor *
-                                         (float) bwest_str->rec_bw);
-
-    if (bwest_str->rec_bw < (int32_t) MIN_ISAC_BW)
-    {
-      bwest_str->rec_bw = (int32_t) MIN_ISAC_BW;
-    }
-
-    bwest_str->rec_bw_avg = bwest_str->rec_bw +
-        bwest_str->rec_header_rate;
-
-    bwest_str->rec_bw_avg_Q = (float) bwest_str->rec_bw;
-
-    bwest_str->rec_jitter_short_term = 0.0f;
-
-    bwest_str->rec_bw_inv = 1.0f / (bwest_str->rec_bw +
-                                    bwest_str->rec_header_rate);
-
-    bwest_str->count_tot_updates_rec = 1;
-
-    immediate_set = 0;
-    bwest_str->consecLatency = 0;
-    bwest_str->numConsecLatePkts = 0;
-  }
-
-  return 0;
-}
-
-
-/* This function updates the send bottle neck rate                                                   */
-/* Index         - integer (range 0...23) indicating bottle neck & jitter as estimated by other side */
-/* returns 0 if everything went fine, -1 otherwise                                                   */
-int16_t WebRtcIsac_UpdateUplinkBwImpl(
-    BwEstimatorstr*           bwest_str,
-    int16_t               index,
-    enum IsacSamplingRate encoderSamplingFreq)
-{
-  RTC_DCHECK(!bwest_str->external_bw_info.in_use);
-
-  if((index < 0) || (index > 23))
-  {
-    return -ISAC_RANGE_ERROR_BW_ESTIMATOR;
-  }
-
-  /* UPDATE ESTIMATES FROM OTHER SIDE */
-  if(encoderSamplingFreq == kIsacWideband)
-  {
-    if(index > 11)
-    {
-      index -= 12;   
-      /* compute the jitter estimate as decoded on the other side */
-      bwest_str->send_max_delay_avg = 0.9f * bwest_str->send_max_delay_avg +
-          0.1f * (float)MAX_ISAC_MD;
-    }
-    else
-    {
-      /* compute the jitter estimate as decoded on the other side */
-      bwest_str->send_max_delay_avg = 0.9f * bwest_str->send_max_delay_avg +
-          0.1f * (float)MIN_ISAC_MD;
-    }
-
-    /* compute the BN estimate as decoded on the other side */
-    bwest_str->send_bw_avg = 0.9f * bwest_str->send_bw_avg +
-        0.1f * kQRateTableWb[index];
-  }
-  else
-  {
-    /* compute the BN estimate as decoded on the other side */
-    bwest_str->send_bw_avg = 0.9f * bwest_str->send_bw_avg +
-        0.1f * kQRateTableSwb[index];
-  }
-
-  if (bwest_str->send_bw_avg > (float) 28000 && !bwest_str->hsn_detect_snd)
-  {
-    bwest_str->num_consec_snt_pkts_over_30k++;
-
-    if (bwest_str->num_consec_snt_pkts_over_30k >= 66)
-    {
-      //approx 2 seconds with 30ms frames
-      bwest_str->hsn_detect_snd = 1;
-    }
-  }
-  else if (!bwest_str->hsn_detect_snd)
-  {
-    bwest_str->num_consec_snt_pkts_over_30k = 0;
-  }
-  return 0;
-}
-
-// called when there is upper-band bit-stream to update jitter
-// statistics.
-int16_t WebRtcIsac_UpdateUplinkJitter(
-    BwEstimatorstr*              bwest_str,
-    int32_t                  index)
-{
-  RTC_DCHECK(!bwest_str->external_bw_info.in_use);
-
-  if((index < 0) || (index > 23))
-  {
-    return -ISAC_RANGE_ERROR_BW_ESTIMATOR;
-  }
-
-  if(index > 0)
-  {
-    /* compute the jitter estimate as decoded on the other side */
-    bwest_str->send_max_delay_avg = 0.9f * bwest_str->send_max_delay_avg +
-        0.1f * (float)MAX_ISAC_MD;
-  }
-  else
-  {
-    /* compute the jitter estimate as decoded on the other side */
-    bwest_str->send_max_delay_avg = 0.9f * bwest_str->send_max_delay_avg +
-        0.1f * (float)MIN_ISAC_MD;
-  }
-
-  return 0;
-}
-
-
-
-// Returns the bandwidth/jitter estimation code (integer 0...23)
-// to put in the sending iSAC payload
-void
-WebRtcIsac_GetDownlinkBwJitIndexImpl(
-    BwEstimatorstr*           bwest_str,
-    int16_t*              bottleneckIndex,
-    int16_t*              jitterInfo,
-    enum IsacSamplingRate decoderSamplingFreq)
-{
-  float MaxDelay;
-  //uint16_t MaxDelayBit;
-
-  float rate;
-  float r;
-  float e1, e2;
-  const float weight = 0.1f;
-  const float* ptrQuantizationTable;
-  int16_t addJitterInfo;
-  int16_t minInd;
-  int16_t maxInd;
-  int16_t midInd;
-
-  if (bwest_str->external_bw_info.in_use) {
-    *bottleneckIndex = bwest_str->external_bw_info.bottleneck_idx;
-    *jitterInfo = bwest_str->external_bw_info.jitter_info;
-    return;
-  }
-
-  /* Get Max Delay Bit */
-  /* get unquantized max delay */
-  MaxDelay = (float)WebRtcIsac_GetDownlinkMaxDelay(bwest_str);
-
-  if ( ((1.f - weight) * bwest_str->rec_max_delay_avg_Q + weight *
-        MAX_ISAC_MD - MaxDelay) > (MaxDelay - (1.f-weight) *
-                                   bwest_str->rec_max_delay_avg_Q - weight * MIN_ISAC_MD) )
-  {
-    jitterInfo[0] = 0;
-    /* update quantized average */
-    bwest_str->rec_max_delay_avg_Q =
-        (1.f - weight) * bwest_str->rec_max_delay_avg_Q + weight *
-        (float)MIN_ISAC_MD;
-  }
-  else
-  {
-    jitterInfo[0] = 1;
-    /* update quantized average */
-    bwest_str->rec_max_delay_avg_Q =
-        (1.f-weight) * bwest_str->rec_max_delay_avg_Q + weight *
-        (float)MAX_ISAC_MD;
-  }
-
-  // Get unquantized rate.
-  rate = (float)WebRtcIsac_GetDownlinkBandwidth(bwest_str);
-
-  /* Get Rate Index */
-  if(decoderSamplingFreq == kIsacWideband)
-  {
-    ptrQuantizationTable = kQRateTableWb;
-    addJitterInfo = 1;
-    maxInd = 11;
-  }
-  else
-  {
-    ptrQuantizationTable = kQRateTableSwb;
-    addJitterInfo = 0;
-    maxInd = 23;
-  }
-
-  minInd = 0;
-  while(maxInd > minInd + 1)
-  {
-    midInd = (maxInd + minInd) >> 1;
-    if(rate > ptrQuantizationTable[midInd])
-    {
-      minInd = midInd;
-    }
-    else
-    {
-      maxInd = midInd;
-    }
-  }
-  // Chose the index which gives results an average which is closest
-  // to rate
-  r = (1 - weight) * bwest_str->rec_bw_avg_Q - rate;
-  e1 = weight * ptrQuantizationTable[minInd] + r;
-  e2 = weight * ptrQuantizationTable[maxInd] + r;
-  e1 = (e1 > 0)? e1:-e1;
-  e2 = (e2 > 0)? e2:-e2;
-  if(e1 < e2)
-  {
-    bottleneckIndex[0] = minInd;
-  }
-  else
-  {
-    bottleneckIndex[0] = maxInd;
-  }
-
-  bwest_str->rec_bw_avg_Q = (1 - weight) * bwest_str->rec_bw_avg_Q +
-      weight * ptrQuantizationTable[bottleneckIndex[0]];
-  bottleneckIndex[0] += jitterInfo[0] * 12 * addJitterInfo;
-
-  bwest_str->rec_bw_avg = (1 - weight) * bwest_str->rec_bw_avg + weight *
-      (rate + bwest_str->rec_header_rate);
-}
-
-
-
-/* get the bottle neck rate from far side to here, as estimated on this side */
-int32_t WebRtcIsac_GetDownlinkBandwidth( const BwEstimatorstr *bwest_str)
-{
-  int32_t  rec_bw;
-  float   jitter_sign;
-  float   bw_adjust;
-
-  RTC_DCHECK(!bwest_str->external_bw_info.in_use);
-
-  /* create a value between -1.0 and 1.0 indicating "average sign" of jitter */
-  jitter_sign = bwest_str->rec_jitter_short_term /
-      bwest_str->rec_jitter_short_term_abs;
-
-  /* adjust bw proportionally to negative average jitter sign */
-  bw_adjust = 1.0f - jitter_sign * (0.15f + 0.15f * jitter_sign * jitter_sign);
-
-  /* adjust Rate if jitter sign is mostly constant */
-  rec_bw = (int32_t)(bwest_str->rec_bw * bw_adjust);
-
-  /* limit range of bottle neck rate */
-  if (rec_bw < MIN_ISAC_BW)
-  {
-    rec_bw = MIN_ISAC_BW;
-  }
-  else if (rec_bw > MAX_ISAC_BW)
-  {
-    rec_bw = MAX_ISAC_BW;
-  }
-  return rec_bw;
-}
-
-/* Returns the max delay (in ms) */
-int32_t
-WebRtcIsac_GetDownlinkMaxDelay(const BwEstimatorstr *bwest_str)
-{
-  int32_t rec_max_delay;
-
-  RTC_DCHECK(!bwest_str->external_bw_info.in_use);
-
-  rec_max_delay = (int32_t)(bwest_str->rec_max_delay);
-
-  /* limit range of jitter estimate */
-  if (rec_max_delay < MIN_ISAC_MD)
-  {
-    rec_max_delay = MIN_ISAC_MD;
-  }
-  else if (rec_max_delay > MAX_ISAC_MD)
-  {
-    rec_max_delay = MAX_ISAC_MD;
-  }
-  return rec_max_delay;
-}
-
-/* Clamp val to the closed interval [min,max]. */
-static int32_t clamp(int32_t val, int32_t min, int32_t max) {
-  RTC_DCHECK_LE(min, max);
-  return val < min ? min : (val > max ? max : val);
-}
-
-int32_t WebRtcIsac_GetUplinkBandwidth(const BwEstimatorstr* bwest_str) {
-  return bwest_str->external_bw_info.in_use
-             ? bwest_str->external_bw_info.send_bw_avg
-             : clamp(bwest_str->send_bw_avg, MIN_ISAC_BW, MAX_ISAC_BW);
-}
-
-int32_t WebRtcIsac_GetUplinkMaxDelay(const BwEstimatorstr* bwest_str) {
-  return bwest_str->external_bw_info.in_use
-             ? bwest_str->external_bw_info.send_max_delay_avg
-             : clamp(bwest_str->send_max_delay_avg, MIN_ISAC_MD, MAX_ISAC_MD);
-}
-
-void WebRtcIsacBw_GetBandwidthInfo(BwEstimatorstr* bwest_str,
-                                   enum IsacSamplingRate decoder_sample_rate_hz,
-                                   IsacBandwidthInfo* bwinfo) {
-  RTC_DCHECK(!bwest_str->external_bw_info.in_use);
-  bwinfo->in_use = 1;
-  bwinfo->send_bw_avg = WebRtcIsac_GetUplinkBandwidth(bwest_str);
-  bwinfo->send_max_delay_avg = WebRtcIsac_GetUplinkMaxDelay(bwest_str);
-  WebRtcIsac_GetDownlinkBwJitIndexImpl(bwest_str, &bwinfo->bottleneck_idx,
-                                       &bwinfo->jitter_info,
-                                       decoder_sample_rate_hz);
-}
-
-void WebRtcIsacBw_SetBandwidthInfo(BwEstimatorstr* bwest_str,
-                                   const IsacBandwidthInfo* bwinfo) {
-  memcpy(&bwest_str->external_bw_info, bwinfo,
-         sizeof bwest_str->external_bw_info);
-}
-
-/*
- * update long-term average bitrate and amount of data in buffer
- * returns minimum payload size (bytes)
- */
-int WebRtcIsac_GetMinBytes(
-    RateModel*         State,
-    int                StreamSize,    /* bytes in bitstream */
-    const int          FrameSamples,  /* samples per frame */
-    const double       BottleNeck,    /* bottle neck rate; excl headers (bps) */
-    const double       DelayBuildUp,  /* max delay from bottleneck buffering (ms) */
-    enum ISACBandwidth bandwidth
-    /*,int16_t        frequentLargePackets*/)
-{
-  double MinRate = 0.0;
-  int    MinBytes;
-  double TransmissionTime;
-  int    burstInterval = BURST_INTERVAL;
-
-  // first 10 packets @ low rate, then INIT_BURST_LEN packets @
-  // fixed rate of INIT_RATE bps
-  if (State->InitCounter > 0)
-  {
-    if (State->InitCounter-- <= INIT_BURST_LEN)
-    {
-      if(bandwidth == isac8kHz)
-      {
-        MinRate = INIT_RATE_WB;
-      }
-      else
-      {
-        MinRate = INIT_RATE_SWB;
-      }
-    }
-    else
-    {
-      MinRate = 0;
-    }
-  }
-  else
-  {
-    /* handle burst */
-    if (State->BurstCounter)
-    {
-      if (State->StillBuffered < (1.0 - 1.0/BURST_LEN) * DelayBuildUp)
-      {
-        /* max bps derived from BottleNeck and DelayBuildUp values */
-        MinRate = (1.0 + (FS/1000) * DelayBuildUp /
-                   (double)(BURST_LEN * FrameSamples)) * BottleNeck;
-      }
-      else
-      {
-        // max bps derived from StillBuffered and DelayBuildUp
-        // values
-        MinRate = (1.0 + (FS/1000) * (DelayBuildUp -
-                                      State->StillBuffered) / (double)FrameSamples) * BottleNeck;
-        if (MinRate < 1.04 * BottleNeck)
-        {
-          MinRate = 1.04 * BottleNeck;
-        }
-      }
-      State->BurstCounter--;
-    }
-  }
-
-
-  /* convert rate from bits/second to bytes/packet */
-  MinBytes = (int) (MinRate * FrameSamples / (8.0 * FS));
-
-  /* StreamSize will be adjusted if less than MinBytes */
-  if (StreamSize < MinBytes)
-  {
-    StreamSize = MinBytes;
-  }
-
-  /* keep track of when bottle neck was last exceeded by at least 1% */
-  if (StreamSize * 8.0 * FS / FrameSamples > 1.01 * BottleNeck) {
-    if (State->PrevExceed) {
-      /* bottle_neck exceded twice in a row, decrease ExceedAgo */
-      State->ExceedAgo -= /*BURST_INTERVAL*/ burstInterval / (BURST_LEN - 1);
-      if (State->ExceedAgo < 0)
-        State->ExceedAgo = 0;
-    }
-    else
-    {
-      State->ExceedAgo += (FrameSamples * 1000) / FS; /* ms */
-      State->PrevExceed = 1;
-    }
-  }
-  else
-  {
-    State->PrevExceed = 0;
-    State->ExceedAgo += (FrameSamples * 1000) / FS;     /* ms */
-  }
-
-  /* set burst flag if bottle neck not exceeded for long time */
-  if ((State->ExceedAgo > burstInterval) &&
-      (State->BurstCounter == 0))
-  {
-    if (State->PrevExceed)
-    {
-      State->BurstCounter = BURST_LEN - 1;
-    }
-    else
-    {
-      State->BurstCounter = BURST_LEN;
-    }
-  }
-
-
-  /* Update buffer delay */
-  TransmissionTime = StreamSize * 8.0 * 1000.0 / BottleNeck;  /* ms */
-  State->StillBuffered += TransmissionTime;
-  State->StillBuffered -= (FrameSamples * 1000) / FS;     /* ms */
-  if (State->StillBuffered < 0.0)
-  {
-    State->StillBuffered = 0.0;
-  }
-
-  return MinBytes;
-}
-
-
-/*
- * update long-term average bitrate and amount of data in buffer
- */
-void WebRtcIsac_UpdateRateModel(
-    RateModel *State,
-    int StreamSize,                    /* bytes in bitstream */
-    const int FrameSamples,            /* samples per frame */
-    const double BottleNeck)        /* bottle neck rate; excl headers (bps) */
-{
-  double TransmissionTime;
-
-  /* avoid the initial "high-rate" burst */
-  State->InitCounter = 0;
-
-  /* Update buffer delay */
-  TransmissionTime = StreamSize * 8.0 * 1000.0 / BottleNeck;  /* ms */
-  State->StillBuffered += TransmissionTime;
-  State->StillBuffered -= (FrameSamples * 1000) / FS;     /* ms */
-  if (State->StillBuffered < 0.0)
-    State->StillBuffered = 0.0;
-
-}
-
-
-void WebRtcIsac_InitRateModel(
-    RateModel *State)
-{
-  State->PrevExceed      = 0;                        /* boolean */
-  State->ExceedAgo       = 0;                        /* ms */
-  State->BurstCounter    = 0;                        /* packets */
-  State->InitCounter     = INIT_BURST_LEN + 10;    /* packets */
-  State->StillBuffered   = 1.0;                    /* ms */
-}
-
-int WebRtcIsac_GetNewFrameLength(
-    double bottle_neck,
-    int    current_framesamples)
-{
-  int new_framesamples;
-
-  const int Thld_20_30 = 20000;
-
-  //const int Thld_30_20 = 30000;
-  const int Thld_30_20 = 1000000;   // disable 20 ms frames
-
-  const int Thld_30_60 = 18000;
-  //const int Thld_30_60 = 0;      // disable 60 ms frames
-
-  const int Thld_60_30 = 27000;
-
-
-  new_framesamples = current_framesamples;
-
-  /* find new framelength */
-  switch(current_framesamples) {
-    case 320:
-      if (bottle_neck < Thld_20_30)
-        new_framesamples = 480;
-      break;
-    case 480:
-      if (bottle_neck < Thld_30_60)
-        new_framesamples = 960;
-      else if (bottle_neck > Thld_30_20)
-        new_framesamples = 320;
-      break;
-    case 960:
-      if (bottle_neck >= Thld_60_30)
-        new_framesamples = 480;
-      break;
-  }
-
-  return new_framesamples;
-}
-
-double WebRtcIsac_GetSnr(
-    double bottle_neck,
-    int    framesamples)
-{
-  double s2nr;
-
-  const double a_20 = -30.0;
-  const double b_20 = 0.8;
-  const double c_20 = 0.0;
-
-  const double a_30 = -23.0;
-  const double b_30 = 0.48;
-  const double c_30 = 0.0;
-
-  const double a_60 = -23.0;
-  const double b_60 = 0.53;
-  const double c_60 = 0.0;
-
-
-  /* find new SNR value */
-  switch(framesamples) {
-    case 320:
-      s2nr = a_20 + b_20 * bottle_neck * 0.001 + c_20 * bottle_neck *
-          bottle_neck * 0.000001;
-      break;
-    case 480:
-      s2nr = a_30 + b_30 * bottle_neck * 0.001 + c_30 * bottle_neck *
-          bottle_neck * 0.000001;
-      break;
-    case 960:
-      s2nr = a_60 + b_60 * bottle_neck * 0.001 + c_60 * bottle_neck *
-          bottle_neck * 0.000001;
-      break;
-    default:
-      s2nr = 0;
-  }
-
-  return s2nr;
-
-}
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_coding/codecs/isac/main/source/bandwidth_estimator.h b/submodules/libtgvoip/webrtc_dsp/modules/audio_coding/codecs/isac/main/source/bandwidth_estimator.h
deleted file mode 100644
index d80ff73bf5..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_coding/codecs/isac/main/source/bandwidth_estimator.h
+++ /dev/null
@@ -1,174 +0,0 @@
-/*
- *  Copyright (c) 2011 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-/*
- * bandwidth_estimator.h
- *
- * This header file contains the API for the Bandwidth Estimator
- * designed for iSAC.
- *
- */
-
-#ifndef MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_BANDWIDTH_ESTIMATOR_H_
-#define MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_BANDWIDTH_ESTIMATOR_H_
-
-#include <stddef.h>
-
-#include "modules/audio_coding/codecs/isac/main/source/settings.h"
-#include "modules/audio_coding/codecs/isac/main/source/structs.h"
-
-#define MIN_ISAC_BW 10000
-#define MIN_ISAC_BW_LB 10000
-#define MIN_ISAC_BW_UB 25000
-
-#define MAX_ISAC_BW 56000
-#define MAX_ISAC_BW_UB 32000
-#define MAX_ISAC_BW_LB 32000
-
-#define MIN_ISAC_MD 5
-#define MAX_ISAC_MD 25
-
-// assumed header size, in bytes; we don't know the exact number
-// (header compression may be used)
-#define HEADER_SIZE 35
-
-// Initial Frame-Size, in ms, for Wideband & Super-Wideband Mode
-#define INIT_FRAME_LEN_WB 60
-#define INIT_FRAME_LEN_SWB 30
-
-// Initial Bottleneck Estimate, in bits/sec, for
-// Wideband & Super-wideband mode
-#define INIT_BN_EST_WB 20e3f
-#define INIT_BN_EST_SWB 56e3f
-
-// Initial Header rate (header rate depends on frame-size),
-// in bits/sec, for Wideband & Super-Wideband mode.
-#define INIT_HDR_RATE_WB \
-  ((float)HEADER_SIZE * 8.0f * 1000.0f / (float)INIT_FRAME_LEN_WB)
-#define INIT_HDR_RATE_SWB \
-  ((float)HEADER_SIZE * 8.0f * 1000.0f / (float)INIT_FRAME_LEN_SWB)
-
-// number of packets in a row for a high rate burst
-#define BURST_LEN 3
-
-// ms, max time between two full bursts
-#define BURST_INTERVAL 500
-
-// number of packets in a row for initial high rate burst
-#define INIT_BURST_LEN 5
-
-// bits/s, rate for the first BURST_LEN packets
-#define INIT_RATE_WB INIT_BN_EST_WB
-#define INIT_RATE_SWB INIT_BN_EST_SWB
-
-#if defined(__cplusplus)
-extern "C" {
-#endif
-
-/* This function initializes the struct                    */
-/* to be called before using the struct for anything else  */
-/* returns 0 if everything went fine, -1 otherwise         */
-int32_t WebRtcIsac_InitBandwidthEstimator(
-    BwEstimatorstr* bwest_str,
-    enum IsacSamplingRate encoderSampRate,
-    enum IsacSamplingRate decoderSampRate);
-
-/* This function updates the receiving estimate */
-/* Parameters: */
-/* rtp_number    - value from RTP packet, from NetEq */
-/* frame length  - length of signal frame in ms, from iSAC decoder */
-/* send_ts       - value in RTP header giving send time in samples */
-/* arr_ts        - value given by timeGetTime() time of arrival in samples of
- * packet from NetEq      */
-/* pksize        - size of packet in bytes, from NetEq */
-/* Index         - integer (range 0...23) indicating bottle neck & jitter as
- * estimated by other side */
-/* returns 0 if everything went fine, -1 otherwise */
-int16_t WebRtcIsac_UpdateBandwidthEstimator(BwEstimatorstr* bwest_str,
-                                            const uint16_t rtp_number,
-                                            const int32_t frame_length,
-                                            const uint32_t send_ts,
-                                            const uint32_t arr_ts,
-                                            const size_t pksize);
-
-/* Update receiving estimates. Used when we only receive BWE index, no iSAC data
- * packet. */
-int16_t WebRtcIsac_UpdateUplinkBwImpl(
-    BwEstimatorstr* bwest_str,
-    int16_t Index,
-    enum IsacSamplingRate encoderSamplingFreq);
-
-/* Returns the bandwidth/jitter estimation code (integer 0...23) to put in the
- * sending iSAC payload */
-void WebRtcIsac_GetDownlinkBwJitIndexImpl(
-    BwEstimatorstr* bwest_str,
-    int16_t* bottleneckIndex,
-    int16_t* jitterInfo,
-    enum IsacSamplingRate decoderSamplingFreq);
-
-/* Returns the bandwidth estimation (in bps) */
-int32_t WebRtcIsac_GetDownlinkBandwidth(const BwEstimatorstr* bwest_str);
-
-/* Returns the max delay (in ms) */
-int32_t WebRtcIsac_GetDownlinkMaxDelay(const BwEstimatorstr* bwest_str);
-
-/* Returns the bandwidth that iSAC should send with in bps */
-int32_t WebRtcIsac_GetUplinkBandwidth(const BwEstimatorstr* bwest_str);
-
-/* Returns the max delay value from the other side in ms */
-int32_t WebRtcIsac_GetUplinkMaxDelay(const BwEstimatorstr* bwest_str);
-
-/* Fills in an IsacExternalBandwidthInfo struct. */
-void WebRtcIsacBw_GetBandwidthInfo(BwEstimatorstr* bwest_str,
-                                   enum IsacSamplingRate decoder_sample_rate_hz,
-                                   IsacBandwidthInfo* bwinfo);
-
-/* Uses the values from an IsacExternalBandwidthInfo struct. */
-void WebRtcIsacBw_SetBandwidthInfo(BwEstimatorstr* bwest_str,
-                                   const IsacBandwidthInfo* bwinfo);
-
-/*
- * update amount of data in bottle neck buffer and burst handling
- * returns minimum payload size (bytes)
- */
-int WebRtcIsac_GetMinBytes(
-    RateModel* State,
-    int StreamSize,            /* bytes in bitstream */
-    const int FrameLen,        /* ms per frame */
-    const double BottleNeck,   /* bottle neck rate; excl headers (bps) */
-    const double DelayBuildUp, /* max delay from bottleneck buffering (ms) */
-    enum ISACBandwidth bandwidth
-    /*,int16_t        frequentLargePackets*/);
-
-/*
- * update long-term average bitrate and amount of data in buffer
- */
-void WebRtcIsac_UpdateRateModel(
-    RateModel* State,
-    int StreamSize,           /* bytes in bitstream */
-    const int FrameSamples,   /* samples per frame */
-    const double BottleNeck); /* bottle neck rate; excl headers (bps) */
-
-void WebRtcIsac_InitRateModel(RateModel* State);
-
-/* Returns the new framelength value (input argument: bottle_neck) */
-int WebRtcIsac_GetNewFrameLength(double bottle_neck, int current_framelength);
-
-/* Returns the new SNR value (input argument: bottle_neck) */
-double WebRtcIsac_GetSnr(double bottle_neck, int new_framelength);
-
-int16_t WebRtcIsac_UpdateUplinkJitter(BwEstimatorstr* bwest_str, int32_t index);
-
-#if defined(__cplusplus)
-}
-#endif
-
-#endif /* MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_BANDWIDTH_ESTIMATOR_H_ \
-        */
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_coding/codecs/isac/main/source/codec.h b/submodules/libtgvoip/webrtc_dsp/modules/audio_coding/codecs/isac/main/source/codec.h
deleted file mode 100644
index a7c7ddc14a..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_coding/codecs/isac/main/source/codec.h
+++ /dev/null
@@ -1,223 +0,0 @@
-/*
- *  Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-/*
- * codec.h
- *
- * This header file contains the calls to the internal encoder
- * and decoder functions.
- *
- */
-
-#ifndef MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_CODEC_H_
-#define MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_CODEC_H_
-
-#include <stddef.h>
-
-#include "modules/audio_coding/codecs/isac/main/source/structs.h"
-#include "modules/third_party/fft/fft.h"
-
-void WebRtcIsac_ResetBitstream(Bitstr* bit_stream);
-
-int WebRtcIsac_EstimateBandwidth(BwEstimatorstr* bwest_str,
-                                 Bitstr* streamdata,
-                                 size_t packet_size,
-                                 uint16_t rtp_seq_number,
-                                 uint32_t send_ts,
-                                 uint32_t arr_ts,
-                                 enum IsacSamplingRate encoderSampRate,
-                                 enum IsacSamplingRate decoderSampRate);
-
-int WebRtcIsac_DecodeLb(const TransformTables* transform_tables,
-                        float* signal_out,
-                        ISACLBDecStruct* ISACdec_obj,
-                        int16_t* current_framesamples,
-                        int16_t isRCUPayload);
-
-int WebRtcIsac_DecodeRcuLb(float* signal_out,
-                           ISACLBDecStruct* ISACdec_obj,
-                           int16_t* current_framesamples);
-
-int WebRtcIsac_EncodeLb(const TransformTables* transform_tables,
-                        float* in,
-                        ISACLBEncStruct* ISACencLB_obj,
-                        int16_t codingMode,
-                        int16_t bottleneckIndex);
-
-int WebRtcIsac_EncodeStoredDataLb(const IsacSaveEncoderData* ISACSavedEnc_obj,
-                                  Bitstr* ISACBitStr_obj,
-                                  int BWnumber,
-                                  float scale);
-
-int WebRtcIsac_EncodeStoredDataUb(
-    const ISACUBSaveEncDataStruct* ISACSavedEnc_obj,
-    Bitstr* bitStream,
-    int32_t jitterInfo,
-    float scale,
-    enum ISACBandwidth bandwidth);
-
-int16_t WebRtcIsac_GetRedPayloadUb(
-    const ISACUBSaveEncDataStruct* ISACSavedEncObj,
-    Bitstr* bitStreamObj,
-    enum ISACBandwidth bandwidth);
-
-/******************************************************************************
- * WebRtcIsac_RateAllocation()
- * Internal function to perform a rate-allocation for upper and lower-band,
- * given a total rate.
- *
- * Input:
- *   - inRateBitPerSec           : a total bit-rate in bits/sec.
- *
- * Output:
- *   - rateLBBitPerSec           : a bit-rate allocated to the lower-band
- *                                 in bits/sec.
- *   - rateUBBitPerSec           : a bit-rate allocated to the upper-band
- *                                 in bits/sec.
- *
- * Return value                  : 0 if rate allocation has been successful.
- *                                -1 if failed to allocate rates.
- */
-
-int16_t WebRtcIsac_RateAllocation(int32_t inRateBitPerSec,
-                                  double* rateLBBitPerSec,
-                                  double* rateUBBitPerSec,
-                                  enum ISACBandwidth* bandwidthKHz);
-
-/******************************************************************************
- * WebRtcIsac_DecodeUb16()
- *
- * Decode the upper-band if the codec is in 0-16 kHz mode.
- *
- * Input/Output:
- *       -ISACdec_obj        : pointer to the upper-band decoder object. The
- *                             bit-stream is stored inside the decoder object.
- *
- * Output:
- *       -signal_out         : decoded audio, 480 samples 30 ms.
- *
- * Return value              : >0 number of decoded bytes.
- *                             <0 if an error occurred.
- */
-int WebRtcIsac_DecodeUb16(const TransformTables* transform_tables,
-                          float* signal_out,
-                          ISACUBDecStruct* ISACdec_obj,
-                          int16_t isRCUPayload);
-
-/******************************************************************************
- * WebRtcIsac_DecodeUb12()
- *
- * Decode the upper-band if the codec is in 0-12 kHz mode.
- *
- * Input/Output:
- *       -ISACdec_obj        : pointer to the upper-band decoder object. The
- *                             bit-stream is stored inside the decoder object.
- *
- * Output:
- *       -signal_out         : decoded audio, 480 samples 30 ms.
- *
- * Return value              : >0 number of decoded bytes.
- *                             <0 if an error occurred.
- */
-int WebRtcIsac_DecodeUb12(const TransformTables* transform_tables,
-                          float* signal_out,
-                          ISACUBDecStruct* ISACdec_obj,
-                          int16_t isRCUPayload);
-
-/******************************************************************************
- * WebRtcIsac_EncodeUb16()
- *
- * Encode the upper-band if the codec is in 0-16 kHz mode.
- *
- * Input:
- *       -in                 : upper-band audio, 160 samples (10 ms).
- *
- * Input/Output:
- *       -ISACdec_obj        : pointer to the upper-band encoder object. The
- *                             bit-stream is stored inside the encoder object.
- *
- * Return value              : >0 number of encoded bytes.
- *                             <0 if an error occurred.
- */
-int WebRtcIsac_EncodeUb16(const TransformTables* transform_tables,
-                          float* in,
-                          ISACUBEncStruct* ISACenc_obj,
-                          int32_t jitterInfo);
-
-/******************************************************************************
- * WebRtcIsac_EncodeUb12()
- *
- * Encode the upper-band if the codec is in 0-12 kHz mode.
- *
- * Input:
- *       -in                 : upper-band audio, 160 samples (10 ms).
- *
- * Input/Output:
- *       -ISACdec_obj        : pointer to the upper-band encoder object. The
- *                             bit-stream is stored inside the encoder object.
- *
- * Return value              : >0 number of encoded bytes.
- *                             <0 if an error occurred.
- */
-int WebRtcIsac_EncodeUb12(const TransformTables* transform_tables,
-                          float* in,
-                          ISACUBEncStruct* ISACenc_obj,
-                          int32_t jitterInfo);
-
-/************************** initialization functions *************************/
-
-void WebRtcIsac_InitMasking(MaskFiltstr* maskdata);
-
-void WebRtcIsac_InitPostFilterbank(PostFiltBankstr* postfiltdata);
-
-/**************************** transform functions ****************************/
-
-void WebRtcIsac_InitTransform(TransformTables* tables);
-
-void WebRtcIsac_Time2Spec(const TransformTables* tables,
-                          double* inre1,
-                          double* inre2,
-                          int16_t* outre,
-                          int16_t* outim,
-                          FFTstr* fftstr_obj);
-
-void WebRtcIsac_Spec2time(const TransformTables* tables,
-                          double* inre,
-                          double* inim,
-                          double* outre1,
-                          double* outre2,
-                          FFTstr* fftstr_obj);
-
-/***************************** filterbank functions **************************/
-
-void WebRtcIsac_FilterAndCombineFloat(float* InLP,
-                                      float* InHP,
-                                      float* Out,
-                                      PostFiltBankstr* postfiltdata);
-
-/************************* normalized lattice filters ************************/
-
-void WebRtcIsac_NormLatticeFilterMa(int orderCoef,
-                                    float* stateF,
-                                    float* stateG,
-                                    float* lat_in,
-                                    double* filtcoeflo,
-                                    double* lat_out);
-
-void WebRtcIsac_NormLatticeFilterAr(int orderCoef,
-                                    float* stateF,
-                                    float* stateG,
-                                    double* lat_in,
-                                    double* lo_filt_coef,
-                                    float* lat_out);
-
-void WebRtcIsac_Dir2Lat(double* a, int orderCoef, float* sth, float* cth);
-
-#endif /* MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_CODEC_H_ */
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_coding/codecs/isac/main/source/crc.c b/submodules/libtgvoip/webrtc_dsp/modules/audio_coding/codecs/isac/main/source/crc.c
deleted file mode 100644
index 1bb0827031..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_coding/codecs/isac/main/source/crc.c
+++ /dev/null
@@ -1,111 +0,0 @@
-/*
- *  Copyright (c) 2011 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#include <stdlib.h>
-
-#include "modules/audio_coding/codecs/isac/main/source/crc.h"
-#include "common_audio/signal_processing/include/signal_processing_library.h"
-
-#define POLYNOMIAL 0x04c11db7L
-
-
-static const uint32_t kCrcTable[256] = {
-  0,          0x4c11db7,  0x9823b6e,  0xd4326d9,  0x130476dc, 0x17c56b6b,
-  0x1a864db2, 0x1e475005, 0x2608edb8, 0x22c9f00f, 0x2f8ad6d6, 0x2b4bcb61,
-  0x350c9b64, 0x31cd86d3, 0x3c8ea00a, 0x384fbdbd, 0x4c11db70, 0x48d0c6c7,
-  0x4593e01e, 0x4152fda9, 0x5f15adac, 0x5bd4b01b, 0x569796c2, 0x52568b75,
-  0x6a1936c8, 0x6ed82b7f, 0x639b0da6, 0x675a1011, 0x791d4014, 0x7ddc5da3,
-  0x709f7b7a, 0x745e66cd, 0x9823b6e0, 0x9ce2ab57, 0x91a18d8e, 0x95609039,
-  0x8b27c03c, 0x8fe6dd8b, 0x82a5fb52, 0x8664e6e5, 0xbe2b5b58, 0xbaea46ef,
-  0xb7a96036, 0xb3687d81, 0xad2f2d84, 0xa9ee3033, 0xa4ad16ea, 0xa06c0b5d,
-  0xd4326d90, 0xd0f37027, 0xddb056fe, 0xd9714b49, 0xc7361b4c, 0xc3f706fb,
-  0xceb42022, 0xca753d95, 0xf23a8028, 0xf6fb9d9f, 0xfbb8bb46, 0xff79a6f1,
-  0xe13ef6f4, 0xe5ffeb43, 0xe8bccd9a, 0xec7dd02d, 0x34867077, 0x30476dc0,
-  0x3d044b19, 0x39c556ae, 0x278206ab, 0x23431b1c, 0x2e003dc5, 0x2ac12072,
-  0x128e9dcf, 0x164f8078, 0x1b0ca6a1, 0x1fcdbb16, 0x18aeb13,  0x54bf6a4,
-  0x808d07d,  0xcc9cdca,  0x7897ab07, 0x7c56b6b0, 0x71159069, 0x75d48dde,
-  0x6b93dddb, 0x6f52c06c, 0x6211e6b5, 0x66d0fb02, 0x5e9f46bf, 0x5a5e5b08,
-  0x571d7dd1, 0x53dc6066, 0x4d9b3063, 0x495a2dd4, 0x44190b0d, 0x40d816ba,
-  0xaca5c697, 0xa864db20, 0xa527fdf9, 0xa1e6e04e, 0xbfa1b04b, 0xbb60adfc,
-  0xb6238b25, 0xb2e29692, 0x8aad2b2f, 0x8e6c3698, 0x832f1041, 0x87ee0df6,
-  0x99a95df3, 0x9d684044, 0x902b669d, 0x94ea7b2a, 0xe0b41de7, 0xe4750050,
-  0xe9362689, 0xedf73b3e, 0xf3b06b3b, 0xf771768c, 0xfa325055, 0xfef34de2,
-  0xc6bcf05f, 0xc27dede8, 0xcf3ecb31, 0xcbffd686, 0xd5b88683, 0xd1799b34,
-  0xdc3abded, 0xd8fba05a, 0x690ce0ee, 0x6dcdfd59, 0x608edb80, 0x644fc637,
-  0x7a089632, 0x7ec98b85, 0x738aad5c, 0x774bb0eb, 0x4f040d56, 0x4bc510e1,
-  0x46863638, 0x42472b8f, 0x5c007b8a, 0x58c1663d, 0x558240e4, 0x51435d53,
-  0x251d3b9e, 0x21dc2629, 0x2c9f00f0, 0x285e1d47, 0x36194d42, 0x32d850f5,
-  0x3f9b762c, 0x3b5a6b9b,  0x315d626, 0x7d4cb91,  0xa97ed48,  0xe56f0ff,
-  0x1011a0fa, 0x14d0bd4d, 0x19939b94, 0x1d528623, 0xf12f560e, 0xf5ee4bb9,
-  0xf8ad6d60, 0xfc6c70d7, 0xe22b20d2, 0xe6ea3d65, 0xeba91bbc, 0xef68060b,
-  0xd727bbb6, 0xd3e6a601, 0xdea580d8, 0xda649d6f, 0xc423cd6a, 0xc0e2d0dd,
-  0xcda1f604, 0xc960ebb3, 0xbd3e8d7e, 0xb9ff90c9, 0xb4bcb610, 0xb07daba7,
-  0xae3afba2, 0xaafbe615, 0xa7b8c0cc, 0xa379dd7b, 0x9b3660c6, 0x9ff77d71,
-  0x92b45ba8, 0x9675461f, 0x8832161a, 0x8cf30bad, 0x81b02d74, 0x857130c3,
-  0x5d8a9099, 0x594b8d2e, 0x5408abf7, 0x50c9b640, 0x4e8ee645, 0x4a4ffbf2,
-  0x470cdd2b, 0x43cdc09c, 0x7b827d21, 0x7f436096, 0x7200464f, 0x76c15bf8,
-  0x68860bfd, 0x6c47164a, 0x61043093, 0x65c52d24, 0x119b4be9, 0x155a565e,
-  0x18197087, 0x1cd86d30, 0x29f3d35,  0x65e2082,  0xb1d065b,  0xfdc1bec,
-  0x3793a651, 0x3352bbe6, 0x3e119d3f, 0x3ad08088, 0x2497d08d, 0x2056cd3a,
-  0x2d15ebe3, 0x29d4f654, 0xc5a92679, 0xc1683bce, 0xcc2b1d17, 0xc8ea00a0,
-  0xd6ad50a5, 0xd26c4d12, 0xdf2f6bcb, 0xdbee767c, 0xe3a1cbc1, 0xe760d676,
-  0xea23f0af, 0xeee2ed18, 0xf0a5bd1d, 0xf464a0aa, 0xf9278673, 0xfde69bc4,
-  0x89b8fd09, 0x8d79e0be, 0x803ac667, 0x84fbdbd0, 0x9abc8bd5, 0x9e7d9662,
-  0x933eb0bb, 0x97ffad0c, 0xafb010b1, 0xab710d06, 0xa6322bdf, 0xa2f33668,
-  0xbcb4666d, 0xb8757bda, 0xb5365d03, 0xb1f740b4
-};
-
-
-
-
-/****************************************************************************
- * WebRtcIsac_GetCrc(...)
- *
- * This function returns a 32 bit CRC checksum of a bit stream
- *
- * Input:
- *  - bitstream              : payload bitstream
- *  - len_bitstream_in_bytes : number of 8-bit words in the bit stream
- *
- * Output:
- *  - crc                    : checksum
- *
- * Return value              :  0 - Ok
- *                             -1 - Error
- */
-
-int WebRtcIsac_GetCrc(const int16_t* bitstream,
-                      int len_bitstream_in_bytes,
-                      uint32_t* crc)
-{
-  uint8_t* bitstream_ptr_uw8;
-  uint32_t crc_state;
-  int byte_cntr;
-  int crc_tbl_indx;
-
-  /* Sanity Check. */
-  if (bitstream == NULL) {
-    return -1;
-  }
-  /* cast to UWord8 pointer */
-  bitstream_ptr_uw8 = (uint8_t *)bitstream;
-
-  /* initialize */
-  crc_state = 0xFFFFFFFF;
-
-  for (byte_cntr = 0; byte_cntr < len_bitstream_in_bytes; byte_cntr++) {
-    crc_tbl_indx = (WEBRTC_SPL_RSHIFT_U32(crc_state, 24) ^
-                       bitstream_ptr_uw8[byte_cntr]) & 0xFF;
-    crc_state = (crc_state << 8) ^ kCrcTable[crc_tbl_indx];
-  }
-
-  *crc = ~crc_state;
-  return 0;
-}
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_coding/codecs/isac/main/source/crc.h b/submodules/libtgvoip/webrtc_dsp/modules/audio_coding/codecs/isac/main/source/crc.h
deleted file mode 100644
index f031019ed3..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_coding/codecs/isac/main/source/crc.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- *  Copyright (c) 2011 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-/*
- * crc.h
- *
- * Checksum functions
- *
- */
-
-#ifndef MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_CRC_H_
-#define MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_CRC_H_
-
-#include <stdint.h>
-
-/****************************************************************************
- * WebRtcIsac_GetCrc(...)
- *
- * This function returns a 32 bit CRC checksum of a bit stream
- *
- * Input:
- *  - encoded      : payload bit stream
- *  - no_of_word8s : number of 8-bit words in the bit stream
- *
- * Output:
- *  - crc          : checksum
- *
- * Return value    :  0 - Ok
- *                   -1 - Error
- */
-
-int WebRtcIsac_GetCrc(const int16_t* encoded, int no_of_word8s, uint32_t* crc);
-
-#endif /* MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_CRC_H_ */
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_coding/codecs/isac/main/source/decode.c b/submodules/libtgvoip/webrtc_dsp/modules/audio_coding/codecs/isac/main/source/decode.c
deleted file mode 100644
index 6e114e4a2b..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_coding/codecs/isac/main/source/decode.c
+++ /dev/null
@@ -1,303 +0,0 @@
-/*
- *  Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-/*
- * decode_B.c
- *
- * This file contains definition of funtions for decoding.
- * Decoding of lower-band, including normal-decoding and RCU decoding.
- * Decoding of upper-band, including 8-12 kHz, when the bandwidth is
- * 0-12 kHz, and 8-16 kHz, when the bandwidth is 0-16 kHz.
- *
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "modules/audio_coding/codecs/isac/main/source/codec.h"
-#include "modules/audio_coding/codecs/isac/main/source/entropy_coding.h"
-#include "modules/audio_coding/codecs/isac/main/source/pitch_estimator.h"
-#include "modules/audio_coding/codecs/isac/main/source/bandwidth_estimator.h"
-#include "modules/audio_coding/codecs/isac/main/source/structs.h"
-#include "modules/audio_coding/codecs/isac/main/source/settings.h"
-#include "modules/audio_coding/codecs/isac/main/source/pitch_filter.h"
-
-/*
- * function to decode the bitstream
- * returns the total number of bytes in the stream
- */
-int WebRtcIsac_DecodeLb(const TransformTables* transform_tables,
-                        float* signal_out, ISACLBDecStruct* ISACdecLB_obj,
-                        int16_t* current_framesamples,
-                        int16_t isRCUPayload) {
-  int k;
-  int len, err;
-  int16_t bandwidthInd;
-
-  float LP_dec_float[FRAMESAMPLES_HALF];
-  float HP_dec_float[FRAMESAMPLES_HALF];
-
-  double LPw[FRAMESAMPLES_HALF];
-  double HPw[FRAMESAMPLES_HALF];
-  double LPw_pf[FRAMESAMPLES_HALF];
-
-  double lo_filt_coef[(ORDERLO + 1)*SUBFRAMES];
-  double hi_filt_coef[(ORDERHI + 1)*SUBFRAMES];
-
-  double real_f[FRAMESAMPLES_HALF];
-  double imag_f[FRAMESAMPLES_HALF];
-
-  double PitchLags[4];
-  double PitchGains[4];
-  double AvgPitchGain;
-  int16_t PitchGains_Q12[4];
-  int16_t AvgPitchGain_Q12;
-
-  float gain;
-
-  int frame_nb; /* counter */
-  int frame_mode; /* 0 30ms, 1 for 60ms */
-  /* Processed_samples: 480 (30, 60 ms). Cannot take other values. */
-
-  WebRtcIsac_ResetBitstream(&(ISACdecLB_obj->bitstr_obj));
-
-  len = 0;
-
-  /* Decode framelength and BW estimation - not used,
-     only for stream pointer*/
-  err = WebRtcIsac_DecodeFrameLen(&ISACdecLB_obj->bitstr_obj,
-                                  current_framesamples);
-  if (err < 0) {
-    return err;
-  }
-
-  /* Frame_mode:
-   * 0: indicates 30 ms frame (480 samples)
-   * 1: indicates 60 ms frame (960 samples) */
-  frame_mode = *current_framesamples / MAX_FRAMESAMPLES;
-
-  err = WebRtcIsac_DecodeSendBW(&ISACdecLB_obj->bitstr_obj, &bandwidthInd);
-  if (err < 0) {
-    return err;
-  }
-
-  /* One loop if it's one frame (20 or 30ms), 2 loops if 2 frames
-     bundled together (60ms). */
-  for (frame_nb = 0; frame_nb <= frame_mode; frame_nb++) {
-    /* Decode & de-quantize pitch parameters */
-    err = WebRtcIsac_DecodePitchGain(&ISACdecLB_obj->bitstr_obj,
-                                     PitchGains_Q12);
-    if (err < 0) {
-      return err;
-    }
-
-    err = WebRtcIsac_DecodePitchLag(&ISACdecLB_obj->bitstr_obj, PitchGains_Q12,
-                                    PitchLags);
-    if (err < 0) {
-      return err;
-    }
-
-    AvgPitchGain_Q12 = (PitchGains_Q12[0] + PitchGains_Q12[1] +
-        PitchGains_Q12[2] + PitchGains_Q12[3]) >> 2;
-
-    /* Decode & de-quantize filter coefficients. */
-    err = WebRtcIsac_DecodeLpc(&ISACdecLB_obj->bitstr_obj, lo_filt_coef,
-                               hi_filt_coef);
-    if (err < 0) {
-      return err;
-    }
-    /* Decode & de-quantize spectrum. */
-    len = WebRtcIsac_DecodeSpec(&ISACdecLB_obj->bitstr_obj, AvgPitchGain_Q12,
-                                kIsacLowerBand, real_f, imag_f);
-    if (len < 0) {
-      return len;
-    }
-
-    /* Inverse transform. */
-    WebRtcIsac_Spec2time(transform_tables, real_f, imag_f, LPw, HPw,
-                         &ISACdecLB_obj->fftstr_obj);
-
-    /* Convert PitchGains back to float for pitchfilter_post */
-    for (k = 0; k < 4; k++) {
-      PitchGains[k] = ((float)PitchGains_Q12[k]) / 4096;
-    }
-    if (isRCUPayload) {
-      for (k = 0; k < 240; k++) {
-        LPw[k] *= RCU_TRANSCODING_SCALE_INVERSE;
-        HPw[k] *= RCU_TRANSCODING_SCALE_INVERSE;
-      }
-    }
-
-    /* Inverse pitch filter. */
-    WebRtcIsac_PitchfilterPost(LPw, LPw_pf, &ISACdecLB_obj->pitchfiltstr_obj,
-                               PitchLags, PitchGains);
-    /* Convert AvgPitchGain back to float for computation of gain. */
-    AvgPitchGain = ((float)AvgPitchGain_Q12) / 4096;
-    gain = 1.0f - 0.45f * (float)AvgPitchGain;
-
-    for (k = 0; k < FRAMESAMPLES_HALF; k++) {
-      /* Reduce gain to compensate for pitch enhancer. */
-      LPw_pf[k] *= gain;
-    }
-
-    if (isRCUPayload) {
-      for (k = 0; k < FRAMESAMPLES_HALF; k++) {
-        /* Compensation for transcoding gain changes. */
-        LPw_pf[k] *= RCU_TRANSCODING_SCALE;
-        HPw[k] *= RCU_TRANSCODING_SCALE;
-      }
-    }
-    /* Perceptual post-filtering (using normalized lattice filter). */
-    WebRtcIsac_NormLatticeFilterAr(
-        ORDERLO, ISACdecLB_obj->maskfiltstr_obj.PostStateLoF,
-        (ISACdecLB_obj->maskfiltstr_obj).PostStateLoG, LPw_pf, lo_filt_coef,
-        LP_dec_float);
-    WebRtcIsac_NormLatticeFilterAr(
-        ORDERHI, ISACdecLB_obj->maskfiltstr_obj.PostStateHiF,
-        (ISACdecLB_obj->maskfiltstr_obj).PostStateHiG, HPw, hi_filt_coef,
-        HP_dec_float);
-
-    /* Recombine the 2 bands. */
-    WebRtcIsac_FilterAndCombineFloat(LP_dec_float, HP_dec_float,
-                                     signal_out + frame_nb * FRAMESAMPLES,
-                                     &ISACdecLB_obj->postfiltbankstr_obj);
-  }
-  return len;
-}
-
-
-/*
- * This decode function is called when the codec is operating in 16 kHz
- * bandwidth to decode the upperband, i.e. 8-16 kHz.
- *
- * Contrary to lower-band, the upper-band (8-16 kHz) is not split in
- * frequency, but split to 12 sub-frames, i.e. twice as lower-band.
- */
-int WebRtcIsac_DecodeUb16(const TransformTables* transform_tables,
-                          float* signal_out, ISACUBDecStruct* ISACdecUB_obj,
-                          int16_t isRCUPayload) {
-  int len, err;
-
-  double halfFrameFirst[FRAMESAMPLES_HALF];
-  double halfFrameSecond[FRAMESAMPLES_HALF];
-
-  double percepFilterParam[(UB_LPC_ORDER + 1) * (SUBFRAMES << 1) +
-                           (UB_LPC_ORDER + 1)];
-
-  double real_f[FRAMESAMPLES_HALF];
-  double imag_f[FRAMESAMPLES_HALF];
-  const int16_t kAveragePitchGain = 0; /* No pitch-gain for upper-band. */
-  len = 0;
-
-  /* Decode & de-quantize filter coefficients. */
-  memset(percepFilterParam, 0, sizeof(percepFilterParam));
-  err = WebRtcIsac_DecodeInterpolLpcUb(&ISACdecUB_obj->bitstr_obj,
-                                       percepFilterParam, isac16kHz);
-  if (err < 0) {
-    return err;
-  }
-
-  /* Decode & de-quantize spectrum. */
-  len = WebRtcIsac_DecodeSpec(&ISACdecUB_obj->bitstr_obj, kAveragePitchGain,
-                              kIsacUpperBand16, real_f, imag_f);
-  if (len < 0) {
-    return len;
-  }
-  if (isRCUPayload) {
-    int n;
-    for (n = 0; n < 240; n++) {
-      real_f[n] *= RCU_TRANSCODING_SCALE_UB_INVERSE;
-      imag_f[n] *= RCU_TRANSCODING_SCALE_UB_INVERSE;
-    }
-  }
-  /* Inverse transform. */
-  WebRtcIsac_Spec2time(transform_tables,
-                       real_f, imag_f, halfFrameFirst, halfFrameSecond,
-                       &ISACdecUB_obj->fftstr_obj);
-
-  /* Perceptual post-filtering (using normalized lattice filter). */
-  WebRtcIsac_NormLatticeFilterAr(
-      UB_LPC_ORDER, ISACdecUB_obj->maskfiltstr_obj.PostStateLoF,
-      (ISACdecUB_obj->maskfiltstr_obj).PostStateLoG, halfFrameFirst,
-      &percepFilterParam[(UB_LPC_ORDER + 1)], signal_out);
-
-  WebRtcIsac_NormLatticeFilterAr(
-      UB_LPC_ORDER, ISACdecUB_obj->maskfiltstr_obj.PostStateLoF,
-      (ISACdecUB_obj->maskfiltstr_obj).PostStateLoG, halfFrameSecond,
-      &percepFilterParam[(UB_LPC_ORDER + 1) * SUBFRAMES + (UB_LPC_ORDER + 1)],
-      &signal_out[FRAMESAMPLES_HALF]);
-
-  return len;
-}
-
-/*
- * This decode function is called when the codec operates at 0-12 kHz
- * bandwidth to decode the upperband, i.e. 8-12 kHz.
- *
- * At the encoder the upper-band is split into two band, 8-12 kHz & 12-16
- * kHz, and only 8-12 kHz is encoded. At the decoder, 8-12 kHz band is
- * reconstructed and 12-16 kHz replaced with zeros. Then two bands
- * are combined, to reconstruct the upperband 8-16 kHz.
- */
-int WebRtcIsac_DecodeUb12(const TransformTables* transform_tables,
-                          float* signal_out, ISACUBDecStruct* ISACdecUB_obj,
-                          int16_t isRCUPayload) {
-  int len, err;
-
-  float LP_dec_float[FRAMESAMPLES_HALF];
-  float HP_dec_float[FRAMESAMPLES_HALF];
-
-  double LPw[FRAMESAMPLES_HALF];
-  double HPw[FRAMESAMPLES_HALF];
-
-  double percepFilterParam[(UB_LPC_ORDER + 1)*SUBFRAMES];
-
-  double real_f[FRAMESAMPLES_HALF];
-  double imag_f[FRAMESAMPLES_HALF];
-  const int16_t kAveragePitchGain = 0; /* No pitch-gain for upper-band. */
-  len = 0;
-
-  /* Decode & dequantize filter coefficients. */
-  err = WebRtcIsac_DecodeInterpolLpcUb(&ISACdecUB_obj->bitstr_obj,
-                                       percepFilterParam, isac12kHz);
-  if (err < 0) {
-    return err;
-  }
-
-  /* Decode & de-quantize spectrum. */
-  len = WebRtcIsac_DecodeSpec(&ISACdecUB_obj->bitstr_obj, kAveragePitchGain,
-                              kIsacUpperBand12, real_f, imag_f);
-  if (len < 0) {
-    return len;
-  }
-
-  if (isRCUPayload) {
-    int n;
-    for (n = 0; n < 240; n++) {
-      real_f[n] *= RCU_TRANSCODING_SCALE_UB_INVERSE;
-      imag_f[n] *= RCU_TRANSCODING_SCALE_UB_INVERSE;
-    }
-  }
-  /* Inverse transform. */
-  WebRtcIsac_Spec2time(transform_tables,
-                       real_f, imag_f, LPw, HPw, &ISACdecUB_obj->fftstr_obj);
-  /* perceptual post-filtering (using normalized lattice filter) */
-  WebRtcIsac_NormLatticeFilterAr(UB_LPC_ORDER,
-                                 ISACdecUB_obj->maskfiltstr_obj.PostStateLoF,
-                                 (ISACdecUB_obj->maskfiltstr_obj).PostStateLoG,
-                                 LPw, percepFilterParam, LP_dec_float);
-  /* Zero for 12-16 kHz. */
-  memset(HP_dec_float, 0, sizeof(float) * (FRAMESAMPLES_HALF));
-  /* Recombine the 2 bands. */
-  WebRtcIsac_FilterAndCombineFloat(HP_dec_float, LP_dec_float, signal_out,
-                                   &ISACdecUB_obj->postfiltbankstr_obj);
-  return len;
-}
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_coding/codecs/isac/main/source/decode_bwe.c b/submodules/libtgvoip/webrtc_dsp/modules/audio_coding/codecs/isac/main/source/decode_bwe.c
deleted file mode 100644
index 89d970fc75..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_coding/codecs/isac/main/source/decode_bwe.c
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
- *  Copyright (c) 2011 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#include "modules/audio_coding/codecs/isac/main/source/structs.h"
-#include "modules/audio_coding/codecs/isac/main/source/bandwidth_estimator.h"
-#include "modules/audio_coding/codecs/isac/main/source/entropy_coding.h"
-#include "modules/audio_coding/codecs/isac/main/source/codec.h"
-
-
-int
-WebRtcIsac_EstimateBandwidth(
-    BwEstimatorstr*           bwest_str,
-    Bitstr*                   streamdata,
-    size_t                packet_size,
-    uint16_t              rtp_seq_number,
-    uint32_t              send_ts,
-    uint32_t              arr_ts,
-    enum IsacSamplingRate encoderSampRate,
-    enum IsacSamplingRate decoderSampRate)
-{
-  int16_t  index;
-  int16_t  frame_samples;
-  uint32_t sendTimestampIn16kHz;
-  uint32_t arrivalTimestampIn16kHz;
-  uint32_t diffSendTime;
-  uint32_t diffArrivalTime;
-  int err;
-
-  /* decode framelength and BW estimation */
-  err = WebRtcIsac_DecodeFrameLen(streamdata, &frame_samples);
-  if(err < 0)  // error check
-  {
-    return err;
-  }
-  err = WebRtcIsac_DecodeSendBW(streamdata, &index);
-  if(err < 0)  // error check
-  {
-    return err;
-  }
-
-  /* UPDATE ESTIMATES FROM OTHER SIDE */
-  err = WebRtcIsac_UpdateUplinkBwImpl(bwest_str, index, encoderSampRate);
-  if(err < 0)
-  {
-    return err;
-  }
-
-  // We like BWE to work at 16 kHz sampling rate,
-  // therefore, we have to change the timestamps accordingly.
-  // translate the send timestamp if required
-  diffSendTime = (uint32_t)((uint32_t)send_ts -
-                                  (uint32_t)bwest_str->senderTimestamp);
-  bwest_str->senderTimestamp = send_ts;
-
-  diffArrivalTime = (uint32_t)((uint32_t)arr_ts -
-                                     (uint32_t)bwest_str->receiverTimestamp);
-  bwest_str->receiverTimestamp = arr_ts;
-
-  if(decoderSampRate == kIsacSuperWideband)
-  {
-    diffArrivalTime = (uint32_t)diffArrivalTime >> 1;
-    diffSendTime = (uint32_t)diffSendTime >> 1;
-  }
-
-  // arrival timestamp in 16 kHz
-  arrivalTimestampIn16kHz = (uint32_t)((uint32_t)
-                                             bwest_str->prev_rec_arr_ts + (uint32_t)diffArrivalTime);
-  // send timestamp in 16 kHz
-  sendTimestampIn16kHz = (uint32_t)((uint32_t)
-                                          bwest_str->prev_rec_send_ts + (uint32_t)diffSendTime);
-
-  err = WebRtcIsac_UpdateBandwidthEstimator(bwest_str, rtp_seq_number,
-                                            (frame_samples * 1000) / FS, sendTimestampIn16kHz,
-                                            arrivalTimestampIn16kHz, packet_size);
-  // error check
-  if(err < 0)
-  {
-    return err;
-  }
-
-  return 0;
-}
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_coding/codecs/isac/main/source/encode.c b/submodules/libtgvoip/webrtc_dsp/modules/audio_coding/codecs/isac/main/source/encode.c
deleted file mode 100644
index bf92d02c53..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_coding/codecs/isac/main/source/encode.c
+++ /dev/null
@@ -1,1260 +0,0 @@
-/*
- *  Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-/*
- * encode.c
- *
- * This file contains definition of funtions for encoding.
- * Decoding of upper-band, including 8-12 kHz, when the bandwidth is
- * 0-12 kHz, and 8-16 kHz, when the bandwidth is 0-16 kHz.
- *
- */
-
-#include <stdlib.h>
-#include <string.h>
-#include <stdio.h>
-
-#include "modules/audio_coding/codecs/isac/main/source/structs.h"
-#include "modules/audio_coding/codecs/isac/main/source/codec.h"
-#include "modules/audio_coding/codecs/isac/main/source/pitch_estimator.h"
-#include "modules/audio_coding/codecs/isac/main/source/entropy_coding.h"
-#include "modules/audio_coding/codecs/isac/main/source/arith_routines.h"
-#include "modules/audio_coding/codecs/isac/main/source/pitch_gain_tables.h"
-#include "modules/audio_coding/codecs/isac/main/source/pitch_lag_tables.h"
-#include "modules/audio_coding/codecs/isac/main/source/spectrum_ar_model_tables.h"
-#include "modules/audio_coding/codecs/isac/main/source/lpc_tables.h"
-#include "modules/audio_coding/codecs/isac/main/source/lpc_analysis.h"
-#include "modules/audio_coding/codecs/isac/main/source/bandwidth_estimator.h"
-#include "modules/audio_coding/codecs/isac/main/source/lpc_shape_swb12_tables.h"
-#include "modules/audio_coding/codecs/isac/main/source/lpc_shape_swb16_tables.h"
-#include "modules/audio_coding/codecs/isac/main/source/lpc_gain_swb_tables.h"
-#include "modules/audio_coding/codecs/isac/main/source/isac_vad.h"
-#include "modules/audio_coding/codecs/isac/main/source/pitch_filter.h"
-
-
-#define UB_LOOKAHEAD 24
-
-
-/*
-  Rate allocation tables of lower and upper-band bottleneck for
-  12kHz & 16kHz bandwidth.
-
-  12 kHz bandwidth
-  -----------------
-  The overall bottleneck of the coder is between 38 kbps and 45 kbps. We have
-  considered 7 enteries, uniformly distributed in this interval, i.e. 38,
-  39.17, 40.33, 41.5, 42.67, 43.83 and 45. For every entery, the lower-band
-  and the upper-band bottlenecks are specified in
-  'kLowerBandBitRate12' and 'kUpperBandBitRate12'
-  tables, respectively. E.g. the overall rate of 41.5 kbps corresponts to a
-  bottleneck of 31 kbps for lower-band and 27 kbps for upper-band. Given an
-  overall bottleneck of the codec, we use linear interpolation to get
-  lower-band and upper-band bottlenecks.
-
-  16 kHz bandwidth
-  -----------------
-  The overall bottleneck of the coder is between 50 kbps and 56 kbps. We have
-  considered 7 enteries, uniformly distributed in this interval, i.e. 50, 51.2,
-  52.4, 53.6, 54.8 and 56. For every entery, the lower-band and the upper-band
-  bottlenecks are specified in 'kLowerBandBitRate16' and
-  'kUpperBandBitRate16' tables, respectively. E.g. the overall rate
-  of 53.6 kbps corresponts to a bottleneck of 32 kbps for lower-band and 30
-  kbps for upper-band. Given an overall bottleneck of the codec, we use linear
-  interpolation to get lower-band and upper-band bottlenecks.
-
- */
-
-/*     38  39.17  40.33   41.5  42.67  43.83     45 */
-static const int16_t kLowerBandBitRate12[7] = {
-    29000, 30000, 30000, 31000, 31000, 32000, 32000 };
-static const int16_t kUpperBandBitRate12[7] = {
-    25000, 25000, 27000, 27000, 29000, 29000, 32000 };
-
-/*    50     51.2  52.4   53.6   54.8    56 */
-static const int16_t kLowerBandBitRate16[6] = {
-    31000, 31000, 32000, 32000, 32000, 32000 };
-static const int16_t kUpperBandBitRate16[6] = {
-    28000, 29000, 29000, 30000, 31000, 32000 };
-
-/******************************************************************************
- * WebRtcIsac_RateAllocation()
- * Internal function to perform a rate-allocation for upper and lower-band,
- * given a total rate.
- *
- * Input:
- *   - inRateBitPerSec           : a total bottleneck in bits/sec.
- *
- * Output:
- *   - rateLBBitPerSec           : a bottleneck allocated to the lower-band
- *                                 in bits/sec.
- *   - rateUBBitPerSec           : a bottleneck allocated to the upper-band
- *                                 in bits/sec.
- *
- * Return value                  : 0 if rate allocation has been successful.
- *                                -1 if failed to allocate rates.
- */
-
-int16_t WebRtcIsac_RateAllocation(int32_t inRateBitPerSec,
-                                        double* rateLBBitPerSec,
-                                        double* rateUBBitPerSec,
-                                        enum ISACBandwidth* bandwidthKHz) {
-  int16_t idx;
-  double idxD;
-  double idxErr;
-  if (inRateBitPerSec < 38000) {
-    /* If the given overall bottleneck is less than 38000 then
-     * then codec has to operate in wideband mode, i.e. 8 kHz
-     * bandwidth. */
-    *rateLBBitPerSec = (int16_t)((inRateBitPerSec > 32000) ?
-        32000 : inRateBitPerSec);
-    *rateUBBitPerSec = 0;
-    *bandwidthKHz = isac8kHz;
-  } else if ((inRateBitPerSec >= 38000) && (inRateBitPerSec < 50000)) {
-    /* At a bottleneck between 38 and 50 kbps the codec is operating
-     * at 12 kHz bandwidth. Using xxxBandBitRate12[] to calculates
-     * upper/lower bottleneck */
-
-    /* Find the bottlenecks by linear interpolation,
-     * step is (45000 - 38000)/6.0 we use the inverse of it. */
-    const double stepSizeInv = 8.5714286e-4;
-    idxD = (inRateBitPerSec - 38000) * stepSizeInv;
-    idx = (idxD >= 6) ? 6 : ((int16_t)idxD);
-    idxErr = idxD - idx;
-    *rateLBBitPerSec = kLowerBandBitRate12[idx];
-    *rateUBBitPerSec = kUpperBandBitRate12[idx];
-
-    if (idx < 6) {
-      *rateLBBitPerSec += (int16_t)(
-          idxErr * (kLowerBandBitRate12[idx + 1] - kLowerBandBitRate12[idx]));
-      *rateUBBitPerSec += (int16_t)(
-          idxErr * (kUpperBandBitRate12[idx + 1] - kUpperBandBitRate12[idx]));
-    }
-    *bandwidthKHz = isac12kHz;
-  } else if ((inRateBitPerSec >= 50000) && (inRateBitPerSec <= 56000)) {
-    /* A bottleneck between 50 and 56 kbps corresponds to bandwidth
-     * of 16 kHz. Using xxxBandBitRate16[] to calculates
-     * upper/lower bottleneck. */
-
-    /* Find the bottlenecks by linear interpolation
-     * step is (56000 - 50000)/5 we use the inverse of it. */
-    const double stepSizeInv = 8.3333333e-4;
-    idxD = (inRateBitPerSec - 50000) * stepSizeInv;
-    idx = (idxD >= 5) ? 5 : ((int16_t)idxD);
-    idxErr = idxD - idx;
-    *rateLBBitPerSec = kLowerBandBitRate16[idx];
-    *rateUBBitPerSec  = kUpperBandBitRate16[idx];
-
-    if (idx < 5) {
-      *rateLBBitPerSec += (int16_t)(idxErr *
-          (kLowerBandBitRate16[idx + 1] -
-              kLowerBandBitRate16[idx]));
-
-      *rateUBBitPerSec += (int16_t)(idxErr *
-          (kUpperBandBitRate16[idx + 1] -
-              kUpperBandBitRate16[idx]));
-    }
-    *bandwidthKHz = isac16kHz;
-  } else {
-    /* Out-of-range botlteneck value. */
-    return -1;
-  }
-
-  /* limit the values. */
-  *rateLBBitPerSec = (*rateLBBitPerSec > 32000) ? 32000 : *rateLBBitPerSec;
-  *rateUBBitPerSec = (*rateUBBitPerSec > 32000) ? 32000 : *rateUBBitPerSec;
-  return 0;
-}
-
-
-void WebRtcIsac_ResetBitstream(Bitstr* bit_stream) {
-  bit_stream->W_upper = 0xFFFFFFFF;
-  bit_stream->stream_index = 0;
-  bit_stream->streamval = 0;
-}
-
-int WebRtcIsac_EncodeLb(const TransformTables* transform_tables,
-                        float* in, ISACLBEncStruct* ISACencLB_obj,
-                        int16_t codingMode,
-                        int16_t bottleneckIndex) {
-  int stream_length = 0;
-  int err;
-  int k;
-  int iterCntr;
-
-  double lofilt_coef[(ORDERLO + 1)*SUBFRAMES];
-  double hifilt_coef[(ORDERHI + 1)*SUBFRAMES];
-  float LP[FRAMESAMPLES_HALF];
-  float HP[FRAMESAMPLES_HALF];
-
-  double LP_lookahead[FRAMESAMPLES_HALF];
-  double HP_lookahead[FRAMESAMPLES_HALF];
-  double LP_lookahead_pf[FRAMESAMPLES_HALF + QLOOKAHEAD];
-  double LPw[FRAMESAMPLES_HALF];
-
-  double HPw[FRAMESAMPLES_HALF];
-  double LPw_pf[FRAMESAMPLES_HALF];
-  int16_t fre[FRAMESAMPLES_HALF];   /* Q7 */
-  int16_t fim[FRAMESAMPLES_HALF];   /* Q7 */
-
-  double PitchLags[4];
-  double PitchGains[4];
-  int16_t PitchGains_Q12[4];
-  int16_t AvgPitchGain_Q12;
-
-  int frame_mode; /* 0 for 30ms, 1 for 60ms */
-  int status = 0;
-  int my_index;
-  transcode_obj transcodingParam;
-  double bytesLeftSpecCoding;
-  uint16_t payloadLimitBytes;
-
-  /* Copy new frame-length and bottleneck rate only for the first 10 ms data */
-  if (ISACencLB_obj->buffer_index == 0) {
-    /* Set the framelength for the next packet. */
-    ISACencLB_obj->current_framesamples = ISACencLB_obj->new_framelength;
-  }
-  /* 'frame_mode' is 0 (30 ms) or 1 (60 ms). */
-  frame_mode = ISACencLB_obj->current_framesamples / MAX_FRAMESAMPLES;
-
-  /* buffer speech samples (by 10ms packet) until the frame-length */
-  /* is reached (30 or 60 ms).                                     */
-  /*****************************************************************/
-
-  /* fill the buffer with 10ms input data */
-  for (k = 0; k < FRAMESAMPLES_10ms; k++) {
-    ISACencLB_obj->data_buffer_float[k + ISACencLB_obj->buffer_index] = in[k];
-  }
-
-  /* If buffersize is not equal to current framesize then increase index
-   * and return. We do no encoding untill we have enough audio.  */
-  if (ISACencLB_obj->buffer_index + FRAMESAMPLES_10ms != FRAMESAMPLES) {
-    ISACencLB_obj->buffer_index += FRAMESAMPLES_10ms;
-    return 0;
-  }
-  /* If buffer reached the right size, reset index and continue with
-   * encoding the frame. */
-  ISACencLB_obj->buffer_index = 0;
-
-  /* End of buffer function. */
-  /**************************/
-
-  /* Encoding */
-  /************/
-
-  if (frame_mode == 0 || ISACencLB_obj->frame_nb == 0) {
-    /* This is to avoid Linux warnings until we change 'int' to 'Word32'
-     * at all places. */
-    int intVar;
-    /* reset bitstream */
-    WebRtcIsac_ResetBitstream(&(ISACencLB_obj->bitstr_obj));
-
-    if ((codingMode == 0) && (frame_mode == 0) &&
-        (ISACencLB_obj->enforceFrameSize == 0)) {
-      ISACencLB_obj->new_framelength = WebRtcIsac_GetNewFrameLength(
-          ISACencLB_obj->bottleneck, ISACencLB_obj->current_framesamples);
-    }
-
-    ISACencLB_obj->s2nr = WebRtcIsac_GetSnr(
-        ISACencLB_obj->bottleneck, ISACencLB_obj->current_framesamples);
-
-    /* Encode frame length. */
-    status = WebRtcIsac_EncodeFrameLen(
-        ISACencLB_obj->current_framesamples, &ISACencLB_obj->bitstr_obj);
-    if (status < 0) {
-      /* Wrong frame size. */
-      return status;
-    }
-    /* Save framelength for multiple packets memory. */
-    ISACencLB_obj->SaveEnc_obj.framelength =
-        ISACencLB_obj->current_framesamples;
-
-    /* To be used for Redundant Coding. */
-    ISACencLB_obj->lastBWIdx = bottleneckIndex;
-    intVar = (int)bottleneckIndex;
-    WebRtcIsac_EncodeReceiveBw(&intVar, &ISACencLB_obj->bitstr_obj);
-  }
-
-  /* Split signal in two bands. */
-  WebRtcIsac_SplitAndFilterFloat(ISACencLB_obj->data_buffer_float, LP, HP,
-                                 LP_lookahead, HP_lookahead,
-                                 &ISACencLB_obj->prefiltbankstr_obj);
-
-  /* estimate pitch parameters and pitch-filter lookahead signal */
-  WebRtcIsac_PitchAnalysis(LP_lookahead, LP_lookahead_pf,
-                           &ISACencLB_obj->pitchanalysisstr_obj, PitchLags,
-                           PitchGains);
-
-  /* Encode in FIX Q12. */
-
-  /* Convert PitchGain to Fixed point. */
-  for (k = 0; k < PITCH_SUBFRAMES; k++) {
-    PitchGains_Q12[k] = (int16_t)(PitchGains[k] * 4096.0);
-  }
-
-  /* Set where to store data in multiple packets memory. */
-  if (frame_mode == 0 || ISACencLB_obj->frame_nb == 0) {
-    ISACencLB_obj->SaveEnc_obj.startIdx = 0;
-  } else {
-    ISACencLB_obj->SaveEnc_obj.startIdx = 1;
-  }
-
-  /* Quantize & encode pitch parameters. */
-  WebRtcIsac_EncodePitchGain(PitchGains_Q12, &ISACencLB_obj->bitstr_obj,
-                             &ISACencLB_obj->SaveEnc_obj);
-  WebRtcIsac_EncodePitchLag(PitchLags, PitchGains_Q12,
-                            &ISACencLB_obj->bitstr_obj,
-                            &ISACencLB_obj->SaveEnc_obj);
-
-  AvgPitchGain_Q12 = (PitchGains_Q12[0] + PitchGains_Q12[1] +
-      PitchGains_Q12[2] + PitchGains_Q12[3]) >> 2;
-
-  /* Find coefficients for perceptual pre-filters. */
-  WebRtcIsac_GetLpcCoefLb(LP_lookahead_pf, HP_lookahead,
-                          &ISACencLB_obj->maskfiltstr_obj, ISACencLB_obj->s2nr,
-                          PitchGains_Q12, lofilt_coef, hifilt_coef);
-
-  /* Code LPC model and shape - gains not quantized yet. */
-  WebRtcIsac_EncodeLpcLb(lofilt_coef, hifilt_coef, &ISACencLB_obj->bitstr_obj,
-                         &ISACencLB_obj->SaveEnc_obj);
-
-  /* Convert PitchGains back to FLOAT for pitchfilter_pre. */
-  for (k = 0; k < 4; k++) {
-    PitchGains[k] = ((float)PitchGains_Q12[k]) / 4096;
-  }
-
-  /* Store the state of arithmetic coder before coding LPC gains. */
-  transcodingParam.W_upper = ISACencLB_obj->bitstr_obj.W_upper;
-  transcodingParam.stream_index = ISACencLB_obj->bitstr_obj.stream_index;
-  transcodingParam.streamval = ISACencLB_obj->bitstr_obj.streamval;
-  transcodingParam.stream[0] =
-      ISACencLB_obj->bitstr_obj.stream[ISACencLB_obj->bitstr_obj.stream_index -
-                                       2];
-  transcodingParam.stream[1] =
-      ISACencLB_obj->bitstr_obj.stream[ISACencLB_obj->bitstr_obj.stream_index -
-                                       1];
-  transcodingParam.stream[2] =
-      ISACencLB_obj->bitstr_obj.stream[ISACencLB_obj->bitstr_obj.stream_index];
-
-  /* Store LPC Gains before encoding them. */
-  for (k = 0; k < SUBFRAMES; k++) {
-    transcodingParam.loFiltGain[k] = lofilt_coef[(LPC_LOBAND_ORDER + 1) * k];
-    transcodingParam.hiFiltGain[k] = hifilt_coef[(LPC_HIBAND_ORDER + 1) * k];
-  }
-
-  /* Code gains */
-  WebRtcIsac_EncodeLpcGainLb(lofilt_coef, hifilt_coef,
-                             &ISACencLB_obj->bitstr_obj,
-                             &ISACencLB_obj->SaveEnc_obj);
-
-  /* Get the correct value for the payload limit and calculate the
-   * number of bytes left for coding the spectrum. */
-  if ((frame_mode == 1) && (ISACencLB_obj->frame_nb == 0)) {
-    /* It is a 60ms and we are in the first 30ms then the limit at
-     * this point should be half of the assigned value. */
-    payloadLimitBytes = ISACencLB_obj->payloadLimitBytes60 >> 1;
-  } else if (frame_mode == 0) {
-    /* It is a 30ms frame */
-    /* Subract 3 because termination process may add 3 bytes. */
-    payloadLimitBytes = ISACencLB_obj->payloadLimitBytes30 - 3;
-  } else {
-    /* This is the second half of a 60ms frame. */
-    /* Subract 3 because termination process may add 3 bytes. */
-    payloadLimitBytes = ISACencLB_obj->payloadLimitBytes60 - 3;
-  }
-  bytesLeftSpecCoding = payloadLimitBytes - transcodingParam.stream_index;
-
-  /* Perceptual pre-filtering (using normalized lattice filter). */
-  /* Low-band filtering. */
-  WebRtcIsac_NormLatticeFilterMa(ORDERLO,
-                                 ISACencLB_obj->maskfiltstr_obj.PreStateLoF,
-                                 ISACencLB_obj->maskfiltstr_obj.PreStateLoG,
-                                 LP, lofilt_coef, LPw);
-  /* High-band filtering. */
-  WebRtcIsac_NormLatticeFilterMa(ORDERHI,
-                                 ISACencLB_obj->maskfiltstr_obj.PreStateHiF,
-                                 ISACencLB_obj->maskfiltstr_obj.PreStateHiG,
-                                 HP, hifilt_coef, HPw);
-  /* Pitch filter. */
-  WebRtcIsac_PitchfilterPre(LPw, LPw_pf, &ISACencLB_obj->pitchfiltstr_obj,
-                            PitchLags, PitchGains);
-  /* Transform */
-  WebRtcIsac_Time2Spec(transform_tables,
-                       LPw_pf, HPw, fre, fim, &ISACencLB_obj->fftstr_obj);
-
-  /* Save data for multiple packets memory. */
-  my_index = ISACencLB_obj->SaveEnc_obj.startIdx * FRAMESAMPLES_HALF;
-  memcpy(&ISACencLB_obj->SaveEnc_obj.fre[my_index], fre, sizeof(fre));
-  memcpy(&ISACencLB_obj->SaveEnc_obj.fim[my_index], fim, sizeof(fim));
-
-  ISACencLB_obj->SaveEnc_obj.AvgPitchGain[ISACencLB_obj->SaveEnc_obj.startIdx] =
-      AvgPitchGain_Q12;
-
-  /* Quantization and loss-less coding. */
-  err = WebRtcIsac_EncodeSpec(fre, fim, AvgPitchGain_Q12, kIsacLowerBand,
-                              &ISACencLB_obj->bitstr_obj);
-  if ((err < 0) && (err != -ISAC_DISALLOWED_BITSTREAM_LENGTH)) {
-    /* There has been an error but it was not too large payload
-       (we can cure too large payload). */
-    if (frame_mode == 1 && ISACencLB_obj->frame_nb == 1) {
-      /* If this is the second 30ms of a 60ms frame reset
-         this such that in the next call encoder starts fresh. */
-      ISACencLB_obj->frame_nb = 0;
-    }
-    return err;
-  }
-  iterCntr = 0;
-  while ((ISACencLB_obj->bitstr_obj.stream_index > payloadLimitBytes) ||
-      (err == -ISAC_DISALLOWED_BITSTREAM_LENGTH)) {
-    double bytesSpecCoderUsed;
-    double transcodeScale;
-
-    if (iterCntr >= MAX_PAYLOAD_LIMIT_ITERATION) {
-      /* We were not able to limit the payload size */
-      if ((frame_mode == 1) && (ISACencLB_obj->frame_nb == 0)) {
-        /* This was the first 30ms of a 60ms frame. Although
-           the payload is larger than it should be but we let
-           the second 30ms be encoded. Maybe together we
-           won't exceed the limit. */
-        ISACencLB_obj->frame_nb = 1;
-        return 0;
-      } else if ((frame_mode == 1) && (ISACencLB_obj->frame_nb == 1)) {
-        ISACencLB_obj->frame_nb = 0;
-      }
-
-      if (err != -ISAC_DISALLOWED_BITSTREAM_LENGTH) {
-        return -ISAC_PAYLOAD_LARGER_THAN_LIMIT;
-      } else {
-        return status;
-      }
-    }
-
-    if (err == -ISAC_DISALLOWED_BITSTREAM_LENGTH) {
-      bytesSpecCoderUsed = STREAM_SIZE_MAX;
-      /* Being conservative */
-      transcodeScale = bytesLeftSpecCoding / bytesSpecCoderUsed * 0.5;
-    } else {
-      bytesSpecCoderUsed = ISACencLB_obj->bitstr_obj.stream_index -
-          transcodingParam.stream_index;
-      transcodeScale = bytesLeftSpecCoding / bytesSpecCoderUsed;
-    }
-
-    /* To be safe, we reduce the scale depending on
-       the number of iterations. */
-    transcodeScale *= (1.0 - (0.9 * (double)iterCntr /
-        (double)MAX_PAYLOAD_LIMIT_ITERATION));
-
-    /* Scale the LPC Gains. */
-    for (k = 0; k < SUBFRAMES; k++) {
-      lofilt_coef[(LPC_LOBAND_ORDER + 1) * k] =
-          transcodingParam.loFiltGain[k] * transcodeScale;
-      hifilt_coef[(LPC_HIBAND_ORDER + 1) * k] =
-          transcodingParam.hiFiltGain[k] * transcodeScale;
-      transcodingParam.loFiltGain[k] = lofilt_coef[(LPC_LOBAND_ORDER + 1) * k];
-      transcodingParam.hiFiltGain[k] = hifilt_coef[(LPC_HIBAND_ORDER + 1) * k];
-    }
-
-    /* Scale DFT coefficients. */
-    for (k = 0; k < FRAMESAMPLES_HALF; k++) {
-      fre[k] = (int16_t)(fre[k] * transcodeScale);
-      fim[k] = (int16_t)(fim[k] * transcodeScale);
-    }
-
-    /* Save data for multiple packets memory. */
-    my_index = ISACencLB_obj->SaveEnc_obj.startIdx * FRAMESAMPLES_HALF;
-    memcpy(&ISACencLB_obj->SaveEnc_obj.fre[my_index], fre, sizeof(fre));
-    memcpy(&ISACencLB_obj->SaveEnc_obj.fim[my_index], fim, sizeof(fim));
-
-    /* Re-store the state of arithmetic coder before coding LPC gains. */
-    ISACencLB_obj->bitstr_obj.W_upper = transcodingParam.W_upper;
-    ISACencLB_obj->bitstr_obj.stream_index = transcodingParam.stream_index;
-    ISACencLB_obj->bitstr_obj.streamval = transcodingParam.streamval;
-    ISACencLB_obj->bitstr_obj.stream[transcodingParam.stream_index - 2] =
-        transcodingParam.stream[0];
-    ISACencLB_obj->bitstr_obj.stream[transcodingParam.stream_index - 1] =
-        transcodingParam.stream[1];
-    ISACencLB_obj->bitstr_obj.stream[transcodingParam.stream_index] =
-        transcodingParam.stream[2];
-
-    /* Code gains. */
-    WebRtcIsac_EncodeLpcGainLb(lofilt_coef, hifilt_coef,
-                               &ISACencLB_obj->bitstr_obj,
-                               &ISACencLB_obj->SaveEnc_obj);
-
-    /* Update the number of bytes left for encoding the spectrum. */
-    bytesLeftSpecCoding = payloadLimitBytes - transcodingParam.stream_index;
-
-    /* Encode the spectrum. */
-    err = WebRtcIsac_EncodeSpec(fre, fim, AvgPitchGain_Q12, kIsacLowerBand,
-                                &ISACencLB_obj->bitstr_obj);
-
-    if ((err < 0) && (err != -ISAC_DISALLOWED_BITSTREAM_LENGTH)) {
-      /* There has been an error but it was not too large
-         payload (we can cure too large payload). */
-      if (frame_mode == 1 && ISACencLB_obj->frame_nb == 1) {
-        /* If this is the second 30 ms of a 60 ms frame reset
-           this such that in the next call encoder starts fresh. */
-        ISACencLB_obj->frame_nb = 0;
-      }
-      return err;
-    }
-    iterCntr++;
-  }
-
-  /* If 60 ms frame-size and just processed the first 30 ms, */
-  /* go back to main function to buffer the other 30 ms speech frame. */
-  if (frame_mode == 1) {
-    if (ISACencLB_obj->frame_nb == 0) {
-      ISACencLB_obj->frame_nb = 1;
-      return 0;
-    } else if (ISACencLB_obj->frame_nb == 1) {
-      ISACencLB_obj->frame_nb = 0;
-      /* Also update the frame-length for next packet,
-         in Adaptive mode only. */
-      if (codingMode == 0 && (ISACencLB_obj->enforceFrameSize == 0)) {
-        ISACencLB_obj->new_framelength =
-            WebRtcIsac_GetNewFrameLength(ISACencLB_obj->bottleneck,
-                                         ISACencLB_obj->current_framesamples);
-      }
-    }
-  } else {
-    ISACencLB_obj->frame_nb = 0;
-  }
-
-  /* Complete arithmetic coding. */
-  stream_length = WebRtcIsac_EncTerminate(&ISACencLB_obj->bitstr_obj);
-  return stream_length;
-}
-
-
-
-static int LimitPayloadUb(ISACUBEncStruct* ISACencUB_obj,
-                          uint16_t payloadLimitBytes,
-                          double bytesLeftSpecCoding,
-                          transcode_obj* transcodingParam,
-                          int16_t* fre, int16_t* fim,
-                          double* lpcGains, enum ISACBand band, int status) {
-
-  int iterCntr = 0;
-  int k;
-  double bytesSpecCoderUsed;
-  double transcodeScale;
-  const int16_t kAveragePitchGain = 0.0;
-
-  do {
-    if (iterCntr >= MAX_PAYLOAD_LIMIT_ITERATION) {
-      /* We were not able to limit the payload size. */
-      return -ISAC_PAYLOAD_LARGER_THAN_LIMIT;
-    }
-
-    if (status == -ISAC_DISALLOWED_BITSTREAM_LENGTH) {
-      bytesSpecCoderUsed = STREAM_SIZE_MAX;
-      /* Being conservative. */
-      transcodeScale = bytesLeftSpecCoding / bytesSpecCoderUsed * 0.5;
-    } else {
-      bytesSpecCoderUsed = ISACencUB_obj->bitstr_obj.stream_index -
-          transcodingParam->stream_index;
-      transcodeScale = bytesLeftSpecCoding / bytesSpecCoderUsed;
-    }
-
-    /* To be safe, we reduce the scale depending on the
-       number of iterations. */
-    transcodeScale *= (1.0 - (0.9 * (double)iterCntr /
-        (double)MAX_PAYLOAD_LIMIT_ITERATION));
-
-    /* Scale the LPC Gains. */
-    if (band == kIsacUpperBand16) {
-      /* Two sets of coefficients if 16 kHz. */
-      for (k = 0; k < SUBFRAMES; k++) {
-        transcodingParam->loFiltGain[k] *= transcodeScale;
-        transcodingParam->hiFiltGain[k] *= transcodeScale;
-      }
-    } else {
-      /* One sets of coefficients if 12 kHz. */
-      for (k = 0; k < SUBFRAMES; k++) {
-        transcodingParam->loFiltGain[k] *= transcodeScale;
-      }
-    }
-
-    /* Scale DFT coefficients. */
-    for (k = 0; k < FRAMESAMPLES_HALF; k++) {
-      fre[k] = (int16_t)(fre[k] * transcodeScale + 0.5);
-      fim[k] = (int16_t)(fim[k] * transcodeScale + 0.5);
-    }
-    /* Store FFT coefficients for multiple encoding. */
-    memcpy(ISACencUB_obj->SaveEnc_obj.realFFT, fre,
-          sizeof(ISACencUB_obj->SaveEnc_obj.realFFT));
-    memcpy(ISACencUB_obj->SaveEnc_obj.imagFFT, fim,
-           sizeof(ISACencUB_obj->SaveEnc_obj.imagFFT));
-
-    /* Store the state of arithmetic coder before coding LPC gains */
-    ISACencUB_obj->bitstr_obj.W_upper = transcodingParam->W_upper;
-    ISACencUB_obj->bitstr_obj.stream_index = transcodingParam->stream_index;
-    ISACencUB_obj->bitstr_obj.streamval = transcodingParam->streamval;
-    ISACencUB_obj->bitstr_obj.stream[transcodingParam->stream_index - 2] =
-        transcodingParam->stream[0];
-    ISACencUB_obj->bitstr_obj.stream[transcodingParam->stream_index - 1] =
-        transcodingParam->stream[1];
-    ISACencUB_obj->bitstr_obj.stream[transcodingParam->stream_index] =
-        transcodingParam->stream[2];
-
-    /* Store the gains for multiple encoding. */
-    memcpy(ISACencUB_obj->SaveEnc_obj.lpcGain, lpcGains,
-           SUBFRAMES * sizeof(double));
-    /* Entropy Code lpc-gains, indices are stored for a later use.*/
-    WebRtcIsac_EncodeLpcGainUb(transcodingParam->loFiltGain,
-                               &ISACencUB_obj->bitstr_obj,
-                               ISACencUB_obj->SaveEnc_obj.lpcGainIndex);
-
-    /* If 16kHz should do one more set. */
-    if (band == kIsacUpperBand16) {
-      /* Store the gains for multiple encoding. */
-      memcpy(&ISACencUB_obj->SaveEnc_obj.lpcGain[SUBFRAMES],
-             &lpcGains[SUBFRAMES], SUBFRAMES * sizeof(double));
-      /* Entropy Code lpc-gains, indices are stored for a later use.*/
-      WebRtcIsac_EncodeLpcGainUb(
-          transcodingParam->hiFiltGain, &ISACencUB_obj->bitstr_obj,
-          &ISACencUB_obj->SaveEnc_obj.lpcGainIndex[SUBFRAMES]);
-    }
-
-    /* Update the number of bytes left for encoding the spectrum. */
-    bytesLeftSpecCoding = payloadLimitBytes -
-        ISACencUB_obj->bitstr_obj.stream_index;
-
-    /* Save the bit-stream object at this point for FEC. */
-    memcpy(&ISACencUB_obj->SaveEnc_obj.bitStreamObj,
-           &ISACencUB_obj->bitstr_obj, sizeof(Bitstr));
-
-    /* Encode the spectrum. */
-    status = WebRtcIsac_EncodeSpec(fre, fim, kAveragePitchGain,
-                                   band, &ISACencUB_obj->bitstr_obj);
-    if ((status < 0) && (status != -ISAC_DISALLOWED_BITSTREAM_LENGTH)) {
-      /* There has been an error but it was not too large payload
-         (we can cure too large payload). */
-      return status;
-    }
-    iterCntr++;
-  } while ((ISACencUB_obj->bitstr_obj.stream_index > payloadLimitBytes) ||
-      (status == -ISAC_DISALLOWED_BITSTREAM_LENGTH));
-  return 0;
-}
-
-int WebRtcIsac_EncodeUb16(const TransformTables* transform_tables,
-                          float* in, ISACUBEncStruct* ISACencUB_obj,
-                          int32_t jitterInfo) {
-  int err;
-  int k;
-
-  double lpcVecs[UB_LPC_ORDER * UB16_LPC_VEC_PER_FRAME];
-  double percepFilterParams[(1 + UB_LPC_ORDER) * (SUBFRAMES << 1) +
-                            (1 + UB_LPC_ORDER)];
-
-  double LP_lookahead[FRAMESAMPLES];
-  int16_t fre[FRAMESAMPLES_HALF];   /* Q7 */
-  int16_t fim[FRAMESAMPLES_HALF];   /* Q7 */
-
-  int status = 0;
-
-  double varscale[2];
-  double corr[SUBFRAMES << 1][UB_LPC_ORDER + 1];
-  double lpcGains[SUBFRAMES << 1];
-  transcode_obj transcodingParam;
-  uint16_t payloadLimitBytes;
-  double s2nr;
-  const int16_t kAveragePitchGain = 0.0;
-  int bytesLeftSpecCoding;
-
-  /* Buffer speech samples (by 10ms packet) until the frame-length is   */
-  /* reached (30 ms).                                                   */
-  /*********************************************************************/
-
-  /* fill the buffer with 10ms input data */
-  memcpy(&ISACencUB_obj->data_buffer_float[ISACencUB_obj->buffer_index], in,
-         FRAMESAMPLES_10ms * sizeof(float));
-
-  /* If buffer size is not equal to current frame-size, and end of file is
-   * not reached yet, we don't do encoding unless we have the whole frame. */
-  if (ISACencUB_obj->buffer_index + FRAMESAMPLES_10ms < FRAMESAMPLES) {
-    ISACencUB_obj->buffer_index += FRAMESAMPLES_10ms;
-    return 0;
-  }
-
-  /* End of buffer function. */
-  /**************************/
-
-  /* Encoding */
-  /************/
-
-  /* Reset bit-stream */
-  WebRtcIsac_ResetBitstream(&(ISACencUB_obj->bitstr_obj));
-
-  /* Encoding of bandwidth information. */
-  WebRtcIsac_EncodeJitterInfo(jitterInfo, &ISACencUB_obj->bitstr_obj);
-
-  status = WebRtcIsac_EncodeBandwidth(isac16kHz, &ISACencUB_obj->bitstr_obj);
-  if (status < 0) {
-    return status;
-  }
-
-  s2nr = WebRtcIsac_GetSnr(ISACencUB_obj->bottleneck, FRAMESAMPLES);
-
-  memcpy(lpcVecs, ISACencUB_obj->lastLPCVec, UB_LPC_ORDER * sizeof(double));
-
-  for (k = 0; k < FRAMESAMPLES; k++) {
-    LP_lookahead[k] = ISACencUB_obj->data_buffer_float[UB_LOOKAHEAD + k];
-  }
-
-  /* Find coefficients for perceptual pre-filters. */
-  WebRtcIsac_GetLpcCoefUb(LP_lookahead, &ISACencUB_obj->maskfiltstr_obj,
-                          &lpcVecs[UB_LPC_ORDER], corr, varscale, isac16kHz);
-
-  memcpy(ISACencUB_obj->lastLPCVec,
-         &lpcVecs[(UB16_LPC_VEC_PER_FRAME - 1) * (UB_LPC_ORDER)],
-         sizeof(double) * UB_LPC_ORDER);
-
-  /* Code LPC model and shape - gains not quantized yet. */
-  WebRtcIsac_EncodeLpcUB(lpcVecs, &ISACencUB_obj->bitstr_obj,
-                         percepFilterParams, isac16kHz,
-                         &ISACencUB_obj->SaveEnc_obj);
-
-  /* the first set of lpc parameters are from the last sub-frame of
-   * the previous frame. so we don't care about them. */
-  WebRtcIsac_GetLpcGain(s2nr, &percepFilterParams[UB_LPC_ORDER + 1],
-                        (SUBFRAMES << 1), lpcGains, corr, varscale);
-
-  /* Store the state of arithmetic coder before coding LPC gains */
-  transcodingParam.stream_index = ISACencUB_obj->bitstr_obj.stream_index;
-  transcodingParam.W_upper = ISACencUB_obj->bitstr_obj.W_upper;
-  transcodingParam.streamval = ISACencUB_obj->bitstr_obj.streamval;
-  transcodingParam.stream[0] =
-      ISACencUB_obj->bitstr_obj.stream[ISACencUB_obj->bitstr_obj.stream_index -
-                                       2];
-  transcodingParam.stream[1] =
-      ISACencUB_obj->bitstr_obj.stream[ISACencUB_obj->bitstr_obj.stream_index -
-                                       1];
-  transcodingParam.stream[2] =
-      ISACencUB_obj->bitstr_obj.stream[ISACencUB_obj->bitstr_obj.stream_index];
-
-  /* Store LPC Gains before encoding them. */
-  for (k = 0; k < SUBFRAMES; k++) {
-    transcodingParam.loFiltGain[k] = lpcGains[k];
-    transcodingParam.hiFiltGain[k] = lpcGains[SUBFRAMES + k];
-  }
-
-  /* Store the gains for multiple encoding. */
-  memcpy(ISACencUB_obj->SaveEnc_obj.lpcGain, lpcGains,
-         (SUBFRAMES << 1) * sizeof(double));
-
-  WebRtcIsac_EncodeLpcGainUb(lpcGains, &ISACencUB_obj->bitstr_obj,
-                             ISACencUB_obj->SaveEnc_obj.lpcGainIndex);
-  WebRtcIsac_EncodeLpcGainUb(
-      &lpcGains[SUBFRAMES], &ISACencUB_obj->bitstr_obj,
-      &ISACencUB_obj->SaveEnc_obj.lpcGainIndex[SUBFRAMES]);
-
-  /* Get the correct value for the payload limit and calculate the number of
-     bytes left for coding the spectrum. It is a 30ms frame
-     Subract 3 because termination process may add 3 bytes */
-  payloadLimitBytes = ISACencUB_obj->maxPayloadSizeBytes -
-      ISACencUB_obj->numBytesUsed - 3;
-  bytesLeftSpecCoding = payloadLimitBytes -
-        ISACencUB_obj->bitstr_obj.stream_index;
-
-  for (k = 0; k < (SUBFRAMES << 1); k++) {
-    percepFilterParams[k * (UB_LPC_ORDER + 1) + (UB_LPC_ORDER + 1)] =
-        lpcGains[k];
-  }
-
-  /* LPC filtering (using normalized lattice filter), */
-  /* first half-frame. */
-  WebRtcIsac_NormLatticeFilterMa(UB_LPC_ORDER,
-                                 ISACencUB_obj->maskfiltstr_obj.PreStateLoF,
-                                 ISACencUB_obj->maskfiltstr_obj.PreStateLoG,
-                                 &ISACencUB_obj->data_buffer_float[0],
-                                 &percepFilterParams[UB_LPC_ORDER + 1],
-                                 &LP_lookahead[0]);
-
-  /* Second half-frame filtering. */
-  WebRtcIsac_NormLatticeFilterMa(
-      UB_LPC_ORDER, ISACencUB_obj->maskfiltstr_obj.PreStateLoF,
-      ISACencUB_obj->maskfiltstr_obj.PreStateLoG,
-      &ISACencUB_obj->data_buffer_float[FRAMESAMPLES_HALF],
-      &percepFilterParams[(UB_LPC_ORDER + 1) + SUBFRAMES * (UB_LPC_ORDER + 1)],
-      &LP_lookahead[FRAMESAMPLES_HALF]);
-
-  WebRtcIsac_Time2Spec(transform_tables,
-                       &LP_lookahead[0], &LP_lookahead[FRAMESAMPLES_HALF],
-                       fre, fim, &ISACencUB_obj->fftstr_obj);
-
-  /* Store FFT coefficients for multiple encoding. */
-  memcpy(ISACencUB_obj->SaveEnc_obj.realFFT, fre, sizeof(fre));
-  memcpy(ISACencUB_obj->SaveEnc_obj.imagFFT, fim, sizeof(fim));
-
-  /* Prepare the audio buffer for the next packet
-   * move the last 3 ms to the beginning of the buffer. */
-  memcpy(ISACencUB_obj->data_buffer_float,
-         &ISACencUB_obj->data_buffer_float[FRAMESAMPLES],
-         LB_TOTAL_DELAY_SAMPLES * sizeof(float));
-  /* start writing with 3 ms delay to compensate for the delay
-   * of the lower-band. */
-  ISACencUB_obj->buffer_index = LB_TOTAL_DELAY_SAMPLES;
-
-  /* Save the bit-stream object at this point for FEC. */
-  memcpy(&ISACencUB_obj->SaveEnc_obj.bitStreamObj, &ISACencUB_obj->bitstr_obj,
-         sizeof(Bitstr));
-
-  /* Qantization and lossless coding */
-  /* Note that there is no pitch-gain for this band so kAveragePitchGain = 0
-   * is passed to the function. In fact, the function ignores the 3rd parameter
-   * for this band. */
-  err = WebRtcIsac_EncodeSpec(fre, fim, kAveragePitchGain, kIsacUpperBand16,
-                              &ISACencUB_obj->bitstr_obj);
-  if ((err < 0) && (err != -ISAC_DISALLOWED_BITSTREAM_LENGTH)) {
-    return err;
-  }
-
-  if ((ISACencUB_obj->bitstr_obj.stream_index > payloadLimitBytes) ||
-      (err == -ISAC_DISALLOWED_BITSTREAM_LENGTH)) {
-    err = LimitPayloadUb(ISACencUB_obj, payloadLimitBytes, bytesLeftSpecCoding,
-                         &transcodingParam, fre, fim, lpcGains,
-                         kIsacUpperBand16, err);
-  }
-  if (err < 0) {
-    return err;
-  }
-  /* Complete arithmetic coding. */
-  return WebRtcIsac_EncTerminate(&ISACencUB_obj->bitstr_obj);
-}
-
-
-int WebRtcIsac_EncodeUb12(const TransformTables* transform_tables,
-                          float* in, ISACUBEncStruct* ISACencUB_obj,
-                          int32_t jitterInfo) {
-  int err;
-  int k;
-
-  double lpcVecs[UB_LPC_ORDER * UB_LPC_VEC_PER_FRAME];
-
-  double percepFilterParams[(1 + UB_LPC_ORDER) * SUBFRAMES];
-  float LP[FRAMESAMPLES_HALF];
-  float HP[FRAMESAMPLES_HALF];
-
-  double LP_lookahead[FRAMESAMPLES_HALF];
-  double HP_lookahead[FRAMESAMPLES_HALF];
-  double LPw[FRAMESAMPLES_HALF];
-
-  double HPw[FRAMESAMPLES_HALF];
-  int16_t fre[FRAMESAMPLES_HALF];   /* Q7 */
-  int16_t fim[FRAMESAMPLES_HALF];   /* Q7 */
-
-  int status = 0;
-
-  double varscale[1];
-
-  double corr[UB_LPC_GAIN_DIM][UB_LPC_ORDER + 1];
-  double lpcGains[SUBFRAMES];
-  transcode_obj transcodingParam;
-  uint16_t payloadLimitBytes;
-  double s2nr;
-  const int16_t kAveragePitchGain = 0.0;
-  double bytesLeftSpecCoding;
-
-  /* Buffer speech samples (by 10ms packet) until the framelength is  */
-  /* reached (30 ms).                                                 */
-  /********************************************************************/
-
-  /* Fill the buffer with 10ms input data. */
-  memcpy(&ISACencUB_obj->data_buffer_float[ISACencUB_obj->buffer_index], in,
-         FRAMESAMPLES_10ms * sizeof(float));
-
-  /* if buffer-size is not equal to current frame-size then increase the
-     index and return. We do the encoding when we have enough audio.     */
-  if (ISACencUB_obj->buffer_index + FRAMESAMPLES_10ms < FRAMESAMPLES) {
-    ISACencUB_obj->buffer_index += FRAMESAMPLES_10ms;
-    return 0;
-  }
-  /* If buffer reached the right size, reset index and continue
-     with encoding the frame */
-  ISACencUB_obj->buffer_index = 0;
-
-  /* End of buffer function */
-  /**************************/
-
-  /* Encoding */
-  /************/
-
-  /* Reset bit-stream. */
-  WebRtcIsac_ResetBitstream(&(ISACencUB_obj->bitstr_obj));
-
-  /* Encoding bandwidth information. */
-  WebRtcIsac_EncodeJitterInfo(jitterInfo, &ISACencUB_obj->bitstr_obj);
-  status = WebRtcIsac_EncodeBandwidth(isac12kHz, &ISACencUB_obj->bitstr_obj);
-  if (status < 0) {
-    return status;
-  }
-
-  s2nr = WebRtcIsac_GetSnr(ISACencUB_obj->bottleneck, FRAMESAMPLES);
-
-  /* Split signal in two bands. */
-  WebRtcIsac_SplitAndFilterFloat(ISACencUB_obj->data_buffer_float, HP, LP,
-                                 HP_lookahead, LP_lookahead,
-                                 &ISACencUB_obj->prefiltbankstr_obj);
-
-  /* Find coefficients for perceptual pre-filters. */
-  WebRtcIsac_GetLpcCoefUb(LP_lookahead, &ISACencUB_obj->maskfiltstr_obj,
-                          lpcVecs, corr, varscale, isac12kHz);
-
-  /* Code LPC model and shape - gains not quantized yet. */
-  WebRtcIsac_EncodeLpcUB(lpcVecs, &ISACencUB_obj->bitstr_obj,
-                         percepFilterParams, isac12kHz,
-                         &ISACencUB_obj->SaveEnc_obj);
-
-  WebRtcIsac_GetLpcGain(s2nr, percepFilterParams, SUBFRAMES, lpcGains, corr,
-                        varscale);
-
-  /* Store the state of arithmetic coder before coding LPC gains. */
-  transcodingParam.W_upper = ISACencUB_obj->bitstr_obj.W_upper;
-  transcodingParam.stream_index = ISACencUB_obj->bitstr_obj.stream_index;
-  transcodingParam.streamval = ISACencUB_obj->bitstr_obj.streamval;
-  transcodingParam.stream[0] =
-      ISACencUB_obj->bitstr_obj.stream[ISACencUB_obj->bitstr_obj.stream_index -
-                                       2];
-  transcodingParam.stream[1] =
-      ISACencUB_obj->bitstr_obj.stream[ISACencUB_obj->bitstr_obj.stream_index -
-                                       1];
-  transcodingParam.stream[2] =
-      ISACencUB_obj->bitstr_obj.stream[ISACencUB_obj->bitstr_obj.stream_index];
-
-  /* Store LPC Gains before encoding them. */
-  for (k = 0; k < SUBFRAMES; k++) {
-    transcodingParam.loFiltGain[k] = lpcGains[k];
-  }
-
-  /* Store the gains for multiple encoding. */
-  memcpy(ISACencUB_obj->SaveEnc_obj.lpcGain, lpcGains, SUBFRAMES *
-         sizeof(double));
-
-  WebRtcIsac_EncodeLpcGainUb(lpcGains, &ISACencUB_obj->bitstr_obj,
-                             ISACencUB_obj->SaveEnc_obj.lpcGainIndex);
-
-  for (k = 0; k < SUBFRAMES; k++) {
-    percepFilterParams[k * (UB_LPC_ORDER + 1)] = lpcGains[k];
-  }
-
-  /* perceptual pre-filtering (using normalized lattice filter) */
-  /* low-band filtering */
-  WebRtcIsac_NormLatticeFilterMa(UB_LPC_ORDER,
-                                 ISACencUB_obj->maskfiltstr_obj.PreStateLoF,
-                                 ISACencUB_obj->maskfiltstr_obj.PreStateLoG, LP,
-                                 percepFilterParams, LPw);
-
-  /* Get the correct value for the payload limit and calculate the number
-     of bytes left for coding the spectrum. It is a 30ms frame Subract 3
-     because termination process may add 3 bytes */
-  payloadLimitBytes = ISACencUB_obj->maxPayloadSizeBytes -
-      ISACencUB_obj->numBytesUsed - 3;
-  bytesLeftSpecCoding = payloadLimitBytes -
-      ISACencUB_obj->bitstr_obj.stream_index;
-
-  memset(HPw, 0, sizeof(HPw));
-
-  /* Transform */
-  WebRtcIsac_Time2Spec(transform_tables,
-                       LPw, HPw, fre, fim, &ISACencUB_obj->fftstr_obj);
-
-  /* Store FFT coefficients for multiple encoding. */
-  memcpy(ISACencUB_obj->SaveEnc_obj.realFFT, fre,
-         sizeof(ISACencUB_obj->SaveEnc_obj.realFFT));
-  memcpy(ISACencUB_obj->SaveEnc_obj.imagFFT, fim,
-         sizeof(ISACencUB_obj->SaveEnc_obj.imagFFT));
-
-  /* Save the bit-stream object at this point for FEC. */
-  memcpy(&ISACencUB_obj->SaveEnc_obj.bitStreamObj,
-         &ISACencUB_obj->bitstr_obj, sizeof(Bitstr));
-
-  /* Quantization and loss-less coding */
-  /* The 4th parameter to this function is pitch-gain, which is only used
-   * when encoding 0-8 kHz band, and irrelevant in this function, therefore,
-   * we insert zero here. */
-  err = WebRtcIsac_EncodeSpec(fre, fim, kAveragePitchGain, kIsacUpperBand12,
-                              &ISACencUB_obj->bitstr_obj);
-  if ((err < 0) && (err != -ISAC_DISALLOWED_BITSTREAM_LENGTH)) {
-    /* There has been an error but it was not too large
-       payload (we can cure too large payload) */
-    return err;
-  }
-
-  if ((ISACencUB_obj->bitstr_obj.stream_index > payloadLimitBytes) ||
-      (err == -ISAC_DISALLOWED_BITSTREAM_LENGTH)) {
-    err = LimitPayloadUb(ISACencUB_obj, payloadLimitBytes, bytesLeftSpecCoding,
-                         &transcodingParam, fre, fim, lpcGains,
-                         kIsacUpperBand12, err);
-  }
-  if (err < 0) {
-    return err;
-  }
-  /* Complete arithmetic coding. */
-  return WebRtcIsac_EncTerminate(&ISACencUB_obj->bitstr_obj);
-}
-
-
-
-
-
-
-/* This function is used to create a new bit-stream with new BWE.
-   The same data as previously encoded with the function WebRtcIsac_Encoder().
-   The data needed is taken from the structure, where it was stored
-   when calling the encoder. */
-
-int WebRtcIsac_EncodeStoredDataLb(const IsacSaveEncoderData* ISACSavedEnc_obj,
-                                  Bitstr* ISACBitStr_obj, int BWnumber,
-                                  float scale) {
-  int ii;
-  int status;
-  int BWno = BWnumber;
-
-  const uint16_t* WebRtcIsac_kQPitchGainCdf_ptr[1];
-  const uint16_t** cdf;
-
-  double tmpLPCcoeffs_lo[(ORDERLO + 1)*SUBFRAMES * 2];
-  double tmpLPCcoeffs_hi[(ORDERHI + 1)*SUBFRAMES * 2];
-  int tmpLPCindex_g[12 * 2];
-  int16_t tmp_fre[FRAMESAMPLES], tmp_fim[FRAMESAMPLES];
-  const int kModel = 0;
-
-  /* Sanity Check - possible values for BWnumber is 0 - 23. */
-  if ((BWnumber < 0) || (BWnumber > 23)) {
-    return -ISAC_RANGE_ERROR_BW_ESTIMATOR;
-  }
-
-  /* Reset bit-stream. */
-  WebRtcIsac_ResetBitstream(ISACBitStr_obj);
-
-  /* Encode frame length */
-  status = WebRtcIsac_EncodeFrameLen(ISACSavedEnc_obj->framelength,
-                                     ISACBitStr_obj);
-  if (status < 0) {
-    /* Wrong frame size. */
-    return status;
-  }
-
-  /* Transcoding */
-  if ((scale > 0.0) && (scale < 1.0)) {
-    /* Compensate LPC gain. */
-    for (ii = 0;
-        ii < ((ORDERLO + 1)* SUBFRAMES * (1 + ISACSavedEnc_obj->startIdx));
-        ii++) {
-      tmpLPCcoeffs_lo[ii] = scale *  ISACSavedEnc_obj->LPCcoeffs_lo[ii];
-    }
-    for (ii = 0;
-        ii < ((ORDERHI + 1) * SUBFRAMES * (1 + ISACSavedEnc_obj->startIdx));
-        ii++) {
-      tmpLPCcoeffs_hi[ii] = scale *  ISACSavedEnc_obj->LPCcoeffs_hi[ii];
-    }
-    /* Scale DFT. */
-    for (ii = 0;
-        ii < (FRAMESAMPLES_HALF * (1 + ISACSavedEnc_obj->startIdx));
-        ii++) {
-      tmp_fre[ii] = (int16_t)((scale) * (float)ISACSavedEnc_obj->fre[ii]);
-      tmp_fim[ii] = (int16_t)((scale) * (float)ISACSavedEnc_obj->fim[ii]);
-    }
-  } else {
-    for (ii = 0;
-        ii < (KLT_ORDER_GAIN * (1 + ISACSavedEnc_obj->startIdx));
-        ii++) {
-      tmpLPCindex_g[ii] =  ISACSavedEnc_obj->LPCindex_g[ii];
-    }
-    for (ii = 0;
-        ii < (FRAMESAMPLES_HALF * (1 + ISACSavedEnc_obj->startIdx));
-        ii++) {
-      tmp_fre[ii] = ISACSavedEnc_obj->fre[ii];
-      tmp_fim[ii] = ISACSavedEnc_obj->fim[ii];
-    }
-  }
-
-  /* Encode bandwidth estimate. */
-  WebRtcIsac_EncodeReceiveBw(&BWno, ISACBitStr_obj);
-
-  /* Loop over number of 30 msec */
-  for (ii = 0; ii <= ISACSavedEnc_obj->startIdx; ii++) {
-    /* Encode pitch gains. */
-    *WebRtcIsac_kQPitchGainCdf_ptr = WebRtcIsac_kQPitchGainCdf;
-    WebRtcIsac_EncHistMulti(ISACBitStr_obj,
-                            &ISACSavedEnc_obj->pitchGain_index[ii],
-                            WebRtcIsac_kQPitchGainCdf_ptr, 1);
-
-    /* Entropy coding of quantization pitch lags */
-    /* Voicing classification. */
-    if (ISACSavedEnc_obj->meanGain[ii] < 0.2) {
-      cdf = WebRtcIsac_kQPitchLagCdfPtrLo;
-    } else if (ISACSavedEnc_obj->meanGain[ii] < 0.4) {
-      cdf = WebRtcIsac_kQPitchLagCdfPtrMid;
-    } else {
-      cdf = WebRtcIsac_kQPitchLagCdfPtrHi;
-    }
-    WebRtcIsac_EncHistMulti(ISACBitStr_obj,
-                            &ISACSavedEnc_obj->pitchIndex[PITCH_SUBFRAMES * ii],
-                            cdf, PITCH_SUBFRAMES);
-
-    /* LPC */
-    /* Only one model exists. The entropy coding is done only for backward
-     * compatibility. */
-    WebRtcIsac_EncHistMulti(ISACBitStr_obj, &kModel,
-                            WebRtcIsac_kQKltModelCdfPtr, 1);
-    /* Entropy coding of quantization indices - LPC shape only. */
-    WebRtcIsac_EncHistMulti(ISACBitStr_obj,
-                            &ISACSavedEnc_obj->LPCindex_s[KLT_ORDER_SHAPE * ii],
-                            WebRtcIsac_kQKltCdfPtrShape,
-                            KLT_ORDER_SHAPE);
-
-    /* If transcoding, get new LPC gain indices */
-    if (scale < 1.0) {
-      WebRtcIsac_TranscodeLPCCoef(
-          &tmpLPCcoeffs_lo[(ORDERLO + 1) * SUBFRAMES * ii],
-          &tmpLPCcoeffs_hi[(ORDERHI + 1)*SUBFRAMES * ii],
-          &tmpLPCindex_g[KLT_ORDER_GAIN * ii]);
-    }
-
-    /* Entropy coding of quantization indices - LPC gain. */
-    WebRtcIsac_EncHistMulti(ISACBitStr_obj, &tmpLPCindex_g[KLT_ORDER_GAIN * ii],
-                            WebRtcIsac_kQKltCdfPtrGain, KLT_ORDER_GAIN);
-
-    /* Quantization and loss-less coding. */
-    status = WebRtcIsac_EncodeSpec(&tmp_fre[ii * FRAMESAMPLES_HALF],
-                                   &tmp_fim[ii * FRAMESAMPLES_HALF],
-                                   ISACSavedEnc_obj->AvgPitchGain[ii],
-                                   kIsacLowerBand, ISACBitStr_obj);
-    if (status < 0) {
-      return status;
-    }
-  }
-  /* Complete arithmetic coding. */
-  return WebRtcIsac_EncTerminate(ISACBitStr_obj);
-}
-
-
-int WebRtcIsac_EncodeStoredDataUb(
-    const ISACUBSaveEncDataStruct* ISACSavedEnc_obj,
-    Bitstr* bitStream,
-    int32_t jitterInfo,
-    float scale,
-    enum ISACBandwidth bandwidth) {
-  int n;
-  int err;
-  double lpcGain[SUBFRAMES];
-  int16_t realFFT[FRAMESAMPLES_HALF];
-  int16_t imagFFT[FRAMESAMPLES_HALF];
-  const uint16_t** shape_cdf;
-  int shape_len;
-  const int16_t kAveragePitchGain = 0.0;
-  enum ISACBand band;
-  /* Reset bitstream. */
-  WebRtcIsac_ResetBitstream(bitStream);
-
-  /* Encode jitter index. */
-  WebRtcIsac_EncodeJitterInfo(jitterInfo, bitStream);
-
-  err = WebRtcIsac_EncodeBandwidth(bandwidth, bitStream);
-  if (err < 0) {
-    return err;
-  }
-
-  /* Encode LPC-shape. */
-  if (bandwidth == isac12kHz) {
-    shape_cdf = WebRtcIsac_kLpcShapeCdfMatUb12;
-    shape_len = UB_LPC_ORDER * UB_LPC_VEC_PER_FRAME;
-    band = kIsacUpperBand12;
-  } else {
-    shape_cdf = WebRtcIsac_kLpcShapeCdfMatUb16;
-    shape_len = UB_LPC_ORDER * UB16_LPC_VEC_PER_FRAME;
-    band = kIsacUpperBand16;
-  }
-  WebRtcIsac_EncHistMulti(bitStream, ISACSavedEnc_obj->indexLPCShape,
-                          shape_cdf, shape_len);
-
-  if ((scale <= 0.0) || (scale >= 1.0)) {
-    /* We only consider scales between zero and one. */
-    WebRtcIsac_EncHistMulti(bitStream, ISACSavedEnc_obj->lpcGainIndex,
-                            WebRtcIsac_kLpcGainCdfMat, UB_LPC_GAIN_DIM);
-    if (bandwidth == isac16kHz) {
-      /* Store gain indices of the second half. */
-      WebRtcIsac_EncHistMulti(bitStream,
-                              &ISACSavedEnc_obj->lpcGainIndex[SUBFRAMES],
-                              WebRtcIsac_kLpcGainCdfMat, UB_LPC_GAIN_DIM);
-    }
-    /* Store FFT coefficients. */
-    err = WebRtcIsac_EncodeSpec(ISACSavedEnc_obj->realFFT,
-                                ISACSavedEnc_obj->imagFFT, kAveragePitchGain,
-                                band, bitStream);
-  } else {
-    /* Scale LPC gain and FFT coefficients. */
-    for (n = 0; n < SUBFRAMES; n++) {
-      lpcGain[n] = scale * ISACSavedEnc_obj->lpcGain[n];
-    }
-    /* Store LPC gains. */
-    WebRtcIsac_StoreLpcGainUb(lpcGain, bitStream);
-
-    if (bandwidth == isac16kHz) {
-      /* Scale and code the gains of the second half of the frame, if 16kHz. */
-      for (n = 0; n < SUBFRAMES; n++) {
-        lpcGain[n] = scale * ISACSavedEnc_obj->lpcGain[n + SUBFRAMES];
-      }
-      WebRtcIsac_StoreLpcGainUb(lpcGain, bitStream);
-    }
-
-    for (n = 0; n < FRAMESAMPLES_HALF; n++) {
-      realFFT[n] = (int16_t)(scale * (float)ISACSavedEnc_obj->realFFT[n] +
-          0.5f);
-      imagFFT[n] = (int16_t)(scale * (float)ISACSavedEnc_obj->imagFFT[n] +
-          0.5f);
-    }
-    /* Store FFT coefficients. */
-    err = WebRtcIsac_EncodeSpec(realFFT, imagFFT, kAveragePitchGain,
-                                band, bitStream);
-  }
-  if (err < 0) {
-    /* Error happened while encoding FFT coefficients. */
-    return err;
-  }
-
-  /* Complete arithmetic coding. */
-  return WebRtcIsac_EncTerminate(bitStream);
-}
-
-int16_t WebRtcIsac_GetRedPayloadUb(
-    const ISACUBSaveEncDataStruct* ISACSavedEncObj,
-    Bitstr*                        bitStreamObj,
-    enum ISACBandwidth             bandwidth) {
-  int n;
-  int16_t status;
-  int16_t realFFT[FRAMESAMPLES_HALF];
-  int16_t imagFFT[FRAMESAMPLES_HALF];
-  enum ISACBand band;
-  const int16_t kAveragePitchGain = 0.0;
-  /* Store bit-stream object. */
-  memcpy(bitStreamObj, &ISACSavedEncObj->bitStreamObj, sizeof(Bitstr));
-
-  /* Scale FFT coefficients. */
-  for (n = 0; n < FRAMESAMPLES_HALF; n++) {
-    realFFT[n] = (int16_t)((float)ISACSavedEncObj->realFFT[n] *
-        RCU_TRANSCODING_SCALE_UB + 0.5);
-    imagFFT[n] = (int16_t)((float)ISACSavedEncObj->imagFFT[n] *
-        RCU_TRANSCODING_SCALE_UB + 0.5);
-  }
-
-  band = (bandwidth == isac12kHz) ? kIsacUpperBand12 : kIsacUpperBand16;
-  status = WebRtcIsac_EncodeSpec(realFFT, imagFFT, kAveragePitchGain, band,
-                                 bitStreamObj);
-  if (status < 0) {
-    return status;
-  } else {
-    /* Terminate entropy coding */
-    return WebRtcIsac_EncTerminate(bitStreamObj);
-  }
-}
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_coding/codecs/isac/main/source/encode_lpc_swb.c b/submodules/libtgvoip/webrtc_dsp/modules/audio_coding/codecs/isac/main/source/encode_lpc_swb.c
deleted file mode 100644
index 7b02e64a01..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_coding/codecs/isac/main/source/encode_lpc_swb.c
+++ /dev/null
@@ -1,706 +0,0 @@
-/*
- *  Copyright (c) 2011 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-/*
- * code_LPC_UB.c
- *
- * This file contains definition of functions used to
- * encode LPC parameters (Shape & gain) of the upper band.
- *
- */
-
-#include <math.h>
-#include <stdio.h>
-#include <string.h>
-
-#include "modules/audio_coding/codecs/isac/main/source/encode_lpc_swb.h"
-#include "modules/audio_coding/codecs/isac/main/source/lpc_gain_swb_tables.h"
-#include "modules/audio_coding/codecs/isac/main/source/lpc_shape_swb12_tables.h"
-#include "modules/audio_coding/codecs/isac/main/source/lpc_shape_swb16_tables.h"
-#include "modules/audio_coding/codecs/isac/main/source/settings.h"
-
-/******************************************************************************
- * WebRtcIsac_RemoveLarMean()
- *
- * Remove the means from LAR coefficients.
- *
- * Input:
- *      -lar                : pointer to lar vectors. LAR vectors are
- *                            concatenated.
- *      -bandwidth          : indicates if the given LAR vectors belong
- *                            to SWB-12kHz or SWB-16kHz.
- *
- * Output:
- *      -lar                : pointer to mean-removed LAR:s.
- *
- *
- */
-int16_t
-WebRtcIsac_RemoveLarMean(
-    double* lar,
-    int16_t bandwidth)
-{
-  int16_t coeffCntr;
-  int16_t vecCntr;
-  int16_t numVec;
-  const double* meanLAR;
-  switch(bandwidth)
-  {
-    case isac12kHz:
-      {
-        numVec = UB_LPC_VEC_PER_FRAME;
-        meanLAR = WebRtcIsac_kMeanLarUb12;
-        break;
-      }
-    case isac16kHz:
-      {
-        numVec = UB16_LPC_VEC_PER_FRAME;
-        meanLAR = WebRtcIsac_kMeanLarUb16;
-        break;
-      }
-    default:
-      return -1;
-  }
-
-  for(vecCntr = 0; vecCntr < numVec; vecCntr++)
-  {
-    for(coeffCntr = 0; coeffCntr < UB_LPC_ORDER; coeffCntr++)
-    {
-      // REMOVE MEAN
-      *lar++ -= meanLAR[coeffCntr];
-    }
-  }
-  return 0;
-}
-
-/******************************************************************************
- * WebRtcIsac_DecorrelateIntraVec()
- *
- * Remove the correlation amonge the components of LAR vectors. If LAR vectors
- * of one frame are put in a matrix where each column is a LAR vector of a
- * sub-frame, then this is equivalent to multiplying the LAR matrix with
- * a decorrelting mtrix from left.
- *
- * Input:
- *      -inLar              : pointer to mean-removed LAR vecrtors.
- *      -bandwidth          : indicates if the given LAR vectors belong
- *                            to SWB-12kHz or SWB-16kHz.
- *
- * Output:
- *      -out                : decorrelated LAR vectors.
- */
-int16_t
-WebRtcIsac_DecorrelateIntraVec(
-    const double* data,
-    double*       out,
-    int16_t bandwidth)
-{
-  const double* ptrData;
-  const double* ptrRow;
-  int16_t rowCntr;
-  int16_t colCntr;
-  int16_t larVecCntr;
-  int16_t numVec;
-  const double* decorrMat;
-  switch(bandwidth)
-  {
-    case isac12kHz:
-      {
-        decorrMat = &WebRtcIsac_kIntraVecDecorrMatUb12[0][0];
-        numVec = UB_LPC_VEC_PER_FRAME;
-        break;
-      }
-    case isac16kHz:
-      {
-        decorrMat = &WebRtcIsac_kIintraVecDecorrMatUb16[0][0];
-        numVec = UB16_LPC_VEC_PER_FRAME;
-        break;
-      }
-    default:
-      return -1;
-  }
-
-  //
-  // decorrMat * data
-  //
-  // data is assumed to contain 'numVec' of LAR
-  // vectors (mean removed) each of dimension 'UB_LPC_ORDER'
-  // concatenated one after the other.
-  //
-
-  ptrData = data;
-  for(larVecCntr = 0; larVecCntr < numVec; larVecCntr++)
-  {
-    for(rowCntr = 0; rowCntr < UB_LPC_ORDER; rowCntr++)
-    {
-      ptrRow = &decorrMat[rowCntr * UB_LPC_ORDER];
-      *out = 0;
-      for(colCntr = 0; colCntr < UB_LPC_ORDER; colCntr++)
-      {
-        *out += ptrData[colCntr] * ptrRow[colCntr];
-      }
-      out++;
-    }
-    ptrData += UB_LPC_ORDER;
-  }
-  return 0;
-}
-
-/******************************************************************************
- * WebRtcIsac_DecorrelateInterVec()
- *
- * Remover the correlation among mean-removed LAR vectors. If LAR vectors
- * of one frame are put in a matrix where each column is a LAR vector of a
- * sub-frame, then this is equivalent to multiplying the LAR matrix with
- * a decorrelting mtrix from right.
- *
- * Input:
- *      -data               : pointer to matrix of LAR vectors. The matrix
- *                            is stored column-wise.
- *      -bandwidth          : indicates if the given LAR vectors belong
- *                            to SWB-12kHz or SWB-16kHz.
- *
- * Output:
- *      -out                : decorrelated LAR vectors.
- */
-int16_t
-WebRtcIsac_DecorrelateInterVec(
-    const double* data,
-    double* out,
-    int16_t bandwidth)
-{
-  int16_t coeffCntr;
-  int16_t rowCntr;
-  int16_t colCntr;
-  const double* decorrMat;
-  int16_t interVecDim;
-
-  switch(bandwidth)
-  {
-    case isac12kHz:
-      {
-        decorrMat = &WebRtcIsac_kInterVecDecorrMatUb12[0][0];
-        interVecDim = UB_LPC_VEC_PER_FRAME;
-        break;
-      }
-    case isac16kHz:
-      {
-        decorrMat = &WebRtcIsac_kInterVecDecorrMatUb16[0][0];
-        interVecDim = UB16_LPC_VEC_PER_FRAME;
-        break;
-      }
-    default:
-      return -1;
-  }
-
-  //
-  // data * decorrMat
-  //
-  // data is of size 'interVecDim' * 'UB_LPC_ORDER'
-  // That is 'interVecDim' of LAR vectors (mean removed)
-  // in columns each of dimension 'UB_LPC_ORDER'.
-  // matrix is stored column-wise.
-  //
-
-  for(coeffCntr = 0; coeffCntr < UB_LPC_ORDER; coeffCntr++)
-  {
-    for(colCntr = 0; colCntr < interVecDim; colCntr++)
-    {
-      out[coeffCntr + colCntr * UB_LPC_ORDER] = 0;
-      for(rowCntr = 0; rowCntr < interVecDim; rowCntr++)
-      {
-        out[coeffCntr + colCntr * UB_LPC_ORDER] +=
-            data[coeffCntr + rowCntr * UB_LPC_ORDER] *
-            decorrMat[rowCntr * interVecDim + colCntr];
-      }
-    }
-  }
-  return 0;
-}
-
-/******************************************************************************
- * WebRtcIsac_QuantizeUncorrLar()
- *
- * Quantize the uncorrelated parameters.
- *
- * Input:
- *      -data               : uncorrelated LAR vectors.
- *      -bandwidth          : indicates if the given LAR vectors belong
- *                            to SWB-12kHz or SWB-16kHz.
- *
- * Output:
- *      -data               : quantized version of the input.
- *      -idx                : pointer to quantization indices.
- */
-double
-WebRtcIsac_QuantizeUncorrLar(
-    double* data,
-    int* recIdx,
-    int16_t bandwidth)
-{
-  int16_t cntr;
-  int32_t idx;
-  int16_t interVecDim;
-  const double* leftRecPoint;
-  double quantizationStepSize;
-  const int16_t* numQuantCell;
-  switch(bandwidth)
-  {
-    case isac12kHz:
-      {
-        leftRecPoint         = WebRtcIsac_kLpcShapeLeftRecPointUb12;
-        quantizationStepSize = WebRtcIsac_kLpcShapeQStepSizeUb12;
-        numQuantCell         = WebRtcIsac_kLpcShapeNumRecPointUb12;
-        interVecDim          = UB_LPC_VEC_PER_FRAME;
-        break;
-      }
-    case isac16kHz:
-      {
-        leftRecPoint         = WebRtcIsac_kLpcShapeLeftRecPointUb16;
-        quantizationStepSize = WebRtcIsac_kLpcShapeQStepSizeUb16;
-        numQuantCell         = WebRtcIsac_kLpcShapeNumRecPointUb16;
-        interVecDim          = UB16_LPC_VEC_PER_FRAME;
-        break;
-      }
-    default:
-      return -1;
-  }
-
-  //
-  // Quantize the parametrs.
-  //
-  for(cntr = 0; cntr < UB_LPC_ORDER * interVecDim; cntr++)
-  {
-    idx = (int32_t)floor((*data - leftRecPoint[cntr]) /
-                               quantizationStepSize + 0.5);
-    if(idx < 0)
-    {
-      idx = 0;
-    }
-    else if(idx >= numQuantCell[cntr])
-    {
-      idx = numQuantCell[cntr] - 1;
-    }
-
-    *data++ = leftRecPoint[cntr] + idx * quantizationStepSize;
-    *recIdx++ = idx;
-  }
-  return 0;
-}
-
-
-/******************************************************************************
- * WebRtcIsac_DequantizeLpcParam()
- *
- * Get the quantized value of uncorrelated LARs given the quantization indices.
- *
- * Input:
- *      -idx                : pointer to quantiztion indices.
- *      -bandwidth          : indicates if the given LAR vectors belong
- *                            to SWB-12kHz or SWB-16kHz.
- *
- * Output:
- *      -out                : pointer to quantized values.
- */
-int16_t
-WebRtcIsac_DequantizeLpcParam(
-    const int* idx,
-    double*    out,
-    int16_t bandwidth)
-{
-  int16_t cntr;
-  int16_t interVecDim;
-  const double* leftRecPoint;
-  double quantizationStepSize;
-
-  switch(bandwidth)
-  {
-    case isac12kHz:
-      {
-        leftRecPoint =         WebRtcIsac_kLpcShapeLeftRecPointUb12;
-        quantizationStepSize = WebRtcIsac_kLpcShapeQStepSizeUb12;
-        interVecDim =          UB_LPC_VEC_PER_FRAME;
-        break;
-      }
-    case isac16kHz:
-      {
-        leftRecPoint =         WebRtcIsac_kLpcShapeLeftRecPointUb16;
-        quantizationStepSize = WebRtcIsac_kLpcShapeQStepSizeUb16;
-        interVecDim =          UB16_LPC_VEC_PER_FRAME;
-        break;
-      }
-    default:
-      return -1;
-  }
-
-  //
-  // Dequantize given the quantization indices
-  //
-
-  for(cntr = 0; cntr < UB_LPC_ORDER * interVecDim; cntr++)
-  {
-    *out++ = leftRecPoint[cntr] + *idx++ * quantizationStepSize;
-  }
-  return 0;
-}
-
-
-/******************************************************************************
- * WebRtcIsac_CorrelateIntraVec()
- *
- * This is the inverse of WebRtcIsac_DecorrelateIntraVec().
- *
- * Input:
- *      -data               : uncorrelated parameters.
- *      -bandwidth          : indicates if the given LAR vectors belong
- *                            to SWB-12kHz or SWB-16kHz.
- *
- * Output:
- *      -out                : correlated parametrs.
- */
-int16_t
-WebRtcIsac_CorrelateIntraVec(
-    const double* data,
-    double*       out,
-    int16_t bandwidth)
-{
-  int16_t vecCntr;
-  int16_t rowCntr;
-  int16_t colCntr;
-  int16_t numVec;
-  const double* ptrData;
-  const double* intraVecDecorrMat;
-
-  switch(bandwidth)
-  {
-    case isac12kHz:
-      {
-        numVec            = UB_LPC_VEC_PER_FRAME;
-        intraVecDecorrMat = &WebRtcIsac_kIntraVecDecorrMatUb12[0][0];
-        break;
-      }
-    case isac16kHz:
-      {
-        numVec            = UB16_LPC_VEC_PER_FRAME;
-        intraVecDecorrMat = &WebRtcIsac_kIintraVecDecorrMatUb16[0][0];
-        break;
-      }
-    default:
-      return -1;
-  }
-
-
-  ptrData = data;
-  for(vecCntr = 0; vecCntr < numVec; vecCntr++)
-  {
-    for(colCntr = 0; colCntr < UB_LPC_ORDER; colCntr++)
-    {
-      *out = 0;
-      for(rowCntr = 0; rowCntr < UB_LPC_ORDER; rowCntr++)
-      {
-        *out += ptrData[rowCntr] *
-            intraVecDecorrMat[rowCntr * UB_LPC_ORDER + colCntr];
-      }
-      out++;
-    }
-    ptrData += UB_LPC_ORDER;
-  }
-  return 0;
-}
-
-/******************************************************************************
- * WebRtcIsac_CorrelateInterVec()
- *
- * This is the inverse of WebRtcIsac_DecorrelateInterVec().
- *
- * Input:
- *      -data
- *      -bandwidth          : indicates if the given LAR vectors belong
- *                            to SWB-12kHz or SWB-16kHz.
- *
- * Output:
- *      -out                : correlated parametrs.
- */
-int16_t
-WebRtcIsac_CorrelateInterVec(
-    const double* data,
-    double*       out,
-    int16_t bandwidth)
-{
-  int16_t coeffCntr;
-  int16_t rowCntr;
-  int16_t colCntr;
-  int16_t interVecDim;
-  double myVec[UB16_LPC_VEC_PER_FRAME] = {0.0};
-  const double* interVecDecorrMat;
-
-  switch(bandwidth)
-  {
-    case isac12kHz:
-      {
-        interVecDim       = UB_LPC_VEC_PER_FRAME;
-        interVecDecorrMat = &WebRtcIsac_kInterVecDecorrMatUb12[0][0];
-        break;
-      }
-    case isac16kHz:
-      {
-        interVecDim       = UB16_LPC_VEC_PER_FRAME;
-        interVecDecorrMat = &WebRtcIsac_kInterVecDecorrMatUb16[0][0];
-        break;
-      }
-    default:
-      return -1;
-  }
-
-  for(coeffCntr = 0; coeffCntr < UB_LPC_ORDER; coeffCntr++)
-  {
-    for(rowCntr = 0; rowCntr < interVecDim; rowCntr++)
-    {
-      myVec[rowCntr] = 0;
-      for(colCntr = 0; colCntr < interVecDim; colCntr++)
-      {
-        myVec[rowCntr] += data[coeffCntr + colCntr * UB_LPC_ORDER] * //*ptrData *
-            interVecDecorrMat[rowCntr * interVecDim + colCntr];
-        //ptrData += UB_LPC_ORDER;
-      }
-    }
-
-    for(rowCntr = 0; rowCntr < interVecDim; rowCntr++)
-    {
-      out[coeffCntr + rowCntr * UB_LPC_ORDER] = myVec[rowCntr];
-    }
-  }
-  return 0;
-}
-
-/******************************************************************************
- * WebRtcIsac_AddLarMean()
- *
- * This is the inverse of WebRtcIsac_RemoveLarMean()
- *
- * Input:
- *      -data               : pointer to mean-removed LAR:s.
- *      -bandwidth          : indicates if the given LAR vectors belong
- *                            to SWB-12kHz or SWB-16kHz.
- *
- * Output:
- *      -data               : pointer to LARs.
- */
-int16_t
-WebRtcIsac_AddLarMean(
-    double* data,
-    int16_t bandwidth)
-{
-  int16_t coeffCntr;
-  int16_t vecCntr;
-  int16_t numVec;
-  const double* meanLAR;
-
-  switch(bandwidth)
-  {
-    case isac12kHz:
-      {
-        numVec = UB_LPC_VEC_PER_FRAME;
-        meanLAR = WebRtcIsac_kMeanLarUb12;
-        break;
-      }
-    case isac16kHz:
-      {
-        numVec = UB16_LPC_VEC_PER_FRAME;
-        meanLAR = WebRtcIsac_kMeanLarUb16;
-        break;
-      }
-    default:
-      return -1;
-  }
-
-  for(vecCntr = 0; vecCntr < numVec; vecCntr++)
-  {
-    for(coeffCntr = 0; coeffCntr < UB_LPC_ORDER; coeffCntr++)
-    {
-      *data++ += meanLAR[coeffCntr];
-    }
-  }
-  return 0;
-}
-
-/******************************************************************************
- * WebRtcIsac_ToLogDomainRemoveMean()
- *
- * Transform the LPC gain to log domain then remove the mean value.
- *
- * Input:
- *      -lpcGain            : pointer to LPC Gain, expecting 6 LPC gains
- *
- * Output:
- *      -lpcGain            : mean-removed in log domain.
- */
-int16_t
-WebRtcIsac_ToLogDomainRemoveMean(
-    double* data)
-{
-  int16_t coeffCntr;
-  for(coeffCntr = 0; coeffCntr < UB_LPC_GAIN_DIM; coeffCntr++)
-  {
-    data[coeffCntr] = log(data[coeffCntr]) - WebRtcIsac_kMeanLpcGain;
-  }
-  return 0;
-}
-
-
-/******************************************************************************
- * WebRtcIsac_DecorrelateLPGain()
- *
- * Decorrelate LPC gains. There are 6 LPC Gains per frame. This is like
- * multiplying gain vector with decorrelating matrix.
- *
- * Input:
- *      -data               : LPC gain in log-domain with mean removed.
- *
- * Output:
- *      -out                : decorrelated parameters.
- */
-int16_t WebRtcIsac_DecorrelateLPGain(
-    const double* data,
-    double* out)
-{
-  int16_t rowCntr;
-  int16_t colCntr;
-
-  for(colCntr = 0; colCntr < UB_LPC_GAIN_DIM; colCntr++)
-  {
-    *out = 0;
-    for(rowCntr = 0; rowCntr < UB_LPC_GAIN_DIM; rowCntr++)
-    {
-      *out += data[rowCntr] * WebRtcIsac_kLpcGainDecorrMat[rowCntr][colCntr];
-    }
-    out++;
-  }
-  return 0;
-}
-
-/******************************************************************************
- * WebRtcIsac_QuantizeLpcGain()
- *
- * Quantize the decorrelated log-domain gains.
- *
- * Input:
- *      -lpcGain            : uncorrelated LPC gains.
- *
- * Output:
- *      -idx                : quantization indices
- *      -lpcGain            : quantized value of the inpt.
- */
-double WebRtcIsac_QuantizeLpcGain(
-    double* data,
-    int*    idx)
-{
-  int16_t coeffCntr;
-  for(coeffCntr = 0; coeffCntr < UB_LPC_GAIN_DIM; coeffCntr++)
-  {
-    *idx = (int)floor((*data - WebRtcIsac_kLeftRecPointLpcGain[coeffCntr]) /
-                                WebRtcIsac_kQSizeLpcGain + 0.5);
-
-    if(*idx < 0)
-    {
-      *idx = 0;
-    }
-    else if(*idx >= WebRtcIsac_kNumQCellLpcGain[coeffCntr])
-    {
-      *idx = WebRtcIsac_kNumQCellLpcGain[coeffCntr] - 1;
-    }
-    *data = WebRtcIsac_kLeftRecPointLpcGain[coeffCntr] + *idx *
-        WebRtcIsac_kQSizeLpcGain;
-
-    data++;
-    idx++;
-  }
-  return 0;
-}
-
-/******************************************************************************
- * WebRtcIsac_DequantizeLpcGain()
- *
- * Get the quantized values given the quantization indices.
- *
- * Input:
- *      -idx                : pointer to quantization indices.
- *
- * Output:
- *      -lpcGains           : quantized values of the given parametes.
- */
-int16_t WebRtcIsac_DequantizeLpcGain(
-    const int* idx,
-    double*    out)
-{
-  int16_t coeffCntr;
-  for(coeffCntr = 0; coeffCntr < UB_LPC_GAIN_DIM; coeffCntr++)
-  {
-    *out = WebRtcIsac_kLeftRecPointLpcGain[coeffCntr] + *idx *
-        WebRtcIsac_kQSizeLpcGain;
-    out++;
-    idx++;
-  }
-  return 0;
-}
-
-/******************************************************************************
- * WebRtcIsac_CorrelateLpcGain()
- *
- * This is the inverse of WebRtcIsac_DecorrelateLPGain().
- *
- * Input:
- *      -data               : decorrelated parameters.
- *
- * Output:
- *      -out                : correlated parameters.
- */
-int16_t WebRtcIsac_CorrelateLpcGain(
-    const double* data,
-    double* out)
-{
-  int16_t rowCntr;
-  int16_t colCntr;
-
-  for(rowCntr = 0; rowCntr < UB_LPC_GAIN_DIM; rowCntr++)
-  {
-    *out = 0;
-    for(colCntr = 0; colCntr < UB_LPC_GAIN_DIM; colCntr++)
-    {
-      *out += WebRtcIsac_kLpcGainDecorrMat[rowCntr][colCntr] * data[colCntr];
-    }
-    out++;
-  }
-
-  return 0;
-}
-
-
-/******************************************************************************
- * WebRtcIsac_AddMeanToLinearDomain()
- *
- * This is the inverse of WebRtcIsac_ToLogDomainRemoveMean().
- *
- * Input:
- *      -lpcGain            : LPC gain in log-domain & mean removed
- *
- * Output:
- *      -lpcGain            : LPC gain in normal domain.
- */
-int16_t WebRtcIsac_AddMeanToLinearDomain(
-    double* lpcGains)
-{
-  int16_t coeffCntr;
-  for(coeffCntr = 0; coeffCntr < UB_LPC_GAIN_DIM; coeffCntr++)
-  {
-    lpcGains[coeffCntr] = exp(lpcGains[coeffCntr] + WebRtcIsac_kMeanLpcGain);
-  }
-  return 0;
-}
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_coding/codecs/isac/main/source/encode_lpc_swb.h b/submodules/libtgvoip/webrtc_dsp/modules/audio_coding/codecs/isac/main/source/encode_lpc_swb.h
deleted file mode 100644
index 8bc3d752c3..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_coding/codecs/isac/main/source/encode_lpc_swb.h
+++ /dev/null
@@ -1,246 +0,0 @@
-/*
- *  Copyright (c) 2011 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-/*
- * encode_lpc_swb.h
- *
- * This file contains declaration of functions used to
- * encode LPC parameters (Shape & gain) of the upper band.
- *
- */
-
-#ifndef MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_ENCODE_LPC_SWB_H_
-#define MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_ENCODE_LPC_SWB_H_
-
-#include "modules/audio_coding/codecs/isac/main/source/settings.h"
-#include "modules/audio_coding/codecs/isac/main/source/structs.h"
-
-/******************************************************************************
- * WebRtcIsac_RemoveLarMean()
- *
- * Remove the means from LAR coefficients.
- *
- * Input:
- *      -lar                : pointer to lar vectors. LAR vectors are
- *                            concatenated.
- *      -bandwidth          : indicates if the given LAR vectors belong
- *                            to SWB-12kHz or SWB-16kHz.
- *
- * Output:
- *      -lar                : pointer to mean-removed LAR:s.
- *
- *
- */
-int16_t WebRtcIsac_RemoveLarMean(double* lar, int16_t bandwidth);
-
-/******************************************************************************
- * WebRtcIsac_DecorrelateIntraVec()
- *
- * Remove the correlation amonge the components of LAR vectors. If LAR vectors
- * of one frame are put in a matrix where each column is a LAR vector of a
- * sub-frame, then this is equivalent to multiplying the LAR matrix with
- * a decorrelting mtrix from left.
- *
- * Input:
- *      -inLar              : pointer to mean-removed LAR vecrtors.
- *      -bandwidth          : indicates if the given LAR vectors belong
- *                            to SWB-12kHz or SWB-16kHz.
- *
- * Output:
- *      -out                : decorrelated LAR vectors.
- */
-int16_t WebRtcIsac_DecorrelateIntraVec(const double* inLAR,
-                                       double* out,
-                                       int16_t bandwidth);
-
-/******************************************************************************
- * WebRtcIsac_DecorrelateInterVec()
- *
- * Remover the correlation among mean-removed LAR vectors. If LAR vectors
- * of one frame are put in a matrix where each column is a LAR vector of a
- * sub-frame, then this is equivalent to multiplying the LAR matrix with
- * a decorrelting mtrix from right.
- *
- * Input:
- *      -data               : pointer to matrix of LAR vectors. The matrix
- *                            is stored column-wise.
- *      -bandwidth          : indicates if the given LAR vectors belong
- *                            to SWB-12kHz or SWB-16kHz.
- *
- * Output:
- *      -out                : decorrelated LAR vectors.
- */
-int16_t WebRtcIsac_DecorrelateInterVec(const double* data,
-                                       double* out,
-                                       int16_t bandwidth);
-
-/******************************************************************************
- * WebRtcIsac_QuantizeUncorrLar()
- *
- * Quantize the uncorrelated parameters.
- *
- * Input:
- *      -data               : uncorrelated LAR vectors.
- *      -bandwidth          : indicates if the given LAR vectors belong
- *                            to SWB-12kHz or SWB-16kHz.
- *
- * Output:
- *      -data               : quantized version of the input.
- *      -idx                : pointer to quantization indices.
- */
-double WebRtcIsac_QuantizeUncorrLar(double* data, int* idx, int16_t bandwidth);
-
-/******************************************************************************
- * WebRtcIsac_CorrelateIntraVec()
- *
- * This is the inverse of WebRtcIsac_DecorrelateIntraVec().
- *
- * Input:
- *      -data               : uncorrelated parameters.
- *      -bandwidth          : indicates if the given LAR vectors belong
- *                            to SWB-12kHz or SWB-16kHz.
- *
- * Output:
- *      -out                : correlated parametrs.
- */
-int16_t WebRtcIsac_CorrelateIntraVec(const double* data,
-                                     double* out,
-                                     int16_t bandwidth);
-
-/******************************************************************************
- * WebRtcIsac_CorrelateInterVec()
- *
- * This is the inverse of WebRtcIsac_DecorrelateInterVec().
- *
- * Input:
- *      -data
- *      -bandwidth          : indicates if the given LAR vectors belong
- *                            to SWB-12kHz or SWB-16kHz.
- *
- * Output:
- *      -out                : correlated parametrs.
- */
-int16_t WebRtcIsac_CorrelateInterVec(const double* data,
-                                     double* out,
-                                     int16_t bandwidth);
-
-/******************************************************************************
- * WebRtcIsac_AddLarMean()
- *
- * This is the inverse of WebRtcIsac_RemoveLarMean()
- *
- * Input:
- *      -data               : pointer to mean-removed LAR:s.
- *      -bandwidth          : indicates if the given LAR vectors belong
- *                            to SWB-12kHz or SWB-16kHz.
- *
- * Output:
- *      -data               : pointer to LARs.
- */
-int16_t WebRtcIsac_AddLarMean(double* data, int16_t bandwidth);
-
-/******************************************************************************
- * WebRtcIsac_DequantizeLpcParam()
- *
- * Get the quantized value of uncorrelated LARs given the quantization indices.
- *
- * Input:
- *      -idx                : pointer to quantiztion indices.
- *      -bandwidth          : indicates if the given LAR vectors belong
- *                            to SWB-12kHz or SWB-16kHz.
- *
- * Output:
- *      -out                : pointer to quantized values.
- */
-int16_t WebRtcIsac_DequantizeLpcParam(const int* idx,
-                                      double* out,
-                                      int16_t bandwidth);
-
-/******************************************************************************
- * WebRtcIsac_ToLogDomainRemoveMean()
- *
- * Transform the LPC gain to log domain then remove the mean value.
- *
- * Input:
- *      -lpcGain            : pointer to LPC Gain, expecting 6 LPC gains
- *
- * Output:
- *      -lpcGain            : mean-removed in log domain.
- */
-int16_t WebRtcIsac_ToLogDomainRemoveMean(double* lpGains);
-
-/******************************************************************************
- * WebRtcIsac_DecorrelateLPGain()
- *
- * Decorrelate LPC gains. There are 6 LPC Gains per frame. This is like
- * multiplying gain vector with decorrelating matrix.
- *
- * Input:
- *      -data               : LPC gain in log-domain with mean removed.
- *
- * Output:
- *      -out                : decorrelated parameters.
- */
-int16_t WebRtcIsac_DecorrelateLPGain(const double* data, double* out);
-
-/******************************************************************************
- * WebRtcIsac_QuantizeLpcGain()
- *
- * Quantize the decorrelated log-domain gains.
- *
- * Input:
- *      -lpcGain            : uncorrelated LPC gains.
- *
- * Output:
- *      -idx                : quantization indices
- *      -lpcGain            : quantized value of the inpt.
- */
-double WebRtcIsac_QuantizeLpcGain(double* lpGains, int* idx);
-
-/******************************************************************************
- * WebRtcIsac_DequantizeLpcGain()
- *
- * Get the quantized values given the quantization indices.
- *
- * Input:
- *      -idx                : pointer to quantization indices.
- *
- * Output:
- *      -lpcGains           : quantized values of the given parametes.
- */
-int16_t WebRtcIsac_DequantizeLpcGain(const int* idx, double* lpGains);
-
-/******************************************************************************
- * WebRtcIsac_CorrelateLpcGain()
- *
- * This is the inverse of WebRtcIsac_DecorrelateLPGain().
- *
- * Input:
- *      -data               : decorrelated parameters.
- *
- * Output:
- *      -out                : correlated parameters.
- */
-int16_t WebRtcIsac_CorrelateLpcGain(const double* data, double* out);
-
-/******************************************************************************
- * WebRtcIsac_AddMeanToLinearDomain()
- *
- * This is the inverse of WebRtcIsac_ToLogDomainRemoveMean().
- *
- * Input:
- *      -lpcGain            : LPC gain in log-domain & mean removed
- *
- * Output:
- *      -lpcGain            : LPC gain in normal domain.
- */
-int16_t WebRtcIsac_AddMeanToLinearDomain(double* lpcGains);
-
-#endif  // MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_ENCODE_LPC_SWB_H_
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_coding/codecs/isac/main/source/entropy_coding.c b/submodules/libtgvoip/webrtc_dsp/modules/audio_coding/codecs/isac/main/source/entropy_coding.c
deleted file mode 100644
index 28767afc63..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_coding/codecs/isac/main/source/entropy_coding.c
+++ /dev/null
@@ -1,2066 +0,0 @@
-/*
- *  Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-/*
- * entropy_coding.c
- *
- * This header file defines all of the functions used to arithmetically
- * encode the iSAC bistream
- *
- */
-
-
-#include "common_audio/signal_processing/include/signal_processing_library.h"
-#include "modules/audio_coding/codecs/isac/main/source/entropy_coding.h"
-#include "modules/audio_coding/codecs/isac/main/source/settings.h"
-#include "modules/audio_coding/codecs/isac/main/source/arith_routines.h"
-#include "modules/audio_coding/codecs/isac/main/source/spectrum_ar_model_tables.h"
-#include "modules/audio_coding/codecs/isac/main/source/lpc_tables.h"
-#include "modules/audio_coding/codecs/isac/main/source/pitch_gain_tables.h"
-#include "modules/audio_coding/codecs/isac/main/source/pitch_lag_tables.h"
-#include "modules/audio_coding/codecs/isac/main/source/encode_lpc_swb.h"
-#include "modules/audio_coding/codecs/isac/main/source/lpc_shape_swb12_tables.h"
-#include "modules/audio_coding/codecs/isac/main/source/lpc_shape_swb16_tables.h"
-#include "modules/audio_coding/codecs/isac/main/source/lpc_gain_swb_tables.h"
-#include "modules/audio_coding/codecs/isac/main/source/os_specific_inline.h"
-
-#include <math.h>
-#include <string.h>
-
-static const uint16_t kLpcVecPerSegmentUb12 = 5;
-static const uint16_t kLpcVecPerSegmentUb16 = 4;
-
-/* CDF array for encoder bandwidth (12 vs 16 kHz) indicator. */
-static const uint16_t kOneBitEqualProbCdf[3] = {
-    0, 32768, 65535 };
-
-/* Pointer to cdf array for encoder bandwidth (12 vs 16 kHz) indicator. */
-static const uint16_t* const kOneBitEqualProbCdf_ptr[1] = {
-    kOneBitEqualProbCdf };
-
-/*
- * Initial cdf index for decoder of encoded bandwidth
- * (12 vs 16 kHz) indicator.
- */
-static const uint16_t kOneBitEqualProbInitIndex[1] = { 1 };
-
-
-static const int kIsSWB12 = 1;
-
-/* compute correlation from power spectrum */
-static void FindCorrelation(int32_t* PSpecQ12, int32_t* CorrQ7) {
-  int32_t summ[FRAMESAMPLES / 8];
-  int32_t diff[FRAMESAMPLES / 8];
-  const int16_t* CS_ptrQ9;
-  int32_t sum;
-  int k, n;
-
-  for (k = 0; k < FRAMESAMPLES / 8; k++) {
-    summ[k] = (PSpecQ12[k] + PSpecQ12[FRAMESAMPLES_QUARTER - 1 - k] + 16) >> 5;
-    diff[k] = (PSpecQ12[k] - PSpecQ12[FRAMESAMPLES_QUARTER - 1 - k] + 16) >> 5;
-  }
-
-  sum = 2;
-  for (n = 0; n < FRAMESAMPLES / 8; n++) {
-    sum += summ[n];
-  }
-  CorrQ7[0] = sum;
-
-  for (k = 0; k < AR_ORDER; k += 2) {
-    sum = 0;
-    CS_ptrQ9 = WebRtcIsac_kCos[k];
-    for (n = 0; n < FRAMESAMPLES / 8; n++)
-      sum += (CS_ptrQ9[n] * diff[n] + 256) >> 9;
-    CorrQ7[k + 1] = sum;
-  }
-
-  for (k = 1; k < AR_ORDER; k += 2) {
-    sum = 0;
-    CS_ptrQ9 = WebRtcIsac_kCos[k];
-    for (n = 0; n < FRAMESAMPLES / 8; n++)
-      sum += (CS_ptrQ9[n] * summ[n] + 256) >> 9;
-    CorrQ7[k + 1] = sum;
-  }
-}
-
-/* compute inverse AR power spectrum */
-/* Changed to the function used in iSAC FIX for compatibility reasons */
-static void FindInvArSpec(const int16_t* ARCoefQ12,
-                          const int32_t gainQ10,
-                          int32_t* CurveQ16) {
-  int32_t CorrQ11[AR_ORDER + 1];
-  int32_t sum, tmpGain;
-  int32_t diffQ16[FRAMESAMPLES / 8];
-  const int16_t* CS_ptrQ9;
-  int k, n;
-  int16_t round, shftVal = 0, sh;
-
-  sum = 0;
-  for (n = 0; n < AR_ORDER + 1; n++) {
-    sum += WEBRTC_SPL_MUL(ARCoefQ12[n], ARCoefQ12[n]);   /* Q24 */
-  }
-  sum = ((sum >> 6) * 65 + 32768) >> 16;  /* Q8 */
-  CorrQ11[0] = (sum * gainQ10 + 256) >> 9;
-
-  /* To avoid overflow, we shift down gainQ10 if it is large.
-   * We will not lose any precision */
-  if (gainQ10 > 400000) {
-    tmpGain = gainQ10 >> 3;
-    round = 32;
-    shftVal = 6;
-  } else {
-    tmpGain = gainQ10;
-    round = 256;
-    shftVal = 9;
-  }
-
-  for (k = 1; k < AR_ORDER + 1; k++) {
-    sum = 16384;
-    for (n = k; n < AR_ORDER + 1; n++)
-      sum += WEBRTC_SPL_MUL(ARCoefQ12[n - k], ARCoefQ12[n]); /* Q24 */
-    sum >>= 15;
-    CorrQ11[k] = (sum * tmpGain + round) >> shftVal;
-  }
-  sum = CorrQ11[0] << 7;
-  for (n = 0; n < FRAMESAMPLES / 8; n++) {
-    CurveQ16[n] = sum;
-  }
-  for (k = 1; k < AR_ORDER; k += 2) {
-    for (n = 0; n < FRAMESAMPLES / 8; n++) {
-      CurveQ16[n] += (WebRtcIsac_kCos[k][n] * CorrQ11[k + 1] + 2) >> 2;
-    }
-  }
-
-  CS_ptrQ9 = WebRtcIsac_kCos[0];
-
-  /* If CorrQ11[1] too large we avoid getting overflow in the
-   * calculation by shifting */
-  sh = WebRtcSpl_NormW32(CorrQ11[1]);
-  if (CorrQ11[1] == 0) { /* Use next correlation */
-    sh = WebRtcSpl_NormW32(CorrQ11[2]);
-  }
-  if (sh < 9) {
-    shftVal = 9 - sh;
-  } else {
-    shftVal = 0;
-  }
-  for (n = 0; n < FRAMESAMPLES / 8; n++) {
-    diffQ16[n] = (CS_ptrQ9[n] * (CorrQ11[1] >> shftVal) + 2) >> 2;
-  }
-  for (k = 2; k < AR_ORDER; k += 2) {
-    CS_ptrQ9 = WebRtcIsac_kCos[k];
-    for (n = 0; n < FRAMESAMPLES / 8; n++) {
-      diffQ16[n] += (CS_ptrQ9[n] * (CorrQ11[k + 1] >> shftVal) + 2) >> 2;
-    }
-  }
-
-  for (k = 0; k < FRAMESAMPLES / 8; k++) {
-    int32_t diff_q16_shifted = (int32_t)((uint32_t)(diffQ16[k]) << shftVal);
-    CurveQ16[FRAMESAMPLES_QUARTER - 1 - k] = CurveQ16[k] - diff_q16_shifted;
-    CurveQ16[k] += diff_q16_shifted;
-  }
-}
-
-/* Generate array of dither samples in Q7. */
-static void GenerateDitherQ7Lb(int16_t* bufQ7, uint32_t seed,
-                               int length, int16_t AvgPitchGain_Q12) {
-  int   k, shft;
-  int16_t dither1_Q7, dither2_Q7, dither_gain_Q14;
-
-  /* This threshold should be equal to that in decode_spec(). */
-  if (AvgPitchGain_Q12 < 614) {
-    for (k = 0; k < length - 2; k += 3) {
-      /* New random unsigned int. */
-      seed = (seed * 196314165) + 907633515;
-
-      /* Fixed-point dither sample between -64 and 64 (Q7). */
-      /* dither = seed * 128 / 4294967295 */
-      dither1_Q7 = (int16_t)(((int32_t)(seed + 16777216)) >> 25);
-
-      /* New random unsigned int. */
-      seed = (seed * 196314165) + 907633515;
-
-      /* Fixed-point dither sample between -64 and 64. */
-      dither2_Q7 = (int16_t)(((int32_t)(seed + 16777216)) >> 25);
-
-      shft = (seed >> 25) & 15;
-      if (shft < 5) {
-        bufQ7[k]   = dither1_Q7;
-        bufQ7[k + 1] = dither2_Q7;
-        bufQ7[k + 2] = 0;
-      } else if (shft < 10) {
-        bufQ7[k]   = dither1_Q7;
-        bufQ7[k + 1] = 0;
-        bufQ7[k + 2] = dither2_Q7;
-      } else {
-        bufQ7[k]   = 0;
-        bufQ7[k + 1] = dither1_Q7;
-        bufQ7[k + 2] = dither2_Q7;
-      }
-    }
-  } else {
-    dither_gain_Q14 = (int16_t)(22528 - 10 * AvgPitchGain_Q12);
-
-    /* Dither on half of the coefficients. */
-    for (k = 0; k < length - 1; k += 2) {
-      /* New random unsigned int */
-      seed = (seed * 196314165) + 907633515;
-
-      /* Fixed-point dither sample between -64 and 64. */
-      dither1_Q7 = (int16_t)(((int32_t)(seed + 16777216)) >> 25);
-
-      /* Dither sample is placed in either even or odd index. */
-      shft = (seed >> 25) & 1;     /* Either 0 or 1 */
-
-      bufQ7[k + shft] = (((dither_gain_Q14 * dither1_Q7) + 8192) >> 14);
-      bufQ7[k + 1 - shft] = 0;
-    }
-  }
-}
-
-
-
-/******************************************************************************
- * GenerateDitherQ7LbUB()
- *
- * generate array of dither samples in Q7 There are less zeros in dither
- * vector compared to GenerateDitherQ7Lb.
- *
- * A uniform random number generator with the range of [-64 64] is employed
- * but the generated dithers are scaled by 0.35, a heuristic scaling.
- *
- * Input:
- *      -seed               : the initial seed for the random number generator.
- *      -length             : the number of dither values to be generated.
- *
- * Output:
- *      -bufQ7              : pointer to a buffer where dithers are written to.
- */
-static void GenerateDitherQ7LbUB(
-    int16_t* bufQ7,
-    uint32_t seed,
-    int length) {
-  int k;
-  for (k = 0; k < length; k++) {
-    /* new random unsigned int */
-    seed = (seed * 196314165) + 907633515;
-
-    /* Fixed-point dither sample between -64 and 64 (Q7). */
-    /* bufQ7 = seed * 128 / 4294967295 */
-    bufQ7[k] = (int16_t)(((int32_t)(seed + 16777216)) >> 25);
-
-    /* Scale by 0.35. */
-    bufQ7[k] = (int16_t)WEBRTC_SPL_MUL_16_16_RSFT(bufQ7[k], 2048, 13);
-  }
-}
-
-/*
- * Function to decode the complex spectrum from the bit stream
- * returns the total number of bytes in the stream.
- */
-int WebRtcIsac_DecodeSpec(Bitstr* streamdata, int16_t AvgPitchGain_Q12,
-                          enum ISACBand band, double* fr, double* fi) {
-  int16_t  DitherQ7[FRAMESAMPLES];
-  int16_t  data[FRAMESAMPLES];
-  int32_t  invARSpec2_Q16[FRAMESAMPLES_QUARTER];
-  uint16_t invARSpecQ8[FRAMESAMPLES_QUARTER];
-  int16_t  ARCoefQ12[AR_ORDER + 1];
-  int16_t  RCQ15[AR_ORDER];
-  int16_t  gainQ10;
-  int32_t  gain2_Q10, res;
-  int32_t  in_sqrt;
-  int32_t  newRes;
-  int k, len, i;
-  int is_12khz = !kIsSWB12;
-  int num_dft_coeff = FRAMESAMPLES;
-  /* Create dither signal. */
-  if (band == kIsacLowerBand) {
-    GenerateDitherQ7Lb(DitherQ7, streamdata->W_upper, FRAMESAMPLES,
-                       AvgPitchGain_Q12);
-  } else {
-    GenerateDitherQ7LbUB(DitherQ7, streamdata->W_upper, FRAMESAMPLES);
-    if (band == kIsacUpperBand12) {
-      is_12khz = kIsSWB12;
-      num_dft_coeff = FRAMESAMPLES_HALF;
-    }
-  }
-
-  /* Decode model parameters. */
-  if (WebRtcIsac_DecodeRc(streamdata, RCQ15) < 0)
-    return -ISAC_RANGE_ERROR_DECODE_SPECTRUM;
-
-  WebRtcSpl_ReflCoefToLpc(RCQ15, AR_ORDER, ARCoefQ12);
-
-  if (WebRtcIsac_DecodeGain2(streamdata, &gain2_Q10) < 0)
-    return -ISAC_RANGE_ERROR_DECODE_SPECTRUM;
-
-  /* Compute inverse AR power spectrum. */
-  FindInvArSpec(ARCoefQ12, gain2_Q10, invARSpec2_Q16);
-
-  /* Convert to magnitude spectrum,
-   * by doing square-roots (modified from SPLIB). */
-  res = 1 << (WebRtcSpl_GetSizeInBits(invARSpec2_Q16[0]) >> 1);
-  for (k = 0; k < FRAMESAMPLES_QUARTER; k++) {
-    in_sqrt = invARSpec2_Q16[k];
-    i = 10;
-
-    /* Negative values make no sense for a real sqrt-function. */
-    if (in_sqrt < 0)
-      in_sqrt = -in_sqrt;
-
-    newRes = (in_sqrt / res + res) >> 1;
-    do {
-      res = newRes;
-      newRes = (in_sqrt / res + res) >> 1;
-    } while (newRes != res && i-- > 0);
-
-    invARSpecQ8[k] = (int16_t)newRes;
-  }
-
-  len = WebRtcIsac_DecLogisticMulti2(data, streamdata, invARSpecQ8, DitherQ7,
-                                     num_dft_coeff, is_12khz);
-  /* Arithmetic decoding of spectrum. */
-  if (len < 1) {
-    return -ISAC_RANGE_ERROR_DECODE_SPECTRUM;
-  }
-
-  switch (band) {
-    case kIsacLowerBand: {
-      /* Scale down spectral samples with low SNR. */
-      int32_t p1;
-      int32_t p2;
-      if (AvgPitchGain_Q12 <= 614) {
-        p1 = 30 << 10;
-        p2 = 32768 + (33 << 16);
-      } else {
-        p1 = 36 << 10;
-        p2 = 32768 + (40 << 16);
-      }
-      for (k = 0; k < FRAMESAMPLES; k += 4) {
-        gainQ10 = WebRtcSpl_DivW32W16ResW16(p1, (int16_t)(
-            (invARSpec2_Q16[k >> 2] + p2) >> 16));
-        *fr++ = (double)((data[ k ] * gainQ10 + 512) >> 10) / 128.0;
-        *fi++ = (double)((data[k + 1] * gainQ10 + 512) >> 10) / 128.0;
-        *fr++ = (double)((data[k + 2] * gainQ10 + 512) >> 10) / 128.0;
-        *fi++ = (double)((data[k + 3] * gainQ10 + 512) >> 10) / 128.0;
-      }
-      break;
-    }
-    case kIsacUpperBand12: {
-      for (k = 0, i = 0; k < FRAMESAMPLES_HALF; k += 4) {
-        fr[i] = (double)data[ k ] / 128.0;
-        fi[i] = (double)data[k + 1] / 128.0;
-        i++;
-        fr[i] = (double)data[k + 2] / 128.0;
-        fi[i] = (double)data[k + 3] / 128.0;
-        i++;
-      }
-      /* The second half of real and imaginary coefficients is zero. This is
-       * due to using the old FFT module which requires two signals as input
-       * while in 0-12 kHz mode we only have 8-12 kHz band, and the second
-       * signal is set to zero. */
-      memset(&fr[FRAMESAMPLES_QUARTER], 0, FRAMESAMPLES_QUARTER *
-             sizeof(double));
-      memset(&fi[FRAMESAMPLES_QUARTER], 0, FRAMESAMPLES_QUARTER *
-             sizeof(double));
-      break;
-    }
-    case kIsacUpperBand16: {
-      for (i = 0, k = 0; k < FRAMESAMPLES; k += 4, i++) {
-        fr[i] = (double)data[ k ] / 128.0;
-        fi[i] = (double)data[k + 1] / 128.0;
-        fr[(FRAMESAMPLES_HALF) - 1 - i] = (double)data[k + 2] / 128.0;
-        fi[(FRAMESAMPLES_HALF) - 1 - i] = (double)data[k + 3] / 128.0;
-      }
-      break;
-    }
-  }
-  return len;
-}
-
-
-int WebRtcIsac_EncodeSpec(const int16_t* fr, const int16_t* fi,
-                          int16_t AvgPitchGain_Q12, enum ISACBand band,
-                          Bitstr* streamdata) {
-  int16_t ditherQ7[FRAMESAMPLES];
-  int16_t dataQ7[FRAMESAMPLES];
-  int32_t PSpec[FRAMESAMPLES_QUARTER];
-  int32_t invARSpec2_Q16[FRAMESAMPLES_QUARTER];
-  uint16_t invARSpecQ8[FRAMESAMPLES_QUARTER];
-  int32_t CorrQ7[AR_ORDER + 1];
-  int32_t CorrQ7_norm[AR_ORDER + 1];
-  int16_t RCQ15[AR_ORDER];
-  int16_t ARCoefQ12[AR_ORDER + 1];
-  int32_t gain2_Q10;
-  int16_t val;
-  int32_t nrg, res;
-  uint32_t sum;
-  int32_t in_sqrt;
-  int32_t newRes;
-  int16_t err;
-  uint32_t nrg_u32;
-  int shift_var;
-  int k, n, j, i;
-  int is_12khz = !kIsSWB12;
-  int num_dft_coeff = FRAMESAMPLES;
-
-  /* Create dither signal. */
-  if (band == kIsacLowerBand) {
-    GenerateDitherQ7Lb(ditherQ7, streamdata->W_upper, FRAMESAMPLES,
-                       AvgPitchGain_Q12);
-  } else {
-    GenerateDitherQ7LbUB(ditherQ7, streamdata->W_upper, FRAMESAMPLES);
-    if (band == kIsacUpperBand12) {
-      is_12khz = kIsSWB12;
-      num_dft_coeff = FRAMESAMPLES_HALF;
-    }
-  }
-
-  /* add dither and quantize, and compute power spectrum */
-  switch (band) {
-    case kIsacLowerBand: {
-      for (k = 0; k < FRAMESAMPLES; k += 4) {
-        val = ((*fr++ + ditherQ7[k]   + 64) & 0xFF80) - ditherQ7[k];
-        dataQ7[k] = val;
-        sum = val * val;
-
-        val = ((*fi++ + ditherQ7[k + 1] + 64) & 0xFF80) - ditherQ7[k + 1];
-        dataQ7[k + 1] = val;
-        sum += val * val;
-
-        val = ((*fr++ + ditherQ7[k + 2] + 64) & 0xFF80) - ditherQ7[k + 2];
-        dataQ7[k + 2] = val;
-        sum += val * val;
-
-        val = ((*fi++ + ditherQ7[k + 3] + 64) & 0xFF80) - ditherQ7[k + 3];
-        dataQ7[k + 3] = val;
-        sum += val * val;
-
-        PSpec[k >> 2] = sum >> 2;
-      }
-      break;
-    }
-    case kIsacUpperBand12: {
-      for (k = 0, j = 0; k < FRAMESAMPLES_HALF; k += 4) {
-        val = ((*fr++ + ditherQ7[k]   + 64) & 0xFF80) - ditherQ7[k];
-        dataQ7[k] = val;
-        sum = val * val;
-
-        val = ((*fi++ + ditherQ7[k + 1] + 64) & 0xFF80) - ditherQ7[k + 1];
-        dataQ7[k + 1] = val;
-        sum += val * val;
-
-        PSpec[j++] = sum >> 1;
-
-        val = ((*fr++ + ditherQ7[k + 2] + 64) & 0xFF80) - ditherQ7[k + 2];
-        dataQ7[k + 2] = val;
-        sum = val * val;
-
-        val = ((*fi++ + ditherQ7[k + 3] + 64) & 0xFF80) - ditherQ7[k + 3];
-        dataQ7[k + 3] = val;
-        sum += val * val;
-
-        PSpec[j++] = sum >> 1;
-      }
-      break;
-    }
-    case kIsacUpperBand16: {
-      for (j = 0, k = 0; k < FRAMESAMPLES; k += 4, j++) {
-        val = ((fr[j] + ditherQ7[k]   + 64) & 0xFF80) - ditherQ7[k];
-        dataQ7[k] = val;
-        sum = val * val;
-
-        val = ((fi[j] + ditherQ7[k + 1] + 64) & 0xFF80) - ditherQ7[k + 1];
-        dataQ7[k + 1] = val;
-        sum += val * val;
-
-        val = ((fr[(FRAMESAMPLES_HALF) - 1 - j] + ditherQ7[k + 2] + 64) &
-            0xFF80) - ditherQ7[k + 2];
-        dataQ7[k + 2] = val;
-        sum += val * val;
-
-        val = ((fi[(FRAMESAMPLES_HALF) - 1 - j] + ditherQ7[k + 3] + 64) &
-            0xFF80) - ditherQ7[k + 3];
-        dataQ7[k + 3] = val;
-        sum += val * val;
-
-        PSpec[k >> 2] = sum >> 2;
-      }
-      break;
-    }
-  }
-
-  /* compute correlation from power spectrum */
-  FindCorrelation(PSpec, CorrQ7);
-
-  /* Find AR coefficients */
-  /* Aumber of bit shifts to 14-bit normalize CorrQ7[0]
-   * (leaving room for sign) */
-  shift_var = WebRtcSpl_NormW32(CorrQ7[0]) - 18;
-
-  if (shift_var > 0) {
-    for (k = 0; k < AR_ORDER + 1; k++) {
-      CorrQ7_norm[k] = CorrQ7[k] << shift_var;
-    }
-  } else {
-    for (k = 0; k < AR_ORDER + 1; k++) {
-      CorrQ7_norm[k] = CorrQ7[k] >> (-shift_var);
-    }
-  }
-
-  /* Find RC coefficients. */
-  WebRtcSpl_AutoCorrToReflCoef(CorrQ7_norm, AR_ORDER, RCQ15);
-
-  /* Quantize & code RC Coefficient. */
-  WebRtcIsac_EncodeRc(RCQ15, streamdata);
-
-  /* RC -> AR coefficients */
-  WebRtcSpl_ReflCoefToLpc(RCQ15, AR_ORDER, ARCoefQ12);
-
-  /* Compute ARCoef' * Corr * ARCoef in Q19. */
-  nrg = 0;
-  for (j = 0; j <= AR_ORDER; j++) {
-    for (n = 0; n <= j; n++) {
-      nrg += (ARCoefQ12[j] * ((CorrQ7_norm[j - n] * ARCoefQ12[n] + 256) >> 9) +
-          4) >> 3;
-    }
-    for (n = j + 1; n <= AR_ORDER; n++) {
-      nrg += (ARCoefQ12[j] * ((CorrQ7_norm[n - j] * ARCoefQ12[n] + 256) >> 9) +
-          4) >> 3;
-    }
-  }
-
-  nrg_u32 = (uint32_t)nrg;
-  if (shift_var > 0) {
-    nrg_u32 = nrg_u32 >> shift_var;
-  } else {
-    nrg_u32 = nrg_u32 << (-shift_var);
-  }
-  if (nrg_u32 > 0x7FFFFFFF) {
-    nrg = 0x7FFFFFFF;
-  }  else {
-    nrg = (int32_t)nrg_u32;
-  }
-  /* Also shifts 31 bits to the left! */
-  gain2_Q10 = WebRtcSpl_DivResultInQ31(FRAMESAMPLES_QUARTER, nrg);
-
-  /* Quantize & code gain2_Q10. */
-  if (WebRtcIsac_EncodeGain2(&gain2_Q10, streamdata)) {
-    return -1;
-  }
-
-  /* Compute inverse AR power spectrum. */
-  FindInvArSpec(ARCoefQ12, gain2_Q10, invARSpec2_Q16);
-  /* Convert to magnitude spectrum, by doing square-roots
-   * (modified from SPLIB). */
-  res = 1 << (WebRtcSpl_GetSizeInBits(invARSpec2_Q16[0]) >> 1);
-  for (k = 0; k < FRAMESAMPLES_QUARTER; k++) {
-    in_sqrt = invARSpec2_Q16[k];
-    i = 10;
-    /* Negative values make no sense for a real sqrt-function. */
-    if (in_sqrt < 0) {
-      in_sqrt = -in_sqrt;
-    }
-    newRes = (in_sqrt / res + res) >> 1;
-    do {
-      res = newRes;
-      newRes = (in_sqrt / res + res) >> 1;
-    } while (newRes != res && i-- > 0);
-
-    invARSpecQ8[k] = (int16_t)newRes;
-  }
-  /* arithmetic coding of spectrum */
-  err = WebRtcIsac_EncLogisticMulti2(streamdata, dataQ7, invARSpecQ8,
-                                     num_dft_coeff, is_12khz);
-  if (err < 0) {
-    return (err);
-  }
-  return 0;
-}
-
-
-/* step-up */
-void WebRtcIsac_Rc2Poly(double* RC, int N, double* a) {
-  int m, k;
-  double tmp[MAX_AR_MODEL_ORDER];
-
-  a[0] = 1.0;
-  tmp[0] = 1.0;
-  for (m = 1; m <= N; m++) {
-    /* copy */
-    memcpy(&tmp[1], &a[1], (m - 1) * sizeof(double));
-    a[m] = RC[m - 1];
-    for (k = 1; k < m; k++) {
-      a[k] += RC[m - 1] * tmp[m - k];
-    }
-  }
-  return;
-}
-
-/* step-down */
-void WebRtcIsac_Poly2Rc(double* a, int N, double* RC) {
-  int m, k;
-  double tmp[MAX_AR_MODEL_ORDER];
-  double tmp_inv;
-
-  RC[N - 1] = a[N];
-  for (m = N - 1; m > 0; m--) {
-    tmp_inv = 1.0 / (1.0 - RC[m] * RC[m]);
-    for (k = 1; k <= m; k++) {
-      tmp[k] = (a[k] - RC[m] * a[m - k + 1]) * tmp_inv;
-    }
-
-    memcpy(&a[1], &tmp[1], (m - 1) * sizeof(double));
-    RC[m - 1] = tmp[m];
-  }
-  return;
-}
-
-
-#define MAX_ORDER 100
-
-/* Matlab's LAR definition */
-void WebRtcIsac_Rc2Lar(const double* refc, double* lar, int order) {
-  int k;
-  for (k = 0; k < order; k++) {
-    lar[k] = log((1 + refc[k]) / (1 - refc[k]));
-  }
-}
-
-
-void WebRtcIsac_Lar2Rc(const double* lar, double* refc,  int order) {
-  int k;
-  double tmp;
-
-  for (k = 0; k < order; k++) {
-    tmp = exp(lar[k]);
-    refc[k] = (tmp - 1) / (tmp + 1);
-  }
-}
-
-void WebRtcIsac_Poly2Lar(double* lowband, int orderLo, double* hiband,
-                         int orderHi, int Nsub, double* lars) {
-  int k;
-  double rc[MAX_ORDER], *inpl, *inph, *outp;
-
-  inpl = lowband;
-  inph = hiband;
-  outp = lars;
-  for (k = 0; k < Nsub; k++) {
-    /* gains */
-    outp[0] = inpl[0];
-    outp[1] = inph[0];
-    outp += 2;
-
-    /* Low band */
-    inpl[0] = 1.0;
-    WebRtcIsac_Poly2Rc(inpl, orderLo, rc);
-    WebRtcIsac_Rc2Lar(rc, outp, orderLo);
-    outp += orderLo;
-
-    /* High band */
-    inph[0] = 1.0;
-    WebRtcIsac_Poly2Rc(inph, orderHi, rc);
-    WebRtcIsac_Rc2Lar(rc, outp, orderHi);
-    outp += orderHi;
-
-    inpl += orderLo + 1;
-    inph += orderHi + 1;
-  }
-}
-
-
-int16_t WebRtcIsac_Poly2LarUB(double* lpcVecs, int16_t bandwidth) {
-  double      poly[MAX_ORDER];
-  double      rc[MAX_ORDER];
-  double*     ptrIO;
-  int16_t vecCntr;
-  int16_t vecSize;
-  int16_t numVec;
-
-  vecSize = UB_LPC_ORDER;
-  switch (bandwidth) {
-    case isac12kHz: {
-      numVec  = UB_LPC_VEC_PER_FRAME;
-      break;
-    }
-    case isac16kHz: {
-      numVec  = UB16_LPC_VEC_PER_FRAME;
-      break;
-    }
-    default:
-      return -1;
-  }
-
-  ptrIO = lpcVecs;
-  poly[0] = 1.0;
-  for (vecCntr = 0; vecCntr < numVec; vecCntr++) {
-    memcpy(&poly[1], ptrIO, sizeof(double) * vecSize);
-    WebRtcIsac_Poly2Rc(poly, vecSize, rc);
-    WebRtcIsac_Rc2Lar(rc, ptrIO, vecSize);
-    ptrIO += vecSize;
-  }
-  return 0;
-}
-
-
-void WebRtcIsac_Lar2Poly(double* lars, double* lowband, int orderLo,
-                         double* hiband, int orderHi, int Nsub) {
-  int k, orderTot;
-  double rc[MAX_ORDER], *outpl, *outph, *inp;
-
-  orderTot = (orderLo + orderHi + 2);
-  outpl = lowband;
-  outph = hiband;
-  /* First two elements of 'inp' store gains*/
-  inp = lars;
-  for (k = 0; k < Nsub; k++) {
-    /* Low band */
-    WebRtcIsac_Lar2Rc(&inp[2], rc, orderLo);
-    WebRtcIsac_Rc2Poly(rc, orderLo, outpl);
-
-    /* High band */
-    WebRtcIsac_Lar2Rc(&inp[orderLo + 2], rc, orderHi);
-    WebRtcIsac_Rc2Poly(rc, orderHi, outph);
-
-    /* gains */
-    outpl[0] = inp[0];
-    outph[0] = inp[1];
-
-    outpl += orderLo + 1;
-    outph += orderHi + 1;
-    inp += orderTot;
-  }
-}
-
-/*
- *  assumes 2 LAR vectors interpolates to 'numPolyVec' A-polynomials
- *  Note: 'numPolyVecs' includes the first and the last point of the interval
- */
-void WebRtcIsac_Lar2PolyInterpolUB(double* larVecs, double* percepFilterParams,
-                                   int numPolyVecs) {
-  int polyCntr, coeffCntr;
-  double larInterpol[UB_LPC_ORDER];
-  double rc[UB_LPC_ORDER];
-  double delta[UB_LPC_ORDER];
-
-  /* calculate the step-size for linear interpolation coefficients */
-  for (coeffCntr = 0; coeffCntr < UB_LPC_ORDER; coeffCntr++) {
-    delta[coeffCntr] = (larVecs[UB_LPC_ORDER + coeffCntr] -
-        larVecs[coeffCntr]) / (numPolyVecs - 1);
-  }
-
-  for (polyCntr = 0; polyCntr < numPolyVecs; polyCntr++) {
-    for (coeffCntr = 0; coeffCntr < UB_LPC_ORDER; coeffCntr++) {
-      larInterpol[coeffCntr] = larVecs[coeffCntr] +
-          delta[coeffCntr] * polyCntr;
-    }
-    WebRtcIsac_Lar2Rc(larInterpol, rc, UB_LPC_ORDER);
-
-    /* convert to A-polynomial, the following function returns A[0] = 1;
-     * which is written where gains had to be written. Then we write the
-     * gain (outside this function). This way we say a memcpy. */
-    WebRtcIsac_Rc2Poly(rc, UB_LPC_ORDER, percepFilterParams);
-    percepFilterParams += (UB_LPC_ORDER + 1);
-  }
-}
-
-int WebRtcIsac_DecodeLpc(Bitstr* streamdata, double* LPCCoef_lo,
-                         double* LPCCoef_hi) {
-  double lars[KLT_ORDER_GAIN + KLT_ORDER_SHAPE];
-  int err;
-
-  err = WebRtcIsac_DecodeLpcCoef(streamdata, lars);
-  if (err < 0) {
-    return -ISAC_RANGE_ERROR_DECODE_LPC;
-  }
-  WebRtcIsac_Lar2Poly(lars, LPCCoef_lo, ORDERLO, LPCCoef_hi, ORDERHI,
-                      SUBFRAMES);
-  return 0;
-}
-
-int16_t WebRtcIsac_DecodeInterpolLpcUb(Bitstr* streamdata,
-                                       double* percepFilterParams,
-                                       int16_t bandwidth) {
-  double lpcCoeff[UB_LPC_ORDER * UB16_LPC_VEC_PER_FRAME];
-  int err;
-  int interpolCntr;
-  int subframeCntr;
-  int16_t numSegments;
-  int16_t numVecPerSegment;
-  int16_t numGains;
-
-  double percepFilterGains[SUBFRAMES << 1];
-  double* ptrOutParam = percepFilterParams;
-
-  err = WebRtcIsac_DecodeLpcCoefUB(streamdata, lpcCoeff, percepFilterGains,
-                                   bandwidth);
-  if (err < 0) {
-    return -ISAC_RANGE_ERROR_DECODE_LPC;
-  }
-
-  switch (bandwidth) {
-    case isac12kHz: {
-      numGains = SUBFRAMES;
-      numSegments = UB_LPC_VEC_PER_FRAME - 1;
-      numVecPerSegment = kLpcVecPerSegmentUb12;
-      break;
-    }
-    case isac16kHz: {
-      numGains = SUBFRAMES << 1;
-      numSegments = UB16_LPC_VEC_PER_FRAME - 1;
-      numVecPerSegment = kLpcVecPerSegmentUb16;
-      break;
-    }
-    default:
-      return -1;
-  }
-
-  for (interpolCntr = 0; interpolCntr < numSegments; interpolCntr++) {
-    WebRtcIsac_Lar2PolyInterpolUB(&lpcCoeff[interpolCntr * UB_LPC_ORDER],
-                                  ptrOutParam, numVecPerSegment + 1);
-    ptrOutParam += (numVecPerSegment * (UB_LPC_ORDER + 1));
-  }
-
-  ptrOutParam = percepFilterParams;
-
-  if (bandwidth == isac16kHz) {
-    ptrOutParam += (1 + UB_LPC_ORDER);
-  }
-
-  for (subframeCntr = 0; subframeCntr < numGains; subframeCntr++) {
-    *ptrOutParam = percepFilterGains[subframeCntr];
-    ptrOutParam += (1 + UB_LPC_ORDER);
-  }
-  return 0;
-}
-
-
-/* decode & dequantize LPC Coef */
-int WebRtcIsac_DecodeLpcCoef(Bitstr* streamdata, double* LPCCoef) {
-  int j, k, n, pos, pos2, posg, poss, offsg, offss, offs2;
-  int index_g[KLT_ORDER_GAIN], index_s[KLT_ORDER_SHAPE];
-  double tmpcoeffs_g[KLT_ORDER_GAIN], tmpcoeffs_s[KLT_ORDER_SHAPE];
-  double tmpcoeffs2_g[KLT_ORDER_GAIN], tmpcoeffs2_s[KLT_ORDER_SHAPE];
-  double sum;
-  int err;
-  int model = 1;
-
-  /* entropy decoding of model number */
-  /* We are keeping this for backward compatibility of bit-streams. */
-  err = WebRtcIsac_DecHistOneStepMulti(&model, streamdata,
-                                       WebRtcIsac_kQKltModelCdfPtr,
-                                       WebRtcIsac_kQKltModelInitIndex, 1);
-  if (err < 0) {
-    return err;
-  }
-  /* Only accepted value of model is 0. It is kept in bit-stream for backward
-   * compatibility. */
-  if (model != 0) {
-    return -ISAC_DISALLOWED_LPC_MODEL;
-  }
-
-  /* entropy decoding of quantization indices */
-  err = WebRtcIsac_DecHistOneStepMulti(
-      index_s, streamdata, WebRtcIsac_kQKltCdfPtrShape,
-      WebRtcIsac_kQKltInitIndexShape, KLT_ORDER_SHAPE);
-  if (err < 0) {
-    return err;
-  }
-  err = WebRtcIsac_DecHistOneStepMulti(
-      index_g, streamdata, WebRtcIsac_kQKltCdfPtrGain,
-      WebRtcIsac_kQKltInitIndexGain, KLT_ORDER_GAIN);
-  if (err < 0) {
-    return err;
-  }
-
-  /* find quantization levels for coefficients */
-  for (k = 0; k < KLT_ORDER_SHAPE; k++) {
-    tmpcoeffs_s[k] =
-        WebRtcIsac_kQKltLevelsShape[WebRtcIsac_kQKltOffsetShape[k] +
-                                    index_s[k]];
-  }
-  for (k = 0; k < KLT_ORDER_GAIN; k++) {
-    tmpcoeffs_g[k] = WebRtcIsac_kQKltLevelsGain[WebRtcIsac_kQKltOffsetGain[k] +
-                                                index_g[k]];
-  }
-
-  /* Inverse KLT  */
-
-  /* Left transform, transpose matrix!  */
-  offsg = 0;
-  offss = 0;
-  posg = 0;
-  poss = 0;
-  for (j = 0; j < SUBFRAMES; j++) {
-    offs2 = 0;
-    for (k = 0; k < LPC_GAIN_ORDER; k++) {
-      sum = 0;
-      pos = offsg;
-      pos2 = offs2;
-      for (n = 0; n < LPC_GAIN_ORDER; n++) {
-        sum += tmpcoeffs_g[pos++] * WebRtcIsac_kKltT1Gain[pos2++];
-      }
-      tmpcoeffs2_g[posg++] = sum;
-      offs2 += LPC_GAIN_ORDER;
-    }
-    offs2 = 0;
-    for (k = 0; k < LPC_SHAPE_ORDER; k++) {
-      sum = 0;
-      pos = offss;
-      pos2 = offs2;
-      for (n = 0; n < LPC_SHAPE_ORDER; n++) {
-        sum += tmpcoeffs_s[pos++] * WebRtcIsac_kKltT1Shape[pos2++];
-      }
-      tmpcoeffs2_s[poss++] = sum;
-      offs2 += LPC_SHAPE_ORDER;
-    }
-    offsg += LPC_GAIN_ORDER;
-    offss += LPC_SHAPE_ORDER;
-  }
-
-  /* Right transform, transpose matrix */
-  offsg = 0;
-  offss = 0;
-  posg = 0;
-  poss = 0;
-  for (j = 0; j < SUBFRAMES; j++) {
-    posg = offsg;
-    for (k = 0; k < LPC_GAIN_ORDER; k++) {
-      sum = 0;
-      pos = k;
-      pos2 = j;
-      for (n = 0; n < SUBFRAMES; n++) {
-        sum += tmpcoeffs2_g[pos] * WebRtcIsac_kKltT2Gain[pos2];
-        pos += LPC_GAIN_ORDER;
-        pos2 += SUBFRAMES;
-
-      }
-      tmpcoeffs_g[posg++] = sum;
-    }
-    poss = offss;
-    for (k = 0; k < LPC_SHAPE_ORDER; k++) {
-      sum = 0;
-      pos = k;
-      pos2 = j;
-      for (n = 0; n < SUBFRAMES; n++) {
-        sum += tmpcoeffs2_s[pos] * WebRtcIsac_kKltT2Shape[pos2];
-        pos += LPC_SHAPE_ORDER;
-        pos2 += SUBFRAMES;
-      }
-      tmpcoeffs_s[poss++] = sum;
-    }
-    offsg += LPC_GAIN_ORDER;
-    offss += LPC_SHAPE_ORDER;
-  }
-
-  /* scaling, mean addition, and gain restoration */
-  posg = 0;
-  poss = 0;
-  pos = 0;
-  for (k = 0; k < SUBFRAMES; k++) {
-    /* log gains */
-    LPCCoef[pos] = tmpcoeffs_g[posg] / LPC_GAIN_SCALE;
-    LPCCoef[pos] += WebRtcIsac_kLpcMeansGain[posg];
-    LPCCoef[pos] = exp(LPCCoef[pos]);
-    pos++;
-    posg++;
-    LPCCoef[pos] = tmpcoeffs_g[posg] / LPC_GAIN_SCALE;
-    LPCCoef[pos] += WebRtcIsac_kLpcMeansGain[posg];
-    LPCCoef[pos] = exp(LPCCoef[pos]);
-    pos++;
-    posg++;
-
-    /* Low-band LAR coefficients. */
-    for (n = 0; n < LPC_LOBAND_ORDER; n++, pos++, poss++) {
-      LPCCoef[pos] = tmpcoeffs_s[poss] / LPC_LOBAND_SCALE;
-      LPCCoef[pos] += WebRtcIsac_kLpcMeansShape[poss];
-    }
-
-    /* High-band LAR coefficients. */
-    for (n = 0; n < LPC_HIBAND_ORDER; n++, pos++, poss++) {
-      LPCCoef[pos] = tmpcoeffs_s[poss] / LPC_HIBAND_SCALE;
-      LPCCoef[pos] += WebRtcIsac_kLpcMeansShape[poss];
-    }
-  }
-  return 0;
-}
-
-/* Encode LPC in LAR domain. */
-void WebRtcIsac_EncodeLar(double* LPCCoef, Bitstr* streamdata,
-                          IsacSaveEncoderData* encData) {
-  int j, k, n, pos, pos2, poss, offss, offs2;
-  int index_s[KLT_ORDER_SHAPE];
-  int index_ovr_s[KLT_ORDER_SHAPE];
-  double tmpcoeffs_s[KLT_ORDER_SHAPE];
-  double tmpcoeffs2_s[KLT_ORDER_SHAPE];
-  double sum;
-  const int kModel = 0;
-
-  /* Mean removal and scaling. */
-  poss = 0;
-  pos = 0;
-  for (k = 0; k < SUBFRAMES; k++) {
-    /* First two element are gains, move over them. */
-    pos += 2;
-
-    /* Low-band LAR coefficients. */
-    for (n = 0; n < LPC_LOBAND_ORDER; n++, poss++, pos++) {
-      tmpcoeffs_s[poss] = LPCCoef[pos] - WebRtcIsac_kLpcMeansShape[poss];
-      tmpcoeffs_s[poss] *= LPC_LOBAND_SCALE;
-    }
-
-    /* High-band LAR coefficients. */
-    for (n = 0; n < LPC_HIBAND_ORDER; n++, poss++, pos++) {
-      tmpcoeffs_s[poss] = LPCCoef[pos] - WebRtcIsac_kLpcMeansShape[poss];
-      tmpcoeffs_s[poss] *= LPC_HIBAND_SCALE;
-    }
-  }
-
-  /* KLT  */
-
-  /* Left transform. */
-  offss = 0;
-  for (j = 0; j < SUBFRAMES; j++) {
-    poss = offss;
-    for (k = 0; k < LPC_SHAPE_ORDER; k++) {
-      sum = 0;
-      pos = offss;
-      pos2 = k;
-      for (n = 0; n < LPC_SHAPE_ORDER; n++) {
-        sum += tmpcoeffs_s[pos++] * WebRtcIsac_kKltT1Shape[pos2];
-        pos2 += LPC_SHAPE_ORDER;
-      }
-      tmpcoeffs2_s[poss++] = sum;
-    }
-    offss += LPC_SHAPE_ORDER;
-  }
-
-  /* Right transform. */
-  offss = 0;
-  offs2 = 0;
-  for (j = 0; j < SUBFRAMES; j++) {
-    poss = offss;
-    for (k = 0; k < LPC_SHAPE_ORDER; k++) {
-      sum = 0;
-      pos = k;
-      pos2 = offs2;
-      for (n = 0; n < SUBFRAMES; n++) {
-        sum += tmpcoeffs2_s[pos] * WebRtcIsac_kKltT2Shape[pos2++];
-        pos += LPC_SHAPE_ORDER;
-      }
-      tmpcoeffs_s[poss++] = sum;
-    }
-    offs2 += SUBFRAMES;
-    offss += LPC_SHAPE_ORDER;
-  }
-
-  /* Quantize coefficients. */
-  for (k = 0; k < KLT_ORDER_SHAPE; k++) {
-    index_s[k] = (WebRtcIsac_lrint(tmpcoeffs_s[k] / KLT_STEPSIZE)) +
-        WebRtcIsac_kQKltQuantMinShape[k];
-    if (index_s[k] < 0) {
-      index_s[k] = 0;
-    } else if (index_s[k] > WebRtcIsac_kQKltMaxIndShape[k]) {
-      index_s[k] = WebRtcIsac_kQKltMaxIndShape[k];
-    }
-    index_ovr_s[k] = WebRtcIsac_kQKltOffsetShape[k] + index_s[k];
-  }
-
-
-  /* Only one model remains in this version of the code, kModel = 0. We
-   * are keeping for bit-streams to be backward compatible. */
-  /* entropy coding of model number */
-  WebRtcIsac_EncHistMulti(streamdata, &kModel, WebRtcIsac_kQKltModelCdfPtr, 1);
-
-  /* Save data for creation of multiple bit streams */
-  /* Entropy coding of quantization indices - shape only. */
-  WebRtcIsac_EncHistMulti(streamdata, index_s, WebRtcIsac_kQKltCdfPtrShape,
-                          KLT_ORDER_SHAPE);
-
-  /* Save data for creation of multiple bit streams. */
-  for (k = 0; k < KLT_ORDER_SHAPE; k++) {
-    encData->LPCindex_s[KLT_ORDER_SHAPE * encData->startIdx + k] = index_s[k];
-  }
-
-  /* Find quantization levels for shape coefficients. */
-  for (k = 0; k < KLT_ORDER_SHAPE; k++) {
-    tmpcoeffs_s[k] = WebRtcIsac_kQKltLevelsShape[index_ovr_s[k]];
-  }
-  /* Inverse KLT.  */
-  /* Left transform, transpose matrix.! */
-  offss = 0;
-  poss = 0;
-  for (j = 0; j < SUBFRAMES; j++) {
-    offs2 = 0;
-    for (k = 0; k < LPC_SHAPE_ORDER; k++) {
-      sum = 0;
-      pos = offss;
-      pos2 = offs2;
-      for (n = 0; n < LPC_SHAPE_ORDER; n++) {
-        sum += tmpcoeffs_s[pos++] * WebRtcIsac_kKltT1Shape[pos2++];
-      }
-      tmpcoeffs2_s[poss++] = sum;
-      offs2 += LPC_SHAPE_ORDER;
-    }
-    offss += LPC_SHAPE_ORDER;
-  }
-
-  /* Right transform, Transpose matrix */
-  offss = 0;
-  poss = 0;
-  for (j = 0; j < SUBFRAMES; j++) {
-    poss = offss;
-    for (k = 0; k < LPC_SHAPE_ORDER; k++) {
-      sum = 0;
-      pos = k;
-      pos2 = j;
-      for (n = 0; n < SUBFRAMES; n++) {
-        sum += tmpcoeffs2_s[pos] * WebRtcIsac_kKltT2Shape[pos2];
-        pos += LPC_SHAPE_ORDER;
-        pos2 += SUBFRAMES;
-      }
-      tmpcoeffs_s[poss++] = sum;
-    }
-    offss += LPC_SHAPE_ORDER;
-  }
-
-  /* Scaling, mean addition, and gain restoration. */
-  poss = 0;
-  pos = 0;
-  for (k = 0; k < SUBFRAMES; k++) {
-    /* Ignore gains. */
-    pos += 2;
-
-    /* Low band LAR coefficients. */
-    for (n = 0; n < LPC_LOBAND_ORDER; n++, pos++, poss++) {
-      LPCCoef[pos] = tmpcoeffs_s[poss] / LPC_LOBAND_SCALE;
-      LPCCoef[pos] += WebRtcIsac_kLpcMeansShape[poss];
-    }
-
-    /* High band LAR coefficients. */
-    for (n = 0; n < LPC_HIBAND_ORDER; n++, pos++, poss++) {
-      LPCCoef[pos] = tmpcoeffs_s[poss] / LPC_HIBAND_SCALE;
-      LPCCoef[pos] += WebRtcIsac_kLpcMeansShape[poss];
-    }
-  }
-}
-
-
-void WebRtcIsac_EncodeLpcLb(double* LPCCoef_lo, double* LPCCoef_hi,
-                            Bitstr* streamdata, IsacSaveEncoderData* encData) {
-  double lars[KLT_ORDER_GAIN + KLT_ORDER_SHAPE];
-  int k;
-
-  WebRtcIsac_Poly2Lar(LPCCoef_lo, ORDERLO, LPCCoef_hi, ORDERHI, SUBFRAMES,
-                      lars);
-  WebRtcIsac_EncodeLar(lars, streamdata, encData);
-  WebRtcIsac_Lar2Poly(lars, LPCCoef_lo, ORDERLO, LPCCoef_hi, ORDERHI,
-                      SUBFRAMES);
-  /* Save data for creation of multiple bit streams (and transcoding). */
-  for (k = 0; k < (ORDERLO + 1)*SUBFRAMES; k++) {
-    encData->LPCcoeffs_lo[(ORDERLO + 1)*SUBFRAMES * encData->startIdx + k] =
-        LPCCoef_lo[k];
-  }
-  for (k = 0; k < (ORDERHI + 1)*SUBFRAMES; k++) {
-    encData->LPCcoeffs_hi[(ORDERHI + 1)*SUBFRAMES * encData->startIdx + k] =
-        LPCCoef_hi[k];
-  }
-}
-
-
-int16_t WebRtcIsac_EncodeLpcUB(double* lpcVecs, Bitstr* streamdata,
-                               double* interpolLPCCoeff,
-                               int16_t bandwidth,
-                                     ISACUBSaveEncDataStruct* encData) {
-  double    U[UB_LPC_ORDER * UB16_LPC_VEC_PER_FRAME];
-  int     idx[UB_LPC_ORDER * UB16_LPC_VEC_PER_FRAME];
-  int interpolCntr;
-
-  WebRtcIsac_Poly2LarUB(lpcVecs, bandwidth);
-  WebRtcIsac_RemoveLarMean(lpcVecs, bandwidth);
-  WebRtcIsac_DecorrelateIntraVec(lpcVecs, U, bandwidth);
-  WebRtcIsac_DecorrelateInterVec(U, lpcVecs, bandwidth);
-  WebRtcIsac_QuantizeUncorrLar(lpcVecs, idx, bandwidth);
-
-  WebRtcIsac_CorrelateInterVec(lpcVecs, U, bandwidth);
-  WebRtcIsac_CorrelateIntraVec(U, lpcVecs, bandwidth);
-  WebRtcIsac_AddLarMean(lpcVecs, bandwidth);
-
-  switch (bandwidth) {
-    case isac12kHz: {
-      /* Store the indices to be used for multiple encoding. */
-      memcpy(encData->indexLPCShape, idx, UB_LPC_ORDER *
-             UB_LPC_VEC_PER_FRAME * sizeof(int));
-      WebRtcIsac_EncHistMulti(streamdata, idx, WebRtcIsac_kLpcShapeCdfMatUb12,
-                              UB_LPC_ORDER * UB_LPC_VEC_PER_FRAME);
-      for (interpolCntr = 0; interpolCntr < UB_INTERPOL_SEGMENTS;
-          interpolCntr++) {
-        WebRtcIsac_Lar2PolyInterpolUB(lpcVecs, interpolLPCCoeff,
-                                      kLpcVecPerSegmentUb12 + 1);
-        lpcVecs += UB_LPC_ORDER;
-        interpolLPCCoeff += (kLpcVecPerSegmentUb12 * (UB_LPC_ORDER + 1));
-      }
-      break;
-    }
-    case isac16kHz: {
-      /* Store the indices to be used for multiple encoding. */
-      memcpy(encData->indexLPCShape, idx, UB_LPC_ORDER *
-             UB16_LPC_VEC_PER_FRAME * sizeof(int));
-      WebRtcIsac_EncHistMulti(streamdata, idx, WebRtcIsac_kLpcShapeCdfMatUb16,
-                              UB_LPC_ORDER * UB16_LPC_VEC_PER_FRAME);
-      for (interpolCntr = 0; interpolCntr < UB16_INTERPOL_SEGMENTS;
-          interpolCntr++) {
-        WebRtcIsac_Lar2PolyInterpolUB(lpcVecs, interpolLPCCoeff,
-                                      kLpcVecPerSegmentUb16 + 1);
-        lpcVecs += UB_LPC_ORDER;
-        interpolLPCCoeff += (kLpcVecPerSegmentUb16 * (UB_LPC_ORDER + 1));
-      }
-      break;
-    }
-    default:
-      return -1;
-  }
-  return 0;
-}
-
-void WebRtcIsac_EncodeLpcGainLb(double* LPCCoef_lo, double* LPCCoef_hi,
-                                Bitstr* streamdata,
-                                IsacSaveEncoderData* encData) {
-  int j, k, n, pos, pos2, posg, offsg, offs2;
-  int index_g[KLT_ORDER_GAIN];
-  int index_ovr_g[KLT_ORDER_GAIN];
-  double tmpcoeffs_g[KLT_ORDER_GAIN];
-  double tmpcoeffs2_g[KLT_ORDER_GAIN];
-  double sum;
-  /* log gains, mean removal and scaling */
-  posg = 0;
-  for (k = 0; k < SUBFRAMES; k++) {
-    tmpcoeffs_g[posg] = log(LPCCoef_lo[(LPC_LOBAND_ORDER + 1) * k]);
-    tmpcoeffs_g[posg] -= WebRtcIsac_kLpcMeansGain[posg];
-    tmpcoeffs_g[posg] *= LPC_GAIN_SCALE;
-    posg++;
-    tmpcoeffs_g[posg] = log(LPCCoef_hi[(LPC_HIBAND_ORDER + 1) * k]);
-    tmpcoeffs_g[posg] -= WebRtcIsac_kLpcMeansGain[posg];
-    tmpcoeffs_g[posg] *= LPC_GAIN_SCALE;
-    posg++;
-  }
-
-  /* KLT  */
-
-  /* Left transform. */
-  offsg = 0;
-  for (j = 0; j < SUBFRAMES; j++) {
-    posg = offsg;
-    for (k = 0; k < LPC_GAIN_ORDER; k++) {
-      sum = 0;
-      pos = offsg;
-      pos2 = k;
-      for (n = 0; n < LPC_GAIN_ORDER; n++) {
-        sum += tmpcoeffs_g[pos++] * WebRtcIsac_kKltT1Gain[pos2];
-        pos2 += LPC_GAIN_ORDER;
-      }
-      tmpcoeffs2_g[posg++] = sum;
-    }
-    offsg += LPC_GAIN_ORDER;
-  }
-
-  /* Right transform. */
-  offsg = 0;
-  offs2 = 0;
-  for (j = 0; j < SUBFRAMES; j++) {
-    posg = offsg;
-    for (k = 0; k < LPC_GAIN_ORDER; k++) {
-      sum = 0;
-      pos = k;
-      pos2 = offs2;
-      for (n = 0; n < SUBFRAMES; n++) {
-        sum += tmpcoeffs2_g[pos] * WebRtcIsac_kKltT2Gain[pos2++];
-        pos += LPC_GAIN_ORDER;
-      }
-      tmpcoeffs_g[posg++] = sum;
-    }
-    offs2 += SUBFRAMES;
-    offsg += LPC_GAIN_ORDER;
-  }
-
-  /* Quantize coefficients. */
-  for (k = 0; k < KLT_ORDER_GAIN; k++) {
-    /* Get index. */
-    pos2 = WebRtcIsac_lrint(tmpcoeffs_g[k] / KLT_STEPSIZE);
-    index_g[k] = (pos2) + WebRtcIsac_kQKltQuantMinGain[k];
-    if (index_g[k] < 0) {
-      index_g[k] = 0;
-    } else if (index_g[k] > WebRtcIsac_kQKltMaxIndGain[k]) {
-      index_g[k] = WebRtcIsac_kQKltMaxIndGain[k];
-    }
-    index_ovr_g[k] = WebRtcIsac_kQKltOffsetGain[k] + index_g[k];
-
-    /* Find quantization levels for coefficients. */
-    tmpcoeffs_g[k] = WebRtcIsac_kQKltLevelsGain[index_ovr_g[k]];
-
-    /* Save data for creation of multiple bit streams. */
-    encData->LPCindex_g[KLT_ORDER_GAIN * encData->startIdx + k] = index_g[k];
-  }
-
-  /* Entropy coding of quantization indices - gain. */
-  WebRtcIsac_EncHistMulti(streamdata, index_g, WebRtcIsac_kQKltCdfPtrGain,
-                          KLT_ORDER_GAIN);
-
-  /* Find quantization levels for coefficients. */
-  /* Left transform. */
-  offsg = 0;
-  posg = 0;
-  for (j = 0; j < SUBFRAMES; j++) {
-    offs2 = 0;
-    for (k = 0; k < LPC_GAIN_ORDER; k++) {
-      sum = 0;
-      pos = offsg;
-      pos2 = offs2;
-      for (n = 0; n < LPC_GAIN_ORDER; n++)
-        sum += tmpcoeffs_g[pos++] * WebRtcIsac_kKltT1Gain[pos2++];
-      tmpcoeffs2_g[posg++] = sum;
-      offs2 += LPC_GAIN_ORDER;
-    }
-    offsg += LPC_GAIN_ORDER;
-  }
-
-  /* Right transform, transpose matrix. */
-  offsg = 0;
-  posg = 0;
-  for (j = 0; j < SUBFRAMES; j++) {
-    posg = offsg;
-    for (k = 0; k < LPC_GAIN_ORDER; k++) {
-      sum = 0;
-      pos = k;
-      pos2 = j;
-      for (n = 0; n < SUBFRAMES; n++) {
-        sum += tmpcoeffs2_g[pos] * WebRtcIsac_kKltT2Gain[pos2];
-        pos += LPC_GAIN_ORDER;
-        pos2 += SUBFRAMES;
-      }
-      tmpcoeffs_g[posg++] = sum;
-    }
-    offsg += LPC_GAIN_ORDER;
-  }
-
-
-  /* Scaling, mean addition, and gain restoration. */
-  posg = 0;
-  for (k = 0; k < SUBFRAMES; k++) {
-    sum = tmpcoeffs_g[posg] / LPC_GAIN_SCALE;
-    sum += WebRtcIsac_kLpcMeansGain[posg];
-    LPCCoef_lo[k * (LPC_LOBAND_ORDER + 1)] = exp(sum);
-    pos++;
-    posg++;
-    sum = tmpcoeffs_g[posg] / LPC_GAIN_SCALE;
-    sum += WebRtcIsac_kLpcMeansGain[posg];
-    LPCCoef_hi[k * (LPC_HIBAND_ORDER + 1)] = exp(sum);
-    pos++;
-    posg++;
-  }
-
-}
-
-void WebRtcIsac_EncodeLpcGainUb(double* lpGains, Bitstr* streamdata,
-                                int* lpcGainIndex) {
-  double U[UB_LPC_GAIN_DIM];
-  int idx[UB_LPC_GAIN_DIM];
-  WebRtcIsac_ToLogDomainRemoveMean(lpGains);
-  WebRtcIsac_DecorrelateLPGain(lpGains, U);
-  WebRtcIsac_QuantizeLpcGain(U, idx);
-  /* Store the index for re-encoding for FEC. */
-  memcpy(lpcGainIndex, idx, UB_LPC_GAIN_DIM * sizeof(int));
-  WebRtcIsac_CorrelateLpcGain(U, lpGains);
-  WebRtcIsac_AddMeanToLinearDomain(lpGains);
-  WebRtcIsac_EncHistMulti(streamdata, idx, WebRtcIsac_kLpcGainCdfMat,
-                          UB_LPC_GAIN_DIM);
-}
-
-
-void WebRtcIsac_StoreLpcGainUb(double* lpGains, Bitstr* streamdata) {
-  double U[UB_LPC_GAIN_DIM];
-  int idx[UB_LPC_GAIN_DIM];
-  WebRtcIsac_ToLogDomainRemoveMean(lpGains);
-  WebRtcIsac_DecorrelateLPGain(lpGains, U);
-  WebRtcIsac_QuantizeLpcGain(U, idx);
-  WebRtcIsac_EncHistMulti(streamdata, idx, WebRtcIsac_kLpcGainCdfMat,
-                          UB_LPC_GAIN_DIM);
-}
-
-
-
-int16_t WebRtcIsac_DecodeLpcGainUb(double* lpGains, Bitstr* streamdata) {
-  double U[UB_LPC_GAIN_DIM];
-  int idx[UB_LPC_GAIN_DIM];
-  int err;
-  err = WebRtcIsac_DecHistOneStepMulti(idx, streamdata,
-                                       WebRtcIsac_kLpcGainCdfMat,
-                                       WebRtcIsac_kLpcGainEntropySearch,
-                                       UB_LPC_GAIN_DIM);
-  if (err < 0) {
-    return -1;
-  }
-  WebRtcIsac_DequantizeLpcGain(idx, U);
-  WebRtcIsac_CorrelateLpcGain(U, lpGains);
-  WebRtcIsac_AddMeanToLinearDomain(lpGains);
-  return 0;
-}
-
-
-
-/* decode & dequantize RC */
-int WebRtcIsac_DecodeRc(Bitstr* streamdata, int16_t* RCQ15) {
-  int k, err;
-  int index[AR_ORDER];
-
-  /* entropy decoding of quantization indices */
-  err = WebRtcIsac_DecHistOneStepMulti(index, streamdata,
-                                       WebRtcIsac_kQArRcCdfPtr,
-                                       WebRtcIsac_kQArRcInitIndex, AR_ORDER);
-  if (err < 0)
-    return err;
-
-  /* find quantization levels for reflection coefficients */
-  for (k = 0; k < AR_ORDER; k++) {
-    RCQ15[k] = *(WebRtcIsac_kQArRcLevelsPtr[k] + index[k]);
-  }
-  return 0;
-}
-
-
-/* quantize & code RC */
-void WebRtcIsac_EncodeRc(int16_t* RCQ15, Bitstr* streamdata) {
-  int k;
-  int index[AR_ORDER];
-
-  /* quantize reflection coefficients (add noise feedback?) */
-  for (k = 0; k < AR_ORDER; k++) {
-    index[k] = WebRtcIsac_kQArRcInitIndex[k];
-    // The safe-guards in following while conditions are to suppress gcc 4.8.3
-    // warnings, Issue 2888. Otherwise, first and last elements of
-    // |WebRtcIsac_kQArBoundaryLevels| are such that the following search
-    // *never* cause an out-of-boundary read.
-    if (RCQ15[k] > WebRtcIsac_kQArBoundaryLevels[index[k]]) {
-      while (index[k] + 1 < NUM_AR_RC_QUANT_BAUNDARY &&
-        RCQ15[k] > WebRtcIsac_kQArBoundaryLevels[index[k] + 1]) {
-        index[k]++;
-      }
-    } else {
-      while (index[k] > 0 &&
-        RCQ15[k] < WebRtcIsac_kQArBoundaryLevels[--index[k]]) ;
-    }
-    RCQ15[k] = *(WebRtcIsac_kQArRcLevelsPtr[k] + index[k]);
-  }
-
-  /* entropy coding of quantization indices */
-  WebRtcIsac_EncHistMulti(streamdata, index, WebRtcIsac_kQArRcCdfPtr, AR_ORDER);
-}
-
-
-/* decode & dequantize squared Gain */
-int WebRtcIsac_DecodeGain2(Bitstr* streamdata, int32_t* gainQ10) {
-  int index, err;
-
-  /* entropy decoding of quantization index */
-  err = WebRtcIsac_DecHistOneStepMulti(&index, streamdata,
-                                       WebRtcIsac_kQGainCdf_ptr,
-                                       WebRtcIsac_kQGainInitIndex, 1);
-  if (err < 0) {
-    return err;
-  }
-  /* find quantization level */
-  *gainQ10 = WebRtcIsac_kQGain2Levels[index];
-  return 0;
-}
-
-
-/* quantize & code squared Gain */
-int WebRtcIsac_EncodeGain2(int32_t* gainQ10, Bitstr* streamdata) {
-  int index;
-
-  /* find quantization index */
-  index = WebRtcIsac_kQGainInitIndex[0];
-  if (*gainQ10 > WebRtcIsac_kQGain2BoundaryLevels[index]) {
-    while (*gainQ10 > WebRtcIsac_kQGain2BoundaryLevels[index + 1]) {
-      index++;
-    }
-  } else {
-    while (*gainQ10 < WebRtcIsac_kQGain2BoundaryLevels[--index]) ;
-  }
-  /* De-quantize */
-  *gainQ10 = WebRtcIsac_kQGain2Levels[index];
-
-  /* entropy coding of quantization index */
-  WebRtcIsac_EncHistMulti(streamdata, &index, WebRtcIsac_kQGainCdf_ptr, 1);
-  return 0;
-}
-
-
-/* code and decode Pitch Gains and Lags functions */
-
-/* decode & dequantize Pitch Gains */
-int WebRtcIsac_DecodePitchGain(Bitstr* streamdata,
-                               int16_t* PitchGains_Q12) {
-  int index_comb, err;
-  const uint16_t* WebRtcIsac_kQPitchGainCdf_ptr[1];
-
-  /* Entropy decoding of quantization indices */
-  *WebRtcIsac_kQPitchGainCdf_ptr = WebRtcIsac_kQPitchGainCdf;
-  err = WebRtcIsac_DecHistBisectMulti(&index_comb, streamdata,
-                                      WebRtcIsac_kQPitchGainCdf_ptr,
-                                      WebRtcIsac_kQCdfTableSizeGain, 1);
-  /* Error check, Q_mean_Gain.. tables are of size 144 */
-  if ((err < 0) || (index_comb < 0) || (index_comb >= 144)) {
-    return -ISAC_RANGE_ERROR_DECODE_PITCH_GAIN;
-  }
-  /* De-quantize back to pitch gains by table look-up. */
-  PitchGains_Q12[0] = WebRtcIsac_kQMeanGain1Q12[index_comb];
-  PitchGains_Q12[1] = WebRtcIsac_kQMeanGain2Q12[index_comb];
-  PitchGains_Q12[2] = WebRtcIsac_kQMeanGain3Q12[index_comb];
-  PitchGains_Q12[3] = WebRtcIsac_kQMeanGain4Q12[index_comb];
-  return 0;
-}
-
-
-/* Quantize & code Pitch Gains. */
-void WebRtcIsac_EncodePitchGain(int16_t* PitchGains_Q12,
-                                Bitstr* streamdata,
-                                IsacSaveEncoderData* encData) {
-  int k, j;
-  double C;
-  double S[PITCH_SUBFRAMES];
-  int index[3];
-  int index_comb;
-  const uint16_t* WebRtcIsac_kQPitchGainCdf_ptr[1];
-  double PitchGains[PITCH_SUBFRAMES] = {0, 0, 0, 0};
-
-  /* Take the asin. */
-  for (k = 0; k < PITCH_SUBFRAMES; k++) {
-    PitchGains[k] = ((float)PitchGains_Q12[k]) / 4096;
-    S[k] = asin(PitchGains[k]);
-  }
-
-  /* Find quantization index; only for the first three
-   * transform coefficients. */
-  for (k = 0; k < 3; k++) {
-    /*  transform */
-    C = 0.0;
-    for (j = 0; j < PITCH_SUBFRAMES; j++) {
-      C += WebRtcIsac_kTransform[k][j] * S[j];
-    }
-    /* Quantize */
-    index[k] = WebRtcIsac_lrint(C / PITCH_GAIN_STEPSIZE);
-
-    /* Check that the index is not outside the boundaries of the table. */
-    if (index[k] < WebRtcIsac_kIndexLowerLimitGain[k]) {
-      index[k] = WebRtcIsac_kIndexLowerLimitGain[k];
-    } else if (index[k] > WebRtcIsac_kIndexUpperLimitGain[k]) {
-      index[k] = WebRtcIsac_kIndexUpperLimitGain[k];
-    }
-    index[k] -= WebRtcIsac_kIndexLowerLimitGain[k];
-  }
-
-  /* Calculate unique overall index. */
-  index_comb = WebRtcIsac_kIndexMultsGain[0] * index[0] +
-      WebRtcIsac_kIndexMultsGain[1] * index[1] + index[2];
-
-  /* unquantize back to pitch gains by table look-up */
-  PitchGains_Q12[0] = WebRtcIsac_kQMeanGain1Q12[index_comb];
-  PitchGains_Q12[1] = WebRtcIsac_kQMeanGain2Q12[index_comb];
-  PitchGains_Q12[2] = WebRtcIsac_kQMeanGain3Q12[index_comb];
-  PitchGains_Q12[3] = WebRtcIsac_kQMeanGain4Q12[index_comb];
-
-  /* entropy coding of quantization pitch gains */
-  *WebRtcIsac_kQPitchGainCdf_ptr = WebRtcIsac_kQPitchGainCdf;
-  WebRtcIsac_EncHistMulti(streamdata, &index_comb,
-                          WebRtcIsac_kQPitchGainCdf_ptr, 1);
-  encData->pitchGain_index[encData->startIdx] = index_comb;
-}
-
-
-
-/* Pitch LAG */
-/* Decode & de-quantize Pitch Lags. */
-int WebRtcIsac_DecodePitchLag(Bitstr* streamdata, int16_t* PitchGain_Q12,
-                              double* PitchLags) {
-  int k, err;
-  double StepSize;
-  double C;
-  int index[PITCH_SUBFRAMES];
-  double mean_gain;
-  const double* mean_val2, *mean_val3, *mean_val4;
-  const int16_t* lower_limit;
-  const uint16_t* init_index;
-  const uint16_t* cdf_size;
-  const uint16_t** cdf;
-  double PitchGain[4] = {0, 0, 0, 0};
-
-  /* compute mean pitch gain */
-  mean_gain = 0.0;
-  for (k = 0; k < 4; k++) {
-    PitchGain[k] = ((float)PitchGain_Q12[k]) / 4096;
-    mean_gain += PitchGain[k];
-  }
-  mean_gain /= 4.0;
-
-  /* voicing classification. */
-  if (mean_gain < 0.2) {
-    StepSize = WebRtcIsac_kQPitchLagStepsizeLo;
-    cdf = WebRtcIsac_kQPitchLagCdfPtrLo;
-    cdf_size = WebRtcIsac_kQPitchLagCdfSizeLo;
-    mean_val2 = WebRtcIsac_kQMeanLag2Lo;
-    mean_val3 = WebRtcIsac_kQMeanLag3Lo;
-    mean_val4 = WebRtcIsac_kQMeanLag4Lo;
-    lower_limit = WebRtcIsac_kQIndexLowerLimitLagLo;
-    init_index = WebRtcIsac_kQInitIndexLagLo;
-  } else if (mean_gain < 0.4) {
-    StepSize = WebRtcIsac_kQPitchLagStepsizeMid;
-    cdf = WebRtcIsac_kQPitchLagCdfPtrMid;
-    cdf_size = WebRtcIsac_kQPitchLagCdfSizeMid;
-    mean_val2 = WebRtcIsac_kQMeanLag2Mid;
-    mean_val3 = WebRtcIsac_kQMeanLag3Mid;
-    mean_val4 = WebRtcIsac_kQMeanLag4Mid;
-    lower_limit = WebRtcIsac_kQIndexLowerLimitLagMid;
-    init_index = WebRtcIsac_kQInitIndexLagMid;
-  } else {
-    StepSize = WebRtcIsac_kQPitchLagStepsizeHi;
-    cdf = WebRtcIsac_kQPitchLagCdfPtrHi;
-    cdf_size = WebRtcIsac_kQPitchLagCdfSizeHi;
-    mean_val2 = WebRtcIsac_kQMeanLag2Hi;
-    mean_val3 = WebRtcIsac_kQMeanLag3Hi;
-    mean_val4 = WebRtcIsac_kQMeanLag4Hi;
-    lower_limit = WebRtcIsac_kQindexLowerLimitLagHi;
-    init_index = WebRtcIsac_kQInitIndexLagHi;
-  }
-
-  /* Entropy decoding of quantization indices. */
-  err = WebRtcIsac_DecHistBisectMulti(index, streamdata, cdf, cdf_size, 1);
-  if ((err < 0) || (index[0] < 0)) {
-    return -ISAC_RANGE_ERROR_DECODE_PITCH_LAG;
-  }
-  err = WebRtcIsac_DecHistOneStepMulti(index + 1, streamdata, cdf + 1,
-                                       init_index, 3);
-  if (err < 0) {
-    return -ISAC_RANGE_ERROR_DECODE_PITCH_LAG;
-  }
-
-  /* Unquantize back to transform coefficients and do the inverse transform:
-   * S = T'*C. */
-  C = (index[0] + lower_limit[0]) * StepSize;
-  for (k = 0; k < PITCH_SUBFRAMES; k++) {
-    PitchLags[k] = WebRtcIsac_kTransformTranspose[k][0] * C;
-  }
-  C = mean_val2[index[1]];
-  for (k = 0; k < PITCH_SUBFRAMES; k++) {
-    PitchLags[k] += WebRtcIsac_kTransformTranspose[k][1] * C;
-  }
-  C = mean_val3[index[2]];
-  for (k = 0; k < PITCH_SUBFRAMES; k++) {
-    PitchLags[k] += WebRtcIsac_kTransformTranspose[k][2] * C;
-  }
-  C = mean_val4[index[3]];
-  for (k = 0; k < PITCH_SUBFRAMES; k++) {
-    PitchLags[k] += WebRtcIsac_kTransformTranspose[k][3] * C;
-  }
-  return 0;
-}
-
-
-
-/* Quantize & code pitch lags. */
-void WebRtcIsac_EncodePitchLag(double* PitchLags, int16_t* PitchGain_Q12,
-                               Bitstr* streamdata,
-                               IsacSaveEncoderData* encData) {
-  int k, j;
-  double StepSize;
-  double C;
-  int index[PITCH_SUBFRAMES];
-  double mean_gain;
-  const double* mean_val2, *mean_val3, *mean_val4;
-  const int16_t* lower_limit, *upper_limit;
-  const uint16_t** cdf;
-  double PitchGain[4] = {0, 0, 0, 0};
-
-  /* compute mean pitch gain */
-  mean_gain = 0.0;
-  for (k = 0; k < 4; k++) {
-    PitchGain[k] = ((float)PitchGain_Q12[k]) / 4096;
-    mean_gain += PitchGain[k];
-  }
-  mean_gain /= 4.0;
-
-  /* Save data for creation of multiple bit streams */
-  encData->meanGain[encData->startIdx] = mean_gain;
-
-  /* Voicing classification. */
-  if (mean_gain < 0.2) {
-    StepSize = WebRtcIsac_kQPitchLagStepsizeLo;
-    cdf = WebRtcIsac_kQPitchLagCdfPtrLo;
-    mean_val2 = WebRtcIsac_kQMeanLag2Lo;
-    mean_val3 = WebRtcIsac_kQMeanLag3Lo;
-    mean_val4 = WebRtcIsac_kQMeanLag4Lo;
-    lower_limit = WebRtcIsac_kQIndexLowerLimitLagLo;
-    upper_limit = WebRtcIsac_kQIndexUpperLimitLagLo;
-  } else if (mean_gain < 0.4) {
-    StepSize = WebRtcIsac_kQPitchLagStepsizeMid;
-    cdf = WebRtcIsac_kQPitchLagCdfPtrMid;
-    mean_val2 = WebRtcIsac_kQMeanLag2Mid;
-    mean_val3 = WebRtcIsac_kQMeanLag3Mid;
-    mean_val4 = WebRtcIsac_kQMeanLag4Mid;
-    lower_limit = WebRtcIsac_kQIndexLowerLimitLagMid;
-    upper_limit = WebRtcIsac_kQIndexUpperLimitLagMid;
-  } else {
-    StepSize = WebRtcIsac_kQPitchLagStepsizeHi;
-    cdf = WebRtcIsac_kQPitchLagCdfPtrHi;
-    mean_val2 = WebRtcIsac_kQMeanLag2Hi;
-    mean_val3 = WebRtcIsac_kQMeanLag3Hi;
-    mean_val4 = WebRtcIsac_kQMeanLag4Hi;
-    lower_limit = WebRtcIsac_kQindexLowerLimitLagHi;
-    upper_limit = WebRtcIsac_kQindexUpperLimitLagHi;
-  }
-
-  /* find quantization index */
-  for (k = 0; k < 4; k++) {
-    /*  transform */
-    C = 0.0;
-    for (j = 0; j < PITCH_SUBFRAMES; j++) {
-      C += WebRtcIsac_kTransform[k][j] * PitchLags[j];
-    }
-    /* quantize */
-    index[k] = WebRtcIsac_lrint(C / StepSize);
-
-    /* check that the index is not outside the boundaries of the table */
-    if (index[k] < lower_limit[k]) {
-      index[k] = lower_limit[k];
-    } else if (index[k] > upper_limit[k]) index[k] = upper_limit[k]; {
-      index[k] -= lower_limit[k];
-    }
-    /* Save data for creation of multiple bit streams */
-    encData->pitchIndex[PITCH_SUBFRAMES * encData->startIdx + k] = index[k];
-  }
-
-  /* Un-quantize back to transform coefficients and do the inverse transform:
-   * S = T'*C */
-  C = (index[0] + lower_limit[0]) * StepSize;
-  for (k = 0; k < PITCH_SUBFRAMES; k++) {
-    PitchLags[k] = WebRtcIsac_kTransformTranspose[k][0] * C;
-  }
-  C = mean_val2[index[1]];
-  for (k = 0; k < PITCH_SUBFRAMES; k++) {
-    PitchLags[k] += WebRtcIsac_kTransformTranspose[k][1] * C;
-  }
-  C = mean_val3[index[2]];
-  for (k = 0; k < PITCH_SUBFRAMES; k++) {
-    PitchLags[k] += WebRtcIsac_kTransformTranspose[k][2] * C;
-  }
-  C = mean_val4[index[3]];
-  for (k = 0; k < PITCH_SUBFRAMES; k++) {
-    PitchLags[k] += WebRtcIsac_kTransformTranspose[k][3] * C;
-  }
-  /* entropy coding of quantization pitch lags */
-  WebRtcIsac_EncHistMulti(streamdata, index, cdf, PITCH_SUBFRAMES);
-}
-
-
-
-/* Routines for in-band signaling of bandwidth estimation */
-/* Histograms based on uniform distribution of indices */
-/* Move global variables later! */
-
-
-/* cdf array for frame length indicator */
-const uint16_t WebRtcIsac_kFrameLengthCdf[4] = {
-    0, 21845, 43690, 65535 };
-
-/* pointer to cdf array for frame length indicator */
-const uint16_t* WebRtcIsac_kFrameLengthCdf_ptr[1] = {
-    WebRtcIsac_kFrameLengthCdf };
-
-/* initial cdf index for decoder of frame length indicator */
-const uint16_t WebRtcIsac_kFrameLengthInitIndex[1] = { 1 };
-
-
-int WebRtcIsac_DecodeFrameLen(Bitstr* streamdata, int16_t* framesamples) {
-  int frame_mode, err;
-  err = 0;
-  /* entropy decoding of frame length [1:30ms,2:60ms] */
-  err = WebRtcIsac_DecHistOneStepMulti(&frame_mode, streamdata,
-                                       WebRtcIsac_kFrameLengthCdf_ptr,
-                                       WebRtcIsac_kFrameLengthInitIndex, 1);
-  if (err < 0)
-    return -ISAC_RANGE_ERROR_DECODE_FRAME_LENGTH;
-
-  switch (frame_mode) {
-    case 1:
-      *framesamples = 480; /* 30ms */
-      break;
-    case 2:
-      *framesamples = 960; /* 60ms */
-      break;
-    default:
-      err = -ISAC_DISALLOWED_FRAME_MODE_DECODER;
-  }
-  return err;
-}
-
-int WebRtcIsac_EncodeFrameLen(int16_t framesamples, Bitstr* streamdata) {
-  int frame_mode, status;
-
-  status = 0;
-  frame_mode = 0;
-  /* entropy coding of frame length [1:480 samples,2:960 samples] */
-  switch (framesamples) {
-    case 480:
-      frame_mode = 1;
-      break;
-    case 960:
-      frame_mode = 2;
-      break;
-    default:
-      status = - ISAC_DISALLOWED_FRAME_MODE_ENCODER;
-  }
-
-  if (status < 0)
-    return status;
-
-  WebRtcIsac_EncHistMulti(streamdata, &frame_mode,
-                          WebRtcIsac_kFrameLengthCdf_ptr, 1);
-  return status;
-}
-
-/* cdf array for estimated bandwidth */
-static const uint16_t kBwCdf[25] = {
-    0, 2731, 5461, 8192, 10923, 13653, 16384, 19114, 21845, 24576, 27306, 30037,
-    32768, 35498, 38229, 40959, 43690, 46421, 49151, 51882, 54613, 57343, 60074,
-    62804, 65535 };
-
-/* pointer to cdf array for estimated bandwidth */
-static const uint16_t* const kBwCdfPtr[1] = { kBwCdf };
-
-/* initial cdf index for decoder of estimated bandwidth*/
-static const uint16_t kBwInitIndex[1] = { 7 };
-
-
-int WebRtcIsac_DecodeSendBW(Bitstr* streamdata, int16_t* BWno) {
-  int BWno32, err;
-
-  /* entropy decoding of sender's BW estimation [0..23] */
-  err = WebRtcIsac_DecHistOneStepMulti(&BWno32, streamdata, kBwCdfPtr,
-                                       kBwInitIndex, 1);
-  if (err < 0) {
-    return -ISAC_RANGE_ERROR_DECODE_BANDWIDTH;
-  }
-  *BWno = (int16_t)BWno32;
-  return err;
-}
-
-void WebRtcIsac_EncodeReceiveBw(int* BWno, Bitstr* streamdata) {
-  /* entropy encoding of receiver's BW estimation [0..23] */
-  WebRtcIsac_EncHistMulti(streamdata, BWno, kBwCdfPtr, 1);
-}
-
-
-/* estimate code length of LPC Coef */
-void WebRtcIsac_TranscodeLPCCoef(double* LPCCoef_lo, double* LPCCoef_hi,
-                                 int* index_g) {
-  int j, k, n, pos, pos2, posg, offsg, offs2;
-  int index_ovr_g[KLT_ORDER_GAIN];
-  double tmpcoeffs_g[KLT_ORDER_GAIN];
-  double tmpcoeffs2_g[KLT_ORDER_GAIN];
-  double sum;
-
-  /* log gains, mean removal and scaling */
-  posg = 0;
-  for (k = 0; k < SUBFRAMES; k++) {
-    tmpcoeffs_g[posg] = log(LPCCoef_lo[(LPC_LOBAND_ORDER + 1) * k]);
-    tmpcoeffs_g[posg] -= WebRtcIsac_kLpcMeansGain[posg];
-    tmpcoeffs_g[posg] *= LPC_GAIN_SCALE;
-    posg++;
-    tmpcoeffs_g[posg] = log(LPCCoef_hi[(LPC_HIBAND_ORDER + 1) * k]);
-    tmpcoeffs_g[posg] -= WebRtcIsac_kLpcMeansGain[posg];
-    tmpcoeffs_g[posg] *= LPC_GAIN_SCALE;
-    posg++;
-  }
-
-  /* KLT  */
-
-  /* Left transform. */
-  offsg = 0;
-  for (j = 0; j < SUBFRAMES; j++) {
-    posg = offsg;
-    for (k = 0; k < LPC_GAIN_ORDER; k++) {
-      sum = 0;
-      pos = offsg;
-      pos2 = k;
-      for (n = 0; n < LPC_GAIN_ORDER; n++) {
-        sum += tmpcoeffs_g[pos++] * WebRtcIsac_kKltT1Gain[pos2];
-        pos2 += LPC_GAIN_ORDER;
-      }
-      tmpcoeffs2_g[posg++] = sum;
-    }
-    offsg += LPC_GAIN_ORDER;
-  }
-
-  /* Right transform. */
-  offsg = 0;
-  offs2 = 0;
-  for (j = 0; j < SUBFRAMES; j++) {
-    posg = offsg;
-    for (k = 0; k < LPC_GAIN_ORDER; k++) {
-      sum = 0;
-      pos = k;
-      pos2 = offs2;
-      for (n = 0; n < SUBFRAMES; n++) {
-        sum += tmpcoeffs2_g[pos] * WebRtcIsac_kKltT2Gain[pos2++];
-        pos += LPC_GAIN_ORDER;
-      }
-      tmpcoeffs_g[posg++] = sum;
-    }
-    offs2 += SUBFRAMES;
-    offsg += LPC_GAIN_ORDER;
-  }
-
-
-  /* quantize coefficients */
-  for (k = 0; k < KLT_ORDER_GAIN; k++) {
-    /* Get index. */
-    pos2 = WebRtcIsac_lrint(tmpcoeffs_g[k] / KLT_STEPSIZE);
-    index_g[k] = (pos2) + WebRtcIsac_kQKltQuantMinGain[k];
-    if (index_g[k] < 0) {
-      index_g[k] = 0;
-    } else if (index_g[k] > WebRtcIsac_kQKltMaxIndGain[k]) {
-      index_g[k] = WebRtcIsac_kQKltMaxIndGain[k];
-    }
-    index_ovr_g[k] = WebRtcIsac_kQKltOffsetGain[k] + index_g[k];
-
-    /* find quantization levels for coefficients */
-    tmpcoeffs_g[k] = WebRtcIsac_kQKltLevelsGain[index_ovr_g[k]];
-  }
-}
-
-
-/* Decode & de-quantize LPC Coefficients. */
-int WebRtcIsac_DecodeLpcCoefUB(Bitstr* streamdata, double* lpcVecs,
-                               double* percepFilterGains,
-                               int16_t bandwidth) {
-  int  index_s[KLT_ORDER_SHAPE];
-
-  double U[UB_LPC_ORDER * UB16_LPC_VEC_PER_FRAME];
-  int err;
-
-  /* Entropy decoding of quantization indices. */
-  switch (bandwidth) {
-    case isac12kHz: {
-      err = WebRtcIsac_DecHistOneStepMulti(
-          index_s, streamdata, WebRtcIsac_kLpcShapeCdfMatUb12,
-          WebRtcIsac_kLpcShapeEntropySearchUb12, UB_LPC_ORDER *
-          UB_LPC_VEC_PER_FRAME);
-      break;
-    }
-    case isac16kHz: {
-      err = WebRtcIsac_DecHistOneStepMulti(
-          index_s, streamdata, WebRtcIsac_kLpcShapeCdfMatUb16,
-          WebRtcIsac_kLpcShapeEntropySearchUb16, UB_LPC_ORDER *
-          UB16_LPC_VEC_PER_FRAME);
-      break;
-    }
-    default:
-      return -1;
-  }
-
-  if (err < 0) {
-    return err;
-  }
-
-  WebRtcIsac_DequantizeLpcParam(index_s, lpcVecs, bandwidth);
-  WebRtcIsac_CorrelateInterVec(lpcVecs, U, bandwidth);
-  WebRtcIsac_CorrelateIntraVec(U, lpcVecs, bandwidth);
-  WebRtcIsac_AddLarMean(lpcVecs, bandwidth);
-  WebRtcIsac_DecodeLpcGainUb(percepFilterGains, streamdata);
-
-  if (bandwidth == isac16kHz) {
-    /* Decode another set of Gains. */
-    WebRtcIsac_DecodeLpcGainUb(&percepFilterGains[SUBFRAMES], streamdata);
-  }
-  return 0;
-}
-
-int16_t WebRtcIsac_EncodeBandwidth(enum ISACBandwidth bandwidth,
-                                   Bitstr* streamData) {
-  int bandwidthMode;
-  switch (bandwidth) {
-    case isac12kHz: {
-      bandwidthMode = 0;
-      break;
-    }
-    case isac16kHz: {
-      bandwidthMode = 1;
-      break;
-    }
-    default:
-      return -ISAC_DISALLOWED_ENCODER_BANDWIDTH;
-  }
-  WebRtcIsac_EncHistMulti(streamData, &bandwidthMode, kOneBitEqualProbCdf_ptr,
-                          1);
-  return 0;
-}
-
-int16_t WebRtcIsac_DecodeBandwidth(Bitstr* streamData,
-                                   enum ISACBandwidth* bandwidth) {
-  int bandwidthMode;
-  if (WebRtcIsac_DecHistOneStepMulti(&bandwidthMode, streamData,
-                                     kOneBitEqualProbCdf_ptr,
-                                     kOneBitEqualProbInitIndex, 1) < 0) {
-    return -ISAC_RANGE_ERROR_DECODE_BANDWITH;
-  }
-  switch (bandwidthMode) {
-    case 0: {
-      *bandwidth = isac12kHz;
-      break;
-    }
-    case 1: {
-      *bandwidth = isac16kHz;
-      break;
-    }
-    default:
-      return -ISAC_DISALLOWED_BANDWIDTH_MODE_DECODER;
-  }
-  return 0;
-}
-
-int16_t WebRtcIsac_EncodeJitterInfo(int32_t jitterIndex,
-                                    Bitstr* streamData) {
-  /* This is to avoid LINUX warning until we change 'int' to 'Word32'. */
-  int intVar;
-
-  if ((jitterIndex < 0) || (jitterIndex > 1)) {
-    return -1;
-  }
-  intVar = (int)(jitterIndex);
-  /* Use the same CDF table as for bandwidth
-   * both take two values with equal probability.*/
-  WebRtcIsac_EncHistMulti(streamData, &intVar, kOneBitEqualProbCdf_ptr, 1);
-  return 0;
-}
-
-int16_t WebRtcIsac_DecodeJitterInfo(Bitstr* streamData,
-                                    int32_t* jitterInfo) {
-  int intVar;
-  /* Use the same CDF table as for bandwidth
-   * both take two values with equal probability. */
-  if (WebRtcIsac_DecHistOneStepMulti(&intVar, streamData,
-                                     kOneBitEqualProbCdf_ptr,
-                                     kOneBitEqualProbInitIndex, 1) < 0) {
-    return -ISAC_RANGE_ERROR_DECODE_BANDWITH;
-  }
-  *jitterInfo = (int16_t)(intVar);
-  return 0;
-}
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_coding/codecs/isac/main/source/entropy_coding.h b/submodules/libtgvoip/webrtc_dsp/modules/audio_coding/codecs/isac/main/source/entropy_coding.h
deleted file mode 100644
index 6c2b8d3cc1..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_coding/codecs/isac/main/source/entropy_coding.h
+++ /dev/null
@@ -1,347 +0,0 @@
-/*
- *  Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-/*
- * entropy_coding.h
- *
- * This header file declares all of the functions used to arithmetically
- * encode the iSAC bistream
- *
- */
-
-#ifndef MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_ENTROPY_CODING_H_
-#define MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_ENTROPY_CODING_H_
-
-#include "modules/audio_coding/codecs/isac/main/source/settings.h"
-#include "modules/audio_coding/codecs/isac/main/source/structs.h"
-
-/******************************************************************************
- * WebRtcIsac_DecodeSpec()
- * Decode real and imaginary part of the DFT coefficients, given a bit-stream.
- * The decoded DFT coefficient can be transformed to time domain by
- * WebRtcIsac_Time2Spec().
- *
- * Input:
- *  - streamdata            : pointer to a stucture containg the encoded
- *                            data and theparameters needed for entropy
- *                            coding.
- *  - AvgPitchGain_Q12      : average pitch-gain of the frame. This is only
- *                            relevant for 0-4 kHz band, and the input value is
- *                            not used in other bands.
- *  - band                  : specifies which band's DFT should be decoded.
- *
- * Output:
- *   - *fr                  : pointer to a buffer where the real part of DFT
- *                            coefficients are written to.
- *   - *fi                  : pointer to a buffer where the imaginary part
- *                            of DFT coefficients are written to.
- *
- * Return value             : < 0 if an error occures
- *                              0 if succeeded.
- */
-int WebRtcIsac_DecodeSpec(Bitstr* streamdata,
-                          int16_t AvgPitchGain_Q12,
-                          enum ISACBand band,
-                          double* fr,
-                          double* fi);
-
-/******************************************************************************
- * WebRtcIsac_EncodeSpec()
- * Encode real and imaginary part of the DFT coefficients into the given
- * bit-stream.
- *
- * Input:
- *  - *fr                   : pointer to a buffer where the real part of DFT
- *                            coefficients are written to.
- *  - *fi                   : pointer to a buffer where the imaginary part
- *                            of DFT coefficients are written to.
- *  - AvgPitchGain_Q12      : average pitch-gain of the frame. This is only
- *                            relevant for 0-4 kHz band, and the input value is
- *                            not used in other bands.
- *  - band                  : specifies which band's DFT should be decoded.
- *
- * Output:
- *  - streamdata            : pointer to a stucture containg the encoded
- *                            data and theparameters needed for entropy
- *                            coding.
- *
- * Return value             : < 0 if an error occures
- *                              0 if succeeded.
- */
-int WebRtcIsac_EncodeSpec(const int16_t* fr,
-                          const int16_t* fi,
-                          int16_t AvgPitchGain_Q12,
-                          enum ISACBand band,
-                          Bitstr* streamdata);
-
-/* decode & dequantize LPC Coef */
-int WebRtcIsac_DecodeLpcCoef(Bitstr* streamdata, double* LPCCoef);
-int WebRtcIsac_DecodeLpcCoefUB(Bitstr* streamdata,
-                               double* lpcVecs,
-                               double* percepFilterGains,
-                               int16_t bandwidth);
-
-int WebRtcIsac_DecodeLpc(Bitstr* streamdata,
-                         double* LPCCoef_lo,
-                         double* LPCCoef_hi);
-
-/* quantize & code LPC Coef */
-void WebRtcIsac_EncodeLpcLb(double* LPCCoef_lo,
-                            double* LPCCoef_hi,
-                            Bitstr* streamdata,
-                            IsacSaveEncoderData* encData);
-
-void WebRtcIsac_EncodeLpcGainLb(double* LPCCoef_lo,
-                                double* LPCCoef_hi,
-                                Bitstr* streamdata,
-                                IsacSaveEncoderData* encData);
-
-/******************************************************************************
- * WebRtcIsac_EncodeLpcUB()
- * Encode LPC parameters, given as A-polynomial, of upper-band. The encoding
- * is performed in LAR domain.
- * For the upper-band, we compute and encode LPC of some sub-frames, LPC of
- * other sub-frames are computed by linear interpolation, in LAR domain. This
- * function performs the interpolation and returns the LPC of all sub-frames.
- *
- * Inputs:
- *  - lpcCoef               : a buffer containing A-polynomials of sub-frames
- *                            (excluding first coefficient that is 1).
- *  - bandwidth             : specifies if the codec is operating at 0-12 kHz
- *                            or 0-16 kHz mode.
- *
- * Input/output:
- *  - streamdata            : pointer to a structure containing the encoded
- *                            data and the parameters needed for entropy
- *                            coding.
- *
- * Output:
- *  - interpolLPCCoeff      : Decoded and interpolated LPC (A-polynomial)
- *                            of all sub-frames.
- *                            If LP analysis is of order K, and there are N
- *                            sub-frames then this is a buffer of size
- *                            (k + 1) * N, each vector starts with the LPC gain
- *                            of the corresponding sub-frame. The LPC gains
- *                            are encoded and inserted after this function is
- *                            called. The first A-coefficient which is 1 is not
- *                            included.
- *
- * Return value             : 0 if encoding is successful,
- *                           <0 if failed to encode.
- */
-int16_t WebRtcIsac_EncodeLpcUB(double* lpcCoeff,
-                               Bitstr* streamdata,
-                               double* interpolLPCCoeff,
-                               int16_t bandwidth,
-                               ISACUBSaveEncDataStruct* encData);
-
-/******************************************************************************
- * WebRtcIsac_DecodeInterpolLpcUb()
- * Decode LPC coefficients and interpolate to get the coefficients fo all
- * sub-frmaes.
- *
- * Inputs:
- *  - bandwidth             : spepecifies if the codec is in 0-12 kHz or
- *                            0-16 kHz mode.
- *
- * Input/output:
- *  - streamdata            : pointer to a stucture containg the encoded
- *                            data and theparameters needed for entropy
- *                            coding.
- *
- * Output:
- *  - percepFilterParam     : Decoded and interpolated LPC (A-polynomial) of
- *                            all sub-frames.
- *                            If LP analysis is of order K, and there are N
- *                            sub-frames then this is a buffer of size
- *                            (k + 1) * N, each vector starts with the LPC gain
- *                            of the corresponding sub-frame. The LPC gains
- *                            are encoded and inserted after this function is
- *                            called. The first A-coefficient which is 1 is not
- *                            included.
- *
- * Return value             : 0 if encoding is successful,
- *                           <0 if failed to encode.
- */
-int16_t WebRtcIsac_DecodeInterpolLpcUb(Bitstr* streamdata,
-                                       double* percepFilterParam,
-                                       int16_t bandwidth);
-
-/* Decode & dequantize RC */
-int WebRtcIsac_DecodeRc(Bitstr* streamdata, int16_t* RCQ15);
-
-/* Quantize & code RC */
-void WebRtcIsac_EncodeRc(int16_t* RCQ15, Bitstr* streamdata);
-
-/* Decode & dequantize squared Gain */
-int WebRtcIsac_DecodeGain2(Bitstr* streamdata, int32_t* Gain2);
-
-/* Quantize & code squared Gain (input is squared gain) */
-int WebRtcIsac_EncodeGain2(int32_t* gain2, Bitstr* streamdata);
-
-void WebRtcIsac_EncodePitchGain(int16_t* PitchGains_Q12,
-                                Bitstr* streamdata,
-                                IsacSaveEncoderData* encData);
-
-void WebRtcIsac_EncodePitchLag(double* PitchLags,
-                               int16_t* PitchGain_Q12,
-                               Bitstr* streamdata,
-                               IsacSaveEncoderData* encData);
-
-int WebRtcIsac_DecodePitchGain(Bitstr* streamdata, int16_t* PitchGain_Q12);
-int WebRtcIsac_DecodePitchLag(Bitstr* streamdata,
-                              int16_t* PitchGain_Q12,
-                              double* PitchLag);
-
-int WebRtcIsac_DecodeFrameLen(Bitstr* streamdata, int16_t* framelength);
-int WebRtcIsac_EncodeFrameLen(int16_t framelength, Bitstr* streamdata);
-int WebRtcIsac_DecodeSendBW(Bitstr* streamdata, int16_t* BWno);
-void WebRtcIsac_EncodeReceiveBw(int* BWno, Bitstr* streamdata);
-
-/* Step-down */
-void WebRtcIsac_Poly2Rc(double* a, int N, double* RC);
-
-/* Step-up */
-void WebRtcIsac_Rc2Poly(double* RC, int N, double* a);
-
-void WebRtcIsac_TranscodeLPCCoef(double* LPCCoef_lo,
-                                 double* LPCCoef_hi,
-                                 int* index_g);
-
-/******************************************************************************
- * WebRtcIsac_EncodeLpcGainUb()
- * Encode LPC gains of sub-Frames.
- *
- * Input/outputs:
- *  - lpGains               : a buffer which contains 'SUBFRAME' number of
- *                            LP gains to be encoded. The input values are
- *                            overwritten by the quantized values.
- *  - streamdata            : pointer to a stucture containg the encoded
- *                            data and theparameters needed for entropy
- *                            coding.
- *
- * Output:
- *  - lpcGainIndex          : quantization indices for lpc gains, these will
- *                            be stored to be used  for FEC.
- */
-void WebRtcIsac_EncodeLpcGainUb(double* lpGains,
-                                Bitstr* streamdata,
-                                int* lpcGainIndex);
-
-/******************************************************************************
- * WebRtcIsac_EncodeLpcGainUb()
- * Store LPC gains of sub-Frames in 'streamdata'.
- *
- * Input:
- *  - lpGains               : a buffer which contains 'SUBFRAME' number of
- *                            LP gains to be encoded.
- * Input/outputs:
- *  - streamdata            : pointer to a stucture containg the encoded
- *                            data and theparameters needed for entropy
- *                            coding.
- *
- */
-void WebRtcIsac_StoreLpcGainUb(double* lpGains, Bitstr* streamdata);
-
-/******************************************************************************
- * WebRtcIsac_DecodeLpcGainUb()
- * Decode the LPC gain of sub-frames.
- *
- * Input/output:
- *  - streamdata            : pointer to a stucture containg the encoded
- *                            data and theparameters needed for entropy
- *                            coding.
- *
- * Output:
- *  - lpGains               : a buffer where decoded LPC gians will be stored.
- *
- * Return value             : 0 if succeeded.
- *                           <0 if failed.
- */
-int16_t WebRtcIsac_DecodeLpcGainUb(double* lpGains, Bitstr* streamdata);
-
-/******************************************************************************
- * WebRtcIsac_EncodeBandwidth()
- * Encode if the bandwidth of encoded audio is 0-12 kHz or 0-16 kHz.
- *
- * Input:
- *  - bandwidth             : an enumerator specifying if the codec in is
- *                            0-12 kHz or 0-16 kHz mode.
- *
- * Input/output:
- *  - streamdata            : pointer to a stucture containg the encoded
- *                            data and theparameters needed for entropy
- *                            coding.
- *
- * Return value             : 0 if succeeded.
- *                           <0 if failed.
- */
-int16_t WebRtcIsac_EncodeBandwidth(enum ISACBandwidth bandwidth,
-                                   Bitstr* streamData);
-
-/******************************************************************************
- * WebRtcIsac_DecodeBandwidth()
- * Decode the bandwidth of the encoded audio, i.e. if the bandwidth is 0-12 kHz
- * or 0-16 kHz.
- *
- * Input/output:
- *  - streamdata            : pointer to a stucture containg the encoded
- *                            data and theparameters needed for entropy
- *                            coding.
- *
- * Output:
- *  - bandwidth             : an enumerator specifying if the codec is in
- *                            0-12 kHz or 0-16 kHz mode.
- *
- * Return value             : 0 if succeeded.
- *                           <0 if failed.
- */
-int16_t WebRtcIsac_DecodeBandwidth(Bitstr* streamData,
-                                   enum ISACBandwidth* bandwidth);
-
-/******************************************************************************
- * WebRtcIsac_EncodeJitterInfo()
- * Decode the jitter information.
- *
- * Input/output:
- *  - streamdata            : pointer to a stucture containg the encoded
- *                            data and theparameters needed for entropy
- *                            coding.
- *
- * Input:
- *  - jitterInfo            : one bit of info specifying if the channel is
- *                            in high/low jitter. Zero indicates low jitter
- *                            and one indicates high jitter.
- *
- * Return value             : 0 if succeeded.
- *                           <0 if failed.
- */
-int16_t WebRtcIsac_EncodeJitterInfo(int32_t jitterIndex, Bitstr* streamData);
-
-/******************************************************************************
- * WebRtcIsac_DecodeJitterInfo()
- * Decode the jitter information.
- *
- * Input/output:
- *  - streamdata            : pointer to a stucture containg the encoded
- *                            data and theparameters needed for entropy
- *                            coding.
- *
- * Output:
- *  - jitterInfo            : one bit of info specifying if the channel is
- *                            in high/low jitter. Zero indicates low jitter
- *                            and one indicates high jitter.
- *
- * Return value             : 0 if succeeded.
- *                           <0 if failed.
- */
-int16_t WebRtcIsac_DecodeJitterInfo(Bitstr* streamData, int32_t* jitterInfo);
-
-#endif /* MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_ENTROPY_CODING_H_ */
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_coding/codecs/isac/main/source/filter_functions.c b/submodules/libtgvoip/webrtc_dsp/modules/audio_coding/codecs/isac/main/source/filter_functions.c
deleted file mode 100644
index a4f297c5a1..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_coding/codecs/isac/main/source/filter_functions.c
+++ /dev/null
@@ -1,195 +0,0 @@
-/*
- *  Copyright (c) 2011 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#include <memory.h>
-#include <string.h>
-#ifdef WEBRTC_ANDROID
-#include <stdlib.h>
-#endif
-
-#include "modules/audio_coding/codecs/isac/main/source/pitch_estimator.h"
-#include "modules/audio_coding/codecs/isac/main/source/isac_vad.h"
-
-static void WebRtcIsac_AllPoleFilter(double* InOut,
-                                     double* Coef,
-                                     size_t lengthInOut,
-                                     int orderCoef) {
-  /* the state of filter is assumed to be in InOut[-1] to InOut[-orderCoef] */
-  double scal;
-  double sum;
-  size_t n;
-  int k;
-
-  //if (fabs(Coef[0]-1.0)<0.001) {
-  if ( (Coef[0] > 0.9999) && (Coef[0] < 1.0001) )
-  {
-    for(n = 0; n < lengthInOut; n++)
-    {
-      sum = Coef[1] * InOut[-1];
-      for(k = 2; k <= orderCoef; k++){
-        sum += Coef[k] * InOut[-k];
-      }
-      *InOut++ -= sum;
-    }
-  }
-  else
-  {
-    scal = 1.0 / Coef[0];
-    for(n=0;n<lengthInOut;n++)
-    {
-      *InOut *= scal;
-      for(k=1;k<=orderCoef;k++){
-        *InOut -= scal*Coef[k]*InOut[-k];
-      }
-      InOut++;
-    }
-  }
-}
-
-static void WebRtcIsac_AllZeroFilter(double* In,
-                                     double* Coef,
-                                     size_t lengthInOut,
-                                     int orderCoef,
-                                     double* Out) {
-  /* the state of filter is assumed to be in In[-1] to In[-orderCoef] */
-
-  size_t n;
-  int k;
-  double tmp;
-
-  for(n = 0; n < lengthInOut; n++)
-  {
-    tmp = In[0] * Coef[0];
-
-    for(k = 1; k <= orderCoef; k++){
-      tmp += Coef[k] * In[-k];
-    }
-
-    *Out++ = tmp;
-    In++;
-  }
-}
-
-static void WebRtcIsac_ZeroPoleFilter(double* In,
-                                      double* ZeroCoef,
-                                      double* PoleCoef,
-                                      size_t lengthInOut,
-                                      int orderCoef,
-                                      double* Out) {
-  /* the state of the zero section is assumed to be in In[-1] to In[-orderCoef] */
-  /* the state of the pole section is assumed to be in Out[-1] to Out[-orderCoef] */
-
-  WebRtcIsac_AllZeroFilter(In,ZeroCoef,lengthInOut,orderCoef,Out);
-  WebRtcIsac_AllPoleFilter(Out,PoleCoef,lengthInOut,orderCoef);
-}
-
-
-void WebRtcIsac_AutoCorr(double* r, const double* x, size_t N, size_t order) {
-  size_t  lag, n;
-  double sum, prod;
-  const double *x_lag;
-
-  for (lag = 0; lag <= order; lag++)
-  {
-    sum = 0.0f;
-    x_lag = &x[lag];
-    prod = x[0] * x_lag[0];
-    for (n = 1; n < N - lag; n++) {
-      sum += prod;
-      prod = x[n] * x_lag[n];
-    }
-    sum += prod;
-    r[lag] = sum;
-  }
-
-}
-
-static void WebRtcIsac_BwExpand(double* out,
-                                double* in,
-                                double coef,
-                                size_t length) {
-  size_t i;
-  double  chirp;
-
-  chirp = coef;
-
-  out[0] = in[0];
-  for (i = 1; i < length; i++) {
-    out[i] = chirp * in[i];
-    chirp *= coef;
-  }
-}
-
-void WebRtcIsac_WeightingFilter(const double* in,
-                                double* weiout,
-                                double* whiout,
-                                WeightFiltstr* wfdata) {
-  double  tmpbuffer[PITCH_FRAME_LEN + PITCH_WLPCBUFLEN];
-  double  corr[PITCH_WLPCORDER+1], rc[PITCH_WLPCORDER+1];
-  double apol[PITCH_WLPCORDER+1], apolr[PITCH_WLPCORDER+1];
-  double  rho=0.9, *inp, *dp, *dp2;
-  double  whoutbuf[PITCH_WLPCBUFLEN + PITCH_WLPCORDER];
-  double  weoutbuf[PITCH_WLPCBUFLEN + PITCH_WLPCORDER];
-  double  *weo, *who, opol[PITCH_WLPCORDER+1], ext[PITCH_WLPCWINLEN];
-  int     k, n, endpos, start;
-
-  /* Set up buffer and states */
-  memcpy(tmpbuffer, wfdata->buffer, sizeof(double) * PITCH_WLPCBUFLEN);
-  memcpy(tmpbuffer+PITCH_WLPCBUFLEN, in, sizeof(double) * PITCH_FRAME_LEN);
-  memcpy(wfdata->buffer, tmpbuffer+PITCH_FRAME_LEN, sizeof(double) * PITCH_WLPCBUFLEN);
-
-  dp=weoutbuf;
-  dp2=whoutbuf;
-  for (k=0;k<PITCH_WLPCORDER;k++) {
-    *dp++ = wfdata->weostate[k];
-    *dp2++ = wfdata->whostate[k];
-    opol[k]=0.0;
-  }
-  opol[0]=1.0;
-  opol[PITCH_WLPCORDER]=0.0;
-  weo=dp;
-  who=dp2;
-
-  endpos=PITCH_WLPCBUFLEN + PITCH_SUBFRAME_LEN;
-  inp=tmpbuffer + PITCH_WLPCBUFLEN;
-
-  for (n=0; n<PITCH_SUBFRAMES; n++) {
-    /* Windowing */
-    start=endpos-PITCH_WLPCWINLEN;
-    for (k=0; k<PITCH_WLPCWINLEN; k++) {
-      ext[k]=wfdata->window[k]*tmpbuffer[start+k];
-    }
-
-    /* Get LPC polynomial */
-    WebRtcIsac_AutoCorr(corr, ext, PITCH_WLPCWINLEN, PITCH_WLPCORDER);
-    corr[0]=1.01*corr[0]+1.0; /* White noise correction */
-    WebRtcIsac_LevDurb(apol, rc, corr, PITCH_WLPCORDER);
-    WebRtcIsac_BwExpand(apolr, apol, rho, PITCH_WLPCORDER+1);
-
-    /* Filtering */
-    WebRtcIsac_ZeroPoleFilter(inp, apol, apolr, PITCH_SUBFRAME_LEN, PITCH_WLPCORDER, weo);
-    WebRtcIsac_ZeroPoleFilter(inp, apolr, opol, PITCH_SUBFRAME_LEN, PITCH_WLPCORDER, who);
-
-    inp+=PITCH_SUBFRAME_LEN;
-    endpos+=PITCH_SUBFRAME_LEN;
-    weo+=PITCH_SUBFRAME_LEN;
-    who+=PITCH_SUBFRAME_LEN;
-  }
-
-  /* Export filter states */
-  for (k=0;k<PITCH_WLPCORDER;k++) {
-    wfdata->weostate[k]=weoutbuf[PITCH_FRAME_LEN+k];
-    wfdata->whostate[k]=whoutbuf[PITCH_FRAME_LEN+k];
-  }
-
-  /* Export output data */
-  memcpy(weiout, weoutbuf+PITCH_WLPCORDER, sizeof(double) * PITCH_FRAME_LEN);
-  memcpy(whiout, whoutbuf+PITCH_WLPCORDER, sizeof(double) * PITCH_FRAME_LEN);
-}
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_coding/codecs/isac/main/source/filter_functions.h b/submodules/libtgvoip/webrtc_dsp/modules/audio_coding/codecs/isac/main/source/filter_functions.h
deleted file mode 100644
index 48a9b7426b..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_coding/codecs/isac/main/source/filter_functions.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- *  Copyright (c) 2018 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#ifndef MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_FILTER_FUNCTIONS_H_
-#define MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_FILTER_FUNCTIONS_H_
-
-#include "modules/audio_coding/codecs/isac/main/source/structs.h"
-
-void WebRtcIsac_AutoCorr(double* r, const double* x, size_t N, size_t order);
-
-void WebRtcIsac_WeightingFilter(const double* in,
-                                double* weiout,
-                                double* whiout,
-                                WeightFiltstr* wfdata);
-
-#endif  // MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_FILTER_FUNCTIONS_H_
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_coding/codecs/isac/main/source/filterbanks.c b/submodules/libtgvoip/webrtc_dsp/modules/audio_coding/codecs/isac/main/source/filterbanks.c
deleted file mode 100644
index d57b55022d..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_coding/codecs/isac/main/source/filterbanks.c
+++ /dev/null
@@ -1,114 +0,0 @@
-/*
- *  Copyright (c) 2011 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-/*
- * filterbanks.c
- *
- * This file contains function WebRtcIsac_AllPassFilter2Float,
- * WebRtcIsac_SplitAndFilter, and WebRtcIsac_FilterAndCombine
- * which implement filterbanks that produce decimated lowpass and
- * highpass versions of a signal, and performs reconstruction.
- *
- */
-
-#include "modules/audio_coding/codecs/isac/main/source/settings.h"
-#include "modules/audio_coding/codecs/isac/main/source/codec.h"
-#include "modules/audio_coding/codecs/isac/main/source/isac_vad.h"
-
-/* Combining */
-
-/* HPstcoeff_out_1 = {a1, a2, b1 - b0 * a1, b2 - b0 * a2}; */
-static const float kHpStCoefOut1Float[4] =
-{-1.99701049409000f, 0.99714204490000f, 0.01701049409000f, -0.01704204490000f};
-
-/* HPstcoeff_out_2 = {a1, a2, b1 - b0 * a1, b2 - b0 * a2}; */
-static const float kHpStCoefOut2Float[4] =
-{-1.98645294509837f, 0.98672435560000f, 0.00645294509837f, -0.00662435560000f};
-
-
-/* Function WebRtcIsac_FilterAndCombine */
-/* This is a decoder function that takes the decimated
-   length FRAMESAMPLES_HALF input low-pass and
-   high-pass signals and creates a reconstructed fullband
-   output signal of length FRAMESAMPLES. WebRtcIsac_FilterAndCombine
-   is the sibling function of WebRtcIsac_SplitAndFilter */
-/* INPUTS:
-   inLP: a length FRAMESAMPLES_HALF array of input low-pass
-   samples.
-   inHP: a length FRAMESAMPLES_HALF array of input high-pass
-   samples.
-   postfiltdata: input data structure containing the filterbank
-   states from the previous decoding iteration.
-   OUTPUTS:
-   Out: a length FRAMESAMPLES array of output reconstructed
-   samples (fullband) based on the input low-pass and
-   high-pass signals.
-   postfiltdata: the input data structure containing the filterbank
-   states is updated for the next decoding iteration */
-void WebRtcIsac_FilterAndCombineFloat(float *InLP,
-                                      float *InHP,
-                                      float *Out,
-                                      PostFiltBankstr *postfiltdata)
-{
-  int k;
-  float tempin_ch1[FRAMESAMPLES+MAX_AR_MODEL_ORDER];
-  float tempin_ch2[FRAMESAMPLES+MAX_AR_MODEL_ORDER];
-  float ftmp, ftmp2;
-
-  /* Form the polyphase signals*/
-  for (k=0;k<FRAMESAMPLES_HALF;k++) {
-    tempin_ch1[k]=InLP[k]+InHP[k]; /* Construct a new upper channel signal*/
-    tempin_ch2[k]=InLP[k]-InHP[k]; /* Construct a new lower channel signal*/
-  }
-
-
-  /* all-pass filter the new upper channel signal. HOWEVER, use the all-pass filter factors
-     that were used as a lower channel at the encoding side.  So at the decoder, the
-     corresponding all-pass filter factors for each channel are swapped.*/
-  WebRtcIsac_AllPassFilter2Float(tempin_ch1, WebRtcIsac_kLowerApFactorsFloat,
-                                 FRAMESAMPLES_HALF, NUMBEROFCHANNELAPSECTIONS,postfiltdata->STATE_0_UPPER_float);
-
-  /* Now, all-pass filter the new lower channel signal. But since all-pass filter factors
-     at the decoder are swapped from the ones at the encoder, the 'upper' channel
-     all-pass filter factors (WebRtcIsac_kUpperApFactorsFloat) are used to filter this new
-     lower channel signal */
-  WebRtcIsac_AllPassFilter2Float(tempin_ch2, WebRtcIsac_kUpperApFactorsFloat,
-                                 FRAMESAMPLES_HALF, NUMBEROFCHANNELAPSECTIONS,postfiltdata->STATE_0_LOWER_float);
-
-
-  /* Merge outputs to form the full length output signal.*/
-  for (k=0;k<FRAMESAMPLES_HALF;k++) {
-    Out[2*k]=tempin_ch2[k];
-    Out[2*k+1]=tempin_ch1[k];
-  }
-
-
-  /* High pass filter */
-
-  for (k=0;k<FRAMESAMPLES;k++) {
-    ftmp2 = Out[k] + kHpStCoefOut1Float[2] * postfiltdata->HPstates1_float[0] +
-        kHpStCoefOut1Float[3] * postfiltdata->HPstates1_float[1];
-    ftmp = Out[k] - kHpStCoefOut1Float[0] * postfiltdata->HPstates1_float[0] -
-        kHpStCoefOut1Float[1] * postfiltdata->HPstates1_float[1];
-    postfiltdata->HPstates1_float[1] = postfiltdata->HPstates1_float[0];
-    postfiltdata->HPstates1_float[0] = ftmp;
-    Out[k] = ftmp2;
-  }
-
-  for (k=0;k<FRAMESAMPLES;k++) {
-    ftmp2 = Out[k] + kHpStCoefOut2Float[2] * postfiltdata->HPstates2_float[0] +
-        kHpStCoefOut2Float[3] * postfiltdata->HPstates2_float[1];
-    ftmp = Out[k] - kHpStCoefOut2Float[0] * postfiltdata->HPstates2_float[0] -
-        kHpStCoefOut2Float[1] * postfiltdata->HPstates2_float[1];
-    postfiltdata->HPstates2_float[1] = postfiltdata->HPstates2_float[0];
-    postfiltdata->HPstates2_float[0] = ftmp;
-    Out[k] = ftmp2;
-  }
-}
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_coding/codecs/isac/main/source/intialize.c b/submodules/libtgvoip/webrtc_dsp/modules/audio_coding/codecs/isac/main/source/intialize.c
deleted file mode 100644
index 5c951f6e9d..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_coding/codecs/isac/main/source/intialize.c
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- *  Copyright (c) 2011 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-/* encode.c  - Encoding function for the iSAC coder */
-
-#include <math.h>
-
-#include "modules/audio_coding/codecs/isac/main/source/structs.h"
-#include "modules/audio_coding/codecs/isac/main/source/codec.h"
-#include "modules/audio_coding/codecs/isac/main/source/pitch_estimator.h"
-
-void WebRtcIsac_InitMasking(MaskFiltstr *maskdata) {
-
-  int k;
-
-  for (k = 0; k < WINLEN; k++) {
-    maskdata->DataBufferLo[k] = 0.0;
-    maskdata->DataBufferHi[k] = 0.0;
-  }
-  for (k = 0; k < ORDERLO+1; k++) {
-    maskdata->CorrBufLo[k] = 0.0;
-    maskdata->PreStateLoF[k] = 0.0;
-    maskdata->PreStateLoG[k] = 0.0;
-    maskdata->PostStateLoF[k] = 0.0;
-    maskdata->PostStateLoG[k] = 0.0;
-  }
-  for (k = 0; k < ORDERHI+1; k++) {
-    maskdata->CorrBufHi[k] = 0.0;
-    maskdata->PreStateHiF[k] = 0.0;
-    maskdata->PreStateHiG[k] = 0.0;
-    maskdata->PostStateHiF[k] = 0.0;
-    maskdata->PostStateHiG[k] = 0.0;
-  }
-
-  maskdata->OldEnergy = 10.0;
-  return;
-}
-
-void WebRtcIsac_InitPostFilterbank(PostFiltBankstr *postfiltdata)
-{
-  int k;
-
-  for (k = 0; k < 2*POSTQORDER; k++) {
-    postfiltdata->STATE_0_LOWER[k] = 0;
-    postfiltdata->STATE_0_UPPER[k] = 0;
-
-    postfiltdata->STATE_0_LOWER_float[k] = 0;
-    postfiltdata->STATE_0_UPPER_float[k] = 0;
-  }
-
-  /* High pass filter states */
-  postfiltdata->HPstates1[0] = 0.0;
-  postfiltdata->HPstates1[1] = 0.0;
-
-  postfiltdata->HPstates2[0] = 0.0;
-  postfiltdata->HPstates2[1] = 0.0;
-
-  postfiltdata->HPstates1_float[0] = 0.0f;
-  postfiltdata->HPstates1_float[1] = 0.0f;
-
-  postfiltdata->HPstates2_float[0] = 0.0f;
-  postfiltdata->HPstates2_float[1] = 0.0f;
-
-  return;
-}
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_coding/codecs/isac/main/source/isac.c b/submodules/libtgvoip/webrtc_dsp/modules/audio_coding/codecs/isac/main/source/isac.c
deleted file mode 100644
index 866959691c..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_coding/codecs/isac/main/source/isac.c
+++ /dev/null
@@ -1,2378 +0,0 @@
-/*
- *  Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-/*
- * isac.c
- *
- * This C file contains the functions for the ISAC API
- *
- */
-
-#include "modules/audio_coding/codecs/isac/main/include/isac.h"
-
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "rtc_base/checks.h"
-#include "common_audio/signal_processing/include/signal_processing_library.h"
-#include "modules/audio_coding/codecs/isac/main/source/bandwidth_estimator.h"
-#include "modules/audio_coding/codecs/isac/main/source/codec.h"
-#include "modules/audio_coding/codecs/isac/main/source/crc.h"
-#include "modules/audio_coding/codecs/isac/main/source/entropy_coding.h"
-#include "modules/audio_coding/codecs/isac/main/source/lpc_shape_swb16_tables.h"
-#include "modules/audio_coding/codecs/isac/main/source/os_specific_inline.h"
-#include "modules/audio_coding/codecs/isac/main/source/structs.h"
-#include "modules/audio_coding/codecs/isac/main/source/isac_vad.h"
-#include "rtc_base/system/arch.h"
-
-#define BIT_MASK_DEC_INIT 0x0001
-#define BIT_MASK_ENC_INIT 0x0002
-
-#define LEN_CHECK_SUM_WORD8     4
-#define MAX_NUM_LAYERS         10
-
-
-/****************************************************************************
- * UpdatePayloadSizeLimit(...)
- *
- * Call this function to update the limit on the payload size. The limit on
- * payload size might change i) if a user ''directly changes the limit by
- * calling xxx_setMaxPayloadSize() or xxx_setMaxRate(), or ii) indirectly
- * when bandwidth is changing. The latter might be the result of bandwidth
- * adaptation, or direct change of the bottleneck in instantaneous mode.
- *
- * This function takes the current overall limit on payload, and translates it
- * to the limits on lower and upper-band. If the codec is in wideband mode,
- * then the overall limit and the limit on the lower-band is the same.
- * Otherwise, a fraction of the limit should be allocated to lower-band
- * leaving some room for the upper-band bit-stream. That is why an update
- * of limit is required every time that the bandwidth is changing.
- *
- */
-static void UpdatePayloadSizeLimit(ISACMainStruct* instISAC) {
-  int16_t lim30MsPayloadBytes = WEBRTC_SPL_MIN(
-                          (instISAC->maxPayloadSizeBytes),
-                          (instISAC->maxRateBytesPer30Ms));
-  int16_t lim60MsPayloadBytes = WEBRTC_SPL_MIN(
-                          (instISAC->maxPayloadSizeBytes),
-                          (instISAC->maxRateBytesPer30Ms << 1));
-
-  /* The only time that iSAC will have 60 ms
-   * frame-size is when operating in wideband, so
-   * there is no upper-band bit-stream. */
-
-  if (instISAC->bandwidthKHz == isac8kHz) {
-    /* At 8 kHz there is no upper-band bit-stream,
-     * therefore, the lower-band limit is the overall limit. */
-    instISAC->instLB.ISACencLB_obj.payloadLimitBytes60 =
-      lim60MsPayloadBytes;
-    instISAC->instLB.ISACencLB_obj.payloadLimitBytes30 =
-      lim30MsPayloadBytes;
-  } else {
-    /* When in super-wideband, we only have 30 ms frames.
-     * Do a rate allocation for the given limit. */
-    if (lim30MsPayloadBytes > 250) {
-      /* 4/5 to lower-band the rest for upper-band. */
-      instISAC->instLB.ISACencLB_obj.payloadLimitBytes30 =
-        (lim30MsPayloadBytes << 2) / 5;
-    } else if (lim30MsPayloadBytes > 200) {
-      /* For the interval of 200 to 250 the share of
-       * upper-band linearly grows from 20 to 50. */
-      instISAC->instLB.ISACencLB_obj.payloadLimitBytes30 =
-        (lim30MsPayloadBytes << 1) / 5 + 100;
-    } else {
-      /* Allocate only 20 for upper-band. */
-      instISAC->instLB.ISACencLB_obj.payloadLimitBytes30 =
-        lim30MsPayloadBytes - 20;
-    }
-    instISAC->instUB.ISACencUB_obj.maxPayloadSizeBytes =
-      lim30MsPayloadBytes;
-  }
-}
-
-
-/****************************************************************************
- * UpdateBottleneck(...)
- *
- * This function updates the bottleneck only if the codec is operating in
- * channel-adaptive mode. Furthermore, as the update of bottleneck might
- * result in an update of bandwidth, therefore, the bottlenech should be
- * updated just right before the first 10ms of a frame is pushed into encoder.
- *
- */
-static void UpdateBottleneck(ISACMainStruct* instISAC) {
-  /* Read the bottleneck from bandwidth estimator for the
-   * first 10 ms audio. This way, if there is a change
-   * in bandwidth, upper and lower-band will be in sync. */
-  if ((instISAC->codingMode == 0) &&
-      (instISAC->instLB.ISACencLB_obj.buffer_index == 0) &&
-      (instISAC->instLB.ISACencLB_obj.frame_nb == 0)) {
-    int32_t bottleneck =
-        WebRtcIsac_GetUplinkBandwidth(&instISAC->bwestimator_obj);
-
-    /* Adding hysteresis when increasing signal bandwidth. */
-    if ((instISAC->bandwidthKHz == isac8kHz)
-        && (bottleneck > 37000)
-        && (bottleneck < 41000)) {
-      bottleneck = 37000;
-    }
-
-    /* Switching from 12 kHz to 16 kHz is not allowed at this revision.
-     * If we let this happen, we have to take care of buffer_index and
-     * the last LPC vector. */
-    if ((instISAC->bandwidthKHz != isac16kHz) &&
-        (bottleneck > 46000)) {
-      bottleneck = 46000;
-    }
-
-    /* We might need a rate allocation. */
-    if (instISAC->encoderSamplingRateKHz == kIsacWideband) {
-      /* Wideband is the only choice we have here. */
-      instISAC->instLB.ISACencLB_obj.bottleneck =
-        (bottleneck > 32000) ? 32000 : bottleneck;
-      instISAC->bandwidthKHz = isac8kHz;
-    } else {
-      /* Do the rate-allocation and get the new bandwidth. */
-      enum ISACBandwidth bandwidth;
-      WebRtcIsac_RateAllocation(bottleneck,
-                                &(instISAC->instLB.ISACencLB_obj.bottleneck),
-                                &(instISAC->instUB.ISACencUB_obj.bottleneck),
-                                &bandwidth);
-      if (bandwidth != isac8kHz) {
-        instISAC->instLB.ISACencLB_obj.new_framelength = 480;
-      }
-      if (bandwidth != instISAC->bandwidthKHz) {
-        /* Bandwidth is changing. */
-        instISAC->bandwidthKHz = bandwidth;
-        UpdatePayloadSizeLimit(instISAC);
-        if (bandwidth == isac12kHz) {
-          instISAC->instLB.ISACencLB_obj.buffer_index = 0;
-        }
-        /* Currently we don't let the bandwidth to switch to 16 kHz
-         * if in adaptive mode. If we let this happen, we have to take
-         * care of buffer_index and the last LPC vector. */
-      }
-    }
-  }
-}
-
-
-/****************************************************************************
- * GetSendBandwidthInfo(...)
- *
- * This is called to get the bandwidth info. This info is the bandwidth and
- * the jitter of 'there-to-here' channel, estimated 'here.' These info
- * is signaled in an in-band fashion to the other side.
- *
- * The call to the bandwidth estimator triggers a recursive averaging which
- * has to be synchronized between encoder & decoder, therefore, the call to
- * BWE should be once per packet. As the BWE info is inserted into bit-stream
- * We need a valid info right before the encodeLB function is going to
- * generate a bit-stream. That is when lower-band buffer has already 20ms
- * of audio, and the 3rd block of 10ms is going to be injected into encoder.
- *
- * Inputs:
- *         - instISAC          : iSAC instance.
- *
- * Outputs:
- *         - bandwidthIndex    : an index which has to be encoded in
- *                               lower-band bit-stream, indicating the
- *                               bandwidth of there-to-here channel.
- *         - jitterInfo        : this indicates if the jitter is high
- *                               or low and it is encoded in upper-band
- *                               bit-stream.
- *
- */
-static void GetSendBandwidthInfo(ISACMainStruct* instISAC,
-                                 int16_t* bandwidthIndex,
-                                 int16_t* jitterInfo) {
-  if ((instISAC->instLB.ISACencLB_obj.buffer_index ==
-      (FRAMESAMPLES_10ms << 1)) &&
-      (instISAC->instLB.ISACencLB_obj.frame_nb == 0)) {
-    /* Bandwidth estimation and coding. */
-    WebRtcIsac_GetDownlinkBwJitIndexImpl(&(instISAC->bwestimator_obj),
-                                         bandwidthIndex, jitterInfo,
-                                         instISAC->decoderSamplingRateKHz);
-  }
-}
-
-
-/****************************************************************************
- * WebRtcIsac_AssignSize(...)
- *
- * This function returns the size of the ISAC instance, so that the instance
- * can be created out side iSAC.
- *
- * Output:
- *        - sizeinbytes       : number of bytes needed to allocate for the
- *                              instance.
- *
- * Return value               : 0 - Ok
- *                             -1 - Error
- */
-int16_t WebRtcIsac_AssignSize(int* sizeInBytes) {
-  *sizeInBytes = sizeof(ISACMainStruct) * 2 / sizeof(int16_t);
-  return 0;
-}
-
-
-/****************************************************************************
- * WebRtcIsac_Assign(...)
- *
- * This function assigns the memory already created to the ISAC instance.
- *
- * Input:
- *        - ISAC_main_inst    : address of the pointer to the coder instance.
- *        - instISAC_Addr     : the already allocated memory, where we put the
- *                              iSAC structure.
- *
- * Return value               : 0 - Ok
- *                             -1 - Error
- */
-int16_t WebRtcIsac_Assign(ISACStruct** ISAC_main_inst,
-                          void* instISAC_Addr) {
-  if (instISAC_Addr != NULL) {
-    ISACMainStruct* instISAC = (ISACMainStruct*)instISAC_Addr;
-    instISAC->errorCode = 0;
-    instISAC->initFlag = 0;
-
-    /* Assign the address. */
-    *ISAC_main_inst = (ISACStruct*)instISAC_Addr;
-
-    /* Default is wideband. */
-    instISAC->encoderSamplingRateKHz = kIsacWideband;
-    instISAC->decoderSamplingRateKHz = kIsacWideband;
-    instISAC->bandwidthKHz           = isac8kHz;
-    instISAC->in_sample_rate_hz = 16000;
-
-    WebRtcIsac_InitTransform(&instISAC->transform_tables);
-    return 0;
-  } else {
-    return -1;
-  }
-}
-
-
-/****************************************************************************
- * WebRtcIsac_Create(...)
- *
- * This function creates an ISAC instance, which will contain the state
- * information for one coding/decoding channel.
- *
- * Input:
- *        - ISAC_main_inst    : address of the pointer to the coder instance.
- *
- * Return value               : 0 - Ok
- *                             -1 - Error
- */
-int16_t WebRtcIsac_Create(ISACStruct** ISAC_main_inst) {
-  ISACMainStruct* instISAC;
-
-  if (ISAC_main_inst != NULL) {
-    instISAC = (ISACMainStruct*)malloc(sizeof(ISACMainStruct));
-    *ISAC_main_inst = (ISACStruct*)instISAC;
-    if (*ISAC_main_inst != NULL) {
-      instISAC->errorCode = 0;
-      instISAC->initFlag = 0;
-      /* Default is wideband. */
-      instISAC->bandwidthKHz = isac8kHz;
-      instISAC->encoderSamplingRateKHz = kIsacWideband;
-      instISAC->decoderSamplingRateKHz = kIsacWideband;
-      instISAC->in_sample_rate_hz = 16000;
-
-      WebRtcIsac_InitTransform(&instISAC->transform_tables);
-      return 0;
-    } else {
-      return -1;
-    }
-  } else {
-    return -1;
-  }
-}
-
-
-/****************************************************************************
- * WebRtcIsac_Free(...)
- *
- * This function frees the ISAC instance created at the beginning.
- *
- * Input:
- *        - ISAC_main_inst    : a ISAC instance.
- *
- * Return value               : 0 - Ok
- *                             -1 - Error
- */
-int16_t WebRtcIsac_Free(ISACStruct* ISAC_main_inst) {
-  ISACMainStruct* instISAC = (ISACMainStruct*)ISAC_main_inst;
-  free(instISAC);
-  return 0;
-}
-
-
-/****************************************************************************
- * EncoderInitLb(...) - internal function for initialization of
- *                                Lower Band
- * EncoderInitUb(...) - internal function for initialization of
- *                                Upper Band
- * WebRtcIsac_EncoderInit(...) - API function
- *
- * This function initializes a ISAC instance prior to the encoder calls.
- *
- * Input:
- *        - ISAC_main_inst    : ISAC instance.
- *        - CodingMode        : 0 -> Bit rate and frame length are automatically
- *                                 adjusted to available bandwidth on
- *                                 transmission channel, applicable just to
- *                                 wideband mode.
- *                              1 -> User sets a frame length and a target bit
- *                                 rate which is taken as the maximum
- *                                 short-term average bit rate.
- *
- * Return value               :  0 - Ok
- *                              -1 - Error
- */
-static int16_t EncoderInitLb(ISACLBStruct* instLB,
-                             int16_t codingMode,
-                             enum IsacSamplingRate sampRate) {
-  int16_t statusInit = 0;
-  int k;
-
-  /* Init stream vector to zero */
-  for (k = 0; k < STREAM_SIZE_MAX_60; k++) {
-    instLB->ISACencLB_obj.bitstr_obj.stream[k] = 0;
-  }
-
-  if ((codingMode == 1) || (sampRate == kIsacSuperWideband)) {
-    /* 30 ms frame-size if either in super-wideband or
-     * instantaneous mode (I-mode). */
-    instLB->ISACencLB_obj.new_framelength = 480;
-  } else {
-    instLB->ISACencLB_obj.new_framelength = INITIAL_FRAMESAMPLES;
-  }
-
-  WebRtcIsac_InitMasking(&instLB->ISACencLB_obj.maskfiltstr_obj);
-  WebRtcIsac_InitPreFilterbank(&instLB->ISACencLB_obj.prefiltbankstr_obj);
-  WebRtcIsac_InitPitchFilter(&instLB->ISACencLB_obj.pitchfiltstr_obj);
-  WebRtcIsac_InitPitchAnalysis(
-    &instLB->ISACencLB_obj.pitchanalysisstr_obj);
-
-  instLB->ISACencLB_obj.buffer_index = 0;
-  instLB->ISACencLB_obj.frame_nb = 0;
-  /* Default for I-mode. */
-  instLB->ISACencLB_obj.bottleneck = 32000;
-  instLB->ISACencLB_obj.current_framesamples = 0;
-  instLB->ISACencLB_obj.s2nr = 0;
-  instLB->ISACencLB_obj.payloadLimitBytes30 = STREAM_SIZE_MAX_30;
-  instLB->ISACencLB_obj.payloadLimitBytes60 = STREAM_SIZE_MAX_60;
-  instLB->ISACencLB_obj.maxPayloadBytes = STREAM_SIZE_MAX_60;
-  instLB->ISACencLB_obj.maxRateInBytes = STREAM_SIZE_MAX_30;
-  instLB->ISACencLB_obj.enforceFrameSize = 0;
-  /* Invalid value prevents getRedPayload to
-     run before encoder is called. */
-  instLB->ISACencLB_obj.lastBWIdx            = -1;
-  return statusInit;
-}
-
-static int16_t EncoderInitUb(ISACUBStruct* instUB,
-                             int16_t bandwidth) {
-  int16_t statusInit = 0;
-  int k;
-
-  /* Init stream vector to zero. */
-  for (k = 0; k < STREAM_SIZE_MAX_60; k++) {
-    instUB->ISACencUB_obj.bitstr_obj.stream[k] = 0;
-  }
-
-  WebRtcIsac_InitMasking(&instUB->ISACencUB_obj.maskfiltstr_obj);
-  WebRtcIsac_InitPreFilterbank(&instUB->ISACencUB_obj.prefiltbankstr_obj);
-
-  if (bandwidth == isac16kHz) {
-    instUB->ISACencUB_obj.buffer_index = LB_TOTAL_DELAY_SAMPLES;
-  } else {
-    instUB->ISACencUB_obj.buffer_index = 0;
-  }
-  /* Default for I-mode. */
-  instUB->ISACencUB_obj.bottleneck = 32000;
-  /* These store the limits for the wideband + super-wideband bit-stream. */
-  instUB->ISACencUB_obj.maxPayloadSizeBytes = STREAM_SIZE_MAX_30 << 1;
-  /* This has to be updated after each lower-band encoding to guarantee
-   * a correct payload-limitation. */
-  instUB->ISACencUB_obj.numBytesUsed = 0;
-  memset(instUB->ISACencUB_obj.data_buffer_float, 0,
-         (MAX_FRAMESAMPLES + LB_TOTAL_DELAY_SAMPLES) * sizeof(float));
-
-  memcpy(&(instUB->ISACencUB_obj.lastLPCVec),
-         WebRtcIsac_kMeanLarUb16, sizeof(double) * UB_LPC_ORDER);
-
-  return statusInit;
-}
-
-
-int16_t WebRtcIsac_EncoderInit(ISACStruct* ISAC_main_inst,
-                               int16_t codingMode) {
-  ISACMainStruct* instISAC = (ISACMainStruct*)ISAC_main_inst;
-  int16_t status;
-
-  if ((codingMode != 0) && (codingMode != 1)) {
-    instISAC->errorCode = ISAC_DISALLOWED_CODING_MODE;
-    return -1;
-  }
-  /* Default bottleneck. */
-  instISAC->bottleneck = MAX_ISAC_BW;
-
-  if (instISAC->encoderSamplingRateKHz == kIsacWideband) {
-    instISAC->bandwidthKHz = isac8kHz;
-    instISAC->maxPayloadSizeBytes = STREAM_SIZE_MAX_60;
-    instISAC->maxRateBytesPer30Ms = STREAM_SIZE_MAX_30;
-  } else {
-    instISAC->bandwidthKHz = isac16kHz;
-    instISAC->maxPayloadSizeBytes = STREAM_SIZE_MAX;
-    instISAC->maxRateBytesPer30Ms = STREAM_SIZE_MAX;
-  }
-
-  /* Channel-adaptive = 0; Instantaneous (Channel-independent) = 1. */
-  instISAC->codingMode = codingMode;
-
-  WebRtcIsac_InitBandwidthEstimator(&instISAC->bwestimator_obj,
-                                    instISAC->encoderSamplingRateKHz,
-                                    instISAC->decoderSamplingRateKHz);
-
-  WebRtcIsac_InitRateModel(&instISAC->rate_data_obj);
-  /* Default for I-mode. */
-  instISAC->MaxDelay = 10.0;
-
-  status = EncoderInitLb(&instISAC->instLB, codingMode,
-                         instISAC->encoderSamplingRateKHz);
-  if (status < 0) {
-    instISAC->errorCode = -status;
-    return -1;
-  }
-
-  if (instISAC->encoderSamplingRateKHz == kIsacSuperWideband) {
-    /* Initialize encoder filter-bank. */
-    memset(instISAC->analysisFBState1, 0,
-           FB_STATE_SIZE_WORD32 * sizeof(int32_t));
-    memset(instISAC->analysisFBState2, 0,
-           FB_STATE_SIZE_WORD32 * sizeof(int32_t));
-
-    status = EncoderInitUb(&(instISAC->instUB),
-                           instISAC->bandwidthKHz);
-    if (status < 0) {
-      instISAC->errorCode = -status;
-      return -1;
-    }
-  }
-  /* Initialization is successful, set the flag. */
-  instISAC->initFlag |= BIT_MASK_ENC_INIT;
-  return 0;
-}
-
-
-/****************************************************************************
- * WebRtcIsac_Encode(...)
- *
- * This function encodes 10ms frame(s) and inserts it into a package.
- * Input speech length has to be 160 samples (10ms). The encoder buffers those
- * 10ms frames until it reaches the chosen Framesize (480 or 960 samples
- * corresponding to 30 or 60 ms frames), and then proceeds to the encoding.
- *
- * Input:
- *        - ISAC_main_inst    : ISAC instance.
- *        - speechIn          : input speech vector.
- *
- * Output:
- *        - encoded           : the encoded data vector
- *
- * Return value:
- *                            : >0 - Length (in bytes) of coded data
- *                            :  0 - The buffer didn't reach the chosen
- *                                  frameSize so it keeps buffering speech
- *                                 samples.
- *                            : -1 - Error
- */
-int WebRtcIsac_Encode(ISACStruct* ISAC_main_inst,
-                      const int16_t* speechIn,
-                      uint8_t* encoded) {
-  float inFrame[FRAMESAMPLES_10ms];
-  int16_t speechInLB[FRAMESAMPLES_10ms];
-  int16_t speechInUB[FRAMESAMPLES_10ms];
-  int streamLenLB = 0;
-  int streamLenUB = 0;
-  int streamLen = 0;
-  size_t k = 0;
-  uint8_t garbageLen = 0;
-  int32_t bottleneck = 0;
-  int16_t bottleneckIdx = 0;
-  int16_t jitterInfo = 0;
-
-  ISACMainStruct* instISAC = (ISACMainStruct*)ISAC_main_inst;
-  ISACLBStruct* instLB = &(instISAC->instLB);
-  ISACUBStruct* instUB = &(instISAC->instUB);
-
-  /* Check if encoder initiated. */
-  if ((instISAC->initFlag & BIT_MASK_ENC_INIT) !=
-      BIT_MASK_ENC_INIT) {
-    instISAC->errorCode = ISAC_ENCODER_NOT_INITIATED;
-    return -1;
-  }
-
-  if (instISAC->encoderSamplingRateKHz == kIsacSuperWideband) {
-    WebRtcSpl_AnalysisQMF(speechIn, SWBFRAMESAMPLES_10ms, speechInLB,
-                          speechInUB, instISAC->analysisFBState1,
-                          instISAC->analysisFBState2);
-
-    /* Convert from fixed to floating point. */
-    for (k = 0; k < FRAMESAMPLES_10ms; k++) {
-      inFrame[k] = (float)speechInLB[k];
-    }
-  } else {
-    for (k = 0; k < FRAMESAMPLES_10ms; k++) {
-      inFrame[k] = (float) speechIn[k];
-    }
-  }
-
-  /* Add some noise to avoid denormal numbers. */
-  inFrame[0] += (float)1.23455334e-3;
-  inFrame[1] -= (float)2.04324239e-3;
-  inFrame[2] += (float)1.90854954e-3;
-  inFrame[9] += (float)1.84854878e-3;
-
-  /* This function will update the bottleneck if required. */
-  UpdateBottleneck(instISAC);
-
-  /* Get the bandwith information which has to be sent to the other side. */
-  GetSendBandwidthInfo(instISAC, &bottleneckIdx, &jitterInfo);
-
-  /* Encode lower-band. */
-  streamLenLB = WebRtcIsac_EncodeLb(&instISAC->transform_tables,
-                                    inFrame, &instLB->ISACencLB_obj,
-                                    instISAC->codingMode, bottleneckIdx);
-  if (streamLenLB < 0) {
-    return -1;
-  }
-
-  if (instISAC->encoderSamplingRateKHz == kIsacSuperWideband) {
-    instUB = &(instISAC->instUB);
-
-    /* Convert to float. */
-    for (k = 0; k < FRAMESAMPLES_10ms; k++) {
-      inFrame[k] = (float) speechInUB[k];
-    }
-
-    /* Add some noise to avoid denormal numbers. */
-    inFrame[0] += (float)1.23455334e-3;
-    inFrame[1] -= (float)2.04324239e-3;
-    inFrame[2] += (float)1.90854954e-3;
-    inFrame[9] += (float)1.84854878e-3;
-
-    /* Tell to upper-band the number of bytes used so far.
-     * This is for payload limitation. */
-    instUB->ISACencUB_obj.numBytesUsed =
-        (int16_t)(streamLenLB + 1 + LEN_CHECK_SUM_WORD8);
-    /* Encode upper-band. */
-    switch (instISAC->bandwidthKHz) {
-      case isac12kHz: {
-        streamLenUB = WebRtcIsac_EncodeUb12(&instISAC->transform_tables,
-                                            inFrame, &instUB->ISACencUB_obj,
-                                            jitterInfo);
-        break;
-      }
-      case isac16kHz: {
-        streamLenUB = WebRtcIsac_EncodeUb16(&instISAC->transform_tables,
-                                            inFrame, &instUB->ISACencUB_obj,
-                                            jitterInfo);
-        break;
-      }
-      case isac8kHz: {
-        streamLenUB = 0;
-        break;
-      }
-    }
-
-    if ((streamLenUB < 0) && (streamLenUB != -ISAC_PAYLOAD_LARGER_THAN_LIMIT)) {
-      /* An error has happened but this is not the error due to a
-       * bit-stream larger than the limit. */
-      return -1;
-    }
-
-    if (streamLenLB == 0) {
-      return 0;
-    }
-
-    /* One byte is allocated for the length. According to older decoders
-       so the length bit-stream plus one byte for size and
-       LEN_CHECK_SUM_WORD8 for the checksum should be less than or equal
-       to 255. */
-    if ((streamLenUB > (255 - (LEN_CHECK_SUM_WORD8 + 1))) ||
-        (streamLenUB == -ISAC_PAYLOAD_LARGER_THAN_LIMIT)) {
-      /* We have got a too long bit-stream we skip the upper-band
-       * bit-stream for this frame. */
-      streamLenUB = 0;
-    }
-
-    memcpy(encoded, instLB->ISACencLB_obj.bitstr_obj.stream, streamLenLB);
-    streamLen = streamLenLB;
-    if (streamLenUB > 0) {
-      encoded[streamLenLB] = (uint8_t)(streamLenUB + 1 + LEN_CHECK_SUM_WORD8);
-      memcpy(&encoded[streamLenLB + 1],
-             instUB->ISACencUB_obj.bitstr_obj.stream,
-             streamLenUB);
-      streamLen += encoded[streamLenLB];
-    } else {
-      encoded[streamLenLB] = 0;
-    }
-  } else {
-    if (streamLenLB == 0) {
-      return 0;
-    }
-    memcpy(encoded, instLB->ISACencLB_obj.bitstr_obj.stream, streamLenLB);
-    streamLenUB = 0;
-    streamLen = streamLenLB;
-  }
-
-  /* Add Garbage if required. */
-  bottleneck = WebRtcIsac_GetUplinkBandwidth(&instISAC->bwestimator_obj);
-  if (instISAC->codingMode == 0) {
-    int minBytes;
-    int limit;
-    uint8_t* ptrGarbage;
-
-    instISAC->MaxDelay = (double)WebRtcIsac_GetUplinkMaxDelay(
-                           &instISAC->bwestimator_obj);
-
-    /* Update rate model and get minimum number of bytes in this packet. */
-    minBytes = WebRtcIsac_GetMinBytes(
-        &(instISAC->rate_data_obj), streamLen,
-        instISAC->instLB.ISACencLB_obj.current_framesamples, bottleneck,
-        instISAC->MaxDelay, instISAC->bandwidthKHz);
-
-    /* Make sure MinBytes does not exceed packet size limit. */
-    if (instISAC->bandwidthKHz == isac8kHz) {
-      if (instLB->ISACencLB_obj.current_framesamples == FRAMESAMPLES) {
-        limit = instLB->ISACencLB_obj.payloadLimitBytes30;
-      } else {
-        limit = instLB->ISACencLB_obj.payloadLimitBytes60;
-      }
-    } else {
-      limit = instUB->ISACencUB_obj.maxPayloadSizeBytes;
-    }
-    minBytes = (minBytes > limit) ? limit : minBytes;
-
-    /* Make sure we don't allow more than 255 bytes of garbage data.
-     * We store the length of the garbage data in 8 bits in the bitstream,
-     * 255 is the max garbage length we can signal using 8 bits. */
-    if ((instISAC->bandwidthKHz == isac8kHz) ||
-        (streamLenUB == 0)) {
-      ptrGarbage = &encoded[streamLenLB];
-      limit = streamLen + 255;
-    } else {
-      ptrGarbage = &encoded[streamLenLB + 1 + streamLenUB];
-      limit = streamLen + (255 - encoded[streamLenLB]);
-    }
-    minBytes = (minBytes > limit) ? limit : minBytes;
-
-    garbageLen = (minBytes > streamLen) ? (uint8_t)(minBytes - streamLen) : 0;
-
-    /* Save data for creation of multiple bit-streams. */
-    /* If bit-stream too short then add garbage at the end. */
-    if (garbageLen > 0) {
-      /* Overwrite the garbage area to avoid leaking possibly sensitive data
-         over the network. This also makes the output deterministic. */
-      memset(ptrGarbage, 0, garbageLen);
-
-      /* For a correct length of the upper-band bit-stream together
-       * with the garbage. Garbage is embeded in upper-band bit-stream.
-       * That is the only way to preserve backward compatibility. */
-      if ((instISAC->bandwidthKHz == isac8kHz) ||
-          (streamLenUB == 0)) {
-        encoded[streamLenLB] = garbageLen;
-      } else {
-        encoded[streamLenLB] += garbageLen;
-        /* Write the length of the garbage at the end of the upper-band
-         *  bit-stream, if exists. This helps for sanity check. */
-        encoded[streamLenLB + 1 + streamLenUB] = garbageLen;
-
-      }
-      streamLen += garbageLen;
-    }
-  } else {
-    /* update rate model */
-    WebRtcIsac_UpdateRateModel(
-        &instISAC->rate_data_obj, streamLen,
-        instISAC->instLB.ISACencLB_obj.current_framesamples, bottleneck);
-    garbageLen = 0;
-  }
-
-  /* Generate CRC if required. */
-  if ((instISAC->bandwidthKHz != isac8kHz) && (streamLenUB > 0)) {
-    uint32_t crc;
-
-    WebRtcIsac_GetCrc((int16_t*)(&(encoded[streamLenLB + 1])),
-                      streamLenUB + garbageLen, &crc);
-#ifndef WEBRTC_ARCH_BIG_ENDIAN
-    for (k = 0; k < LEN_CHECK_SUM_WORD8; k++) {
-      encoded[streamLen - LEN_CHECK_SUM_WORD8 + k] =
-          (uint8_t)(crc >> (24 - k * 8));
-    }
-#else
-    memcpy(&encoded[streamLenLB + streamLenUB + 1], &crc, LEN_CHECK_SUM_WORD8);
-#endif
-  }
-  return streamLen;
-}
-
-
-/******************************************************************************
- * WebRtcIsac_GetNewBitStream(...)
- *
- * This function returns encoded data, with the recieved bwe-index in the
- * stream. If the rate is set to a value less than bottleneck of codec
- * the new bistream will be re-encoded with the given target rate.
- * It should always return a complete packet, i.e. only called once
- * even for 60 msec frames.
- *
- * NOTE 1! This function does not write in the ISACStruct, it is not allowed.
- * NOTE 2! Rates larger than the bottleneck of the codec will be limited
- *         to the current bottleneck.
- *
- * Input:
- *        - ISAC_main_inst    : ISAC instance.
- *        - bweIndex          : Index of bandwidth estimate to put in new
- *                              bitstream
- *        - rate              : target rate of the transcoder is bits/sec.
- *                              Valid values are the accepted rate in iSAC,
- *                              i.e. 10000 to 56000.
- *
- * Output:
- *        - encoded           : The encoded data vector
- *
- * Return value               : >0 - Length (in bytes) of coded data
- *                              -1 - Error  or called in SWB mode
- *                                 NOTE! No error code is written to
- *                                 the struct since it is only allowed to read
- *                                 the struct.
- */
-int16_t WebRtcIsac_GetNewBitStream(ISACStruct*  ISAC_main_inst,
-                                   int16_t  bweIndex,
-                                   int16_t  jitterInfo,
-                                   int32_t  rate,
-                                   uint8_t* encoded,
-                                   int16_t  isRCU) {
-  Bitstr iSACBitStreamInst;   /* Local struct for bitstream handling */
-  int16_t streamLenLB;
-  int16_t streamLenUB;
-  int16_t totalStreamLen;
-  double gain2;
-  double gain1;
-  float scale;
-  enum ISACBandwidth bandwidthKHz;
-  double rateLB;
-  double rateUB;
-  int32_t currentBN;
-  uint32_t crc;
-#ifndef WEBRTC_ARCH_BIG_ENDIAN
-  int16_t  k;
-#endif
-  ISACMainStruct* instISAC = (ISACMainStruct*)ISAC_main_inst;
-
-  if ((instISAC->initFlag & BIT_MASK_ENC_INIT) !=
-      BIT_MASK_ENC_INIT) {
-    return -1;
-  }
-
-  /* Get the bottleneck of this iSAC and limit the
-   * given rate to the current bottleneck. */
-  WebRtcIsac_GetUplinkBw(ISAC_main_inst, &currentBN);
-  if (rate > currentBN) {
-    rate = currentBN;
-  }
-
-  if (WebRtcIsac_RateAllocation(rate, &rateLB, &rateUB, &bandwidthKHz) < 0) {
-    return -1;
-  }
-
-  /* Cannot transcode from 16 kHz to 12 kHz. */
-  if ((bandwidthKHz == isac12kHz) &&
-      (instISAC->bandwidthKHz == isac16kHz)) {
-    return -1;
-  }
-
-  /* A gain [dB] for the given rate. */
-  gain1 = WebRtcIsac_GetSnr(
-      rateLB, instISAC->instLB.ISACencLB_obj.current_framesamples);
-  /* The gain [dB] of this iSAC. */
-  gain2 = WebRtcIsac_GetSnr(
-      instISAC->instLB.ISACencLB_obj.bottleneck,
-      instISAC->instLB.ISACencLB_obj.current_framesamples);
-
-  /* Scale is the ratio of two gains in normal domain. */
-  scale = (float)pow(10, (gain1 - gain2) / 20.0);
-  /* Change the scale if this is a RCU bit-stream. */
-  scale = (isRCU) ? (scale * RCU_TRANSCODING_SCALE) : scale;
-
-  streamLenLB = WebRtcIsac_EncodeStoredDataLb(
-                  &instISAC->instLB.ISACencLB_obj.SaveEnc_obj,
-                  &iSACBitStreamInst, bweIndex, scale);
-
-  if (streamLenLB < 0) {
-    return -1;
-  }
-
-  /* Convert from bytes to int16_t. */
-  memcpy(encoded, iSACBitStreamInst.stream, streamLenLB);
-
-  if (bandwidthKHz == isac8kHz) {
-    return streamLenLB;
-  }
-
-  totalStreamLen = streamLenLB;
-  /* super-wideband is always at 30ms.
-   * These gains are in dB.
-   * Gain for the given rate. */
-  gain1 = WebRtcIsac_GetSnr(rateUB, FRAMESAMPLES);
-  /* Gain of this iSAC */
-  gain2 = WebRtcIsac_GetSnr(instISAC->instUB.ISACencUB_obj.bottleneck,
-                            FRAMESAMPLES);
-
-  /* Scale is the ratio of two gains in normal domain. */
-  scale = (float)pow(10, (gain1 - gain2) / 20.0);
-
-  /* Change the scale if this is a RCU bit-stream. */
-  scale = (isRCU)? (scale * RCU_TRANSCODING_SCALE_UB) : scale;
-
-  streamLenUB = WebRtcIsac_EncodeStoredDataUb(
-                  &(instISAC->instUB.ISACencUB_obj.SaveEnc_obj),
-                  &iSACBitStreamInst, jitterInfo, scale,
-                  instISAC->bandwidthKHz);
-
-  if (streamLenUB < 0) {
-    return -1;
-  }
-
-  if (streamLenUB + 1 + LEN_CHECK_SUM_WORD8 > 255) {
-    return streamLenLB;
-  }
-
-  totalStreamLen = streamLenLB + streamLenUB + 1 + LEN_CHECK_SUM_WORD8;
-  encoded[streamLenLB] = streamLenUB + 1 + LEN_CHECK_SUM_WORD8;
-
-  memcpy(&encoded[streamLenLB + 1], iSACBitStreamInst.stream,
-         streamLenUB);
-
-  WebRtcIsac_GetCrc((int16_t*)(&(encoded[streamLenLB + 1])),
-                    streamLenUB, &crc);
-#ifndef WEBRTC_ARCH_BIG_ENDIAN
-  for (k = 0; k < LEN_CHECK_SUM_WORD8; k++) {
-    encoded[totalStreamLen - LEN_CHECK_SUM_WORD8 + k] =
-      (uint8_t)((crc >> (24 - k * 8)) & 0xFF);
-  }
-#else
-  memcpy(&encoded[streamLenLB + streamLenUB + 1], &crc,
-         LEN_CHECK_SUM_WORD8);
-#endif
-  return totalStreamLen;
-}
-
-
-/****************************************************************************
- * DecoderInitLb(...) - internal function for initialization of
- *                                Lower Band
- * DecoderInitUb(...) - internal function for initialization of
- *                                Upper Band
- * WebRtcIsac_DecoderInit(...) - API function
- *
- * This function initializes a ISAC instance prior to the decoder calls.
- *
- * Input:
- *        - ISAC_main_inst    : ISAC instance.
- */
-static void DecoderInitLb(ISACLBStruct* instISAC) {
-  int i;
-  /* Initialize stream vector to zero. */
-  for (i = 0; i < STREAM_SIZE_MAX_60; i++) {
-    instISAC->ISACdecLB_obj.bitstr_obj.stream[i] = 0;
-  }
-
-  WebRtcIsac_InitMasking(&instISAC->ISACdecLB_obj.maskfiltstr_obj);
-  WebRtcIsac_InitPostFilterbank(
-    &instISAC->ISACdecLB_obj.postfiltbankstr_obj);
-  WebRtcIsac_InitPitchFilter(&instISAC->ISACdecLB_obj.pitchfiltstr_obj);
-}
-
-static void DecoderInitUb(ISACUBStruct* instISAC) {
-  int i;
-  /* Init stream vector to zero */
-  for (i = 0; i < STREAM_SIZE_MAX_60; i++) {
-    instISAC->ISACdecUB_obj.bitstr_obj.stream[i] = 0;
-  }
-
-  WebRtcIsac_InitMasking(&instISAC->ISACdecUB_obj.maskfiltstr_obj);
-  WebRtcIsac_InitPostFilterbank(
-    &instISAC->ISACdecUB_obj.postfiltbankstr_obj);
-}
-
-void WebRtcIsac_DecoderInit(ISACStruct* ISAC_main_inst) {
-  ISACMainStruct* instISAC = (ISACMainStruct*)ISAC_main_inst;
-
-  DecoderInitLb(&instISAC->instLB);
-  if (instISAC->decoderSamplingRateKHz == kIsacSuperWideband) {
-    memset(instISAC->synthesisFBState1, 0,
-           FB_STATE_SIZE_WORD32 * sizeof(int32_t));
-    memset(instISAC->synthesisFBState2, 0,
-           FB_STATE_SIZE_WORD32 * sizeof(int32_t));
-    DecoderInitUb(&(instISAC->instUB));
-  }
-  if ((instISAC->initFlag & BIT_MASK_ENC_INIT) != BIT_MASK_ENC_INIT) {
-    WebRtcIsac_InitBandwidthEstimator(&instISAC->bwestimator_obj,
-                                      instISAC->encoderSamplingRateKHz,
-                                      instISAC->decoderSamplingRateKHz);
-  }
-  instISAC->initFlag |= BIT_MASK_DEC_INIT;
-  instISAC->resetFlag_8kHz = 0;
-}
-
-
-/****************************************************************************
- * WebRtcIsac_UpdateBwEstimate(...)
- *
- * This function updates the estimate of the bandwidth.
- *
- * NOTE:
- * The estimates of bandwidth is not valid if the sample rate of the far-end
- * encoder is set to 48 kHz and send timestamps are increamented according to
- * 48 kHz sampling rate.
- *
- * Input:
- *        - ISAC_main_inst    : ISAC instance.
- *        - encoded           : encoded ISAC frame(s).
- *        - packet_size       : size of the packet.
- *        - rtp_seq_number    : the RTP number of the packet.
- *        - arr_ts            : the arrival time of the packet (from NetEq)
- *                              in samples.
- *
- * Return value               :  0 - Ok
- *                              -1 - Error
- */
-int16_t WebRtcIsac_UpdateBwEstimate(ISACStruct* ISAC_main_inst,
-                                    const uint8_t* encoded,
-                                    size_t packet_size,
-                                    uint16_t rtp_seq_number,
-                                    uint32_t send_ts,
-                                    uint32_t arr_ts) {
-  ISACMainStruct* instISAC = (ISACMainStruct*)ISAC_main_inst;
-  Bitstr streamdata;
-#ifndef WEBRTC_ARCH_BIG_ENDIAN
-  int k;
-#endif
-  int16_t err;
-
-  /* Check if decoder initiated. */
-  if ((instISAC->initFlag & BIT_MASK_DEC_INIT) != BIT_MASK_DEC_INIT) {
-    instISAC->errorCode = ISAC_DECODER_NOT_INITIATED;
-    return -1;
-  }
-
-  /* Check that the size of the packet is valid, and if not return without
-   * updating the bandwidth estimate. A valid size is at least 10 bytes. */
-  if (packet_size < 10) {
-    /* Return error code if the packet length is null. */
-    instISAC->errorCode = ISAC_EMPTY_PACKET;
-    return -1;
-  }
-
-  WebRtcIsac_ResetBitstream(&(streamdata));
-
-#ifndef WEBRTC_ARCH_BIG_ENDIAN
-  for (k = 0; k < 10; k++) {
-    uint16_t ek = ((const uint16_t*)encoded)[k >> 1];
-    streamdata.stream[k] = (uint8_t)((ek >> ((k & 1) << 3)) & 0xff);
-  }
-#else
-  memcpy(streamdata.stream, encoded, 10);
-#endif
-
-  err = WebRtcIsac_EstimateBandwidth(&instISAC->bwestimator_obj, &streamdata,
-                                     packet_size, rtp_seq_number, send_ts,
-                                     arr_ts, instISAC->encoderSamplingRateKHz,
-                                     instISAC->decoderSamplingRateKHz);
-  if (err < 0) {
-    /* Return error code if something went wrong. */
-    instISAC->errorCode = -err;
-    return -1;
-  }
-  return 0;
-}
-
-static int Decode(ISACStruct* ISAC_main_inst,
-                  const uint8_t* encoded,
-                  size_t lenEncodedBytes,
-                  int16_t* decoded,
-                  int16_t* speechType,
-                  int16_t isRCUPayload) {
-  /* Number of samples (480 or 960), output from decoder
-     that were actually used in the encoder/decoder
-     (determined on the fly). */
-  int16_t numSamplesLB;
-  int16_t numSamplesUB;
-  int16_t speechIdx;
-  float outFrame[MAX_FRAMESAMPLES];
-  int16_t outFrameLB[MAX_FRAMESAMPLES];
-  int16_t outFrameUB[MAX_FRAMESAMPLES];
-  int numDecodedBytesLBint;
-  size_t numDecodedBytesLB;
-  int numDecodedBytesUB;
-  size_t lenEncodedLBBytes;
-  int16_t validChecksum = 1;
-  int16_t k;
-  uint16_t numLayer;
-  size_t totSizeBytes;
-  int16_t err;
-
-  ISACMainStruct* instISAC = (ISACMainStruct*)ISAC_main_inst;
-  ISACUBDecStruct* decInstUB = &(instISAC->instUB.ISACdecUB_obj);
-  ISACLBDecStruct* decInstLB = &(instISAC->instLB.ISACdecLB_obj);
-
-  /* Check if decoder initiated. */
-  if ((instISAC->initFlag & BIT_MASK_DEC_INIT) !=
-      BIT_MASK_DEC_INIT) {
-    instISAC->errorCode = ISAC_DECODER_NOT_INITIATED;
-    return -1;
-  }
-
-  if (lenEncodedBytes == 0) {
-    /* return error code if the packet length is null. */
-    instISAC->errorCode = ISAC_EMPTY_PACKET;
-    return -1;
-  }
-
-  /* The size of the encoded lower-band is bounded by
-   * STREAM_SIZE_MAX. If a payload with the size larger than STREAM_SIZE_MAX
-   * is received, it is not considered erroneous. */
-  lenEncodedLBBytes = (lenEncodedBytes > STREAM_SIZE_MAX) ?
-      STREAM_SIZE_MAX : lenEncodedBytes;
-
-  /* Copy to lower-band bit-stream structure. */
-  memcpy(instISAC->instLB.ISACdecLB_obj.bitstr_obj.stream, encoded,
-         lenEncodedLBBytes);
-
-  /* We need to initialize numSamplesLB to something; otherwise, in the test
-     for whether we should return -1 below, the compiler might generate code
-     that fools Memcheck (Valgrind) into thinking that the control flow depends
-     on the uninitialized value in numSamplesLB (since WebRtcIsac_DecodeLb will
-     not fill it in if it fails and returns -1). */
-  numSamplesLB = 0;
-
-  /* Regardless of that the current codec is setup to work in
-   * wideband or super-wideband, the decoding of the lower-band
-   * has to be performed. */
-  numDecodedBytesLBint = WebRtcIsac_DecodeLb(&instISAC->transform_tables,
-                                             outFrame, decInstLB,
-                                             &numSamplesLB, isRCUPayload);
-  numDecodedBytesLB = (size_t)numDecodedBytesLBint;
-  if ((numDecodedBytesLBint < 0) ||
-      (numDecodedBytesLB > lenEncodedLBBytes) ||
-      (numSamplesLB > MAX_FRAMESAMPLES)) {
-    instISAC->errorCode = ISAC_LENGTH_MISMATCH;
-    return -1;
-  }
-
-  /* Error Check, we accept multi-layer bit-stream This will limit number
-   * of iterations of the while loop. Even without this the number
-   * of iterations is limited. */
-  numLayer = 1;
-  totSizeBytes = numDecodedBytesLB;
-  while (totSizeBytes != lenEncodedBytes) {
-    if ((totSizeBytes > lenEncodedBytes) ||
-        (encoded[totSizeBytes] == 0) ||
-        (numLayer > MAX_NUM_LAYERS)) {
-      instISAC->errorCode = ISAC_LENGTH_MISMATCH;
-      return -1;
-    }
-    totSizeBytes += encoded[totSizeBytes];
-    numLayer++;
-  }
-
-  if (instISAC->decoderSamplingRateKHz == kIsacWideband) {
-    for (k = 0; k < numSamplesLB; k++) {
-      if (outFrame[k] > 32767) {
-        decoded[k] = 32767;
-      } else if (outFrame[k] < -32768) {
-        decoded[k] = -32768;
-      } else {
-        decoded[k] = (int16_t)WebRtcIsac_lrint(outFrame[k]);
-      }
-    }
-    numSamplesUB = 0;
-  } else {
-    uint32_t crc;
-    /* We don't accept larger than 30ms (480 samples at lower-band)
-     * frame-size. */
-    for (k = 0; k < numSamplesLB; k++) {
-      if (outFrame[k] > 32767) {
-        outFrameLB[k] = 32767;
-      } else if (outFrame[k] < -32768) {
-        outFrameLB[k] = -32768;
-      } else {
-        outFrameLB[k] = (int16_t)WebRtcIsac_lrint(outFrame[k]);
-      }
-    }
-
-    /* Check for possible error, and if upper-band stream exists. */
-    if (numDecodedBytesLB == lenEncodedBytes) {
-      /* Decoding was successful. No super-wideband bit-stream exists. */
-      numSamplesUB = numSamplesLB;
-      memset(outFrameUB, 0, sizeof(int16_t) *  numSamplesUB);
-
-      /* Prepare for the potential increase of signal bandwidth. */
-      instISAC->resetFlag_8kHz = 2;
-    } else {
-      /* This includes the checksum and the bytes that stores the length. */
-      int16_t lenNextStream = encoded[numDecodedBytesLB];
-
-      /* Is this garbage or valid super-wideband bit-stream?
-       * Check if checksum is valid. */
-      if (lenNextStream <= (LEN_CHECK_SUM_WORD8 + 1)) {
-        /* Such a small second layer cannot be super-wideband layer.
-         * It must be a short garbage. */
-        validChecksum = 0;
-      } else {
-        /* Run CRC to see if the checksum match. */
-        WebRtcIsac_GetCrc((int16_t*)(&encoded[numDecodedBytesLB + 1]),
-                          lenNextStream - LEN_CHECK_SUM_WORD8 - 1, &crc);
-
-        validChecksum = 1;
-        for (k = 0; k < LEN_CHECK_SUM_WORD8; k++) {
-          validChecksum &= (((crc >> (24 - k * 8)) & 0xFF) ==
-                            encoded[numDecodedBytesLB + lenNextStream -
-                                          LEN_CHECK_SUM_WORD8 + k]);
-        }
-      }
-
-      if (!validChecksum) {
-        /* This is a garbage, we have received a wideband
-         * bit-stream with garbage. */
-        numSamplesUB = numSamplesLB;
-        memset(outFrameUB, 0, sizeof(int16_t) * numSamplesUB);
-      } else {
-        /* A valid super-wideband biststream exists. */
-        enum ISACBandwidth bandwidthKHz;
-        int32_t maxDelayBit;
-
-        /* If we have super-wideband bit-stream, we cannot
-         * have 60 ms frame-size. */
-        if (numSamplesLB > FRAMESAMPLES) {
-          instISAC->errorCode = ISAC_LENGTH_MISMATCH;
-          return -1;
-        }
-
-        /* The rest of the bit-stream contains the upper-band
-         * bit-stream curently this is the only thing there,
-         * however, we might add more layers. */
-
-        /* Have to exclude one byte where the length is stored
-         * and last 'LEN_CHECK_SUM_WORD8' bytes where the
-         * checksum is stored. */
-        lenNextStream -= (LEN_CHECK_SUM_WORD8 + 1);
-
-        memcpy(decInstUB->bitstr_obj.stream,
-               &encoded[numDecodedBytesLB + 1], lenNextStream);
-
-        /* Reset bit-stream object, this is the first decoding. */
-        WebRtcIsac_ResetBitstream(&(decInstUB->bitstr_obj));
-
-        /* Decode jitter information. */
-        err = WebRtcIsac_DecodeJitterInfo(&decInstUB->bitstr_obj, &maxDelayBit);
-        if (err < 0) {
-          instISAC->errorCode = -err;
-          return -1;
-        }
-
-        /* Update jitter info which is in the upper-band bit-stream
-         * only if the encoder is in super-wideband. Otherwise,
-         * the jitter info is already embedded in bandwidth index
-         * and has been updated. */
-        if (instISAC->encoderSamplingRateKHz == kIsacSuperWideband) {
-          err = WebRtcIsac_UpdateUplinkJitter(
-                  &(instISAC->bwestimator_obj), maxDelayBit);
-          if (err < 0) {
-            instISAC->errorCode = -err;
-            return -1;
-          }
-        }
-
-        /* Decode bandwidth information. */
-        err = WebRtcIsac_DecodeBandwidth(&decInstUB->bitstr_obj,
-                                         &bandwidthKHz);
-        if (err < 0) {
-          instISAC->errorCode = -err;
-          return -1;
-        }
-
-        switch (bandwidthKHz) {
-          case isac12kHz: {
-            numDecodedBytesUB = WebRtcIsac_DecodeUb12(
-                &instISAC->transform_tables, outFrame, decInstUB, isRCUPayload);
-
-            /* Hang-over for transient alleviation -
-             * wait two frames to add the upper band going up from 8 kHz. */
-            if (instISAC->resetFlag_8kHz > 0) {
-              if (instISAC->resetFlag_8kHz == 2) {
-                /* Silence first and a half frame. */
-                memset(outFrame, 0, MAX_FRAMESAMPLES *
-                       sizeof(float));
-              } else {
-                const float rampStep = 2.0f / MAX_FRAMESAMPLES;
-                float rampVal = 0;
-                memset(outFrame, 0, (MAX_FRAMESAMPLES >> 1) *
-                       sizeof(float));
-
-                /* Ramp up second half of second frame. */
-                for (k = MAX_FRAMESAMPLES / 2; k < MAX_FRAMESAMPLES; k++) {
-                  outFrame[k] *= rampVal;
-                  rampVal += rampStep;
-                }
-              }
-              instISAC->resetFlag_8kHz -= 1;
-            }
-
-            break;
-          }
-          case isac16kHz: {
-            numDecodedBytesUB = WebRtcIsac_DecodeUb16(
-                &instISAC->transform_tables, outFrame, decInstUB, isRCUPayload);
-            break;
-          }
-          default:
-            return -1;
-        }
-
-        if (numDecodedBytesUB < 0) {
-          instISAC->errorCode = numDecodedBytesUB;
-          return -1;
-        }
-        if (numDecodedBytesLB + numDecodedBytesUB > lenEncodedBytes) {
-          // We have supposedly decoded more bytes than we were given. Likely
-          // caused by bad input data.
-          instISAC->errorCode = ISAC_LENGTH_MISMATCH;
-          return -1;
-        }
-
-        /* It might be less due to garbage. */
-        if ((numDecodedBytesUB != lenNextStream) &&
-            (numDecodedBytesLB + 1 + numDecodedBytesUB >= lenEncodedBytes ||
-             numDecodedBytesUB !=
-                 (lenNextStream -
-                  encoded[numDecodedBytesLB + 1 + numDecodedBytesUB]))) {
-          instISAC->errorCode = ISAC_LENGTH_MISMATCH;
-          return -1;
-        }
-
-        /* If there is no error Upper-band always decodes
-         * 30 ms (480 samples). */
-        numSamplesUB = FRAMESAMPLES;
-
-        /* Convert to W16. */
-        for (k = 0; k < numSamplesUB; k++) {
-          if (outFrame[k] > 32767) {
-            outFrameUB[k] = 32767;
-          } else if (outFrame[k] < -32768) {
-            outFrameUB[k] = -32768;
-          } else {
-            outFrameUB[k] = (int16_t)WebRtcIsac_lrint(
-                              outFrame[k]);
-          }
-        }
-      }
-    }
-
-    speechIdx = 0;
-    while (speechIdx < numSamplesLB) {
-      WebRtcSpl_SynthesisQMF(&outFrameLB[speechIdx], &outFrameUB[speechIdx],
-                             FRAMESAMPLES_10ms, &decoded[(speechIdx << 1)],
-                             instISAC->synthesisFBState1,
-                             instISAC->synthesisFBState2);
-
-      speechIdx += FRAMESAMPLES_10ms;
-    }
-  }
-  *speechType = 0;
-  return (numSamplesLB + numSamplesUB);
-}
-
-
-
-
-
-
-
-/****************************************************************************
- * WebRtcIsac_Decode(...)
- *
- * This function decodes a ISAC frame. Output speech length
- * will be a multiple of 480 samples: 480 or 960 samples,
- * depending on the  frameSize (30 or 60 ms).
- *
- * Input:
- *        - ISAC_main_inst    : ISAC instance.
- *        - encoded           : encoded ISAC frame(s)
- *        - len               : bytes in encoded vector
- *
- * Output:
- *        - decoded           : The decoded vector
- *
- * Return value               : >0 - number of samples in decoded vector
- *                              -1 - Error
- */
-
-int WebRtcIsac_Decode(ISACStruct* ISAC_main_inst,
-                      const uint8_t* encoded,
-                      size_t lenEncodedBytes,
-                      int16_t* decoded,
-                      int16_t* speechType) {
-  int16_t isRCUPayload = 0;
-  return Decode(ISAC_main_inst, encoded, lenEncodedBytes, decoded,
-                speechType, isRCUPayload);
-}
-
-/****************************************************************************
- * WebRtcIsac_DecodeRcu(...)
- *
- * This function decodes a redundant (RCU) iSAC frame. Function is called in
- * NetEq with a stored RCU payload in case of packet loss. Output speech length
- * will be a multiple of 480 samples: 480 or 960 samples,
- * depending on the framesize (30 or 60 ms).
- *
- * Input:
- *      - ISAC_main_inst     : ISAC instance.
- *      - encoded            : encoded ISAC RCU frame(s)
- *      - len                : bytes in encoded vector
- *
- * Output:
- *      - decoded            : The decoded vector
- *
- * Return value              : >0 - number of samples in decoded vector
- *                             -1 - Error
- */
-
-
-
-int WebRtcIsac_DecodeRcu(ISACStruct* ISAC_main_inst,
-                         const uint8_t* encoded,
-                         size_t lenEncodedBytes,
-                         int16_t* decoded,
-                         int16_t* speechType) {
-  int16_t isRCUPayload = 1;
-  return Decode(ISAC_main_inst, encoded, lenEncodedBytes, decoded,
-                speechType, isRCUPayload);
-}
-
-
-/****************************************************************************
- * WebRtcIsac_DecodePlc(...)
- *
- * This function conducts PLC for ISAC frame(s). Output speech length
- * will be a multiple of 480 samples: 480 or 960 samples,
- * depending on the  frameSize (30 or 60 ms).
- *
- * Input:
- *        - ISAC_main_inst    : ISAC instance.
- *        - noOfLostFrames    : Number of PLC frames to produce
- *
- * Output:
- *        - decoded           : The decoded vector
- *
- * Return value               : Number of samples in decoded PLC vector
- */
-size_t WebRtcIsac_DecodePlc(ISACStruct* ISAC_main_inst,
-                            int16_t* decoded,
-                            size_t noOfLostFrames) {
-  size_t numSamples = 0;
-  ISACMainStruct* instISAC = (ISACMainStruct*)ISAC_main_inst;
-
-  /* Limit number of frames to two = 60 millisecond.
-   * Otherwise we exceed data vectors. */
-  if (noOfLostFrames > 2) {
-    noOfLostFrames = 2;
-  }
-
-  /* Get the number of samples per frame */
-  switch (instISAC->decoderSamplingRateKHz) {
-    case kIsacWideband: {
-      numSamples = 480 * noOfLostFrames;
-      break;
-    }
-    case kIsacSuperWideband: {
-      numSamples = 960 * noOfLostFrames;
-      break;
-    }
-  }
-
-  /* Set output samples to zero. */
-  memset(decoded, 0, numSamples * sizeof(int16_t));
-  return numSamples;
-}
-
-
-/****************************************************************************
- * ControlLb(...) - Internal function for controlling Lower Band
- * ControlUb(...) - Internal function for controlling Upper Band
- * WebRtcIsac_Control(...) - API function
- *
- * This function sets the limit on the short-term average bit rate and the
- * frame length. Should be used only in Instantaneous mode.
- *
- * Input:
- *        - ISAC_main_inst    : ISAC instance.
- *        - rate              : limit on the short-term average bit rate,
- *                              in bits/second (between 10000 and 32000)
- *        - frameSize         : number of milliseconds per frame (30 or 60)
- *
- * Return value               : 0 - ok
- *                             -1 - Error
- */
-static int16_t ControlLb(ISACLBStruct* instISAC, double rate,
-                         int16_t frameSize) {
-  if ((rate >= 10000) && (rate <= 32000)) {
-    instISAC->ISACencLB_obj.bottleneck = rate;
-  } else {
-    return -ISAC_DISALLOWED_BOTTLENECK;
-  }
-
-  if ((frameSize == 30) || (frameSize == 60)) {
-    instISAC->ISACencLB_obj.new_framelength = (FS / 1000) *  frameSize;
-  } else {
-    return -ISAC_DISALLOWED_FRAME_LENGTH;
-  }
-
-  return 0;
-}
-
-static int16_t ControlUb(ISACUBStruct* instISAC, double rate) {
-  if ((rate >= 10000) && (rate <= 32000)) {
-    instISAC->ISACencUB_obj.bottleneck = rate;
-  } else {
-    return -ISAC_DISALLOWED_BOTTLENECK;
-  }
-  return 0;
-}
-
-int16_t WebRtcIsac_Control(ISACStruct* ISAC_main_inst,
-                           int32_t bottleneckBPS,
-                           int frameSize) {
-  ISACMainStruct* instISAC = (ISACMainStruct*)ISAC_main_inst;
-  int16_t status;
-  double rateLB;
-  double rateUB;
-  enum ISACBandwidth bandwidthKHz;
-
-  if (instISAC->codingMode == 0) {
-    /* In adaptive mode. */
-    instISAC->errorCode = ISAC_MODE_MISMATCH;
-    return -1;
-  }
-
-  /* Check if encoder initiated */
-  if ((instISAC->initFlag & BIT_MASK_ENC_INIT) !=
-      BIT_MASK_ENC_INIT) {
-    instISAC->errorCode = ISAC_ENCODER_NOT_INITIATED;
-    return -1;
-  }
-
-  if (instISAC->encoderSamplingRateKHz == kIsacWideband) {
-    /* If the sampling rate is 16kHz then bandwith should be 8kHz,
-     * regardless of bottleneck. */
-    bandwidthKHz = isac8kHz;
-    rateLB = (bottleneckBPS > 32000) ? 32000 : bottleneckBPS;
-    rateUB = 0;
-  } else {
-    if (WebRtcIsac_RateAllocation(bottleneckBPS, &rateLB, &rateUB,
-                                  &bandwidthKHz) < 0) {
-      return -1;
-    }
-  }
-
-  if ((instISAC->encoderSamplingRateKHz == kIsacSuperWideband) &&
-      (frameSize != 30) &&
-      (bandwidthKHz != isac8kHz)) {
-    /* Cannot have 60 ms in super-wideband. */
-    instISAC->errorCode = ISAC_DISALLOWED_FRAME_LENGTH;
-    return -1;
-  }
-
-  status = ControlLb(&instISAC->instLB, rateLB, (int16_t)frameSize);
-  if (status < 0) {
-    instISAC->errorCode = -status;
-    return -1;
-  }
-  if (bandwidthKHz != isac8kHz) {
-    status = ControlUb(&(instISAC->instUB), rateUB);
-    if (status < 0) {
-      instISAC->errorCode = -status;
-      return -1;
-    }
-  }
-
-
-  /* Check if bandwidth is changing from wideband to super-wideband
-   * then we have to synch data buffer of lower & upper-band. Also
-   * clean up the upper-band data buffer. */
-
-  if ((instISAC->bandwidthKHz == isac8kHz) && (bandwidthKHz != isac8kHz)) {
-    memset(instISAC->instUB.ISACencUB_obj.data_buffer_float, 0,
-           sizeof(float) * (MAX_FRAMESAMPLES + LB_TOTAL_DELAY_SAMPLES));
-
-    if (bandwidthKHz == isac12kHz) {
-      instISAC->instUB.ISACencUB_obj.buffer_index =
-        instISAC->instLB.ISACencLB_obj.buffer_index;
-    } else {
-      instISAC->instUB.ISACencUB_obj.buffer_index =
-          LB_TOTAL_DELAY_SAMPLES + instISAC->instLB.ISACencLB_obj.buffer_index;
-
-      memcpy(&(instISAC->instUB.ISACencUB_obj.lastLPCVec),
-             WebRtcIsac_kMeanLarUb16, sizeof(double) * UB_LPC_ORDER);
-    }
-  }
-
-  /* Update the payload limit if the bandwidth is changing. */
-  if (instISAC->bandwidthKHz != bandwidthKHz) {
-    instISAC->bandwidthKHz = bandwidthKHz;
-    UpdatePayloadSizeLimit(instISAC);
-  }
-  instISAC->bottleneck = bottleneckBPS;
-  return 0;
-}
-
-void WebRtcIsac_SetInitialBweBottleneck(ISACStruct* ISAC_main_inst,
-                                        int bottleneck_bits_per_second) {
-  ISACMainStruct* instISAC = (ISACMainStruct*)ISAC_main_inst;
-  RTC_DCHECK_GE(bottleneck_bits_per_second, 10000);
-  RTC_DCHECK_LE(bottleneck_bits_per_second, 32000);
-  instISAC->bwestimator_obj.send_bw_avg = (float)bottleneck_bits_per_second;
-}
-
-/****************************************************************************
- * WebRtcIsac_ControlBwe(...)
- *
- * This function sets the initial values of bottleneck and frame-size if
- * iSAC is used in channel-adaptive mode. Through this API, users can
- * enforce a frame-size for all values of bottleneck. Then iSAC will not
- * automatically change the frame-size.
- *
- *
- * Input:
- *        - ISAC_main_inst    : ISAC instance.
- *        - rateBPS           : initial value of bottleneck in bits/second
- *                              10000 <= rateBPS <= 32000 is accepted
- *                              For default bottleneck set rateBPS = 0
- *        - frameSizeMs       : number of milliseconds per frame (30 or 60)
- *        - enforceFrameSize  : 1 to enforce the given frame-size through out
- *                              the adaptation process, 0 to let iSAC change
- *                              the frame-size if required.
- *
- * Return value               : 0 - ok
- *                             -1 - Error
- */
-int16_t WebRtcIsac_ControlBwe(ISACStruct* ISAC_main_inst,
-                              int32_t bottleneckBPS,
-                              int frameSizeMs,
-                              int16_t enforceFrameSize) {
-  ISACMainStruct* instISAC = (ISACMainStruct*)ISAC_main_inst;
-  enum ISACBandwidth bandwidth;
-
-   /* Check if encoder initiated */
-  if ((instISAC->initFlag & BIT_MASK_ENC_INIT) !=
-      BIT_MASK_ENC_INIT) {
-    instISAC->errorCode = ISAC_ENCODER_NOT_INITIATED;
-    return -1;
-  }
-
-  /* Check that we are in channel-adaptive mode, otherwise, return (-1) */
-  if (instISAC->codingMode != 0) {
-    instISAC->errorCode = ISAC_MODE_MISMATCH;
-    return -1;
-  }
-  if ((frameSizeMs != 30) &&
-      (instISAC->encoderSamplingRateKHz == kIsacSuperWideband)) {
-    return -1;
-  }
-
-  /* Set structure variable if enforceFrameSize is set. ISAC will then
-   * keep the chosen frame size. */
-  if (enforceFrameSize != 0) {
-    instISAC->instLB.ISACencLB_obj.enforceFrameSize = 1;
-  } else {
-    instISAC->instLB.ISACencLB_obj.enforceFrameSize = 0;
-  }
-
-  /* Set the initial rate. If the input value is zero then the default intial
-   * rate is used. Otehrwise, values between 10 to 32 kbps are accepted. */
-  if (bottleneckBPS != 0) {
-    double rateLB;
-    double rateUB;
-    if (WebRtcIsac_RateAllocation(bottleneckBPS, &rateLB, &rateUB,
-                                  &bandwidth) < 0) {
-      return -1;
-    }
-    instISAC->bwestimator_obj.send_bw_avg = (float)bottleneckBPS;
-    instISAC->bandwidthKHz = bandwidth;
-  }
-
-  /* Set the initial frame-size. If 'enforceFrameSize' is set, the frame-size
-   *  will not change */
-  if (frameSizeMs != 0) {
-    if ((frameSizeMs  == 30) || (frameSizeMs == 60)) {
-      instISAC->instLB.ISACencLB_obj.new_framelength =
-          (int16_t)((FS / 1000) * frameSizeMs);
-    } else {
-      instISAC->errorCode = ISAC_DISALLOWED_FRAME_LENGTH;
-      return -1;
-    }
-  }
-  return 0;
-}
-
-
-/****************************************************************************
- * WebRtcIsac_GetDownLinkBwIndex(...)
- *
- * This function returns index representing the Bandwidth estimate from
- * the other side to this side.
- *
- * Input:
- *        - ISAC_main_inst    : iSAC structure
- *
- * Output:
- *        - bweIndex         : Bandwidth estimate to transmit to other side.
- *
- */
-int16_t WebRtcIsac_GetDownLinkBwIndex(ISACStruct* ISAC_main_inst,
-                                      int16_t* bweIndex,
-                                      int16_t* jitterInfo) {
-  ISACMainStruct* instISAC = (ISACMainStruct*)ISAC_main_inst;
-
-  /* Check if encoder initialized. */
-  if ((instISAC->initFlag & BIT_MASK_DEC_INIT) !=
-      BIT_MASK_DEC_INIT) {
-    instISAC->errorCode = ISAC_ENCODER_NOT_INITIATED;
-    return -1;
-  }
-
-  /* Call function to get Bandwidth Estimate. */
-  WebRtcIsac_GetDownlinkBwJitIndexImpl(&(instISAC->bwestimator_obj), bweIndex,
-                                       jitterInfo,
-                                       instISAC->decoderSamplingRateKHz);
-  return 0;
-}
-
-
-/****************************************************************************
- * WebRtcIsac_UpdateUplinkBw(...)
- *
- * This function takes an index representing the Bandwidth estimate from
- * this side to other side and updates BWE.
- *
- * Input:
- *        - ISAC_main_inst    : iSAC structure
- *        - rateIndex         : Bandwidth estimate from other side.
- *
- * Return value               : 0 - ok
- *                             -1 - index out of range
- */
-int16_t WebRtcIsac_UpdateUplinkBw(ISACStruct* ISAC_main_inst,
-                                  int16_t bweIndex) {
-  ISACMainStruct* instISAC = (ISACMainStruct*)ISAC_main_inst;
-  int16_t returnVal;
-
-  /* Check if encoder initiated. */
-  if ((instISAC->initFlag & BIT_MASK_ENC_INIT) !=
-      BIT_MASK_ENC_INIT) {
-    instISAC->errorCode = ISAC_ENCODER_NOT_INITIATED;
-    return -1;
-  }
-
-  /* Call function to get Bandwidth Estimate. */
-  returnVal = WebRtcIsac_UpdateUplinkBwImpl(
-                &(instISAC->bwestimator_obj), bweIndex,
-                instISAC->encoderSamplingRateKHz);
-
-  if (returnVal < 0) {
-    instISAC->errorCode = -returnVal;
-    return -1;
-  } else {
-    return 0;
-  }
-}
-
-
-/****************************************************************************
- * WebRtcIsac_ReadBwIndex(...)
- *
- * This function returns the index of the Bandwidth estimate from the
- * bit-stream.
- *
- * Input:
- *        - encoded           : Encoded bit-stream
- *
- * Output:
- *        - frameLength       : Length of frame in packet (in samples)
- *        - bweIndex          : Bandwidth estimate in bit-stream
- *
- */
-int16_t WebRtcIsac_ReadBwIndex(const uint8_t* encoded,
-                               int16_t* bweIndex) {
-  Bitstr streamdata;
-#ifndef WEBRTC_ARCH_BIG_ENDIAN
-  int k;
-#endif
-  int16_t err;
-
-  WebRtcIsac_ResetBitstream(&(streamdata));
-
-#ifndef WEBRTC_ARCH_BIG_ENDIAN
-  for (k = 0; k < 10; k++) {
-    int16_t ek2 = ((const int16_t*)encoded)[k >> 1];
-    streamdata.stream[k] = (uint8_t)((ek2 >> ((k & 1) << 3)) & 0xff);
-  }
-#else
-  memcpy(streamdata.stream, encoded, 10);
-#endif
-
-  /* Decode frame length. */
-  err = WebRtcIsac_DecodeFrameLen(&streamdata, bweIndex);
-  if (err < 0) {
-    return err;
-  }
-
-  /* Decode BW estimation. */
-  err = WebRtcIsac_DecodeSendBW(&streamdata, bweIndex);
-  if (err < 0) {
-    return err;
-  }
-
-  return 0;
-}
-
-
-/****************************************************************************
- * WebRtcIsac_ReadFrameLen(...)
- *
- * This function returns the number of samples the decoder will generate if
- * the given payload is decoded.
- *
- * Input:
- *        - encoded           : Encoded bitstream
- *
- * Output:
- *        - frameLength       : Length of frame in packet (in samples)
- *
- */
-int16_t WebRtcIsac_ReadFrameLen(ISACStruct* ISAC_main_inst,
-                                const uint8_t* encoded,
-                                int16_t* frameLength) {
-  Bitstr streamdata;
-#ifndef WEBRTC_ARCH_BIG_ENDIAN
-  int k;
-#endif
-  int16_t err;
-  ISACMainStruct* instISAC;
-
-  WebRtcIsac_ResetBitstream(&(streamdata));
-
-#ifndef WEBRTC_ARCH_BIG_ENDIAN
-  for (k = 0; k < 10; k++) {
-    int16_t ek2 = ((const int16_t*)encoded)[k >> 1];
-    streamdata.stream[k] = (uint8_t)((ek2 >> ((k & 1) << 3)) & 0xff);
-  }
-#else
-  memcpy(streamdata.stream, encoded, 10);
-#endif
-
-  /* Decode frame length. */
-  err = WebRtcIsac_DecodeFrameLen(&streamdata, frameLength);
-  if (err < 0) {
-    return -1;
-  }
-  instISAC = (ISACMainStruct*)ISAC_main_inst;
-
-  if (instISAC->decoderSamplingRateKHz == kIsacSuperWideband) {
-    /* The decoded frame length indicates the number of samples in
-     * lower-band in this case, multiply by 2 to get the total number
-     * of samples. */
-    *frameLength <<= 1;
-  }
-  return 0;
-}
-
-
-/*******************************************************************************
- * WebRtcIsac_GetNewFrameLen(...)
- *
- * This function returns the frame length (in samples) of the next packet.
- * In the case of channel-adaptive mode, iSAC decides on its frame length based
- * on the estimated bottleneck, this AOI allows a user to prepare for the next
- * packet (at the encoder).
- *
- * The primary usage is in CE to make the iSAC works in channel-adaptive mode
- *
- * Input:
- *        - ISAC_main_inst     : iSAC struct
- *
- * Return Value                : frame lenght in samples
- *
- */
-int16_t WebRtcIsac_GetNewFrameLen(ISACStruct* ISAC_main_inst) {
-  ISACMainStruct* instISAC = (ISACMainStruct*)ISAC_main_inst;
-
-  /* Return new frame length. */
-  if (instISAC->in_sample_rate_hz == 16000)
-    return (instISAC->instLB.ISACencLB_obj.new_framelength);
-  else  /* 32000 Hz */
-    return ((instISAC->instLB.ISACencLB_obj.new_framelength) * 2);
-}
-
-
-/****************************************************************************
- * WebRtcIsac_GetErrorCode(...)
- *
- * This function can be used to check the error code of an iSAC instance.
- * When a function returns -1 an error code will be set for that instance.
- * The function below extracts the code of the last error that occurred in
- * the specified instance.
- *
- * Input:
- *        - ISAC_main_inst    : ISAC instance
- *
- * Return value               : Error code
- */
-int16_t WebRtcIsac_GetErrorCode(ISACStruct* ISAC_main_inst) {
- return ((ISACMainStruct*)ISAC_main_inst)->errorCode;
-}
-
-
-/****************************************************************************
- * WebRtcIsac_GetUplinkBw(...)
- *
- * This function outputs the target bottleneck of the codec. In
- * channel-adaptive mode, the target bottleneck is specified through an in-band
- * signalling retrieved by bandwidth estimator.
- * In channel-independent, also called instantaneous mode, the target
- * bottleneck is provided to the encoder by calling xxx_control(...) (if
- * xxx_control is never called, the default values are used.).
- * Note that the output is the iSAC internal operating bottleneck which might
- * differ slightly from the one provided through xxx_control().
- *
- * Input:
- *        - ISAC_main_inst    : iSAC instance
- *
- * Output:
- *        - *bottleneck       : bottleneck in bits/sec
- *
- * Return value               : -1 if error happens
- *                               0 bit-rates computed correctly.
- */
-int16_t WebRtcIsac_GetUplinkBw(ISACStruct*  ISAC_main_inst,
-                               int32_t* bottleneck) {
-  ISACMainStruct* instISAC = (ISACMainStruct*)ISAC_main_inst;
-
-  if (instISAC->codingMode == 0) {
-    /* We are in adaptive mode then get the bottleneck from BWE. */
-    *bottleneck = (int32_t)instISAC->bwestimator_obj.send_bw_avg;
-  } else {
-    *bottleneck = instISAC->bottleneck;
-  }
-
-  if ((*bottleneck > 32000) && (*bottleneck < 38000)) {
-    *bottleneck = 32000;
-  } else if ((*bottleneck > 45000) && (*bottleneck < 50000)) {
-    *bottleneck = 45000;
-  } else if (*bottleneck > 56000) {
-    *bottleneck = 56000;
-  }
-  return 0;
-}
-
-
-/******************************************************************************
- * WebRtcIsac_SetMaxPayloadSize(...)
- *
- * This function sets a limit for the maximum payload size of iSAC. The same
- * value is used both for 30 and 60 ms packets. If the encoder sampling rate
- * is 16 kHz the maximum payload size is between 120 and 400 bytes. If the
- * encoder sampling rate is 32 kHz the maximum payload size is between 120
- * and 600 bytes.
- *
- * ---------------
- * IMPORTANT NOTES
- * ---------------
- * The size of a packet is limited to the minimum of 'max-payload-size' and
- * 'max-rate.' For instance, let's assume the max-payload-size is set to
- * 170 bytes, and max-rate is set to 40 kbps. Note that a limit of 40 kbps
- * translates to 150 bytes for 30ms frame-size & 300 bytes for 60ms
- * frame-size. Then a packet with a frame-size of 30 ms is limited to 150,
- * i.e. min(170, 150), and a packet with 60 ms frame-size is limited to
- * 170 bytes, i.e. min(170, 300).
- *
- * Input:
- *        - ISAC_main_inst    : iSAC instance
- *        - maxPayloadBytes   : maximum size of the payload in bytes
- *                              valid values are between 100 and 400 bytes
- *                              if encoder sampling rate is 16 kHz. For
- *                              32 kHz encoder sampling rate valid values
- *                              are between 100 and 600 bytes.
- *
- * Return value               : 0 if successful
- *                             -1 if error happens
- */
-int16_t WebRtcIsac_SetMaxPayloadSize(ISACStruct* ISAC_main_inst,
-                                     int16_t maxPayloadBytes) {
-  ISACMainStruct* instISAC = (ISACMainStruct*)ISAC_main_inst;
-  int16_t status = 0;
-
-  /* Check if encoder initiated */
-  if ((instISAC->initFlag & BIT_MASK_ENC_INIT) !=
-      BIT_MASK_ENC_INIT) {
-    instISAC->errorCode = ISAC_ENCODER_NOT_INITIATED;
-    return -1;
-  }
-
-  if (instISAC->encoderSamplingRateKHz == kIsacSuperWideband) {
-    /* Sanity check. */
-    if (maxPayloadBytes < 120) {
-      /* 'maxRate' is out of valid range
-       * set to the acceptable value and return -1. */
-      maxPayloadBytes = 120;
-      status = -1;
-    }
-
-    /* sanity check */
-    if (maxPayloadBytes > STREAM_SIZE_MAX) {
-      /* maxRate is out of valid range,
-       * set to the acceptable value and return -1. */
-      maxPayloadBytes = STREAM_SIZE_MAX;
-      status = -1;
-    }
-  } else {
-    if (maxPayloadBytes < 120) {
-      /* Max payload-size is out of valid range
-       * set to the acceptable value and return -1. */
-      maxPayloadBytes = 120;
-      status = -1;
-    }
-    if (maxPayloadBytes > STREAM_SIZE_MAX_60) {
-      /* Max payload-size is out of valid range
-       * set to the acceptable value and return -1. */
-      maxPayloadBytes = STREAM_SIZE_MAX_60;
-      status = -1;
-    }
-  }
-  instISAC->maxPayloadSizeBytes = maxPayloadBytes;
-  UpdatePayloadSizeLimit(instISAC);
-  return status;
-}
-
-
-/******************************************************************************
- * WebRtcIsac_SetMaxRate(...)
- *
- * This function sets the maximum rate which the codec may not exceed for
- * any signal packet. The maximum rate is defined and payload-size per
- * frame-size in bits per second.
- *
- * The codec has a maximum rate of 53400 bits per second (200 bytes per 30
- * ms) if the encoder sampling rate is 16kHz, and 160 kbps (600 bytes/30 ms)
- * if the encoder sampling rate is 32 kHz.
- *
- * It is possible to set a maximum rate between 32000 and 53400 bits/sec
- * in wideband mode, and 32000 to 160000 bits/sec in super-wideband mode.
- *
- * ---------------
- * IMPORTANT NOTES
- * ---------------
- * The size of a packet is limited to the minimum of 'max-payload-size' and
- * 'max-rate.' For instance, let's assume the max-payload-size is set to
- * 170 bytes, and max-rate is set to 40 kbps. Note that a limit of 40 kbps
- * translates to 150 bytes for 30ms frame-size & 300 bytes for 60ms
- * frame-size. Then a packet with a frame-size of 30 ms is limited to 150,
- * i.e. min(170, 150), and a packet with 60 ms frame-size is limited to
- * 170 bytes, min(170, 300).
- *
- * Input:
- *        - ISAC_main_inst    : iSAC instance
- *        - maxRate           : maximum rate in bits per second,
- *                              valid values are 32000 to 53400 bits/sec in
- *                              wideband mode, and 32000 to 160000 bits/sec in
- *                              super-wideband mode.
- *
- * Return value               : 0 if successful
- *                             -1 if error happens
- */
-int16_t WebRtcIsac_SetMaxRate(ISACStruct* ISAC_main_inst,
-                              int32_t maxRate) {
-  ISACMainStruct* instISAC = (ISACMainStruct*)ISAC_main_inst;
-  int16_t maxRateInBytesPer30Ms;
-  int16_t status = 0;
-
-  /* check if encoder initiated */
-  if ((instISAC->initFlag & BIT_MASK_ENC_INIT) != BIT_MASK_ENC_INIT) {
-    instISAC->errorCode = ISAC_ENCODER_NOT_INITIATED;
-    return -1;
-  }
-  /* Calculate maximum number of bytes per 30 msec packets for the
-     given maximum rate. Multiply with 30/1000 to get number of
-     bits per 30 ms, divide by 8 to get number of bytes per 30 ms:
-     maxRateInBytes = floor((maxRate * 30/1000) / 8); */
-  maxRateInBytesPer30Ms = (int16_t)(maxRate * 3 / 800);
-
-  if (instISAC->encoderSamplingRateKHz == kIsacWideband) {
-    if (maxRate < 32000) {
-      /* 'maxRate' is out of valid range.
-       * Set to the acceptable value and return -1. */
-      maxRateInBytesPer30Ms = 120;
-      status = -1;
-    }
-
-    if (maxRate > 53400) {
-      /* 'maxRate' is out of valid range.
-       * Set to the acceptable value and return -1. */
-      maxRateInBytesPer30Ms = 200;
-      status = -1;
-    }
-  } else {
-    if (maxRateInBytesPer30Ms < 120) {
-      /* 'maxRate' is out of valid range
-       * Set to the acceptable value and return -1. */
-      maxRateInBytesPer30Ms = 120;
-      status = -1;
-    }
-
-    if (maxRateInBytesPer30Ms > STREAM_SIZE_MAX) {
-      /* 'maxRate' is out of valid range.
-       * Set to the acceptable value and return -1. */
-      maxRateInBytesPer30Ms = STREAM_SIZE_MAX;
-      status = -1;
-    }
-  }
-  instISAC->maxRateBytesPer30Ms = maxRateInBytesPer30Ms;
-  UpdatePayloadSizeLimit(instISAC);
-  return status;
-}
-
-
-/****************************************************************************
- * WebRtcIsac_GetRedPayload(...)
- *
- * This function populates "encoded" with the redundant payload of the recently
- * encodedframe. This function has to be called once that WebRtcIsac_Encode(...)
- * returns a positive value. Regardless of the frame-size this function will
- * be called only once after encoding is completed. The bit-stream is
- * targeted for 16000 bit/sec.
- *
- * Input:
- *        - ISAC_main_inst    : iSAC struct
- *
- * Output:
- *        - encoded           : the encoded data vector
- *
- *
- * Return value               : >0 - Length (in bytes) of coded data
- *                            : -1 - Error
- */
-int16_t WebRtcIsac_GetRedPayload(ISACStruct* ISAC_main_inst,
-                                 uint8_t* encoded) {
-  Bitstr iSACBitStreamInst;
-  int16_t streamLenLB;
-  int16_t streamLenUB;
-  int16_t streamLen;
-  int16_t totalLenUB;
-  ISACMainStruct* instISAC = (ISACMainStruct*)ISAC_main_inst;
-#ifndef WEBRTC_ARCH_BIG_ENDIAN
-  int k;
-#endif
-
-  if ((instISAC->initFlag & BIT_MASK_ENC_INIT) !=
-      BIT_MASK_ENC_INIT) {
-    instISAC->errorCode = ISAC_ENCODER_NOT_INITIATED;
-  }
-
-  WebRtcIsac_ResetBitstream(&(iSACBitStreamInst));
-
-  streamLenLB = WebRtcIsac_EncodeStoredDataLb(
-                  &instISAC->instLB.ISACencLB_obj.SaveEnc_obj,
-                  &iSACBitStreamInst,
-                  instISAC->instLB.ISACencLB_obj.lastBWIdx,
-                  RCU_TRANSCODING_SCALE);
-  if (streamLenLB < 0) {
-    return -1;
-  }
-
-  /* convert from bytes to int16_t. */
-  memcpy(encoded, iSACBitStreamInst.stream, streamLenLB);
-  streamLen = streamLenLB;
-  if (instISAC->bandwidthKHz == isac8kHz) {
-    return streamLenLB;
-  }
-
-  streamLenUB = WebRtcIsac_GetRedPayloadUb(
-                  &instISAC->instUB.ISACencUB_obj.SaveEnc_obj,
-                  &iSACBitStreamInst, instISAC->bandwidthKHz);
-  if (streamLenUB < 0) {
-    /* An error has happened but this is not the error due to a
-     * bit-stream larger than the limit. */
-    return -1;
-  }
-
-  /* We have one byte to write the total length of the upper-band.
-   * The length includes the bit-stream length, check-sum and the
-   * single byte where the length is written to. This is according to
-   * iSAC wideband and how the "garbage" is dealt. */
-  totalLenUB = streamLenUB + 1 + LEN_CHECK_SUM_WORD8;
-  if (totalLenUB > 255) {
-    streamLenUB = 0;
-  }
-
-  /* Generate CRC if required. */
-  if ((instISAC->bandwidthKHz != isac8kHz) &&
-      (streamLenUB > 0)) {
-    uint32_t crc;
-    streamLen += totalLenUB;
-    encoded[streamLenLB] = (uint8_t)totalLenUB;
-    memcpy(&encoded[streamLenLB + 1], iSACBitStreamInst.stream,
-           streamLenUB);
-
-    WebRtcIsac_GetCrc((int16_t*)(&(encoded[streamLenLB + 1])),
-                      streamLenUB, &crc);
-#ifndef WEBRTC_ARCH_BIG_ENDIAN
-    for (k = 0; k < LEN_CHECK_SUM_WORD8; k++) {
-      encoded[streamLen - LEN_CHECK_SUM_WORD8 + k] =
-        (uint8_t)((crc >> (24 - k * 8)) & 0xFF);
-    }
-#else
-    memcpy(&encoded[streamLenLB + streamLenUB + 1], &crc,
-           LEN_CHECK_SUM_WORD8);
-#endif
-  }
-  return streamLen;
-}
-
-
-/****************************************************************************
- * WebRtcIsac_version(...)
- *
- * This function returns the version number.
- *
- * Output:
- *        - version      : Pointer to character string
- *
- */
-void WebRtcIsac_version(char* version) {
-  strcpy(version, "4.3.0");
-}
-
-
-/******************************************************************************
- * WebRtcIsac_SetEncSampRate()
- * This function sets the sampling rate of the encoder. Initialization of the
- * encoder WILL NOT overwrite the sampling rate of the encoder. The default
- * value is 16 kHz which is set when the instance is created. The encoding-mode
- * and the bottleneck remain unchanged by this call, however, the maximum rate
- * and maximum payload-size will be reset to their default values.
- *
- * Input:
- *        - ISAC_main_inst    : iSAC instance
- *        - sample_rate_hz    : sampling rate in Hertz, valid values are 16000
- *                              and 32000.
- *
- * Return value               : 0 if successful
- *                             -1 if failed.
- */
-int16_t WebRtcIsac_SetEncSampRate(ISACStruct* ISAC_main_inst,
-                                  uint16_t sample_rate_hz) {
-  ISACMainStruct* instISAC = (ISACMainStruct*)ISAC_main_inst;
-  enum IsacSamplingRate encoder_operational_rate;
-
-  if ((sample_rate_hz != 16000) && (sample_rate_hz != 32000)) {
-    /* Sampling Frequency is not supported. */
-    instISAC->errorCode = ISAC_UNSUPPORTED_SAMPLING_FREQUENCY;
-    return -1;
-  }
-  if (sample_rate_hz == 16000) {
-    encoder_operational_rate = kIsacWideband;
-  } else {
-    encoder_operational_rate = kIsacSuperWideband;
-  }
-
-  if ((instISAC->initFlag & BIT_MASK_ENC_INIT) !=
-      BIT_MASK_ENC_INIT) {
-    if (encoder_operational_rate == kIsacWideband) {
-      instISAC->bandwidthKHz = isac8kHz;
-    } else {
-      instISAC->bandwidthKHz = isac16kHz;
-    }
-  } else {
-    ISACUBStruct* instUB = &(instISAC->instUB);
-    ISACLBStruct* instLB = &(instISAC->instLB);
-    int32_t bottleneck = instISAC->bottleneck;
-    int16_t codingMode = instISAC->codingMode;
-    int16_t frameSizeMs = instLB->ISACencLB_obj.new_framelength /
-        (FS / 1000);
-
-    if ((encoder_operational_rate == kIsacWideband) &&
-        (instISAC->encoderSamplingRateKHz == kIsacSuperWideband)) {
-      /* Changing from super-wideband to wideband.
-       * we don't need to re-initialize the encoder of the lower-band. */
-      instISAC->bandwidthKHz = isac8kHz;
-      if (codingMode == 1) {
-        ControlLb(instLB,
-                  (bottleneck > 32000) ? 32000 : bottleneck, FRAMESIZE);
-      }
-      instISAC->maxPayloadSizeBytes = STREAM_SIZE_MAX_60;
-      instISAC->maxRateBytesPer30Ms = STREAM_SIZE_MAX_30;
-    } else if ((encoder_operational_rate == kIsacSuperWideband) &&
-               (instISAC->encoderSamplingRateKHz == kIsacWideband)) {
-      double bottleneckLB = 0;
-      double bottleneckUB = 0;
-      if (codingMode == 1) {
-        WebRtcIsac_RateAllocation(bottleneck, &bottleneckLB, &bottleneckUB,
-                                  &(instISAC->bandwidthKHz));
-      }
-
-      instISAC->bandwidthKHz = isac16kHz;
-      instISAC->maxPayloadSizeBytes = STREAM_SIZE_MAX;
-      instISAC->maxRateBytesPer30Ms = STREAM_SIZE_MAX;
-
-      EncoderInitLb(instLB, codingMode, encoder_operational_rate);
-      EncoderInitUb(instUB, instISAC->bandwidthKHz);
-
-      memset(instISAC->analysisFBState1, 0,
-             FB_STATE_SIZE_WORD32 * sizeof(int32_t));
-      memset(instISAC->analysisFBState2, 0,
-             FB_STATE_SIZE_WORD32 * sizeof(int32_t));
-
-      if (codingMode == 1) {
-        instISAC->bottleneck = bottleneck;
-        ControlLb(instLB, bottleneckLB,
-                  (instISAC->bandwidthKHz == isac8kHz) ? frameSizeMs:FRAMESIZE);
-        if (instISAC->bandwidthKHz > isac8kHz) {
-          ControlUb(instUB, bottleneckUB);
-        }
-      } else {
-        instLB->ISACencLB_obj.enforceFrameSize = 0;
-        instLB->ISACencLB_obj.new_framelength = FRAMESAMPLES;
-      }
-    }
-  }
-  instISAC->encoderSamplingRateKHz = encoder_operational_rate;
-  instISAC->in_sample_rate_hz = sample_rate_hz;
-  return 0;
-}
-
-
-/******************************************************************************
- * WebRtcIsac_SetDecSampRate()
- * This function sets the sampling rate of the decoder. Initialization of the
- * decoder WILL NOT overwrite the sampling rate of the encoder. The default
- * value is 16 kHz which is set when the instance is created.
- *
- * Input:
- *        - ISAC_main_inst    : iSAC instance
- *        - sample_rate_hz    : sampling rate in Hertz, valid values are 16000
- *                              and 32000.
- *
- * Return value               : 0 if successful
- *                             -1 if failed.
- */
-int16_t WebRtcIsac_SetDecSampRate(ISACStruct* ISAC_main_inst,
-                                  uint16_t sample_rate_hz) {
-  ISACMainStruct* instISAC = (ISACMainStruct*)ISAC_main_inst;
-  enum IsacSamplingRate decoder_operational_rate;
-
-  if (sample_rate_hz == 16000) {
-    decoder_operational_rate = kIsacWideband;
-  } else if (sample_rate_hz == 32000) {
-    decoder_operational_rate = kIsacSuperWideband;
-  } else {
-    /* Sampling Frequency is not supported. */
-    instISAC->errorCode = ISAC_UNSUPPORTED_SAMPLING_FREQUENCY;
-    return -1;
-  }
-
-  if ((instISAC->decoderSamplingRateKHz == kIsacWideband) &&
-        (decoder_operational_rate == kIsacSuperWideband)) {
-      /* Switching from wideband to super-wideband at the decoder
-       * we need to reset the filter-bank and initialize upper-band decoder. */
-      memset(instISAC->synthesisFBState1, 0,
-             FB_STATE_SIZE_WORD32 * sizeof(int32_t));
-      memset(instISAC->synthesisFBState2, 0,
-             FB_STATE_SIZE_WORD32 * sizeof(int32_t));
-
-      DecoderInitUb(&instISAC->instUB);
-  }
-  instISAC->decoderSamplingRateKHz = decoder_operational_rate;
-  return 0;
-}
-
-
-/******************************************************************************
- * WebRtcIsac_EncSampRate()
- *
- * Input:
- *        - ISAC_main_inst    : iSAC instance
- *
- * Return value               : sampling rate in Hertz. The input to encoder
- *                              is expected to be sampled in this rate.
- *
- */
-uint16_t WebRtcIsac_EncSampRate(ISACStruct* ISAC_main_inst) {
-  ISACMainStruct* instISAC = (ISACMainStruct*)ISAC_main_inst;
-  return instISAC->in_sample_rate_hz;
-}
-
-
-/******************************************************************************
- * WebRtcIsac_DecSampRate()
- * Return the sampling rate of the decoded audio.
- *
- * Input:
- *        - ISAC_main_inst    : iSAC instance
- *
- * Return value               : sampling rate in Hertz. Decoder output is
- *                              sampled at this rate.
- *
- */
-uint16_t WebRtcIsac_DecSampRate(ISACStruct* ISAC_main_inst) {
-  ISACMainStruct* instISAC = (ISACMainStruct*)ISAC_main_inst;
-  return instISAC->decoderSamplingRateKHz == kIsacWideband ? 16000 : 32000;
-}
-
-void WebRtcIsac_GetBandwidthInfo(ISACStruct* inst,
-                                 IsacBandwidthInfo* bwinfo) {
-  ISACMainStruct* instISAC = (ISACMainStruct*)inst;
-  RTC_DCHECK_NE(0, instISAC->initFlag & BIT_MASK_DEC_INIT);
-  WebRtcIsacBw_GetBandwidthInfo(&instISAC->bwestimator_obj,
-                                instISAC->decoderSamplingRateKHz, bwinfo);
-}
-
-void WebRtcIsac_SetBandwidthInfo(ISACStruct* inst,
-                                 const IsacBandwidthInfo* bwinfo) {
-  ISACMainStruct* instISAC = (ISACMainStruct*)inst;
-  RTC_DCHECK_NE(0, instISAC->initFlag & BIT_MASK_ENC_INIT);
-  WebRtcIsacBw_SetBandwidthInfo(&instISAC->bwestimator_obj, bwinfo);
-}
-
-void WebRtcIsac_SetEncSampRateInDecoder(ISACStruct* inst,
-                                        int sample_rate_hz) {
-  ISACMainStruct* instISAC = (ISACMainStruct*)inst;
-  RTC_DCHECK_NE(0, instISAC->initFlag & BIT_MASK_DEC_INIT);
-  RTC_DCHECK(!(instISAC->initFlag & BIT_MASK_ENC_INIT));
-  RTC_DCHECK(sample_rate_hz == 16000 || sample_rate_hz == 32000);
-  instISAC->encoderSamplingRateKHz = sample_rate_hz / 1000;
-}
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_coding/codecs/isac/main/source/isac_float_type.h b/submodules/libtgvoip/webrtc_dsp/modules/audio_coding/codecs/isac/main/source/isac_float_type.h
deleted file mode 100644
index 59a8805bd5..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_coding/codecs/isac/main/source/isac_float_type.h
+++ /dev/null
@@ -1,117 +0,0 @@
-/*
- *  Copyright (c) 2015 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#ifndef MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_ISAC_FLOAT_TYPE_H_
-#define MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_ISAC_FLOAT_TYPE_H_
-
-#include "modules/audio_coding/codecs/isac/main/include/isac.h"
-
-namespace webrtc {
-
-struct IsacFloat {
-  using instance_type = ISACStruct;
-  static const bool has_swb = true;
-  static inline int16_t Control(instance_type* inst,
-                                int32_t rate,
-                                int framesize) {
-    return WebRtcIsac_Control(inst, rate, framesize);
-  }
-  static inline int16_t ControlBwe(instance_type* inst,
-                                   int32_t rate_bps,
-                                   int frame_size_ms,
-                                   int16_t enforce_frame_size) {
-    return WebRtcIsac_ControlBwe(inst, rate_bps, frame_size_ms,
-                                 enforce_frame_size);
-  }
-  static inline int16_t Create(instance_type** inst) {
-    return WebRtcIsac_Create(inst);
-  }
-  static inline int DecodeInternal(instance_type* inst,
-                                   const uint8_t* encoded,
-                                   size_t len,
-                                   int16_t* decoded,
-                                   int16_t* speech_type) {
-    return WebRtcIsac_Decode(inst, encoded, len, decoded, speech_type);
-  }
-  static inline size_t DecodePlc(instance_type* inst,
-                                 int16_t* decoded,
-                                 size_t num_lost_frames) {
-    return WebRtcIsac_DecodePlc(inst, decoded, num_lost_frames);
-  }
-
-  static inline void DecoderInit(instance_type* inst) {
-    WebRtcIsac_DecoderInit(inst);
-  }
-  static inline int Encode(instance_type* inst,
-                           const int16_t* speech_in,
-                           uint8_t* encoded) {
-    return WebRtcIsac_Encode(inst, speech_in, encoded);
-  }
-  static inline int16_t EncoderInit(instance_type* inst, int16_t coding_mode) {
-    return WebRtcIsac_EncoderInit(inst, coding_mode);
-  }
-  static inline uint16_t EncSampRate(instance_type* inst) {
-    return WebRtcIsac_EncSampRate(inst);
-  }
-
-  static inline int16_t Free(instance_type* inst) {
-    return WebRtcIsac_Free(inst);
-  }
-  static inline void GetBandwidthInfo(instance_type* inst,
-                                      IsacBandwidthInfo* bwinfo) {
-    WebRtcIsac_GetBandwidthInfo(inst, bwinfo);
-  }
-  static inline int16_t GetErrorCode(instance_type* inst) {
-    return WebRtcIsac_GetErrorCode(inst);
-  }
-
-  static inline int16_t GetNewFrameLen(instance_type* inst) {
-    return WebRtcIsac_GetNewFrameLen(inst);
-  }
-  static inline void SetBandwidthInfo(instance_type* inst,
-                                      const IsacBandwidthInfo* bwinfo) {
-    WebRtcIsac_SetBandwidthInfo(inst, bwinfo);
-  }
-  static inline int16_t SetDecSampRate(instance_type* inst,
-                                       uint16_t sample_rate_hz) {
-    return WebRtcIsac_SetDecSampRate(inst, sample_rate_hz);
-  }
-  static inline int16_t SetEncSampRate(instance_type* inst,
-                                       uint16_t sample_rate_hz) {
-    return WebRtcIsac_SetEncSampRate(inst, sample_rate_hz);
-  }
-  static inline void SetEncSampRateInDecoder(instance_type* inst,
-                                             uint16_t sample_rate_hz) {
-    WebRtcIsac_SetEncSampRateInDecoder(inst, sample_rate_hz);
-  }
-  static inline void SetInitialBweBottleneck(instance_type* inst,
-                                             int bottleneck_bits_per_second) {
-    WebRtcIsac_SetInitialBweBottleneck(inst, bottleneck_bits_per_second);
-  }
-  static inline int16_t UpdateBwEstimate(instance_type* inst,
-                                         const uint8_t* encoded,
-                                         size_t packet_size,
-                                         uint16_t rtp_seq_number,
-                                         uint32_t send_ts,
-                                         uint32_t arr_ts) {
-    return WebRtcIsac_UpdateBwEstimate(inst, encoded, packet_size,
-                                       rtp_seq_number, send_ts, arr_ts);
-  }
-  static inline int16_t SetMaxPayloadSize(instance_type* inst,
-                                          int16_t max_payload_size_bytes) {
-    return WebRtcIsac_SetMaxPayloadSize(inst, max_payload_size_bytes);
-  }
-  static inline int16_t SetMaxRate(instance_type* inst, int32_t max_bit_rate) {
-    return WebRtcIsac_SetMaxRate(inst, max_bit_rate);
-  }
-};
-
-}  // namespace webrtc
-#endif  // MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_ISAC_FLOAT_TYPE_H_
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_coding/codecs/isac/main/source/isac_vad.c b/submodules/libtgvoip/webrtc_dsp/modules/audio_coding/codecs/isac/main/source/isac_vad.c
deleted file mode 100644
index 57cf0c39da..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_coding/codecs/isac/main/source/isac_vad.c
+++ /dev/null
@@ -1,409 +0,0 @@
-/*
- *  Copyright (c) 2018 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#include "modules/audio_coding/codecs/isac/main/source/isac_vad.h"
-
-#include <math.h>
-
-void WebRtcIsac_InitPitchFilter(PitchFiltstr* pitchfiltdata) {
-  int k;
-
-  for (k = 0; k < PITCH_BUFFSIZE; k++) {
-    pitchfiltdata->ubuf[k] = 0.0;
-  }
-  pitchfiltdata->ystate[0] = 0.0;
-  for (k = 1; k < (PITCH_DAMPORDER); k++) {
-    pitchfiltdata->ystate[k] = 0.0;
-  }
-  pitchfiltdata->oldlagp[0] = 50.0;
-  pitchfiltdata->oldgainp[0] = 0.0;
-}
-
-static void WebRtcIsac_InitWeightingFilter(WeightFiltstr* wfdata) {
-  int k;
-  double t, dtmp, dtmp2, denum, denum2;
-
-  for (k = 0; k < PITCH_WLPCBUFLEN; k++)
-    wfdata->buffer[k] = 0.0;
-
-  for (k = 0; k < PITCH_WLPCORDER; k++) {
-    wfdata->istate[k] = 0.0;
-    wfdata->weostate[k] = 0.0;
-    wfdata->whostate[k] = 0.0;
-  }
-
-  /* next part should be in Matlab, writing to a global table */
-  t = 0.5;
-  denum = 1.0 / ((double)PITCH_WLPCWINLEN);
-  denum2 = denum * denum;
-  for (k = 0; k < PITCH_WLPCWINLEN; k++) {
-    dtmp = PITCH_WLPCASYM * t * denum + (1 - PITCH_WLPCASYM) * t * t * denum2;
-    dtmp *= 3.14159265;
-    dtmp2 = sin(dtmp);
-    wfdata->window[k] = dtmp2 * dtmp2;
-    t++;
-  }
-}
-
-void WebRtcIsac_InitPitchAnalysis(PitchAnalysisStruct* State) {
-  int k;
-
-  for (k = 0; k < PITCH_CORR_LEN2 + PITCH_CORR_STEP2 + PITCH_MAX_LAG / 2 -
-                      PITCH_FRAME_LEN / 2 + 2;
-       k++)
-    State->dec_buffer[k] = 0.0;
-  for (k = 0; k < 2 * ALLPASSSECTIONS + 1; k++)
-    State->decimator_state[k] = 0.0;
-  for (k = 0; k < 2; k++)
-    State->hp_state[k] = 0.0;
-  for (k = 0; k < QLOOKAHEAD; k++)
-    State->whitened_buf[k] = 0.0;
-  for (k = 0; k < QLOOKAHEAD; k++)
-    State->inbuf[k] = 0.0;
-
-  WebRtcIsac_InitPitchFilter(&(State->PFstr_wght));
-
-  WebRtcIsac_InitPitchFilter(&(State->PFstr));
-
-  WebRtcIsac_InitWeightingFilter(&(State->Wghtstr));
-}
-
-void WebRtcIsac_InitPreFilterbank(PreFiltBankstr* prefiltdata) {
-  int k;
-
-  for (k = 0; k < QLOOKAHEAD; k++) {
-    prefiltdata->INLABUF1[k] = 0;
-    prefiltdata->INLABUF2[k] = 0;
-
-    prefiltdata->INLABUF1_float[k] = 0;
-    prefiltdata->INLABUF2_float[k] = 0;
-  }
-  for (k = 0; k < 2 * (QORDER - 1); k++) {
-    prefiltdata->INSTAT1[k] = 0;
-    prefiltdata->INSTAT2[k] = 0;
-    prefiltdata->INSTATLA1[k] = 0;
-    prefiltdata->INSTATLA2[k] = 0;
-
-    prefiltdata->INSTAT1_float[k] = 0;
-    prefiltdata->INSTAT2_float[k] = 0;
-    prefiltdata->INSTATLA1_float[k] = 0;
-    prefiltdata->INSTATLA2_float[k] = 0;
-  }
-
-  /* High pass filter states */
-  prefiltdata->HPstates[0] = 0.0;
-  prefiltdata->HPstates[1] = 0.0;
-
-  prefiltdata->HPstates_float[0] = 0.0f;
-  prefiltdata->HPstates_float[1] = 0.0f;
-
-  return;
-}
-
-double WebRtcIsac_LevDurb(double* a, double* k, double* r, size_t order) {
-  const double LEVINSON_EPS = 1.0e-10;
-
-  double sum, alpha;
-  size_t m, m_h, i;
-  alpha = 0;  // warning -DH
-  a[0] = 1.0;
-  if (r[0] < LEVINSON_EPS) { /* if r[0] <= 0, set LPC coeff. to zero */
-    for (i = 0; i < order; i++) {
-      k[i] = 0;
-      a[i + 1] = 0;
-    }
-  } else {
-    a[1] = k[0] = -r[1] / r[0];
-    alpha = r[0] + r[1] * k[0];
-    for (m = 1; m < order; m++) {
-      sum = r[m + 1];
-      for (i = 0; i < m; i++) {
-        sum += a[i + 1] * r[m - i];
-      }
-      k[m] = -sum / alpha;
-      alpha += k[m] * sum;
-      m_h = (m + 1) >> 1;
-      for (i = 0; i < m_h; i++) {
-        sum = a[i + 1] + k[m] * a[m - i];
-        a[m - i] += k[m] * a[i + 1];
-        a[i + 1] = sum;
-      }
-      a[m + 1] = k[m];
-    }
-  }
-  return alpha;
-}
-
-/* The upper channel all-pass filter factors */
-const float WebRtcIsac_kUpperApFactorsFloat[2] = {0.03470000000000f,
-                                                  0.38260000000000f};
-
-/* The lower channel all-pass filter factors */
-const float WebRtcIsac_kLowerApFactorsFloat[2] = {0.15440000000000f,
-                                                  0.74400000000000f};
-
-/* This function performs all-pass filtering--a series of first order all-pass
- * sections are used to filter the input in a cascade manner.
- * The input is overwritten!!
- */
-void WebRtcIsac_AllPassFilter2Float(float* InOut,
-                                    const float* APSectionFactors,
-                                    int lengthInOut,
-                                    int NumberOfSections,
-                                    float* FilterState) {
-  int n, j;
-  float temp;
-  for (j = 0; j < NumberOfSections; j++) {
-    for (n = 0; n < lengthInOut; n++) {
-      temp = FilterState[j] + APSectionFactors[j] * InOut[n];
-      FilterState[j] = -APSectionFactors[j] * temp + InOut[n];
-      InOut[n] = temp;
-    }
-  }
-}
-
-/* The number of composite all-pass filter factors */
-#define NUMBEROFCOMPOSITEAPSECTIONS 4
-
-/* Function WebRtcIsac_SplitAndFilter
- * This function creates low-pass and high-pass decimated versions of part of
- the input signal, and part of the signal in the input 'lookahead buffer'.
-
- INPUTS:
- in: a length FRAMESAMPLES array of input samples
- prefiltdata: input data structure containing the filterbank states
- and lookahead samples from the previous encoding
- iteration.
- OUTPUTS:
- LP: a FRAMESAMPLES_HALF array of low-pass filtered samples that
- have been phase equalized.  The first QLOOKAHEAD samples are
- based on the samples in the two prefiltdata->INLABUFx arrays
- each of length QLOOKAHEAD.
- The remaining FRAMESAMPLES_HALF-QLOOKAHEAD samples are based
- on the first FRAMESAMPLES_HALF-QLOOKAHEAD samples of the input
- array in[].
- HP: a FRAMESAMPLES_HALF array of high-pass filtered samples that
- have been phase equalized.  The first QLOOKAHEAD samples are
- based on the samples in the two prefiltdata->INLABUFx arrays
- each of length QLOOKAHEAD.
- The remaining FRAMESAMPLES_HALF-QLOOKAHEAD samples are based
- on the first FRAMESAMPLES_HALF-QLOOKAHEAD samples of the input
- array in[].
-
- LP_la: a FRAMESAMPLES_HALF array of low-pass filtered samples.
- These samples are not phase equalized. They are computed
- from the samples in the in[] array.
- HP_la: a FRAMESAMPLES_HALF array of high-pass filtered samples
- that are not phase equalized. They are computed from
- the in[] vector.
- prefiltdata: this input data structure's filterbank state and
- lookahead sample buffers are updated for the next
- encoding iteration.
-*/
-void WebRtcIsac_SplitAndFilterFloat(float* pin,
-                                    float* LP,
-                                    float* HP,
-                                    double* LP_la,
-                                    double* HP_la,
-                                    PreFiltBankstr* prefiltdata) {
-  int k, n;
-  float CompositeAPFilterState[NUMBEROFCOMPOSITEAPSECTIONS];
-  float ForTransform_CompositeAPFilterState[NUMBEROFCOMPOSITEAPSECTIONS];
-  float ForTransform_CompositeAPFilterState2[NUMBEROFCOMPOSITEAPSECTIONS];
-  float tempinoutvec[FRAMESAMPLES + MAX_AR_MODEL_ORDER];
-  float tempin_ch1[FRAMESAMPLES + MAX_AR_MODEL_ORDER];
-  float tempin_ch2[FRAMESAMPLES + MAX_AR_MODEL_ORDER];
-  float in[FRAMESAMPLES];
-  float ftmp;
-
-  /* HPstcoeff_in = {a1, a2, b1 - b0 * a1, b2 - b0 * a2}; */
-  static const float kHpStCoefInFloat[4] = {
-      -1.94895953203325f, 0.94984516000000f, -0.05101826139794f,
-      0.05015484000000f};
-
-  /* The composite all-pass filter factors */
-  static const float WebRtcIsac_kCompositeApFactorsFloat[4] = {
-      0.03470000000000f, 0.15440000000000f, 0.38260000000000f,
-      0.74400000000000f};
-
-  // The matrix for transforming the backward composite state to upper channel
-  // state.
-  static const float WebRtcIsac_kTransform1Float[8] = {
-      -0.00158678506084f, 0.00127157815343f, -0.00104805672709f,
-      0.00084837248079f,  0.00134467983258f, -0.00107756549387f,
-      0.00088814793277f,  -0.00071893072525f};
-
-  // The matrix for transforming the backward composite state to lower channel
-  // state.
-  static const float WebRtcIsac_kTransform2Float[8] = {
-      -0.00170686041697f, 0.00136780109829f, -0.00112736532350f,
-      0.00091257055385f,  0.00103094281812f, -0.00082615076557f,
-      0.00068092756088f,  -0.00055119165484f};
-
-  /* High pass filter */
-
-  for (k = 0; k < FRAMESAMPLES; k++) {
-    in[k] = pin[k] + kHpStCoefInFloat[2] * prefiltdata->HPstates_float[0] +
-            kHpStCoefInFloat[3] * prefiltdata->HPstates_float[1];
-    ftmp = pin[k] - kHpStCoefInFloat[0] * prefiltdata->HPstates_float[0] -
-           kHpStCoefInFloat[1] * prefiltdata->HPstates_float[1];
-    prefiltdata->HPstates_float[1] = prefiltdata->HPstates_float[0];
-    prefiltdata->HPstates_float[0] = ftmp;
-  }
-
-  /* First Channel */
-
-  /*initial state of composite filter is zero */
-  for (k = 0; k < NUMBEROFCOMPOSITEAPSECTIONS; k++) {
-    CompositeAPFilterState[k] = 0.0;
-  }
-  /* put every other sample of input into a temporary vector in reverse
-   * (backward) order*/
-  for (k = 0; k < FRAMESAMPLES_HALF; k++) {
-    tempinoutvec[k] = in[FRAMESAMPLES - 1 - 2 * k];
-  }
-
-  /* now all-pass filter the backwards vector.  Output values overwrite the
-   * input vector. */
-  WebRtcIsac_AllPassFilter2Float(
-      tempinoutvec, WebRtcIsac_kCompositeApFactorsFloat, FRAMESAMPLES_HALF,
-      NUMBEROFCOMPOSITEAPSECTIONS, CompositeAPFilterState);
-
-  /* save the backwards filtered output for later forward filtering,
-     but write it in forward order*/
-  for (k = 0; k < FRAMESAMPLES_HALF; k++) {
-    tempin_ch1[FRAMESAMPLES_HALF + QLOOKAHEAD - 1 - k] = tempinoutvec[k];
-  }
-
-  /* save the backwards filter state  becaue it will be transformed
-     later into a forward state */
-  for (k = 0; k < NUMBEROFCOMPOSITEAPSECTIONS; k++) {
-    ForTransform_CompositeAPFilterState[k] = CompositeAPFilterState[k];
-  }
-
-  /* now backwards filter the samples in the lookahead buffer. The samples were
-     placed there in the encoding of the previous frame.  The output samples
-     overwrite the input samples */
-  WebRtcIsac_AllPassFilter2Float(
-      prefiltdata->INLABUF1_float, WebRtcIsac_kCompositeApFactorsFloat,
-      QLOOKAHEAD, NUMBEROFCOMPOSITEAPSECTIONS, CompositeAPFilterState);
-
-  /* save the output, but write it in forward order */
-  /* write the lookahead samples for the next encoding iteration. Every other
-     sample at the end of the input frame is written in reverse order for the
-     lookahead length. Exported in the prefiltdata structure. */
-  for (k = 0; k < QLOOKAHEAD; k++) {
-    tempin_ch1[QLOOKAHEAD - 1 - k] = prefiltdata->INLABUF1_float[k];
-    prefiltdata->INLABUF1_float[k] = in[FRAMESAMPLES - 1 - 2 * k];
-  }
-
-  /* Second Channel.  This is exactly like the first channel, except that the
-     even samples are now filtered instead (lower channel). */
-  for (k = 0; k < NUMBEROFCOMPOSITEAPSECTIONS; k++) {
-    CompositeAPFilterState[k] = 0.0;
-  }
-
-  for (k = 0; k < FRAMESAMPLES_HALF; k++) {
-    tempinoutvec[k] = in[FRAMESAMPLES - 2 - 2 * k];
-  }
-
-  WebRtcIsac_AllPassFilter2Float(
-      tempinoutvec, WebRtcIsac_kCompositeApFactorsFloat, FRAMESAMPLES_HALF,
-      NUMBEROFCOMPOSITEAPSECTIONS, CompositeAPFilterState);
-
-  for (k = 0; k < FRAMESAMPLES_HALF; k++) {
-    tempin_ch2[FRAMESAMPLES_HALF + QLOOKAHEAD - 1 - k] = tempinoutvec[k];
-  }
-
-  for (k = 0; k < NUMBEROFCOMPOSITEAPSECTIONS; k++) {
-    ForTransform_CompositeAPFilterState2[k] = CompositeAPFilterState[k];
-  }
-
-  WebRtcIsac_AllPassFilter2Float(
-      prefiltdata->INLABUF2_float, WebRtcIsac_kCompositeApFactorsFloat,
-      QLOOKAHEAD, NUMBEROFCOMPOSITEAPSECTIONS, CompositeAPFilterState);
-
-  for (k = 0; k < QLOOKAHEAD; k++) {
-    tempin_ch2[QLOOKAHEAD - 1 - k] = prefiltdata->INLABUF2_float[k];
-    prefiltdata->INLABUF2_float[k] = in[FRAMESAMPLES - 2 - 2 * k];
-  }
-
-  /* Transform filter states from backward to forward */
-  /*At this point, each of the states of the backwards composite filters for the
-    two channels are transformed into forward filtering states for the
-    corresponding forward channel filters.  Each channel's forward filtering
-    state from the previous
-    encoding iteration is added to the transformed state to get a proper forward
-    state */
-
-  /* So the existing NUMBEROFCOMPOSITEAPSECTIONS x 1 (4x1) state vector is
-     multiplied by a NUMBEROFCHANNELAPSECTIONSxNUMBEROFCOMPOSITEAPSECTIONS (2x4)
-     transform matrix to get the new state that is added to the previous 2x1
-     input state */
-
-  for (k = 0; k < NUMBEROFCHANNELAPSECTIONS; k++) { /* k is row variable */
-    for (n = 0; n < NUMBEROFCOMPOSITEAPSECTIONS;
-         n++) { /* n is column variable */
-      prefiltdata->INSTAT1_float[k] +=
-          ForTransform_CompositeAPFilterState[n] *
-          WebRtcIsac_kTransform1Float[k * NUMBEROFCHANNELAPSECTIONS + n];
-      prefiltdata->INSTAT2_float[k] +=
-          ForTransform_CompositeAPFilterState2[n] *
-          WebRtcIsac_kTransform2Float[k * NUMBEROFCHANNELAPSECTIONS + n];
-    }
-  }
-
-  /*obtain polyphase components by forward all-pass filtering through each
-   * channel */
-  /* the backward filtered samples are now forward filtered with the
-   * corresponding channel filters */
-  /* The all pass filtering automatically updates the filter states which are
-     exported in the prefiltdata structure */
-  WebRtcIsac_AllPassFilter2Float(tempin_ch1, WebRtcIsac_kUpperApFactorsFloat,
-                                 FRAMESAMPLES_HALF, NUMBEROFCHANNELAPSECTIONS,
-                                 prefiltdata->INSTAT1_float);
-  WebRtcIsac_AllPassFilter2Float(tempin_ch2, WebRtcIsac_kLowerApFactorsFloat,
-                                 FRAMESAMPLES_HALF, NUMBEROFCHANNELAPSECTIONS,
-                                 prefiltdata->INSTAT2_float);
-
-  /* Now Construct low-pass and high-pass signals as combinations of polyphase
-   * components */
-  for (k = 0; k < FRAMESAMPLES_HALF; k++) {
-    LP[k] = 0.5f * (tempin_ch1[k] + tempin_ch2[k]); /* low pass signal*/
-    HP[k] = 0.5f * (tempin_ch1[k] - tempin_ch2[k]); /* high pass signal*/
-  }
-
-  /* Lookahead LP and HP signals */
-  /* now create low pass and high pass signals of the input vector.  However, no
-     backwards filtering is performed, and hence no phase equalization is
-     involved. Also, the input contains some samples that are lookahead samples.
-     The high pass and low pass signals that are created are used outside this
-     function for analysis (not encoding) purposes */
-
-  /* set up input */
-  for (k = 0; k < FRAMESAMPLES_HALF; k++) {
-    tempin_ch1[k] = in[2 * k + 1];
-    tempin_ch2[k] = in[2 * k];
-  }
-
-  /* the input filter states are passed in and updated by the all-pass filtering
-     routine and exported in the prefiltdata structure*/
-  WebRtcIsac_AllPassFilter2Float(tempin_ch1, WebRtcIsac_kUpperApFactorsFloat,
-                                 FRAMESAMPLES_HALF, NUMBEROFCHANNELAPSECTIONS,
-                                 prefiltdata->INSTATLA1_float);
-  WebRtcIsac_AllPassFilter2Float(tempin_ch2, WebRtcIsac_kLowerApFactorsFloat,
-                                 FRAMESAMPLES_HALF, NUMBEROFCHANNELAPSECTIONS,
-                                 prefiltdata->INSTATLA2_float);
-
-  for (k = 0; k < FRAMESAMPLES_HALF; k++) {
-    LP_la[k] = (float)(0.5f * (tempin_ch1[k] + tempin_ch2[k]));  /*low pass */
-    HP_la[k] = (double)(0.5f * (tempin_ch1[k] - tempin_ch2[k])); /* high pass */
-  }
-}
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_coding/codecs/isac/main/source/isac_vad.h b/submodules/libtgvoip/webrtc_dsp/modules/audio_coding/codecs/isac/main/source/isac_vad.h
deleted file mode 100644
index 1aecfc4046..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_coding/codecs/isac/main/source/isac_vad.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- *  Copyright (c) 2018 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#ifndef MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_ISAC_VAD_H_
-#define MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_ISAC_VAD_H_
-
-#include <stddef.h>
-
-#include "modules/audio_coding/codecs/isac/main/source/structs.h"
-
-void WebRtcIsac_InitPitchFilter(PitchFiltstr* pitchfiltdata);
-void WebRtcIsac_InitPitchAnalysis(PitchAnalysisStruct* state);
-void WebRtcIsac_InitPreFilterbank(PreFiltBankstr* prefiltdata);
-
-double WebRtcIsac_LevDurb(double* a, double* k, double* r, size_t order);
-
-/* The number of all-pass filter factors in an upper or lower channel*/
-#define NUMBEROFCHANNELAPSECTIONS 2
-
-/* The upper channel all-pass filter factors */
-extern const float WebRtcIsac_kUpperApFactorsFloat[2];
-
-/* The lower channel all-pass filter factors */
-extern const float WebRtcIsac_kLowerApFactorsFloat[2];
-
-void WebRtcIsac_AllPassFilter2Float(float* InOut,
-                                    const float* APSectionFactors,
-                                    int lengthInOut,
-                                    int NumberOfSections,
-                                    float* FilterState);
-void WebRtcIsac_SplitAndFilterFloat(float* in,
-                                    float* LP,
-                                    float* HP,
-                                    double* LP_la,
-                                    double* HP_la,
-                                    PreFiltBankstr* prefiltdata);
-
-#endif  // MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_ISAC_VAD_H_
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_coding/codecs/isac/main/source/lattice.c b/submodules/libtgvoip/webrtc_dsp/modules/audio_coding/codecs/isac/main/source/lattice.c
deleted file mode 100644
index d9d2d65665..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_coding/codecs/isac/main/source/lattice.c
+++ /dev/null
@@ -1,219 +0,0 @@
-/*
- *  Copyright (c) 2011 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-/*
- * lattice.c
- *
- * contains the normalized lattice filter routines (MA and AR) for iSAC codec
- *
- */
-
-#include <math.h>
-#include <memory.h>
-#include <string.h>
-#ifdef WEBRTC_ANDROID
-#include <stdlib.h>
-#endif
-
-#include "modules/audio_coding/codecs/isac/main/source/settings.h"
-#include "modules/audio_coding/codecs/isac/main/source/codec.h"
-
-/* filter the signal using normalized lattice filter */
-/* MA filter */
-void WebRtcIsac_NormLatticeFilterMa(int orderCoef,
-                                     float *stateF,
-                                     float *stateG,
-                                     float *lat_in,
-                                     double *filtcoeflo,
-                                     double *lat_out)
-{
-  int n,k,i,u,temp1;
-  int ord_1 = orderCoef+1;
-  float sth[MAX_AR_MODEL_ORDER];
-  float cth[MAX_AR_MODEL_ORDER];
-  float inv_cth[MAX_AR_MODEL_ORDER];
-  double a[MAX_AR_MODEL_ORDER+1];
-  float f[MAX_AR_MODEL_ORDER+1][HALF_SUBFRAMELEN], g[MAX_AR_MODEL_ORDER+1][HALF_SUBFRAMELEN];
-  float gain1;
-
-  for (u=0;u<SUBFRAMES;u++)
-  {
-    /* set the Direct Form coefficients */
-    temp1 = u*ord_1;
-    a[0] = 1;
-    memcpy(a+1, filtcoeflo+temp1+1, sizeof(double) * (ord_1-1));
-
-    /* compute lattice filter coefficients */
-    WebRtcIsac_Dir2Lat(a,orderCoef,sth,cth);
-
-    /* compute the gain */
-    gain1 = (float)filtcoeflo[temp1];
-    for (k=0;k<orderCoef;k++)
-    {
-      gain1 *= cth[k];
-      inv_cth[k] = 1/cth[k];
-    }
-
-    /* normalized lattice filter */
-    /*****************************/
-
-    /* initial conditions */
-    for (i=0;i<HALF_SUBFRAMELEN;i++)
-    {
-      f[0][i] = lat_in[i + u * HALF_SUBFRAMELEN];
-      g[0][i] = lat_in[i + u * HALF_SUBFRAMELEN];
-    }
-
-    /* get the state of f&g for the first input, for all orders */
-    for (i=1;i<ord_1;i++)
-    {
-      f[i][0] = inv_cth[i-1]*(f[i-1][0] + sth[i-1]*stateG[i-1]);
-      g[i][0] = cth[i-1]*stateG[i-1] + sth[i-1]* f[i][0];
-    }
-
-    /* filtering */
-    for(k=0;k<orderCoef;k++)
-    {
-      for(n=0;n<(HALF_SUBFRAMELEN-1);n++)
-      {
-        f[k+1][n+1] = inv_cth[k]*(f[k][n+1] + sth[k]*g[k][n]);
-        g[k+1][n+1] = cth[k]*g[k][n] + sth[k]* f[k+1][n+1];
-      }
-    }
-
-    for(n=0;n<HALF_SUBFRAMELEN;n++)
-    {
-      lat_out[n + u * HALF_SUBFRAMELEN] = gain1 * f[orderCoef][n];
-    }
-
-    /* save the states */
-    for (i=0;i<ord_1;i++)
-    {
-      stateF[i] = f[i][HALF_SUBFRAMELEN-1];
-      stateG[i] = g[i][HALF_SUBFRAMELEN-1];
-    }
-    /* process next frame */
-  }
-
-  return;
-}
-
-
-/*///////////////////AR filter ///////////////////////////////*/
-/* filter the signal using normalized lattice filter */
-void WebRtcIsac_NormLatticeFilterAr(int orderCoef,
-                                     float *stateF,
-                                     float *stateG,
-                                     double *lat_in,
-                                     double *lo_filt_coef,
-                                     float *lat_out)
-{
-  int n,k,i,u,temp1;
-  int ord_1 = orderCoef+1;
-  float sth[MAX_AR_MODEL_ORDER];
-  float cth[MAX_AR_MODEL_ORDER];
-  double a[MAX_AR_MODEL_ORDER+1];
-  float ARf[MAX_AR_MODEL_ORDER+1][HALF_SUBFRAMELEN], ARg[MAX_AR_MODEL_ORDER+1][HALF_SUBFRAMELEN];
-  float gain1,inv_gain1;
-
-  for (u=0;u<SUBFRAMES;u++)
-  {
-    /* set the denominator and numerator of the Direct Form */
-    temp1 = u*ord_1;
-    a[0] = 1;
-
-    memcpy(a+1, lo_filt_coef+temp1+1, sizeof(double) * (ord_1-1));
-
-    WebRtcIsac_Dir2Lat(a,orderCoef,sth,cth);
-
-    gain1 = (float)lo_filt_coef[temp1];
-    for (k=0;k<orderCoef;k++)
-    {
-      gain1 = cth[k]*gain1;
-    }
-
-    /* initial conditions */
-    inv_gain1 = 1/gain1;
-    for (i=0;i<HALF_SUBFRAMELEN;i++)
-    {
-      ARf[orderCoef][i] = (float)lat_in[i + u * HALF_SUBFRAMELEN]*inv_gain1;
-    }
-
-
-    for (i=orderCoef-1;i>=0;i--) //get the state of f&g for the first input, for all orders
-    {
-      ARf[i][0] = cth[i]*ARf[i+1][0] - sth[i]*stateG[i];
-      ARg[i+1][0] = sth[i]*ARf[i+1][0] + cth[i]* stateG[i];
-    }
-    ARg[0][0] = ARf[0][0];
-
-    for(n=0;n<(HALF_SUBFRAMELEN-1);n++)
-    {
-      for(k=orderCoef-1;k>=0;k--)
-      {
-        ARf[k][n+1] = cth[k]*ARf[k+1][n+1] - sth[k]*ARg[k][n];
-        ARg[k+1][n+1] = sth[k]*ARf[k+1][n+1] + cth[k]* ARg[k][n];
-      }
-      ARg[0][n+1] = ARf[0][n+1];
-    }
-
-    memcpy(lat_out+u * HALF_SUBFRAMELEN, &(ARf[0][0]), sizeof(float) * HALF_SUBFRAMELEN);
-
-    /* cannot use memcpy in the following */
-    for (i=0;i<ord_1;i++)
-    {
-      stateF[i] = ARf[i][HALF_SUBFRAMELEN-1];
-      stateG[i] = ARg[i][HALF_SUBFRAMELEN-1];
-    }
-
-  }
-
-  return;
-}
-
-
-/* compute the reflection coefficients using the step-down procedure*/
-/* converts the direct form parameters to lattice form.*/
-/* a and b are vectors which contain the direct form coefficients,
-   according to
-   A(z) = a(1) + a(2)*z + a(3)*z^2 + ... + a(M+1)*z^M
-   B(z) = b(1) + b(2)*z + b(3)*z^2 + ... + b(M+1)*z^M
-*/
-
-void WebRtcIsac_Dir2Lat(double *a,
-                        int orderCoef,
-                        float *sth,
-                        float *cth)
-{
-  int m, k;
-  float tmp[MAX_AR_MODEL_ORDER];
-  float tmp_inv, cth2;
-
-  sth[orderCoef-1] = (float)a[orderCoef];
-  cth2 = 1.0f - sth[orderCoef-1] * sth[orderCoef-1];
-  cth[orderCoef-1] = (float)sqrt(cth2);
-  for (m=orderCoef-1; m>0; m--)
-  {
-    tmp_inv = 1.0f / cth2;
-    for (k=1; k<=m; k++)
-    {
-      tmp[k] = ((float)a[k] - sth[m] * (float)a[m-k+1]) * tmp_inv;
-    }
-
-    for (k=1; k<m; k++)
-    {
-      a[k] = tmp[k];
-    }
-
-    sth[m-1] = tmp[m];
-    cth2 = 1 - sth[m-1] * sth[m-1];
-    cth[m-1] = (float)sqrt(cth2);
-  }
-}
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_coding/codecs/isac/main/source/lpc_analysis.c b/submodules/libtgvoip/webrtc_dsp/modules/audio_coding/codecs/isac/main/source/lpc_analysis.c
deleted file mode 100644
index 0fda73bda6..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_coding/codecs/isac/main/source/lpc_analysis.c
+++ /dev/null
@@ -1,496 +0,0 @@
-/*
- *  Copyright (c) 2011 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#include <math.h>
-#include <string.h>
-
-#include "modules/audio_coding/codecs/isac/main/source/lpc_analysis.h"
-#include "modules/audio_coding/codecs/isac/main/source/settings.h"
-#include "modules/audio_coding/codecs/isac/main/source/codec.h"
-#include "modules/audio_coding/codecs/isac/main/source/entropy_coding.h"
-#include "modules/audio_coding/codecs/isac/main/source/filter_functions.h"
-#include "modules/audio_coding/codecs/isac/main/source/isac_vad.h"
-
-/* window */
-/* Matlab generation code:
- *  t = (1:256)/257; r = 1-(1-t).^.45; w = sin(r*pi).^3; w = w/sum(w); plot((1:256)/8, w); grid;
- *  for k=1:16, fprintf(1, '%.8f, ', w(k*16 + (-15:0))); fprintf(1, '\n'); end
- */
-static const double kLpcCorrWindow[WINLEN] = {
-  0.00000000, 0.00000001, 0.00000004, 0.00000010, 0.00000020,
-  0.00000035, 0.00000055, 0.00000083, 0.00000118, 0.00000163,
-  0.00000218, 0.00000283, 0.00000361, 0.00000453, 0.00000558, 0.00000679,
-  0.00000817, 0.00000973, 0.00001147, 0.00001342, 0.00001558,
-  0.00001796, 0.00002058, 0.00002344, 0.00002657, 0.00002997,
-  0.00003365, 0.00003762, 0.00004190, 0.00004651, 0.00005144, 0.00005673,
-  0.00006236, 0.00006837, 0.00007476, 0.00008155, 0.00008875,
-  0.00009636, 0.00010441, 0.00011290, 0.00012186, 0.00013128,
-  0.00014119, 0.00015160, 0.00016252, 0.00017396, 0.00018594, 0.00019846,
-  0.00021155, 0.00022521, 0.00023946, 0.00025432, 0.00026978,
-  0.00028587, 0.00030260, 0.00031998, 0.00033802, 0.00035674,
-  0.00037615, 0.00039626, 0.00041708, 0.00043863, 0.00046092, 0.00048396,
-  0.00050775, 0.00053233, 0.00055768, 0.00058384, 0.00061080,
-  0.00063858, 0.00066720, 0.00069665, 0.00072696, 0.00075813,
-  0.00079017, 0.00082310, 0.00085692, 0.00089164, 0.00092728, 0.00096384,
-  0.00100133, 0.00103976, 0.00107914, 0.00111947, 0.00116077,
-  0.00120304, 0.00124630, 0.00129053, 0.00133577, 0.00138200,
-  0.00142924, 0.00147749, 0.00152676, 0.00157705, 0.00162836, 0.00168070,
-  0.00173408, 0.00178850, 0.00184395, 0.00190045, 0.00195799,
-  0.00201658, 0.00207621, 0.00213688, 0.00219860, 0.00226137,
-  0.00232518, 0.00239003, 0.00245591, 0.00252284, 0.00259079, 0.00265977,
-  0.00272977, 0.00280078, 0.00287280, 0.00294582, 0.00301984,
-  0.00309484, 0.00317081, 0.00324774, 0.00332563, 0.00340446,
-  0.00348421, 0.00356488, 0.00364644, 0.00372889, 0.00381220, 0.00389636,
-  0.00398135, 0.00406715, 0.00415374, 0.00424109, 0.00432920,
-  0.00441802, 0.00450754, 0.00459773, 0.00468857, 0.00478001,
-  0.00487205, 0.00496464, 0.00505775, 0.00515136, 0.00524542, 0.00533990,
-  0.00543476, 0.00552997, 0.00562548, 0.00572125, 0.00581725,
-  0.00591342, 0.00600973, 0.00610612, 0.00620254, 0.00629895,
-  0.00639530, 0.00649153, 0.00658758, 0.00668341, 0.00677894, 0.00687413,
-  0.00696891, 0.00706322, 0.00715699, 0.00725016, 0.00734266,
-  0.00743441, 0.00752535, 0.00761540, 0.00770449, 0.00779254,
-  0.00787947, 0.00796519, 0.00804963, 0.00813270, 0.00821431, 0.00829437,
-  0.00837280, 0.00844949, 0.00852436, 0.00859730, 0.00866822,
-  0.00873701, 0.00880358, 0.00886781, 0.00892960, 0.00898884,
-  0.00904542, 0.00909923, 0.00915014, 0.00919805, 0.00924283, 0.00928436,
-  0.00932252, 0.00935718, 0.00938821, 0.00941550, 0.00943890,
-  0.00945828, 0.00947351, 0.00948446, 0.00949098, 0.00949294,
-  0.00949020, 0.00948262, 0.00947005, 0.00945235, 0.00942938, 0.00940099,
-  0.00936704, 0.00932738, 0.00928186, 0.00923034, 0.00917268,
-  0.00910872, 0.00903832, 0.00896134, 0.00887763, 0.00878706,
-  0.00868949, 0.00858478, 0.00847280, 0.00835343, 0.00822653, 0.00809199,
-  0.00794970, 0.00779956, 0.00764145, 0.00747530, 0.00730103,
-  0.00711857, 0.00692787, 0.00672888, 0.00652158, 0.00630597,
-  0.00608208, 0.00584994, 0.00560962, 0.00536124, 0.00510493, 0.00484089,
-  0.00456935, 0.00429062, 0.00400505, 0.00371310, 0.00341532,
-  0.00311238, 0.00280511, 0.00249452, 0.00218184, 0.00186864,
-  0.00155690, 0.00124918, 0.00094895, 0.00066112, 0.00039320, 0.00015881
-};
-
-static void WebRtcIsac_GetVars(const double* input,
-                               const int16_t* pitchGains_Q12,
-                               double* oldEnergy,
-                               double* varscale) {
-  double nrg[4], chng, pg;
-  int k;
-
-  double pitchGains[4]={0,0,0,0};;
-
-  /* Calculate energies of first and second frame halfs */
-  nrg[0] = 0.0001;
-  for (k = QLOOKAHEAD/2; k < (FRAMESAMPLES_QUARTER + QLOOKAHEAD) / 2; k++) {
-    nrg[0] += input[k]*input[k];
-  }
-  nrg[1] = 0.0001;
-  for ( ; k < (FRAMESAMPLES_HALF + QLOOKAHEAD) / 2; k++) {
-    nrg[1] += input[k]*input[k];
-  }
-  nrg[2] = 0.0001;
-  for ( ; k < (FRAMESAMPLES*3/4 + QLOOKAHEAD) / 2; k++) {
-    nrg[2] += input[k]*input[k];
-  }
-  nrg[3] = 0.0001;
-  for ( ; k < (FRAMESAMPLES + QLOOKAHEAD) / 2; k++) {
-    nrg[3] += input[k]*input[k];
-  }
-
-  /* Calculate average level change */
-  chng = 0.25 * (fabs(10.0 * log10(nrg[3] / nrg[2])) +
-                 fabs(10.0 * log10(nrg[2] / nrg[1])) +
-                 fabs(10.0 * log10(nrg[1] / nrg[0])) +
-                 fabs(10.0 * log10(nrg[0] / *oldEnergy)));
-
-
-  /* Find average pitch gain */
-  pg = 0.0;
-  for (k=0; k<4; k++)
-  {
-    pitchGains[k] = ((float)pitchGains_Q12[k])/4096;
-    pg += pitchGains[k];
-  }
-  pg *= 0.25;
-
-  /* If pitch gain is low and energy constant - increase noise level*/
-  /* Matlab code:
-     pg = 0:.01:.45; plot(pg, 0.0 + 1.0 * exp( -1.0 * exp(-200.0 * pg.*pg.*pg) / (1.0 + 0.4 * 0) ))
-  */
-  *varscale = 0.0 + 1.0 * exp( -1.4 * exp(-200.0 * pg*pg*pg) / (1.0 + 0.4 * chng) );
-
-  *oldEnergy = nrg[3];
-}
-
-static void WebRtcIsac_GetVarsUB(const double* input,
-                                 double* oldEnergy,
-                                 double* varscale) {
-  double nrg[4], chng;
-  int k;
-
-  /* Calculate energies of first and second frame halfs */
-  nrg[0] = 0.0001;
-  for (k = 0; k < (FRAMESAMPLES_QUARTER) / 2; k++) {
-    nrg[0] += input[k]*input[k];
-  }
-  nrg[1] = 0.0001;
-  for ( ; k < (FRAMESAMPLES_HALF) / 2; k++) {
-    nrg[1] += input[k]*input[k];
-  }
-  nrg[2] = 0.0001;
-  for ( ; k < (FRAMESAMPLES*3/4) / 2; k++) {
-    nrg[2] += input[k]*input[k];
-  }
-  nrg[3] = 0.0001;
-  for ( ; k < (FRAMESAMPLES) / 2; k++) {
-    nrg[3] += input[k]*input[k];
-  }
-
-  /* Calculate average level change */
-  chng = 0.25 * (fabs(10.0 * log10(nrg[3] / nrg[2])) +
-                 fabs(10.0 * log10(nrg[2] / nrg[1])) +
-                 fabs(10.0 * log10(nrg[1] / nrg[0])) +
-                 fabs(10.0 * log10(nrg[0] / *oldEnergy)));
-
-
-  /* If pitch gain is low and energy constant - increase noise level*/
-  /* Matlab code:
-     pg = 0:.01:.45; plot(pg, 0.0 + 1.0 * exp( -1.0 * exp(-200.0 * pg.*pg.*pg) / (1.0 + 0.4 * 0) ))
-  */
-  *varscale = exp( -1.4 / (1.0 + 0.4 * chng) );
-
-  *oldEnergy = nrg[3];
-}
-
-void WebRtcIsac_GetLpcCoefLb(double *inLo, double *inHi, MaskFiltstr *maskdata,
-                             double signal_noise_ratio, const int16_t *pitchGains_Q12,
-                             double *lo_coeff, double *hi_coeff)
-{
-  int k, n, j, pos1, pos2;
-  double varscale;
-
-  double DataLo[WINLEN], DataHi[WINLEN];
-  double corrlo[ORDERLO+2], corrlo2[ORDERLO+1];
-  double corrhi[ORDERHI+1];
-  double k_veclo[ORDERLO], k_vechi[ORDERHI];
-
-  double a_LO[ORDERLO+1], a_HI[ORDERHI+1];
-  double tmp, res_nrg;
-
-  double FwdA, FwdB;
-
-  /* hearing threshold level in dB; higher value gives more noise */
-  const double HearThresOffset = -28.0;
-
-  /* bandwdith expansion factors for low- and high band */
-  const double gammaLo = 0.9;
-  const double gammaHi = 0.8;
-
-  /* less-noise-at-low-frequencies factor */
-  double aa;
-
-
-  /* convert from dB to signal level */
-  const double H_T_H = pow(10.0, 0.05 * HearThresOffset);
-  double S_N_R = pow(10.0, 0.05 * signal_noise_ratio) / 3.46;    /* divide by sqrt(12) */
-
-  /* change quallevel depending on pitch gains and level fluctuations */
-  WebRtcIsac_GetVars(inLo, pitchGains_Q12, &(maskdata->OldEnergy), &varscale);
-
-  /* less-noise-at-low-frequencies factor */
-  aa = 0.35 * (0.5 + 0.5 * varscale);
-
-  /* replace data in buffer by new look-ahead data */
-  for (pos1 = 0; pos1 < QLOOKAHEAD; pos1++)
-    maskdata->DataBufferLo[pos1 + WINLEN - QLOOKAHEAD] = inLo[pos1];
-
-  for (k = 0; k < SUBFRAMES; k++) {
-
-    /* Update input buffer and multiply signal with window */
-    for (pos1 = 0; pos1 < WINLEN - UPDATE/2; pos1++) {
-      maskdata->DataBufferLo[pos1] = maskdata->DataBufferLo[pos1 + UPDATE/2];
-      maskdata->DataBufferHi[pos1] = maskdata->DataBufferHi[pos1 + UPDATE/2];
-      DataLo[pos1] = maskdata->DataBufferLo[pos1] * kLpcCorrWindow[pos1];
-      DataHi[pos1] = maskdata->DataBufferHi[pos1] * kLpcCorrWindow[pos1];
-    }
-    pos2 = k * UPDATE/2;
-    for (n = 0; n < UPDATE/2; n++, pos1++) {
-      maskdata->DataBufferLo[pos1] = inLo[QLOOKAHEAD + pos2];
-      maskdata->DataBufferHi[pos1] = inHi[pos2++];
-      DataLo[pos1] = maskdata->DataBufferLo[pos1] * kLpcCorrWindow[pos1];
-      DataHi[pos1] = maskdata->DataBufferHi[pos1] * kLpcCorrWindow[pos1];
-    }
-
-    /* Get correlation coefficients */
-    WebRtcIsac_AutoCorr(corrlo, DataLo, WINLEN, ORDERLO+1); /* computing autocorrelation */
-    WebRtcIsac_AutoCorr(corrhi, DataHi, WINLEN, ORDERHI);
-
-
-    /* less noise for lower frequencies, by filtering/scaling autocorrelation sequences */
-    corrlo2[0] = (1.0+aa*aa) * corrlo[0] - 2.0*aa * corrlo[1];
-    tmp = (1.0 + aa*aa);
-    for (n = 1; n <= ORDERLO; n++) {
-      corrlo2[n] = tmp * corrlo[n] - aa * (corrlo[n-1] + corrlo[n+1]);
-    }
-    tmp = (1.0+aa) * (1.0+aa);
-    for (n = 0; n <= ORDERHI; n++) {
-      corrhi[n] = tmp * corrhi[n];
-    }
-
-    /* add white noise floor */
-    corrlo2[0] += 1e-6;
-    corrhi[0] += 1e-6;
-
-
-    FwdA = 0.01;
-    FwdB = 0.01;
-
-    /* recursive filtering of correlation over subframes */
-    for (n = 0; n <= ORDERLO; n++) {
-      maskdata->CorrBufLo[n] = FwdA * maskdata->CorrBufLo[n] + corrlo2[n];
-      corrlo2[n] = ((1.0-FwdA)*FwdB) * maskdata->CorrBufLo[n] + (1.0-FwdB) * corrlo2[n];
-    }
-    for (n = 0; n <= ORDERHI; n++) {
-      maskdata->CorrBufHi[n] = FwdA * maskdata->CorrBufHi[n] + corrhi[n];
-      corrhi[n] = ((1.0-FwdA)*FwdB) * maskdata->CorrBufHi[n] + (1.0-FwdB) * corrhi[n];
-    }
-
-    /* compute prediction coefficients */
-    WebRtcIsac_LevDurb(a_LO, k_veclo, corrlo2, ORDERLO);
-    WebRtcIsac_LevDurb(a_HI, k_vechi, corrhi, ORDERHI);
-
-    /* bandwidth expansion */
-    tmp = gammaLo;
-    for (n = 1; n <= ORDERLO; n++) {
-      a_LO[n] *= tmp;
-      tmp *= gammaLo;
-    }
-
-    /* residual energy */
-    res_nrg = 0.0;
-    for (j = 0; j <= ORDERLO; j++) {
-      for (n = 0; n <= j; n++) {
-        res_nrg += a_LO[j] * corrlo2[j-n] * a_LO[n];
-      }
-      for (n = j+1; n <= ORDERLO; n++) {
-        res_nrg += a_LO[j] * corrlo2[n-j] * a_LO[n];
-      }
-    }
-
-    /* add hearing threshold and compute the gain */
-    *lo_coeff++ = S_N_R / (sqrt(res_nrg) / varscale + H_T_H);
-
-    /* copy coefficients to output array */
-    for (n = 1; n <= ORDERLO; n++) {
-      *lo_coeff++ = a_LO[n];
-    }
-
-
-    /* bandwidth expansion */
-    tmp = gammaHi;
-    for (n = 1; n <= ORDERHI; n++) {
-      a_HI[n] *= tmp;
-      tmp *= gammaHi;
-    }
-
-    /* residual energy */
-    res_nrg = 0.0;
-    for (j = 0; j <= ORDERHI; j++) {
-      for (n = 0; n <= j; n++) {
-        res_nrg += a_HI[j] * corrhi[j-n] * a_HI[n];
-      }
-      for (n = j+1; n <= ORDERHI; n++) {
-        res_nrg += a_HI[j] * corrhi[n-j] * a_HI[n];
-      }
-    }
-
-    /* add hearing threshold and compute of the gain */
-    *hi_coeff++ = S_N_R / (sqrt(res_nrg) / varscale + H_T_H);
-
-    /* copy coefficients to output array */
-    for (n = 1; n <= ORDERHI; n++) {
-      *hi_coeff++ = a_HI[n];
-    }
-  }
-}
-
-
-
-/******************************************************************************
- * WebRtcIsac_GetLpcCoefUb()
- *
- * Compute LP coefficients and correlation coefficients. At 12 kHz LP
- * coefficients of the first and the last sub-frame is computed. At 16 kHz
- * LP coefficients of 4th, 8th and 12th sub-frames are computed. We always
- * compute correlation coefficients of all sub-frames.
- *
- * Inputs:
- *       -inSignal           : Input signal
- *       -maskdata           : a structure keeping signal from previous frame.
- *       -bandwidth          : specifies if the codec is in 0-16 kHz mode or
- *                             0-12 kHz mode.
- *
- * Outputs:
- *       -lpCoeff            : pointer to a buffer where A-polynomials are
- *                             written to (first coeff is 1 and it is not
- *                             written)
- *       -corrMat            : a matrix where correlation coefficients of each
- *                             sub-frame are written to one row.
- *       -varscale           : a scale used to compute LPC gains.
- */
-void
-WebRtcIsac_GetLpcCoefUb(
-    double*      inSignal,
-    MaskFiltstr* maskdata,
-    double*      lpCoeff,
-    double       corrMat[][UB_LPC_ORDER + 1],
-    double*      varscale,
-    int16_t  bandwidth)
-{
-  int frameCntr, activeFrameCntr, n, pos1, pos2;
-  int16_t criterion1;
-  int16_t criterion2;
-  int16_t numSubFrames = SUBFRAMES * (1 + (bandwidth == isac16kHz));
-  double data[WINLEN];
-  double corrSubFrame[UB_LPC_ORDER+2];
-  double reflecCoeff[UB_LPC_ORDER];
-
-  double aPolynom[UB_LPC_ORDER+1];
-  double tmp;
-
-  /* bandwdith expansion factors */
-  const double gamma = 0.9;
-
-  /* change quallevel depending on pitch gains and level fluctuations */
-  WebRtcIsac_GetVarsUB(inSignal, &(maskdata->OldEnergy), varscale);
-
-  /* replace data in buffer by new look-ahead data */
-  for(frameCntr = 0, activeFrameCntr = 0; frameCntr < numSubFrames;
-      frameCntr++)
-  {
-    if(frameCntr == SUBFRAMES)
-    {
-      // we are in 16 kHz
-      varscale++;
-      WebRtcIsac_GetVarsUB(&inSignal[FRAMESAMPLES_HALF],
-                          &(maskdata->OldEnergy), varscale);
-    }
-    /* Update input buffer and multiply signal with window */
-    for(pos1 = 0; pos1 < WINLEN - UPDATE/2; pos1++)
-    {
-      maskdata->DataBufferLo[pos1] = maskdata->DataBufferLo[pos1 +
-                                                            UPDATE/2];
-      data[pos1] = maskdata->DataBufferLo[pos1] * kLpcCorrWindow[pos1];
-    }
-    pos2 = frameCntr * UPDATE/2;
-    for(n = 0; n < UPDATE/2; n++, pos1++, pos2++)
-    {
-      maskdata->DataBufferLo[pos1] = inSignal[pos2];
-      data[pos1] = maskdata->DataBufferLo[pos1] * kLpcCorrWindow[pos1];
-    }
-
-    /* Get correlation coefficients */
-    /* computing autocorrelation    */
-    WebRtcIsac_AutoCorr(corrSubFrame, data, WINLEN, UB_LPC_ORDER+1);
-    memcpy(corrMat[frameCntr], corrSubFrame,
-           (UB_LPC_ORDER+1)*sizeof(double));
-
-    criterion1 = ((frameCntr == 0) || (frameCntr == (SUBFRAMES - 1))) &&
-        (bandwidth == isac12kHz);
-    criterion2 = (((frameCntr+1) % 4) == 0) &&
-        (bandwidth == isac16kHz);
-    if(criterion1 || criterion2)
-    {
-      /* add noise */
-      corrSubFrame[0] += 1e-6;
-      /* compute prediction coefficients */
-      WebRtcIsac_LevDurb(aPolynom, reflecCoeff, corrSubFrame,
-                        UB_LPC_ORDER);
-
-      /* bandwidth expansion */
-      tmp = gamma;
-      for (n = 1; n <= UB_LPC_ORDER; n++)
-      {
-        *lpCoeff++ = aPolynom[n] * tmp;
-        tmp *= gamma;
-      }
-      activeFrameCntr++;
-    }
-  }
-}
-
-
-
-/******************************************************************************
- * WebRtcIsac_GetLpcGain()
- *
- * Compute the LPC gains for each sub-frame, given the LPC of each sub-frame
- * and the corresponding correlation coefficients.
- *
- * Inputs:
- *       -signal_noise_ratio : the desired SNR in dB.
- *       -numVecs            : number of sub-frames
- *       -corrMat             : a matrix of correlation coefficients where
- *                             each row is a set of correlation coefficients of
- *                             one sub-frame.
- *       -varscale           : a scale computed when WebRtcIsac_GetLpcCoefUb()
- *                             is called.
- *
- * Outputs:
- *       -gain               : pointer to a buffer where LP gains are written.
- *
- */
-void
-WebRtcIsac_GetLpcGain(
-    double        signal_noise_ratio,
-    const double* filtCoeffVecs,
-    int           numVecs,
-    double*       gain,
-    double        corrMat[][UB_LPC_ORDER + 1],
-    const double* varscale)
-{
-  int16_t j, n;
-  int16_t subFrameCntr;
-  double aPolynom[ORDERLO + 1];
-  double res_nrg;
-
-  const double HearThresOffset = -28.0;
-  const double H_T_H = pow(10.0, 0.05 * HearThresOffset);
-  /* divide by sqrt(12) = 3.46 */
-  const double S_N_R = pow(10.0, 0.05 * signal_noise_ratio) / 3.46;
-
-  aPolynom[0] = 1;
-  for(subFrameCntr = 0; subFrameCntr < numVecs; subFrameCntr++)
-  {
-    if(subFrameCntr == SUBFRAMES)
-    {
-      // we are in second half of a SWB frame. use new varscale
-      varscale++;
-    }
-    memcpy(&aPolynom[1], &filtCoeffVecs[(subFrameCntr * (UB_LPC_ORDER + 1)) +
-                                        1], sizeof(double) * UB_LPC_ORDER);
-
-    /* residual energy */
-    res_nrg = 0.0;
-    for(j = 0; j <= UB_LPC_ORDER; j++)
-    {
-      for(n = 0; n <= j; n++)
-      {
-        res_nrg += aPolynom[j] * corrMat[subFrameCntr][j-n] *
-            aPolynom[n];
-      }
-      for(n = j+1; n <= UB_LPC_ORDER; n++)
-      {
-        res_nrg += aPolynom[j] * corrMat[subFrameCntr][n-j] *
-            aPolynom[n];
-      }
-    }
-
-    /* add hearing threshold and compute the gain */
-    gain[subFrameCntr] = S_N_R / (sqrt(res_nrg) / *varscale + H_T_H);
-  }
-}
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_coding/codecs/isac/main/source/lpc_analysis.h b/submodules/libtgvoip/webrtc_dsp/modules/audio_coding/codecs/isac/main/source/lpc_analysis.h
deleted file mode 100644
index 5503e2d49b..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_coding/codecs/isac/main/source/lpc_analysis.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- *  Copyright (c) 2011 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-/*
- * lpc_analysis.h
- *
- * LPC functions
- *
- */
-
-#ifndef MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_LPC_ANALYSIS_H_
-#define MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_LPC_ANALYSIS_H_
-
-#include "modules/audio_coding/codecs/isac/main/source/settings.h"
-#include "modules/audio_coding/codecs/isac/main/source/structs.h"
-
-void WebRtcIsac_GetLpcCoefLb(double* inLo,
-                             double* inHi,
-                             MaskFiltstr* maskdata,
-                             double signal_noise_ratio,
-                             const int16_t* pitchGains_Q12,
-                             double* lo_coeff,
-                             double* hi_coeff);
-
-void WebRtcIsac_GetLpcGain(double signal_noise_ratio,
-                           const double* filtCoeffVecs,
-                           int numVecs,
-                           double* gain,
-                           double corrLo[][UB_LPC_ORDER + 1],
-                           const double* varscale);
-
-void WebRtcIsac_GetLpcCoefUb(double* inSignal,
-                             MaskFiltstr* maskdata,
-                             double* lpCoeff,
-                             double corr[][UB_LPC_ORDER + 1],
-                             double* varscale,
-                             int16_t bandwidth);
-
-#endif /* MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_LPC_ANALYIS_H_ */
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_coding/codecs/isac/main/source/lpc_gain_swb_tables.c b/submodules/libtgvoip/webrtc_dsp/modules/audio_coding/codecs/isac/main/source/lpc_gain_swb_tables.c
deleted file mode 100644
index 670754065f..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_coding/codecs/isac/main/source/lpc_gain_swb_tables.c
+++ /dev/null
@@ -1,136 +0,0 @@
-/*
- *  Copyright (c) 2011 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-/*
- * SWB_KLT_Tables_LPCGain.c
- *
- * This file defines tables used for entropy coding of LPC Gain
- * of upper-band.
- *
- */
-
-#include "modules/audio_coding/codecs/isac/main/source/lpc_gain_swb_tables.h"
-#include "modules/audio_coding/codecs/isac/main/source/settings.h"
-
-const double WebRtcIsac_kQSizeLpcGain = 0.100000;
-
-const double WebRtcIsac_kMeanLpcGain = -3.3822;
-
-/*
-* The smallest reconstruction points for quantiztion of
-* LPC gains.
-*/
-const double WebRtcIsac_kLeftRecPointLpcGain[SUBFRAMES] =
-{
-   -0.800000, -1.000000, -1.200000, -2.200000, -3.000000, -12.700000
-};
-
-/*
-* Number of reconstruction points of quantizers for LPC Gains.
-*/
-const int16_t WebRtcIsac_kNumQCellLpcGain[SUBFRAMES] =
-{
-    17,  20,  25,  45,  77, 170
-};
-/*
-* Starting index for entropy decoder to search for the right interval,
-* one entry per LAR coefficient
-*/
-const uint16_t WebRtcIsac_kLpcGainEntropySearch[SUBFRAMES] =
-{
-     8,  10,  12,  22,  38,  85
-};
-
-/*
-* The following 6 vectors define CDF of 6 decorrelated LPC
-* gains.
-*/
-const uint16_t WebRtcIsac_kLpcGainCdfVec0[18] =
-{
-     0,    10,    27,    83,   234,   568,  1601,  4683, 16830, 57534, 63437,
- 64767, 65229, 65408, 65483, 65514, 65527, 65535
-};
-
-const uint16_t WebRtcIsac_kLpcGainCdfVec1[21] =
-{
-     0,    15,    33,    84,   185,   385,   807,  1619,  3529,  7850, 19488,
- 51365, 62437, 64548, 65088, 65304, 65409, 65484, 65507, 65522, 65535
-};
-
-const uint16_t WebRtcIsac_kLpcGainCdfVec2[26] =
-{
-     0,    15,    29,    54,    89,   145,   228,   380,   652,  1493,  4260,
- 12359, 34133, 50749, 57224, 60814, 62927, 64078, 64742, 65103, 65311, 65418,
- 65473, 65509, 65521, 65535
-};
-
-const uint16_t WebRtcIsac_kLpcGainCdfVec3[46] =
-{
-     0,     8,    12,    16,    26,    42,    56,    76,   111,   164,   247,
-   366,   508,   693,  1000,  1442,  2155,  3188,  4854,  7387, 11249, 17617,
- 30079, 46711, 56291, 60127, 62140, 63258, 63954, 64384, 64690, 64891, 65031,
- 65139, 65227, 65293, 65351, 65399, 65438, 65467, 65492, 65504, 65510, 65518,
- 65523, 65535
-};
-
-const uint16_t WebRtcIsac_kLpcGainCdfVec4[78] =
-{
-     0,    17,    29,    39,    51,    70,   104,   154,   234,   324,   443,
-   590,   760,   971,  1202,  1494,  1845,  2274,  2797,  3366,  4088,  4905,
-  5899,  7142,  8683, 10625, 12983, 16095, 20637, 28216, 38859, 47237, 51537,
- 54150, 56066, 57583, 58756, 59685, 60458, 61103, 61659, 62144, 62550, 62886,
- 63186, 63480, 63743, 63954, 64148, 64320, 64467, 64600, 64719, 64837, 64939,
- 65014, 65098, 65160, 65211, 65250, 65290, 65325, 65344, 65366, 65391, 65410,
- 65430, 65447, 65460, 65474, 65487, 65494, 65501, 65509, 65513, 65518, 65520,
- 65535
-};
-
-const uint16_t WebRtcIsac_kLpcGainCdfVec5[171] =
-{
-     0,    10,    12,    14,    16,    18,    23,    29,    35,    42,    51,
-    58,    65,    72,    78,    87,    96,   103,   111,   122,   134,   150,
-   167,   184,   202,   223,   244,   265,   289,   315,   346,   379,   414,
-   450,   491,   532,   572,   613,   656,   700,   751,   802,   853,   905,
-   957,  1021,  1098,  1174,  1250,  1331,  1413,  1490,  1565,  1647,  1730,
-  1821,  1913,  2004,  2100,  2207,  2314,  2420,  2532,  2652,  2783,  2921,
-  3056,  3189,  3327,  3468,  3640,  3817,  3993,  4171,  4362,  4554,  4751,
-  4948,  5142,  5346,  5566,  5799,  6044,  6301,  6565,  6852,  7150,  7470,
-  7797,  8143,  8492,  8835,  9181,  9547,  9919, 10315, 10718, 11136, 11566,
- 12015, 12482, 12967, 13458, 13953, 14432, 14903, 15416, 15936, 16452, 16967,
- 17492, 18024, 18600, 19173, 19736, 20311, 20911, 21490, 22041, 22597, 23157,
- 23768, 24405, 25034, 25660, 26280, 26899, 27614, 28331, 29015, 29702, 30403,
- 31107, 31817, 32566, 33381, 34224, 35099, 36112, 37222, 38375, 39549, 40801,
- 42074, 43350, 44626, 45982, 47354, 48860, 50361, 51845, 53312, 54739, 56026,
- 57116, 58104, 58996, 59842, 60658, 61488, 62324, 63057, 63769, 64285, 64779,
- 65076, 65344, 65430, 65500, 65517, 65535
-};
-
-/*
-* An array of pointers to CDFs of decorrelated LPC Gains
-*/
-const uint16_t* WebRtcIsac_kLpcGainCdfMat[SUBFRAMES] =
-{
-    WebRtcIsac_kLpcGainCdfVec0, WebRtcIsac_kLpcGainCdfVec1,
-    WebRtcIsac_kLpcGainCdfVec2, WebRtcIsac_kLpcGainCdfVec3,
-    WebRtcIsac_kLpcGainCdfVec4, WebRtcIsac_kLpcGainCdfVec5
-};
-
-/*
-* A matrix to decorrellate LPC gains of subframes.
-*/
-const double WebRtcIsac_kLpcGainDecorrMat[SUBFRAMES][SUBFRAMES] =
-{
-    {-0.150860,  0.327872,  0.367220,  0.504613,  0.559270,  0.409234},
-    { 0.457128, -0.613591, -0.289283, -0.029734,  0.393760,  0.418240},
-    {-0.626043,  0.136489, -0.439118, -0.448323,  0.135987,  0.420869},
-    { 0.526617,  0.480187,  0.242552, -0.488754, -0.158713,  0.411331},
-    {-0.302587, -0.494953,  0.588112, -0.063035, -0.404290,  0.387510},
-    { 0.086378,  0.147714, -0.428875,  0.548300, -0.570121,  0.401391}
-};
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_coding/codecs/isac/main/source/lpc_gain_swb_tables.h b/submodules/libtgvoip/webrtc_dsp/modules/audio_coding/codecs/isac/main/source/lpc_gain_swb_tables.h
deleted file mode 100644
index 39c4a24ef4..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_coding/codecs/isac/main/source/lpc_gain_swb_tables.h
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- *  Copyright (c) 2011 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-/*
- * SWB_KLT_Tables_LPCGain.h
- *
- * This file declares tables used for entropy coding of LPC Gain
- * of upper-band.
- *
- */
-
-#ifndef MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_LPC_GAIN_SWB_TABLES_H_
-#define MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_LPC_GAIN_SWB_TABLES_H_
-
-#include <stdint.h>
-
-#include "modules/audio_coding/codecs/isac/main/source/settings.h"
-
-extern const double WebRtcIsac_kQSizeLpcGain;
-
-extern const double WebRtcIsac_kLeftRecPointLpcGain[SUBFRAMES];
-
-extern const int16_t WebRtcIsac_kNumQCellLpcGain[SUBFRAMES];
-
-extern const uint16_t WebRtcIsac_kLpcGainEntropySearch[SUBFRAMES];
-
-extern const uint16_t WebRtcIsac_kLpcGainCdfVec0[18];
-
-extern const uint16_t WebRtcIsac_kLpcGainCdfVec1[21];
-
-extern const uint16_t WebRtcIsac_kLpcGainCdfVec2[26];
-
-extern const uint16_t WebRtcIsac_kLpcGainCdfVec3[46];
-
-extern const uint16_t WebRtcIsac_kLpcGainCdfVec4[78];
-
-extern const uint16_t WebRtcIsac_kLpcGainCdfVec5[171];
-
-extern const uint16_t* WebRtcIsac_kLpcGainCdfMat[SUBFRAMES];
-
-extern const double WebRtcIsac_kLpcGainDecorrMat[SUBFRAMES][SUBFRAMES];
-
-#endif  // MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_LPC_GAIN_SWB_TABLES_H_
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_coding/codecs/isac/main/source/lpc_shape_swb12_tables.c b/submodules/libtgvoip/webrtc_dsp/modules/audio_coding/codecs/isac/main/source/lpc_shape_swb12_tables.c
deleted file mode 100644
index e3600a7fab..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_coding/codecs/isac/main/source/lpc_shape_swb12_tables.c
+++ /dev/null
@@ -1,158 +0,0 @@
-/*
- *  Copyright (c) 2011 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-/*
- * SWB_KLT_Tables.c
- *
- * This file defines tables used for entropy coding of LPC shape of
- * upper-band signal if the bandwidth is 12 kHz.
- *
- */
-
-#include "modules/audio_coding/codecs/isac/main/source/lpc_shape_swb12_tables.h"
-#include "modules/audio_coding/codecs/isac/main/source/settings.h"
-
-/*
-* Mean value of LAR
-*/
-const double WebRtcIsac_kMeanLarUb12[UB_LPC_ORDER] =
-{
-  0.03748928306641, 0.09453441192543, -0.01112522344398, 0.03800237516842
-};
-
-/*
-* A rotation matrix to decorrelate intra-vector correlation,
-* i.e. correlation among components of LAR vector.
-*/
-const double WebRtcIsac_kIntraVecDecorrMatUb12[UB_LPC_ORDER][UB_LPC_ORDER] =
-{
-    {-0.00075365493856,  -0.05809964887743,  -0.23397966154116,   0.97050367376411},
-    { 0.00625021257734,  -0.17299965610679,   0.95977735920651,   0.22104179375008},
-    { 0.20543384258374,  -0.96202143495696,  -0.15301870801552,  -0.09432375099565},
-    {-0.97865075648479,  -0.20300322280841,  -0.02581111653779,  -0.01913568980258}
-};
-
-/*
-* A rotation matrix to remove correlation among LAR coefficients
-* of different LAR vectors. One might guess that decorrelation matrix
-* for the first component should differ from the second component
-* but we haven't observed a significant benefit of having different
-* decorrelation matrices for different components.
-*/
-const double WebRtcIsac_kInterVecDecorrMatUb12
-[UB_LPC_VEC_PER_FRAME][UB_LPC_VEC_PER_FRAME] =
-{
-    { 0.70650597970460,  -0.70770707262373},
-    {-0.70770707262373,  -0.70650597970460}
-};
-
-/*
-* LAR quantization step-size.
-*/
-const double WebRtcIsac_kLpcShapeQStepSizeUb12 = 0.150000;
-
-/*
-* The smallest reconstruction points for quantiztion of LAR coefficients.
-*/
-const double WebRtcIsac_kLpcShapeLeftRecPointUb12
-[UB_LPC_ORDER*UB_LPC_VEC_PER_FRAME] =
-{
-    -0.900000, -1.050000, -1.350000, -1.800000, -1.350000, -1.650000,
-    -2.250000, -3.450000
-};
-
-/*
-* Number of reconstruction points of quantizers for LAR coefficients.
-*/
-const int16_t WebRtcIsac_kLpcShapeNumRecPointUb12
-[UB_LPC_ORDER * UB_LPC_VEC_PER_FRAME] =
-{
-    13, 15, 19, 27, 19, 24, 32, 48
-};
-
-/*
-* Starting index for entropy decoder to search for the right interval,
-* one entry per LAR coefficient
-*/
-const uint16_t WebRtcIsac_kLpcShapeEntropySearchUb12
-[UB_LPC_ORDER * UB_LPC_VEC_PER_FRAME] =
-{
-     6,  7,  9, 13,  9, 12, 16, 24
-};
-
-/*
-* The following 8 vectors define CDF of 8 decorrelated LAR
-* coefficients.
-*/
-const uint16_t WebRtcIsac_kLpcShapeCdfVec0Ub12[14] =
-{
-     0,    13,    95,   418,  1687,  6498, 21317, 44200, 59029, 63849, 65147,
- 65449, 65525, 65535
-};
-
-const uint16_t WebRtcIsac_kLpcShapeCdfVec1Ub12[16] =
-{
-     0,    10,    59,   255,   858,  2667,  8200, 22609, 42988, 57202, 62947,
- 64743, 65308, 65476, 65522, 65535
-};
-
-const uint16_t WebRtcIsac_kLpcShapeCdfVec2Ub12[20] =
-{
-     0,    18,    40,   118,   332,   857,  2017,  4822, 11321, 24330, 41279,
- 54342, 60637, 63394, 64659, 65184, 65398, 65482, 65518, 65535
-};
-
-const uint16_t WebRtcIsac_kLpcShapeCdfVec3Ub12[28] =
-{
-     0,    21,    38,    90,   196,   398,   770,  1400,  2589,  4650,  8211,
- 14933, 26044, 39592, 50814, 57452, 60971, 62884, 63995, 64621, 65019, 65273,
- 65410, 65480, 65514, 65522, 65531, 65535
-};
-
-const uint16_t WebRtcIsac_kLpcShapeCdfVec4Ub12[20] =
-{
-     0,     7,    46,   141,   403,   969,  2132,  4649, 10633, 24902, 43254,
- 54665, 59928, 62674, 64173, 64938, 65293, 65464, 65523, 65535
-};
-
-const uint16_t WebRtcIsac_kLpcShapeCdfVec5Ub12[25] =
-{
-     0,     7,    22,    72,   174,   411,   854,  1737,  3545,  6774, 13165,
- 25221, 40980, 52821, 58714, 61706, 63472, 64437, 64989, 65287, 65430, 65503,
- 65525, 65529, 65535
-};
-
-const uint16_t WebRtcIsac_kLpcShapeCdfVec6Ub12[33] =
-{
-     0,    11,    21,    36,    65,   128,   228,   401,   707,  1241,  2126,
-  3589,  6060, 10517, 18853, 31114, 42477, 49770, 54271, 57467, 59838, 61569,
- 62831, 63772, 64433, 64833, 65123, 65306, 65419, 65466, 65499, 65519, 65535
-};
-
-const uint16_t WebRtcIsac_kLpcShapeCdfVec7Ub12[49] =
-{
-     0,    14,    34,    67,   107,   167,   245,   326,   449,   645,   861,
-  1155,  1508,  2003,  2669,  3544,  4592,  5961,  7583,  9887, 13256, 18765,
- 26519, 34077, 40034, 44349, 47795, 50663, 53262, 55473, 57458, 59122, 60592,
- 61742, 62690, 63391, 63997, 64463, 64794, 65045, 65207, 65309, 65394, 65443,
- 65478, 65504, 65514, 65523, 65535
-};
-
-/*
-* An array of pointers to CDFs of decorrelated LARs
-*/
-const uint16_t* WebRtcIsac_kLpcShapeCdfMatUb12
-[UB_LPC_ORDER * UB_LPC_VEC_PER_FRAME] =
-{
-    WebRtcIsac_kLpcShapeCdfVec0Ub12, WebRtcIsac_kLpcShapeCdfVec1Ub12,
-    WebRtcIsac_kLpcShapeCdfVec2Ub12, WebRtcIsac_kLpcShapeCdfVec3Ub12,
-    WebRtcIsac_kLpcShapeCdfVec4Ub12, WebRtcIsac_kLpcShapeCdfVec5Ub12,
-    WebRtcIsac_kLpcShapeCdfVec6Ub12, WebRtcIsac_kLpcShapeCdfVec7Ub12
-};
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_coding/codecs/isac/main/source/lpc_shape_swb12_tables.h b/submodules/libtgvoip/webrtc_dsp/modules/audio_coding/codecs/isac/main/source/lpc_shape_swb12_tables.h
deleted file mode 100644
index 7448a1e76b..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_coding/codecs/isac/main/source/lpc_shape_swb12_tables.h
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- *  Copyright (c) 2011 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-/*
- * lpc_shape_swb12_tables.h
- *
- * This file declares tables used for entropy coding of LPC shape of
- * upper-band signal if the bandwidth is 12 kHz.
- *
- */
-
-#ifndef MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_LPC_SHAPE_SWB12_TABLES_H_
-#define MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_LPC_SHAPE_SWB12_TABLES_H_
-
-#include <stdint.h>
-
-#include "modules/audio_coding/codecs/isac/main/source/settings.h"
-
-extern const double WebRtcIsac_kMeanLarUb12[UB_LPC_ORDER];
-
-extern const double WebRtcIsac_kMeanLpcGain;
-
-extern const double WebRtcIsac_kIntraVecDecorrMatUb12[UB_LPC_ORDER]
-                                                     [UB_LPC_ORDER];
-
-extern const double WebRtcIsac_kInterVecDecorrMatUb12[UB_LPC_VEC_PER_FRAME]
-                                                     [UB_LPC_VEC_PER_FRAME];
-
-extern const double WebRtcIsac_kLpcShapeQStepSizeUb12;
-
-extern const double
-    WebRtcIsac_kLpcShapeLeftRecPointUb12[UB_LPC_ORDER * UB_LPC_VEC_PER_FRAME];
-
-extern const int16_t
-    WebRtcIsac_kLpcShapeNumRecPointUb12[UB_LPC_ORDER * UB_LPC_VEC_PER_FRAME];
-
-extern const uint16_t
-    WebRtcIsac_kLpcShapeEntropySearchUb12[UB_LPC_ORDER * UB_LPC_VEC_PER_FRAME];
-
-extern const uint16_t WebRtcIsac_kLpcShapeCdfVec0Ub12[14];
-
-extern const uint16_t WebRtcIsac_kLpcShapeCdfVec1Ub12[16];
-
-extern const uint16_t WebRtcIsac_kLpcShapeCdfVec2Ub12[20];
-
-extern const uint16_t WebRtcIsac_kLpcShapeCdfVec3Ub12[28];
-
-extern const uint16_t WebRtcIsac_kLpcShapeCdfVec4Ub12[20];
-
-extern const uint16_t WebRtcIsac_kLpcShapeCdfVec5Ub12[25];
-
-extern const uint16_t WebRtcIsac_kLpcShapeCdfVec6Ub12[33];
-
-extern const uint16_t WebRtcIsac_kLpcShapeCdfVec7Ub12[49];
-
-extern const uint16_t*
-    WebRtcIsac_kLpcShapeCdfMatUb12[UB_LPC_ORDER * UB_LPC_VEC_PER_FRAME];
-
-#endif  // MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_LPC_SHAPE_SWB12_TABLES_H_
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_coding/codecs/isac/main/source/lpc_shape_swb16_tables.c b/submodules/libtgvoip/webrtc_dsp/modules/audio_coding/codecs/isac/main/source/lpc_shape_swb16_tables.c
deleted file mode 100644
index 59617fd274..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_coding/codecs/isac/main/source/lpc_shape_swb16_tables.c
+++ /dev/null
@@ -1,247 +0,0 @@
-/*
- *  Copyright (c) 2011 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-/*
- * SWB16_KLT_Tables.c
- *
- * This file defines tables used for entropy coding of LPC shape of
- * upper-band signal if the bandwidth is 16 kHz.
- *
- */
-
-#include "modules/audio_coding/codecs/isac/main/source/lpc_shape_swb16_tables.h"
-#include "modules/audio_coding/codecs/isac/main/source/settings.h"
-
-/*
-* Mean value of LAR
-*/
-const double WebRtcIsac_kMeanLarUb16[UB_LPC_ORDER] =
-{
-0.454978, 0.364747, 0.102999, 0.104523
-};
-
-/*
-* A rotation matrix to decorrelate intra-vector correlation,
-* i.e. correlation among components of LAR vector.
-*/
-const double WebRtcIsac_kIintraVecDecorrMatUb16[UB_LPC_ORDER][UB_LPC_ORDER] =
-{
-    {-0.020528, -0.085858, -0.002431,  0.996093},
-    {-0.033155,  0.036102,  0.998786,  0.004866},
-    { 0.202627,  0.974853, -0.028940,  0.088132},
-    {-0.978479,  0.202454, -0.039785, -0.002811}
-};
-
-/*
-* A rotation matrix to remove correlation among LAR coefficients
-* of different LAR vectors. One might guess that decorrelation matrix
-* for the first component should differ from the second component
-* but we haven't observed a significant benefit of having different
-* decorrelation matrices for different components.
-*/
-const double WebRtcIsac_kInterVecDecorrMatUb16
-[UB16_LPC_VEC_PER_FRAME][UB16_LPC_VEC_PER_FRAME] =
-{
-    { 0.291675, -0.515786,  0.644927,  0.482658},
-    {-0.647220,  0.479712,  0.289556,  0.516856},
-    { 0.643084,  0.485489, -0.289307,  0.516763},
-    {-0.287185, -0.517823, -0.645389,  0.482553}
-};
-
-/*
-* The following 16 vectors define CDF of 16 decorrelated LAR
-* coefficients.
-*/
-const uint16_t WebRtcIsac_kLpcShapeCdfVec01Ub16[14] =
-{
-     0,      2,     20,    159,   1034,   5688,  20892,  44653,
- 59849,  64485,  65383,  65518,  65534,  65535
-};
-
-const uint16_t WebRtcIsac_kLpcShapeCdfVec1Ub16[16] =
-{
-     0,      1,      7,     43,    276,   1496,   6681,  21653,
- 43891,  58859,  64022,  65248,  65489,  65529,  65534,  65535
-};
-
-const uint16_t WebRtcIsac_kLpcShapeCdfVec2Ub16[18] =
-{
-     0,      1,      9,     54,    238,    933,   3192,   9461,
- 23226,  42146,  56138,  62413,  64623,  65300,  65473,  65521,
- 65533,  65535
-};
-
-const uint16_t WebRtcIsac_kLpcShapeCdfVec3Ub16[30] =
-{
-     0,      2,      4,      8,     17,     36,     75,    155,
-   329,    683,   1376,   2662,   5047,   9508,  17526,  29027,
- 40363,  48997,  55096,  59180,  61789,  63407,  64400,  64967,
- 65273,  65429,  65497,  65526,  65534,  65535
-};
-
-const uint16_t WebRtcIsac_kLpcShapeCdfVec4Ub16[16] =
-{
-     0,      1,     10,     63,    361,   1785,   7407,  22242,
- 43337,  58125,  63729,  65181,  65472,  65527,  65534,  65535
-};
-
-const uint16_t WebRtcIsac_kLpcShapeCdfVec5Ub16[17] =
-{
-     0,      1,      7,     29,    134,    599,   2443,   8590,
- 22962,  42635,  56911,  63060,  64940,  65408,  65513,  65531,
- 65535
-};
-
-const uint16_t WebRtcIsac_kLpcShapeCdfVec6Ub16[21] =
-{
-     0,      1,      5,     16,     57,    191,    611,   1808,
-  4847,  11755,  24612,  40910,  53789,  60698,  63729,  64924,
- 65346,  65486,  65523,  65532,  65535
-};
-
-const uint16_t WebRtcIsac_kLpcShapeCdfVec7Ub16[36] =
-{
-     0,      1,      4,     12,     25,     55,    104,    184,
-   314,    539,    926,   1550,   2479,   3861,   5892,   8845,
- 13281,  20018,  29019,  38029,  45581,  51557,  56057,  59284,
- 61517,  63047,  64030,  64648,  65031,  65261,  65402,  65480,
- 65518,  65530,  65534,  65535
-};
-
-const uint16_t WebRtcIsac_kLpcShapeCdfVec8Ub16[21] =
-{
-     0,      1,      2,      7,     26,    103,    351,   1149,
-  3583,  10204,  23846,  41711,  55361,  61917,  64382,  65186,
- 65433,  65506,  65528,  65534,  65535
-};
-
-const uint16_t WebRtcIsac_kLpcShapeCdfVec01Ub160[21] =
-{
-     0,      6,     19,     63,    205,    638,   1799,   4784,
- 11721,  24494,  40803,  53805,  60886,  63822,  64931,  65333,
- 65472,  65517,  65530,  65533,  65535
-};
-
-const uint16_t WebRtcIsac_kLpcShapeCdfVec01Ub161[28] =
-{
-     0,      1,      3,     11,     31,     86,    221,    506,
-  1101,   2296,   4486,   8477,  15356,  26079,  38941,  49952,
- 57165,  61257,  63426,  64549,  65097,  65351,  65463,  65510,
- 65526,  65532,  65534,  65535
-};
-
-const uint16_t WebRtcIsac_kLpcShapeCdfVec01Ub162[55] =
-{
-     0,      3,     12,     23,     42,     65,     89,    115,
-   150,    195,    248,    327,    430,    580,    784,   1099,
-  1586,   2358,   3651,   5899,   9568,  14312,  19158,  23776,
- 28267,  32663,  36991,  41153,  45098,  48680,  51870,  54729,
- 57141,  59158,  60772,  62029,  63000,  63761,  64322,  64728,
- 65000,  65192,  65321,  65411,  65463,  65496,  65514,  65523,
- 65527,  65529,  65531,  65532,  65533,  65534,  65535
-};
-
-const uint16_t WebRtcIsac_kLpcShapeCdfVec01Ub163[26] =
-{
-     0,      2,      4,     10,     21,     48,    114,    280,
-   701,   1765,   4555,  11270,  24267,  41213,  54285,  61003,
- 63767,  64840,  65254,  65421,  65489,  65514,  65526,  65532,
- 65534,  65535
-};
-
-const uint16_t WebRtcIsac_kLpcShapeCdfVec01Ub164[28] =
-{
-     0,      1,      3,      6,     15,     36,     82,    196,
-   453,   1087,   2557,   5923,  13016,  25366,  40449,  52582,
- 59539,  62896,  64389,  65033,  65316,  65442,  65494,  65519,
- 65529,  65533,  65534,  65535
-};
-
-const uint16_t WebRtcIsac_kLpcShapeCdfVec01Ub165[34] =
-{
-     0,      2,      4,      8,     18,     35,     73,    146,
-   279,    524,    980,   1789,   3235,   5784,  10040,  16998,
- 27070,  38543,  48499,  55421,  59712,  62257,  63748,  64591,
- 65041,  65278,  65410,  65474,  65508,  65522,  65530,  65533,
- 65534,  65535
-};
-
-const uint16_t WebRtcIsac_kLpcShapeCdfVec01Ub166[71] =
-{
-     0,      1,      2,      6,     13,     26,     55,     92,
-   141,    191,    242,    296,    355,    429,    522,    636,
-   777,    947,   1162,   1428,   1753,   2137,   2605,   3140,
-  3743,   4409,   5164,   6016,   6982,   8118,   9451,  10993,
- 12754,  14810,  17130,  19780,  22864,  26424,  30547,  35222,
- 40140,  44716,  48698,  52056,  54850,  57162,  59068,  60643,
- 61877,  62827,  63561,  64113,  64519,  64807,  65019,  65167,
- 65272,  65343,  65399,  65440,  65471,  65487,  65500,  65509,
- 65518,  65524,  65527,  65531,  65533,  65534,  65535
-};
-
-/*
-* An array of pointers to CDFs of decorrelated LARs
-*/
-const uint16_t* WebRtcIsac_kLpcShapeCdfMatUb16
-[UB_LPC_ORDER * UB16_LPC_VEC_PER_FRAME] = {
-     WebRtcIsac_kLpcShapeCdfVec01Ub16,
-     WebRtcIsac_kLpcShapeCdfVec1Ub16,
-     WebRtcIsac_kLpcShapeCdfVec2Ub16,
-     WebRtcIsac_kLpcShapeCdfVec3Ub16,
-     WebRtcIsac_kLpcShapeCdfVec4Ub16,
-     WebRtcIsac_kLpcShapeCdfVec5Ub16,
-     WebRtcIsac_kLpcShapeCdfVec6Ub16,
-     WebRtcIsac_kLpcShapeCdfVec7Ub16,
-     WebRtcIsac_kLpcShapeCdfVec8Ub16,
-     WebRtcIsac_kLpcShapeCdfVec01Ub160,
-     WebRtcIsac_kLpcShapeCdfVec01Ub161,
-     WebRtcIsac_kLpcShapeCdfVec01Ub162,
-     WebRtcIsac_kLpcShapeCdfVec01Ub163,
-     WebRtcIsac_kLpcShapeCdfVec01Ub164,
-     WebRtcIsac_kLpcShapeCdfVec01Ub165,
-     WebRtcIsac_kLpcShapeCdfVec01Ub166
-};
-
-/*
-* The smallest reconstruction points for quantiztion of LAR coefficients.
-*/
-const double WebRtcIsac_kLpcShapeLeftRecPointUb16
-[UB_LPC_ORDER * UB16_LPC_VEC_PER_FRAME] =
-{
- -0.8250,  -0.9750,  -1.1250,  -2.1750,  -0.9750,  -1.1250,  -1.4250,
- -2.6250,  -1.4250,  -1.2750,  -1.8750,  -3.6750,  -1.7250,  -1.8750,
- -2.3250,  -5.4750
-};
-
-/*
-* Number of reconstruction points of quantizers for LAR coefficients.
-*/
-const int16_t WebRtcIsac_kLpcShapeNumRecPointUb16
-[UB_LPC_ORDER * UB16_LPC_VEC_PER_FRAME] =
-{
-   13,    15,    17,    29,    15,    16,    20,    35,    20,
-   20,    27,    54,    25,    27,    33,    70
-};
-
-/*
-* Starting index for entropy decoder to search for the right interval,
-* one entry per LAR coefficient
-*/
-const uint16_t WebRtcIsac_kLpcShapeEntropySearchUb16
-[UB_LPC_ORDER * UB16_LPC_VEC_PER_FRAME] =
-{
-    6,     7,     8,    14,     7,     8,    10,    17,    10,
-   10,    13,    27,    12,    13,    16,    35
-};
-
-/*
-* LAR quantization step-size.
-*/
-const double WebRtcIsac_kLpcShapeQStepSizeUb16 = 0.150000;
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_coding/codecs/isac/main/source/lpc_shape_swb16_tables.h b/submodules/libtgvoip/webrtc_dsp/modules/audio_coding/codecs/isac/main/source/lpc_shape_swb16_tables.h
deleted file mode 100644
index 51101db936..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_coding/codecs/isac/main/source/lpc_shape_swb16_tables.h
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- *  Copyright (c) 2011 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-/*
- * lpc_shape_swb16_tables.h
- *
- * This file declares tables used for entropy coding of LPC shape of
- * upper-band signal if the bandwidth is 16 kHz.
- *
- */
-
-#ifndef MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_LPC_SHAPE_SWB16_TABLES_H_
-#define MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_LPC_SHAPE_SWB16_TABLES_H_
-
-#include <stdint.h>
-
-#include "modules/audio_coding/codecs/isac/main/source/settings.h"
-
-extern const double WebRtcIsac_kMeanLarUb16[UB_LPC_ORDER];
-
-extern const double WebRtcIsac_kIintraVecDecorrMatUb16[UB_LPC_ORDER]
-                                                      [UB_LPC_ORDER];
-
-extern const double WebRtcIsac_kInterVecDecorrMatUb16[UB16_LPC_VEC_PER_FRAME]
-                                                     [UB16_LPC_VEC_PER_FRAME];
-
-extern const uint16_t WebRtcIsac_kLpcShapeCdfVec01Ub16[14];
-
-extern const uint16_t WebRtcIsac_kLpcShapeCdfVec1Ub16[16];
-
-extern const uint16_t WebRtcIsac_kLpcShapeCdfVec2Ub16[18];
-
-extern const uint16_t WebRtcIsac_kLpcShapeCdfVec3Ub16[30];
-
-extern const uint16_t WebRtcIsac_kLpcShapeCdfVec4Ub16[16];
-
-extern const uint16_t WebRtcIsac_kLpcShapeCdfVec5Ub16[17];
-
-extern const uint16_t WebRtcIsac_kLpcShapeCdfVec6Ub16[21];
-
-extern const uint16_t WebRtcIsac_kLpcShapeCdfVec7Ub16[36];
-
-extern const uint16_t WebRtcIsac_kLpcShapeCdfVec8Ub16[21];
-
-extern const uint16_t WebRtcIsac_kLpcShapeCdfVec01Ub160[21];
-
-extern const uint16_t WebRtcIsac_kLpcShapeCdfVec01Ub161[28];
-
-extern const uint16_t WebRtcIsac_kLpcShapeCdfVec01Ub162[55];
-
-extern const uint16_t WebRtcIsac_kLpcShapeCdfVec01Ub163[26];
-
-extern const uint16_t WebRtcIsac_kLpcShapeCdfVec01Ub164[28];
-
-extern const uint16_t WebRtcIsac_kLpcShapeCdfVec01Ub165[34];
-
-extern const uint16_t WebRtcIsac_kLpcShapeCdfVec01Ub166[71];
-
-extern const uint16_t*
-    WebRtcIsac_kLpcShapeCdfMatUb16[UB_LPC_ORDER * UB16_LPC_VEC_PER_FRAME];
-
-extern const double
-    WebRtcIsac_kLpcShapeLeftRecPointUb16[UB_LPC_ORDER * UB16_LPC_VEC_PER_FRAME];
-
-extern const int16_t
-    WebRtcIsac_kLpcShapeNumRecPointUb16[UB_LPC_ORDER * UB16_LPC_VEC_PER_FRAME];
-
-extern const uint16_t
-    WebRtcIsac_kLpcShapeEntropySearchUb16[UB_LPC_ORDER *
-                                          UB16_LPC_VEC_PER_FRAME];
-
-extern const double WebRtcIsac_kLpcShapeQStepSizeUb16;
-
-#endif  // MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_LPC_SHAPE_SWB16_TABLES_H_
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_coding/codecs/isac/main/source/lpc_tables.c b/submodules/libtgvoip/webrtc_dsp/modules/audio_coding/codecs/isac/main/source/lpc_tables.c
deleted file mode 100644
index 461b92eb8a..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_coding/codecs/isac/main/source/lpc_tables.c
+++ /dev/null
@@ -1,601 +0,0 @@
-/*
- *  Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-/* coding tables for the KLT coefficients */
-
-#include "modules/audio_coding/codecs/isac/main/source/lpc_tables.h"
-#include "modules/audio_coding/codecs/isac/main/source/settings.h"
-
-/* cdf array for model indicator */
-const uint16_t WebRtcIsac_kQKltModelCdf[4] = {
-    0,  15434,  37548,  65535 };
-
-/* pointer to cdf array for model indicator */
-const uint16_t *WebRtcIsac_kQKltModelCdfPtr[1] = {
-    WebRtcIsac_kQKltModelCdf };
-
-/* initial cdf index for decoder of model indicator */
-const uint16_t WebRtcIsac_kQKltModelInitIndex[1] = { 1 };
-
-/* offset to go from rounded value to quantization index */
-const short WebRtcIsac_kQKltQuantMinGain[12] = {
-    3,  6,  4,  6,  6,  9,  5,  16,  11,  34, 32,  47 };
-
-
-const short WebRtcIsac_kQKltQuantMinShape[108] = {
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  1,
-    1,  1,  1,  1,  2,  2,  2,  3,  0,  0,
-    0,  0,  1,  0,  0,  0,  0,  1,  1,  1,
-    1,  1,  1,  2,  2,  3,  0,  0,  0,  0,
-    1,  0,  1,  1,  1,  1,  1,  1,  1,  2,
-    2,  4,  3,  5,  0,  0,  0,  0,  1,  1,
-    1,  1,  1,  1,  2,  1,  2,  2,  3,  4,
-    4,  7,  0,  0,  1,  1,  1,  1,  1,  1,
-    1,  2,  3,  2,  3,  4,  4,  5,  7,  13,
-    0,  1,  1,  2,  3,  2,  2,  2,  4,  4,
-    5,  6,  7,  11,  9,  13,  12,  26 };
-
-/* maximum quantization index */
-const uint16_t WebRtcIsac_kQKltMaxIndGain[12] = {
-    6,  12,  8,  14,  10,  19,  12,  31,  22,  56, 52,  138 };
-
-const uint16_t WebRtcIsac_kQKltMaxIndShape[108] = {
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  1,
-    2,  2,  2,  2,  4,  4,  5,  6,  0,  0,
-    0,  0,  1,  0,  0,  0,  0,  1,  2,  2,
-    2,  2,  3,  4,  5,  7,  0,  0,  0,  0,
-    2,  0,  2,  2,  2,  2,  3,  2,  2,  4,
-    4,  6,  6,  9,  0,  0,  0,  0,  2,  2,
-    2,  2,  2,  2,  3,  2,  4,  4,  7,  7,
-    9,  13,  0,  0,  2,  2,  2,  2,  2,  2,
-    3,  4,  5,  4,  6,  8,  8,  10,  16,  25,
-    0,  2,  2,  4,  5,  4,  4,  4,  7,  8,
-    9,  10,  13,  19,  17,  23,  25,  49 };
-
-/* index offset */
-const uint16_t WebRtcIsac_kQKltOffsetGain[12] = {
-    0,  7,  20,  29,  44,  55,  75,  88,  120,  143,  200,  253 };
-
-const uint16_t WebRtcIsac_kQKltOffsetShape[108] = {
-    0,  1,  2,  3,  4,  5,  6,  7,  8,  9,
-    11,  14,  17,  20,  23,  28,  33,  39,  46,  47,
-    48,  49,  50,  52,  53,  54,  55,  56,  58,  61,
-    64,  67,  70,  74,  79,  85,  93,  94,  95,  96,
-    97,  100,  101,  104,  107,  110,  113,  117,  120,  123,
-    128,  133,  140,  147,  157,  158,  159,  160,  161,  164,
-    167,  170,  173,  176,  179,  183,  186,  191,  196,  204,
-    212,  222,  236,  237,  238,  241,  244,  247,  250,  253,
-    256,  260,  265,  271,  276,  283,  292,  301,  312,  329,
-    355,  356,  359,  362,  367,  373,  378,  383,  388,  396,
-    405,  415,  426,  440,  460,  478,  502,  528 };
-
-/* initial cdf index for KLT coefficients */
-const uint16_t WebRtcIsac_kQKltInitIndexGain[12] = {
-    3,  6,  4,  7,  5,  10,  6,  16,  11,  28, 26,  69};
-
-const uint16_t WebRtcIsac_kQKltInitIndexShape[108] = {
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  1,
-    1,  1,  1,  1,  2,  2,  3,  3,  0,  0,
-    0,  0,  1,  0,  0,  0,  0,  1,  1,  1,
-    1,  1,  2,  2,  3,  4,  0,  0,  0,  0,
-    1,  0,  1,  1,  1,  1,  2,  1,  1,  2,
-    2,  3,  3,  5,  0,  0,  0,  0,  1,  1,
-    1,  1,  1,  1,  2,  1,  2,  2,  4,  4,
-    5,  7,  0,  0,  1,  1,  1,  1,  1,  1,
-    2,  2,  3,  2,  3,  4,  4,  5,  8,  13,
-    0,  1,  1,  2,  3,  2,  2,  2,  4,  4,
-    5,  5,  7,  10,  9,  12,  13,  25 };
-
-
-/* quantizer representation levels */
-const double WebRtcIsac_kQKltLevelsGain[392] = {
-    -2.78127126, -1.76745590, -0.77913790, -0.00437329,  0.79961206,
-    1.81775776, 2.81389782, -5.78753143, -4.88384084, -3.89320940,
-    -2.88133610, -1.92859977, -0.86347396,  0.02003888,  0.86140400,
-    1.89667156,  2.97134967,  3.98781964,  4.91727277,  5.82865898,
-    -4.11195874, -2.80898424, -1.87547977, -0.80943825, -0.00679084,
-    0.79573851,  1.83953397,  2.67586037,  3.76274082, -6.10933968,
-    -4.93034581, -3.89281296, -2.91530625, -1.89684163, -0.85319130,
-    -0.02275767,  0.86862017,  1.91578276,  2.96107339,  3.96543056,
-    4.91369908,  5.91058154,  6.83848343,  8.07136925, -5.87470395,
-    -4.84703049, -3.84284597, -2.86168446, -1.89290192, -0.82798145,
-    -0.00080013,  0.82594974,  1.85754329,  2.88351798,  3.96172628,
-    -8.85684885, -7.87387461, -6.97811862, -5.93256270, -4.94301439,
-    -3.95513701, -2.96041544, -1.94031192, -0.87961478, -0.00456201,
-    0.89911505,  1.91723376,  2.94011511,  3.93302540,  4.97990967,
-    5.93133404,  7.02181199,  7.92407762,  8.80155440,  10.04665814,
-    -4.82396678, -3.85612158, -2.89482244, -1.89558408, -0.90036978,
-    -0.00677823,  0.90607989,  1.90937981,  2.91175777,  3.91637730,
-    4.97565723,  5.84771228,  7.11145863, -16.07879840, -15.03776309,
-    -13.93905670, -12.95671800, -11.89171202, -10.95820934, -9.95923714,
-    -8.94357334, -7.99068299, -6.97481009, -5.94826231, -4.96673988,
-    -3.97490466, -2.97846970, -1.95130435, -0.94215262, -0.01444043,
-    0.96770704,  1.95848598,  2.94107862,  3.95666119,  4.97253085,
-    5.97191122,  6.93277360,  7.96608727,  8.87958779,  10.00264269,
-    10.86560820,  12.07449071,  13.04491775,  13.97507061,  14.91845261,
-    -10.85696295, -9.83365357, -9.01245635, -7.95915145, -6.95625003,
-    -5.95362618, -4.93468444, -3.98760978, -2.95044407, -1.97041277,
-    -0.97701799, -0.00840234,  0.97834289,  1.98361415,  2.97802439,
-    3.96415871,  4.95369042,  5.94101770,  6.92756798,  7.94063998,
-    8.85951828,  9.97077022,  11.00068503, -33.92030406, -32.81426422,
-    -32.00000000, -31.13243639, -30.11886909, -29.06017570, -28.12598824,
-    -27.22045482, -25.81215858, -25.07849962, -23.93018013, -23.02097643,
-    -21.89529725, -20.99091085, -19.98889048, -18.94327044, -17.96562071,
-    -16.96126218, -15.95054062, -14.98516200, -13.97101012, -13.02106500,
-    -11.98438006, -11.03216748, -9.95930286, -8.97043946, -7.98085082,
-    -6.98360995, -5.98998802, -4.98668173, -4.00032906, -3.00420619,
-    -1.98701132, -0.99324682, -0.00609324,  0.98297834,  1.99483076,
-    3.00305044,  3.97142097,  4.97525759,  5.98612258,  6.97448236,
-    7.97575900,  9.01086211,  9.98665542,  11.00541438,  11.98078628,
-    12.92352471,  14.06849675,  14.99949430,  15.94904834,  16.97440321,
-    18.04040916,  18.88987609,  20.05312391,  21.00000000,  21.79443341,
-    -31.98578825, -31.00000000, -29.89060567, -28.98555686, -27.97114102,
-    -26.84935410, -26.02402230, -24.94195278, -23.92336849, -22.95552382,
-    -21.97932836, -20.96055470, -19.99649553, -19.03436122, -17.96706525,
-    -17.01139515, -16.01363516, -14.99154248, -14.00298333, -12.99630613,
-    -11.99955519, -10.99000421, -10.00819092, -8.99763648, -7.98431793,
-    -7.01769025, -5.99604690, -4.99980697, -3.99334671, -3.01748192,
-    -2.02051217, -1.00848371, -0.01942358,  1.00477757,  1.95477872,
-    2.98593031,  3.98779079,  4.96862849,  6.02694771,  6.93983733,
-    7.89874717,  8.99615862,  10.02367921,  10.96293452,  11.84351528,
-    12.92207187,  13.85122329,  15.05146877,  15.99371264,  17.00000000,
-    18.00000000,  19.00000000,  19.82763573, -47.00000000, -46.00000000,
-    -44.87138498, -44.00000000, -43.00000000, -42.00000000, -41.00000000,
-    -39.88966612, -38.98913239, -37.80306486, -37.23584325, -35.94200288,
-    -34.99881301, -34.11361858, -33.06507360, -32.13129135, -30.90891364,
-    -29.81511907, -28.99250380, -28.04535391, -26.99767800, -26.04418164,
-    -24.95687851, -24.04865595, -23.03392645, -21.89366707, -20.93517364,
-    -19.99388660, -18.91620943, -18.03749683, -16.99532379, -15.98683813,
-    -15.06421479, -13.99359211, -12.99714098, -11.97022520, -10.98500279,
-    -9.98834422, -8.95729330, -8.01232284, -7.00253661, -5.99681626,
-    -5.01207817, -3.95914904, -3.01232178, -1.96615919, -0.97687670,
-    0.01228030,  0.98412288,  2.01753544,  3.00580570,  3.97783510,
-    4.98846894,  6.01321400,  7.00867732,  8.00416375,  9.01771966,
-    9.98637729,  10.98255180,  11.99194163,  13.01807333,  14.00999545,
-    15.00118556,  16.00089224,  17.00584148,  17.98251763,  18.99942091,
-    19.96917690,  20.97839265,  21.98207297,  23.00171271,  23.99930737,
-    24.99746061,  26.00936304,  26.98240132,  28.01126868,  29.01395915,
-    29.98153507,  31.01376711,  31.99876818,  33.00475317,  33.99753994,
-    34.99493913,  35.98933585,  36.95620160,  37.98428461,  38.99317544,
-    40.01832073,  40.98048133,  41.95999283,  42.98232091,  43.96523612,
-    44.99574268,  45.99524194,  47.05464025,  48.03821548,  48.99354366,
-    49.96400411,  50.98017973,  51.95184408,  52.96291806,  54.00194392,
-    54.96603783,  55.95623778,  57.03076595,  58.05889901,  58.99081551,
-    59.97928121,  61.05071612,  62.03971580,  63.01286038,  64.01290338,
-    65.02074503,  65.99454594,  67.00399425,  67.96571257,  68.95305727,
-    69.92030664,  70.95594862,  71.98088567,  73.04764124,  74.00285480,
-    75.02696330,  75.89837673,  76.93459997,  78.16266309,  78.83317543,
-    80.00000000,  80.87251574,  82.09803524,  83.10671664,  84.00000000,
-    84.77023523,  86.00000000,  87.00000000,  87.92946897,  88.69159118,
-    90.00000000,  90.90535270 };
-
-const double WebRtcIsac_kQKltLevelsShape[578] = {
-    0.00032397,  0.00008053, -0.00061202, -0.00012620,  0.00030437,
-    0.00054764, -0.00027902,  0.00069360,  0.00029449, -0.80219239,
-    0.00091089, -0.74514927, -0.00094283,  0.64030631, -0.60509119,
-    0.00035575,  0.61851665, -0.62129957,  0.00375219,  0.60054900,
-    -0.61554359,  0.00054977,  0.63362016, -1.73118727, -0.65422341,
-    0.00524568,  0.66165298,  1.76785515, -1.83182018, -0.65997434,
-    -0.00011887,  0.67524299,  1.79933938, -1.76344480, -0.72547708,
-    -0.00133017,  0.73104704,  1.75305377,  2.85164534, -2.80423916,
-    -1.71959639, -0.75419722, -0.00329945,  0.77196760,  1.72211069,
-    2.87339653,  0.00031089, -0.00015311,  0.00018201, -0.00035035,
-    -0.77357251,  0.00154647, -0.00047625, -0.00045299,  0.00086590,
-    0.00044762, -0.83383829,  0.00024787, -0.68526258, -0.00122472,
-    0.64643255, -0.60904942, -0.00448987,  0.62309184, -0.59626442,
-    -0.00574132,  0.62296546, -0.63222115,  0.00013441,  0.63609545,
-    -0.66911055, -0.00369971,  0.66346095,  2.07281301, -1.77184694,
-    -0.67640425, -0.00010145,  0.64818392,  1.74948973, -1.69420224,
-    -0.71943894, -0.00004680,  0.75303493,  1.81075983,  2.80610041,
-    -2.80005755, -1.79866753, -0.77409777, -0.00084220,  0.80141293,
-    1.78291081,  2.73954236,  3.82994169,  0.00015140, -0.00012766,
-    -0.00034241, -0.00119125, -0.76113497,  0.00069246,  0.76722027,
-    0.00132862, -0.69107530,  0.00010656,  0.77061578, -0.78012970,
-    0.00095947,  0.77828502, -0.64787758,  0.00217168,  0.63050167,
-    -0.58601125,  0.00306596,  0.59466308, -0.58603410,  0.00059779,
-    0.64257970,  1.76512766, -0.61193600, -0.00259517,  0.59767574,
-    -0.61026273,  0.00315811,  0.61725479, -1.69169719, -0.65816029,
-    0.00067575,  0.65576890,  2.00000000, -1.72689193, -0.69780808,
-    -0.00040990,  0.70668487,  1.74198458, -3.79028154, -3.00000000,
-    -1.73194459, -0.70179341, -0.00106695,  0.71302629,  1.76849782,
-    -2.89332364, -1.78585007, -0.78731491, -0.00132610,  0.79692976,
-    1.75247009,  2.97828682, -5.26238694, -3.69559829, -2.87286122,
-    -1.84908818, -0.84434577, -0.01167975,  0.84641753,  1.84087672,
-    2.87628156,  3.83556679, -0.00190204,  0.00092642,  0.00354385,
-    -0.00012982, -0.67742785,  0.00229509,  0.64935672, -0.58444751,
-    0.00470733,  0.57299534, -0.58456202, -0.00097715,  0.64593607,
-    -0.64060330, -0.00638534,  0.59680157, -0.59287537,  0.00490772,
-    0.58919707, -0.60306173, -0.00417464,  0.60562100, -1.75218757,
-    -0.63018569, -0.00225922,  0.63863300, -0.63949939, -0.00126421,
-    0.64268914, -1.75851182, -0.68318060,  0.00510418,  0.69049211,
-    1.88178506, -1.71136148, -0.72710534, -0.00815559,  0.73412917,
-    1.79996711, -2.77111145, -1.73940498, -0.78212945,  0.01074476,
-    0.77688916,  1.76873972,  2.87281379,  3.77554698, -3.75832725,
-    -2.95463235, -1.80451491, -0.80017226,  0.00149902,  0.80729206,
-    1.78265046,  2.89391793, -3.78236148, -2.83640598, -1.82532067,
-    -0.88844327, -0.00620952,  0.88208030,  1.85757631,  2.81712391,
-    3.88430176,  5.16179367, -7.00000000, -5.93805408, -4.87172597,
-    -3.87524433, -2.89399744, -1.92359563, -0.92136341, -0.00172725,
-    0.93087018,  1.90528280,  2.89809686,  3.88085708,  4.89147740,
-    5.89078692, -0.00239502,  0.00312564, -1.00000000,  0.00178325,
-    1.00000000, -0.62198029,  0.00143254,  0.65344051, -0.59851220,
-    -0.00676987,  0.61510140, -0.58894151,  0.00385055,  0.59794203,
-    -0.59808568, -0.00038214,  0.57625703, -0.63009713, -0.01107985,
-    0.61278758, -0.64206758, -0.00154369,  0.65480598,  1.80604162,
-    -1.80909286, -0.67810514,  0.00205762,  0.68571097,  1.79453891,
-    -3.22682422, -1.73808453, -0.71870305, -0.00738594,  0.71486172,
-    1.73005326, -1.66891897, -0.73689615, -0.00616203,  0.74262409,
-    1.73807899, -2.92417482, -1.73866741, -0.78133871,  0.00764425,
-    0.80027264,  1.78668732,  2.74992588, -4.00000000, -2.75578740,
-    -1.83697516, -0.83117035, -0.00355191,  0.83527172,  1.82814700,
-    2.77377675,  3.80718693, -3.81667698, -2.83575471, -1.83372350,
-    -0.86579471,  0.00547578,  0.87582281,  1.82858793,  2.87265007,
-    3.91405377, -4.87521600, -3.78999094, -2.86437014, -1.86964365,
-    -0.90618018,  0.00128243,  0.91497811,  1.87374952,  2.83199819,
-    3.91519130,  4.76632822, -6.68713448, -6.01252467, -4.94587936,
-    -3.88795368, -2.91299088, -1.92592211, -0.95504570, -0.00089980,
-    0.94565200,  1.93239633,  2.91832808,  3.91363475,  4.88920034,
-    5.96471415,  6.83905252,  7.86195009,  8.81571018,-12.96141759,
-    -11.73039516,-10.96459719, -9.97382433, -9.04414433, -7.89460619,
-    -6.96628608, -5.93236595, -4.93337924, -3.95479990, -2.96451499,
-    -1.96635876, -0.97271229, -0.00402238,  0.98343930,  1.98348291,
-    2.96641164,  3.95456471,  4.95517089,  5.98975714,  6.90322073,
-    7.90468849,  8.85639467,  9.97255498, 10.79006309, 11.81988596,
-    0.04950500, -1.00000000, -0.01226628,  1.00000000, -0.59479469,
-    -0.10438305,  0.59822144, -2.00000000, -0.67109149, -0.09256692,
-    0.65171621,  2.00000000, -3.00000000, -1.68391999, -0.76681039,
-    -0.03354151,  0.71509146,  1.77615472, -2.00000000, -0.68661511,
-    -0.02497881,  0.66478398,  2.00000000, -2.00000000, -0.67032784,
-    -0.00920582,  0.64892756,  2.00000000, -2.00000000, -0.68561894,
-    0.03641869,  0.73021611,  1.68293863, -4.00000000, -2.72024184,
-    -1.80096059, -0.81696185,  0.03604685,  0.79232033,  1.70070730,
-    3.00000000, -4.00000000, -2.71795670, -1.80482986, -0.86001162,
-    0.03764903,  0.87723968,  1.79970771,  2.72685932,  3.67589143,
-    -5.00000000, -4.00000000, -2.85492548, -1.78996365, -0.83250358,
-    -0.01376828,  0.84195506,  1.78161105,  2.76754458,  4.00000000,
-    -6.00000000, -5.00000000, -3.82268811, -2.77563624, -1.82608163,
-    -0.86486114, -0.02671886,  0.86693165,  1.88422879,  2.86248347,
-    3.95632216, -7.00000000, -6.00000000, -5.00000000, -3.77533988,
-    -2.86391432, -1.87052039, -0.90513658,  0.06271236,  0.91083620,
-    1.85734756,  2.86031688,  3.82019418,  4.94420394,  6.00000000,
-    -11.00000000,-10.00000000, -9.00000000, -8.00000000, -6.91952415,
-    -6.00000000, -4.92044374, -3.87845165, -2.87392362, -1.88413020,
-    -0.91915740,  0.00318517,  0.91602800,  1.89664838,  2.88925058,
-    3.84123856,  4.78988651,  5.94526812,  6.81953917,  8.00000000,
-    -9.00000000, -8.00000000, -7.03319143, -5.94530963, -4.86669720,
-    -3.92438007, -2.88620396, -1.92848070, -0.94365985,  0.01671855,
-    0.97349410,  1.93419878,  2.89740109,  3.89662823,  4.83235583,
-    5.88106535,  6.80328232,  8.00000000,-13.00000000,-12.00000000,
-    -11.00000000,-10.00000000, -9.00000000, -7.86033489, -6.83344055,
-    -5.89844215, -4.90811454, -3.94841298, -2.95820490, -1.98627966,
-    -0.99161468, -0.02286136,  0.96055651,  1.95052433,  2.93969396,
-    3.94304346,  4.88522624,  5.87434241,  6.78309433,  7.87244101,
-    9.00000000, 10.00000000,-12.09117356,-11.00000000,-10.00000000,
-    -8.84766108, -7.86934236, -6.98544896, -5.94233429, -4.95583292,
-    -3.95575986, -2.97085529, -1.98955811, -0.99359873, -0.00485413,
-    0.98298870,  1.98093258,  2.96430203,  3.95540216,  4.96915010,
-    5.96775124,  6.99236918,  7.96503302,  8.99864542,  9.85857723,
-    10.96541926, 11.91647197, 12.71060069,-26.00000000,-25.00000000,
-    -24.00585596,-23.11642573,-22.14271284,-20.89800711,-19.87815799,
-    -19.05036354,-17.88555651,-16.86471209,-15.97711073,-14.94012359,
-    -14.02661226,-12.98243228,-11.97489256,-10.97402777, -9.96425624,
-    -9.01085220, -7.97372506, -6.98795002, -5.97271328, -5.00191694,
-    -3.98055849, -2.98458048, -1.99470442, -0.99656768, -0.00825666,
-    1.00272004,  1.99922218,  2.99357669,  4.01407905,  5.01003897,
-    5.98115528,  7.00018958,  8.00338125,  8.98981046,  9.98990318,
-    10.96341479, 11.96866930, 12.99175139, 13.94580443, 14.95745083,
-    15.98992869, 16.97484646, 17.99630043, 18.93396897, 19.88347741,
-    20.96532482, 21.92191032, 23.22314702 };
-
-
-/* cdf tables for quantizer indices */
-const uint16_t WebRtcIsac_kQKltCdfGain[404] = {
-    0,  13,  301,  3730,  61784,  65167,  65489,  65535,  0,  17,
-    142,  314,  929,  2466,  7678,  56450,  63463,  64740,  65204,  65426,
-    65527,  65535,  0,  8,  100,  724,  6301,  60105,  65125,  65510,
-    65531,  65535,  0,  13,  117,  368,  1068,  3010,  11928,  53603,
-    61177,  63404,  64505,  65108,  65422,  65502,  65531,  65535,  0,  4,
-    17,  96,  410,  1859,  12125,  54361,  64103,  65305,  65497,  65535,
-    0,  4,  88,  230,  469,  950,  1746,  3228,  6092,  16592,
-    44756,  56848,  61256,  63308,  64325,  64920,  65309,  65460,  65502,
-    65522, 65535,  0,  88,  352,  1675,  6339,  20749,  46686,  59284,  63525,
-    64949,  65359,  65502,  65527,  65535,  0,  13,  38,  63,  117,
-    234,  381,  641,  929,  1407,  2043,  2809,  4032,  5753,  8792,
-    14407,  24308,  38941,  48947,  55403,  59293,  61411,  62688,  63630,
-    64329, 64840,  65188,  65376,  65472,  65506,  65527,  65531,  65535,
-    0,  8, 29,  75,  222,  615,  1327,  2801,  5623,  9931,  16094,  24966,
-    34419, 43458,  50676,  56186,  60055,  62500,  63936,  64765,  65225,
-    65435, 65514,  65535,  0,  8,  13,  15,  17,  21,  33,  59,
-    71,  92,  151,  243,  360,  456,  674,  934,  1223,  1583,
-    1989,  2504,  3031,  3617,  4354,  5154,  6163,  7411,  8780,  10747,
-    12874,  15591,  18974,  23027,  27436,  32020,  36948,  41830,  46205,
-    49797,  53042,  56094,  58418,  60360,  61763,  62818,  63559,  64103,
-    64509,  64798,  65045,  65162,  65288,  65363,  65447,  65506,  65522,
-    65531,  65533,  65535,  0,  4,  6,  25,  38,  71,  138,  264,  519,  808,
-    1227,  1825,  2516,  3408,  4279,  5560,  7092,  9197,  11420,  14108,
-    16947,  20300,  23926,  27459,  31164,  34827,  38575,  42178,  45540,
-    48747,  51444,  54090,  56426,  58460,  60080,  61595,  62734,  63668,
-    64275,  64673,  64936,  65112,  65217,  65334,  65426,  65464,  65477,
-    65489,  65518,  65527,  65529,  65531,  65533,  65535,  0,  2,  4,  8,  10,
-    12,  14,  16,  21,  33,  50,  71,  84,  92,  105,  138, 180,  255,  318,
-    377,  435,  473,  511,  590,  682,  758,  913,  1097,  1256,  1449,  1671,
-    1884,  2169,  2445,  2772,  3157,  3563,  3944,  4375,  4848,  5334,  5820,
-    6448,  7101,  7716,  8378,  9102,  9956,  10752,  11648,  12707,  13670,
-    14758,  15910,  17187,  18472,  19627,  20649,  21951,  23169,  24283,
-    25552,  26862,  28227,  29391,  30764,  31882,  33213,  34432,  35600,
-    36910,  38116,  39464,  40729,  41872,  43144,  44371,  45514,  46762,
-    47813,  48968,  50069,  51032,  51974,  52908,  53737,  54603,  55445,
-    56282,  56990,  57572,  58191,  58840,  59410,  59887,  60264,  60607,
-    60946,  61269,  61516,  61771,  61960,  62198,  62408,  62558,  62776,
-    62985,  63207,  63408,  63546,  63739,  63906,  64070,  64237,  64371,
-    64551,  64677,  64836,  64999,  65095,  65213,  65284,  65338,  65380,
-    65426,  65447,  65472,  65485,  65487,  65489,  65502,  65510,  65512,
-    65514,  65516,  65518,  65522,  65531,  65533,  65535 };
-
-
-const uint16_t WebRtcIsac_kQKltCdfShape[686] = {
-    0,  65535,  0,  65535,  0,  65535,  0,  65535,  0,  65535,
-    0,  65535,  0,  65535,  0,  65535,  0,  65535,  0,  4,
-    65535,  0,  8,  65514,  65535,  0,  29,  65481,  65535,  0,
-    121,  65439,  65535,  0,  239,  65284,  65535,  0,  8,  779,
-    64999,  65527,  65535,  0,  8,  888,  64693,  65522,  65535,  0,
-    29,  2604,  62843,  65497,  65531,  65535,  0,  25,  176,  4576,
-    61164,  65275,  65527,  65535,  0,  65535,  0,  65535,  0,  65535,
-    0,  65535,  0,  4,  65535,  0,  65535,  0,  65535,  0,
-    65535,  0,  65535,  0,  4,  65535,  0,  33,  65502,  65535,
-    0,  54,  65481,  65535,  0,  251,  65309,  65535,  0,  611,
-    65074,  65535,  0,  1273,  64292,  65527,  65535,  0,  4,  1809,
-    63940,  65518,  65535,  0,  88,  4392,  60603,  65426,  65531,  65535,
-    0,  25,  419,  7046,  57756,  64961,  65514,  65531,  65535,  0,
-    65535,  0,  65535,  0,  65535,  0,  65535,  0,  4,  65531,
-    65535,  0,  65535,  0,  8,  65531,  65535,  0,  4,  65527,
-    65535,  0,  17,  65510,  65535,  0,  42,  65481,  65535,  0,
-    197,  65342,  65531,  65535,  0,  385,  65154,  65535,  0,  1005,
-    64522,  65535,  0,  8,  1985,  63469,  65533,  65535,  0,  38,
-    3119,  61884,  65514,  65535,  0,  4,  6,  67,  4961,  60804,
-    65472,  65535,  0,  17,  565,  9182,  56538,  65087,  65514,  65535,
-    0,  8,  63,  327,  2118,  14490,  52774,  63839,  65376,  65522,
-    65535,  0,  65535,  0,  65535,  0,  65535,  0,  65535,  0,
-    17,  65522,  65535,  0,  59,  65489,  65535,  0,  50,  65522,
-    65535,  0,  54,  65489,  65535,  0,  310,  65179,  65535,  0,
-    615,  64836,  65535,  0,  4,  1503,  63965,  65535,  0,  2780,
-    63383,  65535,  0,  21,  3919,  61051,  65527,  65535,  0,  84,
-    6674,  59929,  65435,  65535,  0,  4,  255,  7976,  55784,  65150,
-    65518,  65531,  65535,  0,  4,  8,  582,  10726,  53465,  64949,
-    65518,  65535,  0,  29,  339,  3006,  17555,  49517,  62956,  65200,
-    65497,  65531,  65535,  0,  2,  33,  138,  565,  2324,  7670,
-    22089,  45966,  58949,  63479,  64966,  65380,  65518,  65535,  0,  65535,
-    0,  65535,  0,  2,  65533,  65535,  0,  46,  65514,  65535,
-    0,  414,  65091,  65535,  0,  540,  64911,  65535,  0,  419,
-    65162,  65535,  0,  976,  64790,  65535,  0,  2977,  62495,  65531,
-    65535,  0,  4,  3852,  61034,  65527,  65535,  0,  4,  29,
-    6021,  60243,  65468,  65535,  0,  84,  6711,  58066,  65418,  65535,
-    0,  13,  281,  9550,  54917,  65125,  65506,  65535,  0,  2,
-    63,  984,  12108,  52644,  64342,  65435,  65527,  65535,  0,  29,
-    251,  2014,  14871,  47553,  62881,  65229,  65518,  65535,  0,  13,
-    142,  749,  4220,  18497,  45200,  60913,  64823,  65426,  65527,  65535,
-    0,  13,  71,  264,  1176,  3789,  10500,  24480,  43488,  56324,
-    62315,  64493,  65242,  65464,  65514,  65522,  65531,  65535,  0,  4,
-    13,  38,  109,  205,  448,  850,  1708,  3429,  6276,  11371,
-    19221,  29734,  40955,  49391,  55411,  59460,  62102,  63793,  64656,
-    65150, 65401,  65485,  65522,  65531,  65535,  0,  65535,  0,  2,  65533,
-    65535,  0,  1160,  65476,  65535,  0,  2,  6640,  64763,  65533,
-    65535,  0,  2,  38,  9923,  61009,  65527,  65535,  0,  2,
-    4949,  63092,  65533,  65535,  0,  2,  3090,  63398,  65533,  65535,
-    0,  2,  2520,  58744,  65510,  65535,  0,  2,  13,  544,
-    8784,  51403,  65148,  65533,  65535,  0,  2,  25,  1017,  10412,
-    43550,  63651,  65489,  65527,  65535,  0,  2,  4,  29,  783,
-    13377,  52462,  64524,  65495,  65533,  65535,  0,  2,  4,  6,
-    100,  1817,  18451,  52590,  63559,  65376,  65531,  65535,  0,  2,
-    4,  6,  46,  385,  2562,  11225,  37416,  60488,  65026,  65487,
-    65529,  65533,  65535,  0,  2,  4,  6,  8,  10,  12,
-    42,  222,  971,  5221,  19811,  45048,  60312,  64486,  65294,  65474,
-    65525,  65529,  65533,  65535,  0,  2,  4,  8,  71,  167,
-    666,  2533,  7875,  19622,  38082,  54359,  62108,  64633,  65290,  65495,
-    65529,  65533,  65535,  0,  2,  4,  6,  8,  10,  13,
-    109,  586,  1930,  4949,  11600,  22641,  36125,  48312,  56899,  61495,
-    63927,  64932,  65389,  65489,  65518,  65531,  65533,  65535,  0,  4,
-    6,  8,  67,  209,  712,  1838,  4195,  8432,  14432,  22834,
-    31723,  40523,  48139,  53929,  57865,  60657,  62403,  63584,  64363,
-    64907, 65167,  65372,  65472,  65514,  65535,  0,  2,  4,  13,  25,
-    42,  46,  50,  75,  113,  147,  281,  448,  657,  909,
-    1185,  1591,  1976,  2600,  3676,  5317,  7398,  9914,  12941,  16169,
-    19477,  22885,  26464,  29851,  33360,  37228,  41139,  44802,  48654,
-    52058, 55181,  57676,  59581,  61022,  62190,  63107,  63676,  64199,
-    64547,  64924, 65158,  65313,  65430,  65481,  65518,  65535 };
-
-
-/* pointers to cdf tables for quantizer indices */
-const uint16_t *WebRtcIsac_kQKltCdfPtrGain[12] = {
-    WebRtcIsac_kQKltCdfGain +0 +0, WebRtcIsac_kQKltCdfGain +0 +8,
-    WebRtcIsac_kQKltCdfGain +0 +22, WebRtcIsac_kQKltCdfGain +0 +32,
-    WebRtcIsac_kQKltCdfGain +0 +48, WebRtcIsac_kQKltCdfGain +0 +60,
-    WebRtcIsac_kQKltCdfGain +0 +81, WebRtcIsac_kQKltCdfGain +0 +95,
-    WebRtcIsac_kQKltCdfGain +0 +128, WebRtcIsac_kQKltCdfGain +0 +152,
-    WebRtcIsac_kQKltCdfGain +0 +210, WebRtcIsac_kQKltCdfGain +0 +264 };
-
-const uint16_t *WebRtcIsac_kQKltCdfPtrShape[108] = {
-    WebRtcIsac_kQKltCdfShape +0 +0, WebRtcIsac_kQKltCdfShape +0 +2,
-    WebRtcIsac_kQKltCdfShape +0 +4, WebRtcIsac_kQKltCdfShape +0 +6,
-    WebRtcIsac_kQKltCdfShape +0 +8, WebRtcIsac_kQKltCdfShape +0 +10,
-    WebRtcIsac_kQKltCdfShape +0 +12, WebRtcIsac_kQKltCdfShape +0 +14,
-    WebRtcIsac_kQKltCdfShape +0 +16, WebRtcIsac_kQKltCdfShape +0 +18,
-    WebRtcIsac_kQKltCdfShape +0 +21, WebRtcIsac_kQKltCdfShape +0 +25,
-    WebRtcIsac_kQKltCdfShape +0 +29, WebRtcIsac_kQKltCdfShape +0 +33,
-    WebRtcIsac_kQKltCdfShape +0 +37, WebRtcIsac_kQKltCdfShape +0 +43,
-    WebRtcIsac_kQKltCdfShape +0 +49, WebRtcIsac_kQKltCdfShape +0 +56,
-    WebRtcIsac_kQKltCdfShape +0 +64, WebRtcIsac_kQKltCdfShape +0 +66,
-    WebRtcIsac_kQKltCdfShape +0 +68, WebRtcIsac_kQKltCdfShape +0 +70,
-    WebRtcIsac_kQKltCdfShape +0 +72, WebRtcIsac_kQKltCdfShape +0 +75,
-    WebRtcIsac_kQKltCdfShape +0 +77, WebRtcIsac_kQKltCdfShape +0 +79,
-    WebRtcIsac_kQKltCdfShape +0 +81, WebRtcIsac_kQKltCdfShape +0 +83,
-    WebRtcIsac_kQKltCdfShape +0 +86, WebRtcIsac_kQKltCdfShape +0 +90,
-    WebRtcIsac_kQKltCdfShape +0 +94, WebRtcIsac_kQKltCdfShape +0 +98,
-    WebRtcIsac_kQKltCdfShape +0 +102, WebRtcIsac_kQKltCdfShape +0 +107,
-    WebRtcIsac_kQKltCdfShape +0 +113, WebRtcIsac_kQKltCdfShape +0 +120,
-    WebRtcIsac_kQKltCdfShape +0 +129, WebRtcIsac_kQKltCdfShape +0 +131,
-    WebRtcIsac_kQKltCdfShape +0 +133, WebRtcIsac_kQKltCdfShape +0 +135,
-    WebRtcIsac_kQKltCdfShape +0 +137, WebRtcIsac_kQKltCdfShape +0 +141,
-    WebRtcIsac_kQKltCdfShape +0 +143, WebRtcIsac_kQKltCdfShape +0 +147,
-    WebRtcIsac_kQKltCdfShape +0 +151, WebRtcIsac_kQKltCdfShape +0 +155,
-    WebRtcIsac_kQKltCdfShape +0 +159, WebRtcIsac_kQKltCdfShape +0 +164,
-    WebRtcIsac_kQKltCdfShape +0 +168, WebRtcIsac_kQKltCdfShape +0 +172,
-    WebRtcIsac_kQKltCdfShape +0 +178, WebRtcIsac_kQKltCdfShape +0 +184,
-    WebRtcIsac_kQKltCdfShape +0 +192, WebRtcIsac_kQKltCdfShape +0 +200,
-    WebRtcIsac_kQKltCdfShape +0 +211, WebRtcIsac_kQKltCdfShape +0 +213,
-    WebRtcIsac_kQKltCdfShape +0 +215, WebRtcIsac_kQKltCdfShape +0 +217,
-    WebRtcIsac_kQKltCdfShape +0 +219, WebRtcIsac_kQKltCdfShape +0 +223,
-    WebRtcIsac_kQKltCdfShape +0 +227, WebRtcIsac_kQKltCdfShape +0 +231,
-    WebRtcIsac_kQKltCdfShape +0 +235, WebRtcIsac_kQKltCdfShape +0 +239,
-    WebRtcIsac_kQKltCdfShape +0 +243, WebRtcIsac_kQKltCdfShape +0 +248,
-    WebRtcIsac_kQKltCdfShape +0 +252, WebRtcIsac_kQKltCdfShape +0 +258,
-    WebRtcIsac_kQKltCdfShape +0 +264, WebRtcIsac_kQKltCdfShape +0 +273,
-    WebRtcIsac_kQKltCdfShape +0 +282, WebRtcIsac_kQKltCdfShape +0 +293,
-    WebRtcIsac_kQKltCdfShape +0 +308, WebRtcIsac_kQKltCdfShape +0 +310,
-    WebRtcIsac_kQKltCdfShape +0 +312, WebRtcIsac_kQKltCdfShape +0 +316,
-    WebRtcIsac_kQKltCdfShape +0 +320, WebRtcIsac_kQKltCdfShape +0 +324,
-    WebRtcIsac_kQKltCdfShape +0 +328, WebRtcIsac_kQKltCdfShape +0 +332,
-    WebRtcIsac_kQKltCdfShape +0 +336, WebRtcIsac_kQKltCdfShape +0 +341,
-    WebRtcIsac_kQKltCdfShape +0 +347, WebRtcIsac_kQKltCdfShape +0 +354,
-    WebRtcIsac_kQKltCdfShape +0 +360, WebRtcIsac_kQKltCdfShape +0 +368,
-    WebRtcIsac_kQKltCdfShape +0 +378, WebRtcIsac_kQKltCdfShape +0 +388,
-    WebRtcIsac_kQKltCdfShape +0 +400, WebRtcIsac_kQKltCdfShape +0 +418,
-    WebRtcIsac_kQKltCdfShape +0 +445, WebRtcIsac_kQKltCdfShape +0 +447,
-    WebRtcIsac_kQKltCdfShape +0 +451, WebRtcIsac_kQKltCdfShape +0 +455,
-    WebRtcIsac_kQKltCdfShape +0 +461, WebRtcIsac_kQKltCdfShape +0 +468,
-    WebRtcIsac_kQKltCdfShape +0 +474, WebRtcIsac_kQKltCdfShape +0 +480,
-    WebRtcIsac_kQKltCdfShape +0 +486, WebRtcIsac_kQKltCdfShape +0 +495,
-    WebRtcIsac_kQKltCdfShape +0 +505, WebRtcIsac_kQKltCdfShape +0 +516,
-    WebRtcIsac_kQKltCdfShape +0 +528, WebRtcIsac_kQKltCdfShape +0 +543,
-    WebRtcIsac_kQKltCdfShape +0 +564, WebRtcIsac_kQKltCdfShape +0 +583,
-    WebRtcIsac_kQKltCdfShape +0 +608, WebRtcIsac_kQKltCdfShape +0 +635 };
-
-
-/* left KLT transforms */
-const double WebRtcIsac_kKltT1Gain[4] = {
-    -0.79742827,  0.60341375,  0.60341375,  0.79742827 };
-
-const double WebRtcIsac_kKltT1Shape[324] = {
-    0.00159597,  0.00049320,  0.00513821,  0.00021066,  0.01338581,
-    -0.00422367, -0.00272072,  0.00935107,  0.02047622,  0.02691189,
-    0.00478236,  0.03969702,  0.00886698,  0.04877604, -0.10898362,
-    -0.05930891, -0.03415047,  0.98889721,  0.00293558, -0.00035282,
-    0.01156321, -0.00195341, -0.00937631,  0.01052213, -0.02551163,
-    0.01644059,  0.03189927,  0.07754773, -0.08742313, -0.03026338,
-    0.05136248, -0.14395974,  0.17725040,  0.22664856,  0.93380230,
-    0.07076411,  0.00557890, -0.00222834,  0.01377569,  0.01466808,
-    0.02847361, -0.00603178,  0.02382480, -0.01210452,  0.03797267,
-    -0.02371480,  0.11260335, -0.07366682,  0.00453436, -0.04136941,
-    -0.07912843, -0.95031418,  0.25295337, -0.05302216, -0.00617554,
-    -0.00044040, -0.00653778,  0.01097838,  0.01529174,  0.01374431,
-    -0.00748512, -0.00020034,  0.02432713,  0.11101570, -0.08556891,
-    0.09282249, -0.01029446,  0.67556443, -0.67454300,  0.06910063,
-    0.20866865, -0.10318050,  0.00932175,  0.00524058,  0.00803610,
-    -0.00594676, -0.01082578,  0.01069906,  0.00546768,  0.01565291,
-    0.06816200,  0.10201227,  0.16812734,  0.22984074,  0.58213170,
-    -0.54138651, -0.51379962,  0.06847390, -0.01920037, -0.04592324,
-    -0.00467394,  0.00328858,  0.00377424, -0.00987448,  0.08222096,
-    -0.00377301,  0.04551941, -0.02592517,  0.16317082,  0.13077530,
-    0.22702921, -0.31215289, -0.69645962, -0.38047101, -0.39339411,
-    0.11124777,  0.02508035, -0.00708074,  0.00400344,  0.00040331,
-    0.01142402,  0.01725406,  0.01635170,  0.14285366,  0.03949233,
-    -0.05905676,  0.05877154, -0.17497577, -0.32479440,  0.80754464,
-    -0.38085603, -0.17055430, -0.03168622, -0.07531451,  0.02942002,
-    -0.02148095, -0.00754114, -0.00322372,  0.00567812, -0.01701521,
-    -0.12358320,  0.11473564,  0.09070136,  0.06533068, -0.22560802,
-    0.19209022,  0.81605094,  0.36592275, -0.09919829,  0.16667122,
-    0.16300725,  0.04803807,  0.06739263, -0.00156752, -0.01685302,
-    -0.00905240, -0.02297836, -0.00469939,  0.06310613, -0.16391930,
-    0.10919511,  0.12529293,  0.85581322, -0.32145522,  0.24539076,
-    0.07181839,  0.07289591,  0.14066759,  0.10406711,  0.05815518,
-    0.01072680, -0.00759339,  0.00053486, -0.00044865,  0.03407361,
-    0.01645348,  0.08758579,  0.27722240,  0.53665485, -0.74853376,
-    -0.01118192, -0.19805430,  0.06130619, -0.09675299,  0.08978480,
-    0.03405255, -0.00706867,  0.05102045,  0.03250746,  0.01849966,
-    -0.01216314, -0.01184187, -0.01579288,  0.00114807,  0.11376166,
-    0.88342114, -0.36425379,  0.13863190,  0.12524180, -0.13553892,
-    0.04715856, -0.12341103,  0.04531568,  0.01899360, -0.00206897,
-    0.00567768, -0.01444163,  0.00411946, -0.00855896,  0.00381663,
-    -0.01664861, -0.05534280,  0.21328278,  0.20161162,  0.72360394,
-    0.59130708, -0.08043791,  0.08757349, -0.13893918, -0.05147377,
-    0.02680690, -0.01144070,  0.00625162, -0.00634215, -0.01248947,
-    -0.00329455, -0.00609625, -0.00136305, -0.05097048, -0.01029851,
-    0.25065384, -0.16856837, -0.07123372,  0.15992623, -0.39487617,
-    -0.79972301,  0.18118185, -0.04826639, -0.01805578, -0.02927253,
-    -0.16400618,  0.07472763,  0.10376449,  0.01705406,  0.01065801,
-    -0.01500498,  0.02039914,  0.37776349, -0.84484186,  0.10434286,
-    0.15616990,  0.13474456, -0.00906238, -0.25238368, -0.03820885,
-    -0.10650905, -0.03880833, -0.03660028, -0.09640894,  0.00583314,
-    0.01922097,  0.01489911, -0.02431117, -0.09372217,  0.39404721,
-    -0.84786223, -0.31277121,  0.03193850,  0.01974060,  0.01887901,
-    0.00337911, -0.11359599, -0.02792521, -0.03220184, -0.01533311,
-    0.00015962, -0.04225043, -0.00933965,  0.00675311,  0.00206060,
-    0.15926771,  0.40199829, -0.80792558, -0.35591604, -0.17169764,
-    0.02830436,  0.02459982, -0.03438589,  0.00718705, -0.01798329,
-    -0.01594508, -0.00702430, -0.00952419, -0.00962701, -0.01307212,
-    -0.01749740,  0.01299602,  0.00587270, -0.36103108, -0.82039266,
-    -0.43092844, -0.08500097, -0.04361674, -0.00333482,  0.01250434,
-    -0.02538295, -0.00921797,  0.01645071, -0.01400872,  0.00317607,
-    0.00003277, -0.01617646, -0.00616863, -0.00882661,  0.00466157,
-    0.00353237,  0.91803104, -0.39503305, -0.02048964,  0.00060125,
-    0.01980634,  0.00300109,  0.00313880,  0.00657337,  0.00715163,
-    0.00000261,  0.00854276, -0.00154825, -0.00516128,  0.00909527,
-    0.00095609,  0.00701196, -0.00221867, -0.00156741 };
-
-/* right KLT transforms */
-const double WebRtcIsac_kKltT2Gain[36] = {
-    0.14572837, -0.45446306,  0.61990621, -0.52197033,  0.32145074,
-    -0.11026900, -0.20698282,  0.48962182, -0.27127933, -0.33627476,
-    0.65094037, -0.32715751,  0.40262573, -0.47844405, -0.33876075,
-    0.44130653,  0.37383966, -0.39964662, -0.51730480,  0.06611973,
-    0.49030187,  0.47512886, -0.02141226, -0.51129451, -0.58578569,
-    -0.39132064, -0.13187771,  0.15649421,  0.40735596,  0.54396897,
-    0.40381276,  0.40904942,  0.41179766,  0.41167576,  0.40840251,
-    0.40468132 };
-
-const double WebRtcIsac_kKltT2Shape[36] = {
-    0.13427386, -0.35132558,  0.52506528, -0.59419077,  0.45075085,
-    -0.16312057,  0.29857439, -0.58660147,  0.34265431,  0.20879510,
-    -0.56063262,  0.30238345,  0.43308283, -0.41186999, -0.35288681,
-    0.42768996,  0.36094634, -0.45284910, -0.47116680,  0.02893449,
-    0.54326135,  0.45249040, -0.06264420, -0.52283830,  0.57137758,
-    0.44298139,  0.12617554, -0.20819946, -0.42324603, -0.48876443,
-    0.39597050,  0.40713935,  0.41389880,  0.41512486,  0.41130400,
-    0.40575001 };
-
-/* means of log gains and LAR coefficients*/
-const double WebRtcIsac_kLpcMeansGain[12] = {
-    -6.86881911, -5.35075273, -6.86792680, -5.36200897, -6.86401538,
-    -5.36921533, -6.86802969, -5.36893966, -6.86538097, -5.36315063,
-    -6.85535304, -5.35155315 };
-
-const double WebRtcIsac_kLpcMeansShape[108] = {
-    -0.91232981,  0.26258634, -0.33716701,  0.08477430, -0.03378426,
-    0.14423909,  0.07036185,  0.06155019,  0.01490385,  0.04138740,
-    0.01427317,  0.01288970,  0.83872106,  0.25750199,  0.07988929,
-    -0.01957923,  0.00831390,  0.01770300, -0.90957164,  0.25732216,
-    -0.33385344,  0.08735740, -0.03715332,  0.14584917,  0.06998990,
-    0.06131968,  0.01504379,  0.04067339,  0.01428039,  0.01406460,
-    0.83846243,  0.26169862,  0.08109025, -0.01767055,  0.00970539,
-    0.01954310, -0.90490803,  0.24656405, -0.33578607,  0.08843286,
-    -0.03749139,  0.14443959,  0.07214669,  0.06170993,  0.01449947,
-    0.04134309,  0.01314762,  0.01413471,  0.83895203,  0.26748062,
-    0.08197507, -0.01781298,  0.00885967,  0.01922394, -0.90922472,
-    0.24495889, -0.33921540,  0.08877169, -0.03581332,  0.14199172,
-    0.07444032,  0.06185940,  0.01502054,  0.04185113,  0.01276579,
-    0.01355457,  0.83645358,  0.26631720,  0.08119697, -0.01835449,
-    0.00788512,  0.01846446, -0.90482253,  0.24658310, -0.34019734,
-    0.08281090, -0.03486038,  0.14359248,  0.07401336,  0.06001471,
-    0.01528421,  0.04254560,  0.01321472,  0.01240799,  0.83857127,
-    0.26281654,  0.08174380, -0.02099842,  0.00755176,  0.01699448,
-    -0.90132307,  0.25174308, -0.33838268,  0.07883863, -0.02877906,
-    0.14105407,  0.07220290,  0.06000352,  0.01684879,  0.04226844,
-    0.01331331,  0.01269244,  0.83832138,  0.25467485,  0.08118028,
-    -0.02120528,  0.00747832,  0.01567212 };
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_coding/codecs/isac/main/source/lpc_tables.h b/submodules/libtgvoip/webrtc_dsp/modules/audio_coding/codecs/isac/main/source/lpc_tables.h
deleted file mode 100644
index 2d92dfaaa5..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_coding/codecs/isac/main/source/lpc_tables.h
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- *  Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-/*
- * lpc_tables.h
- *
- * header file for coding tables for the LPC coefficients
- *
- */
-
-#ifndef MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_LPC_TABLES_H_
-#define MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_LPC_TABLES_H_
-
-#include "modules/audio_coding/codecs/isac/main/source/structs.h"
-
-#include "modules/audio_coding/codecs/isac/main/source/settings.h"
-
-#define KLT_STEPSIZE 1.00000000
-#define KLT_NUM_AVG_GAIN 0
-#define KLT_NUM_AVG_SHAPE 0
-#define KLT_NUM_MODELS 3
-#define LPC_GAIN_SCALE 4.000f
-#define LPC_LOBAND_SCALE 2.100f
-#define LPC_LOBAND_ORDER ORDERLO
-#define LPC_HIBAND_SCALE 0.450f
-#define LPC_HIBAND_ORDER ORDERHI
-#define LPC_GAIN_ORDER 2
-
-#define LPC_SHAPE_ORDER (LPC_LOBAND_ORDER + LPC_HIBAND_ORDER)
-
-#define KLT_ORDER_GAIN (LPC_GAIN_ORDER * SUBFRAMES)
-#define KLT_ORDER_SHAPE (LPC_SHAPE_ORDER * SUBFRAMES)
-
-/* cdf array for model indicator */
-extern const uint16_t WebRtcIsac_kQKltModelCdf[KLT_NUM_MODELS + 1];
-
-/* pointer to cdf array for model indicator */
-extern const uint16_t* WebRtcIsac_kQKltModelCdfPtr[1];
-
-/* initial cdf index for decoder of model indicator */
-extern const uint16_t WebRtcIsac_kQKltModelInitIndex[1];
-
-/* offset to go from rounded value to quantization index */
-extern const short WebRtcIsac_kQKltQuantMinGain[12];
-
-extern const short WebRtcIsac_kQKltQuantMinShape[108];
-
-/* maximum quantization index */
-extern const uint16_t WebRtcIsac_kQKltMaxIndGain[12];
-
-extern const uint16_t WebRtcIsac_kQKltMaxIndShape[108];
-
-/* index offset */
-extern const uint16_t WebRtcIsac_kQKltOffsetGain[12];
-
-extern const uint16_t WebRtcIsac_kQKltOffsetShape[108];
-
-/* initial cdf index for KLT coefficients */
-extern const uint16_t WebRtcIsac_kQKltInitIndexGain[12];
-
-extern const uint16_t WebRtcIsac_kQKltInitIndexShape[108];
-
-/* quantizer representation levels */
-extern const double WebRtcIsac_kQKltLevelsGain[392];
-
-extern const double WebRtcIsac_kQKltLevelsShape[578];
-
-/* cdf tables for quantizer indices */
-extern const uint16_t WebRtcIsac_kQKltCdfGain[404];
-
-extern const uint16_t WebRtcIsac_kQKltCdfShape[686];
-
-/* pointers to cdf tables for quantizer indices */
-extern const uint16_t* WebRtcIsac_kQKltCdfPtrGain[12];
-
-extern const uint16_t* WebRtcIsac_kQKltCdfPtrShape[108];
-
-/* left KLT transforms */
-extern const double WebRtcIsac_kKltT1Gain[4];
-
-extern const double WebRtcIsac_kKltT1Shape[324];
-
-/* right KLT transforms */
-extern const double WebRtcIsac_kKltT2Gain[36];
-
-extern const double WebRtcIsac_kKltT2Shape[36];
-
-/* means of log gains and LAR coefficients */
-extern const double WebRtcIsac_kLpcMeansGain[12];
-
-extern const double WebRtcIsac_kLpcMeansShape[108];
-
-#endif /* MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_LPC_TABLES_H_ */
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_coding/codecs/isac/main/source/os_specific_inline.h b/submodules/libtgvoip/webrtc_dsp/modules/audio_coding/codecs/isac/main/source/os_specific_inline.h
deleted file mode 100644
index fe9afa4ba2..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_coding/codecs/isac/main/source/os_specific_inline.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- *  Copyright (c) 2011 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#ifndef MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_OS_SPECIFIC_INLINE_H_
-#define MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_OS_SPECIFIC_INLINE_H_
-
-#include <math.h>
-
-#include "rtc_base/system/arch.h"
-
-#if defined(WEBRTC_POSIX)
-#define WebRtcIsac_lrint lrint
-#elif (defined(WEBRTC_ARCH_X86) && defined(WIN32))
-static __inline long int WebRtcIsac_lrint(double x_dbl) {
-  long int x_int;
-
-  __asm {
-    fld x_dbl
-    fistp x_int
-  }
-  ;
-
-  return x_int;
-}
-#else  // Do a slow but correct implementation of lrint
-
-static __inline long int WebRtcIsac_lrint(double x_dbl) {
-  long int x_int;
-  x_int = (long int)floor(x_dbl + 0.499999999999);
-  return x_int;
-}
-
-#endif
-
-#endif  // MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_OS_SPECIFIC_INLINE_H_
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_coding/codecs/isac/main/source/pitch_estimator.c b/submodules/libtgvoip/webrtc_dsp/modules/audio_coding/codecs/isac/main/source/pitch_estimator.c
deleted file mode 100644
index 8a19ac1710..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_coding/codecs/isac/main/source/pitch_estimator.c
+++ /dev/null
@@ -1,695 +0,0 @@
-/*
- *  Copyright (c) 2011 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#include "modules/audio_coding/codecs/isac/main/source/pitch_estimator.h"
-
-#include <math.h>
-#include <memory.h>
-#include <string.h>
-#ifdef WEBRTC_ANDROID
-#include <stdlib.h>
-#endif
-
-#include "modules/audio_coding/codecs/isac/main/source/filter_functions.h"
-#include "modules/audio_coding/codecs/isac/main/source/pitch_filter.h"
-#include "rtc_base/system/ignore_warnings.h"
-
-static const double kInterpolWin[8] = {-0.00067556028640,  0.02184247643159, -0.12203175715679,  0.60086484101160,
-                                       0.60086484101160, -0.12203175715679,  0.02184247643159, -0.00067556028640};
-
-/* interpolation filter */
-__inline static void IntrepolFilter(double *data_ptr, double *intrp)
-{
-  *intrp = kInterpolWin[0] * data_ptr[-3];
-  *intrp += kInterpolWin[1] * data_ptr[-2];
-  *intrp += kInterpolWin[2] * data_ptr[-1];
-  *intrp += kInterpolWin[3] * data_ptr[0];
-  *intrp += kInterpolWin[4] * data_ptr[1];
-  *intrp += kInterpolWin[5] * data_ptr[2];
-  *intrp += kInterpolWin[6] * data_ptr[3];
-  *intrp += kInterpolWin[7] * data_ptr[4];
-}
-
-
-/* 2D parabolic interpolation */
-/* probably some 0.5 factors can be eliminated, and the square-roots can be removed from the Cholesky fact. */
-__inline static void Intrpol2D(double T[3][3], double *x, double *y, double *peak_val)
-{
-  double c, b[2], A[2][2];
-  double t1, t2, d;
-  double delta1, delta2;
-
-
-  // double T[3][3] = {{-1.25, -.25,-.25}, {-.25, .75, .75}, {-.25, .75, .75}};
-  // should result in: delta1 = 0.5;  delta2 = 0.0;  peak_val = 1.0
-
-  c = T[1][1];
-  b[0] = 0.5 * (T[1][2] + T[2][1] - T[0][1] - T[1][0]);
-  b[1] = 0.5 * (T[1][0] + T[2][1] - T[0][1] - T[1][2]);
-  A[0][1] = -0.5 * (T[0][1] + T[2][1] - T[1][0] - T[1][2]);
-  t1 = 0.5 * (T[0][0] + T[2][2]) - c;
-  t2 = 0.5 * (T[2][0] + T[0][2]) - c;
-  d = (T[0][1] + T[1][2] + T[1][0] + T[2][1]) - 4.0 * c - t1 - t2;
-  A[0][0] = -t1 - 0.5 * d;
-  A[1][1] = -t2 - 0.5 * d;
-
-  /* deal with singularities or ill-conditioned cases */
-  if ( (A[0][0] < 1e-7) || ((A[0][0] * A[1][1] - A[0][1] * A[0][1]) < 1e-7) ) {
-    *peak_val = T[1][1];
-    return;
-  }
-
-  /* Cholesky decomposition: replace A by upper-triangular factor */
-  A[0][0] = sqrt(A[0][0]);
-  A[0][1] = A[0][1] / A[0][0];
-  A[1][1] = sqrt(A[1][1] - A[0][1] * A[0][1]);
-
-  /* compute [x; y] = -0.5 * inv(A) * b */
-  t1 = b[0] / A[0][0];
-  t2 = (b[1] - t1 * A[0][1]) / A[1][1];
-  delta2 = t2 / A[1][1];
-  delta1 = 0.5 * (t1 - delta2 * A[0][1]) / A[0][0];
-  delta2 *= 0.5;
-
-  /* limit norm */
-  t1 = delta1 * delta1 + delta2 * delta2;
-  if (t1 > 1.0) {
-    delta1 /= t1;
-    delta2 /= t1;
-  }
-
-  *peak_val = 0.5 * (b[0] * delta1 + b[1] * delta2) + c;
-
-  *x += delta1;
-  *y += delta2;
-}
-
-
-static void PCorr(const double *in, double *outcorr)
-{
-  double sum, ysum, prod;
-  const double *x, *inptr;
-  int k, n;
-
-  //ysum = 1e-6;          /* use this with float (i.s.o. double)! */
-  ysum = 1e-13;
-  sum = 0.0;
-  x = in + PITCH_MAX_LAG/2 + 2;
-  for (n = 0; n < PITCH_CORR_LEN2; n++) {
-    ysum += in[n] * in[n];
-    sum += x[n] * in[n];
-  }
-
-  outcorr += PITCH_LAG_SPAN2 - 1;     /* index of last element in array */
-  *outcorr = sum / sqrt(ysum);
-
-  for (k = 1; k < PITCH_LAG_SPAN2; k++) {
-    ysum -= in[k-1] * in[k-1];
-    ysum += in[PITCH_CORR_LEN2 + k - 1] * in[PITCH_CORR_LEN2 + k - 1];
-    sum = 0.0;
-    inptr = &in[k];
-    prod = x[0] * inptr[0];
-    for (n = 1; n < PITCH_CORR_LEN2; n++) {
-      sum += prod;
-      prod = x[n] * inptr[n];
-    }
-    sum += prod;
-    outcorr--;
-    *outcorr = sum / sqrt(ysum);
-  }
-}
-
-static void WebRtcIsac_AllpassFilterForDec(double* InOut,
-                                           const double* APSectionFactors,
-                                           size_t lengthInOut,
-                                           double* FilterState) {
-  // This performs all-pass filtering--a series of first order all-pass
-  // sections are used to filter the input in a cascade manner.
-  size_t n, j;
-  double temp;
-  for (j = 0; j < ALLPASSSECTIONS; j++) {
-    for (n = 0; n < lengthInOut; n += 2) {
-      temp = InOut[n];  // store input
-      InOut[n] = FilterState[j] + APSectionFactors[j] * temp;
-      FilterState[j] = -APSectionFactors[j] * InOut[n] + temp;
-    }
-  }
-}
-
-static void WebRtcIsac_DecimateAllpass(
-    const double* in,
-    double* state_in,  // array of size: 2*ALLPASSSECTIONS+1
-    size_t N,          // number of input samples
-    double* out) {     // array of size N/2
-
-  static const double APupper[ALLPASSSECTIONS] = {0.0347, 0.3826};
-  static const double APlower[ALLPASSSECTIONS] = {0.1544, 0.744};
-
-  size_t n;
-  double data_vec[PITCH_FRAME_LEN];
-
-  /* copy input */
-  memcpy(data_vec + 1, in, sizeof(double) * (N - 1));
-
-  data_vec[0] = state_in[2 * ALLPASSSECTIONS];  // the z^(-1) state
-  state_in[2 * ALLPASSSECTIONS] = in[N - 1];
-
-  WebRtcIsac_AllpassFilterForDec(data_vec + 1, APupper, N, state_in);
-  WebRtcIsac_AllpassFilterForDec(data_vec, APlower, N,
-                                 state_in + ALLPASSSECTIONS);
-
-  for (n = 0; n < N / 2; n++)
-    out[n] = data_vec[2 * n] + data_vec[2 * n + 1];
-}
-
-RTC_PUSH_IGNORING_WFRAME_LARGER_THAN()
-
-static void WebRtcIsac_InitializePitch(const double* in,
-                                       const double old_lag,
-                                       const double old_gain,
-                                       PitchAnalysisStruct* State,
-                                       double* lags) {
-  double buf_dec[PITCH_CORR_LEN2+PITCH_CORR_STEP2+PITCH_MAX_LAG/2+2];
-  double ratio, log_lag, gain_bias;
-  double bias;
-  double corrvec1[PITCH_LAG_SPAN2];
-  double corrvec2[PITCH_LAG_SPAN2];
-  int m, k;
-  // Allocating 10 extra entries at the begining of the CorrSurf
-  double corrSurfBuff[10 + (2*PITCH_BW+3)*(PITCH_LAG_SPAN2+4)];
-  double* CorrSurf[2*PITCH_BW+3];
-  double *CorrSurfPtr1, *CorrSurfPtr2;
-  double LagWin[3] = {0.2, 0.5, 0.98};
-  int ind1, ind2, peaks_ind, peak, max_ind;
-  int peaks[PITCH_MAX_NUM_PEAKS];
-  double adj, gain_tmp;
-  double corr, corr_max;
-  double intrp_a, intrp_b, intrp_c, intrp_d;
-  double peak_vals[PITCH_MAX_NUM_PEAKS];
-  double lags1[PITCH_MAX_NUM_PEAKS];
-  double lags2[PITCH_MAX_NUM_PEAKS];
-  double T[3][3];
-  int row;
-
-  for(k = 0; k < 2*PITCH_BW+3; k++)
-  {
-    CorrSurf[k] = &corrSurfBuff[10 + k * (PITCH_LAG_SPAN2+4)];
-  }
-  /* reset CorrSurf matrix */
-  memset(corrSurfBuff, 0, sizeof(double) * (10 + (2*PITCH_BW+3) * (PITCH_LAG_SPAN2+4)));
-
-  //warnings -DH
-  max_ind = 0;
-  peak = 0;
-
-  /* copy old values from state buffer */
-  memcpy(buf_dec, State->dec_buffer, sizeof(double) * (PITCH_CORR_LEN2+PITCH_CORR_STEP2+PITCH_MAX_LAG/2-PITCH_FRAME_LEN/2+2));
-
-  /* decimation; put result after the old values */
-  WebRtcIsac_DecimateAllpass(in, State->decimator_state, PITCH_FRAME_LEN,
-                             &buf_dec[PITCH_CORR_LEN2+PITCH_CORR_STEP2+PITCH_MAX_LAG/2-PITCH_FRAME_LEN/2+2]);
-
-  /* low-pass filtering */
-  for (k = PITCH_CORR_LEN2+PITCH_CORR_STEP2+PITCH_MAX_LAG/2-PITCH_FRAME_LEN/2+2; k < PITCH_CORR_LEN2+PITCH_CORR_STEP2+PITCH_MAX_LAG/2+2; k++)
-    buf_dec[k] += 0.75 * buf_dec[k-1] - 0.25 * buf_dec[k-2];
-
-  /* copy end part back into state buffer */
-  memcpy(State->dec_buffer, buf_dec+PITCH_FRAME_LEN/2, sizeof(double) * (PITCH_CORR_LEN2+PITCH_CORR_STEP2+PITCH_MAX_LAG/2-PITCH_FRAME_LEN/2+2));
-
-  /* compute correlation for first and second half of the frame */
-  PCorr(buf_dec, corrvec1);
-  PCorr(buf_dec + PITCH_CORR_STEP2, corrvec2);
-
-  /* bias towards pitch lag of previous frame */
-  log_lag = log(0.5 * old_lag);
-  gain_bias = 4.0 * old_gain * old_gain;
-  if (gain_bias > 0.8) gain_bias = 0.8;
-  for (k = 0; k < PITCH_LAG_SPAN2; k++)
-  {
-    ratio = log((double) (k + (PITCH_MIN_LAG/2-2))) - log_lag;
-    bias = 1.0 + gain_bias * exp(-5.0 * ratio * ratio);
-    corrvec1[k] *= bias;
-  }
-
-  /* taper correlation functions */
-  for (k = 0; k < 3; k++) {
-    gain_tmp = LagWin[k];
-    corrvec1[k] *= gain_tmp;
-    corrvec2[k] *= gain_tmp;
-    corrvec1[PITCH_LAG_SPAN2-1-k] *= gain_tmp;
-    corrvec2[PITCH_LAG_SPAN2-1-k] *= gain_tmp;
-  }
-
-  corr_max = 0.0;
-  /* fill middle row of correlation surface */
-  ind1 = 0;
-  ind2 = 0;
-  CorrSurfPtr1 = &CorrSurf[PITCH_BW][2];
-  for (k = 0; k < PITCH_LAG_SPAN2; k++) {
-    corr = corrvec1[ind1++] + corrvec2[ind2++];
-    CorrSurfPtr1[k] = corr;
-    if (corr > corr_max) {
-      corr_max = corr;  /* update maximum */
-      max_ind = (int)(&CorrSurfPtr1[k] - &CorrSurf[0][0]);
-    }
-  }
-  /* fill first and last rows of correlation surface */
-  ind1 = 0;
-  ind2 = PITCH_BW;
-  CorrSurfPtr1 = &CorrSurf[0][2];
-  CorrSurfPtr2 = &CorrSurf[2*PITCH_BW][PITCH_BW+2];
-  for (k = 0; k < PITCH_LAG_SPAN2-PITCH_BW; k++) {
-    ratio = ((double) (ind1 + 12)) / ((double) (ind2 + 12));
-    adj = 0.2 * ratio * (2.0 - ratio);   /* adjustment factor; inverse parabola as a function of ratio */
-    corr = adj * (corrvec1[ind1] + corrvec2[ind2]);
-    CorrSurfPtr1[k] = corr;
-    if (corr > corr_max) {
-      corr_max = corr;  /* update maximum */
-      max_ind = (int)(&CorrSurfPtr1[k] - &CorrSurf[0][0]);
-    }
-    corr = adj * (corrvec1[ind2++] + corrvec2[ind1++]);
-    CorrSurfPtr2[k] = corr;
-    if (corr > corr_max) {
-      corr_max = corr;  /* update maximum */
-      max_ind = (int)(&CorrSurfPtr2[k] - &CorrSurf[0][0]);
-    }
-  }
-  /* fill second and next to last rows of correlation surface */
-  ind1 = 0;
-  ind2 = PITCH_BW-1;
-  CorrSurfPtr1 = &CorrSurf[1][2];
-  CorrSurfPtr2 = &CorrSurf[2*PITCH_BW-1][PITCH_BW+1];
-  for (k = 0; k < PITCH_LAG_SPAN2-PITCH_BW+1; k++) {
-    ratio = ((double) (ind1 + 12)) / ((double) (ind2 + 12));
-    adj = 0.9 * ratio * (2.0 - ratio);   /* adjustment factor; inverse parabola as a function of ratio */
-    corr = adj * (corrvec1[ind1] + corrvec2[ind2]);
-    CorrSurfPtr1[k] = corr;
-    if (corr > corr_max) {
-      corr_max = corr;  /* update maximum */
-      max_ind = (int)(&CorrSurfPtr1[k] - &CorrSurf[0][0]);
-    }
-    corr = adj * (corrvec1[ind2++] + corrvec2[ind1++]);
-    CorrSurfPtr2[k] = corr;
-    if (corr > corr_max) {
-      corr_max = corr;  /* update maximum */
-      max_ind = (int)(&CorrSurfPtr2[k] - &CorrSurf[0][0]);
-    }
-  }
-  /* fill remainder of correlation surface */
-  for (m = 2; m < PITCH_BW; m++) {
-    ind1 = 0;
-    ind2 = PITCH_BW - m;         /* always larger than ind1 */
-    CorrSurfPtr1 = &CorrSurf[m][2];
-    CorrSurfPtr2 = &CorrSurf[2*PITCH_BW-m][PITCH_BW+2-m];
-    for (k = 0; k < PITCH_LAG_SPAN2-PITCH_BW+m; k++) {
-      ratio = ((double) (ind1 + 12)) / ((double) (ind2 + 12));
-      adj = ratio * (2.0 - ratio);    /* adjustment factor; inverse parabola as a function of ratio */
-      corr = adj * (corrvec1[ind1] + corrvec2[ind2]);
-      CorrSurfPtr1[k] = corr;
-      if (corr > corr_max) {
-        corr_max = corr;  /* update maximum */
-        max_ind = (int)(&CorrSurfPtr1[k] - &CorrSurf[0][0]);
-      }
-      corr = adj * (corrvec1[ind2++] + corrvec2[ind1++]);
-      CorrSurfPtr2[k] = corr;
-      if (corr > corr_max) {
-        corr_max = corr;  /* update maximum */
-        max_ind = (int)(&CorrSurfPtr2[k] - &CorrSurf[0][0]);
-      }
-    }
-  }
-
-  /* threshold value to qualify as a peak */
-  corr_max *= 0.6;
-
-  peaks_ind = 0;
-  /* find peaks */
-  for (m = 1; m < PITCH_BW+1; m++) {
-    if (peaks_ind == PITCH_MAX_NUM_PEAKS) break;
-    CorrSurfPtr1 = &CorrSurf[m][2];
-    for (k = 2; k < PITCH_LAG_SPAN2-PITCH_BW-2+m; k++) {
-      corr = CorrSurfPtr1[k];
-      if (corr > corr_max) {
-        if ( (corr > CorrSurfPtr1[k - (PITCH_LAG_SPAN2+5)]) && (corr > CorrSurfPtr1[k - (PITCH_LAG_SPAN2+4)]) ) {
-          if ( (corr > CorrSurfPtr1[k + (PITCH_LAG_SPAN2+4)]) && (corr > CorrSurfPtr1[k + (PITCH_LAG_SPAN2+5)]) ) {
-            /* found a peak; store index into matrix */
-            peaks[peaks_ind++] = (int)(&CorrSurfPtr1[k] - &CorrSurf[0][0]);
-            if (peaks_ind == PITCH_MAX_NUM_PEAKS) break;
-          }
-        }
-      }
-    }
-  }
-  for (m = PITCH_BW+1; m < 2*PITCH_BW; m++) {
-    if (peaks_ind == PITCH_MAX_NUM_PEAKS) break;
-    CorrSurfPtr1 = &CorrSurf[m][2];
-    for (k = 2+m-PITCH_BW; k < PITCH_LAG_SPAN2-2; k++) {
-      corr = CorrSurfPtr1[k];
-      if (corr > corr_max) {
-        if ( (corr > CorrSurfPtr1[k - (PITCH_LAG_SPAN2+5)]) && (corr > CorrSurfPtr1[k - (PITCH_LAG_SPAN2+4)]) ) {
-          if ( (corr > CorrSurfPtr1[k + (PITCH_LAG_SPAN2+4)]) && (corr > CorrSurfPtr1[k + (PITCH_LAG_SPAN2+5)]) ) {
-            /* found a peak; store index into matrix */
-            peaks[peaks_ind++] = (int)(&CorrSurfPtr1[k] - &CorrSurf[0][0]);
-            if (peaks_ind == PITCH_MAX_NUM_PEAKS) break;
-          }
-        }
-      }
-    }
-  }
-
-  if (peaks_ind > 0) {
-    /* examine each peak */
-    CorrSurfPtr1 = &CorrSurf[0][0];
-    for (k = 0; k < peaks_ind; k++) {
-      peak = peaks[k];
-
-      /* compute four interpolated values around current peak */
-      IntrepolFilter(&CorrSurfPtr1[peak - (PITCH_LAG_SPAN2+5)], &intrp_a);
-      IntrepolFilter(&CorrSurfPtr1[peak - 1            ], &intrp_b);
-      IntrepolFilter(&CorrSurfPtr1[peak                ], &intrp_c);
-      IntrepolFilter(&CorrSurfPtr1[peak + (PITCH_LAG_SPAN2+4)], &intrp_d);
-
-      /* determine maximum of the interpolated values */
-      corr = CorrSurfPtr1[peak];
-      corr_max = intrp_a;
-      if (intrp_b > corr_max) corr_max = intrp_b;
-      if (intrp_c > corr_max) corr_max = intrp_c;
-      if (intrp_d > corr_max) corr_max = intrp_d;
-
-      /* determine where the peak sits and fill a 3x3 matrix around it */
-      row = peak / (PITCH_LAG_SPAN2+4);
-      lags1[k] = (double) ((peak - row * (PITCH_LAG_SPAN2+4)) + PITCH_MIN_LAG/2 - 4);
-      lags2[k] = (double) (lags1[k] + PITCH_BW - row);
-      if ( corr > corr_max ) {
-        T[0][0] = CorrSurfPtr1[peak - (PITCH_LAG_SPAN2+5)];
-        T[2][0] = CorrSurfPtr1[peak - (PITCH_LAG_SPAN2+4)];
-        T[1][1] = corr;
-        T[0][2] = CorrSurfPtr1[peak + (PITCH_LAG_SPAN2+4)];
-        T[2][2] = CorrSurfPtr1[peak + (PITCH_LAG_SPAN2+5)];
-        T[1][0] = intrp_a;
-        T[0][1] = intrp_b;
-        T[2][1] = intrp_c;
-        T[1][2] = intrp_d;
-      } else {
-        if (intrp_a == corr_max) {
-          lags1[k] -= 0.5;
-          lags2[k] += 0.5;
-          IntrepolFilter(&CorrSurfPtr1[peak - 2*(PITCH_LAG_SPAN2+5)], &T[0][0]);
-          IntrepolFilter(&CorrSurfPtr1[peak - (2*PITCH_LAG_SPAN2+9)], &T[2][0]);
-          T[1][1] = intrp_a;
-          T[0][2] = intrp_b;
-          T[2][2] = intrp_c;
-          T[1][0] = CorrSurfPtr1[peak - (2*PITCH_LAG_SPAN2+9)];
-          T[0][1] = CorrSurfPtr1[peak - (PITCH_LAG_SPAN2+5)];
-          T[2][1] = CorrSurfPtr1[peak - (PITCH_LAG_SPAN2+4)];
-          T[1][2] = corr;
-        } else if (intrp_b == corr_max) {
-          lags1[k] -= 0.5;
-          lags2[k] -= 0.5;
-          IntrepolFilter(&CorrSurfPtr1[peak - (PITCH_LAG_SPAN2+6)], &T[0][0]);
-          T[2][0] = intrp_a;
-          T[1][1] = intrp_b;
-          IntrepolFilter(&CorrSurfPtr1[peak + (PITCH_LAG_SPAN2+3)], &T[0][2]);
-          T[2][2] = intrp_d;
-          T[1][0] = CorrSurfPtr1[peak - (PITCH_LAG_SPAN2+5)];
-          T[0][1] = CorrSurfPtr1[peak - 1];
-          T[2][1] = corr;
-          T[1][2] = CorrSurfPtr1[peak + (PITCH_LAG_SPAN2+4)];
-        } else if (intrp_c == corr_max) {
-          lags1[k] += 0.5;
-          lags2[k] += 0.5;
-          T[0][0] = intrp_a;
-          IntrepolFilter(&CorrSurfPtr1[peak - (PITCH_LAG_SPAN2+4)], &T[2][0]);
-          T[1][1] = intrp_c;
-          T[0][2] = intrp_d;
-          IntrepolFilter(&CorrSurfPtr1[peak + (PITCH_LAG_SPAN2+5)], &T[2][2]);
-          T[1][0] = CorrSurfPtr1[peak - (PITCH_LAG_SPAN2+4)];
-          T[0][1] = corr;
-          T[2][1] = CorrSurfPtr1[peak + 1];
-          T[1][2] = CorrSurfPtr1[peak + (PITCH_LAG_SPAN2+5)];
-        } else {
-          lags1[k] += 0.5;
-          lags2[k] -= 0.5;
-          T[0][0] = intrp_b;
-          T[2][0] = intrp_c;
-          T[1][1] = intrp_d;
-          IntrepolFilter(&CorrSurfPtr1[peak + 2*(PITCH_LAG_SPAN2+4)], &T[0][2]);
-          IntrepolFilter(&CorrSurfPtr1[peak + (2*PITCH_LAG_SPAN2+9)], &T[2][2]);
-          T[1][0] = corr;
-          T[0][1] = CorrSurfPtr1[peak + (PITCH_LAG_SPAN2+4)];
-          T[2][1] = CorrSurfPtr1[peak + (PITCH_LAG_SPAN2+5)];
-          T[1][2] = CorrSurfPtr1[peak + (2*PITCH_LAG_SPAN2+9)];
-        }
-      }
-
-      /* 2D parabolic interpolation gives more accurate lags and peak value */
-      Intrpol2D(T, &lags1[k], &lags2[k], &peak_vals[k]);
-    }
-
-    /* determine the highest peak, after applying a bias towards short lags */
-    corr_max = 0.0;
-    for (k = 0; k < peaks_ind; k++) {
-      corr = peak_vals[k] * pow(PITCH_PEAK_DECAY, log(lags1[k] + lags2[k]));
-      if (corr > corr_max) {
-        corr_max = corr;
-        peak = k;
-      }
-    }
-
-    lags1[peak] *= 2.0;
-    lags2[peak] *= 2.0;
-
-    if (lags1[peak] < (double) PITCH_MIN_LAG) lags1[peak] = (double) PITCH_MIN_LAG;
-    if (lags2[peak] < (double) PITCH_MIN_LAG) lags2[peak] = (double) PITCH_MIN_LAG;
-    if (lags1[peak] > (double) PITCH_MAX_LAG) lags1[peak] = (double) PITCH_MAX_LAG;
-    if (lags2[peak] > (double) PITCH_MAX_LAG) lags2[peak] = (double) PITCH_MAX_LAG;
-
-    /* store lags of highest peak in output array */
-    lags[0] = lags1[peak];
-    lags[1] = lags1[peak];
-    lags[2] = lags2[peak];
-    lags[3] = lags2[peak];
-  }
-  else
-  {
-    row = max_ind / (PITCH_LAG_SPAN2+4);
-    lags1[0] = (double) ((max_ind - row * (PITCH_LAG_SPAN2+4)) + PITCH_MIN_LAG/2 - 4);
-    lags2[0] = (double) (lags1[0] + PITCH_BW - row);
-
-    if (lags1[0] < (double) PITCH_MIN_LAG) lags1[0] = (double) PITCH_MIN_LAG;
-    if (lags2[0] < (double) PITCH_MIN_LAG) lags2[0] = (double) PITCH_MIN_LAG;
-    if (lags1[0] > (double) PITCH_MAX_LAG) lags1[0] = (double) PITCH_MAX_LAG;
-    if (lags2[0] > (double) PITCH_MAX_LAG) lags2[0] = (double) PITCH_MAX_LAG;
-
-    /* store lags of highest peak in output array */
-    lags[0] = lags1[0];
-    lags[1] = lags1[0];
-    lags[2] = lags2[0];
-    lags[3] = lags2[0];
-  }
-}
-
-RTC_POP_IGNORING_WFRAME_LARGER_THAN()
-
-/* create weighting matrix by orthogonalizing a basis of polynomials of increasing order
- * t = (0:4)';
- * A = [t.^0, t.^1, t.^2, t.^3, t.^4];
- * [Q, dummy] = qr(A);
- * P.Weight = Q * diag([0, .1, .5, 1, 1]) * Q'; */
-static const double kWeight[5][5] = {
-  { 0.29714285714286,  -0.30857142857143,  -0.05714285714286,   0.05142857142857,  0.01714285714286},
-  {-0.30857142857143,   0.67428571428571,  -0.27142857142857,  -0.14571428571429,  0.05142857142857},
-  {-0.05714285714286,  -0.27142857142857,   0.65714285714286,  -0.27142857142857, -0.05714285714286},
-  { 0.05142857142857,  -0.14571428571429,  -0.27142857142857,   0.67428571428571, -0.30857142857143},
-  { 0.01714285714286,   0.05142857142857,  -0.05714285714286,  -0.30857142857143,  0.29714285714286}
-};
-
-/* second order high-pass filter */
-static void WebRtcIsac_Highpass(const double* in,
-                         double* out,
-                         double* state,
-                         size_t N) {
-  /* create high-pass filter ocefficients
-   * z = 0.998 * exp(j*2*pi*35/8000);
-   * p = 0.94 * exp(j*2*pi*140/8000);
-   * HP_b = [1, -2*real(z), abs(z)^2];
-   * HP_a = [1, -2*real(p), abs(p)^2]; */
-  static const double a_coef[2] = { 1.86864659625574, -0.88360000000000};
-  static const double b_coef[2] = {-1.99524591718270,  0.99600400000000};
-
-  size_t k;
-
-  for (k=0; k<N; k++) {
-    *out = *in + state[1];
-    state[1] = state[0] + b_coef[0] * *in + a_coef[0] * *out;
-    state[0] = b_coef[1] * *in++ + a_coef[1] * *out++;
-  }
-}
-
-RTC_PUSH_IGNORING_WFRAME_LARGER_THAN()
-
-void WebRtcIsac_PitchAnalysis(const double *in,               /* PITCH_FRAME_LEN samples */
-                              double *out,                    /* PITCH_FRAME_LEN+QLOOKAHEAD samples */
-                              PitchAnalysisStruct *State,
-                              double *lags,
-                              double *gains)
-{
-  double HPin[PITCH_FRAME_LEN];
-  double Weighted[PITCH_FRAME_LEN];
-  double Whitened[PITCH_FRAME_LEN + QLOOKAHEAD];
-  double inbuf[PITCH_FRAME_LEN + QLOOKAHEAD];
-  double out_G[PITCH_FRAME_LEN + QLOOKAHEAD];          // could be removed by using out instead
-  double out_dG[4][PITCH_FRAME_LEN + QLOOKAHEAD];
-  double old_lag, old_gain;
-  double nrg_wht, tmp;
-  double Wnrg, Wfluct, Wgain;
-  double H[4][4];
-  double grad[4];
-  double dG[4];
-  int k, m, n, iter;
-
-  /* high pass filtering using second order pole-zero filter */
-  WebRtcIsac_Highpass(in, HPin, State->hp_state, PITCH_FRAME_LEN);
-
-  /* copy from state into buffer */
-  memcpy(Whitened, State->whitened_buf, sizeof(double) * QLOOKAHEAD);
-
-  /* compute weighted and whitened signals */
-  WebRtcIsac_WeightingFilter(HPin, &Weighted[0], &Whitened[QLOOKAHEAD], &(State->Wghtstr));
-
-  /* copy from buffer into state */
-  memcpy(State->whitened_buf, Whitened+PITCH_FRAME_LEN, sizeof(double) * QLOOKAHEAD);
-
-  old_lag = State->PFstr_wght.oldlagp[0];
-  old_gain = State->PFstr_wght.oldgainp[0];
-
-  /* inital pitch estimate */
-  WebRtcIsac_InitializePitch(Weighted, old_lag, old_gain, State, lags);
-
-
-  /* Iterative optimization of lags - to be done */
-
-  /* compute energy of whitened signal */
-  nrg_wht = 0.0;
-  for (k = 0; k < PITCH_FRAME_LEN + QLOOKAHEAD; k++)
-    nrg_wht += Whitened[k] * Whitened[k];
-
-
-  /* Iterative optimization of gains */
-
-  /* set weights for energy, gain fluctiation, and spectral gain penalty functions */
-  Wnrg = 1.0 / nrg_wht;
-  Wgain = 0.005;
-  Wfluct = 3.0;
-
-  /* set initial gains */
-  for (k = 0; k < 4; k++)
-    gains[k] = PITCH_MAX_GAIN_06;
-
-  /* two iterations should be enough */
-  for (iter = 0; iter < 2; iter++) {
-    /* compute Jacobian of pre-filter output towards gains */
-    WebRtcIsac_PitchfilterPre_gains(Whitened, out_G, out_dG, &(State->PFstr_wght), lags, gains);
-
-    /* gradient and approximate Hessian (lower triangle) for minimizing the filter's output power */
-    for (k = 0; k < 4; k++) {
-      tmp = 0.0;
-      for (n = 0; n < PITCH_FRAME_LEN + QLOOKAHEAD; n++)
-        tmp += out_G[n] * out_dG[k][n];
-      grad[k] = tmp * Wnrg;
-    }
-    for (k = 0; k < 4; k++) {
-      for (m = 0; m <= k; m++) {
-        tmp = 0.0;
-        for (n = 0; n < PITCH_FRAME_LEN + QLOOKAHEAD; n++)
-          tmp += out_dG[m][n] * out_dG[k][n];
-        H[k][m] = tmp * Wnrg;
-      }
-    }
-
-    /* add gradient and Hessian (lower triangle) for dampening fast gain changes */
-    for (k = 0; k < 4; k++) {
-      tmp = kWeight[k+1][0] * old_gain;
-      for (m = 0; m < 4; m++)
-        tmp += kWeight[k+1][m+1] * gains[m];
-      grad[k] += tmp * Wfluct;
-    }
-    for (k = 0; k < 4; k++) {
-      for (m = 0; m <= k; m++) {
-        H[k][m] += kWeight[k+1][m+1] * Wfluct;
-      }
-    }
-
-    /* add gradient and Hessian for dampening gain */
-    for (k = 0; k < 3; k++) {
-      tmp = 1.0 / (1 - gains[k]);
-      grad[k] += tmp * tmp * Wgain;
-      H[k][k] += 2.0 * tmp * (tmp * tmp * Wgain);
-    }
-    tmp = 1.0 / (1 - gains[3]);
-    grad[3] += 1.33 * (tmp * tmp * Wgain);
-    H[3][3] += 2.66 * tmp * (tmp * tmp * Wgain);
-
-
-    /* compute Cholesky factorization of Hessian
-     * by overwritting the upper triangle; scale factors on diagonal
-     * (for non pc-platforms store the inverse of the diagonals seperately to minimize divisions) */
-    H[0][1] = H[1][0] / H[0][0];
-    H[0][2] = H[2][0] / H[0][0];
-    H[0][3] = H[3][0] / H[0][0];
-    H[1][1] -= H[0][0] * H[0][1] * H[0][1];
-    H[1][2] = (H[2][1] - H[0][1] * H[2][0]) / H[1][1];
-    H[1][3] = (H[3][1] - H[0][1] * H[3][0]) / H[1][1];
-    H[2][2] -= H[0][0] * H[0][2] * H[0][2] + H[1][1] * H[1][2] * H[1][2];
-    H[2][3] = (H[3][2] - H[0][2] * H[3][0] - H[1][2] * H[1][1] * H[1][3]) / H[2][2];
-    H[3][3] -= H[0][0] * H[0][3] * H[0][3] + H[1][1] * H[1][3] * H[1][3] + H[2][2] * H[2][3] * H[2][3];
-
-    /* Compute update as  delta_gains = -inv(H) * grad */
-    /* copy and negate */
-    for (k = 0; k < 4; k++)
-      dG[k] = -grad[k];
-    /* back substitution */
-    dG[1] -= dG[0] * H[0][1];
-    dG[2] -= dG[0] * H[0][2] + dG[1] * H[1][2];
-    dG[3] -= dG[0] * H[0][3] + dG[1] * H[1][3] + dG[2] * H[2][3];
-    /* scale */
-    for (k = 0; k < 4; k++)
-      dG[k] /= H[k][k];
-    /* back substitution */
-    dG[2] -= dG[3] * H[2][3];
-    dG[1] -= dG[3] * H[1][3] + dG[2] * H[1][2];
-    dG[0] -= dG[3] * H[0][3] + dG[2] * H[0][2] + dG[1] * H[0][1];
-
-    /* update gains and check range */
-    for (k = 0; k < 4; k++) {
-      gains[k] += dG[k];
-      if (gains[k] > PITCH_MAX_GAIN)
-        gains[k] = PITCH_MAX_GAIN;
-      else if (gains[k] < 0.0)
-        gains[k] = 0.0;
-    }
-  }
-
-  /* update state for next frame */
-  WebRtcIsac_PitchfilterPre(Whitened, out, &(State->PFstr_wght), lags, gains);
-
-  /* concatenate previous input's end and current input */
-  memcpy(inbuf, State->inbuf, sizeof(double) * QLOOKAHEAD);
-  memcpy(inbuf+QLOOKAHEAD, in, sizeof(double) * PITCH_FRAME_LEN);
-
-  /* lookahead pitch filtering for masking analysis */
-  WebRtcIsac_PitchfilterPre_la(inbuf, out, &(State->PFstr), lags, gains);
-
-  /* store last part of input */
-  for (k = 0; k < QLOOKAHEAD; k++)
-    State->inbuf[k] = inbuf[k + PITCH_FRAME_LEN];
-}
-
-RTC_POP_IGNORING_WFRAME_LARGER_THAN()
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_coding/codecs/isac/main/source/pitch_estimator.h b/submodules/libtgvoip/webrtc_dsp/modules/audio_coding/codecs/isac/main/source/pitch_estimator.h
deleted file mode 100644
index 4ab78c20ad..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_coding/codecs/isac/main/source/pitch_estimator.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- *  Copyright (c) 2011 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-/*
- * pitch_estimator.h
- *
- * Pitch functions
- *
- */
-
-#ifndef MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_PITCH_ESTIMATOR_H_
-#define MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_PITCH_ESTIMATOR_H_
-
-#include <stddef.h>
-
-#include "modules/audio_coding/codecs/isac/main/source/structs.h"
-
-void WebRtcIsac_PitchAnalysis(
-    const double* in, /* PITCH_FRAME_LEN samples */
-    double* out,      /* PITCH_FRAME_LEN+QLOOKAHEAD samples */
-    PitchAnalysisStruct* State,
-    double* lags,
-    double* gains);
-
-#endif /* MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_PITCH_ESTIMATOR_H_ */
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_coding/codecs/isac/main/source/pitch_filter.c b/submodules/libtgvoip/webrtc_dsp/modules/audio_coding/codecs/isac/main/source/pitch_filter.c
deleted file mode 100644
index 61cd533ab3..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_coding/codecs/isac/main/source/pitch_filter.c
+++ /dev/null
@@ -1,388 +0,0 @@
-/*
- *  Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#include <math.h>
-#include <memory.h>
-#include <stdlib.h>
-
-#include "modules/audio_coding/codecs/isac/main/source/pitch_estimator.h"
-#include "modules/audio_coding/codecs/isac/main/source/os_specific_inline.h"
-#include "rtc_base/compile_assert_c.h"
-
-/*
- * We are implementing the following filters;
- *
- * Pre-filtering:
- *   y(z) = x(z) + damper(z) * gain * (x(z) + y(z)) * z ^ (-lag);
- *
- * Post-filtering:
- *   y(z) = x(z) - damper(z) * gain * (x(z) + y(z)) * z ^ (-lag);
- *
- * Note that |lag| is a floating number so we perform an interpolation to
- * obtain the correct |lag|.
- *
- */
-
-static const double kDampFilter[PITCH_DAMPORDER] = {-0.07, 0.25, 0.64, 0.25,
-    -0.07};
-
-/* interpolation coefficients; generated by design_pitch_filter.m */
-static const double kIntrpCoef[PITCH_FRACS][PITCH_FRACORDER] = {
-    {-0.02239172458614,  0.06653315052934, -0.16515880017569,  0.60701333734125,
-     0.64671399919202, -0.20249000396417,  0.09926548334755, -0.04765933793109,
-     0.01754159521746},
-    {-0.01985640750434,  0.05816126837866, -0.13991265473714,  0.44560418147643,
-     0.79117042386876, -0.20266133815188,  0.09585268418555, -0.04533310458084,
-     0.01654127246314},
-    {-0.01463300534216,  0.04229888475060, -0.09897034715253,  0.28284326017787,
-     0.90385267956632, -0.16976950138649,  0.07704272393639, -0.03584218578311,
-     0.01295781500709},
-    {-0.00764851320885,  0.02184035544377, -0.04985561057281,  0.13083306574393,
-     0.97545011664662, -0.10177807997561,  0.04400901776474, -0.02010737175166,
-     0.00719783432422},
-    {-0.00000000000000,  0.00000000000000, -0.00000000000001,  0.00000000000001,
-     0.99999999999999,  0.00000000000001, -0.00000000000001,  0.00000000000000,
-     -0.00000000000000},
-    {0.00719783432422, -0.02010737175166,  0.04400901776474, -0.10177807997562,
-     0.97545011664663,  0.13083306574393, -0.04985561057280,  0.02184035544377,
-     -0.00764851320885},
-    {0.01295781500710, -0.03584218578312,  0.07704272393640, -0.16976950138650,
-     0.90385267956634,  0.28284326017785, -0.09897034715252,  0.04229888475059,
-     -0.01463300534216},
-    {0.01654127246315, -0.04533310458085,  0.09585268418557, -0.20266133815190,
-     0.79117042386878,  0.44560418147640, -0.13991265473712,  0.05816126837865,
-     -0.01985640750433}
-};
-
-/*
- * Enumerating the operation of the filter.
- * iSAC has 4 different pitch-filter which are very similar in their structure.
- *
- * kPitchFilterPre     : In this mode the filter is operating as pitch
- *                       pre-filter. This is used at the encoder.
- * kPitchFilterPost    : In this mode the filter is operating as pitch
- *                       post-filter. This is the inverse of pre-filter and used
- *                       in the decoder.
- * kPitchFilterPreLa   : This is, in structure, similar to pre-filtering but
- *                       utilizing 3 millisecond lookahead. It is used to
- *                       obtain the signal for LPC analysis.
- * kPitchFilterPreGain : This is, in structure, similar to pre-filtering but
- *                       differential changes in gain is considered. This is
- *                       used to find the optimal gain.
- */
-typedef enum {
-  kPitchFilterPre, kPitchFilterPost, kPitchFilterPreLa, kPitchFilterPreGain
-} PitchFilterOperation;
-
-/*
- * Structure with parameters used for pitch-filtering.
- * buffer           : a buffer where the sum of previous inputs and outputs
- *                    are stored.
- * damper_state     : the state of the damping filter. The filter is defined by
- *                    |kDampFilter|.
- * interpol_coeff   : pointer to a set of coefficient which are used to utilize
- *                    fractional pitch by interpolation.
- * gain             : pitch-gain to be applied to the current segment of input.
- * lag              : pitch-lag for the current segment of input.
- * lag_offset       : the offset of lag w.r.t. current sample.
- * sub_frame        : sub-frame index, there are 4 pitch sub-frames in an iSAC
- *                    frame.
- *                    This specifies the usage of the filter. See
- *                    'PitchFilterOperation' for operational modes.
- * num_samples      : number of samples to be processed in each segment.
- * index            : index of the input and output sample.
- * damper_state_dg  : state of damping filter for different trial gains.
- * gain_mult        : differential changes to gain.
- */
-typedef struct {
-  double buffer[PITCH_INTBUFFSIZE + QLOOKAHEAD];
-  double damper_state[PITCH_DAMPORDER];
-  const double *interpol_coeff;
-  double gain;
-  double lag;
-  int lag_offset;
-
-  int sub_frame;
-  PitchFilterOperation mode;
-  int num_samples;
-  int index;
-
-  double damper_state_dg[4][PITCH_DAMPORDER];
-  double gain_mult[4];
-} PitchFilterParam;
-
-/**********************************************************************
- * FilterSegment()
- * Filter one segment, a quarter of a frame.
- *
- * Inputs
- *   in_data      : pointer to the input signal of 30 ms at 8 kHz sample-rate.
- *   filter_param : pitch filter parameters.
- *
- * Outputs
- *   out_data     : pointer to a buffer where the filtered signal is written to.
- *   out_dg       : [only used in kPitchFilterPreGain] pointer to a buffer
- *                  where the output of different gain values (differential
- *                  change to gain) is written.
- */
-static void FilterSegment(const double* in_data, PitchFilterParam* parameters,
-                          double* out_data,
-                          double out_dg[][PITCH_FRAME_LEN + QLOOKAHEAD]) {
-  int n;
-  int m;
-  int j;
-  double sum;
-  double sum2;
-  /* Index of |parameters->buffer| where the output is written to. */
-  int pos = parameters->index + PITCH_BUFFSIZE;
-  /* Index of |parameters->buffer| where samples are read for fractional-lag
-   * computation. */
-  int pos_lag = pos - parameters->lag_offset;
-
-  for (n = 0; n < parameters->num_samples; ++n) {
-    /* Shift low pass filter states. */
-    for (m = PITCH_DAMPORDER - 1; m > 0; --m) {
-      parameters->damper_state[m] = parameters->damper_state[m - 1];
-    }
-    /* Filter to get fractional pitch. */
-    sum = 0.0;
-    for (m = 0; m < PITCH_FRACORDER; ++m) {
-      sum += parameters->buffer[pos_lag + m] * parameters->interpol_coeff[m];
-    }
-    /* Multiply with gain. */
-    parameters->damper_state[0] = parameters->gain * sum;
-
-    if (parameters->mode == kPitchFilterPreGain) {
-      int lag_index = parameters->index - parameters->lag_offset;
-      int m_tmp = (lag_index < 0) ? -lag_index : 0;
-      /* Update the damper state for the new sample. */
-      for (m = PITCH_DAMPORDER - 1; m > 0; --m) {
-        for (j = 0; j < 4; ++j) {
-          parameters->damper_state_dg[j][m] =
-              parameters->damper_state_dg[j][m - 1];
-        }
-      }
-
-      for (j = 0; j < parameters->sub_frame + 1; ++j) {
-        /* Filter for fractional pitch. */
-        sum2 = 0.0;
-        for (m = PITCH_FRACORDER-1; m >= m_tmp; --m) {
-          /* |lag_index + m| is always larger than or equal to zero, see how
-           * m_tmp is computed. This is equivalent to assume samples outside
-           * |out_dg[j]| are zero. */
-          sum2 += out_dg[j][lag_index + m] * parameters->interpol_coeff[m];
-        }
-        /* Add the contribution of differential gain change. */
-        parameters->damper_state_dg[j][0] = parameters->gain_mult[j] * sum +
-            parameters->gain * sum2;
-      }
-
-      /* Filter with damping filter, and store the results. */
-      for (j = 0; j < parameters->sub_frame + 1; ++j) {
-        sum = 0.0;
-        for (m = 0; m < PITCH_DAMPORDER; ++m) {
-          sum -= parameters->damper_state_dg[j][m] * kDampFilter[m];
-        }
-        out_dg[j][parameters->index] = sum;
-      }
-    }
-    /* Filter with damping filter. */
-    sum = 0.0;
-    for (m = 0; m < PITCH_DAMPORDER; ++m) {
-      sum += parameters->damper_state[m] * kDampFilter[m];
-    }
-
-    /* Subtract from input and update buffer. */
-    out_data[parameters->index] = in_data[parameters->index] - sum;
-    parameters->buffer[pos] = in_data[parameters->index] +
-        out_data[parameters->index];
-
-    ++parameters->index;
-    ++pos;
-    ++pos_lag;
-  }
-  return;
-}
-
-/* Update filter parameters based on the pitch-gains and pitch-lags. */
-static void Update(PitchFilterParam* parameters) {
-  double fraction;
-  int fraction_index;
-  /* Compute integer lag-offset. */
-  parameters->lag_offset = WebRtcIsac_lrint(parameters->lag + PITCH_FILTDELAY +
-                                            0.5);
-  /* Find correct set of coefficients for computing fractional pitch. */
-  fraction = parameters->lag_offset - (parameters->lag + PITCH_FILTDELAY);
-  fraction_index = WebRtcIsac_lrint(PITCH_FRACS * fraction - 0.5);
-  parameters->interpol_coeff = kIntrpCoef[fraction_index];
-
-  if (parameters->mode == kPitchFilterPreGain) {
-    /* If in this mode make a differential change to pitch gain. */
-    parameters->gain_mult[parameters->sub_frame] += 0.2;
-    if (parameters->gain_mult[parameters->sub_frame] > 1.0) {
-      parameters->gain_mult[parameters->sub_frame] = 1.0;
-    }
-    if (parameters->sub_frame > 0) {
-      parameters->gain_mult[parameters->sub_frame - 1] -= 0.2;
-    }
-  }
-}
-
-/******************************************************************************
- * FilterFrame()
- * Filter a frame of 30 millisecond, given pitch-lags and pitch-gains.
- *
- * Inputs
- *   in_data     : pointer to the input signal of 30 ms at 8 kHz sample-rate.
- *   lags        : pointer to pitch-lags, 4 lags per frame.
- *   gains       : pointer to pitch-gians, 4 gains per frame.
- *   mode        : defining the functionality of the filter. It takes the
- *                 following values.
- *                 kPitchFilterPre:     Pitch pre-filter, used at encoder.
- *                 kPitchFilterPost:    Pitch post-filter, used at decoder.
- *                 kPitchFilterPreLa:   Pitch pre-filter with lookahead.
- *                 kPitchFilterPreGain: Pitch pre-filter used to otain optimal
- *                                      pitch-gains.
- *
- * Outputs
- *   out_data    : pointer to a buffer where the filtered signal is written to.
- *   out_dg      : [only used in kPitchFilterPreGain] pointer to a buffer
- *                 where the output of different gain values (differential
- *                 change to gain) is written.
- */
-static void FilterFrame(const double* in_data, PitchFiltstr* filter_state,
-                        double* lags, double* gains, PitchFilterOperation mode,
-                        double* out_data,
-                        double out_dg[][PITCH_FRAME_LEN + QLOOKAHEAD]) {
-  PitchFilterParam filter_parameters;
-  double gain_delta, lag_delta;
-  double old_lag, old_gain;
-  int n;
-  int m;
-  const double kEnhancer = 1.3;
-
-  /* Set up buffer and states. */
-  filter_parameters.index = 0;
-  filter_parameters.lag_offset = 0;
-  filter_parameters.mode = mode;
-  /* Copy states to local variables. */
-  memcpy(filter_parameters.buffer, filter_state->ubuf,
-         sizeof(filter_state->ubuf));
-  RTC_COMPILE_ASSERT(sizeof(filter_parameters.buffer) >=
-                 sizeof(filter_state->ubuf));
-  memset(filter_parameters.buffer +
-             sizeof(filter_state->ubuf) / sizeof(filter_state->ubuf[0]),
-         0, sizeof(filter_parameters.buffer) - sizeof(filter_state->ubuf));
-  memcpy(filter_parameters.damper_state, filter_state->ystate,
-         sizeof(filter_state->ystate));
-
-  if (mode == kPitchFilterPreGain) {
-    /* Clear buffers. */
-    memset(filter_parameters.gain_mult, 0, sizeof(filter_parameters.gain_mult));
-    memset(filter_parameters.damper_state_dg, 0,
-           sizeof(filter_parameters.damper_state_dg));
-    for (n = 0; n < PITCH_SUBFRAMES; ++n) {
-      //memset(out_dg[n], 0, sizeof(double) * (PITCH_FRAME_LEN + QLOOKAHEAD));
-      memset(out_dg[n], 0, sizeof(out_dg[n]));
-    }
-  } else if (mode == kPitchFilterPost) {
-    /* Make output more periodic. Negative sign is to change the structure
-     * of the filter. */
-    for (n = 0; n < PITCH_SUBFRAMES; ++n) {
-      gains[n] *= -kEnhancer;
-    }
-  }
-
-  old_lag = *filter_state->oldlagp;
-  old_gain = *filter_state->oldgainp;
-
-  /* No interpolation if pitch lag step is big. */
-  if ((lags[0] > (PITCH_UPSTEP * old_lag)) ||
-      (lags[0] < (PITCH_DOWNSTEP * old_lag))) {
-    old_lag = lags[0];
-    old_gain = gains[0];
-
-    if (mode == kPitchFilterPreGain) {
-      filter_parameters.gain_mult[0] = 1.0;
-    }
-  }
-
-  filter_parameters.num_samples = PITCH_UPDATE;
-  for (m = 0; m < PITCH_SUBFRAMES; ++m) {
-    /* Set the sub-frame value. */
-    filter_parameters.sub_frame = m;
-    /* Calculate interpolation steps for pitch-lag and pitch-gain. */
-    lag_delta = (lags[m] - old_lag) / PITCH_GRAN_PER_SUBFRAME;
-    filter_parameters.lag = old_lag;
-    gain_delta = (gains[m] - old_gain) / PITCH_GRAN_PER_SUBFRAME;
-    filter_parameters.gain = old_gain;
-    /* Store for the next sub-frame. */
-    old_lag = lags[m];
-    old_gain = gains[m];
-
-    for (n = 0; n < PITCH_GRAN_PER_SUBFRAME; ++n) {
-      /* Step-wise interpolation of pitch gains and lags. As pitch-lag changes,
-       * some parameters of filter need to be update. */
-      filter_parameters.gain += gain_delta;
-      filter_parameters.lag += lag_delta;
-      /* Update parameters according to new lag value. */
-      Update(&filter_parameters);
-      /* Filter a segment of input. */
-      FilterSegment(in_data, &filter_parameters, out_data, out_dg);
-    }
-  }
-
-  if (mode != kPitchFilterPreGain) {
-    /* Export buffer and states. */
-    memcpy(filter_state->ubuf, &filter_parameters.buffer[PITCH_FRAME_LEN],
-           sizeof(filter_state->ubuf));
-    memcpy(filter_state->ystate, filter_parameters.damper_state,
-           sizeof(filter_state->ystate));
-
-    /* Store for the next frame. */
-    *filter_state->oldlagp = old_lag;
-    *filter_state->oldgainp = old_gain;
-  }
-
-  if ((mode == kPitchFilterPreGain) || (mode == kPitchFilterPreLa)) {
-    /* Filter the lookahead segment, this is treated as the last sub-frame. So
-     * set |pf_param| to last sub-frame. */
-    filter_parameters.sub_frame = PITCH_SUBFRAMES - 1;
-    filter_parameters.num_samples = QLOOKAHEAD;
-    FilterSegment(in_data, &filter_parameters, out_data, out_dg);
-  }
-}
-
-void WebRtcIsac_PitchfilterPre(double* in_data, double* out_data,
-                               PitchFiltstr* pf_state, double* lags,
-                               double* gains) {
-  FilterFrame(in_data, pf_state, lags, gains, kPitchFilterPre, out_data, NULL);
-}
-
-void WebRtcIsac_PitchfilterPre_la(double* in_data, double* out_data,
-                                  PitchFiltstr* pf_state, double* lags,
-                                  double* gains) {
-  FilterFrame(in_data, pf_state, lags, gains, kPitchFilterPreLa, out_data,
-              NULL);
-}
-
-void WebRtcIsac_PitchfilterPre_gains(
-    double* in_data, double* out_data,
-    double out_dg[][PITCH_FRAME_LEN + QLOOKAHEAD], PitchFiltstr *pf_state,
-    double* lags, double* gains) {
-  FilterFrame(in_data, pf_state, lags, gains, kPitchFilterPreGain, out_data,
-              out_dg);
-}
-
-void WebRtcIsac_PitchfilterPost(double* in_data, double* out_data,
-                                PitchFiltstr* pf_state, double* lags,
-                                double* gains) {
-  FilterFrame(in_data, pf_state, lags, gains, kPitchFilterPost, out_data, NULL);
-}
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_coding/codecs/isac/main/source/pitch_filter.h b/submodules/libtgvoip/webrtc_dsp/modules/audio_coding/codecs/isac/main/source/pitch_filter.h
deleted file mode 100644
index 9a232de87b..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_coding/codecs/isac/main/source/pitch_filter.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- *  Copyright (c) 2018 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#ifndef MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_PITCH_FILTER_H_
-#define MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_PITCH_FILTER_H_
-
-#include "modules/audio_coding/codecs/isac/main/source/structs.h"
-
-void WebRtcIsac_PitchfilterPre(double* indat,
-                               double* outdat,
-                               PitchFiltstr* pfp,
-                               double* lags,
-                               double* gains);
-
-void WebRtcIsac_PitchfilterPost(double* indat,
-                                double* outdat,
-                                PitchFiltstr* pfp,
-                                double* lags,
-                                double* gains);
-
-void WebRtcIsac_PitchfilterPre_la(double* indat,
-                                  double* outdat,
-                                  PitchFiltstr* pfp,
-                                  double* lags,
-                                  double* gains);
-
-void WebRtcIsac_PitchfilterPre_gains(
-    double* indat,
-    double* outdat,
-    double out_dG[][PITCH_FRAME_LEN + QLOOKAHEAD],
-    PitchFiltstr* pfp,
-    double* lags,
-    double* gains);
-
-#endif  // MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_PITCH_FILTER_H_
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_coding/codecs/isac/main/source/pitch_gain_tables.c b/submodules/libtgvoip/webrtc_dsp/modules/audio_coding/codecs/isac/main/source/pitch_gain_tables.c
deleted file mode 100644
index 080432c3a5..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_coding/codecs/isac/main/source/pitch_gain_tables.c
+++ /dev/null
@@ -1,104 +0,0 @@
-/*
- *  Copyright (c) 2011 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#include "modules/audio_coding/codecs/isac/main/source/pitch_gain_tables.h"
-#include "modules/audio_coding/codecs/isac/main/source/settings.h"
-
-/* header file for coding tables for the pitch filter side-info in the entropy coder */
-/********************* Pitch Filter Gain Coefficient Tables ************************/
-/* cdf for quantized pitch filter gains */
-const uint16_t WebRtcIsac_kQPitchGainCdf[255] = {
-  0,  2,  4,  6,  64,  901,  903,  905,  16954,  16956,
-  16961,  17360,  17362,  17364,  17366,  17368,  17370,  17372,  17374,  17411,
-  17514,  17516,  17583,  18790,  18796,  18802,  20760,  20777,  20782,  21722,
-  21724,  21728,  21738,  21740,  21742,  21744,  21746,  21748,  22224,  22227,
-  22230,  23214,  23229,  23239,  25086,  25108,  25120,  26088,  26094,  26098,
-  26175,  26177,  26179,  26181,  26183,  26185,  26484,  26507,  26522,  27705,
-  27731,  27750,  29767,  29799,  29817,  30866,  30883,  30885,  31025,  31029,
-  31031,  31033,  31035,  31037,  31114,  31126,  31134,  32687,  32722,  32767,
-  35718,  35742,  35757,  36943,  36952,  36954,  37115,  37128,  37130,  37132,
-  37134,  37136,  37143,  37145,  37152,  38843,  38863,  38897,  47458,  47467,
-  47474,  49040,  49061,  49063,  49145,  49157,  49159,  49161,  49163,  49165,
-  49167,  49169,  49171,  49757,  49770,  49782,  61333,  61344,  61346,  62860,
-  62883,  62885,  62887,  62889,  62891,  62893,  62895,  62897,  62899,  62901,
-  62903,  62905,  62907,  62909,  65496,  65498,  65500,  65521,  65523,  65525,
-  65527,  65529,  65531,  65533,  65535,  65535,  65535,  65535,  65535,  65535,
-  65535,  65535,  65535,  65535,  65535,  65535,  65535,  65535,  65535,  65535,
-  65535,  65535,  65535,  65535,  65535,  65535,  65535,  65535,  65535,  65535,
-  65535,  65535,  65535,  65535,  65535,  65535,  65535,  65535,  65535,  65535,
-  65535,  65535,  65535,  65535,  65535,  65535,  65535,  65535,  65535,  65535,
-  65535,  65535,  65535,  65535,  65535,  65535,  65535,  65535,  65535,  65535,
-  65535,  65535,  65535,  65535,  65535,  65535,  65535,  65535,  65535,  65535,
-  65535,  65535,  65535,  65535,  65535,  65535,  65535,  65535,  65535,  65535,
-  65535,  65535,  65535,  65535,  65535,  65535,  65535,  65535,  65535,  65535,
-  65535,  65535,  65535,  65535,  65535,  65535,  65535,  65535,  65535,  65535,
-  65535,  65535,  65535,  65535,  65535,  65535,  65535,  65535,  65535,  65535,
-  65535,  65535,  65535,  65535,  65535};
-
-/* index limits and ranges */
-const int16_t WebRtcIsac_kIndexLowerLimitGain[3] = {
-  -7, -2, -1};
-
-const int16_t WebRtcIsac_kIndexUpperLimitGain[3] = {
-  0,  3,  1};
-
-const uint16_t WebRtcIsac_kIndexMultsGain[2] = {
-  18,  3};
-
-/* size of cdf table */
-const uint16_t WebRtcIsac_kQCdfTableSizeGain[1] = {
-  256};
-
-///////////////////////////FIXED POINT
-/* mean values of pitch filter gains in FIXED point */
-const int16_t WebRtcIsac_kQMeanGain1Q12[144] = {
-   843,    1092,    1336,    1222,    1405,    1656,    1500,    1815,    1843,    1838,    1839,    1843,    1843,    1843,    1843,    1843,
-  1843,    1843,     814,     846,    1092,    1013,    1174,    1383,    1391,    1511,    1584,    1734,    1753,    1843,    1843,    1843,
-  1843,    1843,    1843,    1843,     524,     689,     777,     845,     947,    1069,    1090,    1263,    1380,    1447,    1559,    1676,
-  1645,    1749,    1843,    1843,    1843,    1843,      81,     477,     563,     611,     706,     806,     849,    1012,    1192,    1128,
-  1330,    1489,    1425,    1576,    1826,    1741,    1843,    1843,       0,     290,     305,     356,     488,     575,     602,     741,
-   890,     835,    1079,    1196,    1182,    1376,    1519,    1506,    1680,    1843,       0,      47,      97,      69,     289,     381,
-   385,     474,     617,     664,     803,    1079,     935,    1160,    1269,    1265,    1506,    1741,       0,       0,       0,       0,
-   112,     120,     190,     283,     442,     343,     526,     809,     684,     935,    1134,    1020,    1265,    1506,       0,       0,
-     0,       0,       0,       0,       0,     111,     256,      87,     373,     597,     430,     684,     935,     770,    1020,    1265};
-
-const int16_t WebRtcIsac_kQMeanGain2Q12[144] = {
-  1760,    1525,    1285,    1747,    1671,    1393,    1843,    1826,    1555,    1843,    1784,    1606,    1843,    1843,    1711,    1843,
-  1843,    1814,    1389,    1275,    1040,    1564,    1414,    1252,    1610,    1495,    1343,    1753,    1592,    1405,    1804,    1720,
-  1475,    1843,    1814,    1581,    1208,    1061,    856,    1349,    1148,    994,    1390,    1253,    1111,    1495,    1343,    1178,
-  1770,    1465,    1234,    1814,    1581,    1342,    1040,    793,    713,    1053,    895,    737,    1128,    1003,    861,    1277,
-  1094,    981,    1475,    1192,    1019,    1581,    1342,    1098,    855,    570,    483,    833,    648,    540,    948,    744,
-  572,    1009,    844,    636,    1234,    934,    685,    1342,    1217,    984,    537,    318,    124,    603,    423,    350,
-  687,    479,    322,    791,    581,    430,    987,    671,    488,    1098,    849,    597,    283,    27,        0,    397,
-  222,    38,        513,    271,    124,    624,    325,    157,    737,    484,    233,    849,    597,    343,    27,        0,
-  0,    141,    0,    0,    256,    69,        0,    370,    87,        0,    484,    229,    0,    597,    343,    87};
-
-const int16_t WebRtcIsac_kQMeanGain3Q12[144] = {
-  1843,    1843,    1711,    1843,    1818,    1606,    1843,    1827,    1511,    1814,    1639,    1393,    1760,    1525,    1285,    1656,
-  1419,    1176,    1835,    1718,    1475,    1841,    1650,    1387,    1648,    1498,    1287,    1600,    1411,    1176,    1522,    1299,
-  1040,    1419,    1176,    928,    1773,    1461,    1128,    1532,    1355,    1202,    1429,    1260,    1115,    1398,    1151,    1025,
-  1172,    1080,    790,    1176,    928,    677,    1475,    1147,    1019,    1276,    1096,    922,    1214,    1010,    901,    1057,
-  893,    800,    1040,    796,    734,    928,    677,    424,    1137,    897,    753,    1120,    830,    710,    875,    751,
-  601,    795,    642,    583,    790,    544,    475,    677,    474,    140,    987,    750,    482,    697,    573,    450,
-  691,    487,    303,    661,    394,    332,    537,    303,    220,    424,    168,    0,    737,    484,    229,    624,
-  348,    153,    441,    261,    136,    397,    166,    51,        283,    27,        0,    168,    0,    0,    484,    229,
-  0,    370,    57,        0,    256,    43,        0,    141,    0,        0,    27,        0,    0,    0,    0,    0};
-
-
-const int16_t WebRtcIsac_kQMeanGain4Q12[144] = {
-  1843,    1843,    1843,    1843,    1841,    1843,    1500,    1821,    1843,    1222,    1434,    1656,    843,    1092,    1336,    504,
-  757,    1007,    1843,    1843,    1843,    1838,    1791,    1843,    1265,    1505,    1599,    965,    1219,    1425,    730,    821,
-  1092,    249,    504,    757,    1783,    1819,    1843,    1351,    1567,    1727,    1096,    1268,    1409,    805,    961,    1131,
-  444,    670,    843,    0,        249,    504,    1425,    1655,    1743,    1096,    1324,    1448,    822,    1019,    1199,    490,
-  704,    867,    81,        450,    555,    0,    0,        249,    1247,    1428,    1530,    881,    1073,    1283,    610,    759,
-  939,    278,    464,    645,    0,    200,    270,    0,    0,    0,        935,    1163,    1410,    528,    790,    1068,
-  377,    499,    717,    173,    240,    274,    0,    43,        62,        0,    0,    0,    684,    935,    1182,    343,
-  551,    735,    161,    262,    423,    0,    55,        27,        0,    0,    0,    0,    0,    0,    430,    684,
-  935,    87,        377,    597,    0,    46,        256,    0,    0,    0,    0,    0,    0,    0,    0,    0};
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_coding/codecs/isac/main/source/pitch_gain_tables.h b/submodules/libtgvoip/webrtc_dsp/modules/audio_coding/codecs/isac/main/source/pitch_gain_tables.h
deleted file mode 100644
index 145fd4e6aa..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_coding/codecs/isac/main/source/pitch_gain_tables.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- *  Copyright (c) 2011 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-/*
- * pitch_gain_tables.h
- *
- * This file contains tables for the pitch filter side-info in the entropy
- * coder.
- *
- */
-
-#ifndef MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_PITCH_GAIN_TABLES_H_
-#define MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_PITCH_GAIN_TABLES_H_
-
-#include <stdint.h>
-
-/* header file for coding tables for the pitch filter side-info in the entropy
- * coder */
-/********************* Pitch Filter Gain Coefficient Tables
- * ************************/
-/* cdf for quantized pitch filter gains */
-extern const uint16_t WebRtcIsac_kQPitchGainCdf[255];
-
-/* index limits and ranges */
-extern const int16_t WebRtcIsac_kIndexLowerLimitGain[3];
-
-extern const int16_t WebRtcIsac_kIndexUpperLimitGain[3];
-extern const uint16_t WebRtcIsac_kIndexMultsGain[2];
-
-/* mean values of pitch filter gains */
-//(Y)
-extern const int16_t WebRtcIsac_kQMeanGain1Q12[144];
-extern const int16_t WebRtcIsac_kQMeanGain2Q12[144];
-extern const int16_t WebRtcIsac_kQMeanGain3Q12[144];
-extern const int16_t WebRtcIsac_kQMeanGain4Q12[144];
-//(Y)
-
-/* size of cdf table */
-extern const uint16_t WebRtcIsac_kQCdfTableSizeGain[1];
-
-#endif /* MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_PITCH_GAIN_TABLES_H_ */
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_coding/codecs/isac/main/source/pitch_lag_tables.c b/submodules/libtgvoip/webrtc_dsp/modules/audio_coding/codecs/isac/main/source/pitch_lag_tables.c
deleted file mode 100644
index 57d12021ac..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_coding/codecs/isac/main/source/pitch_lag_tables.c
+++ /dev/null
@@ -1,277 +0,0 @@
-/*
- *  Copyright (c) 2011 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#include "modules/audio_coding/codecs/isac/main/source/pitch_lag_tables.h"
-#include "modules/audio_coding/codecs/isac/main/source/settings.h"
-
-/* header file for coding tables for the pitch filter side-info in the entropy coder */
-/********************* Pitch Filter Gain Coefficient Tables ************************/
-
-/* tables for use with small pitch gain */
-
-/* cdf for quantized pitch filter lags */
-const uint16_t WebRtcIsac_kQPitchLagCdf1Lo[127] = {
- 0,  134,  336,  549,  778,  998,  1264,  1512,  1777,  2070,
- 2423,  2794,  3051,  3361,  3708,  3979,  4315,  4610,  4933,  5269,
- 5575,  5896,  6155,  6480,  6816,  7129,  7477,  7764,  8061,  8358,
- 8718,  9020,  9390,  9783,  10177,  10543,  10885,  11342,  11795,  12213,
- 12680,  13096,  13524,  13919,  14436,  14903,  15349,  15795,  16267,  16734,
- 17266,  17697,  18130,  18632,  19080,  19447,  19884,  20315,  20735,  21288,
- 21764,  22264,  22723,  23193,  23680,  24111,  24557,  25022,  25537,  26082,
- 26543,  27090,  27620,  28139,  28652,  29149,  29634,  30175,  30692,  31273,
- 31866,  32506,  33059,  33650,  34296,  34955,  35629,  36295,  36967,  37726,
- 38559,  39458,  40364,  41293,  42256,  43215,  44231,  45253,  46274,  47359,
- 48482,  49678,  50810,  51853,  53016,  54148,  55235,  56263,  57282,  58363,
- 59288,  60179,  61076,  61806,  62474,  63129,  63656,  64160,  64533,  64856,
- 65152,  65535,  65535,  65535,  65535,  65535,  65535};
-
-const uint16_t WebRtcIsac_kQPitchLagCdf2Lo[20] = {
- 0,  429,  3558,  5861,  8558,  11639,  15210,  19502,  24773,  31983,
- 42602,  48567,  52601,  55676,  58160,  60172,  61889,  63235,  65383,  65535};
-
-const uint16_t WebRtcIsac_kQPitchLagCdf3Lo[2] = {
- 0,  65535};
-
-const uint16_t WebRtcIsac_kQPitchLagCdf4Lo[10] = {
- 0,  2966,  6368,  11182,  19431,  37793,  48532,  55353,  60626,  65535};
-
-const uint16_t *WebRtcIsac_kQPitchLagCdfPtrLo[4] = {WebRtcIsac_kQPitchLagCdf1Lo, WebRtcIsac_kQPitchLagCdf2Lo, WebRtcIsac_kQPitchLagCdf3Lo, WebRtcIsac_kQPitchLagCdf4Lo};
-
-/* size of first cdf table */
-const uint16_t WebRtcIsac_kQPitchLagCdfSizeLo[1] = {128};
-
-/* index limits and ranges */
-const int16_t WebRtcIsac_kQIndexLowerLimitLagLo[4] = {
--140, -9,  0, -4};
-
-const int16_t WebRtcIsac_kQIndexUpperLimitLagLo[4] = {
--20,  9,  0,  4};
-
-/* initial index for arithmetic decoder */
-const uint16_t WebRtcIsac_kQInitIndexLagLo[3] = {
- 10,  1,  5};
-
-/* mean values of pitch filter lags */
-const double WebRtcIsac_kQMeanLag2Lo[19] = {
--17.21385070, -15.82678944, -14.07123081, -12.03003877, -10.01311864, -8.00794627, -5.91162987, -3.89231876, -1.90220980, -0.01879275,
- 1.89144232,  3.88123171,  5.92146992,  7.96435361,  9.98923648,  11.98266347,  13.96101002,  15.74855713,  17.10976611};
-
-const double WebRtcIsac_kQMeanLag3Lo[1] = {
- 0.00000000};
-
-const double WebRtcIsac_kQMeanLag4Lo[9] = {
--7.76246496, -5.92083980, -3.94095226, -1.89502305,  0.03724681,  1.93054221,  3.96443467,  5.91726366,  7.78434291};
-
-const double WebRtcIsac_kQPitchLagStepsizeLo = 2.000000;
-
-
-/* tables for use with medium pitch gain */
-
-/* cdf for quantized pitch filter lags */
-const uint16_t WebRtcIsac_kQPitchLagCdf1Mid[255] = {
- 0,  28,  61,  88,  121,  149,  233,  331,  475,  559,
- 624,  661,  689,  712,  745,  791,  815,  843,  866,  922,
- 959,  1024,  1061,  1117,  1178,  1238,  1280,  1350,  1453,  1513,
- 1564,  1625,  1671,  1741,  1788,  1904,  2072,  2421,  2626,  2770,
- 2840,  2900,  2942,  3012,  3068,  3115,  3147,  3194,  3254,  3319,
- 3366,  3520,  3678,  3780,  3850,  3911,  3957,  4032,  4106,  4185,
- 4292,  4474,  4683,  4842,  5019,  5191,  5321,  5428,  5540,  5675,
- 5763,  5847,  5959,  6127,  6304,  6564,  6839,  7090,  7263,  7421,
- 7556,  7728,  7872,  7984,  8142,  8361,  8580,  8743,  8938,  9227,
- 9409,  9539,  9674,  9795,  9930,  10060,  10177,  10382,  10614,  10861,
- 11038,  11271,  11415,  11629,  11792,  12044,  12193,  12416,  12574,  12821,
- 13007,  13235,  13445,  13654,  13901,  14134,  14488,  15000,  15703,  16285,
- 16504,  16797,  17086,  17328,  17579,  17807,  17998,  18268,  18538,  18836,
- 19087,  19274,  19474,  19716,  19935,  20270,  20833,  21303,  21532,  21741,
- 21978,  22207,  22523,  22770,  23054,  23613,  23943,  24204,  24399,  24651,
- 24832,  25074,  25270,  25549,  25759,  26015,  26150,  26424,  26713,  27048,
- 27342,  27504,  27681,  27854,  28021,  28207,  28412,  28664,  28859,  29064,
- 29278,  29548,  29748,  30107,  30377,  30656,  30856,  31164,  31452,  31755,
- 32011,  32328,  32626,  32919,  33319,  33789,  34329,  34925,  35396,  35973,
- 36443,  36964,  37551,  38156,  38724,  39357,  40023,  40908,  41587,  42602,
- 43924,  45037,  45810,  46597,  47421,  48291,  49092,  50051,  51448,  52719,
- 53440,  54241,  54944,  55977,  56676,  57299,  57872,  58389,  59059,  59688,
- 60237,  60782,  61094,  61573,  61890,  62290,  62658,  63030,  63217,  63454,
- 63622,  63882,  64003,  64273,  64427,  64529,  64581,  64697,  64758,  64902,
- 65414,  65535,  65535,  65535,  65535,  65535,  65535,  65535,  65535,  65535,
- 65535,  65535,  65535,  65535,  65535};
-
-const uint16_t WebRtcIsac_kQPitchLagCdf2Mid[36] = {
- 0,  71,  335,  581,  836,  1039,  1323,  1795,  2258,  2608,
- 3005,  3591,  4243,  5344,  7163,  10583,  16848,  28078,  49448,  57007,
- 60357,  61850,  62837,  63437,  63872,  64188,  64377,  64614,  64774,  64949,
- 65039,  65115,  65223,  65360,  65474,  65535};
-
-const uint16_t WebRtcIsac_kQPitchLagCdf3Mid[2] = {
- 0,  65535};
-
-const uint16_t WebRtcIsac_kQPitchLagCdf4Mid[20] = {
- 0,  28,  246,  459,  667,  1045,  1523,  2337,  4337,  11347,
- 44231,  56709,  60781,  62243,  63161,  63969,  64608,  65062,  65502,  65535};
-
-const uint16_t *WebRtcIsac_kQPitchLagCdfPtrMid[4] = {WebRtcIsac_kQPitchLagCdf1Mid, WebRtcIsac_kQPitchLagCdf2Mid, WebRtcIsac_kQPitchLagCdf3Mid, WebRtcIsac_kQPitchLagCdf4Mid};
-
-/* size of first cdf table */
-const uint16_t WebRtcIsac_kQPitchLagCdfSizeMid[1] = {256};
-
-/* index limits and ranges */
-const int16_t WebRtcIsac_kQIndexLowerLimitLagMid[4] = {
--280, -17,  0, -9};
-
-const int16_t WebRtcIsac_kQIndexUpperLimitLagMid[4] = {
--40,  17,  0,  9};
-
-/* initial index for arithmetic decoder */
-const uint16_t WebRtcIsac_kQInitIndexLagMid[3] = {
- 18,  1,  10};
-
-/* mean values of pitch filter lags */
-const double WebRtcIsac_kQMeanLag2Mid[35] = {
--16.89183900, -15.86949778, -15.05476653, -14.00664348, -13.02793036, -12.07324237, -11.00542532, -10.11250602, -8.90792971, -8.02474753,
--7.00426767, -5.94055287, -4.98251338, -3.91053158, -2.98820425, -1.93524245, -0.92978085, -0.01722509,  0.91317387,  1.92973955,
- 2.96908851,  3.93728974,  4.96308471,  5.92244151,  7.08673497,  8.00993708,  9.04656316,  9.98538742,  10.97851694,  11.94772884,
- 13.02426166,  14.00039951,  15.01347042,  15.80758023,  16.94086895};
-
-const double WebRtcIsac_kQMeanLag3Mid[1] = {
- 0.00000000};
-
-const double WebRtcIsac_kQMeanLag4Mid[19] = {
--8.60409403, -7.89198395, -7.03450280, -5.86260421, -4.93822322, -3.93078706, -2.91302322, -1.91824007, -0.87003282,  0.02822649,
- 0.89951758,  1.87495484,  2.91802604,  3.96874074,  5.06571703,  5.93618227,  7.00520185,  7.88497726,  8.64160364};
-
-const double WebRtcIsac_kQPitchLagStepsizeMid = 1.000000;
-
-
-/* tables for use with large pitch gain */
-
-/* cdf for quantized pitch filter lags */
-const uint16_t WebRtcIsac_kQPitchLagCdf1Hi[511] = {
- 0,  7,  18,  33,  69,  105,  156,  228,  315,  612,
- 680,  691,  709,  724,  735,  738,  742,  746,  749,  753,
- 756,  760,  764,  774,  782,  785,  789,  796,  800,  803,
- 807,  814,  818,  822,  829,  832,  847,  854,  858,  869,
- 876,  883,  898,  908,  934,  977,  1010,  1050,  1060,  1064,
- 1075,  1078,  1086,  1089,  1093,  1104,  1111,  1122,  1133,  1136,
- 1151,  1162,  1183,  1209,  1252,  1281,  1339,  1364,  1386,  1401,
- 1411,  1415,  1426,  1430,  1433,  1440,  1448,  1455,  1462,  1477,
- 1487,  1495,  1502,  1506,  1509,  1516,  1524,  1531,  1535,  1542,
- 1553,  1556,  1578,  1589,  1611,  1625,  1639,  1643,  1654,  1665,
- 1672,  1687,  1694,  1705,  1708,  1719,  1730,  1744,  1752,  1759,
- 1791,  1795,  1820,  1867,  1886,  1915,  1936,  1943,  1965,  1987,
- 2041,  2099,  2161,  2175,  2200,  2211,  2226,  2233,  2244,  2251,
- 2266,  2280,  2287,  2298,  2309,  2316,  2331,  2342,  2356,  2378,
- 2403,  2418,  2447,  2497,  2544,  2602,  2863,  2895,  2903,  2935,
- 2950,  2971,  3004,  3011,  3018,  3029,  3040,  3062,  3087,  3127,
- 3152,  3170,  3199,  3243,  3293,  3322,  3340,  3377,  3402,  3427,
- 3474,  3518,  3543,  3579,  3601,  3637,  3659,  3706,  3731,  3760,
- 3818,  3847,  3869,  3901,  3920,  3952,  4068,  4169,  4220,  4271,
- 4524,  4571,  4604,  4632,  4672,  4730,  4777,  4806,  4857,  4904,
- 4951,  5002,  5031,  5060,  5107,  5150,  5212,  5266,  5331,  5382,
- 5432,  5490,  5544,  5610,  5700,  5762,  5812,  5874,  5972,  6022,
- 6091,  6163,  6232,  6305,  6402,  6540,  6685,  6880,  7090,  7271,
- 7379,  7452,  7542,  7625,  7687,  7770,  7843,  7911,  7966,  8024,
- 8096,  8190,  8252,  8320,  8411,  8501,  8585,  8639,  8751,  8842,
- 8918,  8986,  9066,  9127,  9203,  9269,  9345,  9406,  9464,  9536,
- 9612,  9667,  9735,  9844,  9931,  10036,  10119,  10199,  10260,  10358,
- 10441,  10514,  10666,  10734,  10872,  10951,  11053,  11125,  11223,  11324,
- 11516,  11664,  11737,  11816,  11892,  12008,  12120,  12200,  12280,  12392,
- 12490,  12576,  12685,  12812,  12917,  13003,  13108,  13210,  13300,  13384,
- 13470,  13579,  13673,  13771,  13879,  13999,  14136,  14201,  14368,  14614,
- 14759,  14867,  14958,  15030,  15121,  15189,  15280,  15385,  15461,  15555,
- 15653,  15768,  15884,  15971,  16069,  16145,  16210,  16279,  16380,  16463,
- 16539,  16615,  16688,  16818,  16919,  17017,  18041,  18338,  18523,  18649,
- 18790,  18917,  19047,  19167,  19315,  19460,  19601,  19731,  19858,  20068,
- 20173,  20318,  20466,  20625,  20741,  20911,  21045,  21201,  21396,  21588,
- 21816,  22022,  22305,  22547,  22786,  23072,  23322,  23600,  23879,  24168,
- 24433,  24769,  25120,  25511,  25895,  26289,  26792,  27219,  27683,  28077,
- 28566,  29094,  29546,  29977,  30491,  30991,  31573,  32105,  32594,  33173,
- 33788,  34497,  35181,  35833,  36488,  37255,  37921,  38645,  39275,  39894,
- 40505,  41167,  41790,  42431,  43096,  43723,  44385,  45134,  45858,  46607,
- 47349,  48091,  48768,  49405,  49955,  50555,  51167,  51985,  52611,  53078,
- 53494,  53965,  54435,  54996,  55601,  56125,  56563,  56838,  57244,  57566,
- 57967,  58297,  58771,  59093,  59419,  59647,  59886,  60143,  60461,  60693,
- 60917,  61170,  61416,  61634,  61891,  62122,  62310,  62455,  62632,  62839,
- 63103,  63436,  63639,  63805,  63906,  64015,  64192,  64355,  64475,  64558,
- 64663,  64742,  64811,  64865,  64916,  64956,  64981,  65025,  65068,  65115,
- 65195,  65314,  65419,  65535,  65535,  65535,  65535,  65535,  65535,  65535,
- 65535,  65535,  65535,  65535,  65535,  65535,  65535,  65535,  65535,  65535,
- 65535,  65535,  65535,  65535,  65535,  65535,  65535,  65535,  65535,  65535,
- 65535,  65535,  65535,  65535,  65535,  65535,  65535,  65535,  65535,  65535,
- 65535};
-
-const uint16_t WebRtcIsac_kQPitchLagCdf2Hi[68] = {
- 0,  7,  11,  22,  37,  52,  56,  59,  81,  85,
- 89,  96,  115,  130,  137,  152,  170,  181,  193,  200,
- 207,  233,  237,  259,  289,  318,  363,  433,  592,  992,
- 1607,  3062,  6149,  12206,  25522,  48368,  58223,  61918,  63640,  64584,
- 64943,  65098,  65206,  65268,  65294,  65335,  65350,  65372,  65387,  65402,
- 65413,  65420,  65428,  65435,  65439,  65450,  65454,  65468,  65472,  65476,
- 65483,  65491,  65498,  65505,  65516,  65520,  65528,  65535};
-
-const uint16_t WebRtcIsac_kQPitchLagCdf3Hi[2] = {
- 0,  65535};
-
-const uint16_t WebRtcIsac_kQPitchLagCdf4Hi[35] = {
- 0,  7,  19,  30,  41,  48,  63,  74,  82,  96,
- 122,  152,  215,  330,  701,  2611,  10931,  48106,  61177,  64341,
- 65112,  65238,  65309,  65338,  65364,  65379,  65401,  65427,  65453,  65465,
- 65476,  65490,  65509,  65528,  65535};
-
-const uint16_t *WebRtcIsac_kQPitchLagCdfPtrHi[4] = {WebRtcIsac_kQPitchLagCdf1Hi, WebRtcIsac_kQPitchLagCdf2Hi, WebRtcIsac_kQPitchLagCdf3Hi, WebRtcIsac_kQPitchLagCdf4Hi};
-
-/* size of first cdf table */
-const uint16_t WebRtcIsac_kQPitchLagCdfSizeHi[1] = {512};
-
-/* index limits and ranges */
-const int16_t WebRtcIsac_kQindexLowerLimitLagHi[4] = {
--552, -34,  0, -16};
-
-const int16_t WebRtcIsac_kQindexUpperLimitLagHi[4] = {
--80,  32,  0,  17};
-
-/* initial index for arithmetic decoder */
-const uint16_t WebRtcIsac_kQInitIndexLagHi[3] = {
- 34,  1,  18};
-
-/* mean values of pitch filter lags */
-const double WebRtcIsac_kQMeanLag2Hi[67] = {
--17.07263295, -16.50000000, -15.83966081, -15.55613708, -14.96948007, -14.50000000, -14.00000000, -13.48377986, -13.00000000, -12.50000000,
--11.93199636, -11.44530414, -11.04197641, -10.39910301, -10.15202337, -9.51322461, -8.93357741, -8.46456632, -8.10270672, -7.53751847,
--6.98686404, -6.50000000, -6.08463150, -5.46872991, -5.00864717, -4.50163760, -4.01382410, -3.43856708, -2.96898001, -2.46554810,
--1.96861004, -1.47106701, -0.97197237, -0.46561654, -0.00531409,  0.45767857,  0.96777907,  1.47507903,  1.97740425,  2.46695420,
- 3.00695774,  3.47167185,  4.02712538,  4.49280007,  5.01087640,  5.48191963,  6.04916550,  6.51511058,  6.97297819,  7.46565499,
- 8.01489405,  8.39912001,  8.91819757,  9.50000000,  10.11654065,  10.50000000,  11.03712583,  11.50000000,  12.00000000,  12.38964346,
- 12.89466127,  13.43657881,  13.96013840,  14.46279912,  15.00000000,  15.39412269,  15.96662441};
-
-const double WebRtcIsac_kQMeanLag3Hi[1] = {
- 0.00000000};
-
-const double WebRtcIsac_kQMeanLag4Hi[34] = {
--7.98331221, -7.47988769, -7.03626557, -6.52708003, -6.06982173, -5.51856292, -5.05827033, -4.45909878, -3.99125864, -3.45308135,
--3.02328139, -2.47297273, -1.94341995, -1.44699056, -0.93612243, -0.43012406,  0.01120357,  0.44054812,  0.93199883,  1.45669587,
- 1.97218322,  2.50187419,  2.98748690,  3.49343202,  4.01660147,  4.50984306,  5.01402683,  5.58936797,  5.91787793,  6.59998900,
- 6.85034315,  7.53503316,  7.87711194,  8.53631648};
-
-const double WebRtcIsac_kQPitchLagStepsizeHi = 0.500000;
-
-/* transform matrix */
-const double WebRtcIsac_kTransform[4][4] = {
-{-0.50000000, -0.50000000, -0.50000000, -0.50000000},
-{ 0.67082039,  0.22360680, -0.22360680, -0.67082039},
-{ 0.50000000, -0.50000000, -0.50000000,  0.50000000},
-{ 0.22360680, -0.67082039,  0.67082039, -0.22360680}};
-
-/* transpose transform matrix */
-const double WebRtcIsac_kTransformTranspose[4][4] = {
-{-0.50000000,  0.67082039,  0.50000000,  0.22360680},
-{-0.50000000,  0.22360680, -0.50000000, -0.67082039},
-{-0.50000000, -0.22360680, -0.50000000,  0.67082039},
-{-0.50000000, -0.67082039,  0.50000000, -0.22360680}};
-
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_coding/codecs/isac/main/source/pitch_lag_tables.h b/submodules/libtgvoip/webrtc_dsp/modules/audio_coding/codecs/isac/main/source/pitch_lag_tables.h
deleted file mode 100644
index b48e358a5a..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_coding/codecs/isac/main/source/pitch_lag_tables.h
+++ /dev/null
@@ -1,116 +0,0 @@
-/*
- *  Copyright (c) 2011 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-/*
- * pitch_lag_tables.h
- *
- * This file contains tables for the pitch filter side-info in the entropy
- * coder.
- *
- */
-
-#ifndef MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_PITCH_LAG_TABLES_H_
-#define MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_PITCH_LAG_TABLES_H_
-
-#include <stdint.h>
-
-/* header file for coding tables for the pitch filter side-info in the entropy
- * coder */
-/********************* Pitch Filter Lag Coefficient Tables
- * ************************/
-
-/* tables for use with small pitch gain */
-
-/* cdfs for quantized pitch lags */
-extern const uint16_t WebRtcIsac_kQPitchLagCdf1Lo[127];
-extern const uint16_t WebRtcIsac_kQPitchLagCdf2Lo[20];
-extern const uint16_t WebRtcIsac_kQPitchLagCdf3Lo[2];
-extern const uint16_t WebRtcIsac_kQPitchLagCdf4Lo[10];
-
-extern const uint16_t* WebRtcIsac_kQPitchLagCdfPtrLo[4];
-
-/* size of first cdf table */
-extern const uint16_t WebRtcIsac_kQPitchLagCdfSizeLo[1];
-
-/* index limits and ranges */
-extern const int16_t WebRtcIsac_kQIndexLowerLimitLagLo[4];
-extern const int16_t WebRtcIsac_kQIndexUpperLimitLagLo[4];
-
-/* initial index for arithmetic decoder */
-extern const uint16_t WebRtcIsac_kQInitIndexLagLo[3];
-
-/* mean values of pitch filter lags */
-extern const double WebRtcIsac_kQMeanLag2Lo[19];
-extern const double WebRtcIsac_kQMeanLag3Lo[1];
-extern const double WebRtcIsac_kQMeanLag4Lo[9];
-
-extern const double WebRtcIsac_kQPitchLagStepsizeLo;
-
-/* tables for use with medium pitch gain */
-
-/* cdfs for quantized pitch lags */
-extern const uint16_t WebRtcIsac_kQPitchLagCdf1Mid[255];
-extern const uint16_t WebRtcIsac_kQPitchLagCdf2Mid[36];
-extern const uint16_t WebRtcIsac_kQPitchLagCdf3Mid[2];
-extern const uint16_t WebRtcIsac_kQPitchLagCdf4Mid[20];
-
-extern const uint16_t* WebRtcIsac_kQPitchLagCdfPtrMid[4];
-
-/* size of first cdf table */
-extern const uint16_t WebRtcIsac_kQPitchLagCdfSizeMid[1];
-
-/* index limits and ranges */
-extern const int16_t WebRtcIsac_kQIndexLowerLimitLagMid[4];
-extern const int16_t WebRtcIsac_kQIndexUpperLimitLagMid[4];
-
-/* initial index for arithmetic decoder */
-extern const uint16_t WebRtcIsac_kQInitIndexLagMid[3];
-
-/* mean values of pitch filter lags */
-extern const double WebRtcIsac_kQMeanLag2Mid[35];
-extern const double WebRtcIsac_kQMeanLag3Mid[1];
-extern const double WebRtcIsac_kQMeanLag4Mid[19];
-
-extern const double WebRtcIsac_kQPitchLagStepsizeMid;
-
-/* tables for use with large pitch gain */
-
-/* cdfs for quantized pitch lags */
-extern const uint16_t WebRtcIsac_kQPitchLagCdf1Hi[511];
-extern const uint16_t WebRtcIsac_kQPitchLagCdf2Hi[68];
-extern const uint16_t WebRtcIsac_kQPitchLagCdf3Hi[2];
-extern const uint16_t WebRtcIsac_kQPitchLagCdf4Hi[35];
-
-extern const uint16_t* WebRtcIsac_kQPitchLagCdfPtrHi[4];
-
-/* size of first cdf table */
-extern const uint16_t WebRtcIsac_kQPitchLagCdfSizeHi[1];
-
-/* index limits and ranges */
-extern const int16_t WebRtcIsac_kQindexLowerLimitLagHi[4];
-extern const int16_t WebRtcIsac_kQindexUpperLimitLagHi[4];
-
-/* initial index for arithmetic decoder */
-extern const uint16_t WebRtcIsac_kQInitIndexLagHi[3];
-
-/* mean values of pitch filter lags */
-extern const double WebRtcIsac_kQMeanLag2Hi[67];
-extern const double WebRtcIsac_kQMeanLag3Hi[1];
-extern const double WebRtcIsac_kQMeanLag4Hi[34];
-
-extern const double WebRtcIsac_kQPitchLagStepsizeHi;
-
-/* transform matrix */
-extern const double WebRtcIsac_kTransform[4][4];
-
-/* transpose transform matrix */
-extern const double WebRtcIsac_kTransformTranspose[4][4];
-
-#endif /* MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_PITCH_LAG_TABLES_H_ */
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_coding/codecs/isac/main/source/settings.h b/submodules/libtgvoip/webrtc_dsp/modules/audio_coding/codecs/isac/main/source/settings.h
deleted file mode 100644
index abce90c4f5..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_coding/codecs/isac/main/source/settings.h
+++ /dev/null
@@ -1,196 +0,0 @@
-/*
- *  Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-/*
- * settings.h
- *
- * Declaration of #defines used in the iSAC codec
- *
- */
-
-#ifndef MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_SETTINGS_H_
-#define MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_SETTINGS_H_
-
-/* sampling frequency (Hz) */
-#define FS 16000
-
-/* number of samples per frame (either 320 (20ms), 480 (30ms) or 960 (60ms)) */
-#define INITIAL_FRAMESAMPLES 960
-
-/* do not modify the following; this will have to be modified if we
- * have a 20ms framesize option */
-/**********************************************************************/
-/* miliseconds */
-#define FRAMESIZE 30
-/* number of samples per frame processed in the encoder, 480 */
-#define FRAMESAMPLES 480 /* ((FRAMESIZE*FS)/1000) */
-#define FRAMESAMPLES_HALF 240
-#define FRAMESAMPLES_QUARTER 120
-/**********************************************************************/
-
-/* max number of samples per frame (= 60 ms frame) */
-#define MAX_FRAMESAMPLES 960
-#define MAX_SWBFRAMESAMPLES (MAX_FRAMESAMPLES * 2)
-/* number of samples per 10ms frame */
-#define FRAMESAMPLES_10ms ((10 * FS) / 1000)
-#define SWBFRAMESAMPLES_10ms (FRAMESAMPLES_10ms * 2)
-/* number of samples in 30 ms frame */
-#define FRAMESAMPLES_30ms 480
-/* number of subframes */
-#define SUBFRAMES 6
-/* length of a subframe */
-#define UPDATE 80
-/* length of half a subframe (low/high band) */
-#define HALF_SUBFRAMELEN (UPDATE / 2)
-/* samples of look ahead (in a half-band, so actually
- * half the samples of look ahead @ FS) */
-#define QLOOKAHEAD 24 /* 3 ms */
-/* order of AR model in spectral entropy coder */
-#define AR_ORDER 6
-/* order of LP model in spectral entropy coder */
-#define LP_ORDER 0
-
-/* window length (masking analysis) */
-#define WINLEN 256
-/* order of low-band pole filter used to approximate masking curve */
-#define ORDERLO 12
-/* order of hi-band pole filter used to approximate masking curve */
-#define ORDERHI 6
-
-#define UB_LPC_ORDER 4
-#define UB_LPC_VEC_PER_FRAME 2
-#define UB16_LPC_VEC_PER_FRAME 4
-#define UB_ACTIVE_SUBFRAMES 2
-#define UB_MAX_LPC_ORDER 6
-#define UB_INTERPOL_SEGMENTS 1
-#define UB16_INTERPOL_SEGMENTS 3
-#define LB_TOTAL_DELAY_SAMPLES 48
-enum ISACBandwidth { isac8kHz = 8, isac12kHz = 12, isac16kHz = 16 };
-enum ISACBand {
-  kIsacLowerBand = 0,
-  kIsacUpperBand12 = 1,
-  kIsacUpperBand16 = 2
-};
-enum IsacSamplingRate { kIsacWideband = 16, kIsacSuperWideband = 32 };
-#define UB_LPC_GAIN_DIM SUBFRAMES
-#define FB_STATE_SIZE_WORD32 6
-
-/* order for post_filter_bank */
-#define POSTQORDER 3
-/* order for pre-filterbank */
-#define QORDER 3
-/* another order */
-#define QORDER_ALL (POSTQORDER + QORDER - 1)
-/* for decimator */
-#define ALLPASSSECTIONS 2
-
-/* array size for byte stream in number of bytes. */
-/* The old maximum size still needed for the decoding */
-#define STREAM_SIZE_MAX 600
-#define STREAM_SIZE_MAX_30 200 /* 200 bytes=53.4 kbps @ 30 ms.framelength */
-#define STREAM_SIZE_MAX_60 400 /* 400 bytes=53.4 kbps @ 60 ms.framelength */
-
-/* storage size for bit counts */
-#define BIT_COUNTER_SIZE 30
-/* maximum order of any AR model or filter */
-#define MAX_AR_MODEL_ORDER 12  // 50
-
-/* For pitch analysis */
-#define PITCH_FRAME_LEN (FRAMESAMPLES_HALF) /* 30 ms  */
-#define PITCH_MAX_LAG 140                   /* 57 Hz  */
-#define PITCH_MIN_LAG 20                    /* 400 Hz */
-#define PITCH_MAX_GAIN 0.45
-#define PITCH_MAX_GAIN_06 0.27 /* PITCH_MAX_GAIN*0.6 */
-#define PITCH_MAX_GAIN_Q12 1843
-#define PITCH_LAG_SPAN2 (PITCH_MAX_LAG / 2 - PITCH_MIN_LAG / 2 + 5)
-#define PITCH_CORR_LEN2 60 /* 15 ms  */
-#define PITCH_CORR_STEP2 (PITCH_FRAME_LEN / 4)
-#define PITCH_BW 11 /* half the band width of correlation surface */
-#define PITCH_SUBFRAMES 4
-#define PITCH_GRAN_PER_SUBFRAME 5
-#define PITCH_SUBFRAME_LEN (PITCH_FRAME_LEN / PITCH_SUBFRAMES)
-#define PITCH_UPDATE (PITCH_SUBFRAME_LEN / PITCH_GRAN_PER_SUBFRAME)
-/* maximum number of peaks to be examined in correlation surface */
-#define PITCH_MAX_NUM_PEAKS 10
-#define PITCH_PEAK_DECAY 0.85
-/* For weighting filter */
-#define PITCH_WLPCORDER 6
-#define PITCH_WLPCWINLEN PITCH_FRAME_LEN
-#define PITCH_WLPCASYM 0.3 /* asymmetry parameter */
-#define PITCH_WLPCBUFLEN PITCH_WLPCWINLEN
-/* For pitch filter */
-/* Extra 50 for fraction and LP filters */
-#define PITCH_BUFFSIZE (PITCH_MAX_LAG + 50)
-#define PITCH_INTBUFFSIZE (PITCH_FRAME_LEN + PITCH_BUFFSIZE)
-/* Max rel. step for interpolation */
-#define PITCH_UPSTEP 1.5
-/* Max rel. step for interpolation */
-#define PITCH_DOWNSTEP 0.67
-#define PITCH_FRACS 8
-#define PITCH_FRACORDER 9
-#define PITCH_DAMPORDER 5
-#define PITCH_FILTDELAY 1.5f
-/* stepsize for quantization of the pitch Gain */
-#define PITCH_GAIN_STEPSIZE 0.125
-
-/* Order of high pass filter */
-#define HPORDER 2
-
-/* some mathematical constants */
-/* log2(exp) */
-#define LOG2EXP 1.44269504088896
-#define PI 3.14159265358979
-
-/* Maximum number of iterations allowed to limit payload size */
-#define MAX_PAYLOAD_LIMIT_ITERATION 5
-
-/* Redundant Coding */
-#define RCU_BOTTLENECK_BPS 16000
-#define RCU_TRANSCODING_SCALE 0.40f
-#define RCU_TRANSCODING_SCALE_INVERSE 2.5f
-
-#define RCU_TRANSCODING_SCALE_UB 0.50f
-#define RCU_TRANSCODING_SCALE_UB_INVERSE 2.0f
-
-/* Define Error codes */
-/* 6000 General */
-#define ISAC_MEMORY_ALLOCATION_FAILED 6010
-#define ISAC_MODE_MISMATCH 6020
-#define ISAC_DISALLOWED_BOTTLENECK 6030
-#define ISAC_DISALLOWED_FRAME_LENGTH 6040
-#define ISAC_UNSUPPORTED_SAMPLING_FREQUENCY 6050
-
-/* 6200 Bandwidth estimator */
-#define ISAC_RANGE_ERROR_BW_ESTIMATOR 6240
-/* 6400 Encoder */
-#define ISAC_ENCODER_NOT_INITIATED 6410
-#define ISAC_DISALLOWED_CODING_MODE 6420
-#define ISAC_DISALLOWED_FRAME_MODE_ENCODER 6430
-#define ISAC_DISALLOWED_BITSTREAM_LENGTH 6440
-#define ISAC_PAYLOAD_LARGER_THAN_LIMIT 6450
-#define ISAC_DISALLOWED_ENCODER_BANDWIDTH 6460
-/* 6600 Decoder */
-#define ISAC_DECODER_NOT_INITIATED 6610
-#define ISAC_EMPTY_PACKET 6620
-#define ISAC_DISALLOWED_FRAME_MODE_DECODER 6630
-#define ISAC_RANGE_ERROR_DECODE_FRAME_LENGTH 6640
-#define ISAC_RANGE_ERROR_DECODE_BANDWIDTH 6650
-#define ISAC_RANGE_ERROR_DECODE_PITCH_GAIN 6660
-#define ISAC_RANGE_ERROR_DECODE_PITCH_LAG 6670
-#define ISAC_RANGE_ERROR_DECODE_LPC 6680
-#define ISAC_RANGE_ERROR_DECODE_SPECTRUM 6690
-#define ISAC_LENGTH_MISMATCH 6730
-#define ISAC_RANGE_ERROR_DECODE_BANDWITH 6740
-#define ISAC_DISALLOWED_BANDWIDTH_MODE_DECODER 6750
-#define ISAC_DISALLOWED_LPC_MODEL 6760
-/* 6800 Call setup formats */
-#define ISAC_INCOMPATIBLE_FORMATS 6810
-
-#endif /* MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_SETTINGS_H_ */
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_coding/codecs/isac/main/source/spectrum_ar_model_tables.c b/submodules/libtgvoip/webrtc_dsp/modules/audio_coding/codecs/isac/main/source/spectrum_ar_model_tables.c
deleted file mode 100644
index 839d5d4586..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_coding/codecs/isac/main/source/spectrum_ar_model_tables.c
+++ /dev/null
@@ -1,139 +0,0 @@
-/*
- *  Copyright (c) 2011 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#include "modules/audio_coding/codecs/isac/main/source/spectrum_ar_model_tables.h"
-#include "modules/audio_coding/codecs/isac/main/source/settings.h"
-
-/********************* AR Coefficient Tables ************************/
-/* cdf for quantized reflection coefficient 1 */
-const uint16_t WebRtcIsac_kQArRc1Cdf[NUM_AR_RC_QUANT_BAUNDARY] = {
- 0,  2,  4,  129,  7707,  57485,  65495,  65527,  65529,  65531,
- 65533,  65535};
-
-/* cdf for quantized reflection coefficient 2 */
-const uint16_t WebRtcIsac_kQArRc2Cdf[NUM_AR_RC_QUANT_BAUNDARY] = {
- 0,  2,  4,  7,  531,  25298,  64525,  65526,  65529,  65531,
- 65533,  65535};
-
-/* cdf for quantized reflection coefficient 3 */
-const uint16_t WebRtcIsac_kQArRc3Cdf[NUM_AR_RC_QUANT_BAUNDARY] = {
- 0,  2,  4,  6,  620,  22898,  64843,  65527,  65529,  65531,
- 65533,  65535};
-
-/* cdf for quantized reflection coefficient 4 */
-const uint16_t WebRtcIsac_kQArRc4Cdf[NUM_AR_RC_QUANT_BAUNDARY] = {
- 0,  2,  4,  6,  35,  10034,  60733,  65506,  65529,  65531,
- 65533,  65535};
-
-/* cdf for quantized reflection coefficient 5 */
-const uint16_t WebRtcIsac_kQArRc5Cdf[NUM_AR_RC_QUANT_BAUNDARY] = {
- 0,  2,  4,  6,  36,  7567,  56727,  65385,  65529,  65531,
- 65533,  65535};
-
-/* cdf for quantized reflection coefficient 6 */
-const uint16_t WebRtcIsac_kQArRc6Cdf[NUM_AR_RC_QUANT_BAUNDARY] = {
- 0,  2,  4,  6,  14,  6579,  57360,  65409,  65529,  65531,
- 65533,  65535};
-
-/* representation levels for quantized reflection coefficient 1 */
-const int16_t WebRtcIsac_kQArRc1Levels[NUM_AR_RC_QUANT_BAUNDARY - 1] = {
- -32104, -29007, -23202, -15496, -9279, -2577, 5934, 17535, 24512, 29503, 32104
-};
-
-/* representation levels for quantized reflection coefficient 2 */
-const int16_t WebRtcIsac_kQArRc2Levels[NUM_AR_RC_QUANT_BAUNDARY - 1] = {
- -32104, -29503, -23494, -15261, -7309, -1399, 6158, 16381, 24512, 29503, 32104
-};
-
-/* representation levels for quantized reflection coefficient 3 */
-const int16_t WebRtcIsac_kQArRc3Levels[NUM_AR_RC_QUANT_BAUNDARY - 1] = {
--32104, -29503, -23157, -15186, -7347, -1359, 5829, 17535, 24512, 29503, 32104
-};
-
-/* representation levels for quantized reflection coefficient 4 */
-const int16_t WebRtcIsac_kQArRc4Levels[NUM_AR_RC_QUANT_BAUNDARY - 1] = {
--32104, -29503, -24512, -15362, -6665, -342, 6596, 14585, 24512, 29503, 32104
-};
-
-/* representation levels for quantized reflection coefficient 5 */
-const int16_t WebRtcIsac_kQArRc5Levels[NUM_AR_RC_QUANT_BAUNDARY - 1] = {
--32104, -29503, -24512, -15005, -6564, -106, 7123, 14920, 24512, 29503, 32104
-};
-
-/* representation levels for quantized reflection coefficient 6 */
-const int16_t WebRtcIsac_kQArRc6Levels[NUM_AR_RC_QUANT_BAUNDARY - 1] = {
--32104, -29503, -24512, -15096, -6656, -37, 7036, 14847, 24512, 29503, 32104
-};
-
-/* quantization boundary levels for reflection coefficients */
-const int16_t WebRtcIsac_kQArBoundaryLevels[NUM_AR_RC_QUANT_BAUNDARY] = {
--32768, -31441, -27566, -21458, -13612, -4663, 4663, 13612, 21458, 27566, 31441,
-32767
-};
-
-/* initial index for AR reflection coefficient quantizer and cdf table search */
-const uint16_t WebRtcIsac_kQArRcInitIndex[6] = {
- 5,  5,  5,  5,  5,  5};
-
-/* pointers to AR cdf tables */
-const uint16_t *WebRtcIsac_kQArRcCdfPtr[AR_ORDER] = {
-  WebRtcIsac_kQArRc1Cdf, WebRtcIsac_kQArRc2Cdf, WebRtcIsac_kQArRc3Cdf,
-  WebRtcIsac_kQArRc4Cdf, WebRtcIsac_kQArRc5Cdf, WebRtcIsac_kQArRc6Cdf
-};
-
-/* pointers to AR representation levels tables */
-const int16_t *WebRtcIsac_kQArRcLevelsPtr[AR_ORDER] = {
-  WebRtcIsac_kQArRc1Levels, WebRtcIsac_kQArRc2Levels, WebRtcIsac_kQArRc3Levels,
-  WebRtcIsac_kQArRc4Levels, WebRtcIsac_kQArRc5Levels, WebRtcIsac_kQArRc6Levels
-};
-
-
-/******************** GAIN Coefficient Tables ***********************/
-/* cdf for Gain coefficient */
-const uint16_t WebRtcIsac_kQGainCdf[19] = {
- 0,  2,  4,  6,  8,  10,  12,  14,  16,  1172,
- 11119,  29411,  51699,  64445,  65527,  65529,  65531,  65533,  65535};
-
-/* representation levels for quantized squared Gain coefficient */
-const int32_t WebRtcIsac_kQGain2Levels[18] = {
-// 17, 28, 46, 76, 128, 215, 364, 709, 1268, 1960, 3405, 6078, 11286, 17827, 51918, 134498, 487432, 2048000};
- 128, 128, 128, 128, 128, 215, 364, 709, 1268, 1960, 3405, 6078, 11286, 17827, 51918, 134498, 487432, 2048000};
-/* quantization boundary levels for squared Gain coefficient */
-const int32_t WebRtcIsac_kQGain2BoundaryLevels[19] = {
-0, 21, 35, 59, 99, 166, 280, 475, 815, 1414, 2495, 4505, 8397, 16405, 34431, 81359, 240497, 921600, 0x7FFFFFFF};
-
-/* pointers to Gain cdf table */
-const uint16_t *WebRtcIsac_kQGainCdf_ptr[1] = {WebRtcIsac_kQGainCdf};
-
-/* Gain initial index for gain quantizer and cdf table search */
-const uint16_t WebRtcIsac_kQGainInitIndex[1] = {11};
-
-/************************* Cosine Tables ****************************/
-/* Cosine table */
-const int16_t WebRtcIsac_kCos[6][60] = {
-{512,  512,  511,  510,  508,  507,  505,  502,  499,  496,  493,  489,  485,  480,  476,  470,  465,  459,  453,  447,
-440,  433,  426,  418,  410,  402,  394,  385,  376,  367,  357,  348,  338,  327,  317,  306,  295,  284,  273,  262,
-250,  238,  226,  214,  202,  190,  177,  165,  152,  139,  126,  113,  100,  87,  73,  60,  47,  33,  20,  7},
-{512,  510,  508,  503,  498,  491,  483,  473,  462,  450,  437,  422,  406,  389,  371,  352,  333,  312,  290,  268,
-244,  220,  196,  171,  145,  120,  93,  67,  40,  13,  -13,  -40,  -67,  -93,  -120,  -145,  -171,  -196,  -220,  -244,
--268,  -290,  -312,  -333,  -352,  -371,  -389,  -406,  -422,  -437,  -450,  -462,  -473,  -483,  -491,  -498,  -503,  -508,  -510,  -512},
-{512,  508,  502,  493,  480,  465,  447,  426,  402,  376,  348,  317,  284,  250,  214,  177,  139,  100,  60,  20,
--20,  -60,  -100,  -139,  -177,  -214,  -250,  -284,  -317,  -348,  -376,  -402,  -426,  -447,  -465,  -480,  -493,  -502,  -508,  -512,
--512,  -508,  -502,  -493,  -480,  -465,  -447,  -426,  -402,  -376,  -348,  -317,  -284,  -250,  -214,  -177,  -139,  -100,  -60,  -20},
-{511,  506,  495,  478,  456,  429,  398,  362,  322,  279,  232,  183,  133,  80,  27,  -27,  -80,  -133,  -183,  -232,
--279,  -322,  -362,  -398,  -429,  -456,  -478,  -495,  -506,  -511,  -511,  -506,  -495,  -478,  -456,  -429,  -398,  -362,  -322,  -279,
--232,  -183,  -133,  -80,  -27,  27,  80,  133,  183,  232,  279,  322,  362,  398,  429,  456,  478,  495,  506,  511},
-{511,  502,  485,  459,  426,  385,  338,  284,  226,  165,  100,  33,  -33,  -100,  -165,  -226,  -284,  -338,  -385,  -426,
--459,  -485,  -502,  -511,  -511,  -502,  -485,  -459,  -426,  -385,  -338,  -284,  -226,  -165,  -100,  -33,  33,  100,  165,  226,
-284,  338,  385,  426,  459,  485,  502,  511,  511,  502,  485,  459,  426,  385,  338,  284,  226,  165,  100,  33},
-{510,  498,  473,  437,  389,  333,  268,  196,  120,  40,  -40,  -120,  -196,  -268,  -333,  -389,  -437,  -473,  -498,  -510,
--510,  -498,  -473,  -437,  -389,  -333,  -268,  -196,  -120,  -40,  40,  120,  196,  268,  333,  389,  437,  473,  498,  510,
-510,  498,  473,  437,  389,  333,  268,  196,  120,  40,  -40,  -120,  -196,  -268,  -333,  -389,  -437,  -473,  -498,  -510}
-};
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_coding/codecs/isac/main/source/spectrum_ar_model_tables.h b/submodules/libtgvoip/webrtc_dsp/modules/audio_coding/codecs/isac/main/source/spectrum_ar_model_tables.h
deleted file mode 100644
index d272be0dc3..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_coding/codecs/isac/main/source/spectrum_ar_model_tables.h
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- *  Copyright (c) 2011 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-/*
- * spectrum_ar_model_tables.h
- *
- * This file contains definitions of tables with AR coefficients,
- * Gain coefficients and cosine tables.
- *
- */
-
-#ifndef MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_SPECTRUM_AR_MODEL_TABLES_H_
-#define MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_SPECTRUM_AR_MODEL_TABLES_H_
-
-#include "modules/audio_coding/codecs/isac/main/source/structs.h"
-
-#define NUM_AR_RC_QUANT_BAUNDARY 12
-
-/********************* AR Coefficient Tables ************************/
-/* cdf for quantized reflection coefficient 1 */
-extern const uint16_t WebRtcIsac_kQArRc1Cdf[NUM_AR_RC_QUANT_BAUNDARY];
-
-/* cdf for quantized reflection coefficient 2 */
-extern const uint16_t WebRtcIsac_kQArRc2Cdf[NUM_AR_RC_QUANT_BAUNDARY];
-
-/* cdf for quantized reflection coefficient 3 */
-extern const uint16_t WebRtcIsac_kQArRc3Cdf[NUM_AR_RC_QUANT_BAUNDARY];
-
-/* cdf for quantized reflection coefficient 4 */
-extern const uint16_t WebRtcIsac_kQArRc4Cdf[NUM_AR_RC_QUANT_BAUNDARY];
-
-/* cdf for quantized reflection coefficient 5 */
-extern const uint16_t WebRtcIsac_kQArRc5Cdf[NUM_AR_RC_QUANT_BAUNDARY];
-
-/* cdf for quantized reflection coefficient 6 */
-extern const uint16_t WebRtcIsac_kQArRc6Cdf[NUM_AR_RC_QUANT_BAUNDARY];
-
-/* quantization boundary levels for reflection coefficients */
-extern const int16_t WebRtcIsac_kQArBoundaryLevels[NUM_AR_RC_QUANT_BAUNDARY];
-
-/* initial indices for AR reflection coefficient quantizer and cdf table search
- */
-extern const uint16_t WebRtcIsac_kQArRcInitIndex[AR_ORDER];
-
-/* pointers to AR cdf tables */
-extern const uint16_t* WebRtcIsac_kQArRcCdfPtr[AR_ORDER];
-
-/* pointers to AR representation levels tables */
-extern const int16_t* WebRtcIsac_kQArRcLevelsPtr[AR_ORDER];
-
-/******************** GAIN Coefficient Tables ***********************/
-/* cdf for Gain coefficient */
-extern const uint16_t WebRtcIsac_kQGainCdf[19];
-
-/* representation levels for quantized Gain coefficient */
-extern const int32_t WebRtcIsac_kQGain2Levels[18];
-
-/* squared quantization boundary levels for Gain coefficient */
-extern const int32_t WebRtcIsac_kQGain2BoundaryLevels[19];
-
-/* pointer to Gain cdf table */
-extern const uint16_t* WebRtcIsac_kQGainCdf_ptr[1];
-
-/* Gain initial index for gain quantizer and cdf table search */
-extern const uint16_t WebRtcIsac_kQGainInitIndex[1];
-
-/************************* Cosine Tables ****************************/
-/* Cosine table */
-extern const int16_t WebRtcIsac_kCos[6][60];
-
-#endif /* MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_SPECTRUM_AR_MODEL_TABLES_H_ \
-        */
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_coding/codecs/isac/main/source/structs.h b/submodules/libtgvoip/webrtc_dsp/modules/audio_coding/codecs/isac/main/source/structs.h
deleted file mode 100644
index 1255d5b16c..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_coding/codecs/isac/main/source/structs.h
+++ /dev/null
@@ -1,448 +0,0 @@
-/*
- *  Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-/*
- * structs.h
- *
- * This header file contains all the structs used in the ISAC codec
- *
- */
-
-#ifndef MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_STRUCTS_H_
-#define MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_STRUCTS_H_
-
-#include "modules/audio_coding/codecs/isac/bandwidth_info.h"
-#include "modules/audio_coding/codecs/isac/main/source/settings.h"
-#include "modules/third_party/fft/fft.h"
-
-typedef struct Bitstreamstruct {
-  uint8_t stream[STREAM_SIZE_MAX];
-  uint32_t W_upper;
-  uint32_t streamval;
-  uint32_t stream_index;
-
-} Bitstr;
-
-typedef struct {
-  double DataBufferLo[WINLEN];
-  double DataBufferHi[WINLEN];
-
-  double CorrBufLo[ORDERLO + 1];
-  double CorrBufHi[ORDERHI + 1];
-
-  float PreStateLoF[ORDERLO + 1];
-  float PreStateLoG[ORDERLO + 1];
-  float PreStateHiF[ORDERHI + 1];
-  float PreStateHiG[ORDERHI + 1];
-  float PostStateLoF[ORDERLO + 1];
-  float PostStateLoG[ORDERLO + 1];
-  float PostStateHiF[ORDERHI + 1];
-  float PostStateHiG[ORDERHI + 1];
-
-  double OldEnergy;
-
-} MaskFiltstr;
-
-typedef struct {
-  // state vectors for each of the two analysis filters
-  double INSTAT1[2 * (QORDER - 1)];
-  double INSTAT2[2 * (QORDER - 1)];
-  double INSTATLA1[2 * (QORDER - 1)];
-  double INSTATLA2[2 * (QORDER - 1)];
-  double INLABUF1[QLOOKAHEAD];
-  double INLABUF2[QLOOKAHEAD];
-
-  float INSTAT1_float[2 * (QORDER - 1)];
-  float INSTAT2_float[2 * (QORDER - 1)];
-  float INSTATLA1_float[2 * (QORDER - 1)];
-  float INSTATLA2_float[2 * (QORDER - 1)];
-  float INLABUF1_float[QLOOKAHEAD];
-  float INLABUF2_float[QLOOKAHEAD];
-
-  /* High pass filter */
-  double HPstates[HPORDER];
-  float HPstates_float[HPORDER];
-
-} PreFiltBankstr;
-
-typedef struct {
-  // state vectors for each of the two analysis filters
-  double STATE_0_LOWER[2 * POSTQORDER];
-  double STATE_0_UPPER[2 * POSTQORDER];
-
-  /* High pass filter */
-  double HPstates1[HPORDER];
-  double HPstates2[HPORDER];
-
-  float STATE_0_LOWER_float[2 * POSTQORDER];
-  float STATE_0_UPPER_float[2 * POSTQORDER];
-
-  float HPstates1_float[HPORDER];
-  float HPstates2_float[HPORDER];
-
-} PostFiltBankstr;
-
-typedef struct {
-  // data buffer for pitch filter
-  double ubuf[PITCH_BUFFSIZE];
-
-  // low pass state vector
-  double ystate[PITCH_DAMPORDER];
-
-  // old lag and gain
-  double oldlagp[1];
-  double oldgainp[1];
-
-} PitchFiltstr;
-
-typedef struct {
-  // data buffer
-  double buffer[PITCH_WLPCBUFLEN];
-
-  // state vectors
-  double istate[PITCH_WLPCORDER];
-  double weostate[PITCH_WLPCORDER];
-  double whostate[PITCH_WLPCORDER];
-
-  // LPC window   -> should be a global array because constant
-  double window[PITCH_WLPCWINLEN];
-
-} WeightFiltstr;
-
-typedef struct {
-  // for inital estimator
-  double dec_buffer[PITCH_CORR_LEN2 + PITCH_CORR_STEP2 + PITCH_MAX_LAG / 2 -
-                    PITCH_FRAME_LEN / 2 + 2];
-  double decimator_state[2 * ALLPASSSECTIONS + 1];
-  double hp_state[2];
-
-  double whitened_buf[QLOOKAHEAD];
-
-  double inbuf[QLOOKAHEAD];
-
-  PitchFiltstr PFstr_wght;
-  PitchFiltstr PFstr;
-  WeightFiltstr Wghtstr;
-
-} PitchAnalysisStruct;
-
-/* Have instance of struct together with other iSAC structs */
-typedef struct {
-  /* Previous frame length (in ms)                                    */
-  int32_t prev_frame_length;
-
-  /* Previous RTP timestamp from received
-     packet (in samples relative beginning)                           */
-  int32_t prev_rec_rtp_number;
-
-  /* Send timestamp for previous packet (in ms using timeGetTime())   */
-  uint32_t prev_rec_send_ts;
-
-  /* Arrival time for previous packet (in ms using timeGetTime())     */
-  uint32_t prev_rec_arr_ts;
-
-  /* rate of previous packet, derived from RTP timestamps (in bits/s) */
-  float prev_rec_rtp_rate;
-
-  /* Time sinse the last update of the BN estimate (in ms)            */
-  uint32_t last_update_ts;
-
-  /* Time sinse the last reduction (in ms)                            */
-  uint32_t last_reduction_ts;
-
-  /* How many times the estimate was update in the beginning          */
-  int32_t count_tot_updates_rec;
-
-  /* The estimated bottle neck rate from there to here (in bits/s)    */
-  int32_t rec_bw;
-  float rec_bw_inv;
-  float rec_bw_avg;
-  float rec_bw_avg_Q;
-
-  /* The estimated mean absolute jitter value,
-     as seen on this side (in ms)                                     */
-  float rec_jitter;
-  float rec_jitter_short_term;
-  float rec_jitter_short_term_abs;
-  float rec_max_delay;
-  float rec_max_delay_avg_Q;
-
-  /* (assumed) bitrate for headers (bps)                              */
-  float rec_header_rate;
-
-  /* The estimated bottle neck rate from here to there (in bits/s)    */
-  float send_bw_avg;
-
-  /* The estimated mean absolute jitter value, as seen on
-     the other siee (in ms)                                           */
-  float send_max_delay_avg;
-
-  // number of packets received since last update
-  int num_pkts_rec;
-
-  int num_consec_rec_pkts_over_30k;
-
-  // flag for marking that a high speed network has been
-  // detected downstream
-  int hsn_detect_rec;
-
-  int num_consec_snt_pkts_over_30k;
-
-  // flag for marking that a high speed network has
-  // been detected upstream
-  int hsn_detect_snd;
-
-  uint32_t start_wait_period;
-
-  int in_wait_period;
-
-  int change_to_WB;
-
-  uint32_t senderTimestamp;
-  uint32_t receiverTimestamp;
-  // enum IsacSamplingRate incomingStreamSampFreq;
-  uint16_t numConsecLatePkts;
-  float consecLatency;
-  int16_t inWaitLatePkts;
-
-  IsacBandwidthInfo external_bw_info;
-} BwEstimatorstr;
-
-typedef struct {
-  /* boolean, flags if previous packet exceeded B.N. */
-  int PrevExceed;
-  /* ms */
-  int ExceedAgo;
-  /* packets left to send in current burst */
-  int BurstCounter;
-  /* packets */
-  int InitCounter;
-  /* ms remaining in buffer when next packet will be sent */
-  double StillBuffered;
-
-} RateModel;
-
-/* The following strutc is used to store data from encoding, to make it
-   fast and easy to construct a new bitstream with a different Bandwidth
-   estimate. All values (except framelength and minBytes) is double size to
-   handle 60 ms of data.
-*/
-typedef struct {
-  /* Used to keep track of if it is first or second part of 60 msec packet */
-  int startIdx;
-
-  /* Frame length in samples */
-  int16_t framelength;
-
-  /* Pitch Gain */
-  int pitchGain_index[2];
-
-  /* Pitch Lag */
-  double meanGain[2];
-  int pitchIndex[PITCH_SUBFRAMES * 2];
-
-  /* LPC */
-  int LPCindex_s[108 * 2]; /* KLT_ORDER_SHAPE = 108 */
-  int LPCindex_g[12 * 2];  /* KLT_ORDER_GAIN = 12 */
-  double LPCcoeffs_lo[(ORDERLO + 1) * SUBFRAMES * 2];
-  double LPCcoeffs_hi[(ORDERHI + 1) * SUBFRAMES * 2];
-
-  /* Encode Spec */
-  int16_t fre[FRAMESAMPLES];
-  int16_t fim[FRAMESAMPLES];
-  int16_t AvgPitchGain[2];
-
-  /* Used in adaptive mode only */
-  int minBytes;
-
-} IsacSaveEncoderData;
-
-typedef struct {
-  int indexLPCShape[UB_LPC_ORDER * UB16_LPC_VEC_PER_FRAME];
-  double lpcGain[SUBFRAMES << 1];
-  int lpcGainIndex[SUBFRAMES << 1];
-
-  Bitstr bitStreamObj;
-
-  int16_t realFFT[FRAMESAMPLES_HALF];
-  int16_t imagFFT[FRAMESAMPLES_HALF];
-} ISACUBSaveEncDataStruct;
-
-typedef struct {
-  Bitstr bitstr_obj;
-  MaskFiltstr maskfiltstr_obj;
-  PreFiltBankstr prefiltbankstr_obj;
-  PitchFiltstr pitchfiltstr_obj;
-  PitchAnalysisStruct pitchanalysisstr_obj;
-  FFTstr fftstr_obj;
-  IsacSaveEncoderData SaveEnc_obj;
-
-  int buffer_index;
-  int16_t current_framesamples;
-
-  float data_buffer_float[FRAMESAMPLES_30ms];
-
-  int frame_nb;
-  double bottleneck;
-  int16_t new_framelength;
-  double s2nr;
-
-  /* Maximum allowed number of bits for a 30 msec packet */
-  int16_t payloadLimitBytes30;
-  /* Maximum allowed number of bits for a 30 msec packet */
-  int16_t payloadLimitBytes60;
-  /* Maximum allowed number of bits for both 30 and 60 msec packet */
-  int16_t maxPayloadBytes;
-  /* Maximum allowed rate in bytes per 30 msec packet */
-  int16_t maxRateInBytes;
-
-  /*---
-    If set to 1 iSAC will not addapt the frame-size, if used in
-    channel-adaptive mode. The initial value will be used for all rates.
-    ---*/
-  int16_t enforceFrameSize;
-
-  /*-----
-    This records the BWE index the encoder injected into the bit-stream.
-    It will be used in RCU. The same BWE index of main payload will be in
-    the redundant payload. We can not retrive it from BWE because it is
-    a recursive procedure (WebRtcIsac_GetDownlinkBwJitIndexImpl) and has to be
-    called only once per each encode.
-    -----*/
-  int16_t lastBWIdx;
-} ISACLBEncStruct;
-
-typedef struct {
-  Bitstr bitstr_obj;
-  MaskFiltstr maskfiltstr_obj;
-  PreFiltBankstr prefiltbankstr_obj;
-  FFTstr fftstr_obj;
-  ISACUBSaveEncDataStruct SaveEnc_obj;
-
-  int buffer_index;
-  float data_buffer_float[MAX_FRAMESAMPLES + LB_TOTAL_DELAY_SAMPLES];
-  double bottleneck;
-  /* Maximum allowed number of bits for a 30 msec packet */
-  // int16_t        payloadLimitBytes30;
-  /* Maximum allowed number of bits for both 30 and 60 msec packet */
-  // int16_t        maxPayloadBytes;
-  int16_t maxPayloadSizeBytes;
-
-  double lastLPCVec[UB_LPC_ORDER];
-  int16_t numBytesUsed;
-  int16_t lastJitterInfo;
-} ISACUBEncStruct;
-
-typedef struct {
-  Bitstr bitstr_obj;
-  MaskFiltstr maskfiltstr_obj;
-  PostFiltBankstr postfiltbankstr_obj;
-  PitchFiltstr pitchfiltstr_obj;
-  FFTstr fftstr_obj;
-
-} ISACLBDecStruct;
-
-typedef struct {
-  Bitstr bitstr_obj;
-  MaskFiltstr maskfiltstr_obj;
-  PostFiltBankstr postfiltbankstr_obj;
-  FFTstr fftstr_obj;
-
-} ISACUBDecStruct;
-
-typedef struct {
-  ISACLBEncStruct ISACencLB_obj;
-  ISACLBDecStruct ISACdecLB_obj;
-} ISACLBStruct;
-
-typedef struct {
-  ISACUBEncStruct ISACencUB_obj;
-  ISACUBDecStruct ISACdecUB_obj;
-} ISACUBStruct;
-
-/*
-  This struct is used to take a snapshot of the entropy coder and LPC gains
-  right before encoding LPC gains. This allows us to go back to that state
-  if we like to limit the payload size.
-*/
-typedef struct {
-  /* 6 lower-band & 6 upper-band */
-  double loFiltGain[SUBFRAMES];
-  double hiFiltGain[SUBFRAMES];
-  /* Upper boundary of interval W */
-  uint32_t W_upper;
-  uint32_t streamval;
-  /* Index to the current position in bytestream */
-  uint32_t stream_index;
-  uint8_t stream[3];
-} transcode_obj;
-
-typedef struct {
-  // TODO(kwiberg): The size of these tables could be reduced by storing floats
-  // instead of doubles, and by making use of the identity cos(x) =
-  // sin(x+pi/2). They could also be made global constants that we fill in at
-  // compile time.
-  double costab1[FRAMESAMPLES_HALF];
-  double sintab1[FRAMESAMPLES_HALF];
-  double costab2[FRAMESAMPLES_QUARTER];
-  double sintab2[FRAMESAMPLES_QUARTER];
-} TransformTables;
-
-typedef struct {
-  // lower-band codec instance
-  ISACLBStruct instLB;
-  // upper-band codec instance
-  ISACUBStruct instUB;
-
-  // Bandwidth Estimator and model for the rate.
-  BwEstimatorstr bwestimator_obj;
-  RateModel rate_data_obj;
-  double MaxDelay;
-
-  /* 0 = adaptive; 1 = instantaneous */
-  int16_t codingMode;
-
-  // overall bottleneck of the codec
-  int32_t bottleneck;
-
-  // QMF Filter state
-  int32_t analysisFBState1[FB_STATE_SIZE_WORD32];
-  int32_t analysisFBState2[FB_STATE_SIZE_WORD32];
-  int32_t synthesisFBState1[FB_STATE_SIZE_WORD32];
-  int32_t synthesisFBState2[FB_STATE_SIZE_WORD32];
-
-  // Error Code
-  int16_t errorCode;
-
-  // bandwidth of the encoded audio 8, 12 or 16 kHz
-  enum ISACBandwidth bandwidthKHz;
-  // Sampling rate of audio, encoder and decode,  8 or 16 kHz
-  enum IsacSamplingRate encoderSamplingRateKHz;
-  enum IsacSamplingRate decoderSamplingRateKHz;
-  // Flag to keep track of initializations, lower & upper-band
-  // encoder and decoder.
-  int16_t initFlag;
-
-  // Flag to to indicate signal bandwidth switch
-  int16_t resetFlag_8kHz;
-
-  // Maximum allowed rate, measured in Bytes per 30 ms.
-  int16_t maxRateBytesPer30Ms;
-  // Maximum allowed payload-size, measured in Bytes.
-  int16_t maxPayloadSizeBytes;
-  /* The expected sampling rate of the input signal. Valid values are 16000
-   * and 32000. This is not the operation sampling rate of the codec. */
-  uint16_t in_sample_rate_hz;
-
-  // Trig tables for WebRtcIsac_Time2Spec and WebRtcIsac_Spec2time.
-  TransformTables transform_tables;
-} ISACMainStruct;
-
-#endif /* MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_STRUCTS_H_ */
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_coding/codecs/isac/main/source/transform.c b/submodules/libtgvoip/webrtc_dsp/modules/audio_coding/codecs/isac/main/source/transform.c
deleted file mode 100644
index 082ad941c4..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_coding/codecs/isac/main/source/transform.c
+++ /dev/null
@@ -1,126 +0,0 @@
-/*
- *  Copyright (c) 2011 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#include <math.h>
-
-#include "modules/audio_coding/codecs/isac/main/source/settings.h"
-#include "modules/audio_coding/codecs/isac/main/source/codec.h"
-#include "modules/audio_coding/codecs/isac/main/source/os_specific_inline.h"
-#include "modules/third_party/fft/fft.h"
-
-void WebRtcIsac_InitTransform(TransformTables* tables) {
-  int k;
-  double fact, phase;
-
-  fact = PI / (FRAMESAMPLES_HALF);
-  phase = 0.0;
-  for (k = 0; k < FRAMESAMPLES_HALF; k++) {
-    tables->costab1[k] = cos(phase);
-    tables->sintab1[k] = sin(phase);
-    phase += fact;
-  }
-
-  fact = PI * ((double) (FRAMESAMPLES_HALF - 1)) / ((double) FRAMESAMPLES_HALF);
-  phase = 0.5 * fact;
-  for (k = 0; k < FRAMESAMPLES_QUARTER; k++) {
-    tables->costab2[k] = cos(phase);
-    tables->sintab2[k] = sin(phase);
-    phase += fact;
-  }
-}
-
-void WebRtcIsac_Time2Spec(const TransformTables* tables,
-                          double* inre1,
-                          double* inre2,
-                          int16_t* outreQ7,
-                          int16_t* outimQ7,
-                          FFTstr* fftstr_obj) {
-  int k;
-  int dims[1];
-  double tmp1r, tmp1i, xr, xi, yr, yi, fact;
-  double tmpre[FRAMESAMPLES_HALF], tmpim[FRAMESAMPLES_HALF];
-
-
-  dims[0] = FRAMESAMPLES_HALF;
-
-
-  /* Multiply with complex exponentials and combine into one complex vector */
-  fact = 0.5 / sqrt(FRAMESAMPLES_HALF);
-  for (k = 0; k < FRAMESAMPLES_HALF; k++) {
-    tmp1r = tables->costab1[k];
-    tmp1i = tables->sintab1[k];
-    tmpre[k] = (inre1[k] * tmp1r + inre2[k] * tmp1i) * fact;
-    tmpim[k] = (inre2[k] * tmp1r - inre1[k] * tmp1i) * fact;
-  }
-
-
-  /* Get DFT */
-  WebRtcIsac_Fftns(1, dims, tmpre, tmpim, -1, 1.0, fftstr_obj);
-
-  /* Use symmetry to separate into two complex vectors and center frames in time around zero */
-  for (k = 0; k < FRAMESAMPLES_QUARTER; k++) {
-    xr = tmpre[k] + tmpre[FRAMESAMPLES_HALF - 1 - k];
-    yi = -tmpre[k] + tmpre[FRAMESAMPLES_HALF - 1 - k];
-    xi = tmpim[k] - tmpim[FRAMESAMPLES_HALF - 1 - k];
-    yr = tmpim[k] + tmpim[FRAMESAMPLES_HALF - 1 - k];
-
-    tmp1r = tables->costab2[k];
-    tmp1i = tables->sintab2[k];
-    outreQ7[k] = (int16_t)WebRtcIsac_lrint((xr * tmp1r - xi * tmp1i) * 128.0);
-    outimQ7[k] = (int16_t)WebRtcIsac_lrint((xr * tmp1i + xi * tmp1r) * 128.0);
-    outreQ7[FRAMESAMPLES_HALF - 1 - k] = (int16_t)WebRtcIsac_lrint((-yr * tmp1i - yi * tmp1r) * 128.0);
-    outimQ7[FRAMESAMPLES_HALF - 1 - k] = (int16_t)WebRtcIsac_lrint((-yr * tmp1r + yi * tmp1i) * 128.0);
-  }
-}
-
-void WebRtcIsac_Spec2time(const TransformTables* tables,
-                          double* inre,
-                          double* inim,
-                          double* outre1,
-                          double* outre2,
-                          FFTstr* fftstr_obj) {
-  int k;
-  double tmp1r, tmp1i, xr, xi, yr, yi, fact;
-
-  int dims;
-
-  dims = FRAMESAMPLES_HALF;
-
-  for (k = 0; k < FRAMESAMPLES_QUARTER; k++) {
-    /* Move zero in time to beginning of frames */
-    tmp1r = tables->costab2[k];
-    tmp1i = tables->sintab2[k];
-    xr = inre[k] * tmp1r + inim[k] * tmp1i;
-    xi = inim[k] * tmp1r - inre[k] * tmp1i;
-    yr = -inim[FRAMESAMPLES_HALF - 1 - k] * tmp1r - inre[FRAMESAMPLES_HALF - 1 - k] * tmp1i;
-    yi = -inre[FRAMESAMPLES_HALF - 1 - k] * tmp1r + inim[FRAMESAMPLES_HALF - 1 - k] * tmp1i;
-
-    /* Combine into one vector,  z = x + j * y */
-    outre1[k] = xr - yi;
-    outre1[FRAMESAMPLES_HALF - 1 - k] = xr + yi;
-    outre2[k] = xi + yr;
-    outre2[FRAMESAMPLES_HALF - 1 - k] = -xi + yr;
-  }
-
-
-  /* Get IDFT */
-  WebRtcIsac_Fftns(1, &dims, outre1, outre2, 1, FRAMESAMPLES_HALF, fftstr_obj);
-
-
-  /* Demodulate and separate */
-  fact = sqrt(FRAMESAMPLES_HALF);
-  for (k = 0; k < FRAMESAMPLES_HALF; k++) {
-    tmp1r = tables->costab1[k];
-    tmp1i = tables->sintab1[k];
-    xr = (outre1[k] * tmp1r - outre2[k] * tmp1i) * fact;
-    outre2[k] = (outre2[k] * tmp1r + outre1[k] * tmp1i) * fact;
-    outre1[k] = xr;
-  }
-}
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec/aec_common.h b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec/aec_common.h
deleted file mode 100644
index ac1f339456..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec/aec_common.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- *  Copyright (c) 2014 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#ifndef MODULES_AUDIO_PROCESSING_AEC_AEC_COMMON_H_
-#define MODULES_AUDIO_PROCESSING_AEC_AEC_COMMON_H_
-
-#ifdef _MSC_VER /* visual c++ */
-#define ALIGN16_BEG __declspec(align(16))
-#define ALIGN16_END
-#else /* gcc or icc */
-#define ALIGN16_BEG
-#define ALIGN16_END __attribute__((aligned(16)))
-#endif
-
-#ifdef __cplusplus
-namespace webrtc {
-#endif
-
-extern ALIGN16_BEG const float ALIGN16_END WebRtcAec_sqrtHanning[65];
-extern ALIGN16_BEG const float ALIGN16_END WebRtcAec_weightCurve[65];
-extern ALIGN16_BEG const float ALIGN16_END WebRtcAec_overDriveCurve[65];
-extern const float WebRtcAec_kExtendedSmoothingCoefficients[2][2];
-extern const float WebRtcAec_kNormalSmoothingCoefficients[2][2];
-extern const float WebRtcAec_kMinFarendPSD;
-
-#ifdef __cplusplus
-}  // namespace webrtc
-#endif
-
-#endif  // MODULES_AUDIO_PROCESSING_AEC_AEC_COMMON_H_
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec/aec_core.cc b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec/aec_core.cc
deleted file mode 100644
index ea1d7635b8..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec/aec_core.cc
+++ /dev/null
@@ -1,2042 +0,0 @@
-/*
- *  Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-/*
- * The core AEC algorithm, which is presented with time-aligned signals.
- */
-
-#include "modules/audio_processing/aec/aec_core.h"
-
-#include <math.h>
-#include <stddef.h>  // size_t
-#include <stdlib.h>
-#include <string.h>
-#include <algorithm>
-
-#include "rtc_base/checks.h"
-
-extern "C" {
-#include "common_audio/ring_buffer.h"
-}
-#include "common_audio/signal_processing/include/signal_processing_library.h"
-#include "modules/audio_processing/aec/aec_common.h"
-#include "modules/audio_processing/aec/aec_core_optimized_methods.h"
-#include "modules/audio_processing/logging/apm_data_dumper.h"
-#include "modules/audio_processing/utility/delay_estimator_wrapper.h"
-#include "rtc_base/system/arch.h"
-#include "system_wrappers/include/cpu_features_wrapper.h"
-#include "system_wrappers/include/metrics.h"
-
-namespace webrtc {
-namespace {
-enum class DelaySource {
-  kSystemDelay,    // The delay values come from the OS.
-  kDelayAgnostic,  // The delay values come from the DA-AEC.
-};
-
-constexpr int kMinDelayLogValue = -200;
-constexpr int kMaxDelayLogValue = 200;
-constexpr int kNumDelayLogBuckets = 100;
-
-void MaybeLogDelayAdjustment(int moved_ms, DelaySource source) {
-  if (moved_ms == 0)
-    return;
-  switch (source) {
-    case DelaySource::kSystemDelay:
-      RTC_HISTOGRAM_COUNTS("WebRTC.Audio.AecDelayAdjustmentMsSystemValue",
-                           moved_ms, kMinDelayLogValue, kMaxDelayLogValue,
-                           kNumDelayLogBuckets);
-      return;
-    case DelaySource::kDelayAgnostic:
-      RTC_HISTOGRAM_COUNTS("WebRTC.Audio.AecDelayAdjustmentMsAgnosticValue",
-                           moved_ms, kMinDelayLogValue, kMaxDelayLogValue,
-                           kNumDelayLogBuckets);
-      return;
-  }
-}
-}  // namespace
-
-// Buffer size (samples)
-static const size_t kBufferSizeBlocks = 250;  // 1 second of audio in 16 kHz.
-
-// Metrics
-static const size_t kSubCountLen = 4;
-static const size_t kCountLen = 50;
-static const int kDelayMetricsAggregationWindow = 1250;  // 5 seconds at 16 kHz.
-
-// Divergence metric is based on audio level, which gets updated every
-// |kSubCountLen + 1| * PART_LEN samples. Divergence metric takes the statistics
-// of |kDivergentFilterFractionAggregationWindowSize| audio levels. The
-// following value corresponds to 1 second at 16 kHz.
-static const int kDivergentFilterFractionAggregationWindowSize = 50;
-
-// Quantities to control H band scaling for SWB input
-static const float cnScaleHband = 0.4f;  // scale for comfort noise in H band.
-// Initial bin for averaging nlp gain in low band
-static const int freqAvgIc = PART_LEN / 2;
-
-// Matlab code to produce table:
-// win = sqrt(hanning(63)); win = [0 ; win(1:32)];
-// fprintf(1, '\t%.14f, %.14f, %.14f,\n', win);
-ALIGN16_BEG const float ALIGN16_END WebRtcAec_sqrtHanning[65] = {
-    0.00000000000000f, 0.02454122852291f, 0.04906767432742f, 0.07356456359967f,
-    0.09801714032956f, 0.12241067519922f, 0.14673047445536f, 0.17096188876030f,
-    0.19509032201613f, 0.21910124015687f, 0.24298017990326f, 0.26671275747490f,
-    0.29028467725446f, 0.31368174039889f, 0.33688985339222f, 0.35989503653499f,
-    0.38268343236509f, 0.40524131400499f, 0.42755509343028f, 0.44961132965461f,
-    0.47139673682600f, 0.49289819222978f, 0.51410274419322f, 0.53499761988710f,
-    0.55557023301960f, 0.57580819141785f, 0.59569930449243f, 0.61523159058063f,
-    0.63439328416365f, 0.65317284295378f, 0.67155895484702f, 0.68954054473707f,
-    0.70710678118655f, 0.72424708295147f, 0.74095112535496f, 0.75720884650648f,
-    0.77301045336274f, 0.78834642762661f, 0.80320753148064f, 0.81758481315158f,
-    0.83146961230255f, 0.84485356524971f, 0.85772861000027f, 0.87008699110871f,
-    0.88192126434835f, 0.89322430119552f, 0.90398929312344f, 0.91420975570353f,
-    0.92387953251129f, 0.93299279883474f, 0.94154406518302f, 0.94952818059304f,
-    0.95694033573221f, 0.96377606579544f, 0.97003125319454f, 0.97570213003853f,
-    0.98078528040323f, 0.98527764238894f, 0.98917650996478f, 0.99247953459871f,
-    0.99518472667220f, 0.99729045667869f, 0.99879545620517f, 0.99969881869620f,
-    1.00000000000000f};
-
-// Matlab code to produce table:
-// weightCurve = [0 ; 0.3 * sqrt(linspace(0,1,64))' + 0.1];
-// fprintf(1, '\t%.4f, %.4f, %.4f, %.4f, %.4f, %.4f,\n', weightCurve);
-ALIGN16_BEG const float ALIGN16_END WebRtcAec_weightCurve[65] = {
-    0.0000f, 0.1000f, 0.1378f, 0.1535f, 0.1655f, 0.1756f, 0.1845f, 0.1926f,
-    0.2000f, 0.2069f, 0.2134f, 0.2195f, 0.2254f, 0.2309f, 0.2363f, 0.2414f,
-    0.2464f, 0.2512f, 0.2558f, 0.2604f, 0.2648f, 0.2690f, 0.2732f, 0.2773f,
-    0.2813f, 0.2852f, 0.2890f, 0.2927f, 0.2964f, 0.3000f, 0.3035f, 0.3070f,
-    0.3104f, 0.3138f, 0.3171f, 0.3204f, 0.3236f, 0.3268f, 0.3299f, 0.3330f,
-    0.3360f, 0.3390f, 0.3420f, 0.3449f, 0.3478f, 0.3507f, 0.3535f, 0.3563f,
-    0.3591f, 0.3619f, 0.3646f, 0.3673f, 0.3699f, 0.3726f, 0.3752f, 0.3777f,
-    0.3803f, 0.3828f, 0.3854f, 0.3878f, 0.3903f, 0.3928f, 0.3952f, 0.3976f,
-    0.4000f};
-
-// Matlab code to produce table:
-// overDriveCurve = [sqrt(linspace(0,1,65))' + 1];
-// fprintf(1, '\t%.4f, %.4f, %.4f, %.4f, %.4f, %.4f,\n', overDriveCurve);
-ALIGN16_BEG const float ALIGN16_END WebRtcAec_overDriveCurve[65] = {
-    1.0000f, 1.1250f, 1.1768f, 1.2165f, 1.2500f, 1.2795f, 1.3062f, 1.3307f,
-    1.3536f, 1.3750f, 1.3953f, 1.4146f, 1.4330f, 1.4507f, 1.4677f, 1.4841f,
-    1.5000f, 1.5154f, 1.5303f, 1.5449f, 1.5590f, 1.5728f, 1.5863f, 1.5995f,
-    1.6124f, 1.6250f, 1.6374f, 1.6495f, 1.6614f, 1.6731f, 1.6847f, 1.6960f,
-    1.7071f, 1.7181f, 1.7289f, 1.7395f, 1.7500f, 1.7603f, 1.7706f, 1.7806f,
-    1.7906f, 1.8004f, 1.8101f, 1.8197f, 1.8292f, 1.8385f, 1.8478f, 1.8570f,
-    1.8660f, 1.8750f, 1.8839f, 1.8927f, 1.9014f, 1.9100f, 1.9186f, 1.9270f,
-    1.9354f, 1.9437f, 1.9520f, 1.9601f, 1.9682f, 1.9763f, 1.9843f, 1.9922f,
-    2.0000f};
-
-// Delay Agnostic AEC parameters, still under development and may change.
-static const float kDelayQualityThresholdMax = 0.07f;
-static const float kDelayQualityThresholdMin = 0.01f;
-static const int kInitialShiftOffset = 5;
-#if !defined(WEBRTC_ANDROID)
-static const int kDelayCorrectionStart = 1500;  // 10 ms chunks
-#endif
-
-// Target suppression levels for nlp modes.
-// log{0.001, 0.00001, 0.00000001}
-static const float kTargetSupp[3] = {-6.9f, -11.5f, -18.4f};
-
-// Two sets of parameters, one for the extended filter mode.
-static const float kExtendedMinOverDrive[3] = {3.0f, 6.0f, 15.0f};
-static const float kNormalMinOverDrive[3] = {1.0f, 2.0f, 5.0f};
-const float WebRtcAec_kExtendedSmoothingCoefficients[2][2] = {{0.9f, 0.1f},
-                                                              {0.92f, 0.08f}};
-const float WebRtcAec_kNormalSmoothingCoefficients[2][2] = {{0.9f, 0.1f},
-                                                            {0.93f, 0.07f}};
-
-// Number of partitions forming the NLP's "preferred" bands.
-enum { kPrefBandSize = 24 };
-
-WebRtcAecFilterFar WebRtcAec_FilterFar;
-WebRtcAecScaleErrorSignal WebRtcAec_ScaleErrorSignal;
-WebRtcAecFilterAdaptation WebRtcAec_FilterAdaptation;
-WebRtcAecOverdrive WebRtcAec_Overdrive;
-WebRtcAecSuppress WebRtcAec_Suppress;
-WebRtcAecComputeCoherence WebRtcAec_ComputeCoherence;
-WebRtcAecUpdateCoherenceSpectra WebRtcAec_UpdateCoherenceSpectra;
-WebRtcAecStoreAsComplex WebRtcAec_StoreAsComplex;
-WebRtcAecPartitionDelay WebRtcAec_PartitionDelay;
-WebRtcAecWindowData WebRtcAec_WindowData;
-
-__inline static float MulRe(float aRe, float aIm, float bRe, float bIm) {
-  return aRe * bRe - aIm * bIm;
-}
-
-__inline static float MulIm(float aRe, float aIm, float bRe, float bIm) {
-  return aRe * bIm + aIm * bRe;
-}
-
-// TODO(minyue): Due to a legacy bug, |framelevel| and |averagelevel| use a
-// window, of which the length is 1 unit longer than indicated. Remove "+1" when
-// the code is refactored.
-PowerLevel::PowerLevel()
-    : framelevel(kSubCountLen + 1), averagelevel(kCountLen + 1) {}
-
-BlockBuffer::BlockBuffer() {
-  buffer_ = WebRtc_CreateBuffer(kBufferSizeBlocks, sizeof(float) * PART_LEN);
-  RTC_CHECK(buffer_);
-  ReInit();
-}
-
-BlockBuffer::~BlockBuffer() {
-  WebRtc_FreeBuffer(buffer_);
-}
-
-void BlockBuffer::ReInit() {
-  WebRtc_InitBuffer(buffer_);
-}
-
-void BlockBuffer::Insert(const float block[PART_LEN]) {
-  WebRtc_WriteBuffer(buffer_, block, 1);
-}
-
-void BlockBuffer::ExtractExtendedBlock(float extended_block[PART_LEN2]) {
-  float* block_ptr = NULL;
-  RTC_DCHECK_LT(0, AvaliableSpace());
-
-  // Extract the previous block.
-  WebRtc_MoveReadPtr(buffer_, -1);
-  size_t read_elements = WebRtc_ReadBuffer(
-      buffer_, reinterpret_cast<void**>(&block_ptr), &extended_block[0], 1);
-  if (read_elements == 0u) {
-    std::fill_n(&extended_block[0], PART_LEN, 0.0f);
-  } else if (block_ptr != &extended_block[0]) {
-    memcpy(&extended_block[0], block_ptr, PART_LEN * sizeof(float));
-  }
-
-  // Extract the current block.
-  read_elements =
-      WebRtc_ReadBuffer(buffer_, reinterpret_cast<void**>(&block_ptr),
-                        &extended_block[PART_LEN], 1);
-  if (read_elements == 0u) {
-    std::fill_n(&extended_block[PART_LEN], PART_LEN, 0.0f);
-  } else if (block_ptr != &extended_block[PART_LEN]) {
-    memcpy(&extended_block[PART_LEN], block_ptr, PART_LEN * sizeof(float));
-  }
-}
-
-int BlockBuffer::AdjustSize(int buffer_size_decrease) {
-  return WebRtc_MoveReadPtr(buffer_, buffer_size_decrease);
-}
-
-size_t BlockBuffer::Size() {
-  return static_cast<int>(WebRtc_available_read(buffer_));
-}
-
-size_t BlockBuffer::AvaliableSpace() {
-  return WebRtc_available_write(buffer_);
-}
-
-DivergentFilterFraction::DivergentFilterFraction()
-    : count_(0), occurrence_(0), fraction_(-1.0) {}
-
-void DivergentFilterFraction::Reset() {
-  Clear();
-  fraction_ = -1.0;
-}
-
-void DivergentFilterFraction::AddObservation(const PowerLevel& nearlevel,
-                                             const PowerLevel& linoutlevel,
-                                             const PowerLevel& nlpoutlevel) {
-  const float near_level = nearlevel.framelevel.GetLatestMean();
-  const float level_increase =
-      linoutlevel.framelevel.GetLatestMean() - near_level;
-  const bool output_signal_active =
-      nlpoutlevel.framelevel.GetLatestMean() > 40.0 * nlpoutlevel.minlevel;
-  // Level increase should be, in principle, negative, when the filter
-  // does not diverge. Here we allow some margin (0.01 * near end level) and
-  // numerical error (1.0). We count divergence only when the AEC output
-  // signal is active.
-  if (output_signal_active && level_increase > std::max(0.01 * near_level, 1.0))
-    occurrence_++;
-  ++count_;
-  if (count_ == kDivergentFilterFractionAggregationWindowSize) {
-    fraction_ = static_cast<float>(occurrence_) /
-                kDivergentFilterFractionAggregationWindowSize;
-    Clear();
-  }
-}
-
-float DivergentFilterFraction::GetLatestFraction() const {
-  return fraction_;
-}
-
-void DivergentFilterFraction::Clear() {
-  count_ = 0;
-  occurrence_ = 0;
-}
-
-// TODO(minyue): Moving some initialization from WebRtcAec_CreateAec() to ctor.
-AecCore::AecCore(int instance_index)
-    : data_dumper(new ApmDataDumper(instance_index)) {}
-
-AecCore::~AecCore() {}
-
-static int CmpFloat(const void* a, const void* b) {
-  const float* da = (const float*)a;
-  const float* db = (const float*)b;
-
-  return (*da > *db) - (*da < *db);
-}
-
-static void FilterFar(int num_partitions,
-                      int x_fft_buf_block_pos,
-                      float x_fft_buf[2][kExtendedNumPartitions * PART_LEN1],
-                      float h_fft_buf[2][kExtendedNumPartitions * PART_LEN1],
-                      float y_fft[2][PART_LEN1]) {
-  int i;
-  for (i = 0; i < num_partitions; i++) {
-    int j;
-    int xPos = (i + x_fft_buf_block_pos) * PART_LEN1;
-    int pos = i * PART_LEN1;
-    // Check for wrap
-    if (i + x_fft_buf_block_pos >= num_partitions) {
-      xPos -= num_partitions * (PART_LEN1);
-    }
-
-    for (j = 0; j < PART_LEN1; j++) {
-      y_fft[0][j] += MulRe(x_fft_buf[0][xPos + j], x_fft_buf[1][xPos + j],
-                           h_fft_buf[0][pos + j], h_fft_buf[1][pos + j]);
-      y_fft[1][j] += MulIm(x_fft_buf[0][xPos + j], x_fft_buf[1][xPos + j],
-                           h_fft_buf[0][pos + j], h_fft_buf[1][pos + j]);
-    }
-  }
-}
-
-static void ScaleErrorSignal(float mu,
-                             float error_threshold,
-                             float x_pow[PART_LEN1],
-                             float ef[2][PART_LEN1]) {
-  int i;
-  float abs_ef;
-  for (i = 0; i < (PART_LEN1); i++) {
-    ef[0][i] /= (x_pow[i] + 1e-10f);
-    ef[1][i] /= (x_pow[i] + 1e-10f);
-    abs_ef = sqrtf(ef[0][i] * ef[0][i] + ef[1][i] * ef[1][i]);
-
-    if (abs_ef > error_threshold) {
-      abs_ef = error_threshold / (abs_ef + 1e-10f);
-      ef[0][i] *= abs_ef;
-      ef[1][i] *= abs_ef;
-    }
-
-    // Stepsize factor
-    ef[0][i] *= mu;
-    ef[1][i] *= mu;
-  }
-}
-
-static void FilterAdaptation(
-    const OouraFft& ooura_fft,
-    int num_partitions,
-    int x_fft_buf_block_pos,
-    float x_fft_buf[2][kExtendedNumPartitions * PART_LEN1],
-    float e_fft[2][PART_LEN1],
-    float h_fft_buf[2][kExtendedNumPartitions * PART_LEN1]) {
-  int i, j;
-  float fft[PART_LEN2];
-  for (i = 0; i < num_partitions; i++) {
-    int xPos = (i + x_fft_buf_block_pos) * (PART_LEN1);
-    int pos;
-    // Check for wrap
-    if (i + x_fft_buf_block_pos >= num_partitions) {
-      xPos -= num_partitions * PART_LEN1;
-    }
-
-    pos = i * PART_LEN1;
-
-    for (j = 0; j < PART_LEN; j++) {
-      fft[2 * j] = MulRe(x_fft_buf[0][xPos + j], -x_fft_buf[1][xPos + j],
-                         e_fft[0][j], e_fft[1][j]);
-      fft[2 * j + 1] = MulIm(x_fft_buf[0][xPos + j], -x_fft_buf[1][xPos + j],
-                             e_fft[0][j], e_fft[1][j]);
-    }
-    fft[1] =
-        MulRe(x_fft_buf[0][xPos + PART_LEN], -x_fft_buf[1][xPos + PART_LEN],
-              e_fft[0][PART_LEN], e_fft[1][PART_LEN]);
-
-    ooura_fft.InverseFft(fft);
-    memset(fft + PART_LEN, 0, sizeof(float) * PART_LEN);
-
-    // fft scaling
-    {
-      float scale = 2.0f / PART_LEN2;
-      for (j = 0; j < PART_LEN; j++) {
-        fft[j] *= scale;
-      }
-    }
-    ooura_fft.Fft(fft);
-
-    h_fft_buf[0][pos] += fft[0];
-    h_fft_buf[0][pos + PART_LEN] += fft[1];
-
-    for (j = 1; j < PART_LEN; j++) {
-      h_fft_buf[0][pos + j] += fft[2 * j];
-      h_fft_buf[1][pos + j] += fft[2 * j + 1];
-    }
-  }
-}
-
-static void Overdrive(float overdrive_scaling,
-                      const float hNlFb,
-                      float hNl[PART_LEN1]) {
-  for (int i = 0; i < PART_LEN1; ++i) {
-    // Weight subbands
-    if (hNl[i] > hNlFb) {
-      hNl[i] = WebRtcAec_weightCurve[i] * hNlFb +
-               (1 - WebRtcAec_weightCurve[i]) * hNl[i];
-    }
-    hNl[i] = powf(hNl[i], overdrive_scaling * WebRtcAec_overDriveCurve[i]);
-  }
-}
-
-static void Suppress(const float hNl[PART_LEN1], float efw[2][PART_LEN1]) {
-  for (int i = 0; i < PART_LEN1; ++i) {
-    // Suppress error signal
-    efw[0][i] *= hNl[i];
-    efw[1][i] *= hNl[i];
-
-    // Ooura fft returns incorrect sign on imaginary component. It matters here
-    // because we are making an additive change with comfort noise.
-    efw[1][i] *= -1;
-  }
-}
-
-static int PartitionDelay(
-    int num_partitions,
-    float h_fft_buf[2][kExtendedNumPartitions * PART_LEN1]) {
-  // Measures the energy in each filter partition and returns the partition with
-  // highest energy.
-  // TODO(bjornv): Spread computational cost by computing one partition per
-  // block?
-  float wfEnMax = 0;
-  int i;
-  int delay = 0;
-
-  for (i = 0; i < num_partitions; i++) {
-    int j;
-    int pos = i * PART_LEN1;
-    float wfEn = 0;
-    for (j = 0; j < PART_LEN1; j++) {
-      wfEn += h_fft_buf[0][pos + j] * h_fft_buf[0][pos + j] +
-              h_fft_buf[1][pos + j] * h_fft_buf[1][pos + j];
-    }
-
-    if (wfEn > wfEnMax) {
-      wfEnMax = wfEn;
-      delay = i;
-    }
-  }
-  return delay;
-}
-
-// Update metric with 10 * log10(numerator / denominator).
-static void UpdateLogRatioMetric(Stats* metric,
-                                 float numerator,
-                                 float denominator) {
-  RTC_DCHECK(metric);
-  RTC_CHECK(numerator >= 0);
-  RTC_CHECK(denominator >= 0);
-
-  const float log_numerator = log10(numerator + 1e-10f);
-  const float log_denominator = log10(denominator + 1e-10f);
-  metric->instant = 10.0f * (log_numerator - log_denominator);
-
-  // Max.
-  if (metric->instant > metric->max)
-    metric->max = metric->instant;
-
-  // Min.
-  if (metric->instant < metric->min)
-    metric->min = metric->instant;
-
-  // Average.
-  metric->counter++;
-  // This is to protect overflow, which should almost never happen.
-  RTC_CHECK_NE(0, metric->counter);
-  metric->sum += metric->instant;
-  metric->average = metric->sum / metric->counter;
-
-  // Upper mean.
-  if (metric->instant > metric->average) {
-    metric->hicounter++;
-    // This is to protect overflow, which should almost never happen.
-    RTC_CHECK_NE(0, metric->hicounter);
-    metric->hisum += metric->instant;
-    metric->himean = metric->hisum / metric->hicounter;
-  }
-}
-
-// Threshold to protect against the ill-effects of a zero far-end.
-const float WebRtcAec_kMinFarendPSD = 15;
-
-// Updates the following smoothed Power Spectral Densities (PSD):
-//  - sd  : near-end
-//  - se  : residual echo
-//  - sx  : far-end
-//  - sde : cross-PSD of near-end and residual echo
-//  - sxd : cross-PSD of near-end and far-end
-//
-// In addition to updating the PSDs, also the filter diverge state is
-// determined.
-static void UpdateCoherenceSpectra(int mult,
-                                   bool extended_filter_enabled,
-                                   float efw[2][PART_LEN1],
-                                   float dfw[2][PART_LEN1],
-                                   float xfw[2][PART_LEN1],
-                                   CoherenceState* coherence_state,
-                                   short* filter_divergence_state,
-                                   int* extreme_filter_divergence) {
-  // Power estimate smoothing coefficients.
-  const float* ptrGCoh =
-      extended_filter_enabled
-          ? WebRtcAec_kExtendedSmoothingCoefficients[mult - 1]
-          : WebRtcAec_kNormalSmoothingCoefficients[mult - 1];
-  int i;
-  float sdSum = 0, seSum = 0;
-
-  for (i = 0; i < PART_LEN1; i++) {
-    coherence_state->sd[i] =
-        ptrGCoh[0] * coherence_state->sd[i] +
-        ptrGCoh[1] * (dfw[0][i] * dfw[0][i] + dfw[1][i] * dfw[1][i]);
-    coherence_state->se[i] =
-        ptrGCoh[0] * coherence_state->se[i] +
-        ptrGCoh[1] * (efw[0][i] * efw[0][i] + efw[1][i] * efw[1][i]);
-    // We threshold here to protect against the ill-effects of a zero farend.
-    // The threshold is not arbitrarily chosen, but balances protection and
-    // adverse interaction with the algorithm's tuning.
-    // TODO(bjornv): investigate further why this is so sensitive.
-    coherence_state->sx[i] =
-        ptrGCoh[0] * coherence_state->sx[i] +
-        ptrGCoh[1] *
-            WEBRTC_SPL_MAX(xfw[0][i] * xfw[0][i] + xfw[1][i] * xfw[1][i],
-                           WebRtcAec_kMinFarendPSD);
-
-    coherence_state->sde[i][0] =
-        ptrGCoh[0] * coherence_state->sde[i][0] +
-        ptrGCoh[1] * (dfw[0][i] * efw[0][i] + dfw[1][i] * efw[1][i]);
-    coherence_state->sde[i][1] =
-        ptrGCoh[0] * coherence_state->sde[i][1] +
-        ptrGCoh[1] * (dfw[0][i] * efw[1][i] - dfw[1][i] * efw[0][i]);
-
-    coherence_state->sxd[i][0] =
-        ptrGCoh[0] * coherence_state->sxd[i][0] +
-        ptrGCoh[1] * (dfw[0][i] * xfw[0][i] + dfw[1][i] * xfw[1][i]);
-    coherence_state->sxd[i][1] =
-        ptrGCoh[0] * coherence_state->sxd[i][1] +
-        ptrGCoh[1] * (dfw[0][i] * xfw[1][i] - dfw[1][i] * xfw[0][i]);
-
-    sdSum += coherence_state->sd[i];
-    seSum += coherence_state->se[i];
-  }
-
-  // Divergent filter safeguard update.
-  *filter_divergence_state =
-      (*filter_divergence_state ? 1.05f : 1.0f) * seSum > sdSum;
-
-  // Signal extreme filter divergence if the error is significantly larger
-  // than the nearend (13 dB).
-  *extreme_filter_divergence = (seSum > (19.95f * sdSum));
-}
-
-// Window time domain data to be used by the fft.
-__inline static void WindowData(float* x_windowed, const float* x) {
-  int i;
-  for (i = 0; i < PART_LEN; i++) {
-    x_windowed[i] = x[i] * WebRtcAec_sqrtHanning[i];
-    x_windowed[PART_LEN + i] =
-        x[PART_LEN + i] * WebRtcAec_sqrtHanning[PART_LEN - i];
-  }
-}
-
-// Puts fft output data into a complex valued array.
-__inline static void StoreAsComplex(const float* data,
-                                    float data_complex[2][PART_LEN1]) {
-  int i;
-  data_complex[0][0] = data[0];
-  data_complex[1][0] = 0;
-  for (i = 1; i < PART_LEN; i++) {
-    data_complex[0][i] = data[2 * i];
-    data_complex[1][i] = data[2 * i + 1];
-  }
-  data_complex[0][PART_LEN] = data[1];
-  data_complex[1][PART_LEN] = 0;
-}
-
-static void ComputeCoherence(const CoherenceState* coherence_state,
-                             float* cohde,
-                             float* cohxd) {
-  // Subband coherence
-  for (int i = 0; i < PART_LEN1; i++) {
-    cohde[i] = (coherence_state->sde[i][0] * coherence_state->sde[i][0] +
-                coherence_state->sde[i][1] * coherence_state->sde[i][1]) /
-               (coherence_state->sd[i] * coherence_state->se[i] + 1e-10f);
-    cohxd[i] = (coherence_state->sxd[i][0] * coherence_state->sxd[i][0] +
-                coherence_state->sxd[i][1] * coherence_state->sxd[i][1]) /
-               (coherence_state->sx[i] * coherence_state->sd[i] + 1e-10f);
-  }
-}
-
-static void GetHighbandGain(const float* lambda, float* nlpGainHband) {
-  int i;
-
-  *nlpGainHband = 0.0f;
-  for (i = freqAvgIc; i < PART_LEN1 - 1; i++) {
-    *nlpGainHband += lambda[i];
-  }
-  *nlpGainHband /= static_cast<float>(PART_LEN1 - 1 - freqAvgIc);
-}
-
-static void GenerateComplexNoise(uint32_t* seed, float noise[2][PART_LEN1]) {
-  const float kPi2 = 6.28318530717959f;
-  int16_t randW16[PART_LEN];
-  WebRtcSpl_RandUArray(randW16, PART_LEN, seed);
-
-  noise[0][0] = 0;
-  noise[1][0] = 0;
-  for (size_t i = 1; i < PART_LEN1; i++) {
-    float tmp = kPi2 * randW16[i - 1] / 32768.f;
-    noise[0][i] = cosf(tmp);
-    noise[1][i] = -sinf(tmp);
-  }
-  noise[1][PART_LEN] = 0;
-}
-
-static void ComfortNoise(bool generate_high_frequency_noise,
-                         uint32_t* seed,
-                         float e_fft[2][PART_LEN1],
-                         float high_frequency_comfort_noise[2][PART_LEN1],
-                         const float* noise_spectrum,
-                         const float* suppressor_gain) {
-  float complex_noise[2][PART_LEN1];
-
-  GenerateComplexNoise(seed, complex_noise);
-
-  // Shape, scale and add comfort noise.
-  for (int i = 1; i < PART_LEN1; ++i) {
-    float noise_scaling =
-        sqrtf(WEBRTC_SPL_MAX(1 - suppressor_gain[i] * suppressor_gain[i], 0)) *
-        sqrtf(noise_spectrum[i]);
-    e_fft[0][i] += noise_scaling * complex_noise[0][i];
-    e_fft[1][i] += noise_scaling * complex_noise[1][i];
-  }
-
-  // Form comfort noise for higher frequencies.
-  if (generate_high_frequency_noise) {
-    // Compute average noise power and nlp gain over the second half of freq
-    // spectrum (i.e., 4->8khz).
-    int start_avg_band = PART_LEN1 / 2;
-    float upper_bands_noise_power = 0.f;
-    float upper_bands_suppressor_gain = 0.f;
-    for (int i = start_avg_band; i < PART_LEN1; ++i) {
-      upper_bands_noise_power += sqrtf(noise_spectrum[i]);
-      upper_bands_suppressor_gain +=
-          sqrtf(WEBRTC_SPL_MAX(1 - suppressor_gain[i] * suppressor_gain[i], 0));
-    }
-    upper_bands_noise_power /= (PART_LEN1 - start_avg_band);
-    upper_bands_suppressor_gain /= (PART_LEN1 - start_avg_band);
-
-    // Shape, scale and add comfort noise.
-    float noise_scaling = upper_bands_suppressor_gain * upper_bands_noise_power;
-    high_frequency_comfort_noise[0][0] = 0;
-    high_frequency_comfort_noise[1][0] = 0;
-    for (int i = 1; i < PART_LEN1; ++i) {
-      high_frequency_comfort_noise[0][i] = noise_scaling * complex_noise[0][i];
-      high_frequency_comfort_noise[1][i] = noise_scaling * complex_noise[1][i];
-    }
-    high_frequency_comfort_noise[1][PART_LEN] = 0;
-  } else {
-    memset(high_frequency_comfort_noise, 0,
-           2 * PART_LEN1 * sizeof(high_frequency_comfort_noise[0][0]));
-  }
-}
-
-static void InitLevel(PowerLevel* level) {
-  const float kBigFloat = 1E17f;
-  level->averagelevel.Reset();
-  level->framelevel.Reset();
-  level->minlevel = kBigFloat;
-}
-
-static void InitStats(Stats* stats) {
-  stats->instant = kOffsetLevel;
-  stats->average = kOffsetLevel;
-  stats->max = kOffsetLevel;
-  stats->min = kOffsetLevel * (-1);
-  stats->sum = 0;
-  stats->hisum = 0;
-  stats->himean = kOffsetLevel;
-  stats->counter = 0;
-  stats->hicounter = 0;
-}
-
-static void InitMetrics(AecCore* self) {
-  self->stateCounter = 0;
-  InitLevel(&self->farlevel);
-  InitLevel(&self->nearlevel);
-  InitLevel(&self->linoutlevel);
-  InitLevel(&self->nlpoutlevel);
-
-  InitStats(&self->erl);
-  InitStats(&self->erle);
-  InitStats(&self->aNlp);
-  InitStats(&self->rerl);
-
-  self->divergent_filter_fraction.Reset();
-}
-
-static float CalculatePower(const float* in, size_t num_samples) {
-  size_t k;
-  float energy = 0.0f;
-
-  for (k = 0; k < num_samples; ++k) {
-    energy += in[k] * in[k];
-  }
-  return energy / num_samples;
-}
-
-static void UpdateLevel(PowerLevel* level, float power) {
-  level->framelevel.AddValue(power);
-  if (level->framelevel.EndOfBlock()) {
-    const float new_frame_level = level->framelevel.GetLatestMean();
-    if (new_frame_level > 0) {
-      if (new_frame_level < level->minlevel) {
-        level->minlevel = new_frame_level;  // New minimum.
-      } else {
-        level->minlevel *= (1 + 0.001f);  // Small increase.
-      }
-    }
-    level->averagelevel.AddValue(new_frame_level);
-  }
-}
-
-static void UpdateMetrics(AecCore* aec) {
-  const float actThresholdNoisy = 8.0f;
-  const float actThresholdClean = 40.0f;
-
-  const float noisyPower = 300000.0f;
-
-  float actThreshold;
-
-  if (aec->echoState) {  // Check if echo is likely present
-    aec->stateCounter++;
-  }
-
-  if (aec->linoutlevel.framelevel.EndOfBlock()) {
-    aec->divergent_filter_fraction.AddObservation(
-        aec->nearlevel, aec->linoutlevel, aec->nlpoutlevel);
-  }
-
-  if (aec->farlevel.averagelevel.EndOfBlock()) {
-    if (aec->farlevel.minlevel < noisyPower) {
-      actThreshold = actThresholdClean;
-    } else {
-      actThreshold = actThresholdNoisy;
-    }
-
-    const float far_average_level = aec->farlevel.averagelevel.GetLatestMean();
-
-    // The last condition is to let estimation be made in active far-end
-    // segments only.
-    if ((aec->stateCounter > (0.5f * kCountLen * kSubCountLen)) &&
-        (aec->farlevel.framelevel.EndOfBlock()) &&
-        (far_average_level > (actThreshold * aec->farlevel.minlevel))) {
-      // ERL: error return loss.
-      const float near_average_level =
-          aec->nearlevel.averagelevel.GetLatestMean();
-      UpdateLogRatioMetric(&aec->erl, far_average_level, near_average_level);
-
-      // A_NLP: error return loss enhanced before the nonlinear suppression.
-      const float linout_average_level =
-          aec->linoutlevel.averagelevel.GetLatestMean();
-      UpdateLogRatioMetric(&aec->aNlp, near_average_level,
-                           linout_average_level);
-
-      // ERLE: error return loss enhanced.
-      const float nlpout_average_level =
-          aec->nlpoutlevel.averagelevel.GetLatestMean();
-      UpdateLogRatioMetric(&aec->erle, near_average_level,
-                           nlpout_average_level);
-    }
-
-    aec->stateCounter = 0;
-  }
-}
-
-static void UpdateDelayMetrics(AecCore* self) {
-  int i = 0;
-  int delay_values = 0;
-  int median = 0;
-  int lookahead = WebRtc_lookahead(self->delay_estimator);
-  const int kMsPerBlock = PART_LEN / (self->mult * 8);
-  int64_t l1_norm = 0;
-
-  if (self->num_delay_values == 0) {
-    // We have no new delay value data. Even though -1 is a valid |median| in
-    // the sense that we allow negative values, it will practically never be
-    // used since multiples of |kMsPerBlock| will always be returned.
-    // We therefore use -1 to indicate in the logs that the delay estimator was
-    // not able to estimate the delay.
-    self->delay_median = -1;
-    self->delay_std = -1;
-    self->fraction_poor_delays = -1;
-    return;
-  }
-
-  // Start value for median count down.
-  delay_values = self->num_delay_values >> 1;
-  // Get median of delay values since last update.
-  for (i = 0; i < kHistorySizeBlocks; i++) {
-    delay_values -= self->delay_histogram[i];
-    if (delay_values < 0) {
-      median = i;
-      break;
-    }
-  }
-  // Account for lookahead.
-  self->delay_median = (median - lookahead) * kMsPerBlock;
-
-  // Calculate the L1 norm, with median value as central moment.
-  for (i = 0; i < kHistorySizeBlocks; i++) {
-    l1_norm += abs(i - median) * self->delay_histogram[i];
-  }
-  self->delay_std = static_cast<int>((l1_norm + self->num_delay_values / 2) /
-                                     self->num_delay_values) *
-                    kMsPerBlock;
-
-  // Determine fraction of delays that are out of bounds, that is, either
-  // negative (anti-causal system) or larger than the AEC filter length.
-  {
-    int num_delays_out_of_bounds = self->num_delay_values;
-    const int histogram_length =
-        sizeof(self->delay_histogram) / sizeof(self->delay_histogram[0]);
-    for (i = lookahead; i < lookahead + self->num_partitions; ++i) {
-      if (i < histogram_length)
-        num_delays_out_of_bounds -= self->delay_histogram[i];
-    }
-    self->fraction_poor_delays =
-        static_cast<float>(num_delays_out_of_bounds) / self->num_delay_values;
-  }
-
-  // Reset histogram.
-  memset(self->delay_histogram, 0, sizeof(self->delay_histogram));
-  self->num_delay_values = 0;
-}
-
-static void ScaledInverseFft(const OouraFft& ooura_fft,
-                             float freq_data[2][PART_LEN1],
-                             float time_data[PART_LEN2],
-                             float scale,
-                             int conjugate) {
-  int i;
-  const float normalization = scale / static_cast<float>(PART_LEN2);
-  const float sign = (conjugate ? -1 : 1);
-  time_data[0] = freq_data[0][0] * normalization;
-  time_data[1] = freq_data[0][PART_LEN] * normalization;
-  for (i = 1; i < PART_LEN; i++) {
-    time_data[2 * i] = freq_data[0][i] * normalization;
-    time_data[2 * i + 1] = sign * freq_data[1][i] * normalization;
-  }
-  ooura_fft.InverseFft(time_data);
-}
-
-static void Fft(const OouraFft& ooura_fft,
-                float time_data[PART_LEN2],
-                float freq_data[2][PART_LEN1]) {
-  int i;
-  ooura_fft.Fft(time_data);
-
-  // Reorder fft output data.
-  freq_data[1][0] = 0;
-  freq_data[1][PART_LEN] = 0;
-  freq_data[0][0] = time_data[0];
-  freq_data[0][PART_LEN] = time_data[1];
-  for (i = 1; i < PART_LEN; i++) {
-    freq_data[0][i] = time_data[2 * i];
-    freq_data[1][i] = time_data[2 * i + 1];
-  }
-}
-
-static int SignalBasedDelayCorrection(AecCore* self) {
-  int delay_correction = 0;
-  int last_delay = -2;
-  RTC_DCHECK(self);
-#if !defined(WEBRTC_ANDROID)
-  // On desktops, turn on correction after |kDelayCorrectionStart| frames.  This
-  // is to let the delay estimation get a chance to converge.  Also, if the
-  // playout audio volume is low (or even muted) the delay estimation can return
-  // a very large delay, which will break the AEC if it is applied.
-  if (self->frame_count < kDelayCorrectionStart) {
-    self->data_dumper->DumpRaw("aec_da_reported_delay", 1, &last_delay);
-    return 0;
-  }
-#endif
-
-  // 1. Check for non-negative delay estimate.  Note that the estimates we get
-  //    from the delay estimation are not compensated for lookahead.  Hence, a
-  //    negative |last_delay| is an invalid one.
-  // 2. Verify that there is a delay change.  In addition, only allow a change
-  //    if the delay is outside a certain region taking the AEC filter length
-  //    into account.
-  // TODO(bjornv): Investigate if we can remove the non-zero delay change check.
-  // 3. Only allow delay correction if the delay estimation quality exceeds
-  //    |delay_quality_threshold|.
-  // 4. Finally, verify that the proposed |delay_correction| is feasible by
-  //    comparing with the size of the far-end buffer.
-  last_delay = WebRtc_last_delay(self->delay_estimator);
-  self->data_dumper->DumpRaw("aec_da_reported_delay", 1, &last_delay);
-  if ((last_delay >= 0) && (last_delay != self->previous_delay) &&
-      (WebRtc_last_delay_quality(self->delay_estimator) >
-       self->delay_quality_threshold)) {
-    int delay = last_delay - WebRtc_lookahead(self->delay_estimator);
-    // Allow for a slack in the actual delay, defined by a |lower_bound| and an
-    // |upper_bound|.  The adaptive echo cancellation filter is currently
-    // |num_partitions| (of 64 samples) long.  If the delay estimate is negative
-    // or at least 3/4 of the filter length we open up for correction.
-    const int lower_bound = 0;
-    const int upper_bound = self->num_partitions * 3 / 4;
-    const int do_correction = delay <= lower_bound || delay > upper_bound;
-    if (do_correction == 1) {
-      int available_read = self->farend_block_buffer_.Size();
-      // With |shift_offset| we gradually rely on the delay estimates.  For
-      // positive delays we reduce the correction by |shift_offset| to lower the
-      // risk of pushing the AEC into a non causal state.  For negative delays
-      // we rely on the values up to a rounding error, hence compensate by 1
-      // element to make sure to push the delay into the causal region.
-      delay_correction = -delay;
-      delay_correction += delay > self->shift_offset ? self->shift_offset : 1;
-      self->shift_offset--;
-      self->shift_offset = (self->shift_offset <= 1 ? 1 : self->shift_offset);
-      if (delay_correction > available_read - self->mult - 1) {
-        // There is not enough data in the buffer to perform this shift.  Hence,
-        // we do not rely on the delay estimate and do nothing.
-        delay_correction = 0;
-      } else {
-        self->previous_delay = last_delay;
-        ++self->delay_correction_count;
-      }
-    }
-  }
-  // Update the |delay_quality_threshold| once we have our first delay
-  // correction.
-  if (self->delay_correction_count > 0) {
-    float delay_quality = WebRtc_last_delay_quality(self->delay_estimator);
-    delay_quality =
-        (delay_quality > kDelayQualityThresholdMax ? kDelayQualityThresholdMax
-                                                   : delay_quality);
-    self->delay_quality_threshold =
-        (delay_quality > self->delay_quality_threshold
-             ? delay_quality
-             : self->delay_quality_threshold);
-  }
-  self->data_dumper->DumpRaw("aec_da_delay_correction", 1, &delay_correction);
-
-  return delay_correction;
-}
-
-static void RegressorPower(
-    int num_partitions,
-    int latest_added_partition,
-    float x_fft_buf[2][kExtendedNumPartitions * PART_LEN1],
-    float x_pow[PART_LEN1]) {
-  RTC_DCHECK_LT(latest_added_partition, num_partitions);
-  memset(x_pow, 0, PART_LEN1 * sizeof(x_pow[0]));
-
-  int partition = latest_added_partition;
-  int x_fft_buf_position = partition * PART_LEN1;
-  for (int i = 0; i < num_partitions; ++i) {
-    for (int bin = 0; bin < PART_LEN1; ++bin) {
-      float re = x_fft_buf[0][x_fft_buf_position];
-      float im = x_fft_buf[1][x_fft_buf_position];
-      x_pow[bin] += re * re + im * im;
-      ++x_fft_buf_position;
-    }
-
-    ++partition;
-    if (partition == num_partitions) {
-      partition = 0;
-      RTC_DCHECK_EQ(num_partitions * PART_LEN1, x_fft_buf_position);
-      x_fft_buf_position = 0;
-    }
-  }
-}
-
-static void EchoSubtraction(
-    const OouraFft& ooura_fft,
-    int num_partitions,
-    int extended_filter_enabled,
-    int* extreme_filter_divergence,
-    float filter_step_size,
-    float error_threshold,
-    float* x_fft,
-    int* x_fft_buf_block_pos,
-    float x_fft_buf[2][kExtendedNumPartitions * PART_LEN1],
-    float* const y,
-    float x_pow[PART_LEN1],
-    float h_fft_buf[2][kExtendedNumPartitions * PART_LEN1],
-    float echo_subtractor_output[PART_LEN]) {
-  float s_fft[2][PART_LEN1];
-  float e_extended[PART_LEN2];
-  float s_extended[PART_LEN2];
-  float* s;
-  float e[PART_LEN];
-  float e_fft[2][PART_LEN1];
-  int i;
-
-  // Update the x_fft_buf block position.
-  (*x_fft_buf_block_pos)--;
-  if ((*x_fft_buf_block_pos) == -1) {
-    *x_fft_buf_block_pos = num_partitions - 1;
-  }
-
-  // Buffer x_fft.
-  memcpy(x_fft_buf[0] + (*x_fft_buf_block_pos) * PART_LEN1, x_fft,
-         sizeof(float) * PART_LEN1);
-  memcpy(x_fft_buf[1] + (*x_fft_buf_block_pos) * PART_LEN1, &x_fft[PART_LEN1],
-         sizeof(float) * PART_LEN1);
-
-  memset(s_fft, 0, sizeof(s_fft));
-
-  // Conditionally reset the echo subtraction filter if the filter has diverged
-  // significantly.
-  if (!extended_filter_enabled && *extreme_filter_divergence) {
-    memset(h_fft_buf, 0,
-           2 * kExtendedNumPartitions * PART_LEN1 * sizeof(h_fft_buf[0][0]));
-    *extreme_filter_divergence = 0;
-  }
-
-  // Produce echo estimate s_fft.
-  WebRtcAec_FilterFar(num_partitions, *x_fft_buf_block_pos, x_fft_buf,
-                      h_fft_buf, s_fft);
-
-  // Compute the time-domain echo estimate s.
-  ScaledInverseFft(ooura_fft, s_fft, s_extended, 2.0f, 0);
-  s = &s_extended[PART_LEN];
-
-  // Compute the time-domain echo prediction error.
-  for (i = 0; i < PART_LEN; ++i) {
-    e[i] = y[i] - s[i];
-  }
-
-  // Compute the frequency domain echo prediction error.
-  memset(e_extended, 0, sizeof(float) * PART_LEN);
-  memcpy(e_extended + PART_LEN, e, sizeof(float) * PART_LEN);
-  Fft(ooura_fft, e_extended, e_fft);
-
-  // Scale error signal inversely with far power.
-  WebRtcAec_ScaleErrorSignal(filter_step_size, error_threshold, x_pow, e_fft);
-  WebRtcAec_FilterAdaptation(ooura_fft, num_partitions, *x_fft_buf_block_pos,
-                             x_fft_buf, e_fft, h_fft_buf);
-  memcpy(echo_subtractor_output, e, sizeof(float) * PART_LEN);
-}
-
-static void FormSuppressionGain(AecCore* aec,
-                                float cohde[PART_LEN1],
-                                float cohxd[PART_LEN1],
-                                float hNl[PART_LEN1]) {
-  float hNlDeAvg, hNlXdAvg;
-  float hNlPref[kPrefBandSize];
-  float hNlFb = 0, hNlFbLow = 0;
-  const int prefBandSize = kPrefBandSize / aec->mult;
-  const float prefBandQuant = 0.75f, prefBandQuantLow = 0.5f;
-  const int minPrefBand = 4 / aec->mult;
-  // Power estimate smoothing coefficients.
-  const float* min_overdrive = aec->extended_filter_enabled
-                                   ? kExtendedMinOverDrive
-                                   : kNormalMinOverDrive;
-
-  hNlXdAvg = 0;
-  for (int i = minPrefBand; i < prefBandSize + minPrefBand; ++i) {
-    hNlXdAvg += cohxd[i];
-  }
-  hNlXdAvg /= prefBandSize;
-  hNlXdAvg = 1 - hNlXdAvg;
-
-  hNlDeAvg = 0;
-  for (int i = minPrefBand; i < prefBandSize + minPrefBand; ++i) {
-    hNlDeAvg += cohde[i];
-  }
-  hNlDeAvg /= prefBandSize;
-
-  if (hNlXdAvg < 0.75f && hNlXdAvg < aec->hNlXdAvgMin) {
-    aec->hNlXdAvgMin = hNlXdAvg;
-  }
-
-  if (hNlDeAvg > 0.98f && hNlXdAvg > 0.9f) {
-    aec->stNearState = 1;
-  } else if (hNlDeAvg < 0.95f || hNlXdAvg < 0.8f) {
-    aec->stNearState = 0;
-  }
-
-  if (aec->hNlXdAvgMin == 1) {
-    aec->echoState = 0;
-    aec->overDrive = min_overdrive[aec->nlp_mode];
-
-    if (aec->stNearState == 1) {
-      memcpy(hNl, cohde, sizeof(hNl[0]) * PART_LEN1);
-      hNlFb = hNlDeAvg;
-      hNlFbLow = hNlDeAvg;
-    } else {
-      for (int i = 0; i < PART_LEN1; ++i) {
-        hNl[i] = 1 - cohxd[i];
-        hNl[i] = std::max(hNl[i], 0.f);
-      }
-      hNlFb = hNlXdAvg;
-      hNlFbLow = hNlXdAvg;
-    }
-  } else {
-    if (aec->stNearState == 1) {
-      aec->echoState = 0;
-      memcpy(hNl, cohde, sizeof(hNl[0]) * PART_LEN1);
-      hNlFb = hNlDeAvg;
-      hNlFbLow = hNlDeAvg;
-    } else {
-      aec->echoState = 1;
-      for (int i = 0; i < PART_LEN1; ++i) {
-        hNl[i] = WEBRTC_SPL_MIN(cohde[i], 1 - cohxd[i]);
-        hNl[i] = std::max(hNl[i], 0.f);
-      }
-
-      // Select an order statistic from the preferred bands.
-      // TODO(peah): Using quicksort now, but a selection algorithm may be
-      // preferred.
-      memcpy(hNlPref, &hNl[minPrefBand], sizeof(float) * prefBandSize);
-      qsort(hNlPref, prefBandSize, sizeof(float), CmpFloat);
-      hNlFb =
-          hNlPref[static_cast<int>(floor(prefBandQuant * (prefBandSize - 1)))];
-      hNlFbLow = hNlPref[static_cast<int>(
-          floor(prefBandQuantLow * (prefBandSize - 1)))];
-    }
-  }
-
-  // Track the local filter minimum to determine suppression overdrive.
-  if (hNlFbLow < 0.6f && hNlFbLow < aec->hNlFbLocalMin) {
-    aec->hNlFbLocalMin = hNlFbLow;
-    aec->hNlFbMin = hNlFbLow;
-    aec->hNlNewMin = 1;
-    aec->hNlMinCtr = 0;
-  }
-  aec->hNlFbLocalMin =
-      WEBRTC_SPL_MIN(aec->hNlFbLocalMin + 0.0008f / aec->mult, 1);
-  aec->hNlXdAvgMin = WEBRTC_SPL_MIN(aec->hNlXdAvgMin + 0.0006f / aec->mult, 1);
-
-  if (aec->hNlNewMin == 1) {
-    aec->hNlMinCtr++;
-  }
-  if (aec->hNlMinCtr == 2) {
-    aec->hNlNewMin = 0;
-    aec->hNlMinCtr = 0;
-    aec->overDrive = WEBRTC_SPL_MAX(
-        kTargetSupp[aec->nlp_mode] /
-            static_cast<float>(log(aec->hNlFbMin + 1e-10f) + 1e-10f),
-        min_overdrive[aec->nlp_mode]);
-  }
-
-  // Smooth the overdrive.
-  if (aec->overDrive < aec->overdrive_scaling) {
-    aec->overdrive_scaling =
-        0.99f * aec->overdrive_scaling + 0.01f * aec->overDrive;
-  } else {
-    aec->overdrive_scaling =
-        0.9f * aec->overdrive_scaling + 0.1f * aec->overDrive;
-  }
-
-  // Apply the overdrive.
-  WebRtcAec_Overdrive(aec->overdrive_scaling, hNlFb, hNl);
-}
-
-static void EchoSuppression(const OouraFft& ooura_fft,
-                            AecCore* aec,
-                            float* nearend_extended_block_lowest_band,
-                            float farend_extended_block[PART_LEN2],
-                            float* echo_subtractor_output,
-                            float output[NUM_HIGH_BANDS_MAX + 1][PART_LEN]) {
-  float efw[2][PART_LEN1];
-  float xfw[2][PART_LEN1];
-  float dfw[2][PART_LEN1];
-  float comfortNoiseHband[2][PART_LEN1];
-  float fft[PART_LEN2];
-  float nlpGainHband;
-  int i;
-  size_t j;
-
-  // Coherence and non-linear filter
-  float cohde[PART_LEN1], cohxd[PART_LEN1];
-  float hNl[PART_LEN1];
-
-  // Filter energy
-  const int delayEstInterval = 10 * aec->mult;
-
-  float* xfw_ptr = NULL;
-
-  // Update eBuf with echo subtractor output.
-  memcpy(aec->eBuf + PART_LEN, echo_subtractor_output,
-         sizeof(float) * PART_LEN);
-
-  // Analysis filter banks for the echo suppressor.
-  // Windowed near-end ffts.
-  WindowData(fft, nearend_extended_block_lowest_band);
-  ooura_fft.Fft(fft);
-  StoreAsComplex(fft, dfw);
-
-  // Windowed echo suppressor output ffts.
-  WindowData(fft, aec->eBuf);
-  ooura_fft.Fft(fft);
-  StoreAsComplex(fft, efw);
-
-  // NLP
-
-  // Convert far-end partition to the frequency domain with windowing.
-  WindowData(fft, farend_extended_block);
-  Fft(ooura_fft, fft, xfw);
-  xfw_ptr = &xfw[0][0];
-
-  // Buffer far.
-  memcpy(aec->xfwBuf, xfw_ptr, sizeof(float) * 2 * PART_LEN1);
-
-  aec->delayEstCtr++;
-  if (aec->delayEstCtr == delayEstInterval) {
-    aec->delayEstCtr = 0;
-    aec->delayIdx = WebRtcAec_PartitionDelay(aec->num_partitions, aec->wfBuf);
-  }
-
-  aec->data_dumper->DumpRaw("aec_nlp_delay", 1, &aec->delayIdx);
-
-  // Use delayed far.
-  memcpy(xfw, aec->xfwBuf + aec->delayIdx * PART_LEN1,
-         sizeof(xfw[0][0]) * 2 * PART_LEN1);
-
-  WebRtcAec_UpdateCoherenceSpectra(aec->mult, aec->extended_filter_enabled == 1,
-                                   efw, dfw, xfw, &aec->coherence_state,
-                                   &aec->divergeState,
-                                   &aec->extreme_filter_divergence);
-
-  WebRtcAec_ComputeCoherence(&aec->coherence_state, cohde, cohxd);
-
-  // Select the microphone signal as output if the filter is deemed to have
-  // diverged.
-  if (aec->divergeState) {
-    memcpy(efw, dfw, sizeof(efw[0][0]) * 2 * PART_LEN1);
-  }
-
-  FormSuppressionGain(aec, cohde, cohxd, hNl);
-
-  aec->data_dumper->DumpRaw("aec_nlp_gain", PART_LEN1, hNl);
-
-  WebRtcAec_Suppress(hNl, efw);
-
-  // Add comfort noise.
-  ComfortNoise(aec->num_bands > 1, &aec->seed, efw, comfortNoiseHband,
-               aec->noisePow, hNl);
-
-  // Inverse error fft.
-  ScaledInverseFft(ooura_fft, efw, fft, 2.0f, 1);
-
-  // Overlap and add to obtain output.
-  for (i = 0; i < PART_LEN; i++) {
-    output[0][i] = (fft[i] * WebRtcAec_sqrtHanning[i] +
-                    aec->outBuf[i] * WebRtcAec_sqrtHanning[PART_LEN - i]);
-
-    // Saturate output to keep it in the allowed range.
-    output[0][i] = WEBRTC_SPL_SAT(WEBRTC_SPL_WORD16_MAX, output[0][i],
-                                  WEBRTC_SPL_WORD16_MIN);
-  }
-  memcpy(aec->outBuf, &fft[PART_LEN], PART_LEN * sizeof(aec->outBuf[0]));
-
-  // For H band
-  if (aec->num_bands > 1) {
-    // H band gain
-    // average nlp over low band: average over second half of freq spectrum
-    // (4->8khz)
-    GetHighbandGain(hNl, &nlpGainHband);
-
-    // Inverse comfort_noise
-    ScaledInverseFft(ooura_fft, comfortNoiseHband, fft, 2.0f, 0);
-
-    // compute gain factor
-    for (j = 1; j < aec->num_bands; ++j) {
-      for (i = 0; i < PART_LEN; i++) {
-        output[j][i] = aec->previous_nearend_block[j][i] * nlpGainHband;
-      }
-    }
-
-    // Add some comfort noise where Hband is attenuated.
-    for (i = 0; i < PART_LEN; i++) {
-      output[1][i] += cnScaleHband * fft[i];
-    }
-
-    // Saturate output to keep it in the allowed range.
-    for (j = 1; j < aec->num_bands; ++j) {
-      for (i = 0; i < PART_LEN; i++) {
-        output[j][i] = WEBRTC_SPL_SAT(WEBRTC_SPL_WORD16_MAX, output[j][i],
-                                      WEBRTC_SPL_WORD16_MIN);
-      }
-    }
-  }
-
-  // Copy the current block to the old position.
-  memcpy(aec->eBuf, aec->eBuf + PART_LEN, sizeof(float) * PART_LEN);
-
-  memmove(aec->xfwBuf + PART_LEN1, aec->xfwBuf,
-          sizeof(aec->xfwBuf) - sizeof(complex_t) * PART_LEN1);
-}
-
-static void ProcessNearendBlock(
-    AecCore* aec,
-    float farend_extended_block_lowest_band[PART_LEN2],
-    float nearend_block[NUM_HIGH_BANDS_MAX + 1][PART_LEN],
-    float output_block[NUM_HIGH_BANDS_MAX + 1][PART_LEN]) {
-  size_t i;
-
-  float fft[PART_LEN2];
-  float nearend_extended_block_lowest_band[PART_LEN2];
-  float farend_fft[2][PART_LEN1];
-  float nearend_fft[2][PART_LEN1];
-  float far_spectrum = 0.0f;
-  float near_spectrum = 0.0f;
-  float abs_far_spectrum[PART_LEN1];
-  float abs_near_spectrum[PART_LEN1];
-
-  const float gPow[2] = {0.9f, 0.1f};
-
-  // Noise estimate constants.
-  const int noiseInitBlocks = 500 * aec->mult;
-  const float step = 0.1f;
-  const float ramp = 1.0002f;
-  const float gInitNoise[2] = {0.999f, 0.001f};
-
-  float echo_subtractor_output[PART_LEN];
-
-  aec->data_dumper->DumpWav("aec_far", PART_LEN,
-                            &farend_extended_block_lowest_band[PART_LEN],
-                            std::min(aec->sampFreq, 16000), 1);
-  aec->data_dumper->DumpWav("aec_near", PART_LEN, &nearend_block[0][0],
-                            std::min(aec->sampFreq, 16000), 1);
-
-  if (aec->metricsMode == 1) {
-    // Update power levels
-    UpdateLevel(
-        &aec->farlevel,
-        CalculatePower(&farend_extended_block_lowest_band[PART_LEN], PART_LEN));
-    UpdateLevel(&aec->nearlevel,
-                CalculatePower(&nearend_block[0][0], PART_LEN));
-  }
-
-  // Convert far-end signal to the frequency domain.
-  memcpy(fft, farend_extended_block_lowest_band, sizeof(float) * PART_LEN2);
-  Fft(aec->ooura_fft, fft, farend_fft);
-
-  // Form extended nearend frame.
-  memcpy(&nearend_extended_block_lowest_band[0],
-         &aec->previous_nearend_block[0][0], sizeof(float) * PART_LEN);
-  memcpy(&nearend_extended_block_lowest_band[PART_LEN], &nearend_block[0][0],
-         sizeof(float) * PART_LEN);
-
-  // Convert near-end signal to the frequency domain.
-  memcpy(fft, nearend_extended_block_lowest_band, sizeof(float) * PART_LEN2);
-  Fft(aec->ooura_fft, fft, nearend_fft);
-
-  // Power smoothing.
-  if (aec->refined_adaptive_filter_enabled) {
-    for (i = 0; i < PART_LEN1; ++i) {
-      far_spectrum = farend_fft[0][i] * farend_fft[0][i] +
-                     farend_fft[1][i] * farend_fft[1][i];
-      // Calculate the magnitude spectrum.
-      abs_far_spectrum[i] = sqrtf(far_spectrum);
-    }
-    RegressorPower(aec->num_partitions, aec->xfBufBlockPos, aec->xfBuf,
-                   aec->xPow);
-  } else {
-    for (i = 0; i < PART_LEN1; ++i) {
-      far_spectrum = farend_fft[0][i] * farend_fft[0][i] +
-                     farend_fft[1][i] * farend_fft[1][i];
-      aec->xPow[i] =
-          gPow[0] * aec->xPow[i] + gPow[1] * aec->num_partitions * far_spectrum;
-      // Calculate the magnitude spectrum.
-      abs_far_spectrum[i] = sqrtf(far_spectrum);
-    }
-  }
-
-  for (i = 0; i < PART_LEN1; ++i) {
-    near_spectrum = nearend_fft[0][i] * nearend_fft[0][i] +
-                    nearend_fft[1][i] * nearend_fft[1][i];
-    aec->dPow[i] = gPow[0] * aec->dPow[i] + gPow[1] * near_spectrum;
-    // Calculate the magnitude spectrum.
-    abs_near_spectrum[i] = sqrtf(near_spectrum);
-  }
-
-  // Estimate noise power. Wait until dPow is more stable.
-  if (aec->noiseEstCtr > 50) {
-    for (i = 0; i < PART_LEN1; i++) {
-      if (aec->dPow[i] < aec->dMinPow[i]) {
-        aec->dMinPow[i] =
-            (aec->dPow[i] + step * (aec->dMinPow[i] - aec->dPow[i])) * ramp;
-      } else {
-        aec->dMinPow[i] *= ramp;
-      }
-    }
-  }
-
-  // Smooth increasing noise power from zero at the start,
-  // to avoid a sudden burst of comfort noise.
-  if (aec->noiseEstCtr < noiseInitBlocks) {
-    aec->noiseEstCtr++;
-    for (i = 0; i < PART_LEN1; i++) {
-      if (aec->dMinPow[i] > aec->dInitMinPow[i]) {
-        aec->dInitMinPow[i] = gInitNoise[0] * aec->dInitMinPow[i] +
-                              gInitNoise[1] * aec->dMinPow[i];
-      } else {
-        aec->dInitMinPow[i] = aec->dMinPow[i];
-      }
-    }
-    aec->noisePow = aec->dInitMinPow;
-  } else {
-    aec->noisePow = aec->dMinPow;
-  }
-
-  // Block wise delay estimation used for logging
-  if (aec->delay_logging_enabled) {
-    if (WebRtc_AddFarSpectrumFloat(aec->delay_estimator_farend,
-                                   abs_far_spectrum, PART_LEN1) == 0) {
-      int delay_estimate = WebRtc_DelayEstimatorProcessFloat(
-          aec->delay_estimator, abs_near_spectrum, PART_LEN1);
-      if (delay_estimate >= 0) {
-        // Update delay estimate buffer.
-        aec->delay_histogram[delay_estimate]++;
-        aec->num_delay_values++;
-      }
-      if (aec->delay_metrics_delivered == 1 &&
-          aec->num_delay_values >= kDelayMetricsAggregationWindow) {
-        UpdateDelayMetrics(aec);
-      }
-    }
-  }
-
-  // Perform echo subtraction.
-  EchoSubtraction(
-      aec->ooura_fft, aec->num_partitions, aec->extended_filter_enabled,
-      &aec->extreme_filter_divergence, aec->filter_step_size,
-      aec->error_threshold, &farend_fft[0][0], &aec->xfBufBlockPos, aec->xfBuf,
-      &nearend_block[0][0], aec->xPow, aec->wfBuf, echo_subtractor_output);
-  aec->data_dumper->DumpRaw("aec_h_fft", PART_LEN1 * aec->num_partitions,
-                            &aec->wfBuf[0][0]);
-  aec->data_dumper->DumpRaw("aec_h_fft", PART_LEN1 * aec->num_partitions,
-                            &aec->wfBuf[1][0]);
-
-  aec->data_dumper->DumpWav("aec_out_linear", PART_LEN, echo_subtractor_output,
-                            std::min(aec->sampFreq, 16000), 1);
-
-  if (aec->metricsMode == 1) {
-    UpdateLevel(&aec->linoutlevel,
-                CalculatePower(echo_subtractor_output, PART_LEN));
-  }
-
-  // Perform echo suppression.
-  EchoSuppression(aec->ooura_fft, aec, nearend_extended_block_lowest_band,
-                  farend_extended_block_lowest_band, echo_subtractor_output,
-                  output_block);
-
-  if (aec->metricsMode == 1) {
-    UpdateLevel(&aec->nlpoutlevel,
-                CalculatePower(&output_block[0][0], PART_LEN));
-    UpdateMetrics(aec);
-  }
-
-  // Store the nearend signal until the next frame.
-  for (i = 0; i < aec->num_bands; ++i) {
-    memcpy(&aec->previous_nearend_block[i][0], &nearend_block[i][0],
-           sizeof(float) * PART_LEN);
-  }
-
-  aec->data_dumper->DumpWav("aec_out", PART_LEN, &output_block[0][0],
-                            std::min(aec->sampFreq, 16000), 1);
-}
-
-AecCore* WebRtcAec_CreateAec(int instance_count) {
-  AecCore* aec = new AecCore(instance_count);
-
-  if (!aec) {
-    return NULL;
-  }
-  aec->nearend_buffer_size = 0;
-  memset(&aec->nearend_buffer[0], 0, sizeof(aec->nearend_buffer));
-  // Start the output buffer with zeros to be able to produce
-  // a full output frame in the first frame.
-  aec->output_buffer_size = PART_LEN - (FRAME_LEN - PART_LEN);
-  memset(&aec->output_buffer[0], 0, sizeof(aec->output_buffer));
-
-  aec->delay_estimator_farend =
-      WebRtc_CreateDelayEstimatorFarend(PART_LEN1, kHistorySizeBlocks);
-  if (aec->delay_estimator_farend == NULL) {
-    WebRtcAec_FreeAec(aec);
-    return NULL;
-  }
-  // We create the delay_estimator with the same amount of maximum lookahead as
-  // the delay history size (kHistorySizeBlocks) for symmetry reasons.
-  aec->delay_estimator = WebRtc_CreateDelayEstimator(
-      aec->delay_estimator_farend, kHistorySizeBlocks);
-  if (aec->delay_estimator == NULL) {
-    WebRtcAec_FreeAec(aec);
-    return NULL;
-  }
-#ifdef WEBRTC_ANDROID
-  aec->delay_agnostic_enabled = 1;  // DA-AEC enabled by default.
-  // DA-AEC assumes the system is causal from the beginning and will self adjust
-  // the lookahead when shifting is required.
-  WebRtc_set_lookahead(aec->delay_estimator, 0);
-#else
-  aec->delay_agnostic_enabled = 0;
-  WebRtc_set_lookahead(aec->delay_estimator, kLookaheadBlocks);
-#endif
-  aec->extended_filter_enabled = 0;
-  aec->refined_adaptive_filter_enabled = false;
-
-  // Assembly optimization
-  WebRtcAec_FilterFar = FilterFar;
-  WebRtcAec_ScaleErrorSignal = ScaleErrorSignal;
-  WebRtcAec_FilterAdaptation = FilterAdaptation;
-  WebRtcAec_Overdrive = Overdrive;
-  WebRtcAec_Suppress = Suppress;
-  WebRtcAec_ComputeCoherence = ComputeCoherence;
-  WebRtcAec_UpdateCoherenceSpectra = UpdateCoherenceSpectra;
-  WebRtcAec_StoreAsComplex = StoreAsComplex;
-  WebRtcAec_PartitionDelay = PartitionDelay;
-  WebRtcAec_WindowData = WindowData;
-
-#if defined(WEBRTC_ARCH_X86_FAMILY)
-  if (WebRtc_GetCPUInfo(kSSE2)) {
-    WebRtcAec_InitAec_SSE2();
-  }
-#endif
-
-#if defined(MIPS_FPU_LE)
-  WebRtcAec_InitAec_mips();
-#endif
-
-#if defined(WEBRTC_ARCH_ARM_FAMILY) && defined(WEBRTC_HAS_NEON)
-  WebRtcAec_InitAec_neon();
-#endif
-
-  return aec;
-}
-
-void WebRtcAec_FreeAec(AecCore* aec) {
-  if (aec == NULL) {
-    return;
-  }
-
-  WebRtc_FreeDelayEstimator(aec->delay_estimator);
-  WebRtc_FreeDelayEstimatorFarend(aec->delay_estimator_farend);
-
-  delete aec;
-}
-
-static void SetAdaptiveFilterStepSize(AecCore* aec) {
-  // Extended filter adaptation parameter.
-  // TODO(ajm): No narrowband tuning yet.
-  const float kExtendedMu = 0.4f;
-
-  if (aec->refined_adaptive_filter_enabled) {
-    aec->filter_step_size = 0.05f;
-  } else {
-    if (aec->extended_filter_enabled) {
-      aec->filter_step_size = kExtendedMu;
-    } else {
-      if (aec->sampFreq == 8000) {
-        aec->filter_step_size = 0.6f;
-      } else {
-        aec->filter_step_size = 0.5f;
-      }
-    }
-  }
-}
-
-static void SetErrorThreshold(AecCore* aec) {
-  // Extended filter adaptation parameter.
-  // TODO(ajm): No narrowband tuning yet.
-  static const float kExtendedErrorThreshold = 1.0e-6f;
-
-  if (aec->extended_filter_enabled) {
-    aec->error_threshold = kExtendedErrorThreshold;
-  } else {
-    if (aec->sampFreq == 8000) {
-      aec->error_threshold = 2e-6f;
-    } else {
-      aec->error_threshold = 1.5e-6f;
-    }
-  }
-}
-
-int WebRtcAec_InitAec(AecCore* aec, int sampFreq) {
-  int i;
-  aec->data_dumper->InitiateNewSetOfRecordings();
-
-  aec->sampFreq = sampFreq;
-
-  SetAdaptiveFilterStepSize(aec);
-  SetErrorThreshold(aec);
-
-  if (sampFreq == 8000) {
-    aec->num_bands = 1;
-  } else {
-    aec->num_bands = (size_t)(sampFreq / 16000);
-  }
-
-  // Start the output buffer with zeros to be able to produce
-  // a full output frame in the first frame.
-  aec->output_buffer_size = PART_LEN - (FRAME_LEN - PART_LEN);
-  memset(&aec->output_buffer[0], 0, sizeof(aec->output_buffer));
-  aec->nearend_buffer_size = 0;
-  memset(&aec->nearend_buffer[0], 0, sizeof(aec->nearend_buffer));
-
-  // Initialize far-end buffer.
-  aec->farend_block_buffer_.ReInit();
-
-  aec->system_delay = 0;
-
-  if (WebRtc_InitDelayEstimatorFarend(aec->delay_estimator_farend) != 0) {
-    return -1;
-  }
-  if (WebRtc_InitDelayEstimator(aec->delay_estimator) != 0) {
-    return -1;
-  }
-  aec->delay_logging_enabled = 0;
-  aec->delay_metrics_delivered = 0;
-  memset(aec->delay_histogram, 0, sizeof(aec->delay_histogram));
-  aec->num_delay_values = 0;
-  aec->delay_median = -1;
-  aec->delay_std = -1;
-  aec->fraction_poor_delays = -1.0f;
-
-  aec->previous_delay = -2;  // (-2): Uninitialized.
-  aec->delay_correction_count = 0;
-  aec->shift_offset = kInitialShiftOffset;
-  aec->delay_quality_threshold = kDelayQualityThresholdMin;
-
-  aec->num_partitions = kNormalNumPartitions;
-
-  // Update the delay estimator with filter length.  We use half the
-  // |num_partitions| to take the echo path into account.  In practice we say
-  // that the echo has a duration of maximum half |num_partitions|, which is not
-  // true, but serves as a crude measure.
-  WebRtc_set_allowed_offset(aec->delay_estimator, aec->num_partitions / 2);
-  // TODO(bjornv): I currently hard coded the enable.  Once we've established
-  // that AECM has no performance regression, robust_validation will be enabled
-  // all the time and the APIs to turn it on/off will be removed.  Hence, remove
-  // this line then.
-  WebRtc_enable_robust_validation(aec->delay_estimator, 1);
-  aec->frame_count = 0;
-
-  // Default target suppression mode.
-  aec->nlp_mode = 1;
-
-  // Sampling frequency multiplier w.r.t. 8 kHz.
-  // In case of multiple bands we process the lower band in 16 kHz, hence the
-  // multiplier is always 2.
-  if (aec->num_bands > 1) {
-    aec->mult = 2;
-  } else {
-    aec->mult = static_cast<int16_t>(aec->sampFreq) / 8000;
-  }
-
-  aec->farBufWritePos = 0;
-  aec->farBufReadPos = 0;
-
-  aec->inSamples = 0;
-  aec->outSamples = 0;
-  aec->knownDelay = 0;
-
-  // Initialize buffers
-  memset(aec->previous_nearend_block, 0, sizeof(aec->previous_nearend_block));
-  memset(aec->eBuf, 0, sizeof(aec->eBuf));
-
-  memset(aec->xPow, 0, sizeof(aec->xPow));
-  memset(aec->dPow, 0, sizeof(aec->dPow));
-  memset(aec->dInitMinPow, 0, sizeof(aec->dInitMinPow));
-  aec->noisePow = aec->dInitMinPow;
-  aec->noiseEstCtr = 0;
-
-  // Initial comfort noise power
-  for (i = 0; i < PART_LEN1; i++) {
-    aec->dMinPow[i] = 1.0e6f;
-  }
-
-  // Holds the last block written to
-  aec->xfBufBlockPos = 0;
-  // TODO(peah): Investigate need for these initializations. Deleting them
-  // doesn't change the output at all and yields 0.4% overall speedup.
-  memset(aec->xfBuf, 0, sizeof(complex_t) * kExtendedNumPartitions * PART_LEN1);
-  memset(aec->wfBuf, 0, sizeof(complex_t) * kExtendedNumPartitions * PART_LEN1);
-  memset(aec->coherence_state.sde, 0, sizeof(complex_t) * PART_LEN1);
-  memset(aec->coherence_state.sxd, 0, sizeof(complex_t) * PART_LEN1);
-  memset(aec->xfwBuf, 0,
-         sizeof(complex_t) * kExtendedNumPartitions * PART_LEN1);
-  memset(aec->coherence_state.se, 0, sizeof(float) * PART_LEN1);
-
-  // To prevent numerical instability in the first block.
-  for (i = 0; i < PART_LEN1; i++) {
-    aec->coherence_state.sd[i] = 1;
-  }
-  for (i = 0; i < PART_LEN1; i++) {
-    aec->coherence_state.sx[i] = 1;
-  }
-
-  memset(aec->hNs, 0, sizeof(aec->hNs));
-  memset(aec->outBuf, 0, sizeof(float) * PART_LEN);
-
-  aec->hNlFbMin = 1;
-  aec->hNlFbLocalMin = 1;
-  aec->hNlXdAvgMin = 1;
-  aec->hNlNewMin = 0;
-  aec->hNlMinCtr = 0;
-  aec->overDrive = 2;
-  aec->overdrive_scaling = 2;
-  aec->delayIdx = 0;
-  aec->stNearState = 0;
-  aec->echoState = 0;
-  aec->divergeState = 0;
-
-  aec->seed = 777;
-  aec->delayEstCtr = 0;
-
-  aec->extreme_filter_divergence = 0;
-
-  // Metrics disabled by default
-  aec->metricsMode = 0;
-  InitMetrics(aec);
-
-  return 0;
-}
-
-void WebRtcAec_BufferFarendBlock(AecCore* aec, const float* farend) {
-  // Check if the buffer is full, and in that case flush the oldest data.
-  if (aec->farend_block_buffer_.AvaliableSpace() < 1) {
-    aec->farend_block_buffer_.AdjustSize(1);
-  }
-  aec->farend_block_buffer_.Insert(farend);
-}
-
-int WebRtcAec_AdjustFarendBufferSizeAndSystemDelay(AecCore* aec,
-                                                   int buffer_size_decrease) {
-  int achieved_buffer_size_decrease =
-      aec->farend_block_buffer_.AdjustSize(buffer_size_decrease);
-  aec->system_delay -= achieved_buffer_size_decrease * PART_LEN;
-  return achieved_buffer_size_decrease;
-}
-
-void FormNearendBlock(
-    size_t nearend_start_index,
-    size_t num_bands,
-    const float* const* nearend_frame,
-    size_t num_samples_from_nearend_frame,
-    const float nearend_buffer[NUM_HIGH_BANDS_MAX + 1]
-                              [PART_LEN - (FRAME_LEN - PART_LEN)],
-    float nearend_block[NUM_HIGH_BANDS_MAX + 1][PART_LEN]) {
-  RTC_DCHECK_LE(num_samples_from_nearend_frame, PART_LEN);
-  const int num_samples_from_buffer = PART_LEN - num_samples_from_nearend_frame;
-
-  if (num_samples_from_buffer > 0) {
-    for (size_t i = 0; i < num_bands; ++i) {
-      memcpy(&nearend_block[i][0], &nearend_buffer[i][0],
-             num_samples_from_buffer * sizeof(float));
-    }
-  }
-
-  for (size_t i = 0; i < num_bands; ++i) {
-    memcpy(&nearend_block[i][num_samples_from_buffer],
-           &nearend_frame[i][nearend_start_index],
-           num_samples_from_nearend_frame * sizeof(float));
-  }
-}
-
-void BufferNearendFrame(
-    size_t nearend_start_index,
-    size_t num_bands,
-    const float* const* nearend_frame,
-    size_t num_samples_to_buffer,
-    float nearend_buffer[NUM_HIGH_BANDS_MAX + 1]
-                        [PART_LEN - (FRAME_LEN - PART_LEN)]) {
-  for (size_t i = 0; i < num_bands; ++i) {
-    memcpy(&nearend_buffer[i][0],
-           &nearend_frame[i][nearend_start_index + FRAME_LEN -
-                             num_samples_to_buffer],
-           num_samples_to_buffer * sizeof(float));
-  }
-}
-
-void BufferOutputBlock(
-    size_t num_bands,
-    const float output_block[NUM_HIGH_BANDS_MAX + 1][PART_LEN],
-    size_t* output_buffer_size,
-    float output_buffer[NUM_HIGH_BANDS_MAX + 1][2 * PART_LEN]) {
-  for (size_t i = 0; i < num_bands; ++i) {
-    memcpy(&output_buffer[i][*output_buffer_size], &output_block[i][0],
-           PART_LEN * sizeof(float));
-  }
-  (*output_buffer_size) += PART_LEN;
-}
-
-void FormOutputFrame(size_t output_start_index,
-                     size_t num_bands,
-                     size_t* output_buffer_size,
-                     float output_buffer[NUM_HIGH_BANDS_MAX + 1][2 * PART_LEN],
-                     float* const* output_frame) {
-  RTC_DCHECK_LE(FRAME_LEN, *output_buffer_size);
-  for (size_t i = 0; i < num_bands; ++i) {
-    memcpy(&output_frame[i][output_start_index], &output_buffer[i][0],
-           FRAME_LEN * sizeof(float));
-  }
-  (*output_buffer_size) -= FRAME_LEN;
-  if (*output_buffer_size > 0) {
-    RTC_DCHECK_GE(2 * PART_LEN - FRAME_LEN, (*output_buffer_size));
-    for (size_t i = 0; i < num_bands; ++i) {
-      memcpy(&output_buffer[i][0], &output_buffer[i][FRAME_LEN],
-             (*output_buffer_size) * sizeof(float));
-    }
-  }
-}
-
-void WebRtcAec_ProcessFrames(AecCore* aec,
-                             const float* const* nearend,
-                             size_t num_bands,
-                             size_t num_samples,
-                             int knownDelay,
-                             float* const* out) {
-  RTC_DCHECK(num_samples == 80 || num_samples == 160);
-
-  aec->frame_count++;
-  // For each frame the process is as follows:
-  // 1) If the system_delay indicates on being too small for processing a
-  //    frame we stuff the buffer with enough data for 10 ms.
-  // 2 a) Adjust the buffer to the system delay, by moving the read pointer.
-  //   b) Apply signal based delay correction, if we have detected poor AEC
-  //    performance.
-  // 3) TODO(bjornv): Investigate if we need to add this:
-  //    If we can't move read pointer due to buffer size limitations we
-  //    flush/stuff the buffer.
-  // 4) Process as many partitions as possible.
-  // 5) Update the |system_delay| with respect to a full frame of FRAME_LEN
-  //    samples. Even though we will have data left to process (we work with
-  //    partitions) we consider updating a whole frame, since that's the
-  //    amount of data we input and output in audio_processing.
-  // 6) Update the outputs.
-
-  // The AEC has two different delay estimation algorithms built in.  The
-  // first relies on delay input values from the user and the amount of
-  // shifted buffer elements is controlled by |knownDelay|.  This delay will
-  // give a guess on how much we need to shift far-end buffers to align with
-  // the near-end signal.  The other delay estimation algorithm uses the
-  // far- and near-end signals to find the offset between them.  This one
-  // (called "signal delay") is then used to fine tune the alignment, or
-  // simply compensate for errors in the system based one.
-  // Note that the two algorithms operate independently.  Currently, we only
-  // allow one algorithm to be turned on.
-
-  RTC_DCHECK_EQ(aec->num_bands, num_bands);
-
-  for (size_t j = 0; j < num_samples; j += FRAME_LEN) {
-    // 1) At most we process |aec->mult|+1 partitions in 10 ms. Make sure we
-    // have enough far-end data for that by stuffing the buffer if the
-    // |system_delay| indicates others.
-    if (aec->system_delay < FRAME_LEN) {
-      // We don't have enough data so we rewind 10 ms.
-      WebRtcAec_AdjustFarendBufferSizeAndSystemDelay(aec, -(aec->mult + 1));
-    }
-
-    if (!aec->delay_agnostic_enabled) {
-      // 2 a) Compensate for a possible change in the system delay.
-
-      // TODO(bjornv): Investigate how we should round the delay difference;
-      // right now we know that incoming |knownDelay| is underestimated when
-      // it's less than |aec->knownDelay|. We therefore, round (-32) in that
-      // direction. In the other direction, we don't have this situation, but
-      // might flush one partition too little. This can cause non-causality,
-      // which should be investigated. Maybe, allow for a non-symmetric
-      // rounding, like -16.
-      int move_elements = (aec->knownDelay - knownDelay - 32) / PART_LEN;
-      int moved_elements = aec->farend_block_buffer_.AdjustSize(move_elements);
-      MaybeLogDelayAdjustment(moved_elements * (aec->sampFreq == 8000 ? 8 : 4),
-                              DelaySource::kSystemDelay);
-      aec->knownDelay -= moved_elements * PART_LEN;
-    } else {
-      // 2 b) Apply signal based delay correction.
-      int move_elements = SignalBasedDelayCorrection(aec);
-      int moved_elements = aec->farend_block_buffer_.AdjustSize(move_elements);
-      MaybeLogDelayAdjustment(moved_elements * (aec->sampFreq == 8000 ? 8 : 4),
-                              DelaySource::kDelayAgnostic);
-      int far_near_buffer_diff =
-          aec->farend_block_buffer_.Size() -
-          (aec->nearend_buffer_size + FRAME_LEN) / PART_LEN;
-      WebRtc_SoftResetDelayEstimator(aec->delay_estimator, moved_elements);
-      WebRtc_SoftResetDelayEstimatorFarend(aec->delay_estimator_farend,
-                                           moved_elements);
-      // If we rely on reported system delay values only, a buffer underrun here
-      // can never occur since we've taken care of that in 1) above.  Here, we
-      // apply signal based delay correction and can therefore end up with
-      // buffer underruns since the delay estimation can be wrong.  We therefore
-      // stuff the buffer with enough elements if needed.
-      if (far_near_buffer_diff < 0) {
-        WebRtcAec_AdjustFarendBufferSizeAndSystemDelay(aec,
-                                                       far_near_buffer_diff);
-      }
-    }
-
-    static_assert(
-        16 == (FRAME_LEN - PART_LEN),
-        "These constants need to be properly related for this code to work");
-    float output_block[NUM_HIGH_BANDS_MAX + 1][PART_LEN];
-    float nearend_block[NUM_HIGH_BANDS_MAX + 1][PART_LEN];
-    float farend_extended_block_lowest_band[PART_LEN2];
-
-    // Form and process a block of nearend samples, buffer the output block of
-    // samples.
-    aec->farend_block_buffer_.ExtractExtendedBlock(
-        farend_extended_block_lowest_band);
-    FormNearendBlock(j, num_bands, nearend, PART_LEN - aec->nearend_buffer_size,
-                     aec->nearend_buffer, nearend_block);
-    ProcessNearendBlock(aec, farend_extended_block_lowest_band, nearend_block,
-                        output_block);
-    BufferOutputBlock(num_bands, output_block, &aec->output_buffer_size,
-                      aec->output_buffer);
-
-    if ((FRAME_LEN - PART_LEN + aec->nearend_buffer_size) == PART_LEN) {
-      // When possible (every fourth frame) form and process a second block of
-      // nearend samples, buffer the output block of samples.
-      aec->farend_block_buffer_.ExtractExtendedBlock(
-          farend_extended_block_lowest_band);
-      FormNearendBlock(j + FRAME_LEN - PART_LEN, num_bands, nearend, PART_LEN,
-                       aec->nearend_buffer, nearend_block);
-      ProcessNearendBlock(aec, farend_extended_block_lowest_band, nearend_block,
-                          output_block);
-      BufferOutputBlock(num_bands, output_block, &aec->output_buffer_size,
-                        aec->output_buffer);
-
-      // Reset the buffer size as there are no samples left in the nearend input
-      // to buffer.
-      aec->nearend_buffer_size = 0;
-    } else {
-      // Buffer the remaining samples in the nearend input.
-      aec->nearend_buffer_size += FRAME_LEN - PART_LEN;
-      BufferNearendFrame(j, num_bands, nearend, aec->nearend_buffer_size,
-                         aec->nearend_buffer);
-    }
-
-    // 5) Update system delay with respect to the entire frame.
-    aec->system_delay -= FRAME_LEN;
-
-    // 6) Form the output frame.
-    FormOutputFrame(j, num_bands, &aec->output_buffer_size, aec->output_buffer,
-                    out);
-  }
-}
-
-int WebRtcAec_GetDelayMetricsCore(AecCore* self,
-                                  int* median,
-                                  int* std,
-                                  float* fraction_poor_delays) {
-  RTC_DCHECK(self);
-  RTC_DCHECK(median);
-  RTC_DCHECK(std);
-
-  if (self->delay_logging_enabled == 0) {
-    // Logging disabled.
-    return -1;
-  }
-
-  if (self->delay_metrics_delivered == 0) {
-    UpdateDelayMetrics(self);
-    self->delay_metrics_delivered = 1;
-  }
-  *median = self->delay_median;
-  *std = self->delay_std;
-  *fraction_poor_delays = self->fraction_poor_delays;
-
-  return 0;
-}
-
-int WebRtcAec_echo_state(AecCore* self) {
-  return self->echoState;
-}
-
-void WebRtcAec_GetEchoStats(AecCore* self,
-                            Stats* erl,
-                            Stats* erle,
-                            Stats* a_nlp,
-                            float* divergent_filter_fraction) {
-  RTC_DCHECK(erl);
-  RTC_DCHECK(erle);
-  RTC_DCHECK(a_nlp);
-  *erl = self->erl;
-  *erle = self->erle;
-  *a_nlp = self->aNlp;
-  *divergent_filter_fraction =
-      self->divergent_filter_fraction.GetLatestFraction();
-}
-
-void WebRtcAec_SetConfigCore(AecCore* self,
-                             int nlp_mode,
-                             int metrics_mode,
-                             int delay_logging) {
-  RTC_DCHECK_GE(nlp_mode, 0);
-  RTC_DCHECK_LT(nlp_mode, 3);
-  self->nlp_mode = nlp_mode;
-  self->metricsMode = metrics_mode;
-  if (self->metricsMode) {
-    InitMetrics(self);
-  }
-  // Turn on delay logging if it is either set explicitly or if delay agnostic
-  // AEC is enabled (which requires delay estimates).
-  self->delay_logging_enabled = delay_logging || self->delay_agnostic_enabled;
-  if (self->delay_logging_enabled) {
-    memset(self->delay_histogram, 0, sizeof(self->delay_histogram));
-  }
-}
-
-void WebRtcAec_enable_delay_agnostic(AecCore* self, int enable) {
-  self->delay_agnostic_enabled = enable;
-}
-
-int WebRtcAec_delay_agnostic_enabled(AecCore* self) {
-  return self->delay_agnostic_enabled;
-}
-
-void WebRtcAec_enable_refined_adaptive_filter(AecCore* self, bool enable) {
-  self->refined_adaptive_filter_enabled = enable;
-  SetAdaptiveFilterStepSize(self);
-  SetErrorThreshold(self);
-}
-
-bool WebRtcAec_refined_adaptive_filter_enabled(const AecCore* self) {
-  return self->refined_adaptive_filter_enabled;
-}
-
-void WebRtcAec_enable_extended_filter(AecCore* self, int enable) {
-  self->extended_filter_enabled = enable;
-  SetAdaptiveFilterStepSize(self);
-  SetErrorThreshold(self);
-  self->num_partitions = enable ? kExtendedNumPartitions : kNormalNumPartitions;
-  // Update the delay estimator with filter length.  See InitAEC() for details.
-  WebRtc_set_allowed_offset(self->delay_estimator, self->num_partitions / 2);
-}
-
-int WebRtcAec_extended_filter_enabled(AecCore* self) {
-  return self->extended_filter_enabled;
-}
-
-int WebRtcAec_system_delay(AecCore* self) {
-  return self->system_delay;
-}
-
-void WebRtcAec_SetSystemDelay(AecCore* self, int delay) {
-  RTC_DCHECK_GE(delay, 0);
-  self->system_delay = delay;
-}
-}  // namespace webrtc
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec/aec_core.h b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec/aec_core.h
deleted file mode 100644
index 35a6c9b216..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec/aec_core.h
+++ /dev/null
@@ -1,333 +0,0 @@
-/*
- *  Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-/*
- * Specifies the interface for the AEC core.
- */
-
-#ifndef MODULES_AUDIO_PROCESSING_AEC_AEC_CORE_H_
-#define MODULES_AUDIO_PROCESSING_AEC_AEC_CORE_H_
-
-#include <stddef.h>
-
-#include <memory>
-
-extern "C" {
-#include "common_audio/ring_buffer.h"
-}
-#include "modules/audio_processing/aec/aec_common.h"
-#include "modules/audio_processing/utility/block_mean_calculator.h"
-#include "modules/audio_processing/utility/ooura_fft.h"
-#include "rtc_base/constructormagic.h"
-
-namespace webrtc {
-
-#define FRAME_LEN 80
-#define PART_LEN 64               // Length of partition
-#define PART_LEN1 (PART_LEN + 1)  // Unique fft coefficients
-#define PART_LEN2 (PART_LEN * 2)  // Length of partition * 2
-#define NUM_HIGH_BANDS_MAX 2      // Max number of high bands
-
-class ApmDataDumper;
-
-typedef float complex_t[2];
-// For performance reasons, some arrays of complex numbers are replaced by twice
-// as long arrays of float, all the real parts followed by all the imaginary
-// ones (complex_t[SIZE] -> float[2][SIZE]). This allows SIMD optimizations and
-// is better than two arrays (one for the real parts and one for the imaginary
-// parts) as this other way would require two pointers instead of one and cause
-// extra register spilling. This also allows the offsets to be calculated at
-// compile time.
-
-// Metrics
-enum { kOffsetLevel = -100 };
-
-typedef struct Stats {
-  float instant;
-  float average;
-  float min;
-  float max;
-  float sum;
-  float hisum;
-  float himean;
-  size_t counter;
-  size_t hicounter;
-} Stats;
-
-// Number of partitions for the extended filter mode. The first one is an enum
-// to be used in array declarations, as it represents the maximum filter length.
-enum { kExtendedNumPartitions = 32 };
-static const int kNormalNumPartitions = 12;
-
-// Delay estimator constants, used for logging and delay compensation if
-// if reported delays are disabled.
-enum { kLookaheadBlocks = 15 };
-enum {
-  // 500 ms for 16 kHz which is equivalent with the limit of reported delays.
-  kHistorySizeBlocks = 125
-};
-
-typedef struct PowerLevel {
-  PowerLevel();
-
-  BlockMeanCalculator framelevel;
-  BlockMeanCalculator averagelevel;
-  float minlevel;
-} PowerLevel;
-
-class BlockBuffer {
- public:
-  BlockBuffer();
-  ~BlockBuffer();
-  void ReInit();
-  void Insert(const float block[PART_LEN]);
-  void ExtractExtendedBlock(float extended_block[PART_LEN]);
-  int AdjustSize(int buffer_size_decrease);
-  size_t Size();
-  size_t AvaliableSpace();
-
- private:
-  RingBuffer* buffer_;
-};
-
-class DivergentFilterFraction {
- public:
-  DivergentFilterFraction();
-
-  // Reset.
-  void Reset();
-
-  void AddObservation(const PowerLevel& nearlevel,
-                      const PowerLevel& linoutlevel,
-                      const PowerLevel& nlpoutlevel);
-
-  // Return the latest fraction.
-  float GetLatestFraction() const;
-
- private:
-  // Clear all values added.
-  void Clear();
-
-  size_t count_;
-  size_t occurrence_;
-  float fraction_;
-
-  RTC_DISALLOW_COPY_AND_ASSIGN(DivergentFilterFraction);
-};
-
-typedef struct CoherenceState {
-  complex_t sde[PART_LEN1];  // cross-psd of nearend and error
-  complex_t sxd[PART_LEN1];  // cross-psd of farend and nearend
-  float sx[PART_LEN1], sd[PART_LEN1], se[PART_LEN1];  // far, near, error psd
-} CoherenceState;
-
-struct AecCore {
-  explicit AecCore(int instance_index);
-  ~AecCore();
-
-  std::unique_ptr<ApmDataDumper> data_dumper;
-  const OouraFft ooura_fft;
-
-  CoherenceState coherence_state;
-
-  int farBufWritePos, farBufReadPos;
-
-  int knownDelay;
-  int inSamples, outSamples;
-  int delayEstCtr;
-
-  // Nearend buffer used for changing from FRAME_LEN to PART_LEN sample block
-  // sizes. The buffer stores all the incoming bands and for each band a maximum
-  // of PART_LEN - (FRAME_LEN - PART_LEN) values need to be buffered in order to
-  // change the block size from FRAME_LEN to PART_LEN.
-  float nearend_buffer[NUM_HIGH_BANDS_MAX + 1]
-                      [PART_LEN - (FRAME_LEN - PART_LEN)];
-  size_t nearend_buffer_size;
-  float output_buffer[NUM_HIGH_BANDS_MAX + 1][2 * PART_LEN];
-  size_t output_buffer_size;
-
-  float eBuf[PART_LEN2];  // error
-
-  float previous_nearend_block[NUM_HIGH_BANDS_MAX + 1][PART_LEN];
-
-  float xPow[PART_LEN1];
-  float dPow[PART_LEN1];
-  float dMinPow[PART_LEN1];
-  float dInitMinPow[PART_LEN1];
-  float* noisePow;
-
-  float xfBuf[2][kExtendedNumPartitions * PART_LEN1];  // farend fft buffer
-  float wfBuf[2][kExtendedNumPartitions * PART_LEN1];  // filter fft
-  // Farend windowed fft buffer.
-  complex_t xfwBuf[kExtendedNumPartitions * PART_LEN1];
-
-  float hNs[PART_LEN1];
-  float hNlFbMin, hNlFbLocalMin;
-  float hNlXdAvgMin;
-  int hNlNewMin, hNlMinCtr;
-  float overDrive;
-  float overdrive_scaling;
-  int nlp_mode;
-  float outBuf[PART_LEN];
-  int delayIdx;
-
-  short stNearState, echoState;
-  short divergeState;
-
-  int xfBufBlockPos;
-
-  BlockBuffer farend_block_buffer_;
-
-  int system_delay;  // Current system delay buffered in AEC.
-
-  int mult;  // sampling frequency multiple
-  int sampFreq = 16000;
-  size_t num_bands;
-  uint32_t seed;
-
-  float filter_step_size;  // stepsize
-  float error_threshold;   // error threshold
-
-  int noiseEstCtr;
-
-  PowerLevel farlevel;
-  PowerLevel nearlevel;
-  PowerLevel linoutlevel;
-  PowerLevel nlpoutlevel;
-
-  int metricsMode;
-  int stateCounter;
-  Stats erl;
-  Stats erle;
-  Stats aNlp;
-  Stats rerl;
-  DivergentFilterFraction divergent_filter_fraction;
-
-  // Quantities to control H band scaling for SWB input
-  int freq_avg_ic;       // initial bin for averaging nlp gain
-  int flag_Hband_cn;     // for comfort noise
-  float cn_scale_Hband;  // scale for comfort noise in H band
-
-  int delay_metrics_delivered;
-  int delay_histogram[kHistorySizeBlocks];
-  int num_delay_values;
-  int delay_median;
-  int delay_std;
-  float fraction_poor_delays;
-  int delay_logging_enabled;
-  void* delay_estimator_farend;
-  void* delay_estimator;
-  // Variables associated with delay correction through signal based delay
-  // estimation feedback.
-  int previous_delay;
-  int delay_correction_count;
-  int shift_offset;
-  float delay_quality_threshold;
-  int frame_count;
-
-  // 0 = delay agnostic mode (signal based delay correction) disabled.
-  // Otherwise enabled.
-  int delay_agnostic_enabled;
-  // 1 = extended filter mode enabled, 0 = disabled.
-  int extended_filter_enabled;
-  // 1 = refined filter adaptation aec mode enabled, 0 = disabled.
-  bool refined_adaptive_filter_enabled;
-
-  // Runtime selection of number of filter partitions.
-  int num_partitions;
-
-  // Flag that extreme filter divergence has been detected by the Echo
-  // Suppressor.
-  int extreme_filter_divergence;
-};
-
-AecCore* WebRtcAec_CreateAec(int instance_count);  // Returns NULL on error.
-void WebRtcAec_FreeAec(AecCore* aec);
-int WebRtcAec_InitAec(AecCore* aec, int sampFreq);
-void WebRtcAec_InitAec_SSE2(void);
-#if defined(MIPS_FPU_LE)
-void WebRtcAec_InitAec_mips(void);
-#endif
-#if defined(WEBRTC_HAS_NEON)
-void WebRtcAec_InitAec_neon(void);
-#endif
-
-void WebRtcAec_BufferFarendBlock(AecCore* aec, const float* farend);
-void WebRtcAec_ProcessFrames(AecCore* aec,
-                             const float* const* nearend,
-                             size_t num_bands,
-                             size_t num_samples,
-                             int knownDelay,
-                             float* const* out);
-
-// A helper function to call adjust the farend buffer size.
-// Returns the number of elements the size was decreased with, and adjusts
-// |system_delay| by the corresponding amount in ms.
-int WebRtcAec_AdjustFarendBufferSizeAndSystemDelay(AecCore* aec,
-                                                   int size_decrease);
-
-// Calculates the median, standard deviation and amount of poor values among the
-// delay estimates aggregated up to the first call to the function. After that
-// first call the metrics are aggregated and updated every second. With poor
-// values we mean values that most likely will cause the AEC to perform poorly.
-// TODO(bjornv): Consider changing tests and tools to handle constant
-// constant aggregation window throughout the session instead.
-int WebRtcAec_GetDelayMetricsCore(AecCore* self,
-                                  int* median,
-                                  int* std,
-                                  float* fraction_poor_delays);
-
-// Returns the echo state (1: echo, 0: no echo).
-int WebRtcAec_echo_state(AecCore* self);
-
-// Gets statistics of the echo metrics ERL, ERLE, A_NLP.
-void WebRtcAec_GetEchoStats(AecCore* self,
-                            Stats* erl,
-                            Stats* erle,
-                            Stats* a_nlp,
-                            float* divergent_filter_fraction);
-
-// Sets local configuration modes.
-void WebRtcAec_SetConfigCore(AecCore* self,
-                             int nlp_mode,
-                             int metrics_mode,
-                             int delay_logging);
-
-// Non-zero enables, zero disables.
-void WebRtcAec_enable_delay_agnostic(AecCore* self, int enable);
-
-// Returns non-zero if delay agnostic (i.e., signal based delay estimation) is
-// enabled and zero if disabled.
-int WebRtcAec_delay_agnostic_enabled(AecCore* self);
-
-// Turns on/off the refined adaptive filter feature.
-void WebRtcAec_enable_refined_adaptive_filter(AecCore* self, bool enable);
-
-// Returns whether the refined adaptive filter is enabled.
-bool WebRtcAec_refined_adaptive_filter(const AecCore* self);
-
-// Enables or disables extended filter mode. Non-zero enables, zero disables.
-void WebRtcAec_enable_extended_filter(AecCore* self, int enable);
-
-// Returns non-zero if extended filter mode is enabled and zero if disabled.
-int WebRtcAec_extended_filter_enabled(AecCore* self);
-
-// Returns the current |system_delay|, i.e., the buffered difference between
-// far-end and near-end.
-int WebRtcAec_system_delay(AecCore* self);
-
-// Sets the |system_delay| to |value|.  Note that if the value is changed
-// improperly, there can be a performance regression.  So it should be used with
-// care.
-void WebRtcAec_SetSystemDelay(AecCore* self, int delay);
-
-}  // namespace webrtc
-
-#endif  // MODULES_AUDIO_PROCESSING_AEC_AEC_CORE_H_
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec/aec_core_neon.cc b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec/aec_core_neon.cc
deleted file mode 100644
index 786b1dc7d0..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec/aec_core_neon.cc
+++ /dev/null
@@ -1,739 +0,0 @@
-/*
- *  Copyright (c) 2014 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-/*
- * The core AEC algorithm, neon version of speed-critical functions.
- *
- * Based on aec_core_sse2.c.
- */
-#if defined(__arm__) || defined(_M_ARM) || defined(__aarch64__)
-
-#include <arm_neon.h>
-#include <math.h>
-#include <string.h>  // memset
-
-extern "C" {
-#include "common_audio/signal_processing/include/signal_processing_library.h"
-}
-#include "modules/audio_processing/aec/aec_common.h"
-#include "modules/audio_processing/aec/aec_core_optimized_methods.h"
-#include "modules/audio_processing/utility/ooura_fft.h"
-
-namespace webrtc {
-
-enum { kShiftExponentIntoTopMantissa = 8 };
-enum { kFloatExponentShift = 23 };
-
-__inline static float MulRe(float aRe, float aIm, float bRe, float bIm) {
-  return aRe * bRe - aIm * bIm;
-}
-
-__inline static float MulIm(float aRe, float aIm, float bRe, float bIm) {
-  return aRe * bIm + aIm * bRe;
-}
-
-static void FilterFarNEON(
-    int num_partitions,
-    int x_fft_buf_block_pos,
-    float x_fft_buf[2][kExtendedNumPartitions * PART_LEN1],
-    float h_fft_buf[2][kExtendedNumPartitions * PART_LEN1],
-    float y_fft[2][PART_LEN1]) {
-  int i;
-  for (i = 0; i < num_partitions; i++) {
-    int j;
-    int xPos = (i + x_fft_buf_block_pos) * PART_LEN1;
-    int pos = i * PART_LEN1;
-    // Check for wrap
-    if (i + x_fft_buf_block_pos >= num_partitions) {
-      xPos -= num_partitions * PART_LEN1;
-    }
-
-    // vectorized code (four at once)
-    for (j = 0; j + 3 < PART_LEN1; j += 4) {
-      const float32x4_t x_fft_buf_re = vld1q_f32(&x_fft_buf[0][xPos + j]);
-      const float32x4_t x_fft_buf_im = vld1q_f32(&x_fft_buf[1][xPos + j]);
-      const float32x4_t h_fft_buf_re = vld1q_f32(&h_fft_buf[0][pos + j]);
-      const float32x4_t h_fft_buf_im = vld1q_f32(&h_fft_buf[1][pos + j]);
-      const float32x4_t y_fft_re = vld1q_f32(&y_fft[0][j]);
-      const float32x4_t y_fft_im = vld1q_f32(&y_fft[1][j]);
-      const float32x4_t a = vmulq_f32(x_fft_buf_re, h_fft_buf_re);
-      const float32x4_t e = vmlsq_f32(a, x_fft_buf_im, h_fft_buf_im);
-      const float32x4_t c = vmulq_f32(x_fft_buf_re, h_fft_buf_im);
-      const float32x4_t f = vmlaq_f32(c, x_fft_buf_im, h_fft_buf_re);
-      const float32x4_t g = vaddq_f32(y_fft_re, e);
-      const float32x4_t h = vaddq_f32(y_fft_im, f);
-      vst1q_f32(&y_fft[0][j], g);
-      vst1q_f32(&y_fft[1][j], h);
-    }
-    // scalar code for the remaining items.
-    for (; j < PART_LEN1; j++) {
-      y_fft[0][j] += MulRe(x_fft_buf[0][xPos + j], x_fft_buf[1][xPos + j],
-                           h_fft_buf[0][pos + j], h_fft_buf[1][pos + j]);
-      y_fft[1][j] += MulIm(x_fft_buf[0][xPos + j], x_fft_buf[1][xPos + j],
-                           h_fft_buf[0][pos + j], h_fft_buf[1][pos + j]);
-    }
-  }
-}
-
-// ARM64's arm_neon.h has already defined vdivq_f32 vsqrtq_f32.
-#if !defined(WEBRTC_ARCH_ARM64)
-static float32x4_t vdivq_f32(float32x4_t a, float32x4_t b) {
-  int i;
-  float32x4_t x = vrecpeq_f32(b);
-  // from arm documentation
-  // The Newton-Raphson iteration:
-  //     x[n+1] = x[n] * (2 - d * x[n])
-  // converges to (1/d) if x0 is the result of VRECPE applied to d.
-  //
-  // Note: The precision did not improve after 2 iterations.
-  for (i = 0; i < 2; i++) {
-    x = vmulq_f32(vrecpsq_f32(b, x), x);
-  }
-  // a/b = a*(1/b)
-  return vmulq_f32(a, x);
-}
-
-static float32x4_t vsqrtq_f32(float32x4_t s) {
-  int i;
-  float32x4_t x = vrsqrteq_f32(s);
-
-  // Code to handle sqrt(0).
-  // If the input to sqrtf() is zero, a zero will be returned.
-  // If the input to vrsqrteq_f32() is zero, positive infinity is returned.
-  const uint32x4_t vec_p_inf = vdupq_n_u32(0x7F800000);
-  // check for divide by zero
-  const uint32x4_t div_by_zero = vceqq_u32(vec_p_inf, vreinterpretq_u32_f32(x));
-  // zero out the positive infinity results
-  x = vreinterpretq_f32_u32(
-      vandq_u32(vmvnq_u32(div_by_zero), vreinterpretq_u32_f32(x)));
-  // from arm documentation
-  // The Newton-Raphson iteration:
-  //     x[n+1] = x[n] * (3 - d * (x[n] * x[n])) / 2)
-  // converges to (1/√d) if x0 is the result of VRSQRTE applied to d.
-  //
-  // Note: The precision did not improve after 2 iterations.
-  for (i = 0; i < 2; i++) {
-    x = vmulq_f32(vrsqrtsq_f32(vmulq_f32(x, x), s), x);
-  }
-  // sqrt(s) = s * 1/sqrt(s)
-  return vmulq_f32(s, x);
-}
-#endif  // WEBRTC_ARCH_ARM64
-
-static void ScaleErrorSignalNEON(float mu,
-                                 float error_threshold,
-                                 float x_pow[PART_LEN1],
-                                 float ef[2][PART_LEN1]) {
-  const float32x4_t k1e_10f = vdupq_n_f32(1e-10f);
-  const float32x4_t kMu = vmovq_n_f32(mu);
-  const float32x4_t kThresh = vmovq_n_f32(error_threshold);
-  int i;
-  // vectorized code (four at once)
-  for (i = 0; i + 3 < PART_LEN1; i += 4) {
-    const float32x4_t x_pow_local = vld1q_f32(&x_pow[i]);
-    const float32x4_t ef_re_base = vld1q_f32(&ef[0][i]);
-    const float32x4_t ef_im_base = vld1q_f32(&ef[1][i]);
-    const float32x4_t xPowPlus = vaddq_f32(x_pow_local, k1e_10f);
-    float32x4_t ef_re = vdivq_f32(ef_re_base, xPowPlus);
-    float32x4_t ef_im = vdivq_f32(ef_im_base, xPowPlus);
-    const float32x4_t ef_re2 = vmulq_f32(ef_re, ef_re);
-    const float32x4_t ef_sum2 = vmlaq_f32(ef_re2, ef_im, ef_im);
-    const float32x4_t absEf = vsqrtq_f32(ef_sum2);
-    const uint32x4_t bigger = vcgtq_f32(absEf, kThresh);
-    const float32x4_t absEfPlus = vaddq_f32(absEf, k1e_10f);
-    const float32x4_t absEfInv = vdivq_f32(kThresh, absEfPlus);
-    uint32x4_t ef_re_if = vreinterpretq_u32_f32(vmulq_f32(ef_re, absEfInv));
-    uint32x4_t ef_im_if = vreinterpretq_u32_f32(vmulq_f32(ef_im, absEfInv));
-    uint32x4_t ef_re_u32 =
-        vandq_u32(vmvnq_u32(bigger), vreinterpretq_u32_f32(ef_re));
-    uint32x4_t ef_im_u32 =
-        vandq_u32(vmvnq_u32(bigger), vreinterpretq_u32_f32(ef_im));
-    ef_re_if = vandq_u32(bigger, ef_re_if);
-    ef_im_if = vandq_u32(bigger, ef_im_if);
-    ef_re_u32 = vorrq_u32(ef_re_u32, ef_re_if);
-    ef_im_u32 = vorrq_u32(ef_im_u32, ef_im_if);
-    ef_re = vmulq_f32(vreinterpretq_f32_u32(ef_re_u32), kMu);
-    ef_im = vmulq_f32(vreinterpretq_f32_u32(ef_im_u32), kMu);
-    vst1q_f32(&ef[0][i], ef_re);
-    vst1q_f32(&ef[1][i], ef_im);
-  }
-  // scalar code for the remaining items.
-  for (; i < PART_LEN1; i++) {
-    float abs_ef;
-    ef[0][i] /= (x_pow[i] + 1e-10f);
-    ef[1][i] /= (x_pow[i] + 1e-10f);
-    abs_ef = sqrtf(ef[0][i] * ef[0][i] + ef[1][i] * ef[1][i]);
-
-    if (abs_ef > error_threshold) {
-      abs_ef = error_threshold / (abs_ef + 1e-10f);
-      ef[0][i] *= abs_ef;
-      ef[1][i] *= abs_ef;
-    }
-
-    // Stepsize factor
-    ef[0][i] *= mu;
-    ef[1][i] *= mu;
-  }
-}
-
-static void FilterAdaptationNEON(
-    const OouraFft& ooura_fft,
-    int num_partitions,
-    int x_fft_buf_block_pos,
-    float x_fft_buf[2][kExtendedNumPartitions * PART_LEN1],
-    float e_fft[2][PART_LEN1],
-    float h_fft_buf[2][kExtendedNumPartitions * PART_LEN1]) {
-  float fft[PART_LEN2];
-  int i;
-  for (i = 0; i < num_partitions; i++) {
-    int xPos = (i + x_fft_buf_block_pos) * PART_LEN1;
-    int pos = i * PART_LEN1;
-    int j;
-    // Check for wrap
-    if (i + x_fft_buf_block_pos >= num_partitions) {
-      xPos -= num_partitions * PART_LEN1;
-    }
-
-    // Process the whole array...
-    for (j = 0; j < PART_LEN; j += 4) {
-      // Load x_fft_buf and e_fft.
-      const float32x4_t x_fft_buf_re = vld1q_f32(&x_fft_buf[0][xPos + j]);
-      const float32x4_t x_fft_buf_im = vld1q_f32(&x_fft_buf[1][xPos + j]);
-      const float32x4_t e_fft_re = vld1q_f32(&e_fft[0][j]);
-      const float32x4_t e_fft_im = vld1q_f32(&e_fft[1][j]);
-      // Calculate the product of conjugate(x_fft_buf) by e_fft.
-      //   re(conjugate(a) * b) = aRe * bRe + aIm * bIm
-      //   im(conjugate(a) * b)=  aRe * bIm - aIm * bRe
-      const float32x4_t a = vmulq_f32(x_fft_buf_re, e_fft_re);
-      const float32x4_t e = vmlaq_f32(a, x_fft_buf_im, e_fft_im);
-      const float32x4_t c = vmulq_f32(x_fft_buf_re, e_fft_im);
-      const float32x4_t f = vmlsq_f32(c, x_fft_buf_im, e_fft_re);
-      // Interleave real and imaginary parts.
-      const float32x4x2_t g_n_h = vzipq_f32(e, f);
-      // Store
-      vst1q_f32(&fft[2 * j + 0], g_n_h.val[0]);
-      vst1q_f32(&fft[2 * j + 4], g_n_h.val[1]);
-    }
-    // ... and fixup the first imaginary entry.
-    fft[1] =
-        MulRe(x_fft_buf[0][xPos + PART_LEN], -x_fft_buf[1][xPos + PART_LEN],
-              e_fft[0][PART_LEN], e_fft[1][PART_LEN]);
-
-    ooura_fft.InverseFft(fft);
-    memset(fft + PART_LEN, 0, sizeof(float) * PART_LEN);
-
-    // fft scaling
-    {
-      const float scale = 2.0f / PART_LEN2;
-      const float32x4_t scale_ps = vmovq_n_f32(scale);
-      for (j = 0; j < PART_LEN; j += 4) {
-        const float32x4_t fft_ps = vld1q_f32(&fft[j]);
-        const float32x4_t fft_scale = vmulq_f32(fft_ps, scale_ps);
-        vst1q_f32(&fft[j], fft_scale);
-      }
-    }
-    ooura_fft.Fft(fft);
-
-    {
-      const float wt1 = h_fft_buf[1][pos];
-      h_fft_buf[0][pos + PART_LEN] += fft[1];
-      for (j = 0; j < PART_LEN; j += 4) {
-        float32x4_t wtBuf_re = vld1q_f32(&h_fft_buf[0][pos + j]);
-        float32x4_t wtBuf_im = vld1q_f32(&h_fft_buf[1][pos + j]);
-        const float32x4_t fft0 = vld1q_f32(&fft[2 * j + 0]);
-        const float32x4_t fft4 = vld1q_f32(&fft[2 * j + 4]);
-        const float32x4x2_t fft_re_im = vuzpq_f32(fft0, fft4);
-        wtBuf_re = vaddq_f32(wtBuf_re, fft_re_im.val[0]);
-        wtBuf_im = vaddq_f32(wtBuf_im, fft_re_im.val[1]);
-
-        vst1q_f32(&h_fft_buf[0][pos + j], wtBuf_re);
-        vst1q_f32(&h_fft_buf[1][pos + j], wtBuf_im);
-      }
-      h_fft_buf[1][pos] = wt1;
-    }
-  }
-}
-
-static float32x4_t vpowq_f32(float32x4_t a, float32x4_t b) {
-  // a^b = exp2(b * log2(a))
-  //   exp2(x) and log2(x) are calculated using polynomial approximations.
-  float32x4_t log2_a, b_log2_a, a_exp_b;
-
-  // Calculate log2(x), x = a.
-  {
-    // To calculate log2(x), we decompose x like this:
-    //   x = y * 2^n
-    //     n is an integer
-    //     y is in the [1.0, 2.0) range
-    //
-    //   log2(x) = log2(y) + n
-    //     n       can be evaluated by playing with float representation.
-    //     log2(y) in a small range can be approximated, this code uses an order
-    //             five polynomial approximation. The coefficients have been
-    //             estimated with the Remez algorithm and the resulting
-    //             polynomial has a maximum relative error of 0.00086%.
-
-    // Compute n.
-    //    This is done by masking the exponent, shifting it into the top bit of
-    //    the mantissa, putting eight into the biased exponent (to shift/
-    //    compensate the fact that the exponent has been shifted in the top/
-    //    fractional part and finally getting rid of the implicit leading one
-    //    from the mantissa by substracting it out.
-    const uint32x4_t vec_float_exponent_mask = vdupq_n_u32(0x7F800000);
-    const uint32x4_t vec_eight_biased_exponent = vdupq_n_u32(0x43800000);
-    const uint32x4_t vec_implicit_leading_one = vdupq_n_u32(0x43BF8000);
-    const uint32x4_t two_n =
-        vandq_u32(vreinterpretq_u32_f32(a), vec_float_exponent_mask);
-    const uint32x4_t n_1 = vshrq_n_u32(two_n, kShiftExponentIntoTopMantissa);
-    const uint32x4_t n_0 = vorrq_u32(n_1, vec_eight_biased_exponent);
-    const float32x4_t n =
-        vsubq_f32(vreinterpretq_f32_u32(n_0),
-                  vreinterpretq_f32_u32(vec_implicit_leading_one));
-    // Compute y.
-    const uint32x4_t vec_mantissa_mask = vdupq_n_u32(0x007FFFFF);
-    const uint32x4_t vec_zero_biased_exponent_is_one = vdupq_n_u32(0x3F800000);
-    const uint32x4_t mantissa =
-        vandq_u32(vreinterpretq_u32_f32(a), vec_mantissa_mask);
-    const float32x4_t y = vreinterpretq_f32_u32(
-        vorrq_u32(mantissa, vec_zero_biased_exponent_is_one));
-    // Approximate log2(y) ~= (y - 1) * pol5(y).
-    //    pol5(y) = C5 * y^5 + C4 * y^4 + C3 * y^3 + C2 * y^2 + C1 * y + C0
-    const float32x4_t C5 = vdupq_n_f32(-3.4436006e-2f);
-    const float32x4_t C4 = vdupq_n_f32(3.1821337e-1f);
-    const float32x4_t C3 = vdupq_n_f32(-1.2315303f);
-    const float32x4_t C2 = vdupq_n_f32(2.5988452f);
-    const float32x4_t C1 = vdupq_n_f32(-3.3241990f);
-    const float32x4_t C0 = vdupq_n_f32(3.1157899f);
-    float32x4_t pol5_y = C5;
-    pol5_y = vmlaq_f32(C4, y, pol5_y);
-    pol5_y = vmlaq_f32(C3, y, pol5_y);
-    pol5_y = vmlaq_f32(C2, y, pol5_y);
-    pol5_y = vmlaq_f32(C1, y, pol5_y);
-    pol5_y = vmlaq_f32(C0, y, pol5_y);
-    const float32x4_t y_minus_one =
-        vsubq_f32(y, vreinterpretq_f32_u32(vec_zero_biased_exponent_is_one));
-    const float32x4_t log2_y = vmulq_f32(y_minus_one, pol5_y);
-
-    // Combine parts.
-    log2_a = vaddq_f32(n, log2_y);
-  }
-
-  // b * log2(a)
-  b_log2_a = vmulq_f32(b, log2_a);
-
-  // Calculate exp2(x), x = b * log2(a).
-  {
-    // To calculate 2^x, we decompose x like this:
-    //   x = n + y
-    //     n is an integer, the value of x - 0.5 rounded down, therefore
-    //     y is in the [0.5, 1.5) range
-    //
-    //   2^x = 2^n * 2^y
-    //     2^n can be evaluated by playing with float representation.
-    //     2^y in a small range can be approximated, this code uses an order two
-    //         polynomial approximation. The coefficients have been estimated
-    //         with the Remez algorithm and the resulting polynomial has a
-    //         maximum relative error of 0.17%.
-    // To avoid over/underflow, we reduce the range of input to ]-127, 129].
-    const float32x4_t max_input = vdupq_n_f32(129.f);
-    const float32x4_t min_input = vdupq_n_f32(-126.99999f);
-    const float32x4_t x_min = vminq_f32(b_log2_a, max_input);
-    const float32x4_t x_max = vmaxq_f32(x_min, min_input);
-    // Compute n.
-    const float32x4_t half = vdupq_n_f32(0.5f);
-    const float32x4_t x_minus_half = vsubq_f32(x_max, half);
-    const int32x4_t x_minus_half_floor = vcvtq_s32_f32(x_minus_half);
-
-    // Compute 2^n.
-    const int32x4_t float_exponent_bias = vdupq_n_s32(127);
-    const int32x4_t two_n_exponent =
-        vaddq_s32(x_minus_half_floor, float_exponent_bias);
-    const float32x4_t two_n =
-        vreinterpretq_f32_s32(vshlq_n_s32(two_n_exponent, kFloatExponentShift));
-    // Compute y.
-    const float32x4_t y = vsubq_f32(x_max, vcvtq_f32_s32(x_minus_half_floor));
-
-    // Approximate 2^y ~= C2 * y^2 + C1 * y + C0.
-    const float32x4_t C2 = vdupq_n_f32(3.3718944e-1f);
-    const float32x4_t C1 = vdupq_n_f32(6.5763628e-1f);
-    const float32x4_t C0 = vdupq_n_f32(1.0017247f);
-    float32x4_t exp2_y = C2;
-    exp2_y = vmlaq_f32(C1, y, exp2_y);
-    exp2_y = vmlaq_f32(C0, y, exp2_y);
-
-    // Combine parts.
-    a_exp_b = vmulq_f32(exp2_y, two_n);
-  }
-
-  return a_exp_b;
-}
-
-static void OverdriveNEON(float overdrive_scaling,
-                          float hNlFb,
-                          float hNl[PART_LEN1]) {
-  int i;
-  const float32x4_t vec_hNlFb = vmovq_n_f32(hNlFb);
-  const float32x4_t vec_one = vdupq_n_f32(1.0f);
-  const float32x4_t vec_overdrive_scaling = vmovq_n_f32(overdrive_scaling);
-
-  // vectorized code (four at once)
-  for (i = 0; i + 3 < PART_LEN1; i += 4) {
-    // Weight subbands
-    float32x4_t vec_hNl = vld1q_f32(&hNl[i]);
-    const float32x4_t vec_weightCurve = vld1q_f32(&WebRtcAec_weightCurve[i]);
-    const uint32x4_t bigger = vcgtq_f32(vec_hNl, vec_hNlFb);
-    const float32x4_t vec_weightCurve_hNlFb =
-        vmulq_f32(vec_weightCurve, vec_hNlFb);
-    const float32x4_t vec_one_weightCurve = vsubq_f32(vec_one, vec_weightCurve);
-    const float32x4_t vec_one_weightCurve_hNl =
-        vmulq_f32(vec_one_weightCurve, vec_hNl);
-    const uint32x4_t vec_if0 =
-        vandq_u32(vmvnq_u32(bigger), vreinterpretq_u32_f32(vec_hNl));
-    const float32x4_t vec_one_weightCurve_add =
-        vaddq_f32(vec_weightCurve_hNlFb, vec_one_weightCurve_hNl);
-    const uint32x4_t vec_if1 =
-        vandq_u32(bigger, vreinterpretq_u32_f32(vec_one_weightCurve_add));
-
-    vec_hNl = vreinterpretq_f32_u32(vorrq_u32(vec_if0, vec_if1));
-
-    const float32x4_t vec_overDriveCurve =
-        vld1q_f32(&WebRtcAec_overDriveCurve[i]);
-    const float32x4_t vec_overDriveSm_overDriveCurve =
-        vmulq_f32(vec_overdrive_scaling, vec_overDriveCurve);
-    vec_hNl = vpowq_f32(vec_hNl, vec_overDriveSm_overDriveCurve);
-    vst1q_f32(&hNl[i], vec_hNl);
-  }
-
-  // scalar code for the remaining items.
-  for (; i < PART_LEN1; i++) {
-    // Weight subbands
-    if (hNl[i] > hNlFb) {
-      hNl[i] = WebRtcAec_weightCurve[i] * hNlFb +
-               (1 - WebRtcAec_weightCurve[i]) * hNl[i];
-    }
-
-    hNl[i] = powf(hNl[i], overdrive_scaling * WebRtcAec_overDriveCurve[i]);
-  }
-}
-
-static void SuppressNEON(const float hNl[PART_LEN1], float efw[2][PART_LEN1]) {
-  int i;
-  const float32x4_t vec_minus_one = vdupq_n_f32(-1.0f);
-  // vectorized code (four at once)
-  for (i = 0; i + 3 < PART_LEN1; i += 4) {
-    float32x4_t vec_hNl = vld1q_f32(&hNl[i]);
-    float32x4_t vec_efw_re = vld1q_f32(&efw[0][i]);
-    float32x4_t vec_efw_im = vld1q_f32(&efw[1][i]);
-    vec_efw_re = vmulq_f32(vec_efw_re, vec_hNl);
-    vec_efw_im = vmulq_f32(vec_efw_im, vec_hNl);
-
-    // Ooura fft returns incorrect sign on imaginary component. It matters
-    // here because we are making an additive change with comfort noise.
-    vec_efw_im = vmulq_f32(vec_efw_im, vec_minus_one);
-    vst1q_f32(&efw[0][i], vec_efw_re);
-    vst1q_f32(&efw[1][i], vec_efw_im);
-  }
-
-  // scalar code for the remaining items.
-  for (; i < PART_LEN1; i++) {
-    efw[0][i] *= hNl[i];
-    efw[1][i] *= hNl[i];
-
-    // Ooura fft returns incorrect sign on imaginary component. It matters
-    // here because we are making an additive change with comfort noise.
-    efw[1][i] *= -1;
-  }
-}
-
-static int PartitionDelayNEON(
-    int num_partitions,
-    float h_fft_buf[2][kExtendedNumPartitions * PART_LEN1]) {
-  // Measures the energy in each filter partition and returns the partition with
-  // highest energy.
-  // TODO(bjornv): Spread computational cost by computing one partition per
-  // block?
-  float wfEnMax = 0;
-  int i;
-  int delay = 0;
-
-  for (i = 0; i < num_partitions; i++) {
-    int j;
-    int pos = i * PART_LEN1;
-    float wfEn = 0;
-    float32x4_t vec_wfEn = vdupq_n_f32(0.0f);
-    // vectorized code (four at once)
-    for (j = 0; j + 3 < PART_LEN1; j += 4) {
-      const float32x4_t vec_wfBuf0 = vld1q_f32(&h_fft_buf[0][pos + j]);
-      const float32x4_t vec_wfBuf1 = vld1q_f32(&h_fft_buf[1][pos + j]);
-      vec_wfEn = vmlaq_f32(vec_wfEn, vec_wfBuf0, vec_wfBuf0);
-      vec_wfEn = vmlaq_f32(vec_wfEn, vec_wfBuf1, vec_wfBuf1);
-    }
-    {
-      float32x2_t vec_total;
-      // A B C D
-      vec_total = vpadd_f32(vget_low_f32(vec_wfEn), vget_high_f32(vec_wfEn));
-      // A+B C+D
-      vec_total = vpadd_f32(vec_total, vec_total);
-      // A+B+C+D A+B+C+D
-      wfEn = vget_lane_f32(vec_total, 0);
-    }
-
-    // scalar code for the remaining items.
-    for (; j < PART_LEN1; j++) {
-      wfEn += h_fft_buf[0][pos + j] * h_fft_buf[0][pos + j] +
-              h_fft_buf[1][pos + j] * h_fft_buf[1][pos + j];
-    }
-
-    if (wfEn > wfEnMax) {
-      wfEnMax = wfEn;
-      delay = i;
-    }
-  }
-  return delay;
-}
-
-// Updates the following smoothed  Power Spectral Densities (PSD):
-//  - sd  : near-end
-//  - se  : residual echo
-//  - sx  : far-end
-//  - sde : cross-PSD of near-end and residual echo
-//  - sxd : cross-PSD of near-end and far-end
-//
-// In addition to updating the PSDs, also the filter diverge state is determined
-// upon actions are taken.
-static void UpdateCoherenceSpectraNEON(int mult,
-                                       bool extended_filter_enabled,
-                                       float efw[2][PART_LEN1],
-                                       float dfw[2][PART_LEN1],
-                                       float xfw[2][PART_LEN1],
-                                       CoherenceState* coherence_state,
-                                       short* filter_divergence_state,
-                                       int* extreme_filter_divergence) {
-  // Power estimate smoothing coefficients.
-  const float* ptrGCoh =
-      extended_filter_enabled
-          ? WebRtcAec_kExtendedSmoothingCoefficients[mult - 1]
-          : WebRtcAec_kNormalSmoothingCoefficients[mult - 1];
-  int i;
-  float sdSum = 0, seSum = 0;
-  const float32x4_t vec_15 = vdupq_n_f32(WebRtcAec_kMinFarendPSD);
-  float32x4_t vec_sdSum = vdupq_n_f32(0.0f);
-  float32x4_t vec_seSum = vdupq_n_f32(0.0f);
-
-  for (i = 0; i + 3 < PART_LEN1; i += 4) {
-    const float32x4_t vec_dfw0 = vld1q_f32(&dfw[0][i]);
-    const float32x4_t vec_dfw1 = vld1q_f32(&dfw[1][i]);
-    const float32x4_t vec_efw0 = vld1q_f32(&efw[0][i]);
-    const float32x4_t vec_efw1 = vld1q_f32(&efw[1][i]);
-    const float32x4_t vec_xfw0 = vld1q_f32(&xfw[0][i]);
-    const float32x4_t vec_xfw1 = vld1q_f32(&xfw[1][i]);
-    float32x4_t vec_sd =
-        vmulq_n_f32(vld1q_f32(&coherence_state->sd[i]), ptrGCoh[0]);
-    float32x4_t vec_se =
-        vmulq_n_f32(vld1q_f32(&coherence_state->se[i]), ptrGCoh[0]);
-    float32x4_t vec_sx =
-        vmulq_n_f32(vld1q_f32(&coherence_state->sx[i]), ptrGCoh[0]);
-    float32x4_t vec_dfw_sumsq = vmulq_f32(vec_dfw0, vec_dfw0);
-    float32x4_t vec_efw_sumsq = vmulq_f32(vec_efw0, vec_efw0);
-    float32x4_t vec_xfw_sumsq = vmulq_f32(vec_xfw0, vec_xfw0);
-
-    vec_dfw_sumsq = vmlaq_f32(vec_dfw_sumsq, vec_dfw1, vec_dfw1);
-    vec_efw_sumsq = vmlaq_f32(vec_efw_sumsq, vec_efw1, vec_efw1);
-    vec_xfw_sumsq = vmlaq_f32(vec_xfw_sumsq, vec_xfw1, vec_xfw1);
-    vec_xfw_sumsq = vmaxq_f32(vec_xfw_sumsq, vec_15);
-    vec_sd = vmlaq_n_f32(vec_sd, vec_dfw_sumsq, ptrGCoh[1]);
-    vec_se = vmlaq_n_f32(vec_se, vec_efw_sumsq, ptrGCoh[1]);
-    vec_sx = vmlaq_n_f32(vec_sx, vec_xfw_sumsq, ptrGCoh[1]);
-
-    vst1q_f32(&coherence_state->sd[i], vec_sd);
-    vst1q_f32(&coherence_state->se[i], vec_se);
-    vst1q_f32(&coherence_state->sx[i], vec_sx);
-
-    {
-      float32x4x2_t vec_sde = vld2q_f32(&coherence_state->sde[i][0]);
-      float32x4_t vec_dfwefw0011 = vmulq_f32(vec_dfw0, vec_efw0);
-      float32x4_t vec_dfwefw0110 = vmulq_f32(vec_dfw0, vec_efw1);
-      vec_sde.val[0] = vmulq_n_f32(vec_sde.val[0], ptrGCoh[0]);
-      vec_sde.val[1] = vmulq_n_f32(vec_sde.val[1], ptrGCoh[0]);
-      vec_dfwefw0011 = vmlaq_f32(vec_dfwefw0011, vec_dfw1, vec_efw1);
-      vec_dfwefw0110 = vmlsq_f32(vec_dfwefw0110, vec_dfw1, vec_efw0);
-      vec_sde.val[0] = vmlaq_n_f32(vec_sde.val[0], vec_dfwefw0011, ptrGCoh[1]);
-      vec_sde.val[1] = vmlaq_n_f32(vec_sde.val[1], vec_dfwefw0110, ptrGCoh[1]);
-      vst2q_f32(&coherence_state->sde[i][0], vec_sde);
-    }
-
-    {
-      float32x4x2_t vec_sxd = vld2q_f32(&coherence_state->sxd[i][0]);
-      float32x4_t vec_dfwxfw0011 = vmulq_f32(vec_dfw0, vec_xfw0);
-      float32x4_t vec_dfwxfw0110 = vmulq_f32(vec_dfw0, vec_xfw1);
-      vec_sxd.val[0] = vmulq_n_f32(vec_sxd.val[0], ptrGCoh[0]);
-      vec_sxd.val[1] = vmulq_n_f32(vec_sxd.val[1], ptrGCoh[0]);
-      vec_dfwxfw0011 = vmlaq_f32(vec_dfwxfw0011, vec_dfw1, vec_xfw1);
-      vec_dfwxfw0110 = vmlsq_f32(vec_dfwxfw0110, vec_dfw1, vec_xfw0);
-      vec_sxd.val[0] = vmlaq_n_f32(vec_sxd.val[0], vec_dfwxfw0011, ptrGCoh[1]);
-      vec_sxd.val[1] = vmlaq_n_f32(vec_sxd.val[1], vec_dfwxfw0110, ptrGCoh[1]);
-      vst2q_f32(&coherence_state->sxd[i][0], vec_sxd);
-    }
-
-    vec_sdSum = vaddq_f32(vec_sdSum, vec_sd);
-    vec_seSum = vaddq_f32(vec_seSum, vec_se);
-  }
-  {
-    float32x2_t vec_sdSum_total;
-    float32x2_t vec_seSum_total;
-    // A B C D
-    vec_sdSum_total =
-        vpadd_f32(vget_low_f32(vec_sdSum), vget_high_f32(vec_sdSum));
-    vec_seSum_total =
-        vpadd_f32(vget_low_f32(vec_seSum), vget_high_f32(vec_seSum));
-    // A+B C+D
-    vec_sdSum_total = vpadd_f32(vec_sdSum_total, vec_sdSum_total);
-    vec_seSum_total = vpadd_f32(vec_seSum_total, vec_seSum_total);
-    // A+B+C+D A+B+C+D
-    sdSum = vget_lane_f32(vec_sdSum_total, 0);
-    seSum = vget_lane_f32(vec_seSum_total, 0);
-  }
-
-  // scalar code for the remaining items.
-  for (; i < PART_LEN1; i++) {
-    coherence_state->sd[i] =
-        ptrGCoh[0] * coherence_state->sd[i] +
-        ptrGCoh[1] * (dfw[0][i] * dfw[0][i] + dfw[1][i] * dfw[1][i]);
-    coherence_state->se[i] =
-        ptrGCoh[0] * coherence_state->se[i] +
-        ptrGCoh[1] * (efw[0][i] * efw[0][i] + efw[1][i] * efw[1][i]);
-    // We threshold here to protect against the ill-effects of a zero farend.
-    // The threshold is not arbitrarily chosen, but balances protection and
-    // adverse interaction with the algorithm's tuning.
-    // TODO(bjornv): investigate further why this is so sensitive.
-    coherence_state->sx[i] =
-        ptrGCoh[0] * coherence_state->sx[i] +
-        ptrGCoh[1] *
-            WEBRTC_SPL_MAX(xfw[0][i] * xfw[0][i] + xfw[1][i] * xfw[1][i],
-                           WebRtcAec_kMinFarendPSD);
-
-    coherence_state->sde[i][0] =
-        ptrGCoh[0] * coherence_state->sde[i][0] +
-        ptrGCoh[1] * (dfw[0][i] * efw[0][i] + dfw[1][i] * efw[1][i]);
-    coherence_state->sde[i][1] =
-        ptrGCoh[0] * coherence_state->sde[i][1] +
-        ptrGCoh[1] * (dfw[0][i] * efw[1][i] - dfw[1][i] * efw[0][i]);
-
-    coherence_state->sxd[i][0] =
-        ptrGCoh[0] * coherence_state->sxd[i][0] +
-        ptrGCoh[1] * (dfw[0][i] * xfw[0][i] + dfw[1][i] * xfw[1][i]);
-    coherence_state->sxd[i][1] =
-        ptrGCoh[0] * coherence_state->sxd[i][1] +
-        ptrGCoh[1] * (dfw[0][i] * xfw[1][i] - dfw[1][i] * xfw[0][i]);
-
-    sdSum += coherence_state->sd[i];
-    seSum += coherence_state->se[i];
-  }
-
-  // Divergent filter safeguard update.
-  *filter_divergence_state =
-      (*filter_divergence_state ? 1.05f : 1.0f) * seSum > sdSum;
-
-  // Signal extreme filter divergence if the error is significantly larger
-  // than the nearend (13 dB).
-  *extreme_filter_divergence = (seSum > (19.95f * sdSum));
-}
-
-// Window time domain data to be used by the fft.
-static void WindowDataNEON(float* x_windowed, const float* x) {
-  int i;
-  for (i = 0; i < PART_LEN; i += 4) {
-    const float32x4_t vec_Buf1 = vld1q_f32(&x[i]);
-    const float32x4_t vec_Buf2 = vld1q_f32(&x[PART_LEN + i]);
-    const float32x4_t vec_sqrtHanning = vld1q_f32(&WebRtcAec_sqrtHanning[i]);
-    // A B C D
-    float32x4_t vec_sqrtHanning_rev =
-        vld1q_f32(&WebRtcAec_sqrtHanning[PART_LEN - i - 3]);
-    // B A D C
-    vec_sqrtHanning_rev = vrev64q_f32(vec_sqrtHanning_rev);
-    // D C B A
-    vec_sqrtHanning_rev = vcombine_f32(vget_high_f32(vec_sqrtHanning_rev),
-                                       vget_low_f32(vec_sqrtHanning_rev));
-    vst1q_f32(&x_windowed[i], vmulq_f32(vec_Buf1, vec_sqrtHanning));
-    vst1q_f32(&x_windowed[PART_LEN + i],
-              vmulq_f32(vec_Buf2, vec_sqrtHanning_rev));
-  }
-}
-
-// Puts fft output data into a complex valued array.
-static void StoreAsComplexNEON(const float* data,
-                               float data_complex[2][PART_LEN1]) {
-  int i;
-  for (i = 0; i < PART_LEN; i += 4) {
-    const float32x4x2_t vec_data = vld2q_f32(&data[2 * i]);
-    vst1q_f32(&data_complex[0][i], vec_data.val[0]);
-    vst1q_f32(&data_complex[1][i], vec_data.val[1]);
-  }
-  // fix beginning/end values
-  data_complex[1][0] = 0;
-  data_complex[1][PART_LEN] = 0;
-  data_complex[0][0] = data[0];
-  data_complex[0][PART_LEN] = data[1];
-}
-
-static void ComputeCoherenceNEON(const CoherenceState* coherence_state,
-                                 float* cohde,
-                                 float* cohxd) {
-  int i;
-
-  {
-    const float32x4_t vec_1eminus10 = vdupq_n_f32(1e-10f);
-
-    // Subband coherence
-    for (i = 0; i + 3 < PART_LEN1; i += 4) {
-      const float32x4_t vec_sd = vld1q_f32(&coherence_state->sd[i]);
-      const float32x4_t vec_se = vld1q_f32(&coherence_state->se[i]);
-      const float32x4_t vec_sx = vld1q_f32(&coherence_state->sx[i]);
-      const float32x4_t vec_sdse = vmlaq_f32(vec_1eminus10, vec_sd, vec_se);
-      const float32x4_t vec_sdsx = vmlaq_f32(vec_1eminus10, vec_sd, vec_sx);
-      float32x4x2_t vec_sde = vld2q_f32(&coherence_state->sde[i][0]);
-      float32x4x2_t vec_sxd = vld2q_f32(&coherence_state->sxd[i][0]);
-      float32x4_t vec_cohde = vmulq_f32(vec_sde.val[0], vec_sde.val[0]);
-      float32x4_t vec_cohxd = vmulq_f32(vec_sxd.val[0], vec_sxd.val[0]);
-      vec_cohde = vmlaq_f32(vec_cohde, vec_sde.val[1], vec_sde.val[1]);
-      vec_cohde = vdivq_f32(vec_cohde, vec_sdse);
-      vec_cohxd = vmlaq_f32(vec_cohxd, vec_sxd.val[1], vec_sxd.val[1]);
-      vec_cohxd = vdivq_f32(vec_cohxd, vec_sdsx);
-
-      vst1q_f32(&cohde[i], vec_cohde);
-      vst1q_f32(&cohxd[i], vec_cohxd);
-    }
-  }
-  // scalar code for the remaining items.
-  for (; i < PART_LEN1; i++) {
-    cohde[i] = (coherence_state->sde[i][0] * coherence_state->sde[i][0] +
-                coherence_state->sde[i][1] * coherence_state->sde[i][1]) /
-               (coherence_state->sd[i] * coherence_state->se[i] + 1e-10f);
-    cohxd[i] = (coherence_state->sxd[i][0] * coherence_state->sxd[i][0] +
-                coherence_state->sxd[i][1] * coherence_state->sxd[i][1]) /
-               (coherence_state->sx[i] * coherence_state->sd[i] + 1e-10f);
-  }
-}
-
-void WebRtcAec_InitAec_neon(void) {
-  WebRtcAec_FilterFar = FilterFarNEON;
-  WebRtcAec_ScaleErrorSignal = ScaleErrorSignalNEON;
-  WebRtcAec_FilterAdaptation = FilterAdaptationNEON;
-  WebRtcAec_Overdrive = OverdriveNEON;
-  WebRtcAec_Suppress = SuppressNEON;
-  WebRtcAec_ComputeCoherence = ComputeCoherenceNEON;
-  WebRtcAec_UpdateCoherenceSpectra = UpdateCoherenceSpectraNEON;
-  WebRtcAec_StoreAsComplex = StoreAsComplexNEON;
-  WebRtcAec_PartitionDelay = PartitionDelayNEON;
-  WebRtcAec_WindowData = WindowDataNEON;
-}
-}  // namespace webrtc
-
-#endif
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec/aec_core_optimized_methods.h b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec/aec_core_optimized_methods.h
deleted file mode 100644
index 03c027dabf..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec/aec_core_optimized_methods.h
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- *  Copyright (c) 2016 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#ifndef MODULES_AUDIO_PROCESSING_AEC_AEC_CORE_OPTIMIZED_METHODS_H_
-#define MODULES_AUDIO_PROCESSING_AEC_AEC_CORE_OPTIMIZED_METHODS_H_
-
-#include <memory>
-
-#include "modules/audio_processing/aec/aec_core.h"
-
-namespace webrtc {
-
-typedef void (*WebRtcAecFilterFar)(
-    int num_partitions,
-    int x_fft_buf_block_pos,
-    float x_fft_buf[2][kExtendedNumPartitions * PART_LEN1],
-    float h_fft_buf[2][kExtendedNumPartitions * PART_LEN1],
-    float y_fft[2][PART_LEN1]);
-extern WebRtcAecFilterFar WebRtcAec_FilterFar;
-typedef void (*WebRtcAecScaleErrorSignal)(float mu,
-                                          float error_threshold,
-                                          float x_pow[PART_LEN1],
-                                          float ef[2][PART_LEN1]);
-extern WebRtcAecScaleErrorSignal WebRtcAec_ScaleErrorSignal;
-typedef void (*WebRtcAecFilterAdaptation)(
-    const OouraFft& ooura_fft,
-    int num_partitions,
-    int x_fft_buf_block_pos,
-    float x_fft_buf[2][kExtendedNumPartitions * PART_LEN1],
-    float e_fft[2][PART_LEN1],
-    float h_fft_buf[2][kExtendedNumPartitions * PART_LEN1]);
-extern WebRtcAecFilterAdaptation WebRtcAec_FilterAdaptation;
-
-typedef void (*WebRtcAecOverdrive)(float overdrive_scaling,
-                                   const float hNlFb,
-                                   float hNl[PART_LEN1]);
-extern WebRtcAecOverdrive WebRtcAec_Overdrive;
-
-typedef void (*WebRtcAecSuppress)(const float hNl[PART_LEN1],
-                                  float efw[2][PART_LEN1]);
-extern WebRtcAecSuppress WebRtcAec_Suppress;
-
-typedef void (*WebRtcAecComputeCoherence)(const CoherenceState* coherence_state,
-                                          float* cohde,
-                                          float* cohxd);
-extern WebRtcAecComputeCoherence WebRtcAec_ComputeCoherence;
-
-typedef void (*WebRtcAecUpdateCoherenceSpectra)(int mult,
-                                                bool extended_filter_enabled,
-                                                float efw[2][PART_LEN1],
-                                                float dfw[2][PART_LEN1],
-                                                float xfw[2][PART_LEN1],
-                                                CoherenceState* coherence_state,
-                                                short* filter_divergence_state,
-                                                int* extreme_filter_divergence);
-extern WebRtcAecUpdateCoherenceSpectra WebRtcAec_UpdateCoherenceSpectra;
-
-typedef int (*WebRtcAecPartitionDelay)(
-    int num_partitions,
-    float h_fft_buf[2][kExtendedNumPartitions * PART_LEN1]);
-extern WebRtcAecPartitionDelay WebRtcAec_PartitionDelay;
-
-typedef void (*WebRtcAecStoreAsComplex)(const float* data,
-                                        float data_complex[2][PART_LEN1]);
-extern WebRtcAecStoreAsComplex WebRtcAec_StoreAsComplex;
-
-typedef void (*WebRtcAecWindowData)(float* x_windowed, const float* x);
-extern WebRtcAecWindowData WebRtcAec_WindowData;
-
-}  // namespace webrtc
-
-#endif  // MODULES_AUDIO_PROCESSING_AEC_AEC_CORE_OPTIMIZED_METHODS_H_
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec/aec_core_sse2.cc b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec/aec_core_sse2.cc
deleted file mode 100644
index 89315c6fbc..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec/aec_core_sse2.cc
+++ /dev/null
@@ -1,753 +0,0 @@
-/*
- *  Copyright (c) 2011 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-/*
- * The core AEC algorithm, SSE2 version of speed-critical functions.
- */
-#include "rtc_base/system/arch.h"
-#ifdef WEBRTC_ARCH_X86_FAMILY
-
-#include <emmintrin.h>
-#include <math.h>
-#include <string.h>  // memset
-
-extern "C" {
-#include "common_audio/signal_processing/include/signal_processing_library.h"
-}
-#include "modules/audio_processing/aec/aec_common.h"
-#include "modules/audio_processing/aec/aec_core_optimized_methods.h"
-#include "modules/audio_processing/utility/ooura_fft.h"
-
-namespace webrtc {
-
-__inline static float MulRe(float aRe, float aIm, float bRe, float bIm) {
-  return aRe * bRe - aIm * bIm;
-}
-
-__inline static float MulIm(float aRe, float aIm, float bRe, float bIm) {
-  return aRe * bIm + aIm * bRe;
-}
-
-static void FilterFarSSE2(
-    int num_partitions,
-    int x_fft_buf_block_pos,
-    float x_fft_buf[2][kExtendedNumPartitions * PART_LEN1],
-    float h_fft_buf[2][kExtendedNumPartitions * PART_LEN1],
-    float y_fft[2][PART_LEN1]) {
-  int i;
-  for (i = 0; i < num_partitions; i++) {
-    int j;
-    int xPos = (i + x_fft_buf_block_pos) * PART_LEN1;
-    int pos = i * PART_LEN1;
-    // Check for wrap
-    if (i + x_fft_buf_block_pos >= num_partitions) {
-      xPos -= num_partitions * (PART_LEN1);
-    }
-
-    // vectorized code (four at once)
-    for (j = 0; j + 3 < PART_LEN1; j += 4) {
-      const __m128 x_fft_buf_re = _mm_loadu_ps(&x_fft_buf[0][xPos + j]);
-      const __m128 x_fft_buf_im = _mm_loadu_ps(&x_fft_buf[1][xPos + j]);
-      const __m128 h_fft_buf_re = _mm_loadu_ps(&h_fft_buf[0][pos + j]);
-      const __m128 h_fft_buf_im = _mm_loadu_ps(&h_fft_buf[1][pos + j]);
-      const __m128 y_fft_re = _mm_loadu_ps(&y_fft[0][j]);
-      const __m128 y_fft_im = _mm_loadu_ps(&y_fft[1][j]);
-      const __m128 a = _mm_mul_ps(x_fft_buf_re, h_fft_buf_re);
-      const __m128 b = _mm_mul_ps(x_fft_buf_im, h_fft_buf_im);
-      const __m128 c = _mm_mul_ps(x_fft_buf_re, h_fft_buf_im);
-      const __m128 d = _mm_mul_ps(x_fft_buf_im, h_fft_buf_re);
-      const __m128 e = _mm_sub_ps(a, b);
-      const __m128 f = _mm_add_ps(c, d);
-      const __m128 g = _mm_add_ps(y_fft_re, e);
-      const __m128 h = _mm_add_ps(y_fft_im, f);
-      _mm_storeu_ps(&y_fft[0][j], g);
-      _mm_storeu_ps(&y_fft[1][j], h);
-    }
-    // scalar code for the remaining items.
-    for (; j < PART_LEN1; j++) {
-      y_fft[0][j] += MulRe(x_fft_buf[0][xPos + j], x_fft_buf[1][xPos + j],
-                           h_fft_buf[0][pos + j], h_fft_buf[1][pos + j]);
-      y_fft[1][j] += MulIm(x_fft_buf[0][xPos + j], x_fft_buf[1][xPos + j],
-                           h_fft_buf[0][pos + j], h_fft_buf[1][pos + j]);
-    }
-  }
-}
-
-static void ScaleErrorSignalSSE2(float mu,
-                                 float error_threshold,
-                                 float x_pow[PART_LEN1],
-                                 float ef[2][PART_LEN1]) {
-  const __m128 k1e_10f = _mm_set1_ps(1e-10f);
-  const __m128 kMu = _mm_set1_ps(mu);
-  const __m128 kThresh = _mm_set1_ps(error_threshold);
-
-  int i;
-  // vectorized code (four at once)
-  for (i = 0; i + 3 < PART_LEN1; i += 4) {
-    const __m128 x_pow_local = _mm_loadu_ps(&x_pow[i]);
-    const __m128 ef_re_base = _mm_loadu_ps(&ef[0][i]);
-    const __m128 ef_im_base = _mm_loadu_ps(&ef[1][i]);
-
-    const __m128 xPowPlus = _mm_add_ps(x_pow_local, k1e_10f);
-    __m128 ef_re = _mm_div_ps(ef_re_base, xPowPlus);
-    __m128 ef_im = _mm_div_ps(ef_im_base, xPowPlus);
-    const __m128 ef_re2 = _mm_mul_ps(ef_re, ef_re);
-    const __m128 ef_im2 = _mm_mul_ps(ef_im, ef_im);
-    const __m128 ef_sum2 = _mm_add_ps(ef_re2, ef_im2);
-    const __m128 absEf = _mm_sqrt_ps(ef_sum2);
-    const __m128 bigger = _mm_cmpgt_ps(absEf, kThresh);
-    __m128 absEfPlus = _mm_add_ps(absEf, k1e_10f);
-    const __m128 absEfInv = _mm_div_ps(kThresh, absEfPlus);
-    __m128 ef_re_if = _mm_mul_ps(ef_re, absEfInv);
-    __m128 ef_im_if = _mm_mul_ps(ef_im, absEfInv);
-    ef_re_if = _mm_and_ps(bigger, ef_re_if);
-    ef_im_if = _mm_and_ps(bigger, ef_im_if);
-    ef_re = _mm_andnot_ps(bigger, ef_re);
-    ef_im = _mm_andnot_ps(bigger, ef_im);
-    ef_re = _mm_or_ps(ef_re, ef_re_if);
-    ef_im = _mm_or_ps(ef_im, ef_im_if);
-    ef_re = _mm_mul_ps(ef_re, kMu);
-    ef_im = _mm_mul_ps(ef_im, kMu);
-
-    _mm_storeu_ps(&ef[0][i], ef_re);
-    _mm_storeu_ps(&ef[1][i], ef_im);
-  }
-  // scalar code for the remaining items.
-  {
-    for (; i < (PART_LEN1); i++) {
-      float abs_ef;
-      ef[0][i] /= (x_pow[i] + 1e-10f);
-      ef[1][i] /= (x_pow[i] + 1e-10f);
-      abs_ef = sqrtf(ef[0][i] * ef[0][i] + ef[1][i] * ef[1][i]);
-
-      if (abs_ef > error_threshold) {
-        abs_ef = error_threshold / (abs_ef + 1e-10f);
-        ef[0][i] *= abs_ef;
-        ef[1][i] *= abs_ef;
-      }
-
-      // Stepsize factor
-      ef[0][i] *= mu;
-      ef[1][i] *= mu;
-    }
-  }
-}
-
-static void FilterAdaptationSSE2(
-    const OouraFft& ooura_fft,
-    int num_partitions,
-    int x_fft_buf_block_pos,
-    float x_fft_buf[2][kExtendedNumPartitions * PART_LEN1],
-    float e_fft[2][PART_LEN1],
-    float h_fft_buf[2][kExtendedNumPartitions * PART_LEN1]) {
-  float fft[PART_LEN2];
-  int i, j;
-  for (i = 0; i < num_partitions; i++) {
-    int xPos = (i + x_fft_buf_block_pos) * (PART_LEN1);
-    int pos = i * PART_LEN1;
-    // Check for wrap
-    if (i + x_fft_buf_block_pos >= num_partitions) {
-      xPos -= num_partitions * PART_LEN1;
-    }
-
-    // Process the whole array...
-    for (j = 0; j < PART_LEN; j += 4) {
-      // Load x_fft_buf and e_fft.
-      const __m128 x_fft_buf_re = _mm_loadu_ps(&x_fft_buf[0][xPos + j]);
-      const __m128 x_fft_buf_im = _mm_loadu_ps(&x_fft_buf[1][xPos + j]);
-      const __m128 e_fft_re = _mm_loadu_ps(&e_fft[0][j]);
-      const __m128 e_fft_im = _mm_loadu_ps(&e_fft[1][j]);
-      // Calculate the product of conjugate(x_fft_buf) by e_fft.
-      //   re(conjugate(a) * b) = aRe * bRe + aIm * bIm
-      //   im(conjugate(a) * b)=  aRe * bIm - aIm * bRe
-      const __m128 a = _mm_mul_ps(x_fft_buf_re, e_fft_re);
-      const __m128 b = _mm_mul_ps(x_fft_buf_im, e_fft_im);
-      const __m128 c = _mm_mul_ps(x_fft_buf_re, e_fft_im);
-      const __m128 d = _mm_mul_ps(x_fft_buf_im, e_fft_re);
-      const __m128 e = _mm_add_ps(a, b);
-      const __m128 f = _mm_sub_ps(c, d);
-      // Interleave real and imaginary parts.
-      const __m128 g = _mm_unpacklo_ps(e, f);
-      const __m128 h = _mm_unpackhi_ps(e, f);
-      // Store
-      _mm_storeu_ps(&fft[2 * j + 0], g);
-      _mm_storeu_ps(&fft[2 * j + 4], h);
-    }
-    // ... and fixup the first imaginary entry.
-    fft[1] =
-        MulRe(x_fft_buf[0][xPos + PART_LEN], -x_fft_buf[1][xPos + PART_LEN],
-              e_fft[0][PART_LEN], e_fft[1][PART_LEN]);
-
-    ooura_fft.InverseFft(fft);
-    memset(fft + PART_LEN, 0, sizeof(float) * PART_LEN);
-
-    // fft scaling
-    {
-      float scale = 2.0f / PART_LEN2;
-      const __m128 scale_ps = _mm_load_ps1(&scale);
-      for (j = 0; j < PART_LEN; j += 4) {
-        const __m128 fft_ps = _mm_loadu_ps(&fft[j]);
-        const __m128 fft_scale = _mm_mul_ps(fft_ps, scale_ps);
-        _mm_storeu_ps(&fft[j], fft_scale);
-      }
-    }
-    ooura_fft.Fft(fft);
-
-    {
-      float wt1 = h_fft_buf[1][pos];
-      h_fft_buf[0][pos + PART_LEN] += fft[1];
-      for (j = 0; j < PART_LEN; j += 4) {
-        __m128 wtBuf_re = _mm_loadu_ps(&h_fft_buf[0][pos + j]);
-        __m128 wtBuf_im = _mm_loadu_ps(&h_fft_buf[1][pos + j]);
-        const __m128 fft0 = _mm_loadu_ps(&fft[2 * j + 0]);
-        const __m128 fft4 = _mm_loadu_ps(&fft[2 * j + 4]);
-        const __m128 fft_re =
-            _mm_shuffle_ps(fft0, fft4, _MM_SHUFFLE(2, 0, 2, 0));
-        const __m128 fft_im =
-            _mm_shuffle_ps(fft0, fft4, _MM_SHUFFLE(3, 1, 3, 1));
-        wtBuf_re = _mm_add_ps(wtBuf_re, fft_re);
-        wtBuf_im = _mm_add_ps(wtBuf_im, fft_im);
-        _mm_storeu_ps(&h_fft_buf[0][pos + j], wtBuf_re);
-        _mm_storeu_ps(&h_fft_buf[1][pos + j], wtBuf_im);
-      }
-      h_fft_buf[1][pos] = wt1;
-    }
-  }
-}
-
-static __m128 mm_pow_ps(__m128 a, __m128 b) {
-  // a^b = exp2(b * log2(a))
-  //   exp2(x) and log2(x) are calculated using polynomial approximations.
-  __m128 log2_a, b_log2_a, a_exp_b;
-
-  // Calculate log2(x), x = a.
-  {
-    // To calculate log2(x), we decompose x like this:
-    //   x = y * 2^n
-    //     n is an integer
-    //     y is in the [1.0, 2.0) range
-    //
-    //   log2(x) = log2(y) + n
-    //     n       can be evaluated by playing with float representation.
-    //     log2(y) in a small range can be approximated, this code uses an order
-    //             five polynomial approximation. The coefficients have been
-    //             estimated with the Remez algorithm and the resulting
-    //             polynomial has a maximum relative error of 0.00086%.
-
-    // Compute n.
-    //    This is done by masking the exponent, shifting it into the top bit of
-    //    the mantissa, putting eight into the biased exponent (to shift/
-    //    compensate the fact that the exponent has been shifted in the top/
-    //    fractional part and finally getting rid of the implicit leading one
-    //    from the mantissa by substracting it out.
-    static const ALIGN16_BEG int float_exponent_mask[4] ALIGN16_END = {
-        0x7F800000, 0x7F800000, 0x7F800000, 0x7F800000};
-    static const ALIGN16_BEG int eight_biased_exponent[4] ALIGN16_END = {
-        0x43800000, 0x43800000, 0x43800000, 0x43800000};
-    static const ALIGN16_BEG int implicit_leading_one[4] ALIGN16_END = {
-        0x43BF8000, 0x43BF8000, 0x43BF8000, 0x43BF8000};
-    static const int shift_exponent_into_top_mantissa = 8;
-    const __m128 two_n =
-        _mm_and_ps(a, *(reinterpret_cast<const __m128*>(float_exponent_mask)));
-    const __m128 n_1 = _mm_castsi128_ps(_mm_srli_epi32(
-        _mm_castps_si128(two_n), shift_exponent_into_top_mantissa));
-    const __m128 n_0 = _mm_or_ps(
-        n_1, *(reinterpret_cast<const __m128*>(eight_biased_exponent)));
-    const __m128 n = _mm_sub_ps(
-        n_0, *(reinterpret_cast<const __m128*>(implicit_leading_one)));
-
-    // Compute y.
-    static const ALIGN16_BEG int mantissa_mask[4] ALIGN16_END = {
-        0x007FFFFF, 0x007FFFFF, 0x007FFFFF, 0x007FFFFF};
-    static const ALIGN16_BEG int zero_biased_exponent_is_one[4] ALIGN16_END = {
-        0x3F800000, 0x3F800000, 0x3F800000, 0x3F800000};
-    const __m128 mantissa =
-        _mm_and_ps(a, *(reinterpret_cast<const __m128*>(mantissa_mask)));
-    const __m128 y = _mm_or_ps(
-        mantissa,
-        *(reinterpret_cast<const __m128*>(zero_biased_exponent_is_one)));
-
-    // Approximate log2(y) ~= (y - 1) * pol5(y).
-    //    pol5(y) = C5 * y^5 + C4 * y^4 + C3 * y^3 + C2 * y^2 + C1 * y + C0
-    static const ALIGN16_BEG float ALIGN16_END C5[4] = {
-        -3.4436006e-2f, -3.4436006e-2f, -3.4436006e-2f, -3.4436006e-2f};
-    static const ALIGN16_BEG float ALIGN16_END C4[4] = {
-        3.1821337e-1f, 3.1821337e-1f, 3.1821337e-1f, 3.1821337e-1f};
-    static const ALIGN16_BEG float ALIGN16_END C3[4] = {
-        -1.2315303f, -1.2315303f, -1.2315303f, -1.2315303f};
-    static const ALIGN16_BEG float ALIGN16_END C2[4] = {2.5988452f, 2.5988452f,
-                                                        2.5988452f, 2.5988452f};
-    static const ALIGN16_BEG float ALIGN16_END C1[4] = {
-        -3.3241990f, -3.3241990f, -3.3241990f, -3.3241990f};
-    static const ALIGN16_BEG float ALIGN16_END C0[4] = {3.1157899f, 3.1157899f,
-                                                        3.1157899f, 3.1157899f};
-    const __m128 pol5_y_0 =
-        _mm_mul_ps(y, *(reinterpret_cast<const __m128*>(C5)));
-    const __m128 pol5_y_1 =
-        _mm_add_ps(pol5_y_0, *(reinterpret_cast<const __m128*>(C4)));
-    const __m128 pol5_y_2 = _mm_mul_ps(pol5_y_1, y);
-    const __m128 pol5_y_3 =
-        _mm_add_ps(pol5_y_2, *(reinterpret_cast<const __m128*>(C3)));
-    const __m128 pol5_y_4 = _mm_mul_ps(pol5_y_3, y);
-    const __m128 pol5_y_5 =
-        _mm_add_ps(pol5_y_4, *(reinterpret_cast<const __m128*>(C2)));
-    const __m128 pol5_y_6 = _mm_mul_ps(pol5_y_5, y);
-    const __m128 pol5_y_7 =
-        _mm_add_ps(pol5_y_6, *(reinterpret_cast<const __m128*>(C1)));
-    const __m128 pol5_y_8 = _mm_mul_ps(pol5_y_7, y);
-    const __m128 pol5_y =
-        _mm_add_ps(pol5_y_8, *(reinterpret_cast<const __m128*>(C0)));
-    const __m128 y_minus_one = _mm_sub_ps(
-        y, *(reinterpret_cast<const __m128*>(zero_biased_exponent_is_one)));
-    const __m128 log2_y = _mm_mul_ps(y_minus_one, pol5_y);
-
-    // Combine parts.
-    log2_a = _mm_add_ps(n, log2_y);
-  }
-
-  // b * log2(a)
-  b_log2_a = _mm_mul_ps(b, log2_a);
-
-  // Calculate exp2(x), x = b * log2(a).
-  {
-    // To calculate 2^x, we decompose x like this:
-    //   x = n + y
-    //     n is an integer, the value of x - 0.5 rounded down, therefore
-    //     y is in the [0.5, 1.5) range
-    //
-    //   2^x = 2^n * 2^y
-    //     2^n can be evaluated by playing with float representation.
-    //     2^y in a small range can be approximated, this code uses an order two
-    //         polynomial approximation. The coefficients have been estimated
-    //         with the Remez algorithm and the resulting polynomial has a
-    //         maximum relative error of 0.17%.
-
-    // To avoid over/underflow, we reduce the range of input to ]-127, 129].
-    static const ALIGN16_BEG float max_input[4] ALIGN16_END = {129.f, 129.f,
-                                                               129.f, 129.f};
-    static const ALIGN16_BEG float min_input[4] ALIGN16_END = {
-        -126.99999f, -126.99999f, -126.99999f, -126.99999f};
-    const __m128 x_min =
-        _mm_min_ps(b_log2_a, *(reinterpret_cast<const __m128*>(max_input)));
-    const __m128 x_max =
-        _mm_max_ps(x_min, *(reinterpret_cast<const __m128*>(min_input)));
-    // Compute n.
-    static const ALIGN16_BEG float half[4] ALIGN16_END = {0.5f, 0.5f, 0.5f,
-                                                          0.5f};
-    const __m128 x_minus_half =
-        _mm_sub_ps(x_max, *(reinterpret_cast<const __m128*>(half)));
-    const __m128i x_minus_half_floor = _mm_cvtps_epi32(x_minus_half);
-    // Compute 2^n.
-    static const ALIGN16_BEG int float_exponent_bias[4] ALIGN16_END = {
-        127, 127, 127, 127};
-    static const int float_exponent_shift = 23;
-    const __m128i two_n_exponent =
-        _mm_add_epi32(x_minus_half_floor,
-                      *(reinterpret_cast<const __m128i*>(float_exponent_bias)));
-    const __m128 two_n =
-        _mm_castsi128_ps(_mm_slli_epi32(two_n_exponent, float_exponent_shift));
-    // Compute y.
-    const __m128 y = _mm_sub_ps(x_max, _mm_cvtepi32_ps(x_minus_half_floor));
-    // Approximate 2^y ~= C2 * y^2 + C1 * y + C0.
-    static const ALIGN16_BEG float C2[4] ALIGN16_END = {
-        3.3718944e-1f, 3.3718944e-1f, 3.3718944e-1f, 3.3718944e-1f};
-    static const ALIGN16_BEG float C1[4] ALIGN16_END = {
-        6.5763628e-1f, 6.5763628e-1f, 6.5763628e-1f, 6.5763628e-1f};
-    static const ALIGN16_BEG float C0[4] ALIGN16_END = {1.0017247f, 1.0017247f,
-                                                        1.0017247f, 1.0017247f};
-    const __m128 exp2_y_0 =
-        _mm_mul_ps(y, *(reinterpret_cast<const __m128*>(C2)));
-    const __m128 exp2_y_1 =
-        _mm_add_ps(exp2_y_0, *(reinterpret_cast<const __m128*>(C1)));
-    const __m128 exp2_y_2 = _mm_mul_ps(exp2_y_1, y);
-    const __m128 exp2_y =
-        _mm_add_ps(exp2_y_2, *(reinterpret_cast<const __m128*>(C0)));
-
-    // Combine parts.
-    a_exp_b = _mm_mul_ps(exp2_y, two_n);
-  }
-  return a_exp_b;
-}
-
-static void OverdriveSSE2(float overdrive_scaling,
-                          float hNlFb,
-                          float hNl[PART_LEN1]) {
-  int i;
-  const __m128 vec_hNlFb = _mm_set1_ps(hNlFb);
-  const __m128 vec_one = _mm_set1_ps(1.0f);
-  const __m128 vec_overdrive_scaling = _mm_set1_ps(overdrive_scaling);
-  // vectorized code (four at once)
-  for (i = 0; i + 3 < PART_LEN1; i += 4) {
-    // Weight subbands
-    __m128 vec_hNl = _mm_loadu_ps(&hNl[i]);
-    const __m128 vec_weightCurve = _mm_loadu_ps(&WebRtcAec_weightCurve[i]);
-    const __m128 bigger = _mm_cmpgt_ps(vec_hNl, vec_hNlFb);
-    const __m128 vec_weightCurve_hNlFb = _mm_mul_ps(vec_weightCurve, vec_hNlFb);
-    const __m128 vec_one_weightCurve = _mm_sub_ps(vec_one, vec_weightCurve);
-    const __m128 vec_one_weightCurve_hNl =
-        _mm_mul_ps(vec_one_weightCurve, vec_hNl);
-    const __m128 vec_if0 = _mm_andnot_ps(bigger, vec_hNl);
-    const __m128 vec_if1 = _mm_and_ps(
-        bigger, _mm_add_ps(vec_weightCurve_hNlFb, vec_one_weightCurve_hNl));
-    vec_hNl = _mm_or_ps(vec_if0, vec_if1);
-
-    const __m128 vec_overDriveCurve =
-        _mm_loadu_ps(&WebRtcAec_overDriveCurve[i]);
-    const __m128 vec_overDriveSm_overDriveCurve =
-        _mm_mul_ps(vec_overdrive_scaling, vec_overDriveCurve);
-    vec_hNl = mm_pow_ps(vec_hNl, vec_overDriveSm_overDriveCurve);
-    _mm_storeu_ps(&hNl[i], vec_hNl);
-  }
-  // scalar code for the remaining items.
-  for (; i < PART_LEN1; i++) {
-    // Weight subbands
-    if (hNl[i] > hNlFb) {
-      hNl[i] = WebRtcAec_weightCurve[i] * hNlFb +
-               (1 - WebRtcAec_weightCurve[i]) * hNl[i];
-    }
-    hNl[i] = powf(hNl[i], overdrive_scaling * WebRtcAec_overDriveCurve[i]);
-  }
-}
-
-static void SuppressSSE2(const float hNl[PART_LEN1], float efw[2][PART_LEN1]) {
-  int i;
-  const __m128 vec_minus_one = _mm_set1_ps(-1.0f);
-  // vectorized code (four at once)
-  for (i = 0; i + 3 < PART_LEN1; i += 4) {
-    // Suppress error signal
-    __m128 vec_hNl = _mm_loadu_ps(&hNl[i]);
-    __m128 vec_efw_re = _mm_loadu_ps(&efw[0][i]);
-    __m128 vec_efw_im = _mm_loadu_ps(&efw[1][i]);
-    vec_efw_re = _mm_mul_ps(vec_efw_re, vec_hNl);
-    vec_efw_im = _mm_mul_ps(vec_efw_im, vec_hNl);
-
-    // Ooura fft returns incorrect sign on imaginary component. It matters
-    // here because we are making an additive change with comfort noise.
-    vec_efw_im = _mm_mul_ps(vec_efw_im, vec_minus_one);
-    _mm_storeu_ps(&efw[0][i], vec_efw_re);
-    _mm_storeu_ps(&efw[1][i], vec_efw_im);
-  }
-  // scalar code for the remaining items.
-  for (; i < PART_LEN1; i++) {
-    // Suppress error signal
-    efw[0][i] *= hNl[i];
-    efw[1][i] *= hNl[i];
-
-    // Ooura fft returns incorrect sign on imaginary component. It matters
-    // here because we are making an additive change with comfort noise.
-    efw[1][i] *= -1;
-  }
-}
-
-__inline static void _mm_add_ps_4x1(__m128 sum, float* dst) {
-  // A+B C+D
-  sum = _mm_add_ps(sum, _mm_shuffle_ps(sum, sum, _MM_SHUFFLE(0, 0, 3, 2)));
-  // A+B+C+D A+B+C+D
-  sum = _mm_add_ps(sum, _mm_shuffle_ps(sum, sum, _MM_SHUFFLE(1, 1, 1, 1)));
-  _mm_store_ss(dst, sum);
-}
-
-static int PartitionDelaySSE2(
-    int num_partitions,
-    float h_fft_buf[2][kExtendedNumPartitions * PART_LEN1]) {
-  // Measures the energy in each filter partition and returns the partition with
-  // highest energy.
-  // TODO(bjornv): Spread computational cost by computing one partition per
-  // block?
-  float wfEnMax = 0;
-  int i;
-  int delay = 0;
-
-  for (i = 0; i < num_partitions; i++) {
-    int j;
-    int pos = i * PART_LEN1;
-    float wfEn = 0;
-    __m128 vec_wfEn = _mm_set1_ps(0.0f);
-    // vectorized code (four at once)
-    for (j = 0; j + 3 < PART_LEN1; j += 4) {
-      const __m128 vec_wfBuf0 = _mm_loadu_ps(&h_fft_buf[0][pos + j]);
-      const __m128 vec_wfBuf1 = _mm_loadu_ps(&h_fft_buf[1][pos + j]);
-      vec_wfEn = _mm_add_ps(vec_wfEn, _mm_mul_ps(vec_wfBuf0, vec_wfBuf0));
-      vec_wfEn = _mm_add_ps(vec_wfEn, _mm_mul_ps(vec_wfBuf1, vec_wfBuf1));
-    }
-    _mm_add_ps_4x1(vec_wfEn, &wfEn);
-
-    // scalar code for the remaining items.
-    for (; j < PART_LEN1; j++) {
-      wfEn += h_fft_buf[0][pos + j] * h_fft_buf[0][pos + j] +
-              h_fft_buf[1][pos + j] * h_fft_buf[1][pos + j];
-    }
-
-    if (wfEn > wfEnMax) {
-      wfEnMax = wfEn;
-      delay = i;
-    }
-  }
-  return delay;
-}
-
-// Updates the following smoothed  Power Spectral Densities (PSD):
-//  - sd  : near-end
-//  - se  : residual echo
-//  - sx  : far-end
-//  - sde : cross-PSD of near-end and residual echo
-//  - sxd : cross-PSD of near-end and far-end
-//
-// In addition to updating the PSDs, also the filter diverge state is determined
-// upon actions are taken.
-static void UpdateCoherenceSpectraSSE2(int mult,
-                                       bool extended_filter_enabled,
-                                       float efw[2][PART_LEN1],
-                                       float dfw[2][PART_LEN1],
-                                       float xfw[2][PART_LEN1],
-                                       CoherenceState* coherence_state,
-                                       short* filter_divergence_state,
-                                       int* extreme_filter_divergence) {
-  // Power estimate smoothing coefficients.
-  const float* ptrGCoh =
-      extended_filter_enabled
-          ? WebRtcAec_kExtendedSmoothingCoefficients[mult - 1]
-          : WebRtcAec_kNormalSmoothingCoefficients[mult - 1];
-  int i;
-  float sdSum = 0, seSum = 0;
-  const __m128 vec_15 = _mm_set1_ps(WebRtcAec_kMinFarendPSD);
-  const __m128 vec_GCoh0 = _mm_set1_ps(ptrGCoh[0]);
-  const __m128 vec_GCoh1 = _mm_set1_ps(ptrGCoh[1]);
-  __m128 vec_sdSum = _mm_set1_ps(0.0f);
-  __m128 vec_seSum = _mm_set1_ps(0.0f);
-
-  for (i = 0; i + 3 < PART_LEN1; i += 4) {
-    const __m128 vec_dfw0 = _mm_loadu_ps(&dfw[0][i]);
-    const __m128 vec_dfw1 = _mm_loadu_ps(&dfw[1][i]);
-    const __m128 vec_efw0 = _mm_loadu_ps(&efw[0][i]);
-    const __m128 vec_efw1 = _mm_loadu_ps(&efw[1][i]);
-    const __m128 vec_xfw0 = _mm_loadu_ps(&xfw[0][i]);
-    const __m128 vec_xfw1 = _mm_loadu_ps(&xfw[1][i]);
-    __m128 vec_sd =
-        _mm_mul_ps(_mm_loadu_ps(&coherence_state->sd[i]), vec_GCoh0);
-    __m128 vec_se =
-        _mm_mul_ps(_mm_loadu_ps(&coherence_state->se[i]), vec_GCoh0);
-    __m128 vec_sx =
-        _mm_mul_ps(_mm_loadu_ps(&coherence_state->sx[i]), vec_GCoh0);
-    __m128 vec_dfw_sumsq = _mm_mul_ps(vec_dfw0, vec_dfw0);
-    __m128 vec_efw_sumsq = _mm_mul_ps(vec_efw0, vec_efw0);
-    __m128 vec_xfw_sumsq = _mm_mul_ps(vec_xfw0, vec_xfw0);
-    vec_dfw_sumsq = _mm_add_ps(vec_dfw_sumsq, _mm_mul_ps(vec_dfw1, vec_dfw1));
-    vec_efw_sumsq = _mm_add_ps(vec_efw_sumsq, _mm_mul_ps(vec_efw1, vec_efw1));
-    vec_xfw_sumsq = _mm_add_ps(vec_xfw_sumsq, _mm_mul_ps(vec_xfw1, vec_xfw1));
-    vec_xfw_sumsq = _mm_max_ps(vec_xfw_sumsq, vec_15);
-    vec_sd = _mm_add_ps(vec_sd, _mm_mul_ps(vec_dfw_sumsq, vec_GCoh1));
-    vec_se = _mm_add_ps(vec_se, _mm_mul_ps(vec_efw_sumsq, vec_GCoh1));
-    vec_sx = _mm_add_ps(vec_sx, _mm_mul_ps(vec_xfw_sumsq, vec_GCoh1));
-    _mm_storeu_ps(&coherence_state->sd[i], vec_sd);
-    _mm_storeu_ps(&coherence_state->se[i], vec_se);
-    _mm_storeu_ps(&coherence_state->sx[i], vec_sx);
-
-    {
-      const __m128 vec_3210 = _mm_loadu_ps(&coherence_state->sde[i][0]);
-      const __m128 vec_7654 = _mm_loadu_ps(&coherence_state->sde[i + 2][0]);
-      __m128 vec_a =
-          _mm_shuffle_ps(vec_3210, vec_7654, _MM_SHUFFLE(2, 0, 2, 0));
-      __m128 vec_b =
-          _mm_shuffle_ps(vec_3210, vec_7654, _MM_SHUFFLE(3, 1, 3, 1));
-      __m128 vec_dfwefw0011 = _mm_mul_ps(vec_dfw0, vec_efw0);
-      __m128 vec_dfwefw0110 = _mm_mul_ps(vec_dfw0, vec_efw1);
-      vec_a = _mm_mul_ps(vec_a, vec_GCoh0);
-      vec_b = _mm_mul_ps(vec_b, vec_GCoh0);
-      vec_dfwefw0011 =
-          _mm_add_ps(vec_dfwefw0011, _mm_mul_ps(vec_dfw1, vec_efw1));
-      vec_dfwefw0110 =
-          _mm_sub_ps(vec_dfwefw0110, _mm_mul_ps(vec_dfw1, vec_efw0));
-      vec_a = _mm_add_ps(vec_a, _mm_mul_ps(vec_dfwefw0011, vec_GCoh1));
-      vec_b = _mm_add_ps(vec_b, _mm_mul_ps(vec_dfwefw0110, vec_GCoh1));
-      _mm_storeu_ps(&coherence_state->sde[i][0], _mm_unpacklo_ps(vec_a, vec_b));
-      _mm_storeu_ps(&coherence_state->sde[i + 2][0],
-                    _mm_unpackhi_ps(vec_a, vec_b));
-    }
-
-    {
-      const __m128 vec_3210 = _mm_loadu_ps(&coherence_state->sxd[i][0]);
-      const __m128 vec_7654 = _mm_loadu_ps(&coherence_state->sxd[i + 2][0]);
-      __m128 vec_a =
-          _mm_shuffle_ps(vec_3210, vec_7654, _MM_SHUFFLE(2, 0, 2, 0));
-      __m128 vec_b =
-          _mm_shuffle_ps(vec_3210, vec_7654, _MM_SHUFFLE(3, 1, 3, 1));
-      __m128 vec_dfwxfw0011 = _mm_mul_ps(vec_dfw0, vec_xfw0);
-      __m128 vec_dfwxfw0110 = _mm_mul_ps(vec_dfw0, vec_xfw1);
-      vec_a = _mm_mul_ps(vec_a, vec_GCoh0);
-      vec_b = _mm_mul_ps(vec_b, vec_GCoh0);
-      vec_dfwxfw0011 =
-          _mm_add_ps(vec_dfwxfw0011, _mm_mul_ps(vec_dfw1, vec_xfw1));
-      vec_dfwxfw0110 =
-          _mm_sub_ps(vec_dfwxfw0110, _mm_mul_ps(vec_dfw1, vec_xfw0));
-      vec_a = _mm_add_ps(vec_a, _mm_mul_ps(vec_dfwxfw0011, vec_GCoh1));
-      vec_b = _mm_add_ps(vec_b, _mm_mul_ps(vec_dfwxfw0110, vec_GCoh1));
-      _mm_storeu_ps(&coherence_state->sxd[i][0], _mm_unpacklo_ps(vec_a, vec_b));
-      _mm_storeu_ps(&coherence_state->sxd[i + 2][0],
-                    _mm_unpackhi_ps(vec_a, vec_b));
-    }
-
-    vec_sdSum = _mm_add_ps(vec_sdSum, vec_sd);
-    vec_seSum = _mm_add_ps(vec_seSum, vec_se);
-  }
-
-  _mm_add_ps_4x1(vec_sdSum, &sdSum);
-  _mm_add_ps_4x1(vec_seSum, &seSum);
-
-  for (; i < PART_LEN1; i++) {
-    coherence_state->sd[i] =
-        ptrGCoh[0] * coherence_state->sd[i] +
-        ptrGCoh[1] * (dfw[0][i] * dfw[0][i] + dfw[1][i] * dfw[1][i]);
-    coherence_state->se[i] =
-        ptrGCoh[0] * coherence_state->se[i] +
-        ptrGCoh[1] * (efw[0][i] * efw[0][i] + efw[1][i] * efw[1][i]);
-    // We threshold here to protect against the ill-effects of a zero farend.
-    // The threshold is not arbitrarily chosen, but balances protection and
-    // adverse interaction with the algorithm's tuning.
-    // TODO(bjornv): investigate further why this is so sensitive.
-    coherence_state->sx[i] =
-        ptrGCoh[0] * coherence_state->sx[i] +
-        ptrGCoh[1] *
-            WEBRTC_SPL_MAX(xfw[0][i] * xfw[0][i] + xfw[1][i] * xfw[1][i],
-                           WebRtcAec_kMinFarendPSD);
-
-    coherence_state->sde[i][0] =
-        ptrGCoh[0] * coherence_state->sde[i][0] +
-        ptrGCoh[1] * (dfw[0][i] * efw[0][i] + dfw[1][i] * efw[1][i]);
-    coherence_state->sde[i][1] =
-        ptrGCoh[0] * coherence_state->sde[i][1] +
-        ptrGCoh[1] * (dfw[0][i] * efw[1][i] - dfw[1][i] * efw[0][i]);
-
-    coherence_state->sxd[i][0] =
-        ptrGCoh[0] * coherence_state->sxd[i][0] +
-        ptrGCoh[1] * (dfw[0][i] * xfw[0][i] + dfw[1][i] * xfw[1][i]);
-    coherence_state->sxd[i][1] =
-        ptrGCoh[0] * coherence_state->sxd[i][1] +
-        ptrGCoh[1] * (dfw[0][i] * xfw[1][i] - dfw[1][i] * xfw[0][i]);
-
-    sdSum += coherence_state->sd[i];
-    seSum += coherence_state->se[i];
-  }
-
-  // Divergent filter safeguard update.
-  *filter_divergence_state =
-      (*filter_divergence_state ? 1.05f : 1.0f) * seSum > sdSum;
-
-  // Signal extreme filter divergence if the error is significantly larger
-  // than the nearend (13 dB).
-  *extreme_filter_divergence = (seSum > (19.95f * sdSum));
-}
-
-// Window time domain data to be used by the fft.
-static void WindowDataSSE2(float* x_windowed, const float* x) {
-  int i;
-  for (i = 0; i < PART_LEN; i += 4) {
-    const __m128 vec_Buf1 = _mm_loadu_ps(&x[i]);
-    const __m128 vec_Buf2 = _mm_loadu_ps(&x[PART_LEN + i]);
-    const __m128 vec_sqrtHanning = _mm_load_ps(&WebRtcAec_sqrtHanning[i]);
-    // A B C D
-    __m128 vec_sqrtHanning_rev =
-        _mm_loadu_ps(&WebRtcAec_sqrtHanning[PART_LEN - i - 3]);
-    // D C B A
-    vec_sqrtHanning_rev = _mm_shuffle_ps(
-        vec_sqrtHanning_rev, vec_sqrtHanning_rev, _MM_SHUFFLE(0, 1, 2, 3));
-    _mm_storeu_ps(&x_windowed[i], _mm_mul_ps(vec_Buf1, vec_sqrtHanning));
-    _mm_storeu_ps(&x_windowed[PART_LEN + i],
-                  _mm_mul_ps(vec_Buf2, vec_sqrtHanning_rev));
-  }
-}
-
-// Puts fft output data into a complex valued array.
-static void StoreAsComplexSSE2(const float* data,
-                               float data_complex[2][PART_LEN1]) {
-  int i;
-  for (i = 0; i < PART_LEN; i += 4) {
-    const __m128 vec_fft0 = _mm_loadu_ps(&data[2 * i]);
-    const __m128 vec_fft4 = _mm_loadu_ps(&data[2 * i + 4]);
-    const __m128 vec_a =
-        _mm_shuffle_ps(vec_fft0, vec_fft4, _MM_SHUFFLE(2, 0, 2, 0));
-    const __m128 vec_b =
-        _mm_shuffle_ps(vec_fft0, vec_fft4, _MM_SHUFFLE(3, 1, 3, 1));
-    _mm_storeu_ps(&data_complex[0][i], vec_a);
-    _mm_storeu_ps(&data_complex[1][i], vec_b);
-  }
-  // fix beginning/end values
-  data_complex[1][0] = 0;
-  data_complex[1][PART_LEN] = 0;
-  data_complex[0][0] = data[0];
-  data_complex[0][PART_LEN] = data[1];
-}
-
-static void ComputeCoherenceSSE2(const CoherenceState* coherence_state,
-                                 float* cohde,
-                                 float* cohxd) {
-  int i;
-
-  {
-    const __m128 vec_1eminus10 = _mm_set1_ps(1e-10f);
-
-    // Subband coherence
-    for (i = 0; i + 3 < PART_LEN1; i += 4) {
-      const __m128 vec_sd = _mm_loadu_ps(&coherence_state->sd[i]);
-      const __m128 vec_se = _mm_loadu_ps(&coherence_state->se[i]);
-      const __m128 vec_sx = _mm_loadu_ps(&coherence_state->sx[i]);
-      const __m128 vec_sdse =
-          _mm_add_ps(vec_1eminus10, _mm_mul_ps(vec_sd, vec_se));
-      const __m128 vec_sdsx =
-          _mm_add_ps(vec_1eminus10, _mm_mul_ps(vec_sd, vec_sx));
-      const __m128 vec_sde_3210 = _mm_loadu_ps(&coherence_state->sde[i][0]);
-      const __m128 vec_sde_7654 = _mm_loadu_ps(&coherence_state->sde[i + 2][0]);
-      const __m128 vec_sxd_3210 = _mm_loadu_ps(&coherence_state->sxd[i][0]);
-      const __m128 vec_sxd_7654 = _mm_loadu_ps(&coherence_state->sxd[i + 2][0]);
-      const __m128 vec_sde_0 =
-          _mm_shuffle_ps(vec_sde_3210, vec_sde_7654, _MM_SHUFFLE(2, 0, 2, 0));
-      const __m128 vec_sde_1 =
-          _mm_shuffle_ps(vec_sde_3210, vec_sde_7654, _MM_SHUFFLE(3, 1, 3, 1));
-      const __m128 vec_sxd_0 =
-          _mm_shuffle_ps(vec_sxd_3210, vec_sxd_7654, _MM_SHUFFLE(2, 0, 2, 0));
-      const __m128 vec_sxd_1 =
-          _mm_shuffle_ps(vec_sxd_3210, vec_sxd_7654, _MM_SHUFFLE(3, 1, 3, 1));
-      __m128 vec_cohde = _mm_mul_ps(vec_sde_0, vec_sde_0);
-      __m128 vec_cohxd = _mm_mul_ps(vec_sxd_0, vec_sxd_0);
-      vec_cohde = _mm_add_ps(vec_cohde, _mm_mul_ps(vec_sde_1, vec_sde_1));
-      vec_cohde = _mm_div_ps(vec_cohde, vec_sdse);
-      vec_cohxd = _mm_add_ps(vec_cohxd, _mm_mul_ps(vec_sxd_1, vec_sxd_1));
-      vec_cohxd = _mm_div_ps(vec_cohxd, vec_sdsx);
-      _mm_storeu_ps(&cohde[i], vec_cohde);
-      _mm_storeu_ps(&cohxd[i], vec_cohxd);
-    }
-
-    // scalar code for the remaining items.
-    for (; i < PART_LEN1; i++) {
-      cohde[i] = (coherence_state->sde[i][0] * coherence_state->sde[i][0] +
-                  coherence_state->sde[i][1] * coherence_state->sde[i][1]) /
-                 (coherence_state->sd[i] * coherence_state->se[i] + 1e-10f);
-      cohxd[i] = (coherence_state->sxd[i][0] * coherence_state->sxd[i][0] +
-                  coherence_state->sxd[i][1] * coherence_state->sxd[i][1]) /
-                 (coherence_state->sx[i] * coherence_state->sd[i] + 1e-10f);
-    }
-  }
-}
-
-void WebRtcAec_InitAec_SSE2(void) {
-  WebRtcAec_FilterFar = FilterFarSSE2;
-  WebRtcAec_ScaleErrorSignal = ScaleErrorSignalSSE2;
-  WebRtcAec_FilterAdaptation = FilterAdaptationSSE2;
-  WebRtcAec_Overdrive = OverdriveSSE2;
-  WebRtcAec_Suppress = SuppressSSE2;
-  WebRtcAec_ComputeCoherence = ComputeCoherenceSSE2;
-  WebRtcAec_UpdateCoherenceSpectra = UpdateCoherenceSpectraSSE2;
-  WebRtcAec_StoreAsComplex = StoreAsComplexSSE2;
-  WebRtcAec_PartitionDelay = PartitionDelaySSE2;
-  WebRtcAec_WindowData = WindowDataSSE2;
-}
-}  // namespace webrtc
-
-#endif
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec/aec_resampler.cc b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec/aec_resampler.cc
deleted file mode 100644
index 210c2bebe0..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec/aec_resampler.cc
+++ /dev/null
@@ -1,206 +0,0 @@
-/*
- *  Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-/* Resamples a signal to an arbitrary rate. Used by the AEC to compensate for
- * clock skew by resampling the farend signal.
- */
-
-#include "modules/audio_processing/aec/aec_resampler.h"
-
-#include <stdlib.h>
-#include <string.h>
-
-#include "modules/audio_processing/aec/aec_core.h"
-#include "rtc_base/checks.h"
-
-namespace webrtc {
-
-enum { kEstimateLengthFrames = 400 };
-
-typedef struct {
-  float buffer[kResamplerBufferSize];
-  float position;
-
-  int deviceSampleRateHz;
-  int skewData[kEstimateLengthFrames];
-  int skewDataIndex;
-  float skewEstimate;
-} AecResampler;
-
-static int EstimateSkew(const int* rawSkew,
-                        int size,
-                        int deviceSampleRateHz,
-                        float* skewEst);
-
-void* WebRtcAec_CreateResampler() {
-  return malloc(sizeof(AecResampler));
-}
-
-int WebRtcAec_InitResampler(void* resampInst, int deviceSampleRateHz) {
-  AecResampler* obj = static_cast<AecResampler*>(resampInst);
-  memset(obj->buffer, 0, sizeof(obj->buffer));
-  obj->position = 0.0;
-
-  obj->deviceSampleRateHz = deviceSampleRateHz;
-  memset(obj->skewData, 0, sizeof(obj->skewData));
-  obj->skewDataIndex = 0;
-  obj->skewEstimate = 0.0;
-
-  return 0;
-}
-
-void WebRtcAec_FreeResampler(void* resampInst) {
-  AecResampler* obj = static_cast<AecResampler*>(resampInst);
-  free(obj);
-}
-
-void WebRtcAec_ResampleLinear(void* resampInst,
-                              const float* inspeech,
-                              size_t size,
-                              float skew,
-                              float* outspeech,
-                              size_t* size_out) {
-  AecResampler* obj = static_cast<AecResampler*>(resampInst);
-
-  float* y;
-  float be, tnew;
-  size_t tn, mm;
-
-  RTC_DCHECK_LE(size, 2 * FRAME_LEN);
-  RTC_DCHECK(resampInst);
-  RTC_DCHECK(inspeech);
-  RTC_DCHECK(outspeech);
-  RTC_DCHECK(size_out);
-
-  // Add new frame data in lookahead
-  memcpy(&obj->buffer[FRAME_LEN + kResamplingDelay], inspeech,
-         size * sizeof(inspeech[0]));
-
-  // Sample rate ratio
-  be = 1 + skew;
-
-  // Loop over input frame
-  mm = 0;
-  y = &obj->buffer[FRAME_LEN];  // Point at current frame
-
-  tnew = be * mm + obj->position;
-  tn = (size_t)tnew;
-
-  while (tn < size) {
-    // Interpolation
-    outspeech[mm] = y[tn] + (tnew - tn) * (y[tn + 1] - y[tn]);
-    mm++;
-
-    tnew = be * mm + obj->position;
-    tn = static_cast<int>(tnew);
-  }
-
-  *size_out = mm;
-  obj->position += (*size_out) * be - size;
-
-  // Shift buffer
-  memmove(obj->buffer, &obj->buffer[size],
-          (kResamplerBufferSize - size) * sizeof(obj->buffer[0]));
-}
-
-int WebRtcAec_GetSkew(void* resampInst, int rawSkew, float* skewEst) {
-  AecResampler* obj = static_cast<AecResampler*>(resampInst);
-  int err = 0;
-
-  if (obj->skewDataIndex < kEstimateLengthFrames) {
-    obj->skewData[obj->skewDataIndex] = rawSkew;
-    obj->skewDataIndex++;
-  } else if (obj->skewDataIndex == kEstimateLengthFrames) {
-    err = EstimateSkew(obj->skewData, kEstimateLengthFrames,
-                       obj->deviceSampleRateHz, skewEst);
-    obj->skewEstimate = *skewEst;
-    obj->skewDataIndex++;
-  } else {
-    *skewEst = obj->skewEstimate;
-  }
-
-  return err;
-}
-
-int EstimateSkew(const int* rawSkew,
-                 int size,
-                 int deviceSampleRateHz,
-                 float* skewEst) {
-  const int absLimitOuter = static_cast<int>(0.04f * deviceSampleRateHz);
-  const int absLimitInner = static_cast<int>(0.0025f * deviceSampleRateHz);
-  int i = 0;
-  int n = 0;
-  float rawAvg = 0;
-  float err = 0;
-  float rawAbsDev = 0;
-  int upperLimit = 0;
-  int lowerLimit = 0;
-  float cumSum = 0;
-  float x = 0;
-  float x2 = 0;
-  float y = 0;
-  float xy = 0;
-  float xAvg = 0;
-  float denom = 0;
-  float skew = 0;
-
-  *skewEst = 0;  // Set in case of error below.
-  for (i = 0; i < size; i++) {
-    if ((rawSkew[i] < absLimitOuter && rawSkew[i] > -absLimitOuter)) {
-      n++;
-      rawAvg += rawSkew[i];
-    }
-  }
-
-  if (n == 0) {
-    return -1;
-  }
-  RTC_DCHECK_GT(n, 0);
-  rawAvg /= n;
-
-  for (i = 0; i < size; i++) {
-    if ((rawSkew[i] < absLimitOuter && rawSkew[i] > -absLimitOuter)) {
-      err = rawSkew[i] - rawAvg;
-      rawAbsDev += err >= 0 ? err : -err;
-    }
-  }
-  RTC_DCHECK_GT(n, 0);
-  rawAbsDev /= n;
-  upperLimit = static_cast<int>(rawAvg + 5 * rawAbsDev + 1);  // +1 for ceiling.
-  lowerLimit = static_cast<int>(rawAvg - 5 * rawAbsDev - 1);  // -1 for floor.
-
-  n = 0;
-  for (i = 0; i < size; i++) {
-    if ((rawSkew[i] < absLimitInner && rawSkew[i] > -absLimitInner) ||
-        (rawSkew[i] < upperLimit && rawSkew[i] > lowerLimit)) {
-      n++;
-      cumSum += rawSkew[i];
-      x += n;
-      x2 += n * n;
-      y += cumSum;
-      xy += n * cumSum;
-    }
-  }
-
-  if (n == 0) {
-    return -1;
-  }
-  RTC_DCHECK_GT(n, 0);
-  xAvg = x / n;
-  denom = x2 - xAvg * x;
-
-  if (denom != 0) {
-    skew = (xy - xAvg * y) / denom;
-  }
-
-  *skewEst = skew;
-  return 0;
-}
-}  // namespace webrtc
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec/aec_resampler.h b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec/aec_resampler.h
deleted file mode 100644
index a112c434d0..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec/aec_resampler.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- *  Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#ifndef MODULES_AUDIO_PROCESSING_AEC_AEC_RESAMPLER_H_
-#define MODULES_AUDIO_PROCESSING_AEC_AEC_RESAMPLER_H_
-
-#include <stddef.h>
-
-#include "modules/audio_processing/aec/aec_core.h"
-
-namespace webrtc {
-
-enum { kResamplingDelay = 1 };
-enum { kResamplerBufferSize = FRAME_LEN * 4 };
-
-// Unless otherwise specified, functions return 0 on success and -1 on error.
-void* WebRtcAec_CreateResampler();  // Returns NULL on error.
-int WebRtcAec_InitResampler(void* resampInst, int deviceSampleRateHz);
-void WebRtcAec_FreeResampler(void* resampInst);
-
-// Estimates skew from raw measurement.
-int WebRtcAec_GetSkew(void* resampInst, int rawSkew, float* skewEst);
-
-// Resamples input using linear interpolation.
-void WebRtcAec_ResampleLinear(void* resampInst,
-                              const float* inspeech,
-                              size_t size,
-                              float skew,
-                              float* outspeech,
-                              size_t* size_out);
-
-}  // namespace webrtc
-
-#endif  // MODULES_AUDIO_PROCESSING_AEC_AEC_RESAMPLER_H_
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec/echo_cancellation.cc b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec/echo_cancellation.cc
deleted file mode 100644
index fd1aec4058..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec/echo_cancellation.cc
+++ /dev/null
@@ -1,864 +0,0 @@
-/*
- *  Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-/*
- * Contains the API functions for the AEC.
- */
-#include "modules/audio_processing/aec/echo_cancellation.h"
-
-#include <math.h>
-#include <stdlib.h>
-#include <string.h>
-
-extern "C" {
-#include "common_audio/ring_buffer.h"
-#include "common_audio/signal_processing/include/signal_processing_library.h"
-}
-#include "modules/audio_processing/aec/aec_core.h"
-#include "modules/audio_processing/aec/aec_resampler.h"
-#include "modules/audio_processing/logging/apm_data_dumper.h"
-
-namespace webrtc {
-
-Aec::Aec() = default;
-Aec::~Aec() = default;
-
-// Measured delays [ms]
-// Device                Chrome  GTP
-// MacBook Air           10
-// MacBook Retina        10      100
-// MacPro                30?
-//
-// Win7 Desktop          70      80?
-// Win7 T430s            110
-// Win8 T420s            70
-//
-// Daisy                 50
-// Pixel (w/ preproc?)           240
-// Pixel (w/o preproc?)  110     110
-
-// The extended filter mode gives us the flexibility to ignore the system's
-// reported delays. We do this for platforms which we believe provide results
-// which are incompatible with the AEC's expectations. Based on measurements
-// (some provided above) we set a conservative (i.e. lower than measured)
-// fixed delay.
-//
-// WEBRTC_UNTRUSTED_DELAY will only have an impact when |extended_filter_mode|
-// is enabled. See the note along with |DelayCorrection| in
-// echo_cancellation_impl.h for more details on the mode.
-//
-// Justification:
-// Chromium/Mac: Here, the true latency is so low (~10-20 ms), that it plays
-// havoc with the AEC's buffering. To avoid this, we set a fixed delay of 20 ms
-// and then compensate by rewinding by 10 ms (in wideband) through
-// kDelayDiffOffsetSamples. This trick does not seem to work for larger rewind
-// values, but fortunately this is sufficient.
-//
-// Chromium/Linux(ChromeOS): The values we get on this platform don't correspond
-// well to reality. The variance doesn't match the AEC's buffer changes, and the
-// bulk values tend to be too low. However, the range across different hardware
-// appears to be too large to choose a single value.
-//
-// GTP/Linux(ChromeOS): TBD, but for the moment we will trust the values.
-#if defined(WEBRTC_CHROMIUM_BUILD) && defined(WEBRTC_MAC)
-#define WEBRTC_UNTRUSTED_DELAY
-#endif
-
-#if defined(WEBRTC_UNTRUSTED_DELAY) && defined(WEBRTC_MAC)
-static const int kDelayDiffOffsetSamples = -160;
-#else
-// Not enabled for now.
-static const int kDelayDiffOffsetSamples = 0;
-#endif
-
-#if defined(WEBRTC_MAC)
-static const int kFixedDelayMs = 20;
-#else
-static const int kFixedDelayMs = 50;
-#endif
-#if !defined(WEBRTC_UNTRUSTED_DELAY)
-static const int kMinTrustedDelayMs = 20;
-#endif
-static const int kMaxTrustedDelayMs = 500;
-
-// Maximum length of resampled signal. Must be an integer multiple of frames
-// (ceil(1/(1 + MIN_SKEW)*2) + 1)*FRAME_LEN
-// The factor of 2 handles wb, and the + 1 is as a safety margin
-// TODO(bjornv): Replace with kResamplerBufferSize
-#define MAX_RESAMP_LEN (5 * FRAME_LEN)
-
-static const int kMaxBufSizeStart = 62;  // In partitions
-static const int sampMsNb = 8;           // samples per ms in nb
-static const int initCheck = 42;
-
-int Aec::instance_count = 0;
-
-// Estimates delay to set the position of the far-end buffer read pointer
-// (controlled by knownDelay)
-static void EstBufDelayNormal(Aec* aecInst);
-static void EstBufDelayExtended(Aec* aecInst);
-static int ProcessNormal(Aec* aecInst,
-                         const float* const* nearend,
-                         size_t num_bands,
-                         float* const* out,
-                         size_t num_samples,
-                         int16_t reported_delay_ms,
-                         int32_t skew);
-static void ProcessExtended(Aec* aecInst,
-                            const float* const* nearend,
-                            size_t num_bands,
-                            float* const* out,
-                            size_t num_samples,
-                            int16_t reported_delay_ms,
-                            int32_t skew);
-
-void* WebRtcAec_Create() {
-  Aec* aecpc = new Aec();
-
-  if (!aecpc) {
-    return NULL;
-  }
-  aecpc->data_dumper.reset(new ApmDataDumper(aecpc->instance_count));
-
-  aecpc->aec = WebRtcAec_CreateAec(aecpc->instance_count);
-  if (!aecpc->aec) {
-    WebRtcAec_Free(aecpc);
-    return NULL;
-  }
-  aecpc->resampler = WebRtcAec_CreateResampler();
-  if (!aecpc->resampler) {
-    WebRtcAec_Free(aecpc);
-    return NULL;
-  }
-  // Create far-end pre-buffer. The buffer size has to be large enough for
-  // largest possible drift compensation (kResamplerBufferSize) + "almost" an
-  // FFT buffer (PART_LEN2 - 1).
-  aecpc->far_pre_buf =
-      WebRtc_CreateBuffer(PART_LEN2 + kResamplerBufferSize, sizeof(float));
-  if (!aecpc->far_pre_buf) {
-    WebRtcAec_Free(aecpc);
-    return NULL;
-  }
-
-  aecpc->initFlag = 0;
-
-  aecpc->instance_count++;
-  return aecpc;
-}
-
-void WebRtcAec_Free(void* aecInst) {
-  Aec* aecpc = reinterpret_cast<Aec*>(aecInst);
-
-  if (aecpc == NULL) {
-    return;
-  }
-
-  WebRtc_FreeBuffer(aecpc->far_pre_buf);
-
-  WebRtcAec_FreeAec(aecpc->aec);
-  WebRtcAec_FreeResampler(aecpc->resampler);
-  delete aecpc;
-}
-
-int32_t WebRtcAec_Init(void* aecInst, int32_t sampFreq, int32_t scSampFreq) {
-  Aec* aecpc = reinterpret_cast<Aec*>(aecInst);
-  aecpc->data_dumper->InitiateNewSetOfRecordings();
-  AecConfig aecConfig;
-
-  if (sampFreq != 8000 && sampFreq != 16000 && sampFreq != 32000 &&
-      sampFreq != 48000) {
-    return AEC_BAD_PARAMETER_ERROR;
-  }
-  aecpc->sampFreq = sampFreq;
-
-  if (scSampFreq < 1 || scSampFreq > 96000) {
-    return AEC_BAD_PARAMETER_ERROR;
-  }
-  aecpc->scSampFreq = scSampFreq;
-
-  // Initialize echo canceller core
-  if (WebRtcAec_InitAec(aecpc->aec, aecpc->sampFreq) == -1) {
-    return AEC_UNSPECIFIED_ERROR;
-  }
-
-  if (WebRtcAec_InitResampler(aecpc->resampler, aecpc->scSampFreq) == -1) {
-    return AEC_UNSPECIFIED_ERROR;
-  }
-
-  WebRtc_InitBuffer(aecpc->far_pre_buf);
-  WebRtc_MoveReadPtr(aecpc->far_pre_buf, -PART_LEN);  // Start overlap.
-
-  aecpc->initFlag = initCheck;  // indicates that initialization has been done
-
-  if (aecpc->sampFreq == 32000 || aecpc->sampFreq == 48000) {
-    aecpc->splitSampFreq = 16000;
-  } else {
-    aecpc->splitSampFreq = sampFreq;
-  }
-
-  aecpc->delayCtr = 0;
-  aecpc->sampFactor = (aecpc->scSampFreq * 1.0f) / aecpc->splitSampFreq;
-  // Sampling frequency multiplier (SWB is processed as 160 frame size).
-  aecpc->rate_factor = aecpc->splitSampFreq / 8000;
-
-  aecpc->sum = 0;
-  aecpc->counter = 0;
-  aecpc->checkBuffSize = 1;
-  aecpc->firstVal = 0;
-
-  // We skip the startup_phase completely (setting to 0) if DA-AEC is enabled,
-  // but not extended_filter mode.
-  aecpc->startup_phase = WebRtcAec_extended_filter_enabled(aecpc->aec) ||
-                         !WebRtcAec_delay_agnostic_enabled(aecpc->aec);
-  aecpc->bufSizeStart = 0;
-  aecpc->checkBufSizeCtr = 0;
-  aecpc->msInSndCardBuf = 0;
-  aecpc->filtDelay = -1;  // -1 indicates an initialized state.
-  aecpc->timeForDelayChange = 0;
-  aecpc->knownDelay = 0;
-  aecpc->lastDelayDiff = 0;
-
-  aecpc->skewFrCtr = 0;
-  aecpc->resample = kAecFalse;
-  aecpc->highSkewCtr = 0;
-  aecpc->skew = 0;
-
-  aecpc->farend_started = 0;
-
-  // Default settings.
-  aecConfig.nlpMode = kAecNlpModerate;
-  aecConfig.skewMode = kAecFalse;
-  aecConfig.metricsMode = kAecFalse;
-  aecConfig.delay_logging = kAecFalse;
-
-  if (WebRtcAec_set_config(aecpc, aecConfig) == -1) {
-    return AEC_UNSPECIFIED_ERROR;
-  }
-
-  return 0;
-}
-
-// Returns any error that is caused when buffering the
-// far-end signal.
-int32_t WebRtcAec_GetBufferFarendError(void* aecInst,
-                                       const float* farend,
-                                       size_t nrOfSamples) {
-  Aec* aecpc = reinterpret_cast<Aec*>(aecInst);
-
-  if (!farend)
-    return AEC_NULL_POINTER_ERROR;
-
-  if (aecpc->initFlag != initCheck)
-    return AEC_UNINITIALIZED_ERROR;
-
-  // number of samples == 160 for SWB input
-  if (nrOfSamples != 80 && nrOfSamples != 160)
-    return AEC_BAD_PARAMETER_ERROR;
-
-  return 0;
-}
-
-// only buffer L band for farend
-int32_t WebRtcAec_BufferFarend(void* aecInst,
-                               const float* farend,
-                               size_t nrOfSamples) {
-  Aec* aecpc = reinterpret_cast<Aec*>(aecInst);
-  size_t newNrOfSamples = nrOfSamples;
-  float new_farend[MAX_RESAMP_LEN];
-  const float* farend_ptr = farend;
-
-  // Get any error caused by buffering the farend signal.
-  int32_t error_code =
-      WebRtcAec_GetBufferFarendError(aecInst, farend, nrOfSamples);
-
-  if (error_code != 0)
-    return error_code;
-
-  if (aecpc->skewMode == kAecTrue && aecpc->resample == kAecTrue) {
-    // Resample and get a new number of samples
-    WebRtcAec_ResampleLinear(aecpc->resampler, farend, nrOfSamples, aecpc->skew,
-                             new_farend, &newNrOfSamples);
-    farend_ptr = new_farend;
-  }
-
-  aecpc->farend_started = 1;
-  WebRtcAec_SetSystemDelay(aecpc->aec, WebRtcAec_system_delay(aecpc->aec) +
-                                           static_cast<int>(newNrOfSamples));
-
-  // Write the time-domain data to |far_pre_buf|.
-  WebRtc_WriteBuffer(aecpc->far_pre_buf, farend_ptr, newNrOfSamples);
-
-  // TODO(minyue): reduce to |PART_LEN| samples for each buffering.
-  while (WebRtc_available_read(aecpc->far_pre_buf) >= PART_LEN2) {
-    // We have enough data to pass to the FFT, hence read PART_LEN2 samples.
-    {
-      float* ptmp = NULL;
-      float tmp[PART_LEN2];
-      WebRtc_ReadBuffer(aecpc->far_pre_buf, reinterpret_cast<void**>(&ptmp),
-                        tmp, PART_LEN2);
-      WebRtcAec_BufferFarendBlock(aecpc->aec, &ptmp[PART_LEN]);
-    }
-
-    // Rewind |far_pre_buf| PART_LEN samples for overlap before continuing.
-    WebRtc_MoveReadPtr(aecpc->far_pre_buf, -PART_LEN);
-  }
-
-  return 0;
-}
-
-int32_t WebRtcAec_Process(void* aecInst,
-                          const float* const* nearend,
-                          size_t num_bands,
-                          float* const* out,
-                          size_t nrOfSamples,
-                          int16_t msInSndCardBuf,
-                          int32_t skew) {
-  Aec* aecpc = reinterpret_cast<Aec*>(aecInst);
-  int32_t retVal = 0;
-
-  if (out == NULL) {
-    return AEC_NULL_POINTER_ERROR;
-  }
-
-  if (aecpc->initFlag != initCheck) {
-    return AEC_UNINITIALIZED_ERROR;
-  }
-
-  // number of samples == 160 for SWB input
-  if (nrOfSamples != 80 && nrOfSamples != 160) {
-    return AEC_BAD_PARAMETER_ERROR;
-  }
-
-  if (msInSndCardBuf < 0) {
-    msInSndCardBuf = 0;
-    retVal = AEC_BAD_PARAMETER_WARNING;
-  } else if (msInSndCardBuf > kMaxTrustedDelayMs) {
-    // The clamping is now done in ProcessExtended/Normal().
-    retVal = AEC_BAD_PARAMETER_WARNING;
-  }
-
-  // This returns the value of aec->extended_filter_enabled.
-  if (WebRtcAec_extended_filter_enabled(aecpc->aec)) {
-    ProcessExtended(aecpc, nearend, num_bands, out, nrOfSamples, msInSndCardBuf,
-                    skew);
-  } else {
-    retVal = ProcessNormal(aecpc, nearend, num_bands, out, nrOfSamples,
-                           msInSndCardBuf, skew);
-  }
-
-  int far_buf_size_samples = WebRtcAec_system_delay(aecpc->aec);
-  aecpc->data_dumper->DumpRaw("aec_system_delay", 1, &far_buf_size_samples);
-  aecpc->data_dumper->DumpRaw("aec_known_delay", 1, &aecpc->knownDelay);
-
-  return retVal;
-}
-
-int WebRtcAec_set_config(void* handle, AecConfig config) {
-  Aec* self = reinterpret_cast<Aec*>(handle);
-  if (self->initFlag != initCheck) {
-    return AEC_UNINITIALIZED_ERROR;
-  }
-
-  if (config.skewMode != kAecFalse && config.skewMode != kAecTrue) {
-    return AEC_BAD_PARAMETER_ERROR;
-  }
-  self->skewMode = config.skewMode;
-
-  if (config.nlpMode != kAecNlpConservative &&
-      config.nlpMode != kAecNlpModerate &&
-      config.nlpMode != kAecNlpAggressive) {
-    return AEC_BAD_PARAMETER_ERROR;
-  }
-
-  if (config.metricsMode != kAecFalse && config.metricsMode != kAecTrue) {
-    return AEC_BAD_PARAMETER_ERROR;
-  }
-
-  if (config.delay_logging != kAecFalse && config.delay_logging != kAecTrue) {
-    return AEC_BAD_PARAMETER_ERROR;
-  }
-
-  WebRtcAec_SetConfigCore(self->aec, config.nlpMode, config.metricsMode,
-                          config.delay_logging);
-  return 0;
-}
-
-int WebRtcAec_get_echo_status(void* handle, int* status) {
-  Aec* self = reinterpret_cast<Aec*>(handle);
-  if (status == NULL) {
-    return AEC_NULL_POINTER_ERROR;
-  }
-  if (self->initFlag != initCheck) {
-    return AEC_UNINITIALIZED_ERROR;
-  }
-
-  *status = WebRtcAec_echo_state(self->aec);
-
-  return 0;
-}
-
-int WebRtcAec_GetMetrics(void* handle, AecMetrics* metrics) {
-  const float kUpWeight = 0.7f;
-  float dtmp;
-  int stmp;
-  Aec* self = reinterpret_cast<Aec*>(handle);
-  Stats erl;
-  Stats erle;
-  Stats a_nlp;
-
-  if (handle == NULL) {
-    return -1;
-  }
-  if (metrics == NULL) {
-    return AEC_NULL_POINTER_ERROR;
-  }
-  if (self->initFlag != initCheck) {
-    return AEC_UNINITIALIZED_ERROR;
-  }
-
-  WebRtcAec_GetEchoStats(self->aec, &erl, &erle, &a_nlp,
-                         &metrics->divergent_filter_fraction);
-
-  // ERL
-  metrics->erl.instant = static_cast<int>(erl.instant);
-
-  if ((erl.himean > kOffsetLevel) && (erl.average > kOffsetLevel)) {
-    // Use a mix between regular average and upper part average.
-    dtmp = kUpWeight * erl.himean + (1 - kUpWeight) * erl.average;
-    metrics->erl.average = static_cast<int>(dtmp);
-  } else {
-    metrics->erl.average = kOffsetLevel;
-  }
-
-  metrics->erl.max = static_cast<int>(erl.max);
-
-  if (erl.min < (kOffsetLevel * (-1))) {
-    metrics->erl.min = static_cast<int>(erl.min);
-  } else {
-    metrics->erl.min = kOffsetLevel;
-  }
-
-  // ERLE
-  metrics->erle.instant = static_cast<int>(erle.instant);
-
-  if ((erle.himean > kOffsetLevel) && (erle.average > kOffsetLevel)) {
-    // Use a mix between regular average and upper part average.
-    dtmp = kUpWeight * erle.himean + (1 - kUpWeight) * erle.average;
-    metrics->erle.average = static_cast<int>(dtmp);
-  } else {
-    metrics->erle.average = kOffsetLevel;
-  }
-
-  metrics->erle.max = static_cast<int>(erle.max);
-
-  if (erle.min < (kOffsetLevel * (-1))) {
-    metrics->erle.min = static_cast<int>(erle.min);
-  } else {
-    metrics->erle.min = kOffsetLevel;
-  }
-
-  // RERL
-  if ((metrics->erl.average > kOffsetLevel) &&
-      (metrics->erle.average > kOffsetLevel)) {
-    stmp = metrics->erl.average + metrics->erle.average;
-  } else {
-    stmp = kOffsetLevel;
-  }
-  metrics->rerl.average = stmp;
-
-  // No other statistics needed, but returned for completeness.
-  metrics->rerl.instant = stmp;
-  metrics->rerl.max = stmp;
-  metrics->rerl.min = stmp;
-
-  // A_NLP
-  metrics->aNlp.instant = static_cast<int>(a_nlp.instant);
-
-  if ((a_nlp.himean > kOffsetLevel) && (a_nlp.average > kOffsetLevel)) {
-    // Use a mix between regular average and upper part average.
-    dtmp = kUpWeight * a_nlp.himean + (1 - kUpWeight) * a_nlp.average;
-    metrics->aNlp.average = static_cast<int>(dtmp);
-  } else {
-    metrics->aNlp.average = kOffsetLevel;
-  }
-
-  metrics->aNlp.max = static_cast<int>(a_nlp.max);
-
-  if (a_nlp.min < (kOffsetLevel * (-1))) {
-    metrics->aNlp.min = static_cast<int>(a_nlp.min);
-  } else {
-    metrics->aNlp.min = kOffsetLevel;
-  }
-
-  return 0;
-}
-
-int WebRtcAec_GetDelayMetrics(void* handle,
-                              int* median,
-                              int* std,
-                              float* fraction_poor_delays) {
-  Aec* self = reinterpret_cast<Aec*>(handle);
-  if (median == NULL) {
-    return AEC_NULL_POINTER_ERROR;
-  }
-  if (std == NULL) {
-    return AEC_NULL_POINTER_ERROR;
-  }
-  if (self->initFlag != initCheck) {
-    return AEC_UNINITIALIZED_ERROR;
-  }
-  if (WebRtcAec_GetDelayMetricsCore(self->aec, median, std,
-                                    fraction_poor_delays) == -1) {
-    // Logging disabled.
-    return AEC_UNSUPPORTED_FUNCTION_ERROR;
-  }
-
-  return 0;
-}
-
-AecCore* WebRtcAec_aec_core(void* handle) {
-  if (!handle) {
-    return NULL;
-  }
-  return reinterpret_cast<Aec*>(handle)->aec;
-}
-
-static int ProcessNormal(Aec* aecInst,
-                         const float* const* nearend,
-                         size_t num_bands,
-                         float* const* out,
-                         size_t num_samples,
-                         int16_t reported_delay_ms,
-                         int32_t skew) {
-  int retVal = 0;
-  size_t i;
-  size_t nBlocks10ms;
-  // Limit resampling to doubling/halving of signal
-  const float minSkewEst = -0.5f;
-  const float maxSkewEst = 1.0f;
-
-  reported_delay_ms = reported_delay_ms > kMaxTrustedDelayMs
-                          ? kMaxTrustedDelayMs
-                          : reported_delay_ms;
-  // TODO(andrew): we need to investigate if this +10 is really wanted.
-  reported_delay_ms += 10;
-  aecInst->msInSndCardBuf = reported_delay_ms;
-
-  if (aecInst->skewMode == kAecTrue) {
-    if (aecInst->skewFrCtr < 25) {
-      aecInst->skewFrCtr++;
-    } else {
-      retVal = WebRtcAec_GetSkew(aecInst->resampler, skew, &aecInst->skew);
-      if (retVal == -1) {
-        aecInst->skew = 0;
-        retVal = AEC_BAD_PARAMETER_WARNING;
-      }
-
-      aecInst->skew /= aecInst->sampFactor * num_samples;
-
-      if (aecInst->skew < 1.0e-3 && aecInst->skew > -1.0e-3) {
-        aecInst->resample = kAecFalse;
-      } else {
-        aecInst->resample = kAecTrue;
-      }
-
-      if (aecInst->skew < minSkewEst) {
-        aecInst->skew = minSkewEst;
-      } else if (aecInst->skew > maxSkewEst) {
-        aecInst->skew = maxSkewEst;
-      }
-
-      aecInst->data_dumper->DumpRaw("aec_skew", 1, &aecInst->skew);
-    }
-  }
-
-  nBlocks10ms = num_samples / (FRAME_LEN * aecInst->rate_factor);
-
-  if (aecInst->startup_phase) {
-    for (i = 0; i < num_bands; ++i) {
-      // Only needed if they don't already point to the same place.
-      if (nearend[i] != out[i]) {
-        memcpy(out[i], nearend[i], sizeof(nearend[i][0]) * num_samples);
-      }
-    }
-
-    // The AEC is in the start up mode
-    // AEC is disabled until the system delay is OK
-
-    // Mechanism to ensure that the system delay is reasonably stable.
-    if (aecInst->checkBuffSize) {
-      aecInst->checkBufSizeCtr++;
-      // Before we fill up the far-end buffer we require the system delay
-      // to be stable (+/-8 ms) compared to the first value. This
-      // comparison is made during the following 6 consecutive 10 ms
-      // blocks. If it seems to be stable then we start to fill up the
-      // far-end buffer.
-      if (aecInst->counter == 0) {
-        aecInst->firstVal = aecInst->msInSndCardBuf;
-        aecInst->sum = 0;
-      }
-
-      if (abs(aecInst->firstVal - aecInst->msInSndCardBuf) <
-          WEBRTC_SPL_MAX(0.2 * aecInst->msInSndCardBuf, sampMsNb)) {
-        aecInst->sum += aecInst->msInSndCardBuf;
-        aecInst->counter++;
-      } else {
-        aecInst->counter = 0;
-      }
-
-      if (aecInst->counter * nBlocks10ms >= 6) {
-        // The far-end buffer size is determined in partitions of
-        // PART_LEN samples. Use 75% of the average value of the system
-        // delay as buffer size to start with.
-        aecInst->bufSizeStart =
-            WEBRTC_SPL_MIN((3 * aecInst->sum * aecInst->rate_factor * 8) /
-                               (4 * aecInst->counter * PART_LEN),
-                           kMaxBufSizeStart);
-        // Buffer size has now been determined.
-        aecInst->checkBuffSize = 0;
-      }
-
-      if (aecInst->checkBufSizeCtr * nBlocks10ms > 50) {
-        // For really bad systems, don't disable the echo canceller for
-        // more than 0.5 sec.
-        aecInst->bufSizeStart = WEBRTC_SPL_MIN(
-            (aecInst->msInSndCardBuf * aecInst->rate_factor * 3) / 40,
-            kMaxBufSizeStart);
-        aecInst->checkBuffSize = 0;
-      }
-    }
-
-    // If |checkBuffSize| changed in the if-statement above.
-    if (!aecInst->checkBuffSize) {
-      // The system delay is now reasonably stable (or has been unstable
-      // for too long). When the far-end buffer is filled with
-      // approximately the same amount of data as reported by the system
-      // we end the startup phase.
-      int overhead_elements = WebRtcAec_system_delay(aecInst->aec) / PART_LEN -
-                              aecInst->bufSizeStart;
-      if (overhead_elements == 0) {
-        // Enable the AEC
-        aecInst->startup_phase = 0;
-      } else if (overhead_elements > 0) {
-        // TODO(bjornv): Do we need a check on how much we actually
-        // moved the read pointer? It should always be possible to move
-        // the pointer |overhead_elements| since we have only added data
-        // to the buffer and no delay compensation nor AEC processing
-        // has been done.
-        WebRtcAec_AdjustFarendBufferSizeAndSystemDelay(aecInst->aec,
-                                                       overhead_elements);
-
-        // Enable the AEC
-        aecInst->startup_phase = 0;
-      }
-    }
-  } else {
-    // AEC is enabled.
-    EstBufDelayNormal(aecInst);
-
-    // Call the AEC.
-    // TODO(bjornv): Re-structure such that we don't have to pass
-    // |aecInst->knownDelay| as input. Change name to something like
-    // |system_buffer_diff|.
-    WebRtcAec_ProcessFrames(aecInst->aec, nearend, num_bands, num_samples,
-                            aecInst->knownDelay, out);
-  }
-
-  return retVal;
-}
-
-static void ProcessExtended(Aec* self,
-                            const float* const* nearend,
-                            size_t num_bands,
-                            float* const* out,
-                            size_t num_samples,
-                            int16_t reported_delay_ms,
-                            int32_t skew) {
-  size_t i;
-  const int delay_diff_offset = kDelayDiffOffsetSamples;
-  RTC_DCHECK(num_samples == 80 || num_samples == 160);
-#if defined(WEBRTC_UNTRUSTED_DELAY)
-  reported_delay_ms = kFixedDelayMs;
-#else
-  // This is the usual mode where we trust the reported system delay values.
-  // Due to the longer filter, we no longer add 10 ms to the reported delay
-  // to reduce chance of non-causality. Instead we apply a minimum here to avoid
-  // issues with the read pointer jumping around needlessly.
-  reported_delay_ms = reported_delay_ms < kMinTrustedDelayMs
-                          ? kMinTrustedDelayMs
-                          : reported_delay_ms;
-  // If the reported delay appears to be bogus, we attempt to recover by using
-  // the measured fixed delay values. We use >= here because higher layers
-  // may already clamp to this maximum value, and we would otherwise not
-  // detect it here.
-  reported_delay_ms = reported_delay_ms >= kMaxTrustedDelayMs
-                          ? kFixedDelayMs
-                          : reported_delay_ms;
-#endif
-  self->msInSndCardBuf = reported_delay_ms;
-
-  if (!self->farend_started) {
-    for (i = 0; i < num_bands; ++i) {
-      // Only needed if they don't already point to the same place.
-      if (nearend[i] != out[i]) {
-        memcpy(out[i], nearend[i], sizeof(nearend[i][0]) * num_samples);
-      }
-    }
-    return;
-  }
-  if (self->startup_phase) {
-    // In the extended mode, there isn't a startup "phase", just a special
-    // action on the first frame. In the trusted delay case, we'll take the
-    // current reported delay, unless it's less then our conservative
-    // measurement.
-    int startup_size_ms =
-        reported_delay_ms < kFixedDelayMs ? kFixedDelayMs : reported_delay_ms;
-#if defined(WEBRTC_ANDROID)
-    int target_delay = startup_size_ms * self->rate_factor * 8;
-#else
-    // To avoid putting the AEC in a non-causal state we're being slightly
-    // conservative and scale by 2. On Android we use a fixed delay and
-    // therefore there is no need to scale the target_delay.
-    int target_delay = startup_size_ms * self->rate_factor * 8 / 2;
-#endif
-    int overhead_elements =
-        (WebRtcAec_system_delay(self->aec) - target_delay) / PART_LEN;
-    WebRtcAec_AdjustFarendBufferSizeAndSystemDelay(self->aec,
-                                                   overhead_elements);
-    self->startup_phase = 0;
-  }
-
-  EstBufDelayExtended(self);
-
-  {
-    // |delay_diff_offset| gives us the option to manually rewind the delay on
-    // very low delay platforms which can't be expressed purely through
-    // |reported_delay_ms|.
-    const int adjusted_known_delay =
-        WEBRTC_SPL_MAX(0, self->knownDelay + delay_diff_offset);
-
-    WebRtcAec_ProcessFrames(self->aec, nearend, num_bands, num_samples,
-                            adjusted_known_delay, out);
-  }
-}
-
-static void EstBufDelayNormal(Aec* aecInst) {
-  int nSampSndCard = aecInst->msInSndCardBuf * sampMsNb * aecInst->rate_factor;
-  int current_delay = nSampSndCard - WebRtcAec_system_delay(aecInst->aec);
-  int delay_difference = 0;
-
-  // Before we proceed with the delay estimate filtering we:
-  // 1) Compensate for the frame that will be read.
-  // 2) Compensate for drift resampling.
-  // 3) Compensate for non-causality if needed, since the estimated delay can't
-  //    be negative.
-
-  // 1) Compensating for the frame(s) that will be read/processed.
-  current_delay += FRAME_LEN * aecInst->rate_factor;
-
-  // 2) Account for resampling frame delay.
-  if (aecInst->skewMode == kAecTrue && aecInst->resample == kAecTrue) {
-    current_delay -= kResamplingDelay;
-  }
-
-  // 3) Compensate for non-causality, if needed, by flushing one block.
-  if (current_delay < PART_LEN) {
-    current_delay +=
-        WebRtcAec_AdjustFarendBufferSizeAndSystemDelay(aecInst->aec, 1) *
-        PART_LEN;
-  }
-
-  // We use -1 to signal an initialized state in the "extended" implementation;
-  // compensate for that.
-  aecInst->filtDelay = aecInst->filtDelay < 0 ? 0 : aecInst->filtDelay;
-  aecInst->filtDelay = WEBRTC_SPL_MAX(
-      0, static_cast<int16_t>(0.8 * aecInst->filtDelay + 0.2 * current_delay));
-
-  delay_difference = aecInst->filtDelay - aecInst->knownDelay;
-  if (delay_difference > 224) {
-    if (aecInst->lastDelayDiff < 96) {
-      aecInst->timeForDelayChange = 0;
-    } else {
-      aecInst->timeForDelayChange++;
-    }
-  } else if (delay_difference < 96 && aecInst->knownDelay > 0) {
-    if (aecInst->lastDelayDiff > 224) {
-      aecInst->timeForDelayChange = 0;
-    } else {
-      aecInst->timeForDelayChange++;
-    }
-  } else {
-    aecInst->timeForDelayChange = 0;
-  }
-  aecInst->lastDelayDiff = delay_difference;
-
-  if (aecInst->timeForDelayChange > 25) {
-    aecInst->knownDelay = WEBRTC_SPL_MAX((int)aecInst->filtDelay - 160, 0);
-  }
-}
-
-static void EstBufDelayExtended(Aec* aecInst) {
-  int reported_delay =
-      aecInst->msInSndCardBuf * sampMsNb * aecInst->rate_factor;
-  int current_delay = reported_delay - WebRtcAec_system_delay(aecInst->aec);
-  int delay_difference = 0;
-
-  // Before we proceed with the delay estimate filtering we:
-  // 1) Compensate for the frame that will be read.
-  // 2) Compensate for drift resampling.
-  // 3) Compensate for non-causality if needed, since the estimated delay can't
-  //    be negative.
-
-  // 1) Compensating for the frame(s) that will be read/processed.
-  current_delay += FRAME_LEN * aecInst->rate_factor;
-
-  // 2) Account for resampling frame delay.
-  if (aecInst->skewMode == kAecTrue && aecInst->resample == kAecTrue) {
-    current_delay -= kResamplingDelay;
-  }
-
-  // 3) Compensate for non-causality, if needed, by flushing two blocks.
-  if (current_delay < PART_LEN) {
-    current_delay +=
-        WebRtcAec_AdjustFarendBufferSizeAndSystemDelay(aecInst->aec, 2) *
-        PART_LEN;
-  }
-
-  if (aecInst->filtDelay == -1) {
-    aecInst->filtDelay = WEBRTC_SPL_MAX(0, 0.5 * current_delay);
-  } else {
-    aecInst->filtDelay = WEBRTC_SPL_MAX(
-        0,
-        static_cast<int16_t>(0.95 * aecInst->filtDelay + 0.05 * current_delay));
-  }
-
-  delay_difference = aecInst->filtDelay - aecInst->knownDelay;
-  if (delay_difference > 384) {
-    if (aecInst->lastDelayDiff < 128) {
-      aecInst->timeForDelayChange = 0;
-    } else {
-      aecInst->timeForDelayChange++;
-    }
-  } else if (delay_difference < 128 && aecInst->knownDelay > 0) {
-    if (aecInst->lastDelayDiff > 384) {
-      aecInst->timeForDelayChange = 0;
-    } else {
-      aecInst->timeForDelayChange++;
-    }
-  } else {
-    aecInst->timeForDelayChange = 0;
-  }
-  aecInst->lastDelayDiff = delay_difference;
-
-  if (aecInst->timeForDelayChange > 25) {
-    aecInst->knownDelay = WEBRTC_SPL_MAX((int)aecInst->filtDelay - 256, 0);
-  }
-}
-}  // namespace webrtc
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec/echo_cancellation.h b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec/echo_cancellation.h
deleted file mode 100644
index 20393471f2..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec/echo_cancellation.h
+++ /dev/null
@@ -1,298 +0,0 @@
-/*
- *  Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#ifndef MODULES_AUDIO_PROCESSING_AEC_ECHO_CANCELLATION_H_
-#define MODULES_AUDIO_PROCESSING_AEC_ECHO_CANCELLATION_H_
-
-#include <memory>
-
-#include <stddef.h>
-
-extern "C" {
-#include "common_audio/ring_buffer.h"
-}
-#include "modules/audio_processing/aec/aec_core.h"
-
-namespace webrtc {
-
-// Errors
-#define AEC_UNSPECIFIED_ERROR 12000
-#define AEC_UNSUPPORTED_FUNCTION_ERROR 12001
-#define AEC_UNINITIALIZED_ERROR 12002
-#define AEC_NULL_POINTER_ERROR 12003
-#define AEC_BAD_PARAMETER_ERROR 12004
-
-// Warnings
-#define AEC_BAD_PARAMETER_WARNING 12050
-
-enum { kAecNlpConservative = 0, kAecNlpModerate, kAecNlpAggressive };
-
-enum { kAecFalse = 0, kAecTrue };
-
-typedef struct {
-  int16_t nlpMode;      // default kAecNlpModerate
-  int16_t skewMode;     // default kAecFalse
-  int16_t metricsMode;  // default kAecFalse
-  int delay_logging;    // default kAecFalse
-  // float realSkew;
-} AecConfig;
-
-typedef struct {
-  int instant;
-  int average;
-  int max;
-  int min;
-} AecLevel;
-
-typedef struct {
-  AecLevel rerl;
-  AecLevel erl;
-  AecLevel erle;
-  AecLevel aNlp;
-  float divergent_filter_fraction;
-} AecMetrics;
-
-struct AecCore;
-
-class ApmDataDumper;
-
-typedef struct Aec {
-  Aec();
-  ~Aec();
-
-  std::unique_ptr<ApmDataDumper> data_dumper;
-
-  int delayCtr;
-  int sampFreq;
-  int splitSampFreq;
-  int scSampFreq;
-  float sampFactor;  // scSampRate / sampFreq
-  short skewMode;
-  int bufSizeStart;
-  int knownDelay;
-  int rate_factor;
-
-  short initFlag;  // indicates if AEC has been initialized
-
-  // Variables used for averaging far end buffer size
-  short counter;
-  int sum;
-  short firstVal;
-  short checkBufSizeCtr;
-
-  // Variables used for delay shifts
-  short msInSndCardBuf;
-  short filtDelay;  // Filtered delay estimate.
-  int timeForDelayChange;
-  int startup_phase;
-  int checkBuffSize;
-  short lastDelayDiff;
-
-  // Structures
-  void* resampler;
-
-  int skewFrCtr;
-  int resample;  // if the skew is small enough we don't resample
-  int highSkewCtr;
-  float skew;
-
-  RingBuffer* far_pre_buf;  // Time domain far-end pre-buffer.
-
-  int farend_started;
-
-  // Aec instance counter.
-  static int instance_count;
-  AecCore* aec;
-} Aec;
-
-/*
- * Allocates the memory needed by the AEC. The memory needs to be initialized
- * separately using the WebRtcAec_Init() function. Returns a pointer to the
- * object or NULL on error.
- */
-void* WebRtcAec_Create();
-
-/*
- * This function releases the memory allocated by WebRtcAec_Create().
- *
- * Inputs                       Description
- * -------------------------------------------------------------------
- * void*        aecInst         Pointer to the AEC instance
- */
-void WebRtcAec_Free(void* aecInst);
-
-/*
- * Initializes an AEC instance.
- *
- * Inputs                       Description
- * -------------------------------------------------------------------
- * void*          aecInst       Pointer to the AEC instance
- * int32_t        sampFreq      Sampling frequency of data
- * int32_t        scSampFreq    Soundcard sampling frequency
- *
- * Outputs                      Description
- * -------------------------------------------------------------------
- * int32_t        return        0: OK
- *                             -1: error
- */
-int32_t WebRtcAec_Init(void* aecInst, int32_t sampFreq, int32_t scSampFreq);
-
-/*
- * Inserts an 80 or 160 sample block of data into the farend buffer.
- *
- * Inputs                       Description
- * -------------------------------------------------------------------
- * void*          aecInst       Pointer to the AEC instance
- * const float*   farend        In buffer containing one frame of
- *                              farend signal for L band
- * int16_t        nrOfSamples   Number of samples in farend buffer
- *
- * Outputs                      Description
- * -------------------------------------------------------------------
- * int32_t        return        0: OK
- *                              12000-12050: error code
- */
-int32_t WebRtcAec_BufferFarend(void* aecInst,
-                               const float* farend,
-                               size_t nrOfSamples);
-
-/*
- * Reports any errors that would arise if buffering a farend buffer
- *
- * Inputs                       Description
- * -------------------------------------------------------------------
- * void*          aecInst       Pointer to the AEC instance
- * const float*   farend        In buffer containing one frame of
- *                              farend signal for L band
- * int16_t        nrOfSamples   Number of samples in farend buffer
- *
- * Outputs                      Description
- * -------------------------------------------------------------------
- * int32_t        return        0: OK
- *                              12000-12050: error code
- */
-int32_t WebRtcAec_GetBufferFarendError(void* aecInst,
-                                       const float* farend,
-                                       size_t nrOfSamples);
-
-/*
- * Runs the echo canceller on an 80 or 160 sample blocks of data.
- *
- * Inputs                       Description
- * -------------------------------------------------------------------
- * void*         aecInst        Pointer to the AEC instance
- * float* const* nearend        In buffer containing one frame of
- *                              nearend+echo signal for each band
- * int           num_bands      Number of bands in nearend buffer
- * int16_t       nrOfSamples    Number of samples in nearend buffer
- * int16_t       msInSndCardBuf Delay estimate for sound card and
- *                              system buffers
- * int16_t       skew           Difference between number of samples played
- *                              and recorded at the soundcard (for clock skew
- *                              compensation)
- *
- * Outputs                      Description
- * -------------------------------------------------------------------
- * float* const* out            Out buffer, one frame of processed nearend
- *                              for each band
- * int32_t       return         0: OK
- *                              12000-12050: error code
- */
-int32_t WebRtcAec_Process(void* aecInst,
-                          const float* const* nearend,
-                          size_t num_bands,
-                          float* const* out,
-                          size_t nrOfSamples,
-                          int16_t msInSndCardBuf,
-                          int32_t skew);
-
-/*
- * This function enables the user to set certain parameters on-the-fly.
- *
- * Inputs                       Description
- * -------------------------------------------------------------------
- * void*          handle        Pointer to the AEC instance
- * AecConfig      config        Config instance that contains all
- *                              properties to be set
- *
- * Outputs                      Description
- * -------------------------------------------------------------------
- * int            return        0: OK
- *                              12000-12050: error code
- */
-int WebRtcAec_set_config(void* handle, AecConfig config);
-
-/*
- * Gets the current echo status of the nearend signal.
- *
- * Inputs                       Description
- * -------------------------------------------------------------------
- * void*          handle        Pointer to the AEC instance
- *
- * Outputs                      Description
- * -------------------------------------------------------------------
- * int*           status        0: Almost certainly nearend single-talk
- *                              1: Might not be neared single-talk
- * int            return        0: OK
- *                              12000-12050: error code
- */
-int WebRtcAec_get_echo_status(void* handle, int* status);
-
-/*
- * Gets the current echo metrics for the session.
- *
- * Inputs                       Description
- * -------------------------------------------------------------------
- * void*          handle        Pointer to the AEC instance
- *
- * Outputs                      Description
- * -------------------------------------------------------------------
- * AecMetrics*    metrics       Struct which will be filled out with the
- *                              current echo metrics.
- * int            return        0: OK
- *                              12000-12050: error code
- */
-int WebRtcAec_GetMetrics(void* handle, AecMetrics* metrics);
-
-/*
- * Gets the current delay metrics for the session.
- *
- * Inputs                       Description
- * -------------------------------------------------------------------
- * void*   handle               Pointer to the AEC instance
- *
- * Outputs                      Description
- * -------------------------------------------------------------------
- * int*    median               Delay median value.
- * int*    std                  Delay standard deviation.
- * float*  fraction_poor_delays Fraction of the delay estimates that may
- *                              cause the AEC to perform poorly.
- *
- * int            return        0: OK
- *                              12000-12050: error code
- */
-int WebRtcAec_GetDelayMetrics(void* handle,
-                              int* median,
-                              int* std,
-                              float* fraction_poor_delays);
-
-// Returns a pointer to the low level AEC handle.
-//
-// Input:
-//  - handle                    : Pointer to the AEC instance.
-//
-// Return value:
-//  - AecCore pointer           : NULL for error.
-//
-struct AecCore* WebRtcAec_aec_core(void* handle);
-
-}  // namespace webrtc
-
-#endif  // MODULES_AUDIO_PROCESSING_AEC_ECHO_CANCELLATION_H_
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/adaptive_fir_filter.cc b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/adaptive_fir_filter.cc
deleted file mode 100644
index 1cfa620251..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/adaptive_fir_filter.cc
+++ /dev/null
@@ -1,655 +0,0 @@
-/*
- *  Copyright (c) 2017 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#include "modules/audio_processing/aec3/adaptive_fir_filter.h"
-
-// Defines WEBRTC_ARCH_X86_FAMILY, used below.
-#include "rtc_base/system/arch.h"
-
-#if defined(WEBRTC_ARCH_ARM_FAMILY) && defined(WEBRTC_HAS_NEON)
-#include <arm_neon.h>
-#endif
-#if defined(WEBRTC_ARCH_X86_FAMILY)
-#include <emmintrin.h>
-#endif
-#include <algorithm>
-#include <functional>
-
-#include "modules/audio_processing/aec3/fft_data.h"
-#include "rtc_base/checks.h"
-#include "system_wrappers/include/field_trial.h"
-
-namespace webrtc {
-
-namespace aec3 {
-
-// Computes and stores the frequency response of the filter.
-void UpdateFrequencyResponse(
-    rtc::ArrayView<const FftData> H,
-    std::vector<std::array<float, kFftLengthBy2Plus1>>* H2) {
-  RTC_DCHECK_EQ(H.size(), H2->size());
-  for (size_t k = 0; k < H.size(); ++k) {
-    std::transform(H[k].re.begin(), H[k].re.end(), H[k].im.begin(),
-                   (*H2)[k].begin(),
-                   [](float a, float b) { return a * a + b * b; });
-  }
-}
-
-#if defined(WEBRTC_ARCH_ARM_FAMILY) && defined(WEBRTC_HAS_NEON)
-// Computes and stores the frequency response of the filter.
-void UpdateFrequencyResponse_NEON(
-    rtc::ArrayView<const FftData> H,
-    std::vector<std::array<float, kFftLengthBy2Plus1>>* H2) {
-  RTC_DCHECK_EQ(H.size(), H2->size());
-  for (size_t k = 0; k < H.size(); ++k) {
-    for (size_t j = 0; j < kFftLengthBy2; j += 4) {
-      const float32x4_t re = vld1q_f32(&H[k].re[j]);
-      const float32x4_t im = vld1q_f32(&H[k].im[j]);
-      float32x4_t H2_k_j = vmulq_f32(re, re);
-      H2_k_j = vmlaq_f32(H2_k_j, im, im);
-      vst1q_f32(&(*H2)[k][j], H2_k_j);
-    }
-    (*H2)[k][kFftLengthBy2] = H[k].re[kFftLengthBy2] * H[k].re[kFftLengthBy2] +
-                              H[k].im[kFftLengthBy2] * H[k].im[kFftLengthBy2];
-  }
-}
-#endif
-
-#if defined(WEBRTC_ARCH_X86_FAMILY)
-// Computes and stores the frequency response of the filter.
-void UpdateFrequencyResponse_SSE2(
-    rtc::ArrayView<const FftData> H,
-    std::vector<std::array<float, kFftLengthBy2Plus1>>* H2) {
-  RTC_DCHECK_EQ(H.size(), H2->size());
-  for (size_t k = 0; k < H.size(); ++k) {
-    for (size_t j = 0; j < kFftLengthBy2; j += 4) {
-      const __m128 re = _mm_loadu_ps(&H[k].re[j]);
-      const __m128 re2 = _mm_mul_ps(re, re);
-      const __m128 im = _mm_loadu_ps(&H[k].im[j]);
-      const __m128 im2 = _mm_mul_ps(im, im);
-      const __m128 H2_k_j = _mm_add_ps(re2, im2);
-      _mm_storeu_ps(&(*H2)[k][j], H2_k_j);
-    }
-    (*H2)[k][kFftLengthBy2] = H[k].re[kFftLengthBy2] * H[k].re[kFftLengthBy2] +
-                              H[k].im[kFftLengthBy2] * H[k].im[kFftLengthBy2];
-  }
-}
-#endif
-
-// Computes and stores the echo return loss estimate of the filter, which is the
-// sum of the partition frequency responses.
-void UpdateErlEstimator(
-    const std::vector<std::array<float, kFftLengthBy2Plus1>>& H2,
-    std::array<float, kFftLengthBy2Plus1>* erl) {
-  erl->fill(0.f);
-  for (auto& H2_j : H2) {
-    std::transform(H2_j.begin(), H2_j.end(), erl->begin(), erl->begin(),
-                   std::plus<float>());
-  }
-}
-
-#if defined(WEBRTC_ARCH_ARM_FAMILY) && defined(WEBRTC_HAS_NEON)
-// Computes and stores the echo return loss estimate of the filter, which is the
-// sum of the partition frequency responses.
-void UpdateErlEstimator_NEON(
-    const std::vector<std::array<float, kFftLengthBy2Plus1>>& H2,
-    std::array<float, kFftLengthBy2Plus1>* erl) {
-  erl->fill(0.f);
-  for (auto& H2_j : H2) {
-    for (size_t k = 0; k < kFftLengthBy2; k += 4) {
-      const float32x4_t H2_j_k = vld1q_f32(&H2_j[k]);
-      float32x4_t erl_k = vld1q_f32(&(*erl)[k]);
-      erl_k = vaddq_f32(erl_k, H2_j_k);
-      vst1q_f32(&(*erl)[k], erl_k);
-    }
-    (*erl)[kFftLengthBy2] += H2_j[kFftLengthBy2];
-  }
-}
-#endif
-
-#if defined(WEBRTC_ARCH_X86_FAMILY)
-// Computes and stores the echo return loss estimate of the filter, which is the
-// sum of the partition frequency responses.
-void UpdateErlEstimator_SSE2(
-    const std::vector<std::array<float, kFftLengthBy2Plus1>>& H2,
-    std::array<float, kFftLengthBy2Plus1>* erl) {
-  erl->fill(0.f);
-  for (auto& H2_j : H2) {
-    for (size_t k = 0; k < kFftLengthBy2; k += 4) {
-      const __m128 H2_j_k = _mm_loadu_ps(&H2_j[k]);
-      __m128 erl_k = _mm_loadu_ps(&(*erl)[k]);
-      erl_k = _mm_add_ps(erl_k, H2_j_k);
-      _mm_storeu_ps(&(*erl)[k], erl_k);
-    }
-    (*erl)[kFftLengthBy2] += H2_j[kFftLengthBy2];
-  }
-}
-#endif
-
-// Adapts the filter partitions as H(t+1)=H(t)+G(t)*conj(X(t)).
-void AdaptPartitions(const RenderBuffer& render_buffer,
-                     const FftData& G,
-                     rtc::ArrayView<FftData> H) {
-  rtc::ArrayView<const FftData> render_buffer_data =
-      render_buffer.GetFftBuffer();
-  size_t index = render_buffer.Position();
-  for (auto& H_j : H) {
-    const FftData& X = render_buffer_data[index];
-    for (size_t k = 0; k < kFftLengthBy2Plus1; ++k) {
-      H_j.re[k] += X.re[k] * G.re[k] + X.im[k] * G.im[k];
-      H_j.im[k] += X.re[k] * G.im[k] - X.im[k] * G.re[k];
-    }
-
-    index = index < (render_buffer_data.size() - 1) ? index + 1 : 0;
-  }
-}
-
-#if defined(WEBRTC_ARCH_ARM_FAMILY) && defined(WEBRTC_HAS_NEON)
-// Adapts the filter partitions. (NEON variant)
-void AdaptPartitions_NEON(const RenderBuffer& render_buffer,
-                          const FftData& G,
-                          rtc::ArrayView<FftData> H) {
-  rtc::ArrayView<const FftData> render_buffer_data =
-      render_buffer.GetFftBuffer();
-  const int lim1 =
-      std::min(render_buffer_data.size() - render_buffer.Position(), H.size());
-  const int lim2 = H.size();
-  constexpr int kNumFourBinBands = kFftLengthBy2 / 4;
-  FftData* H_j = &H[0];
-  const FftData* X = &render_buffer_data[render_buffer.Position()];
-  int limit = lim1;
-  int j = 0;
-  do {
-    for (; j < limit; ++j, ++H_j, ++X) {
-      for (int k = 0, n = 0; n < kNumFourBinBands; ++n, k += 4) {
-        const float32x4_t G_re = vld1q_f32(&G.re[k]);
-        const float32x4_t G_im = vld1q_f32(&G.im[k]);
-        const float32x4_t X_re = vld1q_f32(&X->re[k]);
-        const float32x4_t X_im = vld1q_f32(&X->im[k]);
-        const float32x4_t H_re = vld1q_f32(&H_j->re[k]);
-        const float32x4_t H_im = vld1q_f32(&H_j->im[k]);
-        const float32x4_t a = vmulq_f32(X_re, G_re);
-        const float32x4_t e = vmlaq_f32(a, X_im, G_im);
-        const float32x4_t c = vmulq_f32(X_re, G_im);
-        const float32x4_t f = vmlsq_f32(c, X_im, G_re);
-        const float32x4_t g = vaddq_f32(H_re, e);
-        const float32x4_t h = vaddq_f32(H_im, f);
-
-        vst1q_f32(&H_j->re[k], g);
-        vst1q_f32(&H_j->im[k], h);
-      }
-    }
-
-    X = &render_buffer_data[0];
-    limit = lim2;
-  } while (j < lim2);
-
-  H_j = &H[0];
-  X = &render_buffer_data[render_buffer.Position()];
-  limit = lim1;
-  j = 0;
-  do {
-    for (; j < limit; ++j, ++H_j, ++X) {
-      H_j->re[kFftLengthBy2] += X->re[kFftLengthBy2] * G.re[kFftLengthBy2] +
-                                X->im[kFftLengthBy2] * G.im[kFftLengthBy2];
-      H_j->im[kFftLengthBy2] += X->re[kFftLengthBy2] * G.im[kFftLengthBy2] -
-                                X->im[kFftLengthBy2] * G.re[kFftLengthBy2];
-    }
-
-    X = &render_buffer_data[0];
-    limit = lim2;
-  } while (j < lim2);
-}
-#endif
-
-#if defined(WEBRTC_ARCH_X86_FAMILY)
-// Adapts the filter partitions. (SSE2 variant)
-void AdaptPartitions_SSE2(const RenderBuffer& render_buffer,
-                          const FftData& G,
-                          rtc::ArrayView<FftData> H) {
-  rtc::ArrayView<const FftData> render_buffer_data =
-      render_buffer.GetFftBuffer();
-  const int lim1 =
-      std::min(render_buffer_data.size() - render_buffer.Position(), H.size());
-  const int lim2 = H.size();
-  constexpr int kNumFourBinBands = kFftLengthBy2 / 4;
-  FftData* H_j;
-  const FftData* X;
-  int limit;
-  int j;
-  for (int k = 0, n = 0; n < kNumFourBinBands; ++n, k += 4) {
-    const __m128 G_re = _mm_loadu_ps(&G.re[k]);
-    const __m128 G_im = _mm_loadu_ps(&G.im[k]);
-
-    H_j = &H[0];
-    X = &render_buffer_data[render_buffer.Position()];
-    limit = lim1;
-    j = 0;
-    do {
-      for (; j < limit; ++j, ++H_j, ++X) {
-        const __m128 X_re = _mm_loadu_ps(&X->re[k]);
-        const __m128 X_im = _mm_loadu_ps(&X->im[k]);
-        const __m128 H_re = _mm_loadu_ps(&H_j->re[k]);
-        const __m128 H_im = _mm_loadu_ps(&H_j->im[k]);
-        const __m128 a = _mm_mul_ps(X_re, G_re);
-        const __m128 b = _mm_mul_ps(X_im, G_im);
-        const __m128 c = _mm_mul_ps(X_re, G_im);
-        const __m128 d = _mm_mul_ps(X_im, G_re);
-        const __m128 e = _mm_add_ps(a, b);
-        const __m128 f = _mm_sub_ps(c, d);
-        const __m128 g = _mm_add_ps(H_re, e);
-        const __m128 h = _mm_add_ps(H_im, f);
-        _mm_storeu_ps(&H_j->re[k], g);
-        _mm_storeu_ps(&H_j->im[k], h);
-      }
-
-      X = &render_buffer_data[0];
-      limit = lim2;
-    } while (j < lim2);
-  }
-
-  H_j = &H[0];
-  X = &render_buffer_data[render_buffer.Position()];
-  limit = lim1;
-  j = 0;
-  do {
-    for (; j < limit; ++j, ++H_j, ++X) {
-      H_j->re[kFftLengthBy2] += X->re[kFftLengthBy2] * G.re[kFftLengthBy2] +
-                                X->im[kFftLengthBy2] * G.im[kFftLengthBy2];
-      H_j->im[kFftLengthBy2] += X->re[kFftLengthBy2] * G.im[kFftLengthBy2] -
-                                X->im[kFftLengthBy2] * G.re[kFftLengthBy2];
-    }
-
-    X = &render_buffer_data[0];
-    limit = lim2;
-  } while (j < lim2);
-}
-#endif
-
-// Produces the filter output.
-void ApplyFilter(const RenderBuffer& render_buffer,
-                 rtc::ArrayView<const FftData> H,
-                 FftData* S) {
-  S->re.fill(0.f);
-  S->im.fill(0.f);
-
-  rtc::ArrayView<const FftData> render_buffer_data =
-      render_buffer.GetFftBuffer();
-  size_t index = render_buffer.Position();
-  for (auto& H_j : H) {
-    const FftData& X = render_buffer_data[index];
-    for (size_t k = 0; k < kFftLengthBy2Plus1; ++k) {
-      S->re[k] += X.re[k] * H_j.re[k] - X.im[k] * H_j.im[k];
-      S->im[k] += X.re[k] * H_j.im[k] + X.im[k] * H_j.re[k];
-    }
-    index = index < (render_buffer_data.size() - 1) ? index + 1 : 0;
-  }
-}
-
-#if defined(WEBRTC_ARCH_ARM_FAMILY) && defined(WEBRTC_HAS_NEON)
-// Produces the filter output (NEON variant).
-void ApplyFilter_NEON(const RenderBuffer& render_buffer,
-                      rtc::ArrayView<const FftData> H,
-                      FftData* S) {
-  RTC_DCHECK_GE(H.size(), H.size() - 1);
-  S->re.fill(0.f);
-  S->im.fill(0.f);
-
-  rtc::ArrayView<const FftData> render_buffer_data =
-      render_buffer.GetFftBuffer();
-  const int lim1 =
-      std::min(render_buffer_data.size() - render_buffer.Position(), H.size());
-  const int lim2 = H.size();
-  constexpr int kNumFourBinBands = kFftLengthBy2 / 4;
-  const FftData* H_j = &H[0];
-  const FftData* X = &render_buffer_data[render_buffer.Position()];
-
-  int j = 0;
-  int limit = lim1;
-  do {
-    for (; j < limit; ++j, ++H_j, ++X) {
-      for (int k = 0, n = 0; n < kNumFourBinBands; ++n, k += 4) {
-        const float32x4_t X_re = vld1q_f32(&X->re[k]);
-        const float32x4_t X_im = vld1q_f32(&X->im[k]);
-        const float32x4_t H_re = vld1q_f32(&H_j->re[k]);
-        const float32x4_t H_im = vld1q_f32(&H_j->im[k]);
-        const float32x4_t S_re = vld1q_f32(&S->re[k]);
-        const float32x4_t S_im = vld1q_f32(&S->im[k]);
-        const float32x4_t a = vmulq_f32(X_re, H_re);
-        const float32x4_t e = vmlsq_f32(a, X_im, H_im);
-        const float32x4_t c = vmulq_f32(X_re, H_im);
-        const float32x4_t f = vmlaq_f32(c, X_im, H_re);
-        const float32x4_t g = vaddq_f32(S_re, e);
-        const float32x4_t h = vaddq_f32(S_im, f);
-        vst1q_f32(&S->re[k], g);
-        vst1q_f32(&S->im[k], h);
-      }
-    }
-    limit = lim2;
-    X = &render_buffer_data[0];
-  } while (j < lim2);
-
-  H_j = &H[0];
-  X = &render_buffer_data[render_buffer.Position()];
-  j = 0;
-  limit = lim1;
-  do {
-    for (; j < limit; ++j, ++H_j, ++X) {
-      S->re[kFftLengthBy2] += X->re[kFftLengthBy2] * H_j->re[kFftLengthBy2] -
-                              X->im[kFftLengthBy2] * H_j->im[kFftLengthBy2];
-      S->im[kFftLengthBy2] += X->re[kFftLengthBy2] * H_j->im[kFftLengthBy2] +
-                              X->im[kFftLengthBy2] * H_j->re[kFftLengthBy2];
-    }
-    limit = lim2;
-    X = &render_buffer_data[0];
-  } while (j < lim2);
-}
-#endif
-
-#if defined(WEBRTC_ARCH_X86_FAMILY)
-// Produces the filter output (SSE2 variant).
-void ApplyFilter_SSE2(const RenderBuffer& render_buffer,
-                      rtc::ArrayView<const FftData> H,
-                      FftData* S) {
-  RTC_DCHECK_GE(H.size(), H.size() - 1);
-  S->re.fill(0.f);
-  S->im.fill(0.f);
-
-  rtc::ArrayView<const FftData> render_buffer_data =
-      render_buffer.GetFftBuffer();
-  const int lim1 =
-      std::min(render_buffer_data.size() - render_buffer.Position(), H.size());
-  const int lim2 = H.size();
-  constexpr int kNumFourBinBands = kFftLengthBy2 / 4;
-  const FftData* H_j = &H[0];
-  const FftData* X = &render_buffer_data[render_buffer.Position()];
-
-  int j = 0;
-  int limit = lim1;
-  do {
-    for (; j < limit; ++j, ++H_j, ++X) {
-      for (int k = 0, n = 0; n < kNumFourBinBands; ++n, k += 4) {
-        const __m128 X_re = _mm_loadu_ps(&X->re[k]);
-        const __m128 X_im = _mm_loadu_ps(&X->im[k]);
-        const __m128 H_re = _mm_loadu_ps(&H_j->re[k]);
-        const __m128 H_im = _mm_loadu_ps(&H_j->im[k]);
-        const __m128 S_re = _mm_loadu_ps(&S->re[k]);
-        const __m128 S_im = _mm_loadu_ps(&S->im[k]);
-        const __m128 a = _mm_mul_ps(X_re, H_re);
-        const __m128 b = _mm_mul_ps(X_im, H_im);
-        const __m128 c = _mm_mul_ps(X_re, H_im);
-        const __m128 d = _mm_mul_ps(X_im, H_re);
-        const __m128 e = _mm_sub_ps(a, b);
-        const __m128 f = _mm_add_ps(c, d);
-        const __m128 g = _mm_add_ps(S_re, e);
-        const __m128 h = _mm_add_ps(S_im, f);
-        _mm_storeu_ps(&S->re[k], g);
-        _mm_storeu_ps(&S->im[k], h);
-      }
-    }
-    limit = lim2;
-    X = &render_buffer_data[0];
-  } while (j < lim2);
-
-  H_j = &H[0];
-  X = &render_buffer_data[render_buffer.Position()];
-  j = 0;
-  limit = lim1;
-  do {
-    for (; j < limit; ++j, ++H_j, ++X) {
-      S->re[kFftLengthBy2] += X->re[kFftLengthBy2] * H_j->re[kFftLengthBy2] -
-                              X->im[kFftLengthBy2] * H_j->im[kFftLengthBy2];
-      S->im[kFftLengthBy2] += X->re[kFftLengthBy2] * H_j->im[kFftLengthBy2] +
-                              X->im[kFftLengthBy2] * H_j->re[kFftLengthBy2];
-    }
-    limit = lim2;
-    X = &render_buffer_data[0];
-  } while (j < lim2);
-}
-#endif
-
-}  // namespace aec3
-
-namespace {
-
-bool EnablePartialFilterReset() {
-  return !field_trial::IsEnabled("WebRTC-Aec3PartialFilterResetKillSwitch");
-}
-
-}  // namespace
-
-AdaptiveFirFilter::AdaptiveFirFilter(size_t max_size_partitions,
-                                     size_t initial_size_partitions,
-                                     size_t size_change_duration_blocks,
-                                     Aec3Optimization optimization,
-                                     ApmDataDumper* data_dumper)
-    : data_dumper_(data_dumper),
-      use_partial_filter_reset_(EnablePartialFilterReset()),
-      fft_(),
-      optimization_(optimization),
-      max_size_partitions_(max_size_partitions),
-      size_change_duration_blocks_(
-          static_cast<int>(size_change_duration_blocks)),
-      current_size_partitions_(initial_size_partitions),
-      target_size_partitions_(initial_size_partitions),
-      old_target_size_partitions_(initial_size_partitions),
-      H_(max_size_partitions_),
-      H2_(max_size_partitions_, std::array<float, kFftLengthBy2Plus1>()),
-      h_(GetTimeDomainLength(max_size_partitions_), 0.f) {
-  RTC_DCHECK(data_dumper_);
-  RTC_DCHECK_GE(max_size_partitions, initial_size_partitions);
-
-  RTC_DCHECK_LT(0, size_change_duration_blocks_);
-  one_by_size_change_duration_blocks_ = 1.f / size_change_duration_blocks_;
-
-  for (auto& H_j : H_) {
-    H_j.Clear();
-  }
-  for (auto& H2_k : H2_) {
-    H2_k.fill(0.f);
-  }
-  erl_.fill(0.f);
-  SetSizePartitions(current_size_partitions_, true);
-}
-
-AdaptiveFirFilter::~AdaptiveFirFilter() = default;
-
-void AdaptiveFirFilter::HandleEchoPathChange() {
-  size_t current_h_size = h_.size();
-  h_.resize(GetTimeDomainLength(max_size_partitions_));
-  const size_t begin_coeffficient =
-      use_partial_filter_reset_ ? current_h_size : 0;
-  std::fill(h_.begin() + begin_coeffficient, h_.end(), 0.f);
-  h_.resize(current_h_size);
-
-  size_t current_size_partitions = H_.size();
-  H_.resize(max_size_partitions_);
-  H2_.resize(max_size_partitions_);
-
-  const size_t begin_partition =
-      use_partial_filter_reset_ ? current_size_partitions : 0;
-  for (size_t k = begin_partition; k < max_size_partitions_; ++k) {
-    H_[k].Clear();
-    H2_[k].fill(0.f);
-  }
-  H_.resize(current_size_partitions);
-  H2_.resize(current_size_partitions);
-
-  erl_.fill(0.f);
-}
-
-void AdaptiveFirFilter::SetSizePartitions(size_t size, bool immediate_effect) {
-  RTC_DCHECK_EQ(max_size_partitions_, H_.capacity());
-  RTC_DCHECK_EQ(max_size_partitions_, H2_.capacity());
-  RTC_DCHECK_EQ(GetTimeDomainLength(max_size_partitions_), h_.capacity());
-  RTC_DCHECK_EQ(H_.size(), H2_.size());
-  RTC_DCHECK_EQ(h_.size(), GetTimeDomainLength(H_.size()));
-  RTC_DCHECK_LE(size, max_size_partitions_);
-
-  target_size_partitions_ = std::min(max_size_partitions_, size);
-  if (immediate_effect) {
-    current_size_partitions_ = old_target_size_partitions_ =
-        target_size_partitions_;
-    ResetFilterBuffersToCurrentSize();
-    size_change_counter_ = 0;
-  } else {
-    size_change_counter_ = size_change_duration_blocks_;
-  }
-}
-
-void AdaptiveFirFilter::ResetFilterBuffersToCurrentSize() {
-  if (current_size_partitions_ < H_.size()) {
-    for (size_t k = current_size_partitions_; k < H_.size(); ++k) {
-      H_[k].Clear();
-      H2_[k].fill(0.f);
-    }
-    std::fill(h_.begin() + GetTimeDomainLength(current_size_partitions_),
-              h_.end(), 0.f);
-  }
-
-  H_.resize(current_size_partitions_);
-  H2_.resize(current_size_partitions_);
-  h_.resize(GetTimeDomainLength(current_size_partitions_));
-  RTC_DCHECK_LT(0, current_size_partitions_);
-  partition_to_constrain_ =
-      std::min(partition_to_constrain_, current_size_partitions_ - 1);
-}
-
-void AdaptiveFirFilter::UpdateSize() {
-  RTC_DCHECK_GE(size_change_duration_blocks_, size_change_counter_);
-  if (size_change_counter_ > 0) {
-    --size_change_counter_;
-
-    auto average = [](float from, float to, float from_weight) {
-      return from * from_weight + to * (1.f - from_weight);
-    };
-
-    float change_factor =
-        size_change_counter_ * one_by_size_change_duration_blocks_;
-
-    current_size_partitions_ = average(old_target_size_partitions_,
-                                       target_size_partitions_, change_factor);
-
-    ResetFilterBuffersToCurrentSize();
-  } else {
-    current_size_partitions_ = old_target_size_partitions_ =
-        target_size_partitions_;
-  }
-  RTC_DCHECK_LE(0, size_change_counter_);
-}
-
-void AdaptiveFirFilter::Filter(const RenderBuffer& render_buffer,
-                               FftData* S) const {
-  RTC_DCHECK(S);
-  switch (optimization_) {
-#if defined(WEBRTC_ARCH_X86_FAMILY)
-    case Aec3Optimization::kSse2:
-      aec3::ApplyFilter_SSE2(render_buffer, H_, S);
-      break;
-#endif
-#if defined(WEBRTC_HAS_NEON)
-    case Aec3Optimization::kNeon:
-      aec3::ApplyFilter_NEON(render_buffer, H_, S);
-      break;
-#endif
-    default:
-      aec3::ApplyFilter(render_buffer, H_, S);
-  }
-}
-
-void AdaptiveFirFilter::Adapt(const RenderBuffer& render_buffer,
-                              const FftData& G) {
-  // Update the filter size if needed.
-  UpdateSize();
-
-  // Adapt the filter.
-  switch (optimization_) {
-#if defined(WEBRTC_ARCH_X86_FAMILY)
-    case Aec3Optimization::kSse2:
-      aec3::AdaptPartitions_SSE2(render_buffer, G, H_);
-      break;
-#endif
-#if defined(WEBRTC_HAS_NEON)
-    case Aec3Optimization::kNeon:
-      aec3::AdaptPartitions_NEON(render_buffer, G, H_);
-      break;
-#endif
-    default:
-      aec3::AdaptPartitions(render_buffer, G, H_);
-  }
-
-  // Constrain the filter partitions in a cyclic manner.
-  Constrain();
-
-  // Update the frequency response and echo return loss for the filter.
-  switch (optimization_) {
-#if defined(WEBRTC_ARCH_X86_FAMILY)
-    case Aec3Optimization::kSse2:
-      aec3::UpdateFrequencyResponse_SSE2(H_, &H2_);
-      aec3::UpdateErlEstimator_SSE2(H2_, &erl_);
-      break;
-#endif
-#if defined(WEBRTC_HAS_NEON)
-    case Aec3Optimization::kNeon:
-      aec3::UpdateFrequencyResponse_NEON(H_, &H2_);
-      aec3::UpdateErlEstimator_NEON(H2_, &erl_);
-      break;
-#endif
-    default:
-      aec3::UpdateFrequencyResponse(H_, &H2_);
-      aec3::UpdateErlEstimator(H2_, &erl_);
-  }
-}
-
-// Constrains the a partiton of the frequency domain filter to be limited in
-// time via setting the relevant time-domain coefficients to zero.
-void AdaptiveFirFilter::Constrain() {
-  std::array<float, kFftLength> h;
-  fft_.Ifft(H_[partition_to_constrain_], &h);
-
-  static constexpr float kScale = 1.0f / kFftLengthBy2;
-  std::for_each(h.begin(), h.begin() + kFftLengthBy2,
-                [](float& a) { a *= kScale; });
-  std::fill(h.begin() + kFftLengthBy2, h.end(), 0.f);
-
-  std::copy(h.begin(), h.begin() + kFftLengthBy2,
-            h_.begin() + partition_to_constrain_ * kFftLengthBy2);
-
-  fft_.Fft(&h, &H_[partition_to_constrain_]);
-
-  partition_to_constrain_ = partition_to_constrain_ < (H_.size() - 1)
-                                ? partition_to_constrain_ + 1
-                                : 0;
-}
-
-void AdaptiveFirFilter::ScaleFilter(float factor) {
-  for (auto& H : H_) {
-    for (auto& re : H.re) {
-      re *= factor;
-    }
-    for (auto& im : H.im) {
-      im *= factor;
-    }
-  }
-  for (auto& h : h_) {
-    h *= factor;
-  }
-}
-
-// Set the filter coefficients.
-void AdaptiveFirFilter::SetFilter(const std::vector<FftData>& H) {
-  const size_t num_partitions = std::min(H_.size(), H.size());
-  for (size_t k = 0; k < num_partitions; ++k) {
-    std::copy(H[k].re.begin(), H[k].re.end(), H_[k].re.begin());
-    std::copy(H[k].im.begin(), H[k].im.end(), H_[k].im.begin());
-  }
-}
-
-}  // namespace webrtc
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/adaptive_fir_filter.h b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/adaptive_fir_filter.h
deleted file mode 100644
index 7c832a6cd2..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/adaptive_fir_filter.h
+++ /dev/null
@@ -1,188 +0,0 @@
-/*
- *  Copyright (c) 2017 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#ifndef MODULES_AUDIO_PROCESSING_AEC3_ADAPTIVE_FIR_FILTER_H_
-#define MODULES_AUDIO_PROCESSING_AEC3_ADAPTIVE_FIR_FILTER_H_
-
-#include <stddef.h>
-#include <array>
-#include <vector>
-
-#include "api/array_view.h"
-#include "modules/audio_processing/aec3/aec3_common.h"
-#include "modules/audio_processing/aec3/aec3_fft.h"
-#include "modules/audio_processing/aec3/fft_data.h"
-#include "modules/audio_processing/aec3/render_buffer.h"
-#include "modules/audio_processing/logging/apm_data_dumper.h"
-#include "rtc_base/constructormagic.h"
-#include "rtc_base/system/arch.h"
-
-namespace webrtc {
-namespace aec3 {
-// Computes and stores the frequency response of the filter.
-void UpdateFrequencyResponse(
-    rtc::ArrayView<const FftData> H,
-    std::vector<std::array<float, kFftLengthBy2Plus1>>* H2);
-#if defined(WEBRTC_HAS_NEON)
-void UpdateFrequencyResponse_NEON(
-    rtc::ArrayView<const FftData> H,
-    std::vector<std::array<float, kFftLengthBy2Plus1>>* H2);
-#endif
-#if defined(WEBRTC_ARCH_X86_FAMILY)
-void UpdateFrequencyResponse_SSE2(
-    rtc::ArrayView<const FftData> H,
-    std::vector<std::array<float, kFftLengthBy2Plus1>>* H2);
-#endif
-
-// Computes and stores the echo return loss estimate of the filter, which is the
-// sum of the partition frequency responses.
-void UpdateErlEstimator(
-    const std::vector<std::array<float, kFftLengthBy2Plus1>>& H2,
-    std::array<float, kFftLengthBy2Plus1>* erl);
-#if defined(WEBRTC_HAS_NEON)
-void UpdateErlEstimator_NEON(
-    const std::vector<std::array<float, kFftLengthBy2Plus1>>& H2,
-    std::array<float, kFftLengthBy2Plus1>* erl);
-#endif
-#if defined(WEBRTC_ARCH_X86_FAMILY)
-void UpdateErlEstimator_SSE2(
-    const std::vector<std::array<float, kFftLengthBy2Plus1>>& H2,
-    std::array<float, kFftLengthBy2Plus1>* erl);
-#endif
-
-// Adapts the filter partitions.
-void AdaptPartitions(const RenderBuffer& render_buffer,
-                     const FftData& G,
-                     rtc::ArrayView<FftData> H);
-#if defined(WEBRTC_HAS_NEON)
-void AdaptPartitions_NEON(const RenderBuffer& render_buffer,
-                          const FftData& G,
-                          rtc::ArrayView<FftData> H);
-#endif
-#if defined(WEBRTC_ARCH_X86_FAMILY)
-void AdaptPartitions_SSE2(const RenderBuffer& render_buffer,
-                          const FftData& G,
-                          rtc::ArrayView<FftData> H);
-#endif
-
-// Produces the filter output.
-void ApplyFilter(const RenderBuffer& render_buffer,
-                 rtc::ArrayView<const FftData> H,
-                 FftData* S);
-#if defined(WEBRTC_HAS_NEON)
-void ApplyFilter_NEON(const RenderBuffer& render_buffer,
-                      rtc::ArrayView<const FftData> H,
-                      FftData* S);
-#endif
-#if defined(WEBRTC_ARCH_X86_FAMILY)
-void ApplyFilter_SSE2(const RenderBuffer& render_buffer,
-                      rtc::ArrayView<const FftData> H,
-                      FftData* S);
-#endif
-
-}  // namespace aec3
-
-// Provides a frequency domain adaptive filter functionality.
-class AdaptiveFirFilter {
- public:
-  AdaptiveFirFilter(size_t max_size_partitions,
-                    size_t initial_size_partitions,
-                    size_t size_change_duration_blocks,
-                    Aec3Optimization optimization,
-                    ApmDataDumper* data_dumper);
-
-  ~AdaptiveFirFilter();
-
-  // Produces the output of the filter.
-  void Filter(const RenderBuffer& render_buffer, FftData* S) const;
-
-  // Adapts the filter.
-  void Adapt(const RenderBuffer& render_buffer, const FftData& G);
-
-  // Receives reports that known echo path changes have occured and adjusts
-  // the filter adaptation accordingly.
-  void HandleEchoPathChange();
-
-  // Returns the filter size.
-  size_t SizePartitions() const { return H_.size(); }
-
-  // Sets the filter size.
-  void SetSizePartitions(size_t size, bool immediate_effect);
-
-  // Returns the filter based echo return loss.
-  const std::array<float, kFftLengthBy2Plus1>& Erl() const { return erl_; }
-
-  // Returns the frequency responses for the filter partitions.
-  const std::vector<std::array<float, kFftLengthBy2Plus1>>&
-  FilterFrequencyResponse() const {
-    return H2_;
-  }
-
-  // Returns the estimate of the impulse response.
-  const std::vector<float>& FilterImpulseResponse() const { return h_; }
-
-  void DumpFilter(const char* name_frequency_domain,
-                  const char* name_time_domain) {
-    size_t current_size = H_.size();
-    H_.resize(max_size_partitions_);
-    for (auto& H : H_) {
-      data_dumper_->DumpRaw(name_frequency_domain, H.re);
-      data_dumper_->DumpRaw(name_frequency_domain, H.im);
-    }
-    H_.resize(current_size);
-
-    current_size = h_.size();
-    h_.resize(GetTimeDomainLength(max_size_partitions_));
-    data_dumper_->DumpRaw(name_time_domain, h_);
-    h_.resize(current_size);
-  }
-
-  // Scale the filter impulse response and spectrum by a factor.
-  void ScaleFilter(float factor);
-
-  // Set the filter coefficients.
-  void SetFilter(const std::vector<FftData>& H);
-
-  // Gets the filter coefficients.
-  const std::vector<FftData>& GetFilter() const { return H_; }
-
- private:
-  // Constrain the filter partitions in a cyclic manner.
-  void Constrain();
-
-  // Resets the filter buffers to use the current size.
-  void ResetFilterBuffersToCurrentSize();
-
-  // Gradually Updates the current filter size towards the target size.
-  void UpdateSize();
-
-  ApmDataDumper* const data_dumper_;
-  const bool use_partial_filter_reset_;
-  const Aec3Fft fft_;
-  const Aec3Optimization optimization_;
-  const size_t max_size_partitions_;
-  const int size_change_duration_blocks_;
-  float one_by_size_change_duration_blocks_;
-  size_t current_size_partitions_;
-  size_t target_size_partitions_;
-  size_t old_target_size_partitions_;
-  int size_change_counter_ = 0;
-  std::vector<FftData> H_;
-  std::vector<std::array<float, kFftLengthBy2Plus1>> H2_;
-  std::vector<float> h_;
-  std::array<float, kFftLengthBy2Plus1> erl_;
-  size_t partition_to_constrain_ = 0;
-
-  RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(AdaptiveFirFilter);
-};
-
-}  // namespace webrtc
-
-#endif  // MODULES_AUDIO_PROCESSING_AEC3_ADAPTIVE_FIR_FILTER_H_
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/aec3_common.cc b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/aec3_common.cc
deleted file mode 100644
index aeb848a570..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/aec3_common.cc
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- *  Copyright (c) 2017 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#include "modules/audio_processing/aec3/aec3_common.h"
-
-#include <stdint.h>
-
-#include "rtc_base/checks.h"
-#include "rtc_base/system/arch.h"
-#include "system_wrappers/include/cpu_features_wrapper.h"
-
-namespace webrtc {
-
-Aec3Optimization DetectOptimization() {
-#if defined(WEBRTC_ARCH_X86_FAMILY)
-  if (WebRtc_GetCPUInfo(kSSE2) != 0) {
-    return Aec3Optimization::kSse2;
-  }
-#endif
-
-#if defined(WEBRTC_HAS_NEON)
-  return Aec3Optimization::kNeon;
-#endif
-
-  return Aec3Optimization::kNone;
-}
-
-float FastApproxLog2f(const float in) {
-  RTC_DCHECK_GT(in, .0f);
-  // Read and interpret float as uint32_t and then cast to float.
-  // This is done to extract the exponent (bits 30 - 23).
-  // "Right shift" of the exponent is then performed by multiplying
-  // with the constant (1/2^23). Finally, we subtract a constant to
-  // remove the bias (https://en.wikipedia.org/wiki/Exponent_bias).
-  union {
-    float dummy;
-    uint32_t a;
-  } x = {in};
-  float out = x.a;
-  out *= 1.1920929e-7f;  // 1/2^23
-  out -= 126.942695f;    // Remove bias.
-  return out;
-}
-
-float Log2TodB(const float in_log2) {
-  return 3.0102999566398121 * in_log2;
-}
-
-}  // namespace webrtc
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/aec3_common.h b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/aec3_common.h
deleted file mode 100644
index 56c7a9024a..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/aec3_common.h
+++ /dev/null
@@ -1,129 +0,0 @@
-/*
- *  Copyright (c) 2016 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#ifndef MODULES_AUDIO_PROCESSING_AEC3_AEC3_COMMON_H_
-#define MODULES_AUDIO_PROCESSING_AEC3_AEC3_COMMON_H_
-
-#include <stddef.h>
-
-namespace webrtc {
-
-#ifdef _MSC_VER /* visual c++ */
-#define ALIGN16_BEG __declspec(align(16))
-#define ALIGN16_END
-#else /* gcc or icc */
-#define ALIGN16_BEG
-#define ALIGN16_END __attribute__((aligned(16)))
-#endif
-
-enum class Aec3Optimization { kNone, kSse2, kNeon };
-
-constexpr int kNumBlocksPerSecond = 250;
-
-constexpr int kMetricsReportingIntervalBlocks = 10 * kNumBlocksPerSecond;
-constexpr int kMetricsComputationBlocks = 11;
-constexpr int kMetricsCollectionBlocks =
-    kMetricsReportingIntervalBlocks - kMetricsComputationBlocks;
-
-constexpr size_t kFftLengthBy2 = 64;
-constexpr size_t kFftLengthBy2Plus1 = kFftLengthBy2 + 1;
-constexpr size_t kFftLengthBy2Minus1 = kFftLengthBy2 - 1;
-constexpr size_t kFftLength = 2 * kFftLengthBy2;
-constexpr size_t kFftLengthBy2Log2 = 6;
-
-constexpr int kMaxAdaptiveFilterLength = 50;
-constexpr int kRenderTransferQueueSizeFrames = 100;
-
-constexpr size_t kMaxNumBands = 3;
-constexpr size_t kSubFrameLength = 80;
-
-constexpr size_t kBlockSize = kFftLengthBy2;
-constexpr size_t kBlockSizeLog2 = kFftLengthBy2Log2;
-
-constexpr size_t kExtendedBlockSize = 2 * kFftLengthBy2;
-constexpr size_t kMatchedFilterWindowSizeSubBlocks = 32;
-constexpr size_t kMatchedFilterAlignmentShiftSizeSubBlocks =
-    kMatchedFilterWindowSizeSubBlocks * 3 / 4;
-
-// TODO(peah): Integrate this with how it is done inside audio_processing_impl.
-constexpr size_t NumBandsForRate(int sample_rate_hz) {
-  return static_cast<size_t>(sample_rate_hz == 8000 ? 1
-                                                    : sample_rate_hz / 16000);
-}
-constexpr int LowestBandRate(int sample_rate_hz) {
-  return sample_rate_hz == 8000 ? sample_rate_hz : 16000;
-}
-
-constexpr bool ValidFullBandRate(int sample_rate_hz) {
-  return sample_rate_hz == 8000 || sample_rate_hz == 16000 ||
-         sample_rate_hz == 32000 || sample_rate_hz == 48000;
-}
-
-constexpr int GetTimeDomainLength(int filter_length_blocks) {
-  return filter_length_blocks * kFftLengthBy2;
-}
-
-constexpr size_t GetDownSampledBufferSize(size_t down_sampling_factor,
-                                          size_t num_matched_filters) {
-  return kBlockSize / down_sampling_factor *
-         (kMatchedFilterAlignmentShiftSizeSubBlocks * num_matched_filters +
-          kMatchedFilterWindowSizeSubBlocks + 1);
-}
-
-constexpr size_t GetRenderDelayBufferSize(size_t down_sampling_factor,
-                                          size_t num_matched_filters,
-                                          size_t filter_length_blocks) {
-  return GetDownSampledBufferSize(down_sampling_factor, num_matched_filters) /
-             (kBlockSize / down_sampling_factor) +
-         filter_length_blocks + 1;
-}
-
-// Detects what kind of optimizations to use for the code.
-Aec3Optimization DetectOptimization();
-
-// Computes the log2 of the input in a fast an approximate manner.
-float FastApproxLog2f(const float in);
-
-// Returns dB from a power quantity expressed in log2.
-float Log2TodB(const float in_log2);
-
-static_assert(1 << kBlockSizeLog2 == kBlockSize,
-              "Proper number of shifts for blocksize");
-
-static_assert(1 << kFftLengthBy2Log2 == kFftLengthBy2,
-              "Proper number of shifts for the fft length");
-
-static_assert(1 == NumBandsForRate(8000), "Number of bands for 8 kHz");
-static_assert(1 == NumBandsForRate(16000), "Number of bands for 16 kHz");
-static_assert(2 == NumBandsForRate(32000), "Number of bands for 32 kHz");
-static_assert(3 == NumBandsForRate(48000), "Number of bands for 48 kHz");
-
-static_assert(8000 == LowestBandRate(8000), "Sample rate of band 0 for 8 kHz");
-static_assert(16000 == LowestBandRate(16000),
-              "Sample rate of band 0 for 16 kHz");
-static_assert(16000 == LowestBandRate(32000),
-              "Sample rate of band 0 for 32 kHz");
-static_assert(16000 == LowestBandRate(48000),
-              "Sample rate of band 0 for 48 kHz");
-
-static_assert(ValidFullBandRate(8000),
-              "Test that 8 kHz is a valid sample rate");
-static_assert(ValidFullBandRate(16000),
-              "Test that 16 kHz is a valid sample rate");
-static_assert(ValidFullBandRate(32000),
-              "Test that 32 kHz is a valid sample rate");
-static_assert(ValidFullBandRate(48000),
-              "Test that 48 kHz is a valid sample rate");
-static_assert(!ValidFullBandRate(8001),
-              "Test that 8001 Hz is not a valid sample rate");
-
-}  // namespace webrtc
-
-#endif  // MODULES_AUDIO_PROCESSING_AEC3_AEC3_COMMON_H_
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/aec3_fft.cc b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/aec3_fft.cc
deleted file mode 100644
index 1832101855..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/aec3_fft.cc
+++ /dev/null
@@ -1,133 +0,0 @@
-/*
- *  Copyright (c) 2017 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#include "modules/audio_processing/aec3/aec3_fft.h"
-
-#include <algorithm>
-#include <functional>
-#include <iterator>
-
-#include "rtc_base/checks.h"
-
-namespace webrtc {
-
-namespace {
-
-const float kHanning64[kFftLengthBy2] = {
-    0.f,         0.00248461f, 0.00991376f, 0.0222136f,  0.03926189f,
-    0.06088921f, 0.08688061f, 0.11697778f, 0.15088159f, 0.1882551f,
-    0.22872687f, 0.27189467f, 0.31732949f, 0.36457977f, 0.41317591f,
-    0.46263495f, 0.51246535f, 0.56217185f, 0.61126047f, 0.65924333f,
-    0.70564355f, 0.75f,       0.79187184f, 0.83084292f, 0.86652594f,
-    0.89856625f, 0.92664544f, 0.95048443f, 0.96984631f, 0.98453864f,
-    0.99441541f, 0.99937846f, 0.99937846f, 0.99441541f, 0.98453864f,
-    0.96984631f, 0.95048443f, 0.92664544f, 0.89856625f, 0.86652594f,
-    0.83084292f, 0.79187184f, 0.75f,       0.70564355f, 0.65924333f,
-    0.61126047f, 0.56217185f, 0.51246535f, 0.46263495f, 0.41317591f,
-    0.36457977f, 0.31732949f, 0.27189467f, 0.22872687f, 0.1882551f,
-    0.15088159f, 0.11697778f, 0.08688061f, 0.06088921f, 0.03926189f,
-    0.0222136f,  0.00991376f, 0.00248461f, 0.f};
-
-// Hanning window from Matlab command win = sqrt(hanning(128)).
-const float kSqrtHanning128[kFftLength] = {
-    0.00000000000000f, 0.02454122852291f, 0.04906767432742f, 0.07356456359967f,
-    0.09801714032956f, 0.12241067519922f, 0.14673047445536f, 0.17096188876030f,
-    0.19509032201613f, 0.21910124015687f, 0.24298017990326f, 0.26671275747490f,
-    0.29028467725446f, 0.31368174039889f, 0.33688985339222f, 0.35989503653499f,
-    0.38268343236509f, 0.40524131400499f, 0.42755509343028f, 0.44961132965461f,
-    0.47139673682600f, 0.49289819222978f, 0.51410274419322f, 0.53499761988710f,
-    0.55557023301960f, 0.57580819141785f, 0.59569930449243f, 0.61523159058063f,
-    0.63439328416365f, 0.65317284295378f, 0.67155895484702f, 0.68954054473707f,
-    0.70710678118655f, 0.72424708295147f, 0.74095112535496f, 0.75720884650648f,
-    0.77301045336274f, 0.78834642762661f, 0.80320753148064f, 0.81758481315158f,
-    0.83146961230255f, 0.84485356524971f, 0.85772861000027f, 0.87008699110871f,
-    0.88192126434835f, 0.89322430119552f, 0.90398929312344f, 0.91420975570353f,
-    0.92387953251129f, 0.93299279883474f, 0.94154406518302f, 0.94952818059304f,
-    0.95694033573221f, 0.96377606579544f, 0.97003125319454f, 0.97570213003853f,
-    0.98078528040323f, 0.98527764238894f, 0.98917650996478f, 0.99247953459871f,
-    0.99518472667220f, 0.99729045667869f, 0.99879545620517f, 0.99969881869620f,
-    1.00000000000000f, 0.99969881869620f, 0.99879545620517f, 0.99729045667869f,
-    0.99518472667220f, 0.99247953459871f, 0.98917650996478f, 0.98527764238894f,
-    0.98078528040323f, 0.97570213003853f, 0.97003125319454f, 0.96377606579544f,
-    0.95694033573221f, 0.94952818059304f, 0.94154406518302f, 0.93299279883474f,
-    0.92387953251129f, 0.91420975570353f, 0.90398929312344f, 0.89322430119552f,
-    0.88192126434835f, 0.87008699110871f, 0.85772861000027f, 0.84485356524971f,
-    0.83146961230255f, 0.81758481315158f, 0.80320753148064f, 0.78834642762661f,
-    0.77301045336274f, 0.75720884650648f, 0.74095112535496f, 0.72424708295147f,
-    0.70710678118655f, 0.68954054473707f, 0.67155895484702f, 0.65317284295378f,
-    0.63439328416365f, 0.61523159058063f, 0.59569930449243f, 0.57580819141785f,
-    0.55557023301960f, 0.53499761988710f, 0.51410274419322f, 0.49289819222978f,
-    0.47139673682600f, 0.44961132965461f, 0.42755509343028f, 0.40524131400499f,
-    0.38268343236509f, 0.35989503653499f, 0.33688985339222f, 0.31368174039889f,
-    0.29028467725446f, 0.26671275747490f, 0.24298017990326f, 0.21910124015687f,
-    0.19509032201613f, 0.17096188876030f, 0.14673047445536f, 0.12241067519922f,
-    0.09801714032956f, 0.07356456359967f, 0.04906767432742f, 0.02454122852291f};
-
-}  // namespace
-
-// TODO(peah): Change x to be std::array once the rest of the code allows this.
-void Aec3Fft::ZeroPaddedFft(rtc::ArrayView<const float> x,
-                            Window window,
-                            FftData* X) const {
-  RTC_DCHECK(X);
-  RTC_DCHECK_EQ(kFftLengthBy2, x.size());
-  std::array<float, kFftLength> fft;
-  std::fill(fft.begin(), fft.begin() + kFftLengthBy2, 0.f);
-  switch (window) {
-    case Window::kRectangular:
-      std::copy(x.begin(), x.end(), fft.begin() + kFftLengthBy2);
-      break;
-    case Window::kHanning:
-      std::transform(x.begin(), x.end(), std::begin(kHanning64),
-                     fft.begin() + kFftLengthBy2,
-                     [](float a, float b) { return a * b; });
-      break;
-    case Window::kSqrtHanning:
-      RTC_NOTREACHED();
-      break;
-    default:
-      RTC_NOTREACHED();
-  }
-
-  Fft(&fft, X);
-}
-
-void Aec3Fft::PaddedFft(rtc::ArrayView<const float> x,
-                        rtc::ArrayView<const float> x_old,
-                        Window window,
-                        FftData* X) const {
-  RTC_DCHECK(X);
-  RTC_DCHECK_EQ(kFftLengthBy2, x.size());
-  RTC_DCHECK_EQ(kFftLengthBy2, x_old.size());
-  std::array<float, kFftLength> fft;
-
-  switch (window) {
-    case Window::kRectangular:
-      std::copy(x_old.begin(), x_old.end(), fft.begin());
-      std::copy(x.begin(), x.end(), fft.begin() + x_old.size());
-      break;
-    case Window::kHanning:
-      RTC_NOTREACHED();
-      break;
-    case Window::kSqrtHanning:
-      std::transform(x_old.begin(), x_old.end(), std::begin(kSqrtHanning128),
-                     fft.begin(), std::multiplies<float>());
-      std::transform(x.begin(), x.end(),
-                     std::begin(kSqrtHanning128) + x_old.size(),
-                     fft.begin() + x_old.size(), std::multiplies<float>());
-      break;
-    default:
-      RTC_NOTREACHED();
-  }
-
-  Fft(&fft, X);
-}
-
-}  // namespace webrtc
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/aec3_fft.h b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/aec3_fft.h
deleted file mode 100644
index 6cd649af8f..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/aec3_fft.h
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- *  Copyright (c) 2017 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#ifndef MODULES_AUDIO_PROCESSING_AEC3_AEC3_FFT_H_
-#define MODULES_AUDIO_PROCESSING_AEC3_AEC3_FFT_H_
-
-#include <array>
-
-#include "api/array_view.h"
-#include "modules/audio_processing/aec3/aec3_common.h"
-#include "modules/audio_processing/aec3/fft_data.h"
-#include "modules/audio_processing/utility/ooura_fft.h"
-#include "rtc_base/checks.h"
-#include "rtc_base/constructormagic.h"
-
-namespace webrtc {
-
-// Wrapper class that provides 128 point real valued FFT functionality with the
-// FftData type.
-class Aec3Fft {
- public:
-  enum class Window { kRectangular, kHanning, kSqrtHanning };
-
-  Aec3Fft() = default;
-  // Computes the FFT. Note that both the input and output are modified.
-  void Fft(std::array<float, kFftLength>* x, FftData* X) const {
-    RTC_DCHECK(x);
-    RTC_DCHECK(X);
-    ooura_fft_.Fft(x->data());
-    X->CopyFromPackedArray(*x);
-  }
-  // Computes the inverse Fft.
-  void Ifft(const FftData& X, std::array<float, kFftLength>* x) const {
-    RTC_DCHECK(x);
-    X.CopyToPackedArray(x);
-    ooura_fft_.InverseFft(x->data());
-  }
-
-  // Windows the input using a Hanning window, and then adds padding of
-  // kFftLengthBy2 initial zeros before computing the Fft.
-  void ZeroPaddedFft(rtc::ArrayView<const float> x,
-                     Window window,
-                     FftData* X) const;
-
-  // Concatenates the kFftLengthBy2 values long x and x_old before computing the
-  // Fft. After that, x is copied to x_old.
-  void PaddedFft(rtc::ArrayView<const float> x,
-                 rtc::ArrayView<const float> x_old,
-                 FftData* X) const {
-    PaddedFft(x, x_old, Window::kRectangular, X);
-  }
-
-  // Padded Fft using a time-domain window.
-  void PaddedFft(rtc::ArrayView<const float> x,
-                 rtc::ArrayView<const float> x_old,
-                 Window window,
-                 FftData* X) const;
-
- private:
-  const OouraFft ooura_fft_;
-
-  RTC_DISALLOW_COPY_AND_ASSIGN(Aec3Fft);
-};
-
-}  // namespace webrtc
-
-#endif  // MODULES_AUDIO_PROCESSING_AEC3_AEC3_FFT_H_
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/aec_state.cc b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/aec_state.cc
deleted file mode 100644
index 0eeb7ebca0..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/aec_state.cc
+++ /dev/null
@@ -1,606 +0,0 @@
-/*
- *  Copyright (c) 2017 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#include "modules/audio_processing/aec3/aec_state.h"
-
-#include <math.h>
-#include <algorithm>
-#include <numeric>
-#include <vector>
-
-#include "absl/types/optional.h"
-#include "api/array_view.h"
-#include "modules/audio_processing/aec3/aec3_common.h"
-#include "modules/audio_processing/logging/apm_data_dumper.h"
-#include "rtc_base/atomicops.h"
-#include "rtc_base/checks.h"
-#include "system_wrappers/include/field_trial.h"
-
-namespace webrtc {
-namespace {
-
-bool EnableErleResetsAtGainChanges() {
-  return !field_trial::IsEnabled("WebRTC-Aec3ResetErleAtGainChangesKillSwitch");
-}
-
-bool UseLegacyFilterQualityState() {
-  return field_trial::IsEnabled("WebRTC-Aec3FilterQualityStateKillSwitch");
-}
-
-bool EnableLegacySaturationBehavior() {
-  return field_trial::IsEnabled("WebRTC-Aec3NewSaturationBehaviorKillSwitch");
-}
-
-bool UseSuppressionGainLimiter() {
-  return field_trial::IsEnabled("WebRTC-Aec3GainLimiterDeactivationKillSwitch");
-}
-bool EnableErleUpdatesDuringReverb() {
-  return !field_trial::IsEnabled(
-      "WebRTC-Aec3EnableErleUpdatesDuringReverbKillSwitch");
-}
-
-constexpr size_t kBlocksSinceConvergencedFilterInit = 10000;
-constexpr size_t kBlocksSinceConsistentEstimateInit = 10000;
-
-}  // namespace
-
-int AecState::instance_count_ = 0;
-
-void AecState::GetResidualEchoScaling(
-    rtc::ArrayView<float> residual_scaling) const {
-  bool filter_has_had_time_to_converge;
-  if (config_.filter.conservative_initial_phase) {
-    filter_has_had_time_to_converge =
-        strong_not_saturated_render_blocks_ >= 1.5f * kNumBlocksPerSecond;
-  } else {
-    filter_has_had_time_to_converge =
-        strong_not_saturated_render_blocks_ >= 0.8f * kNumBlocksPerSecond;
-  }
-  echo_audibility_.GetResidualEchoScaling(filter_has_had_time_to_converge,
-                                          residual_scaling);
-}
-
-absl::optional<float> AecState::ErleUncertainty() const {
-  if (SaturatedEcho() && use_legacy_saturation_behavior_) {
-    return 1.f;
-  }
-
-  return absl::nullopt;
-}
-
-AecState::AecState(const EchoCanceller3Config& config)
-    : data_dumper_(
-          new ApmDataDumper(rtc::AtomicOps::Increment(&instance_count_))),
-      config_(config),
-      use_legacy_saturation_behavior_(EnableLegacySaturationBehavior()),
-      enable_erle_resets_at_gain_changes_(EnableErleResetsAtGainChanges()),
-      enable_erle_updates_during_reverb_(EnableErleUpdatesDuringReverb()),
-      use_legacy_filter_quality_(UseLegacyFilterQualityState()),
-      use_suppressor_gain_limiter_(UseSuppressionGainLimiter()),
-      initial_state_(config_),
-      delay_state_(config_),
-      transparent_state_(config_),
-      filter_quality_state_(config_),
-      legacy_filter_quality_state_(config_),
-      legacy_saturation_detector_(config_),
-      erl_estimator_(2 * kNumBlocksPerSecond),
-      erle_estimator_(2 * kNumBlocksPerSecond,
-                      config_.erle.min,
-                      config_.erle.max_l,
-                      config_.erle.max_h),
-      suppression_gain_limiter_(config_),
-      filter_analyzer_(config_),
-      echo_audibility_(
-          config_.echo_audibility.use_stationarity_properties_at_init),
-      reverb_model_estimator_(config_) {}
-
-AecState::~AecState() = default;
-
-void AecState::HandleEchoPathChange(
-    const EchoPathVariability& echo_path_variability) {
-  const auto full_reset = [&]() {
-    filter_analyzer_.Reset();
-    capture_signal_saturation_ = false;
-    strong_not_saturated_render_blocks_ = 0;
-    blocks_with_active_render_ = 0;
-    if (use_suppressor_gain_limiter_) {
-      suppression_gain_limiter_.Reset();
-    }
-    initial_state_.Reset();
-    transparent_state_.Reset();
-    if (use_legacy_saturation_behavior_) {
-      legacy_saturation_detector_.Reset();
-    }
-    erle_estimator_.Reset(true);
-    erl_estimator_.Reset();
-    if (use_legacy_filter_quality_) {
-      legacy_filter_quality_state_.Reset();
-    } else {
-      filter_quality_state_.Reset();
-    }
-  };
-
-  // TODO(peah): Refine the reset scheme according to the type of gain and
-  // delay adjustment.
-
-  if (echo_path_variability.delay_change !=
-      EchoPathVariability::DelayAdjustment::kNone) {
-    full_reset();
-  } else if (enable_erle_resets_at_gain_changes_ &&
-             echo_path_variability.gain_change) {
-    erle_estimator_.Reset(false);
-  }
-  subtractor_output_analyzer_.HandleEchoPathChange();
-}
-
-void AecState::Update(
-    const absl::optional<DelayEstimate>& external_delay,
-    const std::vector<std::array<float, kFftLengthBy2Plus1>>&
-        adaptive_filter_frequency_response,
-    const std::vector<float>& adaptive_filter_impulse_response,
-    const RenderBuffer& render_buffer,
-    const std::array<float, kFftLengthBy2Plus1>& E2_main,
-    const std::array<float, kFftLengthBy2Plus1>& Y2,
-    const SubtractorOutput& subtractor_output,
-    rtc::ArrayView<const float> y) {
-  // Analyze the filter output.
-  subtractor_output_analyzer_.Update(subtractor_output);
-
-  // Analyze the properties of the filter.
-  filter_analyzer_.Update(adaptive_filter_impulse_response,
-                          adaptive_filter_frequency_response, render_buffer);
-
-  // Estimate the direct path delay of the filter.
-  delay_state_.Update(filter_analyzer_, external_delay,
-                      strong_not_saturated_render_blocks_);
-
-  const std::vector<float>& aligned_render_block =
-      render_buffer.Block(-delay_state_.DirectPathFilterDelay())[0];
-
-  // Update render counters.
-  const float render_energy = std::inner_product(
-      aligned_render_block.begin(), aligned_render_block.end(),
-      aligned_render_block.begin(), 0.f);
-  const bool active_render =
-      render_energy > (config_.render_levels.active_render_limit *
-                       config_.render_levels.active_render_limit) *
-                          kFftLengthBy2;
-  blocks_with_active_render_ += active_render ? 1 : 0;
-  strong_not_saturated_render_blocks_ +=
-      active_render && !SaturatedCapture() ? 1 : 0;
-
-  if (use_suppressor_gain_limiter_) {
-    // Update the limit on the echo suppression after an echo path change to
-    // avoid an initial echo burst.
-    suppression_gain_limiter_.Update(render_buffer.GetRenderActivity(),
-                                     TransparentMode());
-
-    if (subtractor_output_analyzer_.ConvergedFilter()) {
-      suppression_gain_limiter_.Deactivate();
-    }
-  }
-
-  std::array<float, kFftLengthBy2Plus1> X2_reverb;
-  render_reverb_.Apply(
-      render_buffer.GetSpectrumBuffer(), delay_state_.DirectPathFilterDelay(),
-      config_.ep_strength.reverb_based_on_render ? ReverbDecay() : 0.f,
-      X2_reverb);
-
-  if (config_.echo_audibility.use_stationary_properties) {
-    // Update the echo audibility evaluator.
-    echo_audibility_.Update(render_buffer,
-                            render_reverb_.GetReverbContributionPowerSpectrum(),
-                            delay_state_.DirectPathFilterDelay(),
-                            delay_state_.ExternalDelayReported());
-  }
-
-  // Update the ERL and ERLE measures.
-  if (initial_state_.TransitionTriggered()) {
-    erle_estimator_.Reset(false);
-  }
-
-  const auto& X2 = render_buffer.Spectrum(delay_state_.DirectPathFilterDelay());
-  const auto& X2_input_erle =
-      enable_erle_updates_during_reverb_ ? X2_reverb : X2;
-
-  erle_estimator_.Update(X2_input_erle, Y2, E2_main,
-                         subtractor_output_analyzer_.ConvergedFilter(),
-                         config_.erle.onset_detection);
-
-  erl_estimator_.Update(subtractor_output_analyzer_.ConvergedFilter(), X2, Y2);
-
-  // Detect and flag echo saturation.
-  if (use_legacy_saturation_behavior_) {
-    legacy_saturation_detector_.Update(aligned_render_block, SaturatedCapture(),
-                                       EchoPathGain());
-  } else {
-    saturation_detector_.Update(aligned_render_block, SaturatedCapture(),
-                                UsableLinearEstimate(), subtractor_output,
-                                EchoPathGain());
-  }
-
-  // Update the decision on whether to use the initial state parameter set.
-  initial_state_.Update(active_render, SaturatedCapture());
-
-  // Detect whether the transparent mode should be activated.
-  transparent_state_.Update(delay_state_.DirectPathFilterDelay(),
-                            filter_analyzer_.Consistent(),
-                            subtractor_output_analyzer_.ConvergedFilter(),
-                            subtractor_output_analyzer_.DivergedFilter(),
-                            active_render, SaturatedCapture());
-
-  // Analyze the quality of the filter.
-  if (use_legacy_filter_quality_) {
-    legacy_filter_quality_state_.Update(
-        SaturatedEcho(), active_render, SaturatedCapture(), TransparentMode(),
-        external_delay, subtractor_output_analyzer_.ConvergedFilter(),
-        subtractor_output_analyzer_.DivergedFilter());
-  } else {
-    filter_quality_state_.Update(active_render, TransparentMode(),
-                                 SaturatedCapture(),
-                                 filter_analyzer_.Consistent(), external_delay,
-                                 subtractor_output_analyzer_.ConvergedFilter());
-  }
-
-  // Update the reverb estimate.
-  const bool stationary_block =
-      config_.echo_audibility.use_stationary_properties &&
-      echo_audibility_.IsBlockStationary();
-
-  reverb_model_estimator_.Update(filter_analyzer_.GetAdjustedFilter(),
-                                 adaptive_filter_frequency_response,
-                                 erle_estimator_.GetInstLinearQualityEstimate(),
-                                 delay_state_.DirectPathFilterDelay(),
-                                 UsableLinearEstimate(), stationary_block);
-
-  erle_estimator_.Dump(data_dumper_);
-  reverb_model_estimator_.Dump(data_dumper_.get());
-  data_dumper_->DumpRaw("aec3_erl", Erl());
-  data_dumper_->DumpRaw("aec3_erl_time_domain", ErlTimeDomain());
-  data_dumper_->DumpRaw("aec3_usable_linear_estimate", UsableLinearEstimate());
-  data_dumper_->DumpRaw("aec3_transparent_mode", TransparentMode());
-  data_dumper_->DumpRaw("aec3_filter_delay", filter_analyzer_.DelayBlocks());
-
-  data_dumper_->DumpRaw("aec3_consistent_filter",
-                        filter_analyzer_.Consistent());
-  data_dumper_->DumpRaw("aec3_suppression_gain_limit", SuppressionGainLimit());
-  data_dumper_->DumpRaw("aec3_initial_state",
-                        initial_state_.InitialStateActive());
-  data_dumper_->DumpRaw("aec3_capture_saturation", SaturatedCapture());
-  data_dumper_->DumpRaw("aec3_echo_saturation", SaturatedEcho());
-  data_dumper_->DumpRaw("aec3_converged_filter",
-                        subtractor_output_analyzer_.ConvergedFilter());
-  data_dumper_->DumpRaw("aec3_diverged_filter",
-                        subtractor_output_analyzer_.DivergedFilter());
-
-  data_dumper_->DumpRaw("aec3_external_delay_avaliable",
-                        external_delay ? 1 : 0);
-  data_dumper_->DumpRaw("aec3_suppresion_gain_limiter_running",
-                        IsSuppressionGainLimitActive());
-  data_dumper_->DumpRaw("aec3_filter_tail_freq_resp_est",
-                        GetReverbFrequencyResponse());
-}
-
-AecState::InitialState::InitialState(const EchoCanceller3Config& config)
-    : conservative_initial_phase_(config.filter.conservative_initial_phase),
-      initial_state_seconds_(config.filter.initial_state_seconds) {
-  Reset();
-}
-void AecState::InitialState::InitialState::Reset() {
-  initial_state_ = true;
-  strong_not_saturated_render_blocks_ = 0;
-}
-void AecState::InitialState::InitialState::Update(bool active_render,
-                                                  bool saturated_capture) {
-  strong_not_saturated_render_blocks_ +=
-      active_render && !saturated_capture ? 1 : 0;
-
-  // Flag whether the initial state is still active.
-  bool prev_initial_state = initial_state_;
-  if (conservative_initial_phase_) {
-    initial_state_ =
-        strong_not_saturated_render_blocks_ < 5 * kNumBlocksPerSecond;
-  } else {
-    initial_state_ = strong_not_saturated_render_blocks_ <
-                     initial_state_seconds_ * kNumBlocksPerSecond;
-  }
-
-  // Flag whether the transition from the initial state has started.
-  transition_triggered_ = !initial_state_ && prev_initial_state;
-}
-
-AecState::FilterDelay::FilterDelay(const EchoCanceller3Config& config)
-    : delay_headroom_blocks_(config.delay.delay_headroom_blocks) {}
-
-void AecState::FilterDelay::Update(
-    const FilterAnalyzer& filter_analyzer,
-    const absl::optional<DelayEstimate>& external_delay,
-    size_t blocks_with_proper_filter_adaptation) {
-  // Update the delay based on the external delay.
-  if (external_delay &&
-      (!external_delay_ || external_delay_->delay != external_delay->delay)) {
-    external_delay_ = external_delay;
-    external_delay_reported_ = true;
-  }
-
-  // Override the estimated delay if it is not certain that the filter has had
-  // time to converge.
-  const bool delay_estimator_may_not_have_converged =
-      blocks_with_proper_filter_adaptation < 2 * kNumBlocksPerSecond;
-  if (delay_estimator_may_not_have_converged && external_delay_) {
-    filter_delay_blocks_ = delay_headroom_blocks_;
-  } else {
-    filter_delay_blocks_ = filter_analyzer.DelayBlocks();
-  }
-}
-
-AecState::TransparentMode::TransparentMode(const EchoCanceller3Config& config)
-    : bounded_erl_(config.ep_strength.bounded_erl),
-      linear_and_stable_echo_path_(
-          config.echo_removal_control.linear_and_stable_echo_path),
-      active_blocks_since_sane_filter_(kBlocksSinceConsistentEstimateInit),
-      non_converged_sequence_size_(kBlocksSinceConvergencedFilterInit) {}
-
-void AecState::TransparentMode::Reset() {
-  non_converged_sequence_size_ = kBlocksSinceConvergencedFilterInit;
-  diverged_sequence_size_ = 0;
-  strong_not_saturated_render_blocks_ = 0;
-  if (linear_and_stable_echo_path_) {
-    recent_convergence_during_activity_ = false;
-  }
-}
-
-void AecState::TransparentMode::Update(int filter_delay_blocks,
-                                       bool consistent_filter,
-                                       bool converged_filter,
-                                       bool diverged_filter,
-                                       bool active_render,
-                                       bool saturated_capture) {
-  ++capture_block_counter_;
-  strong_not_saturated_render_blocks_ +=
-      active_render && !saturated_capture ? 1 : 0;
-
-  if (consistent_filter && filter_delay_blocks < 5) {
-    sane_filter_observed_ = true;
-    active_blocks_since_sane_filter_ = 0;
-  } else if (active_render) {
-    ++active_blocks_since_sane_filter_;
-  }
-
-  bool sane_filter_recently_seen;
-  if (!sane_filter_observed_) {
-    sane_filter_recently_seen =
-        capture_block_counter_ <= 5 * kNumBlocksPerSecond;
-  } else {
-    sane_filter_recently_seen =
-        active_blocks_since_sane_filter_ <= 30 * kNumBlocksPerSecond;
-  }
-
-  if (converged_filter) {
-    recent_convergence_during_activity_ = true;
-    active_non_converged_sequence_size_ = 0;
-    non_converged_sequence_size_ = 0;
-    ++num_converged_blocks_;
-  } else {
-    if (++non_converged_sequence_size_ > 20 * kNumBlocksPerSecond) {
-      num_converged_blocks_ = 0;
-    }
-
-    if (active_render &&
-        ++active_non_converged_sequence_size_ > 60 * kNumBlocksPerSecond) {
-      recent_convergence_during_activity_ = false;
-    }
-  }
-
-  if (!diverged_filter) {
-    diverged_sequence_size_ = 0;
-  } else if (++diverged_sequence_size_ >= 60) {
-    // TODO(peah): Change these lines to ensure proper triggering of usable
-    // filter.
-    non_converged_sequence_size_ = kBlocksSinceConvergencedFilterInit;
-  }
-
-  if (active_non_converged_sequence_size_ > 60 * kNumBlocksPerSecond) {
-    finite_erl_recently_detected_ = false;
-  }
-  if (num_converged_blocks_ > 50) {
-    finite_erl_recently_detected_ = true;
-  }
-
-  if (bounded_erl_) {
-    transparency_activated_ = false;
-  } else if (finite_erl_recently_detected_) {
-    transparency_activated_ = false;
-  } else if (sane_filter_recently_seen && recent_convergence_during_activity_) {
-    transparency_activated_ = false;
-  } else {
-    const bool filter_should_have_converged =
-        strong_not_saturated_render_blocks_ > 6 * kNumBlocksPerSecond;
-    transparency_activated_ = filter_should_have_converged;
-  }
-}
-
-AecState::FilteringQualityAnalyzer::FilteringQualityAnalyzer(
-    const EchoCanceller3Config& config) {}
-
-void AecState::FilteringQualityAnalyzer::Reset() {
-  usable_linear_estimate_ = false;
-  filter_update_blocks_since_reset_ = 0;
-}
-
-void AecState::FilteringQualityAnalyzer::Update(
-    bool active_render,
-    bool transparent_mode,
-    bool saturated_capture,
-    bool consistent_estimate_,
-    const absl::optional<DelayEstimate>& external_delay,
-    bool converged_filter) {
-  // Update blocks counter.
-  const bool filter_update = active_render && !saturated_capture;
-  filter_update_blocks_since_reset_ += filter_update ? 1 : 0;
-  filter_update_blocks_since_start_ += filter_update ? 1 : 0;
-
-  // Store convergence flag when observed.
-  convergence_seen_ = convergence_seen_ || converged_filter;
-
-  // Verify requirements for achieving a decent filter. The requirements for
-  // filter adaptation at call startup are more restrictive than after an
-  // in-call reset.
-  const bool sufficient_data_to_converge_at_startup =
-      filter_update_blocks_since_start_ > kNumBlocksPerSecond * 0.4f;
-  const bool sufficient_data_to_converge_at_reset =
-      sufficient_data_to_converge_at_startup &&
-      filter_update_blocks_since_reset_ > kNumBlocksPerSecond * 0.2f;
-
-  // The linear filter can only be used it has had time to converge.
-  usable_linear_estimate_ = sufficient_data_to_converge_at_startup &&
-                            sufficient_data_to_converge_at_reset;
-
-  // The linear filter can only be used if an external delay or convergence have
-  // been identified
-  usable_linear_estimate_ =
-      usable_linear_estimate_ && (external_delay || convergence_seen_);
-
-  // If transparent mode is on, deactivate usign the linear filter.
-  usable_linear_estimate_ = usable_linear_estimate_ && !transparent_mode;
-}
-
-AecState::LegacyFilteringQualityAnalyzer::LegacyFilteringQualityAnalyzer(
-    const EchoCanceller3Config& config)
-    : conservative_initial_phase_(config.filter.conservative_initial_phase),
-      required_blocks_for_convergence_(
-          kNumBlocksPerSecond * (conservative_initial_phase_ ? 1.5f : 0.8f)),
-      linear_and_stable_echo_path_(
-          config.echo_removal_control.linear_and_stable_echo_path),
-      non_converged_sequence_size_(kBlocksSinceConvergencedFilterInit) {}
-
-void AecState::LegacyFilteringQualityAnalyzer::Reset() {
-  usable_linear_estimate_ = false;
-  strong_not_saturated_render_blocks_ = 0;
-  if (linear_and_stable_echo_path_) {
-    recent_convergence_during_activity_ = false;
-  }
-  diverged_sequence_size_ = 0;
-  // TODO(peah): Change to ensure proper triggering of usable filter.
-  non_converged_sequence_size_ = 10000;
-  recent_convergence_ = true;
-}
-
-void AecState::LegacyFilteringQualityAnalyzer::Update(
-    bool saturated_echo,
-    bool active_render,
-    bool saturated_capture,
-    bool transparent_mode,
-    const absl::optional<DelayEstimate>& external_delay,
-    bool converged_filter,
-    bool diverged_filter) {
-  diverged_sequence_size_ = diverged_filter ? diverged_sequence_size_ + 1 : 0;
-  if (diverged_sequence_size_ >= 60) {
-    // TODO(peah): Change these lines to ensure proper triggering of usable
-    // filter.
-    non_converged_sequence_size_ = 10000;
-    recent_convergence_ = true;
-  }
-
-  if (converged_filter) {
-    non_converged_sequence_size_ = 0;
-    recent_convergence_ = true;
-    active_non_converged_sequence_size_ = 0;
-    recent_convergence_during_activity_ = true;
-  } else {
-    if (++non_converged_sequence_size_ >= 60 * kNumBlocksPerSecond) {
-      recent_convergence_ = false;
-    }
-
-    if (active_render &&
-        ++active_non_converged_sequence_size_ > 60 * kNumBlocksPerSecond) {
-      recent_convergence_during_activity_ = false;
-    }
-  }
-
-  strong_not_saturated_render_blocks_ +=
-      active_render && !saturated_capture ? 1 : 0;
-  const bool filter_has_had_time_to_converge =
-      strong_not_saturated_render_blocks_ > required_blocks_for_convergence_;
-
-  usable_linear_estimate_ = filter_has_had_time_to_converge && external_delay;
-
-  if (!conservative_initial_phase_ && recent_convergence_during_activity_) {
-    usable_linear_estimate_ = true;
-  }
-
-  if (!linear_and_stable_echo_path_ && !recent_convergence_) {
-    usable_linear_estimate_ = false;
-  }
-
-  if (saturated_echo || transparent_mode) {
-    usable_linear_estimate_ = false;
-  }
-}
-
-void AecState::SaturationDetector::Update(
-    rtc::ArrayView<const float> x,
-    bool saturated_capture,
-    bool usable_linear_estimate,
-    const SubtractorOutput& subtractor_output,
-    float echo_path_gain) {
-  saturated_echo_ = saturated_capture;
-  if (usable_linear_estimate) {
-    constexpr float kSaturationThreshold = 20000.f;
-    saturated_echo_ =
-        saturated_echo_ &&
-        (subtractor_output.s_main_max_abs > kSaturationThreshold ||
-         subtractor_output.s_shadow_max_abs > kSaturationThreshold);
-  } else {
-    const float max_sample = fabs(*std::max_element(
-        x.begin(), x.end(), [](float a, float b) { return a * a < b * b; }));
-
-    const float kMargin = 10.f;
-    float peak_echo_amplitude = max_sample * echo_path_gain * kMargin;
-    saturated_echo_ = saturated_echo_ && peak_echo_amplitude > 32000;
-  }
-}
-
-AecState::LegacySaturationDetector::LegacySaturationDetector(
-    const EchoCanceller3Config& config)
-    : echo_can_saturate_(config.ep_strength.echo_can_saturate),
-      not_saturated_sequence_size_(1000) {}
-
-void AecState::LegacySaturationDetector::Reset() {
-  not_saturated_sequence_size_ = 0;
-}
-
-void AecState::LegacySaturationDetector::Update(rtc::ArrayView<const float> x,
-                                                bool saturated_capture,
-                                                float echo_path_gain) {
-  if (!echo_can_saturate_) {
-    saturated_echo_ = false;
-    return;
-  }
-
-  RTC_DCHECK_LT(0, x.size());
-  if (saturated_capture) {
-    const float max_sample = fabs(*std::max_element(
-        x.begin(), x.end(), [](float a, float b) { return a * a < b * b; }));
-
-    // Set flag for potential presence of saturated echo
-    const float kMargin = 10.f;
-    float peak_echo_amplitude = max_sample * echo_path_gain * kMargin;
-    if (peak_echo_amplitude > 32000) {
-      not_saturated_sequence_size_ = 0;
-      saturated_echo_ = true;
-      return;
-    }
-  }
-
-  saturated_echo_ = ++not_saturated_sequence_size_ < 5;
-}
-
-}  // namespace webrtc
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/aec_state.h b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/aec_state.h
deleted file mode 100644
index c9d9cf3f3a..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/aec_state.h
+++ /dev/null
@@ -1,393 +0,0 @@
-/*
- *  Copyright (c) 2017 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#ifndef MODULES_AUDIO_PROCESSING_AEC3_AEC_STATE_H_
-#define MODULES_AUDIO_PROCESSING_AEC3_AEC_STATE_H_
-
-#include <stddef.h>
-#include <array>
-#include <memory>
-#include <vector>
-
-#include "absl/types/optional.h"
-#include "api/array_view.h"
-#include "api/audio/echo_canceller3_config.h"
-#include "modules/audio_processing/aec3/aec3_common.h"
-#include "modules/audio_processing/aec3/delay_estimate.h"
-#include "modules/audio_processing/aec3/echo_audibility.h"
-#include "modules/audio_processing/aec3/echo_path_variability.h"
-#include "modules/audio_processing/aec3/erl_estimator.h"
-#include "modules/audio_processing/aec3/erle_estimator.h"
-#include "modules/audio_processing/aec3/filter_analyzer.h"
-#include "modules/audio_processing/aec3/render_buffer.h"
-#include "modules/audio_processing/aec3/render_reverb_model.h"
-#include "modules/audio_processing/aec3/reverb_model_estimator.h"
-#include "modules/audio_processing/aec3/subtractor_output.h"
-#include "modules/audio_processing/aec3/subtractor_output_analyzer.h"
-#include "modules/audio_processing/aec3/suppression_gain_limiter.h"
-
-namespace webrtc {
-
-class ApmDataDumper;
-
-// Handles the state and the conditions for the echo removal functionality.
-class AecState {
- public:
-  explicit AecState(const EchoCanceller3Config& config);
-  ~AecState();
-
-  // Returns whether the echo subtractor can be used to determine the residual
-  // echo.
-  bool UsableLinearEstimate() const {
-    if (use_legacy_filter_quality_) {
-      return legacy_filter_quality_state_.LinearFilterUsable();
-    }
-    return filter_quality_state_.LinearFilterUsable();
-  }
-
-  // Returns whether the echo subtractor output should be used as output.
-  bool UseLinearFilterOutput() const {
-    if (use_legacy_filter_quality_) {
-      return legacy_filter_quality_state_.LinearFilterUsable();
-    }
-    return filter_quality_state_.LinearFilterUsable();
-  }
-
-  // Returns the estimated echo path gain.
-  float EchoPathGain() const { return filter_analyzer_.Gain(); }
-
-  // Returns whether the render signal is currently active.
-  bool ActiveRender() const { return blocks_with_active_render_ > 200; }
-
-  // Returns the appropriate scaling of the residual echo to match the
-  // audibility.
-  void GetResidualEchoScaling(rtc::ArrayView<float> residual_scaling) const;
-
-  // Returns whether the stationary properties of the signals are used in the
-  // aec.
-  bool UseStationaryProperties() const {
-    return config_.echo_audibility.use_stationary_properties;
-  }
-
-  // Returns the ERLE.
-  const std::array<float, kFftLengthBy2Plus1>& Erle() const {
-    return erle_estimator_.Erle();
-  }
-
-  // Returns an offset to apply to the estimation of the residual echo
-  // computation. Returning nullopt means that no offset should be used, while
-  // any other value will be applied as a multiplier to the estimated residual
-  // echo.
-  absl::optional<float> ErleUncertainty() const;
-
-  // Returns the fullband ERLE estimate in log2 units.
-  float FullBandErleLog2() const { return erle_estimator_.FullbandErleLog2(); }
-
-  // Returns the ERL.
-  const std::array<float, kFftLengthBy2Plus1>& Erl() const {
-    return erl_estimator_.Erl();
-  }
-
-  // Returns the time-domain ERL.
-  float ErlTimeDomain() const { return erl_estimator_.ErlTimeDomain(); }
-
-  // Returns the delay estimate based on the linear filter.
-  int FilterDelayBlocks() const { return delay_state_.DirectPathFilterDelay(); }
-
-  // Returns whether the capture signal is saturated.
-  bool SaturatedCapture() const { return capture_signal_saturation_; }
-
-  // Returns whether the echo signal is saturated.
-  bool SaturatedEcho() const {
-    return use_legacy_saturation_behavior_
-               ? legacy_saturation_detector_.SaturatedEcho()
-               : saturation_detector_.SaturatedEcho();
-  }
-
-  // Updates the capture signal saturation.
-  void UpdateCaptureSaturation(bool capture_signal_saturation) {
-    capture_signal_saturation_ = capture_signal_saturation;
-  }
-
-  // Returns whether the transparent mode is active
-  bool TransparentMode() const { return transparent_state_.Active(); }
-
-  // Takes appropriate action at an echo path change.
-  void HandleEchoPathChange(const EchoPathVariability& echo_path_variability);
-
-  // Returns the decay factor for the echo reverberation.
-  float ReverbDecay() const { return reverb_model_estimator_.ReverbDecay(); }
-
-  // Return the frequency response of the reverberant echo.
-  rtc::ArrayView<const float> GetReverbFrequencyResponse() const {
-    return reverb_model_estimator_.GetReverbFrequencyResponse();
-  }
-
-  // Returns the upper limit for the echo suppression gain.
-  float SuppressionGainLimit() const {
-    if (use_suppressor_gain_limiter_) {
-      return suppression_gain_limiter_.Limit();
-    } else {
-      return 1.f;
-    }
-  }
-
-  // Returns whether the suppression gain limiter is active.
-  bool IsSuppressionGainLimitActive() const {
-    return suppression_gain_limiter_.IsActive();
-  }
-
-  // Returns whether the transition for going out of the initial stated has
-  // been triggered.
-  bool TransitionTriggered() const {
-    return initial_state_.TransitionTriggered();
-  }
-
-  // Updates the aec state.
-  void Update(const absl::optional<DelayEstimate>& external_delay,
-              const std::vector<std::array<float, kFftLengthBy2Plus1>>&
-                  adaptive_filter_frequency_response,
-              const std::vector<float>& adaptive_filter_impulse_response,
-              const RenderBuffer& render_buffer,
-              const std::array<float, kFftLengthBy2Plus1>& E2_main,
-              const std::array<float, kFftLengthBy2Plus1>& Y2,
-              const SubtractorOutput& subtractor_output,
-              rtc::ArrayView<const float> y);
-
-  // Returns filter length in blocks.
-  int FilterLengthBlocks() const {
-    return filter_analyzer_.FilterLengthBlocks();
-  }
-
- private:
-  static int instance_count_;
-  std::unique_ptr<ApmDataDumper> data_dumper_;
-  const EchoCanceller3Config config_;
-  const bool use_legacy_saturation_behavior_;
-  const bool enable_erle_resets_at_gain_changes_;
-  const bool enable_erle_updates_during_reverb_;
-  const bool use_legacy_filter_quality_;
-  const bool use_suppressor_gain_limiter_;
-
-  // Class for controlling the transition from the intial state, which in turn
-  // controls when the filter parameters for the initial state should be used.
-  class InitialState {
-   public:
-    explicit InitialState(const EchoCanceller3Config& config);
-    // Resets the state to again begin in the initial state.
-    void Reset();
-
-    // Updates the state based on new data.
-    void Update(bool active_render, bool saturated_capture);
-
-    // Returns whether the initial state is active or not.
-    bool InitialStateActive() const { return initial_state_; }
-
-    // Returns that the transition from the initial state has was started.
-    bool TransitionTriggered() const { return transition_triggered_; }
-
-   private:
-    const bool conservative_initial_phase_;
-    const float initial_state_seconds_;
-    bool transition_triggered_ = false;
-    bool initial_state_ = true;
-    size_t strong_not_saturated_render_blocks_ = 0;
-  } initial_state_;
-
-  // Class for choosing the direct-path delay relative to the beginning of the
-  // filter, as well as any other data related to the delay used within
-  // AecState.
-  class FilterDelay {
-   public:
-    explicit FilterDelay(const EchoCanceller3Config& config);
-
-    // Returns whether an external delay has been reported to the AecState (from
-    // the delay estimator).
-    bool ExternalDelayReported() const { return external_delay_reported_; }
-
-    // Returns the delay in blocks relative to the beginning of the filter that
-    // corresponds to the direct path of the echo.
-    int DirectPathFilterDelay() const { return filter_delay_blocks_; }
-
-    // Updates the delay estimates based on new data.
-    void Update(const FilterAnalyzer& filter_analyzer,
-                const absl::optional<DelayEstimate>& external_delay,
-                size_t blocks_with_proper_filter_adaptation);
-
-   private:
-    const int delay_headroom_blocks_;
-    bool external_delay_reported_ = false;
-    int filter_delay_blocks_ = 0;
-    absl::optional<DelayEstimate> external_delay_;
-  } delay_state_;
-
-  // Class for detecting and toggling the transparent mode which causes the
-  // suppressor to apply no suppression.
-  class TransparentMode {
-   public:
-    explicit TransparentMode(const EchoCanceller3Config& config);
-
-    // Returns whether the transparent mode should be active.
-    bool Active() const { return transparency_activated_; }
-
-    // Resets the state of the detector.
-    void Reset();
-
-    // Updates the detection deciscion based on new data.
-    void Update(int filter_delay_blocks,
-                bool consistent_filter,
-                bool converged_filter,
-                bool diverged_filter,
-                bool active_render,
-                bool saturated_capture);
-
-   private:
-    const bool bounded_erl_;
-    const bool linear_and_stable_echo_path_;
-    size_t capture_block_counter_ = 0;
-    bool transparency_activated_ = false;
-    size_t active_blocks_since_sane_filter_;
-    bool sane_filter_observed_ = false;
-    bool finite_erl_recently_detected_ = false;
-    size_t non_converged_sequence_size_;
-    size_t diverged_sequence_size_ = 0;
-    size_t active_non_converged_sequence_size_ = 0;
-    size_t num_converged_blocks_ = 0;
-    bool recent_convergence_during_activity_ = false;
-    size_t strong_not_saturated_render_blocks_ = 0;
-  } transparent_state_;
-
-  // Class for analyzing how well the linear filter is, and can be expected to,
-  // perform on the current signals. The purpose of this is for using to
-  // select the echo suppression functionality as well as the input to the echo
-  // suppressor.
-  class FilteringQualityAnalyzer {
-   public:
-    FilteringQualityAnalyzer(const EchoCanceller3Config& config);
-
-    // Returns whether the the linear filter can be used for the echo
-    // canceller output.
-    bool LinearFilterUsable() const { return usable_linear_estimate_; }
-
-    // Resets the state of the analyzer.
-    void Reset();
-
-    // Updates the analysis based on new data.
-    void Update(bool active_render,
-                bool transparent_mode,
-                bool saturated_capture,
-                bool consistent_estimate_,
-                const absl::optional<DelayEstimate>& external_delay,
-                bool converged_filter);
-
-   private:
-    bool usable_linear_estimate_ = false;
-    size_t filter_update_blocks_since_reset_ = 0;
-    size_t filter_update_blocks_since_start_ = 0;
-    bool convergence_seen_ = false;
-  } filter_quality_state_;
-
-  // Class containing the legacy functionality for analyzing how well the linear
-  // filter is, and can be expected to perform on the current signals. The
-  // purpose of this is for using to select the echo suppression functionality
-  // as well as the input to the echo suppressor.
-  class LegacyFilteringQualityAnalyzer {
-   public:
-    explicit LegacyFilteringQualityAnalyzer(const EchoCanceller3Config& config);
-
-    // Returns whether the the linear filter is can be used for the echo
-    // canceller output.
-    bool LinearFilterUsable() const { return usable_linear_estimate_; }
-
-    // Resets the state of the analyzer.
-    void Reset();
-
-    // Updates the analysis based on new data.
-    void Update(bool saturated_echo,
-                bool active_render,
-                bool saturated_capture,
-                bool transparent_mode,
-                const absl::optional<DelayEstimate>& external_delay,
-                bool converged_filter,
-                bool diverged_filter);
-
-   private:
-    const bool conservative_initial_phase_;
-    const float required_blocks_for_convergence_;
-    const bool linear_and_stable_echo_path_;
-    bool usable_linear_estimate_ = false;
-    size_t strong_not_saturated_render_blocks_ = 0;
-    size_t non_converged_sequence_size_;
-    size_t diverged_sequence_size_ = 0;
-    size_t active_non_converged_sequence_size_ = 0;
-    bool recent_convergence_during_activity_ = false;
-    bool recent_convergence_ = false;
-  } legacy_filter_quality_state_;
-
-  // Class for detecting whether the echo is to be considered to be
-  // saturated.
-  class SaturationDetector {
-   public:
-    // Returns whether the echo is to be considered saturated.
-    bool SaturatedEcho() const { return saturated_echo_; };
-
-    // Updates the detection decision based on new data.
-    void Update(rtc::ArrayView<const float> x,
-                bool saturated_capture,
-                bool usable_linear_estimate,
-                const SubtractorOutput& subtractor_output,
-                float echo_path_gain);
-
-   private:
-    bool saturated_echo_ = false;
-  } saturation_detector_;
-
-  // Legacy class for detecting whether the echo is to be considered to be
-  // saturated. This is kept as a fallback solution to use instead of the class
-  // SaturationDetector,
-  class LegacySaturationDetector {
-   public:
-    explicit LegacySaturationDetector(const EchoCanceller3Config& config);
-
-    // Returns whether the echo is to be considered saturated.
-    bool SaturatedEcho() const { return saturated_echo_; };
-
-    // Resets the state of the detector.
-    void Reset();
-
-    // Updates the detection decision based on new data.
-    void Update(rtc::ArrayView<const float> x,
-                bool saturated_capture,
-                float echo_path_gain);
-
-   private:
-    const bool echo_can_saturate_;
-    size_t not_saturated_sequence_size_;
-    bool saturated_echo_ = false;
-  } legacy_saturation_detector_;
-
-  ErlEstimator erl_estimator_;
-  ErleEstimator erle_estimator_;
-  size_t strong_not_saturated_render_blocks_ = 0;
-  size_t blocks_with_active_render_ = 0;
-  bool capture_signal_saturation_ = false;
-
-  SuppressionGainUpperLimiter suppression_gain_limiter_;
-  FilterAnalyzer filter_analyzer_;
-  absl::optional<DelayEstimate> external_delay_;
-  EchoAudibility echo_audibility_;
-  ReverbModelEstimator reverb_model_estimator_;
-  RenderReverbModel render_reverb_;
-  SubtractorOutputAnalyzer subtractor_output_analyzer_;
-};
-
-}  // namespace webrtc
-
-#endif  // MODULES_AUDIO_PROCESSING_AEC3_AEC_STATE_H_
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/block_delay_buffer.cc b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/block_delay_buffer.cc
deleted file mode 100644
index 0a242eede7..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/block_delay_buffer.cc
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- *  Copyright (c) 2018 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-#include "modules/audio_processing/aec3/block_delay_buffer.h"
-
-#include "rtc_base/checks.h"
-
-namespace webrtc {
-
-BlockDelayBuffer::BlockDelayBuffer(size_t num_bands,
-                                   size_t frame_length,
-                                   size_t delay_samples)
-    : frame_length_(frame_length),
-      delay_(delay_samples),
-      buf_(num_bands, std::vector<float>(delay_, 0.f)) {}
-
-BlockDelayBuffer::~BlockDelayBuffer() = default;
-
-void BlockDelayBuffer::DelaySignal(AudioBuffer* frame) {
-  RTC_DCHECK_EQ(1, frame->num_channels());
-  RTC_DCHECK_EQ(buf_.size(), frame->num_bands());
-  if (delay_ == 0) {
-    return;
-  }
-
-  const size_t i_start = last_insert_;
-  size_t i = 0;
-  for (size_t j = 0; j < buf_.size(); ++j) {
-    i = i_start;
-    for (size_t k = 0; k < frame_length_; ++k) {
-      const float tmp = buf_[j][i];
-      buf_[j][i] = frame->split_bands_f(0)[j][k];
-      frame->split_bands_f(0)[j][k] = tmp;
-      i = i < buf_[0].size() - 1 ? i + 1 : 0;
-    }
-  }
-
-  last_insert_ = i;
-}
-
-}  // namespace webrtc
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/block_delay_buffer.h b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/block_delay_buffer.h
deleted file mode 100644
index 624e9139a3..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/block_delay_buffer.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- *  Copyright (c) 2018 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#ifndef MODULES_AUDIO_PROCESSING_AEC3_BLOCK_DELAY_BUFFER_H_
-#define MODULES_AUDIO_PROCESSING_AEC3_BLOCK_DELAY_BUFFER_H_
-
-#include <stddef.h>
-#include <vector>
-
-#include "modules/audio_processing/audio_buffer.h"
-
-namespace webrtc {
-
-// Class for applying a fixed delay to the samples in a signal partitioned using
-// the audiobuffer band-splitting scheme.
-class BlockDelayBuffer {
- public:
-  BlockDelayBuffer(size_t num_bands, size_t frame_length, size_t delay_samples);
-  ~BlockDelayBuffer();
-
-  // Delays the samples by the specified delay.
-  void DelaySignal(AudioBuffer* frame);
-
- private:
-  const size_t frame_length_;
-  const size_t delay_;
-  std::vector<std::vector<float>> buf_;
-  size_t last_insert_ = 0;
-};
-}  // namespace webrtc
-
-#endif  // MODULES_AUDIO_PROCESSING_AEC3_BLOCK_DELAY_BUFFER_H_
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/block_framer.cc b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/block_framer.cc
deleted file mode 100644
index ca7667c24f..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/block_framer.cc
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- *  Copyright (c) 2016 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#include "modules/audio_processing/aec3/block_framer.h"
-
-#include <algorithm>
-
-#include "modules/audio_processing/aec3/aec3_common.h"
-#include "rtc_base/checks.h"
-
-namespace webrtc {
-
-BlockFramer::BlockFramer(size_t num_bands)
-    : num_bands_(num_bands),
-      buffer_(num_bands_, std::vector<float>(kBlockSize, 0.f)) {}
-
-BlockFramer::~BlockFramer() = default;
-
-// All the constants are chosen so that the buffer is either empty or has enough
-// samples for InsertBlockAndExtractSubFrame to produce a frame. In order to
-// achieve this, the InsertBlockAndExtractSubFrame and InsertBlock methods need
-// to be called in the correct order.
-void BlockFramer::InsertBlock(const std::vector<std::vector<float>>& block) {
-  RTC_DCHECK_EQ(num_bands_, block.size());
-  for (size_t i = 0; i < num_bands_; ++i) {
-    RTC_DCHECK_EQ(kBlockSize, block[i].size());
-    RTC_DCHECK_EQ(0, buffer_[i].size());
-    buffer_[i].insert(buffer_[i].begin(), block[i].begin(), block[i].end());
-  }
-}
-
-void BlockFramer::InsertBlockAndExtractSubFrame(
-    const std::vector<std::vector<float>>& block,
-    std::vector<rtc::ArrayView<float>>* sub_frame) {
-  RTC_DCHECK(sub_frame);
-  RTC_DCHECK_EQ(num_bands_, block.size());
-  RTC_DCHECK_EQ(num_bands_, sub_frame->size());
-  for (size_t i = 0; i < num_bands_; ++i) {
-    RTC_DCHECK_LE(kSubFrameLength, buffer_[i].size() + kBlockSize);
-    RTC_DCHECK_EQ(kBlockSize, block[i].size());
-    RTC_DCHECK_GE(kBlockSize, buffer_[i].size());
-    RTC_DCHECK_EQ(kSubFrameLength, (*sub_frame)[i].size());
-    const int samples_to_frame = kSubFrameLength - buffer_[i].size();
-    std::copy(buffer_[i].begin(), buffer_[i].end(), (*sub_frame)[i].begin());
-    std::copy(block[i].begin(), block[i].begin() + samples_to_frame,
-              (*sub_frame)[i].begin() + buffer_[i].size());
-    buffer_[i].clear();
-    buffer_[i].insert(buffer_[i].begin(), block[i].begin() + samples_to_frame,
-                      block[i].end());
-  }
-}
-
-}  // namespace webrtc
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/block_framer.h b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/block_framer.h
deleted file mode 100644
index 923e4cfb53..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/block_framer.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- *  Copyright (c) 2016 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#ifndef MODULES_AUDIO_PROCESSING_AEC3_BLOCK_FRAMER_H_
-#define MODULES_AUDIO_PROCESSING_AEC3_BLOCK_FRAMER_H_
-
-#include <vector>
-
-#include "api/array_view.h"
-#include "modules/audio_processing/aec3/aec3_common.h"
-#include "rtc_base/constructormagic.h"
-
-namespace webrtc {
-
-// Class for producing frames consisting of 1 or 2 subframes of 80 samples each
-// from 64 sample blocks. The class is designed to work together with the
-// FrameBlocker class which performs the reverse conversion. Used together with
-// that, this class produces output frames are the same rate as frames are
-// received by the FrameBlocker class. Note that the internal buffers will
-// overrun if any other rate of packets insertion is used.
-class BlockFramer {
- public:
-  explicit BlockFramer(size_t num_bands);
-  ~BlockFramer();
-  // Adds a 64 sample block into the data that will form the next output frame.
-  void InsertBlock(const std::vector<std::vector<float>>& block);
-  // Adds a 64 sample block and extracts an 80 sample subframe.
-  void InsertBlockAndExtractSubFrame(
-      const std::vector<std::vector<float>>& block,
-      std::vector<rtc::ArrayView<float>>* sub_frame);
-
- private:
-  const size_t num_bands_;
-  std::vector<std::vector<float>> buffer_;
-
-  RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(BlockFramer);
-};
-}  // namespace webrtc
-
-#endif  // MODULES_AUDIO_PROCESSING_AEC3_BLOCK_FRAMER_H_
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/block_processor.cc b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/block_processor.cc
deleted file mode 100644
index 590380f897..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/block_processor.cc
+++ /dev/null
@@ -1,288 +0,0 @@
-/*
- *  Copyright (c) 2016 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-#include "modules/audio_processing/aec3/block_processor.h"
-
-#include <utility>
-
-#include "absl/types/optional.h"
-#include "modules/audio_processing/aec3/aec3_common.h"
-#include "modules/audio_processing/aec3/block_processor_metrics.h"
-#include "modules/audio_processing/aec3/delay_estimate.h"
-#include "modules/audio_processing/aec3/echo_path_variability.h"
-#include "modules/audio_processing/logging/apm_data_dumper.h"
-#include "rtc_base/atomicops.h"
-#include "rtc_base/checks.h"
-#include "rtc_base/constructormagic.h"
-#include "rtc_base/logging.h"
-
-namespace webrtc {
-namespace {
-
-enum class BlockProcessorApiCall { kCapture, kRender };
-
-class BlockProcessorImpl final : public BlockProcessor {
- public:
-  BlockProcessorImpl(const EchoCanceller3Config& config,
-                     int sample_rate_hz,
-                     std::unique_ptr<RenderDelayBuffer> render_buffer,
-                     std::unique_ptr<RenderDelayController> delay_controller,
-                     std::unique_ptr<EchoRemover> echo_remover);
-
-  ~BlockProcessorImpl() override;
-
-  void ProcessCapture(bool echo_path_gain_change,
-                      bool capture_signal_saturation,
-                      std::vector<std::vector<float>>* capture_block) override;
-
-  void BufferRender(const std::vector<std::vector<float>>& block) override;
-
-  void UpdateEchoLeakageStatus(bool leakage_detected) override;
-
-  void GetMetrics(EchoControl::Metrics* metrics) const override;
-
-  void SetAudioBufferDelay(size_t delay_ms) override;
-
- private:
-  static int instance_count_;
-  std::unique_ptr<ApmDataDumper> data_dumper_;
-  const EchoCanceller3Config config_;
-  bool capture_properly_started_ = false;
-  bool render_properly_started_ = false;
-  const size_t sample_rate_hz_;
-  std::unique_ptr<RenderDelayBuffer> render_buffer_;
-  std::unique_ptr<RenderDelayController> delay_controller_;
-  std::unique_ptr<EchoRemover> echo_remover_;
-  BlockProcessorMetrics metrics_;
-  RenderDelayBuffer::BufferingEvent render_event_;
-  size_t capture_call_counter_ = 0;
-  absl::optional<DelayEstimate> estimated_delay_;
-  absl::optional<int> echo_remover_delay_;
-  RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(BlockProcessorImpl);
-};
-
-int BlockProcessorImpl::instance_count_ = 0;
-
-BlockProcessorImpl::BlockProcessorImpl(
-    const EchoCanceller3Config& config,
-    int sample_rate_hz,
-    std::unique_ptr<RenderDelayBuffer> render_buffer,
-    std::unique_ptr<RenderDelayController> delay_controller,
-    std::unique_ptr<EchoRemover> echo_remover)
-    : data_dumper_(
-          new ApmDataDumper(rtc::AtomicOps::Increment(&instance_count_))),
-      config_(config),
-      sample_rate_hz_(sample_rate_hz),
-      render_buffer_(std::move(render_buffer)),
-      delay_controller_(std::move(delay_controller)),
-      echo_remover_(std::move(echo_remover)),
-      render_event_(RenderDelayBuffer::BufferingEvent::kNone) {
-  RTC_DCHECK(ValidFullBandRate(sample_rate_hz_));
-}
-
-BlockProcessorImpl::~BlockProcessorImpl() = default;
-
-void BlockProcessorImpl::ProcessCapture(
-    bool echo_path_gain_change,
-    bool capture_signal_saturation,
-    std::vector<std::vector<float>>* capture_block) {
-  RTC_DCHECK(capture_block);
-  RTC_DCHECK_EQ(NumBandsForRate(sample_rate_hz_), capture_block->size());
-  RTC_DCHECK_EQ(kBlockSize, (*capture_block)[0].size());
-
-  capture_call_counter_++;
-
-  data_dumper_->DumpRaw("aec3_processblock_call_order",
-                        static_cast<int>(BlockProcessorApiCall::kCapture));
-  data_dumper_->DumpWav("aec3_processblock_capture_input", kBlockSize,
-                        &(*capture_block)[0][0],
-                        LowestBandRate(sample_rate_hz_), 1);
-
-  if (render_properly_started_) {
-    if (!capture_properly_started_) {
-      capture_properly_started_ = true;
-      render_buffer_->Reset();
-      delay_controller_->Reset(true);
-    }
-  } else {
-    // If no render data has yet arrived, do not process the capture signal.
-    return;
-  }
-
-  EchoPathVariability echo_path_variability(
-      echo_path_gain_change, EchoPathVariability::DelayAdjustment::kNone,
-      false);
-
-  if (render_event_ == RenderDelayBuffer::BufferingEvent::kRenderOverrun &&
-      render_properly_started_) {
-    echo_path_variability.delay_change =
-        EchoPathVariability::DelayAdjustment::kBufferFlush;
-    delay_controller_->Reset(true);
-    RTC_LOG(LS_WARNING) << "Reset due to render buffer overrun at block  "
-                        << capture_call_counter_;
-  }
-
-  // Update the render buffers with any newly arrived render blocks and prepare
-  // the render buffers for reading the render data corresponding to the current
-  // capture block.
-  render_event_ = render_buffer_->PrepareCaptureProcessing();
-  RTC_DCHECK(RenderDelayBuffer::BufferingEvent::kRenderOverrun !=
-             render_event_);
-  if (render_event_ == RenderDelayBuffer::BufferingEvent::kRenderUnderrun) {
-    if (estimated_delay_ &&
-        estimated_delay_->quality == DelayEstimate::Quality::kRefined) {
-      echo_path_variability.delay_change =
-          EchoPathVariability::DelayAdjustment::kDelayReset;
-      delay_controller_->Reset(true);
-      capture_properly_started_ = false;
-      render_properly_started_ = false;
-
-      RTC_LOG(LS_WARNING) << "Reset due to render buffer underrun at block "
-                          << capture_call_counter_;
-    }
-  } else if (render_event_ == RenderDelayBuffer::BufferingEvent::kApiCallSkew) {
-    // There have been too many render calls in a row. Reset to avoid noncausal
-    // echo.
-    echo_path_variability.delay_change =
-        EchoPathVariability::DelayAdjustment::kDelayReset;
-    delay_controller_->Reset(true);
-    capture_properly_started_ = false;
-    render_properly_started_ = false;
-    RTC_LOG(LS_WARNING) << "Reset due to render buffer api skew at block "
-                        << capture_call_counter_;
-  }
-
-  data_dumper_->DumpWav("aec3_processblock_capture_input2", kBlockSize,
-                        &(*capture_block)[0][0],
-                        LowestBandRate(sample_rate_hz_), 1);
-
-  // Compute and and apply the render delay required to achieve proper signal
-  // alignment.
-  estimated_delay_ = delay_controller_->GetDelay(
-      render_buffer_->GetDownsampledRenderBuffer(), render_buffer_->Delay(),
-      echo_remover_delay_, (*capture_block)[0]);
-
-  if (estimated_delay_) {
-    if (render_buffer_->CausalDelay(estimated_delay_->delay)) {
-      bool delay_change = render_buffer_->SetDelay(estimated_delay_->delay);
-      if (delay_change) {
-        RTC_LOG(LS_WARNING) << "Delay changed to " << estimated_delay_->delay
-                            << " at block " << capture_call_counter_;
-        echo_path_variability.delay_change =
-            EchoPathVariability::DelayAdjustment::kNewDetectedDelay;
-      }
-    } else {
-      // A noncausal delay has been detected. This can only happen if there is
-      // clockdrift, an audio pipeline issue has occurred, an unreliable delay
-      // estimate is used or the specified minimum delay is too short.
-      if (estimated_delay_->quality == DelayEstimate::Quality::kRefined) {
-        echo_path_variability.delay_change =
-            EchoPathVariability::DelayAdjustment::kDelayReset;
-        delay_controller_->Reset(true);
-        render_buffer_->Reset();
-        capture_properly_started_ = false;
-        render_properly_started_ = false;
-        RTC_LOG(LS_WARNING) << "Reset due to noncausal delay at block "
-                            << capture_call_counter_;
-      }
-    }
-  }
-
-  // Remove the echo from the capture signal.
-  echo_remover_->ProcessCapture(
-      echo_path_variability, capture_signal_saturation, estimated_delay_,
-      render_buffer_->GetRenderBuffer(), capture_block);
-
-  // Check to see if a refined delay estimate has been obtained from the echo
-  // remover.
-  echo_remover_delay_ = echo_remover_->Delay();
-
-  // Update the metrics.
-  metrics_.UpdateCapture(false);
-
-  render_event_ = RenderDelayBuffer::BufferingEvent::kNone;
-}
-
-void BlockProcessorImpl::BufferRender(
-    const std::vector<std::vector<float>>& block) {
-  RTC_DCHECK_EQ(NumBandsForRate(sample_rate_hz_), block.size());
-  RTC_DCHECK_EQ(kBlockSize, block[0].size());
-  data_dumper_->DumpRaw("aec3_processblock_call_order",
-                        static_cast<int>(BlockProcessorApiCall::kRender));
-  data_dumper_->DumpWav("aec3_processblock_render_input", kBlockSize,
-                        &block[0][0], LowestBandRate(sample_rate_hz_), 1);
-  data_dumper_->DumpWav("aec3_processblock_render_input2", kBlockSize,
-                        &block[0][0], LowestBandRate(sample_rate_hz_), 1);
-
-  render_event_ = render_buffer_->Insert(block);
-
-  metrics_.UpdateRender(render_event_ !=
-                        RenderDelayBuffer::BufferingEvent::kNone);
-
-  render_properly_started_ = true;
-  delay_controller_->LogRenderCall();
-}
-
-void BlockProcessorImpl::UpdateEchoLeakageStatus(bool leakage_detected) {
-  echo_remover_->UpdateEchoLeakageStatus(leakage_detected);
-}
-
-void BlockProcessorImpl::GetMetrics(EchoControl::Metrics* metrics) const {
-  echo_remover_->GetMetrics(metrics);
-  const int block_size_ms = sample_rate_hz_ == 8000 ? 8 : 4;
-  absl::optional<size_t> delay = render_buffer_->Delay();
-  metrics->delay_ms = delay ? static_cast<int>(*delay) * block_size_ms : 0;
-}
-
-void BlockProcessorImpl::SetAudioBufferDelay(size_t delay_ms) {
-  render_buffer_->SetAudioBufferDelay(delay_ms);
-}
-
-}  // namespace
-
-BlockProcessor* BlockProcessor::Create(const EchoCanceller3Config& config,
-                                       int sample_rate_hz) {
-  std::unique_ptr<RenderDelayBuffer> render_buffer(
-      RenderDelayBuffer::Create(config, NumBandsForRate(sample_rate_hz)));
-  std::unique_ptr<RenderDelayController> delay_controller(
-      RenderDelayController::Create(
-          config, RenderDelayBuffer::DelayEstimatorOffset(config),
-          sample_rate_hz));
-  std::unique_ptr<EchoRemover> echo_remover(
-      EchoRemover::Create(config, sample_rate_hz));
-  return Create(config, sample_rate_hz, std::move(render_buffer),
-                std::move(delay_controller), std::move(echo_remover));
-}
-
-BlockProcessor* BlockProcessor::Create(
-    const EchoCanceller3Config& config,
-    int sample_rate_hz,
-    std::unique_ptr<RenderDelayBuffer> render_buffer) {
-  std::unique_ptr<RenderDelayController> delay_controller(
-      RenderDelayController::Create(
-          config, RenderDelayBuffer::DelayEstimatorOffset(config),
-          sample_rate_hz));
-  std::unique_ptr<EchoRemover> echo_remover(
-      EchoRemover::Create(config, sample_rate_hz));
-  return Create(config, sample_rate_hz, std::move(render_buffer),
-                std::move(delay_controller), std::move(echo_remover));
-}
-
-BlockProcessor* BlockProcessor::Create(
-    const EchoCanceller3Config& config,
-    int sample_rate_hz,
-    std::unique_ptr<RenderDelayBuffer> render_buffer,
-    std::unique_ptr<RenderDelayController> delay_controller,
-    std::unique_ptr<EchoRemover> echo_remover) {
-  return new BlockProcessorImpl(
-      config, sample_rate_hz, std::move(render_buffer),
-      std::move(delay_controller), std::move(echo_remover));
-}
-
-}  // namespace webrtc
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/block_processor.h b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/block_processor.h
deleted file mode 100644
index 5f7ec7c17c..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/block_processor.h
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
- *  Copyright (c) 2016 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#ifndef MODULES_AUDIO_PROCESSING_AEC3_BLOCK_PROCESSOR_H_
-#define MODULES_AUDIO_PROCESSING_AEC3_BLOCK_PROCESSOR_H_
-
-#include <stddef.h>
-#include <memory>
-#include <vector>
-
-#include "api/audio/echo_canceller3_config.h"
-#include "api/audio/echo_control.h"
-#include "modules/audio_processing/aec3/echo_remover.h"
-#include "modules/audio_processing/aec3/render_delay_buffer.h"
-#include "modules/audio_processing/aec3/render_delay_controller.h"
-
-namespace webrtc {
-
-// Class for performing echo cancellation on 64 sample blocks of audio data.
-class BlockProcessor {
- public:
-  // Create a block processor with the legacy render buffering.
-  static BlockProcessor* Create(const EchoCanceller3Config& config,
-                                int sample_rate_hz);
-  // Create a block processor with the new render buffering.
-  static BlockProcessor* Create2(const EchoCanceller3Config& config,
-                                 int sample_rate_hz);
-  // Only used for testing purposes.
-  static BlockProcessor* Create(
-      const EchoCanceller3Config& config,
-      int sample_rate_hz,
-      std::unique_ptr<RenderDelayBuffer> render_buffer);
-  static BlockProcessor* Create2(
-      const EchoCanceller3Config& config,
-      int sample_rate_hz,
-      std::unique_ptr<RenderDelayBuffer> render_buffer);
-  static BlockProcessor* Create(
-      const EchoCanceller3Config& config,
-      int sample_rate_hz,
-      std::unique_ptr<RenderDelayBuffer> render_buffer,
-      std::unique_ptr<RenderDelayController> delay_controller,
-      std::unique_ptr<EchoRemover> echo_remover);
-  static BlockProcessor* Create2(
-      const EchoCanceller3Config& config,
-      int sample_rate_hz,
-      std::unique_ptr<RenderDelayBuffer> render_buffer,
-      std::unique_ptr<RenderDelayController> delay_controller,
-      std::unique_ptr<EchoRemover> echo_remover);
-
-  virtual ~BlockProcessor() = default;
-
-  // Get current metrics.
-  virtual void GetMetrics(EchoControl::Metrics* metrics) const = 0;
-
-  // Provides an optional external estimate of the audio buffer delay.
-  virtual void SetAudioBufferDelay(size_t delay_ms) = 0;
-
-  // Processes a block of capture data.
-  virtual void ProcessCapture(
-      bool echo_path_gain_change,
-      bool capture_signal_saturation,
-      std::vector<std::vector<float>>* capture_block) = 0;
-
-  // Buffers a block of render data supplied by a FrameBlocker object.
-  virtual void BufferRender(
-      const std::vector<std::vector<float>>& render_block) = 0;
-
-  // Reports whether echo leakage has been detected in the echo canceller
-  // output.
-  virtual void UpdateEchoLeakageStatus(bool leakage_detected) = 0;
-};
-
-}  // namespace webrtc
-
-#endif  // MODULES_AUDIO_PROCESSING_AEC3_BLOCK_PROCESSOR_H_
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/block_processor2.cc b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/block_processor2.cc
deleted file mode 100644
index 3616427ce2..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/block_processor2.cc
+++ /dev/null
@@ -1,254 +0,0 @@
-/*
- *  Copyright (c) 2018 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-#include <stddef.h>
-#include <memory>
-#include <utility>
-#include <vector>
-
-#include "absl/types/optional.h"
-#include "api/audio/echo_canceller3_config.h"
-#include "api/audio/echo_control.h"
-#include "modules/audio_processing/aec3/aec3_common.h"
-#include "modules/audio_processing/aec3/block_processor.h"
-#include "modules/audio_processing/aec3/block_processor_metrics.h"
-#include "modules/audio_processing/aec3/delay_estimate.h"
-#include "modules/audio_processing/aec3/echo_path_variability.h"
-#include "modules/audio_processing/aec3/echo_remover.h"
-#include "modules/audio_processing/aec3/render_delay_buffer.h"
-#include "modules/audio_processing/aec3/render_delay_controller.h"
-#include "modules/audio_processing/logging/apm_data_dumper.h"
-#include "rtc_base/atomicops.h"
-#include "rtc_base/checks.h"
-#include "rtc_base/logging.h"
-
-namespace webrtc {
-namespace {
-
-enum class BlockProcessorApiCall { kCapture, kRender };
-
-class BlockProcessorImpl2 final : public BlockProcessor {
- public:
-  BlockProcessorImpl2(const EchoCanceller3Config& config,
-                      int sample_rate_hz,
-                      std::unique_ptr<RenderDelayBuffer> render_buffer,
-                      std::unique_ptr<RenderDelayController> delay_controller,
-                      std::unique_ptr<EchoRemover> echo_remover);
-
-  BlockProcessorImpl2() = delete;
-
-  ~BlockProcessorImpl2() override;
-
-  void ProcessCapture(bool echo_path_gain_change,
-                      bool capture_signal_saturation,
-                      std::vector<std::vector<float>>* capture_block) override;
-
-  void BufferRender(const std::vector<std::vector<float>>& block) override;
-
-  void UpdateEchoLeakageStatus(bool leakage_detected) override;
-
-  void GetMetrics(EchoControl::Metrics* metrics) const override;
-
-  void SetAudioBufferDelay(size_t delay_ms) override;
-
- private:
-  static int instance_count_;
-  std::unique_ptr<ApmDataDumper> data_dumper_;
-  const EchoCanceller3Config config_;
-  bool capture_properly_started_ = false;
-  bool render_properly_started_ = false;
-  const size_t sample_rate_hz_;
-  std::unique_ptr<RenderDelayBuffer> render_buffer_;
-  std::unique_ptr<RenderDelayController> delay_controller_;
-  std::unique_ptr<EchoRemover> echo_remover_;
-  BlockProcessorMetrics metrics_;
-  RenderDelayBuffer::BufferingEvent render_event_;
-  size_t capture_call_counter_ = 0;
-  absl::optional<DelayEstimate> estimated_delay_;
-  absl::optional<int> echo_remover_delay_;
-};
-
-int BlockProcessorImpl2::instance_count_ = 0;
-
-BlockProcessorImpl2::BlockProcessorImpl2(
-    const EchoCanceller3Config& config,
-    int sample_rate_hz,
-    std::unique_ptr<RenderDelayBuffer> render_buffer,
-    std::unique_ptr<RenderDelayController> delay_controller,
-    std::unique_ptr<EchoRemover> echo_remover)
-    : data_dumper_(
-          new ApmDataDumper(rtc::AtomicOps::Increment(&instance_count_))),
-      config_(config),
-      sample_rate_hz_(sample_rate_hz),
-      render_buffer_(std::move(render_buffer)),
-      delay_controller_(std::move(delay_controller)),
-      echo_remover_(std::move(echo_remover)),
-      render_event_(RenderDelayBuffer::BufferingEvent::kNone) {
-  RTC_DCHECK(ValidFullBandRate(sample_rate_hz_));
-}
-
-BlockProcessorImpl2::~BlockProcessorImpl2() = default;
-
-void BlockProcessorImpl2::ProcessCapture(
-    bool echo_path_gain_change,
-    bool capture_signal_saturation,
-    std::vector<std::vector<float>>* capture_block) {
-  RTC_DCHECK(capture_block);
-  RTC_DCHECK_EQ(NumBandsForRate(sample_rate_hz_), capture_block->size());
-  RTC_DCHECK_EQ(kBlockSize, (*capture_block)[0].size());
-
-  capture_call_counter_++;
-
-  data_dumper_->DumpRaw("aec3_processblock_call_order",
-                        static_cast<int>(BlockProcessorApiCall::kCapture));
-  data_dumper_->DumpWav("aec3_processblock_capture_input", kBlockSize,
-                        &(*capture_block)[0][0],
-                        LowestBandRate(sample_rate_hz_), 1);
-
-  if (render_properly_started_) {
-    if (!capture_properly_started_) {
-      capture_properly_started_ = true;
-      render_buffer_->Reset();
-      delay_controller_->Reset(true);
-    }
-  } else {
-    // If no render data has yet arrived, do not process the capture signal.
-    return;
-  }
-
-  EchoPathVariability echo_path_variability(
-      echo_path_gain_change, EchoPathVariability::DelayAdjustment::kNone,
-      false);
-
-  if (render_event_ == RenderDelayBuffer::BufferingEvent::kRenderOverrun &&
-      render_properly_started_) {
-    echo_path_variability.delay_change =
-        EchoPathVariability::DelayAdjustment::kBufferFlush;
-    delay_controller_->Reset(true);
-    RTC_LOG(LS_WARNING) << "Reset due to render buffer overrun at block  "
-                        << capture_call_counter_;
-  }
-  render_event_ = RenderDelayBuffer::BufferingEvent::kNone;
-
-  // Update the render buffers with any newly arrived render blocks and prepare
-  // the render buffers for reading the render data corresponding to the current
-  // capture block.
-  RenderDelayBuffer::BufferingEvent buffer_event =
-      render_buffer_->PrepareCaptureProcessing();
-  // Reset the delay controller at render buffer underrun.
-  if (buffer_event == RenderDelayBuffer::BufferingEvent::kRenderUnderrun) {
-    delay_controller_->Reset(false);
-  }
-
-  data_dumper_->DumpWav("aec3_processblock_capture_input2", kBlockSize,
-                        &(*capture_block)[0][0],
-                        LowestBandRate(sample_rate_hz_), 1);
-
-  // Compute and and apply the render delay required to achieve proper signal
-  // alignment.
-  estimated_delay_ = delay_controller_->GetDelay(
-      render_buffer_->GetDownsampledRenderBuffer(), render_buffer_->Delay(),
-      echo_remover_delay_, (*capture_block)[0]);
-
-  if (estimated_delay_) {
-    bool delay_change = render_buffer_->SetDelay(estimated_delay_->delay);
-    if (delay_change) {
-      RTC_LOG(LS_WARNING) << "Delay changed to " << estimated_delay_->delay
-                          << " at block " << capture_call_counter_;
-      echo_path_variability.delay_change =
-          EchoPathVariability::DelayAdjustment::kNewDetectedDelay;
-    }
-  }
-
-  // Remove the echo from the capture signal.
-  echo_remover_->ProcessCapture(
-      echo_path_variability, capture_signal_saturation, estimated_delay_,
-      render_buffer_->GetRenderBuffer(), capture_block);
-
-  // Check to see if a refined delay estimate has been obtained from the echo
-  // remover.
-  echo_remover_delay_ = echo_remover_->Delay();
-
-  // Update the metrics.
-  metrics_.UpdateCapture(false);
-}
-
-void BlockProcessorImpl2::BufferRender(
-    const std::vector<std::vector<float>>& block) {
-  RTC_DCHECK_EQ(NumBandsForRate(sample_rate_hz_), block.size());
-  RTC_DCHECK_EQ(kBlockSize, block[0].size());
-  data_dumper_->DumpRaw("aec3_processblock_call_order",
-                        static_cast<int>(BlockProcessorApiCall::kRender));
-  data_dumper_->DumpWav("aec3_processblock_render_input", kBlockSize,
-                        &block[0][0], LowestBandRate(sample_rate_hz_), 1);
-  data_dumper_->DumpWav("aec3_processblock_render_input2", kBlockSize,
-                        &block[0][0], LowestBandRate(sample_rate_hz_), 1);
-
-  render_event_ = render_buffer_->Insert(block);
-
-  metrics_.UpdateRender(render_event_ !=
-                        RenderDelayBuffer::BufferingEvent::kNone);
-
-  render_properly_started_ = true;
-  delay_controller_->LogRenderCall();
-}
-
-void BlockProcessorImpl2::UpdateEchoLeakageStatus(bool leakage_detected) {
-  echo_remover_->UpdateEchoLeakageStatus(leakage_detected);
-}
-
-void BlockProcessorImpl2::GetMetrics(EchoControl::Metrics* metrics) const {
-  echo_remover_->GetMetrics(metrics);
-  const int block_size_ms = sample_rate_hz_ == 8000 ? 8 : 4;
-  absl::optional<size_t> delay = render_buffer_->Delay();
-  metrics->delay_ms = delay ? static_cast<int>(*delay) * block_size_ms : 0;
-}
-
-void BlockProcessorImpl2::SetAudioBufferDelay(size_t delay_ms) {
-  render_buffer_->SetAudioBufferDelay(delay_ms);
-}
-
-}  // namespace
-
-BlockProcessor* BlockProcessor::Create2(const EchoCanceller3Config& config,
-                                        int sample_rate_hz) {
-  std::unique_ptr<RenderDelayBuffer> render_buffer(
-      RenderDelayBuffer::Create2(config, NumBandsForRate(sample_rate_hz)));
-  std::unique_ptr<RenderDelayController> delay_controller(
-      RenderDelayController::Create2(config, sample_rate_hz));
-  std::unique_ptr<EchoRemover> echo_remover(
-      EchoRemover::Create(config, sample_rate_hz));
-  return Create2(config, sample_rate_hz, std::move(render_buffer),
-                 std::move(delay_controller), std::move(echo_remover));
-}
-
-BlockProcessor* BlockProcessor::Create2(
-    const EchoCanceller3Config& config,
-    int sample_rate_hz,
-    std::unique_ptr<RenderDelayBuffer> render_buffer) {
-  std::unique_ptr<RenderDelayController> delay_controller(
-      RenderDelayController::Create2(config, sample_rate_hz));
-  std::unique_ptr<EchoRemover> echo_remover(
-      EchoRemover::Create(config, sample_rate_hz));
-  return Create2(config, sample_rate_hz, std::move(render_buffer),
-                 std::move(delay_controller), std::move(echo_remover));
-}
-
-BlockProcessor* BlockProcessor::Create2(
-    const EchoCanceller3Config& config,
-    int sample_rate_hz,
-    std::unique_ptr<RenderDelayBuffer> render_buffer,
-    std::unique_ptr<RenderDelayController> delay_controller,
-    std::unique_ptr<EchoRemover> echo_remover) {
-  return new BlockProcessorImpl2(
-      config, sample_rate_hz, std::move(render_buffer),
-      std::move(delay_controller), std::move(echo_remover));
-}
-
-}  // namespace webrtc
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/block_processor_metrics.cc b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/block_processor_metrics.cc
deleted file mode 100644
index deac1fcd22..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/block_processor_metrics.cc
+++ /dev/null
@@ -1,104 +0,0 @@
-/*
- *  Copyright (c) 2017 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#include "modules/audio_processing/aec3/block_processor_metrics.h"
-
-#include "modules/audio_processing/aec3/aec3_common.h"
-#include "rtc_base/checks.h"
-#include "system_wrappers/include/metrics.h"
-
-namespace webrtc {
-
-namespace {
-
-enum class RenderUnderrunCategory {
-  kNone,
-  kFew,
-  kSeveral,
-  kMany,
-  kConstant,
-  kNumCategories
-};
-
-enum class RenderOverrunCategory {
-  kNone,
-  kFew,
-  kSeveral,
-  kMany,
-  kConstant,
-  kNumCategories
-};
-
-}  // namespace
-
-void BlockProcessorMetrics::UpdateCapture(bool underrun) {
-  ++capture_block_counter_;
-  if (underrun) {
-    ++render_buffer_underruns_;
-  }
-
-  if (capture_block_counter_ == kMetricsReportingIntervalBlocks) {
-    metrics_reported_ = true;
-
-    RenderUnderrunCategory underrun_category;
-    if (render_buffer_underruns_ == 0) {
-      underrun_category = RenderUnderrunCategory::kNone;
-    } else if (render_buffer_underruns_ > (capture_block_counter_ >> 1)) {
-      underrun_category = RenderUnderrunCategory::kConstant;
-    } else if (render_buffer_underruns_ > 100) {
-      underrun_category = RenderUnderrunCategory::kMany;
-    } else if (render_buffer_underruns_ > 10) {
-      underrun_category = RenderUnderrunCategory::kSeveral;
-    } else {
-      underrun_category = RenderUnderrunCategory::kFew;
-    }
-    RTC_HISTOGRAM_ENUMERATION(
-        "WebRTC.Audio.EchoCanceller.RenderUnderruns",
-        static_cast<int>(underrun_category),
-        static_cast<int>(RenderUnderrunCategory::kNumCategories));
-
-    RenderOverrunCategory overrun_category;
-    if (render_buffer_overruns_ == 0) {
-      overrun_category = RenderOverrunCategory::kNone;
-    } else if (render_buffer_overruns_ > (buffer_render_calls_ >> 1)) {
-      overrun_category = RenderOverrunCategory::kConstant;
-    } else if (render_buffer_overruns_ > 100) {
-      overrun_category = RenderOverrunCategory::kMany;
-    } else if (render_buffer_overruns_ > 10) {
-      overrun_category = RenderOverrunCategory::kSeveral;
-    } else {
-      overrun_category = RenderOverrunCategory::kFew;
-    }
-    RTC_HISTOGRAM_ENUMERATION(
-        "WebRTC.Audio.EchoCanceller.RenderOverruns",
-        static_cast<int>(overrun_category),
-        static_cast<int>(RenderOverrunCategory::kNumCategories));
-
-    ResetMetrics();
-    capture_block_counter_ = 0;
-  } else {
-    metrics_reported_ = false;
-  }
-}
-
-void BlockProcessorMetrics::UpdateRender(bool overrun) {
-  ++buffer_render_calls_;
-  if (overrun) {
-    ++render_buffer_overruns_;
-  }
-}
-
-void BlockProcessorMetrics::ResetMetrics() {
-  render_buffer_underruns_ = 0;
-  render_buffer_overruns_ = 0;
-  buffer_render_calls_ = 0;
-}
-
-}  // namespace webrtc
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/block_processor_metrics.h b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/block_processor_metrics.h
deleted file mode 100644
index 9b437c0d13..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/block_processor_metrics.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- *  Copyright (c) 2017 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#ifndef MODULES_AUDIO_PROCESSING_AEC3_BLOCK_PROCESSOR_METRICS_H_
-#define MODULES_AUDIO_PROCESSING_AEC3_BLOCK_PROCESSOR_METRICS_H_
-
-#include "rtc_base/constructormagic.h"
-
-namespace webrtc {
-
-// Handles the reporting of metrics for the block_processor.
-class BlockProcessorMetrics {
- public:
-  BlockProcessorMetrics() = default;
-
-  // Updates the metric with new capture data.
-  void UpdateCapture(bool underrun);
-
-  // Updates the metric with new render data.
-  void UpdateRender(bool overrun);
-
-  // Returns true if the metrics have just been reported, otherwise false.
-  bool MetricsReported() { return metrics_reported_; }
-
- private:
-  // Resets the metrics.
-  void ResetMetrics();
-
-  int capture_block_counter_ = 0;
-  bool metrics_reported_ = false;
-  int render_buffer_underruns_ = 0;
-  int render_buffer_overruns_ = 0;
-  int buffer_render_calls_ = 0;
-
-  RTC_DISALLOW_COPY_AND_ASSIGN(BlockProcessorMetrics);
-};
-
-}  // namespace webrtc
-
-#endif  // MODULES_AUDIO_PROCESSING_AEC3_BLOCK_PROCESSOR_METRICS_H_
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/cascaded_biquad_filter.cc b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/cascaded_biquad_filter.cc
deleted file mode 100644
index 5dfd7c54e2..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/cascaded_biquad_filter.cc
+++ /dev/null
@@ -1,107 +0,0 @@
-/*
- *  Copyright (c) 2016 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-#include "modules/audio_processing/aec3/cascaded_biquad_filter.h"
-
-#include <algorithm>
-
-#include "rtc_base/checks.h"
-
-namespace webrtc {
-
-CascadedBiQuadFilter::BiQuadParam::BiQuadParam(std::complex<float> zero,
-                                               std::complex<float> pole,
-                                               float gain,
-                                               bool mirror_zero_along_i_axis)
-    : zero(zero),
-      pole(pole),
-      gain(gain),
-      mirror_zero_along_i_axis(mirror_zero_along_i_axis) {}
-
-CascadedBiQuadFilter::BiQuadParam::BiQuadParam(const BiQuadParam&) = default;
-
-CascadedBiQuadFilter::BiQuad::BiQuad(
-    const CascadedBiQuadFilter::BiQuadParam& param)
-    : x(), y() {
-  float z_r = std::real(param.zero);
-  float z_i = std::imag(param.zero);
-  float p_r = std::real(param.pole);
-  float p_i = std::imag(param.pole);
-  float gain = param.gain;
-
-  if (param.mirror_zero_along_i_axis) {
-    // Assuming zeroes at z_r and -z_r.
-    RTC_DCHECK(z_i == 0.f);
-    coefficients.b[0] = gain * 1.f;
-    coefficients.b[1] = 0.f;
-    coefficients.b[2] = gain * -(z_r * z_r);
-  } else {
-    // Assuming zeros at (z_r + z_i*i) and (z_r - z_i*i).
-    coefficients.b[0] = gain * 1.f;
-    coefficients.b[1] = gain * -2.f * z_r;
-    coefficients.b[2] = gain * (z_r * z_r + z_i * z_i);
-  }
-
-  // Assuming poles at (p_r + p_i*i) and (p_r - p_i*i).
-  coefficients.a[0] = -2.f * p_r;
-  coefficients.a[1] = p_r * p_r + p_i * p_i;
-}
-
-CascadedBiQuadFilter::CascadedBiQuadFilter(
-    const CascadedBiQuadFilter::BiQuadCoefficients& coefficients,
-    size_t num_biquads)
-    : biquads_(num_biquads, coefficients) {}
-
-CascadedBiQuadFilter::CascadedBiQuadFilter(
-    const std::vector<CascadedBiQuadFilter::BiQuadParam>& biquad_params) {
-  for (const auto& param : biquad_params) {
-    biquads_.push_back(BiQuad(param));
-  }
-}
-
-CascadedBiQuadFilter::~CascadedBiQuadFilter() = default;
-
-void CascadedBiQuadFilter::Process(rtc::ArrayView<const float> x,
-                                   rtc::ArrayView<float> y) {
-  if (biquads_.size() > 0) {
-    ApplyBiQuad(x, y, &biquads_[0]);
-    for (size_t k = 1; k < biquads_.size(); ++k) {
-      ApplyBiQuad(y, y, &biquads_[k]);
-    }
-  } else {
-    std::copy(x.begin(), x.end(), y.begin());
-  }
-}
-
-void CascadedBiQuadFilter::Process(rtc::ArrayView<float> y) {
-  for (auto& biquad : biquads_) {
-    ApplyBiQuad(y, y, &biquad);
-  }
-}
-
-void CascadedBiQuadFilter::ApplyBiQuad(rtc::ArrayView<const float> x,
-                                       rtc::ArrayView<float> y,
-                                       CascadedBiQuadFilter::BiQuad* biquad) {
-  RTC_DCHECK_EQ(x.size(), y.size());
-  const auto* c_b = biquad->coefficients.b;
-  const auto* c_a = biquad->coefficients.a;
-  auto* m_x = biquad->x;
-  auto* m_y = biquad->y;
-  for (size_t k = 0; k < x.size(); ++k) {
-    const float tmp = x[k];
-    y[k] = c_b[0] * tmp + c_b[1] * m_x[0] + c_b[2] * m_x[1] - c_a[0] * m_y[0] -
-           c_a[1] * m_y[1];
-    m_x[1] = m_x[0];
-    m_x[0] = tmp;
-    m_y[1] = m_y[0];
-    m_y[0] = y[k];
-  }
-}
-
-}  // namespace webrtc
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/cascaded_biquad_filter.h b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/cascaded_biquad_filter.h
deleted file mode 100644
index 2a3b6d65c5..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/cascaded_biquad_filter.h
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- *  Copyright (c) 2016 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#ifndef MODULES_AUDIO_PROCESSING_AEC3_CASCADED_BIQUAD_FILTER_H_
-#define MODULES_AUDIO_PROCESSING_AEC3_CASCADED_BIQUAD_FILTER_H_
-
-#include <stddef.h>
-#include <complex>
-#include <vector>
-
-#include "api/array_view.h"
-#include "rtc_base/constructormagic.h"
-
-namespace webrtc {
-
-// Applies a number of biquads in a cascaded manner. The filter implementation
-// is direct form 1.
-class CascadedBiQuadFilter {
- public:
-  struct BiQuadParam {
-    BiQuadParam(std::complex<float> zero,
-                std::complex<float> pole,
-                float gain,
-                bool mirror_zero_along_i_axis = false);
-    BiQuadParam(const BiQuadParam&);
-    std::complex<float> zero;
-    std::complex<float> pole;
-    float gain;
-    bool mirror_zero_along_i_axis;
-  };
-
-  struct BiQuadCoefficients {
-    float b[3];
-    float a[2];
-  };
-
-  struct BiQuad {
-    BiQuad(const BiQuadCoefficients& coefficients)
-        : coefficients(coefficients), x(), y() {}
-    BiQuad(const CascadedBiQuadFilter::BiQuadParam& param);
-    BiQuadCoefficients coefficients;
-    float x[2];
-    float y[2];
-  };
-
-  CascadedBiQuadFilter(
-      const CascadedBiQuadFilter::BiQuadCoefficients& coefficients,
-      size_t num_biquads);
-  CascadedBiQuadFilter(
-      const std::vector<CascadedBiQuadFilter::BiQuadParam>& biquad_params);
-  ~CascadedBiQuadFilter();
-  // Applies the biquads on the values in x in order to form the output in y.
-  void Process(rtc::ArrayView<const float> x, rtc::ArrayView<float> y);
-  // Applies the biquads on the values in y in an in-place manner.
-  void Process(rtc::ArrayView<float> y);
-
- private:
-  void ApplyBiQuad(rtc::ArrayView<const float> x,
-                   rtc::ArrayView<float> y,
-                   CascadedBiQuadFilter::BiQuad* biquad);
-
-  std::vector<BiQuad> biquads_;
-
-  RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(CascadedBiQuadFilter);
-};
-
-}  // namespace webrtc
-
-#endif  // MODULES_AUDIO_PROCESSING_AEC3_CASCADED_BIQUAD_FILTER_H_
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/comfort_noise_generator.cc b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/comfort_noise_generator.cc
deleted file mode 100644
index 766e658639..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/comfort_noise_generator.cc
+++ /dev/null
@@ -1,169 +0,0 @@
-/*
- *  Copyright (c) 2017 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#include "modules/audio_processing/aec3/comfort_noise_generator.h"
-
-// Defines WEBRTC_ARCH_X86_FAMILY, used below.
-#include "rtc_base/system/arch.h"
-
-#if defined(WEBRTC_ARCH_X86_FAMILY)
-#include <emmintrin.h>
-#endif
-#include <algorithm>
-#include <array>
-#include <cmath>
-#include <cstdint>
-#include <functional>
-#include <numeric>
-
-#include "common_audio/signal_processing/include/signal_processing_library.h"
-#include "modules/audio_processing/aec3/vector_math.h"
-#include "rtc_base/checks.h"
-
-namespace webrtc {
-
-namespace {
-
-// Creates an array of uniformly distributed variables.
-void TableRandomValue(int16_t* vector, int16_t vector_length, uint32_t* seed) {
-  for (int i = 0; i < vector_length; i++) {
-    seed[0] = (seed[0] * ((int32_t)69069) + 1) & (0x80000000 - 1);
-    vector[i] = (int16_t)(seed[0] >> 16);
-  }
-}
-
-}  // namespace
-
-namespace {
-
-void GenerateComfortNoise(Aec3Optimization optimization,
-                          const std::array<float, kFftLengthBy2Plus1>& N2,
-                          uint32_t* seed,
-                          FftData* lower_band_noise,
-                          FftData* upper_band_noise) {
-  FftData* N_low = lower_band_noise;
-  FftData* N_high = upper_band_noise;
-
-  // Compute square root spectrum.
-  std::array<float, kFftLengthBy2Plus1> N;
-  std::copy(N2.begin(), N2.end(), N.begin());
-  aec3::VectorMath(optimization).Sqrt(N);
-
-  // Compute the noise level for the upper bands.
-  constexpr float kOneByNumBands = 1.f / (kFftLengthBy2Plus1 / 2 + 1);
-  constexpr int kFftLengthBy2Plus1By2 = kFftLengthBy2Plus1 / 2;
-  const float high_band_noise_level =
-      std::accumulate(N.begin() + kFftLengthBy2Plus1By2, N.end(), 0.f) *
-      kOneByNumBands;
-
-  // Generate complex noise.
-  std::array<int16_t, kFftLengthBy2 - 1> random_values_int;
-  TableRandomValue(random_values_int.data(), random_values_int.size(), seed);
-
-  // The analysis and synthesis windowing cause loss of power when
-  // cross-fading the noise where frames are completely uncorrelated
-  // (generated with random phase), hence the factor sqrt(2).
-  // This is not the case for the speech signal where the input is overlapping
-  // (strong correlation).
-  std::array<float, kFftLengthBy2 - 1> sin;
-  std::array<float, kFftLengthBy2 - 1> cos;
-  constexpr float kScale = 6.28318530717959f / 32768.0f;
-  constexpr float kSqrt2 = 1.4142135623f;
-  std::transform(random_values_int.begin(), random_values_int.end(),
-                 sin.begin(),
-                 [&](int16_t a) { return -sinf(kScale * a) * kSqrt2; });
-  std::transform(random_values_int.begin(), random_values_int.end(),
-                 cos.begin(),
-                 [&](int16_t a) { return cosf(kScale * a) * kSqrt2; });
-
-  // Form low-frequency noise via spectral shaping.
-  N_low->re[0] = N_low->re[kFftLengthBy2] = N_high->re[0] =
-      N_high->re[kFftLengthBy2] = 0.f;
-  std::transform(cos.begin(), cos.end(), N.begin() + 1, N_low->re.begin() + 1,
-                 std::multiplies<float>());
-  std::transform(sin.begin(), sin.end(), N.begin() + 1, N_low->im.begin() + 1,
-                 std::multiplies<float>());
-
-  // Form the high-frequency noise via simple levelling.
-  std::transform(cos.begin(), cos.end(), N_high->re.begin() + 1,
-                 [&](float a) { return high_band_noise_level * a; });
-  std::transform(sin.begin(), sin.end(), N_high->im.begin() + 1,
-                 [&](float a) { return high_band_noise_level * a; });
-}
-
-}  // namespace
-
-ComfortNoiseGenerator::ComfortNoiseGenerator(Aec3Optimization optimization)
-    : optimization_(optimization),
-      seed_(42),
-      N2_initial_(new std::array<float, kFftLengthBy2Plus1>()) {
-  N2_initial_->fill(0.f);
-  Y2_smoothed_.fill(0.f);
-  N2_.fill(1.0e6f);
-}
-
-ComfortNoiseGenerator::~ComfortNoiseGenerator() = default;
-
-void ComfortNoiseGenerator::Compute(
-    const AecState& aec_state,
-    const std::array<float, kFftLengthBy2Plus1>& capture_spectrum,
-    FftData* lower_band_noise,
-    FftData* upper_band_noise) {
-  RTC_DCHECK(lower_band_noise);
-  RTC_DCHECK(upper_band_noise);
-  const auto& Y2 = capture_spectrum;
-
-  if (!aec_state.SaturatedCapture()) {
-    // Smooth Y2.
-    std::transform(Y2_smoothed_.begin(), Y2_smoothed_.end(), Y2.begin(),
-                   Y2_smoothed_.begin(),
-                   [](float a, float b) { return a + 0.1f * (b - a); });
-
-    if (N2_counter_ > 50) {
-      // Update N2 from Y2_smoothed.
-      std::transform(N2_.begin(), N2_.end(), Y2_smoothed_.begin(), N2_.begin(),
-                     [](float a, float b) {
-                       return b < a ? (0.9f * b + 0.1f * a) * 1.0002f
-                                    : a * 1.0002f;
-                     });
-    }
-
-    if (N2_initial_) {
-      if (++N2_counter_ == 1000) {
-        N2_initial_.reset();
-      } else {
-        // Compute the N2_initial from N2.
-        std::transform(
-            N2_.begin(), N2_.end(), N2_initial_->begin(), N2_initial_->begin(),
-            [](float a, float b) { return a > b ? b + 0.001f * (a - b) : a; });
-      }
-    }
-  }
-
-  // Limit the noise to a floor of -96 dBFS.
-  constexpr float kNoiseFloor = 440.f;
-  for (auto& n : N2_) {
-    n = std::max(n, kNoiseFloor);
-  }
-  if (N2_initial_) {
-    for (auto& n : *N2_initial_) {
-      n = std::max(n, kNoiseFloor);
-    }
-  }
-
-  // Choose N2 estimate to use.
-  const std::array<float, kFftLengthBy2Plus1>& N2 =
-      N2_initial_ ? *N2_initial_ : N2_;
-
-  GenerateComfortNoise(optimization_, N2, &seed_, lower_band_noise,
-                       upper_band_noise);
-}
-
-}  // namespace webrtc
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/comfort_noise_generator.h b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/comfort_noise_generator.h
deleted file mode 100644
index 3be386bab1..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/comfort_noise_generator.h
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- *  Copyright (c) 2017 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#ifndef MODULES_AUDIO_PROCESSING_AEC3_COMFORT_NOISE_GENERATOR_H_
-#define MODULES_AUDIO_PROCESSING_AEC3_COMFORT_NOISE_GENERATOR_H_
-
-#include <stdint.h>
-#include <array>
-#include <memory>
-
-#include "modules/audio_processing/aec3/aec3_common.h"
-#include "modules/audio_processing/aec3/aec_state.h"
-#include "modules/audio_processing/aec3/fft_data.h"
-#include "rtc_base/constructormagic.h"
-#include "rtc_base/system/arch.h"
-
-namespace webrtc {
-namespace aec3 {
-#if defined(WEBRTC_ARCH_X86_FAMILY)
-
-void EstimateComfortNoise_SSE2(const std::array<float, kFftLengthBy2Plus1>& N2,
-                               uint32_t* seed,
-                               FftData* lower_band_noise,
-                               FftData* upper_band_noise);
-#endif
-void EstimateComfortNoise(const std::array<float, kFftLengthBy2Plus1>& N2,
-                          uint32_t* seed,
-                          FftData* lower_band_noise,
-                          FftData* upper_band_noise);
-
-}  // namespace aec3
-
-// Generates the comfort noise.
-class ComfortNoiseGenerator {
- public:
-  explicit ComfortNoiseGenerator(Aec3Optimization optimization);
-  ~ComfortNoiseGenerator();
-
-  // Computes the comfort noise.
-  void Compute(const AecState& aec_state,
-               const std::array<float, kFftLengthBy2Plus1>& capture_spectrum,
-               FftData* lower_band_noise,
-               FftData* upper_band_noise);
-
-  // Returns the estimate of the background noise spectrum.
-  const std::array<float, kFftLengthBy2Plus1>& NoiseSpectrum() const {
-    return N2_;
-  }
-
- private:
-  const Aec3Optimization optimization_;
-  uint32_t seed_;
-  std::unique_ptr<std::array<float, kFftLengthBy2Plus1>> N2_initial_;
-  std::array<float, kFftLengthBy2Plus1> Y2_smoothed_;
-  std::array<float, kFftLengthBy2Plus1> N2_;
-  int N2_counter_ = 0;
-
-  RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(ComfortNoiseGenerator);
-};
-
-}  // namespace webrtc
-
-#endif  // MODULES_AUDIO_PROCESSING_AEC3_COMFORT_NOISE_GENERATOR_H_
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/decimator.cc b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/decimator.cc
deleted file mode 100644
index bd03237ca0..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/decimator.cc
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
- *  Copyright (c) 2017 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-#include "modules/audio_processing/aec3/decimator.h"
-
-#include <array>
-#include <vector>
-
-#include "modules/audio_processing/aec3/aec3_common.h"
-#include "rtc_base/checks.h"
-
-namespace webrtc {
-namespace {
-
-// signal.butter(2, 3400/8000.0, 'lowpass', analog=False)
-const std::vector<CascadedBiQuadFilter::BiQuadParam> GetLowPassFilterDS2() {
-  return std::vector<CascadedBiQuadFilter::BiQuadParam>{
-      {{-1.f, 0.f}, {0.13833231f, 0.40743176f}, 0.22711796393486466f},
-      {{-1.f, 0.f}, {0.13833231f, 0.40743176f}, 0.22711796393486466f},
-      {{-1.f, 0.f}, {0.13833231f, 0.40743176f}, 0.22711796393486466f}};
-}
-
-// signal.ellip(6, 1, 40, 1800/8000, btype='lowpass', analog=False)
-const std::vector<CascadedBiQuadFilter::BiQuadParam> GetLowPassFilterDS4() {
-  return std::vector<CascadedBiQuadFilter::BiQuadParam>{
-      {{-0.08873842f, 0.99605496f}, {0.75916227f, 0.23841065f}, 0.26250696827f},
-      {{0.62273832f, 0.78243018f}, {0.74892112f, 0.5410152f}, 0.26250696827f},
-      {{0.71107693f, 0.70311421f}, {0.74895534f, 0.63924616f}, 0.26250696827f}};
-}
-
-// signal.cheby1(1, 6, [1000/8000, 2000/8000], btype='bandpass', analog=False)
-const std::vector<CascadedBiQuadFilter::BiQuadParam> GetBandPassFilterDS8() {
-  return std::vector<CascadedBiQuadFilter::BiQuadParam>{
-      {{1.f, 0.f}, {0.7601815f, 0.46423542f}, 0.10330478266505948f, true},
-      {{1.f, 0.f}, {0.7601815f, 0.46423542f}, 0.10330478266505948f, true},
-      {{1.f, 0.f}, {0.7601815f, 0.46423542f}, 0.10330478266505948f, true},
-      {{1.f, 0.f}, {0.7601815f, 0.46423542f}, 0.10330478266505948f, true},
-      {{1.f, 0.f}, {0.7601815f, 0.46423542f}, 0.10330478266505948f, true}};
-}
-
-// signal.butter(2, 1000/8000.0, 'highpass', analog=False)
-const std::vector<CascadedBiQuadFilter::BiQuadParam> GetHighPassFilter() {
-  return std::vector<CascadedBiQuadFilter::BiQuadParam>{
-      {{1.f, 0.f}, {0.72712179f, 0.21296904f}, 0.7570763753338849f}};
-}
-
-const std::vector<CascadedBiQuadFilter::BiQuadParam> GetPassThroughFilter() {
-  return std::vector<CascadedBiQuadFilter::BiQuadParam>{};
-}
-}  // namespace
-
-Decimator::Decimator(size_t down_sampling_factor)
-    : down_sampling_factor_(down_sampling_factor),
-      anti_aliasing_filter_(down_sampling_factor_ == 4
-                                ? GetLowPassFilterDS4()
-                                : (down_sampling_factor_ == 8
-                                       ? GetBandPassFilterDS8()
-                                       : GetLowPassFilterDS2())),
-      noise_reduction_filter_(down_sampling_factor_ == 8
-                                  ? GetPassThroughFilter()
-                                  : GetHighPassFilter()) {
-  RTC_DCHECK(down_sampling_factor_ == 2 || down_sampling_factor_ == 4 ||
-             down_sampling_factor_ == 8);
-}
-
-void Decimator::Decimate(rtc::ArrayView<const float> in,
-                         rtc::ArrayView<float> out) {
-  RTC_DCHECK_EQ(kBlockSize, in.size());
-  RTC_DCHECK_EQ(kBlockSize / down_sampling_factor_, out.size());
-  std::array<float, kBlockSize> x;
-
-  // Limit the frequency content of the signal to avoid aliasing.
-  anti_aliasing_filter_.Process(in, x);
-
-  // Reduce the impact of near-end noise.
-  noise_reduction_filter_.Process(x);
-
-  // Downsample the signal.
-  for (size_t j = 0, k = 0; j < out.size(); ++j, k += down_sampling_factor_) {
-    RTC_DCHECK_GT(kBlockSize, k);
-    out[j] = x[k];
-  }
-}
-
-}  // namespace webrtc
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/decimator.h b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/decimator.h
deleted file mode 100644
index 2bb60a4d7b..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/decimator.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- *  Copyright (c) 2017 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#ifndef MODULES_AUDIO_PROCESSING_AEC3_DECIMATOR_H_
-#define MODULES_AUDIO_PROCESSING_AEC3_DECIMATOR_H_
-
-#include <array>
-
-#include "api/array_view.h"
-#include "modules/audio_processing/aec3/aec3_common.h"
-#include "modules/audio_processing/aec3/cascaded_biquad_filter.h"
-#include "rtc_base/constructormagic.h"
-
-namespace webrtc {
-
-// Provides functionality for decimating a signal.
-class Decimator {
- public:
-  explicit Decimator(size_t down_sampling_factor);
-
-  // Downsamples the signal.
-  void Decimate(rtc::ArrayView<const float> in, rtc::ArrayView<float> out);
-
- private:
-  const size_t down_sampling_factor_;
-  CascadedBiQuadFilter anti_aliasing_filter_;
-  CascadedBiQuadFilter noise_reduction_filter_;
-
-  RTC_DISALLOW_COPY_AND_ASSIGN(Decimator);
-};
-}  // namespace webrtc
-
-#endif  // MODULES_AUDIO_PROCESSING_AEC3_DECIMATOR_H_
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/delay_estimate.h b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/delay_estimate.h
deleted file mode 100644
index ea5dd27153..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/delay_estimate.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- *  Copyright (c) 2018 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#ifndef MODULES_AUDIO_PROCESSING_AEC3_DELAY_ESTIMATE_H_
-#define MODULES_AUDIO_PROCESSING_AEC3_DELAY_ESTIMATE_H_
-
-namespace webrtc {
-
-// Stores delay_estimates.
-struct DelayEstimate {
-  enum class Quality { kCoarse, kRefined };
-
-  DelayEstimate(Quality quality, size_t delay)
-      : quality(quality), delay(delay) {}
-
-  Quality quality;
-  size_t delay;
-  size_t blocks_since_last_change = 0;
-  size_t blocks_since_last_update = 0;
-};
-
-}  // namespace webrtc
-
-#endif  // MODULES_AUDIO_PROCESSING_AEC3_DELAY_ESTIMATE_H_
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/downsampled_render_buffer.cc b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/downsampled_render_buffer.cc
deleted file mode 100644
index c105911aa8..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/downsampled_render_buffer.cc
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- *  Copyright (c) 2017 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#include "modules/audio_processing/aec3/downsampled_render_buffer.h"
-
-#include <algorithm>
-
-namespace webrtc {
-
-DownsampledRenderBuffer::DownsampledRenderBuffer(size_t downsampled_buffer_size)
-    : size(static_cast<int>(downsampled_buffer_size)),
-      buffer(downsampled_buffer_size, 0.f) {
-  std::fill(buffer.begin(), buffer.end(), 0.f);
-}
-
-DownsampledRenderBuffer::~DownsampledRenderBuffer() = default;
-
-}  // namespace webrtc
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/downsampled_render_buffer.h b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/downsampled_render_buffer.h
deleted file mode 100644
index c91ea3b836..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/downsampled_render_buffer.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- *  Copyright (c) 2017 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#ifndef MODULES_AUDIO_PROCESSING_AEC3_DOWNSAMPLED_RENDER_BUFFER_H_
-#define MODULES_AUDIO_PROCESSING_AEC3_DOWNSAMPLED_RENDER_BUFFER_H_
-
-#include <stddef.h>
-#include <vector>
-
-#include "rtc_base/checks.h"
-
-namespace webrtc {
-
-// Holds the circular buffer of the downsampled render data.
-struct DownsampledRenderBuffer {
-  explicit DownsampledRenderBuffer(size_t downsampled_buffer_size);
-  ~DownsampledRenderBuffer();
-
-  int IncIndex(int index) const {
-    RTC_DCHECK_EQ(buffer.size(), static_cast<size_t>(size));
-    return index < size - 1 ? index + 1 : 0;
-  }
-
-  int DecIndex(int index) const {
-    RTC_DCHECK_EQ(buffer.size(), static_cast<size_t>(size));
-    return index > 0 ? index - 1 : size - 1;
-  }
-
-  int OffsetIndex(int index, int offset) const {
-    RTC_DCHECK_GE(buffer.size(), offset);
-    RTC_DCHECK_EQ(buffer.size(), static_cast<size_t>(size));
-    return (size + index + offset) % size;
-  }
-
-  void UpdateWriteIndex(int offset) { write = OffsetIndex(write, offset); }
-  void IncWriteIndex() { write = IncIndex(write); }
-  void DecWriteIndex() { write = DecIndex(write); }
-  void UpdateReadIndex(int offset) { read = OffsetIndex(read, offset); }
-  void IncReadIndex() { read = IncIndex(read); }
-  void DecReadIndex() { read = DecIndex(read); }
-
-  const int size;
-  std::vector<float> buffer;
-  int write = 0;
-  int read = 0;
-};
-
-}  // namespace webrtc
-
-#endif  // MODULES_AUDIO_PROCESSING_AEC3_DOWNSAMPLED_RENDER_BUFFER_H_
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/echo_audibility.cc b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/echo_audibility.cc
deleted file mode 100644
index e857a7e45a..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/echo_audibility.cc
+++ /dev/null
@@ -1,113 +0,0 @@
-/*
- *  Copyright (c) 2018 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#include "modules/audio_processing/aec3/echo_audibility.h"
-
-#include <algorithm>
-#include <cmath>
-#include <utility>
-#include <vector>
-
-#include "api/array_view.h"
-#include "modules/audio_processing/aec3/matrix_buffer.h"
-#include "modules/audio_processing/aec3/stationarity_estimator.h"
-#include "modules/audio_processing/aec3/vector_buffer.h"
-
-namespace webrtc {
-
-EchoAudibility::EchoAudibility(bool use_render_stationarity_at_init)
-    : use_render_stationarity_at_init_(use_render_stationarity_at_init) {
-  Reset();
-}
-
-EchoAudibility::~EchoAudibility() = default;
-
-void EchoAudibility::Update(
-    const RenderBuffer& render_buffer,
-    rtc::ArrayView<const float> render_reverb_contribution_spectrum,
-    int delay_blocks,
-    bool external_delay_seen) {
-  UpdateRenderNoiseEstimator(render_buffer.GetSpectrumBuffer(),
-                             render_buffer.GetBlockBuffer(),
-                             external_delay_seen);
-
-  if (external_delay_seen || use_render_stationarity_at_init_) {
-    UpdateRenderStationarityFlags(
-        render_buffer, render_reverb_contribution_spectrum, delay_blocks);
-  }
-}
-
-void EchoAudibility::Reset() {
-  render_stationarity_.Reset();
-  non_zero_render_seen_ = false;
-  render_spectrum_write_prev_ = absl::nullopt;
-}
-
-void EchoAudibility::UpdateRenderStationarityFlags(
-    const RenderBuffer& render_buffer,
-    rtc::ArrayView<const float> render_reverb_contribution_spectrum,
-    int delay_blocks) {
-  const VectorBuffer& spectrum_buffer = render_buffer.GetSpectrumBuffer();
-  int idx_at_delay =
-      spectrum_buffer.OffsetIndex(spectrum_buffer.read, delay_blocks);
-
-  int num_lookahead = render_buffer.Headroom() - delay_blocks + 1;
-  num_lookahead = std::max(0, num_lookahead);
-
-  render_stationarity_.UpdateStationarityFlags(
-      spectrum_buffer, render_reverb_contribution_spectrum, idx_at_delay,
-      num_lookahead);
-}
-
-void EchoAudibility::UpdateRenderNoiseEstimator(
-    const VectorBuffer& spectrum_buffer,
-    const MatrixBuffer& block_buffer,
-    bool external_delay_seen) {
-  if (!render_spectrum_write_prev_) {
-    render_spectrum_write_prev_ = spectrum_buffer.write;
-    render_block_write_prev_ = block_buffer.write;
-    return;
-  }
-  int render_spectrum_write_current = spectrum_buffer.write;
-  if (!non_zero_render_seen_ && !external_delay_seen) {
-    non_zero_render_seen_ = !IsRenderTooLow(block_buffer);
-  }
-  if (non_zero_render_seen_) {
-    for (int idx = render_spectrum_write_prev_.value();
-         idx != render_spectrum_write_current;
-         idx = spectrum_buffer.DecIndex(idx)) {
-      render_stationarity_.UpdateNoiseEstimator(spectrum_buffer.buffer[idx]);
-    }
-  }
-  render_spectrum_write_prev_ = render_spectrum_write_current;
-}
-
-bool EchoAudibility::IsRenderTooLow(const MatrixBuffer& block_buffer) {
-  bool too_low = false;
-  const int render_block_write_current = block_buffer.write;
-  if (render_block_write_current == render_block_write_prev_) {
-    too_low = true;
-  } else {
-    for (int idx = render_block_write_prev_; idx != render_block_write_current;
-         idx = block_buffer.IncIndex(idx)) {
-      auto block = block_buffer.buffer[idx][0];
-      auto r = std::minmax_element(block.cbegin(), block.cend());
-      float max_abs = std::max(std::fabs(*r.first), std::fabs(*r.second));
-      if (max_abs < 10) {
-        too_low = true;  // Discards all blocks if one of them is too low.
-        break;
-      }
-    }
-  }
-  render_block_write_prev_ = render_block_write_current;
-  return too_low;
-}
-
-}  // namespace webrtc
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/echo_audibility.h b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/echo_audibility.h
deleted file mode 100644
index b903ca0cf1..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/echo_audibility.h
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- *  Copyright (c) 2018 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#ifndef MODULES_AUDIO_PROCESSING_AEC3_ECHO_AUDIBILITY_H_
-#define MODULES_AUDIO_PROCESSING_AEC3_ECHO_AUDIBILITY_H_
-
-#include <stddef.h>
-
-#include "absl/types/optional.h"
-#include "api/array_view.h"
-#include "modules/audio_processing/aec3/matrix_buffer.h"
-#include "modules/audio_processing/aec3/render_buffer.h"
-#include "modules/audio_processing/aec3/stationarity_estimator.h"
-#include "modules/audio_processing/aec3/vector_buffer.h"
-#include "rtc_base/constructormagic.h"
-
-namespace webrtc {
-
-class EchoAudibility {
- public:
-  explicit EchoAudibility(bool use_render_stationarity_at_init);
-  ~EchoAudibility();
-
-  // Feed new render data to the echo audibility estimator.
-  void Update(const RenderBuffer& render_buffer,
-              rtc::ArrayView<const float> render_reverb_contribution_spectrum,
-              int delay_blocks,
-              bool external_delay_seen);
-  // Get the residual echo scaling.
-  void GetResidualEchoScaling(bool filter_has_had_time_to_converge,
-                              rtc::ArrayView<float> residual_scaling) const {
-    for (size_t band = 0; band < residual_scaling.size(); ++band) {
-      if (render_stationarity_.IsBandStationary(band) &&
-          filter_has_had_time_to_converge) {
-        residual_scaling[band] = 0.f;
-      } else {
-        residual_scaling[band] = 1.0f;
-      }
-    }
-  }
-
-  // Returns true if the current render block is estimated as stationary.
-  bool IsBlockStationary() const {
-    return render_stationarity_.IsBlockStationary();
-  }
-
- private:
-  // Reset the EchoAudibility class.
-  void Reset();
-
-  // Updates the render stationarity flags for the current frame.
-  void UpdateRenderStationarityFlags(
-      const RenderBuffer& render_buffer,
-      rtc::ArrayView<const float> render_reverb_contribution_spectrum,
-      int delay_blocks);
-
-  // Updates the noise estimator with the new render data since the previous
-  // call to this method.
-  void UpdateRenderNoiseEstimator(const VectorBuffer& spectrum_buffer,
-                                  const MatrixBuffer& block_buffer,
-                                  bool external_delay_seen);
-
-  // Returns a bool being true if the render signal contains just close to zero
-  // values.
-  bool IsRenderTooLow(const MatrixBuffer& block_buffer);
-
-  absl::optional<int> render_spectrum_write_prev_;
-  int render_block_write_prev_;
-  bool non_zero_render_seen_;
-  const bool use_render_stationarity_at_init_;
-  StationarityEstimator render_stationarity_;
-  RTC_DISALLOW_COPY_AND_ASSIGN(EchoAudibility);
-};
-
-}  // namespace webrtc
-
-#endif  // MODULES_AUDIO_PROCESSING_AEC3_ECHO_AUDIBILITY_H_
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/echo_canceller3.cc b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/echo_canceller3.cc
deleted file mode 100644
index c7e2de3340..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/echo_canceller3.cc
+++ /dev/null
@@ -1,519 +0,0 @@
-/*
- *  Copyright (c) 2016 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-#include "modules/audio_processing/aec3/echo_canceller3.h"
-
-#include <algorithm>
-#include <utility>
-
-#include "modules/audio_processing/aec3/aec3_common.h"
-#include "modules/audio_processing/logging/apm_data_dumper.h"
-#include "rtc_base/atomicops.h"
-#include "system_wrappers/include/field_trial.h"
-
-namespace webrtc {
-
-namespace {
-
-enum class EchoCanceller3ApiCall { kCapture, kRender };
-
-bool DetectSaturation(rtc::ArrayView<const float> y) {
-  for (auto y_k : y) {
-    if (y_k >= 32700.0f || y_k <= -32700.0f) {
-      return true;
-    }
-  }
-  return false;
-}
-
-bool UseShortDelayEstimatorWindow() {
-  return field_trial::IsEnabled("WebRTC-Aec3UseShortDelayEstimatorWindow");
-}
-
-bool EnableReverbBasedOnRender() {
-  return !field_trial::IsEnabled("WebRTC-Aec3ReverbBasedOnRenderKillSwitch");
-}
-
-bool EnableReverbModelling() {
-  return !field_trial::IsEnabled("WebRTC-Aec3ReverbModellingKillSwitch");
-}
-
-bool EnableUnityInitialRampupGain() {
-  return field_trial::IsEnabled("WebRTC-Aec3EnableUnityInitialRampupGain");
-}
-
-bool EnableUnityNonZeroRampupGain() {
-  return field_trial::IsEnabled("WebRTC-Aec3EnableUnityNonZeroRampupGain");
-}
-
-bool EnableLongReverb() {
-  return field_trial::IsEnabled("WebRTC-Aec3ShortReverbKillSwitch");
-}
-
-bool EnableNewFilterParams() {
-  return !field_trial::IsEnabled("WebRTC-Aec3NewFilterParamsKillSwitch");
-}
-
-bool EnableLegacyDominantNearend() {
-  return field_trial::IsEnabled("WebRTC-Aec3EnableLegacyDominantNearend");
-}
-
-bool UseLegacyNormalSuppressorTuning() {
-  return field_trial::IsEnabled("WebRTC-Aec3UseLegacyNormalSuppressorTuning");
-}
-
-bool ActivateStationarityProperties() {
-  return field_trial::IsEnabled("WebRTC-Aec3UseStationarityProperties");
-}
-
-bool ActivateStationarityPropertiesAtInit() {
-  return field_trial::IsEnabled("WebRTC-Aec3UseStationarityPropertiesAtInit");
-}
-
-bool EnableNewRenderBuffering() {
-  return !field_trial::IsEnabled("WebRTC-Aec3NewRenderBufferingKillSwitch");
-}
-
-bool UseEarlyDelayDetection() {
-  return !field_trial::IsEnabled("WebRTC-Aec3EarlyDelayDetectionKillSwitch");
-}
-
-// Method for adjusting config parameter dependencies..
-EchoCanceller3Config AdjustConfig(const EchoCanceller3Config& config) {
-  EchoCanceller3Config adjusted_cfg = config;
-  const EchoCanceller3Config default_cfg;
-
-  if (!EnableReverbModelling()) {
-    adjusted_cfg.ep_strength.default_len = 0.f;
-  }
-
-  if (UseShortDelayEstimatorWindow()) {
-    adjusted_cfg.delay.num_filters =
-        std::min(adjusted_cfg.delay.num_filters, static_cast<size_t>(5));
-  }
-
-  bool use_new_render_buffering =
-      EnableNewRenderBuffering() && config.buffering.use_new_render_buffering;
-  // Old render buffering needs one more filter to cover the same delay.
-  if (!use_new_render_buffering) {
-    adjusted_cfg.delay.num_filters += 1;
-  }
-
-  if (EnableReverbBasedOnRender() == false) {
-    adjusted_cfg.ep_strength.reverb_based_on_render = false;
-  }
-
-  if (!EnableNewFilterParams()) {
-    adjusted_cfg.filter.main.leakage_diverged = 0.01f;
-    adjusted_cfg.filter.main.error_floor = 0.1f;
-    adjusted_cfg.filter.main.error_ceil = 1E10f;
-    adjusted_cfg.filter.main_initial.error_ceil = 1E10f;
-  }
-
-  if (EnableUnityInitialRampupGain() &&
-      adjusted_cfg.echo_removal_control.gain_rampup.initial_gain ==
-          default_cfg.echo_removal_control.gain_rampup.initial_gain) {
-    adjusted_cfg.echo_removal_control.gain_rampup.initial_gain = 1.f;
-  }
-
-  if (EnableUnityNonZeroRampupGain() &&
-      adjusted_cfg.echo_removal_control.gain_rampup.first_non_zero_gain ==
-          default_cfg.echo_removal_control.gain_rampup.first_non_zero_gain) {
-    adjusted_cfg.echo_removal_control.gain_rampup.first_non_zero_gain = 1.f;
-  }
-
-  if (EnableLongReverb()) {
-    adjusted_cfg.ep_strength.default_len = 0.88f;
-  }
-
-  if (EnableLegacyDominantNearend()) {
-    adjusted_cfg.suppressor.nearend_tuning =
-        EchoCanceller3Config::Suppressor::Tuning(
-            EchoCanceller3Config::Suppressor::MaskingThresholds(.2f, .3f, .3f),
-            EchoCanceller3Config::Suppressor::MaskingThresholds(.07f, .1f, .3f),
-            2.0f, 0.25f);
-  }
-
-  if (UseLegacyNormalSuppressorTuning()) {
-    adjusted_cfg.suppressor.normal_tuning =
-        EchoCanceller3Config::Suppressor::Tuning(
-            EchoCanceller3Config::Suppressor::MaskingThresholds(.2f, .3f, .3f),
-            EchoCanceller3Config::Suppressor::MaskingThresholds(.07f, .1f, .3f),
-            2.0f, 0.25f);
-
-    adjusted_cfg.suppressor.dominant_nearend_detection.enr_threshold = 10.f;
-    adjusted_cfg.suppressor.dominant_nearend_detection.snr_threshold = 10.f;
-    adjusted_cfg.suppressor.dominant_nearend_detection.hold_duration = 25;
-  }
-
-  if (ActivateStationarityProperties()) {
-    adjusted_cfg.echo_audibility.use_stationary_properties = true;
-  }
-
-  if (ActivateStationarityPropertiesAtInit()) {
-    adjusted_cfg.echo_audibility.use_stationarity_properties_at_init = true;
-  }
-
-  if (!UseEarlyDelayDetection()) {
-    adjusted_cfg.delay.delay_selection_thresholds = {25, 25};
-  }
-
-  return adjusted_cfg;
-}
-
-void FillSubFrameView(AudioBuffer* frame,
-                      size_t sub_frame_index,
-                      std::vector<rtc::ArrayView<float>>* sub_frame_view) {
-  RTC_DCHECK_GE(1, sub_frame_index);
-  RTC_DCHECK_LE(0, sub_frame_index);
-  RTC_DCHECK_EQ(frame->num_bands(), sub_frame_view->size());
-  for (size_t k = 0; k < sub_frame_view->size(); ++k) {
-    (*sub_frame_view)[k] = rtc::ArrayView<float>(
-        &frame->split_bands_f(0)[k][sub_frame_index * kSubFrameLength],
-        kSubFrameLength);
-  }
-}
-
-void FillSubFrameView(std::vector<std::vector<float>>* frame,
-                      size_t sub_frame_index,
-                      std::vector<rtc::ArrayView<float>>* sub_frame_view) {
-  RTC_DCHECK_GE(1, sub_frame_index);
-  RTC_DCHECK_EQ(frame->size(), sub_frame_view->size());
-  for (size_t k = 0; k < frame->size(); ++k) {
-    (*sub_frame_view)[k] = rtc::ArrayView<float>(
-        &(*frame)[k][sub_frame_index * kSubFrameLength], kSubFrameLength);
-  }
-}
-
-void ProcessCaptureFrameContent(
-    AudioBuffer* capture,
-    bool level_change,
-    bool saturated_microphone_signal,
-    size_t sub_frame_index,
-    FrameBlocker* capture_blocker,
-    BlockFramer* output_framer,
-    BlockProcessor* block_processor,
-    std::vector<std::vector<float>>* block,
-    std::vector<rtc::ArrayView<float>>* sub_frame_view) {
-  FillSubFrameView(capture, sub_frame_index, sub_frame_view);
-  capture_blocker->InsertSubFrameAndExtractBlock(*sub_frame_view, block);
-  block_processor->ProcessCapture(level_change, saturated_microphone_signal,
-                                  block);
-  output_framer->InsertBlockAndExtractSubFrame(*block, sub_frame_view);
-}
-
-void ProcessRemainingCaptureFrameContent(
-    bool level_change,
-    bool saturated_microphone_signal,
-    FrameBlocker* capture_blocker,
-    BlockFramer* output_framer,
-    BlockProcessor* block_processor,
-    std::vector<std::vector<float>>* block) {
-  if (!capture_blocker->IsBlockAvailable()) {
-    return;
-  }
-
-  capture_blocker->ExtractBlock(block);
-  block_processor->ProcessCapture(level_change, saturated_microphone_signal,
-                                  block);
-  output_framer->InsertBlock(*block);
-}
-
-void BufferRenderFrameContent(
-    std::vector<std::vector<float>>* render_frame,
-    size_t sub_frame_index,
-    FrameBlocker* render_blocker,
-    BlockProcessor* block_processor,
-    std::vector<std::vector<float>>* block,
-    std::vector<rtc::ArrayView<float>>* sub_frame_view) {
-  FillSubFrameView(render_frame, sub_frame_index, sub_frame_view);
-  render_blocker->InsertSubFrameAndExtractBlock(*sub_frame_view, block);
-  block_processor->BufferRender(*block);
-}
-
-void BufferRemainingRenderFrameContent(FrameBlocker* render_blocker,
-                                       BlockProcessor* block_processor,
-                                       std::vector<std::vector<float>>* block) {
-  if (!render_blocker->IsBlockAvailable()) {
-    return;
-  }
-  render_blocker->ExtractBlock(block);
-  block_processor->BufferRender(*block);
-}
-
-void CopyBufferIntoFrame(AudioBuffer* buffer,
-                         size_t num_bands,
-                         size_t frame_length,
-                         std::vector<std::vector<float>>* frame) {
-  RTC_DCHECK_EQ(num_bands, frame->size());
-  RTC_DCHECK_EQ(frame_length, (*frame)[0].size());
-  for (size_t k = 0; k < num_bands; ++k) {
-    rtc::ArrayView<float> buffer_view(&buffer->split_bands_f(0)[k][0],
-                                      frame_length);
-    std::copy(buffer_view.begin(), buffer_view.end(), (*frame)[k].begin());
-  }
-}
-
-// [B,A] = butter(2,100/4000,'high')
-const CascadedBiQuadFilter::BiQuadCoefficients
-    kHighPassFilterCoefficients_8kHz = {{0.94598f, -1.89195f, 0.94598f},
-                                        {-1.88903f, 0.89487f}};
-const int kNumberOfHighPassBiQuads_8kHz = 1;
-
-// [B,A] = butter(2,100/8000,'high')
-const CascadedBiQuadFilter::BiQuadCoefficients
-    kHighPassFilterCoefficients_16kHz = {{0.97261f, -1.94523f, 0.97261f},
-                                         {-1.94448f, 0.94598f}};
-const int kNumberOfHighPassBiQuads_16kHz = 1;
-
-}  // namespace
-
-class EchoCanceller3::RenderWriter {
- public:
-  RenderWriter(ApmDataDumper* data_dumper,
-               SwapQueue<std::vector<std::vector<float>>,
-                         Aec3RenderQueueItemVerifier>* render_transfer_queue,
-               std::unique_ptr<CascadedBiQuadFilter> render_highpass_filter,
-               int sample_rate_hz,
-               int frame_length,
-               int num_bands);
-  ~RenderWriter();
-  void Insert(AudioBuffer* input);
-
- private:
-  ApmDataDumper* data_dumper_;
-  const int sample_rate_hz_;
-  const size_t frame_length_;
-  const int num_bands_;
-  std::unique_ptr<CascadedBiQuadFilter> render_highpass_filter_;
-  std::vector<std::vector<float>> render_queue_input_frame_;
-  SwapQueue<std::vector<std::vector<float>>, Aec3RenderQueueItemVerifier>*
-      render_transfer_queue_;
-  RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(RenderWriter);
-};
-
-EchoCanceller3::RenderWriter::RenderWriter(
-    ApmDataDumper* data_dumper,
-    SwapQueue<std::vector<std::vector<float>>, Aec3RenderQueueItemVerifier>*
-        render_transfer_queue,
-    std::unique_ptr<CascadedBiQuadFilter> render_highpass_filter,
-    int sample_rate_hz,
-    int frame_length,
-    int num_bands)
-    : data_dumper_(data_dumper),
-      sample_rate_hz_(sample_rate_hz),
-      frame_length_(frame_length),
-      num_bands_(num_bands),
-      render_highpass_filter_(std::move(render_highpass_filter)),
-      render_queue_input_frame_(num_bands_,
-                                std::vector<float>(frame_length_, 0.f)),
-      render_transfer_queue_(render_transfer_queue) {
-  RTC_DCHECK(data_dumper);
-}
-
-EchoCanceller3::RenderWriter::~RenderWriter() = default;
-
-void EchoCanceller3::RenderWriter::Insert(AudioBuffer* input) {
-  RTC_DCHECK_EQ(1, input->num_channels());
-  RTC_DCHECK_EQ(frame_length_, input->num_frames_per_band());
-  RTC_DCHECK_EQ(num_bands_, input->num_bands());
-
-  // TODO(bugs.webrtc.org/8759) Temporary work-around.
-  if (num_bands_ != static_cast<int>(input->num_bands()))
-    return;
-
-  data_dumper_->DumpWav("aec3_render_input", frame_length_,
-                        &input->split_bands_f(0)[0][0],
-                        LowestBandRate(sample_rate_hz_), 1);
-
-  CopyBufferIntoFrame(input, num_bands_, frame_length_,
-                      &render_queue_input_frame_);
-
-  if (render_highpass_filter_) {
-    render_highpass_filter_->Process(render_queue_input_frame_[0]);
-  }
-
-  static_cast<void>(render_transfer_queue_->Insert(&render_queue_input_frame_));
-}
-
-int EchoCanceller3::instance_count_ = 0;
-
-EchoCanceller3::EchoCanceller3(const EchoCanceller3Config& config,
-                               int sample_rate_hz,
-                               bool use_highpass_filter)
-    : EchoCanceller3(AdjustConfig(config),
-                     sample_rate_hz,
-                     use_highpass_filter,
-                     std::unique_ptr<BlockProcessor>(
-                         EnableNewRenderBuffering() &&
-                                 config.buffering.use_new_render_buffering
-                             ? BlockProcessor::Create2(AdjustConfig(config),
-                                                       sample_rate_hz)
-                             : BlockProcessor::Create(AdjustConfig(config),
-                                                      sample_rate_hz))) {}
-EchoCanceller3::EchoCanceller3(const EchoCanceller3Config& config,
-                               int sample_rate_hz,
-                               bool use_highpass_filter,
-                               std::unique_ptr<BlockProcessor> block_processor)
-    : data_dumper_(
-          new ApmDataDumper(rtc::AtomicOps::Increment(&instance_count_))),
-      config_(config),
-      sample_rate_hz_(sample_rate_hz),
-      num_bands_(NumBandsForRate(sample_rate_hz_)),
-      frame_length_(rtc::CheckedDivExact(LowestBandRate(sample_rate_hz_), 100)),
-      output_framer_(num_bands_),
-      capture_blocker_(num_bands_),
-      render_blocker_(num_bands_),
-      render_transfer_queue_(
-          kRenderTransferQueueSizeFrames,
-          std::vector<std::vector<float>>(
-              num_bands_,
-              std::vector<float>(frame_length_, 0.f)),
-          Aec3RenderQueueItemVerifier(num_bands_, frame_length_)),
-      block_processor_(std::move(block_processor)),
-      render_queue_output_frame_(num_bands_,
-                                 std::vector<float>(frame_length_, 0.f)),
-      block_(num_bands_, std::vector<float>(kBlockSize, 0.f)),
-      sub_frame_view_(num_bands_),
-      block_delay_buffer_(num_bands_,
-                          frame_length_,
-                          config_.delay.fixed_capture_delay_samples) {
-  RTC_DCHECK(ValidFullBandRate(sample_rate_hz_));
-
-  std::unique_ptr<CascadedBiQuadFilter> render_highpass_filter;
-  if (use_highpass_filter) {
-    render_highpass_filter.reset(new CascadedBiQuadFilter(
-        sample_rate_hz_ == 8000 ? kHighPassFilterCoefficients_8kHz
-                                : kHighPassFilterCoefficients_16kHz,
-        sample_rate_hz_ == 8000 ? kNumberOfHighPassBiQuads_8kHz
-                                : kNumberOfHighPassBiQuads_16kHz));
-    capture_highpass_filter_.reset(new CascadedBiQuadFilter(
-        sample_rate_hz_ == 8000 ? kHighPassFilterCoefficients_8kHz
-                                : kHighPassFilterCoefficients_16kHz,
-        sample_rate_hz_ == 8000 ? kNumberOfHighPassBiQuads_8kHz
-                                : kNumberOfHighPassBiQuads_16kHz));
-  }
-
-  render_writer_.reset(
-      new RenderWriter(data_dumper_.get(), &render_transfer_queue_,
-                       std::move(render_highpass_filter), sample_rate_hz_,
-                       frame_length_, num_bands_));
-
-  RTC_DCHECK_EQ(num_bands_, std::max(sample_rate_hz_, 16000) / 16000);
-  RTC_DCHECK_GE(kMaxNumBands, num_bands_);
-}
-
-EchoCanceller3::~EchoCanceller3() = default;
-
-void EchoCanceller3::AnalyzeRender(AudioBuffer* render) {
-  RTC_DCHECK_RUNS_SERIALIZED(&render_race_checker_);
-  RTC_DCHECK(render);
-  data_dumper_->DumpRaw("aec3_call_order",
-                        static_cast<int>(EchoCanceller3ApiCall::kRender));
-
-  return render_writer_->Insert(render);
-}
-
-void EchoCanceller3::AnalyzeCapture(AudioBuffer* capture) {
-  RTC_DCHECK_RUNS_SERIALIZED(&capture_race_checker_);
-  RTC_DCHECK(capture);
-  data_dumper_->DumpWav("aec3_capture_analyze_input", capture->num_frames(),
-                        capture->channels_f()[0], sample_rate_hz_, 1);
-
-  saturated_microphone_signal_ = false;
-  for (size_t k = 0; k < capture->num_channels(); ++k) {
-    saturated_microphone_signal_ |=
-        DetectSaturation(rtc::ArrayView<const float>(capture->channels_f()[k],
-                                                     capture->num_frames()));
-    if (saturated_microphone_signal_) {
-      break;
-    }
-  }
-}
-
-void EchoCanceller3::ProcessCapture(AudioBuffer* capture, bool level_change) {
-  RTC_DCHECK_RUNS_SERIALIZED(&capture_race_checker_);
-  RTC_DCHECK(capture);
-  RTC_DCHECK_EQ(1u, capture->num_channels());
-  RTC_DCHECK_EQ(num_bands_, capture->num_bands());
-  RTC_DCHECK_EQ(frame_length_, capture->num_frames_per_band());
-  data_dumper_->DumpRaw("aec3_call_order",
-                        static_cast<int>(EchoCanceller3ApiCall::kCapture));
-
-  // Optionally delay the capture signal.
-  if (config_.delay.fixed_capture_delay_samples > 0) {
-    block_delay_buffer_.DelaySignal(capture);
-  }
-
-  rtc::ArrayView<float> capture_lower_band =
-      rtc::ArrayView<float>(&capture->split_bands_f(0)[0][0], frame_length_);
-
-  data_dumper_->DumpWav("aec3_capture_input", capture_lower_band,
-                        LowestBandRate(sample_rate_hz_), 1);
-
-  EmptyRenderQueue();
-
-  if (capture_highpass_filter_) {
-    capture_highpass_filter_->Process(capture_lower_band);
-  }
-
-  ProcessCaptureFrameContent(
-      capture, level_change, saturated_microphone_signal_, 0, &capture_blocker_,
-      &output_framer_, block_processor_.get(), &block_, &sub_frame_view_);
-
-  if (sample_rate_hz_ != 8000) {
-    ProcessCaptureFrameContent(
-        capture, level_change, saturated_microphone_signal_, 1,
-        &capture_blocker_, &output_framer_, block_processor_.get(), &block_,
-        &sub_frame_view_);
-  }
-
-  ProcessRemainingCaptureFrameContent(
-      level_change, saturated_microphone_signal_, &capture_blocker_,
-      &output_framer_, block_processor_.get(), &block_);
-
-  data_dumper_->DumpWav("aec3_capture_output", frame_length_,
-                        &capture->split_bands_f(0)[0][0],
-                        LowestBandRate(sample_rate_hz_), 1);
-}
-
-EchoControl::Metrics EchoCanceller3::GetMetrics() const {
-  RTC_DCHECK_RUNS_SERIALIZED(&capture_race_checker_);
-  Metrics metrics;
-  block_processor_->GetMetrics(&metrics);
-  return metrics;
-}
-
-void EchoCanceller3::SetAudioBufferDelay(size_t delay_ms) {
-  RTC_DCHECK_RUNS_SERIALIZED(&capture_race_checker_);
-  block_processor_->SetAudioBufferDelay(delay_ms);
-}
-
-void EchoCanceller3::EmptyRenderQueue() {
-  RTC_DCHECK_RUNS_SERIALIZED(&capture_race_checker_);
-  bool frame_to_buffer =
-      render_transfer_queue_.Remove(&render_queue_output_frame_);
-  while (frame_to_buffer) {
-    BufferRenderFrameContent(&render_queue_output_frame_, 0, &render_blocker_,
-                             block_processor_.get(), &block_, &sub_frame_view_);
-
-    if (sample_rate_hz_ != 8000) {
-      BufferRenderFrameContent(&render_queue_output_frame_, 1, &render_blocker_,
-                               block_processor_.get(), &block_,
-                               &sub_frame_view_);
-    }
-
-    BufferRemainingRenderFrameContent(&render_blocker_, block_processor_.get(),
-                                      &block_);
-
-    frame_to_buffer =
-        render_transfer_queue_.Remove(&render_queue_output_frame_);
-  }
-}
-}  // namespace webrtc
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/echo_canceller3.h b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/echo_canceller3.h
deleted file mode 100644
index 0d07702c84..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/echo_canceller3.h
+++ /dev/null
@@ -1,148 +0,0 @@
-/*
- *  Copyright (c) 2016 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#ifndef MODULES_AUDIO_PROCESSING_AEC3_ECHO_CANCELLER3_H_
-#define MODULES_AUDIO_PROCESSING_AEC3_ECHO_CANCELLER3_H_
-
-#include <stddef.h>
-#include <memory>
-#include <vector>
-
-#include "api/array_view.h"
-#include "api/audio/echo_canceller3_config.h"
-#include "api/audio/echo_control.h"
-#include "modules/audio_processing/aec3/block_delay_buffer.h"
-#include "modules/audio_processing/aec3/block_framer.h"
-#include "modules/audio_processing/aec3/block_processor.h"
-#include "modules/audio_processing/aec3/cascaded_biquad_filter.h"
-#include "modules/audio_processing/aec3/frame_blocker.h"
-#include "modules/audio_processing/audio_buffer.h"
-#include "modules/audio_processing/logging/apm_data_dumper.h"
-#include "rtc_base/checks.h"
-#include "rtc_base/constructormagic.h"
-#include "rtc_base/race_checker.h"
-#include "rtc_base/swap_queue.h"
-#include "rtc_base/thread_annotations.h"
-
-namespace webrtc {
-
-// Functor for verifying the invariance of the frames being put into the render
-// queue.
-class Aec3RenderQueueItemVerifier {
- public:
-  explicit Aec3RenderQueueItemVerifier(size_t num_bands, size_t frame_length)
-      : num_bands_(num_bands), frame_length_(frame_length) {}
-
-  bool operator()(const std::vector<std::vector<float>>& v) const {
-    if (v.size() != num_bands_) {
-      return false;
-    }
-    for (const auto& v_k : v) {
-      if (v_k.size() != frame_length_) {
-        return false;
-      }
-    }
-    return true;
-  }
-
- private:
-  const size_t num_bands_;
-  const size_t frame_length_;
-};
-
-// Main class for the echo canceller3.
-// It does 4 things:
-// -Receives 10 ms frames of band-split audio.
-// -Optionally applies an anti-hum (high-pass) filter on the
-// received signals.
-// -Provides the lower level echo canceller functionality with
-// blocks of 64 samples of audio data.
-// -Partially handles the jitter in the render and capture API
-// call sequence.
-//
-// The class is supposed to be used in a non-concurrent manner apart from the
-// AnalyzeRender call which can be called concurrently with the other methods.
-class EchoCanceller3 : public EchoControl {
- public:
-  // Normal c-tor to use.
-  EchoCanceller3(const EchoCanceller3Config& config,
-                 int sample_rate_hz,
-                 bool use_highpass_filter);
-  // Testing c-tor that is used only for testing purposes.
-  EchoCanceller3(const EchoCanceller3Config& config,
-                 int sample_rate_hz,
-                 bool use_highpass_filter,
-                 std::unique_ptr<BlockProcessor> block_processor);
-  ~EchoCanceller3() override;
-  // Analyzes and stores an internal copy of the split-band domain render
-  // signal.
-  void AnalyzeRender(AudioBuffer* farend) override;
-  // Analyzes the full-band domain capture signal to detect signal saturation.
-  void AnalyzeCapture(AudioBuffer* capture) override;
-  // Processes the split-band domain capture signal in order to remove any echo
-  // present in the signal.
-  void ProcessCapture(AudioBuffer* capture, bool level_change) override;
-  // Collect current metrics from the echo canceller.
-  Metrics GetMetrics() const override;
-  // Provides an optional external estimate of the audio buffer delay.
-  void SetAudioBufferDelay(size_t delay_ms) override;
-
-  // Signals whether an external detector has detected echo leakage from the
-  // echo canceller.
-  // Note that in the case echo leakage has been flagged, it should be unflagged
-  // once it is no longer occurring.
-  void UpdateEchoLeakageStatus(bool leakage_detected) {
-    RTC_DCHECK_RUNS_SERIALIZED(&capture_race_checker_);
-    block_processor_->UpdateEchoLeakageStatus(leakage_detected);
-  }
-
- private:
-  class RenderWriter;
-
-  // Empties the render SwapQueue.
-  void EmptyRenderQueue();
-
-  rtc::RaceChecker capture_race_checker_;
-  rtc::RaceChecker render_race_checker_;
-
-  // State that is accessed by the AnalyzeRender call.
-  std::unique_ptr<RenderWriter> render_writer_
-      RTC_GUARDED_BY(render_race_checker_);
-
-  // State that may be accessed by the capture thread.
-  static int instance_count_;
-  std::unique_ptr<ApmDataDumper> data_dumper_;
-  const EchoCanceller3Config config_;
-  const int sample_rate_hz_;
-  const int num_bands_;
-  const size_t frame_length_;
-  BlockFramer output_framer_ RTC_GUARDED_BY(capture_race_checker_);
-  FrameBlocker capture_blocker_ RTC_GUARDED_BY(capture_race_checker_);
-  FrameBlocker render_blocker_ RTC_GUARDED_BY(capture_race_checker_);
-  SwapQueue<std::vector<std::vector<float>>, Aec3RenderQueueItemVerifier>
-      render_transfer_queue_;
-  std::unique_ptr<BlockProcessor> block_processor_
-      RTC_GUARDED_BY(capture_race_checker_);
-  std::vector<std::vector<float>> render_queue_output_frame_
-      RTC_GUARDED_BY(capture_race_checker_);
-  std::unique_ptr<CascadedBiQuadFilter> capture_highpass_filter_
-      RTC_GUARDED_BY(capture_race_checker_);
-  bool saturated_microphone_signal_ RTC_GUARDED_BY(capture_race_checker_) =
-      false;
-  std::vector<std::vector<float>> block_ RTC_GUARDED_BY(capture_race_checker_);
-  std::vector<rtc::ArrayView<float>> sub_frame_view_
-      RTC_GUARDED_BY(capture_race_checker_);
-  BlockDelayBuffer block_delay_buffer_ RTC_GUARDED_BY(capture_race_checker_);
-
-  RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(EchoCanceller3);
-};
-}  // namespace webrtc
-
-#endif  // MODULES_AUDIO_PROCESSING_AEC3_ECHO_CANCELLER3_H_
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/echo_path_delay_estimator.cc b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/echo_path_delay_estimator.cc
deleted file mode 100644
index 5c838aed8a..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/echo_path_delay_estimator.cc
+++ /dev/null
@@ -1,116 +0,0 @@
-/*
- *  Copyright (c) 2017 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-#include "modules/audio_processing/aec3/echo_path_delay_estimator.h"
-
-#include <array>
-
-#include "api/audio/echo_canceller3_config.h"
-#include "modules/audio_processing/aec3/aec3_common.h"
-#include "modules/audio_processing/aec3/downsampled_render_buffer.h"
-#include "modules/audio_processing/logging/apm_data_dumper.h"
-#include "rtc_base/checks.h"
-
-namespace webrtc {
-
-EchoPathDelayEstimator::EchoPathDelayEstimator(
-    ApmDataDumper* data_dumper,
-    const EchoCanceller3Config& config)
-    : data_dumper_(data_dumper),
-      down_sampling_factor_(config.delay.down_sampling_factor),
-      sub_block_size_(down_sampling_factor_ != 0
-                          ? kBlockSize / down_sampling_factor_
-                          : kBlockSize),
-      capture_decimator_(down_sampling_factor_),
-      matched_filter_(
-          data_dumper_,
-          DetectOptimization(),
-          sub_block_size_,
-          kMatchedFilterWindowSizeSubBlocks,
-          config.delay.num_filters,
-          kMatchedFilterAlignmentShiftSizeSubBlocks,
-          config.delay.down_sampling_factor == 8
-              ? config.render_levels.poor_excitation_render_limit_ds8
-              : config.render_levels.poor_excitation_render_limit,
-          config.delay.delay_estimate_smoothing,
-          config.delay.delay_candidate_detection_threshold),
-      matched_filter_lag_aggregator_(data_dumper_,
-                                     matched_filter_.GetMaxFilterLag(),
-                                     config.delay.delay_selection_thresholds) {
-  RTC_DCHECK(data_dumper);
-  RTC_DCHECK(down_sampling_factor_ > 0);
-}
-
-EchoPathDelayEstimator::~EchoPathDelayEstimator() = default;
-
-void EchoPathDelayEstimator::Reset(bool reset_delay_confidence) {
-  Reset(true, reset_delay_confidence);
-}
-
-absl::optional<DelayEstimate> EchoPathDelayEstimator::EstimateDelay(
-    const DownsampledRenderBuffer& render_buffer,
-    rtc::ArrayView<const float> capture) {
-  RTC_DCHECK_EQ(kBlockSize, capture.size());
-
-  std::array<float, kBlockSize> downsampled_capture_data;
-  rtc::ArrayView<float> downsampled_capture(downsampled_capture_data.data(),
-                                            sub_block_size_);
-  data_dumper_->DumpWav("aec3_capture_decimator_input", capture.size(),
-                        capture.data(), 16000, 1);
-  capture_decimator_.Decimate(capture, downsampled_capture);
-  data_dumper_->DumpWav("aec3_capture_decimator_output",
-                        downsampled_capture.size(), downsampled_capture.data(),
-                        16000 / down_sampling_factor_, 1);
-  matched_filter_.Update(render_buffer, downsampled_capture);
-
-  absl::optional<DelayEstimate> aggregated_matched_filter_lag =
-      matched_filter_lag_aggregator_.Aggregate(
-          matched_filter_.GetLagEstimates());
-
-  // TODO(peah): Move this logging outside of this class once EchoCanceller3
-  // development is done.
-  data_dumper_->DumpRaw(
-      "aec3_echo_path_delay_estimator_delay",
-      aggregated_matched_filter_lag
-          ? static_cast<int>(aggregated_matched_filter_lag->delay *
-                             down_sampling_factor_)
-          : -1);
-
-  // Return the detected delay in samples as the aggregated matched filter lag
-  // compensated by the down sampling factor for the signal being correlated.
-  if (aggregated_matched_filter_lag) {
-    aggregated_matched_filter_lag->delay *= down_sampling_factor_;
-  }
-
-  if (old_aggregated_lag_ && aggregated_matched_filter_lag &&
-      old_aggregated_lag_->delay == aggregated_matched_filter_lag->delay) {
-    ++consistent_estimate_counter_;
-  } else {
-    consistent_estimate_counter_ = 0;
-  }
-  old_aggregated_lag_ = aggregated_matched_filter_lag;
-  constexpr size_t kNumBlocksPerSecondBy2 = kNumBlocksPerSecond / 2;
-  if (consistent_estimate_counter_ > kNumBlocksPerSecondBy2) {
-    Reset(false, false);
-  }
-
-  return aggregated_matched_filter_lag;
-}
-
-void EchoPathDelayEstimator::Reset(bool reset_lag_aggregator,
-                                   bool reset_delay_confidence) {
-  if (reset_lag_aggregator) {
-    matched_filter_lag_aggregator_.Reset(reset_delay_confidence);
-  }
-  matched_filter_.Reset();
-  old_aggregated_lag_ = absl::nullopt;
-  consistent_estimate_counter_ = 0;
-}
-
-}  // namespace webrtc
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/echo_path_delay_estimator.h b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/echo_path_delay_estimator.h
deleted file mode 100644
index 060c8753bd..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/echo_path_delay_estimator.h
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- *  Copyright (c) 2017 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#ifndef MODULES_AUDIO_PROCESSING_AEC3_ECHO_PATH_DELAY_ESTIMATOR_H_
-#define MODULES_AUDIO_PROCESSING_AEC3_ECHO_PATH_DELAY_ESTIMATOR_H_
-
-#include <stddef.h>
-
-#include "absl/types/optional.h"
-#include "api/array_view.h"
-#include "modules/audio_processing/aec3/decimator.h"
-#include "modules/audio_processing/aec3/delay_estimate.h"
-#include "modules/audio_processing/aec3/matched_filter.h"
-#include "modules/audio_processing/aec3/matched_filter_lag_aggregator.h"
-#include "rtc_base/constructormagic.h"
-
-namespace webrtc {
-
-class ApmDataDumper;
-struct DownsampledRenderBuffer;
-struct EchoCanceller3Config;
-
-// Estimates the delay of the echo path.
-class EchoPathDelayEstimator {
- public:
-  EchoPathDelayEstimator(ApmDataDumper* data_dumper,
-                         const EchoCanceller3Config& config);
-  ~EchoPathDelayEstimator();
-
-  // Resets the estimation. If the delay confidence is reset, the reset behavior
-  // is as if the call is restarted.
-  void Reset(bool reset_delay_confidence);
-
-  // Produce a delay estimate if such is avaliable.
-  absl::optional<DelayEstimate> EstimateDelay(
-      const DownsampledRenderBuffer& render_buffer,
-      rtc::ArrayView<const float> capture);
-
-  // Log delay estimator properties.
-  void LogDelayEstimationProperties(int sample_rate_hz, size_t shift) const {
-    matched_filter_.LogFilterProperties(sample_rate_hz, shift,
-                                        down_sampling_factor_);
-  }
-
- private:
-  ApmDataDumper* const data_dumper_;
-  const size_t down_sampling_factor_;
-  const size_t sub_block_size_;
-  Decimator capture_decimator_;
-  MatchedFilter matched_filter_;
-  MatchedFilterLagAggregator matched_filter_lag_aggregator_;
-  absl::optional<DelayEstimate> old_aggregated_lag_;
-  size_t consistent_estimate_counter_ = 0;
-
-  // Internal reset method with more granularity.
-  void Reset(bool reset_lag_aggregator, bool reset_delay_confidence);
-
-  RTC_DISALLOW_COPY_AND_ASSIGN(EchoPathDelayEstimator);
-};
-}  // namespace webrtc
-
-#endif  // MODULES_AUDIO_PROCESSING_AEC3_ECHO_PATH_DELAY_ESTIMATOR_H_
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/echo_path_variability.cc b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/echo_path_variability.cc
deleted file mode 100644
index 0ae9cff98e..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/echo_path_variability.cc
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- *  Copyright (c) 2017 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#include "modules/audio_processing/aec3/echo_path_variability.h"
-
-namespace webrtc {
-
-EchoPathVariability::EchoPathVariability(bool gain_change,
-                                         DelayAdjustment delay_change,
-                                         bool clock_drift)
-    : gain_change(gain_change),
-      delay_change(delay_change),
-      clock_drift(clock_drift) {}
-
-}  // namespace webrtc
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/echo_path_variability.h b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/echo_path_variability.h
deleted file mode 100644
index adf0d7a4ad..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/echo_path_variability.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- *  Copyright (c) 2017 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#ifndef MODULES_AUDIO_PROCESSING_AEC3_ECHO_PATH_VARIABILITY_H_
-#define MODULES_AUDIO_PROCESSING_AEC3_ECHO_PATH_VARIABILITY_H_
-
-namespace webrtc {
-
-struct EchoPathVariability {
-  enum class DelayAdjustment {
-    kNone,
-    kBufferReadjustment,
-    kBufferFlush,
-    kDelayReset,
-    kNewDetectedDelay
-  };
-
-  EchoPathVariability(bool gain_change,
-                      DelayAdjustment delay_change,
-                      bool clock_drift);
-
-  bool AudioPathChanged() const {
-    return gain_change || delay_change != DelayAdjustment::kNone;
-  }
-  bool gain_change;
-  DelayAdjustment delay_change;
-  bool clock_drift;
-};
-
-}  // namespace webrtc
-
-#endif  // MODULES_AUDIO_PROCESSING_AEC3_ECHO_PATH_VARIABILITY_H_
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/echo_remover.cc b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/echo_remover.cc
deleted file mode 100644
index cfb7395199..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/echo_remover.cc
+++ /dev/null
@@ -1,422 +0,0 @@
-/*
- *  Copyright (c) 2017 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-#include "modules/audio_processing/aec3/echo_remover.h"
-
-#include <math.h>
-#include <stddef.h>
-#include <algorithm>
-#include <array>
-#include <memory>
-
-#include "api/array_view.h"
-#include "modules/audio_processing/aec3/aec3_common.h"
-#include "modules/audio_processing/aec3/aec3_fft.h"
-#include "modules/audio_processing/aec3/aec_state.h"
-#include "modules/audio_processing/aec3/comfort_noise_generator.h"
-#include "modules/audio_processing/aec3/echo_path_variability.h"
-#include "modules/audio_processing/aec3/echo_remover_metrics.h"
-#include "modules/audio_processing/aec3/fft_data.h"
-#include "modules/audio_processing/aec3/render_buffer.h"
-#include "modules/audio_processing/aec3/render_signal_analyzer.h"
-#include "modules/audio_processing/aec3/residual_echo_estimator.h"
-#include "modules/audio_processing/aec3/subtractor.h"
-#include "modules/audio_processing/aec3/subtractor_output.h"
-#include "modules/audio_processing/aec3/suppression_filter.h"
-#include "modules/audio_processing/aec3/suppression_gain.h"
-#include "modules/audio_processing/logging/apm_data_dumper.h"
-#include "rtc_base/atomicops.h"
-#include "rtc_base/checks.h"
-#include "rtc_base/constructormagic.h"
-#include "rtc_base/logging.h"
-#include "system_wrappers/include/field_trial.h"
-
-namespace webrtc {
-
-namespace {
-
-bool UseShadowFilterOutput() {
-  return !field_trial::IsEnabled(
-      "WebRTC-Aec3UtilizeShadowFilterOutputKillSwitch");
-}
-
-bool UseSmoothSignalTransitions() {
-  return !field_trial::IsEnabled(
-      "WebRTC-Aec3SmoothSignalTransitionsKillSwitch");
-}
-
-bool EnableBoundedNearend() {
-  return !field_trial::IsEnabled("WebRTC-Aec3BoundedNearendKillSwitch");
-}
-
-void LinearEchoPower(const FftData& E,
-                     const FftData& Y,
-                     std::array<float, kFftLengthBy2Plus1>* S2) {
-  for (size_t k = 0; k < E.re.size(); ++k) {
-    (*S2)[k] = (Y.re[k] - E.re[k]) * (Y.re[k] - E.re[k]) +
-               (Y.im[k] - E.im[k]) * (Y.im[k] - E.im[k]);
-  }
-}
-
-// Fades between two input signals using a fix-sized transition.
-void SignalTransition(rtc::ArrayView<const float> from,
-                      rtc::ArrayView<const float> to,
-                      rtc::ArrayView<float> out) {
-  constexpr size_t kTransitionSize = 30;
-  constexpr float kOneByTransitionSizePlusOne = 1.f / (kTransitionSize + 1);
-
-  RTC_DCHECK_EQ(from.size(), to.size());
-  RTC_DCHECK_EQ(from.size(), out.size());
-  RTC_DCHECK_LE(kTransitionSize, out.size());
-
-  for (size_t k = 0; k < kTransitionSize; ++k) {
-    float a = (k + 1) * kOneByTransitionSizePlusOne;
-    out[k] = a * to[k] + (1.f - a) * from[k];
-  }
-
-  std::copy(to.begin() + kTransitionSize, to.end(),
-            out.begin() + kTransitionSize);
-}
-
-// Computes a windowed (square root Hanning) padded FFT and updates the related
-// memory.
-void WindowedPaddedFft(const Aec3Fft& fft,
-                       rtc::ArrayView<const float> v,
-                       rtc::ArrayView<float> v_old,
-                       FftData* V) {
-  fft.PaddedFft(v, v_old, Aec3Fft::Window::kSqrtHanning, V);
-  std::copy(v.begin(), v.end(), v_old.begin());
-}
-
-// Class for removing the echo from the capture signal.
-class EchoRemoverImpl final : public EchoRemover {
- public:
-  EchoRemoverImpl(const EchoCanceller3Config& config, int sample_rate_hz);
-  ~EchoRemoverImpl() override;
-
-  void GetMetrics(EchoControl::Metrics* metrics) const override;
-
-  // Removes the echo from a block of samples from the capture signal. The
-  // supplied render signal is assumed to be pre-aligned with the capture
-  // signal.
-  void ProcessCapture(EchoPathVariability echo_path_variability,
-                      bool capture_signal_saturation,
-                      const absl::optional<DelayEstimate>& external_delay,
-                      RenderBuffer* render_buffer,
-                      std::vector<std::vector<float>>* capture) override;
-
-  // Returns the internal delay estimate in blocks.
-  absl::optional<int> Delay() const override {
-    // TODO(peah): Remove or reactivate this functionality.
-    return absl::nullopt;
-  }
-
-  // Updates the status on whether echo leakage is detected in the output of the
-  // echo remover.
-  void UpdateEchoLeakageStatus(bool leakage_detected) override {
-    echo_leakage_detected_ = leakage_detected;
-  }
-
- private:
-  // Selects which of the shadow and main linear filter outputs that is most
-  // appropriate to pass to the suppressor and forms the linear filter output by
-  // smoothly transition between those.
-  void FormLinearFilterOutput(bool smooth_transition,
-                              const SubtractorOutput& subtractor_output,
-                              rtc::ArrayView<float> output);
-
-  static int instance_count_;
-  const EchoCanceller3Config config_;
-  const Aec3Fft fft_;
-  std::unique_ptr<ApmDataDumper> data_dumper_;
-  const Aec3Optimization optimization_;
-  const int sample_rate_hz_;
-  const bool use_shadow_filter_output_;
-  const bool use_smooth_signal_transitions_;
-  const bool enable_bounded_nearend_;
-  Subtractor subtractor_;
-  SuppressionGain suppression_gain_;
-  ComfortNoiseGenerator cng_;
-  SuppressionFilter suppression_filter_;
-  RenderSignalAnalyzer render_signal_analyzer_;
-  ResidualEchoEstimator residual_echo_estimator_;
-  bool echo_leakage_detected_ = false;
-  AecState aec_state_;
-  EchoRemoverMetrics metrics_;
-  std::array<float, kFftLengthBy2> e_old_;
-  std::array<float, kFftLengthBy2> x_old_;
-  std::array<float, kFftLengthBy2> y_old_;
-  size_t block_counter_ = 0;
-  int gain_change_hangover_ = 0;
-  bool main_filter_output_last_selected_ = true;
-  bool linear_filter_output_last_selected_ = true;
-
-  RTC_DISALLOW_COPY_AND_ASSIGN(EchoRemoverImpl);
-};
-
-int EchoRemoverImpl::instance_count_ = 0;
-
-EchoRemoverImpl::EchoRemoverImpl(const EchoCanceller3Config& config,
-                                 int sample_rate_hz)
-    : config_(config),
-      fft_(),
-      data_dumper_(
-          new ApmDataDumper(rtc::AtomicOps::Increment(&instance_count_))),
-      optimization_(DetectOptimization()),
-      sample_rate_hz_(sample_rate_hz),
-      use_shadow_filter_output_(
-          UseShadowFilterOutput() &&
-          config_.filter.enable_shadow_filter_output_usage),
-      use_smooth_signal_transitions_(UseSmoothSignalTransitions()),
-      enable_bounded_nearend_(EnableBoundedNearend()),
-      subtractor_(config, data_dumper_.get(), optimization_),
-      suppression_gain_(config_, optimization_, sample_rate_hz),
-      cng_(optimization_),
-      suppression_filter_(optimization_, sample_rate_hz_),
-      render_signal_analyzer_(config_),
-      residual_echo_estimator_(config_),
-      aec_state_(config_) {
-  RTC_DCHECK(ValidFullBandRate(sample_rate_hz));
-  x_old_.fill(0.f);
-  y_old_.fill(0.f);
-  e_old_.fill(0.f);
-}
-
-EchoRemoverImpl::~EchoRemoverImpl() = default;
-
-void EchoRemoverImpl::GetMetrics(EchoControl::Metrics* metrics) const {
-  // Echo return loss (ERL) is inverted to go from gain to attenuation.
-  metrics->echo_return_loss = -10.0 * log10(aec_state_.ErlTimeDomain());
-  metrics->echo_return_loss_enhancement =
-      Log2TodB(aec_state_.FullBandErleLog2());
-}
-
-void EchoRemoverImpl::ProcessCapture(
-    EchoPathVariability echo_path_variability,
-    bool capture_signal_saturation,
-    const absl::optional<DelayEstimate>& external_delay,
-    RenderBuffer* render_buffer,
-    std::vector<std::vector<float>>* capture) {
-  ++block_counter_;
-  const std::vector<std::vector<float>>& x = render_buffer->Block(0);
-  std::vector<std::vector<float>>* y = capture;
-  RTC_DCHECK(render_buffer);
-  RTC_DCHECK(y);
-  RTC_DCHECK_EQ(x.size(), NumBandsForRate(sample_rate_hz_));
-  RTC_DCHECK_EQ(y->size(), NumBandsForRate(sample_rate_hz_));
-  RTC_DCHECK_EQ(x[0].size(), kBlockSize);
-  RTC_DCHECK_EQ((*y)[0].size(), kBlockSize);
-  const std::vector<float>& x0 = x[0];
-  std::vector<float>& y0 = (*y)[0];
-
-  data_dumper_->DumpWav("aec3_echo_remover_capture_input", kBlockSize, &y0[0],
-                        LowestBandRate(sample_rate_hz_), 1);
-  data_dumper_->DumpWav("aec3_echo_remover_render_input", kBlockSize, &x0[0],
-                        LowestBandRate(sample_rate_hz_), 1);
-  data_dumper_->DumpRaw("aec3_echo_remover_capture_input", y0);
-  data_dumper_->DumpRaw("aec3_echo_remover_render_input", x0);
-
-  aec_state_.UpdateCaptureSaturation(capture_signal_saturation);
-
-  if (echo_path_variability.AudioPathChanged()) {
-    // Ensure that the gain change is only acted on once per frame.
-    if (echo_path_variability.gain_change) {
-      if (gain_change_hangover_ == 0) {
-        constexpr int kMaxBlocksPerFrame = 3;
-        gain_change_hangover_ = kMaxBlocksPerFrame;
-        RTC_LOG(LS_WARNING)
-            << "Gain change detected at block " << block_counter_;
-      } else {
-        echo_path_variability.gain_change = false;
-      }
-    }
-
-    subtractor_.HandleEchoPathChange(echo_path_variability);
-    aec_state_.HandleEchoPathChange(echo_path_variability);
-
-    if (echo_path_variability.delay_change !=
-        EchoPathVariability::DelayAdjustment::kNone) {
-      suppression_gain_.SetInitialState(true);
-    }
-  }
-  if (gain_change_hangover_ > 0) {
-    --gain_change_hangover_;
-  }
-
-  std::array<float, kFftLengthBy2Plus1> Y2;
-  std::array<float, kFftLengthBy2Plus1> E2;
-  std::array<float, kFftLengthBy2Plus1> R2;
-  std::array<float, kFftLengthBy2Plus1> S2_linear;
-  std::array<float, kFftLengthBy2Plus1> G;
-  float high_bands_gain;
-  FftData Y;
-  FftData E;
-  FftData comfort_noise;
-  FftData high_band_comfort_noise;
-  SubtractorOutput subtractor_output;
-
-  // Analyze the render signal.
-  render_signal_analyzer_.Update(*render_buffer,
-                                 aec_state_.FilterDelayBlocks());
-
-  // Perform linear echo cancellation.
-  if (aec_state_.TransitionTriggered()) {
-    subtractor_.ExitInitialState();
-    suppression_gain_.SetInitialState(false);
-  }
-
-  // If the delay is known, use the echo subtractor.
-  subtractor_.Process(*render_buffer, y0, render_signal_analyzer_, aec_state_,
-                      &subtractor_output);
-  std::array<float, kBlockSize> e;
-  FormLinearFilterOutput(use_smooth_signal_transitions_, subtractor_output, e);
-
-  // Compute spectra.
-  WindowedPaddedFft(fft_, y0, y_old_, &Y);
-  WindowedPaddedFft(fft_, e, e_old_, &E);
-  LinearEchoPower(E, Y, &S2_linear);
-  Y.Spectrum(optimization_, Y2);
-  E.Spectrum(optimization_, E2);
-
-  // Update the AEC state information.
-  aec_state_.Update(external_delay, subtractor_.FilterFrequencyResponse(),
-                    subtractor_.FilterImpulseResponse(), *render_buffer, E2, Y2,
-                    subtractor_output, y0);
-
-  // Choose the linear output.
-  data_dumper_->DumpWav("aec3_output_linear2", kBlockSize, &e[0],
-                        LowestBandRate(sample_rate_hz_), 1);
-  if (aec_state_.UseLinearFilterOutput()) {
-    if (!linear_filter_output_last_selected_ &&
-        use_smooth_signal_transitions_) {
-      SignalTransition(y0, e, y0);
-    } else {
-      std::copy(e.begin(), e.end(), y0.begin());
-    }
-  } else {
-    if (linear_filter_output_last_selected_ && use_smooth_signal_transitions_) {
-      SignalTransition(e, y0, y0);
-    }
-  }
-  linear_filter_output_last_selected_ = aec_state_.UseLinearFilterOutput();
-  const auto& Y_fft = aec_state_.UseLinearFilterOutput() ? E : Y;
-
-  data_dumper_->DumpWav("aec3_output_linear", kBlockSize, &y0[0],
-                        LowestBandRate(sample_rate_hz_), 1);
-
-  // Estimate the residual echo power.
-  residual_echo_estimator_.Estimate(aec_state_, *render_buffer, S2_linear, Y2,
-                                    &R2);
-
-  // Estimate the comfort noise.
-  cng_.Compute(aec_state_, Y2, &comfort_noise, &high_band_comfort_noise);
-
-  // Compute and apply the suppression gain.
-  const auto& echo_spectrum =
-      aec_state_.UsableLinearEstimate() ? S2_linear : R2;
-
-  std::array<float, kFftLengthBy2Plus1> E2_bounded;
-  if (enable_bounded_nearend_) {
-    std::transform(E2.begin(), E2.end(), Y2.begin(), E2_bounded.begin(),
-                   [](float a, float b) { return std::min(a, b); });
-  } else {
-    std::copy(E2.begin(), E2.end(), E2_bounded.begin());
-  }
-
-  suppression_gain_.GetGain(E2, E2_bounded, echo_spectrum, R2,
-                            cng_.NoiseSpectrum(), E, Y, render_signal_analyzer_,
-                            aec_state_, x, &high_bands_gain, &G);
-
-  suppression_filter_.ApplyGain(comfort_noise, high_band_comfort_noise, G,
-                                high_bands_gain, Y_fft, y);
-
-  // Update the metrics.
-  metrics_.Update(aec_state_, cng_.NoiseSpectrum(), G);
-
-  // Debug outputs for the purpose of development and analysis.
-  data_dumper_->DumpWav("aec3_echo_estimate", kBlockSize,
-                        &subtractor_output.s_main[0],
-                        LowestBandRate(sample_rate_hz_), 1);
-  data_dumper_->DumpRaw("aec3_output", y0);
-  data_dumper_->DumpRaw("aec3_narrow_render",
-                        render_signal_analyzer_.NarrowPeakBand() ? 1 : 0);
-  data_dumper_->DumpRaw("aec3_N2", cng_.NoiseSpectrum());
-  data_dumper_->DumpRaw("aec3_suppressor_gain", G);
-  data_dumper_->DumpWav("aec3_output",
-                        rtc::ArrayView<const float>(&y0[0], kBlockSize),
-                        LowestBandRate(sample_rate_hz_), 1);
-  data_dumper_->DumpRaw("aec3_using_subtractor_output",
-                        aec_state_.UseLinearFilterOutput() ? 1 : 0);
-  data_dumper_->DumpRaw("aec3_E2", E2);
-  data_dumper_->DumpRaw("aec3_S2_linear", S2_linear);
-  data_dumper_->DumpRaw("aec3_Y2", Y2);
-  data_dumper_->DumpRaw(
-      "aec3_X2", render_buffer->Spectrum(aec_state_.FilterDelayBlocks()));
-  data_dumper_->DumpRaw("aec3_R2", R2);
-  data_dumper_->DumpRaw("aec3_R2_reverb",
-                        residual_echo_estimator_.GetReverbPowerSpectrum());
-  data_dumper_->DumpRaw("aec3_filter_delay", aec_state_.FilterDelayBlocks());
-  data_dumper_->DumpRaw("aec3_capture_saturation",
-                        aec_state_.SaturatedCapture() ? 1 : 0);
-}
-
-void EchoRemoverImpl::FormLinearFilterOutput(
-    bool smooth_transition,
-    const SubtractorOutput& subtractor_output,
-    rtc::ArrayView<float> output) {
-  RTC_DCHECK_EQ(subtractor_output.e_main.size(), output.size());
-  RTC_DCHECK_EQ(subtractor_output.e_shadow.size(), output.size());
-  bool use_main_output = true;
-  if (use_shadow_filter_output_) {
-    // As the output of the main adaptive filter generally should be better
-    // than the shadow filter output, add a margin and threshold for when
-    // choosing the shadow filter output.
-    if (subtractor_output.e2_shadow < 0.9f * subtractor_output.e2_main &&
-        subtractor_output.y2 > 30.f * 30.f * kBlockSize &&
-        (subtractor_output.s2_main > 60.f * 60.f * kBlockSize ||
-         subtractor_output.s2_shadow > 60.f * 60.f * kBlockSize)) {
-      use_main_output = false;
-    } else {
-      // If the main filter is diverged, choose the filter output that has the
-      // lowest power.
-      if (subtractor_output.e2_shadow < subtractor_output.e2_main &&
-          subtractor_output.y2 < subtractor_output.e2_main) {
-        use_main_output = false;
-      }
-    }
-  }
-
-  if (use_main_output) {
-    if (!main_filter_output_last_selected_ && smooth_transition) {
-      SignalTransition(subtractor_output.e_shadow, subtractor_output.e_main,
-                       output);
-    } else {
-      std::copy(subtractor_output.e_main.begin(),
-                subtractor_output.e_main.end(), output.begin());
-    }
-  } else {
-    if (main_filter_output_last_selected_ && smooth_transition) {
-      SignalTransition(subtractor_output.e_main, subtractor_output.e_shadow,
-                       output);
-    } else {
-      std::copy(subtractor_output.e_shadow.begin(),
-                subtractor_output.e_shadow.end(), output.begin());
-    }
-  }
-  main_filter_output_last_selected_ = use_main_output;
-}
-
-}  // namespace
-
-EchoRemover* EchoRemover::Create(const EchoCanceller3Config& config,
-                                 int sample_rate_hz) {
-  return new EchoRemoverImpl(config, sample_rate_hz);
-}
-
-}  // namespace webrtc
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/echo_remover.h b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/echo_remover.h
deleted file mode 100644
index cc8dae9c17..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/echo_remover.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- *  Copyright (c) 2017 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#ifndef MODULES_AUDIO_PROCESSING_AEC3_ECHO_REMOVER_H_
-#define MODULES_AUDIO_PROCESSING_AEC3_ECHO_REMOVER_H_
-
-#include <vector>
-
-#include "absl/types/optional.h"
-#include "api/audio/echo_canceller3_config.h"
-#include "api/audio/echo_control.h"
-#include "modules/audio_processing/aec3/delay_estimate.h"
-#include "modules/audio_processing/aec3/echo_path_variability.h"
-#include "modules/audio_processing/aec3/render_buffer.h"
-
-namespace webrtc {
-
-// Class for removing the echo from the capture signal.
-class EchoRemover {
- public:
-  static EchoRemover* Create(const EchoCanceller3Config& config,
-                             int sample_rate_hz);
-  virtual ~EchoRemover() = default;
-
-  // Get current metrics.
-  virtual void GetMetrics(EchoControl::Metrics* metrics) const = 0;
-
-  // Removes the echo from a block of samples from the capture signal. The
-  // supplied render signal is assumed to be pre-aligned with the capture
-  // signal.
-  virtual void ProcessCapture(
-      EchoPathVariability echo_path_variability,
-      bool capture_signal_saturation,
-      const absl::optional<DelayEstimate>& external_delay,
-      RenderBuffer* render_buffer,
-      std::vector<std::vector<float>>* capture) = 0;
-
-  // Returns the internal delay estimate in blocks.
-  virtual absl::optional<int> Delay() const = 0;
-
-  // Updates the status on whether echo leakage is detected in the output of the
-  // echo remover.
-  virtual void UpdateEchoLeakageStatus(bool leakage_detected) = 0;
-};
-
-}  // namespace webrtc
-
-#endif  // MODULES_AUDIO_PROCESSING_AEC3_ECHO_REMOVER_H_
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/echo_remover_metrics.cc b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/echo_remover_metrics.cc
deleted file mode 100644
index da7a224e86..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/echo_remover_metrics.cc
+++ /dev/null
@@ -1,326 +0,0 @@
-/*
- *  Copyright (c) 2017 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#include "modules/audio_processing/aec3/echo_remover_metrics.h"
-
-#include <math.h>
-#include <stddef.h>
-#include <algorithm>
-#include <numeric>
-
-#include "rtc_base/checks.h"
-#include "rtc_base/numerics/safe_minmax.h"
-#include "system_wrappers/include/metrics.h"
-
-namespace webrtc {
-
-namespace {
-
-constexpr float kOneByMetricsCollectionBlocks = 1.f / kMetricsCollectionBlocks;
-
-}  // namespace
-
-EchoRemoverMetrics::DbMetric::DbMetric() : DbMetric(0.f, 0.f, 0.f) {}
-EchoRemoverMetrics::DbMetric::DbMetric(float sum_value,
-                                       float floor_value,
-                                       float ceil_value)
-    : sum_value(sum_value), floor_value(floor_value), ceil_value(ceil_value) {}
-
-void EchoRemoverMetrics::DbMetric::Update(float value) {
-  sum_value += value;
-  floor_value = std::min(floor_value, value);
-  ceil_value = std::max(ceil_value, value);
-}
-
-void EchoRemoverMetrics::DbMetric::UpdateInstant(float value) {
-  sum_value = value;
-  floor_value = std::min(floor_value, value);
-  ceil_value = std::max(ceil_value, value);
-}
-
-EchoRemoverMetrics::EchoRemoverMetrics() {
-  ResetMetrics();
-}
-
-void EchoRemoverMetrics::ResetMetrics() {
-  erl_.fill(DbMetric(0.f, 10000.f, 0.000f));
-  erl_time_domain_ = DbMetric(0.f, 10000.f, 0.000f);
-  erle_.fill(DbMetric(0.f, 0.f, 1000.f));
-  erle_time_domain_ = DbMetric(0.f, 0.f, 1000.f);
-  comfort_noise_.fill(DbMetric(0.f, 100000000.f, 0.f));
-  suppressor_gain_.fill(DbMetric(0.f, 1.f, 0.f));
-  active_render_count_ = 0;
-  saturated_capture_ = false;
-}
-
-void EchoRemoverMetrics::Update(
-    const AecState& aec_state,
-    const std::array<float, kFftLengthBy2Plus1>& comfort_noise_spectrum,
-    const std::array<float, kFftLengthBy2Plus1>& suppressor_gain) {
-  metrics_reported_ = false;
-  if (++block_counter_ <= kMetricsCollectionBlocks) {
-    aec3::UpdateDbMetric(aec_state.Erl(), &erl_);
-    erl_time_domain_.UpdateInstant(aec_state.ErlTimeDomain());
-    aec3::UpdateDbMetric(aec_state.Erle(), &erle_);
-    erle_time_domain_.UpdateInstant(aec_state.FullBandErleLog2());
-    aec3::UpdateDbMetric(comfort_noise_spectrum, &comfort_noise_);
-    aec3::UpdateDbMetric(suppressor_gain, &suppressor_gain_);
-    active_render_count_ += (aec_state.ActiveRender() ? 1 : 0);
-    saturated_capture_ = saturated_capture_ || aec_state.SaturatedCapture();
-  } else {
-    // Report the metrics over several frames in order to lower the impact of
-    // the logarithms involved on the computational complexity.
-    constexpr int kMetricsCollectionBlocksBy2 = kMetricsCollectionBlocks / 2;
-    constexpr float kComfortNoiseScaling = 1.f / (kBlockSize * kBlockSize);
-    switch (block_counter_) {
-      case kMetricsCollectionBlocks + 1:
-        RTC_HISTOGRAM_COUNTS_LINEAR(
-            "WebRTC.Audio.EchoCanceller.ErleBand0.Average",
-            aec3::TransformDbMetricForReporting(true, 0.f, 19.f, 0.f,
-                                                kOneByMetricsCollectionBlocks,
-                                                erle_[0].sum_value),
-            0, 19, 20);
-        RTC_HISTOGRAM_COUNTS_LINEAR(
-            "WebRTC.Audio.EchoCanceller.ErleBand0.Max",
-            aec3::TransformDbMetricForReporting(true, 0.f, 19.f, 0.f, 1.f,
-                                                erle_[0].ceil_value),
-            0, 19, 20);
-        RTC_HISTOGRAM_COUNTS_LINEAR(
-            "WebRTC.Audio.EchoCanceller.ErleBand0.Min",
-            aec3::TransformDbMetricForReporting(true, 0.f, 19.f, 0.f, 1.f,
-                                                erle_[0].floor_value),
-            0, 19, 20);
-        break;
-      case kMetricsCollectionBlocks + 2:
-        RTC_HISTOGRAM_COUNTS_LINEAR(
-            "WebRTC.Audio.EchoCanceller.ErleBand1.Average",
-            aec3::TransformDbMetricForReporting(true, 0.f, 19.f, 0.f,
-                                                kOneByMetricsCollectionBlocks,
-                                                erle_[1].sum_value),
-            0, 19, 20);
-        RTC_HISTOGRAM_COUNTS_LINEAR(
-            "WebRTC.Audio.EchoCanceller.ErleBand1.Max",
-            aec3::TransformDbMetricForReporting(true, 0.f, 19.f, 0.f, 1.f,
-                                                erle_[1].ceil_value),
-            0, 19, 20);
-        RTC_HISTOGRAM_COUNTS_LINEAR(
-            "WebRTC.Audio.EchoCanceller.ErleBand1.Min",
-            aec3::TransformDbMetricForReporting(true, 0.f, 19.f, 0.f, 1.f,
-                                                erle_[1].floor_value),
-            0, 19, 20);
-        break;
-      case kMetricsCollectionBlocks + 3:
-        RTC_HISTOGRAM_COUNTS_LINEAR(
-            "WebRTC.Audio.EchoCanceller.ErlBand0.Average",
-            aec3::TransformDbMetricForReporting(true, 0.f, 59.f, 30.f,
-                                                kOneByMetricsCollectionBlocks,
-                                                erl_[0].sum_value),
-            0, 59, 30);
-        RTC_HISTOGRAM_COUNTS_LINEAR(
-            "WebRTC.Audio.EchoCanceller.ErlBand0.Max",
-            aec3::TransformDbMetricForReporting(true, 0.f, 59.f, 30.f, 1.f,
-                                                erl_[0].ceil_value),
-            0, 59, 30);
-        RTC_HISTOGRAM_COUNTS_LINEAR(
-            "WebRTC.Audio.EchoCanceller.ErlBand0.Min",
-            aec3::TransformDbMetricForReporting(true, 0.f, 59.f, 30.f, 1.f,
-                                                erl_[0].floor_value),
-            0, 59, 30);
-        break;
-      case kMetricsCollectionBlocks + 4:
-        RTC_HISTOGRAM_COUNTS_LINEAR(
-            "WebRTC.Audio.EchoCanceller.ErlBand1.Average",
-            aec3::TransformDbMetricForReporting(true, 0.f, 59.f, 30.f,
-                                                kOneByMetricsCollectionBlocks,
-                                                erl_[1].sum_value),
-            0, 59, 30);
-        RTC_HISTOGRAM_COUNTS_LINEAR(
-            "WebRTC.Audio.EchoCanceller.ErlBand1.Max",
-            aec3::TransformDbMetricForReporting(true, 0.f, 59.f, 30.f, 1.f,
-                                                erl_[1].ceil_value),
-            0, 59, 30);
-        RTC_HISTOGRAM_COUNTS_LINEAR(
-            "WebRTC.Audio.EchoCanceller.ErlBand1.Min",
-            aec3::TransformDbMetricForReporting(true, 0.f, 59.f, 30.f, 1.f,
-                                                erl_[1].floor_value),
-            0, 59, 30);
-        break;
-      case kMetricsCollectionBlocks + 5:
-        RTC_HISTOGRAM_COUNTS_LINEAR(
-            "WebRTC.Audio.EchoCanceller.ComfortNoiseBand0.Average",
-            aec3::TransformDbMetricForReporting(
-                true, 0.f, 89.f, -90.3f,
-                kComfortNoiseScaling * kOneByMetricsCollectionBlocks,
-                comfort_noise_[0].sum_value),
-            0, 89, 45);
-        RTC_HISTOGRAM_COUNTS_LINEAR(
-            "WebRTC.Audio.EchoCanceller.ComfortNoiseBand0.Max",
-            aec3::TransformDbMetricForReporting(true, 0.f, 89.f, -90.3f,
-                                                kComfortNoiseScaling,
-                                                comfort_noise_[0].ceil_value),
-            0, 89, 45);
-        RTC_HISTOGRAM_COUNTS_LINEAR(
-            "WebRTC.Audio.EchoCanceller.ComfortNoiseBand0.Min",
-            aec3::TransformDbMetricForReporting(true, 0.f, 89.f, -90.3f,
-                                                kComfortNoiseScaling,
-                                                comfort_noise_[0].floor_value),
-            0, 89, 45);
-        break;
-      case kMetricsCollectionBlocks + 6:
-        RTC_HISTOGRAM_COUNTS_LINEAR(
-            "WebRTC.Audio.EchoCanceller.ComfortNoiseBand1.Average",
-            aec3::TransformDbMetricForReporting(
-                true, 0.f, 89.f, -90.3f,
-                kComfortNoiseScaling * kOneByMetricsCollectionBlocks,
-                comfort_noise_[1].sum_value),
-            0, 89, 45);
-        RTC_HISTOGRAM_COUNTS_LINEAR(
-            "WebRTC.Audio.EchoCanceller.ComfortNoiseBand1.Max",
-            aec3::TransformDbMetricForReporting(true, 0.f, 89.f, -90.3f,
-                                                kComfortNoiseScaling,
-                                                comfort_noise_[1].ceil_value),
-            0, 89, 45);
-        RTC_HISTOGRAM_COUNTS_LINEAR(
-            "WebRTC.Audio.EchoCanceller.ComfortNoiseBand1.Min",
-            aec3::TransformDbMetricForReporting(true, 0.f, 89.f, -90.3f,
-                                                kComfortNoiseScaling,
-                                                comfort_noise_[1].floor_value),
-            0, 89, 45);
-        break;
-      case kMetricsCollectionBlocks + 7:
-        RTC_HISTOGRAM_COUNTS_LINEAR(
-            "WebRTC.Audio.EchoCanceller.SuppressorGainBand0.Average",
-            aec3::TransformDbMetricForReporting(true, 0.f, 59.f, 0.f,
-                                                kOneByMetricsCollectionBlocks,
-                                                suppressor_gain_[0].sum_value),
-            0, 59, 30);
-        RTC_HISTOGRAM_COUNTS_LINEAR(
-            "WebRTC.Audio.EchoCanceller.SuppressorGainBand0.Max",
-            aec3::TransformDbMetricForReporting(true, 0.f, 59.f, 0.f, 1.f,
-                                                suppressor_gain_[0].ceil_value),
-            0, 59, 30);
-        RTC_HISTOGRAM_COUNTS_LINEAR(
-            "WebRTC.Audio.EchoCanceller.SuppressorGainBand0.Min",
-            aec3::TransformDbMetricForReporting(
-                true, 0.f, 59.f, 0.f, 1.f, suppressor_gain_[0].floor_value),
-            0, 59, 30);
-        break;
-      case kMetricsCollectionBlocks + 8:
-        RTC_HISTOGRAM_COUNTS_LINEAR(
-            "WebRTC.Audio.EchoCanceller.SuppressorGainBand1.Average",
-            aec3::TransformDbMetricForReporting(true, 0.f, 59.f, 0.f,
-                                                kOneByMetricsCollectionBlocks,
-                                                suppressor_gain_[1].sum_value),
-            0, 59, 30);
-        RTC_HISTOGRAM_COUNTS_LINEAR(
-            "WebRTC.Audio.EchoCanceller.SuppressorGainBand1.Max",
-            aec3::TransformDbMetricForReporting(true, 0.f, 59.f, 0.f, 1.f,
-                                                suppressor_gain_[1].ceil_value),
-            0, 59, 30);
-        RTC_HISTOGRAM_COUNTS_LINEAR(
-            "WebRTC.Audio.EchoCanceller.SuppressorGainBand1.Min",
-            aec3::TransformDbMetricForReporting(
-                true, 0.f, 59.f, 0.f, 1.f, suppressor_gain_[1].floor_value),
-            0, 59, 30);
-        break;
-      case kMetricsCollectionBlocks + 9:
-        RTC_HISTOGRAM_BOOLEAN(
-            "WebRTC.Audio.EchoCanceller.UsableLinearEstimate",
-            static_cast<int>(aec_state.UsableLinearEstimate() ? 1 : 0));
-        RTC_HISTOGRAM_BOOLEAN(
-            "WebRTC.Audio.EchoCanceller.ActiveRender",
-            static_cast<int>(
-                active_render_count_ > kMetricsCollectionBlocksBy2 ? 1 : 0));
-        RTC_HISTOGRAM_COUNTS_LINEAR("WebRTC.Audio.EchoCanceller.FilterDelay",
-                                    aec_state.FilterDelayBlocks(), 0, 30, 31);
-        RTC_HISTOGRAM_BOOLEAN("WebRTC.Audio.EchoCanceller.CaptureSaturation",
-                              static_cast<int>(saturated_capture_ ? 1 : 0));
-        break;
-      case kMetricsCollectionBlocks + 10:
-        RTC_HISTOGRAM_COUNTS_LINEAR(
-            "WebRTC.Audio.EchoCanceller.Erl.Value",
-            aec3::TransformDbMetricForReporting(true, 0.f, 59.f, 30.f, 1.f,
-                                                erl_time_domain_.sum_value),
-            0, 59, 30);
-        RTC_HISTOGRAM_COUNTS_LINEAR(
-            "WebRTC.Audio.EchoCanceller.Erl.Max",
-            aec3::TransformDbMetricForReporting(true, 0.f, 59.f, 30.f, 1.f,
-                                                erl_time_domain_.ceil_value),
-            0, 59, 30);
-        RTC_HISTOGRAM_COUNTS_LINEAR(
-            "WebRTC.Audio.EchoCanceller.Erl.Min",
-            aec3::TransformDbMetricForReporting(true, 0.f, 59.f, 30.f, 1.f,
-                                                erl_time_domain_.floor_value),
-            0, 59, 30);
-        break;
-      case kMetricsCollectionBlocks + 11:
-        RTC_HISTOGRAM_COUNTS_LINEAR(
-            "WebRTC.Audio.EchoCanceller.Erle.Value",
-            aec3::TransformDbMetricForReporting(false, 0.f, 19.f, 0.f, 1.f,
-                                                erle_time_domain_.sum_value),
-            0, 19, 20);
-        RTC_HISTOGRAM_COUNTS_LINEAR(
-            "WebRTC.Audio.EchoCanceller.Erle.Max",
-            aec3::TransformDbMetricForReporting(false, 0.f, 19.f, 0.f, 1.f,
-                                                erle_time_domain_.ceil_value),
-            0, 19, 20);
-        RTC_HISTOGRAM_COUNTS_LINEAR(
-            "WebRTC.Audio.EchoCanceller.Erle.Min",
-            aec3::TransformDbMetricForReporting(false, 0.f, 19.f, 0.f, 1.f,
-                                                erle_time_domain_.floor_value),
-            0, 19, 20);
-        metrics_reported_ = true;
-        RTC_DCHECK_EQ(kMetricsReportingIntervalBlocks, block_counter_);
-        block_counter_ = 0;
-        ResetMetrics();
-        break;
-      default:
-        RTC_NOTREACHED();
-        break;
-    }
-  }
-}
-
-namespace aec3 {
-
-void UpdateDbMetric(const std::array<float, kFftLengthBy2Plus1>& value,
-                    std::array<EchoRemoverMetrics::DbMetric, 2>* statistic) {
-  RTC_DCHECK(statistic);
-  // Truncation is intended in the band width computation.
-  constexpr int kNumBands = 2;
-  constexpr int kBandWidth = 65 / kNumBands;
-  constexpr float kOneByBandWidth = 1.f / kBandWidth;
-  RTC_DCHECK_EQ(kNumBands, statistic->size());
-  RTC_DCHECK_EQ(65, value.size());
-  for (size_t k = 0; k < statistic->size(); ++k) {
-    float average_band =
-        std::accumulate(value.begin() + kBandWidth * k,
-                        value.begin() + kBandWidth * (k + 1), 0.f) *
-        kOneByBandWidth;
-    (*statistic)[k].Update(average_band);
-  }
-}
-
-int TransformDbMetricForReporting(bool negate,
-                                  float min_value,
-                                  float max_value,
-                                  float offset,
-                                  float scaling,
-                                  float value) {
-  float new_value = 10.f * log10(value * scaling + 1e-10f) + offset;
-  if (negate) {
-    new_value = -new_value;
-  }
-  return static_cast<int>(rtc::SafeClamp(new_value, min_value, max_value));
-}
-
-}  // namespace aec3
-
-}  // namespace webrtc
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/echo_remover_metrics.h b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/echo_remover_metrics.h
deleted file mode 100644
index 0707a5f031..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/echo_remover_metrics.h
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- *  Copyright (c) 2017 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#ifndef MODULES_AUDIO_PROCESSING_AEC3_ECHO_REMOVER_METRICS_H_
-#define MODULES_AUDIO_PROCESSING_AEC3_ECHO_REMOVER_METRICS_H_
-
-#include <array>
-
-#include "modules/audio_processing/aec3/aec3_common.h"
-#include "modules/audio_processing/aec3/aec_state.h"
-#include "rtc_base/constructormagic.h"
-
-namespace webrtc {
-
-// Handles the reporting of metrics for the echo remover.
-class EchoRemoverMetrics {
- public:
-  struct DbMetric {
-    DbMetric();
-    DbMetric(float sum_value, float floor_value, float ceil_value);
-    void Update(float value);
-    void UpdateInstant(float value);
-    float sum_value;
-    float floor_value;
-    float ceil_value;
-  };
-
-  EchoRemoverMetrics();
-
-  // Updates the metric with new data.
-  void Update(
-      const AecState& aec_state,
-      const std::array<float, kFftLengthBy2Plus1>& comfort_noise_spectrum,
-      const std::array<float, kFftLengthBy2Plus1>& suppressor_gain);
-
-  // Returns true if the metrics have just been reported, otherwise false.
-  bool MetricsReported() { return metrics_reported_; }
-
- private:
-  // Resets the metrics.
-  void ResetMetrics();
-
-  int block_counter_ = 0;
-  std::array<DbMetric, 2> erl_;
-  DbMetric erl_time_domain_;
-  std::array<DbMetric, 2> erle_;
-  DbMetric erle_time_domain_;
-  std::array<DbMetric, 2> comfort_noise_;
-  std::array<DbMetric, 2> suppressor_gain_;
-  int active_render_count_ = 0;
-  bool saturated_capture_ = false;
-  bool metrics_reported_ = false;
-
-  RTC_DISALLOW_COPY_AND_ASSIGN(EchoRemoverMetrics);
-};
-
-namespace aec3 {
-
-// Updates a banded metric of type DbMetric with the values in the supplied
-// array.
-void UpdateDbMetric(const std::array<float, kFftLengthBy2Plus1>& value,
-                    std::array<EchoRemoverMetrics::DbMetric, 2>* statistic);
-
-// Transforms a DbMetric from the linear domain into the logarithmic domain.
-int TransformDbMetricForReporting(bool negate,
-                                  float min_value,
-                                  float max_value,
-                                  float offset,
-                                  float scaling,
-                                  float value);
-
-}  // namespace aec3
-
-}  // namespace webrtc
-
-#endif  // MODULES_AUDIO_PROCESSING_AEC3_ECHO_REMOVER_METRICS_H_
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/erl_estimator.cc b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/erl_estimator.cc
deleted file mode 100644
index 85b1e022da..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/erl_estimator.cc
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
- *  Copyright (c) 2017 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#include "modules/audio_processing/aec3/erl_estimator.h"
-
-#include <algorithm>
-#include <numeric>
-
-#include "rtc_base/checks.h"
-
-namespace webrtc {
-
-namespace {
-
-constexpr float kMinErl = 0.01f;
-constexpr float kMaxErl = 1000.f;
-
-}  // namespace
-
-ErlEstimator::ErlEstimator(size_t startup_phase_length_blocks_)
-    : startup_phase_length_blocks__(startup_phase_length_blocks_) {
-  erl_.fill(kMaxErl);
-  hold_counters_.fill(0);
-  erl_time_domain_ = kMaxErl;
-  hold_counter_time_domain_ = 0;
-}
-
-ErlEstimator::~ErlEstimator() = default;
-
-void ErlEstimator::Reset() {
-  blocks_since_reset_ = 0;
-}
-
-void ErlEstimator::Update(bool converged_filter,
-                          rtc::ArrayView<const float> render_spectrum,
-                          rtc::ArrayView<const float> capture_spectrum) {
-  RTC_DCHECK_EQ(kFftLengthBy2Plus1, render_spectrum.size());
-  RTC_DCHECK_EQ(kFftLengthBy2Plus1, capture_spectrum.size());
-  const auto& X2 = render_spectrum;
-  const auto& Y2 = capture_spectrum;
-
-  // Corresponds to WGN of power -46 dBFS.
-  constexpr float kX2Min = 44015068.0f;
-
-  if (++blocks_since_reset_ < startup_phase_length_blocks__ ||
-      !converged_filter) {
-    return;
-  }
-
-  // Update the estimates in a maximum statistics manner.
-  for (size_t k = 1; k < kFftLengthBy2; ++k) {
-    if (X2[k] > kX2Min) {
-      const float new_erl = Y2[k] / X2[k];
-      if (new_erl < erl_[k]) {
-        hold_counters_[k - 1] = 1000;
-        erl_[k] += 0.1f * (new_erl - erl_[k]);
-        erl_[k] = std::max(erl_[k], kMinErl);
-      }
-    }
-  }
-
-  std::for_each(hold_counters_.begin(), hold_counters_.end(),
-                [](int& a) { --a; });
-  std::transform(hold_counters_.begin(), hold_counters_.end(), erl_.begin() + 1,
-                 erl_.begin() + 1, [](int a, float b) {
-                   return a > 0 ? b : std::min(kMaxErl, 2.f * b);
-                 });
-
-  erl_[0] = erl_[1];
-  erl_[kFftLengthBy2] = erl_[kFftLengthBy2 - 1];
-
-  // Compute ERL over all frequency bins.
-  const float X2_sum = std::accumulate(X2.begin(), X2.end(), 0.0f);
-
-  if (X2_sum > kX2Min * X2.size()) {
-    const float Y2_sum = std::accumulate(Y2.begin(), Y2.end(), 0.0f);
-    const float new_erl = Y2_sum / X2_sum;
-    if (new_erl < erl_time_domain_) {
-      hold_counter_time_domain_ = 1000;
-      erl_time_domain_ += 0.1f * (new_erl - erl_time_domain_);
-      erl_time_domain_ = std::max(erl_time_domain_, kMinErl);
-    }
-  }
-
-  --hold_counter_time_domain_;
-  erl_time_domain_ = (hold_counter_time_domain_ > 0)
-                         ? erl_time_domain_
-                         : std::min(kMaxErl, 2.f * erl_time_domain_);
-}
-
-}  // namespace webrtc
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/erl_estimator.h b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/erl_estimator.h
deleted file mode 100644
index 29718c3783..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/erl_estimator.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- *  Copyright (c) 2017 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#ifndef MODULES_AUDIO_PROCESSING_AEC3_ERL_ESTIMATOR_H_
-#define MODULES_AUDIO_PROCESSING_AEC3_ERL_ESTIMATOR_H_
-
-#include <stddef.h>
-#include <array>
-
-#include "api/array_view.h"
-#include "modules/audio_processing/aec3/aec3_common.h"
-#include "rtc_base/constructormagic.h"
-
-namespace webrtc {
-
-// Estimates the echo return loss based on the signal spectra.
-class ErlEstimator {
- public:
-  explicit ErlEstimator(size_t startup_phase_length_blocks_);
-  ~ErlEstimator();
-
-  // Resets the ERL estimation.
-  void Reset();
-
-  // Updates the ERL estimate.
-  void Update(bool converged_filter,
-              rtc::ArrayView<const float> render_spectrum,
-              rtc::ArrayView<const float> capture_spectrum);
-
-  // Returns the most recent ERL estimate.
-  const std::array<float, kFftLengthBy2Plus1>& Erl() const { return erl_; }
-  float ErlTimeDomain() const { return erl_time_domain_; }
-
- private:
-  const size_t startup_phase_length_blocks__;
-  std::array<float, kFftLengthBy2Plus1> erl_;
-  std::array<int, kFftLengthBy2Minus1> hold_counters_;
-  float erl_time_domain_;
-  int hold_counter_time_domain_;
-  size_t blocks_since_reset_ = 0;
-  RTC_DISALLOW_COPY_AND_ASSIGN(ErlEstimator);
-};
-
-}  // namespace webrtc
-
-#endif  // MODULES_AUDIO_PROCESSING_AEC3_ERL_ESTIMATOR_H_
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/erle_estimator.cc b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/erle_estimator.cc
deleted file mode 100644
index 539a59b84e..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/erle_estimator.cc
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- *  Copyright (c) 2017 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#include "modules/audio_processing/aec3/erle_estimator.h"
-
-#include "api/array_view.h"
-#include "modules/audio_processing/aec3/aec3_common.h"
-#include "modules/audio_processing/logging/apm_data_dumper.h"
-#include "rtc_base/checks.h"
-
-namespace webrtc {
-
-ErleEstimator::ErleEstimator(size_t startup_phase_length_blocks_,
-                             float min_erle,
-                             float max_erle_lf,
-                             float max_erle_hf)
-    : startup_phase_length_blocks__(startup_phase_length_blocks_),
-      fullband_erle_estimator_(min_erle, max_erle_lf),
-      subband_erle_estimator_(min_erle, max_erle_lf, max_erle_hf) {
-  Reset(true);
-}
-
-ErleEstimator::~ErleEstimator() = default;
-
-void ErleEstimator::Reset(bool delay_change) {
-  fullband_erle_estimator_.Reset();
-  subband_erle_estimator_.Reset();
-  if (delay_change) {
-    blocks_since_reset_ = 0;
-  }
-}
-
-void ErleEstimator::Update(rtc::ArrayView<const float> reverb_render_spectrum,
-                           rtc::ArrayView<const float> capture_spectrum,
-                           rtc::ArrayView<const float> subtractor_spectrum,
-                           bool converged_filter,
-                           bool onset_detection) {
-  RTC_DCHECK_EQ(kFftLengthBy2Plus1, reverb_render_spectrum.size());
-  RTC_DCHECK_EQ(kFftLengthBy2Plus1, capture_spectrum.size());
-  RTC_DCHECK_EQ(kFftLengthBy2Plus1, subtractor_spectrum.size());
-  const auto& X2_reverb = reverb_render_spectrum;
-  const auto& Y2 = capture_spectrum;
-  const auto& E2 = subtractor_spectrum;
-
-  if (++blocks_since_reset_ < startup_phase_length_blocks__) {
-    return;
-  }
-
-  subband_erle_estimator_.Update(X2_reverb, Y2, E2, converged_filter,
-                                 onset_detection);
-  fullband_erle_estimator_.Update(X2_reverb, Y2, E2, converged_filter);
-}
-
-void ErleEstimator::Dump(
-    const std::unique_ptr<ApmDataDumper>& data_dumper) const {
-  fullband_erle_estimator_.Dump(data_dumper);
-  subband_erle_estimator_.Dump(data_dumper);
-}
-
-}  // namespace webrtc
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/erle_estimator.h b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/erle_estimator.h
deleted file mode 100644
index 2d2c3ae44b..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/erle_estimator.h
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- *  Copyright (c) 2017 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#ifndef MODULES_AUDIO_PROCESSING_AEC3_ERLE_ESTIMATOR_H_
-#define MODULES_AUDIO_PROCESSING_AEC3_ERLE_ESTIMATOR_H_
-
-#include <stddef.h>
-#include <array>
-#include <memory>
-
-#include "absl/types/optional.h"
-#include "api/array_view.h"
-#include "modules/audio_processing/aec3/aec3_common.h"
-#include "modules/audio_processing/aec3/fullband_erle_estimator.h"
-#include "modules/audio_processing/aec3/subband_erle_estimator.h"
-#include "modules/audio_processing/logging/apm_data_dumper.h"
-
-namespace webrtc {
-
-// Estimates the echo return loss enhancement. One estimate is done per subband
-// and another one is done using the aggreation of energy over all the subbands.
-class ErleEstimator {
- public:
-  ErleEstimator(size_t startup_phase_length_blocks_,
-                float min_erle,
-                float max_erle_lf,
-                float max_erle_hf);
-  ~ErleEstimator();
-
-  // Resets the fullband ERLE estimator and the subbands ERLE estimators.
-  void Reset(bool delay_change);
-
-  // Updates the ERLE estimates.
-  void Update(rtc::ArrayView<const float> reverb_render_spectrum,
-              rtc::ArrayView<const float> capture_spectrum,
-              rtc::ArrayView<const float> subtractor_spectrum,
-              bool converged_filter,
-              bool onset_detection);
-
-  // Returns the most recent subband ERLE estimates.
-  const std::array<float, kFftLengthBy2Plus1>& Erle() const {
-    return subband_erle_estimator_.Erle();
-  }
-  // Returns the subband ERLE that are estimated during onsets. Used
-  // for logging/testing.
-  const std::array<float, kFftLengthBy2Plus1>& ErleOnsets() const {
-    return subband_erle_estimator_.ErleOnsets();
-  }
-
-  // Returns the fullband ERLE estimate.
-  float FullbandErleLog2() const {
-    return fullband_erle_estimator_.FullbandErleLog2();
-  }
-
-  // Returns an estimation of the current linear filter quality based on the
-  // current and past fullband ERLE estimates. The returned value is a float
-  // between 0 and 1 where 1 indicates that, at this current time instant, the
-  // linear filter is reaching its maximum subtraction performance.
-  absl::optional<float> GetInstLinearQualityEstimate() const {
-    return fullband_erle_estimator_.GetInstLinearQualityEstimate();
-  }
-
-  void Dump(const std::unique_ptr<ApmDataDumper>& data_dumper) const;
-
- private:
-  const size_t startup_phase_length_blocks__;
-  FullBandErleEstimator fullband_erle_estimator_;
-  SubbandErleEstimator subband_erle_estimator_;
-  size_t blocks_since_reset_ = 0;
-};
-
-}  // namespace webrtc
-
-#endif  // MODULES_AUDIO_PROCESSING_AEC3_ERLE_ESTIMATOR_H_
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/fft_buffer.cc b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/fft_buffer.cc
deleted file mode 100644
index 379ef7c521..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/fft_buffer.cc
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- *  Copyright (c) 2017 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#include "modules/audio_processing/aec3/fft_buffer.h"
-
-namespace webrtc {
-
-FftBuffer::FftBuffer(size_t size) : size(static_cast<int>(size)), buffer(size) {
-  for (auto& b : buffer) {
-    b.Clear();
-  }
-}
-
-FftBuffer::~FftBuffer() = default;
-
-}  // namespace webrtc
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/fft_buffer.h b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/fft_buffer.h
deleted file mode 100644
index 9f81a910a8..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/fft_buffer.h
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- *  Copyright (c) 2017 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#ifndef MODULES_AUDIO_PROCESSING_AEC3_FFT_BUFFER_H_
-#define MODULES_AUDIO_PROCESSING_AEC3_FFT_BUFFER_H_
-
-#include <stddef.h>
-#include <vector>
-
-#include "modules/audio_processing/aec3/fft_data.h"
-#include "rtc_base/checks.h"
-
-namespace webrtc {
-
-// Struct for bundling a circular buffer of FftData objects together with the
-// read and write indices.
-struct FftBuffer {
-  explicit FftBuffer(size_t size);
-  ~FftBuffer();
-
-  int IncIndex(int index) const {
-    RTC_DCHECK_EQ(buffer.size(), static_cast<size_t>(size));
-    return index < size - 1 ? index + 1 : 0;
-  }
-
-  int DecIndex(int index) const {
-    RTC_DCHECK_EQ(buffer.size(), static_cast<size_t>(size));
-    return index > 0 ? index - 1 : size - 1;
-  }
-
-  int OffsetIndex(int index, int offset) const {
-    RTC_DCHECK_GE(buffer.size(), offset);
-    RTC_DCHECK_EQ(buffer.size(), static_cast<size_t>(size));
-    return (size + index + offset) % size;
-  }
-
-  void UpdateWriteIndex(int offset) { write = OffsetIndex(write, offset); }
-  void IncWriteIndex() { write = IncIndex(write); }
-  void DecWriteIndex() { write = DecIndex(write); }
-  void UpdateReadIndex(int offset) { read = OffsetIndex(read, offset); }
-  void IncReadIndex() { read = IncIndex(read); }
-  void DecReadIndex() { read = DecIndex(read); }
-
-  const int size;
-  std::vector<FftData> buffer;
-  int write = 0;
-  int read = 0;
-};
-
-}  // namespace webrtc
-
-#endif  // MODULES_AUDIO_PROCESSING_AEC3_FFT_BUFFER_H_
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/fft_data.h b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/fft_data.h
deleted file mode 100644
index 5e5adb62de..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/fft_data.h
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
- *  Copyright (c) 2017 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#ifndef MODULES_AUDIO_PROCESSING_AEC3_FFT_DATA_H_
-#define MODULES_AUDIO_PROCESSING_AEC3_FFT_DATA_H_
-
-// Defines WEBRTC_ARCH_X86_FAMILY, used below.
-#include "rtc_base/system/arch.h"
-
-#if defined(WEBRTC_ARCH_X86_FAMILY)
-#include <emmintrin.h>
-#endif
-#include <algorithm>
-#include <array>
-
-#include "api/array_view.h"
-#include "modules/audio_processing/aec3/aec3_common.h"
-
-namespace webrtc {
-
-// Struct that holds imaginary data produced from 128 point real-valued FFTs.
-struct FftData {
-  // Copies the data in src.
-  void Assign(const FftData& src) {
-    std::copy(src.re.begin(), src.re.end(), re.begin());
-    std::copy(src.im.begin(), src.im.end(), im.begin());
-    im[0] = im[kFftLengthBy2] = 0;
-  }
-
-  // Clears all the imaginary.
-  void Clear() {
-    re.fill(0.f);
-    im.fill(0.f);
-  }
-
-  // Computes the power spectrum of the data.
-  void Spectrum(Aec3Optimization optimization,
-                rtc::ArrayView<float> power_spectrum) const {
-    RTC_DCHECK_EQ(kFftLengthBy2Plus1, power_spectrum.size());
-    switch (optimization) {
-#if defined(WEBRTC_ARCH_X86_FAMILY)
-      case Aec3Optimization::kSse2: {
-        constexpr int kNumFourBinBands = kFftLengthBy2 / 4;
-        constexpr int kLimit = kNumFourBinBands * 4;
-        for (size_t k = 0; k < kLimit; k += 4) {
-          const __m128 r = _mm_loadu_ps(&re[k]);
-          const __m128 i = _mm_loadu_ps(&im[k]);
-          const __m128 ii = _mm_mul_ps(i, i);
-          const __m128 rr = _mm_mul_ps(r, r);
-          const __m128 rrii = _mm_add_ps(rr, ii);
-          _mm_storeu_ps(&power_spectrum[k], rrii);
-        }
-        power_spectrum[kFftLengthBy2] = re[kFftLengthBy2] * re[kFftLengthBy2] +
-                                        im[kFftLengthBy2] * im[kFftLengthBy2];
-      } break;
-#endif
-      default:
-        std::transform(re.begin(), re.end(), im.begin(), power_spectrum.begin(),
-                       [](float a, float b) { return a * a + b * b; });
-    }
-  }
-
-  // Copy the data from an interleaved array.
-  void CopyFromPackedArray(const std::array<float, kFftLength>& v) {
-    re[0] = v[0];
-    re[kFftLengthBy2] = v[1];
-    im[0] = im[kFftLengthBy2] = 0;
-    for (size_t k = 1, j = 2; k < kFftLengthBy2; ++k) {
-      re[k] = v[j++];
-      im[k] = v[j++];
-    }
-  }
-
-  // Copies the data into an interleaved array.
-  void CopyToPackedArray(std::array<float, kFftLength>* v) const {
-    RTC_DCHECK(v);
-    (*v)[0] = re[0];
-    (*v)[1] = re[kFftLengthBy2];
-    for (size_t k = 1, j = 2; k < kFftLengthBy2; ++k) {
-      (*v)[j++] = re[k];
-      (*v)[j++] = im[k];
-    }
-  }
-
-  std::array<float, kFftLengthBy2Plus1> re;
-  std::array<float, kFftLengthBy2Plus1> im;
-};
-
-}  // namespace webrtc
-
-#endif  // MODULES_AUDIO_PROCESSING_AEC3_FFT_DATA_H_
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/filter_analyzer.cc b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/filter_analyzer.cc
deleted file mode 100644
index 5b890d7474..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/filter_analyzer.cc
+++ /dev/null
@@ -1,172 +0,0 @@
-/*
- *  Copyright (c) 2017 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#include "modules/audio_processing/aec3/filter_analyzer.h"
-#include <math.h>
-
-#include <algorithm>
-#include <array>
-#include <numeric>
-
-#include "modules/audio_processing/aec3/aec3_common.h"
-#include "modules/audio_processing/aec3/render_buffer.h"
-#include "modules/audio_processing/logging/apm_data_dumper.h"
-#include "rtc_base/atomicops.h"
-#include "rtc_base/checks.h"
-#include "system_wrappers/include/field_trial.h"
-
-namespace webrtc {
-namespace {
-
-size_t FindPeakIndex(rtc::ArrayView<const float> filter_time_domain) {
-  size_t peak_index = 0;
-  float max_h2 = filter_time_domain[0] * filter_time_domain[0];
-  for (size_t k = 1; k < filter_time_domain.size(); ++k) {
-    float tmp = filter_time_domain[k] * filter_time_domain[k];
-    if (tmp > max_h2) {
-      peak_index = k;
-      max_h2 = tmp;
-    }
-  }
-
-  return peak_index;
-}
-
-bool EnableFilterPreprocessing() {
-  return !field_trial::IsEnabled(
-      "WebRTC-Aec3FilterAnalyzerPreprocessorKillSwitch");
-}
-
-}  // namespace
-
-int FilterAnalyzer::instance_count_ = 0;
-
-FilterAnalyzer::FilterAnalyzer(const EchoCanceller3Config& config)
-    : data_dumper_(
-          new ApmDataDumper(rtc::AtomicOps::Increment(&instance_count_))),
-      use_preprocessed_filter_(EnableFilterPreprocessing()),
-      bounded_erl_(config.ep_strength.bounded_erl),
-      default_gain_(config.ep_strength.lf),
-      active_render_threshold_(config.render_levels.active_render_limit *
-                               config.render_levels.active_render_limit *
-                               kFftLengthBy2),
-      h_highpass_(GetTimeDomainLength(config.filter.main.length_blocks), 0.f),
-      filter_length_blocks_(config.filter.main_initial.length_blocks) {
-  Reset();
-}
-
-void FilterAnalyzer::PreProcessFilter(
-    rtc::ArrayView<const float> filter_time_domain) {
-  RTC_DCHECK_GE(h_highpass_.capacity(), filter_time_domain.size());
-  h_highpass_.resize(filter_time_domain.size());
-  // Minimum phase high-pass filter with cutoff frequency at about 600 Hz.
-  constexpr std::array<float, 3> h = {{0.7929742f, -0.36072128f, -0.47047766f}};
-
-  std::fill(h_highpass_.begin(), h_highpass_.end(), 0.f);
-  for (size_t k = h.size() - 1; k < filter_time_domain.size(); ++k) {
-    for (size_t j = 0; j < h.size(); ++j) {
-      h_highpass_[k] += filter_time_domain[k - j] * h[j];
-    }
-  }
-}
-
-FilterAnalyzer::~FilterAnalyzer() = default;
-
-void FilterAnalyzer::Reset() {
-  delay_blocks_ = 0;
-  consistent_estimate_ = false;
-  blocks_since_reset_ = 0;
-  consistent_estimate_ = false;
-  consistent_estimate_counter_ = 0;
-  consistent_delay_reference_ = -10;
-  gain_ = default_gain_;
-}
-
-void FilterAnalyzer::Update(
-    rtc::ArrayView<const float> filter_time_domain,
-    const std::vector<std::array<float, kFftLengthBy2Plus1>>&
-        filter_freq_response,
-    const RenderBuffer& render_buffer) {
-  // Preprocess the filter to avoid issues with low-frequency components in the
-  // filter.
-  PreProcessFilter(filter_time_domain);
-  data_dumper_->DumpRaw("aec3_linear_filter_processed_td", h_highpass_);
-
-  const auto& filter_to_analyze =
-      use_preprocessed_filter_ ? h_highpass_ : filter_time_domain;
-  RTC_DCHECK_EQ(filter_to_analyze.size(), filter_time_domain.size());
-
-  size_t peak_index = FindPeakIndex(filter_to_analyze);
-  delay_blocks_ = peak_index >> kBlockSizeLog2;
-  UpdateFilterGain(filter_to_analyze, peak_index);
-
-  float filter_floor = 0;
-  float filter_secondary_peak = 0;
-  size_t limit1 = peak_index < 64 ? 0 : peak_index - 64;
-  size_t limit2 =
-      peak_index > filter_to_analyze.size() - 129 ? 0 : peak_index + 128;
-
-  for (size_t k = 0; k < limit1; ++k) {
-    float abs_h = fabsf(filter_to_analyze[k]);
-    filter_floor += abs_h;
-    filter_secondary_peak = std::max(filter_secondary_peak, abs_h);
-  }
-  for (size_t k = limit2; k < filter_to_analyze.size(); ++k) {
-    float abs_h = fabsf(filter_to_analyze[k]);
-    filter_floor += abs_h;
-    filter_secondary_peak = std::max(filter_secondary_peak, abs_h);
-  }
-
-  filter_floor /= (limit1 + filter_to_analyze.size() - limit2);
-
-  float abs_peak = fabsf(filter_to_analyze[peak_index]);
-  bool significant_peak_index =
-      abs_peak > 10.f * filter_floor && abs_peak > 2.f * filter_secondary_peak;
-
-  if (consistent_delay_reference_ != delay_blocks_ || !significant_peak_index) {
-    consistent_estimate_counter_ = 0;
-    consistent_delay_reference_ = delay_blocks_;
-  } else {
-    const auto& x = render_buffer.Block(-delay_blocks_)[0];
-    const float x_energy =
-        std::inner_product(x.begin(), x.end(), x.begin(), 0.f);
-    const bool active_render_block = x_energy > active_render_threshold_;
-
-    if (active_render_block) {
-      ++consistent_estimate_counter_;
-    }
-  }
-
-  consistent_estimate_ =
-      consistent_estimate_counter_ > 1.5f * kNumBlocksPerSecond;
-
-  filter_length_blocks_ = filter_time_domain.size() * (1.f / kBlockSize);
-}
-
-void FilterAnalyzer::UpdateFilterGain(
-    rtc::ArrayView<const float> filter_time_domain,
-    size_t peak_index) {
-  bool sufficient_time_to_converge =
-      ++blocks_since_reset_ > 5 * kNumBlocksPerSecond;
-
-  if (sufficient_time_to_converge && consistent_estimate_) {
-    gain_ = fabsf(filter_time_domain[peak_index]);
-  } else {
-    if (gain_) {
-      gain_ = std::max(gain_, fabsf(filter_time_domain[peak_index]));
-    }
-  }
-
-  if (bounded_erl_ && gain_) {
-    gain_ = std::max(gain_, 0.01f);
-  }
-}
-
-}  // namespace webrtc
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/filter_analyzer.h b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/filter_analyzer.h
deleted file mode 100644
index 99a0e25973..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/filter_analyzer.h
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- *  Copyright (c) 2017 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#ifndef MODULES_AUDIO_PROCESSING_AEC3_FILTER_ANALYZER_H_
-#define MODULES_AUDIO_PROCESSING_AEC3_FILTER_ANALYZER_H_
-
-#include <stddef.h>
-#include <array>
-#include <memory>
-#include <vector>
-
-#include "api/array_view.h"
-#include "api/audio/echo_canceller3_config.h"
-#include "modules/audio_processing/aec3/aec3_common.h"
-#include "rtc_base/constructormagic.h"
-
-namespace webrtc {
-
-class ApmDataDumper;
-class RenderBuffer;
-
-// Class for analyzing the properties of an adaptive filter.
-class FilterAnalyzer {
- public:
-  explicit FilterAnalyzer(const EchoCanceller3Config& config);
-  ~FilterAnalyzer();
-
-  // Resets the analysis.
-  void Reset();
-
-  // Updates the estimates with new input data.
-  void Update(rtc::ArrayView<const float> filter_time_domain,
-              const std::vector<std::array<float, kFftLengthBy2Plus1>>&
-                  filter_freq_response,
-              const RenderBuffer& render_buffer);
-
-  // Returns the delay of the filter in terms of blocks.
-  int DelayBlocks() const { return delay_blocks_; }
-
-  // Returns whether the filter is consistent in the sense that it does not
-  // change much over time.
-  bool Consistent() const { return consistent_estimate_; }
-
-  // Returns the estimated filter gain.
-  float Gain() const { return gain_; }
-
-  // Returns the number of blocks for the current used filter.
-  float FilterLengthBlocks() const { return filter_length_blocks_; }
-
-  // Returns the preprocessed filter.
-  rtc::ArrayView<const float> GetAdjustedFilter() const { return h_highpass_; }
-
- private:
-  void UpdateFilterGain(rtc::ArrayView<const float> filter_time_domain,
-                        size_t max_index);
-  void PreProcessFilter(rtc::ArrayView<const float> filter_time_domain);
-
-  static int instance_count_;
-  std::unique_ptr<ApmDataDumper> data_dumper_;
-  const bool use_preprocessed_filter_;
-  const bool bounded_erl_;
-  const float default_gain_;
-  const float active_render_threshold_;
-  std::vector<float> h_highpass_;
-  int delay_blocks_ = 0;
-  size_t blocks_since_reset_ = 0;
-  bool consistent_estimate_ = false;
-  size_t consistent_estimate_counter_ = 0;
-  int consistent_delay_reference_ = -10;
-  float gain_;
-  int filter_length_blocks_;
-  RTC_DISALLOW_COPY_AND_ASSIGN(FilterAnalyzer);
-};
-
-}  // namespace webrtc
-
-#endif  // MODULES_AUDIO_PROCESSING_AEC3_FILTER_ANALYZER_H_
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/frame_blocker.cc b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/frame_blocker.cc
deleted file mode 100644
index ca122e5ebb..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/frame_blocker.cc
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- *  Copyright (c) 2016 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#include "modules/audio_processing/aec3/frame_blocker.h"
-
-#include "modules/audio_processing/aec3/aec3_common.h"
-#include "rtc_base/checks.h"
-
-namespace webrtc {
-
-FrameBlocker::FrameBlocker(size_t num_bands)
-    : num_bands_(num_bands), buffer_(num_bands_) {
-  for (auto& b : buffer_) {
-    b.reserve(kBlockSize);
-    RTC_DCHECK(b.empty());
-  }
-}
-
-FrameBlocker::~FrameBlocker() = default;
-
-void FrameBlocker::InsertSubFrameAndExtractBlock(
-    const std::vector<rtc::ArrayView<float>>& sub_frame,
-    std::vector<std::vector<float>>* block) {
-  RTC_DCHECK(block);
-  RTC_DCHECK_EQ(num_bands_, block->size());
-  RTC_DCHECK_EQ(num_bands_, sub_frame.size());
-  for (size_t i = 0; i < num_bands_; ++i) {
-    RTC_DCHECK_GE(kBlockSize - 16, buffer_[i].size());
-    RTC_DCHECK_EQ(kBlockSize, (*block)[i].size());
-    RTC_DCHECK_EQ(kSubFrameLength, sub_frame[i].size());
-    const int samples_to_block = kBlockSize - buffer_[i].size();
-    (*block)[i].clear();
-    (*block)[i].insert((*block)[i].begin(), buffer_[i].begin(),
-                       buffer_[i].end());
-    (*block)[i].insert((*block)[i].begin() + buffer_[i].size(),
-                       sub_frame[i].begin(),
-                       sub_frame[i].begin() + samples_to_block);
-    buffer_[i].clear();
-    buffer_[i].insert(buffer_[i].begin(),
-                      sub_frame[i].begin() + samples_to_block,
-                      sub_frame[i].end());
-  }
-}
-
-bool FrameBlocker::IsBlockAvailable() const {
-  return kBlockSize == buffer_[0].size();
-}
-
-void FrameBlocker::ExtractBlock(std::vector<std::vector<float>>* block) {
-  RTC_DCHECK(block);
-  RTC_DCHECK_EQ(num_bands_, block->size());
-  RTC_DCHECK(IsBlockAvailable());
-  for (size_t i = 0; i < num_bands_; ++i) {
-    RTC_DCHECK_EQ(kBlockSize, buffer_[i].size());
-    RTC_DCHECK_EQ(kBlockSize, (*block)[i].size());
-    (*block)[i].clear();
-    (*block)[i].insert((*block)[i].begin(), buffer_[i].begin(),
-                       buffer_[i].end());
-    buffer_[i].clear();
-  }
-}
-
-}  // namespace webrtc
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/frame_blocker.h b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/frame_blocker.h
deleted file mode 100644
index 08e1e1dd23..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/frame_blocker.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- *  Copyright (c) 2016 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#ifndef MODULES_AUDIO_PROCESSING_AEC3_FRAME_BLOCKER_H_
-#define MODULES_AUDIO_PROCESSING_AEC3_FRAME_BLOCKER_H_
-
-#include <stddef.h>
-#include <vector>
-
-#include "api/array_view.h"
-#include "modules/audio_processing/aec3/aec3_common.h"
-#include "rtc_base/constructormagic.h"
-
-namespace webrtc {
-
-// Class for producing 64 sample multiband blocks from frames consisting of 1 or
-// 2 subframes of 80 samples.
-class FrameBlocker {
- public:
-  explicit FrameBlocker(size_t num_bands);
-  ~FrameBlocker();
-  // Inserts one 80 sample multiband subframe from the multiband frame and
-  // extracts one 64 sample multiband block.
-  void InsertSubFrameAndExtractBlock(
-      const std::vector<rtc::ArrayView<float>>& sub_frame,
-      std::vector<std::vector<float>>* block);
-  // Reports whether a multiband block of 64 samples is available for
-  // extraction.
-  bool IsBlockAvailable() const;
-  // Extracts a multiband block of 64 samples.
-  void ExtractBlock(std::vector<std::vector<float>>* block);
-
- private:
-  const size_t num_bands_;
-  std::vector<std::vector<float>> buffer_;
-
-  RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(FrameBlocker);
-};
-}  // namespace webrtc
-
-#endif  // MODULES_AUDIO_PROCESSING_AEC3_FRAME_BLOCKER_H_
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/fullband_erle_estimator.cc b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/fullband_erle_estimator.cc
deleted file mode 100644
index dc745090d6..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/fullband_erle_estimator.cc
+++ /dev/null
@@ -1,169 +0,0 @@
-/*
- *  Copyright (c) 2018 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#include "modules/audio_processing/aec3/fullband_erle_estimator.h"
-
-#include <algorithm>
-#include <memory>
-#include <numeric>
-
-#include "absl/types/optional.h"
-#include "api/array_view.h"
-#include "modules/audio_processing/aec3/aec3_common.h"
-#include "modules/audio_processing/logging/apm_data_dumper.h"
-#include "rtc_base/checks.h"
-#include "rtc_base/numerics/safe_minmax.h"
-
-namespace webrtc {
-
-namespace {
-constexpr float kEpsilon = 1e-3f;
-constexpr float kX2BandEnergyThreshold = 44015068.0f;
-constexpr int kErleHold = 100;
-constexpr int kPointsToAccumulate = 6;
-}  // namespace
-
-FullBandErleEstimator::FullBandErleEstimator(float min_erle, float max_erle_lf)
-    : min_erle_log2_(FastApproxLog2f(min_erle + kEpsilon)),
-      max_erle_lf_log2(FastApproxLog2f(max_erle_lf + kEpsilon)) {
-  Reset();
-}
-
-FullBandErleEstimator::~FullBandErleEstimator() = default;
-
-void FullBandErleEstimator::Reset() {
-  instantaneous_erle_.Reset();
-  erle_time_domain_log2_ = min_erle_log2_;
-  hold_counter_time_domain_ = 0;
-}
-
-void FullBandErleEstimator::Update(rtc::ArrayView<const float> X2,
-                                   rtc::ArrayView<const float> Y2,
-                                   rtc::ArrayView<const float> E2,
-                                   bool converged_filter) {
-  if (converged_filter) {
-    // Computes the fullband ERLE.
-    const float X2_sum = std::accumulate(X2.begin(), X2.end(), 0.0f);
-    if (X2_sum > kX2BandEnergyThreshold * X2.size()) {
-      const float Y2_sum = std::accumulate(Y2.begin(), Y2.end(), 0.0f);
-      const float E2_sum = std::accumulate(E2.begin(), E2.end(), 0.0f);
-      if (instantaneous_erle_.Update(Y2_sum, E2_sum)) {
-        hold_counter_time_domain_ = kErleHold;
-        erle_time_domain_log2_ +=
-            0.1f * ((instantaneous_erle_.GetInstErleLog2().value()) -
-                    erle_time_domain_log2_);
-        erle_time_domain_log2_ = rtc::SafeClamp(
-            erle_time_domain_log2_, min_erle_log2_, max_erle_lf_log2);
-      }
-    }
-  }
-  --hold_counter_time_domain_;
-  if (hold_counter_time_domain_ <= 0) {
-    erle_time_domain_log2_ =
-        std::max(min_erle_log2_, erle_time_domain_log2_ - 0.044f);
-  }
-  if (hold_counter_time_domain_ == 0) {
-    instantaneous_erle_.ResetAccumulators();
-  }
-}
-
-void FullBandErleEstimator::Dump(
-    const std::unique_ptr<ApmDataDumper>& data_dumper) const {
-  data_dumper->DumpRaw("aec3_fullband_erle_log2", FullbandErleLog2());
-  instantaneous_erle_.Dump(data_dumper);
-}
-
-FullBandErleEstimator::ErleInstantaneous::ErleInstantaneous() {
-  Reset();
-}
-
-FullBandErleEstimator::ErleInstantaneous::~ErleInstantaneous() = default;
-
-bool FullBandErleEstimator::ErleInstantaneous::Update(const float Y2_sum,
-                                                      const float E2_sum) {
-  bool update_estimates = false;
-  E2_acum_ += E2_sum;
-  Y2_acum_ += Y2_sum;
-  num_points_++;
-  if (num_points_ == kPointsToAccumulate) {
-    if (E2_acum_ > 0.f) {
-      update_estimates = true;
-      erle_log2_ = FastApproxLog2f(Y2_acum_ / E2_acum_ + kEpsilon);
-    }
-    num_points_ = 0;
-    E2_acum_ = 0.f;
-    Y2_acum_ = 0.f;
-  }
-
-  if (update_estimates) {
-    UpdateMaxMin();
-    UpdateQualityEstimate();
-  }
-  return update_estimates;
-}
-
-void FullBandErleEstimator::ErleInstantaneous::Reset() {
-  ResetAccumulators();
-  max_erle_log2_ = -10.f;  // -30 dB.
-  min_erle_log2_ = 33.f;   // 100 dB.
-  inst_quality_estimate_ = 0.f;
-}
-
-void FullBandErleEstimator::ErleInstantaneous::ResetAccumulators() {
-  erle_log2_ = absl::nullopt;
-  inst_quality_estimate_ = 0.f;
-  num_points_ = 0;
-  E2_acum_ = 0.f;
-  Y2_acum_ = 0.f;
-}
-
-void FullBandErleEstimator::ErleInstantaneous::Dump(
-    const std::unique_ptr<ApmDataDumper>& data_dumper) const {
-  data_dumper->DumpRaw("aec3_fullband_erle_inst_log2",
-                       erle_log2_ ? *erle_log2_ : -10.f);
-  data_dumper->DumpRaw(
-      "aec3_erle_instantaneous_quality",
-      GetQualityEstimate() ? GetQualityEstimate().value() : 0.f);
-  data_dumper->DumpRaw("aec3_fullband_erle_max_log2", max_erle_log2_);
-  data_dumper->DumpRaw("aec3_fullband_erle_min_log2", min_erle_log2_);
-}
-
-void FullBandErleEstimator::ErleInstantaneous::UpdateMaxMin() {
-  RTC_DCHECK(erle_log2_);
-  if (erle_log2_.value() > max_erle_log2_) {
-    max_erle_log2_ = erle_log2_.value();
-  } else {
-    max_erle_log2_ -= 0.0004;  // Forget factor, approx 1dB every 3 sec.
-  }
-
-  if (erle_log2_.value() < min_erle_log2_) {
-    min_erle_log2_ = erle_log2_.value();
-  } else {
-    min_erle_log2_ += 0.0004;  // Forget factor, approx 1dB every 3 sec.
-  }
-}
-
-void FullBandErleEstimator::ErleInstantaneous::UpdateQualityEstimate() {
-  const float alpha = 0.07f;
-  float quality_estimate = 0.f;
-  RTC_DCHECK(erle_log2_);
-  if (max_erle_log2_ > min_erle_log2_) {
-    quality_estimate = (erle_log2_.value() - min_erle_log2_) /
-                       (max_erle_log2_ - min_erle_log2_);
-  }
-  if (quality_estimate > inst_quality_estimate_) {
-    inst_quality_estimate_ = quality_estimate;
-  } else {
-    inst_quality_estimate_ +=
-        alpha * (quality_estimate - inst_quality_estimate_);
-  }
-}
-
-}  // namespace webrtc
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/fullband_erle_estimator.h b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/fullband_erle_estimator.h
deleted file mode 100644
index 175db55e11..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/fullband_erle_estimator.h
+++ /dev/null
@@ -1,93 +0,0 @@
-/*
- *  Copyright (c) 2018 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#ifndef MODULES_AUDIO_PROCESSING_AEC3_FULLBAND_ERLE_ESTIMATOR_H_
-#define MODULES_AUDIO_PROCESSING_AEC3_FULLBAND_ERLE_ESTIMATOR_H_
-
-#include <memory>
-
-#include "absl/types/optional.h"
-#include "api/array_view.h"
-#include "modules/audio_processing/logging/apm_data_dumper.h"
-
-namespace webrtc {
-
-// Estimates the echo return loss enhancement using the energy of all the
-// freuquency bands.
-class FullBandErleEstimator {
- public:
-  FullBandErleEstimator(float min_erle, float max_erle_lf);
-  ~FullBandErleEstimator();
-  // Resets the ERLE estimator.
-  void Reset();
-
-  // Updates the ERLE estimator.
-  void Update(rtc::ArrayView<const float> X2,
-              rtc::ArrayView<const float> Y2,
-              rtc::ArrayView<const float> E2,
-              bool converged_filter);
-
-  // Returns the fullband ERLE estimates in log2 units.
-  float FullbandErleLog2() const { return erle_time_domain_log2_; }
-
-  // Returns an estimation of the current linear filter quality. It returns a
-  // float number between 0 and 1 mapping 1 to the highest possible quality.
-  absl::optional<float> GetInstLinearQualityEstimate() const {
-    return instantaneous_erle_.GetQualityEstimate();
-  }
-
-  void Dump(const std::unique_ptr<ApmDataDumper>& data_dumper) const;
-
- private:
-  class ErleInstantaneous {
-   public:
-    ErleInstantaneous();
-    ~ErleInstantaneous();
-
-    // Updates the estimator with a new point, returns true
-    // if the instantaneous ERLE was updated due to having enough
-    // points for performing the estimate.
-    bool Update(const float Y2_sum, const float E2_sum);
-    // Resets the instantaneous ERLE estimator to its initial state.
-    void Reset();
-    // Resets the members related with an instantaneous estimate.
-    void ResetAccumulators();
-    // Returns the instantaneous ERLE in log2 units.
-    absl::optional<float> GetInstErleLog2() const { return erle_log2_; }
-    // Gets an indication between 0 and 1 of the performance of the linear
-    // filter for the current time instant.
-    absl::optional<float> GetQualityEstimate() const {
-      return erle_log2_ ? absl::optional<float>(inst_quality_estimate_)
-                        : absl::nullopt;
-    }
-    void Dump(const std::unique_ptr<ApmDataDumper>& data_dumper) const;
-
-   private:
-    void UpdateMaxMin();
-    void UpdateQualityEstimate();
-    absl::optional<float> erle_log2_;
-    float inst_quality_estimate_;
-    float max_erle_log2_;
-    float min_erle_log2_;
-    float Y2_acum_;
-    float E2_acum_;
-    int num_points_;
-  };
-
-  int hold_counter_time_domain_;
-  float erle_time_domain_log2_;
-  const float min_erle_log2_;
-  const float max_erle_lf_log2;
-  ErleInstantaneous instantaneous_erle_;
-};
-
-}  // namespace webrtc
-
-#endif  // MODULES_AUDIO_PROCESSING_AEC3_FULLBAND_ERLE_ESTIMATOR_H_
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/main_filter_update_gain.cc b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/main_filter_update_gain.cc
deleted file mode 100644
index ef87d142db..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/main_filter_update_gain.cc
+++ /dev/null
@@ -1,177 +0,0 @@
-/*
- *  Copyright (c) 2017 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#include "modules/audio_processing/aec3/main_filter_update_gain.h"
-
-#include <algorithm>
-#include <functional>
-
-#include "modules/audio_processing/aec3/adaptive_fir_filter.h"
-#include "modules/audio_processing/aec3/aec3_common.h"
-#include "modules/audio_processing/aec3/echo_path_variability.h"
-#include "modules/audio_processing/aec3/fft_data.h"
-#include "modules/audio_processing/aec3/render_signal_analyzer.h"
-#include "modules/audio_processing/aec3/subtractor_output.h"
-#include "modules/audio_processing/logging/apm_data_dumper.h"
-#include "rtc_base/atomicops.h"
-#include "rtc_base/checks.h"
-
-namespace webrtc {
-namespace {
-
-constexpr float kHErrorInitial = 10000.f;
-constexpr int kPoorExcitationCounterInitial = 1000;
-
-}  // namespace
-
-int MainFilterUpdateGain::instance_count_ = 0;
-
-MainFilterUpdateGain::MainFilterUpdateGain(
-    const EchoCanceller3Config::Filter::MainConfiguration& config,
-    size_t config_change_duration_blocks)
-    : data_dumper_(
-          new ApmDataDumper(rtc::AtomicOps::Increment(&instance_count_))),
-      config_change_duration_blocks_(
-          static_cast<int>(config_change_duration_blocks)),
-      poor_excitation_counter_(kPoorExcitationCounterInitial) {
-  SetConfig(config, true);
-  H_error_.fill(kHErrorInitial);
-  RTC_DCHECK_LT(0, config_change_duration_blocks_);
-  one_by_config_change_duration_blocks_ = 1.f / config_change_duration_blocks_;
-}
-
-MainFilterUpdateGain::~MainFilterUpdateGain() {}
-
-void MainFilterUpdateGain::HandleEchoPathChange(
-    const EchoPathVariability& echo_path_variability) {
-  if (echo_path_variability.gain_change) {
-    // TODO(bugs.webrtc.org/9526) Handle gain changes.
-  }
-
-  if (echo_path_variability.delay_change !=
-      EchoPathVariability::DelayAdjustment::kNone) {
-    H_error_.fill(kHErrorInitial);
-  }
-
-  if (!echo_path_variability.gain_change) {
-    poor_excitation_counter_ = kPoorExcitationCounterInitial;
-    call_counter_ = 0;
-  }
-}
-
-void MainFilterUpdateGain::Compute(
-    const std::array<float, kFftLengthBy2Plus1>& render_power,
-    const RenderSignalAnalyzer& render_signal_analyzer,
-    const SubtractorOutput& subtractor_output,
-    const AdaptiveFirFilter& filter,
-    bool saturated_capture_signal,
-    FftData* gain_fft) {
-  RTC_DCHECK(gain_fft);
-  // Introducing shorter notation to improve readability.
-  const FftData& E_main = subtractor_output.E_main;
-  const auto& E2_main = subtractor_output.E2_main;
-  const auto& E2_shadow = subtractor_output.E2_shadow;
-  FftData* G = gain_fft;
-  const size_t size_partitions = filter.SizePartitions();
-  auto X2 = render_power;
-  const auto& erl = filter.Erl();
-  ++call_counter_;
-
-  UpdateCurrentConfig();
-
-  if (render_signal_analyzer.PoorSignalExcitation()) {
-    poor_excitation_counter_ = 0;
-  }
-
-  // Do not update the filter if the render is not sufficiently excited.
-  if (++poor_excitation_counter_ < size_partitions ||
-      saturated_capture_signal || call_counter_ <= size_partitions) {
-    G->re.fill(0.f);
-    G->im.fill(0.f);
-  } else {
-    // Corresponds to WGN of power -39 dBFS.
-    std::array<float, kFftLengthBy2Plus1> mu;
-    // mu = H_error / (0.5* H_error* X2 + n * E2).
-    for (size_t k = 0; k < kFftLengthBy2Plus1; ++k) {
-      mu[k] = X2[k] > current_config_.noise_gate
-                  ? H_error_[k] / (0.5f * H_error_[k] * X2[k] +
-                                   size_partitions * E2_main[k])
-                  : 0.f;
-    }
-
-    // Avoid updating the filter close to narrow bands in the render signals.
-    render_signal_analyzer.MaskRegionsAroundNarrowBands(&mu);
-
-    // H_error = H_error - 0.5 * mu * X2 * H_error.
-    for (size_t k = 0; k < H_error_.size(); ++k) {
-      H_error_[k] -= 0.5f * mu[k] * X2[k] * H_error_[k];
-    }
-
-    // G = mu * E.
-    std::transform(mu.begin(), mu.end(), E_main.re.begin(), G->re.begin(),
-                   std::multiplies<float>());
-    std::transform(mu.begin(), mu.end(), E_main.im.begin(), G->im.begin(),
-                   std::multiplies<float>());
-  }
-
-  // H_error = H_error + factor * erl.
-  std::array<float, kFftLengthBy2Plus1> H_error_increase;
-  std::transform(E2_shadow.begin(), E2_shadow.end(), E2_main.begin(),
-                 H_error_increase.begin(), [&](float a, float b) {
-                   return a >= b ? current_config_.leakage_converged
-                                 : current_config_.leakage_diverged;
-                 });
-  std::transform(erl.begin(), erl.end(), H_error_increase.begin(),
-                 H_error_increase.begin(), std::multiplies<float>());
-  std::transform(H_error_.begin(), H_error_.end(), H_error_increase.begin(),
-                 H_error_.begin(), [&](float a, float b) {
-                   float error = a + b;
-                   error = std::max(error, current_config_.error_floor);
-                   error = std::min(error, current_config_.error_ceil);
-                   return error;
-                 });
-
-  data_dumper_->DumpRaw("aec3_main_gain_H_error", H_error_);
-}
-
-void MainFilterUpdateGain::UpdateCurrentConfig() {
-  RTC_DCHECK_GE(config_change_duration_blocks_, config_change_counter_);
-  if (config_change_counter_ > 0) {
-    if (--config_change_counter_ > 0) {
-      auto average = [](float from, float to, float from_weight) {
-        return from * from_weight + to * (1.f - from_weight);
-      };
-
-      float change_factor =
-          config_change_counter_ * one_by_config_change_duration_blocks_;
-
-      current_config_.leakage_converged =
-          average(old_target_config_.leakage_converged,
-                  target_config_.leakage_converged, change_factor);
-      current_config_.leakage_diverged =
-          average(old_target_config_.leakage_diverged,
-                  target_config_.leakage_diverged, change_factor);
-      current_config_.error_floor =
-          average(old_target_config_.error_floor, target_config_.error_floor,
-                  change_factor);
-      current_config_.error_ceil =
-          average(old_target_config_.error_ceil, target_config_.error_ceil,
-                  change_factor);
-      current_config_.noise_gate =
-          average(old_target_config_.noise_gate, target_config_.noise_gate,
-                  change_factor);
-    } else {
-      current_config_ = old_target_config_ = target_config_;
-    }
-  }
-  RTC_DCHECK_LE(0, config_change_counter_);
-}
-
-}  // namespace webrtc
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/main_filter_update_gain.h b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/main_filter_update_gain.h
deleted file mode 100644
index 892ff689a4..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/main_filter_update_gain.h
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- *  Copyright (c) 2017 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#ifndef MODULES_AUDIO_PROCESSING_AEC3_MAIN_FILTER_UPDATE_GAIN_H_
-#define MODULES_AUDIO_PROCESSING_AEC3_MAIN_FILTER_UPDATE_GAIN_H_
-
-#include <stddef.h>
-#include <array>
-#include <memory>
-
-#include "api/audio/echo_canceller3_config.h"
-#include "modules/audio_processing/aec3/aec3_common.h"
-#include "rtc_base/constructormagic.h"
-
-namespace webrtc {
-
-class AdaptiveFirFilter;
-class ApmDataDumper;
-struct EchoPathVariability;
-struct FftData;
-class RenderSignalAnalyzer;
-struct SubtractorOutput;
-
-// Provides functionality for  computing the adaptive gain for the main filter.
-class MainFilterUpdateGain {
- public:
-  explicit MainFilterUpdateGain(
-      const EchoCanceller3Config::Filter::MainConfiguration& config,
-      size_t config_change_duration_blocks);
-  ~MainFilterUpdateGain();
-
-  // Takes action in the case of a known echo path change.
-  void HandleEchoPathChange(const EchoPathVariability& echo_path_variability);
-
-  // Computes the gain.
-  void Compute(const std::array<float, kFftLengthBy2Plus1>& render_power,
-               const RenderSignalAnalyzer& render_signal_analyzer,
-               const SubtractorOutput& subtractor_output,
-               const AdaptiveFirFilter& filter,
-               bool saturated_capture_signal,
-               FftData* gain_fft);
-
-  // Sets a new config.
-  void SetConfig(const EchoCanceller3Config::Filter::MainConfiguration& config,
-                 bool immediate_effect) {
-    if (immediate_effect) {
-      old_target_config_ = current_config_ = target_config_ = config;
-      config_change_counter_ = 0;
-    } else {
-      old_target_config_ = current_config_;
-      target_config_ = config;
-      config_change_counter_ = config_change_duration_blocks_;
-    }
-  }
-
- private:
-  static int instance_count_;
-  std::unique_ptr<ApmDataDumper> data_dumper_;
-  const int config_change_duration_blocks_;
-  float one_by_config_change_duration_blocks_;
-  EchoCanceller3Config::Filter::MainConfiguration current_config_;
-  EchoCanceller3Config::Filter::MainConfiguration target_config_;
-  EchoCanceller3Config::Filter::MainConfiguration old_target_config_;
-  std::array<float, kFftLengthBy2Plus1> H_error_;
-  size_t poor_excitation_counter_;
-  size_t call_counter_ = 0;
-  int config_change_counter_ = 0;
-
-  // Updates the current config towards the target config.
-  void UpdateCurrentConfig();
-
-  RTC_DISALLOW_COPY_AND_ASSIGN(MainFilterUpdateGain);
-};
-
-}  // namespace webrtc
-
-#endif  // MODULES_AUDIO_PROCESSING_AEC3_MAIN_FILTER_UPDATE_GAIN_H_
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/matched_filter.cc b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/matched_filter.cc
deleted file mode 100644
index 448386535d..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/matched_filter.cc
+++ /dev/null
@@ -1,458 +0,0 @@
-/*
- *  Copyright (c) 2017 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-#include "modules/audio_processing/aec3/matched_filter.h"
-
-// Defines WEBRTC_ARCH_X86_FAMILY, used below.
-#include "rtc_base/system/arch.h"
-
-#if defined(WEBRTC_ARCH_ARM_FAMILY) && defined(WEBRTC_HAS_NEON)
-#include <arm_neon.h>
-#endif
-#if defined(WEBRTC_ARCH_X86_FAMILY)
-#include <emmintrin.h>
-#endif
-#include <algorithm>
-#include <cstddef>
-#include <initializer_list>
-#include <iterator>
-#include <numeric>
-
-#include "modules/audio_processing/aec3/downsampled_render_buffer.h"
-#include "modules/audio_processing/logging/apm_data_dumper.h"
-#include "rtc_base/checks.h"
-#include "rtc_base/logging.h"
-
-namespace webrtc {
-namespace aec3 {
-
-#if defined(WEBRTC_ARCH_ARM_FAMILY) && defined(WEBRTC_HAS_NEON)
-
-void MatchedFilterCore_NEON(size_t x_start_index,
-                            float x2_sum_threshold,
-                            float smoothing,
-                            rtc::ArrayView<const float> x,
-                            rtc::ArrayView<const float> y,
-                            rtc::ArrayView<float> h,
-                            bool* filters_updated,
-                            float* error_sum) {
-  const int h_size = static_cast<int>(h.size());
-  const int x_size = static_cast<int>(x.size());
-  RTC_DCHECK_EQ(0, h_size % 4);
-
-  // Process for all samples in the sub-block.
-  for (size_t i = 0; i < y.size(); ++i) {
-    // Apply the matched filter as filter * x, and compute x * x.
-
-    RTC_DCHECK_GT(x_size, x_start_index);
-    const float* x_p = &x[x_start_index];
-    const float* h_p = &h[0];
-
-    // Initialize values for the accumulation.
-    float32x4_t s_128 = vdupq_n_f32(0);
-    float32x4_t x2_sum_128 = vdupq_n_f32(0);
-    float x2_sum = 0.f;
-    float s = 0;
-
-    // Compute loop chunk sizes until, and after, the wraparound of the circular
-    // buffer for x.
-    const int chunk1 =
-        std::min(h_size, static_cast<int>(x_size - x_start_index));
-
-    // Perform the loop in two chunks.
-    const int chunk2 = h_size - chunk1;
-    for (int limit : {chunk1, chunk2}) {
-      // Perform 128 bit vector operations.
-      const int limit_by_4 = limit >> 2;
-      for (int k = limit_by_4; k > 0; --k, h_p += 4, x_p += 4) {
-        // Load the data into 128 bit vectors.
-        const float32x4_t x_k = vld1q_f32(x_p);
-        const float32x4_t h_k = vld1q_f32(h_p);
-        // Compute and accumulate x * x and h * x.
-        x2_sum_128 = vmlaq_f32(x2_sum_128, x_k, x_k);
-        s_128 = vmlaq_f32(s_128, h_k, x_k);
-      }
-
-      // Perform non-vector operations for any remaining items.
-      for (int k = limit - limit_by_4 * 4; k > 0; --k, ++h_p, ++x_p) {
-        const float x_k = *x_p;
-        x2_sum += x_k * x_k;
-        s += *h_p * x_k;
-      }
-
-      x_p = &x[0];
-    }
-
-    // Combine the accumulated vector and scalar values.
-    float* v = reinterpret_cast<float*>(&x2_sum_128);
-    x2_sum += v[0] + v[1] + v[2] + v[3];
-    v = reinterpret_cast<float*>(&s_128);
-    s += v[0] + v[1] + v[2] + v[3];
-
-    // Compute the matched filter error.
-    float e = y[i] - s;
-    const bool saturation = y[i] >= 32000.f || y[i] <= -32000.f;
-    (*error_sum) += e * e;
-
-    // Update the matched filter estimate in an NLMS manner.
-    if (x2_sum > x2_sum_threshold && !saturation) {
-      RTC_DCHECK_LT(0.f, x2_sum);
-      const float alpha = smoothing * e / x2_sum;
-      const float32x4_t alpha_128 = vmovq_n_f32(alpha);
-
-      // filter = filter + smoothing * (y - filter * x) * x / x * x.
-      float* h_p = &h[0];
-      x_p = &x[x_start_index];
-
-      // Perform the loop in two chunks.
-      for (int limit : {chunk1, chunk2}) {
-        // Perform 128 bit vector operations.
-        const int limit_by_4 = limit >> 2;
-        for (int k = limit_by_4; k > 0; --k, h_p += 4, x_p += 4) {
-          // Load the data into 128 bit vectors.
-          float32x4_t h_k = vld1q_f32(h_p);
-          const float32x4_t x_k = vld1q_f32(x_p);
-          // Compute h = h + alpha * x.
-          h_k = vmlaq_f32(h_k, alpha_128, x_k);
-
-          // Store the result.
-          vst1q_f32(h_p, h_k);
-        }
-
-        // Perform non-vector operations for any remaining items.
-        for (int k = limit - limit_by_4 * 4; k > 0; --k, ++h_p, ++x_p) {
-          *h_p += alpha * *x_p;
-        }
-
-        x_p = &x[0];
-      }
-
-      *filters_updated = true;
-    }
-
-    x_start_index = x_start_index > 0 ? x_start_index - 1 : x_size - 1;
-  }
-}
-
-#endif
-
-#if defined(WEBRTC_ARCH_X86_FAMILY)
-
-void MatchedFilterCore_SSE2(size_t x_start_index,
-                            float x2_sum_threshold,
-                            float smoothing,
-                            rtc::ArrayView<const float> x,
-                            rtc::ArrayView<const float> y,
-                            rtc::ArrayView<float> h,
-                            bool* filters_updated,
-                            float* error_sum) {
-  const int h_size = static_cast<int>(h.size());
-  const int x_size = static_cast<int>(x.size());
-  RTC_DCHECK_EQ(0, h_size % 4);
-
-  // Process for all samples in the sub-block.
-  for (size_t i = 0; i < y.size(); ++i) {
-    // Apply the matched filter as filter * x, and compute x * x.
-
-    RTC_DCHECK_GT(x_size, x_start_index);
-    const float* x_p = &x[x_start_index];
-    const float* h_p = &h[0];
-
-    // Initialize values for the accumulation.
-    __m128 s_128 = _mm_set1_ps(0);
-    __m128 x2_sum_128 = _mm_set1_ps(0);
-    float x2_sum = 0.f;
-    float s = 0;
-
-    // Compute loop chunk sizes until, and after, the wraparound of the circular
-    // buffer for x.
-    const int chunk1 =
-        std::min(h_size, static_cast<int>(x_size - x_start_index));
-
-    // Perform the loop in two chunks.
-    const int chunk2 = h_size - chunk1;
-    for (int limit : {chunk1, chunk2}) {
-      // Perform 128 bit vector operations.
-      const int limit_by_4 = limit >> 2;
-      for (int k = limit_by_4; k > 0; --k, h_p += 4, x_p += 4) {
-        // Load the data into 128 bit vectors.
-        const __m128 x_k = _mm_loadu_ps(x_p);
-        const __m128 h_k = _mm_loadu_ps(h_p);
-        const __m128 xx = _mm_mul_ps(x_k, x_k);
-        // Compute and accumulate x * x and h * x.
-        x2_sum_128 = _mm_add_ps(x2_sum_128, xx);
-        const __m128 hx = _mm_mul_ps(h_k, x_k);
-        s_128 = _mm_add_ps(s_128, hx);
-      }
-
-      // Perform non-vector operations for any remaining items.
-      for (int k = limit - limit_by_4 * 4; k > 0; --k, ++h_p, ++x_p) {
-        const float x_k = *x_p;
-        x2_sum += x_k * x_k;
-        s += *h_p * x_k;
-      }
-
-      x_p = &x[0];
-    }
-
-    // Combine the accumulated vector and scalar values.
-    float* v = reinterpret_cast<float*>(&x2_sum_128);
-    x2_sum += v[0] + v[1] + v[2] + v[3];
-    v = reinterpret_cast<float*>(&s_128);
-    s += v[0] + v[1] + v[2] + v[3];
-
-    // Compute the matched filter error.
-    float e = y[i] - s;
-    const bool saturation = y[i] >= 32000.f || y[i] <= -32000.f;
-    (*error_sum) += e * e;
-
-    // Update the matched filter estimate in an NLMS manner.
-    if (x2_sum > x2_sum_threshold && !saturation) {
-      RTC_DCHECK_LT(0.f, x2_sum);
-      const float alpha = smoothing * e / x2_sum;
-      const __m128 alpha_128 = _mm_set1_ps(alpha);
-
-      // filter = filter + smoothing * (y - filter * x) * x / x * x.
-      float* h_p = &h[0];
-      x_p = &x[x_start_index];
-
-      // Perform the loop in two chunks.
-      for (int limit : {chunk1, chunk2}) {
-        // Perform 128 bit vector operations.
-        const int limit_by_4 = limit >> 2;
-        for (int k = limit_by_4; k > 0; --k, h_p += 4, x_p += 4) {
-          // Load the data into 128 bit vectors.
-          __m128 h_k = _mm_loadu_ps(h_p);
-          const __m128 x_k = _mm_loadu_ps(x_p);
-
-          // Compute h = h + alpha * x.
-          const __m128 alpha_x = _mm_mul_ps(alpha_128, x_k);
-          h_k = _mm_add_ps(h_k, alpha_x);
-
-          // Store the result.
-          _mm_storeu_ps(h_p, h_k);
-        }
-
-        // Perform non-vector operations for any remaining items.
-        for (int k = limit - limit_by_4 * 4; k > 0; --k, ++h_p, ++x_p) {
-          *h_p += alpha * *x_p;
-        }
-
-        x_p = &x[0];
-      }
-
-      *filters_updated = true;
-    }
-
-    x_start_index = x_start_index > 0 ? x_start_index - 1 : x_size - 1;
-  }
-}
-#endif
-
-void MatchedFilterCore(size_t x_start_index,
-                       float x2_sum_threshold,
-                       float smoothing,
-                       rtc::ArrayView<const float> x,
-                       rtc::ArrayView<const float> y,
-                       rtc::ArrayView<float> h,
-                       bool* filters_updated,
-                       float* error_sum) {
-  // Process for all samples in the sub-block.
-  for (size_t i = 0; i < y.size(); ++i) {
-    // Apply the matched filter as filter * x, and compute x * x.
-    float x2_sum = 0.f;
-    float s = 0;
-    size_t x_index = x_start_index;
-    for (size_t k = 0; k < h.size(); ++k) {
-      x2_sum += x[x_index] * x[x_index];
-      s += h[k] * x[x_index];
-      x_index = x_index < (x.size() - 1) ? x_index + 1 : 0;
-    }
-
-    // Compute the matched filter error.
-    float e = y[i] - s;
-    const bool saturation = y[i] >= 32000.f || y[i] <= -32000.f;
-    (*error_sum) += e * e;
-
-    // Update the matched filter estimate in an NLMS manner.
-    if (x2_sum > x2_sum_threshold && !saturation) {
-      RTC_DCHECK_LT(0.f, x2_sum);
-      const float alpha = smoothing * e / x2_sum;
-
-      // filter = filter + smoothing * (y - filter * x) * x / x * x.
-      size_t x_index = x_start_index;
-      for (size_t k = 0; k < h.size(); ++k) {
-        h[k] += alpha * x[x_index];
-        x_index = x_index < (x.size() - 1) ? x_index + 1 : 0;
-      }
-      *filters_updated = true;
-    }
-
-    x_start_index = x_start_index > 0 ? x_start_index - 1 : x.size() - 1;
-  }
-}
-
-}  // namespace aec3
-
-MatchedFilter::MatchedFilter(ApmDataDumper* data_dumper,
-                             Aec3Optimization optimization,
-                             size_t sub_block_size,
-                             size_t window_size_sub_blocks,
-                             int num_matched_filters,
-                             size_t alignment_shift_sub_blocks,
-                             float excitation_limit,
-                             float smoothing,
-                             float matching_filter_threshold)
-    : data_dumper_(data_dumper),
-      optimization_(optimization),
-      sub_block_size_(sub_block_size),
-      filter_intra_lag_shift_(alignment_shift_sub_blocks * sub_block_size_),
-      filters_(
-          num_matched_filters,
-          std::vector<float>(window_size_sub_blocks * sub_block_size_, 0.f)),
-      lag_estimates_(num_matched_filters),
-      filters_offsets_(num_matched_filters, 0),
-      excitation_limit_(excitation_limit),
-      smoothing_(smoothing),
-      matching_filter_threshold_(matching_filter_threshold) {
-  RTC_DCHECK(data_dumper);
-  RTC_DCHECK_LT(0, window_size_sub_blocks);
-  RTC_DCHECK((kBlockSize % sub_block_size) == 0);
-  RTC_DCHECK((sub_block_size % 4) == 0);
-}
-
-MatchedFilter::~MatchedFilter() = default;
-
-void MatchedFilter::Reset() {
-  for (auto& f : filters_) {
-    std::fill(f.begin(), f.end(), 0.f);
-  }
-
-  for (auto& l : lag_estimates_) {
-    l = MatchedFilter::LagEstimate();
-  }
-}
-
-void MatchedFilter::Update(const DownsampledRenderBuffer& render_buffer,
-                           rtc::ArrayView<const float> capture) {
-  RTC_DCHECK_EQ(sub_block_size_, capture.size());
-  auto& y = capture;
-
-  const float x2_sum_threshold =
-      filters_[0].size() * excitation_limit_ * excitation_limit_;
-
-  // Apply all matched filters.
-  size_t alignment_shift = 0;
-  for (size_t n = 0; n < filters_.size(); ++n) {
-    float error_sum = 0.f;
-    bool filters_updated = false;
-
-    size_t x_start_index =
-        (render_buffer.read + alignment_shift + sub_block_size_ - 1) %
-        render_buffer.buffer.size();
-
-    switch (optimization_) {
-#if defined(WEBRTC_ARCH_X86_FAMILY)
-      case Aec3Optimization::kSse2:
-        aec3::MatchedFilterCore_SSE2(x_start_index, x2_sum_threshold,
-                                     smoothing_, render_buffer.buffer, y,
-                                     filters_[n], &filters_updated, &error_sum);
-        break;
-#endif
-#if defined(WEBRTC_ARCH_ARM_FAMILY) && defined(WEBRTC_HAS_NEON)
-      case Aec3Optimization::kNeon:
-        aec3::MatchedFilterCore_NEON(x_start_index, x2_sum_threshold,
-                                     smoothing_, render_buffer.buffer, y,
-                                     filters_[n], &filters_updated, &error_sum);
-        break;
-#endif
-      default:
-        aec3::MatchedFilterCore(x_start_index, x2_sum_threshold, smoothing_,
-                                render_buffer.buffer, y, filters_[n],
-                                &filters_updated, &error_sum);
-    }
-
-    // Compute anchor for the matched filter error.
-    const float error_sum_anchor =
-        std::inner_product(y.begin(), y.end(), y.begin(), 0.f);
-
-    // Estimate the lag in the matched filter as the distance to the portion in
-    // the filter that contributes the most to the matched filter output. This
-    // is detected as the peak of the matched filter.
-    const size_t lag_estimate = std::distance(
-        filters_[n].begin(),
-        std::max_element(
-            filters_[n].begin(), filters_[n].end(),
-            [](float a, float b) -> bool { return a * a < b * b; }));
-
-    // Update the lag estimates for the matched filter.
-    lag_estimates_[n] = LagEstimate(
-        error_sum_anchor - error_sum,
-        (lag_estimate > 2 && lag_estimate < (filters_[n].size() - 10) &&
-         error_sum < matching_filter_threshold_ * error_sum_anchor),
-        lag_estimate + alignment_shift, filters_updated);
-
-    RTC_DCHECK_GE(10, filters_.size());
-    switch (n) {
-      case 0:
-        data_dumper_->DumpRaw("aec3_correlator_0_h", filters_[0]);
-        break;
-      case 1:
-        data_dumper_->DumpRaw("aec3_correlator_1_h", filters_[1]);
-        break;
-      case 2:
-        data_dumper_->DumpRaw("aec3_correlator_2_h", filters_[2]);
-        break;
-      case 3:
-        data_dumper_->DumpRaw("aec3_correlator_3_h", filters_[3]);
-        break;
-      case 4:
-        data_dumper_->DumpRaw("aec3_correlator_4_h", filters_[4]);
-        break;
-      case 5:
-        data_dumper_->DumpRaw("aec3_correlator_5_h", filters_[5]);
-        break;
-      case 6:
-        data_dumper_->DumpRaw("aec3_correlator_6_h", filters_[6]);
-        break;
-      case 7:
-        data_dumper_->DumpRaw("aec3_correlator_7_h", filters_[7]);
-        break;
-      case 8:
-        data_dumper_->DumpRaw("aec3_correlator_8_h", filters_[8]);
-        break;
-      case 9:
-        data_dumper_->DumpRaw("aec3_correlator_9_h", filters_[9]);
-        break;
-      default:
-        RTC_NOTREACHED();
-    }
-
-    alignment_shift += filter_intra_lag_shift_;
-  }
-}
-
-void MatchedFilter::LogFilterProperties(int sample_rate_hz,
-                                        size_t shift,
-                                        size_t downsampling_factor) const {
-  size_t alignment_shift = 0;
-  const int fs_by_1000 = LowestBandRate(sample_rate_hz) / 1000;
-  for (size_t k = 0; k < filters_.size(); ++k) {
-    int start = static_cast<int>(alignment_shift * downsampling_factor);
-    int end = static_cast<int>((alignment_shift + filters_[k].size()) *
-                               downsampling_factor);
-    RTC_LOG(LS_INFO) << "Filter " << k << ": start: "
-                     << (start - static_cast<int>(shift)) / fs_by_1000
-                     << " ms, end: "
-                     << (end - static_cast<int>(shift)) / fs_by_1000 << " ms.";
-    alignment_shift += filter_intra_lag_shift_;
-  }
-}
-
-}  // namespace webrtc
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/matched_filter.h b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/matched_filter.h
deleted file mode 100644
index 2a65339a4c..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/matched_filter.h
+++ /dev/null
@@ -1,138 +0,0 @@
-/*
- *  Copyright (c) 2017 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#ifndef MODULES_AUDIO_PROCESSING_AEC3_MATCHED_FILTER_H_
-#define MODULES_AUDIO_PROCESSING_AEC3_MATCHED_FILTER_H_
-
-#include <stddef.h>
-#include <vector>
-
-#include "api/array_view.h"
-#include "modules/audio_processing/aec3/aec3_common.h"
-#include "rtc_base/constructormagic.h"
-#include "rtc_base/system/arch.h"
-
-namespace webrtc {
-
-class ApmDataDumper;
-struct DownsampledRenderBuffer;
-
-namespace aec3 {
-
-#if defined(WEBRTC_HAS_NEON)
-
-// Filter core for the matched filter that is optimized for NEON.
-void MatchedFilterCore_NEON(size_t x_start_index,
-                            float x2_sum_threshold,
-                            float smoothing,
-                            rtc::ArrayView<const float> x,
-                            rtc::ArrayView<const float> y,
-                            rtc::ArrayView<float> h,
-                            bool* filters_updated,
-                            float* error_sum);
-
-#endif
-
-#if defined(WEBRTC_ARCH_X86_FAMILY)
-
-// Filter core for the matched filter that is optimized for SSE2.
-void MatchedFilterCore_SSE2(size_t x_start_index,
-                            float x2_sum_threshold,
-                            float smoothing,
-                            rtc::ArrayView<const float> x,
-                            rtc::ArrayView<const float> y,
-                            rtc::ArrayView<float> h,
-                            bool* filters_updated,
-                            float* error_sum);
-
-#endif
-
-// Filter core for the matched filter.
-void MatchedFilterCore(size_t x_start_index,
-                       float x2_sum_threshold,
-                       float smoothing,
-                       rtc::ArrayView<const float> x,
-                       rtc::ArrayView<const float> y,
-                       rtc::ArrayView<float> h,
-                       bool* filters_updated,
-                       float* error_sum);
-
-}  // namespace aec3
-
-
-// Produces recursively updated cross-correlation estimates for several signal
-// shifts where the intra-shift spacing is uniform.
-class MatchedFilter {
- public:
-  // Stores properties for the lag estimate corresponding to a particular signal
-  // shift.
-  struct LagEstimate {
-    LagEstimate() = default;
-    LagEstimate(float accuracy, bool reliable, size_t lag, bool updated)
-        : accuracy(accuracy), reliable(reliable), lag(lag), updated(updated) {}
-
-    float accuracy = 0.f;
-    bool reliable = false;
-    size_t lag = 0;
-    bool updated = false;
-  };
-
-  MatchedFilter(ApmDataDumper* data_dumper,
-                Aec3Optimization optimization,
-                size_t sub_block_size,
-                size_t window_size_sub_blocks,
-                int num_matched_filters,
-                size_t alignment_shift_sub_blocks,
-                float excitation_limit,
-                float smoothing,
-                float matching_filter_threshold);
-
-  ~MatchedFilter();
-
-  // Updates the correlation with the values in the capture buffer.
-  void Update(const DownsampledRenderBuffer& render_buffer,
-              rtc::ArrayView<const float> capture);
-
-  // Resets the matched filter.
-  void Reset();
-
-  // Returns the current lag estimates.
-  rtc::ArrayView<const MatchedFilter::LagEstimate> GetLagEstimates() const {
-    return lag_estimates_;
-  }
-
-  // Returns the maximum filter lag.
-  size_t GetMaxFilterLag() const {
-    return filters_.size() * filter_intra_lag_shift_ + filters_[0].size();
-  }
-
-  // Log matched filter properties.
-  void LogFilterProperties(int sample_rate_hz,
-                           size_t shift,
-                           size_t downsampling_factor) const;
-
- private:
-  ApmDataDumper* const data_dumper_;
-  const Aec3Optimization optimization_;
-  const size_t sub_block_size_;
-  const size_t filter_intra_lag_shift_;
-  std::vector<std::vector<float>> filters_;
-  std::vector<LagEstimate> lag_estimates_;
-  std::vector<size_t> filters_offsets_;
-  const float excitation_limit_;
-  const float smoothing_;
-  const float matching_filter_threshold_;
-
-  RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(MatchedFilter);
-};
-
-}  // namespace webrtc
-
-#endif  // MODULES_AUDIO_PROCESSING_AEC3_MATCHED_FILTER_H_
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/matched_filter_lag_aggregator.cc b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/matched_filter_lag_aggregator.cc
deleted file mode 100644
index f59525eee9..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/matched_filter_lag_aggregator.cc
+++ /dev/null
@@ -1,96 +0,0 @@
-/*
- *  Copyright (c) 2017 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-#include "modules/audio_processing/aec3/matched_filter_lag_aggregator.h"
-
-#include <algorithm>
-#include <iterator>
-
-#include "modules/audio_processing/logging/apm_data_dumper.h"
-#include "rtc_base/checks.h"
-
-namespace webrtc {
-
-MatchedFilterLagAggregator::MatchedFilterLagAggregator(
-    ApmDataDumper* data_dumper,
-    size_t max_filter_lag,
-    const EchoCanceller3Config::Delay::DelaySelectionThresholds& thresholds)
-    : data_dumper_(data_dumper),
-      histogram_(max_filter_lag + 1, 0),
-      thresholds_(thresholds) {
-  RTC_DCHECK(data_dumper);
-  RTC_DCHECK_LE(thresholds_.initial, thresholds_.converged);
-  histogram_data_.fill(0);
-}
-
-MatchedFilterLagAggregator::~MatchedFilterLagAggregator() = default;
-
-void MatchedFilterLagAggregator::Reset(bool hard_reset) {
-  std::fill(histogram_.begin(), histogram_.end(), 0);
-  histogram_data_.fill(0);
-  histogram_data_index_ = 0;
-  if (hard_reset) {
-    significant_candidate_found_ = false;
-  }
-}
-
-absl::optional<DelayEstimate> MatchedFilterLagAggregator::Aggregate(
-    rtc::ArrayView<const MatchedFilter::LagEstimate> lag_estimates) {
-  // Choose the strongest lag estimate as the best one.
-  float best_accuracy = 0.f;
-  int best_lag_estimate_index = -1;
-  for (size_t k = 0; k < lag_estimates.size(); ++k) {
-    if (lag_estimates[k].updated && lag_estimates[k].reliable) {
-      if (lag_estimates[k].accuracy > best_accuracy) {
-        best_accuracy = lag_estimates[k].accuracy;
-        best_lag_estimate_index = static_cast<int>(k);
-      }
-    }
-  }
-
-  // TODO(peah): Remove this logging once all development is done.
-  data_dumper_->DumpRaw("aec3_echo_path_delay_estimator_best_index",
-                        best_lag_estimate_index);
-
-  if (best_lag_estimate_index != -1) {
-    RTC_DCHECK_GT(histogram_.size(), histogram_data_[histogram_data_index_]);
-    RTC_DCHECK_LE(0, histogram_data_[histogram_data_index_]);
-    --histogram_[histogram_data_[histogram_data_index_]];
-
-    histogram_data_[histogram_data_index_] =
-        lag_estimates[best_lag_estimate_index].lag;
-
-    RTC_DCHECK_GT(histogram_.size(), histogram_data_[histogram_data_index_]);
-    RTC_DCHECK_LE(0, histogram_data_[histogram_data_index_]);
-    ++histogram_[histogram_data_[histogram_data_index_]];
-
-    histogram_data_index_ =
-        (histogram_data_index_ + 1) % histogram_data_.size();
-
-    const int candidate =
-        std::distance(histogram_.begin(),
-                      std::max_element(histogram_.begin(), histogram_.end()));
-
-    significant_candidate_found_ =
-        significant_candidate_found_ ||
-        histogram_[candidate] > thresholds_.converged;
-    if (histogram_[candidate] > thresholds_.converged ||
-        (histogram_[candidate] > thresholds_.initial &&
-         !significant_candidate_found_)) {
-      DelayEstimate::Quality quality = significant_candidate_found_
-                                           ? DelayEstimate::Quality::kRefined
-                                           : DelayEstimate::Quality::kCoarse;
-      return DelayEstimate(quality, candidate);
-    }
-  }
-
-  return absl::nullopt;
-}
-
-}  // namespace webrtc
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/matched_filter_lag_aggregator.h b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/matched_filter_lag_aggregator.h
deleted file mode 100644
index d7f34aed60..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/matched_filter_lag_aggregator.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- *  Copyright (c) 2017 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#ifndef MODULES_AUDIO_PROCESSING_AEC3_MATCHED_FILTER_LAG_AGGREGATOR_H_
-#define MODULES_AUDIO_PROCESSING_AEC3_MATCHED_FILTER_LAG_AGGREGATOR_H_
-
-#include <vector>
-
-#include "absl/types/optional.h"
-#include "api/audio/echo_canceller3_config.h"
-#include "modules/audio_processing/aec3/delay_estimate.h"
-#include "modules/audio_processing/aec3/matched_filter.h"
-#include "rtc_base/constructormagic.h"
-
-namespace webrtc {
-
-class ApmDataDumper;
-
-// Aggregates lag estimates produced by the MatchedFilter class into a single
-// reliable combined lag estimate.
-class MatchedFilterLagAggregator {
- public:
-  MatchedFilterLagAggregator(
-      ApmDataDumper* data_dumper,
-      size_t max_filter_lag,
-      const EchoCanceller3Config::Delay::DelaySelectionThresholds& thresholds);
-  ~MatchedFilterLagAggregator();
-
-  // Resets the aggregator.
-  void Reset(bool hard_reset);
-
-  // Aggregates the provided lag estimates.
-  absl::optional<DelayEstimate> Aggregate(
-      rtc::ArrayView<const MatchedFilter::LagEstimate> lag_estimates);
-
- private:
-  ApmDataDumper* const data_dumper_;
-  std::vector<int> histogram_;
-  std::array<int, 250> histogram_data_;
-  int histogram_data_index_ = 0;
-  bool significant_candidate_found_ = false;
-  const EchoCanceller3Config::Delay::DelaySelectionThresholds thresholds_;
-
-  RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(MatchedFilterLagAggregator);
-};
-}  // namespace webrtc
-
-#endif  // MODULES_AUDIO_PROCESSING_AEC3_MATCHED_FILTER_LAG_AGGREGATOR_H_
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/matrix_buffer.cc b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/matrix_buffer.cc
deleted file mode 100644
index bd6daea95c..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/matrix_buffer.cc
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- *  Copyright (c) 2017 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#include "modules/audio_processing/aec3/matrix_buffer.h"
-
-#include <algorithm>
-
-namespace webrtc {
-
-MatrixBuffer::MatrixBuffer(size_t size, size_t height, size_t width)
-    : size(static_cast<int>(size)),
-      buffer(size,
-             std::vector<std::vector<float>>(height,
-                                             std::vector<float>(width, 0.f))) {
-  for (auto& c : buffer) {
-    for (auto& b : c) {
-      std::fill(b.begin(), b.end(), 0.f);
-    }
-  }
-}
-
-MatrixBuffer::~MatrixBuffer() = default;
-
-}  // namespace webrtc
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/matrix_buffer.h b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/matrix_buffer.h
deleted file mode 100644
index cae3759f92..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/matrix_buffer.h
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- *  Copyright (c) 2017 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#ifndef MODULES_AUDIO_PROCESSING_AEC3_MATRIX_BUFFER_H_
-#define MODULES_AUDIO_PROCESSING_AEC3_MATRIX_BUFFER_H_
-
-#include <stddef.h>
-#include <vector>
-
-#include "rtc_base/checks.h"
-
-namespace webrtc {
-
-// Struct for bundling a circular buffer of two dimensional vector objects
-// together with the read and write indices.
-struct MatrixBuffer {
-  MatrixBuffer(size_t size, size_t height, size_t width);
-  ~MatrixBuffer();
-
-  int IncIndex(int index) const {
-    RTC_DCHECK_EQ(buffer.size(), static_cast<size_t>(size));
-    return index < size - 1 ? index + 1 : 0;
-  }
-
-  int DecIndex(int index) const {
-    RTC_DCHECK_EQ(buffer.size(), static_cast<size_t>(size));
-    return index > 0 ? index - 1 : size - 1;
-  }
-
-  int OffsetIndex(int index, int offset) const {
-    RTC_DCHECK_EQ(buffer.size(), static_cast<size_t>(size));
-    RTC_DCHECK_GE(size, offset);
-    return (size + index + offset) % size;
-  }
-
-  void UpdateWriteIndex(int offset) { write = OffsetIndex(write, offset); }
-  void IncWriteIndex() { write = IncIndex(write); }
-  void DecWriteIndex() { write = DecIndex(write); }
-  void UpdateReadIndex(int offset) { read = OffsetIndex(read, offset); }
-  void IncReadIndex() { read = IncIndex(read); }
-  void DecReadIndex() { read = DecIndex(read); }
-
-  const int size;
-  std::vector<std::vector<std::vector<float>>> buffer;
-  int write = 0;
-  int read = 0;
-};
-
-}  // namespace webrtc
-
-#endif  // MODULES_AUDIO_PROCESSING_AEC3_MATRIX_BUFFER_H_
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/moving_average.cc b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/moving_average.cc
deleted file mode 100644
index 7a81ee89ea..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/moving_average.cc
+++ /dev/null
@@ -1,60 +0,0 @@
-
-/*
- *  Copyright (c) 2018 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#include "modules/audio_processing/aec3/moving_average.h"
-
-#include <algorithm>
-#include <functional>
-
-#include "rtc_base/checks.h"
-
-namespace webrtc {
-namespace aec3 {
-
-MovingAverage::MovingAverage(size_t num_elem, size_t mem_len)
-    : num_elem_(num_elem),
-      mem_len_(mem_len - 1),
-      scaling_(1.0f / static_cast<float>(mem_len)),
-      memory_(num_elem * mem_len_, 0.f),
-      mem_index_(0) {
-  RTC_DCHECK(num_elem_ > 0);
-  RTC_DCHECK(mem_len > 0);
-}
-
-MovingAverage::~MovingAverage() = default;
-
-void MovingAverage::Average(rtc::ArrayView<const float> input,
-                            rtc::ArrayView<float> output) {
-  RTC_DCHECK(input.size() == num_elem_);
-  RTC_DCHECK(output.size() == num_elem_);
-
-  // Sum all contributions.
-  std::copy(input.begin(), input.end(), output.begin());
-  for (auto i = memory_.begin(); i < memory_.end(); i += num_elem_) {
-    std::transform(i, i + num_elem_, output.begin(), output.begin(),
-                   std::plus<float>());
-  }
-
-  // Divide by mem_len_.
-  for (float& o : output) {
-    o *= scaling_;
-  }
-
-  // Update memory.
-  if (mem_len_ > 0) {
-    std::copy(input.begin(), input.end(),
-              memory_.begin() + mem_index_ * num_elem_);
-    mem_index_ = (mem_index_ + 1) % mem_len_;
-  }
-}
-
-}  // namespace aec3
-}  // namespace webrtc
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/moving_average.h b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/moving_average.h
deleted file mode 100644
index 0f855beffb..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/moving_average.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- *  Copyright (c) 2018 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#ifndef MODULES_AUDIO_PROCESSING_AEC3_MOVING_AVERAGE_H_
-#define MODULES_AUDIO_PROCESSING_AEC3_MOVING_AVERAGE_H_
-
-#include <stddef.h>
-#include <vector>
-
-#include "api/array_view.h"
-
-namespace webrtc {
-namespace aec3 {
-
-class MovingAverage {
- public:
-  // Creates an instance of MovingAverage that accepts inputs of length num_elem
-  // and averages over mem_len inputs.
-  MovingAverage(size_t num_elem, size_t mem_len);
-  ~MovingAverage();
-
-  // Computes the average of input and mem_len-1 previous inputs and stores the
-  // result in output.
-  void Average(rtc::ArrayView<const float> input, rtc::ArrayView<float> output);
-
- private:
-  const size_t num_elem_;
-  const size_t mem_len_;
-  const float scaling_;
-  std::vector<float> memory_;
-  size_t mem_index_;
-};
-
-}  // namespace aec3
-}  // namespace webrtc
-
-#endif  // MODULES_AUDIO_PROCESSING_AEC3_MOVING_AVERAGE_H_
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/render_buffer.cc b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/render_buffer.cc
deleted file mode 100644
index f6ffa046e6..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/render_buffer.cc
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- *  Copyright (c) 2017 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#include "modules/audio_processing/aec3/render_buffer.h"
-
-#include <algorithm>
-#include <functional>
-
-#include "modules/audio_processing/aec3/aec3_common.h"
-#include "rtc_base/checks.h"
-
-namespace webrtc {
-
-RenderBuffer::RenderBuffer(MatrixBuffer* block_buffer,
-                           VectorBuffer* spectrum_buffer,
-                           FftBuffer* fft_buffer)
-    : block_buffer_(block_buffer),
-      spectrum_buffer_(spectrum_buffer),
-      fft_buffer_(fft_buffer) {
-  RTC_DCHECK(block_buffer_);
-  RTC_DCHECK(spectrum_buffer_);
-  RTC_DCHECK(fft_buffer_);
-  RTC_DCHECK_EQ(block_buffer_->buffer.size(), fft_buffer_->buffer.size());
-  RTC_DCHECK_EQ(spectrum_buffer_->buffer.size(), fft_buffer_->buffer.size());
-  RTC_DCHECK_EQ(spectrum_buffer_->read, fft_buffer_->read);
-  RTC_DCHECK_EQ(spectrum_buffer_->write, fft_buffer_->write);
-}
-
-RenderBuffer::~RenderBuffer() = default;
-
-void RenderBuffer::SpectralSum(
-    size_t num_spectra,
-    std::array<float, kFftLengthBy2Plus1>* X2) const {
-  X2->fill(0.f);
-  int position = spectrum_buffer_->read;
-  for (size_t j = 0; j < num_spectra; ++j) {
-    std::transform(X2->begin(), X2->end(),
-                   spectrum_buffer_->buffer[position].begin(), X2->begin(),
-                   std::plus<float>());
-    position = spectrum_buffer_->IncIndex(position);
-  }
-}
-
-void RenderBuffer::SpectralSums(
-    size_t num_spectra_shorter,
-    size_t num_spectra_longer,
-    std::array<float, kFftLengthBy2Plus1>* X2_shorter,
-    std::array<float, kFftLengthBy2Plus1>* X2_longer) const {
-  RTC_DCHECK_LE(num_spectra_shorter, num_spectra_longer);
-  X2_shorter->fill(0.f);
-  int position = spectrum_buffer_->read;
-  size_t j = 0;
-  for (; j < num_spectra_shorter; ++j) {
-    std::transform(X2_shorter->begin(), X2_shorter->end(),
-                   spectrum_buffer_->buffer[position].begin(),
-                   X2_shorter->begin(), std::plus<float>());
-    position = spectrum_buffer_->IncIndex(position);
-  }
-  std::copy(X2_shorter->begin(), X2_shorter->end(), X2_longer->begin());
-  for (; j < num_spectra_longer; ++j) {
-    std::transform(X2_longer->begin(), X2_longer->end(),
-                   spectrum_buffer_->buffer[position].begin(),
-                   X2_longer->begin(), std::plus<float>());
-    position = spectrum_buffer_->IncIndex(position);
-  }
-}
-
-}  // namespace webrtc
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/render_buffer.h b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/render_buffer.h
deleted file mode 100644
index 4c7c60cf85..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/render_buffer.h
+++ /dev/null
@@ -1,110 +0,0 @@
-/*
- *  Copyright (c) 2017 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#ifndef MODULES_AUDIO_PROCESSING_AEC3_RENDER_BUFFER_H_
-#define MODULES_AUDIO_PROCESSING_AEC3_RENDER_BUFFER_H_
-
-#include <stddef.h>
-#include <array>
-#include <vector>
-
-#include "api/array_view.h"
-#include "modules/audio_processing/aec3/aec3_common.h"
-#include "modules/audio_processing/aec3/fft_buffer.h"
-#include "modules/audio_processing/aec3/fft_data.h"
-#include "modules/audio_processing/aec3/matrix_buffer.h"
-#include "modules/audio_processing/aec3/vector_buffer.h"
-#include "rtc_base/checks.h"
-#include "rtc_base/constructormagic.h"
-
-namespace webrtc {
-
-// Provides a buffer of the render data for the echo remover.
-class RenderBuffer {
- public:
-  RenderBuffer(MatrixBuffer* block_buffer,
-               VectorBuffer* spectrum_buffer,
-               FftBuffer* fft_buffer);
-  ~RenderBuffer();
-
-  // Get a block.
-  const std::vector<std::vector<float>>& Block(int buffer_offset_blocks) const {
-    int position =
-        block_buffer_->OffsetIndex(block_buffer_->read, buffer_offset_blocks);
-    return block_buffer_->buffer[position];
-  }
-
-  // Get the spectrum from one of the FFTs in the buffer.
-  rtc::ArrayView<const float> Spectrum(int buffer_offset_ffts) const {
-    int position = spectrum_buffer_->OffsetIndex(spectrum_buffer_->read,
-                                                 buffer_offset_ffts);
-    return spectrum_buffer_->buffer[position];
-  }
-
-  // Returns the circular fft buffer.
-  rtc::ArrayView<const FftData> GetFftBuffer() const {
-    return fft_buffer_->buffer;
-  }
-
-  // Returns the current position in the circular buffer.
-  size_t Position() const {
-    RTC_DCHECK_EQ(spectrum_buffer_->read, fft_buffer_->read);
-    RTC_DCHECK_EQ(spectrum_buffer_->write, fft_buffer_->write);
-    return fft_buffer_->read;
-  }
-
-  // Returns the sum of the spectrums for a certain number of FFTs.
-  void SpectralSum(size_t num_spectra,
-                   std::array<float, kFftLengthBy2Plus1>* X2) const;
-
-  // Returns the sums of the spectrums for two numbers of FFTs.
-  void SpectralSums(size_t num_spectra_shorter,
-                    size_t num_spectra_longer,
-                    std::array<float, kFftLengthBy2Plus1>* X2_shorter,
-                    std::array<float, kFftLengthBy2Plus1>* X2_longer) const;
-
-  // Gets the recent activity seen in the render signal.
-  bool GetRenderActivity() const { return render_activity_; }
-
-  // Specifies the recent activity seen in the render signal.
-  void SetRenderActivity(bool activity) { render_activity_ = activity; }
-
-  // Returns the headroom between the write and the read positions in the
-  // buffer.
-  int Headroom() const {
-    // The write and read indices are decreased over time.
-    int headroom =
-        fft_buffer_->write < fft_buffer_->read
-            ? fft_buffer_->read - fft_buffer_->write
-            : fft_buffer_->size - fft_buffer_->write + fft_buffer_->read;
-
-    RTC_DCHECK_LE(0, headroom);
-    RTC_DCHECK_GE(fft_buffer_->size, headroom);
-
-    return headroom;
-  }
-
-  // Returns a reference to the spectrum buffer.
-  const VectorBuffer& GetSpectrumBuffer() const { return *spectrum_buffer_; }
-
-  // Returns a reference to the block buffer.
-  const MatrixBuffer& GetBlockBuffer() const { return *block_buffer_; }
-
- private:
-  const MatrixBuffer* const block_buffer_;
-  const VectorBuffer* const spectrum_buffer_;
-  const FftBuffer* const fft_buffer_;
-  bool render_activity_ = false;
-  RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(RenderBuffer);
-};
-
-}  // namespace webrtc
-
-#endif  // MODULES_AUDIO_PROCESSING_AEC3_RENDER_BUFFER_H_
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/render_delay_buffer.cc b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/render_delay_buffer.cc
deleted file mode 100644
index 1ec27790a8..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/render_delay_buffer.cc
+++ /dev/null
@@ -1,467 +0,0 @@
-/*
- *  Copyright (c) 2017 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#include "modules/audio_processing/aec3/render_delay_buffer.h"
-
-#include <stdlib.h>
-#include <algorithm>
-#include <memory>
-#include <numeric>
-
-#include "absl/types/optional.h"
-#include "api/array_view.h"
-#include "modules/audio_processing/aec3/aec3_common.h"
-#include "modules/audio_processing/aec3/aec3_fft.h"
-#include "modules/audio_processing/aec3/decimator.h"
-#include "modules/audio_processing/aec3/fft_buffer.h"
-#include "modules/audio_processing/aec3/fft_data.h"
-#include "modules/audio_processing/aec3/matrix_buffer.h"
-#include "modules/audio_processing/aec3/vector_buffer.h"
-#include "modules/audio_processing/logging/apm_data_dumper.h"
-#include "rtc_base/atomicops.h"
-#include "rtc_base/checks.h"
-#include "rtc_base/constructormagic.h"
-#include "rtc_base/logging.h"
-#include "system_wrappers/include/field_trial.h"
-
-namespace webrtc {
-namespace {
-
-bool EnableZeroExternalDelayHeadroom() {
-  return !field_trial::IsEnabled(
-      "WebRTC-Aec3ZeroExternalDelayHeadroomKillSwitch");
-}
-
-class RenderDelayBufferImpl final : public RenderDelayBuffer {
- public:
-  RenderDelayBufferImpl(const EchoCanceller3Config& config, size_t num_bands);
-  ~RenderDelayBufferImpl() override;
-
-  void Reset() override;
-  BufferingEvent Insert(const std::vector<std::vector<float>>& block) override;
-  BufferingEvent PrepareCaptureProcessing() override;
-  bool SetDelay(size_t delay) override;
-  size_t Delay() const override { return MapInternalDelayToExternalDelay(); }
-  size_t MaxDelay() const override {
-    return blocks_.buffer.size() - 1 - buffer_headroom_;
-  }
-  RenderBuffer* GetRenderBuffer() override { return &echo_remover_buffer_; }
-
-  const DownsampledRenderBuffer& GetDownsampledRenderBuffer() const override {
-    return low_rate_;
-  }
-
-  bool CausalDelay(size_t delay) const override;
-
-  void SetAudioBufferDelay(size_t delay_ms) override;
-
- private:
-  static int instance_count_;
-  std::unique_ptr<ApmDataDumper> data_dumper_;
-  const Aec3Optimization optimization_;
-  const EchoCanceller3Config config_;
-  size_t down_sampling_factor_;
-  const bool use_zero_external_delay_headroom_;
-  const int sub_block_size_;
-  MatrixBuffer blocks_;
-  VectorBuffer spectra_;
-  FftBuffer ffts_;
-  absl::optional<size_t> delay_;
-  absl::optional<int> internal_delay_;
-  RenderBuffer echo_remover_buffer_;
-  DownsampledRenderBuffer low_rate_;
-  Decimator render_decimator_;
-  const std::vector<std::vector<float>> zero_block_;
-  const Aec3Fft fft_;
-  std::vector<float> render_ds_;
-  const int buffer_headroom_;
-  bool last_call_was_render_ = false;
-  int num_api_calls_in_a_row_ = 0;
-  int max_observed_jitter_ = 1;
-  size_t capture_call_counter_ = 0;
-  size_t render_call_counter_ = 0;
-  bool render_activity_ = false;
-  size_t render_activity_counter_ = 0;
-  absl::optional<size_t> external_audio_buffer_delay_;
-  bool external_delay_verified_after_reset_ = false;
-
-  int LowRateBufferOffset() const { return DelayEstimatorOffset(config_) >> 1; }
-  int MapExternalDelayToInternalDelay(size_t external_delay_blocks) const;
-  int MapInternalDelayToExternalDelay() const;
-  void ApplyDelay(int delay);
-  void InsertBlock(const std::vector<std::vector<float>>& block,
-                   int previous_write);
-  bool DetectActiveRender(rtc::ArrayView<const float> x) const;
-
-  RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(RenderDelayBufferImpl);
-};
-
-// Increases the write indices for the render buffers.
-void IncreaseWriteIndices(int sub_block_size,
-                          MatrixBuffer* blocks,
-                          VectorBuffer* spectra,
-                          FftBuffer* ffts,
-                          DownsampledRenderBuffer* low_rate) {
-  low_rate->UpdateWriteIndex(-sub_block_size);
-  blocks->IncWriteIndex();
-  spectra->DecWriteIndex();
-  ffts->DecWriteIndex();
-}
-
-// Increases the read indices for the render buffers.
-void IncreaseReadIndices(const absl::optional<int>& delay,
-                         int sub_block_size,
-                         MatrixBuffer* blocks,
-                         VectorBuffer* spectra,
-                         FftBuffer* ffts,
-                         DownsampledRenderBuffer* low_rate) {
-  RTC_DCHECK_NE(low_rate->read, low_rate->write);
-  low_rate->UpdateReadIndex(-sub_block_size);
-
-  if (blocks->read != blocks->write) {
-    blocks->IncReadIndex();
-    spectra->DecReadIndex();
-    ffts->DecReadIndex();
-  } else {
-    // Only allow underrun for blocks_ when the delay is not set.
-    RTC_DCHECK(!delay);
-  }
-}
-
-// Checks for a render buffer overrun.
-bool RenderOverrun(const MatrixBuffer& b, const DownsampledRenderBuffer& l) {
-  return l.read == l.write || b.read == b.write;
-}
-
-// Checks for a render buffer underrun. If the delay is not specified, only the
-// low rate buffer underrun is counted as the delay offset for the other buffers
-// is unknown.
-bool RenderUnderrun(const absl::optional<int>& delay,
-                    const MatrixBuffer& b,
-                    const DownsampledRenderBuffer& l) {
-  return l.read == l.write || (delay && b.read == b.write);
-}
-
-// Computes the latency in the buffer (the number of unread elements).
-int BufferLatency(const DownsampledRenderBuffer& l) {
-  return (l.buffer.size() + l.read - l.write) % l.buffer.size();
-}
-
-// Computes the mismatch between the number of render and capture calls based on
-// the known offset (achieved during reset) of the low rate buffer.
-bool ApiCallSkew(const DownsampledRenderBuffer& low_rate_buffer,
-                 int sub_block_size,
-                 int low_rate_buffer_offset_sub_blocks) {
-  int latency = BufferLatency(low_rate_buffer);
-  int skew = abs(low_rate_buffer_offset_sub_blocks * sub_block_size - latency);
-  int skew_limit = low_rate_buffer_offset_sub_blocks * sub_block_size;
-  return skew >= skew_limit;
-}
-
-int RenderDelayBufferImpl::instance_count_ = 0;
-
-RenderDelayBufferImpl::RenderDelayBufferImpl(const EchoCanceller3Config& config,
-                                             size_t num_bands)
-    : data_dumper_(
-          new ApmDataDumper(rtc::AtomicOps::Increment(&instance_count_))),
-      optimization_(DetectOptimization()),
-      config_(config),
-      down_sampling_factor_(config.delay.down_sampling_factor),
-      use_zero_external_delay_headroom_(EnableZeroExternalDelayHeadroom()),
-      sub_block_size_(static_cast<int>(down_sampling_factor_ > 0
-                                           ? kBlockSize / down_sampling_factor_
-                                           : kBlockSize)),
-      blocks_(GetRenderDelayBufferSize(down_sampling_factor_,
-                                       config.delay.num_filters,
-                                       config.filter.main.length_blocks),
-              num_bands,
-              kBlockSize),
-      spectra_(blocks_.buffer.size(), kFftLengthBy2Plus1),
-      ffts_(blocks_.buffer.size()),
-      delay_(config_.delay.default_delay),
-      echo_remover_buffer_(&blocks_, &spectra_, &ffts_),
-      low_rate_(GetDownSampledBufferSize(down_sampling_factor_,
-                                         config.delay.num_filters)),
-      render_decimator_(down_sampling_factor_),
-      zero_block_(num_bands, std::vector<float>(kBlockSize, 0.f)),
-      fft_(),
-      render_ds_(sub_block_size_, 0.f),
-      buffer_headroom_(config.filter.main.length_blocks) {
-  RTC_DCHECK_EQ(blocks_.buffer.size(), ffts_.buffer.size());
-  RTC_DCHECK_EQ(spectra_.buffer.size(), ffts_.buffer.size());
-
-  // Necessary condition to avoid unrecoverable echp due to noncausal alignment.
-  RTC_DCHECK_EQ(DelayEstimatorOffset(config_), LowRateBufferOffset() * 2);
-  Reset();
-}
-
-RenderDelayBufferImpl::~RenderDelayBufferImpl() = default;
-
-// Resets the buffer delays and clears the reported delays.
-void RenderDelayBufferImpl::Reset() {
-  last_call_was_render_ = false;
-  num_api_calls_in_a_row_ = 1;
-
-  // Pre-fill the low rate buffer (which is used for delay estimation) to add
-  // headroom for the allowed api call jitter.
-  low_rate_.read = low_rate_.OffsetIndex(
-      low_rate_.write, LowRateBufferOffset() * sub_block_size_);
-
-  // Check for any external audio buffer delay and whether it is feasible.
-  if (external_audio_buffer_delay_) {
-    const size_t headroom = use_zero_external_delay_headroom_ ? 0 : 2;
-    size_t external_delay_to_set = 0;
-    if (*external_audio_buffer_delay_ < headroom) {
-      external_delay_to_set = 0;
-    } else {
-      external_delay_to_set = *external_audio_buffer_delay_ - headroom;
-    }
-
-    external_delay_to_set = std::min(external_delay_to_set, MaxDelay());
-
-    // When an external delay estimate is available, use that delay as the
-    // initial render buffer delay.
-    internal_delay_ = external_delay_to_set;
-    ApplyDelay(*internal_delay_);
-    delay_ = MapInternalDelayToExternalDelay();
-
-    external_delay_verified_after_reset_ = false;
-  } else {
-    // If an external delay estimate is not available, use that delay as the
-    // initial delay. Set the render buffer delays to the default delay.
-    ApplyDelay(config_.delay.default_delay);
-
-    // Unset the delays which are set by SetDelay.
-    delay_ = absl::nullopt;
-    internal_delay_ = absl::nullopt;
-  }
-}
-
-// Inserts a new block into the render buffers.
-RenderDelayBuffer::BufferingEvent RenderDelayBufferImpl::Insert(
-    const std::vector<std::vector<float>>& block) {
-  ++render_call_counter_;
-  if (delay_) {
-    if (!last_call_was_render_) {
-      last_call_was_render_ = true;
-      num_api_calls_in_a_row_ = 1;
-    } else {
-      if (++num_api_calls_in_a_row_ > max_observed_jitter_) {
-        max_observed_jitter_ = num_api_calls_in_a_row_;
-        RTC_LOG(LS_WARNING)
-            << "New max number api jitter observed at render block "
-            << render_call_counter_ << ":  " << num_api_calls_in_a_row_
-            << " blocks";
-      }
-    }
-  }
-
-  // Increase the write indices to where the new blocks should be written.
-  const int previous_write = blocks_.write;
-  IncreaseWriteIndices(sub_block_size_, &blocks_, &spectra_, &ffts_,
-                       &low_rate_);
-
-  // Allow overrun and do a reset when render overrun occurrs due to more render
-  // data being inserted than capture data is received.
-  BufferingEvent event = RenderOverrun(blocks_, low_rate_)
-                             ? BufferingEvent::kRenderOverrun
-                             : BufferingEvent::kNone;
-
-  // Detect and update render activity.
-  if (!render_activity_) {
-    render_activity_counter_ += DetectActiveRender(block[0]) ? 1 : 0;
-    render_activity_ = render_activity_counter_ >= 20;
-  }
-
-  // Insert the new render block into the specified position.
-  InsertBlock(block, previous_write);
-
-  if (event != BufferingEvent::kNone) {
-    Reset();
-  }
-
-  return event;
-}
-
-// Prepares the render buffers for processing another capture block.
-RenderDelayBuffer::BufferingEvent
-RenderDelayBufferImpl::PrepareCaptureProcessing() {
-  BufferingEvent event = BufferingEvent::kNone;
-  ++capture_call_counter_;
-
-  if (delay_) {
-    if (last_call_was_render_) {
-      last_call_was_render_ = false;
-      num_api_calls_in_a_row_ = 1;
-    } else {
-      if (++num_api_calls_in_a_row_ > max_observed_jitter_) {
-        max_observed_jitter_ = num_api_calls_in_a_row_;
-        RTC_LOG(LS_WARNING)
-            << "New max number api jitter observed at capture block "
-            << capture_call_counter_ << ":  " << num_api_calls_in_a_row_
-            << " blocks";
-      }
-    }
-  }
-
-  if (RenderUnderrun(internal_delay_, blocks_, low_rate_)) {
-    // Don't increase the read indices if there is a render underrun.
-    event = BufferingEvent::kRenderUnderrun;
-  } else {
-    // Increase the read indices in the render buffers to point to the most
-    // recent block to use in the capture processing.
-    IncreaseReadIndices(internal_delay_, sub_block_size_, &blocks_, &spectra_,
-                        &ffts_, &low_rate_);
-
-    // Check for skew in the API calls which, if too large, causes the delay
-    // estimation to be noncausal. Doing this check after the render indice
-    // increase saves one unit of allowed skew. Note that the skew check only
-    // should need to be one-sided as one of the skew directions results in an
-    // underrun.
-    bool skew = ApiCallSkew(low_rate_, sub_block_size_, LowRateBufferOffset());
-    event = skew ? BufferingEvent::kApiCallSkew : BufferingEvent::kNone;
-  }
-
-  if (event != BufferingEvent::kNone) {
-    Reset();
-  }
-
-  echo_remover_buffer_.SetRenderActivity(render_activity_);
-  if (render_activity_) {
-    render_activity_counter_ = 0;
-    render_activity_ = false;
-  }
-
-  return event;
-}
-
-// Sets the delay and returns a bool indicating whether the delay was changed.
-bool RenderDelayBufferImpl::SetDelay(size_t delay) {
-  if (!external_delay_verified_after_reset_ && external_audio_buffer_delay_ &&
-      delay_) {
-    int difference = static_cast<int>(delay) - static_cast<int>(*delay_);
-    RTC_LOG(LS_WARNING) << "Mismatch between first estimated delay after reset "
-                           "and external delay: "
-                        << difference << " blocks";
-    external_delay_verified_after_reset_ = true;
-  }
-  if (delay_ && *delay_ == delay) {
-    return false;
-  }
-  delay_ = delay;
-
-  // Compute the internal delay and limit the delay to the allowed range.
-  int internal_delay = MapExternalDelayToInternalDelay(*delay_);
-  internal_delay_ =
-      std::min(MaxDelay(), static_cast<size_t>(std::max(internal_delay, 0)));
-
-  // Apply the delay to the buffers.
-  ApplyDelay(*internal_delay_);
-  return true;
-}
-
-// Returns whether the specified delay is causal.
-bool RenderDelayBufferImpl::CausalDelay(size_t delay) const {
-  // Compute the internal delay and limit the delay to the allowed range.
-  int internal_delay = MapExternalDelayToInternalDelay(delay);
-  internal_delay =
-      std::min(MaxDelay(), static_cast<size_t>(std::max(internal_delay, 0)));
-
-  return internal_delay >=
-         static_cast<int>(config_.delay.min_echo_path_delay_blocks);
-}
-
-void RenderDelayBufferImpl::SetAudioBufferDelay(size_t delay_ms) {
-  if (!external_audio_buffer_delay_) {
-    RTC_LOG(LS_WARNING)
-        << "Receiving a first reported externally buffer delay of " << delay_ms
-        << " ms.";
-  }
-
-  // Convert delay from milliseconds to blocks (rounded down).
-  external_audio_buffer_delay_ = delay_ms / 4;
-}
-
-// Maps the externally computed delay to the delay used internally.
-int RenderDelayBufferImpl::MapExternalDelayToInternalDelay(
-    size_t external_delay_blocks) const {
-  const int latency = BufferLatency(low_rate_);
-  RTC_DCHECK_LT(0, sub_block_size_);
-  RTC_DCHECK_EQ(0, latency % sub_block_size_);
-  int latency_blocks = latency / sub_block_size_;
-  return latency_blocks + static_cast<int>(external_delay_blocks) -
-         DelayEstimatorOffset(config_);
-}
-
-// Maps the internally used delay to the delay used externally.
-int RenderDelayBufferImpl::MapInternalDelayToExternalDelay() const {
-  const int latency = BufferLatency(low_rate_);
-  int latency_blocks = latency / sub_block_size_;
-  int internal_delay = spectra_.read >= spectra_.write
-                           ? spectra_.read - spectra_.write
-                           : spectra_.size + spectra_.read - spectra_.write;
-
-  return internal_delay - latency_blocks + DelayEstimatorOffset(config_);
-}
-
-// Set the read indices according to the delay.
-void RenderDelayBufferImpl::ApplyDelay(int delay) {
-  RTC_LOG(LS_WARNING) << "Applying internal delay of " << delay << " blocks.";
-  blocks_.read = blocks_.OffsetIndex(blocks_.write, -delay);
-  spectra_.read = spectra_.OffsetIndex(spectra_.write, delay);
-  ffts_.read = ffts_.OffsetIndex(ffts_.write, delay);
-}
-
-// Inserts a block into the render buffers.
-void RenderDelayBufferImpl::InsertBlock(
-    const std::vector<std::vector<float>>& block,
-    int previous_write) {
-  auto& b = blocks_;
-  auto& lr = low_rate_;
-  auto& ds = render_ds_;
-  auto& f = ffts_;
-  auto& s = spectra_;
-  RTC_DCHECK_EQ(block.size(), b.buffer[b.write].size());
-  for (size_t k = 0; k < block.size(); ++k) {
-    RTC_DCHECK_EQ(block[k].size(), b.buffer[b.write][k].size());
-    std::copy(block[k].begin(), block[k].end(), b.buffer[b.write][k].begin());
-  }
-
-  data_dumper_->DumpWav("aec3_render_decimator_input", block[0].size(),
-                        block[0].data(), 16000, 1);
-  render_decimator_.Decimate(block[0], ds);
-  data_dumper_->DumpWav("aec3_render_decimator_output", ds.size(), ds.data(),
-                        16000 / down_sampling_factor_, 1);
-  std::copy(ds.rbegin(), ds.rend(), lr.buffer.begin() + lr.write);
-  fft_.PaddedFft(block[0], b.buffer[previous_write][0], &f.buffer[f.write]);
-  f.buffer[f.write].Spectrum(optimization_, s.buffer[s.write]);
-}
-
-bool RenderDelayBufferImpl::DetectActiveRender(
-    rtc::ArrayView<const float> x) const {
-  const float x_energy = std::inner_product(x.begin(), x.end(), x.begin(), 0.f);
-  return x_energy > (config_.render_levels.active_render_limit *
-                     config_.render_levels.active_render_limit) *
-                        kFftLengthBy2;
-}
-
-}  // namespace
-
-int RenderDelayBuffer::RenderDelayBuffer::DelayEstimatorOffset(
-    const EchoCanceller3Config& config) {
-  return config.delay.api_call_jitter_blocks * 2;
-}
-
-RenderDelayBuffer* RenderDelayBuffer::Create(const EchoCanceller3Config& config,
-                                             size_t num_bands) {
-  return new RenderDelayBufferImpl(config, num_bands);
-}
-
-}  // namespace webrtc
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/render_delay_buffer.h b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/render_delay_buffer.h
deleted file mode 100644
index bd242f743f..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/render_delay_buffer.h
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- *  Copyright (c) 2017 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#ifndef MODULES_AUDIO_PROCESSING_AEC3_RENDER_DELAY_BUFFER_H_
-#define MODULES_AUDIO_PROCESSING_AEC3_RENDER_DELAY_BUFFER_H_
-
-#include <stddef.h>
-#include <vector>
-
-#include "api/audio/echo_canceller3_config.h"
-#include "modules/audio_processing/aec3/downsampled_render_buffer.h"
-#include "modules/audio_processing/aec3/render_buffer.h"
-
-namespace webrtc {
-
-// Class for buffering the incoming render blocks such that these may be
-// extracted with a specified delay.
-class RenderDelayBuffer {
- public:
-  enum class BufferingEvent {
-    kNone,
-    kRenderUnderrun,
-    kRenderOverrun,
-    kApiCallSkew
-  };
-
-  static RenderDelayBuffer* Create(const EchoCanceller3Config& config,
-                                   size_t num_bands);
-  static RenderDelayBuffer* Create2(const EchoCanceller3Config& config,
-                                    size_t num_bands);
-  virtual ~RenderDelayBuffer() = default;
-
-  // Resets the buffer alignment.
-  virtual void Reset() = 0;
-
-  // Inserts a block into the buffer.
-  virtual BufferingEvent Insert(
-      const std::vector<std::vector<float>>& block) = 0;
-
-  // Updates the buffers one step based on the specified buffer delay. Returns
-  // an enum indicating whether there was a special event that occurred.
-  virtual BufferingEvent PrepareCaptureProcessing() = 0;
-
-  // Sets the buffer delay and returns a bool indicating whether the delay
-  // changed.
-  virtual bool SetDelay(size_t delay) = 0;
-
-  // Gets the buffer delay.
-  virtual size_t Delay() const = 0;
-
-  // Gets the buffer delay.
-  virtual size_t MaxDelay() const = 0;
-
-  // Returns the render buffer for the echo remover.
-  virtual RenderBuffer* GetRenderBuffer() = 0;
-
-  // Returns the downsampled render buffer.
-  virtual const DownsampledRenderBuffer& GetDownsampledRenderBuffer() const = 0;
-
-  // Returns whether the current delay is noncausal.
-  virtual bool CausalDelay(size_t delay) const = 0;
-
-  // Returns the maximum non calusal offset that can occur in the delay buffer.
-  static int DelayEstimatorOffset(const EchoCanceller3Config& config);
-
-  // Provides an optional external estimate of the audio buffer delay.
-  virtual void SetAudioBufferDelay(size_t delay_ms) = 0;
-};
-
-}  // namespace webrtc
-
-#endif  // MODULES_AUDIO_PROCESSING_AEC3_RENDER_DELAY_BUFFER_H_
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/render_delay_buffer2.cc b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/render_delay_buffer2.cc
deleted file mode 100644
index 6992c5b898..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/render_delay_buffer2.cc
+++ /dev/null
@@ -1,453 +0,0 @@
-/*
- *  Copyright (c) 2018 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#include <string.h>
-#include <algorithm>
-#include <memory>
-#include <numeric>
-#include <vector>
-
-#include "absl/types/optional.h"
-#include "api/array_view.h"
-#include "api/audio/echo_canceller3_config.h"
-#include "modules/audio_processing/aec3/aec3_common.h"
-#include "modules/audio_processing/aec3/aec3_fft.h"
-#include "modules/audio_processing/aec3/decimator.h"
-#include "modules/audio_processing/aec3/downsampled_render_buffer.h"
-#include "modules/audio_processing/aec3/fft_buffer.h"
-#include "modules/audio_processing/aec3/fft_data.h"
-#include "modules/audio_processing/aec3/matrix_buffer.h"
-#include "modules/audio_processing/aec3/render_buffer.h"
-#include "modules/audio_processing/aec3/render_delay_buffer.h"
-#include "modules/audio_processing/aec3/vector_buffer.h"
-#include "modules/audio_processing/logging/apm_data_dumper.h"
-#include "rtc_base/atomicops.h"
-#include "rtc_base/checks.h"
-#include "rtc_base/logging.h"
-
-namespace webrtc {
-namespace {
-
-class RenderDelayBufferImpl2 final : public RenderDelayBuffer {
- public:
-  RenderDelayBufferImpl2(const EchoCanceller3Config& config, size_t num_bands);
-  RenderDelayBufferImpl2() = delete;
-  ~RenderDelayBufferImpl2() override;
-
-  void Reset() override;
-  BufferingEvent Insert(const std::vector<std::vector<float>>& block) override;
-  BufferingEvent PrepareCaptureProcessing() override;
-  bool SetDelay(size_t delay) override;
-  size_t Delay() const override { return ComputeDelay(); }
-  size_t MaxDelay() const override {
-    return blocks_.buffer.size() - 1 - buffer_headroom_;
-  }
-  RenderBuffer* GetRenderBuffer() override { return &echo_remover_buffer_; }
-
-  const DownsampledRenderBuffer& GetDownsampledRenderBuffer() const override {
-    return low_rate_;
-  }
-
-  int BufferLatency() const;
-  bool CausalDelay(size_t delay) const override;
-  void SetAudioBufferDelay(size_t delay_ms) override;
-
- private:
-  static int instance_count_;
-  std::unique_ptr<ApmDataDumper> data_dumper_;
-  const Aec3Optimization optimization_;
-  const EchoCanceller3Config config_;
-  size_t down_sampling_factor_;
-  const int sub_block_size_;
-  MatrixBuffer blocks_;
-  VectorBuffer spectra_;
-  FftBuffer ffts_;
-  absl::optional<size_t> delay_;
-  RenderBuffer echo_remover_buffer_;
-  DownsampledRenderBuffer low_rate_;
-  Decimator render_decimator_;
-  const Aec3Fft fft_;
-  std::vector<float> render_ds_;
-  const int buffer_headroom_;
-  bool last_call_was_render_ = false;
-  int num_api_calls_in_a_row_ = 0;
-  int max_observed_jitter_ = 1;
-  size_t capture_call_counter_ = 0;
-  size_t render_call_counter_ = 0;
-  bool render_activity_ = false;
-  size_t render_activity_counter_ = 0;
-  absl::optional<size_t> external_audio_buffer_delay_;
-  bool external_audio_buffer_delay_verified_after_reset_ = false;
-  size_t min_latency_blocks_ = 0;
-  size_t excess_render_detection_counter_ = 0;
-  size_t num_bands_;
-
-  int MapDelayToTotalDelay(size_t delay) const;
-  int ComputeDelay() const;
-  void ApplyTotalDelay(int delay);
-  void InsertBlock(const std::vector<std::vector<float>>& block,
-                   int previous_write);
-  bool DetectActiveRender(rtc::ArrayView<const float> x) const;
-  bool DetectExcessRenderBlocks();
-  void IncrementWriteIndices();
-  void IncrementLowRateReadIndices();
-  void IncrementReadIndices();
-  bool RenderOverrun();
-  bool RenderUnderrun();
-};
-
-int RenderDelayBufferImpl2::instance_count_ = 0;
-
-RenderDelayBufferImpl2::RenderDelayBufferImpl2(
-    const EchoCanceller3Config& config,
-    size_t num_bands)
-    : data_dumper_(
-          new ApmDataDumper(rtc::AtomicOps::Increment(&instance_count_))),
-      optimization_(DetectOptimization()),
-      config_(config),
-      down_sampling_factor_(config.delay.down_sampling_factor),
-      sub_block_size_(static_cast<int>(down_sampling_factor_ > 0
-                                           ? kBlockSize / down_sampling_factor_
-                                           : kBlockSize)),
-      blocks_(GetRenderDelayBufferSize(down_sampling_factor_,
-                                       config.delay.num_filters,
-                                       config.filter.main.length_blocks),
-              num_bands,
-              kBlockSize),
-      spectra_(blocks_.buffer.size(), kFftLengthBy2Plus1),
-      ffts_(blocks_.buffer.size()),
-      delay_(config_.delay.default_delay),
-      echo_remover_buffer_(&blocks_, &spectra_, &ffts_),
-      low_rate_(GetDownSampledBufferSize(down_sampling_factor_,
-                                         config.delay.num_filters)),
-      render_decimator_(down_sampling_factor_),
-      fft_(),
-      render_ds_(sub_block_size_, 0.f),
-      buffer_headroom_(config.filter.main.length_blocks),
-      num_bands_(num_bands) {
-  RTC_DCHECK_EQ(blocks_.buffer.size(), ffts_.buffer.size());
-  RTC_DCHECK_EQ(spectra_.buffer.size(), ffts_.buffer.size());
-
-  Reset();
-}
-
-RenderDelayBufferImpl2::~RenderDelayBufferImpl2() = default;
-
-// Resets the buffer delays and clears the reported delays.
-void RenderDelayBufferImpl2::Reset() {
-  last_call_was_render_ = false;
-  num_api_calls_in_a_row_ = 1;
-  min_latency_blocks_ = 0;
-  excess_render_detection_counter_ = 0;
-
-  // Initialize the read index to one sub-block before the write index.
-  low_rate_.read = low_rate_.OffsetIndex(low_rate_.write, sub_block_size_);
-
-  // Check for any external audio buffer delay and whether it is feasible.
-  if (external_audio_buffer_delay_) {
-    const size_t headroom = 2;
-    size_t audio_buffer_delay_to_set;
-    // Minimum delay is 1 (like the low-rate render buffer).
-    if (*external_audio_buffer_delay_ <= headroom) {
-      audio_buffer_delay_to_set = 1;
-    } else {
-      audio_buffer_delay_to_set = *external_audio_buffer_delay_ - headroom;
-    }
-
-    audio_buffer_delay_to_set = std::min(audio_buffer_delay_to_set, MaxDelay());
-
-    // When an external delay estimate is available, use that delay as the
-    // initial render buffer delay.
-    ApplyTotalDelay(audio_buffer_delay_to_set);
-    delay_ = ComputeDelay();
-
-    external_audio_buffer_delay_verified_after_reset_ = false;
-  } else {
-    // If an external delay estimate is not available, use that delay as the
-    // initial delay. Set the render buffer delays to the default delay.
-    ApplyTotalDelay(config_.delay.default_delay);
-
-    // Unset the delays which are set by SetDelay.
-    delay_ = absl::nullopt;
-  }
-}
-
-// Inserts a new block into the render buffers.
-RenderDelayBuffer::BufferingEvent RenderDelayBufferImpl2::Insert(
-    const std::vector<std::vector<float>>& block) {
-  ++render_call_counter_;
-  if (delay_) {
-    if (!last_call_was_render_) {
-      last_call_was_render_ = true;
-      num_api_calls_in_a_row_ = 1;
-    } else {
-      if (++num_api_calls_in_a_row_ > max_observed_jitter_) {
-        max_observed_jitter_ = num_api_calls_in_a_row_;
-        RTC_LOG(LS_WARNING)
-            << "New max number api jitter observed at render block "
-            << render_call_counter_ << ":  " << num_api_calls_in_a_row_
-            << " blocks";
-      }
-    }
-  }
-
-  // Increase the write indices to where the new blocks should be written.
-  const int previous_write = blocks_.write;
-  IncrementWriteIndices();
-
-  // Allow overrun and do a reset when render overrun occurrs due to more render
-  // data being inserted than capture data is received.
-  BufferingEvent event =
-      RenderOverrun() ? BufferingEvent::kRenderOverrun : BufferingEvent::kNone;
-
-  // Detect and update render activity.
-  if (!render_activity_) {
-    render_activity_counter_ += DetectActiveRender(block[0]) ? 1 : 0;
-    render_activity_ = render_activity_counter_ >= 20;
-  }
-
-  // Insert the new render block into the specified position.
-  InsertBlock(block, previous_write);
-
-  if (event != BufferingEvent::kNone) {
-    Reset();
-  }
-
-  return event;
-}
-
-// Prepares the render buffers for processing another capture block.
-RenderDelayBuffer::BufferingEvent
-RenderDelayBufferImpl2::PrepareCaptureProcessing() {
-  RenderDelayBuffer::BufferingEvent event = BufferingEvent::kNone;
-  ++capture_call_counter_;
-
-  if (delay_) {
-    if (last_call_was_render_) {
-      last_call_was_render_ = false;
-      num_api_calls_in_a_row_ = 1;
-    } else {
-      if (++num_api_calls_in_a_row_ > max_observed_jitter_) {
-        max_observed_jitter_ = num_api_calls_in_a_row_;
-        RTC_LOG(LS_WARNING)
-            << "New max number api jitter observed at capture block "
-            << capture_call_counter_ << ":  " << num_api_calls_in_a_row_
-            << " blocks";
-      }
-    }
-  }
-
-  if (DetectExcessRenderBlocks()) {
-    // Too many render blocks compared to capture blocks. Risk of delay ending
-    // up before the filter used by the delay estimator.
-    RTC_LOG(LS_WARNING) << "Excess render blocks detected at block "
-                        << capture_call_counter_;
-    Reset();
-    event = BufferingEvent::kRenderOverrun;
-  } else if (RenderUnderrun()) {
-    // Don't increment the read indices of the low rate buffer if there is a
-    // render underrun.
-    RTC_LOG(LS_WARNING) << "Render buffer underrun detected at block "
-                        << capture_call_counter_;
-    IncrementReadIndices();
-    // Incrementing the buffer index without increasing the low rate buffer
-    // index means that the delay is reduced by one.
-    if (delay_ && *delay_ > 0)
-      delay_ = *delay_ - 1;
-    event = BufferingEvent::kRenderUnderrun;
-  } else {
-    // Increment the read indices in the render buffers to point to the most
-    // recent block to use in the capture processing.
-    IncrementLowRateReadIndices();
-    IncrementReadIndices();
-  }
-
-  echo_remover_buffer_.SetRenderActivity(render_activity_);
-  if (render_activity_) {
-    render_activity_counter_ = 0;
-    render_activity_ = false;
-  }
-
-  return event;
-}
-
-// Sets the delay and returns a bool indicating whether the delay was changed.
-bool RenderDelayBufferImpl2::SetDelay(size_t delay) {
-  if (!external_audio_buffer_delay_verified_after_reset_ &&
-      external_audio_buffer_delay_ && delay_) {
-    int difference = static_cast<int>(delay) - static_cast<int>(*delay_);
-    RTC_LOG(LS_WARNING) << "Mismatch between first estimated delay after reset "
-                           "and externally reported audio buffer delay: "
-                        << difference << " blocks";
-    external_audio_buffer_delay_verified_after_reset_ = true;
-  }
-  if (delay_ && *delay_ == delay) {
-    return false;
-  }
-  delay_ = delay;
-
-  // Compute the total delay and limit the delay to the allowed range.
-  int total_delay = MapDelayToTotalDelay(*delay_);
-  total_delay =
-      std::min(MaxDelay(), static_cast<size_t>(std::max(total_delay, 0)));
-
-  // Apply the delay to the buffers.
-  ApplyTotalDelay(total_delay);
-  return true;
-}
-
-// Returns whether the specified delay is causal.
-bool RenderDelayBufferImpl2::CausalDelay(size_t delay) const {
-  // TODO(gustaf): Remove this from RenderDelayBuffer.
-  return true;
-}
-
-void RenderDelayBufferImpl2::SetAudioBufferDelay(size_t delay_ms) {
-  if (!external_audio_buffer_delay_) {
-    RTC_LOG(LS_WARNING)
-        << "Receiving a first externally reported audio buffer delay of "
-        << delay_ms << " ms.";
-  }
-
-  // Convert delay from milliseconds to blocks (rounded down).
-  external_audio_buffer_delay_ = delay_ms >> ((num_bands_ == 1) ? 1 : 2);
-}
-
-// Maps the externally computed delay to the delay used internally.
-int RenderDelayBufferImpl2::MapDelayToTotalDelay(
-    size_t external_delay_blocks) const {
-  const int latency_blocks = BufferLatency();
-  return latency_blocks + static_cast<int>(external_delay_blocks);
-}
-
-// Returns the delay (not including call jitter).
-int RenderDelayBufferImpl2::ComputeDelay() const {
-  const int latency_blocks = BufferLatency();
-  int internal_delay = spectra_.read >= spectra_.write
-                           ? spectra_.read - spectra_.write
-                           : spectra_.size + spectra_.read - spectra_.write;
-
-  return internal_delay - latency_blocks;
-}
-
-// Set the read indices according to the delay.
-void RenderDelayBufferImpl2::ApplyTotalDelay(int delay) {
-  RTC_LOG(LS_WARNING) << "Applying total delay of " << delay << " blocks.";
-  blocks_.read = blocks_.OffsetIndex(blocks_.write, -delay);
-  spectra_.read = spectra_.OffsetIndex(spectra_.write, delay);
-  ffts_.read = ffts_.OffsetIndex(ffts_.write, delay);
-}
-
-// Inserts a block into the render buffers.
-void RenderDelayBufferImpl2::InsertBlock(
-    const std::vector<std::vector<float>>& block,
-    int previous_write) {
-  auto& b = blocks_;
-  auto& lr = low_rate_;
-  auto& ds = render_ds_;
-  auto& f = ffts_;
-  auto& s = spectra_;
-  RTC_DCHECK_EQ(block.size(), b.buffer[b.write].size());
-  for (size_t k = 0; k < block.size(); ++k) {
-    RTC_DCHECK_EQ(block[k].size(), b.buffer[b.write][k].size());
-    std::copy(block[k].begin(), block[k].end(), b.buffer[b.write][k].begin());
-  }
-
-  data_dumper_->DumpWav("aec3_render_decimator_input", block[0].size(),
-                        block[0].data(), 16000, 1);
-  render_decimator_.Decimate(block[0], ds);
-  data_dumper_->DumpWav("aec3_render_decimator_output", ds.size(), ds.data(),
-                        16000 / down_sampling_factor_, 1);
-  std::copy(ds.rbegin(), ds.rend(), lr.buffer.begin() + lr.write);
-  fft_.PaddedFft(block[0], b.buffer[previous_write][0], &f.buffer[f.write]);
-  f.buffer[f.write].Spectrum(optimization_, s.buffer[s.write]);
-}
-
-bool RenderDelayBufferImpl2::DetectActiveRender(
-    rtc::ArrayView<const float> x) const {
-  const float x_energy = std::inner_product(x.begin(), x.end(), x.begin(), 0.f);
-  return x_energy > (config_.render_levels.active_render_limit *
-                     config_.render_levels.active_render_limit) *
-                        kFftLengthBy2;
-}
-
-bool RenderDelayBufferImpl2::DetectExcessRenderBlocks() {
-  bool excess_render_detected = false;
-  const size_t latency_blocks = static_cast<size_t>(BufferLatency());
-  // The recently seen minimum latency in blocks. Should be close to 0.
-  min_latency_blocks_ = std::min(min_latency_blocks_, latency_blocks);
-  // After processing a configurable number of blocks the minimum latency is
-  // checked.
-  if (++excess_render_detection_counter_ >=
-      config_.buffering.excess_render_detection_interval_blocks) {
-    // If the minimum latency is not lower than the threshold there have been
-    // more render than capture frames.
-    excess_render_detected = min_latency_blocks_ >
-                             config_.buffering.max_allowed_excess_render_blocks;
-    // Reset the counter and let the minimum latency be the current latency.
-    min_latency_blocks_ = latency_blocks;
-    excess_render_detection_counter_ = 0;
-  }
-
-  data_dumper_->DumpRaw("aec3_latency_blocks", latency_blocks);
-  data_dumper_->DumpRaw("aec3_min_latency_blocks", min_latency_blocks_);
-  data_dumper_->DumpRaw("aec3_excess_render_detected", excess_render_detected);
-  return excess_render_detected;
-}
-
-// Computes the latency in the buffer (the number of unread sub-blocks).
-int RenderDelayBufferImpl2::BufferLatency() const {
-  const DownsampledRenderBuffer& l = low_rate_;
-  int latency_samples = (l.buffer.size() + l.read - l.write) % l.buffer.size();
-  int latency_blocks = latency_samples / sub_block_size_;
-  return latency_blocks;
-}
-
-// Increments the write indices for the render buffers.
-void RenderDelayBufferImpl2::IncrementWriteIndices() {
-  low_rate_.UpdateWriteIndex(-sub_block_size_);
-  blocks_.IncWriteIndex();
-  spectra_.DecWriteIndex();
-  ffts_.DecWriteIndex();
-}
-
-// Increments the read indices of the low rate render buffers.
-void RenderDelayBufferImpl2::IncrementLowRateReadIndices() {
-  low_rate_.UpdateReadIndex(-sub_block_size_);
-}
-
-// Increments the read indices for the render buffers.
-void RenderDelayBufferImpl2::IncrementReadIndices() {
-  if (blocks_.read != blocks_.write) {
-    blocks_.IncReadIndex();
-    spectra_.DecReadIndex();
-    ffts_.DecReadIndex();
-  }
-}
-
-// Checks for a render buffer overrun.
-bool RenderDelayBufferImpl2::RenderOverrun() {
-  return low_rate_.read == low_rate_.write || blocks_.read == blocks_.write;
-}
-
-// Checks for a render buffer underrun.
-bool RenderDelayBufferImpl2::RenderUnderrun() {
-  return low_rate_.read == low_rate_.write;
-}
-
-}  // namespace
-
-RenderDelayBuffer* RenderDelayBuffer::Create2(
-    const EchoCanceller3Config& config,
-    size_t num_bands) {
-  return new RenderDelayBufferImpl2(config, num_bands);
-}
-
-}  // namespace webrtc
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/render_delay_controller.cc b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/render_delay_controller.cc
deleted file mode 100644
index 36e75d9fa9..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/render_delay_controller.cc
+++ /dev/null
@@ -1,314 +0,0 @@
-/*
- *  Copyright (c) 2017 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-#include "modules/audio_processing/aec3/render_delay_controller.h"
-
-#include <stdlib.h>
-#include <algorithm>
-#include <memory>
-#include <vector>
-
-#include "api/audio/echo_canceller3_config.h"
-#include "modules/audio_processing/aec3/aec3_common.h"
-#include "modules/audio_processing/aec3/echo_path_delay_estimator.h"
-#include "modules/audio_processing/aec3/render_delay_controller_metrics.h"
-#include "modules/audio_processing/aec3/skew_estimator.h"
-#include "modules/audio_processing/logging/apm_data_dumper.h"
-#include "rtc_base/atomicops.h"
-#include "rtc_base/checks.h"
-#include "rtc_base/constructormagic.h"
-#include "rtc_base/logging.h"
-#include "system_wrappers/include/field_trial.h"
-
-namespace webrtc {
-
-namespace {
-
-int GetSkewHysteresis(const EchoCanceller3Config& config) {
-  if (field_trial::IsEnabled("WebRTC-Aec3EnforceSkewHysteresis1")) {
-    return 1;
-  }
-  if (field_trial::IsEnabled("WebRTC-Aec3EnforceSkewHysteresis2")) {
-    return 2;
-  }
-
-  return static_cast<int>(config.delay.skew_hysteresis_blocks);
-}
-
-bool UseOffsetBlocks() {
-  return field_trial::IsEnabled("WebRTC-Aec3UseOffsetBlocks");
-}
-
-bool UseEarlyDelayDetection() {
-  return !field_trial::IsEnabled("WebRTC-Aec3EarlyDelayDetectionKillSwitch");
-}
-
-constexpr int kSkewHistorySizeLog2 = 8;
-
-class RenderDelayControllerImpl final : public RenderDelayController {
- public:
-  RenderDelayControllerImpl(const EchoCanceller3Config& config,
-                            int non_causal_offset,
-                            int sample_rate_hz);
-  ~RenderDelayControllerImpl() override;
-  void Reset(bool reset_delay_confidence) override;
-  void LogRenderCall() override;
-  absl::optional<DelayEstimate> GetDelay(
-      const DownsampledRenderBuffer& render_buffer,
-      size_t render_delay_buffer_delay,
-      const absl::optional<int>& echo_remover_delay,
-      rtc::ArrayView<const float> capture) override;
-
- private:
-  static int instance_count_;
-  std::unique_ptr<ApmDataDumper> data_dumper_;
-  const bool use_early_delay_detection_;
-  const int delay_headroom_blocks_;
-  const int hysteresis_limit_1_blocks_;
-  const int hysteresis_limit_2_blocks_;
-  const int skew_hysteresis_blocks_;
-  const bool use_offset_blocks_;
-  absl::optional<DelayEstimate> delay_;
-  EchoPathDelayEstimator delay_estimator_;
-  std::vector<float> delay_buf_;
-  int delay_buf_index_ = 0;
-  RenderDelayControllerMetrics metrics_;
-  SkewEstimator skew_estimator_;
-  absl::optional<DelayEstimate> delay_samples_;
-  absl::optional<int> skew_;
-  int previous_offset_blocks_ = 0;
-  int skew_shift_reporting_counter_ = 0;
-  size_t capture_call_counter_ = 0;
-  int delay_change_counter_ = 0;
-  size_t soft_reset_counter_ = 0;
-  DelayEstimate::Quality last_delay_estimate_quality_;
-  RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(RenderDelayControllerImpl);
-};
-
-DelayEstimate ComputeBufferDelay(
-    const absl::optional<DelayEstimate>& current_delay,
-    int delay_headroom_blocks,
-    int hysteresis_limit_1_blocks,
-    int hysteresis_limit_2_blocks,
-    int offset_blocks,
-    DelayEstimate estimated_delay) {
-  // The below division is not exact and the truncation is intended.
-  const int echo_path_delay_blocks = estimated_delay.delay >> kBlockSizeLog2;
-
-  // Compute the buffer delay increase required to achieve the desired latency.
-  size_t new_delay_blocks = std::max(
-      echo_path_delay_blocks + offset_blocks - delay_headroom_blocks, 0);
-
-  // Add hysteresis.
-  if (current_delay) {
-    size_t current_delay_blocks = current_delay->delay;
-    if (new_delay_blocks > current_delay_blocks) {
-      if (new_delay_blocks <=
-          current_delay_blocks + hysteresis_limit_1_blocks) {
-        new_delay_blocks = current_delay_blocks;
-      }
-    } else if (new_delay_blocks < current_delay_blocks) {
-      size_t hysteresis_limit = std::max(
-          static_cast<int>(current_delay_blocks) - hysteresis_limit_2_blocks,
-          0);
-      if (new_delay_blocks >= hysteresis_limit) {
-        new_delay_blocks = current_delay_blocks;
-      }
-    }
-  }
-
-  DelayEstimate new_delay = estimated_delay;
-  new_delay.delay = new_delay_blocks;
-  return new_delay;
-}
-
-int RenderDelayControllerImpl::instance_count_ = 0;
-
-RenderDelayControllerImpl::RenderDelayControllerImpl(
-    const EchoCanceller3Config& config,
-    int non_causal_offset,
-    int sample_rate_hz)
-    : data_dumper_(
-          new ApmDataDumper(rtc::AtomicOps::Increment(&instance_count_))),
-      use_early_delay_detection_(UseEarlyDelayDetection()),
-      delay_headroom_blocks_(
-          static_cast<int>(config.delay.delay_headroom_blocks)),
-      hysteresis_limit_1_blocks_(
-          static_cast<int>(config.delay.hysteresis_limit_1_blocks)),
-      hysteresis_limit_2_blocks_(
-          static_cast<int>(config.delay.hysteresis_limit_2_blocks)),
-      skew_hysteresis_blocks_(GetSkewHysteresis(config)),
-      use_offset_blocks_(UseOffsetBlocks()),
-      delay_estimator_(data_dumper_.get(), config),
-      delay_buf_(kBlockSize * non_causal_offset, 0.f),
-      skew_estimator_(kSkewHistorySizeLog2),
-      last_delay_estimate_quality_(DelayEstimate::Quality::kCoarse) {
-  RTC_DCHECK(ValidFullBandRate(sample_rate_hz));
-  delay_estimator_.LogDelayEstimationProperties(sample_rate_hz,
-                                                delay_buf_.size());
-}
-
-RenderDelayControllerImpl::~RenderDelayControllerImpl() = default;
-
-void RenderDelayControllerImpl::Reset(bool reset_delay_confidence) {
-  delay_ = absl::nullopt;
-  delay_samples_ = absl::nullopt;
-  skew_ = absl::nullopt;
-  previous_offset_blocks_ = 0;
-  std::fill(delay_buf_.begin(), delay_buf_.end(), 0.f);
-  delay_estimator_.Reset(reset_delay_confidence);
-  skew_estimator_.Reset();
-  delay_change_counter_ = 0;
-  soft_reset_counter_ = 0;
-  if (reset_delay_confidence) {
-    last_delay_estimate_quality_ = DelayEstimate::Quality::kCoarse;
-  }
-}
-
-void RenderDelayControllerImpl::LogRenderCall() {
-  skew_estimator_.LogRenderCall();
-}
-
-absl::optional<DelayEstimate> RenderDelayControllerImpl::GetDelay(
-    const DownsampledRenderBuffer& render_buffer,
-    size_t render_delay_buffer_delay,
-    const absl::optional<int>& echo_remover_delay,
-    rtc::ArrayView<const float> capture) {
-  RTC_DCHECK_EQ(kBlockSize, capture.size());
-  ++capture_call_counter_;
-
-  // Estimate the delay with a delayed capture.
-  RTC_DCHECK_LT(delay_buf_index_ + kBlockSize - 1, delay_buf_.size());
-  rtc::ArrayView<const float> capture_delayed(&delay_buf_[delay_buf_index_],
-                                              kBlockSize);
-  auto delay_samples =
-      delay_estimator_.EstimateDelay(render_buffer, capture_delayed);
-
-  // Overrule the delay estimator delay if the echo remover reports a delay.
-  if (echo_remover_delay) {
-    int total_echo_remover_delay_samples =
-        (render_delay_buffer_delay + *echo_remover_delay) * kBlockSize;
-    delay_samples = DelayEstimate(DelayEstimate::Quality::kRefined,
-                                  total_echo_remover_delay_samples);
-  }
-
-  std::copy(capture.begin(), capture.end(),
-            delay_buf_.begin() + delay_buf_index_);
-  delay_buf_index_ = (delay_buf_index_ + kBlockSize) % delay_buf_.size();
-
-  // Compute the latest skew update.
-  absl::optional<int> skew = skew_estimator_.GetSkewFromCapture();
-
-  if (delay_samples) {
-    if (!delay_samples_ || delay_samples->delay != delay_samples_->delay) {
-      delay_change_counter_ = 0;
-    }
-    if (delay_samples_) {
-      delay_samples_->blocks_since_last_change =
-          delay_samples_->delay == delay_samples->delay
-              ? delay_samples_->blocks_since_last_change + 1
-              : 0;
-      delay_samples_->blocks_since_last_update = 0;
-      delay_samples_->delay = delay_samples->delay;
-      delay_samples_->quality = delay_samples->quality;
-    } else {
-      delay_samples_ = delay_samples;
-    }
-  } else {
-    if (delay_samples_) {
-      ++delay_samples_->blocks_since_last_change;
-      ++delay_samples_->blocks_since_last_update;
-    }
-  }
-
-  if (delay_change_counter_ < 2 * kNumBlocksPerSecond) {
-    ++delay_change_counter_;
-    // If a new delay estimate is recently obtained, store the skew for that.
-    skew_ = skew;
-  } else {
-    // A reliable skew should have been obtained after 2 seconds.
-    RTC_DCHECK(skew_);
-    RTC_DCHECK(skew);
-  }
-
-  ++soft_reset_counter_;
-  int offset_blocks = 0;
-  if (skew_ && skew && delay_samples_ &&
-      delay_samples_->quality == DelayEstimate::Quality::kRefined) {
-    // Compute the skew offset and add a margin.
-    offset_blocks = *skew_ - *skew;
-    if (abs(offset_blocks) <= skew_hysteresis_blocks_) {
-      offset_blocks = 0;
-    } else if (soft_reset_counter_ > 10 * kNumBlocksPerSecond) {
-      // Soft reset the delay estimator if there is a significant offset
-      // detected.
-      delay_estimator_.Reset(false);
-      soft_reset_counter_ = 0;
-    }
-  }
-  if (!use_offset_blocks_)
-    offset_blocks = 0;
-
-  // Log any changes in the skew.
-  skew_shift_reporting_counter_ =
-      std::max(0, skew_shift_reporting_counter_ - 1);
-  absl::optional<int> skew_shift =
-      skew_shift_reporting_counter_ == 0 &&
-              previous_offset_blocks_ != offset_blocks
-          ? absl::optional<int>(offset_blocks - previous_offset_blocks_)
-          : absl::nullopt;
-  previous_offset_blocks_ = offset_blocks;
-  if (skew_shift) {
-    RTC_LOG(LS_WARNING) << "API call skew shift of " << *skew_shift
-                        << " blocks detected at capture block "
-                        << capture_call_counter_;
-    skew_shift_reporting_counter_ = 3 * kNumBlocksPerSecond;
-  }
-
-  if (delay_samples_) {
-    // Compute the render delay buffer delay.
-    const bool use_hysteresis =
-        last_delay_estimate_quality_ == DelayEstimate::Quality::kRefined &&
-        delay_samples_->quality == DelayEstimate::Quality::kRefined;
-    delay_ = ComputeBufferDelay(delay_, delay_headroom_blocks_,
-                                use_hysteresis ? hysteresis_limit_1_blocks_ : 0,
-                                use_hysteresis ? hysteresis_limit_2_blocks_ : 0,
-                                offset_blocks, *delay_samples_);
-    last_delay_estimate_quality_ = delay_samples_->quality;
-  }
-
-  metrics_.Update(delay_samples_ ? absl::optional<size_t>(delay_samples_->delay)
-                                 : absl::nullopt,
-                  delay_ ? delay_->delay : 0, skew_shift);
-
-  data_dumper_->DumpRaw("aec3_render_delay_controller_delay",
-                        delay_samples ? delay_samples->delay : 0);
-  data_dumper_->DumpRaw("aec3_render_delay_controller_buffer_delay",
-                        delay_ ? delay_->delay : 0);
-
-  data_dumper_->DumpRaw("aec3_render_delay_controller_new_skew",
-                        skew ? *skew : 0);
-  data_dumper_->DumpRaw("aec3_render_delay_controller_old_skew",
-                        skew_ ? *skew_ : 0);
-  data_dumper_->DumpRaw("aec3_render_delay_controller_offset", offset_blocks);
-
-  return delay_;
-}
-
-}  // namespace
-
-RenderDelayController* RenderDelayController::Create(
-    const EchoCanceller3Config& config,
-    int non_causal_offset,
-    int sample_rate_hz) {
-  return new RenderDelayControllerImpl(config, non_causal_offset,
-                                       sample_rate_hz);
-}
-
-}  // namespace webrtc
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/render_delay_controller.h b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/render_delay_controller.h
deleted file mode 100644
index 41ba4224c9..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/render_delay_controller.h
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- *  Copyright (c) 2017 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#ifndef MODULES_AUDIO_PROCESSING_AEC3_RENDER_DELAY_CONTROLLER_H_
-#define MODULES_AUDIO_PROCESSING_AEC3_RENDER_DELAY_CONTROLLER_H_
-
-#include "absl/types/optional.h"
-#include "api/array_view.h"
-#include "api/audio/echo_canceller3_config.h"
-#include "modules/audio_processing/aec3/delay_estimate.h"
-#include "modules/audio_processing/aec3/downsampled_render_buffer.h"
-#include "modules/audio_processing/aec3/render_delay_buffer.h"
-#include "modules/audio_processing/logging/apm_data_dumper.h"
-
-namespace webrtc {
-
-// Class for aligning the render and capture signal using a RenderDelayBuffer.
-class RenderDelayController {
- public:
-  static RenderDelayController* Create(const EchoCanceller3Config& config,
-                                       int non_causal_offset,
-                                       int sample_rate_hz);
-  static RenderDelayController* Create2(const EchoCanceller3Config& config,
-                                        int sample_rate_hz);
-  virtual ~RenderDelayController() = default;
-
-  // Resets the delay controller. If the delay confidence is reset, the reset
-  // behavior is as if the call is restarted.
-  virtual void Reset(bool reset_delay_confidence) = 0;
-
-  // Logs a render call.
-  virtual void LogRenderCall() = 0;
-
-  // Aligns the render buffer content with the capture signal.
-  virtual absl::optional<DelayEstimate> GetDelay(
-      const DownsampledRenderBuffer& render_buffer,
-      size_t render_delay_buffer_delay,
-      const absl::optional<int>& echo_remover_delay,
-      rtc::ArrayView<const float> capture) = 0;
-};
-}  // namespace webrtc
-
-#endif  // MODULES_AUDIO_PROCESSING_AEC3_RENDER_DELAY_CONTROLLER_H_
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/render_delay_controller2.cc b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/render_delay_controller2.cc
deleted file mode 100644
index e27d5f3d60..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/render_delay_controller2.cc
+++ /dev/null
@@ -1,213 +0,0 @@
-/*
- *  Copyright (c) 2018 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-#include <stddef.h>
-#include <algorithm>
-#include <memory>
-
-#include "absl/types/optional.h"
-#include "api/array_view.h"
-#include "api/audio/echo_canceller3_config.h"
-#include "modules/audio_processing/aec3/aec3_common.h"
-#include "modules/audio_processing/aec3/delay_estimate.h"
-#include "modules/audio_processing/aec3/downsampled_render_buffer.h"
-#include "modules/audio_processing/aec3/echo_path_delay_estimator.h"
-#include "modules/audio_processing/aec3/render_delay_controller.h"
-#include "modules/audio_processing/aec3/render_delay_controller_metrics.h"
-#include "modules/audio_processing/logging/apm_data_dumper.h"
-#include "rtc_base/atomicops.h"
-#include "rtc_base/checks.h"
-#include "rtc_base/constructormagic.h"
-#include "system_wrappers/include/field_trial.h"
-
-namespace webrtc {
-
-namespace {
-
-bool UseEarlyDelayDetection() {
-  return !field_trial::IsEnabled("WebRTC-Aec3EarlyDelayDetectionKillSwitch");
-}
-
-class RenderDelayControllerImpl2 final : public RenderDelayController {
- public:
-  RenderDelayControllerImpl2(const EchoCanceller3Config& config,
-                             int sample_rate_hz);
-  ~RenderDelayControllerImpl2() override;
-  void Reset(bool reset_delay_confidence) override;
-  void LogRenderCall() override;
-  absl::optional<DelayEstimate> GetDelay(
-      const DownsampledRenderBuffer& render_buffer,
-      size_t render_delay_buffer_delay,
-      const absl::optional<int>& echo_remover_delay,
-      rtc::ArrayView<const float> capture) override;
-
- private:
-  static int instance_count_;
-  std::unique_ptr<ApmDataDumper> data_dumper_;
-  const bool use_early_delay_detection_;
-  const int delay_headroom_blocks_;
-  const int hysteresis_limit_1_blocks_;
-  const int hysteresis_limit_2_blocks_;
-  absl::optional<DelayEstimate> delay_;
-  EchoPathDelayEstimator delay_estimator_;
-  RenderDelayControllerMetrics metrics_;
-  absl::optional<DelayEstimate> delay_samples_;
-  size_t capture_call_counter_ = 0;
-  int delay_change_counter_ = 0;
-  DelayEstimate::Quality last_delay_estimate_quality_;
-  RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(RenderDelayControllerImpl2);
-};
-
-DelayEstimate ComputeBufferDelay(
-    const absl::optional<DelayEstimate>& current_delay,
-    int delay_headroom_blocks,
-    int hysteresis_limit_1_blocks,
-    int hysteresis_limit_2_blocks,
-    DelayEstimate estimated_delay) {
-  // The below division is not exact and the truncation is intended.
-  const int echo_path_delay_blocks = estimated_delay.delay >> kBlockSizeLog2;
-
-  // Compute the buffer delay increase required to achieve the desired latency.
-  size_t new_delay_blocks =
-      std::max(echo_path_delay_blocks - delay_headroom_blocks, 0);
-
-  // Add hysteresis.
-  if (current_delay) {
-    size_t current_delay_blocks = current_delay->delay;
-    if (new_delay_blocks > current_delay_blocks) {
-      if (new_delay_blocks <=
-          current_delay_blocks + hysteresis_limit_1_blocks) {
-        new_delay_blocks = current_delay_blocks;
-      }
-    } else if (new_delay_blocks < current_delay_blocks) {
-      size_t hysteresis_limit = std::max(
-          static_cast<int>(current_delay_blocks) - hysteresis_limit_2_blocks,
-          0);
-      if (new_delay_blocks >= hysteresis_limit) {
-        new_delay_blocks = current_delay_blocks;
-      }
-    }
-  }
-
-  DelayEstimate new_delay = estimated_delay;
-  new_delay.delay = new_delay_blocks;
-  return new_delay;
-}
-
-int RenderDelayControllerImpl2::instance_count_ = 0;
-
-RenderDelayControllerImpl2::RenderDelayControllerImpl2(
-    const EchoCanceller3Config& config,
-    int sample_rate_hz)
-    : data_dumper_(
-          new ApmDataDumper(rtc::AtomicOps::Increment(&instance_count_))),
-      use_early_delay_detection_(UseEarlyDelayDetection()),
-      delay_headroom_blocks_(
-          static_cast<int>(config.delay.delay_headroom_blocks)),
-      hysteresis_limit_1_blocks_(
-          static_cast<int>(config.delay.hysteresis_limit_1_blocks)),
-      hysteresis_limit_2_blocks_(
-          static_cast<int>(config.delay.hysteresis_limit_2_blocks)),
-      delay_estimator_(data_dumper_.get(), config),
-      last_delay_estimate_quality_(DelayEstimate::Quality::kCoarse) {
-  RTC_DCHECK(ValidFullBandRate(sample_rate_hz));
-  delay_estimator_.LogDelayEstimationProperties(sample_rate_hz, 0);
-}
-
-RenderDelayControllerImpl2::~RenderDelayControllerImpl2() = default;
-
-void RenderDelayControllerImpl2::Reset(bool reset_delay_confidence) {
-  delay_ = absl::nullopt;
-  delay_samples_ = absl::nullopt;
-  delay_estimator_.Reset(reset_delay_confidence);
-  delay_change_counter_ = 0;
-  if (reset_delay_confidence) {
-    last_delay_estimate_quality_ = DelayEstimate::Quality::kCoarse;
-  }
-}
-
-void RenderDelayControllerImpl2::LogRenderCall() {}
-
-absl::optional<DelayEstimate> RenderDelayControllerImpl2::GetDelay(
-    const DownsampledRenderBuffer& render_buffer,
-    size_t render_delay_buffer_delay,
-    const absl::optional<int>& echo_remover_delay,
-    rtc::ArrayView<const float> capture) {
-  RTC_DCHECK_EQ(kBlockSize, capture.size());
-  ++capture_call_counter_;
-
-  auto delay_samples = delay_estimator_.EstimateDelay(render_buffer, capture);
-
-  // Overrule the delay estimator delay if the echo remover reports a delay.
-  if (echo_remover_delay) {
-    int total_echo_remover_delay_samples =
-        (render_delay_buffer_delay + *echo_remover_delay) * kBlockSize;
-    delay_samples = DelayEstimate(DelayEstimate::Quality::kRefined,
-                                  total_echo_remover_delay_samples);
-  }
-
-  if (delay_samples) {
-    if (!delay_samples_ || delay_samples->delay != delay_samples_->delay) {
-      delay_change_counter_ = 0;
-    }
-    if (delay_samples_) {
-      delay_samples_->blocks_since_last_change =
-          delay_samples_->delay == delay_samples->delay
-              ? delay_samples_->blocks_since_last_change + 1
-              : 0;
-      delay_samples_->blocks_since_last_update = 0;
-      delay_samples_->delay = delay_samples->delay;
-      delay_samples_->quality = delay_samples->quality;
-    } else {
-      delay_samples_ = delay_samples;
-    }
-  } else {
-    if (delay_samples_) {
-      ++delay_samples_->blocks_since_last_change;
-      ++delay_samples_->blocks_since_last_update;
-    }
-  }
-
-  if (delay_change_counter_ < 2 * kNumBlocksPerSecond) {
-    ++delay_change_counter_;
-  }
-
-  if (delay_samples_) {
-    // Compute the render delay buffer delay.
-    const bool use_hysteresis =
-        last_delay_estimate_quality_ == DelayEstimate::Quality::kRefined &&
-        delay_samples_->quality == DelayEstimate::Quality::kRefined;
-    delay_ = ComputeBufferDelay(delay_, delay_headroom_blocks_,
-                                use_hysteresis ? hysteresis_limit_1_blocks_ : 0,
-                                use_hysteresis ? hysteresis_limit_2_blocks_ : 0,
-                                *delay_samples_);
-    last_delay_estimate_quality_ = delay_samples_->quality;
-  }
-
-  metrics_.Update(delay_samples_ ? absl::optional<size_t>(delay_samples_->delay)
-                                 : absl::nullopt,
-                  delay_ ? delay_->delay : 0, 0);
-
-  data_dumper_->DumpRaw("aec3_render_delay_controller_delay",
-                        delay_samples ? delay_samples->delay : 0);
-  data_dumper_->DumpRaw("aec3_render_delay_controller_buffer_delay",
-                        delay_ ? delay_->delay : 0);
-
-  return delay_;
-}
-
-}  // namespace
-
-RenderDelayController* RenderDelayController::Create2(
-    const EchoCanceller3Config& config,
-    int sample_rate_hz) {
-  return new RenderDelayControllerImpl2(config, sample_rate_hz);
-}
-
-}  // namespace webrtc
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/render_delay_controller_metrics.cc b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/render_delay_controller_metrics.cc
deleted file mode 100644
index c51d4688a7..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/render_delay_controller_metrics.cc
+++ /dev/null
@@ -1,140 +0,0 @@
-/*
- *  Copyright (c) 2017 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#include "modules/audio_processing/aec3/render_delay_controller_metrics.h"
-
-#include <algorithm>
-
-#include "modules/audio_processing/aec3/aec3_common.h"
-#include "rtc_base/checks.h"
-#include "system_wrappers/include/metrics.h"
-
-namespace webrtc {
-
-namespace {
-
-enum class DelayReliabilityCategory {
-  kNone,
-  kPoor,
-  kMedium,
-  kGood,
-  kExcellent,
-  kNumCategories
-};
-enum class DelayChangesCategory {
-  kNone,
-  kFew,
-  kSeveral,
-  kMany,
-  kConstant,
-  kNumCategories
-};
-
-constexpr int kMaxSkewShiftCount = 20;
-
-}  // namespace
-
-RenderDelayControllerMetrics::RenderDelayControllerMetrics() = default;
-
-void RenderDelayControllerMetrics::Update(
-    absl::optional<size_t> delay_samples,
-    size_t buffer_delay_blocks,
-    absl::optional<int> skew_shift_blocks) {
-  ++call_counter_;
-
-  if (!initial_update) {
-    size_t delay_blocks;
-    if (delay_samples) {
-      ++reliable_delay_estimate_counter_;
-      delay_blocks = (*delay_samples) / kBlockSize + 2;
-    } else {
-      delay_blocks = 0;
-    }
-
-    if (delay_blocks != delay_blocks_) {
-      ++delay_change_counter_;
-      delay_blocks_ = delay_blocks;
-    }
-
-    if (skew_shift_blocks) {
-      skew_shift_count_ = std::min(kMaxSkewShiftCount, skew_shift_count_);
-    }
-  } else if (++initial_call_counter_ == 5 * kNumBlocksPerSecond) {
-    initial_update = false;
-  }
-
-  if (call_counter_ == kMetricsReportingIntervalBlocks) {
-    int value_to_report = static_cast<int>(delay_blocks_);
-    value_to_report = std::min(124, value_to_report >> 1);
-    RTC_HISTOGRAM_COUNTS_LINEAR("WebRTC.Audio.EchoCanceller.EchoPathDelay",
-                                value_to_report, 0, 124, 125);
-
-    value_to_report = static_cast<int>(buffer_delay_blocks + 2);
-    value_to_report = std::min(124, value_to_report >> 1);
-    RTC_HISTOGRAM_COUNTS_LINEAR("WebRTC.Audio.EchoCanceller.BufferDelay",
-                                value_to_report, 0, 124, 125);
-
-    DelayReliabilityCategory delay_reliability;
-    if (reliable_delay_estimate_counter_ == 0) {
-      delay_reliability = DelayReliabilityCategory::kNone;
-    } else if (reliable_delay_estimate_counter_ > (call_counter_ >> 1)) {
-      delay_reliability = DelayReliabilityCategory::kExcellent;
-    } else if (reliable_delay_estimate_counter_ > 100) {
-      delay_reliability = DelayReliabilityCategory::kGood;
-    } else if (reliable_delay_estimate_counter_ > 10) {
-      delay_reliability = DelayReliabilityCategory::kMedium;
-    } else {
-      delay_reliability = DelayReliabilityCategory::kPoor;
-    }
-    RTC_HISTOGRAM_ENUMERATION(
-        "WebRTC.Audio.EchoCanceller.ReliableDelayEstimates",
-        static_cast<int>(delay_reliability),
-        static_cast<int>(DelayReliabilityCategory::kNumCategories));
-
-    DelayChangesCategory delay_changes;
-    if (delay_change_counter_ == 0) {
-      delay_changes = DelayChangesCategory::kNone;
-    } else if (delay_change_counter_ > 10) {
-      delay_changes = DelayChangesCategory::kConstant;
-    } else if (delay_change_counter_ > 5) {
-      delay_changes = DelayChangesCategory::kMany;
-    } else if (delay_change_counter_ > 2) {
-      delay_changes = DelayChangesCategory::kSeveral;
-    } else {
-      delay_changes = DelayChangesCategory::kFew;
-    }
-    RTC_HISTOGRAM_ENUMERATION(
-        "WebRTC.Audio.EchoCanceller.DelayChanges",
-        static_cast<int>(delay_changes),
-        static_cast<int>(DelayChangesCategory::kNumCategories));
-
-    metrics_reported_ = true;
-    call_counter_ = 0;
-    ResetMetrics();
-  } else {
-    metrics_reported_ = false;
-  }
-
-  if (!initial_update && ++skew_report_timer_ == 60 * kNumBlocksPerSecond) {
-    RTC_HISTOGRAM_COUNTS_LINEAR("WebRTC.Audio.EchoCanceller.MaxSkewShiftCount",
-                                skew_shift_count_, 0, kMaxSkewShiftCount,
-                                kMaxSkewShiftCount + 1);
-
-    skew_shift_count_ = 0;
-    skew_report_timer_ = 0;
-  }
-}
-
-void RenderDelayControllerMetrics::ResetMetrics() {
-  delay_change_counter_ = 0;
-  reliable_delay_estimate_counter_ = 0;
-}
-
-}  // namespace webrtc
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/render_delay_controller_metrics.h b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/render_delay_controller_metrics.h
deleted file mode 100644
index 50e60bbd9c..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/render_delay_controller_metrics.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- *  Copyright (c) 2017 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#ifndef MODULES_AUDIO_PROCESSING_AEC3_RENDER_DELAY_CONTROLLER_METRICS_H_
-#define MODULES_AUDIO_PROCESSING_AEC3_RENDER_DELAY_CONTROLLER_METRICS_H_
-
-#include <stddef.h>
-
-#include "absl/types/optional.h"
-#include "rtc_base/constructormagic.h"
-
-namespace webrtc {
-
-// Handles the reporting of metrics for the render delay controller.
-class RenderDelayControllerMetrics {
- public:
-  RenderDelayControllerMetrics();
-
-  // Updates the metric with new data.
-  void Update(absl::optional<size_t> delay_samples,
-              size_t buffer_delay_blocks,
-              absl::optional<int> skew_shift_blocks);
-
-  // Returns true if the metrics have just been reported, otherwise false.
-  bool MetricsReported() { return metrics_reported_; }
-
- private:
-  // Resets the metrics.
-  void ResetMetrics();
-
-  size_t delay_blocks_ = 0;
-  int reliable_delay_estimate_counter_ = 0;
-  int delay_change_counter_ = 0;
-  int call_counter_ = 0;
-  int skew_report_timer_ = 0;
-  int initial_call_counter_ = 0;
-  bool metrics_reported_ = false;
-  bool initial_update = true;
-  int skew_shift_count_ = 0;
-
-  RTC_DISALLOW_COPY_AND_ASSIGN(RenderDelayControllerMetrics);
-};
-
-}  // namespace webrtc
-
-#endif  // MODULES_AUDIO_PROCESSING_AEC3_RENDER_DELAY_CONTROLLER_METRICS_H_
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/render_reverb_model.cc b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/render_reverb_model.cc
deleted file mode 100644
index 8ad54c0cc3..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/render_reverb_model.cc
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- *  Copyright (c) 2018 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#include "modules/audio_processing/aec3/render_reverb_model.h"
-
-#include <algorithm>
-
-#include "api/array_view.h"
-#include "rtc_base/checks.h"
-
-namespace webrtc {
-
-RenderReverbModel::RenderReverbModel() {
-  Reset();
-}
-
-RenderReverbModel::~RenderReverbModel() = default;
-
-void RenderReverbModel::Reset() {
-  render_reverb_.Reset();
-}
-
-void RenderReverbModel::Apply(const VectorBuffer& spectrum_buffer,
-                              int delay_blocks,
-                              float reverb_decay,
-                              rtc::ArrayView<float> reverb_power_spectrum) {
-  int idx_at_delay =
-      spectrum_buffer.OffsetIndex(spectrum_buffer.read, delay_blocks);
-  int idx_past = spectrum_buffer.IncIndex(idx_at_delay);
-  const auto& X2 = spectrum_buffer.buffer[idx_at_delay];
-  RTC_DCHECK_EQ(X2.size(), reverb_power_spectrum.size());
-  std::copy(X2.begin(), X2.end(), reverb_power_spectrum.begin());
-  render_reverb_.AddReverbNoFreqShaping(spectrum_buffer.buffer[idx_past], 1.0f,
-                                        reverb_decay, reverb_power_spectrum);
-}
-
-}  // namespace webrtc
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/render_reverb_model.h b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/render_reverb_model.h
deleted file mode 100644
index d404a69ecd..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/render_reverb_model.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- *  Copyright (c) 2018 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#ifndef MODULES_AUDIO_PROCESSING_AEC3_RENDER_REVERB_MODEL_H_
-#define MODULES_AUDIO_PROCESSING_AEC3_RENDER_REVERB_MODEL_H_
-
-#include "api/array_view.h"
-#include "modules/audio_processing/aec3/reverb_model.h"
-#include "modules/audio_processing/aec3/vector_buffer.h"
-
-namespace webrtc {
-
-// The RenderReverbModel class applies an exponential reverberant model over the
-// render spectrum.
-class RenderReverbModel {
- public:
-  RenderReverbModel();
-  ~RenderReverbModel();
-
-  // Resets the state.
-  void Reset();
-
-  // Applies the reverberation model over the render spectrum. It also returns
-  // the reverberation render power spectrum in the array reverb_power_spectrum.
-  void Apply(const VectorBuffer& spectrum_buffer,
-             int delay_blocks,
-             float reverb_decay,
-             rtc::ArrayView<float> reverb_power_spectrum);
-
-  // Gets the reverberation spectrum that was added to the render spectrum for
-  // computing the reverberation render spectrum.
-  rtc::ArrayView<const float> GetReverbContributionPowerSpectrum() const {
-    return render_reverb_.GetPowerSpectrum();
-  }
-
- private:
-  ReverbModel render_reverb_;
-};
-
-}  // namespace webrtc.
-
-#endif  // MODULES_AUDIO_PROCESSING_AEC3_RENDER_REVERB_MODEL_H_
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/render_signal_analyzer.cc b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/render_signal_analyzer.cc
deleted file mode 100644
index 33b04bf70c..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/render_signal_analyzer.cc
+++ /dev/null
@@ -1,132 +0,0 @@
-/*
- *  Copyright (c) 2017 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#include "modules/audio_processing/aec3/render_signal_analyzer.h"
-
-#include <math.h>
-#include <algorithm>
-#include <utility>
-#include <vector>
-
-#include "api/array_view.h"
-#include "rtc_base/checks.h"
-
-namespace webrtc {
-
-namespace {
-constexpr size_t kCounterThreshold = 5;
-
-// Identifies local bands with narrow characteristics.
-void IdentifySmallNarrowBandRegions(
-    const RenderBuffer& render_buffer,
-    const absl::optional<size_t>& delay_partitions,
-    std::array<size_t, kFftLengthBy2 - 1>* narrow_band_counters) {
-  if (!delay_partitions) {
-    narrow_band_counters->fill(0);
-    return;
-  }
-
-  rtc::ArrayView<const float> X2 = render_buffer.Spectrum(*delay_partitions);
-  RTC_DCHECK_EQ(kFftLengthBy2Plus1, X2.size());
-
-  for (size_t k = 1; k < (X2.size() - 1); ++k) {
-    (*narrow_band_counters)[k - 1] = X2[k] > 3 * std::max(X2[k - 1], X2[k + 1])
-                                         ? (*narrow_band_counters)[k - 1] + 1
-                                         : 0;
-  }
-}
-
-// Identifies whether the signal has a single strong narrow-band component.
-void IdentifyStrongNarrowBandComponent(const RenderBuffer& render_buffer,
-                                       int strong_peak_freeze_duration,
-                                       absl::optional<int>* narrow_peak_band,
-                                       size_t* narrow_peak_counter) {
-  const auto X2_latest = render_buffer.Spectrum(0);
-
-  // Identify the spectral peak.
-  const int peak_bin = static_cast<int>(
-      std::max_element(X2_latest.begin(), X2_latest.end()) - X2_latest.begin());
-
-  // Compute the level around the peak.
-  float non_peak_power = 0.f;
-  for (int k = std::max(0, peak_bin - 14); k < peak_bin - 4; ++k) {
-    non_peak_power = std::max(X2_latest[k], non_peak_power);
-  }
-  for (int k = peak_bin + 5;
-       k < std::min(peak_bin + 15, static_cast<int>(kFftLengthBy2Plus1)); ++k) {
-    non_peak_power = std::max(X2_latest[k], non_peak_power);
-  }
-
-  // Assess the render signal strength.
-  const std::vector<std::vector<float>>& x_latest = render_buffer.Block(0);
-  auto result0 = std::minmax_element(x_latest[0].begin(), x_latest[0].end());
-  float max_abs = std::max(fabs(*result0.first), fabs(*result0.second));
-
-  if (x_latest.size() > 1) {
-    const auto result1 =
-        std::minmax_element(x_latest[1].begin(), x_latest[1].end());
-    max_abs =
-        std::max(max_abs, static_cast<float>(std::max(fabs(*result1.first),
-                                                      fabs(*result1.second))));
-  }
-
-  // Detect whether the spectal peak has as strong narrowband nature.
-  if (peak_bin > 0 && max_abs > 100 &&
-      X2_latest[peak_bin] > 100 * non_peak_power) {
-    *narrow_peak_band = peak_bin;
-    *narrow_peak_counter = 0;
-  } else {
-    if (*narrow_peak_band &&
-        ++(*narrow_peak_counter) >
-            static_cast<size_t>(strong_peak_freeze_duration)) {
-      *narrow_peak_band = absl::nullopt;
-    }
-  }
-}
-
-}  // namespace
-
-RenderSignalAnalyzer::RenderSignalAnalyzer(const EchoCanceller3Config& config)
-    : strong_peak_freeze_duration_(config.filter.main.length_blocks) {
-  narrow_band_counters_.fill(0);
-}
-RenderSignalAnalyzer::~RenderSignalAnalyzer() = default;
-
-void RenderSignalAnalyzer::Update(
-    const RenderBuffer& render_buffer,
-    const absl::optional<size_t>& delay_partitions) {
-  // Identify bands of narrow nature.
-  IdentifySmallNarrowBandRegions(render_buffer, delay_partitions,
-                                 &narrow_band_counters_);
-
-  // Identify the presence of a strong narrow band.
-  IdentifyStrongNarrowBandComponent(render_buffer, strong_peak_freeze_duration_,
-                                    &narrow_peak_band_, &narrow_peak_counter_);
-}
-
-void RenderSignalAnalyzer::MaskRegionsAroundNarrowBands(
-    std::array<float, kFftLengthBy2Plus1>* v) const {
-  RTC_DCHECK(v);
-
-  // Set v to zero around narrow band signal regions.
-  if (narrow_band_counters_[0] > kCounterThreshold) {
-    (*v)[1] = (*v)[0] = 0.f;
-  }
-  for (size_t k = 2; k < kFftLengthBy2 - 1; ++k) {
-    if (narrow_band_counters_[k - 1] > kCounterThreshold) {
-      (*v)[k - 2] = (*v)[k - 1] = (*v)[k] = (*v)[k + 1] = (*v)[k + 2] = 0.f;
-    }
-  }
-  if (narrow_band_counters_[kFftLengthBy2 - 2] > kCounterThreshold) {
-    (*v)[kFftLengthBy2] = (*v)[kFftLengthBy2 - 1] = 0.f;
-  }
-}
-
-}  // namespace webrtc
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/render_signal_analyzer.h b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/render_signal_analyzer.h
deleted file mode 100644
index 8a44232cf9..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/render_signal_analyzer.h
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- *  Copyright (c) 2017 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#ifndef MODULES_AUDIO_PROCESSING_AEC3_RENDER_SIGNAL_ANALYZER_H_
-#define MODULES_AUDIO_PROCESSING_AEC3_RENDER_SIGNAL_ANALYZER_H_
-
-#include <algorithm>
-#include <array>
-#include <cstddef>
-
-#include "absl/types/optional.h"
-#include "api/audio/echo_canceller3_config.h"
-#include "modules/audio_processing/aec3/aec3_common.h"
-#include "modules/audio_processing/aec3/render_buffer.h"
-#include "rtc_base/checks.h"
-#include "rtc_base/constructormagic.h"
-
-namespace webrtc {
-
-// Provides functionality for analyzing the properties of the render signal.
-class RenderSignalAnalyzer {
- public:
-  explicit RenderSignalAnalyzer(const EchoCanceller3Config& config);
-  ~RenderSignalAnalyzer();
-
-  // Updates the render signal analysis with the most recent render signal.
-  void Update(const RenderBuffer& render_buffer,
-              const absl::optional<size_t>& delay_partitions);
-
-  // Returns true if the render signal is poorly exciting.
-  bool PoorSignalExcitation() const {
-    RTC_DCHECK_LT(2, narrow_band_counters_.size());
-    return std::any_of(narrow_band_counters_.begin(),
-                       narrow_band_counters_.end(),
-                       [](size_t a) { return a > 10; });
-  }
-
-  // Zeros the array around regions with narrow bands signal characteristics.
-  void MaskRegionsAroundNarrowBands(
-      std::array<float, kFftLengthBy2Plus1>* v) const;
-
-  absl::optional<int> NarrowPeakBand() const { return narrow_peak_band_; }
-
- private:
-  const int strong_peak_freeze_duration_;
-  std::array<size_t, kFftLengthBy2 - 1> narrow_band_counters_;
-  absl::optional<int> narrow_peak_band_;
-  size_t narrow_peak_counter_;
-
-  RTC_DISALLOW_COPY_AND_ASSIGN(RenderSignalAnalyzer);
-};
-
-}  // namespace webrtc
-
-#endif  // MODULES_AUDIO_PROCESSING_AEC3_RENDER_SIGNAL_ANALYZER_H_
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/residual_echo_estimator.cc b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/residual_echo_estimator.cc
deleted file mode 100644
index 627dd900c4..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/residual_echo_estimator.cc
+++ /dev/null
@@ -1,328 +0,0 @@
-
-/*
- *  Copyright (c) 2017 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#include "modules/audio_processing/aec3/residual_echo_estimator.h"
-
-#include <stddef.h>
-#include <algorithm>
-#include <vector>
-
-#include "api/array_view.h"
-#include "modules/audio_processing/aec3/reverb_model.h"
-#include "modules/audio_processing/aec3/reverb_model_fallback.h"
-#include "rtc_base/checks.h"
-#include "system_wrappers/include/field_trial.h"
-
-namespace webrtc {
-namespace {
-
-bool EnableSoftTransparentMode() {
-  return !field_trial::IsEnabled("WebRTC-Aec3SoftTransparentModeKillSwitch");
-}
-
-bool OverrideEstimatedEchoPathGain() {
-  return !field_trial::IsEnabled("WebRTC-Aec3OverrideEchoPathGainKillSwitch");
-}
-
-bool UseFixedNonLinearReverbModel() {
-  return field_trial::IsEnabled(
-      "WebRTC-Aec3StandardNonlinearReverbModelKillSwitch");
-}
-
-// Computes the indexes that will be used for computing spectral power over
-// the blocks surrounding the delay.
-void GetRenderIndexesToAnalyze(
-    const VectorBuffer& spectrum_buffer,
-    const EchoCanceller3Config::EchoModel& echo_model,
-    int filter_delay_blocks,
-    bool gain_limiter_running,
-    int headroom,
-    int* idx_start,
-    int* idx_stop) {
-  RTC_DCHECK(idx_start);
-  RTC_DCHECK(idx_stop);
-  if (gain_limiter_running) {
-    if (static_cast<size_t>(headroom) >
-        echo_model.render_post_window_size_init) {
-      *idx_start = spectrum_buffer.OffsetIndex(
-          spectrum_buffer.read,
-          -static_cast<int>(echo_model.render_post_window_size_init));
-    } else {
-      *idx_start = spectrum_buffer.IncIndex(spectrum_buffer.write);
-    }
-
-    *idx_stop = spectrum_buffer.OffsetIndex(
-        spectrum_buffer.read, echo_model.render_pre_window_size_init);
-  } else {
-    size_t window_start;
-    size_t window_end;
-    window_start =
-        std::max(0, filter_delay_blocks -
-                        static_cast<int>(echo_model.render_pre_window_size));
-    window_end = filter_delay_blocks +
-                 static_cast<int>(echo_model.render_post_window_size);
-    *idx_start =
-        spectrum_buffer.OffsetIndex(spectrum_buffer.read, window_start);
-    *idx_stop =
-        spectrum_buffer.OffsetIndex(spectrum_buffer.read, window_end + 1);
-  }
-}
-
-}  // namespace
-
-ResidualEchoEstimator::ResidualEchoEstimator(const EchoCanceller3Config& config)
-    : config_(config),
-      soft_transparent_mode_(EnableSoftTransparentMode()),
-      override_estimated_echo_path_gain_(OverrideEstimatedEchoPathGain()),
-      use_fixed_nonlinear_reverb_model_(UseFixedNonLinearReverbModel()) {
-  if (config_.ep_strength.reverb_based_on_render) {
-    echo_reverb_.reset(new ReverbModel());
-  } else {
-    echo_reverb_fallback.reset(
-        new ReverbModelFallback(config_.filter.main.length_blocks));
-  }
-  Reset();
-}
-
-ResidualEchoEstimator::~ResidualEchoEstimator() = default;
-
-void ResidualEchoEstimator::Estimate(
-    const AecState& aec_state,
-    const RenderBuffer& render_buffer,
-    const std::array<float, kFftLengthBy2Plus1>& S2_linear,
-    const std::array<float, kFftLengthBy2Plus1>& Y2,
-    std::array<float, kFftLengthBy2Plus1>* R2) {
-  RTC_DCHECK(R2);
-
-  // Estimate the power of the stationary noise in the render signal.
-  RenderNoisePower(render_buffer, &X2_noise_floor_, &X2_noise_floor_counter_);
-
-  // Estimate the residual echo power.
-  if (aec_state.UsableLinearEstimate()) {
-    LinearEstimate(S2_linear, aec_state.Erle(), aec_state.ErleUncertainty(),
-                   R2);
-
-    // When there is saturated echo, assume the same spectral content as is
-    // present in the micropone signal.
-    if (aec_state.SaturatedEcho()) {
-      std::copy(Y2.begin(), Y2.end(), R2->begin());
-    }
-
-    // Adds the estimated unmodelled echo power to the residual echo power
-    // estimate.
-    if (echo_reverb_) {
-      echo_reverb_->AddReverb(
-          render_buffer.Spectrum(aec_state.FilterLengthBlocks() + 1),
-          aec_state.GetReverbFrequencyResponse(), aec_state.ReverbDecay(), *R2);
-
-    } else {
-      RTC_DCHECK(echo_reverb_fallback);
-      echo_reverb_fallback->AddEchoReverb(S2_linear,
-                                          aec_state.FilterDelayBlocks(),
-                                          aec_state.ReverbDecay(), R2);
-    }
-
-  } else {
-    // Estimate the echo generating signal power.
-    std::array<float, kFftLengthBy2Plus1> X2;
-
-    EchoGeneratingPower(render_buffer.GetSpectrumBuffer(), config_.echo_model,
-                        render_buffer.Headroom(), aec_state.FilterDelayBlocks(),
-                        aec_state.IsSuppressionGainLimitActive(),
-                        !aec_state.UseStationaryProperties(), &X2);
-
-    // Subtract the stationary noise power to avoid stationary noise causing
-    // excessive echo suppression.
-    std::transform(X2.begin(), X2.end(), X2_noise_floor_.begin(), X2.begin(),
-                   [&](float a, float b) {
-                     return std::max(
-                         0.f, a - config_.echo_model.stationary_gate_slope * b);
-                   });
-
-    float echo_path_gain;
-    if (override_estimated_echo_path_gain_) {
-      echo_path_gain = aec_state.TransparentMode() && soft_transparent_mode_
-                           ? 0.01f
-                           : config_.ep_strength.lf;
-    } else {
-      echo_path_gain = aec_state.TransparentMode() && soft_transparent_mode_
-                           ? 0.01f
-                           : aec_state.EchoPathGain();
-    }
-    NonLinearEstimate(echo_path_gain, X2, Y2, R2);
-
-    // When there is saturated echo, assume the same spectral content as is
-    // present in the micropone signal.
-    if (aec_state.SaturatedEcho()) {
-      std::copy(Y2.begin(), Y2.end(), R2->begin());
-    }
-
-    if (!(aec_state.TransparentMode() && soft_transparent_mode_)) {
-      if (echo_reverb_) {
-        echo_reverb_->AddReverbNoFreqShaping(
-            render_buffer.Spectrum(aec_state.FilterDelayBlocks() + 1),
-            echo_path_gain * echo_path_gain, aec_state.ReverbDecay(), *R2);
-      } else {
-        RTC_DCHECK(echo_reverb_fallback);
-        echo_reverb_fallback->AddEchoReverb(*R2,
-                                            config_.filter.main.length_blocks,
-                                            aec_state.ReverbDecay(), R2);
-      }
-    }
-  }
-
-  if (aec_state.UseStationaryProperties()) {
-    // Scale the echo according to echo audibility.
-    std::array<float, kFftLengthBy2Plus1> residual_scaling;
-    aec_state.GetResidualEchoScaling(residual_scaling);
-    for (size_t k = 0; k < R2->size(); ++k) {
-      (*R2)[k] *= residual_scaling[k];
-      if (residual_scaling[k] == 0.f) {
-        R2_hold_counter_[k] = 0;
-      }
-    }
-  }
-  if (!soft_transparent_mode_) {
-    // If the echo is deemed inaudible, set the residual echo to zero.
-    if (aec_state.TransparentMode()) {
-      R2->fill(0.f);
-      R2_old_.fill(0.f);
-      R2_hold_counter_.fill(0.f);
-    }
-  }
-
-  std::copy(R2->begin(), R2->end(), R2_old_.begin());
-}
-
-void ResidualEchoEstimator::Reset() {
-  if (echo_reverb_) {
-    echo_reverb_->Reset();
-  } else {
-    RTC_DCHECK(echo_reverb_fallback);
-    echo_reverb_fallback->Reset();
-  }
-  X2_noise_floor_counter_.fill(config_.echo_model.noise_floor_hold);
-  X2_noise_floor_.fill(config_.echo_model.min_noise_floor_power);
-  R2_old_.fill(0.f);
-  R2_hold_counter_.fill(0.f);
-}
-
-void ResidualEchoEstimator::LinearEstimate(
-    const std::array<float, kFftLengthBy2Plus1>& S2_linear,
-    const std::array<float, kFftLengthBy2Plus1>& erle,
-    absl::optional<float> erle_uncertainty,
-    std::array<float, kFftLengthBy2Plus1>* R2) {
-  std::fill(R2_hold_counter_.begin(), R2_hold_counter_.end(), 10.f);
-  if (erle_uncertainty) {
-    for (size_t k = 0; k < R2->size(); ++k) {
-      (*R2)[k] = S2_linear[k] * *erle_uncertainty;
-    }
-  } else {
-    std::transform(erle.begin(), erle.end(), S2_linear.begin(), R2->begin(),
-                   [](float a, float b) {
-                     RTC_DCHECK_LT(0.f, a);
-                     return b / a;
-                   });
-  }
-}
-
-void ResidualEchoEstimator::NonLinearEstimate(
-    float echo_path_gain,
-    const std::array<float, kFftLengthBy2Plus1>& X2,
-    const std::array<float, kFftLengthBy2Plus1>& Y2,
-    std::array<float, kFftLengthBy2Plus1>* R2) {
-  // Compute preliminary residual echo.
-  std::transform(X2.begin(), X2.end(), R2->begin(), [echo_path_gain](float a) {
-    return a * echo_path_gain * echo_path_gain;
-  });
-
-  if (use_fixed_nonlinear_reverb_model_) {
-    for (size_t k = 0; k < R2->size(); ++k) {
-      // Update hold counter.
-      R2_hold_counter_[k] = R2_old_[k] < (*R2)[k] ? 0 : R2_hold_counter_[k] + 1;
-
-      // Compute the residual echo by holding a maximum echo powers and an echo
-      // fading corresponding to a room with an RT60 value of about 50 ms.
-      (*R2)[k] =
-          R2_hold_counter_[k] < config_.echo_model.nonlinear_hold
-              ? std::max((*R2)[k], R2_old_[k])
-              : std::min((*R2)[k] +
-                             R2_old_[k] * config_.echo_model.nonlinear_release,
-                         Y2[k]);
-    }
-  }
-}
-
-void ResidualEchoEstimator::EchoGeneratingPower(
-    const VectorBuffer& spectrum_buffer,
-    const EchoCanceller3Config::EchoModel& echo_model,
-    int headroom_spectrum_buffer,
-    int filter_delay_blocks,
-    bool gain_limiter_running,
-    bool apply_noise_gating,
-    std::array<float, kFftLengthBy2Plus1>* X2) const {
-  int idx_stop, idx_start;
-
-  RTC_DCHECK(X2);
-  GetRenderIndexesToAnalyze(spectrum_buffer, config_.echo_model,
-                            filter_delay_blocks, gain_limiter_running,
-                            headroom_spectrum_buffer, &idx_start, &idx_stop);
-
-  X2->fill(0.f);
-  for (int k = idx_start; k != idx_stop; k = spectrum_buffer.IncIndex(k)) {
-    std::transform(X2->begin(), X2->end(), spectrum_buffer.buffer[k].begin(),
-                   X2->begin(),
-                   [](float a, float b) { return std::max(a, b); });
-  }
-
-  if (apply_noise_gating) {
-    // Apply soft noise gate.
-    std::for_each(X2->begin(), X2->end(), [&](float& a) {
-      if (config_.echo_model.noise_gate_power > a) {
-        a = std::max(0.f, a - config_.echo_model.noise_gate_slope *
-                                  (config_.echo_model.noise_gate_power - a));
-      }
-    });
-  }
-}
-
-void ResidualEchoEstimator::RenderNoisePower(
-    const RenderBuffer& render_buffer,
-    std::array<float, kFftLengthBy2Plus1>* X2_noise_floor,
-    std::array<int, kFftLengthBy2Plus1>* X2_noise_floor_counter) const {
-  RTC_DCHECK(X2_noise_floor);
-  RTC_DCHECK(X2_noise_floor_counter);
-
-  const auto render_power = render_buffer.Spectrum(0);
-  RTC_DCHECK_EQ(X2_noise_floor->size(), render_power.size());
-  RTC_DCHECK_EQ(X2_noise_floor_counter->size(), render_power.size());
-
-  // Estimate the stationary noise power in a minimum statistics manner.
-  for (size_t k = 0; k < render_power.size(); ++k) {
-    // Decrease rapidly.
-    if (render_power[k] < (*X2_noise_floor)[k]) {
-      (*X2_noise_floor)[k] = render_power[k];
-      (*X2_noise_floor_counter)[k] = 0;
-    } else {
-      // Increase in a delayed, leaky manner.
-      if ((*X2_noise_floor_counter)[k] >=
-          static_cast<int>(config_.echo_model.noise_floor_hold)) {
-        (*X2_noise_floor)[k] =
-            std::max((*X2_noise_floor)[k] * 1.1f,
-                     config_.echo_model.min_noise_floor_power);
-      } else {
-        ++(*X2_noise_floor_counter)[k];
-      }
-    }
-  }
-}
-
-}  // namespace webrtc
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/residual_echo_estimator.h b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/residual_echo_estimator.h
deleted file mode 100644
index 52885a58d8..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/residual_echo_estimator.h
+++ /dev/null
@@ -1,101 +0,0 @@
-/*
- *  Copyright (c) 2017 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#ifndef MODULES_AUDIO_PROCESSING_AEC3_RESIDUAL_ECHO_ESTIMATOR_H_
-#define MODULES_AUDIO_PROCESSING_AEC3_RESIDUAL_ECHO_ESTIMATOR_H_
-
-#include <array>
-#include <memory>
-
-#include "absl/types/optional.h"
-#include "api/audio/echo_canceller3_config.h"
-#include "modules/audio_processing/aec3/aec3_common.h"
-#include "modules/audio_processing/aec3/aec_state.h"
-#include "modules/audio_processing/aec3/render_buffer.h"
-#include "modules/audio_processing/aec3/reverb_model.h"
-#include "modules/audio_processing/aec3/reverb_model_fallback.h"
-#include "modules/audio_processing/aec3/vector_buffer.h"
-#include "rtc_base/checks.h"
-#include "rtc_base/constructormagic.h"
-
-namespace webrtc {
-
-class ResidualEchoEstimator {
- public:
-  explicit ResidualEchoEstimator(const EchoCanceller3Config& config);
-  ~ResidualEchoEstimator();
-
-  void Estimate(const AecState& aec_state,
-                const RenderBuffer& render_buffer,
-                const std::array<float, kFftLengthBy2Plus1>& S2_linear,
-                const std::array<float, kFftLengthBy2Plus1>& Y2,
-                std::array<float, kFftLengthBy2Plus1>* R2);
-
-  // Returns the reverberant power spectrum contributions to the echo residual.
-  rtc::ArrayView<const float> GetReverbPowerSpectrum() const {
-    if (echo_reverb_) {
-      return echo_reverb_->GetPowerSpectrum();
-    } else {
-      RTC_DCHECK(echo_reverb_fallback);
-      return echo_reverb_fallback->GetPowerSpectrum();
-    }
-  }
-
- private:
-  // Resets the state.
-  void Reset();
-
-  // Estimates the residual echo power based on the echo return loss enhancement
-  // (ERLE) and the linear power estimate.
-  void LinearEstimate(const std::array<float, kFftLengthBy2Plus1>& S2_linear,
-                      const std::array<float, kFftLengthBy2Plus1>& erle,
-                      absl::optional<float> erle_uncertainty,
-                      std::array<float, kFftLengthBy2Plus1>* R2);
-
-  // Estimates the residual echo power based on the estimate of the echo path
-  // gain.
-  void NonLinearEstimate(float echo_path_gain,
-                         const std::array<float, kFftLengthBy2Plus1>& X2,
-                         const std::array<float, kFftLengthBy2Plus1>& Y2,
-                         std::array<float, kFftLengthBy2Plus1>* R2);
-
-  // Estimates the echo generating signal power as gated maximal power over a
-  // time window.
-  void EchoGeneratingPower(const VectorBuffer& spectrum_buffer,
-                           const EchoCanceller3Config::EchoModel& echo_model,
-                           int headroom_spectrum_buffer,
-                           int filter_delay_blocks,
-                           bool gain_limiter_running,
-                           bool apply_noise_gating,
-                           std::array<float, kFftLengthBy2Plus1>* X2) const;
-
-  // Updates estimate for the power of the stationary noise component in the
-  // render signal.
-  void RenderNoisePower(
-      const RenderBuffer& render_buffer,
-      std::array<float, kFftLengthBy2Plus1>* X2_noise_floor,
-      std::array<int, kFftLengthBy2Plus1>* X2_noise_floor_counter) const;
-
-  const EchoCanceller3Config config_;
-  std::array<float, kFftLengthBy2Plus1> R2_old_;
-  std::array<int, kFftLengthBy2Plus1> R2_hold_counter_;
-  std::array<float, kFftLengthBy2Plus1> X2_noise_floor_;
-  std::array<int, kFftLengthBy2Plus1> X2_noise_floor_counter_;
-  const bool soft_transparent_mode_;
-  const bool override_estimated_echo_path_gain_;
-  const bool use_fixed_nonlinear_reverb_model_;
-  std::unique_ptr<ReverbModel> echo_reverb_;
-  std::unique_ptr<ReverbModelFallback> echo_reverb_fallback;
-  RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(ResidualEchoEstimator);
-};
-
-}  // namespace webrtc
-
-#endif  // MODULES_AUDIO_PROCESSING_AEC3_RESIDUAL_ECHO_ESTIMATOR_H_
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/reverb_decay_estimator.cc b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/reverb_decay_estimator.cc
deleted file mode 100644
index 95fd13af59..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/reverb_decay_estimator.cc
+++ /dev/null
@@ -1,415 +0,0 @@
-/*
- *  Copyright (c) 2018 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#include "modules/audio_processing/aec3/reverb_decay_estimator.h"
-
-#include <stddef.h>
-#include <algorithm>
-#include <cmath>
-#include <numeric>
-
-#include "api/array_view.h"
-#include "api/audio/echo_canceller3_config.h"
-#include "modules/audio_processing/logging/apm_data_dumper.h"
-#include "rtc_base/checks.h"
-#include "system_wrappers/include/field_trial.h"
-
-namespace webrtc {
-
-namespace {
-
-bool EnforceAdaptiveEchoReverbEstimation() {
-  return field_trial::IsEnabled(
-      "WebRTC-Aec3EnableAdaptiveEchoReverbEstimation");
-}
-
-constexpr int kEarlyReverbMinSizeBlocks = 3;
-constexpr int kBlocksPerSection = 6;
-// Linear regression approach assumes symmetric index around 0.
-constexpr float kEarlyReverbFirstPointAtLinearRegressors =
-    -0.5f * kBlocksPerSection * kFftLengthBy2 + 0.5f;
-
-// Averages the values in a block of size kFftLengthBy2;
-float BlockAverage(rtc::ArrayView<const float> v, size_t block_index) {
-  constexpr float kOneByFftLengthBy2 = 1.f / kFftLengthBy2;
-  const int i = block_index * kFftLengthBy2;
-  RTC_DCHECK_GE(v.size(), i + kFftLengthBy2);
-  const float sum =
-      std::accumulate(v.begin() + i, v.begin() + i + kFftLengthBy2, 0.f);
-  return sum * kOneByFftLengthBy2;
-}
-
-// Analyzes the gain in a block.
-void AnalyzeBlockGain(const std::array<float, kFftLengthBy2>& h2,
-                      float floor_gain,
-                      float* previous_gain,
-                      bool* block_adapting,
-                      bool* decaying_gain) {
-  float gain = std::max(BlockAverage(h2, 0), 1e-32f);
-  *block_adapting =
-      *previous_gain > 1.1f * gain || *previous_gain < 0.9f * gain;
-  *decaying_gain = gain > floor_gain;
-  *previous_gain = gain;
-}
-
-// Arithmetic sum of $2 \sum_{i=0.5}^{(N-1)/2}i^2$ calculated directly.
-constexpr float SymmetricArithmetricSum(int N) {
-  return N * (N * N - 1.0f) * (1.f / 12.f);
-}
-
-// Returns the peak energy of an impulse response.
-float BlockEnergyPeak(rtc::ArrayView<const float> h, int peak_block) {
-  RTC_DCHECK_LE((peak_block + 1) * kFftLengthBy2, h.size());
-  RTC_DCHECK_GE(peak_block, 0);
-  float peak_value =
-      *std::max_element(h.begin() + peak_block * kFftLengthBy2,
-                        h.begin() + (peak_block + 1) * kFftLengthBy2,
-                        [](float a, float b) { return a * a < b * b; });
-  return peak_value * peak_value;
-}
-
-// Returns the average energy of an impulse response block.
-float BlockEnergyAverage(rtc::ArrayView<const float> h, int block_index) {
-  RTC_DCHECK_LE((block_index + 1) * kFftLengthBy2, h.size());
-  RTC_DCHECK_GE(block_index, 0);
-  constexpr float kOneByFftLengthBy2 = 1.f / kFftLengthBy2;
-  const auto sum_of_squares = [](float a, float b) { return a + b * b; };
-  return std::accumulate(h.begin() + block_index * kFftLengthBy2,
-                         h.begin() + (block_index + 1) * kFftLengthBy2, 0.f,
-                         sum_of_squares) *
-         kOneByFftLengthBy2;
-}
-
-}  // namespace
-
-ReverbDecayEstimator::ReverbDecayEstimator(const EchoCanceller3Config& config)
-    : filter_length_blocks_(config.filter.main.length_blocks),
-      filter_length_coefficients_(GetTimeDomainLength(filter_length_blocks_)),
-      use_adaptive_echo_decay_(config.ep_strength.default_len < 0.f ||
-                               EnforceAdaptiveEchoReverbEstimation()),
-      early_reverb_estimator_(config.filter.main.length_blocks -
-                              kEarlyReverbMinSizeBlocks),
-      late_reverb_start_(kEarlyReverbMinSizeBlocks),
-      late_reverb_end_(kEarlyReverbMinSizeBlocks),
-      decay_(std::fabs(config.ep_strength.default_len)) {
-  previous_gains_.fill(0.f);
-  RTC_DCHECK_GT(config.filter.main.length_blocks,
-                static_cast<size_t>(kEarlyReverbMinSizeBlocks));
-}
-
-ReverbDecayEstimator::~ReverbDecayEstimator() = default;
-
-void ReverbDecayEstimator::Update(rtc::ArrayView<const float> filter,
-                                  const absl::optional<float>& filter_quality,
-                                  int filter_delay_blocks,
-                                  bool usable_linear_filter,
-                                  bool stationary_signal) {
-  const int filter_size = static_cast<int>(filter.size());
-
-  if (stationary_signal) {
-    return;
-  }
-
-  bool estimation_feasible =
-      filter_delay_blocks <=
-      filter_length_blocks_ - kEarlyReverbMinSizeBlocks - 1;
-  estimation_feasible =
-      estimation_feasible && filter_size == filter_length_coefficients_;
-  estimation_feasible = estimation_feasible && filter_delay_blocks > 0;
-  estimation_feasible = estimation_feasible && usable_linear_filter;
-
-  if (!estimation_feasible) {
-    ResetDecayEstimation();
-    return;
-  }
-
-  if (!use_adaptive_echo_decay_) {
-    return;
-  }
-
-  const float new_smoothing = filter_quality ? *filter_quality * 0.2f : 0.f;
-  smoothing_constant_ = std::max(new_smoothing, smoothing_constant_);
-  if (smoothing_constant_ == 0.f) {
-    return;
-  }
-
-  if (block_to_analyze_ < filter_length_blocks_) {
-    // Analyze the filter and accumulate data for reverb estimation.
-    AnalyzeFilter(filter);
-    ++block_to_analyze_;
-  } else {
-    // When the filter is fully analyzed, estimate the reverb decay and reset
-    // the block_to_analyze_ counter.
-    EstimateDecay(filter, filter_delay_blocks);
-  }
-}
-
-void ReverbDecayEstimator::ResetDecayEstimation() {
-  early_reverb_estimator_.Reset();
-  late_reverb_decay_estimator_.Reset(0);
-  block_to_analyze_ = 0;
-  estimation_region_candidate_size_ = 0;
-  estimation_region_identified_ = false;
-  smoothing_constant_ = 0.f;
-  late_reverb_start_ = 0;
-  late_reverb_end_ = 0;
-}
-
-void ReverbDecayEstimator::EstimateDecay(rtc::ArrayView<const float> filter,
-                                         int peak_block) {
-  auto& h = filter;
-  RTC_DCHECK_EQ(0, h.size() % kFftLengthBy2);
-
-  // Reset the block analysis counter.
-  block_to_analyze_ =
-      std::min(peak_block + kEarlyReverbMinSizeBlocks, filter_length_blocks_);
-
-  // To estimate the reverb decay, the energy of the first filter section must
-  // be substantially larger than the last. Also, the first filter section
-  // energy must not deviate too much from the max peak.
-  const float first_reverb_gain = BlockEnergyAverage(h, block_to_analyze_);
-  const size_t h_size_blocks = h.size() >> kFftLengthBy2Log2;
-  tail_gain_ = BlockEnergyAverage(h, h_size_blocks - 1);
-  float peak_energy = BlockEnergyPeak(h, peak_block);
-  const bool sufficient_reverb_decay = first_reverb_gain > 4.f * tail_gain_;
-  const bool valid_filter =
-      first_reverb_gain > 2.f * tail_gain_ && peak_energy < 100.f;
-
-  // Estimate the size of the regions with early and late reflections.
-  const int size_early_reverb = early_reverb_estimator_.Estimate();
-  const int size_late_reverb =
-      std::max(estimation_region_candidate_size_ - size_early_reverb, 0);
-
-  // Only update the reverb decay estimate if the size of the identified late
-  // reverb is sufficiently large.
-  if (size_late_reverb >= 5) {
-    if (valid_filter && late_reverb_decay_estimator_.EstimateAvailable()) {
-      float decay = std::pow(
-          2.0f, late_reverb_decay_estimator_.Estimate() * kFftLengthBy2);
-      constexpr float kMaxDecay = 0.95f;  // ~1 sec min RT60.
-      constexpr float kMinDecay = 0.02f;  // ~15 ms max RT60.
-      decay = std::max(.97f * decay_, decay);
-      decay = std::min(decay, kMaxDecay);
-      decay = std::max(decay, kMinDecay);
-      decay_ += smoothing_constant_ * (decay - decay_);
-    }
-
-    // Update length of decay. Must have enough data (number of sections) in
-    // order to estimate decay rate.
-    late_reverb_decay_estimator_.Reset(size_late_reverb * kFftLengthBy2);
-    late_reverb_start_ =
-        peak_block + kEarlyReverbMinSizeBlocks + size_early_reverb;
-    late_reverb_end_ =
-        block_to_analyze_ + estimation_region_candidate_size_ - 1;
-  } else {
-    late_reverb_decay_estimator_.Reset(0);
-    late_reverb_start_ = 0;
-    late_reverb_end_ = 0;
-  }
-
-  // Reset variables for the identification of the region for reverb decay
-  // estimation.
-  estimation_region_identified_ = !(valid_filter && sufficient_reverb_decay);
-  estimation_region_candidate_size_ = 0;
-
-  // Stop estimation of the decay until another good filter is received.
-  smoothing_constant_ = 0.f;
-
-  // Reset early reflections detector.
-  early_reverb_estimator_.Reset();
-}
-
-void ReverbDecayEstimator::AnalyzeFilter(rtc::ArrayView<const float> filter) {
-  auto h = rtc::ArrayView<const float>(
-      filter.begin() + block_to_analyze_ * kFftLengthBy2, kFftLengthBy2);
-
-  // Compute squared filter coeffiecients for the block to analyze_;
-  std::array<float, kFftLengthBy2> h2;
-  std::transform(h.begin(), h.end(), h2.begin(), [](float a) { return a * a; });
-
-  // Map out the region for estimating the reverb decay.
-  bool adapting;
-  bool above_noise_floor;
-  AnalyzeBlockGain(h2, tail_gain_, &previous_gains_[block_to_analyze_],
-                   &adapting, &above_noise_floor);
-
-  // Count consecutive number of "good" filter sections, where "good" means:
-  // 1) energy is above noise floor.
-  // 2) energy of current section has not changed too much from last check.
-  estimation_region_identified_ =
-      estimation_region_identified_ || adapting || !above_noise_floor;
-  if (!estimation_region_identified_) {
-    ++estimation_region_candidate_size_;
-  }
-
-  // Accumulate data for reverb decay estimation and for the estimation of early
-  // reflections.
-  if (block_to_analyze_ <= late_reverb_end_) {
-    if (block_to_analyze_ >= late_reverb_start_) {
-      for (float h2_k : h2) {
-        float h2_log2 = FastApproxLog2f(h2_k + 1e-10);
-        late_reverb_decay_estimator_.Accumulate(h2_log2);
-        early_reverb_estimator_.Accumulate(h2_log2, smoothing_constant_);
-      }
-    } else {
-      for (float h2_k : h2) {
-        float h2_log2 = FastApproxLog2f(h2_k + 1e-10);
-        early_reverb_estimator_.Accumulate(h2_log2, smoothing_constant_);
-      }
-    }
-  }
-}
-
-void ReverbDecayEstimator::Dump(ApmDataDumper* data_dumper) const {
-  data_dumper->DumpRaw("aec3_reverb_decay", decay_);
-  data_dumper->DumpRaw("aec3_reverb_tail_energy", tail_gain_);
-  data_dumper->DumpRaw("aec3_reverb_alpha", smoothing_constant_);
-  data_dumper->DumpRaw("aec3_num_reverb_decay_blocks",
-                       late_reverb_end_ - late_reverb_start_);
-  data_dumper->DumpRaw("aec3_late_reverb_start", late_reverb_start_);
-  data_dumper->DumpRaw("aec3_late_reverb_end", late_reverb_end_);
-  early_reverb_estimator_.Dump(data_dumper);
-}
-
-void ReverbDecayEstimator::LateReverbLinearRegressor::Reset(
-    int num_data_points) {
-  RTC_DCHECK_LE(0, num_data_points);
-  RTC_DCHECK_EQ(0, num_data_points % 2);
-  const int N = num_data_points;
-  nz_ = 0.f;
-  // Arithmetic sum of $2 \sum_{i=0.5}^{(N-1)/2}i^2$ calculated directly.
-  nn_ = SymmetricArithmetricSum(N);
-  // The linear regression approach assumes symmetric index around 0.
-  count_ = N > 0 ? count_ = -N * 0.5f + 0.5f : 0.f;
-  N_ = N;
-  n_ = 0;
-}
-
-void ReverbDecayEstimator::LateReverbLinearRegressor::Accumulate(float z) {
-  nz_ += count_ * z;
-  ++count_;
-  ++n_;
-}
-
-float ReverbDecayEstimator::LateReverbLinearRegressor::Estimate() {
-  RTC_DCHECK(EstimateAvailable());
-  if (nn_ == 0.f) {
-    RTC_NOTREACHED();
-    return 0.f;
-  }
-  return nz_ / nn_;
-}
-
-ReverbDecayEstimator::EarlyReverbLengthEstimator::EarlyReverbLengthEstimator(
-    int max_blocks)
-    : numerators_smooth_(max_blocks - kBlocksPerSection, 0.f),
-      numerators_(numerators_smooth_.size(), 0.f),
-      coefficients_counter_(0) {
-  RTC_DCHECK_LE(0, max_blocks);
-}
-
-ReverbDecayEstimator::EarlyReverbLengthEstimator::
-    ~EarlyReverbLengthEstimator() = default;
-
-void ReverbDecayEstimator::EarlyReverbLengthEstimator::Reset() {
-  coefficients_counter_ = 0;
-  std::fill(numerators_.begin(), numerators_.end(), 0.f);
-  block_counter_ = 0;
-}
-
-void ReverbDecayEstimator::EarlyReverbLengthEstimator::Accumulate(
-    float value,
-    float smoothing) {
-  // Each section is composed by kBlocksPerSection blocks and each section
-  // overlaps with the next one in (kBlocksPerSection - 1) blocks. For example,
-  // the first section covers the blocks [0:5], the second covers the blocks
-  // [1:6] and so on. As a result, for each value, kBlocksPerSection sections
-  // need to be updated.
-  int first_section_index = std::max(block_counter_ - kBlocksPerSection + 1, 0);
-  int last_section_index =
-      std::min(block_counter_, static_cast<int>(numerators_.size() - 1));
-  float x_value = static_cast<float>(coefficients_counter_) +
-                  kEarlyReverbFirstPointAtLinearRegressors;
-  const float value_to_inc = kFftLengthBy2 * value;
-  float value_to_add =
-      x_value * value + (block_counter_ - last_section_index) * value_to_inc;
-  for (int section = last_section_index; section >= first_section_index;
-       --section, value_to_add += value_to_inc) {
-    numerators_[section] += value_to_add;
-  }
-
-  // Check if this update was the last coefficient of the current block. In that
-  // case, check if we are at the end of one of the sections and update the
-  // numerator of the linear regressor that is computed in such section.
-  if (++coefficients_counter_ == kFftLengthBy2) {
-    if (block_counter_ >= (kBlocksPerSection - 1)) {
-      size_t section = block_counter_ - (kBlocksPerSection - 1);
-      RTC_DCHECK_GT(numerators_.size(), section);
-      RTC_DCHECK_GT(numerators_smooth_.size(), section);
-      numerators_smooth_[section] +=
-          smoothing * (numerators_[section] - numerators_smooth_[section]);
-      n_sections_ = section + 1;
-    }
-    ++block_counter_;
-    coefficients_counter_ = 0;
-  }
-}
-
-// Estimates the size in blocks of the early reverb. The estimation is done by
-// comparing the tilt that is estimated in each section. As an optimization
-// detail and due to the fact that all the linear regressors that are computed
-// shared the same denominator, the comparison of the tilts is done by a
-// comparison of the numerator of the linear regressors.
-int ReverbDecayEstimator::EarlyReverbLengthEstimator::Estimate() {
-  constexpr float N = kBlocksPerSection * kFftLengthBy2;
-  constexpr float nn = SymmetricArithmetricSum(N);
-  // numerator_11 refers to the quantity that the linear regressor needs in the
-  // numerator for getting a decay equal to 1.1 (which is not a decay).
-  // log2(1.1) * nn / kFftLengthBy2.
-  constexpr float numerator_11 = 0.13750352374993502f * nn / kFftLengthBy2;
-  // log2(0.8) *  nn / kFftLengthBy2.
-  constexpr float numerator_08 = -0.32192809488736229f * nn / kFftLengthBy2;
-  constexpr int kNumSectionsToAnalyze = 9;
-
-  if (n_sections_ < kNumSectionsToAnalyze) {
-    return 0;
-  }
-
-  // Estimation of the blocks that correspond to early reverberations. The
-  // estimation is done by analyzing the impulse response. The portions of the
-  // impulse response whose energy is not decreasing over its coefficients are
-  // considered to be part of the early reverberations. Furthermore, the blocks
-  // where the energy is decreasing faster than what it does at the end of the
-  // impulse response are also considered to be part of the early
-  // reverberations. The estimation is limited to the first
-  // kNumSectionsToAnalyze sections.
-
-  RTC_DCHECK_LE(n_sections_, numerators_smooth_.size());
-  const float min_numerator_tail =
-      *std::min_element(numerators_smooth_.begin() + kNumSectionsToAnalyze,
-                        numerators_smooth_.begin() + n_sections_);
-  int early_reverb_size_minus_1 = 0;
-  for (int k = 0; k < kNumSectionsToAnalyze; ++k) {
-    if ((numerators_smooth_[k] > numerator_11) ||
-        (numerators_smooth_[k] < numerator_08 &&
-         numerators_smooth_[k] < 0.9f * min_numerator_tail)) {
-      early_reverb_size_minus_1 = k;
-    }
-  }
-
-  return early_reverb_size_minus_1 == 0 ? 0 : early_reverb_size_minus_1 + 1;
-}
-
-void ReverbDecayEstimator::EarlyReverbLengthEstimator::Dump(
-    ApmDataDumper* data_dumper) const {
-  data_dumper->DumpRaw("aec3_er_acum_numerator", numerators_smooth_);
-}
-
-}  // namespace webrtc
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/reverb_decay_estimator.h b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/reverb_decay_estimator.h
deleted file mode 100644
index 4c8d0c6434..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/reverb_decay_estimator.h
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
- *  Copyright (c) 2018 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#ifndef MODULES_AUDIO_PROCESSING_AEC3_REVERB_DECAY_ESTIMATOR_H_
-#define MODULES_AUDIO_PROCESSING_AEC3_REVERB_DECAY_ESTIMATOR_H_
-
-#include <array>
-#include <vector>
-
-#include "absl/types/optional.h"
-#include "api/array_view.h"
-#include "modules/audio_processing/aec3/aec3_common.h"  // kMaxAdaptiveFilter...
-
-namespace webrtc {
-
-class ApmDataDumper;
-struct EchoCanceller3Config;
-
-// Class for estimating the decay of the late reverb.
-class ReverbDecayEstimator {
- public:
-  explicit ReverbDecayEstimator(const EchoCanceller3Config& config);
-  ~ReverbDecayEstimator();
-  // Updates the decay estimate.
-  void Update(rtc::ArrayView<const float> filter,
-              const absl::optional<float>& filter_quality,
-              int filter_delay_blocks,
-              bool usable_linear_filter,
-              bool stationary_signal);
-  // Returns the decay for the exponential model.
-  float Decay() const { return decay_; }
-  // Dumps debug data.
-  void Dump(ApmDataDumper* data_dumper) const;
-
- private:
-  void EstimateDecay(rtc::ArrayView<const float> filter, int peak_block);
-  void AnalyzeFilter(rtc::ArrayView<const float> filter);
-
-  void ResetDecayEstimation();
-
-  // Class for estimating the decay of the late reverb from the linear filter.
-  class LateReverbLinearRegressor {
-   public:
-    // Resets the estimator to receive a specified number of data points.
-    void Reset(int num_data_points);
-    // Accumulates estimation data.
-    void Accumulate(float z);
-    // Estimates the decay.
-    float Estimate();
-    // Returns whether an estimate is available.
-    bool EstimateAvailable() const { return n_ == N_ && N_ != 0; }
-
-   public:
-    float nz_ = 0.f;
-    float nn_ = 0.f;
-    float count_ = 0.f;
-    int N_ = 0;
-    int n_ = 0;
-  };
-
-  // Class for identifying the length of the early reverb from the linear
-  // filter. For identifying the early reverberations, the impulse response is
-  // divided in sections and the tilt of each section is computed by a linear
-  // regressor.
-  class EarlyReverbLengthEstimator {
-   public:
-    explicit EarlyReverbLengthEstimator(int max_blocks);
-    ~EarlyReverbLengthEstimator();
-
-    // Resets the estimator.
-    void Reset();
-    // Accumulates estimation data.
-    void Accumulate(float value, float smoothing);
-    // Estimates the size in blocks of the early reverb.
-    int Estimate();
-    // Dumps debug data.
-    void Dump(ApmDataDumper* data_dumper) const;
-
-   private:
-    std::vector<float> numerators_smooth_;
-    std::vector<float> numerators_;
-    int coefficients_counter_;
-    int block_counter_ = 0;
-    int n_sections_ = 0;
-  };
-
-  const int filter_length_blocks_;
-  const int filter_length_coefficients_;
-  const bool use_adaptive_echo_decay_;
-  LateReverbLinearRegressor late_reverb_decay_estimator_;
-  EarlyReverbLengthEstimator early_reverb_estimator_;
-  int late_reverb_start_;
-  int late_reverb_end_;
-  int block_to_analyze_ = 0;
-  int estimation_region_candidate_size_ = 0;
-  bool estimation_region_identified_ = false;
-  std::array<float, kMaxAdaptiveFilterLength> previous_gains_;
-  float decay_;
-  float tail_gain_ = 0.f;
-  float smoothing_constant_ = 0.f;
-};
-
-}  // namespace webrtc
-
-#endif  // MODULES_AUDIO_PROCESSING_AEC3_REVERB_DECAY_ESTIMATOR_H_
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/reverb_frequency_response.cc b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/reverb_frequency_response.cc
deleted file mode 100644
index d2103d442e..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/reverb_frequency_response.cc
+++ /dev/null
@@ -1,109 +0,0 @@
-/*
- *  Copyright (c) 2018 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#include "modules/audio_processing/aec3/reverb_frequency_response.h"
-
-#include <stddef.h>
-#include <algorithm>
-#include <array>
-#include <numeric>
-
-#include "api/array_view.h"
-#include "modules/audio_processing/aec3/aec3_common.h"
-#include "rtc_base/checks.h"
-#include "system_wrappers/include/field_trial.h"
-
-namespace webrtc {
-
-namespace {
-
-bool EnableSmoothUpdatesTailFreqResp() {
-  return !field_trial::IsEnabled(
-      "WebRTC-Aec3SmoothUpdatesTailFreqRespKillSwitch");
-}
-
-// Computes the ratio of the energies between the direct path and the tail. The
-// energy is computed in the power spectrum domain discarding the DC
-// contributions.
-float AverageDecayWithinFilter(
-    rtc::ArrayView<const float> freq_resp_direct_path,
-    rtc::ArrayView<const float> freq_resp_tail) {
-  // Skipping the DC for the ratio computation
-  constexpr size_t kSkipBins = 1;
-  RTC_CHECK_EQ(freq_resp_direct_path.size(), freq_resp_tail.size());
-
-  float direct_path_energy =
-      std::accumulate(freq_resp_direct_path.begin() + kSkipBins,
-                      freq_resp_direct_path.end(), 0.f);
-
-  if (direct_path_energy == 0.f) {
-    return 0.f;
-  }
-
-  float tail_energy = std::accumulate(freq_resp_tail.begin() + kSkipBins,
-                                      freq_resp_tail.end(), 0.f);
-  return tail_energy / direct_path_energy;
-}
-
-}  // namespace
-
-ReverbFrequencyResponse::ReverbFrequencyResponse()
-    : enable_smooth_tail_response_updates_(EnableSmoothUpdatesTailFreqResp()) {
-  tail_response_.fill(0.f);
-}
-ReverbFrequencyResponse::~ReverbFrequencyResponse() = default;
-
-void ReverbFrequencyResponse::Update(
-    const std::vector<std::array<float, kFftLengthBy2Plus1>>&
-        frequency_response,
-    int filter_delay_blocks,
-    const absl::optional<float>& linear_filter_quality,
-    bool stationary_block) {
-  if (!enable_smooth_tail_response_updates_) {
-    Update(frequency_response, filter_delay_blocks, 0.5f);
-    return;
-  }
-
-  if (stationary_block || !linear_filter_quality) {
-    return;
-  }
-
-  Update(frequency_response, filter_delay_blocks, *linear_filter_quality);
-}
-
-void ReverbFrequencyResponse::Update(
-    const std::vector<std::array<float, kFftLengthBy2Plus1>>&
-        frequency_response,
-    int filter_delay_blocks,
-    float linear_filter_quality) {
-  rtc::ArrayView<const float> freq_resp_tail(
-      frequency_response[frequency_response.size() - 1]);
-
-  rtc::ArrayView<const float> freq_resp_direct_path(
-      frequency_response[filter_delay_blocks]);
-
-  float average_decay =
-      AverageDecayWithinFilter(freq_resp_direct_path, freq_resp_tail);
-
-  const float smoothing = 0.2f * linear_filter_quality;
-  average_decay_ += smoothing * (average_decay - average_decay_);
-
-  for (size_t k = 0; k < kFftLengthBy2Plus1; ++k) {
-    tail_response_[k] = freq_resp_direct_path[k] * average_decay_;
-  }
-
-  for (size_t k = 1; k < kFftLengthBy2; ++k) {
-    const float avg_neighbour =
-        0.5f * (tail_response_[k - 1] + tail_response_[k + 1]);
-    tail_response_[k] = std::max(tail_response_[k], avg_neighbour);
-  }
-}
-
-}  // namespace webrtc
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/reverb_frequency_response.h b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/reverb_frequency_response.h
deleted file mode 100644
index eb63b8e52e..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/reverb_frequency_response.h
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- *  Copyright (c) 2018 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#ifndef MODULES_AUDIO_PROCESSING_AEC3_REVERB_FREQUENCY_RESPONSE_H_
-#define MODULES_AUDIO_PROCESSING_AEC3_REVERB_FREQUENCY_RESPONSE_H_
-
-#include <array>
-#include <vector>
-
-#include "absl/types/optional.h"
-#include "api/array_view.h"
-#include "modules/audio_processing/aec3/aec3_common.h"
-
-namespace webrtc {
-
-// Class for updating the frequency response for the reverb.
-class ReverbFrequencyResponse {
- public:
-  ReverbFrequencyResponse();
-  ~ReverbFrequencyResponse();
-
-  // Updates the frequency response estimate of the reverb.
-  void Update(const std::vector<std::array<float, kFftLengthBy2Plus1>>&
-                  frequency_response,
-              int filter_delay_blocks,
-              const absl::optional<float>& linear_filter_quality,
-              bool stationary_block);
-
-  // Returns the estimated frequency response for the reverb.
-  rtc::ArrayView<const float> FrequencyResponse() const {
-    return tail_response_;
-  }
-
- private:
-  void Update(const std::vector<std::array<float, kFftLengthBy2Plus1>>&
-                  frequency_response,
-              int filter_delay_blocks,
-              float linear_filter_quality);
-
-  const bool enable_smooth_tail_response_updates_;
-  float average_decay_ = 0.f;
-  std::array<float, kFftLengthBy2Plus1> tail_response_;
-};
-
-}  // namespace webrtc
-
-#endif  // MODULES_AUDIO_PROCESSING_AEC3_REVERB_FREQUENCY_RESPONSE_H_
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/reverb_model.cc b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/reverb_model.cc
deleted file mode 100644
index f0a24c0249..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/reverb_model.cc
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
- *  Copyright (c) 2018 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#include "modules/audio_processing/aec3/reverb_model.h"
-
-#include <stddef.h>
-#include <algorithm>
-#include <functional>
-
-#include "api/array_view.h"
-
-namespace webrtc {
-
-ReverbModel::ReverbModel() {
-  Reset();
-}
-
-ReverbModel::~ReverbModel() = default;
-
-void ReverbModel::Reset() {
-  reverb_.fill(0.);
-}
-
-void ReverbModel::AddReverbNoFreqShaping(
-    rtc::ArrayView<const float> power_spectrum,
-    float power_spectrum_scaling,
-    float reverb_decay,
-    rtc::ArrayView<float> reverb_power_spectrum) {
-  UpdateReverbContributionsNoFreqShaping(power_spectrum, power_spectrum_scaling,
-                                         reverb_decay);
-
-  // Add the power of the echo reverb to the residual echo power.
-  std::transform(reverb_power_spectrum.begin(), reverb_power_spectrum.end(),
-                 reverb_.begin(), reverb_power_spectrum.begin(),
-                 std::plus<float>());
-}
-
-void ReverbModel::AddReverb(rtc::ArrayView<const float> power_spectrum,
-                            rtc::ArrayView<const float> power_spectrum_scaling,
-                            float reverb_decay,
-                            rtc::ArrayView<float> reverb_power_spectrum) {
-  UpdateReverbContributions(power_spectrum, power_spectrum_scaling,
-                            reverb_decay);
-
-  // Add the power of the echo reverb to the residual echo power.
-  std::transform(reverb_power_spectrum.begin(), reverb_power_spectrum.end(),
-                 reverb_.begin(), reverb_power_spectrum.begin(),
-                 std::plus<float>());
-}
-
-void ReverbModel::UpdateReverbContributionsNoFreqShaping(
-    rtc::ArrayView<const float> power_spectrum,
-    float power_spectrum_scaling,
-    float reverb_decay) {
-  if (reverb_decay > 0) {
-    // Update the estimate of the reverberant power.
-    for (size_t k = 0; k < power_spectrum.size(); ++k) {
-      reverb_[k] = (reverb_[k] + power_spectrum[k] * power_spectrum_scaling) *
-                   reverb_decay;
-    }
-  }
-}
-
-void ReverbModel::UpdateReverbContributions(
-    rtc::ArrayView<const float>& power_spectrum,
-    rtc::ArrayView<const float>& power_spectrum_scaling,
-    float reverb_decay) {
-  if (reverb_decay > 0) {
-    // Update the estimate of the reverberant power.
-    for (size_t k = 0; k < power_spectrum.size(); ++k) {
-      reverb_[k] =
-          (reverb_[k] + power_spectrum[k] * power_spectrum_scaling[k]) *
-          reverb_decay;
-    }
-  }
-}
-
-}  // namespace webrtc
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/reverb_model.h b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/reverb_model.h
deleted file mode 100644
index 56e2266e56..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/reverb_model.h
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- *  Copyright (c) 2018 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#ifndef MODULES_AUDIO_PROCESSING_AEC3_REVERB_MODEL_H_
-#define MODULES_AUDIO_PROCESSING_AEC3_REVERB_MODEL_H_
-
-#include <array>
-
-#include "api/array_view.h"
-#include "modules/audio_processing/aec3/aec3_common.h"
-
-namespace webrtc {
-
-// The ReverbModel class describes an exponential reverberant model
-// that can be applied over power spectrums.
-class ReverbModel {
- public:
-  ReverbModel();
-  ~ReverbModel();
-
-  // Resets the state.
-  void Reset();
-
-  // The methods AddReverbNoFreqShaping and AddReverb add the reverberation
-  // contribution to an input/output power spectrum
-  // Before applying the exponential reverberant model, the input power spectrum
-  // is pre-scaled. Use the method AddReverb when a different scaling should be
-  // applied per frequency and AddReverb_no_freq_shape if the same scaling
-  // should be used for all the frequencies.
-  void AddReverbNoFreqShaping(rtc::ArrayView<const float> power_spectrum,
-                              float power_spectrum_scaling,
-                              float reverb_decay,
-                              rtc::ArrayView<float> reverb_power_spectrum);
-
-  void AddReverb(rtc::ArrayView<const float> power_spectrum,
-                 rtc::ArrayView<const float> freq_response_tail,
-                 float reverb_decay,
-                 rtc::ArrayView<float> reverb_power_spectrum);
-
-  // Updates the reverberation contributions without applying any shaping of the
-  // spectrum.
-  void UpdateReverbContributionsNoFreqShaping(
-      rtc::ArrayView<const float> power_spectrum,
-      float power_spectrum_scaling,
-      float reverb_decay);
-
-  // Returns the current power spectrum reverberation contributions.
-  rtc::ArrayView<const float> GetPowerSpectrum() const { return reverb_; }
-
- private:
-  // Updates the reverberation contributions.
-  void UpdateReverbContributions(rtc::ArrayView<const float>& power_spectrum,
-                                 rtc::ArrayView<const float>& freq_resp_tail,
-                                 float reverb_decay);
-
-  std::array<float, kFftLengthBy2Plus1> reverb_;
-};
-
-}  // namespace webrtc
-
-#endif  // MODULES_AUDIO_PROCESSING_AEC3_REVERB_MODEL_H_
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/reverb_model_estimator.cc b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/reverb_model_estimator.cc
deleted file mode 100644
index ce3e2be335..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/reverb_model_estimator.cc
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- *  Copyright (c) 2018 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#include "modules/audio_processing/aec3/reverb_model_estimator.h"
-
-namespace webrtc {
-
-ReverbModelEstimator::ReverbModelEstimator(const EchoCanceller3Config& config)
-    : reverb_decay_estimator_(config) {}
-
-ReverbModelEstimator::~ReverbModelEstimator() = default;
-
-void ReverbModelEstimator::Update(
-    rtc::ArrayView<const float> impulse_response,
-    const std::vector<std::array<float, kFftLengthBy2Plus1>>&
-        frequency_response,
-    const absl::optional<float>& linear_filter_quality,
-    int filter_delay_blocks,
-    bool usable_linear_estimate,
-    bool stationary_block) {
-  // Estimate the frequency response for the reverb.
-  reverb_frequency_response_.Update(frequency_response, filter_delay_blocks,
-                                    linear_filter_quality, stationary_block);
-
-  // Estimate the reverb decay,
-  reverb_decay_estimator_.Update(impulse_response, linear_filter_quality,
-                                 filter_delay_blocks, usable_linear_estimate,
-                                 stationary_block);
-}
-}  // namespace webrtc
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/reverb_model_estimator.h b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/reverb_model_estimator.h
deleted file mode 100644
index 1112f93a71..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/reverb_model_estimator.h
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- *  Copyright (c) 2018 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#ifndef MODULES_AUDIO_PROCESSING_AEC3_REVERB_MODEL_ESTIMATOR_H_
-#define MODULES_AUDIO_PROCESSING_AEC3_REVERB_MODEL_ESTIMATOR_H_
-
-#include <array>
-#include <vector>
-
-#include "absl/types/optional.h"
-#include "api/array_view.h"
-#include "api/audio/echo_canceller3_config.h"
-#include "modules/audio_processing/aec3/aec3_common.h"  // kFftLengthBy2Plus1
-#include "modules/audio_processing/aec3/reverb_decay_estimator.h"
-#include "modules/audio_processing/aec3/reverb_frequency_response.h"
-
-namespace webrtc {
-
-class ApmDataDumper;
-
-// Class for estimating the model parameters for the reverberant echo.
-class ReverbModelEstimator {
- public:
-  explicit ReverbModelEstimator(const EchoCanceller3Config& config);
-  ~ReverbModelEstimator();
-
-  // Updates the estimates based on new data.
-  void Update(rtc::ArrayView<const float> impulse_response,
-              const std::vector<std::array<float, kFftLengthBy2Plus1>>&
-                  frequency_response,
-              const absl::optional<float>& linear_filter_quality,
-              int filter_delay_blocks,
-              bool usable_linear_estimate,
-              bool stationary_block);
-
-  // Returns the exponential decay of the reverberant echo.
-  float ReverbDecay() const { return reverb_decay_estimator_.Decay(); }
-
-  // Return the frequency response of the reverberant echo.
-  rtc::ArrayView<const float> GetReverbFrequencyResponse() const {
-    return reverb_frequency_response_.FrequencyResponse();
-  }
-
-  // Dumps debug data.
-  void Dump(ApmDataDumper* data_dumper) const {
-    reverb_decay_estimator_.Dump(data_dumper);
-  }
-
- private:
-  ReverbDecayEstimator reverb_decay_estimator_;
-  ReverbFrequencyResponse reverb_frequency_response_;
-};
-
-}  // namespace webrtc
-
-#endif  // MODULES_AUDIO_PROCESSING_AEC3_REVERB_MODEL_ESTIMATOR_H_
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/reverb_model_fallback.cc b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/reverb_model_fallback.cc
deleted file mode 100644
index 67df37b3cf..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/reverb_model_fallback.cc
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- *  Copyright (c) 2018 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#include "modules/audio_processing/aec3/reverb_model_fallback.h"
-
-#include <algorithm>
-#include <functional>
-
-#include "modules/audio_processing/aec3/aec3_common.h"
-#include "rtc_base/checks.h"
-
-namespace webrtc {
-
-ReverbModelFallback::ReverbModelFallback(size_t length_blocks)
-    : S2_old_(length_blocks) {
-  Reset();
-}
-
-ReverbModelFallback::~ReverbModelFallback() = default;
-
-void ReverbModelFallback::Reset() {
-  R2_reverb_.fill(0.f);
-  for (auto& S2_k : S2_old_) {
-    S2_k.fill(0.f);
-  }
-}
-
-void ReverbModelFallback::AddEchoReverb(
-    const std::array<float, kFftLengthBy2Plus1>& S2,
-    size_t delay,
-    float reverb_decay_factor,
-    std::array<float, kFftLengthBy2Plus1>* R2) {
-  // Compute the decay factor for how much the echo has decayed before leaving
-  // the region covered by the linear model.
-  auto integer_power = [](float base, int exp) {
-    float result = 1.f;
-    for (int k = 0; k < exp; ++k) {
-      result *= base;
-    }
-    return result;
-  };
-  RTC_DCHECK_LE(delay, S2_old_.size());
-  const float reverb_decay_for_delay =
-      integer_power(reverb_decay_factor, S2_old_.size() - delay);
-
-  // Update the estimate of the reverberant residual echo power.
-  S2_old_index_ = S2_old_index_ > 0 ? S2_old_index_ - 1 : S2_old_.size() - 1;
-  const auto& S2_end = S2_old_[S2_old_index_];
-  std::transform(
-      S2_end.begin(), S2_end.end(), R2_reverb_.begin(), R2_reverb_.begin(),
-      [reverb_decay_for_delay, reverb_decay_factor](float a, float b) {
-        return (b + a * reverb_decay_for_delay) * reverb_decay_factor;
-      });
-
-  // Update the buffer of old echo powers.
-  std::copy(S2.begin(), S2.end(), S2_old_[S2_old_index_].begin());
-
-  // Add the power of the echo reverb to the residual echo power.
-  std::transform(R2->begin(), R2->end(), R2_reverb_.begin(), R2->begin(),
-                 std::plus<float>());
-}
-
-}  // namespace webrtc
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/reverb_model_fallback.h b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/reverb_model_fallback.h
deleted file mode 100644
index 1bd2b594e0..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/reverb_model_fallback.h
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- *  Copyright (c) 2017 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#ifndef MODULES_AUDIO_PROCESSING_AEC3_REVERB_MODEL_FALLBACK_H_
-#define MODULES_AUDIO_PROCESSING_AEC3_REVERB_MODEL_FALLBACK_H_
-
-#include <stddef.h>
-#include <array>
-#include <vector>
-
-#include "modules/audio_processing/aec3/aec3_common.h"
-
-namespace webrtc {
-
-// The ReverbModelFallback class describes an exponential reverberant model.
-// This model is expected to be applied over the echo power spectrum that
-// is estimated by the linear filter.
-
-class ReverbModelFallback {
- public:
-  explicit ReverbModelFallback(size_t length_blocks);
-  ~ReverbModelFallback();
-
-  // Resets the state
-  void Reset();
-
-  // Adds the estimated unmodelled echo power to the residual echo power
-  // estimate.
-  void AddEchoReverb(const std::array<float, kFftLengthBy2Plus1>& S2,
-                     size_t delay,
-                     float reverb_decay_factor,
-                     std::array<float, kFftLengthBy2Plus1>* R2);
-
-  // Returns the current power spectrum reverberation contributions.
-  const std::array<float, kFftLengthBy2Plus1>& GetPowerSpectrum() const {
-    return R2_reverb_;
-  }
-
- private:
-  std::array<float, kFftLengthBy2Plus1> R2_reverb_;
-  int S2_old_index_ = 0;
-  std::vector<std::array<float, kFftLengthBy2Plus1>> S2_old_;
-};
-
-}  // namespace webrtc
-
-#endif  // MODULES_AUDIO_PROCESSING_AEC3_REVERB_MODEL_FALLBACK_H_
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/shadow_filter_update_gain.cc b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/shadow_filter_update_gain.cc
deleted file mode 100644
index e27437aff2..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/shadow_filter_update_gain.cc
+++ /dev/null
@@ -1,101 +0,0 @@
-/*
- *  Copyright (c) 2017 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#include "modules/audio_processing/aec3/shadow_filter_update_gain.h"
-
-#include <algorithm>
-#include <functional>
-
-#include "rtc_base/checks.h"
-
-namespace webrtc {
-
-ShadowFilterUpdateGain::ShadowFilterUpdateGain(
-    const EchoCanceller3Config::Filter::ShadowConfiguration& config,
-    size_t config_change_duration_blocks)
-    : config_change_duration_blocks_(
-          static_cast<int>(config_change_duration_blocks)) {
-  SetConfig(config, true);
-  RTC_DCHECK_LT(0, config_change_duration_blocks_);
-  one_by_config_change_duration_blocks_ = 1.f / config_change_duration_blocks_;
-}
-
-void ShadowFilterUpdateGain::HandleEchoPathChange() {
-  // TODO(peah): Check whether this counter should instead be initialized to a
-  // large value.
-  poor_signal_excitation_counter_ = 0;
-  call_counter_ = 0;
-}
-
-void ShadowFilterUpdateGain::Compute(
-    const std::array<float, kFftLengthBy2Plus1>& render_power,
-    const RenderSignalAnalyzer& render_signal_analyzer,
-    const FftData& E_shadow,
-    size_t size_partitions,
-    bool saturated_capture_signal,
-    FftData* G) {
-  RTC_DCHECK(G);
-  ++call_counter_;
-
-  UpdateCurrentConfig();
-
-  if (render_signal_analyzer.PoorSignalExcitation()) {
-    poor_signal_excitation_counter_ = 0;
-  }
-
-  // Do not update the filter if the render is not sufficiently excited.
-  if (++poor_signal_excitation_counter_ < size_partitions ||
-      saturated_capture_signal || call_counter_ <= size_partitions) {
-    G->re.fill(0.f);
-    G->im.fill(0.f);
-    return;
-  }
-
-  // Compute mu.
-  std::array<float, kFftLengthBy2Plus1> mu;
-  auto X2 = render_power;
-  std::transform(X2.begin(), X2.end(), mu.begin(), [&](float a) {
-    return a > current_config_.noise_gate ? current_config_.rate / a : 0.f;
-  });
-
-  // Avoid updating the filter close to narrow bands in the render signals.
-  render_signal_analyzer.MaskRegionsAroundNarrowBands(&mu);
-
-  // G = mu * E * X2.
-  std::transform(mu.begin(), mu.end(), E_shadow.re.begin(), G->re.begin(),
-                 std::multiplies<float>());
-  std::transform(mu.begin(), mu.end(), E_shadow.im.begin(), G->im.begin(),
-                 std::multiplies<float>());
-}
-
-void ShadowFilterUpdateGain::UpdateCurrentConfig() {
-  RTC_DCHECK_GE(config_change_duration_blocks_, config_change_counter_);
-  if (config_change_counter_ > 0) {
-    if (--config_change_counter_ > 0) {
-      auto average = [](float from, float to, float from_weight) {
-        return from * from_weight + to * (1.f - from_weight);
-      };
-
-      float change_factor =
-          config_change_counter_ * one_by_config_change_duration_blocks_;
-
-      current_config_.rate =
-          average(old_target_config_.rate, target_config_.rate, change_factor);
-      current_config_.noise_gate =
-          average(old_target_config_.noise_gate, target_config_.noise_gate,
-                  change_factor);
-    } else {
-      current_config_ = old_target_config_ = target_config_;
-    }
-  }
-  RTC_DCHECK_LE(0, config_change_counter_);
-}
-
-}  // namespace webrtc
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/shadow_filter_update_gain.h b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/shadow_filter_update_gain.h
deleted file mode 100644
index 05e632fa78..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/shadow_filter_update_gain.h
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- *  Copyright (c) 2017 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#ifndef MODULES_AUDIO_PROCESSING_AEC3_SHADOW_FILTER_UPDATE_GAIN_H_
-#define MODULES_AUDIO_PROCESSING_AEC3_SHADOW_FILTER_UPDATE_GAIN_H_
-
-#include <stddef.h>
-#include <array>
-
-#include "api/audio/echo_canceller3_config.h"
-#include "modules/audio_processing/aec3/aec3_common.h"
-#include "modules/audio_processing/aec3/fft_data.h"
-#include "modules/audio_processing/aec3/render_signal_analyzer.h"
-
-namespace webrtc {
-
-// Provides functionality for computing the fixed gain for the shadow filter.
-class ShadowFilterUpdateGain {
- public:
-  explicit ShadowFilterUpdateGain(
-      const EchoCanceller3Config::Filter::ShadowConfiguration& config,
-      size_t config_change_duration_blocks);
-
-  // Takes action in the case of a known echo path change.
-  void HandleEchoPathChange();
-
-  // Computes the gain.
-  void Compute(const std::array<float, kFftLengthBy2Plus1>& render_power,
-               const RenderSignalAnalyzer& render_signal_analyzer,
-               const FftData& E_shadow,
-               size_t size_partitions,
-               bool saturated_capture_signal,
-               FftData* G);
-
-  // Sets a new config.
-  void SetConfig(
-      const EchoCanceller3Config::Filter::ShadowConfiguration& config,
-      bool immediate_effect) {
-    if (immediate_effect) {
-      old_target_config_ = current_config_ = target_config_ = config;
-      config_change_counter_ = 0;
-    } else {
-      old_target_config_ = current_config_;
-      target_config_ = config;
-      config_change_counter_ = config_change_duration_blocks_;
-    }
-  }
-
- private:
-  EchoCanceller3Config::Filter::ShadowConfiguration current_config_;
-  EchoCanceller3Config::Filter::ShadowConfiguration target_config_;
-  EchoCanceller3Config::Filter::ShadowConfiguration old_target_config_;
-  const int config_change_duration_blocks_;
-  float one_by_config_change_duration_blocks_;
-  // TODO(peah): Check whether this counter should instead be initialized to a
-  // large value.
-  size_t poor_signal_excitation_counter_ = 0;
-  size_t call_counter_ = 0;
-  int config_change_counter_ = 0;
-
-  void UpdateCurrentConfig();
-};
-
-}  // namespace webrtc
-
-#endif  // MODULES_AUDIO_PROCESSING_AEC3_SHADOW_FILTER_UPDATE_GAIN_H_
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/skew_estimator.cc b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/skew_estimator.cc
deleted file mode 100644
index a2099fcd01..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/skew_estimator.cc
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- *  Copyright (c) 2018 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-#include "modules/audio_processing/aec3/skew_estimator.h"
-
-#include <algorithm>
-
-namespace webrtc {
-
-SkewEstimator::SkewEstimator(size_t skew_history_size_log2)
-    : skew_history_size_log2_(static_cast<int>(skew_history_size_log2)),
-      skew_history_(1ULL << skew_history_size_log2_, 0) {}
-
-SkewEstimator::~SkewEstimator() = default;
-
-void SkewEstimator::Reset() {
-  skew_ = 0;
-  skew_sum_ = 0;
-  next_index_ = 0;
-  sufficient_skew_stored_ = false;
-  std::fill(skew_history_.begin(), skew_history_.end(), 0);
-}
-
-absl::optional<int> SkewEstimator::GetSkewFromCapture() {
-  --skew_;
-
-  skew_sum_ += skew_ - skew_history_[next_index_];
-  skew_history_[next_index_] = skew_;
-  if (++next_index_ == skew_history_.size()) {
-    next_index_ = 0;
-    sufficient_skew_stored_ = true;
-  }
-
-  const int bias = static_cast<int>(skew_history_.size()) >> 1;
-  const int average = (skew_sum_ + bias) >> skew_history_size_log2_;
-  return sufficient_skew_stored_ ? absl::optional<int>(average) : absl::nullopt;
-}
-
-}  // namespace webrtc
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/skew_estimator.h b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/skew_estimator.h
deleted file mode 100644
index b0946d833e..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/skew_estimator.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- *  Copyright (c) 2018 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#ifndef MODULES_AUDIO_PROCESSING_AEC3_SKEW_ESTIMATOR_H_
-#define MODULES_AUDIO_PROCESSING_AEC3_SKEW_ESTIMATOR_H_
-
-#include <stddef.h>
-#include <vector>
-
-#include "absl/types/optional.h"
-#include "rtc_base/constructormagic.h"
-
-namespace webrtc {
-
-// Estimator of API call skew between render and capture.
-class SkewEstimator {
- public:
-  explicit SkewEstimator(size_t skew_history_size_log2);
-  ~SkewEstimator();
-
-  // Resets the estimation.
-  void Reset();
-
-  // Updates the skew data for a render call.
-  void LogRenderCall() { ++skew_; }
-
-  // Updates and computes the skew at a capture call. Returns an optional which
-  // is non-null if a reliable skew has been found.
-  absl::optional<int> GetSkewFromCapture();
-
- private:
-  const int skew_history_size_log2_;
-  std::vector<float> skew_history_;
-  int skew_ = 0;
-  int skew_sum_ = 0;
-  size_t next_index_ = 0;
-  bool sufficient_skew_stored_ = false;
-
-  RTC_DISALLOW_COPY_AND_ASSIGN(SkewEstimator);
-};
-
-}  // namespace webrtc
-
-#endif  // MODULES_AUDIO_PROCESSING_AEC3_SKEW_ESTIMATOR_H_
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/stationarity_estimator.cc b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/stationarity_estimator.cc
deleted file mode 100644
index 25100bfd4a..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/stationarity_estimator.cc
+++ /dev/null
@@ -1,215 +0,0 @@
-/*
- *  Copyright (c) 2018 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#include "modules/audio_processing/aec3/stationarity_estimator.h"
-
-#include <algorithm>
-#include <array>
-#include <vector>
-
-#include "api/array_view.h"
-#include "modules/audio_processing/aec3/aec3_common.h"
-#include "modules/audio_processing/aec3/vector_buffer.h"
-#include "modules/audio_processing/logging/apm_data_dumper.h"
-#include "rtc_base/atomicops.h"
-
-namespace webrtc {
-
-namespace {
-constexpr float kMinNoisePower = 10.f;
-constexpr int kHangoverBlocks = kNumBlocksPerSecond / 20;
-constexpr int kNBlocksAverageInitPhase = 20;
-constexpr int kNBlocksInitialPhase = kNumBlocksPerSecond * 2.;
-}  // namespace
-
-StationarityEstimator::StationarityEstimator()
-    : data_dumper_(
-          new ApmDataDumper(rtc::AtomicOps::Increment(&instance_count_))) {
-  Reset();
-}
-
-StationarityEstimator::~StationarityEstimator() = default;
-
-void StationarityEstimator::Reset() {
-  noise_.Reset();
-  hangovers_.fill(0);
-  stationarity_flags_.fill(false);
-}
-
-// Update just the noise estimator. Usefull until the delay is known
-void StationarityEstimator::UpdateNoiseEstimator(
-    rtc::ArrayView<const float> spectrum) {
-  noise_.Update(spectrum);
-  data_dumper_->DumpRaw("aec3_stationarity_noise_spectrum", noise_.Spectrum());
-  data_dumper_->DumpRaw("aec3_stationarity_is_block_stationary",
-                        IsBlockStationary());
-}
-
-void StationarityEstimator::UpdateStationarityFlags(
-    const VectorBuffer& spectrum_buffer,
-    rtc::ArrayView<const float> render_reverb_contribution_spectrum,
-    int idx_current,
-    int num_lookahead) {
-  std::array<int, kWindowLength> indexes;
-  int num_lookahead_bounded = std::min(num_lookahead, kWindowLength - 1);
-  int idx = idx_current;
-
-  if (num_lookahead_bounded < kWindowLength - 1) {
-    int num_lookback = (kWindowLength - 1) - num_lookahead_bounded;
-    idx = spectrum_buffer.OffsetIndex(idx_current, num_lookback);
-  }
-  // For estimating the stationarity properties of the current frame, the
-  // power for each band is accumulated for several consecutive spectra in the
-  // method EstimateBandStationarity.
-  // In order to avoid getting the indexes of the spectra for every band with
-  // its associated overhead, those indexes are stored in an array and then use
-  // when the estimation is done.
-  indexes[0] = idx;
-  for (size_t k = 1; k < indexes.size(); ++k) {
-    indexes[k] = spectrum_buffer.DecIndex(indexes[k - 1]);
-  }
-  RTC_DCHECK_EQ(
-      spectrum_buffer.DecIndex(indexes[kWindowLength - 1]),
-      spectrum_buffer.OffsetIndex(idx_current, -(num_lookahead_bounded + 1)));
-
-  for (size_t k = 0; k < stationarity_flags_.size(); ++k) {
-    stationarity_flags_[k] = EstimateBandStationarity(
-        spectrum_buffer, render_reverb_contribution_spectrum, indexes, k);
-  }
-  UpdateHangover();
-  SmoothStationaryPerFreq();
-}
-
-bool StationarityEstimator::IsBlockStationary() const {
-  float acum_stationarity = 0.f;
-  RTC_DCHECK_EQ(stationarity_flags_.size(), kFftLengthBy2Plus1);
-  for (size_t band = 0; band < stationarity_flags_.size(); ++band) {
-    bool st = IsBandStationary(band);
-    acum_stationarity += static_cast<float>(st);
-  }
-  return ((acum_stationarity * (1.f / kFftLengthBy2Plus1)) > 0.75f);
-}
-
-bool StationarityEstimator::EstimateBandStationarity(
-    const VectorBuffer& spectrum_buffer,
-    rtc::ArrayView<const float> reverb,
-    const std::array<int, kWindowLength>& indexes,
-    size_t band) const {
-  constexpr float kThrStationarity = 10.f;
-  float acum_power = 0.f;
-  for (auto idx : indexes) {
-    acum_power += spectrum_buffer.buffer[idx][band];
-  }
-  acum_power += reverb[band];
-  float noise = kWindowLength * GetStationarityPowerBand(band);
-  RTC_CHECK_LT(0.f, noise);
-  bool stationary = acum_power < kThrStationarity * noise;
-  data_dumper_->DumpRaw("aec3_stationarity_long_ratio", acum_power / noise);
-  return stationary;
-}
-
-bool StationarityEstimator::AreAllBandsStationary() {
-  for (auto b : stationarity_flags_) {
-    if (!b)
-      return false;
-  }
-  return true;
-}
-
-void StationarityEstimator::UpdateHangover() {
-  bool reduce_hangover = AreAllBandsStationary();
-  for (size_t k = 0; k < stationarity_flags_.size(); ++k) {
-    if (!stationarity_flags_[k]) {
-      hangovers_[k] = kHangoverBlocks;
-    } else if (reduce_hangover) {
-      hangovers_[k] = std::max(hangovers_[k] - 1, 0);
-    }
-  }
-}
-
-void StationarityEstimator::SmoothStationaryPerFreq() {
-  std::array<bool, kFftLengthBy2Plus1> all_ahead_stationary_smooth;
-  for (size_t k = 1; k < kFftLengthBy2Plus1 - 1; ++k) {
-    all_ahead_stationary_smooth[k] = stationarity_flags_[k - 1] &&
-                                     stationarity_flags_[k] &&
-                                     stationarity_flags_[k + 1];
-  }
-
-  all_ahead_stationary_smooth[0] = all_ahead_stationary_smooth[1];
-  all_ahead_stationary_smooth[kFftLengthBy2Plus1 - 1] =
-      all_ahead_stationary_smooth[kFftLengthBy2Plus1 - 2];
-
-  stationarity_flags_ = all_ahead_stationary_smooth;
-}
-
-int StationarityEstimator::instance_count_ = 0;
-
-StationarityEstimator::NoiseSpectrum::NoiseSpectrum() {
-  Reset();
-}
-
-StationarityEstimator::NoiseSpectrum::~NoiseSpectrum() = default;
-
-void StationarityEstimator::NoiseSpectrum::Reset() {
-  block_counter_ = 0;
-  noise_spectrum_.fill(kMinNoisePower);
-}
-
-void StationarityEstimator::NoiseSpectrum::Update(
-    rtc::ArrayView<const float> spectrum) {
-  RTC_DCHECK_EQ(kFftLengthBy2Plus1, spectrum.size());
-  ++block_counter_;
-  float alpha = GetAlpha();
-  for (size_t k = 0; k < spectrum.size(); ++k) {
-    if (block_counter_ <= kNBlocksAverageInitPhase) {
-      noise_spectrum_[k] += (1.f / kNBlocksAverageInitPhase) * spectrum[k];
-    } else {
-      noise_spectrum_[k] =
-          UpdateBandBySmoothing(spectrum[k], noise_spectrum_[k], alpha);
-    }
-  }
-}
-
-float StationarityEstimator::NoiseSpectrum::GetAlpha() const {
-  constexpr float kAlpha = 0.004f;
-  constexpr float kAlphaInit = 0.04f;
-  constexpr float kTiltAlpha = (kAlphaInit - kAlpha) / kNBlocksInitialPhase;
-
-  if (block_counter_ > (kNBlocksInitialPhase + kNBlocksAverageInitPhase)) {
-    return kAlpha;
-  } else {
-    return kAlphaInit -
-           kTiltAlpha * (block_counter_ - kNBlocksAverageInitPhase);
-  }
-}
-
-float StationarityEstimator::NoiseSpectrum::UpdateBandBySmoothing(
-    float power_band,
-    float power_band_noise,
-    float alpha) const {
-  float power_band_noise_updated = power_band_noise;
-  if (power_band_noise < power_band) {
-    RTC_DCHECK_GT(power_band, 0.f);
-    float alpha_inc = alpha * (power_band_noise / power_band);
-    if (block_counter_ > kNBlocksInitialPhase) {
-      if (10.f * power_band_noise < power_band) {
-        alpha_inc *= 0.1f;
-      }
-    }
-    power_band_noise_updated += alpha_inc * (power_band - power_band_noise);
-  } else {
-    power_band_noise_updated += alpha * (power_band - power_band_noise);
-    power_band_noise_updated =
-        std::max(power_band_noise_updated, kMinNoisePower);
-  }
-  return power_band_noise_updated;
-}
-
-}  // namespace webrtc
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/stationarity_estimator.h b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/stationarity_estimator.h
deleted file mode 100644
index 704859a1fe..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/stationarity_estimator.h
+++ /dev/null
@@ -1,119 +0,0 @@
-/*
- *  Copyright (c) 2018 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#ifndef MODULES_AUDIO_PROCESSING_AEC3_STATIONARITY_ESTIMATOR_H_
-#define MODULES_AUDIO_PROCESSING_AEC3_STATIONARITY_ESTIMATOR_H_
-
-#include <stddef.h>
-#include <array>
-#include <memory>
-
-#include "api/array_view.h"
-#include "modules/audio_processing/aec3/aec3_common.h"  // kFftLengthBy2Plus1...
-#include "modules/audio_processing/aec3/reverb_model.h"
-#include "rtc_base/checks.h"
-
-namespace webrtc {
-
-class ApmDataDumper;
-struct VectorBuffer;
-
-class StationarityEstimator {
- public:
-  StationarityEstimator();
-  ~StationarityEstimator();
-
-  // Reset the stationarity estimator.
-  void Reset();
-
-  // Update just the noise estimator. Usefull until the delay is known
-  void UpdateNoiseEstimator(rtc::ArrayView<const float> spectrum);
-
-  // Update the flag indicating whether this current frame is stationary. For
-  // getting a more robust estimation, it looks at future and/or past frames.
-  void UpdateStationarityFlags(
-      const VectorBuffer& spectrum_buffer,
-      rtc::ArrayView<const float> render_reverb_contribution_spectrum,
-      int idx_current,
-      int num_lookahead);
-
-  // Returns true if the current band is stationary.
-  bool IsBandStationary(size_t band) const {
-    return stationarity_flags_[band] && (hangovers_[band] == 0);
-  }
-
-  // Returns true if the current block is estimated as stationary.
-  bool IsBlockStationary() const;
-
- private:
-  static constexpr int kWindowLength = 13;
-  // Returns the power of the stationary noise spectrum at a band.
-  float GetStationarityPowerBand(size_t k) const { return noise_.Power(k); }
-
-  // Get an estimation of the stationarity for the current band by looking
-  // at the past/present/future available data.
-  bool EstimateBandStationarity(const VectorBuffer& spectrum_buffer,
-                                rtc::ArrayView<const float> reverb,
-                                const std::array<int, kWindowLength>& indexes,
-                                size_t band) const;
-
-  // True if all bands at the current point are stationary.
-  bool AreAllBandsStationary();
-
-  // Update the hangover depending on the stationary status of the current
-  // frame.
-  void UpdateHangover();
-
-  // Smooth the stationarity detection by looking at neighbouring frequency
-  // bands.
-  void SmoothStationaryPerFreq();
-
-  class NoiseSpectrum {
-   public:
-    NoiseSpectrum();
-    ~NoiseSpectrum();
-
-    // Reset the noise power spectrum estimate state.
-    void Reset();
-
-    // Update the noise power spectrum with a new frame.
-    void Update(rtc::ArrayView<const float> spectrum);
-
-    // Get the noise estimation power spectrum.
-    rtc::ArrayView<const float> Spectrum() const { return noise_spectrum_; }
-
-    // Get the noise power spectrum at a certain band.
-    float Power(size_t band) const {
-      RTC_DCHECK_LT(band, noise_spectrum_.size());
-      return noise_spectrum_[band];
-    }
-
-   private:
-    // Get the update coefficient to be used for the current frame.
-    float GetAlpha() const;
-
-    // Update the noise power spectrum at a certain band with a new frame.
-    float UpdateBandBySmoothing(float power_band,
-                                float power_band_noise,
-                                float alpha) const;
-    std::array<float, kFftLengthBy2Plus1> noise_spectrum_;
-    size_t block_counter_;
-  };
-
-  static int instance_count_;
-  std::unique_ptr<ApmDataDumper> data_dumper_;
-  NoiseSpectrum noise_;
-  std::array<int, kFftLengthBy2Plus1> hangovers_;
-  std::array<bool, kFftLengthBy2Plus1> stationarity_flags_;
-};
-
-}  // namespace webrtc
-
-#endif  // MODULES_AUDIO_PROCESSING_AEC3_STATIONARITY_ESTIMATOR_H_
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/subband_erle_estimator.cc b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/subband_erle_estimator.cc
deleted file mode 100644
index 2cb5accabd..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/subband_erle_estimator.cc
+++ /dev/null
@@ -1,188 +0,0 @@
-/*
- *  Copyright (c) 2018 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#include "modules/audio_processing/aec3/subband_erle_estimator.h"
-
-#include <algorithm>
-#include <memory>
-
-#include "absl/types/optional.h"
-#include "api/array_view.h"
-#include "modules/audio_processing/aec3/aec3_common.h"
-#include "modules/audio_processing/logging/apm_data_dumper.h"
-#include "rtc_base/checks.h"
-#include "rtc_base/numerics/safe_minmax.h"
-#include "system_wrappers/include/field_trial.h"
-
-namespace webrtc {
-
-namespace {
-constexpr int kPointsToAccumulate = 6;
-constexpr float kX2BandEnergyThreshold = 44015068.0f;
-constexpr int kErleHold = 100;
-constexpr int kBlocksForOnsetDetection = kErleHold + 150;
-
-bool EnableAdaptErleOnLowRender() {
-  return !field_trial::IsEnabled("WebRTC-Aec3AdaptErleOnLowRenderKillSwitch");
-}
-
-}  // namespace
-
-SubbandErleEstimator::SubbandErleEstimator(float min_erle,
-                                           float max_erle_lf,
-                                           float max_erle_hf)
-    : min_erle_(min_erle),
-      max_erle_lf_(max_erle_lf),
-      max_erle_hf_(max_erle_hf),
-      adapt_on_low_render_(EnableAdaptErleOnLowRender()) {
-  Reset();
-}
-
-SubbandErleEstimator::~SubbandErleEstimator() = default;
-
-void SubbandErleEstimator::Reset() {
-  erle_.fill(min_erle_);
-  erle_onsets_.fill(min_erle_);
-  hold_counters_.fill(0);
-  coming_onset_.fill(true);
-}
-
-void SubbandErleEstimator::Update(rtc::ArrayView<const float> X2,
-                                  rtc::ArrayView<const float> Y2,
-                                  rtc::ArrayView<const float> E2,
-                                  bool converged_filter,
-                                  bool onset_detection) {
-  if (converged_filter) {
-    // Note that the use of the converged_filter flag already imposed
-    // a minimum of the erle that can be estimated as that flag would
-    // be false if the filter is performing poorly.
-    constexpr size_t kFftLengthBy4 = kFftLengthBy2 / 2;
-    UpdateBands(X2, Y2, E2, 1, kFftLengthBy4, max_erle_lf_, onset_detection);
-    UpdateBands(X2, Y2, E2, kFftLengthBy4, kFftLengthBy2, max_erle_hf_,
-                onset_detection);
-  }
-
-  if (onset_detection) {
-    DecreaseErlePerBandForLowRenderSignals();
-  }
-
-  erle_[0] = erle_[1];
-  erle_[kFftLengthBy2] = erle_[kFftLengthBy2 - 1];
-}
-
-void SubbandErleEstimator::Dump(
-    const std::unique_ptr<ApmDataDumper>& data_dumper) const {
-  data_dumper->DumpRaw("aec3_erle", Erle());
-  data_dumper->DumpRaw("aec3_erle_onset", ErleOnsets());
-}
-
-void SubbandErleEstimator::UpdateBands(rtc::ArrayView<const float> X2,
-                                       rtc::ArrayView<const float> Y2,
-                                       rtc::ArrayView<const float> E2,
-                                       size_t start,
-                                       size_t stop,
-                                       float max_erle,
-                                       bool onset_detection) {
-  auto erle_band_update = [](float erle_band, float new_erle,
-                             bool low_render_energy, float alpha_inc,
-                             float alpha_dec, float min_erle, float max_erle) {
-    if (new_erle < erle_band && low_render_energy) {
-      // Decreases are not allowed if low render energy signals were used for
-      // the erle computation.
-      return erle_band;
-    }
-    float alpha = new_erle > erle_band ? alpha_inc : alpha_dec;
-    float erle_band_out = erle_band;
-    erle_band_out = erle_band + alpha * (new_erle - erle_band);
-    erle_band_out = rtc::SafeClamp(erle_band_out, min_erle, max_erle);
-    return erle_band_out;
-  };
-
-  for (size_t k = start; k < stop; ++k) {
-    if (adapt_on_low_render_ || X2[k] > kX2BandEnergyThreshold) {
-      bool low_render_energy = false;
-      absl::optional<float> new_erle = instantaneous_erle_.Update(
-          X2[k], Y2[k], E2[k], k, &low_render_energy);
-      if (new_erle) {
-        RTC_DCHECK(adapt_on_low_render_ || !low_render_energy);
-        if (onset_detection && !low_render_energy) {
-          if (coming_onset_[k]) {
-            coming_onset_[k] = false;
-            erle_onsets_[k] = erle_band_update(
-                erle_onsets_[k], new_erle.value(), low_render_energy, 0.15f,
-                0.3f, min_erle_, max_erle);
-          }
-          hold_counters_[k] = kBlocksForOnsetDetection;
-        }
-
-        erle_[k] =
-            erle_band_update(erle_[k], new_erle.value(), low_render_energy,
-                             0.05f, 0.1f, min_erle_, max_erle);
-      }
-    }
-  }
-}
-
-void SubbandErleEstimator::DecreaseErlePerBandForLowRenderSignals() {
-  for (size_t k = 1; k < kFftLengthBy2; ++k) {
-    hold_counters_[k]--;
-    if (hold_counters_[k] <= (kBlocksForOnsetDetection - kErleHold)) {
-      if (erle_[k] > erle_onsets_[k]) {
-        erle_[k] = std::max(erle_onsets_[k], 0.97f * erle_[k]);
-        RTC_DCHECK_LE(min_erle_, erle_[k]);
-      }
-      if (hold_counters_[k] <= 0) {
-        coming_onset_[k] = true;
-        hold_counters_[k] = 0;
-      }
-    }
-  }
-}
-
-SubbandErleEstimator::ErleInstantaneous::ErleInstantaneous() {
-  Reset();
-}
-
-SubbandErleEstimator::ErleInstantaneous::~ErleInstantaneous() = default;
-
-absl::optional<float> SubbandErleEstimator::ErleInstantaneous::Update(
-    float X2,
-    float Y2,
-    float E2,
-    size_t band,
-    bool* low_render_energy) {
-  absl::optional<float> erle_instantaneous = absl::nullopt;
-  RTC_DCHECK_LT(band, kFftLengthBy2Plus1);
-  Y2_acum_[band] += Y2;
-  E2_acum_[band] += E2;
-  low_render_energy_[band] =
-      low_render_energy_[band] || X2 < kX2BandEnergyThreshold;
-  if (++num_points_[band] == kPointsToAccumulate) {
-    if (E2_acum_[band]) {
-      erle_instantaneous = Y2_acum_[band] / E2_acum_[band];
-    }
-    *low_render_energy = low_render_energy_[band];
-    num_points_[band] = 0;
-    Y2_acum_[band] = 0.f;
-    E2_acum_[band] = 0.f;
-    low_render_energy_[band] = false;
-  }
-
-  return erle_instantaneous;
-}
-
-void SubbandErleEstimator::ErleInstantaneous::Reset() {
-  Y2_acum_.fill(0.f);
-  E2_acum_.fill(0.f);
-  low_render_energy_.fill(false);
-  num_points_.fill(0);
-}
-
-}  // namespace webrtc
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/subband_erle_estimator.h b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/subband_erle_estimator.h
deleted file mode 100644
index 7693b6a931..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/subband_erle_estimator.h
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
- *  Copyright (c) 2018 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#ifndef MODULES_AUDIO_PROCESSING_AEC3_SUBBAND_ERLE_ESTIMATOR_H_
-#define MODULES_AUDIO_PROCESSING_AEC3_SUBBAND_ERLE_ESTIMATOR_H_
-
-#include <stddef.h>
-#include <array>
-#include <memory>
-
-#include "absl/types/optional.h"
-#include "api/array_view.h"
-#include "modules/audio_processing/aec3/aec3_common.h"
-#include "modules/audio_processing/logging/apm_data_dumper.h"
-
-namespace webrtc {
-
-// Estimates the echo return loss enhancement for each frequency subband.
-class SubbandErleEstimator {
- public:
-  SubbandErleEstimator(float min_erle, float max_erle_lf, float max_erle_hf);
-  ~SubbandErleEstimator();
-
-  // Resets the ERLE estimator.
-  void Reset();
-
-  // Updates the ERLE estimate.
-  void Update(rtc::ArrayView<const float> X2,
-              rtc::ArrayView<const float> Y2,
-              rtc::ArrayView<const float> E2,
-              bool converged_filter,
-              bool onset_detection);
-
-  // Returns the ERLE estimate.
-  const std::array<float, kFftLengthBy2Plus1>& Erle() const { return erle_; }
-
-  // Returns the ERLE estimate at onsets.
-  const std::array<float, kFftLengthBy2Plus1>& ErleOnsets() const {
-    return erle_onsets_;
-  }
-
-  void Dump(const std::unique_ptr<ApmDataDumper>& data_dumper) const;
-
- private:
-  void UpdateBands(rtc::ArrayView<const float> X2,
-                   rtc::ArrayView<const float> Y2,
-                   rtc::ArrayView<const float> E2,
-                   size_t start,
-                   size_t stop,
-                   float max_erle,
-                   bool onset_detection);
-  void DecreaseErlePerBandForLowRenderSignals();
-
-  class ErleInstantaneous {
-   public:
-    ErleInstantaneous();
-    ~ErleInstantaneous();
-    // Updates the ERLE for a band with a new block. Returns absl::nullopt
-    // if not enough points were accumulated for doing the estimation,
-    // otherwise, it returns the ERLE. When the ERLE is returned, the
-    // low_render_energy flag contains information on whether the estimation was
-    // done using low level render signals.
-    absl::optional<float> Update(float X2,
-                                 float Y2,
-                                 float E2,
-                                 size_t band,
-                                 bool* low_render_energy);
-    // Resets the ERLE estimator to its initial state.
-    void Reset();
-
-   private:
-    std::array<float, kFftLengthBy2Plus1> Y2_acum_;
-    std::array<float, kFftLengthBy2Plus1> E2_acum_;
-    std::array<bool, kFftLengthBy2Plus1> low_render_energy_;
-    std::array<int, kFftLengthBy2Plus1> num_points_;
-  };
-
-  ErleInstantaneous instantaneous_erle_;
-  std::array<float, kFftLengthBy2Plus1> erle_;
-  std::array<float, kFftLengthBy2Plus1> erle_onsets_;
-  std::array<bool, kFftLengthBy2Plus1> coming_onset_;
-  std::array<int, kFftLengthBy2Plus1> hold_counters_;
-  const float min_erle_;
-  const float max_erle_lf_;
-  const float max_erle_hf_;
-  const bool adapt_on_low_render_;
-};
-
-}  // namespace webrtc
-
-#endif  // MODULES_AUDIO_PROCESSING_AEC3_SUBBAND_ERLE_ESTIMATOR_H_
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/subtractor.cc b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/subtractor.cc
deleted file mode 100644
index 90069c7a74..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/subtractor.cc
+++ /dev/null
@@ -1,329 +0,0 @@
-/*
- *  Copyright (c) 2017 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#include "modules/audio_processing/aec3/subtractor.h"
-
-#include <algorithm>
-#include <utility>
-
-#include "api/array_view.h"
-#include "modules/audio_processing/aec3/fft_data.h"
-#include "modules/audio_processing/logging/apm_data_dumper.h"
-#include "rtc_base/checks.h"
-#include "rtc_base/numerics/safe_minmax.h"
-#include "system_wrappers/include/field_trial.h"
-
-namespace webrtc {
-
-namespace {
-
-bool EnableAgcGainChangeResponse() {
-  return !field_trial::IsEnabled("WebRTC-Aec3AgcGainChangeResponseKillSwitch");
-}
-
-bool EnableAdaptationDuringSaturation() {
-  return !field_trial::IsEnabled("WebRTC-Aec3RapidAgcGainRecoveryKillSwitch");
-}
-
-bool EnableMisadjustmentEstimator() {
-  return !field_trial::IsEnabled("WebRTC-Aec3MisadjustmentEstimatorKillSwitch");
-}
-
-bool EnableShadowFilterJumpstart() {
-  return !field_trial::IsEnabled("WebRTC-Aec3ShadowFilterJumpstartKillSwitch");
-}
-
-bool EnableShadowFilterBoostedJumpstart() {
-  return !field_trial::IsEnabled(
-      "WebRTC-Aec3ShadowFilterBoostedJumpstartKillSwitch");
-}
-
-bool EnableEarlyShadowFilterJumpstart() {
-  return !field_trial::IsEnabled(
-      "WebRTC-Aec3EarlyShadowFilterJumpstartKillSwitch");
-}
-
-void PredictionError(const Aec3Fft& fft,
-                     const FftData& S,
-                     rtc::ArrayView<const float> y,
-                     std::array<float, kBlockSize>* e,
-                     std::array<float, kBlockSize>* s,
-                     bool adaptation_during_saturation,
-                     bool* saturation) {
-  std::array<float, kFftLength> tmp;
-  fft.Ifft(S, &tmp);
-  constexpr float kScale = 1.0f / kFftLengthBy2;
-  std::transform(y.begin(), y.end(), tmp.begin() + kFftLengthBy2, e->begin(),
-                 [&](float a, float b) { return a - b * kScale; });
-
-  *saturation = false;
-
-  if (s) {
-    for (size_t k = 0; k < s->size(); ++k) {
-      (*s)[k] = kScale * tmp[k + kFftLengthBy2];
-    }
-    auto result = std::minmax_element(s->begin(), s->end());
-    *saturation = *result.first <= -32768 || *result.first >= 32767;
-  }
-  if (!(*saturation)) {
-    auto result = std::minmax_element(e->begin(), e->end());
-    *saturation = *result.first <= -32768 || *result.first >= 32767;
-  }
-
-  if (!adaptation_during_saturation) {
-    std::for_each(e->begin(), e->end(),
-                  [](float& a) { a = rtc::SafeClamp(a, -32768.f, 32767.f); });
-  } else {
-    *saturation = false;
-  }
-}
-
-void ScaleFilterOutput(rtc::ArrayView<const float> y,
-                       float factor,
-                       rtc::ArrayView<float> e,
-                       rtc::ArrayView<float> s) {
-  RTC_DCHECK_EQ(y.size(), e.size());
-  RTC_DCHECK_EQ(y.size(), s.size());
-  for (size_t k = 0; k < y.size(); ++k) {
-    s[k] *= factor;
-    e[k] = y[k] - s[k];
-  }
-}
-
-}  // namespace
-
-Subtractor::Subtractor(const EchoCanceller3Config& config,
-                       ApmDataDumper* data_dumper,
-                       Aec3Optimization optimization)
-    : fft_(),
-      data_dumper_(data_dumper),
-      optimization_(optimization),
-      config_(config),
-      adaptation_during_saturation_(EnableAdaptationDuringSaturation()),
-      enable_misadjustment_estimator_(EnableMisadjustmentEstimator()),
-      enable_agc_gain_change_response_(EnableAgcGainChangeResponse()),
-      enable_shadow_filter_jumpstart_(EnableShadowFilterJumpstart()),
-      enable_shadow_filter_boosted_jumpstart_(
-          EnableShadowFilterBoostedJumpstart()),
-      enable_early_shadow_filter_jumpstart_(EnableEarlyShadowFilterJumpstart()),
-      main_filter_(config_.filter.main.length_blocks,
-                   config_.filter.main_initial.length_blocks,
-                   config.filter.config_change_duration_blocks,
-                   optimization,
-                   data_dumper_),
-      shadow_filter_(config_.filter.shadow.length_blocks,
-                     config_.filter.shadow_initial.length_blocks,
-                     config.filter.config_change_duration_blocks,
-                     optimization,
-                     data_dumper_),
-      G_main_(config_.filter.main_initial,
-              config_.filter.config_change_duration_blocks),
-      G_shadow_(config_.filter.shadow_initial,
-                config.filter.config_change_duration_blocks) {
-  RTC_DCHECK(data_dumper_);
-}
-
-Subtractor::~Subtractor() = default;
-
-void Subtractor::HandleEchoPathChange(
-    const EchoPathVariability& echo_path_variability) {
-  const auto full_reset = [&]() {
-    main_filter_.HandleEchoPathChange();
-    shadow_filter_.HandleEchoPathChange();
-    G_main_.HandleEchoPathChange(echo_path_variability);
-    G_shadow_.HandleEchoPathChange();
-    G_main_.SetConfig(config_.filter.main_initial, true);
-    G_shadow_.SetConfig(config_.filter.shadow_initial, true);
-    main_filter_.SetSizePartitions(config_.filter.main_initial.length_blocks,
-                                   true);
-    shadow_filter_.SetSizePartitions(
-        config_.filter.shadow_initial.length_blocks, true);
-  };
-
-  if (echo_path_variability.delay_change !=
-      EchoPathVariability::DelayAdjustment::kNone) {
-    full_reset();
-  }
-
-  if (echo_path_variability.gain_change && enable_agc_gain_change_response_) {
-    G_main_.HandleEchoPathChange(echo_path_variability);
-  }
-}
-
-void Subtractor::ExitInitialState() {
-  G_main_.SetConfig(config_.filter.main, false);
-  G_shadow_.SetConfig(config_.filter.shadow, false);
-  main_filter_.SetSizePartitions(config_.filter.main.length_blocks, false);
-  shadow_filter_.SetSizePartitions(config_.filter.shadow.length_blocks, false);
-}
-
-void Subtractor::Process(const RenderBuffer& render_buffer,
-                         const rtc::ArrayView<const float> capture,
-                         const RenderSignalAnalyzer& render_signal_analyzer,
-                         const AecState& aec_state,
-                         SubtractorOutput* output) {
-  RTC_DCHECK_EQ(kBlockSize, capture.size());
-  rtc::ArrayView<const float> y = capture;
-  FftData& E_main = output->E_main;
-  FftData E_shadow;
-  std::array<float, kBlockSize>& e_main = output->e_main;
-  std::array<float, kBlockSize>& e_shadow = output->e_shadow;
-
-  FftData S;
-  FftData& G = S;
-
-  // Form the outputs of the main and shadow filters.
-  main_filter_.Filter(render_buffer, &S);
-  bool main_saturation = false;
-  PredictionError(fft_, S, y, &e_main, &output->s_main,
-                  adaptation_during_saturation_, &main_saturation);
-
-  shadow_filter_.Filter(render_buffer, &S);
-  bool shadow_saturation = false;
-  PredictionError(fft_, S, y, &e_shadow, &output->s_shadow,
-                  adaptation_during_saturation_, &shadow_saturation);
-
-  // Compute the signal powers in the subtractor output.
-  output->ComputeMetrics(y);
-
-  // Adjust the filter if needed.
-  bool main_filter_adjusted = false;
-  if (enable_misadjustment_estimator_) {
-    filter_misadjustment_estimator_.Update(*output);
-    if (filter_misadjustment_estimator_.IsAdjustmentNeeded()) {
-      float scale = filter_misadjustment_estimator_.GetMisadjustment();
-      main_filter_.ScaleFilter(scale);
-      ScaleFilterOutput(y, scale, e_main, output->s_main);
-      filter_misadjustment_estimator_.Reset();
-      main_filter_adjusted = true;
-    }
-  }
-
-  // Compute the FFts of the main and shadow filter outputs.
-  fft_.ZeroPaddedFft(e_main, Aec3Fft::Window::kHanning, &E_main);
-  fft_.ZeroPaddedFft(e_shadow, Aec3Fft::Window::kHanning, &E_shadow);
-
-  // Compute spectra for future use.
-  E_shadow.Spectrum(optimization_, output->E2_shadow);
-  E_main.Spectrum(optimization_, output->E2_main);
-
-  // Compute the render powers.
-  std::array<float, kFftLengthBy2Plus1> X2_main;
-  std::array<float, kFftLengthBy2Plus1> X2_shadow_data;
-  std::array<float, kFftLengthBy2Plus1>& X2_shadow =
-      main_filter_.SizePartitions() == shadow_filter_.SizePartitions()
-          ? X2_main
-          : X2_shadow_data;
-  if (main_filter_.SizePartitions() == shadow_filter_.SizePartitions()) {
-    render_buffer.SpectralSum(main_filter_.SizePartitions(), &X2_main);
-  } else if (main_filter_.SizePartitions() > shadow_filter_.SizePartitions()) {
-    render_buffer.SpectralSums(shadow_filter_.SizePartitions(),
-                               main_filter_.SizePartitions(), &X2_shadow,
-                               &X2_main);
-  } else {
-    render_buffer.SpectralSums(main_filter_.SizePartitions(),
-                               shadow_filter_.SizePartitions(), &X2_main,
-                               &X2_shadow);
-  }
-
-  // Update the main filter.
-  if (!main_filter_adjusted) {
-    G_main_.Compute(X2_main, render_signal_analyzer, *output, main_filter_,
-                    aec_state.SaturatedCapture() || main_saturation, &G);
-  } else {
-    G.re.fill(0.f);
-    G.im.fill(0.f);
-  }
-  main_filter_.Adapt(render_buffer, G);
-  data_dumper_->DumpRaw("aec3_subtractor_G_main", G.re);
-  data_dumper_->DumpRaw("aec3_subtractor_G_main", G.im);
-
-  // Update the shadow filter.
-  poor_shadow_filter_counter_ =
-      output->e2_main < output->e2_shadow ? poor_shadow_filter_counter_ + 1 : 0;
-  if (((poor_shadow_filter_counter_ < 5 &&
-        enable_early_shadow_filter_jumpstart_) ||
-       (poor_shadow_filter_counter_ < 10 &&
-        !enable_early_shadow_filter_jumpstart_)) ||
-      !enable_shadow_filter_jumpstart_) {
-    G_shadow_.Compute(X2_shadow, render_signal_analyzer, E_shadow,
-                      shadow_filter_.SizePartitions(),
-                      aec_state.SaturatedCapture() || shadow_saturation, &G);
-    shadow_filter_.Adapt(render_buffer, G);
-  } else {
-    poor_shadow_filter_counter_ = 0;
-    if (enable_shadow_filter_boosted_jumpstart_) {
-      shadow_filter_.SetFilter(main_filter_.GetFilter());
-      G_shadow_.Compute(X2_shadow, render_signal_analyzer, E_main,
-                        shadow_filter_.SizePartitions(),
-                        aec_state.SaturatedCapture() || main_saturation, &G);
-      shadow_filter_.Adapt(render_buffer, G);
-    } else {
-      G.re.fill(0.f);
-      G.im.fill(0.f);
-      shadow_filter_.Adapt(render_buffer, G);
-      shadow_filter_.SetFilter(main_filter_.GetFilter());
-    }
-  }
-
-  data_dumper_->DumpRaw("aec3_subtractor_G_shadow", G.re);
-  data_dumper_->DumpRaw("aec3_subtractor_G_shadow", G.im);
-  filter_misadjustment_estimator_.Dump(data_dumper_);
-  DumpFilters();
-
-  if (adaptation_during_saturation_) {
-    std::for_each(e_main.begin(), e_main.end(),
-                  [](float& a) { a = rtc::SafeClamp(a, -32768.f, 32767.f); });
-  }
-
-  data_dumper_->DumpWav("aec3_main_filter_output", kBlockSize, &e_main[0],
-                        16000, 1);
-  data_dumper_->DumpWav("aec3_shadow_filter_output", kBlockSize, &e_shadow[0],
-                        16000, 1);
-}
-
-void Subtractor::FilterMisadjustmentEstimator::Update(
-    const SubtractorOutput& output) {
-  e2_acum_ += output.e2_main;
-  y2_acum_ += output.y2;
-  if (++n_blocks_acum_ == n_blocks_) {
-    if (y2_acum_ > n_blocks_ * 200.f * 200.f * kBlockSize) {
-      float update = (e2_acum_ / y2_acum_);
-      if (e2_acum_ > n_blocks_ * 7500.f * 7500.f * kBlockSize) {
-        // Duration equal to blockSizeMs * n_blocks_ * 4.
-        overhang_ = 4;
-      } else {
-        overhang_ = std::max(overhang_ - 1, 0);
-      }
-
-      if ((update < inv_misadjustment_) || (overhang_ > 0)) {
-        inv_misadjustment_ += 0.1f * (update - inv_misadjustment_);
-      }
-    }
-    e2_acum_ = 0.f;
-    y2_acum_ = 0.f;
-    n_blocks_acum_ = 0;
-  }
-}
-
-void Subtractor::FilterMisadjustmentEstimator::Reset() {
-  e2_acum_ = 0.f;
-  y2_acum_ = 0.f;
-  n_blocks_acum_ = 0;
-  inv_misadjustment_ = 0.f;
-  overhang_ = 0.f;
-}
-
-void Subtractor::FilterMisadjustmentEstimator::Dump(
-    ApmDataDumper* data_dumper) const {
-  data_dumper->DumpRaw("aec3_inv_misadjustment_factor", inv_misadjustment_);
-}
-
-}  // namespace webrtc
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/subtractor.h b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/subtractor.h
deleted file mode 100644
index bec014deec..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/subtractor.h
+++ /dev/null
@@ -1,128 +0,0 @@
-/*
- *  Copyright (c) 2017 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#ifndef MODULES_AUDIO_PROCESSING_AEC3_SUBTRACTOR_H_
-#define MODULES_AUDIO_PROCESSING_AEC3_SUBTRACTOR_H_
-
-#include <math.h>
-#include <stddef.h>
-#include <array>
-#include <vector>
-
-#include "api/array_view.h"
-#include "api/audio/echo_canceller3_config.h"
-#include "modules/audio_processing/aec3/adaptive_fir_filter.h"
-#include "modules/audio_processing/aec3/aec3_common.h"
-#include "modules/audio_processing/aec3/aec3_fft.h"
-#include "modules/audio_processing/aec3/aec_state.h"
-#include "modules/audio_processing/aec3/echo_path_variability.h"
-#include "modules/audio_processing/aec3/main_filter_update_gain.h"
-#include "modules/audio_processing/aec3/render_buffer.h"
-#include "modules/audio_processing/aec3/render_signal_analyzer.h"
-#include "modules/audio_processing/aec3/shadow_filter_update_gain.h"
-#include "modules/audio_processing/aec3/subtractor_output.h"
-#include "modules/audio_processing/logging/apm_data_dumper.h"
-#include "rtc_base/checks.h"
-#include "rtc_base/constructormagic.h"
-
-namespace webrtc {
-
-// Proves linear echo cancellation functionality
-class Subtractor {
- public:
-  Subtractor(const EchoCanceller3Config& config,
-             ApmDataDumper* data_dumper,
-             Aec3Optimization optimization);
-  ~Subtractor();
-
-  // Performs the echo subtraction.
-  void Process(const RenderBuffer& render_buffer,
-               const rtc::ArrayView<const float> capture,
-               const RenderSignalAnalyzer& render_signal_analyzer,
-               const AecState& aec_state,
-               SubtractorOutput* output);
-
-  void HandleEchoPathChange(const EchoPathVariability& echo_path_variability);
-
-  // Exits the initial state.
-  void ExitInitialState();
-
-  // Returns the block-wise frequency response for the main adaptive filter.
-  const std::vector<std::array<float, kFftLengthBy2Plus1>>&
-  FilterFrequencyResponse() const {
-    return main_filter_.FilterFrequencyResponse();
-  }
-
-  // Returns the estimate of the impulse response for the main adaptive filter.
-  const std::vector<float>& FilterImpulseResponse() const {
-    return main_filter_.FilterImpulseResponse();
-  }
-
-  void DumpFilters() {
-    main_filter_.DumpFilter("aec3_subtractor_H_main", "aec3_subtractor_h_main");
-    shadow_filter_.DumpFilter("aec3_subtractor_H_shadow",
-                              "aec3_subtractor_h_shadow");
-  }
-
- private:
-  class FilterMisadjustmentEstimator {
-   public:
-    FilterMisadjustmentEstimator() = default;
-    ~FilterMisadjustmentEstimator() = default;
-    // Update the misadjustment estimator.
-    void Update(const SubtractorOutput& output);
-    // GetMisadjustment() Returns a recommended scale for the filter so the
-    // prediction error energy gets closer to the energy that is seen at the
-    // microphone input.
-    float GetMisadjustment() const {
-      RTC_DCHECK_GT(inv_misadjustment_, 0.0f);
-      // It is not aiming to adjust all the estimated mismatch. Instead,
-      // it adjusts half of that estimated mismatch.
-      return 2.f / sqrtf(inv_misadjustment_);
-    }
-    // Returns true if the prediciton error energy is significantly larger
-    // than the microphone signal energy and, therefore, an adjustment is
-    // recommended.
-    bool IsAdjustmentNeeded() const { return inv_misadjustment_ > 10.f; }
-    void Reset();
-    void Dump(ApmDataDumper* data_dumper) const;
-
-   private:
-    const int n_blocks_ = 4;
-    int n_blocks_acum_ = 0;
-    float e2_acum_ = 0.f;
-    float y2_acum_ = 0.f;
-    float inv_misadjustment_ = 0.f;
-    int overhang_ = 0.f;
-  };
-
-  const Aec3Fft fft_;
-  ApmDataDumper* data_dumper_;
-  const Aec3Optimization optimization_;
-  const EchoCanceller3Config config_;
-  const bool adaptation_during_saturation_;
-  const bool enable_misadjustment_estimator_;
-  const bool enable_agc_gain_change_response_;
-  const bool enable_shadow_filter_jumpstart_;
-  const bool enable_shadow_filter_boosted_jumpstart_;
-  const bool enable_early_shadow_filter_jumpstart_;
-
-  AdaptiveFirFilter main_filter_;
-  AdaptiveFirFilter shadow_filter_;
-  MainFilterUpdateGain G_main_;
-  ShadowFilterUpdateGain G_shadow_;
-  FilterMisadjustmentEstimator filter_misadjustment_estimator_;
-  size_t poor_shadow_filter_counter_ = 0;
-  RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(Subtractor);
-};
-
-}  // namespace webrtc
-
-#endif  // MODULES_AUDIO_PROCESSING_AEC3_SUBTRACTOR_H_
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/subtractor_output.cc b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/subtractor_output.cc
deleted file mode 100644
index 922cc3d1b3..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/subtractor_output.cc
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- *  Copyright (c) 2018 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#include "modules/audio_processing/aec3/subtractor_output.h"
-
-#include <numeric>
-
-namespace webrtc {
-
-SubtractorOutput::SubtractorOutput() = default;
-SubtractorOutput::~SubtractorOutput() = default;
-
-void SubtractorOutput::Reset() {
-  s_main.fill(0.f);
-  s_shadow.fill(0.f);
-  e_main.fill(0.f);
-  e_shadow.fill(0.f);
-  E_main.re.fill(0.f);
-  E_main.im.fill(0.f);
-  E2_main.fill(0.f);
-  E2_shadow.fill(0.f);
-  e2_main = 0.f;
-  e2_shadow = 0.f;
-  s2_main = 0.f;
-  s2_shadow = 0.f;
-  y2 = 0.f;
-}
-
-void SubtractorOutput::ComputeMetrics(rtc::ArrayView<const float> y) {
-  const auto sum_of_squares = [](float a, float b) { return a + b * b; };
-  y2 = std::accumulate(y.begin(), y.end(), 0.f, sum_of_squares);
-  e2_main = std::accumulate(e_main.begin(), e_main.end(), 0.f, sum_of_squares);
-  e2_shadow =
-      std::accumulate(e_shadow.begin(), e_shadow.end(), 0.f, sum_of_squares);
-  s2_main = std::accumulate(s_main.begin(), s_main.end(), 0.f, sum_of_squares);
-  s2_shadow =
-      std::accumulate(s_shadow.begin(), s_shadow.end(), 0.f, sum_of_squares);
-
-  s_main_max_abs = *std::max_element(s_main.begin(), s_main.end());
-  s_main_max_abs = std::max(s_main_max_abs,
-                            -(*std::min_element(s_main.begin(), s_main.end())));
-
-  s_shadow_max_abs = *std::max_element(s_shadow.begin(), s_shadow.end());
-  s_shadow_max_abs = std::max(
-      s_shadow_max_abs, -(*std::min_element(s_shadow.begin(), s_shadow.end())));
-}
-
-}  // namespace webrtc
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/subtractor_output.h b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/subtractor_output.h
deleted file mode 100644
index 5f6fd3ed71..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/subtractor_output.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- *  Copyright (c) 2017 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#ifndef MODULES_AUDIO_PROCESSING_AEC3_SUBTRACTOR_OUTPUT_H_
-#define MODULES_AUDIO_PROCESSING_AEC3_SUBTRACTOR_OUTPUT_H_
-
-#include <array>
-
-#include "api/array_view.h"
-#include "modules/audio_processing/aec3/aec3_common.h"
-#include "modules/audio_processing/aec3/fft_data.h"
-
-namespace webrtc {
-
-// Stores the values being returned from the echo subtractor.
-struct SubtractorOutput {
-  SubtractorOutput();
-  ~SubtractorOutput();
-
-  std::array<float, kBlockSize> s_main;
-  std::array<float, kBlockSize> s_shadow;
-  std::array<float, kBlockSize> e_main;
-  std::array<float, kBlockSize> e_shadow;
-  FftData E_main;
-  std::array<float, kFftLengthBy2Plus1> E2_main;
-  std::array<float, kFftLengthBy2Plus1> E2_shadow;
-  float s2_main = 0.f;
-  float s2_shadow = 0.f;
-  float e2_main = 0.f;
-  float e2_shadow = 0.f;
-  float y2 = 0.f;
-  float s_main_max_abs = 0.f;
-  float s_shadow_max_abs = 0.f;
-
-  // Reset the struct content.
-  void Reset();
-
-  // Updates the powers of the signals.
-  void ComputeMetrics(rtc::ArrayView<const float> y);
-};
-
-}  // namespace webrtc
-
-#endif  // MODULES_AUDIO_PROCESSING_AEC3_SUBTRACTOR_OUTPUT_H_
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/subtractor_output_analyzer.cc b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/subtractor_output_analyzer.cc
deleted file mode 100644
index 9374b8099f..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/subtractor_output_analyzer.cc
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- *  Copyright (c) 2018 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#include "modules/audio_processing/aec3/subtractor_output_analyzer.h"
-
-#include <algorithm>
-
-#include "modules/audio_processing/aec3/aec3_common.h"
-#include "system_wrappers/include/field_trial.h"
-
-namespace webrtc {
-namespace {
-
-bool EnableStrictDivergenceCheck() {
-  return !field_trial::IsEnabled("WebRTC-Aec3StrictDivergenceCheckKillSwitch");
-}
-
-}  // namespace
-
-SubtractorOutputAnalyzer::SubtractorOutputAnalyzer()
-    : strict_divergence_check_(EnableStrictDivergenceCheck()) {}
-
-void SubtractorOutputAnalyzer::Update(
-    const SubtractorOutput& subtractor_output) {
-  const float y2 = subtractor_output.y2;
-  const float e2_main = subtractor_output.e2_main;
-  const float e2_shadow = subtractor_output.e2_shadow;
-
-  constexpr float kConvergenceThreshold = 50 * 50 * kBlockSize;
-  main_filter_converged_ = e2_main < 0.5f * y2 && y2 > kConvergenceThreshold;
-  shadow_filter_converged_ =
-      e2_shadow < 0.05f * y2 && y2 > kConvergenceThreshold;
-  float min_e2 =
-      strict_divergence_check_ ? std::min(e2_main, e2_shadow) : e2_main;
-  filter_diverged_ = min_e2 > 1.5f * y2 && y2 > 30.f * 30.f * kBlockSize;
-}
-
-void SubtractorOutputAnalyzer::HandleEchoPathChange() {
-  shadow_filter_converged_ = false;
-  main_filter_converged_ = false;
-  filter_diverged_ = false;
-}
-
-}  // namespace webrtc
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/subtractor_output_analyzer.h b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/subtractor_output_analyzer.h
deleted file mode 100644
index 0e23ad5dfa..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/subtractor_output_analyzer.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- *  Copyright (c) 2018 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#ifndef MODULES_AUDIO_PROCESSING_AEC3_SUBTRACTOR_OUTPUT_ANALYZER_H_
-#define MODULES_AUDIO_PROCESSING_AEC3_SUBTRACTOR_OUTPUT_ANALYZER_H_
-
-#include "modules/audio_processing/aec3/subtractor_output.h"
-
-namespace webrtc {
-
-// Class for analyzing the properties subtractor output
-class SubtractorOutputAnalyzer {
- public:
-  SubtractorOutputAnalyzer();
-  ~SubtractorOutputAnalyzer() = default;
-
-  // Analyses the subtractor output.
-  void Update(const SubtractorOutput& subtractor_output);
-
-  bool ConvergedFilter() const {
-    return main_filter_converged_ || shadow_filter_converged_;
-  }
-
-  bool DivergedFilter() const { return filter_diverged_; }
-
-  // Handle echo path change.
-  void HandleEchoPathChange();
-
- private:
-  const bool strict_divergence_check_;
-  bool shadow_filter_converged_ = false;
-  bool main_filter_converged_ = false;
-  bool filter_diverged_ = false;
-};
-
-}  // namespace webrtc
-
-#endif  // MODULES_AUDIO_PROCESSING_AEC3_SUBTRACTOR_OUTPUT_ANALYZER_H_
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/suppression_filter.cc b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/suppression_filter.cc
deleted file mode 100644
index 6fe296c219..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/suppression_filter.cc
+++ /dev/null
@@ -1,168 +0,0 @@
-/*
- *  Copyright (c) 2017 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#include "modules/audio_processing/aec3/suppression_filter.h"
-
-#include <algorithm>
-#include <cmath>
-#include <cstring>
-#include <functional>
-#include <iterator>
-
-#include "modules/audio_processing/aec3/vector_math.h"
-#include "rtc_base/checks.h"
-#include "rtc_base/numerics/safe_minmax.h"
-
-namespace webrtc {
-namespace {
-
-// Hanning window from Matlab command win = sqrt(hanning(128)).
-const float kSqrtHanning[kFftLength] = {
-    0.00000000000000f, 0.02454122852291f, 0.04906767432742f, 0.07356456359967f,
-    0.09801714032956f, 0.12241067519922f, 0.14673047445536f, 0.17096188876030f,
-    0.19509032201613f, 0.21910124015687f, 0.24298017990326f, 0.26671275747490f,
-    0.29028467725446f, 0.31368174039889f, 0.33688985339222f, 0.35989503653499f,
-    0.38268343236509f, 0.40524131400499f, 0.42755509343028f, 0.44961132965461f,
-    0.47139673682600f, 0.49289819222978f, 0.51410274419322f, 0.53499761988710f,
-    0.55557023301960f, 0.57580819141785f, 0.59569930449243f, 0.61523159058063f,
-    0.63439328416365f, 0.65317284295378f, 0.67155895484702f, 0.68954054473707f,
-    0.70710678118655f, 0.72424708295147f, 0.74095112535496f, 0.75720884650648f,
-    0.77301045336274f, 0.78834642762661f, 0.80320753148064f, 0.81758481315158f,
-    0.83146961230255f, 0.84485356524971f, 0.85772861000027f, 0.87008699110871f,
-    0.88192126434835f, 0.89322430119552f, 0.90398929312344f, 0.91420975570353f,
-    0.92387953251129f, 0.93299279883474f, 0.94154406518302f, 0.94952818059304f,
-    0.95694033573221f, 0.96377606579544f, 0.97003125319454f, 0.97570213003853f,
-    0.98078528040323f, 0.98527764238894f, 0.98917650996478f, 0.99247953459871f,
-    0.99518472667220f, 0.99729045667869f, 0.99879545620517f, 0.99969881869620f,
-    1.00000000000000f, 0.99969881869620f, 0.99879545620517f, 0.99729045667869f,
-    0.99518472667220f, 0.99247953459871f, 0.98917650996478f, 0.98527764238894f,
-    0.98078528040323f, 0.97570213003853f, 0.97003125319454f, 0.96377606579544f,
-    0.95694033573221f, 0.94952818059304f, 0.94154406518302f, 0.93299279883474f,
-    0.92387953251129f, 0.91420975570353f, 0.90398929312344f, 0.89322430119552f,
-    0.88192126434835f, 0.87008699110871f, 0.85772861000027f, 0.84485356524971f,
-    0.83146961230255f, 0.81758481315158f, 0.80320753148064f, 0.78834642762661f,
-    0.77301045336274f, 0.75720884650648f, 0.74095112535496f, 0.72424708295147f,
-    0.70710678118655f, 0.68954054473707f, 0.67155895484702f, 0.65317284295378f,
-    0.63439328416365f, 0.61523159058063f, 0.59569930449243f, 0.57580819141785f,
-    0.55557023301960f, 0.53499761988710f, 0.51410274419322f, 0.49289819222978f,
-    0.47139673682600f, 0.44961132965461f, 0.42755509343028f, 0.40524131400499f,
-    0.38268343236509f, 0.35989503653499f, 0.33688985339222f, 0.31368174039889f,
-    0.29028467725446f, 0.26671275747490f, 0.24298017990326f, 0.21910124015687f,
-    0.19509032201613f, 0.17096188876030f, 0.14673047445536f, 0.12241067519922f,
-    0.09801714032956f, 0.07356456359967f, 0.04906767432742f, 0.02454122852291f};
-
-}  // namespace
-
-SuppressionFilter::SuppressionFilter(Aec3Optimization optimization,
-                                     int sample_rate_hz)
-    : optimization_(optimization),
-      sample_rate_hz_(sample_rate_hz),
-      fft_(),
-      e_output_old_(NumBandsForRate(sample_rate_hz_)) {
-  RTC_DCHECK(ValidFullBandRate(sample_rate_hz_));
-  std::for_each(e_output_old_.begin(), e_output_old_.end(),
-                [](std::array<float, kFftLengthBy2>& a) { a.fill(0.f); });
-}
-
-SuppressionFilter::~SuppressionFilter() = default;
-
-void SuppressionFilter::ApplyGain(
-    const FftData& comfort_noise,
-    const FftData& comfort_noise_high_band,
-    const std::array<float, kFftLengthBy2Plus1>& suppression_gain,
-    float high_bands_gain,
-    const FftData& E_lowest_band,
-    std::vector<std::vector<float>>* e) {
-  RTC_DCHECK(e);
-  RTC_DCHECK_EQ(e->size(), NumBandsForRate(sample_rate_hz_));
-  FftData E;
-
-  // Analysis filterbank.
-  E.Assign(E_lowest_band);
-
-  // Apply gain.
-  std::transform(suppression_gain.begin(), suppression_gain.end(), E.re.begin(),
-                 E.re.begin(), std::multiplies<float>());
-  std::transform(suppression_gain.begin(), suppression_gain.end(), E.im.begin(),
-                 E.im.begin(), std::multiplies<float>());
-
-  // Comfort noise gain is sqrt(1-g^2), where g is the suppression gain.
-  std::array<float, kFftLengthBy2Plus1> noise_gain;
-  std::transform(suppression_gain.begin(), suppression_gain.end(),
-                 noise_gain.begin(), [](float g) { return 1.f - g * g; });
-  aec3::VectorMath(optimization_).Sqrt(noise_gain);
-
-  // Scale and add the comfort noise.
-  for (size_t k = 0; k < kFftLengthBy2Plus1; k++) {
-    E.re[k] += noise_gain[k] * comfort_noise.re[k];
-    E.im[k] += noise_gain[k] * comfort_noise.im[k];
-  }
-
-  // Synthesis filterbank.
-  std::array<float, kFftLength> e_extended;
-  constexpr float kIfftNormalization = 2.f / kFftLength;
-
-  fft_.Ifft(E, &e_extended);
-  std::transform(e_output_old_[0].begin(), e_output_old_[0].end(),
-                 std::begin(kSqrtHanning) + kFftLengthBy2, (*e)[0].begin(),
-                 [&](float a, float b) { return kIfftNormalization * a * b; });
-  std::transform(e_extended.begin(), e_extended.begin() + kFftLengthBy2,
-                 std::begin(kSqrtHanning), e_extended.begin(),
-                 [&](float a, float b) { return kIfftNormalization * a * b; });
-  std::transform((*e)[0].begin(), (*e)[0].end(), e_extended.begin(),
-                 (*e)[0].begin(), std::plus<float>());
-  std::for_each((*e)[0].begin(), (*e)[0].end(), [](float& x_k) {
-    x_k = rtc::SafeClamp(x_k, -32768.f, 32767.f);
-  });
-  std::copy(e_extended.begin() + kFftLengthBy2, e_extended.begin() + kFftLength,
-            std::begin(e_output_old_[0]));
-
-  if (e->size() > 1) {
-    // Form time-domain high-band noise.
-    std::array<float, kFftLength> time_domain_high_band_noise;
-    std::transform(comfort_noise_high_band.re.begin(),
-                   comfort_noise_high_band.re.end(), E.re.begin(),
-                   [&](float a) { return kIfftNormalization * a; });
-    std::transform(comfort_noise_high_band.im.begin(),
-                   comfort_noise_high_band.im.end(), E.im.begin(),
-                   [&](float a) { return kIfftNormalization * a; });
-    fft_.Ifft(E, &time_domain_high_band_noise);
-
-    // Scale and apply the noise to the signals.
-    const float high_bands_noise_scaling =
-        0.4f * std::sqrt(1.f - high_bands_gain * high_bands_gain);
-
-    std::transform(
-        (*e)[1].begin(), (*e)[1].end(), time_domain_high_band_noise.begin(),
-        (*e)[1].begin(), [&](float a, float b) {
-          return std::max(
-              std::min(b * high_bands_noise_scaling + high_bands_gain * a,
-                       32767.0f),
-              -32768.0f);
-        });
-
-    if (e->size() > 2) {
-      RTC_DCHECK_EQ(3, e->size());
-      std::for_each((*e)[2].begin(), (*e)[2].end(), [&](float& a) {
-        a = rtc::SafeClamp(a * high_bands_gain, -32768.f, 32767.f);
-      });
-    }
-
-    std::array<float, kFftLengthBy2> tmp;
-    for (size_t k = 1; k < e->size(); ++k) {
-      std::copy((*e)[k].begin(), (*e)[k].end(), tmp.begin());
-      std::copy(e_output_old_[k].begin(), e_output_old_[k].end(),
-                (*e)[k].begin());
-      std::copy(tmp.begin(), tmp.end(), e_output_old_[k].begin());
-    }
-  }
-}
-
-}  // namespace webrtc
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/suppression_filter.h b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/suppression_filter.h
deleted file mode 100644
index edd1290014..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/suppression_filter.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- *  Copyright (c) 2017 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#ifndef MODULES_AUDIO_PROCESSING_AEC3_SUPPRESSION_FILTER_H_
-#define MODULES_AUDIO_PROCESSING_AEC3_SUPPRESSION_FILTER_H_
-
-#include <array>
-#include <vector>
-
-#include "modules/audio_processing/aec3/aec3_common.h"
-#include "modules/audio_processing/aec3/aec3_fft.h"
-#include "modules/audio_processing/aec3/fft_data.h"
-#include "modules/audio_processing/utility/ooura_fft.h"
-#include "rtc_base/constructormagic.h"
-
-namespace webrtc {
-
-class SuppressionFilter {
- public:
-  SuppressionFilter(Aec3Optimization optimization, int sample_rate_hz);
-  ~SuppressionFilter();
-  void ApplyGain(const FftData& comfort_noise,
-                 const FftData& comfort_noise_high_bands,
-                 const std::array<float, kFftLengthBy2Plus1>& suppression_gain,
-                 float high_bands_gain,
-                 const FftData& E_lowest_band,
-                 std::vector<std::vector<float>>* e);
-
- private:
-  const Aec3Optimization optimization_;
-  const int sample_rate_hz_;
-  const OouraFft ooura_fft_;
-  const Aec3Fft fft_;
-  std::vector<std::array<float, kFftLengthBy2>> e_output_old_;
-  RTC_DISALLOW_COPY_AND_ASSIGN(SuppressionFilter);
-};
-
-}  // namespace webrtc
-
-#endif  // MODULES_AUDIO_PROCESSING_AEC3_SUPPRESSION_FILTER_H_
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/suppression_gain.cc b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/suppression_gain.cc
deleted file mode 100644
index 88cfc0a01e..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/suppression_gain.cc
+++ /dev/null
@@ -1,472 +0,0 @@
-/*
- *  Copyright (c) 2017 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#include "modules/audio_processing/aec3/suppression_gain.h"
-
-#include <math.h>
-#include <stddef.h>
-#include <algorithm>
-#include <numeric>
-
-#include "modules/audio_processing/aec3/moving_average.h"
-#include "modules/audio_processing/aec3/vector_math.h"
-#include "modules/audio_processing/logging/apm_data_dumper.h"
-#include "rtc_base/atomicops.h"
-#include "rtc_base/checks.h"
-
-namespace webrtc {
-namespace {
-
-// Adjust the gains according to the presence of known external filters.
-void AdjustForExternalFilters(std::array<float, kFftLengthBy2Plus1>* gain) {
-  // Limit the low frequency gains to avoid the impact of the high-pass filter
-  // on the lower-frequency gain influencing the overall achieved gain.
-  (*gain)[0] = (*gain)[1] = std::min((*gain)[1], (*gain)[2]);
-
-  // Limit the high frequency gains to avoid the impact of the anti-aliasing
-  // filter on the upper-frequency gains influencing the overall achieved
-  // gain. TODO(peah): Update this when new anti-aliasing filters are
-  // implemented.
-  constexpr size_t kAntiAliasingImpactLimit = (64 * 2000) / 8000;
-  const float min_upper_gain = (*gain)[kAntiAliasingImpactLimit];
-  std::for_each(
-      gain->begin() + kAntiAliasingImpactLimit, gain->end() - 1,
-      [min_upper_gain](float& a) { a = std::min(a, min_upper_gain); });
-  (*gain)[kFftLengthBy2] = (*gain)[kFftLengthBy2Minus1];
-}
-
-// Scales the echo according to assessed audibility at the other end.
-void WeightEchoForAudibility(const EchoCanceller3Config& config,
-                             rtc::ArrayView<const float> echo,
-                             rtc::ArrayView<float> weighted_echo) {
-  RTC_DCHECK_EQ(kFftLengthBy2Plus1, echo.size());
-  RTC_DCHECK_EQ(kFftLengthBy2Plus1, weighted_echo.size());
-
-  auto weigh = [](float threshold, float normalizer, size_t begin, size_t end,
-                  rtc::ArrayView<const float> echo,
-                  rtc::ArrayView<float> weighted_echo) {
-    for (size_t k = begin; k < end; ++k) {
-      if (echo[k] < threshold) {
-        float tmp = (threshold - echo[k]) * normalizer;
-        weighted_echo[k] = echo[k] * std::max(0.f, 1.f - tmp * tmp);
-      } else {
-        weighted_echo[k] = echo[k];
-      }
-    }
-  };
-
-  float threshold = config.echo_audibility.floor_power *
-                    config.echo_audibility.audibility_threshold_lf;
-  float normalizer = 1.f / (threshold - config.echo_audibility.floor_power);
-  weigh(threshold, normalizer, 0, 3, echo, weighted_echo);
-
-  threshold = config.echo_audibility.floor_power *
-              config.echo_audibility.audibility_threshold_mf;
-  normalizer = 1.f / (threshold - config.echo_audibility.floor_power);
-  weigh(threshold, normalizer, 3, 7, echo, weighted_echo);
-
-  threshold = config.echo_audibility.floor_power *
-              config.echo_audibility.audibility_threshold_hf;
-  normalizer = 1.f / (threshold - config.echo_audibility.floor_power);
-  weigh(threshold, normalizer, 7, kFftLengthBy2Plus1, echo, weighted_echo);
-}
-
-// TODO(peah): Make adaptive to take the actual filter error into account.
-constexpr size_t kUpperAccurateBandPlus1 = 29;
-
-// Limits the gain in the frequencies for which the adaptive filter has not
-// converged. Currently, these frequencies are not hardcoded to the frequencies
-// which are typically not excited by speech.
-// TODO(peah): Make adaptive to take the actual filter error into account.
-void AdjustNonConvergedFrequencies(
-    std::array<float, kFftLengthBy2Plus1>* gain) {
-  constexpr float oneByBandsInSum =
-      1 / static_cast<float>(kUpperAccurateBandPlus1 - 20);
-  const float hf_gain_bound =
-      std::accumulate(gain->begin() + 20,
-                      gain->begin() + kUpperAccurateBandPlus1, 0.f) *
-      oneByBandsInSum;
-
-  std::for_each(gain->begin() + kUpperAccurateBandPlus1, gain->end(),
-                [hf_gain_bound](float& a) { a = std::min(a, hf_gain_bound); });
-}
-
-}  // namespace
-
-int SuppressionGain::instance_count_ = 0;
-
-float SuppressionGain::UpperBandsGain(
-    const std::array<float, kFftLengthBy2Plus1>& echo_spectrum,
-    const std::array<float, kFftLengthBy2Plus1>& comfort_noise_spectrum,
-    const absl::optional<int>& narrow_peak_band,
-    bool saturated_echo,
-    const std::vector<std::vector<float>>& render,
-    const std::array<float, kFftLengthBy2Plus1>& low_band_gain) const {
-  RTC_DCHECK_LT(0, render.size());
-  if (render.size() == 1) {
-    return 1.f;
-  }
-
-  if (narrow_peak_band &&
-      (*narrow_peak_band > static_cast<int>(kFftLengthBy2Plus1 - 10))) {
-    return 0.001f;
-  }
-
-  constexpr size_t kLowBandGainLimit = kFftLengthBy2 / 2;
-  const float gain_below_8_khz = *std::min_element(
-      low_band_gain.begin() + kLowBandGainLimit, low_band_gain.end());
-
-  // Always attenuate the upper bands when there is saturated echo.
-  if (saturated_echo) {
-    return std::min(0.001f, gain_below_8_khz);
-  }
-
-  // Compute the upper and lower band energies.
-  const auto sum_of_squares = [](float a, float b) { return a + b * b; };
-  const float low_band_energy =
-      std::accumulate(render[0].begin(), render[0].end(), 0.f, sum_of_squares);
-  float high_band_energy = 0.f;
-  for (size_t k = 1; k < render.size(); ++k) {
-    const float energy = std::accumulate(render[k].begin(), render[k].end(),
-                                         0.f, sum_of_squares);
-    high_band_energy = std::max(high_band_energy, energy);
-  }
-
-  // If there is more power in the lower frequencies than the upper frequencies,
-  // or if the power in upper frequencies is low, do not bound the gain in the
-  // upper bands.
-  float anti_howling_gain;
-  constexpr float kThreshold = kBlockSize * 10.f * 10.f / 4.f;
-  if (high_band_energy < std::max(low_band_energy, kThreshold)) {
-    anti_howling_gain = 1.f;
-  } else {
-    // In all other cases, bound the gain for upper frequencies.
-    RTC_DCHECK_LE(low_band_energy, high_band_energy);
-    RTC_DCHECK_NE(0.f, high_band_energy);
-    anti_howling_gain = 0.01f * sqrtf(low_band_energy / high_band_energy);
-  }
-
-  // Bound the upper gain during significant echo activity.
-  auto low_frequency_energy = [](rtc::ArrayView<const float> spectrum) {
-    RTC_DCHECK_LE(16, spectrum.size());
-    return std::accumulate(spectrum.begin() + 1, spectrum.begin() + 16, 0.f);
-  };
-  const float echo_sum = low_frequency_energy(echo_spectrum);
-  const float noise_sum = low_frequency_energy(comfort_noise_spectrum);
-  const auto& cfg = config_.suppressor.high_bands_suppression;
-  float gain_bound = 1.f;
-  if (echo_sum > cfg.enr_threshold * noise_sum &&
-      !dominant_nearend_detector_.IsNearendState()) {
-    gain_bound = cfg.max_gain_during_echo;
-  }
-
-  // Choose the gain as the minimum of the lower and upper gains.
-  return std::min(std::min(gain_below_8_khz, anti_howling_gain), gain_bound);
-}
-
-// Computes the gain to reduce the echo to a non audible level.
-void SuppressionGain::GainToNoAudibleEcho(
-    const std::array<float, kFftLengthBy2Plus1>& nearend,
-    const std::array<float, kFftLengthBy2Plus1>& echo,
-    const std::array<float, kFftLengthBy2Plus1>& masker,
-    const std::array<float, kFftLengthBy2Plus1>& min_gain,
-    const std::array<float, kFftLengthBy2Plus1>& max_gain,
-    std::array<float, kFftLengthBy2Plus1>* gain) const {
-  const auto& p = dominant_nearend_detector_.IsNearendState() ? nearend_params_
-                                                              : normal_params_;
-  for (size_t k = 0; k < gain->size(); ++k) {
-    float enr = echo[k] / (nearend[k] + 1.f);  // Echo-to-nearend ratio.
-    float emr = echo[k] / (masker[k] + 1.f);   // Echo-to-masker (noise) ratio.
-    float g = 1.0f;
-    if (enr > p.enr_transparent_[k] && emr > p.emr_transparent_[k]) {
-      g = (p.enr_suppress_[k] - enr) /
-          (p.enr_suppress_[k] - p.enr_transparent_[k]);
-      g = std::max(g, p.emr_transparent_[k] / emr);
-    }
-    (*gain)[k] = std::max(std::min(g, max_gain[k]), min_gain[k]);
-  }
-}
-
-// Compute the minimum gain as the attenuating gain to put the signal just
-// above the zero sample values.
-void SuppressionGain::GetMinGain(
-    rtc::ArrayView<const float> suppressor_input,
-    rtc::ArrayView<const float> weighted_residual_echo,
-    bool low_noise_render,
-    bool saturated_echo,
-    rtc::ArrayView<float> min_gain) const {
-  if (!saturated_echo) {
-    const float min_echo_power =
-        low_noise_render ? config_.echo_audibility.low_render_limit
-                         : config_.echo_audibility.normal_render_limit;
-
-    for (size_t k = 0; k < suppressor_input.size(); ++k) {
-      const float denom =
-          std::min(suppressor_input[k], weighted_residual_echo[k]);
-      min_gain[k] = denom > 0.f ? min_echo_power / denom : 1.f;
-      min_gain[k] = std::min(min_gain[k], 1.f);
-    }
-    for (size_t k = 0; k < 6; ++k) {
-      const auto& dec = dominant_nearend_detector_.IsNearendState()
-                            ? nearend_params_.max_dec_factor_lf
-                            : normal_params_.max_dec_factor_lf;
-
-      // Make sure the gains of the low frequencies do not decrease too
-      // quickly after strong nearend.
-      if (last_nearend_[k] > last_echo_[k]) {
-        min_gain[k] = std::max(min_gain[k], last_gain_[k] * dec);
-        min_gain[k] = std::min(min_gain[k], 1.f);
-      }
-    }
-  } else {
-    std::fill(min_gain.begin(), min_gain.end(), 0.f);
-  }
-}
-
-// Compute the maximum gain by limiting the gain increase from the previous
-// gain.
-void SuppressionGain::GetMaxGain(rtc::ArrayView<float> max_gain) const {
-  const auto& inc = dominant_nearend_detector_.IsNearendState()
-                        ? nearend_params_.max_inc_factor
-                        : normal_params_.max_inc_factor;
-  const auto& floor = config_.suppressor.floor_first_increase;
-  for (size_t k = 0; k < max_gain.size(); ++k) {
-    max_gain[k] = std::min(std::max(last_gain_[k] * inc, floor), 1.f);
-  }
-}
-
-// TODO(peah): Add further optimizations, in particular for the divisions.
-void SuppressionGain::LowerBandGain(
-    bool low_noise_render,
-    const AecState& aec_state,
-    const std::array<float, kFftLengthBy2Plus1>& suppressor_input,
-    const std::array<float, kFftLengthBy2Plus1>& nearend,
-    const std::array<float, kFftLengthBy2Plus1>& residual_echo,
-    const std::array<float, kFftLengthBy2Plus1>& comfort_noise,
-    std::array<float, kFftLengthBy2Plus1>* gain) {
-  const bool saturated_echo = aec_state.SaturatedEcho();
-
-  // Weight echo power in terms of audibility. // Precompute 1/weighted echo
-  // (note that when the echo is zero, the precomputed value is never used).
-  std::array<float, kFftLengthBy2Plus1> weighted_residual_echo;
-  WeightEchoForAudibility(config_, residual_echo, weighted_residual_echo);
-
-  std::array<float, kFftLengthBy2Plus1> min_gain;
-  GetMinGain(suppressor_input, weighted_residual_echo, low_noise_render,
-             saturated_echo, min_gain);
-
-  std::array<float, kFftLengthBy2Plus1> max_gain;
-  GetMaxGain(max_gain);
-
-    GainToNoAudibleEcho(nearend, weighted_residual_echo, comfort_noise,
-                        min_gain, max_gain, gain);
-    AdjustForExternalFilters(gain);
-
-  // Adjust the gain for frequencies which have not yet converged.
-  AdjustNonConvergedFrequencies(gain);
-
-  // Store data required for the gain computation of the next block.
-  std::copy(nearend.begin(), nearend.end(), last_nearend_.begin());
-  std::copy(weighted_residual_echo.begin(), weighted_residual_echo.end(),
-            last_echo_.begin());
-  std::copy(gain->begin(), gain->end(), last_gain_.begin());
-  aec3::VectorMath(optimization_).Sqrt(*gain);
-
-  // Debug outputs for the purpose of development and analysis.
-  data_dumper_->DumpRaw("aec3_suppressor_min_gain", min_gain);
-  data_dumper_->DumpRaw("aec3_suppressor_max_gain", max_gain);
-  data_dumper_->DumpRaw("aec3_dominant_nearend",
-                        dominant_nearend_detector_.IsNearendState());
-}
-
-SuppressionGain::SuppressionGain(const EchoCanceller3Config& config,
-                                 Aec3Optimization optimization,
-                                 int sample_rate_hz)
-    : data_dumper_(
-          new ApmDataDumper(rtc::AtomicOps::Increment(&instance_count_))),
-      optimization_(optimization),
-      config_(config),
-      state_change_duration_blocks_(
-          static_cast<int>(config_.filter.config_change_duration_blocks)),
-      moving_average_(kFftLengthBy2Plus1,
-                      config.suppressor.nearend_average_blocks),
-      nearend_params_(config_.suppressor.nearend_tuning),
-      normal_params_(config_.suppressor.normal_tuning),
-      dominant_nearend_detector_(
-          config_.suppressor.dominant_nearend_detection) {
-  RTC_DCHECK_LT(0, state_change_duration_blocks_);
-  one_by_state_change_duration_blocks_ = 1.f / state_change_duration_blocks_;
-  last_gain_.fill(1.f);
-  last_nearend_.fill(0.f);
-  last_echo_.fill(0.f);
-}
-
-SuppressionGain::~SuppressionGain() = default;
-
-void SuppressionGain::GetGain(
-    const std::array<float, kFftLengthBy2Plus1>& suppressor_input_spectrum,
-    const std::array<float, kFftLengthBy2Plus1>& nearend_spectrum,
-    const std::array<float, kFftLengthBy2Plus1>& echo_spectrum,
-    const std::array<float, kFftLengthBy2Plus1>& residual_echo_spectrum,
-    const std::array<float, kFftLengthBy2Plus1>& comfort_noise_spectrum,
-    const FftData& linear_aec_fft,
-    const FftData& capture_fft,
-    const RenderSignalAnalyzer& render_signal_analyzer,
-    const AecState& aec_state,
-    const std::vector<std::vector<float>>& render,
-    float* high_bands_gain,
-    std::array<float, kFftLengthBy2Plus1>* low_band_gain) {
-  RTC_DCHECK(high_bands_gain);
-  RTC_DCHECK(low_band_gain);
-  const auto& cfg = config_.suppressor;
-
-  if (cfg.enforce_transparent) {
-    low_band_gain->fill(1.f);
-    *high_bands_gain = cfg.enforce_empty_higher_bands ? 0.f : 1.f;
-    return;
-  }
-
-  std::array<float, kFftLengthBy2Plus1> nearend_average;
-  moving_average_.Average(nearend_spectrum, nearend_average);
-
-  // Update the state selection.
-  dominant_nearend_detector_.Update(nearend_spectrum, residual_echo_spectrum,
-                                    comfort_noise_spectrum, initial_state_);
-
-  // Compute gain for the lower band.
-  bool low_noise_render = low_render_detector_.Detect(render);
-  LowerBandGain(low_noise_render, aec_state, suppressor_input_spectrum,
-                nearend_average, residual_echo_spectrum, comfort_noise_spectrum,
-                low_band_gain);
-
-  // Limit the gain of the lower bands during start up and after resets.
-  const float gain_upper_bound = aec_state.SuppressionGainLimit();
-  if (gain_upper_bound < 1.f) {
-    for (size_t k = 0; k < low_band_gain->size(); ++k) {
-      (*low_band_gain)[k] = std::min((*low_band_gain)[k], gain_upper_bound);
-    }
-  }
-
-  // Compute the gain for the upper bands.
-  const absl::optional<int> narrow_peak_band =
-      render_signal_analyzer.NarrowPeakBand();
-
-  *high_bands_gain =
-      UpperBandsGain(echo_spectrum, comfort_noise_spectrum, narrow_peak_band,
-                     aec_state.SaturatedEcho(), render, *low_band_gain);
-  if (cfg.enforce_empty_higher_bands) {
-    *high_bands_gain = 0.f;
-  }
-}
-
-void SuppressionGain::SetInitialState(bool state) {
-  initial_state_ = state;
-  if (state) {
-    initial_state_change_counter_ = state_change_duration_blocks_;
-  } else {
-    initial_state_change_counter_ = 0;
-  }
-}
-
-// Detects when the render signal can be considered to have low power and
-// consist of stationary noise.
-bool SuppressionGain::LowNoiseRenderDetector::Detect(
-    const std::vector<std::vector<float>>& render) {
-  float x2_sum = 0.f;
-  float x2_max = 0.f;
-  for (auto x_k : render[0]) {
-    const float x2 = x_k * x_k;
-    x2_sum += x2;
-    x2_max = std::max(x2_max, x2);
-  }
-
-  constexpr float kThreshold = 50.f * 50.f * 64.f;
-  const bool low_noise_render =
-      average_power_ < kThreshold && x2_max < 3 * average_power_;
-  average_power_ = average_power_ * 0.9f + x2_sum * 0.1f;
-  return low_noise_render;
-}
-
-SuppressionGain::DominantNearendDetector::DominantNearendDetector(
-    const EchoCanceller3Config::Suppressor::DominantNearendDetection config)
-    : enr_threshold_(config.enr_threshold),
-      enr_exit_threshold_(config.enr_exit_threshold),
-      snr_threshold_(config.snr_threshold),
-      hold_duration_(config.hold_duration),
-      trigger_threshold_(config.trigger_threshold),
-      use_during_initial_phase_(config.use_during_initial_phase) {}
-
-void SuppressionGain::DominantNearendDetector::Update(
-    rtc::ArrayView<const float> nearend_spectrum,
-    rtc::ArrayView<const float> residual_echo_spectrum,
-    rtc::ArrayView<const float> comfort_noise_spectrum,
-    bool initial_state) {
-  auto low_frequency_energy = [](rtc::ArrayView<const float> spectrum) {
-    RTC_DCHECK_LE(16, spectrum.size());
-    return std::accumulate(spectrum.begin() + 1, spectrum.begin() + 16, 0.f);
-  };
-  const float ne_sum = low_frequency_energy(nearend_spectrum);
-  const float echo_sum = low_frequency_energy(residual_echo_spectrum);
-  const float noise_sum = low_frequency_energy(comfort_noise_spectrum);
-
-  // Detect strong active nearend if the nearend is sufficiently stronger than
-  // the echo and the nearend noise.
-  if ((!initial_state || use_during_initial_phase_) &&
-      ne_sum > enr_threshold_ * echo_sum &&
-      ne_sum > snr_threshold_ * noise_sum) {
-    if (++trigger_counter_ >= trigger_threshold_) {
-      // After a period of strong active nearend activity, flag nearend mode.
-      hold_counter_ = hold_duration_;
-      trigger_counter_ = trigger_threshold_;
-    }
-  } else {
-    // Forget previously detected strong active nearend activity.
-    trigger_counter_ = std::max(0, trigger_counter_ - 1);
-  }
-
-  // Exit nearend-state early at strong echo.
-  if (ne_sum < enr_exit_threshold_ * echo_sum &&
-      echo_sum > snr_threshold_ * noise_sum) {
-    hold_counter_ = 0;
-  }
-
-  // Remain in any nearend mode for a certain duration.
-  hold_counter_ = std::max(0, hold_counter_ - 1);
-  nearend_state_ = hold_counter_ > 0;
-}
-
-SuppressionGain::GainParameters::GainParameters(
-    const EchoCanceller3Config::Suppressor::Tuning& tuning)
-    : max_inc_factor(tuning.max_inc_factor),
-      max_dec_factor_lf(tuning.max_dec_factor_lf) {
-  // Compute per-band masking thresholds.
-  constexpr size_t kLastLfBand = 5;
-  constexpr size_t kFirstHfBand = 8;
-  RTC_DCHECK_LT(kLastLfBand, kFirstHfBand);
-  auto& lf = tuning.mask_lf;
-  auto& hf = tuning.mask_hf;
-  RTC_DCHECK_LT(lf.enr_transparent, lf.enr_suppress);
-  RTC_DCHECK_LT(hf.enr_transparent, hf.enr_suppress);
-  for (size_t k = 0; k < kFftLengthBy2Plus1; k++) {
-    float a;
-    if (k <= kLastLfBand) {
-      a = 0.f;
-    } else if (k < kFirstHfBand) {
-      a = (k - kLastLfBand) / static_cast<float>(kFirstHfBand - kLastLfBand);
-    } else {
-      a = 1.f;
-    }
-    enr_transparent_[k] = (1 - a) * lf.enr_transparent + a * hf.enr_transparent;
-    enr_suppress_[k] = (1 - a) * lf.enr_suppress + a * hf.enr_suppress;
-    emr_transparent_[k] = (1 - a) * lf.emr_transparent + a * hf.emr_transparent;
-  }
-}
-
-}  // namespace webrtc
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/suppression_gain.h b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/suppression_gain.h
deleted file mode 100644
index e74cd9632b..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/suppression_gain.h
+++ /dev/null
@@ -1,158 +0,0 @@
-/*
- *  Copyright (c) 2017 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#ifndef MODULES_AUDIO_PROCESSING_AEC3_SUPPRESSION_GAIN_H_
-#define MODULES_AUDIO_PROCESSING_AEC3_SUPPRESSION_GAIN_H_
-
-#include <array>
-#include <memory>
-#include <vector>
-
-#include "absl/types/optional.h"
-#include "api/array_view.h"
-#include "api/audio/echo_canceller3_config.h"
-#include "modules/audio_processing/aec3/aec3_common.h"
-#include "modules/audio_processing/aec3/aec_state.h"
-#include "modules/audio_processing/aec3/fft_data.h"
-#include "modules/audio_processing/aec3/moving_average.h"
-#include "modules/audio_processing/aec3/render_signal_analyzer.h"
-#include "modules/audio_processing/logging/apm_data_dumper.h"
-#include "rtc_base/constructormagic.h"
-
-namespace webrtc {
-
-class SuppressionGain {
- public:
-  SuppressionGain(const EchoCanceller3Config& config,
-                  Aec3Optimization optimization,
-                  int sample_rate_hz);
-  ~SuppressionGain();
-  void GetGain(
-      const std::array<float, kFftLengthBy2Plus1>& suppressor_input_spectrum,
-      const std::array<float, kFftLengthBy2Plus1>& nearend_spectrum,
-      const std::array<float, kFftLengthBy2Plus1>& echo_spectrum,
-      const std::array<float, kFftLengthBy2Plus1>& residual_echo_spectrum,
-      const std::array<float, kFftLengthBy2Plus1>& comfort_noise_spectrum,
-      const FftData& linear_aec_fft,
-      const FftData& capture_fft,
-      const RenderSignalAnalyzer& render_signal_analyzer,
-      const AecState& aec_state,
-      const std::vector<std::vector<float>>& render,
-      float* high_bands_gain,
-      std::array<float, kFftLengthBy2Plus1>* low_band_gain);
-
-  // Toggles the usage of the initial state.
-  void SetInitialState(bool state);
-
- private:
-  // Computes the gain to apply for the bands beyond the first band.
-  float UpperBandsGain(
-      const std::array<float, kFftLengthBy2Plus1>& echo_spectrum,
-      const std::array<float, kFftLengthBy2Plus1>& comfort_noise_spectrum,
-      const absl::optional<int>& narrow_peak_band,
-      bool saturated_echo,
-      const std::vector<std::vector<float>>& render,
-      const std::array<float, kFftLengthBy2Plus1>& low_band_gain) const;
-
-  void GainToNoAudibleEcho(
-      const std::array<float, kFftLengthBy2Plus1>& nearend,
-      const std::array<float, kFftLengthBy2Plus1>& echo,
-      const std::array<float, kFftLengthBy2Plus1>& masker,
-      const std::array<float, kFftLengthBy2Plus1>& min_gain,
-      const std::array<float, kFftLengthBy2Plus1>& max_gain,
-      std::array<float, kFftLengthBy2Plus1>* gain) const;
-
-  void LowerBandGain(
-      bool stationary_with_low_power,
-      const AecState& aec_state,
-      const std::array<float, kFftLengthBy2Plus1>& suppressor_input,
-      const std::array<float, kFftLengthBy2Plus1>& nearend,
-      const std::array<float, kFftLengthBy2Plus1>& residual_echo,
-      const std::array<float, kFftLengthBy2Plus1>& comfort_noise,
-      std::array<float, kFftLengthBy2Plus1>* gain);
-
-  void GetMinGain(rtc::ArrayView<const float> suppressor_input,
-                  rtc::ArrayView<const float> weighted_residual_echo,
-                  bool low_noise_render,
-                  bool saturated_echo,
-                  rtc::ArrayView<float> min_gain) const;
-
-  void GetMaxGain(rtc::ArrayView<float> max_gain) const;
-
-  class LowNoiseRenderDetector {
-   public:
-    bool Detect(const std::vector<std::vector<float>>& render);
-
-   private:
-    float average_power_ = 32768.f * 32768.f;
-  };
-
-  // Class for selecting whether the suppressor is in the nearend or echo state.
-  class DominantNearendDetector {
-   public:
-    explicit DominantNearendDetector(
-        const EchoCanceller3Config::Suppressor::DominantNearendDetection
-            config);
-
-    // Returns whether the current state is the nearend state.
-    bool IsNearendState() const { return nearend_state_; }
-
-    // Updates the state selection based on latest spectral estimates.
-    void Update(rtc::ArrayView<const float> nearend_spectrum,
-                rtc::ArrayView<const float> residual_echo_spectrum,
-                rtc::ArrayView<const float> comfort_noise_spectrum,
-                bool initial_state);
-
-   private:
-    const float enr_threshold_;
-    const float enr_exit_threshold_;
-    const float snr_threshold_;
-    const int hold_duration_;
-    const int trigger_threshold_;
-    const bool use_during_initial_phase_;
-
-    bool nearend_state_ = false;
-    int trigger_counter_ = 0;
-    int hold_counter_ = 0;
-  };
-
-  struct GainParameters {
-    explicit GainParameters(
-        const EchoCanceller3Config::Suppressor::Tuning& tuning);
-    const float max_inc_factor;
-    const float max_dec_factor_lf;
-    std::array<float, kFftLengthBy2Plus1> enr_transparent_;
-    std::array<float, kFftLengthBy2Plus1> enr_suppress_;
-    std::array<float, kFftLengthBy2Plus1> emr_transparent_;
-  };
-
-  static int instance_count_;
-  std::unique_ptr<ApmDataDumper> data_dumper_;
-  const Aec3Optimization optimization_;
-  const EchoCanceller3Config config_;
-  const int state_change_duration_blocks_;
-  float one_by_state_change_duration_blocks_;
-  std::array<float, kFftLengthBy2Plus1> last_gain_;
-  std::array<float, kFftLengthBy2Plus1> last_nearend_;
-  std::array<float, kFftLengthBy2Plus1> last_echo_;
-  LowNoiseRenderDetector low_render_detector_;
-  bool initial_state_ = true;
-  int initial_state_change_counter_ = 0;
-  aec3::MovingAverage moving_average_;
-  const GainParameters nearend_params_;
-  const GainParameters normal_params_;
-  DominantNearendDetector dominant_nearend_detector_;
-
-  RTC_DISALLOW_COPY_AND_ASSIGN(SuppressionGain);
-};
-
-}  // namespace webrtc
-
-#endif  // MODULES_AUDIO_PROCESSING_AEC3_SUPPRESSION_GAIN_H_
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/suppression_gain_limiter.cc b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/suppression_gain_limiter.cc
deleted file mode 100644
index 6625a779c2..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/suppression_gain_limiter.cc
+++ /dev/null
@@ -1,93 +0,0 @@
-/*
- *  Copyright (c) 2018 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#include "modules/audio_processing/aec3/suppression_gain_limiter.h"
-
-#include <math.h>
-#include <algorithm>
-
-#include "modules/audio_processing/aec3/aec3_common.h"
-#include "rtc_base/checks.h"
-
-namespace webrtc {
-namespace {
-
-// Computes the gain rampup factor to use.
-float ComputeGainRampupIncrease(
-    const EchoCanceller3Config::EchoRemovalControl::GainRampup& rampup_config) {
-  return powf(1.f / rampup_config.first_non_zero_gain,
-              1.f / rampup_config.non_zero_gain_blocks);
-}
-
-}  // namespace
-
-SuppressionGainUpperLimiter::SuppressionGainUpperLimiter(
-    const EchoCanceller3Config& config)
-    : rampup_config_(config.echo_removal_control.gain_rampup),
-      gain_rampup_increase_(ComputeGainRampupIncrease(rampup_config_)) {
-  Reset();
-}
-
-void SuppressionGainUpperLimiter::Reset() {
-  recent_reset_ = true;
-}
-
-void SuppressionGainUpperLimiter::Update(bool render_activity,
-                                         bool transparent_mode) {
-  if (transparent_mode) {
-    active_render_seen_ = true;
-    call_startup_phase_ = false;
-    recent_reset_ = false;
-    suppressor_gain_limit_ = 1.f;
-    return;
-  }
-
-  if (recent_reset_ && !call_startup_phase_) {
-    // Only enforce 250 ms full suppression after in-call resets,
-    constexpr int kMuteFramesAfterReset = kNumBlocksPerSecond / 4;
-    realignment_counter_ = kMuteFramesAfterReset;
-  } else if (!active_render_seen_ && render_activity) {
-    // Enforce a tailormade suppression limiting during call startup.
-    active_render_seen_ = true;
-    realignment_counter_ = rampup_config_.full_gain_blocks;
-  } else if (realignment_counter_ > 0) {
-    if (--realignment_counter_ == 0) {
-      call_startup_phase_ = false;
-    }
-  }
-  recent_reset_ = false;
-
-  // Do not enforce any gain limit on the suppressor.
-  if (!IsActive()) {
-    suppressor_gain_limit_ = 1.f;
-    return;
-  }
-
-  // Enforce full suppression.
-  if (realignment_counter_ > rampup_config_.non_zero_gain_blocks ||
-      (!call_startup_phase_ && realignment_counter_ > 0)) {
-    suppressor_gain_limit_ = rampup_config_.initial_gain;
-    return;
-  }
-
-  // Start increasing the gain limit.
-  if (realignment_counter_ == rampup_config_.non_zero_gain_blocks) {
-    suppressor_gain_limit_ = rampup_config_.first_non_zero_gain;
-    return;
-  }
-
-  // Increase the gain limit until it reaches 1.f.
-  RTC_DCHECK_LT(0.f, suppressor_gain_limit_);
-  suppressor_gain_limit_ =
-      std::min(1.f, suppressor_gain_limit_ * gain_rampup_increase_);
-  RTC_DCHECK_GE(1.f, suppressor_gain_limit_);
-}
-
-}  // namespace webrtc
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/suppression_gain_limiter.h b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/suppression_gain_limiter.h
deleted file mode 100644
index eade949605..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/suppression_gain_limiter.h
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- *  Copyright (c) 2018 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#ifndef MODULES_AUDIO_PROCESSING_AEC3_SUPPRESSION_GAIN_LIMITER_H_
-#define MODULES_AUDIO_PROCESSING_AEC3_SUPPRESSION_GAIN_LIMITER_H_
-
-#include "api/array_view.h"
-#include "api/audio/echo_canceller3_config.h"
-#include "rtc_base/constructormagic.h"
-
-namespace webrtc {
-
-// Class for applying a smoothly increasing limit for the suppression gain
-// during call startup and after in-call resets.
-class SuppressionGainUpperLimiter {
- public:
-  explicit SuppressionGainUpperLimiter(const EchoCanceller3Config& config);
-
-  // Reset the limiting behavior.
-  void Reset();
-
-  // Updates the limiting behavior for the current capture bloc.
-  void Update(bool render_activity, bool transparent_mode);
-
-  // Returns the current suppressor gain limit.
-  float Limit() const { return suppressor_gain_limit_; }
-
-  // Return whether the suppressor gain limit is active.
-  bool IsActive() const { return (realignment_counter_ > 0); }
-
-  // Inactivate limiter.
-  void Deactivate() {
-    realignment_counter_ = 0;
-    suppressor_gain_limit_ = 1.f;
-  }
-
- private:
-  const EchoCanceller3Config::EchoRemovalControl::GainRampup rampup_config_;
-  const float gain_rampup_increase_;
-  bool call_startup_phase_ = true;
-  int realignment_counter_ = 0;
-  bool active_render_seen_ = false;
-  float suppressor_gain_limit_ = 1.f;
-  bool recent_reset_ = false;
-
-  RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(SuppressionGainUpperLimiter);
-};
-
-}  // namespace webrtc
-
-#endif  // MODULES_AUDIO_PROCESSING_AEC3_SUPPRESSION_GAIN_LIMITER_H_
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/vector_buffer.cc b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/vector_buffer.cc
deleted file mode 100644
index 0682885c0c..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/vector_buffer.cc
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- *  Copyright (c) 2017 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#include "modules/audio_processing/aec3/vector_buffer.h"
-
-#include <algorithm>
-
-namespace webrtc {
-
-VectorBuffer::VectorBuffer(size_t size, size_t height)
-    : size(static_cast<int>(size)),
-      buffer(size, std::vector<float>(height, 0.f)) {
-  for (auto& c : buffer) {
-    std::fill(c.begin(), c.end(), 0.f);
-  }
-}
-
-VectorBuffer::~VectorBuffer() = default;
-
-}  // namespace webrtc
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/vector_buffer.h b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/vector_buffer.h
deleted file mode 100644
index 4c0257ccea..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/vector_buffer.h
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- *  Copyright (c) 2017 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#ifndef MODULES_AUDIO_PROCESSING_AEC3_VECTOR_BUFFER_H_
-#define MODULES_AUDIO_PROCESSING_AEC3_VECTOR_BUFFER_H_
-
-#include <stddef.h>
-#include <vector>
-
-#include "rtc_base/checks.h"
-
-namespace webrtc {
-
-// Struct for bundling a circular buffer of one dimensional vector objects
-// together with the read and write indices.
-struct VectorBuffer {
-  VectorBuffer(size_t size, size_t height);
-  ~VectorBuffer();
-
-  int IncIndex(int index) const {
-    RTC_DCHECK_EQ(buffer.size(), static_cast<size_t>(size));
-    return index < size - 1 ? index + 1 : 0;
-  }
-
-  int DecIndex(int index) const {
-    RTC_DCHECK_EQ(buffer.size(), static_cast<size_t>(size));
-    return index > 0 ? index - 1 : size - 1;
-  }
-
-  int OffsetIndex(int index, int offset) const {
-    RTC_DCHECK_GE(size, offset);
-    RTC_DCHECK_EQ(buffer.size(), static_cast<size_t>(size));
-    RTC_DCHECK_GE(size + index + offset, 0);
-    return (size + index + offset) % size;
-  }
-
-  void UpdateWriteIndex(int offset) { write = OffsetIndex(write, offset); }
-  void IncWriteIndex() { write = IncIndex(write); }
-  void DecWriteIndex() { write = DecIndex(write); }
-  void UpdateReadIndex(int offset) { read = OffsetIndex(read, offset); }
-  void IncReadIndex() { read = IncIndex(read); }
-  void DecReadIndex() { read = DecIndex(read); }
-
-  const int size;
-  std::vector<std::vector<float>> buffer;
-  int write = 0;
-  int read = 0;
-};
-
-}  // namespace webrtc
-
-#endif  // MODULES_AUDIO_PROCESSING_AEC3_VECTOR_BUFFER_H_
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/vector_math.h b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/vector_math.h
deleted file mode 100644
index 6eb6126d35..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aec3/vector_math.h
+++ /dev/null
@@ -1,214 +0,0 @@
-/*
- *  Copyright (c) 2017 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#ifndef MODULES_AUDIO_PROCESSING_AEC3_VECTOR_MATH_H_
-#define MODULES_AUDIO_PROCESSING_AEC3_VECTOR_MATH_H_
-
-// Defines WEBRTC_ARCH_X86_FAMILY, used below.
-#include "rtc_base/system/arch.h"
-
-#if defined(WEBRTC_ARCH_ARM_FAMILY) && defined(WEBRTC_HAS_NEON)
-#include <arm_neon.h>
-#endif
-#if defined(WEBRTC_ARCH_X86_FAMILY)
-#include <emmintrin.h>
-#endif
-#include <math.h>
-#include <algorithm>
-#include <array>
-#include <functional>
-
-#include "api/array_view.h"
-#include "modules/audio_processing/aec3/aec3_common.h"
-#include "rtc_base/checks.h"
-
-namespace webrtc {
-namespace aec3 {
-
-// Provides optimizations for mathematical operations based on vectors.
-class VectorMath {
- public:
-  explicit VectorMath(Aec3Optimization optimization)
-      : optimization_(optimization) {}
-
-  // Elementwise square root.
-  void Sqrt(rtc::ArrayView<float> x) {
-    switch (optimization_) {
-#if defined(WEBRTC_ARCH_X86_FAMILY)
-      case Aec3Optimization::kSse2: {
-        const int x_size = static_cast<int>(x.size());
-        const int vector_limit = x_size >> 2;
-
-        int j = 0;
-        for (; j < vector_limit * 4; j += 4) {
-          __m128 g = _mm_loadu_ps(&x[j]);
-          g = _mm_sqrt_ps(g);
-          _mm_storeu_ps(&x[j], g);
-        }
-
-        for (; j < x_size; ++j) {
-          x[j] = sqrtf(x[j]);
-        }
-      } break;
-#endif
-#if defined(WEBRTC_ARCH_ARM_FAMILY) && defined(WEBRTC_HAS_NEON)
-      case Aec3Optimization::kNeon: {
-        const int x_size = static_cast<int>(x.size());
-        const int vector_limit = x_size >> 2;
-
-        int j = 0;
-        for (; j < vector_limit * 4; j += 4) {
-          float32x4_t g = vld1q_f32(&x[j]);
-#if !defined(WEBRTC_ARCH_ARM64)
-          float32x4_t y = vrsqrteq_f32(g);
-
-          // Code to handle sqrt(0).
-          // If the input to sqrtf() is zero, a zero will be returned.
-          // If the input to vrsqrteq_f32() is zero, positive infinity is
-          // returned.
-          const uint32x4_t vec_p_inf = vdupq_n_u32(0x7F800000);
-          // check for divide by zero
-          const uint32x4_t div_by_zero =
-              vceqq_u32(vec_p_inf, vreinterpretq_u32_f32(y));
-          // zero out the positive infinity results
-          y = vreinterpretq_f32_u32(
-              vandq_u32(vmvnq_u32(div_by_zero), vreinterpretq_u32_f32(y)));
-          // from arm documentation
-          // The Newton-Raphson iteration:
-          //     y[n+1] = y[n] * (3 - d * (y[n] * y[n])) / 2)
-          // converges to (1/√d) if y0 is the result of VRSQRTE applied to d.
-          //
-          // Note: The precision did not improve after 2 iterations.
-          for (int i = 0; i < 2; i++) {
-            y = vmulq_f32(vrsqrtsq_f32(vmulq_f32(y, y), g), y);
-          }
-          // sqrt(g) = g * 1/sqrt(g)
-          g = vmulq_f32(g, y);
-#else
-          g = vsqrtq_f32(g);
-#endif
-          vst1q_f32(&x[j], g);
-        }
-
-        for (; j < x_size; ++j) {
-          x[j] = sqrtf(x[j]);
-        }
-      }
-#endif
-      break;
-      default:
-        std::for_each(x.begin(), x.end(), [](float& a) { a = sqrtf(a); });
-    }
-  }
-
-  // Elementwise vector multiplication z = x * y.
-  void Multiply(rtc::ArrayView<const float> x,
-                rtc::ArrayView<const float> y,
-                rtc::ArrayView<float> z) {
-    RTC_DCHECK_EQ(z.size(), x.size());
-    RTC_DCHECK_EQ(z.size(), y.size());
-    switch (optimization_) {
-#if defined(WEBRTC_ARCH_X86_FAMILY)
-      case Aec3Optimization::kSse2: {
-        const int x_size = static_cast<int>(x.size());
-        const int vector_limit = x_size >> 2;
-
-        int j = 0;
-        for (; j < vector_limit * 4; j += 4) {
-          const __m128 x_j = _mm_loadu_ps(&x[j]);
-          const __m128 y_j = _mm_loadu_ps(&y[j]);
-          const __m128 z_j = _mm_mul_ps(x_j, y_j);
-          _mm_storeu_ps(&z[j], z_j);
-        }
-
-        for (; j < x_size; ++j) {
-          z[j] = x[j] * y[j];
-        }
-      } break;
-#endif
-#if defined(WEBRTC_ARCH_ARM_FAMILY) && defined(WEBRTC_HAS_NEON)
-      case Aec3Optimization::kNeon: {
-        const int x_size = static_cast<int>(x.size());
-        const int vector_limit = x_size >> 2;
-
-        int j = 0;
-        for (; j < vector_limit * 4; j += 4) {
-          const float32x4_t x_j = vld1q_f32(&x[j]);
-          const float32x4_t y_j = vld1q_f32(&y[j]);
-          const float32x4_t z_j = vmulq_f32(x_j, y_j);
-          vst1q_f32(&z[j], z_j);
-        }
-
-        for (; j < x_size; ++j) {
-          z[j] = x[j] * y[j];
-        }
-      } break;
-#endif
-      default:
-        std::transform(x.begin(), x.end(), y.begin(), z.begin(),
-                       std::multiplies<float>());
-    }
-  }
-
-  // Elementwise vector accumulation z += x.
-  void Accumulate(rtc::ArrayView<const float> x, rtc::ArrayView<float> z) {
-    RTC_DCHECK_EQ(z.size(), x.size());
-    switch (optimization_) {
-#if defined(WEBRTC_ARCH_X86_FAMILY)
-      case Aec3Optimization::kSse2: {
-        const int x_size = static_cast<int>(x.size());
-        const int vector_limit = x_size >> 2;
-
-        int j = 0;
-        for (; j < vector_limit * 4; j += 4) {
-          const __m128 x_j = _mm_loadu_ps(&x[j]);
-          __m128 z_j = _mm_loadu_ps(&z[j]);
-          z_j = _mm_add_ps(x_j, z_j);
-          _mm_storeu_ps(&z[j], z_j);
-        }
-
-        for (; j < x_size; ++j) {
-          z[j] += x[j];
-        }
-      } break;
-#endif
-#if defined(WEBRTC_ARCH_ARM_FAMILY) && defined(WEBRTC_HAS_NEON)
-      case Aec3Optimization::kNeon: {
-        const int x_size = static_cast<int>(x.size());
-        const int vector_limit = x_size >> 2;
-
-        int j = 0;
-        for (; j < vector_limit * 4; j += 4) {
-          const float32x4_t x_j = vld1q_f32(&x[j]);
-          float32x4_t z_j = vld1q_f32(&z[j]);
-          z_j = vaddq_f32(z_j, x_j);
-          vst1q_f32(&z[j], z_j);
-        }
-
-        for (; j < x_size; ++j) {
-          z[j] += x[j];
-        }
-      } break;
-#endif
-      default:
-        std::transform(x.begin(), x.end(), z.begin(), z.begin(),
-                       std::plus<float>());
-    }
-  }
-
- private:
-  Aec3Optimization optimization_;
-};
-
-}  // namespace aec3
-
-}  // namespace webrtc
-
-#endif  // MODULES_AUDIO_PROCESSING_AEC3_VECTOR_MATH_H_
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aecm/aecm_core.cc b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aecm/aecm_core.cc
deleted file mode 100644
index 86a5450dde..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aecm/aecm_core.cc
+++ /dev/null
@@ -1,1117 +0,0 @@
-/*
- *  Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#include "modules/audio_processing/aecm/aecm_core.h"
-
-#include <stddef.h>
-#include <stdlib.h>
-#include <string.h>
-
-extern "C" {
-#include "common_audio/ring_buffer.h"
-#include "common_audio/signal_processing/include/real_fft.h"
-}
-#include "common_audio/signal_processing/include/signal_processing_library.h"
-#include "modules/audio_processing/aecm/echo_control_mobile.h"
-#include "modules/audio_processing/utility/delay_estimator_wrapper.h"
-
-#include "rtc_base/checks.h"
-#include "rtc_base/numerics/safe_conversions.h"
-
-#ifdef AEC_DEBUG
-FILE* dfile;
-FILE* testfile;
-#endif
-
-const int16_t WebRtcAecm_kCosTable[] = {
-    8192,  8190,  8187,  8180,  8172,  8160,  8147,  8130,  8112,  8091,  8067,
-    8041,  8012,  7982,  7948,  7912,  7874,  7834,  7791,  7745,  7697,  7647,
-    7595,  7540,  7483,  7424,  7362,  7299,  7233,  7164,  7094,  7021,  6947,
-    6870,  6791,  6710,  6627,  6542,  6455,  6366,  6275,  6182,  6087,  5991,
-    5892,  5792,  5690,  5586,  5481,  5374,  5265,  5155,  5043,  4930,  4815,
-    4698,  4580,  4461,  4341,  4219,  4096,  3971,  3845,  3719,  3591,  3462,
-    3331,  3200,  3068,  2935,  2801,  2667,  2531,  2395,  2258,  2120,  1981,
-    1842,  1703,  1563,  1422,  1281,  1140,  998,   856,   713,   571,   428,
-    285,   142,   0,     -142,  -285,  -428,  -571,  -713,  -856,  -998,  -1140,
-    -1281, -1422, -1563, -1703, -1842, -1981, -2120, -2258, -2395, -2531, -2667,
-    -2801, -2935, -3068, -3200, -3331, -3462, -3591, -3719, -3845, -3971, -4095,
-    -4219, -4341, -4461, -4580, -4698, -4815, -4930, -5043, -5155, -5265, -5374,
-    -5481, -5586, -5690, -5792, -5892, -5991, -6087, -6182, -6275, -6366, -6455,
-    -6542, -6627, -6710, -6791, -6870, -6947, -7021, -7094, -7164, -7233, -7299,
-    -7362, -7424, -7483, -7540, -7595, -7647, -7697, -7745, -7791, -7834, -7874,
-    -7912, -7948, -7982, -8012, -8041, -8067, -8091, -8112, -8130, -8147, -8160,
-    -8172, -8180, -8187, -8190, -8191, -8190, -8187, -8180, -8172, -8160, -8147,
-    -8130, -8112, -8091, -8067, -8041, -8012, -7982, -7948, -7912, -7874, -7834,
-    -7791, -7745, -7697, -7647, -7595, -7540, -7483, -7424, -7362, -7299, -7233,
-    -7164, -7094, -7021, -6947, -6870, -6791, -6710, -6627, -6542, -6455, -6366,
-    -6275, -6182, -6087, -5991, -5892, -5792, -5690, -5586, -5481, -5374, -5265,
-    -5155, -5043, -4930, -4815, -4698, -4580, -4461, -4341, -4219, -4096, -3971,
-    -3845, -3719, -3591, -3462, -3331, -3200, -3068, -2935, -2801, -2667, -2531,
-    -2395, -2258, -2120, -1981, -1842, -1703, -1563, -1422, -1281, -1140, -998,
-    -856,  -713,  -571,  -428,  -285,  -142,  0,     142,   285,   428,   571,
-    713,   856,   998,   1140,  1281,  1422,  1563,  1703,  1842,  1981,  2120,
-    2258,  2395,  2531,  2667,  2801,  2935,  3068,  3200,  3331,  3462,  3591,
-    3719,  3845,  3971,  4095,  4219,  4341,  4461,  4580,  4698,  4815,  4930,
-    5043,  5155,  5265,  5374,  5481,  5586,  5690,  5792,  5892,  5991,  6087,
-    6182,  6275,  6366,  6455,  6542,  6627,  6710,  6791,  6870,  6947,  7021,
-    7094,  7164,  7233,  7299,  7362,  7424,  7483,  7540,  7595,  7647,  7697,
-    7745,  7791,  7834,  7874,  7912,  7948,  7982,  8012,  8041,  8067,  8091,
-    8112,  8130,  8147,  8160,  8172,  8180,  8187,  8190};
-
-const int16_t WebRtcAecm_kSinTable[] = {
-    0,     142,   285,   428,   571,   713,   856,   998,   1140,  1281,  1422,
-    1563,  1703,  1842,  1981,  2120,  2258,  2395,  2531,  2667,  2801,  2935,
-    3068,  3200,  3331,  3462,  3591,  3719,  3845,  3971,  4095,  4219,  4341,
-    4461,  4580,  4698,  4815,  4930,  5043,  5155,  5265,  5374,  5481,  5586,
-    5690,  5792,  5892,  5991,  6087,  6182,  6275,  6366,  6455,  6542,  6627,
-    6710,  6791,  6870,  6947,  7021,  7094,  7164,  7233,  7299,  7362,  7424,
-    7483,  7540,  7595,  7647,  7697,  7745,  7791,  7834,  7874,  7912,  7948,
-    7982,  8012,  8041,  8067,  8091,  8112,  8130,  8147,  8160,  8172,  8180,
-    8187,  8190,  8191,  8190,  8187,  8180,  8172,  8160,  8147,  8130,  8112,
-    8091,  8067,  8041,  8012,  7982,  7948,  7912,  7874,  7834,  7791,  7745,
-    7697,  7647,  7595,  7540,  7483,  7424,  7362,  7299,  7233,  7164,  7094,
-    7021,  6947,  6870,  6791,  6710,  6627,  6542,  6455,  6366,  6275,  6182,
-    6087,  5991,  5892,  5792,  5690,  5586,  5481,  5374,  5265,  5155,  5043,
-    4930,  4815,  4698,  4580,  4461,  4341,  4219,  4096,  3971,  3845,  3719,
-    3591,  3462,  3331,  3200,  3068,  2935,  2801,  2667,  2531,  2395,  2258,
-    2120,  1981,  1842,  1703,  1563,  1422,  1281,  1140,  998,   856,   713,
-    571,   428,   285,   142,   0,     -142,  -285,  -428,  -571,  -713,  -856,
-    -998,  -1140, -1281, -1422, -1563, -1703, -1842, -1981, -2120, -2258, -2395,
-    -2531, -2667, -2801, -2935, -3068, -3200, -3331, -3462, -3591, -3719, -3845,
-    -3971, -4095, -4219, -4341, -4461, -4580, -4698, -4815, -4930, -5043, -5155,
-    -5265, -5374, -5481, -5586, -5690, -5792, -5892, -5991, -6087, -6182, -6275,
-    -6366, -6455, -6542, -6627, -6710, -6791, -6870, -6947, -7021, -7094, -7164,
-    -7233, -7299, -7362, -7424, -7483, -7540, -7595, -7647, -7697, -7745, -7791,
-    -7834, -7874, -7912, -7948, -7982, -8012, -8041, -8067, -8091, -8112, -8130,
-    -8147, -8160, -8172, -8180, -8187, -8190, -8191, -8190, -8187, -8180, -8172,
-    -8160, -8147, -8130, -8112, -8091, -8067, -8041, -8012, -7982, -7948, -7912,
-    -7874, -7834, -7791, -7745, -7697, -7647, -7595, -7540, -7483, -7424, -7362,
-    -7299, -7233, -7164, -7094, -7021, -6947, -6870, -6791, -6710, -6627, -6542,
-    -6455, -6366, -6275, -6182, -6087, -5991, -5892, -5792, -5690, -5586, -5481,
-    -5374, -5265, -5155, -5043, -4930, -4815, -4698, -4580, -4461, -4341, -4219,
-    -4096, -3971, -3845, -3719, -3591, -3462, -3331, -3200, -3068, -2935, -2801,
-    -2667, -2531, -2395, -2258, -2120, -1981, -1842, -1703, -1563, -1422, -1281,
-    -1140, -998,  -856,  -713,  -571,  -428,  -285,  -142};
-
-// Initialization table for echo channel in 8 kHz
-static const int16_t kChannelStored8kHz[PART_LEN1] = {
-    2040, 1815, 1590, 1498, 1405, 1395, 1385, 1418, 1451, 1506, 1562,
-    1644, 1726, 1804, 1882, 1918, 1953, 1982, 2010, 2025, 2040, 2034,
-    2027, 2021, 2014, 1997, 1980, 1925, 1869, 1800, 1732, 1683, 1635,
-    1604, 1572, 1545, 1517, 1481, 1444, 1405, 1367, 1331, 1294, 1270,
-    1245, 1239, 1233, 1247, 1260, 1282, 1303, 1338, 1373, 1407, 1441,
-    1470, 1499, 1524, 1549, 1565, 1582, 1601, 1621, 1649, 1676};
-
-// Initialization table for echo channel in 16 kHz
-static const int16_t kChannelStored16kHz[PART_LEN1] = {
-    2040, 1590, 1405, 1385, 1451, 1562, 1726, 1882, 1953, 2010, 2040,
-    2027, 2014, 1980, 1869, 1732, 1635, 1572, 1517, 1444, 1367, 1294,
-    1245, 1233, 1260, 1303, 1373, 1441, 1499, 1549, 1582, 1621, 1676,
-    1741, 1802, 1861, 1921, 1983, 2040, 2102, 2170, 2265, 2375, 2515,
-    2651, 2781, 2922, 3075, 3253, 3471, 3738, 3976, 4151, 4258, 4308,
-    4288, 4270, 4253, 4237, 4179, 4086, 3947, 3757, 3484, 3153};
-
-// Moves the pointer to the next entry and inserts |far_spectrum| and
-// corresponding Q-domain in its buffer.
-//
-// Inputs:
-//      - self          : Pointer to the delay estimation instance
-//      - far_spectrum  : Pointer to the far end spectrum
-//      - far_q         : Q-domain of far end spectrum
-//
-void WebRtcAecm_UpdateFarHistory(AecmCore* self,
-                                 uint16_t* far_spectrum,
-                                 int far_q) {
-  // Get new buffer position
-  self->far_history_pos++;
-  if (self->far_history_pos >= MAX_DELAY) {
-    self->far_history_pos = 0;
-  }
-  // Update Q-domain buffer
-  self->far_q_domains[self->far_history_pos] = far_q;
-  // Update far end spectrum buffer
-  memcpy(&(self->far_history[self->far_history_pos * PART_LEN1]), far_spectrum,
-         sizeof(uint16_t) * PART_LEN1);
-}
-
-// Returns a pointer to the far end spectrum aligned to current near end
-// spectrum. The function WebRtc_DelayEstimatorProcessFix(...) should have been
-// called before AlignedFarend(...). Otherwise, you get the pointer to the
-// previous frame. The memory is only valid until the next call of
-// WebRtc_DelayEstimatorProcessFix(...).
-//
-// Inputs:
-//      - self              : Pointer to the AECM instance.
-//      - delay             : Current delay estimate.
-//
-// Output:
-//      - far_q             : The Q-domain of the aligned far end spectrum
-//
-// Return value:
-//      - far_spectrum      : Pointer to the aligned far end spectrum
-//                            NULL - Error
-//
-const uint16_t* WebRtcAecm_AlignedFarend(AecmCore* self,
-                                         int* far_q,
-                                         int delay) {
-  int buffer_position = 0;
-  RTC_DCHECK(self);
-  buffer_position = self->far_history_pos - delay;
-
-  // Check buffer position
-  if (buffer_position < 0) {
-    buffer_position += MAX_DELAY;
-  }
-  // Get Q-domain
-  *far_q = self->far_q_domains[buffer_position];
-  // Return far end spectrum
-  return &(self->far_history[buffer_position * PART_LEN1]);
-}
-
-// Declare function pointers.
-CalcLinearEnergies WebRtcAecm_CalcLinearEnergies;
-StoreAdaptiveChannel WebRtcAecm_StoreAdaptiveChannel;
-ResetAdaptiveChannel WebRtcAecm_ResetAdaptiveChannel;
-
-AecmCore* WebRtcAecm_CreateCore() {
-  AecmCore* aecm = static_cast<AecmCore*>(malloc(sizeof(AecmCore)));
-
-  aecm->farFrameBuf =
-      WebRtc_CreateBuffer(FRAME_LEN + PART_LEN, sizeof(int16_t));
-  if (!aecm->farFrameBuf) {
-    WebRtcAecm_FreeCore(aecm);
-    return NULL;
-  }
-
-  aecm->nearNoisyFrameBuf =
-      WebRtc_CreateBuffer(FRAME_LEN + PART_LEN, sizeof(int16_t));
-  if (!aecm->nearNoisyFrameBuf) {
-    WebRtcAecm_FreeCore(aecm);
-    return NULL;
-  }
-
-  aecm->nearCleanFrameBuf =
-      WebRtc_CreateBuffer(FRAME_LEN + PART_LEN, sizeof(int16_t));
-  if (!aecm->nearCleanFrameBuf) {
-    WebRtcAecm_FreeCore(aecm);
-    return NULL;
-  }
-
-  aecm->outFrameBuf =
-      WebRtc_CreateBuffer(FRAME_LEN + PART_LEN, sizeof(int16_t));
-  if (!aecm->outFrameBuf) {
-    WebRtcAecm_FreeCore(aecm);
-    return NULL;
-  }
-
-  aecm->delay_estimator_farend =
-      WebRtc_CreateDelayEstimatorFarend(PART_LEN1, MAX_DELAY);
-  if (aecm->delay_estimator_farend == NULL) {
-    WebRtcAecm_FreeCore(aecm);
-    return NULL;
-  }
-  aecm->delay_estimator =
-      WebRtc_CreateDelayEstimator(aecm->delay_estimator_farend, 0);
-  if (aecm->delay_estimator == NULL) {
-    WebRtcAecm_FreeCore(aecm);
-    return NULL;
-  }
-  // TODO(bjornv): Explicitly disable robust delay validation until no
-  // performance regression has been established.  Then remove the line.
-  WebRtc_enable_robust_validation(aecm->delay_estimator, 0);
-
-  aecm->real_fft = WebRtcSpl_CreateRealFFT(PART_LEN_SHIFT);
-  if (aecm->real_fft == NULL) {
-    WebRtcAecm_FreeCore(aecm);
-    return NULL;
-  }
-
-  // Init some aecm pointers. 16 and 32 byte alignment is only necessary
-  // for Neon code currently.
-  aecm->xBuf = (int16_t*)(((uintptr_t)aecm->xBuf_buf + 31) & ~31);
-  aecm->dBufClean = (int16_t*)(((uintptr_t)aecm->dBufClean_buf + 31) & ~31);
-  aecm->dBufNoisy = (int16_t*)(((uintptr_t)aecm->dBufNoisy_buf + 31) & ~31);
-  aecm->outBuf = (int16_t*)(((uintptr_t)aecm->outBuf_buf + 15) & ~15);
-  aecm->channelStored =
-      (int16_t*)(((uintptr_t)aecm->channelStored_buf + 15) & ~15);
-  aecm->channelAdapt16 =
-      (int16_t*)(((uintptr_t)aecm->channelAdapt16_buf + 15) & ~15);
-  aecm->channelAdapt32 =
-      (int32_t*)(((uintptr_t)aecm->channelAdapt32_buf + 31) & ~31);
-
-  return aecm;
-}
-
-void WebRtcAecm_InitEchoPathCore(AecmCore* aecm, const int16_t* echo_path) {
-  int i = 0;
-
-  // Reset the stored channel
-  memcpy(aecm->channelStored, echo_path, sizeof(int16_t) * PART_LEN1);
-  // Reset the adapted channels
-  memcpy(aecm->channelAdapt16, echo_path, sizeof(int16_t) * PART_LEN1);
-  for (i = 0; i < PART_LEN1; i++) {
-    aecm->channelAdapt32[i] = (int32_t)aecm->channelAdapt16[i] << 16;
-  }
-
-  // Reset channel storing variables
-  aecm->mseAdaptOld = 1000;
-  aecm->mseStoredOld = 1000;
-  aecm->mseThreshold = WEBRTC_SPL_WORD32_MAX;
-  aecm->mseChannelCount = 0;
-}
-
-static void CalcLinearEnergiesC(AecmCore* aecm,
-                                const uint16_t* far_spectrum,
-                                int32_t* echo_est,
-                                uint32_t* far_energy,
-                                uint32_t* echo_energy_adapt,
-                                uint32_t* echo_energy_stored) {
-  int i;
-
-  // Get energy for the delayed far end signal and estimated
-  // echo using both stored and adapted channels.
-  for (i = 0; i < PART_LEN1; i++) {
-    echo_est[i] =
-        WEBRTC_SPL_MUL_16_U16(aecm->channelStored[i], far_spectrum[i]);
-    (*far_energy) += (uint32_t)(far_spectrum[i]);
-    *echo_energy_adapt += aecm->channelAdapt16[i] * far_spectrum[i];
-    (*echo_energy_stored) += (uint32_t)echo_est[i];
-  }
-}
-
-static void StoreAdaptiveChannelC(AecmCore* aecm,
-                                  const uint16_t* far_spectrum,
-                                  int32_t* echo_est) {
-  int i;
-
-  // During startup we store the channel every block.
-  memcpy(aecm->channelStored, aecm->channelAdapt16,
-         sizeof(int16_t) * PART_LEN1);
-  // Recalculate echo estimate
-  for (i = 0; i < PART_LEN; i += 4) {
-    echo_est[i] =
-        WEBRTC_SPL_MUL_16_U16(aecm->channelStored[i], far_spectrum[i]);
-    echo_est[i + 1] =
-        WEBRTC_SPL_MUL_16_U16(aecm->channelStored[i + 1], far_spectrum[i + 1]);
-    echo_est[i + 2] =
-        WEBRTC_SPL_MUL_16_U16(aecm->channelStored[i + 2], far_spectrum[i + 2]);
-    echo_est[i + 3] =
-        WEBRTC_SPL_MUL_16_U16(aecm->channelStored[i + 3], far_spectrum[i + 3]);
-  }
-  echo_est[i] = WEBRTC_SPL_MUL_16_U16(aecm->channelStored[i], far_spectrum[i]);
-}
-
-static void ResetAdaptiveChannelC(AecmCore* aecm) {
-  int i;
-
-  // The stored channel has a significantly lower MSE than the adaptive one for
-  // two consecutive calculations. Reset the adaptive channel.
-  memcpy(aecm->channelAdapt16, aecm->channelStored,
-         sizeof(int16_t) * PART_LEN1);
-  // Restore the W32 channel
-  for (i = 0; i < PART_LEN; i += 4) {
-    aecm->channelAdapt32[i] = (int32_t)aecm->channelStored[i] << 16;
-    aecm->channelAdapt32[i + 1] = (int32_t)aecm->channelStored[i + 1] << 16;
-    aecm->channelAdapt32[i + 2] = (int32_t)aecm->channelStored[i + 2] << 16;
-    aecm->channelAdapt32[i + 3] = (int32_t)aecm->channelStored[i + 3] << 16;
-  }
-  aecm->channelAdapt32[i] = (int32_t)aecm->channelStored[i] << 16;
-}
-
-// Initialize function pointers for ARM Neon platform.
-#if defined(WEBRTC_ARCH_ARM_FAMILY) && defined(WEBRTC_HAS_NEON)
-static void WebRtcAecm_InitNeon(void) {
-  WebRtcAecm_StoreAdaptiveChannel = WebRtcAecm_StoreAdaptiveChannelNeon;
-  WebRtcAecm_ResetAdaptiveChannel = WebRtcAecm_ResetAdaptiveChannelNeon;
-  WebRtcAecm_CalcLinearEnergies = WebRtcAecm_CalcLinearEnergiesNeon;
-}
-#endif
-
-// Initialize function pointers for MIPS platform.
-#if defined(MIPS32_LE)
-static void WebRtcAecm_InitMips(void) {
-#if defined(MIPS_DSP_R1_LE)
-  WebRtcAecm_StoreAdaptiveChannel = WebRtcAecm_StoreAdaptiveChannel_mips;
-  WebRtcAecm_ResetAdaptiveChannel = WebRtcAecm_ResetAdaptiveChannel_mips;
-#endif
-  WebRtcAecm_CalcLinearEnergies = WebRtcAecm_CalcLinearEnergies_mips;
-}
-#endif
-
-// WebRtcAecm_InitCore(...)
-//
-// This function initializes the AECM instant created with
-// WebRtcAecm_CreateCore(...) Input:
-//      - aecm            : Pointer to the Echo Suppression instance
-//      - samplingFreq   : Sampling Frequency
-//
-// Output:
-//      - aecm            : Initialized instance
-//
-// Return value         :  0 - Ok
-//                        -1 - Error
-//
-int WebRtcAecm_InitCore(AecmCore* const aecm, int samplingFreq) {
-  int i = 0;
-  int32_t tmp32 = PART_LEN1 * PART_LEN1;
-  int16_t tmp16 = PART_LEN1;
-
-  if (samplingFreq != 8000 && samplingFreq != 16000) {
-    samplingFreq = 8000;
-    return -1;
-  }
-  // sanity check of sampling frequency
-  aecm->mult = (int16_t)samplingFreq / 8000;
-
-  aecm->farBufWritePos = 0;
-  aecm->farBufReadPos = 0;
-  aecm->knownDelay = 0;
-  aecm->lastKnownDelay = 0;
-
-  WebRtc_InitBuffer(aecm->farFrameBuf);
-  WebRtc_InitBuffer(aecm->nearNoisyFrameBuf);
-  WebRtc_InitBuffer(aecm->nearCleanFrameBuf);
-  WebRtc_InitBuffer(aecm->outFrameBuf);
-
-  memset(aecm->xBuf_buf, 0, sizeof(aecm->xBuf_buf));
-  memset(aecm->dBufClean_buf, 0, sizeof(aecm->dBufClean_buf));
-  memset(aecm->dBufNoisy_buf, 0, sizeof(aecm->dBufNoisy_buf));
-  memset(aecm->outBuf_buf, 0, sizeof(aecm->outBuf_buf));
-
-  aecm->seed = 666;
-  aecm->totCount = 0;
-
-  if (WebRtc_InitDelayEstimatorFarend(aecm->delay_estimator_farend) != 0) {
-    return -1;
-  }
-  if (WebRtc_InitDelayEstimator(aecm->delay_estimator) != 0) {
-    return -1;
-  }
-  // Set far end histories to zero
-  memset(aecm->far_history, 0, sizeof(uint16_t) * PART_LEN1 * MAX_DELAY);
-  memset(aecm->far_q_domains, 0, sizeof(int) * MAX_DELAY);
-  aecm->far_history_pos = MAX_DELAY;
-
-  aecm->nlpFlag = 1;
-  aecm->fixedDelay = -1;
-
-  aecm->dfaCleanQDomain = 0;
-  aecm->dfaCleanQDomainOld = 0;
-  aecm->dfaNoisyQDomain = 0;
-  aecm->dfaNoisyQDomainOld = 0;
-
-  memset(aecm->nearLogEnergy, 0, sizeof(aecm->nearLogEnergy));
-  aecm->farLogEnergy = 0;
-  memset(aecm->echoAdaptLogEnergy, 0, sizeof(aecm->echoAdaptLogEnergy));
-  memset(aecm->echoStoredLogEnergy, 0, sizeof(aecm->echoStoredLogEnergy));
-
-  // Initialize the echo channels with a stored shape.
-  if (samplingFreq == 8000) {
-    WebRtcAecm_InitEchoPathCore(aecm, kChannelStored8kHz);
-  } else {
-    WebRtcAecm_InitEchoPathCore(aecm, kChannelStored16kHz);
-  }
-
-  memset(aecm->echoFilt, 0, sizeof(aecm->echoFilt));
-  memset(aecm->nearFilt, 0, sizeof(aecm->nearFilt));
-  aecm->noiseEstCtr = 0;
-
-  aecm->cngMode = AecmTrue;
-
-  memset(aecm->noiseEstTooLowCtr, 0, sizeof(aecm->noiseEstTooLowCtr));
-  memset(aecm->noiseEstTooHighCtr, 0, sizeof(aecm->noiseEstTooHighCtr));
-  // Shape the initial noise level to an approximate pink noise.
-  for (i = 0; i < (PART_LEN1 >> 1) - 1; i++) {
-    aecm->noiseEst[i] = (tmp32 << 8);
-    tmp16--;
-    tmp32 -= (int32_t)((tmp16 << 1) + 1);
-  }
-  for (; i < PART_LEN1; i++) {
-    aecm->noiseEst[i] = (tmp32 << 8);
-  }
-
-  aecm->farEnergyMin = WEBRTC_SPL_WORD16_MAX;
-  aecm->farEnergyMax = WEBRTC_SPL_WORD16_MIN;
-  aecm->farEnergyMaxMin = 0;
-  aecm->farEnergyVAD =
-      FAR_ENERGY_MIN;  // This prevents false speech detection at the
-                       // beginning.
-  aecm->farEnergyMSE = 0;
-  aecm->currentVADValue = 0;
-  aecm->vadUpdateCount = 0;
-  aecm->firstVAD = 1;
-
-  aecm->startupState = 0;
-  aecm->supGain = SUPGAIN_DEFAULT;
-  aecm->supGainOld = SUPGAIN_DEFAULT;
-
-  aecm->supGainErrParamA = SUPGAIN_ERROR_PARAM_A;
-  aecm->supGainErrParamD = SUPGAIN_ERROR_PARAM_D;
-  aecm->supGainErrParamDiffAB = SUPGAIN_ERROR_PARAM_A - SUPGAIN_ERROR_PARAM_B;
-  aecm->supGainErrParamDiffBD = SUPGAIN_ERROR_PARAM_B - SUPGAIN_ERROR_PARAM_D;
-
-  // Assert a preprocessor definition at compile-time. It's an assumption
-  // used in assembly code, so check the assembly files before any change.
-  static_assert(PART_LEN % 16 == 0, "PART_LEN is not a multiple of 16");
-
-  // Initialize function pointers.
-  WebRtcAecm_CalcLinearEnergies = CalcLinearEnergiesC;
-  WebRtcAecm_StoreAdaptiveChannel = StoreAdaptiveChannelC;
-  WebRtcAecm_ResetAdaptiveChannel = ResetAdaptiveChannelC;
-
-#if defined(WEBRTC_ARCH_ARM_FAMILY) && defined(WEBRTC_HAS_NEON)
-  WebRtcAecm_InitNeon();
-#endif
-
-#if defined(MIPS32_LE)
-  WebRtcAecm_InitMips();
-#endif
-  return 0;
-}
-
-// TODO(bjornv): This function is currently not used. Add support for these
-// parameters from a higher level
-int WebRtcAecm_Control(AecmCore* aecm, int delay, int nlpFlag) {
-  aecm->nlpFlag = nlpFlag;
-  aecm->fixedDelay = delay;
-
-  return 0;
-}
-
-void WebRtcAecm_FreeCore(AecmCore* aecm) {
-  if (aecm == NULL) {
-    return;
-  }
-
-  WebRtc_FreeBuffer(aecm->farFrameBuf);
-  WebRtc_FreeBuffer(aecm->nearNoisyFrameBuf);
-  WebRtc_FreeBuffer(aecm->nearCleanFrameBuf);
-  WebRtc_FreeBuffer(aecm->outFrameBuf);
-
-  WebRtc_FreeDelayEstimator(aecm->delay_estimator);
-  WebRtc_FreeDelayEstimatorFarend(aecm->delay_estimator_farend);
-  WebRtcSpl_FreeRealFFT(aecm->real_fft);
-
-  free(aecm);
-}
-
-int WebRtcAecm_ProcessFrame(AecmCore* aecm,
-                            const int16_t* farend,
-                            const int16_t* nearendNoisy,
-                            const int16_t* nearendClean,
-                            int16_t* out) {
-  int16_t outBlock_buf[PART_LEN + 8];  // Align buffer to 8-byte boundary.
-  int16_t* outBlock = (int16_t*)(((uintptr_t)outBlock_buf + 15) & ~15);
-
-  int16_t farFrame[FRAME_LEN];
-  const int16_t* out_ptr = NULL;
-  int size = 0;
-
-  // Buffer the current frame.
-  // Fetch an older one corresponding to the delay.
-  WebRtcAecm_BufferFarFrame(aecm, farend, FRAME_LEN);
-  WebRtcAecm_FetchFarFrame(aecm, farFrame, FRAME_LEN, aecm->knownDelay);
-
-  // Buffer the synchronized far and near frames,
-  // to pass the smaller blocks individually.
-  WebRtc_WriteBuffer(aecm->farFrameBuf, farFrame, FRAME_LEN);
-  WebRtc_WriteBuffer(aecm->nearNoisyFrameBuf, nearendNoisy, FRAME_LEN);
-  if (nearendClean != NULL) {
-    WebRtc_WriteBuffer(aecm->nearCleanFrameBuf, nearendClean, FRAME_LEN);
-  }
-
-  // Process as many blocks as possible.
-  while (WebRtc_available_read(aecm->farFrameBuf) >= PART_LEN) {
-    int16_t far_block[PART_LEN];
-    const int16_t* far_block_ptr = NULL;
-    int16_t near_noisy_block[PART_LEN];
-    const int16_t* near_noisy_block_ptr = NULL;
-
-    WebRtc_ReadBuffer(aecm->farFrameBuf, (void**)&far_block_ptr, far_block,
-                      PART_LEN);
-    WebRtc_ReadBuffer(aecm->nearNoisyFrameBuf, (void**)&near_noisy_block_ptr,
-                      near_noisy_block, PART_LEN);
-    if (nearendClean != NULL) {
-      int16_t near_clean_block[PART_LEN];
-      const int16_t* near_clean_block_ptr = NULL;
-
-      WebRtc_ReadBuffer(aecm->nearCleanFrameBuf, (void**)&near_clean_block_ptr,
-                        near_clean_block, PART_LEN);
-      if (WebRtcAecm_ProcessBlock(aecm, far_block_ptr, near_noisy_block_ptr,
-                                  near_clean_block_ptr, outBlock) == -1) {
-        return -1;
-      }
-    } else {
-      if (WebRtcAecm_ProcessBlock(aecm, far_block_ptr, near_noisy_block_ptr,
-                                  NULL, outBlock) == -1) {
-        return -1;
-      }
-    }
-
-    WebRtc_WriteBuffer(aecm->outFrameBuf, outBlock, PART_LEN);
-  }
-
-  // Stuff the out buffer if we have less than a frame to output.
-  // This should only happen for the first frame.
-  size = (int)WebRtc_available_read(aecm->outFrameBuf);
-  if (size < FRAME_LEN) {
-    WebRtc_MoveReadPtr(aecm->outFrameBuf, size - FRAME_LEN);
-  }
-
-  // Obtain an output frame.
-  WebRtc_ReadBuffer(aecm->outFrameBuf, (void**)&out_ptr, out, FRAME_LEN);
-  if (out_ptr != out) {
-    // ReadBuffer() hasn't copied to |out| in this case.
-    memcpy(out, out_ptr, FRAME_LEN * sizeof(int16_t));
-  }
-
-  return 0;
-}
-
-// WebRtcAecm_AsymFilt(...)
-//
-// Performs asymmetric filtering.
-//
-// Inputs:
-//      - filtOld       : Previous filtered value.
-//      - inVal         : New input value.
-//      - stepSizePos   : Step size when we have a positive contribution.
-//      - stepSizeNeg   : Step size when we have a negative contribution.
-//
-// Output:
-//
-// Return: - Filtered value.
-//
-int16_t WebRtcAecm_AsymFilt(const int16_t filtOld,
-                            const int16_t inVal,
-                            const int16_t stepSizePos,
-                            const int16_t stepSizeNeg) {
-  int16_t retVal;
-
-  if ((filtOld == WEBRTC_SPL_WORD16_MAX) | (filtOld == WEBRTC_SPL_WORD16_MIN)) {
-    return inVal;
-  }
-  retVal = filtOld;
-  if (filtOld > inVal) {
-    retVal -= (filtOld - inVal) >> stepSizeNeg;
-  } else {
-    retVal += (inVal - filtOld) >> stepSizePos;
-  }
-
-  return retVal;
-}
-
-// ExtractFractionPart(a, zeros)
-//
-// returns the fraction part of |a|, with |zeros| number of leading zeros, as an
-// int16_t scaled to Q8. There is no sanity check of |a| in the sense that the
-// number of zeros match.
-static int16_t ExtractFractionPart(uint32_t a, int zeros) {
-  return (int16_t)(((a << zeros) & 0x7FFFFFFF) >> 23);
-}
-
-// Calculates and returns the log of |energy| in Q8. The input |energy| is
-// supposed to be in Q(|q_domain|).
-static int16_t LogOfEnergyInQ8(uint32_t energy, int q_domain) {
-  static const int16_t kLogLowValue = PART_LEN_SHIFT << 7;
-  int16_t log_energy_q8 = kLogLowValue;
-  if (energy > 0) {
-    int zeros = WebRtcSpl_NormU32(energy);
-    int16_t frac = ExtractFractionPart(energy, zeros);
-    // log2 of |energy| in Q8.
-    log_energy_q8 += ((31 - zeros) << 8) + frac - (q_domain << 8);
-  }
-  return log_energy_q8;
-}
-
-// WebRtcAecm_CalcEnergies(...)
-//
-// This function calculates the log of energies for nearend, farend and
-// estimated echoes. There is also an update of energy decision levels, i.e.
-// internal VAD.
-//
-//
-// @param  aecm         [i/o]   Handle of the AECM instance.
-// @param  far_spectrum [in]    Pointer to farend spectrum.
-// @param  far_q        [in]    Q-domain of farend spectrum.
-// @param  nearEner     [in]    Near end energy for current block in
-//                              Q(aecm->dfaQDomain).
-// @param  echoEst      [out]   Estimated echo in Q(xfa_q+RESOLUTION_CHANNEL16).
-//
-void WebRtcAecm_CalcEnergies(AecmCore* aecm,
-                             const uint16_t* far_spectrum,
-                             const int16_t far_q,
-                             const uint32_t nearEner,
-                             int32_t* echoEst) {
-  // Local variables
-  uint32_t tmpAdapt = 0;
-  uint32_t tmpStored = 0;
-  uint32_t tmpFar = 0;
-
-  int i;
-
-  int16_t tmp16;
-  int16_t increase_max_shifts = 4;
-  int16_t decrease_max_shifts = 11;
-  int16_t increase_min_shifts = 11;
-  int16_t decrease_min_shifts = 3;
-
-  // Get log of near end energy and store in buffer
-
-  // Shift buffer
-  memmove(aecm->nearLogEnergy + 1, aecm->nearLogEnergy,
-          sizeof(int16_t) * (MAX_BUF_LEN - 1));
-
-  // Logarithm of integrated magnitude spectrum (nearEner)
-  aecm->nearLogEnergy[0] = LogOfEnergyInQ8(nearEner, aecm->dfaNoisyQDomain);
-
-  WebRtcAecm_CalcLinearEnergies(aecm, far_spectrum, echoEst, &tmpFar, &tmpAdapt,
-                                &tmpStored);
-
-  // Shift buffers
-  memmove(aecm->echoAdaptLogEnergy + 1, aecm->echoAdaptLogEnergy,
-          sizeof(int16_t) * (MAX_BUF_LEN - 1));
-  memmove(aecm->echoStoredLogEnergy + 1, aecm->echoStoredLogEnergy,
-          sizeof(int16_t) * (MAX_BUF_LEN - 1));
-
-  // Logarithm of delayed far end energy
-  aecm->farLogEnergy = LogOfEnergyInQ8(tmpFar, far_q);
-
-  // Logarithm of estimated echo energy through adapted channel
-  aecm->echoAdaptLogEnergy[0] =
-      LogOfEnergyInQ8(tmpAdapt, RESOLUTION_CHANNEL16 + far_q);
-
-  // Logarithm of estimated echo energy through stored channel
-  aecm->echoStoredLogEnergy[0] =
-      LogOfEnergyInQ8(tmpStored, RESOLUTION_CHANNEL16 + far_q);
-
-  // Update farend energy levels (min, max, vad, mse)
-  if (aecm->farLogEnergy > FAR_ENERGY_MIN) {
-    if (aecm->startupState == 0) {
-      increase_max_shifts = 2;
-      decrease_min_shifts = 2;
-      increase_min_shifts = 8;
-    }
-
-    aecm->farEnergyMin =
-        WebRtcAecm_AsymFilt(aecm->farEnergyMin, aecm->farLogEnergy,
-                            increase_min_shifts, decrease_min_shifts);
-    aecm->farEnergyMax =
-        WebRtcAecm_AsymFilt(aecm->farEnergyMax, aecm->farLogEnergy,
-                            increase_max_shifts, decrease_max_shifts);
-    aecm->farEnergyMaxMin = (aecm->farEnergyMax - aecm->farEnergyMin);
-
-    // Dynamic VAD region size
-    tmp16 = 2560 - aecm->farEnergyMin;
-    if (tmp16 > 0) {
-      tmp16 = (int16_t)((tmp16 * FAR_ENERGY_VAD_REGION) >> 9);
-    } else {
-      tmp16 = 0;
-    }
-    tmp16 += FAR_ENERGY_VAD_REGION;
-
-    if ((aecm->startupState == 0) | (aecm->vadUpdateCount > 1024)) {
-      // In startup phase or VAD update halted
-      aecm->farEnergyVAD = aecm->farEnergyMin + tmp16;
-    } else {
-      if (aecm->farEnergyVAD > aecm->farLogEnergy) {
-        aecm->farEnergyVAD +=
-            (aecm->farLogEnergy + tmp16 - aecm->farEnergyVAD) >> 6;
-        aecm->vadUpdateCount = 0;
-      } else {
-        aecm->vadUpdateCount++;
-      }
-    }
-    // Put MSE threshold higher than VAD
-    aecm->farEnergyMSE = aecm->farEnergyVAD + (1 << 8);
-  }
-
-  // Update VAD variables
-  if (aecm->farLogEnergy > aecm->farEnergyVAD) {
-    if ((aecm->startupState == 0) | (aecm->farEnergyMaxMin > FAR_ENERGY_DIFF)) {
-      // We are in startup or have significant dynamics in input speech level
-      aecm->currentVADValue = 1;
-    }
-  } else {
-    aecm->currentVADValue = 0;
-  }
-  if ((aecm->currentVADValue) && (aecm->firstVAD)) {
-    aecm->firstVAD = 0;
-    if (aecm->echoAdaptLogEnergy[0] > aecm->nearLogEnergy[0]) {
-      // The estimated echo has higher energy than the near end signal.
-      // This means that the initialization was too aggressive. Scale
-      // down by a factor 8
-      for (i = 0; i < PART_LEN1; i++) {
-        aecm->channelAdapt16[i] >>= 3;
-      }
-      // Compensate the adapted echo energy level accordingly.
-      aecm->echoAdaptLogEnergy[0] -= (3 << 8);
-      aecm->firstVAD = 1;
-    }
-  }
-}
-
-// WebRtcAecm_CalcStepSize(...)
-//
-// This function calculates the step size used in channel estimation
-//
-//
-// @param  aecm  [in]    Handle of the AECM instance.
-// @param  mu    [out]   (Return value) Stepsize in log2(), i.e. number of
-// shifts.
-//
-//
-int16_t WebRtcAecm_CalcStepSize(AecmCore* const aecm) {
-  int32_t tmp32;
-  int16_t tmp16;
-  int16_t mu = MU_MAX;
-
-  // Here we calculate the step size mu used in the
-  // following NLMS based Channel estimation algorithm
-  if (!aecm->currentVADValue) {
-    // Far end energy level too low, no channel update
-    mu = 0;
-  } else if (aecm->startupState > 0) {
-    if (aecm->farEnergyMin >= aecm->farEnergyMax) {
-      mu = MU_MIN;
-    } else {
-      tmp16 = (aecm->farLogEnergy - aecm->farEnergyMin);
-      tmp32 = tmp16 * MU_DIFF;
-      tmp32 = WebRtcSpl_DivW32W16(tmp32, aecm->farEnergyMaxMin);
-      mu = MU_MIN - 1 - (int16_t)(tmp32);
-      // The -1 is an alternative to rounding. This way we get a larger
-      // stepsize, so we in some sense compensate for truncation in NLMS
-    }
-    if (mu < MU_MAX) {
-      mu = MU_MAX;  // Equivalent with maximum step size of 2^-MU_MAX
-    }
-  }
-
-  return mu;
-}
-
-// WebRtcAecm_UpdateChannel(...)
-//
-// This function performs channel estimation. NLMS and decision on channel
-// storage.
-//
-//
-// @param  aecm         [i/o]   Handle of the AECM instance.
-// @param  far_spectrum [in]    Absolute value of the farend signal in Q(far_q)
-// @param  far_q        [in]    Q-domain of the farend signal
-// @param  dfa          [in]    Absolute value of the nearend signal
-// (Q[aecm->dfaQDomain])
-// @param  mu           [in]    NLMS step size.
-// @param  echoEst      [i/o]   Estimated echo in Q(far_q+RESOLUTION_CHANNEL16).
-//
-void WebRtcAecm_UpdateChannel(AecmCore* aecm,
-                              const uint16_t* far_spectrum,
-                              const int16_t far_q,
-                              const uint16_t* const dfa,
-                              const int16_t mu,
-                              int32_t* echoEst) {
-  uint32_t tmpU32no1, tmpU32no2;
-  int32_t tmp32no1, tmp32no2;
-  int32_t mseStored;
-  int32_t mseAdapt;
-
-  int i;
-
-  int16_t zerosFar, zerosNum, zerosCh, zerosDfa;
-  int16_t shiftChFar, shiftNum, shift2ResChan;
-  int16_t tmp16no1;
-  int16_t xfaQ, dfaQ;
-
-  // This is the channel estimation algorithm. It is base on NLMS but has a
-  // variable step length, which was calculated above.
-  if (mu) {
-    for (i = 0; i < PART_LEN1; i++) {
-      // Determine norm of channel and farend to make sure we don't get overflow
-      // in multiplication
-      zerosCh = WebRtcSpl_NormU32(aecm->channelAdapt32[i]);
-      zerosFar = WebRtcSpl_NormU32((uint32_t)far_spectrum[i]);
-      if (zerosCh + zerosFar > 31) {
-        // Multiplication is safe
-        tmpU32no1 =
-            WEBRTC_SPL_UMUL_32_16(aecm->channelAdapt32[i], far_spectrum[i]);
-        shiftChFar = 0;
-      } else {
-        // We need to shift down before multiplication
-        shiftChFar = 32 - zerosCh - zerosFar;
-        // If zerosCh == zerosFar == 0, shiftChFar is 32. A
-        // right shift of 32 is undefined. To avoid that, we
-        // do this check.
-        tmpU32no1 =
-            rtc::dchecked_cast<uint32_t>(
-                shiftChFar >= 32 ? 0 : aecm->channelAdapt32[i] >> shiftChFar) *
-            far_spectrum[i];
-      }
-      // Determine Q-domain of numerator
-      zerosNum = WebRtcSpl_NormU32(tmpU32no1);
-      if (dfa[i]) {
-        zerosDfa = WebRtcSpl_NormU32((uint32_t)dfa[i]);
-      } else {
-        zerosDfa = 32;
-      }
-      tmp16no1 = zerosDfa - 2 + aecm->dfaNoisyQDomain - RESOLUTION_CHANNEL32 -
-                 far_q + shiftChFar;
-      if (zerosNum > tmp16no1 + 1) {
-        xfaQ = tmp16no1;
-        dfaQ = zerosDfa - 2;
-      } else {
-        xfaQ = zerosNum - 2;
-        dfaQ = RESOLUTION_CHANNEL32 + far_q - aecm->dfaNoisyQDomain -
-               shiftChFar + xfaQ;
-      }
-      // Add in the same Q-domain
-      tmpU32no1 = WEBRTC_SPL_SHIFT_W32(tmpU32no1, xfaQ);
-      tmpU32no2 = WEBRTC_SPL_SHIFT_W32((uint32_t)dfa[i], dfaQ);
-      tmp32no1 = (int32_t)tmpU32no2 - (int32_t)tmpU32no1;
-      zerosNum = WebRtcSpl_NormW32(tmp32no1);
-      if ((tmp32no1) && (far_spectrum[i] > (CHANNEL_VAD << far_q))) {
-        //
-        // Update is needed
-        //
-        // This is what we would like to compute
-        //
-        // tmp32no1 = dfa[i] - (aecm->channelAdapt[i] * far_spectrum[i])
-        // tmp32norm = (i + 1)
-        // aecm->channelAdapt[i] += (2^mu) * tmp32no1
-        //                        / (tmp32norm * far_spectrum[i])
-        //
-
-        // Make sure we don't get overflow in multiplication.
-        if (zerosNum + zerosFar > 31) {
-          if (tmp32no1 > 0) {
-            tmp32no2 =
-                (int32_t)WEBRTC_SPL_UMUL_32_16(tmp32no1, far_spectrum[i]);
-          } else {
-            tmp32no2 =
-                -(int32_t)WEBRTC_SPL_UMUL_32_16(-tmp32no1, far_spectrum[i]);
-          }
-          shiftNum = 0;
-        } else {
-          shiftNum = 32 - (zerosNum + zerosFar);
-          if (tmp32no1 > 0) {
-            tmp32no2 = (tmp32no1 >> shiftNum) * far_spectrum[i];
-          } else {
-            tmp32no2 = -((-tmp32no1 >> shiftNum) * far_spectrum[i]);
-          }
-        }
-        // Normalize with respect to frequency bin
-        tmp32no2 = WebRtcSpl_DivW32W16(tmp32no2, i + 1);
-        // Make sure we are in the right Q-domain
-        shift2ResChan =
-            shiftNum + shiftChFar - xfaQ - mu - ((30 - zerosFar) << 1);
-        if (WebRtcSpl_NormW32(tmp32no2) < shift2ResChan) {
-          tmp32no2 = WEBRTC_SPL_WORD32_MAX;
-        } else {
-          tmp32no2 = WEBRTC_SPL_SHIFT_W32(tmp32no2, shift2ResChan);
-        }
-        aecm->channelAdapt32[i] =
-            WebRtcSpl_AddSatW32(aecm->channelAdapt32[i], tmp32no2);
-        if (aecm->channelAdapt32[i] < 0) {
-          // We can never have negative channel gain
-          aecm->channelAdapt32[i] = 0;
-        }
-        aecm->channelAdapt16[i] = (int16_t)(aecm->channelAdapt32[i] >> 16);
-      }
-    }
-  }
-  // END: Adaptive channel update
-
-  // Determine if we should store or restore the channel
-  if ((aecm->startupState == 0) & (aecm->currentVADValue)) {
-    // During startup we store the channel every block,
-    // and we recalculate echo estimate
-    WebRtcAecm_StoreAdaptiveChannel(aecm, far_spectrum, echoEst);
-  } else {
-    if (aecm->farLogEnergy < aecm->farEnergyMSE) {
-      aecm->mseChannelCount = 0;
-    } else {
-      aecm->mseChannelCount++;
-    }
-    // Enough data for validation. Store channel if we can.
-    if (aecm->mseChannelCount >= (MIN_MSE_COUNT + 10)) {
-      // We have enough data.
-      // Calculate MSE of "Adapt" and "Stored" versions.
-      // It is actually not MSE, but average absolute error.
-      mseStored = 0;
-      mseAdapt = 0;
-      for (i = 0; i < MIN_MSE_COUNT; i++) {
-        tmp32no1 = ((int32_t)aecm->echoStoredLogEnergy[i] -
-                    (int32_t)aecm->nearLogEnergy[i]);
-        tmp32no2 = WEBRTC_SPL_ABS_W32(tmp32no1);
-        mseStored += tmp32no2;
-
-        tmp32no1 = ((int32_t)aecm->echoAdaptLogEnergy[i] -
-                    (int32_t)aecm->nearLogEnergy[i]);
-        tmp32no2 = WEBRTC_SPL_ABS_W32(tmp32no1);
-        mseAdapt += tmp32no2;
-      }
-      if (((mseStored << MSE_RESOLUTION) < (MIN_MSE_DIFF * mseAdapt)) &
-          ((aecm->mseStoredOld << MSE_RESOLUTION) <
-           (MIN_MSE_DIFF * aecm->mseAdaptOld))) {
-        // The stored channel has a significantly lower MSE than the adaptive
-        // one for two consecutive calculations. Reset the adaptive channel.
-        WebRtcAecm_ResetAdaptiveChannel(aecm);
-      } else if (((MIN_MSE_DIFF * mseStored) > (mseAdapt << MSE_RESOLUTION)) &
-                 (mseAdapt < aecm->mseThreshold) &
-                 (aecm->mseAdaptOld < aecm->mseThreshold)) {
-        // The adaptive channel has a significantly lower MSE than the stored
-        // one. The MSE for the adaptive channel has also been low for two
-        // consecutive calculations. Store the adaptive channel.
-        WebRtcAecm_StoreAdaptiveChannel(aecm, far_spectrum, echoEst);
-
-        // Update threshold
-        if (aecm->mseThreshold == WEBRTC_SPL_WORD32_MAX) {
-          aecm->mseThreshold = (mseAdapt + aecm->mseAdaptOld);
-        } else {
-          int scaled_threshold = aecm->mseThreshold * 5 / 8;
-          aecm->mseThreshold += ((mseAdapt - scaled_threshold) * 205) >> 8;
-        }
-      }
-
-      // Reset counter
-      aecm->mseChannelCount = 0;
-
-      // Store the MSE values.
-      aecm->mseStoredOld = mseStored;
-      aecm->mseAdaptOld = mseAdapt;
-    }
-  }
-  // END: Determine if we should store or reset channel estimate.
-}
-
-// CalcSuppressionGain(...)
-//
-// This function calculates the suppression gain that is used in the Wiener
-// filter.
-//
-//
-// @param  aecm     [i/n]   Handle of the AECM instance.
-// @param  supGain  [out]   (Return value) Suppression gain with which to scale
-// the noise
-//                          level (Q14).
-//
-//
-int16_t WebRtcAecm_CalcSuppressionGain(AecmCore* const aecm) {
-  int32_t tmp32no1;
-
-  int16_t supGain = SUPGAIN_DEFAULT;
-  int16_t tmp16no1;
-  int16_t dE = 0;
-
-  // Determine suppression gain used in the Wiener filter. The gain is based on
-  // a mix of far end energy and echo estimation error. Adjust for the far end
-  // signal level. A low signal level indicates no far end signal, hence we set
-  // the suppression gain to 0
-  if (!aecm->currentVADValue) {
-    supGain = 0;
-  } else {
-    // Adjust for possible double talk. If we have large variations in
-    // estimation error we likely have double talk (or poor channel).
-    tmp16no1 = (aecm->nearLogEnergy[0] - aecm->echoStoredLogEnergy[0] -
-                ENERGY_DEV_OFFSET);
-    dE = WEBRTC_SPL_ABS_W16(tmp16no1);
-
-    if (dE < ENERGY_DEV_TOL) {
-      // Likely no double talk. The better estimation, the more we can suppress
-      // signal. Update counters
-      if (dE < SUPGAIN_EPC_DT) {
-        tmp32no1 = aecm->supGainErrParamDiffAB * dE;
-        tmp32no1 += (SUPGAIN_EPC_DT >> 1);
-        tmp16no1 = (int16_t)WebRtcSpl_DivW32W16(tmp32no1, SUPGAIN_EPC_DT);
-        supGain = aecm->supGainErrParamA - tmp16no1;
-      } else {
-        tmp32no1 = aecm->supGainErrParamDiffBD * (ENERGY_DEV_TOL - dE);
-        tmp32no1 += ((ENERGY_DEV_TOL - SUPGAIN_EPC_DT) >> 1);
-        tmp16no1 = (int16_t)WebRtcSpl_DivW32W16(
-            tmp32no1, (ENERGY_DEV_TOL - SUPGAIN_EPC_DT));
-        supGain = aecm->supGainErrParamD + tmp16no1;
-      }
-    } else {
-      // Likely in double talk. Use default value
-      supGain = aecm->supGainErrParamD;
-    }
-  }
-
-  if (supGain > aecm->supGainOld) {
-    tmp16no1 = supGain;
-  } else {
-    tmp16no1 = aecm->supGainOld;
-  }
-  aecm->supGainOld = supGain;
-  if (tmp16no1 < aecm->supGain) {
-    aecm->supGain += (int16_t)((tmp16no1 - aecm->supGain) >> 4);
-  } else {
-    aecm->supGain += (int16_t)((tmp16no1 - aecm->supGain) >> 4);
-  }
-
-  // END: Update suppression gain
-
-  return aecm->supGain;
-}
-
-void WebRtcAecm_BufferFarFrame(AecmCore* const aecm,
-                               const int16_t* const farend,
-                               const int farLen) {
-  int writeLen = farLen, writePos = 0;
-
-  // Check if the write position must be wrapped
-  while (aecm->farBufWritePos + writeLen > FAR_BUF_LEN) {
-    // Write to remaining buffer space before wrapping
-    writeLen = FAR_BUF_LEN - aecm->farBufWritePos;
-    memcpy(aecm->farBuf + aecm->farBufWritePos, farend + writePos,
-           sizeof(int16_t) * writeLen);
-    aecm->farBufWritePos = 0;
-    writePos = writeLen;
-    writeLen = farLen - writeLen;
-  }
-
-  memcpy(aecm->farBuf + aecm->farBufWritePos, farend + writePos,
-         sizeof(int16_t) * writeLen);
-  aecm->farBufWritePos += writeLen;
-}
-
-void WebRtcAecm_FetchFarFrame(AecmCore* const aecm,
-                              int16_t* const farend,
-                              const int farLen,
-                              const int knownDelay) {
-  int readLen = farLen;
-  int readPos = 0;
-  int delayChange = knownDelay - aecm->lastKnownDelay;
-
-  aecm->farBufReadPos -= delayChange;
-
-  // Check if delay forces a read position wrap
-  while (aecm->farBufReadPos < 0) {
-    aecm->farBufReadPos += FAR_BUF_LEN;
-  }
-  while (aecm->farBufReadPos > FAR_BUF_LEN - 1) {
-    aecm->farBufReadPos -= FAR_BUF_LEN;
-  }
-
-  aecm->lastKnownDelay = knownDelay;
-
-  // Check if read position must be wrapped
-  while (aecm->farBufReadPos + readLen > FAR_BUF_LEN) {
-    // Read from remaining buffer space before wrapping
-    readLen = FAR_BUF_LEN - aecm->farBufReadPos;
-    memcpy(farend + readPos, aecm->farBuf + aecm->farBufReadPos,
-           sizeof(int16_t) * readLen);
-    aecm->farBufReadPos = 0;
-    readPos = readLen;
-    readLen = farLen - readLen;
-  }
-  memcpy(farend + readPos, aecm->farBuf + aecm->farBufReadPos,
-         sizeof(int16_t) * readLen);
-  aecm->farBufReadPos += readLen;
-}
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aecm/aecm_core.h b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aecm/aecm_core.h
deleted file mode 100644
index 1681d2a92f..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aecm/aecm_core.h
+++ /dev/null
@@ -1,435 +0,0 @@
-/*
- *  Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-// Performs echo control (suppression) with fft routines in fixed-point.
-
-#ifndef MODULES_AUDIO_PROCESSING_AECM_AECM_CORE_H_
-#define MODULES_AUDIO_PROCESSING_AECM_AECM_CORE_H_
-
-extern "C" {
-#include "common_audio/ring_buffer.h"
-#include "common_audio/signal_processing/include/signal_processing_library.h"
-}
-#include "modules/audio_processing/aecm/aecm_defines.h"
-
-#ifdef _MSC_VER  // visual c++
-#define ALIGN8_BEG __declspec(align(8))
-#define ALIGN8_END
-#else  // gcc or icc
-#define ALIGN8_BEG
-#define ALIGN8_END __attribute__((aligned(8)))
-#endif
-
-typedef struct {
-  int16_t real;
-  int16_t imag;
-} ComplexInt16;
-
-typedef struct {
-  int farBufWritePos;
-  int farBufReadPos;
-  int knownDelay;
-  int lastKnownDelay;
-  int firstVAD;  // Parameter to control poorly initialized channels
-
-  RingBuffer* farFrameBuf;
-  RingBuffer* nearNoisyFrameBuf;
-  RingBuffer* nearCleanFrameBuf;
-  RingBuffer* outFrameBuf;
-
-  int16_t farBuf[FAR_BUF_LEN];
-
-  int16_t mult;
-  uint32_t seed;
-
-  // Delay estimation variables
-  void* delay_estimator_farend;
-  void* delay_estimator;
-  uint16_t currentDelay;
-  // Far end history variables
-  // TODO(bjornv): Replace |far_history| with ring_buffer.
-  uint16_t far_history[PART_LEN1 * MAX_DELAY];
-  int far_history_pos;
-  int far_q_domains[MAX_DELAY];
-
-  int16_t nlpFlag;
-  int16_t fixedDelay;
-
-  uint32_t totCount;
-
-  int16_t dfaCleanQDomain;
-  int16_t dfaCleanQDomainOld;
-  int16_t dfaNoisyQDomain;
-  int16_t dfaNoisyQDomainOld;
-
-  int16_t nearLogEnergy[MAX_BUF_LEN];
-  int16_t farLogEnergy;
-  int16_t echoAdaptLogEnergy[MAX_BUF_LEN];
-  int16_t echoStoredLogEnergy[MAX_BUF_LEN];
-
-  // The extra 16 or 32 bytes in the following buffers are for alignment based
-  // Neon code.
-  // It's designed this way since the current GCC compiler can't align a
-  // buffer in 16 or 32 byte boundaries properly.
-  int16_t channelStored_buf[PART_LEN1 + 8];
-  int16_t channelAdapt16_buf[PART_LEN1 + 8];
-  int32_t channelAdapt32_buf[PART_LEN1 + 8];
-  int16_t xBuf_buf[PART_LEN2 + 16];       // farend
-  int16_t dBufClean_buf[PART_LEN2 + 16];  // nearend
-  int16_t dBufNoisy_buf[PART_LEN2 + 16];  // nearend
-  int16_t outBuf_buf[PART_LEN + 8];
-
-  // Pointers to the above buffers
-  int16_t* channelStored;
-  int16_t* channelAdapt16;
-  int32_t* channelAdapt32;
-  int16_t* xBuf;
-  int16_t* dBufClean;
-  int16_t* dBufNoisy;
-  int16_t* outBuf;
-
-  int32_t echoFilt[PART_LEN1];
-  int16_t nearFilt[PART_LEN1];
-  int32_t noiseEst[PART_LEN1];
-  int noiseEstTooLowCtr[PART_LEN1];
-  int noiseEstTooHighCtr[PART_LEN1];
-  int16_t noiseEstCtr;
-  int16_t cngMode;
-
-  int32_t mseAdaptOld;
-  int32_t mseStoredOld;
-  int32_t mseThreshold;
-
-  int16_t farEnergyMin;
-  int16_t farEnergyMax;
-  int16_t farEnergyMaxMin;
-  int16_t farEnergyVAD;
-  int16_t farEnergyMSE;
-  int currentVADValue;
-  int16_t vadUpdateCount;
-
-  int16_t startupState;
-  int16_t mseChannelCount;
-  int16_t supGain;
-  int16_t supGainOld;
-
-  int16_t supGainErrParamA;
-  int16_t supGainErrParamD;
-  int16_t supGainErrParamDiffAB;
-  int16_t supGainErrParamDiffBD;
-
-  struct RealFFT* real_fft;
-
-#ifdef AEC_DEBUG
-  FILE* farFile;
-  FILE* nearFile;
-  FILE* outFile;
-#endif
-} AecmCore;
-
-////////////////////////////////////////////////////////////////////////////////
-// WebRtcAecm_CreateCore()
-//
-// Allocates the memory needed by the AECM. The memory needs to be
-// initialized separately using the WebRtcAecm_InitCore() function.
-// Returns a pointer to the instance and a nullptr at failure.
-AecmCore* WebRtcAecm_CreateCore();
-
-////////////////////////////////////////////////////////////////////////////////
-// WebRtcAecm_InitCore(...)
-//
-// This function initializes the AECM instant created with
-// WebRtcAecm_CreateCore()
-// Input:
-//      - aecm          : Pointer to the AECM instance
-//      - samplingFreq  : Sampling Frequency
-//
-// Output:
-//      - aecm          : Initialized instance
-//
-// Return value         :  0 - Ok
-//                        -1 - Error
-//
-int WebRtcAecm_InitCore(AecmCore* const aecm, int samplingFreq);
-
-////////////////////////////////////////////////////////////////////////////////
-// WebRtcAecm_FreeCore(...)
-//
-// This function releases the memory allocated by WebRtcAecm_CreateCore()
-// Input:
-//      - aecm          : Pointer to the AECM instance
-//
-void WebRtcAecm_FreeCore(AecmCore* aecm);
-
-int WebRtcAecm_Control(AecmCore* aecm, int delay, int nlpFlag);
-
-////////////////////////////////////////////////////////////////////////////////
-// WebRtcAecm_InitEchoPathCore(...)
-//
-// This function resets the echo channel adaptation with the specified channel.
-// Input:
-//      - aecm          : Pointer to the AECM instance
-//      - echo_path     : Pointer to the data that should initialize the echo
-//                        path
-//
-// Output:
-//      - aecm          : Initialized instance
-//
-void WebRtcAecm_InitEchoPathCore(AecmCore* aecm, const int16_t* echo_path);
-
-////////////////////////////////////////////////////////////////////////////////
-// WebRtcAecm_ProcessFrame(...)
-//
-// This function processes frames and sends blocks to
-// WebRtcAecm_ProcessBlock(...)
-//
-// Inputs:
-//      - aecm          : Pointer to the AECM instance
-//      - farend        : In buffer containing one frame of echo signal
-//      - nearendNoisy  : In buffer containing one frame of nearend+echo signal
-//                        without NS
-//      - nearendClean  : In buffer containing one frame of nearend+echo signal
-//                        with NS
-//
-// Output:
-//      - out           : Out buffer, one frame of nearend signal          :
-//
-//
-int WebRtcAecm_ProcessFrame(AecmCore* aecm,
-                            const int16_t* farend,
-                            const int16_t* nearendNoisy,
-                            const int16_t* nearendClean,
-                            int16_t* out);
-
-////////////////////////////////////////////////////////////////////////////////
-// WebRtcAecm_ProcessBlock(...)
-//
-// This function is called for every block within one frame
-// This function is called by WebRtcAecm_ProcessFrame(...)
-//
-// Inputs:
-//      - aecm          : Pointer to the AECM instance
-//      - farend        : In buffer containing one block of echo signal
-//      - nearendNoisy  : In buffer containing one frame of nearend+echo signal
-//                        without NS
-//      - nearendClean  : In buffer containing one frame of nearend+echo signal
-//                        with NS
-//
-// Output:
-//      - out           : Out buffer, one block of nearend signal          :
-//
-//
-int WebRtcAecm_ProcessBlock(AecmCore* aecm,
-                            const int16_t* farend,
-                            const int16_t* nearendNoisy,
-                            const int16_t* noisyClean,
-                            int16_t* out);
-
-////////////////////////////////////////////////////////////////////////////////
-// WebRtcAecm_BufferFarFrame()
-//
-// Inserts a frame of data into farend buffer.
-//
-// Inputs:
-//      - aecm          : Pointer to the AECM instance
-//      - farend        : In buffer containing one frame of farend signal
-//      - farLen        : Length of frame
-//
-void WebRtcAecm_BufferFarFrame(AecmCore* const aecm,
-                               const int16_t* const farend,
-                               const int farLen);
-
-////////////////////////////////////////////////////////////////////////////////
-// WebRtcAecm_FetchFarFrame()
-//
-// Read the farend buffer to account for known delay
-//
-// Inputs:
-//      - aecm          : Pointer to the AECM instance
-//      - farend        : In buffer containing one frame of farend signal
-//      - farLen        : Length of frame
-//      - knownDelay    : known delay
-//
-void WebRtcAecm_FetchFarFrame(AecmCore* const aecm,
-                              int16_t* const farend,
-                              const int farLen,
-                              const int knownDelay);
-
-// All the functions below are intended to be private
-
-////////////////////////////////////////////////////////////////////////////////
-// WebRtcAecm_UpdateFarHistory()
-//
-// Moves the pointer to the next entry and inserts |far_spectrum| and
-// corresponding Q-domain in its buffer.
-//
-// Inputs:
-//      - self          : Pointer to the delay estimation instance
-//      - far_spectrum  : Pointer to the far end spectrum
-//      - far_q         : Q-domain of far end spectrum
-//
-void WebRtcAecm_UpdateFarHistory(AecmCore* self,
-                                 uint16_t* far_spectrum,
-                                 int far_q);
-
-////////////////////////////////////////////////////////////////////////////////
-// WebRtcAecm_AlignedFarend()
-//
-// Returns a pointer to the far end spectrum aligned to current near end
-// spectrum. The function WebRtc_DelayEstimatorProcessFix(...) should have been
-// called before AlignedFarend(...). Otherwise, you get the pointer to the
-// previous frame. The memory is only valid until the next call of
-// WebRtc_DelayEstimatorProcessFix(...).
-//
-// Inputs:
-//      - self              : Pointer to the AECM instance.
-//      - delay             : Current delay estimate.
-//
-// Output:
-//      - far_q             : The Q-domain of the aligned far end spectrum
-//
-// Return value:
-//      - far_spectrum      : Pointer to the aligned far end spectrum
-//                            NULL - Error
-//
-const uint16_t* WebRtcAecm_AlignedFarend(AecmCore* self, int* far_q, int delay);
-
-///////////////////////////////////////////////////////////////////////////////
-// WebRtcAecm_CalcSuppressionGain()
-//
-// This function calculates the suppression gain that is used in the
-// Wiener filter.
-//
-// Inputs:
-//      - aecm              : Pointer to the AECM instance.
-//
-// Return value:
-//      - supGain           : Suppression gain with which to scale the noise
-//                            level (Q14).
-//
-int16_t WebRtcAecm_CalcSuppressionGain(AecmCore* const aecm);
-
-///////////////////////////////////////////////////////////////////////////////
-// WebRtcAecm_CalcEnergies()
-//
-// This function calculates the log of energies for nearend, farend and
-// estimated echoes. There is also an update of energy decision levels,
-// i.e. internal VAD.
-//
-// Inputs:
-//      - aecm              : Pointer to the AECM instance.
-//      - far_spectrum      : Pointer to farend spectrum.
-//      - far_q             : Q-domain of farend spectrum.
-//      - nearEner          : Near end energy for current block in
-//                            Q(aecm->dfaQDomain).
-//
-// Output:
-//     - echoEst            : Estimated echo in Q(xfa_q+RESOLUTION_CHANNEL16).
-//
-void WebRtcAecm_CalcEnergies(AecmCore* aecm,
-                             const uint16_t* far_spectrum,
-                             const int16_t far_q,
-                             const uint32_t nearEner,
-                             int32_t* echoEst);
-
-///////////////////////////////////////////////////////////////////////////////
-// WebRtcAecm_CalcStepSize()
-//
-// This function calculates the step size used in channel estimation
-//
-// Inputs:
-//      - aecm              : Pointer to the AECM instance.
-//
-// Return value:
-//      - mu                : Stepsize in log2(), i.e. number of shifts.
-//
-int16_t WebRtcAecm_CalcStepSize(AecmCore* const aecm);
-
-///////////////////////////////////////////////////////////////////////////////
-// WebRtcAecm_UpdateChannel(...)
-//
-// This function performs channel estimation.
-// NLMS and decision on channel storage.
-//
-// Inputs:
-//      - aecm              : Pointer to the AECM instance.
-//      - far_spectrum      : Absolute value of the farend signal in Q(far_q)
-//      - far_q             : Q-domain of the farend signal
-//      - dfa               : Absolute value of the nearend signal
-//                            (Q[aecm->dfaQDomain])
-//      - mu                : NLMS step size.
-// Input/Output:
-//      - echoEst           : Estimated echo in Q(far_q+RESOLUTION_CHANNEL16).
-//
-void WebRtcAecm_UpdateChannel(AecmCore* aecm,
-                              const uint16_t* far_spectrum,
-                              const int16_t far_q,
-                              const uint16_t* const dfa,
-                              const int16_t mu,
-                              int32_t* echoEst);
-
-extern const int16_t WebRtcAecm_kCosTable[];
-extern const int16_t WebRtcAecm_kSinTable[];
-
-///////////////////////////////////////////////////////////////////////////////
-// Some function pointers, for internal functions shared by ARM NEON and
-// generic C code.
-//
-typedef void (*CalcLinearEnergies)(AecmCore* aecm,
-                                   const uint16_t* far_spectrum,
-                                   int32_t* echoEst,
-                                   uint32_t* far_energy,
-                                   uint32_t* echo_energy_adapt,
-                                   uint32_t* echo_energy_stored);
-extern CalcLinearEnergies WebRtcAecm_CalcLinearEnergies;
-
-typedef void (*StoreAdaptiveChannel)(AecmCore* aecm,
-                                     const uint16_t* far_spectrum,
-                                     int32_t* echo_est);
-extern StoreAdaptiveChannel WebRtcAecm_StoreAdaptiveChannel;
-
-typedef void (*ResetAdaptiveChannel)(AecmCore* aecm);
-extern ResetAdaptiveChannel WebRtcAecm_ResetAdaptiveChannel;
-
-// For the above function pointers, functions for generic platforms are declared
-// and defined as static in file aecm_core.c, while those for ARM Neon platforms
-// are declared below and defined in file aecm_core_neon.c.
-#if defined(WEBRTC_HAS_NEON)
-void WebRtcAecm_CalcLinearEnergiesNeon(AecmCore* aecm,
-                                       const uint16_t* far_spectrum,
-                                       int32_t* echo_est,
-                                       uint32_t* far_energy,
-                                       uint32_t* echo_energy_adapt,
-                                       uint32_t* echo_energy_stored);
-
-void WebRtcAecm_StoreAdaptiveChannelNeon(AecmCore* aecm,
-                                         const uint16_t* far_spectrum,
-                                         int32_t* echo_est);
-
-void WebRtcAecm_ResetAdaptiveChannelNeon(AecmCore* aecm);
-#endif
-
-#if defined(MIPS32_LE)
-void WebRtcAecm_CalcLinearEnergies_mips(AecmCore* aecm,
-                                        const uint16_t* far_spectrum,
-                                        int32_t* echo_est,
-                                        uint32_t* far_energy,
-                                        uint32_t* echo_energy_adapt,
-                                        uint32_t* echo_energy_stored);
-#if defined(MIPS_DSP_R1_LE)
-void WebRtcAecm_StoreAdaptiveChannel_mips(AecmCore* aecm,
-                                          const uint16_t* far_spectrum,
-                                          int32_t* echo_est);
-
-void WebRtcAecm_ResetAdaptiveChannel_mips(AecmCore* aecm);
-#endif
-#endif
-
-#endif
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aecm/aecm_core_c.cc b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aecm/aecm_core_c.cc
deleted file mode 100644
index 905274fa97..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aecm/aecm_core_c.cc
+++ /dev/null
@@ -1,668 +0,0 @@
-/*
- *  Copyright (c) 2013 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#include "modules/audio_processing/aecm/aecm_core.h"
-
-#include <stddef.h>
-#include <stdlib.h>
-
-extern "C" {
-#include "common_audio/ring_buffer.h"
-#include "common_audio/signal_processing/include/real_fft.h"
-}
-#include "modules/audio_processing/aecm/echo_control_mobile.h"
-#include "modules/audio_processing/utility/delay_estimator_wrapper.h"
-extern "C" {
-#include "system_wrappers/include/cpu_features_wrapper.h"
-}
-
-#include "rtc_base/checks.h"
-#include "rtc_base/numerics/safe_conversions.h"
-#include "rtc_base/sanitizer.h"
-
-// Square root of Hanning window in Q14.
-static const ALIGN8_BEG int16_t WebRtcAecm_kSqrtHanning[] ALIGN8_END = {
-    0,     399,   798,   1196,  1594,  1990,  2386,  2780,  3172,  3562,  3951,
-    4337,  4720,  5101,  5478,  5853,  6224,  6591,  6954,  7313,  7668,  8019,
-    8364,  8705,  9040,  9370,  9695,  10013, 10326, 10633, 10933, 11227, 11514,
-    11795, 12068, 12335, 12594, 12845, 13089, 13325, 13553, 13773, 13985, 14189,
-    14384, 14571, 14749, 14918, 15079, 15231, 15373, 15506, 15631, 15746, 15851,
-    15947, 16034, 16111, 16179, 16237, 16286, 16325, 16354, 16373, 16384};
-
-#ifdef AECM_WITH_ABS_APPROX
-// Q15 alpha = 0.99439986968132  const Factor for magnitude approximation
-static const uint16_t kAlpha1 = 32584;
-// Q15 beta = 0.12967166976970   const Factor for magnitude approximation
-static const uint16_t kBeta1 = 4249;
-// Q15 alpha = 0.94234827210087  const Factor for magnitude approximation
-static const uint16_t kAlpha2 = 30879;
-// Q15 beta = 0.33787806009150   const Factor for magnitude approximation
-static const uint16_t kBeta2 = 11072;
-// Q15 alpha = 0.82247698684306  const Factor for magnitude approximation
-static const uint16_t kAlpha3 = 26951;
-// Q15 beta = 0.57762063060713   const Factor for magnitude approximation
-static const uint16_t kBeta3 = 18927;
-#endif
-
-static const int16_t kNoiseEstQDomain = 15;
-static const int16_t kNoiseEstIncCount = 5;
-
-static void ComfortNoise(AecmCore* aecm,
-                         const uint16_t* dfa,
-                         ComplexInt16* out,
-                         const int16_t* lambda);
-
-static void WindowAndFFT(AecmCore* aecm,
-                         int16_t* fft,
-                         const int16_t* time_signal,
-                         ComplexInt16* freq_signal,
-                         int time_signal_scaling) {
-  int i = 0;
-
-  // FFT of signal
-  for (i = 0; i < PART_LEN; i++) {
-    // Window time domain signal and insert into real part of
-    // transformation array |fft|
-    int16_t scaled_time_signal = time_signal[i] * (1 << time_signal_scaling);
-    fft[i] = (int16_t)((scaled_time_signal * WebRtcAecm_kSqrtHanning[i]) >> 14);
-    scaled_time_signal = time_signal[i + PART_LEN] * (1 << time_signal_scaling);
-    fft[PART_LEN + i] = (int16_t)(
-        (scaled_time_signal * WebRtcAecm_kSqrtHanning[PART_LEN - i]) >> 14);
-  }
-
-  // Do forward FFT, then take only the first PART_LEN complex samples,
-  // and change signs of the imaginary parts.
-  WebRtcSpl_RealForwardFFT(aecm->real_fft, fft, (int16_t*)freq_signal);
-  for (i = 0; i < PART_LEN; i++) {
-    freq_signal[i].imag = -freq_signal[i].imag;
-  }
-}
-
-static void InverseFFTAndWindow(AecmCore* aecm,
-                                int16_t* fft,
-                                ComplexInt16* efw,
-                                int16_t* output,
-                                const int16_t* nearendClean) {
-  int i, j, outCFFT;
-  int32_t tmp32no1;
-  // Reuse |efw| for the inverse FFT output after transferring
-  // the contents to |fft|.
-  int16_t* ifft_out = (int16_t*)efw;
-
-  // Synthesis
-  for (i = 1, j = 2; i < PART_LEN; i += 1, j += 2) {
-    fft[j] = efw[i].real;
-    fft[j + 1] = -efw[i].imag;
-  }
-  fft[0] = efw[0].real;
-  fft[1] = -efw[0].imag;
-
-  fft[PART_LEN2] = efw[PART_LEN].real;
-  fft[PART_LEN2 + 1] = -efw[PART_LEN].imag;
-
-  // Inverse FFT. Keep outCFFT to scale the samples in the next block.
-  outCFFT = WebRtcSpl_RealInverseFFT(aecm->real_fft, fft, ifft_out);
-  for (i = 0; i < PART_LEN; i++) {
-    ifft_out[i] = (int16_t)WEBRTC_SPL_MUL_16_16_RSFT_WITH_ROUND(
-        ifft_out[i], WebRtcAecm_kSqrtHanning[i], 14);
-    tmp32no1 = WEBRTC_SPL_SHIFT_W32((int32_t)ifft_out[i],
-                                    outCFFT - aecm->dfaCleanQDomain);
-    output[i] = (int16_t)WEBRTC_SPL_SAT(WEBRTC_SPL_WORD16_MAX,
-                                        tmp32no1 + aecm->outBuf[i],
-                                        WEBRTC_SPL_WORD16_MIN);
-
-    tmp32no1 =
-        (ifft_out[PART_LEN + i] * WebRtcAecm_kSqrtHanning[PART_LEN - i]) >> 14;
-    tmp32no1 = WEBRTC_SPL_SHIFT_W32(tmp32no1, outCFFT - aecm->dfaCleanQDomain);
-    aecm->outBuf[i] = (int16_t)WEBRTC_SPL_SAT(WEBRTC_SPL_WORD16_MAX, tmp32no1,
-                                              WEBRTC_SPL_WORD16_MIN);
-  }
-
-  // Copy the current block to the old position
-  // (aecm->outBuf is shifted elsewhere)
-  memcpy(aecm->xBuf, aecm->xBuf + PART_LEN, sizeof(int16_t) * PART_LEN);
-  memcpy(aecm->dBufNoisy, aecm->dBufNoisy + PART_LEN,
-         sizeof(int16_t) * PART_LEN);
-  if (nearendClean != NULL) {
-    memcpy(aecm->dBufClean, aecm->dBufClean + PART_LEN,
-           sizeof(int16_t) * PART_LEN);
-  }
-}
-
-// Transforms a time domain signal into the frequency domain, outputting the
-// complex valued signal, absolute value and sum of absolute values.
-//
-// time_signal          [in]    Pointer to time domain signal
-// freq_signal_real     [out]   Pointer to real part of frequency domain array
-// freq_signal_imag     [out]   Pointer to imaginary part of frequency domain
-//                              array
-// freq_signal_abs      [out]   Pointer to absolute value of frequency domain
-//                              array
-// freq_signal_sum_abs  [out]   Pointer to the sum of all absolute values in
-//                              the frequency domain array
-// return value                 The Q-domain of current frequency values
-//
-static int TimeToFrequencyDomain(AecmCore* aecm,
-                                 const int16_t* time_signal,
-                                 ComplexInt16* freq_signal,
-                                 uint16_t* freq_signal_abs,
-                                 uint32_t* freq_signal_sum_abs) {
-  int i = 0;
-  int time_signal_scaling = 0;
-
-  int32_t tmp32no1 = 0;
-  int32_t tmp32no2 = 0;
-
-  // In fft_buf, +16 for 32-byte alignment.
-  int16_t fft_buf[PART_LEN4 + 16];
-  int16_t* fft = (int16_t*)(((uintptr_t)fft_buf + 31) & ~31);
-
-  int16_t tmp16no1;
-#ifndef WEBRTC_ARCH_ARM_V7
-  int16_t tmp16no2;
-#endif
-#ifdef AECM_WITH_ABS_APPROX
-  int16_t max_value = 0;
-  int16_t min_value = 0;
-  uint16_t alpha = 0;
-  uint16_t beta = 0;
-#endif
-
-#ifdef AECM_DYNAMIC_Q
-  tmp16no1 = WebRtcSpl_MaxAbsValueW16(time_signal, PART_LEN2);
-  time_signal_scaling = WebRtcSpl_NormW16(tmp16no1);
-#endif
-
-  WindowAndFFT(aecm, fft, time_signal, freq_signal, time_signal_scaling);
-
-  // Extract imaginary and real part, calculate the magnitude for
-  // all frequency bins
-  freq_signal[0].imag = 0;
-  freq_signal[PART_LEN].imag = 0;
-  freq_signal_abs[0] = (uint16_t)WEBRTC_SPL_ABS_W16(freq_signal[0].real);
-  freq_signal_abs[PART_LEN] =
-      (uint16_t)WEBRTC_SPL_ABS_W16(freq_signal[PART_LEN].real);
-  (*freq_signal_sum_abs) =
-      (uint32_t)(freq_signal_abs[0]) + (uint32_t)(freq_signal_abs[PART_LEN]);
-
-  for (i = 1; i < PART_LEN; i++) {
-    if (freq_signal[i].real == 0) {
-      freq_signal_abs[i] = (uint16_t)WEBRTC_SPL_ABS_W16(freq_signal[i].imag);
-    } else if (freq_signal[i].imag == 0) {
-      freq_signal_abs[i] = (uint16_t)WEBRTC_SPL_ABS_W16(freq_signal[i].real);
-    } else {
-// Approximation for magnitude of complex fft output
-// magn = sqrt(real^2 + imag^2)
-// magn ~= alpha * max(|imag|,|real|) + beta * min(|imag|,|real|)
-//
-// The parameters alpha and beta are stored in Q15
-
-#ifdef AECM_WITH_ABS_APPROX
-      tmp16no1 = WEBRTC_SPL_ABS_W16(freq_signal[i].real);
-      tmp16no2 = WEBRTC_SPL_ABS_W16(freq_signal[i].imag);
-
-      if (tmp16no1 > tmp16no2) {
-        max_value = tmp16no1;
-        min_value = tmp16no2;
-      } else {
-        max_value = tmp16no2;
-        min_value = tmp16no1;
-      }
-
-      // Magnitude in Q(-6)
-      if ((max_value >> 2) > min_value) {
-        alpha = kAlpha1;
-        beta = kBeta1;
-      } else if ((max_value >> 1) > min_value) {
-        alpha = kAlpha2;
-        beta = kBeta2;
-      } else {
-        alpha = kAlpha3;
-        beta = kBeta3;
-      }
-      tmp16no1 = (int16_t)((max_value * alpha) >> 15);
-      tmp16no2 = (int16_t)((min_value * beta) >> 15);
-      freq_signal_abs[i] = (uint16_t)tmp16no1 + (uint16_t)tmp16no2;
-#else
-#ifdef WEBRTC_ARCH_ARM_V7
-      __asm __volatile(
-          "smulbb %[tmp32no1], %[real], %[real]\n\t"
-          "smlabb %[tmp32no2], %[imag], %[imag], %[tmp32no1]\n\t"
-          : [tmp32no1] "+&r"(tmp32no1), [tmp32no2] "=r"(tmp32no2)
-          : [real] "r"(freq_signal[i].real), [imag] "r"(freq_signal[i].imag));
-#else
-      tmp16no1 = WEBRTC_SPL_ABS_W16(freq_signal[i].real);
-      tmp16no2 = WEBRTC_SPL_ABS_W16(freq_signal[i].imag);
-      tmp32no1 = tmp16no1 * tmp16no1;
-      tmp32no2 = tmp16no2 * tmp16no2;
-      tmp32no2 = WebRtcSpl_AddSatW32(tmp32no1, tmp32no2);
-#endif  // WEBRTC_ARCH_ARM_V7
-      tmp32no1 = WebRtcSpl_SqrtFloor(tmp32no2);
-
-      freq_signal_abs[i] = (uint16_t)tmp32no1;
-#endif  // AECM_WITH_ABS_APPROX
-    }
-    (*freq_signal_sum_abs) += (uint32_t)freq_signal_abs[i];
-  }
-
-  return time_signal_scaling;
-}
-
-int RTC_NO_SANITIZE("signed-integer-overflow")  // bugs.webrtc.org/8200
-    WebRtcAecm_ProcessBlock(AecmCore* aecm,
-                            const int16_t* farend,
-                            const int16_t* nearendNoisy,
-                            const int16_t* nearendClean,
-                            int16_t* output) {
-  int i;
-
-  uint32_t xfaSum;
-  uint32_t dfaNoisySum;
-  uint32_t dfaCleanSum;
-  uint32_t echoEst32Gained;
-  uint32_t tmpU32;
-
-  int32_t tmp32no1;
-
-  uint16_t xfa[PART_LEN1];
-  uint16_t dfaNoisy[PART_LEN1];
-  uint16_t dfaClean[PART_LEN1];
-  uint16_t* ptrDfaClean = dfaClean;
-  const uint16_t* far_spectrum_ptr = NULL;
-
-  // 32 byte aligned buffers (with +8 or +16).
-  // TODO(kma): define fft with ComplexInt16.
-  int16_t fft_buf[PART_LEN4 + 2 + 16];  // +2 to make a loop safe.
-  int32_t echoEst32_buf[PART_LEN1 + 8];
-  int32_t dfw_buf[PART_LEN2 + 8];
-  int32_t efw_buf[PART_LEN2 + 8];
-
-  int16_t* fft = (int16_t*)(((uintptr_t)fft_buf + 31) & ~31);
-  int32_t* echoEst32 = (int32_t*)(((uintptr_t)echoEst32_buf + 31) & ~31);
-  ComplexInt16* dfw = (ComplexInt16*)(((uintptr_t)dfw_buf + 31) & ~31);
-  ComplexInt16* efw = (ComplexInt16*)(((uintptr_t)efw_buf + 31) & ~31);
-
-  int16_t hnl[PART_LEN1];
-  int16_t numPosCoef = 0;
-  int16_t nlpGain = ONE_Q14;
-  int delay;
-  int16_t tmp16no1;
-  int16_t tmp16no2;
-  int16_t mu;
-  int16_t supGain;
-  int16_t zeros32, zeros16;
-  int16_t zerosDBufNoisy, zerosDBufClean, zerosXBuf;
-  int far_q;
-  int16_t resolutionDiff, qDomainDiff, dfa_clean_q_domain_diff;
-
-  const int kMinPrefBand = 4;
-  const int kMaxPrefBand = 24;
-  int32_t avgHnl32 = 0;
-
-  // Determine startup state. There are three states:
-  // (0) the first CONV_LEN blocks
-  // (1) another CONV_LEN blocks
-  // (2) the rest
-
-  if (aecm->startupState < 2) {
-    aecm->startupState =
-        (aecm->totCount >= CONV_LEN) + (aecm->totCount >= CONV_LEN2);
-  }
-  // END: Determine startup state
-
-  // Buffer near and far end signals
-  memcpy(aecm->xBuf + PART_LEN, farend, sizeof(int16_t) * PART_LEN);
-  memcpy(aecm->dBufNoisy + PART_LEN, nearendNoisy, sizeof(int16_t) * PART_LEN);
-  if (nearendClean != NULL) {
-    memcpy(aecm->dBufClean + PART_LEN, nearendClean,
-           sizeof(int16_t) * PART_LEN);
-  }
-
-  // Transform far end signal from time domain to frequency domain.
-  far_q = TimeToFrequencyDomain(aecm, aecm->xBuf, dfw, xfa, &xfaSum);
-
-  // Transform noisy near end signal from time domain to frequency domain.
-  zerosDBufNoisy =
-      TimeToFrequencyDomain(aecm, aecm->dBufNoisy, dfw, dfaNoisy, &dfaNoisySum);
-  aecm->dfaNoisyQDomainOld = aecm->dfaNoisyQDomain;
-  aecm->dfaNoisyQDomain = (int16_t)zerosDBufNoisy;
-
-  if (nearendClean == NULL) {
-    ptrDfaClean = dfaNoisy;
-    aecm->dfaCleanQDomainOld = aecm->dfaNoisyQDomainOld;
-    aecm->dfaCleanQDomain = aecm->dfaNoisyQDomain;
-    dfaCleanSum = dfaNoisySum;
-  } else {
-    // Transform clean near end signal from time domain to frequency domain.
-    zerosDBufClean = TimeToFrequencyDomain(aecm, aecm->dBufClean, dfw, dfaClean,
-                                           &dfaCleanSum);
-    aecm->dfaCleanQDomainOld = aecm->dfaCleanQDomain;
-    aecm->dfaCleanQDomain = (int16_t)zerosDBufClean;
-  }
-
-  // Get the delay
-  // Save far-end history and estimate delay
-  WebRtcAecm_UpdateFarHistory(aecm, xfa, far_q);
-  if (WebRtc_AddFarSpectrumFix(aecm->delay_estimator_farend, xfa, PART_LEN1,
-                               far_q) == -1) {
-    return -1;
-  }
-  delay = WebRtc_DelayEstimatorProcessFix(aecm->delay_estimator, dfaNoisy,
-                                          PART_LEN1, zerosDBufNoisy);
-  if (delay == -1) {
-    return -1;
-  } else if (delay == -2) {
-    // If the delay is unknown, we assume zero.
-    // NOTE: this will have to be adjusted if we ever add lookahead.
-    delay = 0;
-  }
-
-  if (aecm->fixedDelay >= 0) {
-    // Use fixed delay
-    delay = aecm->fixedDelay;
-  }
-
-  // Get aligned far end spectrum
-  far_spectrum_ptr = WebRtcAecm_AlignedFarend(aecm, &far_q, delay);
-  zerosXBuf = (int16_t)far_q;
-  if (far_spectrum_ptr == NULL) {
-    return -1;
-  }
-
-  // Calculate log(energy) and update energy threshold levels
-  WebRtcAecm_CalcEnergies(aecm, far_spectrum_ptr, zerosXBuf, dfaNoisySum,
-                          echoEst32);
-
-  // Calculate stepsize
-  mu = WebRtcAecm_CalcStepSize(aecm);
-
-  // Update counters
-  aecm->totCount++;
-
-  // This is the channel estimation algorithm.
-  // It is base on NLMS but has a variable step length,
-  // which was calculated above.
-  WebRtcAecm_UpdateChannel(aecm, far_spectrum_ptr, zerosXBuf, dfaNoisy, mu,
-                           echoEst32);
-  supGain = WebRtcAecm_CalcSuppressionGain(aecm);
-
-  // Calculate Wiener filter hnl[]
-  for (i = 0; i < PART_LEN1; i++) {
-    // Far end signal through channel estimate in Q8
-    // How much can we shift right to preserve resolution
-    tmp32no1 = echoEst32[i] - aecm->echoFilt[i];
-    aecm->echoFilt[i] +=
-        rtc::dchecked_cast<int32_t>((int64_t{tmp32no1} * 50) >> 8);
-
-    zeros32 = WebRtcSpl_NormW32(aecm->echoFilt[i]) + 1;
-    zeros16 = WebRtcSpl_NormW16(supGain) + 1;
-    if (zeros32 + zeros16 > 16) {
-      // Multiplication is safe
-      // Result in
-      // Q(RESOLUTION_CHANNEL+RESOLUTION_SUPGAIN+
-      //   aecm->xfaQDomainBuf[diff])
-      echoEst32Gained =
-          WEBRTC_SPL_UMUL_32_16((uint32_t)aecm->echoFilt[i], (uint16_t)supGain);
-      resolutionDiff = 14 - RESOLUTION_CHANNEL16 - RESOLUTION_SUPGAIN;
-      resolutionDiff += (aecm->dfaCleanQDomain - zerosXBuf);
-    } else {
-      tmp16no1 = 17 - zeros32 - zeros16;
-      resolutionDiff =
-          14 + tmp16no1 - RESOLUTION_CHANNEL16 - RESOLUTION_SUPGAIN;
-      resolutionDiff += (aecm->dfaCleanQDomain - zerosXBuf);
-      if (zeros32 > tmp16no1) {
-        echoEst32Gained = WEBRTC_SPL_UMUL_32_16((uint32_t)aecm->echoFilt[i],
-                                                supGain >> tmp16no1);
-      } else {
-        // Result in Q-(RESOLUTION_CHANNEL+RESOLUTION_SUPGAIN-16)
-        echoEst32Gained = (aecm->echoFilt[i] >> tmp16no1) * supGain;
-      }
-    }
-
-    zeros16 = WebRtcSpl_NormW16(aecm->nearFilt[i]);
-    RTC_DCHECK_GE(zeros16, 0);  // |zeros16| is a norm, hence non-negative.
-    dfa_clean_q_domain_diff = aecm->dfaCleanQDomain - aecm->dfaCleanQDomainOld;
-    if (zeros16 < dfa_clean_q_domain_diff && aecm->nearFilt[i]) {
-      tmp16no1 = aecm->nearFilt[i] * (1 << zeros16);
-      qDomainDiff = zeros16 - dfa_clean_q_domain_diff;
-      tmp16no2 = ptrDfaClean[i] >> -qDomainDiff;
-    } else {
-      tmp16no1 = dfa_clean_q_domain_diff < 0
-                     ? aecm->nearFilt[i] >> -dfa_clean_q_domain_diff
-                     : aecm->nearFilt[i] * (1 << dfa_clean_q_domain_diff);
-      qDomainDiff = 0;
-      tmp16no2 = ptrDfaClean[i];
-    }
-    tmp32no1 = (int32_t)(tmp16no2 - tmp16no1);
-    tmp16no2 = (int16_t)(tmp32no1 >> 4);
-    tmp16no2 += tmp16no1;
-    zeros16 = WebRtcSpl_NormW16(tmp16no2);
-    if ((tmp16no2) & (-qDomainDiff > zeros16)) {
-      aecm->nearFilt[i] = WEBRTC_SPL_WORD16_MAX;
-    } else {
-      aecm->nearFilt[i] = qDomainDiff < 0 ? tmp16no2 * (1 << -qDomainDiff)
-                                          : tmp16no2 >> qDomainDiff;
-    }
-
-    // Wiener filter coefficients, resulting hnl in Q14
-    if (echoEst32Gained == 0) {
-      hnl[i] = ONE_Q14;
-    } else if (aecm->nearFilt[i] == 0) {
-      hnl[i] = 0;
-    } else {
-      // Multiply the suppression gain
-      // Rounding
-      echoEst32Gained += (uint32_t)(aecm->nearFilt[i] >> 1);
-      tmpU32 =
-          WebRtcSpl_DivU32U16(echoEst32Gained, (uint16_t)aecm->nearFilt[i]);
-
-      // Current resolution is
-      // Q-(RESOLUTION_CHANNEL+RESOLUTION_SUPGAIN- max(0,17-zeros16- zeros32))
-      // Make sure we are in Q14
-      tmp32no1 = (int32_t)WEBRTC_SPL_SHIFT_W32(tmpU32, resolutionDiff);
-      if (tmp32no1 > ONE_Q14) {
-        hnl[i] = 0;
-      } else if (tmp32no1 < 0) {
-        hnl[i] = ONE_Q14;
-      } else {
-        // 1-echoEst/dfa
-        hnl[i] = ONE_Q14 - (int16_t)tmp32no1;
-        if (hnl[i] < 0) {
-          hnl[i] = 0;
-        }
-      }
-    }
-    if (hnl[i]) {
-      numPosCoef++;
-    }
-  }
-  // Only in wideband. Prevent the gain in upper band from being larger than
-  // in lower band.
-  if (aecm->mult == 2) {
-    // TODO(bjornv): Investigate if the scaling of hnl[i] below can cause
-    //               speech distortion in double-talk.
-    for (i = 0; i < PART_LEN1; i++) {
-      hnl[i] = (int16_t)((hnl[i] * hnl[i]) >> 14);
-    }
-
-    for (i = kMinPrefBand; i <= kMaxPrefBand; i++) {
-      avgHnl32 += (int32_t)hnl[i];
-    }
-    RTC_DCHECK_GT(kMaxPrefBand - kMinPrefBand + 1, 0);
-    avgHnl32 /= (kMaxPrefBand - kMinPrefBand + 1);
-
-    for (i = kMaxPrefBand; i < PART_LEN1; i++) {
-      if (hnl[i] > (int16_t)avgHnl32) {
-        hnl[i] = (int16_t)avgHnl32;
-      }
-    }
-  }
-
-  // Calculate NLP gain, result is in Q14
-  if (aecm->nlpFlag) {
-    for (i = 0; i < PART_LEN1; i++) {
-      // Truncate values close to zero and one.
-      if (hnl[i] > NLP_COMP_HIGH) {
-        hnl[i] = ONE_Q14;
-      } else if (hnl[i] < NLP_COMP_LOW) {
-        hnl[i] = 0;
-      }
-
-      // Remove outliers
-      if (numPosCoef < 3) {
-        nlpGain = 0;
-      } else {
-        nlpGain = ONE_Q14;
-      }
-
-      // NLP
-      if ((hnl[i] == ONE_Q14) && (nlpGain == ONE_Q14)) {
-        hnl[i] = ONE_Q14;
-      } else {
-        hnl[i] = (int16_t)((hnl[i] * nlpGain) >> 14);
-      }
-
-      // multiply with Wiener coefficients
-      efw[i].real = (int16_t)(
-          WEBRTC_SPL_MUL_16_16_RSFT_WITH_ROUND(dfw[i].real, hnl[i], 14));
-      efw[i].imag = (int16_t)(
-          WEBRTC_SPL_MUL_16_16_RSFT_WITH_ROUND(dfw[i].imag, hnl[i], 14));
-    }
-  } else {
-    // multiply with Wiener coefficients
-    for (i = 0; i < PART_LEN1; i++) {
-      efw[i].real = (int16_t)(
-          WEBRTC_SPL_MUL_16_16_RSFT_WITH_ROUND(dfw[i].real, hnl[i], 14));
-      efw[i].imag = (int16_t)(
-          WEBRTC_SPL_MUL_16_16_RSFT_WITH_ROUND(dfw[i].imag, hnl[i], 14));
-    }
-  }
-
-  if (aecm->cngMode == AecmTrue) {
-    ComfortNoise(aecm, ptrDfaClean, efw, hnl);
-  }
-
-  InverseFFTAndWindow(aecm, fft, efw, output, nearendClean);
-
-  return 0;
-}
-
-static void ComfortNoise(AecmCore* aecm,
-                         const uint16_t* dfa,
-                         ComplexInt16* out,
-                         const int16_t* lambda) {
-  int16_t i;
-  int16_t tmp16;
-  int32_t tmp32;
-
-  int16_t randW16[PART_LEN];
-  int16_t uReal[PART_LEN1];
-  int16_t uImag[PART_LEN1];
-  int32_t outLShift32;
-  int16_t noiseRShift16[PART_LEN1];
-
-  int16_t shiftFromNearToNoise = kNoiseEstQDomain - aecm->dfaCleanQDomain;
-  int16_t minTrackShift;
-
-  RTC_DCHECK_GE(shiftFromNearToNoise, 0);
-  RTC_DCHECK_LT(shiftFromNearToNoise, 16);
-
-  if (aecm->noiseEstCtr < 100) {
-    // Track the minimum more quickly initially.
-    aecm->noiseEstCtr++;
-    minTrackShift = 6;
-  } else {
-    minTrackShift = 9;
-  }
-
-  // Estimate noise power.
-  for (i = 0; i < PART_LEN1; i++) {
-    // Shift to the noise domain.
-    tmp32 = (int32_t)dfa[i];
-    outLShift32 = tmp32 << shiftFromNearToNoise;
-
-    if (outLShift32 < aecm->noiseEst[i]) {
-      // Reset "too low" counter
-      aecm->noiseEstTooLowCtr[i] = 0;
-      // Track the minimum.
-      if (aecm->noiseEst[i] < (1 << minTrackShift)) {
-        // For small values, decrease noiseEst[i] every
-        // |kNoiseEstIncCount| block. The regular approach below can not
-        // go further down due to truncation.
-        aecm->noiseEstTooHighCtr[i]++;
-        if (aecm->noiseEstTooHighCtr[i] >= kNoiseEstIncCount) {
-          aecm->noiseEst[i]--;
-          aecm->noiseEstTooHighCtr[i] = 0;  // Reset the counter
-        }
-      } else {
-        aecm->noiseEst[i] -=
-            ((aecm->noiseEst[i] - outLShift32) >> minTrackShift);
-      }
-    } else {
-      // Reset "too high" counter
-      aecm->noiseEstTooHighCtr[i] = 0;
-      // Ramp slowly upwards until we hit the minimum again.
-      if ((aecm->noiseEst[i] >> 19) > 0) {
-        // Avoid overflow.
-        // Multiplication with 2049 will cause wrap around. Scale
-        // down first and then multiply
-        aecm->noiseEst[i] >>= 11;
-        aecm->noiseEst[i] *= 2049;
-      } else if ((aecm->noiseEst[i] >> 11) > 0) {
-        // Large enough for relative increase
-        aecm->noiseEst[i] *= 2049;
-        aecm->noiseEst[i] >>= 11;
-      } else {
-        // Make incremental increases based on size every
-        // |kNoiseEstIncCount| block
-        aecm->noiseEstTooLowCtr[i]++;
-        if (aecm->noiseEstTooLowCtr[i] >= kNoiseEstIncCount) {
-          aecm->noiseEst[i] += (aecm->noiseEst[i] >> 9) + 1;
-          aecm->noiseEstTooLowCtr[i] = 0;  // Reset counter
-        }
-      }
-    }
-  }
-
-  for (i = 0; i < PART_LEN1; i++) {
-    tmp32 = aecm->noiseEst[i] >> shiftFromNearToNoise;
-    if (tmp32 > 32767) {
-      tmp32 = 32767;
-      aecm->noiseEst[i] = tmp32 << shiftFromNearToNoise;
-    }
-    noiseRShift16[i] = (int16_t)tmp32;
-
-    tmp16 = ONE_Q14 - lambda[i];
-    noiseRShift16[i] = (int16_t)((tmp16 * noiseRShift16[i]) >> 14);
-  }
-
-  // Generate a uniform random array on [0 2^15-1].
-  WebRtcSpl_RandUArray(randW16, PART_LEN, &aecm->seed);
-
-  // Generate noise according to estimated energy.
-  uReal[0] = 0;  // Reject LF noise.
-  uImag[0] = 0;
-  for (i = 1; i < PART_LEN1; i++) {
-    // Get a random index for the cos and sin tables over [0 359].
-    tmp16 = (int16_t)((359 * randW16[i - 1]) >> 15);
-
-    // Tables are in Q13.
-    uReal[i] =
-        (int16_t)((noiseRShift16[i] * WebRtcAecm_kCosTable[tmp16]) >> 13);
-    uImag[i] =
-        (int16_t)((-noiseRShift16[i] * WebRtcAecm_kSinTable[tmp16]) >> 13);
-  }
-  uImag[PART_LEN] = 0;
-
-  for (i = 0; i < PART_LEN1; i++) {
-    out[i].real = WebRtcSpl_AddSatW16(out[i].real, uReal[i]);
-    out[i].imag = WebRtcSpl_AddSatW16(out[i].imag, uImag[i]);
-  }
-}
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aecm/aecm_core_neon.cc b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aecm/aecm_core_neon.cc
deleted file mode 100644
index f72e586796..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aecm/aecm_core_neon.cc
+++ /dev/null
@@ -1,202 +0,0 @@
-/*
- *  Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-#if defined(__arm__) || defined(_M_ARM) || defined(__aarch64__)
-
-#include "modules/audio_processing/aecm/aecm_core.h"
-
-#include <arm_neon.h>
-
-#include "common_audio/signal_processing/include/real_fft.h"
-#include "rtc_base/checks.h"
-
-// TODO(kma): Re-write the corresponding assembly file, the offset
-// generating script and makefile, to replace these C functions.
-
-static inline void AddLanes(uint32_t* ptr, uint32x4_t v) {
-#if defined(WEBRTC_ARCH_ARM64)
-  *(ptr) = vaddvq_u32(v);
-#else
-  uint32x2_t tmp_v;
-  tmp_v = vadd_u32(vget_low_u32(v), vget_high_u32(v));
-  tmp_v = vpadd_u32(tmp_v, tmp_v);
-  *(ptr) = vget_lane_u32(tmp_v, 0);
-#endif
-}
-
-void WebRtcAecm_CalcLinearEnergiesNeon(AecmCore* aecm,
-                                       const uint16_t* far_spectrum,
-                                       int32_t* echo_est,
-                                       uint32_t* far_energy,
-                                       uint32_t* echo_energy_adapt,
-                                       uint32_t* echo_energy_stored) {
-  int16_t* start_stored_p = aecm->channelStored;
-  int16_t* start_adapt_p = aecm->channelAdapt16;
-  int32_t* echo_est_p = echo_est;
-  const int16_t* end_stored_p = aecm->channelStored + PART_LEN;
-  const uint16_t* far_spectrum_p = far_spectrum;
-  int16x8_t store_v, adapt_v;
-  uint16x8_t spectrum_v;
-  uint32x4_t echo_est_v_low, echo_est_v_high;
-  uint32x4_t far_energy_v, echo_stored_v, echo_adapt_v;
-
-  far_energy_v = vdupq_n_u32(0);
-  echo_adapt_v = vdupq_n_u32(0);
-  echo_stored_v = vdupq_n_u32(0);
-
-  // Get energy for the delayed far end signal and estimated
-  // echo using both stored and adapted channels.
-  // The C code:
-  //  for (i = 0; i < PART_LEN1; i++) {
-  //      echo_est[i] = WEBRTC_SPL_MUL_16_U16(aecm->channelStored[i],
-  //                                         far_spectrum[i]);
-  //      (*far_energy) += (uint32_t)(far_spectrum[i]);
-  //      *echo_energy_adapt += aecm->channelAdapt16[i] * far_spectrum[i];
-  //      (*echo_energy_stored) += (uint32_t)echo_est[i];
-  //  }
-  while (start_stored_p < end_stored_p) {
-    spectrum_v = vld1q_u16(far_spectrum_p);
-    adapt_v = vld1q_s16(start_adapt_p);
-    store_v = vld1q_s16(start_stored_p);
-
-    far_energy_v = vaddw_u16(far_energy_v, vget_low_u16(spectrum_v));
-    far_energy_v = vaddw_u16(far_energy_v, vget_high_u16(spectrum_v));
-
-    echo_est_v_low = vmull_u16(vreinterpret_u16_s16(vget_low_s16(store_v)),
-                               vget_low_u16(spectrum_v));
-    echo_est_v_high = vmull_u16(vreinterpret_u16_s16(vget_high_s16(store_v)),
-                                vget_high_u16(spectrum_v));
-    vst1q_s32(echo_est_p, vreinterpretq_s32_u32(echo_est_v_low));
-    vst1q_s32(echo_est_p + 4, vreinterpretq_s32_u32(echo_est_v_high));
-
-    echo_stored_v = vaddq_u32(echo_est_v_low, echo_stored_v);
-    echo_stored_v = vaddq_u32(echo_est_v_high, echo_stored_v);
-
-    echo_adapt_v =
-        vmlal_u16(echo_adapt_v, vreinterpret_u16_s16(vget_low_s16(adapt_v)),
-                  vget_low_u16(spectrum_v));
-    echo_adapt_v =
-        vmlal_u16(echo_adapt_v, vreinterpret_u16_s16(vget_high_s16(adapt_v)),
-                  vget_high_u16(spectrum_v));
-
-    start_stored_p += 8;
-    start_adapt_p += 8;
-    far_spectrum_p += 8;
-    echo_est_p += 8;
-  }
-
-  AddLanes(far_energy, far_energy_v);
-  AddLanes(echo_energy_stored, echo_stored_v);
-  AddLanes(echo_energy_adapt, echo_adapt_v);
-
-  echo_est[PART_LEN] = WEBRTC_SPL_MUL_16_U16(aecm->channelStored[PART_LEN],
-                                             far_spectrum[PART_LEN]);
-  *echo_energy_stored += (uint32_t)echo_est[PART_LEN];
-  *far_energy += (uint32_t)far_spectrum[PART_LEN];
-  *echo_energy_adapt += aecm->channelAdapt16[PART_LEN] * far_spectrum[PART_LEN];
-}
-
-void WebRtcAecm_StoreAdaptiveChannelNeon(AecmCore* aecm,
-                                         const uint16_t* far_spectrum,
-                                         int32_t* echo_est) {
-  RTC_DCHECK_EQ(0, (uintptr_t)echo_est % 32);
-  RTC_DCHECK_EQ(0, (uintptr_t)aecm->channelStored % 16);
-  RTC_DCHECK_EQ(0, (uintptr_t)aecm->channelAdapt16 % 16);
-
-  // This is C code of following optimized code.
-  // During startup we store the channel every block.
-  //  memcpy(aecm->channelStored,
-  //         aecm->channelAdapt16,
-  //         sizeof(int16_t) * PART_LEN1);
-  // Recalculate echo estimate
-  //  for (i = 0; i < PART_LEN; i += 4) {
-  //    echo_est[i] = WEBRTC_SPL_MUL_16_U16(aecm->channelStored[i],
-  //                                        far_spectrum[i]);
-  //    echo_est[i + 1] = WEBRTC_SPL_MUL_16_U16(aecm->channelStored[i + 1],
-  //                                            far_spectrum[i + 1]);
-  //    echo_est[i + 2] = WEBRTC_SPL_MUL_16_U16(aecm->channelStored[i + 2],
-  //                                            far_spectrum[i + 2]);
-  //    echo_est[i + 3] = WEBRTC_SPL_MUL_16_U16(aecm->channelStored[i + 3],
-  //                                            far_spectrum[i + 3]);
-  //  }
-  //  echo_est[i] = WEBRTC_SPL_MUL_16_U16(aecm->channelStored[i],
-  //                                     far_spectrum[i]);
-  const uint16_t* far_spectrum_p = far_spectrum;
-  int16_t* start_adapt_p = aecm->channelAdapt16;
-  int16_t* start_stored_p = aecm->channelStored;
-  const int16_t* end_stored_p = aecm->channelStored + PART_LEN;
-  int32_t* echo_est_p = echo_est;
-
-  uint16x8_t far_spectrum_v;
-  int16x8_t adapt_v;
-  uint32x4_t echo_est_v_low, echo_est_v_high;
-
-  while (start_stored_p < end_stored_p) {
-    far_spectrum_v = vld1q_u16(far_spectrum_p);
-    adapt_v = vld1q_s16(start_adapt_p);
-
-    vst1q_s16(start_stored_p, adapt_v);
-
-    echo_est_v_low = vmull_u16(vget_low_u16(far_spectrum_v),
-                               vget_low_u16(vreinterpretq_u16_s16(adapt_v)));
-    echo_est_v_high = vmull_u16(vget_high_u16(far_spectrum_v),
-                                vget_high_u16(vreinterpretq_u16_s16(adapt_v)));
-
-    vst1q_s32(echo_est_p, vreinterpretq_s32_u32(echo_est_v_low));
-    vst1q_s32(echo_est_p + 4, vreinterpretq_s32_u32(echo_est_v_high));
-
-    far_spectrum_p += 8;
-    start_adapt_p += 8;
-    start_stored_p += 8;
-    echo_est_p += 8;
-  }
-  aecm->channelStored[PART_LEN] = aecm->channelAdapt16[PART_LEN];
-  echo_est[PART_LEN] = WEBRTC_SPL_MUL_16_U16(aecm->channelStored[PART_LEN],
-                                             far_spectrum[PART_LEN]);
-}
-
-void WebRtcAecm_ResetAdaptiveChannelNeon(AecmCore* aecm) {
-  RTC_DCHECK_EQ(0, (uintptr_t)aecm->channelStored % 16);
-  RTC_DCHECK_EQ(0, (uintptr_t)aecm->channelAdapt16 % 16);
-  RTC_DCHECK_EQ(0, (uintptr_t)aecm->channelAdapt32 % 32);
-
-  // The C code of following optimized code.
-  // for (i = 0; i < PART_LEN1; i++) {
-  //   aecm->channelAdapt16[i] = aecm->channelStored[i];
-  //   aecm->channelAdapt32[i] = WEBRTC_SPL_LSHIFT_W32(
-  //              (int32_t)aecm->channelStored[i], 16);
-  // }
-
-  int16_t* start_stored_p = aecm->channelStored;
-  int16_t* start_adapt16_p = aecm->channelAdapt16;
-  int32_t* start_adapt32_p = aecm->channelAdapt32;
-  const int16_t* end_stored_p = start_stored_p + PART_LEN;
-
-  int16x8_t stored_v;
-  int32x4_t adapt32_v_low, adapt32_v_high;
-
-  while (start_stored_p < end_stored_p) {
-    stored_v = vld1q_s16(start_stored_p);
-    vst1q_s16(start_adapt16_p, stored_v);
-
-    adapt32_v_low = vshll_n_s16(vget_low_s16(stored_v), 16);
-    adapt32_v_high = vshll_n_s16(vget_high_s16(stored_v), 16);
-
-    vst1q_s32(start_adapt32_p, adapt32_v_low);
-    vst1q_s32(start_adapt32_p + 4, adapt32_v_high);
-
-    start_stored_p += 8;
-    start_adapt16_p += 8;
-    start_adapt32_p += 8;
-  }
-  aecm->channelAdapt16[PART_LEN] = aecm->channelStored[PART_LEN];
-  aecm->channelAdapt32[PART_LEN] = (int32_t)aecm->channelStored[PART_LEN] << 16;
-}
-
-#endif
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aecm/aecm_defines.h b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aecm/aecm_defines.h
deleted file mode 100644
index 5805549e2c..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aecm/aecm_defines.h
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
- *  Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#ifndef MODULES_AUDIO_PROCESSING_AECM_AECM_DEFINES_H_
-#define MODULES_AUDIO_PROCESSING_AECM_AECM_DEFINES_H_
-
-#define AECM_DYNAMIC_Q /* Turn on/off dynamic Q-domain. */
-
-/* Algorithm parameters */
-#define FRAME_LEN 80 /* Total frame length, 10 ms. */
-
-#define PART_LEN 64      /* Length of partition. */
-#define PART_LEN_SHIFT 7 /* Length of (PART_LEN * 2) in base 2. */
-
-#define PART_LEN1 (PART_LEN + 1)  /* Unique fft coefficients. */
-#define PART_LEN2 (PART_LEN << 1) /* Length of partition * 2. */
-#define PART_LEN4 (PART_LEN << 2) /* Length of partition * 4. */
-#define FAR_BUF_LEN PART_LEN4     /* Length of buffers. */
-#define MAX_DELAY 100
-
-/* Counter parameters */
-#define CONV_LEN 512              /* Convergence length used at startup. */
-#define CONV_LEN2 (CONV_LEN << 1) /* Used at startup. */
-
-/* Energy parameters */
-#define MAX_BUF_LEN 64            /* History length of energy signals. */
-#define FAR_ENERGY_MIN 1025       /* Lowest Far energy level: At least 2 */
-                                  /* in energy. */
-#define FAR_ENERGY_DIFF 929       /* Allowed difference between max */
-                                  /* and min. */
-#define ENERGY_DEV_OFFSET 0       /* The energy error offset in Q8. */
-#define ENERGY_DEV_TOL 400        /* The energy estimation tolerance (Q8). */
-#define FAR_ENERGY_VAD_REGION 230 /* Far VAD tolerance region. */
-
-/* Stepsize parameters */
-#define MU_MIN 10 /* Min stepsize 2^-MU_MIN (far end energy */
-                  /* dependent). */
-#define MU_MAX 1  /* Max stepsize 2^-MU_MAX (far end energy */
-                  /* dependent). */
-#define MU_DIFF 9 /* MU_MIN - MU_MAX */
-
-/* Channel parameters */
-#define MIN_MSE_COUNT 20 /* Min number of consecutive blocks with enough */
-                         /* far end energy to compare channel estimates. */
-#define MIN_MSE_DIFF 29  /* The ratio between adapted and stored channel to */
-                         /* accept a new storage (0.8 in Q-MSE_RESOLUTION). */
-#define MSE_RESOLUTION 5 /* MSE parameter resolution. */
-#define RESOLUTION_CHANNEL16 12 /* W16 Channel in Q-RESOLUTION_CHANNEL16. */
-#define RESOLUTION_CHANNEL32 28 /* W32 Channel in Q-RESOLUTION_CHANNEL. */
-#define CHANNEL_VAD 16          /* Minimum energy in frequency band */
-                                /* to update channel. */
-
-/* Suppression gain parameters: SUPGAIN parameters in Q-(RESOLUTION_SUPGAIN). */
-#define RESOLUTION_SUPGAIN 8 /* Channel in Q-(RESOLUTION_SUPGAIN). */
-#define SUPGAIN_DEFAULT (1 << RESOLUTION_SUPGAIN) /* Default. */
-#define SUPGAIN_ERROR_PARAM_A 3072            /* Estimation error parameter */
-                                              /* (Maximum gain) (8 in Q8). */
-#define SUPGAIN_ERROR_PARAM_B 1536            /* Estimation error parameter */
-                                              /* (Gain before going down). */
-#define SUPGAIN_ERROR_PARAM_D SUPGAIN_DEFAULT /* Estimation error parameter */
-/* (Should be the same as Default) (1 in Q8). */
-#define SUPGAIN_EPC_DT 200 /* SUPGAIN_ERROR_PARAM_C * ENERGY_DEV_TOL */
-
-/* Defines for "check delay estimation" */
-#define CORR_WIDTH 31 /* Number of samples to correlate over. */
-#define CORR_MAX 16   /* Maximum correlation offset. */
-#define CORR_MAX_BUF 63
-#define CORR_DEV 4
-#define CORR_MAX_LEVEL 20
-#define CORR_MAX_LOW 4
-#define CORR_BUF_LEN (CORR_MAX << 1) + 1
-/* Note that CORR_WIDTH + 2*CORR_MAX <= MAX_BUF_LEN. */
-
-#define ONE_Q14 (1 << 14)
-
-/* NLP defines */
-#define NLP_COMP_LOW 3277     /* 0.2 in Q14 */
-#define NLP_COMP_HIGH ONE_Q14 /* 1 in Q14 */
-
-#endif
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aecm/echo_control_mobile.cc b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aecm/echo_control_mobile.cc
deleted file mode 100644
index 257dfbf56e..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aecm/echo_control_mobile.cc
+++ /dev/null
@@ -1,594 +0,0 @@
-/*
- *  Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#include "modules/audio_processing/aecm/echo_control_mobile.h"
-
-#ifdef AEC_DEBUG
-#include <stdio.h>
-#endif
-#include <stdlib.h>
-#include <string.h>
-
-extern "C" {
-#include "common_audio/ring_buffer.h"
-#include "common_audio/signal_processing/include/signal_processing_library.h"
-#include "modules/audio_processing/aecm/aecm_defines.h"
-}
-#include "modules/audio_processing/aecm/aecm_core.h"
-
-#define BUF_SIZE_FRAMES 50  // buffer size (frames)
-// Maximum length of resampled signal. Must be an integer multiple of frames
-// (ceil(1/(1 + MIN_SKEW)*2) + 1)*FRAME_LEN
-// The factor of 2 handles wb, and the + 1 is as a safety margin
-#define MAX_RESAMP_LEN (5 * FRAME_LEN)
-
-static const size_t kBufSizeSamp =
-    BUF_SIZE_FRAMES * FRAME_LEN;  // buffer size (samples)
-static const int kSampMsNb = 8;   // samples per ms in nb
-// Target suppression levels for nlp modes
-// log{0.001, 0.00001, 0.00000001}
-static const int kInitCheck = 42;
-
-typedef struct {
-  int sampFreq;
-  int scSampFreq;
-  short bufSizeStart;
-  int knownDelay;
-
-  // Stores the last frame added to the farend buffer
-  short farendOld[2][FRAME_LEN];
-  short initFlag;  // indicates if AEC has been initialized
-
-  // Variables used for averaging far end buffer size
-  short counter;
-  short sum;
-  short firstVal;
-  short checkBufSizeCtr;
-
-  // Variables used for delay shifts
-  short msInSndCardBuf;
-  short filtDelay;
-  int timeForDelayChange;
-  int ECstartup;
-  int checkBuffSize;
-  int delayChange;
-  short lastDelayDiff;
-
-  int16_t echoMode;
-
-#ifdef AEC_DEBUG
-  FILE* bufFile;
-  FILE* delayFile;
-  FILE* preCompFile;
-  FILE* postCompFile;
-#endif  // AEC_DEBUG
-  // Structures
-  RingBuffer* farendBuf;
-
-  AecmCore* aecmCore;
-} AecMobile;
-
-// Estimates delay to set the position of the farend buffer read pointer
-// (controlled by knownDelay)
-static int WebRtcAecm_EstBufDelay(AecMobile* aecm, short msInSndCardBuf);
-
-// Stuffs the farend buffer if the estimated delay is too large
-static int WebRtcAecm_DelayComp(AecMobile* aecm);
-
-void* WebRtcAecm_Create() {
-  AecMobile* aecm = static_cast<AecMobile*>(malloc(sizeof(AecMobile)));
-
-  WebRtcSpl_Init();
-
-  aecm->aecmCore = WebRtcAecm_CreateCore();
-  if (!aecm->aecmCore) {
-    WebRtcAecm_Free(aecm);
-    return NULL;
-  }
-
-  aecm->farendBuf = WebRtc_CreateBuffer(kBufSizeSamp, sizeof(int16_t));
-  if (!aecm->farendBuf) {
-    WebRtcAecm_Free(aecm);
-    return NULL;
-  }
-
-  aecm->initFlag = 0;
-
-#ifdef AEC_DEBUG
-  aecm->aecmCore->farFile = fopen("aecFar.pcm", "wb");
-  aecm->aecmCore->nearFile = fopen("aecNear.pcm", "wb");
-  aecm->aecmCore->outFile = fopen("aecOut.pcm", "wb");
-  // aecm->aecmCore->outLpFile = fopen("aecOutLp.pcm","wb");
-
-  aecm->bufFile = fopen("aecBuf.dat", "wb");
-  aecm->delayFile = fopen("aecDelay.dat", "wb");
-  aecm->preCompFile = fopen("preComp.pcm", "wb");
-  aecm->postCompFile = fopen("postComp.pcm", "wb");
-#endif  // AEC_DEBUG
-  return aecm;
-}
-
-void WebRtcAecm_Free(void* aecmInst) {
-  AecMobile* aecm = static_cast<AecMobile*>(aecmInst);
-
-  if (aecm == NULL) {
-    return;
-  }
-
-#ifdef AEC_DEBUG
-  fclose(aecm->aecmCore->farFile);
-  fclose(aecm->aecmCore->nearFile);
-  fclose(aecm->aecmCore->outFile);
-  // fclose(aecm->aecmCore->outLpFile);
-
-  fclose(aecm->bufFile);
-  fclose(aecm->delayFile);
-  fclose(aecm->preCompFile);
-  fclose(aecm->postCompFile);
-#endif  // AEC_DEBUG
-  WebRtcAecm_FreeCore(aecm->aecmCore);
-  WebRtc_FreeBuffer(aecm->farendBuf);
-  free(aecm);
-}
-
-int32_t WebRtcAecm_Init(void* aecmInst, int32_t sampFreq) {
-  AecMobile* aecm = static_cast<AecMobile*>(aecmInst);
-  AecmConfig aecConfig;
-
-  if (aecm == NULL) {
-    return -1;
-  }
-
-  if (sampFreq != 8000 && sampFreq != 16000) {
-    return AECM_BAD_PARAMETER_ERROR;
-  }
-  aecm->sampFreq = sampFreq;
-
-  // Initialize AECM core
-  if (WebRtcAecm_InitCore(aecm->aecmCore, aecm->sampFreq) == -1) {
-    return AECM_UNSPECIFIED_ERROR;
-  }
-
-  // Initialize farend buffer
-  WebRtc_InitBuffer(aecm->farendBuf);
-
-  aecm->initFlag = kInitCheck;  // indicates that initialization has been done
-
-  aecm->delayChange = 1;
-
-  aecm->sum = 0;
-  aecm->counter = 0;
-  aecm->checkBuffSize = 1;
-  aecm->firstVal = 0;
-
-  aecm->ECstartup = 1;
-  aecm->bufSizeStart = 0;
-  aecm->checkBufSizeCtr = 0;
-  aecm->filtDelay = 0;
-  aecm->timeForDelayChange = 0;
-  aecm->knownDelay = 0;
-  aecm->lastDelayDiff = 0;
-
-  memset(&aecm->farendOld, 0, sizeof(aecm->farendOld));
-
-  // Default settings.
-  aecConfig.cngMode = AecmTrue;
-  aecConfig.echoMode = 3;
-
-  if (WebRtcAecm_set_config(aecm, aecConfig) == -1) {
-    return AECM_UNSPECIFIED_ERROR;
-  }
-
-  return 0;
-}
-
-// Returns any error that is caused when buffering the
-// farend signal.
-int32_t WebRtcAecm_GetBufferFarendError(void* aecmInst,
-                                        const int16_t* farend,
-                                        size_t nrOfSamples) {
-  AecMobile* aecm = static_cast<AecMobile*>(aecmInst);
-
-  if (aecm == NULL)
-    return -1;
-
-  if (farend == NULL)
-    return AECM_NULL_POINTER_ERROR;
-
-  if (aecm->initFlag != kInitCheck)
-    return AECM_UNINITIALIZED_ERROR;
-
-  if (nrOfSamples != 80 && nrOfSamples != 160)
-    return AECM_BAD_PARAMETER_ERROR;
-
-  return 0;
-}
-
-int32_t WebRtcAecm_BufferFarend(void* aecmInst,
-                                const int16_t* farend,
-                                size_t nrOfSamples) {
-  AecMobile* aecm = static_cast<AecMobile*>(aecmInst);
-
-  const int32_t err =
-      WebRtcAecm_GetBufferFarendError(aecmInst, farend, nrOfSamples);
-
-  if (err != 0)
-    return err;
-
-  // TODO(unknown): Is this really a good idea?
-  if (!aecm->ECstartup) {
-    WebRtcAecm_DelayComp(aecm);
-  }
-
-  WebRtc_WriteBuffer(aecm->farendBuf, farend, nrOfSamples);
-
-  return 0;
-}
-
-int32_t WebRtcAecm_Process(void* aecmInst,
-                           const int16_t* nearendNoisy,
-                           const int16_t* nearendClean,
-                           int16_t* out,
-                           size_t nrOfSamples,
-                           int16_t msInSndCardBuf) {
-  AecMobile* aecm = static_cast<AecMobile*>(aecmInst);
-  int32_t retVal = 0;
-  size_t i;
-  short nmbrOfFilledBuffers;
-  size_t nBlocks10ms;
-  size_t nFrames;
-#ifdef AEC_DEBUG
-  short msInAECBuf;
-#endif
-
-  if (aecm == NULL) {
-    return -1;
-  }
-
-  if (nearendNoisy == NULL) {
-    return AECM_NULL_POINTER_ERROR;
-  }
-
-  if (out == NULL) {
-    return AECM_NULL_POINTER_ERROR;
-  }
-
-  if (aecm->initFlag != kInitCheck) {
-    return AECM_UNINITIALIZED_ERROR;
-  }
-
-  if (nrOfSamples != 80 && nrOfSamples != 160) {
-    return AECM_BAD_PARAMETER_ERROR;
-  }
-
-  if (msInSndCardBuf < 0) {
-    msInSndCardBuf = 0;
-    retVal = AECM_BAD_PARAMETER_WARNING;
-  } else if (msInSndCardBuf > 500) {
-    msInSndCardBuf = 500;
-    retVal = AECM_BAD_PARAMETER_WARNING;
-  }
-  msInSndCardBuf += 10;
-  aecm->msInSndCardBuf = msInSndCardBuf;
-
-  nFrames = nrOfSamples / FRAME_LEN;
-  nBlocks10ms = nFrames / aecm->aecmCore->mult;
-
-  if (aecm->ECstartup) {
-    if (nearendClean == NULL) {
-      if (out != nearendNoisy) {
-        memcpy(out, nearendNoisy, sizeof(short) * nrOfSamples);
-      }
-    } else if (out != nearendClean) {
-      memcpy(out, nearendClean, sizeof(short) * nrOfSamples);
-    }
-
-    nmbrOfFilledBuffers =
-        (short)WebRtc_available_read(aecm->farendBuf) / FRAME_LEN;
-    // The AECM is in the start up mode
-    // AECM is disabled until the soundcard buffer and farend buffers are OK
-
-    // Mechanism to ensure that the soundcard buffer is reasonably stable.
-    if (aecm->checkBuffSize) {
-      aecm->checkBufSizeCtr++;
-      // Before we fill up the far end buffer we require the amount of data on
-      // the sound card to be stable (+/-8 ms) compared to the first value. This
-      // comparison is made during the following 4 consecutive frames. If it
-      // seems to be stable then we start to fill up the far end buffer.
-
-      if (aecm->counter == 0) {
-        aecm->firstVal = aecm->msInSndCardBuf;
-        aecm->sum = 0;
-      }
-
-      if (abs(aecm->firstVal - aecm->msInSndCardBuf) <
-          WEBRTC_SPL_MAX(0.2 * aecm->msInSndCardBuf, kSampMsNb)) {
-        aecm->sum += aecm->msInSndCardBuf;
-        aecm->counter++;
-      } else {
-        aecm->counter = 0;
-      }
-
-      if (aecm->counter * nBlocks10ms >= 6) {
-        // The farend buffer size is determined in blocks of 80 samples
-        // Use 75% of the average value of the soundcard buffer
-        aecm->bufSizeStart = WEBRTC_SPL_MIN(
-            (3 * aecm->sum * aecm->aecmCore->mult) / (aecm->counter * 40),
-            BUF_SIZE_FRAMES);
-        // buffersize has now been determined
-        aecm->checkBuffSize = 0;
-      }
-
-      if (aecm->checkBufSizeCtr * nBlocks10ms > 50) {
-        // for really bad sound cards, don't disable echocanceller for more than
-        // 0.5 sec
-        aecm->bufSizeStart = WEBRTC_SPL_MIN(
-            (3 * aecm->msInSndCardBuf * aecm->aecmCore->mult) / 40,
-            BUF_SIZE_FRAMES);
-        aecm->checkBuffSize = 0;
-      }
-    }
-
-    // if checkBuffSize changed in the if-statement above
-    if (!aecm->checkBuffSize) {
-      // soundcard buffer is now reasonably stable
-      // When the far end buffer is filled with approximately the same amount of
-      // data as the amount on the sound card we end the start up phase and
-      // start to cancel echoes.
-
-      if (nmbrOfFilledBuffers == aecm->bufSizeStart) {
-        aecm->ECstartup = 0;  // Enable the AECM
-      } else if (nmbrOfFilledBuffers > aecm->bufSizeStart) {
-        WebRtc_MoveReadPtr(aecm->farendBuf,
-                           (int)WebRtc_available_read(aecm->farendBuf) -
-                               (int)aecm->bufSizeStart * FRAME_LEN);
-        aecm->ECstartup = 0;
-      }
-    }
-
-  } else {
-    // AECM is enabled
-
-    // Note only 1 block supported for nb and 2 blocks for wb
-    for (i = 0; i < nFrames; i++) {
-      int16_t farend[FRAME_LEN];
-      const int16_t* farend_ptr = NULL;
-
-      nmbrOfFilledBuffers =
-          (short)WebRtc_available_read(aecm->farendBuf) / FRAME_LEN;
-
-      // Check that there is data in the far end buffer
-      if (nmbrOfFilledBuffers > 0) {
-        // Get the next 80 samples from the farend buffer
-        WebRtc_ReadBuffer(aecm->farendBuf, (void**)&farend_ptr, farend,
-                          FRAME_LEN);
-
-        // Always store the last frame for use when we run out of data
-        memcpy(&(aecm->farendOld[i][0]), farend_ptr, FRAME_LEN * sizeof(short));
-      } else {
-        // We have no data so we use the last played frame
-        memcpy(farend, &(aecm->farendOld[i][0]), FRAME_LEN * sizeof(short));
-        farend_ptr = farend;
-      }
-
-      // Call buffer delay estimator when all data is extracted,
-      // i,e. i = 0 for NB and i = 1 for WB
-      if ((i == 0 && aecm->sampFreq == 8000) ||
-          (i == 1 && aecm->sampFreq == 16000)) {
-        WebRtcAecm_EstBufDelay(aecm, aecm->msInSndCardBuf);
-      }
-
-      // Call the AECM
-      /*WebRtcAecm_ProcessFrame(aecm->aecmCore, farend, &nearend[FRAME_LEN * i],
-       &out[FRAME_LEN * i], aecm->knownDelay);*/
-      if (WebRtcAecm_ProcessFrame(
-              aecm->aecmCore, farend_ptr, &nearendNoisy[FRAME_LEN * i],
-              (nearendClean ? &nearendClean[FRAME_LEN * i] : NULL),
-              &out[FRAME_LEN * i]) == -1)
-        return -1;
-    }
-  }
-
-#ifdef AEC_DEBUG
-  msInAECBuf = (short)WebRtc_available_read(aecm->farendBuf) /
-               (kSampMsNb * aecm->aecmCore->mult);
-  fwrite(&msInAECBuf, 2, 1, aecm->bufFile);
-  fwrite(&(aecm->knownDelay), sizeof(aecm->knownDelay), 1, aecm->delayFile);
-#endif
-
-  return retVal;
-}
-
-int32_t WebRtcAecm_set_config(void* aecmInst, AecmConfig config) {
-  AecMobile* aecm = static_cast<AecMobile*>(aecmInst);
-
-  if (aecm == NULL) {
-    return -1;
-  }
-
-  if (aecm->initFlag != kInitCheck) {
-    return AECM_UNINITIALIZED_ERROR;
-  }
-
-  if (config.cngMode != AecmFalse && config.cngMode != AecmTrue) {
-    return AECM_BAD_PARAMETER_ERROR;
-  }
-  aecm->aecmCore->cngMode = config.cngMode;
-
-  if (config.echoMode < 0 || config.echoMode > 4) {
-    return AECM_BAD_PARAMETER_ERROR;
-  }
-  aecm->echoMode = config.echoMode;
-
-  if (aecm->echoMode == 0) {
-    aecm->aecmCore->supGain = SUPGAIN_DEFAULT >> 3;
-    aecm->aecmCore->supGainOld = SUPGAIN_DEFAULT >> 3;
-    aecm->aecmCore->supGainErrParamA = SUPGAIN_ERROR_PARAM_A >> 3;
-    aecm->aecmCore->supGainErrParamD = SUPGAIN_ERROR_PARAM_D >> 3;
-    aecm->aecmCore->supGainErrParamDiffAB =
-        (SUPGAIN_ERROR_PARAM_A >> 3) - (SUPGAIN_ERROR_PARAM_B >> 3);
-    aecm->aecmCore->supGainErrParamDiffBD =
-        (SUPGAIN_ERROR_PARAM_B >> 3) - (SUPGAIN_ERROR_PARAM_D >> 3);
-  } else if (aecm->echoMode == 1) {
-    aecm->aecmCore->supGain = SUPGAIN_DEFAULT >> 2;
-    aecm->aecmCore->supGainOld = SUPGAIN_DEFAULT >> 2;
-    aecm->aecmCore->supGainErrParamA = SUPGAIN_ERROR_PARAM_A >> 2;
-    aecm->aecmCore->supGainErrParamD = SUPGAIN_ERROR_PARAM_D >> 2;
-    aecm->aecmCore->supGainErrParamDiffAB =
-        (SUPGAIN_ERROR_PARAM_A >> 2) - (SUPGAIN_ERROR_PARAM_B >> 2);
-    aecm->aecmCore->supGainErrParamDiffBD =
-        (SUPGAIN_ERROR_PARAM_B >> 2) - (SUPGAIN_ERROR_PARAM_D >> 2);
-  } else if (aecm->echoMode == 2) {
-    aecm->aecmCore->supGain = SUPGAIN_DEFAULT >> 1;
-    aecm->aecmCore->supGainOld = SUPGAIN_DEFAULT >> 1;
-    aecm->aecmCore->supGainErrParamA = SUPGAIN_ERROR_PARAM_A >> 1;
-    aecm->aecmCore->supGainErrParamD = SUPGAIN_ERROR_PARAM_D >> 1;
-    aecm->aecmCore->supGainErrParamDiffAB =
-        (SUPGAIN_ERROR_PARAM_A >> 1) - (SUPGAIN_ERROR_PARAM_B >> 1);
-    aecm->aecmCore->supGainErrParamDiffBD =
-        (SUPGAIN_ERROR_PARAM_B >> 1) - (SUPGAIN_ERROR_PARAM_D >> 1);
-  } else if (aecm->echoMode == 3) {
-    aecm->aecmCore->supGain = SUPGAIN_DEFAULT;
-    aecm->aecmCore->supGainOld = SUPGAIN_DEFAULT;
-    aecm->aecmCore->supGainErrParamA = SUPGAIN_ERROR_PARAM_A;
-    aecm->aecmCore->supGainErrParamD = SUPGAIN_ERROR_PARAM_D;
-    aecm->aecmCore->supGainErrParamDiffAB =
-        SUPGAIN_ERROR_PARAM_A - SUPGAIN_ERROR_PARAM_B;
-    aecm->aecmCore->supGainErrParamDiffBD =
-        SUPGAIN_ERROR_PARAM_B - SUPGAIN_ERROR_PARAM_D;
-  } else if (aecm->echoMode == 4) {
-    aecm->aecmCore->supGain = SUPGAIN_DEFAULT << 1;
-    aecm->aecmCore->supGainOld = SUPGAIN_DEFAULT << 1;
-    aecm->aecmCore->supGainErrParamA = SUPGAIN_ERROR_PARAM_A << 1;
-    aecm->aecmCore->supGainErrParamD = SUPGAIN_ERROR_PARAM_D << 1;
-    aecm->aecmCore->supGainErrParamDiffAB =
-        (SUPGAIN_ERROR_PARAM_A << 1) - (SUPGAIN_ERROR_PARAM_B << 1);
-    aecm->aecmCore->supGainErrParamDiffBD =
-        (SUPGAIN_ERROR_PARAM_B << 1) - (SUPGAIN_ERROR_PARAM_D << 1);
-  }
-
-  return 0;
-}
-
-int32_t WebRtcAecm_InitEchoPath(void* aecmInst,
-                                const void* echo_path,
-                                size_t size_bytes) {
-  AecMobile* aecm = static_cast<AecMobile*>(aecmInst);
-  const int16_t* echo_path_ptr = static_cast<const int16_t*>(echo_path);
-
-  if (aecmInst == NULL) {
-    return -1;
-  }
-  if (echo_path == NULL) {
-    return AECM_NULL_POINTER_ERROR;
-  }
-  if (size_bytes != WebRtcAecm_echo_path_size_bytes()) {
-    // Input channel size does not match the size of AECM
-    return AECM_BAD_PARAMETER_ERROR;
-  }
-  if (aecm->initFlag != kInitCheck) {
-    return AECM_UNINITIALIZED_ERROR;
-  }
-
-  WebRtcAecm_InitEchoPathCore(aecm->aecmCore, echo_path_ptr);
-
-  return 0;
-}
-
-int32_t WebRtcAecm_GetEchoPath(void* aecmInst,
-                               void* echo_path,
-                               size_t size_bytes) {
-  AecMobile* aecm = static_cast<AecMobile*>(aecmInst);
-  int16_t* echo_path_ptr = static_cast<int16_t*>(echo_path);
-
-  if (aecmInst == NULL) {
-    return -1;
-  }
-  if (echo_path == NULL) {
-    return AECM_NULL_POINTER_ERROR;
-  }
-  if (size_bytes != WebRtcAecm_echo_path_size_bytes()) {
-    // Input channel size does not match the size of AECM
-    return AECM_BAD_PARAMETER_ERROR;
-  }
-  if (aecm->initFlag != kInitCheck) {
-    return AECM_UNINITIALIZED_ERROR;
-  }
-
-  memcpy(echo_path_ptr, aecm->aecmCore->channelStored, size_bytes);
-  return 0;
-}
-
-size_t WebRtcAecm_echo_path_size_bytes() {
-  return (PART_LEN1 * sizeof(int16_t));
-}
-
-static int WebRtcAecm_EstBufDelay(AecMobile* aecm, short msInSndCardBuf) {
-  short delayNew, nSampSndCard;
-  short nSampFar = (short)WebRtc_available_read(aecm->farendBuf);
-  short diff;
-
-  nSampSndCard = msInSndCardBuf * kSampMsNb * aecm->aecmCore->mult;
-
-  delayNew = nSampSndCard - nSampFar;
-
-  if (delayNew < FRAME_LEN) {
-    WebRtc_MoveReadPtr(aecm->farendBuf, FRAME_LEN);
-    delayNew += FRAME_LEN;
-  }
-
-  aecm->filtDelay =
-      WEBRTC_SPL_MAX(0, (8 * aecm->filtDelay + 2 * delayNew) / 10);
-
-  diff = aecm->filtDelay - aecm->knownDelay;
-  if (diff > 224) {
-    if (aecm->lastDelayDiff < 96) {
-      aecm->timeForDelayChange = 0;
-    } else {
-      aecm->timeForDelayChange++;
-    }
-  } else if (diff < 96 && aecm->knownDelay > 0) {
-    if (aecm->lastDelayDiff > 224) {
-      aecm->timeForDelayChange = 0;
-    } else {
-      aecm->timeForDelayChange++;
-    }
-  } else {
-    aecm->timeForDelayChange = 0;
-  }
-  aecm->lastDelayDiff = diff;
-
-  if (aecm->timeForDelayChange > 25) {
-    aecm->knownDelay = WEBRTC_SPL_MAX((int)aecm->filtDelay - 160, 0);
-  }
-  return 0;
-}
-
-static int WebRtcAecm_DelayComp(AecMobile* aecm) {
-  int nSampFar = (int)WebRtc_available_read(aecm->farendBuf);
-  int nSampSndCard, delayNew, nSampAdd;
-  const int maxStuffSamp = 10 * FRAME_LEN;
-
-  nSampSndCard = aecm->msInSndCardBuf * kSampMsNb * aecm->aecmCore->mult;
-  delayNew = nSampSndCard - nSampFar;
-
-  if (delayNew > FAR_BUF_LEN - FRAME_LEN * aecm->aecmCore->mult) {
-    // The difference of the buffer sizes is larger than the maximum
-    // allowed known delay. Compensate by stuffing the buffer.
-    nSampAdd =
-        (int)(WEBRTC_SPL_MAX(((nSampSndCard >> 1) - nSampFar), FRAME_LEN));
-    nSampAdd = WEBRTC_SPL_MIN(nSampAdd, maxStuffSamp);
-
-    WebRtc_MoveReadPtr(aecm->farendBuf, -nSampAdd);
-    aecm->delayChange = 1;  // the delay needs to be updated
-  }
-
-  return 0;
-}
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aecm/echo_control_mobile.h b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aecm/echo_control_mobile.h
deleted file mode 100644
index cea13b8b5e..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/aecm/echo_control_mobile.h
+++ /dev/null
@@ -1,204 +0,0 @@
-/*
- *  Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#ifndef MODULES_AUDIO_PROCESSING_AECM_ECHO_CONTROL_MOBILE_H_
-#define MODULES_AUDIO_PROCESSING_AECM_ECHO_CONTROL_MOBILE_H_
-
-#include <stddef.h>
-#include <stdint.h>
-
-enum { AecmFalse = 0, AecmTrue };
-
-// Errors
-#define AECM_UNSPECIFIED_ERROR 12000
-#define AECM_UNSUPPORTED_FUNCTION_ERROR 12001
-#define AECM_UNINITIALIZED_ERROR 12002
-#define AECM_NULL_POINTER_ERROR 12003
-#define AECM_BAD_PARAMETER_ERROR 12004
-
-// Warnings
-#define AECM_BAD_PARAMETER_WARNING 12100
-
-typedef struct {
-  int16_t cngMode;   // AECM_FALSE, AECM_TRUE (default)
-  int16_t echoMode;  // 0, 1, 2, 3 (default), 4
-} AecmConfig;
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*
- * Allocates the memory needed by the AECM. The memory needs to be
- * initialized separately using the WebRtcAecm_Init() function.
- * Returns a pointer to the instance and a nullptr at failure.
- */
-void* WebRtcAecm_Create();
-
-/*
- * This function releases the memory allocated by WebRtcAecm_Create()
- *
- * Inputs                       Description
- * -------------------------------------------------------------------
- * void*    aecmInst            Pointer to the AECM instance
- */
-void WebRtcAecm_Free(void* aecmInst);
-
-/*
- * Initializes an AECM instance.
- *
- * Inputs                       Description
- * -------------------------------------------------------------------
- * void*          aecmInst      Pointer to the AECM instance
- * int32_t        sampFreq      Sampling frequency of data
- *
- * Outputs                      Description
- * -------------------------------------------------------------------
- * int32_t        return        0: OK
- *                              1200-12004,12100: error/warning
- */
-int32_t WebRtcAecm_Init(void* aecmInst, int32_t sampFreq);
-
-/*
- * Inserts an 80 or 160 sample block of data into the farend buffer.
- *
- * Inputs                       Description
- * -------------------------------------------------------------------
- * void*          aecmInst      Pointer to the AECM instance
- * int16_t*       farend        In buffer containing one frame of
- *                              farend signal
- * int16_t        nrOfSamples   Number of samples in farend buffer
- *
- * Outputs                      Description
- * -------------------------------------------------------------------
- * int32_t        return        0: OK
- *                              1200-12004,12100: error/warning
- */
-int32_t WebRtcAecm_BufferFarend(void* aecmInst,
-                                const int16_t* farend,
-                                size_t nrOfSamples);
-
-/*
- * Reports any errors that would arise when buffering a farend buffer.
- *
- * Inputs                       Description
- * -------------------------------------------------------------------
- * void*          aecmInst      Pointer to the AECM instance
- * int16_t*       farend        In buffer containing one frame of
- *                              farend signal
- * int16_t        nrOfSamples   Number of samples in farend buffer
- *
- * Outputs                      Description
- * -------------------------------------------------------------------
- * int32_t        return        0: OK
- *                              1200-12004,12100: error/warning
- */
-int32_t WebRtcAecm_GetBufferFarendError(void* aecmInst,
-                                        const int16_t* farend,
-                                        size_t nrOfSamples);
-
-/*
- * Runs the AECM on an 80 or 160 sample blocks of data.
- *
- * Inputs                        Description
- * -------------------------------------------------------------------
- * void*          aecmInst       Pointer to the AECM instance
- * int16_t*       nearendNoisy   In buffer containing one frame of
- *                               reference nearend+echo signal. If
- *                               noise reduction is active, provide
- *                               the noisy signal here.
- * int16_t*       nearendClean   In buffer containing one frame of
- *                               nearend+echo signal. If noise
- *                               reduction is active, provide the
- *                               clean signal here. Otherwise pass a
- *                               NULL pointer.
- * int16_t        nrOfSamples    Number of samples in nearend buffer
- * int16_t        msInSndCardBuf Delay estimate for sound card and
- *                               system buffers
- *
- * Outputs                       Description
- * -------------------------------------------------------------------
- * int16_t*       out            Out buffer, one frame of processed nearend
- * int32_t        return         0: OK
- *                               1200-12004,12100: error/warning
- */
-int32_t WebRtcAecm_Process(void* aecmInst,
-                           const int16_t* nearendNoisy,
-                           const int16_t* nearendClean,
-                           int16_t* out,
-                           size_t nrOfSamples,
-                           int16_t msInSndCardBuf);
-
-/*
- * This function enables the user to set certain parameters on-the-fly
- *
- * Inputs                       Description
- * -------------------------------------------------------------------
- * void*          aecmInst      Pointer to the AECM instance
- * AecmConfig     config        Config instance that contains all
- *                              properties to be set
- *
- * Outputs                      Description
- * -------------------------------------------------------------------
- * int32_t        return        0: OK
- *                              1200-12004,12100: error/warning
- */
-int32_t WebRtcAecm_set_config(void* aecmInst, AecmConfig config);
-
-/*
- * This function enables the user to set the echo path on-the-fly.
- *
- * Inputs                       Description
- * -------------------------------------------------------------------
- * void*        aecmInst        Pointer to the AECM instance
- * void*        echo_path       Pointer to the echo path to be set
- * size_t       size_bytes      Size in bytes of the echo path
- *
- * Outputs                      Description
- * -------------------------------------------------------------------
- * int32_t      return          0: OK
- *                              1200-12004,12100: error/warning
- */
-int32_t WebRtcAecm_InitEchoPath(void* aecmInst,
-                                const void* echo_path,
-                                size_t size_bytes);
-
-/*
- * This function enables the user to get the currently used echo path
- * on-the-fly
- *
- * Inputs                       Description
- * -------------------------------------------------------------------
- * void*        aecmInst        Pointer to the AECM instance
- * void*        echo_path       Pointer to echo path
- * size_t       size_bytes      Size in bytes of the echo path
- *
- * Outputs                      Description
- * -------------------------------------------------------------------
- * int32_t      return          0: OK
- *                              1200-12004,12100: error/warning
- */
-int32_t WebRtcAecm_GetEchoPath(void* aecmInst,
-                               void* echo_path,
-                               size_t size_bytes);
-
-/*
- * This function enables the user to get the echo path size in bytes
- *
- * Outputs                      Description
- * -------------------------------------------------------------------
- * size_t       return          Size in bytes
- */
-size_t WebRtcAecm_echo_path_size_bytes();
-
-#ifdef __cplusplus
-}
-#endif
-#endif  // MODULES_AUDIO_PROCESSING_AECM_ECHO_CONTROL_MOBILE_H_
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/agc/agc.cc b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/agc/agc.cc
deleted file mode 100644
index c24db0dd52..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/agc/agc.cc
+++ /dev/null
@@ -1,104 +0,0 @@
-/*
- *  Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#include "modules/audio_processing/agc/agc.h"
-
-#include <cmath>
-#include <cstdlib>
-#include <vector>
-
-#include "modules/audio_processing/agc/loudness_histogram.h"
-#include "modules/audio_processing/agc/utility.h"
-#include "rtc_base/checks.h"
-
-namespace webrtc {
-namespace {
-
-const int kDefaultLevelDbfs = -18;
-const int kNumAnalysisFrames = 100;
-const double kActivityThreshold = 0.3;
-
-}  // namespace
-
-Agc::Agc()
-    : target_level_loudness_(Dbfs2Loudness(kDefaultLevelDbfs)),
-      target_level_dbfs_(kDefaultLevelDbfs),
-      histogram_(LoudnessHistogram::Create(kNumAnalysisFrames)),
-      inactive_histogram_(LoudnessHistogram::Create()) {}
-
-Agc::~Agc() {}
-
-float Agc::AnalyzePreproc(const int16_t* audio, size_t length) {
-  RTC_DCHECK_GT(length, 0);
-  size_t num_clipped = 0;
-  for (size_t i = 0; i < length; ++i) {
-    if (audio[i] == 32767 || audio[i] == -32768)
-      ++num_clipped;
-  }
-  return 1.0f * num_clipped / length;
-}
-
-void Agc::Process(const int16_t* audio, size_t length, int sample_rate_hz) {
-  vad_.ProcessChunk(audio, length, sample_rate_hz);
-  const std::vector<double>& rms = vad_.chunkwise_rms();
-  const std::vector<double>& probabilities =
-      vad_.chunkwise_voice_probabilities();
-  RTC_DCHECK_EQ(rms.size(), probabilities.size());
-  for (size_t i = 0; i < rms.size(); ++i) {
-    histogram_->Update(rms[i], probabilities[i]);
-  }
-}
-
-bool Agc::GetRmsErrorDb(int* error) {
-  if (!error) {
-    RTC_NOTREACHED();
-    return false;
-  }
-
-  if (histogram_->num_updates() < kNumAnalysisFrames) {
-    // We haven't yet received enough frames.
-    return false;
-  }
-
-  if (histogram_->AudioContent() < kNumAnalysisFrames * kActivityThreshold) {
-    // We are likely in an inactive segment.
-    return false;
-  }
-
-  double loudness = Linear2Loudness(histogram_->CurrentRms());
-  *error = std::floor(Loudness2Db(target_level_loudness_ - loudness) + 0.5);
-  histogram_->Reset();
-  return true;
-}
-
-void Agc::Reset() {
-  histogram_->Reset();
-}
-
-int Agc::set_target_level_dbfs(int level) {
-  // TODO(turajs): just some arbitrary sanity check. We can come up with better
-  // limits. The upper limit should be chosen such that the risk of clipping is
-  // low. The lower limit should not result in a too quiet signal.
-  if (level >= 0 || level <= -100)
-    return -1;
-  target_level_dbfs_ = level;
-  target_level_loudness_ = Dbfs2Loudness(level);
-  return 0;
-}
-
-int Agc::target_level_dbfs() const {
-  return target_level_dbfs_;
-}
-
-float Agc::voice_probability() const {
-  return vad_.last_voice_probability();
-}
-
-}  // namespace webrtc
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/agc/agc.h b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/agc/agc.h
deleted file mode 100644
index abd68d5e31..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/agc/agc.h
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- *  Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#ifndef MODULES_AUDIO_PROCESSING_AGC_AGC_H_
-#define MODULES_AUDIO_PROCESSING_AGC_AGC_H_
-
-#include <memory>
-
-#include "modules/audio_processing/vad/voice_activity_detector.h"
-
-namespace webrtc {
-
-class LoudnessHistogram;
-
-class Agc {
- public:
-  Agc();
-  virtual ~Agc();
-
-  // Returns the proportion of samples in the buffer which are at full-scale
-  // (and presumably clipped).
-  virtual float AnalyzePreproc(const int16_t* audio, size_t length);
-  // |audio| must be mono; in a multi-channel stream, provide the first (usually
-  // left) channel.
-  virtual void Process(const int16_t* audio, size_t length, int sample_rate_hz);
-
-  // Retrieves the difference between the target RMS level and the current
-  // signal RMS level in dB. Returns true if an update is available and false
-  // otherwise, in which case |error| should be ignored and no action taken.
-  virtual bool GetRmsErrorDb(int* error);
-  virtual void Reset();
-
-  virtual int set_target_level_dbfs(int level);
-  virtual int target_level_dbfs() const;
-  virtual float voice_probability() const;
-
- private:
-  double target_level_loudness_;
-  int target_level_dbfs_;
-  std::unique_ptr<LoudnessHistogram> histogram_;
-  std::unique_ptr<LoudnessHistogram> inactive_histogram_;
-  VoiceActivityDetector vad_;
-};
-
-}  // namespace webrtc
-
-#endif  // MODULES_AUDIO_PROCESSING_AGC_AGC_H_
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/agc/agc_manager_direct.cc b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/agc/agc_manager_direct.cc
deleted file mode 100644
index 5c4deeccbf..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/agc/agc_manager_direct.cc
+++ /dev/null
@@ -1,501 +0,0 @@
-/*
- *  Copyright (c) 2013 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#include "modules/audio_processing/agc/agc_manager_direct.h"
-
-#include <algorithm>
-#include <cmath>
-
-#ifdef WEBRTC_AGC_DEBUG_DUMP
-#include <cstdio>
-#endif
-
-#include "modules/audio_processing/agc/gain_map_internal.h"
-#include "modules/audio_processing/agc2/adaptive_mode_level_estimator_agc.h"
-#include "modules/audio_processing/include/gain_control.h"
-#include "rtc_base/checks.h"
-#include "rtc_base/logging.h"
-#include "rtc_base/numerics/safe_minmax.h"
-#include "system_wrappers/include/metrics.h"
-
-namespace webrtc {
-
-int AgcManagerDirect::instance_counter_ = 0;
-
-namespace {
-
-// Amount the microphone level is lowered with every clipping event.
-const int kClippedLevelStep = 15;
-// Proportion of clipped samples required to declare a clipping event.
-const float kClippedRatioThreshold = 0.1f;
-// Time in frames to wait after a clipping event before checking again.
-const int kClippedWaitFrames = 300;
-
-// Amount of error we tolerate in the microphone level (presumably due to OS
-// quantization) before we assume the user has manually adjusted the microphone.
-const int kLevelQuantizationSlack = 25;
-
-const int kDefaultCompressionGain = 7;
-const int kMaxCompressionGain = 12;
-const int kMinCompressionGain = 2;
-// Controls the rate of compression changes towards the target.
-const float kCompressionGainStep = 0.05f;
-
-const int kMaxMicLevel = 255;
-static_assert(kGainMapSize > kMaxMicLevel, "gain map too small");
-const int kMinMicLevel = 12;
-
-// Prevent very large microphone level changes.
-const int kMaxResidualGainChange = 15;
-
-// Maximum additional gain allowed to compensate for microphone level
-// restrictions from clipping events.
-const int kSurplusCompressionGain = 6;
-
-int ClampLevel(int mic_level) {
-  return rtc::SafeClamp(mic_level, kMinMicLevel, kMaxMicLevel);
-}
-
-int LevelFromGainError(int gain_error, int level) {
-  RTC_DCHECK_GE(level, 0);
-  RTC_DCHECK_LE(level, kMaxMicLevel);
-  if (gain_error == 0) {
-    return level;
-  }
-  // TODO(ajm): Could be made more efficient with a binary search.
-  int new_level = level;
-  if (gain_error > 0) {
-    while (kGainMap[new_level] - kGainMap[level] < gain_error &&
-           new_level < kMaxMicLevel) {
-      ++new_level;
-    }
-  } else {
-    while (kGainMap[new_level] - kGainMap[level] > gain_error &&
-           new_level > kMinMicLevel) {
-      --new_level;
-    }
-  }
-  return new_level;
-}
-
-int InitializeGainControl(GainControl* gain_control,
-                          bool disable_digital_adaptive) {
-  if (gain_control->set_mode(GainControl::kFixedDigital) != 0) {
-    RTC_LOG(LS_ERROR) << "set_mode(GainControl::kFixedDigital) failed.";
-    return -1;
-  }
-  const int target_level_dbfs = disable_digital_adaptive ? 0 : 2;
-  if (gain_control->set_target_level_dbfs(target_level_dbfs) != 0) {
-    RTC_LOG(LS_ERROR) << "set_target_level_dbfs() failed.";
-    return -1;
-  }
-  const int compression_gain_db =
-      disable_digital_adaptive ? 0 : kDefaultCompressionGain;
-  if (gain_control->set_compression_gain_db(compression_gain_db) != 0) {
-    RTC_LOG(LS_ERROR) << "set_compression_gain_db() failed.";
-    return -1;
-  }
-  const bool enable_limiter = !disable_digital_adaptive;
-  if (gain_control->enable_limiter(enable_limiter) != 0) {
-    RTC_LOG(LS_ERROR) << "enable_limiter() failed.";
-    return -1;
-  }
-  return 0;
-}
-
-}  // namespace
-
-// Facility for dumping debug audio files. All methods are no-ops in the
-// default case where WEBRTC_AGC_DEBUG_DUMP is undefined.
-class DebugFile {
-#ifdef WEBRTC_AGC_DEBUG_DUMP
- public:
-  explicit DebugFile(const char* filename) : file_(fopen(filename, "wb")) {
-    RTC_DCHECK(file_);
-  }
-  ~DebugFile() { fclose(file_); }
-  void Write(const int16_t* data, size_t length_samples) {
-    fwrite(data, 1, length_samples * sizeof(int16_t), file_);
-  }
-
- private:
-  FILE* file_;
-#else
- public:
-  explicit DebugFile(const char* filename) {}
-  ~DebugFile() {}
-  void Write(const int16_t* data, size_t length_samples) {}
-#endif  // WEBRTC_AGC_DEBUG_DUMP
-};
-
-AgcManagerDirect::AgcManagerDirect(GainControl* gctrl,
-                                   VolumeCallbacks* volume_callbacks,
-                                   int startup_min_level,
-                                   int clipped_level_min,
-                                   bool use_agc2_level_estimation,
-                                   bool disable_digital_adaptive)
-    : AgcManagerDirect(use_agc2_level_estimation ? nullptr : new Agc(),
-                       gctrl,
-                       volume_callbacks,
-                       startup_min_level,
-                       clipped_level_min,
-                       use_agc2_level_estimation,
-                       disable_digital_adaptive) {
-  RTC_DCHECK(agc_);
-}
-
-AgcManagerDirect::AgcManagerDirect(Agc* agc,
-                                   GainControl* gctrl,
-                                   VolumeCallbacks* volume_callbacks,
-                                   int startup_min_level,
-                                   int clipped_level_min)
-    : AgcManagerDirect(agc,
-                       gctrl,
-                       volume_callbacks,
-                       startup_min_level,
-                       clipped_level_min,
-                       false,
-                       false) {
-  RTC_DCHECK(agc_);
-}
-
-AgcManagerDirect::AgcManagerDirect(Agc* agc,
-                                   GainControl* gctrl,
-                                   VolumeCallbacks* volume_callbacks,
-                                   int startup_min_level,
-                                   int clipped_level_min,
-                                   bool use_agc2_level_estimation,
-                                   bool disable_digital_adaptive)
-    : data_dumper_(new ApmDataDumper(instance_counter_)),
-      agc_(agc),
-      gctrl_(gctrl),
-      volume_callbacks_(volume_callbacks),
-      frames_since_clipped_(kClippedWaitFrames),
-      level_(0),
-      max_level_(kMaxMicLevel),
-      max_compression_gain_(kMaxCompressionGain),
-      target_compression_(kDefaultCompressionGain),
-      compression_(target_compression_),
-      compression_accumulator_(compression_),
-      capture_muted_(false),
-      check_volume_on_next_process_(true),  // Check at startup.
-      startup_(true),
-      use_agc2_level_estimation_(use_agc2_level_estimation),
-      disable_digital_adaptive_(disable_digital_adaptive),
-      startup_min_level_(ClampLevel(startup_min_level)),
-      clipped_level_min_(clipped_level_min),
-      file_preproc_(new DebugFile("agc_preproc.pcm")),
-      file_postproc_(new DebugFile("agc_postproc.pcm")) {
-  instance_counter_++;
-  if (use_agc2_level_estimation_) {
-    RTC_DCHECK(!agc);
-    agc_.reset(new AdaptiveModeLevelEstimatorAgc(data_dumper_.get()));
-  } else {
-    RTC_DCHECK(agc);
-  }
-}
-
-AgcManagerDirect::~AgcManagerDirect() {}
-
-int AgcManagerDirect::Initialize() {
-  max_level_ = kMaxMicLevel;
-  max_compression_gain_ = kMaxCompressionGain;
-  target_compression_ = disable_digital_adaptive_ ? 0 : kDefaultCompressionGain;
-  compression_ = disable_digital_adaptive_ ? 0 : target_compression_;
-  compression_accumulator_ = compression_;
-  capture_muted_ = false;
-  check_volume_on_next_process_ = true;
-  // TODO(bjornv): Investigate if we need to reset |startup_| as well. For
-  // example, what happens when we change devices.
-
-  data_dumper_->InitiateNewSetOfRecordings();
-
-  return InitializeGainControl(gctrl_, disable_digital_adaptive_);
-}
-
-void AgcManagerDirect::AnalyzePreProcess(int16_t* audio,
-                                         int num_channels,
-                                         size_t samples_per_channel) {
-  size_t length = num_channels * samples_per_channel;
-  if (capture_muted_) {
-    return;
-  }
-
-  file_preproc_->Write(audio, length);
-
-  if (frames_since_clipped_ < kClippedWaitFrames) {
-    ++frames_since_clipped_;
-    return;
-  }
-
-  // Check for clipped samples, as the AGC has difficulty detecting pitch
-  // under clipping distortion. We do this in the preprocessing phase in order
-  // to catch clipped echo as well.
-  //
-  // If we find a sufficiently clipped frame, drop the current microphone level
-  // and enforce a new maximum level, dropped the same amount from the current
-  // maximum. This harsh treatment is an effort to avoid repeated clipped echo
-  // events. As compensation for this restriction, the maximum compression
-  // gain is increased, through SetMaxLevel().
-  float clipped_ratio = agc_->AnalyzePreproc(audio, length);
-  if (clipped_ratio > kClippedRatioThreshold) {
-    RTC_DLOG(LS_INFO) << "[agc] Clipping detected. clipped_ratio="
-                      << clipped_ratio;
-    // Always decrease the maximum level, even if the current level is below
-    // threshold.
-    SetMaxLevel(std::max(clipped_level_min_, max_level_ - kClippedLevelStep));
-    RTC_HISTOGRAM_BOOLEAN("WebRTC.Audio.AgcClippingAdjustmentAllowed",
-                          level_ - kClippedLevelStep >= clipped_level_min_);
-    if (level_ > clipped_level_min_) {
-      // Don't try to adjust the level if we're already below the limit. As
-      // a consequence, if the user has brought the level above the limit, we
-      // will still not react until the postproc updates the level.
-      SetLevel(std::max(clipped_level_min_, level_ - kClippedLevelStep));
-      // Reset the AGC since the level has changed.
-      agc_->Reset();
-    }
-    frames_since_clipped_ = 0;
-  }
-}
-
-void AgcManagerDirect::Process(const int16_t* audio,
-                               size_t length,
-                               int sample_rate_hz) {
-  if (capture_muted_) {
-    return;
-  }
-
-  if (check_volume_on_next_process_) {
-    check_volume_on_next_process_ = false;
-    // We have to wait until the first process call to check the volume,
-    // because Chromium doesn't guarantee it to be valid any earlier.
-    CheckVolumeAndReset();
-  }
-
-  agc_->Process(audio, length, sample_rate_hz);
-
-  UpdateGain();
-  if (!disable_digital_adaptive_) {
-    UpdateCompressor();
-  }
-
-  file_postproc_->Write(audio, length);
-
-  data_dumper_->DumpRaw("experimental_gain_control_compression_gain_db", 1,
-                        &compression_);
-}
-
-void AgcManagerDirect::SetLevel(int new_level) {
-  int voe_level = volume_callbacks_->GetMicVolume();
-  if (voe_level == 0) {
-    RTC_DLOG(LS_INFO)
-        << "[agc] VolumeCallbacks returned level=0, taking no action.";
-    return;
-  }
-  if (voe_level < 0 || voe_level > kMaxMicLevel) {
-    RTC_LOG(LS_ERROR) << "VolumeCallbacks returned an invalid level="
-                      << voe_level;
-    return;
-  }
-
-  if (voe_level > level_ + kLevelQuantizationSlack ||
-      voe_level < level_ - kLevelQuantizationSlack) {
-    RTC_DLOG(LS_INFO) << "[agc] Mic volume was manually adjusted. Updating "
-                         "stored level from "
-                      << level_ << " to " << voe_level;
-    level_ = voe_level;
-    // Always allow the user to increase the volume.
-    if (level_ > max_level_) {
-      SetMaxLevel(level_);
-    }
-    // Take no action in this case, since we can't be sure when the volume
-    // was manually adjusted. The compressor will still provide some of the
-    // desired gain change.
-    agc_->Reset();
-    return;
-  }
-
-  new_level = std::min(new_level, max_level_);
-  if (new_level == level_) {
-    return;
-  }
-
-  volume_callbacks_->SetMicVolume(new_level);
-  RTC_DLOG(LS_INFO) << "[agc] voe_level=" << voe_level << ", "
-                    << "level_=" << level_ << ", "
-                    << "new_level=" << new_level;
-  level_ = new_level;
-}
-
-void AgcManagerDirect::SetMaxLevel(int level) {
-  RTC_DCHECK_GE(level, clipped_level_min_);
-  max_level_ = level;
-  // Scale the |kSurplusCompressionGain| linearly across the restricted
-  // level range.
-  max_compression_gain_ =
-      kMaxCompressionGain + std::floor((1.f * kMaxMicLevel - max_level_) /
-                                           (kMaxMicLevel - clipped_level_min_) *
-                                           kSurplusCompressionGain +
-                                       0.5f);
-  RTC_DLOG(LS_INFO) << "[agc] max_level_=" << max_level_
-                    << ", max_compression_gain_=" << max_compression_gain_;
-}
-
-void AgcManagerDirect::SetCaptureMuted(bool muted) {
-  if (capture_muted_ == muted) {
-    return;
-  }
-  capture_muted_ = muted;
-
-  if (!muted) {
-    // When we unmute, we should reset things to be safe.
-    check_volume_on_next_process_ = true;
-  }
-}
-
-float AgcManagerDirect::voice_probability() {
-  return agc_->voice_probability();
-}
-
-int AgcManagerDirect::CheckVolumeAndReset() {
-  int level = volume_callbacks_->GetMicVolume();
-  // Reasons for taking action at startup:
-  // 1) A person starting a call is expected to be heard.
-  // 2) Independent of interpretation of |level| == 0 we should raise it so the
-  // AGC can do its job properly.
-  if (level == 0 && !startup_) {
-    RTC_DLOG(LS_INFO)
-        << "[agc] VolumeCallbacks returned level=0, taking no action.";
-    return 0;
-  }
-  if (level < 0 || level > kMaxMicLevel) {
-    RTC_LOG(LS_ERROR) << "[agc] VolumeCallbacks returned an invalid level="
-                      << level;
-    return -1;
-  }
-  RTC_DLOG(LS_INFO) << "[agc] Initial GetMicVolume()=" << level;
-
-  int minLevel = startup_ ? startup_min_level_ : kMinMicLevel;
-  if (level < minLevel) {
-    level = minLevel;
-    RTC_DLOG(LS_INFO) << "[agc] Initial volume too low, raising to " << level;
-    volume_callbacks_->SetMicVolume(level);
-  }
-  agc_->Reset();
-  level_ = level;
-  startup_ = false;
-  return 0;
-}
-
-// Requests the RMS error from AGC and distributes the required gain change
-// between the digital compression stage and volume slider. We use the
-// compressor first, providing a slack region around the current slider
-// position to reduce movement.
-//
-// If the slider needs to be moved, we check first if the user has adjusted
-// it, in which case we take no action and cache the updated level.
-void AgcManagerDirect::UpdateGain() {
-  int rms_error = 0;
-  if (!agc_->GetRmsErrorDb(&rms_error)) {
-    // No error update ready.
-    return;
-  }
-  // The compressor will always add at least kMinCompressionGain. In effect,
-  // this adjusts our target gain upward by the same amount and rms_error
-  // needs to reflect that.
-  rms_error += kMinCompressionGain;
-
-  // Handle as much error as possible with the compressor first.
-  int raw_compression =
-      rtc::SafeClamp(rms_error, kMinCompressionGain, max_compression_gain_);
-
-  // Deemphasize the compression gain error. Move halfway between the current
-  // target and the newly received target. This serves to soften perceptible
-  // intra-talkspurt adjustments, at the cost of some adaptation speed.
-  if ((raw_compression == max_compression_gain_ &&
-       target_compression_ == max_compression_gain_ - 1) ||
-      (raw_compression == kMinCompressionGain &&
-       target_compression_ == kMinCompressionGain + 1)) {
-    // Special case to allow the target to reach the endpoints of the
-    // compression range. The deemphasis would otherwise halt it at 1 dB shy.
-    target_compression_ = raw_compression;
-  } else {
-    target_compression_ =
-        (raw_compression - target_compression_) / 2 + target_compression_;
-  }
-
-  // Residual error will be handled by adjusting the volume slider. Use the
-  // raw rather than deemphasized compression here as we would otherwise
-  // shrink the amount of slack the compressor provides.
-  const int residual_gain =
-      rtc::SafeClamp(rms_error - raw_compression, -kMaxResidualGainChange,
-                     kMaxResidualGainChange);
-  RTC_DLOG(LS_INFO) << "[agc] rms_error=" << rms_error
-                    << ", target_compression=" << target_compression_
-                    << ", residual_gain=" << residual_gain;
-  if (residual_gain == 0)
-    return;
-
-  int old_level = level_;
-  SetLevel(LevelFromGainError(residual_gain, level_));
-  if (old_level != level_) {
-    // level_ was updated by SetLevel; log the new value.
-    RTC_HISTOGRAM_COUNTS_LINEAR("WebRTC.Audio.AgcSetLevel", level_, 1,
-                                kMaxMicLevel, 50);
-    // Reset the AGC since the level has changed.
-    agc_->Reset();
-  }
-}
-
-void AgcManagerDirect::UpdateCompressor() {
-  calls_since_last_gain_log_++;
-  if (calls_since_last_gain_log_ == 100) {
-    calls_since_last_gain_log_ = 0;
-    RTC_HISTOGRAM_COUNTS_LINEAR("WebRTC.Audio.Agc.DigitalGainApplied",
-                                compression_, 0, kMaxCompressionGain,
-                                kMaxCompressionGain + 1);
-  }
-  if (compression_ == target_compression_) {
-    return;
-  }
-
-  // Adapt the compression gain slowly towards the target, in order to avoid
-  // highly perceptible changes.
-  if (target_compression_ > compression_) {
-    compression_accumulator_ += kCompressionGainStep;
-  } else {
-    compression_accumulator_ -= kCompressionGainStep;
-  }
-
-  // The compressor accepts integer gains in dB. Adjust the gain when
-  // we've come within half a stepsize of the nearest integer.  (We don't
-  // check for equality due to potential floating point imprecision).
-  int new_compression = compression_;
-  int nearest_neighbor = std::floor(compression_accumulator_ + 0.5);
-  if (std::fabs(compression_accumulator_ - nearest_neighbor) <
-      kCompressionGainStep / 2) {
-    new_compression = nearest_neighbor;
-  }
-
-  // Set the new compression gain.
-  if (new_compression != compression_) {
-    RTC_HISTOGRAM_COUNTS_LINEAR("WebRTC.Audio.Agc.DigitalGainUpdated",
-                                new_compression, 0, kMaxCompressionGain,
-                                kMaxCompressionGain + 1);
-    compression_ = new_compression;
-    compression_accumulator_ = new_compression;
-    if (gctrl_->set_compression_gain_db(compression_) != 0) {
-      RTC_LOG(LS_ERROR) << "set_compression_gain_db(" << compression_
-                        << ") failed.";
-    }
-  }
-}
-
-}  // namespace webrtc
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/agc/agc_manager_direct.h b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/agc/agc_manager_direct.h
deleted file mode 100644
index cbfd6a1018..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/agc/agc_manager_direct.h
+++ /dev/null
@@ -1,139 +0,0 @@
-/*
- *  Copyright (c) 2013 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#ifndef MODULES_AUDIO_PROCESSING_AGC_AGC_MANAGER_DIRECT_H_
-#define MODULES_AUDIO_PROCESSING_AGC_AGC_MANAGER_DIRECT_H_
-
-#include <memory>
-
-#include "modules/audio_processing/agc/agc.h"
-#include "modules/audio_processing/logging/apm_data_dumper.h"
-#include "rtc_base/constructormagic.h"
-#include "rtc_base/gtest_prod_util.h"
-
-namespace webrtc {
-
-class AudioFrame;
-class DebugFile;
-class GainControl;
-
-// Callbacks that need to be injected into AgcManagerDirect to read and control
-// the volume values. This is done to remove the VoiceEngine dependency in
-// AgcManagerDirect.
-// TODO(aluebs): Remove VolumeCallbacks.
-class VolumeCallbacks {
- public:
-  virtual ~VolumeCallbacks() {}
-  virtual void SetMicVolume(int volume) = 0;
-  virtual int GetMicVolume() = 0;
-};
-
-// Direct interface to use AGC to set volume and compression values.
-// AudioProcessing uses this interface directly to integrate the callback-less
-// AGC.
-//
-// This class is not thread-safe.
-class AgcManagerDirect final {
- public:
-  // AgcManagerDirect will configure GainControl internally. The user is
-  // responsible for processing the audio using it after the call to Process.
-  // The operating range of startup_min_level is [12, 255] and any input value
-  // outside that range will be clamped.
-  AgcManagerDirect(GainControl* gctrl,
-                   VolumeCallbacks* volume_callbacks,
-                   int startup_min_level,
-                   int clipped_level_min,
-                   bool use_agc2_level_estimation,
-                   bool disable_digital_adaptive);
-
-  ~AgcManagerDirect();
-
-  int Initialize();
-  void AnalyzePreProcess(int16_t* audio,
-                         int num_channels,
-                         size_t samples_per_channel);
-  void Process(const int16_t* audio, size_t length, int sample_rate_hz);
-
-  // Call when the capture stream has been muted/unmuted. This causes the
-  // manager to disregard all incoming audio; chances are good it's background
-  // noise to which we'd like to avoid adapting.
-  void SetCaptureMuted(bool muted);
-  bool capture_muted() { return capture_muted_; }
-
-  float voice_probability();
-
- private:
-  friend class AgcManagerDirectTest;
-
-  FRIEND_TEST_ALL_PREFIXES(AgcManagerDirectStandaloneTest,
-                           DisableDigitalDisablesDigital);
-
-  // Dependency injection for testing. Don't delete |agc| as the memory is owned
-  // by the manager.
-  AgcManagerDirect(Agc* agc,
-                   GainControl* gctrl,
-                   VolumeCallbacks* volume_callbacks,
-                   int startup_min_level,
-                   int clipped_level_min);
-
-  // Most general c-tor.
-  AgcManagerDirect(Agc* agc,
-                   GainControl* gctrl,
-                   VolumeCallbacks* volume_callbacks,
-                   int startup_min_level,
-                   int clipped_level_min,
-                   bool use_agc2_level_estimation,
-                   bool disable_digital_adaptive);
-
-  // Sets a new microphone level, after first checking that it hasn't been
-  // updated by the user, in which case no action is taken.
-  void SetLevel(int new_level);
-
-  // Set the maximum level the AGC is allowed to apply. Also updates the
-  // maximum compression gain to compensate. The level must be at least
-  // |kClippedLevelMin|.
-  void SetMaxLevel(int level);
-
-  int CheckVolumeAndReset();
-  void UpdateGain();
-  void UpdateCompressor();
-
-  std::unique_ptr<ApmDataDumper> data_dumper_;
-  static int instance_counter_;
-
-  std::unique_ptr<Agc> agc_;
-  GainControl* gctrl_;
-  VolumeCallbacks* volume_callbacks_;
-
-  int frames_since_clipped_;
-  int level_;
-  int max_level_;
-  int max_compression_gain_;
-  int target_compression_;
-  int compression_;
-  float compression_accumulator_;
-  bool capture_muted_;
-  bool check_volume_on_next_process_;
-  bool startup_;
-  const bool use_agc2_level_estimation_;
-  const bool disable_digital_adaptive_;
-  int startup_min_level_;
-  const int clipped_level_min_;
-  int calls_since_last_gain_log_ = 0;
-
-  std::unique_ptr<DebugFile> file_preproc_;
-  std::unique_ptr<DebugFile> file_postproc_;
-
-  RTC_DISALLOW_COPY_AND_ASSIGN(AgcManagerDirect);
-};
-
-}  // namespace webrtc
-
-#endif  // MODULES_AUDIO_PROCESSING_AGC_AGC_MANAGER_DIRECT_H_
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/agc/gain_map_internal.h b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/agc/gain_map_internal.h
deleted file mode 100644
index 63d9b510ca..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/agc/gain_map_internal.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- *  Copyright (c) 2013 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#ifndef MODULES_AUDIO_PROCESSING_AGC_GAIN_MAP_INTERNAL_H_
-#define MODULES_AUDIO_PROCESSING_AGC_GAIN_MAP_INTERNAL_H_
-
-static const int kGainMapSize = 256;
-// Uses parameters: si = 2, sf = 0.25, D = 8/256
-static const int kGainMap[kGainMapSize] = {
-    -56, -54, -52, -50, -48, -47, -45, -43, -42, -40, -38, -37, -35, -34, -33,
-    -31, -30, -29, -27, -26, -25, -24, -23, -22, -20, -19, -18, -17, -16, -15,
-    -14, -14, -13, -12, -11, -10, -9,  -8,  -8,  -7,  -6,  -5,  -5,  -4,  -3,
-    -2,  -2,  -1,  0,   0,   1,   1,   2,   3,   3,   4,   4,   5,   5,   6,
-    6,   7,   7,   8,   8,   9,   9,   10,  10,  11,  11,  12,  12,  13,  13,
-    13,  14,  14,  15,  15,  15,  16,  16,  17,  17,  17,  18,  18,  18,  19,
-    19,  19,  20,  20,  21,  21,  21,  22,  22,  22,  23,  23,  23,  24,  24,
-    24,  24,  25,  25,  25,  26,  26,  26,  27,  27,  27,  28,  28,  28,  28,
-    29,  29,  29,  30,  30,  30,  30,  31,  31,  31,  32,  32,  32,  32,  33,
-    33,  33,  33,  34,  34,  34,  35,  35,  35,  35,  36,  36,  36,  36,  37,
-    37,  37,  38,  38,  38,  38,  39,  39,  39,  39,  40,  40,  40,  40,  41,
-    41,  41,  41,  42,  42,  42,  42,  43,  43,  43,  44,  44,  44,  44,  45,
-    45,  45,  45,  46,  46,  46,  46,  47,  47,  47,  47,  48,  48,  48,  48,
-    49,  49,  49,  49,  50,  50,  50,  50,  51,  51,  51,  51,  52,  52,  52,
-    52,  53,  53,  53,  53,  54,  54,  54,  54,  55,  55,  55,  55,  56,  56,
-    56,  56,  57,  57,  57,  57,  58,  58,  58,  58,  59,  59,  59,  59,  60,
-    60,  60,  60,  61,  61,  61,  61,  62,  62,  62,  62,  63,  63,  63,  63,
-    64};
-
-#endif  // MODULES_AUDIO_PROCESSING_AGC_GAIN_MAP_INTERNAL_H_
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/agc/legacy/analog_agc.c b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/agc/legacy/analog_agc.c
deleted file mode 100644
index 662e88b6e7..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/agc/legacy/analog_agc.c
+++ /dev/null
@@ -1,1390 +0,0 @@
-/*
- *  Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-/* analog_agc.c
- *
- * Using a feedback system, determines an appropriate analog volume level
- * given an input signal and current volume level. Targets a conservative
- * signal level and is intended for use with a digital AGC to apply
- * additional gain.
- *
- */
-
-#include "modules/audio_processing/agc/legacy/analog_agc.h"
-
-#include <stdlib.h>
-#ifdef WEBRTC_AGC_DEBUG_DUMP
-#include <stdio.h>
-#endif
-
-#include "rtc_base/checks.h"
-
-/* The slope of in Q13*/
-static const int16_t kSlope1[8] = {21793, 12517, 7189, 4129,
-                                   2372,  1362,  472,  78};
-
-/* The offset in Q14 */
-static const int16_t kOffset1[8] = {25395, 23911, 22206, 20737,
-                                    19612, 18805, 17951, 17367};
-
-/* The slope of in Q13*/
-static const int16_t kSlope2[8] = {2063, 1731, 1452, 1218, 1021, 857, 597, 337};
-
-/* The offset in Q14 */
-static const int16_t kOffset2[8] = {18432, 18379, 18290, 18177,
-                                    18052, 17920, 17670, 17286};
-
-static const int16_t kMuteGuardTimeMs = 8000;
-static const int16_t kInitCheck = 42;
-static const size_t kNumSubframes = 10;
-
-/* Default settings if config is not used */
-#define AGC_DEFAULT_TARGET_LEVEL 3
-#define AGC_DEFAULT_COMP_GAIN 9
-/* This is the target level for the analog part in ENV scale. To convert to RMS
- * scale you
- * have to add OFFSET_ENV_TO_RMS.
- */
-#define ANALOG_TARGET_LEVEL 11
-#define ANALOG_TARGET_LEVEL_2 5  // ANALOG_TARGET_LEVEL / 2
-/* Offset between RMS scale (analog part) and ENV scale (digital part). This
- * value actually
- * varies with the FIXED_ANALOG_TARGET_LEVEL, hence we should in the future
- * replace it with
- * a table.
- */
-#define OFFSET_ENV_TO_RMS 9
-/* The reference input level at which the digital part gives an output of
- * targetLevelDbfs
- * (desired level) if we have no compression gain. This level should be set high
- * enough not
- * to compress the peaks due to the dynamics.
- */
-#define DIGITAL_REF_AT_0_COMP_GAIN 4
-/* Speed of reference level decrease.
- */
-#define DIFF_REF_TO_ANALOG 5
-
-#ifdef MIC_LEVEL_FEEDBACK
-#define NUM_BLOCKS_IN_SAT_BEFORE_CHANGE_TARGET 7
-#endif
-/* Size of analog gain table */
-#define GAIN_TBL_LEN 32
-/* Matlab code:
- * fprintf(1, '\t%i, %i, %i, %i,\n', round(10.^(linspace(0,10,32)/20) * 2^12));
- */
-/* Q12 */
-static const uint16_t kGainTableAnalog[GAIN_TBL_LEN] = {
-    4096, 4251, 4412, 4579,  4752,  4932,  5118,  5312,  5513,  5722, 5938,
-    6163, 6396, 6638, 6889,  7150,  7420,  7701,  7992,  8295,  8609, 8934,
-    9273, 9623, 9987, 10365, 10758, 11165, 11587, 12025, 12480, 12953};
-
-/* Gain/Suppression tables for virtual Mic (in Q10) */
-static const uint16_t kGainTableVirtualMic[128] = {
-    1052,  1081,  1110,  1141,  1172,  1204,  1237,  1271,  1305,  1341,  1378,
-    1416,  1454,  1494,  1535,  1577,  1620,  1664,  1710,  1757,  1805,  1854,
-    1905,  1957,  2010,  2065,  2122,  2180,  2239,  2301,  2364,  2428,  2495,
-    2563,  2633,  2705,  2779,  2855,  2933,  3013,  3096,  3180,  3267,  3357,
-    3449,  3543,  3640,  3739,  3842,  3947,  4055,  4166,  4280,  4397,  4517,
-    4640,  4767,  4898,  5032,  5169,  5311,  5456,  5605,  5758,  5916,  6078,
-    6244,  6415,  6590,  6770,  6956,  7146,  7341,  7542,  7748,  7960,  8178,
-    8402,  8631,  8867,  9110,  9359,  9615,  9878,  10148, 10426, 10711, 11004,
-    11305, 11614, 11932, 12258, 12593, 12938, 13292, 13655, 14029, 14412, 14807,
-    15212, 15628, 16055, 16494, 16945, 17409, 17885, 18374, 18877, 19393, 19923,
-    20468, 21028, 21603, 22194, 22801, 23425, 24065, 24724, 25400, 26095, 26808,
-    27541, 28295, 29069, 29864, 30681, 31520, 32382};
-static const uint16_t kSuppressionTableVirtualMic[128] = {
-    1024, 1006, 988, 970, 952, 935, 918, 902, 886, 870, 854, 839, 824, 809, 794,
-    780,  766,  752, 739, 726, 713, 700, 687, 675, 663, 651, 639, 628, 616, 605,
-    594,  584,  573, 563, 553, 543, 533, 524, 514, 505, 496, 487, 478, 470, 461,
-    453,  445,  437, 429, 421, 414, 406, 399, 392, 385, 378, 371, 364, 358, 351,
-    345,  339,  333, 327, 321, 315, 309, 304, 298, 293, 288, 283, 278, 273, 268,
-    263,  258,  254, 249, 244, 240, 236, 232, 227, 223, 219, 215, 211, 208, 204,
-    200,  197,  193, 190, 186, 183, 180, 176, 173, 170, 167, 164, 161, 158, 155,
-    153,  150,  147, 145, 142, 139, 137, 134, 132, 130, 127, 125, 123, 121, 118,
-    116,  114,  112, 110, 108, 106, 104, 102};
-
-/* Table for target energy levels. Values in Q(-7)
- * Matlab code
- * targetLevelTable = fprintf('%d,\t%d,\t%d,\t%d,\n',
- * round((32767*10.^(-(0:63)'/20)).^2*16/2^7) */
-
-static const int32_t kTargetLevelTable[64] = {
-    134209536, 106606424, 84680493, 67264106, 53429779, 42440782, 33711911,
-    26778323,  21270778,  16895980, 13420954, 10660642, 8468049,  6726411,
-    5342978,   4244078,   3371191,  2677832,  2127078,  1689598,  1342095,
-    1066064,   846805,    672641,   534298,   424408,   337119,   267783,
-    212708,    168960,    134210,   106606,   84680,    67264,    53430,
-    42441,     33712,     26778,    21271,    16896,    13421,    10661,
-    8468,      6726,      5343,     4244,     3371,     2678,     2127,
-    1690,      1342,      1066,     847,      673,      534,      424,
-    337,       268,       213,      169,      134,      107,      85,
-    67};
-
-int WebRtcAgc_AddMic(void* state,
-                     int16_t* const* in_mic,
-                     size_t num_bands,
-                     size_t samples) {
-  int32_t nrg, max_nrg, sample, tmp32;
-  int32_t* ptr;
-  uint16_t targetGainIdx, gain;
-  size_t i;
-  int16_t n, L, tmp16, tmp_speech[16];
-  LegacyAgc* stt;
-  stt = (LegacyAgc*)state;
-
-  if (stt->fs == 8000) {
-    L = 8;
-    if (samples != 80) {
-      return -1;
-    }
-  } else {
-    L = 16;
-    if (samples != 160) {
-      return -1;
-    }
-  }
-
-  /* apply slowly varying digital gain */
-  if (stt->micVol > stt->maxAnalog) {
-    /* |maxLevel| is strictly >= |micVol|, so this condition should be
-     * satisfied here, ensuring there is no divide-by-zero. */
-    RTC_DCHECK_GT(stt->maxLevel, stt->maxAnalog);
-
-    /* Q1 */
-    tmp16 = (int16_t)(stt->micVol - stt->maxAnalog);
-    tmp32 = (GAIN_TBL_LEN - 1) * tmp16;
-    tmp16 = (int16_t)(stt->maxLevel - stt->maxAnalog);
-    targetGainIdx = tmp32 / tmp16;
-    RTC_DCHECK_LT(targetGainIdx, GAIN_TBL_LEN);
-
-    /* Increment through the table towards the target gain.
-     * If micVol drops below maxAnalog, we allow the gain
-     * to be dropped immediately. */
-    if (stt->gainTableIdx < targetGainIdx) {
-      stt->gainTableIdx++;
-    } else if (stt->gainTableIdx > targetGainIdx) {
-      stt->gainTableIdx--;
-    }
-
-    /* Q12 */
-    gain = kGainTableAnalog[stt->gainTableIdx];
-
-    for (i = 0; i < samples; i++) {
-      size_t j;
-      for (j = 0; j < num_bands; ++j) {
-        sample = (in_mic[j][i] * gain) >> 12;
-        if (sample > 32767) {
-          in_mic[j][i] = 32767;
-        } else if (sample < -32768) {
-          in_mic[j][i] = -32768;
-        } else {
-          in_mic[j][i] = (int16_t)sample;
-        }
-      }
-    }
-  } else {
-    stt->gainTableIdx = 0;
-  }
-
-  /* compute envelope */
-  if (stt->inQueue > 0) {
-    ptr = stt->env[1];
-  } else {
-    ptr = stt->env[0];
-  }
-
-  for (i = 0; i < kNumSubframes; i++) {
-    /* iterate over samples */
-    max_nrg = 0;
-    for (n = 0; n < L; n++) {
-      nrg = in_mic[0][i * L + n] * in_mic[0][i * L + n];
-      if (nrg > max_nrg) {
-        max_nrg = nrg;
-      }
-    }
-    ptr[i] = max_nrg;
-  }
-
-  /* compute energy */
-  if (stt->inQueue > 0) {
-    ptr = stt->Rxx16w32_array[1];
-  } else {
-    ptr = stt->Rxx16w32_array[0];
-  }
-
-  for (i = 0; i < kNumSubframes / 2; i++) {
-    if (stt->fs == 16000) {
-      WebRtcSpl_DownsampleBy2(&in_mic[0][i * 32], 32, tmp_speech,
-                              stt->filterState);
-    } else {
-      memcpy(tmp_speech, &in_mic[0][i * 16], 16 * sizeof(short));
-    }
-    /* Compute energy in blocks of 16 samples */
-    ptr[i] = WebRtcSpl_DotProductWithScale(tmp_speech, tmp_speech, 16, 4);
-  }
-
-  /* update queue information */
-  if (stt->inQueue == 0) {
-    stt->inQueue = 1;
-  } else {
-    stt->inQueue = 2;
-  }
-
-  /* call VAD (use low band only) */
-  WebRtcAgc_ProcessVad(&stt->vadMic, in_mic[0], samples);
-
-  return 0;
-}
-
-int WebRtcAgc_AddFarend(void* state, const int16_t* in_far, size_t samples) {
-  LegacyAgc* stt = (LegacyAgc*)state;
-
-  int err = WebRtcAgc_GetAddFarendError(state, samples);
-
-  if (err != 0)
-    return err;
-
-  return WebRtcAgc_AddFarendToDigital(&stt->digitalAgc, in_far, samples);
-}
-
-int WebRtcAgc_GetAddFarendError(void* state, size_t samples) {
-  LegacyAgc* stt;
-  stt = (LegacyAgc*)state;
-
-  if (stt == NULL)
-    return -1;
-
-  if (stt->fs == 8000) {
-    if (samples != 80)
-      return -1;
-  } else if (stt->fs == 16000 || stt->fs == 32000 || stt->fs == 48000) {
-    if (samples != 160)
-      return -1;
-  } else {
-    return -1;
-  }
-
-  return 0;
-}
-
-int WebRtcAgc_VirtualMic(void* agcInst,
-                         int16_t* const* in_near,
-                         size_t num_bands,
-                         size_t samples,
-                         int32_t micLevelIn,
-                         int32_t* micLevelOut) {
-  int32_t tmpFlt, micLevelTmp, gainIdx;
-  uint16_t gain;
-  size_t ii, j;
-  LegacyAgc* stt;
-
-  uint32_t nrg;
-  size_t sampleCntr;
-  uint32_t frameNrg = 0;
-  uint32_t frameNrgLimit = 5500;
-  int16_t numZeroCrossing = 0;
-  const int16_t kZeroCrossingLowLim = 15;
-  const int16_t kZeroCrossingHighLim = 20;
-
-  stt = (LegacyAgc*)agcInst;
-
-  /*
-   *  Before applying gain decide if this is a low-level signal.
-   *  The idea is that digital AGC will not adapt to low-level
-   *  signals.
-   */
-  if (stt->fs != 8000) {
-    frameNrgLimit = frameNrgLimit << 1;
-  }
-
-  frameNrg = (uint32_t)(in_near[0][0] * in_near[0][0]);
-  for (sampleCntr = 1; sampleCntr < samples; sampleCntr++) {
-    // increment frame energy if it is less than the limit
-    // the correct value of the energy is not important
-    if (frameNrg < frameNrgLimit) {
-      nrg = (uint32_t)(in_near[0][sampleCntr] * in_near[0][sampleCntr]);
-      frameNrg += nrg;
-    }
-
-    // Count the zero crossings
-    numZeroCrossing +=
-        ((in_near[0][sampleCntr] ^ in_near[0][sampleCntr - 1]) < 0);
-  }
-
-  if ((frameNrg < 500) || (numZeroCrossing <= 5)) {
-    stt->lowLevelSignal = 1;
-  } else if (numZeroCrossing <= kZeroCrossingLowLim) {
-    stt->lowLevelSignal = 0;
-  } else if (frameNrg <= frameNrgLimit) {
-    stt->lowLevelSignal = 1;
-  } else if (numZeroCrossing >= kZeroCrossingHighLim) {
-    stt->lowLevelSignal = 1;
-  } else {
-    stt->lowLevelSignal = 0;
-  }
-
-  micLevelTmp = micLevelIn << stt->scale;
-  /* Set desired level */
-  gainIdx = stt->micVol;
-  if (stt->micVol > stt->maxAnalog) {
-    gainIdx = stt->maxAnalog;
-  }
-  if (micLevelTmp != stt->micRef) {
-    /* Something has happened with the physical level, restart. */
-    stt->micRef = micLevelTmp;
-    stt->micVol = 127;
-    *micLevelOut = 127;
-    stt->micGainIdx = 127;
-    gainIdx = 127;
-  }
-  /* Pre-process the signal to emulate the microphone level. */
-  /* Take one step at a time in the gain table. */
-  if (gainIdx > 127) {
-    gain = kGainTableVirtualMic[gainIdx - 128];
-  } else {
-    gain = kSuppressionTableVirtualMic[127 - gainIdx];
-  }
-  for (ii = 0; ii < samples; ii++) {
-    tmpFlt = (in_near[0][ii] * gain) >> 10;
-    if (tmpFlt > 32767) {
-      tmpFlt = 32767;
-      gainIdx--;
-      if (gainIdx >= 127) {
-        gain = kGainTableVirtualMic[gainIdx - 127];
-      } else {
-        gain = kSuppressionTableVirtualMic[127 - gainIdx];
-      }
-    }
-    if (tmpFlt < -32768) {
-      tmpFlt = -32768;
-      gainIdx--;
-      if (gainIdx >= 127) {
-        gain = kGainTableVirtualMic[gainIdx - 127];
-      } else {
-        gain = kSuppressionTableVirtualMic[127 - gainIdx];
-      }
-    }
-    in_near[0][ii] = (int16_t)tmpFlt;
-    for (j = 1; j < num_bands; ++j) {
-      tmpFlt = (in_near[j][ii] * gain) >> 10;
-      if (tmpFlt > 32767) {
-        tmpFlt = 32767;
-      }
-      if (tmpFlt < -32768) {
-        tmpFlt = -32768;
-      }
-      in_near[j][ii] = (int16_t)tmpFlt;
-    }
-  }
-  /* Set the level we (finally) used */
-  stt->micGainIdx = gainIdx;
-  //    *micLevelOut = stt->micGainIdx;
-  *micLevelOut = stt->micGainIdx >> stt->scale;
-  /* Add to Mic as if it was the output from a true microphone */
-  if (WebRtcAgc_AddMic(agcInst, in_near, num_bands, samples) != 0) {
-    return -1;
-  }
-  return 0;
-}
-
-void WebRtcAgc_UpdateAgcThresholds(LegacyAgc* stt) {
-  int16_t tmp16;
-#ifdef MIC_LEVEL_FEEDBACK
-  int zeros;
-
-  if (stt->micLvlSat) {
-    /* Lower the analog target level since we have reached its maximum */
-    zeros = WebRtcSpl_NormW32(stt->Rxx160_LPw32);
-    stt->targetIdxOffset = (3 * zeros - stt->targetIdx - 2) / 4;
-  }
-#endif
-
-  /* Set analog target level in envelope dBOv scale */
-  tmp16 = (DIFF_REF_TO_ANALOG * stt->compressionGaindB) + ANALOG_TARGET_LEVEL_2;
-  tmp16 = WebRtcSpl_DivW32W16ResW16((int32_t)tmp16, ANALOG_TARGET_LEVEL);
-  stt->analogTarget = DIGITAL_REF_AT_0_COMP_GAIN + tmp16;
-  if (stt->analogTarget < DIGITAL_REF_AT_0_COMP_GAIN) {
-    stt->analogTarget = DIGITAL_REF_AT_0_COMP_GAIN;
-  }
-  if (stt->agcMode == kAgcModeFixedDigital) {
-    /* Adjust for different parameter interpretation in FixedDigital mode */
-    stt->analogTarget = stt->compressionGaindB;
-  }
-#ifdef MIC_LEVEL_FEEDBACK
-  stt->analogTarget += stt->targetIdxOffset;
-#endif
-  /* Since the offset between RMS and ENV is not constant, we should make this
-   * into a
-   * table, but for now, we'll stick with a constant, tuned for the chosen
-   * analog
-   * target level.
-   */
-  stt->targetIdx = ANALOG_TARGET_LEVEL + OFFSET_ENV_TO_RMS;
-#ifdef MIC_LEVEL_FEEDBACK
-  stt->targetIdx += stt->targetIdxOffset;
-#endif
-  /* Analog adaptation limits */
-  /* analogTargetLevel = round((32767*10^(-targetIdx/20))^2*16/2^7) */
-  stt->analogTargetLevel =
-      RXX_BUFFER_LEN * kTargetLevelTable[stt->targetIdx]; /* ex. -20 dBov */
-  stt->startUpperLimit =
-      RXX_BUFFER_LEN * kTargetLevelTable[stt->targetIdx - 1]; /* -19 dBov */
-  stt->startLowerLimit =
-      RXX_BUFFER_LEN * kTargetLevelTable[stt->targetIdx + 1]; /* -21 dBov */
-  stt->upperPrimaryLimit =
-      RXX_BUFFER_LEN * kTargetLevelTable[stt->targetIdx - 2]; /* -18 dBov */
-  stt->lowerPrimaryLimit =
-      RXX_BUFFER_LEN * kTargetLevelTable[stt->targetIdx + 2]; /* -22 dBov */
-  stt->upperSecondaryLimit =
-      RXX_BUFFER_LEN * kTargetLevelTable[stt->targetIdx - 5]; /* -15 dBov */
-  stt->lowerSecondaryLimit =
-      RXX_BUFFER_LEN * kTargetLevelTable[stt->targetIdx + 5]; /* -25 dBov */
-  stt->upperLimit = stt->startUpperLimit;
-  stt->lowerLimit = stt->startLowerLimit;
-}
-
-void WebRtcAgc_SaturationCtrl(LegacyAgc* stt,
-                              uint8_t* saturated,
-                              int32_t* env) {
-  int16_t i, tmpW16;
-
-  /* Check if the signal is saturated */
-  for (i = 0; i < 10; i++) {
-    tmpW16 = (int16_t)(env[i] >> 20);
-    if (tmpW16 > 875) {
-      stt->envSum += tmpW16;
-    }
-  }
-
-  if (stt->envSum > 25000) {
-    *saturated = 1;
-    stt->envSum = 0;
-  }
-
-  /* stt->envSum *= 0.99; */
-  stt->envSum = (int16_t)((stt->envSum * 32440) >> 15);
-}
-
-void WebRtcAgc_ZeroCtrl(LegacyAgc* stt, int32_t* inMicLevel, int32_t* env) {
-  int16_t i;
-  int64_t tmp = 0;
-  int32_t midVal;
-
-  /* Is the input signal zero? */
-  for (i = 0; i < 10; i++) {
-    tmp += env[i];
-  }
-
-  /* Each block is allowed to have a few non-zero
-   * samples.
-   */
-  if (tmp < 500) {
-    stt->msZero += 10;
-  } else {
-    stt->msZero = 0;
-  }
-
-  if (stt->muteGuardMs > 0) {
-    stt->muteGuardMs -= 10;
-  }
-
-  if (stt->msZero > 500) {
-    stt->msZero = 0;
-
-    /* Increase microphone level only if it's less than 50% */
-    midVal = (stt->maxAnalog + stt->minLevel + 1) / 2;
-    if (*inMicLevel < midVal) {
-      /* *inMicLevel *= 1.1; */
-      *inMicLevel = (1126 * *inMicLevel) >> 10;
-      /* Reduces risk of a muted mic repeatedly triggering excessive levels due
-       * to zero signal detection. */
-      *inMicLevel = WEBRTC_SPL_MIN(*inMicLevel, stt->zeroCtrlMax);
-      stt->micVol = *inMicLevel;
-    }
-
-#ifdef WEBRTC_AGC_DEBUG_DUMP
-    fprintf(stt->fpt,
-            "\t\tAGC->zeroCntrl, frame %d: 500 ms under threshold,"
-            " micVol: %d\n",
-            stt->fcount, stt->micVol);
-#endif
-
-    stt->activeSpeech = 0;
-    stt->Rxx16_LPw32Max = 0;
-
-    /* The AGC has a tendency (due to problems with the VAD parameters), to
-     * vastly increase the volume after a muting event. This timer prevents
-     * upwards adaptation for a short period. */
-    stt->muteGuardMs = kMuteGuardTimeMs;
-  }
-}
-
-void WebRtcAgc_SpeakerInactiveCtrl(LegacyAgc* stt) {
-  /* Check if the near end speaker is inactive.
-   * If that is the case the VAD threshold is
-   * increased since the VAD speech model gets
-   * more sensitive to any sound after a long
-   * silence.
-   */
-
-  int32_t tmp32;
-  int16_t vadThresh;
-
-  if (stt->vadMic.stdLongTerm < 2500) {
-    stt->vadThreshold = 1500;
-  } else {
-    vadThresh = kNormalVadThreshold;
-    if (stt->vadMic.stdLongTerm < 4500) {
-      /* Scale between min and max threshold */
-      vadThresh += (4500 - stt->vadMic.stdLongTerm) / 2;
-    }
-
-    /* stt->vadThreshold = (31 * stt->vadThreshold + vadThresh) / 32; */
-    tmp32 = vadThresh + 31 * stt->vadThreshold;
-    stt->vadThreshold = (int16_t)(tmp32 >> 5);
-  }
-}
-
-void WebRtcAgc_ExpCurve(int16_t volume, int16_t* index) {
-  // volume in Q14
-  // index in [0-7]
-  /* 8 different curves */
-  if (volume > 5243) {
-    if (volume > 7864) {
-      if (volume > 12124) {
-        *index = 7;
-      } else {
-        *index = 6;
-      }
-    } else {
-      if (volume > 6554) {
-        *index = 5;
-      } else {
-        *index = 4;
-      }
-    }
-  } else {
-    if (volume > 2621) {
-      if (volume > 3932) {
-        *index = 3;
-      } else {
-        *index = 2;
-      }
-    } else {
-      if (volume > 1311) {
-        *index = 1;
-      } else {
-        *index = 0;
-      }
-    }
-  }
-}
-
-int32_t WebRtcAgc_ProcessAnalog(void* state,
-                                int32_t inMicLevel,
-                                int32_t* outMicLevel,
-                                int16_t vadLogRatio,
-                                int16_t echo,
-                                uint8_t* saturationWarning) {
-  uint32_t tmpU32;
-  int32_t Rxx16w32, tmp32;
-  int32_t inMicLevelTmp, lastMicVol;
-  int16_t i;
-  uint8_t saturated = 0;
-  LegacyAgc* stt;
-
-  stt = (LegacyAgc*)state;
-  inMicLevelTmp = inMicLevel << stt->scale;
-
-  if (inMicLevelTmp > stt->maxAnalog) {
-#ifdef WEBRTC_AGC_DEBUG_DUMP
-    fprintf(stt->fpt, "\tAGC->ProcessAnalog, frame %d: micLvl > maxAnalog\n",
-            stt->fcount);
-#endif
-    return -1;
-  } else if (inMicLevelTmp < stt->minLevel) {
-#ifdef WEBRTC_AGC_DEBUG_DUMP
-    fprintf(stt->fpt, "\tAGC->ProcessAnalog, frame %d: micLvl < minLevel\n",
-            stt->fcount);
-#endif
-    return -1;
-  }
-
-  if (stt->firstCall == 0) {
-    int32_t tmpVol;
-    stt->firstCall = 1;
-    tmp32 = ((stt->maxLevel - stt->minLevel) * 51) >> 9;
-    tmpVol = (stt->minLevel + tmp32);
-
-    /* If the mic level is very low at start, increase it! */
-    if ((inMicLevelTmp < tmpVol) && (stt->agcMode == kAgcModeAdaptiveAnalog)) {
-      inMicLevelTmp = tmpVol;
-    }
-    stt->micVol = inMicLevelTmp;
-  }
-
-  /* Set the mic level to the previous output value if there is digital input
-   * gain */
-  if ((inMicLevelTmp == stt->maxAnalog) && (stt->micVol > stt->maxAnalog)) {
-    inMicLevelTmp = stt->micVol;
-  }
-
-  /* If the mic level was manually changed to a very low value raise it! */
-  if ((inMicLevelTmp != stt->micVol) && (inMicLevelTmp < stt->minOutput)) {
-    tmp32 = ((stt->maxLevel - stt->minLevel) * 51) >> 9;
-    inMicLevelTmp = (stt->minLevel + tmp32);
-    stt->micVol = inMicLevelTmp;
-#ifdef MIC_LEVEL_FEEDBACK
-// stt->numBlocksMicLvlSat = 0;
-#endif
-#ifdef WEBRTC_AGC_DEBUG_DUMP
-    fprintf(stt->fpt,
-            "\tAGC->ProcessAnalog, frame %d: micLvl < minLevel by manual"
-            " decrease, raise vol\n",
-            stt->fcount);
-#endif
-  }
-
-  if (inMicLevelTmp != stt->micVol) {
-    if (inMicLevel == stt->lastInMicLevel) {
-      // We requested a volume adjustment, but it didn't occur. This is
-      // probably due to a coarse quantization of the volume slider.
-      // Restore the requested value to prevent getting stuck.
-      inMicLevelTmp = stt->micVol;
-    } else {
-      // As long as the value changed, update to match.
-      stt->micVol = inMicLevelTmp;
-    }
-  }
-
-  if (inMicLevelTmp > stt->maxLevel) {
-    // Always allow the user to raise the volume above the maxLevel.
-    stt->maxLevel = inMicLevelTmp;
-  }
-
-  // Store last value here, after we've taken care of manual updates etc.
-  stt->lastInMicLevel = inMicLevel;
-  lastMicVol = stt->micVol;
-
-  /* Checks if the signal is saturated. Also a check if individual samples
-   * are larger than 12000 is done. If they are the counter for increasing
-   * the volume level is set to -100ms
-   */
-  WebRtcAgc_SaturationCtrl(stt, &saturated, stt->env[0]);
-
-  /* The AGC is always allowed to lower the level if the signal is saturated */
-  if (saturated == 1) {
-    /* Lower the recording level
-     * Rxx160_LP is adjusted down because it is so slow it could
-     * cause the AGC to make wrong decisions. */
-    /* stt->Rxx160_LPw32 *= 0.875; */
-    stt->Rxx160_LPw32 = (stt->Rxx160_LPw32 / 8) * 7;
-
-    stt->zeroCtrlMax = stt->micVol;
-
-    /* stt->micVol *= 0.903; */
-    tmp32 = inMicLevelTmp - stt->minLevel;
-    tmpU32 = WEBRTC_SPL_UMUL(29591, (uint32_t)(tmp32));
-    stt->micVol = (tmpU32 >> 15) + stt->minLevel;
-    if (stt->micVol > lastMicVol - 2) {
-      stt->micVol = lastMicVol - 2;
-    }
-    inMicLevelTmp = stt->micVol;
-
-#ifdef WEBRTC_AGC_DEBUG_DUMP
-    fprintf(stt->fpt,
-            "\tAGC->ProcessAnalog, frame %d: saturated, micVol = %d\n",
-            stt->fcount, stt->micVol);
-#endif
-
-    if (stt->micVol < stt->minOutput) {
-      *saturationWarning = 1;
-    }
-
-    /* Reset counter for decrease of volume level to avoid
-     * decreasing too much. The saturation control can still
-     * lower the level if needed. */
-    stt->msTooHigh = -100;
-
-    /* Enable the control mechanism to ensure that our measure,
-     * Rxx160_LP, is in the correct range. This must be done since
-     * the measure is very slow. */
-    stt->activeSpeech = 0;
-    stt->Rxx16_LPw32Max = 0;
-
-    /* Reset to initial values */
-    stt->msecSpeechInnerChange = kMsecSpeechInner;
-    stt->msecSpeechOuterChange = kMsecSpeechOuter;
-    stt->changeToSlowMode = 0;
-
-    stt->muteGuardMs = 0;
-
-    stt->upperLimit = stt->startUpperLimit;
-    stt->lowerLimit = stt->startLowerLimit;
-#ifdef MIC_LEVEL_FEEDBACK
-// stt->numBlocksMicLvlSat = 0;
-#endif
-  }
-
-  /* Check if the input speech is zero. If so the mic volume
-   * is increased. On some computers the input is zero up as high
-   * level as 17% */
-  WebRtcAgc_ZeroCtrl(stt, &inMicLevelTmp, stt->env[0]);
-
-  /* Check if the near end speaker is inactive.
-   * If that is the case the VAD threshold is
-   * increased since the VAD speech model gets
-   * more sensitive to any sound after a long
-   * silence.
-   */
-  WebRtcAgc_SpeakerInactiveCtrl(stt);
-
-  for (i = 0; i < 5; i++) {
-    /* Computed on blocks of 16 samples */
-
-    Rxx16w32 = stt->Rxx16w32_array[0][i];
-
-    /* Rxx160w32 in Q(-7) */
-    tmp32 = (Rxx16w32 - stt->Rxx16_vectorw32[stt->Rxx16pos]) >> 3;
-    stt->Rxx160w32 = stt->Rxx160w32 + tmp32;
-    stt->Rxx16_vectorw32[stt->Rxx16pos] = Rxx16w32;
-
-    /* Circular buffer */
-    stt->Rxx16pos++;
-    if (stt->Rxx16pos == RXX_BUFFER_LEN) {
-      stt->Rxx16pos = 0;
-    }
-
-    /* Rxx16_LPw32 in Q(-4) */
-    tmp32 = (Rxx16w32 - stt->Rxx16_LPw32) >> kAlphaShortTerm;
-    stt->Rxx16_LPw32 = (stt->Rxx16_LPw32) + tmp32;
-
-    if (vadLogRatio > stt->vadThreshold) {
-      /* Speech detected! */
-
-      /* Check if Rxx160_LP is in the correct range. If
-       * it is too high/low then we set it to the maximum of
-       * Rxx16_LPw32 during the first 200ms of speech.
-       */
-      if (stt->activeSpeech < 250) {
-        stt->activeSpeech += 2;
-
-        if (stt->Rxx16_LPw32 > stt->Rxx16_LPw32Max) {
-          stt->Rxx16_LPw32Max = stt->Rxx16_LPw32;
-        }
-      } else if (stt->activeSpeech == 250) {
-        stt->activeSpeech += 2;
-        tmp32 = stt->Rxx16_LPw32Max >> 3;
-        stt->Rxx160_LPw32 = tmp32 * RXX_BUFFER_LEN;
-      }
-
-      tmp32 = (stt->Rxx160w32 - stt->Rxx160_LPw32) >> kAlphaLongTerm;
-      stt->Rxx160_LPw32 = stt->Rxx160_LPw32 + tmp32;
-
-      if (stt->Rxx160_LPw32 > stt->upperSecondaryLimit) {
-        stt->msTooHigh += 2;
-        stt->msTooLow = 0;
-        stt->changeToSlowMode = 0;
-
-        if (stt->msTooHigh > stt->msecSpeechOuterChange) {
-          stt->msTooHigh = 0;
-
-          /* Lower the recording level */
-          /* Multiply by 0.828125 which corresponds to decreasing ~0.8dB */
-          tmp32 = stt->Rxx160_LPw32 >> 6;
-          stt->Rxx160_LPw32 = tmp32 * 53;
-
-          /* Reduce the max gain to avoid excessive oscillation
-           * (but never drop below the maximum analog level).
-           */
-          stt->maxLevel = (15 * stt->maxLevel + stt->micVol) / 16;
-          stt->maxLevel = WEBRTC_SPL_MAX(stt->maxLevel, stt->maxAnalog);
-
-          stt->zeroCtrlMax = stt->micVol;
-
-          /* 0.95 in Q15 */
-          tmp32 = inMicLevelTmp - stt->minLevel;
-          tmpU32 = WEBRTC_SPL_UMUL(31130, (uint32_t)(tmp32));
-          stt->micVol = (tmpU32 >> 15) + stt->minLevel;
-          if (stt->micVol > lastMicVol - 1) {
-            stt->micVol = lastMicVol - 1;
-          }
-          inMicLevelTmp = stt->micVol;
-
-          /* Enable the control mechanism to ensure that our measure,
-           * Rxx160_LP, is in the correct range.
-           */
-          stt->activeSpeech = 0;
-          stt->Rxx16_LPw32Max = 0;
-#ifdef MIC_LEVEL_FEEDBACK
-// stt->numBlocksMicLvlSat = 0;
-#endif
-#ifdef WEBRTC_AGC_DEBUG_DUMP
-          fprintf(stt->fpt,
-                  "\tAGC->ProcessAnalog, frame %d: measure >"
-                  " 2ndUpperLim, micVol = %d, maxLevel = %d\n",
-                  stt->fcount, stt->micVol, stt->maxLevel);
-#endif
-        }
-      } else if (stt->Rxx160_LPw32 > stt->upperLimit) {
-        stt->msTooHigh += 2;
-        stt->msTooLow = 0;
-        stt->changeToSlowMode = 0;
-
-        if (stt->msTooHigh > stt->msecSpeechInnerChange) {
-          /* Lower the recording level */
-          stt->msTooHigh = 0;
-          /* Multiply by 0.828125 which corresponds to decreasing ~0.8dB */
-          stt->Rxx160_LPw32 = (stt->Rxx160_LPw32 / 64) * 53;
-
-          /* Reduce the max gain to avoid excessive oscillation
-           * (but never drop below the maximum analog level).
-           */
-          stt->maxLevel = (15 * stt->maxLevel + stt->micVol) / 16;
-          stt->maxLevel = WEBRTC_SPL_MAX(stt->maxLevel, stt->maxAnalog);
-
-          stt->zeroCtrlMax = stt->micVol;
-
-          /* 0.965 in Q15 */
-          tmp32 = inMicLevelTmp - stt->minLevel;
-          tmpU32 =
-              WEBRTC_SPL_UMUL(31621, (uint32_t)(inMicLevelTmp - stt->minLevel));
-          stt->micVol = (tmpU32 >> 15) + stt->minLevel;
-          if (stt->micVol > lastMicVol - 1) {
-            stt->micVol = lastMicVol - 1;
-          }
-          inMicLevelTmp = stt->micVol;
-
-#ifdef MIC_LEVEL_FEEDBACK
-// stt->numBlocksMicLvlSat = 0;
-#endif
-#ifdef WEBRTC_AGC_DEBUG_DUMP
-          fprintf(stt->fpt,
-                  "\tAGC->ProcessAnalog, frame %d: measure >"
-                  " UpperLim, micVol = %d, maxLevel = %d\n",
-                  stt->fcount, stt->micVol, stt->maxLevel);
-#endif
-        }
-      } else if (stt->Rxx160_LPw32 < stt->lowerSecondaryLimit) {
-        stt->msTooHigh = 0;
-        stt->changeToSlowMode = 0;
-        stt->msTooLow += 2;
-
-        if (stt->msTooLow > stt->msecSpeechOuterChange) {
-          /* Raise the recording level */
-          int16_t index, weightFIX;
-          int16_t volNormFIX = 16384;  // =1 in Q14.
-
-          stt->msTooLow = 0;
-
-          /* Normalize the volume level */
-          tmp32 = (inMicLevelTmp - stt->minLevel) << 14;
-          if (stt->maxInit != stt->minLevel) {
-            volNormFIX = tmp32 / (stt->maxInit - stt->minLevel);
-          }
-
-          /* Find correct curve */
-          WebRtcAgc_ExpCurve(volNormFIX, &index);
-
-          /* Compute weighting factor for the volume increase, 32^(-2*X)/2+1.05
-           */
-          weightFIX =
-              kOffset1[index] - (int16_t)((kSlope1[index] * volNormFIX) >> 13);
-
-          /* stt->Rxx160_LPw32 *= 1.047 [~0.2 dB]; */
-          stt->Rxx160_LPw32 = (stt->Rxx160_LPw32 / 64) * 67;
-
-          tmp32 = inMicLevelTmp - stt->minLevel;
-          tmpU32 =
-              ((uint32_t)weightFIX * (uint32_t)(inMicLevelTmp - stt->minLevel));
-          stt->micVol = (tmpU32 >> 14) + stt->minLevel;
-          if (stt->micVol < lastMicVol + 2) {
-            stt->micVol = lastMicVol + 2;
-          }
-
-          inMicLevelTmp = stt->micVol;
-
-#ifdef MIC_LEVEL_FEEDBACK
-          /* Count ms in level saturation */
-          // if (stt->micVol > stt->maxAnalog) {
-          if (stt->micVol > 150) {
-            /* mic level is saturated */
-            stt->numBlocksMicLvlSat++;
-            fprintf(stderr, "Sat mic Level: %d\n", stt->numBlocksMicLvlSat);
-          }
-#endif
-#ifdef WEBRTC_AGC_DEBUG_DUMP
-          fprintf(stt->fpt,
-                  "\tAGC->ProcessAnalog, frame %d: measure <"
-                  " 2ndLowerLim, micVol = %d\n",
-                  stt->fcount, stt->micVol);
-#endif
-        }
-      } else if (stt->Rxx160_LPw32 < stt->lowerLimit) {
-        stt->msTooHigh = 0;
-        stt->changeToSlowMode = 0;
-        stt->msTooLow += 2;
-
-        if (stt->msTooLow > stt->msecSpeechInnerChange) {
-          /* Raise the recording level */
-          int16_t index, weightFIX;
-          int16_t volNormFIX = 16384;  // =1 in Q14.
-
-          stt->msTooLow = 0;
-
-          /* Normalize the volume level */
-          tmp32 = (inMicLevelTmp - stt->minLevel) << 14;
-          if (stt->maxInit != stt->minLevel) {
-            volNormFIX = tmp32 / (stt->maxInit - stt->minLevel);
-          }
-
-          /* Find correct curve */
-          WebRtcAgc_ExpCurve(volNormFIX, &index);
-
-          /* Compute weighting factor for the volume increase, (3.^(-2.*X))/8+1
-           */
-          weightFIX =
-              kOffset2[index] - (int16_t)((kSlope2[index] * volNormFIX) >> 13);
-
-          /* stt->Rxx160_LPw32 *= 1.047 [~0.2 dB]; */
-          stt->Rxx160_LPw32 = (stt->Rxx160_LPw32 / 64) * 67;
-
-          tmp32 = inMicLevelTmp - stt->minLevel;
-          tmpU32 =
-              ((uint32_t)weightFIX * (uint32_t)(inMicLevelTmp - stt->minLevel));
-          stt->micVol = (tmpU32 >> 14) + stt->minLevel;
-          if (stt->micVol < lastMicVol + 1) {
-            stt->micVol = lastMicVol + 1;
-          }
-
-          inMicLevelTmp = stt->micVol;
-
-#ifdef MIC_LEVEL_FEEDBACK
-          /* Count ms in level saturation */
-          // if (stt->micVol > stt->maxAnalog) {
-          if (stt->micVol > 150) {
-            /* mic level is saturated */
-            stt->numBlocksMicLvlSat++;
-            fprintf(stderr, "Sat mic Level: %d\n", stt->numBlocksMicLvlSat);
-          }
-#endif
-#ifdef WEBRTC_AGC_DEBUG_DUMP
-          fprintf(stt->fpt,
-                  "\tAGC->ProcessAnalog, frame %d: measure < LowerLim, micVol "
-                  "= %d\n",
-                  stt->fcount, stt->micVol);
-#endif
-        }
-      } else {
-        /* The signal is inside the desired range which is:
-         * lowerLimit < Rxx160_LP/640 < upperLimit
-         */
-        if (stt->changeToSlowMode > 4000) {
-          stt->msecSpeechInnerChange = 1000;
-          stt->msecSpeechOuterChange = 500;
-          stt->upperLimit = stt->upperPrimaryLimit;
-          stt->lowerLimit = stt->lowerPrimaryLimit;
-        } else {
-          stt->changeToSlowMode += 2;  // in milliseconds
-        }
-        stt->msTooLow = 0;
-        stt->msTooHigh = 0;
-
-        stt->micVol = inMicLevelTmp;
-      }
-#ifdef MIC_LEVEL_FEEDBACK
-      if (stt->numBlocksMicLvlSat > NUM_BLOCKS_IN_SAT_BEFORE_CHANGE_TARGET) {
-        stt->micLvlSat = 1;
-        fprintf(stderr, "target before = %d (%d)\n", stt->analogTargetLevel,
-                stt->targetIdx);
-        WebRtcAgc_UpdateAgcThresholds(stt);
-        WebRtcAgc_CalculateGainTable(
-            &(stt->digitalAgc.gainTable[0]), stt->compressionGaindB,
-            stt->targetLevelDbfs, stt->limiterEnable, stt->analogTarget);
-        stt->numBlocksMicLvlSat = 0;
-        stt->micLvlSat = 0;
-        fprintf(stderr, "target offset = %d\n", stt->targetIdxOffset);
-        fprintf(stderr, "target after  = %d (%d)\n", stt->analogTargetLevel,
-                stt->targetIdx);
-      }
-#endif
-    }
-  }
-
-  /* Ensure gain is not increased in presence of echo or after a mute event
-   * (but allow the zeroCtrl() increase on the frame of a mute detection).
-   */
-  if (echo == 1 ||
-      (stt->muteGuardMs > 0 && stt->muteGuardMs < kMuteGuardTimeMs)) {
-    if (stt->micVol > lastMicVol) {
-      stt->micVol = lastMicVol;
-    }
-  }
-
-  /* limit the gain */
-  if (stt->micVol > stt->maxLevel) {
-    stt->micVol = stt->maxLevel;
-  } else if (stt->micVol < stt->minOutput) {
-    stt->micVol = stt->minOutput;
-  }
-
-  *outMicLevel = WEBRTC_SPL_MIN(stt->micVol, stt->maxAnalog) >> stt->scale;
-
-  return 0;
-}
-
-int WebRtcAgc_Process(void* agcInst,
-                      const int16_t* const* in_near,
-                      size_t num_bands,
-                      size_t samples,
-                      int16_t* const* out,
-                      int32_t inMicLevel,
-                      int32_t* outMicLevel,
-                      int16_t echo,
-                      uint8_t* saturationWarning) {
-  LegacyAgc* stt;
-
-  stt = (LegacyAgc*)agcInst;
-
-  //
-  if (stt == NULL) {
-    return -1;
-  }
-  //
-
-  if (stt->fs == 8000) {
-    if (samples != 80) {
-      return -1;
-    }
-  } else if (stt->fs == 16000 || stt->fs == 32000 || stt->fs == 48000) {
-    if (samples != 160) {
-      return -1;
-    }
-  } else {
-    return -1;
-  }
-
-  *saturationWarning = 0;
-  // TODO(minyue): PUT IN RANGE CHECKING FOR INPUT LEVELS
-  *outMicLevel = inMicLevel;
-
-#ifdef WEBRTC_AGC_DEBUG_DUMP
-  stt->fcount++;
-#endif
-
-  if (WebRtcAgc_ProcessDigital(&stt->digitalAgc, in_near, num_bands, out,
-                               stt->fs, stt->lowLevelSignal) == -1) {
-#ifdef WEBRTC_AGC_DEBUG_DUMP
-    fprintf(stt->fpt, "AGC->Process, frame %d: Error from DigAGC\n\n",
-            stt->fcount);
-#endif
-    return -1;
-  }
-  if (stt->agcMode < kAgcModeFixedDigital &&
-      (stt->lowLevelSignal == 0 || stt->agcMode != kAgcModeAdaptiveDigital)) {
-    if (WebRtcAgc_ProcessAnalog(agcInst, inMicLevel, outMicLevel,
-                                stt->vadMic.logRatio, echo,
-                                saturationWarning) == -1) {
-      return -1;
-    }
-  }
-#ifdef WEBRTC_AGC_DEBUG_DUMP
-  fprintf(stt->agcLog, "%5d\t%d\t%d\t%d\t%d\n", stt->fcount, inMicLevel,
-          *outMicLevel, stt->maxLevel, stt->micVol);
-#endif
-
-  /* update queue */
-  if (stt->inQueue > 1) {
-    memcpy(stt->env[0], stt->env[1], 10 * sizeof(int32_t));
-    memcpy(stt->Rxx16w32_array[0], stt->Rxx16w32_array[1], 5 * sizeof(int32_t));
-  }
-
-  if (stt->inQueue > 0) {
-    stt->inQueue--;
-  }
-
-  return 0;
-}
-
-int WebRtcAgc_set_config(void* agcInst, WebRtcAgcConfig agcConfig) {
-  LegacyAgc* stt;
-  stt = (LegacyAgc*)agcInst;
-
-  if (stt == NULL) {
-    return -1;
-  }
-
-  if (stt->initFlag != kInitCheck) {
-    stt->lastError = AGC_UNINITIALIZED_ERROR;
-    return -1;
-  }
-
-  if (agcConfig.limiterEnable != kAgcFalse &&
-      agcConfig.limiterEnable != kAgcTrue) {
-    stt->lastError = AGC_BAD_PARAMETER_ERROR;
-    return -1;
-  }
-  stt->limiterEnable = agcConfig.limiterEnable;
-  stt->compressionGaindB = agcConfig.compressionGaindB;
-  if ((agcConfig.targetLevelDbfs < 0) || (agcConfig.targetLevelDbfs > 31)) {
-    stt->lastError = AGC_BAD_PARAMETER_ERROR;
-    return -1;
-  }
-  stt->targetLevelDbfs = agcConfig.targetLevelDbfs;
-
-  if (stt->agcMode == kAgcModeFixedDigital) {
-    /* Adjust for different parameter interpretation in FixedDigital mode */
-    stt->compressionGaindB += agcConfig.targetLevelDbfs;
-  }
-
-  /* Update threshold levels for analog adaptation */
-  WebRtcAgc_UpdateAgcThresholds(stt);
-
-  /* Recalculate gain table */
-  if (WebRtcAgc_CalculateGainTable(
-          &(stt->digitalAgc.gainTable[0]), stt->compressionGaindB,
-          stt->targetLevelDbfs, stt->limiterEnable, stt->analogTarget) == -1) {
-#ifdef WEBRTC_AGC_DEBUG_DUMP
-    fprintf(stt->fpt, "AGC->set_config, frame %d: Error from calcGainTable\n\n",
-            stt->fcount);
-#endif
-    return -1;
-  }
-  /* Store the config in a WebRtcAgcConfig */
-  stt->usedConfig.compressionGaindB = agcConfig.compressionGaindB;
-  stt->usedConfig.limiterEnable = agcConfig.limiterEnable;
-  stt->usedConfig.targetLevelDbfs = agcConfig.targetLevelDbfs;
-
-  return 0;
-}
-
-int WebRtcAgc_get_config(void* agcInst, WebRtcAgcConfig* config) {
-  LegacyAgc* stt;
-  stt = (LegacyAgc*)agcInst;
-
-  if (stt == NULL) {
-    return -1;
-  }
-
-  if (config == NULL) {
-    stt->lastError = AGC_NULL_POINTER_ERROR;
-    return -1;
-  }
-
-  if (stt->initFlag != kInitCheck) {
-    stt->lastError = AGC_UNINITIALIZED_ERROR;
-    return -1;
-  }
-
-  config->limiterEnable = stt->usedConfig.limiterEnable;
-  config->targetLevelDbfs = stt->usedConfig.targetLevelDbfs;
-  config->compressionGaindB = stt->usedConfig.compressionGaindB;
-
-  return 0;
-}
-
-void* WebRtcAgc_Create() {
-  LegacyAgc* stt = malloc(sizeof(LegacyAgc));
-
-#ifdef WEBRTC_AGC_DEBUG_DUMP
-  stt->fpt = fopen("./agc_test_log.txt", "wt");
-  stt->agcLog = fopen("./agc_debug_log.txt", "wt");
-  stt->digitalAgc.logFile = fopen("./agc_log.txt", "wt");
-#endif
-
-  stt->initFlag = 0;
-  stt->lastError = 0;
-
-  return stt;
-}
-
-void WebRtcAgc_Free(void* state) {
-  LegacyAgc* stt;
-
-  stt = (LegacyAgc*)state;
-#ifdef WEBRTC_AGC_DEBUG_DUMP
-  fclose(stt->fpt);
-  fclose(stt->agcLog);
-  fclose(stt->digitalAgc.logFile);
-#endif
-  free(stt);
-}
-
-/* minLevel     - Minimum volume level
- * maxLevel     - Maximum volume level
- */
-int WebRtcAgc_Init(void* agcInst,
-                   int32_t minLevel,
-                   int32_t maxLevel,
-                   int16_t agcMode,
-                   uint32_t fs) {
-  int32_t max_add, tmp32;
-  int16_t i;
-  int tmpNorm;
-  LegacyAgc* stt;
-
-  /* typecast state pointer */
-  stt = (LegacyAgc*)agcInst;
-
-  if (WebRtcAgc_InitDigital(&stt->digitalAgc, agcMode) != 0) {
-    stt->lastError = AGC_UNINITIALIZED_ERROR;
-    return -1;
-  }
-
-  /* Analog AGC variables */
-  stt->envSum = 0;
-
-/* mode     = 0 - Only saturation protection
- *            1 - Analog Automatic Gain Control [-targetLevelDbfs (default -3
- * dBOv)]
- *            2 - Digital Automatic Gain Control [-targetLevelDbfs (default -3
- * dBOv)]
- *            3 - Fixed Digital Gain [compressionGaindB (default 8 dB)]
- */
-#ifdef WEBRTC_AGC_DEBUG_DUMP
-  stt->fcount = 0;
-  fprintf(stt->fpt, "AGC->Init\n");
-#endif
-  if (agcMode < kAgcModeUnchanged || agcMode > kAgcModeFixedDigital) {
-#ifdef WEBRTC_AGC_DEBUG_DUMP
-    fprintf(stt->fpt, "AGC->Init: error, incorrect mode\n\n");
-#endif
-    return -1;
-  }
-  stt->agcMode = agcMode;
-  stt->fs = fs;
-
-  /* initialize input VAD */
-  WebRtcAgc_InitVad(&stt->vadMic);
-
-  /* If the volume range is smaller than 0-256 then
-   * the levels are shifted up to Q8-domain */
-  tmpNorm = WebRtcSpl_NormU32((uint32_t)maxLevel);
-  stt->scale = tmpNorm - 23;
-  if (stt->scale < 0) {
-    stt->scale = 0;
-  }
-  // TODO(bjornv): Investigate if we really need to scale up a small range now
-  // when we have
-  // a guard against zero-increments. For now, we do not support scale up (scale
-  // = 0).
-  stt->scale = 0;
-  maxLevel <<= stt->scale;
-  minLevel <<= stt->scale;
-
-  /* Make minLevel and maxLevel static in AdaptiveDigital */
-  if (stt->agcMode == kAgcModeAdaptiveDigital) {
-    minLevel = 0;
-    maxLevel = 255;
-    stt->scale = 0;
-  }
-  /* The maximum supplemental volume range is based on a vague idea
-   * of how much lower the gain will be than the real analog gain. */
-  max_add = (maxLevel - minLevel) / 4;
-
-  /* Minimum/maximum volume level that can be set */
-  stt->minLevel = minLevel;
-  stt->maxAnalog = maxLevel;
-  stt->maxLevel = maxLevel + max_add;
-  stt->maxInit = stt->maxLevel;
-
-  stt->zeroCtrlMax = stt->maxAnalog;
-  stt->lastInMicLevel = 0;
-
-  /* Initialize micVol parameter */
-  stt->micVol = stt->maxAnalog;
-  if (stt->agcMode == kAgcModeAdaptiveDigital) {
-    stt->micVol = 127; /* Mid-point of mic level */
-  }
-  stt->micRef = stt->micVol;
-  stt->micGainIdx = 127;
-#ifdef MIC_LEVEL_FEEDBACK
-  stt->numBlocksMicLvlSat = 0;
-  stt->micLvlSat = 0;
-#endif
-#ifdef WEBRTC_AGC_DEBUG_DUMP
-  fprintf(stt->fpt, "AGC->Init: minLevel = %d, maxAnalog = %d, maxLevel = %d\n",
-          stt->minLevel, stt->maxAnalog, stt->maxLevel);
-#endif
-
-  /* Minimum output volume is 4% higher than the available lowest volume level
-   */
-  tmp32 = ((stt->maxLevel - stt->minLevel) * 10) >> 8;
-  stt->minOutput = (stt->minLevel + tmp32);
-
-  stt->msTooLow = 0;
-  stt->msTooHigh = 0;
-  stt->changeToSlowMode = 0;
-  stt->firstCall = 0;
-  stt->msZero = 0;
-  stt->muteGuardMs = 0;
-  stt->gainTableIdx = 0;
-
-  stt->msecSpeechInnerChange = kMsecSpeechInner;
-  stt->msecSpeechOuterChange = kMsecSpeechOuter;
-
-  stt->activeSpeech = 0;
-  stt->Rxx16_LPw32Max = 0;
-
-  stt->vadThreshold = kNormalVadThreshold;
-  stt->inActive = 0;
-
-  for (i = 0; i < RXX_BUFFER_LEN; i++) {
-    stt->Rxx16_vectorw32[i] = (int32_t)1000; /* -54dBm0 */
-  }
-  stt->Rxx160w32 =
-      125 * RXX_BUFFER_LEN; /* (stt->Rxx16_vectorw32[0]>>3) = 125 */
-
-  stt->Rxx16pos = 0;
-  stt->Rxx16_LPw32 = (int32_t)16284; /* Q(-4) */
-
-  for (i = 0; i < 5; i++) {
-    stt->Rxx16w32_array[0][i] = 0;
-  }
-  for (i = 0; i < 10; i++) {
-    stt->env[0][i] = 0;
-    stt->env[1][i] = 0;
-  }
-  stt->inQueue = 0;
-
-#ifdef MIC_LEVEL_FEEDBACK
-  stt->targetIdxOffset = 0;
-#endif
-
-  WebRtcSpl_MemSetW32(stt->filterState, 0, 8);
-
-  stt->initFlag = kInitCheck;
-  // Default config settings.
-  stt->defaultConfig.limiterEnable = kAgcTrue;
-  stt->defaultConfig.targetLevelDbfs = AGC_DEFAULT_TARGET_LEVEL;
-  stt->defaultConfig.compressionGaindB = AGC_DEFAULT_COMP_GAIN;
-
-  if (WebRtcAgc_set_config(stt, stt->defaultConfig) == -1) {
-    stt->lastError = AGC_UNSPECIFIED_ERROR;
-    return -1;
-  }
-  stt->Rxx160_LPw32 = stt->analogTargetLevel;  // Initialize rms value
-
-  stt->lowLevelSignal = 0;
-
-  /* Only positive values are allowed that are not too large */
-  if ((minLevel >= maxLevel) || (maxLevel & 0xFC000000)) {
-#ifdef WEBRTC_AGC_DEBUG_DUMP
-    fprintf(stt->fpt, "minLevel, maxLevel value(s) are invalid\n\n");
-#endif
-    return -1;
-  } else {
-#ifdef WEBRTC_AGC_DEBUG_DUMP
-    fprintf(stt->fpt, "\n");
-#endif
-    return 0;
-  }
-}
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/agc/legacy/analog_agc.h b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/agc/legacy/analog_agc.h
deleted file mode 100644
index 619d95ad0a..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/agc/legacy/analog_agc.h
+++ /dev/null
@@ -1,131 +0,0 @@
-/*
- *  Copyright (c) 2011 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#ifndef MODULES_AUDIO_PROCESSING_AGC_LEGACY_ANALOG_AGC_H_
-#define MODULES_AUDIO_PROCESSING_AGC_LEGACY_ANALOG_AGC_H_
-
-//#define MIC_LEVEL_FEEDBACK
-#ifdef WEBRTC_AGC_DEBUG_DUMP
-#include <stdio.h>
-#endif
-
-#include "modules/audio_processing/agc/legacy/digital_agc.h"
-#include "modules/audio_processing/agc/legacy/gain_control.h"
-
-/* Analog Automatic Gain Control variables:
- * Constant declarations (inner limits inside which no changes are done)
- * In the beginning the range is narrower to widen as soon as the measure
- * 'Rxx160_LP' is inside it. Currently the starting limits are -22.2+/-1dBm0
- * and the final limits -22.2+/-2.5dBm0. These levels makes the speech signal
- * go towards -25.4dBm0 (-31.4dBov). Tuned with wbfile-31.4dBov.pcm
- * The limits are created by running the AGC with a file having the desired
- * signal level and thereafter plotting Rxx160_LP in the dBm0-domain defined
- * by out=10*log10(in/260537279.7); Set the target level to the average level
- * of our measure Rxx160_LP. Remember that the levels are in blocks of 16 in
- * Q(-7). (Example matlab code: round(db2pow(-21.2)*16/2^7) )
- */
-#define RXX_BUFFER_LEN 10
-
-static const int16_t kMsecSpeechInner = 520;
-static const int16_t kMsecSpeechOuter = 340;
-
-static const int16_t kNormalVadThreshold = 400;
-
-static const int16_t kAlphaShortTerm = 6;  // 1 >> 6 = 0.0156
-static const int16_t kAlphaLongTerm = 10;  // 1 >> 10 = 0.000977
-
-typedef struct {
-  // Configurable parameters/variables
-  uint32_t fs;                // Sampling frequency
-  int16_t compressionGaindB;  // Fixed gain level in dB
-  int16_t targetLevelDbfs;    // Target level in -dBfs of envelope (default -3)
-  int16_t agcMode;            // Hard coded mode (adaptAna/adaptDig/fixedDig)
-  uint8_t limiterEnable;      // Enabling limiter (on/off (default off))
-  WebRtcAgcConfig defaultConfig;
-  WebRtcAgcConfig usedConfig;
-
-  // General variables
-  int16_t initFlag;
-  int16_t lastError;
-
-  // Target level parameters
-  // Based on the above: analogTargetLevel = round((32767*10^(-22/20))^2*16/2^7)
-  int32_t analogTargetLevel;    // = RXX_BUFFER_LEN * 846805;       -22 dBfs
-  int32_t startUpperLimit;      // = RXX_BUFFER_LEN * 1066064;      -21 dBfs
-  int32_t startLowerLimit;      // = RXX_BUFFER_LEN * 672641;       -23 dBfs
-  int32_t upperPrimaryLimit;    // = RXX_BUFFER_LEN * 1342095;      -20 dBfs
-  int32_t lowerPrimaryLimit;    // = RXX_BUFFER_LEN * 534298;       -24 dBfs
-  int32_t upperSecondaryLimit;  // = RXX_BUFFER_LEN * 2677832;      -17 dBfs
-  int32_t lowerSecondaryLimit;  // = RXX_BUFFER_LEN * 267783;       -27 dBfs
-  uint16_t targetIdx;           // Table index for corresponding target level
-#ifdef MIC_LEVEL_FEEDBACK
-  uint16_t targetIdxOffset;  // Table index offset for level compensation
-#endif
-  int16_t analogTarget;  // Digital reference level in ENV scale
-
-  // Analog AGC specific variables
-  int32_t filterState[8];  // For downsampling wb to nb
-  int32_t upperLimit;      // Upper limit for mic energy
-  int32_t lowerLimit;      // Lower limit for mic energy
-  int32_t Rxx160w32;       // Average energy for one frame
-  int32_t Rxx16_LPw32;     // Low pass filtered subframe energies
-  int32_t Rxx160_LPw32;    // Low pass filtered frame energies
-  int32_t Rxx16_LPw32Max;  // Keeps track of largest energy subframe
-  int32_t Rxx16_vectorw32[RXX_BUFFER_LEN];  // Array with subframe energies
-  int32_t Rxx16w32_array[2][5];  // Energy values of microphone signal
-  int32_t env[2][10];            // Envelope values of subframes
-
-  int16_t Rxx16pos;          // Current position in the Rxx16_vectorw32
-  int16_t envSum;            // Filtered scaled envelope in subframes
-  int16_t vadThreshold;      // Threshold for VAD decision
-  int16_t inActive;          // Inactive time in milliseconds
-  int16_t msTooLow;          // Milliseconds of speech at a too low level
-  int16_t msTooHigh;         // Milliseconds of speech at a too high level
-  int16_t changeToSlowMode;  // Change to slow mode after some time at target
-  int16_t firstCall;         // First call to the process-function
-  int16_t msZero;            // Milliseconds of zero input
-  int16_t msecSpeechOuterChange;  // Min ms of speech between volume changes
-  int16_t msecSpeechInnerChange;  // Min ms of speech between volume changes
-  int16_t activeSpeech;           // Milliseconds of active speech
-  int16_t muteGuardMs;            // Counter to prevent mute action
-  int16_t inQueue;                // 10 ms batch indicator
-
-  // Microphone level variables
-  int32_t micRef;         // Remember ref. mic level for virtual mic
-  uint16_t gainTableIdx;  // Current position in virtual gain table
-  int32_t micGainIdx;     // Gain index of mic level to increase slowly
-  int32_t micVol;         // Remember volume between frames
-  int32_t maxLevel;       // Max possible vol level, incl dig gain
-  int32_t maxAnalog;      // Maximum possible analog volume level
-  int32_t maxInit;        // Initial value of "max"
-  int32_t minLevel;       // Minimum possible volume level
-  int32_t minOutput;      // Minimum output volume level
-  int32_t zeroCtrlMax;    // Remember max gain => don't amp low input
-  int32_t lastInMicLevel;
-
-  int16_t scale;  // Scale factor for internal volume levels
-#ifdef MIC_LEVEL_FEEDBACK
-  int16_t numBlocksMicLvlSat;
-  uint8_t micLvlSat;
-#endif
-  // Structs for VAD and digital_agc
-  AgcVad vadMic;
-  DigitalAgc digitalAgc;
-
-#ifdef WEBRTC_AGC_DEBUG_DUMP
-  FILE* fpt;
-  FILE* agcLog;
-  int32_t fcount;
-#endif
-
-  int16_t lowLevelSignal;
-} LegacyAgc;
-
-#endif  // MODULES_AUDIO_PROCESSING_AGC_LEGACY_ANALOG_AGC_H_
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/agc/legacy/digital_agc.c b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/agc/legacy/digital_agc.c
deleted file mode 100644
index d1c30bd283..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/agc/legacy/digital_agc.c
+++ /dev/null
@@ -1,705 +0,0 @@
-/*
- *  Copyright (c) 2011 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-/* digital_agc.c
- *
- */
-
-#include "modules/audio_processing/agc/legacy/digital_agc.h"
-
-#include <string.h>
-#ifdef WEBRTC_AGC_DEBUG_DUMP
-#include <stdio.h>
-#endif
-
-#include "rtc_base/checks.h"
-#include "modules/audio_processing/agc/legacy/gain_control.h"
-
-// To generate the gaintable, copy&paste the following lines to a Matlab window:
-// MaxGain = 6; MinGain = 0; CompRatio = 3; Knee = 1;
-// zeros = 0:31; lvl = 2.^(1-zeros);
-// A = -10*log10(lvl) * (CompRatio - 1) / CompRatio;
-// B = MaxGain - MinGain;
-// gains = round(2^16*10.^(0.05 * (MinGain + B * (
-// log(exp(-Knee*A)+exp(-Knee*B)) - log(1+exp(-Knee*B)) ) /
-// log(1/(1+exp(Knee*B))))));
-// fprintf(1, '\t%i, %i, %i, %i,\n', gains);
-// % Matlab code for plotting the gain and input/output level characteristic
-// (copy/paste the following 3 lines):
-// in = 10*log10(lvl); out = 20*log10(gains/65536);
-// subplot(121); plot(in, out); axis([-30, 0, -5, 20]); grid on; xlabel('Input
-// (dB)'); ylabel('Gain (dB)');
-// subplot(122); plot(in, in+out); axis([-30, 0, -30, 5]); grid on;
-// xlabel('Input (dB)'); ylabel('Output (dB)');
-// zoom on;
-
-// Generator table for y=log2(1+e^x) in Q8.
-enum { kGenFuncTableSize = 128 };
-static const uint16_t kGenFuncTable[kGenFuncTableSize] = {
-    256,   485,   786,   1126,  1484,  1849,  2217,  2586,  2955,  3324,  3693,
-    4063,  4432,  4801,  5171,  5540,  5909,  6279,  6648,  7017,  7387,  7756,
-    8125,  8495,  8864,  9233,  9603,  9972,  10341, 10711, 11080, 11449, 11819,
-    12188, 12557, 12927, 13296, 13665, 14035, 14404, 14773, 15143, 15512, 15881,
-    16251, 16620, 16989, 17359, 17728, 18097, 18466, 18836, 19205, 19574, 19944,
-    20313, 20682, 21052, 21421, 21790, 22160, 22529, 22898, 23268, 23637, 24006,
-    24376, 24745, 25114, 25484, 25853, 26222, 26592, 26961, 27330, 27700, 28069,
-    28438, 28808, 29177, 29546, 29916, 30285, 30654, 31024, 31393, 31762, 32132,
-    32501, 32870, 33240, 33609, 33978, 34348, 34717, 35086, 35456, 35825, 36194,
-    36564, 36933, 37302, 37672, 38041, 38410, 38780, 39149, 39518, 39888, 40257,
-    40626, 40996, 41365, 41734, 42104, 42473, 42842, 43212, 43581, 43950, 44320,
-    44689, 45058, 45428, 45797, 46166, 46536, 46905};
-
-static const int16_t kAvgDecayTime = 250;  // frames; < 3000
-
-int32_t WebRtcAgc_CalculateGainTable(int32_t* gainTable,       // Q16
-                                     int16_t digCompGaindB,    // Q0
-                                     int16_t targetLevelDbfs,  // Q0
-                                     uint8_t limiterEnable,
-                                     int16_t analogTarget)  // Q0
-{
-  // This function generates the compressor gain table used in the fixed digital
-  // part.
-  uint32_t tmpU32no1, tmpU32no2, absInLevel, logApprox;
-  int32_t inLevel, limiterLvl;
-  int32_t tmp32, tmp32no1, tmp32no2, numFIX, den, y32;
-  const uint16_t kLog10 = 54426;    // log2(10)     in Q14
-  const uint16_t kLog10_2 = 49321;  // 10*log10(2)  in Q14
-  const uint16_t kLogE_1 = 23637;   // log2(e)      in Q14
-  uint16_t constMaxGain;
-  uint16_t tmpU16, intPart, fracPart;
-  const int16_t kCompRatio = 3;
-  const int16_t kSoftLimiterLeft = 1;
-  int16_t limiterOffset = 0;  // Limiter offset
-  int16_t limiterIdx, limiterLvlX;
-  int16_t constLinApprox, zeroGainLvl, maxGain, diffGain;
-  int16_t i, tmp16, tmp16no1;
-  int zeros, zerosScale;
-
-  // Constants
-  //    kLogE_1 = 23637; // log2(e)      in Q14
-  //    kLog10 = 54426; // log2(10)     in Q14
-  //    kLog10_2 = 49321; // 10*log10(2)  in Q14
-
-  // Calculate maximum digital gain and zero gain level
-  tmp32no1 = (digCompGaindB - analogTarget) * (kCompRatio - 1);
-  tmp16no1 = analogTarget - targetLevelDbfs;
-  tmp16no1 +=
-      WebRtcSpl_DivW32W16ResW16(tmp32no1 + (kCompRatio >> 1), kCompRatio);
-  maxGain = WEBRTC_SPL_MAX(tmp16no1, (analogTarget - targetLevelDbfs));
-  tmp32no1 = maxGain * kCompRatio;
-  zeroGainLvl = digCompGaindB;
-  zeroGainLvl -= WebRtcSpl_DivW32W16ResW16(tmp32no1 + ((kCompRatio - 1) >> 1),
-                                           kCompRatio - 1);
-  if ((digCompGaindB <= analogTarget) && (limiterEnable)) {
-    zeroGainLvl += (analogTarget - digCompGaindB + kSoftLimiterLeft);
-    limiterOffset = 0;
-  }
-
-  // Calculate the difference between maximum gain and gain at 0dB0v:
-  //  diffGain = maxGain + (compRatio-1)*zeroGainLvl/compRatio
-  //           = (compRatio-1)*digCompGaindB/compRatio
-  tmp32no1 = digCompGaindB * (kCompRatio - 1);
-  diffGain =
-      WebRtcSpl_DivW32W16ResW16(tmp32no1 + (kCompRatio >> 1), kCompRatio);
-  if (diffGain < 0 || diffGain >= kGenFuncTableSize) {
-    RTC_DCHECK(0);
-    return -1;
-  }
-
-  // Calculate the limiter level and index:
-  //  limiterLvlX = analogTarget - limiterOffset
-  //  limiterLvl  = targetLevelDbfs + limiterOffset/compRatio
-  limiterLvlX = analogTarget - limiterOffset;
-  limiterIdx = 2 + WebRtcSpl_DivW32W16ResW16((int32_t)limiterLvlX * (1 << 13),
-                                             kLog10_2 / 2);
-  tmp16no1 =
-      WebRtcSpl_DivW32W16ResW16(limiterOffset + (kCompRatio >> 1), kCompRatio);
-  limiterLvl = targetLevelDbfs + tmp16no1;
-
-  // Calculate (through table lookup):
-  //  constMaxGain = log2(1+2^(log2(e)*diffGain)); (in Q8)
-  constMaxGain = kGenFuncTable[diffGain];  // in Q8
-
-  // Calculate a parameter used to approximate the fractional part of 2^x with a
-  // piecewise linear function in Q14:
-  //  constLinApprox = round(3/2*(4*(3-2*sqrt(2))/(log(2)^2)-0.5)*2^14);
-  constLinApprox = 22817;  // in Q14
-
-  // Calculate a denominator used in the exponential part to convert from dB to
-  // linear scale:
-  //  den = 20*constMaxGain (in Q8)
-  den = WEBRTC_SPL_MUL_16_U16(20, constMaxGain);  // in Q8
-
-  for (i = 0; i < 32; i++) {
-    // Calculate scaled input level (compressor):
-    //  inLevel =
-    //  fix((-constLog10_2*(compRatio-1)*(1-i)+fix(compRatio/2))/compRatio)
-    tmp16 = (int16_t)((kCompRatio - 1) * (i - 1));       // Q0
-    tmp32 = WEBRTC_SPL_MUL_16_U16(tmp16, kLog10_2) + 1;  // Q14
-    inLevel = WebRtcSpl_DivW32W16(tmp32, kCompRatio);    // Q14
-
-    // Calculate diffGain-inLevel, to map using the genFuncTable
-    inLevel = (int32_t)diffGain * (1 << 14) - inLevel;  // Q14
-
-    // Make calculations on abs(inLevel) and compensate for the sign afterwards.
-    absInLevel = (uint32_t)WEBRTC_SPL_ABS_W32(inLevel);  // Q14
-
-    // LUT with interpolation
-    intPart = (uint16_t)(absInLevel >> 14);
-    fracPart =
-        (uint16_t)(absInLevel & 0x00003FFF);  // extract the fractional part
-    tmpU16 = kGenFuncTable[intPart + 1] - kGenFuncTable[intPart];  // Q8
-    tmpU32no1 = tmpU16 * fracPart;                                 // Q22
-    tmpU32no1 += (uint32_t)kGenFuncTable[intPart] << 14;           // Q22
-    logApprox = tmpU32no1 >> 8;                                    // Q14
-    // Compensate for negative exponent using the relation:
-    //  log2(1 + 2^-x) = log2(1 + 2^x) - x
-    if (inLevel < 0) {
-      zeros = WebRtcSpl_NormU32(absInLevel);
-      zerosScale = 0;
-      if (zeros < 15) {
-        // Not enough space for multiplication
-        tmpU32no2 = absInLevel >> (15 - zeros);                 // Q(zeros-1)
-        tmpU32no2 = WEBRTC_SPL_UMUL_32_16(tmpU32no2, kLogE_1);  // Q(zeros+13)
-        if (zeros < 9) {
-          zerosScale = 9 - zeros;
-          tmpU32no1 >>= zerosScale;  // Q(zeros+13)
-        } else {
-          tmpU32no2 >>= zeros - 9;  // Q22
-        }
-      } else {
-        tmpU32no2 = WEBRTC_SPL_UMUL_32_16(absInLevel, kLogE_1);  // Q28
-        tmpU32no2 >>= 6;                                         // Q22
-      }
-      logApprox = 0;
-      if (tmpU32no2 < tmpU32no1) {
-        logApprox = (tmpU32no1 - tmpU32no2) >> (8 - zerosScale);  // Q14
-      }
-    }
-    numFIX = (maxGain * constMaxGain) * (1 << 6);  // Q14
-    numFIX -= (int32_t)logApprox * diffGain;       // Q14
-
-    // Calculate ratio
-    // Shift |numFIX| as much as possible.
-    // Ensure we avoid wrap-around in |den| as well.
-    if (numFIX > (den >> 8) || -numFIX > (den >> 8))  // |den| is Q8.
-    {
-      zeros = WebRtcSpl_NormW32(numFIX);
-    } else {
-      zeros = WebRtcSpl_NormW32(den) + 8;
-    }
-    numFIX *= 1 << zeros;  // Q(14+zeros)
-
-    // Shift den so we end up in Qy1
-    tmp32no1 = WEBRTC_SPL_SHIFT_W32(den, zeros - 9);  // Q(zeros - 1)
-    y32 = numFIX / tmp32no1;  // in Q15
-    // This is to do rounding in Q14.
-    y32 = y32 >= 0 ? (y32 + 1) >> 1 : -((-y32 + 1) >> 1);
-
-    if (limiterEnable && (i < limiterIdx)) {
-      tmp32 = WEBRTC_SPL_MUL_16_U16(i - 1, kLog10_2);  // Q14
-      tmp32 -= limiterLvl * (1 << 14);                 // Q14
-      y32 = WebRtcSpl_DivW32W16(tmp32 + 10, 20);
-    }
-    if (y32 > 39000) {
-      tmp32 = (y32 >> 1) * kLog10 + 4096;  // in Q27
-      tmp32 >>= 13;                        // In Q14.
-    } else {
-      tmp32 = y32 * kLog10 + 8192;  // in Q28
-      tmp32 >>= 14;                 // In Q14.
-    }
-    tmp32 += 16 << 14;  // in Q14 (Make sure final output is in Q16)
-
-    // Calculate power
-    if (tmp32 > 0) {
-      intPart = (int16_t)(tmp32 >> 14);
-      fracPart = (uint16_t)(tmp32 & 0x00003FFF);  // in Q14
-      if ((fracPart >> 13) != 0) {
-        tmp16 = (2 << 14) - constLinApprox;
-        tmp32no2 = (1 << 14) - fracPart;
-        tmp32no2 *= tmp16;
-        tmp32no2 >>= 13;
-        tmp32no2 = (1 << 14) - tmp32no2;
-      } else {
-        tmp16 = constLinApprox - (1 << 14);
-        tmp32no2 = (fracPart * tmp16) >> 13;
-      }
-      fracPart = (uint16_t)tmp32no2;
-      gainTable[i] =
-          (1 << intPart) + WEBRTC_SPL_SHIFT_W32(fracPart, intPart - 14);
-    } else {
-      gainTable[i] = 0;
-    }
-  }
-
-  return 0;
-}
-
-int32_t WebRtcAgc_InitDigital(DigitalAgc* stt, int16_t agcMode) {
-  if (agcMode == kAgcModeFixedDigital) {
-    // start at minimum to find correct gain faster
-    stt->capacitorSlow = 0;
-  } else {
-    // start out with 0 dB gain
-    stt->capacitorSlow = 134217728;  // (int32_t)(0.125f * 32768.0f * 32768.0f);
-  }
-  stt->capacitorFast = 0;
-  stt->gain = 65536;
-  stt->gatePrevious = 0;
-  stt->agcMode = agcMode;
-#ifdef WEBRTC_AGC_DEBUG_DUMP
-  stt->frameCounter = 0;
-#endif
-
-  // initialize VADs
-  WebRtcAgc_InitVad(&stt->vadNearend);
-  WebRtcAgc_InitVad(&stt->vadFarend);
-
-  return 0;
-}
-
-int32_t WebRtcAgc_AddFarendToDigital(DigitalAgc* stt,
-                                     const int16_t* in_far,
-                                     size_t nrSamples) {
-  RTC_DCHECK(stt);
-  // VAD for far end
-  WebRtcAgc_ProcessVad(&stt->vadFarend, in_far, nrSamples);
-
-  return 0;
-}
-
-int32_t WebRtcAgc_ProcessDigital(DigitalAgc* stt,
-                                 const int16_t* const* in_near,
-                                 size_t num_bands,
-                                 int16_t* const* out,
-                                 uint32_t FS,
-                                 int16_t lowlevelSignal) {
-  // array for gains (one value per ms, incl start & end)
-  int32_t gains[11];
-
-  int32_t out_tmp, tmp32;
-  int32_t env[10];
-  int32_t max_nrg;
-  int32_t cur_level;
-  int32_t gain32, delta;
-  int16_t logratio;
-  int16_t lower_thr, upper_thr;
-  int16_t zeros = 0, zeros_fast, frac = 0;
-  int16_t decay;
-  int16_t gate, gain_adj;
-  int16_t k;
-  size_t n, i, L;
-  int16_t L2;  // samples/subframe
-
-  // determine number of samples per ms
-  if (FS == 8000) {
-    L = 8;
-    L2 = 3;
-  } else if (FS == 16000 || FS == 32000 || FS == 48000) {
-    L = 16;
-    L2 = 4;
-  } else {
-    return -1;
-  }
-
-  for (i = 0; i < num_bands; ++i) {
-    if (in_near[i] != out[i]) {
-      // Only needed if they don't already point to the same place.
-      memcpy(out[i], in_near[i], 10 * L * sizeof(in_near[i][0]));
-    }
-  }
-  // VAD for near end
-  logratio = WebRtcAgc_ProcessVad(&stt->vadNearend, out[0], L * 10);
-
-  // Account for far end VAD
-  if (stt->vadFarend.counter > 10) {
-    tmp32 = 3 * logratio;
-    logratio = (int16_t)((tmp32 - stt->vadFarend.logRatio) >> 2);
-  }
-
-  // Determine decay factor depending on VAD
-  //  upper_thr = 1.0f;
-  //  lower_thr = 0.25f;
-  upper_thr = 1024;  // Q10
-  lower_thr = 0;     // Q10
-  if (logratio > upper_thr) {
-    // decay = -2^17 / DecayTime;  ->  -65
-    decay = -65;
-  } else if (logratio < lower_thr) {
-    decay = 0;
-  } else {
-    // decay = (int16_t)(((lower_thr - logratio)
-    //       * (2^27/(DecayTime*(upper_thr-lower_thr)))) >> 10);
-    // SUBSTITUTED: 2^27/(DecayTime*(upper_thr-lower_thr))  ->  65
-    tmp32 = (lower_thr - logratio) * 65;
-    decay = (int16_t)(tmp32 >> 10);
-  }
-
-  // adjust decay factor for long silence (detected as low standard deviation)
-  // This is only done in the adaptive modes
-  if (stt->agcMode != kAgcModeFixedDigital) {
-    if (stt->vadNearend.stdLongTerm < 4000) {
-      decay = 0;
-    } else if (stt->vadNearend.stdLongTerm < 8096) {
-      // decay = (int16_t)(((stt->vadNearend.stdLongTerm - 4000) * decay) >>
-      // 12);
-      tmp32 = (stt->vadNearend.stdLongTerm - 4000) * decay;
-      decay = (int16_t)(tmp32 >> 12);
-    }
-
-    if (lowlevelSignal != 0) {
-      decay = 0;
-    }
-  }
-#ifdef WEBRTC_AGC_DEBUG_DUMP
-  stt->frameCounter++;
-  fprintf(stt->logFile, "%5.2f\t%d\t%d\t%d\t", (float)(stt->frameCounter) / 100,
-          logratio, decay, stt->vadNearend.stdLongTerm);
-#endif
-  // Find max amplitude per sub frame
-  // iterate over sub frames
-  for (k = 0; k < 10; k++) {
-    // iterate over samples
-    max_nrg = 0;
-    for (n = 0; n < L; n++) {
-      int32_t nrg = out[0][k * L + n] * out[0][k * L + n];
-      if (nrg > max_nrg) {
-        max_nrg = nrg;
-      }
-    }
-    env[k] = max_nrg;
-  }
-
-  // Calculate gain per sub frame
-  gains[0] = stt->gain;
-  for (k = 0; k < 10; k++) {
-    // Fast envelope follower
-    //  decay time = -131000 / -1000 = 131 (ms)
-    stt->capacitorFast =
-        AGC_SCALEDIFF32(-1000, stt->capacitorFast, stt->capacitorFast);
-    if (env[k] > stt->capacitorFast) {
-      stt->capacitorFast = env[k];
-    }
-    // Slow envelope follower
-    if (env[k] > stt->capacitorSlow) {
-      // increase capacitorSlow
-      stt->capacitorSlow = AGC_SCALEDIFF32(500, (env[k] - stt->capacitorSlow),
-                                           stt->capacitorSlow);
-    } else {
-      // decrease capacitorSlow
-      stt->capacitorSlow =
-          AGC_SCALEDIFF32(decay, stt->capacitorSlow, stt->capacitorSlow);
-    }
-
-    // use maximum of both capacitors as current level
-    if (stt->capacitorFast > stt->capacitorSlow) {
-      cur_level = stt->capacitorFast;
-    } else {
-      cur_level = stt->capacitorSlow;
-    }
-    // Translate signal level into gain, using a piecewise linear approximation
-    // find number of leading zeros
-    zeros = WebRtcSpl_NormU32((uint32_t)cur_level);
-    if (cur_level == 0) {
-      zeros = 31;
-    }
-    tmp32 = ((uint32_t)cur_level << zeros) & 0x7FFFFFFF;
-    frac = (int16_t)(tmp32 >> 19);  // Q12.
-    // Interpolate between gainTable[zeros] and gainTable[zeros-1].
-    tmp32 = ((stt->gainTable[zeros - 1] - stt->gainTable[zeros]) *
-             (int64_t)frac) >> 12;
-    gains[k + 1] = stt->gainTable[zeros] + tmp32;
-#ifdef WEBRTC_AGC_DEBUG_DUMP
-    if (k == 0) {
-      fprintf(stt->logFile, "%d\t%d\t%d\t%d\t%d\n", env[0], cur_level,
-              stt->capacitorFast, stt->capacitorSlow, zeros);
-    }
-#endif
-  }
-
-  // Gate processing (lower gain during absence of speech)
-  zeros = (zeros << 9) - (frac >> 3);
-  // find number of leading zeros
-  zeros_fast = WebRtcSpl_NormU32((uint32_t)stt->capacitorFast);
-  if (stt->capacitorFast == 0) {
-    zeros_fast = 31;
-  }
-  tmp32 = ((uint32_t)stt->capacitorFast << zeros_fast) & 0x7FFFFFFF;
-  zeros_fast <<= 9;
-  zeros_fast -= (int16_t)(tmp32 >> 22);
-
-  gate = 1000 + zeros_fast - zeros - stt->vadNearend.stdShortTerm;
-
-  if (gate < 0) {
-    stt->gatePrevious = 0;
-  } else {
-    tmp32 = stt->gatePrevious * 7;
-    gate = (int16_t)((gate + tmp32) >> 3);
-    stt->gatePrevious = gate;
-  }
-  // gate < 0     -> no gate
-  // gate > 2500  -> max gate
-  if (gate > 0) {
-    if (gate < 2500) {
-      gain_adj = (2500 - gate) >> 5;
-    } else {
-      gain_adj = 0;
-    }
-    for (k = 0; k < 10; k++) {
-      if ((gains[k + 1] - stt->gainTable[0]) > 8388608) {
-        // To prevent wraparound
-        tmp32 = (gains[k + 1] - stt->gainTable[0]) >> 8;
-        tmp32 *= 178 + gain_adj;
-      } else {
-        tmp32 = (gains[k + 1] - stt->gainTable[0]) * (178 + gain_adj);
-        tmp32 >>= 8;
-      }
-      gains[k + 1] = stt->gainTable[0] + tmp32;
-    }
-  }
-
-  // Limit gain to avoid overload distortion
-  for (k = 0; k < 10; k++) {
-    // Find a shift of gains[k + 1] such that it can be squared without
-    // overflow, but at least by 10 bits.
-    zeros = 10;
-    if (gains[k + 1] > 47452159) {
-      zeros = 16 - WebRtcSpl_NormW32(gains[k + 1]);
-    }
-    gain32 = (gains[k + 1] >> zeros) + 1;
-    gain32 *= gain32;
-    // check for overflow
-    while (AGC_MUL32((env[k] >> 12) + 1, gain32) >
-           WEBRTC_SPL_SHIFT_W32((int32_t)32767, 2 * (1 - zeros + 10))) {
-      // multiply by 253/256 ==> -0.1 dB
-      if (gains[k + 1] > 8388607) {
-        // Prevent wrap around
-        gains[k + 1] = (gains[k + 1] / 256) * 253;
-      } else {
-        gains[k + 1] = (gains[k + 1] * 253) / 256;
-      }
-      gain32 = (gains[k + 1] >> zeros) + 1;
-      gain32 *= gain32;
-    }
-  }
-  // gain reductions should be done 1 ms earlier than gain increases
-  for (k = 1; k < 10; k++) {
-    if (gains[k] > gains[k + 1]) {
-      gains[k] = gains[k + 1];
-    }
-  }
-  // save start gain for next frame
-  stt->gain = gains[10];
-
-  // Apply gain
-  // handle first sub frame separately
-  delta = (gains[1] - gains[0]) * (1 << (4 - L2));
-  gain32 = gains[0] * (1 << 4);
-  // iterate over samples
-  for (n = 0; n < L; n++) {
-    for (i = 0; i < num_bands; ++i) {
-      out_tmp = (int64_t)out[i][n] * ((gain32 + 127) >> 7) >> 16;
-      if (out_tmp > 4095) {
-        out[i][n] = (int16_t)32767;
-      } else if (out_tmp < -4096) {
-        out[i][n] = (int16_t)-32768;
-      } else {
-        tmp32 = ((int64_t)out[i][n] * (gain32 >> 4)) >> 16;
-        out[i][n] = (int16_t)tmp32;
-      }
-    }
-
-    gain32 += delta;
-  }
-  // iterate over subframes
-  for (k = 1; k < 10; k++) {
-    delta = (gains[k + 1] - gains[k]) * (1 << (4 - L2));
-    gain32 = gains[k] * (1 << 4);
-    // iterate over samples
-    for (n = 0; n < L; n++) {
-      for (i = 0; i < num_bands; ++i) {
-        int64_t tmp64 = ((int64_t)(out[i][k * L + n])) * (gain32 >> 4);
-        tmp64 = tmp64 >> 16;
-        if (tmp64 > 32767) {
-          out[i][k * L + n] = 32767;
-        }
-        else if (tmp64 < -32768) {
-          out[i][k * L + n] = -32768;
-        }
-        else {
-          out[i][k * L + n] = (int16_t)(tmp64);
-        }
-      }
-      gain32 += delta;
-    }
-  }
-
-  return 0;
-}
-
-void WebRtcAgc_InitVad(AgcVad* state) {
-  int16_t k;
-
-  state->HPstate = 0;   // state of high pass filter
-  state->logRatio = 0;  // log( P(active) / P(inactive) )
-  // average input level (Q10)
-  state->meanLongTerm = 15 << 10;
-
-  // variance of input level (Q8)
-  state->varianceLongTerm = 500 << 8;
-
-  state->stdLongTerm = 0;  // standard deviation of input level in dB
-  // short-term average input level (Q10)
-  state->meanShortTerm = 15 << 10;
-
-  // short-term variance of input level (Q8)
-  state->varianceShortTerm = 500 << 8;
-
-  state->stdShortTerm =
-      0;               // short-term standard deviation of input level in dB
-  state->counter = 3;  // counts updates
-  for (k = 0; k < 8; k++) {
-    // downsampling filter
-    state->downState[k] = 0;
-  }
-}
-
-int16_t WebRtcAgc_ProcessVad(AgcVad* state,      // (i) VAD state
-                             const int16_t* in,  // (i) Speech signal
-                             size_t nrSamples)   // (i) number of samples
-{
-  uint32_t nrg;
-  int32_t out, tmp32, tmp32b;
-  uint16_t tmpU16;
-  int16_t k, subfr, tmp16;
-  int16_t buf1[8];
-  int16_t buf2[4];
-  int16_t HPstate;
-  int16_t zeros, dB;
-  int64_t tmp64;
-
-  // process in 10 sub frames of 1 ms (to save on memory)
-  nrg = 0;
-  HPstate = state->HPstate;
-  for (subfr = 0; subfr < 10; subfr++) {
-    // downsample to 4 kHz
-    if (nrSamples == 160) {
-      for (k = 0; k < 8; k++) {
-        tmp32 = (int32_t)in[2 * k] + (int32_t)in[2 * k + 1];
-        tmp32 >>= 1;
-        buf1[k] = (int16_t)tmp32;
-      }
-      in += 16;
-
-      WebRtcSpl_DownsampleBy2(buf1, 8, buf2, state->downState);
-    } else {
-      WebRtcSpl_DownsampleBy2(in, 8, buf2, state->downState);
-      in += 8;
-    }
-
-    // high pass filter and compute energy
-    for (k = 0; k < 4; k++) {
-      out = buf2[k] + HPstate;
-      tmp32 = 600 * out;
-      HPstate = (int16_t)((tmp32 >> 10) - buf2[k]);
-
-      // Add 'out * out / 2**6' to 'nrg' in a non-overflowing
-      // way. Guaranteed to work as long as 'out * out / 2**6' fits in
-      // an int32_t.
-      nrg += out * (out / (1 << 6));
-      nrg += out * (out % (1 << 6)) / (1 << 6);
-    }
-  }
-  state->HPstate = HPstate;
-
-  // find number of leading zeros
-  if (!(0xFFFF0000 & nrg)) {
-    zeros = 16;
-  } else {
-    zeros = 0;
-  }
-  if (!(0xFF000000 & (nrg << zeros))) {
-    zeros += 8;
-  }
-  if (!(0xF0000000 & (nrg << zeros))) {
-    zeros += 4;
-  }
-  if (!(0xC0000000 & (nrg << zeros))) {
-    zeros += 2;
-  }
-  if (!(0x80000000 & (nrg << zeros))) {
-    zeros += 1;
-  }
-
-  // energy level (range {-32..30}) (Q10)
-  dB = (15 - zeros) * (1 << 11);
-
-  // Update statistics
-
-  if (state->counter < kAvgDecayTime) {
-    // decay time = AvgDecTime * 10 ms
-    state->counter++;
-  }
-
-  // update short-term estimate of mean energy level (Q10)
-  tmp32 = state->meanShortTerm * 15 + dB;
-  state->meanShortTerm = (int16_t)(tmp32 >> 4);
-
-  // update short-term estimate of variance in energy level (Q8)
-  tmp32 = (dB * dB) >> 12;
-  tmp32 += state->varianceShortTerm * 15;
-  state->varianceShortTerm = tmp32 / 16;
-
-  // update short-term estimate of standard deviation in energy level (Q10)
-  tmp32 = state->meanShortTerm * state->meanShortTerm;
-  tmp32 = (state->varianceShortTerm << 12) - tmp32;
-  state->stdShortTerm = (int16_t)WebRtcSpl_Sqrt(tmp32);
-
-  // update long-term estimate of mean energy level (Q10)
-  tmp32 = state->meanLongTerm * state->counter + dB;
-  state->meanLongTerm =
-      WebRtcSpl_DivW32W16ResW16(tmp32, WebRtcSpl_AddSatW16(state->counter, 1));
-
-  // update long-term estimate of variance in energy level (Q8)
-  tmp32 = (dB * dB) >> 12;
-  tmp32 += state->varianceLongTerm * state->counter;
-  state->varianceLongTerm =
-      WebRtcSpl_DivW32W16(tmp32, WebRtcSpl_AddSatW16(state->counter, 1));
-
-  // update long-term estimate of standard deviation in energy level (Q10)
-  tmp32 = state->meanLongTerm * state->meanLongTerm;
-  tmp32 = (state->varianceLongTerm << 12) - tmp32;
-  state->stdLongTerm = (int16_t)WebRtcSpl_Sqrt(tmp32);
-
-  // update voice activity measure (Q10)
-  tmp16 = 3 << 12;
-  // TODO(bjornv): (dB - state->meanLongTerm) can overflow, e.g., in
-  // ApmTest.Process unit test. Previously the macro WEBRTC_SPL_MUL_16_16()
-  // was used, which did an intermediate cast to (int16_t), hence losing
-  // significant bits. This cause logRatio to max out positive, rather than
-  // negative. This is a bug, but has very little significance.
-  tmp32 = tmp16 * (int16_t)(dB - state->meanLongTerm);
-  tmp32 = WebRtcSpl_DivW32W16(tmp32, state->stdLongTerm);
-  tmpU16 = (13 << 12);
-  tmp32b = WEBRTC_SPL_MUL_16_U16(state->logRatio, tmpU16);
-  tmp64 = tmp32;
-  tmp64 += tmp32b >> 10;
-  tmp64 >>= 6;
-
-  // limit
-  if (tmp64 > 2048) {
-    tmp64 = 2048;
-  } else if (tmp64 < -2048) {
-    tmp64 = -2048;
-  }
-  state->logRatio = (int16_t)tmp64;
-
-  return state->logRatio;  // Q10
-}
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/agc/legacy/digital_agc.h b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/agc/legacy/digital_agc.h
deleted file mode 100644
index f086294cf2..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/agc/legacy/digital_agc.h
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- *  Copyright (c) 2011 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#ifndef MODULES_AUDIO_PROCESSING_AGC_LEGACY_DIGITAL_AGC_H_
-#define MODULES_AUDIO_PROCESSING_AGC_LEGACY_DIGITAL_AGC_H_
-
-#ifdef WEBRTC_AGC_DEBUG_DUMP
-#include <stdio.h>
-#endif
-#include "common_audio/signal_processing/include/signal_processing_library.h"
-
-// the 32 most significant bits of A(19) * B(26) >> 13
-#define AGC_MUL32(A, B) (((B) >> 13) * (A) + (((0x00001FFF & (B)) * (A)) >> 13))
-// C + the 32 most significant bits of A * B
-#define AGC_SCALEDIFF32(A, B, C) \
-  ((C) + ((B) >> 16) * (A) + (((0x0000FFFF & (B)) * (A)) >> 16))
-
-typedef struct {
-  int32_t downState[8];
-  int16_t HPstate;
-  int16_t counter;
-  int16_t logRatio;           // log( P(active) / P(inactive) ) (Q10)
-  int16_t meanLongTerm;       // Q10
-  int32_t varianceLongTerm;   // Q8
-  int16_t stdLongTerm;        // Q10
-  int16_t meanShortTerm;      // Q10
-  int32_t varianceShortTerm;  // Q8
-  int16_t stdShortTerm;       // Q10
-} AgcVad;                     // total = 54 bytes
-
-typedef struct {
-  int32_t capacitorSlow;
-  int32_t capacitorFast;
-  int32_t gain;
-  int32_t gainTable[32];
-  int16_t gatePrevious;
-  int16_t agcMode;
-  AgcVad vadNearend;
-  AgcVad vadFarend;
-#ifdef WEBRTC_AGC_DEBUG_DUMP
-  FILE* logFile;
-  int frameCounter;
-#endif
-} DigitalAgc;
-
-int32_t WebRtcAgc_InitDigital(DigitalAgc* digitalAgcInst, int16_t agcMode);
-
-int32_t WebRtcAgc_ProcessDigital(DigitalAgc* digitalAgcInst,
-                                 const int16_t* const* inNear,
-                                 size_t num_bands,
-                                 int16_t* const* out,
-                                 uint32_t FS,
-                                 int16_t lowLevelSignal);
-
-int32_t WebRtcAgc_AddFarendToDigital(DigitalAgc* digitalAgcInst,
-                                     const int16_t* inFar,
-                                     size_t nrSamples);
-
-void WebRtcAgc_InitVad(AgcVad* vadInst);
-
-int16_t WebRtcAgc_ProcessVad(AgcVad* vadInst,    // (i) VAD state
-                             const int16_t* in,  // (i) Speech signal
-                             size_t nrSamples);  // (i) number of samples
-
-int32_t WebRtcAgc_CalculateGainTable(int32_t* gainTable,         // Q16
-                                     int16_t compressionGaindB,  // Q0 (in dB)
-                                     int16_t targetLevelDbfs,    // Q0 (in dB)
-                                     uint8_t limiterEnable,
-                                     int16_t analogTarget);
-
-#endif  // MODULES_AUDIO_PROCESSING_AGC_LEGACY_DIGITAL_AGC_H_
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/agc/legacy/gain_control.h b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/agc/legacy/gain_control.h
deleted file mode 100644
index a0ac96dfa8..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/agc/legacy/gain_control.h
+++ /dev/null
@@ -1,245 +0,0 @@
-/*
- *  Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#ifndef MODULES_AUDIO_PROCESSING_AGC_LEGACY_GAIN_CONTROL_H_
-#define MODULES_AUDIO_PROCESSING_AGC_LEGACY_GAIN_CONTROL_H_
-
-// Errors
-#define AGC_UNSPECIFIED_ERROR 18000
-#define AGC_UNSUPPORTED_FUNCTION_ERROR 18001
-#define AGC_UNINITIALIZED_ERROR 18002
-#define AGC_NULL_POINTER_ERROR 18003
-#define AGC_BAD_PARAMETER_ERROR 18004
-
-// Warnings
-#define AGC_BAD_PARAMETER_WARNING 18050
-
-enum {
-  kAgcModeUnchanged,
-  kAgcModeAdaptiveAnalog,
-  kAgcModeAdaptiveDigital,
-  kAgcModeFixedDigital
-};
-
-enum { kAgcFalse = 0, kAgcTrue };
-
-typedef struct {
-  int16_t targetLevelDbfs;    // default 3 (-3 dBOv)
-  int16_t compressionGaindB;  // default 9 dB
-  uint8_t limiterEnable;      // default kAgcTrue (on)
-} WebRtcAgcConfig;
-
-#if defined(__cplusplus)
-extern "C" {
-#endif
-
-/*
- * This function analyses the number of samples passed to
- * farend and produces any error code that could arise.
- *
- * Input:
- *      - agcInst           : AGC instance.
- *      - samples           : Number of samples in input vector.
- *
- * Return value:
- *                          :  0 - Normal operation.
- *                          : -1 - Error.
- */
-int WebRtcAgc_GetAddFarendError(void* state, size_t samples);
-
-/*
- * This function processes a 10 ms frame of far-end speech to determine
- * if there is active speech. The length of the input speech vector must be
- * given in samples (80 when FS=8000, and 160 when FS=16000, FS=32000 or
- * FS=48000).
- *
- * Input:
- *      - agcInst           : AGC instance.
- *      - inFar             : Far-end input speech vector
- *      - samples           : Number of samples in input vector
- *
- * Return value:
- *                          :  0 - Normal operation.
- *                          : -1 - Error
- */
-int WebRtcAgc_AddFarend(void* agcInst, const int16_t* inFar, size_t samples);
-
-/*
- * This function processes a 10 ms frame of microphone speech to determine
- * if there is active speech. The length of the input speech vector must be
- * given in samples (80 when FS=8000, and 160 when FS=16000, FS=32000 or
- * FS=48000). For very low input levels, the input signal is increased in level
- * by multiplying and overwriting the samples in inMic[].
- *
- * This function should be called before any further processing of the
- * near-end microphone signal.
- *
- * Input:
- *      - agcInst           : AGC instance.
- *      - inMic             : Microphone input speech vector for each band
- *      - num_bands         : Number of bands in input vector
- *      - samples           : Number of samples in input vector
- *
- * Return value:
- *                          :  0 - Normal operation.
- *                          : -1 - Error
- */
-int WebRtcAgc_AddMic(void* agcInst,
-                     int16_t* const* inMic,
-                     size_t num_bands,
-                     size_t samples);
-
-/*
- * This function replaces the analog microphone with a virtual one.
- * It is a digital gain applied to the input signal and is used in the
- * agcAdaptiveDigital mode where no microphone level is adjustable. The length
- * of the input speech vector must be given in samples (80 when FS=8000, and 160
- * when FS=16000, FS=32000 or FS=48000).
- *
- * Input:
- *      - agcInst           : AGC instance.
- *      - inMic             : Microphone input speech vector for each band
- *      - num_bands         : Number of bands in input vector
- *      - samples           : Number of samples in input vector
- *      - micLevelIn        : Input level of microphone (static)
- *
- * Output:
- *      - inMic             : Microphone output after processing (L band)
- *      - inMic_H           : Microphone output after processing (H band)
- *      - micLevelOut       : Adjusted microphone level after processing
- *
- * Return value:
- *                          :  0 - Normal operation.
- *                          : -1 - Error
- */
-int WebRtcAgc_VirtualMic(void* agcInst,
-                         int16_t* const* inMic,
-                         size_t num_bands,
-                         size_t samples,
-                         int32_t micLevelIn,
-                         int32_t* micLevelOut);
-
-/*
- * This function processes a 10 ms frame and adjusts (normalizes) the gain both
- * analog and digitally. The gain adjustments are done only during active
- * periods of speech. The length of the speech vectors must be given in samples
- * (80 when FS=8000, and 160 when FS=16000, FS=32000 or FS=48000). The echo
- * parameter can be used to ensure the AGC will not adjust upward in the
- * presence of echo.
- *
- * This function should be called after processing the near-end microphone
- * signal, in any case after any echo cancellation.
- *
- * Input:
- *      - agcInst           : AGC instance
- *      - inNear            : Near-end input speech vector for each band
- *      - num_bands         : Number of bands in input/output vector
- *      - samples           : Number of samples in input/output vector
- *      - inMicLevel        : Current microphone volume level
- *      - echo              : Set to 0 if the signal passed to add_mic is
- *                            almost certainly free of echo; otherwise set
- *                            to 1. If you have no information regarding echo
- *                            set to 0.
- *
- * Output:
- *      - outMicLevel       : Adjusted microphone volume level
- *      - out               : Gain-adjusted near-end speech vector
- *                          : May be the same vector as the input.
- *      - saturationWarning : A returned value of 1 indicates a saturation event
- *                            has occurred and the volume cannot be further
- *                            reduced. Otherwise will be set to 0.
- *
- * Return value:
- *                          :  0 - Normal operation.
- *                          : -1 - Error
- */
-int WebRtcAgc_Process(void* agcInst,
-                      const int16_t* const* inNear,
-                      size_t num_bands,
-                      size_t samples,
-                      int16_t* const* out,
-                      int32_t inMicLevel,
-                      int32_t* outMicLevel,
-                      int16_t echo,
-                      uint8_t* saturationWarning);
-
-/*
- * This function sets the config parameters (targetLevelDbfs,
- * compressionGaindB and limiterEnable).
- *
- * Input:
- *      - agcInst           : AGC instance
- *      - config            : config struct
- *
- * Output:
- *
- * Return value:
- *                          :  0 - Normal operation.
- *                          : -1 - Error
- */
-int WebRtcAgc_set_config(void* agcInst, WebRtcAgcConfig config);
-
-/*
- * This function returns the config parameters (targetLevelDbfs,
- * compressionGaindB and limiterEnable).
- *
- * Input:
- *      - agcInst           : AGC instance
- *
- * Output:
- *      - config            : config struct
- *
- * Return value:
- *                          :  0 - Normal operation.
- *                          : -1 - Error
- */
-int WebRtcAgc_get_config(void* agcInst, WebRtcAgcConfig* config);
-
-/*
- * This function creates and returns an AGC instance, which will contain the
- * state information for one (duplex) channel.
- */
-void* WebRtcAgc_Create(void);
-
-/*
- * This function frees the AGC instance created at the beginning.
- *
- * Input:
- *      - agcInst           : AGC instance.
- */
-void WebRtcAgc_Free(void* agcInst);
-
-/*
- * This function initializes an AGC instance.
- *
- * Input:
- *      - agcInst           : AGC instance.
- *      - minLevel          : Minimum possible mic level
- *      - maxLevel          : Maximum possible mic level
- *      - agcMode           : 0 - Unchanged
- *                          : 1 - Adaptive Analog Automatic Gain Control -3dBOv
- *                          : 2 - Adaptive Digital Automatic Gain Control -3dBOv
- *                          : 3 - Fixed Digital Gain 0dB
- *      - fs                : Sampling frequency
- *
- * Return value             :  0 - Ok
- *                            -1 - Error
- */
-int WebRtcAgc_Init(void* agcInst,
-                   int32_t minLevel,
-                   int32_t maxLevel,
-                   int16_t agcMode,
-                   uint32_t fs);
-
-#if defined(__cplusplus)
-}
-#endif
-
-#endif  // MODULES_AUDIO_PROCESSING_AGC_LEGACY_GAIN_CONTROL_H_
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/agc/loudness_histogram.cc b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/agc/loudness_histogram.cc
deleted file mode 100644
index cd57b82bcc..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/agc/loudness_histogram.cc
+++ /dev/null
@@ -1,228 +0,0 @@
-/*
- *  Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#include "modules/audio_processing/agc/loudness_histogram.h"
-
-#include <string.h>
-#include <cmath>
-
-#include "rtc_base/checks.h"
-
-namespace webrtc {
-
-static const double kHistBinCenters[] = {
-    7.59621091765857e-02, 9.02036021061016e-02, 1.07115112009343e-01,
-    1.27197217770508e-01, 1.51044347572047e-01, 1.79362373905283e-01,
-    2.12989507320644e-01, 2.52921107370304e-01, 3.00339145144454e-01,
-    3.56647189489147e-01, 4.23511952494003e-01, 5.02912623991786e-01,
-    5.97199455365749e-01, 7.09163326739184e-01, 8.42118356728544e-01,
-    1.00000000000000e+00, 1.18748153630660e+00, 1.41011239906908e+00,
-    1.67448243801153e+00, 1.98841697800836e+00, 2.36120844786349e+00,
-    2.80389143520905e+00, 3.32956930911896e+00, 3.95380207843188e+00,
-    4.69506696634852e+00, 5.57530533426190e+00, 6.62057214370769e+00,
-    7.86180718043869e+00, 9.33575086877358e+00, 1.10860317842269e+01,
-    1.31644580546776e+01, 1.56325508754123e+01, 1.85633655299256e+01,
-    2.20436538184971e+01, 2.61764319021997e+01, 3.10840295702492e+01,
-    3.69117111886792e+01, 4.38319755100383e+01, 5.20496616180135e+01,
-    6.18080121423973e+01, 7.33958732149108e+01, 8.71562442838066e+01,
-    1.03496430860848e+02, 1.22900100720889e+02, 1.45941600416277e+02,
-    1.73302955873365e+02, 2.05794060286978e+02, 2.44376646872353e+02,
-    2.90192756065437e+02, 3.44598539797631e+02, 4.09204403447902e+02,
-    4.85922673669740e+02, 5.77024203055553e+02, 6.85205587130498e+02,
-    8.13668983291589e+02, 9.66216894324125e+02, 1.14736472207740e+03,
-    1.36247442287647e+03, 1.61791322085579e+03, 1.92124207711260e+03,
-    2.28143949334655e+03, 2.70916727454970e+03, 3.21708611729384e+03,
-    3.82023036499473e+03, 4.53645302286906e+03, 5.38695420497926e+03,
-    6.39690865534207e+03, 7.59621091765857e+03, 9.02036021061016e+03,
-    1.07115112009343e+04, 1.27197217770508e+04, 1.51044347572047e+04,
-    1.79362373905283e+04, 2.12989507320644e+04, 2.52921107370304e+04,
-    3.00339145144454e+04, 3.56647189489147e+04};
-
-static const double kProbQDomain = 1024.0;
-// Loudness of -15 dB (smallest expected loudness) in log domain,
-// loudness_db = 13.5 * log10(rms);
-static const double kLogDomainMinBinCenter = -2.57752062648587;
-// Loudness step of 1 dB in log domain
-static const double kLogDomainStepSizeInverse = 5.81954605750359;
-
-static const int kTransientWidthThreshold = 7;
-static const double kLowProbabilityThreshold = 0.2;
-
-static const int kLowProbThresholdQ10 =
-    static_cast<int>(kLowProbabilityThreshold * kProbQDomain);
-
-LoudnessHistogram::LoudnessHistogram()
-    : num_updates_(0),
-      audio_content_q10_(0),
-      bin_count_q10_(),
-      activity_probability_(),
-      hist_bin_index_(),
-      buffer_index_(0),
-      buffer_is_full_(false),
-      len_circular_buffer_(0),
-      len_high_activity_(0) {
-  static_assert(
-      kHistSize == sizeof(kHistBinCenters) / sizeof(kHistBinCenters[0]),
-      "histogram bin centers incorrect size");
-}
-
-LoudnessHistogram::LoudnessHistogram(int window_size)
-    : num_updates_(0),
-      audio_content_q10_(0),
-      bin_count_q10_(),
-      activity_probability_(new int[window_size]),
-      hist_bin_index_(new int[window_size]),
-      buffer_index_(0),
-      buffer_is_full_(false),
-      len_circular_buffer_(window_size),
-      len_high_activity_(0) {}
-
-LoudnessHistogram::~LoudnessHistogram() {}
-
-void LoudnessHistogram::Update(double rms, double activity_probaility) {
-  // If circular histogram is activated then remove the oldest entry.
-  if (len_circular_buffer_ > 0)
-    RemoveOldestEntryAndUpdate();
-
-  // Find the corresponding bin.
-  int hist_index = GetBinIndex(rms);
-  // To Q10 domain.
-  int prob_q10 =
-      static_cast<int16_t>(floor(activity_probaility * kProbQDomain));
-  InsertNewestEntryAndUpdate(prob_q10, hist_index);
-}
-
-// Doing nothing if buffer is not full, yet.
-void LoudnessHistogram::RemoveOldestEntryAndUpdate() {
-  RTC_DCHECK_GT(len_circular_buffer_, 0);
-  // Do nothing if circular buffer is not full.
-  if (!buffer_is_full_)
-    return;
-
-  int oldest_prob = activity_probability_[buffer_index_];
-  int oldest_hist_index = hist_bin_index_[buffer_index_];
-  UpdateHist(-oldest_prob, oldest_hist_index);
-}
-
-void LoudnessHistogram::RemoveTransient() {
-  // Don't expect to be here if high-activity region is longer than
-  // |kTransientWidthThreshold| or there has not been any transient.
-  RTC_DCHECK_LE(len_high_activity_, kTransientWidthThreshold);
-  int index =
-      (buffer_index_ > 0) ? (buffer_index_ - 1) : len_circular_buffer_ - 1;
-  while (len_high_activity_ > 0) {
-    UpdateHist(-activity_probability_[index], hist_bin_index_[index]);
-    activity_probability_[index] = 0;
-    index = (index > 0) ? (index - 1) : (len_circular_buffer_ - 1);
-    len_high_activity_--;
-  }
-}
-
-void LoudnessHistogram::InsertNewestEntryAndUpdate(int activity_prob_q10,
-                                                   int hist_index) {
-  // Update the circular buffer if it is enabled.
-  if (len_circular_buffer_ > 0) {
-    // Removing transient.
-    if (activity_prob_q10 <= kLowProbThresholdQ10) {
-      // Lower than threshold probability, set it to zero.
-      activity_prob_q10 = 0;
-      // Check if this has been a transient.
-      if (len_high_activity_ <= kTransientWidthThreshold)
-        RemoveTransient();  // Remove this transient.
-      len_high_activity_ = 0;
-    } else if (len_high_activity_ <= kTransientWidthThreshold) {
-      len_high_activity_++;
-    }
-    // Updating the circular buffer.
-    activity_probability_[buffer_index_] = activity_prob_q10;
-    hist_bin_index_[buffer_index_] = hist_index;
-    // Increment the buffer index and check for wrap-around.
-    buffer_index_++;
-    if (buffer_index_ >= len_circular_buffer_) {
-      buffer_index_ = 0;
-      buffer_is_full_ = true;
-    }
-  }
-
-  num_updates_++;
-  if (num_updates_ < 0)
-    num_updates_--;
-
-  UpdateHist(activity_prob_q10, hist_index);
-}
-
-void LoudnessHistogram::UpdateHist(int activity_prob_q10, int hist_index) {
-  bin_count_q10_[hist_index] += activity_prob_q10;
-  audio_content_q10_ += activity_prob_q10;
-}
-
-double LoudnessHistogram::AudioContent() const {
-  return audio_content_q10_ / kProbQDomain;
-}
-
-LoudnessHistogram* LoudnessHistogram::Create() {
-  return new LoudnessHistogram;
-}
-
-LoudnessHistogram* LoudnessHistogram::Create(int window_size) {
-  if (window_size < 0)
-    return NULL;
-  return new LoudnessHistogram(window_size);
-}
-
-void LoudnessHistogram::Reset() {
-  // Reset the histogram, audio-content and number of updates.
-  memset(bin_count_q10_, 0, sizeof(bin_count_q10_));
-  audio_content_q10_ = 0;
-  num_updates_ = 0;
-  // Empty the circular buffer.
-  buffer_index_ = 0;
-  buffer_is_full_ = false;
-  len_high_activity_ = 0;
-}
-
-int LoudnessHistogram::GetBinIndex(double rms) {
-  // First exclude overload cases.
-  if (rms <= kHistBinCenters[0]) {
-    return 0;
-  } else if (rms >= kHistBinCenters[kHistSize - 1]) {
-    return kHistSize - 1;
-  } else {
-    // The quantizer is uniform in log domain. Alternatively we could do binary
-    // search in linear domain.
-    double rms_log = log(rms);
-
-    int index = static_cast<int>(
-        floor((rms_log - kLogDomainMinBinCenter) * kLogDomainStepSizeInverse));
-    // The final decision is in linear domain.
-    double b = 0.5 * (kHistBinCenters[index] + kHistBinCenters[index + 1]);
-    if (rms > b) {
-      return index + 1;
-    }
-    return index;
-  }
-}
-
-double LoudnessHistogram::CurrentRms() const {
-  double p;
-  double mean_val = 0;
-  if (audio_content_q10_ > 0) {
-    double p_total_inverse = 1. / static_cast<double>(audio_content_q10_);
-    for (int n = 0; n < kHistSize; n++) {
-      p = static_cast<double>(bin_count_q10_[n]) * p_total_inverse;
-      mean_val += p * kHistBinCenters[n];
-    }
-  } else {
-    mean_val = kHistBinCenters[0];
-  }
-  return mean_val;
-}
-
-}  // namespace webrtc
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/agc/loudness_histogram.h b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/agc/loudness_histogram.h
deleted file mode 100644
index b210be96e3..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/agc/loudness_histogram.h
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
- *  Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#ifndef MODULES_AUDIO_PROCESSING_AGC_LOUDNESS_HISTOGRAM_H_
-#define MODULES_AUDIO_PROCESSING_AGC_LOUDNESS_HISTOGRAM_H_
-
-#include <stdint.h>
-#include <memory>
-
-namespace webrtc {
-
-// This class implements the histogram of loudness with circular buffers so that
-// the histogram tracks the last T seconds of the loudness.
-class LoudnessHistogram {
- public:
-  // Create a non-sliding LoudnessHistogram.
-  static LoudnessHistogram* Create();
-
-  // Create a sliding LoudnessHistogram, i.e. the histogram represents the last
-  // |window_size| samples.
-  static LoudnessHistogram* Create(int window_size);
-  ~LoudnessHistogram();
-
-  // Insert RMS and the corresponding activity probability.
-  void Update(double rms, double activity_probability);
-
-  // Reset the histogram, forget the past.
-  void Reset();
-
-  // Current loudness, which is actually the mean of histogram in loudness
-  // domain.
-  double CurrentRms() const;
-
-  // Sum of the histogram content.
-  double AudioContent() const;
-
-  // Number of times the histogram has been updated.
-  int num_updates() const { return num_updates_; }
-
- private:
-  LoudnessHistogram();
-  explicit LoudnessHistogram(int window);
-
-  // Find the histogram bin associated with the given |rms|.
-  int GetBinIndex(double rms);
-
-  void RemoveOldestEntryAndUpdate();
-  void InsertNewestEntryAndUpdate(int activity_prob_q10, int hist_index);
-  void UpdateHist(int activity_prob_q10, int hist_index);
-  void RemoveTransient();
-
-  // Number of histogram bins.
-  static const int kHistSize = 77;
-
-  // Number of times the histogram is updated
-  int num_updates_;
-  // Audio content, this should be equal to the sum of the components of
-  // |bin_count_q10_|.
-  int64_t audio_content_q10_;
-
-  // LoudnessHistogram of input RMS in Q10 with |kHistSize_| bins. In each
-  // 'Update(),' we increment the associated histogram-bin with the given
-  // probability. The increment is implemented in Q10 to avoid rounding errors.
-  int64_t bin_count_q10_[kHistSize];
-
-  // Circular buffer for probabilities
-  std::unique_ptr<int[]> activity_probability_;
-  // Circular buffer for histogram-indices of probabilities.
-  std::unique_ptr<int[]> hist_bin_index_;
-  // Current index of circular buffer, where the newest data will be written to,
-  // therefore, pointing to the oldest data if buffer is full.
-  int buffer_index_;
-  // Indicating if buffer is full and we had a wrap around.
-  int buffer_is_full_;
-  // Size of circular buffer.
-  int len_circular_buffer_;
-  int len_high_activity_;
-};
-
-}  // namespace webrtc
-
-#endif  // MODULES_AUDIO_PROCESSING_AGC_LOUDNESS_HISTOGRAM_H_
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/agc/mock_agc.h b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/agc/mock_agc.h
deleted file mode 100644
index 4297e2a08b..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/agc/mock_agc.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- *  Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#ifndef MODULES_AUDIO_PROCESSING_AGC_MOCK_AGC_H_
-#define MODULES_AUDIO_PROCESSING_AGC_MOCK_AGC_H_
-
-#include "modules/audio_processing/agc/agc.h"
-
-#include "test/gmock.h"
-
-namespace webrtc {
-
-class MockAgc : public Agc {
- public:
-  virtual ~MockAgc() {}
-  MOCK_METHOD2(AnalyzePreproc, float(const int16_t* audio, size_t length));
-  MOCK_METHOD3(Process,
-               void(const int16_t* audio, size_t length, int sample_rate_hz));
-  MOCK_METHOD1(GetRmsErrorDb, bool(int* error));
-  MOCK_METHOD0(Reset, void());
-  MOCK_METHOD1(set_target_level_dbfs, int(int level));
-  MOCK_CONST_METHOD0(target_level_dbfs, int());
-  MOCK_METHOD1(EnableStandaloneVad, void(bool enable));
-  MOCK_CONST_METHOD0(standalone_vad_enabled, bool());
-};
-
-}  // namespace webrtc
-
-#endif  // MODULES_AUDIO_PROCESSING_AGC_MOCK_AGC_H_
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/agc/utility.cc b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/agc/utility.cc
deleted file mode 100644
index 554a8377aa..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/agc/utility.cc
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- *  Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#include "modules/audio_processing/agc/utility.h"
-
-#include <math.h>
-
-static const double kLog10 = 2.30258509299;
-static const double kLinear2DbScale = 20.0 / kLog10;
-static const double kLinear2LoudnessScale = 13.4 / kLog10;
-
-double Loudness2Db(double loudness) {
-  return loudness * kLinear2DbScale / kLinear2LoudnessScale;
-}
-
-double Linear2Loudness(double rms) {
-  if (rms == 0)
-    return -15;
-  return kLinear2LoudnessScale * log(rms);
-}
-
-double Db2Loudness(double db) {
-  return db * kLinear2LoudnessScale / kLinear2DbScale;
-}
-
-double Dbfs2Loudness(double dbfs) {
-  return Db2Loudness(90 + dbfs);
-}
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/agc/utility.h b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/agc/utility.h
deleted file mode 100644
index 8ba87b6d55..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/agc/utility.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- *  Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#ifndef MODULES_AUDIO_PROCESSING_AGC_UTILITY_H_
-#define MODULES_AUDIO_PROCESSING_AGC_UTILITY_H_
-
-// TODO(turajs): Add description of function.
-double Loudness2Db(double loudness);
-
-double Linear2Loudness(double rms);
-
-double Db2Loudness(double db);
-
-double Dbfs2Loudness(double dbfs);
-
-#endif  // MODULES_AUDIO_PROCESSING_AGC_UTILITY_H_
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/agc2/adaptive_agc.cc b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/agc2/adaptive_agc.cc
deleted file mode 100644
index a5d36089c4..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/agc2/adaptive_agc.cc
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- *  Copyright (c) 2018 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#include "modules/audio_processing/agc2/adaptive_agc.h"
-
-#include "common_audio/include/audio_util.h"
-#include "modules/audio_processing/agc2/vad_with_level.h"
-#include "modules/audio_processing/logging/apm_data_dumper.h"
-#include "rtc_base/checks.h"
-
-namespace webrtc {
-
-AdaptiveAgc::AdaptiveAgc(ApmDataDumper* apm_data_dumper)
-    : speech_level_estimator_(apm_data_dumper),
-      gain_applier_(apm_data_dumper),
-      apm_data_dumper_(apm_data_dumper),
-      noise_level_estimator_(apm_data_dumper) {
-  RTC_DCHECK(apm_data_dumper);
-}
-
-AdaptiveAgc::AdaptiveAgc(ApmDataDumper* apm_data_dumper,
-                         const AudioProcessing::Config::GainController2& config)
-    : speech_level_estimator_(
-          apm_data_dumper,
-          config.adaptive_digital.level_estimator,
-          config.adaptive_digital.use_saturation_protector,
-          config.adaptive_digital.extra_saturation_margin_db),
-      gain_applier_(apm_data_dumper),
-      apm_data_dumper_(apm_data_dumper),
-      noise_level_estimator_(apm_data_dumper) {
-  RTC_DCHECK(apm_data_dumper);
-}
-
-AdaptiveAgc::~AdaptiveAgc() = default;
-
-void AdaptiveAgc::Process(AudioFrameView<float> float_frame,
-                          float last_audio_level) {
-  auto signal_with_levels = SignalWithLevels(float_frame);
-  signal_with_levels.vad_result = vad_.AnalyzeFrame(float_frame);
-  apm_data_dumper_->DumpRaw("agc2_vad_probability",
-                            signal_with_levels.vad_result.speech_probability);
-  apm_data_dumper_->DumpRaw("agc2_vad_rms_dbfs",
-                            signal_with_levels.vad_result.speech_rms_dbfs);
-  apm_data_dumper_->DumpRaw("agc2_vad_peak_dbfs",
-                            signal_with_levels.vad_result.speech_peak_dbfs);
-
-  speech_level_estimator_.UpdateEstimation(signal_with_levels.vad_result);
-
-  signal_with_levels.input_level_dbfs =
-      speech_level_estimator_.LatestLevelEstimate();
-
-  signal_with_levels.input_noise_level_dbfs =
-      noise_level_estimator_.Analyze(float_frame);
-
-  apm_data_dumper_->DumpRaw("agc2_noise_estimate_dbfs",
-                            signal_with_levels.input_noise_level_dbfs);
-
-  signal_with_levels.limiter_audio_level_dbfs =
-      last_audio_level > 0 ? FloatS16ToDbfs(last_audio_level) : -90.f;
-  apm_data_dumper_->DumpRaw("agc2_last_limiter_audio_level",
-                            signal_with_levels.limiter_audio_level_dbfs);
-
-  signal_with_levels.estimate_is_confident =
-      speech_level_estimator_.LevelEstimationIsConfident();
-
-  // The gain applier applies the gain.
-  gain_applier_.Process(signal_with_levels);
-}
-
-void AdaptiveAgc::Reset() {
-  speech_level_estimator_.Reset();
-}
-
-}  // namespace webrtc
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/agc2/adaptive_agc.h b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/agc2/adaptive_agc.h
deleted file mode 100644
index 16c0082ed8..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/agc2/adaptive_agc.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- *  Copyright (c) 2018 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#ifndef MODULES_AUDIO_PROCESSING_AGC2_ADAPTIVE_AGC_H_
-#define MODULES_AUDIO_PROCESSING_AGC2_ADAPTIVE_AGC_H_
-
-#include "modules/audio_processing/agc2/adaptive_digital_gain_applier.h"
-#include "modules/audio_processing/agc2/adaptive_mode_level_estimator.h"
-#include "modules/audio_processing/agc2/noise_level_estimator.h"
-#include "modules/audio_processing/agc2/vad_with_level.h"
-#include "modules/audio_processing/include/audio_frame_view.h"
-#include "modules/audio_processing/include/audio_processing.h"
-
-namespace webrtc {
-class ApmDataDumper;
-
-class AdaptiveAgc {
- public:
-  explicit AdaptiveAgc(ApmDataDumper* apm_data_dumper);
-  AdaptiveAgc(ApmDataDumper* apm_data_dumper,
-              const AudioProcessing::Config::GainController2& config);
-  ~AdaptiveAgc();
-
-  void Process(AudioFrameView<float> float_frame, float last_audio_level);
-  void Reset();
-
- private:
-  AdaptiveModeLevelEstimator speech_level_estimator_;
-  VadWithLevel vad_;
-  AdaptiveDigitalGainApplier gain_applier_;
-  ApmDataDumper* const apm_data_dumper_;
-  NoiseLevelEstimator noise_level_estimator_;
-};
-
-}  // namespace webrtc
-
-#endif  // MODULES_AUDIO_PROCESSING_AGC2_ADAPTIVE_AGC_H_
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/agc2/adaptive_digital_gain_applier.cc b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/agc2/adaptive_digital_gain_applier.cc
deleted file mode 100644
index 6ece83b239..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/agc2/adaptive_digital_gain_applier.cc
+++ /dev/null
@@ -1,146 +0,0 @@
-/*
- *  Copyright (c) 2018 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#include "modules/audio_processing/agc2/adaptive_digital_gain_applier.h"
-
-#include <algorithm>
-
-#include "common_audio/include/audio_util.h"
-#include "modules/audio_processing/agc2/agc2_common.h"
-#include "modules/audio_processing/logging/apm_data_dumper.h"
-#include "rtc_base/checks.h"
-#include "rtc_base/numerics/safe_minmax.h"
-#include "system_wrappers/include/metrics.h"
-
-namespace webrtc {
-namespace {
-
-// This function maps input level to desired applied gain. We want to
-// boost the signal so that peaks are at -kHeadroomDbfs. We can't
-// apply more than kMaxGainDb gain.
-float ComputeGainDb(float input_level_dbfs) {
-  // If the level is very low, boost it as much as we can.
-  if (input_level_dbfs < -(kHeadroomDbfs + kMaxGainDb)) {
-    return kMaxGainDb;
-  }
-
-  // We expect to end up here most of the time: the level is below
-  // -headroom, but we can boost it to -headroom.
-  if (input_level_dbfs < -kHeadroomDbfs) {
-    return -kHeadroomDbfs - input_level_dbfs;
-  }
-
-  // Otherwise, the level is too high and we can't boost. The
-  // LevelEstimator is responsible for not reporting bogus gain
-  // values.
-  RTC_DCHECK_LE(input_level_dbfs, 0.f);
-  return 0.f;
-}
-
-// We require 'gain + noise_level <= kMaxNoiseLevelDbfs'.
-float LimitGainByNoise(float target_gain,
-                       float input_noise_level_dbfs,
-                       ApmDataDumper* apm_data_dumper) {
-  const float noise_headroom_db = kMaxNoiseLevelDbfs - input_noise_level_dbfs;
-  apm_data_dumper->DumpRaw("agc2_noise_headroom_db", noise_headroom_db);
-  return std::min(target_gain, std::max(noise_headroom_db, 0.f));
-}
-
-float LimitGainByLowConfidence(float target_gain,
-                               float last_gain,
-                               float limiter_audio_level_dbfs,
-                               bool estimate_is_confident) {
-  if (estimate_is_confident ||
-      limiter_audio_level_dbfs <= kLimiterThresholdForAgcGainDbfs) {
-    return target_gain;
-  }
-  const float limiter_level_before_gain = limiter_audio_level_dbfs - last_gain;
-
-  // Compute a new gain so that limiter_level_before_gain + new_gain <=
-  // kLimiterThreshold.
-  const float new_target_gain = std::max(
-      kLimiterThresholdForAgcGainDbfs - limiter_level_before_gain, 0.f);
-  return std::min(new_target_gain, target_gain);
-}
-
-// Computes how the gain should change during this frame.
-// Return the gain difference in db to 'last_gain_db'.
-float ComputeGainChangeThisFrameDb(float target_gain_db,
-                                   float last_gain_db,
-                                   bool gain_increase_allowed) {
-  float target_gain_difference_db = target_gain_db - last_gain_db;
-  if (!gain_increase_allowed) {
-    target_gain_difference_db = std::min(target_gain_difference_db, 0.f);
-  }
-
-  return rtc::SafeClamp(target_gain_difference_db, -kMaxGainChangePerFrameDb,
-                        kMaxGainChangePerFrameDb);
-}
-}  // namespace
-
-SignalWithLevels::SignalWithLevels(AudioFrameView<float> float_frame)
-    : float_frame(float_frame) {}
-SignalWithLevels::SignalWithLevels(const SignalWithLevels&) = default;
-
-AdaptiveDigitalGainApplier::AdaptiveDigitalGainApplier(
-    ApmDataDumper* apm_data_dumper)
-    : gain_applier_(false, DbToRatio(last_gain_db_)),
-      apm_data_dumper_(apm_data_dumper) {}
-
-void AdaptiveDigitalGainApplier::Process(SignalWithLevels signal_with_levels) {
-  calls_since_last_gain_log_++;
-  if (calls_since_last_gain_log_ == 100) {
-    calls_since_last_gain_log_ = 0;
-    RTC_HISTOGRAM_COUNTS_LINEAR("WebRTC.Audio.Agc2.DigitalGainApplied",
-                                last_gain_db_, 0, kMaxGainDb, kMaxGainDb + 1);
-    RTC_HISTOGRAM_COUNTS_LINEAR("WebRTC.Audio.Agc2.EstimatedNoiseLevel",
-                                -signal_with_levels.input_noise_level_dbfs, 0,
-                                100, 101);
-  }
-
-  signal_with_levels.input_level_dbfs =
-      std::min(signal_with_levels.input_level_dbfs, 0.f);
-
-  RTC_DCHECK_GE(signal_with_levels.input_level_dbfs, -150.f);
-  RTC_DCHECK_GE(signal_with_levels.float_frame.num_channels(), 1);
-  RTC_DCHECK_GE(signal_with_levels.float_frame.samples_per_channel(), 1);
-
-  const float target_gain_db = LimitGainByLowConfidence(
-      LimitGainByNoise(ComputeGainDb(signal_with_levels.input_level_dbfs),
-                       signal_with_levels.input_noise_level_dbfs,
-                       apm_data_dumper_),
-      last_gain_db_, signal_with_levels.limiter_audio_level_dbfs,
-      signal_with_levels.estimate_is_confident);
-
-  // Forbid increasing the gain when there is no speech.
-  gain_increase_allowed_ = signal_with_levels.vad_result.speech_probability >
-                           kVadConfidenceThreshold;
-
-  const float gain_change_this_frame_db = ComputeGainChangeThisFrameDb(
-      target_gain_db, last_gain_db_, gain_increase_allowed_);
-
-  apm_data_dumper_->DumpRaw("agc2_want_to_change_by_db",
-                            target_gain_db - last_gain_db_);
-  apm_data_dumper_->DumpRaw("agc2_will_change_by_db",
-                            gain_change_this_frame_db);
-
-  // Optimization: avoid calling math functions if gain does not
-  // change.
-  if (gain_change_this_frame_db != 0.f) {
-    gain_applier_.SetGainFactor(
-        DbToRatio(last_gain_db_ + gain_change_this_frame_db));
-  }
-  gain_applier_.ApplyGain(signal_with_levels.float_frame);
-
-  // Remember that the gain has changed for the next iteration.
-  last_gain_db_ = last_gain_db_ + gain_change_this_frame_db;
-  apm_data_dumper_->DumpRaw("agc2_applied_gain_db", last_gain_db_);
-}
-}  // namespace webrtc
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/agc2/adaptive_digital_gain_applier.h b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/agc2/adaptive_digital_gain_applier.h
deleted file mode 100644
index e7f07fcf06..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/agc2/adaptive_digital_gain_applier.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- *  Copyright (c) 2018 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#ifndef MODULES_AUDIO_PROCESSING_AGC2_ADAPTIVE_DIGITAL_GAIN_APPLIER_H_
-#define MODULES_AUDIO_PROCESSING_AGC2_ADAPTIVE_DIGITAL_GAIN_APPLIER_H_
-
-#include "modules/audio_processing/agc2/agc2_common.h"
-#include "modules/audio_processing/agc2/gain_applier.h"
-#include "modules/audio_processing/agc2/vad_with_level.h"
-#include "modules/audio_processing/include/audio_frame_view.h"
-
-namespace webrtc {
-
-class ApmDataDumper;
-
-struct SignalWithLevels {
-  SignalWithLevels(AudioFrameView<float> float_frame);
-  SignalWithLevels(const SignalWithLevels&);
-
-  float input_level_dbfs = -1.f;
-  float input_noise_level_dbfs = -1.f;
-  VadWithLevel::LevelAndProbability vad_result;
-  float limiter_audio_level_dbfs = -1.f;
-  bool estimate_is_confident = false;
-  AudioFrameView<float> float_frame;
-};
-
-class AdaptiveDigitalGainApplier {
- public:
-  explicit AdaptiveDigitalGainApplier(ApmDataDumper* apm_data_dumper);
-  // Decide what gain to apply.
-  void Process(SignalWithLevels signal_with_levels);
-
- private:
-  float last_gain_db_ = kInitialAdaptiveDigitalGainDb;
-  GainApplier gain_applier_;
-  int calls_since_last_gain_log_ = 0;
-
-  // For some combinations of noise and speech probability, increasing
-  // the level is not allowed. Since we may get VAD results in bursts,
-  // we keep track of this variable until the next VAD results come
-  // in.
-  bool gain_increase_allowed_ = true;
-  ApmDataDumper* apm_data_dumper_ = nullptr;
-};
-}  // namespace webrtc
-
-#endif  // MODULES_AUDIO_PROCESSING_AGC2_ADAPTIVE_DIGITAL_GAIN_APPLIER_H_
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/agc2/adaptive_mode_level_estimator.cc b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/agc2/adaptive_mode_level_estimator.cc
deleted file mode 100644
index 8640324b59..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/agc2/adaptive_mode_level_estimator.cc
+++ /dev/null
@@ -1,109 +0,0 @@
-/*
- *  Copyright (c) 2018 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#include "modules/audio_processing/agc2/adaptive_mode_level_estimator.h"
-
-#include "modules/audio_processing/agc2/agc2_common.h"
-#include "modules/audio_processing/logging/apm_data_dumper.h"
-#include "rtc_base/checks.h"
-#include "rtc_base/numerics/safe_minmax.h"
-
-namespace webrtc {
-
-AdaptiveModeLevelEstimator::AdaptiveModeLevelEstimator(
-    ApmDataDumper* apm_data_dumper)
-    : level_estimator_(
-          AudioProcessing::Config::GainController2::LevelEstimator::kRms),
-      use_saturation_protector_(true),
-      saturation_protector_(apm_data_dumper),
-      apm_data_dumper_(apm_data_dumper) {}
-
-AdaptiveModeLevelEstimator::AdaptiveModeLevelEstimator(
-    ApmDataDumper* apm_data_dumper,
-    AudioProcessing::Config::GainController2::LevelEstimator level_estimator,
-    bool use_saturation_protector,
-    float extra_saturation_margin_db)
-    : level_estimator_(level_estimator),
-      use_saturation_protector_(use_saturation_protector),
-      saturation_protector_(apm_data_dumper, extra_saturation_margin_db),
-      apm_data_dumper_(apm_data_dumper) {}
-
-void AdaptiveModeLevelEstimator::UpdateEstimation(
-    const VadWithLevel::LevelAndProbability& vad_data) {
-  RTC_DCHECK_GT(vad_data.speech_rms_dbfs, -150.f);
-  RTC_DCHECK_LT(vad_data.speech_rms_dbfs, 50.f);
-  RTC_DCHECK_GT(vad_data.speech_peak_dbfs, -150.f);
-  RTC_DCHECK_LT(vad_data.speech_peak_dbfs, 50.f);
-  RTC_DCHECK_GE(vad_data.speech_probability, 0.f);
-  RTC_DCHECK_LE(vad_data.speech_probability, 1.f);
-
-  if (vad_data.speech_probability < kVadConfidenceThreshold) {
-    DebugDumpEstimate();
-    return;
-  }
-
-  const bool buffer_is_full = buffer_size_ms_ >= kFullBufferSizeMs;
-  if (!buffer_is_full) {
-    buffer_size_ms_ += kFrameDurationMs;
-  }
-
-  const float leak_factor = buffer_is_full ? kFullBufferLeakFactor : 1.f;
-
-  // Read speech level estimation.
-  float speech_level_dbfs = 0.f;
-  using LevelEstimatorType =
-      AudioProcessing::Config::GainController2::LevelEstimator;
-  switch (level_estimator_) {
-    case LevelEstimatorType::kRms:
-      speech_level_dbfs = vad_data.speech_rms_dbfs;
-      break;
-    case LevelEstimatorType::kPeak:
-      speech_level_dbfs = vad_data.speech_peak_dbfs;
-      break;
-  }
-
-  // Update speech level estimation.
-  estimate_numerator_ = estimate_numerator_ * leak_factor +
-                        speech_level_dbfs * vad_data.speech_probability;
-  estimate_denominator_ =
-      estimate_denominator_ * leak_factor + vad_data.speech_probability;
-  last_estimate_with_offset_dbfs_ = estimate_numerator_ / estimate_denominator_;
-
-  if (use_saturation_protector_) {
-    saturation_protector_.UpdateMargin(vad_data,
-                                       last_estimate_with_offset_dbfs_);
-    DebugDumpEstimate();
-  }
-}
-
-float AdaptiveModeLevelEstimator::LatestLevelEstimate() const {
-  return rtc::SafeClamp<float>(
-      last_estimate_with_offset_dbfs_ +
-          (use_saturation_protector_ ? saturation_protector_.LastMargin()
-                                     : 0.f),
-      -90.f, 30.f);
-}
-
-void AdaptiveModeLevelEstimator::Reset() {
-  buffer_size_ms_ = 0;
-  last_estimate_with_offset_dbfs_ = kInitialSpeechLevelEstimateDbfs;
-  estimate_numerator_ = 0.f;
-  estimate_denominator_ = 0.f;
-  saturation_protector_.Reset();
-}
-
-void AdaptiveModeLevelEstimator::DebugDumpEstimate() {
-  apm_data_dumper_->DumpRaw("agc2_adaptive_level_estimate_with_offset_dbfs",
-                            last_estimate_with_offset_dbfs_);
-  apm_data_dumper_->DumpRaw("agc2_adaptive_level_estimate_dbfs",
-                            LatestLevelEstimate());
-  saturation_protector_.DebugDumpEstimate();
-}
-}  // namespace webrtc
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/agc2/adaptive_mode_level_estimator.h b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/agc2/adaptive_mode_level_estimator.h
deleted file mode 100644
index 63b9de2aec..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/agc2/adaptive_mode_level_estimator.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- *  Copyright (c) 2018 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#ifndef MODULES_AUDIO_PROCESSING_AGC2_ADAPTIVE_MODE_LEVEL_ESTIMATOR_H_
-#define MODULES_AUDIO_PROCESSING_AGC2_ADAPTIVE_MODE_LEVEL_ESTIMATOR_H_
-
-#include <stddef.h>
-
-#include "modules/audio_processing/agc2/agc2_common.h"  // kFullBufferSizeMs...
-#include "modules/audio_processing/agc2/saturation_protector.h"
-#include "modules/audio_processing/agc2/vad_with_level.h"
-#include "modules/audio_processing/include/audio_processing.h"
-
-namespace webrtc {
-class ApmDataDumper;
-
-class AdaptiveModeLevelEstimator {
- public:
-  explicit AdaptiveModeLevelEstimator(ApmDataDumper* apm_data_dumper);
-  AdaptiveModeLevelEstimator(
-      ApmDataDumper* apm_data_dumper,
-      AudioProcessing::Config::GainController2::LevelEstimator level_estimator,
-      bool use_saturation_protector,
-      float extra_saturation_margin_db);
-  void UpdateEstimation(const VadWithLevel::LevelAndProbability& vad_data);
-  float LatestLevelEstimate() const;
-  void Reset();
-  bool LevelEstimationIsConfident() const {
-    return buffer_size_ms_ >= kFullBufferSizeMs;
-  }
-
- private:
-  void DebugDumpEstimate();
-
-  const AudioProcessing::Config::GainController2::LevelEstimator
-      level_estimator_;
-  const bool use_saturation_protector_;
-  size_t buffer_size_ms_ = 0;
-  float last_estimate_with_offset_dbfs_ = kInitialSpeechLevelEstimateDbfs;
-  float estimate_numerator_ = 0.f;
-  float estimate_denominator_ = 0.f;
-  SaturationProtector saturation_protector_;
-  ApmDataDumper* const apm_data_dumper_;
-};
-
-}  // namespace webrtc
-
-#endif  // MODULES_AUDIO_PROCESSING_AGC2_ADAPTIVE_MODE_LEVEL_ESTIMATOR_H_
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/agc2/adaptive_mode_level_estimator_agc.cc b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/agc2/adaptive_mode_level_estimator_agc.cc
deleted file mode 100644
index b7c64373fc..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/agc2/adaptive_mode_level_estimator_agc.cc
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- *  Copyright (c) 2018 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#include "modules/audio_processing/agc2/adaptive_mode_level_estimator_agc.h"
-
-#include <cmath>
-#include <vector>
-
-#include "modules/audio_processing/agc2/agc2_common.h"
-#include "modules/audio_processing/include/audio_frame_view.h"
-
-namespace webrtc {
-
-AdaptiveModeLevelEstimatorAgc::AdaptiveModeLevelEstimatorAgc(
-    ApmDataDumper* apm_data_dumper)
-    : level_estimator_(apm_data_dumper) {
-  set_target_level_dbfs(kDefaultAgc2LevelHeadroomDbfs);
-}
-
-// |audio| must be mono; in a multi-channel stream, provide the first (usually
-// left) channel.
-void AdaptiveModeLevelEstimatorAgc::Process(const int16_t* audio,
-                                            size_t length,
-                                            int sample_rate_hz) {
-  std::vector<float> float_audio_frame(audio, audio + length);
-  const float* const first_channel = &float_audio_frame[0];
-  AudioFrameView<const float> frame_view(&first_channel, 1 /* num channels */,
-                                         length);
-  const auto vad_prob = agc2_vad_.AnalyzeFrame(frame_view);
-  latest_voice_probability_ = vad_prob.speech_probability;
-  if (latest_voice_probability_ > kVadConfidenceThreshold) {
-    time_in_ms_since_last_estimate_ += kFrameDurationMs;
-  }
-  level_estimator_.UpdateEstimation(vad_prob);
-}
-
-// Retrieves the difference between the target RMS level and the current
-// signal RMS level in dB. Returns true if an update is available and false
-// otherwise, in which case |error| should be ignored and no action taken.
-bool AdaptiveModeLevelEstimatorAgc::GetRmsErrorDb(int* error) {
-  if (time_in_ms_since_last_estimate_ <= kTimeUntilConfidentMs) {
-    return false;
-  }
-  *error = std::floor(target_level_dbfs() -
-                      level_estimator_.LatestLevelEstimate() + 0.5f);
-  time_in_ms_since_last_estimate_ = 0;
-  return true;
-}
-
-void AdaptiveModeLevelEstimatorAgc::Reset() {
-  level_estimator_.Reset();
-}
-
-float AdaptiveModeLevelEstimatorAgc::voice_probability() const {
-  return latest_voice_probability_;
-}
-
-}  // namespace webrtc
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/agc2/adaptive_mode_level_estimator_agc.h b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/agc2/adaptive_mode_level_estimator_agc.h
deleted file mode 100644
index 6d12339888..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/agc2/adaptive_mode_level_estimator_agc.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- *  Copyright (c) 2018 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#ifndef MODULES_AUDIO_PROCESSING_AGC2_ADAPTIVE_MODE_LEVEL_ESTIMATOR_AGC_H_
-#define MODULES_AUDIO_PROCESSING_AGC2_ADAPTIVE_MODE_LEVEL_ESTIMATOR_AGC_H_
-
-#include <stddef.h>
-#include <stdint.h>
-
-#include "modules/audio_processing/agc/agc.h"
-#include "modules/audio_processing/agc2/adaptive_mode_level_estimator.h"
-#include "modules/audio_processing/agc2/saturation_protector.h"
-#include "modules/audio_processing/agc2/vad_with_level.h"
-
-namespace webrtc {
-class AdaptiveModeLevelEstimatorAgc : public Agc {
- public:
-  explicit AdaptiveModeLevelEstimatorAgc(ApmDataDumper* apm_data_dumper);
-
-  // |audio| must be mono; in a multi-channel stream, provide the first (usually
-  // left) channel.
-  void Process(const int16_t* audio,
-               size_t length,
-               int sample_rate_hz) override;
-
-  // Retrieves the difference between the target RMS level and the current
-  // signal RMS level in dB. Returns true if an update is available and false
-  // otherwise, in which case |error| should be ignored and no action taken.
-  bool GetRmsErrorDb(int* error) override;
-  void Reset() override;
-
-  float voice_probability() const override;
-
- private:
-  static constexpr int kTimeUntilConfidentMs = 700;
-  static constexpr int kDefaultAgc2LevelHeadroomDbfs = -1;
-  int32_t time_in_ms_since_last_estimate_ = 0;
-  AdaptiveModeLevelEstimator level_estimator_;
-  VadWithLevel agc2_vad_;
-  float latest_voice_probability_ = 0.f;
-};
-}  // namespace webrtc
-
-#endif  // MODULES_AUDIO_PROCESSING_AGC2_ADAPTIVE_MODE_LEVEL_ESTIMATOR_AGC_H_
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/agc2/agc2_common.cc b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/agc2/agc2_common.cc
deleted file mode 100644
index af943df78f..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/agc2/agc2_common.cc
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- *  Copyright (c) 2018 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#include "modules/audio_processing/agc2/agc2_common.h"
-
-#include <stdio.h>
-#include <string>
-
-#include "system_wrappers/include/field_trial.h"
-
-namespace webrtc {
-
-float GetInitialSaturationMarginDb() {
-  constexpr char kForceInitialSaturationMarginFieldTrial[] =
-      "WebRTC-Audio-Agc2ForceInitialSaturationMargin";
-
-  const bool use_forced_initial_saturation_margin =
-      webrtc::field_trial::IsEnabled(kForceInitialSaturationMarginFieldTrial);
-  if (use_forced_initial_saturation_margin) {
-    const std::string field_trial_string = webrtc::field_trial::FindFullName(
-        kForceInitialSaturationMarginFieldTrial);
-    float margin_db = -1;
-    if (sscanf(field_trial_string.c_str(), "Enabled-%f", &margin_db) == 1 &&
-        margin_db >= 12.f && margin_db <= 25.f) {
-      return margin_db;
-    }
-  }
-  constexpr float kDefaultInitialSaturationMarginDb = 20.f;
-  return kDefaultInitialSaturationMarginDb;
-}
-
-float GetExtraSaturationMarginOffsetDb() {
-  constexpr char kForceExtraSaturationMarginFieldTrial[] =
-      "WebRTC-Audio-Agc2ForceExtraSaturationMargin";
-
-  const bool use_forced_extra_saturation_margin =
-      webrtc::field_trial::IsEnabled(kForceExtraSaturationMarginFieldTrial);
-  if (use_forced_extra_saturation_margin) {
-    const std::string field_trial_string = webrtc::field_trial::FindFullName(
-        kForceExtraSaturationMarginFieldTrial);
-    float margin_db = -1;
-    if (sscanf(field_trial_string.c_str(), "Enabled-%f", &margin_db) == 1 &&
-        margin_db >= 0.f && margin_db <= 10.f) {
-      return margin_db;
-    }
-  }
-  constexpr float kDefaultExtraSaturationMarginDb = 2.f;
-  return kDefaultExtraSaturationMarginDb;
-}
-};  // namespace webrtc
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/agc2/agc2_common.h b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/agc2/agc2_common.h
deleted file mode 100644
index 55dd648db4..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/agc2/agc2_common.h
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
- *  Copyright (c) 2018 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#ifndef MODULES_AUDIO_PROCESSING_AGC2_AGC2_COMMON_H_
-#define MODULES_AUDIO_PROCESSING_AGC2_AGC2_COMMON_H_
-
-#include <stddef.h>
-
-namespace webrtc {
-
-constexpr float kMinFloatS16Value = -32768.f;
-constexpr float kMaxFloatS16Value = 32767.f;
-constexpr float kMaxAbsFloatS16Value = 32768.0f;
-
-constexpr size_t kFrameDurationMs = 10;
-constexpr size_t kSubFramesInFrame = 20;
-constexpr size_t kMaximalNumberOfSamplesPerChannel = 480;
-
-constexpr float kAttackFilterConstant = 0.f;
-
-// Adaptive digital gain applier settings below.
-constexpr float kMaxGainChangePerSecondDb = 3.f;
-constexpr float kMaxGainChangePerFrameDb =
-    kMaxGainChangePerSecondDb * kFrameDurationMs / 1000.f;
-constexpr float kHeadroomDbfs = 1.f;
-constexpr float kMaxGainDb = 30.f;
-constexpr float kInitialAdaptiveDigitalGainDb = 8.f;
-// At what limiter levels should we start decreasing the adaptive digital gain.
-constexpr float kLimiterThresholdForAgcGainDbfs = -kHeadroomDbfs;
-
-// This parameter must be tuned together with the noise estimator.
-constexpr float kMaxNoiseLevelDbfs = -50.f;
-
-// This is the threshold for speech. Speech frames are used for updating the
-// speech level, measuring the amount of speech, and decide when to allow target
-// gain reduction.
-constexpr float kVadConfidenceThreshold = 0.4f;
-
-// The amount of 'memory' of the Level Estimator. Decides leak factors.
-constexpr size_t kFullBufferSizeMs = 1600;
-constexpr float kFullBufferLeakFactor = 1.f - 1.f / kFullBufferSizeMs;
-
-constexpr float kInitialSpeechLevelEstimateDbfs = -30.f;
-
-// Saturation Protector settings.
-float GetInitialSaturationMarginDb();
-float GetExtraSaturationMarginOffsetDb();
-
-constexpr size_t kPeakEnveloperSuperFrameLengthMs = 400;
-static_assert(kFullBufferSizeMs % kPeakEnveloperSuperFrameLengthMs == 0,
-              "Full buffer size should be a multiple of super frame length for "
-              "optimal Saturation Protector performance.");
-
-constexpr size_t kPeakEnveloperBufferSize =
-    kFullBufferSizeMs / kPeakEnveloperSuperFrameLengthMs + 1;
-
-// This value is 10 ** (-1/20 * frame_size_ms / satproc_attack_ms),
-// where satproc_attack_ms is 5000.
-constexpr float kSaturationProtectorAttackConstant = 0.9988493699365052f;
-
-// This value is 10 ** (-1/20 * frame_size_ms / satproc_decay_ms),
-// where satproc_decay_ms is 1000.
-constexpr float kSaturationProtectorDecayConstant = 0.9997697679981565f;
-
-// This is computed from kDecayMs by
-// 10 ** (-1/20 * subframe_duration / kDecayMs).
-// |subframe_duration| is |kFrameDurationMs / kSubFramesInFrame|.
-// kDecayMs is defined in agc2_testing_common.h
-constexpr float kDecayFilterConstant = 0.9998848773724686f;
-
-// Number of interpolation points for each region of the limiter.
-// These values have been tuned to limit the interpolated gain curve error given
-// the limiter parameters and allowing a maximum error of +/- 32768^-1.
-constexpr size_t kInterpolatedGainCurveKneePoints = 22;
-constexpr size_t kInterpolatedGainCurveBeyondKneePoints = 10;
-constexpr size_t kInterpolatedGainCurveTotalPoints =
-    kInterpolatedGainCurveKneePoints + kInterpolatedGainCurveBeyondKneePoints;
-
-}  // namespace webrtc
-
-#endif  // MODULES_AUDIO_PROCESSING_AGC2_AGC2_COMMON_H_
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/agc2/agc2_testing_common.cc b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/agc2/agc2_testing_common.cc
deleted file mode 100644
index 6c22492e88..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/agc2/agc2_testing_common.cc
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- *  Copyright (c) 2018 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#include "modules/audio_processing/agc2/agc2_testing_common.h"
-
-#include "rtc_base/checks.h"
-
-namespace webrtc {
-
-namespace test {
-
-std::vector<double> LinSpace(const double l,
-                             const double r,
-                             size_t num_points) {
-  RTC_CHECK(num_points >= 2);
-  std::vector<double> points(num_points);
-  const double step = (r - l) / (num_points - 1.0);
-  points[0] = l;
-  for (size_t i = 1; i < num_points - 1; i++) {
-    points[i] = static_cast<double>(l) + i * step;
-  }
-  points[num_points - 1] = r;
-  return points;
-}
-}  // namespace test
-}  // namespace webrtc
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/agc2/agc2_testing_common.h b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/agc2/agc2_testing_common.h
deleted file mode 100644
index 7bfadbb3fc..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/agc2/agc2_testing_common.h
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- *  Copyright (c) 2018 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#ifndef MODULES_AUDIO_PROCESSING_AGC2_AGC2_TESTING_COMMON_H_
-#define MODULES_AUDIO_PROCESSING_AGC2_AGC2_TESTING_COMMON_H_
-
-#include <math.h>
-
-#include <limits>
-#include <vector>
-
-#include "rtc_base/checks.h"
-
-namespace webrtc {
-
-namespace test {
-
-// Level Estimator test parameters.
-constexpr float kDecayMs = 500.f;
-
-// Limiter parameters.
-constexpr float kLimiterMaxInputLevelDbFs = 1.f;
-constexpr float kLimiterKneeSmoothnessDb = 1.f;
-constexpr float kLimiterCompressionRatio = 5.f;
-constexpr float kPi = 3.1415926536f;
-
-std::vector<double> LinSpace(const double l, const double r, size_t num_points);
-
-class SineGenerator {
- public:
-  SineGenerator(float frequency, int rate)
-      : frequency_(frequency), rate_(rate) {}
-  float operator()() {
-    x_radians_ += frequency_ / rate_ * 2 * kPi;
-    if (x_radians_ > 2 * kPi) {
-      x_radians_ -= 2 * kPi;
-    }
-    return 1000.f * sinf(x_radians_);
-  }
-
- private:
-  float frequency_;
-  int rate_;
-  float x_radians_ = 0.f;
-};
-
-class PulseGenerator {
- public:
-  PulseGenerator(float frequency, int rate)
-      : samples_period_(
-            static_cast<int>(static_cast<float>(rate) / frequency)) {
-    RTC_DCHECK_GT(rate, frequency);
-  }
-  float operator()() {
-    sample_counter_++;
-    if (sample_counter_ >= samples_period_) {
-      sample_counter_ -= samples_period_;
-    }
-    return static_cast<float>(
-        sample_counter_ == 0 ? std::numeric_limits<int16_t>::max() : 10.f);
-  }
-
- private:
-  int samples_period_;
-  int sample_counter_ = 0;
-};
-
-}  // namespace test
-}  // namespace webrtc
-
-#endif  // MODULES_AUDIO_PROCESSING_AGC2_AGC2_TESTING_COMMON_H_
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/agc2/biquad_filter.cc b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/agc2/biquad_filter.cc
deleted file mode 100644
index da8557c190..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/agc2/biquad_filter.cc
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- *  Copyright (c) 2016 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#include "modules/audio_processing/agc2/biquad_filter.h"
-
-#include <stddef.h>
-
-namespace webrtc {
-
-// Transposed direct form I implementation of a bi-quad filter applied to an
-// input signal |x| to produce an output signal |y|.
-void BiQuadFilter::Process(rtc::ArrayView<const float> x,
-                           rtc::ArrayView<float> y) {
-  for (size_t k = 0; k < x.size(); ++k) {
-    // Use temporary variable for x[k] to allow in-place function call
-    // (that x and y refer to the same array).
-    const float tmp = x[k];
-    y[k] = coefficients_.b[0] * tmp + coefficients_.b[1] * biquad_state_.b[0] +
-           coefficients_.b[2] * biquad_state_.b[1] -
-           coefficients_.a[0] * biquad_state_.a[0] -
-           coefficients_.a[1] * biquad_state_.a[1];
-    biquad_state_.b[1] = biquad_state_.b[0];
-    biquad_state_.b[0] = tmp;
-    biquad_state_.a[1] = biquad_state_.a[0];
-    biquad_state_.a[0] = y[k];
-  }
-}
-
-}  // namespace webrtc
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/agc2/biquad_filter.h b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/agc2/biquad_filter.h
deleted file mode 100644
index 3d78c07607..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/agc2/biquad_filter.h
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- *  Copyright (c) 2016 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#ifndef MODULES_AUDIO_PROCESSING_AGC2_BIQUAD_FILTER_H_
-#define MODULES_AUDIO_PROCESSING_AGC2_BIQUAD_FILTER_H_
-
-#include <algorithm>
-
-#include "api/array_view.h"
-#include "rtc_base/arraysize.h"
-#include "rtc_base/constructormagic.h"
-
-namespace webrtc {
-
-class BiQuadFilter {
- public:
-  // Normalized filter coefficients.
-  //        b_0 + b_1 • z^(-1) + b_2 • z^(-2)
-  // H(z) = ---------------------------------
-  //         1 + a_1 • z^(-1) + a_2 • z^(-2)
-  struct BiQuadCoefficients {
-    float b[3];
-    float a[2];
-  };
-
-  BiQuadFilter() = default;
-
-  void Initialize(const BiQuadCoefficients& coefficients) {
-    coefficients_ = coefficients;
-  }
-
-  void Reset() { biquad_state_.Reset(); }
-
-  // Produces a filtered output y of the input x. Both x and y need to
-  // have the same length. In-place modification is allowed.
-  void Process(rtc::ArrayView<const float> x, rtc::ArrayView<float> y);
-
- private:
-  struct BiQuadState {
-    BiQuadState() { Reset(); }
-
-    void Reset() {
-      std::fill(b, b + arraysize(b), 0.f);
-      std::fill(a, a + arraysize(a), 0.f);
-    }
-
-    float b[2];
-    float a[2];
-  };
-
-  BiQuadState biquad_state_;
-  BiQuadCoefficients coefficients_;
-
-  RTC_DISALLOW_COPY_AND_ASSIGN(BiQuadFilter);
-};
-
-}  // namespace webrtc
-
-#endif  // MODULES_AUDIO_PROCESSING_AGC2_BIQUAD_FILTER_H_
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/agc2/compute_interpolated_gain_curve.cc b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/agc2/compute_interpolated_gain_curve.cc
deleted file mode 100644
index bc92613b69..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/agc2/compute_interpolated_gain_curve.cc
+++ /dev/null
@@ -1,229 +0,0 @@
-/*
- *  Copyright (c) 2018 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#include "modules/audio_processing/agc2/compute_interpolated_gain_curve.h"
-
-#include <algorithm>
-#include <cmath>
-#include <queue>
-#include <tuple>
-#include <utility>
-#include <vector>
-
-#include "modules/audio_processing/agc2/agc2_common.h"
-#include "modules/audio_processing/agc2/agc2_testing_common.h"
-#include "modules/audio_processing/agc2/limiter_db_gain_curve.h"
-#include "rtc_base/checks.h"
-
-namespace webrtc {
-namespace {
-
-std::pair<double, double> ComputeLinearApproximationParams(
-    const LimiterDbGainCurve* limiter,
-    const double x) {
-  const double m = limiter->GetGainFirstDerivativeLinear(x);
-  const double q = limiter->GetGainLinear(x) - m * x;
-  return {m, q};
-}
-
-double ComputeAreaUnderPiecewiseLinearApproximation(
-    const LimiterDbGainCurve* limiter,
-    const double x0,
-    const double x1) {
-  RTC_CHECK_LT(x0, x1);
-
-  // Linear approximation in x0 and x1.
-  double m0, q0, m1, q1;
-  std::tie(m0, q0) = ComputeLinearApproximationParams(limiter, x0);
-  std::tie(m1, q1) = ComputeLinearApproximationParams(limiter, x1);
-
-  // Intersection point between two adjacent linear pieces.
-  RTC_CHECK_NE(m1, m0);
-  const double x_split = (q0 - q1) / (m1 - m0);
-  RTC_CHECK_LT(x0, x_split);
-  RTC_CHECK_LT(x_split, x1);
-
-  auto area_under_linear_piece = [](double x_l, double x_r, double m,
-                                    double q) {
-    return x_r * (m * x_r / 2.0 + q) - x_l * (m * x_l / 2.0 + q);
-  };
-  return area_under_linear_piece(x0, x_split, m0, q0) +
-         area_under_linear_piece(x_split, x1, m1, q1);
-}
-
-// Computes the approximation error in the limiter region for a given interval.
-// The error is computed as the difference between the areas beneath the limiter
-// curve to approximate and its linear under-approximation.
-double LimiterUnderApproximationNegativeError(const LimiterDbGainCurve* limiter,
-                                              const double x0,
-                                              const double x1) {
-  const double area_limiter = limiter->GetGainIntegralLinear(x0, x1);
-  const double area_interpolated_curve =
-      ComputeAreaUnderPiecewiseLinearApproximation(limiter, x0, x1);
-  RTC_CHECK_GE(area_limiter, area_interpolated_curve);
-  return area_limiter - area_interpolated_curve;
-}
-
-// Automatically finds where to sample the beyond-knee region of a limiter using
-// a greedy optimization algorithm that iteratively decreases the approximation
-// error.
-// The solution is sub-optimal because the algorithm is greedy and the points
-// are assigned by halving intervals (starting with the whole beyond-knee region
-// as a single interval). However, even if sub-optimal, this algorithm works
-// well in practice and it is efficiently implemented using priority queues.
-std::vector<double> SampleLimiterRegion(const LimiterDbGainCurve* limiter) {
-  static_assert(kInterpolatedGainCurveBeyondKneePoints > 2, "");
-
-  struct Interval {
-    Interval() = default;  // Ctor required by std::priority_queue.
-    Interval(double l, double r, double e) : x0(l), x1(r), error(e) {
-      RTC_CHECK(x0 < x1);
-    }
-    bool operator<(const Interval& other) const { return error < other.error; }
-
-    double x0;
-    double x1;
-    double error;
-  };
-
-  std::priority_queue<Interval, std::vector<Interval>> q;
-  q.emplace(limiter->limiter_start_linear(), limiter->max_input_level_linear(),
-            LimiterUnderApproximationNegativeError(
-                limiter, limiter->limiter_start_linear(),
-                limiter->max_input_level_linear()));
-
-  // Iteratively find points by halving the interval with greatest error.
-  while (q.size() < kInterpolatedGainCurveBeyondKneePoints) {
-    // Get the interval with highest error.
-    const auto interval = q.top();
-    q.pop();
-
-    // Split |interval| and enqueue.
-    double x_split = (interval.x0 + interval.x1) / 2.0;
-    q.emplace(interval.x0, x_split,
-              LimiterUnderApproximationNegativeError(limiter, interval.x0,
-                                                     x_split));  // Left.
-    q.emplace(x_split, interval.x1,
-              LimiterUnderApproximationNegativeError(limiter, x_split,
-                                                     interval.x1));  // Right.
-  }
-
-  // Copy x1 values and sort them.
-  RTC_CHECK_EQ(q.size(), kInterpolatedGainCurveBeyondKneePoints);
-  std::vector<double> samples(kInterpolatedGainCurveBeyondKneePoints);
-  for (size_t i = 0; i < kInterpolatedGainCurveBeyondKneePoints; ++i) {
-    const auto interval = q.top();
-    q.pop();
-    samples[i] = interval.x1;
-  }
-  RTC_CHECK(q.empty());
-  std::sort(samples.begin(), samples.end());
-
-  return samples;
-}
-
-// Compute the parameters to over-approximate the knee region via linear
-// interpolation. Over-approximating is saturation-safe since the knee region is
-// convex.
-void PrecomputeKneeApproxParams(const LimiterDbGainCurve* limiter,
-                                test::InterpolatedParameters* parameters) {
-  static_assert(kInterpolatedGainCurveKneePoints > 2, "");
-  // Get |kInterpolatedGainCurveKneePoints| - 1 equally spaced points.
-  const std::vector<double> points = test::LinSpace(
-      limiter->knee_start_linear(), limiter->limiter_start_linear(),
-      kInterpolatedGainCurveKneePoints - 1);
-
-  // Set the first two points. The second is computed to help with the beginning
-  // of the knee region, which has high curvature.
-  parameters->computed_approximation_params_x[0] = points[0];
-  parameters->computed_approximation_params_x[1] =
-      (points[0] + points[1]) / 2.0;
-  // Copy the remaining points.
-  std::copy(std::begin(points) + 1, std::end(points),
-            std::begin(parameters->computed_approximation_params_x) + 2);
-
-  // Compute (m, q) pairs for each linear piece y = mx + q.
-  for (size_t i = 0; i < kInterpolatedGainCurveKneePoints - 1; ++i) {
-    const double x0 = parameters->computed_approximation_params_x[i];
-    const double x1 = parameters->computed_approximation_params_x[i + 1];
-    const double y0 = limiter->GetGainLinear(x0);
-    const double y1 = limiter->GetGainLinear(x1);
-    RTC_CHECK_NE(x1, x0);
-    parameters->computed_approximation_params_m[i] = (y1 - y0) / (x1 - x0);
-    parameters->computed_approximation_params_q[i] =
-        y0 - parameters->computed_approximation_params_m[i] * x0;
-  }
-}
-
-// Compute the parameters to under-approximate the beyond-knee region via linear
-// interpolation and greedy sampling. Under-approximating is saturation-safe
-// since the beyond-knee region is concave.
-void PrecomputeBeyondKneeApproxParams(
-    const LimiterDbGainCurve* limiter,
-    test::InterpolatedParameters* parameters) {
-  // Find points on which the linear pieces are tangent to the gain curve.
-  const auto samples = SampleLimiterRegion(limiter);
-
-  // Parametrize each linear piece.
-  double m, q;
-  std::tie(m, q) = ComputeLinearApproximationParams(
-      limiter,
-      parameters
-          ->computed_approximation_params_x[kInterpolatedGainCurveKneePoints -
-                                            1]);
-  parameters
-      ->computed_approximation_params_m[kInterpolatedGainCurveKneePoints - 1] =
-      m;
-  parameters
-      ->computed_approximation_params_q[kInterpolatedGainCurveKneePoints - 1] =
-      q;
-  for (size_t i = 0; i < samples.size(); ++i) {
-    std::tie(m, q) = ComputeLinearApproximationParams(limiter, samples[i]);
-    parameters
-        ->computed_approximation_params_m[i +
-                                          kInterpolatedGainCurveKneePoints] = m;
-    parameters
-        ->computed_approximation_params_q[i +
-                                          kInterpolatedGainCurveKneePoints] = q;
-  }
-
-  // Find the point of intersection between adjacent linear pieces. They will be
-  // used as boundaries between adjacent linear pieces.
-  for (size_t i = kInterpolatedGainCurveKneePoints;
-       i < kInterpolatedGainCurveKneePoints +
-               kInterpolatedGainCurveBeyondKneePoints;
-       ++i) {
-    RTC_CHECK_NE(parameters->computed_approximation_params_m[i],
-                 parameters->computed_approximation_params_m[i - 1]);
-    parameters->computed_approximation_params_x[i] =
-        (  // Formula: (q0 - q1) / (m1 - m0).
-            parameters->computed_approximation_params_q[i - 1] -
-            parameters->computed_approximation_params_q[i]) /
-        (parameters->computed_approximation_params_m[i] -
-         parameters->computed_approximation_params_m[i - 1]);
-  }
-}
-
-}  // namespace
-
-namespace test {
-
-InterpolatedParameters ComputeInterpolatedGainCurveApproximationParams() {
-  InterpolatedParameters parameters;
-  LimiterDbGainCurve limiter;
-  parameters.computed_approximation_params_x.fill(0.0f);
-  parameters.computed_approximation_params_m.fill(0.0f);
-  parameters.computed_approximation_params_q.fill(0.0f);
-  PrecomputeKneeApproxParams(&limiter, &parameters);
-  PrecomputeBeyondKneeApproxParams(&limiter, &parameters);
-  return parameters;
-}
-}  // namespace test
-}  // namespace webrtc
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/agc2/compute_interpolated_gain_curve.h b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/agc2/compute_interpolated_gain_curve.h
deleted file mode 100644
index 5f52441ec3..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/agc2/compute_interpolated_gain_curve.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- *  Copyright (c) 2018 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#ifndef MODULES_AUDIO_PROCESSING_AGC2_COMPUTE_INTERPOLATED_GAIN_CURVE_H_
-#define MODULES_AUDIO_PROCESSING_AGC2_COMPUTE_INTERPOLATED_GAIN_CURVE_H_
-
-#include <array>
-
-#include "modules/audio_processing/agc2/agc2_common.h"
-
-namespace webrtc {
-
-namespace test {
-
-// Parameters for interpolated gain curve using under-approximation to
-// avoid saturation.
-//
-// The saturation gain is defined in order to let hard-clipping occur for
-// those samples having a level that falls in the saturation region. It is an
-// upper bound of the actual gain to apply - i.e., that returned by the
-// limiter.
-
-// Knee and beyond-knee regions approximation parameters.
-// The gain curve is approximated as a piece-wise linear function.
-// |approx_params_x_| are the boundaries between adjacent linear pieces,
-// |approx_params_m_| and |approx_params_q_| are the slope and the y-intercept
-// values of each piece.
-struct InterpolatedParameters {
-  std::array<float, kInterpolatedGainCurveTotalPoints>
-      computed_approximation_params_x;
-  std::array<float, kInterpolatedGainCurveTotalPoints>
-      computed_approximation_params_m;
-  std::array<float, kInterpolatedGainCurveTotalPoints>
-      computed_approximation_params_q;
-};
-
-InterpolatedParameters ComputeInterpolatedGainCurveApproximationParams();
-}  // namespace test
-}  // namespace webrtc
-
-#endif  // MODULES_AUDIO_PROCESSING_AGC2_COMPUTE_INTERPOLATED_GAIN_CURVE_H_
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/agc2/down_sampler.cc b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/agc2/down_sampler.cc
deleted file mode 100644
index 50486e0a36..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/agc2/down_sampler.cc
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
- *  Copyright (c) 2016 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#include "modules/audio_processing/agc2/down_sampler.h"
-
-#include <string.h>
-#include <algorithm>
-
-#include "modules/audio_processing/agc2/biquad_filter.h"
-#include "modules/audio_processing/logging/apm_data_dumper.h"
-#include "rtc_base/checks.h"
-
-namespace webrtc {
-namespace {
-
-constexpr int kChunkSizeMs = 10;
-constexpr int kSampleRate8kHz = 8000;
-constexpr int kSampleRate16kHz = 16000;
-constexpr int kSampleRate32kHz = 32000;
-constexpr int kSampleRate48kHz = 48000;
-
-// Bandlimiter coefficients computed based on that only
-// the first 40 bins of the spectrum for the downsampled
-// signal are used.
-// [B,A] = butter(2,(41/64*4000)/8000)
-const BiQuadFilter::BiQuadCoefficients kLowPassFilterCoefficients_16kHz = {
-    {0.1455f, 0.2911f, 0.1455f},
-    {-0.6698f, 0.2520f}};
-
-// [B,A] = butter(2,(41/64*4000)/16000)
-const BiQuadFilter::BiQuadCoefficients kLowPassFilterCoefficients_32kHz = {
-    {0.0462f, 0.0924f, 0.0462f},
-    {-1.3066f, 0.4915f}};
-
-// [B,A] = butter(2,(41/64*4000)/24000)
-const BiQuadFilter::BiQuadCoefficients kLowPassFilterCoefficients_48kHz = {
-    {0.0226f, 0.0452f, 0.0226f},
-    {-1.5320f, 0.6224f}};
-
-}  // namespace
-
-DownSampler::DownSampler(ApmDataDumper* data_dumper)
-    : data_dumper_(data_dumper) {
-  Initialize(48000);
-}
-void DownSampler::Initialize(int sample_rate_hz) {
-  RTC_DCHECK(
-      sample_rate_hz == kSampleRate8kHz || sample_rate_hz == kSampleRate16kHz ||
-      sample_rate_hz == kSampleRate32kHz || sample_rate_hz == kSampleRate48kHz);
-
-  sample_rate_hz_ = sample_rate_hz;
-  down_sampling_factor_ = rtc::CheckedDivExact(sample_rate_hz_, 8000);
-
-  /// Note that the down sampling filter is not used if the sample rate is 8
-  /// kHz.
-  if (sample_rate_hz_ == kSampleRate16kHz) {
-    low_pass_filter_.Initialize(kLowPassFilterCoefficients_16kHz);
-  } else if (sample_rate_hz_ == kSampleRate32kHz) {
-    low_pass_filter_.Initialize(kLowPassFilterCoefficients_32kHz);
-  } else if (sample_rate_hz_ == kSampleRate48kHz) {
-    low_pass_filter_.Initialize(kLowPassFilterCoefficients_48kHz);
-  }
-}
-
-void DownSampler::DownSample(rtc::ArrayView<const float> in,
-                             rtc::ArrayView<float> out) {
-  data_dumper_->DumpWav("lc_down_sampler_input", in, sample_rate_hz_, 1);
-  RTC_DCHECK_EQ(sample_rate_hz_ * kChunkSizeMs / 1000, in.size());
-  RTC_DCHECK_EQ(kSampleRate8kHz * kChunkSizeMs / 1000, out.size());
-  const size_t kMaxNumFrames = kSampleRate48kHz * kChunkSizeMs / 1000;
-  float x[kMaxNumFrames];
-
-  // Band-limit the signal to 4 kHz.
-  if (sample_rate_hz_ != kSampleRate8kHz) {
-    low_pass_filter_.Process(in, rtc::ArrayView<float>(x, in.size()));
-
-    // Downsample the signal.
-    size_t k = 0;
-    for (size_t j = 0; j < out.size(); ++j) {
-      RTC_DCHECK_GT(kMaxNumFrames, k);
-      out[j] = x[k];
-      k += down_sampling_factor_;
-    }
-  } else {
-    std::copy(in.data(), in.data() + in.size(), out.data());
-  }
-
-  data_dumper_->DumpWav("lc_down_sampler_output", out, kSampleRate8kHz, 1);
-}
-
-}  // namespace webrtc
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/agc2/down_sampler.h b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/agc2/down_sampler.h
deleted file mode 100644
index a609ea8e0c..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/agc2/down_sampler.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- *  Copyright (c) 2016 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#ifndef MODULES_AUDIO_PROCESSING_AGC2_DOWN_SAMPLER_H_
-#define MODULES_AUDIO_PROCESSING_AGC2_DOWN_SAMPLER_H_
-
-#include "api/array_view.h"
-#include "modules/audio_processing/agc2/biquad_filter.h"
-#include "rtc_base/constructormagic.h"
-
-namespace webrtc {
-
-class ApmDataDumper;
-
-class DownSampler {
- public:
-  explicit DownSampler(ApmDataDumper* data_dumper);
-  void Initialize(int sample_rate_hz);
-
-  void DownSample(rtc::ArrayView<const float> in, rtc::ArrayView<float> out);
-
- private:
-  ApmDataDumper* data_dumper_;
-  int sample_rate_hz_;
-  int down_sampling_factor_;
-  BiQuadFilter low_pass_filter_;
-
-  RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(DownSampler);
-};
-
-}  // namespace webrtc
-
-#endif  // MODULES_AUDIO_PROCESSING_AGC2_DOWN_SAMPLER_H_
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/agc2/fixed_digital_level_estimator.cc b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/agc2/fixed_digital_level_estimator.cc
deleted file mode 100644
index 971f4f62b7..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/agc2/fixed_digital_level_estimator.cc
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
- *  Copyright (c) 2018 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#include "modules/audio_processing/agc2/fixed_digital_level_estimator.h"
-
-#include <algorithm>
-#include <cmath>
-
-#include "api/array_view.h"
-#include "modules/audio_processing/logging/apm_data_dumper.h"
-#include "rtc_base/checks.h"
-
-namespace webrtc {
-namespace {
-
-constexpr float kInitialFilterStateLevel = 0.f;
-
-}  // namespace
-
-FixedDigitalLevelEstimator::FixedDigitalLevelEstimator(
-    size_t sample_rate_hz,
-    ApmDataDumper* apm_data_dumper)
-    : apm_data_dumper_(apm_data_dumper),
-      filter_state_level_(kInitialFilterStateLevel) {
-  SetSampleRate(sample_rate_hz);
-  CheckParameterCombination();
-  RTC_DCHECK(apm_data_dumper_);
-  apm_data_dumper_->DumpRaw("agc2_level_estimator_samplerate", sample_rate_hz);
-}
-
-void FixedDigitalLevelEstimator::CheckParameterCombination() {
-  RTC_DCHECK_GT(samples_in_frame_, 0);
-  RTC_DCHECK_LE(kSubFramesInFrame, samples_in_frame_);
-  RTC_DCHECK_EQ(samples_in_frame_ % kSubFramesInFrame, 0);
-  RTC_DCHECK_GT(samples_in_sub_frame_, 1);
-}
-
-std::array<float, kSubFramesInFrame> FixedDigitalLevelEstimator::ComputeLevel(
-    const AudioFrameView<const float>& float_frame) {
-  RTC_DCHECK_GT(float_frame.num_channels(), 0);
-  RTC_DCHECK_EQ(float_frame.samples_per_channel(), samples_in_frame_);
-
-  // Compute max envelope without smoothing.
-  std::array<float, kSubFramesInFrame> envelope{};
-  for (size_t channel_idx = 0; channel_idx < float_frame.num_channels();
-       ++channel_idx) {
-    const auto channel = float_frame.channel(channel_idx);
-    for (size_t sub_frame = 0; sub_frame < kSubFramesInFrame; ++sub_frame) {
-      for (size_t sample_in_sub_frame = 0;
-           sample_in_sub_frame < samples_in_sub_frame_; ++sample_in_sub_frame) {
-        envelope[sub_frame] =
-            std::max(envelope[sub_frame],
-                     std::abs(channel[sub_frame * samples_in_sub_frame_ +
-                                      sample_in_sub_frame]));
-      }
-    }
-  }
-
-  // Make sure envelope increases happen one step earlier so that the
-  // corresponding *gain decrease* doesn't miss a sudden signal
-  // increase due to interpolation.
-  for (size_t sub_frame = 0; sub_frame < kSubFramesInFrame - 1; ++sub_frame) {
-    if (envelope[sub_frame] < envelope[sub_frame + 1]) {
-      envelope[sub_frame] = envelope[sub_frame + 1];
-    }
-  }
-
-  // Add attack / decay smoothing.
-  for (size_t sub_frame = 0; sub_frame < kSubFramesInFrame; ++sub_frame) {
-    const float envelope_value = envelope[sub_frame];
-    if (envelope_value > filter_state_level_) {
-      envelope[sub_frame] = envelope_value * (1 - kAttackFilterConstant) +
-                            filter_state_level_ * kAttackFilterConstant;
-    } else {
-      envelope[sub_frame] = envelope_value * (1 - kDecayFilterConstant) +
-                            filter_state_level_ * kDecayFilterConstant;
-    }
-    filter_state_level_ = envelope[sub_frame];
-
-    // Dump data for debug.
-    RTC_DCHECK(apm_data_dumper_);
-    const auto channel = float_frame.channel(0);
-    apm_data_dumper_->DumpRaw("agc2_level_estimator_samples",
-                              samples_in_sub_frame_,
-                              &channel[sub_frame * samples_in_sub_frame_]);
-    apm_data_dumper_->DumpRaw("agc2_level_estimator_level",
-                              envelope[sub_frame]);
-  }
-
-  return envelope;
-}
-
-void FixedDigitalLevelEstimator::SetSampleRate(size_t sample_rate_hz) {
-  samples_in_frame_ = rtc::CheckedDivExact(sample_rate_hz * kFrameDurationMs,
-                                           static_cast<size_t>(1000));
-  samples_in_sub_frame_ =
-      rtc::CheckedDivExact(samples_in_frame_, kSubFramesInFrame);
-  CheckParameterCombination();
-}
-
-void FixedDigitalLevelEstimator::Reset() {
-  filter_state_level_ = kInitialFilterStateLevel;
-}
-
-}  // namespace webrtc
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/agc2/fixed_digital_level_estimator.h b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/agc2/fixed_digital_level_estimator.h
deleted file mode 100644
index 84429d3952..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/agc2/fixed_digital_level_estimator.h
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- *  Copyright (c) 2018 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#ifndef MODULES_AUDIO_PROCESSING_AGC2_FIXED_DIGITAL_LEVEL_ESTIMATOR_H_
-#define MODULES_AUDIO_PROCESSING_AGC2_FIXED_DIGITAL_LEVEL_ESTIMATOR_H_
-
-#include <array>
-#include <vector>
-
-#include "modules/audio_processing/agc2/agc2_common.h"
-#include "modules/audio_processing/include/audio_frame_view.h"
-#include "rtc_base/constructormagic.h"
-
-namespace webrtc {
-
-class ApmDataDumper;
-// Produces a smooth signal level estimate from an input audio
-// stream. The estimate smoothing is done through exponential
-// filtering.
-class FixedDigitalLevelEstimator {
- public:
-  // Sample rates are allowed if the number of samples in a frame
-  // (sample_rate_hz * kFrameDurationMs / 1000) is divisible by
-  // kSubFramesInSample. For kFrameDurationMs=10 and
-  // kSubFramesInSample=20, this means that sample_rate_hz has to be
-  // divisible by 2000.
-  FixedDigitalLevelEstimator(size_t sample_rate_hz,
-                             ApmDataDumper* apm_data_dumper);
-
-  // The input is assumed to be in FloatS16 format. Scaled input will
-  // produce similarly scaled output. A frame of with kFrameDurationMs
-  // ms of audio produces a level estimates in the same scale. The
-  // level estimate contains kSubFramesInFrame values.
-  std::array<float, kSubFramesInFrame> ComputeLevel(
-      const AudioFrameView<const float>& float_frame);
-
-  // Rate may be changed at any time (but not concurrently) from the
-  // value passed to the constructor. The class is not thread safe.
-  void SetSampleRate(size_t sample_rate_hz);
-
-  // Resets the level estimator internal state.
-  void Reset();
-
-  float LastAudioLevel() const { return filter_state_level_; }
-
- private:
-  void CheckParameterCombination();
-
-  ApmDataDumper* const apm_data_dumper_ = nullptr;
-  float filter_state_level_;
-  size_t samples_in_frame_;
-  size_t samples_in_sub_frame_;
-
-  RTC_DISALLOW_COPY_AND_ASSIGN(FixedDigitalLevelEstimator);
-};
-}  // namespace webrtc
-
-#endif  // MODULES_AUDIO_PROCESSING_AGC2_FIXED_DIGITAL_LEVEL_ESTIMATOR_H_
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/agc2/fixed_gain_controller.cc b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/agc2/fixed_gain_controller.cc
deleted file mode 100644
index ef908dc358..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/agc2/fixed_gain_controller.cc
+++ /dev/null
@@ -1,101 +0,0 @@
-/*
- *  Copyright (c) 2018 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#include "modules/audio_processing/agc2/fixed_gain_controller.h"
-
-#include "api/array_view.h"
-#include "common_audio/include/audio_util.h"
-#include "modules/audio_processing/agc2/agc2_common.h"
-#include "modules/audio_processing/logging/apm_data_dumper.h"
-#include "rtc_base/checks.h"
-#include "rtc_base/logging.h"
-#include "rtc_base/numerics/safe_minmax.h"
-
-namespace webrtc {
-namespace {
-
-// Returns true when the gain factor is so close to 1 that it would
-// not affect int16 samples.
-bool CloseToOne(float gain_factor) {
-  return 1.f - 1.f / kMaxFloatS16Value <= gain_factor &&
-         gain_factor <= 1.f + 1.f / kMaxFloatS16Value;
-}
-}  // namespace
-
-FixedGainController::FixedGainController(ApmDataDumper* apm_data_dumper)
-    : FixedGainController(apm_data_dumper, "Agc2") {}
-
-FixedGainController::FixedGainController(ApmDataDumper* apm_data_dumper,
-                                         std::string histogram_name_prefix)
-    : apm_data_dumper_(apm_data_dumper),
-      limiter_(48000, apm_data_dumper_, histogram_name_prefix) {
-  // Do update histograms.xml when adding name prefixes.
-  RTC_DCHECK(histogram_name_prefix == "" || histogram_name_prefix == "Test" ||
-             histogram_name_prefix == "AudioMixer" ||
-             histogram_name_prefix == "Agc2");
-}
-
-void FixedGainController::SetGain(float gain_to_apply_db) {
-  // Changes in gain_to_apply_ cause discontinuities. We assume
-  // gain_to_apply_ is set in the beginning of the call. If it is
-  // frequently changed, we should add interpolation between the
-  // values.
-  // The gain
-  RTC_DCHECK_LE(-50.f, gain_to_apply_db);
-  RTC_DCHECK_LE(gain_to_apply_db, 50.f);
-  const float previous_applied_gained = gain_to_apply_;
-  gain_to_apply_ = DbToRatio(gain_to_apply_db);
-  RTC_DCHECK_LT(0.f, gain_to_apply_);
-  RTC_DLOG(LS_INFO) << "Gain to apply: " << gain_to_apply_db << " db.";
-  // Reset the gain curve applier to quickly react on abrupt level changes
-  // caused by large changes of the applied gain.
-  if (previous_applied_gained != gain_to_apply_) {
-    limiter_.Reset();
-  }
-}
-
-void FixedGainController::SetSampleRate(size_t sample_rate_hz) {
-  limiter_.SetSampleRate(sample_rate_hz);
-}
-
-void FixedGainController::Process(AudioFrameView<float> signal) {
-  // Apply fixed digital gain. One of the
-  // planned usages of the FGC is to only use the limiter. In that
-  // case, the gain would be 1.0. Not doing the multiplications speeds
-  // it up considerably. Hence the check.
-  if (!CloseToOne(gain_to_apply_)) {
-    for (size_t k = 0; k < signal.num_channels(); ++k) {
-      rtc::ArrayView<float> channel_view = signal.channel(k);
-      for (auto& sample : channel_view) {
-        sample *= gain_to_apply_;
-      }
-    }
-  }
-
-  // Use the limiter.
-  limiter_.Process(signal);
-
-  // Dump data for debug.
-  const auto channel_view = signal.channel(0);
-  apm_data_dumper_->DumpRaw("agc2_fixed_digital_gain_curve_applier",
-                            channel_view.size(), channel_view.data());
-  // Hard-clipping.
-  for (size_t k = 0; k < signal.num_channels(); ++k) {
-    rtc::ArrayView<float> channel_view = signal.channel(k);
-    for (auto& sample : channel_view) {
-      sample = rtc::SafeClamp(sample, kMinFloatS16Value, kMaxFloatS16Value);
-    }
-  }
-}
-
-float FixedGainController::LastAudioLevel() const {
-  return limiter_.LastAudioLevel();
-}
-}  // namespace webrtc
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/agc2/fixed_gain_controller.h b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/agc2/fixed_gain_controller.h
deleted file mode 100644
index c262ab42f3..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/agc2/fixed_gain_controller.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- *  Copyright (c) 2018 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-#ifndef MODULES_AUDIO_PROCESSING_AGC2_FIXED_GAIN_CONTROLLER_H_
-#define MODULES_AUDIO_PROCESSING_AGC2_FIXED_GAIN_CONTROLLER_H_
-#include "modules/audio_processing/agc2/limiter.h"
-#include "modules/audio_processing/include/audio_frame_view.h"
-namespace webrtc {
-class ApmDataDumper;
-class FixedGainController {
- public:
-  explicit FixedGainController(ApmDataDumper* apm_data_dumper);
-  FixedGainController(ApmDataDumper* apm_data_dumper,
-                      std::string histogram_name_prefix);
-  void Process(AudioFrameView<float> signal);
-  // Gain and sample rate may be changed at any time (but not
-  // concurrently with any other method call).
-  void SetGain(float gain_to_apply_db);
-  void SetSampleRate(size_t sample_rate_hz);
-  float LastAudioLevel() const;
- private:
-  float gain_to_apply_ = 1.f;
-  ApmDataDumper* apm_data_dumper_ = nullptr;
-  Limiter limiter_;
-};
-}  // namespace webrtc
-#endif  // MODULES_AUDIO_PROCESSING_AGC2_FIXED_GAIN_CONTROLLER_H_
\ No newline at end of file
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/agc2/gain_applier.cc b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/agc2/gain_applier.cc
deleted file mode 100644
index 8c437177e3..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/agc2/gain_applier.cc
+++ /dev/null
@@ -1,102 +0,0 @@
-/*
- *  Copyright (c) 2018 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#include "modules/audio_processing/agc2/gain_applier.h"
-
-#include "api/array_view.h"
-#include "modules/audio_processing/agc2/agc2_common.h"
-#include "rtc_base/numerics/safe_minmax.h"
-
-namespace webrtc {
-namespace {
-
-// Returns true when the gain factor is so close to 1 that it would
-// not affect int16 samples.
-bool GainCloseToOne(float gain_factor) {
-  return 1.f - 1.f / kMaxFloatS16Value <= gain_factor &&
-         gain_factor <= 1.f + 1.f / kMaxFloatS16Value;
-}
-
-void ClipSignal(AudioFrameView<float> signal) {
-  for (size_t k = 0; k < signal.num_channels(); ++k) {
-    rtc::ArrayView<float> channel_view = signal.channel(k);
-    for (auto& sample : channel_view) {
-      sample = rtc::SafeClamp(sample, kMinFloatS16Value, kMaxFloatS16Value);
-    }
-  }
-}
-
-void ApplyGainWithRamping(float last_gain_linear,
-                          float gain_at_end_of_frame_linear,
-                          float inverse_samples_per_channel,
-                          AudioFrameView<float> float_frame) {
-  // Do not modify the signal.
-  if (last_gain_linear == gain_at_end_of_frame_linear &&
-      GainCloseToOne(gain_at_end_of_frame_linear)) {
-    return;
-  }
-
-  // Gain is constant and different from 1.
-  if (last_gain_linear == gain_at_end_of_frame_linear) {
-    for (size_t k = 0; k < float_frame.num_channels(); ++k) {
-      rtc::ArrayView<float> channel_view = float_frame.channel(k);
-      for (auto& sample : channel_view) {
-        sample *= gain_at_end_of_frame_linear;
-      }
-    }
-    return;
-  }
-
-  // The gain changes. We have to change slowly to avoid discontinuities.
-  const float increment = (gain_at_end_of_frame_linear - last_gain_linear) *
-                          inverse_samples_per_channel;
-  float gain = last_gain_linear;
-  for (size_t i = 0; i < float_frame.samples_per_channel(); ++i) {
-    for (size_t ch = 0; ch < float_frame.num_channels(); ++ch) {
-      float_frame.channel(ch)[i] *= gain;
-    }
-    gain += increment;
-  }
-}
-
-}  // namespace
-
-GainApplier::GainApplier(bool hard_clip_samples, float initial_gain_factor)
-    : hard_clip_samples_(hard_clip_samples),
-      last_gain_factor_(initial_gain_factor),
-      current_gain_factor_(initial_gain_factor) {}
-
-void GainApplier::ApplyGain(AudioFrameView<float> signal) {
-  if (static_cast<int>(signal.samples_per_channel()) != samples_per_channel_) {
-    Initialize(signal.samples_per_channel());
-  }
-
-  ApplyGainWithRamping(last_gain_factor_, current_gain_factor_,
-                       inverse_samples_per_channel_, signal);
-
-  last_gain_factor_ = current_gain_factor_;
-
-  if (hard_clip_samples_) {
-    ClipSignal(signal);
-  }
-}
-
-void GainApplier::SetGainFactor(float gain_factor) {
-  RTC_DCHECK_GT(gain_factor, 0.f);
-  current_gain_factor_ = gain_factor;
-}
-
-void GainApplier::Initialize(size_t samples_per_channel) {
-  RTC_DCHECK_GT(samples_per_channel, 0);
-  samples_per_channel_ = static_cast<int>(samples_per_channel);
-  inverse_samples_per_channel_ = 1.f / samples_per_channel_;
-}
-
-}  // namespace webrtc
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/agc2/gain_applier.h b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/agc2/gain_applier.h
deleted file mode 100644
index 7f9f00e076..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/agc2/gain_applier.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- *  Copyright (c) 2018 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#ifndef MODULES_AUDIO_PROCESSING_AGC2_GAIN_APPLIER_H_
-#define MODULES_AUDIO_PROCESSING_AGC2_GAIN_APPLIER_H_
-
-#include <stddef.h>
-
-#include "modules/audio_processing/include/audio_frame_view.h"
-
-namespace webrtc {
-class GainApplier {
- public:
-  GainApplier(bool hard_clip_samples, float initial_gain_factor);
-
-  void ApplyGain(AudioFrameView<float> signal);
-  void SetGainFactor(float gain_factor);
-  float GetGainFactor() const { return current_gain_factor_; };
-
- private:
-  void Initialize(size_t samples_per_channel);
-
-  // Whether to clip samples after gain is applied. If 'true', result
-  // will fit in FloatS16 range.
-  const bool hard_clip_samples_;
-  float last_gain_factor_;
-
-  // If this value is not equal to 'last_gain_factor', gain will be
-  // ramped from 'last_gain_factor_' to this value during the next
-  // 'ApplyGain'.
-  float current_gain_factor_;
-  int samples_per_channel_ = -1;
-  float inverse_samples_per_channel_ = -1.f;
-};
-}  // namespace webrtc
-
-#endif  // MODULES_AUDIO_PROCESSING_AGC2_GAIN_APPLIER_H_
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/agc2/interpolated_gain_curve.cc b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/agc2/interpolated_gain_curve.cc
deleted file mode 100644
index f5d6b47169..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/agc2/interpolated_gain_curve.cc
+++ /dev/null
@@ -1,193 +0,0 @@
-/*
- *  Copyright (c) 2018 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#include "modules/audio_processing/agc2/interpolated_gain_curve.h"
-
-#include <algorithm>
-#include <iterator>
-
-#include "modules/audio_processing/agc2/agc2_common.h"
-#include "modules/audio_processing/logging/apm_data_dumper.h"
-#include "rtc_base/checks.h"
-
-namespace webrtc {
-
-constexpr std::array<float, kInterpolatedGainCurveTotalPoints>
-    InterpolatedGainCurve::approximation_params_x_;
-
-constexpr std::array<float, kInterpolatedGainCurveTotalPoints>
-    InterpolatedGainCurve::approximation_params_m_;
-
-constexpr std::array<float, kInterpolatedGainCurveTotalPoints>
-    InterpolatedGainCurve::approximation_params_q_;
-
-InterpolatedGainCurve::InterpolatedGainCurve(ApmDataDumper* apm_data_dumper,
-                                             std::string histogram_name_prefix)
-    : region_logger_("WebRTC.Audio." + histogram_name_prefix +
-                         ".FixedDigitalGainCurveRegion.Identity",
-                     "WebRTC.Audio." + histogram_name_prefix +
-                         ".FixedDigitalGainCurveRegion.Knee",
-                     "WebRTC.Audio." + histogram_name_prefix +
-                         ".FixedDigitalGainCurveRegion.Limiter",
-                     "WebRTC.Audio." + histogram_name_prefix +
-                         ".FixedDigitalGainCurveRegion.Saturation"),
-      apm_data_dumper_(apm_data_dumper) {}
-
-InterpolatedGainCurve::~InterpolatedGainCurve() {
-  if (stats_.available) {
-    RTC_DCHECK(apm_data_dumper_);
-    apm_data_dumper_->DumpRaw("agc2_interp_gain_curve_lookups_identity",
-                              stats_.look_ups_identity_region);
-    apm_data_dumper_->DumpRaw("agc2_interp_gain_curve_lookups_knee",
-                              stats_.look_ups_knee_region);
-    apm_data_dumper_->DumpRaw("agc2_interp_gain_curve_lookups_limiter",
-                              stats_.look_ups_limiter_region);
-    apm_data_dumper_->DumpRaw("agc2_interp_gain_curve_lookups_saturation",
-                              stats_.look_ups_saturation_region);
-    region_logger_.LogRegionStats(stats_);
-  }
-}
-
-InterpolatedGainCurve::RegionLogger::RegionLogger(
-    std::string identity_histogram_name,
-    std::string knee_histogram_name,
-    std::string limiter_histogram_name,
-    std::string saturation_histogram_name)
-    : identity_histogram(
-          metrics::HistogramFactoryGetCounts(identity_histogram_name,
-                                             1,
-                                             10000,
-                                             50)),
-      knee_histogram(metrics::HistogramFactoryGetCounts(knee_histogram_name,
-                                                        1,
-                                                        10000,
-                                                        50)),
-      limiter_histogram(
-          metrics::HistogramFactoryGetCounts(limiter_histogram_name,
-                                             1,
-                                             10000,
-                                             50)),
-      saturation_histogram(
-          metrics::HistogramFactoryGetCounts(saturation_histogram_name,
-                                             1,
-                                             10000,
-                                             50)) {}
-
-InterpolatedGainCurve::RegionLogger::~RegionLogger() = default;
-
-void InterpolatedGainCurve::RegionLogger::LogRegionStats(
-    const InterpolatedGainCurve::Stats& stats) const {
-  using Region = InterpolatedGainCurve::GainCurveRegion;
-  const int duration_s =
-      stats.region_duration_frames / (1000 / kFrameDurationMs);
-
-  switch (stats.region) {
-    case Region::kIdentity: {
-      if (identity_histogram) {
-        metrics::HistogramAdd(identity_histogram, duration_s);
-      }
-      break;
-    }
-    case Region::kKnee: {
-      if (knee_histogram) {
-        metrics::HistogramAdd(knee_histogram, duration_s);
-      }
-      break;
-    }
-    case Region::kLimiter: {
-      if (limiter_histogram) {
-        metrics::HistogramAdd(limiter_histogram, duration_s);
-      }
-      break;
-    }
-    case Region::kSaturation: {
-      if (saturation_histogram) {
-        metrics::HistogramAdd(saturation_histogram, duration_s);
-      }
-      break;
-    }
-    default: { RTC_NOTREACHED(); }
-  }
-}
-
-void InterpolatedGainCurve::UpdateStats(float input_level) const {
-  stats_.available = true;
-
-  GainCurveRegion region;
-
-  if (input_level < approximation_params_x_[0]) {
-    stats_.look_ups_identity_region++;
-    region = GainCurveRegion::kIdentity;
-  } else if (input_level <
-             approximation_params_x_[kInterpolatedGainCurveKneePoints - 1]) {
-    stats_.look_ups_knee_region++;
-    region = GainCurveRegion::kKnee;
-  } else if (input_level < kMaxInputLevelLinear) {
-    stats_.look_ups_limiter_region++;
-    region = GainCurveRegion::kLimiter;
-  } else {
-    stats_.look_ups_saturation_region++;
-    region = GainCurveRegion::kSaturation;
-  }
-
-  if (region == stats_.region) {
-    ++stats_.region_duration_frames;
-  } else {
-    region_logger_.LogRegionStats(stats_);
-
-    stats_.region_duration_frames = 0;
-    stats_.region = region;
-  }
-}
-
-// Looks up a gain to apply given a non-negative input level.
-// The cost of this operation depends on the region in which |input_level|
-// falls.
-// For the identity and the saturation regions the cost is O(1).
-// For the other regions, namely knee and limiter, the cost is
-// O(2 + log2(|LightkInterpolatedGainCurveTotalPoints|), plus O(1) for the
-// linear interpolation (one product and one sum).
-float InterpolatedGainCurve::LookUpGainToApply(float input_level) const {
-  UpdateStats(input_level);
-
-  if (input_level <= approximation_params_x_[0]) {
-    // Identity region.
-    return 1.0f;
-  }
-
-  if (input_level >= kMaxInputLevelLinear) {
-    // Saturating lower bound. The saturing samples exactly hit the clipping
-    // level. This method achieves has the lowest harmonic distorsion, but it
-    // may reduce the amplitude of the non-saturating samples too much.
-    return 32768.f / input_level;
-  }
-
-  // Knee and limiter regions; find the linear piece index. Spelling
-  // out the complete type was the only way to silence both the clang
-  // plugin and the windows compilers.
-  std::array<float, kInterpolatedGainCurveTotalPoints>::const_iterator it =
-      std::lower_bound(approximation_params_x_.begin(),
-                       approximation_params_x_.end(), input_level);
-  const size_t index = std::distance(approximation_params_x_.begin(), it) - 1;
-  RTC_DCHECK_LE(0, index);
-  RTC_DCHECK_LT(index, approximation_params_m_.size());
-  RTC_DCHECK_LE(approximation_params_x_[index], input_level);
-  if (index < approximation_params_m_.size() - 1) {
-    RTC_DCHECK_LE(input_level, approximation_params_x_[index + 1]);
-  }
-
-  // Piece-wise linear interploation.
-  const float gain = approximation_params_m_[index] * input_level +
-                     approximation_params_q_[index];
-  RTC_DCHECK_LE(0.f, gain);
-  return gain;
-}
-
-}  // namespace webrtc
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/agc2/interpolated_gain_curve.h b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/agc2/interpolated_gain_curve.h
deleted file mode 100644
index 68d4532238..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/agc2/interpolated_gain_curve.h
+++ /dev/null
@@ -1,153 +0,0 @@
-/*
- *  Copyright (c) 2018 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#ifndef MODULES_AUDIO_PROCESSING_AGC2_INTERPOLATED_GAIN_CURVE_H_
-#define MODULES_AUDIO_PROCESSING_AGC2_INTERPOLATED_GAIN_CURVE_H_
-
-#include <array>
-#include <string>
-
-#include "modules/audio_processing/agc2/agc2_common.h"
-
-#include "rtc_base/constructormagic.h"
-#include "rtc_base/gtest_prod_util.h"
-#include "system_wrappers/include/metrics.h"
-
-namespace webrtc {
-
-class ApmDataDumper;
-
-constexpr float kInputLevelScalingFactor = 32768.0f;
-
-// Defined as DbfsToLinear(kLimiterMaxInputLevelDbFs)
-constexpr float kMaxInputLevelLinear = static_cast<float>(36766.300710566735);
-
-// Interpolated gain curve using under-approximation to avoid saturation.
-//
-// The goal of this class is allowing fast look ups to get an accurate
-// estimates of the gain to apply given an estimated input level.
-class InterpolatedGainCurve {
- public:
-  enum class GainCurveRegion {
-    kIdentity = 0,
-    kKnee = 1,
-    kLimiter = 2,
-    kSaturation = 3
-  };
-
-  struct Stats {
-    // Region in which the output level equals the input one.
-    size_t look_ups_identity_region = 0;
-    // Smoothing between the identity and the limiter regions.
-    size_t look_ups_knee_region = 0;
-    // Limiter region in which the output and input levels are linearly related.
-    size_t look_ups_limiter_region = 0;
-    // Region in which saturation may occur since the input level is beyond the
-    // maximum expected by the limiter.
-    size_t look_ups_saturation_region = 0;
-    // True if stats have been populated.
-    bool available = false;
-
-    // The current region, and for how many frames the level has been
-    // in that region.
-    GainCurveRegion region = GainCurveRegion::kIdentity;
-    int64_t region_duration_frames = 0;
-  };
-
-  InterpolatedGainCurve(ApmDataDumper* apm_data_dumper,
-                        std::string histogram_name_prefix);
-  ~InterpolatedGainCurve();
-
-  Stats get_stats() const { return stats_; }
-
-  // Given a non-negative input level (linear scale), a scalar factor to apply
-  // to a sub-frame is returned.
-  // Levels above kLimiterMaxInputLevelDbFs will be reduced to 0 dBFS
-  // after applying this gain
-  float LookUpGainToApply(float input_level) const;
-
- private:
-  // For comparing 'approximation_params_*_' with ones computed by
-  // ComputeInterpolatedGainCurve.
-  FRIEND_TEST_ALL_PREFIXES(AutomaticGainController2InterpolatedGainCurve,
-                           CheckApproximationParams);
-
-  struct RegionLogger {
-    metrics::Histogram* identity_histogram;
-    metrics::Histogram* knee_histogram;
-    metrics::Histogram* limiter_histogram;
-    metrics::Histogram* saturation_histogram;
-
-    RegionLogger(std::string identity_histogram_name,
-                 std::string knee_histogram_name,
-                 std::string limiter_histogram_name,
-                 std::string saturation_histogram_name);
-
-    ~RegionLogger();
-
-    void LogRegionStats(const InterpolatedGainCurve::Stats& stats) const;
-  } region_logger_;
-
-  void UpdateStats(float input_level) const;
-
-  ApmDataDumper* const apm_data_dumper_;
-
-  static constexpr std::array<float, kInterpolatedGainCurveTotalPoints>
-      approximation_params_x_ = {
-          {30057.296875,    30148.986328125, 30240.67578125,  30424.052734375,
-           30607.4296875,   30790.806640625, 30974.18359375,  31157.560546875,
-           31340.939453125, 31524.31640625,  31707.693359375, 31891.0703125,
-           32074.447265625, 32257.82421875,  32441.201171875, 32624.580078125,
-           32807.95703125,  32991.33203125,  33174.7109375,   33358.08984375,
-           33541.46484375,  33724.84375,     33819.53515625,  34009.5390625,
-           34200.05859375,  34389.81640625,  34674.48828125,  35054.375,
-           35434.86328125,  35814.81640625,  36195.16796875,  36575.03125}};
-  static constexpr std::array<float, kInterpolatedGainCurveTotalPoints>
-      approximation_params_m_ = {
-          {-3.515235675877192989e-07, -1.050251626111275982e-06,
-           -2.085213736791047268e-06, -3.443004743530764244e-06,
-           -4.773849468620028347e-06, -6.077375928725814447e-06,
-           -7.353257842623861507e-06, -8.601219633419532329e-06,
-           -9.821013009059242904e-06, -1.101243378798244521e-05,
-           -1.217532644659513608e-05, -1.330956911260727793e-05,
-           -1.441507538402220234e-05, -1.549179251014720649e-05,
-           -1.653970684856176376e-05, -1.755882840370759368e-05,
-           -1.854918446042574942e-05, -1.951086778717581183e-05,
-           -2.044398024736437947e-05, -2.1348627342376858e-05,
-           -2.222496914328075945e-05, -2.265374678245279938e-05,
-           -2.242570917587727308e-05, -2.220122041762806475e-05,
-           -2.19802095671184361e-05,  -2.176260204578284174e-05,
-           -2.133731686626560986e-05, -2.092481918225530535e-05,
-           -2.052459603874012828e-05, -2.013615448959171772e-05,
-           -1.975903069251216948e-05, -1.939277899509761482e-05}};
-
-  static constexpr std::array<float, kInterpolatedGainCurveTotalPoints>
-      approximation_params_q_ = {
-          {1.010565876960754395, 1.031631827354431152, 1.062929749488830566,
-           1.104239225387573242, 1.144973039627075195, 1.185109615325927734,
-           1.224629044532775879, 1.263512492179870605, 1.301741957664489746,
-           1.339300632476806641, 1.376173257827758789, 1.412345528602600098,
-           1.447803974151611328, 1.482536554336547852, 1.516532182693481445,
-           1.549780607223510742, 1.582272171974182129, 1.613999366760253906,
-           1.644955039024353027, 1.675132393836975098, 1.704526185989379883,
-           1.718986630439758301, 1.711274504661560059, 1.703639745712280273,
-           1.696081161499023438, 1.688597679138183594, 1.673851132392883301,
-           1.659391283988952637, 1.645209431648254395, 1.631297469139099121,
-           1.617647409439086914, 1.604251742362976074}};
-
-  // Stats.
-  mutable Stats stats_;
-
-  RTC_DISALLOW_COPY_AND_ASSIGN(InterpolatedGainCurve);
-};
-
-}  // namespace webrtc
-
-#endif  // MODULES_AUDIO_PROCESSING_AGC2_INTERPOLATED_GAIN_CURVE_H_
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/agc2/limiter.cc b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/agc2/limiter.cc
deleted file mode 100644
index 1589f07404..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/agc2/limiter.cc
+++ /dev/null
@@ -1,150 +0,0 @@
-/*
- *  Copyright (c) 2018 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#include "modules/audio_processing/agc2/limiter.h"
-
-#include <algorithm>
-#include <array>
-#include <cmath>
-
-#include "api/array_view.h"
-#include "modules/audio_processing/agc2/agc2_common.h"
-#include "modules/audio_processing/logging/apm_data_dumper.h"
-#include "rtc_base/checks.h"
-#include "rtc_base/numerics/safe_minmax.h"
-
-namespace webrtc {
-namespace {
-
-// This constant affects the way scaling factors are interpolated for the first
-// sub-frame of a frame. Only in the case in which the first sub-frame has an
-// estimated level which is greater than the that of the previous analyzed
-// sub-frame, linear interpolation is replaced with a power function which
-// reduces the chances of over-shooting (and hence saturation), however reducing
-// the fixed gain effectiveness.
-constexpr float kAttackFirstSubframeInterpolationPower = 8.f;
-
-void InterpolateFirstSubframe(float last_factor,
-                              float current_factor,
-                              rtc::ArrayView<float> subframe) {
-  const auto n = subframe.size();
-  constexpr auto p = kAttackFirstSubframeInterpolationPower;
-  for (size_t i = 0; i < n; ++i) {
-    subframe[i] = std::pow(1.f - i / n, p) * (last_factor - current_factor) +
-                  current_factor;
-  }
-}
-
-void ComputePerSampleSubframeFactors(
-    const std::array<float, kSubFramesInFrame + 1>& scaling_factors,
-    size_t samples_per_channel,
-    rtc::ArrayView<float> per_sample_scaling_factors) {
-  const size_t num_subframes = scaling_factors.size() - 1;
-  const size_t subframe_size =
-      rtc::CheckedDivExact(samples_per_channel, num_subframes);
-
-  // Handle first sub-frame differently in case of attack.
-  const bool is_attack = scaling_factors[0] > scaling_factors[1];
-  if (is_attack) {
-    InterpolateFirstSubframe(
-        scaling_factors[0], scaling_factors[1],
-        rtc::ArrayView<float>(
-            per_sample_scaling_factors.subview(0, subframe_size)));
-  }
-
-  for (size_t i = is_attack ? 1 : 0; i < num_subframes; ++i) {
-    const size_t subframe_start = i * subframe_size;
-    const float scaling_start = scaling_factors[i];
-    const float scaling_end = scaling_factors[i + 1];
-    const float scaling_diff = (scaling_end - scaling_start) / subframe_size;
-    for (size_t j = 0; j < subframe_size; ++j) {
-      per_sample_scaling_factors[subframe_start + j] =
-          scaling_start + scaling_diff * j;
-    }
-  }
-}
-
-void ScaleSamples(rtc::ArrayView<const float> per_sample_scaling_factors,
-                  AudioFrameView<float> signal) {
-  const size_t samples_per_channel = signal.samples_per_channel();
-  RTC_DCHECK_EQ(samples_per_channel, per_sample_scaling_factors.size());
-  for (size_t i = 0; i < signal.num_channels(); ++i) {
-    auto channel = signal.channel(i);
-    for (size_t j = 0; j < samples_per_channel; ++j) {
-      channel[j] = rtc::SafeClamp(channel[j] * per_sample_scaling_factors[j],
-                                  kMinFloatS16Value, kMaxFloatS16Value);
-    }
-  }
-}
-
-void CheckLimiterSampleRate(size_t sample_rate_hz) {
-  // Check that per_sample_scaling_factors_ is large enough.
-  RTC_DCHECK_LE(sample_rate_hz,
-                kMaximalNumberOfSamplesPerChannel * 1000 / kFrameDurationMs);
-}
-
-}  // namespace
-
-Limiter::Limiter(size_t sample_rate_hz,
-                 ApmDataDumper* apm_data_dumper,
-                 std::string histogram_name)
-    : interp_gain_curve_(apm_data_dumper, histogram_name),
-      level_estimator_(sample_rate_hz, apm_data_dumper),
-      apm_data_dumper_(apm_data_dumper) {
-  CheckLimiterSampleRate(sample_rate_hz);
-}
-
-Limiter::~Limiter() = default;
-
-void Limiter::Process(AudioFrameView<float> signal) {
-  const auto level_estimate = level_estimator_.ComputeLevel(signal);
-
-  RTC_DCHECK_EQ(level_estimate.size() + 1, scaling_factors_.size());
-  scaling_factors_[0] = last_scaling_factor_;
-  std::transform(level_estimate.begin(), level_estimate.end(),
-                 scaling_factors_.begin() + 1, [this](float x) {
-                   return interp_gain_curve_.LookUpGainToApply(x);
-                 });
-
-  const size_t samples_per_channel = signal.samples_per_channel();
-  RTC_DCHECK_LE(samples_per_channel, kMaximalNumberOfSamplesPerChannel);
-
-  auto per_sample_scaling_factors = rtc::ArrayView<float>(
-      &per_sample_scaling_factors_[0], samples_per_channel);
-  ComputePerSampleSubframeFactors(scaling_factors_, samples_per_channel,
-                                  per_sample_scaling_factors);
-  ScaleSamples(per_sample_scaling_factors, signal);
-
-  last_scaling_factor_ = scaling_factors_.back();
-
-  // Dump data for debug.
-  apm_data_dumper_->DumpRaw("agc2_gain_curve_applier_scaling_factors",
-                            samples_per_channel,
-                            per_sample_scaling_factors_.data());
-}
-
-InterpolatedGainCurve::Stats Limiter::GetGainCurveStats() const {
-  return interp_gain_curve_.get_stats();
-}
-
-void Limiter::SetSampleRate(size_t sample_rate_hz) {
-  CheckLimiterSampleRate(sample_rate_hz);
-  level_estimator_.SetSampleRate(sample_rate_hz);
-}
-
-void Limiter::Reset() {
-  level_estimator_.Reset();
-}
-
-float Limiter::LastAudioLevel() const {
-  return level_estimator_.LastAudioLevel();
-}
-
-}  // namespace webrtc
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/agc2/limiter.h b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/agc2/limiter.h
deleted file mode 100644
index 1e0ab71a18..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/agc2/limiter.h
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- *  Copyright (c) 2018 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#ifndef MODULES_AUDIO_PROCESSING_AGC2_LIMITER_H_
-#define MODULES_AUDIO_PROCESSING_AGC2_LIMITER_H_
-
-#include <string>
-#include <vector>
-
-#include "modules/audio_processing/agc2/fixed_digital_level_estimator.h"
-#include "modules/audio_processing/agc2/interpolated_gain_curve.h"
-#include "modules/audio_processing/include/audio_frame_view.h"
-#include "rtc_base/constructormagic.h"
-
-namespace webrtc {
-class ApmDataDumper;
-
-class Limiter {
- public:
-  Limiter(size_t sample_rate_hz,
-          ApmDataDumper* apm_data_dumper,
-          std::string histogram_name_prefix);
-  Limiter(const Limiter& limiter) = delete;
-  Limiter& operator=(const Limiter& limiter) = delete;
-  ~Limiter();
-
-  // Applies limiter and hard-clipping to |signal|.
-  void Process(AudioFrameView<float> signal);
-  InterpolatedGainCurve::Stats GetGainCurveStats() const;
-
-  // Supported rates must be
-  // * supported by FixedDigitalLevelEstimator
-  // * below kMaximalNumberOfSamplesPerChannel*1000/kFrameDurationMs
-  //   so that samples_per_channel fit in the
-  //   per_sample_scaling_factors_ array.
-  void SetSampleRate(size_t sample_rate_hz);
-
-  // Resets the internal state.
-  void Reset();
-
-  float LastAudioLevel() const;
-
- private:
-  const InterpolatedGainCurve interp_gain_curve_;
-  FixedDigitalLevelEstimator level_estimator_;
-  ApmDataDumper* const apm_data_dumper_ = nullptr;
-
-  // Work array containing the sub-frame scaling factors to be interpolated.
-  std::array<float, kSubFramesInFrame + 1> scaling_factors_ = {};
-  std::array<float, kMaximalNumberOfSamplesPerChannel>
-      per_sample_scaling_factors_ = {};
-  float last_scaling_factor_ = 1.f;
-};
-
-}  // namespace webrtc
-
-#endif  // MODULES_AUDIO_PROCESSING_AGC2_LIMITER_H_
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/agc2/limiter_db_gain_curve.cc b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/agc2/limiter_db_gain_curve.cc
deleted file mode 100644
index d55ed5df58..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/agc2/limiter_db_gain_curve.cc
+++ /dev/null
@@ -1,138 +0,0 @@
-/*
- *  Copyright (c) 2018 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#include "modules/audio_processing/agc2/limiter_db_gain_curve.h"
-
-#include <cmath>
-
-#include "common_audio/include/audio_util.h"
-#include "modules/audio_processing/agc2/agc2_common.h"
-#include "rtc_base/checks.h"
-
-namespace webrtc {
-namespace {
-
-double ComputeKneeStart(double max_input_level_db,
-                        double knee_smoothness_db,
-                        double compression_ratio) {
-  RTC_CHECK_LT((compression_ratio - 1.0) * knee_smoothness_db /
-                   (2.0 * compression_ratio),
-               max_input_level_db);
-  return -knee_smoothness_db / 2.0 -
-         max_input_level_db / (compression_ratio - 1.0);
-}
-
-std::array<double, 3> ComputeKneeRegionPolynomial(double knee_start_dbfs,
-                                                  double knee_smoothness_db,
-                                                  double compression_ratio) {
-  const double a = (1.0 - compression_ratio) /
-                   (2.0 * knee_smoothness_db * compression_ratio);
-  const double b = 1.0 - 2.0 * a * knee_start_dbfs;
-  const double c = a * knee_start_dbfs * knee_start_dbfs;
-  return {{a, b, c}};
-}
-
-double ComputeLimiterD1(double max_input_level_db, double compression_ratio) {
-  return (std::pow(10.0, -max_input_level_db / (20.0 * compression_ratio)) *
-          (1.0 - compression_ratio) / compression_ratio) /
-         kMaxAbsFloatS16Value;
-}
-
-constexpr double ComputeLimiterD2(double compression_ratio) {
-  return (1.0 - 2.0 * compression_ratio) / compression_ratio;
-}
-
-double ComputeLimiterI2(double max_input_level_db,
-                        double compression_ratio,
-                        double gain_curve_limiter_i1) {
-  RTC_CHECK_NE(gain_curve_limiter_i1, 0.f);
-  return std::pow(10.0, -max_input_level_db / (20.0 * compression_ratio)) /
-         gain_curve_limiter_i1 /
-         std::pow(kMaxAbsFloatS16Value, gain_curve_limiter_i1 - 1);
-}
-
-}  // namespace
-
-LimiterDbGainCurve::LimiterDbGainCurve()
-    : max_input_level_linear_(DbfsToFloatS16(max_input_level_db_)),
-      knee_start_dbfs_(ComputeKneeStart(max_input_level_db_,
-                                        knee_smoothness_db_,
-                                        compression_ratio_)),
-      knee_start_linear_(DbfsToFloatS16(knee_start_dbfs_)),
-      limiter_start_dbfs_(knee_start_dbfs_ + knee_smoothness_db_),
-      limiter_start_linear_(DbfsToFloatS16(limiter_start_dbfs_)),
-      knee_region_polynomial_(ComputeKneeRegionPolynomial(knee_start_dbfs_,
-                                                          knee_smoothness_db_,
-                                                          compression_ratio_)),
-      gain_curve_limiter_d1_(
-          ComputeLimiterD1(max_input_level_db_, compression_ratio_)),
-      gain_curve_limiter_d2_(ComputeLimiterD2(compression_ratio_)),
-      gain_curve_limiter_i1_(1.0 / compression_ratio_),
-      gain_curve_limiter_i2_(ComputeLimiterI2(max_input_level_db_,
-                                              compression_ratio_,
-                                              gain_curve_limiter_i1_)) {
-  static_assert(knee_smoothness_db_ > 0.0f, "");
-  static_assert(compression_ratio_ > 1.0f, "");
-  RTC_CHECK_GE(max_input_level_db_, knee_start_dbfs_ + knee_smoothness_db_);
-}
-
-constexpr double LimiterDbGainCurve::max_input_level_db_;
-constexpr double LimiterDbGainCurve::knee_smoothness_db_;
-constexpr double LimiterDbGainCurve::compression_ratio_;
-
-double LimiterDbGainCurve::GetOutputLevelDbfs(double input_level_dbfs) const {
-  if (input_level_dbfs < knee_start_dbfs_) {
-    return input_level_dbfs;
-  } else if (input_level_dbfs < limiter_start_dbfs_) {
-    return GetKneeRegionOutputLevelDbfs(input_level_dbfs);
-  }
-  return GetCompressorRegionOutputLevelDbfs(input_level_dbfs);
-}
-
-double LimiterDbGainCurve::GetGainLinear(double input_level_linear) const {
-  if (input_level_linear < knee_start_linear_) {
-    return 1.0;
-  }
-  return DbfsToFloatS16(
-             GetOutputLevelDbfs(FloatS16ToDbfs(input_level_linear))) /
-         input_level_linear;
-}
-
-// Computes the first derivative of GetGainLinear() in |x|.
-double LimiterDbGainCurve::GetGainFirstDerivativeLinear(double x) const {
-  // Beyond-knee region only.
-  RTC_CHECK_GE(x, limiter_start_linear_ - 1e-7 * kMaxAbsFloatS16Value);
-  return gain_curve_limiter_d1_ *
-         std::pow(x / kMaxAbsFloatS16Value, gain_curve_limiter_d2_);
-}
-
-// Computes the integral of GetGainLinear() in the range [x0, x1].
-double LimiterDbGainCurve::GetGainIntegralLinear(double x0, double x1) const {
-  RTC_CHECK_LE(x0, x1);                     // Valid interval.
-  RTC_CHECK_GE(x0, limiter_start_linear_);  // Beyond-knee region only.
-  auto limiter_integral = [this](const double& x) {
-    return gain_curve_limiter_i2_ * std::pow(x, gain_curve_limiter_i1_);
-  };
-  return limiter_integral(x1) - limiter_integral(x0);
-}
-
-double LimiterDbGainCurve::GetKneeRegionOutputLevelDbfs(
-    double input_level_dbfs) const {
-  return knee_region_polynomial_[0] * input_level_dbfs * input_level_dbfs +
-         knee_region_polynomial_[1] * input_level_dbfs +
-         knee_region_polynomial_[2];
-}
-
-double LimiterDbGainCurve::GetCompressorRegionOutputLevelDbfs(
-    double input_level_dbfs) const {
-  return (input_level_dbfs - max_input_level_db_) / compression_ratio_;
-}
-
-}  // namespace webrtc
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/agc2/limiter_db_gain_curve.h b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/agc2/limiter_db_gain_curve.h
deleted file mode 100644
index 9086e26739..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/agc2/limiter_db_gain_curve.h
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- *  Copyright (c) 2018 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#ifndef MODULES_AUDIO_PROCESSING_AGC2_LIMITER_DB_GAIN_CURVE_H_
-#define MODULES_AUDIO_PROCESSING_AGC2_LIMITER_DB_GAIN_CURVE_H_
-
-#include <array>
-
-#include "modules/audio_processing/agc2/agc2_testing_common.h"
-
-namespace webrtc {
-
-// A class for computing a limiter gain curve (in dB scale) given a set of
-// hard-coded parameters (namely, kLimiterDbGainCurveMaxInputLevelDbFs,
-// kLimiterDbGainCurveKneeSmoothnessDb, and
-// kLimiterDbGainCurveCompressionRatio). The generated curve consists of four
-// regions: identity (linear), knee (quadratic polynomial), compression
-// (linear), saturation (linear). The aforementioned constants are used to shape
-// the different regions.
-class LimiterDbGainCurve {
- public:
-  LimiterDbGainCurve();
-
-  double max_input_level_db() const { return max_input_level_db_; }
-  double max_input_level_linear() const { return max_input_level_linear_; }
-  double knee_start_linear() const { return knee_start_linear_; }
-  double limiter_start_linear() const { return limiter_start_linear_; }
-
-  // These methods can be marked 'constexpr' in C++ 14.
-  double GetOutputLevelDbfs(double input_level_dbfs) const;
-  double GetGainLinear(double input_level_linear) const;
-  double GetGainFirstDerivativeLinear(double x) const;
-  double GetGainIntegralLinear(double x0, double x1) const;
-
- private:
-  double GetKneeRegionOutputLevelDbfs(double input_level_dbfs) const;
-  double GetCompressorRegionOutputLevelDbfs(double input_level_dbfs) const;
-
-  static constexpr double max_input_level_db_ = test::kLimiterMaxInputLevelDbFs;
-  static constexpr double knee_smoothness_db_ = test::kLimiterKneeSmoothnessDb;
-  static constexpr double compression_ratio_ = test::kLimiterCompressionRatio;
-
-  const double max_input_level_linear_;
-
-  // Do not modify signal with level <= knee_start_dbfs_.
-  const double knee_start_dbfs_;
-  const double knee_start_linear_;
-
-  // The upper end of the knee region, which is between knee_start_dbfs_ and
-  // limiter_start_dbfs_.
-  const double limiter_start_dbfs_;
-  const double limiter_start_linear_;
-
-  // Coefficients {a, b, c} of the knee region polynomial
-  // ax^2 + bx + c in the DB scale.
-  const std::array<double, 3> knee_region_polynomial_;
-
-  // Parameters for the computation of the first derivative of GetGainLinear().
-  const double gain_curve_limiter_d1_;
-  const double gain_curve_limiter_d2_;
-
-  // Parameters for the computation of the integral of GetGainLinear().
-  const double gain_curve_limiter_i1_;
-  const double gain_curve_limiter_i2_;
-};
-
-}  // namespace webrtc
-
-#endif  // MODULES_AUDIO_PROCESSING_AGC2_LIMITER_DB_GAIN_CURVE_H_
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/agc2/noise_level_estimator.cc b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/agc2/noise_level_estimator.cc
deleted file mode 100644
index 6e43672ce0..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/agc2/noise_level_estimator.cc
+++ /dev/null
@@ -1,113 +0,0 @@
-/*
- *  Copyright (c) 2016 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#include "modules/audio_processing/agc2/noise_level_estimator.h"
-
-#include <stddef.h>
-#include <algorithm>
-#include <cmath>
-#include <numeric>
-
-#include "api/array_view.h"
-#include "common_audio/include/audio_util.h"
-#include "modules/audio_processing/logging/apm_data_dumper.h"
-#include "rtc_base/checks.h"
-
-namespace webrtc {
-
-namespace {
-constexpr int kFramesPerSecond = 100;
-
-float FrameEnergy(const AudioFrameView<const float>& audio) {
-  float energy = 0.f;
-  for (size_t k = 0; k < audio.num_channels(); ++k) {
-    float channel_energy =
-        std::accumulate(audio.channel(k).begin(), audio.channel(k).end(), 0.f,
-                        [](float a, float b) -> float { return a + b * b; });
-    energy = std::max(channel_energy, energy);
-  }
-  return energy;
-}
-
-float EnergyToDbfs(float signal_energy, size_t num_samples) {
-  const float rms = std::sqrt(signal_energy / num_samples);
-  return FloatS16ToDbfs(rms);
-}
-}  // namespace
-
-NoiseLevelEstimator::NoiseLevelEstimator(ApmDataDumper* data_dumper)
-    : signal_classifier_(data_dumper) {
-  Initialize(48000);
-}
-
-NoiseLevelEstimator::~NoiseLevelEstimator() {}
-
-void NoiseLevelEstimator::Initialize(int sample_rate_hz) {
-  sample_rate_hz_ = sample_rate_hz;
-  noise_energy_ = 1.f;
-  first_update_ = true;
-  min_noise_energy_ = sample_rate_hz * 2.f * 2.f / kFramesPerSecond;
-  noise_energy_hold_counter_ = 0;
-  signal_classifier_.Initialize(sample_rate_hz);
-}
-
-float NoiseLevelEstimator::Analyze(const AudioFrameView<const float>& frame) {
-  const int rate =
-      static_cast<int>(frame.samples_per_channel() * kFramesPerSecond);
-  if (rate != sample_rate_hz_) {
-    Initialize(rate);
-  }
-  const float frame_energy = FrameEnergy(frame);
-  if (frame_energy <= 0.f) {
-    RTC_DCHECK_GE(frame_energy, 0.f);
-    return EnergyToDbfs(noise_energy_, frame.samples_per_channel());
-  }
-
-  if (first_update_) {
-    // Initialize the noise energy to the frame energy.
-    first_update_ = false;
-    return EnergyToDbfs(
-        noise_energy_ = std::max(frame_energy, min_noise_energy_),
-        frame.samples_per_channel());
-  }
-
-  const SignalClassifier::SignalType signal_type =
-      signal_classifier_.Analyze(frame.channel(0));
-
-  // Update the noise estimate in a minimum statistics-type manner.
-  if (signal_type == SignalClassifier::SignalType::kStationary) {
-    if (frame_energy > noise_energy_) {
-      // Leak the estimate upwards towards the frame energy if no recent
-      // downward update.
-      noise_energy_hold_counter_ = std::max(noise_energy_hold_counter_ - 1, 0);
-
-      if (noise_energy_hold_counter_ == 0) {
-        noise_energy_ = std::min(noise_energy_ * 1.01f, frame_energy);
-      }
-    } else {
-      // Update smoothly downwards with a limited maximum update magnitude.
-      noise_energy_ =
-          std::max(noise_energy_ * 0.9f,
-                   noise_energy_ + 0.05f * (frame_energy - noise_energy_));
-      noise_energy_hold_counter_ = 1000;
-    }
-  } else {
-    // For a non-stationary signal, leak the estimate downwards in order to
-    // avoid estimate locking due to incorrect signal classification.
-    noise_energy_ = noise_energy_ * 0.99f;
-  }
-
-  // Ensure a minimum of the estimate.
-  return EnergyToDbfs(
-      noise_energy_ = std::max(noise_energy_, min_noise_energy_),
-      frame.samples_per_channel());
-}
-
-}  // namespace webrtc
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/agc2/noise_level_estimator.h b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/agc2/noise_level_estimator.h
deleted file mode 100644
index 24067a1665..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/agc2/noise_level_estimator.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- *  Copyright (c) 2016 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#ifndef MODULES_AUDIO_PROCESSING_AGC2_NOISE_LEVEL_ESTIMATOR_H_
-#define MODULES_AUDIO_PROCESSING_AGC2_NOISE_LEVEL_ESTIMATOR_H_
-
-#include "modules/audio_processing/agc2/signal_classifier.h"
-#include "modules/audio_processing/include/audio_frame_view.h"
-#include "rtc_base/constructormagic.h"
-
-namespace webrtc {
-class ApmDataDumper;
-
-class NoiseLevelEstimator {
- public:
-  NoiseLevelEstimator(ApmDataDumper* data_dumper);
-  ~NoiseLevelEstimator();
-  // Returns the estimated noise level in dBFS.
-  float Analyze(const AudioFrameView<const float>& frame);
-
- private:
-  void Initialize(int sample_rate_hz);
-
-  int sample_rate_hz_;
-  float min_noise_energy_;
-  bool first_update_;
-  float noise_energy_;
-  int noise_energy_hold_counter_;
-  SignalClassifier signal_classifier_;
-
-  RTC_DISALLOW_COPY_AND_ASSIGN(NoiseLevelEstimator);
-};
-
-}  // namespace webrtc
-
-#endif  // MODULES_AUDIO_PROCESSING_AGC2_NOISE_LEVEL_ESTIMATOR_H_
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/agc2/noise_spectrum_estimator.cc b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/agc2/noise_spectrum_estimator.cc
deleted file mode 100644
index 5735faf3d2..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/agc2/noise_spectrum_estimator.cc
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- *  Copyright (c) 2016 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#include "modules/audio_processing/agc2/noise_spectrum_estimator.h"
-
-#include <string.h>
-#include <algorithm>
-
-#include "api/array_view.h"
-#include "modules/audio_processing/logging/apm_data_dumper.h"
-#include "rtc_base/arraysize.h"
-#include "rtc_base/checks.h"
-
-namespace webrtc {
-namespace {
-constexpr float kMinNoisePower = 100.f;
-}  // namespace
-
-NoiseSpectrumEstimator::NoiseSpectrumEstimator(ApmDataDumper* data_dumper)
-    : data_dumper_(data_dumper) {
-  Initialize();
-}
-
-void NoiseSpectrumEstimator::Initialize() {
-  std::fill(noise_spectrum_, noise_spectrum_ + arraysize(noise_spectrum_),
-            kMinNoisePower);
-}
-
-void NoiseSpectrumEstimator::Update(rtc::ArrayView<const float> spectrum,
-                                    bool first_update) {
-  RTC_DCHECK_EQ(65, spectrum.size());
-
-  if (first_update) {
-    // Initialize the noise spectral estimate with the signal spectrum.
-    std::copy(spectrum.data(), spectrum.data() + spectrum.size(),
-              noise_spectrum_);
-  } else {
-    // Smoothly update the noise spectral estimate towards the signal spectrum
-    // such that the magnitude of the updates are limited.
-    for (size_t k = 0; k < spectrum.size(); ++k) {
-      if (noise_spectrum_[k] < spectrum[k]) {
-        noise_spectrum_[k] = std::min(
-            1.01f * noise_spectrum_[k],
-            noise_spectrum_[k] + 0.05f * (spectrum[k] - noise_spectrum_[k]));
-      } else {
-        noise_spectrum_[k] = std::max(
-            0.99f * noise_spectrum_[k],
-            noise_spectrum_[k] + 0.05f * (spectrum[k] - noise_spectrum_[k]));
-      }
-    }
-  }
-
-  // Ensure that the noise spectal estimate does not become too low.
-  for (auto& v : noise_spectrum_) {
-    v = std::max(v, kMinNoisePower);
-  }
-
-  data_dumper_->DumpRaw("lc_noise_spectrum", 65, noise_spectrum_);
-  data_dumper_->DumpRaw("lc_signal_spectrum", spectrum);
-}
-
-}  // namespace webrtc
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/agc2/noise_spectrum_estimator.h b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/agc2/noise_spectrum_estimator.h
deleted file mode 100644
index fd1cc13a3f..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/agc2/noise_spectrum_estimator.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- *  Copyright (c) 2016 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#ifndef MODULES_AUDIO_PROCESSING_AGC2_NOISE_SPECTRUM_ESTIMATOR_H_
-#define MODULES_AUDIO_PROCESSING_AGC2_NOISE_SPECTRUM_ESTIMATOR_H_
-
-#include "api/array_view.h"
-#include "rtc_base/constructormagic.h"
-
-namespace webrtc {
-
-class ApmDataDumper;
-
-class NoiseSpectrumEstimator {
- public:
-  explicit NoiseSpectrumEstimator(ApmDataDumper* data_dumper);
-  void Initialize();
-  void Update(rtc::ArrayView<const float> spectrum, bool first_update);
-
-  rtc::ArrayView<const float> GetNoiseSpectrum() const {
-    return rtc::ArrayView<const float>(noise_spectrum_);
-  }
-
- private:
-  ApmDataDumper* data_dumper_;
-  float noise_spectrum_[65];
-
-  RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(NoiseSpectrumEstimator);
-};
-
-}  // namespace webrtc
-
-#endif  // MODULES_AUDIO_PROCESSING_AGC2_NOISE_SPECTRUM_ESTIMATOR_H_
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/agc2/rnn_vad/common.h b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/agc2/rnn_vad/common.h
deleted file mode 100644
index b98438db68..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/agc2/rnn_vad/common.h
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- *  Copyright (c) 2018 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#ifndef MODULES_AUDIO_PROCESSING_AGC2_RNN_VAD_COMMON_H_
-#define MODULES_AUDIO_PROCESSING_AGC2_RNN_VAD_COMMON_H_
-
-namespace webrtc {
-namespace rnn_vad {
-
-constexpr double kPi = 3.14159265358979323846;
-
-constexpr size_t kSampleRate24kHz = 24000;
-constexpr size_t kFrameSize10ms24kHz = kSampleRate24kHz / 100;
-constexpr size_t kFrameSize20ms24kHz = kFrameSize10ms24kHz * 2;
-
-// Pitch analysis params.
-constexpr size_t kMinPitch24kHz = kSampleRate24kHz / 800;   // 0.00125 s.
-constexpr size_t kMaxPitch24kHz = kSampleRate24kHz / 62.5;  // 0.016 s.
-constexpr size_t kBufSize24kHz = kMaxPitch24kHz + kFrameSize20ms24kHz;
-static_assert((kBufSize24kHz & 1) == 0, "The buffer size must be even.");
-
-// Define a higher minimum pitch period for the initial search. This is used to
-// avoid searching for very short periods, for which a refinement step is
-// responsible.
-constexpr size_t kInitialMinPitch24kHz = 3 * kMinPitch24kHz;
-static_assert(kMinPitch24kHz < kInitialMinPitch24kHz, "");
-static_assert(kInitialMinPitch24kHz < kMaxPitch24kHz, "");
-
-// 12 kHz analysis.
-constexpr size_t kSampleRate12kHz = 12000;
-constexpr size_t kFrameSize10ms12kHz = kSampleRate12kHz / 100;
-constexpr size_t kFrameSize20ms12kHz = kFrameSize10ms12kHz * 2;
-constexpr size_t kBufSize12kHz = kBufSize24kHz / 2;
-constexpr size_t kInitialMinPitch12kHz = kInitialMinPitch24kHz / 2;
-constexpr size_t kMaxPitch12kHz = kMaxPitch24kHz / 2;
-
-// 48 kHz constants.
-constexpr size_t kMinPitch48kHz = kMinPitch24kHz * 2;
-constexpr size_t kMaxPitch48kHz = kMaxPitch24kHz * 2;
-
-// Sub-band frequency boundaries.
-constexpr size_t kNumBands = 22;
-constexpr int kBandFrequencyBoundaries[kNumBands] = {
-    0,    200,  400,  600,  800,  1000, 1200, 1400, 1600,  2000,  2400,
-    2800, 3200, 4000, 4800, 5600, 6800, 8000, 9600, 12000, 15600, 20000};
-
-// Feature extraction parameters.
-constexpr size_t kNumLowerBands = 6;
-static_assert((0 < kNumLowerBands) && (kNumLowerBands < kNumBands), "");
-constexpr size_t kSpectralCoeffsHistorySize = 8;
-static_assert(kSpectralCoeffsHistorySize > 2,
-              "The history size must at least be 3 to compute first and second "
-              "derivatives.");
-
-constexpr size_t kFeatureVectorSize = 42;
-
-}  // namespace rnn_vad
-}  // namespace webrtc
-
-#endif  // MODULES_AUDIO_PROCESSING_AGC2_RNN_VAD_COMMON_H_
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/agc2/rnn_vad/features_extraction.cc b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/agc2/rnn_vad/features_extraction.cc
deleted file mode 100644
index 8f472a55ed..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/agc2/rnn_vad/features_extraction.cc
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
- *  Copyright (c) 2018 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#include "modules/audio_processing/agc2/rnn_vad/features_extraction.h"
-
-#include <array>
-
-#include "modules/audio_processing/agc2/rnn_vad/lp_residual.h"
-#include "rtc_base/checks.h"
-
-namespace webrtc {
-namespace rnn_vad {
-namespace {
-
-// Generated via "B, A = scipy.signal.butter(2, 30/12000, btype='highpass')"
-const BiQuadFilter::BiQuadCoefficients kHpfConfig24k = {
-    {0.99446179f, -1.98892358f, 0.99446179f},
-    {-1.98889291f, 0.98895425f}};
-
-}  // namespace
-
-FeaturesExtractor::FeaturesExtractor()
-    : use_high_pass_filter_(false),
-      pitch_buf_24kHz_(),
-      pitch_buf_24kHz_view_(pitch_buf_24kHz_.GetBufferView()),
-      lp_residual_(kBufSize24kHz),
-      lp_residual_view_(lp_residual_.data(), kBufSize24kHz),
-      pitch_estimator_(),
-      reference_frame_view_(pitch_buf_24kHz_.GetMostRecentValuesView()) {
-  RTC_DCHECK_EQ(kBufSize24kHz, lp_residual_.size());
-  hpf_.Initialize(kHpfConfig24k);
-  Reset();
-}
-
-FeaturesExtractor::~FeaturesExtractor() = default;
-
-void FeaturesExtractor::Reset() {
-  pitch_buf_24kHz_.Reset();
-  spectral_features_extractor_.Reset();
-  if (use_high_pass_filter_)
-    hpf_.Reset();
-}
-
-bool FeaturesExtractor::CheckSilenceComputeFeatures(
-    rtc::ArrayView<const float, kFrameSize10ms24kHz> samples,
-    rtc::ArrayView<float, kFeatureVectorSize> feature_vector) {
-  // Pre-processing.
-  if (use_high_pass_filter_) {
-    std::array<float, kFrameSize10ms24kHz> samples_filtered;
-    hpf_.Process(samples, samples_filtered);
-    // Feed buffer with the pre-processed version of |samples|.
-    pitch_buf_24kHz_.Push(samples_filtered);
-  } else {
-    // Feed buffer with |samples|.
-    pitch_buf_24kHz_.Push(samples);
-  }
-  // Extract the LP residual.
-  float lpc_coeffs[kNumLpcCoefficients];
-  ComputeAndPostProcessLpcCoefficients(pitch_buf_24kHz_view_, lpc_coeffs);
-  ComputeLpResidual(lpc_coeffs, pitch_buf_24kHz_view_, lp_residual_view_);
-  // Estimate pitch on the LP-residual and write the normalized pitch period
-  // into the output vector (normalization based on training data stats).
-  pitch_info_48kHz_ = pitch_estimator_.Estimate(lp_residual_view_);
-  feature_vector[kFeatureVectorSize - 2] =
-      0.01f * (static_cast<int>(pitch_info_48kHz_.period) - 300);
-  // Extract lagged frames (according to the estimated pitch period).
-  RTC_DCHECK_LE(pitch_info_48kHz_.period / 2, kMaxPitch24kHz);
-  auto lagged_frame = pitch_buf_24kHz_view_.subview(
-      kMaxPitch24kHz - pitch_info_48kHz_.period / 2, kFrameSize20ms24kHz);
-  // Analyze reference and lagged frames checking if silence has been detected
-  // and write the feature vector.
-  return spectral_features_extractor_.CheckSilenceComputeFeatures(
-      reference_frame_view_, {lagged_frame.data(), kFrameSize20ms24kHz},
-      {{feature_vector.data() + kNumLowerBands, kNumBands - kNumLowerBands},
-       {feature_vector.data(), kNumLowerBands},
-       {feature_vector.data() + kNumBands, kNumLowerBands},
-       {feature_vector.data() + kNumBands + kNumLowerBands, kNumLowerBands},
-       {feature_vector.data() + kNumBands + 2 * kNumLowerBands, kNumLowerBands},
-       &feature_vector[kFeatureVectorSize - 1]});
-}
-
-}  // namespace rnn_vad
-}  // namespace webrtc
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/agc2/rnn_vad/features_extraction.h b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/agc2/rnn_vad/features_extraction.h
deleted file mode 100644
index ce5cce1857..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/agc2/rnn_vad/features_extraction.h
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- *  Copyright (c) 2018 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#ifndef MODULES_AUDIO_PROCESSING_AGC2_RNN_VAD_FEATURES_EXTRACTION_H_
-#define MODULES_AUDIO_PROCESSING_AGC2_RNN_VAD_FEATURES_EXTRACTION_H_
-
-#include <vector>
-
-#include "api/array_view.h"
-#include "modules/audio_processing/agc2/biquad_filter.h"
-#include "modules/audio_processing/agc2/rnn_vad/common.h"
-#include "modules/audio_processing/agc2/rnn_vad/pitch_info.h"
-#include "modules/audio_processing/agc2/rnn_vad/pitch_search.h"
-#include "modules/audio_processing/agc2/rnn_vad/sequence_buffer.h"
-#include "modules/audio_processing/agc2/rnn_vad/spectral_features.h"
-
-namespace webrtc {
-namespace rnn_vad {
-
-// Feature extractor to feed the VAD RNN.
-class FeaturesExtractor {
- public:
-  FeaturesExtractor();
-  FeaturesExtractor(const FeaturesExtractor&) = delete;
-  FeaturesExtractor& operator=(const FeaturesExtractor&) = delete;
-  ~FeaturesExtractor();
-  void Reset();
-  // Analyzes the samples, computes the feature vector and returns true if
-  // silence is detected (false if not). When silence is detected,
-  // |feature_vector| is partially written and therefore must not be used to
-  // feed the VAD RNN.
-  bool CheckSilenceComputeFeatures(
-      rtc::ArrayView<const float, kFrameSize10ms24kHz> samples,
-      rtc::ArrayView<float, kFeatureVectorSize> feature_vector);
-
- private:
-  const bool use_high_pass_filter_;
-  // TODO(bugs.webrtc.org/7494): Remove HPF depending on how AGC2 is used in APM
-  // and on whether an HPF is already used as pre-processing step in APM.
-  BiQuadFilter hpf_;
-  SequenceBuffer<float, kBufSize24kHz, kFrameSize10ms24kHz, kFrameSize20ms24kHz>
-      pitch_buf_24kHz_;
-  rtc::ArrayView<const float, kBufSize24kHz> pitch_buf_24kHz_view_;
-  std::vector<float> lp_residual_;
-  rtc::ArrayView<float, kBufSize24kHz> lp_residual_view_;
-  PitchEstimator pitch_estimator_;
-  rtc::ArrayView<const float, kFrameSize20ms24kHz> reference_frame_view_;
-  SpectralFeaturesExtractor spectral_features_extractor_;
-  PitchInfo pitch_info_48kHz_;
-};
-
-}  // namespace rnn_vad
-}  // namespace webrtc
-
-#endif  // MODULES_AUDIO_PROCESSING_AGC2_RNN_VAD_FEATURES_EXTRACTION_H_
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/agc2/rnn_vad/fft_util.cc b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/agc2/rnn_vad/fft_util.cc
deleted file mode 100644
index a1c5dac477..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/agc2/rnn_vad/fft_util.cc
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- *  Copyright (c) 2018 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#include "modules/audio_processing/agc2/rnn_vad/fft_util.h"
-
-#include <stddef.h>
-#include <cmath>
-
-#include "rtc_base/checks.h"
-
-namespace webrtc {
-namespace rnn_vad {
-namespace {
-
-constexpr size_t kHalfFrameSize = kFrameSize20ms24kHz / 2;
-
-// Computes the first half of the Vorbis window.
-std::array<float, kHalfFrameSize> ComputeHalfVorbisWindow() {
-  std::array<float, kHalfFrameSize> half_window{};
-  for (size_t i = 0; i < kHalfFrameSize; ++i) {
-    half_window[i] =
-        std::sin(0.5 * kPi * std::sin(0.5 * kPi * (i + 0.5) / kHalfFrameSize) *
-                 std::sin(0.5 * kPi * (i + 0.5) / kHalfFrameSize));
-  }
-  return half_window;
-}
-
-}  // namespace
-
-BandAnalysisFft::BandAnalysisFft()
-    : half_window_(ComputeHalfVorbisWindow()),
-      fft_(static_cast<int>(input_buf_.size())) {}
-
-BandAnalysisFft::~BandAnalysisFft() = default;
-
-void BandAnalysisFft::ForwardFft(rtc::ArrayView<const float> samples,
-                                 rtc::ArrayView<std::complex<float>> dst) {
-  RTC_DCHECK_EQ(input_buf_.size(), samples.size());
-  RTC_DCHECK_EQ(samples.size(), dst.size());
-  // Apply windowing.
-  RTC_DCHECK_EQ(input_buf_.size(), 2 * half_window_.size());
-  for (size_t i = 0; i < input_buf_.size() / 2; ++i) {
-    input_buf_[i].real(samples[i] * half_window_[i]);
-    size_t j = kFrameSize20ms24kHz - i - 1;
-    input_buf_[j].real(samples[j] * half_window_[i]);
-  }
-  fft_.ForwardFft(kFrameSize20ms24kHz, input_buf_.data(), kFrameSize20ms24kHz,
-                  dst.data());
-}
-
-}  // namespace rnn_vad
-}  // namespace webrtc
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/agc2/rnn_vad/fft_util.h b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/agc2/rnn_vad/fft_util.h
deleted file mode 100644
index f4265f4e32..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/agc2/rnn_vad/fft_util.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- *  Copyright (c) 2018 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#ifndef MODULES_AUDIO_PROCESSING_AGC2_RNN_VAD_FFT_UTIL_H_
-#define MODULES_AUDIO_PROCESSING_AGC2_RNN_VAD_FFT_UTIL_H_
-
-#include <array>
-#include <complex>
-
-#include "api/array_view.h"
-#include "modules/audio_processing/agc2/rnn_vad/common.h"
-#include "third_party/rnnoise/src/kiss_fft.h"
-
-namespace webrtc {
-namespace rnn_vad {
-
-// FFT implementation wrapper for the band-wise analysis step in which 20 ms
-// frames at 24 kHz are analyzed in the frequency domain. The goal of this class
-// are (i) making easy to switch to another FFT implementation, (ii) own the
-// input buffer for the FFT and (iii) apply a windowing function before
-// computing the FFT.
-class BandAnalysisFft {
- public:
-  BandAnalysisFft();
-  BandAnalysisFft(const BandAnalysisFft&) = delete;
-  BandAnalysisFft& operator=(const BandAnalysisFft&) = delete;
-  ~BandAnalysisFft();
-  // Applies a windowing function to |samples|, computes the real forward FFT
-  // and writes the result in |dst|.
-  void ForwardFft(rtc::ArrayView<const float> samples,
-                  rtc::ArrayView<std::complex<float>> dst);
-
- private:
-  static_assert((kFrameSize20ms24kHz & 1) == 0,
-                "kFrameSize20ms24kHz must be even.");
-  const std::array<float, kFrameSize20ms24kHz / 2> half_window_;
-  std::array<std::complex<float>, kFrameSize20ms24kHz> input_buf_{};
-  rnnoise::KissFft fft_;
-};
-
-}  // namespace rnn_vad
-}  // namespace webrtc
-
-#endif  // MODULES_AUDIO_PROCESSING_AGC2_RNN_VAD_FFT_UTIL_H_
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/agc2/rnn_vad/lp_residual.cc b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/agc2/rnn_vad/lp_residual.cc
deleted file mode 100644
index c9c4b65329..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/agc2/rnn_vad/lp_residual.cc
+++ /dev/null
@@ -1,138 +0,0 @@
-/*
- *  Copyright (c) 2018 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#include "modules/audio_processing/agc2/rnn_vad/lp_residual.h"
-
-#include <algorithm>
-#include <array>
-#include <cmath>
-#include <numeric>
-
-#include "rtc_base/checks.h"
-
-namespace webrtc {
-namespace rnn_vad {
-namespace {
-
-// Computes cross-correlation coefficients between |x| and |y| and writes them
-// in |x_corr|. The lag values are in {0, ..., max_lag - 1}, where max_lag
-// equals the size of |x_corr|.
-// The |x| and |y| sub-arrays used to compute a cross-correlation coefficients
-// for a lag l have both size "size of |x| - l" - i.e., the longest sub-array is
-// used. |x| and |y| must have the same size.
-void ComputeCrossCorrelation(
-    rtc::ArrayView<const float> x,
-    rtc::ArrayView<const float> y,
-    rtc::ArrayView<float, kNumLpcCoefficients> x_corr) {
-  constexpr size_t max_lag = x_corr.size();
-  RTC_DCHECK_EQ(x.size(), y.size());
-  RTC_DCHECK_LT(max_lag, x.size());
-  for (size_t lag = 0; lag < max_lag; ++lag) {
-    x_corr[lag] =
-        std::inner_product(x.begin(), x.end() - lag, y.begin() + lag, 0.f);
-  }
-}
-
-// Applies denoising to the auto-correlation coefficients.
-void DenoiseAutoCorrelation(
-    rtc::ArrayView<float, kNumLpcCoefficients> auto_corr) {
-  // Assume -40 dB white noise floor.
-  auto_corr[0] *= 1.0001f;
-  for (size_t i = 1; i < kNumLpcCoefficients; ++i) {
-    auto_corr[i] -= auto_corr[i] * (0.008f * i) * (0.008f * i);
-  }
-}
-
-// Computes the initial inverse filter coefficients given the auto-correlation
-// coefficients of an input frame.
-void ComputeInitialInverseFilterCoefficients(
-    rtc::ArrayView<const float, kNumLpcCoefficients> auto_corr,
-    rtc::ArrayView<float, kNumLpcCoefficients - 1> lpc_coeffs) {
-  float error = auto_corr[0];
-  for (size_t i = 0; i < kNumLpcCoefficients - 1; ++i) {
-    float reflection_coeff = 0.f;
-    for (size_t j = 0; j < i; ++j) {
-      reflection_coeff += lpc_coeffs[j] * auto_corr[i - j];
-    }
-    reflection_coeff += auto_corr[i + 1];
-
-    // Avoid division by numbers close to zero.
-    constexpr float kMinErrorMagnitude = 1e-6f;
-    if (std::fabs(error) < kMinErrorMagnitude) {
-      error =static_cast<float>(copysign(kMinErrorMagnitude, error));
-    }
-
-    reflection_coeff /= -error;
-    // Update LPC coefficients and total error.
-    lpc_coeffs[i] = reflection_coeff;
-    for (size_t j = 0; j<(i + 1)>> 1; ++j) {
-      const float tmp1 = lpc_coeffs[j];
-      const float tmp2 = lpc_coeffs[i - 1 - j];
-      lpc_coeffs[j] = tmp1 + reflection_coeff * tmp2;
-      lpc_coeffs[i - 1 - j] = tmp2 + reflection_coeff * tmp1;
-    }
-    error -= reflection_coeff * reflection_coeff * error;
-    if (error < 0.001f * auto_corr[0]) {
-      break;
-    }
-  }
-}
-
-}  // namespace
-
-void ComputeAndPostProcessLpcCoefficients(
-    rtc::ArrayView<const float> x,
-    rtc::ArrayView<float, kNumLpcCoefficients> lpc_coeffs) {
-  std::array<float, kNumLpcCoefficients> auto_corr;
-  ComputeCrossCorrelation(x, x, {auto_corr.data(), auto_corr.size()});
-  if (auto_corr[0] == 0.f) {  // Empty frame.
-    std::fill(lpc_coeffs.begin(), lpc_coeffs.end(), 0);
-    return;
-  }
-  DenoiseAutoCorrelation({auto_corr.data(), auto_corr.size()});
-  std::array<float, kNumLpcCoefficients - 1> lpc_coeffs_pre{};
-  ComputeInitialInverseFilterCoefficients(auto_corr, lpc_coeffs_pre);
-  // LPC coefficients post-processing.
-  // TODO(bugs.webrtc.org/9076): Consider removing these steps.
-  float c1 = 1.f;
-  for (size_t i = 0; i < kNumLpcCoefficients - 1; ++i) {
-    c1 *= 0.9f;
-    lpc_coeffs_pre[i] *= c1;
-  }
-  const float c2 = 0.8f;
-  lpc_coeffs[0] = lpc_coeffs_pre[0] + c2;
-  lpc_coeffs[1] = lpc_coeffs_pre[1] + c2 * lpc_coeffs_pre[0];
-  lpc_coeffs[2] = lpc_coeffs_pre[2] + c2 * lpc_coeffs_pre[1];
-  lpc_coeffs[3] = lpc_coeffs_pre[3] + c2 * lpc_coeffs_pre[2];
-  lpc_coeffs[4] = c2 * lpc_coeffs_pre[3];
-}
-
-void ComputeLpResidual(
-    rtc::ArrayView<const float, kNumLpcCoefficients> lpc_coeffs,
-    rtc::ArrayView<const float> x,
-    rtc::ArrayView<float> y) {
-  RTC_DCHECK_LT(kNumLpcCoefficients, x.size());
-  RTC_DCHECK_EQ(x.size(), y.size());
-  std::array<float, kNumLpcCoefficients> input_chunk;
-  input_chunk.fill(0.f);
-  for (size_t i = 0; i < y.size(); ++i) {
-    const float sum = std::inner_product(input_chunk.begin(), input_chunk.end(),
-                                         lpc_coeffs.begin(), x[i]);
-    // Circular shift and add a new sample.
-    for (size_t j = kNumLpcCoefficients - 1; j > 0; --j)
-      input_chunk[j] = input_chunk[j - 1];
-    input_chunk[0] = x[i];
-    // Copy result.
-    y[i] = sum;
-  }
-}
-
-}  // namespace rnn_vad
-}  // namespace webrtc
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/agc2/rnn_vad/lp_residual.h b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/agc2/rnn_vad/lp_residual.h
deleted file mode 100644
index cddedca5d6..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/agc2/rnn_vad/lp_residual.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- *  Copyright (c) 2018 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#ifndef MODULES_AUDIO_PROCESSING_AGC2_RNN_VAD_LP_RESIDUAL_H_
-#define MODULES_AUDIO_PROCESSING_AGC2_RNN_VAD_LP_RESIDUAL_H_
-
-#include <stddef.h>
-
-#include "api/array_view.h"
-
-namespace webrtc {
-namespace rnn_vad {
-
-// LPC inverse filter length.
-constexpr size_t kNumLpcCoefficients = 5;
-
-// Given a frame |x|, computes a post-processed version of LPC coefficients
-// tailored for pitch estimation.
-void ComputeAndPostProcessLpcCoefficients(
-    rtc::ArrayView<const float> x,
-    rtc::ArrayView<float, kNumLpcCoefficients> lpc_coeffs);
-
-// Computes the LP residual for the input frame |x| and the LPC coefficients
-// |lpc_coeffs|. |y| and |x| can point to the same array for in-place
-// computation.
-void ComputeLpResidual(
-    rtc::ArrayView<const float, kNumLpcCoefficients> lpc_coeffs,
-    rtc::ArrayView<const float> x,
-    rtc::ArrayView<float> y);
-
-}  // namespace rnn_vad
-}  // namespace webrtc
-
-#endif  // MODULES_AUDIO_PROCESSING_AGC2_RNN_VAD_LP_RESIDUAL_H_
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/agc2/rnn_vad/pitch_info.h b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/agc2/rnn_vad/pitch_info.h
deleted file mode 100644
index f0998d1fad..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/agc2/rnn_vad/pitch_info.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- *  Copyright (c) 2018 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#ifndef MODULES_AUDIO_PROCESSING_AGC2_RNN_VAD_PITCH_INFO_H_
-#define MODULES_AUDIO_PROCESSING_AGC2_RNN_VAD_PITCH_INFO_H_
-
-namespace webrtc {
-namespace rnn_vad {
-
-// Stores pitch period and gain information. The pitch gain measures the
-// strength of the pitch (the higher, the stronger).
-struct PitchInfo {
-  PitchInfo() : period(0), gain(0.f) {}
-  PitchInfo(size_t p, float g) : period(p), gain(g) {}
-  size_t period;
-  float gain;
-};
-
-}  // namespace rnn_vad
-}  // namespace webrtc
-
-#endif  // MODULES_AUDIO_PROCESSING_AGC2_RNN_VAD_PITCH_INFO_H_
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/agc2/rnn_vad/pitch_search.cc b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/agc2/rnn_vad/pitch_search.cc
deleted file mode 100644
index aa0b751d28..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/agc2/rnn_vad/pitch_search.cc
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- *  Copyright (c) 2018 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#include "modules/audio_processing/agc2/rnn_vad/pitch_search.h"
-
-#include <array>
-#include <cstddef>
-
-#include "rtc_base/checks.h"
-
-namespace webrtc {
-namespace rnn_vad {
-
-PitchEstimator::PitchEstimator()
-    : fft_(RealFourier::Create(kAutoCorrelationFftOrder)),
-      pitch_buf_decimated_(kBufSize12kHz),
-      pitch_buf_decimated_view_(pitch_buf_decimated_.data(), kBufSize12kHz),
-      auto_corr_(kNumInvertedLags12kHz),
-      auto_corr_view_(auto_corr_.data(), kNumInvertedLags12kHz) {
-  RTC_DCHECK_EQ(kBufSize12kHz, pitch_buf_decimated_.size());
-  RTC_DCHECK_EQ(kNumInvertedLags12kHz, auto_corr_view_.size());
-}
-
-PitchEstimator::~PitchEstimator() = default;
-
-PitchInfo PitchEstimator::Estimate(
-    rtc::ArrayView<const float, kBufSize24kHz> pitch_buf) {
-  // Perform the initial pitch search at 12 kHz.
-  Decimate2x(pitch_buf, pitch_buf_decimated_view_);
-  // Compute auto-correlation terms.
-  ComputePitchAutoCorrelation(pitch_buf_decimated_view_, kMaxPitch12kHz,
-                              auto_corr_view_, fft_.get());
-
-  // Search for pitch at 12 kHz.
-  std::array<size_t, 2> pitch_candidates_inv_lags = FindBestPitchPeriods(
-      auto_corr_view_, pitch_buf_decimated_view_, kMaxPitch12kHz);
-
-  // Refine the pitch period estimation.
-  // The refinement is done using the pitch buffer that contains 24 kHz samples.
-  // Therefore, adapt the inverted lags in |pitch_candidates_inv_lags| from 12
-  // to 24 kHz.
-  for (size_t i = 0; i < pitch_candidates_inv_lags.size(); ++i)
-    pitch_candidates_inv_lags[i] *= 2;
-  size_t pitch_inv_lag_48kHz =
-      RefinePitchPeriod48kHz(pitch_buf, pitch_candidates_inv_lags);
-  // Look for stronger harmonics to find the final pitch period and its gain.
-  RTC_DCHECK_LT(pitch_inv_lag_48kHz, kMaxPitch48kHz);
-  last_pitch_48kHz_ = CheckLowerPitchPeriodsAndComputePitchGain(
-      pitch_buf, kMaxPitch48kHz - pitch_inv_lag_48kHz, last_pitch_48kHz_);
-  return last_pitch_48kHz_;
-}
-
-}  // namespace rnn_vad
-}  // namespace webrtc
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/agc2/rnn_vad/pitch_search.h b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/agc2/rnn_vad/pitch_search.h
deleted file mode 100644
index 59145353c1..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/agc2/rnn_vad/pitch_search.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- *  Copyright (c) 2018 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#ifndef MODULES_AUDIO_PROCESSING_AGC2_RNN_VAD_PITCH_SEARCH_H_
-#define MODULES_AUDIO_PROCESSING_AGC2_RNN_VAD_PITCH_SEARCH_H_
-
-#include <memory>
-#include <vector>
-
-#include "api/array_view.h"
-#include "common_audio/real_fourier.h"
-#include "modules/audio_processing/agc2/rnn_vad/common.h"
-#include "modules/audio_processing/agc2/rnn_vad/pitch_info.h"
-#include "modules/audio_processing/agc2/rnn_vad/pitch_search_internal.h"
-
-namespace webrtc {
-namespace rnn_vad {
-
-// Pitch estimator.
-class PitchEstimator {
- public:
-  PitchEstimator();
-  PitchEstimator(const PitchEstimator&) = delete;
-  PitchEstimator& operator=(const PitchEstimator&) = delete;
-  ~PitchEstimator();
-  // Estimates the pitch period and gain. Returns the pitch estimation data for
-  // 48 kHz.
-  PitchInfo Estimate(rtc::ArrayView<const float, kBufSize24kHz> pitch_buf);
-
- private:
-  PitchInfo last_pitch_48kHz_;
-  std::unique_ptr<RealFourier> fft_;
-  std::vector<float> pitch_buf_decimated_;
-  rtc::ArrayView<float, kBufSize12kHz> pitch_buf_decimated_view_;
-  std::vector<float> auto_corr_;
-  rtc::ArrayView<float, kNumInvertedLags12kHz> auto_corr_view_;
-};
-
-}  // namespace rnn_vad
-}  // namespace webrtc
-
-#endif  // MODULES_AUDIO_PROCESSING_AGC2_RNN_VAD_PITCH_SEARCH_H_
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/agc2/rnn_vad/pitch_search_internal.cc b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/agc2/rnn_vad/pitch_search_internal.cc
deleted file mode 100644
index 32ee8c00df..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/agc2/rnn_vad/pitch_search_internal.cc
+++ /dev/null
@@ -1,453 +0,0 @@
-/*
- *  Copyright (c) 2018 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#include "modules/audio_processing/agc2/rnn_vad/pitch_search_internal.h"
-
-#include <stdlib.h>
-#include <algorithm>
-#include <cmath>
-#include <complex>
-#include <cstddef>
-#include <numeric>
-
-#include "modules/audio_processing/agc2/rnn_vad/common.h"
-#include "rtc_base/checks.h"
-
-namespace webrtc {
-namespace rnn_vad {
-namespace {
-
-// Converts a lag to an inverted lag (only for 24kHz).
-size_t GetInvertedLag(size_t lag) {
-  RTC_DCHECK_LE(lag, kMaxPitch24kHz);
-  return kMaxPitch24kHz - lag;
-}
-
-float ComputeAutoCorrelationCoeff(rtc::ArrayView<const float> pitch_buf,
-                                  size_t inv_lag,
-                                  size_t max_pitch_period) {
-  RTC_DCHECK_LT(inv_lag, pitch_buf.size());
-  RTC_DCHECK_LT(max_pitch_period, pitch_buf.size());
-  RTC_DCHECK_LE(inv_lag, max_pitch_period);
-  // TODO(bugs.webrtc.org/9076): Maybe optimize using vectorization.
-  return std::inner_product(pitch_buf.begin() + max_pitch_period,
-                            pitch_buf.end(), pitch_buf.begin() + inv_lag, 0.f);
-}
-
-// Computes a pseudo-interpolation offset for an estimated pitch period |lag| by
-// looking at the auto-correlation coefficients in the neighborhood of |lag|.
-// (namely, |prev_auto_corr|, |lag_auto_corr| and |next_auto_corr|). The output
-// is a lag in {-1, 0, +1}.
-// TODO(bugs.webrtc.org/9076): Consider removing pseudo-i since it
-// is relevant only if the spectral analysis works at a sample rate that is
-// twice as that of the pitch buffer (not so important instead for the estimated
-// pitch period feature fed into the RNN).
-int GetPitchPseudoInterpolationOffset(size_t lag,
-                                      float prev_auto_corr,
-                                      float lag_auto_corr,
-                                      float next_auto_corr) {
-  const float& a = prev_auto_corr;
-  const float& b = lag_auto_corr;
-  const float& c = next_auto_corr;
-
-  int offset = 0;
-  if ((c - a) > 0.7f * (b - a)) {
-    offset = 1;  // |c| is the largest auto-correlation coefficient.
-  } else if ((a - c) > 0.7f * (b - c)) {
-    offset = -1;  // |a| is the largest auto-correlation coefficient.
-  }
-  return offset;
-}
-
-// Refines a pitch period |lag| encoded as lag with pseudo-interpolation. The
-// output sample rate is twice as that of |lag|.
-size_t PitchPseudoInterpolationLagPitchBuf(
-    size_t lag,
-    rtc::ArrayView<const float, kBufSize24kHz> pitch_buf) {
-  int offset = 0;
-  // Cannot apply pseudo-interpolation at the boundaries.
-  if (lag > 0 && lag < kMaxPitch24kHz) {
-    offset = GetPitchPseudoInterpolationOffset(
-        lag,
-        ComputeAutoCorrelationCoeff(pitch_buf, GetInvertedLag(lag - 1),
-                                    kMaxPitch24kHz),
-        ComputeAutoCorrelationCoeff(pitch_buf, GetInvertedLag(lag),
-                                    kMaxPitch24kHz),
-        ComputeAutoCorrelationCoeff(pitch_buf, GetInvertedLag(lag + 1),
-                                    kMaxPitch24kHz));
-  }
-  return 2 * lag + offset;
-}
-
-// Refines a pitch period |inv_lag| encoded as inverted lag with
-// pseudo-interpolation. The output sample rate is twice as that of
-// |inv_lag|.
-size_t PitchPseudoInterpolationInvLagAutoCorr(
-    size_t inv_lag,
-    rtc::ArrayView<const float> auto_corr) {
-  int offset = 0;
-  // Cannot apply pseudo-interpolation at the boundaries.
-  if (inv_lag > 0 && inv_lag < auto_corr.size() - 1) {
-    offset = GetPitchPseudoInterpolationOffset(inv_lag, auto_corr[inv_lag + 1],
-                                               auto_corr[inv_lag],
-                                               auto_corr[inv_lag - 1]);
-  }
-  // TODO(bugs.webrtc.org/9076): When retraining, check if |offset| below should
-  // be subtracted since |inv_lag| is an inverted lag but offset is a lag.
-  return 2 * inv_lag + offset;
-}
-
-// Integer multipliers used in CheckLowerPitchPeriodsAndComputePitchGain() when
-// looking for sub-harmonics.
-// The values have been chosen to serve the following algorithm. Given the
-// initial pitch period T, we examine whether one of its harmonics is the true
-// fundamental frequency. We consider T/k with k in {2, ..., 15}. For each of
-// these harmonics, in addition to the pitch gain of itself, we choose one
-// multiple of its pitch period, n*T/k, to validate it (by averaging their pitch
-// gains). The multiplier n is chosen so that n*T/k is used only one time over
-// all k. When for example k = 4, we should also expect a peak at 3*T/4. When
-// k = 8 instead we don't want to look at 2*T/8, since we have already checked
-// T/4 before. Instead, we look at T*3/8.
-// The array can be generate in Python as follows:
-//   from fractions import Fraction
-//   # Smallest positive integer not in X.
-//   def mex(X):
-//     for i in range(1, int(max(X)+2)):
-//       if i not in X:
-//         return i
-//   # Visited multiples of the period.
-//   S = {1}
-//   for n in range(2, 16):
-//     sn = mex({n * i for i in S} | {1})
-//     S = S | {Fraction(1, n), Fraction(sn, n)}
-//     print(sn, end=', ')
-constexpr std::array<size_t, 14> kSubHarmonicMultipliers = {
-    {3, 2, 3, 2, 5, 2, 3, 2, 3, 2, 5, 2, 3, 2}};
-
-// Initial pitch period candidate thresholds for ComputePitchGainThreshold() for
-// a sample rate of 24 kHz. Computed as [5*k*k for k in range(16)].
-constexpr std::array<size_t, 14> kInitialPitchPeriodThresholds = {
-    {20, 45, 80, 125, 180, 245, 320, 405, 500, 605, 720, 845, 980, 1125}};
-
-}  // namespace
-
-void Decimate2x(rtc::ArrayView<const float, kBufSize24kHz> src,
-                rtc::ArrayView<float, kBufSize12kHz> dst) {
-  // TODO(bugs.webrtc.org/9076): Consider adding anti-aliasing filter.
-  static_assert(2 * dst.size() == src.size(), "");
-  for (size_t i = 0; i < dst.size(); ++i) {
-    dst[i] = src[2 * i];
-  }
-}
-
-float ComputePitchGainThreshold(size_t candidate_pitch_period,
-                                size_t pitch_period_ratio,
-                                size_t initial_pitch_period,
-                                float initial_pitch_gain,
-                                size_t prev_pitch_period,
-                                size_t prev_pitch_gain) {
-  // Map arguments to more compact aliases.
-  const size_t& t1 = candidate_pitch_period;
-  const size_t& k = pitch_period_ratio;
-  const size_t& t0 = initial_pitch_period;
-  const float& g0 = initial_pitch_gain;
-  const size_t& t_prev = prev_pitch_period;
-  const size_t& g_prev = prev_pitch_gain;
-
-  // Validate input.
-  RTC_DCHECK_GE(k, 2);
-
-  // Compute a term that lowers the threshold when |t1| is close to the last
-  // estimated period |t_prev| - i.e., pitch tracking.
-  float lower_threshold_term = 0;
-  if (abs(static_cast<int>(t1) - static_cast<int>(t_prev)) <= 1) {
-    // The candidate pitch period is within 1 sample from the previous one.
-    // Make the candidate at |t1| very easy to be accepted.
-    lower_threshold_term = g_prev;
-  } else if (abs(static_cast<int>(t1) - static_cast<int>(t_prev)) == 2 &&
-             t0 > kInitialPitchPeriodThresholds[k - 2]) {
-    // The candidate pitch period is 2 samples far from the previous one and the
-    // period |t0| (from which |t1| has been derived) is greater than a
-    // threshold. Make |t1| easy to be accepted.
-    lower_threshold_term = 0.5f * g_prev;
-  }
-  // Set the threshold based on the gain of the initial estimate |t0|. Also
-  // reduce the chance of false positives caused by a bias towards high
-  // frequencies (originating from short-term correlations).
-  float threshold = std::max(0.3f, 0.7f * g0 - lower_threshold_term);
-  if (t1 < 3 * kMinPitch24kHz) {  // High frequency.
-    threshold = std::max(0.4f, 0.85f * g0 - lower_threshold_term);
-  } else if (t1 < 2 * kMinPitch24kHz) {  // Even higher frequency.
-    threshold = std::max(0.5f, 0.9f * g0 - lower_threshold_term);
-  }
-  return threshold;
-}
-
-void ComputeSlidingFrameSquareEnergies(
-    rtc::ArrayView<const float, kBufSize24kHz> pitch_buf,
-    rtc::ArrayView<float, kMaxPitch24kHz + 1> yy_values) {
-  float yy =
-      ComputeAutoCorrelationCoeff(pitch_buf, kMaxPitch24kHz, kMaxPitch24kHz);
-  yy_values[0] = yy;
-  for (size_t i = 1; i < yy_values.size(); ++i) {
-    RTC_DCHECK_LE(i, kMaxPitch24kHz + kFrameSize20ms24kHz);
-    RTC_DCHECK_LE(i, kMaxPitch24kHz);
-    const float old_coeff = pitch_buf[kMaxPitch24kHz + kFrameSize20ms24kHz - i];
-    const float new_coeff = pitch_buf[kMaxPitch24kHz - i];
-    yy -= old_coeff * old_coeff;
-    yy += new_coeff * new_coeff;
-    yy = std::max(0.f, yy);
-    yy_values[i] = yy;
-  }
-}
-
-void ComputePitchAutoCorrelation(
-    rtc::ArrayView<const float, kBufSize12kHz> pitch_buf,
-    size_t max_pitch_period,
-    rtc::ArrayView<float, kNumInvertedLags12kHz> auto_corr,
-    webrtc::RealFourier* fft) {
-  RTC_DCHECK_GT(max_pitch_period, auto_corr.size());
-  RTC_DCHECK_LT(max_pitch_period, pitch_buf.size());
-  RTC_DCHECK(fft);
-
-  constexpr size_t time_domain_fft_length = 1 << kAutoCorrelationFftOrder;
-  constexpr size_t freq_domain_fft_length = time_domain_fft_length / 2 + 1;
-
-  RTC_DCHECK_EQ(RealFourier::FftLength(fft->order()), time_domain_fft_length);
-  RTC_DCHECK_EQ(RealFourier::ComplexLength(fft->order()),
-                freq_domain_fft_length);
-
-  // Cross-correlation of y_i=pitch_buf[i:i+convolution_length] and
-  // x=pitch_buf[-convolution_length:] is equivalent to convolution of
-  // y_i and reversed(x). New notation: h=reversed(x), x=y.
-  std::array<float, time_domain_fft_length> h{};
-  std::array<float, time_domain_fft_length> x{};
-
-  const size_t convolution_length = kBufSize12kHz - max_pitch_period;
-  // Check that the FFT-length is big enough to avoid cyclic
-  // convolution errors.
-  RTC_DCHECK_GT(time_domain_fft_length,
-                kNumInvertedLags12kHz + convolution_length);
-
-  // h[0:convolution_length] is reversed pitch_buf[-convolution_length:].
-  std::reverse_copy(pitch_buf.end() - convolution_length, pitch_buf.end(),
-                    h.begin());
-
-  // x is pitch_buf[:kNumInvertedLags12kHz + convolution_length].
-  std::copy(pitch_buf.begin(),
-            pitch_buf.begin() + kNumInvertedLags12kHz + convolution_length,
-            x.begin());
-
-  // Shift to frequency domain.
-  std::array<std::complex<float>, freq_domain_fft_length> X{};
-  std::array<std::complex<float>, freq_domain_fft_length> H{};
-  fft->Forward(&x[0], &X[0]);
-  fft->Forward(&h[0], &H[0]);
-
-  // Convolve in frequency domain.
-  for (size_t i = 0; i < X.size(); ++i) {
-    X[i] *= H[i];
-  }
-
-  // Shift back to time domain.
-  std::array<float, time_domain_fft_length> x_conv_h;
-  fft->Inverse(&X[0], &x_conv_h[0]);
-
-  // Collect the result.
-  std::copy(x_conv_h.begin() + convolution_length - 1,
-            x_conv_h.begin() + convolution_length + kNumInvertedLags12kHz - 1,
-            auto_corr.begin());
-}
-
-std::array<size_t, 2> FindBestPitchPeriods(
-    rtc::ArrayView<const float> auto_corr,
-    rtc::ArrayView<const float> pitch_buf,
-    size_t max_pitch_period) {
-  // Stores a pitch candidate period and strength information.
-  struct PitchCandidate {
-    // Pitch period encoded as inverted lag.
-    size_t period_inverted_lag = 0;
-    // Pitch strength encoded as a ratio.
-    float strength_numerator = -1.f;
-    float strength_denominator = 0.f;
-    // Compare the strength of two pitch candidates.
-    bool HasStrongerPitchThan(const PitchCandidate& b) const {
-      // Comparing the numerator/denominator ratios without using divisions.
-      return strength_numerator * b.strength_denominator >
-             b.strength_numerator * strength_denominator;
-    }
-  };
-
-  RTC_DCHECK_GT(max_pitch_period, auto_corr.size());
-  RTC_DCHECK_LT(max_pitch_period, pitch_buf.size());
-  const size_t frame_size = pitch_buf.size() - max_pitch_period;
-  // TODO(bugs.webrtc.org/9076): Maybe optimize using vectorization.
-  float yy =
-      std::inner_product(pitch_buf.begin(), pitch_buf.begin() + frame_size + 1,
-                         pitch_buf.begin(), 1.f);
-  // Search best and second best pitches by looking at the scaled
-  // auto-correlation.
-  PitchCandidate candidate;
-  PitchCandidate best;
-  PitchCandidate second_best;
-  second_best.period_inverted_lag = 1;
-  for (size_t inv_lag = 0; inv_lag < auto_corr.size(); ++inv_lag) {
-    // A pitch candidate must have positive correlation.
-    if (auto_corr[inv_lag] > 0) {
-      candidate.period_inverted_lag = inv_lag;
-      candidate.strength_numerator = auto_corr[inv_lag] * auto_corr[inv_lag];
-      candidate.strength_denominator = yy;
-      if (candidate.HasStrongerPitchThan(second_best)) {
-        if (candidate.HasStrongerPitchThan(best)) {
-          second_best = best;
-          best = candidate;
-        } else {
-          second_best = candidate;
-        }
-      }
-    }
-    // Update |squared_energy_y| for the next inverted lag.
-    const float old_coeff = pitch_buf[inv_lag];
-    const float new_coeff = pitch_buf[inv_lag + frame_size];
-    yy -= old_coeff * old_coeff;
-    yy += new_coeff * new_coeff;
-    yy = std::max(0.f, yy);
-  }
-  return {{best.period_inverted_lag, second_best.period_inverted_lag}};
-}
-
-size_t RefinePitchPeriod48kHz(
-    rtc::ArrayView<const float, kBufSize24kHz> pitch_buf,
-    rtc::ArrayView<const size_t, 2> inv_lags) {
-  // Compute the auto-correlation terms only for neighbors of the given pitch
-  // candidates (similar to what is done in ComputePitchAutoCorrelation(), but
-  // for a few lag values).
-  std::array<float, kNumInvertedLags24kHz> auto_corr;
-  auto_corr.fill(0.f);  // Zeros become ignored lags in FindBestPitchPeriods().
-  auto is_neighbor = [](size_t i, size_t j) {
-    return ((i > j) ? (i - j) : (j - i)) <= 2;
-  };
-  for (size_t inv_lag = 0; inv_lag < auto_corr.size(); ++inv_lag) {
-    if (is_neighbor(inv_lag, inv_lags[0]) || is_neighbor(inv_lag, inv_lags[1]))
-      auto_corr[inv_lag] =
-          ComputeAutoCorrelationCoeff(pitch_buf, inv_lag, kMaxPitch24kHz);
-  }
-  // Find best pitch at 24 kHz.
-  const auto pitch_candidates_inv_lags = FindBestPitchPeriods(
-      {auto_corr.data(), auto_corr.size()},
-      {pitch_buf.data(), pitch_buf.size()}, kMaxPitch24kHz);
-  const auto inv_lag = pitch_candidates_inv_lags[0];  // Refine the best.
-  // Pseudo-interpolation.
-  return PitchPseudoInterpolationInvLagAutoCorr(inv_lag, auto_corr);
-}
-
-PitchInfo CheckLowerPitchPeriodsAndComputePitchGain(
-    rtc::ArrayView<const float, kBufSize24kHz> pitch_buf,
-    size_t initial_pitch_period_48kHz,
-    PitchInfo prev_pitch_48kHz) {
-  RTC_DCHECK_LE(kMinPitch48kHz, initial_pitch_period_48kHz);
-  RTC_DCHECK_LE(initial_pitch_period_48kHz, kMaxPitch48kHz);
-  // Stores information for a refined pitch candidate.
-  struct RefinedPitchCandidate {
-    RefinedPitchCandidate() {}
-    RefinedPitchCandidate(size_t period_24kHz, float gain, float xy, float yy)
-        : period_24kHz(period_24kHz), gain(gain), xy(xy), yy(yy) {}
-    size_t period_24kHz;
-    // Pitch strength information.
-    float gain;
-    // Additional pitch strength information used for the final estimation of
-    // pitch gain.
-    float xy;  // Cross-correlation.
-    float yy;  // Auto-correlation.
-  };
-
-  // Initialize.
-  std::array<float, kMaxPitch24kHz + 1> yy_values;
-  ComputeSlidingFrameSquareEnergies(pitch_buf,
-                                    {yy_values.data(), yy_values.size()});
-  const float xx = yy_values[0];
-  // Helper lambdas.
-  const auto pitch_gain = [](float xy, float yy, float xx) {
-    RTC_DCHECK_LE(0.f, xx * yy);
-    return xy / std::sqrt(1.f + xx * yy);
-  };
-  // Initial pitch candidate gain.
-  RefinedPitchCandidate best_pitch;
-  best_pitch.period_24kHz =
-      std::min(initial_pitch_period_48kHz / 2, kMaxPitch24kHz - 1);
-  best_pitch.xy = ComputeAutoCorrelationCoeff(
-      pitch_buf, GetInvertedLag(best_pitch.period_24kHz), kMaxPitch24kHz);
-  best_pitch.yy = yy_values[best_pitch.period_24kHz];
-  best_pitch.gain = pitch_gain(best_pitch.xy, best_pitch.yy, xx);
-
-  // Store the initial pitch period information.
-  const size_t initial_pitch_period = best_pitch.period_24kHz;
-  const float initial_pitch_gain = best_pitch.gain;
-
-  // Given the initial pitch estimation, check lower periods (i.e., harmonics).
-  const auto alternative_period = [](size_t period, size_t k,
-                                     size_t n) -> size_t {
-    RTC_DCHECK_LT(0, k);
-    return (2 * n * period + k) / (2 * k);  // Same as round(n*period/k).
-  };
-  for (size_t k = 2; k < kSubHarmonicMultipliers.size() + 2; ++k) {
-    size_t candidate_pitch_period =
-        alternative_period(initial_pitch_period, k, 1);
-    if (candidate_pitch_period < kMinPitch24kHz)
-      break;
-    // When looking at |candidate_pitch_period|, we also look at one of its
-    // sub-harmonics. |kSubHarmonicMultipliers| is used to know where to look.
-    // |k| == 2 is a special case since |candidate_pitch_secondary_period| might
-    // be greater than the maximum pitch period.
-    size_t candidate_pitch_secondary_period = alternative_period(
-        initial_pitch_period, k, kSubHarmonicMultipliers[k - 2]);
-    if (k == 2 && candidate_pitch_secondary_period > kMaxPitch24kHz)
-      candidate_pitch_secondary_period = initial_pitch_period;
-    RTC_DCHECK_NE(candidate_pitch_period, candidate_pitch_secondary_period)
-        << "The lower pitch period and the additional sub-harmonic must not "
-        << "coincide.";
-    // Compute an auto-correlation score for the primary pitch candidate
-    // |candidate_pitch_period| by also looking at its possible sub-harmonic
-    // |candidate_pitch_secondary_period|.
-    float xy_primary_period = ComputeAutoCorrelationCoeff(
-        pitch_buf, GetInvertedLag(candidate_pitch_period), kMaxPitch24kHz);
-    float xy_secondary_period = ComputeAutoCorrelationCoeff(
-        pitch_buf, GetInvertedLag(candidate_pitch_secondary_period),
-        kMaxPitch24kHz);
-    float xy = 0.5f * (xy_primary_period + xy_secondary_period);
-    float yy = 0.5f * (yy_values[candidate_pitch_period] +
-                       yy_values[candidate_pitch_secondary_period]);
-    float candidate_pitch_gain = pitch_gain(xy, yy, xx);
-
-    // Maybe update best period.
-    float threshold = ComputePitchGainThreshold(
-        candidate_pitch_period, k, initial_pitch_period, initial_pitch_gain,
-        prev_pitch_48kHz.period / 2, prev_pitch_48kHz.gain);
-    if (candidate_pitch_gain > threshold) {
-      best_pitch = {candidate_pitch_period, candidate_pitch_gain, xy, yy};
-    }
-  }
-
-  // Final pitch gain and period.
-  best_pitch.xy = std::max(0.f, best_pitch.xy);
-  RTC_DCHECK_LE(0.f, best_pitch.yy);
-  float final_pitch_gain = (best_pitch.yy <= best_pitch.xy)
-                               ? 1.f
-                               : best_pitch.xy / (best_pitch.yy + 1.f);
-  final_pitch_gain = std::min(best_pitch.gain, final_pitch_gain);
-  size_t final_pitch_period_48kHz = std::max(
-      kMinPitch48kHz,
-      PitchPseudoInterpolationLagPitchBuf(best_pitch.period_24kHz, pitch_buf));
-
-  return {final_pitch_period_48kHz, final_pitch_gain};
-}
-
-}  // namespace rnn_vad
-}  // namespace webrtc
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/agc2/rnn_vad/pitch_search_internal.h b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/agc2/rnn_vad/pitch_search_internal.h
deleted file mode 100644
index bb747bb03e..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/agc2/rnn_vad/pitch_search_internal.h
+++ /dev/null
@@ -1,108 +0,0 @@
-/*
- *  Copyright (c) 2018 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#ifndef MODULES_AUDIO_PROCESSING_AGC2_RNN_VAD_PITCH_SEARCH_INTERNAL_H_
-#define MODULES_AUDIO_PROCESSING_AGC2_RNN_VAD_PITCH_SEARCH_INTERNAL_H_
-
-#include <stddef.h>
-#include <array>
-
-#include "api/array_view.h"
-#include "common_audio/real_fourier.h"
-#include "modules/audio_processing/agc2/rnn_vad/common.h"
-#include "modules/audio_processing/agc2/rnn_vad/pitch_info.h"
-
-namespace webrtc {
-namespace rnn_vad {
-
-// The inverted lags for the pitch interval [|kInitialMinPitch12kHz|,
-// |kMaxPitch12kHz|] are in the range [0, |kNumInvertedLags|].
-static_assert(kMaxPitch12kHz > kInitialMinPitch12kHz, "");
-static_assert(kMaxPitch24kHz > kInitialMinPitch24kHz, "");
-constexpr size_t kNumInvertedLags12kHz = kMaxPitch12kHz - kInitialMinPitch12kHz;
-constexpr size_t kNumInvertedLags24kHz = kMaxPitch24kHz - kInitialMinPitch24kHz;
-constexpr int kAutoCorrelationFftOrder = 9;  // Length-512 FFT.
-
-static_assert(1 << kAutoCorrelationFftOrder >
-                  kNumInvertedLags12kHz + kBufSize12kHz - kMaxPitch12kHz,
-              "");
-
-// Performs 2x decimation without any anti-aliasing filter.
-void Decimate2x(rtc::ArrayView<const float, kBufSize24kHz> src,
-                rtc::ArrayView<float, kBufSize12kHz> dst);
-
-// Computes a gain threshold for a candidate pitch period given the initial and
-// the previous pitch period and gain estimates and the pitch period ratio used
-// to derive the candidate pitch period from the initial period.
-float ComputePitchGainThreshold(size_t candidate_pitch_period,
-                                size_t pitch_period_ratio,
-                                size_t initial_pitch_period,
-                                float initial_pitch_gain,
-                                size_t prev_pitch_period,
-                                size_t prev_pitch_gain);
-
-// Computes the sum of squared samples for every sliding frame in the pitch
-// buffer. |yy_values| indexes are lags.
-//
-// The pitch buffer is structured as depicted below:
-// |.........|...........|
-//      a          b
-// The part on the left, named "a" contains the oldest samples, whereas "b" the
-// most recent ones. The size of "a" corresponds to the maximum pitch period,
-// that of "b" to the frame size (e.g., 16 ms and 20 ms respectively).
-void ComputeSlidingFrameSquareEnergies(
-    rtc::ArrayView<const float, kBufSize24kHz> pitch_buf,
-    rtc::ArrayView<float, kMaxPitch24kHz + 1> yy_values);
-
-// Computes the auto-correlation coefficients for a given pitch interval.
-// |auto_corr| indexes are inverted lags.
-//
-// The auto-correlations coefficients are computed as follows:
-// |.........|...........|  <- pitch buffer
-//           [ x (fixed) ]
-// [   y_0   ]
-//         [ y_{m-1} ]
-// x and y are sub-array of equal length; x is never moved, whereas y slides.
-// The cross-correlation between y_0 and x corresponds to the auto-correlation
-// for the maximum pitch period. Hence, the first value in |auto_corr| has an
-// inverted lag equal to 0 that corresponds to a lag equal to the maximum pitch
-// period.
-void ComputePitchAutoCorrelation(
-    rtc::ArrayView<const float, kBufSize12kHz> pitch_buf,
-    size_t max_pitch_period,
-    rtc::ArrayView<float, kNumInvertedLags12kHz> auto_corr,
-    webrtc::RealFourier* fft);
-
-// Given the auto-correlation coefficients stored according to
-// ComputePitchAutoCorrelation() (i.e., using inverted lags), returns the best
-// and the second best pitch periods.
-std::array<size_t, 2> FindBestPitchPeriods(
-    rtc::ArrayView<const float> auto_corr,
-    rtc::ArrayView<const float> pitch_buf,
-    size_t max_pitch_period);
-
-// Refines the pitch period estimation given the pitch buffer |pitch_buf| and
-// the initial pitch period estimation |inv_lags|. Returns an inverted lag at
-// 48 kHz.
-size_t RefinePitchPeriod48kHz(
-    rtc::ArrayView<const float, kBufSize24kHz> pitch_buf,
-    rtc::ArrayView<const size_t, 2> inv_lags);
-
-// Refines the pitch period estimation and compute the pitch gain. Returns the
-// refined pitch estimation data at 48 kHz.
-PitchInfo CheckLowerPitchPeriodsAndComputePitchGain(
-    rtc::ArrayView<const float, kBufSize24kHz> pitch_buf,
-    size_t initial_pitch_period_48kHz,
-    PitchInfo prev_pitch_48kHz);
-
-}  // namespace rnn_vad
-}  // namespace webrtc
-
-#endif  // MODULES_AUDIO_PROCESSING_AGC2_RNN_VAD_PITCH_SEARCH_INTERNAL_H_
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/agc2/rnn_vad/ring_buffer.h b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/agc2/rnn_vad/ring_buffer.h
deleted file mode 100644
index 294b0c0ba8..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/agc2/rnn_vad/ring_buffer.h
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- *  Copyright (c) 2018 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#ifndef MODULES_AUDIO_PROCESSING_AGC2_RNN_VAD_RING_BUFFER_H_
-#define MODULES_AUDIO_PROCESSING_AGC2_RNN_VAD_RING_BUFFER_H_
-
-#include <array>
-#include <cstring>
-#include <type_traits>
-
-#include "api/array_view.h"
-
-namespace webrtc {
-namespace rnn_vad {
-
-// Ring buffer for N arrays of type T each one with size S.
-template <typename T, size_t S, size_t N>
-class RingBuffer {
-  static_assert(S > 0, "");
-  static_assert(N > 0, "");
-  static_assert(std::is_arithmetic<T>::value,
-                "Integral or floating point required.");
-
- public:
-  RingBuffer() : tail_(0) {}
-  RingBuffer(const RingBuffer&) = delete;
-  RingBuffer& operator=(const RingBuffer&) = delete;
-  ~RingBuffer() = default;
-  // Set the ring buffer values to zero.
-  void Reset() { buffer_.fill(0); }
-  // Replace the least recently pushed array in the buffer with |new_values|.
-  void Push(rtc::ArrayView<const T, S> new_values) {
-    std::memcpy(buffer_.data() + S * tail_, new_values.data(), S * sizeof(T));
-    tail_ += 1;
-    if (tail_ == N)
-      tail_ = 0;
-  }
-  // Return an array view onto the array with a given delay. A view on the last
-  // and least recently push array is returned when |delay| is 0 and N - 1
-  // respectively.
-  rtc::ArrayView<const T, S> GetArrayView(size_t delay) const {
-    const int delay_int = static_cast<int>(delay);
-    RTC_DCHECK_LE(0, delay_int);
-    RTC_DCHECK_LT(delay_int, N);
-    int offset = tail_ - 1 - delay_int;
-    if (offset < 0)
-      offset += N;
-    return {buffer_.data() + S * offset, S};
-  }
-
- private:
-  int tail_;  // Index of the least recently pushed sub-array.
-  std::array<T, S * N> buffer_{};
-};
-
-}  // namespace rnn_vad
-}  // namespace webrtc
-
-#endif  // MODULES_AUDIO_PROCESSING_AGC2_RNN_VAD_RING_BUFFER_H_
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/agc2/rnn_vad/rnn.cc b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/agc2/rnn_vad/rnn.cc
deleted file mode 100644
index 2b36034734..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/agc2/rnn_vad/rnn.cc
+++ /dev/null
@@ -1,232 +0,0 @@
-/*
- *  Copyright (c) 2018 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#include "modules/audio_processing/agc2/rnn_vad/rnn.h"
-
-#include <algorithm>
-#include <array>
-#include <cmath>
-
-#include "rtc_base/checks.h"
-#include "third_party/rnnoise/src/rnn_activations.h"
-#include "third_party/rnnoise/src/rnn_vad_weights.h"
-
-namespace webrtc {
-namespace rnn_vad {
-
-using rnnoise::kWeightsScale;
-
-using rnnoise::kInputLayerInputSize;
-static_assert(kFeatureVectorSize == kInputLayerInputSize, "");
-using rnnoise::kInputDenseWeights;
-using rnnoise::kInputDenseBias;
-using rnnoise::kInputLayerOutputSize;
-static_assert(kInputLayerOutputSize <= kFullyConnectedLayersMaxUnits,
-              "Increase kFullyConnectedLayersMaxUnits.");
-
-using rnnoise::kHiddenGruRecurrentWeights;
-using rnnoise::kHiddenGruWeights;
-using rnnoise::kHiddenGruBias;
-using rnnoise::kHiddenLayerOutputSize;
-static_assert(kHiddenLayerOutputSize <= kRecurrentLayersMaxUnits,
-              "Increase kRecurrentLayersMaxUnits.");
-
-using rnnoise::kOutputDenseWeights;
-using rnnoise::kOutputDenseBias;
-using rnnoise::kOutputLayerOutputSize;
-static_assert(kOutputLayerOutputSize <= kFullyConnectedLayersMaxUnits,
-              "Increase kFullyConnectedLayersMaxUnits.");
-
-using rnnoise::RectifiedLinearUnit;
-using rnnoise::SigmoidApproximated;
-using rnnoise::TansigApproximated;
-
-FullyConnectedLayer::FullyConnectedLayer(
-    const size_t input_size,
-    const size_t output_size,
-    const rtc::ArrayView<const int8_t> bias,
-    const rtc::ArrayView<const int8_t> weights,
-    float (*const activation_function)(float))
-    : input_size_(input_size),
-      output_size_(output_size),
-      bias_(bias),
-      weights_(weights),
-      activation_function_(activation_function) {
-  RTC_DCHECK_LE(output_size_, kFullyConnectedLayersMaxUnits)
-      << "Static over-allocation of fully-connected layers output vectors is "
-         "not sufficient.";
-  RTC_DCHECK_EQ(output_size_, bias_.size())
-      << "Mismatching output size and bias terms array size.";
-  RTC_DCHECK_EQ(input_size_ * output_size_, weights_.size())
-      << "Mismatching input-output size and weight coefficients array size.";
-}
-
-FullyConnectedLayer::~FullyConnectedLayer() = default;
-
-rtc::ArrayView<const float> FullyConnectedLayer::GetOutput() const {
-  return rtc::ArrayView<const float>(output_.data(), output_size_);
-}
-
-void FullyConnectedLayer::ComputeOutput(rtc::ArrayView<const float> input) {
-  // TODO(bugs.chromium.org/9076): Optimize using SSE/AVX fused multiply-add
-  // operations.
-  for (size_t o = 0; o < output_size_; ++o) {
-    output_[o] = bias_[o];
-    // TODO(bugs.chromium.org/9076): Benchmark how different layouts for
-    // |weights_| change the performance across different platforms.
-    for (size_t i = 0; i < input_size_; ++i) {
-      output_[o] += input[i] * weights_[i * output_size_ + o];
-    }
-    output_[o] = (*activation_function_)(kWeightsScale * output_[o]);
-  }
-}
-
-GatedRecurrentLayer::GatedRecurrentLayer(
-    const size_t input_size,
-    const size_t output_size,
-    const rtc::ArrayView<const int8_t> bias,
-    const rtc::ArrayView<const int8_t> weights,
-    const rtc::ArrayView<const int8_t> recurrent_weights,
-    float (*const activation_function)(float))
-    : input_size_(input_size),
-      output_size_(output_size),
-      bias_(bias),
-      weights_(weights),
-      recurrent_weights_(recurrent_weights),
-      activation_function_(activation_function) {
-  RTC_DCHECK_LE(output_size_, kRecurrentLayersMaxUnits)
-      << "Static over-allocation of recurrent layers state vectors is not "
-      << "sufficient.";
-  RTC_DCHECK_EQ(3 * output_size_, bias_.size())
-      << "Mismatching output size and bias terms array size.";
-  RTC_DCHECK_EQ(3 * input_size_ * output_size_, weights_.size())
-      << "Mismatching input-output size and weight coefficients array size.";
-  RTC_DCHECK_EQ(3 * input_size_ * output_size_, recurrent_weights_.size())
-      << "Mismatching input-output size and recurrent weight coefficients array"
-      << " size.";
-  Reset();
-}
-
-GatedRecurrentLayer::~GatedRecurrentLayer() = default;
-
-rtc::ArrayView<const float> GatedRecurrentLayer::GetOutput() const {
-  return rtc::ArrayView<const float>(state_.data(), output_size_);
-}
-
-void GatedRecurrentLayer::Reset() {
-  state_.fill(0.f);
-}
-
-void GatedRecurrentLayer::ComputeOutput(rtc::ArrayView<const float> input) {
-  // TODO(bugs.chromium.org/9076): Optimize using SSE/AVX fused multiply-add
-  // operations.
-  // Stride and offset used to read parameter arrays.
-  const size_t stride = 3 * output_size_;
-  size_t offset = 0;
-
-  // Compute update gates.
-  std::array<float, kRecurrentLayersMaxUnits> update;
-  for (size_t o = 0; o < output_size_; ++o) {
-    update[o] = bias_[o];
-    // TODO(bugs.chromium.org/9076): Benchmark how different layouts for
-    // |weights_| and |recurrent_weights_| change the performance across
-    // different platforms.
-    for (size_t i = 0; i < input_size_; ++i) {  // Add input.
-      update[o] += input[i] * weights_[i * stride + o];
-    }
-    for (size_t s = 0; s < output_size_; ++s) {
-      update[o] += state_[s] * recurrent_weights_[s * stride + o];
-    }  // Add state.
-    update[o] = SigmoidApproximated(kWeightsScale * update[o]);
-  }
-
-  // Compute reset gates.
-  offset += output_size_;
-  std::array<float, kRecurrentLayersMaxUnits> reset;
-  for (size_t o = 0; o < output_size_; ++o) {
-    reset[o] = bias_[offset + o];
-    for (size_t i = 0; i < input_size_; ++i) {  // Add input.
-      reset[o] += input[i] * weights_[offset + i * stride + o];
-    }
-    for (size_t s = 0; s < output_size_; ++s) {  // Add state.
-      reset[o] += state_[s] * recurrent_weights_[offset + s * stride + o];
-    }
-    reset[o] = SigmoidApproximated(kWeightsScale * reset[o]);
-  }
-
-  // Compute output.
-  offset += output_size_;
-  std::array<float, kRecurrentLayersMaxUnits> output;
-  for (size_t o = 0; o < output_size_; ++o) {
-    output[o] = bias_[offset + o];
-    for (size_t i = 0; i < input_size_; ++i) {  // Add input.
-      output[o] += input[i] * weights_[offset + i * stride + o];
-    }
-    for (size_t s = 0; s < output_size_;
-         ++s) {  // Add state through reset gates.
-      output[o] +=
-          state_[s] * recurrent_weights_[offset + s * stride + o] * reset[s];
-    }
-    output[o] = (*activation_function_)(kWeightsScale * output[o]);
-    // Update output through the update gates.
-    output[o] = update[o] * state_[o] + (1.f - update[o]) * output[o];
-  }
-
-  // Update the state. Not done in the previous loop since that would pollute
-  // the current state and lead to incorrect output values.
-  std::copy(output.begin(), output.end(), state_.begin());
-}
-
-RnnBasedVad::RnnBasedVad()
-    : input_layer_(kInputLayerInputSize,
-                   kInputLayerOutputSize,
-                   kInputDenseBias,
-                   kInputDenseWeights,
-                   TansigApproximated),
-      hidden_layer_(kInputLayerOutputSize,
-                    kHiddenLayerOutputSize,
-                    kHiddenGruBias,
-                    kHiddenGruWeights,
-                    kHiddenGruRecurrentWeights,
-                    RectifiedLinearUnit),
-      output_layer_(kHiddenLayerOutputSize,
-                    kOutputLayerOutputSize,
-                    kOutputDenseBias,
-                    kOutputDenseWeights,
-                    SigmoidApproximated) {
-  // Input-output chaining size checks.
-  RTC_DCHECK_EQ(input_layer_.output_size(), hidden_layer_.input_size())
-      << "The input and the hidden layers sizes do not match.";
-  RTC_DCHECK_EQ(hidden_layer_.output_size(), output_layer_.input_size())
-      << "The hidden and the output layers sizes do not match.";
-}
-
-RnnBasedVad::~RnnBasedVad() = default;
-
-void RnnBasedVad::Reset() {
-  hidden_layer_.Reset();
-}
-
-float RnnBasedVad::ComputeVadProbability(
-    rtc::ArrayView<const float, kFeatureVectorSize> feature_vector,
-    bool is_silence) {
-  if (is_silence) {
-    Reset();
-    return 0.f;
-  }
-  input_layer_.ComputeOutput(feature_vector);
-  hidden_layer_.ComputeOutput(input_layer_.GetOutput());
-  output_layer_.ComputeOutput(hidden_layer_.GetOutput());
-  const auto vad_output = output_layer_.GetOutput();
-  return vad_output[0];
-}
-
-}  // namespace rnn_vad
-}  // namespace webrtc
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/agc2/rnn_vad/rnn.h b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/agc2/rnn_vad/rnn.h
deleted file mode 100644
index a7d057d576..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/agc2/rnn_vad/rnn.h
+++ /dev/null
@@ -1,117 +0,0 @@
-/*
- *  Copyright (c) 2018 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#ifndef MODULES_AUDIO_PROCESSING_AGC2_RNN_VAD_RNN_H_
-#define MODULES_AUDIO_PROCESSING_AGC2_RNN_VAD_RNN_H_
-
-#include <stddef.h>
-#include <sys/types.h>
-#include <array>
-
-#include "api/array_view.h"
-#include "modules/audio_processing/agc2/rnn_vad/common.h"
-
-namespace webrtc {
-namespace rnn_vad {
-
-// Maximum number of units for a fully-connected layer. This value is used to
-// over-allocate space for fully-connected layers output vectors (implemented as
-// std::array). The value should equal the number of units of the largest
-// fully-connected layer.
-constexpr size_t kFullyConnectedLayersMaxUnits = 24;
-
-// Maximum number of units for a recurrent layer. This value is used to
-// over-allocate space for recurrent layers state vectors (implemented as
-// std::array). The value should equal the number of units of the largest
-// recurrent layer.
-constexpr size_t kRecurrentLayersMaxUnits = 24;
-
-// Fully-connected layer.
-class FullyConnectedLayer {
- public:
-  FullyConnectedLayer(const size_t input_size,
-                      const size_t output_size,
-                      const rtc::ArrayView<const int8_t> bias,
-                      const rtc::ArrayView<const int8_t> weights,
-                      float (*const activation_function)(float));
-  FullyConnectedLayer(const FullyConnectedLayer&) = delete;
-  FullyConnectedLayer& operator=(const FullyConnectedLayer&) = delete;
-  ~FullyConnectedLayer();
-  size_t input_size() const { return input_size_; }
-  size_t output_size() const { return output_size_; }
-  rtc::ArrayView<const float> GetOutput() const;
-  // Computes the fully-connected layer output.
-  void ComputeOutput(rtc::ArrayView<const float> input);
-
- private:
-  const size_t input_size_;
-  const size_t output_size_;
-  const rtc::ArrayView<const int8_t> bias_;
-  const rtc::ArrayView<const int8_t> weights_;
-  float (*const activation_function_)(float);
-  // The output vector of a recurrent layer has length equal to |output_size_|.
-  // However, for efficiency, over-allocation is used.
-  std::array<float, kFullyConnectedLayersMaxUnits> output_;
-};
-
-// Recurrent layer with gated recurrent units (GRUs).
-class GatedRecurrentLayer {
- public:
-  GatedRecurrentLayer(const size_t input_size,
-                      const size_t output_size,
-                      const rtc::ArrayView<const int8_t> bias,
-                      const rtc::ArrayView<const int8_t> weights,
-                      const rtc::ArrayView<const int8_t> recurrent_weights,
-                      float (*const activation_function)(float));
-  GatedRecurrentLayer(const GatedRecurrentLayer&) = delete;
-  GatedRecurrentLayer& operator=(const GatedRecurrentLayer&) = delete;
-  ~GatedRecurrentLayer();
-  size_t input_size() const { return input_size_; }
-  size_t output_size() const { return output_size_; }
-  rtc::ArrayView<const float> GetOutput() const;
-  void Reset();
-  // Computes the recurrent layer output and updates the status.
-  void ComputeOutput(rtc::ArrayView<const float> input);
-
- private:
-  const size_t input_size_;
-  const size_t output_size_;
-  const rtc::ArrayView<const int8_t> bias_;
-  const rtc::ArrayView<const int8_t> weights_;
-  const rtc::ArrayView<const int8_t> recurrent_weights_;
-  float (*const activation_function_)(float);
-  // The state vector of a recurrent layer has length equal to |output_size_|.
-  // However, to avoid dynamic allocation, over-allocation is used.
-  std::array<float, kRecurrentLayersMaxUnits> state_;
-};
-
-// Recurrent network based VAD.
-class RnnBasedVad {
- public:
-  RnnBasedVad();
-  RnnBasedVad(const RnnBasedVad&) = delete;
-  RnnBasedVad& operator=(const RnnBasedVad&) = delete;
-  ~RnnBasedVad();
-  void Reset();
-  // Compute and returns the probability of voice (range: [0.0, 1.0]).
-  float ComputeVadProbability(
-      rtc::ArrayView<const float, kFeatureVectorSize> feature_vector,
-      bool is_silence);
-
- private:
-  FullyConnectedLayer input_layer_;
-  GatedRecurrentLayer hidden_layer_;
-  FullyConnectedLayer output_layer_;
-};
-
-}  // namespace rnn_vad
-}  // namespace webrtc
-
-#endif  // MODULES_AUDIO_PROCESSING_AGC2_RNN_VAD_RNN_H_
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/agc2/rnn_vad/sequence_buffer.h b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/agc2/rnn_vad/sequence_buffer.h
deleted file mode 100644
index 75d3d9bc09..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/agc2/rnn_vad/sequence_buffer.h
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- *  Copyright (c) 2018 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#ifndef MODULES_AUDIO_PROCESSING_AGC2_RNN_VAD_SEQUENCE_BUFFER_H_
-#define MODULES_AUDIO_PROCESSING_AGC2_RNN_VAD_SEQUENCE_BUFFER_H_
-
-#include <algorithm>
-#include <cstring>
-#include <type_traits>
-#include <vector>
-
-#include "api/array_view.h"
-#include "rtc_base/checks.h"
-
-namespace webrtc {
-namespace rnn_vad {
-
-// Linear buffer implementation to (i) push fixed size chunks of sequential data
-// and (ii) view contiguous parts of the buffer. The buffer and the pushed
-// chunks have size S and N respectively. For instance, when S = 2N the first
-// half of the sequence buffer is replaced with its second half, and the new N
-// values are written at the end of the buffer.
-// The class also provides a view on the most recent M values, where 0 < M <= S
-// and by default M = N.
-template <typename T, size_t S, size_t N, size_t M = N>
-class SequenceBuffer {
-  static_assert(N <= S,
-                "The new chunk size cannot be larger than the sequence buffer "
-                "size.");
-  static_assert(std::is_arithmetic<T>::value,
-                "Integral or floating point required.");
-
- public:
-  SequenceBuffer() : buffer_(S) {
-    RTC_DCHECK_EQ(S, buffer_.size());
-    Reset();
-  }
-  SequenceBuffer(const SequenceBuffer&) = delete;
-  SequenceBuffer& operator=(const SequenceBuffer&) = delete;
-  ~SequenceBuffer() = default;
-  size_t size() const { return S; }
-  size_t chunks_size() const { return N; }
-  // Sets the sequence buffer values to zero.
-  void Reset() { std::fill(buffer_.begin(), buffer_.end(), 0); }
-  // Returns a view on the whole buffer.
-  rtc::ArrayView<const T, S> GetBufferView() const {
-    return {buffer_.data(), S};
-  }
-  // Returns a view on the M most recent values of the buffer.
-  rtc::ArrayView<const T, M> GetMostRecentValuesView() const {
-    static_assert(M <= S,
-                  "The number of most recent values cannot be larger than the "
-                  "sequence buffer size.");
-    return {buffer_.data() + S - M, M};
-  }
-  // Shifts left the buffer by N items and add new N items at the end.
-  void Push(rtc::ArrayView<const T, N> new_values) {
-    // Make space for the new values.
-    if (S > N)
-      std::memmove(buffer_.data(), buffer_.data() + N, (S - N) * sizeof(T));
-    // Copy the new values at the end of the buffer.
-    std::memcpy(buffer_.data() + S - N, new_values.data(), N * sizeof(T));
-  }
-
- private:
-  std::vector<T> buffer_;
-};
-
-}  // namespace rnn_vad
-}  // namespace webrtc
-
-#endif  // MODULES_AUDIO_PROCESSING_AGC2_RNN_VAD_SEQUENCE_BUFFER_H_
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/agc2/rnn_vad/spectral_features.cc b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/agc2/rnn_vad/spectral_features.cc
deleted file mode 100644
index 695eed57f0..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/agc2/rnn_vad/spectral_features.cc
+++ /dev/null
@@ -1,198 +0,0 @@
-/*
- *  Copyright (c) 2018 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#include "modules/audio_processing/agc2/rnn_vad/spectral_features.h"
-
-#include <algorithm>
-#include <cmath>
-#include <limits>
-#include <numeric>
-
-#include "modules/audio_processing/agc2/rnn_vad/spectral_features_internal.h"
-#include "rtc_base/checks.h"
-
-namespace webrtc {
-namespace rnn_vad {
-namespace {
-
-constexpr float kSilenceThreshold = 0.04f;
-
-// Computes the new spectral difference stats and pushes them into the passed
-// symmetric matrix buffer.
-void UpdateSpectralDifferenceStats(
-    rtc::ArrayView<const float, kNumBands> new_spectral_coeffs,
-    const RingBuffer<float, kNumBands, kSpectralCoeffsHistorySize>& ring_buf,
-    SymmetricMatrixBuffer<float, kSpectralCoeffsHistorySize>* sym_matrix_buf) {
-  RTC_DCHECK(sym_matrix_buf);
-  // Compute the new spectral distance stats.
-  std::array<float, kSpectralCoeffsHistorySize - 1> distances;
-  for (size_t i = 0; i < kSpectralCoeffsHistorySize - 1; ++i) {
-    const size_t delay = i + 1;
-    auto old_spectral_coeffs = ring_buf.GetArrayView(delay);
-    distances[i] = 0.f;
-    for (size_t k = 0; k < kNumBands; ++k) {
-      const float c = new_spectral_coeffs[k] - old_spectral_coeffs[k];
-      distances[i] += c * c;
-    }
-  }
-  // Push the new spectral distance stats into the symmetric matrix buffer.
-  sym_matrix_buf->Push(distances);
-}
-
-}  // namespace
-
-SpectralFeaturesView::SpectralFeaturesView(
-    rtc::ArrayView<float, kNumBands - kNumLowerBands> coeffs,
-    rtc::ArrayView<float, kNumLowerBands> average,
-    rtc::ArrayView<float, kNumLowerBands> first_derivative,
-    rtc::ArrayView<float, kNumLowerBands> second_derivative,
-    rtc::ArrayView<float, kNumLowerBands> cross_correlations,
-    float* variability)
-    : coeffs(coeffs),
-      average(average),
-      first_derivative(first_derivative),
-      second_derivative(second_derivative),
-      cross_correlations(cross_correlations),
-      variability(variability) {}
-
-SpectralFeaturesView::SpectralFeaturesView(const SpectralFeaturesView&) =
-    default;
-SpectralFeaturesView::~SpectralFeaturesView() = default;
-
-SpectralFeaturesExtractor::SpectralFeaturesExtractor()
-    : fft_(),
-      reference_frame_fft_(kFrameSize20ms24kHz),
-      lagged_frame_fft_(kFrameSize20ms24kHz),
-      band_boundaries_(
-          ComputeBandBoundaryIndexes(kSampleRate24kHz, kFrameSize20ms24kHz)),
-      dct_table_(ComputeDctTable()) {}
-
-SpectralFeaturesExtractor::~SpectralFeaturesExtractor() = default;
-
-void SpectralFeaturesExtractor::Reset() {
-  spectral_coeffs_ring_buf_.Reset();
-  spectral_diffs_buf_.Reset();
-}
-
-bool SpectralFeaturesExtractor::CheckSilenceComputeFeatures(
-    rtc::ArrayView<const float, kFrameSize20ms24kHz> reference_frame,
-    rtc::ArrayView<const float, kFrameSize20ms24kHz> lagged_frame,
-    SpectralFeaturesView spectral_features) {
-  // Analyze reference frame.
-  fft_.ForwardFft(reference_frame, reference_frame_fft_);
-  ComputeBandEnergies(reference_frame_fft_, band_boundaries_,
-                      reference_frame_energy_coeffs_);
-  // Check if the reference frame has silence.
-  const float tot_energy =
-      std::accumulate(reference_frame_energy_coeffs_.begin(),
-                      reference_frame_energy_coeffs_.end(), 0.f);
-  if (tot_energy < kSilenceThreshold)
-    return true;
-  // Analyze lagged frame.
-  fft_.ForwardFft(lagged_frame, lagged_frame_fft_);
-  ComputeBandEnergies(lagged_frame_fft_, band_boundaries_,
-                      lagged_frame_energy_coeffs_);
-  // Log of the band energies for the reference frame.
-  std::array<float, kNumBands> log_band_energy_coeffs;
-  ComputeLogBandEnergiesCoefficients(reference_frame_energy_coeffs_,
-                                     log_band_energy_coeffs);
-  // Decorrelate band-wise log energy coefficients via DCT.
-  std::array<float, kNumBands> log_band_energy_coeffs_decorrelated;
-  ComputeDct(log_band_energy_coeffs, dct_table_,
-             log_band_energy_coeffs_decorrelated);
-  // Normalize (based on training set stats).
-  log_band_energy_coeffs_decorrelated[0] -= 12;
-  log_band_energy_coeffs_decorrelated[1] -= 4;
-  // Update the ring buffer and the spectral difference stats.
-  spectral_coeffs_ring_buf_.Push(log_band_energy_coeffs_decorrelated);
-  UpdateSpectralDifferenceStats(log_band_energy_coeffs_decorrelated,
-                                spectral_coeffs_ring_buf_,
-                                &spectral_diffs_buf_);
-  // Write the higher bands spectral coefficients.
-  auto coeffs_src = spectral_coeffs_ring_buf_.GetArrayView(0);
-  RTC_DCHECK_EQ(coeffs_src.size() - kNumLowerBands,
-                spectral_features.coeffs.size());
-  std::copy(coeffs_src.begin() + kNumLowerBands, coeffs_src.end(),
-            spectral_features.coeffs.begin());
-  // Compute and write remaining features.
-  ComputeAvgAndDerivatives(spectral_features.average,
-                           spectral_features.first_derivative,
-                           spectral_features.second_derivative);
-  ComputeCrossCorrelation(spectral_features.cross_correlations);
-  RTC_DCHECK(spectral_features.variability);
-  *(spectral_features.variability) = ComputeVariability();
-  return false;
-}
-
-void SpectralFeaturesExtractor::ComputeAvgAndDerivatives(
-    rtc::ArrayView<float, kNumLowerBands> average,
-    rtc::ArrayView<float, kNumLowerBands> first_derivative,
-    rtc::ArrayView<float, kNumLowerBands> second_derivative) {
-  auto curr = spectral_coeffs_ring_buf_.GetArrayView(0);
-  auto prev1 = spectral_coeffs_ring_buf_.GetArrayView(1);
-  auto prev2 = spectral_coeffs_ring_buf_.GetArrayView(2);
-  RTC_DCHECK_EQ(average.size(), first_derivative.size());
-  RTC_DCHECK_EQ(first_derivative.size(), second_derivative.size());
-  RTC_DCHECK_LE(average.size(), curr.size());
-  for (size_t i = 0; i < average.size(); ++i) {
-    // Average, kernel: [1, 1, 1].
-    average[i] = curr[i] + prev1[i] + prev2[i];
-    // First derivative, kernel: [1, 0, - 1].
-    first_derivative[i] = curr[i] - prev2[i];
-    // Second derivative, Laplacian kernel: [1, -2, 1].
-    second_derivative[i] = curr[i] - 2 * prev1[i] + prev2[i];
-  }
-}
-
-void SpectralFeaturesExtractor::ComputeCrossCorrelation(
-    rtc::ArrayView<float, kNumLowerBands> cross_correlations) {
-  const auto& x = reference_frame_fft_;
-  const auto& y = lagged_frame_fft_;
-  auto cross_corr = [x, y](const size_t freq_bin_index) -> float {
-    return (x[freq_bin_index].real() * y[freq_bin_index].real() +
-            x[freq_bin_index].imag() * y[freq_bin_index].imag());
-  };
-  std::array<float, kNumBands> cross_corr_coeffs;
-  constexpr size_t kNumFftPoints = kFrameSize20ms24kHz / 2 + 1;
-  ComputeBandCoefficients(cross_corr, band_boundaries_, kNumFftPoints - 1,
-                          cross_corr_coeffs);
-  // Normalize.
-  for (size_t i = 0; i < cross_corr_coeffs.size(); ++i) {
-    cross_corr_coeffs[i] =
-        cross_corr_coeffs[i] /
-        std::sqrt(0.001f + reference_frame_energy_coeffs_[i] *
-                               lagged_frame_energy_coeffs_[i]);
-  }
-  // Decorrelate.
-  ComputeDct(cross_corr_coeffs, dct_table_, cross_correlations);
-  // Normalize (based on training set stats).
-  cross_correlations[0] -= 1.3f;
-  cross_correlations[1] -= 0.9f;
-}
-
-float SpectralFeaturesExtractor::ComputeVariability() {
-  // Compute spectral variability score.
-  float spec_variability = 0.f;
-  for (size_t delay1 = 0; delay1 < kSpectralCoeffsHistorySize; ++delay1) {
-    float min_dist = std::numeric_limits<float>::max();
-    for (size_t delay2 = 0; delay2 < kSpectralCoeffsHistorySize; ++delay2) {
-      if (delay1 == delay2)  // The distance would be 0.
-        continue;
-      min_dist =
-          std::min(min_dist, spectral_diffs_buf_.GetValue(delay1, delay2));
-    }
-    spec_variability += min_dist;
-  }
-  // Normalize (based on training set stats).
-  return spec_variability / kSpectralCoeffsHistorySize - 2.1f;
-}
-
-}  // namespace rnn_vad
-}  // namespace webrtc
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/agc2/rnn_vad/spectral_features.h b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/agc2/rnn_vad/spectral_features.h
deleted file mode 100644
index 5c33dcdd24..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/agc2/rnn_vad/spectral_features.h
+++ /dev/null
@@ -1,93 +0,0 @@
-/*
- *  Copyright (c) 2018 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#ifndef MODULES_AUDIO_PROCESSING_AGC2_RNN_VAD_SPECTRAL_FEATURES_H_
-#define MODULES_AUDIO_PROCESSING_AGC2_RNN_VAD_SPECTRAL_FEATURES_H_
-
-#include <array>
-#include <complex>
-#include <cstddef>
-#include <vector>
-
-#include "api/array_view.h"
-#include "modules/audio_processing/agc2/rnn_vad/common.h"
-#include "modules/audio_processing/agc2/rnn_vad/fft_util.h"
-#include "modules/audio_processing/agc2/rnn_vad/ring_buffer.h"
-#include "modules/audio_processing/agc2/rnn_vad/symmetric_matrix_buffer.h"
-
-namespace webrtc {
-namespace rnn_vad {
-
-// View on spectral features.
-class SpectralFeaturesView {
- public:
-  SpectralFeaturesView(rtc::ArrayView<float, kNumBands - kNumLowerBands> coeffs,
-                       rtc::ArrayView<float, kNumLowerBands> average,
-                       rtc::ArrayView<float, kNumLowerBands> first_derivative,
-                       rtc::ArrayView<float, kNumLowerBands> second_derivative,
-                       rtc::ArrayView<float, kNumLowerBands> cross_correlations,
-                       float* variability);
-  SpectralFeaturesView(const SpectralFeaturesView&);
-  ~SpectralFeaturesView();
-  // Higher bands spectral coefficients.
-  const rtc::ArrayView<float, kNumBands - kNumLowerBands> coeffs;
-  // Average and first and second derivative over time for the lower bands.
-  const rtc::ArrayView<float, kNumLowerBands> average;
-  const rtc::ArrayView<float, kNumLowerBands> first_derivative;
-  const rtc::ArrayView<float, kNumLowerBands> second_derivative;
-  // Spectral cross-correlation for the lower bands.
-  const rtc::ArrayView<float, kNumLowerBands> cross_correlations;
-  // Spectral variability score.
-  float* const variability;
-};
-
-// Class to compute spectral features.
-class SpectralFeaturesExtractor {
- public:
-  SpectralFeaturesExtractor();
-  SpectralFeaturesExtractor(const SpectralFeaturesExtractor&) = delete;
-  SpectralFeaturesExtractor& operator=(const SpectralFeaturesExtractor&) =
-      delete;
-  ~SpectralFeaturesExtractor();
-  // Resets the internal state of the feature extractor.
-  void Reset();
-  // Analyzes a pair of reference and lagged frames from the pitch buffer,
-  // detects silence and computes features. If silence is detected, the output
-  // is neither computed nor written.
-  bool CheckSilenceComputeFeatures(
-      rtc::ArrayView<const float, kFrameSize20ms24kHz> reference_frame,
-      rtc::ArrayView<const float, kFrameSize20ms24kHz> lagged_frame,
-      SpectralFeaturesView spectral_features);
-
- private:
-  void ComputeAvgAndDerivatives(
-      rtc::ArrayView<float, kNumLowerBands> average,
-      rtc::ArrayView<float, kNumLowerBands> first_derivative,
-      rtc::ArrayView<float, kNumLowerBands> second_derivative);
-  void ComputeCrossCorrelation(
-      rtc::ArrayView<float, kNumLowerBands> cross_correlations);
-  float ComputeVariability();
-
-  BandAnalysisFft fft_;
-  std::vector<std::complex<float>> reference_frame_fft_;
-  std::vector<std::complex<float>> lagged_frame_fft_;
-  std::array<float, kNumBands> reference_frame_energy_coeffs_{};
-  std::array<float, kNumBands> lagged_frame_energy_coeffs_{};
-  const std::array<size_t, kNumBands> band_boundaries_;
-  const std::array<float, kNumBands * kNumBands> dct_table_;
-  RingBuffer<float, kNumBands, kSpectralCoeffsHistorySize>
-      spectral_coeffs_ring_buf_;
-  SymmetricMatrixBuffer<float, kSpectralCoeffsHistorySize> spectral_diffs_buf_;
-};
-
-}  // namespace rnn_vad
-}  // namespace webrtc
-
-#endif  // MODULES_AUDIO_PROCESSING_AGC2_RNN_VAD_SPECTRAL_FEATURES_H_
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/agc2/rnn_vad/spectral_features_internal.cc b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/agc2/rnn_vad/spectral_features_internal.cc
deleted file mode 100644
index 74211fe814..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/agc2/rnn_vad/spectral_features_internal.cc
+++ /dev/null
@@ -1,132 +0,0 @@
-/*
- *  Copyright (c) 2018 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#include "modules/audio_processing/agc2/rnn_vad/spectral_features_internal.h"
-
-#include <algorithm>
-#include <cmath>
-#include <cstddef>
-
-#include "rtc_base/checks.h"
-
-namespace webrtc {
-namespace rnn_vad {
-namespace {
-
-// DCT scaling factor.
-static_assert(
-    kNumBands == 22,
-    "kNumBands changed! Please update the value of kDctScalingFactor");
-constexpr float kDctScalingFactor = 0.301511345f;  // sqrt(2 / kNumBands)
-
-}  // namespace
-
-std::array<size_t, kNumBands> ComputeBandBoundaryIndexes(
-    size_t sample_rate_hz,
-    size_t frame_size_samples) {
-  std::array<size_t, kNumBands> indexes;
-  for (size_t i = 0; i < kNumBands; ++i) {
-    indexes[i] =
-        kBandFrequencyBoundaries[i] * frame_size_samples / sample_rate_hz;
-  }
-  return indexes;
-}
-
-void ComputeBandCoefficients(
-    rtc::FunctionView<float(size_t)> functor,
-    rtc::ArrayView<const size_t, kNumBands> band_boundaries,
-    size_t max_freq_bin_index,
-    rtc::ArrayView<float, kNumBands> coefficients) {
-  std::fill(coefficients.begin(), coefficients.end(), 0.f);
-  for (size_t i = 0; i < coefficients.size() - 1; ++i) {
-    RTC_DCHECK_EQ(0.f, coefficients[i + 1]);
-    RTC_DCHECK_GT(band_boundaries[i + 1], band_boundaries[i]);
-    const size_t first_freq_bin = band_boundaries[i];
-    const size_t last_freq_bin =
-        std::min(max_freq_bin_index, first_freq_bin + band_boundaries[i + 1] -
-                                         band_boundaries[i] - 1);
-    // Depending on the sample rate, the highest bands can have no FFT
-    // coefficients. Stop the iteration when coming across the first empty band.
-    if (first_freq_bin >= last_freq_bin)
-      break;
-    const size_t band_size = last_freq_bin - first_freq_bin + 1;
-    // Compute the band coefficient using a triangular band with peak response
-    // at the band boundary.
-    for (size_t j = first_freq_bin; j <= last_freq_bin; ++j) {
-      const float w = static_cast<float>(j - first_freq_bin) / band_size;
-      const float coefficient = functor(j);
-      coefficients[i] += (1.f - w) * coefficient;
-      coefficients[i + 1] += w * coefficient;
-    }
-  }
-  // The first and the last bands in the loop above only got half contribution.
-  coefficients[0] *= 2.f;
-  coefficients[coefficients.size() - 1] *= 2.f;
-  // TODO(bugs.webrtc.org/9076): Replace the line above with
-  // "coefficients[i] *= 2.f" (*) since we now assume that the last band is
-  // always |kNumBands| - 1.
-  // (*): "size_t i" must be declared before the main loop.
-}
-
-void ComputeBandEnergies(
-    rtc::ArrayView<const std::complex<float>> fft_coeffs,
-    rtc::ArrayView<const size_t, kNumBands> band_boundaries,
-    rtc::ArrayView<float, kNumBands> band_energies) {
-  RTC_DCHECK_EQ(band_boundaries.size(), band_energies.size());
-  auto functor = [fft_coeffs](const size_t freq_bin_index) -> float {
-    return std::norm(fft_coeffs[freq_bin_index]);
-  };
-  ComputeBandCoefficients(functor, band_boundaries, fft_coeffs.size() - 1,
-                          band_energies);
-}
-
-void ComputeLogBandEnergiesCoefficients(
-    rtc::ArrayView<const float, kNumBands> band_energy_coeffs,
-    rtc::ArrayView<float, kNumBands> log_band_energy_coeffs) {
-  float log_max = -2.f;
-  float follow = -2.f;
-  for (size_t i = 0; i < band_energy_coeffs.size(); ++i) {
-    log_band_energy_coeffs[i] = std::log10(1e-2f + band_energy_coeffs[i]);
-    // Smoothing across frequency bands.
-    log_band_energy_coeffs[i] = std::max(
-        log_max - 7.f, std::max(follow - 1.5f, log_band_energy_coeffs[i]));
-    log_max = std::max(log_max, log_band_energy_coeffs[i]);
-    follow = std::max(follow - 1.5f, log_band_energy_coeffs[i]);
-  }
-}
-
-std::array<float, kNumBands * kNumBands> ComputeDctTable() {
-  std::array<float, kNumBands * kNumBands> dct_table;
-  const double k = std::sqrt(0.5);
-  for (size_t i = 0; i < kNumBands; ++i) {
-    for (size_t j = 0; j < kNumBands; ++j)
-      dct_table[i * kNumBands + j] = std::cos((i + 0.5) * j * kPi / kNumBands);
-    dct_table[i * kNumBands] *= k;
-  }
-  return dct_table;
-}
-
-void ComputeDct(rtc::ArrayView<const float, kNumBands> in,
-                rtc::ArrayView<const float, kNumBands * kNumBands> dct_table,
-                rtc::ArrayView<float> out) {
-  RTC_DCHECK_NE(in.data(), out.data()) << "In-place DCT is not supported.";
-  RTC_DCHECK_LE(1, out.size());
-  RTC_DCHECK_LE(out.size(), in.size());
-  std::fill(out.begin(), out.end(), 0.f);
-  for (size_t i = 0; i < out.size(); ++i) {
-    for (size_t j = 0; j < in.size(); ++j) {
-      out[i] += in[j] * dct_table[j * in.size() + i];
-    }
-    out[i] *= kDctScalingFactor;
-  }
-}
-
-}  // namespace rnn_vad
-}  // namespace webrtc
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/agc2/rnn_vad/spectral_features_internal.h b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/agc2/rnn_vad/spectral_features_internal.h
deleted file mode 100644
index edfd18cc85..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/agc2/rnn_vad/spectral_features_internal.h
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- *  Copyright (c) 2018 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#ifndef MODULES_AUDIO_PROCESSING_AGC2_RNN_VAD_SPECTRAL_FEATURES_INTERNAL_H_
-#define MODULES_AUDIO_PROCESSING_AGC2_RNN_VAD_SPECTRAL_FEATURES_INTERNAL_H_
-
-#include <stddef.h>
-#include <array>
-#include <complex>
-
-#include "api/array_view.h"
-#include "modules/audio_processing/agc2/rnn_vad/common.h"
-#include "rtc_base/function_view.h"
-
-namespace webrtc {
-namespace rnn_vad {
-
-// Computes FFT boundary indexes corresponding to sub-bands.
-std::array<size_t, kNumBands> ComputeBandBoundaryIndexes(
-    size_t sample_rate_hz,
-    size_t frame_size_samples);
-
-// Iterates through frequency bands and computes coefficients via |functor| for
-// triangular bands with peak response at each band boundary. |functor| returns
-// a floating point value for the FFT coefficient having index equal to the
-// argument passed to |functor|; that argument is in the range {0, ...
-// |max_freq_bin_index| - 1}.
-void ComputeBandCoefficients(
-    rtc::FunctionView<float(size_t)> functor,
-    rtc::ArrayView<const size_t, kNumBands> band_boundaries,
-    const size_t max_freq_bin_index,
-    rtc::ArrayView<float, kNumBands> coefficients);
-
-// Given an array of FFT coefficients and a vector of band boundary indexes,
-// computes band energy coefficients.
-void ComputeBandEnergies(
-    rtc::ArrayView<const std::complex<float>> fft_coeffs,
-    rtc::ArrayView<const size_t, kNumBands> band_boundaries,
-    rtc::ArrayView<float, kNumBands> band_energies);
-
-// Computes log band energy coefficients.
-void ComputeLogBandEnergiesCoefficients(
-    rtc::ArrayView<const float, kNumBands> band_energy_coeffs,
-    rtc::ArrayView<float, kNumBands> log_band_energy_coeffs);
-
-// Creates a DCT table for arrays having size equal to |kNumBands|.
-std::array<float, kNumBands * kNumBands> ComputeDctTable();
-
-// Computes DCT for |in| given a pre-computed DCT table. In-place computation is
-// not allowed and |out| can be smaller than |in| in order to only compute the
-// first DCT coefficients.
-void ComputeDct(rtc::ArrayView<const float, kNumBands> in,
-                rtc::ArrayView<const float, kNumBands * kNumBands> dct_table,
-                rtc::ArrayView<float> out);
-
-}  // namespace rnn_vad
-}  // namespace webrtc
-
-#endif  // MODULES_AUDIO_PROCESSING_AGC2_RNN_VAD_SPECTRAL_FEATURES_INTERNAL_H_
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/agc2/rnn_vad/symmetric_matrix_buffer.h b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/agc2/rnn_vad/symmetric_matrix_buffer.h
deleted file mode 100644
index f0282aaed5..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/agc2/rnn_vad/symmetric_matrix_buffer.h
+++ /dev/null
@@ -1,94 +0,0 @@
-/*
- *  Copyright (c) 2018 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#ifndef MODULES_AUDIO_PROCESSING_AGC2_RNN_VAD_SYMMETRIC_MATRIX_BUFFER_H_
-#define MODULES_AUDIO_PROCESSING_AGC2_RNN_VAD_SYMMETRIC_MATRIX_BUFFER_H_
-
-#include <algorithm>
-#include <array>
-#include <cstring>
-#include <utility>
-
-#include "api/array_view.h"
-#include "rtc_base/checks.h"
-
-namespace webrtc {
-namespace rnn_vad {
-
-// Data structure to buffer the results of pair-wise comparisons between items
-// stored in a ring buffer. Every time that the oldest item is replaced in the
-// ring buffer, the new one is compared to the remaining items in the ring
-// buffer. The results of such comparisons need to be buffered and automatically
-// removed when one of the two corresponding items that have been compared is
-// removed from the ring buffer. It is assumed that the comparison is symmetric
-// and that comparing an item with itself is not needed.
-template <typename T, size_t S>
-class SymmetricMatrixBuffer {
-  static_assert(S > 2, "");
-
- public:
-  SymmetricMatrixBuffer() = default;
-  SymmetricMatrixBuffer(const SymmetricMatrixBuffer&) = delete;
-  SymmetricMatrixBuffer& operator=(const SymmetricMatrixBuffer&) = delete;
-  ~SymmetricMatrixBuffer() = default;
-  // Sets the buffer values to zero.
-  void Reset() {
-    static_assert(std::is_arithmetic<T>::value,
-                  "Integral or floating point required.");
-    buf_.fill(0);
-  }
-  // Pushes the results from the comparison between the most recent item and
-  // those that are still in the ring buffer. The first element in |values| must
-  // correspond to the comparison between the most recent item and the second
-  // most recent one in the ring buffer, whereas the last element in |values|
-  // must correspond to the comparison between the most recent item and the
-  // oldest one in the ring buffer.
-  void Push(rtc::ArrayView<T, S - 1> values) {
-    // Move the lower-right sub-matrix of size (S-2) x (S-2) one row up and one
-    // column left.
-    std::memmove(buf_.data(), buf_.data() + S, (buf_.size() - S) * sizeof(T));
-    // Copy new values in the last column in the right order.
-    for (size_t i = 0; i < values.size(); ++i) {
-      const size_t index = (S - 1 - i) * (S - 1) - 1;
-      RTC_DCHECK_LE(static_cast<size_t>(0), index);
-      RTC_DCHECK_LT(index, buf_.size());
-      buf_[index] = values[i];
-    }
-  }
-  // Reads the value that corresponds to comparison of two items in the ring
-  // buffer having delay |delay1| and |delay2|. The two arguments must not be
-  // equal and both must be in {0, ..., S - 1}.
-  T GetValue(size_t delay1, size_t delay2) const {
-    int row = S - 1 - static_cast<int>(delay1);
-    int col = S - 1 - static_cast<int>(delay2);
-    RTC_DCHECK_NE(row, col) << "The diagonal cannot be accessed.";
-    if (row > col)
-      std::swap(row, col);  // Swap to access the upper-right triangular part.
-    RTC_DCHECK_LE(0, row);
-    RTC_DCHECK_LT(row, S - 1) << "Not enforcing row < col and row != col.";
-    RTC_DCHECK_LE(1, col) << "Not enforcing row < col and row != col.";
-    RTC_DCHECK_LT(col, S);
-    const int index = row * (S - 1) + (col - 1);
-    RTC_DCHECK_LE(0, index);
-    RTC_DCHECK_LT(index, buf_.size());
-    return buf_[index];
-  }
-
- private:
-  // Encode an upper-right triangular matrix (excluding its diagonal) using a
-  // square matrix. This allows to move the data in Push() with one single
-  // operation.
-  std::array<T, (S - 1) * (S - 1)> buf_{};
-};
-
-}  // namespace rnn_vad
-}  // namespace webrtc
-
-#endif  // MODULES_AUDIO_PROCESSING_AGC2_RNN_VAD_SYMMETRIC_MATRIX_BUFFER_H_
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/agc2/rnn_vad/test_utils.h b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/agc2/rnn_vad/test_utils.h
deleted file mode 100644
index 15be85ac00..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/agc2/rnn_vad/test_utils.h
+++ /dev/null
@@ -1,125 +0,0 @@
-/*
- *  Copyright (c) 2018 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#ifndef MODULES_AUDIO_PROCESSING_AGC2_RNN_VAD_TEST_UTILS_H_
-#define MODULES_AUDIO_PROCESSING_AGC2_RNN_VAD_TEST_UTILS_H_
-
-#include <algorithm>
-#include <fstream>
-#include <limits>
-#include <memory>
-#include <string>
-#include <utility>
-#include <vector>
-
-#include "api/array_view.h"
-#include "rtc_base/checks.h"
-
-namespace webrtc {
-namespace rnn_vad {
-namespace test {
-
-constexpr float kFloatMin = std::numeric_limits<float>::min();
-
-// Fails for every pair from two equally sized rtc::ArrayView<float> views such
-// that the values in the pair do not match.
-void ExpectEqualFloatArray(rtc::ArrayView<const float> expected,
-                           rtc::ArrayView<const float> computed);
-
-// Fails for every pair from two equally sized rtc::ArrayView<float> views such
-// that their absolute error is above a given threshold.
-void ExpectNearAbsolute(rtc::ArrayView<const float> expected,
-                        rtc::ArrayView<const float> computed,
-                        float tolerance);
-
-// Reader for binary files consisting of an arbitrary long sequence of elements
-// having type T. It is possible to read and cast to another type D at once.
-template <typename T, typename D = T>
-class BinaryFileReader {
- public:
-  explicit BinaryFileReader(const std::string& file_path, size_t chunk_size = 1)
-      : is_(file_path, std::ios::binary | std::ios::ate),
-        data_length_(is_.tellg() / sizeof(T)),
-        chunk_size_(chunk_size) {
-    RTC_CHECK_LT(0, chunk_size_);
-    RTC_CHECK(is_);
-    SeekBeginning();
-    buf_.resize(chunk_size_);
-  }
-  BinaryFileReader(const BinaryFileReader&) = delete;
-  BinaryFileReader& operator=(const BinaryFileReader&) = delete;
-  ~BinaryFileReader() = default;
-  size_t data_length() const { return data_length_; }
-  bool ReadValue(D* dst) {
-    if (std::is_same<T, D>::value) {
-      is_.read(reinterpret_cast<char*>(dst), sizeof(T));
-    } else {
-      T v;
-      is_.read(reinterpret_cast<char*>(&v), sizeof(T));
-      *dst = static_cast<D>(v);
-    }
-    return is_.gcount() == sizeof(T);
-  }
-  bool ReadChunk(rtc::ArrayView<D> dst) {
-    RTC_DCHECK_EQ(chunk_size_, dst.size());
-    const std::streamsize bytes_to_read = chunk_size_ * sizeof(T);
-    if (std::is_same<T, D>::value) {
-      is_.read(reinterpret_cast<char*>(dst.data()), bytes_to_read);
-    } else {
-      is_.read(reinterpret_cast<char*>(buf_.data()), bytes_to_read);
-      std::transform(buf_.begin(), buf_.end(), dst.begin(),
-                     [](const T& v) -> D { return static_cast<D>(v); });
-    }
-    return is_.gcount() == bytes_to_read;
-  }
-  void SeekForward(size_t items) { is_.seekg(items * sizeof(T), is_.cur); }
-  void SeekBeginning() { is_.seekg(0, is_.beg); }
-
- private:
-  std::ifstream is_;
-  const size_t data_length_;
-  const size_t chunk_size_;
-  std::vector<T> buf_;
-};
-
-// Factories for resource file readers.
-// Creates a reader for the pitch search test data.
-std::unique_ptr<BinaryFileReader<float>> CreatePitchSearchTestDataReader();
-// The functions below return a pair where the first item is a reader unique
-// pointer and the second the number of chunks that can be read from the file.
-// Creates a reader for the PCM samples that casts from S16 to float and reads
-// chunks with length |frame_length|.
-std::pair<std::unique_ptr<BinaryFileReader<int16_t, float>>, const size_t>
-CreatePcmSamplesReader(const size_t frame_length);
-// Creates a reader for the pitch buffer content at 24 kHz.
-std::pair<std::unique_ptr<BinaryFileReader<float>>, const size_t>
-CreatePitchBuffer24kHzReader();
-// Creates a reader for the the LP residual coefficients and the pitch period
-// and gain values.
-std::pair<std::unique_ptr<BinaryFileReader<float>>, const size_t>
-CreateLpResidualAndPitchPeriodGainReader();
-// Creates a reader for the FFT coefficients.
-std::pair<std::unique_ptr<BinaryFileReader<float>>, const size_t>
-CreateFftCoeffsReader();
-// Instance a reader for the band energy coefficients.
-std::pair<std::unique_ptr<BinaryFileReader<float>>, const size_t>
-CreateBandEnergyCoeffsReader();
-// Creates a reader for the silence flags and the feature matrix.
-std::pair<std::unique_ptr<BinaryFileReader<float>>, const size_t>
-CreateSilenceFlagsFeatureMatrixReader();
-// Creates a reader for the VAD probabilities.
-std::pair<std::unique_ptr<BinaryFileReader<float>>, const size_t>
-CreateVadProbsReader();
-
-}  // namespace test
-}  // namespace rnn_vad
-}  // namespace webrtc
-
-#endif  // MODULES_AUDIO_PROCESSING_AGC2_RNN_VAD_TEST_UTILS_H_
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/agc2/saturation_protector.cc b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/agc2/saturation_protector.cc
deleted file mode 100644
index 94a52eaaca..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/agc2/saturation_protector.cc
+++ /dev/null
@@ -1,102 +0,0 @@
-/*
- *  Copyright (c) 2018 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#include "modules/audio_processing/agc2/saturation_protector.h"
-
-#include <algorithm>
-#include <iterator>
-
-#include "modules/audio_processing/logging/apm_data_dumper.h"
-#include "rtc_base/numerics/safe_minmax.h"
-
-namespace webrtc {
-
-namespace {
-void ShiftBuffer(std::array<float, kPeakEnveloperBufferSize>* buffer_) {
-  // Move everything one element back.
-  std::copy(buffer_->begin() + 1, buffer_->end(), buffer_->begin());
-}
-}  // namespace
-
-SaturationProtector::PeakEnveloper::PeakEnveloper() = default;
-
-void SaturationProtector::PeakEnveloper::Process(float frame_peak_dbfs) {
-  // Update the delayed buffer and the current superframe peak.
-  current_superframe_peak_dbfs_ =
-      std::max(current_superframe_peak_dbfs_, frame_peak_dbfs);
-  speech_time_in_estimate_ms_ += kFrameDurationMs;
-  if (speech_time_in_estimate_ms_ > kPeakEnveloperSuperFrameLengthMs) {
-    speech_time_in_estimate_ms_ = 0;
-    const bool buffer_full = elements_in_buffer_ == kPeakEnveloperBufferSize;
-    if (buffer_full) {
-      ShiftBuffer(&peak_delay_buffer_);
-      *peak_delay_buffer_.rbegin() = current_superframe_peak_dbfs_;
-    } else {
-      peak_delay_buffer_[elements_in_buffer_] = current_superframe_peak_dbfs_;
-      elements_in_buffer_++;
-    }
-    current_superframe_peak_dbfs_ = -90.f;
-  }
-}
-
-float SaturationProtector::PeakEnveloper::Query() const {
-  float result;
-  if (elements_in_buffer_ > 0) {
-    result = peak_delay_buffer_[0];
-  } else {
-    result = current_superframe_peak_dbfs_;
-  }
-  return result;
-}
-
-SaturationProtector::SaturationProtector(ApmDataDumper* apm_data_dumper)
-    : SaturationProtector(apm_data_dumper, GetExtraSaturationMarginOffsetDb()) {
-}
-
-SaturationProtector::SaturationProtector(ApmDataDumper* apm_data_dumper,
-                                         float extra_saturation_margin_db)
-    : apm_data_dumper_(apm_data_dumper),
-      last_margin_(GetInitialSaturationMarginDb()),
-      extra_saturation_margin_db_(extra_saturation_margin_db) {}
-
-void SaturationProtector::UpdateMargin(
-    const VadWithLevel::LevelAndProbability& vad_data,
-    float last_speech_level_estimate) {
-  peak_enveloper_.Process(vad_data.speech_peak_dbfs);
-  const float delayed_peak_dbfs = peak_enveloper_.Query();
-  const float difference_db = delayed_peak_dbfs - last_speech_level_estimate;
-
-  if (last_margin_ < difference_db) {
-    last_margin_ = last_margin_ * kSaturationProtectorAttackConstant +
-                   difference_db * (1.f - kSaturationProtectorAttackConstant);
-  } else {
-    last_margin_ = last_margin_ * kSaturationProtectorDecayConstant +
-                   difference_db * (1.f - kSaturationProtectorDecayConstant);
-  }
-
-  last_margin_ = rtc::SafeClamp<float>(last_margin_, 12.f, 25.f);
-}
-
-float SaturationProtector::LastMargin() const {
-  return last_margin_ + extra_saturation_margin_db_;
-}
-
-void SaturationProtector::Reset() {
-  peak_enveloper_ = PeakEnveloper();
-}
-
-void SaturationProtector::DebugDumpEstimate() const {
-  apm_data_dumper_->DumpRaw(
-      "agc2_adaptive_saturation_protector_delayed_peak_dbfs",
-      peak_enveloper_.Query());
-  apm_data_dumper_->DumpRaw("agc2_adaptive_saturation_margin_db", last_margin_);
-}
-
-}  // namespace webrtc
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/agc2/saturation_protector.h b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/agc2/saturation_protector.h
deleted file mode 100644
index e637469070..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/agc2/saturation_protector.h
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- *  Copyright (c) 2018 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#ifndef MODULES_AUDIO_PROCESSING_AGC2_SATURATION_PROTECTOR_H_
-#define MODULES_AUDIO_PROCESSING_AGC2_SATURATION_PROTECTOR_H_
-
-#include <array>
-
-#include "modules/audio_processing/agc2/agc2_common.h"
-#include "modules/audio_processing/agc2/vad_with_level.h"
-
-namespace webrtc {
-
-class ApmDataDumper;
-
-class SaturationProtector {
- public:
-  explicit SaturationProtector(ApmDataDumper* apm_data_dumper);
-
-  SaturationProtector(ApmDataDumper* apm_data_dumper,
-                      float extra_saturation_margin_db);
-
-  // Update and return margin estimate. This method should be called
-  // whenever a frame is reliably classified as 'speech'.
-  //
-  // Returned value is in DB scale.
-  void UpdateMargin(const VadWithLevel::LevelAndProbability& vad_data,
-                    float last_speech_level_estimate_dbfs);
-
-  // Returns latest computed margin. Used in cases when speech is not
-  // detected.
-  float LastMargin() const;
-
-  // Resets the internal memory.
-  void Reset();
-
-  void DebugDumpEstimate() const;
-
- private:
-  // Computes a delayed envelope of peaks.
-  class PeakEnveloper {
-   public:
-    PeakEnveloper();
-    void Process(float frame_peak_dbfs);
-
-    float Query() const;
-
-   private:
-    size_t speech_time_in_estimate_ms_ = 0;
-    float current_superframe_peak_dbfs_ = -90.f;
-    size_t elements_in_buffer_ = 0;
-    std::array<float, kPeakEnveloperBufferSize> peak_delay_buffer_ = {};
-  };
-
-  ApmDataDumper* apm_data_dumper_;
-
-  float last_margin_;
-  PeakEnveloper peak_enveloper_;
-  const float extra_saturation_margin_db_;
-};
-
-}  // namespace webrtc
-
-#endif  // MODULES_AUDIO_PROCESSING_AGC2_SATURATION_PROTECTOR_H_
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/agc2/signal_classifier.cc b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/agc2/signal_classifier.cc
deleted file mode 100644
index 8778c49426..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/agc2/signal_classifier.cc
+++ /dev/null
@@ -1,167 +0,0 @@
-/*
- *  Copyright (c) 2016 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#include "modules/audio_processing/agc2/signal_classifier.h"
-
-#include <algorithm>
-#include <numeric>
-#include <vector>
-
-#include "api/array_view.h"
-#include "modules/audio_processing/agc2/down_sampler.h"
-#include "modules/audio_processing/agc2/noise_spectrum_estimator.h"
-#include "modules/audio_processing/logging/apm_data_dumper.h"
-#include "rtc_base/checks.h"
-
-namespace webrtc {
-namespace {
-
-void RemoveDcLevel(rtc::ArrayView<float> x) {
-  RTC_DCHECK_LT(0, x.size());
-  float mean = std::accumulate(x.data(), x.data() + x.size(), 0.f);
-  mean /= x.size();
-
-  for (float& v : x) {
-    v -= mean;
-  }
-}
-
-void PowerSpectrum(const OouraFft* ooura_fft,
-                   rtc::ArrayView<const float> x,
-                   rtc::ArrayView<float> spectrum) {
-  RTC_DCHECK_EQ(65, spectrum.size());
-  RTC_DCHECK_EQ(128, x.size());
-  float X[128];
-  std::copy(x.data(), x.data() + x.size(), X);
-  ooura_fft->Fft(X);
-
-  float* X_p = X;
-  RTC_DCHECK_EQ(X_p, &X[0]);
-  spectrum[0] = (*X_p) * (*X_p);
-  ++X_p;
-  RTC_DCHECK_EQ(X_p, &X[1]);
-  spectrum[64] = (*X_p) * (*X_p);
-  for (int k = 1; k < 64; ++k) {
-    ++X_p;
-    RTC_DCHECK_EQ(X_p, &X[2 * k]);
-    spectrum[k] = (*X_p) * (*X_p);
-    ++X_p;
-    RTC_DCHECK_EQ(X_p, &X[2 * k + 1]);
-    spectrum[k] += (*X_p) * (*X_p);
-  }
-}
-
-webrtc::SignalClassifier::SignalType ClassifySignal(
-    rtc::ArrayView<const float> signal_spectrum,
-    rtc::ArrayView<const float> noise_spectrum,
-    ApmDataDumper* data_dumper) {
-  int num_stationary_bands = 0;
-  int num_highly_nonstationary_bands = 0;
-
-  // Detect stationary and highly nonstationary bands.
-  for (size_t k = 1; k < 40; k++) {
-    if (signal_spectrum[k] < 3 * noise_spectrum[k] &&
-        signal_spectrum[k] * 3 > noise_spectrum[k]) {
-      ++num_stationary_bands;
-    } else if (signal_spectrum[k] > 9 * noise_spectrum[k]) {
-      ++num_highly_nonstationary_bands;
-    }
-  }
-
-  data_dumper->DumpRaw("lc_num_stationary_bands", 1, &num_stationary_bands);
-  data_dumper->DumpRaw("lc_num_highly_nonstationary_bands", 1,
-                       &num_highly_nonstationary_bands);
-
-  // Use the detected number of bands to classify the overall signal
-  // stationarity.
-  if (num_stationary_bands > 15) {
-    return SignalClassifier::SignalType::kStationary;
-  } else {
-    return SignalClassifier::SignalType::kNonStationary;
-  }
-}
-
-}  // namespace
-
-SignalClassifier::FrameExtender::FrameExtender(size_t frame_size,
-                                               size_t extended_frame_size)
-    : x_old_(extended_frame_size - frame_size, 0.f) {}
-
-SignalClassifier::FrameExtender::~FrameExtender() = default;
-
-void SignalClassifier::FrameExtender::ExtendFrame(
-    rtc::ArrayView<const float> x,
-    rtc::ArrayView<float> x_extended) {
-  RTC_DCHECK_EQ(x_old_.size() + x.size(), x_extended.size());
-  std::copy(x_old_.data(), x_old_.data() + x_old_.size(), x_extended.data());
-  std::copy(x.data(), x.data() + x.size(), x_extended.data() + x_old_.size());
-  std::copy(x_extended.data() + x_extended.size() - x_old_.size(),
-            x_extended.data() + x_extended.size(), x_old_.data());
-}
-
-SignalClassifier::SignalClassifier(ApmDataDumper* data_dumper)
-    : data_dumper_(data_dumper),
-      down_sampler_(data_dumper_),
-      noise_spectrum_estimator_(data_dumper_) {
-  Initialize(48000);
-}
-SignalClassifier::~SignalClassifier() {}
-
-void SignalClassifier::Initialize(int sample_rate_hz) {
-  down_sampler_.Initialize(sample_rate_hz);
-  noise_spectrum_estimator_.Initialize();
-  frame_extender_.reset(new FrameExtender(80, 128));
-  sample_rate_hz_ = sample_rate_hz;
-  initialization_frames_left_ = 2;
-  consistent_classification_counter_ = 3;
-  last_signal_type_ = SignalClassifier::SignalType::kNonStationary;
-}
-
-SignalClassifier::SignalType SignalClassifier::Analyze(
-    rtc::ArrayView<const float> signal) {
-  RTC_DCHECK_EQ(signal.size(), sample_rate_hz_ / 100);
-
-  // Compute the signal power spectrum.
-  float downsampled_frame[80];
-  down_sampler_.DownSample(signal, downsampled_frame);
-  float extended_frame[128];
-  frame_extender_->ExtendFrame(downsampled_frame, extended_frame);
-  RemoveDcLevel(extended_frame);
-  float signal_spectrum[65];
-  PowerSpectrum(&ooura_fft_, extended_frame, signal_spectrum);
-
-  // Classify the signal based on the estimate of the noise spectrum and the
-  // signal spectrum estimate.
-  const SignalType signal_type = ClassifySignal(
-      signal_spectrum, noise_spectrum_estimator_.GetNoiseSpectrum(),
-      data_dumper_);
-
-  // Update the noise spectrum based on the signal spectrum.
-  noise_spectrum_estimator_.Update(signal_spectrum,
-                                   initialization_frames_left_ > 0);
-
-  // Update the number of frames until a reliable signal spectrum is achieved.
-  initialization_frames_left_ = std::max(0, initialization_frames_left_ - 1);
-
-  if (last_signal_type_ == signal_type) {
-    consistent_classification_counter_ =
-        std::max(0, consistent_classification_counter_ - 1);
-  } else {
-    last_signal_type_ = signal_type;
-    consistent_classification_counter_ = 3;
-  }
-
-  if (consistent_classification_counter_ > 0) {
-    return SignalClassifier::SignalType::kNonStationary;
-  }
-  return signal_type;
-}
-
-}  // namespace webrtc
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/agc2/signal_classifier.h b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/agc2/signal_classifier.h
deleted file mode 100644
index 23fe315977..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/agc2/signal_classifier.h
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- *  Copyright (c) 2016 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#ifndef MODULES_AUDIO_PROCESSING_AGC2_SIGNAL_CLASSIFIER_H_
-#define MODULES_AUDIO_PROCESSING_AGC2_SIGNAL_CLASSIFIER_H_
-
-#include <memory>
-#include <vector>
-
-#include "api/array_view.h"
-#include "modules/audio_processing/agc2/down_sampler.h"
-#include "modules/audio_processing/agc2/noise_spectrum_estimator.h"
-#include "modules/audio_processing/utility/ooura_fft.h"
-#include "rtc_base/constructormagic.h"
-
-namespace webrtc {
-
-class ApmDataDumper;
-class AudioBuffer;
-
-class SignalClassifier {
- public:
-  enum class SignalType { kNonStationary, kStationary };
-
-  explicit SignalClassifier(ApmDataDumper* data_dumper);
-  ~SignalClassifier();
-
-  void Initialize(int sample_rate_hz);
-  SignalType Analyze(rtc::ArrayView<const float> signal);
-
- private:
-  class FrameExtender {
-   public:
-    FrameExtender(size_t frame_size, size_t extended_frame_size);
-    ~FrameExtender();
-
-    void ExtendFrame(rtc::ArrayView<const float> x,
-                     rtc::ArrayView<float> x_extended);
-
-   private:
-    std::vector<float> x_old_;
-
-    RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(FrameExtender);
-  };
-
-  ApmDataDumper* const data_dumper_;
-  DownSampler down_sampler_;
-  std::unique_ptr<FrameExtender> frame_extender_;
-  NoiseSpectrumEstimator noise_spectrum_estimator_;
-  int sample_rate_hz_;
-  int initialization_frames_left_;
-  int consistent_classification_counter_;
-  SignalType last_signal_type_;
-  const OouraFft ooura_fft_;
-  RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(SignalClassifier);
-};
-
-}  // namespace webrtc
-
-#endif  // MODULES_AUDIO_PROCESSING_AGC2_SIGNAL_CLASSIFIER_H_
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/agc2/vad_with_level.cc b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/agc2/vad_with_level.cc
deleted file mode 100644
index 52970dfe67..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/agc2/vad_with_level.cc
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- *  Copyright (c) 2018 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#include "modules/audio_processing/agc2/vad_with_level.h"
-
-#include <algorithm>
-#include <array>
-#include <cmath>
-
-#include "api/array_view.h"
-#include "common_audio/include/audio_util.h"
-#include "modules/audio_processing/agc2/rnn_vad/common.h"
-
-namespace webrtc {
-
-namespace {
-float ProcessForPeak(AudioFrameView<const float> frame) {
-  float current_max = 0;
-  for (const auto& x : frame.channel(0)) {
-    current_max = std::max(std::fabs(x), current_max);
-  }
-  return current_max;
-}
-
-float ProcessForRms(AudioFrameView<const float> frame) {
-  float rms = 0;
-  for (const auto& x : frame.channel(0)) {
-    rms += x * x;
-  }
-  return sqrt(rms / frame.samples_per_channel());
-}
-}  // namespace
-
-VadWithLevel::VadWithLevel() = default;
-VadWithLevel::~VadWithLevel() = default;
-
-VadWithLevel::LevelAndProbability VadWithLevel::AnalyzeFrame(
-    AudioFrameView<const float> frame) {
-  SetSampleRate(static_cast<int>(frame.samples_per_channel() * 100));
-  std::array<float, rnn_vad::kFrameSize10ms24kHz> work_frame;
-  // Feed the 1st channel to the resampler.
-  resampler_.Resample(frame.channel(0).data(), frame.samples_per_channel(),
-                      work_frame.data(), rnn_vad::kFrameSize10ms24kHz);
-
-  std::array<float, rnn_vad::kFeatureVectorSize> feature_vector;
-
-  const bool is_silence = features_extractor_.CheckSilenceComputeFeatures(
-      work_frame, feature_vector);
-  const float vad_probability =
-      rnn_vad_.ComputeVadProbability(feature_vector, is_silence);
-  return LevelAndProbability(vad_probability,
-                             FloatS16ToDbfs(ProcessForRms(frame)),
-                             FloatS16ToDbfs(ProcessForPeak(frame)));
-}
-
-void VadWithLevel::SetSampleRate(int sample_rate_hz) {
-  // The source number of channels in 1, because we always use the 1st
-  // channel.
-  resampler_.InitializeIfNeeded(sample_rate_hz, rnn_vad::kSampleRate24kHz,
-                                1 /* num_channels */);
-}
-
-}  // namespace webrtc
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/agc2/vad_with_level.h b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/agc2/vad_with_level.h
deleted file mode 100644
index b0ad868d4b..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/agc2/vad_with_level.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- *  Copyright (c) 2018 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#ifndef MODULES_AUDIO_PROCESSING_AGC2_VAD_WITH_LEVEL_H_
-#define MODULES_AUDIO_PROCESSING_AGC2_VAD_WITH_LEVEL_H_
-
-#include "common_audio/resampler/include/push_resampler.h"
-#include "modules/audio_processing/agc2/rnn_vad/features_extraction.h"
-#include "modules/audio_processing/agc2/rnn_vad/rnn.h"
-#include "modules/audio_processing/include/audio_frame_view.h"
-
-namespace webrtc {
-class VadWithLevel {
- public:
-  struct LevelAndProbability {
-    constexpr LevelAndProbability(float prob, float rms, float peak)
-        : speech_probability(prob),
-          speech_rms_dbfs(rms),
-          speech_peak_dbfs(peak) {}
-    LevelAndProbability() = default;
-    float speech_probability = 0;
-    float speech_rms_dbfs = 0;  // Root mean square in decibels to full-scale.
-    float speech_peak_dbfs = 0;
-  };
-
-  VadWithLevel();
-  ~VadWithLevel();
-
-  LevelAndProbability AnalyzeFrame(AudioFrameView<const float> frame);
-
- private:
-  void SetSampleRate(int sample_rate_hz);
-
-  rnn_vad::RnnBasedVad rnn_vad_;
-  rnn_vad::FeaturesExtractor features_extractor_;
-  PushResampler<float> resampler_;
-};
-
-}  // namespace webrtc
-
-#endif  // MODULES_AUDIO_PROCESSING_AGC2_VAD_WITH_LEVEL_H_
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/agc2/vector_float_frame.cc b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/agc2/vector_float_frame.cc
deleted file mode 100644
index a70d815196..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/agc2/vector_float_frame.cc
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- *  Copyright (c) 2018 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#include "modules/audio_processing/agc2/vector_float_frame.h"
-
-namespace webrtc {
-
-namespace {
-
-std::vector<float*> ConstructChannelPointers(
-    std::vector<std::vector<float>>* x) {
-  std::vector<float*> channel_ptrs;
-  for (auto& v : *x) {
-    channel_ptrs.push_back(v.data());
-  }
-  return channel_ptrs;
-}
-}  // namespace
-
-VectorFloatFrame::VectorFloatFrame(int num_channels,
-                                   int samples_per_channel,
-                                   float start_value)
-    : channels_(num_channels,
-                std::vector<float>(samples_per_channel, start_value)),
-      channel_ptrs_(ConstructChannelPointers(&channels_)),
-      float_frame_view_(channel_ptrs_.data(),
-                        channels_.size(),
-                        samples_per_channel) {}
-
-VectorFloatFrame::~VectorFloatFrame() = default;
-
-}  // namespace webrtc
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/agc2/vector_float_frame.h b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/agc2/vector_float_frame.h
deleted file mode 100644
index b521f346f9..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/agc2/vector_float_frame.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- *  Copyright (c) 2018 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#ifndef MODULES_AUDIO_PROCESSING_AGC2_VECTOR_FLOAT_FRAME_H_
-#define MODULES_AUDIO_PROCESSING_AGC2_VECTOR_FLOAT_FRAME_H_
-
-#include <vector>
-
-#include "modules/audio_processing/include/audio_frame_view.h"
-
-namespace webrtc {
-
-// A construct consisting of a multi-channel audio frame, and a FloatFrame view
-// of it.
-class VectorFloatFrame {
- public:
-  VectorFloatFrame(int num_channels,
-                   int samples_per_channel,
-                   float start_value);
-  const AudioFrameView<float>& float_frame_view() { return float_frame_view_; }
-  AudioFrameView<const float> float_frame_view() const {
-    return float_frame_view_;
-  }
-
-  ~VectorFloatFrame();
-
- private:
-  std::vector<std::vector<float>> channels_;
-  std::vector<float*> channel_ptrs_;
-  AudioFrameView<float> float_frame_view_;
-};
-
-}  // namespace webrtc
-
-#endif  // MODULES_AUDIO_PROCESSING_AGC2_VECTOR_FLOAT_FRAME_H_
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/audio_buffer.cc b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/audio_buffer.cc
deleted file mode 100644
index 0c38a4fe82..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/audio_buffer.cc
+++ /dev/null
@@ -1,462 +0,0 @@
-/*
- *  Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#include "modules/audio_processing/audio_buffer.h"
-
-#include <string.h>
-#include <cstdint>
-
-#include "common_audio/channel_buffer.h"
-#include "common_audio/include/audio_util.h"
-#include "common_audio/resampler/push_sinc_resampler.h"
-#include "modules/audio_processing/splitting_filter.h"
-#include "rtc_base/checks.h"
-
-namespace webrtc {
-namespace {
-
-const size_t kSamplesPer16kHzChannel = 160;
-const size_t kSamplesPer32kHzChannel = 320;
-const size_t kSamplesPer48kHzChannel = 480;
-
-int KeyboardChannelIndex(const StreamConfig& stream_config) {
-  if (!stream_config.has_keyboard()) {
-    RTC_NOTREACHED();
-    return 0;
-  }
-
-  return stream_config.num_channels();
-}
-
-size_t NumBandsFromSamplesPerChannel(size_t num_frames) {
-  size_t num_bands = 1;
-  if (num_frames == kSamplesPer32kHzChannel ||
-      num_frames == kSamplesPer48kHzChannel) {
-    num_bands = rtc::CheckedDivExact(num_frames, kSamplesPer16kHzChannel);
-  }
-  return num_bands;
-}
-
-}  // namespace
-
-AudioBuffer::AudioBuffer(size_t input_num_frames,
-                         size_t num_input_channels,
-                         size_t process_num_frames,
-                         size_t num_process_channels,
-                         size_t output_num_frames)
-    : input_num_frames_(input_num_frames),
-      num_input_channels_(num_input_channels),
-      proc_num_frames_(process_num_frames),
-      num_proc_channels_(num_process_channels),
-      output_num_frames_(output_num_frames),
-      num_channels_(num_process_channels),
-      num_bands_(NumBandsFromSamplesPerChannel(proc_num_frames_)),
-      num_split_frames_(rtc::CheckedDivExact(proc_num_frames_, num_bands_)),
-      mixed_low_pass_valid_(false),
-      reference_copied_(false),
-      activity_(AudioFrame::kVadUnknown),
-      keyboard_data_(NULL),
-      data_(new IFChannelBuffer(proc_num_frames_, num_proc_channels_)),
-      output_buffer_(new IFChannelBuffer(output_num_frames_, num_channels_)) {
-  RTC_DCHECK_GT(input_num_frames_, 0);
-  RTC_DCHECK_GT(proc_num_frames_, 0);
-  RTC_DCHECK_GT(output_num_frames_, 0);
-  RTC_DCHECK_GT(num_input_channels_, 0);
-  RTC_DCHECK_GT(num_proc_channels_, 0);
-  RTC_DCHECK_LE(num_proc_channels_, num_input_channels_);
-
-  if (input_num_frames_ != proc_num_frames_ ||
-      output_num_frames_ != proc_num_frames_) {
-    // Create an intermediate buffer for resampling.
-    process_buffer_.reset(
-        new ChannelBuffer<float>(proc_num_frames_, num_proc_channels_));
-
-    if (input_num_frames_ != proc_num_frames_) {
-      for (size_t i = 0; i < num_proc_channels_; ++i) {
-        input_resamplers_.push_back(std::unique_ptr<PushSincResampler>(
-            new PushSincResampler(input_num_frames_, proc_num_frames_)));
-      }
-    }
-
-    if (output_num_frames_ != proc_num_frames_) {
-      for (size_t i = 0; i < num_proc_channels_; ++i) {
-        output_resamplers_.push_back(std::unique_ptr<PushSincResampler>(
-            new PushSincResampler(proc_num_frames_, output_num_frames_)));
-      }
-    }
-  }
-
-  if (num_bands_ > 1) {
-    split_data_.reset(
-        new IFChannelBuffer(proc_num_frames_, num_proc_channels_, num_bands_));
-    splitting_filter_.reset(
-        new SplittingFilter(num_proc_channels_, num_bands_, proc_num_frames_));
-  }
-}
-
-AudioBuffer::~AudioBuffer() {}
-
-void AudioBuffer::CopyFrom(const float* const* data,
-                           const StreamConfig& stream_config) {
-  RTC_DCHECK_EQ(stream_config.num_frames(), input_num_frames_);
-  RTC_DCHECK_EQ(stream_config.num_channels(), num_input_channels_);
-  InitForNewData();
-  // Initialized lazily because there's a different condition in
-  // DeinterleaveFrom.
-  const bool need_to_downmix =
-      num_input_channels_ > 1 && num_proc_channels_ == 1;
-  if (need_to_downmix && !input_buffer_) {
-    input_buffer_.reset(
-        new IFChannelBuffer(input_num_frames_, num_proc_channels_));
-  }
-
-  if (stream_config.has_keyboard()) {
-    keyboard_data_ = data[KeyboardChannelIndex(stream_config)];
-  }
-
-  // Downmix.
-  const float* const* data_ptr = data;
-  if (need_to_downmix) {
-    DownmixToMono<float, float>(data, input_num_frames_, num_input_channels_,
-                                input_buffer_->fbuf()->channels()[0]);
-    data_ptr = input_buffer_->fbuf_const()->channels();
-  }
-
-  // Resample.
-  if (input_num_frames_ != proc_num_frames_) {
-    for (size_t i = 0; i < num_proc_channels_; ++i) {
-      input_resamplers_[i]->Resample(data_ptr[i], input_num_frames_,
-                                     process_buffer_->channels()[i],
-                                     proc_num_frames_);
-    }
-    data_ptr = process_buffer_->channels();
-  }
-
-  // Convert to the S16 range.
-  for (size_t i = 0; i < num_proc_channels_; ++i) {
-    FloatToFloatS16(data_ptr[i], proc_num_frames_,
-                    data_->fbuf()->channels()[i]);
-  }
-}
-
-void AudioBuffer::CopyTo(const StreamConfig& stream_config,
-                         float* const* data) {
-  RTC_DCHECK_EQ(stream_config.num_frames(), output_num_frames_);
-  RTC_DCHECK(stream_config.num_channels() == num_channels_ ||
-             num_channels_ == 1);
-
-  // Convert to the float range.
-  float* const* data_ptr = data;
-  if (output_num_frames_ != proc_num_frames_) {
-    // Convert to an intermediate buffer for subsequent resampling.
-    data_ptr = process_buffer_->channels();
-  }
-  for (size_t i = 0; i < num_channels_; ++i) {
-    FloatS16ToFloat(data_->fbuf()->channels()[i], proc_num_frames_,
-                    data_ptr[i]);
-  }
-
-  // Resample.
-  if (output_num_frames_ != proc_num_frames_) {
-    for (size_t i = 0; i < num_channels_; ++i) {
-      output_resamplers_[i]->Resample(data_ptr[i], proc_num_frames_, data[i],
-                                      output_num_frames_);
-    }
-  }
-
-  // Upmix.
-  for (size_t i = num_channels_; i < stream_config.num_channels(); ++i) {
-    memcpy(data[i], data[0], output_num_frames_ * sizeof(**data));
-  }
-}
-
-void AudioBuffer::InitForNewData() {
-  keyboard_data_ = NULL;
-  mixed_low_pass_valid_ = false;
-  reference_copied_ = false;
-  activity_ = AudioFrame::kVadUnknown;
-  num_channels_ = num_proc_channels_;
-  data_->set_num_channels(num_proc_channels_);
-  if (split_data_.get()) {
-    split_data_->set_num_channels(num_proc_channels_);
-  }
-}
-
-const int16_t* const* AudioBuffer::channels_const() const {
-  return data_->ibuf_const()->channels();
-}
-
-int16_t* const* AudioBuffer::channels() {
-  mixed_low_pass_valid_ = false;
-  return data_->ibuf()->channels();
-}
-
-const int16_t* const* AudioBuffer::split_bands_const(size_t channel) const {
-  return split_data_.get() ? split_data_->ibuf_const()->bands(channel)
-                           : data_->ibuf_const()->bands(channel);
-}
-
-int16_t* const* AudioBuffer::split_bands(size_t channel) {
-  mixed_low_pass_valid_ = false;
-  return split_data_.get() ? split_data_->ibuf()->bands(channel)
-                           : data_->ibuf()->bands(channel);
-}
-
-const int16_t* const* AudioBuffer::split_channels_const(Band band) const {
-  if (split_data_.get()) {
-    return split_data_->ibuf_const()->channels(band);
-  } else {
-    return band == kBand0To8kHz ? data_->ibuf_const()->channels() : nullptr;
-  }
-}
-
-int16_t* const* AudioBuffer::split_channels(Band band) {
-  mixed_low_pass_valid_ = false;
-  if (split_data_.get()) {
-    return split_data_->ibuf()->channels(band);
-  } else {
-    return band == kBand0To8kHz ? data_->ibuf()->channels() : nullptr;
-  }
-}
-
-ChannelBuffer<int16_t>* AudioBuffer::data() {
-  mixed_low_pass_valid_ = false;
-  return data_->ibuf();
-}
-
-const ChannelBuffer<int16_t>* AudioBuffer::data() const {
-  return data_->ibuf_const();
-}
-
-ChannelBuffer<int16_t>* AudioBuffer::split_data() {
-  mixed_low_pass_valid_ = false;
-  return split_data_.get() ? split_data_->ibuf() : data_->ibuf();
-}
-
-const ChannelBuffer<int16_t>* AudioBuffer::split_data() const {
-  return split_data_.get() ? split_data_->ibuf_const() : data_->ibuf_const();
-}
-
-const float* const* AudioBuffer::channels_const_f() const {
-  return data_->fbuf_const()->channels();
-}
-
-float* const* AudioBuffer::channels_f() {
-  mixed_low_pass_valid_ = false;
-  return data_->fbuf()->channels();
-}
-
-const float* const* AudioBuffer::split_bands_const_f(size_t channel) const {
-  return split_data_.get() ? split_data_->fbuf_const()->bands(channel)
-                           : data_->fbuf_const()->bands(channel);
-}
-
-float* const* AudioBuffer::split_bands_f(size_t channel) {
-  mixed_low_pass_valid_ = false;
-  return split_data_.get() ? split_data_->fbuf()->bands(channel)
-                           : data_->fbuf()->bands(channel);
-}
-
-const float* const* AudioBuffer::split_channels_const_f(Band band) const {
-  if (split_data_.get()) {
-    return split_data_->fbuf_const()->channels(band);
-  } else {
-    return band == kBand0To8kHz ? data_->fbuf_const()->channels() : nullptr;
-  }
-}
-
-float* const* AudioBuffer::split_channels_f(Band band) {
-  mixed_low_pass_valid_ = false;
-  if (split_data_.get()) {
-    return split_data_->fbuf()->channels(band);
-  } else {
-    return band == kBand0To8kHz ? data_->fbuf()->channels() : nullptr;
-  }
-}
-
-ChannelBuffer<float>* AudioBuffer::data_f() {
-  mixed_low_pass_valid_ = false;
-  return data_->fbuf();
-}
-
-const ChannelBuffer<float>* AudioBuffer::data_f() const {
-  return data_->fbuf_const();
-}
-
-ChannelBuffer<float>* AudioBuffer::split_data_f() {
-  mixed_low_pass_valid_ = false;
-  return split_data_.get() ? split_data_->fbuf() : data_->fbuf();
-}
-
-const ChannelBuffer<float>* AudioBuffer::split_data_f() const {
-  return split_data_.get() ? split_data_->fbuf_const() : data_->fbuf_const();
-}
-
-const int16_t* AudioBuffer::mixed_low_pass_data() {
-  if (num_proc_channels_ == 1) {
-    return split_bands_const(0)[kBand0To8kHz];
-  }
-
-  if (!mixed_low_pass_valid_) {
-    if (!mixed_low_pass_channels_.get()) {
-      mixed_low_pass_channels_.reset(
-          new ChannelBuffer<int16_t>(num_split_frames_, 1));
-    }
-
-    DownmixToMono<int16_t, int32_t>(split_channels_const(kBand0To8kHz),
-                                    num_split_frames_, num_channels_,
-                                    mixed_low_pass_channels_->channels()[0]);
-    mixed_low_pass_valid_ = true;
-  }
-  return mixed_low_pass_channels_->channels()[0];
-}
-
-const int16_t* AudioBuffer::low_pass_reference(int channel) const {
-  if (!reference_copied_) {
-    return NULL;
-  }
-
-  return low_pass_reference_channels_->channels()[channel];
-}
-
-const float* AudioBuffer::keyboard_data() const {
-  return keyboard_data_;
-}
-
-void AudioBuffer::set_activity(AudioFrame::VADActivity activity) {
-  activity_ = activity;
-}
-
-AudioFrame::VADActivity AudioBuffer::activity() const {
-  return activity_;
-}
-
-size_t AudioBuffer::num_channels() const {
-  return num_channels_;
-}
-
-void AudioBuffer::set_num_channels(size_t num_channels) {
-  num_channels_ = num_channels;
-  data_->set_num_channels(num_channels);
-  if (split_data_.get()) {
-    split_data_->set_num_channels(num_channels);
-  }
-}
-
-size_t AudioBuffer::num_frames() const {
-  return proc_num_frames_;
-}
-
-size_t AudioBuffer::num_frames_per_band() const {
-  return num_split_frames_;
-}
-
-size_t AudioBuffer::num_keyboard_frames() const {
-  // We don't resample the keyboard channel.
-  return input_num_frames_;
-}
-
-size_t AudioBuffer::num_bands() const {
-  return num_bands_;
-}
-
-// The resampler is only for supporting 48kHz to 16kHz in the reverse stream.
-void AudioBuffer::DeinterleaveFrom(AudioFrame* frame) {
-  RTC_DCHECK_EQ(frame->num_channels_, num_input_channels_);
-  RTC_DCHECK_EQ(frame->samples_per_channel_, input_num_frames_);
-  InitForNewData();
-  // Initialized lazily because there's a different condition in CopyFrom.
-  if ((input_num_frames_ != proc_num_frames_) && !input_buffer_) {
-    input_buffer_.reset(
-        new IFChannelBuffer(input_num_frames_, num_proc_channels_));
-  }
-  activity_ = frame->vad_activity_;
-
-  int16_t* const* deinterleaved;
-  if (input_num_frames_ == proc_num_frames_) {
-    deinterleaved = data_->ibuf()->channels();
-  } else {
-    deinterleaved = input_buffer_->ibuf()->channels();
-  }
-  // TODO(yujo): handle muted frames more efficiently.
-  if (num_proc_channels_ == 1) {
-    // Downmix and deinterleave simultaneously.
-    DownmixInterleavedToMono(frame->data(), input_num_frames_,
-                             num_input_channels_, deinterleaved[0]);
-  } else {
-    RTC_DCHECK_EQ(num_proc_channels_, num_input_channels_);
-    Deinterleave(frame->data(), input_num_frames_, num_proc_channels_,
-                 deinterleaved);
-  }
-
-  // Resample.
-  if (input_num_frames_ != proc_num_frames_) {
-    for (size_t i = 0; i < num_proc_channels_; ++i) {
-      input_resamplers_[i]->Resample(
-          input_buffer_->fbuf_const()->channels()[i], input_num_frames_,
-          data_->fbuf()->channels()[i], proc_num_frames_);
-    }
-  }
-}
-
-void AudioBuffer::InterleaveTo(AudioFrame* frame, bool data_changed) const {
-  frame->vad_activity_ = activity_;
-  if (!data_changed) {
-    return;
-  }
-
-  RTC_DCHECK(frame->num_channels_ == num_channels_ || num_channels_ == 1);
-  RTC_DCHECK_EQ(frame->samples_per_channel_, output_num_frames_);
-
-  // Resample if necessary.
-  IFChannelBuffer* data_ptr = data_.get();
-  if (proc_num_frames_ != output_num_frames_) {
-    for (size_t i = 0; i < num_channels_; ++i) {
-      output_resamplers_[i]->Resample(
-          data_->fbuf()->channels()[i], proc_num_frames_,
-          output_buffer_->fbuf()->channels()[i], output_num_frames_);
-    }
-    data_ptr = output_buffer_.get();
-  }
-
-  // TODO(yujo): handle muted frames more efficiently.
-  if (frame->num_channels_ == num_channels_) {
-    Interleave(data_ptr->ibuf()->channels(), output_num_frames_, num_channels_,
-               frame->mutable_data());
-  } else {
-    UpmixMonoToInterleaved(data_ptr->ibuf()->channels()[0], output_num_frames_,
-                           frame->num_channels_, frame->mutable_data());
-  }
-}
-
-void AudioBuffer::CopyLowPassToReference() {
-  reference_copied_ = true;
-  if (!low_pass_reference_channels_.get() ||
-      low_pass_reference_channels_->num_channels() != num_channels_) {
-    low_pass_reference_channels_.reset(
-        new ChannelBuffer<int16_t>(num_split_frames_, num_proc_channels_));
-  }
-  for (size_t i = 0; i < num_proc_channels_; i++) {
-    memcpy(low_pass_reference_channels_->channels()[i],
-           split_bands_const(i)[kBand0To8kHz],
-           low_pass_reference_channels_->num_frames_per_band() *
-               sizeof(split_bands_const(i)[kBand0To8kHz][0]));
-  }
-}
-
-void AudioBuffer::SplitIntoFrequencyBands() {
-  splitting_filter_->Analysis(data_.get(), split_data_.get());
-}
-
-void AudioBuffer::MergeFrequencyBands() {
-  splitting_filter_->Synthesis(split_data_.get(), data_.get());
-}
-
-}  // namespace webrtc
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/audio_buffer.h b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/audio_buffer.h
deleted file mode 100644
index 469646e8db..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/audio_buffer.h
+++ /dev/null
@@ -1,164 +0,0 @@
-/*
- *  Copyright (c) 2011 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#ifndef MODULES_AUDIO_PROCESSING_AUDIO_BUFFER_H_
-#define MODULES_AUDIO_PROCESSING_AUDIO_BUFFER_H_
-
-#include <stddef.h>
-#include <stdint.h>
-#include <memory>
-#include <vector>
-
-#include "api/audio/audio_frame.h"
-#include "common_audio/channel_buffer.h"
-#include "modules/audio_processing/include/audio_processing.h"
-#include "rtc_base/gtest_prod_util.h"
-
-namespace webrtc {
-
-class IFChannelBuffer;
-class PushSincResampler;
-class SplittingFilter;
-
-enum Band { kBand0To8kHz = 0, kBand8To16kHz = 1, kBand16To24kHz = 2 };
-
-class AudioBuffer {
- public:
-  // TODO(ajm): Switch to take ChannelLayouts.
-  AudioBuffer(size_t input_num_frames,
-              size_t num_input_channels,
-              size_t process_num_frames,
-              size_t num_process_channels,
-              size_t output_num_frames);
-  virtual ~AudioBuffer();
-
-  size_t num_channels() const;
-  void set_num_channels(size_t num_channels);
-  size_t num_frames() const;
-  size_t num_frames_per_band() const;
-  size_t num_keyboard_frames() const;
-  size_t num_bands() const;
-
-  // Returns a pointer array to the full-band channels.
-  // Usage:
-  // channels()[channel][sample].
-  // Where:
-  // 0 <= channel < |num_proc_channels_|
-  // 0 <= sample < |proc_num_frames_|
-  int16_t* const* channels();
-  const int16_t* const* channels_const() const;
-  float* const* channels_f();
-  const float* const* channels_const_f() const;
-
-  // Returns a pointer array to the bands for a specific channel.
-  // Usage:
-  // split_bands(channel)[band][sample].
-  // Where:
-  // 0 <= channel < |num_proc_channels_|
-  // 0 <= band < |num_bands_|
-  // 0 <= sample < |num_split_frames_|
-  int16_t* const* split_bands(size_t channel);
-  const int16_t* const* split_bands_const(size_t channel) const;
-  float* const* split_bands_f(size_t channel);
-  const float* const* split_bands_const_f(size_t channel) const;
-
-  // Returns a pointer array to the channels for a specific band.
-  // Usage:
-  // split_channels(band)[channel][sample].
-  // Where:
-  // 0 <= band < |num_bands_|
-  // 0 <= channel < |num_proc_channels_|
-  // 0 <= sample < |num_split_frames_|
-  int16_t* const* split_channels(Band band);
-  const int16_t* const* split_channels_const(Band band) const;
-  float* const* split_channels_f(Band band);
-  const float* const* split_channels_const_f(Band band) const;
-
-  // Returns a pointer to the ChannelBuffer that encapsulates the full-band
-  // data.
-  ChannelBuffer<int16_t>* data();
-  const ChannelBuffer<int16_t>* data() const;
-  ChannelBuffer<float>* data_f();
-  const ChannelBuffer<float>* data_f() const;
-
-  // Returns a pointer to the ChannelBuffer that encapsulates the split data.
-  ChannelBuffer<int16_t>* split_data();
-  const ChannelBuffer<int16_t>* split_data() const;
-  ChannelBuffer<float>* split_data_f();
-  const ChannelBuffer<float>* split_data_f() const;
-
-  // Returns a pointer to the low-pass data downmixed to mono. If this data
-  // isn't already available it re-calculates it.
-  const int16_t* mixed_low_pass_data();
-  const int16_t* low_pass_reference(int channel) const;
-
-  const float* keyboard_data() const;
-
-  void set_activity(AudioFrame::VADActivity activity);
-  AudioFrame::VADActivity activity() const;
-
-  // Use for int16 interleaved data.
-  void DeinterleaveFrom(AudioFrame* audioFrame);
-  // If |data_changed| is false, only the non-audio data members will be copied
-  // to |frame|.
-  void InterleaveTo(AudioFrame* frame, bool data_changed) const;
-
-  // Use for float deinterleaved data.
-  void CopyFrom(const float* const* data, const StreamConfig& stream_config);
-  void CopyTo(const StreamConfig& stream_config, float* const* data);
-  void CopyLowPassToReference();
-
-  // Splits the signal into different bands.
-  void SplitIntoFrequencyBands();
-  // Recombine the different bands into one signal.
-  void MergeFrequencyBands();
-
- private:
-  FRIEND_TEST_ALL_PREFIXES(AudioBufferTest,
-                           SetNumChannelsSetsChannelBuffersNumChannels);
-  // Called from DeinterleaveFrom() and CopyFrom().
-  void InitForNewData();
-
-  // The audio is passed into DeinterleaveFrom() or CopyFrom() with input
-  // format (samples per channel and number of channels).
-  const size_t input_num_frames_;
-  const size_t num_input_channels_;
-  // The audio is stored by DeinterleaveFrom() or CopyFrom() with processing
-  // format.
-  const size_t proc_num_frames_;
-  const size_t num_proc_channels_;
-  // The audio is returned by InterleaveTo() and CopyTo() with output samples
-  // per channels and the current number of channels. This last one can be
-  // changed at any time using set_num_channels().
-  const size_t output_num_frames_;
-  size_t num_channels_;
-
-  size_t num_bands_;
-  size_t num_split_frames_;
-  bool mixed_low_pass_valid_;
-  bool reference_copied_;
-  AudioFrame::VADActivity activity_;
-
-  const float* keyboard_data_;
-  std::unique_ptr<IFChannelBuffer> data_;
-  std::unique_ptr<IFChannelBuffer> split_data_;
-  std::unique_ptr<SplittingFilter> splitting_filter_;
-  std::unique_ptr<ChannelBuffer<int16_t>> mixed_low_pass_channels_;
-  std::unique_ptr<ChannelBuffer<int16_t>> low_pass_reference_channels_;
-  std::unique_ptr<IFChannelBuffer> input_buffer_;
-  std::unique_ptr<IFChannelBuffer> output_buffer_;
-  std::unique_ptr<ChannelBuffer<float>> process_buffer_;
-  std::vector<std::unique_ptr<PushSincResampler>> input_resamplers_;
-  std::vector<std::unique_ptr<PushSincResampler>> output_resamplers_;
-};
-
-}  // namespace webrtc
-
-#endif  // MODULES_AUDIO_PROCESSING_AUDIO_BUFFER_H_
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/audio_generator/file_audio_generator.cc b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/audio_generator/file_audio_generator.cc
deleted file mode 100644
index 0d691b8bbf..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/audio_generator/file_audio_generator.cc
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- *  Copyright (c) 2018 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#include "modules/audio_processing/audio_generator/file_audio_generator.h"
-
-namespace webrtc {
-
-FileAudioGenerator::FileAudioGenerator(
-    std::unique_ptr<WavReader> input_audio_file) {
-  // TODO(bugs.webrtc.org/8882) Stub.
-  // Read audio from file into internal buffer.
-}
-
-FileAudioGenerator::~FileAudioGenerator() = default;
-
-void FileAudioGenerator::FillFrame(AudioFrameView<float> audio) {
-  // TODO(bugs.webrtc.org/8882) Stub.
-  // Fill |audio| from internal buffer.
-}
-
-size_t FileAudioGenerator::NumChannels() {
-  return num_channels_;
-}
-
-size_t FileAudioGenerator::SampleRateHz() {
-  return sample_rate_hz_;
-}
-
-}  // namespace webrtc
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/audio_generator/file_audio_generator.h b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/audio_generator/file_audio_generator.h
deleted file mode 100644
index 01979a42b3..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/audio_generator/file_audio_generator.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- *  Copyright (c) 2018 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#ifndef MODULES_AUDIO_PROCESSING_AUDIO_GENERATOR_FILE_AUDIO_GENERATOR_H_
-#define MODULES_AUDIO_PROCESSING_AUDIO_GENERATOR_FILE_AUDIO_GENERATOR_H_
-
-#include <memory>
-
-#include "common_audio/wav_file.h"
-#include "modules/audio_processing/include/audio_generator.h"
-#include "rtc_base/constructormagic.h"
-
-namespace webrtc {
-
-// Provides looping audio from a file. The file is read in its entirety on
-// construction and then closed. This class wraps a webrtc::WavReader, and is
-// hence unsuitable for non-diagnostic code.
-class FileAudioGenerator : public AudioGenerator {
- public:
-  // Reads the playout audio from a given WAV file.
-  explicit FileAudioGenerator(std::unique_ptr<WavReader> input_audio_file);
-
-  ~FileAudioGenerator() override;
-
-  // Fill |audio| with audio from a file.
-  void FillFrame(AudioFrameView<float> audio) override;
-
-  size_t NumChannels() override;
-
-  size_t SampleRateHz() override;
-
- private:
-  size_t num_channels_;
-  size_t sample_rate_hz_;
-
-  RTC_DISALLOW_COPY_AND_ASSIGN(FileAudioGenerator);
-};
-
-}  // namespace webrtc
-
-#endif  // MODULES_AUDIO_PROCESSING_AUDIO_GENERATOR_FILE_AUDIO_GENERATOR_H_
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/audio_processing_impl.cc b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/audio_processing_impl.cc
deleted file mode 100644
index 376464793c..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/audio_processing_impl.cc
+++ /dev/null
@@ -1,1971 +0,0 @@
-/*
- *  Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#include "modules/audio_processing/audio_processing_impl.h"
-
-#include <algorithm>
-#include <cstdint>
-#include <string>
-#include <type_traits>
-#include <utility>
-
-#include "absl/types/optional.h"
-#include "api/array_view.h"
-#include "common_audio/audio_converter.h"
-#include "common_audio/include/audio_util.h"
-#include "modules/audio_processing/agc/agc_manager_direct.h"
-#include "modules/audio_processing/agc2/gain_applier.h"
-#include "modules/audio_processing/audio_buffer.h"
-#include "modules/audio_processing/common.h"
-#include "modules/audio_processing/echo_cancellation_impl.h"
-#include "modules/audio_processing/echo_control_mobile_impl.h"
-#include "modules/audio_processing/gain_control_for_experimental_agc.h"
-#include "modules/audio_processing/gain_control_impl.h"
-#include "modules/audio_processing/gain_controller2.h"
-#include "modules/audio_processing/include/audio_frame_view.h"
-#include "modules/audio_processing/level_estimator_impl.h"
-#include "modules/audio_processing/logging/apm_data_dumper.h"
-#include "modules/audio_processing/low_cut_filter.h"
-#include "modules/audio_processing/noise_suppression_impl.h"
-#include "modules/audio_processing/residual_echo_detector.h"
-#include "modules/audio_processing/transient/transient_suppressor.h"
-#include "modules/audio_processing/voice_detection_impl.h"
-#include "rtc_base/atomicops.h"
-#include "rtc_base/checks.h"
-#include "rtc_base/constructormagic.h"
-#include "rtc_base/logging.h"
-#include "rtc_base/refcountedobject.h"
-#include "rtc_base/timeutils.h"
-#include "rtc_base/trace_event.h"
-#include "system_wrappers/include/metrics.h"
-
-#define RETURN_ON_ERR(expr) \
-  do {                      \
-    int err = (expr);       \
-    if (err != kNoError) {  \
-      return err;           \
-    }                       \
-  } while (0)
-
-namespace webrtc {
-
-constexpr int AudioProcessing::kNativeSampleRatesHz[];
-constexpr int kRuntimeSettingQueueSize = 100;
-
-namespace {
-
-static bool LayoutHasKeyboard(AudioProcessing::ChannelLayout layout) {
-  switch (layout) {
-    case AudioProcessing::kMono:
-    case AudioProcessing::kStereo:
-      return false;
-    case AudioProcessing::kMonoAndKeyboard:
-    case AudioProcessing::kStereoAndKeyboard:
-      return true;
-  }
-
-  RTC_NOTREACHED();
-  return false;
-}
-
-bool SampleRateSupportsMultiBand(int sample_rate_hz) {
-  return sample_rate_hz == AudioProcessing::kSampleRate32kHz ||
-         sample_rate_hz == AudioProcessing::kSampleRate48kHz;
-}
-
-int FindNativeProcessRateToUse(int minimum_rate, bool band_splitting_required) {
-#ifdef WEBRTC_ARCH_ARM_FAMILY
-  constexpr int kMaxSplittingNativeProcessRate =
-      AudioProcessing::kSampleRate32kHz;
-#else
-  constexpr int kMaxSplittingNativeProcessRate =
-      AudioProcessing::kSampleRate48kHz;
-#endif
-  static_assert(
-      kMaxSplittingNativeProcessRate <= AudioProcessing::kMaxNativeSampleRateHz,
-      "");
-  const int uppermost_native_rate = band_splitting_required
-                                        ? kMaxSplittingNativeProcessRate
-                                        : AudioProcessing::kSampleRate48kHz;
-
-  for (auto rate : AudioProcessing::kNativeSampleRatesHz) {
-    if (rate >= uppermost_native_rate) {
-      return uppermost_native_rate;
-    }
-    if (rate >= minimum_rate) {
-      return rate;
-    }
-  }
-  RTC_NOTREACHED();
-  return uppermost_native_rate;
-}
-
-// Maximum lengths that frame of samples being passed from the render side to
-// the capture side can have (does not apply to AEC3).
-static const size_t kMaxAllowedValuesOfSamplesPerBand = 160;
-static const size_t kMaxAllowedValuesOfSamplesPerFrame = 480;
-
-// Maximum number of frames to buffer in the render queue.
-// TODO(peah): Decrease this once we properly handle hugely unbalanced
-// reverse and forward call numbers.
-static const size_t kMaxNumFramesToBuffer = 100;
-}  // namespace
-
-// Throughout webrtc, it's assumed that success is represented by zero.
-static_assert(AudioProcessing::kNoError == 0, "kNoError must be zero");
-
-AudioProcessingImpl::ApmSubmoduleStates::ApmSubmoduleStates(
-    bool capture_post_processor_enabled,
-    bool render_pre_processor_enabled,
-    bool capture_analyzer_enabled)
-    : capture_post_processor_enabled_(capture_post_processor_enabled),
-      render_pre_processor_enabled_(render_pre_processor_enabled),
-      capture_analyzer_enabled_(capture_analyzer_enabled) {}
-
-bool AudioProcessingImpl::ApmSubmoduleStates::Update(
-    bool high_pass_filter_enabled,
-    bool echo_canceller_enabled,
-    bool mobile_echo_controller_enabled,
-    bool residual_echo_detector_enabled,
-    bool noise_suppressor_enabled,
-    bool adaptive_gain_controller_enabled,
-    bool gain_controller2_enabled,
-    bool pre_amplifier_enabled,
-    bool echo_controller_enabled,
-    bool voice_activity_detector_enabled,
-    bool level_estimator_enabled,
-    bool transient_suppressor_enabled) {
-  bool changed = false;
-  changed |= (high_pass_filter_enabled != high_pass_filter_enabled_);
-  changed |= (echo_canceller_enabled != echo_canceller_enabled_);
-  changed |=
-      (mobile_echo_controller_enabled != mobile_echo_controller_enabled_);
-  changed |=
-      (residual_echo_detector_enabled != residual_echo_detector_enabled_);
-  changed |= (noise_suppressor_enabled != noise_suppressor_enabled_);
-  changed |=
-      (adaptive_gain_controller_enabled != adaptive_gain_controller_enabled_);
-  changed |=
-      (gain_controller2_enabled != gain_controller2_enabled_);
-  changed |= (pre_amplifier_enabled_ != pre_amplifier_enabled);
-  changed |= (echo_controller_enabled != echo_controller_enabled_);
-  changed |= (level_estimator_enabled != level_estimator_enabled_);
-  changed |=
-      (voice_activity_detector_enabled != voice_activity_detector_enabled_);
-  changed |= (transient_suppressor_enabled != transient_suppressor_enabled_);
-  if (changed) {
-    high_pass_filter_enabled_ = high_pass_filter_enabled;
-    echo_canceller_enabled_ = echo_canceller_enabled;
-    mobile_echo_controller_enabled_ = mobile_echo_controller_enabled;
-    residual_echo_detector_enabled_ = residual_echo_detector_enabled;
-    noise_suppressor_enabled_ = noise_suppressor_enabled;
-    adaptive_gain_controller_enabled_ = adaptive_gain_controller_enabled;
-    gain_controller2_enabled_ = gain_controller2_enabled;
-    pre_amplifier_enabled_ = pre_amplifier_enabled;
-    echo_controller_enabled_ = echo_controller_enabled;
-    level_estimator_enabled_ = level_estimator_enabled;
-    voice_activity_detector_enabled_ = voice_activity_detector_enabled;
-    transient_suppressor_enabled_ = transient_suppressor_enabled;
-  }
-
-  changed |= first_update_;
-  first_update_ = false;
-  return changed;
-}
-
-bool AudioProcessingImpl::ApmSubmoduleStates::CaptureMultiBandSubModulesActive()
-    const {
-  return CaptureMultiBandProcessingActive() || voice_activity_detector_enabled_;
-}
-
-bool AudioProcessingImpl::ApmSubmoduleStates::CaptureMultiBandProcessingActive()
-    const {
-  return high_pass_filter_enabled_ || echo_canceller_enabled_ ||
-         mobile_echo_controller_enabled_ || noise_suppressor_enabled_ ||
-         adaptive_gain_controller_enabled_ || echo_controller_enabled_;
-}
-
-bool AudioProcessingImpl::ApmSubmoduleStates::CaptureFullBandProcessingActive()
-    const {
-  return gain_controller2_enabled_ || capture_post_processor_enabled_ ||
-         pre_amplifier_enabled_;
-}
-
-bool AudioProcessingImpl::ApmSubmoduleStates::CaptureAnalyzerActive() const {
-  return capture_analyzer_enabled_;
-}
-
-bool AudioProcessingImpl::ApmSubmoduleStates::RenderMultiBandSubModulesActive()
-    const {
-  return RenderMultiBandProcessingActive() || echo_canceller_enabled_ ||
-         mobile_echo_controller_enabled_ || adaptive_gain_controller_enabled_ ||
-         echo_controller_enabled_;
-}
-
-bool AudioProcessingImpl::ApmSubmoduleStates::RenderFullBandProcessingActive()
-    const {
-  return render_pre_processor_enabled_;
-}
-
-bool AudioProcessingImpl::ApmSubmoduleStates::RenderMultiBandProcessingActive()
-    const {
-  return false;
-}
-
-bool AudioProcessingImpl::ApmSubmoduleStates::LowCutFilteringRequired() const {
-  return high_pass_filter_enabled_ || echo_canceller_enabled_ ||
-         mobile_echo_controller_enabled_ || noise_suppressor_enabled_;
-}
-
-struct AudioProcessingImpl::ApmPublicSubmodules {
-  ApmPublicSubmodules() {}
-  // Accessed externally of APM without any lock acquired.
-  std::unique_ptr<GainControlImpl> gain_control;
-  std::unique_ptr<LevelEstimatorImpl> level_estimator;
-  std::unique_ptr<NoiseSuppressionImpl> noise_suppression;
-  std::unique_ptr<VoiceDetectionImpl> voice_detection;
-  std::unique_ptr<GainControlForExperimentalAgc>
-      gain_control_for_experimental_agc;
-
-  // Accessed internally from both render and capture.
-  std::unique_ptr<TransientSuppressor> transient_suppressor;
-};
-
-struct AudioProcessingImpl::ApmPrivateSubmodules {
-  ApmPrivateSubmodules(std::unique_ptr<CustomProcessing> capture_post_processor,
-                       std::unique_ptr<CustomProcessing> render_pre_processor,
-                       rtc::scoped_refptr<EchoDetector> echo_detector,
-                       std::unique_ptr<CustomAudioAnalyzer> capture_analyzer)
-      : echo_detector(std::move(echo_detector)),
-        capture_post_processor(std::move(capture_post_processor)),
-        render_pre_processor(std::move(render_pre_processor)),
-        capture_analyzer(std::move(capture_analyzer)) {}
-  // Accessed internally from capture or during initialization
-  std::unique_ptr<AgcManagerDirect> agc_manager;
-  std::unique_ptr<GainController2> gain_controller2;
-  std::unique_ptr<LowCutFilter> low_cut_filter;
-  rtc::scoped_refptr<EchoDetector> echo_detector;
-  std::unique_ptr<EchoCancellationImpl> echo_cancellation;
-  std::unique_ptr<EchoControl> echo_controller;
-  std::unique_ptr<EchoControlMobileImpl> echo_control_mobile;
-  std::unique_ptr<CustomProcessing> capture_post_processor;
-  std::unique_ptr<CustomProcessing> render_pre_processor;
-  std::unique_ptr<GainApplier> pre_amplifier;
-  std::unique_ptr<CustomAudioAnalyzer> capture_analyzer;
-};
-
-AudioProcessingBuilder::AudioProcessingBuilder() = default;
-AudioProcessingBuilder::~AudioProcessingBuilder() = default;
-
-AudioProcessingBuilder& AudioProcessingBuilder::SetCapturePostProcessing(
-    std::unique_ptr<CustomProcessing> capture_post_processing) {
-  capture_post_processing_ = std::move(capture_post_processing);
-  return *this;
-}
-
-AudioProcessingBuilder& AudioProcessingBuilder::SetRenderPreProcessing(
-    std::unique_ptr<CustomProcessing> render_pre_processing) {
-  render_pre_processing_ = std::move(render_pre_processing);
-  return *this;
-}
-
-AudioProcessingBuilder& AudioProcessingBuilder::SetCaptureAnalyzer(
-    std::unique_ptr<CustomAudioAnalyzer> capture_analyzer) {
-  capture_analyzer_ = std::move(capture_analyzer);
-  return *this;
-}
-
-AudioProcessingBuilder& AudioProcessingBuilder::SetEchoControlFactory(
-    std::unique_ptr<EchoControlFactory> echo_control_factory) {
-  echo_control_factory_ = std::move(echo_control_factory);
-  return *this;
-}
-
-AudioProcessingBuilder& AudioProcessingBuilder::SetEchoDetector(
-    rtc::scoped_refptr<EchoDetector> echo_detector) {
-  echo_detector_ = std::move(echo_detector);
-  return *this;
-}
-
-AudioProcessing* AudioProcessingBuilder::Create() {
-  webrtc::Config config;
-  return Create(config);
-}
-
-AudioProcessing* AudioProcessingBuilder::Create(const webrtc::Config& config) {
-  AudioProcessingImpl* apm = new rtc::RefCountedObject<AudioProcessingImpl>(
-      config, std::move(capture_post_processing_),
-      std::move(render_pre_processing_), std::move(echo_control_factory_),
-      std::move(echo_detector_), std::move(capture_analyzer_));
-  if (apm->Initialize() != AudioProcessing::kNoError) {
-    delete apm;
-    apm = nullptr;
-  }
-  return apm;
-}
-
-AudioProcessingImpl::AudioProcessingImpl(const webrtc::Config& config)
-    : AudioProcessingImpl(config, nullptr, nullptr, nullptr, nullptr, nullptr) {
-}
-
-int AudioProcessingImpl::instance_count_ = 0;
-
-AudioProcessingImpl::AudioProcessingImpl(
-    const webrtc::Config& config,
-    std::unique_ptr<CustomProcessing> capture_post_processor,
-    std::unique_ptr<CustomProcessing> render_pre_processor,
-    std::unique_ptr<EchoControlFactory> echo_control_factory,
-    rtc::scoped_refptr<EchoDetector> echo_detector,
-    std::unique_ptr<CustomAudioAnalyzer> capture_analyzer)
-    : data_dumper_(
-          new ApmDataDumper(rtc::AtomicOps::Increment(&instance_count_))),
-      capture_runtime_settings_(kRuntimeSettingQueueSize),
-      render_runtime_settings_(kRuntimeSettingQueueSize),
-      capture_runtime_settings_enqueuer_(&capture_runtime_settings_),
-      render_runtime_settings_enqueuer_(&render_runtime_settings_),
-      echo_control_factory_(std::move(echo_control_factory)),
-      submodule_states_(!!capture_post_processor,
-                        !!render_pre_processor,
-                        !!capture_analyzer),
-      public_submodules_(new ApmPublicSubmodules()),
-      private_submodules_(
-          new ApmPrivateSubmodules(std::move(capture_post_processor),
-                                   std::move(render_pre_processor),
-                                   std::move(echo_detector),
-                                   std::move(capture_analyzer))),
-      constants_(config.Get<ExperimentalAgc>().startup_min_volume,
-                 config.Get<ExperimentalAgc>().clipped_level_min,
-#if defined(WEBRTC_ANDROID) || defined(WEBRTC_IOS)
-                 /* enabled= */ false,
-                 /* enabled_agc2_level_estimator= */ false,
-                 /* digital_adaptive_disabled= */ false,
-                 /* analyze_before_aec= */ false),
-#else
-                 config.Get<ExperimentalAgc>().enabled,
-                 config.Get<ExperimentalAgc>().enabled_agc2_level_estimator,
-                 config.Get<ExperimentalAgc>().digital_adaptive_disabled,
-                 config.Get<ExperimentalAgc>().analyze_before_aec),
-#endif
-#if defined(WEBRTC_ANDROID) || defined(WEBRTC_IOS)
-      capture_(false),
-#else
-      capture_(config.Get<ExperimentalNs>().enabled),
-#endif
-      capture_nonlocked_() {
-  {
-    rtc::CritScope cs_render(&crit_render_);
-    rtc::CritScope cs_capture(&crit_capture_);
-
-    // Mark Echo Controller enabled if a factory is injected.
-    capture_nonlocked_.echo_controller_enabled =
-        static_cast<bool>(echo_control_factory_);
-
-    public_submodules_->gain_control.reset(
-        new GainControlImpl(&crit_render_, &crit_capture_));
-    public_submodules_->level_estimator.reset(
-        new LevelEstimatorImpl(&crit_capture_));
-    public_submodules_->noise_suppression.reset(
-        new NoiseSuppressionImpl(&crit_capture_));
-    public_submodules_->voice_detection.reset(
-        new VoiceDetectionImpl(&crit_capture_));
-    public_submodules_->gain_control_for_experimental_agc.reset(
-        new GainControlForExperimentalAgc(
-            public_submodules_->gain_control.get(), &crit_capture_));
-
-    // If no echo detector is injected, use the ResidualEchoDetector.
-    if (!private_submodules_->echo_detector) {
-      private_submodules_->echo_detector =
-          new rtc::RefCountedObject<ResidualEchoDetector>();
-    }
-
-    private_submodules_->echo_cancellation.reset(new EchoCancellationImpl());
-    private_submodules_->echo_control_mobile.reset(new EchoControlMobileImpl());
-    // TODO(alessiob): Move the injected gain controller once injection is
-    // implemented.
-    private_submodules_->gain_controller2.reset(new GainController2());
-
-    RTC_LOG(LS_INFO) << "Capture analyzer activated: "
-                     << !!private_submodules_->capture_analyzer
-                     << "\nCapture post processor activated: "
-                     << !!private_submodules_->capture_post_processor
-                     << "\nRender pre processor activated: "
-                     << !!private_submodules_->render_pre_processor;
-  }
-
-  SetExtraOptions(config);
-}
-
-AudioProcessingImpl::~AudioProcessingImpl() {
-  // Depends on gain_control_ and
-  // public_submodules_->gain_control_for_experimental_agc.
-  private_submodules_->agc_manager.reset();
-  // Depends on gain_control_.
-  public_submodules_->gain_control_for_experimental_agc.reset();
-}
-
-int AudioProcessingImpl::Initialize() {
-  // Run in a single-threaded manner during initialization.
-  rtc::CritScope cs_render(&crit_render_);
-  rtc::CritScope cs_capture(&crit_capture_);
-  return InitializeLocked();
-}
-
-int AudioProcessingImpl::Initialize(int capture_input_sample_rate_hz,
-                                    int capture_output_sample_rate_hz,
-                                    int render_input_sample_rate_hz,
-                                    ChannelLayout capture_input_layout,
-                                    ChannelLayout capture_output_layout,
-                                    ChannelLayout render_input_layout) {
-  const ProcessingConfig processing_config = {
-      {{capture_input_sample_rate_hz, ChannelsFromLayout(capture_input_layout),
-        LayoutHasKeyboard(capture_input_layout)},
-       {capture_output_sample_rate_hz,
-        ChannelsFromLayout(capture_output_layout),
-        LayoutHasKeyboard(capture_output_layout)},
-       {render_input_sample_rate_hz, ChannelsFromLayout(render_input_layout),
-        LayoutHasKeyboard(render_input_layout)},
-       {render_input_sample_rate_hz, ChannelsFromLayout(render_input_layout),
-        LayoutHasKeyboard(render_input_layout)}}};
-
-  return Initialize(processing_config);
-}
-
-int AudioProcessingImpl::Initialize(const ProcessingConfig& processing_config) {
-  // Run in a single-threaded manner during initialization.
-  rtc::CritScope cs_render(&crit_render_);
-  rtc::CritScope cs_capture(&crit_capture_);
-  return InitializeLocked(processing_config);
-}
-
-int AudioProcessingImpl::MaybeInitializeRender(
-    const ProcessingConfig& processing_config) {
-  return MaybeInitialize(processing_config, false);
-}
-
-int AudioProcessingImpl::MaybeInitializeCapture(
-    const ProcessingConfig& processing_config,
-    bool force_initialization) {
-  return MaybeInitialize(processing_config, force_initialization);
-}
-
-// Calls InitializeLocked() if any of the audio parameters have changed from
-// their current values (needs to be called while holding the crit_render_lock).
-int AudioProcessingImpl::MaybeInitialize(
-    const ProcessingConfig& processing_config,
-    bool force_initialization) {
-  // Called from both threads. Thread check is therefore not possible.
-  if (processing_config == formats_.api_format && !force_initialization) {
-    return kNoError;
-  }
-
-  rtc::CritScope cs_capture(&crit_capture_);
-  return InitializeLocked(processing_config);
-}
-
-int AudioProcessingImpl::InitializeLocked() {
-  UpdateActiveSubmoduleStates();
-
-  const int render_audiobuffer_num_output_frames =
-      formats_.api_format.reverse_output_stream().num_frames() == 0
-          ? formats_.render_processing_format.num_frames()
-          : formats_.api_format.reverse_output_stream().num_frames();
-  if (formats_.api_format.reverse_input_stream().num_channels() > 0) {
-    render_.render_audio.reset(new AudioBuffer(
-        formats_.api_format.reverse_input_stream().num_frames(),
-        formats_.api_format.reverse_input_stream().num_channels(),
-        formats_.render_processing_format.num_frames(),
-        formats_.render_processing_format.num_channels(),
-        render_audiobuffer_num_output_frames));
-    if (formats_.api_format.reverse_input_stream() !=
-        formats_.api_format.reverse_output_stream()) {
-      render_.render_converter = AudioConverter::Create(
-          formats_.api_format.reverse_input_stream().num_channels(),
-          formats_.api_format.reverse_input_stream().num_frames(),
-          formats_.api_format.reverse_output_stream().num_channels(),
-          formats_.api_format.reverse_output_stream().num_frames());
-    } else {
-      render_.render_converter.reset(nullptr);
-    }
-  } else {
-    render_.render_audio.reset(nullptr);
-    render_.render_converter.reset(nullptr);
-  }
-
-  capture_.capture_audio.reset(
-      new AudioBuffer(formats_.api_format.input_stream().num_frames(),
-                      formats_.api_format.input_stream().num_channels(),
-                      capture_nonlocked_.capture_processing_format.num_frames(),
-                      formats_.api_format.output_stream().num_channels(),
-                      formats_.api_format.output_stream().num_frames()));
-
-  private_submodules_->echo_cancellation->Initialize(
-      proc_sample_rate_hz(), num_reverse_channels(), num_output_channels(),
-      num_proc_channels());
-  AllocateRenderQueue();
-
-  int success = private_submodules_->echo_cancellation->enable_metrics(true);
-  RTC_DCHECK_EQ(0, success);
-  success = private_submodules_->echo_cancellation->enable_delay_logging(true);
-  RTC_DCHECK_EQ(0, success);
-  private_submodules_->echo_control_mobile->Initialize(
-      proc_split_sample_rate_hz(), num_reverse_channels(),
-      num_output_channels());
-
-  public_submodules_->gain_control->Initialize(num_proc_channels(),
-                                               proc_sample_rate_hz());
-  if (constants_.use_experimental_agc) {
-    if (!private_submodules_->agc_manager.get()) {
-      private_submodules_->agc_manager.reset(new AgcManagerDirect(
-          public_submodules_->gain_control.get(),
-          public_submodules_->gain_control_for_experimental_agc.get(),
-          constants_.agc_startup_min_volume, constants_.agc_clipped_level_min,
-          constants_.use_experimental_agc_agc2_level_estimation,
-          constants_.use_experimental_agc_agc2_digital_adaptive));
-    }
-    private_submodules_->agc_manager->Initialize();
-    private_submodules_->agc_manager->SetCaptureMuted(
-        capture_.output_will_be_muted);
-    public_submodules_->gain_control_for_experimental_agc->Initialize();
-  }
-  InitializeTransient();
-  InitializeLowCutFilter();
-  public_submodules_->noise_suppression->Initialize(num_proc_channels(),
-                                                    proc_sample_rate_hz());
-  public_submodules_->voice_detection->Initialize(proc_split_sample_rate_hz());
-  public_submodules_->level_estimator->Initialize();
-  InitializeResidualEchoDetector();
-  InitializeEchoController();
-  InitializeGainController2();
-  InitializeAnalyzer();
-  InitializePostProcessor();
-  InitializePreProcessor();
-
-  if (aec_dump_) {
-    aec_dump_->WriteInitMessage(formats_.api_format, rtc::TimeUTCMillis());
-  }
-  return kNoError;
-}
-
-int AudioProcessingImpl::InitializeLocked(const ProcessingConfig& config) {
-  UpdateActiveSubmoduleStates();
-
-  for (const auto& stream : config.streams) {
-    if (stream.num_channels() > 0 && stream.sample_rate_hz() <= 0) {
-      return kBadSampleRateError;
-    }
-  }
-
-  const size_t num_in_channels = config.input_stream().num_channels();
-  const size_t num_out_channels = config.output_stream().num_channels();
-
-  // Need at least one input channel.
-  // Need either one output channel or as many outputs as there are inputs.
-  if (num_in_channels == 0 ||
-      !(num_out_channels == 1 || num_out_channels == num_in_channels)) {
-    return kBadNumberChannelsError;
-  }
-
-  formats_.api_format = config;
-
-  int capture_processing_rate = FindNativeProcessRateToUse(
-      std::min(formats_.api_format.input_stream().sample_rate_hz(),
-               formats_.api_format.output_stream().sample_rate_hz()),
-      submodule_states_.CaptureMultiBandSubModulesActive() ||
-          submodule_states_.RenderMultiBandSubModulesActive());
-
-  capture_nonlocked_.capture_processing_format =
-      StreamConfig(capture_processing_rate);
-
-  int render_processing_rate;
-  if (!capture_nonlocked_.echo_controller_enabled) {
-    render_processing_rate = FindNativeProcessRateToUse(
-        std::min(formats_.api_format.reverse_input_stream().sample_rate_hz(),
-                 formats_.api_format.reverse_output_stream().sample_rate_hz()),
-        submodule_states_.CaptureMultiBandSubModulesActive() ||
-            submodule_states_.RenderMultiBandSubModulesActive());
-  } else {
-    render_processing_rate = capture_processing_rate;
-  }
-
-  // TODO(aluebs): Remove this restriction once we figure out why the 3-band
-  // splitting filter degrades the AEC performance.
-  if (render_processing_rate > kSampleRate32kHz &&
-      !capture_nonlocked_.echo_controller_enabled) {
-    render_processing_rate = submodule_states_.RenderMultiBandProcessingActive()
-                                 ? kSampleRate32kHz
-                                 : kSampleRate16kHz;
-  }
-
-  // If the forward sample rate is 8 kHz, the render stream is also processed
-  // at this rate.
-  if (capture_nonlocked_.capture_processing_format.sample_rate_hz() ==
-      kSampleRate8kHz) {
-    render_processing_rate = kSampleRate8kHz;
-  } else {
-    render_processing_rate =
-        std::max(render_processing_rate, static_cast<int>(kSampleRate16kHz));
-  }
-
-  // Always downmix the render stream to mono for analysis. This has been
-  // demonstrated to work well for AEC in most practical scenarios.
-  if (submodule_states_.RenderMultiBandSubModulesActive()) {
-    formats_.render_processing_format = StreamConfig(render_processing_rate, 1);
-  } else {
-    formats_.render_processing_format = StreamConfig(
-        formats_.api_format.reverse_input_stream().sample_rate_hz(),
-        formats_.api_format.reverse_input_stream().num_channels());
-  }
-
-  if (capture_nonlocked_.capture_processing_format.sample_rate_hz() ==
-          kSampleRate32kHz ||
-      capture_nonlocked_.capture_processing_format.sample_rate_hz() ==
-          kSampleRate48kHz) {
-    capture_nonlocked_.split_rate = kSampleRate16kHz;
-  } else {
-    capture_nonlocked_.split_rate =
-        capture_nonlocked_.capture_processing_format.sample_rate_hz();
-  }
-
-  return InitializeLocked();
-}
-
-void AudioProcessingImpl::ApplyConfig(const AudioProcessing::Config& config) {
-  // Run in a single-threaded manner when applying the settings.
-  rtc::CritScope cs_render(&crit_render_);
-  rtc::CritScope cs_capture(&crit_capture_);
-
-  config_ = config;
-
-  private_submodules_->echo_cancellation->Enable(
-      config_.echo_canceller.enabled && !config_.echo_canceller.mobile_mode);
-  private_submodules_->echo_control_mobile->Enable(
-      config_.echo_canceller.enabled && config_.echo_canceller.mobile_mode);
-
-  private_submodules_->echo_cancellation->set_suppression_level(
-      config.echo_canceller.legacy_moderate_suppression_level
-          ? EchoCancellationImpl::SuppressionLevel::kModerateSuppression
-          : EchoCancellationImpl::SuppressionLevel::kHighSuppression);
-
-  InitializeLowCutFilter();
-
-  RTC_LOG(LS_INFO) << "Highpass filter activated: "
-                   << config_.high_pass_filter.enabled;
-
-  const bool config_ok = GainController2::Validate(config_.gain_controller2);
-  if (!config_ok) {
-    RTC_LOG(LS_ERROR) << "AudioProcessing module config error\n"
-                         "Gain Controller 2: "
-                      << GainController2::ToString(config_.gain_controller2)
-                      << "\nReverting to default parameter set";
-    config_.gain_controller2 = AudioProcessing::Config::GainController2();
-  }
-  InitializeGainController2();
-  InitializePreAmplifier();
-  private_submodules_->gain_controller2->ApplyConfig(config_.gain_controller2);
-  RTC_LOG(LS_INFO) << "Gain Controller 2 activated: "
-                   << config_.gain_controller2.enabled;
-  RTC_LOG(LS_INFO) << "Pre-amplifier activated: "
-                   << config_.pre_amplifier.enabled;
-}
-
-void AudioProcessingImpl::SetExtraOptions(const webrtc::Config& config) {
-  // Run in a single-threaded manner when setting the extra options.
-  rtc::CritScope cs_render(&crit_render_);
-  rtc::CritScope cs_capture(&crit_capture_);
-
-  private_submodules_->echo_cancellation->SetExtraOptions(config);
-
-  if (capture_.transient_suppressor_enabled !=
-      config.Get<ExperimentalNs>().enabled) {
-    capture_.transient_suppressor_enabled =
-        config.Get<ExperimentalNs>().enabled;
-    InitializeTransient();
-  }
-}
-
-int AudioProcessingImpl::proc_sample_rate_hz() const {
-  // Used as callback from submodules, hence locking is not allowed.
-  return capture_nonlocked_.capture_processing_format.sample_rate_hz();
-}
-
-int AudioProcessingImpl::proc_split_sample_rate_hz() const {
-  // Used as callback from submodules, hence locking is not allowed.
-  return capture_nonlocked_.split_rate;
-}
-
-size_t AudioProcessingImpl::num_reverse_channels() const {
-  // Used as callback from submodules, hence locking is not allowed.
-  return formats_.render_processing_format.num_channels();
-}
-
-size_t AudioProcessingImpl::num_input_channels() const {
-  // Used as callback from submodules, hence locking is not allowed.
-  return formats_.api_format.input_stream().num_channels();
-}
-
-size_t AudioProcessingImpl::num_proc_channels() const {
-  // Used as callback from submodules, hence locking is not allowed.
-  return capture_nonlocked_.echo_controller_enabled ? 1 : num_output_channels();
-}
-
-size_t AudioProcessingImpl::num_output_channels() const {
-  // Used as callback from submodules, hence locking is not allowed.
-  return formats_.api_format.output_stream().num_channels();
-}
-
-void AudioProcessingImpl::set_output_will_be_muted(bool muted) {
-  rtc::CritScope cs(&crit_capture_);
-  capture_.output_will_be_muted = muted;
-  if (private_submodules_->agc_manager.get()) {
-    private_submodules_->agc_manager->SetCaptureMuted(
-        capture_.output_will_be_muted);
-  }
-}
-
-void AudioProcessingImpl::SetRuntimeSetting(RuntimeSetting setting) {
-  switch (setting.type()) {
-    case RuntimeSetting::Type::kCustomRenderProcessingRuntimeSetting:
-      render_runtime_settings_enqueuer_.Enqueue(setting);
-      return;
-    case RuntimeSetting::Type::kNotSpecified:
-      RTC_NOTREACHED();
-      return;
-    case RuntimeSetting::Type::kCapturePreGain:
-      capture_runtime_settings_enqueuer_.Enqueue(setting);
-      return;
-  }
-  // The language allows the enum to have a non-enumerator
-  // value. Check that this doesn't happen.
-  RTC_NOTREACHED();
-}
-
-AudioProcessingImpl::RuntimeSettingEnqueuer::RuntimeSettingEnqueuer(
-    SwapQueue<RuntimeSetting>* runtime_settings)
-    : runtime_settings_(*runtime_settings) {
-  RTC_DCHECK(runtime_settings);
-}
-
-AudioProcessingImpl::RuntimeSettingEnqueuer::~RuntimeSettingEnqueuer() =
-    default;
-
-void AudioProcessingImpl::RuntimeSettingEnqueuer::Enqueue(
-    RuntimeSetting setting) {
-  size_t remaining_attempts = 10;
-  while (!runtime_settings_.Insert(&setting) && remaining_attempts-- > 0) {
-    RuntimeSetting setting_to_discard;
-    if (runtime_settings_.Remove(&setting_to_discard))
-      RTC_LOG(LS_ERROR)
-          << "The runtime settings queue is full. Oldest setting discarded.";
-  }
-  if (remaining_attempts == 0)
-    RTC_LOG(LS_ERROR) << "Cannot enqueue a new runtime setting.";
-}
-
-int AudioProcessingImpl::ProcessStream(const float* const* src,
-                                       size_t samples_per_channel,
-                                       int input_sample_rate_hz,
-                                       ChannelLayout input_layout,
-                                       int output_sample_rate_hz,
-                                       ChannelLayout output_layout,
-                                       float* const* dest) {
-  TRACE_EVENT0("webrtc", "AudioProcessing::ProcessStream_ChannelLayout");
-  StreamConfig input_stream;
-  StreamConfig output_stream;
-  {
-    // Access the formats_.api_format.input_stream beneath the capture lock.
-    // The lock must be released as it is later required in the call
-    // to ProcessStream(,,,);
-    rtc::CritScope cs(&crit_capture_);
-    input_stream = formats_.api_format.input_stream();
-    output_stream = formats_.api_format.output_stream();
-  }
-
-  input_stream.set_sample_rate_hz(input_sample_rate_hz);
-  input_stream.set_num_channels(ChannelsFromLayout(input_layout));
-  input_stream.set_has_keyboard(LayoutHasKeyboard(input_layout));
-  output_stream.set_sample_rate_hz(output_sample_rate_hz);
-  output_stream.set_num_channels(ChannelsFromLayout(output_layout));
-  output_stream.set_has_keyboard(LayoutHasKeyboard(output_layout));
-
-  if (samples_per_channel != input_stream.num_frames()) {
-    return kBadDataLengthError;
-  }
-  return ProcessStream(src, input_stream, output_stream, dest);
-}
-
-int AudioProcessingImpl::ProcessStream(const float* const* src,
-                                       const StreamConfig& input_config,
-                                       const StreamConfig& output_config,
-                                       float* const* dest) {
-  TRACE_EVENT0("webrtc", "AudioProcessing::ProcessStream_StreamConfig");
-  ProcessingConfig processing_config;
-  bool reinitialization_required = false;
-  {
-    // Acquire the capture lock in order to safely call the function
-    // that retrieves the render side data. This function accesses apm
-    // getters that need the capture lock held when being called.
-    rtc::CritScope cs_capture(&crit_capture_);
-    EmptyQueuedRenderAudio();
-
-    if (!src || !dest) {
-      return kNullPointerError;
-    }
-
-    processing_config = formats_.api_format;
-    reinitialization_required = UpdateActiveSubmoduleStates();
-  }
-
-  processing_config.input_stream() = input_config;
-  processing_config.output_stream() = output_config;
-
-  {
-    // Do conditional reinitialization.
-    rtc::CritScope cs_render(&crit_render_);
-    RETURN_ON_ERR(
-        MaybeInitializeCapture(processing_config, reinitialization_required));
-  }
-  rtc::CritScope cs_capture(&crit_capture_);
-  RTC_DCHECK_EQ(processing_config.input_stream().num_frames(),
-                formats_.api_format.input_stream().num_frames());
-
-  if (aec_dump_) {
-    RecordUnprocessedCaptureStream(src);
-  }
-
-  capture_.capture_audio->CopyFrom(src, formats_.api_format.input_stream());
-  RETURN_ON_ERR(ProcessCaptureStreamLocked());
-  capture_.capture_audio->CopyTo(formats_.api_format.output_stream(), dest);
-
-  if (aec_dump_) {
-    RecordProcessedCaptureStream(dest);
-  }
-  return kNoError;
-}
-
-void AudioProcessingImpl::HandleCaptureRuntimeSettings() {
-  RuntimeSetting setting;
-  while (capture_runtime_settings_.Remove(&setting)) {
-    if (aec_dump_) {
-      aec_dump_->WriteRuntimeSetting(setting);
-    }
-    switch (setting.type()) {
-      case RuntimeSetting::Type::kCapturePreGain:
-        if (config_.pre_amplifier.enabled) {
-          float value;
-          setting.GetFloat(&value);
-          private_submodules_->pre_amplifier->SetGainFactor(value);
-        }
-        // TODO(bugs.chromium.org/9138): Log setting handling by Aec Dump.
-        break;
-      case RuntimeSetting::Type::kCustomRenderProcessingRuntimeSetting:
-        RTC_NOTREACHED();
-        break;
-      case RuntimeSetting::Type::kNotSpecified:
-        RTC_NOTREACHED();
-        break;
-    }
-  }
-}
-
-void AudioProcessingImpl::HandleRenderRuntimeSettings() {
-  RuntimeSetting setting;
-  while (render_runtime_settings_.Remove(&setting)) {
-    if (aec_dump_) {
-      aec_dump_->WriteRuntimeSetting(setting);
-    }
-    switch (setting.type()) {
-      case RuntimeSetting::Type::kCustomRenderProcessingRuntimeSetting:
-        if (private_submodules_->render_pre_processor) {
-          private_submodules_->render_pre_processor->SetRuntimeSetting(setting);
-        }
-        break;
-      case RuntimeSetting::Type::kCapturePreGain:
-        RTC_NOTREACHED();
-        break;
-      case RuntimeSetting::Type::kNotSpecified:
-        RTC_NOTREACHED();
-        break;
-    }
-  }
-}
-
-void AudioProcessingImpl::QueueBandedRenderAudio(AudioBuffer* audio) {
-  EchoCancellationImpl::PackRenderAudioBuffer(audio, num_output_channels(),
-                                              num_reverse_channels(),
-                                              &aec_render_queue_buffer_);
-
-  RTC_DCHECK_GE(160, audio->num_frames_per_band());
-
-  // Insert the samples into the queue.
-  if (!aec_render_signal_queue_->Insert(&aec_render_queue_buffer_)) {
-    // The data queue is full and needs to be emptied.
-    EmptyQueuedRenderAudio();
-
-    // Retry the insert (should always work).
-    bool result = aec_render_signal_queue_->Insert(&aec_render_queue_buffer_);
-    RTC_DCHECK(result);
-  }
-
-  EchoControlMobileImpl::PackRenderAudioBuffer(audio, num_output_channels(),
-                                               num_reverse_channels(),
-                                               &aecm_render_queue_buffer_);
-
-  // Insert the samples into the queue.
-  if (!aecm_render_signal_queue_->Insert(&aecm_render_queue_buffer_)) {
-    // The data queue is full and needs to be emptied.
-    EmptyQueuedRenderAudio();
-
-    // Retry the insert (should always work).
-    bool result = aecm_render_signal_queue_->Insert(&aecm_render_queue_buffer_);
-    RTC_DCHECK(result);
-  }
-
-  if (!constants_.use_experimental_agc) {
-    GainControlImpl::PackRenderAudioBuffer(audio, &agc_render_queue_buffer_);
-    // Insert the samples into the queue.
-    if (!agc_render_signal_queue_->Insert(&agc_render_queue_buffer_)) {
-      // The data queue is full and needs to be emptied.
-      EmptyQueuedRenderAudio();
-
-      // Retry the insert (should always work).
-      bool result = agc_render_signal_queue_->Insert(&agc_render_queue_buffer_);
-      RTC_DCHECK(result);
-    }
-  }
-}
-
-void AudioProcessingImpl::QueueNonbandedRenderAudio(AudioBuffer* audio) {
-  ResidualEchoDetector::PackRenderAudioBuffer(audio, &red_render_queue_buffer_);
-
-  // Insert the samples into the queue.
-  if (!red_render_signal_queue_->Insert(&red_render_queue_buffer_)) {
-    // The data queue is full and needs to be emptied.
-    EmptyQueuedRenderAudio();
-
-    // Retry the insert (should always work).
-    bool result = red_render_signal_queue_->Insert(&red_render_queue_buffer_);
-    RTC_DCHECK(result);
-  }
-}
-
-void AudioProcessingImpl::AllocateRenderQueue() {
-  const size_t new_aec_render_queue_element_max_size =
-      std::max(static_cast<size_t>(1),
-               kMaxAllowedValuesOfSamplesPerBand *
-                   EchoCancellationImpl::NumCancellersRequired(
-                       num_output_channels(), num_reverse_channels()));
-
-  const size_t new_aecm_render_queue_element_max_size =
-      std::max(static_cast<size_t>(1),
-               kMaxAllowedValuesOfSamplesPerBand *
-                   EchoControlMobileImpl::NumCancellersRequired(
-                       num_output_channels(), num_reverse_channels()));
-
-  const size_t new_agc_render_queue_element_max_size =
-      std::max(static_cast<size_t>(1), kMaxAllowedValuesOfSamplesPerBand);
-
-  const size_t new_red_render_queue_element_max_size =
-      std::max(static_cast<size_t>(1), kMaxAllowedValuesOfSamplesPerFrame);
-
-  // Reallocate the queues if the queue item sizes are too small to fit the
-  // data to put in the queues.
-  if (aec_render_queue_element_max_size_ <
-      new_aec_render_queue_element_max_size) {
-    aec_render_queue_element_max_size_ = new_aec_render_queue_element_max_size;
-
-    std::vector<float> template_queue_element(
-        aec_render_queue_element_max_size_);
-
-    aec_render_signal_queue_.reset(
-        new SwapQueue<std::vector<float>, RenderQueueItemVerifier<float>>(
-            kMaxNumFramesToBuffer, template_queue_element,
-            RenderQueueItemVerifier<float>(
-                aec_render_queue_element_max_size_)));
-
-    aec_render_queue_buffer_.resize(aec_render_queue_element_max_size_);
-    aec_capture_queue_buffer_.resize(aec_render_queue_element_max_size_);
-  } else {
-    aec_render_signal_queue_->Clear();
-  }
-
-  if (aecm_render_queue_element_max_size_ <
-      new_aecm_render_queue_element_max_size) {
-    aecm_render_queue_element_max_size_ =
-        new_aecm_render_queue_element_max_size;
-
-    std::vector<int16_t> template_queue_element(
-        aecm_render_queue_element_max_size_);
-
-    aecm_render_signal_queue_.reset(
-        new SwapQueue<std::vector<int16_t>, RenderQueueItemVerifier<int16_t>>(
-            kMaxNumFramesToBuffer, template_queue_element,
-            RenderQueueItemVerifier<int16_t>(
-                aecm_render_queue_element_max_size_)));
-
-    aecm_render_queue_buffer_.resize(aecm_render_queue_element_max_size_);
-    aecm_capture_queue_buffer_.resize(aecm_render_queue_element_max_size_);
-  } else {
-    aecm_render_signal_queue_->Clear();
-  }
-
-  if (agc_render_queue_element_max_size_ <
-      new_agc_render_queue_element_max_size) {
-    agc_render_queue_element_max_size_ = new_agc_render_queue_element_max_size;
-
-    std::vector<int16_t> template_queue_element(
-        agc_render_queue_element_max_size_);
-
-    agc_render_signal_queue_.reset(
-        new SwapQueue<std::vector<int16_t>, RenderQueueItemVerifier<int16_t>>(
-            kMaxNumFramesToBuffer, template_queue_element,
-            RenderQueueItemVerifier<int16_t>(
-                agc_render_queue_element_max_size_)));
-
-    agc_render_queue_buffer_.resize(agc_render_queue_element_max_size_);
-    agc_capture_queue_buffer_.resize(agc_render_queue_element_max_size_);
-  } else {
-    agc_render_signal_queue_->Clear();
-  }
-
-  if (red_render_queue_element_max_size_ <
-      new_red_render_queue_element_max_size) {
-    red_render_queue_element_max_size_ = new_red_render_queue_element_max_size;
-
-    std::vector<float> template_queue_element(
-        red_render_queue_element_max_size_);
-
-    red_render_signal_queue_.reset(
-        new SwapQueue<std::vector<float>, RenderQueueItemVerifier<float>>(
-            kMaxNumFramesToBuffer, template_queue_element,
-            RenderQueueItemVerifier<float>(
-                red_render_queue_element_max_size_)));
-
-    red_render_queue_buffer_.resize(red_render_queue_element_max_size_);
-    red_capture_queue_buffer_.resize(red_render_queue_element_max_size_);
-  } else {
-    red_render_signal_queue_->Clear();
-  }
-}
-
-void AudioProcessingImpl::EmptyQueuedRenderAudio() {
-  rtc::CritScope cs_capture(&crit_capture_);
-  while (aec_render_signal_queue_->Remove(&aec_capture_queue_buffer_)) {
-    private_submodules_->echo_cancellation->ProcessRenderAudio(
-        aec_capture_queue_buffer_);
-  }
-
-  while (aecm_render_signal_queue_->Remove(&aecm_capture_queue_buffer_)) {
-    private_submodules_->echo_control_mobile->ProcessRenderAudio(
-        aecm_capture_queue_buffer_);
-  }
-
-  while (agc_render_signal_queue_->Remove(&agc_capture_queue_buffer_)) {
-    public_submodules_->gain_control->ProcessRenderAudio(
-        agc_capture_queue_buffer_);
-  }
-
-  while (red_render_signal_queue_->Remove(&red_capture_queue_buffer_)) {
-    RTC_DCHECK(private_submodules_->echo_detector);
-    private_submodules_->echo_detector->AnalyzeRenderAudio(
-        red_capture_queue_buffer_);
-  }
-}
-
-int AudioProcessingImpl::ProcessStream(AudioFrame* frame) {
-  TRACE_EVENT0("webrtc", "AudioProcessing::ProcessStream_AudioFrame");
-  {
-    // Acquire the capture lock in order to safely call the function
-    // that retrieves the render side data. This function accesses APM
-    // getters that need the capture lock held when being called.
-    rtc::CritScope cs_capture(&crit_capture_);
-    EmptyQueuedRenderAudio();
-  }
-
-  if (!frame) {
-    return kNullPointerError;
-  }
-  // Must be a native rate.
-  if (frame->sample_rate_hz_ != kSampleRate8kHz &&
-      frame->sample_rate_hz_ != kSampleRate16kHz &&
-      frame->sample_rate_hz_ != kSampleRate32kHz &&
-      frame->sample_rate_hz_ != kSampleRate48kHz) {
-    return kBadSampleRateError;
-  }
-
-  ProcessingConfig processing_config;
-  bool reinitialization_required = false;
-  {
-    // Aquire lock for the access of api_format.
-    // The lock is released immediately due to the conditional
-    // reinitialization.
-    rtc::CritScope cs_capture(&crit_capture_);
-    // TODO(ajm): The input and output rates and channels are currently
-    // constrained to be identical in the int16 interface.
-    processing_config = formats_.api_format;
-
-    reinitialization_required = UpdateActiveSubmoduleStates();
-  }
-  processing_config.input_stream().set_sample_rate_hz(frame->sample_rate_hz_);
-  processing_config.input_stream().set_num_channels(frame->num_channels_);
-  processing_config.output_stream().set_sample_rate_hz(frame->sample_rate_hz_);
-  processing_config.output_stream().set_num_channels(frame->num_channels_);
-
-  {
-    // Do conditional reinitialization.
-    rtc::CritScope cs_render(&crit_render_);
-    RETURN_ON_ERR(
-        MaybeInitializeCapture(processing_config, reinitialization_required));
-  }
-  rtc::CritScope cs_capture(&crit_capture_);
-  if (frame->samples_per_channel_ !=
-      formats_.api_format.input_stream().num_frames()) {
-    return kBadDataLengthError;
-  }
-
-  if (aec_dump_) {
-    RecordUnprocessedCaptureStream(*frame);
-  }
-
-  capture_.capture_audio->DeinterleaveFrom(frame);
-  RETURN_ON_ERR(ProcessCaptureStreamLocked());
-  capture_.capture_audio->InterleaveTo(
-      frame, submodule_states_.CaptureMultiBandProcessingActive() ||
-                 submodule_states_.CaptureFullBandProcessingActive());
-
-  if (aec_dump_) {
-    RecordProcessedCaptureStream(*frame);
-  }
-
-  return kNoError;
-}
-
-int AudioProcessingImpl::ProcessCaptureStreamLocked() {
-  HandleCaptureRuntimeSettings();
-
-  // Ensure that not both the AEC and AECM are active at the same time.
-  // TODO(peah): Simplify once the public API Enable functions for these
-  // are moved to APM.
-  RTC_DCHECK(!(private_submodules_->echo_cancellation->is_enabled() &&
-               private_submodules_->echo_control_mobile->is_enabled()));
-
-  MaybeUpdateHistograms();
-
-  AudioBuffer* capture_buffer = capture_.capture_audio.get();  // For brevity.
-
-  if (private_submodules_->pre_amplifier) {
-    private_submodules_->pre_amplifier->ApplyGain(AudioFrameView<float>(
-        capture_buffer->channels_f(), capture_buffer->num_channels(),
-        capture_buffer->num_frames()));
-  }
-
-  capture_input_rms_.Analyze(rtc::ArrayView<const int16_t>(
-      capture_buffer->channels_const()[0],
-      capture_nonlocked_.capture_processing_format.num_frames()));
-  const bool log_rms = ++capture_rms_interval_counter_ >= 1000;
-  if (log_rms) {
-    capture_rms_interval_counter_ = 0;
-    RmsLevel::Levels levels = capture_input_rms_.AverageAndPeak();
-    RTC_HISTOGRAM_COUNTS_LINEAR("WebRTC.Audio.ApmCaptureInputLevelAverageRms",
-                                levels.average, 1, RmsLevel::kMinLevelDb, 64);
-    RTC_HISTOGRAM_COUNTS_LINEAR("WebRTC.Audio.ApmCaptureInputLevelPeakRms",
-                                levels.peak, 1, RmsLevel::kMinLevelDb, 64);
-  }
-
-  if (private_submodules_->echo_controller) {
-    // Detect and flag any change in the analog gain.
-    int analog_mic_level = gain_control()->stream_analog_level();
-    capture_.echo_path_gain_change =
-        capture_.prev_analog_mic_level != analog_mic_level &&
-        capture_.prev_analog_mic_level != -1;
-    capture_.prev_analog_mic_level = analog_mic_level;
-
-    // Detect and flag any change in the pre-amplifier gain.
-    if (private_submodules_->pre_amplifier) {
-      float pre_amp_gain = private_submodules_->pre_amplifier->GetGainFactor();
-      capture_.echo_path_gain_change =
-          capture_.echo_path_gain_change ||
-          (capture_.prev_pre_amp_gain != pre_amp_gain &&
-           capture_.prev_pre_amp_gain >= 0.f);
-      capture_.prev_pre_amp_gain = pre_amp_gain;
-    }
-    private_submodules_->echo_controller->AnalyzeCapture(capture_buffer);
-  }
-
-  if (constants_.use_experimental_agc &&
-      public_submodules_->gain_control->is_enabled()) {
-    private_submodules_->agc_manager->AnalyzePreProcess(
-        capture_buffer->channels()[0], capture_buffer->num_channels(),
-        capture_nonlocked_.capture_processing_format.num_frames());
-
-    if (constants_.use_experimental_agc_process_before_aec) {
-      private_submodules_->agc_manager->Process(
-          capture_buffer->channels()[0],
-          capture_nonlocked_.capture_processing_format.num_frames(),
-          capture_nonlocked_.capture_processing_format.sample_rate_hz());
-    }
-  }
-
-  if (submodule_states_.CaptureMultiBandSubModulesActive() &&
-      SampleRateSupportsMultiBand(
-          capture_nonlocked_.capture_processing_format.sample_rate_hz())) {
-    capture_buffer->SplitIntoFrequencyBands();
-  }
-
-  if (private_submodules_->echo_controller) {
-    // Force down-mixing of the number of channels after the detection of
-    // capture signal saturation.
-    // TODO(peah): Look into ensuring that this kind of tampering with the
-    // AudioBuffer functionality should not be needed.
-    capture_buffer->set_num_channels(1);
-  }
-
-  // TODO(peah): Move the AEC3 low-cut filter to this place.
-  if (private_submodules_->low_cut_filter &&
-      !private_submodules_->echo_controller) {
-    private_submodules_->low_cut_filter->Process(capture_buffer);
-  }
-  RETURN_ON_ERR(
-      public_submodules_->gain_control->AnalyzeCaptureAudio(capture_buffer));
-  public_submodules_->noise_suppression->AnalyzeCaptureAudio(capture_buffer);
-
-  // Ensure that the stream delay was set before the call to the
-  // AEC ProcessCaptureAudio function.
-  if (private_submodules_->echo_cancellation->is_enabled() &&
-      !private_submodules_->echo_controller && !was_stream_delay_set()) {
-    return AudioProcessing::kStreamParameterNotSetError;
-  }
-
-  if (private_submodules_->echo_controller) {
-    data_dumper_->DumpRaw("stream_delay", stream_delay_ms());
-
-    if (was_stream_delay_set()) {
-      private_submodules_->echo_controller->SetAudioBufferDelay(
-          stream_delay_ms());
-    }
-
-    private_submodules_->echo_controller->ProcessCapture(
-        capture_buffer, capture_.echo_path_gain_change);
-  } else {
-    RETURN_ON_ERR(private_submodules_->echo_cancellation->ProcessCaptureAudio(
-        capture_buffer, stream_delay_ms()));
-  }
-
-  if (private_submodules_->echo_control_mobile->is_enabled() &&
-      public_submodules_->noise_suppression->is_enabled()) {
-    capture_buffer->CopyLowPassToReference();
-  }
-  public_submodules_->noise_suppression->ProcessCaptureAudio(capture_buffer);
-
-  // Ensure that the stream delay was set before the call to the
-  // AECM ProcessCaptureAudio function.
-  if (private_submodules_->echo_control_mobile->is_enabled() &&
-      !was_stream_delay_set()) {
-    return AudioProcessing::kStreamParameterNotSetError;
-  }
-
-  if (!(private_submodules_->echo_controller ||
-        private_submodules_->echo_cancellation->is_enabled())) {
-    RETURN_ON_ERR(private_submodules_->echo_control_mobile->ProcessCaptureAudio(
-        capture_buffer, stream_delay_ms()));
-  }
-
-  public_submodules_->voice_detection->ProcessCaptureAudio(capture_buffer);
-
-  if (constants_.use_experimental_agc &&
-      public_submodules_->gain_control->is_enabled() &&
-      !constants_.use_experimental_agc_process_before_aec) {
-    private_submodules_->agc_manager->Process(
-        capture_buffer->split_bands_const(0)[kBand0To8kHz],
-        capture_buffer->num_frames_per_band(), capture_nonlocked_.split_rate);
-  }
-  RETURN_ON_ERR(public_submodules_->gain_control->ProcessCaptureAudio(
-      capture_buffer,
-      private_submodules_->echo_cancellation->stream_has_echo()));
-
-  if (submodule_states_.CaptureMultiBandProcessingActive() &&
-      SampleRateSupportsMultiBand(
-          capture_nonlocked_.capture_processing_format.sample_rate_hz())) {
-    capture_buffer->MergeFrequencyBands();
-  }
-
-  if (config_.residual_echo_detector.enabled) {
-    RTC_DCHECK(private_submodules_->echo_detector);
-    private_submodules_->echo_detector->AnalyzeCaptureAudio(
-        rtc::ArrayView<const float>(capture_buffer->channels_f()[0],
-                                    capture_buffer->num_frames()));
-  }
-
-  // TODO(aluebs): Investigate if the transient suppression placement should be
-  // before or after the AGC.
-  if (capture_.transient_suppressor_enabled) {
-    float voice_probability =
-        private_submodules_->agc_manager.get()
-            ? private_submodules_->agc_manager->voice_probability()
-            : 1.f;
-
-    public_submodules_->transient_suppressor->Suppress(
-        capture_buffer->channels_f()[0], capture_buffer->num_frames(),
-        capture_buffer->num_channels(),
-        capture_buffer->split_bands_const_f(0)[kBand0To8kHz],
-        capture_buffer->num_frames_per_band(), capture_buffer->keyboard_data(),
-        capture_buffer->num_keyboard_frames(), voice_probability,
-        capture_.key_pressed);
-  }
-
-  // Experimental APM sub-module that analyzes |capture_buffer|.
-  if (private_submodules_->capture_analyzer) {
-    private_submodules_->capture_analyzer->Analyze(capture_buffer);
-  }
-
-  if (config_.gain_controller2.enabled) {
-    private_submodules_->gain_controller2->NotifyAnalogLevel(
-        gain_control()->stream_analog_level());
-    private_submodules_->gain_controller2->Process(capture_buffer);
-  }
-
-  if (private_submodules_->capture_post_processor) {
-    private_submodules_->capture_post_processor->Process(capture_buffer);
-  }
-
-  // The level estimator operates on the recombined data.
-  public_submodules_->level_estimator->ProcessStream(capture_buffer);
-
-  capture_output_rms_.Analyze(rtc::ArrayView<const int16_t>(
-      capture_buffer->channels_const()[0],
-      capture_nonlocked_.capture_processing_format.num_frames()));
-  if (log_rms) {
-    RmsLevel::Levels levels = capture_output_rms_.AverageAndPeak();
-    RTC_HISTOGRAM_COUNTS_LINEAR("WebRTC.Audio.ApmCaptureOutputLevelAverageRms",
-                                levels.average, 1, RmsLevel::kMinLevelDb, 64);
-    RTC_HISTOGRAM_COUNTS_LINEAR("WebRTC.Audio.ApmCaptureOutputLevelPeakRms",
-                                levels.peak, 1, RmsLevel::kMinLevelDb, 64);
-  }
-
-  capture_.was_stream_delay_set = false;
-  return kNoError;
-}
-
-int AudioProcessingImpl::AnalyzeReverseStream(const float* const* data,
-                                              size_t samples_per_channel,
-                                              int sample_rate_hz,
-                                              ChannelLayout layout) {
-  TRACE_EVENT0("webrtc", "AudioProcessing::AnalyzeReverseStream_ChannelLayout");
-  rtc::CritScope cs(&crit_render_);
-  const StreamConfig reverse_config = {
-      sample_rate_hz, ChannelsFromLayout(layout), LayoutHasKeyboard(layout),
-  };
-  if (samples_per_channel != reverse_config.num_frames()) {
-    return kBadDataLengthError;
-  }
-  return AnalyzeReverseStreamLocked(data, reverse_config, reverse_config);
-}
-
-int AudioProcessingImpl::ProcessReverseStream(const float* const* src,
-                                              const StreamConfig& input_config,
-                                              const StreamConfig& output_config,
-                                              float* const* dest) {
-  TRACE_EVENT0("webrtc", "AudioProcessing::ProcessReverseStream_StreamConfig");
-  rtc::CritScope cs(&crit_render_);
-  RETURN_ON_ERR(AnalyzeReverseStreamLocked(src, input_config, output_config));
-  if (submodule_states_.RenderMultiBandProcessingActive() ||
-      submodule_states_.RenderFullBandProcessingActive()) {
-    render_.render_audio->CopyTo(formats_.api_format.reverse_output_stream(),
-                                 dest);
-  } else if (formats_.api_format.reverse_input_stream() !=
-             formats_.api_format.reverse_output_stream()) {
-    render_.render_converter->Convert(src, input_config.num_samples(), dest,
-                                      output_config.num_samples());
-  } else {
-    CopyAudioIfNeeded(src, input_config.num_frames(),
-                      input_config.num_channels(), dest);
-  }
-
-  return kNoError;
-}
-
-int AudioProcessingImpl::AnalyzeReverseStreamLocked(
-    const float* const* src,
-    const StreamConfig& input_config,
-    const StreamConfig& output_config) {
-  if (src == nullptr) {
-    return kNullPointerError;
-  }
-
-  if (input_config.num_channels() == 0) {
-    return kBadNumberChannelsError;
-  }
-
-  ProcessingConfig processing_config = formats_.api_format;
-  processing_config.reverse_input_stream() = input_config;
-  processing_config.reverse_output_stream() = output_config;
-
-  RETURN_ON_ERR(MaybeInitializeRender(processing_config));
-  RTC_DCHECK_EQ(input_config.num_frames(),
-                formats_.api_format.reverse_input_stream().num_frames());
-
-  if (aec_dump_) {
-    const size_t channel_size =
-        formats_.api_format.reverse_input_stream().num_frames();
-    const size_t num_channels =
-        formats_.api_format.reverse_input_stream().num_channels();
-    aec_dump_->WriteRenderStreamMessage(
-        AudioFrameView<const float>(src, num_channels, channel_size));
-  }
-  render_.render_audio->CopyFrom(src,
-                                 formats_.api_format.reverse_input_stream());
-  return ProcessRenderStreamLocked();
-}
-
-int AudioProcessingImpl::ProcessReverseStream(AudioFrame* frame) {
-  TRACE_EVENT0("webrtc", "AudioProcessing::ProcessReverseStream_AudioFrame");
-  rtc::CritScope cs(&crit_render_);
-  if (frame == nullptr) {
-    return kNullPointerError;
-  }
-  // Must be a native rate.
-  if (frame->sample_rate_hz_ != kSampleRate8kHz &&
-      frame->sample_rate_hz_ != kSampleRate16kHz &&
-      frame->sample_rate_hz_ != kSampleRate32kHz &&
-      frame->sample_rate_hz_ != kSampleRate48kHz) {
-    return kBadSampleRateError;
-  }
-
-  if (frame->num_channels_ <= 0) {
-    return kBadNumberChannelsError;
-  }
-
-  ProcessingConfig processing_config = formats_.api_format;
-  processing_config.reverse_input_stream().set_sample_rate_hz(
-      frame->sample_rate_hz_);
-  processing_config.reverse_input_stream().set_num_channels(
-      frame->num_channels_);
-  processing_config.reverse_output_stream().set_sample_rate_hz(
-      frame->sample_rate_hz_);
-  processing_config.reverse_output_stream().set_num_channels(
-      frame->num_channels_);
-
-  RETURN_ON_ERR(MaybeInitializeRender(processing_config));
-  if (frame->samples_per_channel_ !=
-      formats_.api_format.reverse_input_stream().num_frames()) {
-    return kBadDataLengthError;
-  }
-
-  if (aec_dump_) {
-    aec_dump_->WriteRenderStreamMessage(*frame);
-  }
-
-  render_.render_audio->DeinterleaveFrom(frame);
-  RETURN_ON_ERR(ProcessRenderStreamLocked());
-  render_.render_audio->InterleaveTo(
-      frame, submodule_states_.RenderMultiBandProcessingActive() ||
-                 submodule_states_.RenderFullBandProcessingActive());
-  return kNoError;
-}
-
-int AudioProcessingImpl::ProcessRenderStreamLocked() {
-  AudioBuffer* render_buffer = render_.render_audio.get();  // For brevity.
-
-  HandleRenderRuntimeSettings();
-
-  if (private_submodules_->render_pre_processor) {
-    private_submodules_->render_pre_processor->Process(render_buffer);
-  }
-
-  QueueNonbandedRenderAudio(render_buffer);
-
-  if (submodule_states_.RenderMultiBandSubModulesActive() &&
-      SampleRateSupportsMultiBand(
-          formats_.render_processing_format.sample_rate_hz())) {
-    render_buffer->SplitIntoFrequencyBands();
-  }
-
-  if (submodule_states_.RenderMultiBandSubModulesActive()) {
-    QueueBandedRenderAudio(render_buffer);
-  }
-
-  // TODO(peah): Perform the queuing inside QueueRenderAudiuo().
-  if (private_submodules_->echo_controller) {
-    private_submodules_->echo_controller->AnalyzeRender(render_buffer);
-  }
-
-  if (submodule_states_.RenderMultiBandProcessingActive() &&
-      SampleRateSupportsMultiBand(
-          formats_.render_processing_format.sample_rate_hz())) {
-    render_buffer->MergeFrequencyBands();
-  }
-
-  return kNoError;
-}
-
-int AudioProcessingImpl::set_stream_delay_ms(int delay) {
-  rtc::CritScope cs(&crit_capture_);
-  Error retval = kNoError;
-  capture_.was_stream_delay_set = true;
-  delay += capture_.delay_offset_ms;
-
-  if (delay < 0) {
-    delay = 0;
-    retval = kBadStreamParameterWarning;
-  }
-
-  // TODO(ajm): the max is rather arbitrarily chosen; investigate.
-  if (delay > 500) {
-    delay = 500;
-    retval = kBadStreamParameterWarning;
-  }
-
-  capture_nonlocked_.stream_delay_ms = delay;
-  return retval;
-}
-
-int AudioProcessingImpl::stream_delay_ms() const {
-  // Used as callback from submodules, hence locking is not allowed.
-  return capture_nonlocked_.stream_delay_ms;
-}
-
-bool AudioProcessingImpl::was_stream_delay_set() const {
-  // Used as callback from submodules, hence locking is not allowed.
-  return capture_.was_stream_delay_set;
-}
-
-void AudioProcessingImpl::set_stream_key_pressed(bool key_pressed) {
-  rtc::CritScope cs(&crit_capture_);
-  capture_.key_pressed = key_pressed;
-}
-
-void AudioProcessingImpl::set_delay_offset_ms(int offset) {
-  rtc::CritScope cs(&crit_capture_);
-  capture_.delay_offset_ms = offset;
-}
-
-int AudioProcessingImpl::delay_offset_ms() const {
-  rtc::CritScope cs(&crit_capture_);
-  return capture_.delay_offset_ms;
-}
-
-void AudioProcessingImpl::AttachAecDump(std::unique_ptr<AecDump> aec_dump) {
-  RTC_DCHECK(aec_dump);
-  rtc::CritScope cs_render(&crit_render_);
-  rtc::CritScope cs_capture(&crit_capture_);
-
-  // The previously attached AecDump will be destroyed with the
-  // 'aec_dump' parameter, which is after locks are released.
-  aec_dump_.swap(aec_dump);
-  WriteAecDumpConfigMessage(true);
-  aec_dump_->WriteInitMessage(formats_.api_format, rtc::TimeUTCMillis());
-}
-
-void AudioProcessingImpl::DetachAecDump() {
-  // The d-tor of a task-queue based AecDump blocks until all pending
-  // tasks are done. This construction avoids blocking while holding
-  // the render and capture locks.
-  std::unique_ptr<AecDump> aec_dump = nullptr;
-  {
-    rtc::CritScope cs_render(&crit_render_);
-    rtc::CritScope cs_capture(&crit_capture_);
-    aec_dump = std::move(aec_dump_);
-  }
-}
-
-void AudioProcessingImpl::AttachPlayoutAudioGenerator(
-    std::unique_ptr<AudioGenerator> audio_generator) {
-  // TODO(bugs.webrtc.org/8882) Stub.
-  // Reset internal audio generator with audio_generator.
-}
-
-void AudioProcessingImpl::DetachPlayoutAudioGenerator() {
-  // TODO(bugs.webrtc.org/8882) Stub.
-  // Delete audio generator, if one is attached.
-}
-
-AudioProcessingStats AudioProcessingImpl::GetStatistics(
-    bool has_remote_tracks) const {
-  AudioProcessingStats stats;
-  if (has_remote_tracks) {
-    EchoCancellationImpl::Metrics metrics;
-    rtc::CritScope cs_capture(&crit_capture_);
-    if (private_submodules_->echo_controller) {
-      auto ec_metrics = private_submodules_->echo_controller->GetMetrics();
-      stats.echo_return_loss = ec_metrics.echo_return_loss;
-      stats.echo_return_loss_enhancement =
-          ec_metrics.echo_return_loss_enhancement;
-      stats.delay_ms = ec_metrics.delay_ms;
-    } else if (private_submodules_->echo_cancellation->GetMetrics(&metrics) ==
-               Error::kNoError) {
-      if (metrics.divergent_filter_fraction != -1.0f) {
-        stats.divergent_filter_fraction =
-            absl::optional<double>(metrics.divergent_filter_fraction);
-      }
-      if (metrics.echo_return_loss.instant != -100) {
-        stats.echo_return_loss =
-            absl::optional<double>(metrics.echo_return_loss.instant);
-      }
-      if (metrics.echo_return_loss_enhancement.instant != -100) {
-        stats.echo_return_loss_enhancement = absl::optional<double>(
-            metrics.echo_return_loss_enhancement.instant);
-      }
-    }
-    if (config_.residual_echo_detector.enabled) {
-      RTC_DCHECK(private_submodules_->echo_detector);
-      auto ed_metrics = private_submodules_->echo_detector->GetMetrics();
-      stats.residual_echo_likelihood = ed_metrics.echo_likelihood;
-      stats.residual_echo_likelihood_recent_max =
-          ed_metrics.echo_likelihood_recent_max;
-    }
-    int delay_median, delay_std;
-    float fraction_poor_delays;
-    if (private_submodules_->echo_cancellation->GetDelayMetrics(
-            &delay_median, &delay_std, &fraction_poor_delays) ==
-        Error::kNoError) {
-      if (delay_median >= 0) {
-        stats.delay_median_ms = absl::optional<int32_t>(delay_median);
-      }
-      if (delay_std >= 0) {
-        stats.delay_standard_deviation_ms = absl::optional<int32_t>(delay_std);
-      }
-    }
-  }
-  return stats;
-}
-
-GainControl* AudioProcessingImpl::gain_control() const {
-  if (constants_.use_experimental_agc) {
-    return public_submodules_->gain_control_for_experimental_agc.get();
-  }
-  return public_submodules_->gain_control.get();
-}
-
-LevelEstimator* AudioProcessingImpl::level_estimator() const {
-  return public_submodules_->level_estimator.get();
-}
-
-NoiseSuppression* AudioProcessingImpl::noise_suppression() const {
-  return public_submodules_->noise_suppression.get();
-}
-
-VoiceDetection* AudioProcessingImpl::voice_detection() const {
-  return public_submodules_->voice_detection.get();
-}
-
-void AudioProcessingImpl::MutateConfig(
-    rtc::FunctionView<void(AudioProcessing::Config*)> mutator) {
-  rtc::CritScope cs_render(&crit_render_);
-  rtc::CritScope cs_capture(&crit_capture_);
-  mutator(&config_);
-  ApplyConfig(config_);
-}
-
-AudioProcessing::Config AudioProcessingImpl::GetConfig() const {
-  rtc::CritScope cs_render(&crit_render_);
-  rtc::CritScope cs_capture(&crit_capture_);
-  return config_;
-}
-
-bool AudioProcessingImpl::UpdateActiveSubmoduleStates() {
-  return submodule_states_.Update(
-      config_.high_pass_filter.enabled,
-      private_submodules_->echo_cancellation->is_enabled(),
-      private_submodules_->echo_control_mobile->is_enabled(),
-      config_.residual_echo_detector.enabled,
-      public_submodules_->noise_suppression->is_enabled(),
-      public_submodules_->gain_control->is_enabled(),
-      config_.gain_controller2.enabled, config_.pre_amplifier.enabled,
-      capture_nonlocked_.echo_controller_enabled,
-      public_submodules_->voice_detection->is_enabled(),
-      public_submodules_->level_estimator->is_enabled(),
-      capture_.transient_suppressor_enabled);
-}
-
-void AudioProcessingImpl::InitializeTransient() {
-  if (capture_.transient_suppressor_enabled) {
-    if (!public_submodules_->transient_suppressor.get()) {
-      public_submodules_->transient_suppressor.reset(new TransientSuppressor());
-    }
-    public_submodules_->transient_suppressor->Initialize(
-        capture_nonlocked_.capture_processing_format.sample_rate_hz(),
-        capture_nonlocked_.split_rate, num_proc_channels());
-  }
-}
-
-void AudioProcessingImpl::InitializeLowCutFilter() {
-  if (submodule_states_.LowCutFilteringRequired()) {
-    private_submodules_->low_cut_filter.reset(
-        new LowCutFilter(num_proc_channels(), proc_sample_rate_hz()));
-  } else {
-    private_submodules_->low_cut_filter.reset();
-  }
-}
-
-void AudioProcessingImpl::InitializeEchoController() {
-  if (echo_control_factory_) {
-    private_submodules_->echo_controller =
-        echo_control_factory_->Create(proc_sample_rate_hz());
-  } else {
-    private_submodules_->echo_controller.reset();
-  }
-}
-
-void AudioProcessingImpl::InitializeGainController2() {
-  if (config_.gain_controller2.enabled) {
-    private_submodules_->gain_controller2->Initialize(proc_sample_rate_hz());
-  }
-}
-
-void AudioProcessingImpl::InitializePreAmplifier() {
-  if (config_.pre_amplifier.enabled) {
-    private_submodules_->pre_amplifier.reset(
-        new GainApplier(true, config_.pre_amplifier.fixed_gain_factor));
-  } else {
-    private_submodules_->pre_amplifier.reset();
-  }
-}
-
-void AudioProcessingImpl::InitializeResidualEchoDetector() {
-  RTC_DCHECK(private_submodules_->echo_detector);
-  private_submodules_->echo_detector->Initialize(
-      proc_sample_rate_hz(), 1,
-      formats_.render_processing_format.sample_rate_hz(), 1);
-}
-
-void AudioProcessingImpl::InitializeAnalyzer() {
-  if (private_submodules_->capture_analyzer) {
-    private_submodules_->capture_analyzer->Initialize(proc_sample_rate_hz(),
-                                                      num_proc_channels());
-  }
-}
-
-void AudioProcessingImpl::InitializePostProcessor() {
-  if (private_submodules_->capture_post_processor) {
-    private_submodules_->capture_post_processor->Initialize(
-        proc_sample_rate_hz(), num_proc_channels());
-  }
-}
-
-void AudioProcessingImpl::InitializePreProcessor() {
-  if (private_submodules_->render_pre_processor) {
-    private_submodules_->render_pre_processor->Initialize(
-        formats_.render_processing_format.sample_rate_hz(),
-        formats_.render_processing_format.num_channels());
-  }
-}
-
-void AudioProcessingImpl::MaybeUpdateHistograms() {
-  static const int kMinDiffDelayMs = 60;
-
-  if (private_submodules_->echo_cancellation->is_enabled()) {
-    // Activate delay_jumps_ counters if we know echo_cancellation is running.
-    // If a stream has echo we know that the echo_cancellation is in process.
-    if (capture_.stream_delay_jumps == -1 &&
-        private_submodules_->echo_cancellation->stream_has_echo()) {
-      capture_.stream_delay_jumps = 0;
-    }
-    if (capture_.aec_system_delay_jumps == -1 &&
-        private_submodules_->echo_cancellation->stream_has_echo()) {
-      capture_.aec_system_delay_jumps = 0;
-    }
-
-    // Detect a jump in platform reported system delay and log the difference.
-    const int diff_stream_delay_ms =
-        capture_nonlocked_.stream_delay_ms - capture_.last_stream_delay_ms;
-    if (diff_stream_delay_ms > kMinDiffDelayMs &&
-        capture_.last_stream_delay_ms != 0) {
-      RTC_HISTOGRAM_COUNTS("WebRTC.Audio.PlatformReportedStreamDelayJump",
-                           diff_stream_delay_ms, kMinDiffDelayMs, 1000, 100);
-      if (capture_.stream_delay_jumps == -1) {
-        capture_.stream_delay_jumps = 0;  // Activate counter if needed.
-      }
-      capture_.stream_delay_jumps++;
-    }
-    capture_.last_stream_delay_ms = capture_nonlocked_.stream_delay_ms;
-
-    // Detect a jump in AEC system delay and log the difference.
-    const int samples_per_ms =
-        rtc::CheckedDivExact(capture_nonlocked_.split_rate, 1000);
-    RTC_DCHECK_LT(0, samples_per_ms);
-    const int aec_system_delay_ms =
-        private_submodules_->echo_cancellation->GetSystemDelayInSamples() /
-        samples_per_ms;
-    const int diff_aec_system_delay_ms =
-        aec_system_delay_ms - capture_.last_aec_system_delay_ms;
-    if (diff_aec_system_delay_ms > kMinDiffDelayMs &&
-        capture_.last_aec_system_delay_ms != 0) {
-      RTC_HISTOGRAM_COUNTS("WebRTC.Audio.AecSystemDelayJump",
-                           diff_aec_system_delay_ms, kMinDiffDelayMs, 1000,
-                           100);
-      if (capture_.aec_system_delay_jumps == -1) {
-        capture_.aec_system_delay_jumps = 0;  // Activate counter if needed.
-      }
-      capture_.aec_system_delay_jumps++;
-    }
-    capture_.last_aec_system_delay_ms = aec_system_delay_ms;
-  }
-}
-
-void AudioProcessingImpl::UpdateHistogramsOnCallEnd() {
-  // Run in a single-threaded manner.
-  rtc::CritScope cs_render(&crit_render_);
-  rtc::CritScope cs_capture(&crit_capture_);
-
-  if (capture_.stream_delay_jumps > -1) {
-    RTC_HISTOGRAM_ENUMERATION(
-        "WebRTC.Audio.NumOfPlatformReportedStreamDelayJumps",
-        capture_.stream_delay_jumps, 51);
-  }
-  capture_.stream_delay_jumps = -1;
-  capture_.last_stream_delay_ms = 0;
-
-  if (capture_.aec_system_delay_jumps > -1) {
-    RTC_HISTOGRAM_ENUMERATION("WebRTC.Audio.NumOfAecSystemDelayJumps",
-                              capture_.aec_system_delay_jumps, 51);
-  }
-  capture_.aec_system_delay_jumps = -1;
-  capture_.last_aec_system_delay_ms = 0;
-}
-
-void AudioProcessingImpl::WriteAecDumpConfigMessage(bool forced) {
-  if (!aec_dump_) {
-    return;
-  }
-  std::string experiments_description =
-      private_submodules_->echo_cancellation->GetExperimentsDescription();
-  // TODO(peah): Add semicolon-separated concatenations of experiment
-  // descriptions for other submodules.
-  if (constants_.agc_clipped_level_min != kClippedLevelMin) {
-    experiments_description += "AgcClippingLevelExperiment;";
-  }
-  if (capture_nonlocked_.echo_controller_enabled) {
-    experiments_description += "EchoController;";
-  }
-  if (config_.gain_controller2.enabled) {
-    experiments_description += "GainController2;";
-  }
-
-  InternalAPMConfig apm_config;
-
-  apm_config.aec_enabled = private_submodules_->echo_cancellation->is_enabled();
-  apm_config.aec_delay_agnostic_enabled =
-      private_submodules_->echo_cancellation->is_delay_agnostic_enabled();
-  apm_config.aec_drift_compensation_enabled =
-      private_submodules_->echo_cancellation->is_drift_compensation_enabled();
-  apm_config.aec_extended_filter_enabled =
-      private_submodules_->echo_cancellation->is_extended_filter_enabled();
-  apm_config.aec_suppression_level = static_cast<int>(
-      private_submodules_->echo_cancellation->suppression_level());
-
-  apm_config.aecm_enabled =
-      private_submodules_->echo_control_mobile->is_enabled();
-  apm_config.aecm_comfort_noise_enabled =
-      private_submodules_->echo_control_mobile->is_comfort_noise_enabled();
-  apm_config.aecm_routing_mode = static_cast<int>(
-      private_submodules_->echo_control_mobile->routing_mode());
-
-  apm_config.agc_enabled = public_submodules_->gain_control->is_enabled();
-  apm_config.agc_mode =
-      static_cast<int>(public_submodules_->gain_control->mode());
-  apm_config.agc_limiter_enabled =
-      public_submodules_->gain_control->is_limiter_enabled();
-  apm_config.noise_robust_agc_enabled = constants_.use_experimental_agc;
-
-  apm_config.hpf_enabled = config_.high_pass_filter.enabled;
-
-  apm_config.ns_enabled = public_submodules_->noise_suppression->is_enabled();
-  apm_config.ns_level =
-      static_cast<int>(public_submodules_->noise_suppression->level());
-
-  apm_config.transient_suppression_enabled =
-      capture_.transient_suppressor_enabled;
-  apm_config.experiments_description = experiments_description;
-  apm_config.pre_amplifier_enabled = config_.pre_amplifier.enabled;
-  apm_config.pre_amplifier_fixed_gain_factor =
-      config_.pre_amplifier.fixed_gain_factor;
-
-  if (!forced && apm_config == apm_config_for_aec_dump_) {
-    return;
-  }
-  aec_dump_->WriteConfig(apm_config);
-  apm_config_for_aec_dump_ = apm_config;
-}
-
-void AudioProcessingImpl::RecordUnprocessedCaptureStream(
-    const float* const* src) {
-  RTC_DCHECK(aec_dump_);
-  WriteAecDumpConfigMessage(false);
-
-  const size_t channel_size = formats_.api_format.input_stream().num_frames();
-  const size_t num_channels = formats_.api_format.input_stream().num_channels();
-  aec_dump_->AddCaptureStreamInput(
-      AudioFrameView<const float>(src, num_channels, channel_size));
-  RecordAudioProcessingState();
-}
-
-void AudioProcessingImpl::RecordUnprocessedCaptureStream(
-    const AudioFrame& capture_frame) {
-  RTC_DCHECK(aec_dump_);
-  WriteAecDumpConfigMessage(false);
-
-  aec_dump_->AddCaptureStreamInput(capture_frame);
-  RecordAudioProcessingState();
-}
-
-void AudioProcessingImpl::RecordProcessedCaptureStream(
-    const float* const* processed_capture_stream) {
-  RTC_DCHECK(aec_dump_);
-
-  const size_t channel_size = formats_.api_format.output_stream().num_frames();
-  const size_t num_channels =
-      formats_.api_format.output_stream().num_channels();
-  aec_dump_->AddCaptureStreamOutput(AudioFrameView<const float>(
-      processed_capture_stream, num_channels, channel_size));
-  aec_dump_->WriteCaptureStreamMessage();
-}
-
-void AudioProcessingImpl::RecordProcessedCaptureStream(
-    const AudioFrame& processed_capture_frame) {
-  RTC_DCHECK(aec_dump_);
-
-  aec_dump_->AddCaptureStreamOutput(processed_capture_frame);
-  aec_dump_->WriteCaptureStreamMessage();
-}
-
-void AudioProcessingImpl::RecordAudioProcessingState() {
-  RTC_DCHECK(aec_dump_);
-  AecDump::AudioProcessingState audio_proc_state;
-  audio_proc_state.delay = capture_nonlocked_.stream_delay_ms;
-  audio_proc_state.drift =
-      private_submodules_->echo_cancellation->stream_drift_samples();
-  audio_proc_state.level = gain_control()->stream_analog_level();
-  audio_proc_state.keypress = capture_.key_pressed;
-  aec_dump_->AddAudioProcessingState(audio_proc_state);
-}
-
-AudioProcessingImpl::ApmCaptureState::ApmCaptureState(
-    bool transient_suppressor_enabled)
-    : aec_system_delay_jumps(-1),
-      delay_offset_ms(0),
-      was_stream_delay_set(false),
-      last_stream_delay_ms(0),
-      last_aec_system_delay_ms(0),
-      stream_delay_jumps(-1),
-      output_will_be_muted(false),
-      key_pressed(false),
-      transient_suppressor_enabled(transient_suppressor_enabled),
-      capture_processing_format(kSampleRate16kHz),
-      split_rate(kSampleRate16kHz),
-      echo_path_gain_change(false),
-      prev_analog_mic_level(-1),
-      prev_pre_amp_gain(-1.f) {}
-
-AudioProcessingImpl::ApmCaptureState::~ApmCaptureState() = default;
-
-AudioProcessingImpl::ApmRenderState::ApmRenderState() = default;
-
-AudioProcessingImpl::ApmRenderState::~ApmRenderState() = default;
-
-}  // namespace webrtc
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/audio_processing_impl.h b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/audio_processing_impl.h
deleted file mode 100644
index e376a7423e..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/audio_processing_impl.h
+++ /dev/null
@@ -1,455 +0,0 @@
-/*
- *  Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#ifndef MODULES_AUDIO_PROCESSING_AUDIO_PROCESSING_IMPL_H_
-#define MODULES_AUDIO_PROCESSING_AUDIO_PROCESSING_IMPL_H_
-
-#include <list>
-#include <memory>
-#include <vector>
-
-#include "modules/audio_processing/audio_buffer.h"
-#include "modules/audio_processing/include/aec_dump.h"
-#include "modules/audio_processing/include/audio_processing.h"
-#include "modules/audio_processing/render_queue_item_verifier.h"
-#include "modules/audio_processing/rms_level.h"
-#include "rtc_base/criticalsection.h"
-#include "rtc_base/function_view.h"
-#include "rtc_base/gtest_prod_util.h"
-#include "rtc_base/ignore_wundef.h"
-#include "rtc_base/swap_queue.h"
-#include "rtc_base/thread_annotations.h"
-
-namespace webrtc {
-
-class ApmDataDumper;
-class AudioConverter;
-
-class AudioProcessingImpl : public AudioProcessing {
- public:
-  // Methods forcing APM to run in a single-threaded manner.
-  // Acquires both the render and capture locks.
-  explicit AudioProcessingImpl(const webrtc::Config& config);
-  // AudioProcessingImpl takes ownership of capture post processor.
-  AudioProcessingImpl(const webrtc::Config& config,
-                      std::unique_ptr<CustomProcessing> capture_post_processor,
-                      std::unique_ptr<CustomProcessing> render_pre_processor,
-                      std::unique_ptr<EchoControlFactory> echo_control_factory,
-                      rtc::scoped_refptr<EchoDetector> echo_detector,
-                      std::unique_ptr<CustomAudioAnalyzer> capture_analyzer);
-  ~AudioProcessingImpl() override;
-  int Initialize() override;
-  int Initialize(int capture_input_sample_rate_hz,
-                 int capture_output_sample_rate_hz,
-                 int render_sample_rate_hz,
-                 ChannelLayout capture_input_layout,
-                 ChannelLayout capture_output_layout,
-                 ChannelLayout render_input_layout) override;
-  int Initialize(const ProcessingConfig& processing_config) override;
-  void ApplyConfig(const AudioProcessing::Config& config) override;
-  void SetExtraOptions(const webrtc::Config& config) override;
-  void UpdateHistogramsOnCallEnd() override;
-  void AttachAecDump(std::unique_ptr<AecDump> aec_dump) override;
-  void DetachAecDump() override;
-  void AttachPlayoutAudioGenerator(
-      std::unique_ptr<AudioGenerator> audio_generator) override;
-  void DetachPlayoutAudioGenerator() override;
-
-  void SetRuntimeSetting(RuntimeSetting setting) override;
-
-  // Capture-side exclusive methods possibly running APM in a
-  // multi-threaded manner. Acquire the capture lock.
-  int ProcessStream(AudioFrame* frame) override;
-  int ProcessStream(const float* const* src,
-                    size_t samples_per_channel,
-                    int input_sample_rate_hz,
-                    ChannelLayout input_layout,
-                    int output_sample_rate_hz,
-                    ChannelLayout output_layout,
-                    float* const* dest) override;
-  int ProcessStream(const float* const* src,
-                    const StreamConfig& input_config,
-                    const StreamConfig& output_config,
-                    float* const* dest) override;
-  void set_output_will_be_muted(bool muted) override;
-  int set_stream_delay_ms(int delay) override;
-  void set_delay_offset_ms(int offset) override;
-  int delay_offset_ms() const override;
-  void set_stream_key_pressed(bool key_pressed) override;
-
-  // Render-side exclusive methods possibly running APM in a
-  // multi-threaded manner. Acquire the render lock.
-  int ProcessReverseStream(AudioFrame* frame) override;
-  int AnalyzeReverseStream(const float* const* data,
-                           size_t samples_per_channel,
-                           int sample_rate_hz,
-                           ChannelLayout layout) override;
-  int ProcessReverseStream(const float* const* src,
-                           const StreamConfig& input_config,
-                           const StreamConfig& output_config,
-                           float* const* dest) override;
-
-  // Methods only accessed from APM submodules or
-  // from AudioProcessing tests in a single-threaded manner.
-  // Hence there is no need for locks in these.
-  int proc_sample_rate_hz() const override;
-  int proc_split_sample_rate_hz() const override;
-  size_t num_input_channels() const override;
-  size_t num_proc_channels() const override;
-  size_t num_output_channels() const override;
-  size_t num_reverse_channels() const override;
-  int stream_delay_ms() const override;
-  bool was_stream_delay_set() const override
-      RTC_EXCLUSIVE_LOCKS_REQUIRED(crit_capture_);
-
-  AudioProcessingStats GetStatistics(bool has_remote_tracks) const override;
-
-  // Methods returning pointers to APM submodules.
-  // No locks are aquired in those, as those locks
-  // would offer no protection (the submodules are
-  // created only once in a single-treaded manner
-  // during APM creation).
-  GainControl* gain_control() const override;
-  LevelEstimator* level_estimator() const override;
-  NoiseSuppression* noise_suppression() const override;
-  VoiceDetection* voice_detection() const override;
-
-  // TODO(peah): Remove MutateConfig once the new API allows that.
-  void MutateConfig(rtc::FunctionView<void(AudioProcessing::Config*)> mutator);
-  AudioProcessing::Config GetConfig() const override;
-
- protected:
-  // Overridden in a mock.
-  virtual int InitializeLocked()
-      RTC_EXCLUSIVE_LOCKS_REQUIRED(crit_render_, crit_capture_);
-
- private:
-  // TODO(peah): These friend classes should be removed as soon as the new
-  // parameter setting scheme allows.
-  FRIEND_TEST_ALL_PREFIXES(ApmConfiguration, DefaultBehavior);
-  FRIEND_TEST_ALL_PREFIXES(ApmConfiguration, ValidConfigBehavior);
-  FRIEND_TEST_ALL_PREFIXES(ApmConfiguration, InValidConfigBehavior);
-
-  // Class providing thread-safe message pipe functionality for
-  // |runtime_settings_|.
-  class RuntimeSettingEnqueuer {
-   public:
-    explicit RuntimeSettingEnqueuer(
-        SwapQueue<RuntimeSetting>* runtime_settings);
-    ~RuntimeSettingEnqueuer();
-    void Enqueue(RuntimeSetting setting);
-
-   private:
-    SwapQueue<RuntimeSetting>& runtime_settings_;
-  };
-  struct ApmPublicSubmodules;
-  struct ApmPrivateSubmodules;
-
-  std::unique_ptr<ApmDataDumper> data_dumper_;
-  static int instance_count_;
-
-  SwapQueue<RuntimeSetting> capture_runtime_settings_;
-  SwapQueue<RuntimeSetting> render_runtime_settings_;
-
-  RuntimeSettingEnqueuer capture_runtime_settings_enqueuer_;
-  RuntimeSettingEnqueuer render_runtime_settings_enqueuer_;
-
-  // EchoControl factory.
-  std::unique_ptr<EchoControlFactory> echo_control_factory_;
-
-  class ApmSubmoduleStates {
-   public:
-    ApmSubmoduleStates(bool capture_post_processor_enabled,
-                       bool render_pre_processor_enabled,
-                       bool capture_analyzer_enabled);
-    // Updates the submodule state and returns true if it has changed.
-    bool Update(bool high_pass_filter_enabled,
-                bool echo_canceller_enabled,
-                bool mobile_echo_controller_enabled,
-                bool residual_echo_detector_enabled,
-                bool noise_suppressor_enabled,
-                bool adaptive_gain_controller_enabled,
-                bool gain_controller2_enabled,
-                bool pre_amplifier_enabled,
-                bool echo_controller_enabled,
-                bool voice_activity_detector_enabled,
-                bool level_estimator_enabled,
-                bool transient_suppressor_enabled);
-    bool CaptureMultiBandSubModulesActive() const;
-    bool CaptureMultiBandProcessingActive() const;
-    bool CaptureFullBandProcessingActive() const;
-    bool CaptureAnalyzerActive() const;
-    bool RenderMultiBandSubModulesActive() const;
-    bool RenderFullBandProcessingActive() const;
-    bool RenderMultiBandProcessingActive() const;
-    bool LowCutFilteringRequired() const;
-
-   private:
-    const bool capture_post_processor_enabled_ = false;
-    const bool render_pre_processor_enabled_ = false;
-    const bool capture_analyzer_enabled_ = false;
-    bool high_pass_filter_enabled_ = false;
-    bool echo_canceller_enabled_ = false;
-    bool mobile_echo_controller_enabled_ = false;
-    bool residual_echo_detector_enabled_ = false;
-    bool noise_suppressor_enabled_ = false;
-    bool adaptive_gain_controller_enabled_ = false;
-    bool gain_controller2_enabled_ = false;
-    bool pre_amplifier_enabled_ = false;
-    bool echo_controller_enabled_ = false;
-    bool level_estimator_enabled_ = false;
-    bool voice_activity_detector_enabled_ = false;
-    bool transient_suppressor_enabled_ = false;
-    bool first_update_ = true;
-  };
-
-  // Method for modifying the formats struct that are called from both
-  // the render and capture threads. The check for whether modifications
-  // are needed is done while holding the render lock only, thereby avoiding
-  // that the capture thread blocks the render thread.
-  // The struct is modified in a single-threaded manner by holding both the
-  // render and capture locks.
-  int MaybeInitialize(const ProcessingConfig& config, bool force_initialization)
-      RTC_EXCLUSIVE_LOCKS_REQUIRED(crit_render_);
-
-  int MaybeInitializeRender(const ProcessingConfig& processing_config)
-      RTC_EXCLUSIVE_LOCKS_REQUIRED(crit_render_);
-
-  int MaybeInitializeCapture(const ProcessingConfig& processing_config,
-                             bool force_initialization)
-      RTC_EXCLUSIVE_LOCKS_REQUIRED(crit_render_);
-
-  // Method for updating the state keeping track of the active submodules.
-  // Returns a bool indicating whether the state has changed.
-  bool UpdateActiveSubmoduleStates()
-      RTC_EXCLUSIVE_LOCKS_REQUIRED(crit_capture_);
-
-  // Methods requiring APM running in a single-threaded manner.
-  // Are called with both the render and capture locks already
-  // acquired.
-  void InitializeTransient()
-      RTC_EXCLUSIVE_LOCKS_REQUIRED(crit_render_, crit_capture_);
-  int InitializeLocked(const ProcessingConfig& config)
-      RTC_EXCLUSIVE_LOCKS_REQUIRED(crit_render_, crit_capture_);
-  void InitializeResidualEchoDetector()
-      RTC_EXCLUSIVE_LOCKS_REQUIRED(crit_render_, crit_capture_);
-  void InitializeLowCutFilter() RTC_EXCLUSIVE_LOCKS_REQUIRED(crit_capture_);
-  void InitializeEchoController() RTC_EXCLUSIVE_LOCKS_REQUIRED(crit_capture_);
-  void InitializeGainController2() RTC_EXCLUSIVE_LOCKS_REQUIRED(crit_capture_);
-  void InitializePreAmplifier() RTC_EXCLUSIVE_LOCKS_REQUIRED(crit_capture_);
-  void InitializePostProcessor() RTC_EXCLUSIVE_LOCKS_REQUIRED(crit_capture_);
-  void InitializeAnalyzer() RTC_EXCLUSIVE_LOCKS_REQUIRED(crit_capture_);
-  void InitializePreProcessor() RTC_EXCLUSIVE_LOCKS_REQUIRED(crit_render_);
-
-  // Empties and handles the respective RuntimeSetting queues.
-  void HandleCaptureRuntimeSettings()
-      RTC_EXCLUSIVE_LOCKS_REQUIRED(crit_capture_);
-  void HandleRenderRuntimeSettings() RTC_EXCLUSIVE_LOCKS_REQUIRED(crit_render_);
-
-  void EmptyQueuedRenderAudio();
-  void AllocateRenderQueue()
-      RTC_EXCLUSIVE_LOCKS_REQUIRED(crit_render_, crit_capture_);
-  void QueueBandedRenderAudio(AudioBuffer* audio)
-      RTC_EXCLUSIVE_LOCKS_REQUIRED(crit_render_);
-  void QueueNonbandedRenderAudio(AudioBuffer* audio)
-      RTC_EXCLUSIVE_LOCKS_REQUIRED(crit_render_);
-
-  // Capture-side exclusive methods possibly running APM in a multi-threaded
-  // manner that are called with the render lock already acquired.
-  int ProcessCaptureStreamLocked() RTC_EXCLUSIVE_LOCKS_REQUIRED(crit_capture_);
-  void MaybeUpdateHistograms() RTC_EXCLUSIVE_LOCKS_REQUIRED(crit_capture_);
-
-  // Render-side exclusive methods possibly running APM in a multi-threaded
-  // manner that are called with the render lock already acquired.
-  // TODO(ekm): Remove once all clients updated to new interface.
-  int AnalyzeReverseStreamLocked(const float* const* src,
-                                 const StreamConfig& input_config,
-                                 const StreamConfig& output_config)
-      RTC_EXCLUSIVE_LOCKS_REQUIRED(crit_render_);
-  int ProcessRenderStreamLocked() RTC_EXCLUSIVE_LOCKS_REQUIRED(crit_render_);
-
-  // Collects configuration settings from public and private
-  // submodules to be saved as an audioproc::Config message on the
-  // AecDump if it is attached.  If not |forced|, only writes the current
-  // config if it is different from the last saved one; if |forced|,
-  // writes the config regardless of the last saved.
-  void WriteAecDumpConfigMessage(bool forced)
-      RTC_EXCLUSIVE_LOCKS_REQUIRED(crit_capture_);
-
-  // Notifies attached AecDump of current configuration and capture data.
-  void RecordUnprocessedCaptureStream(const float* const* capture_stream)
-      RTC_EXCLUSIVE_LOCKS_REQUIRED(crit_capture_);
-
-  void RecordUnprocessedCaptureStream(const AudioFrame& capture_frame)
-      RTC_EXCLUSIVE_LOCKS_REQUIRED(crit_capture_);
-
-  // Notifies attached AecDump of current configuration and
-  // processed capture data and issues a capture stream recording
-  // request.
-  void RecordProcessedCaptureStream(
-      const float* const* processed_capture_stream)
-      RTC_EXCLUSIVE_LOCKS_REQUIRED(crit_capture_);
-
-  void RecordProcessedCaptureStream(const AudioFrame& processed_capture_frame)
-      RTC_EXCLUSIVE_LOCKS_REQUIRED(crit_capture_);
-
-  // Notifies attached AecDump about current state (delay, drift, etc).
-  void RecordAudioProcessingState() RTC_EXCLUSIVE_LOCKS_REQUIRED(crit_capture_);
-
-  // AecDump instance used for optionally logging APM config, input
-  // and output to file in the AEC-dump format defined in debug.proto.
-  std::unique_ptr<AecDump> aec_dump_;
-
-  // Hold the last config written with AecDump for avoiding writing
-  // the same config twice.
-  InternalAPMConfig apm_config_for_aec_dump_ RTC_GUARDED_BY(crit_capture_);
-
-  // Critical sections.
-  rtc::CriticalSection crit_render_ RTC_ACQUIRED_BEFORE(crit_capture_);
-  rtc::CriticalSection crit_capture_;
-
-  // Struct containing the Config specifying the behavior of APM.
-  AudioProcessing::Config config_;
-
-  // Class containing information about what submodules are active.
-  ApmSubmoduleStates submodule_states_;
-
-  // Structs containing the pointers to the submodules.
-  std::unique_ptr<ApmPublicSubmodules> public_submodules_;
-  std::unique_ptr<ApmPrivateSubmodules> private_submodules_;
-
-  // State that is written to while holding both the render and capture locks
-  // but can be read without any lock being held.
-  // As this is only accessed internally of APM, and all internal methods in APM
-  // either are holding the render or capture locks, this construct is safe as
-  // it is not possible to read the variables while writing them.
-  struct ApmFormatState {
-    ApmFormatState()
-        :  // Format of processing streams at input/output call sites.
-          api_format({{{kSampleRate16kHz, 1, false},
-                       {kSampleRate16kHz, 1, false},
-                       {kSampleRate16kHz, 1, false},
-                       {kSampleRate16kHz, 1, false}}}),
-          render_processing_format(kSampleRate16kHz, 1) {}
-    ProcessingConfig api_format;
-    StreamConfig render_processing_format;
-  } formats_;
-
-  // APM constants.
-  const struct ApmConstants {
-    ApmConstants(int agc_startup_min_volume,
-                 int agc_clipped_level_min,
-                 bool use_experimental_agc,
-                 bool use_experimental_agc_agc2_level_estimation,
-                 bool use_experimental_agc_agc2_digital_adaptive,
-                 bool use_experimental_agc_process_before_aec)
-        :  // Format of processing streams at input/output call sites.
-          agc_startup_min_volume(agc_startup_min_volume),
-          agc_clipped_level_min(agc_clipped_level_min),
-          use_experimental_agc(use_experimental_agc),
-          use_experimental_agc_agc2_level_estimation(
-              use_experimental_agc_agc2_level_estimation),
-          use_experimental_agc_agc2_digital_adaptive(
-              use_experimental_agc_agc2_digital_adaptive),
-          use_experimental_agc_process_before_aec(
-              use_experimental_agc_process_before_aec) {}
-    int agc_startup_min_volume;
-    int agc_clipped_level_min;
-    bool use_experimental_agc;
-    bool use_experimental_agc_agc2_level_estimation;
-    bool use_experimental_agc_agc2_digital_adaptive;
-    bool use_experimental_agc_process_before_aec;
-
-  } constants_;
-
-  struct ApmCaptureState {
-    ApmCaptureState(bool transient_suppressor_enabled);
-    ~ApmCaptureState();
-    int aec_system_delay_jumps;
-    int delay_offset_ms;
-    bool was_stream_delay_set;
-    int last_stream_delay_ms;
-    int last_aec_system_delay_ms;
-    int stream_delay_jumps;
-    bool output_will_be_muted;
-    bool key_pressed;
-    bool transient_suppressor_enabled;
-    std::unique_ptr<AudioBuffer> capture_audio;
-    // Only the rate and samples fields of capture_processing_format_ are used
-    // because the capture processing number of channels is mutable and is
-    // tracked by the capture_audio_.
-    StreamConfig capture_processing_format;
-    int split_rate;
-    bool echo_path_gain_change;
-    int prev_analog_mic_level;
-    float prev_pre_amp_gain;
-  } capture_ RTC_GUARDED_BY(crit_capture_);
-
-  struct ApmCaptureNonLockedState {
-    ApmCaptureNonLockedState()
-        : capture_processing_format(kSampleRate16kHz),
-          split_rate(kSampleRate16kHz),
-          stream_delay_ms(0) {}
-    // Only the rate and samples fields of capture_processing_format_ are used
-    // because the forward processing number of channels is mutable and is
-    // tracked by the capture_audio_.
-    StreamConfig capture_processing_format;
-    int split_rate;
-    int stream_delay_ms;
-    bool echo_controller_enabled = false;
-  } capture_nonlocked_;
-
-  struct ApmRenderState {
-    ApmRenderState();
-    ~ApmRenderState();
-    std::unique_ptr<AudioConverter> render_converter;
-    std::unique_ptr<AudioBuffer> render_audio;
-  } render_ RTC_GUARDED_BY(crit_render_);
-
-  size_t aec_render_queue_element_max_size_ RTC_GUARDED_BY(crit_render_)
-      RTC_GUARDED_BY(crit_capture_) = 0;
-  std::vector<float> aec_render_queue_buffer_ RTC_GUARDED_BY(crit_render_);
-  std::vector<float> aec_capture_queue_buffer_ RTC_GUARDED_BY(crit_capture_);
-
-  size_t aecm_render_queue_element_max_size_ RTC_GUARDED_BY(crit_render_)
-      RTC_GUARDED_BY(crit_capture_) = 0;
-  std::vector<int16_t> aecm_render_queue_buffer_ RTC_GUARDED_BY(crit_render_);
-  std::vector<int16_t> aecm_capture_queue_buffer_ RTC_GUARDED_BY(crit_capture_);
-
-  size_t agc_render_queue_element_max_size_ RTC_GUARDED_BY(crit_render_)
-      RTC_GUARDED_BY(crit_capture_) = 0;
-  std::vector<int16_t> agc_render_queue_buffer_ RTC_GUARDED_BY(crit_render_);
-  std::vector<int16_t> agc_capture_queue_buffer_ RTC_GUARDED_BY(crit_capture_);
-
-  size_t red_render_queue_element_max_size_ RTC_GUARDED_BY(crit_render_)
-      RTC_GUARDED_BY(crit_capture_) = 0;
-  std::vector<float> red_render_queue_buffer_ RTC_GUARDED_BY(crit_render_);
-  std::vector<float> red_capture_queue_buffer_ RTC_GUARDED_BY(crit_capture_);
-
-  RmsLevel capture_input_rms_ RTC_GUARDED_BY(crit_capture_);
-  RmsLevel capture_output_rms_ RTC_GUARDED_BY(crit_capture_);
-  int capture_rms_interval_counter_ RTC_GUARDED_BY(crit_capture_) = 0;
-
-  // Lock protection not needed.
-  std::unique_ptr<SwapQueue<std::vector<float>, RenderQueueItemVerifier<float>>>
-      aec_render_signal_queue_;
-  std::unique_ptr<
-      SwapQueue<std::vector<int16_t>, RenderQueueItemVerifier<int16_t>>>
-      aecm_render_signal_queue_;
-  std::unique_ptr<
-      SwapQueue<std::vector<int16_t>, RenderQueueItemVerifier<int16_t>>>
-      agc_render_signal_queue_;
-  std::unique_ptr<SwapQueue<std::vector<float>, RenderQueueItemVerifier<float>>>
-      red_render_signal_queue_;
-};
-
-}  // namespace webrtc
-
-#endif  // MODULES_AUDIO_PROCESSING_AUDIO_PROCESSING_IMPL_H_
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/common.h b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/common.h
deleted file mode 100644
index d8532c5749..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/common.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- *  Copyright (c) 2014 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#ifndef MODULES_AUDIO_PROCESSING_COMMON_H_
-#define MODULES_AUDIO_PROCESSING_COMMON_H_
-
-#include "modules/audio_processing/include/audio_processing.h"
-#include "rtc_base/checks.h"
-
-namespace webrtc {
-
-static inline size_t ChannelsFromLayout(AudioProcessing::ChannelLayout layout) {
-  switch (layout) {
-    case AudioProcessing::kMono:
-    case AudioProcessing::kMonoAndKeyboard:
-      return 1;
-    case AudioProcessing::kStereo:
-    case AudioProcessing::kStereoAndKeyboard:
-      return 2;
-  }
-  RTC_NOTREACHED();
-  return 0;
-}
-
-}  // namespace webrtc
-
-#endif  // MODULES_AUDIO_PROCESSING_COMMON_H_
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/echo_cancellation_impl.cc b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/echo_cancellation_impl.cc
deleted file mode 100644
index 73fe51b752..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/echo_cancellation_impl.cc
+++ /dev/null
@@ -1,470 +0,0 @@
-/*
- *  Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#include "modules/audio_processing/echo_cancellation_impl.h"
-
-#include <stdint.h>
-#include <string.h>
-
-#include "modules/audio_processing/aec/aec_core.h"
-#include "modules/audio_processing/aec/echo_cancellation.h"
-#include "modules/audio_processing/audio_buffer.h"
-#include "modules/audio_processing/include/config.h"
-#include "rtc_base/checks.h"
-#include "system_wrappers/include/field_trial.h"
-
-namespace webrtc {
-
-namespace {
-int16_t MapSetting(EchoCancellationImpl::SuppressionLevel level) {
-  switch (level) {
-    case EchoCancellationImpl::kLowSuppression:
-      return kAecNlpConservative;
-    case EchoCancellationImpl::kModerateSuppression:
-      return kAecNlpModerate;
-    case EchoCancellationImpl::kHighSuppression:
-      return kAecNlpAggressive;
-  }
-  RTC_NOTREACHED();
-  return -1;
-}
-
-AudioProcessing::Error MapError(int err) {
-  switch (err) {
-    case AEC_UNSUPPORTED_FUNCTION_ERROR:
-      return AudioProcessing::kUnsupportedFunctionError;
-    case AEC_BAD_PARAMETER_ERROR:
-      return AudioProcessing::kBadParameterError;
-    case AEC_BAD_PARAMETER_WARNING:
-      return AudioProcessing::kBadStreamParameterWarning;
-    default:
-      // AEC_UNSPECIFIED_ERROR
-      // AEC_UNINITIALIZED_ERROR
-      // AEC_NULL_POINTER_ERROR
-      return AudioProcessing::kUnspecifiedError;
-  }
-}
-
-bool EnforceZeroStreamDelay() {
-#if defined(CHROMEOS)
-  return !field_trial::IsEnabled("WebRTC-Aec2ZeroStreamDelayKillSwitch");
-#else
-  return false;
-#endif
-}
-
-}  // namespace
-
-struct EchoCancellationImpl::StreamProperties {
-  StreamProperties() = delete;
-  StreamProperties(int sample_rate_hz,
-                   size_t num_reverse_channels,
-                   size_t num_output_channels,
-                   size_t num_proc_channels)
-      : sample_rate_hz(sample_rate_hz),
-        num_reverse_channels(num_reverse_channels),
-        num_output_channels(num_output_channels),
-        num_proc_channels(num_proc_channels) {}
-
-  const int sample_rate_hz;
-  const size_t num_reverse_channels;
-  const size_t num_output_channels;
-  const size_t num_proc_channels;
-};
-
-class EchoCancellationImpl::Canceller {
- public:
-  Canceller() {
-    state_ = WebRtcAec_Create();
-    RTC_DCHECK(state_);
-  }
-
-  ~Canceller() {
-    RTC_CHECK(state_);
-    WebRtcAec_Free(state_);
-  }
-
-  void* state() { return state_; }
-
-  void Initialize(int sample_rate_hz) {
-    // TODO(ajm): Drift compensation is disabled in practice. If restored, it
-    // should be managed internally and not depend on the hardware sample rate.
-    // For now, just hardcode a 48 kHz value.
-    const int error = WebRtcAec_Init(state_, sample_rate_hz, 48000);
-    RTC_DCHECK_EQ(0, error);
-  }
-
- private:
-  void* state_;
-};
-
-EchoCancellationImpl::EchoCancellationImpl()
-    : drift_compensation_enabled_(false),
-      metrics_enabled_(true),
-      suppression_level_(kHighSuppression),
-      stream_drift_samples_(0),
-      was_stream_drift_set_(false),
-      stream_has_echo_(false),
-      delay_logging_enabled_(true),
-      extended_filter_enabled_(false),
-      delay_agnostic_enabled_(false),
-      enforce_zero_stream_delay_(EnforceZeroStreamDelay()) {}
-
-EchoCancellationImpl::~EchoCancellationImpl() = default;
-
-void EchoCancellationImpl::ProcessRenderAudio(
-    rtc::ArrayView<const float> packed_render_audio) {
-  if (!enabled_) {
-    return;
-  }
-
-  RTC_DCHECK(stream_properties_);
-  size_t handle_index = 0;
-  size_t buffer_index = 0;
-  const size_t num_frames_per_band =
-      packed_render_audio.size() / (stream_properties_->num_output_channels *
-                                    stream_properties_->num_reverse_channels);
-  for (size_t i = 0; i < stream_properties_->num_output_channels; i++) {
-    for (size_t j = 0; j < stream_properties_->num_reverse_channels; j++) {
-      WebRtcAec_BufferFarend(cancellers_[handle_index++]->state(),
-                             &packed_render_audio[buffer_index],
-                             num_frames_per_band);
-
-      buffer_index += num_frames_per_band;
-    }
-  }
-}
-
-int EchoCancellationImpl::ProcessCaptureAudio(AudioBuffer* audio,
-                                              int stream_delay_ms) {
-  if (!enabled_) {
-    return AudioProcessing::kNoError;
-  }
-
-  const int stream_delay_ms_use =
-      enforce_zero_stream_delay_ ? 0 : stream_delay_ms;
-
-  if (drift_compensation_enabled_ && !was_stream_drift_set_) {
-    return AudioProcessing::kStreamParameterNotSetError;
-  }
-
-  RTC_DCHECK(stream_properties_);
-  RTC_DCHECK_GE(160, audio->num_frames_per_band());
-  RTC_DCHECK_EQ(audio->num_channels(), stream_properties_->num_proc_channels);
-
-  int err = AudioProcessing::kNoError;
-
-  // The ordering convention must be followed to pass to the correct AEC.
-  size_t handle_index = 0;
-  stream_has_echo_ = false;
-  for (size_t i = 0; i < audio->num_channels(); i++) {
-    for (size_t j = 0; j < stream_properties_->num_reverse_channels; j++) {
-      err = WebRtcAec_Process(cancellers_[handle_index]->state(),
-                              audio->split_bands_const_f(i), audio->num_bands(),
-                              audio->split_bands_f(i),
-                              audio->num_frames_per_band(), stream_delay_ms_use,
-                              stream_drift_samples_);
-
-      if (err != AudioProcessing::kNoError) {
-        err = MapError(err);
-        // TODO(ajm): Figure out how to return warnings properly.
-        if (err != AudioProcessing::kBadStreamParameterWarning) {
-          return err;
-        }
-      }
-
-      int status = 0;
-      err = WebRtcAec_get_echo_status(cancellers_[handle_index]->state(),
-                                      &status);
-      if (err != AudioProcessing::kNoError) {
-        return MapError(err);
-      }
-
-      if (status == 1) {
-        stream_has_echo_ = true;
-      }
-
-      handle_index++;
-    }
-  }
-
-  was_stream_drift_set_ = false;
-  return AudioProcessing::kNoError;
-}
-
-int EchoCancellationImpl::Enable(bool enable) {
-  if (enable && !enabled_) {
-    enabled_ = enable;  // Must be set before Initialize() is called.
-
-    // TODO(peah): Simplify once the Enable function has been removed from
-    // the public APM API.
-    RTC_DCHECK(stream_properties_);
-    Initialize(stream_properties_->sample_rate_hz,
-               stream_properties_->num_reverse_channels,
-               stream_properties_->num_output_channels,
-               stream_properties_->num_proc_channels);
-  } else {
-    enabled_ = enable;
-  }
-  return AudioProcessing::kNoError;
-}
-
-bool EchoCancellationImpl::is_enabled() const {
-  return enabled_;
-}
-
-int EchoCancellationImpl::set_suppression_level(SuppressionLevel level) {
-  if (MapSetting(level) == -1) {
-    return AudioProcessing::kBadParameterError;
-  }
-  suppression_level_ = level;
-  return Configure();
-}
-
-EchoCancellationImpl::SuppressionLevel EchoCancellationImpl::suppression_level()
-    const {
-  return suppression_level_;
-}
-
-int EchoCancellationImpl::enable_drift_compensation(bool enable) {
-  drift_compensation_enabled_ = enable;
-  return Configure();
-}
-
-bool EchoCancellationImpl::is_drift_compensation_enabled() const {
-  return drift_compensation_enabled_;
-}
-
-void EchoCancellationImpl::set_stream_drift_samples(int drift) {
-  was_stream_drift_set_ = true;
-  stream_drift_samples_ = drift;
-}
-
-int EchoCancellationImpl::stream_drift_samples() const {
-  return stream_drift_samples_;
-}
-
-int EchoCancellationImpl::enable_metrics(bool enable) {
-  metrics_enabled_ = enable;
-  return Configure();
-}
-
-bool EchoCancellationImpl::are_metrics_enabled() const {
-  return enabled_ && metrics_enabled_;
-}
-
-// TODO(ajm): we currently just use the metrics from the first AEC. Think more
-//            aboue the best way to extend this to multi-channel.
-int EchoCancellationImpl::GetMetrics(Metrics* metrics) {
-  if (metrics == NULL) {
-    return AudioProcessing::kNullPointerError;
-  }
-
-  if (!enabled_ || !metrics_enabled_) {
-    return AudioProcessing::kNotEnabledError;
-  }
-
-  AecMetrics my_metrics;
-  memset(&my_metrics, 0, sizeof(my_metrics));
-  memset(metrics, 0, sizeof(Metrics));
-
-  const int err = WebRtcAec_GetMetrics(cancellers_[0]->state(), &my_metrics);
-  if (err != AudioProcessing::kNoError) {
-    return MapError(err);
-  }
-
-  metrics->residual_echo_return_loss.instant = my_metrics.rerl.instant;
-  metrics->residual_echo_return_loss.average = my_metrics.rerl.average;
-  metrics->residual_echo_return_loss.maximum = my_metrics.rerl.max;
-  metrics->residual_echo_return_loss.minimum = my_metrics.rerl.min;
-
-  metrics->echo_return_loss.instant = my_metrics.erl.instant;
-  metrics->echo_return_loss.average = my_metrics.erl.average;
-  metrics->echo_return_loss.maximum = my_metrics.erl.max;
-  metrics->echo_return_loss.minimum = my_metrics.erl.min;
-
-  metrics->echo_return_loss_enhancement.instant = my_metrics.erle.instant;
-  metrics->echo_return_loss_enhancement.average = my_metrics.erle.average;
-  metrics->echo_return_loss_enhancement.maximum = my_metrics.erle.max;
-  metrics->echo_return_loss_enhancement.minimum = my_metrics.erle.min;
-
-  metrics->a_nlp.instant = my_metrics.aNlp.instant;
-  metrics->a_nlp.average = my_metrics.aNlp.average;
-  metrics->a_nlp.maximum = my_metrics.aNlp.max;
-  metrics->a_nlp.minimum = my_metrics.aNlp.min;
-
-  metrics->divergent_filter_fraction = my_metrics.divergent_filter_fraction;
-  return AudioProcessing::kNoError;
-}
-
-bool EchoCancellationImpl::stream_has_echo() const {
-  return stream_has_echo_;
-}
-
-int EchoCancellationImpl::enable_delay_logging(bool enable) {
-  delay_logging_enabled_ = enable;
-  return Configure();
-}
-
-bool EchoCancellationImpl::is_delay_logging_enabled() const {
-  return enabled_ && delay_logging_enabled_;
-}
-
-bool EchoCancellationImpl::is_delay_agnostic_enabled() const {
-  return delay_agnostic_enabled_;
-}
-
-std::string EchoCancellationImpl::GetExperimentsDescription() {
-  return refined_adaptive_filter_enabled_ ? "RefinedAdaptiveFilter;" : "";
-}
-
-bool EchoCancellationImpl::is_refined_adaptive_filter_enabled() const {
-  return refined_adaptive_filter_enabled_;
-}
-
-bool EchoCancellationImpl::is_extended_filter_enabled() const {
-  return extended_filter_enabled_;
-}
-
-// TODO(bjornv): How should we handle the multi-channel case?
-int EchoCancellationImpl::GetDelayMetrics(int* median, int* std) {
-  float fraction_poor_delays = 0;
-  return GetDelayMetrics(median, std, &fraction_poor_delays);
-}
-
-int EchoCancellationImpl::GetDelayMetrics(int* median,
-                                          int* std,
-                                          float* fraction_poor_delays) {
-  if (median == NULL) {
-    return AudioProcessing::kNullPointerError;
-  }
-  if (std == NULL) {
-    return AudioProcessing::kNullPointerError;
-  }
-
-  if (!enabled_ || !delay_logging_enabled_) {
-    return AudioProcessing::kNotEnabledError;
-  }
-
-  const int err = WebRtcAec_GetDelayMetrics(cancellers_[0]->state(), median,
-                                            std, fraction_poor_delays);
-  if (err != AudioProcessing::kNoError) {
-    return MapError(err);
-  }
-
-  return AudioProcessing::kNoError;
-}
-
-struct AecCore* EchoCancellationImpl::aec_core() const {
-  if (!enabled_) {
-    return NULL;
-  }
-  return WebRtcAec_aec_core(cancellers_[0]->state());
-}
-
-void EchoCancellationImpl::Initialize(int sample_rate_hz,
-                                      size_t num_reverse_channels,
-                                      size_t num_output_channels,
-                                      size_t num_proc_channels) {
-  stream_properties_.reset(
-      new StreamProperties(sample_rate_hz, num_reverse_channels,
-                           num_output_channels, num_proc_channels));
-
-  if (!enabled_) {
-    return;
-  }
-
-  const size_t num_cancellers_required =
-      NumCancellersRequired(stream_properties_->num_output_channels,
-                            stream_properties_->num_reverse_channels);
-  if (num_cancellers_required > cancellers_.size()) {
-    const size_t cancellers_old_size = cancellers_.size();
-    cancellers_.resize(num_cancellers_required);
-
-    for (size_t i = cancellers_old_size; i < cancellers_.size(); ++i) {
-      cancellers_[i].reset(new Canceller());
-    }
-  }
-
-  for (auto& canceller : cancellers_) {
-    canceller->Initialize(sample_rate_hz);
-  }
-
-  Configure();
-}
-
-int EchoCancellationImpl::GetSystemDelayInSamples() const {
-  RTC_DCHECK(enabled_);
-  // Report the delay for the first AEC component.
-  return WebRtcAec_system_delay(WebRtcAec_aec_core(cancellers_[0]->state()));
-}
-
-void EchoCancellationImpl::PackRenderAudioBuffer(
-    const AudioBuffer* audio,
-    size_t num_output_channels,
-    size_t num_channels,
-    std::vector<float>* packed_buffer) {
-  RTC_DCHECK_GE(160, audio->num_frames_per_band());
-  RTC_DCHECK_EQ(num_channels, audio->num_channels());
-
-  packed_buffer->clear();
-  // The ordering convention must be followed to pass the correct data.
-  for (size_t i = 0; i < num_output_channels; i++) {
-    for (size_t j = 0; j < audio->num_channels(); j++) {
-      // Buffer the samples in the render queue.
-      packed_buffer->insert(packed_buffer->end(),
-                            audio->split_bands_const_f(j)[kBand0To8kHz],
-                            (audio->split_bands_const_f(j)[kBand0To8kHz] +
-                             audio->num_frames_per_band()));
-    }
-  }
-}
-
-void EchoCancellationImpl::SetExtraOptions(const webrtc::Config& config) {
-  {
-    extended_filter_enabled_ = config.Get<ExtendedFilter>().enabled;
-    delay_agnostic_enabled_ = config.Get<DelayAgnostic>().enabled;
-    refined_adaptive_filter_enabled_ =
-        config.Get<RefinedAdaptiveFilter>().enabled;
-  }
-  Configure();
-}
-
-int EchoCancellationImpl::Configure() {
-  AecConfig config;
-  config.metricsMode = metrics_enabled_;
-  config.nlpMode = MapSetting(suppression_level_);
-  config.skewMode = drift_compensation_enabled_;
-  config.delay_logging = delay_logging_enabled_;
-
-  int error = AudioProcessing::kNoError;
-  for (auto& canceller : cancellers_) {
-    WebRtcAec_enable_extended_filter(WebRtcAec_aec_core(canceller->state()),
-                                     extended_filter_enabled_ ? 1 : 0);
-    WebRtcAec_enable_delay_agnostic(WebRtcAec_aec_core(canceller->state()),
-                                    delay_agnostic_enabled_ ? 1 : 0);
-    WebRtcAec_enable_refined_adaptive_filter(
-        WebRtcAec_aec_core(canceller->state()),
-        refined_adaptive_filter_enabled_);
-    const int handle_error = WebRtcAec_set_config(canceller->state(), config);
-    if (handle_error != AudioProcessing::kNoError) {
-      error = AudioProcessing::kNoError;
-    }
-  }
-  return error;
-}
-
-size_t EchoCancellationImpl::NumCancellersRequired(
-    size_t num_output_channels,
-    size_t num_reverse_channels) {
-  return num_output_channels * num_reverse_channels;
-}
-
-}  // namespace webrtc
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/echo_cancellation_impl.h b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/echo_cancellation_impl.h
deleted file mode 100644
index a8b43a8cd6..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/echo_cancellation_impl.h
+++ /dev/null
@@ -1,183 +0,0 @@
-/*
- *  Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#ifndef MODULES_AUDIO_PROCESSING_ECHO_CANCELLATION_IMPL_H_
-#define MODULES_AUDIO_PROCESSING_ECHO_CANCELLATION_IMPL_H_
-
-#include <stddef.h>
-#include <memory>
-#include <string>
-#include <vector>
-
-#include "api/array_view.h"
-#include "modules/audio_processing/include/audio_processing.h"
-#include "rtc_base/constructormagic.h"
-#include "rtc_base/criticalsection.h"
-#include "rtc_base/thread_annotations.h"
-
-namespace webrtc {
-
-class AudioBuffer;
-
-// The acoustic echo cancellation (AEC) component provides better performance
-// than AECM but also requires more processing power and is dependent on delay
-// stability and reporting accuracy. As such it is well-suited and recommended
-// for PC and IP phone applications.
-class EchoCancellationImpl {
- public:
-  explicit EchoCancellationImpl();
-  ~EchoCancellationImpl();
-
-  void ProcessRenderAudio(rtc::ArrayView<const float> packed_render_audio);
-  int ProcessCaptureAudio(AudioBuffer* audio, int stream_delay_ms);
-
-  int Enable(bool enable);
-  bool is_enabled() const;
-
-  // Differences in clock speed on the primary and reverse streams can impact
-  // the AEC performance. On the client-side, this could be seen when different
-  // render and capture devices are used, particularly with webcams.
-  //
-  // This enables a compensation mechanism, and requires that
-  // set_stream_drift_samples() be called.
-  int enable_drift_compensation(bool enable);
-  bool is_drift_compensation_enabled() const;
-
-  // Sets the difference between the number of samples rendered and captured by
-  // the audio devices since the last call to |ProcessStream()|. Must be called
-  // if drift compensation is enabled, prior to |ProcessStream()|.
-  void set_stream_drift_samples(int drift);
-  int stream_drift_samples() const;
-
-  enum SuppressionLevel {
-    kLowSuppression,
-    kModerateSuppression,
-    kHighSuppression
-  };
-
-  // Sets the aggressiveness of the suppressor. A higher level trades off
-  // double-talk performance for increased echo suppression.
-  int set_suppression_level(SuppressionLevel level);
-  SuppressionLevel suppression_level() const;
-
-  // Returns false if the current frame almost certainly contains no echo
-  // and true if it _might_ contain echo.
-  bool stream_has_echo() const;
-
-  // Enables the computation of various echo metrics. These are obtained
-  // through |GetMetrics()|.
-  int enable_metrics(bool enable);
-  bool are_metrics_enabled() const;
-
-  // Each statistic is reported in dB.
-  // P_far:  Far-end (render) signal power.
-  // P_echo: Near-end (capture) echo signal power.
-  // P_out:  Signal power at the output of the AEC.
-  // P_a:    Internal signal power at the point before the AEC's non-linear
-  //         processor.
-  struct Metrics {
-    struct Statistic {
-      int instant = 0;  // Instantaneous value.
-      int average = 0;  // Long-term average.
-      int maximum = 0;  // Long-term maximum.
-      int minimum = 0;  // Long-term minimum.
-    };
-    // RERL = ERL + ERLE
-    Statistic residual_echo_return_loss;
-
-    // ERL = 10log_10(P_far / P_echo)
-    Statistic echo_return_loss;
-
-    // ERLE = 10log_10(P_echo / P_out)
-    Statistic echo_return_loss_enhancement;
-
-    // (Pre non-linear processing suppression) A_NLP = 10log_10(P_echo / P_a)
-    Statistic a_nlp;
-
-    // Fraction of time that the AEC linear filter is divergent, in a 1-second
-    // non-overlapped aggregation window.
-    float divergent_filter_fraction;
-  };
-
-  // Provides various statistics about the AEC.
-  int GetMetrics(Metrics* metrics);
-
-  // Enables computation and logging of delay values. Statistics are obtained
-  // through |GetDelayMetrics()|.
-  int enable_delay_logging(bool enable);
-  bool is_delay_logging_enabled() const;
-
-  // Provides delay metrics.
-  // The delay metrics consists of the delay |median| and the delay standard
-  // deviation |std|. It also consists of the fraction of delay estimates
-  // |fraction_poor_delays| that can make the echo cancellation perform poorly.
-  // The values are aggregated until the first call to |GetDelayMetrics()| and
-  // afterwards aggregated and updated every second.
-  // Note that if there are several clients pulling metrics from
-  // |GetDelayMetrics()| during a session the first call from any of them will
-  // change to one second aggregation window for all.
-  int GetDelayMetrics(int* median, int* std);
-  int GetDelayMetrics(int* median, int* std, float* fraction_poor_delays);
-
-  // Returns a pointer to the low level AEC component.  In case of multiple
-  // channels, the pointer to the first one is returned.  A NULL pointer is
-  // returned when the AEC component is disabled or has not been initialized
-  // successfully.
-  struct AecCore* aec_core() const;
-
-  void Initialize(int sample_rate_hz,
-                  size_t num_reverse_channels_,
-                  size_t num_output_channels_,
-                  size_t num_proc_channels_);
-  void SetExtraOptions(const webrtc::Config& config);
-  bool is_delay_agnostic_enabled() const;
-  bool is_extended_filter_enabled() const;
-  std::string GetExperimentsDescription();
-  bool is_refined_adaptive_filter_enabled() const;
-
-  // Returns the system delay of the first AEC component.
-  int GetSystemDelayInSamples() const;
-
-  static void PackRenderAudioBuffer(const AudioBuffer* audio,
-                                    size_t num_output_channels,
-                                    size_t num_channels,
-                                    std::vector<float>* packed_buffer);
-  static size_t NumCancellersRequired(size_t num_output_channels,
-                                      size_t num_reverse_channels);
-
- private:
-  class Canceller;
-  struct StreamProperties;
-
-  void AllocateRenderQueue();
-  int Configure();
-
-  bool enabled_ = false;
-  bool drift_compensation_enabled_;
-  bool metrics_enabled_;
-  SuppressionLevel suppression_level_;
-  int stream_drift_samples_;
-  bool was_stream_drift_set_;
-  bool stream_has_echo_;
-  bool delay_logging_enabled_;
-  bool extended_filter_enabled_;
-  bool delay_agnostic_enabled_;
-  bool refined_adaptive_filter_enabled_ = false;
-
-  // Only active on Chrome OS devices.
-  const bool enforce_zero_stream_delay_;
-
-  std::vector<std::unique_ptr<Canceller>> cancellers_;
-  std::unique_ptr<StreamProperties> stream_properties_;
-};
-
-}  // namespace webrtc
-
-#endif  // MODULES_AUDIO_PROCESSING_ECHO_CANCELLATION_IMPL_H_
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/echo_control_mobile_impl.cc b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/echo_control_mobile_impl.cc
deleted file mode 100644
index b9fbf42052..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/echo_control_mobile_impl.cc
+++ /dev/null
@@ -1,294 +0,0 @@
-/*
- *  Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#include "modules/audio_processing/echo_control_mobile_impl.h"
-
-#include <string.h>
-#include <cstdint>
-
-#include "modules/audio_processing/aecm/echo_control_mobile.h"
-#include "modules/audio_processing/audio_buffer.h"
-#include "modules/audio_processing/include/audio_processing.h"
-#include "rtc_base/checks.h"
-#include "rtc_base/constructormagic.h"
-
-namespace webrtc {
-
-namespace {
-int16_t MapSetting(EchoControlMobileImpl::RoutingMode mode) {
-  switch (mode) {
-    case EchoControlMobileImpl::kQuietEarpieceOrHeadset:
-      return 0;
-    case EchoControlMobileImpl::kEarpiece:
-      return 1;
-    case EchoControlMobileImpl::kLoudEarpiece:
-      return 2;
-    case EchoControlMobileImpl::kSpeakerphone:
-      return 3;
-    case EchoControlMobileImpl::kLoudSpeakerphone:
-      return 4;
-  }
-  RTC_NOTREACHED();
-  return -1;
-}
-
-AudioProcessing::Error MapError(int err) {
-  switch (err) {
-    case AECM_UNSUPPORTED_FUNCTION_ERROR:
-      return AudioProcessing::kUnsupportedFunctionError;
-    case AECM_NULL_POINTER_ERROR:
-      return AudioProcessing::kNullPointerError;
-    case AECM_BAD_PARAMETER_ERROR:
-      return AudioProcessing::kBadParameterError;
-    case AECM_BAD_PARAMETER_WARNING:
-      return AudioProcessing::kBadStreamParameterWarning;
-    default:
-      // AECM_UNSPECIFIED_ERROR
-      // AECM_UNINITIALIZED_ERROR
-      return AudioProcessing::kUnspecifiedError;
-  }
-}
-}  // namespace
-
-struct EchoControlMobileImpl::StreamProperties {
-  StreamProperties() = delete;
-  StreamProperties(int sample_rate_hz,
-                   size_t num_reverse_channels,
-                   size_t num_output_channels)
-      : sample_rate_hz(sample_rate_hz),
-        num_reverse_channels(num_reverse_channels),
-        num_output_channels(num_output_channels) {}
-
-  int sample_rate_hz;
-  size_t num_reverse_channels;
-  size_t num_output_channels;
-};
-
-class EchoControlMobileImpl::Canceller {
- public:
-  Canceller() {
-    state_ = WebRtcAecm_Create();
-    RTC_CHECK(state_);
-  }
-
-  ~Canceller() {
-    RTC_DCHECK(state_);
-    WebRtcAecm_Free(state_);
-  }
-
-  void* state() {
-    RTC_DCHECK(state_);
-    return state_;
-  }
-
-  void Initialize(int sample_rate_hz) {
-    RTC_DCHECK(state_);
-    int error = WebRtcAecm_Init(state_, sample_rate_hz);
-    RTC_DCHECK_EQ(AudioProcessing::kNoError, error);
-  }
-
- private:
-  void* state_;
-  RTC_DISALLOW_COPY_AND_ASSIGN(Canceller);
-};
-
-EchoControlMobileImpl::EchoControlMobileImpl()
-    : routing_mode_(kSpeakerphone), comfort_noise_enabled_(false) {}
-
-EchoControlMobileImpl::~EchoControlMobileImpl() {}
-
-void EchoControlMobileImpl::ProcessRenderAudio(
-    rtc::ArrayView<const int16_t> packed_render_audio) {
-  if (!enabled_) {
-    return;
-  }
-
-  RTC_DCHECK(stream_properties_);
-
-  size_t buffer_index = 0;
-  size_t num_frames_per_band =
-      packed_render_audio.size() / (stream_properties_->num_output_channels *
-                                    stream_properties_->num_reverse_channels);
-
-  for (auto& canceller : cancellers_) {
-    WebRtcAecm_BufferFarend(canceller->state(),
-                            &packed_render_audio[buffer_index],
-                            num_frames_per_band);
-
-    buffer_index += num_frames_per_band;
-  }
-}
-
-void EchoControlMobileImpl::PackRenderAudioBuffer(
-    const AudioBuffer* audio,
-    size_t num_output_channels,
-    size_t num_channels,
-    std::vector<int16_t>* packed_buffer) {
-  RTC_DCHECK_GE(160, audio->num_frames_per_band());
-  RTC_DCHECK_EQ(num_channels, audio->num_channels());
-
-  // The ordering convention must be followed to pass to the correct AECM.
-  packed_buffer->clear();
-  int render_channel = 0;
-  for (size_t i = 0; i < num_output_channels; i++) {
-    for (size_t j = 0; j < audio->num_channels(); j++) {
-      // Buffer the samples in the render queue.
-      packed_buffer->insert(
-          packed_buffer->end(),
-          audio->split_bands_const(render_channel)[kBand0To8kHz],
-          (audio->split_bands_const(render_channel)[kBand0To8kHz] +
-           audio->num_frames_per_band()));
-      render_channel = (render_channel + 1) % audio->num_channels();
-    }
-  }
-}
-
-size_t EchoControlMobileImpl::NumCancellersRequired(
-    size_t num_output_channels,
-    size_t num_reverse_channels) {
-  return num_output_channels * num_reverse_channels;
-}
-
-int EchoControlMobileImpl::ProcessCaptureAudio(AudioBuffer* audio,
-                                               int stream_delay_ms) {
-  if (!enabled_) {
-    return AudioProcessing::kNoError;
-  }
-
-  RTC_DCHECK(stream_properties_);
-  RTC_DCHECK_GE(160, audio->num_frames_per_band());
-  RTC_DCHECK_EQ(audio->num_channels(), stream_properties_->num_output_channels);
-  RTC_DCHECK_GE(cancellers_.size(), stream_properties_->num_reverse_channels *
-                                        audio->num_channels());
-
-  int err = AudioProcessing::kNoError;
-
-  // The ordering convention must be followed to pass to the correct AECM.
-  size_t handle_index = 0;
-  for (size_t capture = 0; capture < audio->num_channels(); ++capture) {
-    // TODO(ajm): improve how this works, possibly inside AECM.
-    //            This is kind of hacked up.
-    const int16_t* noisy = audio->low_pass_reference(capture);
-    const int16_t* clean = audio->split_bands_const(capture)[kBand0To8kHz];
-    if (noisy == NULL) {
-      noisy = clean;
-      clean = NULL;
-    }
-    for (size_t render = 0; render < stream_properties_->num_reverse_channels;
-         ++render) {
-      err = WebRtcAecm_Process(cancellers_[handle_index]->state(), noisy, clean,
-                               audio->split_bands(capture)[kBand0To8kHz],
-                               audio->num_frames_per_band(), stream_delay_ms);
-
-      if (err != AudioProcessing::kNoError) {
-        return MapError(err);
-      }
-
-      ++handle_index;
-    }
-    for (size_t band = 1u; band < audio->num_bands(); ++band) {
-      memset(audio->split_bands(capture)[band], 0,
-             audio->num_frames_per_band() *
-                 sizeof(audio->split_bands(capture)[band][0]));
-    }
-  }
-  return AudioProcessing::kNoError;
-}
-
-int EchoControlMobileImpl::Enable(bool enable) {
-  // Ensure AEC and AECM are not both enabled.
-  RTC_DCHECK(stream_properties_);
-
-  if (enable &&
-      stream_properties_->sample_rate_hz > AudioProcessing::kSampleRate16kHz) {
-    return AudioProcessing::kBadSampleRateError;
-  }
-
-  if (enable && !enabled_) {
-    enabled_ = enable;  // Must be set before Initialize() is called.
-
-    // TODO(peah): Simplify once the Enable function has been removed from
-    // the public APM API.
-    Initialize(stream_properties_->sample_rate_hz,
-               stream_properties_->num_reverse_channels,
-               stream_properties_->num_output_channels);
-  } else {
-    enabled_ = enable;
-  }
-  return AudioProcessing::kNoError;
-}
-
-bool EchoControlMobileImpl::is_enabled() const {
-  return enabled_;
-}
-
-int EchoControlMobileImpl::set_routing_mode(RoutingMode mode) {
-  if (MapSetting(mode) == -1) {
-    return AudioProcessing::kBadParameterError;
-  }
-    routing_mode_ = mode;
-  return Configure();
-}
-
-EchoControlMobileImpl::RoutingMode EchoControlMobileImpl::routing_mode() const {
-  return routing_mode_;
-}
-
-int EchoControlMobileImpl::enable_comfort_noise(bool enable) {
-    comfort_noise_enabled_ = enable;
-  return Configure();
-}
-
-bool EchoControlMobileImpl::is_comfort_noise_enabled() const {
-  return comfort_noise_enabled_;
-}
-
-void EchoControlMobileImpl::Initialize(int sample_rate_hz,
-                                       size_t num_reverse_channels,
-                                       size_t num_output_channels) {
-  stream_properties_.reset(new StreamProperties(
-      sample_rate_hz, num_reverse_channels, num_output_channels));
-
-  if (!enabled_) {
-    return;
-  }
-
-  // AECM only supports 16 kHz or lower sample rates.
-  RTC_DCHECK_LE(stream_properties_->sample_rate_hz,
-                AudioProcessing::kSampleRate16kHz);
-
-  cancellers_.resize(
-      NumCancellersRequired(stream_properties_->num_output_channels,
-                            stream_properties_->num_reverse_channels));
-
-  for (auto& canceller : cancellers_) {
-    if (!canceller) {
-      canceller.reset(new Canceller());
-    }
-    canceller->Initialize(sample_rate_hz);
-  }
-  Configure();
-}
-
-int EchoControlMobileImpl::Configure() {
-  AecmConfig config;
-  config.cngMode = comfort_noise_enabled_;
-  config.echoMode = MapSetting(routing_mode_);
-  int error = AudioProcessing::kNoError;
-  for (auto& canceller : cancellers_) {
-    int handle_error = WebRtcAecm_set_config(canceller->state(), config);
-    if (handle_error != AudioProcessing::kNoError) {
-      error = handle_error;
-    }
-  }
-  return error;
-}
-
-}  // namespace webrtc
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/echo_control_mobile_impl.h b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/echo_control_mobile_impl.h
deleted file mode 100644
index d5a8b0b445..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/echo_control_mobile_impl.h
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
- *  Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#ifndef MODULES_AUDIO_PROCESSING_ECHO_CONTROL_MOBILE_IMPL_H_
-#define MODULES_AUDIO_PROCESSING_ECHO_CONTROL_MOBILE_IMPL_H_
-
-#include <stddef.h>
-#include <stdint.h>
-#include <memory>
-#include <vector>
-
-#include "api/array_view.h"
-
-namespace webrtc {
-
-class AudioBuffer;
-
-// The acoustic echo control for mobile (AECM) component is a low complexity
-// robust option intended for use on mobile devices.
-class EchoControlMobileImpl {
- public:
-  EchoControlMobileImpl();
-
-  ~EchoControlMobileImpl();
-
-  int Enable(bool enable);
-  bool is_enabled() const;
-
-  // Recommended settings for particular audio routes. In general, the louder
-  // the echo is expected to be, the higher this value should be set. The
-  // preferred setting may vary from device to device.
-  enum RoutingMode {
-    kQuietEarpieceOrHeadset,
-    kEarpiece,
-    kLoudEarpiece,
-    kSpeakerphone,
-    kLoudSpeakerphone
-  };
-
-  // Sets echo control appropriate for the audio routing |mode| on the device.
-  // It can and should be updated during a call if the audio routing changes.
-  int set_routing_mode(RoutingMode mode);
-  RoutingMode routing_mode() const;
-
-  // Comfort noise replaces suppressed background noise to maintain a
-  // consistent signal level.
-  int enable_comfort_noise(bool enable);
-  bool is_comfort_noise_enabled() const;
-
-  void ProcessRenderAudio(rtc::ArrayView<const int16_t> packed_render_audio);
-  int ProcessCaptureAudio(AudioBuffer* audio, int stream_delay_ms);
-
-  void Initialize(int sample_rate_hz,
-                  size_t num_reverse_channels,
-                  size_t num_output_channels);
-
-  static void PackRenderAudioBuffer(const AudioBuffer* audio,
-                                    size_t num_output_channels,
-                                    size_t num_channels,
-                                    std::vector<int16_t>* packed_buffer);
-
-  static size_t NumCancellersRequired(size_t num_output_channels,
-                                      size_t num_reverse_channels);
-
- private:
-  class Canceller;
-  struct StreamProperties;
-
-  int Configure();
-
-  bool enabled_ = false;
-
-  RoutingMode routing_mode_;
-  bool comfort_noise_enabled_;
-
-  std::vector<std::unique_ptr<Canceller>> cancellers_;
-  std::unique_ptr<StreamProperties> stream_properties_;
-};
-}  // namespace webrtc
-
-#endif  // MODULES_AUDIO_PROCESSING_ECHO_CONTROL_MOBILE_IMPL_H_
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/echo_detector/circular_buffer.cc b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/echo_detector/circular_buffer.cc
deleted file mode 100644
index a6d10edfe2..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/echo_detector/circular_buffer.cc
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- *  Copyright (c) 2016 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#include "modules/audio_processing/echo_detector/circular_buffer.h"
-
-#include <algorithm>
-
-#include "rtc_base/checks.h"
-
-namespace webrtc {
-
-CircularBuffer::CircularBuffer(size_t size) : buffer_(size) {}
-CircularBuffer::~CircularBuffer() = default;
-
-void CircularBuffer::Push(float value) {
-  buffer_[next_insertion_index_] = value;
-  ++next_insertion_index_;
-  next_insertion_index_ %= buffer_.size();
-  RTC_DCHECK_LT(next_insertion_index_, buffer_.size());
-  nr_elements_in_buffer_ = std::min(nr_elements_in_buffer_ + 1, buffer_.size());
-  RTC_DCHECK_LE(nr_elements_in_buffer_, buffer_.size());
-}
-
-absl::optional<float> CircularBuffer::Pop() {
-  if (nr_elements_in_buffer_ == 0) {
-    return absl::nullopt;
-  }
-  const size_t index =
-      (buffer_.size() + next_insertion_index_ - nr_elements_in_buffer_) %
-      buffer_.size();
-  RTC_DCHECK_LT(index, buffer_.size());
-  --nr_elements_in_buffer_;
-  return buffer_[index];
-}
-
-void CircularBuffer::Clear() {
-  std::fill(buffer_.begin(), buffer_.end(), 0.f);
-  next_insertion_index_ = 0;
-  nr_elements_in_buffer_ = 0;
-}
-
-}  // namespace webrtc
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/echo_detector/circular_buffer.h b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/echo_detector/circular_buffer.h
deleted file mode 100644
index c52311f863..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/echo_detector/circular_buffer.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- *  Copyright (c) 2016 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#ifndef MODULES_AUDIO_PROCESSING_ECHO_DETECTOR_CIRCULAR_BUFFER_H_
-#define MODULES_AUDIO_PROCESSING_ECHO_DETECTOR_CIRCULAR_BUFFER_H_
-
-#include <stddef.h>
-#include <vector>
-
-#include "absl/types/optional.h"
-
-namespace webrtc {
-
-// Ring buffer containing floating point values.
-struct CircularBuffer {
- public:
-  explicit CircularBuffer(size_t size);
-  ~CircularBuffer();
-
-  void Push(float value);
-  absl::optional<float> Pop();
-  size_t Size() const { return nr_elements_in_buffer_; }
-  // This function fills the buffer with zeros, but does not change its size.
-  void Clear();
-
- private:
-  std::vector<float> buffer_;
-  size_t next_insertion_index_ = 0;
-  // This is the number of elements that have been pushed into the circular
-  // buffer, not the allocated buffer size.
-  size_t nr_elements_in_buffer_ = 0;
-};
-
-}  // namespace webrtc
-
-#endif  // MODULES_AUDIO_PROCESSING_ECHO_DETECTOR_CIRCULAR_BUFFER_H_
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/echo_detector/mean_variance_estimator.cc b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/echo_detector/mean_variance_estimator.cc
deleted file mode 100644
index a85740387b..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/echo_detector/mean_variance_estimator.cc
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- *  Copyright (c) 2016 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#include "modules/audio_processing/echo_detector/mean_variance_estimator.h"
-
-#include <math.h>
-
-#include "rtc_base/checks.h"
-
-namespace webrtc {
-namespace {
-
-// Parameter controlling the adaptation speed.
-constexpr float kAlpha = 0.001f;
-
-}  // namespace
-
-void MeanVarianceEstimator::Update(float value) {
-  mean_ = (1.f - kAlpha) * mean_ + kAlpha * value;
-  variance_ =
-      (1.f - kAlpha) * variance_ + kAlpha * (value - mean_) * (value - mean_);
-  RTC_DCHECK(isfinite(mean_));
-  RTC_DCHECK(isfinite(variance_));
-}
-
-float MeanVarianceEstimator::std_deviation() const {
-  RTC_DCHECK_GE(variance_, 0.f);
-  return sqrtf(variance_);
-}
-
-float MeanVarianceEstimator::mean() const {
-  return mean_;
-}
-
-void MeanVarianceEstimator::Clear() {
-  mean_ = 0.f;
-  variance_ = 0.f;
-}
-
-}  // namespace webrtc
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/echo_detector/mean_variance_estimator.h b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/echo_detector/mean_variance_estimator.h
deleted file mode 100644
index 7f793df1e8..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/echo_detector/mean_variance_estimator.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- *  Copyright (c) 2016 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#ifndef MODULES_AUDIO_PROCESSING_ECHO_DETECTOR_MEAN_VARIANCE_ESTIMATOR_H_
-#define MODULES_AUDIO_PROCESSING_ECHO_DETECTOR_MEAN_VARIANCE_ESTIMATOR_H_
-
-namespace webrtc {
-
-// This class iteratively estimates the mean and variance of a signal.
-class MeanVarianceEstimator {
- public:
-  void Update(float value);
-  float std_deviation() const;
-  float mean() const;
-  void Clear();
-
- private:
-  // Estimate of the expected value of the input values.
-  float mean_ = 0.f;
-  // Estimate of the variance of the input values.
-  float variance_ = 0.f;
-};
-
-}  // namespace webrtc
-
-#endif  // MODULES_AUDIO_PROCESSING_ECHO_DETECTOR_MEAN_VARIANCE_ESTIMATOR_H_
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/echo_detector/moving_max.cc b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/echo_detector/moving_max.cc
deleted file mode 100644
index 3054e98bd3..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/echo_detector/moving_max.cc
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- *  Copyright (c) 2017 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#include "modules/audio_processing/echo_detector/moving_max.h"
-
-#include "rtc_base/checks.h"
-
-namespace webrtc {
-namespace {
-
-// Parameter for controlling how fast the estimated maximum decays after the
-// previous maximum is no longer valid. With a value of 0.99, the maximum will
-// decay to 1% of its former value after 460 updates.
-constexpr float kDecayFactor = 0.99f;
-
-}  // namespace
-
-MovingMax::MovingMax(size_t window_size) : window_size_(window_size) {
-  RTC_DCHECK_GT(window_size, 0);
-}
-
-MovingMax::~MovingMax() {}
-
-void MovingMax::Update(float value) {
-  if (counter_ >= window_size_ - 1) {
-    max_value_ *= kDecayFactor;
-  } else {
-    ++counter_;
-  }
-  if (value > max_value_) {
-    max_value_ = value;
-    counter_ = 0;
-  }
-}
-
-float MovingMax::max() const {
-  return max_value_;
-}
-
-void MovingMax::Clear() {
-  max_value_ = 0.f;
-  counter_ = 0;
-}
-
-}  // namespace webrtc
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/echo_detector/moving_max.h b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/echo_detector/moving_max.h
deleted file mode 100644
index f7d8ee8137..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/echo_detector/moving_max.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- *  Copyright (c) 2017 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#ifndef MODULES_AUDIO_PROCESSING_ECHO_DETECTOR_MOVING_MAX_H_
-#define MODULES_AUDIO_PROCESSING_ECHO_DETECTOR_MOVING_MAX_H_
-
-#include <stddef.h>
-
-namespace webrtc {
-
-class MovingMax {
- public:
-  explicit MovingMax(size_t window_size);
-  ~MovingMax();
-
-  void Update(float value);
-  float max() const;
-  // Reset all of the state in this class.
-  void Clear();
-
- private:
-  float max_value_ = 0.f;
-  size_t counter_ = 0;
-  size_t window_size_ = 1;
-};
-
-}  // namespace webrtc
-
-#endif  // MODULES_AUDIO_PROCESSING_ECHO_DETECTOR_MOVING_MAX_H_
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/echo_detector/normalized_covariance_estimator.cc b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/echo_detector/normalized_covariance_estimator.cc
deleted file mode 100644
index 8ec9fe9f0b..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/echo_detector/normalized_covariance_estimator.cc
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- *  Copyright (c) 2016 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#include "modules/audio_processing/echo_detector/normalized_covariance_estimator.h"
-
-#include <math.h>
-
-#include "rtc_base/checks.h"
-
-namespace webrtc {
-namespace {
-
-// Parameter controlling the adaptation speed.
-constexpr float kAlpha = 0.001f;
-
-}  // namespace
-
-void NormalizedCovarianceEstimator::Update(float x,
-                                           float x_mean,
-                                           float x_sigma,
-                                           float y,
-                                           float y_mean,
-                                           float y_sigma) {
-  covariance_ =
-      (1.f - kAlpha) * covariance_ + kAlpha * (x - x_mean) * (y - y_mean);
-  normalized_cross_correlation_ = covariance_ / (x_sigma * y_sigma + .0001f);
-  RTC_DCHECK(isfinite(covariance_));
-  RTC_DCHECK(isfinite(normalized_cross_correlation_));
-}
-
-void NormalizedCovarianceEstimator::Clear() {
-  covariance_ = 0.f;
-  normalized_cross_correlation_ = 0.f;
-}
-
-}  // namespace webrtc
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/echo_detector/normalized_covariance_estimator.h b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/echo_detector/normalized_covariance_estimator.h
deleted file mode 100644
index e3c36d88ba..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/echo_detector/normalized_covariance_estimator.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- *  Copyright (c) 2016 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#ifndef MODULES_AUDIO_PROCESSING_ECHO_DETECTOR_NORMALIZED_COVARIANCE_ESTIMATOR_H_
-#define MODULES_AUDIO_PROCESSING_ECHO_DETECTOR_NORMALIZED_COVARIANCE_ESTIMATOR_H_
-
-namespace webrtc {
-
-// This class iteratively estimates the normalized covariance between two
-// signals.
-class NormalizedCovarianceEstimator {
- public:
-  void Update(float x,
-              float x_mean,
-              float x_var,
-              float y,
-              float y_mean,
-              float y_var);
-  // This function returns an estimate of the Pearson product-moment correlation
-  // coefficient of the two signals.
-  float normalized_cross_correlation() const {
-    return normalized_cross_correlation_;
-  }
-  float covariance() const { return covariance_; }
-  // This function resets the estimated values to zero.
-  void Clear();
-
- private:
-  float normalized_cross_correlation_ = 0.f;
-  // Estimate of the covariance value.
-  float covariance_ = 0.f;
-};
-
-}  // namespace webrtc
-
-#endif  // MODULES_AUDIO_PROCESSING_ECHO_DETECTOR_NORMALIZED_COVARIANCE_ESTIMATOR_H_
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/gain_control_for_experimental_agc.cc b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/gain_control_for_experimental_agc.cc
deleted file mode 100644
index 1479d58b54..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/gain_control_for_experimental_agc.cc
+++ /dev/null
@@ -1,123 +0,0 @@
-/*
- *  Copyright (c) 2016 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#include "modules/audio_processing/gain_control_for_experimental_agc.h"
-
-#include "modules/audio_processing/include/audio_processing.h"
-#include "modules/audio_processing/logging/apm_data_dumper.h"
-#include "rtc_base/atomicops.h"
-#include "rtc_base/criticalsection.h"
-
-namespace webrtc {
-
-int GainControlForExperimentalAgc::instance_counter_ = 0;
-
-GainControlForExperimentalAgc::GainControlForExperimentalAgc(
-    GainControl* gain_control,
-    rtc::CriticalSection* crit_capture)
-    : data_dumper_(
-          new ApmDataDumper(rtc::AtomicOps::Increment(&instance_counter_))),
-      real_gain_control_(gain_control),
-      volume_(0),
-      crit_capture_(crit_capture) {}
-
-GainControlForExperimentalAgc::~GainControlForExperimentalAgc() = default;
-
-int GainControlForExperimentalAgc::Enable(bool enable) {
-  return real_gain_control_->Enable(enable);
-}
-
-bool GainControlForExperimentalAgc::is_enabled() const {
-  return real_gain_control_->is_enabled();
-}
-
-int GainControlForExperimentalAgc::set_stream_analog_level(int level) {
-  rtc::CritScope cs_capture(crit_capture_);
-  data_dumper_->DumpRaw("experimental_gain_control_set_stream_analog_level", 1,
-                        &level);
-  do_log_level_ = true;
-  volume_ = level;
-  return AudioProcessing::kNoError;
-}
-
-int GainControlForExperimentalAgc::stream_analog_level() {
-  rtc::CritScope cs_capture(crit_capture_);
-  if (do_log_level_) {
-    data_dumper_->DumpRaw("experimental_gain_control_stream_analog_level", 1,
-                          &volume_);
-    do_log_level_ = false;
-  }
-  return volume_;
-}
-
-int GainControlForExperimentalAgc::set_mode(Mode mode) {
-  return AudioProcessing::kNoError;
-}
-
-GainControl::Mode GainControlForExperimentalAgc::mode() const {
-  return GainControl::kAdaptiveAnalog;
-}
-
-int GainControlForExperimentalAgc::set_target_level_dbfs(int level) {
-  return AudioProcessing::kNoError;
-}
-
-int GainControlForExperimentalAgc::target_level_dbfs() const {
-  return real_gain_control_->target_level_dbfs();
-}
-
-int GainControlForExperimentalAgc::set_compression_gain_db(int gain) {
-  return AudioProcessing::kNoError;
-}
-
-int GainControlForExperimentalAgc::compression_gain_db() const {
-  return real_gain_control_->compression_gain_db();
-}
-
-int GainControlForExperimentalAgc::enable_limiter(bool enable) {
-  return AudioProcessing::kNoError;
-}
-
-bool GainControlForExperimentalAgc::is_limiter_enabled() const {
-  return real_gain_control_->is_limiter_enabled();
-}
-
-int GainControlForExperimentalAgc::set_analog_level_limits(int minimum,
-                                                           int maximum) {
-  return AudioProcessing::kNoError;
-}
-
-int GainControlForExperimentalAgc::analog_level_minimum() const {
-  return real_gain_control_->analog_level_minimum();
-}
-
-int GainControlForExperimentalAgc::analog_level_maximum() const {
-  return real_gain_control_->analog_level_maximum();
-}
-
-bool GainControlForExperimentalAgc::stream_is_saturated() const {
-  return real_gain_control_->stream_is_saturated();
-}
-
-void GainControlForExperimentalAgc::SetMicVolume(int volume) {
-  rtc::CritScope cs_capture(crit_capture_);
-  volume_ = volume;
-}
-
-int GainControlForExperimentalAgc::GetMicVolume() {
-  rtc::CritScope cs_capture(crit_capture_);
-  return volume_;
-}
-
-void GainControlForExperimentalAgc::Initialize() {
-  data_dumper_->InitiateNewSetOfRecordings();
-}
-
-}  // namespace webrtc
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/gain_control_for_experimental_agc.h b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/gain_control_for_experimental_agc.h
deleted file mode 100644
index b20fbc96f9..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/gain_control_for_experimental_agc.h
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- *  Copyright (c) 2016 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#ifndef MODULES_AUDIO_PROCESSING_GAIN_CONTROL_FOR_EXPERIMENTAL_AGC_H_
-#define MODULES_AUDIO_PROCESSING_GAIN_CONTROL_FOR_EXPERIMENTAL_AGC_H_
-
-#include "modules/audio_processing/agc/agc_manager_direct.h"
-#include "modules/audio_processing/include/audio_processing.h"
-#include "rtc_base/constructormagic.h"
-#include "rtc_base/criticalsection.h"
-#include "rtc_base/thread_checker.h"
-
-namespace webrtc {
-
-class ApmDataDumper;
-
-// This class has two main purposes:
-//
-// 1) It is returned instead of the real GainControl after the new AGC has been
-//    enabled in order to prevent an outside user from overriding compression
-//    settings. It doesn't do anything in its implementation, except for
-//    delegating the const methods and Enable calls to the real GainControl, so
-//    AGC can still be disabled.
-//
-// 2) It is injected into AgcManagerDirect and implements volume callbacks for
-//    getting and setting the volume level. It just caches this value to be used
-//    in VoiceEngine later.
-class GainControlForExperimentalAgc : public GainControl,
-                                      public VolumeCallbacks {
- public:
-  GainControlForExperimentalAgc(GainControl* gain_control,
-                                rtc::CriticalSection* crit_capture);
-  ~GainControlForExperimentalAgc() override;
-
-  // GainControl implementation.
-  int Enable(bool enable) override;
-  bool is_enabled() const override;
-  int set_stream_analog_level(int level) override;
-  int stream_analog_level() override;
-  int set_mode(Mode mode) override;
-  Mode mode() const override;
-  int set_target_level_dbfs(int level) override;
-  int target_level_dbfs() const override;
-  int set_compression_gain_db(int gain) override;
-  int compression_gain_db() const override;
-  int enable_limiter(bool enable) override;
-  bool is_limiter_enabled() const override;
-  int set_analog_level_limits(int minimum, int maximum) override;
-  int analog_level_minimum() const override;
-  int analog_level_maximum() const override;
-  bool stream_is_saturated() const override;
-
-  // VolumeCallbacks implementation.
-  void SetMicVolume(int volume) override;
-  int GetMicVolume() override;
-
-  void Initialize();
-
- private:
-  std::unique_ptr<ApmDataDumper> data_dumper_;
-  GainControl* real_gain_control_;
-  int volume_;
-  rtc::CriticalSection* crit_capture_;
-  bool do_log_level_ = true;
-  static int instance_counter_;
-  RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(GainControlForExperimentalAgc);
-};
-
-}  // namespace webrtc
-
-#endif  // MODULES_AUDIO_PROCESSING_GAIN_CONTROL_FOR_EXPERIMENTAL_AGC_H_
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/gain_control_impl.cc b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/gain_control_impl.cc
deleted file mode 100644
index d5118ba073..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/gain_control_impl.cc
+++ /dev/null
@@ -1,439 +0,0 @@
-/*
- *  Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#include "modules/audio_processing/gain_control_impl.h"
-
-#include <cstdint>
-
-#include "absl/types/optional.h"
-#include "modules/audio_processing/agc/legacy/gain_control.h"
-#include "modules/audio_processing/audio_buffer.h"
-#include "modules/audio_processing/include/audio_processing.h"
-#include "modules/audio_processing/logging/apm_data_dumper.h"
-#include "rtc_base/checks.h"
-#include "rtc_base/constructormagic.h"
-
-namespace webrtc {
-
-typedef void Handle;
-
-namespace {
-int16_t MapSetting(GainControl::Mode mode) {
-  switch (mode) {
-    case GainControl::kAdaptiveAnalog:
-      return kAgcModeAdaptiveAnalog;
-    case GainControl::kAdaptiveDigital:
-      return kAgcModeAdaptiveDigital;
-    case GainControl::kFixedDigital:
-      return kAgcModeFixedDigital;
-  }
-  RTC_NOTREACHED();
-  return -1;
-}
-
-}  // namespace
-
-class GainControlImpl::GainController {
- public:
-  explicit GainController() {
-    state_ = WebRtcAgc_Create();
-    RTC_CHECK(state_);
-  }
-
-  ~GainController() {
-    RTC_DCHECK(state_);
-    WebRtcAgc_Free(state_);
-  }
-
-  Handle* state() {
-    RTC_DCHECK(state_);
-    return state_;
-  }
-
-  void Initialize(int minimum_capture_level,
-                  int maximum_capture_level,
-                  Mode mode,
-                  int sample_rate_hz,
-                  int capture_level) {
-    RTC_DCHECK(state_);
-    int error =
-        WebRtcAgc_Init(state_, minimum_capture_level, maximum_capture_level,
-                       MapSetting(mode), sample_rate_hz);
-    RTC_DCHECK_EQ(0, error);
-
-    set_capture_level(capture_level);
-  }
-
-  void set_capture_level(int capture_level) { capture_level_ = capture_level; }
-
-  int get_capture_level() {
-    RTC_DCHECK(capture_level_);
-    return *capture_level_;
-  }
-
- private:
-  Handle* state_;
-  // TODO(peah): Remove the optional once the initialization is moved into the
-  // ctor.
-  absl::optional<int> capture_level_;
-
-  RTC_DISALLOW_COPY_AND_ASSIGN(GainController);
-};
-
-int GainControlImpl::instance_counter_ = 0;
-
-GainControlImpl::GainControlImpl(rtc::CriticalSection* crit_render,
-                                 rtc::CriticalSection* crit_capture)
-    : crit_render_(crit_render),
-      crit_capture_(crit_capture),
-      data_dumper_(new ApmDataDumper(instance_counter_)),
-      mode_(kAdaptiveAnalog),
-      minimum_capture_level_(0),
-      maximum_capture_level_(255),
-      limiter_enabled_(true),
-      target_level_dbfs_(3),
-      compression_gain_db_(9),
-      analog_capture_level_(0),
-      was_analog_level_set_(false),
-      stream_is_saturated_(false) {
-  RTC_DCHECK(crit_render);
-  RTC_DCHECK(crit_capture);
-}
-
-GainControlImpl::~GainControlImpl() {}
-
-void GainControlImpl::ProcessRenderAudio(
-    rtc::ArrayView<const int16_t> packed_render_audio) {
-  rtc::CritScope cs_capture(crit_capture_);
-  if (!enabled_) {
-    return;
-  }
-
-  for (auto& gain_controller : gain_controllers_) {
-    WebRtcAgc_AddFarend(gain_controller->state(), packed_render_audio.data(),
-                        packed_render_audio.size());
-  }
-}
-
-void GainControlImpl::PackRenderAudioBuffer(
-    AudioBuffer* audio,
-    std::vector<int16_t>* packed_buffer) {
-  RTC_DCHECK_GE(160, audio->num_frames_per_band());
-
-  packed_buffer->clear();
-  packed_buffer->insert(
-      packed_buffer->end(), audio->mixed_low_pass_data(),
-      (audio->mixed_low_pass_data() + audio->num_frames_per_band()));
-}
-
-int GainControlImpl::AnalyzeCaptureAudio(AudioBuffer* audio) {
-  rtc::CritScope cs(crit_capture_);
-
-  if (!enabled_) {
-    return AudioProcessing::kNoError;
-  }
-
-  RTC_DCHECK(num_proc_channels_);
-  RTC_DCHECK_GE(160, audio->num_frames_per_band());
-  RTC_DCHECK_EQ(audio->num_channels(), *num_proc_channels_);
-  RTC_DCHECK_LE(*num_proc_channels_, gain_controllers_.size());
-
-  if (mode_ == kAdaptiveAnalog) {
-    int capture_channel = 0;
-    for (auto& gain_controller : gain_controllers_) {
-      gain_controller->set_capture_level(analog_capture_level_);
-      int err = WebRtcAgc_AddMic(
-          gain_controller->state(), audio->split_bands(capture_channel),
-          audio->num_bands(), audio->num_frames_per_band());
-
-      if (err != AudioProcessing::kNoError) {
-        return AudioProcessing::kUnspecifiedError;
-      }
-      ++capture_channel;
-    }
-  } else if (mode_ == kAdaptiveDigital) {
-    int capture_channel = 0;
-    for (auto& gain_controller : gain_controllers_) {
-      int32_t capture_level_out = 0;
-      int err = WebRtcAgc_VirtualMic(
-          gain_controller->state(), audio->split_bands(capture_channel),
-          audio->num_bands(), audio->num_frames_per_band(),
-          analog_capture_level_, &capture_level_out);
-
-      gain_controller->set_capture_level(capture_level_out);
-
-      if (err != AudioProcessing::kNoError) {
-        return AudioProcessing::kUnspecifiedError;
-      }
-      ++capture_channel;
-    }
-  }
-
-  return AudioProcessing::kNoError;
-}
-
-int GainControlImpl::ProcessCaptureAudio(AudioBuffer* audio,
-                                         bool stream_has_echo) {
-  rtc::CritScope cs(crit_capture_);
-
-  if (!enabled_) {
-    return AudioProcessing::kNoError;
-  }
-
-  if (mode_ == kAdaptiveAnalog && !was_analog_level_set_) {
-    return AudioProcessing::kStreamParameterNotSetError;
-  }
-
-  RTC_DCHECK(num_proc_channels_);
-  RTC_DCHECK_GE(160, audio->num_frames_per_band());
-  RTC_DCHECK_EQ(audio->num_channels(), *num_proc_channels_);
-
-  stream_is_saturated_ = false;
-  int capture_channel = 0;
-  for (auto& gain_controller : gain_controllers_) {
-    int32_t capture_level_out = 0;
-    uint8_t saturation_warning = 0;
-
-    // The call to stream_has_echo() is ok from a deadlock perspective
-    // as the capture lock is allready held.
-    int err = WebRtcAgc_Process(
-        gain_controller->state(), audio->split_bands_const(capture_channel),
-        audio->num_bands(), audio->num_frames_per_band(),
-        audio->split_bands(capture_channel),
-        gain_controller->get_capture_level(), &capture_level_out,
-        stream_has_echo, &saturation_warning);
-
-    if (err != AudioProcessing::kNoError) {
-      return AudioProcessing::kUnspecifiedError;
-    }
-
-    gain_controller->set_capture_level(capture_level_out);
-    if (saturation_warning == 1) {
-      stream_is_saturated_ = true;
-    }
-
-    ++capture_channel;
-  }
-
-  RTC_DCHECK_LT(0ul, *num_proc_channels_);
-  if (mode_ == kAdaptiveAnalog) {
-    // Take the analog level to be the average across the handles.
-    analog_capture_level_ = 0;
-    for (auto& gain_controller : gain_controllers_) {
-      analog_capture_level_ += gain_controller->get_capture_level();
-    }
-
-    analog_capture_level_ /= (*num_proc_channels_);
-  }
-
-  was_analog_level_set_ = false;
-  return AudioProcessing::kNoError;
-}
-
-int GainControlImpl::compression_gain_db() const {
-  rtc::CritScope cs(crit_capture_);
-  return compression_gain_db_;
-}
-
-// TODO(ajm): ensure this is called under kAdaptiveAnalog.
-int GainControlImpl::set_stream_analog_level(int level) {
-  rtc::CritScope cs(crit_capture_);
-  data_dumper_->DumpRaw("gain_control_set_stream_analog_level", 1, &level);
-
-  was_analog_level_set_ = true;
-  if (level < minimum_capture_level_ || level > maximum_capture_level_) {
-    return AudioProcessing::kBadParameterError;
-  }
-  analog_capture_level_ = level;
-
-  return AudioProcessing::kNoError;
-}
-
-int GainControlImpl::stream_analog_level() {
-  rtc::CritScope cs(crit_capture_);
-  data_dumper_->DumpRaw("gain_control_stream_analog_level", 1,
-                        &analog_capture_level_);
-  // TODO(ajm): enable this assertion?
-  // RTC_DCHECK_EQ(kAdaptiveAnalog, mode_);
-
-  return analog_capture_level_;
-}
-
-int GainControlImpl::Enable(bool enable) {
-  rtc::CritScope cs_render(crit_render_);
-  rtc::CritScope cs_capture(crit_capture_);
-  if (enable && !enabled_) {
-    enabled_ = enable;  // Must be set before Initialize() is called.
-
-    RTC_DCHECK(num_proc_channels_);
-    RTC_DCHECK(sample_rate_hz_);
-    Initialize(*num_proc_channels_, *sample_rate_hz_);
-  } else {
-    enabled_ = enable;
-  }
-  return AudioProcessing::kNoError;
-}
-
-bool GainControlImpl::is_enabled() const {
-  rtc::CritScope cs(crit_capture_);
-  return enabled_;
-}
-
-int GainControlImpl::set_mode(Mode mode) {
-  rtc::CritScope cs_render(crit_render_);
-  rtc::CritScope cs_capture(crit_capture_);
-  if (MapSetting(mode) == -1) {
-    return AudioProcessing::kBadParameterError;
-  }
-
-  mode_ = mode;
-  RTC_DCHECK(num_proc_channels_);
-  RTC_DCHECK(sample_rate_hz_);
-  Initialize(*num_proc_channels_, *sample_rate_hz_);
-  return AudioProcessing::kNoError;
-}
-
-GainControl::Mode GainControlImpl::mode() const {
-  rtc::CritScope cs(crit_capture_);
-  return mode_;
-}
-
-int GainControlImpl::set_analog_level_limits(int minimum, int maximum) {
-  if (minimum < 0) {
-    return AudioProcessing::kBadParameterError;
-  }
-
-  if (maximum > 65535) {
-    return AudioProcessing::kBadParameterError;
-  }
-
-  if (maximum < minimum) {
-    return AudioProcessing::kBadParameterError;
-  }
-
-  size_t num_proc_channels_local = 0u;
-  int sample_rate_hz_local = 0;
-  {
-    rtc::CritScope cs(crit_capture_);
-
-    minimum_capture_level_ = minimum;
-    maximum_capture_level_ = maximum;
-
-    RTC_DCHECK(num_proc_channels_);
-    RTC_DCHECK(sample_rate_hz_);
-    num_proc_channels_local = *num_proc_channels_;
-    sample_rate_hz_local = *sample_rate_hz_;
-  }
-  Initialize(num_proc_channels_local, sample_rate_hz_local);
-  return AudioProcessing::kNoError;
-}
-
-int GainControlImpl::analog_level_minimum() const {
-  rtc::CritScope cs(crit_capture_);
-  return minimum_capture_level_;
-}
-
-int GainControlImpl::analog_level_maximum() const {
-  rtc::CritScope cs(crit_capture_);
-  return maximum_capture_level_;
-}
-
-bool GainControlImpl::stream_is_saturated() const {
-  rtc::CritScope cs(crit_capture_);
-  return stream_is_saturated_;
-}
-
-int GainControlImpl::set_target_level_dbfs(int level) {
-  if (level > 31 || level < 0) {
-    return AudioProcessing::kBadParameterError;
-  }
-  {
-    rtc::CritScope cs(crit_capture_);
-    target_level_dbfs_ = level;
-  }
-  return Configure();
-}
-
-int GainControlImpl::target_level_dbfs() const {
-  rtc::CritScope cs(crit_capture_);
-  return target_level_dbfs_;
-}
-
-int GainControlImpl::set_compression_gain_db(int gain) {
-  if (gain < 0 || gain > 90) {
-    return AudioProcessing::kBadParameterError;
-  }
-  {
-    rtc::CritScope cs(crit_capture_);
-    compression_gain_db_ = gain;
-  }
-  return Configure();
-}
-
-int GainControlImpl::enable_limiter(bool enable) {
-  {
-    rtc::CritScope cs(crit_capture_);
-    limiter_enabled_ = enable;
-  }
-  return Configure();
-}
-
-bool GainControlImpl::is_limiter_enabled() const {
-  rtc::CritScope cs(crit_capture_);
-  return limiter_enabled_;
-}
-
-void GainControlImpl::Initialize(size_t num_proc_channels, int sample_rate_hz) {
-  rtc::CritScope cs_render(crit_render_);
-  rtc::CritScope cs_capture(crit_capture_);
-  data_dumper_->InitiateNewSetOfRecordings();
-
-  num_proc_channels_ = num_proc_channels;
-  sample_rate_hz_ = sample_rate_hz;
-
-  if (!enabled_) {
-    return;
-  }
-
-  gain_controllers_.resize(*num_proc_channels_);
-  for (auto& gain_controller : gain_controllers_) {
-    if (!gain_controller) {
-      gain_controller.reset(new GainController());
-    }
-    gain_controller->Initialize(minimum_capture_level_, maximum_capture_level_,
-                                mode_, *sample_rate_hz_, analog_capture_level_);
-  }
-
-  Configure();
-}
-
-int GainControlImpl::Configure() {
-  rtc::CritScope cs_render(crit_render_);
-  rtc::CritScope cs_capture(crit_capture_);
-  WebRtcAgcConfig config;
-  // TODO(ajm): Flip the sign here (since AGC expects a positive value) if we
-  //            change the interface.
-  // RTC_DCHECK_LE(target_level_dbfs_, 0);
-  // config.targetLevelDbfs = static_cast<int16_t>(-target_level_dbfs_);
-  config.targetLevelDbfs = static_cast<int16_t>(target_level_dbfs_);
-  config.compressionGaindB = static_cast<int16_t>(compression_gain_db_);
-  config.limiterEnable = limiter_enabled_;
-
-  int error = AudioProcessing::kNoError;
-  for (auto& gain_controller : gain_controllers_) {
-    const int handle_error =
-        WebRtcAgc_set_config(gain_controller->state(), config);
-    if (handle_error != AudioProcessing::kNoError) {
-      error = handle_error;
-    }
-  }
-  return error;
-}
-}  // namespace webrtc
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/gain_control_impl.h b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/gain_control_impl.h
deleted file mode 100644
index c21d911326..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/gain_control_impl.h
+++ /dev/null
@@ -1,99 +0,0 @@
-/*
- *  Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#ifndef MODULES_AUDIO_PROCESSING_GAIN_CONTROL_IMPL_H_
-#define MODULES_AUDIO_PROCESSING_GAIN_CONTROL_IMPL_H_
-
-#include <stddef.h>
-#include <stdint.h>
-#include <memory>
-#include <vector>
-
-#include "absl/types/optional.h"
-#include "api/array_view.h"
-#include "modules/audio_processing/include/gain_control.h"
-#include "rtc_base/constructormagic.h"
-#include "rtc_base/criticalsection.h"
-#include "rtc_base/thread_annotations.h"
-
-namespace webrtc {
-
-class ApmDataDumper;
-class AudioBuffer;
-
-class GainControlImpl : public GainControl {
- public:
-  GainControlImpl(rtc::CriticalSection* crit_render,
-                  rtc::CriticalSection* crit_capture);
-  ~GainControlImpl() override;
-
-  void ProcessRenderAudio(rtc::ArrayView<const int16_t> packed_render_audio);
-  int AnalyzeCaptureAudio(AudioBuffer* audio);
-  int ProcessCaptureAudio(AudioBuffer* audio, bool stream_has_echo);
-
-  void Initialize(size_t num_proc_channels, int sample_rate_hz);
-
-  static void PackRenderAudioBuffer(AudioBuffer* audio,
-                                    std::vector<int16_t>* packed_buffer);
-
-  // GainControl implementation.
-  bool is_enabled() const override;
-  int stream_analog_level() override;
-  bool is_limiter_enabled() const override;
-  Mode mode() const override;
-
-  int compression_gain_db() const override;
-
- private:
-  class GainController;
-
-  // GainControl implementation.
-  int Enable(bool enable) override;
-  int set_stream_analog_level(int level) override;
-  int set_mode(Mode mode) override;
-  int set_target_level_dbfs(int level) override;
-  int target_level_dbfs() const override;
-  int set_compression_gain_db(int gain) override;
-  int enable_limiter(bool enable) override;
-  int set_analog_level_limits(int minimum, int maximum) override;
-  int analog_level_minimum() const override;
-  int analog_level_maximum() const override;
-  bool stream_is_saturated() const override;
-
-  int Configure();
-
-  rtc::CriticalSection* const crit_render_ RTC_ACQUIRED_BEFORE(crit_capture_);
-  rtc::CriticalSection* const crit_capture_;
-
-  std::unique_ptr<ApmDataDumper> data_dumper_;
-
-  bool enabled_ = false;
-
-  Mode mode_ RTC_GUARDED_BY(crit_capture_);
-  int minimum_capture_level_ RTC_GUARDED_BY(crit_capture_);
-  int maximum_capture_level_ RTC_GUARDED_BY(crit_capture_);
-  bool limiter_enabled_ RTC_GUARDED_BY(crit_capture_);
-  int target_level_dbfs_ RTC_GUARDED_BY(crit_capture_);
-  int compression_gain_db_ RTC_GUARDED_BY(crit_capture_);
-  int analog_capture_level_ RTC_GUARDED_BY(crit_capture_);
-  bool was_analog_level_set_ RTC_GUARDED_BY(crit_capture_);
-  bool stream_is_saturated_ RTC_GUARDED_BY(crit_capture_);
-
-  std::vector<std::unique_ptr<GainController>> gain_controllers_;
-
-  absl::optional<size_t> num_proc_channels_ RTC_GUARDED_BY(crit_capture_);
-  absl::optional<int> sample_rate_hz_ RTC_GUARDED_BY(crit_capture_);
-
-  static int instance_counter_;
-  RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(GainControlImpl);
-};
-}  // namespace webrtc
-
-#endif  // MODULES_AUDIO_PROCESSING_GAIN_CONTROL_IMPL_H_
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/gain_controller2.cc b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/gain_controller2.cc
deleted file mode 100644
index 9b8cf45fc6..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/gain_controller2.cc
+++ /dev/null
@@ -1,117 +0,0 @@
-/*
- *  Copyright (c) 2017 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#include "modules/audio_processing/gain_controller2.h"
-
-#include "common_audio/include/audio_util.h"
-#include "modules/audio_processing/audio_buffer.h"
-#include "modules/audio_processing/include/audio_frame_view.h"
-#include "modules/audio_processing/logging/apm_data_dumper.h"
-#include "rtc_base/atomicops.h"
-#include "rtc_base/checks.h"
-#include "rtc_base/strings/string_builder.h"
-
-namespace webrtc {
-
-int GainController2::instance_count_ = 0;
-
-GainController2::GainController2()
-    : data_dumper_(
-          new ApmDataDumper(rtc::AtomicOps::Increment(&instance_count_))),
-      gain_applier_(/*hard_clip_samples=*/false,
-                    /*initial_gain_factor=*/0.f),
-      adaptive_agc_(new AdaptiveAgc(data_dumper_.get())),
-      limiter_(static_cast<size_t>(48000), data_dumper_.get(), "Agc2") {}
-
-GainController2::~GainController2() = default;
-
-void GainController2::Initialize(int sample_rate_hz) {
-  RTC_DCHECK(sample_rate_hz == AudioProcessing::kSampleRate8kHz ||
-             sample_rate_hz == AudioProcessing::kSampleRate16kHz ||
-             sample_rate_hz == AudioProcessing::kSampleRate32kHz ||
-             sample_rate_hz == AudioProcessing::kSampleRate48kHz);
-  limiter_.SetSampleRate(sample_rate_hz);
-  data_dumper_->InitiateNewSetOfRecordings();
-  data_dumper_->DumpRaw("sample_rate_hz", sample_rate_hz);
-}
-
-void GainController2::Process(AudioBuffer* audio) {
-  AudioFrameView<float> float_frame(audio->channels_f(), audio->num_channels(),
-                                    audio->num_frames());
-  // Apply fixed gain first, then the adaptive one.
-  gain_applier_.ApplyGain(float_frame);
-  if (adaptive_digital_mode_) {
-    adaptive_agc_->Process(float_frame, limiter_.LastAudioLevel());
-  }
-  limiter_.Process(float_frame);
-}
-
-void GainController2::NotifyAnalogLevel(int level) {
-  if (analog_level_ != level && adaptive_digital_mode_) {
-    adaptive_agc_->Reset();
-  }
-  analog_level_ = level;
-}
-
-void GainController2::ApplyConfig(
-    const AudioProcessing::Config::GainController2& config) {
-  RTC_DCHECK(Validate(config))
-      << " the invalid config was " << ToString(config);
-
-  config_ = config;
-  if (config.fixed_digital.gain_db != config_.fixed_digital.gain_db) {
-    // Reset the limiter to quickly react on abrupt level changes caused by
-    // large changes of the fixed gain.
-    limiter_.Reset();
-  }
-  gain_applier_.SetGainFactor(DbToRatio(config_.fixed_digital.gain_db));
-  adaptive_digital_mode_ = config_.adaptive_digital.enabled;
-  adaptive_agc_.reset(new AdaptiveAgc(data_dumper_.get(), config_));
-}
-
-bool GainController2::Validate(
-    const AudioProcessing::Config::GainController2& config) {
-  return config.fixed_digital.gain_db >= 0.f &&
-         config.fixed_digital.gain_db < 50.f &&
-         config.adaptive_digital.extra_saturation_margin_db >= 0.f &&
-         config.adaptive_digital.extra_saturation_margin_db <= 100.f;
-}
-
-std::string GainController2::ToString(
-    const AudioProcessing::Config::GainController2& config) {
-  rtc::StringBuilder ss;
-  std::string adaptive_digital_level_estimator;
-  using LevelEstimatorType =
-      AudioProcessing::Config::GainController2::LevelEstimator;
-  switch (config.adaptive_digital.level_estimator) {
-    case LevelEstimatorType::kRms:
-      adaptive_digital_level_estimator = "RMS";
-      break;
-    case LevelEstimatorType::kPeak:
-      adaptive_digital_level_estimator = "peak";
-      break;
-  }
-  // clang-format off
-  // clang formatting doesn't respect custom nested style.
-  ss << "{"
-     << "enabled: " << (config.enabled ? "true" : "false") << ", "
-     << "fixed_digital: {gain_db: " << config.fixed_digital.gain_db << "}, "
-     << "adaptive_digital: {"
-      << "enabled: "
-        << (config.adaptive_digital.enabled ? "true" : "false") << ", "
-      << "level_estimator: " << adaptive_digital_level_estimator << ", "
-      << "extra_saturation_margin_db:"
-        << config.adaptive_digital.extra_saturation_margin_db << "}"
-      << "}";
-  // clang-format on
-  return ss.Release();
-}
-
-}  // namespace webrtc
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/gain_controller2.h b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/gain_controller2.h
deleted file mode 100644
index 013385d9d3..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/gain_controller2.h
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- *  Copyright (c) 2017 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#ifndef MODULES_AUDIO_PROCESSING_GAIN_CONTROLLER2_H_
-#define MODULES_AUDIO_PROCESSING_GAIN_CONTROLLER2_H_
-
-#include <memory>
-#include <string>
-
-#include "modules/audio_processing/agc2/adaptive_agc.h"
-#include "modules/audio_processing/agc2/gain_applier.h"
-#include "modules/audio_processing/agc2/limiter.h"
-#include "modules/audio_processing/include/audio_processing.h"
-#include "rtc_base/constructormagic.h"
-
-namespace webrtc {
-
-class ApmDataDumper;
-class AudioBuffer;
-
-// Gain Controller 2 aims to automatically adjust levels by acting on the
-// microphone gain and/or applying digital gain.
-class GainController2 {
- public:
-  GainController2();
-  ~GainController2();
-
-  void Initialize(int sample_rate_hz);
-  void Process(AudioBuffer* audio);
-  void NotifyAnalogLevel(int level);
-
-  void ApplyConfig(const AudioProcessing::Config::GainController2& config);
-  static bool Validate(const AudioProcessing::Config::GainController2& config);
-  static std::string ToString(
-      const AudioProcessing::Config::GainController2& config);
-
- private:
-  static int instance_count_;
-  std::unique_ptr<ApmDataDumper> data_dumper_;
-  AudioProcessing::Config::GainController2 config_;
-  GainApplier gain_applier_;
-  std::unique_ptr<AdaptiveAgc> adaptive_agc_;
-  Limiter limiter_;
-  int analog_level_ = -1;
-  bool adaptive_digital_mode_ = true;
-
-  RTC_DISALLOW_COPY_AND_ASSIGN(GainController2);
-};
-
-}  // namespace webrtc
-
-#endif  // MODULES_AUDIO_PROCESSING_GAIN_CONTROLLER2_H_
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/include/aec_dump.cc b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/include/aec_dump.cc
deleted file mode 100644
index 67809d0dcb..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/include/aec_dump.cc
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- *  Copyright (c) 2017 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#include "modules/audio_processing/include/aec_dump.h"
-
-namespace webrtc {
-InternalAPMConfig::InternalAPMConfig() = default;
-InternalAPMConfig::InternalAPMConfig(const InternalAPMConfig&) = default;
-InternalAPMConfig::InternalAPMConfig(InternalAPMConfig&&) = default;
-InternalAPMConfig& InternalAPMConfig::operator=(const InternalAPMConfig&) =
-    default;
-
-bool InternalAPMConfig::operator==(const InternalAPMConfig& other) {
-  return aec_enabled == other.aec_enabled &&
-         aec_delay_agnostic_enabled == other.aec_delay_agnostic_enabled &&
-         aec_drift_compensation_enabled ==
-             other.aec_drift_compensation_enabled &&
-         aec_extended_filter_enabled == other.aec_extended_filter_enabled &&
-         aec_suppression_level == other.aec_suppression_level &&
-         aecm_enabled == other.aecm_enabled &&
-         aecm_comfort_noise_enabled == other.aecm_comfort_noise_enabled &&
-         aecm_routing_mode == other.aecm_routing_mode &&
-         agc_enabled == other.agc_enabled && agc_mode == other.agc_mode &&
-         agc_limiter_enabled == other.agc_limiter_enabled &&
-         hpf_enabled == other.hpf_enabled && ns_enabled == other.ns_enabled &&
-         ns_level == other.ns_level &&
-         transient_suppression_enabled == other.transient_suppression_enabled &&
-         noise_robust_agc_enabled == other.noise_robust_agc_enabled &&
-         pre_amplifier_enabled == other.pre_amplifier_enabled &&
-         pre_amplifier_fixed_gain_factor ==
-             other.pre_amplifier_fixed_gain_factor &&
-         experiments_description == other.experiments_description;
-}
-}  // namespace webrtc
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/include/aec_dump.h b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/include/aec_dump.h
deleted file mode 100644
index b734adfbbb..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/include/aec_dump.h
+++ /dev/null
@@ -1,108 +0,0 @@
-/*
- *  Copyright (c) 2017 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#ifndef MODULES_AUDIO_PROCESSING_INCLUDE_AEC_DUMP_H_
-#define MODULES_AUDIO_PROCESSING_INCLUDE_AEC_DUMP_H_
-
-#include <stdint.h>
-#include <string>
-
-#include "api/audio/audio_frame.h"
-#include "modules/audio_processing/include/audio_frame_view.h"
-#include "modules/audio_processing/include/audio_processing.h"
-#include "rtc_base/deprecation.h"
-
-namespace webrtc {
-
-// Struct for passing current config from APM without having to
-// include protobuf headers.
-struct InternalAPMConfig {
-  InternalAPMConfig();
-  InternalAPMConfig(const InternalAPMConfig&);
-  InternalAPMConfig(InternalAPMConfig&&);
-
-  InternalAPMConfig& operator=(const InternalAPMConfig&);
-  InternalAPMConfig& operator=(InternalAPMConfig&&) = delete;
-
-  bool operator==(const InternalAPMConfig& other);
-
-  bool aec_enabled = false;
-  bool aec_delay_agnostic_enabled = false;
-  bool aec_drift_compensation_enabled = false;
-  bool aec_extended_filter_enabled = false;
-  int aec_suppression_level = 0;
-  bool aecm_enabled = false;
-  bool aecm_comfort_noise_enabled = false;
-  int aecm_routing_mode = 0;
-  bool agc_enabled = false;
-  int agc_mode = 0;
-  bool agc_limiter_enabled = false;
-  bool hpf_enabled = false;
-  bool ns_enabled = false;
-  int ns_level = 0;
-  bool transient_suppression_enabled = false;
-  bool noise_robust_agc_enabled = false;
-  bool pre_amplifier_enabled = false;
-  float pre_amplifier_fixed_gain_factor = 1.f;
-  std::string experiments_description = "";
-};
-
-// An interface for recording configuration and input/output streams
-// of the Audio Processing Module. The recordings are called
-// 'aec-dumps' and are stored in a protobuf format defined in
-// debug.proto.
-// The Write* methods are always safe to call concurrently or
-// otherwise for all implementing subclasses. The intended mode of
-// operation is to create a protobuf object from the input, and send
-// it away to be written to file asynchronously.
-class AecDump {
- public:
-  struct AudioProcessingState {
-    int delay;
-    int drift;
-    int level;
-    bool keypress;
-  };
-
-  virtual ~AecDump() = default;
-
-  // Logs Event::Type INIT message.
-  virtual void WriteInitMessage(const ProcessingConfig& api_format,
-                                int64_t time_now_ms) = 0;
-  RTC_DEPRECATED void WriteInitMessage(const ProcessingConfig& api_format) {
-    WriteInitMessage(api_format, 0);
-  }
-
-  // Logs Event::Type STREAM message. To log an input/output pair,
-  // call the AddCapture* and AddAudioProcessingState methods followed
-  // by a WriteCaptureStreamMessage call.
-  virtual void AddCaptureStreamInput(
-      const AudioFrameView<const float>& src) = 0;
-  virtual void AddCaptureStreamOutput(
-      const AudioFrameView<const float>& src) = 0;
-  virtual void AddCaptureStreamInput(const AudioFrame& frame) = 0;
-  virtual void AddCaptureStreamOutput(const AudioFrame& frame) = 0;
-  virtual void AddAudioProcessingState(const AudioProcessingState& state) = 0;
-  virtual void WriteCaptureStreamMessage() = 0;
-
-  // Logs Event::Type REVERSE_STREAM message.
-  virtual void WriteRenderStreamMessage(const AudioFrame& frame) = 0;
-  virtual void WriteRenderStreamMessage(
-      const AudioFrameView<const float>& src) = 0;
-
-  virtual void WriteRuntimeSetting(
-      const AudioProcessing::RuntimeSetting& runtime_setting) = 0;
-
-  // Logs Event::Type CONFIG message.
-  virtual void WriteConfig(const InternalAPMConfig& config) = 0;
-};
-}  // namespace webrtc
-
-#endif  // MODULES_AUDIO_PROCESSING_INCLUDE_AEC_DUMP_H_
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/include/audio_frame_view.h b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/include/audio_frame_view.h
deleted file mode 100644
index ab5779ad6b..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/include/audio_frame_view.h
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- *  Copyright (c) 2018 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#ifndef MODULES_AUDIO_PROCESSING_INCLUDE_AUDIO_FRAME_VIEW_H_
-#define MODULES_AUDIO_PROCESSING_INCLUDE_AUDIO_FRAME_VIEW_H_
-
-#include "api/array_view.h"
-
-namespace webrtc {
-
-// Class to pass audio data in T** format, where T is a numeric type.
-template <class T>
-class AudioFrameView {
- public:
-  // |num_channels| and |channel_size| describe the T**
-  // |audio_samples|. |audio_samples| is assumed to point to a
-  // two-dimensional |num_channels * channel_size| array of floats.
-  AudioFrameView(T* const* audio_samples,
-                 size_t num_channels,
-                 size_t channel_size)
-      : audio_samples_(audio_samples),
-        num_channels_(num_channels),
-        channel_size_(channel_size) {}
-
-  // Implicit cast to allow converting Frame<float> to
-  // Frame<const float>.
-  template <class U>
-  AudioFrameView(AudioFrameView<U> other)
-      : audio_samples_(other.data()),
-        num_channels_(other.num_channels()),
-        channel_size_(other.samples_per_channel()) {}
-
-  AudioFrameView() = delete;
-
-  size_t num_channels() const { return num_channels_; }
-
-  size_t samples_per_channel() const { return channel_size_; }
-
-  rtc::ArrayView<T> channel(size_t idx) {
-    RTC_DCHECK_LE(0, idx);
-    RTC_DCHECK_LE(idx, num_channels_);
-    return rtc::ArrayView<T>(audio_samples_[idx], channel_size_);
-  }
-
-  rtc::ArrayView<const T> channel(size_t idx) const {
-    RTC_DCHECK_LE(0, idx);
-    RTC_DCHECK_LE(idx, num_channels_);
-    return rtc::ArrayView<const T>(audio_samples_[idx], channel_size_);
-  }
-
-  T* const* data() { return audio_samples_; }
-
- private:
-  T* const* audio_samples_;
-  size_t num_channels_;
-  size_t channel_size_;
-};
-}  // namespace webrtc
-
-#endif  // MODULES_AUDIO_PROCESSING_INCLUDE_AUDIO_FRAME_VIEW_H_
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/include/audio_generator.h b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/include/audio_generator.h
deleted file mode 100644
index 77e6284969..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/include/audio_generator.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- *  Copyright (c) 2018 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#ifndef MODULES_AUDIO_PROCESSING_INCLUDE_AUDIO_GENERATOR_H_
-#define MODULES_AUDIO_PROCESSING_INCLUDE_AUDIO_GENERATOR_H_
-
-#include "modules/audio_processing/include/audio_frame_view.h"
-
-namespace webrtc {
-// This class is used as input sink for the APM, for diagnostic purposes.
-// Generates an infinite audio signal, [-1, 1] floating point values, in frames
-// of fixed channel count and sample rate.
-class AudioGenerator {
- public:
-  virtual ~AudioGenerator() {}
-
-  // Fill |audio| with the next samples of the audio signal.
-  virtual void FillFrame(AudioFrameView<float> audio) = 0;
-
-  // Return the number of channels output by the AudioGenerator.
-  virtual size_t NumChannels() = 0;
-
-  // Return the sample rate output by the AudioGenerator.
-  virtual size_t SampleRateHz() = 0;
-};
-
-}  // namespace webrtc
-
-#endif  // MODULES_AUDIO_PROCESSING_INCLUDE_AUDIO_GENERATOR_H_
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/include/audio_generator_factory.cc b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/include/audio_generator_factory.cc
deleted file mode 100644
index 69a5401514..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/include/audio_generator_factory.cc
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- *  Copyright (c) 2018 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#include "modules/audio_processing/include/audio_generator_factory.h"
-
-#include "absl/memory/memory.h"
-#include "common_audio/wav_file.h"
-#include "modules/audio_processing/audio_generator/file_audio_generator.h"
-
-namespace webrtc {
-
-std::unique_ptr<AudioGenerator> AudioGeneratorFactory::Create(
-    const std::string& file_name) {
-  std::unique_ptr<WavReader> input_audio_file(new WavReader(file_name));
-  return absl::make_unique<FileAudioGenerator>(std::move(input_audio_file));
-}
-
-}  // namespace webrtc
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/include/audio_generator_factory.h b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/include/audio_generator_factory.h
deleted file mode 100644
index a9513ef88d..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/include/audio_generator_factory.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- *  Copyright (c) 2017 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#ifndef MODULES_AUDIO_PROCESSING_INCLUDE_AUDIO_GENERATOR_FACTORY_H_
-#define MODULES_AUDIO_PROCESSING_INCLUDE_AUDIO_GENERATOR_FACTORY_H_
-
-#include <memory>
-#include <string>
-#include <utility>
-
-#include "modules/audio_processing/include/audio_generator.h"
-
-namespace webrtc {
-
-class AudioGeneratorFactory {
- public:
-  // Creates an AudioGenerator that reads the playout audio from a given 16-bit
-  // int-encoded WAV file.
-  static std::unique_ptr<AudioGenerator> Create(const std::string& file_name);
-};
-
-}  // namespace webrtc
-
-#endif  // MODULES_AUDIO_PROCESSING_INCLUDE_AUDIO_GENERATOR_FACTORY_H_
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/include/audio_processing.cc b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/include/audio_processing.cc
deleted file mode 100644
index 27cd8824fe..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/include/audio_processing.cc
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- *  Copyright (c) 2016 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#include "modules/audio_processing/include/audio_processing.h"
-
-namespace webrtc {
-
-void CustomProcessing::SetRuntimeSetting(
-    AudioProcessing::RuntimeSetting setting) {}
-
-}  // namespace webrtc
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/include/audio_processing.h b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/include/audio_processing.h
deleted file mode 100644
index 5467a388e9..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/include/audio_processing.h
+++ /dev/null
@@ -1,890 +0,0 @@
-/*
- *  Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#ifndef MODULES_AUDIO_PROCESSING_INCLUDE_AUDIO_PROCESSING_H_
-#define MODULES_AUDIO_PROCESSING_INCLUDE_AUDIO_PROCESSING_H_
-
-// MSVC++ requires this to be set before any other includes to get M_PI.
-#ifndef _USE_MATH_DEFINES
-#define _USE_MATH_DEFINES
-#endif
-
-#include <math.h>
-#include <stddef.h>  // size_t
-#include <stdio.h>   // FILE
-#include <string.h>
-#include <vector>
-
-#include "absl/types/optional.h"
-#include "api/audio/echo_canceller3_config.h"
-#include "api/audio/echo_control.h"
-#include "modules/audio_processing/include/audio_generator.h"
-#include "modules/audio_processing/include/audio_processing_statistics.h"
-#include "modules/audio_processing/include/config.h"
-#include "modules/audio_processing/include/gain_control.h"
-#include "rtc_base/arraysize.h"
-#include "rtc_base/deprecation.h"
-#include "rtc_base/platform_file.h"
-#include "rtc_base/refcount.h"
-#include "rtc_base/scoped_ref_ptr.h"
-#include "rtc_base/system/rtc_export.h"
-
-namespace webrtc {
-
-struct AecCore;
-
-class AecDump;
-class AudioBuffer;
-class AudioFrame;
-
-class StreamConfig;
-class ProcessingConfig;
-
-class EchoDetector;
-class GainControl;
-class LevelEstimator;
-class NoiseSuppression;
-class CustomAudioAnalyzer;
-class CustomProcessing;
-class VoiceDetection;
-
-// Use to enable the extended filter mode in the AEC, along with robustness
-// measures around the reported system delays. It comes with a significant
-// increase in AEC complexity, but is much more robust to unreliable reported
-// delays.
-//
-// Detailed changes to the algorithm:
-// - The filter length is changed from 48 to 128 ms. This comes with tuning of
-//   several parameters: i) filter adaptation stepsize and error threshold;
-//   ii) non-linear processing smoothing and overdrive.
-// - Option to ignore the reported delays on platforms which we deem
-//   sufficiently unreliable. See WEBRTC_UNTRUSTED_DELAY in echo_cancellation.c.
-// - Faster startup times by removing the excessive "startup phase" processing
-//   of reported delays.
-// - Much more conservative adjustments to the far-end read pointer. We smooth
-//   the delay difference more heavily, and back off from the difference more.
-//   Adjustments force a readaptation of the filter, so they should be avoided
-//   except when really necessary.
-struct ExtendedFilter {
-  ExtendedFilter() : enabled(false) {}
-  explicit ExtendedFilter(bool enabled) : enabled(enabled) {}
-  static const ConfigOptionID identifier = ConfigOptionID::kExtendedFilter;
-  bool enabled;
-};
-
-// Enables the refined linear filter adaptation in the echo canceller.
-// This configuration only applies to non-mobile echo cancellation.
-// It can be set in the constructor or using AudioProcessing::SetExtraOptions().
-struct RefinedAdaptiveFilter {
-  RefinedAdaptiveFilter() : enabled(false) {}
-  explicit RefinedAdaptiveFilter(bool enabled) : enabled(enabled) {}
-  static const ConfigOptionID identifier =
-      ConfigOptionID::kAecRefinedAdaptiveFilter;
-  bool enabled;
-};
-
-// Enables delay-agnostic echo cancellation. This feature relies on internally
-// estimated delays between the process and reverse streams, thus not relying
-// on reported system delays. This configuration only applies to non-mobile echo
-// cancellation. It can be set in the constructor or using
-// AudioProcessing::SetExtraOptions().
-struct DelayAgnostic {
-  DelayAgnostic() : enabled(false) {}
-  explicit DelayAgnostic(bool enabled) : enabled(enabled) {}
-  static const ConfigOptionID identifier = ConfigOptionID::kDelayAgnostic;
-  bool enabled;
-};
-
-// Use to enable experimental gain control (AGC). At startup the experimental
-// AGC moves the microphone volume up to |startup_min_volume| if the current
-// microphone volume is set too low. The value is clamped to its operating range
-// [12, 255]. Here, 255 maps to 100%.
-//
-// Must be provided through AudioProcessingBuilder().Create(config).
-#if defined(WEBRTC_CHROMIUM_BUILD)
-static const int kAgcStartupMinVolume = 85;
-#else
-static const int kAgcStartupMinVolume = 0;
-#endif  // defined(WEBRTC_CHROMIUM_BUILD)
-static constexpr int kClippedLevelMin = 70;
-struct ExperimentalAgc {
-  ExperimentalAgc() = default;
-  explicit ExperimentalAgc(bool enabled) : enabled(enabled) {}
-  ExperimentalAgc(bool enabled,
-                  bool enabled_agc2_level_estimator,
-                  bool digital_adaptive_disabled,
-                  bool analyze_before_aec)
-      : enabled(enabled),
-        enabled_agc2_level_estimator(enabled_agc2_level_estimator),
-        digital_adaptive_disabled(digital_adaptive_disabled),
-        analyze_before_aec(analyze_before_aec) {}
-
-  ExperimentalAgc(bool enabled, int startup_min_volume)
-      : enabled(enabled), startup_min_volume(startup_min_volume) {}
-  ExperimentalAgc(bool enabled, int startup_min_volume, int clipped_level_min)
-      : enabled(enabled),
-        startup_min_volume(startup_min_volume),
-        clipped_level_min(clipped_level_min) {}
-  static const ConfigOptionID identifier = ConfigOptionID::kExperimentalAgc;
-  bool enabled = true;
-  int startup_min_volume = kAgcStartupMinVolume;
-  // Lowest microphone level that will be applied in response to clipping.
-  int clipped_level_min = kClippedLevelMin;
-  bool enabled_agc2_level_estimator = false;
-  bool digital_adaptive_disabled = false;
-  // 'analyze_before_aec' is an experimental flag. It is intended to be removed
-  // at some point.
-  bool analyze_before_aec = false;
-};
-
-// Use to enable experimental noise suppression. It can be set in the
-// constructor or using AudioProcessing::SetExtraOptions().
-struct ExperimentalNs {
-  ExperimentalNs() : enabled(false) {}
-  explicit ExperimentalNs(bool enabled) : enabled(enabled) {}
-  static const ConfigOptionID identifier = ConfigOptionID::kExperimentalNs;
-  bool enabled;
-};
-
-// The Audio Processing Module (APM) provides a collection of voice processing
-// components designed for real-time communications software.
-//
-// APM operates on two audio streams on a frame-by-frame basis. Frames of the
-// primary stream, on which all processing is applied, are passed to
-// |ProcessStream()|. Frames of the reverse direction stream are passed to
-// |ProcessReverseStream()|. On the client-side, this will typically be the
-// near-end (capture) and far-end (render) streams, respectively. APM should be
-// placed in the signal chain as close to the audio hardware abstraction layer
-// (HAL) as possible.
-//
-// On the server-side, the reverse stream will normally not be used, with
-// processing occurring on each incoming stream.
-//
-// Component interfaces follow a similar pattern and are accessed through
-// corresponding getters in APM. All components are disabled at create-time,
-// with default settings that are recommended for most situations. New settings
-// can be applied without enabling a component. Enabling a component triggers
-// memory allocation and initialization to allow it to start processing the
-// streams.
-//
-// Thread safety is provided with the following assumptions to reduce locking
-// overhead:
-//   1. The stream getters and setters are called from the same thread as
-//      ProcessStream(). More precisely, stream functions are never called
-//      concurrently with ProcessStream().
-//   2. Parameter getters are never called concurrently with the corresponding
-//      setter.
-//
-// APM accepts only linear PCM audio data in chunks of 10 ms. The int16
-// interfaces use interleaved data, while the float interfaces use deinterleaved
-// data.
-//
-// Usage example, omitting error checking:
-// AudioProcessing* apm = AudioProcessingBuilder().Create();
-//
-// AudioProcessing::Config config;
-// config.echo_canceller.enabled = true;
-// config.echo_canceller.mobile_mode = false;
-// config.high_pass_filter.enabled = true;
-// config.gain_controller2.enabled = true;
-// apm->ApplyConfig(config)
-//
-// apm->noise_reduction()->set_level(kHighSuppression);
-// apm->noise_reduction()->Enable(true);
-//
-// apm->gain_control()->set_analog_level_limits(0, 255);
-// apm->gain_control()->set_mode(kAdaptiveAnalog);
-// apm->gain_control()->Enable(true);
-//
-// apm->voice_detection()->Enable(true);
-//
-// // Start a voice call...
-//
-// // ... Render frame arrives bound for the audio HAL ...
-// apm->ProcessReverseStream(render_frame);
-//
-// // ... Capture frame arrives from the audio HAL ...
-// // Call required set_stream_ functions.
-// apm->set_stream_delay_ms(delay_ms);
-// apm->gain_control()->set_stream_analog_level(analog_level);
-//
-// apm->ProcessStream(capture_frame);
-//
-// // Call required stream_ functions.
-// analog_level = apm->gain_control()->stream_analog_level();
-// has_voice = apm->stream_has_voice();
-//
-// // Repeate render and capture processing for the duration of the call...
-// // Start a new call...
-// apm->Initialize();
-//
-// // Close the application...
-// delete apm;
-//
-class AudioProcessing : public rtc::RefCountInterface {
- public:
-  // The struct below constitutes the new parameter scheme for the audio
-  // processing. It is being introduced gradually and until it is fully
-  // introduced, it is prone to change.
-  // TODO(peah): Remove this comment once the new config scheme is fully rolled
-  // out.
-  //
-  // The parameters and behavior of the audio processing module are controlled
-  // by changing the default values in the AudioProcessing::Config struct.
-  // The config is applied by passing the struct to the ApplyConfig method.
-  struct Config {
-    struct EchoCanceller {
-      bool enabled = false;
-      bool mobile_mode = false;
-      // Recommended not to use. Will be removed in the future.
-      // APM components are not fine-tuned for legacy suppression levels.
-      bool legacy_moderate_suppression_level = false;
-    } echo_canceller;
-
-    struct ResidualEchoDetector {
-      bool enabled = true;
-    } residual_echo_detector;
-
-    struct HighPassFilter {
-      bool enabled = false;
-    } high_pass_filter;
-
-    // Enabled the pre-amplifier. It amplifies the capture signal
-    // before any other processing is done.
-    struct PreAmplifier {
-      bool enabled = false;
-      float fixed_gain_factor = 1.f;
-    } pre_amplifier;
-
-    // Enables the next generation AGC functionality. This feature replaces the
-    // standard methods of gain control in the previous AGC. Enabling this
-    // submodule enables an adaptive digital AGC followed by a limiter. By
-    // setting |fixed_gain_db|, the limiter can be turned into a compressor that
-    // first applies a fixed gain. The adaptive digital AGC can be turned off by
-    // setting |adaptive_digital_mode=false|.
-    struct GainController2 {
-      enum LevelEstimator { kRms, kPeak };
-      bool enabled = false;
-      struct {
-        float gain_db = 0.f;
-      } fixed_digital;
-      struct {
-        bool enabled = true;
-        LevelEstimator level_estimator = kRms;
-        bool use_saturation_protector = true;
-        float extra_saturation_margin_db = 2.f;
-      } adaptive_digital;
-    } gain_controller2;
-
-    // Explicit copy assignment implementation to avoid issues with memory
-    // sanitizer complaints in case of self-assignment.
-    // TODO(peah): Add buildflag to ensure that this is only included for memory
-    // sanitizer builds.
-    Config& operator=(const Config& config) {
-      if (this != &config) {
-        memcpy(this, &config, sizeof(*this));
-      }
-      return *this;
-    }
-  };
-
-  // TODO(mgraczyk): Remove once all methods that use ChannelLayout are gone.
-  enum ChannelLayout {
-    kMono,
-    // Left, right.
-    kStereo,
-    // Mono, keyboard, and mic.
-    kMonoAndKeyboard,
-    // Left, right, keyboard, and mic.
-    kStereoAndKeyboard
-  };
-
-  // Specifies the properties of a setting to be passed to AudioProcessing at
-  // runtime.
-  class RuntimeSetting {
-   public:
-    enum class Type {
-      kNotSpecified,
-      kCapturePreGain,
-      kCustomRenderProcessingRuntimeSetting
-    };
-
-    RuntimeSetting() : type_(Type::kNotSpecified), value_(0.f) {}
-    ~RuntimeSetting() = default;
-
-    static RuntimeSetting CreateCapturePreGain(float gain) {
-      RTC_DCHECK_GE(gain, 1.f) << "Attenuation is not allowed.";
-      return {Type::kCapturePreGain, gain};
-    }
-
-    static RuntimeSetting CreateCustomRenderSetting(float payload) {
-      return {Type::kCustomRenderProcessingRuntimeSetting, payload};
-    }
-
-    Type type() const { return type_; }
-    void GetFloat(float* value) const {
-      RTC_DCHECK(value);
-      *value = value_;
-    }
-
-   private:
-    RuntimeSetting(Type id, float value) : type_(id), value_(value) {}
-    Type type_;
-    float value_;
-  };
-
-  ~AudioProcessing() override {}
-
-  // Initializes internal states, while retaining all user settings. This
-  // should be called before beginning to process a new audio stream. However,
-  // it is not necessary to call before processing the first stream after
-  // creation.
-  //
-  // It is also not necessary to call if the audio parameters (sample
-  // rate and number of channels) have changed. Passing updated parameters
-  // directly to |ProcessStream()| and |ProcessReverseStream()| is permissible.
-  // If the parameters are known at init-time though, they may be provided.
-  virtual int Initialize() = 0;
-
-  // The int16 interfaces require:
-  //   - only |NativeRate|s be used
-  //   - that the input, output and reverse rates must match
-  //   - that |processing_config.output_stream()| matches
-  //     |processing_config.input_stream()|.
-  //
-  // The float interfaces accept arbitrary rates and support differing input and
-  // output layouts, but the output must have either one channel or the same
-  // number of channels as the input.
-  virtual int Initialize(const ProcessingConfig& processing_config) = 0;
-
-  // Initialize with unpacked parameters. See Initialize() above for details.
-  //
-  // TODO(mgraczyk): Remove once clients are updated to use the new interface.
-  virtual int Initialize(int capture_input_sample_rate_hz,
-                         int capture_output_sample_rate_hz,
-                         int render_sample_rate_hz,
-                         ChannelLayout capture_input_layout,
-                         ChannelLayout capture_output_layout,
-                         ChannelLayout render_input_layout) = 0;
-
-  // TODO(peah): This method is a temporary solution used to take control
-  // over the parameters in the audio processing module and is likely to change.
-  virtual void ApplyConfig(const Config& config) = 0;
-
-  // Pass down additional options which don't have explicit setters. This
-  // ensures the options are applied immediately.
-  virtual void SetExtraOptions(const webrtc::Config& config) = 0;
-
-  // TODO(ajm): Only intended for internal use. Make private and friend the
-  // necessary classes?
-  virtual int proc_sample_rate_hz() const = 0;
-  virtual int proc_split_sample_rate_hz() const = 0;
-  virtual size_t num_input_channels() const = 0;
-  virtual size_t num_proc_channels() const = 0;
-  virtual size_t num_output_channels() const = 0;
-  virtual size_t num_reverse_channels() const = 0;
-
-  // Set to true when the output of AudioProcessing will be muted or in some
-  // other way not used. Ideally, the captured audio would still be processed,
-  // but some components may change behavior based on this information.
-  // Default false.
-  virtual void set_output_will_be_muted(bool muted) = 0;
-
-  // Enqueue a runtime setting.
-  virtual void SetRuntimeSetting(RuntimeSetting setting) = 0;
-
-  // Processes a 10 ms |frame| of the primary audio stream. On the client-side,
-  // this is the near-end (or captured) audio.
-  //
-  // If needed for enabled functionality, any function with the set_stream_ tag
-  // must be called prior to processing the current frame. Any getter function
-  // with the stream_ tag which is needed should be called after processing.
-  //
-  // The |sample_rate_hz_|, |num_channels_|, and |samples_per_channel_|
-  // members of |frame| must be valid. If changed from the previous call to this
-  // method, it will trigger an initialization.
-  virtual int ProcessStream(AudioFrame* frame) = 0;
-
-  // Accepts deinterleaved float audio with the range [-1, 1]. Each element
-  // of |src| points to a channel buffer, arranged according to
-  // |input_layout|. At output, the channels will be arranged according to
-  // |output_layout| at |output_sample_rate_hz| in |dest|.
-  //
-  // The output layout must have one channel or as many channels as the input.
-  // |src| and |dest| may use the same memory, if desired.
-  //
-  // TODO(mgraczyk): Remove once clients are updated to use the new interface.
-  virtual int ProcessStream(const float* const* src,
-                            size_t samples_per_channel,
-                            int input_sample_rate_hz,
-                            ChannelLayout input_layout,
-                            int output_sample_rate_hz,
-                            ChannelLayout output_layout,
-                            float* const* dest) = 0;
-
-  // Accepts deinterleaved float audio with the range [-1, 1]. Each element of
-  // |src| points to a channel buffer, arranged according to |input_stream|. At
-  // output, the channels will be arranged according to |output_stream| in
-  // |dest|.
-  //
-  // The output must have one channel or as many channels as the input. |src|
-  // and |dest| may use the same memory, if desired.
-  virtual int ProcessStream(const float* const* src,
-                            const StreamConfig& input_config,
-                            const StreamConfig& output_config,
-                            float* const* dest) = 0;
-
-  // Processes a 10 ms |frame| of the reverse direction audio stream. The frame
-  // may be modified. On the client-side, this is the far-end (or to be
-  // rendered) audio.
-  //
-  // It is necessary to provide this if echo processing is enabled, as the
-  // reverse stream forms the echo reference signal. It is recommended, but not
-  // necessary, to provide if gain control is enabled. On the server-side this
-  // typically will not be used. If you're not sure what to pass in here,
-  // chances are you don't need to use it.
-  //
-  // The |sample_rate_hz_|, |num_channels_|, and |samples_per_channel_|
-  // members of |frame| must be valid.
-  virtual int ProcessReverseStream(AudioFrame* frame) = 0;
-
-  // Accepts deinterleaved float audio with the range [-1, 1]. Each element
-  // of |data| points to a channel buffer, arranged according to |layout|.
-  // TODO(mgraczyk): Remove once clients are updated to use the new interface.
-  virtual int AnalyzeReverseStream(const float* const* data,
-                                   size_t samples_per_channel,
-                                   int sample_rate_hz,
-                                   ChannelLayout layout) = 0;
-
-  // Accepts deinterleaved float audio with the range [-1, 1]. Each element of
-  // |data| points to a channel buffer, arranged according to |reverse_config|.
-  virtual int ProcessReverseStream(const float* const* src,
-                                   const StreamConfig& input_config,
-                                   const StreamConfig& output_config,
-                                   float* const* dest) = 0;
-
-  // This must be called if and only if echo processing is enabled.
-  //
-  // Sets the |delay| in ms between ProcessReverseStream() receiving a far-end
-  // frame and ProcessStream() receiving a near-end frame containing the
-  // corresponding echo. On the client-side this can be expressed as
-  //   delay = (t_render - t_analyze) + (t_process - t_capture)
-  // where,
-  //   - t_analyze is the time a frame is passed to ProcessReverseStream() and
-  //     t_render is the time the first sample of the same frame is rendered by
-  //     the audio hardware.
-  //   - t_capture is the time the first sample of a frame is captured by the
-  //     audio hardware and t_process is the time the same frame is passed to
-  //     ProcessStream().
-  virtual int set_stream_delay_ms(int delay) = 0;
-  virtual int stream_delay_ms() const = 0;
-  virtual bool was_stream_delay_set() const = 0;
-
-  // Call to signal that a key press occurred (true) or did not occur (false)
-  // with this chunk of audio.
-  virtual void set_stream_key_pressed(bool key_pressed) = 0;
-
-  // Sets a delay |offset| in ms to add to the values passed in through
-  // set_stream_delay_ms(). May be positive or negative.
-  //
-  // Note that this could cause an otherwise valid value passed to
-  // set_stream_delay_ms() to return an error.
-  virtual void set_delay_offset_ms(int offset) = 0;
-  virtual int delay_offset_ms() const = 0;
-
-  // Attaches provided webrtc::AecDump for recording debugging
-  // information. Log file and maximum file size logic is supposed to
-  // be handled by implementing instance of AecDump. Calling this
-  // method when another AecDump is attached resets the active AecDump
-  // with a new one. This causes the d-tor of the earlier AecDump to
-  // be called. The d-tor call may block until all pending logging
-  // tasks are completed.
-  virtual void AttachAecDump(std::unique_ptr<AecDump> aec_dump) = 0;
-
-  // If no AecDump is attached, this has no effect. If an AecDump is
-  // attached, it's destructor is called. The d-tor may block until
-  // all pending logging tasks are completed.
-  virtual void DetachAecDump() = 0;
-
-  // Attaches provided webrtc::AudioGenerator for modifying playout audio.
-  // Calling this method when another AudioGenerator is attached replaces the
-  // active AudioGenerator with a new one.
-  virtual void AttachPlayoutAudioGenerator(
-      std::unique_ptr<AudioGenerator> audio_generator) = 0;
-
-  // If no AudioGenerator is attached, this has no effect. If an AecDump is
-  // attached, its destructor is called.
-  virtual void DetachPlayoutAudioGenerator() = 0;
-
-  // Use to send UMA histograms at end of a call. Note that all histogram
-  // specific member variables are reset.
-  virtual void UpdateHistogramsOnCallEnd() = 0;
-
-  // Get audio processing statistics. The |has_remote_tracks| argument should be
-  // set if there are active remote tracks (this would usually be true during
-  // a call). If there are no remote tracks some of the stats will not be set by
-  // AudioProcessing, because they only make sense if there is at least one
-  // remote track.
-  virtual AudioProcessingStats GetStatistics(bool has_remote_tracks) const = 0;
-
-  // These provide access to the component interfaces and should never return
-  // NULL. The pointers will be valid for the lifetime of the APM instance.
-  // The memory for these objects is entirely managed internally.
-  virtual GainControl* gain_control() const = 0;
-  virtual LevelEstimator* level_estimator() const = 0;
-  virtual NoiseSuppression* noise_suppression() const = 0;
-  virtual VoiceDetection* voice_detection() const = 0;
-
-  // Returns the last applied configuration.
-  virtual AudioProcessing::Config GetConfig() const = 0;
-
-  enum Error {
-    // Fatal errors.
-    kNoError = 0,
-    kUnspecifiedError = -1,
-    kCreationFailedError = -2,
-    kUnsupportedComponentError = -3,
-    kUnsupportedFunctionError = -4,
-    kNullPointerError = -5,
-    kBadParameterError = -6,
-    kBadSampleRateError = -7,
-    kBadDataLengthError = -8,
-    kBadNumberChannelsError = -9,
-    kFileError = -10,
-    kStreamParameterNotSetError = -11,
-    kNotEnabledError = -12,
-
-    // Warnings are non-fatal.
-    // This results when a set_stream_ parameter is out of range. Processing
-    // will continue, but the parameter may have been truncated.
-    kBadStreamParameterWarning = -13
-  };
-
-  enum NativeRate {
-    kSampleRate8kHz = 8000,
-    kSampleRate16kHz = 16000,
-    kSampleRate32kHz = 32000,
-    kSampleRate48kHz = 48000
-  };
-
-  // TODO(kwiberg): We currently need to support a compiler (Visual C++) that
-  // complains if we don't explicitly state the size of the array here. Remove
-  // the size when that's no longer the case.
-  static constexpr int kNativeSampleRatesHz[4] = {
-      kSampleRate8kHz, kSampleRate16kHz, kSampleRate32kHz, kSampleRate48kHz};
-  static constexpr size_t kNumNativeSampleRates =
-      arraysize(kNativeSampleRatesHz);
-  static constexpr int kMaxNativeSampleRateHz =
-      kNativeSampleRatesHz[kNumNativeSampleRates - 1];
-
-  static const int kChunkSizeMs = 10;
-};
-
-class RTC_EXPORT AudioProcessingBuilder {
- public:
-  AudioProcessingBuilder();
-  ~AudioProcessingBuilder();
-  // The AudioProcessingBuilder takes ownership of the echo_control_factory.
-  AudioProcessingBuilder& SetEchoControlFactory(
-      std::unique_ptr<EchoControlFactory> echo_control_factory);
-  // The AudioProcessingBuilder takes ownership of the capture_post_processing.
-  AudioProcessingBuilder& SetCapturePostProcessing(
-      std::unique_ptr<CustomProcessing> capture_post_processing);
-  // The AudioProcessingBuilder takes ownership of the render_pre_processing.
-  AudioProcessingBuilder& SetRenderPreProcessing(
-      std::unique_ptr<CustomProcessing> render_pre_processing);
-  // The AudioProcessingBuilder takes ownership of the echo_detector.
-  AudioProcessingBuilder& SetEchoDetector(
-      rtc::scoped_refptr<EchoDetector> echo_detector);
-  // The AudioProcessingBuilder takes ownership of the capture_analyzer.
-  AudioProcessingBuilder& SetCaptureAnalyzer(
-      std::unique_ptr<CustomAudioAnalyzer> capture_analyzer);
-  // This creates an APM instance using the previously set components. Calling
-  // the Create function resets the AudioProcessingBuilder to its initial state.
-  AudioProcessing* Create();
-  AudioProcessing* Create(const webrtc::Config& config);
-
- private:
-  std::unique_ptr<EchoControlFactory> echo_control_factory_;
-  std::unique_ptr<CustomProcessing> capture_post_processing_;
-  std::unique_ptr<CustomProcessing> render_pre_processing_;
-  rtc::scoped_refptr<EchoDetector> echo_detector_;
-  std::unique_ptr<CustomAudioAnalyzer> capture_analyzer_;
-  RTC_DISALLOW_COPY_AND_ASSIGN(AudioProcessingBuilder);
-};
-
-class StreamConfig {
- public:
-  // sample_rate_hz: The sampling rate of the stream.
-  //
-  // num_channels: The number of audio channels in the stream, excluding the
-  //               keyboard channel if it is present. When passing a
-  //               StreamConfig with an array of arrays T*[N],
-  //
-  //                N == {num_channels + 1  if  has_keyboard
-  //                     {num_channels      if  !has_keyboard
-  //
-  // has_keyboard: True if the stream has a keyboard channel. When has_keyboard
-  //               is true, the last channel in any corresponding list of
-  //               channels is the keyboard channel.
-  StreamConfig(int sample_rate_hz = 0,
-               size_t num_channels = 0,
-               bool has_keyboard = false)
-      : sample_rate_hz_(sample_rate_hz),
-        num_channels_(num_channels),
-        has_keyboard_(has_keyboard),
-        num_frames_(calculate_frames(sample_rate_hz)) {}
-
-  void set_sample_rate_hz(int value) {
-    sample_rate_hz_ = value;
-    num_frames_ = calculate_frames(value);
-  }
-  void set_num_channels(size_t value) { num_channels_ = value; }
-  void set_has_keyboard(bool value) { has_keyboard_ = value; }
-
-  int sample_rate_hz() const { return sample_rate_hz_; }
-
-  // The number of channels in the stream, not including the keyboard channel if
-  // present.
-  size_t num_channels() const { return num_channels_; }
-
-  bool has_keyboard() const { return has_keyboard_; }
-  size_t num_frames() const { return num_frames_; }
-  size_t num_samples() const { return num_channels_ * num_frames_; }
-
-  bool operator==(const StreamConfig& other) const {
-    return sample_rate_hz_ == other.sample_rate_hz_ &&
-           num_channels_ == other.num_channels_ &&
-           has_keyboard_ == other.has_keyboard_;
-  }
-
-  bool operator!=(const StreamConfig& other) const { return !(*this == other); }
-
- private:
-  static size_t calculate_frames(int sample_rate_hz) {
-    return static_cast<size_t>(AudioProcessing::kChunkSizeMs * sample_rate_hz /
-                               1000);
-  }
-
-  int sample_rate_hz_;
-  size_t num_channels_;
-  bool has_keyboard_;
-  size_t num_frames_;
-};
-
-class ProcessingConfig {
- public:
-  enum StreamName {
-    kInputStream,
-    kOutputStream,
-    kReverseInputStream,
-    kReverseOutputStream,
-    kNumStreamNames,
-  };
-
-  const StreamConfig& input_stream() const {
-    return streams[StreamName::kInputStream];
-  }
-  const StreamConfig& output_stream() const {
-    return streams[StreamName::kOutputStream];
-  }
-  const StreamConfig& reverse_input_stream() const {
-    return streams[StreamName::kReverseInputStream];
-  }
-  const StreamConfig& reverse_output_stream() const {
-    return streams[StreamName::kReverseOutputStream];
-  }
-
-  StreamConfig& input_stream() { return streams[StreamName::kInputStream]; }
-  StreamConfig& output_stream() { return streams[StreamName::kOutputStream]; }
-  StreamConfig& reverse_input_stream() {
-    return streams[StreamName::kReverseInputStream];
-  }
-  StreamConfig& reverse_output_stream() {
-    return streams[StreamName::kReverseOutputStream];
-  }
-
-  bool operator==(const ProcessingConfig& other) const {
-    for (int i = 0; i < StreamName::kNumStreamNames; ++i) {
-      if (this->streams[i] != other.streams[i]) {
-        return false;
-      }
-    }
-    return true;
-  }
-
-  bool operator!=(const ProcessingConfig& other) const {
-    return !(*this == other);
-  }
-
-  StreamConfig streams[StreamName::kNumStreamNames];
-};
-
-// An estimation component used to retrieve level metrics.
-class LevelEstimator {
- public:
-  virtual int Enable(bool enable) = 0;
-  virtual bool is_enabled() const = 0;
-
-  // Returns the root mean square (RMS) level in dBFs (decibels from digital
-  // full-scale), or alternately dBov. It is computed over all primary stream
-  // frames since the last call to RMS(). The returned value is positive but
-  // should be interpreted as negative. It is constrained to [0, 127].
-  //
-  // The computation follows: https://tools.ietf.org/html/rfc6465
-  // with the intent that it can provide the RTP audio level indication.
-  //
-  // Frames passed to ProcessStream() with an |_energy| of zero are considered
-  // to have been muted. The RMS of the frame will be interpreted as -127.
-  virtual int RMS() = 0;
-
- protected:
-  virtual ~LevelEstimator() {}
-};
-
-// The noise suppression (NS) component attempts to remove noise while
-// retaining speech. Recommended to be enabled on the client-side.
-//
-// Recommended to be enabled on the client-side.
-class NoiseSuppression {
- public:
-  virtual int Enable(bool enable) = 0;
-  virtual bool is_enabled() const = 0;
-
-  // Determines the aggressiveness of the suppression. Increasing the level
-  // will reduce the noise level at the expense of a higher speech distortion.
-  enum Level { kLow, kModerate, kHigh, kVeryHigh };
-
-  virtual int set_level(Level level) = 0;
-  virtual Level level() const = 0;
-
-  // Returns the internally computed prior speech probability of current frame
-  // averaged over output channels. This is not supported in fixed point, for
-  // which |kUnsupportedFunctionError| is returned.
-  virtual float speech_probability() const = 0;
-
-  // Returns the noise estimate per frequency bin averaged over all channels.
-  virtual std::vector<float> NoiseEstimate() = 0;
-
- protected:
-  virtual ~NoiseSuppression() {}
-};
-
-// Experimental interface for a custom analysis submodule.
-class CustomAudioAnalyzer {
- public:
-  // (Re-) Initializes the submodule.
-  virtual void Initialize(int sample_rate_hz, int num_channels) = 0;
-  // Analyzes the given capture or render signal.
-  virtual void Analyze(const AudioBuffer* audio) = 0;
-  // Returns a string representation of the module state.
-  virtual std::string ToString() const = 0;
-
-  virtual ~CustomAudioAnalyzer() {}
-};
-
-// Interface for a custom processing submodule.
-class CustomProcessing {
- public:
-  // (Re-)Initializes the submodule.
-  virtual void Initialize(int sample_rate_hz, int num_channels) = 0;
-  // Processes the given capture or render signal.
-  virtual void Process(AudioBuffer* audio) = 0;
-  // Returns a string representation of the module state.
-  virtual std::string ToString() const = 0;
-  // Handles RuntimeSettings. TODO(webrtc:9262): make pure virtual
-  // after updating dependencies.
-  virtual void SetRuntimeSetting(AudioProcessing::RuntimeSetting setting);
-
-  virtual ~CustomProcessing() {}
-};
-
-// Interface for an echo detector submodule.
-class EchoDetector : public rtc::RefCountInterface {
- public:
-  // (Re-)Initializes the submodule.
-  virtual void Initialize(int capture_sample_rate_hz,
-                          int num_capture_channels,
-                          int render_sample_rate_hz,
-                          int num_render_channels) = 0;
-
-  // Analysis (not changing) of the render signal.
-  virtual void AnalyzeRenderAudio(rtc::ArrayView<const float> render_audio) = 0;
-
-  // Analysis (not changing) of the capture signal.
-  virtual void AnalyzeCaptureAudio(
-      rtc::ArrayView<const float> capture_audio) = 0;
-
-  // Pack an AudioBuffer into a vector<float>.
-  static void PackRenderAudioBuffer(AudioBuffer* audio,
-                                    std::vector<float>* packed_buffer);
-
-  struct Metrics {
-    double echo_likelihood;
-    double echo_likelihood_recent_max;
-  };
-
-  // Collect current metrics from the echo detector.
-  virtual Metrics GetMetrics() const = 0;
-};
-
-// The voice activity detection (VAD) component analyzes the stream to
-// determine if voice is present. A facility is also provided to pass in an
-// external VAD decision.
-//
-// In addition to |stream_has_voice()| the VAD decision is provided through the
-// |AudioFrame| passed to |ProcessStream()|. The |vad_activity_| member will be
-// modified to reflect the current decision.
-class VoiceDetection {
- public:
-  virtual int Enable(bool enable) = 0;
-  virtual bool is_enabled() const = 0;
-
-  // Returns true if voice is detected in the current frame. Should be called
-  // after |ProcessStream()|.
-  virtual bool stream_has_voice() const = 0;
-
-  // Some of the APM functionality requires a VAD decision. In the case that
-  // a decision is externally available for the current frame, it can be passed
-  // in here, before |ProcessStream()| is called.
-  //
-  // VoiceDetection does _not_ need to be enabled to use this. If it happens to
-  // be enabled, detection will be skipped for any frame in which an external
-  // VAD decision is provided.
-  virtual int set_stream_has_voice(bool has_voice) = 0;
-
-  // Specifies the likelihood that a frame will be declared to contain voice.
-  // A higher value makes it more likely that speech will not be clipped, at
-  // the expense of more noise being detected as voice.
-  enum Likelihood {
-    kVeryLowLikelihood,
-    kLowLikelihood,
-    kModerateLikelihood,
-    kHighLikelihood
-  };
-
-  virtual int set_likelihood(Likelihood likelihood) = 0;
-  virtual Likelihood likelihood() const = 0;
-
-  // Sets the |size| of the frames in ms on which the VAD will operate. Larger
-  // frames will improve detection accuracy, but reduce the frequency of
-  // updates.
-  //
-  // This does not impact the size of frames passed to |ProcessStream()|.
-  virtual int set_frame_size_ms(int size) = 0;
-  virtual int frame_size_ms() const = 0;
-
- protected:
-  virtual ~VoiceDetection() {}
-};
-
-}  // namespace webrtc
-
-#endif  // MODULES_AUDIO_PROCESSING_INCLUDE_AUDIO_PROCESSING_H_
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/include/audio_processing_statistics.cc b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/include/audio_processing_statistics.cc
deleted file mode 100644
index 7139ee502e..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/include/audio_processing_statistics.cc
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- *  Copyright 2017 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#include "modules/audio_processing/include/audio_processing_statistics.h"
-
-namespace webrtc {
-
-AudioProcessingStats::AudioProcessingStats() = default;
-
-AudioProcessingStats::AudioProcessingStats(const AudioProcessingStats& other) =
-    default;
-
-AudioProcessingStats::~AudioProcessingStats() = default;
-
-}  // namespace webrtc
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/include/audio_processing_statistics.h b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/include/audio_processing_statistics.h
deleted file mode 100644
index 2ff20099e2..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/include/audio_processing_statistics.h
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- *  Copyright 2017 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#ifndef MODULES_AUDIO_PROCESSING_INCLUDE_AUDIO_PROCESSING_STATISTICS_H_
-#define MODULES_AUDIO_PROCESSING_INCLUDE_AUDIO_PROCESSING_STATISTICS_H_
-
-#include <stdint.h>
-
-#include "absl/types/optional.h"
-#include "rtc_base/system/rtc_export.h"
-
-namespace webrtc {
-// This version of the stats uses Optionals, it will replace the regular
-// AudioProcessingStatistics struct.
-struct RTC_EXPORT AudioProcessingStats {
-  AudioProcessingStats();
-  AudioProcessingStats(const AudioProcessingStats& other);
-  ~AudioProcessingStats();
-
-  // AEC Statistics.
-  // ERL = 10log_10(P_far / P_echo)
-  absl::optional<double> echo_return_loss;
-  // ERLE = 10log_10(P_echo / P_out)
-  absl::optional<double> echo_return_loss_enhancement;
-  // Fraction of time that the AEC linear filter is divergent, in a 1-second
-  // non-overlapped aggregation window.
-  absl::optional<double> divergent_filter_fraction;
-
-  // The delay metrics consists of the delay median and standard deviation. It
-  // also consists of the fraction of delay estimates that can make the echo
-  // cancellation perform poorly. The values are aggregated until the first
-  // call to |GetStatistics()| and afterwards aggregated and updated every
-  // second. Note that if there are several clients pulling metrics from
-  // |GetStatistics()| during a session the first call from any of them will
-  // change to one second aggregation window for all.
-  absl::optional<int32_t> delay_median_ms;
-  absl::optional<int32_t> delay_standard_deviation_ms;
-
-  // Residual echo detector likelihood.
-  absl::optional<double> residual_echo_likelihood;
-  // Maximum residual echo likelihood from the last time period.
-  absl::optional<double> residual_echo_likelihood_recent_max;
-
-  // The instantaneous delay estimate produced in the AEC. The unit is in
-  // milliseconds and the value is the instantaneous value at the time of the
-  // call to |GetStatistics()|.
-  absl::optional<int32_t> delay_ms;
-};
-
-}  // namespace webrtc
-
-#endif  // MODULES_AUDIO_PROCESSING_INCLUDE_AUDIO_PROCESSING_STATISTICS_H_
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/include/config.cc b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/include/config.cc
deleted file mode 100644
index 14240db305..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/include/config.cc
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- *  Copyright (c) 2016 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#include "modules/audio_processing/include/config.h"
-
-namespace webrtc {
-
-Config::Config() {}
-
-Config::~Config() {
-  for (OptionMap::iterator it = options_.begin(); it != options_.end(); ++it) {
-    delete it->second;
-  }
-}
-
-}  // namespace webrtc
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/include/config.h b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/include/config.h
deleted file mode 100644
index e77d3fd16d..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/include/config.h
+++ /dev/null
@@ -1,133 +0,0 @@
-/*
- *  Copyright (c) 2013 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#ifndef MODULES_AUDIO_PROCESSING_INCLUDE_CONFIG_H_
-#define MODULES_AUDIO_PROCESSING_INCLUDE_CONFIG_H_
-
-#include <map>
-
-#include "rtc_base/constructormagic.h"
-#include "rtc_base/system/rtc_export.h"
-
-namespace webrtc {
-
-// Only add new values to the end of the enumeration and never remove (only
-// deprecate) to maintain binary compatibility.
-enum class ConfigOptionID {
-  kMyExperimentForTest,
-  kAlgo1CostFunctionForTest,
-  kTemporalLayersFactory,  // Deprecated
-  kNetEqCapacityConfig,    // Deprecated
-  kNetEqFastAccelerate,    // Deprecated
-  kVoicePacing,            // Deprecated
-  kExtendedFilter,
-  kDelayAgnostic,
-  kExperimentalAgc,
-  kExperimentalNs,
-  kBeamforming,      // Deprecated
-  kIntelligibility,  // Deprecated
-  kEchoCanceller3,   // Deprecated
-  kAecRefinedAdaptiveFilter,
-  kLevelControl  // Deprecated
-};
-
-// Class Config is designed to ease passing a set of options across webrtc code.
-// Options are identified by typename in order to avoid incorrect casts.
-//
-// Usage:
-// * declaring an option:
-//    struct Algo1_CostFunction {
-//      virtual float cost(int x) const { return x; }
-//      virtual ~Algo1_CostFunction() {}
-//    };
-//
-// * accessing an option:
-//    config.Get<Algo1_CostFunction>().cost(value);
-//
-// * setting an option:
-//    struct SqrCost : Algo1_CostFunction {
-//      virtual float cost(int x) const { return x*x; }
-//    };
-//    config.Set<Algo1_CostFunction>(new SqrCost());
-//
-// Note: This class is thread-compatible (like STL containers).
-class RTC_EXPORT Config {
- public:
-  // Returns the option if set or a default constructed one.
-  // Callers that access options too often are encouraged to cache the result.
-  // Returned references are owned by this.
-  //
-  // Requires std::is_default_constructible<T>
-  template <typename T>
-  const T& Get() const;
-
-  // Set the option, deleting any previous instance of the same.
-  // This instance gets ownership of the newly set value.
-  template <typename T>
-  void Set(T* value);
-
-  Config();
-  ~Config();
-
- private:
-  struct BaseOption {
-    virtual ~BaseOption() {}
-  };
-
-  template <typename T>
-  struct Option : BaseOption {
-    explicit Option(T* v) : value(v) {}
-    ~Option() { delete value; }
-    T* value;
-  };
-
-  template <typename T>
-  static ConfigOptionID identifier() {
-    return T::identifier;
-  }
-
-  // Used to instantiate a default constructed object that doesn't needs to be
-  // owned. This allows Get<T> to be implemented without requiring explicitly
-  // locks.
-  template <typename T>
-  static const T& default_value() {
-    static const T* const def = new T();
-    return *def;
-  }
-
-  typedef std::map<ConfigOptionID, BaseOption*> OptionMap;
-  OptionMap options_;
-
-  // RTC_DISALLOW_COPY_AND_ASSIGN
-  Config(const Config&);
-  void operator=(const Config&);
-};
-
-template <typename T>
-const T& Config::Get() const {
-  OptionMap::const_iterator it = options_.find(identifier<T>());
-  if (it != options_.end()) {
-    const T* t = static_cast<Option<T>*>(it->second)->value;
-    if (t) {
-      return *t;
-    }
-  }
-  return default_value<T>();
-}
-
-template <typename T>
-void Config::Set(T* value) {
-  BaseOption*& it = options_[identifier<T>()];
-  delete it;
-  it = new Option<T>(value);
-}
-}  // namespace webrtc
-
-#endif  // MODULES_AUDIO_PROCESSING_INCLUDE_CONFIG_H_
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/include/gain_control.h b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/include/gain_control.h
deleted file mode 100644
index 420b1c6e38..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/include/gain_control.h
+++ /dev/null
@@ -1,108 +0,0 @@
-/*
- *  Copyright (c) 2018 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#ifndef MODULES_AUDIO_PROCESSING_INCLUDE_GAIN_CONTROL_H_
-#define MODULES_AUDIO_PROCESSING_INCLUDE_GAIN_CONTROL_H_
-
-namespace webrtc {
-
-// The automatic gain control (AGC) component brings the signal to an
-// appropriate range. This is done by applying a digital gain directly and, in
-// the analog mode, prescribing an analog gain to be applied at the audio HAL.
-//
-// Recommended to be enabled on the client-side.
-class GainControl {
- public:
-  virtual int Enable(bool enable) = 0;
-  virtual bool is_enabled() const = 0;
-
-  // When an analog mode is set, this must be called prior to |ProcessStream()|
-  // to pass the current analog level from the audio HAL. Must be within the
-  // range provided to |set_analog_level_limits()|.
-  virtual int set_stream_analog_level(int level) = 0;
-
-  // When an analog mode is set, this should be called after |ProcessStream()|
-  // to obtain the recommended new analog level for the audio HAL. It is the
-  // users responsibility to apply this level.
-  virtual int stream_analog_level() = 0;
-
-  enum Mode {
-    // Adaptive mode intended for use if an analog volume control is available
-    // on the capture device. It will require the user to provide coupling
-    // between the OS mixer controls and AGC through the |stream_analog_level()|
-    // functions.
-    //
-    // It consists of an analog gain prescription for the audio device and a
-    // digital compression stage.
-    kAdaptiveAnalog,
-
-    // Adaptive mode intended for situations in which an analog volume control
-    // is unavailable. It operates in a similar fashion to the adaptive analog
-    // mode, but with scaling instead applied in the digital domain. As with
-    // the analog mode, it additionally uses a digital compression stage.
-    kAdaptiveDigital,
-
-    // Fixed mode which enables only the digital compression stage also used by
-    // the two adaptive modes.
-    //
-    // It is distinguished from the adaptive modes by considering only a
-    // short time-window of the input signal. It applies a fixed gain through
-    // most of the input level range, and compresses (gradually reduces gain
-    // with increasing level) the input signal at higher levels. This mode is
-    // preferred on embedded devices where the capture signal level is
-    // predictable, so that a known gain can be applied.
-    kFixedDigital
-  };
-
-  virtual int set_mode(Mode mode) = 0;
-  virtual Mode mode() const = 0;
-
-  // Sets the target peak |level| (or envelope) of the AGC in dBFs (decibels
-  // from digital full-scale). The convention is to use positive values. For
-  // instance, passing in a value of 3 corresponds to -3 dBFs, or a target
-  // level 3 dB below full-scale. Limited to [0, 31].
-  //
-  // TODO(ajm): use a negative value here instead, if/when VoE will similarly
-  //            update its interface.
-  virtual int set_target_level_dbfs(int level) = 0;
-  virtual int target_level_dbfs() const = 0;
-
-  // Sets the maximum |gain| the digital compression stage may apply, in dB. A
-  // higher number corresponds to greater compression, while a value of 0 will
-  // leave the signal uncompressed. Limited to [0, 90].
-  virtual int set_compression_gain_db(int gain) = 0;
-  virtual int compression_gain_db() const = 0;
-
-  // When enabled, the compression stage will hard limit the signal to the
-  // target level. Otherwise, the signal will be compressed but not limited
-  // above the target level.
-  virtual int enable_limiter(bool enable) = 0;
-  virtual bool is_limiter_enabled() const = 0;
-
-  // Sets the |minimum| and |maximum| analog levels of the audio capture device.
-  // Must be set if and only if an analog mode is used. Limited to [0, 65535].
-  virtual int set_analog_level_limits(int minimum, int maximum) = 0;
-  virtual int analog_level_minimum() const = 0;
-  virtual int analog_level_maximum() const = 0;
-
-  // Returns true if the AGC has detected a saturation event (period where the
-  // signal reaches digital full-scale) in the current frame and the analog
-  // level cannot be reduced.
-  //
-  // This could be used as an indicator to reduce or disable analog mic gain at
-  // the audio HAL.
-  virtual bool stream_is_saturated() const = 0;
-
- protected:
-  virtual ~GainControl() {}
-};
-}  // namespace webrtc
-
-#endif  // MODULES_AUDIO_PROCESSING_INCLUDE_GAIN_CONTROL_H_
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/include/mock_audio_processing.h b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/include/mock_audio_processing.h
deleted file mode 100644
index f00a16d5e2..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/include/mock_audio_processing.h
+++ /dev/null
@@ -1,199 +0,0 @@
-/*
- *  Copyright (c) 2013 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#ifndef MODULES_AUDIO_PROCESSING_INCLUDE_MOCK_AUDIO_PROCESSING_H_
-#define MODULES_AUDIO_PROCESSING_INCLUDE_MOCK_AUDIO_PROCESSING_H_
-
-#include <memory>
-
-#include "modules/audio_processing/include/aec_dump.h"
-#include "modules/audio_processing/include/audio_processing.h"
-#include "modules/audio_processing/include/audio_processing_statistics.h"
-#include "test/gmock.h"
-
-namespace webrtc {
-
-namespace test {
-class MockGainControl : public GainControl {
- public:
-  virtual ~MockGainControl() {}
-  MOCK_METHOD1(Enable, int(bool enable));
-  MOCK_CONST_METHOD0(is_enabled, bool());
-  MOCK_METHOD1(set_stream_analog_level, int(int level));
-  MOCK_METHOD0(stream_analog_level, int());
-  MOCK_METHOD1(set_mode, int(Mode mode));
-  MOCK_CONST_METHOD0(mode, Mode());
-  MOCK_METHOD1(set_target_level_dbfs, int(int level));
-  MOCK_CONST_METHOD0(target_level_dbfs, int());
-  MOCK_METHOD1(set_compression_gain_db, int(int gain));
-  MOCK_CONST_METHOD0(compression_gain_db, int());
-  MOCK_METHOD1(enable_limiter, int(bool enable));
-  MOCK_CONST_METHOD0(is_limiter_enabled, bool());
-  MOCK_METHOD2(set_analog_level_limits, int(int minimum, int maximum));
-  MOCK_CONST_METHOD0(analog_level_minimum, int());
-  MOCK_CONST_METHOD0(analog_level_maximum, int());
-  MOCK_CONST_METHOD0(stream_is_saturated, bool());
-};
-
-class MockLevelEstimator : public LevelEstimator {
- public:
-  virtual ~MockLevelEstimator() {}
-  MOCK_METHOD1(Enable, int(bool enable));
-  MOCK_CONST_METHOD0(is_enabled, bool());
-  MOCK_METHOD0(RMS, int());
-};
-
-class MockNoiseSuppression : public NoiseSuppression {
- public:
-  virtual ~MockNoiseSuppression() {}
-  MOCK_METHOD1(Enable, int(bool enable));
-  MOCK_CONST_METHOD0(is_enabled, bool());
-  MOCK_METHOD1(set_level, int(Level level));
-  MOCK_CONST_METHOD0(level, Level());
-  MOCK_CONST_METHOD0(speech_probability, float());
-  MOCK_METHOD0(NoiseEstimate, std::vector<float>());
-};
-
-class MockCustomProcessing : public CustomProcessing {
- public:
-  virtual ~MockCustomProcessing() {}
-  MOCK_METHOD2(Initialize, void(int sample_rate_hz, int num_channels));
-  MOCK_METHOD1(Process, void(AudioBuffer* audio));
-  MOCK_METHOD1(SetRuntimeSetting,
-               void(AudioProcessing::RuntimeSetting setting));
-  MOCK_CONST_METHOD0(ToString, std::string());
-};
-
-class MockCustomAudioAnalyzer : public CustomAudioAnalyzer {
- public:
-  virtual ~MockCustomAudioAnalyzer() {}
-  MOCK_METHOD2(Initialize, void(int sample_rate_hz, int num_channels));
-  MOCK_METHOD1(Analyze, void(const AudioBuffer* audio));
-  MOCK_CONST_METHOD0(ToString, std::string());
-};
-
-class MockEchoControl : public EchoControl {
- public:
-  virtual ~MockEchoControl() {}
-  MOCK_METHOD1(AnalyzeRender, void(AudioBuffer* render));
-  MOCK_METHOD1(AnalyzeCapture, void(AudioBuffer* capture));
-  MOCK_METHOD2(ProcessCapture,
-               void(AudioBuffer* capture, bool echo_path_change));
-  MOCK_CONST_METHOD0(GetMetrics, Metrics());
-  MOCK_METHOD1(SetAudioBufferDelay, void(size_t delay_ms));
-};
-
-class MockVoiceDetection : public VoiceDetection {
- public:
-  virtual ~MockVoiceDetection() {}
-  MOCK_METHOD1(Enable, int(bool enable));
-  MOCK_CONST_METHOD0(is_enabled, bool());
-  MOCK_CONST_METHOD0(stream_has_voice, bool());
-  MOCK_METHOD1(set_stream_has_voice, int(bool has_voice));
-  MOCK_METHOD1(set_likelihood, int(Likelihood likelihood));
-  MOCK_CONST_METHOD0(likelihood, Likelihood());
-  MOCK_METHOD1(set_frame_size_ms, int(int size));
-  MOCK_CONST_METHOD0(frame_size_ms, int());
-};
-
-class MockAudioProcessing : public testing::NiceMock<AudioProcessing> {
- public:
-  MockAudioProcessing()
-      : gain_control_(new testing::NiceMock<MockGainControl>()),
-        level_estimator_(new testing::NiceMock<MockLevelEstimator>()),
-        noise_suppression_(new testing::NiceMock<MockNoiseSuppression>()),
-        voice_detection_(new testing::NiceMock<MockVoiceDetection>()) {}
-
-  virtual ~MockAudioProcessing() {}
-
-  MOCK_METHOD0(Initialize, int());
-  MOCK_METHOD6(Initialize,
-               int(int capture_input_sample_rate_hz,
-                   int capture_output_sample_rate_hz,
-                   int render_sample_rate_hz,
-                   ChannelLayout capture_input_layout,
-                   ChannelLayout capture_output_layout,
-                   ChannelLayout render_input_layout));
-  MOCK_METHOD1(Initialize, int(const ProcessingConfig& processing_config));
-  MOCK_METHOD1(ApplyConfig, void(const Config& config));
-  MOCK_METHOD1(SetExtraOptions, void(const webrtc::Config& config));
-  MOCK_CONST_METHOD0(proc_sample_rate_hz, int());
-  MOCK_CONST_METHOD0(proc_split_sample_rate_hz, int());
-  MOCK_CONST_METHOD0(num_input_channels, size_t());
-  MOCK_CONST_METHOD0(num_proc_channels, size_t());
-  MOCK_CONST_METHOD0(num_output_channels, size_t());
-  MOCK_CONST_METHOD0(num_reverse_channels, size_t());
-  MOCK_METHOD1(set_output_will_be_muted, void(bool muted));
-  MOCK_METHOD1(SetRuntimeSetting, void(RuntimeSetting setting));
-  MOCK_METHOD1(ProcessStream, int(AudioFrame* frame));
-  MOCK_METHOD7(ProcessStream,
-               int(const float* const* src,
-                   size_t samples_per_channel,
-                   int input_sample_rate_hz,
-                   ChannelLayout input_layout,
-                   int output_sample_rate_hz,
-                   ChannelLayout output_layout,
-                   float* const* dest));
-  MOCK_METHOD4(ProcessStream,
-               int(const float* const* src,
-                   const StreamConfig& input_config,
-                   const StreamConfig& output_config,
-                   float* const* dest));
-  MOCK_METHOD1(ProcessReverseStream, int(AudioFrame* frame));
-  MOCK_METHOD4(AnalyzeReverseStream,
-               int(const float* const* data,
-                   size_t samples_per_channel,
-                   int sample_rate_hz,
-                   ChannelLayout layout));
-  MOCK_METHOD4(ProcessReverseStream,
-               int(const float* const* src,
-                   const StreamConfig& input_config,
-                   const StreamConfig& output_config,
-                   float* const* dest));
-  MOCK_METHOD1(set_stream_delay_ms, int(int delay));
-  MOCK_CONST_METHOD0(stream_delay_ms, int());
-  MOCK_CONST_METHOD0(was_stream_delay_set, bool());
-  MOCK_METHOD1(set_stream_key_pressed, void(bool key_pressed));
-  MOCK_METHOD1(set_delay_offset_ms, void(int offset));
-  MOCK_CONST_METHOD0(delay_offset_ms, int());
-
-  virtual void AttachAecDump(std::unique_ptr<AecDump> aec_dump) {}
-  MOCK_METHOD0(DetachAecDump, void());
-
-  virtual void AttachPlayoutAudioGenerator(
-      std::unique_ptr<AudioGenerator> audio_generator) {}
-  MOCK_METHOD0(DetachPlayoutAudioGenerator, void());
-
-  MOCK_METHOD0(UpdateHistogramsOnCallEnd, void());
-  MOCK_CONST_METHOD1(GetStatistics, AudioProcessingStats(bool));
-  virtual MockGainControl* gain_control() const { return gain_control_.get(); }
-  virtual MockLevelEstimator* level_estimator() const {
-    return level_estimator_.get();
-  }
-  virtual MockNoiseSuppression* noise_suppression() const {
-    return noise_suppression_.get();
-  }
-  virtual MockVoiceDetection* voice_detection() const {
-    return voice_detection_.get();
-  }
-
-  MOCK_CONST_METHOD0(GetConfig, AudioProcessing::Config());
-
- private:
-  std::unique_ptr<MockGainControl> gain_control_;
-  std::unique_ptr<MockLevelEstimator> level_estimator_;
-  std::unique_ptr<MockNoiseSuppression> noise_suppression_;
-  std::unique_ptr<MockVoiceDetection> voice_detection_;
-};
-
-}  // namespace test
-}  // namespace webrtc
-
-#endif  // MODULES_AUDIO_PROCESSING_INCLUDE_MOCK_AUDIO_PROCESSING_H_
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/level_estimator_impl.cc b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/level_estimator_impl.cc
deleted file mode 100644
index 5b49b35fdc..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/level_estimator_impl.cc
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- *  Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#include "modules/audio_processing/level_estimator_impl.h"
-
-#include <stddef.h>
-#include <stdint.h>
-
-#include "api/array_view.h"
-#include "modules/audio_processing/audio_buffer.h"
-#include "modules/audio_processing/rms_level.h"
-#include "rtc_base/checks.h"
-
-namespace webrtc {
-
-LevelEstimatorImpl::LevelEstimatorImpl(rtc::CriticalSection* crit)
-    : crit_(crit), rms_(new RmsLevel()) {
-  RTC_DCHECK(crit);
-}
-
-LevelEstimatorImpl::~LevelEstimatorImpl() {}
-
-void LevelEstimatorImpl::Initialize() {
-  rtc::CritScope cs(crit_);
-  rms_->Reset();
-}
-
-void LevelEstimatorImpl::ProcessStream(AudioBuffer* audio) {
-  RTC_DCHECK(audio);
-  rtc::CritScope cs(crit_);
-  if (!enabled_) {
-    return;
-  }
-
-  for (size_t i = 0; i < audio->num_channels(); i++) {
-    rms_->Analyze(rtc::ArrayView<const int16_t>(audio->channels_const()[i],
-                                                audio->num_frames()));
-  }
-}
-
-int LevelEstimatorImpl::Enable(bool enable) {
-  rtc::CritScope cs(crit_);
-  if (enable && !enabled_) {
-    rms_->Reset();
-  }
-  enabled_ = enable;
-  return AudioProcessing::kNoError;
-}
-
-bool LevelEstimatorImpl::is_enabled() const {
-  rtc::CritScope cs(crit_);
-  return enabled_;
-}
-
-int LevelEstimatorImpl::RMS() {
-  rtc::CritScope cs(crit_);
-  if (!enabled_) {
-    return AudioProcessing::kNotEnabledError;
-  }
-
-  return rms_->Average();
-}
-}  // namespace webrtc
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/level_estimator_impl.h b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/level_estimator_impl.h
deleted file mode 100644
index 901ae4cf58..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/level_estimator_impl.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- *  Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#ifndef MODULES_AUDIO_PROCESSING_LEVEL_ESTIMATOR_IMPL_H_
-#define MODULES_AUDIO_PROCESSING_LEVEL_ESTIMATOR_IMPL_H_
-
-#include <memory>
-
-#include "modules/audio_processing/include/audio_processing.h"
-#include "rtc_base/constructormagic.h"
-#include "rtc_base/criticalsection.h"
-
-namespace webrtc {
-
-class AudioBuffer;
-class RmsLevel;
-
-class LevelEstimatorImpl : public LevelEstimator {
- public:
-  explicit LevelEstimatorImpl(rtc::CriticalSection* crit);
-  ~LevelEstimatorImpl() override;
-
-  // TODO(peah): Fold into ctor, once public API is removed.
-  void Initialize();
-  void ProcessStream(AudioBuffer* audio);
-
-  // LevelEstimator implementation.
-  int Enable(bool enable) override;
-  bool is_enabled() const override;
-  int RMS() override;
-
- private:
-  rtc::CriticalSection* const crit_ = nullptr;
-  bool enabled_ RTC_GUARDED_BY(crit_) = false;
-  std::unique_ptr<RmsLevel> rms_ RTC_GUARDED_BY(crit_);
-  RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(LevelEstimatorImpl);
-};
-}  // namespace webrtc
-
-#endif  // MODULES_AUDIO_PROCESSING_LEVEL_ESTIMATOR_IMPL_H_
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/logging/apm_data_dumper.cc b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/logging/apm_data_dumper.cc
deleted file mode 100644
index 45d8088c98..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/logging/apm_data_dumper.cc
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- *  Copyright (c) 2016 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#include "modules/audio_processing/logging/apm_data_dumper.h"
-
-#include "rtc_base/strings/string_builder.h"
-
-// Check to verify that the define is properly set.
-#if !defined(WEBRTC_APM_DEBUG_DUMP) || \
-    (WEBRTC_APM_DEBUG_DUMP != 0 && WEBRTC_APM_DEBUG_DUMP != 1)
-#error "Set WEBRTC_APM_DEBUG_DUMP to either 0 or 1"
-#endif
-
-namespace webrtc {
-
-namespace {
-
-#if WEBRTC_APM_DEBUG_DUMP == 1
-std::string FormFileName(const char* name,
-                         int instance_index,
-                         int reinit_index,
-                         const std::string& suffix) {
-  char buf[1024];
-  rtc::SimpleStringBuilder ss(buf);
-  ss << name << "_" << instance_index << "-" << reinit_index << suffix;
-  return ss.str();
-}
-#endif
-
-}  // namespace
-
-#if WEBRTC_APM_DEBUG_DUMP == 1
-ApmDataDumper::ApmDataDumper(int instance_index)
-    : instance_index_(instance_index) {}
-#else
-ApmDataDumper::ApmDataDumper(int instance_index) {}
-#endif
-
-ApmDataDumper::~ApmDataDumper() {}
-
-#if WEBRTC_APM_DEBUG_DUMP == 1
-bool ApmDataDumper::recording_activated_ = false;
-;
-FILE* ApmDataDumper::GetRawFile(const char* name) {
-  std::string filename =
-      FormFileName(name, instance_index_, recording_set_index_, ".dat");
-  auto& f = raw_files_[filename];
-  if (!f) {
-    f.reset(fopen(filename.c_str(), "wb"));
-  }
-  return f.get();
-}
-
-WavWriter* ApmDataDumper::GetWavFile(const char* name,
-                                     int sample_rate_hz,
-                                     int num_channels) {
-  std::string filename =
-      FormFileName(name, instance_index_, recording_set_index_, ".wav");
-  auto& f = wav_files_[filename];
-  if (!f) {
-    f.reset(new WavWriter(filename.c_str(), sample_rate_hz, num_channels));
-  }
-  return f.get();
-}
-
-#endif
-
-}  // namespace webrtc
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/logging/apm_data_dumper.h b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/logging/apm_data_dumper.h
deleted file mode 100644
index f0c5978200..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/logging/apm_data_dumper.h
+++ /dev/null
@@ -1,261 +0,0 @@
-/*
- *  Copyright (c) 2016 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#ifndef MODULES_AUDIO_PROCESSING_LOGGING_APM_DATA_DUMPER_H_
-#define MODULES_AUDIO_PROCESSING_LOGGING_APM_DATA_DUMPER_H_
-
-#include <stdint.h>
-#include <stdio.h>
-
-#if WEBRTC_APM_DEBUG_DUMP == 1
-#include <unordered_map>
-#endif
-
-#include "api/array_view.h"
-#if WEBRTC_APM_DEBUG_DUMP == 1
-#include "common_audio/wav_file.h"
-#endif
-#include "rtc_base/constructormagic.h"
-
-// Check to verify that the define is properly set.
-#if !defined(WEBRTC_APM_DEBUG_DUMP) || \
-    (WEBRTC_APM_DEBUG_DUMP != 0 && WEBRTC_APM_DEBUG_DUMP != 1)
-#error "Set WEBRTC_APM_DEBUG_DUMP to either 0 or 1"
-#endif
-
-namespace webrtc {
-
-#if WEBRTC_APM_DEBUG_DUMP == 1
-// Functor used to use as a custom deleter in the map of file pointers to raw
-// files.
-struct RawFileCloseFunctor {
-  void operator()(FILE* f) const { fclose(f); }
-};
-#endif
-
-// Class that handles dumping of variables into files.
-class ApmDataDumper {
- public:
-  // Constructor that takes an instance index that may
-  // be used to distinguish data dumped from different
-  // instances of the code.
-  explicit ApmDataDumper(int instance_index);
-
-  ~ApmDataDumper();
-
-  // Activates or deactivate the dumping functionality.
-  static void SetActivated(bool activated) {
-#if WEBRTC_APM_DEBUG_DUMP == 1
-    recording_activated_ = activated;
-#endif
-  }
-
-  // Reinitializes the data dumping such that new versions
-  // of all files being dumped to are created.
-  void InitiateNewSetOfRecordings() {
-#if WEBRTC_APM_DEBUG_DUMP == 1
-    ++recording_set_index_;
-#endif
-  }
-
-  // Methods for performing dumping of data of various types into
-  // various formats.
-  void DumpRaw(const char* name, double v) {
-#if WEBRTC_APM_DEBUG_DUMP == 1
-    if (recording_activated_) {
-      FILE* file = GetRawFile(name);
-      fwrite(&v, sizeof(v), 1, file);
-    }
-#endif
-  }
-
-  void DumpRaw(const char* name, size_t v_length, const double* v) {
-#if WEBRTC_APM_DEBUG_DUMP == 1
-    if (recording_activated_) {
-      FILE* file = GetRawFile(name);
-      fwrite(v, sizeof(v[0]), v_length, file);
-    }
-#endif
-  }
-
-  void DumpRaw(const char* name, rtc::ArrayView<const double> v) {
-#if WEBRTC_APM_DEBUG_DUMP == 1
-    if (recording_activated_) {
-      DumpRaw(name, v.size(), v.data());
-    }
-#endif
-  }
-
-  void DumpRaw(const char* name, float v) {
-#if WEBRTC_APM_DEBUG_DUMP == 1
-    if (recording_activated_) {
-      FILE* file = GetRawFile(name);
-      fwrite(&v, sizeof(v), 1, file);
-    }
-#endif
-  }
-
-  void DumpRaw(const char* name, size_t v_length, const float* v) {
-#if WEBRTC_APM_DEBUG_DUMP == 1
-    if (recording_activated_) {
-      FILE* file = GetRawFile(name);
-      fwrite(v, sizeof(v[0]), v_length, file);
-    }
-#endif
-  }
-
-  void DumpRaw(const char* name, rtc::ArrayView<const float> v) {
-#if WEBRTC_APM_DEBUG_DUMP == 1
-    if (recording_activated_) {
-      DumpRaw(name, v.size(), v.data());
-    }
-#endif
-  }
-
-  void DumpRaw(const char* name, bool v) {
-#if WEBRTC_APM_DEBUG_DUMP == 1
-    if (recording_activated_) {
-      DumpRaw(name, static_cast<int16_t>(v));
-    }
-#endif
-  }
-
-  void DumpRaw(const char* name, size_t v_length, const bool* v) {
-#if WEBRTC_APM_DEBUG_DUMP == 1
-    if (recording_activated_) {
-      FILE* file = GetRawFile(name);
-      for (size_t k = 0; k < v_length; ++k) {
-        int16_t value = static_cast<int16_t>(v[k]);
-        fwrite(&value, sizeof(value), 1, file);
-      }
-    }
-#endif
-  }
-
-  void DumpRaw(const char* name, rtc::ArrayView<const bool> v) {
-#if WEBRTC_APM_DEBUG_DUMP == 1
-    if (recording_activated_) {
-      DumpRaw(name, v.size(), v.data());
-    }
-#endif
-  }
-
-  void DumpRaw(const char* name, int16_t v) {
-#if WEBRTC_APM_DEBUG_DUMP == 1
-    if (recording_activated_) {
-      FILE* file = GetRawFile(name);
-      fwrite(&v, sizeof(v), 1, file);
-    }
-#endif
-  }
-
-  void DumpRaw(const char* name, size_t v_length, const int16_t* v) {
-#if WEBRTC_APM_DEBUG_DUMP == 1
-    if (recording_activated_) {
-      FILE* file = GetRawFile(name);
-      fwrite(v, sizeof(v[0]), v_length, file);
-    }
-#endif
-  }
-
-  void DumpRaw(const char* name, rtc::ArrayView<const int16_t> v) {
-#if WEBRTC_APM_DEBUG_DUMP == 1
-    if (recording_activated_) {
-      DumpRaw(name, v.size(), v.data());
-    }
-#endif
-  }
-
-  void DumpRaw(const char* name, int32_t v) {
-#if WEBRTC_APM_DEBUG_DUMP == 1
-    if (recording_activated_) {
-      FILE* file = GetRawFile(name);
-      fwrite(&v, sizeof(v), 1, file);
-    }
-#endif
-  }
-
-  void DumpRaw(const char* name, size_t v_length, const int32_t* v) {
-#if WEBRTC_APM_DEBUG_DUMP == 1
-    if (recording_activated_) {
-      FILE* file = GetRawFile(name);
-      fwrite(v, sizeof(v[0]), v_length, file);
-    }
-#endif
-  }
-
-  void DumpRaw(const char* name, size_t v) {
-#if WEBRTC_APM_DEBUG_DUMP == 1
-    if (recording_activated_) {
-      FILE* file = GetRawFile(name);
-      fwrite(&v, sizeof(v), 1, file);
-    }
-#endif
-  }
-
-  void DumpRaw(const char* name, size_t v_length, const size_t* v) {
-#if WEBRTC_APM_DEBUG_DUMP == 1
-    if (recording_activated_) {
-      FILE* file = GetRawFile(name);
-      fwrite(v, sizeof(v[0]), v_length, file);
-    }
-#endif
-  }
-
-  void DumpRaw(const char* name, rtc::ArrayView<const int32_t> v) {
-#if WEBRTC_APM_DEBUG_DUMP == 1
-    if (recording_activated_) {
-      DumpRaw(name, v.size(), v.data());
-    }
-#endif
-  }
-
-  void DumpWav(const char* name,
-               size_t v_length,
-               const float* v,
-               int sample_rate_hz,
-               int num_channels) {
-#if WEBRTC_APM_DEBUG_DUMP == 1
-    if (recording_activated_) {
-      WavWriter* file = GetWavFile(name, sample_rate_hz, num_channels);
-      file->WriteSamples(v, v_length);
-    }
-#endif
-  }
-
-  void DumpWav(const char* name,
-               rtc::ArrayView<const float> v,
-               int sample_rate_hz,
-               int num_channels) {
-#if WEBRTC_APM_DEBUG_DUMP == 1
-    if (recording_activated_) {
-      DumpWav(name, v.size(), v.data(), sample_rate_hz, num_channels);
-    }
-#endif
-  }
-
- private:
-#if WEBRTC_APM_DEBUG_DUMP == 1
-  static bool recording_activated_;
-  const int instance_index_;
-  int recording_set_index_ = 0;
-  std::unordered_map<std::string, std::unique_ptr<FILE, RawFileCloseFunctor>>
-      raw_files_;
-  std::unordered_map<std::string, std::unique_ptr<WavWriter>> wav_files_;
-
-  FILE* GetRawFile(const char* name);
-  WavWriter* GetWavFile(const char* name, int sample_rate_hz, int num_channels);
-#endif
-  RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(ApmDataDumper);
-};
-
-}  // namespace webrtc
-
-#endif  // MODULES_AUDIO_PROCESSING_LOGGING_APM_DATA_DUMPER_H_
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/low_cut_filter.cc b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/low_cut_filter.cc
deleted file mode 100644
index 581d6bc42a..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/low_cut_filter.cc
+++ /dev/null
@@ -1,106 +0,0 @@
-/*
- *  Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#include "modules/audio_processing/low_cut_filter.h"
-
-#include <stdint.h>
-#include <cstring>
-
-#include "common_audio/signal_processing/include/signal_processing_library.h"
-#include "modules/audio_processing/audio_buffer.h"
-#include "modules/audio_processing/include/audio_processing.h"
-#include "rtc_base/checks.h"
-
-namespace webrtc {
-namespace {
-const int16_t kFilterCoefficients8kHz[5] = {3798, -7596, 3798, 7807, -3733};
-const int16_t kFilterCoefficients[5] = {4012, -8024, 4012, 8002, -3913};
-}  // namespace
-
-class LowCutFilter::BiquadFilter {
- public:
-  explicit BiquadFilter(int sample_rate_hz)
-      : ba_(sample_rate_hz == AudioProcessing::kSampleRate8kHz
-                ? kFilterCoefficients8kHz
-                : kFilterCoefficients) {
-    std::memset(x_, 0, sizeof(x_));
-    std::memset(y_, 0, sizeof(y_));
-  }
-
-  void Process(int16_t* data, size_t length) {
-    const int16_t* const ba = ba_;
-    int16_t* x = x_;
-    int16_t* y = y_;
-    int32_t tmp_int32 = 0;
-
-    for (size_t i = 0; i < length; i++) {
-      //  y[i] = b[0] * x[i] +  b[1] * x[i-1] +  b[2] * x[i-2]
-      //                     + -a[1] * y[i-1] + -a[2] * y[i-2];
-
-      tmp_int32 = y[1] * ba[3];   // -a[1] * y[i-1] (low part)
-      tmp_int32 += y[3] * ba[4];  // -a[2] * y[i-2] (low part)
-      tmp_int32 = (tmp_int32 >> 15);
-      tmp_int32 += y[0] * ba[3];  // -a[1] * y[i-1] (high part)
-      tmp_int32 += y[2] * ba[4];  // -a[2] * y[i-2] (high part)
-      tmp_int32 *= 2;
-
-      tmp_int32 += data[i] * ba[0];  // b[0] * x[0]
-      tmp_int32 += x[0] * ba[1];     // b[1] * x[i-1]
-      tmp_int32 += x[1] * ba[2];     // b[2] * x[i-2]
-
-      // Update state (input part).
-      x[1] = x[0];
-      x[0] = data[i];
-
-      // Update state (filtered part).
-      y[2] = y[0];
-      y[3] = y[1];
-      y[0] = static_cast<int16_t>(tmp_int32 >> 13);
-
-      y[1] = static_cast<int16_t>((tmp_int32 & 0x00001FFF) * 4);
-
-      // Rounding in Q12, i.e. add 2^11.
-      tmp_int32 += 2048;
-
-      // Saturate (to 2^27) so that the HP filtered signal does not overflow.
-      tmp_int32 = WEBRTC_SPL_SAT(static_cast<int32_t>(134217727), tmp_int32,
-                                 static_cast<int32_t>(-134217728));
-
-      // Convert back to Q0 and use rounding.
-      data[i] = static_cast<int16_t>(tmp_int32 >> 12);
-    }
-  }
-
- private:
-  const int16_t* const ba_ = nullptr;
-  int16_t x_[2];
-  int16_t y_[4];
-};
-
-LowCutFilter::LowCutFilter(size_t channels, int sample_rate_hz) {
-  filters_.resize(channels);
-  for (size_t i = 0; i < channels; i++) {
-    filters_[i].reset(new BiquadFilter(sample_rate_hz));
-  }
-}
-
-LowCutFilter::~LowCutFilter() {}
-
-void LowCutFilter::Process(AudioBuffer* audio) {
-  RTC_DCHECK(audio);
-  RTC_DCHECK_GE(160, audio->num_frames_per_band());
-  RTC_DCHECK_EQ(filters_.size(), audio->num_channels());
-  for (size_t i = 0; i < filters_.size(); i++) {
-    filters_[i]->Process(audio->split_bands(i)[kBand0To8kHz],
-                         audio->num_frames_per_band());
-  }
-}
-
-}  // namespace webrtc
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/low_cut_filter.h b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/low_cut_filter.h
deleted file mode 100644
index fd4c6f19cb..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/low_cut_filter.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- *  Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#ifndef MODULES_AUDIO_PROCESSING_LOW_CUT_FILTER_H_
-#define MODULES_AUDIO_PROCESSING_LOW_CUT_FILTER_H_
-
-#include <memory>
-#include <vector>
-
-#include "rtc_base/constructormagic.h"
-
-namespace webrtc {
-
-class AudioBuffer;
-
-class LowCutFilter {
- public:
-  LowCutFilter(size_t channels, int sample_rate_hz);
-  ~LowCutFilter();
-  void Process(AudioBuffer* audio);
-
- private:
-  class BiquadFilter;
-  std::vector<std::unique_ptr<BiquadFilter>> filters_;
-  RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(LowCutFilter);
-};
-}  // namespace webrtc
-
-#endif  // MODULES_AUDIO_PROCESSING_LOW_CUT_FILTER_H_
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/noise_suppression_impl.cc b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/noise_suppression_impl.cc
deleted file mode 100644
index d8d9e32340..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/noise_suppression_impl.cc
+++ /dev/null
@@ -1,211 +0,0 @@
-/*
- *  Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#include "modules/audio_processing/noise_suppression_impl.h"
-
-#include "modules/audio_processing/audio_buffer.h"
-#include "rtc_base/checks.h"
-#include "rtc_base/constructormagic.h"
-#if defined(WEBRTC_NS_FLOAT)
-#include "modules/audio_processing/ns/noise_suppression.h"
-
-#define NS_CREATE WebRtcNs_Create
-#define NS_FREE WebRtcNs_Free
-#define NS_INIT WebRtcNs_Init
-#define NS_SET_POLICY WebRtcNs_set_policy
-typedef NsHandle NsState;
-#elif defined(WEBRTC_NS_FIXED)
-#include "modules/audio_processing/ns/noise_suppression_x.h"
-
-#define NS_CREATE WebRtcNsx_Create
-#define NS_FREE WebRtcNsx_Free
-#define NS_INIT WebRtcNsx_Init
-#define NS_SET_POLICY WebRtcNsx_set_policy
-typedef NsxHandle NsState;
-#endif
-
-namespace webrtc {
-class NoiseSuppressionImpl::Suppressor {
- public:
-  explicit Suppressor(int sample_rate_hz) {
-    state_ = NS_CREATE();
-    RTC_CHECK(state_);
-    int error = NS_INIT(state_, sample_rate_hz);
-    RTC_DCHECK_EQ(0, error);
-  }
-  ~Suppressor() { NS_FREE(state_); }
-  NsState* state() { return state_; }
-
- private:
-  NsState* state_ = nullptr;
-  RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(Suppressor);
-};
-
-NoiseSuppressionImpl::NoiseSuppressionImpl(rtc::CriticalSection* crit)
-    : crit_(crit) {
-  RTC_DCHECK(crit);
-}
-
-NoiseSuppressionImpl::~NoiseSuppressionImpl() {}
-
-void NoiseSuppressionImpl::Initialize(size_t channels, int sample_rate_hz) {
-  rtc::CritScope cs(crit_);
-  channels_ = channels;
-  sample_rate_hz_ = sample_rate_hz;
-  std::vector<std::unique_ptr<Suppressor>> new_suppressors;
-  if (enabled_) {
-    new_suppressors.resize(channels);
-    for (size_t i = 0; i < channels; i++) {
-      new_suppressors[i].reset(new Suppressor(sample_rate_hz));
-    }
-  }
-  suppressors_.swap(new_suppressors);
-  set_level(level_);
-}
-
-void NoiseSuppressionImpl::AnalyzeCaptureAudio(AudioBuffer* audio) {
-  RTC_DCHECK(audio);
-#if defined(WEBRTC_NS_FLOAT)
-  rtc::CritScope cs(crit_);
-  if (!enabled_) {
-    return;
-  }
-
-  RTC_DCHECK_GE(160, audio->num_frames_per_band());
-  RTC_DCHECK_EQ(suppressors_.size(), audio->num_channels());
-  for (size_t i = 0; i < suppressors_.size(); i++) {
-    WebRtcNs_Analyze(suppressors_[i]->state(),
-                     audio->split_bands_const_f(i)[kBand0To8kHz]);
-  }
-#endif
-}
-
-void NoiseSuppressionImpl::ProcessCaptureAudio(AudioBuffer* audio) {
-  RTC_DCHECK(audio);
-  rtc::CritScope cs(crit_);
-  if (!enabled_) {
-    return;
-  }
-
-  RTC_DCHECK_GE(160, audio->num_frames_per_band());
-  RTC_DCHECK_EQ(suppressors_.size(), audio->num_channels());
-  for (size_t i = 0; i < suppressors_.size(); i++) {
-#if defined(WEBRTC_NS_FLOAT)
-    WebRtcNs_Process(suppressors_[i]->state(), audio->split_bands_const_f(i),
-                     audio->num_bands(), audio->split_bands_f(i));
-#elif defined(WEBRTC_NS_FIXED)
-    WebRtcNsx_Process(suppressors_[i]->state(), audio->split_bands_const(i),
-                      audio->num_bands(), audio->split_bands(i));
-#endif
-  }
-}
-
-int NoiseSuppressionImpl::Enable(bool enable) {
-  rtc::CritScope cs(crit_);
-  if (enabled_ != enable) {
-    enabled_ = enable;
-    Initialize(channels_, sample_rate_hz_);
-  }
-  return AudioProcessing::kNoError;
-}
-
-bool NoiseSuppressionImpl::is_enabled() const {
-  rtc::CritScope cs(crit_);
-  return enabled_;
-}
-
-int NoiseSuppressionImpl::set_level(Level level) {
-  int policy = 1;
-  switch (level) {
-    case NoiseSuppression::kLow:
-      policy = 0;
-      break;
-    case NoiseSuppression::kModerate:
-      policy = 1;
-      break;
-    case NoiseSuppression::kHigh:
-      policy = 2;
-      break;
-    case NoiseSuppression::kVeryHigh:
-      policy = 3;
-      break;
-    default:
-      RTC_NOTREACHED();
-  }
-  rtc::CritScope cs(crit_);
-  level_ = level;
-  for (auto& suppressor : suppressors_) {
-    int error = NS_SET_POLICY(suppressor->state(), policy);
-    RTC_DCHECK_EQ(0, error);
-  }
-  return AudioProcessing::kNoError;
-}
-
-NoiseSuppression::Level NoiseSuppressionImpl::level() const {
-  rtc::CritScope cs(crit_);
-  return level_;
-}
-
-float NoiseSuppressionImpl::speech_probability() const {
-  rtc::CritScope cs(crit_);
-#if defined(WEBRTC_NS_FLOAT)
-  float probability_average = 0.0f;
-  for (auto& suppressor : suppressors_) {
-    probability_average +=
-        WebRtcNs_prior_speech_probability(suppressor->state());
-  }
-  if (!suppressors_.empty()) {
-    probability_average /= suppressors_.size();
-  }
-  return probability_average;
-#elif defined(WEBRTC_NS_FIXED)
-  // TODO(peah): Returning error code as a float! Remove this.
-  // Currently not available for the fixed point implementation.
-  return AudioProcessing::kUnsupportedFunctionError;
-#endif
-}
-
-std::vector<float> NoiseSuppressionImpl::NoiseEstimate() {
-  rtc::CritScope cs(crit_);
-  std::vector<float> noise_estimate;
-#if defined(WEBRTC_NS_FLOAT)
-  const float kNumChannelsFraction = 1.f / suppressors_.size();
-  noise_estimate.assign(WebRtcNs_num_freq(), 0.f);
-  for (auto& suppressor : suppressors_) {
-    const float* noise = WebRtcNs_noise_estimate(suppressor->state());
-    for (size_t i = 0; i < noise_estimate.size(); ++i) {
-      noise_estimate[i] += kNumChannelsFraction * noise[i];
-    }
-  }
-#elif defined(WEBRTC_NS_FIXED)
-  noise_estimate.assign(WebRtcNsx_num_freq(), 0.f);
-  for (auto& suppressor : suppressors_) {
-    int q_noise;
-    const uint32_t* noise =
-        WebRtcNsx_noise_estimate(suppressor->state(), &q_noise);
-    const float kNormalizationFactor =
-        1.f / ((1 << q_noise) * suppressors_.size());
-    for (size_t i = 0; i < noise_estimate.size(); ++i) {
-      noise_estimate[i] += kNormalizationFactor * noise[i];
-    }
-  }
-#endif
-  return noise_estimate;
-}
-
-size_t NoiseSuppressionImpl::num_noise_bins() {
-#if defined(WEBRTC_NS_FLOAT)
-  return WebRtcNs_num_freq();
-#elif defined(WEBRTC_NS_FIXED)
-  return WebRtcNsx_num_freq();
-#endif
-}
-
-}  // namespace webrtc
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/noise_suppression_impl.h b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/noise_suppression_impl.h
deleted file mode 100644
index fba716e253..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/noise_suppression_impl.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- *  Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#ifndef MODULES_AUDIO_PROCESSING_NOISE_SUPPRESSION_IMPL_H_
-#define MODULES_AUDIO_PROCESSING_NOISE_SUPPRESSION_IMPL_H_
-
-#include <memory>
-#include <vector>
-
-#include "modules/audio_processing/include/audio_processing.h"
-#include "rtc_base/constructormagic.h"
-#include "rtc_base/criticalsection.h"
-
-namespace webrtc {
-
-class AudioBuffer;
-
-class NoiseSuppressionImpl : public NoiseSuppression {
- public:
-  explicit NoiseSuppressionImpl(rtc::CriticalSection* crit);
-  ~NoiseSuppressionImpl() override;
-
-  // TODO(peah): Fold into ctor, once public API is removed.
-  void Initialize(size_t channels, int sample_rate_hz);
-  void AnalyzeCaptureAudio(AudioBuffer* audio);
-  void ProcessCaptureAudio(AudioBuffer* audio);
-
-  // NoiseSuppression implementation.
-  int Enable(bool enable) override;
-  bool is_enabled() const override;
-  int set_level(Level level) override;
-  Level level() const override;
-  float speech_probability() const override;
-  std::vector<float> NoiseEstimate() override;
-  static size_t num_noise_bins();
-
- private:
-  class Suppressor;
-  rtc::CriticalSection* const crit_;
-  bool enabled_ RTC_GUARDED_BY(crit_) = false;
-  Level level_ RTC_GUARDED_BY(crit_) = kModerate;
-  size_t channels_ RTC_GUARDED_BY(crit_) = 0;
-  int sample_rate_hz_ RTC_GUARDED_BY(crit_) = 0;
-  std::vector<std::unique_ptr<Suppressor>> suppressors_ RTC_GUARDED_BY(crit_);
-  RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(NoiseSuppressionImpl);
-};
-}  // namespace webrtc
-
-#endif  // MODULES_AUDIO_PROCESSING_NOISE_SUPPRESSION_IMPL_H_
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/ns/defines.h b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/ns/defines.h
deleted file mode 100644
index d6abfea7e7..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/ns/defines.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- *  Copyright (c) 2011 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#ifndef MODULES_AUDIO_PROCESSING_NS_MAIN_SOURCE_DEFINES_H_
-#define MODULES_AUDIO_PROCESSING_NS_MAIN_SOURCE_DEFINES_H_
-
-#define BLOCKL_MAX 160        // max processing block length: 160
-#define ANAL_BLOCKL_MAX 256   // max analysis block length: 256
-#define HALF_ANAL_BLOCKL 129  // half max analysis block length + 1
-#define NUM_HIGH_BANDS_MAX 2  // max number of high bands: 2
-
-#define QUANTILE (float)0.25
-
-#define SIMULT 3
-#define END_STARTUP_LONG 200
-#define END_STARTUP_SHORT 50
-#define FACTOR (float)40.0
-#define WIDTH (float)0.01
-
-// Length of fft work arrays.
-#define IP_LENGTH \
-  (ANAL_BLOCKL_MAX >> 1)  // must be at least ceil(2 + sqrt(ANAL_BLOCKL_MAX/2))
-#define W_LENGTH (ANAL_BLOCKL_MAX >> 1)
-
-// PARAMETERS FOR NEW METHOD
-#define DD_PR_SNR (float)0.98  // DD update of prior SNR
-#define LRT_TAVG (float)0.50   // tavg parameter for LRT (previously 0.90)
-#define SPECT_FL_TAVG \
-  (float)0.30  // tavg parameter for spectral flatness measure
-#define SPECT_DIFF_TAVG \
-  (float)0.30  // tavg parameter for spectral difference measure
-#define PRIOR_UPDATE (float)0.10   // update parameter of prior model
-#define NOISE_UPDATE (float)0.90   // update parameter for noise
-#define SPEECH_UPDATE (float)0.99  // update parameter when likely speech
-#define WIDTH_PR_MAP \
-  (float)4.0  // width parameter in sigmoid map for prior model
-#define LRT_FEATURE_THR (float)0.5  // default threshold for LRT feature
-#define SF_FEATURE_THR \
-  (float)0.5  // default threshold for Spectral Flatness feature
-#define SD_FEATURE_THR \
-  (float)0.5  // default threshold for Spectral Difference feature
-#define PROB_RANGE (float)0.20   // probability threshold for noise state in
-                                 // speech/noise likelihood
-#define HIST_PAR_EST 1000        // histogram size for estimation of parameters
-#define GAMMA_PAUSE (float)0.05  // update for conservative noise estimate
-//
-#define B_LIM (float)0.5  // threshold in final energy gain factor calculation
-#endif                    // MODULES_AUDIO_PROCESSING_NS_MAIN_SOURCE_DEFINES_H_
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/ns/noise_suppression.c b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/ns/noise_suppression.c
deleted file mode 100644
index e21416f956..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/ns/noise_suppression.c
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- *  Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#include "modules/audio_processing/ns/noise_suppression.h"
-
-#include <stdlib.h>
-#include <string.h>
-
-#include "common_audio/signal_processing/include/signal_processing_library.h"
-#include "modules/audio_processing/ns/defines.h"
-#include "modules/audio_processing/ns/ns_core.h"
-
-NsHandle* WebRtcNs_Create() {
-  NoiseSuppressionC* self = malloc(sizeof(NoiseSuppressionC));
-  self->initFlag = 0;
-  return (NsHandle*)self;
-}
-
-void WebRtcNs_Free(NsHandle* NS_inst) {
-  free(NS_inst);
-}
-
-int WebRtcNs_Init(NsHandle* NS_inst, uint32_t fs) {
-  return WebRtcNs_InitCore((NoiseSuppressionC*)NS_inst, fs);
-}
-
-int WebRtcNs_set_policy(NsHandle* NS_inst, int mode) {
-  return WebRtcNs_set_policy_core((NoiseSuppressionC*)NS_inst, mode);
-}
-
-void WebRtcNs_Analyze(NsHandle* NS_inst, const float* spframe) {
-  WebRtcNs_AnalyzeCore((NoiseSuppressionC*)NS_inst, spframe);
-}
-
-void WebRtcNs_Process(NsHandle* NS_inst,
-                      const float* const* spframe,
-                      size_t num_bands,
-                      float* const* outframe) {
-  WebRtcNs_ProcessCore((NoiseSuppressionC*)NS_inst, spframe, num_bands,
-                       outframe);
-}
-
-float WebRtcNs_prior_speech_probability(NsHandle* handle) {
-  NoiseSuppressionC* self = (NoiseSuppressionC*)handle;
-  if (handle == NULL) {
-    return -1;
-  }
-  if (self->initFlag == 0) {
-    return -1;
-  }
-  return self->priorSpeechProb;
-}
-
-const float* WebRtcNs_noise_estimate(const NsHandle* handle) {
-  const NoiseSuppressionC* self = (const NoiseSuppressionC*)handle;
-  if (handle == NULL || self->initFlag == 0) {
-    return NULL;
-  }
-  return self->noise;
-}
-
-size_t WebRtcNs_num_freq() {
-  return HALF_ANAL_BLOCKL;
-}
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/ns/noise_suppression.h b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/ns/noise_suppression.h
deleted file mode 100644
index 0775ffa243..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/ns/noise_suppression.h
+++ /dev/null
@@ -1,134 +0,0 @@
-/*
- *  Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#ifndef MODULES_AUDIO_PROCESSING_NS_NOISE_SUPPRESSION_H_
-#define MODULES_AUDIO_PROCESSING_NS_NOISE_SUPPRESSION_H_
-
-#include <stddef.h>
-#include <stdint.h>
-
-typedef struct NsHandleT NsHandle;
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*
- * This function creates an instance of the floating point Noise Suppression.
- */
-NsHandle* WebRtcNs_Create(void);
-
-/*
- * This function frees the dynamic memory of a specified noise suppression
- * instance.
- *
- * Input:
- *      - NS_inst       : Pointer to NS instance that should be freed
- */
-void WebRtcNs_Free(NsHandle* NS_inst);
-
-/*
- * This function initializes a NS instance and has to be called before any other
- * processing is made.
- *
- * Input:
- *      - NS_inst       : Instance that should be initialized
- *      - fs            : sampling frequency
- *
- * Output:
- *      - NS_inst       : Initialized instance
- *
- * Return value         :  0 - Ok
- *                        -1 - Error
- */
-int WebRtcNs_Init(NsHandle* NS_inst, uint32_t fs);
-
-/*
- * This changes the aggressiveness of the noise suppression method.
- *
- * Input:
- *      - NS_inst       : Noise suppression instance.
- *      - mode          : 0: Mild, 1: Medium , 2: Aggressive
- *
- * Output:
- *      - NS_inst       : Updated instance.
- *
- * Return value         :  0 - Ok
- *                        -1 - Error
- */
-int WebRtcNs_set_policy(NsHandle* NS_inst, int mode);
-
-/*
- * This functions estimates the background noise for the inserted speech frame.
- * The input and output signals should always be 10ms (80 or 160 samples).
- *
- * Input
- *      - NS_inst       : Noise suppression instance.
- *      - spframe       : Pointer to speech frame buffer for L band
- *
- * Output:
- *      - NS_inst       : Updated NS instance
- */
-void WebRtcNs_Analyze(NsHandle* NS_inst, const float* spframe);
-
-/*
- * This functions does Noise Suppression for the inserted speech frame. The
- * input and output signals should always be 10ms (80 or 160 samples).
- *
- * Input
- *      - NS_inst       : Noise suppression instance.
- *      - spframe       : Pointer to speech frame buffer for each band
- *      - num_bands     : Number of bands
- *
- * Output:
- *      - NS_inst       : Updated NS instance
- *      - outframe      : Pointer to output frame for each band
- */
-void WebRtcNs_Process(NsHandle* NS_inst,
-                      const float* const* spframe,
-                      size_t num_bands,
-                      float* const* outframe);
-
-/* Returns the internally used prior speech probability of the current frame.
- * There is a frequency bin based one as well, with which this should not be
- * confused.
- *
- * Input
- *      - handle        : Noise suppression instance.
- *
- * Return value         : Prior speech probability in interval [0.0, 1.0].
- *                        -1 - NULL pointer or uninitialized instance.
- */
-float WebRtcNs_prior_speech_probability(NsHandle* handle);
-
-/* Returns a pointer to the noise estimate per frequency bin. The number of
- * frequency bins can be provided using WebRtcNs_num_freq().
- *
- * Input
- *      - handle        : Noise suppression instance.
- *
- * Return value         : Pointer to the noise estimate per frequency bin.
- *                        Returns NULL if the input is a NULL pointer or an
- *                        uninitialized instance.
- */
-const float* WebRtcNs_noise_estimate(const NsHandle* handle);
-
-/* Returns the number of frequency bins, which is the length of the noise
- * estimate for example.
- *
- * Return value         : Number of frequency bins.
- */
-size_t WebRtcNs_num_freq(void);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif  // MODULES_AUDIO_PROCESSING_NS_NOISE_SUPPRESSION_H_
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/ns/noise_suppression_x.c b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/ns/noise_suppression_x.c
deleted file mode 100644
index 1fd3ebc67e..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/ns/noise_suppression_x.c
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- *  Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#include "modules/audio_processing/ns/noise_suppression_x.h"
-
-#include <stdlib.h>
-
-#include "common_audio/signal_processing/include/real_fft.h"
-#include "modules/audio_processing/ns/nsx_core.h"
-#include "modules/audio_processing/ns/nsx_defines.h"
-
-NsxHandle* WebRtcNsx_Create() {
-  NoiseSuppressionFixedC* self = malloc(sizeof(NoiseSuppressionFixedC));
-  WebRtcSpl_Init();
-  self->real_fft = NULL;
-  self->initFlag = 0;
-  return (NsxHandle*)self;
-}
-
-void WebRtcNsx_Free(NsxHandle* nsxInst) {
-  WebRtcSpl_FreeRealFFT(((NoiseSuppressionFixedC*)nsxInst)->real_fft);
-  free(nsxInst);
-}
-
-int WebRtcNsx_Init(NsxHandle* nsxInst, uint32_t fs) {
-  return WebRtcNsx_InitCore((NoiseSuppressionFixedC*)nsxInst, fs);
-}
-
-int WebRtcNsx_set_policy(NsxHandle* nsxInst, int mode) {
-  return WebRtcNsx_set_policy_core((NoiseSuppressionFixedC*)nsxInst, mode);
-}
-
-void WebRtcNsx_Process(NsxHandle* nsxInst,
-                      const short* const* speechFrame,
-                      int num_bands,
-                      short* const* outFrame) {
-  WebRtcNsx_ProcessCore((NoiseSuppressionFixedC*)nsxInst, speechFrame,
-                        num_bands, outFrame);
-}
-
-const uint32_t* WebRtcNsx_noise_estimate(const NsxHandle* nsxInst,
-                                         int* q_noise) {
-  *q_noise = 11;
-  const NoiseSuppressionFixedC* self = (const NoiseSuppressionFixedC*)nsxInst;
-  if (nsxInst == NULL || self->initFlag == 0) {
-    return NULL;
-  }
-  *q_noise += self->prevQNoise;
-  return self->prevNoiseU32;
-}
-
-size_t WebRtcNsx_num_freq() {
-  return HALF_ANAL_BLOCKL;
-}
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/ns/noise_suppression_x.h b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/ns/noise_suppression_x.h
deleted file mode 100644
index 972784e581..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/ns/noise_suppression_x.h
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
- *  Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#ifndef MODULES_AUDIO_PROCESSING_NS_NOISE_SUPPRESSION_X_H_
-#define MODULES_AUDIO_PROCESSING_NS_NOISE_SUPPRESSION_X_H_
-
-#include <stddef.h>
-#include <stdint.h>
-
-typedef struct NsxHandleT NsxHandle;
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*
- * This function creates an instance of the fixed point Noise Suppression.
- */
-NsxHandle* WebRtcNsx_Create(void);
-
-/*
- * This function frees the dynamic memory of a specified Noise Suppression
- * instance.
- *
- * Input:
- *      - nsxInst       : Pointer to NS instance that should be freed
- */
-void WebRtcNsx_Free(NsxHandle* nsxInst);
-
-/*
- * This function initializes a NS instance
- *
- * Input:
- *      - nsxInst       : Instance that should be initialized
- *      - fs            : sampling frequency
- *
- * Output:
- *      - nsxInst       : Initialized instance
- *
- * Return value         :  0 - Ok
- *                        -1 - Error
- */
-int WebRtcNsx_Init(NsxHandle* nsxInst, uint32_t fs);
-
-/*
- * This changes the aggressiveness of the noise suppression method.
- *
- * Input:
- *      - nsxInst       : Instance that should be initialized
- *      - mode          : 0: Mild, 1: Medium , 2: Aggressive
- *
- * Output:
- *      - nsxInst       : Initialized instance
- *
- * Return value         :  0 - Ok
- *                        -1 - Error
- */
-int WebRtcNsx_set_policy(NsxHandle* nsxInst, int mode);
-
-/*
- * This functions does noise suppression for the inserted speech frame. The
- * input and output signals should always be 10ms (80 or 160 samples).
- *
- * Input
- *      - nsxInst       : NSx instance. Needs to be initiated before call.
- *      - speechFrame   : Pointer to speech frame buffer for each band
- *      - num_bands     : Number of bands
- *
- * Output:
- *      - nsxInst       : Updated NSx instance
- *      - outFrame      : Pointer to output frame for each band
- */
-void WebRtcNsx_Process(NsxHandle* nsxInst,
-                       const short* const* speechFrame,
-                       int num_bands,
-                       short* const* outFrame);
-
-/* Returns a pointer to the noise estimate per frequency bin. The number of
- * frequency bins can be provided using WebRtcNsx_num_freq().
- *
- * Input
- *      - nsxInst       : NSx instance. Needs to be initiated before call.
- *      - q_noise       : Q value of the noise estimate, which is the number of
- *                        bits that it needs to be right-shifted to be
- *                        normalized.
- *
- * Return value         : Pointer to the noise estimate per frequency bin.
- *                        Returns NULL if the input is a NULL pointer or an
- *                        uninitialized instance.
- */
-const uint32_t* WebRtcNsx_noise_estimate(const NsxHandle* nsxInst,
-                                         int* q_noise);
-
-/* Returns the number of frequency bins, which is the length of the noise
- * estimate for example.
- *
- * Return value         : Number of frequency bins.
- */
-size_t WebRtcNsx_num_freq(void);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif  // MODULES_AUDIO_PROCESSING_NS_NOISE_SUPPRESSION_X_H_
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/ns/ns_core.c b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/ns/ns_core.c
deleted file mode 100644
index bc5dd6d451..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/ns/ns_core.c
+++ /dev/null
@@ -1,1420 +0,0 @@
-/*
- *  Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#include <math.h>
-#include <string.h>
-#include <stdlib.h>
-
-#include "rtc_base/checks.h"
-#include "common_audio/signal_processing/include/signal_processing_library.h"
-#include "common_audio/third_party/fft4g/fft4g.h"
-#include "modules/audio_processing/ns/noise_suppression.h"
-#include "modules/audio_processing/ns/ns_core.h"
-#include "modules/audio_processing/ns/windows_private.h"
-
-// Set Feature Extraction Parameters.
-static void set_feature_extraction_parameters(NoiseSuppressionC* self) {
-  // Bin size of histogram.
-  self->featureExtractionParams.binSizeLrt = 0.1f;
-  self->featureExtractionParams.binSizeSpecFlat = 0.05f;
-  self->featureExtractionParams.binSizeSpecDiff = 0.1f;
-
-  // Range of histogram over which LRT threshold is computed.
-  self->featureExtractionParams.rangeAvgHistLrt = 1.f;
-
-  // Scale parameters: multiply dominant peaks of the histograms by scale factor
-  // to obtain thresholds for prior model.
-  // For LRT and spectral difference.
-  self->featureExtractionParams.factor1ModelPars = 1.2f;
-  // For spectral_flatness: used when noise is flatter than speech.
-  self->featureExtractionParams.factor2ModelPars = 0.9f;
-
-  // Peak limit for spectral flatness (varies between 0 and 1).
-  self->featureExtractionParams.thresPosSpecFlat = 0.6f;
-
-  // Limit on spacing of two highest peaks in histogram: spacing determined by
-  // bin size.
-  self->featureExtractionParams.limitPeakSpacingSpecFlat =
-      2 * self->featureExtractionParams.binSizeSpecFlat;
-  self->featureExtractionParams.limitPeakSpacingSpecDiff =
-      2 * self->featureExtractionParams.binSizeSpecDiff;
-
-  // Limit on relevance of second peak.
-  self->featureExtractionParams.limitPeakWeightsSpecFlat = 0.5f;
-  self->featureExtractionParams.limitPeakWeightsSpecDiff = 0.5f;
-
-  // Fluctuation limit of LRT feature.
-  self->featureExtractionParams.thresFluctLrt = 0.05f;
-
-  // Limit on the max and min values for the feature thresholds.
-  self->featureExtractionParams.maxLrt = 1.f;
-  self->featureExtractionParams.minLrt = 0.2f;
-
-  self->featureExtractionParams.maxSpecFlat = 0.95f;
-  self->featureExtractionParams.minSpecFlat = 0.1f;
-
-  self->featureExtractionParams.maxSpecDiff = 1.f;
-  self->featureExtractionParams.minSpecDiff = 0.16f;
-
-  // Criteria of weight of histogram peak to accept/reject feature.
-  self->featureExtractionParams.thresWeightSpecFlat =
-      (int)(0.3 * (self->modelUpdatePars[1]));  // For spectral flatness.
-  self->featureExtractionParams.thresWeightSpecDiff =
-      (int)(0.3 * (self->modelUpdatePars[1]));  // For spectral difference.
-}
-
-// Initialize state.
-int WebRtcNs_InitCore(NoiseSuppressionC* self, uint32_t fs) {
-  int i;
-  // Check for valid pointer.
-  if (self == NULL) {
-    return -1;
-  }
-
-  // Initialization of struct.
-  if (fs == 8000 || fs == 16000 || fs == 32000 || fs == 48000) {
-    self->fs = fs;
-  } else {
-    return -1;
-  }
-  self->windShift = 0;
-  // We only support 10ms frames.
-  if (fs == 8000) {
-    self->blockLen = 80;
-    self->anaLen = 128;
-    self->window = kBlocks80w128;
-  } else {
-    self->blockLen = 160;
-    self->anaLen = 256;
-    self->window = kBlocks160w256;
-  }
-  self->magnLen = self->anaLen / 2 + 1;  // Number of frequency bins.
-
-  // Initialize FFT work arrays.
-  self->ip[0] = 0;  // Setting this triggers initialization.
-  memset(self->dataBuf, 0, sizeof(float) * ANAL_BLOCKL_MAX);
-  WebRtc_rdft(self->anaLen, 1, self->dataBuf, self->ip, self->wfft);
-
-  memset(self->analyzeBuf, 0, sizeof(float) * ANAL_BLOCKL_MAX);
-  memset(self->dataBuf, 0, sizeof(float) * ANAL_BLOCKL_MAX);
-  memset(self->syntBuf, 0, sizeof(float) * ANAL_BLOCKL_MAX);
-
-  // For HB processing.
-  memset(self->dataBufHB,
-         0,
-         sizeof(float) * NUM_HIGH_BANDS_MAX * ANAL_BLOCKL_MAX);
-
-  // For quantile noise estimation.
-  memset(self->quantile, 0, sizeof(float) * HALF_ANAL_BLOCKL);
-  for (i = 0; i < SIMULT * HALF_ANAL_BLOCKL; i++) {
-    self->lquantile[i] = 8.f;
-    self->density[i] = 0.3f;
-  }
-
-  for (i = 0; i < SIMULT; i++) {
-    self->counter[i] =
-        (int)floor((float)(END_STARTUP_LONG * (i + 1)) / (float)SIMULT);
-  }
-
-  self->updates = 0;
-
-  // Wiener filter initialization.
-  for (i = 0; i < HALF_ANAL_BLOCKL; i++) {
-    self->smooth[i] = 1.f;
-  }
-
-  // Set the aggressiveness: default.
-  self->aggrMode = 0;
-
-  // Initialize variables for new method.
-  self->priorSpeechProb = 0.5f;  // Prior prob for speech/noise.
-  // Previous analyze mag spectrum.
-  memset(self->magnPrevAnalyze, 0, sizeof(float) * HALF_ANAL_BLOCKL);
-  // Previous process mag spectrum.
-  memset(self->magnPrevProcess, 0, sizeof(float) * HALF_ANAL_BLOCKL);
-  // Current noise-spectrum.
-  memset(self->noise, 0, sizeof(float) * HALF_ANAL_BLOCKL);
-  // Previous noise-spectrum.
-  memset(self->noisePrev, 0, sizeof(float) * HALF_ANAL_BLOCKL);
-  // Conservative noise spectrum estimate.
-  memset(self->magnAvgPause, 0, sizeof(float) * HALF_ANAL_BLOCKL);
-  // For estimation of HB in second pass.
-  memset(self->speechProb, 0, sizeof(float) * HALF_ANAL_BLOCKL);
-  // Initial average magnitude spectrum.
-  memset(self->initMagnEst, 0, sizeof(float) * HALF_ANAL_BLOCKL);
-  for (i = 0; i < HALF_ANAL_BLOCKL; i++) {
-    // Smooth LR (same as threshold).
-    self->logLrtTimeAvg[i] = LRT_FEATURE_THR;
-  }
-
-  // Feature quantities.
-  // Spectral flatness (start on threshold).
-  self->featureData[0] = SF_FEATURE_THR;
-  self->featureData[1] = 0.f;  // Spectral entropy: not used in this version.
-  self->featureData[2] = 0.f;  // Spectral variance: not used in this version.
-  // Average LRT factor (start on threshold).
-  self->featureData[3] = LRT_FEATURE_THR;
-  // Spectral template diff (start on threshold).
-  self->featureData[4] = SF_FEATURE_THR;
-  self->featureData[5] = 0.f;  // Normalization for spectral difference.
-  // Window time-average of input magnitude spectrum.
-  self->featureData[6] = 0.f;
-
-  memset(self->parametricNoise, 0, sizeof(float) * HALF_ANAL_BLOCKL);
-
-  // Histogram quantities: used to estimate/update thresholds for features.
-  memset(self->histLrt, 0, sizeof(int) * HIST_PAR_EST);
-  memset(self->histSpecFlat, 0, sizeof(int) * HIST_PAR_EST);
-  memset(self->histSpecDiff, 0, sizeof(int) * HIST_PAR_EST);
-
-
-  self->blockInd = -1;  // Frame counter.
-  // Default threshold for LRT feature.
-  self->priorModelPars[0] = LRT_FEATURE_THR;
-  // Threshold for spectral flatness: determined on-line.
-  self->priorModelPars[1] = 0.5f;
-  // sgn_map par for spectral measure: 1 for flatness measure.
-  self->priorModelPars[2] = 1.f;
-  // Threshold for template-difference feature: determined on-line.
-  self->priorModelPars[3] = 0.5f;
-  // Default weighting parameter for LRT feature.
-  self->priorModelPars[4] = 1.f;
-  // Default weighting parameter for spectral flatness feature.
-  self->priorModelPars[5] = 0.f;
-  // Default weighting parameter for spectral difference feature.
-  self->priorModelPars[6] = 0.f;
-
-  // Update flag for parameters:
-  // 0 no update, 1 = update once, 2 = update every window.
-  self->modelUpdatePars[0] = 2;
-  self->modelUpdatePars[1] = 500;  // Window for update.
-  // Counter for update of conservative noise spectrum.
-  self->modelUpdatePars[2] = 0;
-  // Counter if the feature thresholds are updated during the sequence.
-  self->modelUpdatePars[3] = self->modelUpdatePars[1];
-
-  self->signalEnergy = 0.0;
-  self->sumMagn = 0.0;
-  self->whiteNoiseLevel = 0.0;
-  self->pinkNoiseNumerator = 0.0;
-  self->pinkNoiseExp = 0.0;
-
-  set_feature_extraction_parameters(self);
-
-  // Default mode.
-  WebRtcNs_set_policy_core(self, 0);
-
-  self->initFlag = 1;
-  return 0;
-}
-
-// Estimate noise.
-static void NoiseEstimation(NoiseSuppressionC* self,
-                            float* magn,
-                            float* noise) {
-  size_t i, s, offset;
-  float lmagn[HALF_ANAL_BLOCKL], delta;
-
-  if (self->updates < END_STARTUP_LONG) {
-    self->updates++;
-  }
-
-  for (i = 0; i < self->magnLen; i++) {
-    lmagn[i] = (float)log(magn[i]);
-  }
-
-  // Loop over simultaneous estimates.
-  for (s = 0; s < SIMULT; s++) {
-    offset = s * self->magnLen;
-
-    // newquantest(...)
-    for (i = 0; i < self->magnLen; i++) {
-      // Compute delta.
-      if (self->density[offset + i] > 1.0) {
-        delta = FACTOR * 1.f / self->density[offset + i];
-      } else {
-        delta = FACTOR;
-      }
-
-      // Update log quantile estimate.
-      if (lmagn[i] > self->lquantile[offset + i]) {
-        self->lquantile[offset + i] +=
-            QUANTILE * delta / (float)(self->counter[s] + 1);
-      } else {
-        self->lquantile[offset + i] -=
-            (1.f - QUANTILE) * delta / (float)(self->counter[s] + 1);
-      }
-
-      // Update density estimate.
-      if (fabs(lmagn[i] - self->lquantile[offset + i]) < WIDTH) {
-        self->density[offset + i] =
-            ((float)self->counter[s] * self->density[offset + i] +
-             1.f / (2.f * WIDTH)) /
-            (float)(self->counter[s] + 1);
-      }
-    }  // End loop over magnitude spectrum.
-
-    if (self->counter[s] >= END_STARTUP_LONG) {
-      self->counter[s] = 0;
-      if (self->updates >= END_STARTUP_LONG) {
-        for (i = 0; i < self->magnLen; i++) {
-          self->quantile[i] = (float)exp(self->lquantile[offset + i]);
-        }
-      }
-    }
-
-    self->counter[s]++;
-  }  // End loop over simultaneous estimates.
-
-  // Sequentially update the noise during startup.
-  if (self->updates < END_STARTUP_LONG) {
-    // Use the last "s" to get noise during startup that differ from zero.
-    for (i = 0; i < self->magnLen; i++) {
-      self->quantile[i] = (float)exp(self->lquantile[offset + i]);
-    }
-  }
-
-  for (i = 0; i < self->magnLen; i++) {
-    noise[i] = self->quantile[i];
-  }
-}
-
-// Extract thresholds for feature parameters.
-// Histograms are computed over some window size (given by
-// self->modelUpdatePars[1]).
-// Thresholds and weights are extracted every window.
-// |flag| = 0 updates histogram only, |flag| = 1 computes the threshold/weights.
-// Threshold and weights are returned in: self->priorModelPars.
-static void FeatureParameterExtraction(NoiseSuppressionC* self, int flag) {
-  int i, useFeatureSpecFlat, useFeatureSpecDiff, numHistLrt;
-  int maxPeak1, maxPeak2;
-  int weightPeak1SpecFlat, weightPeak2SpecFlat, weightPeak1SpecDiff,
-      weightPeak2SpecDiff;
-
-  float binMid, featureSum;
-  float posPeak1SpecFlat, posPeak2SpecFlat, posPeak1SpecDiff, posPeak2SpecDiff;
-  float fluctLrt, avgHistLrt, avgSquareHistLrt, avgHistLrtCompl;
-
-  // 3 features: LRT, flatness, difference.
-  // lrt_feature = self->featureData[3];
-  // flat_feature = self->featureData[0];
-  // diff_feature = self->featureData[4];
-
-  // Update histograms.
-  if (flag == 0) {
-    // LRT
-    if ((self->featureData[3] <
-         HIST_PAR_EST * self->featureExtractionParams.binSizeLrt) &&
-        (self->featureData[3] >= 0.0)) {
-      i = (int)(self->featureData[3] /
-                self->featureExtractionParams.binSizeLrt);
-      self->histLrt[i]++;
-    }
-    // Spectral flatness.
-    if ((self->featureData[0] <
-         HIST_PAR_EST * self->featureExtractionParams.binSizeSpecFlat) &&
-        (self->featureData[0] >= 0.0)) {
-      i = (int)(self->featureData[0] /
-                self->featureExtractionParams.binSizeSpecFlat);
-      self->histSpecFlat[i]++;
-    }
-    // Spectral difference.
-    if ((self->featureData[4] <
-         HIST_PAR_EST * self->featureExtractionParams.binSizeSpecDiff) &&
-        (self->featureData[4] >= 0.0)) {
-      i = (int)(self->featureData[4] /
-                self->featureExtractionParams.binSizeSpecDiff);
-      self->histSpecDiff[i]++;
-    }
-  }
-
-  // Extract parameters for speech/noise probability.
-  if (flag == 1) {
-    // LRT feature: compute the average over
-    // self->featureExtractionParams.rangeAvgHistLrt.
-    avgHistLrt = 0.0;
-    avgHistLrtCompl = 0.0;
-    avgSquareHistLrt = 0.0;
-    numHistLrt = 0;
-    for (i = 0; i < HIST_PAR_EST; i++) {
-      binMid = ((float)i + 0.5f) * self->featureExtractionParams.binSizeLrt;
-      if (binMid <= self->featureExtractionParams.rangeAvgHistLrt) {
-        avgHistLrt += self->histLrt[i] * binMid;
-        numHistLrt += self->histLrt[i];
-      }
-      avgSquareHistLrt += self->histLrt[i] * binMid * binMid;
-      avgHistLrtCompl += self->histLrt[i] * binMid;
-    }
-    if (numHistLrt > 0) {
-      avgHistLrt = avgHistLrt / ((float)numHistLrt);
-    }
-    avgHistLrtCompl = avgHistLrtCompl / ((float)self->modelUpdatePars[1]);
-    avgSquareHistLrt = avgSquareHistLrt / ((float)self->modelUpdatePars[1]);
-    fluctLrt = avgSquareHistLrt - avgHistLrt * avgHistLrtCompl;
-    // Get threshold for LRT feature.
-    if (fluctLrt < self->featureExtractionParams.thresFluctLrt) {
-      // Very low fluctuation, so likely noise.
-      self->priorModelPars[0] = self->featureExtractionParams.maxLrt;
-    } else {
-      self->priorModelPars[0] =
-          self->featureExtractionParams.factor1ModelPars * avgHistLrt;
-      // Check if value is within min/max range.
-      if (self->priorModelPars[0] < self->featureExtractionParams.minLrt) {
-        self->priorModelPars[0] = self->featureExtractionParams.minLrt;
-      }
-      if (self->priorModelPars[0] > self->featureExtractionParams.maxLrt) {
-        self->priorModelPars[0] = self->featureExtractionParams.maxLrt;
-      }
-    }
-    // Done with LRT feature.
-
-    // For spectral flatness and spectral difference: compute the main peaks of
-    // histogram.
-    maxPeak1 = 0;
-    maxPeak2 = 0;
-    posPeak1SpecFlat = 0.0;
-    posPeak2SpecFlat = 0.0;
-    weightPeak1SpecFlat = 0;
-    weightPeak2SpecFlat = 0;
-
-    // Peaks for flatness.
-    for (i = 0; i < HIST_PAR_EST; i++) {
-      binMid =
-          (i + 0.5f) * self->featureExtractionParams.binSizeSpecFlat;
-      if (self->histSpecFlat[i] > maxPeak1) {
-        // Found new "first" peak.
-        maxPeak2 = maxPeak1;
-        weightPeak2SpecFlat = weightPeak1SpecFlat;
-        posPeak2SpecFlat = posPeak1SpecFlat;
-
-        maxPeak1 = self->histSpecFlat[i];
-        weightPeak1SpecFlat = self->histSpecFlat[i];
-        posPeak1SpecFlat = binMid;
-      } else if (self->histSpecFlat[i] > maxPeak2) {
-        // Found new "second" peak.
-        maxPeak2 = self->histSpecFlat[i];
-        weightPeak2SpecFlat = self->histSpecFlat[i];
-        posPeak2SpecFlat = binMid;
-      }
-    }
-
-    // Compute two peaks for spectral difference.
-    maxPeak1 = 0;
-    maxPeak2 = 0;
-    posPeak1SpecDiff = 0.0;
-    posPeak2SpecDiff = 0.0;
-    weightPeak1SpecDiff = 0;
-    weightPeak2SpecDiff = 0;
-    // Peaks for spectral difference.
-    for (i = 0; i < HIST_PAR_EST; i++) {
-      binMid =
-          ((float)i + 0.5f) * self->featureExtractionParams.binSizeSpecDiff;
-      if (self->histSpecDiff[i] > maxPeak1) {
-        // Found new "first" peak.
-        maxPeak2 = maxPeak1;
-        weightPeak2SpecDiff = weightPeak1SpecDiff;
-        posPeak2SpecDiff = posPeak1SpecDiff;
-
-        maxPeak1 = self->histSpecDiff[i];
-        weightPeak1SpecDiff = self->histSpecDiff[i];
-        posPeak1SpecDiff = binMid;
-      } else if (self->histSpecDiff[i] > maxPeak2) {
-        // Found new "second" peak.
-        maxPeak2 = self->histSpecDiff[i];
-        weightPeak2SpecDiff = self->histSpecDiff[i];
-        posPeak2SpecDiff = binMid;
-      }
-    }
-
-    // For spectrum flatness feature.
-    useFeatureSpecFlat = 1;
-    // Merge the two peaks if they are close.
-    if ((fabs(posPeak2SpecFlat - posPeak1SpecFlat) <
-         self->featureExtractionParams.limitPeakSpacingSpecFlat) &&
-        (weightPeak2SpecFlat >
-         self->featureExtractionParams.limitPeakWeightsSpecFlat *
-             weightPeak1SpecFlat)) {
-      weightPeak1SpecFlat += weightPeak2SpecFlat;
-      posPeak1SpecFlat = 0.5f * (posPeak1SpecFlat + posPeak2SpecFlat);
-    }
-    // Reject if weight of peaks is not large enough, or peak value too small.
-    if (weightPeak1SpecFlat <
-            self->featureExtractionParams.thresWeightSpecFlat ||
-        posPeak1SpecFlat < self->featureExtractionParams.thresPosSpecFlat) {
-      useFeatureSpecFlat = 0;
-    }
-    // If selected, get the threshold.
-    if (useFeatureSpecFlat == 1) {
-      // Compute the threshold.
-      self->priorModelPars[1] =
-          self->featureExtractionParams.factor2ModelPars * posPeak1SpecFlat;
-      // Check if value is within min/max range.
-      if (self->priorModelPars[1] < self->featureExtractionParams.minSpecFlat) {
-        self->priorModelPars[1] = self->featureExtractionParams.minSpecFlat;
-      }
-      if (self->priorModelPars[1] > self->featureExtractionParams.maxSpecFlat) {
-        self->priorModelPars[1] = self->featureExtractionParams.maxSpecFlat;
-      }
-    }
-    // Done with flatness feature.
-
-    // For template feature.
-    useFeatureSpecDiff = 1;
-    // Merge the two peaks if they are close.
-    if ((fabs(posPeak2SpecDiff - posPeak1SpecDiff) <
-         self->featureExtractionParams.limitPeakSpacingSpecDiff) &&
-        (weightPeak2SpecDiff >
-         self->featureExtractionParams.limitPeakWeightsSpecDiff *
-             weightPeak1SpecDiff)) {
-      weightPeak1SpecDiff += weightPeak2SpecDiff;
-      posPeak1SpecDiff = 0.5f * (posPeak1SpecDiff + posPeak2SpecDiff);
-    }
-    // Get the threshold value.
-    self->priorModelPars[3] =
-        self->featureExtractionParams.factor1ModelPars * posPeak1SpecDiff;
-    // Reject if weight of peaks is not large enough.
-    if (weightPeak1SpecDiff <
-        self->featureExtractionParams.thresWeightSpecDiff) {
-      useFeatureSpecDiff = 0;
-    }
-    // Check if value is within min/max range.
-    if (self->priorModelPars[3] < self->featureExtractionParams.minSpecDiff) {
-      self->priorModelPars[3] = self->featureExtractionParams.minSpecDiff;
-    }
-    if (self->priorModelPars[3] > self->featureExtractionParams.maxSpecDiff) {
-      self->priorModelPars[3] = self->featureExtractionParams.maxSpecDiff;
-    }
-    // Done with spectral difference feature.
-
-    // Don't use template feature if fluctuation of LRT feature is very low:
-    // most likely just noise state.
-    if (fluctLrt < self->featureExtractionParams.thresFluctLrt) {
-      useFeatureSpecDiff = 0;
-    }
-
-    // Select the weights between the features.
-    // self->priorModelPars[4] is weight for LRT: always selected.
-    // self->priorModelPars[5] is weight for spectral flatness.
-    // self->priorModelPars[6] is weight for spectral difference.
-    featureSum = (float)(1 + useFeatureSpecFlat + useFeatureSpecDiff);
-    self->priorModelPars[4] = 1.f / featureSum;
-    self->priorModelPars[5] = ((float)useFeatureSpecFlat) / featureSum;
-    self->priorModelPars[6] = ((float)useFeatureSpecDiff) / featureSum;
-
-    // Set hists to zero for next update.
-    if (self->modelUpdatePars[0] >= 1) {
-      for (i = 0; i < HIST_PAR_EST; i++) {
-        self->histLrt[i] = 0;
-        self->histSpecFlat[i] = 0;
-        self->histSpecDiff[i] = 0;
-      }
-    }
-  }  // End of flag == 1.
-}
-
-// Compute spectral flatness on input spectrum.
-// |magnIn| is the magnitude spectrum.
-// Spectral flatness is returned in self->featureData[0].
-static void ComputeSpectralFlatness(NoiseSuppressionC* self,
-                                    const float* magnIn) {
-  size_t i;
-  size_t shiftLP = 1;  // Option to remove first bin(s) from spectral measures.
-  float avgSpectralFlatnessNum, avgSpectralFlatnessDen, spectralTmp;
-
-  // Compute spectral measures.
-  // For flatness.
-  avgSpectralFlatnessNum = 0.0;
-  avgSpectralFlatnessDen = self->sumMagn;
-  for (i = 0; i < shiftLP; i++) {
-    avgSpectralFlatnessDen -= magnIn[i];
-  }
-  // Compute log of ratio of the geometric to arithmetic mean: check for log(0)
-  // case.
-  for (i = shiftLP; i < self->magnLen; i++) {
-    if (magnIn[i] > 0.0) {
-      avgSpectralFlatnessNum += (float)log(magnIn[i]);
-    } else {
-      self->featureData[0] -= SPECT_FL_TAVG * self->featureData[0];
-      return;
-    }
-  }
-  // Normalize.
-  avgSpectralFlatnessDen = avgSpectralFlatnessDen / self->magnLen;
-  avgSpectralFlatnessNum = avgSpectralFlatnessNum / self->magnLen;
-
-  // Ratio and inverse log: check for case of log(0).
-  spectralTmp = (float)exp(avgSpectralFlatnessNum) / avgSpectralFlatnessDen;
-
-  // Time-avg update of spectral flatness feature.
-  self->featureData[0] += SPECT_FL_TAVG * (spectralTmp - self->featureData[0]);
-  // Done with flatness feature.
-}
-
-// Compute prior and post SNR based on quantile noise estimation.
-// Compute DD estimate of prior SNR.
-// Inputs:
-//   * |magn| is the signal magnitude spectrum estimate.
-//   * |noise| is the magnitude noise spectrum estimate.
-// Outputs:
-//   * |snrLocPrior| is the computed prior SNR.
-//   * |snrLocPost| is the computed post SNR.
-static void ComputeSnr(const NoiseSuppressionC* self,
-                       const float* magn,
-                       const float* noise,
-                       float* snrLocPrior,
-                       float* snrLocPost) {
-  size_t i;
-
-  for (i = 0; i < self->magnLen; i++) {
-    // Previous post SNR.
-    // Previous estimate: based on previous frame with gain filter.
-    float previousEstimateStsa = self->magnPrevAnalyze[i] /
-        (self->noisePrev[i] + 0.0001f) * self->smooth[i];
-    // Post SNR.
-    snrLocPost[i] = 0.f;
-    if (magn[i] > noise[i]) {
-      snrLocPost[i] = magn[i] / (noise[i] + 0.0001f) - 1.f;
-    }
-    // DD estimate is sum of two terms: current estimate and previous estimate.
-    // Directed decision update of snrPrior.
-    snrLocPrior[i] =
-        DD_PR_SNR * previousEstimateStsa + (1.f - DD_PR_SNR) * snrLocPost[i];
-  }  // End of loop over frequencies.
-}
-
-// Compute the difference measure between input spectrum and a template/learned
-// noise spectrum.
-// |magnIn| is the input spectrum.
-// The reference/template spectrum is self->magnAvgPause[i].
-// Returns (normalized) spectral difference in self->featureData[4].
-static void ComputeSpectralDifference(NoiseSuppressionC* self,
-                                      const float* magnIn) {
-  // avgDiffNormMagn = var(magnIn) - cov(magnIn, magnAvgPause)^2 /
-  // var(magnAvgPause)
-  size_t i;
-  float avgPause, avgMagn, covMagnPause, varPause, varMagn, avgDiffNormMagn;
-
-  avgPause = 0.0;
-  avgMagn = self->sumMagn;
-  // Compute average quantities.
-  for (i = 0; i < self->magnLen; i++) {
-    // Conservative smooth noise spectrum from pause frames.
-    avgPause += self->magnAvgPause[i];
-  }
-  avgPause /= self->magnLen;
-  avgMagn /= self->magnLen;
-
-  covMagnPause = 0.0;
-  varPause = 0.0;
-  varMagn = 0.0;
-  // Compute variance and covariance quantities.
-  for (i = 0; i < self->magnLen; i++) {
-    covMagnPause += (magnIn[i] - avgMagn) * (self->magnAvgPause[i] - avgPause);
-    varPause +=
-        (self->magnAvgPause[i] - avgPause) * (self->magnAvgPause[i] - avgPause);
-    varMagn += (magnIn[i] - avgMagn) * (magnIn[i] - avgMagn);
-  }
-  covMagnPause /= self->magnLen;
-  varPause /= self->magnLen;
-  varMagn /= self->magnLen;
-  // Update of average magnitude spectrum.
-  self->featureData[6] += self->signalEnergy;
-
-  avgDiffNormMagn =
-      varMagn - (covMagnPause * covMagnPause) / (varPause + 0.0001f);
-  // Normalize and compute time-avg update of difference feature.
-  avgDiffNormMagn = (float)(avgDiffNormMagn / (self->featureData[5] + 0.0001f));
-  self->featureData[4] +=
-      SPECT_DIFF_TAVG * (avgDiffNormMagn - self->featureData[4]);
-}
-
-// Compute speech/noise probability.
-// Speech/noise probability is returned in |probSpeechFinal|.
-// |magn| is the input magnitude spectrum.
-// |noise| is the noise spectrum.
-// |snrLocPrior| is the prior SNR for each frequency.
-// |snrLocPost| is the post SNR for each frequency.
-static void SpeechNoiseProb(NoiseSuppressionC* self,
-                            float* probSpeechFinal,
-                            const float* snrLocPrior,
-                            const float* snrLocPost) {
-  size_t i;
-  int sgnMap;
-  float invLrt, gainPrior, indPrior;
-  float logLrtTimeAvgKsum, besselTmp;
-  float indicator0, indicator1, indicator2;
-  float tmpFloat1, tmpFloat2;
-  float weightIndPrior0, weightIndPrior1, weightIndPrior2;
-  float threshPrior0, threshPrior1, threshPrior2;
-  float widthPrior, widthPrior0, widthPrior1, widthPrior2;
-
-  widthPrior0 = WIDTH_PR_MAP;
-  // Width for pause region: lower range, so increase width in tanh map.
-  widthPrior1 = 2.f * WIDTH_PR_MAP;
-  widthPrior2 = 2.f * WIDTH_PR_MAP;  // For spectral-difference measure.
-
-  // Threshold parameters for features.
-  threshPrior0 = self->priorModelPars[0];
-  threshPrior1 = self->priorModelPars[1];
-  threshPrior2 = self->priorModelPars[3];
-
-  // Sign for flatness feature.
-  sgnMap = (int)(self->priorModelPars[2]);
-
-  // Weight parameters for features.
-  weightIndPrior0 = self->priorModelPars[4];
-  weightIndPrior1 = self->priorModelPars[5];
-  weightIndPrior2 = self->priorModelPars[6];
-
-  // Compute feature based on average LR factor.
-  // This is the average over all frequencies of the smooth log LRT.
-  logLrtTimeAvgKsum = 0.0;
-  for (i = 0; i < self->magnLen; i++) {
-    tmpFloat1 = 1.f + 2.f * snrLocPrior[i];
-    tmpFloat2 = 2.f * snrLocPrior[i] / (tmpFloat1 + 0.0001f);
-    besselTmp = (snrLocPost[i] + 1.f) * tmpFloat2;
-    self->logLrtTimeAvg[i] +=
-        LRT_TAVG * (besselTmp - (float)log(tmpFloat1) - self->logLrtTimeAvg[i]);
-    logLrtTimeAvgKsum += self->logLrtTimeAvg[i];
-  }
-  logLrtTimeAvgKsum = (float)logLrtTimeAvgKsum / (self->magnLen);
-  self->featureData[3] = logLrtTimeAvgKsum;
-  // Done with computation of LR factor.
-
-  // Compute the indicator functions.
-  // Average LRT feature.
-  widthPrior = widthPrior0;
-  // Use larger width in tanh map for pause regions.
-  if (logLrtTimeAvgKsum < threshPrior0) {
-    widthPrior = widthPrior1;
-  }
-  // Compute indicator function: sigmoid map.
-  indicator0 =
-      0.5f *
-      ((float)tanh(widthPrior * (logLrtTimeAvgKsum - threshPrior0)) + 1.f);
-
-  // Spectral flatness feature.
-  tmpFloat1 = self->featureData[0];
-  widthPrior = widthPrior0;
-  // Use larger width in tanh map for pause regions.
-  if (sgnMap == 1 && (tmpFloat1 > threshPrior1)) {
-    widthPrior = widthPrior1;
-  }
-  if (sgnMap == -1 && (tmpFloat1 < threshPrior1)) {
-    widthPrior = widthPrior1;
-  }
-  // Compute indicator function: sigmoid map.
-  indicator1 =
-      0.5f *
-      ((float)tanh((float)sgnMap * widthPrior * (threshPrior1 - tmpFloat1)) +
-       1.f);
-
-  // For template spectrum-difference.
-  tmpFloat1 = self->featureData[4];
-  widthPrior = widthPrior0;
-  // Use larger width in tanh map for pause regions.
-  if (tmpFloat1 < threshPrior2) {
-    widthPrior = widthPrior2;
-  }
-  // Compute indicator function: sigmoid map.
-  indicator2 =
-      0.5f * ((float)tanh(widthPrior * (tmpFloat1 - threshPrior2)) + 1.f);
-
-  // Combine the indicator function with the feature weights.
-  indPrior = weightIndPrior0 * indicator0 + weightIndPrior1 * indicator1 +
-             weightIndPrior2 * indicator2;
-  // Done with computing indicator function.
-
-  // Compute the prior probability.
-  self->priorSpeechProb += PRIOR_UPDATE * (indPrior - self->priorSpeechProb);
-  // Make sure probabilities are within range: keep floor to 0.01.
-  if (self->priorSpeechProb > 1.f) {
-    self->priorSpeechProb = 1.f;
-  }
-  if (self->priorSpeechProb < 0.01f) {
-    self->priorSpeechProb = 0.01f;
-  }
-
-  // Final speech probability: combine prior model with LR factor:.
-  gainPrior = (1.f - self->priorSpeechProb) / (self->priorSpeechProb + 0.0001f);
-  for (i = 0; i < self->magnLen; i++) {
-    invLrt = (float)exp(-self->logLrtTimeAvg[i]);
-    invLrt = (float)gainPrior * invLrt;
-    probSpeechFinal[i] = 1.f / (1.f + invLrt);
-  }
-}
-
-// Update the noise features.
-// Inputs:
-//   * |magn| is the signal magnitude spectrum estimate.
-//   * |updateParsFlag| is an update flag for parameters.
-static void FeatureUpdate(NoiseSuppressionC* self,
-                          const float* magn,
-                          int updateParsFlag) {
-  // Compute spectral flatness on input spectrum.
-  ComputeSpectralFlatness(self, magn);
-  // Compute difference of input spectrum with learned/estimated noise spectrum.
-  ComputeSpectralDifference(self, magn);
-  // Compute histograms for parameter decisions (thresholds and weights for
-  // features).
-  // Parameters are extracted once every window time.
-  // (=self->modelUpdatePars[1])
-  if (updateParsFlag >= 1) {
-    // Counter update.
-    self->modelUpdatePars[3]--;
-    // Update histogram.
-    if (self->modelUpdatePars[3] > 0) {
-      FeatureParameterExtraction(self, 0);
-    }
-    // Compute model parameters.
-    if (self->modelUpdatePars[3] == 0) {
-      FeatureParameterExtraction(self, 1);
-      self->modelUpdatePars[3] = self->modelUpdatePars[1];
-      // If wish to update only once, set flag to zero.
-      if (updateParsFlag == 1) {
-        self->modelUpdatePars[0] = 0;
-      } else {
-        // Update every window:
-        // Get normalization for spectral difference for next window estimate.
-        self->featureData[6] =
-            self->featureData[6] / ((float)self->modelUpdatePars[1]);
-        self->featureData[5] =
-            0.5f * (self->featureData[6] + self->featureData[5]);
-        self->featureData[6] = 0.f;
-      }
-    }
-  }
-}
-
-// Update the noise estimate.
-// Inputs:
-//   * |magn| is the signal magnitude spectrum estimate.
-//   * |snrLocPrior| is the prior SNR.
-//   * |snrLocPost| is the post SNR.
-// Output:
-//   * |noise| is the updated noise magnitude spectrum estimate.
-static void UpdateNoiseEstimate(NoiseSuppressionC* self,
-                                const float* magn,
-                                const float* snrLocPrior,
-                                const float* snrLocPost,
-                                float* noise) {
-  size_t i;
-  float probSpeech, probNonSpeech;
-  // Time-avg parameter for noise update.
-  float gammaNoiseTmp = NOISE_UPDATE;
-  float gammaNoiseOld;
-  float noiseUpdateTmp;
-
-  for (i = 0; i < self->magnLen; i++) {
-    probSpeech = self->speechProb[i];
-    probNonSpeech = 1.f - probSpeech;
-    // Temporary noise update:
-    // Use it for speech frames if update value is less than previous.
-    noiseUpdateTmp = gammaNoiseTmp * self->noisePrev[i] +
-                     (1.f - gammaNoiseTmp) * (probNonSpeech * magn[i] +
-                                              probSpeech * self->noisePrev[i]);
-    // Time-constant based on speech/noise state.
-    gammaNoiseOld = gammaNoiseTmp;
-    gammaNoiseTmp = NOISE_UPDATE;
-    // Increase gamma (i.e., less noise update) for frame likely to be speech.
-    if (probSpeech > PROB_RANGE) {
-      gammaNoiseTmp = SPEECH_UPDATE;
-    }
-    // Conservative noise update.
-    if (probSpeech < PROB_RANGE) {
-      self->magnAvgPause[i] += GAMMA_PAUSE * (magn[i] - self->magnAvgPause[i]);
-    }
-    // Noise update.
-    if (gammaNoiseTmp == gammaNoiseOld) {
-      noise[i] = noiseUpdateTmp;
-    } else {
-      noise[i] = gammaNoiseTmp * self->noisePrev[i] +
-                 (1.f - gammaNoiseTmp) * (probNonSpeech * magn[i] +
-                                          probSpeech * self->noisePrev[i]);
-      // Allow for noise update downwards:
-      // If noise update decreases the noise, it is safe, so allow it to
-      // happen.
-      if (noiseUpdateTmp < noise[i]) {
-        noise[i] = noiseUpdateTmp;
-      }
-    }
-  }  // End of freq loop.
-}
-
-// Updates |buffer| with a new |frame|.
-// Inputs:
-//   * |frame| is a new speech frame or NULL for setting to zero.
-//   * |frame_length| is the length of the new frame.
-//   * |buffer_length| is the length of the buffer.
-// Output:
-//   * |buffer| is the updated buffer.
-static void UpdateBuffer(const float* frame,
-                         size_t frame_length,
-                         size_t buffer_length,
-                         float* buffer) {
-  RTC_DCHECK_LT(buffer_length, 2 * frame_length);
-
-  memcpy(buffer,
-         buffer + frame_length,
-         sizeof(*buffer) * (buffer_length - frame_length));
-  if (frame) {
-    memcpy(buffer + buffer_length - frame_length,
-           frame,
-           sizeof(*buffer) * frame_length);
-  } else {
-    memset(buffer + buffer_length - frame_length,
-           0,
-           sizeof(*buffer) * frame_length);
-  }
-}
-
-// Transforms the signal from time to frequency domain.
-// Inputs:
-//   * |time_data| is the signal in the time domain.
-//   * |time_data_length| is the length of the analysis buffer.
-//   * |magnitude_length| is the length of the spectrum magnitude, which equals
-//     the length of both |real| and |imag| (time_data_length / 2 + 1).
-// Outputs:
-//   * |time_data| is the signal in the frequency domain.
-//   * |real| is the real part of the frequency domain.
-//   * |imag| is the imaginary part of the frequency domain.
-//   * |magn| is the calculated signal magnitude in the frequency domain.
-static void FFT(NoiseSuppressionC* self,
-                float* time_data,
-                size_t time_data_length,
-                size_t magnitude_length,
-                float* real,
-                float* imag,
-                float* magn) {
-  size_t i;
-
-  RTC_DCHECK_EQ(magnitude_length, time_data_length / 2 + 1);
-
-  WebRtc_rdft(time_data_length, 1, time_data, self->ip, self->wfft);
-
-  imag[0] = 0;
-  real[0] = time_data[0];
-  magn[0] = fabsf(real[0]) + 1.f;
-  imag[magnitude_length - 1] = 0;
-  real[magnitude_length - 1] = time_data[1];
-  magn[magnitude_length - 1] = fabsf(real[magnitude_length - 1]) + 1.f;
-  for (i = 1; i < magnitude_length - 1; ++i) {
-    real[i] = time_data[2 * i];
-    imag[i] = time_data[2 * i + 1];
-    // Magnitude spectrum.
-    magn[i] = sqrtf(real[i] * real[i] + imag[i] * imag[i]) + 1.f;
-  }
-}
-
-// Transforms the signal from frequency to time domain.
-// Inputs:
-//   * |real| is the real part of the frequency domain.
-//   * |imag| is the imaginary part of the frequency domain.
-//   * |magnitude_length| is the length of the spectrum magnitude, which equals
-//     the length of both |real| and |imag|.
-//   * |time_data_length| is the length of the analysis buffer
-//     (2 * (magnitude_length - 1)).
-// Output:
-//   * |time_data| is the signal in the time domain.
-static void IFFT(NoiseSuppressionC* self,
-                 const float* real,
-                 const float* imag,
-                 size_t magnitude_length,
-                 size_t time_data_length,
-                 float* time_data) {
-  size_t i;
-
-  RTC_DCHECK_EQ(time_data_length, 2 * (magnitude_length - 1));
-
-  time_data[0] = real[0];
-  time_data[1] = real[magnitude_length - 1];
-  for (i = 1; i < magnitude_length - 1; ++i) {
-    time_data[2 * i] = real[i];
-    time_data[2 * i + 1] = imag[i];
-  }
-  WebRtc_rdft(time_data_length, -1, time_data, self->ip, self->wfft);
-
-  for (i = 0; i < time_data_length; ++i) {
-    time_data[i] *= 2.f / time_data_length;  // FFT scaling.
-  }
-}
-
-// Calculates the energy of a buffer.
-// Inputs:
-//   * |buffer| is the buffer over which the energy is calculated.
-//   * |length| is the length of the buffer.
-// Returns the calculated energy.
-static float Energy(const float* buffer, size_t length) {
-  size_t i;
-  float energy = 0.f;
-
-  for (i = 0; i < length; ++i) {
-    energy += buffer[i] * buffer[i];
-  }
-
-  return energy;
-}
-
-// Windows a buffer.
-// Inputs:
-//   * |window| is the window by which to multiply.
-//   * |data| is the data without windowing.
-//   * |length| is the length of the window and data.
-// Output:
-//   * |data_windowed| is the windowed data.
-static void Windowing(const float* window,
-                      const float* data,
-                      size_t length,
-                      float* data_windowed) {
-  size_t i;
-
-  for (i = 0; i < length; ++i) {
-    data_windowed[i] = window[i] * data[i];
-  }
-}
-
-// Estimate prior SNR decision-directed and compute DD based Wiener Filter.
-// Input:
-//   * |magn| is the signal magnitude spectrum estimate.
-// Output:
-//   * |theFilter| is the frequency response of the computed Wiener filter.
-static void ComputeDdBasedWienerFilter(const NoiseSuppressionC* self,
-                                       const float* magn,
-                                       float* theFilter) {
-  size_t i;
-  float snrPrior, previousEstimateStsa, currentEstimateStsa;
-
-  for (i = 0; i < self->magnLen; i++) {
-    // Previous estimate: based on previous frame with gain filter.
-    previousEstimateStsa = self->magnPrevProcess[i] /
-                           (self->noisePrev[i] + 0.0001f) * self->smooth[i];
-    // Post and prior SNR.
-    currentEstimateStsa = 0.f;
-    if (magn[i] > self->noise[i]) {
-      currentEstimateStsa = magn[i] / (self->noise[i] + 0.0001f) - 1.f;
-    }
-    // DD estimate is sum of two terms: current estimate and previous estimate.
-    // Directed decision update of |snrPrior|.
-    snrPrior = DD_PR_SNR * previousEstimateStsa +
-               (1.f - DD_PR_SNR) * currentEstimateStsa;
-    // Gain filter.
-    theFilter[i] = snrPrior / (self->overdrive + snrPrior);
-  }  // End of loop over frequencies.
-}
-
-// Changes the aggressiveness of the noise suppression method.
-// |mode| = 0 is mild (6dB), |mode| = 1 is medium (10dB) and |mode| = 2 is
-// aggressive (15dB).
-// Returns 0 on success and -1 otherwise.
-int WebRtcNs_set_policy_core(NoiseSuppressionC* self, int mode) {
-  // Allow for modes: 0, 1, 2, 3.
-  if (mode < 0 || mode > 3) {
-    return (-1);
-  }
-
-  self->aggrMode = mode;
-  if (mode == 0) {
-    self->overdrive = 1.f;
-    self->denoiseBound = 0.5f;
-    self->gainmap = 0;
-  } else if (mode == 1) {
-    // self->overdrive = 1.25f;
-    self->overdrive = 1.f;
-    self->denoiseBound = 0.25f;
-    self->gainmap = 1;
-  } else if (mode == 2) {
-    // self->overdrive = 1.25f;
-    self->overdrive = 1.1f;
-    self->denoiseBound = 0.125f;
-    self->gainmap = 1;
-  } else if (mode == 3) {
-    // self->overdrive = 1.3f;
-    self->overdrive = 1.25f;
-    self->denoiseBound = 0.09f;
-    self->gainmap = 1;
-  }
-  return 0;
-}
-
-void WebRtcNs_AnalyzeCore(NoiseSuppressionC* self, const float* speechFrame) {
-  size_t i;
-  const size_t kStartBand = 5;  // Skip first frequency bins during estimation.
-  int updateParsFlag;
-  float energy;
-  float signalEnergy = 0.f;
-  float sumMagn = 0.f;
-  float tmpFloat1, tmpFloat2, tmpFloat3;
-  float winData[ANAL_BLOCKL_MAX];
-  float magn[HALF_ANAL_BLOCKL], noise[HALF_ANAL_BLOCKL];
-  float snrLocPost[HALF_ANAL_BLOCKL], snrLocPrior[HALF_ANAL_BLOCKL];
-  float real[ANAL_BLOCKL_MAX], imag[HALF_ANAL_BLOCKL];
-  // Variables during startup.
-  float sum_log_i = 0.0;
-  float sum_log_i_square = 0.0;
-  float sum_log_magn = 0.0;
-  float sum_log_i_log_magn = 0.0;
-  float parametric_exp = 0.0;
-  float parametric_num = 0.0;
-
-  // Check that initiation has been done.
-  RTC_DCHECK_EQ(1, self->initFlag);
-  updateParsFlag = self->modelUpdatePars[0];
-
-  // Update analysis buffer for L band.
-  UpdateBuffer(speechFrame, self->blockLen, self->anaLen, self->analyzeBuf);
-
-  Windowing(self->window, self->analyzeBuf, self->anaLen, winData);
-  energy = Energy(winData, self->anaLen);
-  if (energy == 0.0) {
-    // We want to avoid updating statistics in this case:
-    // Updating feature statistics when we have zeros only will cause
-    // thresholds to move towards zero signal situations. This in turn has the
-    // effect that once the signal is "turned on" (non-zero values) everything
-    // will be treated as speech and there is no noise suppression effect.
-    // Depending on the duration of the inactive signal it takes a
-    // considerable amount of time for the system to learn what is noise and
-    // what is speech.
-    self->signalEnergy = 0;
-    return;
-  }
-
-  self->blockInd++;  // Update the block index only when we process a block.
-
-  FFT(self, winData, self->anaLen, self->magnLen, real, imag, magn);
-
-  for (i = 0; i < self->magnLen; i++) {
-    signalEnergy += real[i] * real[i] + imag[i] * imag[i];
-    sumMagn += magn[i];
-    if (self->blockInd < END_STARTUP_SHORT) {
-      if (i >= kStartBand) {
-        tmpFloat2 = logf((float)i);
-        sum_log_i += tmpFloat2;
-        sum_log_i_square += tmpFloat2 * tmpFloat2;
-        tmpFloat1 = logf(magn[i]);
-        sum_log_magn += tmpFloat1;
-        sum_log_i_log_magn += tmpFloat2 * tmpFloat1;
-      }
-    }
-  }
-  signalEnergy /= self->magnLen;
-  self->signalEnergy = signalEnergy;
-  self->sumMagn = sumMagn;
-
-  // Quantile noise estimate.
-  NoiseEstimation(self, magn, noise);
-  // Compute simplified noise model during startup.
-  if (self->blockInd < END_STARTUP_SHORT) {
-    // Estimate White noise.
-    self->whiteNoiseLevel += sumMagn / self->magnLen * self->overdrive;
-    // Estimate Pink noise parameters.
-    tmpFloat1 = sum_log_i_square * (self->magnLen - kStartBand);
-    tmpFloat1 -= (sum_log_i * sum_log_i);
-    tmpFloat2 =
-        (sum_log_i_square * sum_log_magn - sum_log_i * sum_log_i_log_magn);
-    tmpFloat3 = tmpFloat2 / tmpFloat1;
-    // Constrain the estimated spectrum to be positive.
-    if (tmpFloat3 < 0.f) {
-      tmpFloat3 = 0.f;
-    }
-    self->pinkNoiseNumerator += tmpFloat3;
-    tmpFloat2 = (sum_log_i * sum_log_magn);
-    tmpFloat2 -= (self->magnLen - kStartBand) * sum_log_i_log_magn;
-    tmpFloat3 = tmpFloat2 / tmpFloat1;
-    // Constrain the pink noise power to be in the interval [0, 1].
-    if (tmpFloat3 < 0.f) {
-      tmpFloat3 = 0.f;
-    }
-    if (tmpFloat3 > 1.f) {
-      tmpFloat3 = 1.f;
-    }
-    self->pinkNoiseExp += tmpFloat3;
-
-    // Calculate frequency independent parts of parametric noise estimate.
-    if (self->pinkNoiseExp > 0.f) {
-      // Use pink noise estimate.
-      parametric_num =
-          expf(self->pinkNoiseNumerator / (float)(self->blockInd + 1));
-      parametric_num *= (float)(self->blockInd + 1);
-      parametric_exp = self->pinkNoiseExp / (float)(self->blockInd + 1);
-    }
-    for (i = 0; i < self->magnLen; i++) {
-      // Estimate the background noise using the white and pink noise
-      // parameters.
-      if (self->pinkNoiseExp == 0.f) {
-        // Use white noise estimate.
-        self->parametricNoise[i] = self->whiteNoiseLevel;
-      } else {
-        // Use pink noise estimate.
-        float use_band = (float)(i < kStartBand ? kStartBand : i);
-        self->parametricNoise[i] =
-            parametric_num / powf(use_band, parametric_exp);
-      }
-      // Weight quantile noise with modeled noise.
-      noise[i] *= (self->blockInd);
-      tmpFloat2 =
-          self->parametricNoise[i] * (END_STARTUP_SHORT - self->blockInd);
-      noise[i] += (tmpFloat2 / (float)(self->blockInd + 1));
-      noise[i] /= END_STARTUP_SHORT;
-    }
-  }
-  // Compute average signal during END_STARTUP_LONG time:
-  // used to normalize spectral difference measure.
-  if (self->blockInd < END_STARTUP_LONG) {
-    self->featureData[5] *= self->blockInd;
-    self->featureData[5] += signalEnergy;
-    self->featureData[5] /= (self->blockInd + 1);
-  }
-
-  // Post and prior SNR needed for SpeechNoiseProb.
-  ComputeSnr(self, magn, noise, snrLocPrior, snrLocPost);
-
-  FeatureUpdate(self, magn, updateParsFlag);
-  SpeechNoiseProb(self, self->speechProb, snrLocPrior, snrLocPost);
-  UpdateNoiseEstimate(self, magn, snrLocPrior, snrLocPost, noise);
-
-  // Keep track of noise spectrum for next frame.
-  memcpy(self->noise, noise, sizeof(*noise) * self->magnLen);
-  memcpy(self->magnPrevAnalyze, magn, sizeof(*magn) * self->magnLen);
-}
-
-void WebRtcNs_ProcessCore(NoiseSuppressionC* self,
-                          const float* const* speechFrame,
-                          size_t num_bands,
-                          float* const* outFrame) {
-  // Main routine for noise reduction.
-  int flagHB = 0;
-  size_t i, j;
-
-  float energy1, energy2, gain, factor, factor1, factor2;
-  float fout[BLOCKL_MAX];
-  float winData[ANAL_BLOCKL_MAX];
-  float magn[HALF_ANAL_BLOCKL];
-  float theFilter[HALF_ANAL_BLOCKL], theFilterTmp[HALF_ANAL_BLOCKL];
-  float real[ANAL_BLOCKL_MAX], imag[HALF_ANAL_BLOCKL];
-
-  // SWB variables.
-  int deltaBweHB = 1;
-  int deltaGainHB = 1;
-  float decayBweHB = 1.0;
-  float gainMapParHB = 1.0;
-  float gainTimeDomainHB = 1.0;
-  float avgProbSpeechHB, avgProbSpeechHBTmp, avgFilterGainHB, gainModHB;
-  float sumMagnAnalyze, sumMagnProcess;
-
-  // Check that initiation has been done.
-  RTC_DCHECK_EQ(1, self->initFlag);
-  RTC_DCHECK_LE(num_bands - 1, NUM_HIGH_BANDS_MAX);
-
-  const float* const* speechFrameHB = NULL;
-  float* const* outFrameHB = NULL;
-  size_t num_high_bands = 0;
-  if (num_bands > 1) {
-    speechFrameHB = &speechFrame[1];
-    outFrameHB = &outFrame[1];
-    num_high_bands = num_bands - 1;
-    flagHB = 1;
-    // Range for averaging low band quantities for H band gain.
-    deltaBweHB = (int)self->magnLen / 4;
-    deltaGainHB = deltaBweHB;
-  }
-
-  // Update analysis buffer for L band.
-  UpdateBuffer(speechFrame[0], self->blockLen, self->anaLen, self->dataBuf);
-
-  if (flagHB == 1) {
-    // Update analysis buffer for H bands.
-    for (i = 0; i < num_high_bands; ++i) {
-      UpdateBuffer(speechFrameHB[i],
-                   self->blockLen,
-                   self->anaLen,
-                   self->dataBufHB[i]);
-    }
-  }
-
-  Windowing(self->window, self->dataBuf, self->anaLen, winData);
-  energy1 = Energy(winData, self->anaLen);
-  if (energy1 == 0.0 || self->signalEnergy == 0) {
-    // Synthesize the special case of zero input.
-    // Read out fully processed segment.
-    for (i = self->windShift; i < self->blockLen + self->windShift; i++) {
-      fout[i - self->windShift] = self->syntBuf[i];
-    }
-    // Update synthesis buffer.
-    UpdateBuffer(NULL, self->blockLen, self->anaLen, self->syntBuf);
-
-    for (i = 0; i < self->blockLen; ++i)
-      outFrame[0][i] =
-          WEBRTC_SPL_SAT(WEBRTC_SPL_WORD16_MAX, fout[i], WEBRTC_SPL_WORD16_MIN);
-
-    // For time-domain gain of HB.
-    if (flagHB == 1) {
-      for (i = 0; i < num_high_bands; ++i) {
-        for (j = 0; j < self->blockLen; ++j) {
-          outFrameHB[i][j] = WEBRTC_SPL_SAT(WEBRTC_SPL_WORD16_MAX,
-                                            self->dataBufHB[i][j],
-                                            WEBRTC_SPL_WORD16_MIN);
-        }
-      }
-    }
-
-    return;
-  }
-
-  FFT(self, winData, self->anaLen, self->magnLen, real, imag, magn);
-
-  if (self->blockInd < END_STARTUP_SHORT) {
-    for (i = 0; i < self->magnLen; i++) {
-      self->initMagnEst[i] += magn[i];
-    }
-  }
-
-  ComputeDdBasedWienerFilter(self, magn, theFilter);
-
-  for (i = 0; i < self->magnLen; i++) {
-    // Flooring bottom.
-    if (theFilter[i] < self->denoiseBound) {
-      theFilter[i] = self->denoiseBound;
-    }
-    // Flooring top.
-    if (theFilter[i] > 1.f) {
-      theFilter[i] = 1.f;
-    }
-    if (self->blockInd < END_STARTUP_SHORT) {
-      theFilterTmp[i] =
-          (self->initMagnEst[i] - self->overdrive * self->parametricNoise[i]);
-      theFilterTmp[i] /= (self->initMagnEst[i] + 0.0001f);
-      // Flooring bottom.
-      if (theFilterTmp[i] < self->denoiseBound) {
-        theFilterTmp[i] = self->denoiseBound;
-      }
-      // Flooring top.
-      if (theFilterTmp[i] > 1.f) {
-        theFilterTmp[i] = 1.f;
-      }
-      // Weight the two suppression filters.
-      theFilter[i] *= (self->blockInd);
-      theFilterTmp[i] *= (END_STARTUP_SHORT - self->blockInd);
-      theFilter[i] += theFilterTmp[i];
-      theFilter[i] /= (END_STARTUP_SHORT);
-    }
-
-    self->smooth[i] = theFilter[i];
-    real[i] *= self->smooth[i];
-    imag[i] *= self->smooth[i];
-  }
-  // Keep track of |magn| spectrum for next frame.
-  memcpy(self->magnPrevProcess, magn, sizeof(*magn) * self->magnLen);
-  memcpy(self->noisePrev, self->noise, sizeof(self->noise[0]) * self->magnLen);
-  // Back to time domain.
-  IFFT(self, real, imag, self->magnLen, self->anaLen, winData);
-
-  // Scale factor: only do it after END_STARTUP_LONG time.
-  factor = 1.f;
-  if (self->gainmap == 1 && self->blockInd > END_STARTUP_LONG) {
-    factor1 = 1.f;
-    factor2 = 1.f;
-
-    energy2 = Energy(winData, self->anaLen);
-    gain = (float)sqrt(energy2 / (energy1 + 1.f));
-
-    // Scaling for new version.
-    if (gain > B_LIM) {
-      factor1 = 1.f + 1.3f * (gain - B_LIM);
-      if (gain * factor1 > 1.f) {
-        factor1 = 1.f / gain;
-      }
-    }
-    if (gain < B_LIM) {
-      // Don't reduce scale too much for pause regions:
-      // attenuation here should be controlled by flooring.
-      if (gain <= self->denoiseBound) {
-        gain = self->denoiseBound;
-      }
-      factor2 = 1.f - 0.3f * (B_LIM - gain);
-    }
-    // Combine both scales with speech/noise prob:
-    // note prior (priorSpeechProb) is not frequency dependent.
-    factor = self->priorSpeechProb * factor1 +
-             (1.f - self->priorSpeechProb) * factor2;
-  }  // Out of self->gainmap == 1.
-
-  Windowing(self->window, winData, self->anaLen, winData);
-
-  // Synthesis.
-  for (i = 0; i < self->anaLen; i++) {
-    self->syntBuf[i] += factor * winData[i];
-  }
-  // Read out fully processed segment.
-  for (i = self->windShift; i < self->blockLen + self->windShift; i++) {
-    fout[i - self->windShift] = self->syntBuf[i];
-  }
-  // Update synthesis buffer.
-  UpdateBuffer(NULL, self->blockLen, self->anaLen, self->syntBuf);
-
-  for (i = 0; i < self->blockLen; ++i)
-    outFrame[0][i] =
-        WEBRTC_SPL_SAT(WEBRTC_SPL_WORD16_MAX, fout[i], WEBRTC_SPL_WORD16_MIN);
-
-  // For time-domain gain of HB.
-  if (flagHB == 1) {
-    // Average speech prob from low band.
-    // Average over second half (i.e., 4->8kHz) of frequencies spectrum.
-    avgProbSpeechHB = 0.0;
-    for (i = self->magnLen - deltaBweHB - 1; i < self->magnLen - 1; i++) {
-      avgProbSpeechHB += self->speechProb[i];
-    }
-    avgProbSpeechHB = avgProbSpeechHB / ((float)deltaBweHB);
-    // If the speech was suppressed by a component between Analyze and
-    // Process, for example the AEC, then it should not be considered speech
-    // for high band suppression purposes.
-    sumMagnAnalyze = 0;
-    sumMagnProcess = 0;
-    for (i = 0; i < self->magnLen; ++i) {
-      sumMagnAnalyze += self->magnPrevAnalyze[i];
-      sumMagnProcess += self->magnPrevProcess[i];
-    }
-    RTC_DCHECK_GT(sumMagnAnalyze, 0);
-    avgProbSpeechHB *= sumMagnProcess / sumMagnAnalyze;
-    // Average filter gain from low band.
-    // Average over second half (i.e., 4->8kHz) of frequencies spectrum.
-    avgFilterGainHB = 0.0;
-    for (i = self->magnLen - deltaGainHB - 1; i < self->magnLen - 1; i++) {
-      avgFilterGainHB += self->smooth[i];
-    }
-    avgFilterGainHB = avgFilterGainHB / ((float)(deltaGainHB));
-    avgProbSpeechHBTmp = 2.f * avgProbSpeechHB - 1.f;
-    // Gain based on speech probability.
-    gainModHB = 0.5f * (1.f + (float)tanh(gainMapParHB * avgProbSpeechHBTmp));
-    // Combine gain with low band gain.
-    gainTimeDomainHB = 0.5f * gainModHB + 0.5f * avgFilterGainHB;
-    if (avgProbSpeechHB >= 0.5f) {
-      gainTimeDomainHB = 0.25f * gainModHB + 0.75f * avgFilterGainHB;
-    }
-    gainTimeDomainHB = gainTimeDomainHB * decayBweHB;
-    // Make sure gain is within flooring range.
-    // Flooring bottom.
-    if (gainTimeDomainHB < self->denoiseBound) {
-      gainTimeDomainHB = self->denoiseBound;
-    }
-    // Flooring top.
-    if (gainTimeDomainHB > 1.f) {
-      gainTimeDomainHB = 1.f;
-    }
-    // Apply gain.
-    for (i = 0; i < num_high_bands; ++i) {
-      for (j = 0; j < self->blockLen; j++) {
-        outFrameHB[i][j] =
-            WEBRTC_SPL_SAT(WEBRTC_SPL_WORD16_MAX,
-                           gainTimeDomainHB * self->dataBufHB[i][j],
-                           WEBRTC_SPL_WORD16_MIN);
-      }
-    }
-  }  // End of H band gain computation.
-}
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/ns/ns_core.h b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/ns/ns_core.h
deleted file mode 100644
index e90b8ce39b..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/ns/ns_core.h
+++ /dev/null
@@ -1,189 +0,0 @@
-/*
- *  Copyright (c) 2011 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#ifndef MODULES_AUDIO_PROCESSING_NS_NS_CORE_H_
-#define MODULES_AUDIO_PROCESSING_NS_NS_CORE_H_
-
-#include "modules/audio_processing/ns/defines.h"
-
-typedef struct NSParaExtract_ {
-  // Bin size of histogram.
-  float binSizeLrt;
-  float binSizeSpecFlat;
-  float binSizeSpecDiff;
-  // Range of histogram over which LRT threshold is computed.
-  float rangeAvgHistLrt;
-  // Scale parameters: multiply dominant peaks of the histograms by scale factor
-  // to obtain thresholds for prior model.
-  float factor1ModelPars;  // For LRT and spectral difference.
-  float factor2ModelPars;  // For spectral_flatness: used when noise is flatter
-                           // than speech.
-  // Peak limit for spectral flatness (varies between 0 and 1).
-  float thresPosSpecFlat;
-  // Limit on spacing of two highest peaks in histogram: spacing determined by
-  // bin size.
-  float limitPeakSpacingSpecFlat;
-  float limitPeakSpacingSpecDiff;
-  // Limit on relevance of second peak.
-  float limitPeakWeightsSpecFlat;
-  float limitPeakWeightsSpecDiff;
-  // Limit on fluctuation of LRT feature.
-  float thresFluctLrt;
-  // Limit on the max and min values for the feature thresholds.
-  float maxLrt;
-  float minLrt;
-  float maxSpecFlat;
-  float minSpecFlat;
-  float maxSpecDiff;
-  float minSpecDiff;
-  // Criteria of weight of histogram peak to accept/reject feature.
-  int thresWeightSpecFlat;
-  int thresWeightSpecDiff;
-
-} NSParaExtract;
-
-typedef struct NoiseSuppressionC_ {
-  uint32_t fs;
-  size_t blockLen;
-  size_t windShift;
-  size_t anaLen;
-  size_t magnLen;
-  int aggrMode;
-  const float* window;
-  float analyzeBuf[ANAL_BLOCKL_MAX];
-  float dataBuf[ANAL_BLOCKL_MAX];
-  float syntBuf[ANAL_BLOCKL_MAX];
-
-  int initFlag;
-  // Parameters for quantile noise estimation.
-  float density[SIMULT * HALF_ANAL_BLOCKL];
-  float lquantile[SIMULT * HALF_ANAL_BLOCKL];
-  float quantile[HALF_ANAL_BLOCKL];
-  int counter[SIMULT];
-  int updates;
-  // Parameters for Wiener filter.
-  float smooth[HALF_ANAL_BLOCKL];
-  float overdrive;
-  float denoiseBound;
-  int gainmap;
-  // FFT work arrays.
-  size_t ip[IP_LENGTH];
-  float wfft[W_LENGTH];
-
-  // Parameters for new method: some not needed, will reduce/cleanup later.
-  int32_t blockInd;        // Frame index counter.
-  int modelUpdatePars[4];  // Parameters for updating or estimating.
-  // Thresholds/weights for prior model.
-  float priorModelPars[7];            // Parameters for prior model.
-  float noise[HALF_ANAL_BLOCKL];      // Noise spectrum from current frame.
-  float noisePrev[HALF_ANAL_BLOCKL];  // Noise spectrum from previous frame.
-  // Magnitude spectrum of previous analyze frame.
-  float magnPrevAnalyze[HALF_ANAL_BLOCKL];
-  // Magnitude spectrum of previous process frame.
-  float magnPrevProcess[HALF_ANAL_BLOCKL];
-  float logLrtTimeAvg[HALF_ANAL_BLOCKL];  // Log LRT factor with time-smoothing.
-  float priorSpeechProb;                  // Prior speech/noise probability.
-  float featureData[7];
-  // Conservative noise spectrum estimate.
-  float magnAvgPause[HALF_ANAL_BLOCKL];
-  float signalEnergy;  // Energy of |magn|.
-  float sumMagn;
-  float whiteNoiseLevel;                // Initial noise estimate.
-  float initMagnEst[HALF_ANAL_BLOCKL];  // Initial magnitude spectrum estimate.
-  float pinkNoiseNumerator;             // Pink noise parameter: numerator.
-  float pinkNoiseExp;  // Pink noise parameter: power of frequencies.
-  float parametricNoise[HALF_ANAL_BLOCKL];
-  // Parameters for feature extraction.
-  NSParaExtract featureExtractionParams;
-  // Histograms for parameter estimation.
-  int histLrt[HIST_PAR_EST];
-  int histSpecFlat[HIST_PAR_EST];
-  int histSpecDiff[HIST_PAR_EST];
-  // Quantities for high band estimate.
-  float speechProb[HALF_ANAL_BLOCKL];  // Final speech/noise prob: prior + LRT.
-  // Buffering data for HB.
-  float dataBufHB[NUM_HIGH_BANDS_MAX][ANAL_BLOCKL_MAX];
-} NoiseSuppressionC;
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/****************************************************************************
- * WebRtcNs_InitCore(...)
- *
- * This function initializes a noise suppression instance
- *
- * Input:
- *      - self          : Instance that should be initialized
- *      - fs            : Sampling frequency
- *
- * Output:
- *      - self          : Initialized instance
- *
- * Return value         :  0 - Ok
- *                        -1 - Error
- */
-int WebRtcNs_InitCore(NoiseSuppressionC* self, uint32_t fs);
-
-/****************************************************************************
- * WebRtcNs_set_policy_core(...)
- *
- * This changes the aggressiveness of the noise suppression method.
- *
- * Input:
- *      - self          : Instance that should be initialized
- *      - mode          : 0: Mild (6dB), 1: Medium (10dB), 2: Aggressive (15dB)
- *
- * Output:
- *      - self          : Initialized instance
- *
- * Return value         :  0 - Ok
- *                        -1 - Error
- */
-int WebRtcNs_set_policy_core(NoiseSuppressionC* self, int mode);
-
-/****************************************************************************
- * WebRtcNs_AnalyzeCore
- *
- * Estimate the background noise.
- *
- * Input:
- *      - self          : Instance that should be initialized
- *      - speechFrame   : Input speech frame for lower band
- *
- * Output:
- *      - self          : Updated instance
- */
-void WebRtcNs_AnalyzeCore(NoiseSuppressionC* self, const float* speechFrame);
-
-/****************************************************************************
- * WebRtcNs_ProcessCore
- *
- * Do noise suppression.
- *
- * Input:
- *      - self          : Instance that should be initialized
- *      - inFrame       : Input speech frame for each band
- *      - num_bands     : Number of bands
- *
- * Output:
- *      - self          : Updated instance
- *      - outFrame      : Output speech frame for each band
- */
-void WebRtcNs_ProcessCore(NoiseSuppressionC* self,
-                          const float* const* inFrame,
-                          size_t num_bands,
-                          float* const* outFrame);
-
-#ifdef __cplusplus
-}
-#endif
-#endif  // MODULES_AUDIO_PROCESSING_NS_NS_CORE_H_
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/ns/nsx_core.c b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/ns/nsx_core.c
deleted file mode 100644
index 8043656029..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/ns/nsx_core.c
+++ /dev/null
@@ -1,2107 +0,0 @@
-/*
- *  Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#include "modules/audio_processing/ns/noise_suppression_x.h"
-
-#include <math.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "rtc_base/checks.h"
-#include "common_audio/signal_processing/include/real_fft.h"
-#include "modules/audio_processing/ns/nsx_core.h"
-#include "system_wrappers/include/cpu_features_wrapper.h"
-
-#if defined(WEBRTC_HAS_NEON)
-/* Tables are defined in ARM assembly files. */
-extern const int16_t WebRtcNsx_kLogTable[9];
-extern const int16_t WebRtcNsx_kCounterDiv[201];
-extern const int16_t WebRtcNsx_kLogTableFrac[256];
-#else
-static const int16_t WebRtcNsx_kLogTable[9] = {
-  0, 177, 355, 532, 710, 887, 1065, 1242, 1420
-};
-
-static const int16_t WebRtcNsx_kCounterDiv[201] = {
-  32767, 16384, 10923, 8192, 6554, 5461, 4681, 4096, 3641, 3277, 2979, 2731,
-  2521, 2341, 2185, 2048, 1928, 1820, 1725, 1638, 1560, 1489, 1425, 1365, 1311,
-  1260, 1214, 1170, 1130, 1092, 1057, 1024, 993, 964, 936, 910, 886, 862, 840,
-  819, 799, 780, 762, 745, 728, 712, 697, 683, 669, 655, 643, 630, 618, 607,
-  596, 585, 575, 565, 555, 546, 537, 529, 520, 512, 504, 496, 489, 482, 475,
-  468, 462, 455, 449, 443, 437, 431, 426, 420, 415, 410, 405, 400, 395, 390,
-  386, 381, 377, 372, 368, 364, 360, 356, 352, 349, 345, 341, 338, 334, 331,
-  328, 324, 321, 318, 315, 312, 309, 306, 303, 301, 298, 295, 293, 290, 287,
-  285, 282, 280, 278, 275, 273, 271, 269, 266, 264, 262, 260, 258, 256, 254,
-  252, 250, 248, 246, 245, 243, 241, 239, 237, 236, 234, 232, 231, 229, 228,
-  226, 224, 223, 221, 220, 218, 217, 216, 214, 213, 211, 210, 209, 207, 206,
-  205, 204, 202, 201, 200, 199, 197, 196, 195, 194, 193, 192, 191, 189, 188,
-  187, 186, 185, 184, 183, 182, 181, 180, 179, 178, 177, 176, 175, 174, 173,
-  172, 172, 171, 170, 169, 168, 167, 166, 165, 165, 164, 163
-};
-
-static const int16_t WebRtcNsx_kLogTableFrac[256] = {
-  0,   1,   3,   4,   6,   7,   9,  10,  11,  13,  14,  16,  17,  18,  20,  21,
-  22,  24,  25,  26,  28,  29,  30,  32,  33,  34,  36,  37,  38,  40,  41,  42,
-  44,  45,  46,  47,  49,  50,  51,  52,  54,  55,  56,  57,  59,  60,  61,  62,
-  63,  65,  66,  67,  68,  69,  71,  72,  73,  74,  75,  77,  78,  79,  80,  81,
-  82,  84,  85,  86,  87,  88,  89,  90,  92,  93,  94,  95,  96,  97,  98,  99,
-  100, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 116,
-  117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127, 128, 129, 130, 131,
-  132, 133, 134, 135, 136, 137, 138, 139, 140, 141, 142, 143, 144, 145, 146,
-  147, 148, 149, 150, 151, 152, 153, 154, 155, 155, 156, 157, 158, 159, 160,
-  161, 162, 163, 164, 165, 166, 167, 168, 169, 169, 170, 171, 172, 173, 174,
-  175, 176, 177, 178, 178, 179, 180, 181, 182, 183, 184, 185, 185, 186, 187,
-  188, 189, 190, 191, 192, 192, 193, 194, 195, 196, 197, 198, 198, 199, 200,
-  201, 202, 203, 203, 204, 205, 206, 207, 208, 208, 209, 210, 211, 212, 212,
-  213, 214, 215, 216, 216, 217, 218, 219, 220, 220, 221, 222, 223, 224, 224,
-  225, 226, 227, 228, 228, 229, 230, 231, 231, 232, 233, 234, 234, 235, 236,
-  237, 238, 238, 239, 240, 241, 241, 242, 243, 244, 244, 245, 246, 247, 247,
-  248, 249, 249, 250, 251, 252, 252, 253, 254, 255, 255
-};
-#endif  // WEBRTC_HAS_NEON
-
-// Skip first frequency bins during estimation. (0 <= value < 64)
-static const size_t kStartBand = 5;
-
-// hybrib Hanning & flat window
-static const int16_t kBlocks80w128x[128] = {
-  0,    536,   1072,   1606,   2139,   2669,   3196,   3720,   4240,   4756,   5266,
-  5771,   6270,   6762,   7246,   7723,   8192,   8652,   9102,   9543,   9974,  10394,
-  10803,  11200,  11585,  11958,  12318,  12665,  12998,  13318,  13623,  13913,  14189,
-  14449,  14694,  14924,  15137,  15334,  15515,  15679,  15826,  15956,  16069,  16165,
-  16244,  16305,  16349,  16375,  16384,  16384,  16384,  16384,  16384,  16384,  16384,
-  16384,  16384,  16384,  16384,  16384,  16384,  16384,  16384,  16384,  16384,  16384,
-  16384,  16384,  16384,  16384,  16384,  16384,  16384,  16384,  16384,  16384,  16384,
-  16384,  16384,  16384,  16384,  16375,  16349,  16305,  16244,  16165,  16069,  15956,
-  15826,  15679,  15515,  15334,  15137,  14924,  14694,  14449,  14189,  13913,  13623,
-  13318,  12998,  12665,  12318,  11958,  11585,  11200,  10803,  10394,   9974,   9543,
-  9102,   8652,   8192,   7723,   7246,   6762,   6270,   5771,   5266,   4756,   4240,
-  3720,   3196,   2669,   2139,   1606,   1072,    536
-};
-
-// hybrib Hanning & flat window
-static const int16_t kBlocks160w256x[256] = {
-  0,   268,   536,   804,  1072,  1339,  1606,  1872,
-  2139,  2404,  2669,  2933,  3196,  3459,  3720,  3981,
-  4240,  4499,  4756,  5012,  5266,  5520,  5771,  6021,
-  6270,  6517,  6762,  7005,  7246,  7486,  7723,  7959,
-  8192,  8423,  8652,  8878,  9102,  9324,  9543,  9760,
-  9974, 10185, 10394, 10600, 10803, 11003, 11200, 11394,
-  11585, 11773, 11958, 12140, 12318, 12493, 12665, 12833,
-  12998, 13160, 13318, 13472, 13623, 13770, 13913, 14053,
-  14189, 14321, 14449, 14574, 14694, 14811, 14924, 15032,
-  15137, 15237, 15334, 15426, 15515, 15599, 15679, 15754,
-  15826, 15893, 15956, 16015, 16069, 16119, 16165, 16207,
-  16244, 16277, 16305, 16329, 16349, 16364, 16375, 16382,
-  16384, 16384, 16384, 16384, 16384, 16384, 16384, 16384,
-  16384, 16384, 16384, 16384, 16384, 16384, 16384, 16384,
-  16384, 16384, 16384, 16384, 16384, 16384, 16384, 16384,
-  16384, 16384, 16384, 16384, 16384, 16384, 16384, 16384,
-  16384, 16384, 16384, 16384, 16384, 16384, 16384, 16384,
-  16384, 16384, 16384, 16384, 16384, 16384, 16384, 16384,
-  16384, 16384, 16384, 16384, 16384, 16384, 16384, 16384,
-  16384, 16384, 16384, 16384, 16384, 16384, 16384, 16384,
-  16384, 16382, 16375, 16364, 16349, 16329, 16305, 16277,
-  16244, 16207, 16165, 16119, 16069, 16015, 15956, 15893,
-  15826, 15754, 15679, 15599, 15515, 15426, 15334, 15237,
-  15137, 15032, 14924, 14811, 14694, 14574, 14449, 14321,
-  14189, 14053, 13913, 13770, 13623, 13472, 13318, 13160,
-  12998, 12833, 12665, 12493, 12318, 12140, 11958, 11773,
-  11585, 11394, 11200, 11003, 10803, 10600, 10394, 10185,
-  9974,  9760,  9543,  9324,  9102,  8878,  8652,  8423,
-  8192,  7959,  7723,  7486,  7246,  7005,  6762,  6517,
-  6270,  6021,  5771,  5520,  5266,  5012,  4756,  4499,
-  4240,  3981,  3720,  3459,  3196,  2933,  2669,  2404,
-  2139,  1872,  1606,  1339,  1072,   804,   536,   268
-};
-
-// Gain factor1 table: Input value in Q8 and output value in Q13
-// original floating point code
-//  if (gain > blim) {
-//    factor1 = 1.0 + 1.3 * (gain - blim);
-//    if (gain * factor1 > 1.0) {
-//      factor1 = 1.0 / gain;
-//    }
-//  } else {
-//    factor1 = 1.0;
-//  }
-static const int16_t kFactor1Table[257] = {
-  8192, 8192, 8192, 8192, 8192, 8192, 8192,
-  8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192,
-  8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192,
-  8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192,
-  8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192,
-  8192, 8192, 8233, 8274, 8315, 8355, 8396, 8436, 8475, 8515, 8554, 8592, 8631, 8669,
-  8707, 8745, 8783, 8820, 8857, 8894, 8931, 8967, 9003, 9039, 9075, 9111, 9146, 9181,
-  9216, 9251, 9286, 9320, 9354, 9388, 9422, 9456, 9489, 9523, 9556, 9589, 9622, 9655,
-  9687, 9719, 9752, 9784, 9816, 9848, 9879, 9911, 9942, 9973, 10004, 10035, 10066,
-  10097, 10128, 10158, 10188, 10218, 10249, 10279, 10308, 10338, 10368, 10397, 10426,
-  10456, 10485, 10514, 10543, 10572, 10600, 10629, 10657, 10686, 10714, 10742, 10770,
-  10798, 10826, 10854, 10882, 10847, 10810, 10774, 10737, 10701, 10666, 10631, 10596,
-  10562, 10527, 10494, 10460, 10427, 10394, 10362, 10329, 10297, 10266, 10235, 10203,
-  10173, 10142, 10112, 10082, 10052, 10023, 9994, 9965, 9936, 9908, 9879, 9851, 9824,
-  9796, 9769, 9742, 9715, 9689, 9662, 9636, 9610, 9584, 9559, 9534, 9508, 9484, 9459,
-  9434, 9410, 9386, 9362, 9338, 9314, 9291, 9268, 9245, 9222, 9199, 9176, 9154, 9132,
-  9110, 9088, 9066, 9044, 9023, 9002, 8980, 8959, 8939, 8918, 8897, 8877, 8857, 8836,
-  8816, 8796, 8777, 8757, 8738, 8718, 8699, 8680, 8661, 8642, 8623, 8605, 8586, 8568,
-  8550, 8532, 8514, 8496, 8478, 8460, 8443, 8425, 8408, 8391, 8373, 8356, 8339, 8323,
-  8306, 8289, 8273, 8256, 8240, 8224, 8208, 8192
-};
-
-// For Factor2 tables
-// original floating point code
-// if (gain > blim) {
-//   factor2 = 1.0;
-// } else {
-//   factor2 = 1.0 - 0.3 * (blim - gain);
-//   if (gain <= inst->denoiseBound) {
-//     factor2 = 1.0 - 0.3 * (blim - inst->denoiseBound);
-//   }
-// }
-//
-// Gain factor table: Input value in Q8 and output value in Q13
-static const int16_t kFactor2Aggressiveness1[257] = {
-  7577, 7577, 7577, 7577, 7577, 7577,
-  7577, 7577, 7577, 7577, 7577, 7577, 7577, 7577, 7577, 7577, 7577, 7596, 7614, 7632,
-  7650, 7667, 7683, 7699, 7715, 7731, 7746, 7761, 7775, 7790, 7804, 7818, 7832, 7845,
-  7858, 7871, 7884, 7897, 7910, 7922, 7934, 7946, 7958, 7970, 7982, 7993, 8004, 8016,
-  8027, 8038, 8049, 8060, 8070, 8081, 8091, 8102, 8112, 8122, 8132, 8143, 8152, 8162,
-  8172, 8182, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192,
-  8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192,
-  8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192,
-  8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192,
-  8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192,
-  8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192,
-  8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192,
-  8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192,
-  8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192,
-  8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192,
-  8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192,
-  8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192,
-  8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192,
-  8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192
-};
-
-// Gain factor table: Input value in Q8 and output value in Q13
-static const int16_t kFactor2Aggressiveness2[257] = {
-  7270, 7270, 7270, 7270, 7270, 7306,
-  7339, 7369, 7397, 7424, 7448, 7472, 7495, 7517, 7537, 7558, 7577, 7596, 7614, 7632,
-  7650, 7667, 7683, 7699, 7715, 7731, 7746, 7761, 7775, 7790, 7804, 7818, 7832, 7845,
-  7858, 7871, 7884, 7897, 7910, 7922, 7934, 7946, 7958, 7970, 7982, 7993, 8004, 8016,
-  8027, 8038, 8049, 8060, 8070, 8081, 8091, 8102, 8112, 8122, 8132, 8143, 8152, 8162,
-  8172, 8182, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192,
-  8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192,
-  8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192,
-  8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192,
-  8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192,
-  8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192,
-  8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192,
-  8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192,
-  8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192,
-  8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192,
-  8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192,
-  8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192,
-  8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192,
-  8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192
-};
-
-// Gain factor table: Input value in Q8 and output value in Q13
-static const int16_t kFactor2Aggressiveness3[257] = {
-  7184, 7184, 7184, 7229, 7270, 7306,
-  7339, 7369, 7397, 7424, 7448, 7472, 7495, 7517, 7537, 7558, 7577, 7596, 7614, 7632,
-  7650, 7667, 7683, 7699, 7715, 7731, 7746, 7761, 7775, 7790, 7804, 7818, 7832, 7845,
-  7858, 7871, 7884, 7897, 7910, 7922, 7934, 7946, 7958, 7970, 7982, 7993, 8004, 8016,
-  8027, 8038, 8049, 8060, 8070, 8081, 8091, 8102, 8112, 8122, 8132, 8143, 8152, 8162,
-  8172, 8182, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192,
-  8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192,
-  8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192,
-  8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192,
-  8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192,
-  8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192,
-  8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192,
-  8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192,
-  8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192,
-  8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192,
-  8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192,
-  8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192,
-  8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192,
-  8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192, 8192
-};
-
-// sum of log2(i) from table index to inst->anaLen2 in Q5
-// Note that the first table value is invalid, since log2(0) = -infinity
-static const int16_t kSumLogIndex[66] = {
-  0,  22917,  22917,  22885,  22834,  22770,  22696,  22613,
-  22524,  22428,  22326,  22220,  22109,  21994,  21876,  21754,
-  21629,  21501,  21370,  21237,  21101,  20963,  20822,  20679,
-  20535,  20388,  20239,  20089,  19937,  19783,  19628,  19470,
-  19312,  19152,  18991,  18828,  18664,  18498,  18331,  18164,
-  17994,  17824,  17653,  17480,  17306,  17132,  16956,  16779,
-  16602,  16423,  16243,  16063,  15881,  15699,  15515,  15331,
-  15146,  14960,  14774,  14586,  14398,  14209,  14019,  13829,
-  13637,  13445
-};
-
-// sum of log2(i)^2 from table index to inst->anaLen2 in Q2
-// Note that the first table value is invalid, since log2(0) = -infinity
-static const int16_t kSumSquareLogIndex[66] = {
-  0,  16959,  16959,  16955,  16945,  16929,  16908,  16881,
-  16850,  16814,  16773,  16729,  16681,  16630,  16575,  16517,
-  16456,  16392,  16325,  16256,  16184,  16109,  16032,  15952,
-  15870,  15786,  15700,  15612,  15521,  15429,  15334,  15238,
-  15140,  15040,  14938,  14834,  14729,  14622,  14514,  14404,
-  14292,  14179,  14064,  13947,  13830,  13710,  13590,  13468,
-  13344,  13220,  13094,  12966,  12837,  12707,  12576,  12444,
-  12310,  12175,  12039,  11902,  11763,  11624,  11483,  11341,
-  11198,  11054
-};
-
-// log2(table index) in Q12
-// Note that the first table value is invalid, since log2(0) = -infinity
-static const int16_t kLogIndex[129] = {
-  0,      0,   4096,   6492,   8192,   9511,  10588,  11499,
-  12288,  12984,  13607,  14170,  14684,  15157,  15595,  16003,
-  16384,  16742,  17080,  17400,  17703,  17991,  18266,  18529,
-  18780,  19021,  19253,  19476,  19691,  19898,  20099,  20292,
-  20480,  20662,  20838,  21010,  21176,  21338,  21496,  21649,
-  21799,  21945,  22087,  22226,  22362,  22495,  22625,  22752,
-  22876,  22998,  23117,  23234,  23349,  23462,  23572,  23680,
-  23787,  23892,  23994,  24095,  24195,  24292,  24388,  24483,
-  24576,  24668,  24758,  24847,  24934,  25021,  25106,  25189,
-  25272,  25354,  25434,  25513,  25592,  25669,  25745,  25820,
-  25895,  25968,  26041,  26112,  26183,  26253,  26322,  26390,
-  26458,  26525,  26591,  26656,  26721,  26784,  26848,  26910,
-  26972,  27033,  27094,  27154,  27213,  27272,  27330,  27388,
-  27445,  27502,  27558,  27613,  27668,  27722,  27776,  27830,
-  27883,  27935,  27988,  28039,  28090,  28141,  28191,  28241,
-  28291,  28340,  28388,  28437,  28484,  28532,  28579,  28626,
-  28672
-};
-
-// determinant of estimation matrix in Q0 corresponding to the log2 tables above
-// Note that the first table value is invalid, since log2(0) = -infinity
-static const int16_t kDeterminantEstMatrix[66] = {
-  0,  29814,  25574,  22640,  20351,  18469,  16873,  15491,
-  14277,  13199,  12233,  11362,  10571,   9851,   9192,   8587,
-  8030,   7515,   7038,   6596,   6186,   5804,   5448,   5115,
-  4805,   4514,   4242,   3988,   3749,   3524,   3314,   3116,
-  2930,   2755,   2590,   2435,   2289,   2152,   2022,   1900,
-  1785,   1677,   1575,   1478,   1388,   1302,   1221,   1145,
-  1073,   1005,    942,    881,    825,    771,    721,    674,
-  629,    587,    547,    510,    475,    442,    411,    382,
-  355,    330
-};
-
-// Update the noise estimation information.
-static void UpdateNoiseEstimate(NoiseSuppressionFixedC* inst, int offset) {
-  int32_t tmp32no1 = 0;
-  int32_t tmp32no2 = 0;
-  int16_t tmp16 = 0;
-  const int16_t kExp2Const = 11819; // Q13
-
-  size_t i = 0;
-
-  tmp16 = WebRtcSpl_MaxValueW16(inst->noiseEstLogQuantile + offset,
-                                   inst->magnLen);
-  // Guarantee a Q-domain as high as possible and still fit in int16
-  inst->qNoise = 14 - (int) WEBRTC_SPL_MUL_16_16_RSFT_WITH_ROUND(
-                   kExp2Const, tmp16, 21);
-  for (i = 0; i < inst->magnLen; i++) {
-    // inst->quantile[i]=exp(inst->lquantile[offset+i]);
-    // in Q21
-    tmp32no2 = kExp2Const * inst->noiseEstLogQuantile[offset + i];
-    tmp32no1 = (0x00200000 | (tmp32no2 & 0x001FFFFF)); // 2^21 + frac
-    tmp16 = (int16_t)(tmp32no2 >> 21);
-    tmp16 -= 21;// shift 21 to get result in Q0
-    tmp16 += (int16_t) inst->qNoise; //shift to get result in Q(qNoise)
-    if (tmp16 < 0) {
-      tmp32no1 >>= -tmp16;
-    } else {
-      tmp32no1 <<= tmp16;
-    }
-    inst->noiseEstQuantile[i] = WebRtcSpl_SatW32ToW16(tmp32no1);
-  }
-}
-
-// Noise Estimation
-static void NoiseEstimationC(NoiseSuppressionFixedC* inst,
-                             uint16_t* magn,
-                             uint32_t* noise,
-                             int16_t* q_noise) {
-  int16_t lmagn[HALF_ANAL_BLOCKL], counter, countDiv;
-  int16_t countProd, delta, zeros, frac;
-  int16_t log2, tabind, logval, tmp16, tmp16no1, tmp16no2;
-  const int16_t log2_const = 22713; // Q15
-  const int16_t width_factor = 21845;
-
-  size_t i, s, offset;
-
-  tabind = inst->stages - inst->normData;
-  RTC_DCHECK_LT(tabind, 9);
-  RTC_DCHECK_GT(tabind, -9);
-  if (tabind < 0) {
-    logval = -WebRtcNsx_kLogTable[-tabind];
-  } else {
-    logval = WebRtcNsx_kLogTable[tabind];
-  }
-
-  // lmagn(i)=log(magn(i))=log(2)*log2(magn(i))
-  // magn is in Q(-stages), and the real lmagn values are:
-  // real_lmagn(i)=log(magn(i)*2^stages)=log(magn(i))+log(2^stages)
-  // lmagn in Q8
-  for (i = 0; i < inst->magnLen; i++) {
-    if (magn[i]) {
-      zeros = WebRtcSpl_NormU32((uint32_t)magn[i]);
-      frac = (int16_t)((((uint32_t)magn[i] << zeros)
-                              & 0x7FFFFFFF) >> 23);
-      // log2(magn(i))
-      RTC_DCHECK_LT(frac, 256);
-      log2 = (int16_t)(((31 - zeros) << 8)
-                             + WebRtcNsx_kLogTableFrac[frac]);
-      // log2(magn(i))*log(2)
-      lmagn[i] = (int16_t)((log2 * log2_const) >> 15);
-      // + log(2^stages)
-      lmagn[i] += logval;
-    } else {
-      lmagn[i] = logval;//0;
-    }
-  }
-
-  // loop over simultaneous estimates
-  for (s = 0; s < SIMULT; s++) {
-    offset = s * inst->magnLen;
-
-    // Get counter values from state
-    counter = inst->noiseEstCounter[s];
-    RTC_DCHECK_LT(counter, 201);
-    countDiv = WebRtcNsx_kCounterDiv[counter];
-    countProd = (int16_t)(counter * countDiv);
-
-    // quant_est(...)
-    for (i = 0; i < inst->magnLen; i++) {
-      // compute delta
-      if (inst->noiseEstDensity[offset + i] > 512) {
-        // Get the value for delta by shifting intead of dividing.
-        int factor = WebRtcSpl_NormW16(inst->noiseEstDensity[offset + i]);
-        delta = (int16_t)(FACTOR_Q16 >> (14 - factor));
-      } else {
-        delta = FACTOR_Q7;
-        if (inst->blockIndex < END_STARTUP_LONG) {
-          // Smaller step size during startup. This prevents from using
-          // unrealistic values causing overflow.
-          delta = FACTOR_Q7_STARTUP;
-        }
-      }
-
-      // update log quantile estimate
-      tmp16 = (int16_t)((delta * countDiv) >> 14);
-      if (lmagn[i] > inst->noiseEstLogQuantile[offset + i]) {
-        // +=QUANTILE*delta/(inst->counter[s]+1) QUANTILE=0.25, =1 in Q2
-        // CounterDiv=1/(inst->counter[s]+1) in Q15
-        tmp16 += 2;
-        inst->noiseEstLogQuantile[offset + i] += tmp16 / 4;
-      } else {
-        tmp16 += 1;
-        // *(1-QUANTILE), in Q2 QUANTILE=0.25, 1-0.25=0.75=3 in Q2
-        // TODO(bjornv): investigate why we need to truncate twice.
-        tmp16no2 = (int16_t)((tmp16 / 2) * 3 / 2);
-        inst->noiseEstLogQuantile[offset + i] -= tmp16no2;
-        if (inst->noiseEstLogQuantile[offset + i] < logval) {
-          // This is the smallest fixed point representation we can
-          // have, hence we limit the output.
-          inst->noiseEstLogQuantile[offset + i] = logval;
-        }
-      }
-
-      // update density estimate
-      if (WEBRTC_SPL_ABS_W16(lmagn[i] - inst->noiseEstLogQuantile[offset + i])
-          < WIDTH_Q8) {
-        tmp16no1 = (int16_t)WEBRTC_SPL_MUL_16_16_RSFT_WITH_ROUND(
-                     inst->noiseEstDensity[offset + i], countProd, 15);
-        tmp16no2 = (int16_t)WEBRTC_SPL_MUL_16_16_RSFT_WITH_ROUND(
-                     width_factor, countDiv, 15);
-        inst->noiseEstDensity[offset + i] = tmp16no1 + tmp16no2;
-      }
-    }  // end loop over magnitude spectrum
-
-    if (counter >= END_STARTUP_LONG) {
-      inst->noiseEstCounter[s] = 0;
-      if (inst->blockIndex >= END_STARTUP_LONG) {
-        UpdateNoiseEstimate(inst, offset);
-      }
-    }
-    inst->noiseEstCounter[s]++;
-
-  }  // end loop over simultaneous estimates
-
-  // Sequentially update the noise during startup
-  if (inst->blockIndex < END_STARTUP_LONG) {
-    UpdateNoiseEstimate(inst, offset);
-  }
-
-  for (i = 0; i < inst->magnLen; i++) {
-    noise[i] = (uint32_t)(inst->noiseEstQuantile[i]); // Q(qNoise)
-  }
-  (*q_noise) = (int16_t)inst->qNoise;
-}
-
-// Filter the data in the frequency domain, and create spectrum.
-static void PrepareSpectrumC(NoiseSuppressionFixedC* inst, int16_t* freq_buf) {
-  size_t i = 0, j = 0;
-
-  for (i = 0; i < inst->magnLen; i++) {
-    inst->real[i] = (int16_t)((inst->real[i] *
-        (int16_t)(inst->noiseSupFilter[i])) >> 14);  // Q(normData-stages)
-    inst->imag[i] = (int16_t)((inst->imag[i] *
-        (int16_t)(inst->noiseSupFilter[i])) >> 14);  // Q(normData-stages)
-  }
-
-  freq_buf[0] = inst->real[0];
-  freq_buf[1] = -inst->imag[0];
-  for (i = 1, j = 2; i < inst->anaLen2; i += 1, j += 2) {
-    freq_buf[j] = inst->real[i];
-    freq_buf[j + 1] = -inst->imag[i];
-  }
-  freq_buf[inst->anaLen] = inst->real[inst->anaLen2];
-  freq_buf[inst->anaLen + 1] = -inst->imag[inst->anaLen2];
-}
-
-// Denormalize the real-valued signal |in|, the output from inverse FFT.
-static void DenormalizeC(NoiseSuppressionFixedC* inst,
-                         int16_t* in,
-                         int factor) {
-  size_t i = 0;
-  int32_t tmp32 = 0;
-  for (i = 0; i < inst->anaLen; i += 1) {
-    tmp32 = WEBRTC_SPL_SHIFT_W32((int32_t)in[i],
-                                 factor - inst->normData);
-    inst->real[i] = WebRtcSpl_SatW32ToW16(tmp32); // Q0
-  }
-}
-
-// For the noise supression process, synthesis, read out fully processed
-// segment, and update synthesis buffer.
-static void SynthesisUpdateC(NoiseSuppressionFixedC* inst,
-                             int16_t* out_frame,
-                             int16_t gain_factor) {
-  size_t i = 0;
-  int16_t tmp16a = 0;
-  int16_t tmp16b = 0;
-  int32_t tmp32 = 0;
-
-  // synthesis
-  for (i = 0; i < inst->anaLen; i++) {
-    tmp16a = (int16_t)WEBRTC_SPL_MUL_16_16_RSFT_WITH_ROUND(
-                 inst->window[i], inst->real[i], 14); // Q0, window in Q14
-    tmp32 = WEBRTC_SPL_MUL_16_16_RSFT_WITH_ROUND(tmp16a, gain_factor, 13); // Q0
-    // Down shift with rounding
-    tmp16b = WebRtcSpl_SatW32ToW16(tmp32); // Q0
-    inst->synthesisBuffer[i] = WebRtcSpl_AddSatW16(inst->synthesisBuffer[i],
-                                                   tmp16b); // Q0
-  }
-
-  // read out fully processed segment
-  for (i = 0; i < inst->blockLen10ms; i++) {
-    out_frame[i] = inst->synthesisBuffer[i]; // Q0
-  }
-
-  // update synthesis buffer
-  memcpy(inst->synthesisBuffer, inst->synthesisBuffer + inst->blockLen10ms,
-      (inst->anaLen - inst->blockLen10ms) * sizeof(*inst->synthesisBuffer));
-  WebRtcSpl_ZerosArrayW16(inst->synthesisBuffer
-      + inst->anaLen - inst->blockLen10ms, inst->blockLen10ms);
-}
-
-// Update analysis buffer for lower band, and window data before FFT.
-static void AnalysisUpdateC(NoiseSuppressionFixedC* inst,
-                            int16_t* out,
-                            int16_t* new_speech) {
-  size_t i = 0;
-
-  // For lower band update analysis buffer.
-  memcpy(inst->analysisBuffer, inst->analysisBuffer + inst->blockLen10ms,
-      (inst->anaLen - inst->blockLen10ms) * sizeof(*inst->analysisBuffer));
-  memcpy(inst->analysisBuffer + inst->anaLen - inst->blockLen10ms, new_speech,
-      inst->blockLen10ms * sizeof(*inst->analysisBuffer));
-
-  // Window data before FFT.
-  for (i = 0; i < inst->anaLen; i++) {
-    out[i] = (int16_t)WEBRTC_SPL_MUL_16_16_RSFT_WITH_ROUND(
-               inst->window[i], inst->analysisBuffer[i], 14); // Q0
-  }
-}
-
-// Normalize the real-valued signal |in|, the input to forward FFT.
-static void NormalizeRealBufferC(NoiseSuppressionFixedC* inst,
-                                 const int16_t* in,
-                                 int16_t* out) {
-  size_t i = 0;
-  RTC_DCHECK_GE(inst->normData, 0);
-  for (i = 0; i < inst->anaLen; ++i) {
-    out[i] = in[i] << inst->normData;  // Q(normData)
-  }
-}
-
-// Declare function pointers.
-NoiseEstimation WebRtcNsx_NoiseEstimation;
-PrepareSpectrum WebRtcNsx_PrepareSpectrum;
-SynthesisUpdate WebRtcNsx_SynthesisUpdate;
-AnalysisUpdate WebRtcNsx_AnalysisUpdate;
-Denormalize WebRtcNsx_Denormalize;
-NormalizeRealBuffer WebRtcNsx_NormalizeRealBuffer;
-
-#if defined(WEBRTC_HAS_NEON)
-// Initialize function pointers for ARM Neon platform.
-static void WebRtcNsx_InitNeon(void) {
-  WebRtcNsx_NoiseEstimation = WebRtcNsx_NoiseEstimationNeon;
-  WebRtcNsx_PrepareSpectrum = WebRtcNsx_PrepareSpectrumNeon;
-  WebRtcNsx_SynthesisUpdate = WebRtcNsx_SynthesisUpdateNeon;
-  WebRtcNsx_AnalysisUpdate = WebRtcNsx_AnalysisUpdateNeon;
-}
-#endif
-
-#if defined(MIPS32_LE)
-// Initialize function pointers for MIPS platform.
-static void WebRtcNsx_InitMips(void) {
-  WebRtcNsx_PrepareSpectrum = WebRtcNsx_PrepareSpectrum_mips;
-  WebRtcNsx_SynthesisUpdate = WebRtcNsx_SynthesisUpdate_mips;
-  WebRtcNsx_AnalysisUpdate = WebRtcNsx_AnalysisUpdate_mips;
-  WebRtcNsx_NormalizeRealBuffer = WebRtcNsx_NormalizeRealBuffer_mips;
-#if defined(MIPS_DSP_R1_LE)
-  WebRtcNsx_Denormalize = WebRtcNsx_Denormalize_mips;
-#endif
-}
-#endif
-
-void WebRtcNsx_CalcParametricNoiseEstimate(NoiseSuppressionFixedC* inst,
-                                           int16_t pink_noise_exp_avg,
-                                           int32_t pink_noise_num_avg,
-                                           int freq_index,
-                                           uint32_t* noise_estimate,
-                                           uint32_t* noise_estimate_avg) {
-  int32_t tmp32no1 = 0;
-  int32_t tmp32no2 = 0;
-
-  int16_t int_part = 0;
-  int16_t frac_part = 0;
-
-  // Use pink noise estimate
-  // noise_estimate = 2^(pinkNoiseNumerator + pinkNoiseExp * log2(j))
-  RTC_DCHECK_GE(freq_index, 0);
-  RTC_DCHECK_LT(freq_index, 129);
-  tmp32no2 = (pink_noise_exp_avg * kLogIndex[freq_index]) >> 15;  // Q11
-  tmp32no1 = pink_noise_num_avg - tmp32no2; // Q11
-
-  // Calculate output: 2^tmp32no1
-  // Output in Q(minNorm-stages)
-  tmp32no1 += (inst->minNorm - inst->stages) << 11;
-  if (tmp32no1 > 0) {
-    int_part = (int16_t)(tmp32no1 >> 11);
-    frac_part = (int16_t)(tmp32no1 & 0x000007ff); // Q11
-    // Piecewise linear approximation of 'b' in
-    // 2^(int_part+frac_part) = 2^int_part * (1 + b)
-    // 'b' is given in Q11 and below stored in frac_part.
-    if (frac_part >> 10) {
-      // Upper fractional part
-      tmp32no2 = (2048 - frac_part) * 1244;  // Q21
-      tmp32no2 = 2048 - (tmp32no2 >> 10);
-    } else {
-      // Lower fractional part
-      tmp32no2 = (frac_part * 804) >> 10;
-    }
-    // Shift fractional part to Q(minNorm-stages)
-    tmp32no2 = WEBRTC_SPL_SHIFT_W32(tmp32no2, int_part - 11);
-    *noise_estimate_avg = (1 << int_part) + (uint32_t)tmp32no2;
-    // Scale up to initMagnEst, which is not block averaged
-    *noise_estimate = (*noise_estimate_avg) * (uint32_t)(inst->blockIndex + 1);
-  }
-}
-
-// Initialize state
-int32_t WebRtcNsx_InitCore(NoiseSuppressionFixedC* inst, uint32_t fs) {
-  int i;
-
-  //check for valid pointer
-  if (inst == NULL) {
-    return -1;
-  }
-  //
-
-  // Initialization of struct
-  if (fs == 8000 || fs == 16000 || fs == 32000 || fs == 48000) {
-    inst->fs = fs;
-  } else {
-    return -1;
-  }
-
-  if (fs == 8000) {
-    inst->blockLen10ms = 80;
-    inst->anaLen = 128;
-    inst->stages = 7;
-    inst->window = kBlocks80w128x;
-    inst->thresholdLogLrt = 131072; //default threshold for LRT feature
-    inst->maxLrt = 0x0040000;
-    inst->minLrt = 52429;
-  } else {
-    inst->blockLen10ms = 160;
-    inst->anaLen = 256;
-    inst->stages = 8;
-    inst->window = kBlocks160w256x;
-    inst->thresholdLogLrt = 212644; //default threshold for LRT feature
-    inst->maxLrt = 0x0080000;
-    inst->minLrt = 104858;
-  }
-  inst->anaLen2 = inst->anaLen / 2;
-  inst->magnLen = inst->anaLen2 + 1;
-
-  if (inst->real_fft != NULL) {
-    WebRtcSpl_FreeRealFFT(inst->real_fft);
-  }
-  inst->real_fft = WebRtcSpl_CreateRealFFT(inst->stages);
-  if (inst->real_fft == NULL) {
-    return -1;
-  }
-
-  WebRtcSpl_ZerosArrayW16(inst->analysisBuffer, ANAL_BLOCKL_MAX);
-  WebRtcSpl_ZerosArrayW16(inst->synthesisBuffer, ANAL_BLOCKL_MAX);
-
-  // for HB processing
-  WebRtcSpl_ZerosArrayW16(inst->dataBufHBFX[0],
-                          NUM_HIGH_BANDS_MAX * ANAL_BLOCKL_MAX);
-  // for quantile noise estimation
-  WebRtcSpl_ZerosArrayW16(inst->noiseEstQuantile, HALF_ANAL_BLOCKL);
-  for (i = 0; i < SIMULT * HALF_ANAL_BLOCKL; i++) {
-    inst->noiseEstLogQuantile[i] = 2048; // Q8
-    inst->noiseEstDensity[i] = 153; // Q9
-  }
-  for (i = 0; i < SIMULT; i++) {
-    inst->noiseEstCounter[i] = (int16_t)(END_STARTUP_LONG * (i + 1)) / SIMULT;
-  }
-
-  // Initialize suppression filter with ones
-  WebRtcSpl_MemSetW16((int16_t*)inst->noiseSupFilter, 16384, HALF_ANAL_BLOCKL);
-
-  // Set the aggressiveness: default
-  inst->aggrMode = 0;
-
-  //initialize variables for new method
-  inst->priorNonSpeechProb = 8192; // Q14(0.5) prior probability for speech/noise
-  for (i = 0; i < HALF_ANAL_BLOCKL; i++) {
-    inst->prevMagnU16[i] = 0;
-    inst->prevNoiseU32[i] = 0; //previous noise-spectrum
-    inst->logLrtTimeAvgW32[i] = 0; //smooth LR ratio
-    inst->avgMagnPause[i] = 0; //conservative noise spectrum estimate
-    inst->initMagnEst[i] = 0; //initial average magnitude spectrum
-  }
-
-  //feature quantities
-  inst->thresholdSpecDiff = 50; //threshold for difference feature: determined on-line
-  inst->thresholdSpecFlat = 20480; //threshold for flatness: determined on-line
-  inst->featureLogLrt = inst->thresholdLogLrt; //average LRT factor (= threshold)
-  inst->featureSpecFlat = inst->thresholdSpecFlat; //spectral flatness (= threshold)
-  inst->featureSpecDiff = inst->thresholdSpecDiff; //spectral difference (= threshold)
-  inst->weightLogLrt = 6; //default weighting par for LRT feature
-  inst->weightSpecFlat = 0; //default weighting par for spectral flatness feature
-  inst->weightSpecDiff = 0; //default weighting par for spectral difference feature
-
-  inst->curAvgMagnEnergy = 0; //window time-average of input magnitude spectrum
-  inst->timeAvgMagnEnergy = 0; //normalization for spectral difference
-  inst->timeAvgMagnEnergyTmp = 0; //normalization for spectral difference
-
-  //histogram quantities: used to estimate/update thresholds for features
-  WebRtcSpl_ZerosArrayW16(inst->histLrt, HIST_PAR_EST);
-  WebRtcSpl_ZerosArrayW16(inst->histSpecDiff, HIST_PAR_EST);
-  WebRtcSpl_ZerosArrayW16(inst->histSpecFlat, HIST_PAR_EST);
-
-  inst->blockIndex = -1; //frame counter
-
-  //inst->modelUpdate    = 500;   //window for update
-  inst->modelUpdate = (1 << STAT_UPDATES); //window for update
-  inst->cntThresUpdate = 0; //counter feature thresholds updates
-
-  inst->sumMagn = 0;
-  inst->magnEnergy = 0;
-  inst->prevQMagn = 0;
-  inst->qNoise = 0;
-  inst->prevQNoise = 0;
-
-  inst->energyIn = 0;
-  inst->scaleEnergyIn = 0;
-
-  inst->whiteNoiseLevel = 0;
-  inst->pinkNoiseNumerator = 0;
-  inst->pinkNoiseExp = 0;
-  inst->minNorm = 15; // Start with full scale
-  inst->zeroInputSignal = 0;
-
-  //default mode
-  WebRtcNsx_set_policy_core(inst, 0);
-
-#ifdef NS_FILEDEBUG
-  inst->infile = fopen("indebug.pcm", "wb");
-  inst->outfile = fopen("outdebug.pcm", "wb");
-  inst->file1 = fopen("file1.pcm", "wb");
-  inst->file2 = fopen("file2.pcm", "wb");
-  inst->file3 = fopen("file3.pcm", "wb");
-  inst->file4 = fopen("file4.pcm", "wb");
-  inst->file5 = fopen("file5.pcm", "wb");
-#endif
-
-  // Initialize function pointers.
-  WebRtcNsx_NoiseEstimation = NoiseEstimationC;
-  WebRtcNsx_PrepareSpectrum = PrepareSpectrumC;
-  WebRtcNsx_SynthesisUpdate = SynthesisUpdateC;
-  WebRtcNsx_AnalysisUpdate = AnalysisUpdateC;
-  WebRtcNsx_Denormalize = DenormalizeC;
-  WebRtcNsx_NormalizeRealBuffer = NormalizeRealBufferC;
-
-#if defined(WEBRTC_HAS_NEON)
-  WebRtcNsx_InitNeon();
-#endif
-
-#if defined(MIPS32_LE)
-  WebRtcNsx_InitMips();
-#endif
-
-  inst->initFlag = 1;
-
-  return 0;
-}
-
-int WebRtcNsx_set_policy_core(NoiseSuppressionFixedC* inst, int mode) {
-  // allow for modes:0,1,2,3
-  if (mode < 0 || mode > 3) {
-    return -1;
-  }
-
-  inst->aggrMode = mode;
-  if (mode == 0) {
-    inst->overdrive = 256; // Q8(1.0)
-    inst->denoiseBound = 8192; // Q14(0.5)
-    inst->gainMap = 0; // No gain compensation
-  } else if (mode == 1) {
-    inst->overdrive = 256; // Q8(1.0)
-    inst->denoiseBound = 4096; // Q14(0.25)
-    inst->factor2Table = kFactor2Aggressiveness1;
-    inst->gainMap = 1;
-  } else if (mode == 2) {
-    inst->overdrive = 282; // ~= Q8(1.1)
-    inst->denoiseBound = 2048; // Q14(0.125)
-    inst->factor2Table = kFactor2Aggressiveness2;
-    inst->gainMap = 1;
-  } else if (mode == 3) {
-    inst->overdrive = 320; // Q8(1.25)
-    inst->denoiseBound = 1475; // ~= Q14(0.09)
-    inst->factor2Table = kFactor2Aggressiveness3;
-    inst->gainMap = 1;
-  }
-  return 0;
-}
-
-// Extract thresholds for feature parameters
-// histograms are computed over some window_size (given by window_pars)
-// thresholds and weights are extracted every window
-// flag 0 means update histogram only, flag 1 means compute the thresholds/weights
-// threshold and weights are returned in: inst->priorModelPars
-void WebRtcNsx_FeatureParameterExtraction(NoiseSuppressionFixedC* inst,
-                                          int flag) {
-  uint32_t tmpU32;
-  uint32_t histIndex;
-  uint32_t posPeak1SpecFlatFX, posPeak2SpecFlatFX;
-  uint32_t posPeak1SpecDiffFX, posPeak2SpecDiffFX;
-
-  int32_t tmp32;
-  int32_t fluctLrtFX, thresFluctLrtFX;
-  int32_t avgHistLrtFX, avgSquareHistLrtFX, avgHistLrtComplFX;
-
-  int16_t j;
-  int16_t numHistLrt;
-
-  int i;
-  int useFeatureSpecFlat, useFeatureSpecDiff, featureSum;
-  int maxPeak1, maxPeak2;
-  int weightPeak1SpecFlat, weightPeak2SpecFlat;
-  int weightPeak1SpecDiff, weightPeak2SpecDiff;
-
-  //update histograms
-  if (!flag) {
-    // LRT
-    // Type casting to UWord32 is safe since negative values will not be wrapped to larger
-    // values than HIST_PAR_EST
-    histIndex = (uint32_t)(inst->featureLogLrt);
-    if (histIndex < HIST_PAR_EST) {
-      inst->histLrt[histIndex]++;
-    }
-    // Spectral flatness
-    // (inst->featureSpecFlat*20)>>10 = (inst->featureSpecFlat*5)>>8
-    histIndex = (inst->featureSpecFlat * 5) >> 8;
-    if (histIndex < HIST_PAR_EST) {
-      inst->histSpecFlat[histIndex]++;
-    }
-    // Spectral difference
-    histIndex = HIST_PAR_EST;
-    if (inst->timeAvgMagnEnergy > 0) {
-      // Guard against division by zero
-      // If timeAvgMagnEnergy == 0 we have no normalizing statistics and
-      // therefore can't update the histogram
-      histIndex = ((inst->featureSpecDiff * 5) >> inst->stages) /
-          inst->timeAvgMagnEnergy;
-    }
-    if (histIndex < HIST_PAR_EST) {
-      inst->histSpecDiff[histIndex]++;
-    }
-  }
-
-  // extract parameters for speech/noise probability
-  if (flag) {
-    useFeatureSpecDiff = 1;
-    //for LRT feature:
-    // compute the average over inst->featureExtractionParams.rangeAvgHistLrt
-    avgHistLrtFX = 0;
-    avgSquareHistLrtFX = 0;
-    numHistLrt = 0;
-    for (i = 0; i < BIN_SIZE_LRT; i++) {
-      j = (2 * i + 1);
-      tmp32 = inst->histLrt[i] * j;
-      avgHistLrtFX += tmp32;
-      numHistLrt += inst->histLrt[i];
-      avgSquareHistLrtFX += tmp32 * j;
-    }
-    avgHistLrtComplFX = avgHistLrtFX;
-    for (; i < HIST_PAR_EST; i++) {
-      j = (2 * i + 1);
-      tmp32 = inst->histLrt[i] * j;
-      avgHistLrtComplFX += tmp32;
-      avgSquareHistLrtFX += tmp32 * j;
-    }
-    fluctLrtFX = avgSquareHistLrtFX * numHistLrt -
-        avgHistLrtFX * avgHistLrtComplFX;
-    thresFluctLrtFX = THRES_FLUCT_LRT * numHistLrt;
-    // get threshold for LRT feature:
-    tmpU32 = (FACTOR_1_LRT_DIFF * (uint32_t)avgHistLrtFX);
-    if ((fluctLrtFX < thresFluctLrtFX) || (numHistLrt == 0) ||
-        (tmpU32 > (uint32_t)(100 * numHistLrt))) {
-      //very low fluctuation, so likely noise
-      inst->thresholdLogLrt = inst->maxLrt;
-    } else {
-      tmp32 = (int32_t)((tmpU32 << (9 + inst->stages)) / numHistLrt /
-                              25);
-      // check if value is within min/max range
-      inst->thresholdLogLrt = WEBRTC_SPL_SAT(inst->maxLrt,
-                                             tmp32,
-                                             inst->minLrt);
-    }
-    if (fluctLrtFX < thresFluctLrtFX) {
-      // Do not use difference feature if fluctuation of LRT feature is very low:
-      // most likely just noise state
-      useFeatureSpecDiff = 0;
-    }
-
-    // for spectral flatness and spectral difference: compute the main peaks of histogram
-    maxPeak1 = 0;
-    maxPeak2 = 0;
-    posPeak1SpecFlatFX = 0;
-    posPeak2SpecFlatFX = 0;
-    weightPeak1SpecFlat = 0;
-    weightPeak2SpecFlat = 0;
-
-    // peaks for flatness
-    for (i = 0; i < HIST_PAR_EST; i++) {
-      if (inst->histSpecFlat[i] > maxPeak1) {
-        // Found new "first" peak
-        maxPeak2 = maxPeak1;
-        weightPeak2SpecFlat = weightPeak1SpecFlat;
-        posPeak2SpecFlatFX = posPeak1SpecFlatFX;
-
-        maxPeak1 = inst->histSpecFlat[i];
-        weightPeak1SpecFlat = inst->histSpecFlat[i];
-        posPeak1SpecFlatFX = (uint32_t)(2 * i + 1);
-      } else if (inst->histSpecFlat[i] > maxPeak2) {
-        // Found new "second" peak
-        maxPeak2 = inst->histSpecFlat[i];
-        weightPeak2SpecFlat = inst->histSpecFlat[i];
-        posPeak2SpecFlatFX = (uint32_t)(2 * i + 1);
-      }
-    }
-
-    // for spectral flatness feature
-    useFeatureSpecFlat = 1;
-    // merge the two peaks if they are close
-    if ((posPeak1SpecFlatFX - posPeak2SpecFlatFX < LIM_PEAK_SPACE_FLAT_DIFF)
-        && (weightPeak2SpecFlat * LIM_PEAK_WEIGHT_FLAT_DIFF > weightPeak1SpecFlat)) {
-      weightPeak1SpecFlat += weightPeak2SpecFlat;
-      posPeak1SpecFlatFX = (posPeak1SpecFlatFX + posPeak2SpecFlatFX) >> 1;
-    }
-    //reject if weight of peaks is not large enough, or peak value too small
-    if (weightPeak1SpecFlat < THRES_WEIGHT_FLAT_DIFF || posPeak1SpecFlatFX
-        < THRES_PEAK_FLAT) {
-      useFeatureSpecFlat = 0;
-    } else { // if selected, get the threshold
-      // compute the threshold and check if value is within min/max range
-      inst->thresholdSpecFlat = WEBRTC_SPL_SAT(MAX_FLAT_Q10, FACTOR_2_FLAT_Q10
-                                               * posPeak1SpecFlatFX, MIN_FLAT_Q10); //Q10
-    }
-    // done with flatness feature
-
-    if (useFeatureSpecDiff) {
-      //compute two peaks for spectral difference
-      maxPeak1 = 0;
-      maxPeak2 = 0;
-      posPeak1SpecDiffFX = 0;
-      posPeak2SpecDiffFX = 0;
-      weightPeak1SpecDiff = 0;
-      weightPeak2SpecDiff = 0;
-      // peaks for spectral difference
-      for (i = 0; i < HIST_PAR_EST; i++) {
-        if (inst->histSpecDiff[i] > maxPeak1) {
-          // Found new "first" peak
-          maxPeak2 = maxPeak1;
-          weightPeak2SpecDiff = weightPeak1SpecDiff;
-          posPeak2SpecDiffFX = posPeak1SpecDiffFX;
-
-          maxPeak1 = inst->histSpecDiff[i];
-          weightPeak1SpecDiff = inst->histSpecDiff[i];
-          posPeak1SpecDiffFX = (uint32_t)(2 * i + 1);
-        } else if (inst->histSpecDiff[i] > maxPeak2) {
-          // Found new "second" peak
-          maxPeak2 = inst->histSpecDiff[i];
-          weightPeak2SpecDiff = inst->histSpecDiff[i];
-          posPeak2SpecDiffFX = (uint32_t)(2 * i + 1);
-        }
-      }
-
-      // merge the two peaks if they are close
-      if ((posPeak1SpecDiffFX - posPeak2SpecDiffFX < LIM_PEAK_SPACE_FLAT_DIFF)
-          && (weightPeak2SpecDiff * LIM_PEAK_WEIGHT_FLAT_DIFF > weightPeak1SpecDiff)) {
-        weightPeak1SpecDiff += weightPeak2SpecDiff;
-        posPeak1SpecDiffFX = (posPeak1SpecDiffFX + posPeak2SpecDiffFX) >> 1;
-      }
-      // get the threshold value and check if value is within min/max range
-      inst->thresholdSpecDiff = WEBRTC_SPL_SAT(MAX_DIFF, FACTOR_1_LRT_DIFF
-                                               * posPeak1SpecDiffFX, MIN_DIFF); //5x bigger
-      //reject if weight of peaks is not large enough
-      if (weightPeak1SpecDiff < THRES_WEIGHT_FLAT_DIFF) {
-        useFeatureSpecDiff = 0;
-      }
-      // done with spectral difference feature
-    }
-
-    // select the weights between the features
-    // inst->priorModelPars[4] is weight for LRT: always selected
-    featureSum = 6 / (1 + useFeatureSpecFlat + useFeatureSpecDiff);
-    inst->weightLogLrt = featureSum;
-    inst->weightSpecFlat = useFeatureSpecFlat * featureSum;
-    inst->weightSpecDiff = useFeatureSpecDiff * featureSum;
-
-    // set histograms to zero for next update
-    WebRtcSpl_ZerosArrayW16(inst->histLrt, HIST_PAR_EST);
-    WebRtcSpl_ZerosArrayW16(inst->histSpecDiff, HIST_PAR_EST);
-    WebRtcSpl_ZerosArrayW16(inst->histSpecFlat, HIST_PAR_EST);
-  }  // end of flag == 1
-}
-
-
-// Compute spectral flatness on input spectrum
-// magn is the magnitude spectrum
-// spectral flatness is returned in inst->featureSpecFlat
-void WebRtcNsx_ComputeSpectralFlatness(NoiseSuppressionFixedC* inst,
-                                       uint16_t* magn) {
-  uint32_t tmpU32;
-  uint32_t avgSpectralFlatnessNum, avgSpectralFlatnessDen;
-
-  int32_t tmp32;
-  int32_t currentSpectralFlatness, logCurSpectralFlatness;
-
-  int16_t zeros, frac, intPart;
-
-  size_t i;
-
-  // for flatness
-  avgSpectralFlatnessNum = 0;
-  avgSpectralFlatnessDen = inst->sumMagn - (uint32_t)magn[0]; // Q(normData-stages)
-
-  // compute log of ratio of the geometric to arithmetic mean: check for log(0) case
-  // flatness = exp( sum(log(magn[i]))/N - log(sum(magn[i])/N) )
-  //          = exp( sum(log(magn[i]))/N ) * N / sum(magn[i])
-  //          = 2^( sum(log2(magn[i]))/N - (log2(sum(magn[i])) - log2(N)) ) [This is used]
-  for (i = 1; i < inst->magnLen; i++) {
-    // First bin is excluded from spectrum measures. Number of bins is now a power of 2
-    if (magn[i]) {
-      zeros = WebRtcSpl_NormU32((uint32_t)magn[i]);
-      frac = (int16_t)(((uint32_t)((uint32_t)(magn[i]) << zeros)
-                              & 0x7FFFFFFF) >> 23);
-      // log2(magn(i))
-      RTC_DCHECK_LT(frac, 256);
-      tmpU32 = (uint32_t)(((31 - zeros) << 8)
-                                + WebRtcNsx_kLogTableFrac[frac]); // Q8
-      avgSpectralFlatnessNum += tmpU32; // Q8
-    } else {
-      //if at least one frequency component is zero, treat separately
-      tmpU32 = WEBRTC_SPL_UMUL_32_16(inst->featureSpecFlat, SPECT_FLAT_TAVG_Q14); // Q24
-      inst->featureSpecFlat -= tmpU32 >> 14;  // Q10
-      return;
-    }
-  }
-  //ratio and inverse log: check for case of log(0)
-  zeros = WebRtcSpl_NormU32(avgSpectralFlatnessDen);
-  frac = (int16_t)(((avgSpectralFlatnessDen << zeros) & 0x7FFFFFFF) >> 23);
-  // log2(avgSpectralFlatnessDen)
-  RTC_DCHECK_LT(frac, 256);
-  tmp32 = (int32_t)(((31 - zeros) << 8) + WebRtcNsx_kLogTableFrac[frac]); // Q8
-  logCurSpectralFlatness = (int32_t)avgSpectralFlatnessNum;
-  logCurSpectralFlatness += ((int32_t)(inst->stages - 1) << (inst->stages + 7)); // Q(8+stages-1)
-  logCurSpectralFlatness -= (tmp32 << (inst->stages - 1));
-  logCurSpectralFlatness <<= (10 - inst->stages);  // Q17
-  tmp32 = (int32_t)(0x00020000 | (WEBRTC_SPL_ABS_W32(logCurSpectralFlatness)
-                                        & 0x0001FFFF)); //Q17
-  intPart = 7 - (logCurSpectralFlatness >> 17);  // Add 7 for output in Q10.
-  if (intPart > 0) {
-    currentSpectralFlatness = tmp32 >> intPart;
-  } else {
-    currentSpectralFlatness = tmp32 << -intPart;
-  }
-
-  //time average update of spectral flatness feature
-  tmp32 = currentSpectralFlatness - (int32_t)inst->featureSpecFlat; // Q10
-  tmp32 *= SPECT_FLAT_TAVG_Q14;  // Q24
-  inst->featureSpecFlat += tmp32 >> 14;  // Q10
-  // done with flatness feature
-}
-
-
-// Compute the difference measure between input spectrum and a template/learned noise spectrum
-// magn_tmp is the input spectrum
-// the reference/template spectrum is  inst->magn_avg_pause[i]
-// returns (normalized) spectral difference in inst->featureSpecDiff
-void WebRtcNsx_ComputeSpectralDifference(NoiseSuppressionFixedC* inst,
-                                         uint16_t* magnIn) {
-  // This is to be calculated:
-  // avgDiffNormMagn = var(magnIn) - cov(magnIn, magnAvgPause)^2 / var(magnAvgPause)
-
-  uint32_t tmpU32no1, tmpU32no2;
-  uint32_t varMagnUFX, varPauseUFX, avgDiffNormMagnUFX;
-
-  int32_t tmp32no1, tmp32no2;
-  int32_t avgPauseFX, avgMagnFX, covMagnPauseFX;
-  int32_t maxPause, minPause;
-
-  int16_t tmp16no1;
-
-  size_t i;
-  int norm32, nShifts;
-
-  avgPauseFX = 0;
-  maxPause = 0;
-  minPause = inst->avgMagnPause[0]; // Q(prevQMagn)
-  // compute average quantities
-  for (i = 0; i < inst->magnLen; i++) {
-    // Compute mean of magn_pause
-    avgPauseFX += inst->avgMagnPause[i]; // in Q(prevQMagn)
-    maxPause = WEBRTC_SPL_MAX(maxPause, inst->avgMagnPause[i]);
-    minPause = WEBRTC_SPL_MIN(minPause, inst->avgMagnPause[i]);
-  }
-  // normalize by replacing div of "inst->magnLen" with "inst->stages-1" shifts
-  avgPauseFX >>= inst->stages - 1;
-  avgMagnFX = inst->sumMagn >> (inst->stages - 1);
-  // Largest possible deviation in magnPause for (co)var calculations
-  tmp32no1 = WEBRTC_SPL_MAX(maxPause - avgPauseFX, avgPauseFX - minPause);
-  // Get number of shifts to make sure we don't get wrap around in varPause
-  nShifts = WEBRTC_SPL_MAX(0, 10 + inst->stages - WebRtcSpl_NormW32(tmp32no1));
-
-  varMagnUFX = 0;
-  varPauseUFX = 0;
-  covMagnPauseFX = 0;
-  for (i = 0; i < inst->magnLen; i++) {
-    // Compute var and cov of magn and magn_pause
-    tmp16no1 = (int16_t)((int32_t)magnIn[i] - avgMagnFX);
-    tmp32no2 = inst->avgMagnPause[i] - avgPauseFX;
-    varMagnUFX += (uint32_t)(tmp16no1 * tmp16no1);  // Q(2*qMagn)
-    tmp32no1 = tmp32no2 * tmp16no1;  // Q(prevQMagn+qMagn)
-    covMagnPauseFX += tmp32no1; // Q(prevQMagn+qMagn)
-    tmp32no1 = tmp32no2 >> nShifts;  // Q(prevQMagn-minPause).
-    varPauseUFX += tmp32no1 * tmp32no1;  // Q(2*(prevQMagn-minPause))
-  }
-  //update of average magnitude spectrum: Q(-2*stages) and averaging replaced by shifts
-  inst->curAvgMagnEnergy +=
-      inst->magnEnergy >> (2 * inst->normData + inst->stages - 1);
-
-  avgDiffNormMagnUFX = varMagnUFX; // Q(2*qMagn)
-  if ((varPauseUFX) && (covMagnPauseFX)) {
-    tmpU32no1 = (uint32_t)WEBRTC_SPL_ABS_W32(covMagnPauseFX); // Q(prevQMagn+qMagn)
-    norm32 = WebRtcSpl_NormU32(tmpU32no1) - 16;
-    if (norm32 > 0) {
-      tmpU32no1 <<= norm32;  // Q(prevQMagn+qMagn+norm32)
-    } else {
-      tmpU32no1 >>= -norm32;  // Q(prevQMagn+qMagn+norm32)
-    }
-    tmpU32no2 = WEBRTC_SPL_UMUL(tmpU32no1, tmpU32no1); // Q(2*(prevQMagn+qMagn-norm32))
-
-    nShifts += norm32;
-    nShifts <<= 1;
-    if (nShifts < 0) {
-      varPauseUFX >>= (-nShifts); // Q(2*(qMagn+norm32+minPause))
-      nShifts = 0;
-    }
-    if (varPauseUFX > 0) {
-      // Q(2*(qMagn+norm32-16+minPause))
-      tmpU32no1 = tmpU32no2 / varPauseUFX;
-      tmpU32no1 >>= nShifts;
-
-      // Q(2*qMagn)
-      avgDiffNormMagnUFX -= WEBRTC_SPL_MIN(avgDiffNormMagnUFX, tmpU32no1);
-    } else {
-      avgDiffNormMagnUFX = 0;
-    }
-  }
-  //normalize and compute time average update of difference feature
-  tmpU32no1 = avgDiffNormMagnUFX >> (2 * inst->normData);
-  if (inst->featureSpecDiff > tmpU32no1) {
-    tmpU32no2 = WEBRTC_SPL_UMUL_32_16(inst->featureSpecDiff - tmpU32no1,
-                                      SPECT_DIFF_TAVG_Q8); // Q(8-2*stages)
-    inst->featureSpecDiff -= tmpU32no2 >> 8;  // Q(-2*stages)
-  } else {
-    tmpU32no2 = WEBRTC_SPL_UMUL_32_16(tmpU32no1 - inst->featureSpecDiff,
-                                      SPECT_DIFF_TAVG_Q8); // Q(8-2*stages)
-    inst->featureSpecDiff += tmpU32no2 >> 8;  // Q(-2*stages)
-  }
-}
-
-// Transform input (speechFrame) to frequency domain magnitude (magnU16)
-void WebRtcNsx_DataAnalysis(NoiseSuppressionFixedC* inst,
-                            short* speechFrame,
-                            uint16_t* magnU16) {
-  uint32_t tmpU32no1;
-
-  int32_t   tmp_1_w32 = 0;
-  int32_t   tmp_2_w32 = 0;
-  int32_t   sum_log_magn = 0;
-  int32_t   sum_log_i_log_magn = 0;
-
-  uint16_t  sum_log_magn_u16 = 0;
-  uint16_t  tmp_u16 = 0;
-
-  int16_t   sum_log_i = 0;
-  int16_t   sum_log_i_square = 0;
-  int16_t   frac = 0;
-  int16_t   log2 = 0;
-  int16_t   matrix_determinant = 0;
-  int16_t   maxWinData;
-
-  size_t i, j;
-  int zeros;
-  int net_norm = 0;
-  int right_shifts_in_magnU16 = 0;
-  int right_shifts_in_initMagnEst = 0;
-
-  int16_t winData_buff[ANAL_BLOCKL_MAX * 2 + 16];
-  int16_t realImag_buff[ANAL_BLOCKL_MAX * 2 + 16];
-
-  // Align the structures to 32-byte boundary for the FFT function.
-  int16_t* winData = (int16_t*) (((uintptr_t)winData_buff + 31) & ~31);
-  int16_t* realImag = (int16_t*) (((uintptr_t) realImag_buff + 31) & ~31);
-
-  // Update analysis buffer for lower band, and window data before FFT.
-  WebRtcNsx_AnalysisUpdate(inst, winData, speechFrame);
-
-  // Get input energy
-  inst->energyIn =
-      WebRtcSpl_Energy(winData, inst->anaLen, &inst->scaleEnergyIn);
-
-  // Reset zero input flag
-  inst->zeroInputSignal = 0;
-  // Acquire norm for winData
-  maxWinData = WebRtcSpl_MaxAbsValueW16(winData, inst->anaLen);
-  inst->normData = WebRtcSpl_NormW16(maxWinData);
-  if (maxWinData == 0) {
-    // Treat zero input separately.
-    inst->zeroInputSignal = 1;
-    return;
-  }
-
-  // Determine the net normalization in the frequency domain
-  net_norm = inst->stages - inst->normData;
-  // Track lowest normalization factor and use it to prevent wrap around in shifting
-  right_shifts_in_magnU16 = inst->normData - inst->minNorm;
-  right_shifts_in_initMagnEst = WEBRTC_SPL_MAX(-right_shifts_in_magnU16, 0);
-  inst->minNorm -= right_shifts_in_initMagnEst;
-  right_shifts_in_magnU16 = WEBRTC_SPL_MAX(right_shifts_in_magnU16, 0);
-
-  // create realImag as winData interleaved with zeros (= imag. part), normalize it
-  WebRtcNsx_NormalizeRealBuffer(inst, winData, realImag);
-
-  // FFT output will be in winData[].
-  WebRtcSpl_RealForwardFFT(inst->real_fft, realImag, winData);
-
-  inst->imag[0] = 0; // Q(normData-stages)
-  inst->imag[inst->anaLen2] = 0;
-  inst->real[0] = winData[0]; // Q(normData-stages)
-  inst->real[inst->anaLen2] = winData[inst->anaLen];
-  // Q(2*(normData-stages))
-  inst->magnEnergy = (uint32_t)(inst->real[0] * inst->real[0]);
-  inst->magnEnergy += (uint32_t)(inst->real[inst->anaLen2] *
-                                 inst->real[inst->anaLen2]);
-  magnU16[0] = (uint16_t)WEBRTC_SPL_ABS_W16(inst->real[0]); // Q(normData-stages)
-  magnU16[inst->anaLen2] = (uint16_t)WEBRTC_SPL_ABS_W16(inst->real[inst->anaLen2]);
-  inst->sumMagn = (uint32_t)magnU16[0]; // Q(normData-stages)
-  inst->sumMagn += (uint32_t)magnU16[inst->anaLen2];
-
-  if (inst->blockIndex >= END_STARTUP_SHORT) {
-    for (i = 1, j = 2; i < inst->anaLen2; i += 1, j += 2) {
-      inst->real[i] = winData[j];
-      inst->imag[i] = -winData[j + 1];
-      // magnitude spectrum
-      // energy in Q(2*(normData-stages))
-      tmpU32no1 = (uint32_t)(winData[j] * winData[j]);
-      tmpU32no1 += (uint32_t)(winData[j + 1] * winData[j + 1]);
-      inst->magnEnergy += tmpU32no1; // Q(2*(normData-stages))
-
-      magnU16[i] = (uint16_t)WebRtcSpl_SqrtFloor(tmpU32no1); // Q(normData-stages)
-      inst->sumMagn += (uint32_t)magnU16[i]; // Q(normData-stages)
-    }
-  } else {
-    //
-    // Gather information during startup for noise parameter estimation
-    //
-
-    // Switch initMagnEst to Q(minNorm-stages)
-    inst->initMagnEst[0] >>= right_shifts_in_initMagnEst;
-    inst->initMagnEst[inst->anaLen2] >>= right_shifts_in_initMagnEst;
-
-    // Update initMagnEst with magnU16 in Q(minNorm-stages).
-    inst->initMagnEst[0] += magnU16[0] >> right_shifts_in_magnU16;
-    inst->initMagnEst[inst->anaLen2] +=
-        magnU16[inst->anaLen2] >> right_shifts_in_magnU16;
-
-    log2 = 0;
-    if (magnU16[inst->anaLen2]) {
-      // Calculate log2(magnU16[inst->anaLen2])
-      zeros = WebRtcSpl_NormU32((uint32_t)magnU16[inst->anaLen2]);
-      frac = (int16_t)((((uint32_t)magnU16[inst->anaLen2] << zeros) &
-                              0x7FFFFFFF) >> 23); // Q8
-      // log2(magnU16(i)) in Q8
-      RTC_DCHECK_LT(frac, 256);
-      log2 = (int16_t)(((31 - zeros) << 8) + WebRtcNsx_kLogTableFrac[frac]);
-    }
-
-    sum_log_magn = (int32_t)log2; // Q8
-    // sum_log_i_log_magn in Q17
-    sum_log_i_log_magn = (kLogIndex[inst->anaLen2] * log2) >> 3;
-
-    for (i = 1, j = 2; i < inst->anaLen2; i += 1, j += 2) {
-      inst->real[i] = winData[j];
-      inst->imag[i] = -winData[j + 1];
-      // magnitude spectrum
-      // energy in Q(2*(normData-stages))
-      tmpU32no1 = (uint32_t)(winData[j] * winData[j]);
-      tmpU32no1 += (uint32_t)(winData[j + 1] * winData[j + 1]);
-      inst->magnEnergy += tmpU32no1; // Q(2*(normData-stages))
-
-      magnU16[i] = (uint16_t)WebRtcSpl_SqrtFloor(tmpU32no1); // Q(normData-stages)
-      inst->sumMagn += (uint32_t)magnU16[i]; // Q(normData-stages)
-
-      // Switch initMagnEst to Q(minNorm-stages)
-      inst->initMagnEst[i] >>= right_shifts_in_initMagnEst;
-
-      // Update initMagnEst with magnU16 in Q(minNorm-stages).
-      inst->initMagnEst[i] += magnU16[i] >> right_shifts_in_magnU16;
-
-      if (i >= kStartBand) {
-        // For pink noise estimation. Collect data neglecting lower frequency band
-        log2 = 0;
-        if (magnU16[i]) {
-          zeros = WebRtcSpl_NormU32((uint32_t)magnU16[i]);
-          frac = (int16_t)((((uint32_t)magnU16[i] << zeros) &
-                                  0x7FFFFFFF) >> 23);
-          // log2(magnU16(i)) in Q8
-          RTC_DCHECK_LT(frac, 256);
-          log2 = (int16_t)(((31 - zeros) << 8)
-                                 + WebRtcNsx_kLogTableFrac[frac]);
-        }
-        sum_log_magn += (int32_t)log2; // Q8
-        // sum_log_i_log_magn in Q17
-        sum_log_i_log_magn += (kLogIndex[i] * log2) >> 3;
-      }
-    }
-
-    //
-    //compute simplified noise model during startup
-    //
-
-    // Estimate White noise
-
-    // Switch whiteNoiseLevel to Q(minNorm-stages)
-    inst->whiteNoiseLevel >>= right_shifts_in_initMagnEst;
-
-    // Update the average magnitude spectrum, used as noise estimate.
-    tmpU32no1 = WEBRTC_SPL_UMUL_32_16(inst->sumMagn, inst->overdrive);
-    tmpU32no1 >>= inst->stages + 8;
-
-    // Replacing division above with 'stages' shifts
-    // Shift to same Q-domain as whiteNoiseLevel
-    tmpU32no1 >>= right_shifts_in_magnU16;
-    // This operation is safe from wrap around as long as END_STARTUP_SHORT < 128
-    RTC_DCHECK_LT(END_STARTUP_SHORT, 128);
-    inst->whiteNoiseLevel += tmpU32no1; // Q(minNorm-stages)
-
-    // Estimate Pink noise parameters
-    // Denominator used in both parameter estimates.
-    // The value is only dependent on the size of the frequency band (kStartBand)
-    // and to reduce computational complexity stored in a table (kDeterminantEstMatrix[])
-    RTC_DCHECK_LT(kStartBand, 66);
-    matrix_determinant = kDeterminantEstMatrix[kStartBand]; // Q0
-    sum_log_i = kSumLogIndex[kStartBand]; // Q5
-    sum_log_i_square = kSumSquareLogIndex[kStartBand]; // Q2
-    if (inst->fs == 8000) {
-      // Adjust values to shorter blocks in narrow band.
-      tmp_1_w32 = (int32_t)matrix_determinant;
-      tmp_1_w32 += (kSumLogIndex[65] * sum_log_i) >> 9;
-      tmp_1_w32 -= (kSumLogIndex[65] * kSumLogIndex[65]) >> 10;
-      tmp_1_w32 -= (int32_t)sum_log_i_square << 4;
-      tmp_1_w32 -= ((inst->magnLen - kStartBand) * kSumSquareLogIndex[65]) >> 2;
-      matrix_determinant = (int16_t)tmp_1_w32;
-      sum_log_i -= kSumLogIndex[65]; // Q5
-      sum_log_i_square -= kSumSquareLogIndex[65]; // Q2
-    }
-
-    // Necessary number of shifts to fit sum_log_magn in a word16
-    zeros = 16 - WebRtcSpl_NormW32(sum_log_magn);
-    if (zeros < 0) {
-      zeros = 0;
-    }
-    tmp_1_w32 = sum_log_magn << 1;  // Q9
-    sum_log_magn_u16 = (uint16_t)(tmp_1_w32 >> zeros);  // Q(9-zeros).
-
-    // Calculate and update pinkNoiseNumerator. Result in Q11.
-    tmp_2_w32 = WEBRTC_SPL_MUL_16_U16(sum_log_i_square, sum_log_magn_u16); // Q(11-zeros)
-    tmpU32no1 = sum_log_i_log_magn >> 12;  // Q5
-
-    // Shift the largest value of sum_log_i and tmp32no3 before multiplication
-    tmp_u16 = ((uint16_t)sum_log_i << 1);  // Q6
-    if ((uint32_t)sum_log_i > tmpU32no1) {
-      tmp_u16 >>= zeros;
-    } else {
-      tmpU32no1 >>= zeros;
-    }
-    tmp_2_w32 -= (int32_t)WEBRTC_SPL_UMUL_32_16(tmpU32no1, tmp_u16); // Q(11-zeros)
-    matrix_determinant >>= zeros;  // Q(-zeros)
-    tmp_2_w32 = WebRtcSpl_DivW32W16(tmp_2_w32, matrix_determinant); // Q11
-    tmp_2_w32 += (int32_t)net_norm << 11;  // Q11
-    if (tmp_2_w32 < 0) {
-      tmp_2_w32 = 0;
-    }
-    inst->pinkNoiseNumerator += tmp_2_w32; // Q11
-
-    // Calculate and update pinkNoiseExp. Result in Q14.
-    tmp_2_w32 = WEBRTC_SPL_MUL_16_U16(sum_log_i, sum_log_magn_u16); // Q(14-zeros)
-    tmp_1_w32 = sum_log_i_log_magn >> (3 + zeros);
-    tmp_1_w32 *= inst->magnLen - kStartBand;
-    tmp_2_w32 -= tmp_1_w32; // Q(14-zeros)
-    if (tmp_2_w32 > 0) {
-      // If the exponential parameter is negative force it to zero, which means a
-      // flat spectrum.
-      tmp_1_w32 = WebRtcSpl_DivW32W16(tmp_2_w32, matrix_determinant); // Q14
-      inst->pinkNoiseExp += WEBRTC_SPL_SAT(16384, tmp_1_w32, 0); // Q14
-    }
-  }
-}
-
-void WebRtcNsx_DataSynthesis(NoiseSuppressionFixedC* inst, short* outFrame) {
-  int32_t energyOut;
-
-  int16_t realImag_buff[ANAL_BLOCKL_MAX * 2 + 16];
-  int16_t rfft_out_buff[ANAL_BLOCKL_MAX * 2 + 16];
-
-  // Align the structures to 32-byte boundary for the FFT function.
-  int16_t* realImag = (int16_t*) (((uintptr_t)realImag_buff + 31) & ~31);
-  int16_t* rfft_out = (int16_t*) (((uintptr_t) rfft_out_buff + 31) & ~31);
-
-  int16_t tmp16no1, tmp16no2;
-  int16_t energyRatio;
-  int16_t gainFactor, gainFactor1, gainFactor2;
-
-  size_t i;
-  int outCIFFT;
-  int scaleEnergyOut = 0;
-
-  if (inst->zeroInputSignal) {
-    // synthesize the special case of zero input
-    // read out fully processed segment
-    for (i = 0; i < inst->blockLen10ms; i++) {
-      outFrame[i] = inst->synthesisBuffer[i]; // Q0
-    }
-    // update synthesis buffer
-    memcpy(inst->synthesisBuffer, inst->synthesisBuffer + inst->blockLen10ms,
-        (inst->anaLen - inst->blockLen10ms) * sizeof(*inst->synthesisBuffer));
-    WebRtcSpl_ZerosArrayW16(inst->synthesisBuffer + inst->anaLen - inst->blockLen10ms,
-                            inst->blockLen10ms);
-    return;
-  }
-
-  // Filter the data in the frequency domain, and create spectrum.
-  WebRtcNsx_PrepareSpectrum(inst, realImag);
-
-  // Inverse FFT output will be in rfft_out[].
-  outCIFFT = WebRtcSpl_RealInverseFFT(inst->real_fft, realImag, rfft_out);
-
-  WebRtcNsx_Denormalize(inst, rfft_out, outCIFFT);
-
-  //scale factor: only do it after END_STARTUP_LONG time
-  gainFactor = 8192; // 8192 = Q13(1.0)
-  if (inst->gainMap == 1 &&
-      inst->blockIndex > END_STARTUP_LONG &&
-      inst->energyIn > 0) {
-    // Q(-scaleEnergyOut)
-    energyOut = WebRtcSpl_Energy(inst->real, inst->anaLen, &scaleEnergyOut);
-    if (scaleEnergyOut == 0 && !(energyOut & 0x7f800000)) {
-      energyOut = WEBRTC_SPL_SHIFT_W32(energyOut, 8 + scaleEnergyOut
-                                       - inst->scaleEnergyIn);
-    } else {
-      // |energyIn| is currently in Q(|scaleEnergyIn|), but to later on end up
-      // with an |energyRatio| in Q8 we need to change the Q-domain to
-      // Q(-8-scaleEnergyOut).
-      inst->energyIn >>= 8 + scaleEnergyOut - inst->scaleEnergyIn;
-    }
-
-    RTC_DCHECK_GT(inst->energyIn, 0);
-    energyRatio = (energyOut + inst->energyIn / 2) / inst->energyIn;  // Q8
-    // Limit the ratio to [0, 1] in Q8, i.e., [0, 256]
-    energyRatio = WEBRTC_SPL_SAT(256, energyRatio, 0);
-
-    // all done in lookup tables now
-    RTC_DCHECK_LT(energyRatio, 257);
-    gainFactor1 = kFactor1Table[energyRatio]; // Q8
-    gainFactor2 = inst->factor2Table[energyRatio]; // Q8
-
-    //combine both scales with speech/noise prob: note prior (priorSpeechProb) is not frequency dependent
-
-    // factor = inst->priorSpeechProb*factor1 + (1.0-inst->priorSpeechProb)*factor2; // original code
-    tmp16no1 = (int16_t)(((16384 - inst->priorNonSpeechProb) * gainFactor1) >>
-        14);  // in Q13, where 16384 = Q14(1.0)
-    tmp16no2 = (int16_t)((inst->priorNonSpeechProb * gainFactor2) >> 14);
-    gainFactor = tmp16no1 + tmp16no2; // Q13
-  }  // out of flag_gain_map==1
-
-  // Synthesis, read out fully processed segment, and update synthesis buffer.
-  WebRtcNsx_SynthesisUpdate(inst, outFrame, gainFactor);
-}
-
-void WebRtcNsx_ProcessCore(NoiseSuppressionFixedC* inst,
-                           const short* const* speechFrame,
-                           int num_bands,
-                           short* const* outFrame) {
-  // main routine for noise suppression
-
-  uint32_t tmpU32no1, tmpU32no2, tmpU32no3;
-  uint32_t satMax, maxNoiseU32;
-  uint32_t tmpMagnU32, tmpNoiseU32;
-  uint32_t nearMagnEst;
-  uint32_t noiseUpdateU32;
-  uint32_t noiseU32[HALF_ANAL_BLOCKL];
-  uint32_t postLocSnr[HALF_ANAL_BLOCKL];
-  uint32_t priorLocSnr[HALF_ANAL_BLOCKL];
-  uint32_t prevNearSnr[HALF_ANAL_BLOCKL];
-  uint32_t curNearSnr;
-  uint32_t priorSnr;
-  uint32_t noise_estimate = 0;
-  uint32_t noise_estimate_avg = 0;
-  uint32_t numerator = 0;
-
-  int32_t tmp32no1, tmp32no2;
-  int32_t pink_noise_num_avg = 0;
-
-  uint16_t tmpU16no1;
-  uint16_t magnU16[HALF_ANAL_BLOCKL];
-  uint16_t prevNoiseU16[HALF_ANAL_BLOCKL];
-  uint16_t nonSpeechProbFinal[HALF_ANAL_BLOCKL];
-  uint16_t gammaNoise, prevGammaNoise;
-  uint16_t noiseSupFilterTmp[HALF_ANAL_BLOCKL];
-
-  int16_t qMagn, qNoise;
-  int16_t avgProbSpeechHB, gainModHB, avgFilterGainHB, gainTimeDomainHB;
-  int16_t pink_noise_exp_avg = 0;
-
-  size_t i, j;
-  int nShifts, postShifts;
-  int norm32no1, norm32no2;
-  int flag, sign;
-  int q_domain_to_use = 0;
-
-  // Code for ARMv7-Neon platform assumes the following:
-  RTC_DCHECK_GT(inst->anaLen, 0);
-  RTC_DCHECK_GT(inst->anaLen2, 0);
-  RTC_DCHECK_EQ(0, inst->anaLen % 16);
-  RTC_DCHECK_EQ(0, inst->anaLen2 % 8);
-  RTC_DCHECK_GT(inst->blockLen10ms, 0);
-  RTC_DCHECK_EQ(0, inst->blockLen10ms % 16);
-  RTC_DCHECK_EQ(inst->magnLen, inst->anaLen2 + 1);
-
-#ifdef NS_FILEDEBUG
-  if (fwrite(spframe, sizeof(short),
-             inst->blockLen10ms, inst->infile) != inst->blockLen10ms) {
-    RTC_NOTREACHED();
-  }
-#endif
-
-  // Check that initialization has been done
-  RTC_DCHECK_EQ(1, inst->initFlag);
-  RTC_DCHECK_LE(num_bands - 1, NUM_HIGH_BANDS_MAX);
-
-  const short* const* speechFrameHB = NULL;
-  short* const* outFrameHB = NULL;
-  size_t num_high_bands = 0;
-  if (num_bands > 1) {
-    speechFrameHB = &speechFrame[1];
-    outFrameHB = &outFrame[1];
-    num_high_bands = (size_t)(num_bands - 1);
-  }
-
-  // Store speechFrame and transform to frequency domain
-  WebRtcNsx_DataAnalysis(inst, (short*)speechFrame[0], magnU16);
-
-  if (inst->zeroInputSignal) {
-    WebRtcNsx_DataSynthesis(inst, outFrame[0]);
-
-    if (num_bands > 1) {
-      // update analysis buffer for H band
-      // append new data to buffer FX
-      for (i = 0; i < num_high_bands; ++i) {
-        int block_shift = inst->anaLen - inst->blockLen10ms;
-        memcpy(inst->dataBufHBFX[i], inst->dataBufHBFX[i] + inst->blockLen10ms,
-            block_shift * sizeof(*inst->dataBufHBFX[i]));
-        memcpy(inst->dataBufHBFX[i] + block_shift, speechFrameHB[i],
-            inst->blockLen10ms * sizeof(*inst->dataBufHBFX[i]));
-        for (j = 0; j < inst->blockLen10ms; j++) {
-          outFrameHB[i][j] = inst->dataBufHBFX[i][j]; // Q0
-        }
-      }
-    }  // end of H band gain computation
-    return;
-  }
-
-  // Update block index when we have something to process
-  inst->blockIndex++;
-  //
-
-  // Norm of magn
-  qMagn = inst->normData - inst->stages;
-
-  // Compute spectral flatness on input spectrum
-  WebRtcNsx_ComputeSpectralFlatness(inst, magnU16);
-
-  // quantile noise estimate
-  WebRtcNsx_NoiseEstimation(inst, magnU16, noiseU32, &qNoise);
-
-  //noise estimate from previous frame
-  for (i = 0; i < inst->magnLen; i++) {
-    prevNoiseU16[i] = (uint16_t)(inst->prevNoiseU32[i] >> 11);  // Q(prevQNoise)
-  }
-
-  if (inst->blockIndex < END_STARTUP_SHORT) {
-    // Noise Q-domain to be used later; see description at end of section.
-    q_domain_to_use = WEBRTC_SPL_MIN((int)qNoise, inst->minNorm - inst->stages);
-
-    // Calculate frequency independent parts in parametric noise estimate and calculate
-    // the estimate for the lower frequency band (same values for all frequency bins)
-    if (inst->pinkNoiseExp) {
-      pink_noise_exp_avg = (int16_t)WebRtcSpl_DivW32W16(inst->pinkNoiseExp,
-                                                              (int16_t)(inst->blockIndex + 1)); // Q14
-      pink_noise_num_avg = WebRtcSpl_DivW32W16(inst->pinkNoiseNumerator,
-                                               (int16_t)(inst->blockIndex + 1)); // Q11
-      WebRtcNsx_CalcParametricNoiseEstimate(inst,
-                                            pink_noise_exp_avg,
-                                            pink_noise_num_avg,
-                                            kStartBand,
-                                            &noise_estimate,
-                                            &noise_estimate_avg);
-    } else {
-      // Use white noise estimate if we have poor pink noise parameter estimates
-      noise_estimate = inst->whiteNoiseLevel; // Q(minNorm-stages)
-      noise_estimate_avg = noise_estimate / (inst->blockIndex + 1); // Q(minNorm-stages)
-    }
-    for (i = 0; i < inst->magnLen; i++) {
-      // Estimate the background noise using the pink noise parameters if permitted
-      if ((inst->pinkNoiseExp) && (i >= kStartBand)) {
-        // Reset noise_estimate
-        noise_estimate = 0;
-        noise_estimate_avg = 0;
-        // Calculate the parametric noise estimate for current frequency bin
-        WebRtcNsx_CalcParametricNoiseEstimate(inst,
-                                              pink_noise_exp_avg,
-                                              pink_noise_num_avg,
-                                              i,
-                                              &noise_estimate,
-                                              &noise_estimate_avg);
-      }
-      // Calculate parametric Wiener filter
-      noiseSupFilterTmp[i] = inst->denoiseBound;
-      if (inst->initMagnEst[i]) {
-        // numerator = (initMagnEst - noise_estimate * overdrive)
-        // Result in Q(8+minNorm-stages)
-        tmpU32no1 = WEBRTC_SPL_UMUL_32_16(noise_estimate, inst->overdrive);
-        numerator = inst->initMagnEst[i] << 8;
-        if (numerator > tmpU32no1) {
-          // Suppression filter coefficient larger than zero, so calculate.
-          numerator -= tmpU32no1;
-
-          // Determine number of left shifts in numerator for best accuracy after
-          // division
-          nShifts = WebRtcSpl_NormU32(numerator);
-          nShifts = WEBRTC_SPL_SAT(6, nShifts, 0);
-
-          // Shift numerator to Q(nShifts+8+minNorm-stages)
-          numerator <<= nShifts;
-
-          // Shift denominator to Q(nShifts-6+minNorm-stages)
-          tmpU32no1 = inst->initMagnEst[i] >> (6 - nShifts);
-          if (tmpU32no1 == 0) {
-            // This is only possible if numerator = 0, in which case
-            // we don't need any division.
-            tmpU32no1 = 1;
-          }
-          tmpU32no2 = numerator / tmpU32no1;  // Q14
-          noiseSupFilterTmp[i] = (uint16_t)WEBRTC_SPL_SAT(16384, tmpU32no2,
-              (uint32_t)(inst->denoiseBound)); // Q14
-        }
-      }
-      // Weight quantile noise 'noiseU32' with modeled noise 'noise_estimate_avg'
-      // 'noiseU32 is in Q(qNoise) and 'noise_estimate' in Q(minNorm-stages)
-      // To guarantee that we do not get wrap around when shifting to the same domain
-      // we use the lowest one. Furthermore, we need to save 6 bits for the weighting.
-      // 'noise_estimate_avg' can handle this operation by construction, but 'noiseU32'
-      // may not.
-
-      // Shift 'noiseU32' to 'q_domain_to_use'
-      tmpU32no1 = noiseU32[i] >> (qNoise - q_domain_to_use);
-      // Shift 'noise_estimate_avg' to 'q_domain_to_use'
-      tmpU32no2 = noise_estimate_avg >>
-          (inst->minNorm - inst->stages - q_domain_to_use);
-      // Make a simple check to see if we have enough room for weighting 'tmpU32no1'
-      // without wrap around
-      nShifts = 0;
-      if (tmpU32no1 & 0xfc000000) {
-        tmpU32no1 >>= 6;
-        tmpU32no2 >>= 6;
-        nShifts = 6;
-      }
-      tmpU32no1 *= inst->blockIndex;
-      tmpU32no2 *= (END_STARTUP_SHORT - inst->blockIndex);
-      // Add them together and divide by startup length
-      noiseU32[i] = WebRtcSpl_DivU32U16(tmpU32no1 + tmpU32no2, END_STARTUP_SHORT);
-      // Shift back if necessary
-      noiseU32[i] <<= nShifts;
-    }
-    // Update new Q-domain for 'noiseU32'
-    qNoise = q_domain_to_use;
-  }
-  // compute average signal during END_STARTUP_LONG time:
-  // used to normalize spectral difference measure
-  if (inst->blockIndex < END_STARTUP_LONG) {
-    // substituting division with shift ending up in Q(-2*stages)
-    inst->timeAvgMagnEnergyTmp +=
-        inst->magnEnergy >> (2 * inst->normData + inst->stages - 1);
-    inst->timeAvgMagnEnergy = WebRtcSpl_DivU32U16(inst->timeAvgMagnEnergyTmp,
-                                                  inst->blockIndex + 1);
-  }
-
-  //start processing at frames == converged+1
-  // STEP 1: compute prior and post SNR based on quantile noise estimates
-
-  // compute direct decision (DD) estimate of prior SNR: needed for new method
-  satMax = (uint32_t)1048575;// Largest possible value without getting overflow despite shifting 12 steps
-  postShifts = 6 + qMagn - qNoise;
-  nShifts = 5 - inst->prevQMagn + inst->prevQNoise;
-  for (i = 0; i < inst->magnLen; i++) {
-    // FLOAT:
-    // post SNR
-    // postLocSnr[i] = 0.0;
-    // if (magn[i] > noise[i])
-    // {
-    //   postLocSnr[i] = magn[i] / (noise[i] + 0.0001);
-    // }
-    // // previous post SNR
-    // // previous estimate: based on previous frame with gain filter (smooth is previous filter)
-    //
-    // prevNearSnr[i] = inst->prevMagnU16[i] / (inst->noisePrev[i] + 0.0001) * (inst->smooth[i]);
-    //
-    // // DD estimate is sum of two terms: current estimate and previous estimate
-    // // directed decision update of priorSnr (or we actually store [2*priorSnr+1])
-    //
-    // priorLocSnr[i] = DD_PR_SNR * prevNearSnr[i] + (1.0 - DD_PR_SNR) * (postLocSnr[i] - 1.0);
-
-    // calculate post SNR: output in Q11
-    postLocSnr[i] = 2048; // 1.0 in Q11
-    tmpU32no1 = (uint32_t)magnU16[i] << 6;  // Q(6+qMagn)
-    if (postShifts < 0) {
-      tmpU32no2 = noiseU32[i] >> -postShifts;  // Q(6+qMagn)
-    } else {
-      tmpU32no2 = noiseU32[i] << postShifts;  // Q(6+qMagn)
-    }
-    if (tmpU32no1 > tmpU32no2) {
-      // Current magnitude larger than noise
-      tmpU32no1 <<= 11;  // Q(17+qMagn)
-      if (tmpU32no2 > 0) {
-        tmpU32no1 /= tmpU32no2;  // Q11
-        postLocSnr[i] = WEBRTC_SPL_MIN(satMax, tmpU32no1); // Q11
-      } else {
-        postLocSnr[i] = satMax;
-      }
-    }
-
-    // calculate prevNearSnr[i] and save for later instead of recalculating it later
-    // |nearMagnEst| in Q(prevQMagn + 14)
-    nearMagnEst = inst->prevMagnU16[i] * inst->noiseSupFilter[i];
-    tmpU32no1 = nearMagnEst << 3;  // Q(prevQMagn+17)
-    tmpU32no2 = inst->prevNoiseU32[i] >> nShifts;  // Q(prevQMagn+6)
-
-    if (tmpU32no2 > 0) {
-      tmpU32no1 /= tmpU32no2;  // Q11
-      tmpU32no1 = WEBRTC_SPL_MIN(satMax, tmpU32no1); // Q11
-    } else {
-      tmpU32no1 = satMax; // Q11
-    }
-    prevNearSnr[i] = tmpU32no1; // Q11
-
-    //directed decision update of priorSnr
-    tmpU32no1 = WEBRTC_SPL_UMUL_32_16(prevNearSnr[i], DD_PR_SNR_Q11); // Q22
-    tmpU32no2 = WEBRTC_SPL_UMUL_32_16(postLocSnr[i] - 2048, ONE_MINUS_DD_PR_SNR_Q11); // Q22
-    priorSnr = tmpU32no1 + tmpU32no2 + 512; // Q22 (added 512 for rounding)
-    // priorLocSnr = 1 + 2*priorSnr
-    priorLocSnr[i] = 2048 + (priorSnr >> 10);  // Q11
-  }  // end of loop over frequencies
-  // done with step 1: DD computation of prior and post SNR
-
-  // STEP 2: compute speech/noise likelihood
-
-  //compute difference of input spectrum with learned/estimated noise spectrum
-  WebRtcNsx_ComputeSpectralDifference(inst, magnU16);
-  //compute histograms for determination of parameters (thresholds and weights for features)
-  //parameters are extracted once every window time (=inst->modelUpdate)
-  //counter update
-  inst->cntThresUpdate++;
-  flag = (int)(inst->cntThresUpdate == inst->modelUpdate);
-  //update histogram
-  WebRtcNsx_FeatureParameterExtraction(inst, flag);
-  //compute model parameters
-  if (flag) {
-    inst->cntThresUpdate = 0; // Reset counter
-    //update every window:
-    // get normalization for spectral difference for next window estimate
-
-    // Shift to Q(-2*stages)
-    inst->curAvgMagnEnergy >>= STAT_UPDATES;
-
-    tmpU32no1 = (inst->curAvgMagnEnergy + inst->timeAvgMagnEnergy + 1) >> 1; //Q(-2*stages)
-    // Update featureSpecDiff
-    if ((tmpU32no1 != inst->timeAvgMagnEnergy) && (inst->featureSpecDiff) &&
-        (inst->timeAvgMagnEnergy > 0)) {
-      norm32no1 = 0;
-      tmpU32no3 = tmpU32no1;
-      while (0xFFFF0000 & tmpU32no3) {
-        tmpU32no3 >>= 1;
-        norm32no1++;
-      }
-      tmpU32no2 = inst->featureSpecDiff;
-      while (0xFFFF0000 & tmpU32no2) {
-        tmpU32no2 >>= 1;
-        norm32no1++;
-      }
-      tmpU32no3 = WEBRTC_SPL_UMUL(tmpU32no3, tmpU32no2);
-      tmpU32no3 /= inst->timeAvgMagnEnergy;
-      if (WebRtcSpl_NormU32(tmpU32no3) < norm32no1) {
-        inst->featureSpecDiff = 0x007FFFFF;
-      } else {
-        inst->featureSpecDiff = WEBRTC_SPL_MIN(0x007FFFFF,
-                                               tmpU32no3 << norm32no1);
-      }
-    }
-
-    inst->timeAvgMagnEnergy = tmpU32no1; // Q(-2*stages)
-    inst->curAvgMagnEnergy = 0;
-  }
-
-  //compute speech/noise probability
-  WebRtcNsx_SpeechNoiseProb(inst, nonSpeechProbFinal, priorLocSnr, postLocSnr);
-
-  //time-avg parameter for noise update
-  gammaNoise = NOISE_UPDATE_Q8; // Q8
-
-  maxNoiseU32 = 0;
-  postShifts = inst->prevQNoise - qMagn;
-  nShifts = inst->prevQMagn - qMagn;
-  for (i = 0; i < inst->magnLen; i++) {
-    // temporary noise update: use it for speech frames if update value is less than previous
-    // the formula has been rewritten into:
-    // noiseUpdate = noisePrev[i] + (1 - gammaNoise) * nonSpeechProb * (magn[i] - noisePrev[i])
-
-    if (postShifts < 0) {
-      tmpU32no2 = magnU16[i] >> -postShifts;  // Q(prevQNoise)
-    } else {
-      tmpU32no2 = (uint32_t)magnU16[i] << postShifts;  // Q(prevQNoise)
-    }
-    if (prevNoiseU16[i] > tmpU32no2) {
-      sign = -1;
-      tmpU32no1 = prevNoiseU16[i] - tmpU32no2;
-    } else {
-      sign = 1;
-      tmpU32no1 = tmpU32no2 - prevNoiseU16[i];
-    }
-    noiseUpdateU32 = inst->prevNoiseU32[i]; // Q(prevQNoise+11)
-    tmpU32no3 = 0;
-    if ((tmpU32no1) && (nonSpeechProbFinal[i])) {
-      // This value will be used later, if gammaNoise changes
-      tmpU32no3 = WEBRTC_SPL_UMUL_32_16(tmpU32no1, nonSpeechProbFinal[i]); // Q(prevQNoise+8)
-      if (0x7c000000 & tmpU32no3) {
-        // Shifting required before multiplication
-        tmpU32no2 = (tmpU32no3 >> 5) * gammaNoise;  // Q(prevQNoise+11)
-      } else {
-        // We can do shifting after multiplication
-        tmpU32no2 = (tmpU32no3 * gammaNoise) >> 5;  // Q(prevQNoise+11)
-      }
-      if (sign > 0) {
-        noiseUpdateU32 += tmpU32no2; // Q(prevQNoise+11)
-      } else {
-        // This operation is safe. We can never get wrap around, since worst
-        // case scenario means magnU16 = 0
-        noiseUpdateU32 -= tmpU32no2; // Q(prevQNoise+11)
-      }
-    }
-
-    //increase gamma (i.e., less noise update) for frame likely to be speech
-    prevGammaNoise = gammaNoise;
-    gammaNoise = NOISE_UPDATE_Q8;
-    //time-constant based on speech/noise state
-    //increase gamma (i.e., less noise update) for frames likely to be speech
-    if (nonSpeechProbFinal[i] < ONE_MINUS_PROB_RANGE_Q8) {
-      gammaNoise = GAMMA_NOISE_TRANS_AND_SPEECH_Q8;
-    }
-
-    if (prevGammaNoise != gammaNoise) {
-      // new noise update
-      // this line is the same as above, only that the result is stored in a different variable and the gammaNoise
-      // has changed
-      //
-      // noiseUpdate = noisePrev[i] + (1 - gammaNoise) * nonSpeechProb * (magn[i] - noisePrev[i])
-
-      if (0x7c000000 & tmpU32no3) {
-        // Shifting required before multiplication
-        tmpU32no2 = (tmpU32no3 >> 5) * gammaNoise;  // Q(prevQNoise+11)
-      } else {
-        // We can do shifting after multiplication
-        tmpU32no2 = (tmpU32no3 * gammaNoise) >> 5;  // Q(prevQNoise+11)
-      }
-      if (sign > 0) {
-        tmpU32no1 = inst->prevNoiseU32[i] + tmpU32no2; // Q(prevQNoise+11)
-      } else {
-        tmpU32no1 = inst->prevNoiseU32[i] - tmpU32no2; // Q(prevQNoise+11)
-      }
-      if (noiseUpdateU32 > tmpU32no1) {
-        noiseUpdateU32 = tmpU32no1; // Q(prevQNoise+11)
-      }
-    }
-    noiseU32[i] = noiseUpdateU32; // Q(prevQNoise+11)
-    if (noiseUpdateU32 > maxNoiseU32) {
-      maxNoiseU32 = noiseUpdateU32;
-    }
-
-    // conservative noise update
-    // // original FLOAT code
-    // if (prob_speech < PROB_RANGE) {
-    // inst->avgMagnPause[i] = inst->avgMagnPause[i] + (1.0 - gamma_pause)*(magn[i] - inst->avgMagnPause[i]);
-    // }
-
-    tmp32no2 = WEBRTC_SPL_SHIFT_W32(inst->avgMagnPause[i], -nShifts);
-    if (nonSpeechProbFinal[i] > ONE_MINUS_PROB_RANGE_Q8) {
-      if (nShifts < 0) {
-        tmp32no1 = (int32_t)magnU16[i] - tmp32no2; // Q(qMagn)
-        tmp32no1 *= ONE_MINUS_GAMMA_PAUSE_Q8;  // Q(8+prevQMagn+nShifts)
-        tmp32no1 = (tmp32no1 + 128) >> 8;  // Q(qMagn).
-      } else {
-        // In Q(qMagn+nShifts)
-        tmp32no1 = ((int32_t)magnU16[i] << nShifts) - inst->avgMagnPause[i];
-        tmp32no1 *= ONE_MINUS_GAMMA_PAUSE_Q8;  // Q(8+prevQMagn+nShifts)
-        tmp32no1 = (tmp32no1 + (128 << nShifts)) >> (8 + nShifts);  // Q(qMagn).
-      }
-      tmp32no2 += tmp32no1; // Q(qMagn)
-    }
-    inst->avgMagnPause[i] = tmp32no2;
-  }  // end of frequency loop
-
-  norm32no1 = WebRtcSpl_NormU32(maxNoiseU32);
-  qNoise = inst->prevQNoise + norm32no1 - 5;
-  // done with step 2: noise update
-
-  // STEP 3: compute dd update of prior snr and post snr based on new noise estimate
-  nShifts = inst->prevQNoise + 11 - qMagn;
-  for (i = 0; i < inst->magnLen; i++) {
-    // FLOAT code
-    // // post and prior SNR
-    // curNearSnr = 0.0;
-    // if (magn[i] > noise[i])
-    // {
-    // curNearSnr = magn[i] / (noise[i] + 0.0001) - 1.0;
-    // }
-    // // DD estimate is sum of two terms: current estimate and previous estimate
-    // // directed decision update of snrPrior
-    // snrPrior = DD_PR_SNR * prevNearSnr[i] + (1.0 - DD_PR_SNR) * curNearSnr;
-    // // gain filter
-    // tmpFloat1 = inst->overdrive + snrPrior;
-    // tmpFloat2 = snrPrior / tmpFloat1;
-    // theFilter[i] = tmpFloat2;
-
-    // calculate curNearSnr again, this is necessary because a new noise estimate has been made since then. for the original
-    curNearSnr = 0; // Q11
-    if (nShifts < 0) {
-      // This case is equivalent with magn < noise which implies curNearSnr = 0;
-      tmpMagnU32 = (uint32_t)magnU16[i]; // Q(qMagn)
-      tmpNoiseU32 = noiseU32[i] << -nShifts;  // Q(qMagn)
-    } else if (nShifts > 17) {
-      tmpMagnU32 = (uint32_t)magnU16[i] << 17;  // Q(qMagn+17)
-      tmpNoiseU32 = noiseU32[i] >> (nShifts - 17);  // Q(qMagn+17)
-    } else {
-      tmpMagnU32 = (uint32_t)magnU16[i] << nShifts;  // Q(qNoise_prev+11)
-      tmpNoiseU32 = noiseU32[i]; // Q(qNoise_prev+11)
-    }
-    if (tmpMagnU32 > tmpNoiseU32) {
-      tmpU32no1 = tmpMagnU32 - tmpNoiseU32; // Q(qCur)
-      norm32no2 = WEBRTC_SPL_MIN(11, WebRtcSpl_NormU32(tmpU32no1));
-      tmpU32no1 <<= norm32no2;  // Q(qCur+norm32no2)
-      tmpU32no2 = tmpNoiseU32 >> (11 - norm32no2);  // Q(qCur+norm32no2-11)
-      if (tmpU32no2 > 0) {
-        tmpU32no1 /= tmpU32no2;  // Q11
-      }
-      curNearSnr = WEBRTC_SPL_MIN(satMax, tmpU32no1); // Q11
-    }
-
-    //directed decision update of priorSnr
-    // FLOAT
-    // priorSnr = DD_PR_SNR * prevNearSnr + (1.0-DD_PR_SNR) * curNearSnr;
-
-    tmpU32no1 = WEBRTC_SPL_UMUL_32_16(prevNearSnr[i], DD_PR_SNR_Q11); // Q22
-    tmpU32no2 = WEBRTC_SPL_UMUL_32_16(curNearSnr, ONE_MINUS_DD_PR_SNR_Q11); // Q22
-    priorSnr = tmpU32no1 + tmpU32no2; // Q22
-
-    //gain filter
-    tmpU32no1 = inst->overdrive + ((priorSnr + 8192) >> 14);  // Q8
-    RTC_DCHECK_GT(inst->overdrive, 0);
-    tmpU16no1 = (priorSnr + tmpU32no1 / 2) / tmpU32no1;  // Q14
-    inst->noiseSupFilter[i] = WEBRTC_SPL_SAT(16384, tmpU16no1, inst->denoiseBound); // 16384 = Q14(1.0) // Q14
-
-    // Weight in the parametric Wiener filter during startup
-    if (inst->blockIndex < END_STARTUP_SHORT) {
-      // Weight the two suppression filters
-      tmpU32no1 = inst->noiseSupFilter[i] * inst->blockIndex;
-      tmpU32no2 = noiseSupFilterTmp[i] *
-          (END_STARTUP_SHORT - inst->blockIndex);
-      tmpU32no1 += tmpU32no2;
-      inst->noiseSupFilter[i] = (uint16_t)WebRtcSpl_DivU32U16(tmpU32no1,
-                                                                    END_STARTUP_SHORT);
-    }
-  }  // end of loop over frequencies
-  //done with step3
-
-  // save noise and magnitude spectrum for next frame
-  inst->prevQNoise = qNoise;
-  inst->prevQMagn = qMagn;
-  if (norm32no1 > 5) {
-    for (i = 0; i < inst->magnLen; i++) {
-      inst->prevNoiseU32[i] = noiseU32[i] << (norm32no1 - 5);  // Q(qNoise+11)
-      inst->prevMagnU16[i] = magnU16[i]; // Q(qMagn)
-    }
-  } else {
-    for (i = 0; i < inst->magnLen; i++) {
-      inst->prevNoiseU32[i] = noiseU32[i] >> (5 - norm32no1);  // Q(qNoise+11)
-      inst->prevMagnU16[i] = magnU16[i]; // Q(qMagn)
-    }
-  }
-
-  WebRtcNsx_DataSynthesis(inst, outFrame[0]);
-#ifdef NS_FILEDEBUG
-  if (fwrite(outframe, sizeof(short),
-             inst->blockLen10ms, inst->outfile) != inst->blockLen10ms) {
-    RTC_NOTREACHED();
-  }
-#endif
-
-  //for H band:
-  // only update data buffer, then apply time-domain gain is applied derived from L band
-  if (num_bands > 1) {
-    // update analysis buffer for H band
-    // append new data to buffer FX
-    for (i = 0; i < num_high_bands; ++i) {
-      memcpy(inst->dataBufHBFX[i], inst->dataBufHBFX[i] + inst->blockLen10ms,
-          (inst->anaLen - inst->blockLen10ms) * sizeof(*inst->dataBufHBFX[i]));
-      memcpy(inst->dataBufHBFX[i] + inst->anaLen - inst->blockLen10ms,
-          speechFrameHB[i], inst->blockLen10ms * sizeof(*inst->dataBufHBFX[i]));
-    }
-    // range for averaging low band quantities for H band gain
-
-    gainTimeDomainHB = 16384; // 16384 = Q14(1.0)
-    //average speech prob from low band
-    //average filter gain from low band
-    //avg over second half (i.e., 4->8kHz) of freq. spectrum
-    tmpU32no1 = 0; // Q12
-    tmpU16no1 = 0; // Q8
-    for (i = inst->anaLen2 - (inst->anaLen2 >> 2); i < inst->anaLen2; i++) {
-      tmpU16no1 += nonSpeechProbFinal[i]; // Q8
-      tmpU32no1 += (uint32_t)(inst->noiseSupFilter[i]); // Q14
-    }
-    RTC_DCHECK_GE(inst->stages, 7);
-    avgProbSpeechHB = (4096 - (tmpU16no1 >> (inst->stages - 7)));  // Q12
-    avgFilterGainHB = (int16_t)(tmpU32no1 >> (inst->stages - 3));  // Q14
-
-    // // original FLOAT code
-    // // gain based on speech probability:
-    // avg_prob_speech_tt=(float)2.0*avg_prob_speech-(float)1.0;
-    // gain_mod=(float)0.5*((float)1.0+(float)tanh(avg_prob_speech_tt)); // between 0 and 1
-
-    // gain based on speech probability:
-    // original expression: "0.5 * (1 + tanh(2x-1))"
-    // avgProbSpeechHB has been anyway saturated to a value between 0 and 1 so the other cases don't have to be dealt with
-    // avgProbSpeechHB and gainModHB are in Q12, 3607 = Q12(0.880615234375) which is a zero point of
-    // |0.5 * (1 + tanh(2x-1)) - x| - |0.5 * (1 + tanh(2x-1)) - 0.880615234375| meaning that from that point the error of approximating
-    // the expression with f(x) = x would be greater than the error of approximating the expression with f(x) = 0.880615234375
-    // error: "|0.5 * (1 + tanh(2x-1)) - x| from x=0 to 0.880615234375" -> http://www.wolframalpha.com/input/?i=|0.5+*+(1+%2B+tanh(2x-1))+-+x|+from+x%3D0+to+0.880615234375
-    // and:  "|0.5 * (1 + tanh(2x-1)) - 0.880615234375| from x=0.880615234375 to 1" -> http://www.wolframalpha.com/input/?i=+|0.5+*+(1+%2B+tanh(2x-1))+-+0.880615234375|+from+x%3D0.880615234375+to+1
-    gainModHB = WEBRTC_SPL_MIN(avgProbSpeechHB, 3607);
-
-    // // original FLOAT code
-    // //combine gain with low band gain
-    // if (avg_prob_speech < (float)0.5) {
-    // gain_time_domain_HB=(float)0.5*gain_mod+(float)0.5*avg_filter_gain;
-    // }
-    // else {
-    // gain_time_domain_HB=(float)0.25*gain_mod+(float)0.75*avg_filter_gain;
-    // }
-
-
-    //combine gain with low band gain
-    if (avgProbSpeechHB < 2048) {
-      // 2048 = Q12(0.5)
-      // the next two lines in float are  "gain_time_domain = 0.5 * gain_mod + 0.5 * avg_filter_gain"; Q2(0.5) = 2 equals one left shift
-      gainTimeDomainHB = (gainModHB << 1) + (avgFilterGainHB >> 1); // Q14
-    } else {
-      // "gain_time_domain = 0.25 * gain_mod + 0.75 * agv_filter_gain;"
-      gainTimeDomainHB = (int16_t)((3 * avgFilterGainHB) >> 2);  // 3 = Q2(0.75)
-      gainTimeDomainHB += gainModHB; // Q14
-    }
-    //make sure gain is within flooring range
-    gainTimeDomainHB
-      = WEBRTC_SPL_SAT(16384, gainTimeDomainHB, (int16_t)(inst->denoiseBound)); // 16384 = Q14(1.0)
-
-
-    //apply gain
-    for (i = 0; i < num_high_bands; ++i) {
-      for (j = 0; j < inst->blockLen10ms; j++) {
-        outFrameHB[i][j] = (int16_t)((gainTimeDomainHB *
-            inst->dataBufHBFX[i][j]) >> 14);  // Q0
-      }
-    }
-  }  // end of H band gain computation
-}
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/ns/nsx_core.h b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/ns/nsx_core.h
deleted file mode 100644
index 9e9d142818..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/ns/nsx_core.h
+++ /dev/null
@@ -1,261 +0,0 @@
-/*
- *  Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#ifndef MODULES_AUDIO_PROCESSING_NS_MAIN_SOURCE_NSX_CORE_H_
-#define MODULES_AUDIO_PROCESSING_NS_MAIN_SOURCE_NSX_CORE_H_
-
-#ifdef NS_FILEDEBUG
-#include <stdio.h>
-#endif
-
-#include "common_audio/signal_processing/include/signal_processing_library.h"
-#include "modules/audio_processing/ns/nsx_defines.h"
-
-typedef struct NoiseSuppressionFixedC_ {
-  uint32_t fs;
-
-  const int16_t* window;
-  int16_t analysisBuffer[ANAL_BLOCKL_MAX];
-  int16_t synthesisBuffer[ANAL_BLOCKL_MAX];
-  uint16_t noiseSupFilter[HALF_ANAL_BLOCKL];
-  uint16_t overdrive;    /* Q8 */
-  uint16_t denoiseBound; /* Q14 */
-  const int16_t* factor2Table;
-  int16_t noiseEstLogQuantile[SIMULT * HALF_ANAL_BLOCKL];
-  int16_t noiseEstDensity[SIMULT * HALF_ANAL_BLOCKL];
-  int16_t noiseEstCounter[SIMULT];
-  int16_t noiseEstQuantile[HALF_ANAL_BLOCKL];
-
-  size_t anaLen;
-  size_t anaLen2;
-  size_t magnLen;
-  int aggrMode;
-  int stages;
-  int initFlag;
-  int gainMap;
-
-  int32_t maxLrt;
-  int32_t minLrt;
-  // Log LRT factor with time-smoothing in Q8.
-  int32_t logLrtTimeAvgW32[HALF_ANAL_BLOCKL];
-  int32_t featureLogLrt;
-  int32_t thresholdLogLrt;
-  int16_t weightLogLrt;
-
-  uint32_t featureSpecDiff;
-  uint32_t thresholdSpecDiff;
-  int16_t weightSpecDiff;
-
-  uint32_t featureSpecFlat;
-  uint32_t thresholdSpecFlat;
-  int16_t weightSpecFlat;
-
-  // Conservative estimate of noise spectrum.
-  int32_t avgMagnPause[HALF_ANAL_BLOCKL];
-  uint32_t magnEnergy;
-  uint32_t sumMagn;
-  uint32_t curAvgMagnEnergy;
-  uint32_t timeAvgMagnEnergy;
-  uint32_t timeAvgMagnEnergyTmp;
-
-  uint32_t whiteNoiseLevel;  // Initial noise estimate.
-  // Initial magnitude spectrum estimate.
-  uint32_t initMagnEst[HALF_ANAL_BLOCKL];
-  // Pink noise parameters:
-  int32_t pinkNoiseNumerator;  // Numerator.
-  int32_t pinkNoiseExp;        // Power of freq.
-  int minNorm;                 // Smallest normalization factor.
-  int zeroInputSignal;         // Zero input signal flag.
-
-  // Noise spectrum from previous frame.
-  uint32_t prevNoiseU32[HALF_ANAL_BLOCKL];
-  // Magnitude spectrum from previous frame.
-  uint16_t prevMagnU16[HALF_ANAL_BLOCKL];
-  // Prior speech/noise probability in Q14.
-  int16_t priorNonSpeechProb;
-
-  int blockIndex;  // Frame index counter.
-  // Parameter for updating or estimating thresholds/weights for prior model.
-  int modelUpdate;
-  int cntThresUpdate;
-
-  // Histograms for parameter estimation.
-  int16_t histLrt[HIST_PAR_EST];
-  int16_t histSpecFlat[HIST_PAR_EST];
-  int16_t histSpecDiff[HIST_PAR_EST];
-
-  // Quantities for high band estimate.
-  int16_t dataBufHBFX[NUM_HIGH_BANDS_MAX][ANAL_BLOCKL_MAX];
-
-  int qNoise;
-  int prevQNoise;
-  int prevQMagn;
-  size_t blockLen10ms;
-
-  int16_t real[ANAL_BLOCKL_MAX];
-  int16_t imag[ANAL_BLOCKL_MAX];
-  int32_t energyIn;
-  int scaleEnergyIn;
-  int normData;
-
-  struct RealFFT* real_fft;
-} NoiseSuppressionFixedC;
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/****************************************************************************
- * WebRtcNsx_InitCore(...)
- *
- * This function initializes a noise suppression instance
- *
- * Input:
- *      - inst          : Instance that should be initialized
- *      - fs            : Sampling frequency
- *
- * Output:
- *      - inst          : Initialized instance
- *
- * Return value         :  0 - Ok
- *                        -1 - Error
- */
-int32_t WebRtcNsx_InitCore(NoiseSuppressionFixedC* inst, uint32_t fs);
-
-/****************************************************************************
- * WebRtcNsx_set_policy_core(...)
- *
- * This changes the aggressiveness of the noise suppression method.
- *
- * Input:
- *      - inst       : Instance that should be initialized
- *      - mode       : 0: Mild (6 dB), 1: Medium (10 dB), 2: Aggressive (15 dB)
- *
- * Output:
- *      - inst       : Initialized instance
- *
- * Return value      :  0 - Ok
- *                     -1 - Error
- */
-int WebRtcNsx_set_policy_core(NoiseSuppressionFixedC* inst, int mode);
-
-/****************************************************************************
- * WebRtcNsx_ProcessCore
- *
- * Do noise suppression.
- *
- * Input:
- *      - inst          : Instance that should be initialized
- *      - inFrame       : Input speech frame for each band
- *      - num_bands     : Number of bands
- *
- * Output:
- *      - inst          : Updated instance
- *      - outFrame      : Output speech frame for each band
- */
-void WebRtcNsx_ProcessCore(NoiseSuppressionFixedC* inst,
-                           const short* const* inFrame,
-                           int num_bands,
-                           short* const* outFrame);
-
-/****************************************************************************
- * Some function pointers, for internal functions shared by ARM NEON and
- * generic C code.
- */
-// Noise Estimation.
-typedef void (*NoiseEstimation)(NoiseSuppressionFixedC* inst,
-                                uint16_t* magn,
-                                uint32_t* noise,
-                                int16_t* q_noise);
-extern NoiseEstimation WebRtcNsx_NoiseEstimation;
-
-// Filter the data in the frequency domain, and create spectrum.
-typedef void (*PrepareSpectrum)(NoiseSuppressionFixedC* inst,
-                                int16_t* freq_buff);
-extern PrepareSpectrum WebRtcNsx_PrepareSpectrum;
-
-// For the noise supression process, synthesis, read out fully processed
-// segment, and update synthesis buffer.
-typedef void (*SynthesisUpdate)(NoiseSuppressionFixedC* inst,
-                                int16_t* out_frame,
-                                int16_t gain_factor);
-extern SynthesisUpdate WebRtcNsx_SynthesisUpdate;
-
-// Update analysis buffer for lower band, and window data before FFT.
-typedef void (*AnalysisUpdate)(NoiseSuppressionFixedC* inst,
-                               int16_t* out,
-                               int16_t* new_speech);
-extern AnalysisUpdate WebRtcNsx_AnalysisUpdate;
-
-// Denormalize the real-valued signal |in|, the output from inverse FFT.
-typedef void (*Denormalize)(NoiseSuppressionFixedC* inst,
-                            int16_t* in,
-                            int factor);
-extern Denormalize WebRtcNsx_Denormalize;
-
-// Normalize the real-valued signal |in|, the input to forward FFT.
-typedef void (*NormalizeRealBuffer)(NoiseSuppressionFixedC* inst,
-                                    const int16_t* in,
-                                    int16_t* out);
-extern NormalizeRealBuffer WebRtcNsx_NormalizeRealBuffer;
-
-// Compute speech/noise probability.
-// Intended to be private.
-void WebRtcNsx_SpeechNoiseProb(NoiseSuppressionFixedC* inst,
-                               uint16_t* nonSpeechProbFinal,
-                               uint32_t* priorLocSnr,
-                               uint32_t* postLocSnr);
-
-#if defined(WEBRTC_HAS_NEON)
-// For the above function pointers, functions for generic platforms are declared
-// and defined as static in file nsx_core.c, while those for ARM Neon platforms
-// are declared below and defined in file nsx_core_neon.c.
-void WebRtcNsx_NoiseEstimationNeon(NoiseSuppressionFixedC* inst,
-                                   uint16_t* magn,
-                                   uint32_t* noise,
-                                   int16_t* q_noise);
-void WebRtcNsx_SynthesisUpdateNeon(NoiseSuppressionFixedC* inst,
-                                   int16_t* out_frame,
-                                   int16_t gain_factor);
-void WebRtcNsx_AnalysisUpdateNeon(NoiseSuppressionFixedC* inst,
-                                  int16_t* out,
-                                  int16_t* new_speech);
-void WebRtcNsx_PrepareSpectrumNeon(NoiseSuppressionFixedC* inst,
-                                   int16_t* freq_buff);
-#endif
-
-#if defined(MIPS32_LE)
-// For the above function pointers, functions for generic platforms are declared
-// and defined as static in file nsx_core.c, while those for MIPS platforms
-// are declared below and defined in file nsx_core_mips.c.
-void WebRtcNsx_SynthesisUpdate_mips(NoiseSuppressionFixedC* inst,
-                                    int16_t* out_frame,
-                                    int16_t gain_factor);
-void WebRtcNsx_AnalysisUpdate_mips(NoiseSuppressionFixedC* inst,
-                                   int16_t* out,
-                                   int16_t* new_speech);
-void WebRtcNsx_PrepareSpectrum_mips(NoiseSuppressionFixedC* inst,
-                                    int16_t* freq_buff);
-void WebRtcNsx_NormalizeRealBuffer_mips(NoiseSuppressionFixedC* inst,
-                                        const int16_t* in,
-                                        int16_t* out);
-#if defined(MIPS_DSP_R1_LE)
-void WebRtcNsx_Denormalize_mips(NoiseSuppressionFixedC* inst,
-                                int16_t* in,
-                                int factor);
-#endif
-
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif  // MODULES_AUDIO_PROCESSING_NS_MAIN_SOURCE_NSX_CORE_H_
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/ns/nsx_core_c.c b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/ns/nsx_core_c.c
deleted file mode 100644
index 162fb1990a..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/ns/nsx_core_c.c
+++ /dev/null
@@ -1,260 +0,0 @@
-/*
- *  Copyright (c) 2013 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#include "rtc_base/checks.h"
-#include "modules/audio_processing/ns/noise_suppression_x.h"
-#include "modules/audio_processing/ns/nsx_core.h"
-#include "modules/audio_processing/ns/nsx_defines.h"
-
-static const int16_t kIndicatorTable[17] = {
-  0, 2017, 3809, 5227, 6258, 6963, 7424, 7718,
-  7901, 8014, 8084, 8126, 8152, 8168, 8177, 8183, 8187
-};
-
-// Compute speech/noise probability
-// speech/noise probability is returned in: probSpeechFinal
-//snrLocPrior is the prior SNR for each frequency (in Q11)
-//snrLocPost is the post SNR for each frequency (in Q11)
-void WebRtcNsx_SpeechNoiseProb(NoiseSuppressionFixedC* inst,
-                               uint16_t* nonSpeechProbFinal,
-                               uint32_t* priorLocSnr,
-                               uint32_t* postLocSnr) {
-  uint32_t zeros, num, den, tmpU32no1, tmpU32no2, tmpU32no3;
-  int32_t invLrtFX, indPriorFX, tmp32, tmp32no1, tmp32no2, besselTmpFX32;
-  int32_t frac32, logTmp;
-  int32_t logLrtTimeAvgKsumFX;
-  int16_t indPriorFX16;
-  int16_t tmp16, tmp16no1, tmp16no2, tmpIndFX, tableIndex, frac, intPart;
-  size_t i;
-  int normTmp, normTmp2, nShifts;
-
-  // compute feature based on average LR factor
-  // this is the average over all frequencies of the smooth log LRT
-  logLrtTimeAvgKsumFX = 0;
-  for (i = 0; i < inst->magnLen; i++) {
-    besselTmpFX32 = (int32_t)postLocSnr[i]; // Q11
-    normTmp = WebRtcSpl_NormU32(postLocSnr[i]);
-    num = postLocSnr[i] << normTmp;  // Q(11+normTmp)
-    if (normTmp > 10) {
-      den = priorLocSnr[i] << (normTmp - 11);  // Q(normTmp)
-    } else {
-      den = priorLocSnr[i] >> (11 - normTmp);  // Q(normTmp)
-    }
-    if (den > 0) {
-      besselTmpFX32 -= num / den;  // Q11
-    } else {
-      besselTmpFX32 = 0;
-    }
-
-    // inst->logLrtTimeAvg[i] += LRT_TAVG * (besselTmp - log(snrLocPrior)
-    //                                       - inst->logLrtTimeAvg[i]);
-    // Here, LRT_TAVG = 0.5
-    zeros = WebRtcSpl_NormU32(priorLocSnr[i]);
-    frac32 = (int32_t)(((priorLocSnr[i] << zeros) & 0x7FFFFFFF) >> 19);
-    tmp32 = (frac32 * frac32 * -43) >> 19;
-    tmp32 += ((int16_t)frac32 * 5412) >> 12;
-    frac32 = tmp32 + 37;
-    // tmp32 = log2(priorLocSnr[i])
-    tmp32 = (int32_t)(((31 - zeros) << 12) + frac32) - (11 << 12); // Q12
-    logTmp = (tmp32 * 178) >> 8;  // log2(priorLocSnr[i])*log(2)
-    // tmp32no1 = LRT_TAVG * (log(snrLocPrior) + inst->logLrtTimeAvg[i]) in Q12.
-    tmp32no1 = (logTmp + inst->logLrtTimeAvgW32[i]) / 2;
-    inst->logLrtTimeAvgW32[i] += (besselTmpFX32 - tmp32no1); // Q12
-
-    logLrtTimeAvgKsumFX += inst->logLrtTimeAvgW32[i]; // Q12
-  }
-  inst->featureLogLrt = (logLrtTimeAvgKsumFX * BIN_SIZE_LRT) >>
-      (inst->stages + 11);
-
-  // done with computation of LR factor
-
-  //
-  //compute the indicator functions
-  //
-
-  // average LRT feature
-  // FLOAT code
-  // indicator0 = 0.5 * (tanh(widthPrior *
-  //                      (logLrtTimeAvgKsum - threshPrior0)) + 1.0);
-  tmpIndFX = 16384; // Q14(1.0)
-  tmp32no1 = logLrtTimeAvgKsumFX - inst->thresholdLogLrt; // Q12
-  nShifts = 7 - inst->stages; // WIDTH_PR_MAP_SHIFT - inst->stages + 5;
-  //use larger width in tanh map for pause regions
-  if (tmp32no1 < 0) {
-    tmpIndFX = 0;
-    tmp32no1 = -tmp32no1;
-    //widthPrior = widthPrior * 2.0;
-    nShifts++;
-  }
-  tmp32no1 = WEBRTC_SPL_SHIFT_W32(tmp32no1, nShifts); // Q14
-  // compute indicator function: sigmoid map
-  if (tmp32no1 < (16 << 14) && tmp32no1 >= 0) {
-    tableIndex = (int16_t)(tmp32no1 >> 14);
-    tmp16no2 = kIndicatorTable[tableIndex];
-    tmp16no1 = kIndicatorTable[tableIndex + 1] - kIndicatorTable[tableIndex];
-    frac = (int16_t)(tmp32no1 & 0x00003fff); // Q14
-    tmp16no2 += (int16_t)((tmp16no1 * frac) >> 14);
-    if (tmpIndFX == 0) {
-      tmpIndFX = 8192 - tmp16no2; // Q14
-    } else {
-      tmpIndFX = 8192 + tmp16no2; // Q14
-    }
-  }
-  indPriorFX = inst->weightLogLrt * tmpIndFX;  // 6*Q14
-
-  //spectral flatness feature
-  if (inst->weightSpecFlat) {
-    tmpU32no1 = WEBRTC_SPL_UMUL(inst->featureSpecFlat, 400); // Q10
-    tmpIndFX = 16384; // Q14(1.0)
-    //use larger width in tanh map for pause regions
-    tmpU32no2 = inst->thresholdSpecFlat - tmpU32no1; //Q10
-    nShifts = 4;
-    if (inst->thresholdSpecFlat < tmpU32no1) {
-      tmpIndFX = 0;
-      tmpU32no2 = tmpU32no1 - inst->thresholdSpecFlat;
-      //widthPrior = widthPrior * 2.0;
-      nShifts++;
-    }
-    tmpU32no1 = WebRtcSpl_DivU32U16(tmpU32no2 << nShifts, 25);  // Q14
-    // compute indicator function: sigmoid map
-    // FLOAT code
-    // indicator1 = 0.5 * (tanh(sgnMap * widthPrior *
-    //                          (threshPrior1 - tmpFloat1)) + 1.0);
-    if (tmpU32no1 < (16 << 14)) {
-      tableIndex = (int16_t)(tmpU32no1 >> 14);
-      tmp16no2 = kIndicatorTable[tableIndex];
-      tmp16no1 = kIndicatorTable[tableIndex + 1] - kIndicatorTable[tableIndex];
-      frac = (int16_t)(tmpU32no1 & 0x00003fff); // Q14
-      tmp16no2 += (int16_t)((tmp16no1 * frac) >> 14);
-      if (tmpIndFX) {
-        tmpIndFX = 8192 + tmp16no2; // Q14
-      } else {
-        tmpIndFX = 8192 - tmp16no2; // Q14
-      }
-    }
-    indPriorFX += inst->weightSpecFlat * tmpIndFX;  // 6*Q14
-  }
-
-  //for template spectral-difference
-  if (inst->weightSpecDiff) {
-    tmpU32no1 = 0;
-    if (inst->featureSpecDiff) {
-      normTmp = WEBRTC_SPL_MIN(20 - inst->stages,
-                               WebRtcSpl_NormU32(inst->featureSpecDiff));
-      RTC_DCHECK_GE(normTmp, 0);
-      tmpU32no1 = inst->featureSpecDiff << normTmp;  // Q(normTmp-2*stages)
-      tmpU32no2 = inst->timeAvgMagnEnergy >> (20 - inst->stages - normTmp);
-      if (tmpU32no2 > 0) {
-        // Q(20 - inst->stages)
-        tmpU32no1 /= tmpU32no2;
-      } else {
-        tmpU32no1 = (uint32_t)(0x7fffffff);
-      }
-    }
-    tmpU32no3 = (inst->thresholdSpecDiff << 17) / 25;
-    tmpU32no2 = tmpU32no1 - tmpU32no3;
-    nShifts = 1;
-    tmpIndFX = 16384; // Q14(1.0)
-    //use larger width in tanh map for pause regions
-    if (tmpU32no2 & 0x80000000) {
-      tmpIndFX = 0;
-      tmpU32no2 = tmpU32no3 - tmpU32no1;
-      //widthPrior = widthPrior * 2.0;
-      nShifts--;
-    }
-    tmpU32no1 = tmpU32no2 >> nShifts;
-    // compute indicator function: sigmoid map
-    /* FLOAT code
-     indicator2 = 0.5 * (tanh(widthPrior * (tmpFloat1 - threshPrior2)) + 1.0);
-     */
-    if (tmpU32no1 < (16 << 14)) {
-      tableIndex = (int16_t)(tmpU32no1 >> 14);
-      tmp16no2 = kIndicatorTable[tableIndex];
-      tmp16no1 = kIndicatorTable[tableIndex + 1] - kIndicatorTable[tableIndex];
-      frac = (int16_t)(tmpU32no1 & 0x00003fff); // Q14
-      tmp16no2 += (int16_t)WEBRTC_SPL_MUL_16_16_RSFT_WITH_ROUND(
-                    tmp16no1, frac, 14);
-      if (tmpIndFX) {
-        tmpIndFX = 8192 + tmp16no2;
-      } else {
-        tmpIndFX = 8192 - tmp16no2;
-      }
-    }
-    indPriorFX += inst->weightSpecDiff * tmpIndFX;  // 6*Q14
-  }
-
-  //combine the indicator function with the feature weights
-  // FLOAT code
-  // indPrior = 1 - (weightIndPrior0 * indicator0 + weightIndPrior1 *
-  //                 indicator1 + weightIndPrior2 * indicator2);
-  indPriorFX16 = WebRtcSpl_DivW32W16ResW16(98307 - indPriorFX, 6); // Q14
-  // done with computing indicator function
-
-  //compute the prior probability
-  // FLOAT code
-  // inst->priorNonSpeechProb += PRIOR_UPDATE *
-  //                             (indPriorNonSpeech - inst->priorNonSpeechProb);
-  tmp16 = indPriorFX16 - inst->priorNonSpeechProb; // Q14
-  inst->priorNonSpeechProb += (int16_t)((PRIOR_UPDATE_Q14 * tmp16) >> 14);
-
-  //final speech probability: combine prior model with LR factor:
-
-  memset(nonSpeechProbFinal, 0, sizeof(uint16_t) * inst->magnLen);
-
-  if (inst->priorNonSpeechProb > 0) {
-    for (i = 0; i < inst->magnLen; i++) {
-      // FLOAT code
-      // invLrt = exp(inst->logLrtTimeAvg[i]);
-      // invLrt = inst->priorSpeechProb * invLrt;
-      // nonSpeechProbFinal[i] = (1.0 - inst->priorSpeechProb) /
-      //                         (1.0 - inst->priorSpeechProb + invLrt);
-      // invLrt = (1.0 - inst->priorNonSpeechProb) * invLrt;
-      // nonSpeechProbFinal[i] = inst->priorNonSpeechProb /
-      //                         (inst->priorNonSpeechProb + invLrt);
-      if (inst->logLrtTimeAvgW32[i] < 65300) {
-        tmp32no1 = (inst->logLrtTimeAvgW32[i] * 23637) >> 14;  // Q12
-        intPart = (int16_t)(tmp32no1 >> 12);
-        if (intPart < -8) {
-          intPart = -8;
-        }
-        frac = (int16_t)(tmp32no1 & 0x00000fff); // Q12
-
-        // Quadratic approximation of 2^frac
-        tmp32no2 = (frac * frac * 44) >> 19;  // Q12.
-        tmp32no2 += (frac * 84) >> 7;  // Q12
-        invLrtFX = (1 << (8 + intPart)) +
-            WEBRTC_SPL_SHIFT_W32(tmp32no2, intPart - 4); // Q8
-
-        normTmp = WebRtcSpl_NormW32(invLrtFX);
-        normTmp2 = WebRtcSpl_NormW16((16384 - inst->priorNonSpeechProb));
-        if (normTmp + normTmp2 >= 7) {
-          if (normTmp + normTmp2 < 15) {
-            invLrtFX >>= 15 - normTmp2 - normTmp;
-            // Q(normTmp+normTmp2-7)
-            tmp32no1 = invLrtFX * (16384 - inst->priorNonSpeechProb);
-            // Q(normTmp+normTmp2+7)
-            invLrtFX = WEBRTC_SPL_SHIFT_W32(tmp32no1, 7 - normTmp - normTmp2);
-                                                                  // Q14
-          } else {
-            tmp32no1 = invLrtFX * (16384 - inst->priorNonSpeechProb);
-                                                                  // Q22
-            invLrtFX = tmp32no1 >> 8;  // Q14.
-          }
-
-          tmp32no1 = (int32_t)inst->priorNonSpeechProb << 8;  // Q22
-
-          nonSpeechProbFinal[i] = tmp32no1 /
-              (inst->priorNonSpeechProb + invLrtFX);  // Q8
-        }
-      }
-    }
-  }
-}
-
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/ns/nsx_core_neon.c b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/ns/nsx_core_neon.c
deleted file mode 100644
index 9908920dc4..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/ns/nsx_core_neon.c
+++ /dev/null
@@ -1,609 +0,0 @@
-/*
- *  Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-#if defined(__arm__) || defined(_M_ARM) || defined(__aarch64__)
-
-#include "modules/audio_processing/ns/nsx_core.h"
-
-#include <arm_neon.h>
-
-#include "rtc_base/checks.h"
-
-// Constants to compensate for shifting signal log(2^shifts).
-const int16_t WebRtcNsx_kLogTable[9] = {
-  0, 177, 355, 532, 710, 887, 1065, 1242, 1420
-};
-
-const int16_t WebRtcNsx_kCounterDiv[201] = {
-  32767, 16384, 10923, 8192, 6554, 5461, 4681, 4096, 3641, 3277, 2979, 2731,
-  2521, 2341, 2185, 2048, 1928, 1820, 1725, 1638, 1560, 1489, 1425, 1365, 1311,
-  1260, 1214, 1170, 1130, 1092, 1057, 1024, 993, 964, 936, 910, 886, 862, 840,
-  819, 799, 780, 762, 745, 728, 712, 697, 683, 669, 655, 643, 630, 618, 607,
-  596, 585, 575, 565, 555, 546, 537, 529, 520, 512, 504, 496, 489, 482, 475,
-  468, 462, 455, 449, 443, 437, 431, 426, 420, 415, 410, 405, 400, 395, 390,
-  386, 381, 377, 372, 368, 364, 360, 356, 352, 349, 345, 341, 338, 334, 331,
-  328, 324, 321, 318, 315, 312, 309, 306, 303, 301, 298, 295, 293, 290, 287,
-  285, 282, 280, 278, 275, 273, 271, 269, 266, 264, 262, 260, 258, 256, 254,
-  252, 250, 248, 246, 245, 243, 241, 239, 237, 236, 234, 232, 231, 229, 228,
-  226, 224, 223, 221, 220, 218, 217, 216, 214, 213, 211, 210, 209, 207, 206,
-  205, 204, 202, 201, 200, 199, 197, 196, 195, 194, 193, 192, 191, 189, 188,
-  187, 186, 185, 184, 183, 182, 181, 180, 179, 178, 177, 176, 175, 174, 173,
-  172, 172, 171, 170, 169, 168, 167, 166, 165, 165, 164, 163
-};
-
-const int16_t WebRtcNsx_kLogTableFrac[256] = {
-  0, 1, 3, 4, 6, 7, 9, 10, 11, 13, 14, 16, 17, 18, 20, 21,
-  22, 24, 25, 26, 28, 29, 30, 32, 33, 34, 36, 37, 38, 40, 41, 42,
-  44, 45, 46, 47, 49, 50, 51, 52, 54, 55, 56, 57, 59, 60, 61, 62,
-  63, 65, 66, 67, 68, 69, 71, 72, 73, 74, 75, 77, 78, 79, 80, 81,
-  82, 84, 85, 86, 87, 88, 89, 90, 92, 93, 94, 95, 96, 97, 98, 99,
-  100, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 116,
-  117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127, 128, 129, 130, 131,
-  132, 133, 134, 135, 136, 137, 138, 139, 140, 141, 142, 143, 144, 145, 146,
-  147, 148, 149, 150, 151, 152, 153, 154, 155, 155, 156, 157, 158, 159, 160,
-  161, 162, 163, 164, 165, 166, 167, 168, 169, 169, 170, 171, 172, 173, 174,
-  175, 176, 177, 178, 178, 179, 180, 181, 182, 183, 184, 185, 185, 186, 187,
-  188, 189, 190, 191, 192, 192, 193, 194, 195, 196, 197, 198, 198, 199, 200,
-  201, 202, 203, 203, 204, 205, 206, 207, 208, 208, 209, 210, 211, 212, 212,
-  213, 214, 215, 216, 216, 217, 218, 219, 220, 220, 221, 222, 223, 224, 224,
-  225, 226, 227, 228, 228, 229, 230, 231, 231, 232, 233, 234, 234, 235, 236,
-  237, 238, 238, 239, 240, 241, 241, 242, 243, 244, 244, 245, 246, 247, 247,
-  248, 249, 249, 250, 251, 252, 252, 253, 254, 255, 255
-};
-
-// Update the noise estimation information.
-static void UpdateNoiseEstimateNeon(NoiseSuppressionFixedC* inst, int offset) {
-  const int16_t kExp2Const = 11819; // Q13
-  int16_t* ptr_noiseEstLogQuantile = NULL;
-  int16_t* ptr_noiseEstQuantile = NULL;
-  int16x4_t kExp2Const16x4 = vdup_n_s16(kExp2Const);
-  int32x4_t twentyOne32x4 = vdupq_n_s32(21);
-  int32x4_t constA32x4 = vdupq_n_s32(0x1fffff);
-  int32x4_t constB32x4 = vdupq_n_s32(0x200000);
-
-  int16_t tmp16 = WebRtcSpl_MaxValueW16(inst->noiseEstLogQuantile + offset,
-                                        inst->magnLen);
-
-  // Guarantee a Q-domain as high as possible and still fit in int16
-  inst->qNoise = 14 - (int) WEBRTC_SPL_MUL_16_16_RSFT_WITH_ROUND(kExp2Const,
-                                                                 tmp16,
-                                                                 21);
-
-  int32x4_t qNoise32x4 = vdupq_n_s32(inst->qNoise);
-
-  for (ptr_noiseEstLogQuantile = &inst->noiseEstLogQuantile[offset],
-       ptr_noiseEstQuantile = &inst->noiseEstQuantile[0];
-       ptr_noiseEstQuantile < &inst->noiseEstQuantile[inst->magnLen - 3];
-       ptr_noiseEstQuantile += 4, ptr_noiseEstLogQuantile += 4) {
-
-    // tmp32no2 = kExp2Const * inst->noiseEstLogQuantile[offset + i];
-    int16x4_t v16x4 = vld1_s16(ptr_noiseEstLogQuantile);
-    int32x4_t v32x4B = vmull_s16(v16x4, kExp2Const16x4);
-
-    // tmp32no1 = (0x00200000 | (tmp32no2 & 0x001FFFFF)); // 2^21 + frac
-    int32x4_t v32x4A = vandq_s32(v32x4B, constA32x4);
-    v32x4A = vorrq_s32(v32x4A, constB32x4);
-
-    // tmp16 = (int16_t)(tmp32no2 >> 21);
-    v32x4B = vshrq_n_s32(v32x4B, 21);
-
-    // tmp16 -= 21;// shift 21 to get result in Q0
-    v32x4B = vsubq_s32(v32x4B, twentyOne32x4);
-
-    // tmp16 += (int16_t) inst->qNoise;
-    // shift to get result in Q(qNoise)
-    v32x4B = vaddq_s32(v32x4B, qNoise32x4);
-
-    // if (tmp16 < 0) {
-    //   tmp32no1 >>= -tmp16;
-    // } else {
-    //   tmp32no1 <<= tmp16;
-    // }
-    v32x4B = vshlq_s32(v32x4A, v32x4B);
-
-    // tmp16 = WebRtcSpl_SatW32ToW16(tmp32no1);
-    v16x4 = vqmovn_s32(v32x4B);
-
-    //inst->noiseEstQuantile[i] = tmp16;
-    vst1_s16(ptr_noiseEstQuantile, v16x4);
-  }
-
-  // Last iteration:
-
-  // inst->quantile[i]=exp(inst->lquantile[offset+i]);
-  // in Q21
-  int32_t tmp32no2 = kExp2Const * *ptr_noiseEstLogQuantile;
-  int32_t tmp32no1 = (0x00200000 | (tmp32no2 & 0x001FFFFF)); // 2^21 + frac
-
-  tmp16 = (int16_t)(tmp32no2 >> 21);
-  tmp16 -= 21;// shift 21 to get result in Q0
-  tmp16 += (int16_t) inst->qNoise; //shift to get result in Q(qNoise)
-  if (tmp16 < 0) {
-    tmp32no1 >>= -tmp16;
-  } else {
-    tmp32no1 <<= tmp16;
-  }
-  *ptr_noiseEstQuantile = WebRtcSpl_SatW32ToW16(tmp32no1);
-}
-
-// Noise Estimation
-void WebRtcNsx_NoiseEstimationNeon(NoiseSuppressionFixedC* inst,
-                                   uint16_t* magn,
-                                   uint32_t* noise,
-                                   int16_t* q_noise) {
-  int16_t lmagn[HALF_ANAL_BLOCKL], counter, countDiv;
-  int16_t countProd, delta, zeros, frac;
-  int16_t log2, tabind, logval, tmp16, tmp16no1, tmp16no2;
-  const int16_t log2_const = 22713;
-  const int16_t width_factor = 21845;
-
-  size_t i, s, offset;
-
-  tabind = inst->stages - inst->normData;
-  RTC_DCHECK_LT(tabind, 9);
-  RTC_DCHECK_GT(tabind, -9);
-  if (tabind < 0) {
-    logval = -WebRtcNsx_kLogTable[-tabind];
-  } else {
-    logval = WebRtcNsx_kLogTable[tabind];
-  }
-
-  int16x8_t logval_16x8 = vdupq_n_s16(logval);
-
-  // lmagn(i)=log(magn(i))=log(2)*log2(magn(i))
-  // magn is in Q(-stages), and the real lmagn values are:
-  // real_lmagn(i)=log(magn(i)*2^stages)=log(magn(i))+log(2^stages)
-  // lmagn in Q8
-  for (i = 0; i < inst->magnLen; i++) {
-    if (magn[i]) {
-      zeros = WebRtcSpl_NormU32((uint32_t)magn[i]);
-      frac = (int16_t)((((uint32_t)magn[i] << zeros)
-                        & 0x7FFFFFFF) >> 23);
-      RTC_DCHECK_LT(frac, 256);
-      // log2(magn(i))
-      log2 = (int16_t)(((31 - zeros) << 8)
-                       + WebRtcNsx_kLogTableFrac[frac]);
-      // log2(magn(i))*log(2)
-      lmagn[i] = (int16_t)((log2 * log2_const) >> 15);
-      // + log(2^stages)
-      lmagn[i] += logval;
-    } else {
-      lmagn[i] = logval;
-    }
-  }
-
-  int16x4_t Q3_16x4  = vdup_n_s16(3);
-  int16x8_t WIDTHQ8_16x8 = vdupq_n_s16(WIDTH_Q8);
-  int16x8_t WIDTHFACTOR_16x8 = vdupq_n_s16(width_factor);
-
-  int16_t factor = FACTOR_Q7;
-  if (inst->blockIndex < END_STARTUP_LONG)
-    factor = FACTOR_Q7_STARTUP;
-
-  // Loop over simultaneous estimates
-  for (s = 0; s < SIMULT; s++) {
-    offset = s * inst->magnLen;
-
-    // Get counter values from state
-    counter = inst->noiseEstCounter[s];
-    RTC_DCHECK_LT(counter, 201);
-    countDiv = WebRtcNsx_kCounterDiv[counter];
-    countProd = (int16_t)(counter * countDiv);
-
-    // quant_est(...)
-    int16_t deltaBuff[8];
-    int16x4_t tmp16x4_0;
-    int16x4_t tmp16x4_1;
-    int16x4_t countDiv_16x4 = vdup_n_s16(countDiv);
-    int16x8_t countProd_16x8 = vdupq_n_s16(countProd);
-    int16x8_t tmp16x8_0 = vdupq_n_s16(countDiv);
-    int16x8_t prod16x8 = vqrdmulhq_s16(WIDTHFACTOR_16x8, tmp16x8_0);
-    int16x8_t tmp16x8_1;
-    int16x8_t tmp16x8_2;
-    int16x8_t tmp16x8_3;
-    uint16x8_t tmp16x8_4;
-    int32x4_t tmp32x4;
-
-    for (i = 0; i + 7 < inst->magnLen; i += 8) {
-      // Compute delta.
-      // Smaller step size during startup. This prevents from using
-      // unrealistic values causing overflow.
-      tmp16x8_0 = vdupq_n_s16(factor);
-      vst1q_s16(deltaBuff, tmp16x8_0);
-
-      int j;
-      for (j = 0; j < 8; j++) {
-        if (inst->noiseEstDensity[offset + i + j] > 512) {
-          // Get values for deltaBuff by shifting intead of dividing.
-          int factor = WebRtcSpl_NormW16(inst->noiseEstDensity[offset + i + j]);
-          deltaBuff[j] = (int16_t)(FACTOR_Q16 >> (14 - factor));
-        }
-      }
-
-      // Update log quantile estimate
-
-      // tmp16 = (int16_t)((delta * countDiv) >> 14);
-      tmp32x4 = vmull_s16(vld1_s16(&deltaBuff[0]), countDiv_16x4);
-      tmp16x4_1 = vshrn_n_s32(tmp32x4, 14);
-      tmp32x4 = vmull_s16(vld1_s16(&deltaBuff[4]), countDiv_16x4);
-      tmp16x4_0 = vshrn_n_s32(tmp32x4, 14);
-      tmp16x8_0 = vcombine_s16(tmp16x4_1, tmp16x4_0); // Keep for several lines.
-
-      // prepare for the "if" branch
-      // tmp16 += 2;
-      // tmp16_1 = (Word16)(tmp16>>2);
-      tmp16x8_1 = vrshrq_n_s16(tmp16x8_0, 2);
-
-      // inst->noiseEstLogQuantile[offset+i] + tmp16_1;
-      tmp16x8_2 = vld1q_s16(&inst->noiseEstLogQuantile[offset + i]); // Keep
-      tmp16x8_1 = vaddq_s16(tmp16x8_2, tmp16x8_1); // Keep for several lines
-
-      // Prepare for the "else" branch
-      // tmp16 += 1;
-      // tmp16_1 = (Word16)(tmp16>>1);
-      tmp16x8_0 = vrshrq_n_s16(tmp16x8_0, 1);
-
-      // tmp16_2 = (int16_t)((tmp16_1 * 3) >> 1);
-      tmp32x4 = vmull_s16(vget_low_s16(tmp16x8_0), Q3_16x4);
-      tmp16x4_1 = vshrn_n_s32(tmp32x4, 1);
-
-      // tmp16_2 = (int16_t)((tmp16_1 * 3) >> 1);
-      tmp32x4 = vmull_s16(vget_high_s16(tmp16x8_0), Q3_16x4);
-      tmp16x4_0 = vshrn_n_s32(tmp32x4, 1);
-
-      // inst->noiseEstLogQuantile[offset + i] - tmp16_2;
-      tmp16x8_0 = vcombine_s16(tmp16x4_1, tmp16x4_0); // keep
-      tmp16x8_0 = vsubq_s16(tmp16x8_2, tmp16x8_0);
-
-      // logval is the smallest fixed point representation we can have. Values
-      // below that will correspond to values in the interval [0, 1], which
-      // can't possibly occur.
-      tmp16x8_0 = vmaxq_s16(tmp16x8_0, logval_16x8);
-
-      // Do the if-else branches:
-      tmp16x8_3 = vld1q_s16(&lmagn[i]); // keep for several lines
-      tmp16x8_4 = vcgtq_s16(tmp16x8_3, tmp16x8_2);
-      tmp16x8_2 = vbslq_s16(tmp16x8_4, tmp16x8_1, tmp16x8_0);
-      vst1q_s16(&inst->noiseEstLogQuantile[offset + i], tmp16x8_2);
-
-      // Update density estimate
-      // tmp16_1 + tmp16_2
-      tmp16x8_1 = vld1q_s16(&inst->noiseEstDensity[offset + i]);
-      tmp16x8_0 = vqrdmulhq_s16(tmp16x8_1, countProd_16x8);
-      tmp16x8_0 = vaddq_s16(tmp16x8_0, prod16x8);
-
-      // lmagn[i] - inst->noiseEstLogQuantile[offset + i]
-      tmp16x8_3 = vsubq_s16(tmp16x8_3, tmp16x8_2);
-      tmp16x8_3 = vabsq_s16(tmp16x8_3);
-      tmp16x8_4 = vcgtq_s16(WIDTHQ8_16x8, tmp16x8_3);
-      tmp16x8_1 = vbslq_s16(tmp16x8_4, tmp16x8_0, tmp16x8_1);
-      vst1q_s16(&inst->noiseEstDensity[offset + i], tmp16x8_1);
-    }  // End loop over magnitude spectrum
-
-    // Last iteration over magnitude spectrum:
-    // compute delta
-    if (inst->noiseEstDensity[offset + i] > 512) {
-      // Get values for deltaBuff by shifting intead of dividing.
-      int factor = WebRtcSpl_NormW16(inst->noiseEstDensity[offset + i]);
-      delta = (int16_t)(FACTOR_Q16 >> (14 - factor));
-    } else {
-      delta = FACTOR_Q7;
-      if (inst->blockIndex < END_STARTUP_LONG) {
-        // Smaller step size during startup. This prevents from using
-        // unrealistic values causing overflow.
-        delta = FACTOR_Q7_STARTUP;
-      }
-    }
-    // update log quantile estimate
-    tmp16 = (int16_t)((delta * countDiv) >> 14);
-    if (lmagn[i] > inst->noiseEstLogQuantile[offset + i]) {
-      // +=QUANTILE*delta/(inst->counter[s]+1) QUANTILE=0.25, =1 in Q2
-      // CounterDiv=1/(inst->counter[s]+1) in Q15
-      tmp16 += 2;
-      inst->noiseEstLogQuantile[offset + i] += tmp16 / 4;
-    } else {
-      tmp16 += 1;
-      // *(1-QUANTILE), in Q2 QUANTILE=0.25, 1-0.25=0.75=3 in Q2
-      // TODO(bjornv): investigate why we need to truncate twice.
-      tmp16no2 = (int16_t)((tmp16 / 2) * 3 / 2);
-      inst->noiseEstLogQuantile[offset + i] -= tmp16no2;
-      if (inst->noiseEstLogQuantile[offset + i] < logval) {
-        // logval is the smallest fixed point representation we can have.
-        // Values below that will correspond to values in the interval
-        // [0, 1], which can't possibly occur.
-        inst->noiseEstLogQuantile[offset + i] = logval;
-      }
-    }
-
-    // update density estimate
-    if (WEBRTC_SPL_ABS_W16(lmagn[i] - inst->noiseEstLogQuantile[offset + i])
-        < WIDTH_Q8) {
-      tmp16no1 = (int16_t)WEBRTC_SPL_MUL_16_16_RSFT_WITH_ROUND(
-                   inst->noiseEstDensity[offset + i], countProd, 15);
-      tmp16no2 = (int16_t)WEBRTC_SPL_MUL_16_16_RSFT_WITH_ROUND(
-                   width_factor, countDiv, 15);
-      inst->noiseEstDensity[offset + i] = tmp16no1 + tmp16no2;
-    }
-
-
-    if (counter >= END_STARTUP_LONG) {
-      inst->noiseEstCounter[s] = 0;
-      if (inst->blockIndex >= END_STARTUP_LONG) {
-        UpdateNoiseEstimateNeon(inst, offset);
-      }
-    }
-    inst->noiseEstCounter[s]++;
-
-  }  // end loop over simultaneous estimates
-
-  // Sequentially update the noise during startup
-  if (inst->blockIndex < END_STARTUP_LONG) {
-    UpdateNoiseEstimateNeon(inst, offset);
-  }
-
-  for (i = 0; i < inst->magnLen; i++) {
-    noise[i] = (uint32_t)(inst->noiseEstQuantile[i]); // Q(qNoise)
-  }
-  (*q_noise) = (int16_t)inst->qNoise;
-}
-
-// Filter the data in the frequency domain, and create spectrum.
-void WebRtcNsx_PrepareSpectrumNeon(NoiseSuppressionFixedC* inst,
-                                   int16_t* freq_buf) {
-  RTC_DCHECK_EQ(1, inst->magnLen % 8);
-  RTC_DCHECK_EQ(0, inst->anaLen2 % 16);
-
-  // (1) Filtering.
-
-  // Fixed point C code for the next block is as follows:
-  // for (i = 0; i < inst->magnLen; i++) {
-  //   inst->real[i] = (int16_t)((inst->real[i] *
-  //      (int16_t)(inst->noiseSupFilter[i])) >> 14);  // Q(normData-stages)
-  //   inst->imag[i] = (int16_t)((inst->imag[i] *
-  //      (int16_t)(inst->noiseSupFilter[i])) >> 14);  // Q(normData-stages)
-  // }
-
-  int16_t* preal = &inst->real[0];
-  int16_t* pimag = &inst->imag[0];
-  int16_t* pns_filter = (int16_t*)&inst->noiseSupFilter[0];
-  int16_t* pimag_end = pimag + inst->magnLen - 4;
-
-  while (pimag < pimag_end) {
-    int16x8_t real = vld1q_s16(preal);
-    int16x8_t imag = vld1q_s16(pimag);
-    int16x8_t ns_filter = vld1q_s16(pns_filter);
-
-    int32x4_t tmp_r_0 = vmull_s16(vget_low_s16(real), vget_low_s16(ns_filter));
-    int32x4_t tmp_i_0 = vmull_s16(vget_low_s16(imag), vget_low_s16(ns_filter));
-    int32x4_t tmp_r_1 = vmull_s16(vget_high_s16(real),
-                                  vget_high_s16(ns_filter));
-    int32x4_t tmp_i_1 = vmull_s16(vget_high_s16(imag),
-                                  vget_high_s16(ns_filter));
-
-    int16x4_t result_r_0 = vshrn_n_s32(tmp_r_0, 14);
-    int16x4_t result_i_0 = vshrn_n_s32(tmp_i_0, 14);
-    int16x4_t result_r_1 = vshrn_n_s32(tmp_r_1, 14);
-    int16x4_t result_i_1 = vshrn_n_s32(tmp_i_1, 14);
-
-    vst1q_s16(preal, vcombine_s16(result_r_0, result_r_1));
-    vst1q_s16(pimag, vcombine_s16(result_i_0, result_i_1));
-    preal += 8;
-    pimag += 8;
-    pns_filter += 8;
-  }
-
-  // Filter the last element
-  *preal = (int16_t)((*preal * *pns_filter) >> 14);
-  *pimag = (int16_t)((*pimag * *pns_filter) >> 14);
-
-  // (2) Create spectrum.
-
-  // Fixed point C code for the rest of the function is as follows:
-  // freq_buf[0] = inst->real[0];
-  // freq_buf[1] = -inst->imag[0];
-  // for (i = 1, j = 2; i < inst->anaLen2; i += 1, j += 2) {
-  //   freq_buf[j] = inst->real[i];
-  //   freq_buf[j + 1] = -inst->imag[i];
-  // }
-  // freq_buf[inst->anaLen] = inst->real[inst->anaLen2];
-  // freq_buf[inst->anaLen + 1] = -inst->imag[inst->anaLen2];
-
-  preal = &inst->real[0];
-  pimag = &inst->imag[0];
-  pimag_end = pimag + inst->anaLen2;
-  int16_t * freq_buf_start = freq_buf;
-  while (pimag < pimag_end) {
-    // loop unroll
-    int16x8x2_t real_imag_0;
-    int16x8x2_t real_imag_1;
-    real_imag_0.val[1] = vld1q_s16(pimag);
-    real_imag_0.val[0] = vld1q_s16(preal);
-    preal += 8;
-    pimag += 8;
-    real_imag_1.val[1] = vld1q_s16(pimag);
-    real_imag_1.val[0] = vld1q_s16(preal);
-    preal += 8;
-    pimag += 8;
-
-    real_imag_0.val[1] = vnegq_s16(real_imag_0.val[1]);
-    real_imag_1.val[1] = vnegq_s16(real_imag_1.val[1]);
-    vst2q_s16(freq_buf_start, real_imag_0);
-    freq_buf_start += 16;
-    vst2q_s16(freq_buf_start, real_imag_1);
-    freq_buf_start += 16;
-  }
-  freq_buf[inst->anaLen] = inst->real[inst->anaLen2];
-  freq_buf[inst->anaLen + 1] = -inst->imag[inst->anaLen2];
-}
-
-// For the noise supress process, synthesis, read out fully processed segment,
-// and update synthesis buffer.
-void WebRtcNsx_SynthesisUpdateNeon(NoiseSuppressionFixedC* inst,
-                                   int16_t* out_frame,
-                                   int16_t gain_factor) {
-  RTC_DCHECK_EQ(0, inst->anaLen % 16);
-  RTC_DCHECK_EQ(0, inst->blockLen10ms % 16);
-
-  int16_t* preal_start = inst->real;
-  const int16_t* pwindow = inst->window;
-  int16_t* preal_end = preal_start + inst->anaLen;
-  int16_t* psynthesis_buffer = inst->synthesisBuffer;
-
-  while (preal_start < preal_end) {
-    // Loop unroll.
-    int16x8_t window_0 = vld1q_s16(pwindow);
-    int16x8_t real_0 = vld1q_s16(preal_start);
-    int16x8_t synthesis_buffer_0 = vld1q_s16(psynthesis_buffer);
-
-    int16x8_t window_1 = vld1q_s16(pwindow + 8);
-    int16x8_t real_1 = vld1q_s16(preal_start + 8);
-    int16x8_t synthesis_buffer_1 = vld1q_s16(psynthesis_buffer + 8);
-
-    int32x4_t tmp32a_0_low = vmull_s16(vget_low_s16(real_0),
-                                       vget_low_s16(window_0));
-    int32x4_t tmp32a_0_high = vmull_s16(vget_high_s16(real_0),
-                                        vget_high_s16(window_0));
-
-    int32x4_t tmp32a_1_low = vmull_s16(vget_low_s16(real_1),
-                                       vget_low_s16(window_1));
-    int32x4_t tmp32a_1_high = vmull_s16(vget_high_s16(real_1),
-                                        vget_high_s16(window_1));
-
-    int16x4_t tmp16a_0_low = vqrshrn_n_s32(tmp32a_0_low, 14);
-    int16x4_t tmp16a_0_high = vqrshrn_n_s32(tmp32a_0_high, 14);
-
-    int16x4_t tmp16a_1_low = vqrshrn_n_s32(tmp32a_1_low, 14);
-    int16x4_t tmp16a_1_high = vqrshrn_n_s32(tmp32a_1_high, 14);
-
-    int32x4_t tmp32b_0_low = vmull_n_s16(tmp16a_0_low, gain_factor);
-    int32x4_t tmp32b_0_high = vmull_n_s16(tmp16a_0_high, gain_factor);
-
-    int32x4_t tmp32b_1_low = vmull_n_s16(tmp16a_1_low, gain_factor);
-    int32x4_t tmp32b_1_high = vmull_n_s16(tmp16a_1_high, gain_factor);
-
-    int16x4_t tmp16b_0_low = vqrshrn_n_s32(tmp32b_0_low, 13);
-    int16x4_t tmp16b_0_high = vqrshrn_n_s32(tmp32b_0_high, 13);
-
-    int16x4_t tmp16b_1_low = vqrshrn_n_s32(tmp32b_1_low, 13);
-    int16x4_t tmp16b_1_high = vqrshrn_n_s32(tmp32b_1_high, 13);
-
-    synthesis_buffer_0 = vqaddq_s16(vcombine_s16(tmp16b_0_low, tmp16b_0_high),
-                                    synthesis_buffer_0);
-    synthesis_buffer_1 = vqaddq_s16(vcombine_s16(tmp16b_1_low, tmp16b_1_high),
-                                    synthesis_buffer_1);
-    vst1q_s16(psynthesis_buffer, synthesis_buffer_0);
-    vst1q_s16(psynthesis_buffer + 8, synthesis_buffer_1);
-
-    pwindow += 16;
-    preal_start += 16;
-    psynthesis_buffer += 16;
-  }
-
-  // Read out fully processed segment.
-  int16_t * p_start = inst->synthesisBuffer;
-  int16_t * p_end = inst->synthesisBuffer + inst->blockLen10ms;
-  int16_t * p_frame = out_frame;
-  while (p_start < p_end) {
-    int16x8_t frame_0 = vld1q_s16(p_start);
-    vst1q_s16(p_frame, frame_0);
-    p_start += 8;
-    p_frame += 8;
-  }
-
-  // Update synthesis buffer.
-  int16_t* p_start_src = inst->synthesisBuffer + inst->blockLen10ms;
-  int16_t* p_end_src = inst->synthesisBuffer + inst->anaLen;
-  int16_t* p_start_dst = inst->synthesisBuffer;
-  while (p_start_src < p_end_src) {
-    int16x8_t frame = vld1q_s16(p_start_src);
-    vst1q_s16(p_start_dst, frame);
-    p_start_src += 8;
-    p_start_dst += 8;
-  }
-
-  p_start = inst->synthesisBuffer + inst->anaLen - inst->blockLen10ms;
-  p_end = p_start + inst->blockLen10ms;
-  int16x8_t zero = vdupq_n_s16(0);
-  for (;p_start < p_end; p_start += 8) {
-    vst1q_s16(p_start, zero);
-  }
-}
-
-// Update analysis buffer for lower band, and window data before FFT.
-void WebRtcNsx_AnalysisUpdateNeon(NoiseSuppressionFixedC* inst,
-                                  int16_t* out,
-                                  int16_t* new_speech) {
-  RTC_DCHECK_EQ(0, inst->blockLen10ms % 16);
-  RTC_DCHECK_EQ(0, inst->anaLen % 16);
-
-  // For lower band update analysis buffer.
-  // memcpy(inst->analysisBuffer, inst->analysisBuffer + inst->blockLen10ms,
-  //     (inst->anaLen - inst->blockLen10ms) * sizeof(*inst->analysisBuffer));
-  int16_t* p_start_src = inst->analysisBuffer + inst->blockLen10ms;
-  int16_t* p_end_src = inst->analysisBuffer + inst->anaLen;
-  int16_t* p_start_dst = inst->analysisBuffer;
-  while (p_start_src < p_end_src) {
-    int16x8_t frame = vld1q_s16(p_start_src);
-    vst1q_s16(p_start_dst, frame);
-
-    p_start_src += 8;
-    p_start_dst += 8;
-  }
-
-  // memcpy(inst->analysisBuffer + inst->anaLen - inst->blockLen10ms,
-  //     new_speech, inst->blockLen10ms * sizeof(*inst->analysisBuffer));
-  p_start_src = new_speech;
-  p_end_src = new_speech + inst->blockLen10ms;
-  p_start_dst = inst->analysisBuffer + inst->anaLen - inst->blockLen10ms;
-  while (p_start_src < p_end_src) {
-    int16x8_t frame = vld1q_s16(p_start_src);
-    vst1q_s16(p_start_dst, frame);
-
-    p_start_src += 8;
-    p_start_dst += 8;
-  }
-
-  // Window data before FFT.
-  int16_t* p_start_window = (int16_t*) inst->window;
-  int16_t* p_start_buffer = inst->analysisBuffer;
-  int16_t* p_end_buffer = inst->analysisBuffer + inst->anaLen;
-  int16_t* p_start_out = out;
-
-  // Load the first element to reduce pipeline bubble.
-  int16x8_t window = vld1q_s16(p_start_window);
-  int16x8_t buffer = vld1q_s16(p_start_buffer);
-  p_start_window += 8;
-  p_start_buffer += 8;
-
-  while (p_start_buffer < p_end_buffer) {
-    // Unroll loop.
-    int32x4_t tmp32_low = vmull_s16(vget_low_s16(window), vget_low_s16(buffer));
-    int32x4_t tmp32_high = vmull_s16(vget_high_s16(window),
-                                     vget_high_s16(buffer));
-    window = vld1q_s16(p_start_window);
-    buffer = vld1q_s16(p_start_buffer);
-
-    int16x4_t result_low = vrshrn_n_s32(tmp32_low, 14);
-    int16x4_t result_high = vrshrn_n_s32(tmp32_high, 14);
-    vst1q_s16(p_start_out, vcombine_s16(result_low, result_high));
-
-    p_start_buffer += 8;
-    p_start_window += 8;
-    p_start_out += 8;
-  }
-  int32x4_t tmp32_low = vmull_s16(vget_low_s16(window), vget_low_s16(buffer));
-  int32x4_t tmp32_high = vmull_s16(vget_high_s16(window),
-                                   vget_high_s16(buffer));
-
-  int16x4_t result_low = vrshrn_n_s32(tmp32_low, 14);
-  int16x4_t result_high = vrshrn_n_s32(tmp32_high, 14);
-  vst1q_s16(p_start_out, vcombine_s16(result_low, result_high));
-}
-
-#endif
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/ns/nsx_defines.h b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/ns/nsx_defines.h
deleted file mode 100644
index dc14dbc793..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/ns/nsx_defines.h
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- *  Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#ifndef MODULES_AUDIO_PROCESSING_NS_MAIN_SOURCE_NSX_DEFINES_H_
-#define MODULES_AUDIO_PROCESSING_NS_MAIN_SOURCE_NSX_DEFINES_H_
-
-#define ANAL_BLOCKL_MAX 256  /* Max analysis block length */
-#define HALF_ANAL_BLOCKL 129 /* Half max analysis block length + 1 */
-#define NUM_HIGH_BANDS_MAX 2 /* Max number of high bands */
-#define SIMULT 3
-#define END_STARTUP_LONG 200
-#define END_STARTUP_SHORT 50
-#define FACTOR_Q16 2621440     /* 40 in Q16 */
-#define FACTOR_Q7 5120         /* 40 in Q7 */
-#define FACTOR_Q7_STARTUP 1024 /* 8 in Q7 */
-#define WIDTH_Q8 3             /* 0.01 in Q8 (or 25 ) */
-
-/* PARAMETERS FOR NEW METHOD */
-#define DD_PR_SNR_Q11 2007         /* ~= Q11(0.98) DD update of prior SNR */
-#define ONE_MINUS_DD_PR_SNR_Q11 41 /* DD update of prior SNR */
-#define SPECT_FLAT_TAVG_Q14 \
-  4915 /* (0.30) tavg parameter for spectral flatness measure */
-#define SPECT_DIFF_TAVG_Q8 \
-  77 /* (0.30) tavg parameter for spectral flatness measure */
-#define PRIOR_UPDATE_Q14 1638 /* Q14(0.1) Update parameter of prior model */
-#define NOISE_UPDATE_Q8 26    /* 26 ~= Q8(0.1) Update parameter for noise */
-
-/* Probability threshold for noise state in speech/noise likelihood. */
-#define ONE_MINUS_PROB_RANGE_Q8 205 /* 205 ~= Q8(0.8) */
-#define HIST_PAR_EST 1000 /* Histogram size for estimation of parameters */
-
-/* FEATURE EXTRACTION CONFIG  */
-/* Bin size of histogram */
-#define BIN_SIZE_LRT 10
-/* Scale parameters: multiply dominant peaks of the histograms by scale factor
- * to obtain. */
-/* Thresholds for prior model */
-#define FACTOR_1_LRT_DIFF \
-  6 /* For LRT and spectral difference (5 times bigger) */
-/* For spectral_flatness: used when noise is flatter than speech (10 times
- * bigger). */
-#define FACTOR_2_FLAT_Q10 922
-/* Peak limit for spectral flatness (varies between 0 and 1) */
-#define THRES_PEAK_FLAT 24 /* * 2 * BIN_SIZE_FLAT_FX */
-/* Limit on spacing of two highest peaks in histogram: spacing determined by bin
- * size. */
-#define LIM_PEAK_SPACE_FLAT_DIFF 4 /* * 2 * BIN_SIZE_DIFF_FX */
-/* Limit on relevance of second peak */
-#define LIM_PEAK_WEIGHT_FLAT_DIFF 2
-#define THRES_FLUCT_LRT \
-  10240 /* = 20 * inst->modelUpdate; fluctuation limit of LRT feat. */
-/* Limit on the max and min values for the feature thresholds */
-#define MAX_FLAT_Q10 38912 /*  * 2 * BIN_SIZE_FLAT_FX */
-#define MIN_FLAT_Q10 4096  /*  * 2 * BIN_SIZE_FLAT_FX */
-#define MAX_DIFF 100       /* * 2 * BIN_SIZE_DIFF_FX */
-#define MIN_DIFF 16        /* * 2 * BIN_SIZE_DIFF_FX */
-/* Criteria of weight of histogram peak  to accept/reject feature */
-#define THRES_WEIGHT_FLAT_DIFF \
-  154 /*(int)(0.3*(inst->modelUpdate)) for flatness and difference */
-
-#define STAT_UPDATES 9 /* Update every 512 = 1 << 9 block */
-#define ONE_MINUS_GAMMA_PAUSE_Q8 \
-  13 /* ~= Q8(0.05) Update for conservative noise estimate */
-#define GAMMA_NOISE_TRANS_AND_SPEECH_Q8 \
-  3 /* ~= Q8(0.01) Update for transition and noise region */
-
-#endif /* MODULES_AUDIO_PROCESSING_NS_MAIN_SOURCE_NSX_DEFINES_H_ */
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/ns/windows_private.h b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/ns/windows_private.h
deleted file mode 100644
index 17792ecdfe..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/ns/windows_private.h
+++ /dev/null
@@ -1,672 +0,0 @@
-/*
- *  Copyright (c) 2011 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#ifndef MODULES_AUDIO_PROCESSING_NS_MAIN_SOURCE_WINDOWS_PRIVATE_H_
-#define MODULES_AUDIO_PROCESSING_NS_MAIN_SOURCE_WINDOWS_PRIVATE_H_
-
-// Hanning window for 4ms 16kHz
-static const float kHanning64w128[128] = {
-    0.00000000000000f, 0.02454122852291f, 0.04906767432742f, 0.07356456359967f,
-    0.09801714032956f, 0.12241067519922f, 0.14673047445536f, 0.17096188876030f,
-    0.19509032201613f, 0.21910124015687f, 0.24298017990326f, 0.26671275747490f,
-    0.29028467725446f, 0.31368174039889f, 0.33688985339222f, 0.35989503653499f,
-    0.38268343236509f, 0.40524131400499f, 0.42755509343028f, 0.44961132965461f,
-    0.47139673682600f, 0.49289819222978f, 0.51410274419322f, 0.53499761988710f,
-    0.55557023301960f, 0.57580819141785f, 0.59569930449243f, 0.61523159058063f,
-    0.63439328416365f, 0.65317284295378f, 0.67155895484702f, 0.68954054473707f,
-    0.70710678118655f, 0.72424708295147f, 0.74095112535496f, 0.75720884650648f,
-    0.77301045336274f, 0.78834642762661f, 0.80320753148064f, 0.81758481315158f,
-    0.83146961230255f, 0.84485356524971f, 0.85772861000027f, 0.87008699110871f,
-    0.88192126434835f, 0.89322430119552f, 0.90398929312344f, 0.91420975570353f,
-    0.92387953251129f, 0.93299279883474f, 0.94154406518302f, 0.94952818059304f,
-    0.95694033573221f, 0.96377606579544f, 0.97003125319454f, 0.97570213003853f,
-    0.98078528040323f, 0.98527764238894f, 0.98917650996478f, 0.99247953459871f,
-    0.99518472667220f, 0.99729045667869f, 0.99879545620517f, 0.99969881869620f,
-    1.00000000000000f, 0.99969881869620f, 0.99879545620517f, 0.99729045667869f,
-    0.99518472667220f, 0.99247953459871f, 0.98917650996478f, 0.98527764238894f,
-    0.98078528040323f, 0.97570213003853f, 0.97003125319454f, 0.96377606579544f,
-    0.95694033573221f, 0.94952818059304f, 0.94154406518302f, 0.93299279883474f,
-    0.92387953251129f, 0.91420975570353f, 0.90398929312344f, 0.89322430119552f,
-    0.88192126434835f, 0.87008699110871f, 0.85772861000027f, 0.84485356524971f,
-    0.83146961230255f, 0.81758481315158f, 0.80320753148064f, 0.78834642762661f,
-    0.77301045336274f, 0.75720884650648f, 0.74095112535496f, 0.72424708295147f,
-    0.70710678118655f, 0.68954054473707f, 0.67155895484702f, 0.65317284295378f,
-    0.63439328416365f, 0.61523159058063f, 0.59569930449243f, 0.57580819141785f,
-    0.55557023301960f, 0.53499761988710f, 0.51410274419322f, 0.49289819222978f,
-    0.47139673682600f, 0.44961132965461f, 0.42755509343028f, 0.40524131400499f,
-    0.38268343236509f, 0.35989503653499f, 0.33688985339222f, 0.31368174039889f,
-    0.29028467725446f, 0.26671275747490f, 0.24298017990326f, 0.21910124015687f,
-    0.19509032201613f, 0.17096188876030f, 0.14673047445536f, 0.12241067519922f,
-    0.09801714032956f, 0.07356456359967f, 0.04906767432742f, 0.02454122852291f};
-
-// hybrib Hanning & flat window
-static const float kBlocks80w128[128] = {
-    (float)0.00000000, (float)0.03271908, (float)0.06540313, (float)0.09801714,
-    (float)0.13052619, (float)0.16289547, (float)0.19509032, (float)0.22707626,
-    (float)0.25881905, (float)0.29028468, (float)0.32143947, (float)0.35225005,
-    (float)0.38268343, (float)0.41270703, (float)0.44228869, (float)0.47139674,
-    (float)0.50000000, (float)0.52806785, (float)0.55557023, (float)0.58247770,
-    (float)0.60876143, (float)0.63439328, (float)0.65934582, (float)0.68359230,
-    (float)0.70710678, (float)0.72986407, (float)0.75183981, (float)0.77301045,
-    (float)0.79335334, (float)0.81284668, (float)0.83146961, (float)0.84920218,
-    (float)0.86602540, (float)0.88192126, (float)0.89687274, (float)0.91086382,
-    (float)0.92387953, (float)0.93590593, (float)0.94693013, (float)0.95694034,
-    (float)0.96592583, (float)0.97387698, (float)0.98078528, (float)0.98664333,
-    (float)0.99144486, (float)0.99518473, (float)0.99785892, (float)0.99946459,
-    (float)1.00000000, (float)1.00000000, (float)1.00000000, (float)1.00000000,
-    (float)1.00000000, (float)1.00000000, (float)1.00000000, (float)1.00000000,
-    (float)1.00000000, (float)1.00000000, (float)1.00000000, (float)1.00000000,
-    (float)1.00000000, (float)1.00000000, (float)1.00000000, (float)1.00000000,
-    (float)1.00000000, (float)1.00000000, (float)1.00000000, (float)1.00000000,
-    (float)1.00000000, (float)1.00000000, (float)1.00000000, (float)1.00000000,
-    (float)1.00000000, (float)1.00000000, (float)1.00000000, (float)1.00000000,
-    (float)1.00000000, (float)1.00000000, (float)1.00000000, (float)1.00000000,
-    (float)1.00000000, (float)0.99946459, (float)0.99785892, (float)0.99518473,
-    (float)0.99144486, (float)0.98664333, (float)0.98078528, (float)0.97387698,
-    (float)0.96592583, (float)0.95694034, (float)0.94693013, (float)0.93590593,
-    (float)0.92387953, (float)0.91086382, (float)0.89687274, (float)0.88192126,
-    (float)0.86602540, (float)0.84920218, (float)0.83146961, (float)0.81284668,
-    (float)0.79335334, (float)0.77301045, (float)0.75183981, (float)0.72986407,
-    (float)0.70710678, (float)0.68359230, (float)0.65934582, (float)0.63439328,
-    (float)0.60876143, (float)0.58247770, (float)0.55557023, (float)0.52806785,
-    (float)0.50000000, (float)0.47139674, (float)0.44228869, (float)0.41270703,
-    (float)0.38268343, (float)0.35225005, (float)0.32143947, (float)0.29028468,
-    (float)0.25881905, (float)0.22707626, (float)0.19509032, (float)0.16289547,
-    (float)0.13052619, (float)0.09801714, (float)0.06540313, (float)0.03271908};
-
-// hybrib Hanning & flat window
-static const float kBlocks160w256[256] = {
-    (float)0.00000000, (float)0.01636173, (float)0.03271908, (float)0.04906767,
-    (float)0.06540313, (float)0.08172107, (float)0.09801714, (float)0.11428696,
-    (float)0.13052619, (float)0.14673047, (float)0.16289547, (float)0.17901686,
-    (float)0.19509032, (float)0.21111155, (float)0.22707626, (float)0.24298018,
-    (float)0.25881905, (float)0.27458862, (float)0.29028468, (float)0.30590302,
-    (float)0.32143947, (float)0.33688985, (float)0.35225005, (float)0.36751594,
-    (float)0.38268343, (float)0.39774847, (float)0.41270703, (float)0.42755509,
-    (float)0.44228869, (float)0.45690388, (float)0.47139674, (float)0.48576339,
-    (float)0.50000000, (float)0.51410274, (float)0.52806785, (float)0.54189158,
-    (float)0.55557023, (float)0.56910015, (float)0.58247770, (float)0.59569930,
-    (float)0.60876143, (float)0.62166057, (float)0.63439328, (float)0.64695615,
-    (float)0.65934582, (float)0.67155895, (float)0.68359230, (float)0.69544264,
-    (float)0.70710678, (float)0.71858162, (float)0.72986407, (float)0.74095113,
-    (float)0.75183981, (float)0.76252720, (float)0.77301045, (float)0.78328675,
-    (float)0.79335334, (float)0.80320753, (float)0.81284668, (float)0.82226822,
-    (float)0.83146961, (float)0.84044840, (float)0.84920218, (float)0.85772861,
-    (float)0.86602540, (float)0.87409034, (float)0.88192126, (float)0.88951608,
-    (float)0.89687274, (float)0.90398929, (float)0.91086382, (float)0.91749450,
-    (float)0.92387953, (float)0.93001722, (float)0.93590593, (float)0.94154407,
-    (float)0.94693013, (float)0.95206268, (float)0.95694034, (float)0.96156180,
-    (float)0.96592583, (float)0.97003125, (float)0.97387698, (float)0.97746197,
-    (float)0.98078528, (float)0.98384601, (float)0.98664333, (float)0.98917651,
-    (float)0.99144486, (float)0.99344778, (float)0.99518473, (float)0.99665524,
-    (float)0.99785892, (float)0.99879546, (float)0.99946459, (float)0.99986614,
-    (float)1.00000000, (float)1.00000000, (float)1.00000000, (float)1.00000000,
-    (float)1.00000000, (float)1.00000000, (float)1.00000000, (float)1.00000000,
-    (float)1.00000000, (float)1.00000000, (float)1.00000000, (float)1.00000000,
-    (float)1.00000000, (float)1.00000000, (float)1.00000000, (float)1.00000000,
-    (float)1.00000000, (float)1.00000000, (float)1.00000000, (float)1.00000000,
-    (float)1.00000000, (float)1.00000000, (float)1.00000000, (float)1.00000000,
-    (float)1.00000000, (float)1.00000000, (float)1.00000000, (float)1.00000000,
-    (float)1.00000000, (float)1.00000000, (float)1.00000000, (float)1.00000000,
-    (float)1.00000000, (float)1.00000000, (float)1.00000000, (float)1.00000000,
-    (float)1.00000000, (float)1.00000000, (float)1.00000000, (float)1.00000000,
-    (float)1.00000000, (float)1.00000000, (float)1.00000000, (float)1.00000000,
-    (float)1.00000000, (float)1.00000000, (float)1.00000000, (float)1.00000000,
-    (float)1.00000000, (float)1.00000000, (float)1.00000000, (float)1.00000000,
-    (float)1.00000000, (float)1.00000000, (float)1.00000000, (float)1.00000000,
-    (float)1.00000000, (float)1.00000000, (float)1.00000000, (float)1.00000000,
-    (float)1.00000000, (float)1.00000000, (float)1.00000000, (float)1.00000000,
-    (float)1.00000000, (float)0.99986614, (float)0.99946459, (float)0.99879546,
-    (float)0.99785892, (float)0.99665524, (float)0.99518473, (float)0.99344778,
-    (float)0.99144486, (float)0.98917651, (float)0.98664333, (float)0.98384601,
-    (float)0.98078528, (float)0.97746197, (float)0.97387698, (float)0.97003125,
-    (float)0.96592583, (float)0.96156180, (float)0.95694034, (float)0.95206268,
-    (float)0.94693013, (float)0.94154407, (float)0.93590593, (float)0.93001722,
-    (float)0.92387953, (float)0.91749450, (float)0.91086382, (float)0.90398929,
-    (float)0.89687274, (float)0.88951608, (float)0.88192126, (float)0.87409034,
-    (float)0.86602540, (float)0.85772861, (float)0.84920218, (float)0.84044840,
-    (float)0.83146961, (float)0.82226822, (float)0.81284668, (float)0.80320753,
-    (float)0.79335334, (float)0.78328675, (float)0.77301045, (float)0.76252720,
-    (float)0.75183981, (float)0.74095113, (float)0.72986407, (float)0.71858162,
-    (float)0.70710678, (float)0.69544264, (float)0.68359230, (float)0.67155895,
-    (float)0.65934582, (float)0.64695615, (float)0.63439328, (float)0.62166057,
-    (float)0.60876143, (float)0.59569930, (float)0.58247770, (float)0.56910015,
-    (float)0.55557023, (float)0.54189158, (float)0.52806785, (float)0.51410274,
-    (float)0.50000000, (float)0.48576339, (float)0.47139674, (float)0.45690388,
-    (float)0.44228869, (float)0.42755509, (float)0.41270703, (float)0.39774847,
-    (float)0.38268343, (float)0.36751594, (float)0.35225005, (float)0.33688985,
-    (float)0.32143947, (float)0.30590302, (float)0.29028468, (float)0.27458862,
-    (float)0.25881905, (float)0.24298018, (float)0.22707626, (float)0.21111155,
-    (float)0.19509032, (float)0.17901686, (float)0.16289547, (float)0.14673047,
-    (float)0.13052619, (float)0.11428696, (float)0.09801714, (float)0.08172107,
-    (float)0.06540313, (float)0.04906767, (float)0.03271908, (float)0.01636173};
-
-// hybrib Hanning & flat window: for 20ms
-static const float kBlocks320w512[512] = {
-    (float)0.00000000, (float)0.00818114, (float)0.01636173, (float)0.02454123,
-    (float)0.03271908, (float)0.04089475, (float)0.04906767, (float)0.05723732,
-    (float)0.06540313, (float)0.07356456, (float)0.08172107, (float)0.08987211,
-    (float)0.09801714, (float)0.10615561, (float)0.11428696, (float)0.12241068,
-    (float)0.13052619, (float)0.13863297, (float)0.14673047, (float)0.15481816,
-    (float)0.16289547, (float)0.17096189, (float)0.17901686, (float)0.18705985,
-    (float)0.19509032, (float)0.20310773, (float)0.21111155, (float)0.21910124,
-    (float)0.22707626, (float)0.23503609, (float)0.24298018, (float)0.25090801,
-    (float)0.25881905, (float)0.26671276, (float)0.27458862, (float)0.28244610,
-    (float)0.29028468, (float)0.29810383, (float)0.30590302, (float)0.31368174,
-    (float)0.32143947, (float)0.32917568, (float)0.33688985, (float)0.34458148,
-    (float)0.35225005, (float)0.35989504, (float)0.36751594, (float)0.37511224,
-    (float)0.38268343, (float)0.39022901, (float)0.39774847, (float)0.40524131,
-    (float)0.41270703, (float)0.42014512, (float)0.42755509, (float)0.43493645,
-    (float)0.44228869, (float)0.44961133, (float)0.45690388, (float)0.46416584,
-    (float)0.47139674, (float)0.47859608, (float)0.48576339, (float)0.49289819,
-    (float)0.50000000, (float)0.50706834, (float)0.51410274, (float)0.52110274,
-    (float)0.52806785, (float)0.53499762, (float)0.54189158, (float)0.54874927,
-    (float)0.55557023, (float)0.56235401, (float)0.56910015, (float)0.57580819,
-    (float)0.58247770, (float)0.58910822, (float)0.59569930, (float)0.60225052,
-    (float)0.60876143, (float)0.61523159, (float)0.62166057, (float)0.62804795,
-    (float)0.63439328, (float)0.64069616, (float)0.64695615, (float)0.65317284,
-    (float)0.65934582, (float)0.66547466, (float)0.67155895, (float)0.67759830,
-    (float)0.68359230, (float)0.68954054, (float)0.69544264, (float)0.70129818,
-    (float)0.70710678, (float)0.71286806, (float)0.71858162, (float)0.72424708,
-    (float)0.72986407, (float)0.73543221, (float)0.74095113, (float)0.74642045,
-    (float)0.75183981, (float)0.75720885, (float)0.76252720, (float)0.76779452,
-    (float)0.77301045, (float)0.77817464, (float)0.78328675, (float)0.78834643,
-    (float)0.79335334, (float)0.79830715, (float)0.80320753, (float)0.80805415,
-    (float)0.81284668, (float)0.81758481, (float)0.82226822, (float)0.82689659,
-    (float)0.83146961, (float)0.83598698, (float)0.84044840, (float)0.84485357,
-    (float)0.84920218, (float)0.85349396, (float)0.85772861, (float)0.86190585,
-    (float)0.86602540, (float)0.87008699, (float)0.87409034, (float)0.87803519,
-    (float)0.88192126, (float)0.88574831, (float)0.88951608, (float)0.89322430,
-    (float)0.89687274, (float)0.90046115, (float)0.90398929, (float)0.90745693,
-    (float)0.91086382, (float)0.91420976, (float)0.91749450, (float)0.92071783,
-    (float)0.92387953, (float)0.92697940, (float)0.93001722, (float)0.93299280,
-    (float)0.93590593, (float)0.93875641, (float)0.94154407, (float)0.94426870,
-    (float)0.94693013, (float)0.94952818, (float)0.95206268, (float)0.95453345,
-    (float)0.95694034, (float)0.95928317, (float)0.96156180, (float)0.96377607,
-    (float)0.96592583, (float)0.96801094, (float)0.97003125, (float)0.97198664,
-    (float)0.97387698, (float)0.97570213, (float)0.97746197, (float)0.97915640,
-    (float)0.98078528, (float)0.98234852, (float)0.98384601, (float)0.98527764,
-    (float)0.98664333, (float)0.98794298, (float)0.98917651, (float)0.99034383,
-    (float)0.99144486, (float)0.99247953, (float)0.99344778, (float)0.99434953,
-    (float)0.99518473, (float)0.99595331, (float)0.99665524, (float)0.99729046,
-    (float)0.99785892, (float)0.99836060, (float)0.99879546, (float)0.99916346,
-    (float)0.99946459, (float)0.99969882, (float)0.99986614, (float)0.99996653,
-    (float)1.00000000, (float)1.00000000, (float)1.00000000, (float)1.00000000,
-    (float)1.00000000, (float)1.00000000, (float)1.00000000, (float)1.00000000,
-    (float)1.00000000, (float)1.00000000, (float)1.00000000, (float)1.00000000,
-    (float)1.00000000, (float)1.00000000, (float)1.00000000, (float)1.00000000,
-    (float)1.00000000, (float)1.00000000, (float)1.00000000, (float)1.00000000,
-    (float)1.00000000, (float)1.00000000, (float)1.00000000, (float)1.00000000,
-    (float)1.00000000, (float)1.00000000, (float)1.00000000, (float)1.00000000,
-    (float)1.00000000, (float)1.00000000, (float)1.00000000, (float)1.00000000,
-    (float)1.00000000, (float)1.00000000, (float)1.00000000, (float)1.00000000,
-    (float)1.00000000, (float)1.00000000, (float)1.00000000, (float)1.00000000,
-    (float)1.00000000, (float)1.00000000, (float)1.00000000, (float)1.00000000,
-    (float)1.00000000, (float)1.00000000, (float)1.00000000, (float)1.00000000,
-    (float)1.00000000, (float)1.00000000, (float)1.00000000, (float)1.00000000,
-    (float)1.00000000, (float)1.00000000, (float)1.00000000, (float)1.00000000,
-    (float)1.00000000, (float)1.00000000, (float)1.00000000, (float)1.00000000,
-    (float)1.00000000, (float)1.00000000, (float)1.00000000, (float)1.00000000,
-    (float)1.00000000, (float)1.00000000, (float)1.00000000, (float)1.00000000,
-    (float)1.00000000, (float)1.00000000, (float)1.00000000, (float)1.00000000,
-    (float)1.00000000, (float)1.00000000, (float)1.00000000, (float)1.00000000,
-    (float)1.00000000, (float)1.00000000, (float)1.00000000, (float)1.00000000,
-    (float)1.00000000, (float)1.00000000, (float)1.00000000, (float)1.00000000,
-    (float)1.00000000, (float)1.00000000, (float)1.00000000, (float)1.00000000,
-    (float)1.00000000, (float)1.00000000, (float)1.00000000, (float)1.00000000,
-    (float)1.00000000, (float)1.00000000, (float)1.00000000, (float)1.00000000,
-    (float)1.00000000, (float)1.00000000, (float)1.00000000, (float)1.00000000,
-    (float)1.00000000, (float)1.00000000, (float)1.00000000, (float)1.00000000,
-    (float)1.00000000, (float)1.00000000, (float)1.00000000, (float)1.00000000,
-    (float)1.00000000, (float)1.00000000, (float)1.00000000, (float)1.00000000,
-    (float)1.00000000, (float)1.00000000, (float)1.00000000, (float)1.00000000,
-    (float)1.00000000, (float)1.00000000, (float)1.00000000, (float)1.00000000,
-    (float)1.00000000, (float)1.00000000, (float)1.00000000, (float)1.00000000,
-    (float)1.00000000, (float)1.00000000, (float)1.00000000, (float)1.00000000,
-    (float)1.00000000, (float)0.99996653, (float)0.99986614, (float)0.99969882,
-    (float)0.99946459, (float)0.99916346, (float)0.99879546, (float)0.99836060,
-    (float)0.99785892, (float)0.99729046, (float)0.99665524, (float)0.99595331,
-    (float)0.99518473, (float)0.99434953, (float)0.99344778, (float)0.99247953,
-    (float)0.99144486, (float)0.99034383, (float)0.98917651, (float)0.98794298,
-    (float)0.98664333, (float)0.98527764, (float)0.98384601, (float)0.98234852,
-    (float)0.98078528, (float)0.97915640, (float)0.97746197, (float)0.97570213,
-    (float)0.97387698, (float)0.97198664, (float)0.97003125, (float)0.96801094,
-    (float)0.96592583, (float)0.96377607, (float)0.96156180, (float)0.95928317,
-    (float)0.95694034, (float)0.95453345, (float)0.95206268, (float)0.94952818,
-    (float)0.94693013, (float)0.94426870, (float)0.94154407, (float)0.93875641,
-    (float)0.93590593, (float)0.93299280, (float)0.93001722, (float)0.92697940,
-    (float)0.92387953, (float)0.92071783, (float)0.91749450, (float)0.91420976,
-    (float)0.91086382, (float)0.90745693, (float)0.90398929, (float)0.90046115,
-    (float)0.89687274, (float)0.89322430, (float)0.88951608, (float)0.88574831,
-    (float)0.88192126, (float)0.87803519, (float)0.87409034, (float)0.87008699,
-    (float)0.86602540, (float)0.86190585, (float)0.85772861, (float)0.85349396,
-    (float)0.84920218, (float)0.84485357, (float)0.84044840, (float)0.83598698,
-    (float)0.83146961, (float)0.82689659, (float)0.82226822, (float)0.81758481,
-    (float)0.81284668, (float)0.80805415, (float)0.80320753, (float)0.79830715,
-    (float)0.79335334, (float)0.78834643, (float)0.78328675, (float)0.77817464,
-    (float)0.77301045, (float)0.76779452, (float)0.76252720, (float)0.75720885,
-    (float)0.75183981, (float)0.74642045, (float)0.74095113, (float)0.73543221,
-    (float)0.72986407, (float)0.72424708, (float)0.71858162, (float)0.71286806,
-    (float)0.70710678, (float)0.70129818, (float)0.69544264, (float)0.68954054,
-    (float)0.68359230, (float)0.67759830, (float)0.67155895, (float)0.66547466,
-    (float)0.65934582, (float)0.65317284, (float)0.64695615, (float)0.64069616,
-    (float)0.63439328, (float)0.62804795, (float)0.62166057, (float)0.61523159,
-    (float)0.60876143, (float)0.60225052, (float)0.59569930, (float)0.58910822,
-    (float)0.58247770, (float)0.57580819, (float)0.56910015, (float)0.56235401,
-    (float)0.55557023, (float)0.54874927, (float)0.54189158, (float)0.53499762,
-    (float)0.52806785, (float)0.52110274, (float)0.51410274, (float)0.50706834,
-    (float)0.50000000, (float)0.49289819, (float)0.48576339, (float)0.47859608,
-    (float)0.47139674, (float)0.46416584, (float)0.45690388, (float)0.44961133,
-    (float)0.44228869, (float)0.43493645, (float)0.42755509, (float)0.42014512,
-    (float)0.41270703, (float)0.40524131, (float)0.39774847, (float)0.39022901,
-    (float)0.38268343, (float)0.37511224, (float)0.36751594, (float)0.35989504,
-    (float)0.35225005, (float)0.34458148, (float)0.33688985, (float)0.32917568,
-    (float)0.32143947, (float)0.31368174, (float)0.30590302, (float)0.29810383,
-    (float)0.29028468, (float)0.28244610, (float)0.27458862, (float)0.26671276,
-    (float)0.25881905, (float)0.25090801, (float)0.24298018, (float)0.23503609,
-    (float)0.22707626, (float)0.21910124, (float)0.21111155, (float)0.20310773,
-    (float)0.19509032, (float)0.18705985, (float)0.17901686, (float)0.17096189,
-    (float)0.16289547, (float)0.15481816, (float)0.14673047, (float)0.13863297,
-    (float)0.13052619, (float)0.12241068, (float)0.11428696, (float)0.10615561,
-    (float)0.09801714, (float)0.08987211, (float)0.08172107, (float)0.07356456,
-    (float)0.06540313, (float)0.05723732, (float)0.04906767, (float)0.04089475,
-    (float)0.03271908, (float)0.02454123, (float)0.01636173, (float)0.00818114};
-
-// Hanning window: for 15ms at 16kHz with symmetric zeros
-static const float kBlocks240w512[512] = {
-    (float)0.00000000, (float)0.00000000, (float)0.00000000, (float)0.00000000,
-    (float)0.00000000, (float)0.00000000, (float)0.00000000, (float)0.00000000,
-    (float)0.00000000, (float)0.00000000, (float)0.00000000, (float)0.00000000,
-    (float)0.00000000, (float)0.00000000, (float)0.00000000, (float)0.00000000,
-    (float)0.00000000, (float)0.00654494, (float)0.01308960, (float)0.01963369,
-    (float)0.02617695, (float)0.03271908, (float)0.03925982, (float)0.04579887,
-    (float)0.05233596, (float)0.05887080, (float)0.06540313, (float)0.07193266,
-    (float)0.07845910, (float)0.08498218, (float)0.09150162, (float)0.09801714,
-    (float)0.10452846, (float)0.11103531, (float)0.11753740, (float)0.12403446,
-    (float)0.13052620, (float)0.13701233, (float)0.14349262, (float)0.14996676,
-    (float)0.15643448, (float)0.16289547, (float)0.16934951, (float)0.17579629,
-    (float)0.18223552, (float)0.18866697, (float)0.19509032, (float)0.20150533,
-    (float)0.20791170, (float)0.21430916, (float)0.22069745, (float)0.22707628,
-    (float)0.23344538, (float)0.23980446, (float)0.24615330, (float)0.25249159,
-    (float)0.25881904, (float)0.26513544, (float)0.27144045, (float)0.27773386,
-    (float)0.28401536, (float)0.29028466, (float)0.29654160, (float)0.30278578,
-    (float)0.30901700, (float)0.31523499, (float)0.32143945, (float)0.32763019,
-    (float)0.33380687, (float)0.33996925, (float)0.34611708, (float)0.35225007,
-    (float)0.35836795, (float)0.36447051, (float)0.37055743, (float)0.37662852,
-    (float)0.38268346, (float)0.38872197, (float)0.39474389, (float)0.40074885,
-    (float)0.40673664, (float)0.41270703, (float)0.41865975, (float)0.42459452,
-    (float)0.43051112, (float)0.43640924, (float)0.44228873, (float)0.44814920,
-    (float)0.45399052, (float)0.45981237, (float)0.46561453, (float)0.47139674,
-    (float)0.47715878, (float)0.48290035, (float)0.48862126, (float)0.49432120,
-    (float)0.50000000, (float)0.50565743, (float)0.51129311, (float)0.51690692,
-    (float)0.52249855, (float)0.52806789, (float)0.53361452, (float)0.53913832,
-    (float)0.54463905, (float)0.55011642, (float)0.55557024, (float)0.56100029,
-    (float)0.56640625, (float)0.57178795, (float)0.57714522, (float)0.58247769,
-    (float)0.58778524, (float)0.59306765, (float)0.59832460, (float)0.60355598,
-    (float)0.60876143, (float)0.61394083, (float)0.61909395, (float)0.62422055,
-    (float)0.62932038, (float)0.63439333, (float)0.63943899, (float)0.64445734,
-    (float)0.64944810, (float)0.65441096, (float)0.65934587, (float)0.66425246,
-    (float)0.66913062, (float)0.67398012, (float)0.67880076, (float)0.68359232,
-    (float)0.68835455, (float)0.69308740, (float)0.69779050, (float)0.70246369,
-    (float)0.70710677, (float)0.71171963, (float)0.71630198, (float)0.72085363,
-    (float)0.72537440, (float)0.72986406, (float)0.73432255, (float)0.73874950,
-    (float)0.74314487, (float)0.74750835, (float)0.75183982, (float)0.75613910,
-    (float)0.76040596, (float)0.76464027, (float)0.76884186, (float)0.77301043,
-    (float)0.77714598, (float)0.78124821, (float)0.78531694, (float)0.78935206,
-    (float)0.79335338, (float)0.79732066, (float)0.80125386, (float)0.80515265,
-    (float)0.80901700, (float)0.81284672, (float)0.81664157, (float)0.82040149,
-    (float)0.82412618, (float)0.82781565, (float)0.83146966, (float)0.83508795,
-    (float)0.83867061, (float)0.84221727, (float)0.84572780, (float)0.84920216,
-    (float)0.85264021, (float)0.85604161, (float)0.85940641, (float)0.86273444,
-    (float)0.86602545, (float)0.86927933, (float)0.87249607, (float)0.87567532,
-    (float)0.87881714, (float)0.88192129, (float)0.88498765, (float)0.88801610,
-    (float)0.89100653, (float)0.89395881, (float)0.89687276, (float)0.89974827,
-    (float)0.90258533, (float)0.90538365, (float)0.90814316, (float)0.91086388,
-    (float)0.91354549, (float)0.91618794, (float)0.91879123, (float)0.92135513,
-    (float)0.92387950, (float)0.92636442, (float)0.92880958, (float)0.93121493,
-    (float)0.93358046, (float)0.93590593, (float)0.93819135, (float)0.94043654,
-    (float)0.94264150, (float)0.94480604, (float)0.94693011, (float)0.94901365,
-    (float)0.95105654, (float)0.95305866, (float)0.95501995, (float)0.95694035,
-    (float)0.95881975, (float)0.96065807, (float)0.96245527, (float)0.96421117,
-    (float)0.96592581, (float)0.96759909, (float)0.96923089, (float)0.97082120,
-    (float)0.97236991, (float)0.97387701, (float)0.97534233, (float)0.97676587,
-    (float)0.97814763, (float)0.97948742, (float)0.98078531, (float)0.98204112,
-    (float)0.98325491, (float)0.98442656, (float)0.98555607, (float)0.98664331,
-    (float)0.98768836, (float)0.98869103, (float)0.98965138, (float)0.99056935,
-    (float)0.99144489, (float)0.99227792, (float)0.99306846, (float)0.99381649,
-    (float)0.99452192, (float)0.99518472, (float)0.99580491, (float)0.99638247,
-    (float)0.99691731, (float)0.99740952, (float)0.99785894, (float)0.99826562,
-    (float)0.99862951, (float)0.99895066, (float)0.99922901, (float)0.99946457,
-    (float)0.99965733, (float)0.99980724, (float)0.99991435, (float)0.99997860,
-    (float)1.00000000, (float)0.99997860, (float)0.99991435, (float)0.99980724,
-    (float)0.99965733, (float)0.99946457, (float)0.99922901, (float)0.99895066,
-    (float)0.99862951, (float)0.99826562, (float)0.99785894, (float)0.99740946,
-    (float)0.99691731, (float)0.99638247, (float)0.99580491, (float)0.99518472,
-    (float)0.99452192, (float)0.99381644, (float)0.99306846, (float)0.99227792,
-    (float)0.99144489, (float)0.99056935, (float)0.98965138, (float)0.98869103,
-    (float)0.98768836, (float)0.98664331, (float)0.98555607, (float)0.98442656,
-    (float)0.98325491, (float)0.98204112, (float)0.98078525, (float)0.97948742,
-    (float)0.97814757, (float)0.97676587, (float)0.97534227, (float)0.97387695,
-    (float)0.97236991, (float)0.97082120, (float)0.96923089, (float)0.96759909,
-    (float)0.96592581, (float)0.96421117, (float)0.96245521, (float)0.96065807,
-    (float)0.95881969, (float)0.95694029, (float)0.95501995, (float)0.95305860,
-    (float)0.95105648, (float)0.94901365, (float)0.94693011, (float)0.94480604,
-    (float)0.94264150, (float)0.94043654, (float)0.93819129, (float)0.93590593,
-    (float)0.93358046, (float)0.93121493, (float)0.92880952, (float)0.92636436,
-    (float)0.92387950, (float)0.92135507, (float)0.91879123, (float)0.91618794,
-    (float)0.91354543, (float)0.91086382, (float)0.90814310, (float)0.90538365,
-    (float)0.90258527, (float)0.89974827, (float)0.89687276, (float)0.89395875,
-    (float)0.89100647, (float)0.88801610, (float)0.88498759, (float)0.88192123,
-    (float)0.87881714, (float)0.87567532, (float)0.87249595, (float)0.86927933,
-    (float)0.86602539, (float)0.86273432, (float)0.85940641, (float)0.85604161,
-    (float)0.85264009, (float)0.84920216, (float)0.84572780, (float)0.84221715,
-    (float)0.83867055, (float)0.83508795, (float)0.83146954, (float)0.82781565,
-    (float)0.82412612, (float)0.82040137, (float)0.81664157, (float)0.81284660,
-    (float)0.80901700, (float)0.80515265, (float)0.80125374, (float)0.79732066,
-    (float)0.79335332, (float)0.78935200, (float)0.78531694, (float)0.78124815,
-    (float)0.77714586, (float)0.77301049, (float)0.76884180, (float)0.76464021,
-    (float)0.76040596, (float)0.75613904, (float)0.75183970, (float)0.74750835,
-    (float)0.74314481, (float)0.73874938, (float)0.73432249, (float)0.72986400,
-    (float)0.72537428, (float)0.72085363, (float)0.71630186, (float)0.71171951,
-    (float)0.70710677, (float)0.70246363, (float)0.69779032, (float)0.69308734,
-    (float)0.68835449, (float)0.68359220, (float)0.67880070, (float)0.67398006,
-    (float)0.66913044, (float)0.66425240, (float)0.65934575, (float)0.65441096,
-    (float)0.64944804, (float)0.64445722, (float)0.63943905, (float)0.63439327,
-    (float)0.62932026, (float)0.62422055, (float)0.61909389, (float)0.61394072,
-    (float)0.60876143, (float)0.60355592, (float)0.59832448, (float)0.59306765,
-    (float)0.58778518, (float)0.58247757, (float)0.57714522, (float)0.57178789,
-    (float)0.56640613, (float)0.56100023, (float)0.55557019, (float)0.55011630,
-    (float)0.54463905, (float)0.53913826, (float)0.53361434, (float)0.52806783,
-    (float)0.52249849, (float)0.51690674, (float)0.51129305, (float)0.50565726,
-    (float)0.50000006, (float)0.49432117, (float)0.48862115, (float)0.48290038,
-    (float)0.47715873, (float)0.47139663, (float)0.46561456, (float)0.45981231,
-    (float)0.45399037, (float)0.44814920, (float)0.44228864, (float)0.43640912,
-    (float)0.43051112, (float)0.42459446, (float)0.41865960, (float)0.41270703,
-    (float)0.40673658, (float)0.40074870, (float)0.39474386, (float)0.38872188,
-    (float)0.38268328, (float)0.37662849, (float)0.37055734, (float)0.36447033,
-    (float)0.35836792, (float)0.35224995, (float)0.34611690, (float)0.33996922,
-    (float)0.33380675, (float)0.32763001, (float)0.32143945, (float)0.31523487,
-    (float)0.30901679, (float)0.30278572, (float)0.29654145, (float)0.29028472,
-    (float)0.28401530, (float)0.27773371, (float)0.27144048, (float)0.26513538,
-    (float)0.25881892, (float)0.25249159, (float)0.24615324, (float)0.23980433,
-    (float)0.23344538, (float)0.22707619, (float)0.22069728, (float)0.21430916,
-    (float)0.20791161, (float)0.20150517, (float)0.19509031, (float)0.18866688,
-    (float)0.18223536, (float)0.17579627, (float)0.16934940, (float)0.16289529,
-    (float)0.15643445, (float)0.14996666, (float)0.14349243, (float)0.13701232,
-    (float)0.13052608, (float)0.12403426, (float)0.11753736, (float)0.11103519,
-    (float)0.10452849, (float)0.09801710, (float)0.09150149, (float)0.08498220,
-    (float)0.07845904, (float)0.07193252, (float)0.06540315, (float)0.05887074,
-    (float)0.05233581, (float)0.04579888, (float)0.03925974, (float)0.03271893,
-    (float)0.02617695, (float)0.01963361, (float)0.01308943, (float)0.00654493,
-    (float)0.00000000, (float)0.00000000, (float)0.00000000, (float)0.00000000,
-    (float)0.00000000, (float)0.00000000, (float)0.00000000, (float)0.00000000,
-    (float)0.00000000, (float)0.00000000, (float)0.00000000, (float)0.00000000,
-    (float)0.00000000, (float)0.00000000, (float)0.00000000, (float)0.00000000};
-
-// Hanning window: for 30ms with 1024 fft with symmetric zeros at 16kHz
-static const float kBlocks480w1024[1024] = {
-    (float)0.00000000, (float)0.00000000, (float)0.00000000, (float)0.00000000,
-    (float)0.00000000, (float)0.00000000, (float)0.00000000, (float)0.00000000,
-    (float)0.00000000, (float)0.00000000, (float)0.00000000, (float)0.00000000,
-    (float)0.00000000, (float)0.00000000, (float)0.00000000, (float)0.00000000,
-    (float)0.00000000, (float)0.00000000, (float)0.00000000, (float)0.00000000,
-    (float)0.00000000, (float)0.00000000, (float)0.00000000, (float)0.00000000,
-    (float)0.00000000, (float)0.00000000, (float)0.00000000, (float)0.00000000,
-    (float)0.00000000, (float)0.00000000, (float)0.00000000, (float)0.00000000,
-    (float)0.00000000, (float)0.00327249, (float)0.00654494, (float)0.00981732,
-    (float)0.01308960, (float)0.01636173, (float)0.01963369, (float)0.02290544,
-    (float)0.02617695, (float)0.02944817, (float)0.03271908, (float)0.03598964,
-    (float)0.03925982, (float)0.04252957, (float)0.04579887, (float)0.04906768,
-    (float)0.05233596, (float)0.05560368, (float)0.05887080, (float)0.06213730,
-    (float)0.06540313, (float)0.06866825, (float)0.07193266, (float)0.07519628,
-    (float)0.07845910, (float)0.08172107, (float)0.08498218, (float)0.08824237,
-    (float)0.09150162, (float)0.09475989, (float)0.09801714, (float)0.10127335,
-    (float)0.10452846, (float)0.10778246, (float)0.11103531, (float)0.11428697,
-    (float)0.11753740, (float)0.12078657, (float)0.12403446, (float)0.12728101,
-    (float)0.13052620, (float)0.13376999, (float)0.13701233, (float)0.14025325,
-    (float)0.14349262, (float)0.14673047, (float)0.14996676, (float)0.15320145,
-    (float)0.15643448, (float)0.15966582, (float)0.16289547, (float)0.16612339,
-    (float)0.16934951, (float)0.17257382, (float)0.17579629, (float)0.17901687,
-    (float)0.18223552, (float)0.18545224, (float)0.18866697, (float)0.19187967,
-    (float)0.19509032, (float)0.19829889, (float)0.20150533, (float)0.20470962,
-    (float)0.20791170, (float)0.21111156, (float)0.21430916, (float)0.21750447,
-    (float)0.22069745, (float)0.22388805, (float)0.22707628, (float)0.23026206,
-    (float)0.23344538, (float)0.23662618, (float)0.23980446, (float)0.24298020,
-    (float)0.24615330, (float)0.24932377, (float)0.25249159, (float)0.25565669,
-    (float)0.25881904, (float)0.26197866, (float)0.26513544, (float)0.26828939,
-    (float)0.27144045, (float)0.27458861, (float)0.27773386, (float)0.28087610,
-    (float)0.28401536, (float)0.28715158, (float)0.29028466, (float)0.29341471,
-    (float)0.29654160, (float)0.29966527, (float)0.30278578, (float)0.30590302,
-    (float)0.30901700, (float)0.31212768, (float)0.31523499, (float)0.31833893,
-    (float)0.32143945, (float)0.32453656, (float)0.32763019, (float)0.33072028,
-    (float)0.33380687, (float)0.33688986, (float)0.33996925, (float)0.34304500,
-    (float)0.34611708, (float)0.34918544, (float)0.35225007, (float)0.35531089,
-    (float)0.35836795, (float)0.36142117, (float)0.36447051, (float)0.36751595,
-    (float)0.37055743, (float)0.37359497, (float)0.37662852, (float)0.37965801,
-    (float)0.38268346, (float)0.38570479, (float)0.38872197, (float)0.39173502,
-    (float)0.39474389, (float)0.39774847, (float)0.40074885, (float)0.40374491,
-    (float)0.40673664, (float)0.40972406, (float)0.41270703, (float)0.41568562,
-    (float)0.41865975, (float)0.42162940, (float)0.42459452, (float)0.42755508,
-    (float)0.43051112, (float)0.43346250, (float)0.43640924, (float)0.43935132,
-    (float)0.44228873, (float)0.44522133, (float)0.44814920, (float)0.45107228,
-    (float)0.45399052, (float)0.45690390, (float)0.45981237, (float)0.46271592,
-    (float)0.46561453, (float)0.46850815, (float)0.47139674, (float)0.47428030,
-    (float)0.47715878, (float)0.48003215, (float)0.48290035, (float)0.48576337,
-    (float)0.48862126, (float)0.49147385, (float)0.49432120, (float)0.49716330,
-    (float)0.50000000, (float)0.50283140, (float)0.50565743, (float)0.50847799,
-    (float)0.51129311, (float)0.51410276, (float)0.51690692, (float)0.51970553,
-    (float)0.52249855, (float)0.52528602, (float)0.52806789, (float)0.53084403,
-    (float)0.53361452, (float)0.53637928, (float)0.53913832, (float)0.54189163,
-    (float)0.54463905, (float)0.54738063, (float)0.55011642, (float)0.55284631,
-    (float)0.55557024, (float)0.55828828, (float)0.56100029, (float)0.56370628,
-    (float)0.56640625, (float)0.56910014, (float)0.57178795, (float)0.57446963,
-    (float)0.57714522, (float)0.57981455, (float)0.58247769, (float)0.58513463,
-    (float)0.58778524, (float)0.59042960, (float)0.59306765, (float)0.59569931,
-    (float)0.59832460, (float)0.60094351, (float)0.60355598, (float)0.60616195,
-    (float)0.60876143, (float)0.61135441, (float)0.61394083, (float)0.61652070,
-    (float)0.61909395, (float)0.62166059, (float)0.62422055, (float)0.62677383,
-    (float)0.62932038, (float)0.63186020, (float)0.63439333, (float)0.63691956,
-    (float)0.63943899, (float)0.64195162, (float)0.64445734, (float)0.64695615,
-    (float)0.64944810, (float)0.65193301, (float)0.65441096, (float)0.65688187,
-    (float)0.65934587, (float)0.66180271, (float)0.66425246, (float)0.66669512,
-    (float)0.66913062, (float)0.67155898, (float)0.67398012, (float)0.67639405,
-    (float)0.67880076, (float)0.68120021, (float)0.68359232, (float)0.68597710,
-    (float)0.68835455, (float)0.69072467, (float)0.69308740, (float)0.69544262,
-    (float)0.69779050, (float)0.70013082, (float)0.70246369, (float)0.70478904,
-    (float)0.70710677, (float)0.70941699, (float)0.71171963, (float)0.71401459,
-    (float)0.71630198, (float)0.71858168, (float)0.72085363, (float)0.72311789,
-    (float)0.72537440, (float)0.72762316, (float)0.72986406, (float)0.73209721,
-    (float)0.73432255, (float)0.73653996, (float)0.73874950, (float)0.74095118,
-    (float)0.74314487, (float)0.74533057, (float)0.74750835, (float)0.74967808,
-    (float)0.75183982, (float)0.75399351, (float)0.75613910, (float)0.75827658,
-    (float)0.76040596, (float)0.76252723, (float)0.76464027, (float)0.76674515,
-    (float)0.76884186, (float)0.77093029, (float)0.77301043, (float)0.77508241,
-    (float)0.77714598, (float)0.77920127, (float)0.78124821, (float)0.78328675,
-    (float)0.78531694, (float)0.78733873, (float)0.78935206, (float)0.79135692,
-    (float)0.79335338, (float)0.79534125, (float)0.79732066, (float)0.79929149,
-    (float)0.80125386, (float)0.80320752, (float)0.80515265, (float)0.80708915,
-    (float)0.80901700, (float)0.81093621, (float)0.81284672, (float)0.81474853,
-    (float)0.81664157, (float)0.81852591, (float)0.82040149, (float)0.82226825,
-    (float)0.82412618, (float)0.82597536, (float)0.82781565, (float)0.82964706,
-    (float)0.83146966, (float)0.83328325, (float)0.83508795, (float)0.83688378,
-    (float)0.83867061, (float)0.84044838, (float)0.84221727, (float)0.84397703,
-    (float)0.84572780, (float)0.84746957, (float)0.84920216, (float)0.85092574,
-    (float)0.85264021, (float)0.85434544, (float)0.85604161, (float)0.85772866,
-    (float)0.85940641, (float)0.86107504, (float)0.86273444, (float)0.86438453,
-    (float)0.86602545, (float)0.86765707, (float)0.86927933, (float)0.87089235,
-    (float)0.87249607, (float)0.87409031, (float)0.87567532, (float)0.87725097,
-    (float)0.87881714, (float)0.88037390, (float)0.88192129, (float)0.88345921,
-    (float)0.88498765, (float)0.88650668, (float)0.88801610, (float)0.88951612,
-    (float)0.89100653, (float)0.89248741, (float)0.89395881, (float)0.89542055,
-    (float)0.89687276, (float)0.89831537, (float)0.89974827, (float)0.90117162,
-    (float)0.90258533, (float)0.90398932, (float)0.90538365, (float)0.90676826,
-    (float)0.90814316, (float)0.90950841, (float)0.91086388, (float)0.91220951,
-    (float)0.91354549, (float)0.91487163, (float)0.91618794, (float)0.91749454,
-    (float)0.91879123, (float)0.92007810, (float)0.92135513, (float)0.92262226,
-    (float)0.92387950, (float)0.92512691, (float)0.92636442, (float)0.92759192,
-    (float)0.92880958, (float)0.93001723, (float)0.93121493, (float)0.93240267,
-    (float)0.93358046, (float)0.93474817, (float)0.93590593, (float)0.93705362,
-    (float)0.93819135, (float)0.93931901, (float)0.94043654, (float)0.94154406,
-    (float)0.94264150, (float)0.94372880, (float)0.94480604, (float)0.94587320,
-    (float)0.94693011, (float)0.94797695, (float)0.94901365, (float)0.95004016,
-    (float)0.95105654, (float)0.95206273, (float)0.95305866, (float)0.95404440,
-    (float)0.95501995, (float)0.95598525, (float)0.95694035, (float)0.95788521,
-    (float)0.95881975, (float)0.95974404, (float)0.96065807, (float)0.96156180,
-    (float)0.96245527, (float)0.96333838, (float)0.96421117, (float)0.96507370,
-    (float)0.96592581, (float)0.96676767, (float)0.96759909, (float)0.96842021,
-    (float)0.96923089, (float)0.97003126, (float)0.97082120, (float)0.97160077,
-    (float)0.97236991, (float)0.97312868, (float)0.97387701, (float)0.97461486,
-    (float)0.97534233, (float)0.97605932, (float)0.97676587, (float)0.97746199,
-    (float)0.97814763, (float)0.97882277, (float)0.97948742, (float)0.98014158,
-    (float)0.98078531, (float)0.98141843, (float)0.98204112, (float)0.98265332,
-    (float)0.98325491, (float)0.98384601, (float)0.98442656, (float)0.98499662,
-    (float)0.98555607, (float)0.98610497, (float)0.98664331, (float)0.98717111,
-    (float)0.98768836, (float)0.98819500, (float)0.98869103, (float)0.98917651,
-    (float)0.98965138, (float)0.99011570, (float)0.99056935, (float)0.99101239,
-    (float)0.99144489, (float)0.99186671, (float)0.99227792, (float)0.99267852,
-    (float)0.99306846, (float)0.99344778, (float)0.99381649, (float)0.99417448,
-    (float)0.99452192, (float)0.99485862, (float)0.99518472, (float)0.99550015,
-    (float)0.99580491, (float)0.99609905, (float)0.99638247, (float)0.99665523,
-    (float)0.99691731, (float)0.99716878, (float)0.99740952, (float)0.99763954,
-    (float)0.99785894, (float)0.99806762, (float)0.99826562, (float)0.99845290,
-    (float)0.99862951, (float)0.99879545, (float)0.99895066, (float)0.99909520,
-    (float)0.99922901, (float)0.99935216, (float)0.99946457, (float)0.99956632,
-    (float)0.99965733, (float)0.99973762, (float)0.99980724, (float)0.99986613,
-    (float)0.99991435, (float)0.99995178, (float)0.99997860, (float)0.99999464,
-    (float)1.00000000, (float)0.99999464, (float)0.99997860, (float)0.99995178,
-    (float)0.99991435, (float)0.99986613, (float)0.99980724, (float)0.99973762,
-    (float)0.99965733, (float)0.99956632, (float)0.99946457, (float)0.99935216,
-    (float)0.99922901, (float)0.99909520, (float)0.99895066, (float)0.99879545,
-    (float)0.99862951, (float)0.99845290, (float)0.99826562, (float)0.99806762,
-    (float)0.99785894, (float)0.99763954, (float)0.99740946, (float)0.99716872,
-    (float)0.99691731, (float)0.99665523, (float)0.99638247, (float)0.99609905,
-    (float)0.99580491, (float)0.99550015, (float)0.99518472, (float)0.99485862,
-    (float)0.99452192, (float)0.99417448, (float)0.99381644, (float)0.99344778,
-    (float)0.99306846, (float)0.99267852, (float)0.99227792, (float)0.99186671,
-    (float)0.99144489, (float)0.99101239, (float)0.99056935, (float)0.99011564,
-    (float)0.98965138, (float)0.98917651, (float)0.98869103, (float)0.98819494,
-    (float)0.98768836, (float)0.98717111, (float)0.98664331, (float)0.98610497,
-    (float)0.98555607, (float)0.98499656, (float)0.98442656, (float)0.98384601,
-    (float)0.98325491, (float)0.98265326, (float)0.98204112, (float)0.98141843,
-    (float)0.98078525, (float)0.98014158, (float)0.97948742, (float)0.97882277,
-    (float)0.97814757, (float)0.97746193, (float)0.97676587, (float)0.97605932,
-    (float)0.97534227, (float)0.97461486, (float)0.97387695, (float)0.97312862,
-    (float)0.97236991, (float)0.97160077, (float)0.97082120, (float)0.97003126,
-    (float)0.96923089, (float)0.96842015, (float)0.96759909, (float)0.96676761,
-    (float)0.96592581, (float)0.96507365, (float)0.96421117, (float)0.96333838,
-    (float)0.96245521, (float)0.96156180, (float)0.96065807, (float)0.95974404,
-    (float)0.95881969, (float)0.95788515, (float)0.95694029, (float)0.95598525,
-    (float)0.95501995, (float)0.95404440, (float)0.95305860, (float)0.95206267,
-    (float)0.95105648, (float)0.95004016, (float)0.94901365, (float)0.94797695,
-    (float)0.94693011, (float)0.94587314, (float)0.94480604, (float)0.94372880,
-    (float)0.94264150, (float)0.94154406, (float)0.94043654, (float)0.93931895,
-    (float)0.93819129, (float)0.93705362, (float)0.93590593, (float)0.93474817,
-    (float)0.93358046, (float)0.93240267, (float)0.93121493, (float)0.93001723,
-    (float)0.92880952, (float)0.92759192, (float)0.92636436, (float)0.92512691,
-    (float)0.92387950, (float)0.92262226, (float)0.92135507, (float)0.92007804,
-    (float)0.91879123, (float)0.91749448, (float)0.91618794, (float)0.91487157,
-    (float)0.91354543, (float)0.91220951, (float)0.91086382, (float)0.90950835,
-    (float)0.90814310, (float)0.90676820, (float)0.90538365, (float)0.90398932,
-    (float)0.90258527, (float)0.90117157, (float)0.89974827, (float)0.89831525,
-    (float)0.89687276, (float)0.89542055, (float)0.89395875, (float)0.89248741,
-    (float)0.89100647, (float)0.88951600, (float)0.88801610, (float)0.88650662,
-    (float)0.88498759, (float)0.88345915, (float)0.88192123, (float)0.88037384,
-    (float)0.87881714, (float)0.87725091, (float)0.87567532, (float)0.87409031,
-    (float)0.87249595, (float)0.87089223, (float)0.86927933, (float)0.86765701,
-    (float)0.86602539, (float)0.86438447, (float)0.86273432, (float)0.86107504,
-    (float)0.85940641, (float)0.85772860, (float)0.85604161, (float)0.85434544,
-    (float)0.85264009, (float)0.85092574, (float)0.84920216, (float)0.84746951,
-    (float)0.84572780, (float)0.84397697, (float)0.84221715, (float)0.84044844,
-    (float)0.83867055, (float)0.83688372, (float)0.83508795, (float)0.83328319,
-    (float)0.83146954, (float)0.82964706, (float)0.82781565, (float)0.82597530,
-    (float)0.82412612, (float)0.82226813, (float)0.82040137, (float)0.81852591,
-    (float)0.81664157, (float)0.81474847, (float)0.81284660, (float)0.81093609,
-    (float)0.80901700, (float)0.80708915, (float)0.80515265, (float)0.80320752,
-    (float)0.80125374, (float)0.79929143, (float)0.79732066, (float)0.79534125,
-    (float)0.79335332, (float)0.79135686, (float)0.78935200, (float)0.78733861,
-    (float)0.78531694, (float)0.78328675, (float)0.78124815, (float)0.77920121,
-    (float)0.77714586, (float)0.77508223, (float)0.77301049, (float)0.77093029,
-    (float)0.76884180, (float)0.76674509, (float)0.76464021, (float)0.76252711,
-    (float)0.76040596, (float)0.75827658, (float)0.75613904, (float)0.75399339,
-    (float)0.75183970, (float)0.74967796, (float)0.74750835, (float)0.74533057,
-    (float)0.74314481, (float)0.74095106, (float)0.73874938, (float)0.73653996,
-    (float)0.73432249, (float)0.73209721, (float)0.72986400, (float)0.72762305,
-    (float)0.72537428, (float)0.72311789, (float)0.72085363, (float)0.71858162,
-    (float)0.71630186, (float)0.71401453, (float)0.71171951, (float)0.70941705,
-    (float)0.70710677, (float)0.70478898, (float)0.70246363, (float)0.70013070,
-    (float)0.69779032, (float)0.69544268, (float)0.69308734, (float)0.69072461,
-    (float)0.68835449, (float)0.68597704, (float)0.68359220, (float)0.68120021,
-    (float)0.67880070, (float)0.67639399, (float)0.67398006, (float)0.67155886,
-    (float)0.66913044, (float)0.66669512, (float)0.66425240, (float)0.66180259,
-    (float)0.65934575, (float)0.65688181, (float)0.65441096, (float)0.65193301,
-    (float)0.64944804, (float)0.64695609, (float)0.64445722, (float)0.64195150,
-    (float)0.63943905, (float)0.63691956, (float)0.63439327, (float)0.63186014,
-    (float)0.62932026, (float)0.62677372, (float)0.62422055, (float)0.62166059,
-    (float)0.61909389, (float)0.61652064, (float)0.61394072, (float)0.61135429,
-    (float)0.60876143, (float)0.60616189, (float)0.60355592, (float)0.60094339,
-    (float)0.59832448, (float)0.59569913, (float)0.59306765, (float)0.59042960,
-    (float)0.58778518, (float)0.58513451, (float)0.58247757, (float)0.57981461,
-    (float)0.57714522, (float)0.57446963, (float)0.57178789, (float)0.56910002,
-    (float)0.56640613, (float)0.56370628, (float)0.56100023, (float)0.55828822,
-    (float)0.55557019, (float)0.55284619, (float)0.55011630, (float)0.54738069,
-    (float)0.54463905, (float)0.54189152, (float)0.53913826, (float)0.53637916,
-    (float)0.53361434, (float)0.53084403, (float)0.52806783, (float)0.52528596,
-    (float)0.52249849, (float)0.51970541, (float)0.51690674, (float)0.51410276,
-    (float)0.51129305, (float)0.50847787, (float)0.50565726, (float)0.50283122,
-    (float)0.50000006, (float)0.49716327, (float)0.49432117, (float)0.49147379,
-    (float)0.48862115, (float)0.48576325, (float)0.48290038, (float)0.48003212,
-    (float)0.47715873, (float)0.47428021, (float)0.47139663, (float)0.46850798,
-    (float)0.46561456, (float)0.46271589, (float)0.45981231, (float)0.45690379,
-    (float)0.45399037, (float)0.45107210, (float)0.44814920, (float)0.44522130,
-    (float)0.44228864, (float)0.43935123, (float)0.43640912, (float)0.43346232,
-    (float)0.43051112, (float)0.42755505, (float)0.42459446, (float)0.42162928,
-    (float)0.41865960, (float)0.41568545, (float)0.41270703, (float)0.40972400,
-    (float)0.40673658, (float)0.40374479, (float)0.40074870, (float)0.39774850,
-    (float)0.39474386, (float)0.39173496, (float)0.38872188, (float)0.38570464,
-    (float)0.38268328, (float)0.37965804, (float)0.37662849, (float)0.37359491,
-    (float)0.37055734, (float)0.36751580, (float)0.36447033, (float)0.36142117,
-    (float)0.35836792, (float)0.35531086, (float)0.35224995, (float)0.34918529,
-    (float)0.34611690, (float)0.34304500, (float)0.33996922, (float)0.33688980,
-    (float)0.33380675, (float)0.33072016, (float)0.32763001, (float)0.32453656,
-    (float)0.32143945, (float)0.31833887, (float)0.31523487, (float)0.31212750,
-    (float)0.30901679, (float)0.30590302, (float)0.30278572, (float)0.29966521,
-    (float)0.29654145, (float)0.29341453, (float)0.29028472, (float)0.28715155,
-    (float)0.28401530, (float)0.28087601, (float)0.27773371, (float)0.27458847,
-    (float)0.27144048, (float)0.26828936, (float)0.26513538, (float)0.26197854,
-    (float)0.25881892, (float)0.25565651, (float)0.25249159, (float)0.24932374,
-    (float)0.24615324, (float)0.24298008, (float)0.23980433, (float)0.23662600,
-    (float)0.23344538, (float)0.23026201, (float)0.22707619, (float)0.22388794,
-    (float)0.22069728, (float)0.21750426, (float)0.21430916, (float)0.21111152,
-    (float)0.20791161, (float)0.20470949, (float)0.20150517, (float)0.19829892,
-    (float)0.19509031, (float)0.19187963, (float)0.18866688, (float)0.18545210,
-    (float)0.18223536, (float)0.17901689, (float)0.17579627, (float)0.17257376,
-    (float)0.16934940, (float)0.16612324, (float)0.16289529, (float)0.15966584,
-    (float)0.15643445, (float)0.15320137, (float)0.14996666, (float)0.14673033,
-    (float)0.14349243, (float)0.14025325, (float)0.13701232, (float)0.13376991,
-    (float)0.13052608, (float)0.12728085, (float)0.12403426, (float)0.12078657,
-    (float)0.11753736, (float)0.11428688, (float)0.11103519, (float)0.10778230,
-    (float)0.10452849, (float)0.10127334, (float)0.09801710, (float)0.09475980,
-    (float)0.09150149, (float)0.08824220, (float)0.08498220, (float)0.08172106,
-    (float)0.07845904, (float)0.07519618, (float)0.07193252, (float)0.06866808,
-    (float)0.06540315, (float)0.06213728, (float)0.05887074, (float)0.05560357,
-    (float)0.05233581, (float)0.04906749, (float)0.04579888, (float)0.04252954,
-    (float)0.03925974, (float)0.03598953, (float)0.03271893, (float)0.02944798,
-    (float)0.02617695, (float)0.02290541, (float)0.01963361, (float)0.01636161,
-    (float)0.01308943, (float)0.00981712, (float)0.00654493, (float)0.00327244,
-    (float)0.00000000, (float)0.00000000, (float)0.00000000, (float)0.00000000,
-    (float)0.00000000, (float)0.00000000, (float)0.00000000, (float)0.00000000,
-    (float)0.00000000, (float)0.00000000, (float)0.00000000, (float)0.00000000,
-    (float)0.00000000, (float)0.00000000, (float)0.00000000, (float)0.00000000,
-    (float)0.00000000, (float)0.00000000, (float)0.00000000, (float)0.00000000,
-    (float)0.00000000, (float)0.00000000, (float)0.00000000, (float)0.00000000,
-    (float)0.00000000, (float)0.00000000, (float)0.00000000, (float)0.00000000,
-    (float)0.00000000, (float)0.00000000, (float)0.00000000, (float)0.00000000};
-
-#endif  // MODULES_AUDIO_PROCESSING_NS_MAIN_SOURCE_WINDOWS_PRIVATE_H_
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/render_queue_item_verifier.h b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/render_queue_item_verifier.h
deleted file mode 100644
index b8aff4a107..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/render_queue_item_verifier.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- *  Copyright (c) 2016 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#ifndef MODULES_AUDIO_PROCESSING_RENDER_QUEUE_ITEM_VERIFIER_H_
-#define MODULES_AUDIO_PROCESSING_RENDER_QUEUE_ITEM_VERIFIER_H_
-
-#include <vector>
-
-namespace webrtc {
-
-// Functor to use when supplying a verifier function for the queue item
-// verifcation.
-template <typename T>
-class RenderQueueItemVerifier {
- public:
-  explicit RenderQueueItemVerifier(size_t minimum_capacity)
-      : minimum_capacity_(minimum_capacity) {}
-
-  bool operator()(const std::vector<T>& v) const {
-    return v.capacity() >= minimum_capacity_;
-  }
-
- private:
-  size_t minimum_capacity_;
-};
-
-}  // namespace webrtc
-
-#endif  // MODULES_AUDIO_PROCESSING_RENDER_QUEUE_ITEM_VERIFIER_H__
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/residual_echo_detector.cc b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/residual_echo_detector.cc
deleted file mode 100644
index 3454214fd7..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/residual_echo_detector.cc
+++ /dev/null
@@ -1,215 +0,0 @@
-/*
- *  Copyright (c) 2016 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#include "modules/audio_processing/residual_echo_detector.h"
-
-#include <algorithm>
-#include <numeric>
-
-#include "absl/types/optional.h"
-#include "modules/audio_processing/audio_buffer.h"
-#include "modules/audio_processing/logging/apm_data_dumper.h"
-#include "rtc_base/atomicops.h"
-#include "rtc_base/checks.h"
-#include "rtc_base/logging.h"
-#include "system_wrappers/include/metrics.h"
-
-namespace {
-
-float Power(rtc::ArrayView<const float> input) {
-  if (input.empty()) {
-    return 0.f;
-  }
-  return std::inner_product(input.begin(), input.end(), input.begin(), 0.f) /
-         input.size();
-}
-
-constexpr size_t kLookbackFrames = 650;
-// TODO(ivoc): Verify the size of this buffer.
-constexpr size_t kRenderBufferSize = 30;
-constexpr float kAlpha = 0.001f;
-// 10 seconds of data, updated every 10 ms.
-constexpr size_t kAggregationBufferSize = 10 * 100;
-
-}  // namespace
-
-namespace webrtc {
-
-int ResidualEchoDetector::instance_count_ = 0;
-
-ResidualEchoDetector::ResidualEchoDetector()
-    : data_dumper_(
-          new ApmDataDumper(rtc::AtomicOps::Increment(&instance_count_))),
-      render_buffer_(kRenderBufferSize),
-      render_power_(kLookbackFrames),
-      render_power_mean_(kLookbackFrames),
-      render_power_std_dev_(kLookbackFrames),
-      covariances_(kLookbackFrames),
-      recent_likelihood_max_(kAggregationBufferSize) {}
-
-ResidualEchoDetector::~ResidualEchoDetector() = default;
-
-void ResidualEchoDetector::AnalyzeRenderAudio(
-    rtc::ArrayView<const float> render_audio) {
-  // Dump debug data assuming 48 kHz sample rate (if this assumption is not
-  // valid the dumped audio will need to be converted offline accordingly).
-  data_dumper_->DumpWav("ed_render", render_audio.size(), render_audio.data(),
-                        48000, 1);
-
-  if (render_buffer_.Size() == 0) {
-    frames_since_zero_buffer_size_ = 0;
-  } else if (frames_since_zero_buffer_size_ >= kRenderBufferSize) {
-    // This can happen in a few cases: at the start of a call, due to a glitch
-    // or due to clock drift. The excess capture value will be ignored.
-    // TODO(ivoc): Include how often this happens in APM stats.
-    render_buffer_.Pop();
-    frames_since_zero_buffer_size_ = 0;
-  }
-  ++frames_since_zero_buffer_size_;
-  float power = Power(render_audio);
-  render_buffer_.Push(power);
-}
-
-void ResidualEchoDetector::AnalyzeCaptureAudio(
-    rtc::ArrayView<const float> capture_audio) {
-  // Dump debug data assuming 48 kHz sample rate (if this assumption is not
-  // valid the dumped audio will need to be converted offline accordingly).
-  data_dumper_->DumpWav("ed_capture", capture_audio.size(),
-                        capture_audio.data(), 48000, 1);
-
-  if (first_process_call_) {
-    // On the first process call (so the start of a call), we must flush the
-    // render buffer, otherwise the render data will be delayed.
-    render_buffer_.Clear();
-    first_process_call_ = false;
-  }
-
-  // Get the next render value.
-  const absl::optional<float> buffered_render_power = render_buffer_.Pop();
-  if (!buffered_render_power) {
-    // This can happen in a few cases: at the start of a call, due to a glitch
-    // or due to clock drift. The excess capture value will be ignored.
-    // TODO(ivoc): Include how often this happens in APM stats.
-    return;
-  }
-  // Update the render statistics, and store the statistics in circular buffers.
-  render_statistics_.Update(*buffered_render_power);
-  RTC_DCHECK_LT(next_insertion_index_, kLookbackFrames);
-  render_power_[next_insertion_index_] = *buffered_render_power;
-  render_power_mean_[next_insertion_index_] = render_statistics_.mean();
-  render_power_std_dev_[next_insertion_index_] =
-      render_statistics_.std_deviation();
-
-  // Get the next capture value, update capture statistics and add the relevant
-  // values to the buffers.
-  const float capture_power = Power(capture_audio);
-  capture_statistics_.Update(capture_power);
-  const float capture_mean = capture_statistics_.mean();
-  const float capture_std_deviation = capture_statistics_.std_deviation();
-
-  // Update the covariance values and determine the new echo likelihood.
-  echo_likelihood_ = 0.f;
-  size_t read_index = next_insertion_index_;
-
-  int best_delay = -1;
-  for (size_t delay = 0; delay < covariances_.size(); ++delay) {
-    RTC_DCHECK_LT(read_index, render_power_.size());
-    covariances_[delay].Update(capture_power, capture_mean,
-                               capture_std_deviation, render_power_[read_index],
-                               render_power_mean_[read_index],
-                               render_power_std_dev_[read_index]);
-    read_index = read_index > 0 ? read_index - 1 : kLookbackFrames - 1;
-
-    if (covariances_[delay].normalized_cross_correlation() > echo_likelihood_) {
-      echo_likelihood_ = covariances_[delay].normalized_cross_correlation();
-      best_delay = static_cast<int>(delay);
-    }
-  }
-  // This is a temporary log message to help find the underlying cause for echo
-  // likelihoods > 1.0.
-  // TODO(ivoc): Remove once the issue is resolved.
-  if (echo_likelihood_ > 1.1f) {
-    // Make sure we don't spam the log.
-    if (log_counter_ < 5 && best_delay != -1) {
-      size_t read_index = kLookbackFrames + next_insertion_index_ - best_delay;
-      if (read_index >= kLookbackFrames) {
-        read_index -= kLookbackFrames;
-      }
-      RTC_DCHECK_LT(read_index, render_power_.size());
-      RTC_LOG_F(LS_ERROR) << "Echo detector internal state: {"
-                             "Echo likelihood: "
-                          << echo_likelihood_ << ", Best Delay: " << best_delay
-                          << ", Covariance: "
-                          << covariances_[best_delay].covariance()
-                          << ", Last capture power: " << capture_power
-                          << ", Capture mean: " << capture_mean
-                          << ", Capture_standard deviation: "
-                          << capture_std_deviation << ", Last render power: "
-                          << render_power_[read_index]
-                          << ", Render mean: " << render_power_mean_[read_index]
-                          << ", Render standard deviation: "
-                          << render_power_std_dev_[read_index]
-                          << ", Reliability: " << reliability_ << "}";
-      log_counter_++;
-    }
-  }
-  RTC_DCHECK_LT(echo_likelihood_, 1.1f);
-
-  reliability_ = (1.0f - kAlpha) * reliability_ + kAlpha * 1.0f;
-  echo_likelihood_ *= reliability_;
-  // This is a temporary fix to prevent echo likelihood values > 1.0.
-  // TODO(ivoc): Find the root cause of this issue and fix it.
-  echo_likelihood_ = std::min(echo_likelihood_, 1.0f);
-  int echo_percentage = static_cast<int>(echo_likelihood_ * 100);
-  RTC_HISTOGRAM_COUNTS("WebRTC.Audio.ResidualEchoDetector.EchoLikelihood",
-                       echo_percentage, 0, 100, 100 /* number of bins */);
-
-  // Update the buffer of recent likelihood values.
-  recent_likelihood_max_.Update(echo_likelihood_);
-
-  // Update the next insertion index.
-  next_insertion_index_ = next_insertion_index_ < (kLookbackFrames - 1)
-                              ? next_insertion_index_ + 1
-                              : 0;
-}
-
-void ResidualEchoDetector::Initialize(int /*capture_sample_rate_hz*/,
-                                      int /*num_capture_channels*/,
-                                      int /*render_sample_rate_hz*/,
-                                      int /*num_render_channels*/) {
-  render_buffer_.Clear();
-  std::fill(render_power_.begin(), render_power_.end(), 0.f);
-  std::fill(render_power_mean_.begin(), render_power_mean_.end(), 0.f);
-  std::fill(render_power_std_dev_.begin(), render_power_std_dev_.end(), 0.f);
-  render_statistics_.Clear();
-  capture_statistics_.Clear();
-  recent_likelihood_max_.Clear();
-  for (auto& cov : covariances_) {
-    cov.Clear();
-  }
-  echo_likelihood_ = 0.f;
-  next_insertion_index_ = 0;
-  reliability_ = 0.f;
-}
-
-void EchoDetector::PackRenderAudioBuffer(AudioBuffer* audio,
-                                         std::vector<float>* packed_buffer) {
-  packed_buffer->clear();
-  packed_buffer->insert(packed_buffer->end(), audio->channels_f()[0],
-                        audio->channels_f()[0] + audio->num_frames());
-}
-
-EchoDetector::Metrics ResidualEchoDetector::GetMetrics() const {
-  EchoDetector::Metrics metrics;
-  metrics.echo_likelihood = echo_likelihood_;
-  metrics.echo_likelihood_recent_max = recent_likelihood_max_.max();
-  return metrics;
-}
-}  // namespace webrtc
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/residual_echo_detector.h b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/residual_echo_detector.h
deleted file mode 100644
index 5d18ecbb22..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/residual_echo_detector.h
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
- *  Copyright (c) 2016 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#ifndef MODULES_AUDIO_PROCESSING_RESIDUAL_ECHO_DETECTOR_H_
-#define MODULES_AUDIO_PROCESSING_RESIDUAL_ECHO_DETECTOR_H_
-
-#include <vector>
-
-#include "api/array_view.h"
-#include "modules/audio_processing/echo_detector/circular_buffer.h"
-#include "modules/audio_processing/echo_detector/mean_variance_estimator.h"
-#include "modules/audio_processing/echo_detector/moving_max.h"
-#include "modules/audio_processing/echo_detector/normalized_covariance_estimator.h"
-#include "modules/audio_processing/include/audio_processing.h"
-
-namespace webrtc {
-
-class ApmDataDumper;
-class AudioBuffer;
-
-class ResidualEchoDetector : public EchoDetector {
- public:
-  ResidualEchoDetector();
-  ~ResidualEchoDetector() override;
-
-  // This function should be called while holding the render lock.
-  void AnalyzeRenderAudio(rtc::ArrayView<const float> render_audio) override;
-
-  // This function should be called while holding the capture lock.
-  void AnalyzeCaptureAudio(rtc::ArrayView<const float> capture_audio) override;
-
-  // This function should be called while holding the capture lock.
-  void Initialize(int capture_sample_rate_hz,
-                  int num_capture_channels,
-                  int render_sample_rate_hz,
-                  int num_render_channels) override;
-
-  // This function is for testing purposes only.
-  void SetReliabilityForTest(float value) { reliability_ = value; }
-
-  // This function should be called while holding the capture lock.
-  EchoDetector::Metrics GetMetrics() const override;
-
- private:
-  static int instance_count_;
-  std::unique_ptr<ApmDataDumper> data_dumper_;
-  // Keep track if the |Process| function has been previously called.
-  bool first_process_call_ = true;
-  // Buffer for storing the power of incoming farend buffers. This is needed for
-  // cases where calls to BufferFarend and Process are jittery.
-  CircularBuffer render_buffer_;
-  // Count how long ago it was that the size of |render_buffer_| was zero. This
-  // value is also reset to zero when clock drift is detected and a value from
-  // the renderbuffer is discarded, even though the buffer is not actually zero
-  // at that point. This is done to avoid repeatedly removing elements in this
-  // situation.
-  size_t frames_since_zero_buffer_size_ = 0;
-
-  // Circular buffers containing delayed versions of the power, mean and
-  // standard deviation, for calculating the delayed covariance values.
-  std::vector<float> render_power_;
-  std::vector<float> render_power_mean_;
-  std::vector<float> render_power_std_dev_;
-  // Covariance estimates for different delay values.
-  std::vector<NormalizedCovarianceEstimator> covariances_;
-  // Index where next element should be inserted in all of the above circular
-  // buffers.
-  size_t next_insertion_index_ = 0;
-
-  MeanVarianceEstimator render_statistics_;
-  MeanVarianceEstimator capture_statistics_;
-  // Current echo likelihood.
-  float echo_likelihood_ = 0.f;
-  // Reliability of the current likelihood.
-  float reliability_ = 0.f;
-  MovingMax recent_likelihood_max_;
-
-  int log_counter_ = 0;
-};
-
-}  // namespace webrtc
-
-#endif  // MODULES_AUDIO_PROCESSING_RESIDUAL_ECHO_DETECTOR_H_
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/rms_level.cc b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/rms_level.cc
deleted file mode 100644
index 727ecfc9fe..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/rms_level.cc
+++ /dev/null
@@ -1,107 +0,0 @@
-/*
- *  Copyright (c) 2014 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#include "modules/audio_processing/rms_level.h"
-
-#include <math.h>
-#include <algorithm>
-#include <numeric>
-
-#include "rtc_base/checks.h"
-
-namespace webrtc {
-namespace {
-static constexpr float kMaxSquaredLevel = 32768 * 32768;
-// kMinLevel is the level corresponding to kMinLevelDb, that is 10^(-127/10).
-static constexpr float kMinLevel = 1.995262314968883e-13f;
-
-// Calculates the normalized RMS value from a mean square value. The input
-// should be the sum of squared samples divided by the number of samples. The
-// value will be normalized to full range before computing the RMS, wich is
-// returned as a negated dBfs. That is, 0 is full amplitude while 127 is very
-// faint.
-int ComputeRms(float mean_square) {
-  if (mean_square <= kMinLevel * kMaxSquaredLevel) {
-    // Very faint; simply return the minimum value.
-    return RmsLevel::kMinLevelDb;
-  }
-  // Normalize by the max level.
-  const float mean_square_norm = mean_square / kMaxSquaredLevel;
-  RTC_DCHECK_GT(mean_square_norm, kMinLevel);
-  // 20log_10(x^0.5) = 10log_10(x)
-  const float rms = 10.f * log10(mean_square_norm);
-  RTC_DCHECK_LE(rms, 0.f);
-  RTC_DCHECK_GT(rms, -RmsLevel::kMinLevelDb);
-  // Return the negated value.
-  return static_cast<int>(-rms + 0.5f);
-}
-}  // namespace
-
-RmsLevel::RmsLevel() {
-  Reset();
-}
-
-RmsLevel::~RmsLevel() = default;
-
-void RmsLevel::Reset() {
-  sum_square_ = 0.f;
-  sample_count_ = 0;
-  max_sum_square_ = 0.f;
-  block_size_ = absl::nullopt;
-}
-
-void RmsLevel::Analyze(rtc::ArrayView<const int16_t> data) {
-  if (data.empty()) {
-    return;
-  }
-
-  CheckBlockSize(data.size());
-
-  const float sum_square =
-      std::accumulate(data.begin(), data.end(), 0.f,
-                      [](float a, int16_t b) { return a + b * b; });
-  RTC_DCHECK_GE(sum_square, 0.f);
-  sum_square_ += sum_square;
-  sample_count_ += data.size();
-
-  max_sum_square_ = std::max(max_sum_square_, sum_square);
-}
-
-void RmsLevel::AnalyzeMuted(size_t length) {
-  CheckBlockSize(length);
-  sample_count_ += length;
-}
-
-int RmsLevel::Average() {
-  int rms = (sample_count_ == 0) ? RmsLevel::kMinLevelDb
-                                 : ComputeRms(sum_square_ / sample_count_);
-  Reset();
-  return rms;
-}
-
-RmsLevel::Levels RmsLevel::AverageAndPeak() {
-  // Note that block_size_ should by design always be non-empty when
-  // sample_count_ != 0. Also, the * operator of absl::optional enforces this
-  // with a DCHECK.
-  Levels levels = (sample_count_ == 0)
-                      ? Levels{RmsLevel::kMinLevelDb, RmsLevel::kMinLevelDb}
-                      : Levels{ComputeRms(sum_square_ / sample_count_),
-                               ComputeRms(max_sum_square_ / *block_size_)};
-  Reset();
-  return levels;
-}
-
-void RmsLevel::CheckBlockSize(size_t block_size) {
-  if (block_size_ != block_size) {
-    Reset();
-    block_size_ = block_size;
-  }
-}
-}  // namespace webrtc
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/rms_level.h b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/rms_level.h
deleted file mode 100644
index e6b5849ead..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/rms_level.h
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- *  Copyright (c) 2014 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#ifndef MODULES_AUDIO_PROCESSING_RMS_LEVEL_H_
-#define MODULES_AUDIO_PROCESSING_RMS_LEVEL_H_
-
-#include <stddef.h>
-#include <stdint.h>
-
-#include "absl/types/optional.h"
-#include "api/array_view.h"
-
-namespace webrtc {
-
-// Computes the root mean square (RMS) level in dBFs (decibels from digital
-// full-scale) of audio data. The computation follows RFC 6465:
-// https://tools.ietf.org/html/rfc6465
-// with the intent that it can provide the RTP audio level indication.
-//
-// The expected approach is to provide constant-sized chunks of audio to
-// Analyze(). When enough chunks have been accumulated to form a packet, call
-// Average() to get the audio level indicator for the RTP header.
-class RmsLevel {
- public:
-  struct Levels {
-    int average;
-    int peak;
-  };
-
-  static constexpr int kMinLevelDb = 127;
-
-  RmsLevel();
-  ~RmsLevel();
-
-  // Can be called to reset internal states, but is not required during normal
-  // operation.
-  void Reset();
-
-  // Pass each chunk of audio to Analyze() to accumulate the level.
-  void Analyze(rtc::ArrayView<const int16_t> data);
-
-  // If all samples with the given |length| have a magnitude of zero, this is
-  // a shortcut to avoid some computation.
-  void AnalyzeMuted(size_t length);
-
-  // Computes the RMS level over all data passed to Analyze() since the last
-  // call to Average(). The returned value is positive but should be interpreted
-  // as negative as per the RFC. It is constrained to [0, 127]. Resets the
-  // internal state to start a new measurement period.
-  int Average();
-
-  // Like Average() above, but also returns the RMS peak value. Resets the
-  // internal state to start a new measurement period.
-  Levels AverageAndPeak();
-
- private:
-  // Compares |block_size| with |block_size_|. If they are different, calls
-  // Reset() and stores the new size.
-  void CheckBlockSize(size_t block_size);
-
-  float sum_square_;
-  size_t sample_count_;
-  float max_sum_square_;
-  absl::optional<size_t> block_size_;
-};
-
-}  // namespace webrtc
-
-#endif  // MODULES_AUDIO_PROCESSING_RMS_LEVEL_H_
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/splitting_filter.cc b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/splitting_filter.cc
deleted file mode 100644
index 122bc9cc7f..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/splitting_filter.cc
+++ /dev/null
@@ -1,106 +0,0 @@
-/*
- *  Copyright (c) 2014 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#include "modules/audio_processing/splitting_filter.h"
-
-#include "common_audio/channel_buffer.h"
-#include "common_audio/signal_processing/include/signal_processing_library.h"
-#include "rtc_base/checks.h"
-
-namespace webrtc {
-
-SplittingFilter::SplittingFilter(size_t num_channels,
-                                 size_t num_bands,
-                                 size_t num_frames)
-    : num_bands_(num_bands) {
-  RTC_CHECK(num_bands_ == 2 || num_bands_ == 3);
-  if (num_bands_ == 2) {
-    two_bands_states_.resize(num_channels);
-  } else if (num_bands_ == 3) {
-    for (size_t i = 0; i < num_channels; ++i) {
-      three_band_filter_banks_.push_back(std::unique_ptr<ThreeBandFilterBank>(
-          new ThreeBandFilterBank(num_frames)));
-    }
-  }
-}
-
-SplittingFilter::~SplittingFilter() = default;
-
-void SplittingFilter::Analysis(const IFChannelBuffer* data,
-                               IFChannelBuffer* bands) {
-  RTC_DCHECK_EQ(num_bands_, bands->num_bands());
-  RTC_DCHECK_EQ(data->num_channels(), bands->num_channels());
-  RTC_DCHECK_EQ(data->num_frames(),
-                bands->num_frames_per_band() * bands->num_bands());
-  if (bands->num_bands() == 2) {
-    TwoBandsAnalysis(data, bands);
-  } else if (bands->num_bands() == 3) {
-    ThreeBandsAnalysis(data, bands);
-  }
-}
-
-void SplittingFilter::Synthesis(const IFChannelBuffer* bands,
-                                IFChannelBuffer* data) {
-  RTC_DCHECK_EQ(num_bands_, bands->num_bands());
-  RTC_DCHECK_EQ(data->num_channels(), bands->num_channels());
-  RTC_DCHECK_EQ(data->num_frames(),
-                bands->num_frames_per_band() * bands->num_bands());
-  if (bands->num_bands() == 2) {
-    TwoBandsSynthesis(bands, data);
-  } else if (bands->num_bands() == 3) {
-    ThreeBandsSynthesis(bands, data);
-  }
-}
-
-void SplittingFilter::TwoBandsAnalysis(const IFChannelBuffer* data,
-                                       IFChannelBuffer* bands) {
-  RTC_DCHECK_EQ(two_bands_states_.size(), data->num_channels());
-  for (size_t i = 0; i < two_bands_states_.size(); ++i) {
-    WebRtcSpl_AnalysisQMF(data->ibuf_const()->channels()[i], data->num_frames(),
-                          bands->ibuf()->channels(0)[i],
-                          bands->ibuf()->channels(1)[i],
-                          two_bands_states_[i].analysis_state1,
-                          two_bands_states_[i].analysis_state2);
-  }
-}
-
-void SplittingFilter::TwoBandsSynthesis(const IFChannelBuffer* bands,
-                                        IFChannelBuffer* data) {
-  RTC_DCHECK_LE(data->num_channels(), two_bands_states_.size());
-  for (size_t i = 0; i < data->num_channels(); ++i) {
-    WebRtcSpl_SynthesisQMF(
-        bands->ibuf_const()->channels(0)[i],
-        bands->ibuf_const()->channels(1)[i], bands->num_frames_per_band(),
-        data->ibuf()->channels()[i], two_bands_states_[i].synthesis_state1,
-        two_bands_states_[i].synthesis_state2);
-  }
-}
-
-void SplittingFilter::ThreeBandsAnalysis(const IFChannelBuffer* data,
-                                         IFChannelBuffer* bands) {
-  RTC_DCHECK_EQ(three_band_filter_banks_.size(), data->num_channels());
-  for (size_t i = 0; i < three_band_filter_banks_.size(); ++i) {
-    three_band_filter_banks_[i]->Analysis(data->fbuf_const()->channels()[i],
-                                          data->num_frames(),
-                                          bands->fbuf()->bands(i));
-  }
-}
-
-void SplittingFilter::ThreeBandsSynthesis(const IFChannelBuffer* bands,
-                                          IFChannelBuffer* data) {
-  RTC_DCHECK_LE(data->num_channels(), three_band_filter_banks_.size());
-  for (size_t i = 0; i < data->num_channels(); ++i) {
-    three_band_filter_banks_[i]->Synthesis(bands->fbuf_const()->bands(i),
-                                           bands->num_frames_per_band(),
-                                           data->fbuf()->channels()[i]);
-  }
-}
-
-}  // namespace webrtc
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/splitting_filter.h b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/splitting_filter.h
deleted file mode 100644
index 7d60c82ff6..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/splitting_filter.h
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- *  Copyright (c) 2014 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#ifndef MODULES_AUDIO_PROCESSING_SPLITTING_FILTER_H_
-#define MODULES_AUDIO_PROCESSING_SPLITTING_FILTER_H_
-
-#include <cstring>
-#include <memory>
-#include <vector>
-
-#include "modules/audio_processing/three_band_filter_bank.h"
-
-namespace webrtc {
-
-class IFChannelBuffer;
-
-struct TwoBandsStates {
-  TwoBandsStates() {
-    memset(analysis_state1, 0, sizeof(analysis_state1));
-    memset(analysis_state2, 0, sizeof(analysis_state2));
-    memset(synthesis_state1, 0, sizeof(synthesis_state1));
-    memset(synthesis_state2, 0, sizeof(synthesis_state2));
-  }
-
-  static const int kStateSize = 6;
-  int analysis_state1[kStateSize];
-  int analysis_state2[kStateSize];
-  int synthesis_state1[kStateSize];
-  int synthesis_state2[kStateSize];
-};
-
-// Splitting filter which is able to split into and merge from 2 or 3 frequency
-// bands. The number of channels needs to be provided at construction time.
-//
-// For each block, Analysis() is called to split into bands and then Synthesis()
-// to merge these bands again. The input and output signals are contained in
-// IFChannelBuffers and for the different bands an array of IFChannelBuffers is
-// used.
-class SplittingFilter {
- public:
-  SplittingFilter(size_t num_channels, size_t num_bands, size_t num_frames);
-  ~SplittingFilter();
-
-  void Analysis(const IFChannelBuffer* data, IFChannelBuffer* bands);
-  void Synthesis(const IFChannelBuffer* bands, IFChannelBuffer* data);
-
- private:
-  // Two-band analysis and synthesis work for 640 samples or less.
-  void TwoBandsAnalysis(const IFChannelBuffer* data, IFChannelBuffer* bands);
-  void TwoBandsSynthesis(const IFChannelBuffer* bands, IFChannelBuffer* data);
-  void ThreeBandsAnalysis(const IFChannelBuffer* data, IFChannelBuffer* bands);
-  void ThreeBandsSynthesis(const IFChannelBuffer* bands, IFChannelBuffer* data);
-  void InitBuffers();
-
-  const size_t num_bands_;
-  std::vector<TwoBandsStates> two_bands_states_;
-  std::vector<std::unique_ptr<ThreeBandFilterBank>> three_band_filter_banks_;
-};
-
-}  // namespace webrtc
-
-#endif  // MODULES_AUDIO_PROCESSING_SPLITTING_FILTER_H_
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/three_band_filter_bank.cc b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/three_band_filter_bank.cc
deleted file mode 100644
index dbbfc283c5..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/three_band_filter_bank.cc
+++ /dev/null
@@ -1,213 +0,0 @@
-/*
- *  Copyright (c) 2015 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-// An implementation of a 3-band FIR filter-bank with DCT modulation, similar to
-// the proposed in "Multirate Signal Processing for Communication Systems" by
-// Fredric J Harris.
-//
-// The idea is to take a heterodyne system and change the order of the
-// components to get something which is efficient to implement digitally.
-//
-// It is possible to separate the filter using the noble identity as follows:
-//
-// H(z) = H0(z^3) + z^-1 * H1(z^3) + z^-2 * H2(z^3)
-//
-// This is used in the analysis stage to first downsample serial to parallel
-// and then filter each branch with one of these polyphase decompositions of the
-// lowpass prototype. Because each filter is only a modulation of the prototype,
-// it is enough to multiply each coefficient by the respective cosine value to
-// shift it to the desired band. But because the cosine period is 12 samples,
-// it requires separating the prototype even further using the noble identity.
-// After filtering and modulating for each band, the output of all filters is
-// accumulated to get the downsampled bands.
-//
-// A similar logic can be applied to the synthesis stage.
-
-// MSVC++ requires this to be set before any other includes to get M_PI.
-#define _USE_MATH_DEFINES
-
-#include "modules/audio_processing/three_band_filter_bank.h"
-
-#include <cmath>
-
-#include "rtc_base/checks.h"
-
-namespace webrtc {
-namespace {
-
-const size_t kNumBands = 3;
-const size_t kSparsity = 4;
-
-// Factors to take into account when choosing |kNumCoeffs|:
-//   1. Higher |kNumCoeffs|, means faster transition, which ensures less
-//      aliasing. This is especially important when there is non-linear
-//      processing between the splitting and merging.
-//   2. The delay that this filter bank introduces is
-//      |kNumBands| * |kSparsity| * |kNumCoeffs| / 2, so it increases linearly
-//      with |kNumCoeffs|.
-//   3. The computation complexity also increases linearly with |kNumCoeffs|.
-const size_t kNumCoeffs = 4;
-
-// The Matlab code to generate these |kLowpassCoeffs| is:
-//
-// N = kNumBands * kSparsity * kNumCoeffs - 1;
-// h = fir1(N, 1 / (2 * kNumBands), kaiser(N + 1, 3.5));
-// reshape(h, kNumBands * kSparsity, kNumCoeffs);
-//
-// Because the total bandwidth of the lower and higher band is double the middle
-// one (because of the spectrum parity), the low-pass prototype is half the
-// bandwidth of 1 / (2 * |kNumBands|) and is then shifted with cosine modulation
-// to the right places.
-// A Kaiser window is used because of its flexibility and the alpha is set to
-// 3.5, since that sets a stop band attenuation of 40dB ensuring a fast
-// transition.
-const float kLowpassCoeffs[kNumBands * kSparsity][kNumCoeffs] = {
-    {-0.00047749f, -0.00496888f, +0.16547118f, +0.00425496f},
-    {-0.00173287f, -0.01585778f, +0.14989004f, +0.00994113f},
-    {-0.00304815f, -0.02536082f, +0.12154542f, +0.01157993f},
-    {-0.00383509f, -0.02982767f, +0.08543175f, +0.00983212f},
-    {-0.00346946f, -0.02587886f, +0.04760441f, +0.00607594f},
-    {-0.00154717f, -0.01136076f, +0.01387458f, +0.00186353f},
-    {+0.00186353f, +0.01387458f, -0.01136076f, -0.00154717f},
-    {+0.00607594f, +0.04760441f, -0.02587886f, -0.00346946f},
-    {+0.00983212f, +0.08543175f, -0.02982767f, -0.00383509f},
-    {+0.01157993f, +0.12154542f, -0.02536082f, -0.00304815f},
-    {+0.00994113f, +0.14989004f, -0.01585778f, -0.00173287f},
-    {+0.00425496f, +0.16547118f, -0.00496888f, -0.00047749f}};
-
-// Downsamples |in| into |out|, taking one every |kNumbands| starting from
-// |offset|. |split_length| is the |out| length. |in| has to be at least
-// |kNumBands| * |split_length| long.
-void Downsample(const float* in,
-                size_t split_length,
-                size_t offset,
-                float* out) {
-  for (size_t i = 0; i < split_length; ++i) {
-    out[i] = in[kNumBands * i + offset];
-  }
-}
-
-// Upsamples |in| into |out|, scaling by |kNumBands| and accumulating it every
-// |kNumBands| starting from |offset|. |split_length| is the |in| length. |out|
-// has to be at least |kNumBands| * |split_length| long.
-void Upsample(const float* in, size_t split_length, size_t offset, float* out) {
-  for (size_t i = 0; i < split_length; ++i) {
-    out[kNumBands * i + offset] += kNumBands * in[i];
-  }
-}
-
-}  // namespace
-
-// Because the low-pass filter prototype has half bandwidth it is possible to
-// use a DCT to shift it in both directions at the same time, to the center
-// frequencies [1 / 12, 3 / 12, 5 / 12].
-ThreeBandFilterBank::ThreeBandFilterBank(size_t length)
-    : in_buffer_(rtc::CheckedDivExact(length, kNumBands)),
-      out_buffer_(in_buffer_.size()) {
-  for (size_t i = 0; i < kSparsity; ++i) {
-    for (size_t j = 0; j < kNumBands; ++j) {
-      analysis_filters_.push_back(
-          std::unique_ptr<SparseFIRFilter>(new SparseFIRFilter(
-              kLowpassCoeffs[i * kNumBands + j], kNumCoeffs, kSparsity, i)));
-      synthesis_filters_.push_back(
-          std::unique_ptr<SparseFIRFilter>(new SparseFIRFilter(
-              kLowpassCoeffs[i * kNumBands + j], kNumCoeffs, kSparsity, i)));
-    }
-  }
-  dct_modulation_.resize(kNumBands * kSparsity);
-  for (size_t i = 0; i < dct_modulation_.size(); ++i) {
-    dct_modulation_[i].resize(kNumBands);
-    for (size_t j = 0; j < kNumBands; ++j) {
-      dct_modulation_[i][j] =
-          2.f * cos(2.f * M_PI * i * (2.f * j + 1.f) / dct_modulation_.size());
-    }
-  }
-}
-
-ThreeBandFilterBank::~ThreeBandFilterBank() = default;
-
-// The analysis can be separated in these steps:
-//   1. Serial to parallel downsampling by a factor of |kNumBands|.
-//   2. Filtering of |kSparsity| different delayed signals with polyphase
-//      decomposition of the low-pass prototype filter and upsampled by a factor
-//      of |kSparsity|.
-//   3. Modulating with cosines and accumulating to get the desired band.
-void ThreeBandFilterBank::Analysis(const float* in,
-                                   size_t length,
-                                   float* const* out) {
-  RTC_CHECK_EQ(in_buffer_.size(), rtc::CheckedDivExact(length, kNumBands));
-  for (size_t i = 0; i < kNumBands; ++i) {
-    memset(out[i], 0, in_buffer_.size() * sizeof(*out[i]));
-  }
-  for (size_t i = 0; i < kNumBands; ++i) {
-    Downsample(in, in_buffer_.size(), kNumBands - i - 1, &in_buffer_[0]);
-    for (size_t j = 0; j < kSparsity; ++j) {
-      const size_t offset = i + j * kNumBands;
-      analysis_filters_[offset]->Filter(&in_buffer_[0], in_buffer_.size(),
-                                        &out_buffer_[0]);
-      DownModulate(&out_buffer_[0], out_buffer_.size(), offset, out);
-    }
-  }
-}
-
-// The synthesis can be separated in these steps:
-//   1. Modulating with cosines.
-//   2. Filtering each one with a polyphase decomposition of the low-pass
-//      prototype filter upsampled by a factor of |kSparsity| and accumulating
-//      |kSparsity| signals with different delays.
-//   3. Parallel to serial upsampling by a factor of |kNumBands|.
-void ThreeBandFilterBank::Synthesis(const float* const* in,
-                                    size_t split_length,
-                                    float* out) {
-  RTC_CHECK_EQ(in_buffer_.size(), split_length);
-  memset(out, 0, kNumBands * in_buffer_.size() * sizeof(*out));
-  for (size_t i = 0; i < kNumBands; ++i) {
-    for (size_t j = 0; j < kSparsity; ++j) {
-      const size_t offset = i + j * kNumBands;
-      UpModulate(in, in_buffer_.size(), offset, &in_buffer_[0]);
-      synthesis_filters_[offset]->Filter(&in_buffer_[0], in_buffer_.size(),
-                                         &out_buffer_[0]);
-      Upsample(&out_buffer_[0], out_buffer_.size(), i, out);
-    }
-  }
-}
-
-// Modulates |in| by |dct_modulation_| and accumulates it in each of the
-// |kNumBands| bands of |out|. |offset| is the index in the period of the
-// cosines used for modulation. |split_length| is the length of |in| and each
-// band of |out|.
-void ThreeBandFilterBank::DownModulate(const float* in,
-                                       size_t split_length,
-                                       size_t offset,
-                                       float* const* out) {
-  for (size_t i = 0; i < kNumBands; ++i) {
-    for (size_t j = 0; j < split_length; ++j) {
-      out[i][j] += dct_modulation_[offset][i] * in[j];
-    }
-  }
-}
-
-// Modulates each of the |kNumBands| bands of |in| by |dct_modulation_| and
-// accumulates them in |out|. |out| is cleared before starting to accumulate.
-// |offset| is the index in the period of the cosines used for modulation.
-// |split_length| is the length of each band of |in| and |out|.
-void ThreeBandFilterBank::UpModulate(const float* const* in,
-                                     size_t split_length,
-                                     size_t offset,
-                                     float* out) {
-  memset(out, 0, split_length * sizeof(*out));
-  for (size_t i = 0; i < kNumBands; ++i) {
-    for (size_t j = 0; j < split_length; ++j) {
-      out[j] += dct_modulation_[offset][i] * in[i][j];
-    }
-  }
-}
-
-}  // namespace webrtc
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/three_band_filter_bank.h b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/three_band_filter_bank.h
deleted file mode 100644
index ccbf2ddf97..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/three_band_filter_bank.h
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- *  Copyright (c) 2015 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#ifndef MODULES_AUDIO_PROCESSING_THREE_BAND_FILTER_BANK_H_
-#define MODULES_AUDIO_PROCESSING_THREE_BAND_FILTER_BANK_H_
-
-#include <cstring>
-#include <memory>
-#include <vector>
-
-#include "common_audio/sparse_fir_filter.h"
-
-namespace webrtc {
-
-// An implementation of a 3-band FIR filter-bank with DCT modulation, similar to
-// the proposed in "Multirate Signal Processing for Communication Systems" by
-// Fredric J Harris.
-// The low-pass filter prototype has these characteristics:
-// * Pass-band ripple = 0.3dB
-// * Pass-band frequency = 0.147 (7kHz at 48kHz)
-// * Stop-band attenuation = 40dB
-// * Stop-band frequency = 0.192 (9.2kHz at 48kHz)
-// * Delay = 24 samples (500us at 48kHz)
-// * Linear phase
-// This filter bank does not satisfy perfect reconstruction. The SNR after
-// analysis and synthesis (with no processing in between) is approximately 9.5dB
-// depending on the input signal after compensating for the delay.
-class ThreeBandFilterBank final {
- public:
-  explicit ThreeBandFilterBank(size_t length);
-  ~ThreeBandFilterBank();
-
-  // Splits |in| into 3 downsampled frequency bands in |out|.
-  // |length| is the |in| length. Each of the 3 bands of |out| has to have a
-  // length of |length| / 3.
-  void Analysis(const float* in, size_t length, float* const* out);
-
-  // Merges the 3 downsampled frequency bands in |in| into |out|.
-  // |split_length| is the length of each band of |in|. |out| has to have at
-  // least a length of 3 * |split_length|.
-  void Synthesis(const float* const* in, size_t split_length, float* out);
-
- private:
-  void DownModulate(const float* in,
-                    size_t split_length,
-                    size_t offset,
-                    float* const* out);
-  void UpModulate(const float* const* in,
-                  size_t split_length,
-                  size_t offset,
-                  float* out);
-
-  std::vector<float> in_buffer_;
-  std::vector<float> out_buffer_;
-  std::vector<std::unique_ptr<SparseFIRFilter>> analysis_filters_;
-  std::vector<std::unique_ptr<SparseFIRFilter>> synthesis_filters_;
-  std::vector<std::vector<float>> dct_modulation_;
-};
-
-}  // namespace webrtc
-
-#endif  // MODULES_AUDIO_PROCESSING_THREE_BAND_FILTER_BANK_H_
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/transient/common.h b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/transient/common.h
deleted file mode 100644
index 63c9a7b315..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/transient/common.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- *  Copyright (c) 2014 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#ifndef MODULES_AUDIO_PROCESSING_TRANSIENT_COMMON_H_
-#define MODULES_AUDIO_PROCESSING_TRANSIENT_COMMON_H_
-namespace webrtc {
-namespace ts {
-
-static const float kPi = 3.14159265358979323846f;
-static const int kChunkSizeMs = 10;
-enum {
-  kSampleRate8kHz = 8000,
-  kSampleRate16kHz = 16000,
-  kSampleRate32kHz = 32000,
-  kSampleRate48kHz = 48000
-};
-
-}  // namespace ts
-}  // namespace webrtc
-#endif  // MODULES_AUDIO_PROCESSING_TRANSIENT_COMMON_H_
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/transient/daubechies_8_wavelet_coeffs.h b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/transient/daubechies_8_wavelet_coeffs.h
deleted file mode 100644
index 92233bfd74..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/transient/daubechies_8_wavelet_coeffs.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- *  Copyright (c) 2013 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-// This header file defines the coefficients of the FIR based approximation of
-// the Meyer Wavelet
-#ifndef MODULES_AUDIO_PROCESSING_TRANSIENT_DAUBECHIES_8_WAVELET_COEFFS_H_
-#define MODULES_AUDIO_PROCESSING_TRANSIENT_DAUBECHIES_8_WAVELET_COEFFS_H_
-
-// Decomposition coefficients Daubechies 8.
-
-namespace webrtc {
-
-const int kDaubechies8CoefficientsLength = 16;
-
-const float kDaubechies8HighPassCoefficients[kDaubechies8CoefficientsLength] = {
-    -5.44158422430816093862e-02f, 3.12871590914465924627e-01f,
-    -6.75630736298012846142e-01f, 5.85354683654869090148e-01f,
-    1.58291052560238926228e-02f,  -2.84015542962428091389e-01f,
-    -4.72484573997972536787e-04f, 1.28747426620186011803e-01f,
-    1.73693010020221083600e-02f,  -4.40882539310647192377e-02f,
-    -1.39810279170155156436e-02f, 8.74609404701565465445e-03f,
-    4.87035299301066034600e-03f,  -3.91740372995977108837e-04f,
-    -6.75449405998556772109e-04f, -1.17476784002281916305e-04f};
-
-const float kDaubechies8LowPassCoefficients[kDaubechies8CoefficientsLength] = {
-    -1.17476784002281916305e-04f, 6.75449405998556772109e-04f,
-    -3.91740372995977108837e-04f, -4.87035299301066034600e-03f,
-    8.74609404701565465445e-03f,  1.39810279170155156436e-02f,
-    -4.40882539310647192377e-02f, -1.73693010020221083600e-02f,
-    1.28747426620186011803e-01f,  4.72484573997972536787e-04f,
-    -2.84015542962428091389e-01f, -1.58291052560238926228e-02f,
-    5.85354683654869090148e-01f,  6.75630736298012846142e-01f,
-    3.12871590914465924627e-01f,  5.44158422430816093862e-02f};
-
-}  // namespace webrtc
-
-#endif  // MODULES_AUDIO_PROCESSING_TRANSIENT_DAUBECHIES_8_WAVELET_COEFFS_H_
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/transient/dyadic_decimator.h b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/transient/dyadic_decimator.h
deleted file mode 100644
index fcb56b7dc9..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/transient/dyadic_decimator.h
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- *  Copyright (c) 2013 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#ifndef MODULES_AUDIO_PROCESSING_TRANSIENT_DYADIC_DECIMATOR_H_
-#define MODULES_AUDIO_PROCESSING_TRANSIENT_DYADIC_DECIMATOR_H_
-
-#include <cstdlib>
-
-// Provides a set of static methods to perform dyadic decimations.
-
-namespace webrtc {
-
-// Returns the proper length of the output buffer that you should use for the
-// given |in_length| and decimation |odd_sequence|.
-// Return -1 on error.
-inline size_t GetOutLengthToDyadicDecimate(size_t in_length,
-                                           bool odd_sequence) {
-  size_t out_length = in_length / 2;
-
-  if (in_length % 2 == 1 && !odd_sequence) {
-    ++out_length;
-  }
-
-  return out_length;
-}
-
-// Performs a dyadic decimation: removes every odd/even member of a sequence
-// halving its overall length.
-// Arguments:
-//    in: array of |in_length|.
-//    odd_sequence: If false, the odd members will be removed (1, 3, 5, ...);
-//                  if true, the even members will be removed (0, 2, 4, ...).
-//    out: array of |out_length|. |out_length| must be large enough to
-//         hold the decimated output. The necessary length can be provided by
-//         GetOutLengthToDyadicDecimate().
-//         Must be previously allocated.
-// Returns the number of output samples, -1 on error.
-template <typename T>
-static size_t DyadicDecimate(const T* in,
-                             size_t in_length,
-                             bool odd_sequence,
-                             T* out,
-                             size_t out_length) {
-  size_t half_length = GetOutLengthToDyadicDecimate(in_length, odd_sequence);
-
-  if (!in || !out || in_length <= 0 || out_length < half_length) {
-    return 0;
-  }
-
-  size_t output_samples = 0;
-  size_t index_adjustment = odd_sequence ? 1 : 0;
-  for (output_samples = 0; output_samples < half_length; ++output_samples) {
-    out[output_samples] = in[output_samples * 2 + index_adjustment];
-  }
-
-  return output_samples;
-}
-
-}  // namespace webrtc
-
-#endif  // MODULES_AUDIO_PROCESSING_TRANSIENT_DYADIC_DECIMATOR_H_
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/transient/moving_moments.cc b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/transient/moving_moments.cc
deleted file mode 100644
index 83810bfe3c..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/transient/moving_moments.cc
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- *  Copyright (c) 2013 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#include "modules/audio_processing/transient/moving_moments.h"
-
-#include <algorithm>
-
-#include "rtc_base/checks.h"
-
-namespace webrtc {
-
-MovingMoments::MovingMoments(size_t length)
-    : length_(length), queue_(), sum_(0.0), sum_of_squares_(0.0) {
-  RTC_DCHECK_GT(length, 0);
-  for (size_t i = 0; i < length; ++i) {
-    queue_.push(0.0);
-  }
-}
-
-MovingMoments::~MovingMoments() {}
-
-void MovingMoments::CalculateMoments(const float* in,
-                                     size_t in_length,
-                                     float* first,
-                                     float* second) {
-  RTC_DCHECK(in);
-  RTC_DCHECK_GT(in_length, 0);
-  RTC_DCHECK(first);
-  RTC_DCHECK(second);
-
-  for (size_t i = 0; i < in_length; ++i) {
-    const float old_value = queue_.front();
-    queue_.pop();
-    queue_.push(in[i]);
-
-    sum_ += in[i] - old_value;
-    sum_of_squares_ += in[i] * in[i] - old_value * old_value;
-    first[i] = sum_ / length_;
-    second[i] = std::max(0.f, sum_of_squares_ / length_);
-  }
-}
-
-}  // namespace webrtc
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/transient/moving_moments.h b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/transient/moving_moments.h
deleted file mode 100644
index 6dc05204da..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/transient/moving_moments.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- *  Copyright (c) 2013 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#ifndef MODULES_AUDIO_PROCESSING_TRANSIENT_MOVING_MOMENTS_H_
-#define MODULES_AUDIO_PROCESSING_TRANSIENT_MOVING_MOMENTS_H_
-
-#include <stddef.h>
-
-#include <queue>
-
-namespace webrtc {
-
-// Calculates the first and second moments for each value of a buffer taking
-// into account a given number of previous values.
-// It preserves its state, so it can be multiple-called.
-// TODO(chadan): Implement a function that takes a buffer of first moments and a
-// buffer of second moments; and calculates the variances. When needed.
-// TODO(chadan): Add functionality to update with a buffer but only output are
-// the last values of the moments. When needed.
-class MovingMoments {
- public:
-  // Creates a Moving Moments object, that uses the last |length| values
-  // (including the new value introduced in every new calculation).
-  explicit MovingMoments(size_t length);
-  ~MovingMoments();
-
-  // Calculates the new values using |in|. Results will be in the out buffers.
-  // |first| and |second| must be allocated with at least |in_length|.
-  void CalculateMoments(const float* in,
-                        size_t in_length,
-                        float* first,
-                        float* second);
-
- private:
-  size_t length_;
-  // A queue holding the |length_| latest input values.
-  std::queue<float> queue_;
-  // Sum of the values of the queue.
-  float sum_;
-  // Sum of the squares of the values of the queue.
-  float sum_of_squares_;
-};
-
-}  // namespace webrtc
-
-#endif  // MODULES_AUDIO_PROCESSING_TRANSIENT_MOVING_MOMENTS_H_
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/transient/transient_detector.cc b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/transient/transient_detector.cc
deleted file mode 100644
index 8997d4c092..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/transient/transient_detector.cc
+++ /dev/null
@@ -1,175 +0,0 @@
-/*
- *  Copyright (c) 2013 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#include "modules/audio_processing/transient/transient_detector.h"
-
-#include <float.h>
-#include <math.h>
-#include <string.h>
-#include <algorithm>
-
-#include "modules/audio_processing/transient/common.h"
-#include "modules/audio_processing/transient/daubechies_8_wavelet_coeffs.h"
-#include "modules/audio_processing/transient/moving_moments.h"
-#include "modules/audio_processing/transient/wpd_node.h"
-#include "modules/audio_processing/transient/wpd_tree.h"
-#include "rtc_base/checks.h"
-
-namespace webrtc {
-
-static const int kTransientLengthMs = 30;
-static const int kChunksAtStartupLeftToDelete =
-    kTransientLengthMs / ts::kChunkSizeMs;
-static const float kDetectThreshold = 16.f;
-
-TransientDetector::TransientDetector(int sample_rate_hz)
-    : samples_per_chunk_(sample_rate_hz * ts::kChunkSizeMs / 1000),
-      last_first_moment_(),
-      last_second_moment_(),
-      chunks_at_startup_left_to_delete_(kChunksAtStartupLeftToDelete),
-      reference_energy_(1.f),
-      using_reference_(false) {
-  RTC_DCHECK(sample_rate_hz == ts::kSampleRate8kHz ||
-             sample_rate_hz == ts::kSampleRate16kHz ||
-             sample_rate_hz == ts::kSampleRate32kHz ||
-             sample_rate_hz == ts::kSampleRate48kHz);
-  int samples_per_transient = sample_rate_hz * kTransientLengthMs / 1000;
-  // Adjustment to avoid data loss while downsampling, making
-  // |samples_per_chunk_| and |samples_per_transient| always divisible by
-  // |kLeaves|.
-  samples_per_chunk_ -= samples_per_chunk_ % kLeaves;
-  samples_per_transient -= samples_per_transient % kLeaves;
-
-  tree_leaves_data_length_ = samples_per_chunk_ / kLeaves;
-  wpd_tree_.reset(new WPDTree(samples_per_chunk_,
-                              kDaubechies8HighPassCoefficients,
-                              kDaubechies8LowPassCoefficients,
-                              kDaubechies8CoefficientsLength, kLevels));
-  for (size_t i = 0; i < kLeaves; ++i) {
-    moving_moments_[i].reset(
-        new MovingMoments(samples_per_transient / kLeaves));
-  }
-
-  first_moments_.reset(new float[tree_leaves_data_length_]);
-  second_moments_.reset(new float[tree_leaves_data_length_]);
-
-  for (int i = 0; i < kChunksAtStartupLeftToDelete; ++i) {
-    previous_results_.push_back(0.f);
-  }
-}
-
-TransientDetector::~TransientDetector() {}
-
-float TransientDetector::Detect(const float* data,
-                                size_t data_length,
-                                const float* reference_data,
-                                size_t reference_length) {
-  RTC_DCHECK(data);
-  RTC_DCHECK_EQ(samples_per_chunk_, data_length);
-
-  // TODO(aluebs): Check if these errors can logically happen and if not assert
-  // on them.
-  if (wpd_tree_->Update(data, samples_per_chunk_) != 0) {
-    return -1.f;
-  }
-
-  float result = 0.f;
-
-  for (size_t i = 0; i < kLeaves; ++i) {
-    WPDNode* leaf = wpd_tree_->NodeAt(kLevels, i);
-
-    moving_moments_[i]->CalculateMoments(leaf->data(), tree_leaves_data_length_,
-                                         first_moments_.get(),
-                                         second_moments_.get());
-
-    // Add value delayed (Use the last moments from the last call to Detect).
-    float unbiased_data = leaf->data()[0] - last_first_moment_[i];
-    result +=
-        unbiased_data * unbiased_data / (last_second_moment_[i] + FLT_MIN);
-
-    // Add new values.
-    for (size_t j = 1; j < tree_leaves_data_length_; ++j) {
-      unbiased_data = leaf->data()[j] - first_moments_[j - 1];
-      result +=
-          unbiased_data * unbiased_data / (second_moments_[j - 1] + FLT_MIN);
-    }
-
-    last_first_moment_[i] = first_moments_[tree_leaves_data_length_ - 1];
-    last_second_moment_[i] = second_moments_[tree_leaves_data_length_ - 1];
-  }
-
-  result /= tree_leaves_data_length_;
-
-  result *= ReferenceDetectionValue(reference_data, reference_length);
-
-  if (chunks_at_startup_left_to_delete_ > 0) {
-    chunks_at_startup_left_to_delete_--;
-    result = 0.f;
-  }
-
-  if (result >= kDetectThreshold) {
-    result = 1.f;
-  } else {
-    // Get proportional value.
-    // Proportion achieved with a squared raised cosine function with domain
-    // [0, kDetectThreshold) and image [0, 1), it's always increasing.
-    const float horizontal_scaling = ts::kPi / kDetectThreshold;
-    const float kHorizontalShift = ts::kPi;
-    const float kVerticalScaling = 0.5f;
-    const float kVerticalShift = 1.f;
-
-    result =
-        (cos(result * horizontal_scaling + kHorizontalShift) + kVerticalShift) *
-        kVerticalScaling;
-    result *= result;
-  }
-
-  previous_results_.pop_front();
-  previous_results_.push_back(result);
-
-  // In the current implementation we return the max of the current result and
-  // the previous results, so the high results have a width equals to
-  // |transient_length|.
-  return *std::max_element(previous_results_.begin(), previous_results_.end());
-}
-
-// Looks for the highest slope and compares it with the previous ones.
-// An exponential transformation takes this to the [0, 1] range. This value is
-// multiplied by the detection result to avoid false positives.
-float TransientDetector::ReferenceDetectionValue(const float* data,
-                                                 size_t length) {
-  if (data == NULL) {
-    using_reference_ = false;
-    return 1.f;
-  }
-  static const float kEnergyRatioThreshold = 0.2f;
-  static const float kReferenceNonLinearity = 20.f;
-  static const float kMemory = 0.99f;
-  float reference_energy = 0.f;
-  for (size_t i = 1; i < length; ++i) {
-    reference_energy += data[i] * data[i];
-  }
-  if (reference_energy == 0.f) {
-    using_reference_ = false;
-    return 1.f;
-  }
-  RTC_DCHECK_NE(0, reference_energy_);
-  float result = 1.f / (1.f + exp(kReferenceNonLinearity *
-                                  (kEnergyRatioThreshold -
-                                   reference_energy / reference_energy_)));
-  reference_energy_ =
-      kMemory * reference_energy_ + (1.f - kMemory) * reference_energy;
-
-  using_reference_ = true;
-
-  return result;
-}
-
-}  // namespace webrtc
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/transient/transient_detector.h b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/transient/transient_detector.h
deleted file mode 100644
index 23b88f82b1..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/transient/transient_detector.h
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
- *  Copyright (c) 2013 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#ifndef MODULES_AUDIO_PROCESSING_TRANSIENT_TRANSIENT_DETECTOR_H_
-#define MODULES_AUDIO_PROCESSING_TRANSIENT_TRANSIENT_DETECTOR_H_
-
-#include <stddef.h>
-#include <deque>
-#include <memory>
-
-#include "modules/audio_processing/transient/moving_moments.h"
-#include "modules/audio_processing/transient/wpd_tree.h"
-
-namespace webrtc {
-
-// This is an implementation of the transient detector described in "Causal
-// Wavelet based transient detector".
-// Calculates the log-likelihood of a transient to happen on a signal at any
-// given time based on the previous samples; it uses a WPD tree to analyze the
-// signal.  It preserves its state, so it can be multiple-called.
-class TransientDetector {
- public:
-  // TODO(chadan): The only supported wavelet is Daubechies 8 using a WPD tree
-  // of 3 levels. Make an overloaded constructor to allow different wavelets and
-  // depths of the tree. When needed.
-
-  // Creates a wavelet based transient detector.
-  TransientDetector(int sample_rate_hz);
-
-  ~TransientDetector();
-
-  // Calculates the log-likelihood of the existence of a transient in |data|.
-  // |data_length| has to be equal to |samples_per_chunk_|.
-  // Returns a value between 0 and 1, as a non linear representation of this
-  // likelihood.
-  // Returns a negative value on error.
-  float Detect(const float* data,
-               size_t data_length,
-               const float* reference_data,
-               size_t reference_length);
-
-  bool using_reference() { return using_reference_; }
-
- private:
-  float ReferenceDetectionValue(const float* data, size_t length);
-
-  static const size_t kLevels = 3;
-  static const size_t kLeaves = 1 << kLevels;
-
-  size_t samples_per_chunk_;
-
-  std::unique_ptr<WPDTree> wpd_tree_;
-  size_t tree_leaves_data_length_;
-
-  // A MovingMoments object is needed for each leaf in the WPD tree.
-  std::unique_ptr<MovingMoments> moving_moments_[kLeaves];
-
-  std::unique_ptr<float[]> first_moments_;
-  std::unique_ptr<float[]> second_moments_;
-
-  // Stores the last calculated moments from the previous detection.
-  float last_first_moment_[kLeaves];
-  float last_second_moment_[kLeaves];
-
-  // We keep track of the previous results from the previous chunks, so it can
-  // be used to effectively give results according to the |transient_length|.
-  std::deque<float> previous_results_;
-
-  // Number of chunks that are going to return only zeros at the beginning of
-  // the detection. It helps to avoid infs and nans due to the lack of
-  // information.
-  int chunks_at_startup_left_to_delete_;
-
-  float reference_energy_;
-
-  bool using_reference_;
-};
-
-}  // namespace webrtc
-
-#endif  // MODULES_AUDIO_PROCESSING_TRANSIENT_TRANSIENT_DETECTOR_H_
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/transient/transient_suppressor.cc b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/transient/transient_suppressor.cc
deleted file mode 100644
index 1a5ed5669f..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/transient/transient_suppressor.cc
+++ /dev/null
@@ -1,408 +0,0 @@
-/*
- *  Copyright (c) 2013 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#include "modules/audio_processing/transient/transient_suppressor.h"
-
-#include <math.h>
-#include <string.h>
-#include <cmath>
-#include <complex>
-#include <deque>
-#include <set>
-
-#include "common_audio/include/audio_util.h"
-#include "common_audio/signal_processing/include/signal_processing_library.h"
-#include "common_audio/third_party/fft4g/fft4g.h"
-#include "modules/audio_processing/ns/windows_private.h"
-#include "modules/audio_processing/transient/common.h"
-#include "modules/audio_processing/transient/transient_detector.h"
-#include "rtc_base/checks.h"
-#include "rtc_base/logging.h"
-
-namespace webrtc {
-
-static const float kMeanIIRCoefficient = 0.5f;
-static const float kVoiceThreshold = 0.02f;
-
-// TODO(aluebs): Check if these values work also for 48kHz.
-static const size_t kMinVoiceBin = 3;
-static const size_t kMaxVoiceBin = 60;
-
-namespace {
-
-float ComplexMagnitude(float a, float b) {
-  return std::abs(a) + std::abs(b);
-}
-
-}  // namespace
-
-TransientSuppressor::TransientSuppressor()
-    : data_length_(0),
-      detection_length_(0),
-      analysis_length_(0),
-      buffer_delay_(0),
-      complex_analysis_length_(0),
-      num_channels_(0),
-      window_(NULL),
-      detector_smoothed_(0.f),
-      keypress_counter_(0),
-      chunks_since_keypress_(0),
-      detection_enabled_(false),
-      suppression_enabled_(false),
-      use_hard_restoration_(false),
-      chunks_since_voice_change_(0),
-      seed_(182),
-      using_reference_(false) {}
-
-TransientSuppressor::~TransientSuppressor() {}
-
-int TransientSuppressor::Initialize(int sample_rate_hz,
-                                    int detection_rate_hz,
-                                    int num_channels) {
-  switch (sample_rate_hz) {
-    case ts::kSampleRate8kHz:
-      analysis_length_ = 128u;
-      window_ = kBlocks80w128;
-      break;
-    case ts::kSampleRate16kHz:
-      analysis_length_ = 256u;
-      window_ = kBlocks160w256;
-      break;
-    case ts::kSampleRate32kHz:
-      analysis_length_ = 512u;
-      window_ = kBlocks320w512;
-      break;
-    case ts::kSampleRate48kHz:
-      analysis_length_ = 1024u;
-      window_ = kBlocks480w1024;
-      break;
-    default:
-      return -1;
-  }
-  if (detection_rate_hz != ts::kSampleRate8kHz &&
-      detection_rate_hz != ts::kSampleRate16kHz &&
-      detection_rate_hz != ts::kSampleRate32kHz &&
-      detection_rate_hz != ts::kSampleRate48kHz) {
-    return -1;
-  }
-  if (num_channels <= 0) {
-    return -1;
-  }
-
-  detector_.reset(new TransientDetector(detection_rate_hz));
-  data_length_ = sample_rate_hz * ts::kChunkSizeMs / 1000;
-  if (data_length_ > analysis_length_) {
-    RTC_NOTREACHED();
-    return -1;
-  }
-  buffer_delay_ = analysis_length_ - data_length_;
-
-  complex_analysis_length_ = analysis_length_ / 2 + 1;
-  RTC_DCHECK_GE(complex_analysis_length_, kMaxVoiceBin);
-  num_channels_ = num_channels;
-  in_buffer_.reset(new float[analysis_length_ * num_channels_]);
-  memset(in_buffer_.get(), 0,
-         analysis_length_ * num_channels_ * sizeof(in_buffer_[0]));
-  detection_length_ = detection_rate_hz * ts::kChunkSizeMs / 1000;
-  detection_buffer_.reset(new float[detection_length_]);
-  memset(detection_buffer_.get(), 0,
-         detection_length_ * sizeof(detection_buffer_[0]));
-  out_buffer_.reset(new float[analysis_length_ * num_channels_]);
-  memset(out_buffer_.get(), 0,
-         analysis_length_ * num_channels_ * sizeof(out_buffer_[0]));
-  // ip[0] must be zero to trigger initialization using rdft().
-  size_t ip_length = 2 + sqrtf(analysis_length_);
-  ip_.reset(new size_t[ip_length]());
-  memset(ip_.get(), 0, ip_length * sizeof(ip_[0]));
-  wfft_.reset(new float[complex_analysis_length_ - 1]);
-  memset(wfft_.get(), 0, (complex_analysis_length_ - 1) * sizeof(wfft_[0]));
-  spectral_mean_.reset(new float[complex_analysis_length_ * num_channels_]);
-  memset(spectral_mean_.get(), 0,
-         complex_analysis_length_ * num_channels_ * sizeof(spectral_mean_[0]));
-  fft_buffer_.reset(new float[analysis_length_ + 2]);
-  memset(fft_buffer_.get(), 0, (analysis_length_ + 2) * sizeof(fft_buffer_[0]));
-  magnitudes_.reset(new float[complex_analysis_length_]);
-  memset(magnitudes_.get(), 0,
-         complex_analysis_length_ * sizeof(magnitudes_[0]));
-  mean_factor_.reset(new float[complex_analysis_length_]);
-
-  static const float kFactorHeight = 10.f;
-  static const float kLowSlope = 1.f;
-  static const float kHighSlope = 0.3f;
-  for (size_t i = 0; i < complex_analysis_length_; ++i) {
-    mean_factor_[i] =
-        kFactorHeight /
-            (1.f + exp(kLowSlope * static_cast<int>(i - kMinVoiceBin))) +
-        kFactorHeight /
-            (1.f + exp(kHighSlope * static_cast<int>(kMaxVoiceBin - i)));
-  }
-  detector_smoothed_ = 0.f;
-  keypress_counter_ = 0;
-  chunks_since_keypress_ = 0;
-  detection_enabled_ = false;
-  suppression_enabled_ = false;
-  use_hard_restoration_ = false;
-  chunks_since_voice_change_ = 0;
-  seed_ = 182;
-  using_reference_ = false;
-  return 0;
-}
-
-int TransientSuppressor::Suppress(float* data,
-                                  size_t data_length,
-                                  int num_channels,
-                                  const float* detection_data,
-                                  size_t detection_length,
-                                  const float* reference_data,
-                                  size_t reference_length,
-                                  float voice_probability,
-                                  bool key_pressed) {
-  if (!data || data_length != data_length_ || num_channels != num_channels_ ||
-      detection_length != detection_length_ || voice_probability < 0 ||
-      voice_probability > 1) {
-    return -1;
-  }
-
-  UpdateKeypress(key_pressed);
-  UpdateBuffers(data);
-
-  int result = 0;
-  if (detection_enabled_) {
-    UpdateRestoration(voice_probability);
-
-    if (!detection_data) {
-      // Use the input data  of the first channel if special detection data is
-      // not supplied.
-      detection_data = &in_buffer_[buffer_delay_];
-    }
-
-    float detector_result = detector_->Detect(detection_data, detection_length,
-                                              reference_data, reference_length);
-    if (detector_result < 0) {
-      return -1;
-    }
-
-    using_reference_ = detector_->using_reference();
-
-    // |detector_smoothed_| follows the |detector_result| when this last one is
-    // increasing, but has an exponential decaying tail to be able to suppress
-    // the ringing of keyclicks.
-    float smooth_factor = using_reference_ ? 0.6 : 0.1;
-    detector_smoothed_ = detector_result >= detector_smoothed_
-                             ? detector_result
-                             : smooth_factor * detector_smoothed_ +
-                                   (1 - smooth_factor) * detector_result;
-
-    for (int i = 0; i < num_channels_; ++i) {
-      Suppress(&in_buffer_[i * analysis_length_],
-               &spectral_mean_[i * complex_analysis_length_],
-               &out_buffer_[i * analysis_length_]);
-    }
-  }
-
-  // If the suppression isn't enabled, we use the in buffer to delay the signal
-  // appropriately. This also gives time for the out buffer to be refreshed with
-  // new data between detection and suppression getting enabled.
-  for (int i = 0; i < num_channels_; ++i) {
-    memcpy(&data[i * data_length_],
-           suppression_enabled_ ? &out_buffer_[i * analysis_length_]
-                                : &in_buffer_[i * analysis_length_],
-           data_length_ * sizeof(*data));
-  }
-  return result;
-}
-
-// This should only be called when detection is enabled. UpdateBuffers() must
-// have been called. At return, |out_buffer_| will be filled with the
-// processed output.
-void TransientSuppressor::Suppress(float* in_ptr,
-                                   float* spectral_mean,
-                                   float* out_ptr) {
-  // Go to frequency domain.
-  for (size_t i = 0; i < analysis_length_; ++i) {
-    // TODO(aluebs): Rename windows
-    fft_buffer_[i] = in_ptr[i] * window_[i];
-  }
-
-  WebRtc_rdft(analysis_length_, 1, fft_buffer_.get(), ip_.get(), wfft_.get());
-
-  // Since WebRtc_rdft puts R[n/2] in fft_buffer_[1], we move it to the end
-  // for convenience.
-  fft_buffer_[analysis_length_] = fft_buffer_[1];
-  fft_buffer_[analysis_length_ + 1] = 0.f;
-  fft_buffer_[1] = 0.f;
-
-  for (size_t i = 0; i < complex_analysis_length_; ++i) {
-    magnitudes_[i] =
-        ComplexMagnitude(fft_buffer_[i * 2], fft_buffer_[i * 2 + 1]);
-  }
-  // Restore audio if necessary.
-  if (suppression_enabled_) {
-    if (use_hard_restoration_) {
-      HardRestoration(spectral_mean);
-    } else {
-      SoftRestoration(spectral_mean);
-    }
-  }
-
-  // Update the spectral mean.
-  for (size_t i = 0; i < complex_analysis_length_; ++i) {
-    spectral_mean[i] = (1 - kMeanIIRCoefficient) * spectral_mean[i] +
-                       kMeanIIRCoefficient * magnitudes_[i];
-  }
-
-  // Back to time domain.
-  // Put R[n/2] back in fft_buffer_[1].
-  fft_buffer_[1] = fft_buffer_[analysis_length_];
-
-  WebRtc_rdft(analysis_length_, -1, fft_buffer_.get(), ip_.get(), wfft_.get());
-  const float fft_scaling = 2.f / analysis_length_;
-
-  for (size_t i = 0; i < analysis_length_; ++i) {
-    out_ptr[i] += fft_buffer_[i] * window_[i] * fft_scaling;
-  }
-}
-
-void TransientSuppressor::UpdateKeypress(bool key_pressed) {
-  const int kKeypressPenalty = 1000 / ts::kChunkSizeMs;
-  const int kIsTypingThreshold = 1000 / ts::kChunkSizeMs;
-  const int kChunksUntilNotTyping = 4000 / ts::kChunkSizeMs;  // 4 seconds.
-
-  if (key_pressed) {
-    keypress_counter_ += kKeypressPenalty;
-    chunks_since_keypress_ = 0;
-    detection_enabled_ = true;
-  }
-  keypress_counter_ = std::max(0, keypress_counter_ - 1);
-
-  if (keypress_counter_ > kIsTypingThreshold) {
-    if (!suppression_enabled_) {
-      RTC_LOG(LS_INFO) << "[ts] Transient suppression is now enabled.";
-    }
-    suppression_enabled_ = true;
-    keypress_counter_ = 0;
-  }
-
-  if (detection_enabled_ && ++chunks_since_keypress_ > kChunksUntilNotTyping) {
-    if (suppression_enabled_) {
-      RTC_LOG(LS_INFO) << "[ts] Transient suppression is now disabled.";
-    }
-    detection_enabled_ = false;
-    suppression_enabled_ = false;
-    keypress_counter_ = 0;
-  }
-}
-
-void TransientSuppressor::UpdateRestoration(float voice_probability) {
-  const int kHardRestorationOffsetDelay = 3;
-  const int kHardRestorationOnsetDelay = 80;
-
-  bool not_voiced = voice_probability < kVoiceThreshold;
-
-  if (not_voiced == use_hard_restoration_) {
-    chunks_since_voice_change_ = 0;
-  } else {
-    ++chunks_since_voice_change_;
-
-    if ((use_hard_restoration_ &&
-         chunks_since_voice_change_ > kHardRestorationOffsetDelay) ||
-        (!use_hard_restoration_ &&
-         chunks_since_voice_change_ > kHardRestorationOnsetDelay)) {
-      use_hard_restoration_ = not_voiced;
-      chunks_since_voice_change_ = 0;
-    }
-  }
-}
-
-// Shift buffers to make way for new data. Must be called after
-// |detection_enabled_| is updated by UpdateKeypress().
-void TransientSuppressor::UpdateBuffers(float* data) {
-  // TODO(aluebs): Change to ring buffer.
-  memmove(in_buffer_.get(), &in_buffer_[data_length_],
-          (buffer_delay_ + (num_channels_ - 1) * analysis_length_) *
-              sizeof(in_buffer_[0]));
-  // Copy new chunk to buffer.
-  for (int i = 0; i < num_channels_; ++i) {
-    memcpy(&in_buffer_[buffer_delay_ + i * analysis_length_],
-           &data[i * data_length_], data_length_ * sizeof(*data));
-  }
-  if (detection_enabled_) {
-    // Shift previous chunk in out buffer.
-    memmove(out_buffer_.get(), &out_buffer_[data_length_],
-            (buffer_delay_ + (num_channels_ - 1) * analysis_length_) *
-                sizeof(out_buffer_[0]));
-    // Initialize new chunk in out buffer.
-    for (int i = 0; i < num_channels_; ++i) {
-      memset(&out_buffer_[buffer_delay_ + i * analysis_length_], 0,
-             data_length_ * sizeof(out_buffer_[0]));
-    }
-  }
-}
-
-// Restores the unvoiced signal if a click is present.
-// Attenuates by a certain factor every peak in the |fft_buffer_| that exceeds
-// the spectral mean. The attenuation depends on |detector_smoothed_|.
-// If a restoration takes place, the |magnitudes_| are updated to the new value.
-void TransientSuppressor::HardRestoration(float* spectral_mean) {
-  const float detector_result =
-      1.f - pow(1.f - detector_smoothed_, using_reference_ ? 200.f : 50.f);
-  // To restore, we get the peaks in the spectrum. If higher than the previous
-  // spectral mean we adjust them.
-  for (size_t i = 0; i < complex_analysis_length_; ++i) {
-    if (magnitudes_[i] > spectral_mean[i] && magnitudes_[i] > 0) {
-      // RandU() generates values on [0, int16::max()]
-      const float phase = 2 * ts::kPi * WebRtcSpl_RandU(&seed_) /
-                          std::numeric_limits<int16_t>::max();
-      const float scaled_mean = detector_result * spectral_mean[i];
-
-      fft_buffer_[i * 2] = (1 - detector_result) * fft_buffer_[i * 2] +
-                           scaled_mean * cosf(phase);
-      fft_buffer_[i * 2 + 1] = (1 - detector_result) * fft_buffer_[i * 2 + 1] +
-                               scaled_mean * sinf(phase);
-      magnitudes_[i] = magnitudes_[i] -
-                       detector_result * (magnitudes_[i] - spectral_mean[i]);
-    }
-  }
-}
-
-// Restores the voiced signal if a click is present.
-// Attenuates by a certain factor every peak in the |fft_buffer_| that exceeds
-// the spectral mean and that is lower than some function of the current block
-// frequency mean. The attenuation depends on |detector_smoothed_|.
-// If a restoration takes place, the |magnitudes_| are updated to the new value.
-void TransientSuppressor::SoftRestoration(float* spectral_mean) {
-  // Get the spectral magnitude mean of the current block.
-  float block_frequency_mean = 0;
-  for (size_t i = kMinVoiceBin; i < kMaxVoiceBin; ++i) {
-    block_frequency_mean += magnitudes_[i];
-  }
-  block_frequency_mean /= (kMaxVoiceBin - kMinVoiceBin);
-
-  // To restore, we get the peaks in the spectrum. If higher than the
-  // previous spectral mean and lower than a factor of the block mean
-  // we adjust them. The factor is a double sigmoid that has a minimum in the
-  // voice frequency range (300Hz - 3kHz).
-  for (size_t i = 0; i < complex_analysis_length_; ++i) {
-    if (magnitudes_[i] > spectral_mean[i] && magnitudes_[i] > 0 &&
-        (using_reference_ ||
-         magnitudes_[i] < block_frequency_mean * mean_factor_[i])) {
-      const float new_magnitude =
-          magnitudes_[i] -
-          detector_smoothed_ * (magnitudes_[i] - spectral_mean[i]);
-      const float magnitude_ratio = new_magnitude / magnitudes_[i];
-
-      fft_buffer_[i * 2] *= magnitude_ratio;
-      fft_buffer_[i * 2 + 1] *= magnitude_ratio;
-      magnitudes_[i] = new_magnitude;
-    }
-  }
-}
-
-}  // namespace webrtc
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/transient/transient_suppressor.h b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/transient/transient_suppressor.h
deleted file mode 100644
index ae51966a3d..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/transient/transient_suppressor.h
+++ /dev/null
@@ -1,119 +0,0 @@
-/*
- *  Copyright (c) 2013 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#ifndef MODULES_AUDIO_PROCESSING_TRANSIENT_TRANSIENT_SUPPRESSOR_H_
-#define MODULES_AUDIO_PROCESSING_TRANSIENT_TRANSIENT_SUPPRESSOR_H_
-
-#include <stddef.h>
-#include <stdint.h>
-#include <memory>
-
-#include "rtc_base/gtest_prod_util.h"
-
-namespace webrtc {
-
-class TransientDetector;
-
-// Detects transients in an audio stream and suppress them using a simple
-// restoration algorithm that attenuates unexpected spikes in the spectrum.
-class TransientSuppressor {
- public:
-  TransientSuppressor();
-  ~TransientSuppressor();
-
-  int Initialize(int sample_rate_hz, int detector_rate_hz, int num_channels);
-
-  // Processes a |data| chunk, and returns it with keystrokes suppressed from
-  // it. The float format is assumed to be int16 ranged. If there are more than
-  // one channel, the chunks are concatenated one after the other in |data|.
-  // |data_length| must be equal to |data_length_|.
-  // |num_channels| must be equal to |num_channels_|.
-  // A sub-band, ideally the higher, can be used as |detection_data|. If it is
-  // NULL, |data| is used for the detection too. The |detection_data| is always
-  // assumed mono.
-  // If a reference signal (e.g. keyboard microphone) is available, it can be
-  // passed in as |reference_data|. It is assumed mono and must have the same
-  // length as |data|. NULL is accepted if unavailable.
-  // This suppressor performs better if voice information is available.
-  // |voice_probability| is the probability of voice being present in this chunk
-  // of audio. If voice information is not available, |voice_probability| must
-  // always be set to 1.
-  // |key_pressed| determines if a key was pressed on this audio chunk.
-  // Returns 0 on success and -1 otherwise.
-  int Suppress(float* data,
-               size_t data_length,
-               int num_channels,
-               const float* detection_data,
-               size_t detection_length,
-               const float* reference_data,
-               size_t reference_length,
-               float voice_probability,
-               bool key_pressed);
-
- private:
-  FRIEND_TEST_ALL_PREFIXES(TransientSuppressorTest,
-                           TypingDetectionLogicWorksAsExpectedForMono);
-  void Suppress(float* in_ptr, float* spectral_mean, float* out_ptr);
-
-  void UpdateKeypress(bool key_pressed);
-  void UpdateRestoration(float voice_probability);
-
-  void UpdateBuffers(float* data);
-
-  void HardRestoration(float* spectral_mean);
-  void SoftRestoration(float* spectral_mean);
-
-  std::unique_ptr<TransientDetector> detector_;
-
-  size_t data_length_;
-  size_t detection_length_;
-  size_t analysis_length_;
-  size_t buffer_delay_;
-  size_t complex_analysis_length_;
-  int num_channels_;
-  // Input buffer where the original samples are stored.
-  std::unique_ptr<float[]> in_buffer_;
-  std::unique_ptr<float[]> detection_buffer_;
-  // Output buffer where the restored samples are stored.
-  std::unique_ptr<float[]> out_buffer_;
-
-  // Arrays for fft.
-  std::unique_ptr<size_t[]> ip_;
-  std::unique_ptr<float[]> wfft_;
-
-  std::unique_ptr<float[]> spectral_mean_;
-
-  // Stores the data for the fft.
-  std::unique_ptr<float[]> fft_buffer_;
-
-  std::unique_ptr<float[]> magnitudes_;
-
-  const float* window_;
-
-  std::unique_ptr<float[]> mean_factor_;
-
-  float detector_smoothed_;
-
-  int keypress_counter_;
-  int chunks_since_keypress_;
-  bool detection_enabled_;
-  bool suppression_enabled_;
-
-  bool use_hard_restoration_;
-  int chunks_since_voice_change_;
-
-  uint32_t seed_;
-
-  bool using_reference_;
-};
-
-}  // namespace webrtc
-
-#endif  // MODULES_AUDIO_PROCESSING_TRANSIENT_TRANSIENT_SUPPRESSOR_H_
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/transient/wpd_node.cc b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/transient/wpd_node.cc
deleted file mode 100644
index 2e0ee7e5b7..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/transient/wpd_node.cc
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- *  Copyright (c) 2013 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#include "modules/audio_processing/transient/wpd_node.h"
-
-#include <math.h>
-#include <string.h>
-
-#include "common_audio/fir_filter.h"
-#include "common_audio/fir_filter_factory.h"
-#include "modules/audio_processing/transient/dyadic_decimator.h"
-#include "rtc_base/checks.h"
-
-namespace webrtc {
-
-WPDNode::WPDNode(size_t length,
-                 const float* coefficients,
-                 size_t coefficients_length)
-    :  // The data buffer has parent data length to be able to contain and
-       // filter it.
-      data_(new float[2 * length + 1]),
-      length_(length),
-      filter_(
-          CreateFirFilter(coefficients, coefficients_length, 2 * length + 1)) {
-  RTC_DCHECK_GT(length, 0);
-  RTC_DCHECK(coefficients);
-  RTC_DCHECK_GT(coefficients_length, 0);
-  memset(data_.get(), 0.f, (2 * length + 1) * sizeof(data_[0]));
-}
-
-WPDNode::~WPDNode() {}
-
-int WPDNode::Update(const float* parent_data, size_t parent_data_length) {
-  if (!parent_data || (parent_data_length / 2) != length_) {
-    return -1;
-  }
-
-  // Filter data.
-  filter_->Filter(parent_data, parent_data_length, data_.get());
-
-  // Decimate data.
-  const bool kOddSequence = true;
-  size_t output_samples = DyadicDecimate(data_.get(), parent_data_length,
-                                         kOddSequence, data_.get(), length_);
-  if (output_samples != length_) {
-    return -1;
-  }
-
-  // Get abs to all values.
-  for (size_t i = 0; i < length_; ++i) {
-    data_[i] = fabs(data_[i]);
-  }
-
-  return 0;
-}
-
-int WPDNode::set_data(const float* new_data, size_t length) {
-  if (!new_data || length != length_) {
-    return -1;
-  }
-  memcpy(data_.get(), new_data, length * sizeof(data_[0]));
-  return 0;
-}
-
-}  // namespace webrtc
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/transient/wpd_node.h b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/transient/wpd_node.h
deleted file mode 100644
index 6a52fb7284..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/transient/wpd_node.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- *  Copyright (c) 2013 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#ifndef MODULES_AUDIO_PROCESSING_TRANSIENT_WPD_NODE_H_
-#define MODULES_AUDIO_PROCESSING_TRANSIENT_WPD_NODE_H_
-
-#include <memory>
-
-namespace webrtc {
-
-class FIRFilter;
-
-// A single node of a Wavelet Packet Decomposition (WPD) tree.
-class WPDNode {
- public:
-  // Creates a WPDNode. The data vector will contain zeros. The filter will have
-  // the coefficients provided.
-  WPDNode(size_t length, const float* coefficients, size_t coefficients_length);
-  ~WPDNode();
-
-  // Updates the node data. |parent_data| / 2 must be equals to |length_|.
-  // Returns 0 if correct, and -1 otherwise.
-  int Update(const float* parent_data, size_t parent_data_length);
-
-  const float* data() const { return data_.get(); }
-  // Returns 0 if correct, and -1 otherwise.
-  int set_data(const float* new_data, size_t length);
-  size_t length() const { return length_; }
-
- private:
-  std::unique_ptr<float[]> data_;
-  size_t length_;
-  std::unique_ptr<FIRFilter> filter_;
-};
-
-}  // namespace webrtc
-
-#endif  // MODULES_AUDIO_PROCESSING_TRANSIENT_WPD_NODE_H_
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/transient/wpd_tree.cc b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/transient/wpd_tree.cc
deleted file mode 100644
index c8aa615881..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/transient/wpd_tree.cc
+++ /dev/null
@@ -1,118 +0,0 @@
-/*
- *  Copyright (c) 2013 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#include "modules/audio_processing/transient/wpd_tree.h"
-
-#include <string.h>
-
-#include "modules/audio_processing/transient/wpd_node.h"
-#include "rtc_base/checks.h"
-
-namespace webrtc {
-
-WPDTree::WPDTree(size_t data_length,
-                 const float* high_pass_coefficients,
-                 const float* low_pass_coefficients,
-                 size_t coefficients_length,
-                 int levels)
-    : data_length_(data_length),
-      levels_(levels),
-      num_nodes_((1 << (levels + 1)) - 1) {
-  RTC_DCHECK_GT(data_length, (static_cast<size_t>(1) << levels));
-  RTC_DCHECK(high_pass_coefficients);
-  RTC_DCHECK(low_pass_coefficients);
-  RTC_DCHECK_GT(levels, 0);
-  // Size is 1 more, so we can use the array as 1-based. nodes_[0] is never
-  // allocated.
-  nodes_.reset(new std::unique_ptr<WPDNode>[num_nodes_ + 1]);
-
-  // Create the first node
-  const float kRootCoefficient = 1.f;  // Identity Coefficient.
-  nodes_[1].reset(new WPDNode(data_length, &kRootCoefficient, 1));
-  // Variables used to create the rest of the nodes.
-  size_t index = 1;
-  size_t index_left_child = 0;
-  size_t index_right_child = 0;
-
-  int num_nodes_at_curr_level = 0;
-
-  // Branching each node in each level to create its children. The last level is
-  // not branched (all the nodes of that level are leaves).
-  for (int current_level = 0; current_level < levels; ++current_level) {
-    num_nodes_at_curr_level = 1 << current_level;
-    for (int i = 0; i < num_nodes_at_curr_level; ++i) {
-      index = (1 << current_level) + i;
-      // Obtain the index of the current node children.
-      index_left_child = index * 2;
-      index_right_child = index_left_child + 1;
-      nodes_[index_left_child].reset(new WPDNode(nodes_[index]->length() / 2,
-                                                 low_pass_coefficients,
-                                                 coefficients_length));
-      nodes_[index_right_child].reset(new WPDNode(nodes_[index]->length() / 2,
-                                                  high_pass_coefficients,
-                                                  coefficients_length));
-    }
-  }
-}
-
-WPDTree::~WPDTree() {}
-
-WPDNode* WPDTree::NodeAt(int level, int index) {
-  if (level < 0 || level > levels_ || index < 0 || index >= 1 << level) {
-    return NULL;
-  }
-
-  return nodes_[(1 << level) + index].get();
-}
-
-int WPDTree::Update(const float* data, size_t data_length) {
-  if (!data || data_length != data_length_) {
-    return -1;
-  }
-
-  // Update the root node.
-  int update_result = nodes_[1]->set_data(data, data_length);
-  if (update_result != 0) {
-    return -1;
-  }
-
-  // Variables used to update the rest of the nodes.
-  size_t index = 1;
-  size_t index_left_child = 0;
-  size_t index_right_child = 0;
-
-  int num_nodes_at_curr_level = 0;
-
-  for (int current_level = 0; current_level < levels_; ++current_level) {
-    num_nodes_at_curr_level = 1 << current_level;
-    for (int i = 0; i < num_nodes_at_curr_level; ++i) {
-      index = (1 << current_level) + i;
-      // Obtain the index of the current node children.
-      index_left_child = index * 2;
-      index_right_child = index_left_child + 1;
-
-      update_result = nodes_[index_left_child]->Update(nodes_[index]->data(),
-                                                       nodes_[index]->length());
-      if (update_result != 0) {
-        return -1;
-      }
-
-      update_result = nodes_[index_right_child]->Update(
-          nodes_[index]->data(), nodes_[index]->length());
-      if (update_result != 0) {
-        return -1;
-      }
-    }
-  }
-
-  return 0;
-}
-
-}  // namespace webrtc
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/transient/wpd_tree.h b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/transient/wpd_tree.h
deleted file mode 100644
index b62135dafa..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/transient/wpd_tree.h
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
- *  Copyright (c) 2013 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#ifndef MODULES_AUDIO_PROCESSING_TRANSIENT_WPD_TREE_H_
-#define MODULES_AUDIO_PROCESSING_TRANSIENT_WPD_TREE_H_
-
-#include <stddef.h>
-#include <memory>
-
-#include "modules/audio_processing/transient/wpd_node.h"
-
-namespace webrtc {
-
-// Tree of a Wavelet Packet Decomposition (WPD).
-//
-// The root node contains all the data provided; for each node in the tree, the
-// left child contains the approximation coefficients extracted from the node,
-// and the right child contains the detail coefficients.
-// It preserves its state, so it can be multiple-called.
-//
-// The number of nodes in the tree will be 2 ^ levels - 1.
-//
-// Implementation details: Since the tree always will be a complete binary tree,
-// it is implemented using a single linear array instead of managing the
-// relationships in each node. For convience is better to use a array that
-// starts in 1 (instead of 0). Taking that into account, the following formulas
-// apply:
-// Root node index: 1.
-// Node(Level, Index in that level): 2 ^ Level + (Index in that level).
-// Left Child: Current node index * 2.
-// Right Child: Current node index * 2 + 1.
-// Parent: Current Node Index / 2 (Integer division).
-class WPDTree {
- public:
-  // Creates a WPD tree using the data length and coefficients provided.
-  WPDTree(size_t data_length,
-          const float* high_pass_coefficients,
-          const float* low_pass_coefficients,
-          size_t coefficients_length,
-          int levels);
-  ~WPDTree();
-
-  // Returns the number of nodes at any given level.
-  static int NumberOfNodesAtLevel(int level) { return 1 << level; }
-
-  // Returns a pointer to the node at the given level and index(of that level).
-  // Level goes from 0 to levels().
-  // Index goes from 0 to the number of NumberOfNodesAtLevel(level) - 1.
-  //
-  // You can use the following formulas to get any node within the tree:
-  // Notation: (Level, Index of node in that level).
-  // Root node: (0/0).
-  // Left Child: (Current node level + 1, Current node index * 2).
-  // Right Child: (Current node level + 1, Current node index * 2 + 1).
-  // Parent: (Current node level - 1, Current node index / 2) (Integer division)
-  //
-  // If level or index are out of bounds the function will return NULL.
-  WPDNode* NodeAt(int level, int index);
-
-  // Updates all the nodes of the tree with the new data. |data_length| must be
-  // teh same that was used for the creation of the tree.
-  // Returns 0 if correct, and -1 otherwise.
-  int Update(const float* data, size_t data_length);
-
-  // Returns the total number of levels below the root. Root is cosidered level
-  // 0.
-  int levels() const { return levels_; }
-
-  // Returns the total number of nodes.
-  int num_nodes() const { return num_nodes_; }
-
-  // Returns the total number of leaves.
-  int num_leaves() const { return 1 << levels_; }
-
- private:
-  size_t data_length_;
-  int levels_;
-  int num_nodes_;
-  std::unique_ptr<std::unique_ptr<WPDNode>[]> nodes_;
-};
-
-}  // namespace webrtc
-
-#endif  // MODULES_AUDIO_PROCESSING_TRANSIENT_WPD_TREE_H_
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/typing_detection.cc b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/typing_detection.cc
deleted file mode 100644
index e725b264ee..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/typing_detection.cc
+++ /dev/null
@@ -1,93 +0,0 @@
-/*
- *  Copyright (c) 2014 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#include "modules/audio_processing/typing_detection.h"
-
-namespace webrtc {
-
-TypingDetection::TypingDetection()
-    : time_active_(0),
-      time_since_last_typing_(0),
-      penalty_counter_(0),
-      counter_since_last_detection_update_(0),
-      detection_to_report_(false),
-      new_detection_to_report_(false),
-      time_window_(10),
-      cost_per_typing_(100),
-      reporting_threshold_(300),
-      penalty_decay_(1),
-      type_event_delay_(2),
-      report_detection_update_period_(1) {}
-
-TypingDetection::~TypingDetection() {}
-
-bool TypingDetection::Process(bool key_pressed, bool vad_activity) {
-  if (vad_activity)
-    time_active_++;
-  else
-    time_active_ = 0;
-
-  // Keep track if time since last typing event
-  if (key_pressed)
-    time_since_last_typing_ = 0;
-  else
-    ++time_since_last_typing_;
-
-  if (time_since_last_typing_ < type_event_delay_ && vad_activity &&
-      time_active_ < time_window_) {
-    penalty_counter_ += cost_per_typing_;
-    if (penalty_counter_ > reporting_threshold_)
-      new_detection_to_report_ = true;
-  }
-
-  if (penalty_counter_ > 0)
-    penalty_counter_ -= penalty_decay_;
-
-  if (++counter_since_last_detection_update_ ==
-      report_detection_update_period_) {
-    detection_to_report_ = new_detection_to_report_;
-    new_detection_to_report_ = false;
-    counter_since_last_detection_update_ = 0;
-  }
-
-  return detection_to_report_;
-}
-
-int TypingDetection::TimeSinceLastDetectionInSeconds() {
-  // Round to whole seconds.
-  return (time_since_last_typing_ + 50) / 100;
-}
-
-void TypingDetection::SetParameters(int time_window,
-                                    int cost_per_typing,
-                                    int reporting_threshold,
-                                    int penalty_decay,
-                                    int type_event_delay,
-                                    int report_detection_update_period) {
-  if (time_window)
-    time_window_ = time_window;
-
-  if (cost_per_typing)
-    cost_per_typing_ = cost_per_typing;
-
-  if (reporting_threshold)
-    reporting_threshold_ = reporting_threshold;
-
-  if (penalty_decay)
-    penalty_decay_ = penalty_decay;
-
-  if (type_event_delay)
-    type_event_delay_ = type_event_delay;
-
-  if (report_detection_update_period)
-    report_detection_update_period_ = report_detection_update_period;
-}
-
-}  // namespace webrtc
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/typing_detection.h b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/typing_detection.h
deleted file mode 100644
index d8fb3592c9..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/typing_detection.h
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
- *  Copyright (c) 2014 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#ifndef MODULES_AUDIO_PROCESSING_TYPING_DETECTION_H_
-#define MODULES_AUDIO_PROCESSING_TYPING_DETECTION_H_
-
-#include "rtc_base/system/rtc_export.h"
-
-namespace webrtc {
-
-class RTC_EXPORT TypingDetection {
- public:
-  TypingDetection();
-  virtual ~TypingDetection();
-
-  // Run the detection algortihm. Shall be called every 10 ms. Returns true if
-  // typing is detected, or false if not, based on the update period as set with
-  // SetParameters(). See |report_detection_update_period_| description below.
-  bool Process(bool key_pressed, bool vad_activity);
-
-  // Gets the time in seconds since the last detection.
-  int TimeSinceLastDetectionInSeconds();
-
-  // Sets the algorithm parameters. A parameter value of 0 leaves it unchanged.
-  // See the correspondning member variables below for descriptions.
-  void SetParameters(int time_window,
-                     int cost_per_typing,
-                     int reporting_threshold,
-                     int penalty_decay,
-                     int type_event_delay,
-                     int report_detection_update_period);
-
- private:
-  int time_active_;
-  int time_since_last_typing_;
-  int penalty_counter_;
-
-  // Counter since last time the detection status reported by Process() was
-  // updated. See also |report_detection_update_period_|.
-  int counter_since_last_detection_update_;
-
-  // The detection status to report. Updated every
-  // |report_detection_update_period_| call to Process().
-  bool detection_to_report_;
-
-  // What |detection_to_report_| should be set to next time it is updated.
-  bool new_detection_to_report_;
-
-  // Settable threshold values.
-
-  // Number of 10 ms slots accepted to count as a hit.
-  int time_window_;
-
-  // Penalty added for a typing + activity coincide.
-  int cost_per_typing_;
-
-  // Threshold for |penalty_counter_|.
-  int reporting_threshold_;
-
-  // How much we reduce |penalty_counter_| every 10 ms.
-  int penalty_decay_;
-
-  // How old typing events we allow.
-  int type_event_delay_;
-
-  // Settable update period.
-
-  // Number of 10 ms slots between each update of the detection status returned
-  // by Process(). This inertia added to the algorithm is usually desirable and
-  // provided so that consumers of the class don't have to implement that
-  // themselves if they don't wish.
-  // If set to 1, each call to Process() will return the detection status for
-  // that 10 ms slot.
-  // If set to N (where N > 1), the detection status returned from Process()
-  // will remain the same until Process() has been called N times. Then, if none
-  // of the last N calls to Process() has detected typing for each respective
-  // 10 ms slot, Process() will return false. If at least one of the last N
-  // calls has detected typing, Process() will return true. And that returned
-  // status will then remain the same until the next N calls have been done.
-  int report_detection_update_period_;
-};
-
-}  // namespace webrtc
-
-#endif  // #ifndef MODULES_AUDIO_PROCESSING_TYPING_DETECTION_H_
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/utility/block_mean_calculator.cc b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/utility/block_mean_calculator.cc
deleted file mode 100644
index 82c1c0face..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/utility/block_mean_calculator.cc
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- *  Copyright 2016 The WebRTC Project Authors. All rights reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#include "modules/audio_processing/utility/block_mean_calculator.h"
-
-#include "rtc_base/checks.h"
-
-namespace webrtc {
-
-BlockMeanCalculator::BlockMeanCalculator(size_t block_length)
-    : block_length_(block_length), count_(0), sum_(0.0), mean_(0.0) {
-  RTC_DCHECK(block_length_ != 0);
-}
-
-void BlockMeanCalculator::Reset() {
-  Clear();
-  mean_ = 0.0;
-}
-
-void BlockMeanCalculator::AddValue(float value) {
-  sum_ += value;
-  ++count_;
-  if (count_ == block_length_) {
-    mean_ = sum_ / block_length_;
-    Clear();
-  }
-}
-
-bool BlockMeanCalculator::EndOfBlock() const {
-  return count_ == 0;
-}
-
-float BlockMeanCalculator::GetLatestMean() const {
-  return mean_;
-}
-
-// Flush all samples added.
-void BlockMeanCalculator::Clear() {
-  count_ = 0;
-  sum_ = 0.0;
-}
-
-}  // namespace webrtc
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/utility/block_mean_calculator.h b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/utility/block_mean_calculator.h
deleted file mode 100644
index cfa7cfbeba..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/utility/block_mean_calculator.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- *  Copyright 2016 The WebRTC Project Authors. All rights reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#ifndef MODULES_AUDIO_PROCESSING_UTILITY_BLOCK_MEAN_CALCULATOR_H_
-#define MODULES_AUDIO_PROCESSING_UTILITY_BLOCK_MEAN_CALCULATOR_H_
-
-#include <stddef.h>
-
-#include "rtc_base/constructormagic.h"
-
-namespace webrtc {
-
-// BlockMeanCalculator calculates the mean of a block of values. Values are
-// added one after another, and the mean is updated at the end of every block.
-class BlockMeanCalculator {
- public:
-  explicit BlockMeanCalculator(size_t block_length);
-
-  // Reset.
-  void Reset();
-
-  // Add one value to the sequence.
-  void AddValue(float value);
-
-  // Return whether the latest added value was at the end of a block.
-  bool EndOfBlock() const;
-
-  // Return the latest mean.
-  float GetLatestMean() const;
-
- private:
-  // Clear all values added.
-  void Clear();
-
-  const size_t block_length_;
-  size_t count_;
-  float sum_;
-  float mean_;
-
-  RTC_DISALLOW_COPY_AND_ASSIGN(BlockMeanCalculator);
-};
-
-}  // namespace webrtc
-
-#endif  // MODULES_AUDIO_PROCESSING_UTILITY_BLOCK_MEAN_CALCULATOR_H_
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/utility/delay_estimator.cc b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/utility/delay_estimator.cc
deleted file mode 100644
index a15b91406c..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/utility/delay_estimator.cc
+++ /dev/null
@@ -1,699 +0,0 @@
-/*
- *  Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#include "modules/audio_processing/utility/delay_estimator.h"
-
-#include <stdlib.h>
-#include <string.h>
-#include <algorithm>
-
-#include "rtc_base/checks.h"
-
-// Number of right shifts for scaling is linearly depending on number of bits in
-// the far-end binary spectrum.
-static const int kShiftsAtZero = 13;  // Right shifts at zero binary spectrum.
-static const int kShiftsLinearSlope = 3;
-
-static const int32_t kProbabilityOffset = 1024;      // 2 in Q9.
-static const int32_t kProbabilityLowerLimit = 8704;  // 17 in Q9.
-static const int32_t kProbabilityMinSpread = 2816;   // 5.5 in Q9.
-
-// Robust validation settings
-static const float kHistogramMax = 3000.f;
-static const float kLastHistogramMax = 250.f;
-static const float kMinHistogramThreshold = 1.5f;
-static const int kMinRequiredHits = 10;
-static const int kMaxHitsWhenPossiblyNonCausal = 10;
-static const int kMaxHitsWhenPossiblyCausal = 1000;
-static const float kQ14Scaling = 1.f / (1 << 14);  // Scaling by 2^14 to get Q0.
-static const float kFractionSlope = 0.05f;
-static const float kMinFractionWhenPossiblyCausal = 0.5f;
-static const float kMinFractionWhenPossiblyNonCausal = 0.25f;
-
-// Counts and returns number of bits of a 32-bit word.
-static int BitCount(uint32_t u32) {
-  uint32_t tmp =
-      u32 - ((u32 >> 1) & 033333333333) - ((u32 >> 2) & 011111111111);
-  tmp = ((tmp + (tmp >> 3)) & 030707070707);
-  tmp = (tmp + (tmp >> 6));
-  tmp = (tmp + (tmp >> 12) + (tmp >> 24)) & 077;
-
-  return ((int)tmp);
-}
-
-// Compares the |binary_vector| with all rows of the |binary_matrix| and counts
-// per row the number of times they have the same value.
-//
-// Inputs:
-//      - binary_vector     : binary "vector" stored in a long
-//      - binary_matrix     : binary "matrix" stored as a vector of long
-//      - matrix_size       : size of binary "matrix"
-//
-// Output:
-//      - bit_counts        : "Vector" stored as a long, containing for each
-//                            row the number of times the matrix row and the
-//                            input vector have the same value
-//
-static void BitCountComparison(uint32_t binary_vector,
-                               const uint32_t* binary_matrix,
-                               int matrix_size,
-                               int32_t* bit_counts) {
-  int n = 0;
-
-  // Compare |binary_vector| with all rows of the |binary_matrix|
-  for (; n < matrix_size; n++) {
-    bit_counts[n] = (int32_t)BitCount(binary_vector ^ binary_matrix[n]);
-  }
-}
-
-// Collects necessary statistics for the HistogramBasedValidation().  This
-// function has to be called prior to calling HistogramBasedValidation().  The
-// statistics updated and used by the HistogramBasedValidation() are:
-//  1. the number of |candidate_hits|, which states for how long we have had the
-//     same |candidate_delay|
-//  2. the |histogram| of candidate delays over time.  This histogram is
-//     weighted with respect to a reliability measure and time-varying to cope
-//     with possible delay shifts.
-// For further description see commented code.
-//
-// Inputs:
-//  - candidate_delay   : The delay to validate.
-//  - valley_depth_q14  : The cost function has a valley/minimum at the
-//                        |candidate_delay| location.  |valley_depth_q14| is the
-//                        cost function difference between the minimum and
-//                        maximum locations.  The value is in the Q14 domain.
-//  - valley_level_q14  : Is the cost function value at the minimum, in Q14.
-static void UpdateRobustValidationStatistics(BinaryDelayEstimator* self,
-                                             int candidate_delay,
-                                             int32_t valley_depth_q14,
-                                             int32_t valley_level_q14) {
-  const float valley_depth = valley_depth_q14 * kQ14Scaling;
-  float decrease_in_last_set = valley_depth;
-  const int max_hits_for_slow_change = (candidate_delay < self->last_delay)
-                                           ? kMaxHitsWhenPossiblyNonCausal
-                                           : kMaxHitsWhenPossiblyCausal;
-  int i = 0;
-
-  RTC_DCHECK_EQ(self->history_size, self->farend->history_size);
-  // Reset |candidate_hits| if we have a new candidate.
-  if (candidate_delay != self->last_candidate_delay) {
-    self->candidate_hits = 0;
-    self->last_candidate_delay = candidate_delay;
-  }
-  self->candidate_hits++;
-
-  // The |histogram| is updated differently across the bins.
-  // 1. The |candidate_delay| histogram bin is increased with the
-  //    |valley_depth|, which is a simple measure of how reliable the
-  //    |candidate_delay| is.  The histogram is not increased above
-  //    |kHistogramMax|.
-  self->histogram[candidate_delay] += valley_depth;
-  if (self->histogram[candidate_delay] > kHistogramMax) {
-    self->histogram[candidate_delay] = kHistogramMax;
-  }
-  // 2. The histogram bins in the neighborhood of |candidate_delay| are
-  //    unaffected.  The neighborhood is defined as x + {-2, -1, 0, 1}.
-  // 3. The histogram bins in the neighborhood of |last_delay| are decreased
-  //    with |decrease_in_last_set|.  This value equals the difference between
-  //    the cost function values at the locations |candidate_delay| and
-  //    |last_delay| until we reach |max_hits_for_slow_change| consecutive hits
-  //    at the |candidate_delay|.  If we exceed this amount of hits the
-  //    |candidate_delay| is a "potential" candidate and we start decreasing
-  //    these histogram bins more rapidly with |valley_depth|.
-  if (self->candidate_hits < max_hits_for_slow_change) {
-    decrease_in_last_set =
-        (self->mean_bit_counts[self->compare_delay] - valley_level_q14) *
-        kQ14Scaling;
-  }
-  // 4. All other bins are decreased with |valley_depth|.
-  // TODO(bjornv): Investigate how to make this loop more efficient.  Split up
-  // the loop?  Remove parts that doesn't add too much.
-  for (i = 0; i < self->history_size; ++i) {
-    int is_in_last_set = (i >= self->last_delay - 2) &&
-                         (i <= self->last_delay + 1) && (i != candidate_delay);
-    int is_in_candidate_set =
-        (i >= candidate_delay - 2) && (i <= candidate_delay + 1);
-    self->histogram[i] -=
-        decrease_in_last_set * is_in_last_set +
-        valley_depth * (!is_in_last_set && !is_in_candidate_set);
-    // 5. No histogram bin can go below 0.
-    if (self->histogram[i] < 0) {
-      self->histogram[i] = 0;
-    }
-  }
-}
-
-// Validates the |candidate_delay|, estimated in WebRtc_ProcessBinarySpectrum(),
-// based on a mix of counting concurring hits with a modified histogram
-// of recent delay estimates.  In brief a candidate is valid (returns 1) if it
-// is the most likely according to the histogram.  There are a couple of
-// exceptions that are worth mentioning:
-//  1. If the |candidate_delay| < |last_delay| it can be that we are in a
-//     non-causal state, breaking a possible echo control algorithm.  Hence, we
-//     open up for a quicker change by allowing the change even if the
-//     |candidate_delay| is not the most likely one according to the histogram.
-//  2. There's a minimum number of hits (kMinRequiredHits) and the histogram
-//     value has to reached a minimum (kMinHistogramThreshold) to be valid.
-//  3. The action is also depending on the filter length used for echo control.
-//     If the delay difference is larger than what the filter can capture, we
-//     also move quicker towards a change.
-// For further description see commented code.
-//
-// Input:
-//  - candidate_delay     : The delay to validate.
-//
-// Return value:
-//  - is_histogram_valid  : 1 - The |candidate_delay| is valid.
-//                          0 - Otherwise.
-static int HistogramBasedValidation(const BinaryDelayEstimator* self,
-                                    int candidate_delay) {
-  float fraction = 1.f;
-  float histogram_threshold = self->histogram[self->compare_delay];
-  const int delay_difference = candidate_delay - self->last_delay;
-  int is_histogram_valid = 0;
-
-  // The histogram based validation of |candidate_delay| is done by comparing
-  // the |histogram| at bin |candidate_delay| with a |histogram_threshold|.
-  // This |histogram_threshold| equals a |fraction| of the |histogram| at bin
-  // |last_delay|.  The |fraction| is a piecewise linear function of the
-  // |delay_difference| between the |candidate_delay| and the |last_delay|
-  // allowing for a quicker move if
-  //  i) a potential echo control filter can not handle these large differences.
-  // ii) keeping |last_delay| instead of updating to |candidate_delay| could
-  //     force an echo control into a non-causal state.
-  // We further require the histogram to have reached a minimum value of
-  // |kMinHistogramThreshold|.  In addition, we also require the number of
-  // |candidate_hits| to be more than |kMinRequiredHits| to remove spurious
-  // values.
-
-  // Calculate a comparison histogram value (|histogram_threshold|) that is
-  // depending on the distance between the |candidate_delay| and |last_delay|.
-  // TODO(bjornv): How much can we gain by turning the fraction calculation
-  // into tables?
-  if (delay_difference > self->allowed_offset) {
-    fraction = 1.f - kFractionSlope * (delay_difference - self->allowed_offset);
-    fraction = (fraction > kMinFractionWhenPossiblyCausal
-                    ? fraction
-                    : kMinFractionWhenPossiblyCausal);
-  } else if (delay_difference < 0) {
-    fraction =
-        kMinFractionWhenPossiblyNonCausal - kFractionSlope * delay_difference;
-    fraction = (fraction > 1.f ? 1.f : fraction);
-  }
-  histogram_threshold *= fraction;
-  histogram_threshold =
-      (histogram_threshold > kMinHistogramThreshold ? histogram_threshold
-                                                    : kMinHistogramThreshold);
-
-  is_histogram_valid =
-      (self->histogram[candidate_delay] >= histogram_threshold) &&
-      (self->candidate_hits > kMinRequiredHits);
-
-  return is_histogram_valid;
-}
-
-// Performs a robust validation of the |candidate_delay| estimated in
-// WebRtc_ProcessBinarySpectrum().  The algorithm takes the
-// |is_instantaneous_valid| and the |is_histogram_valid| and combines them
-// into a robust validation.  The HistogramBasedValidation() has to be called
-// prior to this call.
-// For further description on how the combination is done, see commented code.
-//
-// Inputs:
-//  - candidate_delay         : The delay to validate.
-//  - is_instantaneous_valid  : The instantaneous validation performed in
-//                              WebRtc_ProcessBinarySpectrum().
-//  - is_histogram_valid      : The histogram based validation.
-//
-// Return value:
-//  - is_robust               : 1 - The candidate_delay is valid according to a
-//                                  combination of the two inputs.
-//                            : 0 - Otherwise.
-static int RobustValidation(const BinaryDelayEstimator* self,
-                            int candidate_delay,
-                            int is_instantaneous_valid,
-                            int is_histogram_valid) {
-  int is_robust = 0;
-
-  // The final robust validation is based on the two algorithms; 1) the
-  // |is_instantaneous_valid| and 2) the histogram based with result stored in
-  // |is_histogram_valid|.
-  //   i) Before we actually have a valid estimate (|last_delay| == -2), we say
-  //      a candidate is valid if either algorithm states so
-  //      (|is_instantaneous_valid| OR |is_histogram_valid|).
-  is_robust =
-      (self->last_delay < 0) && (is_instantaneous_valid || is_histogram_valid);
-  //  ii) Otherwise, we need both algorithms to be certain
-  //      (|is_instantaneous_valid| AND |is_histogram_valid|)
-  is_robust |= is_instantaneous_valid && is_histogram_valid;
-  // iii) With one exception, i.e., the histogram based algorithm can overrule
-  //      the instantaneous one if |is_histogram_valid| = 1 and the histogram
-  //      is significantly strong.
-  is_robust |= is_histogram_valid &&
-               (self->histogram[candidate_delay] > self->last_delay_histogram);
-
-  return is_robust;
-}
-
-void WebRtc_FreeBinaryDelayEstimatorFarend(BinaryDelayEstimatorFarend* self) {
-  if (self == NULL) {
-    return;
-  }
-
-  free(self->binary_far_history);
-  self->binary_far_history = NULL;
-
-  free(self->far_bit_counts);
-  self->far_bit_counts = NULL;
-
-  free(self);
-}
-
-BinaryDelayEstimatorFarend* WebRtc_CreateBinaryDelayEstimatorFarend(
-    int history_size) {
-  BinaryDelayEstimatorFarend* self = NULL;
-
-  if (history_size > 1) {
-    // Sanity conditions fulfilled.
-    self = static_cast<BinaryDelayEstimatorFarend*>(
-        malloc(sizeof(BinaryDelayEstimatorFarend)));
-  }
-  if (self == NULL) {
-    return NULL;
-  }
-
-  self->history_size = 0;
-  self->binary_far_history = NULL;
-  self->far_bit_counts = NULL;
-  if (WebRtc_AllocateFarendBufferMemory(self, history_size) == 0) {
-    WebRtc_FreeBinaryDelayEstimatorFarend(self);
-    self = NULL;
-  }
-  return self;
-}
-
-int WebRtc_AllocateFarendBufferMemory(BinaryDelayEstimatorFarend* self,
-                                      int history_size) {
-  RTC_DCHECK(self);
-  // (Re-)Allocate memory for history buffers.
-  self->binary_far_history = static_cast<uint32_t*>(
-      realloc(self->binary_far_history,
-              history_size * sizeof(*self->binary_far_history)));
-  self->far_bit_counts = static_cast<int*>(realloc(
-      self->far_bit_counts, history_size * sizeof(*self->far_bit_counts)));
-  if ((self->binary_far_history == NULL) || (self->far_bit_counts == NULL)) {
-    history_size = 0;
-  }
-  // Fill with zeros if we have expanded the buffers.
-  if (history_size > self->history_size) {
-    int size_diff = history_size - self->history_size;
-    memset(&self->binary_far_history[self->history_size], 0,
-           sizeof(*self->binary_far_history) * size_diff);
-    memset(&self->far_bit_counts[self->history_size], 0,
-           sizeof(*self->far_bit_counts) * size_diff);
-  }
-  self->history_size = history_size;
-
-  return self->history_size;
-}
-
-void WebRtc_InitBinaryDelayEstimatorFarend(BinaryDelayEstimatorFarend* self) {
-  RTC_DCHECK(self);
-  memset(self->binary_far_history, 0, sizeof(uint32_t) * self->history_size);
-  memset(self->far_bit_counts, 0, sizeof(int) * self->history_size);
-}
-
-void WebRtc_SoftResetBinaryDelayEstimatorFarend(
-    BinaryDelayEstimatorFarend* self,
-    int delay_shift) {
-  int abs_shift = abs(delay_shift);
-  int shift_size = 0;
-  int dest_index = 0;
-  int src_index = 0;
-  int padding_index = 0;
-
-  RTC_DCHECK(self);
-  shift_size = self->history_size - abs_shift;
-  RTC_DCHECK_GT(shift_size, 0);
-  if (delay_shift == 0) {
-    return;
-  } else if (delay_shift > 0) {
-    dest_index = abs_shift;
-  } else if (delay_shift < 0) {
-    src_index = abs_shift;
-    padding_index = shift_size;
-  }
-
-  // Shift and zero pad buffers.
-  memmove(&self->binary_far_history[dest_index],
-          &self->binary_far_history[src_index],
-          sizeof(*self->binary_far_history) * shift_size);
-  memset(&self->binary_far_history[padding_index], 0,
-         sizeof(*self->binary_far_history) * abs_shift);
-  memmove(&self->far_bit_counts[dest_index], &self->far_bit_counts[src_index],
-          sizeof(*self->far_bit_counts) * shift_size);
-  memset(&self->far_bit_counts[padding_index], 0,
-         sizeof(*self->far_bit_counts) * abs_shift);
-}
-
-void WebRtc_AddBinaryFarSpectrum(BinaryDelayEstimatorFarend* handle,
-                                 uint32_t binary_far_spectrum) {
-  RTC_DCHECK(handle);
-  // Shift binary spectrum history and insert current |binary_far_spectrum|.
-  memmove(&(handle->binary_far_history[1]), &(handle->binary_far_history[0]),
-          (handle->history_size - 1) * sizeof(uint32_t));
-  handle->binary_far_history[0] = binary_far_spectrum;
-
-  // Shift history of far-end binary spectrum bit counts and insert bit count
-  // of current |binary_far_spectrum|.
-  memmove(&(handle->far_bit_counts[1]), &(handle->far_bit_counts[0]),
-          (handle->history_size - 1) * sizeof(int));
-  handle->far_bit_counts[0] = BitCount(binary_far_spectrum);
-}
-
-void WebRtc_FreeBinaryDelayEstimator(BinaryDelayEstimator* self) {
-  if (self == NULL) {
-    return;
-  }
-
-  free(self->mean_bit_counts);
-  self->mean_bit_counts = NULL;
-
-  free(self->bit_counts);
-  self->bit_counts = NULL;
-
-  free(self->binary_near_history);
-  self->binary_near_history = NULL;
-
-  free(self->histogram);
-  self->histogram = NULL;
-
-  // BinaryDelayEstimator does not have ownership of |farend|, hence we do not
-  // free the memory here. That should be handled separately by the user.
-  self->farend = NULL;
-
-  free(self);
-}
-
-BinaryDelayEstimator* WebRtc_CreateBinaryDelayEstimator(
-    BinaryDelayEstimatorFarend* farend,
-    int max_lookahead) {
-  BinaryDelayEstimator* self = NULL;
-
-  if ((farend != NULL) && (max_lookahead >= 0)) {
-    // Sanity conditions fulfilled.
-    self = static_cast<BinaryDelayEstimator*>(
-        malloc(sizeof(BinaryDelayEstimator)));
-  }
-  if (self == NULL) {
-    return NULL;
-  }
-
-  self->farend = farend;
-  self->near_history_size = max_lookahead + 1;
-  self->history_size = 0;
-  self->robust_validation_enabled = 0;  // Disabled by default.
-  self->allowed_offset = 0;
-
-  self->lookahead = max_lookahead;
-
-  // Allocate memory for spectrum and history buffers.
-  self->mean_bit_counts = NULL;
-  self->bit_counts = NULL;
-  self->histogram = NULL;
-  self->binary_near_history = static_cast<uint32_t*>(
-      malloc((max_lookahead + 1) * sizeof(*self->binary_near_history)));
-  if (self->binary_near_history == NULL ||
-      WebRtc_AllocateHistoryBufferMemory(self, farend->history_size) == 0) {
-    WebRtc_FreeBinaryDelayEstimator(self);
-    self = NULL;
-  }
-
-  return self;
-}
-
-int WebRtc_AllocateHistoryBufferMemory(BinaryDelayEstimator* self,
-                                       int history_size) {
-  BinaryDelayEstimatorFarend* far = self->farend;
-  // (Re-)Allocate memory for spectrum and history buffers.
-  if (history_size != far->history_size) {
-    // Only update far-end buffers if we need.
-    history_size = WebRtc_AllocateFarendBufferMemory(far, history_size);
-  }
-  // The extra array element in |mean_bit_counts| and |histogram| is a dummy
-  // element only used while |last_delay| == -2, i.e., before we have a valid
-  // estimate.
-  self->mean_bit_counts = static_cast<int32_t*>(
-      realloc(self->mean_bit_counts,
-              (history_size + 1) * sizeof(*self->mean_bit_counts)));
-  self->bit_counts = static_cast<int32_t*>(
-      realloc(self->bit_counts, history_size * sizeof(*self->bit_counts)));
-  self->histogram = static_cast<float*>(
-      realloc(self->histogram, (history_size + 1) * sizeof(*self->histogram)));
-
-  if ((self->mean_bit_counts == NULL) || (self->bit_counts == NULL) ||
-      (self->histogram == NULL)) {
-    history_size = 0;
-  }
-  // Fill with zeros if we have expanded the buffers.
-  if (history_size > self->history_size) {
-    int size_diff = history_size - self->history_size;
-    memset(&self->mean_bit_counts[self->history_size], 0,
-           sizeof(*self->mean_bit_counts) * size_diff);
-    memset(&self->bit_counts[self->history_size], 0,
-           sizeof(*self->bit_counts) * size_diff);
-    memset(&self->histogram[self->history_size], 0,
-           sizeof(*self->histogram) * size_diff);
-  }
-  self->history_size = history_size;
-
-  return self->history_size;
-}
-
-void WebRtc_InitBinaryDelayEstimator(BinaryDelayEstimator* self) {
-  int i = 0;
-  RTC_DCHECK(self);
-
-  memset(self->bit_counts, 0, sizeof(int32_t) * self->history_size);
-  memset(self->binary_near_history, 0,
-         sizeof(uint32_t) * self->near_history_size);
-  for (i = 0; i <= self->history_size; ++i) {
-    self->mean_bit_counts[i] = (20 << 9);  // 20 in Q9.
-    self->histogram[i] = 0.f;
-  }
-  self->minimum_probability = kMaxBitCountsQ9;          // 32 in Q9.
-  self->last_delay_probability = (int)kMaxBitCountsQ9;  // 32 in Q9.
-
-  // Default return value if we're unable to estimate. -1 is used for errors.
-  self->last_delay = -2;
-
-  self->last_candidate_delay = -2;
-  self->compare_delay = self->history_size;
-  self->candidate_hits = 0;
-  self->last_delay_histogram = 0.f;
-}
-
-int WebRtc_SoftResetBinaryDelayEstimator(BinaryDelayEstimator* self,
-                                         int delay_shift) {
-  int lookahead = 0;
-  RTC_DCHECK(self);
-  lookahead = self->lookahead;
-  self->lookahead -= delay_shift;
-  if (self->lookahead < 0) {
-    self->lookahead = 0;
-  }
-  if (self->lookahead > self->near_history_size - 1) {
-    self->lookahead = self->near_history_size - 1;
-  }
-  return lookahead - self->lookahead;
-}
-
-int WebRtc_ProcessBinarySpectrum(BinaryDelayEstimator* self,
-                                 uint32_t binary_near_spectrum) {
-  int i = 0;
-  int candidate_delay = -1;
-  int valid_candidate = 0;
-
-  int32_t value_best_candidate = kMaxBitCountsQ9;
-  int32_t value_worst_candidate = 0;
-  int32_t valley_depth = 0;
-
-  RTC_DCHECK(self);
-  if (self->farend->history_size != self->history_size) {
-    // Non matching history sizes.
-    return -1;
-  }
-  if (self->near_history_size > 1) {
-    // If we apply lookahead, shift near-end binary spectrum history. Insert
-    // current |binary_near_spectrum| and pull out the delayed one.
-    memmove(&(self->binary_near_history[1]), &(self->binary_near_history[0]),
-            (self->near_history_size - 1) * sizeof(uint32_t));
-    self->binary_near_history[0] = binary_near_spectrum;
-    binary_near_spectrum = self->binary_near_history[self->lookahead];
-  }
-
-  // Compare with delayed spectra and store the |bit_counts| for each delay.
-  BitCountComparison(binary_near_spectrum, self->farend->binary_far_history,
-                     self->history_size, self->bit_counts);
-
-  // Update |mean_bit_counts|, which is the smoothed version of |bit_counts|.
-  for (i = 0; i < self->history_size; i++) {
-    // |bit_counts| is constrained to [0, 32], meaning we can smooth with a
-    // factor up to 2^26. We use Q9.
-    int32_t bit_count = (self->bit_counts[i] << 9);  // Q9.
-
-    // Update |mean_bit_counts| only when far-end signal has something to
-    // contribute. If |far_bit_counts| is zero the far-end signal is weak and
-    // we likely have a poor echo condition, hence don't update.
-    if (self->farend->far_bit_counts[i] > 0) {
-      // Make number of right shifts piecewise linear w.r.t. |far_bit_counts|.
-      int shifts = kShiftsAtZero;
-      shifts -= (kShiftsLinearSlope * self->farend->far_bit_counts[i]) >> 4;
-      WebRtc_MeanEstimatorFix(bit_count, shifts, &(self->mean_bit_counts[i]));
-    }
-  }
-
-  // Find |candidate_delay|, |value_best_candidate| and |value_worst_candidate|
-  // of |mean_bit_counts|.
-  for (i = 0; i < self->history_size; i++) {
-    if (self->mean_bit_counts[i] < value_best_candidate) {
-      value_best_candidate = self->mean_bit_counts[i];
-      candidate_delay = i;
-    }
-    if (self->mean_bit_counts[i] > value_worst_candidate) {
-      value_worst_candidate = self->mean_bit_counts[i];
-    }
-  }
-  valley_depth = value_worst_candidate - value_best_candidate;
-
-  // The |value_best_candidate| is a good indicator on the probability of
-  // |candidate_delay| being an accurate delay (a small |value_best_candidate|
-  // means a good binary match). In the following sections we make a decision
-  // whether to update |last_delay| or not.
-  // 1) If the difference bit counts between the best and the worst delay
-  //    candidates is too small we consider the situation to be unreliable and
-  //    don't update |last_delay|.
-  // 2) If the situation is reliable we update |last_delay| if the value of the
-  //    best candidate delay has a value less than
-  //     i) an adaptive threshold |minimum_probability|, or
-  //    ii) this corresponding value |last_delay_probability|, but updated at
-  //        this time instant.
-
-  // Update |minimum_probability|.
-  if ((self->minimum_probability > kProbabilityLowerLimit) &&
-      (valley_depth > kProbabilityMinSpread)) {
-    // The "hard" threshold can't be lower than 17 (in Q9).
-    // The valley in the curve also has to be distinct, i.e., the
-    // difference between |value_worst_candidate| and |value_best_candidate| has
-    // to be large enough.
-    int32_t threshold = value_best_candidate + kProbabilityOffset;
-    if (threshold < kProbabilityLowerLimit) {
-      threshold = kProbabilityLowerLimit;
-    }
-    if (self->minimum_probability > threshold) {
-      self->minimum_probability = threshold;
-    }
-  }
-  // Update |last_delay_probability|.
-  // We use a Markov type model, i.e., a slowly increasing level over time.
-  self->last_delay_probability++;
-  // Validate |candidate_delay|.  We have a reliable instantaneous delay
-  // estimate if
-  //  1) The valley is distinct enough (|valley_depth| > |kProbabilityOffset|)
-  // and
-  //  2) The depth of the valley is deep enough
-  //      (|value_best_candidate| < |minimum_probability|)
-  //     and deeper than the best estimate so far
-  //      (|value_best_candidate| < |last_delay_probability|)
-  valid_candidate = ((valley_depth > kProbabilityOffset) &&
-                     ((value_best_candidate < self->minimum_probability) ||
-                      (value_best_candidate < self->last_delay_probability)));
-
-  // Check for nonstationary farend signal.
-  const bool non_stationary_farend =
-      std::any_of(self->farend->far_bit_counts,
-                  self->farend->far_bit_counts + self->history_size,
-                  [](int a) { return a > 0; });
-
-  if (non_stationary_farend) {
-    // Only update the validation statistics when the farend is nonstationary
-    // as the underlying estimates are otherwise frozen.
-    UpdateRobustValidationStatistics(self, candidate_delay, valley_depth,
-                                     value_best_candidate);
-  }
-
-  if (self->robust_validation_enabled) {
-    int is_histogram_valid = HistogramBasedValidation(self, candidate_delay);
-    valid_candidate = RobustValidation(self, candidate_delay, valid_candidate,
-                                       is_histogram_valid);
-  }
-
-  // Only update the delay estimate when the farend is nonstationary and when
-  // a valid delay candidate is available.
-  if (non_stationary_farend && valid_candidate) {
-    if (candidate_delay != self->last_delay) {
-      self->last_delay_histogram =
-          (self->histogram[candidate_delay] > kLastHistogramMax
-               ? kLastHistogramMax
-               : self->histogram[candidate_delay]);
-      // Adjust the histogram if we made a change to |last_delay|, though it was
-      // not the most likely one according to the histogram.
-      if (self->histogram[candidate_delay] <
-          self->histogram[self->compare_delay]) {
-        self->histogram[self->compare_delay] = self->histogram[candidate_delay];
-      }
-    }
-    self->last_delay = candidate_delay;
-    if (value_best_candidate < self->last_delay_probability) {
-      self->last_delay_probability = value_best_candidate;
-    }
-    self->compare_delay = self->last_delay;
-  }
-
-  return self->last_delay;
-}
-
-int WebRtc_binary_last_delay(BinaryDelayEstimator* self) {
-  RTC_DCHECK(self);
-  return self->last_delay;
-}
-
-float WebRtc_binary_last_delay_quality(BinaryDelayEstimator* self) {
-  float quality = 0;
-  RTC_DCHECK(self);
-
-  if (self->robust_validation_enabled) {
-    // Simply a linear function of the histogram height at delay estimate.
-    quality = self->histogram[self->compare_delay] / kHistogramMax;
-  } else {
-    // Note that |last_delay_probability| states how deep the minimum of the
-    // cost function is, so it is rather an error probability.
-    quality = (float)(kMaxBitCountsQ9 - self->last_delay_probability) /
-              kMaxBitCountsQ9;
-    if (quality < 0) {
-      quality = 0;
-    }
-  }
-  return quality;
-}
-
-void WebRtc_MeanEstimatorFix(int32_t new_value,
-                             int factor,
-                             int32_t* mean_value) {
-  int32_t diff = new_value - *mean_value;
-
-  // mean_new = mean_value + ((new_value - mean_value) >> factor);
-  if (diff < 0) {
-    diff = -((-diff) >> factor);
-  } else {
-    diff = (diff >> factor);
-  }
-  *mean_value += diff;
-}
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/utility/delay_estimator.h b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/utility/delay_estimator.h
deleted file mode 100644
index 2f47e26f36..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/utility/delay_estimator.h
+++ /dev/null
@@ -1,253 +0,0 @@
-/*
- *  Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-// Performs delay estimation on binary converted spectra.
-// The return value is  0 - OK and -1 - Error, unless otherwise stated.
-
-#ifndef MODULES_AUDIO_PROCESSING_UTILITY_DELAY_ESTIMATOR_H_
-#define MODULES_AUDIO_PROCESSING_UTILITY_DELAY_ESTIMATOR_H_
-
-#include <stdint.h>
-
-static const int32_t kMaxBitCountsQ9 = (32 << 9);  // 32 matching bits in Q9.
-
-typedef struct {
-  // Pointer to bit counts.
-  int* far_bit_counts;
-  // Binary history variables.
-  uint32_t* binary_far_history;
-  int history_size;
-} BinaryDelayEstimatorFarend;
-
-typedef struct {
-  // Pointer to bit counts.
-  int32_t* mean_bit_counts;
-  // Array only used locally in ProcessBinarySpectrum() but whose size is
-  // determined at run-time.
-  int32_t* bit_counts;
-
-  // Binary history variables.
-  uint32_t* binary_near_history;
-  int near_history_size;
-  int history_size;
-
-  // Delay estimation variables.
-  int32_t minimum_probability;
-  int last_delay_probability;
-
-  // Delay memory.
-  int last_delay;
-
-  // Robust validation
-  int robust_validation_enabled;
-  int allowed_offset;
-  int last_candidate_delay;
-  int compare_delay;
-  int candidate_hits;
-  float* histogram;
-  float last_delay_histogram;
-
-  // For dynamically changing the lookahead when using SoftReset...().
-  int lookahead;
-
-  // Far-end binary spectrum history buffer etc.
-  BinaryDelayEstimatorFarend* farend;
-} BinaryDelayEstimator;
-
-// Releases the memory allocated by
-// WebRtc_CreateBinaryDelayEstimatorFarend(...).
-// Input:
-//    - self              : Pointer to the binary delay estimation far-end
-//                          instance which is the return value of
-//                          WebRtc_CreateBinaryDelayEstimatorFarend().
-//
-void WebRtc_FreeBinaryDelayEstimatorFarend(BinaryDelayEstimatorFarend* self);
-
-// Allocates the memory needed by the far-end part of the binary delay
-// estimation. The memory needs to be initialized separately through
-// WebRtc_InitBinaryDelayEstimatorFarend(...).
-//
-// Inputs:
-//      - history_size    : Size of the far-end binary spectrum history.
-//
-// Return value:
-//      - BinaryDelayEstimatorFarend*
-//                        : Created |handle|. If the memory can't be allocated
-//                          or if any of the input parameters are invalid NULL
-//                          is returned.
-//
-BinaryDelayEstimatorFarend* WebRtc_CreateBinaryDelayEstimatorFarend(
-    int history_size);
-
-// Re-allocates the buffers.
-//
-// Inputs:
-//      - self            : Pointer to the binary estimation far-end instance
-//                          which is the return value of
-//                          WebRtc_CreateBinaryDelayEstimatorFarend().
-//      - history_size    : Size of the far-end binary spectrum history.
-//
-// Return value:
-//      - history_size    : The history size allocated.
-int WebRtc_AllocateFarendBufferMemory(BinaryDelayEstimatorFarend* self,
-                                      int history_size);
-
-// Initializes the delay estimation far-end instance created with
-// WebRtc_CreateBinaryDelayEstimatorFarend(...).
-//
-// Input:
-//    - self              : Pointer to the delay estimation far-end instance.
-//
-// Output:
-//    - self              : Initialized far-end instance.
-//
-void WebRtc_InitBinaryDelayEstimatorFarend(BinaryDelayEstimatorFarend* self);
-
-// Soft resets the delay estimation far-end instance created with
-// WebRtc_CreateBinaryDelayEstimatorFarend(...).
-//
-// Input:
-//    - delay_shift   : The amount of blocks to shift history buffers.
-//
-void WebRtc_SoftResetBinaryDelayEstimatorFarend(
-    BinaryDelayEstimatorFarend* self,
-    int delay_shift);
-
-// Adds the binary far-end spectrum to the internal far-end history buffer. This
-// spectrum is used as reference when calculating the delay using
-// WebRtc_ProcessBinarySpectrum().
-//
-// Inputs:
-//    - self                  : Pointer to the delay estimation far-end
-//                              instance.
-//    - binary_far_spectrum   : Far-end binary spectrum.
-//
-// Output:
-//    - self                  : Updated far-end instance.
-//
-void WebRtc_AddBinaryFarSpectrum(BinaryDelayEstimatorFarend* self,
-                                 uint32_t binary_far_spectrum);
-
-// Releases the memory allocated by WebRtc_CreateBinaryDelayEstimator(...).
-//
-// Note that BinaryDelayEstimator utilizes BinaryDelayEstimatorFarend, but does
-// not take ownership of it, hence the BinaryDelayEstimator has to be torn down
-// before the far-end.
-//
-// Input:
-//    - self              : Pointer to the binary delay estimation instance
-//                          which is the return value of
-//                          WebRtc_CreateBinaryDelayEstimator().
-//
-void WebRtc_FreeBinaryDelayEstimator(BinaryDelayEstimator* self);
-
-// Allocates the memory needed by the binary delay estimation. The memory needs
-// to be initialized separately through WebRtc_InitBinaryDelayEstimator(...).
-//
-// See WebRtc_CreateDelayEstimator(..) in delay_estimator_wrapper.c for detailed
-// description.
-BinaryDelayEstimator* WebRtc_CreateBinaryDelayEstimator(
-    BinaryDelayEstimatorFarend* farend,
-    int max_lookahead);
-
-// Re-allocates |history_size| dependent buffers. The far-end buffers will be
-// updated at the same time if needed.
-//
-// Input:
-//      - self            : Pointer to the binary estimation instance which is
-//                          the return value of
-//                          WebRtc_CreateBinaryDelayEstimator().
-//      - history_size    : Size of the history buffers.
-//
-// Return value:
-//      - history_size    : The history size allocated.
-int WebRtc_AllocateHistoryBufferMemory(BinaryDelayEstimator* self,
-                                       int history_size);
-
-// Initializes the delay estimation instance created with
-// WebRtc_CreateBinaryDelayEstimator(...).
-//
-// Input:
-//    - self              : Pointer to the delay estimation instance.
-//
-// Output:
-//    - self              : Initialized instance.
-//
-void WebRtc_InitBinaryDelayEstimator(BinaryDelayEstimator* self);
-
-// Soft resets the delay estimation instance created with
-// WebRtc_CreateBinaryDelayEstimator(...).
-//
-// Input:
-//    - delay_shift   : The amount of blocks to shift history buffers.
-//
-// Return value:
-//    - actual_shifts : The actual number of shifts performed.
-//
-int WebRtc_SoftResetBinaryDelayEstimator(BinaryDelayEstimator* self,
-                                         int delay_shift);
-
-// Estimates and returns the delay between the binary far-end and binary near-
-// end spectra. It is assumed the binary far-end spectrum has been added using
-// WebRtc_AddBinaryFarSpectrum() prior to this call. The value will be offset by
-// the lookahead (i.e. the lookahead should be subtracted from the returned
-// value).
-//
-// Inputs:
-//    - self                  : Pointer to the delay estimation instance.
-//    - binary_near_spectrum  : Near-end binary spectrum of the current block.
-//
-// Output:
-//    - self                  : Updated instance.
-//
-// Return value:
-//    - delay                 :  >= 0 - Calculated delay value.
-//                              -2    - Insufficient data for estimation.
-//
-int WebRtc_ProcessBinarySpectrum(BinaryDelayEstimator* self,
-                                 uint32_t binary_near_spectrum);
-
-// Returns the last calculated delay updated by the function
-// WebRtc_ProcessBinarySpectrum(...).
-//
-// Input:
-//    - self                  : Pointer to the delay estimation instance.
-//
-// Return value:
-//    - delay                 :  >= 0 - Last calculated delay value
-//                              -2    - Insufficient data for estimation.
-//
-int WebRtc_binary_last_delay(BinaryDelayEstimator* self);
-
-// Returns the estimation quality of the last calculated delay updated by the
-// function WebRtc_ProcessBinarySpectrum(...). The estimation quality is a value
-// in the interval [0, 1].  The higher the value, the better the quality.
-//
-// Return value:
-//    - delay_quality         :  >= 0 - Estimation quality of last calculated
-//                                      delay value.
-float WebRtc_binary_last_delay_quality(BinaryDelayEstimator* self);
-
-// Updates the |mean_value| recursively with a step size of 2^-|factor|. This
-// function is used internally in the Binary Delay Estimator as well as the
-// Fixed point wrapper.
-//
-// Inputs:
-//    - new_value             : The new value the mean should be updated with.
-//    - factor                : The step size, in number of right shifts.
-//
-// Input/Output:
-//    - mean_value            : Pointer to the mean value.
-//
-void WebRtc_MeanEstimatorFix(int32_t new_value,
-                             int factor,
-                             int32_t* mean_value);
-
-#endif  // MODULES_AUDIO_PROCESSING_UTILITY_DELAY_ESTIMATOR_H_
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/utility/delay_estimator_internal.h b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/utility/delay_estimator_internal.h
deleted file mode 100644
index e99fe21a85..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/utility/delay_estimator_internal.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- *  Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-// Header file including the delay estimator handle used for testing.
-
-#ifndef MODULES_AUDIO_PROCESSING_UTILITY_DELAY_ESTIMATOR_INTERNAL_H_
-#define MODULES_AUDIO_PROCESSING_UTILITY_DELAY_ESTIMATOR_INTERNAL_H_
-
-#include "modules/audio_processing/utility/delay_estimator.h"
-
-typedef union {
-  float float_;
-  int32_t int32_;
-} SpectrumType;
-
-typedef struct {
-  // Pointers to mean values of spectrum.
-  SpectrumType* mean_far_spectrum;
-  // |mean_far_spectrum| initialization indicator.
-  int far_spectrum_initialized;
-
-  int spectrum_size;
-
-  // Far-end part of binary spectrum based delay estimation.
-  BinaryDelayEstimatorFarend* binary_farend;
-} DelayEstimatorFarend;
-
-typedef struct {
-  // Pointers to mean values of spectrum.
-  SpectrumType* mean_near_spectrum;
-  // |mean_near_spectrum| initialization indicator.
-  int near_spectrum_initialized;
-
-  int spectrum_size;
-
-  // Binary spectrum based delay estimator
-  BinaryDelayEstimator* binary_handle;
-} DelayEstimator;
-
-#endif  // MODULES_AUDIO_PROCESSING_UTILITY_DELAY_ESTIMATOR_INTERNAL_H_
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/utility/delay_estimator_wrapper.cc b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/utility/delay_estimator_wrapper.cc
deleted file mode 100644
index 27c2a3a1a2..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/utility/delay_estimator_wrapper.cc
+++ /dev/null
@@ -1,485 +0,0 @@
-/*
- *  Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#include "modules/audio_processing/utility/delay_estimator_wrapper.h"
-
-#include <stdlib.h>
-#include <string.h>
-
-#include "modules/audio_processing/utility/delay_estimator.h"
-#include "modules/audio_processing/utility/delay_estimator_internal.h"
-#include "rtc_base/checks.h"
-
-// Only bit |kBandFirst| through bit |kBandLast| are processed and
-// |kBandFirst| - |kBandLast| must be < 32.
-enum { kBandFirst = 12 };
-enum { kBandLast = 43 };
-
-static __inline uint32_t SetBit(uint32_t in, int pos) {
-  uint32_t mask = (1 << pos);
-  uint32_t out = (in | mask);
-
-  return out;
-}
-
-// Calculates the mean recursively. Same version as WebRtc_MeanEstimatorFix(),
-// but for float.
-//
-// Inputs:
-//    - new_value             : New additional value.
-//    - scale                 : Scale for smoothing (should be less than 1.0).
-//
-// Input/Output:
-//    - mean_value            : Pointer to the mean value for updating.
-//
-static void MeanEstimatorFloat(float new_value,
-                               float scale,
-                               float* mean_value) {
-  RTC_DCHECK_LT(scale, 1.0f);
-  *mean_value += (new_value - *mean_value) * scale;
-}
-
-// Computes the binary spectrum by comparing the input |spectrum| with a
-// |threshold_spectrum|. Float and fixed point versions.
-//
-// Inputs:
-//      - spectrum            : Spectrum of which the binary spectrum should be
-//                              calculated.
-//      - threshold_spectrum  : Threshold spectrum with which the input
-//                              spectrum is compared.
-// Return:
-//      - out                 : Binary spectrum.
-//
-static uint32_t BinarySpectrumFix(const uint16_t* spectrum,
-                                  SpectrumType* threshold_spectrum,
-                                  int q_domain,
-                                  int* threshold_initialized) {
-  int i = kBandFirst;
-  uint32_t out = 0;
-
-  RTC_DCHECK_LT(q_domain, 16);
-
-  if (!(*threshold_initialized)) {
-    // Set the |threshold_spectrum| to half the input |spectrum| as starting
-    // value. This speeds up the convergence.
-    for (i = kBandFirst; i <= kBandLast; i++) {
-      if (spectrum[i] > 0) {
-        // Convert input spectrum from Q(|q_domain|) to Q15.
-        int32_t spectrum_q15 = ((int32_t)spectrum[i]) << (15 - q_domain);
-        threshold_spectrum[i].int32_ = (spectrum_q15 >> 1);
-        *threshold_initialized = 1;
-      }
-    }
-  }
-  for (i = kBandFirst; i <= kBandLast; i++) {
-    // Convert input spectrum from Q(|q_domain|) to Q15.
-    int32_t spectrum_q15 = ((int32_t)spectrum[i]) << (15 - q_domain);
-    // Update the |threshold_spectrum|.
-    WebRtc_MeanEstimatorFix(spectrum_q15, 6, &(threshold_spectrum[i].int32_));
-    // Convert |spectrum| at current frequency bin to a binary value.
-    if (spectrum_q15 > threshold_spectrum[i].int32_) {
-      out = SetBit(out, i - kBandFirst);
-    }
-  }
-
-  return out;
-}
-
-static uint32_t BinarySpectrumFloat(const float* spectrum,
-                                    SpectrumType* threshold_spectrum,
-                                    int* threshold_initialized) {
-  int i = kBandFirst;
-  uint32_t out = 0;
-  const float kScale = 1 / 64.0;
-
-  if (!(*threshold_initialized)) {
-    // Set the |threshold_spectrum| to half the input |spectrum| as starting
-    // value. This speeds up the convergence.
-    for (i = kBandFirst; i <= kBandLast; i++) {
-      if (spectrum[i] > 0.0f) {
-        threshold_spectrum[i].float_ = (spectrum[i] / 2);
-        *threshold_initialized = 1;
-      }
-    }
-  }
-
-  for (i = kBandFirst; i <= kBandLast; i++) {
-    // Update the |threshold_spectrum|.
-    MeanEstimatorFloat(spectrum[i], kScale, &(threshold_spectrum[i].float_));
-    // Convert |spectrum| at current frequency bin to a binary value.
-    if (spectrum[i] > threshold_spectrum[i].float_) {
-      out = SetBit(out, i - kBandFirst);
-    }
-  }
-
-  return out;
-}
-
-void WebRtc_FreeDelayEstimatorFarend(void* handle) {
-  DelayEstimatorFarend* self = (DelayEstimatorFarend*)handle;
-
-  if (handle == NULL) {
-    return;
-  }
-
-  free(self->mean_far_spectrum);
-  self->mean_far_spectrum = NULL;
-
-  WebRtc_FreeBinaryDelayEstimatorFarend(self->binary_farend);
-  self->binary_farend = NULL;
-
-  free(self);
-}
-
-void* WebRtc_CreateDelayEstimatorFarend(int spectrum_size, int history_size) {
-  DelayEstimatorFarend* self = NULL;
-
-  // Check if the sub band used in the delay estimation is small enough to fit
-  // the binary spectra in a uint32_t.
-  static_assert(kBandLast - kBandFirst < 32, "");
-
-  if (spectrum_size >= kBandLast) {
-    self = static_cast<DelayEstimatorFarend*>(
-        malloc(sizeof(DelayEstimatorFarend)));
-  }
-
-  if (self != NULL) {
-    int memory_fail = 0;
-
-    // Allocate memory for the binary far-end spectrum handling.
-    self->binary_farend = WebRtc_CreateBinaryDelayEstimatorFarend(history_size);
-    memory_fail |= (self->binary_farend == NULL);
-
-    // Allocate memory for spectrum buffers.
-    self->mean_far_spectrum = static_cast<SpectrumType*>(
-        malloc(spectrum_size * sizeof(SpectrumType)));
-    memory_fail |= (self->mean_far_spectrum == NULL);
-
-    self->spectrum_size = spectrum_size;
-
-    if (memory_fail) {
-      WebRtc_FreeDelayEstimatorFarend(self);
-      self = NULL;
-    }
-  }
-
-  return self;
-}
-
-int WebRtc_InitDelayEstimatorFarend(void* handle) {
-  DelayEstimatorFarend* self = (DelayEstimatorFarend*)handle;
-
-  if (self == NULL) {
-    return -1;
-  }
-
-  // Initialize far-end part of binary delay estimator.
-  WebRtc_InitBinaryDelayEstimatorFarend(self->binary_farend);
-
-  // Set averaged far and near end spectra to zero.
-  memset(self->mean_far_spectrum, 0,
-         sizeof(SpectrumType) * self->spectrum_size);
-  // Reset initialization indicators.
-  self->far_spectrum_initialized = 0;
-
-  return 0;
-}
-
-void WebRtc_SoftResetDelayEstimatorFarend(void* handle, int delay_shift) {
-  DelayEstimatorFarend* self = (DelayEstimatorFarend*)handle;
-  RTC_DCHECK(self);
-  WebRtc_SoftResetBinaryDelayEstimatorFarend(self->binary_farend, delay_shift);
-}
-
-int WebRtc_AddFarSpectrumFix(void* handle,
-                             const uint16_t* far_spectrum,
-                             int spectrum_size,
-                             int far_q) {
-  DelayEstimatorFarend* self = (DelayEstimatorFarend*)handle;
-  uint32_t binary_spectrum = 0;
-
-  if (self == NULL) {
-    return -1;
-  }
-  if (far_spectrum == NULL) {
-    // Empty far end spectrum.
-    return -1;
-  }
-  if (spectrum_size != self->spectrum_size) {
-    // Data sizes don't match.
-    return -1;
-  }
-  if (far_q > 15) {
-    // If |far_q| is larger than 15 we cannot guarantee no wrap around.
-    return -1;
-  }
-
-  // Get binary spectrum.
-  binary_spectrum = BinarySpectrumFix(far_spectrum, self->mean_far_spectrum,
-                                      far_q, &(self->far_spectrum_initialized));
-  WebRtc_AddBinaryFarSpectrum(self->binary_farend, binary_spectrum);
-
-  return 0;
-}
-
-int WebRtc_AddFarSpectrumFloat(void* handle,
-                               const float* far_spectrum,
-                               int spectrum_size) {
-  DelayEstimatorFarend* self = (DelayEstimatorFarend*)handle;
-  uint32_t binary_spectrum = 0;
-
-  if (self == NULL) {
-    return -1;
-  }
-  if (far_spectrum == NULL) {
-    // Empty far end spectrum.
-    return -1;
-  }
-  if (spectrum_size != self->spectrum_size) {
-    // Data sizes don't match.
-    return -1;
-  }
-
-  // Get binary spectrum.
-  binary_spectrum = BinarySpectrumFloat(far_spectrum, self->mean_far_spectrum,
-                                        &(self->far_spectrum_initialized));
-  WebRtc_AddBinaryFarSpectrum(self->binary_farend, binary_spectrum);
-
-  return 0;
-}
-
-void WebRtc_FreeDelayEstimator(void* handle) {
-  DelayEstimator* self = (DelayEstimator*)handle;
-
-  if (handle == NULL) {
-    return;
-  }
-
-  free(self->mean_near_spectrum);
-  self->mean_near_spectrum = NULL;
-
-  WebRtc_FreeBinaryDelayEstimator(self->binary_handle);
-  self->binary_handle = NULL;
-
-  free(self);
-}
-
-void* WebRtc_CreateDelayEstimator(void* farend_handle, int max_lookahead) {
-  DelayEstimator* self = NULL;
-  DelayEstimatorFarend* farend = (DelayEstimatorFarend*)farend_handle;
-
-  if (farend_handle != NULL) {
-    self = static_cast<DelayEstimator*>(malloc(sizeof(DelayEstimator)));
-  }
-
-  if (self != NULL) {
-    int memory_fail = 0;
-
-    // Allocate memory for the farend spectrum handling.
-    self->binary_handle =
-        WebRtc_CreateBinaryDelayEstimator(farend->binary_farend, max_lookahead);
-    memory_fail |= (self->binary_handle == NULL);
-
-    // Allocate memory for spectrum buffers.
-    self->mean_near_spectrum = static_cast<SpectrumType*>(
-        malloc(farend->spectrum_size * sizeof(SpectrumType)));
-    memory_fail |= (self->mean_near_spectrum == NULL);
-
-    self->spectrum_size = farend->spectrum_size;
-
-    if (memory_fail) {
-      WebRtc_FreeDelayEstimator(self);
-      self = NULL;
-    }
-  }
-
-  return self;
-}
-
-int WebRtc_InitDelayEstimator(void* handle) {
-  DelayEstimator* self = (DelayEstimator*)handle;
-
-  if (self == NULL) {
-    return -1;
-  }
-
-  // Initialize binary delay estimator.
-  WebRtc_InitBinaryDelayEstimator(self->binary_handle);
-
-  // Set averaged far and near end spectra to zero.
-  memset(self->mean_near_spectrum, 0,
-         sizeof(SpectrumType) * self->spectrum_size);
-  // Reset initialization indicators.
-  self->near_spectrum_initialized = 0;
-
-  return 0;
-}
-
-int WebRtc_SoftResetDelayEstimator(void* handle, int delay_shift) {
-  DelayEstimator* self = (DelayEstimator*)handle;
-  RTC_DCHECK(self);
-  return WebRtc_SoftResetBinaryDelayEstimator(self->binary_handle, delay_shift);
-}
-
-int WebRtc_set_history_size(void* handle, int history_size) {
-  DelayEstimator* self = static_cast<DelayEstimator*>(handle);
-
-  if ((self == NULL) || (history_size <= 1)) {
-    return -1;
-  }
-  return WebRtc_AllocateHistoryBufferMemory(self->binary_handle, history_size);
-}
-
-int WebRtc_history_size(const void* handle) {
-  const DelayEstimator* self = static_cast<const DelayEstimator*>(handle);
-
-  if (self == NULL) {
-    return -1;
-  }
-  if (self->binary_handle->farend->history_size !=
-      self->binary_handle->history_size) {
-    // Non matching history sizes.
-    return -1;
-  }
-  return self->binary_handle->history_size;
-}
-
-int WebRtc_set_lookahead(void* handle, int lookahead) {
-  DelayEstimator* self = (DelayEstimator*)handle;
-  RTC_DCHECK(self);
-  RTC_DCHECK(self->binary_handle);
-  if ((lookahead > self->binary_handle->near_history_size - 1) ||
-      (lookahead < 0)) {
-    return -1;
-  }
-  self->binary_handle->lookahead = lookahead;
-  return self->binary_handle->lookahead;
-}
-
-int WebRtc_lookahead(void* handle) {
-  DelayEstimator* self = (DelayEstimator*)handle;
-  RTC_DCHECK(self);
-  RTC_DCHECK(self->binary_handle);
-  return self->binary_handle->lookahead;
-}
-
-int WebRtc_set_allowed_offset(void* handle, int allowed_offset) {
-  DelayEstimator* self = (DelayEstimator*)handle;
-
-  if ((self == NULL) || (allowed_offset < 0)) {
-    return -1;
-  }
-  self->binary_handle->allowed_offset = allowed_offset;
-  return 0;
-}
-
-int WebRtc_get_allowed_offset(const void* handle) {
-  const DelayEstimator* self = (const DelayEstimator*)handle;
-
-  if (self == NULL) {
-    return -1;
-  }
-  return self->binary_handle->allowed_offset;
-}
-
-int WebRtc_enable_robust_validation(void* handle, int enable) {
-  DelayEstimator* self = (DelayEstimator*)handle;
-
-  if (self == NULL) {
-    return -1;
-  }
-  if ((enable < 0) || (enable > 1)) {
-    return -1;
-  }
-  RTC_DCHECK(self->binary_handle);
-  self->binary_handle->robust_validation_enabled = enable;
-  return 0;
-}
-
-int WebRtc_is_robust_validation_enabled(const void* handle) {
-  const DelayEstimator* self = (const DelayEstimator*)handle;
-
-  if (self == NULL) {
-    return -1;
-  }
-  return self->binary_handle->robust_validation_enabled;
-}
-
-int WebRtc_DelayEstimatorProcessFix(void* handle,
-                                    const uint16_t* near_spectrum,
-                                    int spectrum_size,
-                                    int near_q) {
-  DelayEstimator* self = (DelayEstimator*)handle;
-  uint32_t binary_spectrum = 0;
-
-  if (self == NULL) {
-    return -1;
-  }
-  if (near_spectrum == NULL) {
-    // Empty near end spectrum.
-    return -1;
-  }
-  if (spectrum_size != self->spectrum_size) {
-    // Data sizes don't match.
-    return -1;
-  }
-  if (near_q > 15) {
-    // If |near_q| is larger than 15 we cannot guarantee no wrap around.
-    return -1;
-  }
-
-  // Get binary spectra.
-  binary_spectrum =
-      BinarySpectrumFix(near_spectrum, self->mean_near_spectrum, near_q,
-                        &(self->near_spectrum_initialized));
-
-  return WebRtc_ProcessBinarySpectrum(self->binary_handle, binary_spectrum);
-}
-
-int WebRtc_DelayEstimatorProcessFloat(void* handle,
-                                      const float* near_spectrum,
-                                      int spectrum_size) {
-  DelayEstimator* self = (DelayEstimator*)handle;
-  uint32_t binary_spectrum = 0;
-
-  if (self == NULL) {
-    return -1;
-  }
-  if (near_spectrum == NULL) {
-    // Empty near end spectrum.
-    return -1;
-  }
-  if (spectrum_size != self->spectrum_size) {
-    // Data sizes don't match.
-    return -1;
-  }
-
-  // Get binary spectrum.
-  binary_spectrum = BinarySpectrumFloat(near_spectrum, self->mean_near_spectrum,
-                                        &(self->near_spectrum_initialized));
-
-  return WebRtc_ProcessBinarySpectrum(self->binary_handle, binary_spectrum);
-}
-
-int WebRtc_last_delay(void* handle) {
-  DelayEstimator* self = (DelayEstimator*)handle;
-
-  if (self == NULL) {
-    return -1;
-  }
-
-  return WebRtc_binary_last_delay(self->binary_handle);
-}
-
-float WebRtc_last_delay_quality(void* handle) {
-  DelayEstimator* self = (DelayEstimator*)handle;
-  RTC_DCHECK(self);
-  return WebRtc_binary_last_delay_quality(self->binary_handle);
-}
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/utility/delay_estimator_wrapper.h b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/utility/delay_estimator_wrapper.h
deleted file mode 100644
index 995470f99d..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/utility/delay_estimator_wrapper.h
+++ /dev/null
@@ -1,244 +0,0 @@
-/*
- *  Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-// Performs delay estimation on block by block basis.
-// The return value is  0 - OK and -1 - Error, unless otherwise stated.
-
-#ifndef MODULES_AUDIO_PROCESSING_UTILITY_DELAY_ESTIMATOR_WRAPPER_H_
-#define MODULES_AUDIO_PROCESSING_UTILITY_DELAY_ESTIMATOR_WRAPPER_H_
-
-#include <stdint.h>
-
-// Releases the memory allocated by WebRtc_CreateDelayEstimatorFarend(...)
-void WebRtc_FreeDelayEstimatorFarend(void* handle);
-
-// Allocates the memory needed by the far-end part of the delay estimation. The
-// memory needs to be initialized separately through
-// WebRtc_InitDelayEstimatorFarend(...).
-//
-// Inputs:
-//  - spectrum_size     : Size of the spectrum used both in far-end and
-//                        near-end. Used to allocate memory for spectrum
-//                        specific buffers.
-//  - history_size      : The far-end history buffer size. A change in buffer
-//                        size can be forced with WebRtc_set_history_size().
-//                        Note that the maximum delay which can be estimated is
-//                        determined together with WebRtc_set_lookahead().
-//
-// Return value:
-//  - void*             : Created |handle|. If the memory can't be allocated or
-//                        if any of the input parameters are invalid NULL is
-//                        returned.
-void* WebRtc_CreateDelayEstimatorFarend(int spectrum_size, int history_size);
-
-// Initializes the far-end part of the delay estimation instance returned by
-// WebRtc_CreateDelayEstimatorFarend(...)
-int WebRtc_InitDelayEstimatorFarend(void* handle);
-
-// Soft resets the far-end part of the delay estimation instance returned by
-// WebRtc_CreateDelayEstimatorFarend(...).
-// Input:
-//      - delay_shift   : The amount of blocks to shift history buffers.
-void WebRtc_SoftResetDelayEstimatorFarend(void* handle, int delay_shift);
-
-// Adds the far-end spectrum to the far-end history buffer. This spectrum is
-// used as reference when calculating the delay using
-// WebRtc_ProcessSpectrum().
-//
-// Inputs:
-//    - far_spectrum    : Far-end spectrum.
-//    - spectrum_size   : The size of the data arrays (same for both far- and
-//                        near-end).
-//    - far_q           : The Q-domain of the far-end data.
-//
-// Output:
-//    - handle          : Updated far-end instance.
-//
-int WebRtc_AddFarSpectrumFix(void* handle,
-                             const uint16_t* far_spectrum,
-                             int spectrum_size,
-                             int far_q);
-
-// See WebRtc_AddFarSpectrumFix() for description.
-int WebRtc_AddFarSpectrumFloat(void* handle,
-                               const float* far_spectrum,
-                               int spectrum_size);
-
-// Releases the memory allocated by WebRtc_CreateDelayEstimator(...)
-void WebRtc_FreeDelayEstimator(void* handle);
-
-// Allocates the memory needed by the delay estimation. The memory needs to be
-// initialized separately through WebRtc_InitDelayEstimator(...).
-//
-// Inputs:
-//      - farend_handle : Pointer to the far-end part of the delay estimation
-//                        instance created prior to this call using
-//                        WebRtc_CreateDelayEstimatorFarend().
-//
-//                        Note that WebRtc_CreateDelayEstimator does not take
-//                        ownership of |farend_handle|, which has to be torn
-//                        down properly after this instance.
-//
-//      - max_lookahead : Maximum amount of non-causal lookahead allowed. The
-//                        actual amount of lookahead used can be controlled by
-//                        WebRtc_set_lookahead(...). The default |lookahead| is
-//                        set to |max_lookahead| at create time. Use
-//                        WebRtc_set_lookahead(...) before start if a different
-//                        value is desired.
-//
-//                        Using lookahead can detect cases in which a near-end
-//                        signal occurs before the corresponding far-end signal.
-//                        It will delay the estimate for the current block by an
-//                        equal amount, and the returned values will be offset
-//                        by it.
-//
-//                        A value of zero is the typical no-lookahead case.
-//                        This also represents the minimum delay which can be
-//                        estimated.
-//
-//                        Note that the effective range of delay estimates is
-//                        [-|lookahead|,... ,|history_size|-|lookahead|)
-//                        where |history_size| is set through
-//                        WebRtc_set_history_size().
-//
-// Return value:
-//      - void*         : Created |handle|. If the memory can't be allocated or
-//                        if any of the input parameters are invalid NULL is
-//                        returned.
-void* WebRtc_CreateDelayEstimator(void* farend_handle, int max_lookahead);
-
-// Initializes the delay estimation instance returned by
-// WebRtc_CreateDelayEstimator(...)
-int WebRtc_InitDelayEstimator(void* handle);
-
-// Soft resets the delay estimation instance returned by
-// WebRtc_CreateDelayEstimator(...)
-// Input:
-//      - delay_shift   : The amount of blocks to shift history buffers.
-//
-// Return value:
-//      - actual_shifts : The actual number of shifts performed.
-int WebRtc_SoftResetDelayEstimator(void* handle, int delay_shift);
-
-// Sets the effective |history_size| used. Valid values from 2. We simply need
-// at least two delays to compare to perform an estimate. If |history_size| is
-// changed, buffers are reallocated filling in with zeros if necessary.
-// Note that changing the |history_size| affects both buffers in far-end and
-// near-end. Hence it is important to change all DelayEstimators that use the
-// same reference far-end, to the same |history_size| value.
-// Inputs:
-//  - handle            : Pointer to the delay estimation instance.
-//  - history_size      : Effective history size to be used.
-// Return value:
-//  - new_history_size  : The new history size used. If the memory was not able
-//                        to be allocated 0 is returned.
-int WebRtc_set_history_size(void* handle, int history_size);
-
-// Returns the history_size currently used.
-// Input:
-//      - handle        : Pointer to the delay estimation instance.
-int WebRtc_history_size(const void* handle);
-
-// Sets the amount of |lookahead| to use. Valid values are [0, max_lookahead]
-// where |max_lookahead| was set at create time through
-// WebRtc_CreateDelayEstimator(...).
-//
-// Input:
-//      - handle        : Pointer to the delay estimation instance.
-//      - lookahead     : The amount of lookahead to be used.
-//
-// Return value:
-//      - new_lookahead : The actual amount of lookahead set, unless |handle| is
-//                        a NULL pointer or |lookahead| is invalid, for which an
-//                        error is returned.
-int WebRtc_set_lookahead(void* handle, int lookahead);
-
-// Returns the amount of lookahead we currently use.
-// Input:
-//      - handle        : Pointer to the delay estimation instance.
-int WebRtc_lookahead(void* handle);
-
-// Sets the |allowed_offset| used in the robust validation scheme.  If the
-// delay estimator is used in an echo control component, this parameter is
-// related to the filter length.  In principle |allowed_offset| should be set to
-// the echo control filter length minus the expected echo duration, i.e., the
-// delay offset the echo control can handle without quality regression.  The
-// default value, used if not set manually, is zero.  Note that |allowed_offset|
-// has to be non-negative.
-// Inputs:
-//  - handle            : Pointer to the delay estimation instance.
-//  - allowed_offset    : The amount of delay offset, measured in partitions,
-//                        the echo control filter can handle.
-int WebRtc_set_allowed_offset(void* handle, int allowed_offset);
-
-// Returns the |allowed_offset| in number of partitions.
-int WebRtc_get_allowed_offset(const void* handle);
-
-// Enables/Disables a robust validation functionality in the delay estimation.
-// This is by default set to disabled at create time.  The state is preserved
-// over a reset.
-// Inputs:
-//      - handle        : Pointer to the delay estimation instance.
-//      - enable        : Enable (1) or disable (0) this feature.
-int WebRtc_enable_robust_validation(void* handle, int enable);
-
-// Returns 1 if robust validation is enabled and 0 if disabled.
-int WebRtc_is_robust_validation_enabled(const void* handle);
-
-// Estimates and returns the delay between the far-end and near-end blocks. The
-// value will be offset by the lookahead (i.e. the lookahead should be
-// subtracted from the returned value).
-// Inputs:
-//      - handle        : Pointer to the delay estimation instance.
-//      - near_spectrum : Pointer to the near-end spectrum data of the current
-//                        block.
-//      - spectrum_size : The size of the data arrays (same for both far- and
-//                        near-end).
-//      - near_q        : The Q-domain of the near-end data.
-//
-// Output:
-//      - handle        : Updated instance.
-//
-// Return value:
-//      - delay         :  >= 0 - Calculated delay value.
-//                        -1    - Error.
-//                        -2    - Insufficient data for estimation.
-int WebRtc_DelayEstimatorProcessFix(void* handle,
-                                    const uint16_t* near_spectrum,
-                                    int spectrum_size,
-                                    int near_q);
-
-// See WebRtc_DelayEstimatorProcessFix() for description.
-int WebRtc_DelayEstimatorProcessFloat(void* handle,
-                                      const float* near_spectrum,
-                                      int spectrum_size);
-
-// Returns the last calculated delay updated by the function
-// WebRtc_DelayEstimatorProcess(...).
-//
-// Input:
-//      - handle        : Pointer to the delay estimation instance.
-//
-// Return value:
-//      - delay         : >= 0  - Last calculated delay value.
-//                        -1    - Error.
-//                        -2    - Insufficient data for estimation.
-int WebRtc_last_delay(void* handle);
-
-// Returns the estimation quality/probability of the last calculated delay
-// updated by the function WebRtc_DelayEstimatorProcess(...). The estimation
-// quality is a value in the interval [0, 1]. The higher the value, the better
-// the quality.
-//
-// Return value:
-//      - delay_quality : >= 0  - Estimation quality of last calculated delay.
-float WebRtc_last_delay_quality(void* handle);
-
-#endif  // MODULES_AUDIO_PROCESSING_UTILITY_DELAY_ESTIMATOR_WRAPPER_H_
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/utility/ooura_fft.cc b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/utility/ooura_fft.cc
deleted file mode 100644
index b4fcd6019f..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/utility/ooura_fft.cc
+++ /dev/null
@@ -1,540 +0,0 @@
-/*
- * http://www.kurims.kyoto-u.ac.jp/~ooura/fft.html
- * Copyright Takuya OOURA, 1996-2001
- *
- * You may use, copy, modify and distribute this code for any purpose (include
- * commercial use) and without fee. Please refer to this package when you modify
- * this code.
- *
- * Changes by the WebRTC authors:
- *    - Trivial type modifications.
- *    - Minimal code subset to do rdft of length 128.
- *    - Optimizations because of known length.
- *    - Removed the global variables by moving the code in to a class in order
- *      to make it thread safe.
- *
- *  All changes are covered by the WebRTC license and IP grant:
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#include "modules/audio_processing/utility/ooura_fft.h"
-
-#include "modules/audio_processing/utility/ooura_fft_tables_common.h"
-#include "rtc_base/system/arch.h"
-#include "system_wrappers/include/cpu_features_wrapper.h"
-
-namespace webrtc {
-
-namespace {
-
-#if !(defined(MIPS_FPU_LE) || (defined(WEBRTC_ARCH_ARM_FAMILY) && defined(WEBRTC_HAS_NEON)))
-static void cft1st_128_C(float* a) {
-  const int n = 128;
-  int j, k1, k2;
-  float wk1r, wk1i, wk2r, wk2i, wk3r, wk3i;
-  float x0r, x0i, x1r, x1i, x2r, x2i, x3r, x3i;
-
-  // The processing of the first set of elements was simplified in C to avoid
-  // some operations (multiplication by zero or one, addition of two elements
-  // multiplied by the same weight, ...).
-  x0r = a[0] + a[2];
-  x0i = a[1] + a[3];
-  x1r = a[0] - a[2];
-  x1i = a[1] - a[3];
-  x2r = a[4] + a[6];
-  x2i = a[5] + a[7];
-  x3r = a[4] - a[6];
-  x3i = a[5] - a[7];
-  a[0] = x0r + x2r;
-  a[1] = x0i + x2i;
-  a[4] = x0r - x2r;
-  a[5] = x0i - x2i;
-  a[2] = x1r - x3i;
-  a[3] = x1i + x3r;
-  a[6] = x1r + x3i;
-  a[7] = x1i - x3r;
-  wk1r = rdft_w[2];
-  x0r = a[8] + a[10];
-  x0i = a[9] + a[11];
-  x1r = a[8] - a[10];
-  x1i = a[9] - a[11];
-  x2r = a[12] + a[14];
-  x2i = a[13] + a[15];
-  x3r = a[12] - a[14];
-  x3i = a[13] - a[15];
-  a[8] = x0r + x2r;
-  a[9] = x0i + x2i;
-  a[12] = x2i - x0i;
-  a[13] = x0r - x2r;
-  x0r = x1r - x3i;
-  x0i = x1i + x3r;
-  a[10] = wk1r * (x0r - x0i);
-  a[11] = wk1r * (x0r + x0i);
-  x0r = x3i + x1r;
-  x0i = x3r - x1i;
-  a[14] = wk1r * (x0i - x0r);
-  a[15] = wk1r * (x0i + x0r);
-  k1 = 0;
-  for (j = 16; j < n; j += 16) {
-    k1 += 2;
-    k2 = 2 * k1;
-    wk2r = rdft_w[k1 + 0];
-    wk2i = rdft_w[k1 + 1];
-    wk1r = rdft_w[k2 + 0];
-    wk1i = rdft_w[k2 + 1];
-    wk3r = rdft_wk3ri_first[k1 + 0];
-    wk3i = rdft_wk3ri_first[k1 + 1];
-    x0r = a[j + 0] + a[j + 2];
-    x0i = a[j + 1] + a[j + 3];
-    x1r = a[j + 0] - a[j + 2];
-    x1i = a[j + 1] - a[j + 3];
-    x2r = a[j + 4] + a[j + 6];
-    x2i = a[j + 5] + a[j + 7];
-    x3r = a[j + 4] - a[j + 6];
-    x3i = a[j + 5] - a[j + 7];
-    a[j + 0] = x0r + x2r;
-    a[j + 1] = x0i + x2i;
-    x0r -= x2r;
-    x0i -= x2i;
-    a[j + 4] = wk2r * x0r - wk2i * x0i;
-    a[j + 5] = wk2r * x0i + wk2i * x0r;
-    x0r = x1r - x3i;
-    x0i = x1i + x3r;
-    a[j + 2] = wk1r * x0r - wk1i * x0i;
-    a[j + 3] = wk1r * x0i + wk1i * x0r;
-    x0r = x1r + x3i;
-    x0i = x1i - x3r;
-    a[j + 6] = wk3r * x0r - wk3i * x0i;
-    a[j + 7] = wk3r * x0i + wk3i * x0r;
-    wk1r = rdft_w[k2 + 2];
-    wk1i = rdft_w[k2 + 3];
-    wk3r = rdft_wk3ri_second[k1 + 0];
-    wk3i = rdft_wk3ri_second[k1 + 1];
-    x0r = a[j + 8] + a[j + 10];
-    x0i = a[j + 9] + a[j + 11];
-    x1r = a[j + 8] - a[j + 10];
-    x1i = a[j + 9] - a[j + 11];
-    x2r = a[j + 12] + a[j + 14];
-    x2i = a[j + 13] + a[j + 15];
-    x3r = a[j + 12] - a[j + 14];
-    x3i = a[j + 13] - a[j + 15];
-    a[j + 8] = x0r + x2r;
-    a[j + 9] = x0i + x2i;
-    x0r -= x2r;
-    x0i -= x2i;
-    a[j + 12] = -wk2i * x0r - wk2r * x0i;
-    a[j + 13] = -wk2i * x0i + wk2r * x0r;
-    x0r = x1r - x3i;
-    x0i = x1i + x3r;
-    a[j + 10] = wk1r * x0r - wk1i * x0i;
-    a[j + 11] = wk1r * x0i + wk1i * x0r;
-    x0r = x1r + x3i;
-    x0i = x1i - x3r;
-    a[j + 14] = wk3r * x0r - wk3i * x0i;
-    a[j + 15] = wk3r * x0i + wk3i * x0r;
-  }
-}
-
-static void cftmdl_128_C(float* a) {
-  const int l = 8;
-  const int n = 128;
-  const int m = 32;
-  int j0, j1, j2, j3, k, k1, k2, m2;
-  float wk1r, wk1i, wk2r, wk2i, wk3r, wk3i;
-  float x0r, x0i, x1r, x1i, x2r, x2i, x3r, x3i;
-
-  for (j0 = 0; j0 < l; j0 += 2) {
-    j1 = j0 + 8;
-    j2 = j0 + 16;
-    j3 = j0 + 24;
-    x0r = a[j0 + 0] + a[j1 + 0];
-    x0i = a[j0 + 1] + a[j1 + 1];
-    x1r = a[j0 + 0] - a[j1 + 0];
-    x1i = a[j0 + 1] - a[j1 + 1];
-    x2r = a[j2 + 0] + a[j3 + 0];
-    x2i = a[j2 + 1] + a[j3 + 1];
-    x3r = a[j2 + 0] - a[j3 + 0];
-    x3i = a[j2 + 1] - a[j3 + 1];
-    a[j0 + 0] = x0r + x2r;
-    a[j0 + 1] = x0i + x2i;
-    a[j2 + 0] = x0r - x2r;
-    a[j2 + 1] = x0i - x2i;
-    a[j1 + 0] = x1r - x3i;
-    a[j1 + 1] = x1i + x3r;
-    a[j3 + 0] = x1r + x3i;
-    a[j3 + 1] = x1i - x3r;
-  }
-  wk1r = rdft_w[2];
-  for (j0 = m; j0 < l + m; j0 += 2) {
-    j1 = j0 + 8;
-    j2 = j0 + 16;
-    j3 = j0 + 24;
-    x0r = a[j0 + 0] + a[j1 + 0];
-    x0i = a[j0 + 1] + a[j1 + 1];
-    x1r = a[j0 + 0] - a[j1 + 0];
-    x1i = a[j0 + 1] - a[j1 + 1];
-    x2r = a[j2 + 0] + a[j3 + 0];
-    x2i = a[j2 + 1] + a[j3 + 1];
-    x3r = a[j2 + 0] - a[j3 + 0];
-    x3i = a[j2 + 1] - a[j3 + 1];
-    a[j0 + 0] = x0r + x2r;
-    a[j0 + 1] = x0i + x2i;
-    a[j2 + 0] = x2i - x0i;
-    a[j2 + 1] = x0r - x2r;
-    x0r = x1r - x3i;
-    x0i = x1i + x3r;
-    a[j1 + 0] = wk1r * (x0r - x0i);
-    a[j1 + 1] = wk1r * (x0r + x0i);
-    x0r = x3i + x1r;
-    x0i = x3r - x1i;
-    a[j3 + 0] = wk1r * (x0i - x0r);
-    a[j3 + 1] = wk1r * (x0i + x0r);
-  }
-  k1 = 0;
-  m2 = 2 * m;
-  for (k = m2; k < n; k += m2) {
-    k1 += 2;
-    k2 = 2 * k1;
-    wk2r = rdft_w[k1 + 0];
-    wk2i = rdft_w[k1 + 1];
-    wk1r = rdft_w[k2 + 0];
-    wk1i = rdft_w[k2 + 1];
-    wk3r = rdft_wk3ri_first[k1 + 0];
-    wk3i = rdft_wk3ri_first[k1 + 1];
-    for (j0 = k; j0 < l + k; j0 += 2) {
-      j1 = j0 + 8;
-      j2 = j0 + 16;
-      j3 = j0 + 24;
-      x0r = a[j0 + 0] + a[j1 + 0];
-      x0i = a[j0 + 1] + a[j1 + 1];
-      x1r = a[j0 + 0] - a[j1 + 0];
-      x1i = a[j0 + 1] - a[j1 + 1];
-      x2r = a[j2 + 0] + a[j3 + 0];
-      x2i = a[j2 + 1] + a[j3 + 1];
-      x3r = a[j2 + 0] - a[j3 + 0];
-      x3i = a[j2 + 1] - a[j3 + 1];
-      a[j0 + 0] = x0r + x2r;
-      a[j0 + 1] = x0i + x2i;
-      x0r -= x2r;
-      x0i -= x2i;
-      a[j2 + 0] = wk2r * x0r - wk2i * x0i;
-      a[j2 + 1] = wk2r * x0i + wk2i * x0r;
-      x0r = x1r - x3i;
-      x0i = x1i + x3r;
-      a[j1 + 0] = wk1r * x0r - wk1i * x0i;
-      a[j1 + 1] = wk1r * x0i + wk1i * x0r;
-      x0r = x1r + x3i;
-      x0i = x1i - x3r;
-      a[j3 + 0] = wk3r * x0r - wk3i * x0i;
-      a[j3 + 1] = wk3r * x0i + wk3i * x0r;
-    }
-    wk1r = rdft_w[k2 + 2];
-    wk1i = rdft_w[k2 + 3];
-    wk3r = rdft_wk3ri_second[k1 + 0];
-    wk3i = rdft_wk3ri_second[k1 + 1];
-    for (j0 = k + m; j0 < l + (k + m); j0 += 2) {
-      j1 = j0 + 8;
-      j2 = j0 + 16;
-      j3 = j0 + 24;
-      x0r = a[j0 + 0] + a[j1 + 0];
-      x0i = a[j0 + 1] + a[j1 + 1];
-      x1r = a[j0 + 0] - a[j1 + 0];
-      x1i = a[j0 + 1] - a[j1 + 1];
-      x2r = a[j2 + 0] + a[j3 + 0];
-      x2i = a[j2 + 1] + a[j3 + 1];
-      x3r = a[j2 + 0] - a[j3 + 0];
-      x3i = a[j2 + 1] - a[j3 + 1];
-      a[j0 + 0] = x0r + x2r;
-      a[j0 + 1] = x0i + x2i;
-      x0r -= x2r;
-      x0i -= x2i;
-      a[j2 + 0] = -wk2i * x0r - wk2r * x0i;
-      a[j2 + 1] = -wk2i * x0i + wk2r * x0r;
-      x0r = x1r - x3i;
-      x0i = x1i + x3r;
-      a[j1 + 0] = wk1r * x0r - wk1i * x0i;
-      a[j1 + 1] = wk1r * x0i + wk1i * x0r;
-      x0r = x1r + x3i;
-      x0i = x1i - x3r;
-      a[j3 + 0] = wk3r * x0r - wk3i * x0i;
-      a[j3 + 1] = wk3r * x0i + wk3i * x0r;
-    }
-  }
-}
-
-static void rftfsub_128_C(float* a) {
-  const float* c = rdft_w + 32;
-  int j1, j2, k1, k2;
-  float wkr, wki, xr, xi, yr, yi;
-
-  for (j1 = 1, j2 = 2; j2 < 64; j1 += 1, j2 += 2) {
-    k2 = 128 - j2;
-    k1 = 32 - j1;
-    wkr = 0.5f - c[k1];
-    wki = c[j1];
-    xr = a[j2 + 0] - a[k2 + 0];
-    xi = a[j2 + 1] + a[k2 + 1];
-    yr = wkr * xr - wki * xi;
-    yi = wkr * xi + wki * xr;
-    a[j2 + 0] -= yr;
-    a[j2 + 1] -= yi;
-    a[k2 + 0] += yr;
-    a[k2 + 1] -= yi;
-  }
-}
-
-static void rftbsub_128_C(float* a) {
-  const float* c = rdft_w + 32;
-  int j1, j2, k1, k2;
-  float wkr, wki, xr, xi, yr, yi;
-
-  a[1] = -a[1];
-  for (j1 = 1, j2 = 2; j2 < 64; j1 += 1, j2 += 2) {
-    k2 = 128 - j2;
-    k1 = 32 - j1;
-    wkr = 0.5f - c[k1];
-    wki = c[j1];
-    xr = a[j2 + 0] - a[k2 + 0];
-    xi = a[j2 + 1] + a[k2 + 1];
-    yr = wkr * xr + wki * xi;
-    yi = wkr * xi - wki * xr;
-    a[j2 + 0] = a[j2 + 0] - yr;
-    a[j2 + 1] = yi - a[j2 + 1];
-    a[k2 + 0] = yr + a[k2 + 0];
-    a[k2 + 1] = yi - a[k2 + 1];
-  }
-  a[65] = -a[65];
-}
-#endif
-
-}  // namespace
-
-OouraFft::OouraFft() {
-#if defined(WEBRTC_ARCH_X86_FAMILY)
-  use_sse2_ = (WebRtc_GetCPUInfo(kSSE2) != 0);
-#else
-  use_sse2_ = false;
-#endif
-}
-
-OouraFft::~OouraFft() = default;
-
-void OouraFft::Fft(float* a) const {
-  float xi;
-  bitrv2_128(a);
-  cftfsub_128(a);
-  rftfsub_128(a);
-  xi = a[0] - a[1];
-  a[0] += a[1];
-  a[1] = xi;
-}
-void OouraFft::InverseFft(float* a) const {
-  a[1] = 0.5f * (a[0] - a[1]);
-  a[0] -= a[1];
-  rftbsub_128(a);
-  bitrv2_128(a);
-  cftbsub_128(a);
-}
-
-void OouraFft::cft1st_128(float* a) const {
-#if defined(MIPS_FPU_LE)
-  cft1st_128_mips(a);
-#elif defined(WEBRTC_ARCH_ARM_FAMILY) && defined(WEBRTC_HAS_NEON)
-  cft1st_128_neon(a);
-#elif defined(WEBRTC_ARCH_X86_FAMILY)
-  if (use_sse2_) {
-    cft1st_128_SSE2(a);
-  } else {
-    cft1st_128_C(a);
-  }
-#else
-  cft1st_128_C(a);
-#endif
-}
-void OouraFft::cftmdl_128(float* a) const {
-#if defined(MIPS_FPU_LE)
-  cftmdl_128_mips(a);
-#elif defined(WEBRTC_ARCH_ARM_FAMILY) && defined(WEBRTC_HAS_NEON)
-  cftmdl_128_neon(a);
-#elif defined(WEBRTC_ARCH_X86_FAMILY)
-  if (use_sse2_) {
-    cftmdl_128_SSE2(a);
-  } else {
-    cftmdl_128_C(a);
-  }
-#else
-  cftmdl_128_C(a);
-#endif
-}
-void OouraFft::rftfsub_128(float* a) const {
-#if defined(MIPS_FPU_LE)
-  rftfsub_128_mips(a);
-#elif defined(WEBRTC_ARCH_ARM_FAMILY) && defined(WEBRTC_HAS_NEON)
-  rftfsub_128_neon(a);
-#elif defined(WEBRTC_ARCH_X86_FAMILY)
-  if (use_sse2_) {
-    rftfsub_128_SSE2(a);
-  } else {
-    rftfsub_128_C(a);
-  }
-#else
-  rftfsub_128_C(a);
-#endif
-}
-
-void OouraFft::rftbsub_128(float* a) const {
-#if defined(MIPS_FPU_LE)
-  rftbsub_128_mips(a);
-#elif defined(WEBRTC_ARCH_ARM_FAMILY) && defined(WEBRTC_HAS_NEON)
-  rftbsub_128_neon(a);
-#elif defined(WEBRTC_ARCH_X86_FAMILY)
-  if (use_sse2_) {
-    rftbsub_128_SSE2(a);
-  } else {
-    rftbsub_128_C(a);
-  }
-#else
-  rftbsub_128_C(a);
-#endif
-}
-
-void OouraFft::cftbsub_128(float* a) const {
-  int j, j1, j2, j3, l;
-  float x0r, x0i, x1r, x1i, x2r, x2i, x3r, x3i;
-
-  cft1st_128(a);
-  cftmdl_128(a);
-  l = 32;
-
-  for (j = 0; j < l; j += 2) {
-    j1 = j + l;
-    j2 = j1 + l;
-    j3 = j2 + l;
-    x0r = a[j] + a[j1];
-    x0i = -a[j + 1] - a[j1 + 1];
-    x1r = a[j] - a[j1];
-    x1i = -a[j + 1] + a[j1 + 1];
-    x2r = a[j2] + a[j3];
-    x2i = a[j2 + 1] + a[j3 + 1];
-    x3r = a[j2] - a[j3];
-    x3i = a[j2 + 1] - a[j3 + 1];
-    a[j] = x0r + x2r;
-    a[j + 1] = x0i - x2i;
-    a[j2] = x0r - x2r;
-    a[j2 + 1] = x0i + x2i;
-    a[j1] = x1r - x3i;
-    a[j1 + 1] = x1i - x3r;
-    a[j3] = x1r + x3i;
-    a[j3 + 1] = x1i + x3r;
-  }
-}
-
-void OouraFft::cftfsub_128(float* a) const {
-  int j, j1, j2, j3, l;
-  float x0r, x0i, x1r, x1i, x2r, x2i, x3r, x3i;
-
-  cft1st_128(a);
-  cftmdl_128(a);
-  l = 32;
-  for (j = 0; j < l; j += 2) {
-    j1 = j + l;
-    j2 = j1 + l;
-    j3 = j2 + l;
-    x0r = a[j] + a[j1];
-    x0i = a[j + 1] + a[j1 + 1];
-    x1r = a[j] - a[j1];
-    x1i = a[j + 1] - a[j1 + 1];
-    x2r = a[j2] + a[j3];
-    x2i = a[j2 + 1] + a[j3 + 1];
-    x3r = a[j2] - a[j3];
-    x3i = a[j2 + 1] - a[j3 + 1];
-    a[j] = x0r + x2r;
-    a[j + 1] = x0i + x2i;
-    a[j2] = x0r - x2r;
-    a[j2 + 1] = x0i - x2i;
-    a[j1] = x1r - x3i;
-    a[j1 + 1] = x1i + x3r;
-    a[j3] = x1r + x3i;
-    a[j3 + 1] = x1i - x3r;
-  }
-}
-
-void OouraFft::bitrv2_128(float* a) const {
-  /*
-      Following things have been attempted but are no faster:
-      (a) Storing the swap indexes in a LUT (index calculations are done
-          for 'free' while waiting on memory/L1).
-      (b) Consolidate the load/store of two consecutive floats by a 64 bit
-          integer (execution is memory/L1 bound).
-      (c) Do a mix of floats and 64 bit integer to maximize register
-          utilization (execution is memory/L1 bound).
-      (d) Replacing ip[i] by ((k<<31)>>25) + ((k >> 1)<<5).
-      (e) Hard-coding of the offsets to completely eliminates index
-          calculations.
-  */
-
-  unsigned int j, j1, k, k1;
-  float xr, xi, yr, yi;
-
-  const int ip[4] = {0, 64, 32, 96};
-  for (k = 0; k < 4; k++) {
-    for (j = 0; j < k; j++) {
-      j1 = 2 * j + ip[k];
-      k1 = 2 * k + ip[j];
-      xr = a[j1 + 0];
-      xi = a[j1 + 1];
-      yr = a[k1 + 0];
-      yi = a[k1 + 1];
-      a[j1 + 0] = yr;
-      a[j1 + 1] = yi;
-      a[k1 + 0] = xr;
-      a[k1 + 1] = xi;
-      j1 += 8;
-      k1 += 16;
-      xr = a[j1 + 0];
-      xi = a[j1 + 1];
-      yr = a[k1 + 0];
-      yi = a[k1 + 1];
-      a[j1 + 0] = yr;
-      a[j1 + 1] = yi;
-      a[k1 + 0] = xr;
-      a[k1 + 1] = xi;
-      j1 += 8;
-      k1 -= 8;
-      xr = a[j1 + 0];
-      xi = a[j1 + 1];
-      yr = a[k1 + 0];
-      yi = a[k1 + 1];
-      a[j1 + 0] = yr;
-      a[j1 + 1] = yi;
-      a[k1 + 0] = xr;
-      a[k1 + 1] = xi;
-      j1 += 8;
-      k1 += 16;
-      xr = a[j1 + 0];
-      xi = a[j1 + 1];
-      yr = a[k1 + 0];
-      yi = a[k1 + 1];
-      a[j1 + 0] = yr;
-      a[j1 + 1] = yi;
-      a[k1 + 0] = xr;
-      a[k1 + 1] = xi;
-    }
-    j1 = 2 * k + 8 + ip[k];
-    k1 = j1 + 8;
-    xr = a[j1 + 0];
-    xi = a[j1 + 1];
-    yr = a[k1 + 0];
-    yi = a[k1 + 1];
-    a[j1 + 0] = yr;
-    a[j1 + 1] = yi;
-    a[k1 + 0] = xr;
-    a[k1 + 1] = xi;
-  }
-}
-
-}  // namespace webrtc
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/utility/ooura_fft.h b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/utility/ooura_fft.h
deleted file mode 100644
index 0cdd6aa66f..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/utility/ooura_fft.h
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- *  Copyright (c) 2016 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#ifndef MODULES_AUDIO_PROCESSING_UTILITY_OOURA_FFT_H_
-#define MODULES_AUDIO_PROCESSING_UTILITY_OOURA_FFT_H_
-
-#include "rtc_base/system/arch.h"
-
-namespace webrtc {
-
-#if defined(WEBRTC_ARCH_X86_FAMILY)
-void cft1st_128_SSE2(float* a);
-void cftmdl_128_SSE2(float* a);
-void rftfsub_128_SSE2(float* a);
-void rftbsub_128_SSE2(float* a);
-#endif
-
-#if defined(MIPS_FPU_LE)
-void cft1st_128_mips(float* a);
-void cftmdl_128_mips(float* a);
-void rftfsub_128_mips(float* a);
-void rftbsub_128_mips(float* a);
-#endif
-
-#if defined(WEBRTC_HAS_NEON)
-void cft1st_128_neon(float* a);
-void cftmdl_128_neon(float* a);
-void rftfsub_128_neon(float* a);
-void rftbsub_128_neon(float* a);
-#endif
-
-class OouraFft {
- public:
-  OouraFft();
-  ~OouraFft();
-  void Fft(float* a) const;
-  void InverseFft(float* a) const;
-
- private:
-  void cft1st_128(float* a) const;
-  void cftmdl_128(float* a) const;
-  void rftfsub_128(float* a) const;
-  void rftbsub_128(float* a) const;
-
-  void cftfsub_128(float* a) const;
-  void cftbsub_128(float* a) const;
-  void bitrv2_128(float* a) const;
-  bool use_sse2_;
-};
-
-}  // namespace webrtc
-
-#endif  // MODULES_AUDIO_PROCESSING_UTILITY_OOURA_FFT_H_
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/utility/ooura_fft_neon.cc b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/utility/ooura_fft_neon.cc
deleted file mode 100644
index b80f5c2922..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/utility/ooura_fft_neon.cc
+++ /dev/null
@@ -1,355 +0,0 @@
-/*
- *  Copyright (c) 2014 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-/*
- * The rdft AEC algorithm, neon version of speed-critical functions.
- *
- * Based on the sse2 version.
- */
-#if defined(__arm__) || defined(_M_ARM) || defined(__aarch64__)
-
-#include "modules/audio_processing/utility/ooura_fft.h"
-
-#include <arm_neon.h>
-
-#include "modules/audio_processing/utility/ooura_fft_tables_common.h"
-#include "modules/audio_processing/utility/ooura_fft_tables_neon_sse2.h"
-
-namespace webrtc {
-
-#if defined(WEBRTC_HAS_NEON)
-void cft1st_128_neon(float* a) {
-  const float32x4_t vec_swap_sign = vld1q_f32((float32_t*)k_swap_sign);
-  int j, k2;
-
-  for (k2 = 0, j = 0; j < 128; j += 16, k2 += 4) {
-    float32x4_t a00v = vld1q_f32(&a[j + 0]);
-    float32x4_t a04v = vld1q_f32(&a[j + 4]);
-    float32x4_t a08v = vld1q_f32(&a[j + 8]);
-    float32x4_t a12v = vld1q_f32(&a[j + 12]);
-    float32x4_t a01v = vcombine_f32(vget_low_f32(a00v), vget_low_f32(a08v));
-    float32x4_t a23v = vcombine_f32(vget_high_f32(a00v), vget_high_f32(a08v));
-    float32x4_t a45v = vcombine_f32(vget_low_f32(a04v), vget_low_f32(a12v));
-    float32x4_t a67v = vcombine_f32(vget_high_f32(a04v), vget_high_f32(a12v));
-    const float32x4_t wk1rv = vld1q_f32(&rdft_wk1r[k2]);
-    const float32x4_t wk1iv = vld1q_f32(&rdft_wk1i[k2]);
-    const float32x4_t wk2rv = vld1q_f32(&rdft_wk2r[k2]);
-    const float32x4_t wk2iv = vld1q_f32(&rdft_wk2i[k2]);
-    const float32x4_t wk3rv = vld1q_f32(&rdft_wk3r[k2]);
-    const float32x4_t wk3iv = vld1q_f32(&rdft_wk3i[k2]);
-    float32x4_t x0v = vaddq_f32(a01v, a23v);
-    const float32x4_t x1v = vsubq_f32(a01v, a23v);
-    const float32x4_t x2v = vaddq_f32(a45v, a67v);
-    const float32x4_t x3v = vsubq_f32(a45v, a67v);
-    const float32x4_t x3w = vrev64q_f32(x3v);
-    float32x4_t x0w;
-    a01v = vaddq_f32(x0v, x2v);
-    x0v = vsubq_f32(x0v, x2v);
-    x0w = vrev64q_f32(x0v);
-    a45v = vmulq_f32(wk2rv, x0v);
-    a45v = vmlaq_f32(a45v, wk2iv, x0w);
-    x0v = vmlaq_f32(x1v, x3w, vec_swap_sign);
-    x0w = vrev64q_f32(x0v);
-    a23v = vmulq_f32(wk1rv, x0v);
-    a23v = vmlaq_f32(a23v, wk1iv, x0w);
-    x0v = vmlsq_f32(x1v, x3w, vec_swap_sign);
-    x0w = vrev64q_f32(x0v);
-    a67v = vmulq_f32(wk3rv, x0v);
-    a67v = vmlaq_f32(a67v, wk3iv, x0w);
-    a00v = vcombine_f32(vget_low_f32(a01v), vget_low_f32(a23v));
-    a04v = vcombine_f32(vget_low_f32(a45v), vget_low_f32(a67v));
-    a08v = vcombine_f32(vget_high_f32(a01v), vget_high_f32(a23v));
-    a12v = vcombine_f32(vget_high_f32(a45v), vget_high_f32(a67v));
-    vst1q_f32(&a[j + 0], a00v);
-    vst1q_f32(&a[j + 4], a04v);
-    vst1q_f32(&a[j + 8], a08v);
-    vst1q_f32(&a[j + 12], a12v);
-  }
-}
-
-void cftmdl_128_neon(float* a) {
-  int j;
-  const int l = 8;
-  const float32x4_t vec_swap_sign = vld1q_f32((float32_t*)k_swap_sign);
-  float32x4_t wk1rv = vld1q_f32(cftmdl_wk1r);
-
-  for (j = 0; j < l; j += 2) {
-    const float32x2_t a_00 = vld1_f32(&a[j + 0]);
-    const float32x2_t a_08 = vld1_f32(&a[j + 8]);
-    const float32x2_t a_32 = vld1_f32(&a[j + 32]);
-    const float32x2_t a_40 = vld1_f32(&a[j + 40]);
-    const float32x4_t a_00_32 = vcombine_f32(a_00, a_32);
-    const float32x4_t a_08_40 = vcombine_f32(a_08, a_40);
-    const float32x4_t x0r0_0i0_0r1_x0i1 = vaddq_f32(a_00_32, a_08_40);
-    const float32x4_t x1r0_1i0_1r1_x1i1 = vsubq_f32(a_00_32, a_08_40);
-    const float32x2_t a_16 = vld1_f32(&a[j + 16]);
-    const float32x2_t a_24 = vld1_f32(&a[j + 24]);
-    const float32x2_t a_48 = vld1_f32(&a[j + 48]);
-    const float32x2_t a_56 = vld1_f32(&a[j + 56]);
-    const float32x4_t a_16_48 = vcombine_f32(a_16, a_48);
-    const float32x4_t a_24_56 = vcombine_f32(a_24, a_56);
-    const float32x4_t x2r0_2i0_2r1_x2i1 = vaddq_f32(a_16_48, a_24_56);
-    const float32x4_t x3r0_3i0_3r1_x3i1 = vsubq_f32(a_16_48, a_24_56);
-    const float32x4_t xx0 = vaddq_f32(x0r0_0i0_0r1_x0i1, x2r0_2i0_2r1_x2i1);
-    const float32x4_t xx1 = vsubq_f32(x0r0_0i0_0r1_x0i1, x2r0_2i0_2r1_x2i1);
-    const float32x4_t x3i0_3r0_3i1_x3r1 = vrev64q_f32(x3r0_3i0_3r1_x3i1);
-    const float32x4_t x1_x3_add =
-        vmlaq_f32(x1r0_1i0_1r1_x1i1, vec_swap_sign, x3i0_3r0_3i1_x3r1);
-    const float32x4_t x1_x3_sub =
-        vmlsq_f32(x1r0_1i0_1r1_x1i1, vec_swap_sign, x3i0_3r0_3i1_x3r1);
-    const float32x2_t yy0_a = vdup_lane_f32(vget_high_f32(x1_x3_add), 0);
-    const float32x2_t yy0_s = vdup_lane_f32(vget_high_f32(x1_x3_sub), 0);
-    const float32x4_t yy0_as = vcombine_f32(yy0_a, yy0_s);
-    const float32x2_t yy1_a = vdup_lane_f32(vget_high_f32(x1_x3_add), 1);
-    const float32x2_t yy1_s = vdup_lane_f32(vget_high_f32(x1_x3_sub), 1);
-    const float32x4_t yy1_as = vcombine_f32(yy1_a, yy1_s);
-    const float32x4_t yy0 = vmlaq_f32(yy0_as, vec_swap_sign, yy1_as);
-    const float32x4_t yy4 = vmulq_f32(wk1rv, yy0);
-    const float32x4_t xx1_rev = vrev64q_f32(xx1);
-    const float32x4_t yy4_rev = vrev64q_f32(yy4);
-
-    vst1_f32(&a[j + 0], vget_low_f32(xx0));
-    vst1_f32(&a[j + 32], vget_high_f32(xx0));
-    vst1_f32(&a[j + 16], vget_low_f32(xx1));
-    vst1_f32(&a[j + 48], vget_high_f32(xx1_rev));
-
-    a[j + 48] = -a[j + 48];
-
-    vst1_f32(&a[j + 8], vget_low_f32(x1_x3_add));
-    vst1_f32(&a[j + 24], vget_low_f32(x1_x3_sub));
-    vst1_f32(&a[j + 40], vget_low_f32(yy4));
-    vst1_f32(&a[j + 56], vget_high_f32(yy4_rev));
-  }
-
-  {
-    const int k = 64;
-    const int k1 = 2;
-    const int k2 = 2 * k1;
-    const float32x4_t wk2rv = vld1q_f32(&rdft_wk2r[k2 + 0]);
-    const float32x4_t wk2iv = vld1q_f32(&rdft_wk2i[k2 + 0]);
-    const float32x4_t wk1iv = vld1q_f32(&rdft_wk1i[k2 + 0]);
-    const float32x4_t wk3rv = vld1q_f32(&rdft_wk3r[k2 + 0]);
-    const float32x4_t wk3iv = vld1q_f32(&rdft_wk3i[k2 + 0]);
-    wk1rv = vld1q_f32(&rdft_wk1r[k2 + 0]);
-    for (j = k; j < l + k; j += 2) {
-      const float32x2_t a_00 = vld1_f32(&a[j + 0]);
-      const float32x2_t a_08 = vld1_f32(&a[j + 8]);
-      const float32x2_t a_32 = vld1_f32(&a[j + 32]);
-      const float32x2_t a_40 = vld1_f32(&a[j + 40]);
-      const float32x4_t a_00_32 = vcombine_f32(a_00, a_32);
-      const float32x4_t a_08_40 = vcombine_f32(a_08, a_40);
-      const float32x4_t x0r0_0i0_0r1_x0i1 = vaddq_f32(a_00_32, a_08_40);
-      const float32x4_t x1r0_1i0_1r1_x1i1 = vsubq_f32(a_00_32, a_08_40);
-      const float32x2_t a_16 = vld1_f32(&a[j + 16]);
-      const float32x2_t a_24 = vld1_f32(&a[j + 24]);
-      const float32x2_t a_48 = vld1_f32(&a[j + 48]);
-      const float32x2_t a_56 = vld1_f32(&a[j + 56]);
-      const float32x4_t a_16_48 = vcombine_f32(a_16, a_48);
-      const float32x4_t a_24_56 = vcombine_f32(a_24, a_56);
-      const float32x4_t x2r0_2i0_2r1_x2i1 = vaddq_f32(a_16_48, a_24_56);
-      const float32x4_t x3r0_3i0_3r1_x3i1 = vsubq_f32(a_16_48, a_24_56);
-      const float32x4_t xx = vaddq_f32(x0r0_0i0_0r1_x0i1, x2r0_2i0_2r1_x2i1);
-      const float32x4_t xx1 = vsubq_f32(x0r0_0i0_0r1_x0i1, x2r0_2i0_2r1_x2i1);
-      const float32x4_t x3i0_3r0_3i1_x3r1 = vrev64q_f32(x3r0_3i0_3r1_x3i1);
-      const float32x4_t x1_x3_add =
-          vmlaq_f32(x1r0_1i0_1r1_x1i1, vec_swap_sign, x3i0_3r0_3i1_x3r1);
-      const float32x4_t x1_x3_sub =
-          vmlsq_f32(x1r0_1i0_1r1_x1i1, vec_swap_sign, x3i0_3r0_3i1_x3r1);
-      float32x4_t xx4 = vmulq_f32(wk2rv, xx1);
-      float32x4_t xx12 = vmulq_f32(wk1rv, x1_x3_add);
-      float32x4_t xx22 = vmulq_f32(wk3rv, x1_x3_sub);
-      xx4 = vmlaq_f32(xx4, wk2iv, vrev64q_f32(xx1));
-      xx12 = vmlaq_f32(xx12, wk1iv, vrev64q_f32(x1_x3_add));
-      xx22 = vmlaq_f32(xx22, wk3iv, vrev64q_f32(x1_x3_sub));
-
-      vst1_f32(&a[j + 0], vget_low_f32(xx));
-      vst1_f32(&a[j + 32], vget_high_f32(xx));
-      vst1_f32(&a[j + 16], vget_low_f32(xx4));
-      vst1_f32(&a[j + 48], vget_high_f32(xx4));
-      vst1_f32(&a[j + 8], vget_low_f32(xx12));
-      vst1_f32(&a[j + 40], vget_high_f32(xx12));
-      vst1_f32(&a[j + 24], vget_low_f32(xx22));
-      vst1_f32(&a[j + 56], vget_high_f32(xx22));
-    }
-  }
-}
-
-__inline static float32x4_t reverse_order_f32x4(float32x4_t in) {
-  // A B C D -> C D A B
-  const float32x4_t rev = vcombine_f32(vget_high_f32(in), vget_low_f32(in));
-  // C D A B -> D C B A
-  return vrev64q_f32(rev);
-}
-
-void rftfsub_128_neon(float* a) {
-  const float* c = rdft_w + 32;
-  int j1, j2;
-  const float32x4_t mm_half = vdupq_n_f32(0.5f);
-
-  // Vectorized code (four at once).
-  // Note: commented number are indexes for the first iteration of the loop.
-  for (j1 = 1, j2 = 2; j2 + 7 < 64; j1 += 4, j2 += 8) {
-    // Load 'wk'.
-    const float32x4_t c_j1 = vld1q_f32(&c[j1]);          //  1,  2,  3,  4,
-    const float32x4_t c_k1 = vld1q_f32(&c[29 - j1]);     // 28, 29, 30, 31,
-    const float32x4_t wkrt = vsubq_f32(mm_half, c_k1);   // 28, 29, 30, 31,
-    const float32x4_t wkr_ = reverse_order_f32x4(wkrt);  // 31, 30, 29, 28,
-    const float32x4_t wki_ = c_j1;                       //  1,  2,  3,  4,
-    // Load and shuffle 'a'.
-    //   2,   4,   6,   8,   3,   5,   7,   9
-    float32x4x2_t a_j2_p = vld2q_f32(&a[0 + j2]);
-    // 120, 122, 124, 126, 121, 123, 125, 127,
-    const float32x4x2_t k2_0_4 = vld2q_f32(&a[122 - j2]);
-    // 126, 124, 122, 120
-    const float32x4_t a_k2_p0 = reverse_order_f32x4(k2_0_4.val[0]);
-    // 127, 125, 123, 121
-    const float32x4_t a_k2_p1 = reverse_order_f32x4(k2_0_4.val[1]);
-    // Calculate 'x'.
-    const float32x4_t xr_ = vsubq_f32(a_j2_p.val[0], a_k2_p0);
-    // 2-126, 4-124, 6-122, 8-120,
-    const float32x4_t xi_ = vaddq_f32(a_j2_p.val[1], a_k2_p1);
-    // 3-127, 5-125, 7-123, 9-121,
-    // Calculate product into 'y'.
-    //    yr = wkr * xr - wki * xi;
-    //    yi = wkr * xi + wki * xr;
-    const float32x4_t a_ = vmulq_f32(wkr_, xr_);
-    const float32x4_t b_ = vmulq_f32(wki_, xi_);
-    const float32x4_t c_ = vmulq_f32(wkr_, xi_);
-    const float32x4_t d_ = vmulq_f32(wki_, xr_);
-    const float32x4_t yr_ = vsubq_f32(a_, b_);  // 2-126, 4-124, 6-122, 8-120,
-    const float32x4_t yi_ = vaddq_f32(c_, d_);  // 3-127, 5-125, 7-123, 9-121,
-                                                // Update 'a'.
-                                                //    a[j2 + 0] -= yr;
-                                                //    a[j2 + 1] -= yi;
-                                                //    a[k2 + 0] += yr;
-                                                //    a[k2 + 1] -= yi;
-    // 126, 124, 122, 120,
-    const float32x4_t a_k2_p0n = vaddq_f32(a_k2_p0, yr_);
-    // 127, 125, 123, 121,
-    const float32x4_t a_k2_p1n = vsubq_f32(a_k2_p1, yi_);
-    // Shuffle in right order and store.
-    const float32x4_t a_k2_p0nr = vrev64q_f32(a_k2_p0n);
-    const float32x4_t a_k2_p1nr = vrev64q_f32(a_k2_p1n);
-    // 124, 125, 126, 127, 120, 121, 122, 123
-    const float32x4x2_t a_k2_n = vzipq_f32(a_k2_p0nr, a_k2_p1nr);
-    //   2,   4,   6,   8,
-    a_j2_p.val[0] = vsubq_f32(a_j2_p.val[0], yr_);
-    //   3,   5,   7,   9,
-    a_j2_p.val[1] = vsubq_f32(a_j2_p.val[1], yi_);
-    //   2,   3,   4,   5,   6,   7,   8,   9,
-    vst2q_f32(&a[0 + j2], a_j2_p);
-
-    vst1q_f32(&a[122 - j2], a_k2_n.val[1]);
-    vst1q_f32(&a[126 - j2], a_k2_n.val[0]);
-  }
-
-  // Scalar code for the remaining items.
-  for (; j2 < 64; j1 += 1, j2 += 2) {
-    const int k2 = 128 - j2;
-    const int k1 = 32 - j1;
-    const float wkr = 0.5f - c[k1];
-    const float wki = c[j1];
-    const float xr = a[j2 + 0] - a[k2 + 0];
-    const float xi = a[j2 + 1] + a[k2 + 1];
-    const float yr = wkr * xr - wki * xi;
-    const float yi = wkr * xi + wki * xr;
-    a[j2 + 0] -= yr;
-    a[j2 + 1] -= yi;
-    a[k2 + 0] += yr;
-    a[k2 + 1] -= yi;
-  }
-}
-
-void rftbsub_128_neon(float* a) {
-  const float* c = rdft_w + 32;
-  int j1, j2;
-  const float32x4_t mm_half = vdupq_n_f32(0.5f);
-
-  a[1] = -a[1];
-  // Vectorized code (four at once).
-  //    Note: commented number are indexes for the first iteration of the loop.
-  for (j1 = 1, j2 = 2; j2 + 7 < 64; j1 += 4, j2 += 8) {
-    // Load 'wk'.
-    const float32x4_t c_j1 = vld1q_f32(&c[j1]);          //  1,  2,  3,  4,
-    const float32x4_t c_k1 = vld1q_f32(&c[29 - j1]);     // 28, 29, 30, 31,
-    const float32x4_t wkrt = vsubq_f32(mm_half, c_k1);   // 28, 29, 30, 31,
-    const float32x4_t wkr_ = reverse_order_f32x4(wkrt);  // 31, 30, 29, 28,
-    const float32x4_t wki_ = c_j1;                       //  1,  2,  3,  4,
-    // Load and shuffle 'a'.
-    //   2,   4,   6,   8,   3,   5,   7,   9
-    float32x4x2_t a_j2_p = vld2q_f32(&a[0 + j2]);
-    // 120, 122, 124, 126, 121, 123, 125, 127,
-    const float32x4x2_t k2_0_4 = vld2q_f32(&a[122 - j2]);
-    // 126, 124, 122, 120
-    const float32x4_t a_k2_p0 = reverse_order_f32x4(k2_0_4.val[0]);
-    // 127, 125, 123, 121
-    const float32x4_t a_k2_p1 = reverse_order_f32x4(k2_0_4.val[1]);
-    // Calculate 'x'.
-    const float32x4_t xr_ = vsubq_f32(a_j2_p.val[0], a_k2_p0);
-    // 2-126, 4-124, 6-122, 8-120,
-    const float32x4_t xi_ = vaddq_f32(a_j2_p.val[1], a_k2_p1);
-    // 3-127, 5-125, 7-123, 9-121,
-    // Calculate product into 'y'.
-    //    yr = wkr * xr - wki * xi;
-    //    yi = wkr * xi + wki * xr;
-    const float32x4_t a_ = vmulq_f32(wkr_, xr_);
-    const float32x4_t b_ = vmulq_f32(wki_, xi_);
-    const float32x4_t c_ = vmulq_f32(wkr_, xi_);
-    const float32x4_t d_ = vmulq_f32(wki_, xr_);
-    const float32x4_t yr_ = vaddq_f32(a_, b_);  // 2-126, 4-124, 6-122, 8-120,
-    const float32x4_t yi_ = vsubq_f32(c_, d_);  // 3-127, 5-125, 7-123, 9-121,
-                                                // Update 'a'.
-                                                //    a[j2 + 0] -= yr;
-                                                //    a[j2 + 1] -= yi;
-                                                //    a[k2 + 0] += yr;
-                                                //    a[k2 + 1] -= yi;
-    // 126, 124, 122, 120,
-    const float32x4_t a_k2_p0n = vaddq_f32(a_k2_p0, yr_);
-    // 127, 125, 123, 121,
-    const float32x4_t a_k2_p1n = vsubq_f32(yi_, a_k2_p1);
-    // Shuffle in right order and store.
-    //   2,   3,   4,   5,   6,   7,   8,   9,
-    const float32x4_t a_k2_p0nr = vrev64q_f32(a_k2_p0n);
-    const float32x4_t a_k2_p1nr = vrev64q_f32(a_k2_p1n);
-    // 124, 125, 126, 127, 120, 121, 122, 123
-    const float32x4x2_t a_k2_n = vzipq_f32(a_k2_p0nr, a_k2_p1nr);
-    //   2,   4,   6,   8,
-    a_j2_p.val[0] = vsubq_f32(a_j2_p.val[0], yr_);
-    //   3,   5,   7,   9,
-    a_j2_p.val[1] = vsubq_f32(yi_, a_j2_p.val[1]);
-    //   2,   3,   4,   5,   6,   7,   8,   9,
-    vst2q_f32(&a[0 + j2], a_j2_p);
-
-    vst1q_f32(&a[122 - j2], a_k2_n.val[1]);
-    vst1q_f32(&a[126 - j2], a_k2_n.val[0]);
-  }
-
-  // Scalar code for the remaining items.
-  for (; j2 < 64; j1 += 1, j2 += 2) {
-    const int k2 = 128 - j2;
-    const int k1 = 32 - j1;
-    const float wkr = 0.5f - c[k1];
-    const float wki = c[j1];
-    const float xr = a[j2 + 0] - a[k2 + 0];
-    const float xi = a[j2 + 1] + a[k2 + 1];
-    const float yr = wkr * xr + wki * xi;
-    const float yi = wkr * xi - wki * xr;
-    a[j2 + 0] = a[j2 + 0] - yr;
-    a[j2 + 1] = yi - a[j2 + 1];
-    a[k2 + 0] = yr + a[k2 + 0];
-    a[k2 + 1] = yi - a[k2 + 1];
-  }
-  a[65] = -a[65];
-}
-#endif
-
-}  // namespace webrtc
-
-#endif
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/utility/ooura_fft_sse2.cc b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/utility/ooura_fft_sse2.cc
deleted file mode 100644
index adefd147f5..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/utility/ooura_fft_sse2.cc
+++ /dev/null
@@ -1,443 +0,0 @@
-/*
- *  Copyright (c) 2011 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-#include "rtc_base/system/arch.h"
-#ifdef WEBRTC_ARCH_X86_FAMILY
-
-#include <emmintrin.h>
-#include <xmmintrin.h>
-
-#include "modules/audio_processing/utility/ooura_fft.h"
-#include "modules/audio_processing/utility/ooura_fft_tables_common.h"
-#include "modules/audio_processing/utility/ooura_fft_tables_neon_sse2.h"
-#include "rtc_base/system/arch.h"
-
-namespace webrtc {
-
-#if defined(WEBRTC_ARCH_X86_FAMILY)
-
-namespace {
-// These intrinsics were unavailable before VS 2008.
-// TODO(andrew): move to a common file.
-#if defined(_MSC_VER) && _MSC_VER < 1500
-static __inline __m128 _mm_castsi128_ps(__m128i a) {
-  return *(__m128*)&a;
-}
-static __inline __m128i _mm_castps_si128(__m128 a) {
-  return *(__m128i*)&a;
-}
-#endif
-
-}  // namespace
-
-void cft1st_128_SSE2(float* a) {
-  const __m128 mm_swap_sign = _mm_load_ps(k_swap_sign);
-  int j, k2;
-
-  for (k2 = 0, j = 0; j < 128; j += 16, k2 += 4) {
-    __m128 a00v = _mm_loadu_ps(&a[j + 0]);
-    __m128 a04v = _mm_loadu_ps(&a[j + 4]);
-    __m128 a08v = _mm_loadu_ps(&a[j + 8]);
-    __m128 a12v = _mm_loadu_ps(&a[j + 12]);
-    __m128 a01v = _mm_shuffle_ps(a00v, a08v, _MM_SHUFFLE(1, 0, 1, 0));
-    __m128 a23v = _mm_shuffle_ps(a00v, a08v, _MM_SHUFFLE(3, 2, 3, 2));
-    __m128 a45v = _mm_shuffle_ps(a04v, a12v, _MM_SHUFFLE(1, 0, 1, 0));
-    __m128 a67v = _mm_shuffle_ps(a04v, a12v, _MM_SHUFFLE(3, 2, 3, 2));
-
-    const __m128 wk1rv = _mm_load_ps(&rdft_wk1r[k2]);
-    const __m128 wk1iv = _mm_load_ps(&rdft_wk1i[k2]);
-    const __m128 wk2rv = _mm_load_ps(&rdft_wk2r[k2]);
-    const __m128 wk2iv = _mm_load_ps(&rdft_wk2i[k2]);
-    const __m128 wk3rv = _mm_load_ps(&rdft_wk3r[k2]);
-    const __m128 wk3iv = _mm_load_ps(&rdft_wk3i[k2]);
-    __m128 x0v = _mm_add_ps(a01v, a23v);
-    const __m128 x1v = _mm_sub_ps(a01v, a23v);
-    const __m128 x2v = _mm_add_ps(a45v, a67v);
-    const __m128 x3v = _mm_sub_ps(a45v, a67v);
-    __m128 x0w;
-    a01v = _mm_add_ps(x0v, x2v);
-    x0v = _mm_sub_ps(x0v, x2v);
-    x0w = _mm_shuffle_ps(x0v, x0v, _MM_SHUFFLE(2, 3, 0, 1));
-    {
-      const __m128 a45_0v = _mm_mul_ps(wk2rv, x0v);
-      const __m128 a45_1v = _mm_mul_ps(wk2iv, x0w);
-      a45v = _mm_add_ps(a45_0v, a45_1v);
-    }
-    {
-      __m128 a23_0v, a23_1v;
-      const __m128 x3w = _mm_shuffle_ps(x3v, x3v, _MM_SHUFFLE(2, 3, 0, 1));
-      const __m128 x3s = _mm_mul_ps(mm_swap_sign, x3w);
-      x0v = _mm_add_ps(x1v, x3s);
-      x0w = _mm_shuffle_ps(x0v, x0v, _MM_SHUFFLE(2, 3, 0, 1));
-      a23_0v = _mm_mul_ps(wk1rv, x0v);
-      a23_1v = _mm_mul_ps(wk1iv, x0w);
-      a23v = _mm_add_ps(a23_0v, a23_1v);
-
-      x0v = _mm_sub_ps(x1v, x3s);
-      x0w = _mm_shuffle_ps(x0v, x0v, _MM_SHUFFLE(2, 3, 0, 1));
-    }
-    {
-      const __m128 a67_0v = _mm_mul_ps(wk3rv, x0v);
-      const __m128 a67_1v = _mm_mul_ps(wk3iv, x0w);
-      a67v = _mm_add_ps(a67_0v, a67_1v);
-    }
-
-    a00v = _mm_shuffle_ps(a01v, a23v, _MM_SHUFFLE(1, 0, 1, 0));
-    a04v = _mm_shuffle_ps(a45v, a67v, _MM_SHUFFLE(1, 0, 1, 0));
-    a08v = _mm_shuffle_ps(a01v, a23v, _MM_SHUFFLE(3, 2, 3, 2));
-    a12v = _mm_shuffle_ps(a45v, a67v, _MM_SHUFFLE(3, 2, 3, 2));
-    _mm_storeu_ps(&a[j + 0], a00v);
-    _mm_storeu_ps(&a[j + 4], a04v);
-    _mm_storeu_ps(&a[j + 8], a08v);
-    _mm_storeu_ps(&a[j + 12], a12v);
-  }
-}
-
-void cftmdl_128_SSE2(float* a) {
-  const int l = 8;
-  const __m128 mm_swap_sign = _mm_load_ps(k_swap_sign);
-  int j0;
-
-  __m128 wk1rv = _mm_load_ps(cftmdl_wk1r);
-  for (j0 = 0; j0 < l; j0 += 2) {
-    const __m128i a_00 = _mm_loadl_epi64((__m128i*)&a[j0 + 0]);
-    const __m128i a_08 = _mm_loadl_epi64((__m128i*)&a[j0 + 8]);
-    const __m128i a_32 = _mm_loadl_epi64((__m128i*)&a[j0 + 32]);
-    const __m128i a_40 = _mm_loadl_epi64((__m128i*)&a[j0 + 40]);
-    const __m128 a_00_32 =
-        _mm_shuffle_ps(_mm_castsi128_ps(a_00), _mm_castsi128_ps(a_32),
-                       _MM_SHUFFLE(1, 0, 1, 0));
-    const __m128 a_08_40 =
-        _mm_shuffle_ps(_mm_castsi128_ps(a_08), _mm_castsi128_ps(a_40),
-                       _MM_SHUFFLE(1, 0, 1, 0));
-    __m128 x0r0_0i0_0r1_x0i1 = _mm_add_ps(a_00_32, a_08_40);
-    const __m128 x1r0_1i0_1r1_x1i1 = _mm_sub_ps(a_00_32, a_08_40);
-
-    const __m128i a_16 = _mm_loadl_epi64((__m128i*)&a[j0 + 16]);
-    const __m128i a_24 = _mm_loadl_epi64((__m128i*)&a[j0 + 24]);
-    const __m128i a_48 = _mm_loadl_epi64((__m128i*)&a[j0 + 48]);
-    const __m128i a_56 = _mm_loadl_epi64((__m128i*)&a[j0 + 56]);
-    const __m128 a_16_48 =
-        _mm_shuffle_ps(_mm_castsi128_ps(a_16), _mm_castsi128_ps(a_48),
-                       _MM_SHUFFLE(1, 0, 1, 0));
-    const __m128 a_24_56 =
-        _mm_shuffle_ps(_mm_castsi128_ps(a_24), _mm_castsi128_ps(a_56),
-                       _MM_SHUFFLE(1, 0, 1, 0));
-    const __m128 x2r0_2i0_2r1_x2i1 = _mm_add_ps(a_16_48, a_24_56);
-    const __m128 x3r0_3i0_3r1_x3i1 = _mm_sub_ps(a_16_48, a_24_56);
-
-    const __m128 xx0 = _mm_add_ps(x0r0_0i0_0r1_x0i1, x2r0_2i0_2r1_x2i1);
-    const __m128 xx1 = _mm_sub_ps(x0r0_0i0_0r1_x0i1, x2r0_2i0_2r1_x2i1);
-
-    const __m128 x3i0_3r0_3i1_x3r1 = _mm_castsi128_ps(_mm_shuffle_epi32(
-        _mm_castps_si128(x3r0_3i0_3r1_x3i1), _MM_SHUFFLE(2, 3, 0, 1)));
-    const __m128 x3_swapped = _mm_mul_ps(mm_swap_sign, x3i0_3r0_3i1_x3r1);
-    const __m128 x1_x3_add = _mm_add_ps(x1r0_1i0_1r1_x1i1, x3_swapped);
-    const __m128 x1_x3_sub = _mm_sub_ps(x1r0_1i0_1r1_x1i1, x3_swapped);
-
-    const __m128 yy0 =
-        _mm_shuffle_ps(x1_x3_add, x1_x3_sub, _MM_SHUFFLE(2, 2, 2, 2));
-    const __m128 yy1 =
-        _mm_shuffle_ps(x1_x3_add, x1_x3_sub, _MM_SHUFFLE(3, 3, 3, 3));
-    const __m128 yy2 = _mm_mul_ps(mm_swap_sign, yy1);
-    const __m128 yy3 = _mm_add_ps(yy0, yy2);
-    const __m128 yy4 = _mm_mul_ps(wk1rv, yy3);
-
-    _mm_storel_epi64((__m128i*)&a[j0 + 0], _mm_castps_si128(xx0));
-    _mm_storel_epi64(
-        (__m128i*)&a[j0 + 32],
-        _mm_shuffle_epi32(_mm_castps_si128(xx0), _MM_SHUFFLE(3, 2, 3, 2)));
-
-    _mm_storel_epi64((__m128i*)&a[j0 + 16], _mm_castps_si128(xx1));
-    _mm_storel_epi64(
-        (__m128i*)&a[j0 + 48],
-        _mm_shuffle_epi32(_mm_castps_si128(xx1), _MM_SHUFFLE(2, 3, 2, 3)));
-    a[j0 + 48] = -a[j0 + 48];
-
-    _mm_storel_epi64((__m128i*)&a[j0 + 8], _mm_castps_si128(x1_x3_add));
-    _mm_storel_epi64((__m128i*)&a[j0 + 24], _mm_castps_si128(x1_x3_sub));
-
-    _mm_storel_epi64((__m128i*)&a[j0 + 40], _mm_castps_si128(yy4));
-    _mm_storel_epi64(
-        (__m128i*)&a[j0 + 56],
-        _mm_shuffle_epi32(_mm_castps_si128(yy4), _MM_SHUFFLE(2, 3, 2, 3)));
-  }
-
-  {
-    int k = 64;
-    int k1 = 2;
-    int k2 = 2 * k1;
-    const __m128 wk2rv = _mm_load_ps(&rdft_wk2r[k2 + 0]);
-    const __m128 wk2iv = _mm_load_ps(&rdft_wk2i[k2 + 0]);
-    const __m128 wk1iv = _mm_load_ps(&rdft_wk1i[k2 + 0]);
-    const __m128 wk3rv = _mm_load_ps(&rdft_wk3r[k2 + 0]);
-    const __m128 wk3iv = _mm_load_ps(&rdft_wk3i[k2 + 0]);
-    wk1rv = _mm_load_ps(&rdft_wk1r[k2 + 0]);
-    for (j0 = k; j0 < l + k; j0 += 2) {
-      const __m128i a_00 = _mm_loadl_epi64((__m128i*)&a[j0 + 0]);
-      const __m128i a_08 = _mm_loadl_epi64((__m128i*)&a[j0 + 8]);
-      const __m128i a_32 = _mm_loadl_epi64((__m128i*)&a[j0 + 32]);
-      const __m128i a_40 = _mm_loadl_epi64((__m128i*)&a[j0 + 40]);
-      const __m128 a_00_32 =
-          _mm_shuffle_ps(_mm_castsi128_ps(a_00), _mm_castsi128_ps(a_32),
-                         _MM_SHUFFLE(1, 0, 1, 0));
-      const __m128 a_08_40 =
-          _mm_shuffle_ps(_mm_castsi128_ps(a_08), _mm_castsi128_ps(a_40),
-                         _MM_SHUFFLE(1, 0, 1, 0));
-      __m128 x0r0_0i0_0r1_x0i1 = _mm_add_ps(a_00_32, a_08_40);
-      const __m128 x1r0_1i0_1r1_x1i1 = _mm_sub_ps(a_00_32, a_08_40);
-
-      const __m128i a_16 = _mm_loadl_epi64((__m128i*)&a[j0 + 16]);
-      const __m128i a_24 = _mm_loadl_epi64((__m128i*)&a[j0 + 24]);
-      const __m128i a_48 = _mm_loadl_epi64((__m128i*)&a[j0 + 48]);
-      const __m128i a_56 = _mm_loadl_epi64((__m128i*)&a[j0 + 56]);
-      const __m128 a_16_48 =
-          _mm_shuffle_ps(_mm_castsi128_ps(a_16), _mm_castsi128_ps(a_48),
-                         _MM_SHUFFLE(1, 0, 1, 0));
-      const __m128 a_24_56 =
-          _mm_shuffle_ps(_mm_castsi128_ps(a_24), _mm_castsi128_ps(a_56),
-                         _MM_SHUFFLE(1, 0, 1, 0));
-      const __m128 x2r0_2i0_2r1_x2i1 = _mm_add_ps(a_16_48, a_24_56);
-      const __m128 x3r0_3i0_3r1_x3i1 = _mm_sub_ps(a_16_48, a_24_56);
-
-      const __m128 xx = _mm_add_ps(x0r0_0i0_0r1_x0i1, x2r0_2i0_2r1_x2i1);
-      const __m128 xx1 = _mm_sub_ps(x0r0_0i0_0r1_x0i1, x2r0_2i0_2r1_x2i1);
-      const __m128 xx2 = _mm_mul_ps(xx1, wk2rv);
-      const __m128 xx3 = _mm_mul_ps(
-          wk2iv, _mm_castsi128_ps(_mm_shuffle_epi32(_mm_castps_si128(xx1),
-                                                    _MM_SHUFFLE(2, 3, 0, 1))));
-      const __m128 xx4 = _mm_add_ps(xx2, xx3);
-
-      const __m128 x3i0_3r0_3i1_x3r1 = _mm_castsi128_ps(_mm_shuffle_epi32(
-          _mm_castps_si128(x3r0_3i0_3r1_x3i1), _MM_SHUFFLE(2, 3, 0, 1)));
-      const __m128 x3_swapped = _mm_mul_ps(mm_swap_sign, x3i0_3r0_3i1_x3r1);
-      const __m128 x1_x3_add = _mm_add_ps(x1r0_1i0_1r1_x1i1, x3_swapped);
-      const __m128 x1_x3_sub = _mm_sub_ps(x1r0_1i0_1r1_x1i1, x3_swapped);
-
-      const __m128 xx10 = _mm_mul_ps(x1_x3_add, wk1rv);
-      const __m128 xx11 = _mm_mul_ps(
-          wk1iv, _mm_castsi128_ps(_mm_shuffle_epi32(_mm_castps_si128(x1_x3_add),
-                                                    _MM_SHUFFLE(2, 3, 0, 1))));
-      const __m128 xx12 = _mm_add_ps(xx10, xx11);
-
-      const __m128 xx20 = _mm_mul_ps(x1_x3_sub, wk3rv);
-      const __m128 xx21 = _mm_mul_ps(
-          wk3iv, _mm_castsi128_ps(_mm_shuffle_epi32(_mm_castps_si128(x1_x3_sub),
-                                                    _MM_SHUFFLE(2, 3, 0, 1))));
-      const __m128 xx22 = _mm_add_ps(xx20, xx21);
-
-      _mm_storel_epi64((__m128i*)&a[j0 + 0], _mm_castps_si128(xx));
-      _mm_storel_epi64(
-          (__m128i*)&a[j0 + 32],
-          _mm_shuffle_epi32(_mm_castps_si128(xx), _MM_SHUFFLE(3, 2, 3, 2)));
-
-      _mm_storel_epi64((__m128i*)&a[j0 + 16], _mm_castps_si128(xx4));
-      _mm_storel_epi64(
-          (__m128i*)&a[j0 + 48],
-          _mm_shuffle_epi32(_mm_castps_si128(xx4), _MM_SHUFFLE(3, 2, 3, 2)));
-
-      _mm_storel_epi64((__m128i*)&a[j0 + 8], _mm_castps_si128(xx12));
-      _mm_storel_epi64(
-          (__m128i*)&a[j0 + 40],
-          _mm_shuffle_epi32(_mm_castps_si128(xx12), _MM_SHUFFLE(3, 2, 3, 2)));
-
-      _mm_storel_epi64((__m128i*)&a[j0 + 24], _mm_castps_si128(xx22));
-      _mm_storel_epi64(
-          (__m128i*)&a[j0 + 56],
-          _mm_shuffle_epi32(_mm_castps_si128(xx22), _MM_SHUFFLE(3, 2, 3, 2)));
-    }
-  }
-}
-
-void rftfsub_128_SSE2(float* a) {
-  const float* c = rdft_w + 32;
-  int j1, j2, k1, k2;
-  float wkr, wki, xr, xi, yr, yi;
-
-  static const ALIGN16_BEG float ALIGN16_END k_half[4] = {0.5f, 0.5f, 0.5f,
-                                                          0.5f};
-  const __m128 mm_half = _mm_load_ps(k_half);
-
-  // Vectorized code (four at once).
-  //    Note: commented number are indexes for the first iteration of the loop.
-  for (j1 = 1, j2 = 2; j2 + 7 < 64; j1 += 4, j2 += 8) {
-    // Load 'wk'.
-    const __m128 c_j1 = _mm_loadu_ps(&c[j1]);       //  1,  2,  3,  4,
-    const __m128 c_k1 = _mm_loadu_ps(&c[29 - j1]);  // 28, 29, 30, 31,
-    const __m128 wkrt = _mm_sub_ps(mm_half, c_k1);  // 28, 29, 30, 31,
-    const __m128 wkr_ =
-        _mm_shuffle_ps(wkrt, wkrt, _MM_SHUFFLE(0, 1, 2, 3));  // 31, 30, 29, 28,
-    const __m128 wki_ = c_j1;                                 //  1,  2,  3,  4,
-    // Load and shuffle 'a'.
-    const __m128 a_j2_0 = _mm_loadu_ps(&a[0 + j2]);    //   2,   3,   4,   5,
-    const __m128 a_j2_4 = _mm_loadu_ps(&a[4 + j2]);    //   6,   7,   8,   9,
-    const __m128 a_k2_0 = _mm_loadu_ps(&a[122 - j2]);  // 120, 121, 122, 123,
-    const __m128 a_k2_4 = _mm_loadu_ps(&a[126 - j2]);  // 124, 125, 126, 127,
-    const __m128 a_j2_p0 = _mm_shuffle_ps(
-        a_j2_0, a_j2_4, _MM_SHUFFLE(2, 0, 2, 0));  //   2,   4,   6,   8,
-    const __m128 a_j2_p1 = _mm_shuffle_ps(
-        a_j2_0, a_j2_4, _MM_SHUFFLE(3, 1, 3, 1));  //   3,   5,   7,   9,
-    const __m128 a_k2_p0 = _mm_shuffle_ps(
-        a_k2_4, a_k2_0, _MM_SHUFFLE(0, 2, 0, 2));  // 126, 124, 122, 120,
-    const __m128 a_k2_p1 = _mm_shuffle_ps(
-        a_k2_4, a_k2_0, _MM_SHUFFLE(1, 3, 1, 3));  // 127, 125, 123, 121,
-    // Calculate 'x'.
-    const __m128 xr_ = _mm_sub_ps(a_j2_p0, a_k2_p0);
-    // 2-126, 4-124, 6-122, 8-120,
-    const __m128 xi_ = _mm_add_ps(a_j2_p1, a_k2_p1);
-    // 3-127, 5-125, 7-123, 9-121,
-    // Calculate product into 'y'.
-    //    yr = wkr * xr - wki * xi;
-    //    yi = wkr * xi + wki * xr;
-    const __m128 a_ = _mm_mul_ps(wkr_, xr_);
-    const __m128 b_ = _mm_mul_ps(wki_, xi_);
-    const __m128 c_ = _mm_mul_ps(wkr_, xi_);
-    const __m128 d_ = _mm_mul_ps(wki_, xr_);
-    const __m128 yr_ = _mm_sub_ps(a_, b_);  // 2-126, 4-124, 6-122, 8-120,
-    const __m128 yi_ = _mm_add_ps(c_, d_);  // 3-127, 5-125, 7-123, 9-121,
-                                            // Update 'a'.
-                                            //    a[j2 + 0] -= yr;
-                                            //    a[j2 + 1] -= yi;
-                                            //    a[k2 + 0] += yr;
-    //    a[k2 + 1] -= yi;
-    const __m128 a_j2_p0n = _mm_sub_ps(a_j2_p0, yr_);  //   2,   4,   6,   8,
-    const __m128 a_j2_p1n = _mm_sub_ps(a_j2_p1, yi_);  //   3,   5,   7,   9,
-    const __m128 a_k2_p0n = _mm_add_ps(a_k2_p0, yr_);  // 126, 124, 122, 120,
-    const __m128 a_k2_p1n = _mm_sub_ps(a_k2_p1, yi_);  // 127, 125, 123, 121,
-    // Shuffle in right order and store.
-    const __m128 a_j2_0n = _mm_unpacklo_ps(a_j2_p0n, a_j2_p1n);
-    //   2,   3,   4,   5,
-    const __m128 a_j2_4n = _mm_unpackhi_ps(a_j2_p0n, a_j2_p1n);
-    //   6,   7,   8,   9,
-    const __m128 a_k2_0nt = _mm_unpackhi_ps(a_k2_p0n, a_k2_p1n);
-    // 122, 123, 120, 121,
-    const __m128 a_k2_4nt = _mm_unpacklo_ps(a_k2_p0n, a_k2_p1n);
-    // 126, 127, 124, 125,
-    const __m128 a_k2_0n = _mm_shuffle_ps(
-        a_k2_0nt, a_k2_0nt, _MM_SHUFFLE(1, 0, 3, 2));  // 120, 121, 122, 123,
-    const __m128 a_k2_4n = _mm_shuffle_ps(
-        a_k2_4nt, a_k2_4nt, _MM_SHUFFLE(1, 0, 3, 2));  // 124, 125, 126, 127,
-    _mm_storeu_ps(&a[0 + j2], a_j2_0n);
-    _mm_storeu_ps(&a[4 + j2], a_j2_4n);
-    _mm_storeu_ps(&a[122 - j2], a_k2_0n);
-    _mm_storeu_ps(&a[126 - j2], a_k2_4n);
-  }
-  // Scalar code for the remaining items.
-  for (; j2 < 64; j1 += 1, j2 += 2) {
-    k2 = 128 - j2;
-    k1 = 32 - j1;
-    wkr = 0.5f - c[k1];
-    wki = c[j1];
-    xr = a[j2 + 0] - a[k2 + 0];
-    xi = a[j2 + 1] + a[k2 + 1];
-    yr = wkr * xr - wki * xi;
-    yi = wkr * xi + wki * xr;
-    a[j2 + 0] -= yr;
-    a[j2 + 1] -= yi;
-    a[k2 + 0] += yr;
-    a[k2 + 1] -= yi;
-  }
-}
-
-void rftbsub_128_SSE2(float* a) {
-  const float* c = rdft_w + 32;
-  int j1, j2, k1, k2;
-  float wkr, wki, xr, xi, yr, yi;
-
-  static const ALIGN16_BEG float ALIGN16_END k_half[4] = {0.5f, 0.5f, 0.5f,
-                                                          0.5f};
-  const __m128 mm_half = _mm_load_ps(k_half);
-
-  a[1] = -a[1];
-  // Vectorized code (four at once).
-  //    Note: commented number are indexes for the first iteration of the loop.
-  for (j1 = 1, j2 = 2; j2 + 7 < 64; j1 += 4, j2 += 8) {
-    // Load 'wk'.
-    const __m128 c_j1 = _mm_loadu_ps(&c[j1]);       //  1,  2,  3,  4,
-    const __m128 c_k1 = _mm_loadu_ps(&c[29 - j1]);  // 28, 29, 30, 31,
-    const __m128 wkrt = _mm_sub_ps(mm_half, c_k1);  // 28, 29, 30, 31,
-    const __m128 wkr_ =
-        _mm_shuffle_ps(wkrt, wkrt, _MM_SHUFFLE(0, 1, 2, 3));  // 31, 30, 29, 28,
-    const __m128 wki_ = c_j1;                                 //  1,  2,  3,  4,
-    // Load and shuffle 'a'.
-    const __m128 a_j2_0 = _mm_loadu_ps(&a[0 + j2]);    //   2,   3,   4,   5,
-    const __m128 a_j2_4 = _mm_loadu_ps(&a[4 + j2]);    //   6,   7,   8,   9,
-    const __m128 a_k2_0 = _mm_loadu_ps(&a[122 - j2]);  // 120, 121, 122, 123,
-    const __m128 a_k2_4 = _mm_loadu_ps(&a[126 - j2]);  // 124, 125, 126, 127,
-    const __m128 a_j2_p0 = _mm_shuffle_ps(
-        a_j2_0, a_j2_4, _MM_SHUFFLE(2, 0, 2, 0));  //   2,   4,   6,   8,
-    const __m128 a_j2_p1 = _mm_shuffle_ps(
-        a_j2_0, a_j2_4, _MM_SHUFFLE(3, 1, 3, 1));  //   3,   5,   7,   9,
-    const __m128 a_k2_p0 = _mm_shuffle_ps(
-        a_k2_4, a_k2_0, _MM_SHUFFLE(0, 2, 0, 2));  // 126, 124, 122, 120,
-    const __m128 a_k2_p1 = _mm_shuffle_ps(
-        a_k2_4, a_k2_0, _MM_SHUFFLE(1, 3, 1, 3));  // 127, 125, 123, 121,
-    // Calculate 'x'.
-    const __m128 xr_ = _mm_sub_ps(a_j2_p0, a_k2_p0);
-    // 2-126, 4-124, 6-122, 8-120,
-    const __m128 xi_ = _mm_add_ps(a_j2_p1, a_k2_p1);
-    // 3-127, 5-125, 7-123, 9-121,
-    // Calculate product into 'y'.
-    //    yr = wkr * xr + wki * xi;
-    //    yi = wkr * xi - wki * xr;
-    const __m128 a_ = _mm_mul_ps(wkr_, xr_);
-    const __m128 b_ = _mm_mul_ps(wki_, xi_);
-    const __m128 c_ = _mm_mul_ps(wkr_, xi_);
-    const __m128 d_ = _mm_mul_ps(wki_, xr_);
-    const __m128 yr_ = _mm_add_ps(a_, b_);  // 2-126, 4-124, 6-122, 8-120,
-    const __m128 yi_ = _mm_sub_ps(c_, d_);  // 3-127, 5-125, 7-123, 9-121,
-                                            // Update 'a'.
-                                            //    a[j2 + 0] = a[j2 + 0] - yr;
-                                            //    a[j2 + 1] = yi - a[j2 + 1];
-                                            //    a[k2 + 0] = yr + a[k2 + 0];
-    //    a[k2 + 1] = yi - a[k2 + 1];
-    const __m128 a_j2_p0n = _mm_sub_ps(a_j2_p0, yr_);  //   2,   4,   6,   8,
-    const __m128 a_j2_p1n = _mm_sub_ps(yi_, a_j2_p1);  //   3,   5,   7,   9,
-    const __m128 a_k2_p0n = _mm_add_ps(a_k2_p0, yr_);  // 126, 124, 122, 120,
-    const __m128 a_k2_p1n = _mm_sub_ps(yi_, a_k2_p1);  // 127, 125, 123, 121,
-    // Shuffle in right order and store.
-    const __m128 a_j2_0n = _mm_unpacklo_ps(a_j2_p0n, a_j2_p1n);
-    //   2,   3,   4,   5,
-    const __m128 a_j2_4n = _mm_unpackhi_ps(a_j2_p0n, a_j2_p1n);
-    //   6,   7,   8,   9,
-    const __m128 a_k2_0nt = _mm_unpackhi_ps(a_k2_p0n, a_k2_p1n);
-    // 122, 123, 120, 121,
-    const __m128 a_k2_4nt = _mm_unpacklo_ps(a_k2_p0n, a_k2_p1n);
-    // 126, 127, 124, 125,
-    const __m128 a_k2_0n = _mm_shuffle_ps(
-        a_k2_0nt, a_k2_0nt, _MM_SHUFFLE(1, 0, 3, 2));  // 120, 121, 122, 123,
-    const __m128 a_k2_4n = _mm_shuffle_ps(
-        a_k2_4nt, a_k2_4nt, _MM_SHUFFLE(1, 0, 3, 2));  // 124, 125, 126, 127,
-    _mm_storeu_ps(&a[0 + j2], a_j2_0n);
-    _mm_storeu_ps(&a[4 + j2], a_j2_4n);
-    _mm_storeu_ps(&a[122 - j2], a_k2_0n);
-    _mm_storeu_ps(&a[126 - j2], a_k2_4n);
-  }
-  // Scalar code for the remaining items.
-  for (; j2 < 64; j1 += 1, j2 += 2) {
-    k2 = 128 - j2;
-    k1 = 32 - j1;
-    wkr = 0.5f - c[k1];
-    wki = c[j1];
-    xr = a[j2 + 0] - a[k2 + 0];
-    xi = a[j2 + 1] + a[k2 + 1];
-    yr = wkr * xr + wki * xi;
-    yi = wkr * xi - wki * xr;
-    a[j2 + 0] = a[j2 + 0] - yr;
-    a[j2 + 1] = yi - a[j2 + 1];
-    a[k2 + 0] = yr + a[k2 + 0];
-    a[k2 + 1] = yi - a[k2 + 1];
-  }
-  a[65] = -a[65];
-}
-#endif
-
-}  // namespace webrtc
-
-#endif
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/utility/ooura_fft_tables_common.h b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/utility/ooura_fft_tables_common.h
deleted file mode 100644
index 47d076ea2a..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/utility/ooura_fft_tables_common.h
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- *  Copyright (c) 2011 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#ifndef MODULES_AUDIO_PROCESSING_UTILITY_OOURA_FFT_TABLES_COMMON_H_
-#define MODULES_AUDIO_PROCESSING_UTILITY_OOURA_FFT_TABLES_COMMON_H_
-
-#include "modules/audio_processing/utility/ooura_fft.h"
-
-namespace webrtc {
-
-// This tables used to be computed at run-time. For example, refer to:
-// https://code.google.com/p/webrtc/source/browse/trunk/webrtc/modules/audio_processing/utility/apm_rdft.c?r=6564
-// to see the initialization code.
-// Constants shared by all paths (C, SSE2, NEON).
-const float rdft_w[64] = {
-    1.0000000000f, 0.0000000000f, 0.7071067691f, 0.7071067691f, 0.9238795638f,
-    0.3826834559f, 0.3826834559f, 0.9238795638f, 0.9807852507f, 0.1950903237f,
-    0.5555702448f, 0.8314695954f, 0.8314695954f, 0.5555702448f, 0.1950903237f,
-    0.9807852507f, 0.9951847196f, 0.0980171412f, 0.6343933344f, 0.7730104327f,
-    0.8819212914f, 0.4713967443f, 0.2902846634f, 0.9569403529f, 0.9569403529f,
-    0.2902846634f, 0.4713967443f, 0.8819212914f, 0.7730104327f, 0.6343933344f,
-    0.0980171412f, 0.9951847196f, 0.7071067691f, 0.4993977249f, 0.4975923598f,
-    0.4945882559f, 0.4903926253f, 0.4850156307f, 0.4784701765f, 0.4707720280f,
-    0.4619397819f, 0.4519946277f, 0.4409606457f, 0.4288643003f, 0.4157347977f,
-    0.4016037583f, 0.3865052164f, 0.3704755902f, 0.3535533845f, 0.3357794881f,
-    0.3171966672f, 0.2978496552f, 0.2777851224f, 0.2570513785f, 0.2356983721f,
-    0.2137775421f, 0.1913417280f, 0.1684449315f, 0.1451423317f, 0.1214900985f,
-    0.0975451618f, 0.0733652338f, 0.0490085706f, 0.0245338380f,
-};
-
-// Constants used by the C and MIPS paths.
-const float rdft_wk3ri_first[16] = {
-    1.000000000f, 0.000000000f, 0.382683456f,  0.923879564f,
-    0.831469536f, 0.555570245f, -0.195090353f, 0.980785251f,
-    0.956940353f, 0.290284693f, 0.098017156f,  0.995184720f,
-    0.634393334f, 0.773010492f, -0.471396863f, 0.881921172f,
-};
-const float rdft_wk3ri_second[16] = {
-    -0.707106769f, 0.707106769f,  -0.923879564f, -0.382683456f,
-    -0.980785251f, 0.195090353f,  -0.555570245f, -0.831469536f,
-    -0.881921172f, 0.471396863f,  -0.773010492f, -0.634393334f,
-    -0.995184720f, -0.098017156f, -0.290284693f, -0.956940353f,
-};
-
-}  // namespace webrtc
-
-#endif  // MODULES_AUDIO_PROCESSING_UTILITY_OOURA_FFT_TABLES_COMMON_H_
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/utility/ooura_fft_tables_neon_sse2.h b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/utility/ooura_fft_tables_neon_sse2.h
deleted file mode 100644
index b6e4a07fce..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/utility/ooura_fft_tables_neon_sse2.h
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- *  Copyright (c) 2011 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#ifndef MODULES_AUDIO_PROCESSING_UTILITY_OOURA_FFT_TABLES_NEON_SSE2_H_
-#define MODULES_AUDIO_PROCESSING_UTILITY_OOURA_FFT_TABLES_NEON_SSE2_H_
-
-#include "modules/audio_processing/utility/ooura_fft.h"
-#include "rtc_base/system/arch.h"
-
-#ifdef _MSC_VER /* visual c++ */
-#define ALIGN16_BEG __declspec(align(16))
-#define ALIGN16_END
-#else /* gcc or icc */
-#define ALIGN16_BEG
-#define ALIGN16_END __attribute__((aligned(16)))
-#endif
-
-namespace webrtc {
-
-// These tables used to be computed at run-time. For example, refer to:
-// https://code.google.com/p/webrtc/source/browse/trunk/webrtc/modules/audio_processing/utility/apm_rdft.c?r=6564
-// to see the initialization code.
-#if defined(WEBRTC_ARCH_X86_FAMILY) || defined(WEBRTC_HAS_NEON)
-// Constants used by SSE2 and NEON but initialized in the C path.
-const ALIGN16_BEG float ALIGN16_END k_swap_sign[4] = {-1.f, 1.f, -1.f, 1.f};
-
-ALIGN16_BEG const float ALIGN16_END rdft_wk1r[32] = {
-    1.000000000f, 1.000000000f, 0.707106769f, 0.707106769f, 0.923879564f,
-    0.923879564f, 0.382683456f, 0.382683456f, 0.980785251f, 0.980785251f,
-    0.555570245f, 0.555570245f, 0.831469595f, 0.831469595f, 0.195090324f,
-    0.195090324f, 0.995184720f, 0.995184720f, 0.634393334f, 0.634393334f,
-    0.881921291f, 0.881921291f, 0.290284663f, 0.290284663f, 0.956940353f,
-    0.956940353f, 0.471396744f, 0.471396744f, 0.773010433f, 0.773010433f,
-    0.098017141f, 0.098017141f,
-};
-ALIGN16_BEG const float ALIGN16_END rdft_wk2r[32] = {
-    1.000000000f,  1.000000000f,  -0.000000000f, -0.000000000f, 0.707106769f,
-    0.707106769f,  -0.707106769f, -0.707106769f, 0.923879564f,  0.923879564f,
-    -0.382683456f, -0.382683456f, 0.382683456f,  0.382683456f,  -0.923879564f,
-    -0.923879564f, 0.980785251f,  0.980785251f,  -0.195090324f, -0.195090324f,
-    0.555570245f,  0.555570245f,  -0.831469595f, -0.831469595f, 0.831469595f,
-    0.831469595f,  -0.555570245f, -0.555570245f, 0.195090324f,  0.195090324f,
-    -0.980785251f, -0.980785251f,
-};
-ALIGN16_BEG const float ALIGN16_END rdft_wk3r[32] = {
-    1.000000000f,  1.000000000f,  -0.707106769f, -0.707106769f, 0.382683456f,
-    0.382683456f,  -0.923879564f, -0.923879564f, 0.831469536f,  0.831469536f,
-    -0.980785251f, -0.980785251f, -0.195090353f, -0.195090353f, -0.555570245f,
-    -0.555570245f, 0.956940353f,  0.956940353f,  -0.881921172f, -0.881921172f,
-    0.098017156f,  0.098017156f,  -0.773010492f, -0.773010492f, 0.634393334f,
-    0.634393334f,  -0.995184720f, -0.995184720f, -0.471396863f, -0.471396863f,
-    -0.290284693f, -0.290284693f,
-};
-ALIGN16_BEG const float ALIGN16_END rdft_wk1i[32] = {
-    -0.000000000f, 0.000000000f,  -0.707106769f, 0.707106769f,  -0.382683456f,
-    0.382683456f,  -0.923879564f, 0.923879564f,  -0.195090324f, 0.195090324f,
-    -0.831469595f, 0.831469595f,  -0.555570245f, 0.555570245f,  -0.980785251f,
-    0.980785251f,  -0.098017141f, 0.098017141f,  -0.773010433f, 0.773010433f,
-    -0.471396744f, 0.471396744f,  -0.956940353f, 0.956940353f,  -0.290284663f,
-    0.290284663f,  -0.881921291f, 0.881921291f,  -0.634393334f, 0.634393334f,
-    -0.995184720f, 0.995184720f,
-};
-ALIGN16_BEG const float ALIGN16_END rdft_wk2i[32] = {
-    -0.000000000f, 0.000000000f,  -1.000000000f, 1.000000000f,  -0.707106769f,
-    0.707106769f,  -0.707106769f, 0.707106769f,  -0.382683456f, 0.382683456f,
-    -0.923879564f, 0.923879564f,  -0.923879564f, 0.923879564f,  -0.382683456f,
-    0.382683456f,  -0.195090324f, 0.195090324f,  -0.980785251f, 0.980785251f,
-    -0.831469595f, 0.831469595f,  -0.555570245f, 0.555570245f,  -0.555570245f,
-    0.555570245f,  -0.831469595f, 0.831469595f,  -0.980785251f, 0.980785251f,
-    -0.195090324f, 0.195090324f,
-};
-ALIGN16_BEG const float ALIGN16_END rdft_wk3i[32] = {
-    -0.000000000f, 0.000000000f,  -0.707106769f, 0.707106769f,  -0.923879564f,
-    0.923879564f,  0.382683456f,  -0.382683456f, -0.555570245f, 0.555570245f,
-    -0.195090353f, 0.195090353f,  -0.980785251f, 0.980785251f,  0.831469536f,
-    -0.831469536f, -0.290284693f, 0.290284693f,  -0.471396863f, 0.471396863f,
-    -0.995184720f, 0.995184720f,  0.634393334f,  -0.634393334f, -0.773010492f,
-    0.773010492f,  0.098017156f,  -0.098017156f, -0.881921172f, 0.881921172f,
-    0.956940353f,  -0.956940353f,
-};
-ALIGN16_BEG const float ALIGN16_END cftmdl_wk1r[4] = {
-    0.707106769f, 0.707106769f, 0.707106769f, -0.707106769f,
-};
-#endif
-
-}  // namespace webrtc
-
-#endif  // MODULES_AUDIO_PROCESSING_UTILITY_OOURA_FFT_TABLES_NEON_SSE2_H_
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/vad/common.h b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/vad/common.h
deleted file mode 100644
index b5a5fb385b..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/vad/common.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- *  Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#ifndef MODULES_AUDIO_PROCESSING_VAD_COMMON_H_
-#define MODULES_AUDIO_PROCESSING_VAD_COMMON_H_
-
-#include <stddef.h>
-
-static const int kSampleRateHz = 16000;
-static const size_t kLength10Ms = kSampleRateHz / 100;
-static const size_t kMaxNumFrames = 4;
-
-struct AudioFeatures {
-  double log_pitch_gain[kMaxNumFrames];
-  double pitch_lag_hz[kMaxNumFrames];
-  double spectral_peak[kMaxNumFrames];
-  double rms[kMaxNumFrames];
-  size_t num_frames;
-  bool silence;
-};
-
-#endif  // MODULES_AUDIO_PROCESSING_VAD_COMMON_H_
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/vad/gmm.cc b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/vad/gmm.cc
deleted file mode 100644
index 3b8764c4d0..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/vad/gmm.cc
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- *  Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#include "modules/audio_processing/vad/gmm.h"
-
-#include <math.h>
-
-namespace webrtc {
-
-static const int kMaxDimension = 10;
-
-static void RemoveMean(const double* in,
-                       const double* mean_vec,
-                       int dimension,
-                       double* out) {
-  for (int n = 0; n < dimension; ++n)
-    out[n] = in[n] - mean_vec[n];
-}
-
-static double ComputeExponent(const double* in,
-                              const double* covar_inv,
-                              int dimension) {
-  double q = 0;
-  for (int i = 0; i < dimension; ++i) {
-    double v = 0;
-    for (int j = 0; j < dimension; j++)
-      v += (*covar_inv++) * in[j];
-    q += v * in[i];
-  }
-  q *= -0.5;
-  return q;
-}
-
-double EvaluateGmm(const double* x, const GmmParameters& gmm_parameters) {
-  if (gmm_parameters.dimension > kMaxDimension) {
-    return -1;  // This is invalid pdf so the caller can check this.
-  }
-  double f = 0;
-  double v[kMaxDimension];
-  const double* mean_vec = gmm_parameters.mean;
-  const double* covar_inv = gmm_parameters.covar_inverse;
-
-  for (int n = 0; n < gmm_parameters.num_mixtures; n++) {
-    RemoveMean(x, mean_vec, gmm_parameters.dimension, v);
-    double q = ComputeExponent(v, covar_inv, gmm_parameters.dimension) +
-               gmm_parameters.weight[n];
-    f += exp(q);
-    mean_vec += gmm_parameters.dimension;
-    covar_inv += gmm_parameters.dimension * gmm_parameters.dimension;
-  }
-  return f;
-}
-
-}  // namespace webrtc
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/vad/gmm.h b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/vad/gmm.h
deleted file mode 100644
index 93eb675c46..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/vad/gmm.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- *  Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#ifndef MODULES_AUDIO_PROCESSING_VAD_GMM_H_
-#define MODULES_AUDIO_PROCESSING_VAD_GMM_H_
-
-namespace webrtc {
-
-// A structure that specifies a GMM.
-// A GMM is formulated as
-//  f(x) = w[0] * mixture[0] + w[1] * mixture[1] + ... +
-//         w[num_mixtures - 1] * mixture[num_mixtures - 1];
-// Where a 'mixture' is a Gaussian density.
-
-struct GmmParameters {
-  // weight[n] = log(w[n]) - |dimension|/2 * log(2*pi) - 1/2 * log(det(cov[n]));
-  // where cov[n] is the covariance matrix of mixture n;
-  const double* weight;
-  // pointer to the first element of a |num_mixtures|x|dimension| matrix
-  // where kth row is the mean of the kth mixture.
-  const double* mean;
-  // pointer to the first element of a |num_mixtures|x|dimension|x|dimension|
-  // 3D-matrix, where the kth 2D-matrix is the inverse of the covariance
-  // matrix of the kth mixture.
-  const double* covar_inverse;
-  // Dimensionality of the mixtures.
-  int dimension;
-  // number of the mixtures.
-  int num_mixtures;
-};
-
-// Evaluate the given GMM, according to |gmm_parameters|, at the given point
-// |x|. If the dimensionality of the given GMM is larger that the maximum
-// acceptable dimension by the following function -1 is returned.
-double EvaluateGmm(const double* x, const GmmParameters& gmm_parameters);
-
-}  // namespace webrtc
-#endif  // MODULES_AUDIO_PROCESSING_VAD_GMM_H_
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/vad/noise_gmm_tables.h b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/vad/noise_gmm_tables.h
deleted file mode 100644
index 15562776e9..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/vad/noise_gmm_tables.h
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- *  Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-// GMM tables for inactive segments. Generated by MakeGmmTables.m.
-
-#ifndef MODULES_AUDIO_PROCESSING_VAD_NOISE_GMM_TABLES_H_
-#define MODULES_AUDIO_PROCESSING_VAD_NOISE_GMM_TABLES_H_
-
-static const int kNoiseGmmNumMixtures = 12;
-static const int kNoiseGmmDim = 3;
-
-static const double
-    kNoiseGmmCovarInverse[kNoiseGmmNumMixtures][kNoiseGmmDim][kNoiseGmmDim] = {
-        {{7.36219567592941e+00, 4.83060785179861e-03, 1.23335151497610e-02},
-         {4.83060785179861e-03, 1.65289507047817e-04, -2.41490588169997e-04},
-         {1.23335151497610e-02, -2.41490588169997e-04, 6.59472060689382e-03}},
-        {{8.70265239309140e+00, -5.30636201431086e-04, 5.44014966585347e-03},
-         {-5.30636201431086e-04, 3.11095453521008e-04, -1.86287206836035e-04},
-         {5.44014966585347e-03, -1.86287206836035e-04, 6.29493388790744e-04}},
-        {{4.53467851955055e+00, -3.92977536695197e-03, -2.46521420693317e-03},
-         {-3.92977536695197e-03, 4.94650752632750e-05, -1.08587438501826e-05},
-         {-2.46521420693317e-03, -1.08587438501826e-05, 9.28793975422261e-05}},
-        {{9.26817997114275e-01, -4.03976069276753e-04, -3.56441427392165e-03},
-         {-4.03976069276753e-04, 2.51976251631430e-06, 1.46914206734572e-07},
-         {-3.56441427392165e-03, 1.46914206734572e-07, 8.19914567685373e-05}},
-        {{7.61715986787441e+00, -1.54889041216888e-04, 2.41756280071656e-02},
-         {-1.54889041216888e-04, 3.50282550461672e-07, -6.27251196972490e-06},
-         {2.41756280071656e-02, -6.27251196972490e-06, 1.45061847649872e-02}},
-        {{8.31193642663158e+00, -3.84070508164323e-04, -3.09750630821876e-02},
-         {-3.84070508164323e-04, 3.80433432277336e-07, -1.14321142836636e-06},
-         {-3.09750630821876e-02, -1.14321142836636e-06, 8.35091486289997e-04}},
-        {{9.67283151270894e-01, 5.82465812445039e-05, -3.18350798617053e-03},
-         {5.82465812445039e-05, 2.23762672000318e-07, -7.74196587408623e-07},
-         {-3.18350798617053e-03, -7.74196587408623e-07, 3.85120938338325e-04}},
-        {{8.28066236985388e+00, 5.87634508319763e-05, 6.99303090891743e-03},
-         {5.87634508319763e-05, 2.93746018618058e-07, 3.40843332882272e-07},
-         {6.99303090891743e-03, 3.40843332882272e-07, 1.99379171190344e-04}},
-        {{6.07488998675646e+00, -1.11494526618473e-02, 5.10013111123381e-03},
-         {-1.11494526618473e-02, 6.99238879921751e-04, 5.36718550370870e-05},
-         {5.10013111123381e-03, 5.36718550370870e-05, 5.26909853276753e-04}},
-        {{6.90492021419175e+00, 4.20639355257863e-04, -2.38612752336481e-03},
-         {4.20639355257863e-04, 3.31246767338153e-06, -2.42052288150859e-08},
-         {-2.38612752336481e-03, -2.42052288150859e-08, 4.46608368363412e-04}},
-        {{1.31069150869715e+01, -1.73718583865670e-04, -1.97591814508578e-02},
-         {-1.73718583865670e-04, 2.80451716300124e-07, 9.96570755379865e-07},
-         {-1.97591814508578e-02, 9.96570755379865e-07, 2.41361900868847e-03}},
-        {{4.69566344239814e+00, -2.61077567563690e-04, 5.26359000761433e-03},
-         {-2.61077567563690e-04, 1.82420859823767e-06, -7.83645887541601e-07},
-         {5.26359000761433e-03, -7.83645887541601e-07, 1.33586288288802e-02}}};
-
-static const double kNoiseGmmMean[kNoiseGmmNumMixtures][kNoiseGmmDim] = {
-    {-2.01386094766163e+00, 1.69702162045397e+02, 7.41715804872181e+01},
-    {-1.94684591777290e+00, 1.42398396732668e+02, 1.64186321157831e+02},
-    {-2.29319297562437e+00, 3.86415425589868e+02, 2.13452215267125e+02},
-    {-3.25487177070268e+00, 1.08668712553616e+03, 2.33119949467419e+02},
-    {-2.13159632447467e+00, 4.83821702557717e+03, 6.86786166673740e+01},
-    {-2.26171410780526e+00, 4.79420193982422e+03, 1.53222513286450e+02},
-    {-3.32166740703185e+00, 4.35161135834358e+03, 1.33206448431316e+02},
-    {-2.19290322814343e+00, 3.98325506609408e+03, 2.13249167359934e+02},
-    {-2.02898459255404e+00, 7.37039893155007e+03, 1.12518527491926e+02},
-    {-2.26150236399500e+00, 1.54896745196145e+03, 1.49717357868579e+02},
-    {-2.00417668301790e+00, 3.82434760310304e+03, 1.07438913004312e+02},
-    {-2.30193040814533e+00, 1.43953696546439e+03, 7.04085275122649e+01}};
-
-static const double kNoiseGmmWeights[kNoiseGmmNumMixtures] = {
-    -1.09422832086193e+01, -1.10847897513425e+01, -1.36767587732187e+01,
-    -1.79789356118641e+01, -1.42830169160894e+01, -1.56500228061379e+01,
-    -1.83124990950113e+01, -1.69979436177477e+01, -1.12329424387828e+01,
-    -1.41311785780639e+01, -1.47171861448585e+01, -1.35963362781839e+01};
-#endif  // MODULES_AUDIO_PROCESSING_VAD_NOISE_GMM_TABLES_H_
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/vad/pitch_based_vad.cc b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/vad/pitch_based_vad.cc
deleted file mode 100644
index 68e60dc66a..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/vad/pitch_based_vad.cc
+++ /dev/null
@@ -1,120 +0,0 @@
-/*
- *  Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#include "modules/audio_processing/vad/pitch_based_vad.h"
-
-#include <string.h>
-
-#include "modules/audio_processing/vad/common.h"
-#include "modules/audio_processing/vad/noise_gmm_tables.h"
-#include "modules/audio_processing/vad/vad_circular_buffer.h"
-#include "modules/audio_processing/vad/voice_gmm_tables.h"
-
-namespace webrtc {
-
-static_assert(kNoiseGmmDim == kVoiceGmmDim,
-              "noise and voice gmm dimension not equal");
-
-// These values should match MATLAB counterparts for unit-tests to pass.
-static const int kPosteriorHistorySize = 500;  // 5 sec of 10 ms frames.
-static const double kInitialPriorProbability = 0.3;
-static const int kTransientWidthThreshold = 7;
-static const double kLowProbabilityThreshold = 0.2;
-
-static double LimitProbability(double p) {
-  const double kLimHigh = 0.99;
-  const double kLimLow = 0.01;
-
-  if (p > kLimHigh)
-    p = kLimHigh;
-  else if (p < kLimLow)
-    p = kLimLow;
-  return p;
-}
-
-PitchBasedVad::PitchBasedVad()
-    : p_prior_(kInitialPriorProbability),
-      circular_buffer_(VadCircularBuffer::Create(kPosteriorHistorySize)) {
-  // Setup noise GMM.
-  noise_gmm_.dimension = kNoiseGmmDim;
-  noise_gmm_.num_mixtures = kNoiseGmmNumMixtures;
-  noise_gmm_.weight = kNoiseGmmWeights;
-  noise_gmm_.mean = &kNoiseGmmMean[0][0];
-  noise_gmm_.covar_inverse = &kNoiseGmmCovarInverse[0][0][0];
-
-  // Setup voice GMM.
-  voice_gmm_.dimension = kVoiceGmmDim;
-  voice_gmm_.num_mixtures = kVoiceGmmNumMixtures;
-  voice_gmm_.weight = kVoiceGmmWeights;
-  voice_gmm_.mean = &kVoiceGmmMean[0][0];
-  voice_gmm_.covar_inverse = &kVoiceGmmCovarInverse[0][0][0];
-}
-
-PitchBasedVad::~PitchBasedVad() {}
-
-int PitchBasedVad::VoicingProbability(const AudioFeatures& features,
-                                      double* p_combined) {
-  double p;
-  double gmm_features[3];
-  double pdf_features_given_voice;
-  double pdf_features_given_noise;
-  // These limits are the same in matlab implementation 'VoicingProbGMM().'
-  const double kLimLowLogPitchGain = -2.0;
-  const double kLimHighLogPitchGain = -0.9;
-  const double kLimLowSpectralPeak = 200;
-  const double kLimHighSpectralPeak = 2000;
-  const double kEps = 1e-12;
-  for (size_t n = 0; n < features.num_frames; n++) {
-    gmm_features[0] = features.log_pitch_gain[n];
-    gmm_features[1] = features.spectral_peak[n];
-    gmm_features[2] = features.pitch_lag_hz[n];
-
-    pdf_features_given_voice = EvaluateGmm(gmm_features, voice_gmm_);
-    pdf_features_given_noise = EvaluateGmm(gmm_features, noise_gmm_);
-
-    if (features.spectral_peak[n] < kLimLowSpectralPeak ||
-        features.spectral_peak[n] > kLimHighSpectralPeak ||
-        features.log_pitch_gain[n] < kLimLowLogPitchGain) {
-      pdf_features_given_voice = kEps * pdf_features_given_noise;
-    } else if (features.log_pitch_gain[n] > kLimHighLogPitchGain) {
-      pdf_features_given_noise = kEps * pdf_features_given_voice;
-    }
-
-    p = p_prior_ * pdf_features_given_voice /
-        (pdf_features_given_voice * p_prior_ +
-         pdf_features_given_noise * (1 - p_prior_));
-
-    p = LimitProbability(p);
-
-    // Combine pitch-based probability with standalone probability, before
-    // updating prior probabilities.
-    double prod_active = p * p_combined[n];
-    double prod_inactive = (1 - p) * (1 - p_combined[n]);
-    p_combined[n] = prod_active / (prod_active + prod_inactive);
-
-    if (UpdatePrior(p_combined[n]) < 0)
-      return -1;
-    // Limit prior probability. With a zero prior probability the posterior
-    // probability is always zero.
-    p_prior_ = LimitProbability(p_prior_);
-  }
-  return 0;
-}
-
-int PitchBasedVad::UpdatePrior(double p) {
-  circular_buffer_->Insert(p);
-  if (circular_buffer_->RemoveTransient(kTransientWidthThreshold,
-                                        kLowProbabilityThreshold) < 0)
-    return -1;
-  p_prior_ = circular_buffer_->Mean();
-  return 0;
-}
-
-}  // namespace webrtc
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/vad/pitch_based_vad.h b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/vad/pitch_based_vad.h
deleted file mode 100644
index 22bc0f2263..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/vad/pitch_based_vad.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- *  Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#ifndef MODULES_AUDIO_PROCESSING_VAD_PITCH_BASED_VAD_H_
-#define MODULES_AUDIO_PROCESSING_VAD_PITCH_BASED_VAD_H_
-
-#include <memory>
-
-#include "modules/audio_processing/vad/common.h"
-#include "modules/audio_processing/vad/gmm.h"
-
-namespace webrtc {
-
-class VadCircularBuffer;
-
-// Computes the probability of the input audio frame to be active given
-// the corresponding pitch-gain and lag of the frame.
-class PitchBasedVad {
- public:
-  PitchBasedVad();
-  ~PitchBasedVad();
-
-  // Compute pitch-based voicing probability, given the features.
-  //   features: a structure containing features required for computing voicing
-  //             probabilities.
-  //
-  //   p_combined: an array which contains the combined activity probabilities
-  //               computed prior to the call of this function. The method,
-  //               then, computes the voicing probabilities and combine them
-  //               with the given values. The result are returned in |p|.
-  int VoicingProbability(const AudioFeatures& features, double* p_combined);
-
- private:
-  int UpdatePrior(double p);
-
-  // TODO(turajs): maybe defining this at a higher level (maybe enum) so that
-  // all the code recognize it as "no-error."
-  static const int kNoError = 0;
-
-  GmmParameters noise_gmm_;
-  GmmParameters voice_gmm_;
-
-  double p_prior_;
-
-  std::unique_ptr<VadCircularBuffer> circular_buffer_;
-};
-
-}  // namespace webrtc
-#endif  // MODULES_AUDIO_PROCESSING_VAD_PITCH_BASED_VAD_H_
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/vad/pitch_internal.cc b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/vad/pitch_internal.cc
deleted file mode 100644
index 7e6bd3e616..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/vad/pitch_internal.cc
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- *  Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#include "modules/audio_processing/vad/pitch_internal.h"
-
-#include <cmath>
-
-// A 4-to-3 linear interpolation.
-// The interpolation constants are derived as following:
-// Input pitch parameters are updated every 7.5 ms. Within a 30-ms interval
-// we are interested in pitch parameters of 0-5 ms, 10-15ms and 20-25ms. This is
-// like interpolating 4-to-6 and keep the odd samples.
-// The reason behind this is that LPC coefficients are computed for the first
-// half of each 10ms interval.
-static void PitchInterpolation(double old_val, const double* in, double* out) {
-  out[0] = 1. / 6. * old_val + 5. / 6. * in[0];
-  out[1] = 5. / 6. * in[1] + 1. / 6. * in[2];
-  out[2] = 0.5 * in[2] + 0.5 * in[3];
-}
-
-void GetSubframesPitchParameters(int sampling_rate_hz,
-                                 double* gains,
-                                 double* lags,
-                                 int num_in_frames,
-                                 int num_out_frames,
-                                 double* log_old_gain,
-                                 double* old_lag,
-                                 double* log_pitch_gain,
-                                 double* pitch_lag_hz) {
-  // Gain interpolation is in log-domain, also returned in log-domain.
-  for (int n = 0; n < num_in_frames; n++)
-    gains[n] = log(gains[n] + 1e-12);
-
-  // Interpolate lags and gains.
-  PitchInterpolation(*log_old_gain, gains, log_pitch_gain);
-  *log_old_gain = gains[num_in_frames - 1];
-  PitchInterpolation(*old_lag, lags, pitch_lag_hz);
-  *old_lag = lags[num_in_frames - 1];
-
-  // Convert pitch-lags to Hertz.
-  for (int n = 0; n < num_out_frames; n++) {
-    pitch_lag_hz[n] = (sampling_rate_hz) / (pitch_lag_hz[n]);
-  }
-}
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/vad/pitch_internal.h b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/vad/pitch_internal.h
deleted file mode 100644
index 67e0522328..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/vad/pitch_internal.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- *  Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#ifndef MODULES_AUDIO_PROCESSING_VAD_PITCH_INTERNAL_H_
-#define MODULES_AUDIO_PROCESSING_VAD_PITCH_INTERNAL_H_
-
-// TODO(turajs): Write a description of this function. Also be consistent with
-// usage of |sampling_rate_hz| vs |kSamplingFreqHz|.
-void GetSubframesPitchParameters(int sampling_rate_hz,
-                                 double* gains,
-                                 double* lags,
-                                 int num_in_frames,
-                                 int num_out_frames,
-                                 double* log_old_gain,
-                                 double* old_lag,
-                                 double* log_pitch_gain,
-                                 double* pitch_lag_hz);
-
-#endif  // MODULES_AUDIO_PROCESSING_VAD_PITCH_INTERNAL_H_
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/vad/pole_zero_filter.cc b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/vad/pole_zero_filter.cc
deleted file mode 100644
index 4156d7e795..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/vad/pole_zero_filter.cc
+++ /dev/null
@@ -1,106 +0,0 @@
-/*
- *  Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#include "modules/audio_processing/vad/pole_zero_filter.h"
-
-#include <string.h>
-#include <algorithm>
-
-namespace webrtc {
-
-PoleZeroFilter* PoleZeroFilter::Create(const float* numerator_coefficients,
-                                       size_t order_numerator,
-                                       const float* denominator_coefficients,
-                                       size_t order_denominator) {
-  if (order_numerator > kMaxFilterOrder ||
-      order_denominator > kMaxFilterOrder || denominator_coefficients[0] == 0 ||
-      numerator_coefficients == NULL || denominator_coefficients == NULL)
-    return NULL;
-  return new PoleZeroFilter(numerator_coefficients, order_numerator,
-                            denominator_coefficients, order_denominator);
-}
-
-PoleZeroFilter::PoleZeroFilter(const float* numerator_coefficients,
-                               size_t order_numerator,
-                               const float* denominator_coefficients,
-                               size_t order_denominator)
-    : past_input_(),
-      past_output_(),
-      numerator_coefficients_(),
-      denominator_coefficients_(),
-      order_numerator_(order_numerator),
-      order_denominator_(order_denominator),
-      highest_order_(std::max(order_denominator, order_numerator)) {
-  memcpy(numerator_coefficients_, numerator_coefficients,
-         sizeof(numerator_coefficients_[0]) * (order_numerator_ + 1));
-  memcpy(denominator_coefficients_, denominator_coefficients,
-         sizeof(denominator_coefficients_[0]) * (order_denominator_ + 1));
-
-  if (denominator_coefficients_[0] != 1) {
-    for (size_t n = 0; n <= order_numerator_; n++)
-      numerator_coefficients_[n] /= denominator_coefficients_[0];
-    for (size_t n = 0; n <= order_denominator_; n++)
-      denominator_coefficients_[n] /= denominator_coefficients_[0];
-  }
-}
-
-template <typename T>
-static float FilterArPast(const T* past,
-                          size_t order,
-                          const float* coefficients) {
-  float sum = 0.0f;
-  size_t past_index = order - 1;
-  for (size_t k = 1; k <= order; k++, past_index--)
-    sum += coefficients[k] * past[past_index];
-  return sum;
-}
-
-int PoleZeroFilter::Filter(const int16_t* in,
-                           size_t num_input_samples,
-                           float* output) {
-  if (in == NULL || output == NULL)
-    return -1;
-  // This is the typical case, just a memcpy.
-  const size_t k = std::min(num_input_samples, highest_order_);
-  size_t n;
-  for (n = 0; n < k; n++) {
-    output[n] = in[n] * numerator_coefficients_[0];
-    output[n] += FilterArPast(&past_input_[n], order_numerator_,
-                              numerator_coefficients_);
-    output[n] -= FilterArPast(&past_output_[n], order_denominator_,
-                              denominator_coefficients_);
-
-    past_input_[n + order_numerator_] = in[n];
-    past_output_[n + order_denominator_] = output[n];
-  }
-  if (highest_order_ < num_input_samples) {
-    for (size_t m = 0; n < num_input_samples; n++, m++) {
-      output[n] = in[n] * numerator_coefficients_[0];
-      output[n] +=
-          FilterArPast(&in[m], order_numerator_, numerator_coefficients_);
-      output[n] -= FilterArPast(&output[m], order_denominator_,
-                                denominator_coefficients_);
-    }
-    // Record into the past signal.
-    memcpy(past_input_, &in[num_input_samples - order_numerator_],
-           sizeof(in[0]) * order_numerator_);
-    memcpy(past_output_, &output[num_input_samples - order_denominator_],
-           sizeof(output[0]) * order_denominator_);
-  } else {
-    // Odd case that the length of the input is shorter that filter order.
-    memmove(past_input_, &past_input_[num_input_samples],
-            order_numerator_ * sizeof(past_input_[0]));
-    memmove(past_output_, &past_output_[num_input_samples],
-            order_denominator_ * sizeof(past_output_[0]));
-  }
-  return 0;
-}
-
-}  // namespace webrtc
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/vad/pole_zero_filter.h b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/vad/pole_zero_filter.h
deleted file mode 100644
index 11a05114d1..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/vad/pole_zero_filter.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- *  Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#ifndef MODULES_AUDIO_PROCESSING_VAD_POLE_ZERO_FILTER_H_
-#define MODULES_AUDIO_PROCESSING_VAD_POLE_ZERO_FILTER_H_
-
-#include <stddef.h>
-#include <stdint.h>
-
-namespace webrtc {
-
-class PoleZeroFilter {
- public:
-  ~PoleZeroFilter() {}
-
-  static PoleZeroFilter* Create(const float* numerator_coefficients,
-                                size_t order_numerator,
-                                const float* denominator_coefficients,
-                                size_t order_denominator);
-
-  int Filter(const int16_t* in, size_t num_input_samples, float* output);
-
- private:
-  PoleZeroFilter(const float* numerator_coefficients,
-                 size_t order_numerator,
-                 const float* denominator_coefficients,
-                 size_t order_denominator);
-
-  static const int kMaxFilterOrder = 24;
-
-  int16_t past_input_[kMaxFilterOrder * 2];
-  float past_output_[kMaxFilterOrder * 2];
-
-  float numerator_coefficients_[kMaxFilterOrder + 1];
-  float denominator_coefficients_[kMaxFilterOrder + 1];
-
-  size_t order_numerator_;
-  size_t order_denominator_;
-  size_t highest_order_;
-};
-
-}  // namespace webrtc
-
-#endif  // MODULES_AUDIO_PROCESSING_VAD_POLE_ZERO_FILTER_H_
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/vad/standalone_vad.cc b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/vad/standalone_vad.cc
deleted file mode 100644
index 1397668eb4..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/vad/standalone_vad.cc
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
- *  Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#include "modules/audio_processing/vad/standalone_vad.h"
-
-#include <string.h>
-
-#include "common_audio/vad/include/webrtc_vad.h"
-#include "rtc_base/checks.h"
-
-namespace webrtc {
-
-static const int kDefaultStandaloneVadMode = 3;
-
-StandaloneVad::StandaloneVad(VadInst* vad)
-    : vad_(vad), buffer_(), index_(0), mode_(kDefaultStandaloneVadMode) {}
-
-StandaloneVad::~StandaloneVad() {
-  WebRtcVad_Free(vad_);
-}
-
-StandaloneVad* StandaloneVad::Create() {
-  VadInst* vad = WebRtcVad_Create();
-  if (!vad)
-    return nullptr;
-
-  int err = WebRtcVad_Init(vad);
-  err |= WebRtcVad_set_mode(vad, kDefaultStandaloneVadMode);
-  if (err != 0) {
-    WebRtcVad_Free(vad);
-    return nullptr;
-  }
-  return new StandaloneVad(vad);
-}
-
-int StandaloneVad::AddAudio(const int16_t* data, size_t length) {
-  if (length != kLength10Ms)
-    return -1;
-
-  if (index_ + length > kLength10Ms * kMaxNum10msFrames)
-    // Reset the buffer if it's full.
-    // TODO(ajm): Instead, consider just processing every 10 ms frame. Then we
-    // can forgo the buffering.
-    index_ = 0;
-
-  memcpy(&buffer_[index_], data, sizeof(int16_t) * length);
-  index_ += length;
-  return 0;
-}
-
-int StandaloneVad::GetActivity(double* p, size_t length_p) {
-  if (index_ == 0)
-    return -1;
-
-  const size_t num_frames = index_ / kLength10Ms;
-  if (num_frames > length_p)
-    return -1;
-  RTC_DCHECK_EQ(0, WebRtcVad_ValidRateAndFrameLength(kSampleRateHz, index_));
-
-  int activity = WebRtcVad_Process(vad_, kSampleRateHz, buffer_, index_);
-  if (activity < 0)
-    return -1;
-  else if (activity == 0)
-    p[0] = 0.01;  // Arbitrary but small and non-zero.
-  else
-    p[0] = 0.5;  // 0.5 is neutral values when combinned by other probabilities.
-  for (size_t n = 1; n < num_frames; n++)
-    p[n] = p[0];
-  // Reset the buffer to start from the beginning.
-  index_ = 0;
-  return activity;
-}
-
-int StandaloneVad::set_mode(int mode) {
-  if (mode < 0 || mode > 3)
-    return -1;
-  if (WebRtcVad_set_mode(vad_, mode) != 0)
-    return -1;
-
-  mode_ = mode;
-  return 0;
-}
-
-}  // namespace webrtc
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/vad/standalone_vad.h b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/vad/standalone_vad.h
deleted file mode 100644
index 3dff4163c2..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/vad/standalone_vad.h
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- *  Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#ifndef MODULES_AUDIO_PROCESSING_AGC_STANDALONE_VAD_H_
-#define MODULES_AUDIO_PROCESSING_AGC_STANDALONE_VAD_H_
-
-#include <stddef.h>
-#include <stdint.h>
-
-#include "common_audio/vad/include/webrtc_vad.h"
-#include "modules/audio_processing/vad/common.h"
-
-namespace webrtc {
-
-class StandaloneVad {
- public:
-  static StandaloneVad* Create();
-  ~StandaloneVad();
-
-  // Outputs
-  //   p: a buffer where probabilities are written to.
-  //   length_p: number of elements of |p|.
-  //
-  // return value:
-  //    -1: if no audio is stored or VAD returns error.
-  //     0: in success.
-  // In case of error the content of |activity| is unchanged.
-  //
-  // Note that due to a high false-positive (VAD decision is active while the
-  // processed audio is just background noise) rate, stand-alone VAD is used as
-  // a one-sided indicator. The activity probability is 0.5 if the frame is
-  // classified as active, and the probability is 0.01 if the audio is
-  // classified as passive. In this way, when probabilities are combined, the
-  // effect of the stand-alone VAD is neutral if the input is classified as
-  // active.
-  int GetActivity(double* p, size_t length_p);
-
-  // Expecting 10 ms of 16 kHz audio to be pushed in.
-  int AddAudio(const int16_t* data, size_t length);
-
-  // Set aggressiveness of VAD, 0 is the least aggressive and 3 is the most
-  // aggressive mode. Returns -1 if the input is less than 0 or larger than 3,
-  // otherwise 0 is returned.
-  int set_mode(int mode);
-  // Get the agressiveness of the current VAD.
-  int mode() const { return mode_; }
-
- private:
-  explicit StandaloneVad(VadInst* vad);
-
-  static const size_t kMaxNum10msFrames = 3;
-
-  // TODO(turajs): Is there a way to use scoped-pointer here?
-  VadInst* vad_;
-  int16_t buffer_[kMaxNum10msFrames * kLength10Ms];
-  size_t index_;
-  int mode_;
-};
-
-}  // namespace webrtc
-
-#endif  // MODULES_AUDIO_PROCESSING_AGC_STANDALONE_VAD_H_
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/vad/vad_audio_proc.cc b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/vad/vad_audio_proc.cc
deleted file mode 100644
index 53eb6de70f..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/vad/vad_audio_proc.cc
+++ /dev/null
@@ -1,275 +0,0 @@
-/*
- *  Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#include "modules/audio_processing/vad/vad_audio_proc.h"
-
-#include <math.h>
-#include <stdio.h>
-#include <string.h>
-
-#include "common_audio/third_party/fft4g/fft4g.h"
-#include "modules/audio_processing/vad/pitch_internal.h"
-#include "modules/audio_processing/vad/pole_zero_filter.h"
-#include "modules/audio_processing/vad/vad_audio_proc_internal.h"
-#include "rtc_base/checks.h"
-extern "C" {
-#include "modules/audio_coding/codecs/isac/main/source/filter_functions.h"
-#include "modules/audio_coding/codecs/isac/main/source/isac_vad.h"
-#include "modules/audio_coding/codecs/isac/main/source/pitch_estimator.h"
-#include "modules/audio_coding/codecs/isac/main/source/structs.h"
-}
-
-namespace webrtc {
-
-// The following structures are declared anonymous in iSAC's structs.h. To
-// forward declare them, we use this derived class trick.
-struct VadAudioProc::PitchAnalysisStruct : public ::PitchAnalysisStruct {};
-struct VadAudioProc::PreFiltBankstr : public ::PreFiltBankstr {};
-
-static constexpr float kFrequencyResolution =
-    kSampleRateHz / static_cast<float>(VadAudioProc::kDftSize);
-static constexpr int kSilenceRms = 5;
-
-// TODO(turajs): Make a Create or Init for VadAudioProc.
-VadAudioProc::VadAudioProc()
-    : audio_buffer_(),
-      num_buffer_samples_(kNumPastSignalSamples),
-      log_old_gain_(-2),
-      old_lag_(50),  // Arbitrary but valid as pitch-lag (in samples).
-      pitch_analysis_handle_(new PitchAnalysisStruct),
-      pre_filter_handle_(new PreFiltBankstr),
-      high_pass_filter_(PoleZeroFilter::Create(kCoeffNumerator,
-                                               kFilterOrder,
-                                               kCoeffDenominator,
-                                               kFilterOrder)) {
-  static_assert(kNumPastSignalSamples + kNumSubframeSamples ==
-                    sizeof(kLpcAnalWin) / sizeof(kLpcAnalWin[0]),
-                "lpc analysis window incorrect size");
-  static_assert(kLpcOrder + 1 == sizeof(kCorrWeight) / sizeof(kCorrWeight[0]),
-                "correlation weight incorrect size");
-
-  // TODO(turajs): Are we doing too much in the constructor?
-  float data[kDftSize];
-  // Make FFT to initialize.
-  ip_[0] = 0;
-  WebRtc_rdft(kDftSize, 1, data, ip_, w_fft_);
-  // TODO(turajs): Need to initialize high-pass filter.
-
-  // Initialize iSAC components.
-  WebRtcIsac_InitPreFilterbank(pre_filter_handle_.get());
-  WebRtcIsac_InitPitchAnalysis(pitch_analysis_handle_.get());
-}
-
-VadAudioProc::~VadAudioProc() {}
-
-void VadAudioProc::ResetBuffer() {
-  memcpy(audio_buffer_, &audio_buffer_[kNumSamplesToProcess],
-         sizeof(audio_buffer_[0]) * kNumPastSignalSamples);
-  num_buffer_samples_ = kNumPastSignalSamples;
-}
-
-int VadAudioProc::ExtractFeatures(const int16_t* frame,
-                                  size_t length,
-                                  AudioFeatures* features) {
-  features->num_frames = 0;
-  if (length != kNumSubframeSamples) {
-    return -1;
-  }
-
-  // High-pass filter to remove the DC component and very low frequency content.
-  // We have experienced that this high-pass filtering improves voice/non-voiced
-  // classification.
-  if (high_pass_filter_->Filter(frame, kNumSubframeSamples,
-                                &audio_buffer_[num_buffer_samples_]) != 0) {
-    return -1;
-  }
-
-  num_buffer_samples_ += kNumSubframeSamples;
-  if (num_buffer_samples_ < kBufferLength) {
-    return 0;
-  }
-  RTC_DCHECK_EQ(num_buffer_samples_, kBufferLength);
-  features->num_frames = kNum10msSubframes;
-  features->silence = false;
-
-  Rms(features->rms, kMaxNumFrames);
-  for (size_t i = 0; i < kNum10msSubframes; ++i) {
-    if (features->rms[i] < kSilenceRms) {
-      // PitchAnalysis can cause NaNs in the pitch gain if it's fed silence.
-      // Bail out here instead.
-      features->silence = true;
-      ResetBuffer();
-      return 0;
-    }
-  }
-
-  PitchAnalysis(features->log_pitch_gain, features->pitch_lag_hz,
-                kMaxNumFrames);
-  FindFirstSpectralPeaks(features->spectral_peak, kMaxNumFrames);
-  ResetBuffer();
-  return 0;
-}
-
-// Computes |kLpcOrder + 1| correlation coefficients.
-void VadAudioProc::SubframeCorrelation(double* corr,
-                                       size_t length_corr,
-                                       size_t subframe_index) {
-  RTC_DCHECK_GE(length_corr, kLpcOrder + 1);
-  double windowed_audio[kNumSubframeSamples + kNumPastSignalSamples];
-  size_t buffer_index = subframe_index * kNumSubframeSamples;
-
-  for (size_t n = 0; n < kNumSubframeSamples + kNumPastSignalSamples; n++)
-    windowed_audio[n] = audio_buffer_[buffer_index++] * kLpcAnalWin[n];
-
-  WebRtcIsac_AutoCorr(corr, windowed_audio,
-                      kNumSubframeSamples + kNumPastSignalSamples, kLpcOrder);
-}
-
-// Compute |kNum10msSubframes| sets of LPC coefficients, one per 10 ms input.
-// The analysis window is 15 ms long and it is centered on the first half of
-// each 10ms sub-frame. This is equivalent to computing LPC coefficients for the
-// first half of each 10 ms subframe.
-void VadAudioProc::GetLpcPolynomials(double* lpc, size_t length_lpc) {
-  RTC_DCHECK_GE(length_lpc, kNum10msSubframes * (kLpcOrder + 1));
-  double corr[kLpcOrder + 1];
-  double reflec_coeff[kLpcOrder];
-  for (size_t i = 0, offset_lpc = 0; i < kNum10msSubframes;
-       i++, offset_lpc += kLpcOrder + 1) {
-    SubframeCorrelation(corr, kLpcOrder + 1, i);
-    corr[0] *= 1.0001;
-    // This makes Lev-Durb a bit more stable.
-    for (size_t k = 0; k < kLpcOrder + 1; k++) {
-      corr[k] *= kCorrWeight[k];
-    }
-    WebRtcIsac_LevDurb(&lpc[offset_lpc], reflec_coeff, corr, kLpcOrder);
-  }
-}
-
-// Fit a second order curve to these 3 points and find the location of the
-// extremum. The points are inverted before curve fitting.
-static float QuadraticInterpolation(float prev_val,
-                                    float curr_val,
-                                    float next_val) {
-  // Doing the interpolation in |1 / A(z)|^2.
-  float fractional_index = 0;
-  next_val = 1.0f / next_val;
-  prev_val = 1.0f / prev_val;
-  curr_val = 1.0f / curr_val;
-
-  fractional_index =
-      -(next_val - prev_val) * 0.5f / (next_val + prev_val - 2.f * curr_val);
-  RTC_DCHECK_LT(fabs(fractional_index), 1);
-  return fractional_index;
-}
-
-// 1 / A(z), where A(z) is defined by |lpc| is a model of the spectral envelope
-// of the input signal. The local maximum of the spectral envelope corresponds
-// with the local minimum of A(z). It saves complexity, as we save one
-// inversion. Furthermore, we find the first local maximum of magnitude squared,
-// to save on one square root.
-void VadAudioProc::FindFirstSpectralPeaks(double* f_peak,
-                                          size_t length_f_peak) {
-  RTC_DCHECK_GE(length_f_peak, kNum10msSubframes);
-  double lpc[kNum10msSubframes * (kLpcOrder + 1)];
-  // For all sub-frames.
-  GetLpcPolynomials(lpc, kNum10msSubframes * (kLpcOrder + 1));
-
-  const size_t kNumDftCoefficients = kDftSize / 2 + 1;
-  float data[kDftSize];
-
-  for (size_t i = 0; i < kNum10msSubframes; i++) {
-    // Convert to float with zero pad.
-    memset(data, 0, sizeof(data));
-    for (size_t n = 0; n < kLpcOrder + 1; n++) {
-      data[n] = static_cast<float>(lpc[i * (kLpcOrder + 1) + n]);
-    }
-    // Transform to frequency domain.
-    WebRtc_rdft(kDftSize, 1, data, ip_, w_fft_);
-
-    size_t index_peak = 0;
-    float prev_magn_sqr = data[0] * data[0];
-    float curr_magn_sqr = data[2] * data[2] + data[3] * data[3];
-    float next_magn_sqr;
-    bool found_peak = false;
-    for (size_t n = 2; n < kNumDftCoefficients - 1; n++) {
-      next_magn_sqr =
-          data[2 * n] * data[2 * n] + data[2 * n + 1] * data[2 * n + 1];
-      if (curr_magn_sqr < prev_magn_sqr && curr_magn_sqr < next_magn_sqr) {
-        found_peak = true;
-        index_peak = n - 1;
-        break;
-      }
-      prev_magn_sqr = curr_magn_sqr;
-      curr_magn_sqr = next_magn_sqr;
-    }
-    float fractional_index = 0;
-    if (!found_peak) {
-      // Checking if |kNumDftCoefficients - 1| is the local minimum.
-      next_magn_sqr = data[1] * data[1];
-      if (curr_magn_sqr < prev_magn_sqr && curr_magn_sqr < next_magn_sqr) {
-        index_peak = kNumDftCoefficients - 1;
-      }
-    } else {
-      // A peak is found, do a simple quadratic interpolation to get a more
-      // accurate estimate of the peak location.
-      fractional_index =
-          QuadraticInterpolation(prev_magn_sqr, curr_magn_sqr, next_magn_sqr);
-    }
-    f_peak[i] = (index_peak + fractional_index) * kFrequencyResolution;
-  }
-}
-
-// Using iSAC functions to estimate pitch gains & lags.
-void VadAudioProc::PitchAnalysis(double* log_pitch_gains,
-                                 double* pitch_lags_hz,
-                                 size_t length) {
-  // TODO(turajs): This can be "imported" from iSAC & and the next two
-  // constants.
-  RTC_DCHECK_GE(length, kNum10msSubframes);
-  const int kNumPitchSubframes = 4;
-  double gains[kNumPitchSubframes];
-  double lags[kNumPitchSubframes];
-
-  const int kNumSubbandFrameSamples = 240;
-  const int kNumLookaheadSamples = 24;
-
-  float lower[kNumSubbandFrameSamples];
-  float upper[kNumSubbandFrameSamples];
-  double lower_lookahead[kNumSubbandFrameSamples];
-  double upper_lookahead[kNumSubbandFrameSamples];
-  double lower_lookahead_pre_filter[kNumSubbandFrameSamples +
-                                    kNumLookaheadSamples];
-
-  // Split signal to lower and upper bands
-  WebRtcIsac_SplitAndFilterFloat(&audio_buffer_[kNumPastSignalSamples], lower,
-                                 upper, lower_lookahead, upper_lookahead,
-                                 pre_filter_handle_.get());
-  WebRtcIsac_PitchAnalysis(lower_lookahead, lower_lookahead_pre_filter,
-                           pitch_analysis_handle_.get(), lags, gains);
-
-  // Lags are computed on lower-band signal with sampling rate half of the
-  // input signal.
-  GetSubframesPitchParameters(
-      kSampleRateHz / 2, gains, lags, kNumPitchSubframes, kNum10msSubframes,
-      &log_old_gain_, &old_lag_, log_pitch_gains, pitch_lags_hz);
-}
-
-void VadAudioProc::Rms(double* rms, size_t length_rms) {
-  RTC_DCHECK_GE(length_rms, kNum10msSubframes);
-  size_t offset = kNumPastSignalSamples;
-  for (size_t i = 0; i < kNum10msSubframes; i++) {
-    rms[i] = 0;
-    for (size_t n = 0; n < kNumSubframeSamples; n++, offset++)
-      rms[i] += audio_buffer_[offset] * audio_buffer_[offset];
-    rms[i] = sqrt(rms[i] / kNumSubframeSamples);
-  }
-}
-
-}  // namespace webrtc
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/vad/vad_audio_proc.h b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/vad/vad_audio_proc.h
deleted file mode 100644
index 9be3467ef8..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/vad/vad_audio_proc.h
+++ /dev/null
@@ -1,93 +0,0 @@
-/*
- *  Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#ifndef MODULES_AUDIO_PROCESSING_VAD_VAD_AUDIO_PROC_H_
-#define MODULES_AUDIO_PROCESSING_VAD_VAD_AUDIO_PROC_H_
-
-#include <stddef.h>
-#include <stdint.h>
-#include <memory>
-
-#include "modules/audio_processing/vad/common.h"  // AudioFeatures, kSampleR...
-
-namespace webrtc {
-
-class PoleZeroFilter;
-
-class VadAudioProc {
- public:
-  // Forward declare iSAC structs.
-  struct PitchAnalysisStruct;
-  struct PreFiltBankstr;
-
-  VadAudioProc();
-  ~VadAudioProc();
-
-  int ExtractFeatures(const int16_t* audio_frame,
-                      size_t length,
-                      AudioFeatures* audio_features);
-
-  static const size_t kDftSize = 512;
-
- private:
-  void PitchAnalysis(double* pitch_gains, double* pitch_lags_hz, size_t length);
-  void SubframeCorrelation(double* corr,
-                           size_t length_corr,
-                           size_t subframe_index);
-  void GetLpcPolynomials(double* lpc, size_t length_lpc);
-  void FindFirstSpectralPeaks(double* f_peak, size_t length_f_peak);
-  void Rms(double* rms, size_t length_rms);
-  void ResetBuffer();
-
-  // To compute spectral peak we perform LPC analysis to get spectral envelope.
-  // For every 30 ms we compute 3 spectral peak there for 3 LPC analysis.
-  // LPC is computed over 15 ms of windowed audio. For every 10 ms sub-frame
-  // we need 5 ms of past signal to create the input of LPC analysis.
-  enum : size_t {
-    kNumPastSignalSamples = static_cast<size_t>(kSampleRateHz / 200)
-  };
-
-  // TODO(turajs): maybe defining this at a higher level (maybe enum) so that
-  // all the code recognize it as "no-error."
-  enum : int { kNoError = 0 };
-
-  enum : size_t { kNum10msSubframes = 3 };
-  enum : size_t {
-    kNumSubframeSamples = static_cast<size_t>(kSampleRateHz / 100)
-  };
-  enum : size_t {
-    // Samples in 30 ms @ given sampling rate.
-    kNumSamplesToProcess = kNum10msSubframes * kNumSubframeSamples
-  };
-  enum : size_t {
-    kBufferLength = kNumPastSignalSamples + kNumSamplesToProcess
-  };
-  enum : size_t { kIpLength = kDftSize >> 1 };
-  enum : size_t { kWLength = kDftSize >> 1 };
-  enum : size_t { kLpcOrder = 16 };
-
-  size_t ip_[kIpLength];
-  float w_fft_[kWLength];
-
-  // A buffer of 5 ms (past audio) + 30 ms (one iSAC frame ).
-  float audio_buffer_[kBufferLength];
-  size_t num_buffer_samples_;
-
-  double log_old_gain_;
-  double old_lag_;
-
-  std::unique_ptr<PitchAnalysisStruct> pitch_analysis_handle_;
-  std::unique_ptr<PreFiltBankstr> pre_filter_handle_;
-  std::unique_ptr<PoleZeroFilter> high_pass_filter_;
-};
-
-}  // namespace webrtc
-
-#endif  // MODULES_AUDIO_PROCESSING_VAD_VAD_AUDIO_PROC_H_
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/vad/vad_audio_proc_internal.h b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/vad/vad_audio_proc_internal.h
deleted file mode 100644
index 915524f474..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/vad/vad_audio_proc_internal.h
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- *  Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#ifndef MODULES_AUDIO_PROCESSING_VAD_VAD_AUDIO_PROC_INTERNAL_H_
-#define MODULES_AUDIO_PROCESSING_VAD_VAD_AUDIO_PROC_INTERNAL_H_
-
-namespace webrtc {
-
-// These values should match MATLAB counterparts for unit-tests to pass.
-static const double kCorrWeight[] = {
-    1.000000, 0.985000, 0.970225, 0.955672, 0.941337, 0.927217,
-    0.913308, 0.899609, 0.886115, 0.872823, 0.859730, 0.846834,
-    0.834132, 0.821620, 0.809296, 0.797156, 0.785199};
-
-static const double kLpcAnalWin[] = {
-    0.00000000, 0.01314436, 0.02628645, 0.03942400, 0.05255473, 0.06567639,
-    0.07878670, 0.09188339, 0.10496421, 0.11802689, 0.13106918, 0.14408883,
-    0.15708358, 0.17005118, 0.18298941, 0.19589602, 0.20876878, 0.22160547,
-    0.23440387, 0.24716177, 0.25987696, 0.27254725, 0.28517045, 0.29774438,
-    0.31026687, 0.32273574, 0.33514885, 0.34750406, 0.35979922, 0.37203222,
-    0.38420093, 0.39630327, 0.40833713, 0.42030043, 0.43219112, 0.44400713,
-    0.45574642, 0.46740697, 0.47898676, 0.49048379, 0.50189608, 0.51322164,
-    0.52445853, 0.53560481, 0.54665854, 0.55761782, 0.56848075, 0.57924546,
-    0.58991008, 0.60047278, 0.61093173, 0.62128512, 0.63153117, 0.64166810,
-    0.65169416, 0.66160761, 0.67140676, 0.68108990, 0.69065536, 0.70010148,
-    0.70942664, 0.71862923, 0.72770765, 0.73666033, 0.74548573, 0.75418233,
-    0.76274862, 0.77118312, 0.77948437, 0.78765094, 0.79568142, 0.80357442,
-    0.81132858, 0.81894256, 0.82641504, 0.83374472, 0.84093036, 0.84797069,
-    0.85486451, 0.86161063, 0.86820787, 0.87465511, 0.88095122, 0.88709512,
-    0.89308574, 0.89892206, 0.90460306, 0.91012776, 0.91549520, 0.92070447,
-    0.92575465, 0.93064488, 0.93537432, 0.93994213, 0.94434755, 0.94858979,
-    0.95266814, 0.95658189, 0.96033035, 0.96391289, 0.96732888, 0.97057773,
-    0.97365889, 0.97657181, 0.97931600, 0.98189099, 0.98429632, 0.98653158,
-    0.98859639, 0.99049038, 0.99221324, 0.99376466, 0.99514438, 0.99635215,
-    0.99738778, 0.99825107, 0.99894188, 0.99946010, 0.99980562, 0.99997840,
-    0.99997840, 0.99980562, 0.99946010, 0.99894188, 0.99825107, 0.99738778,
-    0.99635215, 0.99514438, 0.99376466, 0.99221324, 0.99049038, 0.98859639,
-    0.98653158, 0.98429632, 0.98189099, 0.97931600, 0.97657181, 0.97365889,
-    0.97057773, 0.96732888, 0.96391289, 0.96033035, 0.95658189, 0.95266814,
-    0.94858979, 0.94434755, 0.93994213, 0.93537432, 0.93064488, 0.92575465,
-    0.92070447, 0.91549520, 0.91012776, 0.90460306, 0.89892206, 0.89308574,
-    0.88709512, 0.88095122, 0.87465511, 0.86820787, 0.86161063, 0.85486451,
-    0.84797069, 0.84093036, 0.83374472, 0.82641504, 0.81894256, 0.81132858,
-    0.80357442, 0.79568142, 0.78765094, 0.77948437, 0.77118312, 0.76274862,
-    0.75418233, 0.74548573, 0.73666033, 0.72770765, 0.71862923, 0.70942664,
-    0.70010148, 0.69065536, 0.68108990, 0.67140676, 0.66160761, 0.65169416,
-    0.64166810, 0.63153117, 0.62128512, 0.61093173, 0.60047278, 0.58991008,
-    0.57924546, 0.56848075, 0.55761782, 0.54665854, 0.53560481, 0.52445853,
-    0.51322164, 0.50189608, 0.49048379, 0.47898676, 0.46740697, 0.45574642,
-    0.44400713, 0.43219112, 0.42030043, 0.40833713, 0.39630327, 0.38420093,
-    0.37203222, 0.35979922, 0.34750406, 0.33514885, 0.32273574, 0.31026687,
-    0.29774438, 0.28517045, 0.27254725, 0.25987696, 0.24716177, 0.23440387,
-    0.22160547, 0.20876878, 0.19589602, 0.18298941, 0.17005118, 0.15708358,
-    0.14408883, 0.13106918, 0.11802689, 0.10496421, 0.09188339, 0.07878670,
-    0.06567639, 0.05255473, 0.03942400, 0.02628645, 0.01314436, 0.00000000};
-
-static const size_t kFilterOrder = 2;
-static const float kCoeffNumerator[kFilterOrder + 1] = {0.974827f, -1.949650f,
-                                                        0.974827f};
-static const float kCoeffDenominator[kFilterOrder + 1] = {1.0f, -1.971999f,
-                                                          0.972457f};
-
-static_assert(kFilterOrder + 1 ==
-                  sizeof(kCoeffNumerator) / sizeof(kCoeffNumerator[0]),
-              "numerator coefficients incorrect size");
-static_assert(kFilterOrder + 1 ==
-                  sizeof(kCoeffDenominator) / sizeof(kCoeffDenominator[0]),
-              "denominator coefficients incorrect size");
-
-}  // namespace webrtc
-
-#endif  // MODULES_AUDIO_PROCESSING_VAD_VAD_AUDIO_PROCESSING_H_
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/vad/vad_circular_buffer.cc b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/vad/vad_circular_buffer.cc
deleted file mode 100644
index 31f14d7f64..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/vad/vad_circular_buffer.cc
+++ /dev/null
@@ -1,135 +0,0 @@
-/*
- *  Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#include "modules/audio_processing/vad/vad_circular_buffer.h"
-
-#include <stdlib.h>
-
-namespace webrtc {
-
-VadCircularBuffer::VadCircularBuffer(int buffer_size)
-    : buffer_(new double[buffer_size]),
-      is_full_(false),
-      index_(0),
-      buffer_size_(buffer_size),
-      sum_(0) {}
-
-VadCircularBuffer::~VadCircularBuffer() {}
-
-void VadCircularBuffer::Reset() {
-  is_full_ = false;
-  index_ = 0;
-  sum_ = 0;
-}
-
-VadCircularBuffer* VadCircularBuffer::Create(int buffer_size) {
-  if (buffer_size <= 0)
-    return NULL;
-  return new VadCircularBuffer(buffer_size);
-}
-
-double VadCircularBuffer::Oldest() const {
-  if (!is_full_)
-    return buffer_[0];
-  else
-    return buffer_[index_];
-}
-
-double VadCircularBuffer::Mean() {
-  double m;
-  if (is_full_) {
-    m = sum_ / buffer_size_;
-  } else {
-    if (index_ > 0)
-      m = sum_ / index_;
-    else
-      m = 0;
-  }
-  return m;
-}
-
-void VadCircularBuffer::Insert(double value) {
-  if (is_full_) {
-    sum_ -= buffer_[index_];
-  }
-  sum_ += value;
-  buffer_[index_] = value;
-  index_++;
-  if (index_ >= buffer_size_) {
-    is_full_ = true;
-    index_ = 0;
-  }
-}
-int VadCircularBuffer::BufferLevel() {
-  if (is_full_)
-    return buffer_size_;
-  return index_;
-}
-
-int VadCircularBuffer::Get(int index, double* value) const {
-  int err = ConvertToLinearIndex(&index);
-  if (err < 0)
-    return -1;
-  *value = buffer_[index];
-  return 0;
-}
-
-int VadCircularBuffer::Set(int index, double value) {
-  int err = ConvertToLinearIndex(&index);
-  if (err < 0)
-    return -1;
-
-  sum_ -= buffer_[index];
-  buffer_[index] = value;
-  sum_ += value;
-  return 0;
-}
-
-int VadCircularBuffer::ConvertToLinearIndex(int* index) const {
-  if (*index < 0 || *index >= buffer_size_)
-    return -1;
-
-  if (!is_full_ && *index >= index_)
-    return -1;
-
-  *index = index_ - 1 - *index;
-  if (*index < 0)
-    *index += buffer_size_;
-  return 0;
-}
-
-int VadCircularBuffer::RemoveTransient(int width_threshold,
-                                       double val_threshold) {
-  if (!is_full_ && index_ < width_threshold + 2)
-    return 0;
-
-  int index_1 = 0;
-  int index_2 = width_threshold + 1;
-  double v = 0;
-  if (Get(index_1, &v) < 0)
-    return -1;
-  if (v < val_threshold) {
-    Set(index_1, 0);
-    int index;
-    for (index = index_2; index > index_1; index--) {
-      if (Get(index, &v) < 0)
-        return -1;
-      if (v < val_threshold)
-        break;
-    }
-    for (; index > index_1; index--) {
-      if (Set(index, 0.0) < 0)
-        return -1;
-    }
-  }
-  return 0;
-}
-
-}  // namespace webrtc
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/vad/vad_circular_buffer.h b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/vad/vad_circular_buffer.h
deleted file mode 100644
index 46b03d49bf..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/vad/vad_circular_buffer.h
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- *  Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#ifndef MODULES_AUDIO_PROCESSING_VAD_VAD_CIRCULAR_BUFFER_H_
-#define MODULES_AUDIO_PROCESSING_VAD_VAD_CIRCULAR_BUFFER_H_
-
-#include <memory>
-
-namespace webrtc {
-
-// A circular buffer tailored to the need of this project. It stores last
-// K samples of the input, and keeps track of the mean of the last samples.
-//
-// It is used in class "PitchBasedActivity" to keep track of posterior
-// probabilities in the past few seconds. The posterior probabilities are used
-// to recursively update prior probabilities.
-class VadCircularBuffer {
- public:
-  static VadCircularBuffer* Create(int buffer_size);
-  ~VadCircularBuffer();
-
-  // If buffer is wrapped around.
-  bool is_full() const { return is_full_; }
-  // Get the oldest entry in the buffer.
-  double Oldest() const;
-  // Insert new value into the buffer.
-  void Insert(double value);
-  // Reset buffer, forget the past, start fresh.
-  void Reset();
-
-  // The mean value of the elements in the buffer. The return value is zero if
-  // buffer is empty, i.e. no value is inserted.
-  double Mean();
-  // Remove transients. If the values exceed |val_threshold| for a period
-  // shorter then or equal to |width_threshold|, then that period is considered
-  // transient and set to zero.
-  int RemoveTransient(int width_threshold, double val_threshold);
-
- private:
-  explicit VadCircularBuffer(int buffer_size);
-  // Get previous values. |index = 0| corresponds to the most recent
-  // insertion. |index = 1| is the one before the most recent insertion, and
-  // so on.
-  int Get(int index, double* value) const;
-  // Set a given position to |value|. |index| is interpreted as above.
-  int Set(int index, double value);
-  // Return the number of valid elements in the buffer.
-  int BufferLevel();
-
-  // Convert an index with the interpretation as get() method to the
-  // corresponding linear index.
-  int ConvertToLinearIndex(int* index) const;
-
-  std::unique_ptr<double[]> buffer_;
-  bool is_full_;
-  int index_;
-  int buffer_size_;
-  double sum_;
-};
-
-}  // namespace webrtc
-#endif  // MODULES_AUDIO_PROCESSING_VAD_VAD_CIRCULAR_BUFFER_H_
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/vad/voice_activity_detector.cc b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/vad/voice_activity_detector.cc
deleted file mode 100644
index f0d34c668e..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/vad/voice_activity_detector.cc
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- *  Copyright (c) 2015 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#include "modules/audio_processing/vad/voice_activity_detector.h"
-
-#include <algorithm>
-
-#include "rtc_base/checks.h"
-
-namespace webrtc {
-namespace {
-
-const size_t kNumChannels = 1;
-
-const double kDefaultVoiceValue = 1.0;
-const double kNeutralProbability = 0.5;
-const double kLowProbability = 0.01;
-
-}  // namespace
-
-VoiceActivityDetector::VoiceActivityDetector()
-    : last_voice_probability_(kDefaultVoiceValue),
-      standalone_vad_(StandaloneVad::Create()) {}
-
-VoiceActivityDetector::~VoiceActivityDetector() = default;
-
-// Because ISAC has a different chunk length, it updates
-// |chunkwise_voice_probabilities_| and |chunkwise_rms_| when there is new data.
-// Otherwise it clears them.
-void VoiceActivityDetector::ProcessChunk(const int16_t* audio,
-                                         size_t length,
-                                         int sample_rate_hz) {
-  RTC_DCHECK_EQ(length, sample_rate_hz / 100);
-  // Resample to the required rate.
-  const int16_t* resampled_ptr = audio;
-  if (sample_rate_hz != kSampleRateHz) {
-    RTC_CHECK_EQ(
-        resampler_.ResetIfNeeded(sample_rate_hz, kSampleRateHz, kNumChannels),
-        0);
-    resampler_.Push(audio, length, resampled_, kLength10Ms, length);
-    resampled_ptr = resampled_;
-  }
-  RTC_DCHECK_EQ(length, kLength10Ms);
-
-  // Each chunk needs to be passed into |standalone_vad_|, because internally it
-  // buffers the audio and processes it all at once when GetActivity() is
-  // called.
-  RTC_CHECK_EQ(standalone_vad_->AddAudio(resampled_ptr, length), 0);
-
-  audio_processing_.ExtractFeatures(resampled_ptr, length, &features_);
-
-  chunkwise_voice_probabilities_.resize(features_.num_frames);
-  chunkwise_rms_.resize(features_.num_frames);
-  std::copy(features_.rms, features_.rms + chunkwise_rms_.size(),
-            chunkwise_rms_.begin());
-  if (features_.num_frames > 0) {
-    if (features_.silence) {
-      // The other features are invalid, so set the voice probabilities to an
-      // arbitrary low value.
-      std::fill(chunkwise_voice_probabilities_.begin(),
-                chunkwise_voice_probabilities_.end(), kLowProbability);
-    } else {
-      std::fill(chunkwise_voice_probabilities_.begin(),
-                chunkwise_voice_probabilities_.end(), kNeutralProbability);
-      RTC_CHECK_GE(
-          standalone_vad_->GetActivity(&chunkwise_voice_probabilities_[0],
-                                       chunkwise_voice_probabilities_.size()),
-          0);
-      RTC_CHECK_GE(pitch_based_vad_.VoicingProbability(
-                       features_, &chunkwise_voice_probabilities_[0]),
-                   0);
-    }
-    last_voice_probability_ = chunkwise_voice_probabilities_.back();
-  }
-}
-
-}  // namespace webrtc
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/vad/voice_activity_detector.h b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/vad/voice_activity_detector.h
deleted file mode 100644
index d140fe2aa3..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/vad/voice_activity_detector.h
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- *  Copyright (c) 2015 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#ifndef MODULES_AUDIO_PROCESSING_VAD_VOICE_ACTIVITY_DETECTOR_H_
-#define MODULES_AUDIO_PROCESSING_VAD_VOICE_ACTIVITY_DETECTOR_H_
-
-#include <stddef.h>
-#include <stdint.h>
-#include <memory>
-#include <vector>
-
-#include "common_audio/resampler/include/resampler.h"
-#include "modules/audio_processing/vad/common.h"
-#include "modules/audio_processing/vad/pitch_based_vad.h"
-#include "modules/audio_processing/vad/standalone_vad.h"
-#include "modules/audio_processing/vad/vad_audio_proc.h"
-
-namespace webrtc {
-
-// A Voice Activity Detector (VAD) that combines the voice probability from the
-// StandaloneVad and PitchBasedVad to get a more robust estimation.
-class VoiceActivityDetector {
- public:
-  VoiceActivityDetector();
-  ~VoiceActivityDetector();
-
-  // Processes each audio chunk and estimates the voice probability.
-  void ProcessChunk(const int16_t* audio, size_t length, int sample_rate_hz);
-
-  // Returns a vector of voice probabilities for each chunk. It can be empty for
-  // some chunks, but it catches up afterwards returning multiple values at
-  // once.
-  const std::vector<double>& chunkwise_voice_probabilities() const {
-    return chunkwise_voice_probabilities_;
-  }
-
-  // Returns a vector of RMS values for each chunk. It has the same length as
-  // chunkwise_voice_probabilities().
-  const std::vector<double>& chunkwise_rms() const { return chunkwise_rms_; }
-
-  // Returns the last voice probability, regardless of the internal
-  // implementation, although it has a few chunks of delay.
-  float last_voice_probability() const { return last_voice_probability_; }
-
- private:
-  // TODO(aluebs): Change these to float.
-  std::vector<double> chunkwise_voice_probabilities_;
-  std::vector<double> chunkwise_rms_;
-
-  float last_voice_probability_;
-
-  Resampler resampler_;
-  VadAudioProc audio_processing_;
-
-  std::unique_ptr<StandaloneVad> standalone_vad_;
-  PitchBasedVad pitch_based_vad_;
-
-  int16_t resampled_[kLength10Ms];
-  AudioFeatures features_;
-};
-
-}  // namespace webrtc
-
-#endif  // MODULES_AUDIO_PROCESSING_VAD_VOICE_ACTIVITY_DETECTOR_H_
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/vad/voice_gmm_tables.h b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/vad/voice_gmm_tables.h
deleted file mode 100644
index ef4ad7e21e..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/vad/voice_gmm_tables.h
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- *  Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-// GMM tables for active segments. Generated by MakeGmmTables.m.
-
-#ifndef MODULES_AUDIO_PROCESSING_VAD_VOICE_GMM_TABLES_H_
-#define MODULES_AUDIO_PROCESSING_VAD_VOICE_GMM_TABLES_H_
-
-static const int kVoiceGmmNumMixtures = 12;
-static const int kVoiceGmmDim = 3;
-
-static const double
-    kVoiceGmmCovarInverse[kVoiceGmmNumMixtures][kVoiceGmmDim][kVoiceGmmDim] = {
-        {{1.83673825579513e+00, -8.09791637570095e-04, 4.60106414365986e-03},
-         {-8.09791637570095e-04, 8.89351738394608e-04, -9.80188953277734e-04},
-         {4.60106414365986e-03, -9.80188953277734e-04, 1.38706060206582e-03}},
-        {{6.76228912850703e+01, -1.98893120119660e-02, -3.53548357253551e-03},
-         {-1.98893120119660e-02, 3.96216858500530e-05, -4.08492938394097e-05},
-         {-3.53548357253551e-03, -4.08492938394097e-05, 9.31864352856416e-04}},
-        {{9.98612435944558e+00, -5.27880954316893e-03, -6.30342541619017e-03},
-         {-5.27880954316893e-03, 4.54359480225226e-05, 6.30804591626044e-05},
-         {-6.30342541619017e-03, 6.30804591626044e-05, 5.36466441382942e-04}},
-        {{3.39917474216349e+01, -1.56213579433191e-03, -4.01459014990225e-02},
-         {-1.56213579433191e-03, 6.40415424897724e-05, 6.20076342427833e-05},
-         {-4.01459014990225e-02, 6.20076342427833e-05, 3.51199070103063e-03}},
-        {{1.34545062271428e+01, -7.94513610147144e-03, -5.34401019341728e-02},
-         {-7.94513610147144e-03, 1.16511820098649e-04, 4.66063702069293e-05},
-         {-5.34401019341728e-02, 4.66063702069293e-05, 2.72354323774163e-03}},
-        {{1.08557844314806e+02, -1.54885805673668e-02, -1.88029692674851e-02},
-         {-1.54885805673668e-02, 1.16404042786406e-04, 6.45579292702802e-06},
-         {-1.88029692674851e-02, 6.45579292702802e-06, 4.32330478391416e-04}},
-        {{8.22940066541450e+01, -1.15903110231303e-02, -4.92166764865343e-02},
-         {-1.15903110231303e-02, 7.42510742165261e-05, 3.73007314191290e-06},
-         {-4.92166764865343e-02, 3.73007314191290e-06, 3.64005221593244e-03}},
-        {{2.31133605685660e+00, -7.83261568950254e-04, 7.45744012346313e-04},
-         {-7.83261568950254e-04, 1.29460648214142e-05, -2.22774455093730e-06},
-         {7.45744012346313e-04, -2.22774455093730e-06, 1.05117294093010e-04}},
-        {{3.78767849189611e+02, 1.57759761011568e-03, -2.08551217988774e-02},
-         {1.57759761011568e-03, 4.76066236886865e-05, -2.33977412299324e-05},
-         {-2.08551217988774e-02, -2.33977412299324e-05, 5.24261005371196e-04}},
-        {{6.98580096506135e-01, -5.13850255217378e-04, -4.01124551717056e-04},
-         {-5.13850255217378e-04, 1.40501021984840e-06, -2.09496928716569e-06},
-         {-4.01124551717056e-04, -2.09496928716569e-06, 2.82879357740037e-04}},
-        {{2.62770945162399e+00, -2.31825753241430e-03, -5.30447217466318e-03},
-         {-2.31825753241430e-03, 4.59108572227649e-05, 7.67631886355405e-05},
-         {-5.30447217466318e-03, 7.67631886355405e-05, 2.28521601674098e-03}},
-        {{1.89940391362152e+02, -4.23280856852379e-03, -2.70608873541399e-02},
-         {-4.23280856852379e-03, 6.77547582742563e-05, 2.69154203800467e-05},
-         {-2.70608873541399e-02, 2.69154203800467e-05, 3.88574543373470e-03}}};
-
-static const double kVoiceGmmMean[kVoiceGmmNumMixtures][kVoiceGmmDim] = {
-    {-2.15020241646536e+00, 4.97079062999877e+02, 4.77078119504505e+02},
-    {-8.92097680029190e-01, 5.92064964199921e+02, 1.81045145941059e+02},
-    {-1.29435784144398e+00, 4.98450293410611e+02, 1.71991263804064e+02},
-    {-1.03925228397884e+00, 4.99511274321571e+02, 1.05838336539105e+02},
-    {-1.29229047206129e+00, 4.15026762566707e+02, 1.12861119017125e+02},
-    {-7.88748114599810e-01, 4.48739336688113e+02, 1.89784216956337e+02},
-    {-8.77777402332642e-01, 4.86620285054533e+02, 1.13477708016491e+02},
-    {-2.06465957063057e+00, 6.33385049870607e+02, 2.32758546796149e+02},
-    {-6.98893789231685e-01, 5.93622051503385e+02, 1.92536982473203e+02},
-    {-2.55901217508894e+00, 1.55914919756205e+03, 1.39769980835570e+02},
-    {-1.92070024165837e+00, 4.87983940444185e+02, 1.02745468128289e+02},
-    {-7.29187507662854e-01, 5.22717685022855e+02, 1.16377942283991e+02}};
-
-static const double kVoiceGmmWeights[kVoiceGmmNumMixtures] = {
-    -1.39789694361035e+01, -1.19527720202104e+01, -1.32396317929055e+01,
-    -1.09436815209238e+01, -1.13440027478149e+01, -1.12200721834504e+01,
-    -1.02537324043693e+01, -1.60789861938302e+01, -1.03394494048344e+01,
-    -1.83207938586818e+01, -1.31186044948288e+01, -9.52479998673554e+00};
-#endif  // MODULES_AUDIO_PROCESSING_VAD_VOICE_GMM_TABLES_H_
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/voice_detection_impl.cc b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/voice_detection_impl.cc
deleted file mode 100644
index c55ca4aee8..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/voice_detection_impl.cc
+++ /dev/null
@@ -1,156 +0,0 @@
-/*
- *  Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#include "modules/audio_processing/voice_detection_impl.h"
-
-#include "api/audio/audio_frame.h"
-#include "common_audio/vad/include/webrtc_vad.h"
-#include "modules/audio_processing/audio_buffer.h"
-#include "rtc_base/checks.h"
-#include "rtc_base/constructormagic.h"
-
-namespace webrtc {
-class VoiceDetectionImpl::Vad {
- public:
-  Vad() {
-    state_ = WebRtcVad_Create();
-    RTC_CHECK(state_);
-    int error = WebRtcVad_Init(state_);
-    RTC_DCHECK_EQ(0, error);
-  }
-  ~Vad() { WebRtcVad_Free(state_); }
-  VadInst* state() { return state_; }
-
- private:
-  VadInst* state_ = nullptr;
-  RTC_DISALLOW_COPY_AND_ASSIGN(Vad);
-};
-
-VoiceDetectionImpl::VoiceDetectionImpl(rtc::CriticalSection* crit)
-    : crit_(crit) {
-  RTC_DCHECK(crit);
-}
-
-VoiceDetectionImpl::~VoiceDetectionImpl() {}
-
-void VoiceDetectionImpl::Initialize(int sample_rate_hz) {
-  rtc::CritScope cs(crit_);
-  sample_rate_hz_ = sample_rate_hz;
-  std::unique_ptr<Vad> new_vad;
-  if (enabled_) {
-    new_vad.reset(new Vad());
-  }
-  vad_.swap(new_vad);
-  using_external_vad_ = false;
-  frame_size_samples_ =
-      static_cast<size_t>(frame_size_ms_ * sample_rate_hz_) / 1000;
-  set_likelihood(likelihood_);
-}
-
-void VoiceDetectionImpl::ProcessCaptureAudio(AudioBuffer* audio) {
-  rtc::CritScope cs(crit_);
-  if (!enabled_) {
-    return;
-  }
-  if (using_external_vad_) {
-    using_external_vad_ = false;
-    return;
-  }
-
-  RTC_DCHECK_GE(160, audio->num_frames_per_band());
-  // TODO(ajm): concatenate data in frame buffer here.
-  int vad_ret =
-      WebRtcVad_Process(vad_->state(), sample_rate_hz_,
-                        audio->mixed_low_pass_data(), frame_size_samples_);
-  if (vad_ret == 0) {
-    stream_has_voice_ = false;
-    audio->set_activity(AudioFrame::kVadPassive);
-  } else if (vad_ret == 1) {
-    stream_has_voice_ = true;
-    audio->set_activity(AudioFrame::kVadActive);
-  } else {
-    RTC_NOTREACHED();
-  }
-}
-
-int VoiceDetectionImpl::Enable(bool enable) {
-  rtc::CritScope cs(crit_);
-  if (enabled_ != enable) {
-    enabled_ = enable;
-    Initialize(sample_rate_hz_);
-  }
-  return AudioProcessing::kNoError;
-}
-
-bool VoiceDetectionImpl::is_enabled() const {
-  rtc::CritScope cs(crit_);
-  return enabled_;
-}
-
-int VoiceDetectionImpl::set_stream_has_voice(bool has_voice) {
-  rtc::CritScope cs(crit_);
-  using_external_vad_ = true;
-  stream_has_voice_ = has_voice;
-  return AudioProcessing::kNoError;
-}
-
-bool VoiceDetectionImpl::stream_has_voice() const {
-  rtc::CritScope cs(crit_);
-  // TODO(ajm): enable this assertion?
-  // RTC_DCHECK(using_external_vad_ || is_component_enabled());
-  return stream_has_voice_;
-}
-
-int VoiceDetectionImpl::set_likelihood(VoiceDetection::Likelihood likelihood) {
-  rtc::CritScope cs(crit_);
-  likelihood_ = likelihood;
-  if (enabled_) {
-    int mode = 2;
-    switch (likelihood) {
-      case VoiceDetection::kVeryLowLikelihood:
-        mode = 3;
-        break;
-      case VoiceDetection::kLowLikelihood:
-        mode = 2;
-        break;
-      case VoiceDetection::kModerateLikelihood:
-        mode = 1;
-        break;
-      case VoiceDetection::kHighLikelihood:
-        mode = 0;
-        break;
-      default:
-        RTC_NOTREACHED();
-        break;
-    }
-    int error = WebRtcVad_set_mode(vad_->state(), mode);
-    RTC_DCHECK_EQ(0, error);
-  }
-  return AudioProcessing::kNoError;
-}
-
-VoiceDetection::Likelihood VoiceDetectionImpl::likelihood() const {
-  rtc::CritScope cs(crit_);
-  return likelihood_;
-}
-
-int VoiceDetectionImpl::set_frame_size_ms(int size) {
-  rtc::CritScope cs(crit_);
-  RTC_DCHECK_EQ(10, size);  // TODO(ajm): remove when supported.
-  frame_size_ms_ = size;
-  Initialize(sample_rate_hz_);
-  return AudioProcessing::kNoError;
-}
-
-int VoiceDetectionImpl::frame_size_ms() const {
-  rtc::CritScope cs(crit_);
-  return frame_size_ms_;
-}
-}  // namespace webrtc
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/voice_detection_impl.h b/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/voice_detection_impl.h
deleted file mode 100644
index c438473679..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/audio_processing/voice_detection_impl.h
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- *  Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#ifndef MODULES_AUDIO_PROCESSING_VOICE_DETECTION_IMPL_H_
-#define MODULES_AUDIO_PROCESSING_VOICE_DETECTION_IMPL_H_
-
-#include <stddef.h>
-#include <memory>
-
-#include "modules/audio_processing/include/audio_processing.h"
-#include "rtc_base/constructormagic.h"
-#include "rtc_base/criticalsection.h"
-#include "rtc_base/thread_annotations.h"
-
-namespace webrtc {
-
-class AudioBuffer;
-
-class VoiceDetectionImpl : public VoiceDetection {
- public:
-  explicit VoiceDetectionImpl(rtc::CriticalSection* crit);
-  ~VoiceDetectionImpl() override;
-
-  // TODO(peah): Fold into ctor, once public API is removed.
-  void Initialize(int sample_rate_hz);
-  void ProcessCaptureAudio(AudioBuffer* audio);
-
-  // VoiceDetection implementation.
-  int Enable(bool enable) override;
-  bool is_enabled() const override;
-  int set_stream_has_voice(bool has_voice) override;
-  bool stream_has_voice() const override;
-  int set_likelihood(Likelihood likelihood) override;
-  Likelihood likelihood() const override;
-  int set_frame_size_ms(int size) override;
-  int frame_size_ms() const override;
-
- private:
-  class Vad;
-
-  rtc::CriticalSection* const crit_;
-  bool enabled_ RTC_GUARDED_BY(crit_) = false;
-  bool stream_has_voice_ RTC_GUARDED_BY(crit_) = false;
-  bool using_external_vad_ RTC_GUARDED_BY(crit_) = false;
-  Likelihood likelihood_ RTC_GUARDED_BY(crit_) = kLowLikelihood;
-  int frame_size_ms_ RTC_GUARDED_BY(crit_) = 10;
-  size_t frame_size_samples_ RTC_GUARDED_BY(crit_) = 0;
-  int sample_rate_hz_ RTC_GUARDED_BY(crit_) = 0;
-  std::unique_ptr<Vad> vad_ RTC_GUARDED_BY(crit_);
-  RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(VoiceDetectionImpl);
-};
-}  // namespace webrtc
-
-#endif  // MODULES_AUDIO_PROCESSING_VOICE_DETECTION_IMPL_H_
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/third_party/fft/fft.c b/submodules/libtgvoip/webrtc_dsp/modules/third_party/fft/fft.c
deleted file mode 100644
index 72604626d9..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/third_party/fft/fft.c
+++ /dev/null
@@ -1,942 +0,0 @@
-/*
- * Copyright(c)1995,97 Mark Olesen <olesen@me.QueensU.CA>
- *    Queen's Univ at Kingston (Canada)
- *
- * Permission to use, copy, modify, and distribute this software for
- * any purpose without fee is hereby granted, provided that this
- * entire notice is included in all copies of any software which is
- * or includes a copy or modification of this software and in all
- * copies of the supporting documentation for such software.
- *
- * THIS SOFTWARE IS BEING PROVIDED "AS IS", WITHOUT ANY EXPRESS OR
- * IMPLIED WARRANTY.  IN PARTICULAR, NEITHER THE AUTHOR NOR QUEEN'S
- * UNIVERSITY AT KINGSTON MAKES ANY REPRESENTATION OR WARRANTY OF ANY
- * KIND CONCERNING THE MERCHANTABILITY OF THIS SOFTWARE OR ITS
- * FITNESS FOR ANY PARTICULAR PURPOSE.
- *
- * All of which is to say that you can do what you like with this
- * source code provided you don't try to sell it as your own and you
- * include an unaltered copy of this message (including the
- * copyright).
- *
- * It is also implicitly understood that bug fixes and improvements
- * should make their way back to the general Internet community so
- * that everyone benefits.
- *
- * Changes:
- *   Trivial type modifications by the WebRTC authors.
- */
-
-
-/*
- * File:
- * WebRtcIsac_Fftn.c
- *
- * Public:
- * WebRtcIsac_Fftn / fftnf ();
- *
- * Private:
- * WebRtcIsac_Fftradix / fftradixf ();
- *
- * Descript:
- * multivariate complex Fourier transform, computed in place
- * using mixed-radix Fast Fourier Transform algorithm.
- *
- * Fortran code by:
- * RC Singleton, Stanford Research Institute, Sept. 1968
- *
- * translated by f2c (version 19950721).
- *
- * int WebRtcIsac_Fftn (int ndim, const int dims[], REAL Re[], REAL Im[],
- *     int iSign, double scaling);
- *
- * NDIM = the total number dimensions
- * DIMS = a vector of array sizes
- * if NDIM is zero then DIMS must be zero-terminated
- *
- * RE and IM hold the real and imaginary components of the data, and return
- * the resulting real and imaginary Fourier coefficients.  Multidimensional
- * data *must* be allocated contiguously.  There is no limit on the number
- * of dimensions.
- *
- * ISIGN = the sign of the complex exponential (ie, forward or inverse FFT)
- * the magnitude of ISIGN (normally 1) is used to determine the
- * correct indexing increment (see below).
- *
- * SCALING = normalizing constant by which the final result is *divided*
- * if SCALING == -1, normalize by total dimension of the transform
- * if SCALING <  -1, normalize by the square-root of the total dimension
- *
- * example:
- * tri-variate transform with Re[n1][n2][n3], Im[n1][n2][n3]
- *
- * int dims[3] = {n1,n2,n3}
- * WebRtcIsac_Fftn (3, dims, Re, Im, 1, scaling);
- *
- *-----------------------------------------------------------------------*
- * int WebRtcIsac_Fftradix (REAL Re[], REAL Im[], size_t nTotal, size_t nPass,
- *   size_t nSpan, int iSign, size_t max_factors,
- *   size_t max_perm);
- *
- * RE, IM - see above documentation
- *
- * Although there is no limit on the number of dimensions, WebRtcIsac_Fftradix() must
- * be called once for each dimension, but the calls may be in any order.
- *
- * NTOTAL = the total number of complex data values
- * NPASS  = the dimension of the current variable
- * NSPAN/NPASS = the spacing of consecutive data values while indexing the
- * current variable
- * ISIGN - see above documentation
- *
- * example:
- * tri-variate transform with Re[n1][n2][n3], Im[n1][n2][n3]
- *
- * WebRtcIsac_Fftradix (Re, Im, n1*n2*n3, n1,       n1, 1, maxf, maxp);
- * WebRtcIsac_Fftradix (Re, Im, n1*n2*n3, n2,    n1*n2, 1, maxf, maxp);
- * WebRtcIsac_Fftradix (Re, Im, n1*n2*n3, n3, n1*n2*n3, 1, maxf, maxp);
- *
- * single-variate transform,
- *    NTOTAL = N = NSPAN = (number of complex data values),
- *
- * WebRtcIsac_Fftradix (Re, Im, n, n, n, 1, maxf, maxp);
- *
- * The data can also be stored in a single array with alternating real and
- * imaginary parts, the magnitude of ISIGN is changed to 2 to give correct
- * indexing increment, and data [0] and data [1] used to pass the initial
- * addresses for the sequences of real and imaginary values,
- *
- * example:
- * REAL data [2*NTOTAL];
- * WebRtcIsac_Fftradix ( &data[0], &data[1], NTOTAL, nPass, nSpan, 2, maxf, maxp);
- *
- * for temporary allocation:
- *
- * MAX_FACTORS >= the maximum prime factor of NPASS
- * MAX_PERM >= the number of prime factors of NPASS.  In addition,
- * if the square-free portion K of NPASS has two or more prime
- * factors, then MAX_PERM >= (K-1)
- *
- * storage in FACTOR for a maximum of 15 prime factors of NPASS. if NPASS
- * has more than one square-free factor, the product of the square-free
- * factors must be <= 210 array storage for maximum prime factor of 23 the
- * following two constants should agree with the array dimensions.
- *
- *----------------------------------------------------------------------*/
-
-#include <stdlib.h>
-#include <math.h>
-
-#include "modules/third_party/fft/fft.h"
-
-/* double precision routine */
-static int
-WebRtcIsac_Fftradix (double Re[], double Im[],
-                    size_t nTotal, size_t nPass, size_t nSpan, int isign,
-                    int max_factors, unsigned int max_perm,
-                    FFTstr *fftstate);
-
-
-
-#ifndef M_PI
-# define M_PI 3.14159265358979323846264338327950288
-#endif
-
-#ifndef SIN60
-# define SIN60 0.86602540378443865 /* sin(60 deg) */
-# define COS72 0.30901699437494742 /* cos(72 deg) */
-# define SIN72 0.95105651629515357 /* sin(72 deg) */
-#endif
-
-# define REAL  double
-# define FFTN  WebRtcIsac_Fftn
-# define FFTNS  "fftn"
-# define FFTRADIX WebRtcIsac_Fftradix
-# define FFTRADIXS "fftradix"
-
-
-int  WebRtcIsac_Fftns(unsigned int ndim, const int dims[],
-                     double Re[],
-                     double Im[],
-                     int iSign,
-                     double scaling,
-                     FFTstr *fftstate)
-{
-
-  size_t nSpan, nPass, nTotal;
-  unsigned int i;
-  int ret, max_factors, max_perm;
-
-  /*
-   * tally the number of elements in the data array
-   * and determine the number of dimensions
-   */
-  nTotal = 1;
-  if (ndim && dims [0])
-  {
-    for (i = 0; i < ndim; i++)
-    {
-      if (dims [i] <= 0)
-      {
-        return -1;
-      }
-      nTotal *= dims [i];
-    }
-  }
-  else
-  {
-    ndim = 0;
-    for (i = 0; dims [i]; i++)
-    {
-      if (dims [i] <= 0)
-      {
-        return -1;
-      }
-      nTotal *= dims [i];
-      ndim++;
-    }
-  }
-
-  /* determine maximum number of factors and permuations */
-#if 1
-  /*
-   * follow John Beale's example, just use the largest dimension and don't
-   * worry about excess allocation.  May be someone else will do it?
-   */
-  max_factors = max_perm = 1;
-  for (i = 0; i < ndim; i++)
-  {
-    nSpan = dims [i];
-    if ((int)nSpan > max_factors)
-    {
-      max_factors = (int)nSpan;
-    }
-    if ((int)nSpan > max_perm)
-    {
-      max_perm = (int)nSpan;
-    }
-  }
-#else
-  /* use the constants used in the original Fortran code */
-  max_factors = 23;
-  max_perm = 209;
-#endif
-  /* loop over the dimensions: */
-  nPass = 1;
-  for (i = 0; i < ndim; i++)
-  {
-    nSpan = dims [i];
-    nPass *= nSpan;
-    ret = FFTRADIX (Re, Im, nTotal, nSpan, nPass, iSign,
-                    max_factors, max_perm, fftstate);
-    /* exit, clean-up already done */
-    if (ret)
-      return ret;
-  }
-
-  /* Divide through by the normalizing constant: */
-  if (scaling && scaling != 1.0)
-  {
-    if (iSign < 0) iSign = -iSign;
-    if (scaling < 0.0)
-    {
-      scaling = (double)nTotal;
-      if (scaling < -1.0)
-        scaling = sqrt (scaling);
-    }
-    scaling = 1.0 / scaling; /* multiply is often faster */
-    for (i = 0; i < nTotal; i += iSign)
-    {
-      Re [i] *= scaling;
-      Im [i] *= scaling;
-    }
-  }
-  return 0;
-}
-
-/*
- * singleton's mixed radix routine
- *
- * could move allocation out to WebRtcIsac_Fftn(), but leave it here so that it's
- * possible to make this a standalone function
- */
-
-static int   FFTRADIX (REAL Re[],
-                       REAL Im[],
-                       size_t nTotal,
-                       size_t nPass,
-                       size_t nSpan,
-                       int iSign,
-                       int max_factors,
-                       unsigned int max_perm,
-                       FFTstr *fftstate)
-{
-  int ii, mfactor, kspan, ispan, inc;
-  int j, jc, jf, jj, k, k1, k2, k3, k4, kk, kt, nn, ns, nt;
-
-
-  REAL radf;
-  REAL c1, c2, c3, cd, aa, aj, ak, ajm, ajp, akm, akp;
-  REAL s1, s2, s3, sd, bb, bj, bk, bjm, bjp, bkm, bkp;
-
-  REAL *Rtmp = NULL; /* temp space for real part*/
-  REAL *Itmp = NULL; /* temp space for imaginary part */
-  REAL *Cos = NULL; /* Cosine values */
-  REAL *Sin = NULL; /* Sine values */
-
-  REAL s60 = SIN60;  /* sin(60 deg) */
-  REAL c72 = COS72;  /* cos(72 deg) */
-  REAL s72 = SIN72;  /* sin(72 deg) */
-  REAL pi2 = M_PI;  /* use PI first, 2 PI later */
-
-
-  fftstate->SpaceAlloced = 0;
-  fftstate->MaxPermAlloced = 0;
-
-
-  // initialize to avoid warnings
-  k3 = c2 = c3 = s2 = s3 = 0.0;
-
-  if (nPass < 2)
-    return 0;
-
-  /*  allocate storage */
-  if (fftstate->SpaceAlloced < max_factors * sizeof (REAL))
-  {
-#ifdef SUN_BROKEN_REALLOC
-    if (!fftstate->SpaceAlloced) /* first time */
-    {
-      fftstate->SpaceAlloced = max_factors * sizeof (REAL);
-    }
-    else
-    {
-#endif
-      fftstate->SpaceAlloced = max_factors * sizeof (REAL);
-#ifdef SUN_BROKEN_REALLOC
-    }
-#endif
-  }
-  else
-  {
-    /* allow full use of alloc'd space */
-    max_factors = fftstate->SpaceAlloced / sizeof (REAL);
-  }
-  if (fftstate->MaxPermAlloced < max_perm)
-  {
-#ifdef SUN_BROKEN_REALLOC
-    if (!fftstate->MaxPermAlloced) /* first time */
-    else
-#endif
-      fftstate->MaxPermAlloced = max_perm;
-  }
-  else
-  {
-    /* allow full use of alloc'd space */
-    max_perm = fftstate->MaxPermAlloced;
-  }
-
-  /* assign pointers */
-  Rtmp = (REAL *) fftstate->Tmp0;
-  Itmp = (REAL *) fftstate->Tmp1;
-  Cos  = (REAL *) fftstate->Tmp2;
-  Sin  = (REAL *) fftstate->Tmp3;
-
-  /*
-   * Function Body
-   */
-  inc = iSign;
-  if (iSign < 0) {
-    s72 = -s72;
-    s60 = -s60;
-    pi2 = -pi2;
-    inc = -inc;  /* absolute value */
-  }
-
-  /* adjust for strange increments */
-  nt = inc * (int)nTotal;
-  ns = inc * (int)nSpan;
-  kspan = ns;
-
-  nn = nt - inc;
-  jc = ns / (int)nPass;
-  radf = pi2 * (double) jc;
-  pi2 *= 2.0;   /* use 2 PI from here on */
-
-  ii = 0;
-  jf = 0;
-  /*  determine the factors of n */
-  mfactor = 0;
-  k = (int)nPass;
-  while (k % 16 == 0) {
-    mfactor++;
-    fftstate->factor [mfactor - 1] = 4;
-    k /= 16;
-  }
-  j = 3;
-  jj = 9;
-  do {
-    while (k % jj == 0) {
-      mfactor++;
-      fftstate->factor [mfactor - 1] = j;
-      k /= jj;
-    }
-    j += 2;
-    jj = j * j;
-  } while (jj <= k);
-  if (k <= 4) {
-    kt = mfactor;
-    fftstate->factor [mfactor] = k;
-    if (k != 1)
-      mfactor++;
-  } else {
-    if (k - (k / 4 << 2) == 0) {
-      mfactor++;
-      fftstate->factor [mfactor - 1] = 2;
-      k /= 4;
-    }
-    kt = mfactor;
-    j = 2;
-    do {
-      if (k % j == 0) {
-        mfactor++;
-        fftstate->factor [mfactor - 1] = j;
-        k /= j;
-      }
-      j = ((j + 1) / 2 << 1) + 1;
-    } while (j <= k);
-  }
-  if (kt) {
-    j = kt;
-    do {
-      mfactor++;
-      fftstate->factor [mfactor - 1] = fftstate->factor [j - 1];
-      j--;
-    } while (j);
-  }
-
-  /* test that mfactors is in range */
-  if (mfactor > FFT_NFACTOR)
-  {
-    return -1;
-  }
-
-  /* compute fourier transform */
-  for (;;) {
-    sd = radf / (double) kspan;
-    cd = sin(sd);
-    cd = 2.0 * cd * cd;
-    sd = sin(sd + sd);
-    kk = 0;
-    ii++;
-
-    switch (fftstate->factor [ii - 1]) {
-      case 2:
-        /* transform for factor of 2 (including rotation factor) */
-        kspan /= 2;
-        k1 = kspan + 2;
-        do {
-          do {
-            k2 = kk + kspan;
-            ak = Re [k2];
-            bk = Im [k2];
-            Re [k2] = Re [kk] - ak;
-            Im [k2] = Im [kk] - bk;
-            Re [kk] += ak;
-            Im [kk] += bk;
-            kk = k2 + kspan;
-          } while (kk < nn);
-          kk -= nn;
-        } while (kk < jc);
-        if (kk >= kspan)
-          goto Permute_Results_Label;  /* exit infinite loop */
-        do {
-          c1 = 1.0 - cd;
-          s1 = sd;
-          do {
-            do {
-              do {
-                k2 = kk + kspan;
-                ak = Re [kk] - Re [k2];
-                bk = Im [kk] - Im [k2];
-                Re [kk] += Re [k2];
-                Im [kk] += Im [k2];
-                Re [k2] = c1 * ak - s1 * bk;
-                Im [k2] = s1 * ak + c1 * bk;
-                kk = k2 + kspan;
-              } while (kk < (nt-1));
-              k2 = kk - nt;
-              c1 = -c1;
-              kk = k1 - k2;
-            } while (kk > k2);
-            ak = c1 - (cd * c1 + sd * s1);
-            s1 = sd * c1 - cd * s1 + s1;
-            c1 = 2.0 - (ak * ak + s1 * s1);
-            s1 *= c1;
-            c1 *= ak;
-            kk += jc;
-          } while (kk < k2);
-          k1 += inc + inc;
-          kk = (k1 - kspan + 1) / 2 + jc - 1;
-        } while (kk < (jc + jc));
-        break;
-
-      case 4:   /* transform for factor of 4 */
-        ispan = kspan;
-        kspan /= 4;
-
-        do {
-          c1 = 1.0;
-          s1 = 0.0;
-          do {
-            do {
-              k1 = kk + kspan;
-              k2 = k1 + kspan;
-              k3 = k2 + kspan;
-              akp = Re [kk] + Re [k2];
-              akm = Re [kk] - Re [k2];
-              ajp = Re [k1] + Re [k3];
-              ajm = Re [k1] - Re [k3];
-              bkp = Im [kk] + Im [k2];
-              bkm = Im [kk] - Im [k2];
-              bjp = Im [k1] + Im [k3];
-              bjm = Im [k1] - Im [k3];
-              Re [kk] = akp + ajp;
-              Im [kk] = bkp + bjp;
-              ajp = akp - ajp;
-              bjp = bkp - bjp;
-              if (iSign < 0) {
-                akp = akm + bjm;
-                bkp = bkm - ajm;
-                akm -= bjm;
-                bkm += ajm;
-              } else {
-                akp = akm - bjm;
-                bkp = bkm + ajm;
-                akm += bjm;
-                bkm -= ajm;
-              }
-              /* avoid useless multiplies */
-              if (s1 == 0.0) {
-                Re [k1] = akp;
-                Re [k2] = ajp;
-                Re [k3] = akm;
-                Im [k1] = bkp;
-                Im [k2] = bjp;
-                Im [k3] = bkm;
-              } else {
-                Re [k1] = akp * c1 - bkp * s1;
-                Re [k2] = ajp * c2 - bjp * s2;
-                Re [k3] = akm * c3 - bkm * s3;
-                Im [k1] = akp * s1 + bkp * c1;
-                Im [k2] = ajp * s2 + bjp * c2;
-                Im [k3] = akm * s3 + bkm * c3;
-              }
-              kk = k3 + kspan;
-            } while (kk < nt);
-
-            c2 = c1 - (cd * c1 + sd * s1);
-            s1 = sd * c1 - cd * s1 + s1;
-            c1 = 2.0 - (c2 * c2 + s1 * s1);
-            s1 *= c1;
-            c1 *= c2;
-            /* values of c2, c3, s2, s3 that will get used next time */
-            c2 = c1 * c1 - s1 * s1;
-            s2 = 2.0 * c1 * s1;
-            c3 = c2 * c1 - s2 * s1;
-            s3 = c2 * s1 + s2 * c1;
-            kk = kk - nt + jc;
-          } while (kk < kspan);
-          kk = kk - kspan + inc;
-        } while (kk < jc);
-        if (kspan == jc)
-          goto Permute_Results_Label;  /* exit infinite loop */
-        break;
-
-      default:
-        /*  transform for odd factors */
-#ifdef FFT_RADIX4
-        return -1;
-        break;
-#else /* FFT_RADIX4 */
-        k = fftstate->factor [ii - 1];
-        ispan = kspan;
-        kspan /= k;
-
-        switch (k) {
-          case 3: /* transform for factor of 3 (optional code) */
-            do {
-              do {
-                k1 = kk + kspan;
-                k2 = k1 + kspan;
-                ak = Re [kk];
-                bk = Im [kk];
-                aj = Re [k1] + Re [k2];
-                bj = Im [k1] + Im [k2];
-                Re [kk] = ak + aj;
-                Im [kk] = bk + bj;
-                ak -= 0.5 * aj;
-                bk -= 0.5 * bj;
-                aj = (Re [k1] - Re [k2]) * s60;
-                bj = (Im [k1] - Im [k2]) * s60;
-                Re [k1] = ak - bj;
-                Re [k2] = ak + bj;
-                Im [k1] = bk + aj;
-                Im [k2] = bk - aj;
-                kk = k2 + kspan;
-              } while (kk < (nn - 1));
-              kk -= nn;
-            } while (kk < kspan);
-            break;
-
-          case 5: /*  transform for factor of 5 (optional code) */
-            c2 = c72 * c72 - s72 * s72;
-            s2 = 2.0 * c72 * s72;
-            do {
-              do {
-                k1 = kk + kspan;
-                k2 = k1 + kspan;
-                k3 = k2 + kspan;
-                k4 = k3 + kspan;
-                akp = Re [k1] + Re [k4];
-                akm = Re [k1] - Re [k4];
-                bkp = Im [k1] + Im [k4];
-                bkm = Im [k1] - Im [k4];
-                ajp = Re [k2] + Re [k3];
-                ajm = Re [k2] - Re [k3];
-                bjp = Im [k2] + Im [k3];
-                bjm = Im [k2] - Im [k3];
-                aa = Re [kk];
-                bb = Im [kk];
-                Re [kk] = aa + akp + ajp;
-                Im [kk] = bb + bkp + bjp;
-                ak = akp * c72 + ajp * c2 + aa;
-                bk = bkp * c72 + bjp * c2 + bb;
-                aj = akm * s72 + ajm * s2;
-                bj = bkm * s72 + bjm * s2;
-                Re [k1] = ak - bj;
-                Re [k4] = ak + bj;
-                Im [k1] = bk + aj;
-                Im [k4] = bk - aj;
-                ak = akp * c2 + ajp * c72 + aa;
-                bk = bkp * c2 + bjp * c72 + bb;
-                aj = akm * s2 - ajm * s72;
-                bj = bkm * s2 - bjm * s72;
-                Re [k2] = ak - bj;
-                Re [k3] = ak + bj;
-                Im [k2] = bk + aj;
-                Im [k3] = bk - aj;
-                kk = k4 + kspan;
-              } while (kk < (nn-1));
-              kk -= nn;
-            } while (kk < kspan);
-            break;
-
-          default:
-            if (k != jf) {
-              jf = k;
-              s1 = pi2 / (double) k;
-              c1 = cos(s1);
-              s1 = sin(s1);
-              if (jf > max_factors){
-                return -1;
-              }
-              Cos [jf - 1] = 1.0;
-              Sin [jf - 1] = 0.0;
-              j = 1;
-              do {
-                Cos [j - 1] = Cos [k - 1] * c1 + Sin [k - 1] * s1;
-                Sin [j - 1] = Cos [k - 1] * s1 - Sin [k - 1] * c1;
-                k--;
-                Cos [k - 1] = Cos [j - 1];
-                Sin [k - 1] = -Sin [j - 1];
-                j++;
-              } while (j < k);
-            }
-            do {
-              do {
-                k1 = kk;
-                k2 = kk + ispan;
-                ak = aa = Re [kk];
-                bk = bb = Im [kk];
-                j = 1;
-                k1 += kspan;
-                do {
-                  k2 -= kspan;
-                  j++;
-                  Rtmp [j - 1] = Re [k1] + Re [k2];
-                  ak += Rtmp [j - 1];
-                  Itmp [j - 1] = Im [k1] + Im [k2];
-                  bk += Itmp [j - 1];
-                  j++;
-                  Rtmp [j - 1] = Re [k1] - Re [k2];
-                  Itmp [j - 1] = Im [k1] - Im [k2];
-                  k1 += kspan;
-                } while (k1 < k2);
-                Re [kk] = ak;
-                Im [kk] = bk;
-                k1 = kk;
-                k2 = kk + ispan;
-                j = 1;
-                do {
-                  k1 += kspan;
-                  k2 -= kspan;
-                  jj = j;
-                  ak = aa;
-                  bk = bb;
-                  aj = 0.0;
-                  bj = 0.0;
-                  k = 1;
-                  do {
-                    k++;
-                    ak += Rtmp [k - 1] * Cos [jj - 1];
-                    bk += Itmp [k - 1] * Cos [jj - 1];
-                    k++;
-                    aj += Rtmp [k - 1] * Sin [jj - 1];
-                    bj += Itmp [k - 1] * Sin [jj - 1];
-                    jj += j;
-                    if (jj > jf) {
-                      jj -= jf;
-                    }
-                  } while (k < jf);
-                  k = jf - j;
-                  Re [k1] = ak - bj;
-                  Im [k1] = bk + aj;
-                  Re [k2] = ak + bj;
-                  Im [k2] = bk - aj;
-                  j++;
-                } while (j < k);
-                kk += ispan;
-              } while (kk < nn);
-              kk -= nn;
-            } while (kk < kspan);
-            break;
-        }
-
-        /*  multiply by rotation factor (except for factors of 2 and 4) */
-        if (ii == mfactor)
-          goto Permute_Results_Label;  /* exit infinite loop */
-        kk = jc;
-        do {
-          c2 = 1.0 - cd;
-          s1 = sd;
-          do {
-            c1 = c2;
-            s2 = s1;
-            kk += kspan;
-            do {
-              do {
-                ak = Re [kk];
-                Re [kk] = c2 * ak - s2 * Im [kk];
-                Im [kk] = s2 * ak + c2 * Im [kk];
-                kk += ispan;
-              } while (kk < nt);
-              ak = s1 * s2;
-              s2 = s1 * c2 + c1 * s2;
-              c2 = c1 * c2 - ak;
-              kk = kk - nt + kspan;
-            } while (kk < ispan);
-            c2 = c1 - (cd * c1 + sd * s1);
-            s1 += sd * c1 - cd * s1;
-            c1 = 2.0 - (c2 * c2 + s1 * s1);
-            s1 *= c1;
-            c2 *= c1;
-            kk = kk - ispan + jc;
-          } while (kk < kspan);
-          kk = kk - kspan + jc + inc;
-        } while (kk < (jc + jc));
-        break;
-#endif /* FFT_RADIX4 */
-    }
-  }
-
-  /*  permute the results to normal order---done in two stages */
-  /*  permutation for square factors of n */
-Permute_Results_Label:
-  fftstate->Perm [0] = ns;
-  if (kt) {
-    k = kt + kt + 1;
-    if (mfactor < k)
-      k--;
-    j = 1;
-    fftstate->Perm [k] = jc;
-    do {
-      fftstate->Perm [j] = fftstate->Perm [j - 1] / fftstate->factor [j - 1];
-      fftstate->Perm [k - 1] = fftstate->Perm [k] * fftstate->factor [j - 1];
-      j++;
-      k--;
-    } while (j < k);
-    k3 = fftstate->Perm [k];
-    kspan = fftstate->Perm [1];
-    kk = jc;
-    k2 = kspan;
-    j = 1;
-    if (nPass != nTotal) {
-      /*  permutation for multivariate transform */
-   Permute_Multi_Label:
-      do {
-        do {
-          k = kk + jc;
-          do {
-            /* swap Re [kk] <> Re [k2], Im [kk] <> Im [k2] */
-            ak = Re [kk]; Re [kk] = Re [k2]; Re [k2] = ak;
-            bk = Im [kk]; Im [kk] = Im [k2]; Im [k2] = bk;
-            kk += inc;
-            k2 += inc;
-          } while (kk < (k-1));
-          kk += ns - jc;
-          k2 += ns - jc;
-        } while (kk < (nt-1));
-        k2 = k2 - nt + kspan;
-        kk = kk - nt + jc;
-      } while (k2 < (ns-1));
-      do {
-        do {
-          k2 -= fftstate->Perm [j - 1];
-          j++;
-          k2 = fftstate->Perm [j] + k2;
-        } while (k2 > fftstate->Perm [j - 1]);
-        j = 1;
-        do {
-          if (kk < (k2-1))
-            goto Permute_Multi_Label;
-          kk += jc;
-          k2 += kspan;
-        } while (k2 < (ns-1));
-      } while (kk < (ns-1));
-    } else {
-      /*  permutation for single-variate transform (optional code) */
-   Permute_Single_Label:
-      do {
-        /* swap Re [kk] <> Re [k2], Im [kk] <> Im [k2] */
-        ak = Re [kk]; Re [kk] = Re [k2]; Re [k2] = ak;
-        bk = Im [kk]; Im [kk] = Im [k2]; Im [k2] = bk;
-        kk += inc;
-        k2 += kspan;
-      } while (k2 < (ns-1));
-      do {
-        do {
-          k2 -= fftstate->Perm [j - 1];
-          j++;
-          k2 = fftstate->Perm [j] + k2;
-        } while (k2 >= fftstate->Perm [j - 1]);
-        j = 1;
-        do {
-          if (kk < k2)
-            goto Permute_Single_Label;
-          kk += inc;
-          k2 += kspan;
-        } while (k2 < (ns-1));
-      } while (kk < (ns-1));
-    }
-    jc = k3;
-  }
-
-  if ((kt << 1) + 1 >= mfactor)
-    return 0;
-  ispan = fftstate->Perm [kt];
-  /* permutation for square-free factors of n */
-  j = mfactor - kt;
-  fftstate->factor [j] = 1;
-  do {
-    fftstate->factor [j - 1] *= fftstate->factor [j];
-    j--;
-  } while (j != kt);
-  kt++;
-  nn = fftstate->factor [kt - 1] - 1;
-  if (nn > (int) max_perm) {
-    return -1;
-  }
-  j = jj = 0;
-  for (;;) {
-    k = kt + 1;
-    k2 = fftstate->factor [kt - 1];
-    kk = fftstate->factor [k - 1];
-    j++;
-    if (j > nn)
-      break;    /* exit infinite loop */
-    jj += kk;
-    while (jj >= k2) {
-      jj -= k2;
-      k2 = kk;
-      k++;
-      kk = fftstate->factor [k - 1];
-      jj += kk;
-    }
-    fftstate->Perm [j - 1] = jj;
-  }
-  /*  determine the permutation cycles of length greater than 1 */
-  j = 0;
-  for (;;) {
-    do {
-      j++;
-      kk = fftstate->Perm [j - 1];
-    } while (kk < 0);
-    if (kk != j) {
-      do {
-        k = kk;
-        kk = fftstate->Perm [k - 1];
-        fftstate->Perm [k - 1] = -kk;
-      } while (kk != j);
-      k3 = kk;
-    } else {
-      fftstate->Perm [j - 1] = -j;
-      if (j == nn)
-        break;  /* exit infinite loop */
-    }
-  }
-  max_factors *= inc;
-  /*  reorder a and b, following the permutation cycles */
-  for (;;) {
-    j = k3 + 1;
-    nt -= ispan;
-    ii = nt - inc + 1;
-    if (nt < 0)
-      break;   /* exit infinite loop */
-    do {
-      do {
-        j--;
-      } while (fftstate->Perm [j - 1] < 0);
-      jj = jc;
-      do {
-        kspan = jj;
-        if (jj > max_factors) {
-          kspan = max_factors;
-        }
-        jj -= kspan;
-        k = fftstate->Perm [j - 1];
-        kk = jc * k + ii + jj;
-        k1 = kk + kspan - 1;
-        k2 = 0;
-        do {
-          k2++;
-          Rtmp [k2 - 1] = Re [k1];
-          Itmp [k2 - 1] = Im [k1];
-          k1 -= inc;
-        } while (k1 != (kk-1));
-        do {
-          k1 = kk + kspan - 1;
-          k2 = k1 - jc * (k + fftstate->Perm [k - 1]);
-          k = -fftstate->Perm [k - 1];
-          do {
-            Re [k1] = Re [k2];
-            Im [k1] = Im [k2];
-            k1 -= inc;
-            k2 -= inc;
-          } while (k1 != (kk-1));
-          kk = k2 + 1;
-        } while (k != j);
-        k1 = kk + kspan - 1;
-        k2 = 0;
-        do {
-          k2++;
-          Re [k1] = Rtmp [k2 - 1];
-          Im [k1] = Itmp [k2 - 1];
-          k1 -= inc;
-        } while (k1 != (kk-1));
-      } while (jj);
-    } while (j != 1);
-  }
-  return 0;   /* exit point here */
-}
-/* ---------------------- end-of-file (c source) ---------------------- */
-
diff --git a/submodules/libtgvoip/webrtc_dsp/modules/third_party/fft/fft.h b/submodules/libtgvoip/webrtc_dsp/modules/third_party/fft/fft.h
deleted file mode 100644
index f8f8b6f17b..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/modules/third_party/fft/fft.h
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- *  Copyright (c) 2011 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the ../../../LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-/*--------------------------------*-C-*---------------------------------*
- * File:
- *       fftn.h
- * ---------------------------------------------------------------------*
- * Re[]:        real value array
- * Im[]:        imaginary value array
- * nTotal:      total number of complex values
- * nPass:       number of elements involved in this pass of transform
- * nSpan:       nspan/nPass = number of bytes to increment pointer
- *              in Re[] and Im[]
- * isign: exponent: +1 = forward  -1 = reverse
- * scaling: normalizing constant by which the final result is *divided*
- * scaling == -1, normalize by total dimension of the transform
- * scaling <  -1, normalize by the square-root of the total dimension
- *
- * ----------------------------------------------------------------------
- * See the comments in the code for correct usage!
- */
-
-#ifndef MODULES_THIRD_PARTY_FFT_FFT_H_
-#define MODULES_THIRD_PARTY_FFT_FFT_H_
-
-#define FFT_MAXFFTSIZE 2048
-#define FFT_NFACTOR 11
-
-typedef struct {
-  unsigned int SpaceAlloced;
-  unsigned int MaxPermAlloced;
-  double Tmp0[FFT_MAXFFTSIZE];
-  double Tmp1[FFT_MAXFFTSIZE];
-  double Tmp2[FFT_MAXFFTSIZE];
-  double Tmp3[FFT_MAXFFTSIZE];
-  int Perm[FFT_MAXFFTSIZE];
-  int factor[FFT_NFACTOR];
-
-} FFTstr;
-
-/* double precision routine */
-
-int WebRtcIsac_Fftns(unsigned int ndim,
-                     const int dims[],
-                     double Re[],
-                     double Im[],
-                     int isign,
-                     double scaling,
-                     FFTstr* fftstate);
-
-#endif /* MODULES_THIRD_PARTY_FFT_FFT_H_ */
diff --git a/submodules/libtgvoip/webrtc_dsp/rtc_base/arraysize.h b/submodules/libtgvoip/webrtc_dsp/rtc_base/arraysize.h
deleted file mode 100644
index bf8e6d8810..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/rtc_base/arraysize.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- *  Copyright (c) 2015 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#ifndef RTC_BASE_ARRAYSIZE_H_
-#define RTC_BASE_ARRAYSIZE_H_
-
-#include <stddef.h>
-
-// This file defines the arraysize() macro and is derived from Chromium's
-// base/macros.h.
-
-// The arraysize(arr) macro returns the # of elements in an array arr.
-// The expression is a compile-time constant, and therefore can be
-// used in defining new arrays, for example.  If you use arraysize on
-// a pointer by mistake, you will get a compile-time error.
-
-// This template function declaration is used in defining arraysize.
-// Note that the function doesn't need an implementation, as we only
-// use its type.
-template <typename T, size_t N>
-char (&ArraySizeHelper(T (&array)[N]))[N];
-
-#define arraysize(array) (sizeof(ArraySizeHelper(array)))
-
-#endif  // RTC_BASE_ARRAYSIZE_H_
diff --git a/submodules/libtgvoip/webrtc_dsp/rtc_base/atomicops.h b/submodules/libtgvoip/webrtc_dsp/rtc_base/atomicops.h
deleted file mode 100644
index 16fa603a4e..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/rtc_base/atomicops.h
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- *  Copyright 2011 The WebRTC Project Authors. All rights reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#ifndef RTC_BASE_ATOMICOPS_H_
-#define RTC_BASE_ATOMICOPS_H_
-
-#if defined(WEBRTC_WIN)
-// clang-format off
-// clang formating would change include order.
-
-// Include winsock2.h before including <windows.h> to maintain consistency with
-// win32.h. To include win32.h directly, it must be broken out into its own
-// build target.
-#include <winsock2.h>
-#include <windows.h>
-// clang-format on
-#endif  // defined(WEBRTC_WIN)
-
-namespace rtc {
-class AtomicOps {
- public:
-#if defined(WEBRTC_WIN)
-  // Assumes sizeof(int) == sizeof(LONG), which it is on Win32 and Win64.
-  static int Increment(volatile int* i) {
-    return ::InterlockedIncrement(reinterpret_cast<volatile LONG*>(i));
-  }
-  static int Decrement(volatile int* i) {
-    return ::InterlockedDecrement(reinterpret_cast<volatile LONG*>(i));
-  }
-  static int AcquireLoad(volatile const int* i) { return *i; }
-  static void ReleaseStore(volatile int* i, int value) { *i = value; }
-  static int CompareAndSwap(volatile int* i, int old_value, int new_value) {
-    return ::InterlockedCompareExchange(reinterpret_cast<volatile LONG*>(i),
-                                        new_value, old_value);
-  }
-  // Pointer variants.
-  template <typename T>
-  static T* AcquireLoadPtr(T* volatile* ptr) {
-    return *ptr;
-  }
-  template <typename T>
-  static T* CompareAndSwapPtr(T* volatile* ptr, T* old_value, T* new_value) {
-    return static_cast<T*>(::InterlockedCompareExchangePointer(
-        reinterpret_cast<PVOID volatile*>(ptr), new_value, old_value));
-  }
-#else
-  static int Increment(volatile int* i) { return __sync_add_and_fetch(i, 1); }
-  static int Decrement(volatile int* i) { return __sync_sub_and_fetch(i, 1); }
-  static int AcquireLoad(volatile const int* i) {
-    return __atomic_load_n(i, __ATOMIC_ACQUIRE);
-  }
-  static void ReleaseStore(volatile int* i, int value) {
-    __atomic_store_n(i, value, __ATOMIC_RELEASE);
-  }
-  static int CompareAndSwap(volatile int* i, int old_value, int new_value) {
-    return __sync_val_compare_and_swap(i, old_value, new_value);
-  }
-  // Pointer variants.
-  template <typename T>
-  static T* AcquireLoadPtr(T* volatile* ptr) {
-    return __atomic_load_n(ptr, __ATOMIC_ACQUIRE);
-  }
-  template <typename T>
-  static T* CompareAndSwapPtr(T* volatile* ptr, T* old_value, T* new_value) {
-    return __sync_val_compare_and_swap(ptr, old_value, new_value);
-  }
-#endif
-};
-
-}  // namespace rtc
-
-#endif  // RTC_BASE_ATOMICOPS_H_
diff --git a/submodules/libtgvoip/webrtc_dsp/rtc_base/checks.cc b/submodules/libtgvoip/webrtc_dsp/rtc_base/checks.cc
deleted file mode 100644
index 675c0e7dc4..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/rtc_base/checks.cc
+++ /dev/null
@@ -1,167 +0,0 @@
-/*
- *  Copyright 2006 The WebRTC Project Authors. All rights reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-// Most of this was borrowed (with minor modifications) from V8's and Chromium's
-// src/base/logging.cc.
-
-#include <cstdarg>
-#include <cstdio>
-#include <cstdlib>
-
-#if defined(WEBRTC_ANDROID)
-#define RTC_LOG_TAG_ANDROID "rtc"
-#include <android/log.h>  // NOLINT
-#endif
-
-#if defined(WEBRTC_WIN)
-#include <windows.h>
-#endif
-
-#if defined(WEBRTC_WIN)
-#define LAST_SYSTEM_ERROR (::GetLastError())
-#elif defined(__native_client__) && __native_client__
-#define LAST_SYSTEM_ERROR (0)
-#elif defined(WEBRTC_POSIX)
-#include <errno.h>
-#define LAST_SYSTEM_ERROR (errno)
-#endif  // WEBRTC_WIN
-
-#include "rtc_base/checks.h"
-
-namespace {
-#if defined(__GNUC__)
-__attribute__((__format__(__printf__, 2, 3)))
-#endif
-  void AppendFormat(std::string* s, const char* fmt, ...) {
-  va_list args, copy;
-  va_start(args, fmt);
-  va_copy(copy, args);
-  const int predicted_length = vsnprintf(nullptr, 0, fmt, copy);
-  va_end(copy);
-
-  if (predicted_length > 0) {
-    const size_t size = s->size();
-    s->resize(size + predicted_length);
-    // Pass "+ 1" to vsnprintf to include space for the '\0'.
-    vsnprintf(&((*s)[size]), predicted_length + 1, fmt, args);
-  }
-  va_end(args);
-}
-}
-
-namespace rtc {
-namespace webrtc_checks_impl {
-
-// Reads one argument from args, appends it to s and advances fmt.
-// Returns true iff an argument was sucessfully parsed.
-bool ParseArg(va_list* args, const CheckArgType** fmt, std::string* s) {
-  if (**fmt == CheckArgType::kEnd)
-    return false;
-
-  switch (**fmt) {
-    case CheckArgType::kInt:
-      AppendFormat(s, "%d", va_arg(*args, int));
-      break;
-    case CheckArgType::kLong:
-      AppendFormat(s, "%ld", va_arg(*args, long));
-      break;
-    case CheckArgType::kLongLong:
-      AppendFormat(s, "%lld", va_arg(*args, long long));
-      break;
-    case CheckArgType::kUInt:
-      AppendFormat(s, "%u", va_arg(*args, unsigned));
-      break;
-    case CheckArgType::kULong:
-      AppendFormat(s, "%lu", va_arg(*args, unsigned long));
-      break;
-    case CheckArgType::kULongLong:
-      AppendFormat(s, "%llu", va_arg(*args, unsigned long long));
-      break;
-    case CheckArgType::kDouble:
-      AppendFormat(s, "%g", va_arg(*args, double));
-      break;
-    case CheckArgType::kLongDouble:
-      AppendFormat(s, "%Lg", va_arg(*args, long double));
-      break;
-    case CheckArgType::kCharP:
-      s->append(va_arg(*args, const char*));
-      break;
-    case CheckArgType::kStdString:
-      s->append(*va_arg(*args, const std::string*));
-      break;
-    case CheckArgType::kVoidP:
-      AppendFormat(s, "%p", va_arg(*args, const void*));
-      break;
-    default:
-      s->append("[Invalid CheckArgType]");
-      return false;
-  }
-  (*fmt)++;
-  return true;
-}
-
-RTC_NORETURN void FatalLog(const char* file,
-                           int line,
-                           const char* message,
-                           const CheckArgType* fmt,
-                           ...) {
-  va_list args;
-  va_start(args, fmt);
-
-  std::string s;
-  AppendFormat(&s,
-               "\n\n"
-               "#\n"
-               "# Fatal error in: %s, line %d\n"
-               "# last system error: %u\n"
-               "# Check failed: %s",
-               file, line, LAST_SYSTEM_ERROR, message);
-
-  if (*fmt == CheckArgType::kCheckOp) {
-    // This log message was generated by RTC_CHECK_OP, so we have to complete
-    // the error message using the operands that have been passed as the first
-    // two arguments.
-    fmt++;
-
-    std::string s1, s2;
-    if (ParseArg(&args, &fmt, &s1) && ParseArg(&args, &fmt, &s2))
-      AppendFormat(&s, " (%s vs. %s)\n# ", s1.c_str(), s2.c_str());
-  } else {
-    s.append("\n# ");
-  }
-
-  // Append all the user-supplied arguments to the message.
-  while (ParseArg(&args, &fmt, &s))
-    ;
-
-  va_end(args);
-
-  const char* output = s.c_str();
-
-#if defined(WEBRTC_ANDROID)
-  __android_log_print(ANDROID_LOG_ERROR, RTC_LOG_TAG_ANDROID, "%s\n", output);
-#endif
-
-  fflush(stdout);
-  fprintf(stderr, "%s", output);
-  fflush(stderr);
-  abort();
-}
-
-}  // namespace webrtc_checks_impl
-}  // namespace rtc
-
-// Function to call from the C version of the RTC_CHECK and RTC_DCHECK macros.
-RTC_NORETURN void rtc_FatalMessage(const char* file, int line,
-                                   const char* msg) {
-  static constexpr rtc::webrtc_checks_impl::CheckArgType t[] = {
-      rtc::webrtc_checks_impl::CheckArgType::kEnd};
-  FatalLog(file, line, msg, t);
-}
diff --git a/submodules/libtgvoip/webrtc_dsp/rtc_base/checks.h b/submodules/libtgvoip/webrtc_dsp/rtc_base/checks.h
deleted file mode 100644
index 9de6d47573..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/rtc_base/checks.h
+++ /dev/null
@@ -1,400 +0,0 @@
-/*
- *  Copyright 2006 The WebRTC Project Authors. All rights reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#ifndef RTC_BASE_CHECKS_H_
-#define RTC_BASE_CHECKS_H_
-
-// If you for some reson need to know if DCHECKs are on, test the value of
-// RTC_DCHECK_IS_ON. (Test its value, not if it's defined; it'll always be
-// defined, to either a true or a false value.)
-#if !defined(NDEBUG) || defined(DCHECK_ALWAYS_ON)
-#define RTC_DCHECK_IS_ON 1
-#else
-#define RTC_DCHECK_IS_ON 0
-#endif
-
-// Annotate a function that will not return control flow to the caller.
-#if defined(_MSC_VER)
-#define RTC_NORETURN __declspec(noreturn)
-#elif defined(__GNUC__)
-#define RTC_NORETURN __attribute__ ((__noreturn__))
-#else
-#define RTC_NORETURN
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-RTC_NORETURN void rtc_FatalMessage(const char* file, int line, const char* msg);
-#ifdef __cplusplus
-}  // extern "C"
-#endif
-
-#ifdef __cplusplus
-// C++ version.
-
-#include <string>
-
-#include "rtc_base/numerics/safe_compare.h"
-#include "rtc_base/system/inline.h"
-
-// The macros here print a message to stderr and abort under various
-// conditions. All will accept additional stream messages. For example:
-// RTC_DCHECK_EQ(foo, bar) << "I'm printed when foo != bar.";
-//
-// - RTC_CHECK(x) is an assertion that x is always true, and that if it isn't,
-//   it's better to terminate the process than to continue. During development,
-//   the reason that it's better to terminate might simply be that the error
-//   handling code isn't in place yet; in production, the reason might be that
-//   the author of the code truly believes that x will always be true, but that
-//   she recognizes that if she is wrong, abrupt and unpleasant process
-//   termination is still better than carrying on with the assumption violated.
-//
-//   RTC_CHECK always evaluates its argument, so it's OK for x to have side
-//   effects.
-//
-// - RTC_DCHECK(x) is the same as RTC_CHECK(x)---an assertion that x is always
-//   true---except that x will only be evaluated in debug builds; in production
-//   builds, x is simply assumed to be true. This is useful if evaluating x is
-//   expensive and the expected cost of failing to detect the violated
-//   assumption is acceptable. You should not handle cases where a production
-//   build fails to spot a violated condition, even those that would result in
-//   crashes. If the code needs to cope with the error, make it cope, but don't
-//   call RTC_DCHECK; if the condition really can't occur, but you'd sleep
-//   better at night knowing that the process will suicide instead of carrying
-//   on in case you were wrong, use RTC_CHECK instead of RTC_DCHECK.
-//
-//   RTC_DCHECK only evaluates its argument in debug builds, so if x has visible
-//   side effects, you need to write e.g.
-//     bool w = x; RTC_DCHECK(w);
-//
-// - RTC_CHECK_EQ, _NE, _GT, ..., and RTC_DCHECK_EQ, _NE, _GT, ... are
-//   specialized variants of RTC_CHECK and RTC_DCHECK that print prettier
-//   messages if the condition doesn't hold. Prefer them to raw RTC_CHECK and
-//   RTC_DCHECK.
-//
-// - FATAL() aborts unconditionally.
-//
-// TODO(ajm): Ideally, checks.h would be combined with logging.h, but
-// consolidation with system_wrappers/logging.h should happen first.
-
-namespace rtc {
-namespace webrtc_checks_impl {
-enum class CheckArgType : int8_t {
-  kEnd = 0,
-  kInt,
-  kLong,
-  kLongLong,
-  kUInt,
-  kULong,
-  kULongLong,
-  kDouble,
-  kLongDouble,
-  kCharP,
-  kStdString,
-  kVoidP,
-
-  // kCheckOp doesn't represent an argument type. Instead, it is sent as the
-  // first argument from RTC_CHECK_OP to make FatalLog use the next two
-  // arguments to build the special CHECK_OP error message
-  // (the "a == b (1 vs. 2)" bit).
-  kCheckOp,
-};
-
-RTC_NORETURN void FatalLog(const char* file,
-                           int line,
-                           const char* message,
-                           const CheckArgType* fmt,
-                           ...);
-
-// Wrapper for log arguments. Only ever make values of this type with the
-// MakeVal() functions.
-template <CheckArgType N, typename T>
-struct Val {
-  static constexpr CheckArgType Type() { return N; }
-  T GetVal() const { return val; }
-  T val;
-};
-
-inline Val<CheckArgType::kInt, int> MakeVal(int x) {
-  return {x};
-}
-inline Val<CheckArgType::kLong, long> MakeVal(long x) {
-  return {x};
-}
-inline Val<CheckArgType::kLongLong, long long> MakeVal(long long x) {
-  return {x};
-}
-inline Val<CheckArgType::kUInt, unsigned int> MakeVal(unsigned int x) {
-  return {x};
-}
-inline Val<CheckArgType::kULong, unsigned long> MakeVal(unsigned long x) {
-  return {x};
-}
-inline Val<CheckArgType::kULongLong, unsigned long long> MakeVal(
-    unsigned long long x) {
-  return {x};
-}
-
-inline Val<CheckArgType::kDouble, double> MakeVal(double x) {
-  return {x};
-}
-inline Val<CheckArgType::kLongDouble, long double> MakeVal(long double x) {
-  return {x};
-}
-
-inline Val<CheckArgType::kCharP, const char*> MakeVal(const char* x) {
-  return {x};
-}
-inline Val<CheckArgType::kStdString, const std::string*> MakeVal(
-    const std::string& x) {
-  return {&x};
-}
-
-inline Val<CheckArgType::kVoidP, const void*> MakeVal(const void* x) {
-  return {x};
-}
-
-// Ephemeral type that represents the result of the logging << operator.
-template <typename... Ts>
-class LogStreamer;
-
-// Base case: Before the first << argument.
-template <>
-class LogStreamer<> final {
- public:
-  template <
-      typename U,
-      typename std::enable_if<std::is_arithmetic<U>::value>::type* = nullptr>
-  RTC_FORCE_INLINE LogStreamer<decltype(MakeVal(std::declval<U>()))> operator<<(
-      U arg) const {
-    return LogStreamer<decltype(MakeVal(std::declval<U>()))>(MakeVal(arg),
-                                                             this);
-  }
-
-  template <
-      typename U,
-      typename std::enable_if<!std::is_arithmetic<U>::value>::type* = nullptr>
-  RTC_FORCE_INLINE LogStreamer<decltype(MakeVal(std::declval<U>()))> operator<<(
-      const U& arg) const {
-    return LogStreamer<decltype(MakeVal(std::declval<U>()))>(MakeVal(arg),
-                                                             this);
-  }
-
-  template <typename... Us>
-  RTC_NORETURN RTC_FORCE_INLINE static void Call(const char* file,
-                                                 const int line,
-                                                 const char* message,
-                                                 const Us&... args) {
-    static constexpr CheckArgType t[] = {Us::Type()..., CheckArgType::kEnd};
-    FatalLog(file, line, message, t, args.GetVal()...);
-  }
-
-  template <typename... Us>
-  RTC_NORETURN RTC_FORCE_INLINE static void CallCheckOp(const char* file,
-                                                        const int line,
-                                                        const char* message,
-                                                        const Us&... args) {
-    static constexpr CheckArgType t[] = {CheckArgType::kCheckOp, Us::Type()...,
-                                         CheckArgType::kEnd};
-    FatalLog(file, line, message, t, args.GetVal()...);
-  }
-};
-
-// Inductive case: We've already seen at least one << argument. The most recent
-// one had type `T`, and the earlier ones had types `Ts`.
-template <typename T, typename... Ts>
-class LogStreamer<T, Ts...> final {
- public:
-  RTC_FORCE_INLINE LogStreamer(T arg, const LogStreamer<Ts...>* prior)
-      : arg_(arg), prior_(prior) {}
-
-  template <
-      typename U,
-      typename std::enable_if<std::is_arithmetic<U>::value>::type* = nullptr>
-  RTC_FORCE_INLINE LogStreamer<decltype(MakeVal(std::declval<U>())), T, Ts...>
-  operator<<(U arg) const {
-    return LogStreamer<decltype(MakeVal(std::declval<U>())), T, Ts...>(
-        MakeVal(arg), this);
-  }
-
-  template <
-      typename U,
-      typename std::enable_if<!std::is_arithmetic<U>::value>::type* = nullptr>
-  RTC_FORCE_INLINE LogStreamer<decltype(MakeVal(std::declval<U>())), T, Ts...>
-  operator<<(const U& arg) const {
-    return LogStreamer<decltype(MakeVal(std::declval<U>())), T, Ts...>(
-        MakeVal(arg), this);
-  }
-
-  template <typename... Us>
-  RTC_NORETURN RTC_FORCE_INLINE void Call(const char* file,
-                                          const int line,
-                                          const char* message,
-                                          const Us&... args) const {
-    prior_->Call(file, line, message, arg_, args...);
-  }
-
-  template <typename... Us>
-  RTC_NORETURN RTC_FORCE_INLINE void CallCheckOp(const char* file,
-                                                 const int line,
-                                                 const char* message,
-                                                 const Us&... args) const {
-    prior_->CallCheckOp(file, line, message, arg_, args...);
-  }
-
- private:
-  // The most recent argument.
-  T arg_;
-
-  // Earlier arguments.
-  const LogStreamer<Ts...>* prior_;
-};
-
-template <bool isCheckOp>
-class FatalLogCall final {
- public:
-  FatalLogCall(const char* file, int line, const char* message)
-      : file_(file), line_(line), message_(message) {}
-
-  // This can be any binary operator with precedence lower than <<.
-  template <typename... Ts>
-  RTC_NORETURN RTC_FORCE_INLINE void operator&(
-      const LogStreamer<Ts...>& streamer) {
-    isCheckOp ? streamer.CallCheckOp(file_, line_, message_)
-              : streamer.Call(file_, line_, message_);
-  }
-
- private:
-  const char* file_;
-  int line_;
-  const char* message_;
-};
-}  // namespace webrtc_checks_impl
-
-// The actual stream used isn't important. We reference |ignored| in the code
-// but don't evaluate it; this is to avoid "unused variable" warnings (we do so
-// in a particularly convoluted way with an extra ?: because that appears to be
-// the simplest construct that keeps Visual Studio from complaining about
-// condition being unused).
-#define RTC_EAT_STREAM_PARAMETERS(ignored)                        \
-  (true ? true : ((void)(ignored), true))                         \
-      ? static_cast<void>(0)                                      \
-      : rtc::webrtc_checks_impl::FatalLogCall<false>("", 0, "") & \
-            rtc::webrtc_checks_impl::LogStreamer<>()
-
-// Call RTC_EAT_STREAM_PARAMETERS with an argument that fails to compile if
-// values of the same types as |a| and |b| can't be compared with the given
-// operation, and that would evaluate |a| and |b| if evaluated.
-#define RTC_EAT_STREAM_PARAMETERS_OP(op, a, b) \
-  RTC_EAT_STREAM_PARAMETERS(((void)rtc::Safe##op(a, b)))
-
-// RTC_CHECK dies with a fatal error if condition is not true. It is *not*
-// controlled by NDEBUG or anything else, so the check will be executed
-// regardless of compilation mode.
-//
-// We make sure RTC_CHECK et al. always evaluates |condition|, as
-// doing RTC_CHECK(FunctionWithSideEffect()) is a common idiom.
-#define RTC_CHECK(condition)                                       \
-  while (!(condition))                                             \
-  rtc::webrtc_checks_impl::FatalLogCall<false>(__FILE__, __LINE__, \
-                                               #condition) &       \
-      rtc::webrtc_checks_impl::LogStreamer<>()
-
-// Helper macro for binary operators.
-// Don't use this macro directly in your code, use RTC_CHECK_EQ et al below.
-#define RTC_CHECK_OP(name, op, val1, val2)                               \
-  while (!rtc::Safe##name((val1), (val2)))                               \
-  rtc::webrtc_checks_impl::FatalLogCall<true>(__FILE__, __LINE__,        \
-                                              #val1 " " #op " " #val2) & \
-      rtc::webrtc_checks_impl::LogStreamer<>() << (val1) << (val2)
-
-#define RTC_CHECK_EQ(val1, val2) RTC_CHECK_OP(Eq, ==, val1, val2)
-#define RTC_CHECK_NE(val1, val2) RTC_CHECK_OP(Ne, !=, val1, val2)
-#define RTC_CHECK_LE(val1, val2) RTC_CHECK_OP(Le, <=, val1, val2)
-#define RTC_CHECK_LT(val1, val2) RTC_CHECK_OP(Lt, <, val1, val2)
-#define RTC_CHECK_GE(val1, val2) RTC_CHECK_OP(Ge, >=, val1, val2)
-#define RTC_CHECK_GT(val1, val2) RTC_CHECK_OP(Gt, >, val1, val2)
-
-// The RTC_DCHECK macro is equivalent to RTC_CHECK except that it only generates
-// code in debug builds. It does reference the condition parameter in all cases,
-// though, so callers won't risk getting warnings about unused variables.
-#if RTC_DCHECK_IS_ON
-#define RTC_DCHECK(condition) RTC_CHECK(condition)
-#define RTC_DCHECK_EQ(v1, v2) RTC_CHECK_EQ(v1, v2)
-#define RTC_DCHECK_NE(v1, v2) RTC_CHECK_NE(v1, v2)
-#define RTC_DCHECK_LE(v1, v2) RTC_CHECK_LE(v1, v2)
-#define RTC_DCHECK_LT(v1, v2) RTC_CHECK_LT(v1, v2)
-#define RTC_DCHECK_GE(v1, v2) RTC_CHECK_GE(v1, v2)
-#define RTC_DCHECK_GT(v1, v2) RTC_CHECK_GT(v1, v2)
-#else
-#define RTC_DCHECK(condition) RTC_EAT_STREAM_PARAMETERS(condition)
-#define RTC_DCHECK_EQ(v1, v2) RTC_EAT_STREAM_PARAMETERS_OP(Eq, v1, v2)
-#define RTC_DCHECK_NE(v1, v2) RTC_EAT_STREAM_PARAMETERS_OP(Ne, v1, v2)
-#define RTC_DCHECK_LE(v1, v2) RTC_EAT_STREAM_PARAMETERS_OP(Le, v1, v2)
-#define RTC_DCHECK_LT(v1, v2) RTC_EAT_STREAM_PARAMETERS_OP(Lt, v1, v2)
-#define RTC_DCHECK_GE(v1, v2) RTC_EAT_STREAM_PARAMETERS_OP(Ge, v1, v2)
-#define RTC_DCHECK_GT(v1, v2) RTC_EAT_STREAM_PARAMETERS_OP(Gt, v1, v2)
-#endif
-
-#define RTC_UNREACHABLE_CODE_HIT false
-#define RTC_NOTREACHED() RTC_DCHECK(RTC_UNREACHABLE_CODE_HIT)
-
-// TODO(bugs.webrtc.org/8454): Add an RTC_ prefix or rename differently.
-#define FATAL()                                                    \
-  rtc::webrtc_checks_impl::FatalLogCall<false>(__FILE__, __LINE__, \
-                                               "FATAL()") &        \
-      rtc::webrtc_checks_impl::LogStreamer<>()
-
-// Performs the integer division a/b and returns the result. CHECKs that the
-// remainder is zero.
-template <typename T>
-inline T CheckedDivExact(T a, T b) {
-  RTC_CHECK_EQ(a % b, 0) << a << " is not evenly divisible by " << b;
-  return a / b;
-}
-
-}  // namespace rtc
-
-#else  // __cplusplus not defined
-// C version. Lacks many features compared to the C++ version, but usage
-// guidelines are the same.
-
-#define RTC_CHECK(condition)                                             \
-  do {                                                                   \
-    if (!(condition)) {                                                  \
-      rtc_FatalMessage(__FILE__, __LINE__, "CHECK failed: " #condition); \
-    }                                                                    \
-  } while (0)
-
-#define RTC_CHECK_EQ(a, b) RTC_CHECK((a) == (b))
-#define RTC_CHECK_NE(a, b) RTC_CHECK((a) != (b))
-#define RTC_CHECK_LE(a, b) RTC_CHECK((a) <= (b))
-#define RTC_CHECK_LT(a, b) RTC_CHECK((a) < (b))
-#define RTC_CHECK_GE(a, b) RTC_CHECK((a) >= (b))
-#define RTC_CHECK_GT(a, b) RTC_CHECK((a) > (b))
-
-#define RTC_DCHECK(condition)                                             \
-  do {                                                                    \
-    if (RTC_DCHECK_IS_ON && !(condition)) {                               \
-      rtc_FatalMessage(__FILE__, __LINE__, "DCHECK failed: " #condition); \
-    }                                                                     \
-  } while (0)
-
-#define RTC_DCHECK_EQ(a, b) RTC_DCHECK((a) == (b))
-#define RTC_DCHECK_NE(a, b) RTC_DCHECK((a) != (b))
-#define RTC_DCHECK_LE(a, b) RTC_DCHECK((a) <= (b))
-#define RTC_DCHECK_LT(a, b) RTC_DCHECK((a) < (b))
-#define RTC_DCHECK_GE(a, b) RTC_DCHECK((a) >= (b))
-#define RTC_DCHECK_GT(a, b) RTC_DCHECK((a) > (b))
-
-#endif  // __cplusplus
-
-#endif  // RTC_BASE_CHECKS_H_
diff --git a/submodules/libtgvoip/webrtc_dsp/rtc_base/compile_assert_c.h b/submodules/libtgvoip/webrtc_dsp/rtc_base/compile_assert_c.h
deleted file mode 100644
index db2e4a8116..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/rtc_base/compile_assert_c.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- *  Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#ifndef RTC_BASE_COMPILE_ASSERT_C_H_
-#define RTC_BASE_COMPILE_ASSERT_C_H_
-
-// Use this macro to verify at compile time that certain restrictions are met.
-// The argument is the boolean expression to evaluate.
-// Example:
-//   RTC_COMPILE_ASSERT(sizeof(foo) < 128);
-// Note: In C++, use static_assert instead!
-#define RTC_COMPILE_ASSERT(expression) \
-  switch (0) {                         \
-    case 0:                            \
-    case expression:;                  \
-  }
-
-#endif  // RTC_BASE_COMPILE_ASSERT_C_H_
diff --git a/submodules/libtgvoip/webrtc_dsp/rtc_base/constructormagic.h b/submodules/libtgvoip/webrtc_dsp/rtc_base/constructormagic.h
deleted file mode 100644
index 6b6e83cb47..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/rtc_base/constructormagic.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- *  Copyright 2004 The WebRTC Project Authors. All rights reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#ifndef RTC_BASE_CONSTRUCTORMAGIC_H_
-#define RTC_BASE_CONSTRUCTORMAGIC_H_
-
-// Put this in the declarations for a class to be unassignable.
-#define RTC_DISALLOW_ASSIGN(TypeName) \
-  TypeName& operator=(const TypeName&) = delete
-
-// A macro to disallow the copy constructor and operator= functions. This should
-// be used in the declarations for a class.
-#define RTC_DISALLOW_COPY_AND_ASSIGN(TypeName) \
-  TypeName(const TypeName&) = delete;          \
-  RTC_DISALLOW_ASSIGN(TypeName)
-
-// A macro to disallow all the implicit constructors, namely the default
-// constructor, copy constructor and operator= functions.
-//
-// This should be used in the declarations for a class that wants to prevent
-// anyone from instantiating it. This is especially useful for classes
-// containing only static methods.
-#define RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(TypeName) \
-  TypeName() = delete;                               \
-  RTC_DISALLOW_COPY_AND_ASSIGN(TypeName)
-
-#endif  // RTC_BASE_CONSTRUCTORMAGIC_H_
diff --git a/submodules/libtgvoip/webrtc_dsp/rtc_base/criticalsection.cc b/submodules/libtgvoip/webrtc_dsp/rtc_base/criticalsection.cc
deleted file mode 100644
index 4e00be968d..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/rtc_base/criticalsection.cc
+++ /dev/null
@@ -1,259 +0,0 @@
-/*
- *  Copyright 2015 The WebRTC Project Authors. All rights reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#include "rtc_base/criticalsection.h"
-
-#include <time.h>
-
-#include "rtc_base/atomicops.h"
-#include "rtc_base/checks.h"
-#include "rtc_base/platform_thread_types.h"
-#include "rtc_base/system/unused.h"
-
-// TODO(tommi): Split this file up to per-platform implementation files.
-
-namespace rtc {
-
-CriticalSection::CriticalSection() {
-#if defined(WEBRTC_WIN)
-  InitializeCriticalSection(&crit_);
-#elif defined(WEBRTC_POSIX)
-#if defined(WEBRTC_MAC) && !USE_NATIVE_MUTEX_ON_MAC
-  lock_queue_ = 0;
-  owning_thread_ = 0;
-  recursion_ = 0;
-  semaphore_ = dispatch_semaphore_create(0);
-#else
-  pthread_mutexattr_t mutex_attribute;
-  pthread_mutexattr_init(&mutex_attribute);
-  pthread_mutexattr_settype(&mutex_attribute, PTHREAD_MUTEX_RECURSIVE);
-  pthread_mutex_init(&mutex_, &mutex_attribute);
-  pthread_mutexattr_destroy(&mutex_attribute);
-#endif
-  CS_DEBUG_CODE(thread_ = 0);
-  CS_DEBUG_CODE(recursion_count_ = 0);
-  RTC_UNUSED(thread_);
-  RTC_UNUSED(recursion_count_);
-#else
-#error Unsupported platform.
-#endif
-}
-
-CriticalSection::~CriticalSection() {
-#if defined(WEBRTC_WIN)
-  DeleteCriticalSection(&crit_);
-#elif defined(WEBRTC_POSIX)
-#if defined(WEBRTC_MAC) && !USE_NATIVE_MUTEX_ON_MAC
-  dispatch_release(semaphore_);
-#else
-  pthread_mutex_destroy(&mutex_);
-#endif
-#else
-#error Unsupported platform.
-#endif
-}
-
-void CriticalSection::Enter() const RTC_EXCLUSIVE_LOCK_FUNCTION() {
-#if defined(WEBRTC_WIN)
-  EnterCriticalSection(&crit_);
-#elif defined(WEBRTC_POSIX)
-#if defined(WEBRTC_MAC) && !USE_NATIVE_MUTEX_ON_MAC
-  int spin = 3000;
-  PlatformThreadRef self = CurrentThreadRef();
-  bool have_lock = false;
-  do {
-    // Instead of calling TryEnter() in this loop, we do two interlocked
-    // operations, first a read-only one in order to avoid affecting the lock
-    // cache-line while spinning, in case another thread is using the lock.
-    if (!IsThreadRefEqual(owning_thread_, self)) {
-      if (AtomicOps::AcquireLoad(&lock_queue_) == 0) {
-        if (AtomicOps::CompareAndSwap(&lock_queue_, 0, 1) == 0) {
-          have_lock = true;
-          break;
-        }
-      }
-    } else {
-      AtomicOps::Increment(&lock_queue_);
-      have_lock = true;
-      break;
-    }
-
-    sched_yield();
-  } while (--spin);
-
-  if (!have_lock && AtomicOps::Increment(&lock_queue_) > 1) {
-    // Owning thread cannot be the current thread since TryEnter() would
-    // have succeeded.
-    RTC_DCHECK(!IsThreadRefEqual(owning_thread_, self));
-    // Wait for the lock to become available.
-    dispatch_semaphore_wait(semaphore_, DISPATCH_TIME_FOREVER);
-    RTC_DCHECK(owning_thread_ == 0);
-    RTC_DCHECK(!recursion_);
-  }
-
-  owning_thread_ = self;
-  ++recursion_;
-
-#else
-  pthread_mutex_lock(&mutex_);
-#endif
-
-#if CS_DEBUG_CHECKS
-  if (!recursion_count_) {
-    RTC_DCHECK(!thread_);
-    thread_ = CurrentThreadRef();
-  } else {
-    RTC_DCHECK(CurrentThreadIsOwner());
-  }
-  ++recursion_count_;
-#endif
-#else
-#error Unsupported platform.
-#endif
-}
-
-bool CriticalSection::TryEnter() const RTC_EXCLUSIVE_TRYLOCK_FUNCTION(true) {
-#if defined(WEBRTC_WIN)
-  return TryEnterCriticalSection(&crit_) != FALSE;
-#elif defined(WEBRTC_POSIX)
-#if defined(WEBRTC_MAC) && !USE_NATIVE_MUTEX_ON_MAC
-  if (!IsThreadRefEqual(owning_thread_, CurrentThreadRef())) {
-    if (AtomicOps::CompareAndSwap(&lock_queue_, 0, 1) != 0)
-      return false;
-    owning_thread_ = CurrentThreadRef();
-    RTC_DCHECK(!recursion_);
-  } else {
-    AtomicOps::Increment(&lock_queue_);
-  }
-  ++recursion_;
-#else
-  if (pthread_mutex_trylock(&mutex_) != 0)
-    return false;
-#endif
-#if CS_DEBUG_CHECKS
-  if (!recursion_count_) {
-    RTC_DCHECK(!thread_);
-    thread_ = CurrentThreadRef();
-  } else {
-    RTC_DCHECK(CurrentThreadIsOwner());
-  }
-  ++recursion_count_;
-#endif
-  return true;
-#else
-#error Unsupported platform.
-#endif
-}
-
-void CriticalSection::Leave() const RTC_UNLOCK_FUNCTION() {
-  RTC_DCHECK(CurrentThreadIsOwner());
-#if defined(WEBRTC_WIN)
-  LeaveCriticalSection(&crit_);
-#elif defined(WEBRTC_POSIX)
-#if CS_DEBUG_CHECKS
-  --recursion_count_;
-  RTC_DCHECK(recursion_count_ >= 0);
-  if (!recursion_count_)
-    thread_ = 0;
-#endif
-#if defined(WEBRTC_MAC) && !USE_NATIVE_MUTEX_ON_MAC
-  RTC_DCHECK(IsThreadRefEqual(owning_thread_, CurrentThreadRef()));
-  RTC_DCHECK_GE(recursion_, 0);
-  --recursion_;
-  if (!recursion_)
-    owning_thread_ = 0;
-
-  if (AtomicOps::Decrement(&lock_queue_) > 0 && !recursion_)
-    dispatch_semaphore_signal(semaphore_);
-#else
-  pthread_mutex_unlock(&mutex_);
-#endif
-#else
-#error Unsupported platform.
-#endif
-}
-
-bool CriticalSection::CurrentThreadIsOwner() const {
-#if defined(WEBRTC_WIN)
-  // OwningThread has type HANDLE but actually contains the Thread ID:
-  // http://stackoverflow.com/questions/12675301/why-is-the-owningthread-member-of-critical-section-of-type-handle-when-it-is-de
-  // Converting through size_t avoids the VS 2015 warning C4312: conversion from
-  // 'type1' to 'type2' of greater size
-  return crit_.OwningThread ==
-         reinterpret_cast<HANDLE>(static_cast<size_t>(GetCurrentThreadId()));
-#elif defined(WEBRTC_POSIX)
-#if CS_DEBUG_CHECKS
-  return IsThreadRefEqual(thread_, CurrentThreadRef());
-#else
-  return true;
-#endif  // CS_DEBUG_CHECKS
-#else
-#error Unsupported platform.
-#endif
-}
-
-CritScope::CritScope(const CriticalSection* cs) : cs_(cs) {
-  cs_->Enter();
-}
-CritScope::~CritScope() {
-  cs_->Leave();
-}
-
-TryCritScope::TryCritScope(const CriticalSection* cs)
-    : cs_(cs), locked_(cs->TryEnter()) {
-  CS_DEBUG_CODE(lock_was_called_ = false);
-  RTC_UNUSED(lock_was_called_);
-}
-
-TryCritScope::~TryCritScope() {
-  CS_DEBUG_CODE(RTC_DCHECK(lock_was_called_));
-  if (locked_)
-    cs_->Leave();
-}
-
-bool TryCritScope::locked() const {
-  CS_DEBUG_CODE(lock_was_called_ = true);
-  return locked_;
-}
-
-void GlobalLockPod::Lock() {
-#if !defined(WEBRTC_WIN) && (!defined(WEBRTC_MAC) || USE_NATIVE_MUTEX_ON_MAC)
-  const struct timespec ts_null = {0};
-#endif
-
-  while (AtomicOps::CompareAndSwap(&lock_acquired, 0, 1)) {
-#if defined(WEBRTC_WIN)
-    ::Sleep(0);
-#elif defined(WEBRTC_MAC) && !USE_NATIVE_MUTEX_ON_MAC
-    sched_yield();
-#else
-    nanosleep(&ts_null, nullptr);
-#endif
-  }
-}
-
-void GlobalLockPod::Unlock() {
-  int old_value = AtomicOps::CompareAndSwap(&lock_acquired, 1, 0);
-  RTC_DCHECK_EQ(1, old_value) << "Unlock called without calling Lock first";
-}
-
-GlobalLock::GlobalLock() {
-  lock_acquired = 0;
-}
-
-GlobalLockScope::GlobalLockScope(GlobalLockPod* lock) : lock_(lock) {
-  lock_->Lock();
-}
-
-GlobalLockScope::~GlobalLockScope() {
-  lock_->Unlock();
-}
-
-}  // namespace rtc
diff --git a/submodules/libtgvoip/webrtc_dsp/rtc_base/criticalsection.h b/submodules/libtgvoip/webrtc_dsp/rtc_base/criticalsection.h
deleted file mode 100644
index f25e7d0c10..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/rtc_base/criticalsection.h
+++ /dev/null
@@ -1,160 +0,0 @@
-/*
- *  Copyright 2004 The WebRTC Project Authors. All rights reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#ifndef RTC_BASE_CRITICALSECTION_H_
-#define RTC_BASE_CRITICALSECTION_H_
-
-#include "rtc_base/checks.h"
-#include "rtc_base/constructormagic.h"
-#include "rtc_base/platform_thread_types.h"
-#include "rtc_base/thread_annotations.h"
-
-#if defined(WEBRTC_WIN)
-// clang-format off
-// clang formating would change include order.
-
-// Include winsock2.h before including <windows.h> to maintain consistency with
-// win32.h. To include win32.h directly, it must be broken out into its own
-// build target.
-#include <winsock2.h>
-#include <windows.h>
-#include <sal.h>  // must come after windows headers.
-// clang-format on
-#endif  // defined(WEBRTC_WIN)
-
-#if defined(WEBRTC_POSIX)
-#include <pthread.h>
-#endif
-
-// See notes in the 'Performance' unit test for the effects of this flag.
-#define USE_NATIVE_MUTEX_ON_MAC 0
-
-#if defined(WEBRTC_MAC) && !USE_NATIVE_MUTEX_ON_MAC
-#include <dispatch/dispatch.h>
-#endif
-
-#define CS_DEBUG_CHECKS RTC_DCHECK_IS_ON
-
-#if CS_DEBUG_CHECKS
-#define CS_DEBUG_CODE(x) x
-#else  // !CS_DEBUG_CHECKS
-#define CS_DEBUG_CODE(x)
-#endif  // !CS_DEBUG_CHECKS
-
-namespace rtc {
-
-// Locking methods (Enter, TryEnter, Leave)are const to permit protecting
-// members inside a const context without requiring mutable CriticalSections
-// everywhere.
-class RTC_LOCKABLE CriticalSection {
- public:
-  CriticalSection();
-  ~CriticalSection();
-
-  void Enter() const RTC_EXCLUSIVE_LOCK_FUNCTION();
-  bool TryEnter() const RTC_EXCLUSIVE_TRYLOCK_FUNCTION(true);
-  void Leave() const RTC_UNLOCK_FUNCTION();
-
- private:
-  // Use only for RTC_DCHECKing.
-  bool CurrentThreadIsOwner() const;
-
-#if defined(WEBRTC_WIN)
-  mutable CRITICAL_SECTION crit_;
-#elif defined(WEBRTC_POSIX)
-#if defined(WEBRTC_MAC) && !USE_NATIVE_MUTEX_ON_MAC
-  // Number of times the lock has been locked + number of threads waiting.
-  // TODO(tommi): We could use this number and subtract the recursion count
-  // to find places where we have multiple threads contending on the same lock.
-  mutable volatile int lock_queue_;
-  // |recursion_| represents the recursion count + 1 for the thread that owns
-  // the lock. Only modified by the thread that owns the lock.
-  mutable int recursion_;
-  // Used to signal a single waiting thread when the lock becomes available.
-  mutable dispatch_semaphore_t semaphore_;
-  // The thread that currently holds the lock. Required to handle recursion.
-  mutable PlatformThreadRef owning_thread_;
-#else
-  mutable pthread_mutex_t mutex_;
-#endif
-  mutable PlatformThreadRef thread_;  // Only used by RTC_DCHECKs.
-  mutable int recursion_count_;       // Only used by RTC_DCHECKs.
-#else  // !defined(WEBRTC_WIN) && !defined(WEBRTC_POSIX)
-#error Unsupported platform.
-#endif
-};
-
-// CritScope, for serializing execution through a scope.
-class RTC_SCOPED_LOCKABLE CritScope {
- public:
-  explicit CritScope(const CriticalSection* cs) RTC_EXCLUSIVE_LOCK_FUNCTION(cs);
-  ~CritScope() RTC_UNLOCK_FUNCTION();
-
- private:
-  const CriticalSection* const cs_;
-  RTC_DISALLOW_COPY_AND_ASSIGN(CritScope);
-};
-
-// Tries to lock a critical section on construction via
-// CriticalSection::TryEnter, and unlocks on destruction if the
-// lock was taken. Never blocks.
-//
-// IMPORTANT: Unlike CritScope, the lock may not be owned by this thread in
-// subsequent code. Users *must* check locked() to determine if the
-// lock was taken. If you're not calling locked(), you're doing it wrong!
-class TryCritScope {
- public:
-  explicit TryCritScope(const CriticalSection* cs);
-  ~TryCritScope();
-#if defined(WEBRTC_WIN)
-  _Check_return_ bool locked() const;
-#elif defined(WEBRTC_POSIX)
-  bool locked() const __attribute__((__warn_unused_result__));
-#else  // !defined(WEBRTC_WIN) && !defined(WEBRTC_POSIX)
-#error Unsupported platform.
-#endif
- private:
-  const CriticalSection* const cs_;
-  const bool locked_;
-  mutable bool lock_was_called_;  // Only used by RTC_DCHECKs.
-  RTC_DISALLOW_COPY_AND_ASSIGN(TryCritScope);
-};
-
-// A POD lock used to protect global variables. Do NOT use for other purposes.
-// No custom constructor or private data member should be added.
-class RTC_LOCKABLE GlobalLockPod {
- public:
-  void Lock() RTC_EXCLUSIVE_LOCK_FUNCTION();
-
-  void Unlock() RTC_UNLOCK_FUNCTION();
-
-  volatile int lock_acquired;
-};
-
-class GlobalLock : public GlobalLockPod {
- public:
-  GlobalLock();
-};
-
-// GlobalLockScope, for serializing execution through a scope.
-class RTC_SCOPED_LOCKABLE GlobalLockScope {
- public:
-  explicit GlobalLockScope(GlobalLockPod* lock)
-      RTC_EXCLUSIVE_LOCK_FUNCTION(lock);
-  ~GlobalLockScope() RTC_UNLOCK_FUNCTION();
-
- private:
-  GlobalLockPod* const lock_;
-  RTC_DISALLOW_COPY_AND_ASSIGN(GlobalLockScope);
-};
-
-}  // namespace rtc
-
-#endif  // RTC_BASE_CRITICALSECTION_H_
diff --git a/submodules/libtgvoip/webrtc_dsp/rtc_base/deprecation.h b/submodules/libtgvoip/webrtc_dsp/rtc_base/deprecation.h
deleted file mode 100644
index f285ab04bb..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/rtc_base/deprecation.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- *  Copyright (c) 2015 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#ifndef RTC_BASE_DEPRECATION_H_
-#define RTC_BASE_DEPRECATION_H_
-
-// Annotate the declarations of deprecated functions with this to cause a
-// compiler warning when they're used. Like so:
-//
-//   RTC_DEPRECATED std::pony PonyPlz(const std::pony_spec& ps);
-//
-// NOTE 1: The annotation goes on the declaration in the .h file, not the
-// definition in the .cc file!
-//
-// NOTE 2: In order to keep unit testing the deprecated function without
-// getting warnings, do something like this:
-//
-//   std::pony DEPRECATED_PonyPlz(const std::pony_spec& ps);
-//   RTC_DEPRECATED inline std::pony PonyPlz(const std::pony_spec& ps) {
-//     return DEPRECATED_PonyPlz(ps);
-//   }
-//
-// In other words, rename the existing function, and provide an inline wrapper
-// using the original name that calls it. That way, callers who are willing to
-// call it using the DEPRECATED_-prefixed name don't get the warning.
-//
-// TODO(kwiberg): Remove this when we can use [[deprecated]] from C++14.
-#if defined(_MSC_VER)
-// Note: Deprecation warnings seem to fail to trigger on Windows
-// (https://bugs.chromium.org/p/webrtc/issues/detail?id=5368).
-#define RTC_DEPRECATED __declspec(deprecated)
-#elif defined(__GNUC__)
-#define RTC_DEPRECATED __attribute__((__deprecated__))
-#else
-#define RTC_DEPRECATED
-#endif
-
-#endif  // RTC_BASE_DEPRECATION_H_
diff --git a/submodules/libtgvoip/webrtc_dsp/rtc_base/event.cc b/submodules/libtgvoip/webrtc_dsp/rtc_base/event.cc
deleted file mode 100644
index 42c22a29cc..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/rtc_base/event.cc
+++ /dev/null
@@ -1,156 +0,0 @@
-/*
- *  Copyright 2004 The WebRTC Project Authors. All rights reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#include "rtc_base/event.h"
-
-#if defined(WEBRTC_WIN)
-#include <windows.h>
-#elif defined(WEBRTC_POSIX)
-#include <pthread.h>
-#include <sys/time.h>
-#include <time.h>
-#else
-#error "Must define either WEBRTC_WIN or WEBRTC_POSIX."
-#endif
-
-#include "rtc_base/checks.h"
-
-namespace rtc {
-
-Event::Event() : Event(false, false) {}
-
-#if defined(WEBRTC_WIN)
-
-Event::Event(bool manual_reset, bool initially_signaled) {
-  event_handle_ = ::CreateEvent(nullptr,  // Security attributes.
-                                manual_reset, initially_signaled,
-                                nullptr);  // Name.
-  RTC_CHECK(event_handle_);
-}
-
-Event::~Event() {
-  CloseHandle(event_handle_);
-}
-
-void Event::Set() {
-  SetEvent(event_handle_);
-}
-
-void Event::Reset() {
-  ResetEvent(event_handle_);
-}
-
-bool Event::Wait(int milliseconds) {
-  DWORD ms = (milliseconds == kForever) ? INFINITE : milliseconds;
-  return (WaitForSingleObject(event_handle_, ms) == WAIT_OBJECT_0);
-}
-
-#elif defined(WEBRTC_POSIX)
-
-// On MacOS, clock_gettime is available from version 10.12, and on
-// iOS, from version 10.0. So we can't use it yet.
-#if defined(WEBRTC_MAC) || defined(WEBRTC_IOS)
-#define USE_CLOCK_GETTIME 0
-#define USE_PTHREAD_COND_TIMEDWAIT_MONOTONIC_NP 0
-// On Android, pthread_condattr_setclock is available from version 21. By
-// default, we target a new enough version for 64-bit platforms but not for
-// 32-bit platforms. For older versions, use
-// pthread_cond_timedwait_monotonic_np.
-#elif defined(WEBRTC_ANDROID) && (__ANDROID_API__ < 21)
-#define USE_CLOCK_GETTIME 1
-#define USE_PTHREAD_COND_TIMEDWAIT_MONOTONIC_NP 1
-#else
-#define USE_CLOCK_GETTIME 1
-#define USE_PTHREAD_COND_TIMEDWAIT_MONOTONIC_NP 0
-#endif
-
-Event::Event(bool manual_reset, bool initially_signaled)
-    : is_manual_reset_(manual_reset), event_status_(initially_signaled) {
-  RTC_CHECK(pthread_mutex_init(&event_mutex_, nullptr) == 0);
-  pthread_condattr_t cond_attr;
-  RTC_CHECK(pthread_condattr_init(&cond_attr) == 0);
-#if USE_CLOCK_GETTIME && !USE_PTHREAD_COND_TIMEDWAIT_MONOTONIC_NP
-  RTC_CHECK(pthread_condattr_setclock(&cond_attr, CLOCK_MONOTONIC) == 0);
-#endif
-  RTC_CHECK(pthread_cond_init(&event_cond_, &cond_attr) == 0);
-  pthread_condattr_destroy(&cond_attr);
-}
-
-Event::~Event() {
-  pthread_mutex_destroy(&event_mutex_);
-  pthread_cond_destroy(&event_cond_);
-}
-
-void Event::Set() {
-  pthread_mutex_lock(&event_mutex_);
-  event_status_ = true;
-  pthread_cond_broadcast(&event_cond_);
-  pthread_mutex_unlock(&event_mutex_);
-}
-
-void Event::Reset() {
-  pthread_mutex_lock(&event_mutex_);
-  event_status_ = false;
-  pthread_mutex_unlock(&event_mutex_);
-}
-
-bool Event::Wait(int milliseconds) {
-  int error = 0;
-
-  struct timespec ts;
-  if (milliseconds != kForever) {
-#if USE_CLOCK_GETTIME
-    clock_gettime(CLOCK_MONOTONIC, &ts);
-#else
-    struct timeval tv;
-    gettimeofday(&tv, nullptr);
-    ts.tv_sec = tv.tv_sec;
-    ts.tv_nsec = tv.tv_usec * 1000;
-#endif
-
-    ts.tv_sec += (milliseconds / 1000);
-    ts.tv_nsec += (milliseconds % 1000) * 1000000;
-
-    // Handle overflow.
-    if (ts.tv_nsec >= 1000000000) {
-      ts.tv_sec++;
-      ts.tv_nsec -= 1000000000;
-    }
-  }
-
-  pthread_mutex_lock(&event_mutex_);
-  if (milliseconds != kForever) {
-    while (!event_status_ && error == 0) {
-#if USE_PTHREAD_COND_TIMEDWAIT_MONOTONIC_NP
-      error =
-          pthread_cond_timedwait_monotonic_np(&event_cond_, &event_mutex_, &ts);
-#else
-      error = pthread_cond_timedwait(&event_cond_, &event_mutex_, &ts);
-#endif
-    }
-  } else {
-    while (!event_status_ && error == 0)
-      error = pthread_cond_wait(&event_cond_, &event_mutex_);
-  }
-
-  // NOTE(liulk): Exactly one thread will auto-reset this event. All
-  // the other threads will think it's unsignaled.  This seems to be
-  // consistent with auto-reset events in WEBRTC_WIN
-  if (error == 0 && !is_manual_reset_)
-    event_status_ = false;
-
-  pthread_mutex_unlock(&event_mutex_);
-
-  return (error == 0);
-}
-
-#endif
-
-}  // namespace rtc
diff --git a/submodules/libtgvoip/webrtc_dsp/rtc_base/event.h b/submodules/libtgvoip/webrtc_dsp/rtc_base/event.h
deleted file mode 100755
index 763b31c0e3..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/rtc_base/event.h
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- *  Copyright 2004 The WebRTC Project Authors. All rights reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#ifndef RTC_BASE_EVENT_H_
-#define RTC_BASE_EVENT_H_
-
-#if defined(WEBRTC_WIN)
-#include <WinSock2.h>
-#include <windows.h>
-#elif defined(WEBRTC_POSIX)
-#include <pthread.h>
-#else
-#error "Must define either WEBRTC_WIN or WEBRTC_POSIX."
-#endif
-
-namespace rtc {
-
-class Event {
- public:
-  static const int kForever = -1;
-
-  Event();
-  Event(bool manual_reset, bool initially_signaled);
-  Event(const Event&) = delete;
-  Event& operator=(const Event&) = delete;
-  ~Event();
-
-  void Set();
-  void Reset();
-
-  // Wait for the event to become signaled, for the specified number of
-  // |milliseconds|.  To wait indefinetly, pass kForever.
-  bool Wait(int milliseconds);
-
- private:
-#if defined(WEBRTC_WIN)
-  HANDLE event_handle_;
-#elif defined(WEBRTC_POSIX)
-  pthread_mutex_t event_mutex_;
-  pthread_cond_t event_cond_;
-  const bool is_manual_reset_;
-  bool event_status_;
-#endif
-};
-
-// This class is provided for compatibility with Chromium.
-// The rtc::Event implementation is overriden inside of Chromium for the
-// purposes of detecting when threads are blocked that shouldn't be as well as
-// to use the more accurate event implementation that's there than is provided
-// by default on some platforms (e.g. Windows).
-// When building with standalone WebRTC, this class is a noop.
-// For further information, please see the ScopedAllowBaseSyncPrimitives class
-// in Chromium.
-class ScopedAllowBaseSyncPrimitives {
- public:
-  ScopedAllowBaseSyncPrimitives() {}
-  ~ScopedAllowBaseSyncPrimitives() {}
-};
-
-}  // namespace rtc
-
-#endif  // RTC_BASE_EVENT_H_
diff --git a/submodules/libtgvoip/webrtc_dsp/rtc_base/event_tracer.cc b/submodules/libtgvoip/webrtc_dsp/rtc_base/event_tracer.cc
deleted file mode 100644
index af88c9ddd4..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/rtc_base/event_tracer.cc
+++ /dev/null
@@ -1,411 +0,0 @@
-/*
- *  Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-#include "rtc_base/event_tracer.h"
-
-#include <inttypes.h>
-#include <stdint.h>
-#include <stdio.h>
-#include <string.h>
-#include <string>
-#include <vector>
-
-#include "rtc_base/atomicops.h"
-#include "rtc_base/checks.h"
-#include "rtc_base/criticalsection.h"
-#include "rtc_base/event.h"
-#include "rtc_base/logging.h"
-#include "rtc_base/platform_thread.h"
-#include "rtc_base/platform_thread_types.h"
-#include "rtc_base/thread_annotations.h"
-#include "rtc_base/thread_checker.h"
-#include "rtc_base/timeutils.h"
-#include "rtc_base/trace_event.h"
-
-// This is a guesstimate that should be enough in most cases.
-static const size_t kEventLoggerArgsStrBufferInitialSize = 256;
-static const size_t kTraceArgBufferLength = 32;
-
-namespace webrtc {
-
-namespace {
-
-GetCategoryEnabledPtr g_get_category_enabled_ptr = nullptr;
-AddTraceEventPtr g_add_trace_event_ptr = nullptr;
-
-}  // namespace
-
-void SetupEventTracer(GetCategoryEnabledPtr get_category_enabled_ptr,
-                      AddTraceEventPtr add_trace_event_ptr) {
-  g_get_category_enabled_ptr = get_category_enabled_ptr;
-  g_add_trace_event_ptr = add_trace_event_ptr;
-}
-
-const unsigned char* EventTracer::GetCategoryEnabled(const char* name) {
-  if (g_get_category_enabled_ptr)
-    return g_get_category_enabled_ptr(name);
-
-  // A string with null terminator means category is disabled.
-  return reinterpret_cast<const unsigned char*>("\0");
-}
-
-// Arguments to this function (phase, etc.) are as defined in
-// webrtc/rtc_base/trace_event.h.
-void EventTracer::AddTraceEvent(char phase,
-                                const unsigned char* category_enabled,
-                                const char* name,
-                                unsigned long long id,
-                                int num_args,
-                                const char** arg_names,
-                                const unsigned char* arg_types,
-                                const unsigned long long* arg_values,
-                                unsigned char flags) {
-  if (g_add_trace_event_ptr) {
-    g_add_trace_event_ptr(phase, category_enabled, name, id, num_args,
-                          arg_names, arg_types, arg_values, flags);
-  }
-}
-
-}  // namespace webrtc
-
-namespace rtc {
-namespace tracing {
-namespace {
-
-static void EventTracingThreadFunc(void* params);
-
-// Atomic-int fast path for avoiding logging when disabled.
-static volatile int g_event_logging_active = 0;
-
-// TODO(pbos): Log metadata for all threads, etc.
-class EventLogger final {
- public:
-  EventLogger()
-      : logging_thread_(EventTracingThreadFunc,
-                        this,
-                        "EventTracingThread",
-                        kLowPriority) {}
-  ~EventLogger() { RTC_DCHECK(thread_checker_.CalledOnValidThread()); }
-
-  void AddTraceEvent(const char* name,
-                     const unsigned char* category_enabled,
-                     char phase,
-                     int num_args,
-                     const char** arg_names,
-                     const unsigned char* arg_types,
-                     const unsigned long long* arg_values,
-                     uint64_t timestamp,
-                     int pid,
-                     rtc::PlatformThreadId thread_id) {
-    std::vector<TraceArg> args(num_args);
-    for (int i = 0; i < num_args; ++i) {
-      TraceArg& arg = args[i];
-      arg.name = arg_names[i];
-      arg.type = arg_types[i];
-      arg.value.as_uint = arg_values[i];
-
-      // Value is a pointer to a temporary string, so we have to make a copy.
-      if (arg.type == TRACE_VALUE_TYPE_COPY_STRING) {
-        // Space for the string and for the terminating null character.
-        size_t str_length = strlen(arg.value.as_string) + 1;
-        char* str_copy = new char[str_length];
-        memcpy(str_copy, arg.value.as_string, str_length);
-        arg.value.as_string = str_copy;
-      }
-    }
-    rtc::CritScope lock(&crit_);
-    trace_events_.push_back(
-        {name, category_enabled, phase, args, timestamp, 1, thread_id});
-  }
-
-  // The TraceEvent format is documented here:
-  // https://docs.google.com/document/d/1CvAClvFfyA5R-PhYUmn5OOQtYMH4h6I0nSsKchNAySU/preview
-  void Log() {
-    RTC_DCHECK(output_file_);
-    static const int kLoggingIntervalMs = 100;
-    fprintf(output_file_, "{ \"traceEvents\": [\n");
-    bool has_logged_event = false;
-    while (true) {
-      bool shutting_down = shutdown_event_.Wait(kLoggingIntervalMs);
-      std::vector<TraceEvent> events;
-      {
-        rtc::CritScope lock(&crit_);
-        trace_events_.swap(events);
-      }
-      std::string args_str;
-      args_str.reserve(kEventLoggerArgsStrBufferInitialSize);
-      for (TraceEvent& e : events) {
-        args_str.clear();
-        if (!e.args.empty()) {
-          args_str += ", \"args\": {";
-          bool is_first_argument = true;
-          for (TraceArg& arg : e.args) {
-            if (!is_first_argument)
-              args_str += ",";
-            is_first_argument = false;
-            args_str += " \"";
-            args_str += arg.name;
-            args_str += "\": ";
-            args_str += TraceArgValueAsString(arg);
-
-            // Delete our copy of the string.
-            if (arg.type == TRACE_VALUE_TYPE_COPY_STRING) {
-              delete[] arg.value.as_string;
-              arg.value.as_string = nullptr;
-            }
-          }
-          args_str += " }";
-        }
-        fprintf(output_file_,
-                "%s{ \"name\": \"%s\""
-                ", \"cat\": \"%s\""
-                ", \"ph\": \"%c\""
-                ", \"ts\": %" PRIu64
-                ", \"pid\": %d"
-#if defined(WEBRTC_WIN)
-                ", \"tid\": %lu"
-#else
-                ", \"tid\": %d"
-#endif  // defined(WEBRTC_WIN)
-                "%s"
-                "}\n",
-                has_logged_event ? "," : " ", e.name, e.category_enabled,
-                e.phase, e.timestamp, e.pid, e.tid, args_str.c_str());
-        has_logged_event = true;
-      }
-      if (shutting_down)
-        break;
-    }
-    fprintf(output_file_, "]}\n");
-    if (output_file_owned_)
-      fclose(output_file_);
-    output_file_ = nullptr;
-  }
-
-  void Start(FILE* file, bool owned) {
-    RTC_DCHECK(thread_checker_.CalledOnValidThread());
-    RTC_DCHECK(file);
-    RTC_DCHECK(!output_file_);
-    output_file_ = file;
-    output_file_owned_ = owned;
-    {
-      rtc::CritScope lock(&crit_);
-      // Since the atomic fast-path for adding events to the queue can be
-      // bypassed while the logging thread is shutting down there may be some
-      // stale events in the queue, hence the vector needs to be cleared to not
-      // log events from a previous logging session (which may be days old).
-      trace_events_.clear();
-    }
-    // Enable event logging (fast-path). This should be disabled since starting
-    // shouldn't be done twice.
-    RTC_CHECK_EQ(0,
-                 rtc::AtomicOps::CompareAndSwap(&g_event_logging_active, 0, 1));
-
-    // Finally start, everything should be set up now.
-    logging_thread_.Start();
-    TRACE_EVENT_INSTANT0("webrtc", "EventLogger::Start");
-  }
-
-  void Stop() {
-    RTC_DCHECK(thread_checker_.CalledOnValidThread());
-    TRACE_EVENT_INSTANT0("webrtc", "EventLogger::Stop");
-    // Try to stop. Abort if we're not currently logging.
-    if (rtc::AtomicOps::CompareAndSwap(&g_event_logging_active, 1, 0) == 0)
-      return;
-
-    // Wake up logging thread to finish writing.
-    shutdown_event_.Set();
-    // Join the logging thread.
-    logging_thread_.Stop();
-  }
-
- private:
-  struct TraceArg {
-    const char* name;
-    unsigned char type;
-    // Copied from webrtc/rtc_base/trace_event.h TraceValueUnion.
-    union TraceArgValue {
-      bool as_bool;
-      unsigned long long as_uint;
-      long long as_int;
-      double as_double;
-      const void* as_pointer;
-      const char* as_string;
-    } value;
-
-    // Assert that the size of the union is equal to the size of the as_uint
-    // field since we are assigning to arbitrary types using it.
-    static_assert(sizeof(TraceArgValue) == sizeof(unsigned long long),
-                  "Size of TraceArg value union is not equal to the size of "
-                  "the uint field of that union.");
-  };
-
-  struct TraceEvent {
-    const char* name;
-    const unsigned char* category_enabled;
-    char phase;
-    std::vector<TraceArg> args;
-    uint64_t timestamp;
-    int pid;
-    rtc::PlatformThreadId tid;
-  };
-
-  static std::string TraceArgValueAsString(TraceArg arg) {
-    std::string output;
-
-    if (arg.type == TRACE_VALUE_TYPE_STRING ||
-        arg.type == TRACE_VALUE_TYPE_COPY_STRING) {
-      // Space for every character to be an espaced character + two for
-      // quatation marks.
-      output.reserve(strlen(arg.value.as_string) * 2 + 2);
-      output += '\"';
-      const char* c = arg.value.as_string;
-      do {
-        if (*c == '"' || *c == '\\') {
-          output += '\\';
-          output += *c;
-        } else {
-          output += *c;
-        }
-      } while (*++c);
-      output += '\"';
-    } else {
-      output.resize(kTraceArgBufferLength);
-      size_t print_length = 0;
-      switch (arg.type) {
-        case TRACE_VALUE_TYPE_BOOL:
-          if (arg.value.as_bool) {
-            strcpy(&output[0], "true");
-            print_length = 4;
-          } else {
-            strcpy(&output[0], "false");
-            print_length = 5;
-          }
-          break;
-        case TRACE_VALUE_TYPE_UINT:
-          print_length = snprintf(&output[0], kTraceArgBufferLength, "%llu",
-                                  arg.value.as_uint);
-          break;
-        case TRACE_VALUE_TYPE_INT:
-          print_length = snprintf(&output[0], kTraceArgBufferLength, "%lld",
-                                  arg.value.as_int);
-          break;
-        case TRACE_VALUE_TYPE_DOUBLE:
-          print_length = snprintf(&output[0], kTraceArgBufferLength, "%f",
-                                  arg.value.as_double);
-          break;
-        case TRACE_VALUE_TYPE_POINTER:
-          print_length = snprintf(&output[0], kTraceArgBufferLength, "\"%p\"",
-                                  arg.value.as_pointer);
-          break;
-      }
-      size_t output_length = print_length < kTraceArgBufferLength
-                                 ? print_length
-                                 : kTraceArgBufferLength - 1;
-      // This will hopefully be very close to nop. On most implementations, it
-      // just writes null byte and sets the length field of the string.
-      output.resize(output_length);
-    }
-
-    return output;
-  }
-
-  rtc::CriticalSection crit_;
-  std::vector<TraceEvent> trace_events_ RTC_GUARDED_BY(crit_);
-  rtc::PlatformThread logging_thread_;
-  rtc::Event shutdown_event_;
-  rtc::ThreadChecker thread_checker_;
-  FILE* output_file_ = nullptr;
-  bool output_file_owned_ = false;
-};
-
-static void EventTracingThreadFunc(void* params) {
-  static_cast<EventLogger*>(params)->Log();
-}
-
-static EventLogger* volatile g_event_logger = nullptr;
-static const char* const kDisabledTracePrefix = TRACE_DISABLED_BY_DEFAULT("");
-const unsigned char* InternalGetCategoryEnabled(const char* name) {
-  const char* prefix_ptr = &kDisabledTracePrefix[0];
-  const char* name_ptr = name;
-  // Check whether name contains the default-disabled prefix.
-  while (*prefix_ptr == *name_ptr && *prefix_ptr != '\0') {
-    ++prefix_ptr;
-    ++name_ptr;
-  }
-  return reinterpret_cast<const unsigned char*>(*prefix_ptr == '\0' ? ""
-                                                                    : name);
-}
-
-void InternalAddTraceEvent(char phase,
-                           const unsigned char* category_enabled,
-                           const char* name,
-                           unsigned long long id,
-                           int num_args,
-                           const char** arg_names,
-                           const unsigned char* arg_types,
-                           const unsigned long long* arg_values,
-                           unsigned char flags) {
-  // Fast path for when event tracing is inactive.
-  if (rtc::AtomicOps::AcquireLoad(&g_event_logging_active) == 0)
-    return;
-
-  g_event_logger->AddTraceEvent(name, category_enabled, phase, num_args,
-                                arg_names, arg_types, arg_values,
-                                rtc::TimeMicros(), 1, rtc::CurrentThreadId());
-}
-
-}  // namespace
-
-void SetupInternalTracer() {
-  RTC_CHECK(rtc::AtomicOps::CompareAndSwapPtr(
-                &g_event_logger, static_cast<EventLogger*>(nullptr),
-                new EventLogger()) == nullptr);
-  webrtc::SetupEventTracer(InternalGetCategoryEnabled, InternalAddTraceEvent);
-}
-
-void StartInternalCaptureToFile(FILE* file) {
-  if (g_event_logger) {
-    g_event_logger->Start(file, false);
-  }
-}
-
-bool StartInternalCapture(const char* filename) {
-  if (!g_event_logger)
-    return false;
-
-  FILE* file = fopen(filename, "w");
-  if (!file) {
-    RTC_LOG(LS_ERROR) << "Failed to open trace file '" << filename
-                      << "' for writing.";
-    return false;
-  }
-  g_event_logger->Start(file, true);
-  return true;
-}
-
-void StopInternalCapture() {
-  if (g_event_logger) {
-    g_event_logger->Stop();
-  }
-}
-
-void ShutdownInternalTracer() {
-  StopInternalCapture();
-  EventLogger* old_logger = rtc::AtomicOps::AcquireLoadPtr(&g_event_logger);
-  RTC_DCHECK(old_logger);
-  RTC_CHECK(rtc::AtomicOps::CompareAndSwapPtr(
-                &g_event_logger, old_logger,
-                static_cast<EventLogger*>(nullptr)) == old_logger);
-  delete old_logger;
-  webrtc::SetupEventTracer(nullptr, nullptr);
-}
-
-}  // namespace tracing
-}  // namespace rtc
diff --git a/submodules/libtgvoip/webrtc_dsp/rtc_base/event_tracer.h b/submodules/libtgvoip/webrtc_dsp/rtc_base/event_tracer.h
deleted file mode 100644
index 4bbda579bc..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/rtc_base/event_tracer.h
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
- *  Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-// This file defines the interface for event tracing in WebRTC.
-//
-// Event log handlers are set through SetupEventTracer(). User of this API will
-// provide two function pointers to handle event tracing calls.
-//
-// * GetCategoryEnabledPtr
-//   Event tracing system calls this function to determine if a particular
-//   event category is enabled.
-//
-// * AddTraceEventPtr
-//   Adds a tracing event. It is the user's responsibility to log the data
-//   provided.
-//
-// Parameters for the above two functions are described in trace_event.h.
-
-#ifndef RTC_BASE_EVENT_TRACER_H_
-#define RTC_BASE_EVENT_TRACER_H_
-
-#include <stdio.h>
-
-namespace webrtc {
-
-typedef const unsigned char* (*GetCategoryEnabledPtr)(const char* name);
-typedef void (*AddTraceEventPtr)(char phase,
-                                 const unsigned char* category_enabled,
-                                 const char* name,
-                                 unsigned long long id,
-                                 int num_args,
-                                 const char** arg_names,
-                                 const unsigned char* arg_types,
-                                 const unsigned long long* arg_values,
-                                 unsigned char flags);
-
-// User of WebRTC can call this method to setup event tracing.
-//
-// This method must be called before any WebRTC methods. Functions
-// provided should be thread-safe.
-void SetupEventTracer(GetCategoryEnabledPtr get_category_enabled_ptr,
-                      AddTraceEventPtr add_trace_event_ptr);
-
-// This class defines interface for the event tracing system to call
-// internally. Do not call these methods directly.
-class EventTracer {
- public:
-  static const unsigned char* GetCategoryEnabled(const char* name);
-
-  static void AddTraceEvent(char phase,
-                            const unsigned char* category_enabled,
-                            const char* name,
-                            unsigned long long id,
-                            int num_args,
-                            const char** arg_names,
-                            const unsigned char* arg_types,
-                            const unsigned long long* arg_values,
-                            unsigned char flags);
-};
-
-}  // namespace webrtc
-
-namespace rtc {
-namespace tracing {
-// Set up internal event tracer.
-void SetupInternalTracer();
-bool StartInternalCapture(const char* filename);
-void StartInternalCaptureToFile(FILE* file);
-void StopInternalCapture();
-// Make sure we run this, this will tear down the internal tracing.
-void ShutdownInternalTracer();
-}  // namespace tracing
-}  // namespace rtc
-
-#endif  // RTC_BASE_EVENT_TRACER_H_
diff --git a/submodules/libtgvoip/webrtc_dsp/rtc_base/function_view.h b/submodules/libtgvoip/webrtc_dsp/rtc_base/function_view.h
deleted file mode 100644
index 91ab88e4fa..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/rtc_base/function_view.h
+++ /dev/null
@@ -1,130 +0,0 @@
-/*
- *  Copyright 2016 The WebRTC Project Authors. All rights reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#ifndef RTC_BASE_FUNCTION_VIEW_H_
-#define RTC_BASE_FUNCTION_VIEW_H_
-
-#include <type_traits>
-#include <utility>
-
-#include "rtc_base/checks.h"
-
-// Just like std::function, FunctionView will wrap any callable and hide its
-// actual type, exposing only its signature. But unlike std::function,
-// FunctionView doesn't own its callable---it just points to it. Thus, it's a
-// good choice mainly as a function argument when the callable argument will
-// not be called again once the function has returned.
-//
-// Its constructors are implicit, so that callers won't have to convert lambdas
-// and other callables to FunctionView<Blah(Blah, Blah)> explicitly. This is
-// safe because FunctionView is only a reference to the real callable.
-//
-// Example use:
-//
-//   void SomeFunction(rtc::FunctionView<int(int)> index_transform);
-//   ...
-//   SomeFunction([](int i) { return 2 * i + 1; });
-//
-// Note: FunctionView is tiny (essentially just two pointers) and trivially
-// copyable, so it's probably cheaper to pass it by value than by const
-// reference.
-
-namespace rtc {
-
-template <typename T>
-class FunctionView;  // Undefined.
-
-template <typename RetT, typename... ArgT>
-class FunctionView<RetT(ArgT...)> final {
- public:
-  // Constructor for lambdas and other callables; it accepts every type of
-  // argument except those noted in its enable_if call.
-  template <
-      typename F,
-      typename std::enable_if<
-          // Not for function pointers; we have another constructor for that
-          // below.
-          !std::is_function<typename std::remove_pointer<
-              typename std::remove_reference<F>::type>::type>::value &&
-
-          // Not for nullptr; we have another constructor for that below.
-          !std::is_same<std::nullptr_t,
-                        typename std::remove_cv<F>::type>::value &&
-
-          // Not for FunctionView objects; we have another constructor for that
-          // (the implicitly declared copy constructor).
-          !std::is_same<FunctionView,
-                        typename std::remove_cv<typename std::remove_reference<
-                            F>::type>::type>::value>::type* = nullptr>
-  FunctionView(F&& f)
-      : call_(CallVoidPtr<typename std::remove_reference<F>::type>) {
-    f_.void_ptr = &f;
-  }
-
-  // Constructor that accepts function pointers. If the argument is null, the
-  // result is an empty FunctionView.
-  template <
-      typename F,
-      typename std::enable_if<std::is_function<typename std::remove_pointer<
-          typename std::remove_reference<F>::type>::type>::value>::type* =
-          nullptr>
-  FunctionView(F&& f)
-      : call_(f ? CallFunPtr<typename std::remove_pointer<F>::type> : nullptr) {
-    f_.fun_ptr = reinterpret_cast<void (*)()>(f);
-  }
-
-  // Constructor that accepts nullptr. It creates an empty FunctionView.
-  template <typename F,
-            typename std::enable_if<std::is_same<
-                std::nullptr_t,
-                typename std::remove_cv<F>::type>::value>::type* = nullptr>
-  FunctionView(F&& f) : call_(nullptr) {}
-
-  // Default constructor. Creates an empty FunctionView.
-  FunctionView() : call_(nullptr) {}
-
-  RetT operator()(ArgT... args) const {
-    RTC_DCHECK(call_);
-    return call_(f_, std::forward<ArgT>(args)...);
-  }
-
-  // Returns true if we have a function, false if we don't (i.e., we're null).
-  explicit operator bool() const { return !!call_; }
-
- private:
-  union VoidUnion {
-    void* void_ptr;
-    void (*fun_ptr)();
-  };
-
-  template <typename F>
-  static RetT CallVoidPtr(VoidUnion vu, ArgT... args) {
-    return (*static_cast<F*>(vu.void_ptr))(std::forward<ArgT>(args)...);
-  }
-  template <typename F>
-  static RetT CallFunPtr(VoidUnion vu, ArgT... args) {
-    return (reinterpret_cast<typename std::add_pointer<F>::type>(vu.fun_ptr))(
-        std::forward<ArgT>(args)...);
-  }
-
-  // A pointer to the callable thing, with type information erased. It's a
-  // union because we have to use separate types depending on if the callable
-  // thing is a function pointer or something else.
-  VoidUnion f_;
-
-  // Pointer to a dispatch function that knows the type of the callable thing
-  // that's stored in f_, and how to call it. A FunctionView object is empty
-  // (null) iff call_ is null.
-  RetT (*call_)(VoidUnion, ArgT...);
-};
-
-}  // namespace rtc
-
-#endif  // RTC_BASE_FUNCTION_VIEW_H_
diff --git a/submodules/libtgvoip/webrtc_dsp/rtc_base/gtest_prod_util.h b/submodules/libtgvoip/webrtc_dsp/rtc_base/gtest_prod_util.h
deleted file mode 100644
index 0661cd7bd9..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/rtc_base/gtest_prod_util.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- *  Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#ifndef RTC_BASE_GTEST_PROD_UTIL_H_
-#define RTC_BASE_GTEST_PROD_UTIL_H_
-
-// Define our own version of FRIEND_TEST here rather than including
-// gtest_prod.h to avoid depending on any part of GTest in production code.
-#define FRIEND_TEST_WEBRTC(test_case_name, test_name) \
-  friend class test_case_name##_##test_name##_Test
-
-// This file is a plain copy of Chromium's base/gtest_prod_util.h.
-//
-// This is a wrapper for gtest's FRIEND_TEST macro that friends
-// test with all possible prefixes. This is very helpful when changing the test
-// prefix, because the friend declarations don't need to be updated.
-//
-// Example usage:
-//
-// class MyClass {
-//  private:
-//   void MyMethod();
-//   FRIEND_TEST_ALL_PREFIXES(MyClassTest, MyMethod);
-// };
-#define FRIEND_TEST_ALL_PREFIXES(test_case_name, test_name) \
-  FRIEND_TEST_WEBRTC(test_case_name, test_name);            \
-  FRIEND_TEST_WEBRTC(test_case_name, DISABLED_##test_name); \
-  FRIEND_TEST_WEBRTC(test_case_name, FLAKY_##test_name);    \
-  FRIEND_TEST_WEBRTC(test_case_name, FAILS_##test_name)
-
-#endif  // RTC_BASE_GTEST_PROD_UTIL_H_
diff --git a/submodules/libtgvoip/webrtc_dsp/rtc_base/ignore_wundef.h b/submodules/libtgvoip/webrtc_dsp/rtc_base/ignore_wundef.h
deleted file mode 100644
index 1564096464..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/rtc_base/ignore_wundef.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- *  Copyright (c) 2016 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#ifndef RTC_BASE_IGNORE_WUNDEF_H_
-#define RTC_BASE_IGNORE_WUNDEF_H_
-
-// If a header file uses #if on possibly undefined macros (and it's for some
-// reason not possible to just fix the header file), include it like this:
-//
-//   RTC_PUSH_IGNORING_WUNDEF()
-//   #include "misbehaving_header.h"
-//   RTC_POP_IGNORING_WUNDEF()
-//
-// This will cause the compiler to not emit -Wundef warnings for that file.
-
-#ifdef __clang__
-#define RTC_PUSH_IGNORING_WUNDEF() \
-  _Pragma("clang diagnostic push") \
-      _Pragma("clang diagnostic ignored \"-Wundef\"")
-#define RTC_POP_IGNORING_WUNDEF() _Pragma("clang diagnostic pop")
-#else
-#define RTC_PUSH_IGNORING_WUNDEF()
-#define RTC_POP_IGNORING_WUNDEF()
-#endif  // __clang__
-
-#endif  // RTC_BASE_IGNORE_WUNDEF_H_
diff --git a/submodules/libtgvoip/webrtc_dsp/rtc_base/logging.h b/submodules/libtgvoip/webrtc_dsp/rtc_base/logging.h
deleted file mode 100644
index c15c37af0a..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/rtc_base/logging.h
+++ /dev/null
@@ -1,617 +0,0 @@
-/*
- *  Copyright 2004 The WebRTC Project Authors. All rights reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-// RTC_LOG(...) an ostream target that can be used to send formatted
-// output to a variety of logging targets, such as debugger console, stderr,
-// or any LogSink.
-// The severity level passed as the first argument to the logging
-// functions is used as a filter, to limit the verbosity of the logging.
-// Static members of LogMessage documented below are used to control the
-// verbosity and target of the output.
-// There are several variations on the RTC_LOG macro which facilitate logging
-// of common error conditions, detailed below.
-
-// RTC_LOG(sev) logs the given stream at severity "sev", which must be a
-//     compile-time constant of the LoggingSeverity type, without the namespace
-//     prefix.
-// RTC_LOG_V(sev) Like RTC_LOG(), but sev is a run-time variable of the
-//     LoggingSeverity type (basically, it just doesn't prepend the namespace).
-// RTC_LOG_F(sev) Like RTC_LOG(), but includes the name of the current function.
-// RTC_LOG_T(sev) Like RTC_LOG(), but includes the this pointer.
-// RTC_LOG_T_F(sev) Like RTC_LOG_F(), but includes the this pointer.
-// RTC_LOG_GLE(sev [, mod]) attempt to add a string description of the
-//     HRESULT returned by GetLastError.
-// RTC_LOG_ERRNO(sev) attempts to add a string description of an errno-derived
-//     error. errno and associated facilities exist on both Windows and POSIX,
-//     but on Windows they only apply to the C/C++ runtime.
-// RTC_LOG_ERR(sev) is an alias for the platform's normal error system, i.e.
-//     _GLE on Windows and _ERRNO on POSIX.
-// (The above three also all have _EX versions that let you specify the error
-// code, rather than using the last one.)
-// RTC_LOG_E(sev, ctx, err, ...) logs a detailed error interpreted using the
-//     specified context.
-// RTC_LOG_CHECK_LEVEL(sev) (and RTC_LOG_CHECK_LEVEL_V(sev)) can be used as a
-//     test before performing expensive or sensitive operations whose sole
-//     purpose is to output logging data at the desired level.
-
-#ifndef RTC_BASE_LOGGING_H_
-#define RTC_BASE_LOGGING_H_
-
-#include <errno.h>
-
-#include <list>
-#include <sstream>  // no-presubmit-check TODO(webrtc:8982)
-#include <string>
-#include <utility>
-
-#include "absl/strings/string_view.h"
-#include "rtc_base/constructormagic.h"
-#include "rtc_base/deprecation.h"
-#include "rtc_base/strings/string_builder.h"
-#include "rtc_base/system/inline.h"
-
-#if defined(WEBRTC_MAC) && !defined(WEBRTC_IOS)
-#include "rtc_base/logging_mac.h"
-#endif  // WEBRTC_MAC
-
-#if !defined(NDEBUG) || defined(DLOG_ALWAYS_ON)
-#define RTC_DLOG_IS_ON 1
-#else
-#define RTC_DLOG_IS_ON 0
-#endif
-
-namespace rtc {
-
-//////////////////////////////////////////////////////////////////////
-
-// Note that the non-standard LoggingSeverity aliases exist because they are
-// still in broad use.  The meanings of the levels are:
-//  LS_SENSITIVE: Information which should only be logged with the consent
-//   of the user, due to privacy concerns.
-//  LS_VERBOSE: This level is for data which we do not want to appear in the
-//   normal debug log, but should appear in diagnostic logs.
-//  LS_INFO: Chatty level used in debugging for all sorts of things, the default
-//   in debug builds.
-//  LS_WARNING: Something that may warrant investigation.
-//  LS_ERROR: Something that should not have occurred.
-//  LS_NONE: Don't log.
-enum LoggingSeverity {
-  LS_SENSITIVE,
-  LS_VERBOSE,
-  LS_INFO,
-  LS_WARNING,
-  LS_ERROR,
-  LS_NONE,
-  INFO = LS_INFO,
-  WARNING = LS_WARNING,
-  LERROR = LS_ERROR
-};
-
-// LogErrorContext assists in interpreting the meaning of an error value.
-enum LogErrorContext {
-  ERRCTX_NONE,
-  ERRCTX_ERRNO,     // System-local errno
-  ERRCTX_HRESULT,   // Windows HRESULT
-  ERRCTX_OSSTATUS,  // MacOS OSStatus
-
-  // Abbreviations for LOG_E macro
-  ERRCTX_EN = ERRCTX_ERRNO,     // LOG_E(sev, EN, x)
-  ERRCTX_HR = ERRCTX_HRESULT,   // LOG_E(sev, HR, x)
-  ERRCTX_OS = ERRCTX_OSSTATUS,  // LOG_E(sev, OS, x)
-};
-
-// Virtual sink interface that can receive log messages.
-class LogSink {
- public:
-  LogSink() {}
-  virtual ~LogSink() {}
-  virtual void OnLogMessage(const std::string& msg,
-                            LoggingSeverity severity,
-                            const char* tag);
-  virtual void OnLogMessage(const std::string& message,
-                            LoggingSeverity severity);
-  virtual void OnLogMessage(const std::string& message) = 0;
-};
-
-namespace webrtc_logging_impl {
-
-class LogMetadata {
- public:
-  LogMetadata(const char* file, int line, LoggingSeverity severity)
-      : file_(file),
-        line_and_sev_(static_cast<uint32_t>(line) << 3 | severity) {}
-  LogMetadata() = default;
-
-  const char* File() const { return file_; }
-  int Line() const { return line_and_sev_ >> 3; }
-  LoggingSeverity Severity() const {
-    return static_cast<LoggingSeverity>(line_and_sev_ & 0x7);
-  }
-
- private:
-  const char* file_;
-
-  // Line number and severity, the former in the most significant 29 bits, the
-  // latter in the least significant 3 bits. (This is an optimization; since
-  // both numbers are usually compile-time constants, this way we can load them
-  // both with a single instruction.)
-  uint32_t line_and_sev_;
-};
-static_assert(std::is_trivial<LogMetadata>::value, "");
-
-struct LogMetadataErr {
-  LogMetadata meta;
-  LogErrorContext err_ctx;
-  int err;
-};
-
-#ifdef WEBRTC_ANDROID
-struct LogMetadataTag {
-  LoggingSeverity severity;
-  const char* tag;
-};
-#endif
-
-enum class LogArgType : int8_t {
-  kEnd = 0,
-  kInt,
-  kLong,
-  kLongLong,
-  kUInt,
-  kULong,
-  kULongLong,
-  kDouble,
-  kLongDouble,
-  kCharP,
-  kStdString,
-  kStringView,
-  kVoidP,
-  kLogMetadata,
-  kLogMetadataErr,
-#ifdef WEBRTC_ANDROID
-  kLogMetadataTag,
-#endif
-};
-
-// Wrapper for log arguments. Only ever make values of this type with the
-// MakeVal() functions.
-template <LogArgType N, typename T>
-struct Val {
-  static constexpr LogArgType Type() { return N; }
-  T GetVal() const { return val; }
-  T val;
-};
-
-// TODO(bugs.webrtc.org/9278): Get rid of this specialization when callers
-// don't need it anymore. No in-tree caller does, but some external callers
-// still do.
-template <>
-struct Val<LogArgType::kStdString, std::string> {
-  static constexpr LogArgType Type() { return LogArgType::kStdString; }
-  const std::string* GetVal() const { return &val; }
-  std::string val;
-};
-
-inline Val<LogArgType::kInt, int> MakeVal(int x) {
-  return {x};
-}
-inline Val<LogArgType::kLong, long> MakeVal(long x) {
-  return {x};
-}
-inline Val<LogArgType::kLongLong, long long> MakeVal(long long x) {
-  return {x};
-}
-inline Val<LogArgType::kUInt, unsigned int> MakeVal(unsigned int x) {
-  return {x};
-}
-inline Val<LogArgType::kULong, unsigned long> MakeVal(unsigned long x) {
-  return {x};
-}
-inline Val<LogArgType::kULongLong, unsigned long long> MakeVal(
-    unsigned long long x) {
-  return {x};
-}
-
-inline Val<LogArgType::kDouble, double> MakeVal(double x) {
-  return {x};
-}
-inline Val<LogArgType::kLongDouble, long double> MakeVal(long double x) {
-  return {x};
-}
-
-inline Val<LogArgType::kCharP, const char*> MakeVal(const char* x) {
-  return {x};
-}
-inline Val<LogArgType::kStdString, const std::string*> MakeVal(
-    const std::string& x) {
-  return {&x};
-}
-inline Val<LogArgType::kStringView, const absl::string_view*> MakeVal(
-    const absl::string_view& x) {
-  return {&x};
-}
-
-inline Val<LogArgType::kVoidP, const void*> MakeVal(const void* x) {
-  return {x};
-}
-
-inline Val<LogArgType::kLogMetadata, LogMetadata> MakeVal(
-    const LogMetadata& x) {
-  return {x};
-}
-inline Val<LogArgType::kLogMetadataErr, LogMetadataErr> MakeVal(
-    const LogMetadataErr& x) {
-  return {x};
-}
-
-#ifdef WEBRTC_ANDROID
-inline Val<LogArgType::kLogMetadataTag, LogMetadataTag> MakeVal(
-    const LogMetadataTag& x) {
-  return {x};
-}
-#endif
-
-// Handle arbitrary types other than the above by falling back to stringstream.
-// TODO(bugs.webrtc.org/9278): Get rid of this overload when callers don't need
-// it anymore. No in-tree caller does, but some external callers still do.
-template <
-    typename T,
-    typename T1 =
-        typename std::remove_cv<typename std::remove_reference<T>::type>::type,
-    typename std::enable_if<
-        std::is_class<T1>::value && !std::is_same<T1, std::string>::value &&
-        !std::is_same<T1, LogMetadata>::value &&
-#ifdef WEBRTC_ANDROID
-        !std::is_same<T1, LogMetadataTag>::value &&
-#endif
-        !std::is_same<T1, LogMetadataErr>::value>::type* = nullptr>
-Val<LogArgType::kStdString, std::string> MakeVal(const T& x) {
-  std::ostringstream os;  // no-presubmit-check TODO(webrtc:8982)
-  os << x;
-  return {os.str()};
-}
-
-void Log(const LogArgType* fmt, ...);
-
-// Ephemeral type that represents the result of the logging << operator.
-template <typename... Ts>
-class LogStreamer;
-
-// Base case: Before the first << argument.
-template <>
-class LogStreamer<> final {
- public:
-  template <
-      typename U,
-      typename std::enable_if<std::is_arithmetic<U>::value>::type* = nullptr>
-  RTC_FORCE_INLINE LogStreamer<decltype(MakeVal(std::declval<U>()))> operator<<(
-      U arg) const {
-    return LogStreamer<decltype(MakeVal(std::declval<U>()))>(MakeVal(arg),
-                                                             this);
-  }
-
-  template <
-      typename U,
-      typename std::enable_if<!std::is_arithmetic<U>::value>::type* = nullptr>
-  RTC_FORCE_INLINE LogStreamer<decltype(MakeVal(std::declval<U>()))> operator<<(
-      const U& arg) const {
-    return LogStreamer<decltype(MakeVal(std::declval<U>()))>(MakeVal(arg),
-                                                             this);
-  }
-
-  template <typename... Us>
-  RTC_FORCE_INLINE static void Call(const Us&... args) {
-    static constexpr LogArgType t[] = {Us::Type()..., LogArgType::kEnd};
-    Log(t, args.GetVal()...);
-  }
-};
-
-// Inductive case: We've already seen at least one << argument. The most recent
-// one had type `T`, and the earlier ones had types `Ts`.
-template <typename T, typename... Ts>
-class LogStreamer<T, Ts...> final {
- public:
-  RTC_FORCE_INLINE LogStreamer(T arg, const LogStreamer<Ts...>* prior)
-      : arg_(arg), prior_(prior) {}
-
-  template <
-      typename U,
-      typename std::enable_if<std::is_arithmetic<U>::value>::type* = nullptr>
-  RTC_FORCE_INLINE LogStreamer<decltype(MakeVal(std::declval<U>())), T, Ts...>
-  operator<<(U arg) const {
-    return LogStreamer<decltype(MakeVal(std::declval<U>())), T, Ts...>(
-        MakeVal(arg), this);
-  }
-
-  template <
-      typename U,
-      typename std::enable_if<!std::is_arithmetic<U>::value>::type* = nullptr>
-  RTC_FORCE_INLINE LogStreamer<decltype(MakeVal(std::declval<U>())), T, Ts...>
-  operator<<(const U& arg) const {
-    return LogStreamer<decltype(MakeVal(std::declval<U>())), T, Ts...>(
-        MakeVal(arg), this);
-  }
-
-  template <typename... Us>
-  RTC_FORCE_INLINE void Call(const Us&... args) const {
-    prior_->Call(arg_, args...);
-  }
-
- private:
-  // The most recent argument.
-  T arg_;
-
-  // Earlier arguments.
-  const LogStreamer<Ts...>* prior_;
-};
-
-class LogCall final {
- public:
-  // This can be any binary operator with precedence lower than <<.
-  template <typename... Ts>
-  RTC_FORCE_INLINE void operator&(const LogStreamer<Ts...>& streamer) {
-    streamer.Call();
-  }
-};
-
-// TODO(bugs.webrtc.org/9278): Remove this once it's no longer used.
-struct LogMessageVoidify {
-  void operator&(std::ostream&) {}  // no-presubmit-check TODO(webrtc:8982)
-};
-
-}  // namespace webrtc_logging_impl
-
-// Direct use of this class is deprecated; please use the logging macros
-// instead.
-// TODO(bugs.webrtc.org/9278): Move this class to an unnamed namespace in the
-// .cc file.
-class LogMessage {
- public:
-  LogMessage(const char* file, int line, LoggingSeverity sev);
-
-  // Same as the above, but using a compile-time constant for the logging
-  // severity. This saves space at the call site, since passing an empty struct
-  // is generally the same as not passing an argument at all.
-  template <LoggingSeverity S>
-  RTC_NO_INLINE LogMessage(const char* file,
-                           int line,
-                           std::integral_constant<LoggingSeverity, S>)
-      : LogMessage(file, line, S) {}
-
-  LogMessage(const char* file,
-             int line,
-             LoggingSeverity sev,
-             LogErrorContext err_ctx,
-             int err);
-
-#if defined(WEBRTC_ANDROID)
-  LogMessage(const char* file, int line, LoggingSeverity sev, const char* tag);
-#endif
-
-  // DEPRECATED - DO NOT USE - PLEASE USE THE MACROS INSTEAD OF THE CLASS.
-  // Android code should use the 'const char*' version since tags are static
-  // and we want to avoid allocating a std::string copy per log line.
-  RTC_DEPRECATED
-  LogMessage(const char* file,
-             int line,
-             LoggingSeverity sev,
-             const std::string& tag);
-
-  ~LogMessage();
-
-  void AddTag(const char* tag);
-
-  rtc::StringBuilder& stream();
-
-  // Returns the time at which this function was called for the first time.
-  // The time will be used as the logging start time.
-  // If this is not called externally, the LogMessage ctor also calls it, in
-  // which case the logging start time will be the time of the first LogMessage
-  // instance is created.
-  static int64_t LogStartTime();
-
-  // Returns the wall clock equivalent of |LogStartTime|, in seconds from the
-  // epoch.
-  static uint32_t WallClockStartTime();
-
-  //  LogThreads: Display the thread identifier of the current thread
-  static void LogThreads(bool on = true);
-
-  //  LogTimestamps: Display the elapsed time of the program
-  static void LogTimestamps(bool on = true);
-
-  // These are the available logging channels
-  //  Debug: Debug console on Windows, otherwise stderr
-  static void LogToDebug(LoggingSeverity min_sev);
-  static LoggingSeverity GetLogToDebug();
-
-  // Sets whether logs will be directed to stderr in debug mode.
-  static void SetLogToStderr(bool log_to_stderr);
-
-  //  Stream: Any non-blocking stream interface.  LogMessage takes ownership of
-  //   the stream. Multiple streams may be specified by using AddLogToStream.
-  //   LogToStream is retained for backwards compatibility; when invoked, it
-  //   will discard any previously set streams and install the specified stream.
-  //   GetLogToStream gets the severity for the specified stream, of if none
-  //   is specified, the minimum stream severity.
-  //   RemoveLogToStream removes the specified stream, without destroying it.
-  static int GetLogToStream(LogSink* stream = nullptr);
-  static void AddLogToStream(LogSink* stream, LoggingSeverity min_sev);
-  static void RemoveLogToStream(LogSink* stream);
-
-  // Testing against MinLogSeverity allows code to avoid potentially expensive
-  // logging operations by pre-checking the logging level.
-  static int GetMinLogSeverity();
-
-  // Parses the provided parameter stream to configure the options above.
-  // Useful for configuring logging from the command line.
-  static void ConfigureLogging(const char* params);
-
-  // Checks the current global debug severity and if the |streams_| collection
-  // is empty. If |severity| is smaller than the global severity and if the
-  // |streams_| collection is empty, the LogMessage will be considered a noop
-  // LogMessage.
-  static bool IsNoop(LoggingSeverity severity);
-
- private:
-  friend class LogMessageForTesting;
-  typedef std::pair<LogSink*, LoggingSeverity> StreamAndSeverity;
-  typedef std::list<StreamAndSeverity> StreamList;
-
-  // Updates min_sev_ appropriately when debug sinks change.
-  static void UpdateMinLogSeverity();
-
-// These write out the actual log messages.
-#if defined(WEBRTC_ANDROID)
-  static void OutputToDebug(const std::string& msg,
-                            LoggingSeverity severity,
-                            const char* tag);
-#else
-  static void OutputToDebug(const std::string& msg, LoggingSeverity severity);
-#endif
-
-  // Called from the dtor (or from a test) to append optional extra error
-  // information to the log stream and a newline character.
-  void FinishPrintStream();
-
-  // The stringbuilder that buffers the formatted message before output
-  rtc::StringBuilder print_stream_;
-
-  // The severity level of this message
-  LoggingSeverity severity_;
-
-#if defined(WEBRTC_ANDROID)
-  // The default Android debug output tag.
-  const char* tag_ = "libjingle";
-#endif
-
-  // String data generated in the constructor, that should be appended to
-  // the message before output.
-  std::string extra_;
-
-  // The output streams and their associated severities
-  static StreamList streams_;
-
-  // Flags for formatting options
-  static bool thread_, timestamp_;
-
-  // Determines if logs will be directed to stderr in debug mode.
-  static bool log_to_stderr_;
-
-  RTC_DISALLOW_COPY_AND_ASSIGN(LogMessage);
-};
-
-//////////////////////////////////////////////////////////////////////
-// Logging Helpers
-//////////////////////////////////////////////////////////////////////
-
-// DEPRECATED.
-// TODO(bugs.webrtc.org/9278): Remove once there are no more users.
-#define RTC_LOG_SEVERITY_PRECONDITION(sev) \
-  (rtc::LogMessage::IsNoop(sev))           \
-      ? static_cast<void>(0)               \
-      : rtc::webrtc_logging_impl::LogMessageVoidify()&
-
-#define RTC_LOG_FILE_LINE(sev, file, line)                                     \
-  rtc::webrtc_logging_impl::LogCall() &                                        \
-      rtc::webrtc_logging_impl::LogStreamer<>()                                \
-          << rtc::webrtc_logging_impl::LogMetadata(__FILE__, __LINE__, sev)
-
-#define RTC_LOG(sev) RTC_LOG_FILE_LINE(rtc::sev, __FILE__, __LINE__)
-
-// The _V version is for when a variable is passed in.
-#define RTC_LOG_V(sev) RTC_LOG_FILE_LINE(sev, __FILE__, __LINE__)
-
-// The _F version prefixes the message with the current function name.
-#if (defined(__GNUC__) && !defined(NDEBUG)) || defined(WANT_PRETTY_LOG_F)
-#define RTC_LOG_F(sev) RTC_LOG(sev) << __PRETTY_FUNCTION__ << ": "
-#define RTC_LOG_T_F(sev) \
-  RTC_LOG(sev) << this << ": " << __PRETTY_FUNCTION__ << ": "
-#else
-#define RTC_LOG_F(sev) RTC_LOG(sev) << __FUNCTION__ << ": "
-#define RTC_LOG_T_F(sev) RTC_LOG(sev) << this << ": " << __FUNCTION__ << ": "
-#endif
-
-#define RTC_LOG_CHECK_LEVEL(sev) rtc::LogCheckLevel(rtc::sev)
-#define RTC_LOG_CHECK_LEVEL_V(sev) rtc::LogCheckLevel(sev)
-
-inline bool LogCheckLevel(LoggingSeverity sev) {
-  return (LogMessage::GetMinLogSeverity() <= sev);
-}
-
-#define RTC_LOG_E(sev, ctx, err)                                    \
-    rtc::webrtc_logging_impl::LogCall() &                           \
-        rtc::webrtc_logging_impl::LogStreamer<>()                   \
-            << rtc::webrtc_logging_impl::LogMetadataErr {           \
-      {__FILE__, __LINE__, rtc::sev}, rtc::ERRCTX_##ctx, (err)      \
-    }
-
-#define RTC_LOG_T(sev) RTC_LOG(sev) << this << ": "
-
-#define RTC_LOG_ERRNO_EX(sev, err) RTC_LOG_E(sev, ERRNO, err)
-#define RTC_LOG_ERRNO(sev) RTC_LOG_ERRNO_EX(sev, errno)
-
-#if defined(WEBRTC_WIN)
-#define RTC_LOG_GLE_EX(sev, err) RTC_LOG_E(sev, HRESULT, err)
-#define RTC_LOG_GLE(sev) RTC_LOG_GLE_EX(sev, static_cast<int>(GetLastError()))
-#define RTC_LOG_ERR_EX(sev, err) RTC_LOG_GLE_EX(sev, err)
-#define RTC_LOG_ERR(sev) RTC_LOG_GLE(sev)
-#elif defined(__native_client__) && __native_client__
-#define RTC_LOG_ERR_EX(sev, err) RTC_LOG(sev)
-#define RTC_LOG_ERR(sev) RTC_LOG(sev)
-#elif defined(WEBRTC_POSIX)
-#define RTC_LOG_ERR_EX(sev, err) RTC_LOG_ERRNO_EX(sev, err)
-#define RTC_LOG_ERR(sev) RTC_LOG_ERRNO(sev)
-#endif  // WEBRTC_WIN
-
-#ifdef WEBRTC_ANDROID
-
-namespace webrtc_logging_impl {
-// TODO(kwiberg): Replace these with absl::string_view.
-inline const char* AdaptString(const char* str) {
-  return str;
-}
-inline const char* AdaptString(const std::string& str) {
-  return str.c_str();
-}
-}  // namespace webrtc_logging_impl
-
-#define RTC_LOG_TAG(sev, tag)                                                \
-    rtc::webrtc_logging_impl::LogCall() &                                    \
-        rtc::webrtc_logging_impl::LogStreamer<>()                            \
-            << rtc::webrtc_logging_impl::LogMetadataTag {                    \
-      sev, rtc::webrtc_logging_impl::AdaptString(tag)                        \
-    }
-
-#else
-
-// DEPRECATED. This macro is only intended for Android.
-#define RTC_LOG_TAG(sev, tag) RTC_LOG_V(sev)
-
-#endif
-
-// The RTC_DLOG macros are equivalent to their RTC_LOG counterparts except that
-// they only generate code in debug builds.
-#if RTC_DLOG_IS_ON
-#define RTC_DLOG(sev) RTC_LOG(sev)
-#define RTC_DLOG_V(sev) RTC_LOG_V(sev)
-#define RTC_DLOG_F(sev) RTC_LOG_F(sev)
-#else
-#define RTC_DLOG_EAT_STREAM_PARAMS() \
-  while (false)                      \
-  rtc::webrtc_logging_impl::LogStreamer<>()
-#define RTC_DLOG(sev) RTC_DLOG_EAT_STREAM_PARAMS()
-#define RTC_DLOG_V(sev) RTC_DLOG_EAT_STREAM_PARAMS()
-#define RTC_DLOG_F(sev) RTC_DLOG_EAT_STREAM_PARAMS()
-#endif
-
-}  // namespace rtc
-
-#endif  // RTC_BASE_LOGGING_H_
diff --git a/submodules/libtgvoip/webrtc_dsp/rtc_base/logging_mac.h b/submodules/libtgvoip/webrtc_dsp/rtc_base/logging_mac.h
deleted file mode 100644
index e65db560c1..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/rtc_base/logging_mac.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- *  Copyright 2018 The WebRTC Project Authors. All rights reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-#ifndef RTC_BASE_LOGGING_MAC_H_
-#define RTC_BASE_LOGGING_MAC_H_
-
-#if !defined(WEBRTC_MAC) || defined(WEBRTC_IOS)
-#error "Only include this header in macOS builds"
-#endif
-
-#include <CoreServices/CoreServices.h>
-
-#include <string>
-
-namespace rtc {
-
-// Returns a UTF8 description from an OS X Status error.
-std::string DescriptionFromOSStatus(OSStatus err);
-
-}  // namespace rtc
-
-#endif  // RTC_BASE_LOGGING_MAC_H_
diff --git a/submodules/libtgvoip/webrtc_dsp/rtc_base/logging_mac.mm b/submodules/libtgvoip/webrtc_dsp/rtc_base/logging_mac.mm
deleted file mode 100644
index bd5f2b9d38..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/rtc_base/logging_mac.mm
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- *  Copyright 2016 The WebRTC Project Authors. All rights reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#include "rtc_base/logging_mac.h"
-
-#import <Foundation/Foundation.h>
-
-namespace rtc {
-std::string DescriptionFromOSStatus(OSStatus err) {
-  NSError* error =
-      [NSError errorWithDomain:NSOSStatusErrorDomain code:err userInfo:nil];
-  return error.description.UTF8String;
-}
-
-}  // namespace rtc
diff --git a/submodules/libtgvoip/webrtc_dsp/rtc_base/logging_webrtc.cc b/submodules/libtgvoip/webrtc_dsp/rtc_base/logging_webrtc.cc
deleted file mode 100755
index a8d1522b01..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/rtc_base/logging_webrtc.cc
+++ /dev/null
@@ -1,568 +0,0 @@
-/*
- *  Copyright 2004 The WebRTC Project Authors. All rights reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#if defined(WEBRTC_WIN)
-#include <WinSock2.h>
-#include <windows.h>
-#if _MSC_VER < 1900
-#define snprintf _snprintf
-#endif
-#undef ERROR  // wingdi.h
-#endif
-
-#if defined(WEBRTC_MAC) && !defined(WEBRTC_IOS)
-#include <CoreServices/CoreServices.h>
-#elif defined(WEBRTC_ANDROID)
-#include <android/log.h>
-
-// Android has a 1024 limit on log inputs. We use 60 chars as an
-// approx for the header/tag portion.
-// See android/system/core/liblog/logd_write.c
-static const int kMaxLogLineSize = 1024 - 60;
-#endif  // WEBRTC_MAC && !defined(WEBRTC_IOS) || WEBRTC_ANDROID
-
-#include <stdio.h>
-#include <string.h>
-#include <time.h>
-#include <algorithm>
-#include <cstdarg>
-#include <vector>
-
-#include "rtc_base/checks.h"
-#include "rtc_base/criticalsection.h"
-#include "rtc_base/logging.h"
-#include "rtc_base/platform_thread_types.h"
-#include "rtc_base/stringencode.h"
-#include "rtc_base/strings/string_builder.h"
-#include "rtc_base/stringutils.h"
-#include "rtc_base/thread_annotations.h"
-#include "rtc_base/timeutils.h"
-
-namespace rtc {
-namespace {
-// By default, release builds don't log, debug builds at info level
-#if !defined(NDEBUG)
-static LoggingSeverity g_min_sev = LS_INFO;
-static LoggingSeverity g_dbg_sev = LS_INFO;
-#else
-static LoggingSeverity g_min_sev = LS_NONE;
-static LoggingSeverity g_dbg_sev = LS_NONE;
-#endif
-
-// Return the filename portion of the string (that following the last slash).
-const char* FilenameFromPath(const char* file) {
-  const char* end1 = ::strrchr(file, '/');
-  const char* end2 = ::strrchr(file, '\\');
-  if (!end1 && !end2)
-    return file;
-  else
-    return (end1 > end2) ? end1 + 1 : end2 + 1;
-}
-
-// Global lock for log subsystem, only needed to serialize access to streams_.
-CriticalSection g_log_crit;
-}  // namespace
-
-// Inefficient default implementation, override is recommended.
-void LogSink::OnLogMessage(const std::string& msg,
-                           LoggingSeverity severity,
-                           const char* tag) {
-  OnLogMessage(tag + (": " + msg), severity);
-}
-
-void LogSink::OnLogMessage(const std::string& msg,
-                           LoggingSeverity /* severity */) {
-  OnLogMessage(msg);
-}
-
-/////////////////////////////////////////////////////////////////////////////
-// LogMessage
-/////////////////////////////////////////////////////////////////////////////
-
-bool LogMessage::log_to_stderr_ = true;
-
-// The list of logging streams currently configured.
-// Note: we explicitly do not clean this up, because of the uncertain ordering
-// of destructors at program exit.  Let the person who sets the stream trigger
-// cleanup by setting to null, or let it leak (safe at program exit).
-LogMessage::StreamList LogMessage::streams_ RTC_GUARDED_BY(g_log_crit);
-
-// Boolean options default to false (0)
-bool LogMessage::thread_, LogMessage::timestamp_;
-
-LogMessage::LogMessage(const char* file, int line, LoggingSeverity sev)
-    : LogMessage(file, line, sev, ERRCTX_NONE, 0) {}
-
-LogMessage::LogMessage(const char* file,
-                       int line,
-                       LoggingSeverity sev,
-                       LogErrorContext err_ctx,
-                       int err)
-    : severity_(sev) {
-  if (timestamp_) {
-    // Use SystemTimeMillis so that even if tests use fake clocks, the timestamp
-    // in log messages represents the real system time.
-    int64_t time = TimeDiff(SystemTimeMillis(), LogStartTime());
-    // Also ensure WallClockStartTime is initialized, so that it matches
-    // LogStartTime.
-    WallClockStartTime();
-    print_stream_ << "[" << rtc::LeftPad('0', 3, rtc::ToString(time / 1000))
-                  << ":" << rtc::LeftPad('0', 3, rtc::ToString(time % 1000))
-                  << "] ";
-  }
-
-  if (thread_) {
-    PlatformThreadId id = CurrentThreadId();
-    print_stream_ << "[" << id << "] ";
-  }
-
-  if (file != nullptr) {
-#if defined(WEBRTC_ANDROID)
-    tag_ = FilenameFromPath(file);
-    print_stream_ << "(line " << line << "): ";
-#else
-    print_stream_ << "(" << FilenameFromPath(file) << ":" << line << "): ";
-#endif
-  }
-
-  if (err_ctx != ERRCTX_NONE) {
-    char tmp_buf[1024];
-    SimpleStringBuilder tmp(tmp_buf);
-    tmp.AppendFormat("[0x%08X]", err);
-    switch (err_ctx) {
-      case ERRCTX_ERRNO:
-        tmp << " " << strerror(err);
-        break;
-#ifdef WEBRTC_WIN
-      case ERRCTX_HRESULT: {
-        char msgbuf[256];
-        DWORD flags =
-            FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS;
-        if (DWORD len = FormatMessageA(
-                flags, nullptr, err, MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
-                msgbuf, sizeof(msgbuf) / sizeof(msgbuf[0]), nullptr)) {
-          while ((len > 0) &&
-                 isspace(static_cast<unsigned char>(msgbuf[len - 1]))) {
-            msgbuf[--len] = 0;
-          }
-          tmp << " " << msgbuf;
-        }
-        break;
-      }
-#endif  // WEBRTC_WIN
-#if defined(WEBRTC_MAC) && !defined(WEBRTC_IOS)
-      case ERRCTX_OSSTATUS: {
-        std::string desc(DescriptionFromOSStatus(err));
-        tmp << " " << (desc.empty() ? "Unknown error" : desc.c_str());
-        break;
-      }
-#endif  // WEBRTC_MAC && !defined(WEBRTC_IOS)
-      default:
-        break;
-    }
-    extra_ = tmp.str();
-  }
-}
-
-#if defined(WEBRTC_ANDROID)
-LogMessage::LogMessage(const char* file,
-                       int line,
-                       LoggingSeverity sev,
-                       const char* tag)
-    : LogMessage(file, line, sev, ERRCTX_NONE, 0 /* err */) {
-  tag_ = tag;
-  print_stream_ << tag << ": ";
-}
-#endif
-
-// DEPRECATED. Currently only used by downstream projects that use
-// implementation details of logging.h. Work is ongoing to remove those
-// dependencies.
-LogMessage::LogMessage(const char* file,
-                       int line,
-                       LoggingSeverity sev,
-                       const std::string& tag)
-    : LogMessage(file, line, sev) {
-  print_stream_ << tag << ": ";
-}
-
-LogMessage::~LogMessage() {
-  FinishPrintStream();
-
-  const std::string str = print_stream_.Release();
-
-  if (severity_ >= g_dbg_sev) {
-#if defined(WEBRTC_ANDROID)
-    OutputToDebug(str, severity_, tag_);
-#else
-    OutputToDebug(str, severity_);
-#endif
-  }
-
-  CritScope cs(&g_log_crit);
-  for (auto& kv : streams_) {
-    if (severity_ >= kv.second) {
-#if defined(WEBRTC_ANDROID)
-      kv.first->OnLogMessage(str, severity_, tag_);
-#else
-      kv.first->OnLogMessage(str, severity_);
-#endif
-    }
-  }
-}
-
-void LogMessage::AddTag(const char* tag) {
-#ifdef WEBRTC_ANDROID
-  tag_ = tag;
-#endif
-}
-
-rtc::StringBuilder& LogMessage::stream() {
-  return print_stream_;
-}
-
-int LogMessage::GetMinLogSeverity() {
-  return g_min_sev;
-}
-
-LoggingSeverity LogMessage::GetLogToDebug() {
-  return g_dbg_sev;
-}
-int64_t LogMessage::LogStartTime() {
-  static const int64_t g_start = SystemTimeMillis();
-  return g_start;
-}
-
-uint32_t LogMessage::WallClockStartTime() {
-  static const uint32_t g_start_wallclock = time(nullptr);
-  return g_start_wallclock;
-}
-
-void LogMessage::LogThreads(bool on) {
-  thread_ = on;
-}
-
-void LogMessage::LogTimestamps(bool on) {
-  timestamp_ = on;
-}
-
-void LogMessage::LogToDebug(LoggingSeverity min_sev) {
-  g_dbg_sev = min_sev;
-  CritScope cs(&g_log_crit);
-  UpdateMinLogSeverity();
-}
-
-void LogMessage::SetLogToStderr(bool log_to_stderr) {
-  log_to_stderr_ = log_to_stderr;
-}
-
-int LogMessage::GetLogToStream(LogSink* stream) {
-  CritScope cs(&g_log_crit);
-  LoggingSeverity sev = LS_NONE;
-  for (auto& kv : streams_) {
-    if (!stream || stream == kv.first) {
-      sev = std::min(sev, kv.second);
-    }
-  }
-  return sev;
-}
-
-void LogMessage::AddLogToStream(LogSink* stream, LoggingSeverity min_sev) {
-  CritScope cs(&g_log_crit);
-  streams_.push_back(std::make_pair(stream, min_sev));
-  UpdateMinLogSeverity();
-}
-
-void LogMessage::RemoveLogToStream(LogSink* stream) {
-  CritScope cs(&g_log_crit);
-  for (StreamList::iterator it = streams_.begin(); it != streams_.end(); ++it) {
-    if (stream == it->first) {
-      streams_.erase(it);
-      break;
-    }
-  }
-  UpdateMinLogSeverity();
-}
-
-void LogMessage::ConfigureLogging(const char* params) {
-  LoggingSeverity current_level = LS_VERBOSE;
-  LoggingSeverity debug_level = GetLogToDebug();
-
-  std::vector<std::string> tokens;
-  tokenize(params, ' ', &tokens);
-
-  for (const std::string& token : tokens) {
-    if (token.empty())
-      continue;
-
-    // Logging features
-    if (token == "tstamp") {
-      LogTimestamps();
-    } else if (token == "thread") {
-      LogThreads();
-
-      // Logging levels
-    } else if (token == "sensitive") {
-      current_level = LS_SENSITIVE;
-    } else if (token == "verbose") {
-      current_level = LS_VERBOSE;
-    } else if (token == "info") {
-      current_level = LS_INFO;
-    } else if (token == "warning") {
-      current_level = LS_WARNING;
-    } else if (token == "error") {
-      current_level = LS_ERROR;
-    } else if (token == "none") {
-      current_level = LS_NONE;
-
-      // Logging targets
-    } else if (token == "debug") {
-      debug_level = current_level;
-    }
-  }
-
-#if defined(WEBRTC_WIN)
-  if ((LS_NONE != debug_level) && !::IsDebuggerPresent()) {
-    // First, attempt to attach to our parent's console... so if you invoke
-    // from the command line, we'll see the output there.  Otherwise, create
-    // our own console window.
-    // Note: These methods fail if a console already exists, which is fine.
-    if (!AttachConsole(ATTACH_PARENT_PROCESS))
-      ::AllocConsole();
-  }
-#endif  // WEBRTC_WIN
-
-  LogToDebug(debug_level);
-}
-
-void LogMessage::UpdateMinLogSeverity()
-    RTC_EXCLUSIVE_LOCKS_REQUIRED(g_log_crit) {
-  LoggingSeverity min_sev = g_dbg_sev;
-  for (const auto& kv : streams_) {
-    const LoggingSeverity sev = kv.second;
-    min_sev = std::min(min_sev, sev);
-  }
-  g_min_sev = min_sev;
-}
-
-#if defined(WEBRTC_ANDROID)
-void LogMessage::OutputToDebug(const std::string& str,
-                               LoggingSeverity severity,
-                               const char* tag) {
-#else
-void LogMessage::OutputToDebug(const std::string& str,
-                               LoggingSeverity severity) {
-#endif
-  bool log_to_stderr = log_to_stderr_;
-#if defined(WEBRTC_MAC) && !defined(WEBRTC_IOS) && defined(NDEBUG)
-  // On the Mac, all stderr output goes to the Console log and causes clutter.
-  // So in opt builds, don't log to stderr unless the user specifically sets
-  // a preference to do so.
-  CFStringRef key = CFStringCreateWithCString(
-      kCFAllocatorDefault, "logToStdErr", kCFStringEncodingUTF8);
-  CFStringRef domain = CFBundleGetIdentifier(CFBundleGetMainBundle());
-  if (key != nullptr && domain != nullptr) {
-    Boolean exists_and_is_valid;
-    Boolean should_log =
-        CFPreferencesGetAppBooleanValue(key, domain, &exists_and_is_valid);
-    // If the key doesn't exist or is invalid or is false, we will not log to
-    // stderr.
-    log_to_stderr = exists_and_is_valid && should_log;
-  }
-  if (key != nullptr) {
-    CFRelease(key);
-  }
-#endif  // defined(WEBRTC_MAC) && !defined(WEBRTC_IOS) && defined(NDEBUG)
-
-#if defined(WEBRTC_WIN)
-  // Always log to the debugger.
-  // Perhaps stderr should be controlled by a preference, as on Mac?
-  OutputDebugStringA(str.c_str());
-  if (log_to_stderr) {
-    // This handles dynamically allocated consoles, too.
-    if (HANDLE error_handle = ::GetStdHandle(STD_ERROR_HANDLE)) {
-      log_to_stderr = false;
-      DWORD written = 0;
-      ::WriteFile(error_handle, str.data(), static_cast<DWORD>(str.size()),
-                  &written, 0);
-    }
-  }
-#endif  // WEBRTC_WIN
-
-#if defined(WEBRTC_ANDROID)
-  // Android's logging facility uses severity to log messages but we
-  // need to map libjingle's severity levels to Android ones first.
-  // Also write to stderr which maybe available to executable started
-  // from the shell.
-  int prio;
-  switch (severity) {
-    case LS_SENSITIVE:
-      __android_log_write(ANDROID_LOG_INFO, tag, "SENSITIVE");
-      if (log_to_stderr) {
-        fprintf(stderr, "SENSITIVE");
-        fflush(stderr);
-      }
-      return;
-    case LS_VERBOSE:
-      prio = ANDROID_LOG_VERBOSE;
-      break;
-    case LS_INFO:
-      prio = ANDROID_LOG_INFO;
-      break;
-    case LS_WARNING:
-      prio = ANDROID_LOG_WARN;
-      break;
-    case LS_ERROR:
-      prio = ANDROID_LOG_ERROR;
-      break;
-    default:
-      prio = ANDROID_LOG_UNKNOWN;
-  }
-
-  int size = str.size();
-  int line = 0;
-  int idx = 0;
-  const int max_lines = size / kMaxLogLineSize + 1;
-  if (max_lines == 1) {
-    __android_log_print(prio, tag, "%.*s", size, str.c_str());
-  } else {
-    while (size > 0) {
-      const int len = std::min(size, kMaxLogLineSize);
-      // Use the size of the string in the format (str may have \0 in the
-      // middle).
-      __android_log_print(prio, tag, "[%d/%d] %.*s", line + 1, max_lines, len,
-                          str.c_str() + idx);
-      idx += len;
-      size -= len;
-      ++line;
-    }
-  }
-#endif  // WEBRTC_ANDROID
-  if (log_to_stderr) {
-    fprintf(stderr, "%s", str.c_str());
-    fflush(stderr);
-  }
-}
-
-// static
-bool LogMessage::IsNoop(LoggingSeverity severity) {
-  if (severity >= g_dbg_sev || severity >= g_min_sev)
-    return false;
-
-  // TODO(tommi): We're grabbing this lock for every LogMessage instance that
-  // is going to be logged. This introduces unnecessary synchronization for
-  // a feature that's mostly used for testing.
-  CritScope cs(&g_log_crit);
-  if (streams_.size() > 0)
-    return false;
-
-  return true;
-}
-
-void LogMessage::FinishPrintStream() {
-  if (!extra_.empty())
-    print_stream_ << " : " << extra_;
-  print_stream_ << "\n";
-}
-
-namespace webrtc_logging_impl {
-
-void Log(const LogArgType* fmt, ...) {
-  va_list args;
-  va_start(args, fmt);
-
-  LogMetadataErr meta;
-  const char* tag = nullptr;
-  switch (*fmt) {
-    case LogArgType::kLogMetadata: {
-      meta = {va_arg(args, LogMetadata), ERRCTX_NONE, 0};
-      break;
-    }
-    case LogArgType::kLogMetadataErr: {
-      meta = va_arg(args, LogMetadataErr);
-      break;
-    }
-#ifdef WEBRTC_ANDROID
-    case LogArgType::kLogMetadataTag: {
-      const LogMetadataTag tag_meta = va_arg(args, LogMetadataTag);
-      meta = {{nullptr, 0, tag_meta.severity}, ERRCTX_NONE, 0};
-      tag = tag_meta.tag;
-      break;
-    }
-#endif
-    default: {
-      RTC_NOTREACHED();
-      va_end(args);
-      return;
-    }
-  }
-
-  if (LogMessage::IsNoop(meta.meta.Severity())) {
-    va_end(args);
-    return;
-  }
-
-  LogMessage log_message(meta.meta.File(), meta.meta.Line(),
-                         meta.meta.Severity(), meta.err_ctx, meta.err);
-  if (tag) {
-    log_message.AddTag(tag);
-  }
-
-  for (++fmt; *fmt != LogArgType::kEnd; ++fmt) {
-    switch (*fmt) {
-      case LogArgType::kInt:
-        log_message.stream() << va_arg(args, int);
-        break;
-      case LogArgType::kLong:
-        log_message.stream() << va_arg(args, long);
-        break;
-      case LogArgType::kLongLong:
-        log_message.stream() << va_arg(args, long long);
-        break;
-      case LogArgType::kUInt:
-        log_message.stream() << va_arg(args, unsigned);
-        break;
-      case LogArgType::kULong:
-        log_message.stream() << va_arg(args, unsigned long);
-        break;
-      case LogArgType::kULongLong:
-        log_message.stream() << va_arg(args, unsigned long long);
-        break;
-      case LogArgType::kDouble:
-        log_message.stream() << va_arg(args, double);
-        break;
-      case LogArgType::kLongDouble:
-        log_message.stream() << va_arg(args, long double);
-        break;
-      case LogArgType::kCharP:
-        log_message.stream() << va_arg(args, const char*);
-        break;
-      case LogArgType::kStdString:
-        log_message.stream() << *va_arg(args, const std::string*);
-        break;
-      case LogArgType::kStringView:
-        log_message.stream() << *va_arg(args, const absl::string_view*);
-        break;
-      case LogArgType::kVoidP:
-        log_message.stream() << rtc::ToHex(
-            reinterpret_cast<uintptr_t>(va_arg(args, const void*)));
-        break;
-      default:
-        RTC_NOTREACHED();
-        va_end(args);
-        return;
-    }
-  }
-
-  va_end(args);
-}
-
-}  // namespace webrtc_logging_impl
-}  // namespace rtc
diff --git a/submodules/libtgvoip/webrtc_dsp/rtc_base/memory/aligned_malloc.cc b/submodules/libtgvoip/webrtc_dsp/rtc_base/memory/aligned_malloc.cc
deleted file mode 100644
index c893c96ef2..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/rtc_base/memory/aligned_malloc.cc
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
- *  Copyright (c) 2011 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#include "rtc_base/memory/aligned_malloc.h"
-
-#include <stdlib.h>  // for free, malloc
-#include <string.h>  // for memcpy
-
-#ifdef _WIN32
-#include <windows.h>
-#else
-#include <stdint.h>
-#endif
-
-// Reference on memory alignment:
-// http://stackoverflow.com/questions/227897/solve-the-memory-alignment-in-c-interview-question-that-stumped-me
-namespace webrtc {
-
-uintptr_t GetRightAlign(uintptr_t start_pos, size_t alignment) {
-  // The pointer should be aligned with |alignment| bytes. The - 1 guarantees
-  // that it is aligned towards the closest higher (right) address.
-  return (start_pos + alignment - 1) & ~(alignment - 1);
-}
-
-// Alignment must be an integer power of two.
-bool ValidAlignment(size_t alignment) {
-  if (!alignment) {
-    return false;
-  }
-  return (alignment & (alignment - 1)) == 0;
-}
-
-void* GetRightAlign(const void* pointer, size_t alignment) {
-  if (!pointer) {
-    return NULL;
-  }
-  if (!ValidAlignment(alignment)) {
-    return NULL;
-  }
-  uintptr_t start_pos = reinterpret_cast<uintptr_t>(pointer);
-  return reinterpret_cast<void*>(GetRightAlign(start_pos, alignment));
-}
-
-void* AlignedMalloc(size_t size, size_t alignment) {
-  if (size == 0) {
-    return NULL;
-  }
-  if (!ValidAlignment(alignment)) {
-    return NULL;
-  }
-
-  // The memory is aligned towards the lowest address that so only
-  // alignment - 1 bytes needs to be allocated.
-  // A pointer to the start of the memory must be stored so that it can be
-  // retreived for deletion, ergo the sizeof(uintptr_t).
-  void* memory_pointer = malloc(size + sizeof(uintptr_t) + alignment - 1);
-  if (memory_pointer == NULL) {
-    return NULL;
-  }
-
-  // Aligning after the sizeof(uintptr_t) bytes will leave room for the header
-  // in the same memory block.
-  uintptr_t align_start_pos = reinterpret_cast<uintptr_t>(memory_pointer);
-  align_start_pos += sizeof(uintptr_t);
-  uintptr_t aligned_pos = GetRightAlign(align_start_pos, alignment);
-  void* aligned_pointer = reinterpret_cast<void*>(aligned_pos);
-
-  // Store the address to the beginning of the memory just before the aligned
-  // memory.
-  uintptr_t header_pos = aligned_pos - sizeof(uintptr_t);
-  void* header_pointer = reinterpret_cast<void*>(header_pos);
-  uintptr_t memory_start = reinterpret_cast<uintptr_t>(memory_pointer);
-  memcpy(header_pointer, &memory_start, sizeof(uintptr_t));
-
-  return aligned_pointer;
-}
-
-void AlignedFree(void* mem_block) {
-  if (mem_block == NULL) {
-    return;
-  }
-  uintptr_t aligned_pos = reinterpret_cast<uintptr_t>(mem_block);
-  uintptr_t header_pos = aligned_pos - sizeof(uintptr_t);
-
-  // Read out the address of the AlignedMemory struct from the header.
-  uintptr_t memory_start_pos = *reinterpret_cast<uintptr_t*>(header_pos);
-  void* memory_start = reinterpret_cast<void*>(memory_start_pos);
-  free(memory_start);
-}
-
-}  // namespace webrtc
diff --git a/submodules/libtgvoip/webrtc_dsp/rtc_base/memory/aligned_malloc.h b/submodules/libtgvoip/webrtc_dsp/rtc_base/memory/aligned_malloc.h
deleted file mode 100644
index 42a6daaef6..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/rtc_base/memory/aligned_malloc.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- *  Copyright (c) 2011 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#ifndef RTC_BASE_MEMORY_ALIGNED_MALLOC_H_
-#define RTC_BASE_MEMORY_ALIGNED_MALLOC_H_
-
-// The functions declared here
-// 1) Allocates block of aligned memory.
-// 2) Re-calculates a pointer such that it is aligned to a higher or equal
-//    address.
-// Note: alignment must be a power of two. The alignment is in bytes.
-
-#include <stddef.h>
-
-namespace webrtc {
-
-// Returns a pointer to the first boundry of |alignment| bytes following the
-// address of |ptr|.
-// Note that there is no guarantee that the memory in question is available.
-// |ptr| has no requirements other than it can't be NULL.
-void* GetRightAlign(const void* ptr, size_t alignment);
-
-// Allocates memory of |size| bytes aligned on an |alignment| boundry.
-// The return value is a pointer to the memory. Note that the memory must
-// be de-allocated using AlignedFree.
-void* AlignedMalloc(size_t size, size_t alignment);
-// De-allocates memory created using the AlignedMalloc() API.
-void AlignedFree(void* mem_block);
-
-// Templated versions to facilitate usage of aligned malloc without casting
-// to and from void*.
-template <typename T>
-T* GetRightAlign(const T* ptr, size_t alignment) {
-  return reinterpret_cast<T*>(
-      GetRightAlign(reinterpret_cast<const void*>(ptr), alignment));
-}
-template <typename T>
-T* AlignedMalloc(size_t size, size_t alignment) {
-  return reinterpret_cast<T*>(AlignedMalloc(size, alignment));
-}
-
-// Deleter for use with unique_ptr. E.g., use as
-//   std::unique_ptr<Foo, AlignedFreeDeleter> foo;
-struct AlignedFreeDeleter {
-  inline void operator()(void* ptr) const { AlignedFree(ptr); }
-};
-
-}  // namespace webrtc
-
-#endif  // RTC_BASE_MEMORY_ALIGNED_MALLOC_H_
diff --git a/submodules/libtgvoip/webrtc_dsp/rtc_base/numerics/safe_compare.h b/submodules/libtgvoip/webrtc_dsp/rtc_base/numerics/safe_compare.h
deleted file mode 100644
index 85f0a30e83..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/rtc_base/numerics/safe_compare.h
+++ /dev/null
@@ -1,176 +0,0 @@
-/*
- *  Copyright 2016 The WebRTC Project Authors. All rights reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-// This file defines six constexpr functions:
-//
-//   rtc::SafeEq  // ==
-//   rtc::SafeNe  // !=
-//   rtc::SafeLt  // <
-//   rtc::SafeLe  // <=
-//   rtc::SafeGt  // >
-//   rtc::SafeGe  // >=
-//
-// They each accept two arguments of arbitrary types, and in almost all cases,
-// they simply call the appropriate comparison operator. However, if both
-// arguments are integers, they don't compare them using C++'s quirky rules,
-// but instead adhere to the true mathematical definitions. It is as if the
-// arguments were first converted to infinite-range signed integers, and then
-// compared, although of course nothing expensive like that actually takes
-// place. In practice, for signed/signed and unsigned/unsigned comparisons and
-// some mixed-signed comparisons with a compile-time constant, the overhead is
-// zero; in the remaining cases, it is just a few machine instructions (no
-// branches).
-
-#ifndef RTC_BASE_NUMERICS_SAFE_COMPARE_H_
-#define RTC_BASE_NUMERICS_SAFE_COMPARE_H_
-
-#include <stddef.h>
-#include <stdint.h>
-
-#include <type_traits>
-#include <utility>
-
-#include "rtc_base/type_traits.h"
-
-namespace rtc {
-
-namespace safe_cmp_impl {
-
-template <size_t N>
-struct LargerIntImpl : std::false_type {};
-template <>
-struct LargerIntImpl<sizeof(int8_t)> : std::true_type {
-  using type = int16_t;
-};
-template <>
-struct LargerIntImpl<sizeof(int16_t)> : std::true_type {
-  using type = int32_t;
-};
-template <>
-struct LargerIntImpl<sizeof(int32_t)> : std::true_type {
-  using type = int64_t;
-};
-
-// LargerInt<T1, T2>::value is true iff there's a signed type that's larger
-// than T1 (and no larger than the larger of T2 and int*, for performance
-// reasons); and if there is such a type, LargerInt<T1, T2>::type is an alias
-// for it.
-template <typename T1, typename T2>
-struct LargerInt
-    : LargerIntImpl<sizeof(T1) < sizeof(T2) || sizeof(T1) < sizeof(int*)
-                        ? sizeof(T1)
-                        : 0> {};
-
-template <typename T>
-constexpr typename std::make_unsigned<T>::type MakeUnsigned(T a) {
-  return static_cast<typename std::make_unsigned<T>::type>(a);
-}
-
-// Overload for when both T1 and T2 have the same signedness.
-template <typename Op,
-          typename T1,
-          typename T2,
-          typename std::enable_if<std::is_signed<T1>::value ==
-                                  std::is_signed<T2>::value>::type* = nullptr>
-constexpr bool Cmp(T1 a, T2 b) {
-  return Op::Op(a, b);
-}
-
-// Overload for signed - unsigned comparison that can be promoted to a bigger
-// signed type.
-template <typename Op,
-          typename T1,
-          typename T2,
-          typename std::enable_if<std::is_signed<T1>::value &&
-                                  std::is_unsigned<T2>::value &&
-                                  LargerInt<T2, T1>::value>::type* = nullptr>
-constexpr bool Cmp(T1 a, T2 b) {
-  return Op::Op(a, static_cast<typename LargerInt<T2, T1>::type>(b));
-}
-
-// Overload for unsigned - signed comparison that can be promoted to a bigger
-// signed type.
-template <typename Op,
-          typename T1,
-          typename T2,
-          typename std::enable_if<std::is_unsigned<T1>::value &&
-                                  std::is_signed<T2>::value &&
-                                  LargerInt<T1, T2>::value>::type* = nullptr>
-constexpr bool Cmp(T1 a, T2 b) {
-  return Op::Op(static_cast<typename LargerInt<T1, T2>::type>(a), b);
-}
-
-// Overload for signed - unsigned comparison that can't be promoted to a bigger
-// signed type.
-template <typename Op,
-          typename T1,
-          typename T2,
-          typename std::enable_if<std::is_signed<T1>::value &&
-                                  std::is_unsigned<T2>::value &&
-                                  !LargerInt<T2, T1>::value>::type* = nullptr>
-constexpr bool Cmp(T1 a, T2 b) {
-  return a < 0 ? Op::Op(-1, 0) : Op::Op(safe_cmp_impl::MakeUnsigned(a), b);
-}
-
-// Overload for unsigned - signed comparison that can't be promoted to a bigger
-// signed type.
-template <typename Op,
-          typename T1,
-          typename T2,
-          typename std::enable_if<std::is_unsigned<T1>::value &&
-                                  std::is_signed<T2>::value &&
-                                  !LargerInt<T1, T2>::value>::type* = nullptr>
-constexpr bool Cmp(T1 a, T2 b) {
-  return b < 0 ? Op::Op(0, -1) : Op::Op(a, safe_cmp_impl::MakeUnsigned(b));
-}
-
-#define RTC_SAFECMP_MAKE_OP(name, op)      \
-  struct name {                            \
-    template <typename T1, typename T2>    \
-    static constexpr bool Op(T1 a, T2 b) { \
-      return a op b;                       \
-    }                                      \
-  };
-RTC_SAFECMP_MAKE_OP(EqOp, ==)
-RTC_SAFECMP_MAKE_OP(NeOp, !=)
-RTC_SAFECMP_MAKE_OP(LtOp, <)
-RTC_SAFECMP_MAKE_OP(LeOp, <=)
-RTC_SAFECMP_MAKE_OP(GtOp, >)
-RTC_SAFECMP_MAKE_OP(GeOp, >=)
-#undef RTC_SAFECMP_MAKE_OP
-
-}  // namespace safe_cmp_impl
-
-#define RTC_SAFECMP_MAKE_FUN(name)                                            \
-  template <typename T1, typename T2>                                         \
-  constexpr                                                                   \
-      typename std::enable_if<IsIntlike<T1>::value && IsIntlike<T2>::value,   \
-                              bool>::type Safe##name(T1 a, T2 b) {            \
-    /* Unary plus here turns enums into real integral types. */               \
-    return safe_cmp_impl::Cmp<safe_cmp_impl::name##Op>(+a, +b);               \
-  }                                                                           \
-  template <typename T1, typename T2>                                         \
-  constexpr                                                                   \
-      typename std::enable_if<!IsIntlike<T1>::value || !IsIntlike<T2>::value, \
-                              bool>::type Safe##name(const T1& a,             \
-                                                     const T2& b) {           \
-    return safe_cmp_impl::name##Op::Op(a, b);                                 \
-  }
-RTC_SAFECMP_MAKE_FUN(Eq)
-RTC_SAFECMP_MAKE_FUN(Ne)
-RTC_SAFECMP_MAKE_FUN(Lt)
-RTC_SAFECMP_MAKE_FUN(Le)
-RTC_SAFECMP_MAKE_FUN(Gt)
-RTC_SAFECMP_MAKE_FUN(Ge)
-#undef RTC_SAFECMP_MAKE_FUN
-
-}  // namespace rtc
-
-#endif  // RTC_BASE_NUMERICS_SAFE_COMPARE_H_
diff --git a/submodules/libtgvoip/webrtc_dsp/rtc_base/numerics/safe_conversions.h b/submodules/libtgvoip/webrtc_dsp/rtc_base/numerics/safe_conversions.h
deleted file mode 100644
index 58efcaa746..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/rtc_base/numerics/safe_conversions.h
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- *  Copyright 2014 The WebRTC Project Authors. All rights reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-// Borrowed from Chromium's src/base/numerics/safe_conversions.h.
-
-#ifndef RTC_BASE_NUMERICS_SAFE_CONVERSIONS_H_
-#define RTC_BASE_NUMERICS_SAFE_CONVERSIONS_H_
-
-#include <limits>
-
-#include "rtc_base/checks.h"
-#include "rtc_base/numerics/safe_conversions_impl.h"
-
-namespace rtc {
-
-// Convenience function that returns true if the supplied value is in range
-// for the destination type.
-template <typename Dst, typename Src>
-inline bool IsValueInRangeForNumericType(Src value) {
-  return internal::RangeCheck<Dst>(value) == internal::TYPE_VALID;
-}
-
-// checked_cast<> and dchecked_cast<> are analogous to static_cast<> for
-// numeric types, except that they [D]CHECK that the specified numeric
-// conversion will not overflow or underflow. NaN source will always trigger
-// the [D]CHECK.
-template <typename Dst, typename Src>
-inline Dst checked_cast(Src value) {
-  RTC_CHECK(IsValueInRangeForNumericType<Dst>(value));
-  return static_cast<Dst>(value);
-}
-template <typename Dst, typename Src>
-inline Dst dchecked_cast(Src value) {
-  RTC_DCHECK(IsValueInRangeForNumericType<Dst>(value));
-  return static_cast<Dst>(value);
-}
-
-// saturated_cast<> is analogous to static_cast<> for numeric types, except
-// that the specified numeric conversion will saturate rather than overflow or
-// underflow. NaN assignment to an integral will trigger a RTC_CHECK condition.
-template <typename Dst, typename Src>
-inline Dst saturated_cast(Src value) {
-  // Optimization for floating point values, which already saturate.
-  if (std::numeric_limits<Dst>::is_iec559)
-    return static_cast<Dst>(value);
-
-  switch (internal::RangeCheck<Dst>(value)) {
-    case internal::TYPE_VALID:
-      return static_cast<Dst>(value);
-
-    case internal::TYPE_UNDERFLOW:
-      return std::numeric_limits<Dst>::min();
-
-    case internal::TYPE_OVERFLOW:
-      return std::numeric_limits<Dst>::max();
-
-    // Should fail only on attempting to assign NaN to a saturated integer.
-    case internal::TYPE_INVALID:
-      FATAL();
-      return std::numeric_limits<Dst>::max();
-  }
-
-  FATAL();
-  return static_cast<Dst>(value);
-}
-
-}  // namespace rtc
-
-#endif  // RTC_BASE_NUMERICS_SAFE_CONVERSIONS_H_
diff --git a/submodules/libtgvoip/webrtc_dsp/rtc_base/numerics/safe_conversions_impl.h b/submodules/libtgvoip/webrtc_dsp/rtc_base/numerics/safe_conversions_impl.h
deleted file mode 100644
index 9b4f1c6483..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/rtc_base/numerics/safe_conversions_impl.h
+++ /dev/null
@@ -1,175 +0,0 @@
-/*
- *  Copyright 2014 The WebRTC Project Authors. All rights reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-// Borrowed from Chromium's src/base/numerics/safe_conversions_impl.h.
-
-#ifndef RTC_BASE_NUMERICS_SAFE_CONVERSIONS_IMPL_H_
-#define RTC_BASE_NUMERICS_SAFE_CONVERSIONS_IMPL_H_
-
-#include <limits>
-
-namespace rtc {
-namespace internal {
-
-enum DstSign { DST_UNSIGNED, DST_SIGNED };
-
-enum SrcSign { SRC_UNSIGNED, SRC_SIGNED };
-
-enum DstRange { OVERLAPS_RANGE, CONTAINS_RANGE };
-
-// Helper templates to statically determine if our destination type can contain
-// all values represented by the source type.
-
-template <typename Dst,
-          typename Src,
-          DstSign IsDstSigned =
-              std::numeric_limits<Dst>::is_signed ? DST_SIGNED : DST_UNSIGNED,
-          SrcSign IsSrcSigned =
-              std::numeric_limits<Src>::is_signed ? SRC_SIGNED : SRC_UNSIGNED>
-struct StaticRangeCheck {};
-
-template <typename Dst, typename Src>
-struct StaticRangeCheck<Dst, Src, DST_SIGNED, SRC_SIGNED> {
-  typedef std::numeric_limits<Dst> DstLimits;
-  typedef std::numeric_limits<Src> SrcLimits;
-  // Compare based on max_exponent, which we must compute for integrals.
-  static const size_t kDstMaxExponent =
-      DstLimits::is_iec559 ? DstLimits::max_exponent : (sizeof(Dst) * 8 - 1);
-  static const size_t kSrcMaxExponent =
-      SrcLimits::is_iec559 ? SrcLimits::max_exponent : (sizeof(Src) * 8 - 1);
-  static const DstRange value =
-      kDstMaxExponent >= kSrcMaxExponent ? CONTAINS_RANGE : OVERLAPS_RANGE;
-};
-
-template <typename Dst, typename Src>
-struct StaticRangeCheck<Dst, Src, DST_UNSIGNED, SRC_UNSIGNED> {
-  static const DstRange value =
-      sizeof(Dst) >= sizeof(Src) ? CONTAINS_RANGE : OVERLAPS_RANGE;
-};
-
-template <typename Dst, typename Src>
-struct StaticRangeCheck<Dst, Src, DST_SIGNED, SRC_UNSIGNED> {
-  typedef std::numeric_limits<Dst> DstLimits;
-  typedef std::numeric_limits<Src> SrcLimits;
-  // Compare based on max_exponent, which we must compute for integrals.
-  static const size_t kDstMaxExponent =
-      DstLimits::is_iec559 ? DstLimits::max_exponent : (sizeof(Dst) * 8 - 1);
-  static const size_t kSrcMaxExponent = sizeof(Src) * 8;
-  static const DstRange value =
-      kDstMaxExponent >= kSrcMaxExponent ? CONTAINS_RANGE : OVERLAPS_RANGE;
-};
-
-template <typename Dst, typename Src>
-struct StaticRangeCheck<Dst, Src, DST_UNSIGNED, SRC_SIGNED> {
-  static const DstRange value = OVERLAPS_RANGE;
-};
-
-enum RangeCheckResult {
-  TYPE_VALID = 0,      // Value can be represented by the destination type.
-  TYPE_UNDERFLOW = 1,  // Value would overflow.
-  TYPE_OVERFLOW = 2,   // Value would underflow.
-  TYPE_INVALID = 3     // Source value is invalid (i.e. NaN).
-};
-
-// This macro creates a RangeCheckResult from an upper and lower bound
-// check by taking advantage of the fact that only NaN can be out of range in
-// both directions at once.
-#define BASE_NUMERIC_RANGE_CHECK_RESULT(is_in_upper_bound, is_in_lower_bound) \
-  RangeCheckResult(((is_in_upper_bound) ? 0 : TYPE_OVERFLOW) |                \
-                   ((is_in_lower_bound) ? 0 : TYPE_UNDERFLOW))
-
-template <typename Dst,
-          typename Src,
-          DstSign IsDstSigned =
-              std::numeric_limits<Dst>::is_signed ? DST_SIGNED : DST_UNSIGNED,
-          SrcSign IsSrcSigned =
-              std::numeric_limits<Src>::is_signed ? SRC_SIGNED : SRC_UNSIGNED,
-          DstRange IsSrcRangeContained = StaticRangeCheck<Dst, Src>::value>
-struct RangeCheckImpl {};
-
-// The following templates are for ranges that must be verified at runtime. We
-// split it into checks based on signedness to avoid confusing casts and
-// compiler warnings on signed an unsigned comparisons.
-
-// Dst range always contains the result: nothing to check.
-template <typename Dst, typename Src, DstSign IsDstSigned, SrcSign IsSrcSigned>
-struct RangeCheckImpl<Dst, Src, IsDstSigned, IsSrcSigned, CONTAINS_RANGE> {
-  static RangeCheckResult Check(Src value) { return TYPE_VALID; }
-};
-
-// Signed to signed narrowing.
-template <typename Dst, typename Src>
-struct RangeCheckImpl<Dst, Src, DST_SIGNED, SRC_SIGNED, OVERLAPS_RANGE> {
-  static RangeCheckResult Check(Src value) {
-    typedef std::numeric_limits<Dst> DstLimits;
-    return DstLimits::is_iec559
-               ? BASE_NUMERIC_RANGE_CHECK_RESULT(
-                     value <= static_cast<Src>(DstLimits::max()),
-                     value >= static_cast<Src>(DstLimits::max() * -1))
-               : BASE_NUMERIC_RANGE_CHECK_RESULT(
-                     value <= static_cast<Src>(DstLimits::max()),
-                     value >= static_cast<Src>(DstLimits::min()));
-  }
-};
-
-// Unsigned to unsigned narrowing.
-template <typename Dst, typename Src>
-struct RangeCheckImpl<Dst, Src, DST_UNSIGNED, SRC_UNSIGNED, OVERLAPS_RANGE> {
-  static RangeCheckResult Check(Src value) {
-    typedef std::numeric_limits<Dst> DstLimits;
-    return BASE_NUMERIC_RANGE_CHECK_RESULT(
-        value <= static_cast<Src>(DstLimits::max()), true);
-  }
-};
-
-// Unsigned to signed.
-template <typename Dst, typename Src>
-struct RangeCheckImpl<Dst, Src, DST_SIGNED, SRC_UNSIGNED, OVERLAPS_RANGE> {
-  static RangeCheckResult Check(Src value) {
-    typedef std::numeric_limits<Dst> DstLimits;
-    return sizeof(Dst) > sizeof(Src)
-               ? TYPE_VALID
-               : BASE_NUMERIC_RANGE_CHECK_RESULT(
-                     value <= static_cast<Src>(DstLimits::max()), true);
-  }
-};
-
-// Signed to unsigned.
-template <typename Dst, typename Src>
-struct RangeCheckImpl<Dst, Src, DST_UNSIGNED, SRC_SIGNED, OVERLAPS_RANGE> {
-  static RangeCheckResult Check(Src value) {
-    typedef std::numeric_limits<Dst> DstLimits;
-    typedef std::numeric_limits<Src> SrcLimits;
-    // Compare based on max_exponent, which we must compute for integrals.
-    static const size_t kDstMaxExponent = sizeof(Dst) * 8;
-    static const size_t kSrcMaxExponent =
-        SrcLimits::is_iec559 ? SrcLimits::max_exponent : (sizeof(Src) * 8 - 1);
-    return (kDstMaxExponent >= kSrcMaxExponent)
-               ? BASE_NUMERIC_RANGE_CHECK_RESULT(true,
-                                                 value >= static_cast<Src>(0))
-               : BASE_NUMERIC_RANGE_CHECK_RESULT(
-                     value <= static_cast<Src>(DstLimits::max()),
-                     value >= static_cast<Src>(0));
-  }
-};
-
-template <typename Dst, typename Src>
-inline RangeCheckResult RangeCheck(Src value) {
-  static_assert(std::numeric_limits<Src>::is_specialized,
-                "argument must be numeric");
-  static_assert(std::numeric_limits<Dst>::is_specialized,
-                "result must be numeric");
-  return RangeCheckImpl<Dst, Src>::Check(value);
-}
-
-}  // namespace internal
-}  // namespace rtc
-
-#endif  // RTC_BASE_NUMERICS_SAFE_CONVERSIONS_IMPL_H_
diff --git a/submodules/libtgvoip/webrtc_dsp/rtc_base/numerics/safe_minmax.h b/submodules/libtgvoip/webrtc_dsp/rtc_base/numerics/safe_minmax.h
deleted file mode 100644
index 8d00afbebd..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/rtc_base/numerics/safe_minmax.h
+++ /dev/null
@@ -1,335 +0,0 @@
-/*
- *  Copyright 2017 The WebRTC Project Authors. All rights reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-// Minimum and maximum
-// ===================
-//
-//   rtc::SafeMin(x, y)
-//   rtc::SafeMax(x, y)
-//
-// (These are both constexpr.)
-//
-// Accept two arguments of either any two integral or any two floating-point
-// types, and return the smaller and larger value, respectively, with no
-// truncation or wrap-around. If only one of the input types is statically
-// guaranteed to be able to represent the result, the return type is that type;
-// if either one would do, the result type is the smaller type. (One of these
-// two cases always applies.)
-//
-//   * The case with one floating-point and one integral type is not allowed,
-//     because the floating-point type will have greater range, but may not
-//     have sufficient precision to represent the integer value exactly.)
-//
-// Clamp (a.k.a. constrain to a given interval)
-// ============================================
-//
-//   rtc::SafeClamp(x, a, b)
-//
-// Accepts three arguments of any mix of integral types or any mix of
-// floating-point types, and returns the value in the closed interval [a, b]
-// that is closest to x (that is, if x < a it returns a; if x > b it returns b;
-// and if a <= x <= b it returns x). As for SafeMin() and SafeMax(), there is
-// no truncation or wrap-around. The result type
-//
-//   1. is statically guaranteed to be able to represent the result;
-//
-//   2. is no larger than the largest of the three argument types; and
-//
-//   3. has the same signedness as the type of the third argument, if this is
-//      possible without violating the First or Second Law.
-//
-// There is always at least one type that meets criteria 1 and 2. If more than
-// one type meets these criteria equally well, the result type is one of the
-// types that is smallest. Note that unlike SafeMin() and SafeMax(),
-// SafeClamp() will sometimes pick a return type that isn't the type of any of
-// its arguments.
-//
-//   * In this context, a type A is smaller than a type B if it has a smaller
-//     range; that is, if A::max() - A::min() < B::max() - B::min(). For
-//     example, int8_t < int16_t == uint16_t < int32_t, and all integral types
-//     are smaller than all floating-point types.)
-//
-//   * As for SafeMin and SafeMax, mixing integer and floating-point arguments
-//     is not allowed, because floating-point types have greater range than
-//     integer types, but do not have sufficient precision to represent the
-//     values of most integer types exactly.
-//
-// Requesting a specific return type
-// =================================
-//
-// All three functions allow callers to explicitly specify the return type as a
-// template parameter, overriding the default return type. E.g.
-//
-//   rtc::SafeMin<int>(x, y)  // returns an int
-//
-// If the requested type is statically guaranteed to be able to represent the
-// result, then everything's fine, and the return type is as requested. But if
-// the requested type is too small, a static_assert is triggered.
-
-#ifndef RTC_BASE_NUMERICS_SAFE_MINMAX_H_
-#define RTC_BASE_NUMERICS_SAFE_MINMAX_H_
-
-#include <limits>
-#include <type_traits>
-
-#include "rtc_base/checks.h"
-#include "rtc_base/numerics/safe_compare.h"
-#include "rtc_base/type_traits.h"
-
-namespace rtc {
-
-namespace safe_minmax_impl {
-
-// Make the range of a type available via something other than a constexpr
-// function, to work around MSVC limitations. See
-// https://blogs.msdn.microsoft.com/vcblog/2015/12/02/partial-support-for-expression-sfinae-in-vs-2015-update-1/
-template <typename T>
-struct Limits {
-  static constexpr T lowest = std::numeric_limits<T>::lowest();
-  static constexpr T max = std::numeric_limits<T>::max();
-};
-
-template <typename T, bool is_enum = std::is_enum<T>::value>
-struct UnderlyingType;
-
-template <typename T>
-struct UnderlyingType<T, false> {
-  using type = T;
-};
-
-template <typename T>
-struct UnderlyingType<T, true> {
-  using type = typename std::underlying_type<T>::type;
-};
-
-// Given two types T1 and T2, find types that can hold the smallest (in
-// ::min_t) and the largest (in ::max_t) of the two values.
-template <typename T1,
-          typename T2,
-          bool int1 = IsIntlike<T1>::value,
-          bool int2 = IsIntlike<T2>::value>
-struct MType {
-  static_assert(int1 == int2,
-                "You may not mix integral and floating-point arguments");
-};
-
-// Specialization for when neither type is integral (and therefore presumably
-// floating-point).
-template <typename T1, typename T2>
-struct MType<T1, T2, false, false> {
-  using min_t = typename std::common_type<T1, T2>::type;
-  static_assert(std::is_same<min_t, T1>::value ||
-                    std::is_same<min_t, T2>::value,
-                "");
-
-  using max_t = typename std::common_type<T1, T2>::type;
-  static_assert(std::is_same<max_t, T1>::value ||
-                    std::is_same<max_t, T2>::value,
-                "");
-};
-
-// Specialization for when both types are integral.
-template <typename T1, typename T2>
-struct MType<T1, T2, true, true> {
-  // The type with the lowest minimum value. In case of a tie, the type with
-  // the lowest maximum value. In case that too is a tie, the types have the
-  // same range, and we arbitrarily pick T1.
-  using min_t = typename std::conditional<
-      SafeLt(Limits<T1>::lowest, Limits<T2>::lowest),
-      T1,
-      typename std::conditional<
-          SafeGt(Limits<T1>::lowest, Limits<T2>::lowest),
-          T2,
-          typename std::conditional<SafeLe(Limits<T1>::max, Limits<T2>::max),
-                                    T1,
-                                    T2>::type>::type>::type;
-  static_assert(std::is_same<min_t, T1>::value ||
-                    std::is_same<min_t, T2>::value,
-                "");
-
-  // The type with the highest maximum value. In case of a tie, the types have
-  // the same range (because in C++, integer types with the same maximum also
-  // have the same minimum).
-  static_assert(SafeNe(Limits<T1>::max, Limits<T2>::max) ||
-                    SafeEq(Limits<T1>::lowest, Limits<T2>::lowest),
-                "integer types with the same max should have the same min");
-  using max_t = typename std::
-      conditional<SafeGe(Limits<T1>::max, Limits<T2>::max), T1, T2>::type;
-  static_assert(std::is_same<max_t, T1>::value ||
-                    std::is_same<max_t, T2>::value,
-                "");
-};
-
-// A dummy type that we pass around at compile time but never actually use.
-// Declared but not defined.
-struct DefaultType;
-
-// ::type is A, except we fall back to B if A is DefaultType. We static_assert
-// that the chosen type can hold all values that B can hold.
-template <typename A, typename B>
-struct TypeOr {
-  using type = typename std::
-      conditional<std::is_same<A, DefaultType>::value, B, A>::type;
-  static_assert(SafeLe(Limits<type>::lowest, Limits<B>::lowest) &&
-                    SafeGe(Limits<type>::max, Limits<B>::max),
-                "The specified type isn't large enough");
-  static_assert(IsIntlike<type>::value == IsIntlike<B>::value &&
-                    std::is_floating_point<type>::value ==
-                        std::is_floating_point<type>::value,
-                "float<->int conversions not allowed");
-};
-
-}  // namespace safe_minmax_impl
-
-template <
-    typename R = safe_minmax_impl::DefaultType,
-    typename T1 = safe_minmax_impl::DefaultType,
-    typename T2 = safe_minmax_impl::DefaultType,
-    typename R2 = typename safe_minmax_impl::TypeOr<
-        R,
-        typename safe_minmax_impl::MType<
-            typename safe_minmax_impl::UnderlyingType<T1>::type,
-            typename safe_minmax_impl::UnderlyingType<T2>::type>::min_t>::type>
-constexpr R2 SafeMin(T1 a, T2 b) {
-  static_assert(IsIntlike<T1>::value || std::is_floating_point<T1>::value,
-                "The first argument must be integral or floating-point");
-  static_assert(IsIntlike<T2>::value || std::is_floating_point<T2>::value,
-                "The second argument must be integral or floating-point");
-  return SafeLt(a, b) ? static_cast<R2>(a) : static_cast<R2>(b);
-}
-
-template <
-    typename R = safe_minmax_impl::DefaultType,
-    typename T1 = safe_minmax_impl::DefaultType,
-    typename T2 = safe_minmax_impl::DefaultType,
-    typename R2 = typename safe_minmax_impl::TypeOr<
-        R,
-        typename safe_minmax_impl::MType<
-            typename safe_minmax_impl::UnderlyingType<T1>::type,
-            typename safe_minmax_impl::UnderlyingType<T2>::type>::max_t>::type>
-constexpr R2 SafeMax(T1 a, T2 b) {
-  static_assert(IsIntlike<T1>::value || std::is_floating_point<T1>::value,
-                "The first argument must be integral or floating-point");
-  static_assert(IsIntlike<T2>::value || std::is_floating_point<T2>::value,
-                "The second argument must be integral or floating-point");
-  return SafeGt(a, b) ? static_cast<R2>(a) : static_cast<R2>(b);
-}
-
-namespace safe_minmax_impl {
-
-// Given three types T, L, and H, let ::type be a suitable return value for
-// SafeClamp(T, L, H). See the docs at the top of this file for details.
-template <typename T,
-          typename L,
-          typename H,
-          bool int1 = IsIntlike<T>::value,
-          bool int2 = IsIntlike<L>::value,
-          bool int3 = IsIntlike<H>::value>
-struct ClampType {
-  static_assert(int1 == int2 && int1 == int3,
-                "You may not mix integral and floating-point arguments");
-};
-
-// Specialization for when all three types are floating-point.
-template <typename T, typename L, typename H>
-struct ClampType<T, L, H, false, false, false> {
-  using type = typename std::common_type<T, L, H>::type;
-};
-
-// Specialization for when all three types are integral.
-template <typename T, typename L, typename H>
-struct ClampType<T, L, H, true, true, true> {
- private:
-  // Range of the return value. The return type must be able to represent this
-  // full range.
-  static constexpr auto r_min =
-      SafeMax(Limits<L>::lowest, SafeMin(Limits<H>::lowest, Limits<T>::lowest));
-  static constexpr auto r_max =
-      SafeMin(Limits<H>::max, SafeMax(Limits<L>::max, Limits<T>::max));
-
-  // Is the given type an acceptable return type? (That is, can it represent
-  // all possible return values, and is it no larger than the largest of the
-  // input types?)
-  template <typename A>
-  struct AcceptableType {
-   private:
-    static constexpr bool not_too_large = sizeof(A) <= sizeof(L) ||
-                                          sizeof(A) <= sizeof(H) ||
-                                          sizeof(A) <= sizeof(T);
-    static constexpr bool range_contained =
-        SafeLe(Limits<A>::lowest, r_min) && SafeLe(r_max, Limits<A>::max);
-
-   public:
-    static constexpr bool value = not_too_large && range_contained;
-  };
-
-  using best_signed_type = typename std::conditional<
-      AcceptableType<int8_t>::value,
-      int8_t,
-      typename std::conditional<
-          AcceptableType<int16_t>::value,
-          int16_t,
-          typename std::conditional<AcceptableType<int32_t>::value,
-                                    int32_t,
-                                    int64_t>::type>::type>::type;
-
-  using best_unsigned_type = typename std::conditional<
-      AcceptableType<uint8_t>::value,
-      uint8_t,
-      typename std::conditional<
-          AcceptableType<uint16_t>::value,
-          uint16_t,
-          typename std::conditional<AcceptableType<uint32_t>::value,
-                                    uint32_t,
-                                    uint64_t>::type>::type>::type;
-
- public:
-  // Pick the best type, preferring the same signedness as T but falling back
-  // to the other one if necessary.
-  using type = typename std::conditional<
-      std::is_signed<T>::value,
-      typename std::conditional<AcceptableType<best_signed_type>::value,
-                                best_signed_type,
-                                best_unsigned_type>::type,
-      typename std::conditional<AcceptableType<best_unsigned_type>::value,
-                                best_unsigned_type,
-                                best_signed_type>::type>::type;
-  static_assert(AcceptableType<type>::value, "");
-};
-
-}  // namespace safe_minmax_impl
-
-template <
-    typename R = safe_minmax_impl::DefaultType,
-    typename T = safe_minmax_impl::DefaultType,
-    typename L = safe_minmax_impl::DefaultType,
-    typename H = safe_minmax_impl::DefaultType,
-    typename R2 = typename safe_minmax_impl::TypeOr<
-        R,
-        typename safe_minmax_impl::ClampType<
-            typename safe_minmax_impl::UnderlyingType<T>::type,
-            typename safe_minmax_impl::UnderlyingType<L>::type,
-            typename safe_minmax_impl::UnderlyingType<H>::type>::type>::type>
-R2 SafeClamp(T x, L min, H max) {
-  static_assert(IsIntlike<H>::value || std::is_floating_point<H>::value,
-                "The first argument must be integral or floating-point");
-  static_assert(IsIntlike<T>::value || std::is_floating_point<T>::value,
-                "The second argument must be integral or floating-point");
-  static_assert(IsIntlike<L>::value || std::is_floating_point<L>::value,
-                "The third argument must be integral or floating-point");
-  RTC_DCHECK_LE(min, max);
-  return SafeLe(x, min)
-             ? static_cast<R2>(min)
-             : SafeGe(x, max) ? static_cast<R2>(max) : static_cast<R2>(x);
-}
-
-}  // namespace rtc
-
-#endif  // RTC_BASE_NUMERICS_SAFE_MINMAX_H_
diff --git a/submodules/libtgvoip/webrtc_dsp/rtc_base/platform_file.cc b/submodules/libtgvoip/webrtc_dsp/rtc_base/platform_file.cc
deleted file mode 100755
index f99336bb3e..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/rtc_base/platform_file.cc
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
- *  Copyright 2014 The WebRTC Project Authors. All rights reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#include "rtc_base/platform_file.h"
-
-#if defined(WEBRTC_WIN)
-#define UNICODE
-#include <io.h>
-
-#include "rtc_base/stringutils.h"  // For ToUtf16
-#else
-#include <fcntl.h>
-#include <sys/stat.h>
-#include <unistd.h>
-#endif
-
-namespace rtc {
-
-FILE* FdopenPlatformFileForWriting(PlatformFile file) {
-  return FdopenPlatformFile(file, "w");
-}
-
-#if defined(WEBRTC_WIN)
-const PlatformFile kInvalidPlatformFileValue = INVALID_HANDLE_VALUE;
-
-FILE* FdopenPlatformFile(PlatformFile file, const char* modes) {
-  if (file == kInvalidPlatformFileValue)
-    return nullptr;
-  int fd = _open_osfhandle(reinterpret_cast<intptr_t>(file), 0);
-  if (fd < 0)
-    return nullptr;
-
-  return _fdopen(fd, modes);
-}
-
-bool ClosePlatformFile(PlatformFile file) {
-  return CloseHandle(file) != 0;
-}
-
-bool RemoveFile(const std::string& path) {
-#if defined(WEBRTC_UWP)
-	return kInvalidPlatformFileValue;
-#else // defined(WEBRTC_WIN)
-  return ::DeleteFile(ToUtf16(path).c_str()) != 0;
-#endif
-}
-
-PlatformFile OpenPlatformFile(const std::string& path) {
-#if defined(WEBRTC_UWP)
-	return kInvalidPlatformFileValue;
-#else // defined(WEBRTC_WIN)
-  return ::CreateFile(ToUtf16(path).c_str(), GENERIC_READ | GENERIC_WRITE, 0,
-                      nullptr, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, nullptr);
-#endif // defined(WEBRTC_WIN)
-}
-
-PlatformFile OpenPlatformFileReadOnly(const std::string& path) {
-#if defined(WEBRTC_UWP)
-	return kInvalidPlatformFileValue;
-#else // defined(WEBRTC_WIN)
-  return ::CreateFile(ToUtf16(path).c_str(), GENERIC_READ, FILE_SHARE_READ,
-                      nullptr, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, nullptr);
-#endif // defined(WEBRTC_WIN)
-}
-
-PlatformFile CreatePlatformFile(const std::string& path) {
-#if defined(WEBRTC_UWP)
-	return kInvalidPlatformFileValue;
-#else // defined(WEBRTC_WIN)
-  return ::CreateFile(ToUtf16(path).c_str(), GENERIC_READ | GENERIC_WRITE, 0,
-                      nullptr, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, nullptr);
-#endif // defined(WEBRTC_WIN)
-}
-
-#else  // defined(WEBRTC_WIN)
-
-const PlatformFile kInvalidPlatformFileValue = -1;
-
-FILE* FdopenPlatformFile(PlatformFile file, const char* modes) {
-  return fdopen(file, modes);
-}
-
-bool ClosePlatformFile(PlatformFile file) {
-  return close(file) == 0;
-}
-
-bool RemoveFile(const std::string& path) {
-  return ::unlink(path.c_str()) == 0;
-}
-
-PlatformFile OpenPlatformFile(const std::string& path) {
-  return ::open(path.c_str(), O_RDWR);
-}
-
-PlatformFile OpenPlatformFileReadOnly(const std::string& path) {
-  return ::open(path.c_str(), O_RDONLY);
-}
-
-PlatformFile CreatePlatformFile(const std::string& path) {
-  return ::open(path.c_str(), O_CREAT | O_TRUNC | O_RDWR, S_IRUSR | S_IWUSR);
-}
-
-#endif
-
-}  // namespace rtc
diff --git a/submodules/libtgvoip/webrtc_dsp/rtc_base/platform_file.h b/submodules/libtgvoip/webrtc_dsp/rtc_base/platform_file.h
deleted file mode 100755
index f818f18f66..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/rtc_base/platform_file.h
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- *  Copyright 2014 The WebRTC Project Authors. All rights reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#ifndef RTC_BASE_PLATFORM_FILE_H_
-#define RTC_BASE_PLATFORM_FILE_H_
-
-#include <stdio.h>
-#include <string>
-
-#if defined(WEBRTC_WIN)
-#define UNICODE
-#include <WinSock2.h>
-#include <windows.h>
-#endif
-
-namespace rtc {
-
-#if defined(WEBRTC_WIN)
-typedef HANDLE PlatformFile;
-#elif defined(WEBRTC_POSIX)
-typedef int PlatformFile;
-#else
-#error Unsupported platform
-#endif
-
-extern const PlatformFile kInvalidPlatformFileValue;
-
-// Associates a standard FILE stream with an existing PlatformFile.
-// Note that after this function has returned a valid FILE stream,
-// the PlatformFile should no longer be used.
-FILE* FdopenPlatformFileForWriting(PlatformFile file);
-
-// Associates a standard FILE stream with an existing PlatformFile.
-// Note that after this function has returned a valid FILE stream,
-// the PlatformFile should no longer be used.
-FILE* FdopenPlatformFile(PlatformFile file, const char* modes);
-
-// Closes a PlatformFile. Returns true on success, false on failure.
-// Don't use ClosePlatformFile to close a file opened with FdopenPlatformFile.
-// Use fclose instead.
-bool ClosePlatformFile(PlatformFile file);
-
-// Removes a file in the filesystem.
-bool RemoveFile(const std::string& path);
-
-// Opens a file for reading and writing. You might want to use base/file.h
-// instead.
-PlatformFile OpenPlatformFile(const std::string& path);
-
-// Opens a file for reading only. You might want to use base/file.h
-// instead.
-PlatformFile OpenPlatformFileReadOnly(const std::string& path);
-
-// Creates a new file for reading and writing. If the file already exists it
-// will be overwritten. You might want to use base/file.h instead.
-PlatformFile CreatePlatformFile(const std::string& path);
-
-}  // namespace rtc
-
-#endif  // RTC_BASE_PLATFORM_FILE_H_
diff --git a/submodules/libtgvoip/webrtc_dsp/rtc_base/platform_thread.cc b/submodules/libtgvoip/webrtc_dsp/rtc_base/platform_thread.cc
deleted file mode 100644
index ba84b6ae8e..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/rtc_base/platform_thread.cc
+++ /dev/null
@@ -1,293 +0,0 @@
-/*
- *  Copyright (c) 2015 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#include "rtc_base/platform_thread.h"
-
-#if !defined(WEBRTC_WIN)
-#include <sched.h>
-#endif
-#include <stdint.h>
-#include <time.h>
-#include <algorithm>
-
-#include "rtc_base/atomicops.h"
-#include "rtc_base/checks.h"
-#include "rtc_base/timeutils.h"
-
-namespace rtc {
-namespace {
-#if defined(WEBRTC_WIN)
-void CALLBACK RaiseFlag(ULONG_PTR param) {
-  *reinterpret_cast<bool*>(param) = true;
-}
-#else
-struct ThreadAttributes {
-  ThreadAttributes() { pthread_attr_init(&attr); }
-  ~ThreadAttributes() { pthread_attr_destroy(&attr); }
-  pthread_attr_t* operator&() { return &attr; }
-  pthread_attr_t attr;
-};
-#endif  // defined(WEBRTC_WIN)
-}
-
-PlatformThread::PlatformThread(ThreadRunFunctionDeprecated func,
-                               void* obj,
-                               const char* thread_name)
-    : run_function_deprecated_(func),
-      obj_(obj),
-      name_(thread_name ? thread_name : "webrtc") {
-  RTC_DCHECK(func);
-  RTC_DCHECK(name_.length() < 64);
-  spawned_thread_checker_.DetachFromThread();
-}
-
-PlatformThread::PlatformThread(ThreadRunFunction func,
-                               void* obj,
-                               const char* thread_name,
-                               ThreadPriority priority /*= kNormalPriority*/)
-    : run_function_(func), priority_(priority), obj_(obj), name_(thread_name) {
-  RTC_DCHECK(func);
-  RTC_DCHECK(!name_.empty());
-  // TODO(tommi): Consider lowering the limit to 15 (limit on Linux).
-  RTC_DCHECK(name_.length() < 64);
-  spawned_thread_checker_.DetachFromThread();
-}
-
-PlatformThread::~PlatformThread() {
-  RTC_DCHECK(thread_checker_.CalledOnValidThread());
-#if defined(WEBRTC_WIN)
-  RTC_DCHECK(!thread_);
-  RTC_DCHECK(!thread_id_);
-#endif  // defined(WEBRTC_WIN)
-}
-
-#if defined(WEBRTC_WIN)
-DWORD WINAPI PlatformThread::StartThread(void* param) {
-  // The GetLastError() function only returns valid results when it is called
-  // after a Win32 API function that returns a "failed" result. A crash dump
-  // contains the result from GetLastError() and to make sure it does not
-  // falsely report a Windows error we call SetLastError here.
-  ::SetLastError(ERROR_SUCCESS);
-  static_cast<PlatformThread*>(param)->Run();
-  return 0;
-}
-#else
-void* PlatformThread::StartThread(void* param) {
-  static_cast<PlatformThread*>(param)->Run();
-  return 0;
-}
-#endif  // defined(WEBRTC_WIN)
-
-void PlatformThread::Start() {
-  RTC_DCHECK(thread_checker_.CalledOnValidThread());
-  RTC_DCHECK(!thread_) << "Thread already started?";
-#if defined(WEBRTC_WIN)
-  stop_ = false;
-
-  // See bug 2902 for background on STACK_SIZE_PARAM_IS_A_RESERVATION.
-  // Set the reserved stack stack size to 1M, which is the default on Windows
-  // and Linux.
-  thread_ = ::CreateThread(nullptr, 1024 * 1024, &StartThread, this,
-                           STACK_SIZE_PARAM_IS_A_RESERVATION, &thread_id_);
-  RTC_CHECK(thread_) << "CreateThread failed";
-  RTC_DCHECK(thread_id_);
-#else
-  ThreadAttributes attr;
-  // Set the stack stack size to 1M.
-  pthread_attr_setstacksize(&attr, 1024 * 1024);
-  RTC_CHECK_EQ(0, pthread_create(&thread_, &attr, &StartThread, this));
-#endif  // defined(WEBRTC_WIN)
-}
-
-bool PlatformThread::IsRunning() const {
-  RTC_DCHECK(thread_checker_.CalledOnValidThread());
-#if defined(WEBRTC_WIN)
-  return thread_ != nullptr;
-#else
-  return thread_ != 0;
-#endif  // defined(WEBRTC_WIN)
-}
-
-PlatformThreadRef PlatformThread::GetThreadRef() const {
-#if defined(WEBRTC_WIN)
-  return thread_id_;
-#else
-  return thread_;
-#endif  // defined(WEBRTC_WIN)
-}
-
-void PlatformThread::Stop() {
-  RTC_DCHECK(thread_checker_.CalledOnValidThread());
-  if (!IsRunning())
-    return;
-
-#if defined(WEBRTC_WIN)
-  // Set stop_ to |true| on the worker thread.
-  bool queued = QueueAPC(&RaiseFlag, reinterpret_cast<ULONG_PTR>(&stop_));
-  // Queuing the APC can fail if the thread is being terminated.
-  RTC_CHECK(queued || GetLastError() == ERROR_GEN_FAILURE);
-  WaitForSingleObject(thread_, INFINITE);
-  CloseHandle(thread_);
-  thread_ = nullptr;
-  thread_id_ = 0;
-#else
-  if (!run_function_)
-    RTC_CHECK_EQ(1, AtomicOps::Increment(&stop_flag_));
-  RTC_CHECK_EQ(0, pthread_join(thread_, nullptr));
-  if (!run_function_)
-    AtomicOps::ReleaseStore(&stop_flag_, 0);
-  thread_ = 0;
-#endif  // defined(WEBRTC_WIN)
-  spawned_thread_checker_.DetachFromThread();
-}
-
-// TODO(tommi): Deprecate the loop behavior in PlatformThread.
-// * Introduce a new callback type that returns void.
-// * Remove potential for a busy loop in PlatformThread.
-// * Delegate the responsibility for how to stop the thread, to the
-//   implementation that actually uses the thread.
-// All implementations will need to be aware of how the thread should be stopped
-// and encouraging a busy polling loop, can be costly in terms of power and cpu.
-void PlatformThread::Run() {
-  // Attach the worker thread checker to this thread.
-  RTC_DCHECK(spawned_thread_checker_.CalledOnValidThread());
-  rtc::SetCurrentThreadName(name_.c_str());
-
-  if (run_function_) {
-    SetPriority(priority_);
-    run_function_(obj_);
-    return;
-  }
-
-// TODO(tommi): Delete the rest of this function when looping isn't supported.
-#if RTC_DCHECK_IS_ON
-  // These constants control the busy loop detection algorithm below.
-  // |kMaxLoopCount| controls the limit for how many times we allow the loop
-  // to run within a period, before DCHECKing.
-  // |kPeriodToMeasureMs| controls how long that period is.
-  static const int kMaxLoopCount = 1000;
-  static const int kPeriodToMeasureMs = 100;
-  int64_t loop_stamps[kMaxLoopCount] = {};
-  int64_t sequence_nr = 0;
-#endif
-
-  do {
-    // The interface contract of Start/Stop is that for a successful call to
-    // Start, there should be at least one call to the run function.  So we
-    // call the function before checking |stop_|.
-    if (!run_function_deprecated_(obj_))
-      break;
-#if RTC_DCHECK_IS_ON
-    auto id = sequence_nr % kMaxLoopCount;
-    loop_stamps[id] = rtc::TimeMillis();
-    if (sequence_nr > kMaxLoopCount) {
-      auto compare_id = (id + 1) % kMaxLoopCount;
-      auto diff = loop_stamps[id] - loop_stamps[compare_id];
-      RTC_DCHECK_GE(diff, 0);
-      if (diff < kPeriodToMeasureMs) {
-        RTC_NOTREACHED() << "This thread is too busy: " << name_ << " " << diff
-                         << "ms sequence=" << sequence_nr << " "
-                         << loop_stamps[id] << " vs " << loop_stamps[compare_id]
-                         << ", " << id << " vs " << compare_id;
-      }
-    }
-    ++sequence_nr;
-#endif
-#if defined(WEBRTC_WIN)
-    // Alertable sleep to permit RaiseFlag to run and update |stop_|.
-    SleepEx(0, true);
-  } while (!stop_);
-#else
-#if defined(WEBRTC_MAC) || defined(WEBRTC_ANDROID)
-    sched_yield();
-#else
-    static const struct timespec ts_null = {0};
-    nanosleep(&ts_null, nullptr);
-#endif
-  } while (!AtomicOps::AcquireLoad(&stop_flag_));
-#endif  // defined(WEBRTC_WIN)
-}
-
-bool PlatformThread::SetPriority(ThreadPriority priority) {
-#if RTC_DCHECK_IS_ON
-  if (run_function_) {
-    // The non-deprecated way of how this function gets called, is that it must
-    // be called on the worker thread itself.
-    RTC_DCHECK(!thread_checker_.CalledOnValidThread());
-    RTC_DCHECK(spawned_thread_checker_.CalledOnValidThread());
-  } else {
-    // In the case of deprecated use of this method, it must be called on the
-    // same thread as the PlatformThread object is constructed on.
-    RTC_DCHECK(thread_checker_.CalledOnValidThread());
-    RTC_DCHECK(IsRunning());
-  }
-#endif
-
-#if defined(WEBRTC_WIN)
-  return SetThreadPriority(thread_, priority) != FALSE;
-#elif defined(__native_client__) || defined(WEBRTC_FUCHSIA)
-  // Setting thread priorities is not supported in NaCl or Fuchsia.
-  return true;
-#elif defined(WEBRTC_CHROMIUM_BUILD) && defined(WEBRTC_LINUX)
-  // TODO(tommi): Switch to the same mechanism as Chromium uses for changing
-  // thread priorities.
-  return true;
-#else
-#ifdef WEBRTC_THREAD_RR
-  const int policy = SCHED_RR;
-#else
-  const int policy = SCHED_FIFO;
-#endif
-  const int min_prio = sched_get_priority_min(policy);
-  const int max_prio = sched_get_priority_max(policy);
-  if (min_prio == -1 || max_prio == -1) {
-    return false;
-  }
-
-  if (max_prio - min_prio <= 2)
-    return false;
-
-  // Convert webrtc priority to system priorities:
-  sched_param param;
-  const int top_prio = max_prio - 1;
-  const int low_prio = min_prio + 1;
-  switch (priority) {
-    case kLowPriority:
-      param.sched_priority = low_prio;
-      break;
-    case kNormalPriority:
-      // The -1 ensures that the kHighPriority is always greater or equal to
-      // kNormalPriority.
-      param.sched_priority = (low_prio + top_prio - 1) / 2;
-      break;
-    case kHighPriority:
-      param.sched_priority = std::max(top_prio - 2, low_prio);
-      break;
-    case kHighestPriority:
-      param.sched_priority = std::max(top_prio - 1, low_prio);
-      break;
-    case kRealtimePriority:
-      param.sched_priority = top_prio;
-      break;
-  }
-  return pthread_setschedparam(thread_, policy, &param) == 0;
-#endif  // defined(WEBRTC_WIN)
-}
-
-#if defined(WEBRTC_WIN)
-bool PlatformThread::QueueAPC(PAPCFUNC function, ULONG_PTR data) {
-  RTC_DCHECK(thread_checker_.CalledOnValidThread());
-  RTC_DCHECK(IsRunning());
-
-  return QueueUserAPC(function, thread_, data) != FALSE;
-}
-#endif
-
-}  // namespace rtc
diff --git a/submodules/libtgvoip/webrtc_dsp/rtc_base/platform_thread.h b/submodules/libtgvoip/webrtc_dsp/rtc_base/platform_thread.h
deleted file mode 100644
index 47c23dc1b5..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/rtc_base/platform_thread.h
+++ /dev/null
@@ -1,117 +0,0 @@
-/*
- *  Copyright (c) 2015 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#ifndef RTC_BASE_PLATFORM_THREAD_H_
-#define RTC_BASE_PLATFORM_THREAD_H_
-
-#ifndef WEBRTC_WIN
-#include <pthread.h>
-#endif
-#include <string>
-
-#include "rtc_base/constructormagic.h"
-#include "rtc_base/platform_thread_types.h"
-#include "rtc_base/thread_checker.h"
-
-namespace rtc {
-
-// Callback function that the spawned thread will enter once spawned.
-// A return value of false is interpreted as that the function has no
-// more work to do and that the thread can be released.
-typedef bool (*ThreadRunFunctionDeprecated)(void*);
-typedef void (*ThreadRunFunction)(void*);
-
-enum ThreadPriority {
-#ifdef WEBRTC_WIN
-  kLowPriority = THREAD_PRIORITY_BELOW_NORMAL,
-  kNormalPriority = THREAD_PRIORITY_NORMAL,
-  kHighPriority = THREAD_PRIORITY_ABOVE_NORMAL,
-  kHighestPriority = THREAD_PRIORITY_HIGHEST,
-  kRealtimePriority = THREAD_PRIORITY_TIME_CRITICAL
-#else
-  kLowPriority = 1,
-  kNormalPriority = 2,
-  kHighPriority = 3,
-  kHighestPriority = 4,
-  kRealtimePriority = 5
-#endif
-};
-
-// Represents a simple worker thread.  The implementation must be assumed
-// to be single threaded, meaning that all methods of the class, must be
-// called from the same thread, including instantiation.
-class PlatformThread {
- public:
-  PlatformThread(ThreadRunFunctionDeprecated func,
-                 void* obj,
-                 const char* thread_name);
-  PlatformThread(ThreadRunFunction func,
-                 void* obj,
-                 const char* thread_name,
-                 ThreadPriority priority = kNormalPriority);
-  virtual ~PlatformThread();
-
-  const std::string& name() const { return name_; }
-
-  // Spawns a thread and tries to set thread priority according to the priority
-  // from when CreateThread was called.
-  void Start();
-
-  bool IsRunning() const;
-
-  // Returns an identifier for the worker thread that can be used to do
-  // thread checks.
-  PlatformThreadRef GetThreadRef() const;
-
-  // Stops (joins) the spawned thread.
-  void Stop();
-
-  // Set the priority of the thread. Must be called when thread is running.
-  // TODO(tommi): Make private and only allow public support via ctor.
-  bool SetPriority(ThreadPriority priority);
-
- protected:
-#if defined(WEBRTC_WIN)
-  // Exposed to derived classes to allow for special cases specific to Windows.
-  bool QueueAPC(PAPCFUNC apc_function, ULONG_PTR data);
-#endif
-
- private:
-  void Run();
-
-  ThreadRunFunctionDeprecated const run_function_deprecated_ = nullptr;
-  ThreadRunFunction const run_function_ = nullptr;
-  const ThreadPriority priority_ = kNormalPriority;
-  void* const obj_;
-  // TODO(pbos): Make sure call sites use string literals and update to a const
-  // char* instead of a std::string.
-  const std::string name_;
-  rtc::ThreadChecker thread_checker_;
-  rtc::ThreadChecker spawned_thread_checker_;
-#if defined(WEBRTC_WIN)
-  static DWORD WINAPI StartThread(void* param);
-
-  bool stop_ = false;
-  HANDLE thread_ = nullptr;
-  DWORD thread_id_ = 0;
-#else
-  static void* StartThread(void* param);
-
-  // An atomic flag that we use to stop the thread. Only modified on the
-  // controlling thread and checked on the worker thread.
-  volatile int stop_flag_ = 0;
-  pthread_t thread_ = 0;
-#endif  // defined(WEBRTC_WIN)
-  RTC_DISALLOW_COPY_AND_ASSIGN(PlatformThread);
-};
-
-}  // namespace rtc
-
-#endif  // RTC_BASE_PLATFORM_THREAD_H_
diff --git a/submodules/libtgvoip/webrtc_dsp/rtc_base/platform_thread_types.cc b/submodules/libtgvoip/webrtc_dsp/rtc_base/platform_thread_types.cc
deleted file mode 100644
index 70cf2378b6..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/rtc_base/platform_thread_types.cc
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- *  Copyright (c) 2018 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#include "rtc_base/platform_thread_types.h"
-
-#if defined(WEBRTC_LINUX)
-#include <sys/prctl.h>
-#include <sys/syscall.h>
-#endif
-
-namespace rtc {
-
-PlatformThreadId CurrentThreadId() {
-#if defined(WEBRTC_WIN)
-  return GetCurrentThreadId();
-#elif defined(WEBRTC_POSIX)
-#if defined(WEBRTC_MAC) || defined(WEBRTC_IOS)
-  return pthread_mach_thread_np(pthread_self());
-#elif defined(WEBRTC_ANDROID)
-  return gettid();
-#elif defined(WEBRTC_FUCHSIA)
-  return zx_thread_self();
-#elif defined(WEBRTC_LINUX)
-  return syscall(__NR_gettid);
-#else
-  // Default implementation for nacl and solaris.
-  return reinterpret_cast<pid_t>(pthread_self());
-#endif
-#endif  // defined(WEBRTC_POSIX)
-}
-
-PlatformThreadRef CurrentThreadRef() {
-#if defined(WEBRTC_WIN)
-  return GetCurrentThreadId();
-#elif defined(WEBRTC_FUCHSIA)
-  return zx_thread_self();
-#elif defined(WEBRTC_POSIX)
-  return pthread_self();
-#endif
-}
-
-bool IsThreadRefEqual(const PlatformThreadRef& a, const PlatformThreadRef& b) {
-#if defined(WEBRTC_WIN) || defined(WEBRTC_FUCHSIA)
-  return a == b;
-#elif defined(WEBRTC_POSIX)
-  return pthread_equal(a, b);
-#endif
-}
-
-void SetCurrentThreadName(const char* name) {
-#if defined(WEBRTC_WIN)
-  struct {
-    DWORD dwType;
-    LPCSTR szName;
-    DWORD dwThreadID;
-    DWORD dwFlags;
-  } threadname_info = {0x1000, name, static_cast<DWORD>(-1), 0};
-
-  __try {
-    ::RaiseException(0x406D1388, 0, sizeof(threadname_info) / sizeof(DWORD),
-                     reinterpret_cast<ULONG_PTR*>(&threadname_info));
-  } __except (EXCEPTION_EXECUTE_HANDLER) {  // NOLINT
-  }
-#elif defined(WEBRTC_LINUX) || defined(WEBRTC_ANDROID)
-  //prctl(PR_SET_NAME, reinterpret_cast<unsigned long>(name));  // NOLINT
-#elif defined(WEBRTC_MAC) || defined(WEBRTC_IOS)
-  pthread_setname_np(name);
-#endif
-}
-
-}  // namespace rtc
diff --git a/submodules/libtgvoip/webrtc_dsp/rtc_base/platform_thread_types.h b/submodules/libtgvoip/webrtc_dsp/rtc_base/platform_thread_types.h
deleted file mode 100644
index 0bc42eb2c2..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/rtc_base/platform_thread_types.h
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- *  Copyright (c) 2015 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#ifndef RTC_BASE_PLATFORM_THREAD_TYPES_H_
-#define RTC_BASE_PLATFORM_THREAD_TYPES_H_
-
-// clang-format off
-// clang formating would change include order.
-#if defined(WEBRTC_WIN)
-// Include winsock2.h before including <windows.h> to maintain consistency with
-// win32.h. To include win32.h directly, it must be broken out into its own
-// build target.
-#include <winsock2.h>
-#include <windows.h>
-#elif defined(WEBRTC_FUCHSIA)
-#include <zircon/types.h>
-#include <zircon/process.h>
-#elif defined(WEBRTC_POSIX)
-#include <pthread.h>
-#include <unistd.h>
-#endif
-// clang-format on
-
-namespace rtc {
-#if defined(WEBRTC_WIN)
-typedef DWORD PlatformThreadId;
-typedef DWORD PlatformThreadRef;
-#elif defined(WEBRTC_FUCHSIA)
-typedef zx_handle_t PlatformThreadId;
-typedef zx_handle_t PlatformThreadRef;
-#elif defined(WEBRTC_POSIX)
-typedef pid_t PlatformThreadId;
-typedef pthread_t PlatformThreadRef;
-#endif
-
-// Retrieve the ID of the current thread.
-PlatformThreadId CurrentThreadId();
-
-// Retrieves a reference to the current thread. On Windows, this is the same
-// as CurrentThreadId. On other platforms it's the pthread_t returned by
-// pthread_self().
-PlatformThreadRef CurrentThreadRef();
-
-// Compares two thread identifiers for equality.
-bool IsThreadRefEqual(const PlatformThreadRef& a, const PlatformThreadRef& b);
-
-// Sets the current thread name.
-void SetCurrentThreadName(const char* name);
-
-}  // namespace rtc
-
-#endif  // RTC_BASE_PLATFORM_THREAD_TYPES_H_
diff --git a/submodules/libtgvoip/webrtc_dsp/rtc_base/protobuf_utils.h b/submodules/libtgvoip/webrtc_dsp/rtc_base/protobuf_utils.h
deleted file mode 100644
index 8fbc06060e..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/rtc_base/protobuf_utils.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- *  Copyright (c) 2017 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#include <string>
-
-#ifndef RTC_BASE_PROTOBUF_UTILS_H_
-#define RTC_BASE_PROTOBUF_UTILS_H_
-
-namespace webrtc {
-
-using ProtoString = std::string;
-
-}  // namespace webrtc
-
-#if WEBRTC_ENABLE_PROTOBUF
-
-#include "third_party/protobuf/src/google/protobuf/message_lite.h"
-#include "third_party/protobuf/src/google/protobuf/repeated_field.h"
-
-namespace webrtc {
-
-using google::protobuf::MessageLite;
-using google::protobuf::RepeatedPtrField;
-
-}  // namespace webrtc
-
-#endif  // WEBRTC_ENABLE_PROTOBUF
-
-#endif  // RTC_BASE_PROTOBUF_UTILS_H_
diff --git a/submodules/libtgvoip/webrtc_dsp/rtc_base/race_checker.cc b/submodules/libtgvoip/webrtc_dsp/rtc_base/race_checker.cc
deleted file mode 100644
index bf9dfdcdaa..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/rtc_base/race_checker.cc
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- *  Copyright (c) 2016 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#include "rtc_base/race_checker.h"
-
-namespace rtc {
-
-RaceChecker::RaceChecker() {}
-
-// Note that the implementation here is in itself racy, but we pretend it does
-// not matter because we want this useful in release builds without having to
-// pay the cost of using atomics. A race hitting the race checker is likely to
-// cause access_count_ to diverge from zero and therefore cause the ThreadRef
-// comparison to fail, signaling a race, although it may not be in the exact
-// spot where a race *first* appeared in the code we're trying to protect. There
-// is also a chance that an actual race is missed, however the probability of
-// that has been considered small enough to be an acceptable trade off.
-bool RaceChecker::Acquire() const {
-  const PlatformThreadRef current_thread = CurrentThreadRef();
-  // Set new accessing thread if this is a new use.
-  if (access_count_++ == 0)
-    accessing_thread_ = current_thread;
-  // If this is being used concurrently this check will fail for the second
-  // thread entering since it won't set the thread. Recursive use of checked
-  // methods are OK since the accessing thread remains the same.
-  const PlatformThreadRef accessing_thread = accessing_thread_;
-  return IsThreadRefEqual(accessing_thread, current_thread);
-}
-
-void RaceChecker::Release() const {
-  --access_count_;
-}
-
-namespace internal {
-RaceCheckerScope::RaceCheckerScope(const RaceChecker* race_checker)
-    : race_checker_(race_checker), race_check_ok_(race_checker->Acquire()) {}
-
-bool RaceCheckerScope::RaceDetected() const {
-  return !race_check_ok_;
-}
-
-RaceCheckerScope::~RaceCheckerScope() {
-  race_checker_->Release();
-}
-
-}  // namespace internal
-}  // namespace rtc
diff --git a/submodules/libtgvoip/webrtc_dsp/rtc_base/race_checker.h b/submodules/libtgvoip/webrtc_dsp/rtc_base/race_checker.h
deleted file mode 100644
index 4d574601eb..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/rtc_base/race_checker.h
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- *  Copyright (c) 2016 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#ifndef RTC_BASE_RACE_CHECKER_H_
-#define RTC_BASE_RACE_CHECKER_H_
-
-#include "rtc_base/checks.h"
-#include "rtc_base/platform_thread_types.h"
-#include "rtc_base/thread_annotations.h"
-
-namespace rtc {
-
-namespace internal {
-class RaceCheckerScope;
-}  // namespace internal
-
-// Best-effort race-checking implementation. This primitive uses no
-// synchronization at all to be as-fast-as-possible in the non-racy case.
-class RTC_LOCKABLE RaceChecker {
- public:
-  friend class internal::RaceCheckerScope;
-  RaceChecker();
-
- private:
-  bool Acquire() const RTC_EXCLUSIVE_LOCK_FUNCTION();
-  void Release() const RTC_UNLOCK_FUNCTION();
-
-  // Volatile to prevent code being optimized away in Acquire()/Release().
-  mutable volatile int access_count_ = 0;
-  mutable volatile PlatformThreadRef accessing_thread_;
-};
-
-namespace internal {
-class RTC_SCOPED_LOCKABLE RaceCheckerScope {
- public:
-  explicit RaceCheckerScope(const RaceChecker* race_checker)
-      RTC_EXCLUSIVE_LOCK_FUNCTION(race_checker);
-
-  bool RaceDetected() const;
-  ~RaceCheckerScope() RTC_UNLOCK_FUNCTION();
-
- private:
-  const RaceChecker* const race_checker_;
-  const bool race_check_ok_;
-};
-
-class RTC_SCOPED_LOCKABLE RaceCheckerScopeDoNothing {
- public:
-  explicit RaceCheckerScopeDoNothing(const RaceChecker* race_checker)
-      RTC_EXCLUSIVE_LOCK_FUNCTION(race_checker) {}
-
-  ~RaceCheckerScopeDoNothing() RTC_UNLOCK_FUNCTION() {}
-};
-
-}  // namespace internal
-}  // namespace rtc
-
-#define RTC_CHECK_RUNS_SERIALIZED(x)               \
-  rtc::internal::RaceCheckerScope race_checker(x); \
-  RTC_CHECK(!race_checker.RaceDetected())
-
-#if RTC_DCHECK_IS_ON
-#define RTC_DCHECK_RUNS_SERIALIZED(x)              \
-  rtc::internal::RaceCheckerScope race_checker(x); \
-  RTC_DCHECK(!race_checker.RaceDetected())
-#else
-#define RTC_DCHECK_RUNS_SERIALIZED(x) \
-  rtc::internal::RaceCheckerScopeDoNothing race_checker(x)
-#endif
-
-#endif  // RTC_BASE_RACE_CHECKER_H_
diff --git a/submodules/libtgvoip/webrtc_dsp/rtc_base/refcount.h b/submodules/libtgvoip/webrtc_dsp/rtc_base/refcount.h
deleted file mode 100644
index fb0971ce01..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/rtc_base/refcount.h
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- *  Copyright 2011 The WebRTC Project Authors. All rights reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-#ifndef RTC_BASE_REFCOUNT_H_
-#define RTC_BASE_REFCOUNT_H_
-
-namespace rtc {
-
-// Refcounted objects should implement the following informal interface:
-//
-// void AddRef() const ;
-// RefCountReleaseStatus Release() const;
-//
-// You may access members of a reference-counted object, including the AddRef()
-// and Release() methods, only if you already own a reference to it, or if
-// you're borrowing someone else's reference. (A newly created object is a
-// special case: the reference count is zero on construction, and the code that
-// creates the object should immediately call AddRef(), bringing the reference
-// count from zero to one, e.g., by constructing an rtc::scoped_refptr).
-//
-// AddRef() creates a new reference to the object.
-//
-// Release() releases a reference to the object; the caller now has one less
-// reference than before the call. Returns kDroppedLastRef if the number of
-// references dropped to zero because of this (in which case the object destroys
-// itself). Otherwise, returns kOtherRefsRemained, to signal that at the precise
-// time the caller's reference was dropped, other references still remained (but
-// if other threads own references, this may of course have changed by the time
-// Release() returns).
-//
-// The caller of Release() must treat it in the same way as a delete operation:
-// Regardless of the return value from Release(), the caller mustn't access the
-// object. The object might still be alive, due to references held by other
-// users of the object, but the object can go away at any time, e.g., as the
-// result of another thread calling Release().
-//
-// Calling AddRef() and Release() manually is discouraged. It's recommended to
-// use rtc::scoped_refptr to manage all pointers to reference counted objects.
-// Note that rtc::scoped_refptr depends on compile-time duck-typing; formally
-// implementing the below RefCountInterface is not required.
-
-enum class RefCountReleaseStatus { kDroppedLastRef, kOtherRefsRemained };
-
-// Interfaces where refcounting is part of the public api should
-// inherit this abstract interface. The implementation of these
-// methods is usually provided by the RefCountedObject template class,
-// applied as a leaf in the inheritance tree.
-class RefCountInterface {
- public:
-  virtual void AddRef() const = 0;
-  virtual RefCountReleaseStatus Release() const = 0;
-
-  // Non-public destructor, because Release() has exclusive responsibility for
-  // destroying the object.
- protected:
-  virtual ~RefCountInterface() {}
-};
-
-}  // namespace rtc
-
-#endif  // RTC_BASE_REFCOUNT_H_
diff --git a/submodules/libtgvoip/webrtc_dsp/rtc_base/refcountedobject.h b/submodules/libtgvoip/webrtc_dsp/rtc_base/refcountedobject.h
deleted file mode 100644
index da3ed9ff2f..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/rtc_base/refcountedobject.h
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- *  Copyright 2016 The WebRTC Project Authors. All rights reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-#ifndef RTC_BASE_REFCOUNTEDOBJECT_H_
-#define RTC_BASE_REFCOUNTEDOBJECT_H_
-
-#include <utility>
-
-#include "rtc_base/constructormagic.h"
-#include "rtc_base/refcount.h"
-#include "rtc_base/refcounter.h"
-
-namespace rtc {
-
-template <class T>
-class RefCountedObject : public T {
- public:
-  RefCountedObject() {}
-
-  template <class P0>
-  explicit RefCountedObject(P0&& p0) : T(std::forward<P0>(p0)) {}
-
-  template <class P0, class P1, class... Args>
-  RefCountedObject(P0&& p0, P1&& p1, Args&&... args)
-      : T(std::forward<P0>(p0),
-          std::forward<P1>(p1),
-          std::forward<Args>(args)...) {}
-
-  virtual void AddRef() const { ref_count_.IncRef(); }
-
-  virtual RefCountReleaseStatus Release() const {
-    const auto status = ref_count_.DecRef();
-    if (status == RefCountReleaseStatus::kDroppedLastRef) {
-      delete this;
-    }
-    return status;
-  }
-
-  // Return whether the reference count is one. If the reference count is used
-  // in the conventional way, a reference count of 1 implies that the current
-  // thread owns the reference and no other thread shares it. This call
-  // performs the test for a reference count of one, and performs the memory
-  // barrier needed for the owning thread to act on the object, knowing that it
-  // has exclusive access to the object.
-  virtual bool HasOneRef() const { return ref_count_.HasOneRef(); }
-
- protected:
-  virtual ~RefCountedObject() {}
-
-  mutable webrtc::webrtc_impl::RefCounter ref_count_{0};
-
-  RTC_DISALLOW_COPY_AND_ASSIGN(RefCountedObject);
-};
-
-}  // namespace rtc
-
-#endif  // RTC_BASE_REFCOUNTEDOBJECT_H_
diff --git a/submodules/libtgvoip/webrtc_dsp/rtc_base/refcounter.h b/submodules/libtgvoip/webrtc_dsp/rtc_base/refcounter.h
deleted file mode 100644
index 3906529c25..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/rtc_base/refcounter.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- *  Copyright 2017 The WebRTC Project Authors. All rights reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-#ifndef RTC_BASE_REFCOUNTER_H_
-#define RTC_BASE_REFCOUNTER_H_
-
-#include "rtc_base/atomicops.h"
-#include "rtc_base/refcount.h"
-
-namespace webrtc {
-namespace webrtc_impl {
-
-class RefCounter {
- public:
-  explicit RefCounter(int ref_count) : ref_count_(ref_count) {}
-  RefCounter() = delete;
-
-  void IncRef() { rtc::AtomicOps::Increment(&ref_count_); }
-
-  // TODO(nisse): Switch return type to RefCountReleaseStatus?
-  // Returns true if this was the last reference, and the resource protected by
-  // the reference counter can be deleted.
-  rtc::RefCountReleaseStatus DecRef() {
-    return (rtc::AtomicOps::Decrement(&ref_count_) == 0)
-               ? rtc::RefCountReleaseStatus::kDroppedLastRef
-               : rtc::RefCountReleaseStatus::kOtherRefsRemained;
-  }
-
-  // Return whether the reference count is one. If the reference count is used
-  // in the conventional way, a reference count of 1 implies that the current
-  // thread owns the reference and no other thread shares it. This call performs
-  // the test for a reference count of one, and performs the memory barrier
-  // needed for the owning thread to act on the resource protected by the
-  // reference counter, knowing that it has exclusive access.
-  bool HasOneRef() const {
-    return rtc::AtomicOps::AcquireLoad(&ref_count_) == 1;
-  }
-
- private:
-  volatile int ref_count_;
-};
-
-}  // namespace webrtc_impl
-}  // namespace webrtc
-
-#endif  // RTC_BASE_REFCOUNTER_H_
diff --git a/submodules/libtgvoip/webrtc_dsp/rtc_base/sanitizer.h b/submodules/libtgvoip/webrtc_dsp/rtc_base/sanitizer.h
deleted file mode 100644
index d4e80e4974..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/rtc_base/sanitizer.h
+++ /dev/null
@@ -1,145 +0,0 @@
-/*
- *  Copyright 2016 The WebRTC Project Authors. All rights reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#ifndef RTC_BASE_SANITIZER_H_
-#define RTC_BASE_SANITIZER_H_
-
-#include <stddef.h>  // For size_t.
-
-#ifdef __cplusplus
-#include <type_traits>
-#endif
-
-#if defined(__has_feature)
-#if __has_feature(address_sanitizer)
-#define RTC_HAS_ASAN 1
-#endif
-#if __has_feature(memory_sanitizer)
-#define RTC_HAS_MSAN 1
-#endif
-#endif
-#ifndef RTC_HAS_ASAN
-#define RTC_HAS_ASAN 0
-#endif
-#ifndef RTC_HAS_MSAN
-#define RTC_HAS_MSAN 0
-#endif
-
-#if RTC_HAS_ASAN
-#include <sanitizer/asan_interface.h>
-#endif
-#if RTC_HAS_MSAN
-#include <sanitizer/msan_interface.h>
-#endif
-
-#ifdef __has_attribute
-#if __has_attribute(no_sanitize)
-#define RTC_NO_SANITIZE(what) __attribute__((no_sanitize(what)))
-#endif
-#endif
-#ifndef RTC_NO_SANITIZE
-#define RTC_NO_SANITIZE(what)
-#endif
-
-// Ask ASan to mark the memory range [ptr, ptr + element_size * num_elements)
-// as being unaddressable, so that reads and writes are not allowed. ASan may
-// narrow the range to the nearest alignment boundaries.
-static inline void rtc_AsanPoison(const volatile void* ptr,
-                                  size_t element_size,
-                                  size_t num_elements) {
-#if RTC_HAS_ASAN
-  ASAN_POISON_MEMORY_REGION(ptr, element_size * num_elements);
-#endif
-}
-
-// Ask ASan to mark the memory range [ptr, ptr + element_size * num_elements)
-// as being addressable, so that reads and writes are allowed. ASan may widen
-// the range to the nearest alignment boundaries.
-static inline void rtc_AsanUnpoison(const volatile void* ptr,
-                                    size_t element_size,
-                                    size_t num_elements) {
-#if RTC_HAS_ASAN
-  ASAN_UNPOISON_MEMORY_REGION(ptr, element_size * num_elements);
-#endif
-}
-
-// Ask MSan to mark the memory range [ptr, ptr + element_size * num_elements)
-// as being uninitialized.
-static inline void rtc_MsanMarkUninitialized(const volatile void* ptr,
-                                             size_t element_size,
-                                             size_t num_elements) {
-#if RTC_HAS_MSAN
-  __msan_poison(ptr, element_size * num_elements);
-#endif
-}
-
-// Force an MSan check (if any bits in the memory range [ptr, ptr +
-// element_size * num_elements) are uninitialized the call will crash with an
-// MSan report).
-static inline void rtc_MsanCheckInitialized(const volatile void* ptr,
-                                            size_t element_size,
-                                            size_t num_elements) {
-#if RTC_HAS_MSAN
-  __msan_check_mem_is_initialized(ptr, element_size * num_elements);
-#endif
-}
-
-#ifdef __cplusplus
-
-namespace rtc {
-namespace sanitizer_impl {
-
-template <typename T>
-constexpr bool IsTriviallyCopyable() {
-/*  return static_cast<bool>(std::is_trivially_copy_constructible<T>::value &&
-                           (std::is_trivially_copy_assignable<T>::value ||
-                            !std::is_copy_assignable<T>::value) &&
-                           std::is_trivially_destructible<T>::value);*/
-  return false; // I don't care, just compile please. Grishka
-}
-
-}  // namespace sanitizer_impl
-
-template <typename T>
-inline void AsanPoison(const T& mem) {
-  rtc_AsanPoison(mem.data(), sizeof(mem.data()[0]), mem.size());
-}
-
-template <typename T>
-inline void AsanUnpoison(const T& mem) {
-  rtc_AsanUnpoison(mem.data(), sizeof(mem.data()[0]), mem.size());
-}
-
-template <typename T>
-inline void MsanMarkUninitialized(const T& mem) {
-  rtc_MsanMarkUninitialized(mem.data(), sizeof(mem.data()[0]), mem.size());
-}
-
-template <typename T>
-inline T MsanUninitialized(T t) {
-#if RTC_HAS_MSAN
-  // TODO(bugs.webrtc.org/8762): Switch to std::is_trivially_copyable when it
-  // becomes available in downstream projects.
-  static_assert(sanitizer_impl::IsTriviallyCopyable<T>(), "");
-#endif
-  rtc_MsanMarkUninitialized(&t, sizeof(T), 1);
-  return t;
-}
-
-template <typename T>
-inline void MsanCheckInitialized(const T& mem) {
-  rtc_MsanCheckInitialized(mem.data(), sizeof(mem.data()[0]), mem.size());
-}
-
-}  // namespace rtc
-
-#endif  // __cplusplus
-
-#endif  // RTC_BASE_SANITIZER_H_
diff --git a/submodules/libtgvoip/webrtc_dsp/rtc_base/scoped_ref_ptr.h b/submodules/libtgvoip/webrtc_dsp/rtc_base/scoped_ref_ptr.h
deleted file mode 100644
index a583aa99b5..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/rtc_base/scoped_ref_ptr.h
+++ /dev/null
@@ -1,161 +0,0 @@
-/*
- *  Copyright 2011 The WebRTC Project Authors. All rights reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-// Originally these classes are from Chromium.
-// http://src.chromium.org/viewvc/chrome/trunk/src/base/memory/ref_counted.h?view=markup
-
-//
-// A smart pointer class for reference counted objects.  Use this class instead
-// of calling AddRef and Release manually on a reference counted object to
-// avoid common memory leaks caused by forgetting to Release an object
-// reference.  Sample usage:
-//
-//   class MyFoo : public RefCounted<MyFoo> {
-//    ...
-//   };
-//
-//   void some_function() {
-//     scoped_refptr<MyFoo> foo = new MyFoo();
-//     foo->Method(param);
-//     // |foo| is released when this function returns
-//   }
-//
-//   void some_other_function() {
-//     scoped_refptr<MyFoo> foo = new MyFoo();
-//     ...
-//     foo = nullptr;  // explicitly releases |foo|
-//     ...
-//     if (foo)
-//       foo->Method(param);
-//   }
-//
-// The above examples show how scoped_refptr<T> acts like a pointer to T.
-// Given two scoped_refptr<T> classes, it is also possible to exchange
-// references between the two objects, like so:
-//
-//   {
-//     scoped_refptr<MyFoo> a = new MyFoo();
-//     scoped_refptr<MyFoo> b;
-//
-//     b.swap(a);
-//     // now, |b| references the MyFoo object, and |a| references null.
-//   }
-//
-// To make both |a| and |b| in the above example reference the same MyFoo
-// object, simply use the assignment operator:
-//
-//   {
-//     scoped_refptr<MyFoo> a = new MyFoo();
-//     scoped_refptr<MyFoo> b;
-//
-//     b = a;
-//     // now, |a| and |b| each own a reference to the same MyFoo object.
-//   }
-//
-
-#ifndef RTC_BASE_SCOPED_REF_PTR_H_
-#define RTC_BASE_SCOPED_REF_PTR_H_
-
-#include <memory>
-
-namespace rtc {
-
-template <class T>
-class scoped_refptr {
- public:
-  scoped_refptr() : ptr_(nullptr) {}
-
-  scoped_refptr(T* p) : ptr_(p) {
-    if (ptr_)
-      ptr_->AddRef();
-  }
-
-  scoped_refptr(const scoped_refptr<T>& r) : ptr_(r.ptr_) {
-    if (ptr_)
-      ptr_->AddRef();
-  }
-
-  template <typename U>
-  scoped_refptr(const scoped_refptr<U>& r) : ptr_(r.get()) {
-    if (ptr_)
-      ptr_->AddRef();
-  }
-
-  // Move constructors.
-  scoped_refptr(scoped_refptr<T>&& r) : ptr_(r.release()) {}
-
-  template <typename U>
-  scoped_refptr(scoped_refptr<U>&& r) : ptr_(r.release()) {}
-
-  ~scoped_refptr() {
-    if (ptr_)
-      ptr_->Release();
-  }
-
-  T* get() const { return ptr_; }
-  operator T*() const { return ptr_; }
-  T* operator->() const { return ptr_; }
-
-  // Returns the (possibly null) raw pointer, and makes the scoped_refptr hold a
-  // null pointer, all without touching the reference count of the underlying
-  // pointed-to object. The object is still reference counted, and the caller of
-  // release() is now the proud owner of one reference, so it is responsible for
-  // calling Release() once on the object when no longer using it.
-  T* release() {
-    T* retVal = ptr_;
-    ptr_ = nullptr;
-    return retVal;
-  }
-
-  scoped_refptr<T>& operator=(T* p) {
-    // AddRef first so that self assignment should work
-    if (p)
-      p->AddRef();
-    if (ptr_)
-      ptr_->Release();
-    ptr_ = p;
-    return *this;
-  }
-
-  scoped_refptr<T>& operator=(const scoped_refptr<T>& r) {
-    return *this = r.ptr_;
-  }
-
-  template <typename U>
-  scoped_refptr<T>& operator=(const scoped_refptr<U>& r) {
-    return *this = r.get();
-  }
-
-  scoped_refptr<T>& operator=(scoped_refptr<T>&& r) {
-    scoped_refptr<T>(std::move(r)).swap(*this);
-    return *this;
-  }
-
-  template <typename U>
-  scoped_refptr<T>& operator=(scoped_refptr<U>&& r) {
-    scoped_refptr<T>(std::move(r)).swap(*this);
-    return *this;
-  }
-
-  void swap(T** pp) {
-    T* p = ptr_;
-    ptr_ = *pp;
-    *pp = p;
-  }
-
-  void swap(scoped_refptr<T>& r) { swap(&r.ptr_); }
-
- protected:
-  T* ptr_;
-};
-
-}  // namespace rtc
-
-#endif  // RTC_BASE_SCOPED_REF_PTR_H_
diff --git a/submodules/libtgvoip/webrtc_dsp/rtc_base/string_to_number.cc b/submodules/libtgvoip/webrtc_dsp/rtc_base/string_to_number.cc
deleted file mode 100644
index e384df6f46..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/rtc_base/string_to_number.cc
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
- *  Copyright 2017 The WebRTC Project Authors. All rights reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#include "rtc_base/string_to_number.h"
-
-#include <ctype.h>
-#include <cerrno>
-#include <cstdlib>
-
-#include "rtc_base/checks.h"
-
-namespace rtc {
-namespace string_to_number_internal {
-
-absl::optional<signed_type> ParseSigned(const char* str, int base) {
-  RTC_DCHECK(str);
-  if (isdigit(str[0]) || str[0] == '-') {
-    char* end = nullptr;
-    errno = 0;
-    const signed_type value = strtoll(str, &end, base);
-    if (end && *end == '\0' && errno == 0) {
-      return value;
-    }
-  }
-  return absl::nullopt;
-}
-
-absl::optional<unsigned_type> ParseUnsigned(const char* str, int base) {
-  RTC_DCHECK(str);
-  if (isdigit(str[0]) || str[0] == '-') {
-    // Explicitly discard negative values. std::strtoull parsing causes unsigned
-    // wraparound. We cannot just reject values that start with -, though, since
-    // -0 is perfectly fine, as is -0000000000000000000000000000000.
-    const bool is_negative = str[0] == '-';
-    char* end = nullptr;
-    errno = 0;
-    const unsigned_type value = strtoull(str, &end, base);
-    if (end && *end == '\0' && errno == 0 && (value == 0 || !is_negative)) {
-      return value;
-    }
-  }
-  return absl::nullopt;
-}
-
-template <typename T>
-T StrToT(const char* str, char** str_end);
-
-template <>
-inline float StrToT(const char* str, char** str_end) {
-  return strtof(str, str_end);
-}
-
-template <>
-inline double StrToT(const char* str, char** str_end) {
-  return std::strtod(str, str_end);
-}
-
-template <>
-inline long double StrToT(const char* str, char** str_end) {
-  return strtold(str, str_end);
-}
-
-template <typename T>
-absl::optional<T> ParseFloatingPoint(const char* str) {
-  RTC_DCHECK(str);
-  if (*str == '\0')
-    return absl::nullopt;
-  char* end = nullptr;
-  errno = 0;
-  const T value = StrToT<T>(str, &end);
-  if (end && *end == '\0' && errno == 0) {
-    return value;
-  }
-  return absl::nullopt;
-}
-
-template absl::optional<float> ParseFloatingPoint(const char* str);
-template absl::optional<double> ParseFloatingPoint(const char* str);
-template absl::optional<long double> ParseFloatingPoint(const char* str);
-
-}  // namespace string_to_number_internal
-}  // namespace rtc
diff --git a/submodules/libtgvoip/webrtc_dsp/rtc_base/string_to_number.h b/submodules/libtgvoip/webrtc_dsp/rtc_base/string_to_number.h
deleted file mode 100644
index 4cb521595d..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/rtc_base/string_to_number.h
+++ /dev/null
@@ -1,116 +0,0 @@
-/*
- *  Copyright 2017 The WebRTC Project Authors. All rights reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#ifndef RTC_BASE_STRING_TO_NUMBER_H_
-#define RTC_BASE_STRING_TO_NUMBER_H_
-
-#include <limits>
-#include <string>
-#include <type_traits>
-
-#include "absl/types/optional.h"
-
-namespace rtc {
-
-// This file declares a family of functions to parse integers from strings.
-// The standard C library functions either fail to indicate errors (atoi, etc.)
-// or are a hassle to work with (strtol, sscanf, etc.). The standard C++ library
-// functions (std::stoi, etc.) indicate errors by throwing exceptions, which
-// are disabled in WebRTC.
-//
-// Integers are parsed using one of the following functions:
-//   absl::optional<int-type> StringToNumber(const char* str, int base = 10);
-//   absl::optional<int-type> StringToNumber(const std::string& str,
-//                                          int base = 10);
-//
-// These functions parse a value from the beginning of a string into one of the
-// fundamental integer types, or returns an empty Optional if parsing
-// failed. Values outside of the range supported by the type will be
-// rejected. The strings must begin with a digit or a minus sign. No leading
-// space nor trailing contents are allowed.
-// By setting base to 0, one of octal, decimal or hexadecimal will be
-// detected from the string's prefix (0, nothing or 0x, respectively).
-// If non-zero, base can be set to a value between 2 and 36 inclusively.
-//
-// If desired, this interface could be extended with support for floating-point
-// types.
-
-namespace string_to_number_internal {
-// These must be (unsigned) long long, to match the signature of strto(u)ll.
-using unsigned_type = unsigned long long;  // NOLINT(runtime/int)
-using signed_type = long long;             // NOLINT(runtime/int)
-
-absl::optional<signed_type> ParseSigned(const char* str, int base);
-absl::optional<unsigned_type> ParseUnsigned(const char* str, int base);
-
-template <typename T>
-absl::optional<T> ParseFloatingPoint(const char* str);
-}  // namespace string_to_number_internal
-
-template <typename T>
-typename std::enable_if<std::is_integral<T>::value && std::is_signed<T>::value,
-                        absl::optional<T>>::type
-StringToNumber(const char* str, int base = 10) {
-  using string_to_number_internal::signed_type;
-  static_assert(
-      std::numeric_limits<T>::max() <=
-              std::numeric_limits<signed_type>::max() &&
-          std::numeric_limits<T>::lowest() >=
-              std::numeric_limits<signed_type>::lowest(),
-      "StringToNumber only supports signed integers as large as long long int");
-  absl::optional<signed_type> value =
-      string_to_number_internal::ParseSigned(str, base);
-  if (value && *value >= std::numeric_limits<T>::lowest() &&
-      *value <= std::numeric_limits<T>::max()) {
-    return static_cast<T>(*value);
-  }
-  return absl::nullopt;
-}
-
-template <typename T>
-typename std::enable_if<std::is_integral<T>::value &&
-                            std::is_unsigned<T>::value,
-                        absl::optional<T>>::type
-StringToNumber(const char* str, int base = 10) {
-  using string_to_number_internal::unsigned_type;
-  static_assert(std::numeric_limits<T>::max() <=
-                    std::numeric_limits<unsigned_type>::max(),
-                "StringToNumber only supports unsigned integers as large as "
-                "unsigned long long int");
-  absl::optional<unsigned_type> value =
-      string_to_number_internal::ParseUnsigned(str, base);
-  if (value && *value <= std::numeric_limits<T>::max()) {
-    return static_cast<T>(*value);
-  }
-  return absl::nullopt;
-}
-
-template <typename T>
-typename std::enable_if<std::is_floating_point<T>::value,
-                        absl::optional<T>>::type
-StringToNumber(const char* str, int base = 10) {
-  static_assert(
-      std::numeric_limits<T>::max() <= std::numeric_limits<long double>::max(),
-      "StringToNumber only supports floating-point numbers as large "
-      "as long double");
-  return string_to_number_internal::ParseFloatingPoint<T>(str);
-}
-
-// The std::string overloads only exists if there is a matching const char*
-// version.
-template <typename T>
-auto StringToNumber(const std::string& str, int base = 10)
-    -> decltype(StringToNumber<T>(str.c_str(), base)) {
-  return StringToNumber<T>(str.c_str(), base);
-}
-
-}  // namespace rtc
-
-#endif  // RTC_BASE_STRING_TO_NUMBER_H_
diff --git a/submodules/libtgvoip/webrtc_dsp/rtc_base/stringencode.cc b/submodules/libtgvoip/webrtc_dsp/rtc_base/stringencode.cc
deleted file mode 100644
index 1a3284c874..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/rtc_base/stringencode.cc
+++ /dev/null
@@ -1,445 +0,0 @@
-/*
- *  Copyright 2004 The WebRTC Project Authors. All rights reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#include "rtc_base/stringencode.h"
-
-#include <cstdio>
-
-#include "rtc_base/arraysize.h"
-#include "rtc_base/checks.h"
-#include "rtc_base/stringutils.h"
-
-namespace rtc {
-
-/////////////////////////////////////////////////////////////////////////////
-// String Encoding Utilities
-/////////////////////////////////////////////////////////////////////////////
-
-size_t url_decode(char* buffer,
-                  size_t buflen,
-                  const char* source,
-                  size_t srclen) {
-  if (nullptr == buffer)
-    return srclen + 1;
-  if (buflen <= 0)
-    return 0;
-
-  unsigned char h1, h2;
-  size_t srcpos = 0, bufpos = 0;
-  while ((srcpos < srclen) && (bufpos + 1 < buflen)) {
-    unsigned char ch = source[srcpos++];
-    if (ch == '+') {
-      buffer[bufpos++] = ' ';
-    } else if ((ch == '%') && (srcpos + 1 < srclen) &&
-               hex_decode(source[srcpos], &h1) &&
-               hex_decode(source[srcpos + 1], &h2)) {
-      buffer[bufpos++] = (h1 << 4) | h2;
-      srcpos += 2;
-    } else {
-      buffer[bufpos++] = ch;
-    }
-  }
-  buffer[bufpos] = '\0';
-  return bufpos;
-}
-
-static const char HEX[] = "0123456789abcdef";
-
-char hex_encode(unsigned char val) {
-  RTC_DCHECK_LT(val, 16);
-  return (val < 16) ? HEX[val] : '!';
-}
-
-bool hex_decode(char ch, unsigned char* val) {
-  if ((ch >= '0') && (ch <= '9')) {
-    *val = ch - '0';
-  } else if ((ch >= 'A') && (ch <= 'F')) {
-    *val = (ch - 'A') + 10;
-  } else if ((ch >= 'a') && (ch <= 'f')) {
-    *val = (ch - 'a') + 10;
-  } else {
-    return false;
-  }
-  return true;
-}
-
-size_t hex_encode(char* buffer,
-                  size_t buflen,
-                  const char* csource,
-                  size_t srclen) {
-  return hex_encode_with_delimiter(buffer, buflen, csource, srclen, 0);
-}
-
-size_t hex_encode_with_delimiter(char* buffer,
-                                 size_t buflen,
-                                 const char* csource,
-                                 size_t srclen,
-                                 char delimiter) {
-  RTC_DCHECK(buffer);  // TODO(kwiberg): estimate output size
-  if (buflen == 0)
-    return 0;
-
-  // Init and check bounds.
-  const unsigned char* bsource =
-      reinterpret_cast<const unsigned char*>(csource);
-  size_t srcpos = 0, bufpos = 0;
-  size_t needed = delimiter ? (srclen * 3) : (srclen * 2 + 1);
-  if (buflen < needed)
-    return 0;
-
-  while (srcpos < srclen) {
-    unsigned char ch = bsource[srcpos++];
-    buffer[bufpos] = hex_encode((ch >> 4) & 0xF);
-    buffer[bufpos + 1] = hex_encode((ch)&0xF);
-    bufpos += 2;
-
-    // Don't write a delimiter after the last byte.
-    if (delimiter && (srcpos < srclen)) {
-      buffer[bufpos] = delimiter;
-      ++bufpos;
-    }
-  }
-
-  // Null terminate.
-  buffer[bufpos] = '\0';
-  return bufpos;
-}
-
-std::string hex_encode(const std::string& str) {
-  return hex_encode(str.c_str(), str.size());
-}
-
-std::string hex_encode(const char* source, size_t srclen) {
-  return hex_encode_with_delimiter(source, srclen, 0);
-}
-
-std::string hex_encode_with_delimiter(const char* source,
-                                      size_t srclen,
-                                      char delimiter) {
-  const size_t kBufferSize = srclen * 3;
-  char* buffer = STACK_ARRAY(char, kBufferSize);
-  size_t length =
-      hex_encode_with_delimiter(buffer, kBufferSize, source, srclen, delimiter);
-  RTC_DCHECK(srclen == 0 || length > 0);
-  return std::string(buffer, length);
-}
-
-size_t hex_decode(char* cbuffer,
-                  size_t buflen,
-                  const char* source,
-                  size_t srclen) {
-  return hex_decode_with_delimiter(cbuffer, buflen, source, srclen, 0);
-}
-
-size_t hex_decode_with_delimiter(char* cbuffer,
-                                 size_t buflen,
-                                 const char* source,
-                                 size_t srclen,
-                                 char delimiter) {
-  RTC_DCHECK(cbuffer);  // TODO(kwiberg): estimate output size
-  if (buflen == 0)
-    return 0;
-
-  // Init and bounds check.
-  unsigned char* bbuffer = reinterpret_cast<unsigned char*>(cbuffer);
-  size_t srcpos = 0, bufpos = 0;
-  size_t needed = (delimiter) ? (srclen + 1) / 3 : srclen / 2;
-  if (buflen < needed)
-    return 0;
-
-  while (srcpos < srclen) {
-    if ((srclen - srcpos) < 2) {
-      // This means we have an odd number of bytes.
-      return 0;
-    }
-
-    unsigned char h1, h2;
-    if (!hex_decode(source[srcpos], &h1) ||
-        !hex_decode(source[srcpos + 1], &h2))
-      return 0;
-
-    bbuffer[bufpos++] = (h1 << 4) | h2;
-    srcpos += 2;
-
-    // Remove the delimiter if needed.
-    if (delimiter && (srclen - srcpos) > 1) {
-      if (source[srcpos] != delimiter)
-        return 0;
-      ++srcpos;
-    }
-  }
-
-  return bufpos;
-}
-
-size_t hex_decode(char* buffer, size_t buflen, const std::string& source) {
-  return hex_decode_with_delimiter(buffer, buflen, source, 0);
-}
-size_t hex_decode_with_delimiter(char* buffer,
-                                 size_t buflen,
-                                 const std::string& source,
-                                 char delimiter) {
-  return hex_decode_with_delimiter(buffer, buflen, source.c_str(),
-                                   source.length(), delimiter);
-}
-
-size_t transform(std::string& value,
-                 size_t maxlen,
-                 const std::string& source,
-                 Transform t) {
-  char* buffer = STACK_ARRAY(char, maxlen + 1);
-  size_t length = t(buffer, maxlen + 1, source.data(), source.length());
-  value.assign(buffer, length);
-  return length;
-}
-
-std::string s_transform(const std::string& source, Transform t) {
-  // Ask transformation function to approximate the destination size (returns
-  // upper bound)
-  size_t maxlen = t(nullptr, 0, source.data(), source.length());
-  char* buffer = STACK_ARRAY(char, maxlen);
-  size_t len = t(buffer, maxlen, source.data(), source.length());
-  std::string result(buffer, len);
-  return result;
-}
-
-size_t tokenize(const std::string& source,
-                char delimiter,
-                std::vector<std::string>* fields) {
-  fields->clear();
-  size_t last = 0;
-  for (size_t i = 0; i < source.length(); ++i) {
-    if (source[i] == delimiter) {
-      if (i != last) {
-        fields->push_back(source.substr(last, i - last));
-      }
-      last = i + 1;
-    }
-  }
-  if (last != source.length()) {
-    fields->push_back(source.substr(last, source.length() - last));
-  }
-  return fields->size();
-}
-
-size_t tokenize_with_empty_tokens(const std::string& source,
-                                  char delimiter,
-                                  std::vector<std::string>* fields) {
-  fields->clear();
-  size_t last = 0;
-  for (size_t i = 0; i < source.length(); ++i) {
-    if (source[i] == delimiter) {
-      fields->push_back(source.substr(last, i - last));
-      last = i + 1;
-    }
-  }
-  fields->push_back(source.substr(last, source.length() - last));
-  return fields->size();
-}
-
-size_t tokenize_append(const std::string& source,
-                       char delimiter,
-                       std::vector<std::string>* fields) {
-  if (!fields)
-    return 0;
-
-  std::vector<std::string> new_fields;
-  tokenize(source, delimiter, &new_fields);
-  fields->insert(fields->end(), new_fields.begin(), new_fields.end());
-  return fields->size();
-}
-
-size_t tokenize(const std::string& source,
-                char delimiter,
-                char start_mark,
-                char end_mark,
-                std::vector<std::string>* fields) {
-  if (!fields)
-    return 0;
-  fields->clear();
-
-  std::string remain_source = source;
-  while (!remain_source.empty()) {
-    size_t start_pos = remain_source.find(start_mark);
-    if (std::string::npos == start_pos)
-      break;
-    std::string pre_mark;
-    if (start_pos > 0) {
-      pre_mark = remain_source.substr(0, start_pos - 1);
-    }
-
-    ++start_pos;
-    size_t end_pos = remain_source.find(end_mark, start_pos);
-    if (std::string::npos == end_pos)
-      break;
-
-    // We have found the matching marks. First tokenize the pre-mask. Then add
-    // the marked part as a single field. Finally, loop back for the post-mark.
-    tokenize_append(pre_mark, delimiter, fields);
-    fields->push_back(remain_source.substr(start_pos, end_pos - start_pos));
-    remain_source = remain_source.substr(end_pos + 1);
-  }
-
-  return tokenize_append(remain_source, delimiter, fields);
-}
-
-bool tokenize_first(const std::string& source,
-                    const char delimiter,
-                    std::string* token,
-                    std::string* rest) {
-  // Find the first delimiter
-  size_t left_pos = source.find(delimiter);
-  if (left_pos == std::string::npos) {
-    return false;
-  }
-
-  // Look for additional occurrances of delimiter.
-  size_t right_pos = left_pos + 1;
-  while (source[right_pos] == delimiter) {
-    right_pos++;
-  }
-
-  *token = source.substr(0, left_pos);
-  *rest = source.substr(right_pos);
-  return true;
-}
-
-std::string join(const std::vector<std::string>& source, char delimiter) {
-  if (source.size() == 0) {
-    return std::string();
-  }
-  // Find length of the string to be returned to pre-allocate memory.
-  size_t source_string_length = 0;
-  for (size_t i = 0; i < source.size(); ++i) {
-    source_string_length += source[i].length();
-  }
-
-  // Build the joined string.
-  std::string joined_string;
-  joined_string.reserve(source_string_length + source.size() - 1);
-  for (size_t i = 0; i < source.size(); ++i) {
-    if (i != 0) {
-      joined_string += delimiter;
-    }
-    joined_string += source[i];
-  }
-  return joined_string;
-}
-
-size_t split(const std::string& source,
-             char delimiter,
-             std::vector<std::string>* fields) {
-  RTC_DCHECK(fields);
-  fields->clear();
-  size_t last = 0;
-  for (size_t i = 0; i < source.length(); ++i) {
-    if (source[i] == delimiter) {
-      fields->push_back(source.substr(last, i - last));
-      last = i + 1;
-    }
-  }
-  fields->push_back(source.substr(last, source.length() - last));
-  return fields->size();
-}
-
-std::string ToString(const bool b) {
-  return b ? "true" : "false";
-}
-
-std::string ToString(const char* const s) {
-  return std::string(s);
-}
-std::string ToString(const std::string s) {
-  return s;
-}
-
-std::string ToString(const short s) {
-  char buf[32];
-  const int len = snprintf(&buf[0], arraysize(buf), "%hd", s);
-  RTC_DCHECK_LE(len, arraysize(buf));
-  return std::string(&buf[0], len);
-}
-std::string ToString(const unsigned short s) {
-  char buf[32];
-  const int len = snprintf(&buf[0], arraysize(buf), "%hu", s);
-  RTC_DCHECK_LE(len, arraysize(buf));
-  return std::string(&buf[0], len);
-}
-std::string ToString(const int s) {
-  char buf[32];
-  const int len = snprintf(&buf[0], arraysize(buf), "%d", s);
-  RTC_DCHECK_LE(len, arraysize(buf));
-  return std::string(&buf[0], len);
-}
-std::string ToString(const unsigned int s) {
-  char buf[32];
-  const int len = snprintf(&buf[0], arraysize(buf), "%u", s);
-  RTC_DCHECK_LE(len, arraysize(buf));
-  return std::string(&buf[0], len);
-}
-std::string ToString(const long int s) {
-  char buf[32];
-  const int len = snprintf(&buf[0], arraysize(buf), "%ld", s);
-  RTC_DCHECK_LE(len, arraysize(buf));
-  return std::string(&buf[0], len);
-}
-std::string ToString(const unsigned long int s) {
-  char buf[32];
-  const int len = snprintf(&buf[0], arraysize(buf), "%lu", s);
-  RTC_DCHECK_LE(len, arraysize(buf));
-  return std::string(&buf[0], len);
-}
-std::string ToString(const long long int s) {
-  char buf[32];
-  const int len = snprintf(&buf[0], arraysize(buf), "%lld", s);
-  RTC_DCHECK_LE(len, arraysize(buf));
-  return std::string(&buf[0], len);
-}
-std::string ToString(const unsigned long long int s) {
-  char buf[32];
-  const int len = snprintf(&buf[0], arraysize(buf), "%llu", s);
-  RTC_DCHECK_LE(len, arraysize(buf));
-  return std::string(&buf[0], len);
-}
-
-std::string ToString(const double d) {
-  char buf[32];
-  const int len = snprintf(&buf[0], arraysize(buf), "%g", d);
-  RTC_DCHECK_LE(len, arraysize(buf));
-  return std::string(&buf[0], len);
-}
-
-std::string ToString(const long double d) {
-  char buf[32];
-  const int len = snprintf(&buf[0], arraysize(buf), "%Lg", d);
-  RTC_DCHECK_LE(len, arraysize(buf));
-  return std::string(&buf[0], len);
-}
-
-std::string ToString(const void* const p) {
-  char buf[32];
-  const int len = snprintf(&buf[0], arraysize(buf), "%p", p);
-  RTC_DCHECK_LE(len, arraysize(buf));
-  return std::string(&buf[0], len);
-}
-
-bool FromString(const std::string& s, bool* b) {
-  if (s == "false") {
-    *b = false;
-    return true;
-  }
-  if (s == "true") {
-    *b = true;
-    return true;
-  }
-  return false;
-}
-
-}  // namespace rtc
diff --git a/submodules/libtgvoip/webrtc_dsp/rtc_base/stringencode.h b/submodules/libtgvoip/webrtc_dsp/rtc_base/stringencode.h
deleted file mode 100644
index 09bf77f446..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/rtc_base/stringencode.h
+++ /dev/null
@@ -1,200 +0,0 @@
-/*
- *  Copyright 2004 The WebRTC Project Authors. All rights reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#ifndef RTC_BASE_STRINGENCODE_H_
-#define RTC_BASE_STRINGENCODE_H_
-
-#include <stddef.h>
-#include <string>
-#include <type_traits>
-#include <vector>
-
-#include "absl/types/optional.h"
-#include "rtc_base/checks.h"
-#include "rtc_base/string_to_number.h"
-
-namespace rtc {
-
-//////////////////////////////////////////////////////////////////////
-// String Encoding Utilities
-//////////////////////////////////////////////////////////////////////
-
-// Note: in-place decoding (buffer == source) is allowed.
-size_t url_decode(char* buffer,
-                  size_t buflen,
-                  const char* source,
-                  size_t srclen);
-
-// Convert an unsigned value from 0 to 15 to the hex character equivalent...
-char hex_encode(unsigned char val);
-// ...and vice-versa.
-bool hex_decode(char ch, unsigned char* val);
-
-// hex_encode shows the hex representation of binary data in ascii.
-size_t hex_encode(char* buffer,
-                  size_t buflen,
-                  const char* source,
-                  size_t srclen);
-
-// hex_encode, but separate each byte representation with a delimiter.
-// |delimiter| == 0 means no delimiter
-// If the buffer is too short, we return 0
-size_t hex_encode_with_delimiter(char* buffer,
-                                 size_t buflen,
-                                 const char* source,
-                                 size_t srclen,
-                                 char delimiter);
-
-// Helper functions for hex_encode.
-std::string hex_encode(const std::string& str);
-std::string hex_encode(const char* source, size_t srclen);
-std::string hex_encode_with_delimiter(const char* source,
-                                      size_t srclen,
-                                      char delimiter);
-
-// hex_decode converts ascii hex to binary.
-size_t hex_decode(char* buffer,
-                  size_t buflen,
-                  const char* source,
-                  size_t srclen);
-
-// hex_decode, assuming that there is a delimiter between every byte
-// pair.
-// |delimiter| == 0 means no delimiter
-// If the buffer is too short or the data is invalid, we return 0.
-size_t hex_decode_with_delimiter(char* buffer,
-                                 size_t buflen,
-                                 const char* source,
-                                 size_t srclen,
-                                 char delimiter);
-
-// Helper functions for hex_decode.
-size_t hex_decode(char* buffer, size_t buflen, const std::string& source);
-size_t hex_decode_with_delimiter(char* buffer,
-                                 size_t buflen,
-                                 const std::string& source,
-                                 char delimiter);
-
-// Apply any suitable string transform (including the ones above) to an STL
-// string.  Stack-allocated temporary space is used for the transformation,
-// so value and source may refer to the same string.
-typedef size_t (*Transform)(char* buffer,
-                            size_t buflen,
-                            const char* source,
-                            size_t srclen);
-size_t transform(std::string& value,
-                 size_t maxlen,
-                 const std::string& source,
-                 Transform t);
-
-// Return the result of applying transform t to source.
-std::string s_transform(const std::string& source, Transform t);
-
-// Convenience wrappers.
-inline std::string s_url_decode(const std::string& source) {
-  return s_transform(source, url_decode);
-}
-
-// Joins the source vector of strings into a single string, with each
-// field in source being separated by delimiter. No trailing delimiter is added.
-std::string join(const std::vector<std::string>& source, char delimiter);
-
-// Splits the source string into multiple fields separated by delimiter,
-// with duplicates of delimiter creating empty fields.
-size_t split(const std::string& source,
-             char delimiter,
-             std::vector<std::string>* fields);
-
-// Splits the source string into multiple fields separated by delimiter,
-// with duplicates of delimiter ignored.  Trailing delimiter ignored.
-size_t tokenize(const std::string& source,
-                char delimiter,
-                std::vector<std::string>* fields);
-
-// Tokenize, including the empty tokens.
-size_t tokenize_with_empty_tokens(const std::string& source,
-                                  char delimiter,
-                                  std::vector<std::string>* fields);
-
-// Tokenize and append the tokens to fields. Return the new size of fields.
-size_t tokenize_append(const std::string& source,
-                       char delimiter,
-                       std::vector<std::string>* fields);
-
-// Splits the source string into multiple fields separated by delimiter, with
-// duplicates of delimiter ignored. Trailing delimiter ignored. A substring in
-// between the start_mark and the end_mark is treated as a single field. Return
-// the size of fields. For example, if source is "filename
-// \"/Library/Application Support/media content.txt\"", delimiter is ' ', and
-// the start_mark and end_mark are '"', this method returns two fields:
-// "filename" and "/Library/Application Support/media content.txt".
-size_t tokenize(const std::string& source,
-                char delimiter,
-                char start_mark,
-                char end_mark,
-                std::vector<std::string>* fields);
-
-// Extract the first token from source as separated by delimiter, with
-// duplicates of delimiter ignored. Return false if the delimiter could not be
-// found, otherwise return true.
-bool tokenize_first(const std::string& source,
-                    const char delimiter,
-                    std::string* token,
-                    std::string* rest);
-
-// Convert arbitrary values to/from a string.
-// TODO(jonasolsson): Remove these when absl::StrCat becomes available.
-std::string ToString(bool b);
-
-std::string ToString(const char* s);
-std::string ToString(std::string t);
-
-std::string ToString(short s);
-std::string ToString(unsigned short s);
-std::string ToString(int s);
-std::string ToString(unsigned int s);
-std::string ToString(long int s);
-std::string ToString(unsigned long int s);
-std::string ToString(long long int s);
-std::string ToString(unsigned long long int s);
-
-std::string ToString(double t);
-std::string ToString(long double t);
-
-std::string ToString(const void* p);
-
-template <typename T,
-          typename std::enable_if<std::is_arithmetic<T>::value &&
-                                      !std::is_same<T, bool>::value,
-                                  int>::type = 0>
-static bool FromString(const std::string& s, T* t) {
-  RTC_DCHECK(t);
-  absl::optional<T> result = StringToNumber<T>(s);
-
-  if (result)
-    *t = *result;
-
-  return result.has_value();
-}
-
-bool FromString(const std::string& s, bool* b);
-
-template <typename T>
-static inline T FromString(const std::string& str) {
-  T val;
-  FromString(str, &val);
-  return val;
-}
-
-//////////////////////////////////////////////////////////////////////
-
-}  // namespace rtc
-
-#endif  // RTC_BASE_STRINGENCODE_H__
diff --git a/submodules/libtgvoip/webrtc_dsp/rtc_base/strings/string_builder.cc b/submodules/libtgvoip/webrtc_dsp/rtc_base/strings/string_builder.cc
deleted file mode 100644
index 839776c7e7..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/rtc_base/strings/string_builder.cc
+++ /dev/null
@@ -1,138 +0,0 @@
-/*
- *  Copyright 2018 The WebRTC Project Authors. All rights reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#include "rtc_base/strings/string_builder.h"
-
-#include <stdarg.h>
-#include <cstring>
-
-#include "rtc_base/checks.h"
-#include "rtc_base/numerics/safe_minmax.h"
-
-namespace rtc {
-
-SimpleStringBuilder::SimpleStringBuilder(rtc::ArrayView<char> buffer)
-    : buffer_(buffer) {
-  buffer_[0] = '\0';
-  RTC_DCHECK(IsConsistent());
-}
-
-SimpleStringBuilder& SimpleStringBuilder::operator<<(const char* str) {
-  return Append(str);
-}
-
-SimpleStringBuilder& SimpleStringBuilder::operator<<(char ch) {
-  return Append(&ch, 1);
-}
-
-SimpleStringBuilder& SimpleStringBuilder::operator<<(const std::string& str) {
-  return Append(str.c_str(), str.length());
-}
-
-// Numeric conversion routines.
-//
-// We use std::[v]snprintf instead of std::to_string because:
-// * std::to_string relies on the current locale for formatting purposes,
-//   and therefore concurrent calls to std::to_string from multiple threads
-//   may result in partial serialization of calls
-// * snprintf allows us to print the number directly into our buffer.
-// * avoid allocating a std::string (potential heap alloc).
-// TODO(tommi): Switch to std::to_chars in C++17.
-
-SimpleStringBuilder& SimpleStringBuilder::operator<<(int i) {
-  return AppendFormat("%d", i);
-}
-
-SimpleStringBuilder& SimpleStringBuilder::operator<<(unsigned i) {
-  return AppendFormat("%u", i);
-}
-
-SimpleStringBuilder& SimpleStringBuilder::operator<<(long i) {  // NOLINT
-  return AppendFormat("%ld", i);
-}
-
-SimpleStringBuilder& SimpleStringBuilder::operator<<(long long i) {  // NOLINT
-  return AppendFormat("%lld", i);
-}
-
-SimpleStringBuilder& SimpleStringBuilder::operator<<(
-    unsigned long i) {  // NOLINT
-  return AppendFormat("%lu", i);
-}
-
-SimpleStringBuilder& SimpleStringBuilder::operator<<(
-    unsigned long long i) {  // NOLINT
-  return AppendFormat("%llu", i);
-}
-
-SimpleStringBuilder& SimpleStringBuilder::operator<<(float f) {
-  return AppendFormat("%g", f);
-}
-
-SimpleStringBuilder& SimpleStringBuilder::operator<<(double f) {
-  return AppendFormat("%g", f);
-}
-
-SimpleStringBuilder& SimpleStringBuilder::operator<<(long double f) {
-  return AppendFormat("%Lg", f);
-}
-
-SimpleStringBuilder& SimpleStringBuilder::AppendFormat(const char* fmt, ...) {
-  va_list args;
-  va_start(args, fmt);
-  const int len =
-      vsnprintf(&buffer_[size_], buffer_.size() - size_, fmt, args);
-  if (len >= 0) {
-    const size_t chars_added = rtc::SafeMin(len, buffer_.size() - 1 - size_);
-    size_ += chars_added;
-    RTC_DCHECK_EQ(len, chars_added) << "Buffer size was insufficient";
-  } else {
-    // This should never happen, but we're paranoid, so re-write the
-    // terminator in case vsnprintf() overwrote it.
-    RTC_NOTREACHED();
-    buffer_[size_] = '\0';
-  }
-  va_end(args);
-  RTC_DCHECK(IsConsistent());
-  return *this;
-}
-
-SimpleStringBuilder& SimpleStringBuilder::Append(const char* str,
-                                                 size_t length) {
-  const size_t chars_added =
-      rtc::strcpyn(&buffer_[size_], buffer_.size() - size_, str, length);
-  size_ += chars_added;
-  RTC_DCHECK_EQ(chars_added, length == SIZE_UNKNOWN ? std::strlen(str) : length)
-      << "Buffer size was insufficient";
-  RTC_DCHECK(IsConsistent());
-  return *this;
-}
-
-StringBuilder& StringBuilder::AppendFormat(const char* fmt, ...) {
-  va_list args, copy;
-  va_start(args, fmt);
-  va_copy(copy, args);
-  const int predicted_length = vsnprintf(nullptr, 0, fmt, copy);
-  va_end(copy);
-
-  RTC_DCHECK_GE(predicted_length, 0);
-  if (predicted_length > 0) {
-    const size_t size = str_.size();
-    str_.resize(size + predicted_length);
-    // Pass "+ 1" to vsnprintf to include space for the '\0'.
-    const int actual_length =
-        vsnprintf(&str_[size], predicted_length + 1, fmt, args);
-    RTC_DCHECK_GE(actual_length, 0);
-  }
-  va_end(args);
-  return *this;
-}
-
-}  // namespace rtc
diff --git a/submodules/libtgvoip/webrtc_dsp/rtc_base/strings/string_builder.h b/submodules/libtgvoip/webrtc_dsp/rtc_base/strings/string_builder.h
deleted file mode 100644
index 27001d1be5..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/rtc_base/strings/string_builder.h
+++ /dev/null
@@ -1,176 +0,0 @@
-/*
- *  Copyright 2018 The WebRTC Project Authors. All rights reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#ifndef RTC_BASE_STRINGS_STRING_BUILDER_H_
-#define RTC_BASE_STRINGS_STRING_BUILDER_H_
-
-#include <cstdio>
-#include <string>
-#include <utility>
-
-#include "absl/strings/string_view.h"
-#include "api/array_view.h"
-#include "rtc_base/stringencode.h"
-#include "rtc_base/stringutils.h"
-
-namespace rtc {
-
-// This is a minimalistic string builder class meant to cover the most cases of
-// when you might otherwise be tempted to use a stringstream (discouraged for
-// anything except logging). It uses a fixed-size buffer provided by the caller
-// and concatenates strings and numbers into it, allowing the results to be
-// read via |str()|.
-class SimpleStringBuilder {
- public:
-  explicit SimpleStringBuilder(rtc::ArrayView<char> buffer);
-  SimpleStringBuilder(const SimpleStringBuilder&) = delete;
-  SimpleStringBuilder& operator=(const SimpleStringBuilder&) = delete;
-
-  SimpleStringBuilder& operator<<(const char* str);
-  SimpleStringBuilder& operator<<(char ch);
-  SimpleStringBuilder& operator<<(const std::string& str);
-  SimpleStringBuilder& operator<<(int i);
-  SimpleStringBuilder& operator<<(unsigned i);
-  SimpleStringBuilder& operator<<(long i);                // NOLINT
-  SimpleStringBuilder& operator<<(long long i);           // NOLINT
-  SimpleStringBuilder& operator<<(unsigned long i);       // NOLINT
-  SimpleStringBuilder& operator<<(unsigned long long i);  // NOLINT
-  SimpleStringBuilder& operator<<(float f);
-  SimpleStringBuilder& operator<<(double f);
-  SimpleStringBuilder& operator<<(long double f);
-
-  // Returns a pointer to the built string. The name |str()| is borrowed for
-  // compatibility reasons as we replace usage of stringstream throughout the
-  // code base.
-  const char* str() const { return buffer_.data(); }
-
-  // Returns the length of the string. The name |size()| is picked for STL
-  // compatibility reasons.
-  size_t size() const { return size_; }
-
-// Allows appending a printf style formatted string.
-#if defined(__GNUC__)
-  __attribute__((__format__(__printf__, 2, 3)))
-#endif
-  SimpleStringBuilder&
-  AppendFormat(const char* fmt, ...);
-
-  // An alternate way from operator<<() to append a string. This variant is
-  // slightly more efficient when the length of the string to append, is known.
-  SimpleStringBuilder& Append(const char* str, size_t length = SIZE_UNKNOWN);
-
- private:
-  bool IsConsistent() const {
-    return size_ <= buffer_.size() - 1 && buffer_[size_] == '\0';
-  }
-
-  // An always-zero-terminated fixed-size buffer that we write to. The fixed
-  // size allows the buffer to be stack allocated, which helps performance.
-  // Having a fixed size is furthermore useful to avoid unnecessary resizing
-  // while building it.
-  const rtc::ArrayView<char> buffer_;
-
-  // Represents the number of characters written to the buffer.
-  // This does not include the terminating '\0'.
-  size_t size_ = 0;
-};
-
-// A string builder that supports dynamic resizing while building a string.
-// The class is based around an instance of std::string and allows moving
-// ownership out of the class once the string has been built.
-// Note that this class uses the heap for allocations, so SimpleStringBuilder
-// might be more efficient for some use cases.
-class StringBuilder {
- public:
-  StringBuilder() {}
-  explicit StringBuilder(absl::string_view s) : str_(s) {}
-
-  // TODO(tommi): Support construction from StringBuilder?
-  StringBuilder(const StringBuilder&) = delete;
-  StringBuilder& operator=(const StringBuilder&) = delete;
-
-  StringBuilder& operator<<(const absl::string_view str) {
-    str_.append(str.data(), str.length());
-    return *this;
-  }
-
-  StringBuilder& operator<<(char c) = delete;
-
-  StringBuilder& operator<<(int i) {
-    str_ += rtc::ToString(i);
-    return *this;
-  }
-
-  StringBuilder& operator<<(unsigned i) {
-    str_ += rtc::ToString(i);
-    return *this;
-  }
-
-  StringBuilder& operator<<(long i) {  // NOLINT
-    str_ += rtc::ToString(i);
-    return *this;
-  }
-
-  StringBuilder& operator<<(long long i) {  // NOLINT
-    str_ += rtc::ToString(i);
-    return *this;
-  }
-
-  StringBuilder& operator<<(unsigned long i) {  // NOLINT
-    str_ += rtc::ToString(i);
-    return *this;
-  }
-
-  StringBuilder& operator<<(unsigned long long i) {  // NOLINT
-    str_ += rtc::ToString(i);
-    return *this;
-  }
-
-  StringBuilder& operator<<(float f) {
-    str_ += rtc::ToString(f);
-    return *this;
-  }
-
-  StringBuilder& operator<<(double f) {
-    str_ += rtc::ToString(f);
-    return *this;
-  }
-
-  StringBuilder& operator<<(long double f) {
-    str_ += rtc::ToString(f);
-    return *this;
-  }
-
-  const std::string& str() const { return str_; }
-
-  void Clear() { str_.clear(); }
-
-  size_t size() const { return str_.size(); }
-
-  std::string Release() {
-    std::string ret = std::move(str_);
-    str_.clear();
-    return ret;
-  }
-
-  // Allows appending a printf style formatted string.
-  StringBuilder& AppendFormat(const char* fmt, ...)
-#if defined(__GNUC__)
-      __attribute__((__format__(__printf__, 2, 3)))
-#endif
-      ;
-
- private:
-  std::string str_;
-};
-
-}  // namespace rtc
-
-#endif  // RTC_BASE_STRINGS_STRING_BUILDER_H_
diff --git a/submodules/libtgvoip/webrtc_dsp/rtc_base/stringutils.cc b/submodules/libtgvoip/webrtc_dsp/rtc_base/stringutils.cc
deleted file mode 100644
index c808eb2cc4..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/rtc_base/stringutils.cc
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
- *  Copyright 2004 The WebRTC Project Authors. All rights reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#include "rtc_base/stringutils.h"
-
-namespace rtc {
-
-size_t strcpyn(char* buffer,
-               size_t buflen,
-               const char* source,
-               size_t srclen /* = SIZE_UNKNOWN */) {
-  if (buflen <= 0)
-    return 0;
-
-  if (srclen == SIZE_UNKNOWN) {
-    srclen = strlen(source);
-  }
-  if (srclen >= buflen) {
-    srclen = buflen - 1;
-  }
-  memcpy(buffer, source, srclen);
-  buffer[srclen] = 0;
-  return srclen;
-}
-
-void replace_substrs(const char* search,
-                     size_t search_len,
-                     const char* replace,
-                     size_t replace_len,
-                     std::string* s) {
-  size_t pos = 0;
-  while ((pos = s->find(search, pos, search_len)) != std::string::npos) {
-    s->replace(pos, search_len, replace, replace_len);
-    pos += replace_len;
-  }
-}
-
-bool starts_with(const char* s1, const char* s2) {
-  return strncmp(s1, s2, strlen(s2)) == 0;
-}
-
-bool ends_with(const char* s1, const char* s2) {
-  size_t s1_length = strlen(s1);
-  size_t s2_length = strlen(s2);
-
-  if (s2_length > s1_length) {
-    return false;
-  }
-
-  const char* start = s1 + (s1_length - s2_length);
-  return strncmp(start, s2, s2_length) == 0;
-}
-
-static const char kWhitespace[] = " \n\r\t";
-
-std::string string_trim(const std::string& s) {
-  std::string::size_type first = s.find_first_not_of(kWhitespace);
-  std::string::size_type last = s.find_last_not_of(kWhitespace);
-
-  if (first == std::string::npos || last == std::string::npos) {
-    return std::string("");
-  }
-
-  return s.substr(first, last - first + 1);
-}
-
-std::string ToHex(const int i) {
-  char buffer[50];
-  snprintf(buffer, sizeof(buffer), "%x", i);
-
-  return std::string(buffer);
-}
-
-std::string LeftPad(char padding, unsigned length, std::string s) {
-  if (s.length() >= length)
-    return s;
-  return std::string(length - s.length(), padding) + s;
-}
-
-}  // namespace rtc
diff --git a/submodules/libtgvoip/webrtc_dsp/rtc_base/stringutils.h b/submodules/libtgvoip/webrtc_dsp/rtc_base/stringutils.h
deleted file mode 100755
index 702bc67b79..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/rtc_base/stringutils.h
+++ /dev/null
@@ -1,119 +0,0 @@
-/*
- *  Copyright 2004 The WebRTC Project Authors. All rights reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#ifndef RTC_BASE_STRINGUTILS_H_
-#define RTC_BASE_STRINGUTILS_H_
-
-#include <ctype.h>
-#include <stdarg.h>
-#include <stdio.h>
-#include <string.h>
-
-#if defined(WEBRTC_WIN)
-#include <malloc.h>
-#include <wchar.h>
-#include <windows.h>
-
-#define alloca _alloca
-#endif  // WEBRTC_WIN
-
-#if defined(WEBRTC_POSIX)
-#ifdef BSD
-#include <stdlib.h>
-#else  // BSD
-#include <alloca.h>
-#endif  // !BSD
-#include <strings.h>
-#endif  // WEBRTC_POSIX
-
-#include <string>
-
-///////////////////////////////////////////////////////////////////////////////
-// Generic string/memory utilities
-///////////////////////////////////////////////////////////////////////////////
-
-#define STACK_ARRAY(TYPE, LEN) \
-  static_cast<TYPE*>(::alloca((LEN) * sizeof(TYPE)))
-
-///////////////////////////////////////////////////////////////////////////////
-// Traits simplifies porting string functions to be CTYPE-agnostic
-///////////////////////////////////////////////////////////////////////////////
-
-namespace rtc {
-
-const size_t SIZE_UNKNOWN = static_cast<size_t>(-1);
-
-// Safe version of strncpy that always nul-terminate.
-size_t strcpyn(char* buffer,
-               size_t buflen,
-               const char* source,
-               size_t srclen = SIZE_UNKNOWN);
-
-///////////////////////////////////////////////////////////////////////////////
-// UTF helpers (Windows only)
-///////////////////////////////////////////////////////////////////////////////
-
-#if defined(WEBRTC_WIN)
-
-inline std::wstring ToUtf16(const char* utf8, size_t len) {
-  int len16 = ::MultiByteToWideChar(CP_UTF8, 0, utf8, static_cast<int>(len),
-                                    nullptr, 0);
-  wchar_t* ws = STACK_ARRAY(wchar_t, len16);
-  ::MultiByteToWideChar(CP_UTF8, 0, utf8, static_cast<int>(len), ws, len16);
-  return std::wstring(ws, len16);
-}
-
-inline std::wstring ToUtf16(const std::string& str) {
-  return ToUtf16(str.data(), str.length());
-}
-
-inline std::string ToUtf8(const wchar_t* wide, size_t len) {
-  int len8 = ::WideCharToMultiByte(CP_UTF8, 0, wide, static_cast<int>(len),
-                                   nullptr, 0, nullptr, nullptr);
-  char* ns = STACK_ARRAY(char, len8);
-  ::WideCharToMultiByte(CP_UTF8, 0, wide, static_cast<int>(len), ns, len8,
-                        nullptr, nullptr);
-  return std::string(ns, len8);
-}
-
-inline std::string ToUtf8(const wchar_t* wide) {
-  return ToUtf8(wide, wcslen(wide));
-}
-
-inline std::string ToUtf8(const std::wstring& wstr) {
-  return ToUtf8(wstr.data(), wstr.length());
-}
-
-#endif  // WEBRTC_WIN
-
-// Replaces all occurrences of "search" with "replace".
-void replace_substrs(const char* search,
-                     size_t search_len,
-                     const char* replace,
-                     size_t replace_len,
-                     std::string* s);
-
-// True iff s1 starts with s2.
-bool starts_with(const char* s1, const char* s2);
-
-// True iff s1 ends with s2.
-bool ends_with(const char* s1, const char* s2);
-
-// Remove leading and trailing whitespaces.
-std::string string_trim(const std::string& s);
-
-// TODO(jonasolsson): replace with absl::Hex when that becomes available.
-std::string ToHex(const int i);
-
-std::string LeftPad(char padding, unsigned length, std::string s);
-
-}  // namespace rtc
-
-#endif  // RTC_BASE_STRINGUTILS_H_
diff --git a/submodules/libtgvoip/webrtc_dsp/rtc_base/swap_queue.h b/submodules/libtgvoip/webrtc_dsp/rtc_base/swap_queue.h
deleted file mode 100644
index 172f2f5f8f..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/rtc_base/swap_queue.h
+++ /dev/null
@@ -1,212 +0,0 @@
-/*
- *  Copyright (c) 2015 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#ifndef RTC_BASE_SWAP_QUEUE_H_
-#define RTC_BASE_SWAP_QUEUE_H_
-
-#include <algorithm>
-#include <utility>
-#include <vector>
-
-#include "rtc_base/checks.h"
-#include "rtc_base/constructormagic.h"
-#include "rtc_base/criticalsection.h"
-#include "rtc_base/system/unused.h"
-
-namespace webrtc {
-
-namespace internal {
-
-// (Internal; please don't use outside this file.)
-template <typename T>
-bool NoopSwapQueueItemVerifierFunction(const T&) {
-  return true;
-}
-
-}  // namespace internal
-
-// Functor to use when supplying a verifier function for the queue.
-template <typename T,
-          bool (*QueueItemVerifierFunction)(const T&) =
-              internal::NoopSwapQueueItemVerifierFunction>
-class SwapQueueItemVerifier {
- public:
-  bool operator()(const T& t) const { return QueueItemVerifierFunction(t); }
-};
-
-// This class is a fixed-size queue. A producer calls Insert() to insert
-// an element of type T at the back of the queue, and a consumer calls
-// Remove() to remove an element from the front of the queue. It's safe
-// for the producer(s) and the consumer(s) to access the queue
-// concurrently, from different threads.
-//
-// To avoid the construction, copying, and destruction of Ts that a naive
-// queue implementation would require, for each "full" T passed from
-// producer to consumer, SwapQueue<T> passes an "empty" T in the other
-// direction (an "empty" T is one that contains nothing of value for the
-// consumer). This bidirectional movement is implemented with swap().
-//
-// // Create queue:
-// Bottle proto(568);  // Prepare an empty Bottle. Heap allocates space for
-//                     // 568 ml.
-// SwapQueue<Bottle> q(N, proto);  // Init queue with N copies of proto.
-//                                 // Each copy allocates on the heap.
-// // Producer pseudo-code:
-// Bottle b(568); // Prepare an empty Bottle. Heap allocates space for 568 ml.
-// loop {
-//   b.Fill(amount);  // Where amount <= 568 ml.
-//   q.Insert(&b);    // Swap our full Bottle for an empty one from q.
-// }
-//
-// // Consumer pseudo-code:
-// Bottle b(568);  // Prepare an empty Bottle. Heap allocates space for 568 ml.
-// loop {
-//   q.Remove(&b); // Swap our empty Bottle for the next-in-line full Bottle.
-//   Drink(&b);
-// }
-//
-// For a well-behaved Bottle class, there are no allocations in the
-// producer, since it just fills an empty Bottle that's already large
-// enough; no deallocations in the consumer, since it returns each empty
-// Bottle to the queue after having drunk it; and no copies along the
-// way, since the queue uses swap() everywhere to move full Bottles in
-// one direction and empty ones in the other.
-template <typename T, typename QueueItemVerifier = SwapQueueItemVerifier<T>>
-class SwapQueue {
- public:
-  // Creates a queue of size size and fills it with default constructed Ts.
-  explicit SwapQueue(size_t size) : queue_(size) {
-    RTC_DCHECK(VerifyQueueSlots());
-  }
-
-  // Same as above and accepts an item verification functor.
-  SwapQueue(size_t size, const QueueItemVerifier& queue_item_verifier)
-      : queue_item_verifier_(queue_item_verifier), queue_(size) {
-    RTC_DCHECK(VerifyQueueSlots());
-  }
-
-  // Creates a queue of size size and fills it with copies of prototype.
-  SwapQueue(size_t size, const T& prototype) : queue_(size, prototype) {
-    RTC_DCHECK(VerifyQueueSlots());
-  }
-
-  // Same as above and accepts an item verification functor.
-  SwapQueue(size_t size,
-            const T& prototype,
-            const QueueItemVerifier& queue_item_verifier)
-      : queue_item_verifier_(queue_item_verifier), queue_(size, prototype) {
-    RTC_DCHECK(VerifyQueueSlots());
-  }
-
-  // Resets the queue to have zero content wile maintaining the queue size.
-  void Clear() {
-    rtc::CritScope cs(&crit_queue_);
-    next_write_index_ = 0;
-    next_read_index_ = 0;
-    num_elements_ = 0;
-  }
-
-  // Inserts a "full" T at the back of the queue by swapping *input with an
-  // "empty" T from the queue.
-  // Returns true if the item was inserted or false if not (the queue was full).
-  // When specified, the T given in *input must pass the ItemVerifier() test.
-  // The contents of *input after the call are then also guaranteed to pass the
-  // ItemVerifier() test.
-  bool Insert(T* input) RTC_WARN_UNUSED_RESULT {
-    RTC_DCHECK(input);
-
-    rtc::CritScope cs(&crit_queue_);
-
-    RTC_DCHECK(queue_item_verifier_(*input));
-
-    if (num_elements_ == queue_.size()) {
-      return false;
-    }
-
-    using std::swap;
-    swap(*input, queue_[next_write_index_]);
-
-    ++next_write_index_;
-    if (next_write_index_ == queue_.size()) {
-      next_write_index_ = 0;
-    }
-
-    ++num_elements_;
-
-    RTC_DCHECK_LT(next_write_index_, queue_.size());
-    RTC_DCHECK_LE(num_elements_, queue_.size());
-
-    return true;
-  }
-
-  // Removes the frontmost "full" T from the queue by swapping it with
-  // the "empty" T in *output.
-  // Returns true if an item could be removed or false if not (the queue was
-  // empty). When specified, The T given in *output must pass the ItemVerifier()
-  // test and the contents of *output after the call are then also guaranteed to
-  // pass the ItemVerifier() test.
-  bool Remove(T* output) RTC_WARN_UNUSED_RESULT {
-    RTC_DCHECK(output);
-
-    rtc::CritScope cs(&crit_queue_);
-
-    RTC_DCHECK(queue_item_verifier_(*output));
-
-    if (num_elements_ == 0) {
-      return false;
-    }
-
-    using std::swap;
-    swap(*output, queue_[next_read_index_]);
-
-    ++next_read_index_;
-    if (next_read_index_ == queue_.size()) {
-      next_read_index_ = 0;
-    }
-
-    --num_elements_;
-
-    RTC_DCHECK_LT(next_read_index_, queue_.size());
-    RTC_DCHECK_LE(num_elements_, queue_.size());
-
-    return true;
-  }
-
- private:
-  // Verify that the queue slots complies with the ItemVerifier test.
-  bool VerifyQueueSlots() {
-    rtc::CritScope cs(&crit_queue_);
-    for (const auto& v : queue_) {
-      RTC_DCHECK(queue_item_verifier_(v));
-    }
-    return true;
-  }
-
-  rtc::CriticalSection crit_queue_;
-
-  // TODO(peah): Change this to use std::function() once we can use C++11 std
-  // lib.
-  QueueItemVerifier queue_item_verifier_ RTC_GUARDED_BY(crit_queue_);
-
-  // (next_read_index_ + num_elements_) % queue_.size() =
-  //  next_write_index_
-  size_t next_write_index_ RTC_GUARDED_BY(crit_queue_) = 0;
-  size_t next_read_index_ RTC_GUARDED_BY(crit_queue_) = 0;
-  size_t num_elements_ RTC_GUARDED_BY(crit_queue_) = 0;
-
-  // queue_.size() is constant.
-  std::vector<T> queue_ RTC_GUARDED_BY(crit_queue_);
-
-  RTC_DISALLOW_COPY_AND_ASSIGN(SwapQueue);
-};
-
-}  // namespace webrtc
-
-#endif  // RTC_BASE_SWAP_QUEUE_H_
diff --git a/submodules/libtgvoip/webrtc_dsp/rtc_base/system/arch.h b/submodules/libtgvoip/webrtc_dsp/rtc_base/system/arch.h
deleted file mode 100644
index ef27c1737c..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/rtc_base/system/arch.h
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- *  Copyright (c) 2018 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-// This file contains platform-specific typedefs and defines.
-// Much of it is derived from Chromium's build/build_config.h.
-
-#ifndef RTC_BASE_SYSTEM_ARCH_H_
-#define RTC_BASE_SYSTEM_ARCH_H_
-
-// Processor architecture detection.  For more info on what's defined, see:
-//   http://msdn.microsoft.com/en-us/library/b0084kay.aspx
-//   http://www.agner.org/optimize/calling_conventions.pdf
-//   or with gcc, run: "echo | gcc -E -dM -"
-#if defined(_M_X64) || defined(__x86_64__)
-#define WEBRTC_ARCH_X86_FAMILY
-#define WEBRTC_ARCH_X86_64
-#define WEBRTC_ARCH_64_BITS
-#define WEBRTC_ARCH_LITTLE_ENDIAN
-#elif defined(__aarch64__)
-#define WEBRTC_ARCH_ARM_FAMILY
-#define WEBRTC_ARCH_64_BITS
-#define WEBRTC_ARCH_LITTLE_ENDIAN
-#elif defined(_M_IX86) || defined(__i386__)
-#define WEBRTC_ARCH_X86_FAMILY
-#define WEBRTC_ARCH_X86
-#define WEBRTC_ARCH_32_BITS
-#define WEBRTC_ARCH_LITTLE_ENDIAN
-#elif defined(__ARMEL__) || defined(__arm__) || defined(_M_ARM)
-#define WEBRTC_ARCH_ARM_FAMILY
-#define WEBRTC_ARCH_32_BITS
-#define WEBRTC_ARCH_LITTLE_ENDIAN
-#elif defined(__MIPSEL__)
-#define WEBRTC_ARCH_MIPS_FAMILY
-#if defined(__LP64__)
-#define WEBRTC_ARCH_64_BITS
-#else
-#define WEBRTC_ARCH_32_BITS
-#endif
-#define WEBRTC_ARCH_LITTLE_ENDIAN
-#elif defined(__pnacl__)
-#define WEBRTC_ARCH_32_BITS
-#define WEBRTC_ARCH_LITTLE_ENDIAN
-#elif defined(__powerpc64__)
-#if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
-#define WEBRTC_ARCH_LITTLE_ENDIAN
-#else
-#define WEBRTC_ARCH_BIG_ENDIAN
-#endif
-#define WEBRTC_ARCH_64_BITS
-#elif defined(__powerpc__)
-#define WEBRTC_ARCH_BIG_ENDIAN
-#define WEBRTC_ARCH_32_BITS
-#else
-/* instead of failing, use typical unix defines... */
-#if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
-#define WEBRTC_ARCH_LITTLE_ENDIAN
-#elif __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
-#define WEBRTC_ARCH_BIG_ENDIAN
-#else
-#error __BYTE_ORDER__ is not defined
-#endif
-#if defined(__LP64__)
-#define WEBRTC_ARCH_64_BITS
-#else
-#define WEBRTC_ARCH_32_BITS
-#endif
-#endif
-
-#if !(defined(WEBRTC_ARCH_LITTLE_ENDIAN) ^ defined(WEBRTC_ARCH_BIG_ENDIAN))
-#error Define either WEBRTC_ARCH_LITTLE_ENDIAN or WEBRTC_ARCH_BIG_ENDIAN
-#endif
-
-#endif  // RTC_BASE_SYSTEM_ARCH_H_
diff --git a/submodules/libtgvoip/webrtc_dsp/rtc_base/system/asm_defines.h b/submodules/libtgvoip/webrtc_dsp/rtc_base/system/asm_defines.h
deleted file mode 100644
index a7f6aad272..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/rtc_base/system/asm_defines.h
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- *  Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#ifndef RTC_BASE_SYSTEM_ASM_DEFINES_H_
-#define RTC_BASE_SYSTEM_ASM_DEFINES_H_
-
-// clang-format off
-// clang formatting breaks everything here, e.g. concatenating directives,
-// due to absence of context via asm keyword.
-
-#if defined(__linux__) && defined(__ELF__)
-.section .note.GNU-stack,"",%progbits
-#endif
-
-// Define the macros used in ARM assembly code, so that for Mac or iOS builds
-// we add leading underscores for the function names.
-#ifdef __APPLE__
-.macro GLOBAL_FUNCTION name
-.global _\name
-.private_extern _\name
-.endm
-.macro DEFINE_FUNCTION name
-_\name:
-.endm
-.macro CALL_FUNCTION name
-bl _\name
-.endm
-.macro GLOBAL_LABEL name
-.global _\name
-.private_extern _\name
-.endm
-#else
-.macro GLOBAL_FUNCTION name
-.global \name
-.hidden \name
-.endm
-.macro DEFINE_FUNCTION name
-#if defined(__linux__) && defined(__ELF__)
-.type \name,%function
-#endif
-\name:
-.endm
-.macro CALL_FUNCTION name
-bl \name
-.endm
-.macro GLOBAL_LABEL name
-.global \name
-.hidden \name
-.endm
-#endif
-
-// With Apple's clang compiler, for instructions ldrb, strh, etc.,
-// the condition code is after the width specifier. Here we define
-// only the ones that are actually used in the assembly files.
-#if (defined __llvm__) && (defined __APPLE__)
-.macro streqh reg1, reg2, num
-strheq \reg1, \reg2, \num
-.endm
-#endif
-
-.text
-
-// clang-format on
-
-#endif  // RTC_BASE_SYSTEM_ASM_DEFINES_H_
diff --git a/submodules/libtgvoip/webrtc_dsp/rtc_base/system/ignore_warnings.h b/submodules/libtgvoip/webrtc_dsp/rtc_base/system/ignore_warnings.h
deleted file mode 100644
index e891c508f8..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/rtc_base/system/ignore_warnings.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- *  Copyright (c) 2018 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#ifndef RTC_BASE_SYSTEM_IGNORE_WARNINGS_H_
-#define RTC_BASE_SYSTEM_IGNORE_WARNINGS_H_
-
-#ifdef __clang__
-#define RTC_PUSH_IGNORING_WFRAME_LARGER_THAN() \
-  _Pragma("clang diagnostic push")             \
-      _Pragma("clang diagnostic ignored \"-Wframe-larger-than=\"")
-#define RTC_POP_IGNORING_WFRAME_LARGER_THAN() _Pragma("clang diagnostic pop")
-#elif __GNUC__
-#define RTC_PUSH_IGNORING_WFRAME_LARGER_THAN() \
-  _Pragma("GCC diagnostic push")               \
-      _Pragma("GCC diagnostic ignored \"-Wframe-larger-than=\"")
-#define RTC_POP_IGNORING_WFRAME_LARGER_THAN() _Pragma("GCC diagnostic pop")
-#else
-#define RTC_PUSH_IGNORING_WFRAME_LARGER_THAN()
-#define RTC_POP_IGNORING_WFRAME_LARGER_THAN()
-#endif
-
-#endif  // RTC_BASE_SYSTEM_IGNORE_WARNINGS_H_
diff --git a/submodules/libtgvoip/webrtc_dsp/rtc_base/system/inline.h b/submodules/libtgvoip/webrtc_dsp/rtc_base/system/inline.h
deleted file mode 100644
index f585d34ded..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/rtc_base/system/inline.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- *  Copyright (c) 2018 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#ifndef RTC_BASE_SYSTEM_INLINE_H_
-#define RTC_BASE_SYSTEM_INLINE_H_
-
-#if defined(_MSC_VER)
-
-#define RTC_FORCE_INLINE __forceinline
-#define RTC_NO_INLINE __declspec(noinline)
-
-#elif defined(__GNUC__)
-
-#define RTC_FORCE_INLINE __attribute__((__always_inline__))
-#define RTC_NO_INLINE __attribute__((__noinline__))
-
-#else
-
-#define RTC_FORCE_INLINE
-#define RTC_NO_INLINE
-
-#endif
-
-#endif  // RTC_BASE_SYSTEM_INLINE_H_
diff --git a/submodules/libtgvoip/webrtc_dsp/rtc_base/system/rtc_export.h b/submodules/libtgvoip/webrtc_dsp/rtc_base/system/rtc_export.h
deleted file mode 100644
index d1eb60ad78..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/rtc_base/system/rtc_export.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- *  Copyright (c) 2018 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#ifndef RTC_BASE_SYSTEM_RTC_EXPORT_H_
-#define RTC_BASE_SYSTEM_RTC_EXPORT_H_
-
-// RTC_EXPORT is used to mark symbols as exported or imported when WebRTC is
-// built or used as a shared library.
-// When WebRTC is built as a static library the RTC_EXPORT macro expands to
-// nothing.
-
-#ifdef WEBRTC_ENABLE_SYMBOL_EXPORT
-
-#ifdef WEBRTC_WIN
-
-#ifdef WEBRTC_LIBRARY_IMPL
-#define RTC_EXPORT __declspec(dllexport)
-#else
-#define RTC_EXPORT __declspec(dllimport)
-#endif
-
-#else  // WEBRTC_WIN
-
-#if __has_attribute(visibility) && defined(WEBRTC_LIBRARY_IMPL)
-#define RTC_EXPORT __attribute__((visibility("default")))
-#endif
-
-#endif  // WEBRTC_WIN
-
-#endif  // WEBRTC_ENABLE_SYMBOL_EXPORT
-
-#ifndef RTC_EXPORT
-#define RTC_EXPORT
-#endif
-
-#endif  // RTC_BASE_SYSTEM_RTC_EXPORT_H_
diff --git a/submodules/libtgvoip/webrtc_dsp/rtc_base/system/unused.h b/submodules/libtgvoip/webrtc_dsp/rtc_base/system/unused.h
deleted file mode 100644
index a0add4ee29..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/rtc_base/system/unused.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- *  Copyright (c) 2018 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#ifndef RTC_BASE_SYSTEM_UNUSED_H_
-#define RTC_BASE_SYSTEM_UNUSED_H_
-
-// Annotate a function indicating the caller must examine the return value.
-// Use like:
-//   int foo() RTC_WARN_UNUSED_RESULT;
-// To explicitly ignore a result, cast to void.
-// TODO(kwiberg): Remove when we can use [[nodiscard]] from C++17.
-#if defined(__clang__)
-#define RTC_WARN_UNUSED_RESULT __attribute__((__warn_unused_result__))
-#elif defined(__GNUC__)
-// gcc has a __warn_unused_result__ attribute, but you can't quiet it by
-// casting to void, so we don't use it.
-#define RTC_WARN_UNUSED_RESULT
-#else
-#define RTC_WARN_UNUSED_RESULT
-#endif
-
-// Prevent the compiler from warning about an unused variable. For example:
-//   int result = DoSomething();
-//   assert(result == 17);
-//   RTC_UNUSED(result);
-// Note: In most cases it is better to remove the unused variable rather than
-// suppressing the compiler warning.
-#ifndef RTC_UNUSED
-#define RTC_UNUSED(x) static_cast<void>(x)
-#endif  // RTC_UNUSED
-
-#endif  // RTC_BASE_SYSTEM_UNUSED_H_
diff --git a/submodules/libtgvoip/webrtc_dsp/rtc_base/thread_annotations.h b/submodules/libtgvoip/webrtc_dsp/rtc_base/thread_annotations.h
deleted file mode 100644
index 8569fab16a..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/rtc_base/thread_annotations.h
+++ /dev/null
@@ -1,95 +0,0 @@
-//
-// Copyright (c) 2013 The WebRTC project authors. All Rights Reserved.
-//
-// Use of this source code is governed by a BSD-style license
-// that can be found in the LICENSE file in the root of the source
-// tree. An additional intellectual property rights grant can be found
-// in the file PATENTS.  All contributing project authors may
-// be found in the AUTHORS file in the root of the source tree.
-//
-// Borrowed from
-// https://code.google.com/p/gperftools/source/browse/src/base/thread_annotations.h
-// but adapted for clang attributes instead of the gcc.
-//
-// This header file contains the macro definitions for thread safety
-// annotations that allow the developers to document the locking policies
-// of their multi-threaded code. The annotations can also help program
-// analysis tools to identify potential thread safety issues.
-
-#ifndef RTC_BASE_THREAD_ANNOTATIONS_H_
-#define RTC_BASE_THREAD_ANNOTATIONS_H_
-
-#if defined(__clang__) && (!defined(SWIG))
-#define RTC_THREAD_ANNOTATION_ATTRIBUTE__(x) __attribute__((x))
-#else
-#define RTC_THREAD_ANNOTATION_ATTRIBUTE__(x)  // no-op
-#endif
-
-// Document if a shared variable/field needs to be protected by a lock.
-// GUARDED_BY allows the user to specify a particular lock that should be
-// held when accessing the annotated variable.
-#define RTC_GUARDED_BY(x) RTC_THREAD_ANNOTATION_ATTRIBUTE__(guarded_by(x))
-
-// Document if the memory location pointed to by a pointer should be guarded
-// by a lock when dereferencing the pointer. Note that a pointer variable to a
-// shared memory location could itself be a shared variable. For example, if a
-// shared global pointer q, which is guarded by mu1, points to a shared memory
-// location that is guarded by mu2, q should be annotated as follows:
-//     int *q GUARDED_BY(mu1) PT_GUARDED_BY(mu2);
-#define RTC_PT_GUARDED_BY(x) RTC_THREAD_ANNOTATION_ATTRIBUTE__(pt_guarded_by(x))
-
-// Document the acquisition order between locks that can be held
-// simultaneously by a thread. For any two locks that need to be annotated
-// to establish an acquisition order, only one of them needs the annotation.
-// (i.e. You don't have to annotate both locks with both ACQUIRED_AFTER
-// and ACQUIRED_BEFORE.)
-#define RTC_ACQUIRED_AFTER(x) \
-  RTC_THREAD_ANNOTATION_ATTRIBUTE__(acquired_after(x))
-#define RTC_ACQUIRED_BEFORE(x) \
-  RTC_THREAD_ANNOTATION_ATTRIBUTE__(acquired_before(x))
-
-// The following three annotations document the lock requirements for
-// functions/methods.
-
-// Document if a function expects certain locks to be held before it is called
-#define RTC_EXCLUSIVE_LOCKS_REQUIRED(...) \
-  RTC_THREAD_ANNOTATION_ATTRIBUTE__(exclusive_locks_required(__VA_ARGS__))
-#define RTC_SHARED_LOCKS_REQUIRED(...) \
-  RTC_THREAD_ANNOTATION_ATTRIBUTE__(shared_locks_required(__VA_ARGS__))
-
-// Document the locks acquired in the body of the function. These locks
-// cannot be held when calling this function (as google3's Mutex locks are
-// non-reentrant).
-#define RTC_LOCKS_EXCLUDED(...) \
-  RTC_THREAD_ANNOTATION_ATTRIBUTE__(locks_excluded(__VA_ARGS__))
-
-// Document the lock the annotated function returns without acquiring it.
-#define RTC_LOCK_RETURNED(x) RTC_THREAD_ANNOTATION_ATTRIBUTE__(lock_returned(x))
-
-// Document if a class/type is a lockable type (such as the Mutex class).
-#define RTC_LOCKABLE RTC_THREAD_ANNOTATION_ATTRIBUTE__(lockable)
-
-// Document if a class is a scoped lockable type (such as the MutexLock class).
-#define RTC_SCOPED_LOCKABLE RTC_THREAD_ANNOTATION_ATTRIBUTE__(scoped_lockable)
-
-// The following annotations specify lock and unlock primitives.
-#define RTC_EXCLUSIVE_LOCK_FUNCTION(...) \
-  RTC_THREAD_ANNOTATION_ATTRIBUTE__(exclusive_lock_function(__VA_ARGS__))
-
-#define RTC_SHARED_LOCK_FUNCTION(...) \
-  RTC_THREAD_ANNOTATION_ATTRIBUTE__(shared_lock_function(__VA_ARGS__))
-
-#define RTC_EXCLUSIVE_TRYLOCK_FUNCTION(...) \
-  RTC_THREAD_ANNOTATION_ATTRIBUTE__(exclusive_trylock_function(__VA_ARGS__))
-
-#define RTC_SHARED_TRYLOCK_FUNCTION(...) \
-  RTC_THREAD_ANNOTATION_ATTRIBUTE__(shared_trylock_function(__VA_ARGS__))
-
-#define RTC_UNLOCK_FUNCTION(...) \
-  RTC_THREAD_ANNOTATION_ATTRIBUTE__(unlock_function(__VA_ARGS__))
-
-// An escape hatch for thread safety analysis to ignore the annotated function.
-#define RTC_NO_THREAD_SAFETY_ANALYSIS \
-  RTC_THREAD_ANNOTATION_ATTRIBUTE__(no_thread_safety_analysis)
-
-#endif  // RTC_BASE_THREAD_ANNOTATIONS_H_
diff --git a/submodules/libtgvoip/webrtc_dsp/rtc_base/thread_checker.h b/submodules/libtgvoip/webrtc_dsp/rtc_base/thread_checker.h
deleted file mode 100644
index ad0450871a..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/rtc_base/thread_checker.h
+++ /dev/null
@@ -1,171 +0,0 @@
-/*
- *  Copyright (c) 2014 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-// Borrowed from Chromium's src/base/threading/thread_checker.h.
-
-#ifndef RTC_BASE_THREAD_CHECKER_H_
-#define RTC_BASE_THREAD_CHECKER_H_
-
-// Apart from debug builds, we also enable the thread checker in
-// builds with RTC_DCHECK_IS_ON so that trybots and waterfall bots
-// with this define will get the same level of thread checking as
-// debug bots.
-#define RTC_ENABLE_THREAD_CHECKER RTC_DCHECK_IS_ON
-
-#include "rtc_base/checks.h"
-#include "rtc_base/constructormagic.h"
-#include "rtc_base/thread_annotations.h"
-#include "rtc_base/thread_checker_impl.h"
-
-namespace rtc {
-
-// Do nothing implementation, for use in release mode.
-//
-// Note: You should almost always use the ThreadChecker class to get the
-// right version for your build configuration.
-class ThreadCheckerDoNothing {
- public:
-  bool CalledOnValidThread() const { return true; }
-
-  void DetachFromThread() {}
-};
-
-// ThreadChecker is a helper class used to help verify that some methods of a
-// class are called from the same thread. It provides identical functionality to
-// base::NonThreadSafe, but it is meant to be held as a member variable, rather
-// than inherited from base::NonThreadSafe.
-//
-// While inheriting from base::NonThreadSafe may give a clear indication about
-// the thread-safety of a class, it may also lead to violations of the style
-// guide with regard to multiple inheritance. The choice between having a
-// ThreadChecker member and inheriting from base::NonThreadSafe should be based
-// on whether:
-//  - Derived classes need to know the thread they belong to, as opposed to
-//    having that functionality fully encapsulated in the base class.
-//  - Derived classes should be able to reassign the base class to another
-//    thread, via DetachFromThread.
-//
-// If neither of these are true, then having a ThreadChecker member and calling
-// CalledOnValidThread is the preferable solution.
-//
-// Example:
-// class MyClass {
-//  public:
-//   void Foo() {
-//     RTC_DCHECK(thread_checker_.CalledOnValidThread());
-//     ... (do stuff) ...
-//   }
-//
-//  private:
-//   ThreadChecker thread_checker_;
-// }
-//
-// In Release mode, CalledOnValidThread will always return true.
-#if RTC_ENABLE_THREAD_CHECKER
-class RTC_LOCKABLE ThreadChecker : public ThreadCheckerImpl {};
-#else
-class RTC_LOCKABLE ThreadChecker : public ThreadCheckerDoNothing {};
-#endif  // RTC_ENABLE_THREAD_CHECKER
-
-#undef RTC_ENABLE_THREAD_CHECKER
-
-namespace internal {
-class RTC_SCOPED_LOCKABLE AnnounceOnThread {
- public:
-  template <typename ThreadLikeObject>
-  explicit AnnounceOnThread(const ThreadLikeObject* thread_like_object)
-      RTC_EXCLUSIVE_LOCK_FUNCTION(thread_like_object) {}
-  ~AnnounceOnThread() RTC_UNLOCK_FUNCTION() {}
-
-  template <typename ThreadLikeObject>
-  static bool IsCurrent(const ThreadLikeObject* thread_like_object) {
-    return thread_like_object->IsCurrent();
-  }
-  static bool IsCurrent(const rtc::ThreadChecker* checker) {
-    return checker->CalledOnValidThread();
-  }
-
- private:
-  RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(AnnounceOnThread);
-};
-
-}  // namespace internal
-}  // namespace rtc
-
-// RTC_RUN_ON/RTC_GUARDED_BY/RTC_DCHECK_RUN_ON macros allows to annotate
-// variables are accessed from same thread/task queue.
-// Using tools designed to check mutexes, it checks at compile time everywhere
-// variable is access, there is a run-time dcheck thread/task queue is correct.
-//
-// class ExampleThread {
-//  public:
-//   void NeedVar1() {
-//     RTC_DCHECK_RUN_ON(network_thread_);
-//     transport_->Send();
-//   }
-//
-//  private:
-//   rtc::Thread* network_thread_;
-//   int transport_ RTC_GUARDED_BY(network_thread_);
-// };
-//
-// class ExampleThreadChecker {
-//  public:
-//   int CalledFromPacer() RTC_RUN_ON(pacer_thread_checker_) {
-//     return var2_;
-//   }
-//
-//   void CallMeFromPacer() {
-//     RTC_DCHECK_RUN_ON(&pacer_thread_checker_)
-//        << "Should be called from pacer";
-//     CalledFromPacer();
-//   }
-//
-//  private:
-//   int pacer_var_ RTC_GUARDED_BY(pacer_thread_checker_);
-//   rtc::ThreadChecker pacer_thread_checker_;
-// };
-//
-// class TaskQueueExample {
-//  public:
-//   class Encoder {
-//    public:
-//     rtc::TaskQueue* Queue() { return encoder_queue_; }
-//     void Encode() {
-//       RTC_DCHECK_RUN_ON(encoder_queue_);
-//       DoSomething(var_);
-//     }
-//
-//    private:
-//     rtc::TaskQueue* const encoder_queue_;
-//     Frame var_ RTC_GUARDED_BY(encoder_queue_);
-//   };
-//
-//   void Encode() {
-//     // Will fail at runtime when DCHECK is enabled:
-//     // encoder_->Encode();
-//     // Will work:
-//     rtc::scoped_ref_ptr<Encoder> encoder = encoder_;
-//     encoder_->Queue()->PostTask([encoder] { encoder->Encode(); });
-//   }
-//
-//  private:
-//   rtc::scoped_ref_ptr<Encoder> encoder_;
-// }
-
-// Document if a function expected to be called from same thread/task queue.
-#define RTC_RUN_ON(x) \
-  RTC_THREAD_ANNOTATION_ATTRIBUTE__(exclusive_locks_required(x))
-
-#define RTC_DCHECK_RUN_ON(thread_like_object)                           \
-  rtc::internal::AnnounceOnThread thread_announcer(thread_like_object); \
-  RTC_DCHECK(rtc::internal::AnnounceOnThread::IsCurrent(thread_like_object))
-
-#endif  // RTC_BASE_THREAD_CHECKER_H_
diff --git a/submodules/libtgvoip/webrtc_dsp/rtc_base/thread_checker_impl.cc b/submodules/libtgvoip/webrtc_dsp/rtc_base/thread_checker_impl.cc
deleted file mode 100644
index a9e87c67a0..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/rtc_base/thread_checker_impl.cc
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- *  Copyright (c) 2014 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-// Borrowed from Chromium's src/base/threading/thread_checker_impl.cc.
-
-#include "rtc_base/thread_checker_impl.h"
-
-namespace rtc {
-
-ThreadCheckerImpl::ThreadCheckerImpl() : valid_thread_(CurrentThreadRef()) {}
-
-ThreadCheckerImpl::~ThreadCheckerImpl() {}
-
-bool ThreadCheckerImpl::CalledOnValidThread() const {
-  const PlatformThreadRef current_thread = CurrentThreadRef();
-  CritScope scoped_lock(&lock_);
-  if (!valid_thread_)  // Set if previously detached.
-    valid_thread_ = current_thread;
-  return IsThreadRefEqual(valid_thread_, current_thread);
-}
-
-void ThreadCheckerImpl::DetachFromThread() {
-  CritScope scoped_lock(&lock_);
-  valid_thread_ = 0;
-}
-
-}  // namespace rtc
diff --git a/submodules/libtgvoip/webrtc_dsp/rtc_base/thread_checker_impl.h b/submodules/libtgvoip/webrtc_dsp/rtc_base/thread_checker_impl.h
deleted file mode 100644
index c82fe1de5d..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/rtc_base/thread_checker_impl.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- *  Copyright (c) 2014 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-// Borrowed from Chromium's src/base/threading/thread_checker_impl.h.
-
-#ifndef RTC_BASE_THREAD_CHECKER_IMPL_H_
-#define RTC_BASE_THREAD_CHECKER_IMPL_H_
-
-#include "rtc_base/criticalsection.h"
-#include "rtc_base/platform_thread_types.h"
-
-namespace rtc {
-
-// Real implementation of ThreadChecker, for use in debug mode, or
-// for temporary use in release mode (e.g. to RTC_CHECK on a threading issue
-// seen only in the wild).
-//
-// Note: You should almost always use the ThreadChecker class to get the
-// right version for your build configuration.
-class ThreadCheckerImpl {
- public:
-  ThreadCheckerImpl();
-  ~ThreadCheckerImpl();
-
-  bool CalledOnValidThread() const;
-
-  // Changes the thread that is checked for in CalledOnValidThread.  This may
-  // be useful when an object may be created on one thread and then used
-  // exclusively on another thread.
-  void DetachFromThread();
-
- private:
-  CriticalSection lock_;
-  // This is mutable so that CalledOnValidThread can set it.
-  // It's guarded by |lock_|.
-  mutable PlatformThreadRef valid_thread_;
-};
-
-}  // namespace rtc
-
-#endif  // RTC_BASE_THREAD_CHECKER_IMPL_H_
diff --git a/submodules/libtgvoip/webrtc_dsp/rtc_base/timeutils.cc b/submodules/libtgvoip/webrtc_dsp/rtc_base/timeutils.cc
deleted file mode 100644
index 09b85dc8b7..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/rtc_base/timeutils.cc
+++ /dev/null
@@ -1,246 +0,0 @@
-/*
- *  Copyright 2004 The WebRTC Project Authors. All rights reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#include <stdint.h>
-
-#if defined(WEBRTC_POSIX)
-#include <sys/time.h>
-#if defined(WEBRTC_MAC)
-#include <mach/mach_time.h>
-#include "rtc_base/numerics/safe_conversions.h"
-#endif
-#endif
-
-#if defined(WEBRTC_WIN)
-// clang-format off
-// clang formatting would put <windows.h> last,
-// which leads to compilation failure.
-#include <windows.h>
-#include <mmsystem.h>
-#include <sys/timeb.h>
-// clang-format on
-#endif
-
-#include "rtc_base/checks.h"
-#include "rtc_base/timeutils.h"
-
-namespace rtc {
-
-ClockInterface* g_clock = nullptr;
-
-ClockInterface* SetClockForTesting(ClockInterface* clock) {
-  ClockInterface* prev = g_clock;
-  g_clock = clock;
-  return prev;
-}
-
-ClockInterface* GetClockForTesting() {
-  return g_clock;
-}
-
-int64_t SystemTimeNanos() {
-  int64_t ticks;
-#if defined(WEBRTC_MAC)
-  static mach_timebase_info_data_t timebase;
-  if (timebase.denom == 0) {
-    // Get the timebase if this is the first time we run.
-    // Recommended by Apple's QA1398.
-    if (mach_timebase_info(&timebase) != KERN_SUCCESS) {
-      RTC_NOTREACHED();
-    }
-  }
-  // Use timebase to convert absolute time tick units into nanoseconds.
-  const auto mul = [](uint64_t a, uint32_t b) -> int64_t {
-    RTC_DCHECK_NE(b, 0);
-    RTC_DCHECK_LE(a, std::numeric_limits<int64_t>::max() / b)
-        << "The multiplication " << a << " * " << b << " overflows";
-    return rtc::dchecked_cast<int64_t>(a * b);
-  };
-  ticks = mul(mach_absolute_time(), timebase.numer) / timebase.denom;
-#elif defined(WEBRTC_POSIX)
-  struct timespec ts;
-  // TODO(deadbeef): Do we need to handle the case when CLOCK_MONOTONIC is not
-  // supported?
-  clock_gettime(CLOCK_MONOTONIC, &ts);
-  ticks = kNumNanosecsPerSec * static_cast<int64_t>(ts.tv_sec) +
-          static_cast<int64_t>(ts.tv_nsec);
-#elif defined(WEBRTC_UWP)
-  static volatile ULONGLONG last_timegettime = 0;
-  static volatile int64_t num_wrap_timegettime = 0;
-  volatile ULONGLONG* last_timegettime_ptr = &last_timegettime;
-  ULONGLONG now = GetTickCount64();
-  // Atomically update the last gotten time
-  ULONGLONG old = InterlockedExchange(last_timegettime_ptr, now);
-  if (now < old) {
-	  // If now is earlier than old, there may have been a race between threads.
-	  // 0x0fffffff ~3.1 days, the code will not take that long to execute
-	  // so it must have been a wrap around.
-	  if (old > 0xf0000000 && now < 0x0fffffff) {
-		  num_wrap_timegettime++;
-	  }
-  }
-  ticks = now + (num_wrap_timegettime << 32);
-  // TODO(deadbeef): Calculate with nanosecond precision. Otherwise, we're
-  // just wasting a multiply and divide when doing Time() on Windows.
-  ticks = ticks * kNumNanosecsPerMillisec;
-#elif defined(WEBRTC_WIN)
-  static volatile LONG last_timegettime = 0;
-  static volatile int64_t num_wrap_timegettime = 0;
-  volatile LONG* last_timegettime_ptr = &last_timegettime;
-  DWORD now = timeGetTime();
-  // Atomically update the last gotten time
-  DWORD old = InterlockedExchange(last_timegettime_ptr, now);
-  if (now < old) {
-    // If now is earlier than old, there may have been a race between threads.
-    // 0x0fffffff ~3.1 days, the code will not take that long to execute
-    // so it must have been a wrap around.
-    if (old > 0xf0000000 && now < 0x0fffffff) {
-      num_wrap_timegettime++;
-    }
-  }
-  ticks = now + (num_wrap_timegettime << 32);
-  // TODO(deadbeef): Calculate with nanosecond precision. Otherwise, we're
-  // just wasting a multiply and divide when doing Time() on Windows.
-  ticks = ticks * kNumNanosecsPerMillisec;
-#else
-#error Unsupported platform.
-#endif
-  return ticks;
-}
-
-int64_t SystemTimeMillis() {
-  return static_cast<int64_t>(SystemTimeNanos() / kNumNanosecsPerMillisec);
-}
-
-int64_t TimeNanos() {
-  if (g_clock) {
-    return g_clock->TimeNanos();
-  }
-  return SystemTimeNanos();
-}
-
-uint32_t Time32() {
-  return static_cast<uint32_t>(TimeNanos() / kNumNanosecsPerMillisec);
-}
-
-int64_t TimeMillis() {
-  return TimeNanos() / kNumNanosecsPerMillisec;
-}
-
-int64_t TimeMicros() {
-  return TimeNanos() / kNumNanosecsPerMicrosec;
-}
-
-int64_t TimeAfter(int64_t elapsed) {
-  RTC_DCHECK_GE(elapsed, 0);
-  return TimeMillis() + elapsed;
-}
-
-int32_t TimeDiff32(uint32_t later, uint32_t earlier) {
-  return later - earlier;
-}
-
-int64_t TimeDiff(int64_t later, int64_t earlier) {
-  return later - earlier;
-}
-
-TimestampWrapAroundHandler::TimestampWrapAroundHandler()
-    : last_ts_(0), num_wrap_(-1) {}
-
-int64_t TimestampWrapAroundHandler::Unwrap(uint32_t ts) {
-  if (num_wrap_ == -1) {
-    last_ts_ = ts;
-    num_wrap_ = 0;
-    return ts;
-  }
-
-  if (ts < last_ts_) {
-    if (last_ts_ >= 0xf0000000 && ts < 0x0fffffff)
-      ++num_wrap_;
-  } else if ((ts - last_ts_) > 0xf0000000) {
-    // Backwards wrap. Unwrap with last wrap count and don't update last_ts_.
-    return ts + ((num_wrap_ - 1) << 32);
-  }
-
-  last_ts_ = ts;
-  return ts + (num_wrap_ << 32);
-}
-
-int64_t TmToSeconds(const tm& tm) {
-  static short int mdays[12] = {31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31};
-  static short int cumul_mdays[12] = {0,   31,  59,  90,  120, 151,
-                                      181, 212, 243, 273, 304, 334};
-  int year = tm.tm_year + 1900;
-  int month = tm.tm_mon;
-  int day = tm.tm_mday - 1;  // Make 0-based like the rest.
-  int hour = tm.tm_hour;
-  int min = tm.tm_min;
-  int sec = tm.tm_sec;
-
-  bool expiry_in_leap_year =
-      (year % 4 == 0 && (year % 100 != 0 || year % 400 == 0));
-
-  if (year < 1970)
-    return -1;
-  if (month < 0 || month > 11)
-    return -1;
-  if (day < 0 || day >= mdays[month] + (expiry_in_leap_year && month == 2 - 1))
-    return -1;
-  if (hour < 0 || hour > 23)
-    return -1;
-  if (min < 0 || min > 59)
-    return -1;
-  if (sec < 0 || sec > 59)
-    return -1;
-
-  day += cumul_mdays[month];
-
-  // Add number of leap days between 1970 and the expiration year, inclusive.
-  day += ((year / 4 - 1970 / 4) - (year / 100 - 1970 / 100) +
-          (year / 400 - 1970 / 400));
-
-  // We will have added one day too much above if expiration is during a leap
-  // year, and expiration is in January or February.
-  if (expiry_in_leap_year && month <= 2 - 1)  // |month| is zero based.
-    day -= 1;
-
-  // Combine all variables into seconds from 1970-01-01 00:00 (except |month|
-  // which was accumulated into |day| above).
-  return (((static_cast<int64_t>(year - 1970) * 365 + day) * 24 + hour) * 60 +
-          min) *
-             60 +
-         sec;
-}
-
-int64_t TimeUTCMicros() {
-  if (g_clock) {
-    return g_clock->TimeNanos() / kNumNanosecsPerMicrosec;
-  }
-#if defined(WEBRTC_POSIX)
-  struct timeval time;
-  gettimeofday(&time, nullptr);
-  // Convert from second (1.0) and microsecond (1e-6).
-  return (static_cast<int64_t>(time.tv_sec) * rtc::kNumMicrosecsPerSec +
-          time.tv_usec);
-
-#elif defined(WEBRTC_WIN)
-  struct _timeb time;
-  _ftime(&time);
-  // Convert from second (1.0) and milliseconds (1e-3).
-  return (static_cast<int64_t>(time.time) * rtc::kNumMicrosecsPerSec +
-          static_cast<int64_t>(time.millitm) * rtc::kNumMicrosecsPerMillisec);
-#endif
-}
-
-int64_t TimeUTCMillis() {
-  return TimeUTCMicros() / kNumMicrosecsPerMillisec;
-}
-
-}  // namespace rtc
diff --git a/submodules/libtgvoip/webrtc_dsp/rtc_base/timeutils.h b/submodules/libtgvoip/webrtc_dsp/rtc_base/timeutils.h
deleted file mode 100644
index 4e38a03140..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/rtc_base/timeutils.h
+++ /dev/null
@@ -1,162 +0,0 @@
-/*
- *  Copyright 2005 The WebRTC Project Authors. All rights reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#ifndef RTC_BASE_TIMEUTILS_H_
-#define RTC_BASE_TIMEUTILS_H_
-
-#include <stdint.h>
-#include <time.h>
-#include <string>
-
-#include "rtc_base/checks.h"
-#include "rtc_base/strings/string_builder.h"
-
-namespace rtc {
-
-static const int64_t kNumMillisecsPerSec = INT64_C(1000);
-static const int64_t kNumMicrosecsPerSec = INT64_C(1000000);
-static const int64_t kNumNanosecsPerSec = INT64_C(1000000000);
-
-static const int64_t kNumMicrosecsPerMillisec =
-    kNumMicrosecsPerSec / kNumMillisecsPerSec;
-static const int64_t kNumNanosecsPerMillisec =
-    kNumNanosecsPerSec / kNumMillisecsPerSec;
-static const int64_t kNumNanosecsPerMicrosec =
-    kNumNanosecsPerSec / kNumMicrosecsPerSec;
-
-// TODO(honghaiz): Define a type for the time value specifically.
-
-class ClockInterface {
- public:
-  virtual ~ClockInterface() {}
-  virtual int64_t TimeNanos() const = 0;
-};
-
-// Sets the global source of time. This is useful mainly for unit tests.
-//
-// Returns the previously set ClockInterface, or nullptr if none is set.
-//
-// Does not transfer ownership of the clock. SetClockForTesting(nullptr)
-// should be called before the ClockInterface is deleted.
-//
-// This method is not thread-safe; it should only be used when no other thread
-// is running (for example, at the start/end of a unit test, or start/end of
-// main()).
-//
-// TODO(deadbeef): Instead of having functions that access this global
-// ClockInterface, we may want to pass the ClockInterface into everything
-// that uses it, eliminating the need for a global variable and this function.
-ClockInterface* SetClockForTesting(ClockInterface* clock);
-
-// Returns previously set clock, or nullptr if no custom clock is being used.
-ClockInterface* GetClockForTesting();
-
-// Returns the actual system time, even if a clock is set for testing.
-// Useful for timeouts while using a test clock, or for logging.
-int64_t SystemTimeNanos();
-int64_t SystemTimeMillis();
-
-// Returns the current time in milliseconds in 32 bits.
-uint32_t Time32();
-
-// Returns the current time in milliseconds in 64 bits.
-int64_t TimeMillis();
-// Deprecated. Do not use this in any new code.
-inline int64_t Time() {
-  return TimeMillis();
-}
-
-// Returns the current time in microseconds.
-int64_t TimeMicros();
-
-// Returns the current time in nanoseconds.
-int64_t TimeNanos();
-
-// Returns a future timestamp, 'elapsed' milliseconds from now.
-int64_t TimeAfter(int64_t elapsed);
-
-// Number of milliseconds that would elapse between 'earlier' and 'later'
-// timestamps.  The value is negative if 'later' occurs before 'earlier'.
-int64_t TimeDiff(int64_t later, int64_t earlier);
-int32_t TimeDiff32(uint32_t later, uint32_t earlier);
-
-// The number of milliseconds that have elapsed since 'earlier'.
-inline int64_t TimeSince(int64_t earlier) {
-  return TimeMillis() - earlier;
-}
-
-// The number of milliseconds that will elapse between now and 'later'.
-inline int64_t TimeUntil(int64_t later) {
-  return later - TimeMillis();
-}
-
-class TimestampWrapAroundHandler {
- public:
-  TimestampWrapAroundHandler();
-
-  int64_t Unwrap(uint32_t ts);
-
- private:
-  uint32_t last_ts_;
-  int64_t num_wrap_;
-};
-
-// Convert from tm, which is relative to 1900-01-01 00:00 to number of
-// seconds from 1970-01-01 00:00 ("epoch"). Don't return time_t since that
-// is still 32 bits on many systems.
-int64_t TmToSeconds(const tm& tm);
-
-// Return the number of microseconds since January 1, 1970, UTC.
-// Useful mainly when producing logs to be correlated with other
-// devices, and when the devices in question all have properly
-// synchronized clocks.
-//
-// Note that this function obeys the system's idea about what the time
-// is. It is not guaranteed to be monotonic; it will jump in case the
-// system time is changed, e.g., by some other process calling
-// settimeofday. Always use rtc::TimeMicros(), not this function, for
-// measuring time intervals and timeouts.
-int64_t TimeUTCMicros();
-
-// Return the number of milliseconds since January 1, 1970, UTC.
-// See above.
-int64_t TimeUTCMillis();
-
-// Interval of time from the range [min, max] inclusive.
-class IntervalRange {
- public:
-  IntervalRange() : min_(0), max_(0) {}
-  IntervalRange(int min, int max) : min_(min), max_(max) {
-    RTC_DCHECK_LE(min, max);
-  }
-
-  int min() const { return min_; }
-  int max() const { return max_; }
-
-  std::string ToString() const {
-    rtc::StringBuilder ss;
-    ss << "[" << min_ << "," << max_ << "]";
-    return ss.Release();
-  }
-
-  bool operator==(const IntervalRange& o) const {
-    return min_ == o.min_ && max_ == o.max_;
-  }
-
-  bool operator!=(const IntervalRange& o) const { return !operator==(o); }
-
- private:
-  int min_;
-  int max_;
-};
-
-}  // namespace rtc
-
-#endif  // RTC_BASE_TIMEUTILS_H_
diff --git a/submodules/libtgvoip/webrtc_dsp/rtc_base/trace_event.h b/submodules/libtgvoip/webrtc_dsp/rtc_base/trace_event.h
deleted file mode 100644
index fee9a7f766..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/rtc_base/trace_event.h
+++ /dev/null
@@ -1,886 +0,0 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file under third_party_mods/chromium or at:
-// http://src.chromium.org/svn/trunk/src/LICENSE
-
-#ifndef RTC_BASE_TRACE_EVENT_H_
-#define RTC_BASE_TRACE_EVENT_H_
-
-#include <string>
-
-#include "rtc_base/event_tracer.h"
-
-#if defined(TRACE_EVENT0)
-#error "Another copy of trace_event.h has already been included."
-#endif
-
-// Extracted from Chromium's src/base/debug/trace_event.h.
-
-// This header is designed to give you trace_event macros without specifying
-// how the events actually get collected and stored. If you need to expose trace
-// event to some other universe, you can copy-and-paste this file,
-// implement the TRACE_EVENT_API macros, and do any other necessary fixup for
-// the target platform. The end result is that multiple libraries can funnel
-// events through to a shared trace event collector.
-
-// Trace events are for tracking application performance and resource usage.
-// Macros are provided to track:
-//    Begin and end of function calls
-//    Counters
-//
-// Events are issued against categories. Whereas RTC_LOG's
-// categories are statically defined, TRACE categories are created
-// implicitly with a string. For example:
-//   TRACE_EVENT_INSTANT0("MY_SUBSYSTEM", "SomeImportantEvent")
-//
-// Events can be INSTANT, or can be pairs of BEGIN and END in the same scope:
-//   TRACE_EVENT_BEGIN0("MY_SUBSYSTEM", "SomethingCostly")
-//   doSomethingCostly()
-//   TRACE_EVENT_END0("MY_SUBSYSTEM", "SomethingCostly")
-// Note: our tools can't always determine the correct BEGIN/END pairs unless
-// these are used in the same scope. Use ASYNC_BEGIN/ASYNC_END macros if you
-// need them to be in separate scopes.
-//
-// A common use case is to trace entire function scopes. This
-// issues a trace BEGIN and END automatically:
-//   void doSomethingCostly() {
-//     TRACE_EVENT0("MY_SUBSYSTEM", "doSomethingCostly");
-//     ...
-//   }
-//
-// Additional parameters can be associated with an event:
-//   void doSomethingCostly2(int howMuch) {
-//     TRACE_EVENT1("MY_SUBSYSTEM", "doSomethingCostly",
-//         "howMuch", howMuch);
-//     ...
-//   }
-//
-// The trace system will automatically add to this information the
-// current process id, thread id, and a timestamp in microseconds.
-//
-// To trace an asynchronous procedure such as an IPC send/receive, use
-// ASYNC_BEGIN and ASYNC_END:
-//   [single threaded sender code]
-//     static int send_count = 0;
-//     ++send_count;
-//     TRACE_EVENT_ASYNC_BEGIN0("ipc", "message", send_count);
-//     Send(new MyMessage(send_count));
-//   [receive code]
-//     void OnMyMessage(send_count) {
-//       TRACE_EVENT_ASYNC_END0("ipc", "message", send_count);
-//     }
-// The third parameter is a unique ID to match ASYNC_BEGIN/ASYNC_END pairs.
-// ASYNC_BEGIN and ASYNC_END can occur on any thread of any traced process.
-// Pointers can be used for the ID parameter, and they will be mangled
-// internally so that the same pointer on two different processes will not
-// match. For example:
-//   class MyTracedClass {
-//    public:
-//     MyTracedClass() {
-//       TRACE_EVENT_ASYNC_BEGIN0("category", "MyTracedClass", this);
-//     }
-//     ~MyTracedClass() {
-//       TRACE_EVENT_ASYNC_END0("category", "MyTracedClass", this);
-//     }
-//   }
-//
-// Trace event also supports counters, which is a way to track a quantity
-// as it varies over time. Counters are created with the following macro:
-//   TRACE_COUNTER1("MY_SUBSYSTEM", "myCounter", g_myCounterValue);
-//
-// Counters are process-specific. The macro itself can be issued from any
-// thread, however.
-//
-// Sometimes, you want to track two counters at once. You can do this with two
-// counter macros:
-//   TRACE_COUNTER1("MY_SUBSYSTEM", "myCounter0", g_myCounterValue[0]);
-//   TRACE_COUNTER1("MY_SUBSYSTEM", "myCounter1", g_myCounterValue[1]);
-// Or you can do it with a combined macro:
-//   TRACE_COUNTER2("MY_SUBSYSTEM", "myCounter",
-//       "bytesPinned", g_myCounterValue[0],
-//       "bytesAllocated", g_myCounterValue[1]);
-// This indicates to the tracing UI that these counters should be displayed
-// in a single graph, as a summed area chart.
-//
-// Since counters are in a global namespace, you may want to disembiguate with a
-// unique ID, by using the TRACE_COUNTER_ID* variations.
-//
-// By default, trace collection is compiled in, but turned off at runtime.
-// Collecting trace data is the responsibility of the embedding
-// application. In Chrome's case, navigating to about:tracing will turn on
-// tracing and display data collected across all active processes.
-//
-//
-// Memory scoping note:
-// Tracing copies the pointers, not the string content, of the strings passed
-// in for category, name, and arg_names.  Thus, the following code will
-// cause problems:
-//     char* str = strdup("impprtantName");
-//     TRACE_EVENT_INSTANT0("SUBSYSTEM", str);  // BAD!
-//     free(str);                   // Trace system now has dangling pointer
-//
-// To avoid this issue with the |name| and |arg_name| parameters, use the
-// TRACE_EVENT_COPY_XXX overloads of the macros at additional runtime overhead.
-// Notes: The category must always be in a long-lived char* (i.e. static const).
-//        The |arg_values|, when used, are always deep copied with the _COPY
-//        macros.
-//
-// When are string argument values copied:
-// const char* arg_values are only referenced by default:
-//     TRACE_EVENT1("category", "name",
-//                  "arg1", "literal string is only referenced");
-// Use TRACE_STR_COPY to force copying of a const char*:
-//     TRACE_EVENT1("category", "name",
-//                  "arg1", TRACE_STR_COPY("string will be copied"));
-// std::string arg_values are always copied:
-//     TRACE_EVENT1("category", "name",
-//                  "arg1", std::string("string will be copied"));
-//
-//
-// Thread Safety:
-// Thread safety is provided by methods defined in event_tracer.h. See the file
-// for details.
-
-// By default, const char* argument values are assumed to have long-lived scope
-// and will not be copied. Use this macro to force a const char* to be copied.
-#define TRACE_STR_COPY(str) \
-    webrtc::trace_event_internal::TraceStringWithCopy(str)
-
-// This will mark the trace event as disabled by default. The user will need
-// to explicitly enable the event.
-#define TRACE_DISABLED_BY_DEFAULT(name) "disabled-by-default-" name
-
-// By default, uint64 ID argument values are not mangled with the Process ID in
-// TRACE_EVENT_ASYNC macros. Use this macro to force Process ID mangling.
-#define TRACE_ID_MANGLE(id) \
-    webrtc::trace_event_internal::TraceID::ForceMangle(id)
-
-// Records a pair of begin and end events called "name" for the current
-// scope, with 0, 1 or 2 associated arguments. If the category is not
-// enabled, then this does nothing.
-// - category and name strings must have application lifetime (statics or
-//   literals). They may not include " chars.
-#define TRACE_EVENT0(category, name) \
-    INTERNAL_TRACE_EVENT_ADD_SCOPED(category, name)
-#define TRACE_EVENT1(category, name, arg1_name, arg1_val) \
-    INTERNAL_TRACE_EVENT_ADD_SCOPED(category, name, arg1_name, arg1_val)
-#define TRACE_EVENT2(category, name, arg1_name, arg1_val, arg2_name, arg2_val) \
-    INTERNAL_TRACE_EVENT_ADD_SCOPED(category, name, arg1_name, arg1_val, \
-        arg2_name, arg2_val)
-
-// Records a single event called "name" immediately, with 0, 1 or 2
-// associated arguments. If the category is not enabled, then this
-// does nothing.
-// - category and name strings must have application lifetime (statics or
-//   literals). They may not include " chars.
-#define TRACE_EVENT_INSTANT0(category, name) \
-    INTERNAL_TRACE_EVENT_ADD(TRACE_EVENT_PHASE_INSTANT, \
-        category, name, TRACE_EVENT_FLAG_NONE)
-#define TRACE_EVENT_INSTANT1(category, name, arg1_name, arg1_val) \
-    INTERNAL_TRACE_EVENT_ADD(TRACE_EVENT_PHASE_INSTANT, \
-        category, name, TRACE_EVENT_FLAG_NONE, arg1_name, arg1_val)
-#define TRACE_EVENT_INSTANT2(category, name, arg1_name, arg1_val, \
-        arg2_name, arg2_val) \
-    INTERNAL_TRACE_EVENT_ADD(TRACE_EVENT_PHASE_INSTANT, \
-        category, name, TRACE_EVENT_FLAG_NONE, arg1_name, arg1_val, \
-        arg2_name, arg2_val)
-#define TRACE_EVENT_COPY_INSTANT0(category, name) \
-    INTERNAL_TRACE_EVENT_ADD(TRACE_EVENT_PHASE_INSTANT, \
-        category, name, TRACE_EVENT_FLAG_COPY)
-#define TRACE_EVENT_COPY_INSTANT1(category, name, arg1_name, arg1_val) \
-    INTERNAL_TRACE_EVENT_ADD(TRACE_EVENT_PHASE_INSTANT, \
-        category, name, TRACE_EVENT_FLAG_COPY, arg1_name, arg1_val)
-#define TRACE_EVENT_COPY_INSTANT2(category, name, arg1_name, arg1_val, \
-        arg2_name, arg2_val) \
-    INTERNAL_TRACE_EVENT_ADD(TRACE_EVENT_PHASE_INSTANT, \
-        category, name, TRACE_EVENT_FLAG_COPY, arg1_name, arg1_val, \
-        arg2_name, arg2_val)
-
-// Records a single BEGIN event called "name" immediately, with 0, 1 or 2
-// associated arguments. If the category is not enabled, then this
-// does nothing.
-// - category and name strings must have application lifetime (statics or
-//   literals). They may not include " chars.
-#define TRACE_EVENT_BEGIN0(category, name) \
-    INTERNAL_TRACE_EVENT_ADD(TRACE_EVENT_PHASE_BEGIN, \
-        category, name, TRACE_EVENT_FLAG_NONE)
-#define TRACE_EVENT_BEGIN1(category, name, arg1_name, arg1_val) \
-    INTERNAL_TRACE_EVENT_ADD(TRACE_EVENT_PHASE_BEGIN, \
-        category, name, TRACE_EVENT_FLAG_NONE, arg1_name, arg1_val)
-#define TRACE_EVENT_BEGIN2(category, name, arg1_name, arg1_val, \
-        arg2_name, arg2_val) \
-    INTERNAL_TRACE_EVENT_ADD(TRACE_EVENT_PHASE_BEGIN, \
-        category, name, TRACE_EVENT_FLAG_NONE, arg1_name, arg1_val, \
-        arg2_name, arg2_val)
-#define TRACE_EVENT_COPY_BEGIN0(category, name) \
-    INTERNAL_TRACE_EVENT_ADD(TRACE_EVENT_PHASE_BEGIN, \
-        category, name, TRACE_EVENT_FLAG_COPY)
-#define TRACE_EVENT_COPY_BEGIN1(category, name, arg1_name, arg1_val) \
-    INTERNAL_TRACE_EVENT_ADD(TRACE_EVENT_PHASE_BEGIN, \
-        category, name, TRACE_EVENT_FLAG_COPY, arg1_name, arg1_val)
-#define TRACE_EVENT_COPY_BEGIN2(category, name, arg1_name, arg1_val, \
-        arg2_name, arg2_val) \
-    INTERNAL_TRACE_EVENT_ADD(TRACE_EVENT_PHASE_BEGIN, \
-        category, name, TRACE_EVENT_FLAG_COPY, arg1_name, arg1_val, \
-        arg2_name, arg2_val)
-
-// Records a single END event for "name" immediately. If the category
-// is not enabled, then this does nothing.
-// - category and name strings must have application lifetime (statics or
-//   literals). They may not include " chars.
-#define TRACE_EVENT_END0(category, name) \
-    INTERNAL_TRACE_EVENT_ADD(TRACE_EVENT_PHASE_END, \
-        category, name, TRACE_EVENT_FLAG_NONE)
-#define TRACE_EVENT_END1(category, name, arg1_name, arg1_val) \
-    INTERNAL_TRACE_EVENT_ADD(TRACE_EVENT_PHASE_END, \
-        category, name, TRACE_EVENT_FLAG_NONE, arg1_name, arg1_val)
-#define TRACE_EVENT_END2(category, name, arg1_name, arg1_val, \
-        arg2_name, arg2_val) \
-    INTERNAL_TRACE_EVENT_ADD(TRACE_EVENT_PHASE_END, \
-        category, name, TRACE_EVENT_FLAG_NONE, arg1_name, arg1_val, \
-        arg2_name, arg2_val)
-#define TRACE_EVENT_COPY_END0(category, name) \
-    INTERNAL_TRACE_EVENT_ADD(TRACE_EVENT_PHASE_END, \
-        category, name, TRACE_EVENT_FLAG_COPY)
-#define TRACE_EVENT_COPY_END1(category, name, arg1_name, arg1_val) \
-    INTERNAL_TRACE_EVENT_ADD(TRACE_EVENT_PHASE_END, \
-        category, name, TRACE_EVENT_FLAG_COPY, arg1_name, arg1_val)
-#define TRACE_EVENT_COPY_END2(category, name, arg1_name, arg1_val, \
-        arg2_name, arg2_val) \
-    INTERNAL_TRACE_EVENT_ADD(TRACE_EVENT_PHASE_END, \
-        category, name, TRACE_EVENT_FLAG_COPY, arg1_name, arg1_val, \
-        arg2_name, arg2_val)
-
-// Records the value of a counter called "name" immediately. Value
-// must be representable as a 32 bit integer.
-// - category and name strings must have application lifetime (statics or
-//   literals). They may not include " chars.
-#define TRACE_COUNTER1(category, name, value) \
-    INTERNAL_TRACE_EVENT_ADD(TRACE_EVENT_PHASE_COUNTER, \
-        category, name, TRACE_EVENT_FLAG_NONE, \
-        "value", static_cast<int>(value))
-#define TRACE_COPY_COUNTER1(category, name, value) \
-    INTERNAL_TRACE_EVENT_ADD(TRACE_EVENT_PHASE_COUNTER, \
-        category, name, TRACE_EVENT_FLAG_COPY, \
-        "value", static_cast<int>(value))
-
-// Records the values of a multi-parted counter called "name" immediately.
-// The UI will treat value1 and value2 as parts of a whole, displaying their
-// values as a stacked-bar chart.
-// - category and name strings must have application lifetime (statics or
-//   literals). They may not include " chars.
-#define TRACE_COUNTER2(category, name, value1_name, value1_val, \
-        value2_name, value2_val) \
-    INTERNAL_TRACE_EVENT_ADD(TRACE_EVENT_PHASE_COUNTER, \
-        category, name, TRACE_EVENT_FLAG_NONE, \
-        value1_name, static_cast<int>(value1_val), \
-        value2_name, static_cast<int>(value2_val))
-#define TRACE_COPY_COUNTER2(category, name, value1_name, value1_val, \
-        value2_name, value2_val) \
-    INTERNAL_TRACE_EVENT_ADD(TRACE_EVENT_PHASE_COUNTER, \
-        category, name, TRACE_EVENT_FLAG_COPY, \
-        value1_name, static_cast<int>(value1_val), \
-        value2_name, static_cast<int>(value2_val))
-
-// Records the value of a counter called "name" immediately. Value
-// must be representable as a 32 bit integer.
-// - category and name strings must have application lifetime (statics or
-//   literals). They may not include " chars.
-// - |id| is used to disambiguate counters with the same name. It must either
-//   be a pointer or an integer value up to 64 bits. If it's a pointer, the bits
-//   will be xored with a hash of the process ID so that the same pointer on
-//   two different processes will not collide.
-#define TRACE_COUNTER_ID1(category, name, id, value) \
-    INTERNAL_TRACE_EVENT_ADD_WITH_ID(TRACE_EVENT_PHASE_COUNTER, \
-        category, name, id, TRACE_EVENT_FLAG_NONE, \
-        "value", static_cast<int>(value))
-#define TRACE_COPY_COUNTER_ID1(category, name, id, value) \
-    INTERNAL_TRACE_EVENT_ADD_WITH_ID(TRACE_EVENT_PHASE_COUNTER, \
-        category, name, id, TRACE_EVENT_FLAG_COPY, \
-        "value", static_cast<int>(value))
-
-// Records the values of a multi-parted counter called "name" immediately.
-// The UI will treat value1 and value2 as parts of a whole, displaying their
-// values as a stacked-bar chart.
-// - category and name strings must have application lifetime (statics or
-//   literals). They may not include " chars.
-// - |id| is used to disambiguate counters with the same name. It must either
-//   be a pointer or an integer value up to 64 bits. If it's a pointer, the bits
-//   will be xored with a hash of the process ID so that the same pointer on
-//   two different processes will not collide.
-#define TRACE_COUNTER_ID2(category, name, id, value1_name, value1_val, \
-        value2_name, value2_val) \
-    INTERNAL_TRACE_EVENT_ADD_WITH_ID(TRACE_EVENT_PHASE_COUNTER, \
-        category, name, id, TRACE_EVENT_FLAG_NONE, \
-        value1_name, static_cast<int>(value1_val), \
-        value2_name, static_cast<int>(value2_val))
-#define TRACE_COPY_COUNTER_ID2(category, name, id, value1_name, value1_val, \
-        value2_name, value2_val) \
-    INTERNAL_TRACE_EVENT_ADD_WITH_ID(TRACE_EVENT_PHASE_COUNTER, \
-        category, name, id, TRACE_EVENT_FLAG_COPY, \
-        value1_name, static_cast<int>(value1_val), \
-        value2_name, static_cast<int>(value2_val))
-
-
-// Records a single ASYNC_BEGIN event called "name" immediately, with 0, 1 or 2
-// associated arguments. If the category is not enabled, then this
-// does nothing.
-// - category and name strings must have application lifetime (statics or
-//   literals). They may not include " chars.
-// - |id| is used to match the ASYNC_BEGIN event with the ASYNC_END event. ASYNC
-//   events are considered to match if their category, name and id values all
-//   match. |id| must either be a pointer or an integer value up to 64 bits. If
-//   it's a pointer, the bits will be xored with a hash of the process ID so
-//   that the same pointer on two different processes will not collide.
-// An asynchronous operation can consist of multiple phases. The first phase is
-// defined by the ASYNC_BEGIN calls. Additional phases can be defined using the
-// ASYNC_STEP macros. When the operation completes, call ASYNC_END.
-// An ASYNC trace typically occur on a single thread (if not, they will only be
-// drawn on the thread defined in the ASYNC_BEGIN event), but all events in that
-// operation must use the same |name| and |id|. Each event can have its own
-// args.
-#define TRACE_EVENT_ASYNC_BEGIN0(category, name, id) \
-    INTERNAL_TRACE_EVENT_ADD_WITH_ID(TRACE_EVENT_PHASE_ASYNC_BEGIN, \
-        category, name, id, TRACE_EVENT_FLAG_NONE)
-#define TRACE_EVENT_ASYNC_BEGIN1(category, name, id, arg1_name, arg1_val) \
-    INTERNAL_TRACE_EVENT_ADD_WITH_ID(TRACE_EVENT_PHASE_ASYNC_BEGIN, \
-        category, name, id, TRACE_EVENT_FLAG_NONE, arg1_name, arg1_val)
-#define TRACE_EVENT_ASYNC_BEGIN2(category, name, id, arg1_name, arg1_val, \
-        arg2_name, arg2_val) \
-    INTERNAL_TRACE_EVENT_ADD_WITH_ID(TRACE_EVENT_PHASE_ASYNC_BEGIN, \
-        category, name, id, TRACE_EVENT_FLAG_NONE, \
-        arg1_name, arg1_val, arg2_name, arg2_val)
-#define TRACE_EVENT_COPY_ASYNC_BEGIN0(category, name, id) \
-    INTERNAL_TRACE_EVENT_ADD_WITH_ID(TRACE_EVENT_PHASE_ASYNC_BEGIN, \
-        category, name, id, TRACE_EVENT_FLAG_COPY)
-#define TRACE_EVENT_COPY_ASYNC_BEGIN1(category, name, id, arg1_name, arg1_val) \
-    INTERNAL_TRACE_EVENT_ADD_WITH_ID(TRACE_EVENT_PHASE_ASYNC_BEGIN, \
-        category, name, id, TRACE_EVENT_FLAG_COPY, \
-        arg1_name, arg1_val)
-#define TRACE_EVENT_COPY_ASYNC_BEGIN2(category, name, id, arg1_name, arg1_val, \
-        arg2_name, arg2_val) \
-    INTERNAL_TRACE_EVENT_ADD_WITH_ID(TRACE_EVENT_PHASE_ASYNC_BEGIN, \
-        category, name, id, TRACE_EVENT_FLAG_COPY, \
-        arg1_name, arg1_val, arg2_name, arg2_val)
-
-// Records a single ASYNC_STEP event for |step| immediately. If the category
-// is not enabled, then this does nothing. The |name| and |id| must match the
-// ASYNC_BEGIN event above. The |step| param identifies this step within the
-// async event. This should be called at the beginning of the next phase of an
-// asynchronous operation.
-#define TRACE_EVENT_ASYNC_STEP0(category, name, id, step) \
-    INTERNAL_TRACE_EVENT_ADD_WITH_ID(TRACE_EVENT_PHASE_ASYNC_STEP, \
-        category, name, id, TRACE_EVENT_FLAG_NONE, "step", step)
-#define TRACE_EVENT_ASYNC_STEP1(category, name, id, step, \
-                                      arg1_name, arg1_val) \
-    INTERNAL_TRACE_EVENT_ADD_WITH_ID(TRACE_EVENT_PHASE_ASYNC_STEP, \
-        category, name, id, TRACE_EVENT_FLAG_NONE, "step", step, \
-        arg1_name, arg1_val)
-#define TRACE_EVENT_COPY_ASYNC_STEP0(category, name, id, step) \
-    INTERNAL_TRACE_EVENT_ADD_WITH_ID(TRACE_EVENT_PHASE_ASYNC_STEP, \
-        category, name, id, TRACE_EVENT_FLAG_COPY, "step", step)
-#define TRACE_EVENT_COPY_ASYNC_STEP1(category, name, id, step, \
-        arg1_name, arg1_val) \
-    INTERNAL_TRACE_EVENT_ADD_WITH_ID(TRACE_EVENT_PHASE_ASYNC_STEP, \
-        category, name, id, TRACE_EVENT_FLAG_COPY, "step", step, \
-        arg1_name, arg1_val)
-
-// Records a single ASYNC_END event for "name" immediately. If the category
-// is not enabled, then this does nothing.
-#define TRACE_EVENT_ASYNC_END0(category, name, id) \
-    INTERNAL_TRACE_EVENT_ADD_WITH_ID(TRACE_EVENT_PHASE_ASYNC_END, \
-        category, name, id, TRACE_EVENT_FLAG_NONE)
-#define TRACE_EVENT_ASYNC_END1(category, name, id, arg1_name, arg1_val) \
-    INTERNAL_TRACE_EVENT_ADD_WITH_ID(TRACE_EVENT_PHASE_ASYNC_END, \
-        category, name, id, TRACE_EVENT_FLAG_NONE, arg1_name, arg1_val)
-#define TRACE_EVENT_ASYNC_END2(category, name, id, arg1_name, arg1_val, \
-        arg2_name, arg2_val) \
-    INTERNAL_TRACE_EVENT_ADD_WITH_ID(TRACE_EVENT_PHASE_ASYNC_END, \
-        category, name, id, TRACE_EVENT_FLAG_NONE, \
-        arg1_name, arg1_val, arg2_name, arg2_val)
-#define TRACE_EVENT_COPY_ASYNC_END0(category, name, id) \
-    INTERNAL_TRACE_EVENT_ADD_WITH_ID(TRACE_EVENT_PHASE_ASYNC_END, \
-        category, name, id, TRACE_EVENT_FLAG_COPY)
-#define TRACE_EVENT_COPY_ASYNC_END1(category, name, id, arg1_name, arg1_val) \
-    INTERNAL_TRACE_EVENT_ADD_WITH_ID(TRACE_EVENT_PHASE_ASYNC_END, \
-        category, name, id, TRACE_EVENT_FLAG_COPY, \
-        arg1_name, arg1_val)
-#define TRACE_EVENT_COPY_ASYNC_END2(category, name, id, arg1_name, arg1_val, \
-        arg2_name, arg2_val) \
-    INTERNAL_TRACE_EVENT_ADD_WITH_ID(TRACE_EVENT_PHASE_ASYNC_END, \
-        category, name, id, TRACE_EVENT_FLAG_COPY, \
-        arg1_name, arg1_val, arg2_name, arg2_val)
-
-
-// Records a single FLOW_BEGIN event called "name" immediately, with 0, 1 or 2
-// associated arguments. If the category is not enabled, then this
-// does nothing.
-// - category and name strings must have application lifetime (statics or
-//   literals). They may not include " chars.
-// - |id| is used to match the FLOW_BEGIN event with the FLOW_END event. FLOW
-//   events are considered to match if their category, name and id values all
-//   match. |id| must either be a pointer or an integer value up to 64 bits. If
-//   it's a pointer, the bits will be xored with a hash of the process ID so
-//   that the same pointer on two different processes will not collide.
-// FLOW events are different from ASYNC events in how they are drawn by the
-// tracing UI. A FLOW defines asynchronous data flow, such as posting a task
-// (FLOW_BEGIN) and later executing that task (FLOW_END). Expect FLOWs to be
-// drawn as lines or arrows from FLOW_BEGIN scopes to FLOW_END scopes. Similar
-// to ASYNC, a FLOW can consist of multiple phases. The first phase is defined
-// by the FLOW_BEGIN calls. Additional phases can be defined using the FLOW_STEP
-// macros. When the operation completes, call FLOW_END. An async operation can
-// span threads and processes, but all events in that operation must use the
-// same |name| and |id|. Each event can have its own args.
-#define TRACE_EVENT_FLOW_BEGIN0(category, name, id) \
-    INTERNAL_TRACE_EVENT_ADD_WITH_ID(TRACE_EVENT_PHASE_FLOW_BEGIN, \
-        category, name, id, TRACE_EVENT_FLAG_NONE)
-#define TRACE_EVENT_FLOW_BEGIN1(category, name, id, arg1_name, arg1_val) \
-    INTERNAL_TRACE_EVENT_ADD_WITH_ID(TRACE_EVENT_PHASE_FLOW_BEGIN, \
-        category, name, id, TRACE_EVENT_FLAG_NONE, arg1_name, arg1_val)
-#define TRACE_EVENT_FLOW_BEGIN2(category, name, id, arg1_name, arg1_val, \
-        arg2_name, arg2_val) \
-    INTERNAL_TRACE_EVENT_ADD_WITH_ID(TRACE_EVENT_PHASE_FLOW_BEGIN, \
-        category, name, id, TRACE_EVENT_FLAG_NONE, \
-        arg1_name, arg1_val, arg2_name, arg2_val)
-#define TRACE_EVENT_COPY_FLOW_BEGIN0(category, name, id) \
-    INTERNAL_TRACE_EVENT_ADD_WITH_ID(TRACE_EVENT_PHASE_FLOW_BEGIN, \
-        category, name, id, TRACE_EVENT_FLAG_COPY)
-#define TRACE_EVENT_COPY_FLOW_BEGIN1(category, name, id, arg1_name, arg1_val) \
-    INTERNAL_TRACE_EVENT_ADD_WITH_ID(TRACE_EVENT_PHASE_FLOW_BEGIN, \
-        category, name, id, TRACE_EVENT_FLAG_COPY, \
-        arg1_name, arg1_val)
-#define TRACE_EVENT_COPY_FLOW_BEGIN2(category, name, id, arg1_name, arg1_val, \
-        arg2_name, arg2_val) \
-    INTERNAL_TRACE_EVENT_ADD_WITH_ID(TRACE_EVENT_PHASE_FLOW_BEGIN, \
-        category, name, id, TRACE_EVENT_FLAG_COPY, \
-        arg1_name, arg1_val, arg2_name, arg2_val)
-
-// Records a single FLOW_STEP event for |step| immediately. If the category
-// is not enabled, then this does nothing. The |name| and |id| must match the
-// FLOW_BEGIN event above. The |step| param identifies this step within the
-// async event. This should be called at the beginning of the next phase of an
-// asynchronous operation.
-#define TRACE_EVENT_FLOW_STEP0(category, name, id, step) \
-    INTERNAL_TRACE_EVENT_ADD_WITH_ID(TRACE_EVENT_PHASE_FLOW_STEP, \
-        category, name, id, TRACE_EVENT_FLAG_NONE, "step", step)
-#define TRACE_EVENT_FLOW_STEP1(category, name, id, step, \
-        arg1_name, arg1_val) \
-    INTERNAL_TRACE_EVENT_ADD_WITH_ID(TRACE_EVENT_PHASE_FLOW_STEP, \
-        category, name, id, TRACE_EVENT_FLAG_NONE, "step", step, \
-        arg1_name, arg1_val)
-#define TRACE_EVENT_COPY_FLOW_STEP0(category, name, id, step) \
-    INTERNAL_TRACE_EVENT_ADD_WITH_ID(TRACE_EVENT_PHASE_FLOW_STEP, \
-        category, name, id, TRACE_EVENT_FLAG_COPY, "step", step)
-#define TRACE_EVENT_COPY_FLOW_STEP1(category, name, id, step, \
-        arg1_name, arg1_val) \
-    INTERNAL_TRACE_EVENT_ADD_WITH_ID(TRACE_EVENT_PHASE_FLOW_STEP, \
-        category, name, id, TRACE_EVENT_FLAG_COPY, "step", step, \
-        arg1_name, arg1_val)
-
-// Records a single FLOW_END event for "name" immediately. If the category
-// is not enabled, then this does nothing.
-#define TRACE_EVENT_FLOW_END0(category, name, id) \
-    INTERNAL_TRACE_EVENT_ADD_WITH_ID(TRACE_EVENT_PHASE_FLOW_END, \
-        category, name, id, TRACE_EVENT_FLAG_NONE)
-#define TRACE_EVENT_FLOW_END1(category, name, id, arg1_name, arg1_val) \
-    INTERNAL_TRACE_EVENT_ADD_WITH_ID(TRACE_EVENT_PHASE_FLOW_END, \
-        category, name, id, TRACE_EVENT_FLAG_NONE, arg1_name, arg1_val)
-#define TRACE_EVENT_FLOW_END2(category, name, id, arg1_name, arg1_val, \
-        arg2_name, arg2_val) \
-    INTERNAL_TRACE_EVENT_ADD_WITH_ID(TRACE_EVENT_PHASE_FLOW_END, \
-        category, name, id, TRACE_EVENT_FLAG_NONE, \
-        arg1_name, arg1_val, arg2_name, arg2_val)
-#define TRACE_EVENT_COPY_FLOW_END0(category, name, id) \
-    INTERNAL_TRACE_EVENT_ADD_WITH_ID(TRACE_EVENT_PHASE_FLOW_END, \
-        category, name, id, TRACE_EVENT_FLAG_COPY)
-#define TRACE_EVENT_COPY_FLOW_END1(category, name, id, arg1_name, arg1_val) \
-    INTERNAL_TRACE_EVENT_ADD_WITH_ID(TRACE_EVENT_PHASE_FLOW_END, \
-        category, name, id, TRACE_EVENT_FLAG_COPY, \
-        arg1_name, arg1_val)
-#define TRACE_EVENT_COPY_FLOW_END2(category, name, id, arg1_name, arg1_val, \
-        arg2_name, arg2_val) \
-    INTERNAL_TRACE_EVENT_ADD_WITH_ID(TRACE_EVENT_PHASE_FLOW_END, \
-        category, name, id, TRACE_EVENT_FLAG_COPY, \
-        arg1_name, arg1_val, arg2_name, arg2_val)
-
-
-////////////////////////////////////////////////////////////////////////////////
-// Implementation specific tracing API definitions.
-
-// Get a pointer to the enabled state of the given trace category. Only
-// long-lived literal strings should be given as the category name. The returned
-// pointer can be held permanently in a local static for example. If the
-// unsigned char is non-zero, tracing is enabled. If tracing is enabled,
-// TRACE_EVENT_API_ADD_TRACE_EVENT can be called. It's OK if tracing is disabled
-// between the load of the tracing state and the call to
-// TRACE_EVENT_API_ADD_TRACE_EVENT, because this flag only provides an early out
-// for best performance when tracing is disabled.
-// const unsigned char*
-//     TRACE_EVENT_API_GET_CATEGORY_ENABLED(const char* category_name)
-#define TRACE_EVENT_API_GET_CATEGORY_ENABLED \
-    webrtc::EventTracer::GetCategoryEnabled
-
-// Add a trace event to the platform tracing system.
-// void TRACE_EVENT_API_ADD_TRACE_EVENT(
-//                    char phase,
-//                    const unsigned char* category_enabled,
-//                    const char* name,
-//                    unsigned long long id,
-//                    int num_args,
-//                    const char** arg_names,
-//                    const unsigned char* arg_types,
-//                    const unsigned long long* arg_values,
-//                    unsigned char flags)
-#define TRACE_EVENT_API_ADD_TRACE_EVENT webrtc::EventTracer::AddTraceEvent
-
-////////////////////////////////////////////////////////////////////////////////
-
-// Implementation detail: trace event macros create temporary variables
-// to keep instrumentation overhead low. These macros give each temporary
-// variable a unique name based on the line number to prevent name collissions.
-#define INTERNAL_TRACE_EVENT_UID3(a,b) \
-    trace_event_unique_##a##b
-#define INTERNAL_TRACE_EVENT_UID2(a,b) \
-    INTERNAL_TRACE_EVENT_UID3(a,b)
-#define INTERNAL_TRACE_EVENT_UID(name_prefix) \
-    INTERNAL_TRACE_EVENT_UID2(name_prefix, __LINE__)
-
-#if WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS
-#define INTERNAL_TRACE_EVENT_INFO_TYPE const unsigned char*
-#else
-#define INTERNAL_TRACE_EVENT_INFO_TYPE static const unsigned char*
-#endif  // WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS
-
-// Implementation detail: internal macro to create static category.
-#define INTERNAL_TRACE_EVENT_GET_CATEGORY_INFO(category) \
-    INTERNAL_TRACE_EVENT_INFO_TYPE INTERNAL_TRACE_EVENT_UID(catstatic) = \
-        TRACE_EVENT_API_GET_CATEGORY_ENABLED(category);
-
-// Implementation detail: internal macro to create static category and add
-// event if the category is enabled.
-#define INTERNAL_TRACE_EVENT_ADD(phase, category, name, flags, ...) \
-    do { \
-      INTERNAL_TRACE_EVENT_GET_CATEGORY_INFO(category); \
-      if (*INTERNAL_TRACE_EVENT_UID(catstatic)) { \
-        webrtc::trace_event_internal::AddTraceEvent(          \
-            phase, INTERNAL_TRACE_EVENT_UID(catstatic), name, \
-            webrtc::trace_event_internal::kNoEventId, flags, ##__VA_ARGS__); \
-      } \
-    } while (0)
-
-// Implementation detail: internal macro to create static category and add begin
-// event if the category is enabled. Also adds the end event when the scope
-// ends.
-#define INTERNAL_TRACE_EVENT_ADD_SCOPED(category, name, ...) \
-    INTERNAL_TRACE_EVENT_GET_CATEGORY_INFO(category); \
-    webrtc::trace_event_internal::TraceEndOnScopeClose  \
-        INTERNAL_TRACE_EVENT_UID(profileScope); \
-    if (*INTERNAL_TRACE_EVENT_UID(catstatic)) { \
-      webrtc::trace_event_internal::AddTraceEvent(      \
-          TRACE_EVENT_PHASE_BEGIN, \
-          INTERNAL_TRACE_EVENT_UID(catstatic), \
-          name, webrtc::trace_event_internal::kNoEventId,       \
-          TRACE_EVENT_FLAG_NONE, ##__VA_ARGS__); \
-      INTERNAL_TRACE_EVENT_UID(profileScope).Initialize( \
-          INTERNAL_TRACE_EVENT_UID(catstatic), name); \
-    }
-
-// Implementation detail: internal macro to create static category and add
-// event if the category is enabled.
-#define INTERNAL_TRACE_EVENT_ADD_WITH_ID(phase, category, name, id, flags, \
-                                         ...) \
-    do { \
-      INTERNAL_TRACE_EVENT_GET_CATEGORY_INFO(category); \
-      if (*INTERNAL_TRACE_EVENT_UID(catstatic)) { \
-        unsigned char trace_event_flags = flags | TRACE_EVENT_FLAG_HAS_ID; \
-        webrtc::trace_event_internal::TraceID trace_event_trace_id( \
-            id, &trace_event_flags); \
-        webrtc::trace_event_internal::AddTraceEvent( \
-            phase, INTERNAL_TRACE_EVENT_UID(catstatic), \
-            name, trace_event_trace_id.data(), trace_event_flags, \
-            ##__VA_ARGS__); \
-      } \
-    } while (0)
-
-// Notes regarding the following definitions:
-// New values can be added and propagated to third party libraries, but existing
-// definitions must never be changed, because third party libraries may use old
-// definitions.
-
-// Phase indicates the nature of an event entry. E.g. part of a begin/end pair.
-#define TRACE_EVENT_PHASE_BEGIN    ('B')
-#define TRACE_EVENT_PHASE_END      ('E')
-#define TRACE_EVENT_PHASE_INSTANT  ('I')
-#define TRACE_EVENT_PHASE_ASYNC_BEGIN ('S')
-#define TRACE_EVENT_PHASE_ASYNC_STEP  ('T')
-#define TRACE_EVENT_PHASE_ASYNC_END   ('F')
-#define TRACE_EVENT_PHASE_FLOW_BEGIN ('s')
-#define TRACE_EVENT_PHASE_FLOW_STEP  ('t')
-#define TRACE_EVENT_PHASE_FLOW_END   ('f')
-#define TRACE_EVENT_PHASE_METADATA ('M')
-#define TRACE_EVENT_PHASE_COUNTER  ('C')
-
-// Flags for changing the behavior of TRACE_EVENT_API_ADD_TRACE_EVENT.
-#define TRACE_EVENT_FLAG_NONE        (static_cast<unsigned char>(0))
-#define TRACE_EVENT_FLAG_COPY        (static_cast<unsigned char>(1 << 0))
-#define TRACE_EVENT_FLAG_HAS_ID      (static_cast<unsigned char>(1 << 1))
-#define TRACE_EVENT_FLAG_MANGLE_ID   (static_cast<unsigned char>(1 << 2))
-
-// Type values for identifying types in the TraceValue union.
-#define TRACE_VALUE_TYPE_BOOL         (static_cast<unsigned char>(1))
-#define TRACE_VALUE_TYPE_UINT         (static_cast<unsigned char>(2))
-#define TRACE_VALUE_TYPE_INT          (static_cast<unsigned char>(3))
-#define TRACE_VALUE_TYPE_DOUBLE       (static_cast<unsigned char>(4))
-#define TRACE_VALUE_TYPE_POINTER      (static_cast<unsigned char>(5))
-#define TRACE_VALUE_TYPE_STRING       (static_cast<unsigned char>(6))
-#define TRACE_VALUE_TYPE_COPY_STRING  (static_cast<unsigned char>(7))
-
-namespace webrtc {
-namespace trace_event_internal {
-
-// Specify these values when the corresponding argument of AddTraceEvent is not
-// used.
-const int kZeroNumArgs = 0;
-const unsigned long long kNoEventId = 0;
-
-// TraceID encapsulates an ID that can either be an integer or pointer. Pointers
-// are mangled with the Process ID so that they are unlikely to collide when the
-// same pointer is used on different processes.
-class TraceID {
- public:
-  class ForceMangle {
-    public:
-     explicit ForceMangle(unsigned long long id) : data_(id) {}
-     explicit ForceMangle(unsigned long id) : data_(id) {}
-     explicit ForceMangle(unsigned int id) : data_(id) {}
-     explicit ForceMangle(unsigned short id) : data_(id) {}
-     explicit ForceMangle(unsigned char id) : data_(id) {}
-     explicit ForceMangle(long long id)
-         : data_(static_cast<unsigned long long>(id)) {}
-     explicit ForceMangle(long id)
-         : data_(static_cast<unsigned long long>(id)) {}
-     explicit ForceMangle(int id)
-         : data_(static_cast<unsigned long long>(id)) {}
-     explicit ForceMangle(short id)
-         : data_(static_cast<unsigned long long>(id)) {}
-     explicit ForceMangle(signed char id)
-         : data_(static_cast<unsigned long long>(id)) {}
-
-     unsigned long long data() const { return data_; }
-
-    private:
-     unsigned long long data_;
-  };
-
-  explicit TraceID(const void* id, unsigned char* flags)
-      : data_(static_cast<unsigned long long>(
-              reinterpret_cast<uintptr_t>(id))) {
-    *flags |= TRACE_EVENT_FLAG_MANGLE_ID;
-  }
-  explicit TraceID(ForceMangle id, unsigned char* flags) : data_(id.data()) {
-    *flags |= TRACE_EVENT_FLAG_MANGLE_ID;
-  }
-  explicit TraceID(unsigned long long id, unsigned char* flags)
-      : data_(id) { (void)flags; }
-  explicit TraceID(unsigned long id, unsigned char* flags)
-      : data_(id) { (void)flags; }
-  explicit TraceID(unsigned int id, unsigned char* flags)
-      : data_(id) { (void)flags; }
-  explicit TraceID(unsigned short id, unsigned char* flags)
-      : data_(id) { (void)flags; }
-  explicit TraceID(unsigned char id, unsigned char* flags)
-      : data_(id) { (void)flags; }
-  explicit TraceID(long long id, unsigned char* flags)
-      : data_(static_cast<unsigned long long>(id)) { (void)flags; }
-  explicit TraceID(long id, unsigned char* flags)
-      : data_(static_cast<unsigned long long>(id)) { (void)flags; }
-  explicit TraceID(int id, unsigned char* flags)
-      : data_(static_cast<unsigned long long>(id)) { (void)flags; }
-  explicit TraceID(short id, unsigned char* flags)
-      : data_(static_cast<unsigned long long>(id)) { (void)flags; }
-  explicit TraceID(signed char id, unsigned char* flags)
-      : data_(static_cast<unsigned long long>(id)) { (void)flags; }
-
-  unsigned long long data() const { return data_; }
-
- private:
-  unsigned long long data_;
-};
-
-// Simple union to store various types as unsigned long long.
-union TraceValueUnion {
-  bool as_bool;
-  unsigned long long as_uint;
-  long long as_int;
-  double as_double;
-  const void* as_pointer;
-  const char* as_string;
-};
-
-// Simple container for const char* that should be copied instead of retained.
-class TraceStringWithCopy {
- public:
-  explicit TraceStringWithCopy(const char* str) : str_(str) {}
-  operator const char* () const { return str_; }
- private:
-  const char* str_;
-};
-
-// Define SetTraceValue for each allowed type. It stores the type and
-// value in the return arguments. This allows this API to avoid declaring any
-// structures so that it is portable to third_party libraries.
-#define INTERNAL_DECLARE_SET_TRACE_VALUE(actual_type, \
-                                         union_member, \
-                                         value_type_id) \
-    static inline void SetTraceValue(actual_type arg, \
-                                     unsigned char* type, \
-                                     unsigned long long* value) { \
-      TraceValueUnion type_value; \
-      type_value.union_member = arg; \
-      *type = value_type_id; \
-      *value = type_value.as_uint; \
-    }
-// Simpler form for int types that can be safely casted.
-#define INTERNAL_DECLARE_SET_TRACE_VALUE_INT(actual_type, \
-                                             value_type_id) \
-    static inline void SetTraceValue(actual_type arg, \
-                                     unsigned char* type, \
-                                     unsigned long long* value) { \
-      *type = value_type_id; \
-      *value = static_cast<unsigned long long>(arg); \
-    }
-
-INTERNAL_DECLARE_SET_TRACE_VALUE_INT(unsigned long long, TRACE_VALUE_TYPE_UINT)
-INTERNAL_DECLARE_SET_TRACE_VALUE_INT(unsigned long, TRACE_VALUE_TYPE_UINT)
-INTERNAL_DECLARE_SET_TRACE_VALUE_INT(unsigned int, TRACE_VALUE_TYPE_UINT)
-INTERNAL_DECLARE_SET_TRACE_VALUE_INT(unsigned short, TRACE_VALUE_TYPE_UINT)
-INTERNAL_DECLARE_SET_TRACE_VALUE_INT(unsigned char, TRACE_VALUE_TYPE_UINT)
-INTERNAL_DECLARE_SET_TRACE_VALUE_INT(long long, TRACE_VALUE_TYPE_INT)
-INTERNAL_DECLARE_SET_TRACE_VALUE_INT(long, TRACE_VALUE_TYPE_INT)
-INTERNAL_DECLARE_SET_TRACE_VALUE_INT(int, TRACE_VALUE_TYPE_INT)
-INTERNAL_DECLARE_SET_TRACE_VALUE_INT(short, TRACE_VALUE_TYPE_INT)
-INTERNAL_DECLARE_SET_TRACE_VALUE_INT(signed char, TRACE_VALUE_TYPE_INT)
-INTERNAL_DECLARE_SET_TRACE_VALUE(bool, as_bool, TRACE_VALUE_TYPE_BOOL)
-INTERNAL_DECLARE_SET_TRACE_VALUE(double, as_double, TRACE_VALUE_TYPE_DOUBLE)
-INTERNAL_DECLARE_SET_TRACE_VALUE(const void*, as_pointer,
-                                 TRACE_VALUE_TYPE_POINTER)
-INTERNAL_DECLARE_SET_TRACE_VALUE(const char*, as_string,
-                                 TRACE_VALUE_TYPE_STRING)
-INTERNAL_DECLARE_SET_TRACE_VALUE(const TraceStringWithCopy&, as_string,
-                                 TRACE_VALUE_TYPE_COPY_STRING)
-
-#undef INTERNAL_DECLARE_SET_TRACE_VALUE
-#undef INTERNAL_DECLARE_SET_TRACE_VALUE_INT
-
-// std::string version of SetTraceValue so that trace arguments can be strings.
-static inline void SetTraceValue(const std::string& arg,
-                                 unsigned char* type,
-                                 unsigned long long* value) {
-  TraceValueUnion type_value;
-  type_value.as_string = arg.c_str();
-  *type = TRACE_VALUE_TYPE_COPY_STRING;
-  *value = type_value.as_uint;
-}
-
-// These AddTraceEvent template functions are defined here instead of in the
-// macro, because the arg_values could be temporary objects, such as
-// std::string. In order to store pointers to the internal c_str and pass
-// through to the tracing API, the arg_values must live throughout
-// these procedures.
-
-static inline void AddTraceEvent(char phase,
-                                const unsigned char* category_enabled,
-                                const char* name,
-                                unsigned long long id,
-                                unsigned char flags) {
-  TRACE_EVENT_API_ADD_TRACE_EVENT(phase, category_enabled, name, id,
-                                  kZeroNumArgs, nullptr, nullptr, nullptr,
-                                  flags);
-}
-
-template<class ARG1_TYPE>
-static inline void AddTraceEvent(char phase,
-                                const unsigned char* category_enabled,
-                                const char* name,
-                                unsigned long long id,
-                                unsigned char flags,
-                                const char* arg1_name,
-                                const ARG1_TYPE& arg1_val) {
-  const int num_args = 1;
-  unsigned char arg_types[1];
-  unsigned long long arg_values[1];
-  SetTraceValue(arg1_val, &arg_types[0], &arg_values[0]);
-  TRACE_EVENT_API_ADD_TRACE_EVENT(
-      phase, category_enabled, name, id,
-      num_args, &arg1_name, arg_types, arg_values,
-      flags);
-}
-
-template<class ARG1_TYPE, class ARG2_TYPE>
-static inline void AddTraceEvent(char phase,
-                                const unsigned char* category_enabled,
-                                const char* name,
-                                unsigned long long id,
-                                unsigned char flags,
-                                const char* arg1_name,
-                                const ARG1_TYPE& arg1_val,
-                                const char* arg2_name,
-                                const ARG2_TYPE& arg2_val) {
-  const int num_args = 2;
-  const char* arg_names[2] = { arg1_name, arg2_name };
-  unsigned char arg_types[2];
-  unsigned long long arg_values[2];
-  SetTraceValue(arg1_val, &arg_types[0], &arg_values[0]);
-  SetTraceValue(arg2_val, &arg_types[1], &arg_values[1]);
-  TRACE_EVENT_API_ADD_TRACE_EVENT(
-      phase, category_enabled, name, id,
-      num_args, arg_names, arg_types, arg_values,
-      flags);
-}
-
-// Used by TRACE_EVENTx macro. Do not use directly.
-class TraceEndOnScopeClose {
- public:
-  // Note: members of data_ intentionally left uninitialized. See Initialize.
-  TraceEndOnScopeClose() : p_data_(nullptr) {}
-  ~TraceEndOnScopeClose() {
-    if (p_data_)
-      AddEventIfEnabled();
-  }
-
-  void Initialize(const unsigned char* category_enabled,
-                  const char* name) {
-    data_.category_enabled = category_enabled;
-    data_.name = name;
-    p_data_ = &data_;
-  }
-
- private:
-  // Add the end event if the category is still enabled.
-  void AddEventIfEnabled() {
-    // Only called when p_data_ is non-null.
-    if (*p_data_->category_enabled) {
-      TRACE_EVENT_API_ADD_TRACE_EVENT(TRACE_EVENT_PHASE_END,
-                                      p_data_->category_enabled, p_data_->name,
-                                      kNoEventId, kZeroNumArgs, nullptr,
-                                      nullptr, nullptr, TRACE_EVENT_FLAG_NONE);
-    }
-  }
-
-  // This Data struct workaround is to avoid initializing all the members
-  // in Data during construction of this object, since this object is always
-  // constructed, even when tracing is disabled. If the members of Data were
-  // members of this class instead, compiler warnings occur about potential
-  // uninitialized accesses.
-  struct Data {
-    const unsigned char* category_enabled;
-    const char* name;
-  };
-  Data* p_data_;
-  Data data_;
-};
-
-}  // namespace trace_event_internal
-}  // namespace webrtc
-
-#endif  // RTC_BASE_TRACE_EVENT_H_
diff --git a/submodules/libtgvoip/webrtc_dsp/rtc_base/type_traits.h b/submodules/libtgvoip/webrtc_dsp/rtc_base/type_traits.h
deleted file mode 100644
index 0cb899c47f..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/rtc_base/type_traits.h
+++ /dev/null
@@ -1,140 +0,0 @@
-/*
- *  Copyright 2016 The WebRTC Project Authors. All rights reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#ifndef RTC_BASE_TYPE_TRAITS_H_
-#define RTC_BASE_TYPE_TRAITS_H_
-
-#include <cstddef>
-#include <type_traits>
-
-namespace rtc {
-
-// Determines if the given class has zero-argument .data() and .size() methods
-// whose return values are convertible to T* and size_t, respectively.
-template <typename DS, typename T>
-class HasDataAndSize {
- private:
-  template <
-      typename C,
-      typename std::enable_if<
-          std::is_convertible<decltype(std::declval<C>().data()), T*>::value &&
-          std::is_convertible<decltype(std::declval<C>().size()),
-                              std::size_t>::value>::type* = nullptr>
-  static int Test(int);
-
-  template <typename>
-  static char Test(...);
-
- public:
-  static constexpr bool value = std::is_same<decltype(Test<DS>(0)), int>::value;
-};
-
-namespace test_has_data_and_size {
-
-template <typename DR, typename SR>
-struct Test1 {
-  DR data();
-  SR size();
-};
-static_assert(HasDataAndSize<Test1<int*, int>, int>::value, "");
-static_assert(HasDataAndSize<Test1<int*, int>, const int>::value, "");
-static_assert(HasDataAndSize<Test1<const int*, int>, const int>::value, "");
-static_assert(!HasDataAndSize<Test1<const int*, int>, int>::value,
-              "implicit cast of const int* to int*");
-static_assert(!HasDataAndSize<Test1<char*, size_t>, int>::value,
-              "implicit cast of char* to int*");
-
-struct Test2 {
-  int* data;
-  size_t size;
-};
-static_assert(!HasDataAndSize<Test2, int>::value,
-              ".data and .size aren't functions");
-
-struct Test3 {
-  int* data();
-};
-static_assert(!HasDataAndSize<Test3, int>::value, ".size() is missing");
-
-class Test4 {
-  int* data();
-  size_t size();
-};
-static_assert(!HasDataAndSize<Test4, int>::value,
-              ".data() and .size() are private");
-
-}  // namespace test_has_data_and_size
-
-namespace type_traits_impl {
-
-// Determines if the given type is an enum that converts implicitly to
-// an integral type.
-template <typename T>
-struct IsIntEnum {
- private:
-  // This overload is used if the type is an enum, and unary plus
-  // compiles and turns it into an integral type.
-  template <typename X,
-            typename std::enable_if<
-                std::is_enum<X>::value &&
-                std::is_integral<decltype(+std::declval<X>())>::value>::type* =
-                nullptr>
-  static int Test(int);
-
-  // Otherwise, this overload is used.
-  template <typename>
-  static char Test(...);
-
- public:
-  static constexpr bool value =
-      std::is_same<decltype(Test<typename std::remove_reference<T>::type>(0)),
-                   int>::value;
-};
-
-}  // namespace type_traits_impl
-
-// Determines if the given type is integral, or an enum that
-// converts implicitly to an integral type.
-template <typename T>
-struct IsIntlike {
- private:
-  using X = typename std::remove_reference<T>::type;
-
- public:
-  static constexpr bool value =
-      std::is_integral<X>::value || type_traits_impl::IsIntEnum<X>::value;
-};
-
-namespace test_enum_intlike {
-
-enum E1 { e1 };
-enum { e2 };
-enum class E3 { e3 };
-struct S {};
-
-static_assert(type_traits_impl::IsIntEnum<E1>::value, "");
-static_assert(type_traits_impl::IsIntEnum<decltype(e2)>::value, "");
-static_assert(!type_traits_impl::IsIntEnum<E3>::value, "");
-static_assert(!type_traits_impl::IsIntEnum<int>::value, "");
-static_assert(!type_traits_impl::IsIntEnum<float>::value, "");
-static_assert(!type_traits_impl::IsIntEnum<S>::value, "");
-
-static_assert(IsIntlike<E1>::value, "");
-static_assert(IsIntlike<decltype(e2)>::value, "");
-static_assert(!IsIntlike<E3>::value, "");
-static_assert(IsIntlike<int>::value, "");
-static_assert(!IsIntlike<float>::value, "");
-static_assert(!IsIntlike<S>::value, "");
-
-}  // namespace test_enum_intlike
-
-}  // namespace rtc
-
-#endif  // RTC_BASE_TYPE_TRAITS_H_
diff --git a/submodules/libtgvoip/webrtc_dsp/system_wrappers/include/asm_defines.h b/submodules/libtgvoip/webrtc_dsp/system_wrappers/include/asm_defines.h
deleted file mode 100644
index fe4c05effc..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/system_wrappers/include/asm_defines.h
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- *  Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#ifndef WEBRTC_SYSTEM_WRAPPERS_INCLUDE_ASM_DEFINES_H_
-#define WEBRTC_SYSTEM_WRAPPERS_INCLUDE_ASM_DEFINES_H_
-
-#if defined(__linux__) && defined(__ELF__)
-.section .note.GNU-stack,"",%progbits
-#endif
-
-// Define the macros used in ARM assembly code, so that for Mac or iOS builds
-// we add leading underscores for the function names.
-#ifdef __APPLE__
-.macro GLOBAL_FUNCTION name
-.global _\name
-.private_extern _\name
-.endm
-.macro DEFINE_FUNCTION name
-_\name:
-.endm
-.macro CALL_FUNCTION name
-bl _\name
-.endm
-.macro GLOBAL_LABEL name
-.global _\name
-.private_extern _\name
-.endm
-#else
-.macro GLOBAL_FUNCTION name
-.global \name
-.hidden \name
-.endm
-.macro DEFINE_FUNCTION name
-#if defined(__linux__) && defined(__ELF__)
-.type \name,%function
-#endif
-\name:
-.endm
-.macro CALL_FUNCTION name
-bl \name
-.endm
-.macro GLOBAL_LABEL name
-.global \name
-.hidden \name
-.endm
-#endif
-
-// With Apple's clang compiler, for instructions ldrb, strh, etc.,
-// the condition code is after the width specifier. Here we define
-// only the ones that are actually used in the assembly files.
-#if (defined __llvm__) && (defined __APPLE__)
-.macro streqh reg1, reg2, num
-strheq \reg1, \reg2, \num
-.endm
-#endif
-
-.text
-
-#endif  // WEBRTC_SYSTEM_WRAPPERS_INCLUDE_ASM_DEFINES_H_
diff --git a/submodules/libtgvoip/webrtc_dsp/system_wrappers/include/compile_assert_c.h b/submodules/libtgvoip/webrtc_dsp/system_wrappers/include/compile_assert_c.h
deleted file mode 100644
index 00f6306e9f..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/system_wrappers/include/compile_assert_c.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- *  Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#ifndef WEBRTC_SYSTEM_WRAPPERS_INCLUDE_COMPILE_ASSERT_H_
-#define WEBRTC_SYSTEM_WRAPPERS_INCLUDE_COMPILE_ASSERT_H_
-
-// Use this macro to verify at compile time that certain restrictions are met.
-// The argument is the boolean expression to evaluate.
-// Example:
-//   COMPILE_ASSERT(sizeof(foo) < 128);
-// Note: In C++, use static_assert instead!
-#define COMPILE_ASSERT(expression) switch (0) {case 0: case expression:;}
-
-#endif  // WEBRTC_SYSTEM_WRAPPERS_INCLUDE_COMPILE_ASSERT_H_
diff --git a/submodules/libtgvoip/webrtc_dsp/system_wrappers/include/cpu_features_wrapper.h b/submodules/libtgvoip/webrtc_dsp/system_wrappers/include/cpu_features_wrapper.h
deleted file mode 100644
index 8315770df4..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/system_wrappers/include/cpu_features_wrapper.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- *  Copyright (c) 2011 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#ifndef WEBRTC_SYSTEM_WRAPPERS_INCLUDE_CPU_FEATURES_WRAPPER_H_
-#define WEBRTC_SYSTEM_WRAPPERS_INCLUDE_CPU_FEATURES_WRAPPER_H_
-
-#if defined(__cplusplus) || defined(c_plusplus)
-extern "C" {
-#endif
-
-#include "typedefs.h"
-
-// List of features in x86.
-typedef enum {
-  kSSE2,
-  kSSE3
-} CPUFeature;
-
-// List of features in ARM.
-enum {
-  kCPUFeatureARMv7       = (1 << 0),
-  kCPUFeatureVFPv3       = (1 << 1),
-  kCPUFeatureNEON        = (1 << 2),
-  kCPUFeatureLDREXSTREX  = (1 << 3)
-};
-
-typedef int (*WebRtc_CPUInfo)(CPUFeature feature);
-
-// Returns true if the CPU supports the feature.
-extern WebRtc_CPUInfo WebRtc_GetCPUInfo;
-
-// No CPU feature is available => straight C path.
-extern WebRtc_CPUInfo WebRtc_GetCPUInfoNoASM;
-
-// Return the features in an ARM device.
-// It detects the features in the hardware platform, and returns supported
-// values in the above enum definition as a bitmask.
-extern uint64_t WebRtc_GetCPUFeaturesARM(void);
-
-#if defined(__cplusplus) || defined(c_plusplus)
-}  // extern "C"
-#endif
-
-#endif // WEBRTC_SYSTEM_WRAPPERS_INCLUDE_CPU_FEATURES_WRAPPER_H_
diff --git a/submodules/libtgvoip/webrtc_dsp/system_wrappers/include/field_trial.h b/submodules/libtgvoip/webrtc_dsp/system_wrappers/include/field_trial.h
deleted file mode 100644
index 41bea9bf58..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/system_wrappers/include/field_trial.h
+++ /dev/null
@@ -1,90 +0,0 @@
-//
-// Copyright (c) 2014 The WebRTC project authors. All Rights Reserved.
-//
-// Use of this source code is governed by a BSD-style license
-// that can be found in the LICENSE file in the root of the source
-// tree. An additional intellectual property rights grant can be found
-// in the file PATENTS.  All contributing project authors may
-// be found in the AUTHORS file in the root of the source tree.
-//
-
-#ifndef SYSTEM_WRAPPERS_INCLUDE_FIELD_TRIAL_H_
-#define SYSTEM_WRAPPERS_INCLUDE_FIELD_TRIAL_H_
-
-#include <string>
-
-// Field trials allow webrtc clients (such as Chrome) to turn on feature code
-// in binaries out in the field and gather information with that.
-//
-// By default WebRTC provides an implementaion of field trials that can be
-// found in system_wrappers/source/field_trial.cc. If clients want to provide
-// a custom version, they will have to:
-//
-// 1. Compile WebRTC defining the preprocessor macro
-//    WEBRTC_EXCLUDE_FIELD_TRIAL_DEFAULT (if GN is used this can be achieved
-//    by setting the GN arg rtc_exclude_field_trial_default to true).
-// 2. Provide an implementation of:
-//    std::string webrtc::field_trial::FindFullName(const std::string& trial).
-//
-// They are designed to wire up directly to chrome field trials and to speed up
-// developers by reducing the need to wire APIs to control whether a feature is
-// on/off. E.g. to experiment with a new method that could lead to a different
-// trade-off between CPU/bandwidth:
-//
-// 1 - Develop the feature with default behaviour off:
-//
-//   if (FieldTrial::FindFullName("WebRTCExperimenMethod2") == "Enabled")
-//     method2();
-//   else
-//     method1();
-//
-// 2 - Once the changes are rolled to chrome, the new code path can be
-//     controlled as normal chrome field trials.
-//
-// 3 - Evaluate the new feature and clean the code paths.
-//
-// Notes:
-//   - NOT every feature is a candidate to be controlled by this mechanism as
-//     it may require negotation between involved parties (e.g. SDP).
-//
-// TODO(andresp): since chrome --force-fieldtrials does not marks the trial
-//     as active it does not gets propaged to renderer process. For now one
-//     needs to push a config with start_active:true or run a local finch
-//     server.
-//
-// TODO(andresp): find out how to get bots to run tests with trials enabled.
-
-namespace webrtc {
-namespace field_trial {
-
-// Returns the group name chosen for the named trial, or the empty string
-// if the trial does not exists.
-//
-// Note: To keep things tidy append all the trial names with WebRTC.
-std::string FindFullName(const std::string& name);
-
-// Convenience method, returns true iff FindFullName(name) return a string that
-// starts with "Enabled".
-// TODO(tommi): Make sure all implementations support this.
-inline bool IsEnabled(const char* name) {
-  return FindFullName(name).find("Enabled") == 0;
-}
-
-// Convenience method, returns true iff FindFullName(name) return a string that
-// starts with "Disabled".
-inline bool IsDisabled(const char* name) {
-  return FindFullName(name).find("Disabled") == 0;
-}
-
-// Optionally initialize field trial from a string.
-// This method can be called at most once before any other call into webrtc.
-// E.g. before the peer connection factory is constructed.
-// Note: trials_string must never be destroyed.
-void InitFieldTrialsFromString(const char* trials_string);
-
-const char* GetFieldTrialString();
-
-}  // namespace field_trial
-}  // namespace webrtc
-
-#endif  // SYSTEM_WRAPPERS_INCLUDE_FIELD_TRIAL_H_
diff --git a/submodules/libtgvoip/webrtc_dsp/system_wrappers/include/metrics.h b/submodules/libtgvoip/webrtc_dsp/system_wrappers/include/metrics.h
deleted file mode 100644
index fb2679d3dc..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/system_wrappers/include/metrics.h
+++ /dev/null
@@ -1,316 +0,0 @@
-//
-// Copyright (c) 2014 The WebRTC project authors. All Rights Reserved.
-//
-// Use of this source code is governed by a BSD-style license
-// that can be found in the LICENSE file in the root of the source
-// tree. An additional intellectual property rights grant can be found
-// in the file PATENTS.  All contributing project authors may
-// be found in the AUTHORS file in the root of the source tree.
-//
-
-#ifndef SYSTEM_WRAPPERS_INCLUDE_METRICS_H_
-#define SYSTEM_WRAPPERS_INCLUDE_METRICS_H_
-
-#include <map>
-#include <memory>
-#include <string>
-
-//#include "common_types.h"  // NOLINT(build/include)
-#include "rtc_base/atomicops.h"
-#include "rtc_base/checks.h"
-
-// Macros for allowing WebRTC clients (e.g. Chrome) to gather and aggregate
-// statistics.
-//
-// Histogram for counters.
-// RTC_HISTOGRAM_COUNTS(name, sample, min, max, bucket_count);
-//
-// Histogram for enumerators.
-// The boundary should be above the max enumerator sample.
-// RTC_HISTOGRAM_ENUMERATION(name, sample, boundary);
-//
-//
-// The macros use the methods HistogramFactoryGetCounts,
-// HistogramFactoryGetEnumeration and HistogramAdd.
-//
-// By default WebRTC provides implementations of the aforementioned methods
-// that can be found in system_wrappers/source/metrics.cc. If clients want to
-// provide a custom version, they will have to:
-//
-// 1. Compile WebRTC defining the preprocessor macro
-//    WEBRTC_EXCLUDE_METRICS_DEFAULT (if GN is used this can be achieved
-//    by setting the GN arg rtc_exclude_metrics_default to true).
-// 2. Provide implementations of:
-//    Histogram* webrtc::metrics::HistogramFactoryGetCounts(
-//        const std::string& name, int sample, int min, int max,
-//        int bucket_count);
-//    Histogram* webrtc::metrics::HistogramFactoryGetEnumeration(
-//        const std::string& name, int sample, int boundary);
-//    void webrtc::metrics::HistogramAdd(
-//        Histogram* histogram_pointer, const std::string& name, int sample);
-//
-// Example usage:
-//
-// RTC_HISTOGRAM_COUNTS("WebRTC.Video.NacksSent", nacks_sent, 1, 100000, 100);
-//
-// enum Types {
-//   kTypeX,
-//   kTypeY,
-//   kBoundary,
-// };
-//
-// RTC_HISTOGRAM_ENUMERATION("WebRTC.Types", kTypeX, kBoundary);
-//
-// NOTE: It is recommended to do the Chromium review for modifications to
-// histograms.xml before new metrics are committed to WebRTC.
-
-// Macros for adding samples to a named histogram.
-
-// Histogram for counters (exponentially spaced buckets).
-#define RTC_HISTOGRAM_COUNTS_100(name, sample) \
-  RTC_HISTOGRAM_COUNTS(name, sample, 1, 100, 50)
-
-#define RTC_HISTOGRAM_COUNTS_200(name, sample) \
-  RTC_HISTOGRAM_COUNTS(name, sample, 1, 200, 50)
-
-#define RTC_HISTOGRAM_COUNTS_500(name, sample) \
-  RTC_HISTOGRAM_COUNTS(name, sample, 1, 500, 50)
-
-#define RTC_HISTOGRAM_COUNTS_1000(name, sample) \
-  RTC_HISTOGRAM_COUNTS(name, sample, 1, 1000, 50)
-
-#define RTC_HISTOGRAM_COUNTS_10000(name, sample) \
-  RTC_HISTOGRAM_COUNTS(name, sample, 1, 10000, 50)
-
-#define RTC_HISTOGRAM_COUNTS_100000(name, sample) \
-  RTC_HISTOGRAM_COUNTS(name, sample, 1, 100000, 50)
-
-#define RTC_HISTOGRAM_COUNTS(name, sample, min, max, bucket_count)       \
-  RTC_HISTOGRAM_COMMON_BLOCK(name, sample,                               \
-                             webrtc::metrics::HistogramFactoryGetCounts( \
-                                 name, min, max, bucket_count))
-
-#define RTC_HISTOGRAM_COUNTS_LINEAR(name, sample, min, max, bucket_count)      \
-  RTC_HISTOGRAM_COMMON_BLOCK(name, sample,                                     \
-                             webrtc::metrics::HistogramFactoryGetCountsLinear( \
-                                 name, min, max, bucket_count))
-
-// Slow metrics: pointer to metric is acquired at each call and is not cached.
-//
-#define RTC_HISTOGRAM_COUNTS_SPARSE_100(name, sample) \
-  RTC_HISTOGRAM_COUNTS_SPARSE(name, sample, 1, 100, 50)
-
-#define RTC_HISTOGRAM_COUNTS_SPARSE_200(name, sample) \
-  RTC_HISTOGRAM_COUNTS_SPARSE(name, sample, 1, 200, 50)
-
-#define RTC_HISTOGRAM_COUNTS_SPARSE_500(name, sample) \
-  RTC_HISTOGRAM_COUNTS_SPARSE(name, sample, 1, 500, 50)
-
-#define RTC_HISTOGRAM_COUNTS_SPARSE_1000(name, sample) \
-  RTC_HISTOGRAM_COUNTS_SPARSE(name, sample, 1, 1000, 50)
-
-#define RTC_HISTOGRAM_COUNTS_SPARSE_10000(name, sample) \
-  RTC_HISTOGRAM_COUNTS_SPARSE(name, sample, 1, 10000, 50)
-
-#define RTC_HISTOGRAM_COUNTS_SPARSE_100000(name, sample) \
-  RTC_HISTOGRAM_COUNTS_SPARSE(name, sample, 1, 100000, 50)
-
-#define RTC_HISTOGRAM_COUNTS_SPARSE(name, sample, min, max, bucket_count)     \
-  RTC_HISTOGRAM_COMMON_BLOCK_SLOW(name, sample,                               \
-                                  webrtc::metrics::HistogramFactoryGetCounts( \
-                                      name, min, max, bucket_count))
-
-// Histogram for percentage (evenly spaced buckets).
-#define RTC_HISTOGRAM_PERCENTAGE_SPARSE(name, sample) \
-  RTC_HISTOGRAM_ENUMERATION_SPARSE(name, sample, 101)
-
-// Histogram for booleans.
-#define RTC_HISTOGRAM_BOOLEAN_SPARSE(name, sample) \
-  RTC_HISTOGRAM_ENUMERATION_SPARSE(name, sample, 2)
-
-// Histogram for enumerators (evenly spaced buckets).
-// |boundary| should be above the max enumerator sample.
-//
-// TODO(qingsi): Refactor the default implementation given by RtcHistogram,
-// which is already sparse, and remove the boundary argument from the macro.
-#define RTC_HISTOGRAM_ENUMERATION_SPARSE(name, sample, boundary) \
-  RTC_HISTOGRAM_COMMON_BLOCK(                                    \
-      name, sample,                                              \
-      webrtc::metrics::SparseHistogramFactoryGetEnumeration(name, boundary))
-
-// Histogram for percentage (evenly spaced buckets).
-#define RTC_HISTOGRAM_PERCENTAGE(name, sample) \
-  RTC_HISTOGRAM_ENUMERATION(name, sample, 101)
-
-// Histogram for booleans.
-#define RTC_HISTOGRAM_BOOLEAN(name, sample) \
-  RTC_HISTOGRAM_ENUMERATION(name, sample, 2)
-
-// Histogram for enumerators (evenly spaced buckets).
-// |boundary| should be above the max enumerator sample.
-#define RTC_HISTOGRAM_ENUMERATION(name, sample, boundary) \
-  RTC_HISTOGRAM_COMMON_BLOCK(                             \
-      name, sample,                                       \
-      webrtc::metrics::HistogramFactoryGetEnumeration(name, boundary))
-
-// The name of the histogram should not vary.
-// TODO(asapersson): Consider changing string to const char*.
-#define RTC_HISTOGRAM_COMMON_BLOCK(constant_name, sample,                  \
-                                   factory_get_invocation)                 \
-  do {                                                                     \
-    static webrtc::metrics::Histogram* atomic_histogram_pointer = nullptr; \
-    webrtc::metrics::Histogram* histogram_pointer =                        \
-        rtc::AtomicOps::AcquireLoadPtr(&atomic_histogram_pointer);         \
-    if (!histogram_pointer) {                                              \
-      histogram_pointer = factory_get_invocation;                          \
-      webrtc::metrics::Histogram* prev_pointer =                           \
-          rtc::AtomicOps::CompareAndSwapPtr(                               \
-              &atomic_histogram_pointer,                                   \
-              static_cast<webrtc::metrics::Histogram*>(nullptr),           \
-              histogram_pointer);                                          \
-      RTC_DCHECK(prev_pointer == nullptr ||                                \
-                 prev_pointer == histogram_pointer);                       \
-    }                                                                      \
-    if (histogram_pointer) {                                               \
-      webrtc::metrics::HistogramAdd(histogram_pointer, sample);            \
-    }                                                                      \
-  } while (0)
-
-// Deprecated.
-// The histogram is constructed/found for each call.
-// May be used for histograms with infrequent updates.`
-#define RTC_HISTOGRAM_COMMON_BLOCK_SLOW(name, sample, factory_get_invocation) \
-  do {                                                                        \
-    webrtc::metrics::Histogram* histogram_pointer = factory_get_invocation;   \
-    if (histogram_pointer) {                                                  \
-      webrtc::metrics::HistogramAdd(histogram_pointer, sample);               \
-    }                                                                         \
-  } while (0)
-
-// Helper macros.
-// Macros for calling a histogram with varying name (e.g. when using a metric
-// in different modes such as real-time vs screenshare). Fast, because pointer
-// is cached. |index| should be different for different names. Allowed |index|
-// values are 0, 1, and 2.
-#define RTC_HISTOGRAMS_COUNTS_100(index, name, sample) \
-  RTC_HISTOGRAMS_COMMON(index, name, sample,           \
-                        RTC_HISTOGRAM_COUNTS(name, sample, 1, 100, 50))
-
-#define RTC_HISTOGRAMS_COUNTS_200(index, name, sample) \
-  RTC_HISTOGRAMS_COMMON(index, name, sample,           \
-                        RTC_HISTOGRAM_COUNTS(name, sample, 1, 200, 50))
-
-#define RTC_HISTOGRAMS_COUNTS_500(index, name, sample) \
-  RTC_HISTOGRAMS_COMMON(index, name, sample,           \
-                        RTC_HISTOGRAM_COUNTS(name, sample, 1, 500, 50))
-
-#define RTC_HISTOGRAMS_COUNTS_1000(index, name, sample) \
-  RTC_HISTOGRAMS_COMMON(index, name, sample,            \
-                        RTC_HISTOGRAM_COUNTS(name, sample, 1, 1000, 50))
-
-#define RTC_HISTOGRAMS_COUNTS_10000(index, name, sample) \
-  RTC_HISTOGRAMS_COMMON(index, name, sample,             \
-                        RTC_HISTOGRAM_COUNTS(name, sample, 1, 10000, 50))
-
-#define RTC_HISTOGRAMS_COUNTS_100000(index, name, sample) \
-  RTC_HISTOGRAMS_COMMON(index, name, sample,              \
-                        RTC_HISTOGRAM_COUNTS(name, sample, 1, 100000, 50))
-
-#define RTC_HISTOGRAMS_ENUMERATION(index, name, sample, boundary) \
-  RTC_HISTOGRAMS_COMMON(index, name, sample,                      \
-                        RTC_HISTOGRAM_ENUMERATION(name, sample, boundary))
-
-#define RTC_HISTOGRAMS_PERCENTAGE(index, name, sample) \
-  RTC_HISTOGRAMS_COMMON(index, name, sample,           \
-                        RTC_HISTOGRAM_PERCENTAGE(name, sample))
-
-#define RTC_HISTOGRAMS_COMMON(index, name, sample, macro_invocation) \
-  do {                                                               \
-    switch (index) {                                                 \
-      case 0:                                                        \
-        macro_invocation;                                            \
-        break;                                                       \
-      case 1:                                                        \
-        macro_invocation;                                            \
-        break;                                                       \
-      case 2:                                                        \
-        macro_invocation;                                            \
-        break;                                                       \
-      default:                                                       \
-        RTC_NOTREACHED();                                            \
-    }                                                                \
-  } while (0)
-
-namespace webrtc {
-namespace metrics {
-
-// Time that should have elapsed for stats that are gathered once per call.
-enum { kMinRunTimeInSeconds = 10 };
-
-class Histogram;
-
-// Functions for getting pointer to histogram (constructs or finds the named
-// histogram).
-
-// Get histogram for counters.
-Histogram* HistogramFactoryGetCounts(const std::string& name,
-                                     int min,
-                                     int max,
-                                     int bucket_count);
-
-// Get histogram for counters with linear bucket spacing.
-Histogram* HistogramFactoryGetCountsLinear(const std::string& name,
-                                           int min,
-                                           int max,
-                                           int bucket_count);
-
-// Get histogram for enumerators.
-// |boundary| should be above the max enumerator sample.
-Histogram* HistogramFactoryGetEnumeration(const std::string& name,
-                                          int boundary);
-
-// Get sparse histogram for enumerators.
-// |boundary| should be above the max enumerator sample.
-Histogram* SparseHistogramFactoryGetEnumeration(const std::string& name,
-                                                int boundary);
-
-// Function for adding a |sample| to a histogram.
-void HistogramAdd(Histogram* histogram_pointer, int sample);
-
-struct SampleInfo {
-  SampleInfo(const std::string& name, int min, int max, size_t bucket_count);
-  ~SampleInfo();
-
-  const std::string name;
-  const int min;
-  const int max;
-  const size_t bucket_count;
-  std::map<int, int> samples;  // <value, # of events>
-};
-
-// Enables collection of samples.
-// This method should be called before any other call into webrtc.
-void Enable();
-
-// Gets histograms and clears all samples.
-void GetAndReset(
-    std::map<std::string, std::unique_ptr<SampleInfo>>* histograms);
-
-// Functions below are mainly for testing.
-
-// Clears all samples.
-void Reset();
-
-// Returns the number of times the |sample| has been added to the histogram.
-int NumEvents(const std::string& name, int sample);
-
-// Returns the total number of added samples to the histogram.
-int NumSamples(const std::string& name);
-
-// Returns the minimum sample value (or -1 if the histogram has no samples).
-int MinSample(const std::string& name);
-
-}  // namespace metrics
-}  // namespace webrtc
-
-#endif  // SYSTEM_WRAPPERS_INCLUDE_METRICS_H_
diff --git a/submodules/libtgvoip/webrtc_dsp/system_wrappers/source/cpu_features.cc b/submodules/libtgvoip/webrtc_dsp/system_wrappers/source/cpu_features.cc
deleted file mode 100644
index 2fc97f8303..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/system_wrappers/source/cpu_features.cc
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- *  Copyright (c) 2011 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-// Parts of this file derived from Chromium's base/cpu.cc.
-
-#include "system_wrappers/include/cpu_features_wrapper.h"
-
-#if defined(WEBRTC_ARCH_X86_FAMILY) && defined(_MSC_VER)
-#include <intrin.h>
-#endif
-
-#include "typedefs.h"
-
-// No CPU feature is available => straight C path.
-int GetCPUInfoNoASM(CPUFeature feature) {
-  (void)feature;
-  return 0;
-}
-
-#if defined(WEBRTC_ARCH_X86_FAMILY)
-#ifndef _MSC_VER
-// Intrinsic for "cpuid".
-#if defined(__pic__) && defined(__i386__)
-static inline void __cpuid(int cpu_info[4], int info_type) {
-  __asm__ volatile(
-    "mov %%ebx, %%edi\n"
-    "cpuid\n"
-    "xchg %%edi, %%ebx\n"
-    : "=a"(cpu_info[0]), "=D"(cpu_info[1]), "=c"(cpu_info[2]), "=d"(cpu_info[3])
-    : "a"(info_type));
-}
-#else
-static inline void __cpuid(int cpu_info[4], int info_type) {
-  __asm__ volatile(
-    "cpuid\n"
-    : "=a"(cpu_info[0]), "=b"(cpu_info[1]), "=c"(cpu_info[2]), "=d"(cpu_info[3])
-    : "a"(info_type));
-}
-#endif
-#endif  // _MSC_VER
-#endif  // WEBRTC_ARCH_X86_FAMILY
-
-#if defined(WEBRTC_ARCH_X86_FAMILY)
-// Actual feature detection for x86.
-static int GetCPUInfo(CPUFeature feature) {
-  int cpu_info[4];
-  __cpuid(cpu_info, 1);
-  if (feature == kSSE2) {
-    return 0 != (cpu_info[3] & 0x04000000);
-  }
-  if (feature == kSSE3) {
-    return 0 != (cpu_info[2] & 0x00000001);
-  }
-  return 0;
-}
-#else
-// Default to straight C for other platforms.
-static int GetCPUInfo(CPUFeature feature) {
-  (void)feature;
-  return 0;
-}
-#endif
-
-WebRtc_CPUInfo WebRtc_GetCPUInfo = GetCPUInfo;
-WebRtc_CPUInfo WebRtc_GetCPUInfoNoASM = GetCPUInfoNoASM;
diff --git a/submodules/libtgvoip/webrtc_dsp/system_wrappers/source/field_trial.cc b/submodules/libtgvoip/webrtc_dsp/system_wrappers/source/field_trial.cc
deleted file mode 100644
index ac7131144a..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/system_wrappers/source/field_trial.cc
+++ /dev/null
@@ -1,67 +0,0 @@
-// Copyright (c) 2014 The WebRTC project authors. All Rights Reserved.
-//
-// Use of this source code is governed by a BSD-style license
-// that can be found in the LICENSE file in the root of the source
-// tree. An additional intellectual property rights grant can be found
-// in the file PATENTS.  All contributing project authors may
-// be found in the AUTHORS file in the root of the source tree.
-//
-
-#include "system_wrappers/include/field_trial.h"
-
-#include <stddef.h>
-#include <string>
-
-// Simple field trial implementation, which allows client to
-// specify desired flags in InitFieldTrialsFromString.
-namespace webrtc {
-namespace field_trial {
-
-static const char* trials_init_string = NULL;
-
-#ifndef WEBRTC_EXCLUDE_FIELD_TRIAL_DEFAULT
-std::string FindFullName(const std::string& name) {
-  if (trials_init_string == NULL)
-    return std::string();
-
-  std::string trials_string(trials_init_string);
-  if (trials_string.empty())
-    return std::string();
-
-  static const char kPersistentStringSeparator = '/';
-  size_t next_item = 0;
-  while (next_item < trials_string.length()) {
-    // Find next name/value pair in field trial configuration string.
-    size_t field_name_end =
-        trials_string.find(kPersistentStringSeparator, next_item);
-    if (field_name_end == trials_string.npos || field_name_end == next_item)
-      break;
-    size_t field_value_end =
-        trials_string.find(kPersistentStringSeparator, field_name_end + 1);
-    if (field_value_end == trials_string.npos ||
-        field_value_end == field_name_end + 1)
-      break;
-    std::string field_name(trials_string, next_item,
-                           field_name_end - next_item);
-    std::string field_value(trials_string, field_name_end + 1,
-                            field_value_end - field_name_end - 1);
-    next_item = field_value_end + 1;
-
-    if (name == field_name)
-      return field_value;
-  }
-  return std::string();
-}
-#endif  // WEBRTC_EXCLUDE_FIELD_TRIAL_DEFAULT
-
-// Optionally initialize field trial from a string.
-void InitFieldTrialsFromString(const char* trials_string) {
-  trials_init_string = trials_string;
-}
-
-const char* GetFieldTrialString() {
-  return trials_init_string;
-}
-
-}  // namespace field_trial
-}  // namespace webrtc
diff --git a/submodules/libtgvoip/webrtc_dsp/system_wrappers/source/metrics.cc b/submodules/libtgvoip/webrtc_dsp/system_wrappers/source/metrics.cc
deleted file mode 100644
index 4aa8770b82..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/system_wrappers/source/metrics.cc
+++ /dev/null
@@ -1,311 +0,0 @@
-// Copyright (c) 2014 The WebRTC project authors. All Rights Reserved.
-//
-// Use of this source code is governed by a BSD-style license
-// that can be found in the LICENSE file in the root of the source
-// tree. An additional intellectual property rights grant can be found
-// in the file PATENTS.  All contributing project authors may
-// be found in the AUTHORS file in the root of the source tree.
-//
-
-#include "system_wrappers/include/metrics.h"
-
-#include <algorithm>
-
-#include "rtc_base/criticalsection.h"
-#include "rtc_base/thread_annotations.h"
-
-// Default implementation of histogram methods for WebRTC clients that do not
-// want to provide their own implementation.
-
-namespace webrtc {
-namespace metrics {
-class Histogram;
-
-namespace {
-// Limit for the maximum number of sample values that can be stored.
-// TODO(asapersson): Consider using bucket count (and set up
-// linearly/exponentially spaced buckets) if samples are logged more frequently.
-const int kMaxSampleMapSize = 300;
-
-class RtcHistogram {
- public:
-  RtcHistogram(const std::string& name, int min, int max, int bucket_count)
-      : min_(min), max_(max), info_(name, min, max, bucket_count) {
-    RTC_DCHECK_GT(bucket_count, 0);
-  }
-
-  void Add(int sample) {
-    sample = std::min(sample, max_);
-    sample = std::max(sample, min_ - 1);  // Underflow bucket.
-
-    rtc::CritScope cs(&crit_);
-    if (info_.samples.size() == kMaxSampleMapSize &&
-        info_.samples.find(sample) == info_.samples.end()) {
-      return;
-    }
-    ++info_.samples[sample];
-  }
-
-  // Returns a copy (or nullptr if there are no samples) and clears samples.
-  std::unique_ptr<SampleInfo> GetAndReset() {
-    rtc::CritScope cs(&crit_);
-    if (info_.samples.empty())
-      return nullptr;
-
-    SampleInfo* copy =
-        new SampleInfo(info_.name, info_.min, info_.max, info_.bucket_count);
-
-    std::swap(info_.samples, copy->samples);
-
-    return std::unique_ptr<SampleInfo>(copy);
-  }
-
-  const std::string& name() const { return info_.name; }
-
-  // Functions only for testing.
-  void Reset() {
-    rtc::CritScope cs(&crit_);
-    info_.samples.clear();
-  }
-
-  int NumEvents(int sample) const {
-    rtc::CritScope cs(&crit_);
-    const auto it = info_.samples.find(sample);
-    return (it == info_.samples.end()) ? 0 : it->second;
-  }
-
-  int NumSamples() const {
-    int num_samples = 0;
-    rtc::CritScope cs(&crit_);
-    for (const auto& sample : info_.samples) {
-      num_samples += sample.second;
-    }
-    return num_samples;
-  }
-
-  int MinSample() const {
-    rtc::CritScope cs(&crit_);
-    return (info_.samples.empty()) ? -1 : info_.samples.begin()->first;
-  }
-
- private:
-  rtc::CriticalSection crit_;
-  const int min_;
-  const int max_;
-  SampleInfo info_ RTC_GUARDED_BY(crit_);
-
-  RTC_DISALLOW_COPY_AND_ASSIGN(RtcHistogram);
-};
-
-class RtcHistogramMap {
- public:
-  RtcHistogramMap() {}
-  ~RtcHistogramMap() {}
-
-  Histogram* GetCountsHistogram(const std::string& name,
-                                int min,
-                                int max,
-                                int bucket_count) {
-    rtc::CritScope cs(&crit_);
-    const auto& it = map_.find(name);
-    if (it != map_.end())
-      return reinterpret_cast<Histogram*>(it->second.get());
-
-    RtcHistogram* hist = new RtcHistogram(name, min, max, bucket_count);
-    map_[name].reset(hist);
-    return reinterpret_cast<Histogram*>(hist);
-  }
-
-  Histogram* GetEnumerationHistogram(const std::string& name, int boundary) {
-    rtc::CritScope cs(&crit_);
-    const auto& it = map_.find(name);
-    if (it != map_.end())
-      return reinterpret_cast<Histogram*>(it->second.get());
-
-    RtcHistogram* hist = new RtcHistogram(name, 1, boundary, boundary + 1);
-    map_[name].reset(hist);
-    return reinterpret_cast<Histogram*>(hist);
-  }
-
-  void GetAndReset(
-      std::map<std::string, std::unique_ptr<SampleInfo>>* histograms) {
-    rtc::CritScope cs(&crit_);
-    for (const auto& kv : map_) {
-      std::unique_ptr<SampleInfo> info = kv.second->GetAndReset();
-      if (info)
-        histograms->insert(std::make_pair(kv.first, std::move(info)));
-    }
-  }
-
-  // Functions only for testing.
-  void Reset() {
-    rtc::CritScope cs(&crit_);
-    for (const auto& kv : map_)
-      kv.second->Reset();
-  }
-
-  int NumEvents(const std::string& name, int sample) const {
-    rtc::CritScope cs(&crit_);
-    const auto& it = map_.find(name);
-    return (it == map_.end()) ? 0 : it->second->NumEvents(sample);
-  }
-
-  int NumSamples(const std::string& name) const {
-    rtc::CritScope cs(&crit_);
-    const auto& it = map_.find(name);
-    return (it == map_.end()) ? 0 : it->second->NumSamples();
-  }
-
-  int MinSample(const std::string& name) const {
-    rtc::CritScope cs(&crit_);
-    const auto& it = map_.find(name);
-    return (it == map_.end()) ? -1 : it->second->MinSample();
-  }
-
- private:
-  rtc::CriticalSection crit_;
-  std::map<std::string, std::unique_ptr<RtcHistogram>> map_
-      RTC_GUARDED_BY(crit_);
-
-  RTC_DISALLOW_COPY_AND_ASSIGN(RtcHistogramMap);
-};
-
-// RtcHistogramMap is allocated upon call to Enable().
-// The histogram getter functions, which return pointer values to the histograms
-// in the map, are cached in WebRTC. Therefore, this memory is not freed by the
-// application (the memory will be reclaimed by the OS).
-static RtcHistogramMap* volatile g_rtc_histogram_map = nullptr;
-
-void CreateMap() {
-  RtcHistogramMap* map = rtc::AtomicOps::AcquireLoadPtr(&g_rtc_histogram_map);
-  if (map == nullptr) {
-    RtcHistogramMap* new_map = new RtcHistogramMap();
-    RtcHistogramMap* old_map = rtc::AtomicOps::CompareAndSwapPtr(
-        &g_rtc_histogram_map, static_cast<RtcHistogramMap*>(nullptr), new_map);
-    if (old_map != nullptr)
-      delete new_map;
-  }
-}
-
-// Set the first time we start using histograms. Used to make sure Enable() is
-// not called thereafter.
-#if RTC_DCHECK_IS_ON
-static volatile int g_rtc_histogram_called = 0;
-#endif
-
-// Gets the map (or nullptr).
-RtcHistogramMap* GetMap() {
-#if RTC_DCHECK_IS_ON
-  rtc::AtomicOps::ReleaseStore(&g_rtc_histogram_called, 1);
-#endif
-  return g_rtc_histogram_map;
-}
-}  // namespace
-
-#ifndef WEBRTC_EXCLUDE_METRICS_DEFAULT
-// Implementation of histogram methods in
-// webrtc/system_wrappers/interface/metrics.h.
-
-// Histogram with exponentially spaced buckets.
-// Creates (or finds) histogram.
-// The returned histogram pointer is cached (and used for adding samples in
-// subsequent calls).
-Histogram* HistogramFactoryGetCounts(const std::string& name,
-                                     int min,
-                                     int max,
-                                     int bucket_count) {
-  // TODO(asapersson): Alternative implementation will be needed if this
-  // histogram type should be truly exponential.
-  return HistogramFactoryGetCountsLinear(name, min, max, bucket_count);
-}
-
-// Histogram with linearly spaced buckets.
-// Creates (or finds) histogram.
-// The returned histogram pointer is cached (and used for adding samples in
-// subsequent calls).
-Histogram* HistogramFactoryGetCountsLinear(const std::string& name,
-                                           int min,
-                                           int max,
-                                           int bucket_count) {
-  RtcHistogramMap* map = GetMap();
-  if (!map)
-    return nullptr;
-
-  return map->GetCountsHistogram(name, min, max, bucket_count);
-}
-
-// Histogram with linearly spaced buckets.
-// Creates (or finds) histogram.
-// The returned histogram pointer is cached (and used for adding samples in
-// subsequent calls).
-Histogram* HistogramFactoryGetEnumeration(const std::string& name,
-                                          int boundary) {
-  RtcHistogramMap* map = GetMap();
-  if (!map)
-    return nullptr;
-
-  return map->GetEnumerationHistogram(name, boundary);
-}
-
-// Our default implementation reuses the non-sparse histogram.
-Histogram* SparseHistogramFactoryGetEnumeration(const std::string& name,
-                                                int boundary) {
-  return HistogramFactoryGetEnumeration(name, boundary);
-}
-
-// Fast path. Adds |sample| to cached |histogram_pointer|.
-void HistogramAdd(Histogram* histogram_pointer, int sample) {
-  RtcHistogram* ptr = reinterpret_cast<RtcHistogram*>(histogram_pointer);
-  ptr->Add(sample);
-}
-
-#endif  // WEBRTC_EXCLUDE_METRICS_DEFAULT
-
-SampleInfo::SampleInfo(const std::string& name,
-                       int min,
-                       int max,
-                       size_t bucket_count)
-    : name(name), min(min), max(max), bucket_count(bucket_count) {}
-
-SampleInfo::~SampleInfo() {}
-
-// Implementation of global functions in metrics.h.
-void Enable() {
-  RTC_DCHECK(g_rtc_histogram_map == nullptr);
-#if RTC_DCHECK_IS_ON
-  RTC_DCHECK_EQ(0, rtc::AtomicOps::AcquireLoad(&g_rtc_histogram_called));
-#endif
-  CreateMap();
-}
-
-void GetAndReset(
-    std::map<std::string, std::unique_ptr<SampleInfo>>* histograms) {
-  histograms->clear();
-  RtcHistogramMap* map = GetMap();
-  if (map)
-    map->GetAndReset(histograms);
-}
-
-void Reset() {
-  RtcHistogramMap* map = GetMap();
-  if (map)
-    map->Reset();
-}
-
-int NumEvents(const std::string& name, int sample) {
-  RtcHistogramMap* map = GetMap();
-  return map ? map->NumEvents(name, sample) : 0;
-}
-
-int NumSamples(const std::string& name) {
-  RtcHistogramMap* map = GetMap();
-  return map ? map->NumSamples(name) : 0;
-}
-
-int MinSample(const std::string& name) {
-  RtcHistogramMap* map = GetMap();
-  return map ? map->MinSample(name) : -1;
-}
-
-}  // namespace metrics
-}  // namespace webrtc
diff --git a/submodules/libtgvoip/webrtc_dsp/third_party/rnnoise/src/kiss_fft.cc b/submodules/libtgvoip/webrtc_dsp/third_party/rnnoise/src/kiss_fft.cc
deleted file mode 100644
index 27b4900b91..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/third_party/rnnoise/src/kiss_fft.cc
+++ /dev/null
@@ -1,443 +0,0 @@
-/*Copyright (c) 2003-2004, Mark Borgerding
-  Lots of modifications by Jean-Marc Valin
-  Copyright (c) 2005-2007, Xiph.Org Foundation
-  Copyright (c) 2008,      Xiph.Org Foundation, CSIRO
-  Copyright (c) 2018,      The WebRTC project authors
-
-  All rights reserved.
-
-  Redistribution and use in source and binary forms, with or without
-   modification, are permitted provided that the following conditions are met:
-
-    * Redistributions of source code must retain the above copyright notice,
-       this list of conditions and the following disclaimer.
-    * Redistributions in binary form must reproduce the above copyright notice,
-       this list of conditions and the following disclaimer in the
-       documentation and/or other materials provided with the distribution.
-
-  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-  AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-  IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-  ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-  LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-  SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-  INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-  CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-  ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-  POSSIBILITY OF SUCH DAMAGE.*/
-
-#include "third_party/rnnoise/src/kiss_fft.h"
-
-#include <cassert>
-#include <cmath>
-#include <utility>
-
-namespace rnnoise {
-namespace {
-
-void kf_bfly2(std::complex<float>* Fout, int m, int N) {
-  if (m == 1) {
-    for (int i = 0; i < N; i++) {
-      const std::complex<float> t = Fout[1];
-      Fout[1] = Fout[0] - t;
-      Fout[0] += t;
-      Fout += 2;
-    }
-  } else {
-    constexpr float tw = 0.7071067812f;
-    // We know that m==4 here because the radix-2 is just after a radix-4.
-    assert(m == 4);
-    for (int i = 0; i < N; i++) {
-      std::complex<float>* Fout2 = Fout + 4;
-      std::complex<float> t = Fout2[0];
-
-      *Fout2 = Fout[0] - t;
-      Fout[0] += t;
-
-      t.real((Fout2[1].real() + Fout2[1].imag()) * tw);
-      t.imag((Fout2[1].imag() - Fout2[1].real()) * tw);
-      Fout2[1] = Fout[1] - t;
-      Fout[1] += t;
-
-      t.real(Fout2[2].imag());
-      t.imag(-Fout2[2].real());
-      Fout2[2] = Fout[2] - t;
-      Fout[2] += t;
-
-      t.real((Fout2[3].imag() - Fout2[3].real()) * tw);
-      t.imag(-(Fout2[3].imag() + Fout2[3].real()) * tw);
-      Fout2[3] = Fout[3] - t;
-      Fout[3] += t;
-      Fout += 8;
-    }
-  }
-}
-
-void kf_bfly4(std::complex<float>* Fout,
-              const size_t fstride,
-              const KissFft::KissFftState* st,
-              int m,
-              int N,
-              int mm) {
-  assert(Fout);
-  assert(st);
-  if (m == 1) {
-    // Degenerate case where all the twiddles are 1.
-    for (int i = 0; i < N; i++) {
-      std::complex<float> scratch0 = Fout[0] - Fout[2];
-      Fout[0] += Fout[2];
-      std::complex<float> scratch1 = Fout[1] + Fout[3];
-      Fout[2] = Fout[0] - scratch1;
-      Fout[0] += scratch1;
-      scratch1 = Fout[1] - Fout[3];
-
-      Fout[1].real(scratch0.real() + scratch1.imag());
-      Fout[1].imag(scratch0.imag() - scratch1.real());
-      Fout[3].real(scratch0.real() - scratch1.imag());
-      Fout[3].imag(scratch0.imag() + scratch1.real());
-      Fout += 4;
-    }
-  } else {
-    std::complex<float> scratch[6];
-    const int m2 = 2 * m;
-    const int m3 = 3 * m;
-    std::complex<float>* Fout_beg = Fout;
-    for (int i = 0; i < N; i++) {
-      Fout = Fout_beg + i * mm;
-      const std::complex<float>* tw1;
-      const std::complex<float>* tw2;
-      const std::complex<float>* tw3;
-      tw3 = tw2 = tw1 = &st->twiddles[0];
-      assert(m % 4 == 0);  // |m| is guaranteed to be a multiple of 4.
-      for (int j = 0; j < m; j++) {
-        scratch[0] = Fout[m] * *tw1;
-        scratch[1] = Fout[m2] * *tw2;
-        scratch[2] = Fout[m3] * *tw3;
-
-        scratch[5] = Fout[0] - scratch[1];
-        Fout[0] += scratch[1];
-        scratch[3] = scratch[0] + scratch[2];
-        scratch[4] = scratch[0] - scratch[2];
-        Fout[m2] = Fout[0] - scratch[3];
-
-        tw1 += fstride;
-        tw2 += fstride * 2;
-        tw3 += fstride * 3;
-        Fout[0] += scratch[3];
-
-        Fout[m].real(scratch[5].real() + scratch[4].imag());
-        Fout[m].imag(scratch[5].imag() - scratch[4].real());
-        Fout[m3].real(scratch[5].real() - scratch[4].imag());
-        Fout[m3].imag(scratch[5].imag() + scratch[4].real());
-        ++Fout;
-      }
-    }
-  }
-}
-
-void kf_bfly3(std::complex<float>* Fout,
-              const size_t fstride,
-              const KissFft::KissFftState* st,
-              int m,
-              int N,
-              int mm) {
-  assert(Fout);
-  assert(st);
-  const size_t m2 = 2 * m;
-  const std::complex<float>*tw1, *tw2;
-  std::complex<float> scratch[5];
-  std::complex<float> epi3;
-
-  std::complex<float>* Fout_beg = Fout;
-  epi3 = st->twiddles[fstride * m];
-  for (int i = 0; i < N; i++) {
-    Fout = Fout_beg + i * mm;
-    tw1 = tw2 = &st->twiddles[0];
-    size_t k = m;
-    do {
-      scratch[1] = Fout[m] * *tw1;
-      scratch[2] = Fout[m2] * *tw2;
-
-      scratch[3] = scratch[1] + scratch[2];
-      scratch[0] = scratch[1] - scratch[2];
-      tw1 += fstride;
-      tw2 += fstride * 2;
-
-      Fout[m] = Fout[0] - 0.5f * scratch[3];
-
-      scratch[0] *= epi3.imag();
-
-      Fout[0] += scratch[3];
-
-      Fout[m2].real(Fout[m].real() + scratch[0].imag());
-      Fout[m2].imag(Fout[m].imag() - scratch[0].real());
-
-      Fout[m].real(Fout[m].real() - scratch[0].imag());
-      Fout[m].imag(Fout[m].imag() + scratch[0].real());
-
-      ++Fout;
-    } while (--k);
-  }
-}
-
-void kf_bfly5(std::complex<float>* Fout,
-              const size_t fstride,
-              const KissFft::KissFftState* st,
-              int m,
-              int N,
-              int mm) {
-  assert(Fout);
-  assert(st);
-  std::complex<float> scratch[13];
-  const std::complex<float>* tw;
-  std::complex<float> ya, yb;
-  std::complex<float>* const Fout_beg = Fout;
-
-  ya = st->twiddles[fstride * m];
-  yb = st->twiddles[fstride * 2 * m];
-  tw = &st->twiddles[0];
-
-  for (int i = 0; i < N; i++) {
-    Fout = Fout_beg + i * mm;
-    std::complex<float>* Fout0 = Fout;
-    std::complex<float>* Fout1 = Fout0 + m;
-    std::complex<float>* Fout2 = Fout0 + 2 * m;
-    std::complex<float>* Fout3 = Fout0 + 3 * m;
-    std::complex<float>* Fout4 = Fout0 + 4 * m;
-
-    // For non-custom modes, m is guaranteed to be a multiple of 4.
-    for (int u = 0; u < m; ++u) {
-      scratch[0] = *Fout0;
-
-      scratch[1] = *Fout1 * tw[u * fstride];
-      scratch[2] = *Fout2 * tw[2 * u * fstride];
-      scratch[3] = *Fout3 * tw[3 * u * fstride];
-      scratch[4] = *Fout4 * tw[4 * u * fstride];
-
-      scratch[7] = scratch[1] + scratch[4];
-      scratch[10] = scratch[1] - scratch[4];
-      scratch[8] = scratch[2] + scratch[3];
-      scratch[9] = scratch[2] - scratch[3];
-
-      Fout0->real(Fout0->real() + scratch[7].real() + scratch[8].real());
-      Fout0->imag(Fout0->imag() + scratch[7].imag() + scratch[8].imag());
-
-      scratch[5].real(scratch[0].real() + scratch[7].real() * ya.real() +
-                      scratch[8].real() * yb.real());
-      scratch[5].imag(scratch[0].imag() + scratch[7].imag() * ya.real() +
-                      scratch[8].imag() * yb.real());
-
-      scratch[6].real(scratch[10].imag() * ya.imag() +
-                      scratch[9].imag() * yb.imag());
-      scratch[6].imag(
-          -(scratch[10].real() * ya.imag() + scratch[9].real() * yb.imag()));
-
-      *Fout1 = scratch[5] - scratch[6];
-      *Fout4 = scratch[5] + scratch[6];
-
-      scratch[11].real(scratch[0].real() + scratch[7].real() * yb.real() +
-                       scratch[8].real() * ya.real());
-      scratch[11].imag(scratch[0].imag() + scratch[7].imag() * yb.real() +
-                       scratch[8].imag() * ya.real());
-      scratch[12].real(scratch[9].imag() * ya.imag() -
-                       scratch[10].imag() * yb.imag());
-      scratch[12].imag(scratch[10].real() * yb.imag() -
-                       scratch[9].real() * ya.imag());
-
-      *Fout2 = scratch[11] + scratch[12];
-      *Fout3 = scratch[11] - scratch[12];
-
-      ++Fout0;
-      ++Fout1;
-      ++Fout2;
-      ++Fout3;
-      ++Fout4;
-    }
-  }
-}
-
-void compute_bitrev_table(int base_index,
-                          const size_t stride,
-                          const int16_t* factors,
-                          const KissFft::KissFftState* st,
-                          const int16_t* bitrev_table_last,
-                          int16_t* bitrev_table) {
-  const int p = *factors++;  // The radix.
-  const int m = *factors++;  // Stage's fft length/p.
-  if (m == 1) {
-    for (int j = 0; j < p; j++) {
-      assert(bitrev_table <= bitrev_table_last);
-      *bitrev_table = base_index + j;
-      bitrev_table += stride;
-    }
-  } else {
-    for (int j = 0; j < p; j++) {
-      compute_bitrev_table(base_index, stride * p, factors, st,
-                           bitrev_table_last, bitrev_table);
-      bitrev_table += stride;
-      base_index += m;
-    }
-  }
-}
-
-// Populates |facbuf| with p1, m1, p2, m2, ... where p[i] * m[i] = m[i-1] and
-// m0 = n.
-bool kf_factor(int n, int16_t* facbuf) {
-  assert(facbuf);
-  int p = 4;
-  int stages = 0;
-  int nbak = n;
-
-  // Factor out powers of 4, powers of 2, then any remaining primes.
-  do {
-    while (n % p) {
-      switch (p) {
-        case 4:
-          p = 2;
-          break;
-        case 2:
-          p = 3;
-          break;
-        default:
-          p += 2;
-          break;
-      }
-      if (p > 32000 || p * p > n)
-        p = n;  // No more factors, skip to end.
-    }
-    n /= p;
-    if (p > 5)
-      return false;
-    facbuf[2 * stages] = p;
-    if (p == 2 && stages > 1) {
-      facbuf[2 * stages] = 4;
-      facbuf[2] = 2;
-    }
-    stages++;
-  } while (n > 1);
-  n = nbak;
-  // Reverse the order to get the radix 4 at the end, so we can use the
-  // fast degenerate case. It turns out that reversing the order also
-  // improves the noise behavior.
-  for (int i = 0; i < stages / 2; i++)
-    std::swap(facbuf[2 * i], facbuf[2 * (stages - i - 1)]);
-  for (int i = 0; i < stages; i++) {
-    n /= facbuf[2 * i];
-    facbuf[2 * i + 1] = n;
-  }
-  return true;
-}
-
-void compute_twiddles(const int nfft, std::complex<float>* twiddles) {
-  constexpr double pi = 3.14159265358979323846264338327;
-  assert(twiddles);
-  for (int i = 0; i < nfft; ++i) {
-    const double phase = (-2 * pi / nfft) * i;
-    twiddles[i].real(std::cos(phase));
-    twiddles[i].imag(std::sin(phase));
-  }
-}
-
-void fft_impl(const KissFft::KissFftState* st, std::complex<float>* fout) {
-  assert(st);
-  assert(fout);
-  int m2, m;
-  int p;
-  int L;
-  int fstride[KissFft::kMaxFactors];
-
-  fstride[0] = 1;
-  L = 0;
-  do {
-    p = st->factors[2 * L];
-    m = st->factors[2 * L + 1];
-    assert(static_cast<size_t>(L + 1) < KissFft::kMaxFactors);
-    fstride[L + 1] = fstride[L] * p;
-    L++;
-  } while (m != 1);
-  m = st->factors[2 * L - 1];
-  for (int i = L - 1; i >= 0; i--) {
-    if (i != 0)
-      m2 = st->factors[2 * i - 1];
-    else
-      m2 = 1;
-    switch (st->factors[2 * i]) {
-      case 2:
-        kf_bfly2(fout, m, fstride[i]);
-        break;
-      case 4:
-        kf_bfly4(fout, fstride[i], st, m, fstride[i], m2);
-        break;
-      case 3:
-        kf_bfly3(fout, fstride[i], st, m, fstride[i], m2);
-        break;
-      case 5:
-        kf_bfly5(fout, fstride[i], st, m, fstride[i], m2);
-        break;
-      default:
-        assert(0);
-        break;
-    }
-    m = m2;
-  }
-}
-
-}  // namespace
-
-KissFft::KissFftState::KissFftState(int num_fft_points)
-    : nfft(num_fft_points), scale(1.f / nfft) {
-  // Factorize |nfft|.
-  // TODO(alessiob): Handle kf_factor fails (invalid nfft).
-  if (!kf_factor(nfft, factors.data()))
-    assert(0);
-  // Twiddles.
-  twiddles.resize(nfft);
-  compute_twiddles(nfft, twiddles.data());
-  // Bit-reverse table.
-  bitrev.resize(nfft);
-  compute_bitrev_table(0, 1, factors.data(), this, &bitrev.back(),
-                       bitrev.data());
-}
-
-KissFft::KissFftState::~KissFftState() = default;
-
-KissFft::KissFft(const int nfft) : state_(nfft) {}
-
-KissFft::~KissFft() = default;
-
-void KissFft::ForwardFft(const size_t in_size,
-                         const std::complex<float>* in,
-                         const size_t out_size,
-                         std::complex<float>* out) {
-  assert(in);
-  assert(out);
-  assert(in != out);  // In-place FFT not supported.
-  assert(state_.nfft == static_cast<int>(in_size));
-  assert(state_.nfft == static_cast<int>(out_size));
-  // Bit-reverse the input.
-  for (int i = 0; i < state_.nfft; i++)
-    out[state_.bitrev[i]] = state_.scale * in[i];
-  fft_impl(&state_, out);
-}
-
-void KissFft::ReverseFft(const size_t in_size,
-                         const std::complex<float>* in,
-                         const size_t out_size,
-                         std::complex<float>* out) {
-  assert(in);
-  assert(out);
-  assert(in != out);  // In-place IFFT not supported.
-  assert(state_.nfft == static_cast<int>(in_size));
-  assert(state_.nfft == static_cast<int>(out_size));
-  // Bit-reverse the input.
-  for (int i = 0; i < state_.nfft; i++)
-    out[state_.bitrev[i]] = in[i];
-  for (int i = 0; i < state_.nfft; i++)
-    out[i].imag(-out[i].imag());
-  fft_impl(&state_, out);
-  for (int i = 0; i < state_.nfft; i++)
-    out[i].imag(-out[i].imag());
-}
-
-}  // namespace rnnoise
diff --git a/submodules/libtgvoip/webrtc_dsp/third_party/rnnoise/src/kiss_fft.h b/submodules/libtgvoip/webrtc_dsp/third_party/rnnoise/src/kiss_fft.h
deleted file mode 100644
index b90f77d1ae..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/third_party/rnnoise/src/kiss_fft.h
+++ /dev/null
@@ -1,78 +0,0 @@
-/*Copyright (c) 2003-2004, Mark Borgerding
-  Lots of modifications by Jean-Marc Valin
-  Copyright (c) 2005-2007, Xiph.Org Foundation
-  Copyright (c) 2008,      Xiph.Org Foundation, CSIRO
-  Copyright (c) 2018,      The WebRTC project authors
-
-  All rights reserved.
-
-  Redistribution and use in source and binary forms, with or without
-   modification, are permitted provided that the following conditions are met:
-
-    * Redistributions of source code must retain the above copyright notice,
-       this list of conditions and the following disclaimer.
-    * Redistributions in binary form must reproduce the above copyright notice,
-       this list of conditions and the following disclaimer in the
-       documentation and/or other materials provided with the distribution.
-
-  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-  AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-  IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-  ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-  LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-  SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-  INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-  CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-  ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-  POSSIBILITY OF SUCH DAMAGE.*/
-
-#ifndef THIRD_PARTY_RNNOISE_SRC_KISS_FFT_H_
-#define THIRD_PARTY_RNNOISE_SRC_KISS_FFT_H_
-
-#include <array>
-#include <complex>
-#include <vector>
-
-namespace rnnoise {
-
-class KissFft {
- public:
-  // Example: an FFT of length 128 has 4 factors as far as kissfft is concerned
-  // (namely, 4*4*4*2).
-  static const size_t kMaxFactors = 8;
-
-  class KissFftState {
-   public:
-    KissFftState(int num_fft_points);
-    KissFftState(const KissFftState&) = delete;
-    KissFftState& operator=(const KissFftState&) = delete;
-    ~KissFftState();
-
-    const int nfft;
-    const float scale;
-    std::array<int16_t, 2 * kMaxFactors> factors;
-    std::vector<int16_t> bitrev;
-    std::vector<std::complex<float>> twiddles;
-  };
-
-  explicit KissFft(const int nfft);
-  KissFft(const KissFft&) = delete;
-  KissFft& operator=(const KissFft&) = delete;
-  ~KissFft();
-  void ForwardFft(const size_t in_size,
-                  const std::complex<float>* in,
-                  const size_t out_size,
-                  std::complex<float>* out);
-  void ReverseFft(const size_t in_size,
-                  const std::complex<float>* in,
-                  const size_t out_size,
-                  std::complex<float>* out);
-
- private:
-  KissFftState state_;
-};
-
-}  // namespace rnnoise
-
-#endif  // THIRD_PARTY_RNNOISE_SRC_KISS_FFT_H_
diff --git a/submodules/libtgvoip/webrtc_dsp/third_party/rnnoise/src/rnn_activations.h b/submodules/libtgvoip/webrtc_dsp/third_party/rnnoise/src/rnn_activations.h
deleted file mode 100644
index af81031996..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/third_party/rnnoise/src/rnn_activations.h
+++ /dev/null
@@ -1,102 +0,0 @@
-/* Copyright (c) 2008-2011 Octasic Inc.
-                 2012-2017 Jean-Marc Valin */
-/*
-   Redistribution and use in source and binary forms, with or without
-   modification, are permitted provided that the following conditions
-   are met:
-
-   - Redistributions of source code must retain the above copyright
-   notice, this list of conditions and the following disclaimer.
-
-   - Redistributions in binary form must reproduce the above copyright
-   notice, this list of conditions and the following disclaimer in the
-   documentation and/or other materials provided with the distribution.
-
-   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-   ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-   A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR
-   CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-   EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-   PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-   PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-   LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-   SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-
-#ifndef THIRD_PARTY_RNNOISE_SRC_RNN_ACTIVATIONS_H_
-#define THIRD_PARTY_RNNOISE_SRC_RNN_ACTIVATIONS_H_
-
-#include <cmath>
-
-namespace rnnoise {
-
-inline float TansigApproximated(float x) {
-  static constexpr float kTansigTable[201] = {
-      0.000000f, 0.039979f, 0.079830f, 0.119427f, 0.158649f, 0.197375f,
-      0.235496f, 0.272905f, 0.309507f, 0.345214f, 0.379949f, 0.413644f,
-      0.446244f, 0.477700f, 0.507977f, 0.537050f, 0.564900f, 0.591519f,
-      0.616909f, 0.641077f, 0.664037f, 0.685809f, 0.706419f, 0.725897f,
-      0.744277f, 0.761594f, 0.777888f, 0.793199f, 0.807569f, 0.821040f,
-      0.833655f, 0.845456f, 0.856485f, 0.866784f, 0.876393f, 0.885352f,
-      0.893698f, 0.901468f, 0.908698f, 0.915420f, 0.921669f, 0.927473f,
-      0.932862f, 0.937863f, 0.942503f, 0.946806f, 0.950795f, 0.954492f,
-      0.957917f, 0.961090f, 0.964028f, 0.966747f, 0.969265f, 0.971594f,
-      0.973749f, 0.975743f, 0.977587f, 0.979293f, 0.980869f, 0.982327f,
-      0.983675f, 0.984921f, 0.986072f, 0.987136f, 0.988119f, 0.989027f,
-      0.989867f, 0.990642f, 0.991359f, 0.992020f, 0.992631f, 0.993196f,
-      0.993718f, 0.994199f, 0.994644f, 0.995055f, 0.995434f, 0.995784f,
-      0.996108f, 0.996407f, 0.996682f, 0.996937f, 0.997172f, 0.997389f,
-      0.997590f, 0.997775f, 0.997946f, 0.998104f, 0.998249f, 0.998384f,
-      0.998508f, 0.998623f, 0.998728f, 0.998826f, 0.998916f, 0.999000f,
-      0.999076f, 0.999147f, 0.999213f, 0.999273f, 0.999329f, 0.999381f,
-      0.999428f, 0.999472f, 0.999513f, 0.999550f, 0.999585f, 0.999617f,
-      0.999646f, 0.999673f, 0.999699f, 0.999722f, 0.999743f, 0.999763f,
-      0.999781f, 0.999798f, 0.999813f, 0.999828f, 0.999841f, 0.999853f,
-      0.999865f, 0.999875f, 0.999885f, 0.999893f, 0.999902f, 0.999909f,
-      0.999916f, 0.999923f, 0.999929f, 0.999934f, 0.999939f, 0.999944f,
-      0.999948f, 0.999952f, 0.999956f, 0.999959f, 0.999962f, 0.999965f,
-      0.999968f, 0.999970f, 0.999973f, 0.999975f, 0.999977f, 0.999978f,
-      0.999980f, 0.999982f, 0.999983f, 0.999984f, 0.999986f, 0.999987f,
-      0.999988f, 0.999989f, 0.999990f, 0.999990f, 0.999991f, 0.999992f,
-      0.999992f, 0.999993f, 0.999994f, 0.999994f, 0.999994f, 0.999995f,
-      0.999995f, 0.999996f, 0.999996f, 0.999996f, 0.999997f, 0.999997f,
-      0.999997f, 0.999997f, 0.999997f, 0.999998f, 0.999998f, 0.999998f,
-      0.999998f, 0.999998f, 0.999998f, 0.999999f, 0.999999f, 0.999999f,
-      0.999999f, 0.999999f, 0.999999f, 0.999999f, 0.999999f, 0.999999f,
-      0.999999f, 0.999999f, 0.999999f, 0.999999f, 1.000000f, 1.000000f,
-      1.000000f, 1.000000f, 1.000000f, 1.000000f, 1.000000f, 1.000000f,
-      1.000000f, 1.000000f, 1.000000f,
-  };
-
-  // Tests are reversed to catch NaNs.
-  if (!(x < 8.f))
-    return 1.f;
-  if (!(x > -8.f))
-    return -1.f;
-  float sign = 1.f;
-  if (x < 0.f) {
-    x = -x;
-    sign = -1.f;
-  }
-  // Look-up.
-  int i = static_cast<int>(std::floor(0.5f + 25 * x));
-  float y = kTansigTable[i];
-  // Map i back to x's scale (undo 25 factor).
-  x -= 0.04f * i;
-  y = y + x * (1.f - y * y) * (1.f - y * x);
-  return sign * y;
-}
-
-inline float SigmoidApproximated(const float x) {
-  return 0.5f + 0.5f * TansigApproximated(0.5f * x);
-}
-
-inline float RectifiedLinearUnit(const float x) {
-  return x < 0.f ? 0.f : x;
-}
-
-}  // namespace rnnoise
-
-#endif  // THIRD_PARTY_RNNOISE_SRC_RNN_ACTIVATIONS_H_
diff --git a/submodules/libtgvoip/webrtc_dsp/third_party/rnnoise/src/rnn_vad_weights.cc b/submodules/libtgvoip/webrtc_dsp/third_party/rnnoise/src/rnn_vad_weights.cc
deleted file mode 100644
index 40c184b98b..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/third_party/rnnoise/src/rnn_vad_weights.cc
+++ /dev/null
@@ -1,401 +0,0 @@
-#include "third_party/rnnoise/src/rnn_vad_weights.h"
-
-namespace rnnoise {
-
-const int8_t kInputDenseWeights[kInputLayerWeights] = {
-    -10,  0,    -3,   1,    -8,   -6,   3,    -13,  1,    0,    -3,   -7,
-    -5,   -3,   6,    -1,   -6,   0,    -6,   -4,   -1,   -2,   1,    1,
-    -7,   2,    21,   10,   -5,   -20,  24,   23,   37,   8,    -2,   33,
-    -6,   22,   13,   -2,   50,   8,    13,   1,    -15,  30,   -10,  30,
-    0,    3,    5,    27,   1,    4,    -3,   41,   56,   35,   -2,   49,
-    -13,  11,   13,   -2,   -47,  5,    -16,  -60,  -15,  77,   -17,  26,
-    -3,   14,   -21,  19,   -5,   -19,  -13,  0,    10,   14,   9,    31,
-    -13,  -41,  -10,  4,    22,   18,   -48,  -6,   -10,  62,   -3,   -18,
-    -14,  12,   26,   -28,  3,    14,   25,   -13,  -19,  6,    5,    36,
-    -3,   -65,  -12,  0,    31,   -7,   -9,   101,  -4,   26,   16,   17,
-    -12,  -12,  14,   -36,  -3,   5,    -15,  21,   2,    30,   -3,   38,
-    -4,   1,    -6,   7,    -7,   14,   38,   -22,  -30,  -3,   -7,   3,
-    -39,  -70,  -126, 25,   34,   94,   -67,  -22,  -33,  83,   -47,  -118,
-    4,    70,   33,   25,   62,   -128, -76,  -118, -113, 49,   -12,  -100,
-    -18,  -114, -33,  43,   32,   61,   40,   -9,   -106, 2,    36,   -100,
-    -40,  -5,   20,   -75,  61,   -51,  -9,   126,  -27,  -52,  5,    -24,
-    -21,  -126, -114, -12,  15,   106,  -2,   73,   -125, 50,   13,   -120,
-    35,   35,   4,    -61,  29,   -124, 6,    -53,  -69,  -125, 64,   -89,
-    36,   -107, -103, -7,   27,   121,  69,   77,   -35,  35,   95,   -125,
-    -49,  97,   -45,  -43,  -23,  23,   -28,  -65,  -118, 2,    8,    -126,
-    27,   -97,  92,   5,    55,   82,   17,   -57,  -115, 37,   8,    -106,
-    -46,  41,   -2,   21,   -44,  8,    -73,  -58,  -39,  34,   89,   -95,
-    95,   -117, 120,  -58,  31,   123,  1,    -32,  -109, -110, 60,   -120,
-    -43,  -74,  5,    91,   26,   21,   114,  82,   -83,  -126, 123,  22,
-    -16,  -67,  25,   -83,  46,   48,   -34,  -121, -124, -63,  -35,  -9,
-    31,   82,   123,  6,    -3,   117,  93,   -2,   -13,  -36,  124,  -112,
-    -6,   -102, -5,   -33,  -15,  44,   -69,  -127, -23,  -40,  -34,  -85,
-    68,   83,   -1,   40,   8,    84,   118,  -58,  -55,  -102, 123,  -55,
-    -14,  -123, 44,   -63,  -14,  21,   35,   16,   24,   -126, -13,  -114,
-    35,   20,   -36,  61,   -9,   97,   34,   19,   -32,  -109, 76,   -104,
-    99,   -119, 45,   -125, -51,  -28,  -8,   -69,  -8,   125,  -45,  -93,
-    113,  103,  -41,  -82,  52,   7,    126,  0,    -40,  104,  55,   -58,
-    17,   -124, -93,  -58,  8,    -45,  1,    56,   -123, 108,  -47,  -23,
-    115,  127,  17,   -68,  -13,  116,  -82,  -44,  45,   67,   -120, -101,
-    -15,  -125, 120,  -113, 17,   -48,  -73,  126,  -64,  -86,  -118, -19,
-    112,  -1,   -66,  -27,  -62,  121,  -86,  -58,  50,   89,   -38,  -75,
-    95,   -111, 12,   -113, 2,    -68,  2,    -94,  -121, 91,   -5,   0,
-    79,   43,   -7,   -18,  79,   35,   -38,  47,   1,    -45,  83,   -50,
-    102,  32,   55,   -96,  15,   -122, -69,  45,   -27,  91,   -62,  -30,
-    46,   -95,  22,   -72,  -97,  -1,   14,   -122, 28,   127,  61,   -126,
-    121,  9,    68,   -120, 49,   -60,  90,   3,    43,   68,   54,   34,
-    -10,  28,   21,   -24,  -54,  22,   -113, -12,  82,   -2,   -17,  -9,
-    127,  8,    116,  -92,  0,    -70,  -33,  123,  66,   116,  -74,  -4,
-    74,   -72,  -22,  -47,  1,    -83,  -60,  -124, 1,    122,  -57,  -43,
-    49,   40,   -126, -128, -8,   -29,  28,   -24,  -123, -121, -70,  -93,
-    -37,  -126, 11,   -125, -37,  11,   -31,  -51,  -124, 116,  -128, 8,
-    -25,  109,  75,   -12,  7,    8,    10,   117,  124,  -128, -128, 29,
-    -26,  101,  21,   -128, 87,   8,    -39,  23,   -128, 127,  -127, 74,
-    -55,  74,   112,  127,  4,    55,   44,   -92,  123,  34,   -93,  47,
-    -21,  -92,  17,   49,   -121, 92,   7,    -126, -125, 124,  -74,  3,
-    -59,  18,   -91,  3,    -9,   9,    56,   116,  7,    -29,  33,   87,
-    -21,  -128, -13,  57,   74,   9,    -29,  -61,  -97,  -21,  -95,  -12,
-    -114, 16,   82,   125,  -7,   10,   -24,  9,    77,   -128, -102, -25,
-    3,    -126, 10,   13,   -18,  51,   26,   127,  -79,  35,   51,   12,
-    -50,  -24,  1,    -7,   22,   81,   65,   120,  -30,  -38,  85,   122,
-    -4,   -106, -11,  27,   53,   41,   8,    -104, -66,  -38,  -124, 10,
-    12,   76,   117,  -109, 9,    11,   2,    -18,  3,    113,  -16,  -79,
-    -39,  -123, -20,  -128, 2,    13,   -33,  -58,  10,   84,   -104, 13,
-    64,   109,  1,    54,   -12,  28,   24,   63,   -126, 118,  -82,  46,
-    -12,  -15,  14,   -43,  60,   22,   -32,  -19,  -46,  91,   -107, 24,
-    -94,  26,   -47,  125,  6,    58,   -15,  -75,  -26,  -38,  -35,  103,
-    -16,  -17,  -13,  63,   -2,   45,   -45,  -73,  -23,  70,   -87,  51,
-    -17,  53,   76,   14,   -18,  -31,  -14,  103,  8,    21,   -28,  -33,
-    -20,  -47,  6,    39,   40,   -30,  7,    -76,  55,   31,   -20,  -21,
-    -59,  1,    25,   -11,  17,   5,    -13,  -39,  0,    -76,  50,   -33,
-    -29,  -50,  -16,  -11,  -12,  -1,   -46,  40,   -10,  65,   -19,  21,
-    -41,  -32,  -83,  -19,  -4,   49,   -60,  118,  -24,  -46,  9,    102,
-    -20,  8,    -19,  25,   31,   -3,   -37,  0,    25,   7,    29,   2,
-    -39,  127,  -64,  -20,  64,   115,  -30,  36,   100,  35,   122,  127,
-    127,  -127, 127,  -127, 19,   127,  -89,  -79,  -32,  39,   -127, 125,
-    -80,  126,  -127, 26,   8,    98,   -8,   -57,  -90,  -50,  126,  61,
-    127,  -126, 40,   -106, -68,  104,  -125, -119, 11,   10,   -127, 66,
-    -56,  -12,  -126, -104, 27,   75,   38,   -124, -126, -125, 84,   -123,
-    -45,  -114, -128, 127,  103,  -101, -124, 127,  -11,  -23,  -123, 92,
-    -123, 24,   126,  41,   -2,   -39,  -27,  -94,  40,   -112, -48,  127,
-    58,   14,   38,   -75,  -64,  73,   117,  100,  -119, -11,  6,    32,
-    -126, -14,  35,   121,  -10,  54,   -60,  89,   -3,   69,   -25,  -20,
-    43,   -86,  -34,  24,   27,   7,    -81,  -99,  -23,  -16,  -26,  13,
-    35,   -97,  80,   -29,  -13,  -121, -12,  -65,  -94,  70,   -89,  -126,
-    -95,  88,   33,   96,   29,   -90,  69,   114,  -78,  65,   90,   -47,
-    -47,  89,   1,    -12,  3,    8,    30,   5,    2,    -30,  -1,   6,
-    -7,   10,   -4,   46,   -27,  -40,  22,   -6,   -17,  45,   24,   -9,
-    23,   -14,  -63,  -26,  -12,  -57,  27,   25,   55,   -76,  -47,  21,
-    34,   33,   26,   17,   14,   6,    9,    26,   25,   -25,  -25,  -18};
-
-const int8_t kInputDenseBias[kInputLayerOutputSize] = {
-    38,  -6,  127,  127, 127,  -43, -127, 78,  127, 5,   127, 123,
-    127, 127, -128, -76, -126, 28,  127,  125, -30, 127, -89, -20};
-
-const int8_t kHiddenGruWeights[kHiddenLayerWeights] = {
-    -124, 23,   -123, -33,  -95,  -4,   8,    -84,  4,    101,  -119, 116,
-    -4,   123,  103,  -51,  29,   -124, -114, -49,  31,   9,    75,   -128,
-    0,    -49,  37,   -50,  46,   -21,  -63,  -104, 54,   82,   33,   21,
-    70,   127,  -9,   -79,  -39,  -23,  -127, 107,  122,  -96,  -46,  -18,
-    -39,  13,   -28,  -48,  14,   56,   -52,  49,   -1,   -121, 25,   -18,
-    -36,  -52,  -57,  -30,  54,   -124, -26,  -47,  10,   39,   12,   2,
-    9,    -127, -128, 102,  21,   11,   -64,  -71,  89,   -113, -111, 54,
-    31,   94,   121,  -40,  30,   40,   -109, 73,   -9,   108,  -92,  2,
-    -127, 116,  127,  127,  -122, 95,   127,  -37,  -127, 28,   89,   10,
-    24,   -104, -62,  -67,  -14,  38,   14,   -71,  22,   -41,  20,   -50,
-    39,   63,   86,   127,  -18,  79,   4,    -51,  2,    33,   117,  -113,
-    -78,  56,   -91,  37,   34,   -45,  -44,  -22,  21,   -16,  56,   30,
-    -84,  -79,  38,   -74,  127,  9,    -25,  2,    82,   61,   25,   -26,
-    26,   11,   117,  -65,  12,   -58,  42,   -62,  -93,  11,   11,   124,
-    -123, 80,   -125, 11,   -90,  42,   94,   4,    -109, -1,   85,   -52,
-    45,   -26,  -27,  77,   -5,   30,   90,   0,    95,   -7,   53,   29,
-    -82,  22,   -9,   74,   2,    -12,  -73,  114,  97,   -64,  122,  -77,
-    43,   91,   86,   126,  106,  72,   90,   -43,  46,   96,   -51,  21,
-    22,   68,   22,   41,   79,   75,   -46,  -105, 23,   -116, 127,  -123,
-    102,  57,   85,   10,   -29,  34,   125,  126,  124,  81,   -15,  54,
-    96,   -128, 39,   -124, 103,  74,   126,  127,  -50,  -71,  -122, -64,
-    93,   -75,  71,   105,  122,  123,  126,  122,  -127, 33,   -63,  -74,
-    124,  -71,  33,   41,   -56,  19,   6,    65,   41,   90,   -116, -3,
-    -46,  75,   -13,  98,   -74,  -42,  74,   -95,  -96,  81,   24,   32,
-    -19,  -123, 74,   55,   109,  115,  0,    32,   33,   12,   -20,  9,
-    127,  127,  -61,  79,   -48,  -54,  -49,  101,  -9,   27,   -106, 74,
-    119,  77,   87,   -126, -24,  127,  124,  31,   34,   127,  40,   3,
-    -90,  127,  23,   57,   -53,  127,  -69,  -88,  -33,  127,  19,   -46,
-    -9,   -125, 13,   -126, -113, 127,  -41,  46,   106,  -62,  3,    -10,
-    111,  49,   -34,  -24,  -20,  -112, 11,   101,  -50,  -34,  50,   65,
-    -64,  -106, 70,   -48,  60,   9,    -122, -45,  15,   -112, -26,  -4,
-    1,    39,   23,   58,   -45,  -80,  127,  82,   58,   30,   -94,  -119,
-    51,   -89,  95,   -107, 30,   127,  125,  58,   -52,  -42,  -38,  -20,
-    -122, 115,  39,   -26,  5,    73,   13,   -39,  43,   -23,  -20,  -125,
-    23,   35,   53,   -61,  -66,  72,   -20,  33,   8,    35,   4,    7,
-    18,   19,   16,   -45,  -50,  -71,  31,   -29,  -41,  -27,  10,   14,
-    27,   9,    -23,  98,   6,    -94,  92,   127,  -114, 59,   -26,  -100,
-    -62,  -127, -17,  -85,  -60,  126,  -42,  -6,   33,   -120, -26,  -126,
-    -127, -35,  -114, -31,  25,   -126, -100, -126, -64,  -46,  -31,  30,
-    25,   -74,  -111, -97,  -81,  -104, -114, -19,  -9,   -116, -69,  22,
-    30,   59,   8,    -51,  16,   -97,  18,   -4,   -89,  80,   -50,  3,
-    36,   -67,  56,   69,   -26,  107,  -10,  58,   -28,  -4,   -57,  -72,
-    -111, 0,    -75,  -119, 14,   -75,  -49,  -66,  -49,  8,    -121, 22,
-    -54,  121,  30,   54,   -26,  -126, -123, 56,   5,    48,   21,   -127,
-    -11,  23,   25,   -82,  6,    -25,  119,  78,   4,    -104, 27,   61,
-    -48,  37,   -13,  -52,  50,   -50,  44,   -1,   -22,  -43,  -59,  -78,
-    -67,  -32,  -26,  9,    -3,   40,   16,   19,   3,    -9,   20,   -6,
-    -37,  28,   39,   17,   -19,  -10,  1,    6,    -59,  74,   47,   3,
-    -119, 0,    -128, -107, -25,  -22,  -69,  -23,  -111, -42,  -93,  -120,
-    90,   -85,  -54,  -118, 76,   -79,  124,  101,  -77,  -75,  -17,  -71,
-    -114, 68,   55,   79,   -1,   -123, -20,  127,  -65,  -123, -128, -87,
-    123,  9,    -115, -14,  7,    -4,   127,  -79,  -115, 125,  -28,  89,
-    -83,  49,   89,   119,  -69,  -5,   12,   -49,  60,   57,   -24,  -99,
-    -110, 76,   -83,  125,  73,   81,   11,   8,    -45,  1,    83,   13,
-    -70,  -2,   97,   112,  -97,  53,   -9,   -94,  124,  44,   -49,  -24,
-    52,   76,   -110, -70,  -114, -12,  72,   -4,   -114, 43,   -43,  81,
-    102,  -84,  -27,  62,   -40,  52,   58,   124,  -35,  -51,  -123, -43,
-    56,   -75,  -34,  -35,  -106, 93,   -43,  14,   -16,  46,   62,   -97,
-    21,   30,   -53,  21,   -11,  -33,  -20,  -95,  4,    -126, 12,   45,
-    20,   108,  85,   11,   20,   -40,  99,   4,    -25,  -18,  -23,  -12,
-    -126, -55,  -20,  -44,  -51,  91,   -127, 127,  -44,  7,    127,  78,
-    38,   125,  -6,   -94,  -103, 73,   126,  -126, 18,   59,   -46,  106,
-    76,   116,  -31,  75,   -4,   92,   102,  32,   -31,  73,   42,   -21,
-    -28,  57,   127,  -8,   -107, 115,  124,  -94,  -4,   -128, 29,   -57,
-    70,   -82,  50,   -13,  -44,  38,   67,   -93,  6,    -39,  -46,  56,
-    68,   27,   61,   26,   18,   -72,  127,  22,   18,   -31,  127,  61,
-    -65,  -38,  1,    -67,  -1,   8,    -73,  46,   -116, -94,  58,   -49,
-    71,   -40,  -63,  -82,  -20,  -60,  93,   76,   69,   -106, 34,   -31,
-    4,    -25,  107,  -18,  45,   4,    -61,  126,  54,   -126, -125, 41,
-    19,   44,   32,   -98,  125,  -24,  125,  -96,  -125, 15,   87,   -4,
-    -90,  18,   -40,  28,   -69,  67,   22,   41,   39,   7,    -48,  -44,
-    12,   69,   -13,  2,    44,   -38,  111,  -7,   -126, -22,  -9,   74,
-    -128, -36,  -7,   -123, -15,  -79,  -91,  -37,  -127, -122, 104,  30,
-    7,    98,   -37,  111,  -116, -47,  127,  -45,  118,  -111, -123, -120,
-    -77,  -64,  -125, 124,  77,   111,  77,   18,   -113, 117,  -9,   67,
-    -77,  126,  49,   -20,  -124, 39,   41,   -124, -34,  114,  -87,  -126,
-    98,   -20,  59,   -17,  -24,  125,  107,  54,   35,   33,   -44,  12,
-    -29,  125,  -71,  -28,  -63,  -114, 28,   -17,  121,  -36,  127,  89,
-    -122, -49,  -18,  -48,  17,   24,   19,   -64,  -128, 13,   86,   45,
-    13,   -49,  55,   84,   48,   80,   -39,  99,   -127, 70,   -33,  30,
-    50,   126,  -65,  -117, -13,  -20,  -24,  127,  115,  -72,  -104, 63,
-    126,  -42,  57,   17,   46,   21,   119,  110,  -100, -60,  -112, 62,
-    -33,  28,   26,   -22,  -60,  -33,  -54,  78,   25,   32,   -114, 86,
-    44,   26,   43,   76,   121,  19,   97,   -2,   -3,   -73,  -68,  6,
-    -116, 6,    -43,  -97,  46,   -128, -120, -31,  -119, -29,  16,   16,
-    -126, -128, -126, -46,  -9,   -3,   92,   -31,  -76,  -126, -3,   -107,
-    -12,  -23,  -69,  5,    51,   27,   -42,  23,   -70,  -128, -29,  22,
-    29,   -126, -55,  50,   -71,  -3,   127,  44,   -27,  -70,  -63,  -66,
-    -70,  104,  86,   115,  29,   -92,  41,   -90,  44,   -11,  -28,  20,
-    -11,  -63,  -16,  43,   31,   17,   -73,  -31,  -1,   -17,  -11,  -39,
-    56,   18,   124,  72,   -14,  28,   69,   -121, -125, 34,   127,  63,
-    86,   -80,  -126, -125, -124, -47,  124,  77,   124,  -19,  23,   -7,
-    -50,  96,   -128, -93,  102,  -53,  -36,  -87,  119,  -125, 92,   -126,
-    118,  102,  72,   -2,   125,  10,   97,   124,  -125, 125,  71,   -20,
-    -47,  -116, -121, -4,   -9,   -32,  79,   -124, -36,  33,   -128, -74,
-    125,  23,   127,  -29,  -115, -32,  124,  -89,  32,   -107, 43,   -17,
-    24,   24,   18,   29,   -13,  -15,  -36,  62,   -91,  4,    -41,  95,
-    28,   -23,  6,    46,   84,   66,   77,   68,   -70,  -1,   -23,  -6,
-    65,   70,   -21,  9,    77,   -12,  2,    -118, 4,    9,    -108, 84,
-    52,   2,    52,   13,   -10,  58,   -110, 18,   66,   -95,  -23,  70,
-    31,   -3,   56,   56,   -3,   -7,   1,    -27,  -48,  -61,  41,   -4,
-    10,   -62,  32,   -7,   -24,  9,    -48,  -60,  -4,   79,   -20,  -38,
-    -76,  68,   -49,  -97,  0,    -15,  5,    -100, -49,  -95,  -99,  -115,
-    -9,   -40,  10,   104,  13,   56,   127,  -27,  -109, -94,  -118, -102,
-    -44,  -85,  52,   127,  -4,   14,   62,   121,  -122, -26,  -79,  -42,
-    -34,  1,    25,   -38,  -79,  -58,  -31,  -31,  -90,  -30,  -123, 32,
-    -56,  125,  66,   124,  -1,   3,    91,   -103, -7,   23,   78,   -18,
-    9,    69,   -69,  76,   -38,  -33,  -2,   -98,  18,   106,  84,   55,
-    87,   -47,  35,   -124, 64,   41,   -14,  46,   25,   -2,   120,  -21,
-    82,   19,   -79,  -37,  -3,   -8,   -16,  21,   19,   -5,   -28,  -112,
-    39,   -6,   -30,  53,   -69,  53,   46,   127,  123,  78,   20,   28,
-    -7,   73,   72,   17,   -40,  41,   111,  57,   32,   -95,  29,   28,
-    -39,  -65,  54,   -20,  -63,  29,   -67,  3,    44,   -57,  -47,  11,
-    61,   -22,  -44,  61,   48,   -100, 20,   125,  96,   -24,  -16,  3,
-    -69,  -126, 74,   -125, 9,    45,   -67,  -123, -59,  -72,  118,  69,
-    45,   50,   -57,  67,   13,   -66,  -106, 47,   62,   22,   -1,   -22,
-    -25,  -40,  -125, 3,    125,  32,   102,  -56,  -25,  -75,  -30,  122,
-    60,   -13,  36,   -73,  7,    -84,  124,  40,   -118, 17,   -87,  -118,
-    -8,   3,    -27,  111,  -40,  40,   -51,  127,  125,  -45,  -30,  -54,
-    46,   80,   -1,   -30,  101,  -17,  18,   26,   54,   7,    -12,  1,
-    -127, 123,  -122, -27,  -75,  64,   10,   25,   -15,  -44,  127,  -127,
-    5,    -84,  -81,  -7,   19,   -26,  126,  15,   116,  -126, 14,   -76,
-    44,   62,   -110, -124, 125,  -29,  -87,  -3,   -69,  82,   90,   57,
-    -123, 123,  100,  -19,  -51,  -32,  69,   37,   -57,  -128, -124, -72,
-    -13,  51,   -7,   -45,  -73,  5,    99,   -26,  -117, -96,  -109, 4,
-    -31,  -12,  0,    31,   -42,  -27,  12,   -81,  118,  39,   83,   14,
-    41,   -126, 107,  -82,  94,   -116, -122, -47,  -109, -84,  -128, -35,
-    -56,  66,   8,    -65,  19,   42,   -46,  -72,  -109, 41,   43,   -127,
-    -113, 58,   127,  42,   -75,  -1,   65,   117,  -55,  -113, -123, 124,
-    43,   -96,  -115, -19,  68,   15,   94,   3,    75,   0,    34,   9,
-    42,   110,  -48,  92,   -76,  99,   -17,  27,   32,   13,   125,  50,
-    -17,  56,   4,    53,   34,   -8,   99,   80,   -126, -21,  -65,  -11,
-    -46,  44,   -81,  -3,   -121, 123,  66,   -81,  -84,  119,  127,  84,
-    105,  45,   -66,  -42,  -23,  32,   -25,  12,   111,  127,  88,   125,
-    30,   24,   -127, -9,   -54,  127,  -116, -119, 88,   70,   94,   -120,
-    35,   -93,  15,   22,   -21,  25,   -110, -123, -45,  8,    -109, 125,
-    -122, -86,  -126, 8,    -14,  -120, -45,  -45,  69,   -125, -122, 6,
-    81,   86,   125,  95,   54,   77,   54,   -123, 126,  -85,  -117, 56,
-    11,   0,    -61,  -91,  -12,  -2,   -113, -3,   -15,  -122, -63,  -91,
-    10,   84,   -111, 125,  93,   21,   62,   -78,  -116, 13,   -57,  28,
-    -124, 126,  110,  12,   15,   95,   15,   -19,  -125, -97,  52,   -7,
-    101,  9,    20,   -125, -26,  -56,  72,   77,   12,   -126, 22,   -29,
-    47,   62,   95,   112,  69,   32,   97,   -83,  -8,   -5,   67,   -63,
-    -123, 79,   59,   0,    -6,   -17,  4,    -111, -52,  27,   65,   0};
-
-const int8_t kHiddenGruRecurrentWeights[kHiddenLayerWeights] = {
-    65,   83,   35,   56,   24,   -34,  -28,  -2,   125,  19,   42,   -9,
-    124,  -53,  24,   -87,  11,   35,   -81,  -35,  -125, -31,  123,  -21,
-    33,   -91,  113,  -93,  45,   -6,   53,   38,   -92,  8,    -27,  87,
-    4,    43,   43,   10,   -128, -128, -46,  127,  -38,  -45,  25,   -87,
-    19,   5,    52,   -96,  -23,  -29,  121,  -126, -24,  -20,  -2,   69,
-    -50,  6,    71,   -81,  -125, 90,   -94,  1,    -38,  36,   89,   17,
-    -60,  71,   -48,  18,   -15,  44,   -18,  59,   11,   114,  -51,  32,
-    110,  1,    4,    109,  -24,  127,  27,   60,   88,   24,   45,   -59,
-    75,   -36,  8,    57,   -32,  -25,  13,   126,  -89,  -61,  -76,  127,
-    18,   -62,  -68,  23,   -113, 5,    126,  43,   -88,  26,   -78,  18,
-    75,   21,   9,    -74,  20,   41,   126,  -118, -15,  9,    116,  126,
-    -127, 34,   -6,   126,  -128, -53,  -54,  -55,  -121, 70,   127,  -12,
-    -68,  82,   -25,  104,  -126, 126,  -21,  -26,  124,  -75,  -127, -120,
-    13,   61,   -64,  -108, -63,  -65,  -44,  -35,  -61,  -39,  109,  -74,
-    113,  -3,   108,  -30,  125,  120,  39,   125,  -128, -95,  -99,  111,
-    9,    25,   114,  -75,  -92,  -54,  -12,  -32,  -38,  10,   31,   10,
-    63,   51,   40,   -99,  74,   4,    50,   -128, -36,  -35,  -11,  -28,
-    -126, -7,   66,   -58,  -126, -22,  -83,  -61,  -127, 49,   126,  -8,
-    7,    62,   36,   -11,  -32,  -44,  63,   116,  41,   65,   -127, 126,
-    63,   -30,  -96,  74,   -92,  127,  38,   -18,  -128, 68,   -5,   101,
-    -4,   85,   58,   79,   0,    -58,  8,    119,  -70,  -1,   -79,  -68,
-    114,  -28,  -90,  -6,   -112, 2,    127,  -8,   10,   55,   -59,  -126,
-    127,  125,  80,   72,   35,   -54,  95,   -124, -124, 79,   23,   -46,
-    -61,  -127, -100, 99,   -77,  8,    -87,  5,    -2,   49,   85,   7,
-    -71,  82,   53,   -41,  22,   -22,  -93,  -103, 6,    52,   -56,  14,
-    -8,   -111, 85,   16,   54,   32,   -118, -24,  61,   -53,  96,   -70,
-    -5,   -17,  -67,  -84,  -7,   -82,  -107, -96,  21,   -83,  -58,  50,
-    12,   -126, -1,   -28,  34,   -126, 115,  17,   91,   1,    -127, 72,
-    11,   126,  -81,  6,    96,   -8,   77,   15,   -6,   63,   -27,  20,
-    -123, -109, 85,   -79,  -17,  126,  -92,  2,    -61,  20,   14,   17,
-    121,  123,  30,   57,   120,  127,  57,   42,   117,  98,   67,   39,
-    -20,  -70,  100,  7,    125,  122,  40,   16,   -79,  125,  83,   41,
-    -106, -57,  24,   55,   27,   -66,  -111, -44,  -7,   -43,  -66,  121,
-    42,   -128, -45,  35,   15,   -127, 34,   -35,  -34,  -40,  -18,  -6,
-    63,   111,  31,   116,  127,  19,   24,   -71,  -39,  34,   11,   19,
-    -40,  27,   12,   106,  -10,  56,   -82,  -106, -2,   -50,  -52,  114,
-    -126, -34,  -43,  -68,  10,   76,   57,   -118, -128, 37,   -104, 76,
-    125,  3,    -76,  127,  -29,  84,   -94,  -15,  55,   125,  79,   127,
-    -57,  -125, 104,  -68,  126,  126,  -77,  51,   45,   33,   -109, 115,
-    -11,  1,    95,   -121, -5,   -9,   -126, -114, 39,   68,   -126, -107,
-    -51,  -42,  24,   -8,   51,   -27,  -43,  66,   -45,  62,   -98,  -109,
-    69,   67,   0,    -125, -128, 49,   31,   126,  -122, 2,    -55,  -67,
-    -126, -70,  -128, -125, -77,  25,   16,   -8,   -102, 11,   -75,  82,
-    38,   -5,   5,    19,   34,   47,   -127, -93,  21,   24,   -97,  -18,
-    31,   39,   34,   -20,  22,   123,  7,    -77,  -81,  -46,  -9,   1,
-    23,   39,   -127, -43,  -8,   -50,  10,   -21,  59,   -9,   -4,   -13,
-    -27,  44,   127,  52,   -47,  70,   -43,  52,   101,  -49,  27,   45,
-    49,   33,   -125, 55,   114,  20,   -1,   76,   -24,  -96,  105,  24,
-    126,  75,   -21,  -105, 13,   -42,  40,   126,  -30,  -39,  -95,  125,
-    -63,  11,   6,    125,  125,  -14,  5,    42,   -61,  -4,   49,   88,
-    6,    -107, -28,  19,   -29,  47,   126,  6,    -46,  -89,  -18,  91,
-    -20,  -6,   118,  -21,  -22,  39,   115,  11,   -42,  54,   73,   -55,
-    -77,  62,   -27,  -59,  -99,  -12,  -127, -40,  56,   -3,   -124, -91,
-    71,   -111, 6,    -19,  82,   -24,  -35,  102,  -42,  7,    -126, -126,
-    -125, 18,   98,   -52,  127,  105,  -52,  40,   -83,  126,  -122, 109,
-    5,    127,  48,   6,    5,    -125, 100,  -16,  29,   85,   -89,  8,
-    4,    41,   62,   -127, 62,   122,  85,   122,  -107, 8,    -125, 93,
-    -127, 127,  102,  19,   19,   -66,  41,   -42,  114,  127,  -48,  -117,
-    -29,  -6,   -73,  -102, -3,   -19,  0,    88,   42,   87,   -117, -20,
-    2,    122,  28,   63,   71,   66,   120,  93,   124,  -43,  49,   103,
-    31,   90,   -91,  -22,  -126, 26,   -24,  -21,  51,   -126, 87,   -103,
-    -69,  -10,  -66,  -23,  20,   97,   36,   25,   -127, 30,   -20,  -63,
-    30,   51,   -116, 23,   40,   -39,  36,   -83,  -77,  -25,  -50,  110,
-    14,   13,   -109, 125,  -65,  -55,  -87,  124,  -126, -32,  -72,  -108,
-    127,  127,  -125, -124, 61,   121,  102,  -128, -127, 16,   100,  127,
-    -124, -68,  72,   -93,  -128, 43,   -93,  -19,  -125, -97,  -113, -33,
-    83,   127,  -44,  127,  -75,  127,  16,   44,   50,   -122, 23,   118,
-    46,   19,   26,   -128, 10,   4,    99,   -14,  -82,  -13,  30,   125,
-    57,   65,   60,   -71,  35,   98,   28,   7,    1,    43,   89,   70,
-    75,   121,  -59,  82,   -126, -53,  -16,  -116, -65,  52,   -52,  0,
-    80,   35,   45,   -61,  46,   8,    107,  27,   -26,  -118, 90,   57,
-    -10,  7,    -15,  0,    -39,  -4,   12,   29,   -1,   116,  84,   79,
-    119,  125,  -59,  28,   -6,   -25,  -43,  2,    90,   79,   67,   103,
-    -82,  2,    -6,   125,  19,   73,   0,    -105, 112,  -17,  104,  107,
-    124,  106,  19,   56,   -44,  55,   -112, 6,    -39,  -83,  126,  -93,
-    -98,  57,   -120, -23,  -38,  2,    -31,  -48,  106,  127,  127,  69,
-    16,   110,  71,   104,  62,   -12,  -22,  42,   -37,  -94,  34,   -1,
-    -32,  -12,  -124, -47,  -13,  60,   -75,  -66,  58,   -127, -2,   64,
-    76,   -106, 73,   -49,  -31,  127,  126,  31,   16,   127,  -110, 107,
-    -16,  -53,  20,   69,   -14,  -125, 59,   -44,  15,   120,  125,  125,
-    43,   6,    19,   -58,  127,  127,  43,   16,   82,   97,   -127, 127,
-    -93,  -41,  88,   0,    77,   -15,  116,  16,   -124, -31,  -3,   95,
-    -40,  -126, -54,  -126, -83,  -8,   -59,  6,    67,   -29,  4,    124,
-    -10,  112,  -28,  -8,   85,   -21,  45,   84,   6,    -8,   11,   72,
-    32,   84,   -62,  77,   2,    -36,  75,   31,   -50,  116,  126,  119,
-    -88,  -55,  -14,  -37,  126,  40,   -108, -6,   -6,   57,   64,   -28,
-    -76,  30,   -117, -93,  31,   -92,  -44,  -64,  94,   58,   65,   114,
-    41,   47,   71,   42,   -26,  99,   -126, 57,   -5,   74,   -19,  -113,
-    -1,   67,   -21,  126,  1,    -3,   33,   60,   -82,  37,   -48,  89,
-    114,  -38,  127,  -114, 35,   58,   -5,   21,   -46,  121,  -123, -43,
-    127,  115,  123,  122,  -101, 126,  127,  81,   52,   89,   -127, 102,
-    42,   117,  -9,   -2,   125,  127,  110,  96,   120,  66,   70,   124,
-    55,   84,   -38,  -58,  119,  -127, -16,  -79,  123,  18,   -127, -50,
-    -38,  120,  -85,  1,    7,    -56,  108,  -77,  -2,   21,   37,   1,
-    13,   -105, -69,  28,   -87,  33,   -104, -51,  126,  41,   3,    -121,
-    28,   71,   58,   86,   -8,   127,  94,   -55,  125,  40,   -19,  127,
-    -33,  -87,  -23,  7,    -111, -68,  9,    84,   -119, 55,   -82,  78,
-    -37,  -20,  -9,   -23,  53,   -13,  15,   -46,  116,  126,  -127, 56,
-    -126, 125,  -7,   -1,   45,   26,   125,  121,  29,   47,   -86,  30,
-    10,   76,   -125, -7,   23,   92,   -12,  -39,  -18,  92,   -97,  -8,
-    -85,  -41,  49,   -50,  123,  -37,  -126, -30,  14,   79,   -49,  -65,
-    9,    -36,  -38,  -96,  85,   -24,  -13,  37,   -25,  -5,   -64,  -127,
-    55,   -60,  -18,  -61,  -63,  127,  56,   67,   15,   124,  72,   120,
-    127,  40,   -10,  114,  24,   -23,  46,   78,   -53,  125,  86,   124,
-    86,   0,    38,   93,   21,   127,  123,  75,   -72,  13,   48,   33,
-    83,   -51,  15,   -32,  -49,  -33,  120,  64,   7,    9,    65,   60,
-    21,   -21,  -61,  -53,  -113, 84,   -97,  101,  37,   -114, -27,  41,
-    73,   126,  -10,  59,   61,   -15,  70,   -13,  82,   -4,   69,   56,
-    94,   -91,  -50,  92,   -74,  -48,  53,   -7,   -107, 127,  28,   30,
-    -26,  -21,  -61,  77,   82,   64,   -91,  -125, 122,  -104, 127,  123,
-    122,  123,  76,   -126, 127,  -6,   -80,  7,    40,   -66,  -65,  54,
-    -2,   23,   96,   -64,  74,   2,    -53,  -12,  -123, 39,   60,   -20,
-    16,   -17,  -97,  23,   -4,   -53,  -122, 32,   -16,  -54,  -95,  43,
-    71,   -1,   -67,  -33,  41,   18,   72,   28,   -83,  31,   -100, -91,
-    -27,  10,   -128, -106, 2,    76,   -13,  42,   34,   112,  -19,  44,
-    40,   -9,   -11,  65,   92,   -43,  -125, 2,    47,   -32,  25,   122,
-    -29,  12,   101,  -8,   -126, -23,  43,   7,    125,  -20,  -124, 82,
-    -2,   13,   -73,  -106, 115,  31,   116,  -23,  -44,  -71,  84,   3,
-    47,   91,   127,  127,  -15,  95,   7,    93,   5,    113,  -50,  54,
-    11,   13,   -127, 17,   72,   43,   -23,  5,    -70,  20,   15,   -27,
-    99,   69,   -109, -122, -94,  16,   127,  0,    116,  104,  45,   108,
-    -34,  87,   72,   -14,  118,  46,   42,   109,  -26,  95,   93,   127,
-    60,   127,  -93,  -54,  -122, 34,   -105, 56,   55,   103,  125,  -71,
-    -50,  95,   -72,  127,  107,  21,   73,   126,  61,   127,  127,  24,
-    -62,  90,   73,   90,   -46,  -78,  -124, 72,   123,  -42,  50,   -107,
-    17,   -32,  -62,  -89,  124,  1,    80,   -2,   117,  119,  -65,  -127,
-    -95,  -121, -52,  103,  66,   75,   -3,   -62,  -127, 127,  -74,  124,
-    79,   49,   40,   105,  -67,  -71,  -70,  43,   127,  119,  -4,   66,
-    43,   23,   91,   -126, 15,   63,   -119, 112,  103,  15,   -99,  31,
-    -127, 69,   116,  -46,  -67,  2,    -126, -29,  30,   30,   -69,  -98,
-    -47,  -87,  -70,  -127, 23,   -73,  30,   -7,   94,   -52,  -65,  98,
-    -45,  97,   53,   23,   -9,   -22,  -52,  -47,  6,    -1,   -85,  -15,
-    -61,  -14,  68,   110,  -10,  -121, -25,  -35,  -15,  -94,  -123, 27,
-    75,   48,   -66,  -56,  -44,  93,   109,  67,   -36,  24,   70,   -126,
-    8,    -127, 126,  52,   11,   -32,  120,  -13,  -26,  -28,  -125, 127,
-    106,  -50,  124,  36,   -126, -12,  0,    -23,  76,   -71,  -126, -12,
-    -17,  -82,  12,   124,  57,   33,   4,    77,   -46,  71,   -34,  72,
-    125,  -128, 124,  -24,  -128, 75,   -120, 69,   -45,  55,   33,   127,
-    -33,  4,    -105, -41,  -59,  -91,  123,  44,   -127, 127,  -67,  52,
-    25,   -125, -65,  100,  -25,  123,  6,    11,   -123, -92,  -33,  126,
-    -17,  -4,   29,   33,   127,  96,   3,    87,   -48,  -18,  -70,  123,
-    58,   -127, -3,   -52,  -1,   -36,  -41,  127,  51,   -52,  -27,  46,
-    -83,  57,   9,    126,  127,  94,   79,   -37,  -127, -40,  67,   52,
-    82,   -66,  122,  -13,  -73,  127,  -8,   -80,  46,   -48,  4,    -54};
-
-const int8_t kHiddenGruBias[kHiddenLayerBiases] = {
-    124, 125, -57, -126, 53,  123, 127,  -75, 68,  102, -2, 116,
-    124, 127, 124, 125,  126, 123, -16,  48,  125, 126, 78, 85,
-    11,  126, -30, -30,  -64, -3,  -105, -29, -17, 69,  63, 2,
-    -32, -10, -62, 113,  -52, 112, -109, 112, 7,   -40, 73, 53,
-    62,  6,   -2,  0,    0,   100, -16,  26,  -24, 56,  26, -10,
-    -33, 41,  70,  109,  -29, 127, 34,   -66, 49,  53,  27, 62};
-
-const int8_t kOutputDenseWeights[kOutputLayerWeights] = {
-    127,  127,  127, 127,  127,  20,  127,  -126, -126, -54, 14,  125,
-    -126, -126, 127, -125, -126, 127, -127, -127, -57,  -30, 127, 80};
-
-const int8_t kOutputDenseBias[kOutputLayerOutputSize] = {-50};
-
-}  // namespace rnnoise
diff --git a/submodules/libtgvoip/webrtc_dsp/third_party/rnnoise/src/rnn_vad_weights.h b/submodules/libtgvoip/webrtc_dsp/third_party/rnnoise/src/rnn_vad_weights.h
deleted file mode 100644
index d55e33ddad..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/third_party/rnnoise/src/rnn_vad_weights.h
+++ /dev/null
@@ -1,37 +0,0 @@
-#ifndef THIRD_PARTY_RNNOISE_SRC_RNN_VAD_WEIGHTS_H_
-#define THIRD_PARTY_RNNOISE_SRC_RNN_VAD_WEIGHTS_H_
-
-#include <cstdint>
-#include <cstring>
-
-namespace rnnoise {
-
-// Weights scaling factor.
-const float kWeightsScale = 1.f / 256.f;
-
-// Input layer (dense).
-const size_t kInputLayerInputSize = 42;
-const size_t kInputLayerOutputSize = 24;
-const size_t kInputLayerWeights = kInputLayerInputSize * kInputLayerOutputSize;
-extern const int8_t kInputDenseWeights[kInputLayerWeights];
-extern const int8_t kInputDenseBias[kInputLayerOutputSize];
-
-// Hidden layer (GRU).
-const size_t kHiddenLayerOutputSize = 24;
-const size_t kHiddenLayerWeights =
-    3 * kInputLayerOutputSize * kHiddenLayerOutputSize;
-const size_t kHiddenLayerBiases = 3 * kHiddenLayerOutputSize;
-extern const int8_t kHiddenGruWeights[kHiddenLayerWeights];
-extern const int8_t kHiddenGruRecurrentWeights[kHiddenLayerWeights];
-extern const int8_t kHiddenGruBias[kHiddenLayerBiases];
-
-// Output layer (dense).
-const size_t kOutputLayerOutputSize = 1;
-const size_t kOutputLayerWeights =
-    kHiddenLayerOutputSize * kOutputLayerOutputSize;
-extern const int8_t kOutputDenseWeights[kOutputLayerWeights];
-extern const int8_t kOutputDenseBias[kOutputLayerOutputSize];
-
-}  // namespace rnnoise
-
-#endif  // THIRD_PARTY_RNNOISE_SRC_RNN_VAD_WEIGHTS_H_
diff --git a/submodules/libtgvoip/webrtc_dsp/typedefs.h b/submodules/libtgvoip/webrtc_dsp/typedefs.h
deleted file mode 100644
index d6ce35ec7a..0000000000
--- a/submodules/libtgvoip/webrtc_dsp/typedefs.h
+++ /dev/null
@@ -1,137 +0,0 @@
-/*
- *  Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-// This file contains platform-specific typedefs and defines.
-// Much of it is derived from Chromium's build/build_config.h.
-
-#ifndef WEBRTC_TYPEDEFS_H_
-#define WEBRTC_TYPEDEFS_H_
-
-// Processor architecture detection.  For more info on what's defined, see:
-//   http://msdn.microsoft.com/en-us/library/b0084kay.aspx
-//   http://www.agner.org/optimize/calling_conventions.pdf
-//   or with gcc, run: "echo | gcc -E -dM -"
-#if defined(_M_X64) || defined(__x86_64__)
-#define WEBRTC_ARCH_X86_FAMILY
-#define WEBRTC_ARCH_X86_64
-#define WEBRTC_ARCH_64_BITS
-#define WEBRTC_ARCH_LITTLE_ENDIAN
-#elif defined(__aarch64__)
-#define WEBRTC_ARCH_ARM_FAMILY
-#define WEBRTC_ARCH_64_BITS
-#define WEBRTC_ARCH_LITTLE_ENDIAN
-#elif defined(_M_IX86) || defined(__i386__)
-#define WEBRTC_ARCH_X86_FAMILY
-#define WEBRTC_ARCH_X86
-#define WEBRTC_ARCH_32_BITS
-#define WEBRTC_ARCH_LITTLE_ENDIAN
-#elif defined(__ARMEL__) || defined(_M_ARM)
-#define WEBRTC_ARCH_ARM_FAMILY
-#define WEBRTC_ARCH_32_BITS
-#define WEBRTC_ARCH_LITTLE_ENDIAN
-#elif defined(__MIPSEL__)
-#define WEBRTC_ARCH_MIPS_FAMILY
-#if defined(__LP64__)
-#define WEBRTC_ARCH_64_BITS
-#else
-#define WEBRTC_ARCH_32_BITS
-#endif
-#define WEBRTC_ARCH_LITTLE_ENDIAN
-#elif defined(__pnacl__)
-#define WEBRTC_ARCH_32_BITS
-#define WEBRTC_ARCH_LITTLE_ENDIAN
-#elif defined(__powerpc64__)
-#if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
-#define WEBRTC_ARCH_LITTLE_ENDIAN
-#else
-#define WEBRTC_ARCH_BIG_ENDIAN
-#endif
-#define WEBRTC_ARCH_64_BITS
-#elif defined(__powerpc__)
-#define WEBRTC_ARCH_BIG_ENDIAN
-#define WEBRTC_ARCH_32_BITS
-#else
-/* instead of failing, use typical unix defines... */
-#if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
-#define WEBRTC_ARCH_LITTLE_ENDIAN
-#elif __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
-#define WEBRTC_ARCH_BIG_ENDIAN
-#else
-#error __BYTE_ORDER__ is not defined
-#endif
-#if defined(__LP64__)
-#define WEBRTC_ARCH_64_BITS
-#else
-#define WEBRTC_ARCH_32_BITS
-#endif
-#endif
-
-#if !(defined(WEBRTC_ARCH_LITTLE_ENDIAN) ^ defined(WEBRTC_ARCH_BIG_ENDIAN))
-#error Define either WEBRTC_ARCH_LITTLE_ENDIAN or WEBRTC_ARCH_BIG_ENDIAN
-#endif
-
-// TODO(zhongwei.yao): WEBRTC_CPU_DETECTION is only used in one place; we should
-// probably just remove it.
-#if (defined(WEBRTC_ARCH_X86_FAMILY) && !defined(__SSE2__))
-#define WEBRTC_CPU_DETECTION
-#endif
-
-// TODO(pbos): Use webrtc/base/basictypes.h instead to include fixed-size ints.
-#include <stdint.h>
-
-#if defined(_MSC_VER) && _MSC_VER<=1800 && !defined(__cplusplus)
-#define inline __inline
-#endif
-
-// Annotate a function indicating the caller must examine the return value.
-// Use like:
-//   int foo() WARN_UNUSED_RESULT;
-// To explicitly ignore a result, see |ignore_result()| in <base/macros.h>.
-// TODO(ajm): Hack to avoid multiple definitions until the base/ of webrtc and
-// libjingle are merged.
-#if !defined(WARN_UNUSED_RESULT)
-#if defined(__GNUC__) || defined(__clang__)
-#define WARN_UNUSED_RESULT __attribute__ ((__warn_unused_result__))
-#else
-#define WARN_UNUSED_RESULT
-#endif
-#endif  // WARN_UNUSED_RESULT
-
-// Put after a variable that might not be used, to prevent compiler warnings:
-//   int result ATTRIBUTE_UNUSED = DoSomething();
-//   assert(result == 17);
-#ifndef ATTRIBUTE_UNUSED
-#if defined(__GNUC__) || defined(__clang__)
-#define ATTRIBUTE_UNUSED __attribute__ ((__unused__))
-#else
-#define ATTRIBUTE_UNUSED
-#endif
-#endif
-
-// Macro to be used for switch-case fallthrough (required for enabling
-// -Wimplicit-fallthrough warning on Clang).
-#ifndef FALLTHROUGH
-#if defined(__clang__)
-#define FALLTHROUGH() [[clang::fallthrough]]
-#else
-#define FALLTHROUGH() do { } while (0)
-#endif
-#endif
-
-// Annotate a function that will not return control flow to the caller.
-#if defined(_MSC_VER)
-#define NO_RETURN __declspec(noreturn)
-#elif defined(__GNUC__)
-#define NO_RETURN __attribute__ ((__noreturn__))
-#else
-#define NO_RETURN
-#endif
-
-#endif  // WEBRTC_TYPEDEFS_H_
diff --git a/submodules/lottie-ios/BUCK b/submodules/lottie-ios/BUCK
index 91f6530fad..18430670c3 100644
--- a/submodules/lottie-ios/BUCK
+++ b/submodules/lottie-ios/BUCK
@@ -1,15 +1,19 @@
 load("//Config:buck_rule_macros.bzl", "static_library")
 
+private_headers = glob([
+    "lottie-ios/**/*.h",
+], exclude = [
+    "lottie-ios/Classes/PublicHeaders/**/*.h",
+])
+
 static_library(
     name = "Lottie",
     srcs = glob([
         "lottie-ios/**/*.m",
     ]),
-    headers = glob([
-    	"lottie-ios/**/*.h",
-    ]),
+    headers = private_headers,
 	exported_headers = glob([
-    	"lottie-ios/Classes/PublicHeaders/*.h",
+        "lottie-ios/Classes/PublicHeaders/**/*.h",
     ]),
     deps = [
     ],
diff --git a/submodules/lottie-ios/BUILD b/submodules/lottie-ios/BUILD
new file mode 100644
index 0000000000..9d59ea6e57
--- /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 = [
+        "-I{}/{}".format(package_name(), directory) for directory in unique_directories(private_headers)
+    ] + [
+        "-I{}/lottie-ios/Classes/PublicHeaders/Lottie".format(package_name()),
+    ],
+    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/openssl/BUCK b/submodules/openssl/BUCK
index 8e26f2d2fa..dc53d924ab 100644
--- a/submodules/openssl/BUCK
+++ b/submodules/openssl/BUCK
@@ -115,11 +115,11 @@ rules = [
     genrule(
         name = "openssl_build_" + arch,
         srcs = glob([
-            "build-openssl.sh",
+            "build-openssl-buck.sh",
             "*.tar.gz",
             "*.patch",
         ]),
-        bash = "sh $SRCDIR/build-openssl.sh $OUT $SRCDIR " + arch,
+        bash = "sh $SRCDIR/build-openssl-buck.sh $OUT $SRCDIR " + arch,
         out = "openssl_" + arch,
         visibility = [
             "//submodules/openssl:...",
diff --git a/submodules/openssl/BUILD b/submodules/openssl/BUILD
new file mode 100644
index 0000000000..955faeca8d
--- /dev/null
+++ b/submodules/openssl/BUILD
@@ -0,0 +1,179 @@
+openssl_headers = [
+    "aes.h",
+    "asn1.h",
+    "asn1_mac.h",
+    "asn1err.h",
+    "asn1t.h",
+    "async.h",
+    "asyncerr.h",
+    "bio.h",
+    "bioerr.h",
+    "blowfish.h",
+    "bn.h",
+    "bnerr.h",
+    "buffer.h",
+    "buffererr.h",
+    "camellia.h",
+    "cast.h",
+    "cmac.h",
+    "cms.h",
+    "cmserr.h",
+    "comp.h",
+    "comperr.h",
+    "conf.h",
+    "conf_api.h",
+    "conferr.h",
+    "crypto.h",
+    "cryptoerr.h",
+    "ct.h",
+    "cterr.h",
+    "des.h",
+    "dh.h",
+    "dherr.h",
+    "dsa.h",
+    "dsaerr.h",
+    "dtls1.h",
+    "e_os2.h",
+    "ebcdic.h",
+    "ec.h",
+    "ecdh.h",
+    "ecdsa.h",
+    "ecerr.h",
+    "engine.h",
+    "engineerr.h",
+    "err.h",
+    "evp.h",
+    "evperr.h",
+    "hmac.h",
+    "idea.h",
+    "kdf.h",
+    "kdferr.h",
+    "lhash.h",
+    "md2.h",
+    "md4.h",
+    "md5.h",
+    "mdc2.h",
+    "modes.h",
+    "obj_mac.h",
+    "objects.h",
+    "objectserr.h",
+    "ocsp.h",
+    "ocsperr.h",
+    "opensslconf.h",
+    "opensslv.h",
+    "ossl_typ.h",
+    "pem.h",
+    "pem2.h",
+    "pemerr.h",
+    "pkcs12.h",
+    "pkcs12err.h",
+    "pkcs7.h",
+    "pkcs7err.h",
+    "rand.h",
+    "rand_drbg.h",
+    "randerr.h",
+    "rc2.h",
+    "rc4.h",
+    "rc5.h",
+    "ripemd.h",
+    "rsa.h",
+    "rsaerr.h",
+    "safestack.h",
+    "seed.h",
+    "sha.h",
+    "srp.h",
+    "srtp.h",
+    "ssl.h",
+    "ssl2.h",
+    "ssl3.h",
+    "sslerr.h",
+    "stack.h",
+    "store.h",
+    "storeerr.h",
+    "symhacks.h",
+    "tls1.h",
+    "ts.h",
+    "tserr.h",
+    "txt_db.h",
+    "ui.h",
+    "uierr.h",
+    "whrlpool.h",
+    "x509.h",
+    "x509_vfy.h",
+    "x509err.h",
+    "x509v3.h",
+    "x509v3err.h",
+]
+
+openssl_libs = [
+    "libcrypto.a",
+]
+
+genrule(
+    name = "openssl_build",
+    srcs = [
+        "build-openssl-bazel.sh",
+        "openssl-1.1.1d.tar.gz",
+        "patch-conf.patch",
+        "patch-include.patch",
+    ],
+    cmd_bash =
+        """
+        if [ "$(TARGET_CPU)" == "ios_armv7" ]; then
+            BUILD_ARCH="armv7"
+        elif [ "$(TARGET_CPU)" == "ios_arm64" ]; then
+            BUILD_ARCH="arm64"
+        elif [ "$(TARGET_CPU)" == "ios_x86_64" ]; then
+            BUILD_ARCH="x86_64"
+        else
+            echo "Unsupported architecture $(TARGET_CPU)"
+        fi
+        BUILD_DIR="$(RULEDIR)/$$BUILD_ARCH"
+        rm -rf "$$BUILD_DIR"
+        mkdir -p "$$BUILD_DIR"
+        """ + "\n" +
+        "mkdir -p $$BUILD_DIR" + "\n" +
+        "cp $(SRCS) $$BUILD_DIR/" + "\n" +
+        "sh $$BUILD_DIR/build-openssl-bazel.sh $$BUILD_DIR $$BUILD_DIR $$BUILD_ARCH" + "\n" +
+        "\n".join([
+            "cp \"$$BUILD_DIR/build/$$BUILD_ARCH/include/openssl/{}\" \"$(location :{})\"\n".format(x, x) for x in openssl_headers
+        ]) +
+        "\n".join([
+            "cp \"$$BUILD_DIR/build/$$BUILD_ARCH/lib/{}\" \"$(location :{})\"\n".format(x, x) for x in openssl_libs
+        ]),
+    outs = openssl_headers + openssl_libs,
+    visibility = [
+        "//visibility:public",
+    ]
+)
+
+genrule(
+    name = "openssl_include",
+    srcs = [":" + x for x in openssl_headers],
+    outs = ["Public/openssl/" + x for x in openssl_headers],
+    cmd_bash = " && ".join(["cp $(location :{}) $(location Public/openssl/{})".format(x, x) for x in openssl_headers]),
+    visibility = [
+        "//visibility:public",
+    ],
+)
+
+cc_library(
+    name = "openssl_lib",
+    srcs = [":" + x for x in openssl_libs],
+)
+
+objc_library(
+    name = "openssl",
+    module_name = "openssl",
+    enable_modules = True,
+    hdrs = ["Public/openssl/" + x for x in openssl_headers],
+    includes = [
+        "Public",
+    ],
+    deps = [
+        ":openssl_lib",
+    ],
+    visibility = [
+        "//visibility:public",
+    ]
+)
diff --git a/submodules/openssl/build-openssl-bazel.sh b/submodules/openssl/build-openssl-bazel.sh
new file mode 100644
index 0000000000..527b8bfe52
--- /dev/null
+++ b/submodules/openssl/build-openssl-bazel.sh
@@ -0,0 +1,203 @@
+#!/bin/bash
+
+set -x
+set -e
+
+OUT_DIR="$1"
+SRC_DIR="$2"
+ARCH="$3"
+
+if [ "$ARCH" != "arm64" ] && [ "$ARCH" != "armv7" ] && [ "$ARCH" != "x86_64" ]; then
+  echo "Invalid architecture $ARCH"
+  exit 1
+fi
+
+if [ -z "$OUT_DIR" ]; then
+  echo "Usage: sh build-openssl.sh OUT_DIR SRC_DIR ARCH"
+  exit 1
+fi
+
+if [ -z "$SRC_DIR" ]; then
+  echo "Usage: sh build-openssl.sh OUT_DIR SRC_DIR ARCH"
+  exit 1
+fi
+
+if [ ! -d "$SRC_DIR" ]; then
+  echo "$SRC_DIR does not exist"
+  exit 1
+fi
+
+mkdir -p "$OUT_DIR"
+
+TMP_DIR_NAME="build"
+TMP_DIR="$OUT_DIR/$TMP_DIR_NAME"
+ABS_TMP_DIR="$(pwd)/$TMP_DIR"
+rm -rf "$TMP_DIR"
+mkdir -p "$TMP_DIR"
+
+CROSS_TOP_SIM="`xcode-select --print-path`/Platforms/iPhoneSimulator.platform/Developer"
+CROSS_SDK_SIM="iPhoneSimulator.sdk"
+
+CROSS_TOP_IOS="`xcode-select --print-path`/Platforms/iPhoneOS.platform/Developer"
+CROSS_SDK_IOS="iPhoneOS.sdk"
+
+SOURCE_DIR="$OUT_DIR/openssl-1.1.1d"
+SOURCE_ARCHIVE="$SRC_DIR/openssl-1.1.1d.tar.gz"
+
+rm -rf "$SOURCE_DIR"
+
+tar -xzf "$SOURCE_ARCHIVE" --directory "$OUT_DIR"
+
+export CROSS_COMPILE=`xcode-select --print-path`/Toolchains/XcodeDefault.xctoolchain/usr/bin/
+
+function build_for ()
+{
+  DIR="$(pwd)"
+  cd "$SOURCE_DIR"
+
+  PLATFORM="$1"
+  ARCH="$2"
+  CROSS_TOP_ENV="CROSS_TOP_$3"
+  CROSS_SDK_ENV="CROSS_SDK_$3"
+
+  make clean
+
+  export CROSS_TOP="${!CROSS_TOP_ENV}"
+  export CROSS_SDK="${!CROSS_SDK_ENV}"
+
+  MINIMAL_FLAGS=(\
+    "no-shared" \
+    "no-afalgeng" \
+    "no-aria" \
+    "no-asan" \
+    "no-async" \
+    "no-autoalginit" \
+    "no-autoerrinit" \
+    "no-autoload-config" \
+    "no-bf" \
+    "no-blake2" \
+    "no-buildtest-c++" \
+    "no-camellia" \
+    "no-capieng" \
+    "no-cast" \
+    "no-chacha" \
+    "no-cmac" \
+    "no-cms" \
+    "no-comp" \
+    "no-crypto-mdebug" \
+    "no-crypto-mdebug-backtrace" \
+    "no-ct" \
+    "no-deprecated" \
+    "no-des" \
+    "no-devcryptoeng" \
+    "no-dgram" \
+    "no-dh" \
+    "no-dsa" \
+    "no-dtls" \
+    "no-dynamic-engine" \
+    "no-ec" \
+    "no-ec2m" \
+    "no-ecdh" \
+    "no-ecdsa" \
+    "no-ec_nistp_64_gcc_128" \
+    "no-egd" \
+    "no-engine" \
+    "no-err" \
+    "no-external-tests" \
+    "no-filenames" \
+    "no-fuzz-libfuzzer" \
+    "no-fuzz-afl" \
+    "no-gost" \
+    "no-heartbeats" \
+    "no-idea" \
+    "no-makedepend" \
+    "no-md2" \
+    "no-md4" \
+    "no-mdc2" \
+    "no-msan" \
+    "no-multiblock" \
+    "no-nextprotoneg" \
+    "no-pinshared" \
+    "no-ocb" \
+    "no-ocsp" \
+    "no-pic" \
+    "no-poly1305" \
+    "no-posix-io" \
+    "no-psk" \
+    "no-rc2" \
+    "no-rc4" \
+    "no-rc5" \
+    "no-rfc3779" \
+    "no-rmd160" \
+    "no-scrypt" \
+    "no-sctp" \
+    "no-shared" \
+    "no-siphash" \
+    "no-sm2" \
+    "no-sm3" \
+    "no-sm4" \
+    "no-sock" \
+    "no-srp" \
+    "no-srtp" \
+    "no-sse2" \
+    "no-ssl" \
+    "no-ssl-trace" \
+    "no-static-engine" \
+    "no-stdio" \
+    "no-tests" \
+    "no-tls" \
+    "no-ts" \
+    "no-ubsan" \
+    "no-ui-console" \
+    "no-unit-test" \
+    "no-whirlpool" \
+    "no-weak-ssl-ciphers" \
+    "no-zlib" \
+    "no-zlib-dynamic" \
+  )
+
+  DEFAULT_FLAGS=(\
+    "no-shared" \
+    "no-asm" \
+    "no-ssl3" \
+    "no-comp" \
+    "no-hw" \
+    "no-engine" \
+    "no-async" \
+    "no-tests" \
+  )
+
+  ./Configure $PLATFORM "-arch $ARCH" ${DEFAULT_FLAGS[@]} --prefix="${ABS_TMP_DIR}/${ARCH}" || exit 1
+  
+  make && make install_sw || exit 2
+  unset CROSS_TOP
+  unset CROSS_SDK
+
+  cd "$DIR"
+}
+
+patch "$SOURCE_DIR/Configurations/10-main.conf" < "$SRC_DIR/patch-conf.patch" || exit 1
+
+if [ "$ARCH" == "x86_64" ]; then
+  build_for ios64sim-cross x86_64 SIM || exit 2
+elif [ "$ARCH" == "armv7" ]; then
+  build_for ios-cross armv7 IOS || exit 4
+elif [ "$ARCH" == "arm64" ]; then
+  build_for ios64-cross arm64 IOS || exit 5
+else
+  echo "Invalid architecture $ARCH"
+  exit 1
+fi
+
+cp -r "${TMP_DIR}/$ARCH/include" "${TMP_DIR}/"
+if [ "$ARCH" == "arm64" ]; then
+  patch -p3 "${TMP_DIR}/include/openssl/opensslconf.h" < "$SRC_DIR/patch-include.patch" || exit 1
+fi
+
+DFT_DIST_DIR="$OUT_DIR/out"
+rm -rf "$DFT_DIST_DIR"
+mkdir -p "$DFT_DIST_DIR"
+
+DIST_DIR="${DIST_DIR:-$DFT_DIST_DIR}"
+mkdir -p "${DIST_DIR}"
+cp -r "${TMP_DIR}/include" "${TMP_DIR}/$ARCH/lib" "${DIST_DIR}"
\ No newline at end of file
diff --git a/submodules/openssl/build-openssl.sh b/submodules/openssl/build-openssl-buck.sh
similarity index 100%
rename from submodules/openssl/build-openssl.sh
rename to submodules/openssl/build-openssl-buck.sh
diff --git a/submodules/openssl/patch-include.patch b/submodules/openssl/patch-include.patch
index 3b177feac6..e4b46becaa 100644
--- a/submodules/openssl/patch-include.patch
+++ b/submodules/openssl/patch-include.patch
@@ -1,19 +1,19 @@
---- armv7s/include/openssl/opensslconf.h	2017-01-08 02:25:43.000000000 -0800
-+++ arm64/include/openssl/opensslconf.h	2017-01-08 03:44:44.000000000 -0800
-@@ -158,11 +158,21 @@
+--- opensslconf.h	2020-01-06 02:41:46.000000000 +0400
++++ opensslconf_updated.h	2020-01-06 02:51:12.000000000 +0400
+@@ -205,11 +205,21 @@
   * The following are cipher-specific, but are part of the public API.
   */
  #if !defined(OPENSSL_SYS_UEFI)
--# define BN_LLONG
+-# undef BN_LLONG
 +# ifdef __LP64__
 +#  undef BN_LLONG
 +# else
 +#  define BN_LLONG
 +# endif
  /* Only one for the following should be defined */
--# undef SIXTY_FOUR_BIT_LONG
+-# define SIXTY_FOUR_BIT_LONG
 -# undef SIXTY_FOUR_BIT
--# define THIRTY_TWO_BIT
+-# undef THIRTY_TWO_BIT
 +# ifdef __LP64__
 +#  define SIXTY_FOUR_BIT_LONG
 +#  undef SIXTY_FOUR_BIT
diff --git a/submodules/rlottie/BUCK b/submodules/rlottie/BUCK
index 74ee15a9df..c9a5e016b3 100644
--- a/submodules/rlottie/BUCK
+++ b/submodules/rlottie/BUCK
@@ -1,5 +1,9 @@
 load("//Config:buck_rule_macros.bzl", "static_library")
 
+public_headers = glob([
+    "PublicHeaders/**/*.h",
+])
+
 static_library(
     name = "RLottieBinding",
     srcs = glob([
@@ -20,12 +24,9 @@ static_library(
     ], exclude = [
         "rlottie/src/lottie/rapidjson/msinttypes/**/*",
     ]) + [
-        "LottieInstance.h",
         "config.h",
-    ],
-    exported_headers = [
-        "LottieInstance.h"
-    ],
+    ] + public_headers,
+    exported_headers = public_headers,
     frameworks = [
         "$SDKROOT/System/Library/Frameworks/Foundation.framework",
         "$SDKROOT/System/Library/Frameworks/UIKit.framework",
diff --git a/submodules/rlottie/BUILD b/submodules/rlottie/BUILD
new file mode 100644
index 0000000000..3e765bd718
--- /dev/null
+++ b/submodules/rlottie/BUILD
@@ -0,0 +1,36 @@
+
+objc_library(
+    name = "RLottieBinding",
+    module_name = "RLottieBinding",
+    enable_modules = True,
+    srcs = glob([
+        "rlottie/src/**/*.cpp",
+        "rlottie/src/**/*.h",
+        "rlottie/inc/**/*.h",
+    ], exclude = [
+        "rlottie/src/vector/vdrawhelper_neon.cpp",
+        "rlottie/src/vector/stb/**/*",
+        "rlottie/src/lottie/rapidjson/msinttypes/**/*",
+    ]) + [
+        "LottieInstance.mm",
+        "config.h",
+    ],
+    hdrs = glob([
+        "PublicHeaders/**/*.h",
+    ]),
+    includes = [
+        "PublicHeaders",
+    ],
+    copts = [
+        "-Dpixman_region_selfcheck(x)=1",
+        "-DLOTTIE_DISABLE_ARM_NEON=1",
+        "-I{}".format(package_name()),
+        "-I{}/rlottie/inc".format(package_name()),
+        "-I{}/rlottie/src/vector".format(package_name()),
+        "-I{}/rlottie/src/vector/pixman".format(package_name()),
+        "-I{}/rlottie/src/vector/freetype".format(package_name()),
+    ],
+    deps = [
+    ],
+    visibility = ["//visibility:public"],
+)
diff --git a/submodules/rlottie/LottieInstance.mm b/submodules/rlottie/LottieInstance.mm
index a5750c075a..86b43dc706 100755
--- a/submodules/rlottie/LottieInstance.mm
+++ b/submodules/rlottie/LottieInstance.mm
@@ -1,4 +1,4 @@
-#import "LottieInstance.h"
+#import <RLottieBinding/LottieInstance.h>
 
 #include "rlottie.h"
 
diff --git a/submodules/rlottie/LottieInstance.h b/submodules/rlottie/PublicHeaders/RLottieBinding/LottieInstance.h
similarity index 100%
rename from submodules/rlottie/LottieInstance.h
rename to submodules/rlottie/PublicHeaders/RLottieBinding/LottieInstance.h
diff --git a/submodules/sqlcipher/BUCK b/submodules/sqlcipher/BUCK
index 8bd14acfbf..8411d124e2 100644
--- a/submodules/sqlcipher/BUCK
+++ b/submodules/sqlcipher/BUCK
@@ -12,18 +12,12 @@ static_library(
     srcs = glob([
         "Sources/*.c",
     ]),
-    headers = [
-	    "Sources/sqlcipher_config.h",
-    	"Sources/sqlite3.h",
-		"Sources/sqlite3ext.h",
-    ],
-    exported_headers = [
-    	"Sources/sqlcipher_config.h",
-    	"Sources/sqlite3.h",
-		"Sources/sqlite3ext.h",
-    ],
-    deps = [
-    ],
+    headers = glob([
+	    "Sources/*.h",
+    ]),
+    exported_headers = glob([
+    	"PublicHeaders/**/*.h",
+    ]),
     frameworks = [
         "$SDKROOT/System/Library/Frameworks/Foundation.framework",
     ],
diff --git a/submodules/sqlcipher/BUILD b/submodules/sqlcipher/BUILD
new file mode 100644
index 0000000000..a0139f65b4
--- /dev/null
+++ b/submodules/sqlcipher/BUILD
@@ -0,0 +1,32 @@
+
+public_headers = glob([
+    "PublicHeaders/**/*.h",
+])
+
+objc_library(
+    name = "sqlcipher",
+    enable_modules = True,
+    module_name = "sqlcipher",
+    srcs = glob([
+        "Sources/*.c",
+        "Sources/*.h",
+    ], exclude = public_headers),
+    hdrs = public_headers,
+    includes = [
+        "PublicHeaders",
+    ],
+    copts = [
+        "-DDSQLITE_HAS_CODEC=1",
+        "-DSQLCIPHER_CRYPTO_CC=1",
+        "-DSQLITE_ENABLE_FTS5",
+        "-DSQLITE_DEFAULT_MEMSTATUS=0",
+        "-DNDEBUG",
+    ],
+    sdk_frameworks = [
+      "Foundation",
+      "Security",
+    ],
+    visibility = [
+        "//visibility:public",
+    ],
+)
diff --git a/submodules/sqlcipher/Info.plist b/submodules/sqlcipher/Info.plist
deleted file mode 100644
index e1fe4cfb7b..0000000000
--- a/submodules/sqlcipher/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/sqlcipher/Sources/sqlcipher_config.h b/submodules/sqlcipher/PublicHeaders/sqlcipher/sqlcipher_config.h
similarity index 100%
rename from submodules/sqlcipher/Sources/sqlcipher_config.h
rename to submodules/sqlcipher/PublicHeaders/sqlcipher/sqlcipher_config.h
diff --git a/submodules/sqlcipher/Sources/sqlite3.h b/submodules/sqlcipher/PublicHeaders/sqlcipher/sqlite3.h
similarity index 100%
rename from submodules/sqlcipher/Sources/sqlite3.h
rename to submodules/sqlcipher/PublicHeaders/sqlcipher/sqlite3.h
diff --git a/submodules/sqlcipher/Sources/sqlite3ext.h b/submodules/sqlcipher/PublicHeaders/sqlcipher/sqlite3ext.h
similarity index 100%
rename from submodules/sqlcipher/Sources/sqlite3ext.h
rename to submodules/sqlcipher/PublicHeaders/sqlcipher/sqlite3ext.h
diff --git a/submodules/ton/BUCK b/submodules/ton/BUCK
index 11b04572d7..5612efe985 100644
--- a/submodules/ton/BUCK
+++ b/submodules/ton/BUCK
@@ -42,14 +42,14 @@ ton_lib_flags = ["-l" + name for name in ton_lib_names]
 genrule(
     name = "ton_build",
     srcs = [
-        "build-ton.sh",
+        "build-ton-buck.sh",
         "tonlib-src",
-        "iOS.cmake"
+        "iOS-buck.cmake"
     ],
     bash =
 """
     export PATH=\"$PATH:$(location //third-party/cmake:cmake)/cmake-3.16.0/bin\"
-    sh $SRCDIR/build-ton.sh $OUT $SRCDIR $(location //submodules/openssl:openssl_build_merged)
+    sh $SRCDIR/build-ton-buck.sh $OUT $SRCDIR $(location //submodules/openssl:openssl_build_merged)
 """,
     out = "ton",
     visibility = [
diff --git a/submodules/ton/BUILD b/submodules/ton/BUILD
new file mode 100644
index 0000000000..6085a72621
--- /dev/null
+++ b/submodules/ton/BUILD
@@ -0,0 +1,131 @@
+ton_headers = [
+    "auto/tl/tonlib_api.h",
+    "tl/TlObject.h",
+    "tonlib/tonlib_client_json.h",
+    "tonlib/tonlibjson_export.h",
+    "tonlib/Client.h",
+    "td/utils/Slice-decl.h",
+    "td/utils/config.h",
+    "td/utils/SharedSlice.h",
+    "td/utils/Slice.h",
+    "td/utils/int_types.h",
+    "td/utils/common.h",
+    "td/utils/check.h",
+    "td/utils/unique_ptr.h",
+    "td/utils/port/platform.h",
+]
+
+ton_lib_names = [
+    "adnllite",
+    "crc32c",
+    "keys",
+    "lite-client-common",
+    "smc-envelope",
+    "tdactor",
+    "tddb",
+    "tdnet",
+    "tdutils",
+    "tl-lite-utils",
+    "tl-utils",
+    "tl_api",
+    "tl_lite_api",
+    "tl_tonlib_api",
+    "ton_block",
+    "ton_crypto",
+    "tonlib",
+]
+
+filegroup(
+    name = "TonSources",
+    srcs = glob([
+        "tonlib-src/**/*"
+    ]),
+)
+
+genrule(
+    name = "ton_build",
+    srcs = [
+        "build-ton-bazel.sh",
+        "iOS-bazel.cmake",
+        ":TonSources",
+        "//submodules/openssl:openssl_include",
+        "//submodules/openssl:libcrypto.a",
+    ],
+    cmd_bash = 
+    """
+    set -ex
+
+    core_count="`sysctl -n hw.logicalcpu`"
+    BUILD_DIR="$(RULEDIR)/build"
+    rm -rf "$$BUILD_DIR"
+    mkdir -p "$$BUILD_DIR"
+
+    CMAKE_DIR="$$(pwd)/$$BUILD_DIR/cmake"
+    rm -rf "$$CMAKE_DIR"
+    mkdir -p "$$CMAKE_DIR"
+    tar -xf "$(location //third-party/cmake:cmake.tar)" -C "$$CMAKE_DIR"
+
+    if [ "$(TARGET_CPU)" == "ios_armv7" ]; then
+        BUILD_ARCH="armv7"
+    elif [ "$(TARGET_CPU)" == "ios_arm64" ]; then
+        BUILD_ARCH="arm64"
+    elif [ "$(TARGET_CPU)" == "ios_x86_64" ]; then
+        BUILD_ARCH="x86_64"
+    else
+        echo "Unsupported architecture $(TARGET_CPU)"
+    fi
+
+    cp $(location :build-ton-bazel.sh) "$$BUILD_DIR/"
+    cp $(location :iOS-bazel.cmake) "$$BUILD_DIR/"
+
+    SOURCE_PATH="submodules/ton/tonlib-src"
+
+    cp -R "$$SOURCE_PATH" "$$BUILD_DIR/"
+
+    mkdir -p "$$BUILD_DIR/openssl_headers/include/openssl"
+    mkdir -p "$$BUILD_DIR/openssl_headers/lib"
+    cp -f "$(location //submodules/openssl:libcrypto.a)" "$$BUILD_DIR/openssl_headers/lib/"
+    for f in $(locations //submodules/openssl:openssl_include); do
+        cp -f "$$f" "$$BUILD_DIR/openssl_headers/include/openssl/"
+    done
+    mkdir -p "$$BUILD_DIR/Public/ton"
+
+    PATH="$$PATH:$$CMAKE_DIR/bin" sh $$BUILD_DIR/build-ton-bazel.sh "$$BUILD_DIR" "$$BUILD_DIR" "$$BUILD_DIR/openssl_headers" $$BUILD_ARCH
+    """ +
+    "\n".join([
+        "cp -f \"$$BUILD_DIR/build/out/include/{}\" \"$(location Public/ton/include/{})\"".format(header, header) for header in ton_headers
+    ]) +
+    "\n" +
+    "\n".join([
+        "cp -f \"$$BUILD_DIR/build/out/lib/lib{}.a\" \"$(location Public/ton/lib/lib{}.a)\"".format(lib, lib) for lib in ton_lib_names
+    ]),
+    outs = ["Public/ton/include/" + x for x in ton_headers] +
+    ["Public/ton/lib/lib{}.a".format(x) for x in ton_lib_names],
+    tools = [
+        "//third-party/cmake:cmake.tar",
+    ],
+    visibility = [
+        "//visibility:public",
+    ]
+)
+
+cc_library(
+    name = "ton_lib",
+    srcs = [":Public/ton/lib/lib" + x + ".a" for x in ton_lib_names],
+)
+
+objc_library(
+    name = "ton",
+    module_name = "ton",
+    enable_modules = True,
+    hdrs = [":Public/ton/include/" + x for x in ton_headers],
+    includes = [
+        "Public/ton/include",
+    ],
+    deps = [
+        ":ton_lib",
+    ],
+    visibility = [
+        "//visibility:public",
+    ],
+)
diff --git a/submodules/ton/build-ton-bazel.sh b/submodules/ton/build-ton-bazel.sh
new file mode 100755
index 0000000000..069aab7bdf
--- /dev/null
+++ b/submodules/ton/build-ton-bazel.sh
@@ -0,0 +1,69 @@
+#/bin/sh
+
+set -x
+set -e
+
+OUT_DIR="$(pwd)/$1"
+SOURCE_DIR="$(pwd)/$2"
+openssl_base_path="$(pwd)/$3"
+arch="$4"
+
+if [ -z "$openssl_base_path" ]; then
+  echo "Usage: sh build-ton.sh path/to/openssl"
+  exit 1
+fi
+
+if [ ! -d "$openssl_base_path" ]; then
+  echo "$openssl_base_path not found"
+  exit 1
+fi
+
+ARCHIVE_PATH="$SOURCE_DIR/tonlib.zip"
+td_path="$SOURCE_DIR/tonlib-src"
+TOOLCHAIN="$SOURCE_DIR/iOS-bazel.cmake"
+
+mkdir -p "$OUT_DIR"
+mkdir -p "$OUT_DIR/build"
+cd "$OUT_DIR/build"
+
+openssl_path="$openssl_base_path"
+echo "OpenSSL path = ${openssl_path}"
+openssl_crypto_library="${openssl_path}/lib/libcrypto.a"
+openssl_ssl_library="${openssl_path}/lib/libssl.a"
+options="$options -DOPENSSL_FOUND=1"
+options="$options -DOPENSSL_CRYPTO_LIBRARY=${openssl_crypto_library}"
+options="$options -DOPENSSL_INCLUDE_DIR=${openssl_path}/include"
+options="$options -DOPENSSL_LIBRARIES=${openssl_crypto_library}"
+options="$options -DCMAKE_BUILD_TYPE=Release"
+
+build="build-${arch}"
+install="install-${arch}"
+
+if [ "$arch" == "armv7" ]; then
+  ios_platform="OSV7"
+elif [ "$arch" == "arm64" ]; then
+  ios_platform="OS64"
+elif [ "$arch" == "x86_64" ]; then
+  ios_platform="SIMULATOR"
+else
+  echo "Unsupported architecture $arch"
+  exit 1
+fi
+
+rm -rf $build
+mkdir -p $build
+mkdir -p $install
+cd $build
+cmake $td_path $options -DCMAKE_TOOLCHAIN_FILE="$TOOLCHAIN" -DIOS_PLATFORM=${ios_platform} -DTON_ARCH= -DCMAKE_INSTALL_PREFIX=../${install}
+CORE_COUNT=`sysctl -n hw.logicalcpu`
+make -j$CORE_COUNT install || exit
+cd ..
+
+mkdir -p "out"
+cp -r "$install/include" "out/"
+mkdir -p "out/lib"
+
+for f in $install/lib/*.a; do
+  lib_name=$(basename "$f")
+  cp "$install/lib/$lib_name" "out/lib/$lib_name"
+done
diff --git a/submodules/ton/build-ton.sh b/submodules/ton/build-ton-buck.sh
old mode 100755
new mode 100644
similarity index 98%
rename from submodules/ton/build-ton.sh
rename to submodules/ton/build-ton-buck.sh
index 1de7b17d9d..f11b7ac0d1
--- a/submodules/ton/build-ton.sh
+++ b/submodules/ton/build-ton-buck.sh
@@ -19,7 +19,7 @@ fi
 
 ARCHIVE_PATH="$SOURCE_DIR/tonlib.zip"
 td_path="$SOURCE_DIR/tonlib-src"
-TOOLCHAIN="$SOURCE_DIR/iOS.cmake"
+TOOLCHAIN="$SOURCE_DIR/iOS-buck.cmake"
 
 mkdir -p "$OUT_DIR"
 mkdir -p "$OUT_DIR/build"
diff --git a/submodules/ton/iOS-bazel.cmake b/submodules/ton/iOS-bazel.cmake
new file mode 100644
index 0000000000..de46c17972
--- /dev/null
+++ b/submodules/ton/iOS-bazel.cmake
@@ -0,0 +1,270 @@
+# This file is based off of the Platform/Darwin.cmake and Platform/UnixPaths.cmake
+# files which are included with CMake 2.8.4
+# It has been altered for iOS development
+
+# Options:
+#
+# IOS_PLATFORM = OS (default) or SIMULATOR
+#   This decides if SDKS will be selected from the iPhoneOS.platform or iPhoneSimulator.platform folders
+#   OS - the default, used to build for iPhone and iPad physical devices, which have an arm arch.
+#   SIMULATOR - used to build for the Simulator platforms, which have an x86 arch.
+#
+# CMAKE_IOS_DEVELOPER_ROOT = automatic(default) or /path/to/platform/Developer folder
+#   By default this location is automatcially chosen based on the IOS_PLATFORM value above.
+#   If set manually, it will override the default location and force the user of a particular Developer Platform
+#
+# CMAKE_IOS_SDK_ROOT = automatic(default) or /path/to/platform/Developer/SDKs/SDK folder
+#   By default this location is automatcially chosen based on the CMAKE_IOS_DEVELOPER_ROOT value.
+#   In this case it will always be the most up-to-date SDK found in the CMAKE_IOS_DEVELOPER_ROOT path.
+#   If set manually, this will force the use of a specific SDK version
+
+# Macros:
+#
+# set_xcode_property (TARGET XCODE_PROPERTY XCODE_VALUE)
+#  A convenience macro for setting xcode specific properties on targets
+#  example: set_xcode_property (myioslib IPHONEOS_DEPLOYMENT_TARGET "3.1")
+#
+# find_host_package (PROGRAM ARGS)
+#  A macro used to find executable programs on the host system, not within the iOS environment.
+#  Thanks to the android-cmake project for providing the command
+
+# Standard settings
+set (CMAKE_SYSTEM_NAME Darwin)
+set (CMAKE_SYSTEM_VERSION 1)
+set (UNIX True)
+set (APPLE True)
+set (IOS True)
+
+# Required as of cmake 2.8.10
+set (CMAKE_OSX_DEPLOYMENT_TARGET "" CACHE STRING "Force unset of the deployment target for iOS" FORCE)
+
+# Determine the cmake host system version so we know where to find the iOS SDKs
+find_program (CMAKE_UNAME uname /bin /usr/bin /usr/local/bin)
+if (CMAKE_UNAME)
+    exec_program(uname ARGS -r OUTPUT_VARIABLE CMAKE_HOST_SYSTEM_VERSION)
+    string (REGEX REPLACE "^([0-9]+)\\.([0-9]+).*$" "\\1" DARWIN_MAJOR_VERSION "${CMAKE_HOST_SYSTEM_VERSION}")
+endif (CMAKE_UNAME)
+
+# Force the compilers to gcc for iOS
+set (CMAKE_C_COMPILER /usr/bin/gcc)
+set (CMAKE_CXX_COMPILER /usr/bin/g++)
+set(CMAKE_AR ar CACHE FILEPATH "" FORCE)
+set(CMAKE_RANLIB ranlib CACHE FILEPATH "" FORCE)
+set(PKG_CONFIG_EXECUTABLE pkg-config CACHE FILEPATH "" FORCE)
+
+# Setup iOS platform unless specified manually with IOS_PLATFORM
+if (NOT DEFINED IOS_PLATFORM)
+    set (IOS_PLATFORM "OS")
+endif (NOT DEFINED IOS_PLATFORM)
+set (IOS_PLATFORM ${IOS_PLATFORM} CACHE STRING "Type of iOS Platform")
+
+# Check the platform selection and setup for developer root
+if (${IOS_PLATFORM} STREQUAL "OS")
+    set (IOS_PLATFORM_LOCATION "iPhoneOS.platform")
+    set (XCODE_IOS_PLATFORM iphoneos)
+
+    # This causes the installers to properly locate the output libraries
+    set (CMAKE_XCODE_EFFECTIVE_PLATFORMS "-iphoneos")
+
+    set (APPLE_IOS True)
+elseif (${IOS_PLATFORM} STREQUAL "OSV7")
+    set (IOS_PLATFORM_LOCATION "iPhoneOS.platform")
+    set (XCODE_IOS_PLATFORM iphoneos)
+
+    # This causes the installers to properly locate the output libraries
+    set (CMAKE_XCODE_EFFECTIVE_PLATFORMS "-iphoneos")
+
+    set (APPLE_IOS True)
+elseif (${IOS_PLATFORM} STREQUAL "OS64")
+    set (IOS_PLATFORM_LOCATION "iPhoneOS.platform")
+    set (XCODE_IOS_PLATFORM iphoneos)
+
+    # This causes the installers to properly locate the output libraries
+    set (CMAKE_XCODE_EFFECTIVE_PLATFORMS "-iphoneos")
+
+    set (APPLE_IOS True)
+elseif (${IOS_PLATFORM} STREQUAL "SIMULATOR")
+    set (SIMULATOR_FLAG true)
+    set (IOS_PLATFORM_LOCATION "iPhoneSimulator.platform")
+    set (XCODE_IOS_PLATFORM iphonesimulator)
+
+    # This causes the installers to properly locate the output libraries
+    set (CMAKE_XCODE_EFFECTIVE_PLATFORMS "-iphonesimulator")
+
+    set (APPLE_IOS True)
+elseif (${IOS_PLATFORM} STREQUAL "WATCHOS")
+    set (IOS_PLATFORM_LOCATION "WatchOS.platform")
+    set (XCODE_IOS_PLATFORM watchos)
+
+    # This causes the installers to properly locate the output libraries
+    set (CMAKE_XCODE_EFFECTIVE_PLATFORMS "-watchos")
+
+    set (APPLE_WATCH True)
+elseif (${IOS_PLATFORM} STREQUAL "WATCHSIMULATOR")
+    set (SIMULATOR_FLAG true)
+    set (IOS_PLATFORM_LOCATION "WatchSimulator.platform")
+    set (XCODE_IOS_PLATFORM watchsimulator)
+
+    # This causes the installers to properly locate the output libraries
+    set (CMAKE_XCODE_EFFECTIVE_PLATFORMS "-watchsimulator")
+
+    set (APPLE_WATCH True)
+elseif (${IOS_PLATFORM} STREQUAL "TVOS")
+    set (IOS_PLATFORM_LOCATION "AppleTvOS.platform")
+    set (XCODE_IOS_PLATFORM tvos)
+
+    # This causes the installers to properly locate the output libraries
+    set (CMAKE_XCODE_EFFECTIVE_PLATFORMS "-appletvos")
+
+    set (APPLE_TV True)
+elseif (${IOS_PLATFORM} STREQUAL "TVSIMULATOR")
+    set (SIMULATOR_FLAG true)
+    set (IOS_PLATFORM_LOCATION "AppleTvSimulator.platform")
+    set (XCODE_IOS_PLATFORM tvsimulator)
+
+    # This causes the installers to properly locate the output libraries
+    set (CMAKE_XCODE_EFFECTIVE_PLATFORMS "-tvsimulator")
+
+    set (APPLE_TV True)
+else (${IOS_PLATFORM} STREQUAL "OS")
+    message (FATAL_ERROR "Unsupported IOS_PLATFORM value selected. Please choose OS, SIMULATOR, or WATCHOS.")
+endif ()
+
+# All iOS/Darwin specific settings - some may be redundant
+set (CMAKE_SHARED_LIBRARY_PREFIX "lib")
+set (CMAKE_SHARED_LIBRARY_SUFFIX ".dylib")
+set (CMAKE_SHARED_MODULE_PREFIX "lib")
+set (CMAKE_SHARED_MODULE_SUFFIX ".so")
+set (CMAKE_MODULE_EXISTS 1)
+set (CMAKE_DL_LIBS "")
+
+set (CMAKE_C_OSX_COMPATIBILITY_VERSION_FLAG "-compatibility_version ")
+set (CMAKE_C_OSX_CURRENT_VERSION_FLAG "-current_version ")
+set (CMAKE_CXX_OSX_COMPATIBILITY_VERSION_FLAG "${CMAKE_C_OSX_COMPATIBILITY_VERSION_FLAG}")
+set (CMAKE_CXX_OSX_CURRENT_VERSION_FLAG "${CMAKE_C_OSX_CURRENT_VERSION_FLAG}")
+
+if (IOS_DEPLOYMENT_TARGET)
+    set (XCODE_IOS_PLATFORM_VERSION_FLAGS "-m${XCODE_IOS_PLATFORM}-version-min=${IOS_DEPLOYMENT_TARGET}")
+endif()
+
+set (CMAKE_SHARED_LINKER_FLAGS_INIT "-fapplication-extension")
+#if (NOT SIMULATOR_FLAG)
+#    set (BITCODE "-fembed-bitcode")
+#endif()
+set (CMAKE_C_FLAGS_INIT "${XCODE_IOS_PLATFORM_VERSION_FLAGS} ${BITCODE} -fno-stack-check")
+# Hidden visibilty is required for cxx on iOS
+set (CMAKE_CXX_FLAGS_INIT "${XCODE_IOS_PLATFORM_VERSION_FLAGS} ${BITCODE} -fvisibility-inlines-hidden -fno-stack-check")
+
+set (CMAKE_C_LINK_FLAGS   "${XCODE_IOS_PLATFORM_VERSION_FLAGS} -fapplication-extension -Wl,-search_paths_first ${CMAKE_C_LINK_FLAGS}")
+set (CMAKE_CXX_LINK_FLAGS "${XCODE_IOS_PLATFORM_VERSION_FLAGS} -fapplication-extension -Wl,-search_paths_first ${CMAKE_CXX_LINK_FLAGS}")
+
+set (CMAKE_PLATFORM_HAS_INSTALLNAME 1)
+set (CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS "-dynamiclib -headerpad_max_install_names")
+set (CMAKE_SHARED_MODULE_CREATE_C_FLAGS "-bundle -headerpad_max_install_names")
+set (CMAKE_SHARED_MODULE_LOADER_C_FLAG "-Wl,-bundle_loader,")
+set (CMAKE_SHARED_MODULE_LOADER_CXX_FLAG "-Wl,-bundle_loader,")
+set (CMAKE_FIND_LIBRARY_SUFFIXES ".dylib" ".so" ".a")
+
+# hack: if a new cmake (which uses CMAKE_INSTALL_NAME_TOOL) runs on an old build tree
+# (where install_name_tool was hardcoded) and where CMAKE_INSTALL_NAME_TOOL isn't in the cache
+# and still cmake didn't fail in CMakeFindBinUtils.cmake (because it isn't rerun)
+# hardcode CMAKE_INSTALL_NAME_TOOL here to install_name_tool, so it behaves as it did before, Alex
+if (NOT DEFINED CMAKE_INSTALL_NAME_TOOL)
+    find_program(CMAKE_INSTALL_NAME_TOOL install_name_tool)
+endif (NOT DEFINED CMAKE_INSTALL_NAME_TOOL)
+
+# Setup iOS deployment target
+set (IOS_DEPLOYMENT_TARGET ${IOS_DEPLOYMENT_TARGET} CACHE STRING "Minimum iOS version")
+
+# Setup iOS developer location unless specified manually with CMAKE_IOS_DEVELOPER_ROOT
+# Note Xcode 4.3 changed the installation location, choose the most recent one available
+exec_program(/usr/bin/xcode-select ARGS -print-path OUTPUT_VARIABLE CMAKE_XCODE_DEVELOPER_DIR)
+set (XCODE_POST_43_ROOT "${CMAKE_XCODE_DEVELOPER_DIR}/Platforms/${IOS_PLATFORM_LOCATION}/Developer")
+set (XCODE_PRE_43_ROOT "/Developer/Platforms/${IOS_PLATFORM_LOCATION}/Developer")
+if (NOT DEFINED CMAKE_IOS_DEVELOPER_ROOT)
+    if (EXISTS ${XCODE_POST_43_ROOT})
+        set (CMAKE_IOS_DEVELOPER_ROOT ${XCODE_POST_43_ROOT})
+    elseif(EXISTS ${XCODE_PRE_43_ROOT})
+        set (CMAKE_IOS_DEVELOPER_ROOT ${XCODE_PRE_43_ROOT})
+    endif (EXISTS ${XCODE_POST_43_ROOT})
+endif (NOT DEFINED CMAKE_IOS_DEVELOPER_ROOT)
+set (CMAKE_IOS_DEVELOPER_ROOT ${CMAKE_IOS_DEVELOPER_ROOT} CACHE PATH "Location of iOS Platform")
+
+# Find and use the most recent iOS sdk unless specified manually with CMAKE_IOS_SDK_ROOT
+if (NOT DEFINED CMAKE_IOS_SDK_ROOT)
+    file (GLOB _CMAKE_IOS_SDKS "${CMAKE_IOS_DEVELOPER_ROOT}/SDKs/*")
+    if (_CMAKE_IOS_SDKS)
+        list (SORT _CMAKE_IOS_SDKS)
+        list (REVERSE _CMAKE_IOS_SDKS)
+        list (GET _CMAKE_IOS_SDKS 0 CMAKE_IOS_SDK_ROOT)
+    else (_CMAKE_IOS_SDKS)
+        message (FATAL_ERROR "No iOS SDK's found in default search path ${CMAKE_IOS_DEVELOPER_ROOT}. Manually set CMAKE_IOS_SDK_ROOT or install the iOS SDK.")
+    endif (_CMAKE_IOS_SDKS)
+    message (STATUS "Toolchain using default iOS SDK: ${CMAKE_IOS_SDK_ROOT}")
+endif (NOT DEFINED CMAKE_IOS_SDK_ROOT)
+set (CMAKE_IOS_SDK_ROOT ${CMAKE_IOS_SDK_ROOT} CACHE PATH "Location of the selected iOS SDK")
+
+# Set the sysroot default to the most recent SDK
+set (CMAKE_OSX_SYSROOT ${CMAKE_IOS_SDK_ROOT} CACHE PATH "Sysroot used for iOS support")
+
+# set the architecture for iOS
+if (IOS_PLATFORM STREQUAL "OS")
+    set (IOS_ARCH "armv7;arm64")
+elseif (IOS_PLATFORM STREQUAL "OSV7")
+    set (IOS_ARCH "armv7")
+elseif (IOS_PLATFORM STREQUAL "OS64")
+    set (IOS_ARCH "arm64")
+elseif (IOS_PLATFORM STREQUAL "SIMULATOR")
+    set (IOS_ARCH "x86_64")
+elseif (IOS_PLATFORM STREQUAL "WATCHOS")
+    set (IOS_ARCH "armv7k")
+elseif (IOS_PLATFORM STREQUAL "WATCHSIMULATOR")
+    set (IOS_ARCH "i386")
+elseif (IOS_PLATFORM STREQUAL "TVOS")
+    set (IOS_ARCH "arm64")
+elseif (IOS_PLATFORM STREQUAL "TVSIMULATOR")
+    set (IOS_ARCH "x86_64")
+else()
+    message (WARNING "Unknown IOS_PLATFORM=<${IOS_PLATFORM}>")
+endif()
+message (STATUS ${IOS_ARCH})
+
+set (CMAKE_OSX_ARCHITECTURES ${IOS_ARCH} CACHE STRING "Build architecture for iOS")
+
+# Set the find root to the iOS developer roots and to user defined paths
+set (CMAKE_FIND_ROOT_PATH ${CMAKE_IOS_DEVELOPER_ROOT} ${CMAKE_IOS_SDK_ROOT} ${CMAKE_PREFIX_PATH} CACHE STRING "iOS find search path root")
+
+# default to searching for frameworks first
+set (CMAKE_FIND_FRAMEWORK FIRST)
+
+# set up the default search directories for frameworks
+set (CMAKE_SYSTEM_FRAMEWORK_PATH
+    ${CMAKE_IOS_SDK_ROOT}/System/Library/Frameworks
+    ${CMAKE_IOS_SDK_ROOT}/System/Library/PrivateFrameworks
+    ${CMAKE_IOS_SDK_ROOT}/Developer/Library/Frameworks
+)
+
+# only search the iOS sdks, not the remainder of the host filesystem
+set (CMAKE_FIND_ROOT_PATH_MODE_PROGRAM ONLY)
+set (CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
+set (CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
+
+# This little macro lets you set any Xcode specific property
+macro (set_xcode_property TARGET XCODE_PROPERTY XCODE_VALUE)
+    set_property (TARGET ${TARGET} PROPERTY XCODE_ATTRIBUTE_${XCODE_PROPERTY} ${XCODE_VALUE})
+endmacro (set_xcode_property)
+
+# This macro lets you find executable programs on the host system
+macro (find_host_package)
+    set (CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
+    set (CMAKE_FIND_ROOT_PATH_MODE_LIBRARY NEVER)
+    set (CMAKE_FIND_ROOT_PATH_MODE_INCLUDE NEVER)
+    set (IOS FALSE)
+
+    find_package(${ARGN})
+
+    set (IOS TRUE)
+    set (CMAKE_FIND_ROOT_PATH_MODE_PROGRAM ONLY)
+    set (CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
+    set (CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
+endmacro (find_host_package)
diff --git a/submodules/ton/iOS.cmake b/submodules/ton/iOS-buck.cmake
similarity index 100%
rename from submodules/ton/iOS.cmake
rename to submodules/ton/iOS-buck.cmake
diff --git a/submodules/ton/tonlib-src/LGPLv2 b/submodules/ton/tonlib-src/LGPLv2
index d93ab1b9a3..ab2bc125c4 100644
--- a/submodules/ton/tonlib-src/LGPLv2
+++ b/submodules/ton/tonlib-src/LGPLv2
@@ -14,5 +14,5 @@
     You should have received a copy of the GNU Lesser General Public License
     along with TON Blockchain Library.  If not, see <http://www.gnu.org/licenses/>.
 
-    Copyright 2017-2019 Telegram Systems LLP
+    Copyright 2017-2020 Telegram Systems LLP
 */
diff --git a/submodules/ton/tonlib-src/README b/submodules/ton/tonlib-src/README
index 7379d91e51..a47456e22b 100644
--- a/submodules/ton/tonlib-src/README
+++ b/submodules/ton/tonlib-src/README
@@ -8,18 +8,19 @@ The software is likely to compile and work properly on most Linux systems. It sh
 
 BASIC COMPILATION AND INSTALLATION INSTRUCTIONS
 
-1) Download and unpack the newest version of this archive, available at
+1) Download the newest version of the TON blockchain sources, available at GitHub repository https://github.com/ton-blockchain/ton/ :
 
-https://test.ton.org/download
+git clone https://github.com/ton-blockchain/ton.git
+git submodule update
 
 The TON Blockchain Test Network is updated quite often, so we cannot guarantee that older versions of the Lite Client will always work. Backward compatibility is not enforced at this development stage.
 
 2) Install the newest versions of make, cmake (version 3.0.2 or later), OpenSSL (including C header files), and g++ or clang (or another C++14-compatible compiler as appropriate for your operating system). We strongly recommend installing OpenSSL version 1.1.1 or later for better performance, especially if you intend to run a Full Node or a Validator as well.
 
-3) Suppose that you have unpacked this archive to directory ~/lite-client, where ~ is your home directory, and that you have created an empty directory ~/liteclient-build. Then run the following in a terminal on a Linux system:
+3) Suppose that you have fetched the source tree to directory ~/ton, where ~ is your home directory, and that you have created an empty directory ~/liteclient-build. Then run the following in a terminal on a Linux system:
 
 cd ~/liteclient-build
-cmake ~/lite-client
+cmake ~/ton
 cmake --build . --target lite-client
 
 You might also build some extra utilities useful for smart-contract development:
diff --git a/submodules/ton/tonlib-src/adnl/adnl-node-id.hpp b/submodules/ton/tonlib-src/adnl/adnl-node-id.hpp
index 84f425f8a2..2d3ade1644 100644
--- a/submodules/ton/tonlib-src/adnl/adnl-node-id.hpp
+++ b/submodules/ton/tonlib-src/adnl/adnl-node-id.hpp
@@ -14,7 +14,7 @@
     You should have received a copy of the GNU Lesser General Public License
     along with TON Blockchain Library.  If not, see <http://www.gnu.org/licenses/>.
 
-    Copyright 2017-2019 Telegram Systems LLP
+    Copyright 2017-2020 Telegram Systems LLP
 */
 #pragma once
 
@@ -75,6 +75,10 @@ class AdnlNodeIdShort {
     return hash_.is_zero();
   }
 
+  static td::Result<AdnlNodeIdShort> parse(td::Slice key);
+
+  std::string serialize();
+
  private:
   PublicKeyHash hash_;
 };
diff --git a/submodules/ton/tonlib-src/common/int-to-string.hpp b/submodules/ton/tonlib-src/common/int-to-string.hpp
index 414342cd0f..88aecc6549 100644
--- a/submodules/ton/tonlib-src/common/int-to-string.hpp
+++ b/submodules/ton/tonlib-src/common/int-to-string.hpp
@@ -1,3 +1,21 @@
+/*
+    This file is part of TON Blockchain Library.
+
+    TON Blockchain Library is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Lesser General Public License as published by
+    the Free Software Foundation, either version 2 of the License, or
+    (at your option) any later version.
+
+    TON Blockchain Library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public License
+    along with TON Blockchain Library.  If not, see <http://www.gnu.org/licenses/>.
+
+    Copyright 2017-2020 Telegram Systems LLP
+*/
 #pragma once
 
 #include "td/utils/int_types.h"
diff --git a/submodules/ton/tonlib-src/crypto/CMakeLists.txt b/submodules/ton/tonlib-src/crypto/CMakeLists.txt
index 10977b44b3..37f427cae2 100644
--- a/submodules/ton/tonlib-src/crypto/CMakeLists.txt
+++ b/submodules/ton/tonlib-src/crypto/CMakeLists.txt
@@ -23,6 +23,7 @@ set(TON_CRYPTO_SOURCE
   vm/atom.cpp
   vm/continuation.cpp
   vm/dict.cpp
+  vm/memo.cpp
   vm/dispatch.cpp
   vm/opctable.cpp
   vm/cp0.cpp
@@ -35,6 +36,8 @@ set(TON_CRYPTO_SOURCE
   vm/debugops.cpp
   vm/tonops.cpp
   vm/boc.cpp
+  vm/utils.cpp
+  vm/vm.cpp
   tl/tlblib.cpp
 
   Ed25519.h
@@ -74,12 +77,15 @@ set(TON_CRYPTO_SOURCE
   vm/excno.hpp
   vm/fmt.hpp
   vm/log.h
+  vm/memo.h
   vm/opctable.h
   vm/stack.hpp
   vm/stackops.h
   vm/tupleops.h
   vm/tonops.h
   vm/vmstate.h
+  vm/utils.h
+  vm/vm.h
 
   vm/cells.h
   vm/cellslice.h
@@ -201,6 +207,9 @@ set(BLOCK_SOURCE
 
 set(SMC_ENVELOPE_SOURCE
   smc-envelope/GenericAccount.cpp
+  smc-envelope/HighloadWallet.cpp
+  smc-envelope/HighloadWalletV2.cpp
+  smc-envelope/ManualDns.cpp
   smc-envelope/MultisigWallet.cpp
   smc-envelope/SmartContract.cpp
   smc-envelope/SmartContractCode.cpp
@@ -210,12 +219,16 @@ set(SMC_ENVELOPE_SOURCE
   smc-envelope/WalletV3.cpp
 
   smc-envelope/GenericAccount.h
+  smc-envelope/HighloadWallet.h
+  smc-envelope/HighloadWalletV2.h
+  smc-envelope/ManualDns.h
   smc-envelope/MultisigWallet.h
   smc-envelope/SmartContract.h
   smc-envelope/SmartContractCode.h
   smc-envelope/TestGiver.h
   smc-envelope/TestWallet.h
   smc-envelope/Wallet.h
+  smc-envelope/WalletInterface.h
   smc-envelope/WalletV3.h
 )
 
@@ -343,7 +356,7 @@ if (NOT CMAKE_CROSSCOMPILING)
       WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
       COMMAND fift -Ifift/lib:smartcont -s asm-to-cpp.fif ${ARG_DEST_FIF} ${ARG_DEST_CPP} ${ARG_NAME}
       MAIN_DEPENDENCY ${ARG_SOURCE}
-      DEPENDS fift ${ARG_DEST_FIF} smartcont/asm-to-cpp.fif
+      DEPENDS fift ${ARG_DEST_FIF} smartcont/asm-to-cpp.fif fift/lib/Asm.fif
       OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/${ARG_DEST_CPP}
     )
     add_custom_target(gen_fif_${ID} DEPENDS ${ARG_DEST_FIF} ${ARG_DEST_CPP})
@@ -355,12 +368,15 @@ if (NOT CMAKE_CROSSCOMPILING)
   GenFif(DEST smartcont/auto/wallet3-code SOURCE smartcont/wallet3-code.fc NAME wallet3)
   GenFif(DEST smartcont/auto/simple-wallet-code SOURCE smartcont/simple-wallet-code.fc NAME simple-wallet)
   GenFif(DEST smartcont/auto/highload-wallet-code SOURCE smartcont/highload-wallet-code.fc NAME highload-wallet)
-  GenFif(DEST smartcont/auto/highload-wallet-v2-code SOURCE smartcont/highload-wallet-v2-code.fc NAME highoad-wallet-v2)
+  GenFif(DEST smartcont/auto/highload-wallet-v2-code SOURCE smartcont/highload-wallet-v2-code.fc NAME highload-wallet-v2)
   GenFif(DEST smartcont/auto/elector-code SOURCE smartcont/elector-code.fc NAME elector-code)
   GenFif(DEST smartcont/auto/multisig-code SOURCE smartcont/multisig-code.fc NAME multisig)
   GenFif(DEST smartcont/auto/restricted-wallet-code SOURCE smartcont/restricted-wallet-code.fc NAME restricted-wallet)
   GenFif(DEST smartcont/auto/restricted-wallet2-code SOURCE smartcont/restricted-wallet2-code.fc NAME restricted-wallet2)
 
+  GenFif(DEST smartcont/auto/dns-manual-code SOURCE smartcont/dns-manual-code.fc NAME dns-manual)
+  GenFif(DEST smartcont/auto/dns-auto-code SOURCE smartcont/dns-auto-code.fc NAME dns-auto)
+
   GenFif(DEST smartcont/auto/simple-wallet-ext-code SOURCE smartcont/simple-wallet-ext-code.fc NAME simple-wallet-ext)
 endif()
 
@@ -387,5 +403,13 @@ if (WINGETOPT_FOUND)
   target_link_libraries_system(dump-block wingetopt)
 endif()
 
+add_executable(adjust-block block/adjust-block.cpp)
+target_include_directories(adjust-block PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
+  $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/..>)
+target_link_libraries(adjust-block PUBLIC ton_crypto fift-lib ton_block)
+if (WINGETOPT_FOUND)
+  target_link_libraries_system(dump-block wingetopt)
+endif()
+
 install(TARGETS fift func RUNTIME DESTINATION bin)
 install(DIRECTORY fift/lib/ DESTINATION lib/fift)
diff --git a/submodules/ton/tonlib-src/crypto/block/adjust-block.cpp b/submodules/ton/tonlib-src/crypto/block/adjust-block.cpp
new file mode 100644
index 0000000000..ba9d22cdae
--- /dev/null
+++ b/submodules/ton/tonlib-src/crypto/block/adjust-block.cpp
@@ -0,0 +1,203 @@
+/* 
+    This file is part of TON Blockchain source code.
+
+    TON Blockchain is free software; you can redistribute it and/or
+    modify it under the terms of the GNU General Public License
+    as published by the Free Software Foundation; either version 2
+    of the License, or (at your option) any later version.
+
+    TON Blockchain is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with TON Blockchain.  If not, see <http://www.gnu.org/licenses/>.
+
+    In addition, as a special exception, the copyright holders give permission 
+    to link the code of portions of this program with the OpenSSL library. 
+    You must obey the GNU General Public License in all respects for all 
+    of the code used other than OpenSSL. If you modify file(s) with this 
+    exception, you may extend this exception to your version of the file(s), 
+    but you are not obligated to do so. If you do not wish to do so, delete this 
+    exception statement from your version. If you delete this exception statement 
+    from all source files in the program, then also delete it here.
+
+    Copyright 2017-2019 Telegram Systems LLP
+*/
+#include "block/block.h"
+#include "vm/boc.h"
+#include <iostream>
+#include "block-db.h"
+#include "block-auto.h"
+#include "block-parse.h"
+#include "vm/cp0.h"
+#include "td/utils/crypto.h"
+#include <getopt.h>
+
+using td::Ref;
+using namespace std::literals::string_literals;
+
+int verbosity;
+
+struct IntError {
+  std::string err_msg;
+  IntError(std::string _msg) : err_msg(_msg) {
+  }
+  IntError(const char* _msg) : err_msg(_msg) {
+  }
+};
+
+int fatal(std::string str) {
+  std::cerr << "fatal error: " << str << std::endl;
+  std::exit(2);
+  return 2;
+}
+
+static inline void fail_unless(td::Status res) {
+  if (res.is_error()) {
+    throw IntError{res.to_string()};
+  }
+}
+
+td::Ref<vm::Cell> load_block(std::string filename, ton::BlockIdExt& id) {
+  std::cerr << "loading block from bag-of-cell file " << filename << std::endl;
+  auto bytes_res = block::load_binary_file(filename);
+  if (bytes_res.is_error()) {
+    throw IntError{PSTRING() << "cannot load file `" << filename << "` : " << bytes_res.move_as_error()};
+  }
+  ton::FileHash fhash;
+  td::sha256(bytes_res.ok(), fhash.as_slice());
+  vm::BagOfCells boc;
+  auto res = boc.deserialize(bytes_res.move_as_ok());
+  if (res.is_error()) {
+    throw IntError{PSTRING() << "cannot deserialize bag-of-cells " << res.move_as_error()};
+  }
+  if (res.move_as_ok() <= 0 || boc.get_root_cell().is_null()) {
+    throw IntError{"cannot deserialize bag-of-cells"};
+  }
+  auto root = boc.get_root_cell();
+  std::vector<ton::BlockIdExt> prev;
+  ton::BlockIdExt mc_blkid;
+  bool after_split;
+  fail_unless(block::unpack_block_prev_blk_try(root, id, prev, mc_blkid, after_split, &id));
+  id.file_hash = fhash;
+  std::cerr << "loaded block " << id.to_str() << std::endl;
+  return root;
+}
+
+bool save_block(std::string filename, Ref<vm::Cell> root, ton::BlockIdExt& id) {
+  std::cerr << "saving block into bag-of-cell file " << filename << std::endl;
+  if (root.is_null()) {
+    throw IntError{"new block has no root"};
+  }
+  id.root_hash = root->get_hash().bits();
+  auto res = vm::std_boc_serialize(std::move(root), 31);
+  if (res.is_error()) {
+    throw IntError{PSTRING() << "cannot serialize modified block as a bag-of-cells: "
+                             << res.move_as_error().to_string()};
+  }
+  auto data = res.move_as_ok();
+  td::sha256(data, id.file_hash.as_slice());
+  auto res1 = block::save_binary_file(filename, std::move(data));
+  if (res1.is_error()) {
+    throw IntError{PSTRING() << "cannot save file `" << filename << "` : " << res1};
+  }
+  return true;
+}
+
+Ref<vm::Cell> adjust_block(Ref<vm::Cell> root, int vseqno_incr, const ton::BlockIdExt& id) {
+  std::vector<ton::BlockIdExt> prev;
+  ton::BlockIdExt mc_blkid;
+  bool after_split;
+  fail_unless(block::unpack_block_prev_blk_try(root, id, prev, mc_blkid, after_split));
+  std::cerr << "unpacked header of block " << id.to_str() << std::endl;
+  if (!id.is_masterchain()) {
+    throw IntError{"can modify only masterchain blocks"};
+  }
+  block::gen::Block::Record blk;
+  block::gen::BlockInfo::Record info;
+  if (!(tlb::unpack_cell(root, blk) && tlb::unpack_cell(blk.info, info))) {
+    throw IntError{"cannot unpack block header"};
+  }
+  if (!info.key_block) {
+    throw IntError{"can modify only key blocks"};
+  }
+  info.vert_seqno_incr = true;
+  info.vert_seq_no += vseqno_incr;
+  if (!block::tlb::t_ExtBlkRef.pack_to(info.prev_vert_ref, id, info.end_lt)) {
+    throw IntError{"cannot pack prev_vert_ref"};
+  }
+  if (!(tlb::pack_cell(blk.info, info) && tlb::pack_cell(root, blk))) {
+    throw IntError{"cannot pack block header"};
+  }
+  return root;
+}
+
+void usage() {
+  std::cout << "usage: adjust-block [-i<vs-incr>] <in-boc-file> <out-boc-file>\n\tor adjust-block -h\n\tAdjusts block "
+               "loaded from <in-boc-file> by incrementing vert_seqno by <vs-incr> (1 by default)\n";
+  std::exit(3);
+}
+
+int main(int argc, char* const argv[]) {
+  int i, vseqno_incr = 1;
+  int new_verbosity_level = VERBOSITY_NAME(INFO);
+  std::string in_fname, out_fname;
+  while ((i = getopt(argc, argv, "hi:v:")) != -1) {
+    switch (i) {
+      case 'h':
+        usage();
+        break;
+      case 'i':
+        vseqno_incr = td::to_integer<int>(td::Slice(optarg));
+        CHECK(vseqno_incr > 0 && vseqno_incr < 1000);
+        break;
+      case 'v':
+        new_verbosity_level = VERBOSITY_NAME(FATAL) + (verbosity = td::to_integer<int>(td::Slice(optarg)));
+        break;
+      default:
+        usage();
+        break;
+    }
+  }
+  SET_VERBOSITY_LEVEL(new_verbosity_level);
+  if (argc != optind + 2) {
+    usage();
+    return 2;
+  }
+  in_fname = argv[optind];
+  out_fname = argv[optind + 1];
+  try {
+    ton::BlockIdExt old_id, new_id;
+    auto root = load_block(in_fname, old_id);
+    if (root.is_null()) {
+      return fatal("cannot load BoC from file "s + in_fname);
+    }
+    bool ok = block::gen::t_Block.validate_ref(root);
+    if (!ok) {
+      return fatal("file `"s + in_fname + " does not contain a valid block");
+    }
+    auto adjusted = adjust_block(root, vseqno_incr, old_id);
+    if (adjusted.is_null()) {
+      return fatal("cannot adjust block");
+    }
+    ok = block::gen::t_Block.validate_ref(root);
+    if (!ok) {
+      return fatal("modified block is not valid");
+    }
+    new_id = old_id;
+    if (!save_block(out_fname, adjusted, new_id)) {
+      return fatal("cannot save modified block to file `"s + out_fname + "`");
+    }
+    std::cout << "old block id: " << old_id.to_str() << std::endl;
+    std::cout << "new block id: " << new_id.to_str() << std::endl;
+  } catch (IntError& err) {
+    std::cerr << "internal error: " << err.err_msg << std::endl;
+    return 1;
+  } catch (vm::VmError& err) {
+    std::cerr << "vm error: " << err.get_msg() << std::endl;
+    return 1;
+  }
+  return 0;
+}
diff --git a/submodules/ton/tonlib-src/crypto/block/block-auto.cpp b/submodules/ton/tonlib-src/crypto/block/block-auto.cpp
index d3d666fb75..d2bf8aea89 100644
--- a/submodules/ton/tonlib-src/crypto/block/block-auto.cpp
+++ b/submodules/ton/tonlib-src/crypto/block/block-auto.cpp
@@ -14,11 +14,16 @@
 // uses built-in type `uint`
 // uses built-in type `bits`
 // uses built-in type `int8`
+// uses built-in type `uint13`
 // uses built-in type `uint15`
+// uses built-in type `int16`
 // uses built-in type `uint16`
 // uses built-in type `int32`
 // uses built-in type `uint32`
+// uses built-in type `uint63`
+// uses built-in type `int64`
 // uses built-in type `uint64`
+// uses built-in type `int257`
 // uses built-in type `bits256`
 
 namespace block {
@@ -273,7 +278,7 @@ int BoolFalse::check_tag(const vm::CellSlice& cs) const {
   return cs.prefetch_ulong(1) == 0 ? bool_false : -1;
 }
 
-bool BoolFalse::validate_skip(vm::CellSlice& cs, bool weak) const {
+bool BoolFalse::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const {
   return cs.fetch_ulong(1) == 0;
 }
 
@@ -340,7 +345,7 @@ int BoolTrue::check_tag(const vm::CellSlice& cs) const {
   return cs.prefetch_ulong(1) == 1 ? bool_true : -1;
 }
 
-bool BoolTrue::validate_skip(vm::CellSlice& cs, bool weak) const {
+bool BoolTrue::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const {
   return cs.fetch_ulong(1) == 1;
 }
 
@@ -423,13 +428,13 @@ bool Maybe::skip(vm::CellSlice& cs) const {
   return false;
 }
 
-bool Maybe::validate_skip(vm::CellSlice& cs, bool weak) const {
+bool Maybe::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const {
   switch (get_tag(cs)) {
   case nothing:
     return cs.advance(1);
   case just:
     return cs.advance(1)
-        && X_.validate_skip(cs, weak);
+        && X_.validate_skip(ops, cs, weak);
   }
   return false;
 }
@@ -556,14 +561,14 @@ bool Either::skip(vm::CellSlice& cs) const {
   return false;
 }
 
-bool Either::validate_skip(vm::CellSlice& cs, bool weak) const {
+bool Either::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const {
   switch (get_tag(cs)) {
   case left:
     return cs.advance(1)
-        && X_.validate_skip(cs, weak);
+        && X_.validate_skip(ops, cs, weak);
   case right:
     return cs.advance(1)
-        && Y_.validate_skip(cs, weak);
+        && Y_.validate_skip(ops, cs, weak);
   }
   return false;
 }
@@ -684,9 +689,9 @@ bool Both::skip(vm::CellSlice& cs) const {
       && Y_.skip(cs);
 }
 
-bool Both::validate_skip(vm::CellSlice& cs, bool weak) const {
-  return X_.validate_skip(cs, weak)
-      && Y_.validate_skip(cs, weak);
+bool Both::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const {
+  return X_.validate_skip(ops, cs, weak)
+      && Y_.validate_skip(ops, cs, weak);
 }
 
 bool Both::unpack(vm::CellSlice& cs, Both::Record& data) const {
@@ -812,11 +817,11 @@ bool Hashmap::skip(vm::CellSlice& cs) const {
       && HashmapNode{m, X_}.skip(cs);
 }
 
-bool Hashmap::validate_skip(vm::CellSlice& cs, bool weak) const {
+bool Hashmap::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const {
   int l, m;
-  return HmLabel{m_}.validate_skip(cs, weak, l)
+  return HmLabel{m_}.validate_skip(ops, cs, weak, l)
       && add_r1(m, l, m_)
-      && HashmapNode{m, X_}.validate_skip(cs, weak);
+      && HashmapNode{m, X_}.validate_skip(ops, cs, weak);
 }
 
 bool Hashmap::unpack(vm::CellSlice& cs, Hashmap::Record& data) const {
@@ -889,16 +894,16 @@ bool HashmapNode::skip(vm::CellSlice& cs) const {
   return false;
 }
 
-bool HashmapNode::validate_skip(vm::CellSlice& cs, bool weak) const {
+bool HashmapNode::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const {
   switch (get_tag(cs)) {
   case hmn_leaf:
     return m_ == 0
-        && X_.validate_skip(cs, weak);
+        && X_.validate_skip(ops, cs, weak);
   case hmn_fork: {
     int n;
     return add_r1(n, 1, m_)
-        && Hashmap{n, X_}.validate_skip_ref(cs, weak)
-        && Hashmap{n, X_}.validate_skip_ref(cs, weak);
+        && Hashmap{n, X_}.validate_skip_ref(ops, cs, weak)
+        && Hashmap{n, X_}.validate_skip_ref(ops, cs, weak);
     }
   }
   return false;
@@ -1077,12 +1082,12 @@ bool HmLabel::skip(vm::CellSlice& cs, int& m_) const {
   return false;
 }
 
-bool HmLabel::validate_skip(vm::CellSlice& cs, bool weak) const {
+bool HmLabel::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const {
   switch (get_tag(cs)) {
   case hml_short: {
     int m_;
     return cs.advance(1)
-        && t_Unary.validate_skip(cs, weak, m_)
+        && t_Unary.validate_skip(ops, cs, weak, m_)
         && m_ <= n_
         && cs.advance(m_);
     }
@@ -1101,11 +1106,11 @@ bool HmLabel::validate_skip(vm::CellSlice& cs, bool weak) const {
   return false;
 }
 
-bool HmLabel::validate_skip(vm::CellSlice& cs, bool weak, int& m_) const {
+bool HmLabel::validate_skip(int* ops, vm::CellSlice& cs, bool weak, int& m_) const {
   switch (get_tag(cs)) {
   case hml_short:
     return cs.advance(1)
-        && t_Unary.validate_skip(cs, weak, m_)
+        && t_Unary.validate_skip(ops, cs, weak, m_)
         && m_ <= n_
         && cs.advance(m_);
   case hml_long:
@@ -1360,20 +1365,20 @@ bool Unary::skip(vm::CellSlice& cs, int& m_) const {
   return false;
 }
 
-bool Unary::validate_skip(vm::CellSlice& cs, bool weak) const {
+bool Unary::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const {
   switch (get_tag(cs)) {
   case unary_zero:
     return cs.advance(1);
   case unary_succ: {
     int n;
     return cs.advance(1)
-        && validate_skip(cs, weak, n);
+        && validate_skip(ops, cs, weak, n);
     }
   }
   return false;
 }
 
-bool Unary::validate_skip(vm::CellSlice& cs, bool weak, int& m_) const {
+bool Unary::validate_skip(int* ops, vm::CellSlice& cs, bool weak, int& m_) const {
   switch (get_tag(cs)) {
   case unary_zero:
     return (m_ = 0) >= 0
@@ -1381,7 +1386,7 @@ bool Unary::validate_skip(vm::CellSlice& cs, bool weak, int& m_) const {
   case unary_succ: {
     int n;
     return cs.advance(1)
-        && validate_skip(cs, weak, n)
+        && validate_skip(ops, cs, weak, n)
         && (m_ = n + 1) >= 0;
     }
   }
@@ -1545,13 +1550,13 @@ bool HashmapE::skip(vm::CellSlice& cs) const {
   return false;
 }
 
-bool HashmapE::validate_skip(vm::CellSlice& cs, bool weak) const {
+bool HashmapE::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const {
   switch (get_tag(cs)) {
   case hme_empty:
     return cs.advance(1);
   case hme_root:
     return cs.advance(1)
-        && Hashmap{m_, X_}.validate_skip_ref(cs, weak);
+        && Hashmap{m_, X_}.validate_skip_ref(ops, cs, weak);
   }
   return false;
 }
@@ -1666,8 +1671,8 @@ bool BitstringSet::skip(vm::CellSlice& cs) const {
   return Hashmap{m_, t_True}.skip(cs);
 }
 
-bool BitstringSet::validate_skip(vm::CellSlice& cs, bool weak) const {
-  return Hashmap{m_, t_True}.validate_skip(cs, weak);
+bool BitstringSet::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const {
+  return Hashmap{m_, t_True}.validate_skip(ops, cs, weak);
 }
 
 bool BitstringSet::unpack(vm::CellSlice& cs, BitstringSet::Record& data) const {
@@ -1733,11 +1738,11 @@ bool HashmapAug::skip(vm::CellSlice& cs) const {
       && HashmapAugNode{m, X_, Y_}.skip(cs);
 }
 
-bool HashmapAug::validate_skip(vm::CellSlice& cs, bool weak) const {
+bool HashmapAug::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const {
   int l, m;
-  return HmLabel{m_}.validate_skip(cs, weak, l)
+  return HmLabel{m_}.validate_skip(ops, cs, weak, l)
       && add_r1(m, l, m_)
-      && HashmapAugNode{m, X_, Y_}.validate_skip(cs, weak);
+      && HashmapAugNode{m, X_, Y_}.validate_skip(ops, cs, weak);
 }
 
 bool HashmapAug::unpack(vm::CellSlice& cs, HashmapAug::Record& data) const {
@@ -1812,18 +1817,18 @@ bool HashmapAugNode::skip(vm::CellSlice& cs) const {
   return false;
 }
 
-bool HashmapAugNode::validate_skip(vm::CellSlice& cs, bool weak) const {
+bool HashmapAugNode::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const {
   switch (get_tag(cs)) {
   case ahmn_leaf:
     return m_ == 0
-        && Y_.validate_skip(cs, weak)
-        && X_.validate_skip(cs, weak);
+        && Y_.validate_skip(ops, cs, weak)
+        && X_.validate_skip(ops, cs, weak);
   case ahmn_fork: {
     int n;
     return add_r1(n, 1, m_)
-        && HashmapAug{n, X_, Y_}.validate_skip_ref(cs, weak)
-        && HashmapAug{n, X_, Y_}.validate_skip_ref(cs, weak)
-        && Y_.validate_skip(cs, weak);
+        && HashmapAug{n, X_, Y_}.validate_skip_ref(ops, cs, weak)
+        && HashmapAug{n, X_, Y_}.validate_skip_ref(ops, cs, weak)
+        && Y_.validate_skip(ops, cs, weak);
     }
   }
   return false;
@@ -1954,15 +1959,15 @@ bool HashmapAugE::skip(vm::CellSlice& cs) const {
   return false;
 }
 
-bool HashmapAugE::validate_skip(vm::CellSlice& cs, bool weak) const {
+bool HashmapAugE::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const {
   switch (get_tag(cs)) {
   case ahme_empty:
     return cs.advance(1)
-        && Y_.validate_skip(cs, weak);
+        && Y_.validate_skip(ops, cs, weak);
   case ahme_root:
     return cs.advance(1)
-        && HashmapAug{m_, X_, Y_}.validate_skip_ref(cs, weak)
-        && Y_.validate_skip(cs, weak);
+        && HashmapAug{m_, X_, Y_}.validate_skip_ref(ops, cs, weak)
+        && Y_.validate_skip(ops, cs, weak);
   }
   return false;
 }
@@ -2093,11 +2098,11 @@ bool VarHashmap::skip(vm::CellSlice& cs) const {
       && VarHashmapNode{m, X_}.skip(cs);
 }
 
-bool VarHashmap::validate_skip(vm::CellSlice& cs, bool weak) const {
+bool VarHashmap::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const {
   int l, m;
-  return HmLabel{m_}.validate_skip(cs, weak, l)
+  return HmLabel{m_}.validate_skip(ops, cs, weak, l)
       && add_r1(m, l, m_)
-      && VarHashmapNode{m, X_}.validate_skip(cs, weak);
+      && VarHashmapNode{m, X_}.validate_skip(ops, cs, weak);
 }
 
 bool VarHashmap::unpack(vm::CellSlice& cs, VarHashmap::Record& data) const {
@@ -2176,25 +2181,25 @@ bool VarHashmapNode::skip(vm::CellSlice& cs) const {
   return false;
 }
 
-bool VarHashmapNode::validate_skip(vm::CellSlice& cs, bool weak) const {
+bool VarHashmapNode::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const {
   switch (get_tag(cs)) {
   case vhmn_leaf:
     return cs.advance(2)
-        && X_.validate_skip(cs, weak);
+        && X_.validate_skip(ops, cs, weak);
   case vhmn_fork: {
     int n;
     return add_r1(n, 1, m_)
         && cs.advance(2)
-        && VarHashmap{n, X_}.validate_skip_ref(cs, weak)
-        && VarHashmap{n, X_}.validate_skip_ref(cs, weak)
-        && Maybe{X_}.validate_skip(cs, weak);
+        && VarHashmap{n, X_}.validate_skip_ref(ops, cs, weak)
+        && VarHashmap{n, X_}.validate_skip_ref(ops, cs, weak)
+        && Maybe{X_}.validate_skip(ops, cs, weak);
     }
   case vhmn_cont: {
     int n;
     return add_r1(n, 1, m_)
         && cs.advance(2)
-        && VarHashmap{n, X_}.validate_skip_ref(cs, weak)
-        && X_.validate_skip(cs, weak);
+        && VarHashmap{n, X_}.validate_skip_ref(ops, cs, weak)
+        && X_.validate_skip(ops, cs, weak);
     }
   }
   return false;
@@ -2360,13 +2365,13 @@ bool VarHashmapE::skip(vm::CellSlice& cs) const {
   return false;
 }
 
-bool VarHashmapE::validate_skip(vm::CellSlice& cs, bool weak) const {
+bool VarHashmapE::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const {
   switch (get_tag(cs)) {
   case vhme_empty:
     return cs.advance(1);
   case vhme_root:
     return cs.advance(1)
-        && VarHashmap{m_, X_}.validate_skip_ref(cs, weak);
+        && VarHashmap{m_, X_}.validate_skip_ref(ops, cs, weak);
   }
   return false;
 }
@@ -2484,11 +2489,11 @@ bool PfxHashmap::skip(vm::CellSlice& cs) const {
       && PfxHashmapNode{m, X_}.skip(cs);
 }
 
-bool PfxHashmap::validate_skip(vm::CellSlice& cs, bool weak) const {
+bool PfxHashmap::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const {
   int l, m;
-  return HmLabel{m_}.validate_skip(cs, weak, l)
+  return HmLabel{m_}.validate_skip(ops, cs, weak, l)
       && add_r1(m, l, m_)
-      && PfxHashmapNode{m, X_}.validate_skip(cs, weak);
+      && PfxHashmapNode{m, X_}.validate_skip(ops, cs, weak);
 }
 
 bool PfxHashmap::unpack(vm::CellSlice& cs, PfxHashmap::Record& data) const {
@@ -2556,17 +2561,17 @@ bool PfxHashmapNode::skip(vm::CellSlice& cs) const {
   return false;
 }
 
-bool PfxHashmapNode::validate_skip(vm::CellSlice& cs, bool weak) const {
+bool PfxHashmapNode::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const {
   switch (get_tag(cs)) {
   case phmn_leaf:
     return cs.advance(1)
-        && X_.validate_skip(cs, weak);
+        && X_.validate_skip(ops, cs, weak);
   case phmn_fork: {
     int n;
     return add_r1(n, 1, m_)
         && cs.advance(1)
-        && PfxHashmap{n, X_}.validate_skip_ref(cs, weak)
-        && PfxHashmap{n, X_}.validate_skip_ref(cs, weak);
+        && PfxHashmap{n, X_}.validate_skip_ref(ops, cs, weak)
+        && PfxHashmap{n, X_}.validate_skip_ref(ops, cs, weak);
     }
   }
   return false;
@@ -2714,13 +2719,13 @@ bool PfxHashmapE::skip(vm::CellSlice& cs) const {
   return false;
 }
 
-bool PfxHashmapE::validate_skip(vm::CellSlice& cs, bool weak) const {
+bool PfxHashmapE::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const {
   switch (get_tag(cs)) {
   case phme_empty:
     return cs.advance(1);
   case phme_root:
     return cs.advance(1)
-        && PfxHashmap{m_, X_}.validate_skip_ref(cs, weak);
+        && PfxHashmap{m_, X_}.validate_skip_ref(ops, cs, weak);
   }
   return false;
 }
@@ -2851,7 +2856,7 @@ bool MsgAddressExt::skip(vm::CellSlice& cs) const {
   return false;
 }
 
-bool MsgAddressExt::validate_skip(vm::CellSlice& cs, bool weak) const {
+bool MsgAddressExt::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const {
   switch (get_tag(cs)) {
   case addr_none:
     return cs.advance(2);
@@ -2984,7 +2989,7 @@ bool Anycast::skip(vm::CellSlice& cs) const {
       && cs.advance(depth);
 }
 
-bool Anycast::validate_skip(vm::CellSlice& cs, bool weak) const {
+bool Anycast::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const {
   int depth;
   return cs.fetch_uint_leq(30, depth)
       && 1 <= depth
@@ -3082,16 +3087,16 @@ bool MsgAddressInt::skip(vm::CellSlice& cs) const {
   return false;
 }
 
-bool MsgAddressInt::validate_skip(vm::CellSlice& cs, bool weak) const {
+bool MsgAddressInt::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const {
   switch (get_tag(cs)) {
   case addr_std:
     return cs.advance(2)
-        && t_Maybe_Anycast.validate_skip(cs, weak)
+        && t_Maybe_Anycast.validate_skip(ops, cs, weak)
         && cs.advance(264);
   case addr_var: {
     int addr_len;
     return cs.advance(2)
-        && t_Maybe_Anycast.validate_skip(cs, weak)
+        && t_Maybe_Anycast.validate_skip(ops, cs, weak)
         && cs.fetch_uint_to(9, addr_len)
         && cs.advance(32)
         && cs.advance(addr_len);
@@ -3229,12 +3234,12 @@ bool MsgAddress::skip(vm::CellSlice& cs) const {
   return false;
 }
 
-bool MsgAddress::validate_skip(vm::CellSlice& cs, bool weak) const {
+bool MsgAddress::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const {
   switch (get_tag(cs)) {
   case cons1:
-    return t_MsgAddressInt.validate_skip(cs, weak);
+    return t_MsgAddressInt.validate_skip(ops, cs, weak);
   case cons2:
-    return t_MsgAddressExt.validate_skip(cs, weak);
+    return t_MsgAddressExt.validate_skip(ops, cs, weak);
   }
   return false;
 }
@@ -3347,7 +3352,7 @@ bool VarUInteger::skip(vm::CellSlice& cs) const {
       && cs.advance(8 * len);
 }
 
-bool VarUInteger::validate_skip(vm::CellSlice& cs, bool weak) const {
+bool VarUInteger::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const {
   int len;
   return cs.fetch_uint_less(m_, len)
       && cs.advance(8 * len);
@@ -3421,7 +3426,7 @@ bool VarInteger::skip(vm::CellSlice& cs) const {
       && cs.advance(8 * len);
 }
 
-bool VarInteger::validate_skip(vm::CellSlice& cs, bool weak) const {
+bool VarInteger::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const {
   int len;
   return cs.fetch_uint_less(m_, len)
       && cs.advance(8 * len);
@@ -3493,8 +3498,8 @@ bool Grams::skip(vm::CellSlice& cs) const {
   return t_VarUInteger_16.skip(cs);
 }
 
-bool Grams::validate_skip(vm::CellSlice& cs, bool weak) const {
-  return t_VarUInteger_16.validate_skip(cs, weak);
+bool Grams::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const {
+  return t_VarUInteger_16.validate_skip(ops, cs, weak);
 }
 
 bool Grams::unpack(vm::CellSlice& cs, Grams::Record& data) const {
@@ -3556,8 +3561,8 @@ bool ExtraCurrencyCollection::skip(vm::CellSlice& cs) const {
   return t_HashmapE_32_VarUInteger_32.skip(cs);
 }
 
-bool ExtraCurrencyCollection::validate_skip(vm::CellSlice& cs, bool weak) const {
-  return t_HashmapE_32_VarUInteger_32.validate_skip(cs, weak);
+bool ExtraCurrencyCollection::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const {
+  return t_HashmapE_32_VarUInteger_32.validate_skip(ops, cs, weak);
 }
 
 bool ExtraCurrencyCollection::unpack(vm::CellSlice& cs, ExtraCurrencyCollection::Record& data) const {
@@ -3620,9 +3625,9 @@ bool CurrencyCollection::skip(vm::CellSlice& cs) const {
       && t_ExtraCurrencyCollection.skip(cs);
 }
 
-bool CurrencyCollection::validate_skip(vm::CellSlice& cs, bool weak) const {
-  return t_Grams.validate_skip(cs, weak)
-      && t_ExtraCurrencyCollection.validate_skip(cs, weak);
+bool CurrencyCollection::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const {
+  return t_Grams.validate_skip(ops, cs, weak)
+      && t_ExtraCurrencyCollection.validate_skip(ops, cs, weak);
 }
 
 bool CurrencyCollection::unpack(vm::CellSlice& cs, CurrencyCollection::Record& data) const {
@@ -3720,25 +3725,25 @@ bool CommonMsgInfo::skip(vm::CellSlice& cs) const {
   return false;
 }
 
-bool CommonMsgInfo::validate_skip(vm::CellSlice& cs, bool weak) const {
+bool CommonMsgInfo::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const {
   switch (get_tag(cs)) {
   case int_msg_info:
     return cs.advance(4)
-        && t_MsgAddressInt.validate_skip(cs, weak)
-        && t_MsgAddressInt.validate_skip(cs, weak)
-        && t_CurrencyCollection.validate_skip(cs, weak)
-        && t_Grams.validate_skip(cs, weak)
-        && t_Grams.validate_skip(cs, weak)
+        && t_MsgAddressInt.validate_skip(ops, cs, weak)
+        && t_MsgAddressInt.validate_skip(ops, cs, weak)
+        && t_CurrencyCollection.validate_skip(ops, cs, weak)
+        && t_Grams.validate_skip(ops, cs, weak)
+        && t_Grams.validate_skip(ops, cs, weak)
         && cs.advance(96);
   case ext_in_msg_info:
     return cs.advance(2)
-        && t_MsgAddressExt.validate_skip(cs, weak)
-        && t_MsgAddressInt.validate_skip(cs, weak)
-        && t_Grams.validate_skip(cs, weak);
+        && t_MsgAddressExt.validate_skip(ops, cs, weak)
+        && t_MsgAddressInt.validate_skip(ops, cs, weak)
+        && t_Grams.validate_skip(ops, cs, weak);
   case ext_out_msg_info:
     return cs.advance(2)
-        && t_MsgAddressInt.validate_skip(cs, weak)
-        && t_MsgAddressExt.validate_skip(cs, weak)
+        && t_MsgAddressInt.validate_skip(ops, cs, weak)
+        && t_MsgAddressExt.validate_skip(ops, cs, weak)
         && cs.advance(96);
   }
   return false;
@@ -3942,20 +3947,20 @@ bool CommonMsgInfoRelaxed::skip(vm::CellSlice& cs) const {
   return false;
 }
 
-bool CommonMsgInfoRelaxed::validate_skip(vm::CellSlice& cs, bool weak) const {
+bool CommonMsgInfoRelaxed::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const {
   switch (get_tag(cs)) {
   case int_msg_info:
     return cs.advance(4)
-        && t_MsgAddress.validate_skip(cs, weak)
-        && t_MsgAddressInt.validate_skip(cs, weak)
-        && t_CurrencyCollection.validate_skip(cs, weak)
-        && t_Grams.validate_skip(cs, weak)
-        && t_Grams.validate_skip(cs, weak)
+        && t_MsgAddress.validate_skip(ops, cs, weak)
+        && t_MsgAddressInt.validate_skip(ops, cs, weak)
+        && t_CurrencyCollection.validate_skip(ops, cs, weak)
+        && t_Grams.validate_skip(ops, cs, weak)
+        && t_Grams.validate_skip(ops, cs, weak)
         && cs.advance(96);
   case ext_out_msg_info:
     return cs.fetch_ulong(2) == 3
-        && t_MsgAddress.validate_skip(cs, weak)
-        && t_MsgAddressExt.validate_skip(cs, weak)
+        && t_MsgAddress.validate_skip(ops, cs, weak)
+        && t_MsgAddressExt.validate_skip(ops, cs, weak)
         && cs.advance(96);
   }
   return false;
@@ -4139,12 +4144,12 @@ bool StateInit::skip(vm::CellSlice& cs) const {
       && t_HashmapE_256_SimpleLib.skip(cs);
 }
 
-bool StateInit::validate_skip(vm::CellSlice& cs, bool weak) const {
-  return t_Maybe_natwidth_5.validate_skip(cs, weak)
-      && t_Maybe_TickTock.validate_skip(cs, weak)
-      && t_Maybe_Ref_Cell.validate_skip(cs, weak)
-      && t_Maybe_Ref_Cell.validate_skip(cs, weak)
-      && t_HashmapE_256_SimpleLib.validate_skip(cs, weak);
+bool StateInit::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const {
+  return t_Maybe_natwidth_5.validate_skip(ops, cs, weak)
+      && t_Maybe_TickTock.validate_skip(ops, cs, weak)
+      && t_Maybe_Ref_Cell.validate_skip(ops, cs, weak)
+      && t_Maybe_Ref_Cell.validate_skip(ops, cs, weak)
+      && t_HashmapE_256_SimpleLib.validate_skip(ops, cs, weak);
 }
 
 bool StateInit::unpack(vm::CellSlice& cs, StateInit::Record& data) const {
@@ -4199,7 +4204,7 @@ int SimpleLib::check_tag(const vm::CellSlice& cs) const {
   return simple_lib;
 }
 
-bool SimpleLib::validate_skip(vm::CellSlice& cs, bool weak) const {
+bool SimpleLib::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const {
   return cs.advance_ext(0x10001);
 }
 
@@ -4269,10 +4274,10 @@ bool Message::skip(vm::CellSlice& cs) const {
       && Either{X_, RefT{X_}}.skip(cs);
 }
 
-bool Message::validate_skip(vm::CellSlice& cs, bool weak) const {
-  return t_CommonMsgInfo.validate_skip(cs, weak)
-      && t_Maybe_Either_StateInit_Ref_StateInit.validate_skip(cs, weak)
-      && Either{X_, RefT{X_}}.validate_skip(cs, weak);
+bool Message::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const {
+  return t_CommonMsgInfo.validate_skip(ops, cs, weak)
+      && t_Maybe_Either_StateInit_Ref_StateInit.validate_skip(ops, cs, weak)
+      && Either{X_, RefT{X_}}.validate_skip(ops, cs, weak);
 }
 
 bool Message::unpack(vm::CellSlice& cs, Message::Record& data) const {
@@ -4347,10 +4352,10 @@ bool MessageRelaxed::skip(vm::CellSlice& cs) const {
       && Either{X_, RefT{X_}}.skip(cs);
 }
 
-bool MessageRelaxed::validate_skip(vm::CellSlice& cs, bool weak) const {
-  return t_CommonMsgInfoRelaxed.validate_skip(cs, weak)
-      && t_Maybe_Either_StateInit_Ref_StateInit.validate_skip(cs, weak)
-      && Either{X_, RefT{X_}}.validate_skip(cs, weak);
+bool MessageRelaxed::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const {
+  return t_CommonMsgInfoRelaxed.validate_skip(ops, cs, weak)
+      && t_Maybe_Either_StateInit_Ref_StateInit.validate_skip(ops, cs, weak)
+      && Either{X_, RefT{X_}}.validate_skip(ops, cs, weak);
 }
 
 bool MessageRelaxed::unpack(vm::CellSlice& cs, MessageRelaxed::Record& data) const {
@@ -4441,7 +4446,7 @@ bool IntermediateAddress::skip(vm::CellSlice& cs) const {
   return false;
 }
 
-bool IntermediateAddress::validate_skip(vm::CellSlice& cs, bool weak) const {
+bool IntermediateAddress::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const {
   switch (get_tag(cs)) {
   case interm_addr_regular: {
     int use_dest_bits;
@@ -4635,12 +4640,12 @@ bool MsgEnvelope::skip(vm::CellSlice& cs) const {
       && cs.advance_refs(1);
 }
 
-bool MsgEnvelope::validate_skip(vm::CellSlice& cs, bool weak) const {
+bool MsgEnvelope::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const {
   return cs.fetch_ulong(4) == 4
-      && t_IntermediateAddress.validate_skip(cs, weak)
-      && t_IntermediateAddress.validate_skip(cs, weak)
-      && t_Grams.validate_skip(cs, weak)
-      && t_Message_Any.validate_skip_ref(cs, weak);
+      && t_IntermediateAddress.validate_skip(ops, cs, weak)
+      && t_IntermediateAddress.validate_skip(ops, cs, weak)
+      && t_Grams.validate_skip(ops, cs, weak)
+      && t_Message_Any.validate_skip_ref(ops, cs, weak);
 }
 
 bool MsgEnvelope::unpack(vm::CellSlice& cs, MsgEnvelope::Record& data) const {
@@ -4739,43 +4744,43 @@ bool InMsg::skip(vm::CellSlice& cs) const {
   return false;
 }
 
-bool InMsg::validate_skip(vm::CellSlice& cs, bool weak) const {
+bool InMsg::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const {
   switch (get_tag(cs)) {
   case msg_import_ext:
     return cs.fetch_ulong(3) == 0
-        && t_Message_Any.validate_skip_ref(cs, weak)
-        && t_Transaction.validate_skip_ref(cs, weak);
+        && t_Message_Any.validate_skip_ref(ops, cs, weak)
+        && t_Transaction.validate_skip_ref(ops, cs, weak);
   case msg_import_ihr:
     return cs.advance(3)
-        && t_Message_Any.validate_skip_ref(cs, weak)
-        && t_Transaction.validate_skip_ref(cs, weak)
-        && t_Grams.validate_skip(cs, weak)
+        && t_Message_Any.validate_skip_ref(ops, cs, weak)
+        && t_Transaction.validate_skip_ref(ops, cs, weak)
+        && t_Grams.validate_skip(ops, cs, weak)
         && cs.advance_refs(1);
   case msg_import_imm:
     return cs.advance(3)
-        && t_MsgEnvelope.validate_skip_ref(cs, weak)
-        && t_Transaction.validate_skip_ref(cs, weak)
-        && t_Grams.validate_skip(cs, weak);
+        && t_MsgEnvelope.validate_skip_ref(ops, cs, weak)
+        && t_Transaction.validate_skip_ref(ops, cs, weak)
+        && t_Grams.validate_skip(ops, cs, weak);
   case msg_import_fin:
     return cs.advance(3)
-        && t_MsgEnvelope.validate_skip_ref(cs, weak)
-        && t_Transaction.validate_skip_ref(cs, weak)
-        && t_Grams.validate_skip(cs, weak);
+        && t_MsgEnvelope.validate_skip_ref(ops, cs, weak)
+        && t_Transaction.validate_skip_ref(ops, cs, weak)
+        && t_Grams.validate_skip(ops, cs, weak);
   case msg_import_tr:
     return cs.advance(3)
-        && t_MsgEnvelope.validate_skip_ref(cs, weak)
-        && t_MsgEnvelope.validate_skip_ref(cs, weak)
-        && t_Grams.validate_skip(cs, weak);
+        && t_MsgEnvelope.validate_skip_ref(ops, cs, weak)
+        && t_MsgEnvelope.validate_skip_ref(ops, cs, weak)
+        && t_Grams.validate_skip(ops, cs, weak);
   case msg_discard_fin:
     return cs.advance(3)
-        && t_MsgEnvelope.validate_skip_ref(cs, weak)
+        && t_MsgEnvelope.validate_skip_ref(ops, cs, weak)
         && cs.advance(64)
-        && t_Grams.validate_skip(cs, weak);
+        && t_Grams.validate_skip(ops, cs, weak);
   case msg_discard_tr:
     return cs.advance(3)
-        && t_MsgEnvelope.validate_skip_ref(cs, weak)
+        && t_MsgEnvelope.validate_skip_ref(ops, cs, weak)
         && cs.advance(64)
-        && t_Grams.validate_skip(cs, weak)
+        && t_Grams.validate_skip(ops, cs, weak)
         && cs.advance_refs(1);
   }
   return false;
@@ -5172,9 +5177,9 @@ bool ImportFees::skip(vm::CellSlice& cs) const {
       && t_CurrencyCollection.skip(cs);
 }
 
-bool ImportFees::validate_skip(vm::CellSlice& cs, bool weak) const {
-  return t_Grams.validate_skip(cs, weak)
-      && t_CurrencyCollection.validate_skip(cs, weak);
+bool ImportFees::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const {
+  return t_Grams.validate_skip(ops, cs, weak)
+      && t_CurrencyCollection.validate_skip(ops, cs, weak);
 }
 
 bool ImportFees::unpack(vm::CellSlice& cs, ImportFees::Record& data) const {
@@ -5242,8 +5247,8 @@ bool InMsgDescr::skip(vm::CellSlice& cs) const {
   return t_HashmapAugE_256_InMsg_ImportFees.skip(cs);
 }
 
-bool InMsgDescr::validate_skip(vm::CellSlice& cs, bool weak) const {
-  return t_HashmapAugE_256_InMsg_ImportFees.validate_skip(cs, weak);
+bool InMsgDescr::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const {
+  return t_HashmapAugE_256_InMsg_ImportFees.validate_skip(ops, cs, weak);
 }
 
 bool InMsgDescr::unpack(vm::CellSlice& cs, InMsgDescr::Record& data) const {
@@ -5338,37 +5343,37 @@ bool OutMsg::skip(vm::CellSlice& cs) const {
   return false;
 }
 
-bool OutMsg::validate_skip(vm::CellSlice& cs, bool weak) const {
+bool OutMsg::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const {
   switch (get_tag(cs)) {
   case msg_export_ext:
     return cs.advance(3)
-        && t_Message_Any.validate_skip_ref(cs, weak)
-        && t_Transaction.validate_skip_ref(cs, weak);
+        && t_Message_Any.validate_skip_ref(ops, cs, weak)
+        && t_Transaction.validate_skip_ref(ops, cs, weak);
   case msg_export_imm:
     return cs.advance(3)
-        && t_MsgEnvelope.validate_skip_ref(cs, weak)
-        && t_Transaction.validate_skip_ref(cs, weak)
-        && t_InMsg.validate_skip_ref(cs, weak);
+        && t_MsgEnvelope.validate_skip_ref(ops, cs, weak)
+        && t_Transaction.validate_skip_ref(ops, cs, weak)
+        && t_InMsg.validate_skip_ref(ops, cs, weak);
   case msg_export_new:
     return cs.advance(3)
-        && t_MsgEnvelope.validate_skip_ref(cs, weak)
-        && t_Transaction.validate_skip_ref(cs, weak);
+        && t_MsgEnvelope.validate_skip_ref(ops, cs, weak)
+        && t_Transaction.validate_skip_ref(ops, cs, weak);
   case msg_export_tr:
     return cs.advance(3)
-        && t_MsgEnvelope.validate_skip_ref(cs, weak)
-        && t_InMsg.validate_skip_ref(cs, weak);
+        && t_MsgEnvelope.validate_skip_ref(ops, cs, weak)
+        && t_InMsg.validate_skip_ref(ops, cs, weak);
   case msg_export_deq:
     return cs.advance(3)
-        && t_MsgEnvelope.validate_skip_ref(cs, weak)
+        && t_MsgEnvelope.validate_skip_ref(ops, cs, weak)
         && cs.advance(64);
   case msg_export_tr_req:
     return cs.advance(3)
-        && t_MsgEnvelope.validate_skip_ref(cs, weak)
-        && t_InMsg.validate_skip_ref(cs, weak);
+        && t_MsgEnvelope.validate_skip_ref(ops, cs, weak)
+        && t_InMsg.validate_skip_ref(ops, cs, weak);
   case msg_export_deq_imm:
     return cs.fetch_ulong(3) == 4
-        && t_MsgEnvelope.validate_skip_ref(cs, weak)
-        && t_InMsg.validate_skip_ref(cs, weak);
+        && t_MsgEnvelope.validate_skip_ref(ops, cs, weak)
+        && t_InMsg.validate_skip_ref(ops, cs, weak);
   }
   return false;
 }
@@ -5772,9 +5777,9 @@ int EnqueuedMsg::check_tag(const vm::CellSlice& cs) const {
   return cons1;
 }
 
-bool EnqueuedMsg::validate_skip(vm::CellSlice& cs, bool weak) const {
+bool EnqueuedMsg::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const {
   return cs.advance(64)
-      && t_MsgEnvelope.validate_skip_ref(cs, weak);
+      && t_MsgEnvelope.validate_skip_ref(ops, cs, weak);
 }
 
 bool EnqueuedMsg::unpack(vm::CellSlice& cs, EnqueuedMsg::Record& data) const {
@@ -5841,8 +5846,8 @@ bool OutMsgDescr::skip(vm::CellSlice& cs) const {
   return t_HashmapAugE_256_OutMsg_CurrencyCollection.skip(cs);
 }
 
-bool OutMsgDescr::validate_skip(vm::CellSlice& cs, bool weak) const {
-  return t_HashmapAugE_256_OutMsg_CurrencyCollection.validate_skip(cs, weak);
+bool OutMsgDescr::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const {
+  return t_HashmapAugE_256_OutMsg_CurrencyCollection.validate_skip(ops, cs, weak);
 }
 
 bool OutMsgDescr::unpack(vm::CellSlice& cs, OutMsgDescr::Record& data) const {
@@ -5904,8 +5909,8 @@ bool OutMsgQueue::skip(vm::CellSlice& cs) const {
   return t_HashmapAugE_352_EnqueuedMsg_uint64.skip(cs);
 }
 
-bool OutMsgQueue::validate_skip(vm::CellSlice& cs, bool weak) const {
-  return t_HashmapAugE_352_EnqueuedMsg_uint64.validate_skip(cs, weak);
+bool OutMsgQueue::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const {
+  return t_HashmapAugE_352_EnqueuedMsg_uint64.validate_skip(ops, cs, weak);
 }
 
 bool OutMsgQueue::unpack(vm::CellSlice& cs, OutMsgQueue::Record& data) const {
@@ -6026,8 +6031,8 @@ bool ProcessedInfo::skip(vm::CellSlice& cs) const {
   return t_HashmapE_96_ProcessedUpto.skip(cs);
 }
 
-bool ProcessedInfo::validate_skip(vm::CellSlice& cs, bool weak) const {
-  return t_HashmapE_96_ProcessedUpto.validate_skip(cs, weak);
+bool ProcessedInfo::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const {
+  return t_HashmapE_96_ProcessedUpto.validate_skip(ops, cs, weak);
 }
 
 bool ProcessedInfo::unpack(vm::CellSlice& cs, ProcessedInfo::Record& data) const {
@@ -6143,8 +6148,8 @@ bool IhrPendingInfo::skip(vm::CellSlice& cs) const {
   return t_HashmapE_320_IhrPendingSince.skip(cs);
 }
 
-bool IhrPendingInfo::validate_skip(vm::CellSlice& cs, bool weak) const {
-  return t_HashmapE_320_IhrPendingSince.validate_skip(cs, weak);
+bool IhrPendingInfo::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const {
+  return t_HashmapE_320_IhrPendingSince.validate_skip(ops, cs, weak);
 }
 
 bool IhrPendingInfo::unpack(vm::CellSlice& cs, IhrPendingInfo::Record& data) const {
@@ -6208,10 +6213,10 @@ bool OutMsgQueueInfo::skip(vm::CellSlice& cs) const {
       && t_IhrPendingInfo.skip(cs);
 }
 
-bool OutMsgQueueInfo::validate_skip(vm::CellSlice& cs, bool weak) const {
-  return t_OutMsgQueue.validate_skip(cs, weak)
-      && t_ProcessedInfo.validate_skip(cs, weak)
-      && t_IhrPendingInfo.validate_skip(cs, weak);
+bool OutMsgQueueInfo::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const {
+  return t_OutMsgQueue.validate_skip(ops, cs, weak)
+      && t_ProcessedInfo.validate_skip(ops, cs, weak)
+      && t_IhrPendingInfo.validate_skip(ops, cs, weak);
 }
 
 bool OutMsgQueueInfo::unpack(vm::CellSlice& cs, OutMsgQueueInfo::Record& data) const {
@@ -6287,10 +6292,10 @@ bool StorageUsed::skip(vm::CellSlice& cs) const {
       && t_VarUInteger_7.skip(cs);
 }
 
-bool StorageUsed::validate_skip(vm::CellSlice& cs, bool weak) const {
-  return t_VarUInteger_7.validate_skip(cs, weak)
-      && t_VarUInteger_7.validate_skip(cs, weak)
-      && t_VarUInteger_7.validate_skip(cs, weak);
+bool StorageUsed::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const {
+  return t_VarUInteger_7.validate_skip(ops, cs, weak)
+      && t_VarUInteger_7.validate_skip(ops, cs, weak)
+      && t_VarUInteger_7.validate_skip(ops, cs, weak);
 }
 
 bool StorageUsed::unpack(vm::CellSlice& cs, StorageUsed::Record& data) const {
@@ -6365,9 +6370,9 @@ bool StorageUsedShort::skip(vm::CellSlice& cs) const {
       && t_VarUInteger_7.skip(cs);
 }
 
-bool StorageUsedShort::validate_skip(vm::CellSlice& cs, bool weak) const {
-  return t_VarUInteger_7.validate_skip(cs, weak)
-      && t_VarUInteger_7.validate_skip(cs, weak);
+bool StorageUsedShort::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const {
+  return t_VarUInteger_7.validate_skip(ops, cs, weak)
+      && t_VarUInteger_7.validate_skip(ops, cs, weak);
 }
 
 bool StorageUsedShort::unpack(vm::CellSlice& cs, StorageUsedShort::Record& data) const {
@@ -6437,10 +6442,10 @@ bool StorageInfo::skip(vm::CellSlice& cs) const {
       && t_Maybe_Grams.skip(cs);
 }
 
-bool StorageInfo::validate_skip(vm::CellSlice& cs, bool weak) const {
-  return t_StorageUsed.validate_skip(cs, weak)
+bool StorageInfo::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const {
+  return t_StorageUsed.validate_skip(ops, cs, weak)
       && cs.advance(32)
-      && t_Maybe_Grams.validate_skip(cs, weak);
+      && t_Maybe_Grams.validate_skip(ops, cs, weak);
 }
 
 bool StorageInfo::unpack(vm::CellSlice& cs, StorageInfo::Record& data) const {
@@ -6528,15 +6533,15 @@ bool Account::skip(vm::CellSlice& cs) const {
   return false;
 }
 
-bool Account::validate_skip(vm::CellSlice& cs, bool weak) const {
+bool Account::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const {
   switch (get_tag(cs)) {
   case account_none:
     return cs.advance(1);
   case account:
     return cs.advance(1)
-        && t_MsgAddressInt.validate_skip(cs, weak)
-        && t_StorageInfo.validate_skip(cs, weak)
-        && t_AccountStorage.validate_skip(cs, weak);
+        && t_MsgAddressInt.validate_skip(ops, cs, weak)
+        && t_StorageInfo.validate_skip(ops, cs, weak)
+        && t_AccountStorage.validate_skip(ops, cs, weak);
   }
   return false;
 }
@@ -6664,10 +6669,10 @@ bool AccountStorage::skip(vm::CellSlice& cs) const {
       && t_AccountState.skip(cs);
 }
 
-bool AccountStorage::validate_skip(vm::CellSlice& cs, bool weak) const {
+bool AccountStorage::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const {
   return cs.advance(64)
-      && t_CurrencyCollection.validate_skip(cs, weak)
-      && t_AccountState.validate_skip(cs, weak);
+      && t_CurrencyCollection.validate_skip(ops, cs, weak)
+      && t_AccountState.validate_skip(ops, cs, weak);
 }
 
 bool AccountStorage::unpack(vm::CellSlice& cs, AccountStorage::Record& data) const {
@@ -6759,13 +6764,13 @@ bool AccountState::skip(vm::CellSlice& cs) const {
   return false;
 }
 
-bool AccountState::validate_skip(vm::CellSlice& cs, bool weak) const {
+bool AccountState::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const {
   switch (get_tag(cs)) {
   case account_uninit:
     return cs.advance(2);
   case account_active:
     return cs.advance(1)
-        && t_StateInit.validate_skip(cs, weak);
+        && t_StateInit.validate_skip(ops, cs, weak);
   case account_frozen:
     return cs.advance(258);
   }
@@ -7123,8 +7128,8 @@ int ShardAccount::check_tag(const vm::CellSlice& cs) const {
   return account_descr;
 }
 
-bool ShardAccount::validate_skip(vm::CellSlice& cs, bool weak) const {
-  return t_Account.validate_skip_ref(cs, weak)
+bool ShardAccount::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const {
+  return t_Account.validate_skip_ref(ops, cs, weak)
       && cs.advance(320);
 }
 
@@ -7198,10 +7203,10 @@ bool DepthBalanceInfo::skip(vm::CellSlice& cs) const {
       && t_CurrencyCollection.skip(cs);
 }
 
-bool DepthBalanceInfo::validate_skip(vm::CellSlice& cs, bool weak) const {
+bool DepthBalanceInfo::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const {
   int split_depth;
   return cs.fetch_uint_leq(30, split_depth)
-      && t_CurrencyCollection.validate_skip(cs, weak);
+      && t_CurrencyCollection.validate_skip(ops, cs, weak);
 }
 
 bool DepthBalanceInfo::unpack(vm::CellSlice& cs, DepthBalanceInfo::Record& data) const {
@@ -7270,8 +7275,8 @@ bool ShardAccounts::skip(vm::CellSlice& cs) const {
   return t_HashmapAugE_256_ShardAccount_DepthBalanceInfo.skip(cs);
 }
 
-bool ShardAccounts::validate_skip(vm::CellSlice& cs, bool weak) const {
-  return t_HashmapAugE_256_ShardAccount_DepthBalanceInfo.validate_skip(cs, weak);
+bool ShardAccounts::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const {
+  return t_HashmapAugE_256_ShardAccount_DepthBalanceInfo.validate_skip(ops, cs, weak);
 }
 
 bool ShardAccounts::unpack(vm::CellSlice& cs, ShardAccounts::Record& data) const {
@@ -7334,9 +7339,9 @@ bool Transaction_aux::skip(vm::CellSlice& cs) const {
       && t_HashmapE_15_Ref_Message_Any.skip(cs);
 }
 
-bool Transaction_aux::validate_skip(vm::CellSlice& cs, bool weak) const {
-  return t_Maybe_Ref_Message_Any.validate_skip(cs, weak)
-      && t_HashmapE_15_Ref_Message_Any.validate_skip(cs, weak);
+bool Transaction_aux::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const {
+  return t_Maybe_Ref_Message_Any.validate_skip(ops, cs, weak)
+      && t_HashmapE_15_Ref_Message_Any.validate_skip(ops, cs, weak);
 }
 
 bool Transaction_aux::unpack(vm::CellSlice& cs, Transaction_aux::Record& data) const {
@@ -7407,13 +7412,13 @@ bool Transaction::skip(vm::CellSlice& cs) const {
       && cs.advance_refs(2);
 }
 
-bool Transaction::validate_skip(vm::CellSlice& cs, bool weak) const {
+bool Transaction::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const {
   return cs.fetch_ulong(4) == 7
       && cs.advance(691)
-      && t_Transaction_aux.validate_skip_ref(cs, weak)
-      && t_CurrencyCollection.validate_skip(cs, weak)
-      && t_HASH_UPDATE_Account.validate_skip_ref(cs, weak)
-      && t_TransactionDescr.validate_skip_ref(cs, weak);
+      && t_Transaction_aux.validate_skip_ref(ops, cs, weak)
+      && t_CurrencyCollection.validate_skip(ops, cs, weak)
+      && t_HASH_UPDATE_Account.validate_skip_ref(ops, cs, weak)
+      && t_TransactionDescr.validate_skip_ref(ops, cs, weak);
 }
 
 bool Transaction::unpack(vm::CellSlice& cs, Transaction::Record& data) const {
@@ -7496,11 +7501,11 @@ int MERKLE_UPDATE::check_tag(const vm::CellSlice& cs) const {
   return cs.prefetch_ulong(8) == 2 ? _merkle_update : -1;
 }
 
-bool MERKLE_UPDATE::validate_skip(vm::CellSlice& cs, bool weak) const {
+bool MERKLE_UPDATE::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const {
   return cs.fetch_ulong(8) == 2
       && cs.advance(512)
-      && X_.validate_skip_ref(cs, weak)
-      && X_.validate_skip_ref(cs, weak);
+      && X_.validate_skip_ref(ops, cs, weak)
+      && X_.validate_skip_ref(ops, cs, weak);
 }
 
 bool MERKLE_UPDATE::unpack(vm::CellSlice& cs, MERKLE_UPDATE::Record& data) const {
@@ -7552,7 +7557,7 @@ int HASH_UPDATE::check_tag(const vm::CellSlice& cs) const {
   return cs.prefetch_ulong(8) == 0x72 ? update_hashes : -1;
 }
 
-bool HASH_UPDATE::validate_skip(vm::CellSlice& cs, bool weak) const {
+bool HASH_UPDATE::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const {
   return cs.fetch_ulong(8) == 0x72
       && cs.advance(512);
 }
@@ -7627,11 +7632,11 @@ bool AccountBlock::skip(vm::CellSlice& cs) const {
       && cs.advance_refs(1);
 }
 
-bool AccountBlock::validate_skip(vm::CellSlice& cs, bool weak) const {
+bool AccountBlock::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const {
   return cs.fetch_ulong(4) == 5
       && cs.advance(256)
-      && t_HashmapAug_64_Ref_Transaction_CurrencyCollection.validate_skip(cs, weak)
-      && t_HASH_UPDATE_Account.validate_skip_ref(cs, weak);
+      && t_HashmapAug_64_Ref_Transaction_CurrencyCollection.validate_skip(ops, cs, weak)
+      && t_HASH_UPDATE_Account.validate_skip_ref(ops, cs, weak);
 }
 
 bool AccountBlock::unpack(vm::CellSlice& cs, AccountBlock::Record& data) const {
@@ -7709,8 +7714,8 @@ bool ShardAccountBlocks::skip(vm::CellSlice& cs) const {
   return t_HashmapAugE_256_AccountBlock_CurrencyCollection.skip(cs);
 }
 
-bool ShardAccountBlocks::validate_skip(vm::CellSlice& cs, bool weak) const {
-  return t_HashmapAugE_256_AccountBlock_CurrencyCollection.validate_skip(cs, weak);
+bool ShardAccountBlocks::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const {
+  return t_HashmapAugE_256_AccountBlock_CurrencyCollection.validate_skip(ops, cs, weak);
 }
 
 bool ShardAccountBlocks::unpack(vm::CellSlice& cs, ShardAccountBlocks::Record& data) const {
@@ -7774,10 +7779,10 @@ bool TrStoragePhase::skip(vm::CellSlice& cs) const {
       && t_AccStatusChange.skip(cs);
 }
 
-bool TrStoragePhase::validate_skip(vm::CellSlice& cs, bool weak) const {
-  return t_Grams.validate_skip(cs, weak)
-      && t_Maybe_Grams.validate_skip(cs, weak)
-      && t_AccStatusChange.validate_skip(cs, weak);
+bool TrStoragePhase::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const {
+  return t_Grams.validate_skip(ops, cs, weak)
+      && t_Maybe_Grams.validate_skip(ops, cs, weak)
+      && t_AccStatusChange.validate_skip(ops, cs, weak);
 }
 
 bool TrStoragePhase::unpack(vm::CellSlice& cs, TrStoragePhase::Record& data) const {
@@ -7869,7 +7874,7 @@ bool AccStatusChange::skip(vm::CellSlice& cs) const {
   return false;
 }
 
-bool AccStatusChange::validate_skip(vm::CellSlice& cs, bool weak) const {
+bool AccStatusChange::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const {
   switch (get_tag(cs)) {
   case acst_unchanged:
     return cs.advance(1);
@@ -8035,9 +8040,9 @@ bool TrCreditPhase::skip(vm::CellSlice& cs) const {
       && t_CurrencyCollection.skip(cs);
 }
 
-bool TrCreditPhase::validate_skip(vm::CellSlice& cs, bool weak) const {
-  return t_Maybe_Grams.validate_skip(cs, weak)
-      && t_CurrencyCollection.validate_skip(cs, weak);
+bool TrCreditPhase::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const {
+  return t_Maybe_Grams.validate_skip(ops, cs, weak)
+      && t_CurrencyCollection.validate_skip(ops, cs, weak);
 }
 
 bool TrCreditPhase::unpack(vm::CellSlice& cs, TrCreditPhase::Record& data) const {
@@ -8110,12 +8115,12 @@ bool TrComputePhase_aux::skip(vm::CellSlice& cs) const {
       && cs.advance(544);
 }
 
-bool TrComputePhase_aux::validate_skip(vm::CellSlice& cs, bool weak) const {
-  return t_VarUInteger_7.validate_skip(cs, weak)
-      && t_VarUInteger_7.validate_skip(cs, weak)
-      && t_Maybe_VarUInteger_3.validate_skip(cs, weak)
+bool TrComputePhase_aux::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const {
+  return t_VarUInteger_7.validate_skip(ops, cs, weak)
+      && t_VarUInteger_7.validate_skip(ops, cs, weak)
+      && t_Maybe_VarUInteger_3.validate_skip(ops, cs, weak)
       && cs.advance(40)
-      && t_Maybe_int32.validate_skip(cs, weak)
+      && t_Maybe_int32.validate_skip(ops, cs, weak)
       && cs.advance(544);
 }
 
@@ -8200,15 +8205,15 @@ bool TrComputePhase::skip(vm::CellSlice& cs) const {
   return false;
 }
 
-bool TrComputePhase::validate_skip(vm::CellSlice& cs, bool weak) const {
+bool TrComputePhase::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const {
   switch (get_tag(cs)) {
   case tr_phase_compute_skipped:
     return cs.advance(1)
-        && t_ComputeSkipReason.validate_skip(cs, weak);
+        && t_ComputeSkipReason.validate_skip(ops, cs, weak);
   case tr_phase_compute_vm:
     return cs.advance(4)
-        && t_Grams.validate_skip(cs, weak)
-        && t_TrComputePhase_aux.validate_skip_ref(cs, weak);
+        && t_Grams.validate_skip(ops, cs, weak)
+        && t_TrComputePhase_aux.validate_skip_ref(ops, cs, weak);
   }
   return false;
 }
@@ -8327,7 +8332,7 @@ int ComputeSkipReason::check_tag(const vm::CellSlice& cs) const {
   return -1;
 }
 
-bool ComputeSkipReason::validate_skip(vm::CellSlice& cs, bool weak) const {
+bool ComputeSkipReason::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const {
   switch (get_tag(cs)) {
   case cskip_no_state:
     return cs.advance(2);
@@ -8499,15 +8504,15 @@ bool TrActionPhase::skip(vm::CellSlice& cs) const {
       && t_StorageUsedShort.skip(cs);
 }
 
-bool TrActionPhase::validate_skip(vm::CellSlice& cs, bool weak) const {
+bool TrActionPhase::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const {
   return cs.advance(3)
-      && t_AccStatusChange.validate_skip(cs, weak)
-      && t_Maybe_Grams.validate_skip(cs, weak)
-      && t_Maybe_Grams.validate_skip(cs, weak)
+      && t_AccStatusChange.validate_skip(ops, cs, weak)
+      && t_Maybe_Grams.validate_skip(ops, cs, weak)
+      && t_Maybe_Grams.validate_skip(ops, cs, weak)
       && cs.advance(32)
-      && t_Maybe_int32.validate_skip(cs, weak)
+      && t_Maybe_int32.validate_skip(ops, cs, weak)
       && cs.advance(320)
-      && t_StorageUsedShort.validate_skip(cs, weak);
+      && t_StorageUsedShort.validate_skip(ops, cs, weak);
 }
 
 bool TrActionPhase::unpack(vm::CellSlice& cs, TrActionPhase::Record& data) const {
@@ -8616,19 +8621,19 @@ bool TrBouncePhase::skip(vm::CellSlice& cs) const {
   return false;
 }
 
-bool TrBouncePhase::validate_skip(vm::CellSlice& cs, bool weak) const {
+bool TrBouncePhase::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const {
   switch (get_tag(cs)) {
   case tr_phase_bounce_negfunds:
     return cs.advance(2);
   case tr_phase_bounce_nofunds:
     return cs.advance(2)
-        && t_StorageUsedShort.validate_skip(cs, weak)
-        && t_Grams.validate_skip(cs, weak);
+        && t_StorageUsedShort.validate_skip(ops, cs, weak)
+        && t_Grams.validate_skip(ops, cs, weak);
   case tr_phase_bounce_ok:
     return cs.advance(1)
-        && t_StorageUsedShort.validate_skip(cs, weak)
-        && t_Grams.validate_skip(cs, weak)
-        && t_Grams.validate_skip(cs, weak);
+        && t_StorageUsedShort.validate_skip(ops, cs, weak)
+        && t_Grams.validate_skip(ops, cs, weak)
+        && t_Grams.validate_skip(ops, cs, weak);
   }
   return false;
 }
@@ -8912,48 +8917,48 @@ bool TransactionDescr::skip(vm::CellSlice& cs) const {
   return false;
 }
 
-bool TransactionDescr::validate_skip(vm::CellSlice& cs, bool weak) const {
+bool TransactionDescr::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const {
   switch (get_tag(cs)) {
   case trans_ord:
     return cs.advance(5)
-        && t_Maybe_TrStoragePhase.validate_skip(cs, weak)
-        && t_Maybe_TrCreditPhase.validate_skip(cs, weak)
-        && t_TrComputePhase.validate_skip(cs, weak)
-        && t_Maybe_Ref_TrActionPhase.validate_skip(cs, weak)
+        && t_Maybe_TrStoragePhase.validate_skip(ops, cs, weak)
+        && t_Maybe_TrCreditPhase.validate_skip(ops, cs, weak)
+        && t_TrComputePhase.validate_skip(ops, cs, weak)
+        && t_Maybe_Ref_TrActionPhase.validate_skip(ops, cs, weak)
         && cs.advance(1)
-        && t_Maybe_TrBouncePhase.validate_skip(cs, weak)
+        && t_Maybe_TrBouncePhase.validate_skip(ops, cs, weak)
         && cs.advance(1);
   case trans_storage:
     return cs.advance(4)
-        && t_TrStoragePhase.validate_skip(cs, weak);
+        && t_TrStoragePhase.validate_skip(ops, cs, weak);
   case trans_tick_tock:
     return cs.advance(4)
-        && t_TrStoragePhase.validate_skip(cs, weak)
-        && t_TrComputePhase.validate_skip(cs, weak)
-        && t_Maybe_Ref_TrActionPhase.validate_skip(cs, weak)
+        && t_TrStoragePhase.validate_skip(ops, cs, weak)
+        && t_TrComputePhase.validate_skip(ops, cs, weak)
+        && t_Maybe_Ref_TrActionPhase.validate_skip(ops, cs, weak)
         && cs.advance(2);
   case trans_split_prepare:
     return cs.advance(528)
-        && t_Maybe_TrStoragePhase.validate_skip(cs, weak)
-        && t_TrComputePhase.validate_skip(cs, weak)
-        && t_Maybe_Ref_TrActionPhase.validate_skip(cs, weak)
+        && t_Maybe_TrStoragePhase.validate_skip(ops, cs, weak)
+        && t_TrComputePhase.validate_skip(ops, cs, weak)
+        && t_Maybe_Ref_TrActionPhase.validate_skip(ops, cs, weak)
         && cs.advance(2);
   case trans_split_install:
     return cs.advance(528)
-        && t_Transaction.validate_skip_ref(cs, weak)
+        && t_Transaction.validate_skip_ref(ops, cs, weak)
         && cs.advance(1);
   case trans_merge_prepare:
     return cs.advance(528)
-        && t_TrStoragePhase.validate_skip(cs, weak)
+        && t_TrStoragePhase.validate_skip(ops, cs, weak)
         && cs.advance(1);
   case trans_merge_install:
     return cs.fetch_ulong(4) == 7
         && cs.advance(524)
-        && t_Transaction.validate_skip_ref(cs, weak)
-        && t_Maybe_TrStoragePhase.validate_skip(cs, weak)
-        && t_Maybe_TrCreditPhase.validate_skip(cs, weak)
-        && t_TrComputePhase.validate_skip(cs, weak)
-        && t_Maybe_Ref_TrActionPhase.validate_skip(cs, weak)
+        && t_Transaction.validate_skip_ref(ops, cs, weak)
+        && t_Maybe_TrStoragePhase.validate_skip(ops, cs, weak)
+        && t_Maybe_TrCreditPhase.validate_skip(ops, cs, weak)
+        && t_TrComputePhase.validate_skip(ops, cs, weak)
+        && t_Maybe_Ref_TrActionPhase.validate_skip(ops, cs, weak)
         && cs.advance(2);
   }
   return false;
@@ -9342,11 +9347,11 @@ bool SmartContractInfo::skip(vm::CellSlice& cs) const {
       && t_MsgAddressInt.skip(cs);
 }
 
-bool SmartContractInfo::validate_skip(vm::CellSlice& cs, bool weak) const {
+bool SmartContractInfo::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const {
   return cs.fetch_ulong(32) == 0x76ef1ea
       && cs.advance(448)
-      && t_CurrencyCollection.validate_skip(cs, weak)
-      && t_MsgAddressInt.validate_skip(cs, weak);
+      && t_CurrencyCollection.validate_skip(ops, cs, weak)
+      && t_MsgAddressInt.validate_skip(ops, cs, weak);
 }
 
 bool SmartContractInfo::unpack(vm::CellSlice& cs, SmartContractInfo::Record& data) const {
@@ -9435,15 +9440,15 @@ bool OutList::skip(vm::CellSlice& cs) const {
   return false;
 }
 
-bool OutList::validate_skip(vm::CellSlice& cs, bool weak) const {
+bool OutList::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const {
   switch (get_tag(cs)) {
   case out_list_empty:
     return m_ == 0;
   case out_list: {
     int n;
     return add_r1(n, 1, m_)
-        && OutList{n}.validate_skip_ref(cs, weak)
-        && t_OutAction.validate_skip(cs, weak);
+        && OutList{n}.validate_skip_ref(ops, cs, weak)
+        && t_OutAction.validate_skip(ops, cs, weak);
     }
   }
   return false;
@@ -9555,10 +9560,147 @@ bool OutList::print_skip(PrettyPrinter& pp, vm::CellSlice& cs) const {
 }
 
 
+//
+// code for type `LibRef`
+//
+
+int LibRef::check_tag(const vm::CellSlice& cs) const {
+  switch (get_tag(cs)) {
+  case libref_hash:
+    return cs.have(1) ? libref_hash : -1;
+  case libref_ref:
+    return cs.have(1) ? libref_ref : -1;
+  }
+  return -1;
+}
+
+bool LibRef::skip(vm::CellSlice& cs) const {
+  switch (get_tag(cs)) {
+  case libref_hash:
+    return cs.advance(257);
+  case libref_ref:
+    return cs.advance_ext(0x10001);
+  }
+  return false;
+}
+
+bool LibRef::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const {
+  switch (get_tag(cs)) {
+  case libref_hash:
+    return cs.advance(257);
+  case libref_ref:
+    return cs.advance_ext(0x10001);
+  }
+  return false;
+}
+
+bool LibRef::unpack(vm::CellSlice& cs, LibRef::Record_libref_hash& data) const {
+  return cs.fetch_ulong(1) == 0
+      && cs.fetch_bits_to(data.lib_hash.bits(), 256);
+}
+
+bool LibRef::unpack_libref_hash(vm::CellSlice& cs, td::BitArray<256>& lib_hash) const {
+  return cs.fetch_ulong(1) == 0
+      && cs.fetch_bits_to(lib_hash.bits(), 256);
+}
+
+bool LibRef::cell_unpack(Ref<vm::Cell> cell_ref, LibRef::Record_libref_hash& data) const {
+  if (cell_ref.is_null()) { return false; }
+  auto cs = load_cell_slice(std::move(cell_ref));
+  return unpack(cs, data) && cs.empty_ext();
+}
+
+bool LibRef::cell_unpack_libref_hash(Ref<vm::Cell> cell_ref, td::BitArray<256>& lib_hash) const {
+  if (cell_ref.is_null()) { return false; }
+  auto cs = load_cell_slice(std::move(cell_ref));
+  return unpack_libref_hash(cs, lib_hash) && cs.empty_ext();
+}
+
+bool LibRef::unpack(vm::CellSlice& cs, LibRef::Record_libref_ref& data) const {
+  return cs.fetch_ulong(1) == 1
+      && cs.fetch_ref_to(data.library);
+}
+
+bool LibRef::unpack_libref_ref(vm::CellSlice& cs, Ref<Cell>& library) const {
+  return cs.fetch_ulong(1) == 1
+      && cs.fetch_ref_to(library);
+}
+
+bool LibRef::cell_unpack(Ref<vm::Cell> cell_ref, LibRef::Record_libref_ref& data) const {
+  if (cell_ref.is_null()) { return false; }
+  auto cs = load_cell_slice(std::move(cell_ref));
+  return unpack(cs, data) && cs.empty_ext();
+}
+
+bool LibRef::cell_unpack_libref_ref(Ref<vm::Cell> cell_ref, Ref<Cell>& library) const {
+  if (cell_ref.is_null()) { return false; }
+  auto cs = load_cell_slice(std::move(cell_ref));
+  return unpack_libref_ref(cs, library) && cs.empty_ext();
+}
+
+bool LibRef::pack(vm::CellBuilder& cb, const LibRef::Record_libref_hash& data) const {
+  return cb.store_long_bool(0, 1)
+      && cb.store_bits_bool(data.lib_hash.cbits(), 256);
+}
+
+bool LibRef::pack_libref_hash(vm::CellBuilder& cb, td::BitArray<256> lib_hash) const {
+  return cb.store_long_bool(0, 1)
+      && cb.store_bits_bool(lib_hash.cbits(), 256);
+}
+
+bool LibRef::cell_pack(Ref<vm::Cell>& cell_ref, const LibRef::Record_libref_hash& data) const {
+  vm::CellBuilder cb;
+  return pack(cb, data) && std::move(cb).finalize_to(cell_ref);
+}
+
+bool LibRef::cell_pack_libref_hash(Ref<vm::Cell>& cell_ref, td::BitArray<256> lib_hash) const {
+  vm::CellBuilder cb;
+  return pack_libref_hash(cb, lib_hash) && std::move(cb).finalize_to(cell_ref);
+}
+
+bool LibRef::pack(vm::CellBuilder& cb, const LibRef::Record_libref_ref& data) const {
+  return cb.store_long_bool(1, 1)
+      && cb.store_ref_bool(data.library);
+}
+
+bool LibRef::pack_libref_ref(vm::CellBuilder& cb, Ref<Cell> library) const {
+  return cb.store_long_bool(1, 1)
+      && cb.store_ref_bool(library);
+}
+
+bool LibRef::cell_pack(Ref<vm::Cell>& cell_ref, const LibRef::Record_libref_ref& data) const {
+  vm::CellBuilder cb;
+  return pack(cb, data) && std::move(cb).finalize_to(cell_ref);
+}
+
+bool LibRef::cell_pack_libref_ref(Ref<vm::Cell>& cell_ref, Ref<Cell> library) const {
+  vm::CellBuilder cb;
+  return pack_libref_ref(cb, std::move(library)) && std::move(cb).finalize_to(cell_ref);
+}
+
+bool LibRef::print_skip(PrettyPrinter& pp, vm::CellSlice& cs) const {
+  switch (get_tag(cs)) {
+  case libref_hash:
+    return cs.advance(1)
+        && pp.open("libref_hash")
+        && pp.fetch_bits_field(cs, 256, "lib_hash")
+        && pp.close();
+  case libref_ref:
+    return cs.advance(1)
+        && pp.open("libref_ref")
+        && pp.field("library")
+        && t_Anything.print_ref(pp, cs.fetch_ref())
+        && pp.close();
+  }
+  return pp.fail("unknown constructor for LibRef");
+}
+
+const LibRef t_LibRef;
+
 //
 // code for type `OutAction`
 //
-constexpr unsigned OutAction::cons_tag[3];
+constexpr unsigned OutAction::cons_tag[4];
 
 int OutAction::check_tag(const vm::CellSlice& cs) const {
   switch (get_tag(cs)) {
@@ -9568,6 +9710,8 @@ int OutAction::check_tag(const vm::CellSlice& cs) const {
     return cs.prefetch_ulong(32) == 0xad4de08eU ? action_set_code : -1;
   case action_reserve_currency:
     return cs.prefetch_ulong(32) == 0x36e6b809 ? action_reserve_currency : -1;
+  case action_change_library:
+    return cs.prefetch_ulong(32) == 0x26fa1dd4 ? action_change_library : -1;
   }
   return -1;
 }
@@ -9581,23 +9725,37 @@ bool OutAction::skip(vm::CellSlice& cs) const {
   case action_reserve_currency:
     return cs.advance(40)
         && t_CurrencyCollection.skip(cs);
+  case action_change_library: {
+    int mode;
+    return cs.advance(32)
+        && cs.fetch_uint_to(7, mode)
+        && mode <= 2
+        && t_LibRef.skip(cs);
+    }
   }
   return false;
 }
 
-bool OutAction::validate_skip(vm::CellSlice& cs, bool weak) const {
+bool OutAction::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const {
   switch (get_tag(cs)) {
   case action_send_msg:
     return cs.fetch_ulong(32) == 0xec3c86d
         && cs.advance(8)
-        && t_MessageRelaxed_Any.validate_skip_ref(cs, weak);
+        && t_MessageRelaxed_Any.validate_skip_ref(ops, cs, weak);
   case action_set_code:
     return cs.fetch_ulong(32) == 0xad4de08eU
         && cs.advance_refs(1);
   case action_reserve_currency:
     return cs.fetch_ulong(32) == 0x36e6b809
         && cs.advance(8)
-        && t_CurrencyCollection.validate_skip(cs, weak);
+        && t_CurrencyCollection.validate_skip(ops, cs, weak);
+  case action_change_library: {
+    int mode;
+    return cs.fetch_ulong(32) == 0x26fa1dd4
+        && cs.fetch_uint_to(7, mode)
+        && mode <= 2
+        && t_LibRef.validate_skip(ops, cs, weak);
+    }
   }
   return false;
 }
@@ -9672,6 +9830,32 @@ bool OutAction::cell_unpack_action_reserve_currency(Ref<vm::Cell> cell_ref, int&
   return unpack_action_reserve_currency(cs, mode, currency) && cs.empty_ext();
 }
 
+bool OutAction::unpack(vm::CellSlice& cs, OutAction::Record_action_change_library& data) const {
+  return cs.fetch_ulong(32) == 0x26fa1dd4
+      && cs.fetch_uint_to(7, data.mode)
+      && data.mode <= 2
+      && t_LibRef.fetch_to(cs, data.libref);
+}
+
+bool OutAction::unpack_action_change_library(vm::CellSlice& cs, int& mode, Ref<CellSlice>& libref) const {
+  return cs.fetch_ulong(32) == 0x26fa1dd4
+      && cs.fetch_uint_to(7, mode)
+      && mode <= 2
+      && t_LibRef.fetch_to(cs, libref);
+}
+
+bool OutAction::cell_unpack(Ref<vm::Cell> cell_ref, OutAction::Record_action_change_library& data) const {
+  if (cell_ref.is_null()) { return false; }
+  auto cs = load_cell_slice(std::move(cell_ref));
+  return unpack(cs, data) && cs.empty_ext();
+}
+
+bool OutAction::cell_unpack_action_change_library(Ref<vm::Cell> cell_ref, int& mode, Ref<CellSlice>& libref) const {
+  if (cell_ref.is_null()) { return false; }
+  auto cs = load_cell_slice(std::move(cell_ref));
+  return unpack_action_change_library(cs, mode, libref) && cs.empty_ext();
+}
+
 bool OutAction::pack(vm::CellBuilder& cb, const OutAction::Record_action_send_msg& data) const {
   return cb.store_long_bool(0xec3c86d, 32)
       && cb.store_ulong_rchk_bool(data.mode, 8)
@@ -9736,6 +9920,30 @@ bool OutAction::cell_pack_action_reserve_currency(Ref<vm::Cell>& cell_ref, int m
   return pack_action_reserve_currency(cb, mode, std::move(currency)) && std::move(cb).finalize_to(cell_ref);
 }
 
+bool OutAction::pack(vm::CellBuilder& cb, const OutAction::Record_action_change_library& data) const {
+  return cb.store_long_bool(0x26fa1dd4, 32)
+      && cb.store_ulong_rchk_bool(data.mode, 7)
+      && data.mode <= 2
+      && t_LibRef.store_from(cb, data.libref);
+}
+
+bool OutAction::pack_action_change_library(vm::CellBuilder& cb, int mode, Ref<CellSlice> libref) const {
+  return cb.store_long_bool(0x26fa1dd4, 32)
+      && cb.store_ulong_rchk_bool(mode, 7)
+      && mode <= 2
+      && t_LibRef.store_from(cb, libref);
+}
+
+bool OutAction::cell_pack(Ref<vm::Cell>& cell_ref, const OutAction::Record_action_change_library& data) const {
+  vm::CellBuilder cb;
+  return pack(cb, data) && std::move(cb).finalize_to(cell_ref);
+}
+
+bool OutAction::cell_pack_action_change_library(Ref<vm::Cell>& cell_ref, int mode, Ref<CellSlice> libref) const {
+  vm::CellBuilder cb;
+  return pack_action_change_library(cb, mode, std::move(libref)) && std::move(cb).finalize_to(cell_ref);
+}
+
 bool OutAction::print_skip(PrettyPrinter& pp, vm::CellSlice& cs) const {
   switch (get_tag(cs)) {
   case action_send_msg: {
@@ -9764,6 +9972,17 @@ bool OutAction::print_skip(PrettyPrinter& pp, vm::CellSlice& cs) const {
         && t_CurrencyCollection.print_skip(pp, cs)
         && pp.close();
     }
+  case action_change_library: {
+    int mode;
+    return cs.fetch_ulong(32) == 0x26fa1dd4
+        && pp.open("action_change_library")
+        && cs.fetch_uint_to(7, mode)
+        && pp.field_int(mode, "mode")
+        && mode <= 2
+        && pp.field("libref")
+        && t_LibRef.print_skip(pp, cs)
+        && pp.close();
+    }
   }
   return pp.fail("unknown constructor for OutAction");
 }
@@ -9783,9 +10002,9 @@ bool OutListNode::skip(vm::CellSlice& cs) const {
       && t_OutAction.skip(cs);
 }
 
-bool OutListNode::validate_skip(vm::CellSlice& cs, bool weak) const {
+bool OutListNode::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const {
   return cs.advance_refs(1)
-      && t_OutAction.validate_skip(cs, weak);
+      && t_OutAction.validate_skip(ops, cs, weak);
 }
 
 bool OutListNode::unpack(vm::CellSlice& cs, OutListNode::Record& data) const {
@@ -9849,7 +10068,7 @@ int ShardIdent::check_tag(const vm::CellSlice& cs) const {
   return cs.prefetch_ulong(2) == 0 ? shard_ident : -1;
 }
 
-bool ShardIdent::validate_skip(vm::CellSlice& cs, bool weak) const {
+bool ShardIdent::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const {
   int shard_pfx_bits;
   return cs.fetch_ulong(2) == 0
       && cs.fetch_uint_leq(60, shard_pfx_bits)
@@ -9971,8 +10190,8 @@ int BlockIdExt::check_tag(const vm::CellSlice& cs) const {
   return block_id_ext;
 }
 
-bool BlockIdExt::validate_skip(vm::CellSlice& cs, bool weak) const {
-  return t_ShardIdent.validate_skip(cs, weak)
+bool BlockIdExt::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const {
+  return t_ShardIdent.validate_skip(ops, cs, weak)
       && cs.advance(544);
 }
 
@@ -10084,12 +10303,12 @@ bool ShardStateUnsplit_aux::skip(vm::CellSlice& cs) const {
       && t_Maybe_BlkMasterInfo.skip(cs);
 }
 
-bool ShardStateUnsplit_aux::validate_skip(vm::CellSlice& cs, bool weak) const {
+bool ShardStateUnsplit_aux::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const {
   return cs.advance(128)
-      && t_CurrencyCollection.validate_skip(cs, weak)
-      && t_CurrencyCollection.validate_skip(cs, weak)
-      && t_HashmapE_256_LibDescr.validate_skip(cs, weak)
-      && t_Maybe_BlkMasterInfo.validate_skip(cs, weak);
+      && t_CurrencyCollection.validate_skip(ops, cs, weak)
+      && t_CurrencyCollection.validate_skip(ops, cs, weak)
+      && t_HashmapE_256_LibDescr.validate_skip(ops, cs, weak)
+      && t_Maybe_BlkMasterInfo.validate_skip(ops, cs, weak);
 }
 
 bool ShardStateUnsplit_aux::unpack(vm::CellSlice& cs, ShardStateUnsplit_aux::Record& data) const {
@@ -10152,16 +10371,16 @@ bool ShardStateUnsplit::skip(vm::CellSlice& cs) const {
       && t_Maybe_Ref_McStateExtra.skip(cs);
 }
 
-bool ShardStateUnsplit::validate_skip(vm::CellSlice& cs, bool weak) const {
+bool ShardStateUnsplit::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const {
   return cs.fetch_ulong(32) == 0x9023afe2U
       && cs.advance(32)
-      && t_ShardIdent.validate_skip(cs, weak)
+      && t_ShardIdent.validate_skip(ops, cs, weak)
       && cs.advance(192)
-      && t_OutMsgQueueInfo.validate_skip_ref(cs, weak)
+      && t_OutMsgQueueInfo.validate_skip_ref(ops, cs, weak)
       && cs.advance(1)
-      && t_ShardAccounts.validate_skip_ref(cs, weak)
-      && t_ShardStateUnsplit_aux.validate_skip_ref(cs, weak)
-      && t_Maybe_Ref_McStateExtra.validate_skip(cs, weak);
+      && t_ShardAccounts.validate_skip_ref(ops, cs, weak)
+      && t_ShardStateUnsplit_aux.validate_skip_ref(ops, cs, weak)
+      && t_Maybe_Ref_McStateExtra.validate_skip(ops, cs, weak);
 }
 
 bool ShardStateUnsplit::unpack(vm::CellSlice& cs, ShardStateUnsplit::Record& data) const {
@@ -10263,14 +10482,14 @@ bool ShardState::skip(vm::CellSlice& cs) const {
   return false;
 }
 
-bool ShardState::validate_skip(vm::CellSlice& cs, bool weak) const {
+bool ShardState::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const {
   switch (get_tag(cs)) {
   case cons1:
-    return t_ShardStateUnsplit.validate_skip(cs, weak);
+    return t_ShardStateUnsplit.validate_skip(ops, cs, weak);
   case split_state:
     return cs.fetch_ulong(32) == 0x5f327da5
-        && t_ShardStateUnsplit.validate_skip_ref(cs, weak)
-        && t_ShardStateUnsplit.validate_skip_ref(cs, weak);
+        && t_ShardStateUnsplit.validate_skip_ref(ops, cs, weak)
+        && t_ShardStateUnsplit.validate_skip_ref(ops, cs, weak);
   }
   return false;
 }
@@ -10393,10 +10612,10 @@ bool LibDescr::skip(vm::CellSlice& cs) const {
       && t_Hashmap_256_True.skip(cs);
 }
 
-bool LibDescr::validate_skip(vm::CellSlice& cs, bool weak) const {
+bool LibDescr::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const {
   return cs.fetch_ulong(2) == 0
       && cs.advance_refs(1)
-      && t_Hashmap_256_True.validate_skip(cs, weak);
+      && t_Hashmap_256_True.validate_skip(ops, cs, weak);
 }
 
 bool LibDescr::unpack(vm::CellSlice& cs, LibDescr::Record& data) const {
@@ -10484,7 +10703,7 @@ bool BlockInfo::skip(vm::CellSlice& cs) const {
       && (!vert_seqno_incr || cs.advance_refs(1));
 }
 
-bool BlockInfo::validate_skip(vm::CellSlice& cs, bool weak) const {
+bool BlockInfo::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const {
   int not_master, after_merge, vert_seqno_incr, seq_no, vert_seq_no, prev_seq_no;
   return cs.fetch_ulong(32) == 0x9bc7a987U
       && cs.advance(32)
@@ -10497,11 +10716,11 @@ bool BlockInfo::validate_skip(vm::CellSlice& cs, bool weak) const {
       && cs.fetch_uint_to(32, vert_seq_no)
       && vert_seqno_incr <= vert_seq_no
       && add_r1(prev_seq_no, 1, seq_no)
-      && t_ShardIdent.validate_skip(cs, weak)
+      && t_ShardIdent.validate_skip(ops, cs, weak)
       && cs.advance(288)
-      && (!not_master || t_BlkMasterInfo.validate_skip_ref(cs, weak))
-      && BlkPrevInfo{after_merge}.validate_skip_ref(cs, weak)
-      && (!vert_seqno_incr || t_BlkPrevInfo_0.validate_skip_ref(cs, weak));
+      && (!not_master || t_BlkMasterInfo.validate_skip_ref(ops, cs, weak))
+      && BlkPrevInfo{after_merge}.validate_skip_ref(ops, cs, weak)
+      && (!vert_seqno_incr || t_BlkPrevInfo_0.validate_skip_ref(ops, cs, weak));
 }
 
 bool BlockInfo::unpack(vm::CellSlice& cs, BlockInfo::Record& data) const {
@@ -10656,14 +10875,14 @@ bool BlkPrevInfo::skip(vm::CellSlice& cs) const {
   return false;
 }
 
-bool BlkPrevInfo::validate_skip(vm::CellSlice& cs, bool weak) const {
+bool BlkPrevInfo::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const {
   switch (get_tag(cs)) {
   case prev_blk_info:
     return cs.advance(608)
         && m_ == 0;
   case prev_blks_info:
-    return t_ExtBlkRef.validate_skip_ref(cs, weak)
-        && t_ExtBlkRef.validate_skip_ref(cs, weak)
+    return t_ExtBlkRef.validate_skip_ref(ops, cs, weak)
+        && t_ExtBlkRef.validate_skip_ref(ops, cs, weak)
         && m_ == 1;
   }
   return false;
@@ -10787,13 +11006,13 @@ int Block::check_tag(const vm::CellSlice& cs) const {
   return cs.prefetch_ulong(32) == 0x11ef55aa ? block : -1;
 }
 
-bool Block::validate_skip(vm::CellSlice& cs, bool weak) const {
+bool Block::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const {
   return cs.fetch_ulong(32) == 0x11ef55aa
       && cs.advance(32)
-      && t_BlockInfo.validate_skip_ref(cs, weak)
-      && t_ValueFlow.validate_skip_ref(cs, weak)
-      && t_MERKLE_UPDATE_ShardState.validate_skip_ref(cs, weak)
-      && t_BlockExtra.validate_skip_ref(cs, weak);
+      && t_BlockInfo.validate_skip_ref(ops, cs, weak)
+      && t_ValueFlow.validate_skip_ref(ops, cs, weak)
+      && t_MERKLE_UPDATE_ShardState.validate_skip_ref(ops, cs, weak)
+      && t_BlockExtra.validate_skip_ref(ops, cs, weak);
 }
 
 bool Block::unpack(vm::CellSlice& cs, Block::Record& data) const {
@@ -10856,13 +11075,13 @@ bool BlockExtra::skip(vm::CellSlice& cs) const {
       && t_Maybe_Ref_McBlockExtra.skip(cs);
 }
 
-bool BlockExtra::validate_skip(vm::CellSlice& cs, bool weak) const {
+bool BlockExtra::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const {
   return cs.fetch_ulong(32) == 0x4a33f6fd
-      && t_InMsgDescr.validate_skip_ref(cs, weak)
-      && t_OutMsgDescr.validate_skip_ref(cs, weak)
-      && t_ShardAccountBlocks.validate_skip_ref(cs, weak)
+      && t_InMsgDescr.validate_skip_ref(ops, cs, weak)
+      && t_OutMsgDescr.validate_skip_ref(ops, cs, weak)
+      && t_ShardAccountBlocks.validate_skip_ref(ops, cs, weak)
       && cs.advance(512)
-      && t_Maybe_Ref_McBlockExtra.validate_skip(cs, weak);
+      && t_Maybe_Ref_McBlockExtra.validate_skip(ops, cs, weak);
 }
 
 bool BlockExtra::unpack(vm::CellSlice& cs, BlockExtra::Record& data) const {
@@ -10929,11 +11148,11 @@ bool ValueFlow_aux::skip(vm::CellSlice& cs) const {
       && t_CurrencyCollection.skip(cs);
 }
 
-bool ValueFlow_aux::validate_skip(vm::CellSlice& cs, bool weak) const {
-  return t_CurrencyCollection.validate_skip(cs, weak)
-      && t_CurrencyCollection.validate_skip(cs, weak)
-      && t_CurrencyCollection.validate_skip(cs, weak)
-      && t_CurrencyCollection.validate_skip(cs, weak);
+bool ValueFlow_aux::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const {
+  return t_CurrencyCollection.validate_skip(ops, cs, weak)
+      && t_CurrencyCollection.validate_skip(ops, cs, weak)
+      && t_CurrencyCollection.validate_skip(ops, cs, weak)
+      && t_CurrencyCollection.validate_skip(ops, cs, weak);
 }
 
 bool ValueFlow_aux::unpack(vm::CellSlice& cs, ValueFlow_aux::Record& data) const {
@@ -10991,11 +11210,11 @@ bool ValueFlow_aux1::skip(vm::CellSlice& cs) const {
       && t_CurrencyCollection.skip(cs);
 }
 
-bool ValueFlow_aux1::validate_skip(vm::CellSlice& cs, bool weak) const {
-  return t_CurrencyCollection.validate_skip(cs, weak)
-      && t_CurrencyCollection.validate_skip(cs, weak)
-      && t_CurrencyCollection.validate_skip(cs, weak)
-      && t_CurrencyCollection.validate_skip(cs, weak);
+bool ValueFlow_aux1::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const {
+  return t_CurrencyCollection.validate_skip(ops, cs, weak)
+      && t_CurrencyCollection.validate_skip(ops, cs, weak)
+      && t_CurrencyCollection.validate_skip(ops, cs, weak)
+      && t_CurrencyCollection.validate_skip(ops, cs, weak);
 }
 
 bool ValueFlow_aux1::unpack(vm::CellSlice& cs, ValueFlow_aux1::Record& data) const {
@@ -11053,11 +11272,11 @@ bool ValueFlow::skip(vm::CellSlice& cs) const {
       && cs.advance_refs(1);
 }
 
-bool ValueFlow::validate_skip(vm::CellSlice& cs, bool weak) const {
+bool ValueFlow::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const {
   return cs.fetch_ulong(32) == 0xb8e48dfbU
-      && t_ValueFlow_aux.validate_skip_ref(cs, weak)
-      && t_CurrencyCollection.validate_skip(cs, weak)
-      && t_ValueFlow_aux1.validate_skip_ref(cs, weak);
+      && t_ValueFlow_aux.validate_skip_ref(ops, cs, weak)
+      && t_CurrencyCollection.validate_skip(ops, cs, weak)
+      && t_ValueFlow_aux1.validate_skip_ref(ops, cs, weak);
 }
 
 bool ValueFlow::unpack(vm::CellSlice& cs, ValueFlow::Record& data) const {
@@ -11127,15 +11346,15 @@ bool BinTree::skip(vm::CellSlice& cs) const {
   return false;
 }
 
-bool BinTree::validate_skip(vm::CellSlice& cs, bool weak) const {
+bool BinTree::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const {
   switch (get_tag(cs)) {
   case bt_leaf:
     return cs.advance(1)
-        && X_.validate_skip(cs, weak);
+        && X_.validate_skip(ops, cs, weak);
   case bt_fork:
     return cs.advance(1)
-        && validate_skip_ref(cs, weak)
-        && validate_skip_ref(cs, weak);
+        && validate_skip_ref(ops, cs, weak)
+        && validate_skip_ref(ops, cs, weak);
   }
   return false;
 }
@@ -11279,7 +11498,7 @@ bool FutureSplitMerge::skip(vm::CellSlice& cs) const {
   return false;
 }
 
-bool FutureSplitMerge::validate_skip(vm::CellSlice& cs, bool weak) const {
+bool FutureSplitMerge::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const {
   switch (get_tag(cs)) {
   case fsm_none:
     return cs.advance(1);
@@ -11464,16 +11683,16 @@ bool ShardDescr::skip(vm::CellSlice& cs) const {
       && t_CurrencyCollection.skip(cs);
 }
 
-bool ShardDescr::validate_skip(vm::CellSlice& cs, bool weak) const {
+bool ShardDescr::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const {
   int flags;
   return cs.fetch_ulong(4) == 11
       && cs.advance(709)
       && cs.fetch_uint_to(3, flags)
       && flags == 0
       && cs.advance(160)
-      && t_FutureSplitMerge.validate_skip(cs, weak)
-      && t_CurrencyCollection.validate_skip(cs, weak)
-      && t_CurrencyCollection.validate_skip(cs, weak);
+      && t_FutureSplitMerge.validate_skip(ops, cs, weak)
+      && t_CurrencyCollection.validate_skip(ops, cs, weak)
+      && t_CurrencyCollection.validate_skip(ops, cs, weak);
 }
 
 bool ShardDescr::unpack(vm::CellSlice& cs, ShardDescr::Record& data) const {
@@ -11580,8 +11799,8 @@ bool ShardHashes::skip(vm::CellSlice& cs) const {
   return t_HashmapE_32_Ref_BinTree_ShardDescr.skip(cs);
 }
 
-bool ShardHashes::validate_skip(vm::CellSlice& cs, bool weak) const {
-  return t_HashmapE_32_Ref_BinTree_ShardDescr.validate_skip(cs, weak);
+bool ShardHashes::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const {
+  return t_HashmapE_32_Ref_BinTree_ShardDescr.validate_skip(ops, cs, weak);
 }
 
 bool ShardHashes::unpack(vm::CellSlice& cs, ShardHashes::Record& data) const {
@@ -11658,17 +11877,17 @@ bool BinTreeAug::skip(vm::CellSlice& cs) const {
   return false;
 }
 
-bool BinTreeAug::validate_skip(vm::CellSlice& cs, bool weak) const {
+bool BinTreeAug::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const {
   switch (get_tag(cs)) {
   case bta_leaf:
     return cs.advance(1)
-        && Y_.validate_skip(cs, weak)
-        && X_.validate_skip(cs, weak);
+        && Y_.validate_skip(ops, cs, weak)
+        && X_.validate_skip(ops, cs, weak);
   case bta_fork:
     return cs.advance(1)
-        && validate_skip_ref(cs, weak)
-        && validate_skip_ref(cs, weak)
-        && Y_.validate_skip(cs, weak);
+        && validate_skip_ref(ops, cs, weak)
+        && validate_skip_ref(ops, cs, weak)
+        && Y_.validate_skip(ops, cs, weak);
   }
   return false;
 }
@@ -11807,9 +12026,9 @@ bool ShardFeeCreated::skip(vm::CellSlice& cs) const {
       && t_CurrencyCollection.skip(cs);
 }
 
-bool ShardFeeCreated::validate_skip(vm::CellSlice& cs, bool weak) const {
-  return t_CurrencyCollection.validate_skip(cs, weak)
-      && t_CurrencyCollection.validate_skip(cs, weak);
+bool ShardFeeCreated::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const {
+  return t_CurrencyCollection.validate_skip(ops, cs, weak)
+      && t_CurrencyCollection.validate_skip(ops, cs, weak);
 }
 
 bool ShardFeeCreated::unpack(vm::CellSlice& cs, ShardFeeCreated::Record& data) const {
@@ -11877,8 +12096,8 @@ bool ShardFees::skip(vm::CellSlice& cs) const {
   return t_HashmapAugE_96_ShardFeeCreated_ShardFeeCreated.skip(cs);
 }
 
-bool ShardFees::validate_skip(vm::CellSlice& cs, bool weak) const {
-  return t_HashmapAugE_96_ShardFeeCreated_ShardFeeCreated.validate_skip(cs, weak);
+bool ShardFees::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const {
+  return t_HashmapAugE_96_ShardFeeCreated_ShardFeeCreated.validate_skip(ops, cs, weak);
 }
 
 bool ShardFees::unpack(vm::CellSlice& cs, ShardFees::Record& data) const {
@@ -11936,9 +12155,9 @@ int ConfigParams::check_tag(const vm::CellSlice& cs) const {
   return cons1;
 }
 
-bool ConfigParams::validate_skip(vm::CellSlice& cs, bool weak) const {
+bool ConfigParams::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const {
   return cs.advance(256)
-      && t_Hashmap_32_Ref_Cell.validate_skip_ref(cs, weak);
+      && t_Hashmap_32_Ref_Cell.validate_skip_ref(ops, cs, weak);
 }
 
 bool ConfigParams::unpack(vm::CellSlice& cs, ConfigParams::Record& data) const {
@@ -12247,8 +12466,8 @@ bool OldMcBlocksInfo::skip(vm::CellSlice& cs) const {
   return t_HashmapAugE_32_KeyExtBlkRef_KeyMaxLt.skip(cs);
 }
 
-bool OldMcBlocksInfo::validate_skip(vm::CellSlice& cs, bool weak) const {
-  return t_HashmapAugE_32_KeyExtBlkRef_KeyMaxLt.validate_skip(cs, weak);
+bool OldMcBlocksInfo::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const {
+  return t_HashmapAugE_32_KeyExtBlkRef_KeyMaxLt.validate_skip(ops, cs, weak);
 }
 
 bool OldMcBlocksInfo::unpack(vm::CellSlice& cs, OldMcBlocksInfo::Record& data) const {
@@ -12351,7 +12570,7 @@ int CreatorStats::check_tag(const vm::CellSlice& cs) const {
   return cs.prefetch_ulong(4) == 4 ? creator_info : -1;
 }
 
-bool CreatorStats::validate_skip(vm::CellSlice& cs, bool weak) const {
+bool CreatorStats::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const {
   return cs.fetch_ulong(4) == 4
       && cs.advance(448);
 }
@@ -12417,23 +12636,43 @@ const CreatorStats t_CreatorStats;
 //
 // code for type `BlockCreateStats`
 //
-constexpr unsigned char BlockCreateStats::cons_tag[1];
+constexpr unsigned char BlockCreateStats::cons_tag[2];
 
 int BlockCreateStats::check_tag(const vm::CellSlice& cs) const {
-  return cs.prefetch_ulong(8) == 23 ? block_create_stats : -1;
+  switch (get_tag(cs)) {
+  case block_create_stats:
+    return cs.prefetch_ulong(8) == 23 ? block_create_stats : -1;
+  case block_create_stats_ext:
+    return cs.prefetch_ulong(8) == 0x34 ? block_create_stats_ext : -1;
+  }
+  return -1;
 }
 
 bool BlockCreateStats::skip(vm::CellSlice& cs) const {
-  return cs.advance(8)
-      && t_HashmapE_256_CreatorStats.skip(cs);
+  switch (get_tag(cs)) {
+  case block_create_stats:
+    return cs.advance(8)
+        && t_HashmapE_256_CreatorStats.skip(cs);
+  case block_create_stats_ext:
+    return cs.advance(8)
+        && t_HashmapAugE_256_CreatorStats_uint32.skip(cs);
+  }
+  return false;
 }
 
-bool BlockCreateStats::validate_skip(vm::CellSlice& cs, bool weak) const {
-  return cs.fetch_ulong(8) == 23
-      && t_HashmapE_256_CreatorStats.validate_skip(cs, weak);
+bool BlockCreateStats::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const {
+  switch (get_tag(cs)) {
+  case block_create_stats:
+    return cs.fetch_ulong(8) == 23
+        && t_HashmapE_256_CreatorStats.validate_skip(ops, cs, weak);
+  case block_create_stats_ext:
+    return cs.fetch_ulong(8) == 0x34
+        && t_HashmapAugE_256_CreatorStats_uint32.validate_skip(ops, cs, weak);
+  }
+  return false;
 }
 
-bool BlockCreateStats::unpack(vm::CellSlice& cs, BlockCreateStats::Record& data) const {
+bool BlockCreateStats::unpack(vm::CellSlice& cs, BlockCreateStats::Record_block_create_stats& data) const {
   return cs.fetch_ulong(8) == 23
       && t_HashmapE_256_CreatorStats.fetch_to(cs, data.counters);
 }
@@ -12443,7 +12682,7 @@ bool BlockCreateStats::unpack_block_create_stats(vm::CellSlice& cs, Ref<CellSlic
       && t_HashmapE_256_CreatorStats.fetch_to(cs, counters);
 }
 
-bool BlockCreateStats::cell_unpack(Ref<vm::Cell> cell_ref, BlockCreateStats::Record& data) const {
+bool BlockCreateStats::cell_unpack(Ref<vm::Cell> cell_ref, BlockCreateStats::Record_block_create_stats& data) const {
   if (cell_ref.is_null()) { return false; }
   auto cs = load_cell_slice(std::move(cell_ref));
   return unpack(cs, data) && cs.empty_ext();
@@ -12455,7 +12694,29 @@ bool BlockCreateStats::cell_unpack_block_create_stats(Ref<vm::Cell> cell_ref, Re
   return unpack_block_create_stats(cs, counters) && cs.empty_ext();
 }
 
-bool BlockCreateStats::pack(vm::CellBuilder& cb, const BlockCreateStats::Record& data) const {
+bool BlockCreateStats::unpack(vm::CellSlice& cs, BlockCreateStats::Record_block_create_stats_ext& data) const {
+  return cs.fetch_ulong(8) == 0x34
+      && t_HashmapAugE_256_CreatorStats_uint32.fetch_to(cs, data.counters);
+}
+
+bool BlockCreateStats::unpack_block_create_stats_ext(vm::CellSlice& cs, Ref<CellSlice>& counters) const {
+  return cs.fetch_ulong(8) == 0x34
+      && t_HashmapAugE_256_CreatorStats_uint32.fetch_to(cs, counters);
+}
+
+bool BlockCreateStats::cell_unpack(Ref<vm::Cell> cell_ref, BlockCreateStats::Record_block_create_stats_ext& data) const {
+  if (cell_ref.is_null()) { return false; }
+  auto cs = load_cell_slice(std::move(cell_ref));
+  return unpack(cs, data) && cs.empty_ext();
+}
+
+bool BlockCreateStats::cell_unpack_block_create_stats_ext(Ref<vm::Cell> cell_ref, Ref<CellSlice>& counters) const {
+  if (cell_ref.is_null()) { return false; }
+  auto cs = load_cell_slice(std::move(cell_ref));
+  return unpack_block_create_stats_ext(cs, counters) && cs.empty_ext();
+}
+
+bool BlockCreateStats::pack(vm::CellBuilder& cb, const BlockCreateStats::Record_block_create_stats& data) const {
   return cb.store_long_bool(23, 8)
       && t_HashmapE_256_CreatorStats.store_from(cb, data.counters);
 }
@@ -12465,7 +12726,7 @@ bool BlockCreateStats::pack_block_create_stats(vm::CellBuilder& cb, Ref<CellSlic
       && t_HashmapE_256_CreatorStats.store_from(cb, counters);
 }
 
-bool BlockCreateStats::cell_pack(Ref<vm::Cell>& cell_ref, const BlockCreateStats::Record& data) const {
+bool BlockCreateStats::cell_pack(Ref<vm::Cell>& cell_ref, const BlockCreateStats::Record_block_create_stats& data) const {
   vm::CellBuilder cb;
   return pack(cb, data) && std::move(cb).finalize_to(cell_ref);
 }
@@ -12475,12 +12736,42 @@ bool BlockCreateStats::cell_pack_block_create_stats(Ref<vm::Cell>& cell_ref, Ref
   return pack_block_create_stats(cb, std::move(counters)) && std::move(cb).finalize_to(cell_ref);
 }
 
+bool BlockCreateStats::pack(vm::CellBuilder& cb, const BlockCreateStats::Record_block_create_stats_ext& data) const {
+  return cb.store_long_bool(0x34, 8)
+      && t_HashmapAugE_256_CreatorStats_uint32.store_from(cb, data.counters);
+}
+
+bool BlockCreateStats::pack_block_create_stats_ext(vm::CellBuilder& cb, Ref<CellSlice> counters) const {
+  return cb.store_long_bool(0x34, 8)
+      && t_HashmapAugE_256_CreatorStats_uint32.store_from(cb, counters);
+}
+
+bool BlockCreateStats::cell_pack(Ref<vm::Cell>& cell_ref, const BlockCreateStats::Record_block_create_stats_ext& data) const {
+  vm::CellBuilder cb;
+  return pack(cb, data) && std::move(cb).finalize_to(cell_ref);
+}
+
+bool BlockCreateStats::cell_pack_block_create_stats_ext(Ref<vm::Cell>& cell_ref, Ref<CellSlice> counters) const {
+  vm::CellBuilder cb;
+  return pack_block_create_stats_ext(cb, std::move(counters)) && std::move(cb).finalize_to(cell_ref);
+}
+
 bool BlockCreateStats::print_skip(PrettyPrinter& pp, vm::CellSlice& cs) const {
-  return cs.fetch_ulong(8) == 23
-      && pp.open("block_create_stats")
-      && pp.field("counters")
-      && t_HashmapE_256_CreatorStats.print_skip(pp, cs)
-      && pp.close();
+  switch (get_tag(cs)) {
+  case block_create_stats:
+    return cs.fetch_ulong(8) == 23
+        && pp.open("block_create_stats")
+        && pp.field("counters")
+        && t_HashmapE_256_CreatorStats.print_skip(pp, cs)
+        && pp.close();
+  case block_create_stats_ext:
+    return cs.fetch_ulong(8) == 0x34
+        && pp.open("block_create_stats_ext")
+        && pp.field("counters")
+        && t_HashmapAugE_256_CreatorStats_uint32.print_skip(pp, cs)
+        && pp.close();
+  }
+  return pp.fail("unknown constructor for BlockCreateStats");
 }
 
 const BlockCreateStats t_BlockCreateStats;
@@ -12504,15 +12795,15 @@ bool McStateExtra_aux::skip(vm::CellSlice& cs) const {
       && (!(flags & 1) || t_BlockCreateStats.skip(cs));
 }
 
-bool McStateExtra_aux::validate_skip(vm::CellSlice& cs, bool weak) const {
+bool McStateExtra_aux::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const {
   int flags;
   return cs.fetch_uint_to(16, flags)
       && flags <= 1
       && cs.advance(65)
-      && t_OldMcBlocksInfo.validate_skip(cs, weak)
+      && t_OldMcBlocksInfo.validate_skip(ops, cs, weak)
       && cs.advance(1)
-      && t_Maybe_ExtBlkRef.validate_skip(cs, weak)
-      && (!(flags & 1) || t_BlockCreateStats.validate_skip(cs, weak));
+      && t_Maybe_ExtBlkRef.validate_skip(ops, cs, weak)
+      && (!(flags & 1) || t_BlockCreateStats.validate_skip(ops, cs, weak));
 }
 
 bool McStateExtra_aux::unpack(vm::CellSlice& cs, McStateExtra_aux::Record& data) const {
@@ -12581,12 +12872,12 @@ bool McStateExtra::skip(vm::CellSlice& cs) const {
       && t_CurrencyCollection.skip(cs);
 }
 
-bool McStateExtra::validate_skip(vm::CellSlice& cs, bool weak) const {
+bool McStateExtra::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const {
   return cs.fetch_ulong(16) == 0xcc26
-      && t_ShardHashes.validate_skip(cs, weak)
-      && t_ConfigParams.validate_skip(cs, weak)
-      && t_McStateExtra_aux.validate_skip_ref(cs, weak)
-      && t_CurrencyCollection.validate_skip(cs, weak);
+      && t_ShardHashes.validate_skip(ops, cs, weak)
+      && t_ConfigParams.validate_skip(ops, cs, weak)
+      && t_McStateExtra_aux.validate_skip_ref(ops, cs, weak)
+      && t_CurrencyCollection.validate_skip(ops, cs, weak);
 }
 
 bool McStateExtra::unpack(vm::CellSlice& cs, McStateExtra::Record& data) const {
@@ -12643,7 +12934,7 @@ int SigPubKey::check_tag(const vm::CellSlice& cs) const {
   return cs.prefetch_ulong(32) == 0x8e81278aU ? ed25519_pubkey : -1;
 }
 
-bool SigPubKey::validate_skip(vm::CellSlice& cs, bool weak) const {
+bool SigPubKey::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const {
   return cs.fetch_ulong(32) == 0x8e81278aU
       && cs.advance(256);
 }
@@ -12708,7 +12999,7 @@ int CryptoSignatureSimple::check_tag(const vm::CellSlice& cs) const {
   return cs.prefetch_ulong(4) == 5 ? ed25519_signature : -1;
 }
 
-bool CryptoSignatureSimple::validate_skip(vm::CellSlice& cs, bool weak) const {
+bool CryptoSignatureSimple::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const {
   return cs.fetch_ulong(4) == 5
       && cs.advance(512);
 }
@@ -12782,9 +13073,9 @@ bool CryptoSignaturePair::skip(vm::CellSlice& cs) const {
       && t_CryptoSignature.skip(cs);
 }
 
-bool CryptoSignaturePair::validate_skip(vm::CellSlice& cs, bool weak) const {
+bool CryptoSignaturePair::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const {
   return cs.advance(256)
-      && t_CryptoSignature.validate_skip(cs, weak);
+      && t_CryptoSignature.validate_skip(ops, cs, weak);
 }
 
 bool CryptoSignaturePair::unpack(vm::CellSlice& cs, CryptoSignaturePair::Record& data) const {
@@ -12848,9 +13139,9 @@ int Certificate::check_tag(const vm::CellSlice& cs) const {
   return cs.prefetch_ulong(4) == 4 ? certificate : -1;
 }
 
-bool Certificate::validate_skip(vm::CellSlice& cs, bool weak) const {
+bool Certificate::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const {
   return cs.fetch_ulong(4) == 4
-      && t_SigPubKey.validate_skip(cs, weak)
+      && t_SigPubKey.validate_skip(ops, cs, weak)
       && cs.advance(64);
 }
 
@@ -12925,9 +13216,9 @@ int CertificateEnv::check_tag(const vm::CellSlice& cs) const {
   return cs.prefetch_ulong(28) == 0xa419b7d ? certificate_env : -1;
 }
 
-bool CertificateEnv::validate_skip(vm::CellSlice& cs, bool weak) const {
+bool CertificateEnv::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const {
   return cs.fetch_ulong(28) == 0xa419b7d
-      && t_Certificate.validate_skip(cs, weak);
+      && t_Certificate.validate_skip(ops, cs, weak);
 }
 
 bool CertificateEnv::unpack(vm::CellSlice& cs, CertificateEnv::Record& data) const {
@@ -12995,9 +13286,9 @@ bool SignedCertificate::skip(vm::CellSlice& cs) const {
       && t_CryptoSignature.skip(cs);
 }
 
-bool SignedCertificate::validate_skip(vm::CellSlice& cs, bool weak) const {
-  return t_Certificate.validate_skip(cs, weak)
-      && t_CryptoSignature.validate_skip(cs, weak);
+bool SignedCertificate::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const {
+  return t_Certificate.validate_skip(ops, cs, weak)
+      && t_CryptoSignature.validate_skip(ops, cs, weak);
 }
 
 bool SignedCertificate::unpack(vm::CellSlice& cs, SignedCertificate::Record& data) const {
@@ -13079,14 +13370,14 @@ bool CryptoSignature::skip(vm::CellSlice& cs) const {
   return false;
 }
 
-bool CryptoSignature::validate_skip(vm::CellSlice& cs, bool weak) const {
+bool CryptoSignature::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const {
   switch (get_tag(cs)) {
   case cons1:
-    return t_CryptoSignatureSimple.validate_skip(cs, weak);
+    return t_CryptoSignatureSimple.validate_skip(ops, cs, weak);
   case chained_signature:
     return cs.fetch_ulong(4) == 15
-        && t_SignedCertificate.validate_skip_ref(cs, weak)
-        && t_CryptoSignatureSimple.validate_skip(cs, weak);
+        && t_SignedCertificate.validate_skip_ref(ops, cs, weak)
+        && t_CryptoSignatureSimple.validate_skip(ops, cs, weak);
   }
   return false;
 }
@@ -13210,10 +13501,10 @@ bool McBlockExtra_aux::skip(vm::CellSlice& cs) const {
       && t_Maybe_Ref_InMsg.skip(cs);
 }
 
-bool McBlockExtra_aux::validate_skip(vm::CellSlice& cs, bool weak) const {
-  return t_HashmapE_16_CryptoSignaturePair.validate_skip(cs, weak)
-      && t_Maybe_Ref_InMsg.validate_skip(cs, weak)
-      && t_Maybe_Ref_InMsg.validate_skip(cs, weak);
+bool McBlockExtra_aux::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const {
+  return t_HashmapE_16_CryptoSignaturePair.validate_skip(ops, cs, weak)
+      && t_Maybe_Ref_InMsg.validate_skip(ops, cs, weak)
+      && t_Maybe_Ref_InMsg.validate_skip(ops, cs, weak);
 }
 
 bool McBlockExtra_aux::unpack(vm::CellSlice& cs, McBlockExtra_aux::Record& data) const {
@@ -13294,14 +13585,14 @@ bool McBlockExtra::skip(vm::CellSlice& cs) const {
       && (!key_block || t_ConfigParams.skip(cs));
 }
 
-bool McBlockExtra::validate_skip(vm::CellSlice& cs, bool weak) const {
+bool McBlockExtra::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const {
   int key_block;
   return cs.fetch_ulong(16) == 0xcca5
       && cs.fetch_bool_to(key_block)
-      && t_ShardHashes.validate_skip(cs, weak)
-      && t_ShardFees.validate_skip(cs, weak)
-      && t_McBlockExtra_aux.validate_skip_ref(cs, weak)
-      && (!key_block || t_ConfigParams.validate_skip(cs, weak));
+      && t_ShardHashes.validate_skip(ops, cs, weak)
+      && t_ShardFees.validate_skip(ops, cs, weak)
+      && t_McBlockExtra_aux.validate_skip_ref(ops, cs, weak)
+      && (!key_block || t_ConfigParams.validate_skip(ops, cs, weak));
 }
 
 bool McBlockExtra::unpack(vm::CellSlice& cs, McBlockExtra::Record& data) const {
@@ -13378,15 +13669,15 @@ bool ValidatorDescr::skip(vm::CellSlice& cs) const {
   return false;
 }
 
-bool ValidatorDescr::validate_skip(vm::CellSlice& cs, bool weak) const {
+bool ValidatorDescr::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const {
   switch (get_tag(cs)) {
   case validator:
     return cs.fetch_ulong(8) == 0x53
-        && t_SigPubKey.validate_skip(cs, weak)
+        && t_SigPubKey.validate_skip(ops, cs, weak)
         && cs.advance(64);
   case validator_addr:
     return cs.fetch_ulong(8) == 0x73
-        && t_SigPubKey.validate_skip(cs, weak)
+        && t_SigPubKey.validate_skip(ops, cs, weak)
         && cs.advance(320);
   }
   return false;
@@ -13560,7 +13851,7 @@ bool ValidatorSet::skip(vm::CellSlice& cs) const {
   return false;
 }
 
-bool ValidatorSet::validate_skip(vm::CellSlice& cs, bool weak) const {
+bool ValidatorSet::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const {
   switch (get_tag(cs)) {
   case validators: {
     int total, main;
@@ -13570,7 +13861,7 @@ bool ValidatorSet::validate_skip(vm::CellSlice& cs, bool weak) const {
         && cs.fetch_uint_to(16, main)
         && main <= total
         && 1 <= main
-        && t_Hashmap_16_ValidatorDescr.validate_skip(cs, weak);
+        && t_Hashmap_16_ValidatorDescr.validate_skip(ops, cs, weak);
     }
   case validators_ext: {
     int total, main;
@@ -13581,7 +13872,7 @@ bool ValidatorSet::validate_skip(vm::CellSlice& cs, bool weak) const {
         && main <= total
         && 1 <= main
         && cs.advance(64)
-        && t_HashmapE_16_ValidatorDescr.validate_skip(cs, weak);
+        && t_HashmapE_16_ValidatorDescr.validate_skip(ops, cs, weak);
     }
   }
   return false;
@@ -13705,7 +13996,7 @@ int GlobalVersion::check_tag(const vm::CellSlice& cs) const {
   return cs.prefetch_ulong(8) == 0xc4 ? capabilities : -1;
 }
 
-bool GlobalVersion::validate_skip(vm::CellSlice& cs, bool weak) const {
+bool GlobalVersion::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const {
   return cs.fetch_ulong(8) == 0xc4
       && cs.advance(96);
 }
@@ -13803,7 +14094,7 @@ bool WorkchainFormat::skip(vm::CellSlice& cs) const {
   return false;
 }
 
-bool WorkchainFormat::validate_skip(vm::CellSlice& cs, bool weak) const {
+bool WorkchainFormat::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const {
   switch (get_tag(cs)) {
   case wfmt_basic:
     return cs.fetch_ulong(4) == 1
@@ -13974,7 +14265,7 @@ bool WorkchainDescr::skip(vm::CellSlice& cs) const {
       && WorkchainFormat{basic}.skip(cs);
 }
 
-bool WorkchainDescr::validate_skip(vm::CellSlice& cs, bool weak) const {
+bool WorkchainDescr::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const {
   int actual_min_split, min_split, basic, flags;
   return cs.fetch_ulong(8) == 0xa6
       && cs.advance(32)
@@ -13987,7 +14278,7 @@ bool WorkchainDescr::validate_skip(vm::CellSlice& cs, bool weak) const {
       && cs.fetch_uint_to(13, flags)
       && flags == 0
       && cs.advance(544)
-      && WorkchainFormat{basic}.validate_skip(cs, weak);
+      && WorkchainFormat{basic}.validate_skip(ops, cs, weak);
 }
 
 bool WorkchainDescr::unpack(vm::CellSlice& cs, WorkchainDescr::Record& data) const {
@@ -14081,10 +14372,10 @@ bool BlockCreateFees::skip(vm::CellSlice& cs) const {
       && t_Grams.skip(cs);
 }
 
-bool BlockCreateFees::validate_skip(vm::CellSlice& cs, bool weak) const {
+bool BlockCreateFees::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const {
   return cs.fetch_ulong(8) == 0x6b
-      && t_Grams.validate_skip(cs, weak)
-      && t_Grams.validate_skip(cs, weak);
+      && t_Grams.validate_skip(ops, cs, weak)
+      && t_Grams.validate_skip(ops, cs, weak);
 }
 
 bool BlockCreateFees::unpack(vm::CellSlice& cs, BlockCreateFees::Record& data) const {
@@ -14154,7 +14445,7 @@ int StoragePrices::check_tag(const vm::CellSlice& cs) const {
   return cs.prefetch_ulong(8) == 0xcc ? cons1 : -1;
 }
 
-bool StoragePrices::validate_skip(vm::CellSlice& cs, bool weak) const {
+bool StoragePrices::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const {
   return cs.fetch_ulong(8) == 0xcc
       && cs.advance(288);
 }
@@ -14242,7 +14533,7 @@ bool GasLimitsPrices::skip(vm::CellSlice& cs) const {
   return false;
 }
 
-bool GasLimitsPrices::validate_skip(vm::CellSlice& cs, bool weak) const {
+bool GasLimitsPrices::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const {
   switch (get_tag(cs)) {
   case gas_prices:
     return cs.fetch_ulong(8) == 0xdd
@@ -14253,7 +14544,7 @@ bool GasLimitsPrices::validate_skip(vm::CellSlice& cs, bool weak) const {
   case gas_flat_pfx:
     return cs.fetch_ulong(8) == 0xd1
         && cs.advance(128)
-        && validate_skip(cs, weak);
+        && validate_skip(ops, cs, weak);
   }
   return false;
 }
@@ -14418,7 +14709,7 @@ int ParamLimits::check_tag(const vm::CellSlice& cs) const {
   return cs.prefetch_ulong(8) == 0xc3 ? param_limits : -1;
 }
 
-bool ParamLimits::validate_skip(vm::CellSlice& cs, bool weak) const {
+bool ParamLimits::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const {
   int underload, soft_limit, hard_limit;
   return cs.fetch_ulong(8) == 0xc3
       && cs.fetch_uint_to(32, underload)
@@ -14512,11 +14803,11 @@ int BlockLimits::check_tag(const vm::CellSlice& cs) const {
   return cs.prefetch_ulong(8) == 0x5d ? block_limits : -1;
 }
 
-bool BlockLimits::validate_skip(vm::CellSlice& cs, bool weak) const {
+bool BlockLimits::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const {
   return cs.fetch_ulong(8) == 0x5d
-      && t_ParamLimits.validate_skip(cs, weak)
-      && t_ParamLimits.validate_skip(cs, weak)
-      && t_ParamLimits.validate_skip(cs, weak);
+      && t_ParamLimits.validate_skip(ops, cs, weak)
+      && t_ParamLimits.validate_skip(ops, cs, weak)
+      && t_ParamLimits.validate_skip(ops, cs, weak);
 }
 
 bool BlockLimits::unpack(vm::CellSlice& cs, BlockLimits::Record& data) const {
@@ -14592,7 +14883,7 @@ int MsgForwardPrices::check_tag(const vm::CellSlice& cs) const {
   return cs.prefetch_ulong(8) == 0xea ? msg_forward_prices : -1;
 }
 
-bool MsgForwardPrices::validate_skip(vm::CellSlice& cs, bool weak) const {
+bool MsgForwardPrices::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const {
   return cs.fetch_ulong(8) == 0xea
       && cs.advance(256);
 }
@@ -14651,7 +14942,7 @@ int CatchainConfig::check_tag(const vm::CellSlice& cs) const {
   return cs.prefetch_ulong(8) == 0xc1 ? catchain_config : -1;
 }
 
-bool CatchainConfig::validate_skip(vm::CellSlice& cs, bool weak) const {
+bool CatchainConfig::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const {
   return cs.fetch_ulong(8) == 0xc1
       && cs.advance(128);
 }
@@ -14704,7 +14995,7 @@ int ConsensusConfig::check_tag(const vm::CellSlice& cs) const {
   return cs.prefetch_ulong(8) == 0xd6 ? consensus_config : -1;
 }
 
-bool ConsensusConfig::validate_skip(vm::CellSlice& cs, bool weak) const {
+bool ConsensusConfig::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const {
   int round_candidates;
   return cs.fetch_ulong(8) == 0xd6
       && cs.fetch_uint_to(32, round_candidates)
@@ -14777,10 +15068,10 @@ int ValidatorTempKey::check_tag(const vm::CellSlice& cs) const {
   return cs.prefetch_ulong(4) == 3 ? validator_temp_key : -1;
 }
 
-bool ValidatorTempKey::validate_skip(vm::CellSlice& cs, bool weak) const {
+bool ValidatorTempKey::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const {
   return cs.fetch_ulong(4) == 3
       && cs.advance(256)
-      && t_SigPubKey.validate_skip(cs, weak)
+      && t_SigPubKey.validate_skip(ops, cs, weak)
       && cs.advance(64);
 }
 
@@ -14840,10 +15131,10 @@ bool ValidatorSignedTempKey::skip(vm::CellSlice& cs) const {
       && t_CryptoSignature.skip(cs);
 }
 
-bool ValidatorSignedTempKey::validate_skip(vm::CellSlice& cs, bool weak) const {
+bool ValidatorSignedTempKey::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const {
   return cs.fetch_ulong(4) == 4
-      && t_ValidatorTempKey.validate_skip_ref(cs, weak)
-      && t_CryptoSignature.validate_skip(cs, weak);
+      && t_ValidatorTempKey.validate_skip_ref(ops, cs, weak)
+      && t_CryptoSignature.validate_skip(ops, cs, weak);
 }
 
 bool ValidatorSignedTempKey::unpack(vm::CellSlice& cs, ValidatorSignedTempKey::Record& data) const {
@@ -15155,7 +15446,7 @@ bool ConfigParam::skip(vm::CellSlice& cs) const {
   return false;
 }
 
-bool ConfigParam::validate_skip(vm::CellSlice& cs, bool weak) const {
+bool ConfigParam::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const {
   switch (get_tag(cs)) {
   case cons0:
     return cs.advance(256)
@@ -15173,23 +15464,23 @@ bool ConfigParam::validate_skip(vm::CellSlice& cs, bool weak) const {
     return cs.advance(256)
         && m_ == 4;
   case cons6:
-    return t_Grams.validate_skip(cs, weak)
-        && t_Grams.validate_skip(cs, weak)
+    return t_Grams.validate_skip(ops, cs, weak)
+        && t_Grams.validate_skip(ops, cs, weak)
         && m_ == 6;
   case cons7:
-    return t_ExtraCurrencyCollection.validate_skip(cs, weak)
+    return t_ExtraCurrencyCollection.validate_skip(ops, cs, weak)
         && m_ == 7;
   case cons8:
-    return t_GlobalVersion.validate_skip(cs, weak)
+    return t_GlobalVersion.validate_skip(ops, cs, weak)
         && m_ == 8;
   case cons9:
-    return t_Hashmap_32_True.validate_skip(cs, weak)
+    return t_Hashmap_32_True.validate_skip(ops, cs, weak)
         && m_ == 9;
   case cons12:
-    return t_HashmapE_32_WorkchainDescr.validate_skip(cs, weak)
+    return t_HashmapE_32_WorkchainDescr.validate_skip(ops, cs, weak)
         && m_ == 12;
   case cons14:
-    return t_BlockCreateFees.validate_skip(cs, weak)
+    return t_BlockCreateFees.validate_skip(ops, cs, weak)
         && m_ == 14;
   case cons15:
     return cs.advance(128)
@@ -15205,61 +15496,61 @@ bool ConfigParam::validate_skip(vm::CellSlice& cs, bool weak) const {
         && m_ == 16;
     }
   case cons17:
-    return t_Grams.validate_skip(cs, weak)
-        && t_Grams.validate_skip(cs, weak)
-        && t_Grams.validate_skip(cs, weak)
+    return t_Grams.validate_skip(ops, cs, weak)
+        && t_Grams.validate_skip(ops, cs, weak)
+        && t_Grams.validate_skip(ops, cs, weak)
         && cs.advance(32)
         && m_ == 17;
   case cons18:
-    return t_Hashmap_32_StoragePrices.validate_skip(cs, weak)
+    return t_Hashmap_32_StoragePrices.validate_skip(ops, cs, weak)
         && m_ == 18;
   case config_mc_gas_prices:
-    return t_GasLimitsPrices.validate_skip(cs, weak)
+    return t_GasLimitsPrices.validate_skip(ops, cs, weak)
         && m_ == 20;
   case config_gas_prices:
-    return t_GasLimitsPrices.validate_skip(cs, weak)
+    return t_GasLimitsPrices.validate_skip(ops, cs, weak)
         && m_ == 21;
   case config_mc_block_limits:
-    return t_BlockLimits.validate_skip(cs, weak)
+    return t_BlockLimits.validate_skip(ops, cs, weak)
         && m_ == 22;
   case config_block_limits:
-    return t_BlockLimits.validate_skip(cs, weak)
+    return t_BlockLimits.validate_skip(ops, cs, weak)
         && m_ == 23;
   case config_mc_fwd_prices:
-    return t_MsgForwardPrices.validate_skip(cs, weak)
+    return t_MsgForwardPrices.validate_skip(ops, cs, weak)
         && m_ == 24;
   case config_fwd_prices:
-    return t_MsgForwardPrices.validate_skip(cs, weak)
+    return t_MsgForwardPrices.validate_skip(ops, cs, weak)
         && m_ == 25;
   case cons28:
-    return t_CatchainConfig.validate_skip(cs, weak)
+    return t_CatchainConfig.validate_skip(ops, cs, weak)
         && m_ == 28;
   case cons29:
-    return t_ConsensusConfig.validate_skip(cs, weak)
+    return t_ConsensusConfig.validate_skip(ops, cs, weak)
         && m_ == 29;
   case cons31:
-    return t_HashmapE_256_True.validate_skip(cs, weak)
+    return t_HashmapE_256_True.validate_skip(ops, cs, weak)
         && m_ == 31;
   case cons32:
-    return t_ValidatorSet.validate_skip(cs, weak)
+    return t_ValidatorSet.validate_skip(ops, cs, weak)
         && m_ == 32;
   case cons33:
-    return t_ValidatorSet.validate_skip(cs, weak)
+    return t_ValidatorSet.validate_skip(ops, cs, weak)
         && m_ == 33;
   case cons34:
-    return t_ValidatorSet.validate_skip(cs, weak)
+    return t_ValidatorSet.validate_skip(ops, cs, weak)
         && m_ == 34;
   case cons35:
-    return t_ValidatorSet.validate_skip(cs, weak)
+    return t_ValidatorSet.validate_skip(ops, cs, weak)
         && m_ == 35;
   case cons36:
-    return t_ValidatorSet.validate_skip(cs, weak)
+    return t_ValidatorSet.validate_skip(ops, cs, weak)
         && m_ == 36;
   case cons37:
-    return t_ValidatorSet.validate_skip(cs, weak)
+    return t_ValidatorSet.validate_skip(ops, cs, weak)
         && m_ == 37;
   case cons39:
-    return t_HashmapE_256_ValidatorSignedTempKey.validate_skip(cs, weak)
+    return t_HashmapE_256_ValidatorSignedTempKey.validate_skip(ops, cs, weak)
         && m_ == 39;
   }
   return false;
@@ -16780,9 +17071,9 @@ bool BlockSignaturesPure::skip(vm::CellSlice& cs) const {
       && t_HashmapE_16_CryptoSignaturePair.skip(cs);
 }
 
-bool BlockSignaturesPure::validate_skip(vm::CellSlice& cs, bool weak) const {
+bool BlockSignaturesPure::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const {
   return cs.advance(96)
-      && t_HashmapE_16_CryptoSignaturePair.validate_skip(cs, weak);
+      && t_HashmapE_16_CryptoSignaturePair.validate_skip(ops, cs, weak);
 }
 
 bool BlockSignaturesPure::unpack(vm::CellSlice& cs, BlockSignaturesPure::Record& data) const {
@@ -16856,10 +17147,10 @@ bool BlockSignatures::skip(vm::CellSlice& cs) const {
       && t_BlockSignaturesPure.skip(cs);
 }
 
-bool BlockSignatures::validate_skip(vm::CellSlice& cs, bool weak) const {
+bool BlockSignatures::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const {
   return cs.fetch_ulong(8) == 17
       && cs.advance(64)
-      && t_BlockSignaturesPure.validate_skip(cs, weak);
+      && t_BlockSignaturesPure.validate_skip(ops, cs, weak);
 }
 
 bool BlockSignatures::unpack(vm::CellSlice& cs, BlockSignatures::Record& data) const {
@@ -16934,11 +17225,11 @@ bool BlockProof::skip(vm::CellSlice& cs) const {
       && t_Maybe_Ref_BlockSignatures.skip(cs);
 }
 
-bool BlockProof::validate_skip(vm::CellSlice& cs, bool weak) const {
+bool BlockProof::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const {
   return cs.fetch_ulong(8) == 0xc3
-      && t_BlockIdExt.validate_skip(cs, weak)
+      && t_BlockIdExt.validate_skip(ops, cs, weak)
       && cs.advance_refs(1)
-      && t_Maybe_Ref_BlockSignatures.validate_skip(cs, weak);
+      && t_Maybe_Ref_BlockSignatures.validate_skip(ops, cs, weak);
 }
 
 bool BlockProof::unpack(vm::CellSlice& cs, BlockProof::Record& data) const {
@@ -17038,7 +17329,7 @@ bool ProofChain::skip(vm::CellSlice& cs) const {
   return false;
 }
 
-bool ProofChain::validate_skip(vm::CellSlice& cs, bool weak) const {
+bool ProofChain::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const {
   switch (get_tag(cs)) {
   case chain_empty:
     return m_ == 0;
@@ -17046,7 +17337,7 @@ bool ProofChain::validate_skip(vm::CellSlice& cs, bool weak) const {
     int n;
     return add_r1(n, 1, m_)
         && cs.advance_refs(1)
-        && (!n || ProofChain{n}.validate_skip_ref(cs, weak));
+        && (!n || ProofChain{n}.validate_skip_ref(ops, cs, weak));
     }
   }
   return false;
@@ -17176,15 +17467,15 @@ bool TopBlockDescr::skip(vm::CellSlice& cs) const {
       && ProofChain{len}.skip(cs);
 }
 
-bool TopBlockDescr::validate_skip(vm::CellSlice& cs, bool weak) const {
+bool TopBlockDescr::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const {
   int len;
   return cs.fetch_ulong(8) == 0xd5
-      && t_BlockIdExt.validate_skip(cs, weak)
-      && t_Maybe_Ref_BlockSignatures.validate_skip(cs, weak)
+      && t_BlockIdExt.validate_skip(ops, cs, weak)
+      && t_Maybe_Ref_BlockSignatures.validate_skip(ops, cs, weak)
       && cs.fetch_uint_to(8, len)
       && 1 <= len
       && len <= 8
-      && ProofChain{len}.validate_skip(cs, weak);
+      && ProofChain{len}.validate_skip(ops, cs, weak);
 }
 
 bool TopBlockDescr::unpack(vm::CellSlice& cs, TopBlockDescr::Record& data) const {
@@ -17251,9 +17542,9 @@ bool TopBlockDescrSet::skip(vm::CellSlice& cs) const {
       && t_HashmapE_96_Ref_TopBlockDescr.skip(cs);
 }
 
-bool TopBlockDescrSet::validate_skip(vm::CellSlice& cs, bool weak) const {
+bool TopBlockDescrSet::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const {
   return cs.fetch_ulong(32) == 0x4ac789f3
-      && t_HashmapE_96_Ref_TopBlockDescr.validate_skip(cs, weak);
+      && t_HashmapE_96_Ref_TopBlockDescr.validate_skip(ops, cs, weak);
 }
 
 bool TopBlockDescrSet::unpack(vm::CellSlice& cs, TopBlockDescrSet::Record& data) const {
@@ -17308,6 +17599,3450 @@ bool TopBlockDescrSet::print_skip(PrettyPrinter& pp, vm::CellSlice& cs) const {
 
 const TopBlockDescrSet t_TopBlockDescrSet;
 
+//
+// code for type `VmCellSlice`
+//
+
+int VmCellSlice::check_tag(const vm::CellSlice& cs) const {
+  return cons1;
+}
+
+bool VmCellSlice::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const {
+  int st_bits, end_bits, st_ref, end_ref;
+  return cs.advance_refs(1)
+      && cs.fetch_uint_to(10, st_bits)
+      && cs.fetch_uint_to(10, end_bits)
+      && st_bits <= end_bits
+      && cs.fetch_uint_leq(4, st_ref)
+      && cs.fetch_uint_leq(4, end_ref)
+      && st_ref <= end_ref;
+}
+
+bool VmCellSlice::unpack(vm::CellSlice& cs, VmCellSlice::Record& data) const {
+  return cs.fetch_ref_to(data.cell)
+      && cs.fetch_uint_to(10, data.st_bits)
+      && cs.fetch_uint_to(10, data.end_bits)
+      && data.st_bits <= data.end_bits
+      && cs.fetch_uint_leq(4, data.st_ref)
+      && cs.fetch_uint_leq(4, data.end_ref)
+      && data.st_ref <= data.end_ref;
+}
+
+bool VmCellSlice::cell_unpack(Ref<vm::Cell> cell_ref, VmCellSlice::Record& data) const {
+  if (cell_ref.is_null()) { return false; }
+  auto cs = load_cell_slice(std::move(cell_ref));
+  return unpack(cs, data) && cs.empty_ext();
+}
+
+bool VmCellSlice::pack(vm::CellBuilder& cb, const VmCellSlice::Record& data) const {
+  return cb.store_ref_bool(data.cell)
+      && cb.store_ulong_rchk_bool(data.st_bits, 10)
+      && cb.store_ulong_rchk_bool(data.end_bits, 10)
+      && data.st_bits <= data.end_bits
+      && cb.store_uint_leq(4, data.st_ref)
+      && cb.store_uint_leq(4, data.end_ref)
+      && data.st_ref <= data.end_ref;
+}
+
+bool VmCellSlice::cell_pack(Ref<vm::Cell>& cell_ref, const VmCellSlice::Record& data) const {
+  vm::CellBuilder cb;
+  return pack(cb, data) && std::move(cb).finalize_to(cell_ref);
+}
+
+bool VmCellSlice::print_skip(PrettyPrinter& pp, vm::CellSlice& cs) const {
+  int st_bits, end_bits, st_ref, end_ref;
+  return pp.open()
+      && pp.field("cell")
+      && t_Anything.print_ref(pp, cs.fetch_ref())
+      && cs.fetch_uint_to(10, st_bits)
+      && pp.field_int(st_bits, "st_bits")
+      && cs.fetch_uint_to(10, end_bits)
+      && pp.field_int(end_bits, "end_bits")
+      && st_bits <= end_bits
+      && cs.fetch_uint_leq(4, st_ref)
+      && pp.field_int(st_ref, "st_ref")
+      && cs.fetch_uint_leq(4, end_ref)
+      && pp.field_int(end_ref, "end_ref")
+      && st_ref <= end_ref
+      && pp.close();
+}
+
+const VmCellSlice t_VmCellSlice;
+
+//
+// code for type `VmTupleRef`
+//
+
+int VmTupleRef::get_tag(const vm::CellSlice& cs) const {
+  // distinguish by parameter `m_` using 1 2 3 3
+  // static inline size_t nat_abs(int x) { return (x > 1) * 2 + (x & 1); }
+  static signed char ctab[4] = { vm_tupref_nil, vm_tupref_single, vm_tupref_any, vm_tupref_any };
+  return ctab[nat_abs(m_)];
+}
+
+int VmTupleRef::check_tag(const vm::CellSlice& cs) const {
+  switch (get_tag(cs)) {
+  case vm_tupref_nil:
+    return vm_tupref_nil;
+  case vm_tupref_single:
+    return vm_tupref_single;
+  case vm_tupref_any:
+    return vm_tupref_any;
+  }
+  return -1;
+}
+
+bool VmTupleRef::skip(vm::CellSlice& cs) const {
+  switch (get_tag(cs)) {
+  case vm_tupref_nil:
+    return m_ == 0;
+  case vm_tupref_single:
+    return cs.advance_refs(1)
+        && m_ == 1;
+  case vm_tupref_any: {
+    int n;
+    return add_r1(n, 2, m_)
+        && cs.advance_refs(1);
+    }
+  }
+  return false;
+}
+
+bool VmTupleRef::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const {
+  switch (get_tag(cs)) {
+  case vm_tupref_nil:
+    return m_ == 0;
+  case vm_tupref_single:
+    return t_VmStackValue.validate_skip_ref(ops, cs, weak)
+        && m_ == 1;
+  case vm_tupref_any: {
+    int n;
+    return add_r1(n, 2, m_)
+        && VmTuple{n + 2}.validate_skip_ref(ops, cs, weak);
+    }
+  }
+  return false;
+}
+
+bool VmTupleRef::unpack(vm::CellSlice& cs, VmTupleRef::Record_vm_tupref_nil& data) const {
+  return m_ == 0;
+}
+
+bool VmTupleRef::unpack_vm_tupref_nil(vm::CellSlice& cs) const {
+  return m_ == 0;
+}
+
+bool VmTupleRef::cell_unpack(Ref<vm::Cell> cell_ref, VmTupleRef::Record_vm_tupref_nil& data) const {
+  if (cell_ref.is_null()) { return false; }
+  auto cs = load_cell_slice(std::move(cell_ref));
+  return unpack(cs, data) && cs.empty_ext();
+}
+
+bool VmTupleRef::cell_unpack_vm_tupref_nil(Ref<vm::Cell> cell_ref) const {
+  if (cell_ref.is_null()) { return false; }
+  auto cs = load_cell_slice(std::move(cell_ref));
+  return unpack_vm_tupref_nil(cs) && cs.empty_ext();
+}
+
+bool VmTupleRef::unpack(vm::CellSlice& cs, VmTupleRef::Record_vm_tupref_single& data) const {
+  return cs.fetch_ref_to(data.entry)
+      && m_ == 1;
+}
+
+bool VmTupleRef::unpack_vm_tupref_single(vm::CellSlice& cs, Ref<Cell>& entry) const {
+  return cs.fetch_ref_to(entry)
+      && m_ == 1;
+}
+
+bool VmTupleRef::cell_unpack(Ref<vm::Cell> cell_ref, VmTupleRef::Record_vm_tupref_single& data) const {
+  if (cell_ref.is_null()) { return false; }
+  auto cs = load_cell_slice(std::move(cell_ref));
+  return unpack(cs, data) && cs.empty_ext();
+}
+
+bool VmTupleRef::cell_unpack_vm_tupref_single(Ref<vm::Cell> cell_ref, Ref<Cell>& entry) const {
+  if (cell_ref.is_null()) { return false; }
+  auto cs = load_cell_slice(std::move(cell_ref));
+  return unpack_vm_tupref_single(cs, entry) && cs.empty_ext();
+}
+
+bool VmTupleRef::unpack(vm::CellSlice& cs, VmTupleRef::Record_vm_tupref_any& data) const {
+  return add_r1(data.n, 2, m_)
+      && cs.fetch_ref_to(data.ref);
+}
+
+bool VmTupleRef::unpack_vm_tupref_any(vm::CellSlice& cs, int& n, Ref<Cell>& ref) const {
+  return add_r1(n, 2, m_)
+      && cs.fetch_ref_to(ref);
+}
+
+bool VmTupleRef::cell_unpack(Ref<vm::Cell> cell_ref, VmTupleRef::Record_vm_tupref_any& data) const {
+  if (cell_ref.is_null()) { return false; }
+  auto cs = load_cell_slice(std::move(cell_ref));
+  return unpack(cs, data) && cs.empty_ext();
+}
+
+bool VmTupleRef::cell_unpack_vm_tupref_any(Ref<vm::Cell> cell_ref, int& n, Ref<Cell>& ref) const {
+  if (cell_ref.is_null()) { return false; }
+  auto cs = load_cell_slice(std::move(cell_ref));
+  return unpack_vm_tupref_any(cs, n, ref) && cs.empty_ext();
+}
+
+bool VmTupleRef::pack(vm::CellBuilder& cb, const VmTupleRef::Record_vm_tupref_nil& data) const {
+  return m_ == 0;
+}
+
+bool VmTupleRef::pack_vm_tupref_nil(vm::CellBuilder& cb) const {
+  return m_ == 0;
+}
+
+bool VmTupleRef::cell_pack(Ref<vm::Cell>& cell_ref, const VmTupleRef::Record_vm_tupref_nil& data) const {
+  vm::CellBuilder cb;
+  return pack(cb, data) && std::move(cb).finalize_to(cell_ref);
+}
+
+bool VmTupleRef::cell_pack_vm_tupref_nil(Ref<vm::Cell>& cell_ref) const {
+  vm::CellBuilder cb;
+  return pack_vm_tupref_nil(cb) && std::move(cb).finalize_to(cell_ref);
+}
+
+bool VmTupleRef::pack(vm::CellBuilder& cb, const VmTupleRef::Record_vm_tupref_single& data) const {
+  return cb.store_ref_bool(data.entry)
+      && m_ == 1;
+}
+
+bool VmTupleRef::pack_vm_tupref_single(vm::CellBuilder& cb, Ref<Cell> entry) const {
+  return cb.store_ref_bool(entry)
+      && m_ == 1;
+}
+
+bool VmTupleRef::cell_pack(Ref<vm::Cell>& cell_ref, const VmTupleRef::Record_vm_tupref_single& data) const {
+  vm::CellBuilder cb;
+  return pack(cb, data) && std::move(cb).finalize_to(cell_ref);
+}
+
+bool VmTupleRef::cell_pack_vm_tupref_single(Ref<vm::Cell>& cell_ref, Ref<Cell> entry) const {
+  vm::CellBuilder cb;
+  return pack_vm_tupref_single(cb, std::move(entry)) && std::move(cb).finalize_to(cell_ref);
+}
+
+bool VmTupleRef::pack(vm::CellBuilder& cb, const VmTupleRef::Record_vm_tupref_any& data) const {
+  int n;
+  return add_r1(n, 2, m_)
+      && cb.store_ref_bool(data.ref);
+}
+
+bool VmTupleRef::pack_vm_tupref_any(vm::CellBuilder& cb, Ref<Cell> ref) const {
+  int n;
+  return add_r1(n, 2, m_)
+      && cb.store_ref_bool(ref);
+}
+
+bool VmTupleRef::cell_pack(Ref<vm::Cell>& cell_ref, const VmTupleRef::Record_vm_tupref_any& data) const {
+  vm::CellBuilder cb;
+  return pack(cb, data) && std::move(cb).finalize_to(cell_ref);
+}
+
+bool VmTupleRef::cell_pack_vm_tupref_any(Ref<vm::Cell>& cell_ref, Ref<Cell> ref) const {
+  vm::CellBuilder cb;
+  return pack_vm_tupref_any(cb, std::move(ref)) && std::move(cb).finalize_to(cell_ref);
+}
+
+bool VmTupleRef::print_skip(PrettyPrinter& pp, vm::CellSlice& cs) const {
+  switch (get_tag(cs)) {
+  case vm_tupref_nil:
+    return pp.cons("vm_tupref_nil")
+        && m_ == 0;
+  case vm_tupref_single:
+    return pp.open("vm_tupref_single")
+        && pp.field("entry")
+        && t_VmStackValue.print_ref(pp, cs.fetch_ref())
+        && m_ == 1
+        && pp.close();
+  case vm_tupref_any: {
+    int n;
+    return pp.open("vm_tupref_any")
+        && add_r1(n, 2, m_)
+        && pp.field("ref")
+        && VmTuple{n + 2}.print_ref(pp, cs.fetch_ref())
+        && pp.close();
+    }
+  }
+  return pp.fail("unknown constructor for VmTupleRef");
+}
+
+
+//
+// code for type `VmTuple`
+//
+
+int VmTuple::get_tag(const vm::CellSlice& cs) const {
+  // distinguish by parameter `m_` using 1 2 2 2
+  return m_ ? vm_tuple_tcons : vm_tuple_nil;
+}
+
+int VmTuple::check_tag(const vm::CellSlice& cs) const {
+  switch (get_tag(cs)) {
+  case vm_tuple_nil:
+    return vm_tuple_nil;
+  case vm_tuple_tcons:
+    return vm_tuple_tcons;
+  }
+  return -1;
+}
+
+bool VmTuple::skip(vm::CellSlice& cs) const {
+  switch (get_tag(cs)) {
+  case vm_tuple_nil:
+    return m_ == 0;
+  case vm_tuple_tcons: {
+    int n;
+    return add_r1(n, 1, m_)
+        && VmTupleRef{n}.skip(cs)
+        && cs.advance_refs(1);
+    }
+  }
+  return false;
+}
+
+bool VmTuple::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const {
+  switch (get_tag(cs)) {
+  case vm_tuple_nil:
+    return m_ == 0;
+  case vm_tuple_tcons: {
+    int n;
+    return add_r1(n, 1, m_)
+        && VmTupleRef{n}.validate_skip(ops, cs, weak)
+        && t_VmStackValue.validate_skip_ref(ops, cs, weak);
+    }
+  }
+  return false;
+}
+
+bool VmTuple::unpack(vm::CellSlice& cs, VmTuple::Record_vm_tuple_nil& data) const {
+  return m_ == 0;
+}
+
+bool VmTuple::unpack_vm_tuple_nil(vm::CellSlice& cs) const {
+  return m_ == 0;
+}
+
+bool VmTuple::cell_unpack(Ref<vm::Cell> cell_ref, VmTuple::Record_vm_tuple_nil& data) const {
+  if (cell_ref.is_null()) { return false; }
+  auto cs = load_cell_slice(std::move(cell_ref));
+  return unpack(cs, data) && cs.empty_ext();
+}
+
+bool VmTuple::cell_unpack_vm_tuple_nil(Ref<vm::Cell> cell_ref) const {
+  if (cell_ref.is_null()) { return false; }
+  auto cs = load_cell_slice(std::move(cell_ref));
+  return unpack_vm_tuple_nil(cs) && cs.empty_ext();
+}
+
+bool VmTuple::unpack(vm::CellSlice& cs, VmTuple::Record_vm_tuple_tcons& data) const {
+  return add_r1(data.n, 1, m_)
+      && VmTupleRef{data.n}.fetch_to(cs, data.head)
+      && cs.fetch_ref_to(data.tail);
+}
+
+bool VmTuple::unpack_vm_tuple_tcons(vm::CellSlice& cs, int& n, Ref<CellSlice>& head, Ref<Cell>& tail) const {
+  return add_r1(n, 1, m_)
+      && VmTupleRef{n}.fetch_to(cs, head)
+      && cs.fetch_ref_to(tail);
+}
+
+bool VmTuple::cell_unpack(Ref<vm::Cell> cell_ref, VmTuple::Record_vm_tuple_tcons& data) const {
+  if (cell_ref.is_null()) { return false; }
+  auto cs = load_cell_slice(std::move(cell_ref));
+  return unpack(cs, data) && cs.empty_ext();
+}
+
+bool VmTuple::cell_unpack_vm_tuple_tcons(Ref<vm::Cell> cell_ref, int& n, Ref<CellSlice>& head, Ref<Cell>& tail) const {
+  if (cell_ref.is_null()) { return false; }
+  auto cs = load_cell_slice(std::move(cell_ref));
+  return unpack_vm_tuple_tcons(cs, n, head, tail) && cs.empty_ext();
+}
+
+bool VmTuple::pack(vm::CellBuilder& cb, const VmTuple::Record_vm_tuple_nil& data) const {
+  return m_ == 0;
+}
+
+bool VmTuple::pack_vm_tuple_nil(vm::CellBuilder& cb) const {
+  return m_ == 0;
+}
+
+bool VmTuple::cell_pack(Ref<vm::Cell>& cell_ref, const VmTuple::Record_vm_tuple_nil& data) const {
+  vm::CellBuilder cb;
+  return pack(cb, data) && std::move(cb).finalize_to(cell_ref);
+}
+
+bool VmTuple::cell_pack_vm_tuple_nil(Ref<vm::Cell>& cell_ref) const {
+  vm::CellBuilder cb;
+  return pack_vm_tuple_nil(cb) && std::move(cb).finalize_to(cell_ref);
+}
+
+bool VmTuple::pack(vm::CellBuilder& cb, const VmTuple::Record_vm_tuple_tcons& data) const {
+  int n;
+  return add_r1(n, 1, m_)
+      && VmTupleRef{n}.store_from(cb, data.head)
+      && cb.store_ref_bool(data.tail);
+}
+
+bool VmTuple::pack_vm_tuple_tcons(vm::CellBuilder& cb, Ref<CellSlice> head, Ref<Cell> tail) const {
+  int n;
+  return add_r1(n, 1, m_)
+      && VmTupleRef{n}.store_from(cb, head)
+      && cb.store_ref_bool(tail);
+}
+
+bool VmTuple::cell_pack(Ref<vm::Cell>& cell_ref, const VmTuple::Record_vm_tuple_tcons& data) const {
+  vm::CellBuilder cb;
+  return pack(cb, data) && std::move(cb).finalize_to(cell_ref);
+}
+
+bool VmTuple::cell_pack_vm_tuple_tcons(Ref<vm::Cell>& cell_ref, Ref<CellSlice> head, Ref<Cell> tail) const {
+  vm::CellBuilder cb;
+  return pack_vm_tuple_tcons(cb, std::move(head), std::move(tail)) && std::move(cb).finalize_to(cell_ref);
+}
+
+bool VmTuple::print_skip(PrettyPrinter& pp, vm::CellSlice& cs) const {
+  switch (get_tag(cs)) {
+  case vm_tuple_nil:
+    return pp.cons("vm_tuple_nil")
+        && m_ == 0;
+  case vm_tuple_tcons: {
+    int n;
+    return pp.open("vm_tuple_tcons")
+        && add_r1(n, 1, m_)
+        && pp.field("head")
+        && VmTupleRef{n}.print_skip(pp, cs)
+        && pp.field("tail")
+        && t_VmStackValue.print_ref(pp, cs.fetch_ref())
+        && pp.close();
+    }
+  }
+  return pp.fail("unknown constructor for VmTuple");
+}
+
+
+//
+// code for type `VmStackValue`
+//
+constexpr char VmStackValue::cons_len[9];
+constexpr unsigned short VmStackValue::cons_tag[9];
+
+int VmStackValue::get_tag(const vm::CellSlice& cs) const {
+  switch (cs.bselect(6, 7)) {
+  case 0:
+    if (cs.bit_at(6)) {
+      if (cs.bit_at(7)) {
+        return vm_stk_cell;
+      } else {
+        return cs.bit_at(8) ? vm_stk_nan : vm_stk_int;
+      }
+    } else {
+      return cs.bit_at(7) ? vm_stk_tinyint : vm_stk_null;
+    }
+  case 1:
+    if (cs.bit_at(6)) {
+      return cs.bit_at(7) ? vm_stk_tuple : vm_stk_cont;
+    } else {
+      return cs.bit_at(7) ? vm_stk_builder : vm_stk_slice;
+    }
+  default:
+    return -1;
+  }
+}
+
+int VmStackValue::check_tag(const vm::CellSlice& cs) const {
+  switch (get_tag(cs)) {
+  case vm_stk_null:
+    return cs.prefetch_ulong(8) == 0 ? vm_stk_null : -1;
+  case vm_stk_tinyint:
+    return cs.prefetch_ulong(8) == 1 ? vm_stk_tinyint : -1;
+  case vm_stk_int:
+    return cs.prefetch_ulong(15) == 0x100 ? vm_stk_int : -1;
+  case vm_stk_nan:
+    return cs.prefetch_ulong(16) == 0x2ff ? vm_stk_nan : -1;
+  case vm_stk_cell:
+    return cs.prefetch_ulong(8) == 3 ? vm_stk_cell : -1;
+  case vm_stk_slice:
+    return cs.prefetch_ulong(8) == 4 ? vm_stk_slice : -1;
+  case vm_stk_builder:
+    return cs.prefetch_ulong(8) == 5 ? vm_stk_builder : -1;
+  case vm_stk_cont:
+    return cs.prefetch_ulong(8) == 6 ? vm_stk_cont : -1;
+  case vm_stk_tuple:
+    return cs.prefetch_ulong(8) == 7 ? vm_stk_tuple : -1;
+  }
+  return -1;
+}
+
+bool VmStackValue::skip(vm::CellSlice& cs) const {
+  switch (get_tag(cs)) {
+  case vm_stk_null:
+    return cs.advance(8);
+  case vm_stk_tinyint:
+    return cs.advance(72);
+  case vm_stk_int:
+    return cs.advance(272);
+  case vm_stk_nan:
+    return cs.advance(16);
+  case vm_stk_cell:
+    return cs.advance_ext(0x10008);
+  case vm_stk_slice:
+    return cs.advance_ext(0x10022);
+  case vm_stk_builder:
+    return cs.advance_ext(0x10008);
+  case vm_stk_cont:
+    return cs.advance(8)
+        && t_VmCont.skip(cs);
+  case vm_stk_tuple: {
+    int len;
+    return cs.advance(8)
+        && cs.fetch_uint_to(16, len)
+        && VmTuple{len}.skip(cs);
+    }
+  }
+  return false;
+}
+
+bool VmStackValue::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const {
+  switch (get_tag(cs)) {
+  case vm_stk_null:
+    return cs.fetch_ulong(8) == 0;
+  case vm_stk_tinyint:
+    return cs.fetch_ulong(8) == 1
+        && cs.advance(64);
+  case vm_stk_int:
+    return cs.fetch_ulong(15) == 0x100
+        && cs.advance(257);
+  case vm_stk_nan:
+    return cs.fetch_ulong(16) == 0x2ff;
+  case vm_stk_cell:
+    return cs.fetch_ulong(8) == 3
+        && cs.advance_refs(1);
+  case vm_stk_slice:
+    return cs.fetch_ulong(8) == 4
+        && t_VmCellSlice.validate_skip(ops, cs, weak);
+  case vm_stk_builder:
+    return cs.fetch_ulong(8) == 5
+        && cs.advance_refs(1);
+  case vm_stk_cont:
+    return cs.fetch_ulong(8) == 6
+        && t_VmCont.validate_skip(ops, cs, weak);
+  case vm_stk_tuple: {
+    int len;
+    return cs.fetch_ulong(8) == 7
+        && cs.fetch_uint_to(16, len)
+        && VmTuple{len}.validate_skip(ops, cs, weak);
+    }
+  }
+  return false;
+}
+
+bool VmStackValue::unpack(vm::CellSlice& cs, VmStackValue::Record_vm_stk_null& data) const {
+  return cs.fetch_ulong(8) == 0;
+}
+
+bool VmStackValue::unpack_vm_stk_null(vm::CellSlice& cs) const {
+  return cs.fetch_ulong(8) == 0;
+}
+
+bool VmStackValue::cell_unpack(Ref<vm::Cell> cell_ref, VmStackValue::Record_vm_stk_null& data) const {
+  if (cell_ref.is_null()) { return false; }
+  auto cs = load_cell_slice(std::move(cell_ref));
+  return unpack(cs, data) && cs.empty_ext();
+}
+
+bool VmStackValue::cell_unpack_vm_stk_null(Ref<vm::Cell> cell_ref) const {
+  if (cell_ref.is_null()) { return false; }
+  auto cs = load_cell_slice(std::move(cell_ref));
+  return unpack_vm_stk_null(cs) && cs.empty_ext();
+}
+
+bool VmStackValue::unpack(vm::CellSlice& cs, VmStackValue::Record_vm_stk_tinyint& data) const {
+  return cs.fetch_ulong(8) == 1
+      && cs.fetch_int_to(64, data.value);
+}
+
+bool VmStackValue::unpack_vm_stk_tinyint(vm::CellSlice& cs, long long& value) const {
+  return cs.fetch_ulong(8) == 1
+      && cs.fetch_int_to(64, value);
+}
+
+bool VmStackValue::cell_unpack(Ref<vm::Cell> cell_ref, VmStackValue::Record_vm_stk_tinyint& data) const {
+  if (cell_ref.is_null()) { return false; }
+  auto cs = load_cell_slice(std::move(cell_ref));
+  return unpack(cs, data) && cs.empty_ext();
+}
+
+bool VmStackValue::cell_unpack_vm_stk_tinyint(Ref<vm::Cell> cell_ref, long long& value) const {
+  if (cell_ref.is_null()) { return false; }
+  auto cs = load_cell_slice(std::move(cell_ref));
+  return unpack_vm_stk_tinyint(cs, value) && cs.empty_ext();
+}
+
+bool VmStackValue::unpack(vm::CellSlice& cs, VmStackValue::Record_vm_stk_int& data) const {
+  return cs.fetch_ulong(15) == 0x100
+      && cs.fetch_int256_to(257, data.value);
+}
+
+bool VmStackValue::unpack_vm_stk_int(vm::CellSlice& cs, RefInt256& value) const {
+  return cs.fetch_ulong(15) == 0x100
+      && cs.fetch_int256_to(257, value);
+}
+
+bool VmStackValue::cell_unpack(Ref<vm::Cell> cell_ref, VmStackValue::Record_vm_stk_int& data) const {
+  if (cell_ref.is_null()) { return false; }
+  auto cs = load_cell_slice(std::move(cell_ref));
+  return unpack(cs, data) && cs.empty_ext();
+}
+
+bool VmStackValue::cell_unpack_vm_stk_int(Ref<vm::Cell> cell_ref, RefInt256& value) const {
+  if (cell_ref.is_null()) { return false; }
+  auto cs = load_cell_slice(std::move(cell_ref));
+  return unpack_vm_stk_int(cs, value) && cs.empty_ext();
+}
+
+bool VmStackValue::unpack(vm::CellSlice& cs, VmStackValue::Record_vm_stk_nan& data) const {
+  return cs.fetch_ulong(16) == 0x2ff;
+}
+
+bool VmStackValue::unpack_vm_stk_nan(vm::CellSlice& cs) const {
+  return cs.fetch_ulong(16) == 0x2ff;
+}
+
+bool VmStackValue::cell_unpack(Ref<vm::Cell> cell_ref, VmStackValue::Record_vm_stk_nan& data) const {
+  if (cell_ref.is_null()) { return false; }
+  auto cs = load_cell_slice(std::move(cell_ref));
+  return unpack(cs, data) && cs.empty_ext();
+}
+
+bool VmStackValue::cell_unpack_vm_stk_nan(Ref<vm::Cell> cell_ref) const {
+  if (cell_ref.is_null()) { return false; }
+  auto cs = load_cell_slice(std::move(cell_ref));
+  return unpack_vm_stk_nan(cs) && cs.empty_ext();
+}
+
+bool VmStackValue::unpack(vm::CellSlice& cs, VmStackValue::Record_vm_stk_cell& data) const {
+  return cs.fetch_ulong(8) == 3
+      && cs.fetch_ref_to(data.cell);
+}
+
+bool VmStackValue::unpack_vm_stk_cell(vm::CellSlice& cs, Ref<Cell>& cell) const {
+  return cs.fetch_ulong(8) == 3
+      && cs.fetch_ref_to(cell);
+}
+
+bool VmStackValue::cell_unpack(Ref<vm::Cell> cell_ref, VmStackValue::Record_vm_stk_cell& data) const {
+  if (cell_ref.is_null()) { return false; }
+  auto cs = load_cell_slice(std::move(cell_ref));
+  return unpack(cs, data) && cs.empty_ext();
+}
+
+bool VmStackValue::cell_unpack_vm_stk_cell(Ref<vm::Cell> cell_ref, Ref<Cell>& cell) const {
+  if (cell_ref.is_null()) { return false; }
+  auto cs = load_cell_slice(std::move(cell_ref));
+  return unpack_vm_stk_cell(cs, cell) && cs.empty_ext();
+}
+
+bool VmStackValue::unpack(vm::CellSlice& cs, VmStackValue::Record_vm_stk_slice& data) const {
+  return cs.fetch_ulong(8) == 4
+      && cs.fetch_subslice_ext_to(0x1001a, data.x);
+}
+
+bool VmStackValue::unpack_vm_stk_slice(vm::CellSlice& cs, Ref<CellSlice>& x) const {
+  return cs.fetch_ulong(8) == 4
+      && cs.fetch_subslice_ext_to(0x1001a, x);
+}
+
+bool VmStackValue::cell_unpack(Ref<vm::Cell> cell_ref, VmStackValue::Record_vm_stk_slice& data) const {
+  if (cell_ref.is_null()) { return false; }
+  auto cs = load_cell_slice(std::move(cell_ref));
+  return unpack(cs, data) && cs.empty_ext();
+}
+
+bool VmStackValue::cell_unpack_vm_stk_slice(Ref<vm::Cell> cell_ref, Ref<CellSlice>& x) const {
+  if (cell_ref.is_null()) { return false; }
+  auto cs = load_cell_slice(std::move(cell_ref));
+  return unpack_vm_stk_slice(cs, x) && cs.empty_ext();
+}
+
+bool VmStackValue::unpack(vm::CellSlice& cs, VmStackValue::Record_vm_stk_builder& data) const {
+  return cs.fetch_ulong(8) == 5
+      && cs.fetch_ref_to(data.cell);
+}
+
+bool VmStackValue::unpack_vm_stk_builder(vm::CellSlice& cs, Ref<Cell>& cell) const {
+  return cs.fetch_ulong(8) == 5
+      && cs.fetch_ref_to(cell);
+}
+
+bool VmStackValue::cell_unpack(Ref<vm::Cell> cell_ref, VmStackValue::Record_vm_stk_builder& data) const {
+  if (cell_ref.is_null()) { return false; }
+  auto cs = load_cell_slice(std::move(cell_ref));
+  return unpack(cs, data) && cs.empty_ext();
+}
+
+bool VmStackValue::cell_unpack_vm_stk_builder(Ref<vm::Cell> cell_ref, Ref<Cell>& cell) const {
+  if (cell_ref.is_null()) { return false; }
+  auto cs = load_cell_slice(std::move(cell_ref));
+  return unpack_vm_stk_builder(cs, cell) && cs.empty_ext();
+}
+
+bool VmStackValue::unpack(vm::CellSlice& cs, VmStackValue::Record_vm_stk_cont& data) const {
+  return cs.fetch_ulong(8) == 6
+      && t_VmCont.fetch_to(cs, data.cont);
+}
+
+bool VmStackValue::unpack_vm_stk_cont(vm::CellSlice& cs, Ref<CellSlice>& cont) const {
+  return cs.fetch_ulong(8) == 6
+      && t_VmCont.fetch_to(cs, cont);
+}
+
+bool VmStackValue::cell_unpack(Ref<vm::Cell> cell_ref, VmStackValue::Record_vm_stk_cont& data) const {
+  if (cell_ref.is_null()) { return false; }
+  auto cs = load_cell_slice(std::move(cell_ref));
+  return unpack(cs, data) && cs.empty_ext();
+}
+
+bool VmStackValue::cell_unpack_vm_stk_cont(Ref<vm::Cell> cell_ref, Ref<CellSlice>& cont) const {
+  if (cell_ref.is_null()) { return false; }
+  auto cs = load_cell_slice(std::move(cell_ref));
+  return unpack_vm_stk_cont(cs, cont) && cs.empty_ext();
+}
+
+bool VmStackValue::unpack(vm::CellSlice& cs, VmStackValue::Record_vm_stk_tuple& data) const {
+  return cs.fetch_ulong(8) == 7
+      && cs.fetch_uint_to(16, data.len)
+      && VmTuple{data.len}.fetch_to(cs, data.data);
+}
+
+bool VmStackValue::unpack_vm_stk_tuple(vm::CellSlice& cs, int& len, Ref<CellSlice>& data) const {
+  return cs.fetch_ulong(8) == 7
+      && cs.fetch_uint_to(16, len)
+      && VmTuple{len}.fetch_to(cs, data);
+}
+
+bool VmStackValue::cell_unpack(Ref<vm::Cell> cell_ref, VmStackValue::Record_vm_stk_tuple& data) const {
+  if (cell_ref.is_null()) { return false; }
+  auto cs = load_cell_slice(std::move(cell_ref));
+  return unpack(cs, data) && cs.empty_ext();
+}
+
+bool VmStackValue::cell_unpack_vm_stk_tuple(Ref<vm::Cell> cell_ref, int& len, Ref<CellSlice>& data) const {
+  if (cell_ref.is_null()) { return false; }
+  auto cs = load_cell_slice(std::move(cell_ref));
+  return unpack_vm_stk_tuple(cs, len, data) && cs.empty_ext();
+}
+
+bool VmStackValue::pack(vm::CellBuilder& cb, const VmStackValue::Record_vm_stk_null& data) const {
+  return cb.store_long_bool(0, 8);
+}
+
+bool VmStackValue::pack_vm_stk_null(vm::CellBuilder& cb) const {
+  return cb.store_long_bool(0, 8);
+}
+
+bool VmStackValue::cell_pack(Ref<vm::Cell>& cell_ref, const VmStackValue::Record_vm_stk_null& data) const {
+  vm::CellBuilder cb;
+  return pack(cb, data) && std::move(cb).finalize_to(cell_ref);
+}
+
+bool VmStackValue::cell_pack_vm_stk_null(Ref<vm::Cell>& cell_ref) const {
+  vm::CellBuilder cb;
+  return pack_vm_stk_null(cb) && std::move(cb).finalize_to(cell_ref);
+}
+
+bool VmStackValue::pack(vm::CellBuilder& cb, const VmStackValue::Record_vm_stk_tinyint& data) const {
+  return cb.store_long_bool(1, 8)
+      && cb.store_long_rchk_bool(data.value, 64);
+}
+
+bool VmStackValue::pack_vm_stk_tinyint(vm::CellBuilder& cb, long long value) const {
+  return cb.store_long_bool(1, 8)
+      && cb.store_long_rchk_bool(value, 64);
+}
+
+bool VmStackValue::cell_pack(Ref<vm::Cell>& cell_ref, const VmStackValue::Record_vm_stk_tinyint& data) const {
+  vm::CellBuilder cb;
+  return pack(cb, data) && std::move(cb).finalize_to(cell_ref);
+}
+
+bool VmStackValue::cell_pack_vm_stk_tinyint(Ref<vm::Cell>& cell_ref, long long value) const {
+  vm::CellBuilder cb;
+  return pack_vm_stk_tinyint(cb, value) && std::move(cb).finalize_to(cell_ref);
+}
+
+bool VmStackValue::pack(vm::CellBuilder& cb, const VmStackValue::Record_vm_stk_int& data) const {
+  return cb.store_long_bool(0x100, 15)
+      && cb.store_int256_bool(data.value, 257);
+}
+
+bool VmStackValue::pack_vm_stk_int(vm::CellBuilder& cb, RefInt256 value) const {
+  return cb.store_long_bool(0x100, 15)
+      && cb.store_int256_bool(value, 257);
+}
+
+bool VmStackValue::cell_pack(Ref<vm::Cell>& cell_ref, const VmStackValue::Record_vm_stk_int& data) const {
+  vm::CellBuilder cb;
+  return pack(cb, data) && std::move(cb).finalize_to(cell_ref);
+}
+
+bool VmStackValue::cell_pack_vm_stk_int(Ref<vm::Cell>& cell_ref, RefInt256 value) const {
+  vm::CellBuilder cb;
+  return pack_vm_stk_int(cb, std::move(value)) && std::move(cb).finalize_to(cell_ref);
+}
+
+bool VmStackValue::pack(vm::CellBuilder& cb, const VmStackValue::Record_vm_stk_nan& data) const {
+  return cb.store_long_bool(0x2ff, 16);
+}
+
+bool VmStackValue::pack_vm_stk_nan(vm::CellBuilder& cb) const {
+  return cb.store_long_bool(0x2ff, 16);
+}
+
+bool VmStackValue::cell_pack(Ref<vm::Cell>& cell_ref, const VmStackValue::Record_vm_stk_nan& data) const {
+  vm::CellBuilder cb;
+  return pack(cb, data) && std::move(cb).finalize_to(cell_ref);
+}
+
+bool VmStackValue::cell_pack_vm_stk_nan(Ref<vm::Cell>& cell_ref) const {
+  vm::CellBuilder cb;
+  return pack_vm_stk_nan(cb) && std::move(cb).finalize_to(cell_ref);
+}
+
+bool VmStackValue::pack(vm::CellBuilder& cb, const VmStackValue::Record_vm_stk_cell& data) const {
+  return cb.store_long_bool(3, 8)
+      && cb.store_ref_bool(data.cell);
+}
+
+bool VmStackValue::pack_vm_stk_cell(vm::CellBuilder& cb, Ref<Cell> cell) const {
+  return cb.store_long_bool(3, 8)
+      && cb.store_ref_bool(cell);
+}
+
+bool VmStackValue::cell_pack(Ref<vm::Cell>& cell_ref, const VmStackValue::Record_vm_stk_cell& data) const {
+  vm::CellBuilder cb;
+  return pack(cb, data) && std::move(cb).finalize_to(cell_ref);
+}
+
+bool VmStackValue::cell_pack_vm_stk_cell(Ref<vm::Cell>& cell_ref, Ref<Cell> cell) const {
+  vm::CellBuilder cb;
+  return pack_vm_stk_cell(cb, std::move(cell)) && std::move(cb).finalize_to(cell_ref);
+}
+
+bool VmStackValue::pack(vm::CellBuilder& cb, const VmStackValue::Record_vm_stk_slice& data) const {
+  return cb.store_long_bool(4, 8)
+      && cb.append_cellslice_chk(data.x, 0x1001a);
+}
+
+bool VmStackValue::pack_vm_stk_slice(vm::CellBuilder& cb, Ref<CellSlice> x) const {
+  return cb.store_long_bool(4, 8)
+      && cb.append_cellslice_chk(x, 0x1001a);
+}
+
+bool VmStackValue::cell_pack(Ref<vm::Cell>& cell_ref, const VmStackValue::Record_vm_stk_slice& data) const {
+  vm::CellBuilder cb;
+  return pack(cb, data) && std::move(cb).finalize_to(cell_ref);
+}
+
+bool VmStackValue::cell_pack_vm_stk_slice(Ref<vm::Cell>& cell_ref, Ref<CellSlice> x) const {
+  vm::CellBuilder cb;
+  return pack_vm_stk_slice(cb, std::move(x)) && std::move(cb).finalize_to(cell_ref);
+}
+
+bool VmStackValue::pack(vm::CellBuilder& cb, const VmStackValue::Record_vm_stk_builder& data) const {
+  return cb.store_long_bool(5, 8)
+      && cb.store_ref_bool(data.cell);
+}
+
+bool VmStackValue::pack_vm_stk_builder(vm::CellBuilder& cb, Ref<Cell> cell) const {
+  return cb.store_long_bool(5, 8)
+      && cb.store_ref_bool(cell);
+}
+
+bool VmStackValue::cell_pack(Ref<vm::Cell>& cell_ref, const VmStackValue::Record_vm_stk_builder& data) const {
+  vm::CellBuilder cb;
+  return pack(cb, data) && std::move(cb).finalize_to(cell_ref);
+}
+
+bool VmStackValue::cell_pack_vm_stk_builder(Ref<vm::Cell>& cell_ref, Ref<Cell> cell) const {
+  vm::CellBuilder cb;
+  return pack_vm_stk_builder(cb, std::move(cell)) && std::move(cb).finalize_to(cell_ref);
+}
+
+bool VmStackValue::pack(vm::CellBuilder& cb, const VmStackValue::Record_vm_stk_cont& data) const {
+  return cb.store_long_bool(6, 8)
+      && t_VmCont.store_from(cb, data.cont);
+}
+
+bool VmStackValue::pack_vm_stk_cont(vm::CellBuilder& cb, Ref<CellSlice> cont) const {
+  return cb.store_long_bool(6, 8)
+      && t_VmCont.store_from(cb, cont);
+}
+
+bool VmStackValue::cell_pack(Ref<vm::Cell>& cell_ref, const VmStackValue::Record_vm_stk_cont& data) const {
+  vm::CellBuilder cb;
+  return pack(cb, data) && std::move(cb).finalize_to(cell_ref);
+}
+
+bool VmStackValue::cell_pack_vm_stk_cont(Ref<vm::Cell>& cell_ref, Ref<CellSlice> cont) const {
+  vm::CellBuilder cb;
+  return pack_vm_stk_cont(cb, std::move(cont)) && std::move(cb).finalize_to(cell_ref);
+}
+
+bool VmStackValue::pack(vm::CellBuilder& cb, const VmStackValue::Record_vm_stk_tuple& data) const {
+  return cb.store_long_bool(7, 8)
+      && cb.store_ulong_rchk_bool(data.len, 16)
+      && VmTuple{data.len}.store_from(cb, data.data);
+}
+
+bool VmStackValue::pack_vm_stk_tuple(vm::CellBuilder& cb, int len, Ref<CellSlice> data) const {
+  return cb.store_long_bool(7, 8)
+      && cb.store_ulong_rchk_bool(len, 16)
+      && VmTuple{len}.store_from(cb, data);
+}
+
+bool VmStackValue::cell_pack(Ref<vm::Cell>& cell_ref, const VmStackValue::Record_vm_stk_tuple& data) const {
+  vm::CellBuilder cb;
+  return pack(cb, data) && std::move(cb).finalize_to(cell_ref);
+}
+
+bool VmStackValue::cell_pack_vm_stk_tuple(Ref<vm::Cell>& cell_ref, int len, Ref<CellSlice> data) const {
+  vm::CellBuilder cb;
+  return pack_vm_stk_tuple(cb, len, std::move(data)) && std::move(cb).finalize_to(cell_ref);
+}
+
+bool VmStackValue::print_skip(PrettyPrinter& pp, vm::CellSlice& cs) const {
+  switch (get_tag(cs)) {
+  case vm_stk_null:
+    return cs.fetch_ulong(8) == 0
+        && pp.cons("vm_stk_null");
+  case vm_stk_tinyint:
+    return cs.fetch_ulong(8) == 1
+        && pp.open("vm_stk_tinyint")
+        && pp.fetch_int_field(cs, 64, "value")
+        && pp.close();
+  case vm_stk_int:
+    return cs.fetch_ulong(15) == 0x100
+        && pp.open("vm_stk_int")
+        && pp.fetch_int256_field(cs, 257, "value")
+        && pp.close();
+  case vm_stk_nan:
+    return cs.fetch_ulong(16) == 0x2ff
+        && pp.cons("vm_stk_nan");
+  case vm_stk_cell:
+    return cs.fetch_ulong(8) == 3
+        && pp.open("vm_stk_cell")
+        && pp.field("cell")
+        && t_Anything.print_ref(pp, cs.fetch_ref())
+        && pp.close();
+  case vm_stk_slice:
+    return cs.fetch_ulong(8) == 4
+        && pp.open("vm_stk_slice")
+        && pp.field()
+        && t_VmCellSlice.print_skip(pp, cs)
+        && pp.close();
+  case vm_stk_builder:
+    return cs.fetch_ulong(8) == 5
+        && pp.open("vm_stk_builder")
+        && pp.field("cell")
+        && t_Anything.print_ref(pp, cs.fetch_ref())
+        && pp.close();
+  case vm_stk_cont:
+    return cs.fetch_ulong(8) == 6
+        && pp.open("vm_stk_cont")
+        && pp.field("cont")
+        && t_VmCont.print_skip(pp, cs)
+        && pp.close();
+  case vm_stk_tuple: {
+    int len;
+    return cs.fetch_ulong(8) == 7
+        && pp.open("vm_stk_tuple")
+        && cs.fetch_uint_to(16, len)
+        && pp.field_int(len, "len")
+        && pp.field("data")
+        && VmTuple{len}.print_skip(pp, cs)
+        && pp.close();
+    }
+  }
+  return pp.fail("unknown constructor for VmStackValue");
+}
+
+const VmStackValue t_VmStackValue;
+
+//
+// code for type `VmStack`
+//
+
+int VmStack::check_tag(const vm::CellSlice& cs) const {
+  return vm_stack;
+}
+
+bool VmStack::skip(vm::CellSlice& cs) const {
+  int depth;
+  return cs.fetch_uint_to(24, depth)
+      && VmStackList{depth}.skip(cs);
+}
+
+bool VmStack::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const {
+  int depth;
+  return cs.fetch_uint_to(24, depth)
+      && VmStackList{depth}.validate_skip(ops, cs, weak);
+}
+
+bool VmStack::unpack(vm::CellSlice& cs, VmStack::Record& data) const {
+  return cs.fetch_uint_to(24, data.depth)
+      && VmStackList{data.depth}.fetch_to(cs, data.stack);
+}
+
+bool VmStack::unpack_vm_stack(vm::CellSlice& cs, int& depth, Ref<CellSlice>& stack) const {
+  return cs.fetch_uint_to(24, depth)
+      && VmStackList{depth}.fetch_to(cs, stack);
+}
+
+bool VmStack::cell_unpack(Ref<vm::Cell> cell_ref, VmStack::Record& data) const {
+  if (cell_ref.is_null()) { return false; }
+  auto cs = load_cell_slice(std::move(cell_ref));
+  return unpack(cs, data) && cs.empty_ext();
+}
+
+bool VmStack::cell_unpack_vm_stack(Ref<vm::Cell> cell_ref, int& depth, Ref<CellSlice>& stack) const {
+  if (cell_ref.is_null()) { return false; }
+  auto cs = load_cell_slice(std::move(cell_ref));
+  return unpack_vm_stack(cs, depth, stack) && cs.empty_ext();
+}
+
+bool VmStack::pack(vm::CellBuilder& cb, const VmStack::Record& data) const {
+  return cb.store_ulong_rchk_bool(data.depth, 24)
+      && VmStackList{data.depth}.store_from(cb, data.stack);
+}
+
+bool VmStack::pack_vm_stack(vm::CellBuilder& cb, int depth, Ref<CellSlice> stack) const {
+  return cb.store_ulong_rchk_bool(depth, 24)
+      && VmStackList{depth}.store_from(cb, stack);
+}
+
+bool VmStack::cell_pack(Ref<vm::Cell>& cell_ref, const VmStack::Record& data) const {
+  vm::CellBuilder cb;
+  return pack(cb, data) && std::move(cb).finalize_to(cell_ref);
+}
+
+bool VmStack::cell_pack_vm_stack(Ref<vm::Cell>& cell_ref, int depth, Ref<CellSlice> stack) const {
+  vm::CellBuilder cb;
+  return pack_vm_stack(cb, depth, std::move(stack)) && std::move(cb).finalize_to(cell_ref);
+}
+
+bool VmStack::print_skip(PrettyPrinter& pp, vm::CellSlice& cs) const {
+  int depth;
+  return pp.open("vm_stack")
+      && cs.fetch_uint_to(24, depth)
+      && pp.field_int(depth, "depth")
+      && pp.field("stack")
+      && VmStackList{depth}.print_skip(pp, cs)
+      && pp.close();
+}
+
+const VmStack t_VmStack;
+
+//
+// code for type `VmStackList`
+//
+
+int VmStackList::get_tag(const vm::CellSlice& cs) const {
+  // distinguish by parameter `m_` using 2 1 1 1
+  return m_ ? vm_stk_cons : vm_stk_nil;
+}
+
+int VmStackList::check_tag(const vm::CellSlice& cs) const {
+  switch (get_tag(cs)) {
+  case vm_stk_cons:
+    return vm_stk_cons;
+  case vm_stk_nil:
+    return vm_stk_nil;
+  }
+  return -1;
+}
+
+bool VmStackList::skip(vm::CellSlice& cs) const {
+  switch (get_tag(cs)) {
+  case vm_stk_cons: {
+    int n;
+    return add_r1(n, 1, m_)
+        && cs.advance_refs(1)
+        && t_VmStackValue.skip(cs);
+    }
+  case vm_stk_nil:
+    return m_ == 0;
+  }
+  return false;
+}
+
+bool VmStackList::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const {
+  switch (get_tag(cs)) {
+  case vm_stk_cons: {
+    int n;
+    return add_r1(n, 1, m_)
+        && VmStackList{n}.validate_skip_ref(ops, cs, weak)
+        && t_VmStackValue.validate_skip(ops, cs, weak);
+    }
+  case vm_stk_nil:
+    return m_ == 0;
+  }
+  return false;
+}
+
+bool VmStackList::unpack(vm::CellSlice& cs, VmStackList::Record_vm_stk_cons& data) const {
+  return add_r1(data.n, 1, m_)
+      && cs.fetch_ref_to(data.rest)
+      && t_VmStackValue.fetch_to(cs, data.tos);
+}
+
+bool VmStackList::unpack_vm_stk_cons(vm::CellSlice& cs, int& n, Ref<Cell>& rest, Ref<CellSlice>& tos) const {
+  return add_r1(n, 1, m_)
+      && cs.fetch_ref_to(rest)
+      && t_VmStackValue.fetch_to(cs, tos);
+}
+
+bool VmStackList::cell_unpack(Ref<vm::Cell> cell_ref, VmStackList::Record_vm_stk_cons& data) const {
+  if (cell_ref.is_null()) { return false; }
+  auto cs = load_cell_slice(std::move(cell_ref));
+  return unpack(cs, data) && cs.empty_ext();
+}
+
+bool VmStackList::cell_unpack_vm_stk_cons(Ref<vm::Cell> cell_ref, int& n, Ref<Cell>& rest, Ref<CellSlice>& tos) const {
+  if (cell_ref.is_null()) { return false; }
+  auto cs = load_cell_slice(std::move(cell_ref));
+  return unpack_vm_stk_cons(cs, n, rest, tos) && cs.empty_ext();
+}
+
+bool VmStackList::unpack(vm::CellSlice& cs, VmStackList::Record_vm_stk_nil& data) const {
+  return m_ == 0;
+}
+
+bool VmStackList::unpack_vm_stk_nil(vm::CellSlice& cs) const {
+  return m_ == 0;
+}
+
+bool VmStackList::cell_unpack(Ref<vm::Cell> cell_ref, VmStackList::Record_vm_stk_nil& data) const {
+  if (cell_ref.is_null()) { return false; }
+  auto cs = load_cell_slice(std::move(cell_ref));
+  return unpack(cs, data) && cs.empty_ext();
+}
+
+bool VmStackList::cell_unpack_vm_stk_nil(Ref<vm::Cell> cell_ref) const {
+  if (cell_ref.is_null()) { return false; }
+  auto cs = load_cell_slice(std::move(cell_ref));
+  return unpack_vm_stk_nil(cs) && cs.empty_ext();
+}
+
+bool VmStackList::pack(vm::CellBuilder& cb, const VmStackList::Record_vm_stk_cons& data) const {
+  int n;
+  return add_r1(n, 1, m_)
+      && cb.store_ref_bool(data.rest)
+      && t_VmStackValue.store_from(cb, data.tos);
+}
+
+bool VmStackList::pack_vm_stk_cons(vm::CellBuilder& cb, Ref<Cell> rest, Ref<CellSlice> tos) const {
+  int n;
+  return add_r1(n, 1, m_)
+      && cb.store_ref_bool(rest)
+      && t_VmStackValue.store_from(cb, tos);
+}
+
+bool VmStackList::cell_pack(Ref<vm::Cell>& cell_ref, const VmStackList::Record_vm_stk_cons& data) const {
+  vm::CellBuilder cb;
+  return pack(cb, data) && std::move(cb).finalize_to(cell_ref);
+}
+
+bool VmStackList::cell_pack_vm_stk_cons(Ref<vm::Cell>& cell_ref, Ref<Cell> rest, Ref<CellSlice> tos) const {
+  vm::CellBuilder cb;
+  return pack_vm_stk_cons(cb, std::move(rest), std::move(tos)) && std::move(cb).finalize_to(cell_ref);
+}
+
+bool VmStackList::pack(vm::CellBuilder& cb, const VmStackList::Record_vm_stk_nil& data) const {
+  return m_ == 0;
+}
+
+bool VmStackList::pack_vm_stk_nil(vm::CellBuilder& cb) const {
+  return m_ == 0;
+}
+
+bool VmStackList::cell_pack(Ref<vm::Cell>& cell_ref, const VmStackList::Record_vm_stk_nil& data) const {
+  vm::CellBuilder cb;
+  return pack(cb, data) && std::move(cb).finalize_to(cell_ref);
+}
+
+bool VmStackList::cell_pack_vm_stk_nil(Ref<vm::Cell>& cell_ref) const {
+  vm::CellBuilder cb;
+  return pack_vm_stk_nil(cb) && std::move(cb).finalize_to(cell_ref);
+}
+
+bool VmStackList::print_skip(PrettyPrinter& pp, vm::CellSlice& cs) const {
+  switch (get_tag(cs)) {
+  case vm_stk_cons: {
+    int n;
+    return pp.open("vm_stk_cons")
+        && add_r1(n, 1, m_)
+        && pp.field("rest")
+        && VmStackList{n}.print_ref(pp, cs.fetch_ref())
+        && pp.field("tos")
+        && t_VmStackValue.print_skip(pp, cs)
+        && pp.close();
+    }
+  case vm_stk_nil:
+    return pp.cons("vm_stk_nil")
+        && m_ == 0;
+  }
+  return pp.fail("unknown constructor for VmStackList");
+}
+
+
+//
+// code for type `VmSaveList`
+//
+
+int VmSaveList::check_tag(const vm::CellSlice& cs) const {
+  return cons1;
+}
+
+bool VmSaveList::skip(vm::CellSlice& cs) const {
+  return t_HashmapE_4_VmStackValue.skip(cs);
+}
+
+bool VmSaveList::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const {
+  return t_HashmapE_4_VmStackValue.validate_skip(ops, cs, weak);
+}
+
+bool VmSaveList::unpack(vm::CellSlice& cs, VmSaveList::Record& data) const {
+  return t_HashmapE_4_VmStackValue.fetch_to(cs, data.cregs);
+}
+
+bool VmSaveList::unpack_cons1(vm::CellSlice& cs, Ref<CellSlice>& cregs) const {
+  return t_HashmapE_4_VmStackValue.fetch_to(cs, cregs);
+}
+
+bool VmSaveList::cell_unpack(Ref<vm::Cell> cell_ref, VmSaveList::Record& data) const {
+  if (cell_ref.is_null()) { return false; }
+  auto cs = load_cell_slice(std::move(cell_ref));
+  return unpack(cs, data) && cs.empty_ext();
+}
+
+bool VmSaveList::cell_unpack_cons1(Ref<vm::Cell> cell_ref, Ref<CellSlice>& cregs) const {
+  if (cell_ref.is_null()) { return false; }
+  auto cs = load_cell_slice(std::move(cell_ref));
+  return unpack_cons1(cs, cregs) && cs.empty_ext();
+}
+
+bool VmSaveList::pack(vm::CellBuilder& cb, const VmSaveList::Record& data) const {
+  return t_HashmapE_4_VmStackValue.store_from(cb, data.cregs);
+}
+
+bool VmSaveList::pack_cons1(vm::CellBuilder& cb, Ref<CellSlice> cregs) const {
+  return t_HashmapE_4_VmStackValue.store_from(cb, cregs);
+}
+
+bool VmSaveList::cell_pack(Ref<vm::Cell>& cell_ref, const VmSaveList::Record& data) const {
+  vm::CellBuilder cb;
+  return pack(cb, data) && std::move(cb).finalize_to(cell_ref);
+}
+
+bool VmSaveList::cell_pack_cons1(Ref<vm::Cell>& cell_ref, Ref<CellSlice> cregs) const {
+  vm::CellBuilder cb;
+  return pack_cons1(cb, std::move(cregs)) && std::move(cb).finalize_to(cell_ref);
+}
+
+bool VmSaveList::print_skip(PrettyPrinter& pp, vm::CellSlice& cs) const {
+  return pp.open()
+      && pp.field("cregs")
+      && t_HashmapE_4_VmStackValue.print_skip(pp, cs)
+      && pp.close();
+}
+
+const VmSaveList t_VmSaveList;
+
+//
+// code for auxiliary type `VmGasLimits_aux`
+//
+
+int VmGasLimits_aux::check_tag(const vm::CellSlice& cs) const {
+  return cons1;
+}
+
+bool VmGasLimits_aux::unpack(vm::CellSlice& cs, VmGasLimits_aux::Record& data) const {
+  return cs.fetch_int_to(64, data.max_limit)
+      && cs.fetch_int_to(64, data.cur_limit)
+      && cs.fetch_int_to(64, data.credit);
+}
+
+bool VmGasLimits_aux::unpack_cons1(vm::CellSlice& cs, long long& max_limit, long long& cur_limit, long long& credit) const {
+  return cs.fetch_int_to(64, max_limit)
+      && cs.fetch_int_to(64, cur_limit)
+      && cs.fetch_int_to(64, credit);
+}
+
+bool VmGasLimits_aux::cell_unpack(Ref<vm::Cell> cell_ref, VmGasLimits_aux::Record& data) const {
+  if (cell_ref.is_null()) { return false; }
+  auto cs = load_cell_slice(std::move(cell_ref));
+  return unpack(cs, data) && cs.empty_ext();
+}
+
+bool VmGasLimits_aux::cell_unpack_cons1(Ref<vm::Cell> cell_ref, long long& max_limit, long long& cur_limit, long long& credit) const {
+  if (cell_ref.is_null()) { return false; }
+  auto cs = load_cell_slice(std::move(cell_ref));
+  return unpack_cons1(cs, max_limit, cur_limit, credit) && cs.empty_ext();
+}
+
+bool VmGasLimits_aux::pack(vm::CellBuilder& cb, const VmGasLimits_aux::Record& data) const {
+  return cb.store_long_rchk_bool(data.max_limit, 64)
+      && cb.store_long_rchk_bool(data.cur_limit, 64)
+      && cb.store_long_rchk_bool(data.credit, 64);
+}
+
+bool VmGasLimits_aux::pack_cons1(vm::CellBuilder& cb, long long max_limit, long long cur_limit, long long credit) const {
+  return cb.store_long_rchk_bool(max_limit, 64)
+      && cb.store_long_rchk_bool(cur_limit, 64)
+      && cb.store_long_rchk_bool(credit, 64);
+}
+
+bool VmGasLimits_aux::cell_pack(Ref<vm::Cell>& cell_ref, const VmGasLimits_aux::Record& data) const {
+  vm::CellBuilder cb;
+  return pack(cb, data) && std::move(cb).finalize_to(cell_ref);
+}
+
+bool VmGasLimits_aux::cell_pack_cons1(Ref<vm::Cell>& cell_ref, long long max_limit, long long cur_limit, long long credit) const {
+  vm::CellBuilder cb;
+  return pack_cons1(cb, max_limit, cur_limit, credit) && std::move(cb).finalize_to(cell_ref);
+}
+
+bool VmGasLimits_aux::print_skip(PrettyPrinter& pp, vm::CellSlice& cs) const {
+  return pp.open()
+      && pp.fetch_int_field(cs, 64, "max_limit")
+      && pp.fetch_int_field(cs, 64, "cur_limit")
+      && pp.fetch_int_field(cs, 64, "credit")
+      && pp.close();
+}
+
+const VmGasLimits_aux t_VmGasLimits_aux;
+
+//
+// code for type `VmGasLimits`
+//
+
+int VmGasLimits::check_tag(const vm::CellSlice& cs) const {
+  return gas_limits;
+}
+
+bool VmGasLimits::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const {
+  return cs.advance(64)
+      && t_VmGasLimits_aux.validate_skip_ref(ops, cs, weak);
+}
+
+bool VmGasLimits::unpack(vm::CellSlice& cs, VmGasLimits::Record& data) const {
+  return cs.fetch_int_to(64, data.remaining)
+      && t_VmGasLimits_aux.cell_unpack(cs.fetch_ref(), data.r1);
+}
+
+bool VmGasLimits::cell_unpack(Ref<vm::Cell> cell_ref, VmGasLimits::Record& data) const {
+  if (cell_ref.is_null()) { return false; }
+  auto cs = load_cell_slice(std::move(cell_ref));
+  return unpack(cs, data) && cs.empty_ext();
+}
+
+bool VmGasLimits::pack(vm::CellBuilder& cb, const VmGasLimits::Record& data) const {
+  Ref<vm::Cell> tmp_cell;
+  return cb.store_long_rchk_bool(data.remaining, 64)
+      && t_VmGasLimits_aux.cell_pack(tmp_cell, data.r1)
+      && cb.store_ref_bool(std::move(tmp_cell));
+}
+
+bool VmGasLimits::cell_pack(Ref<vm::Cell>& cell_ref, const VmGasLimits::Record& data) const {
+  vm::CellBuilder cb;
+  return pack(cb, data) && std::move(cb).finalize_to(cell_ref);
+}
+
+bool VmGasLimits::print_skip(PrettyPrinter& pp, vm::CellSlice& cs) const {
+  return pp.open("gas_limits")
+      && pp.fetch_int_field(cs, 64, "remaining")
+      && pp.field()
+      && t_VmGasLimits_aux.print_ref(pp, cs.fetch_ref())
+      && pp.close();
+}
+
+const VmGasLimits t_VmGasLimits;
+
+//
+// code for type `VmLibraries`
+//
+
+int VmLibraries::check_tag(const vm::CellSlice& cs) const {
+  return cons1;
+}
+
+bool VmLibraries::skip(vm::CellSlice& cs) const {
+  return t_HashmapE_256_Ref_Cell.skip(cs);
+}
+
+bool VmLibraries::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const {
+  return t_HashmapE_256_Ref_Cell.validate_skip(ops, cs, weak);
+}
+
+bool VmLibraries::unpack(vm::CellSlice& cs, VmLibraries::Record& data) const {
+  return t_HashmapE_256_Ref_Cell.fetch_to(cs, data.libraries);
+}
+
+bool VmLibraries::unpack_cons1(vm::CellSlice& cs, Ref<CellSlice>& libraries) const {
+  return t_HashmapE_256_Ref_Cell.fetch_to(cs, libraries);
+}
+
+bool VmLibraries::cell_unpack(Ref<vm::Cell> cell_ref, VmLibraries::Record& data) const {
+  if (cell_ref.is_null()) { return false; }
+  auto cs = load_cell_slice(std::move(cell_ref));
+  return unpack(cs, data) && cs.empty_ext();
+}
+
+bool VmLibraries::cell_unpack_cons1(Ref<vm::Cell> cell_ref, Ref<CellSlice>& libraries) const {
+  if (cell_ref.is_null()) { return false; }
+  auto cs = load_cell_slice(std::move(cell_ref));
+  return unpack_cons1(cs, libraries) && cs.empty_ext();
+}
+
+bool VmLibraries::pack(vm::CellBuilder& cb, const VmLibraries::Record& data) const {
+  return t_HashmapE_256_Ref_Cell.store_from(cb, data.libraries);
+}
+
+bool VmLibraries::pack_cons1(vm::CellBuilder& cb, Ref<CellSlice> libraries) const {
+  return t_HashmapE_256_Ref_Cell.store_from(cb, libraries);
+}
+
+bool VmLibraries::cell_pack(Ref<vm::Cell>& cell_ref, const VmLibraries::Record& data) const {
+  vm::CellBuilder cb;
+  return pack(cb, data) && std::move(cb).finalize_to(cell_ref);
+}
+
+bool VmLibraries::cell_pack_cons1(Ref<vm::Cell>& cell_ref, Ref<CellSlice> libraries) const {
+  vm::CellBuilder cb;
+  return pack_cons1(cb, std::move(libraries)) && std::move(cb).finalize_to(cell_ref);
+}
+
+bool VmLibraries::print_skip(PrettyPrinter& pp, vm::CellSlice& cs) const {
+  return pp.open()
+      && pp.field("libraries")
+      && t_HashmapE_256_Ref_Cell.print_skip(pp, cs)
+      && pp.close();
+}
+
+const VmLibraries t_VmLibraries;
+
+//
+// code for type `VmControlData`
+//
+
+int VmControlData::check_tag(const vm::CellSlice& cs) const {
+  return vm_ctl_data;
+}
+
+bool VmControlData::skip(vm::CellSlice& cs) const {
+  return t_Maybe_uint13.skip(cs)
+      && t_Maybe_VmStack.skip(cs)
+      && t_VmSaveList.skip(cs)
+      && t_Maybe_int16.skip(cs);
+}
+
+bool VmControlData::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const {
+  return t_Maybe_uint13.validate_skip(ops, cs, weak)
+      && t_Maybe_VmStack.validate_skip(ops, cs, weak)
+      && t_VmSaveList.validate_skip(ops, cs, weak)
+      && t_Maybe_int16.validate_skip(ops, cs, weak);
+}
+
+bool VmControlData::unpack(vm::CellSlice& cs, VmControlData::Record& data) const {
+  return t_Maybe_uint13.fetch_to(cs, data.nargs)
+      && t_Maybe_VmStack.fetch_to(cs, data.stack)
+      && t_VmSaveList.fetch_to(cs, data.save)
+      && t_Maybe_int16.fetch_to(cs, data.cp);
+}
+
+bool VmControlData::cell_unpack(Ref<vm::Cell> cell_ref, VmControlData::Record& data) const {
+  if (cell_ref.is_null()) { return false; }
+  auto cs = load_cell_slice(std::move(cell_ref));
+  return unpack(cs, data) && cs.empty_ext();
+}
+
+bool VmControlData::pack(vm::CellBuilder& cb, const VmControlData::Record& data) const {
+  return t_Maybe_uint13.store_from(cb, data.nargs)
+      && t_Maybe_VmStack.store_from(cb, data.stack)
+      && t_VmSaveList.store_from(cb, data.save)
+      && t_Maybe_int16.store_from(cb, data.cp);
+}
+
+bool VmControlData::cell_pack(Ref<vm::Cell>& cell_ref, const VmControlData::Record& data) const {
+  vm::CellBuilder cb;
+  return pack(cb, data) && std::move(cb).finalize_to(cell_ref);
+}
+
+bool VmControlData::print_skip(PrettyPrinter& pp, vm::CellSlice& cs) const {
+  return pp.open("vm_ctl_data")
+      && pp.field("nargs")
+      && t_Maybe_uint13.print_skip(pp, cs)
+      && pp.field("stack")
+      && t_Maybe_VmStack.print_skip(pp, cs)
+      && pp.field("save")
+      && t_VmSaveList.print_skip(pp, cs)
+      && pp.field("cp")
+      && t_Maybe_int16.print_skip(pp, cs)
+      && pp.close();
+}
+
+const VmControlData t_VmControlData;
+
+//
+// code for type `VmCont`
+//
+constexpr char VmCont::cons_len[10];
+constexpr unsigned char VmCont::cons_tag[10];
+
+int VmCont::check_tag(const vm::CellSlice& cs) const {
+  switch (get_tag(cs)) {
+  case vmc_std:
+    return cs.have(2) ? vmc_std : -1;
+  case vmc_envelope:
+    return cs.have(2) ? vmc_envelope : -1;
+  case vmc_quit:
+    return cs.have(4) ? vmc_quit : -1;
+  case vmc_quit_exc:
+    return cs.have(4) ? vmc_quit_exc : -1;
+  case vmc_repeat:
+    return cs.prefetch_ulong(5) == 20 ? vmc_repeat : -1;
+  case vmc_until:
+    return cs.have(6) ? vmc_until : -1;
+  case vmc_again:
+    return cs.have(6) ? vmc_again : -1;
+  case vmc_while_cond:
+    return cs.have(6) ? vmc_while_cond : -1;
+  case vmc_while_body:
+    return cs.prefetch_ulong(6) == 0x33 ? vmc_while_body : -1;
+  case vmc_pushint:
+    return cs.have(4) ? vmc_pushint : -1;
+  }
+  return -1;
+}
+
+bool VmCont::skip(vm::CellSlice& cs) const {
+  switch (get_tag(cs)) {
+  case vmc_std:
+    return cs.advance(2)
+        && t_VmControlData.skip(cs)
+        && cs.advance_ext(0x1001a);
+  case vmc_envelope:
+    return cs.advance(2)
+        && t_VmControlData.skip(cs)
+        && cs.advance_refs(1);
+  case vmc_quit:
+    return cs.advance(36);
+  case vmc_quit_exc:
+    return cs.advance(4);
+  case vmc_repeat:
+    return cs.advance_ext(0x20044);
+  case vmc_until:
+    return cs.advance_ext(0x20006);
+  case vmc_again:
+    return cs.advance_ext(0x10006);
+  case vmc_while_cond:
+    return cs.advance_ext(0x30006);
+  case vmc_while_body:
+    return cs.advance_ext(0x30006);
+  case vmc_pushint:
+    return cs.advance_ext(0x10024);
+  }
+  return false;
+}
+
+bool VmCont::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const {
+  switch (get_tag(cs)) {
+  case vmc_std:
+    return cs.advance(2)
+        && t_VmControlData.validate_skip(ops, cs, weak)
+        && t_VmCellSlice.validate_skip(ops, cs, weak);
+  case vmc_envelope:
+    return cs.advance(2)
+        && t_VmControlData.validate_skip(ops, cs, weak)
+        && validate_skip_ref(ops, cs, weak);
+  case vmc_quit:
+    return cs.advance(36);
+  case vmc_quit_exc:
+    return cs.advance(4);
+  case vmc_repeat:
+    return cs.fetch_ulong(5) == 20
+        && cs.advance(63)
+        && validate_skip_ref(ops, cs, weak)
+        && validate_skip_ref(ops, cs, weak);
+  case vmc_until:
+    return cs.advance(6)
+        && validate_skip_ref(ops, cs, weak)
+        && validate_skip_ref(ops, cs, weak);
+  case vmc_again:
+    return cs.advance(6)
+        && validate_skip_ref(ops, cs, weak);
+  case vmc_while_cond:
+    return cs.advance(6)
+        && validate_skip_ref(ops, cs, weak)
+        && validate_skip_ref(ops, cs, weak)
+        && validate_skip_ref(ops, cs, weak);
+  case vmc_while_body:
+    return cs.fetch_ulong(6) == 0x33
+        && validate_skip_ref(ops, cs, weak)
+        && validate_skip_ref(ops, cs, weak)
+        && validate_skip_ref(ops, cs, weak);
+  case vmc_pushint:
+    return cs.advance(36)
+        && validate_skip_ref(ops, cs, weak);
+  }
+  return false;
+}
+
+bool VmCont::unpack(vm::CellSlice& cs, VmCont::Record_vmc_std& data) const {
+  return cs.fetch_ulong(2) == 0
+      && t_VmControlData.fetch_to(cs, data.cdata)
+      && cs.fetch_subslice_ext_to(0x1001a, data.code);
+}
+
+bool VmCont::unpack_vmc_std(vm::CellSlice& cs, Ref<CellSlice>& cdata, Ref<CellSlice>& code) const {
+  return cs.fetch_ulong(2) == 0
+      && t_VmControlData.fetch_to(cs, cdata)
+      && cs.fetch_subslice_ext_to(0x1001a, code);
+}
+
+bool VmCont::cell_unpack(Ref<vm::Cell> cell_ref, VmCont::Record_vmc_std& data) const {
+  if (cell_ref.is_null()) { return false; }
+  auto cs = load_cell_slice(std::move(cell_ref));
+  return unpack(cs, data) && cs.empty_ext();
+}
+
+bool VmCont::cell_unpack_vmc_std(Ref<vm::Cell> cell_ref, Ref<CellSlice>& cdata, Ref<CellSlice>& code) const {
+  if (cell_ref.is_null()) { return false; }
+  auto cs = load_cell_slice(std::move(cell_ref));
+  return unpack_vmc_std(cs, cdata, code) && cs.empty_ext();
+}
+
+bool VmCont::unpack(vm::CellSlice& cs, VmCont::Record_vmc_envelope& data) const {
+  return cs.fetch_ulong(2) == 1
+      && t_VmControlData.fetch_to(cs, data.cdata)
+      && cs.fetch_ref_to(data.next);
+}
+
+bool VmCont::unpack_vmc_envelope(vm::CellSlice& cs, Ref<CellSlice>& cdata, Ref<Cell>& next) const {
+  return cs.fetch_ulong(2) == 1
+      && t_VmControlData.fetch_to(cs, cdata)
+      && cs.fetch_ref_to(next);
+}
+
+bool VmCont::cell_unpack(Ref<vm::Cell> cell_ref, VmCont::Record_vmc_envelope& data) const {
+  if (cell_ref.is_null()) { return false; }
+  auto cs = load_cell_slice(std::move(cell_ref));
+  return unpack(cs, data) && cs.empty_ext();
+}
+
+bool VmCont::cell_unpack_vmc_envelope(Ref<vm::Cell> cell_ref, Ref<CellSlice>& cdata, Ref<Cell>& next) const {
+  if (cell_ref.is_null()) { return false; }
+  auto cs = load_cell_slice(std::move(cell_ref));
+  return unpack_vmc_envelope(cs, cdata, next) && cs.empty_ext();
+}
+
+bool VmCont::unpack(vm::CellSlice& cs, VmCont::Record_vmc_quit& data) const {
+  return cs.fetch_ulong(4) == 8
+      && cs.fetch_int_to(32, data.exit_code);
+}
+
+bool VmCont::unpack_vmc_quit(vm::CellSlice& cs, int& exit_code) const {
+  return cs.fetch_ulong(4) == 8
+      && cs.fetch_int_to(32, exit_code);
+}
+
+bool VmCont::cell_unpack(Ref<vm::Cell> cell_ref, VmCont::Record_vmc_quit& data) const {
+  if (cell_ref.is_null()) { return false; }
+  auto cs = load_cell_slice(std::move(cell_ref));
+  return unpack(cs, data) && cs.empty_ext();
+}
+
+bool VmCont::cell_unpack_vmc_quit(Ref<vm::Cell> cell_ref, int& exit_code) const {
+  if (cell_ref.is_null()) { return false; }
+  auto cs = load_cell_slice(std::move(cell_ref));
+  return unpack_vmc_quit(cs, exit_code) && cs.empty_ext();
+}
+
+bool VmCont::unpack(vm::CellSlice& cs, VmCont::Record_vmc_quit_exc& data) const {
+  return cs.fetch_ulong(4) == 9;
+}
+
+bool VmCont::unpack_vmc_quit_exc(vm::CellSlice& cs) const {
+  return cs.fetch_ulong(4) == 9;
+}
+
+bool VmCont::cell_unpack(Ref<vm::Cell> cell_ref, VmCont::Record_vmc_quit_exc& data) const {
+  if (cell_ref.is_null()) { return false; }
+  auto cs = load_cell_slice(std::move(cell_ref));
+  return unpack(cs, data) && cs.empty_ext();
+}
+
+bool VmCont::cell_unpack_vmc_quit_exc(Ref<vm::Cell> cell_ref) const {
+  if (cell_ref.is_null()) { return false; }
+  auto cs = load_cell_slice(std::move(cell_ref));
+  return unpack_vmc_quit_exc(cs) && cs.empty_ext();
+}
+
+bool VmCont::unpack(vm::CellSlice& cs, VmCont::Record_vmc_repeat& data) const {
+  return cs.fetch_ulong(5) == 20
+      && cs.fetch_uint_to(63, data.count)
+      && cs.fetch_ref_to(data.body)
+      && cs.fetch_ref_to(data.after);
+}
+
+bool VmCont::unpack_vmc_repeat(vm::CellSlice& cs, long long& count, Ref<Cell>& body, Ref<Cell>& after) const {
+  return cs.fetch_ulong(5) == 20
+      && cs.fetch_uint_to(63, count)
+      && cs.fetch_ref_to(body)
+      && cs.fetch_ref_to(after);
+}
+
+bool VmCont::cell_unpack(Ref<vm::Cell> cell_ref, VmCont::Record_vmc_repeat& data) const {
+  if (cell_ref.is_null()) { return false; }
+  auto cs = load_cell_slice(std::move(cell_ref));
+  return unpack(cs, data) && cs.empty_ext();
+}
+
+bool VmCont::cell_unpack_vmc_repeat(Ref<vm::Cell> cell_ref, long long& count, Ref<Cell>& body, Ref<Cell>& after) const {
+  if (cell_ref.is_null()) { return false; }
+  auto cs = load_cell_slice(std::move(cell_ref));
+  return unpack_vmc_repeat(cs, count, body, after) && cs.empty_ext();
+}
+
+bool VmCont::unpack(vm::CellSlice& cs, VmCont::Record_vmc_until& data) const {
+  return cs.fetch_ulong(6) == 0x30
+      && cs.fetch_ref_to(data.body)
+      && cs.fetch_ref_to(data.after);
+}
+
+bool VmCont::unpack_vmc_until(vm::CellSlice& cs, Ref<Cell>& body, Ref<Cell>& after) const {
+  return cs.fetch_ulong(6) == 0x30
+      && cs.fetch_ref_to(body)
+      && cs.fetch_ref_to(after);
+}
+
+bool VmCont::cell_unpack(Ref<vm::Cell> cell_ref, VmCont::Record_vmc_until& data) const {
+  if (cell_ref.is_null()) { return false; }
+  auto cs = load_cell_slice(std::move(cell_ref));
+  return unpack(cs, data) && cs.empty_ext();
+}
+
+bool VmCont::cell_unpack_vmc_until(Ref<vm::Cell> cell_ref, Ref<Cell>& body, Ref<Cell>& after) const {
+  if (cell_ref.is_null()) { return false; }
+  auto cs = load_cell_slice(std::move(cell_ref));
+  return unpack_vmc_until(cs, body, after) && cs.empty_ext();
+}
+
+bool VmCont::unpack(vm::CellSlice& cs, VmCont::Record_vmc_again& data) const {
+  return cs.fetch_ulong(6) == 0x31
+      && cs.fetch_ref_to(data.body);
+}
+
+bool VmCont::unpack_vmc_again(vm::CellSlice& cs, Ref<Cell>& body) const {
+  return cs.fetch_ulong(6) == 0x31
+      && cs.fetch_ref_to(body);
+}
+
+bool VmCont::cell_unpack(Ref<vm::Cell> cell_ref, VmCont::Record_vmc_again& data) const {
+  if (cell_ref.is_null()) { return false; }
+  auto cs = load_cell_slice(std::move(cell_ref));
+  return unpack(cs, data) && cs.empty_ext();
+}
+
+bool VmCont::cell_unpack_vmc_again(Ref<vm::Cell> cell_ref, Ref<Cell>& body) const {
+  if (cell_ref.is_null()) { return false; }
+  auto cs = load_cell_slice(std::move(cell_ref));
+  return unpack_vmc_again(cs, body) && cs.empty_ext();
+}
+
+bool VmCont::unpack(vm::CellSlice& cs, VmCont::Record_vmc_while_cond& data) const {
+  return cs.fetch_ulong(6) == 0x32
+      && cs.fetch_ref_to(data.cond)
+      && cs.fetch_ref_to(data.body)
+      && cs.fetch_ref_to(data.after);
+}
+
+bool VmCont::unpack_vmc_while_cond(vm::CellSlice& cs, Ref<Cell>& cond, Ref<Cell>& body, Ref<Cell>& after) const {
+  return cs.fetch_ulong(6) == 0x32
+      && cs.fetch_ref_to(cond)
+      && cs.fetch_ref_to(body)
+      && cs.fetch_ref_to(after);
+}
+
+bool VmCont::cell_unpack(Ref<vm::Cell> cell_ref, VmCont::Record_vmc_while_cond& data) const {
+  if (cell_ref.is_null()) { return false; }
+  auto cs = load_cell_slice(std::move(cell_ref));
+  return unpack(cs, data) && cs.empty_ext();
+}
+
+bool VmCont::cell_unpack_vmc_while_cond(Ref<vm::Cell> cell_ref, Ref<Cell>& cond, Ref<Cell>& body, Ref<Cell>& after) const {
+  if (cell_ref.is_null()) { return false; }
+  auto cs = load_cell_slice(std::move(cell_ref));
+  return unpack_vmc_while_cond(cs, cond, body, after) && cs.empty_ext();
+}
+
+bool VmCont::unpack(vm::CellSlice& cs, VmCont::Record_vmc_while_body& data) const {
+  return cs.fetch_ulong(6) == 0x33
+      && cs.fetch_ref_to(data.cond)
+      && cs.fetch_ref_to(data.body)
+      && cs.fetch_ref_to(data.after);
+}
+
+bool VmCont::unpack_vmc_while_body(vm::CellSlice& cs, Ref<Cell>& cond, Ref<Cell>& body, Ref<Cell>& after) const {
+  return cs.fetch_ulong(6) == 0x33
+      && cs.fetch_ref_to(cond)
+      && cs.fetch_ref_to(body)
+      && cs.fetch_ref_to(after);
+}
+
+bool VmCont::cell_unpack(Ref<vm::Cell> cell_ref, VmCont::Record_vmc_while_body& data) const {
+  if (cell_ref.is_null()) { return false; }
+  auto cs = load_cell_slice(std::move(cell_ref));
+  return unpack(cs, data) && cs.empty_ext();
+}
+
+bool VmCont::cell_unpack_vmc_while_body(Ref<vm::Cell> cell_ref, Ref<Cell>& cond, Ref<Cell>& body, Ref<Cell>& after) const {
+  if (cell_ref.is_null()) { return false; }
+  auto cs = load_cell_slice(std::move(cell_ref));
+  return unpack_vmc_while_body(cs, cond, body, after) && cs.empty_ext();
+}
+
+bool VmCont::unpack(vm::CellSlice& cs, VmCont::Record_vmc_pushint& data) const {
+  return cs.fetch_ulong(4) == 15
+      && cs.fetch_int_to(32, data.value)
+      && cs.fetch_ref_to(data.next);
+}
+
+bool VmCont::unpack_vmc_pushint(vm::CellSlice& cs, int& value, Ref<Cell>& next) const {
+  return cs.fetch_ulong(4) == 15
+      && cs.fetch_int_to(32, value)
+      && cs.fetch_ref_to(next);
+}
+
+bool VmCont::cell_unpack(Ref<vm::Cell> cell_ref, VmCont::Record_vmc_pushint& data) const {
+  if (cell_ref.is_null()) { return false; }
+  auto cs = load_cell_slice(std::move(cell_ref));
+  return unpack(cs, data) && cs.empty_ext();
+}
+
+bool VmCont::cell_unpack_vmc_pushint(Ref<vm::Cell> cell_ref, int& value, Ref<Cell>& next) const {
+  if (cell_ref.is_null()) { return false; }
+  auto cs = load_cell_slice(std::move(cell_ref));
+  return unpack_vmc_pushint(cs, value, next) && cs.empty_ext();
+}
+
+bool VmCont::pack(vm::CellBuilder& cb, const VmCont::Record_vmc_std& data) const {
+  return cb.store_long_bool(0, 2)
+      && t_VmControlData.store_from(cb, data.cdata)
+      && cb.append_cellslice_chk(data.code, 0x1001a);
+}
+
+bool VmCont::pack_vmc_std(vm::CellBuilder& cb, Ref<CellSlice> cdata, Ref<CellSlice> code) const {
+  return cb.store_long_bool(0, 2)
+      && t_VmControlData.store_from(cb, cdata)
+      && cb.append_cellslice_chk(code, 0x1001a);
+}
+
+bool VmCont::cell_pack(Ref<vm::Cell>& cell_ref, const VmCont::Record_vmc_std& data) const {
+  vm::CellBuilder cb;
+  return pack(cb, data) && std::move(cb).finalize_to(cell_ref);
+}
+
+bool VmCont::cell_pack_vmc_std(Ref<vm::Cell>& cell_ref, Ref<CellSlice> cdata, Ref<CellSlice> code) const {
+  vm::CellBuilder cb;
+  return pack_vmc_std(cb, std::move(cdata), std::move(code)) && std::move(cb).finalize_to(cell_ref);
+}
+
+bool VmCont::pack(vm::CellBuilder& cb, const VmCont::Record_vmc_envelope& data) const {
+  return cb.store_long_bool(1, 2)
+      && t_VmControlData.store_from(cb, data.cdata)
+      && cb.store_ref_bool(data.next);
+}
+
+bool VmCont::pack_vmc_envelope(vm::CellBuilder& cb, Ref<CellSlice> cdata, Ref<Cell> next) const {
+  return cb.store_long_bool(1, 2)
+      && t_VmControlData.store_from(cb, cdata)
+      && cb.store_ref_bool(next);
+}
+
+bool VmCont::cell_pack(Ref<vm::Cell>& cell_ref, const VmCont::Record_vmc_envelope& data) const {
+  vm::CellBuilder cb;
+  return pack(cb, data) && std::move(cb).finalize_to(cell_ref);
+}
+
+bool VmCont::cell_pack_vmc_envelope(Ref<vm::Cell>& cell_ref, Ref<CellSlice> cdata, Ref<Cell> next) const {
+  vm::CellBuilder cb;
+  return pack_vmc_envelope(cb, std::move(cdata), std::move(next)) && std::move(cb).finalize_to(cell_ref);
+}
+
+bool VmCont::pack(vm::CellBuilder& cb, const VmCont::Record_vmc_quit& data) const {
+  return cb.store_long_bool(8, 4)
+      && cb.store_long_rchk_bool(data.exit_code, 32);
+}
+
+bool VmCont::pack_vmc_quit(vm::CellBuilder& cb, int exit_code) const {
+  return cb.store_long_bool(8, 4)
+      && cb.store_long_rchk_bool(exit_code, 32);
+}
+
+bool VmCont::cell_pack(Ref<vm::Cell>& cell_ref, const VmCont::Record_vmc_quit& data) const {
+  vm::CellBuilder cb;
+  return pack(cb, data) && std::move(cb).finalize_to(cell_ref);
+}
+
+bool VmCont::cell_pack_vmc_quit(Ref<vm::Cell>& cell_ref, int exit_code) const {
+  vm::CellBuilder cb;
+  return pack_vmc_quit(cb, exit_code) && std::move(cb).finalize_to(cell_ref);
+}
+
+bool VmCont::pack(vm::CellBuilder& cb, const VmCont::Record_vmc_quit_exc& data) const {
+  return cb.store_long_bool(9, 4);
+}
+
+bool VmCont::pack_vmc_quit_exc(vm::CellBuilder& cb) const {
+  return cb.store_long_bool(9, 4);
+}
+
+bool VmCont::cell_pack(Ref<vm::Cell>& cell_ref, const VmCont::Record_vmc_quit_exc& data) const {
+  vm::CellBuilder cb;
+  return pack(cb, data) && std::move(cb).finalize_to(cell_ref);
+}
+
+bool VmCont::cell_pack_vmc_quit_exc(Ref<vm::Cell>& cell_ref) const {
+  vm::CellBuilder cb;
+  return pack_vmc_quit_exc(cb) && std::move(cb).finalize_to(cell_ref);
+}
+
+bool VmCont::pack(vm::CellBuilder& cb, const VmCont::Record_vmc_repeat& data) const {
+  return cb.store_long_bool(20, 5)
+      && cb.store_ulong_rchk_bool(data.count, 63)
+      && cb.store_ref_bool(data.body)
+      && cb.store_ref_bool(data.after);
+}
+
+bool VmCont::pack_vmc_repeat(vm::CellBuilder& cb, long long count, Ref<Cell> body, Ref<Cell> after) const {
+  return cb.store_long_bool(20, 5)
+      && cb.store_ulong_rchk_bool(count, 63)
+      && cb.store_ref_bool(body)
+      && cb.store_ref_bool(after);
+}
+
+bool VmCont::cell_pack(Ref<vm::Cell>& cell_ref, const VmCont::Record_vmc_repeat& data) const {
+  vm::CellBuilder cb;
+  return pack(cb, data) && std::move(cb).finalize_to(cell_ref);
+}
+
+bool VmCont::cell_pack_vmc_repeat(Ref<vm::Cell>& cell_ref, long long count, Ref<Cell> body, Ref<Cell> after) const {
+  vm::CellBuilder cb;
+  return pack_vmc_repeat(cb, count, std::move(body), std::move(after)) && std::move(cb).finalize_to(cell_ref);
+}
+
+bool VmCont::pack(vm::CellBuilder& cb, const VmCont::Record_vmc_until& data) const {
+  return cb.store_long_bool(0x30, 6)
+      && cb.store_ref_bool(data.body)
+      && cb.store_ref_bool(data.after);
+}
+
+bool VmCont::pack_vmc_until(vm::CellBuilder& cb, Ref<Cell> body, Ref<Cell> after) const {
+  return cb.store_long_bool(0x30, 6)
+      && cb.store_ref_bool(body)
+      && cb.store_ref_bool(after);
+}
+
+bool VmCont::cell_pack(Ref<vm::Cell>& cell_ref, const VmCont::Record_vmc_until& data) const {
+  vm::CellBuilder cb;
+  return pack(cb, data) && std::move(cb).finalize_to(cell_ref);
+}
+
+bool VmCont::cell_pack_vmc_until(Ref<vm::Cell>& cell_ref, Ref<Cell> body, Ref<Cell> after) const {
+  vm::CellBuilder cb;
+  return pack_vmc_until(cb, std::move(body), std::move(after)) && std::move(cb).finalize_to(cell_ref);
+}
+
+bool VmCont::pack(vm::CellBuilder& cb, const VmCont::Record_vmc_again& data) const {
+  return cb.store_long_bool(0x31, 6)
+      && cb.store_ref_bool(data.body);
+}
+
+bool VmCont::pack_vmc_again(vm::CellBuilder& cb, Ref<Cell> body) const {
+  return cb.store_long_bool(0x31, 6)
+      && cb.store_ref_bool(body);
+}
+
+bool VmCont::cell_pack(Ref<vm::Cell>& cell_ref, const VmCont::Record_vmc_again& data) const {
+  vm::CellBuilder cb;
+  return pack(cb, data) && std::move(cb).finalize_to(cell_ref);
+}
+
+bool VmCont::cell_pack_vmc_again(Ref<vm::Cell>& cell_ref, Ref<Cell> body) const {
+  vm::CellBuilder cb;
+  return pack_vmc_again(cb, std::move(body)) && std::move(cb).finalize_to(cell_ref);
+}
+
+bool VmCont::pack(vm::CellBuilder& cb, const VmCont::Record_vmc_while_cond& data) const {
+  return cb.store_long_bool(0x32, 6)
+      && cb.store_ref_bool(data.cond)
+      && cb.store_ref_bool(data.body)
+      && cb.store_ref_bool(data.after);
+}
+
+bool VmCont::pack_vmc_while_cond(vm::CellBuilder& cb, Ref<Cell> cond, Ref<Cell> body, Ref<Cell> after) const {
+  return cb.store_long_bool(0x32, 6)
+      && cb.store_ref_bool(cond)
+      && cb.store_ref_bool(body)
+      && cb.store_ref_bool(after);
+}
+
+bool VmCont::cell_pack(Ref<vm::Cell>& cell_ref, const VmCont::Record_vmc_while_cond& data) const {
+  vm::CellBuilder cb;
+  return pack(cb, data) && std::move(cb).finalize_to(cell_ref);
+}
+
+bool VmCont::cell_pack_vmc_while_cond(Ref<vm::Cell>& cell_ref, Ref<Cell> cond, Ref<Cell> body, Ref<Cell> after) const {
+  vm::CellBuilder cb;
+  return pack_vmc_while_cond(cb, std::move(cond), std::move(body), std::move(after)) && std::move(cb).finalize_to(cell_ref);
+}
+
+bool VmCont::pack(vm::CellBuilder& cb, const VmCont::Record_vmc_while_body& data) const {
+  return cb.store_long_bool(0x33, 6)
+      && cb.store_ref_bool(data.cond)
+      && cb.store_ref_bool(data.body)
+      && cb.store_ref_bool(data.after);
+}
+
+bool VmCont::pack_vmc_while_body(vm::CellBuilder& cb, Ref<Cell> cond, Ref<Cell> body, Ref<Cell> after) const {
+  return cb.store_long_bool(0x33, 6)
+      && cb.store_ref_bool(cond)
+      && cb.store_ref_bool(body)
+      && cb.store_ref_bool(after);
+}
+
+bool VmCont::cell_pack(Ref<vm::Cell>& cell_ref, const VmCont::Record_vmc_while_body& data) const {
+  vm::CellBuilder cb;
+  return pack(cb, data) && std::move(cb).finalize_to(cell_ref);
+}
+
+bool VmCont::cell_pack_vmc_while_body(Ref<vm::Cell>& cell_ref, Ref<Cell> cond, Ref<Cell> body, Ref<Cell> after) const {
+  vm::CellBuilder cb;
+  return pack_vmc_while_body(cb, std::move(cond), std::move(body), std::move(after)) && std::move(cb).finalize_to(cell_ref);
+}
+
+bool VmCont::pack(vm::CellBuilder& cb, const VmCont::Record_vmc_pushint& data) const {
+  return cb.store_long_bool(15, 4)
+      && cb.store_long_rchk_bool(data.value, 32)
+      && cb.store_ref_bool(data.next);
+}
+
+bool VmCont::pack_vmc_pushint(vm::CellBuilder& cb, int value, Ref<Cell> next) const {
+  return cb.store_long_bool(15, 4)
+      && cb.store_long_rchk_bool(value, 32)
+      && cb.store_ref_bool(next);
+}
+
+bool VmCont::cell_pack(Ref<vm::Cell>& cell_ref, const VmCont::Record_vmc_pushint& data) const {
+  vm::CellBuilder cb;
+  return pack(cb, data) && std::move(cb).finalize_to(cell_ref);
+}
+
+bool VmCont::cell_pack_vmc_pushint(Ref<vm::Cell>& cell_ref, int value, Ref<Cell> next) const {
+  vm::CellBuilder cb;
+  return pack_vmc_pushint(cb, value, std::move(next)) && std::move(cb).finalize_to(cell_ref);
+}
+
+bool VmCont::print_skip(PrettyPrinter& pp, vm::CellSlice& cs) const {
+  switch (get_tag(cs)) {
+  case vmc_std:
+    return cs.advance(2)
+        && pp.open("vmc_std")
+        && pp.field("cdata")
+        && t_VmControlData.print_skip(pp, cs)
+        && pp.field("code")
+        && t_VmCellSlice.print_skip(pp, cs)
+        && pp.close();
+  case vmc_envelope:
+    return cs.advance(2)
+        && pp.open("vmc_envelope")
+        && pp.field("cdata")
+        && t_VmControlData.print_skip(pp, cs)
+        && pp.field("next")
+        && print_ref(pp, cs.fetch_ref())
+        && pp.close();
+  case vmc_quit:
+    return cs.advance(4)
+        && pp.open("vmc_quit")
+        && pp.fetch_int_field(cs, 32, "exit_code")
+        && pp.close();
+  case vmc_quit_exc:
+    return cs.advance(4)
+        && pp.cons("vmc_quit_exc");
+  case vmc_repeat:
+    return cs.fetch_ulong(5) == 20
+        && pp.open("vmc_repeat")
+        && pp.fetch_uint_field(cs, 63, "count")
+        && pp.field("body")
+        && print_ref(pp, cs.fetch_ref())
+        && pp.field("after")
+        && print_ref(pp, cs.fetch_ref())
+        && pp.close();
+  case vmc_until:
+    return cs.advance(6)
+        && pp.open("vmc_until")
+        && pp.field("body")
+        && print_ref(pp, cs.fetch_ref())
+        && pp.field("after")
+        && print_ref(pp, cs.fetch_ref())
+        && pp.close();
+  case vmc_again:
+    return cs.advance(6)
+        && pp.open("vmc_again")
+        && pp.field("body")
+        && print_ref(pp, cs.fetch_ref())
+        && pp.close();
+  case vmc_while_cond:
+    return cs.advance(6)
+        && pp.open("vmc_while_cond")
+        && pp.field("cond")
+        && print_ref(pp, cs.fetch_ref())
+        && pp.field("body")
+        && print_ref(pp, cs.fetch_ref())
+        && pp.field("after")
+        && print_ref(pp, cs.fetch_ref())
+        && pp.close();
+  case vmc_while_body:
+    return cs.fetch_ulong(6) == 0x33
+        && pp.open("vmc_while_body")
+        && pp.field("cond")
+        && print_ref(pp, cs.fetch_ref())
+        && pp.field("body")
+        && print_ref(pp, cs.fetch_ref())
+        && pp.field("after")
+        && print_ref(pp, cs.fetch_ref())
+        && pp.close();
+  case vmc_pushint:
+    return cs.advance(4)
+        && pp.open("vmc_pushint")
+        && pp.fetch_int_field(cs, 32, "value")
+        && pp.field("next")
+        && print_ref(pp, cs.fetch_ref())
+        && pp.close();
+  }
+  return pp.fail("unknown constructor for VmCont");
+}
+
+const VmCont t_VmCont;
+
+//
+// code for type `DNS_RecordSet`
+//
+
+int DNS_RecordSet::check_tag(const vm::CellSlice& cs) const {
+  return cons1;
+}
+
+bool DNS_RecordSet::skip(vm::CellSlice& cs) const {
+  return t_HashmapE_16_Ref_DNSRecord.skip(cs);
+}
+
+bool DNS_RecordSet::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const {
+  return t_HashmapE_16_Ref_DNSRecord.validate_skip(ops, cs, weak);
+}
+
+bool DNS_RecordSet::unpack(vm::CellSlice& cs, DNS_RecordSet::Record& data) const {
+  return t_HashmapE_16_Ref_DNSRecord.fetch_to(cs, data.x);
+}
+
+bool DNS_RecordSet::unpack_cons1(vm::CellSlice& cs, Ref<CellSlice>& x) const {
+  return t_HashmapE_16_Ref_DNSRecord.fetch_to(cs, x);
+}
+
+bool DNS_RecordSet::cell_unpack(Ref<vm::Cell> cell_ref, DNS_RecordSet::Record& data) const {
+  if (cell_ref.is_null()) { return false; }
+  auto cs = load_cell_slice(std::move(cell_ref));
+  return unpack(cs, data) && cs.empty_ext();
+}
+
+bool DNS_RecordSet::cell_unpack_cons1(Ref<vm::Cell> cell_ref, Ref<CellSlice>& x) const {
+  if (cell_ref.is_null()) { return false; }
+  auto cs = load_cell_slice(std::move(cell_ref));
+  return unpack_cons1(cs, x) && cs.empty_ext();
+}
+
+bool DNS_RecordSet::pack(vm::CellBuilder& cb, const DNS_RecordSet::Record& data) const {
+  return t_HashmapE_16_Ref_DNSRecord.store_from(cb, data.x);
+}
+
+bool DNS_RecordSet::pack_cons1(vm::CellBuilder& cb, Ref<CellSlice> x) const {
+  return t_HashmapE_16_Ref_DNSRecord.store_from(cb, x);
+}
+
+bool DNS_RecordSet::cell_pack(Ref<vm::Cell>& cell_ref, const DNS_RecordSet::Record& data) const {
+  vm::CellBuilder cb;
+  return pack(cb, data) && std::move(cb).finalize_to(cell_ref);
+}
+
+bool DNS_RecordSet::cell_pack_cons1(Ref<vm::Cell>& cell_ref, Ref<CellSlice> x) const {
+  vm::CellBuilder cb;
+  return pack_cons1(cb, std::move(x)) && std::move(cb).finalize_to(cell_ref);
+}
+
+bool DNS_RecordSet::print_skip(PrettyPrinter& pp, vm::CellSlice& cs) const {
+  return pp.open()
+      && pp.field()
+      && t_HashmapE_16_Ref_DNSRecord.print_skip(pp, cs)
+      && pp.close();
+}
+
+const DNS_RecordSet t_DNS_RecordSet;
+
+//
+// code for type `TextChunkRef`
+//
+
+int TextChunkRef::get_tag(const vm::CellSlice& cs) const {
+  // distinguish by parameter `m_` using 2 1 1 1
+  return m_ ? chunk_ref : chunk_ref_empty;
+}
+
+int TextChunkRef::check_tag(const vm::CellSlice& cs) const {
+  switch (get_tag(cs)) {
+  case chunk_ref:
+    return chunk_ref;
+  case chunk_ref_empty:
+    return chunk_ref_empty;
+  }
+  return -1;
+}
+
+bool TextChunkRef::skip(vm::CellSlice& cs) const {
+  switch (get_tag(cs)) {
+  case chunk_ref: {
+    int n;
+    return add_r1(n, 1, m_)
+        && cs.advance_refs(1);
+    }
+  case chunk_ref_empty:
+    return m_ == 0;
+  }
+  return false;
+}
+
+bool TextChunkRef::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const {
+  switch (get_tag(cs)) {
+  case chunk_ref: {
+    int n;
+    return add_r1(n, 1, m_)
+        && TextChunks{n + 1}.validate_skip_ref(ops, cs, weak);
+    }
+  case chunk_ref_empty:
+    return m_ == 0;
+  }
+  return false;
+}
+
+bool TextChunkRef::unpack(vm::CellSlice& cs, TextChunkRef::Record_chunk_ref& data) const {
+  return add_r1(data.n, 1, m_)
+      && cs.fetch_ref_to(data.ref);
+}
+
+bool TextChunkRef::unpack_chunk_ref(vm::CellSlice& cs, int& n, Ref<Cell>& ref) const {
+  return add_r1(n, 1, m_)
+      && cs.fetch_ref_to(ref);
+}
+
+bool TextChunkRef::cell_unpack(Ref<vm::Cell> cell_ref, TextChunkRef::Record_chunk_ref& data) const {
+  if (cell_ref.is_null()) { return false; }
+  auto cs = load_cell_slice(std::move(cell_ref));
+  return unpack(cs, data) && cs.empty_ext();
+}
+
+bool TextChunkRef::cell_unpack_chunk_ref(Ref<vm::Cell> cell_ref, int& n, Ref<Cell>& ref) const {
+  if (cell_ref.is_null()) { return false; }
+  auto cs = load_cell_slice(std::move(cell_ref));
+  return unpack_chunk_ref(cs, n, ref) && cs.empty_ext();
+}
+
+bool TextChunkRef::unpack(vm::CellSlice& cs, TextChunkRef::Record_chunk_ref_empty& data) const {
+  return m_ == 0;
+}
+
+bool TextChunkRef::unpack_chunk_ref_empty(vm::CellSlice& cs) const {
+  return m_ == 0;
+}
+
+bool TextChunkRef::cell_unpack(Ref<vm::Cell> cell_ref, TextChunkRef::Record_chunk_ref_empty& data) const {
+  if (cell_ref.is_null()) { return false; }
+  auto cs = load_cell_slice(std::move(cell_ref));
+  return unpack(cs, data) && cs.empty_ext();
+}
+
+bool TextChunkRef::cell_unpack_chunk_ref_empty(Ref<vm::Cell> cell_ref) const {
+  if (cell_ref.is_null()) { return false; }
+  auto cs = load_cell_slice(std::move(cell_ref));
+  return unpack_chunk_ref_empty(cs) && cs.empty_ext();
+}
+
+bool TextChunkRef::pack(vm::CellBuilder& cb, const TextChunkRef::Record_chunk_ref& data) const {
+  int n;
+  return add_r1(n, 1, m_)
+      && cb.store_ref_bool(data.ref);
+}
+
+bool TextChunkRef::pack_chunk_ref(vm::CellBuilder& cb, Ref<Cell> ref) const {
+  int n;
+  return add_r1(n, 1, m_)
+      && cb.store_ref_bool(ref);
+}
+
+bool TextChunkRef::cell_pack(Ref<vm::Cell>& cell_ref, const TextChunkRef::Record_chunk_ref& data) const {
+  vm::CellBuilder cb;
+  return pack(cb, data) && std::move(cb).finalize_to(cell_ref);
+}
+
+bool TextChunkRef::cell_pack_chunk_ref(Ref<vm::Cell>& cell_ref, Ref<Cell> ref) const {
+  vm::CellBuilder cb;
+  return pack_chunk_ref(cb, std::move(ref)) && std::move(cb).finalize_to(cell_ref);
+}
+
+bool TextChunkRef::pack(vm::CellBuilder& cb, const TextChunkRef::Record_chunk_ref_empty& data) const {
+  return m_ == 0;
+}
+
+bool TextChunkRef::pack_chunk_ref_empty(vm::CellBuilder& cb) const {
+  return m_ == 0;
+}
+
+bool TextChunkRef::cell_pack(Ref<vm::Cell>& cell_ref, const TextChunkRef::Record_chunk_ref_empty& data) const {
+  vm::CellBuilder cb;
+  return pack(cb, data) && std::move(cb).finalize_to(cell_ref);
+}
+
+bool TextChunkRef::cell_pack_chunk_ref_empty(Ref<vm::Cell>& cell_ref) const {
+  vm::CellBuilder cb;
+  return pack_chunk_ref_empty(cb) && std::move(cb).finalize_to(cell_ref);
+}
+
+bool TextChunkRef::print_skip(PrettyPrinter& pp, vm::CellSlice& cs) const {
+  switch (get_tag(cs)) {
+  case chunk_ref: {
+    int n;
+    return pp.open("chunk_ref")
+        && add_r1(n, 1, m_)
+        && pp.field("ref")
+        && TextChunks{n + 1}.print_ref(pp, cs.fetch_ref())
+        && pp.close();
+    }
+  case chunk_ref_empty:
+    return pp.cons("chunk_ref_empty")
+        && m_ == 0;
+  }
+  return pp.fail("unknown constructor for TextChunkRef");
+}
+
+
+//
+// code for type `TextChunks`
+//
+
+int TextChunks::get_tag(const vm::CellSlice& cs) const {
+  // distinguish by parameter `m_` using 2 1 1 1
+  return m_ ? text_chunk : text_chunk_empty;
+}
+
+int TextChunks::check_tag(const vm::CellSlice& cs) const {
+  switch (get_tag(cs)) {
+  case text_chunk:
+    return text_chunk;
+  case text_chunk_empty:
+    return text_chunk_empty;
+  }
+  return -1;
+}
+
+bool TextChunks::skip(vm::CellSlice& cs) const {
+  switch (get_tag(cs)) {
+  case text_chunk: {
+    int n, len;
+    return add_r1(n, 1, m_)
+        && cs.fetch_uint_to(8, len)
+        && cs.advance(8 * len)
+        && TextChunkRef{n}.skip(cs);
+    }
+  case text_chunk_empty:
+    return m_ == 0;
+  }
+  return false;
+}
+
+bool TextChunks::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const {
+  switch (get_tag(cs)) {
+  case text_chunk: {
+    int n, len;
+    return add_r1(n, 1, m_)
+        && cs.fetch_uint_to(8, len)
+        && cs.advance(8 * len)
+        && TextChunkRef{n}.validate_skip(ops, cs, weak);
+    }
+  case text_chunk_empty:
+    return m_ == 0;
+  }
+  return false;
+}
+
+bool TextChunks::unpack(vm::CellSlice& cs, TextChunks::Record_text_chunk& data) const {
+  return add_r1(data.n, 1, m_)
+      && cs.fetch_uint_to(8, data.len)
+      && cs.fetch_bitstring_to(8 * data.len, data.data)
+      && TextChunkRef{data.n}.fetch_to(cs, data.next);
+}
+
+bool TextChunks::cell_unpack(Ref<vm::Cell> cell_ref, TextChunks::Record_text_chunk& data) const {
+  if (cell_ref.is_null()) { return false; }
+  auto cs = load_cell_slice(std::move(cell_ref));
+  return unpack(cs, data) && cs.empty_ext();
+}
+
+bool TextChunks::unpack(vm::CellSlice& cs, TextChunks::Record_text_chunk_empty& data) const {
+  return m_ == 0;
+}
+
+bool TextChunks::unpack_text_chunk_empty(vm::CellSlice& cs) const {
+  return m_ == 0;
+}
+
+bool TextChunks::cell_unpack(Ref<vm::Cell> cell_ref, TextChunks::Record_text_chunk_empty& data) const {
+  if (cell_ref.is_null()) { return false; }
+  auto cs = load_cell_slice(std::move(cell_ref));
+  return unpack(cs, data) && cs.empty_ext();
+}
+
+bool TextChunks::cell_unpack_text_chunk_empty(Ref<vm::Cell> cell_ref) const {
+  if (cell_ref.is_null()) { return false; }
+  auto cs = load_cell_slice(std::move(cell_ref));
+  return unpack_text_chunk_empty(cs) && cs.empty_ext();
+}
+
+bool TextChunks::pack(vm::CellBuilder& cb, const TextChunks::Record_text_chunk& data) const {
+  int n;
+  return add_r1(n, 1, m_)
+      && cb.store_ulong_rchk_bool(data.len, 8)
+      && cb.append_bitstring_chk(data.data, 8 * data.len)
+      && TextChunkRef{n}.store_from(cb, data.next);
+}
+
+bool TextChunks::cell_pack(Ref<vm::Cell>& cell_ref, const TextChunks::Record_text_chunk& data) const {
+  vm::CellBuilder cb;
+  return pack(cb, data) && std::move(cb).finalize_to(cell_ref);
+}
+
+bool TextChunks::pack(vm::CellBuilder& cb, const TextChunks::Record_text_chunk_empty& data) const {
+  return m_ == 0;
+}
+
+bool TextChunks::pack_text_chunk_empty(vm::CellBuilder& cb) const {
+  return m_ == 0;
+}
+
+bool TextChunks::cell_pack(Ref<vm::Cell>& cell_ref, const TextChunks::Record_text_chunk_empty& data) const {
+  vm::CellBuilder cb;
+  return pack(cb, data) && std::move(cb).finalize_to(cell_ref);
+}
+
+bool TextChunks::cell_pack_text_chunk_empty(Ref<vm::Cell>& cell_ref) const {
+  vm::CellBuilder cb;
+  return pack_text_chunk_empty(cb) && std::move(cb).finalize_to(cell_ref);
+}
+
+bool TextChunks::print_skip(PrettyPrinter& pp, vm::CellSlice& cs) const {
+  switch (get_tag(cs)) {
+  case text_chunk: {
+    int n, len;
+    return pp.open("text_chunk")
+        && add_r1(n, 1, m_)
+        && cs.fetch_uint_to(8, len)
+        && pp.field_int(len, "len")
+        && pp.fetch_bits_field(cs, 8 * len, "data")
+        && pp.field("next")
+        && TextChunkRef{n}.print_skip(pp, cs)
+        && pp.close();
+    }
+  case text_chunk_empty:
+    return pp.cons("text_chunk_empty")
+        && m_ == 0;
+  }
+  return pp.fail("unknown constructor for TextChunks");
+}
+
+
+//
+// code for type `Text`
+//
+
+int Text::check_tag(const vm::CellSlice& cs) const {
+  return text;
+}
+
+bool Text::skip(vm::CellSlice& cs) const {
+  int chunks;
+  return cs.fetch_uint_to(8, chunks)
+      && TextChunks{chunks}.skip(cs);
+}
+
+bool Text::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const {
+  int chunks;
+  return cs.fetch_uint_to(8, chunks)
+      && TextChunks{chunks}.validate_skip(ops, cs, weak);
+}
+
+bool Text::unpack(vm::CellSlice& cs, Text::Record& data) const {
+  return cs.fetch_uint_to(8, data.chunks)
+      && TextChunks{data.chunks}.fetch_to(cs, data.rest);
+}
+
+bool Text::unpack_text(vm::CellSlice& cs, int& chunks, Ref<CellSlice>& rest) const {
+  return cs.fetch_uint_to(8, chunks)
+      && TextChunks{chunks}.fetch_to(cs, rest);
+}
+
+bool Text::cell_unpack(Ref<vm::Cell> cell_ref, Text::Record& data) const {
+  if (cell_ref.is_null()) { return false; }
+  auto cs = load_cell_slice(std::move(cell_ref));
+  return unpack(cs, data) && cs.empty_ext();
+}
+
+bool Text::cell_unpack_text(Ref<vm::Cell> cell_ref, int& chunks, Ref<CellSlice>& rest) const {
+  if (cell_ref.is_null()) { return false; }
+  auto cs = load_cell_slice(std::move(cell_ref));
+  return unpack_text(cs, chunks, rest) && cs.empty_ext();
+}
+
+bool Text::pack(vm::CellBuilder& cb, const Text::Record& data) const {
+  return cb.store_ulong_rchk_bool(data.chunks, 8)
+      && TextChunks{data.chunks}.store_from(cb, data.rest);
+}
+
+bool Text::pack_text(vm::CellBuilder& cb, int chunks, Ref<CellSlice> rest) const {
+  return cb.store_ulong_rchk_bool(chunks, 8)
+      && TextChunks{chunks}.store_from(cb, rest);
+}
+
+bool Text::cell_pack(Ref<vm::Cell>& cell_ref, const Text::Record& data) const {
+  vm::CellBuilder cb;
+  return pack(cb, data) && std::move(cb).finalize_to(cell_ref);
+}
+
+bool Text::cell_pack_text(Ref<vm::Cell>& cell_ref, int chunks, Ref<CellSlice> rest) const {
+  vm::CellBuilder cb;
+  return pack_text(cb, chunks, std::move(rest)) && std::move(cb).finalize_to(cell_ref);
+}
+
+bool Text::print_skip(PrettyPrinter& pp, vm::CellSlice& cs) const {
+  int chunks;
+  return pp.open("text")
+      && cs.fetch_uint_to(8, chunks)
+      && pp.field_int(chunks, "chunks")
+      && pp.field("rest")
+      && TextChunks{chunks}.print_skip(pp, cs)
+      && pp.close();
+}
+
+const Text t_Text;
+
+//
+// code for type `ProtoList`
+//
+
+int ProtoList::check_tag(const vm::CellSlice& cs) const {
+  switch (get_tag(cs)) {
+  case proto_list_nil:
+    return cs.have(1) ? proto_list_nil : -1;
+  case proto_list_next:
+    return cs.have(1) ? proto_list_next : -1;
+  }
+  return -1;
+}
+
+bool ProtoList::skip(vm::CellSlice& cs) const {
+  switch (get_tag(cs)) {
+  case proto_list_nil:
+    return cs.advance(1);
+  case proto_list_next:
+    return cs.advance(17)
+        && skip(cs);
+  }
+  return false;
+}
+
+bool ProtoList::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const {
+  switch (get_tag(cs)) {
+  case proto_list_nil:
+    return cs.advance(1);
+  case proto_list_next:
+    return cs.advance(1)
+        && t_Protocol.validate_skip(ops, cs, weak)
+        && validate_skip(ops, cs, weak);
+  }
+  return false;
+}
+
+bool ProtoList::unpack(vm::CellSlice& cs, ProtoList::Record_proto_list_nil& data) const {
+  return cs.fetch_ulong(1) == 0;
+}
+
+bool ProtoList::unpack_proto_list_nil(vm::CellSlice& cs) const {
+  return cs.fetch_ulong(1) == 0;
+}
+
+bool ProtoList::cell_unpack(Ref<vm::Cell> cell_ref, ProtoList::Record_proto_list_nil& data) const {
+  if (cell_ref.is_null()) { return false; }
+  auto cs = load_cell_slice(std::move(cell_ref));
+  return unpack(cs, data) && cs.empty_ext();
+}
+
+bool ProtoList::cell_unpack_proto_list_nil(Ref<vm::Cell> cell_ref) const {
+  if (cell_ref.is_null()) { return false; }
+  auto cs = load_cell_slice(std::move(cell_ref));
+  return unpack_proto_list_nil(cs) && cs.empty_ext();
+}
+
+bool ProtoList::unpack(vm::CellSlice& cs, ProtoList::Record_proto_list_next& data) const {
+  return cs.fetch_ulong(1) == 1
+      && t_Protocol.fetch_enum_to(cs, data.head)
+      && fetch_to(cs, data.tail);
+}
+
+bool ProtoList::unpack_proto_list_next(vm::CellSlice& cs, char& head, Ref<CellSlice>& tail) const {
+  return cs.fetch_ulong(1) == 1
+      && t_Protocol.fetch_enum_to(cs, head)
+      && fetch_to(cs, tail);
+}
+
+bool ProtoList::cell_unpack(Ref<vm::Cell> cell_ref, ProtoList::Record_proto_list_next& data) const {
+  if (cell_ref.is_null()) { return false; }
+  auto cs = load_cell_slice(std::move(cell_ref));
+  return unpack(cs, data) && cs.empty_ext();
+}
+
+bool ProtoList::cell_unpack_proto_list_next(Ref<vm::Cell> cell_ref, char& head, Ref<CellSlice>& tail) const {
+  if (cell_ref.is_null()) { return false; }
+  auto cs = load_cell_slice(std::move(cell_ref));
+  return unpack_proto_list_next(cs, head, tail) && cs.empty_ext();
+}
+
+bool ProtoList::pack(vm::CellBuilder& cb, const ProtoList::Record_proto_list_nil& data) const {
+  return cb.store_long_bool(0, 1);
+}
+
+bool ProtoList::pack_proto_list_nil(vm::CellBuilder& cb) const {
+  return cb.store_long_bool(0, 1);
+}
+
+bool ProtoList::cell_pack(Ref<vm::Cell>& cell_ref, const ProtoList::Record_proto_list_nil& data) const {
+  vm::CellBuilder cb;
+  return pack(cb, data) && std::move(cb).finalize_to(cell_ref);
+}
+
+bool ProtoList::cell_pack_proto_list_nil(Ref<vm::Cell>& cell_ref) const {
+  vm::CellBuilder cb;
+  return pack_proto_list_nil(cb) && std::move(cb).finalize_to(cell_ref);
+}
+
+bool ProtoList::pack(vm::CellBuilder& cb, const ProtoList::Record_proto_list_next& data) const {
+  return cb.store_long_bool(1, 1)
+      && t_Protocol.store_enum_from(cb, data.head)
+      && store_from(cb, data.tail);
+}
+
+bool ProtoList::pack_proto_list_next(vm::CellBuilder& cb, char head, Ref<CellSlice> tail) const {
+  return cb.store_long_bool(1, 1)
+      && t_Protocol.store_enum_from(cb, head)
+      && store_from(cb, tail);
+}
+
+bool ProtoList::cell_pack(Ref<vm::Cell>& cell_ref, const ProtoList::Record_proto_list_next& data) const {
+  vm::CellBuilder cb;
+  return pack(cb, data) && std::move(cb).finalize_to(cell_ref);
+}
+
+bool ProtoList::cell_pack_proto_list_next(Ref<vm::Cell>& cell_ref, char head, Ref<CellSlice> tail) const {
+  vm::CellBuilder cb;
+  return pack_proto_list_next(cb, head, std::move(tail)) && std::move(cb).finalize_to(cell_ref);
+}
+
+bool ProtoList::print_skip(PrettyPrinter& pp, vm::CellSlice& cs) const {
+  switch (get_tag(cs)) {
+  case proto_list_nil:
+    return cs.advance(1)
+        && pp.cons("proto_list_nil");
+  case proto_list_next:
+    return cs.advance(1)
+        && pp.open("proto_list_next")
+        && pp.field("head")
+        && t_Protocol.print_skip(pp, cs)
+        && pp.field("tail")
+        && print_skip(pp, cs)
+        && pp.close();
+  }
+  return pp.fail("unknown constructor for ProtoList");
+}
+
+const ProtoList t_ProtoList;
+
+//
+// code for type `Protocol`
+//
+constexpr unsigned short Protocol::cons_tag[1];
+
+int Protocol::check_tag(const vm::CellSlice& cs) const {
+  return cs.prefetch_ulong(16) == 0x4854 ? proto_http : -1;
+}
+
+bool Protocol::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const {
+  return cs.fetch_ulong(16) == 0x4854;
+}
+
+bool Protocol::fetch_enum_to(vm::CellSlice& cs, char& value) const {
+  value = (cs.fetch_ulong(16) == 0x4854) ? 0 : -1;
+  return !value;
+}
+
+bool Protocol::store_enum_from(vm::CellBuilder& cb, int value) const {
+  return !value && cb.store_long_bool(0x4854, 16);
+}
+
+bool Protocol::unpack(vm::CellSlice& cs, Protocol::Record& data) const {
+  return cs.fetch_ulong(16) == 0x4854;
+}
+
+bool Protocol::unpack_proto_http(vm::CellSlice& cs) const {
+  return cs.fetch_ulong(16) == 0x4854;
+}
+
+bool Protocol::cell_unpack(Ref<vm::Cell> cell_ref, Protocol::Record& data) const {
+  if (cell_ref.is_null()) { return false; }
+  auto cs = load_cell_slice(std::move(cell_ref));
+  return unpack(cs, data) && cs.empty_ext();
+}
+
+bool Protocol::cell_unpack_proto_http(Ref<vm::Cell> cell_ref) const {
+  if (cell_ref.is_null()) { return false; }
+  auto cs = load_cell_slice(std::move(cell_ref));
+  return unpack_proto_http(cs) && cs.empty_ext();
+}
+
+bool Protocol::pack(vm::CellBuilder& cb, const Protocol::Record& data) const {
+  return cb.store_long_bool(0x4854, 16);
+}
+
+bool Protocol::pack_proto_http(vm::CellBuilder& cb) const {
+  return cb.store_long_bool(0x4854, 16);
+}
+
+bool Protocol::cell_pack(Ref<vm::Cell>& cell_ref, const Protocol::Record& data) const {
+  vm::CellBuilder cb;
+  return pack(cb, data) && std::move(cb).finalize_to(cell_ref);
+}
+
+bool Protocol::cell_pack_proto_http(Ref<vm::Cell>& cell_ref) const {
+  vm::CellBuilder cb;
+  return pack_proto_http(cb) && std::move(cb).finalize_to(cell_ref);
+}
+
+bool Protocol::print_skip(PrettyPrinter& pp, vm::CellSlice& cs) const {
+  return cs.fetch_ulong(16) == 0x4854
+      && pp.cons("proto_http");
+}
+
+const Protocol t_Protocol;
+
+//
+// code for type `DNSRecord`
+//
+constexpr unsigned short DNSRecord::cons_tag[4];
+
+int DNSRecord::check_tag(const vm::CellSlice& cs) const {
+  switch (get_tag(cs)) {
+  case dns_text:
+    return cs.prefetch_ulong(16) == 0x1eda ? dns_text : -1;
+  case dns_next_resolver:
+    return cs.prefetch_ulong(16) == 0xba93 ? dns_next_resolver : -1;
+  case dns_adnl_address:
+    return cs.prefetch_ulong(16) == 0xad01 ? dns_adnl_address : -1;
+  case dns_smc_address:
+    return cs.prefetch_ulong(16) == 0x9fd3 ? dns_smc_address : -1;
+  }
+  return -1;
+}
+
+bool DNSRecord::skip(vm::CellSlice& cs) const {
+  switch (get_tag(cs)) {
+  case dns_text:
+    return cs.advance(16)
+        && t_Text.skip(cs);
+  case dns_next_resolver:
+    return cs.advance(16)
+        && t_MsgAddressInt.skip(cs);
+  case dns_adnl_address: {
+    int flags;
+    return cs.advance(272)
+        && cs.fetch_uint_to(8, flags)
+        && flags <= 1
+        && (!(flags & 1) || t_ProtoList.skip(cs));
+    }
+  case dns_smc_address: {
+    int flags;
+    return cs.advance(16)
+        && t_MsgAddressInt.skip(cs)
+        && cs.fetch_uint_to(8, flags)
+        && flags <= 1
+        && (!(flags & 1) || t_SmcCapList.skip(cs));
+    }
+  }
+  return false;
+}
+
+bool DNSRecord::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const {
+  switch (get_tag(cs)) {
+  case dns_text:
+    return cs.fetch_ulong(16) == 0x1eda
+        && t_Text.validate_skip(ops, cs, weak);
+  case dns_next_resolver:
+    return cs.fetch_ulong(16) == 0xba93
+        && t_MsgAddressInt.validate_skip(ops, cs, weak);
+  case dns_adnl_address: {
+    int flags;
+    return cs.fetch_ulong(16) == 0xad01
+        && cs.advance(256)
+        && cs.fetch_uint_to(8, flags)
+        && flags <= 1
+        && (!(flags & 1) || t_ProtoList.validate_skip(ops, cs, weak));
+    }
+  case dns_smc_address: {
+    int flags;
+    return cs.fetch_ulong(16) == 0x9fd3
+        && t_MsgAddressInt.validate_skip(ops, cs, weak)
+        && cs.fetch_uint_to(8, flags)
+        && flags <= 1
+        && (!(flags & 1) || t_SmcCapList.validate_skip(ops, cs, weak));
+    }
+  }
+  return false;
+}
+
+bool DNSRecord::unpack(vm::CellSlice& cs, DNSRecord::Record_dns_text& data) const {
+  return cs.fetch_ulong(16) == 0x1eda
+      && t_Text.fetch_to(cs, data.x);
+}
+
+bool DNSRecord::unpack_dns_text(vm::CellSlice& cs, Ref<CellSlice>& x) const {
+  return cs.fetch_ulong(16) == 0x1eda
+      && t_Text.fetch_to(cs, x);
+}
+
+bool DNSRecord::cell_unpack(Ref<vm::Cell> cell_ref, DNSRecord::Record_dns_text& data) const {
+  if (cell_ref.is_null()) { return false; }
+  auto cs = load_cell_slice(std::move(cell_ref));
+  return unpack(cs, data) && cs.empty_ext();
+}
+
+bool DNSRecord::cell_unpack_dns_text(Ref<vm::Cell> cell_ref, Ref<CellSlice>& x) const {
+  if (cell_ref.is_null()) { return false; }
+  auto cs = load_cell_slice(std::move(cell_ref));
+  return unpack_dns_text(cs, x) && cs.empty_ext();
+}
+
+bool DNSRecord::unpack(vm::CellSlice& cs, DNSRecord::Record_dns_next_resolver& data) const {
+  return cs.fetch_ulong(16) == 0xba93
+      && t_MsgAddressInt.fetch_to(cs, data.resolver);
+}
+
+bool DNSRecord::unpack_dns_next_resolver(vm::CellSlice& cs, Ref<CellSlice>& resolver) const {
+  return cs.fetch_ulong(16) == 0xba93
+      && t_MsgAddressInt.fetch_to(cs, resolver);
+}
+
+bool DNSRecord::cell_unpack(Ref<vm::Cell> cell_ref, DNSRecord::Record_dns_next_resolver& data) const {
+  if (cell_ref.is_null()) { return false; }
+  auto cs = load_cell_slice(std::move(cell_ref));
+  return unpack(cs, data) && cs.empty_ext();
+}
+
+bool DNSRecord::cell_unpack_dns_next_resolver(Ref<vm::Cell> cell_ref, Ref<CellSlice>& resolver) const {
+  if (cell_ref.is_null()) { return false; }
+  auto cs = load_cell_slice(std::move(cell_ref));
+  return unpack_dns_next_resolver(cs, resolver) && cs.empty_ext();
+}
+
+bool DNSRecord::unpack(vm::CellSlice& cs, DNSRecord::Record_dns_adnl_address& data) const {
+  return cs.fetch_ulong(16) == 0xad01
+      && cs.fetch_bits_to(data.adnl_addr.bits(), 256)
+      && cs.fetch_uint_to(8, data.flags)
+      && data.flags <= 1
+      && (!(data.flags & 1) || t_ProtoList.fetch_to(cs, data.proto_list));
+}
+
+bool DNSRecord::unpack_dns_adnl_address(vm::CellSlice& cs, td::BitArray<256>& adnl_addr, int& flags, Ref<CellSlice>& proto_list) const {
+  return cs.fetch_ulong(16) == 0xad01
+      && cs.fetch_bits_to(adnl_addr.bits(), 256)
+      && cs.fetch_uint_to(8, flags)
+      && flags <= 1
+      && (!(flags & 1) || t_ProtoList.fetch_to(cs, proto_list));
+}
+
+bool DNSRecord::cell_unpack(Ref<vm::Cell> cell_ref, DNSRecord::Record_dns_adnl_address& data) const {
+  if (cell_ref.is_null()) { return false; }
+  auto cs = load_cell_slice(std::move(cell_ref));
+  return unpack(cs, data) && cs.empty_ext();
+}
+
+bool DNSRecord::cell_unpack_dns_adnl_address(Ref<vm::Cell> cell_ref, td::BitArray<256>& adnl_addr, int& flags, Ref<CellSlice>& proto_list) const {
+  if (cell_ref.is_null()) { return false; }
+  auto cs = load_cell_slice(std::move(cell_ref));
+  return unpack_dns_adnl_address(cs, adnl_addr, flags, proto_list) && cs.empty_ext();
+}
+
+bool DNSRecord::unpack(vm::CellSlice& cs, DNSRecord::Record_dns_smc_address& data) const {
+  return cs.fetch_ulong(16) == 0x9fd3
+      && t_MsgAddressInt.fetch_to(cs, data.smc_addr)
+      && cs.fetch_uint_to(8, data.flags)
+      && data.flags <= 1
+      && (!(data.flags & 1) || t_SmcCapList.fetch_to(cs, data.cap_list));
+}
+
+bool DNSRecord::unpack_dns_smc_address(vm::CellSlice& cs, Ref<CellSlice>& smc_addr, int& flags, Ref<CellSlice>& cap_list) const {
+  return cs.fetch_ulong(16) == 0x9fd3
+      && t_MsgAddressInt.fetch_to(cs, smc_addr)
+      && cs.fetch_uint_to(8, flags)
+      && flags <= 1
+      && (!(flags & 1) || t_SmcCapList.fetch_to(cs, cap_list));
+}
+
+bool DNSRecord::cell_unpack(Ref<vm::Cell> cell_ref, DNSRecord::Record_dns_smc_address& data) const {
+  if (cell_ref.is_null()) { return false; }
+  auto cs = load_cell_slice(std::move(cell_ref));
+  return unpack(cs, data) && cs.empty_ext();
+}
+
+bool DNSRecord::cell_unpack_dns_smc_address(Ref<vm::Cell> cell_ref, Ref<CellSlice>& smc_addr, int& flags, Ref<CellSlice>& cap_list) const {
+  if (cell_ref.is_null()) { return false; }
+  auto cs = load_cell_slice(std::move(cell_ref));
+  return unpack_dns_smc_address(cs, smc_addr, flags, cap_list) && cs.empty_ext();
+}
+
+bool DNSRecord::pack(vm::CellBuilder& cb, const DNSRecord::Record_dns_text& data) const {
+  return cb.store_long_bool(0x1eda, 16)
+      && t_Text.store_from(cb, data.x);
+}
+
+bool DNSRecord::pack_dns_text(vm::CellBuilder& cb, Ref<CellSlice> x) const {
+  return cb.store_long_bool(0x1eda, 16)
+      && t_Text.store_from(cb, x);
+}
+
+bool DNSRecord::cell_pack(Ref<vm::Cell>& cell_ref, const DNSRecord::Record_dns_text& data) const {
+  vm::CellBuilder cb;
+  return pack(cb, data) && std::move(cb).finalize_to(cell_ref);
+}
+
+bool DNSRecord::cell_pack_dns_text(Ref<vm::Cell>& cell_ref, Ref<CellSlice> x) const {
+  vm::CellBuilder cb;
+  return pack_dns_text(cb, std::move(x)) && std::move(cb).finalize_to(cell_ref);
+}
+
+bool DNSRecord::pack(vm::CellBuilder& cb, const DNSRecord::Record_dns_next_resolver& data) const {
+  return cb.store_long_bool(0xba93, 16)
+      && t_MsgAddressInt.store_from(cb, data.resolver);
+}
+
+bool DNSRecord::pack_dns_next_resolver(vm::CellBuilder& cb, Ref<CellSlice> resolver) const {
+  return cb.store_long_bool(0xba93, 16)
+      && t_MsgAddressInt.store_from(cb, resolver);
+}
+
+bool DNSRecord::cell_pack(Ref<vm::Cell>& cell_ref, const DNSRecord::Record_dns_next_resolver& data) const {
+  vm::CellBuilder cb;
+  return pack(cb, data) && std::move(cb).finalize_to(cell_ref);
+}
+
+bool DNSRecord::cell_pack_dns_next_resolver(Ref<vm::Cell>& cell_ref, Ref<CellSlice> resolver) const {
+  vm::CellBuilder cb;
+  return pack_dns_next_resolver(cb, std::move(resolver)) && std::move(cb).finalize_to(cell_ref);
+}
+
+bool DNSRecord::pack(vm::CellBuilder& cb, const DNSRecord::Record_dns_adnl_address& data) const {
+  return cb.store_long_bool(0xad01, 16)
+      && cb.store_bits_bool(data.adnl_addr.cbits(), 256)
+      && cb.store_ulong_rchk_bool(data.flags, 8)
+      && data.flags <= 1
+      && (!(data.flags & 1) || t_ProtoList.store_from(cb, data.proto_list));
+}
+
+bool DNSRecord::pack_dns_adnl_address(vm::CellBuilder& cb, td::BitArray<256> adnl_addr, int flags, Ref<CellSlice> proto_list) const {
+  return cb.store_long_bool(0xad01, 16)
+      && cb.store_bits_bool(adnl_addr.cbits(), 256)
+      && cb.store_ulong_rchk_bool(flags, 8)
+      && flags <= 1
+      && (!(flags & 1) || t_ProtoList.store_from(cb, proto_list));
+}
+
+bool DNSRecord::cell_pack(Ref<vm::Cell>& cell_ref, const DNSRecord::Record_dns_adnl_address& data) const {
+  vm::CellBuilder cb;
+  return pack(cb, data) && std::move(cb).finalize_to(cell_ref);
+}
+
+bool DNSRecord::cell_pack_dns_adnl_address(Ref<vm::Cell>& cell_ref, td::BitArray<256> adnl_addr, int flags, Ref<CellSlice> proto_list) const {
+  vm::CellBuilder cb;
+  return pack_dns_adnl_address(cb, adnl_addr, flags, std::move(proto_list)) && std::move(cb).finalize_to(cell_ref);
+}
+
+bool DNSRecord::pack(vm::CellBuilder& cb, const DNSRecord::Record_dns_smc_address& data) const {
+  return cb.store_long_bool(0x9fd3, 16)
+      && t_MsgAddressInt.store_from(cb, data.smc_addr)
+      && cb.store_ulong_rchk_bool(data.flags, 8)
+      && data.flags <= 1
+      && (!(data.flags & 1) || t_SmcCapList.store_from(cb, data.cap_list));
+}
+
+bool DNSRecord::pack_dns_smc_address(vm::CellBuilder& cb, Ref<CellSlice> smc_addr, int flags, Ref<CellSlice> cap_list) const {
+  return cb.store_long_bool(0x9fd3, 16)
+      && t_MsgAddressInt.store_from(cb, smc_addr)
+      && cb.store_ulong_rchk_bool(flags, 8)
+      && flags <= 1
+      && (!(flags & 1) || t_SmcCapList.store_from(cb, cap_list));
+}
+
+bool DNSRecord::cell_pack(Ref<vm::Cell>& cell_ref, const DNSRecord::Record_dns_smc_address& data) const {
+  vm::CellBuilder cb;
+  return pack(cb, data) && std::move(cb).finalize_to(cell_ref);
+}
+
+bool DNSRecord::cell_pack_dns_smc_address(Ref<vm::Cell>& cell_ref, Ref<CellSlice> smc_addr, int flags, Ref<CellSlice> cap_list) const {
+  vm::CellBuilder cb;
+  return pack_dns_smc_address(cb, std::move(smc_addr), flags, std::move(cap_list)) && std::move(cb).finalize_to(cell_ref);
+}
+
+bool DNSRecord::print_skip(PrettyPrinter& pp, vm::CellSlice& cs) const {
+  switch (get_tag(cs)) {
+  case dns_text:
+    return cs.fetch_ulong(16) == 0x1eda
+        && pp.open("dns_text")
+        && pp.field()
+        && t_Text.print_skip(pp, cs)
+        && pp.close();
+  case dns_next_resolver:
+    return cs.fetch_ulong(16) == 0xba93
+        && pp.open("dns_next_resolver")
+        && pp.field("resolver")
+        && t_MsgAddressInt.print_skip(pp, cs)
+        && pp.close();
+  case dns_adnl_address: {
+    int flags;
+    return cs.fetch_ulong(16) == 0xad01
+        && pp.open("dns_adnl_address")
+        && pp.fetch_bits_field(cs, 256, "adnl_addr")
+        && cs.fetch_uint_to(8, flags)
+        && pp.field_int(flags, "flags")
+        && flags <= 1
+        && (!(flags & 1) || (pp.field("proto_list") && t_ProtoList.print_skip(pp, cs)))
+        && pp.close();
+    }
+  case dns_smc_address: {
+    int flags;
+    return cs.fetch_ulong(16) == 0x9fd3
+        && pp.open("dns_smc_address")
+        && pp.field("smc_addr")
+        && t_MsgAddressInt.print_skip(pp, cs)
+        && cs.fetch_uint_to(8, flags)
+        && pp.field_int(flags, "flags")
+        && flags <= 1
+        && (!(flags & 1) || (pp.field("cap_list") && t_SmcCapList.print_skip(pp, cs)))
+        && pp.close();
+    }
+  }
+  return pp.fail("unknown constructor for DNSRecord");
+}
+
+const DNSRecord t_DNSRecord;
+
+//
+// code for type `SmcCapList`
+//
+
+int SmcCapList::check_tag(const vm::CellSlice& cs) const {
+  switch (get_tag(cs)) {
+  case cap_list_nil:
+    return cs.have(1) ? cap_list_nil : -1;
+  case cap_list_next:
+    return cs.have(1) ? cap_list_next : -1;
+  }
+  return -1;
+}
+
+bool SmcCapList::skip(vm::CellSlice& cs) const {
+  switch (get_tag(cs)) {
+  case cap_list_nil:
+    return cs.advance(1);
+  case cap_list_next:
+    return cs.advance(1)
+        && t_SmcCapability.skip(cs)
+        && skip(cs);
+  }
+  return false;
+}
+
+bool SmcCapList::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const {
+  switch (get_tag(cs)) {
+  case cap_list_nil:
+    return cs.advance(1);
+  case cap_list_next:
+    return cs.advance(1)
+        && t_SmcCapability.validate_skip(ops, cs, weak)
+        && validate_skip(ops, cs, weak);
+  }
+  return false;
+}
+
+bool SmcCapList::unpack(vm::CellSlice& cs, SmcCapList::Record_cap_list_nil& data) const {
+  return cs.fetch_ulong(1) == 0;
+}
+
+bool SmcCapList::unpack_cap_list_nil(vm::CellSlice& cs) const {
+  return cs.fetch_ulong(1) == 0;
+}
+
+bool SmcCapList::cell_unpack(Ref<vm::Cell> cell_ref, SmcCapList::Record_cap_list_nil& data) const {
+  if (cell_ref.is_null()) { return false; }
+  auto cs = load_cell_slice(std::move(cell_ref));
+  return unpack(cs, data) && cs.empty_ext();
+}
+
+bool SmcCapList::cell_unpack_cap_list_nil(Ref<vm::Cell> cell_ref) const {
+  if (cell_ref.is_null()) { return false; }
+  auto cs = load_cell_slice(std::move(cell_ref));
+  return unpack_cap_list_nil(cs) && cs.empty_ext();
+}
+
+bool SmcCapList::unpack(vm::CellSlice& cs, SmcCapList::Record_cap_list_next& data) const {
+  return cs.fetch_ulong(1) == 1
+      && t_SmcCapability.fetch_to(cs, data.head)
+      && fetch_to(cs, data.tail);
+}
+
+bool SmcCapList::unpack_cap_list_next(vm::CellSlice& cs, Ref<CellSlice>& head, Ref<CellSlice>& tail) const {
+  return cs.fetch_ulong(1) == 1
+      && t_SmcCapability.fetch_to(cs, head)
+      && fetch_to(cs, tail);
+}
+
+bool SmcCapList::cell_unpack(Ref<vm::Cell> cell_ref, SmcCapList::Record_cap_list_next& data) const {
+  if (cell_ref.is_null()) { return false; }
+  auto cs = load_cell_slice(std::move(cell_ref));
+  return unpack(cs, data) && cs.empty_ext();
+}
+
+bool SmcCapList::cell_unpack_cap_list_next(Ref<vm::Cell> cell_ref, Ref<CellSlice>& head, Ref<CellSlice>& tail) const {
+  if (cell_ref.is_null()) { return false; }
+  auto cs = load_cell_slice(std::move(cell_ref));
+  return unpack_cap_list_next(cs, head, tail) && cs.empty_ext();
+}
+
+bool SmcCapList::pack(vm::CellBuilder& cb, const SmcCapList::Record_cap_list_nil& data) const {
+  return cb.store_long_bool(0, 1);
+}
+
+bool SmcCapList::pack_cap_list_nil(vm::CellBuilder& cb) const {
+  return cb.store_long_bool(0, 1);
+}
+
+bool SmcCapList::cell_pack(Ref<vm::Cell>& cell_ref, const SmcCapList::Record_cap_list_nil& data) const {
+  vm::CellBuilder cb;
+  return pack(cb, data) && std::move(cb).finalize_to(cell_ref);
+}
+
+bool SmcCapList::cell_pack_cap_list_nil(Ref<vm::Cell>& cell_ref) const {
+  vm::CellBuilder cb;
+  return pack_cap_list_nil(cb) && std::move(cb).finalize_to(cell_ref);
+}
+
+bool SmcCapList::pack(vm::CellBuilder& cb, const SmcCapList::Record_cap_list_next& data) const {
+  return cb.store_long_bool(1, 1)
+      && t_SmcCapability.store_from(cb, data.head)
+      && store_from(cb, data.tail);
+}
+
+bool SmcCapList::pack_cap_list_next(vm::CellBuilder& cb, Ref<CellSlice> head, Ref<CellSlice> tail) const {
+  return cb.store_long_bool(1, 1)
+      && t_SmcCapability.store_from(cb, head)
+      && store_from(cb, tail);
+}
+
+bool SmcCapList::cell_pack(Ref<vm::Cell>& cell_ref, const SmcCapList::Record_cap_list_next& data) const {
+  vm::CellBuilder cb;
+  return pack(cb, data) && std::move(cb).finalize_to(cell_ref);
+}
+
+bool SmcCapList::cell_pack_cap_list_next(Ref<vm::Cell>& cell_ref, Ref<CellSlice> head, Ref<CellSlice> tail) const {
+  vm::CellBuilder cb;
+  return pack_cap_list_next(cb, std::move(head), std::move(tail)) && std::move(cb).finalize_to(cell_ref);
+}
+
+bool SmcCapList::print_skip(PrettyPrinter& pp, vm::CellSlice& cs) const {
+  switch (get_tag(cs)) {
+  case cap_list_nil:
+    return cs.advance(1)
+        && pp.cons("cap_list_nil");
+  case cap_list_next:
+    return cs.advance(1)
+        && pp.open("cap_list_next")
+        && pp.field("head")
+        && t_SmcCapability.print_skip(pp, cs)
+        && pp.field("tail")
+        && print_skip(pp, cs)
+        && pp.close();
+  }
+  return pp.fail("unknown constructor for SmcCapList");
+}
+
+const SmcCapList t_SmcCapList;
+
+//
+// code for type `SmcCapability`
+//
+constexpr char SmcCapability::cons_len[4];
+constexpr unsigned short SmcCapability::cons_tag[4];
+
+int SmcCapability::check_tag(const vm::CellSlice& cs) const {
+  switch (get_tag(cs)) {
+  case cap_method_seqno:
+    return cs.prefetch_ulong(16) == 0x5371 ? cap_method_seqno : -1;
+  case cap_method_pubkey:
+    return cs.prefetch_ulong(16) == 0x71f4 ? cap_method_pubkey : -1;
+  case cap_is_wallet:
+    return cs.prefetch_ulong(16) == 0x2177 ? cap_is_wallet : -1;
+  case cap_name:
+    return cs.prefetch_ulong(8) == 0xff ? cap_name : -1;
+  }
+  return -1;
+}
+
+bool SmcCapability::skip(vm::CellSlice& cs) const {
+  switch (get_tag(cs)) {
+  case cap_method_seqno:
+    return cs.advance(16);
+  case cap_method_pubkey:
+    return cs.advance(16);
+  case cap_is_wallet:
+    return cs.advance(16);
+  case cap_name:
+    return cs.advance(8)
+        && t_Text.skip(cs);
+  }
+  return false;
+}
+
+bool SmcCapability::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const {
+  switch (get_tag(cs)) {
+  case cap_method_seqno:
+    return cs.fetch_ulong(16) == 0x5371;
+  case cap_method_pubkey:
+    return cs.fetch_ulong(16) == 0x71f4;
+  case cap_is_wallet:
+    return cs.fetch_ulong(16) == 0x2177;
+  case cap_name:
+    return cs.fetch_ulong(8) == 0xff
+        && t_Text.validate_skip(ops, cs, weak);
+  }
+  return false;
+}
+
+bool SmcCapability::unpack(vm::CellSlice& cs, SmcCapability::Record_cap_method_seqno& data) const {
+  return cs.fetch_ulong(16) == 0x5371;
+}
+
+bool SmcCapability::unpack_cap_method_seqno(vm::CellSlice& cs) const {
+  return cs.fetch_ulong(16) == 0x5371;
+}
+
+bool SmcCapability::cell_unpack(Ref<vm::Cell> cell_ref, SmcCapability::Record_cap_method_seqno& data) const {
+  if (cell_ref.is_null()) { return false; }
+  auto cs = load_cell_slice(std::move(cell_ref));
+  return unpack(cs, data) && cs.empty_ext();
+}
+
+bool SmcCapability::cell_unpack_cap_method_seqno(Ref<vm::Cell> cell_ref) const {
+  if (cell_ref.is_null()) { return false; }
+  auto cs = load_cell_slice(std::move(cell_ref));
+  return unpack_cap_method_seqno(cs) && cs.empty_ext();
+}
+
+bool SmcCapability::unpack(vm::CellSlice& cs, SmcCapability::Record_cap_method_pubkey& data) const {
+  return cs.fetch_ulong(16) == 0x71f4;
+}
+
+bool SmcCapability::unpack_cap_method_pubkey(vm::CellSlice& cs) const {
+  return cs.fetch_ulong(16) == 0x71f4;
+}
+
+bool SmcCapability::cell_unpack(Ref<vm::Cell> cell_ref, SmcCapability::Record_cap_method_pubkey& data) const {
+  if (cell_ref.is_null()) { return false; }
+  auto cs = load_cell_slice(std::move(cell_ref));
+  return unpack(cs, data) && cs.empty_ext();
+}
+
+bool SmcCapability::cell_unpack_cap_method_pubkey(Ref<vm::Cell> cell_ref) const {
+  if (cell_ref.is_null()) { return false; }
+  auto cs = load_cell_slice(std::move(cell_ref));
+  return unpack_cap_method_pubkey(cs) && cs.empty_ext();
+}
+
+bool SmcCapability::unpack(vm::CellSlice& cs, SmcCapability::Record_cap_is_wallet& data) const {
+  return cs.fetch_ulong(16) == 0x2177;
+}
+
+bool SmcCapability::unpack_cap_is_wallet(vm::CellSlice& cs) const {
+  return cs.fetch_ulong(16) == 0x2177;
+}
+
+bool SmcCapability::cell_unpack(Ref<vm::Cell> cell_ref, SmcCapability::Record_cap_is_wallet& data) const {
+  if (cell_ref.is_null()) { return false; }
+  auto cs = load_cell_slice(std::move(cell_ref));
+  return unpack(cs, data) && cs.empty_ext();
+}
+
+bool SmcCapability::cell_unpack_cap_is_wallet(Ref<vm::Cell> cell_ref) const {
+  if (cell_ref.is_null()) { return false; }
+  auto cs = load_cell_slice(std::move(cell_ref));
+  return unpack_cap_is_wallet(cs) && cs.empty_ext();
+}
+
+bool SmcCapability::unpack(vm::CellSlice& cs, SmcCapability::Record_cap_name& data) const {
+  return cs.fetch_ulong(8) == 0xff
+      && t_Text.fetch_to(cs, data.name);
+}
+
+bool SmcCapability::unpack_cap_name(vm::CellSlice& cs, Ref<CellSlice>& name) const {
+  return cs.fetch_ulong(8) == 0xff
+      && t_Text.fetch_to(cs, name);
+}
+
+bool SmcCapability::cell_unpack(Ref<vm::Cell> cell_ref, SmcCapability::Record_cap_name& data) const {
+  if (cell_ref.is_null()) { return false; }
+  auto cs = load_cell_slice(std::move(cell_ref));
+  return unpack(cs, data) && cs.empty_ext();
+}
+
+bool SmcCapability::cell_unpack_cap_name(Ref<vm::Cell> cell_ref, Ref<CellSlice>& name) const {
+  if (cell_ref.is_null()) { return false; }
+  auto cs = load_cell_slice(std::move(cell_ref));
+  return unpack_cap_name(cs, name) && cs.empty_ext();
+}
+
+bool SmcCapability::pack(vm::CellBuilder& cb, const SmcCapability::Record_cap_method_seqno& data) const {
+  return cb.store_long_bool(0x5371, 16);
+}
+
+bool SmcCapability::pack_cap_method_seqno(vm::CellBuilder& cb) const {
+  return cb.store_long_bool(0x5371, 16);
+}
+
+bool SmcCapability::cell_pack(Ref<vm::Cell>& cell_ref, const SmcCapability::Record_cap_method_seqno& data) const {
+  vm::CellBuilder cb;
+  return pack(cb, data) && std::move(cb).finalize_to(cell_ref);
+}
+
+bool SmcCapability::cell_pack_cap_method_seqno(Ref<vm::Cell>& cell_ref) const {
+  vm::CellBuilder cb;
+  return pack_cap_method_seqno(cb) && std::move(cb).finalize_to(cell_ref);
+}
+
+bool SmcCapability::pack(vm::CellBuilder& cb, const SmcCapability::Record_cap_method_pubkey& data) const {
+  return cb.store_long_bool(0x71f4, 16);
+}
+
+bool SmcCapability::pack_cap_method_pubkey(vm::CellBuilder& cb) const {
+  return cb.store_long_bool(0x71f4, 16);
+}
+
+bool SmcCapability::cell_pack(Ref<vm::Cell>& cell_ref, const SmcCapability::Record_cap_method_pubkey& data) const {
+  vm::CellBuilder cb;
+  return pack(cb, data) && std::move(cb).finalize_to(cell_ref);
+}
+
+bool SmcCapability::cell_pack_cap_method_pubkey(Ref<vm::Cell>& cell_ref) const {
+  vm::CellBuilder cb;
+  return pack_cap_method_pubkey(cb) && std::move(cb).finalize_to(cell_ref);
+}
+
+bool SmcCapability::pack(vm::CellBuilder& cb, const SmcCapability::Record_cap_is_wallet& data) const {
+  return cb.store_long_bool(0x2177, 16);
+}
+
+bool SmcCapability::pack_cap_is_wallet(vm::CellBuilder& cb) const {
+  return cb.store_long_bool(0x2177, 16);
+}
+
+bool SmcCapability::cell_pack(Ref<vm::Cell>& cell_ref, const SmcCapability::Record_cap_is_wallet& data) const {
+  vm::CellBuilder cb;
+  return pack(cb, data) && std::move(cb).finalize_to(cell_ref);
+}
+
+bool SmcCapability::cell_pack_cap_is_wallet(Ref<vm::Cell>& cell_ref) const {
+  vm::CellBuilder cb;
+  return pack_cap_is_wallet(cb) && std::move(cb).finalize_to(cell_ref);
+}
+
+bool SmcCapability::pack(vm::CellBuilder& cb, const SmcCapability::Record_cap_name& data) const {
+  return cb.store_long_bool(0xff, 8)
+      && t_Text.store_from(cb, data.name);
+}
+
+bool SmcCapability::pack_cap_name(vm::CellBuilder& cb, Ref<CellSlice> name) const {
+  return cb.store_long_bool(0xff, 8)
+      && t_Text.store_from(cb, name);
+}
+
+bool SmcCapability::cell_pack(Ref<vm::Cell>& cell_ref, const SmcCapability::Record_cap_name& data) const {
+  vm::CellBuilder cb;
+  return pack(cb, data) && std::move(cb).finalize_to(cell_ref);
+}
+
+bool SmcCapability::cell_pack_cap_name(Ref<vm::Cell>& cell_ref, Ref<CellSlice> name) const {
+  vm::CellBuilder cb;
+  return pack_cap_name(cb, std::move(name)) && std::move(cb).finalize_to(cell_ref);
+}
+
+bool SmcCapability::print_skip(PrettyPrinter& pp, vm::CellSlice& cs) const {
+  switch (get_tag(cs)) {
+  case cap_method_seqno:
+    return cs.fetch_ulong(16) == 0x5371
+        && pp.cons("cap_method_seqno");
+  case cap_method_pubkey:
+    return cs.fetch_ulong(16) == 0x71f4
+        && pp.cons("cap_method_pubkey");
+  case cap_is_wallet:
+    return cs.fetch_ulong(16) == 0x2177
+        && pp.cons("cap_is_wallet");
+  case cap_name:
+    return cs.fetch_ulong(8) == 0xff
+        && pp.open("cap_name")
+        && pp.field("name")
+        && t_Text.print_skip(pp, cs)
+        && pp.close();
+  }
+  return pp.fail("unknown constructor for SmcCapability");
+}
+
+const SmcCapability t_SmcCapability;
+
 // definitions of constant types used
 
 const NatWidth t_natwidth_1{1};
@@ -17368,12 +21103,13 @@ const NatWidth t_natwidth_6{6};
 const NatWidth t_natwidth_8{8};
 const MessageRelaxed t_MessageRelaxed_Any{t_Anything};
 const RefT t_Ref_MessageRelaxed_Any{t_MessageRelaxed_Any};
+const NatWidth t_natwidth_7{7};
 const NatLeq t_natleq_60{60};
 const RefT t_Ref_OutMsgQueueInfo{t_OutMsgQueueInfo};
 const RefT t_Ref_ShardAccounts{t_ShardAccounts};
 const HashmapE t_HashmapE_256_LibDescr{256, t_LibDescr};
 const Maybe t_Maybe_BlkMasterInfo{t_BlkMasterInfo};
-const RefT t_Ref_TYPE_1637{t_ShardStateUnsplit_aux};
+const RefT t_Ref_TYPE_1638{t_ShardStateUnsplit_aux};
 const RefT t_Ref_McStateExtra{t_McStateExtra};
 const Maybe t_Maybe_Ref_McStateExtra{t_Ref_McStateExtra};
 const RefT t_Ref_ShardStateUnsplit{t_ShardStateUnsplit};
@@ -17392,8 +21128,8 @@ const RefT t_Ref_OutMsgDescr{t_OutMsgDescr};
 const RefT t_Ref_ShardAccountBlocks{t_ShardAccountBlocks};
 const RefT t_Ref_McBlockExtra{t_McBlockExtra};
 const Maybe t_Maybe_Ref_McBlockExtra{t_Ref_McBlockExtra};
-const RefT t_Ref_TYPE_1647{t_ValueFlow_aux};
-const RefT t_Ref_TYPE_1648{t_ValueFlow_aux1};
+const RefT t_Ref_TYPE_1648{t_ValueFlow_aux};
+const RefT t_Ref_TYPE_1649{t_ValueFlow_aux1};
 const NatWidth t_natwidth_3{3};
 const BinTree t_BinTree_ShardDescr{t_ShardDescr};
 const RefT t_Ref_BinTree_ShardDescr{t_BinTree_ShardDescr};
@@ -17403,13 +21139,14 @@ const Hashmap t_Hashmap_32_Ref_Cell{32, t_RefCell};
 const RefT t_Ref_Hashmap_32_Ref_Cell{t_Hashmap_32_Ref_Cell};
 const HashmapAugE t_HashmapAugE_32_KeyExtBlkRef_KeyMaxLt{32, t_KeyExtBlkRef, t_KeyMaxLt};
 const HashmapE t_HashmapE_256_CreatorStats{256, t_CreatorStats};
+const HashmapAugE t_HashmapAugE_256_CreatorStats_uint32{256, t_CreatorStats, t_uint32};
 const NatWidth t_natwidth_16{16};
 const Maybe t_Maybe_ExtBlkRef{t_ExtBlkRef};
-const RefT t_Ref_TYPE_1665{t_McStateExtra_aux};
+const RefT t_Ref_TYPE_1666{t_McStateExtra_aux};
 const RefT t_Ref_SignedCertificate{t_SignedCertificate};
 const HashmapE t_HashmapE_16_CryptoSignaturePair{16, t_CryptoSignaturePair};
 const Maybe t_Maybe_Ref_InMsg{t_Ref_InMsg};
-const RefT t_Ref_TYPE_1673{t_McBlockExtra_aux};
+const RefT t_Ref_TYPE_1674{t_McBlockExtra_aux};
 const Hashmap t_Hashmap_16_ValidatorDescr{16, t_ValidatorDescr};
 const HashmapE t_HashmapE_16_ValidatorDescr{16, t_ValidatorDescr};
 const Hashmap t_Hashmap_32_True{32, t_True};
@@ -17425,6 +21162,156 @@ const RefT t_Ref_BlockSignatures{t_BlockSignatures};
 const Maybe t_Maybe_Ref_BlockSignatures{t_Ref_BlockSignatures};
 const RefT t_Ref_TopBlockDescr{t_TopBlockDescr};
 const HashmapE t_HashmapE_96_Ref_TopBlockDescr{96, t_Ref_TopBlockDescr};
+const Int t_int64{64};
+const Int t_int257{257};
+const NatWidth t_natwidth_10{10};
+const NatLeq t_natleq_4{4};
+const RefT t_Ref_VmStackValue{t_VmStackValue};
+const NatWidth t_natwidth_24{24};
+const HashmapE t_HashmapE_4_VmStackValue{4, t_VmStackValue};
+const RefT t_Ref_TYPE_1705{t_VmGasLimits_aux};
+const HashmapE t_HashmapE_256_Ref_Cell{256, t_RefCell};
+const UInt t_uint13{13};
+const Maybe t_Maybe_uint13{t_uint13};
+const Maybe t_Maybe_VmStack{t_VmStack};
+const Int t_int16{16};
+const Maybe t_Maybe_int16{t_int16};
+const RefT t_Ref_VmCont{t_VmCont};
+const UInt t_uint63{63};
+const RefT t_Ref_DNSRecord{t_DNSRecord};
+const HashmapE t_HashmapE_16_Ref_DNSRecord{16, t_Ref_DNSRecord};
+
+// definition of type name registration function
+bool register_simple_types(std::function<bool(const char*, const TLB*)> func) {
+  return func("Unit", &t_Unit)
+      && func("True", &t_True)
+      && func("Bool", &t_Bool)
+      && func("BoolFalse", &t_BoolFalse)
+      && func("BoolTrue", &t_BoolTrue)
+      && func("Bit", &t_Bit)
+      && func("Unary", &t_Unary)
+      && func("MsgAddressExt", &t_MsgAddressExt)
+      && func("Anycast", &t_Anycast)
+      && func("MsgAddressInt", &t_MsgAddressInt)
+      && func("MsgAddress", &t_MsgAddress)
+      && func("Grams", &t_Grams)
+      && func("ExtraCurrencyCollection", &t_ExtraCurrencyCollection)
+      && func("CurrencyCollection", &t_CurrencyCollection)
+      && func("CommonMsgInfo", &t_CommonMsgInfo)
+      && func("CommonMsgInfoRelaxed", &t_CommonMsgInfoRelaxed)
+      && func("TickTock", &t_TickTock)
+      && func("SimpleLib", &t_SimpleLib)
+      && func("StateInit", &t_StateInit)
+      && func("IntermediateAddress", &t_IntermediateAddress)
+      && func("MsgEnvelope", &t_MsgEnvelope)
+      && func("Transaction", &t_Transaction)
+      && func("InMsg", &t_InMsg)
+      && func("ImportFees", &t_ImportFees)
+      && func("InMsgDescr", &t_InMsgDescr)
+      && func("OutMsg", &t_OutMsg)
+      && func("EnqueuedMsg", &t_EnqueuedMsg)
+      && func("OutMsgDescr", &t_OutMsgDescr)
+      && func("OutMsgQueue", &t_OutMsgQueue)
+      && func("ProcessedUpto", &t_ProcessedUpto)
+      && func("ProcessedInfo", &t_ProcessedInfo)
+      && func("IhrPendingSince", &t_IhrPendingSince)
+      && func("IhrPendingInfo", &t_IhrPendingInfo)
+      && func("OutMsgQueueInfo", &t_OutMsgQueueInfo)
+      && func("StorageUsed", &t_StorageUsed)
+      && func("StorageUsedShort", &t_StorageUsedShort)
+      && func("StorageInfo", &t_StorageInfo)
+      && func("Account", &t_Account)
+      && func("AccountStorage", &t_AccountStorage)
+      && func("AccountState", &t_AccountState)
+      && func("AccountStatus", &t_AccountStatus)
+      && func("ShardAccount", &t_ShardAccount)
+      && func("DepthBalanceInfo", &t_DepthBalanceInfo)
+      && func("ShardAccounts", &t_ShardAccounts)
+      && func("TransactionDescr", &t_TransactionDescr)
+      && func("AccountBlock", &t_AccountBlock)
+      && func("ShardAccountBlocks", &t_ShardAccountBlocks)
+      && func("AccStatusChange", &t_AccStatusChange)
+      && func("TrStoragePhase", &t_TrStoragePhase)
+      && func("TrCreditPhase", &t_TrCreditPhase)
+      && func("ComputeSkipReason", &t_ComputeSkipReason)
+      && func("TrComputePhase", &t_TrComputePhase)
+      && func("TrActionPhase", &t_TrActionPhase)
+      && func("TrBouncePhase", &t_TrBouncePhase)
+      && func("SplitMergeInfo", &t_SplitMergeInfo)
+      && func("SmartContractInfo", &t_SmartContractInfo)
+      && func("OutAction", &t_OutAction)
+      && func("LibRef", &t_LibRef)
+      && func("OutListNode", &t_OutListNode)
+      && func("ShardIdent", &t_ShardIdent)
+      && func("ExtBlkRef", &t_ExtBlkRef)
+      && func("BlockIdExt", &t_BlockIdExt)
+      && func("BlkMasterInfo", &t_BlkMasterInfo)
+      && func("LibDescr", &t_LibDescr)
+      && func("McStateExtra", &t_McStateExtra)
+      && func("ShardStateUnsplit", &t_ShardStateUnsplit)
+      && func("ShardState", &t_ShardState)
+      && func("BlockInfo", &t_BlockInfo)
+      && func("ValueFlow", &t_ValueFlow)
+      && func("BlockExtra", &t_BlockExtra)
+      && func("Block", &t_Block)
+      && func("McBlockExtra", &t_McBlockExtra)
+      && func("FutureSplitMerge", &t_FutureSplitMerge)
+      && func("ShardDescr", &t_ShardDescr)
+      && func("ShardHashes", &t_ShardHashes)
+      && func("ShardFeeCreated", &t_ShardFeeCreated)
+      && func("ShardFees", &t_ShardFees)
+      && func("ConfigParams", &t_ConfigParams)
+      && func("ValidatorInfo", &t_ValidatorInfo)
+      && func("ValidatorBaseInfo", &t_ValidatorBaseInfo)
+      && func("KeyMaxLt", &t_KeyMaxLt)
+      && func("KeyExtBlkRef", &t_KeyExtBlkRef)
+      && func("OldMcBlocksInfo", &t_OldMcBlocksInfo)
+      && func("Counters", &t_Counters)
+      && func("CreatorStats", &t_CreatorStats)
+      && func("BlockCreateStats", &t_BlockCreateStats)
+      && func("SigPubKey", &t_SigPubKey)
+      && func("CryptoSignatureSimple", &t_CryptoSignatureSimple)
+      && func("CryptoSignature", &t_CryptoSignature)
+      && func("CryptoSignaturePair", &t_CryptoSignaturePair)
+      && func("Certificate", &t_Certificate)
+      && func("CertificateEnv", &t_CertificateEnv)
+      && func("SignedCertificate", &t_SignedCertificate)
+      && func("ValidatorDescr", &t_ValidatorDescr)
+      && func("ValidatorSet", &t_ValidatorSet)
+      && func("GlobalVersion", &t_GlobalVersion)
+      && func("WorkchainDescr", &t_WorkchainDescr)
+      && func("BlockCreateFees", &t_BlockCreateFees)
+      && func("StoragePrices", &t_StoragePrices)
+      && func("GasLimitsPrices", &t_GasLimitsPrices)
+      && func("ParamLimits", &t_ParamLimits)
+      && func("BlockLimits", &t_BlockLimits)
+      && func("MsgForwardPrices", &t_MsgForwardPrices)
+      && func("CatchainConfig", &t_CatchainConfig)
+      && func("ConsensusConfig", &t_ConsensusConfig)
+      && func("ValidatorTempKey", &t_ValidatorTempKey)
+      && func("ValidatorSignedTempKey", &t_ValidatorSignedTempKey)
+      && func("BlockSignaturesPure", &t_BlockSignaturesPure)
+      && func("BlockSignatures", &t_BlockSignatures)
+      && func("BlockProof", &t_BlockProof)
+      && func("TopBlockDescr", &t_TopBlockDescr)
+      && func("TopBlockDescrSet", &t_TopBlockDescrSet)
+      && func("VmStackValue", &t_VmStackValue)
+      && func("VmCellSlice", &t_VmCellSlice)
+      && func("VmCont", &t_VmCont)
+      && func("VmStack", &t_VmStack)
+      && func("VmSaveList", &t_VmSaveList)
+      && func("VmGasLimits", &t_VmGasLimits)
+      && func("VmLibraries", &t_VmLibraries)
+      && func("VmControlData", &t_VmControlData)
+      && func("DNSRecord", &t_DNSRecord)
+      && func("DNS_RecordSet", &t_DNS_RecordSet)
+      && func("Text", &t_Text)
+      && func("ProtoList", &t_ProtoList)
+      && func("Protocol", &t_Protocol)
+      && func("SmcCapList", &t_SmcCapList)
+      && func("SmcCapability", &t_SmcCapability);
+}
+
 
 } // namespace gen
 
diff --git a/submodules/ton/tonlib-src/crypto/block/block-auto.h b/submodules/ton/tonlib-src/crypto/block/block-auto.h
index 507b5161e8..ac0bf542b8 100644
--- a/submodules/ton/tonlib-src/crypto/block/block-auto.h
+++ b/submodules/ton/tonlib-src/crypto/block/block-auto.h
@@ -15,11 +15,16 @@
 // uses built-in type `uint`
 // uses built-in type `bits`
 // uses built-in type `int8`
+// uses built-in type `uint13`
 // uses built-in type `uint15`
+// uses built-in type `int16`
 // uses built-in type `uint16`
 // uses built-in type `int32`
 // uses built-in type `uint32`
+// uses built-in type `uint63`
+// uses built-in type `int64`
 // uses built-in type `uint64`
+// uses built-in type `int257`
 // uses built-in type `bits256`
 
 namespace block {
@@ -47,7 +52,7 @@ struct Unit final : TLB_Complex {
   bool skip(vm::CellSlice& cs) const override {
     return true;
   }
-  bool validate_skip(vm::CellSlice& cs, bool weak = false) const override {
+  bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override {
     return true;
   }
   bool fetch_enum_to(vm::CellSlice& cs, char& value) const;
@@ -88,7 +93,7 @@ struct True final : TLB_Complex {
   bool skip(vm::CellSlice& cs) const override {
     return true;
   }
-  bool validate_skip(vm::CellSlice& cs, bool weak = false) const override {
+  bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override {
     return true;
   }
   bool fetch_enum_to(vm::CellSlice& cs, char& value) const;
@@ -132,7 +137,7 @@ struct Bool final : TLB_Complex {
   bool skip(vm::CellSlice& cs) const override {
     return cs.advance(1);
   }
-  bool validate_skip(vm::CellSlice& cs, bool weak = false) const override {
+  bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override {
     return cs.advance(1);
   }
   bool fetch_enum_to(vm::CellSlice& cs, char& value) const;
@@ -181,7 +186,7 @@ struct BoolFalse final : TLB_Complex {
   bool skip(vm::CellSlice& cs) const override {
     return cs.advance(1);
   }
-  bool validate_skip(vm::CellSlice& cs, bool weak = false) const override;
+  bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override;
   bool fetch_enum_to(vm::CellSlice& cs, char& value) const;
   bool store_enum_from(vm::CellBuilder& cb, int value) const;
   bool unpack(vm::CellSlice& cs, Record& data) const;
@@ -221,7 +226,7 @@ struct BoolTrue final : TLB_Complex {
   bool skip(vm::CellSlice& cs) const override {
     return cs.advance(1);
   }
-  bool validate_skip(vm::CellSlice& cs, bool weak = false) const override;
+  bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override;
   bool fetch_enum_to(vm::CellSlice& cs, char& value) const;
   bool store_enum_from(vm::CellBuilder& cb, int value) const;
   bool unpack(vm::CellSlice& cs, Record& data) const;
@@ -263,7 +268,7 @@ struct Maybe final : TLB_Complex {
     Record_just(Ref<CellSlice> _value) : value(std::move(_value)) {}
   };
   bool skip(vm::CellSlice& cs) const override;
-  bool validate_skip(vm::CellSlice& cs, bool weak = false) const override;
+  bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override;
   bool unpack(vm::CellSlice& cs, Record_nothing& data) const;
   bool unpack_nothing(vm::CellSlice& cs) const;
   bool cell_unpack(Ref<vm::Cell> cell_ref, Record_nothing& data) const;
@@ -312,7 +317,7 @@ struct Either final : TLB_Complex {
     Record_right(Ref<CellSlice> _value) : value(std::move(_value)) {}
   };
   bool skip(vm::CellSlice& cs) const override;
-  bool validate_skip(vm::CellSlice& cs, bool weak = false) const override;
+  bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override;
   bool unpack(vm::CellSlice& cs, Record_left& data) const;
   bool unpack_left(vm::CellSlice& cs, Ref<CellSlice>& value) const;
   bool cell_unpack(Ref<vm::Cell> cell_ref, Record_left& data) const;
@@ -356,7 +361,7 @@ struct Both final : TLB_Complex {
     Record(Ref<CellSlice> _first, Ref<CellSlice> _second) : first(std::move(_first)), second(std::move(_second)) {}
   };
   bool skip(vm::CellSlice& cs) const override;
-  bool validate_skip(vm::CellSlice& cs, bool weak = false) const override;
+  bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override;
   bool unpack(vm::CellSlice& cs, Record& data) const;
   bool unpack_pair(vm::CellSlice& cs, Ref<CellSlice>& first, Ref<CellSlice>& second) const;
   bool cell_unpack(Ref<vm::Cell> cell_ref, Record& data) const;
@@ -394,7 +399,7 @@ struct Bit final : TLB_Complex {
   bool skip(vm::CellSlice& cs) const override {
     return cs.advance(1);
   }
-  bool validate_skip(vm::CellSlice& cs, bool weak = false) const override {
+  bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override {
     return cs.advance(1);
   }
   bool unpack(vm::CellSlice& cs, Record& data) const;
@@ -429,7 +434,7 @@ struct Hashmap final : TLB_Complex {
   Hashmap(int m, const TLB& X) : m_(m), X_(X) {}
   struct Record;
   bool skip(vm::CellSlice& cs) const override;
-  bool validate_skip(vm::CellSlice& cs, bool weak = false) const override;
+  bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override;
   bool unpack(vm::CellSlice& cs, Record& data) const;
   bool cell_unpack(Ref<vm::Cell> cell_ref, Record& data) const;
   bool pack(vm::CellBuilder& cb, const Record& data) const;
@@ -473,7 +478,7 @@ struct HashmapNode final : TLB_Complex {
   };
   struct Record_hmn_fork;
   bool skip(vm::CellSlice& cs) const override;
-  bool validate_skip(vm::CellSlice& cs, bool weak = false) const override;
+  bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override;
   bool unpack(vm::CellSlice& cs, Record_hmn_leaf& data) const;
   bool unpack_hmn_leaf(vm::CellSlice& cs, Ref<CellSlice>& value) const;
   bool cell_unpack(Ref<vm::Cell> cell_ref, Record_hmn_leaf& data) const;
@@ -522,8 +527,8 @@ struct HmLabel final : TLB_Complex {
   struct Record_hml_same;
   bool skip(vm::CellSlice& cs) const override;
   bool skip(vm::CellSlice& cs, int& m_) const;
-  bool validate_skip(vm::CellSlice& cs, bool weak = false) const override;
-  bool validate_skip(vm::CellSlice& cs, bool weak, int& m_) const;
+  bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override;
+  bool validate_skip(int *ops, vm::CellSlice& cs, bool weak, int& m_) const;
   bool fetch_to(vm::CellSlice& cs, Ref<vm::CellSlice>& res, int& m_) const;
   bool unpack(vm::CellSlice& cs, Record_hml_short& data, int& m_) const;
   bool cell_unpack(Ref<vm::Cell> cell_ref, Record_hml_short& data, int& m_) const;
@@ -603,8 +608,8 @@ struct Unary final : TLB_Complex {
   };
   bool skip(vm::CellSlice& cs) const override;
   bool skip(vm::CellSlice& cs, int& m_) const;
-  bool validate_skip(vm::CellSlice& cs, bool weak = false) const override;
-  bool validate_skip(vm::CellSlice& cs, bool weak, int& m_) const;
+  bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override;
+  bool validate_skip(int *ops, vm::CellSlice& cs, bool weak, int& m_) const;
   bool fetch_to(vm::CellSlice& cs, Ref<vm::CellSlice>& res, int& m_) const;
   bool unpack(vm::CellSlice& cs, Record_unary_zero& data, int& m_) const;
   bool unpack_unary_zero(vm::CellSlice& cs, int& m_) const;
@@ -656,7 +661,7 @@ struct HashmapE final : TLB_Complex {
     Record_hme_root(Ref<Cell> _root) : n(-1), root(std::move(_root)) {}
   };
   bool skip(vm::CellSlice& cs) const override;
-  bool validate_skip(vm::CellSlice& cs, bool weak = false) const override;
+  bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override;
   bool unpack(vm::CellSlice& cs, Record_hme_empty& data) const;
   bool unpack_hme_empty(vm::CellSlice& cs) const;
   bool cell_unpack(Ref<vm::Cell> cell_ref, Record_hme_empty& data) const;
@@ -700,7 +705,7 @@ struct BitstringSet final : TLB_Complex {
     Record(Ref<CellSlice> _x) : n(-1), x(std::move(_x)) {}
   };
   bool skip(vm::CellSlice& cs) const override;
-  bool validate_skip(vm::CellSlice& cs, bool weak = false) const override;
+  bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override;
   bool unpack(vm::CellSlice& cs, Record& data) const;
   bool unpack_cons1(vm::CellSlice& cs, int& n, Ref<CellSlice>& x) const;
   bool cell_unpack(Ref<vm::Cell> cell_ref, Record& data) const;
@@ -731,7 +736,7 @@ struct HashmapAug final : TLB_Complex {
   HashmapAug(int m, const TLB& X, const TLB& Y) : m_(m), X_(X), Y_(Y) {}
   struct Record;
   bool skip(vm::CellSlice& cs) const override;
-  bool validate_skip(vm::CellSlice& cs, bool weak = false) const override;
+  bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override;
   bool unpack(vm::CellSlice& cs, Record& data) const;
   bool cell_unpack(Ref<vm::Cell> cell_ref, Record& data) const;
   bool pack(vm::CellBuilder& cb, const Record& data) const;
@@ -776,7 +781,7 @@ struct HashmapAugNode final : TLB_Complex {
   };
   struct Record_ahmn_fork;
   bool skip(vm::CellSlice& cs) const override;
-  bool validate_skip(vm::CellSlice& cs, bool weak = false) const override;
+  bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override;
   bool unpack(vm::CellSlice& cs, Record_ahmn_leaf& data) const;
   bool unpack_ahmn_leaf(vm::CellSlice& cs, Ref<CellSlice>& extra, Ref<CellSlice>& value) const;
   bool cell_unpack(Ref<vm::Cell> cell_ref, Record_ahmn_leaf& data) const;
@@ -825,7 +830,7 @@ struct HashmapAugE final : TLB_Complex {
   };
   struct Record_ahme_root;
   bool skip(vm::CellSlice& cs) const override;
-  bool validate_skip(vm::CellSlice& cs, bool weak = false) const override;
+  bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override;
   bool unpack(vm::CellSlice& cs, Record_ahme_empty& data) const;
   bool unpack_ahme_empty(vm::CellSlice& cs, Ref<CellSlice>& extra) const;
   bool cell_unpack(Ref<vm::Cell> cell_ref, Record_ahme_empty& data) const;
@@ -873,7 +878,7 @@ struct VarHashmap final : TLB_Complex {
   VarHashmap(int m, const TLB& X) : m_(m), X_(X) {}
   struct Record;
   bool skip(vm::CellSlice& cs) const override;
-  bool validate_skip(vm::CellSlice& cs, bool weak = false) const override;
+  bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override;
   bool unpack(vm::CellSlice& cs, Record& data) const;
   bool cell_unpack(Ref<vm::Cell> cell_ref, Record& data) const;
   bool pack(vm::CellBuilder& cb, const Record& data) const;
@@ -919,7 +924,7 @@ struct VarHashmapNode final : TLB_Complex {
   struct Record_vhmn_fork;
   struct Record_vhmn_cont;
   bool skip(vm::CellSlice& cs) const override;
-  bool validate_skip(vm::CellSlice& cs, bool weak = false) const override;
+  bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override;
   bool unpack(vm::CellSlice& cs, Record_vhmn_leaf& data) const;
   bool unpack_vhmn_leaf(vm::CellSlice& cs, Ref<CellSlice>& value) const;
   bool cell_unpack(Ref<vm::Cell> cell_ref, Record_vhmn_leaf& data) const;
@@ -987,7 +992,7 @@ struct VarHashmapE final : TLB_Complex {
     Record_vhme_root(Ref<Cell> _root) : n(-1), root(std::move(_root)) {}
   };
   bool skip(vm::CellSlice& cs) const override;
-  bool validate_skip(vm::CellSlice& cs, bool weak = false) const override;
+  bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override;
   bool unpack(vm::CellSlice& cs, Record_vhme_empty& data) const;
   bool unpack_vhme_empty(vm::CellSlice& cs) const;
   bool cell_unpack(Ref<vm::Cell> cell_ref, Record_vhme_empty& data) const;
@@ -1026,7 +1031,7 @@ struct PfxHashmap final : TLB_Complex {
   PfxHashmap(int m, const TLB& X) : m_(m), X_(X) {}
   struct Record;
   bool skip(vm::CellSlice& cs) const override;
-  bool validate_skip(vm::CellSlice& cs, bool weak = false) const override;
+  bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override;
   bool unpack(vm::CellSlice& cs, Record& data) const;
   bool cell_unpack(Ref<vm::Cell> cell_ref, Record& data) const;
   bool pack(vm::CellBuilder& cb, const Record& data) const;
@@ -1070,7 +1075,7 @@ struct PfxHashmapNode final : TLB_Complex {
   };
   struct Record_phmn_fork;
   bool skip(vm::CellSlice& cs) const override;
-  bool validate_skip(vm::CellSlice& cs, bool weak = false) const override;
+  bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override;
   bool unpack(vm::CellSlice& cs, Record_phmn_leaf& data) const;
   bool unpack_phmn_leaf(vm::CellSlice& cs, Ref<CellSlice>& value) const;
   bool cell_unpack(Ref<vm::Cell> cell_ref, Record_phmn_leaf& data) const;
@@ -1127,7 +1132,7 @@ struct PfxHashmapE final : TLB_Complex {
     Record_phme_root(Ref<Cell> _root) : n(-1), root(std::move(_root)) {}
   };
   bool skip(vm::CellSlice& cs) const override;
-  bool validate_skip(vm::CellSlice& cs, bool weak = false) const override;
+  bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override;
   bool unpack(vm::CellSlice& cs, Record_phme_empty& data) const;
   bool unpack_phme_empty(vm::CellSlice& cs) const;
   bool cell_unpack(Ref<vm::Cell> cell_ref, Record_phme_empty& data) const;
@@ -1172,7 +1177,7 @@ struct MsgAddressExt final : TLB_Complex {
     Record_addr_extern(int _len, Ref<td::BitString> _external_address) : len(_len), external_address(std::move(_external_address)) {}
   };
   bool skip(vm::CellSlice& cs) const override;
-  bool validate_skip(vm::CellSlice& cs, bool weak = false) const override;
+  bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override;
   bool unpack(vm::CellSlice& cs, Record_addr_none& data) const;
   bool unpack_addr_none(vm::CellSlice& cs) const;
   bool cell_unpack(Ref<vm::Cell> cell_ref, Record_addr_none& data) const;
@@ -1216,7 +1221,7 @@ struct Anycast final : TLB_Complex {
     Record(int _depth, Ref<td::BitString> _rewrite_pfx) : depth(_depth), rewrite_pfx(std::move(_rewrite_pfx)) {}
   };
   bool skip(vm::CellSlice& cs) const override;
-  bool validate_skip(vm::CellSlice& cs, bool weak = false) const override;
+  bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override;
   bool unpack(vm::CellSlice& cs, Record& data) const;
   bool unpack_anycast_info(vm::CellSlice& cs, int& depth, Ref<td::BitString>& rewrite_pfx) const;
   bool cell_unpack(Ref<vm::Cell> cell_ref, Record& data) const;
@@ -1248,7 +1253,7 @@ struct MsgAddressInt final : TLB_Complex {
   struct Record_addr_std;
   struct Record_addr_var;
   bool skip(vm::CellSlice& cs) const override;
-  bool validate_skip(vm::CellSlice& cs, bool weak = false) const override;
+  bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override;
   bool unpack(vm::CellSlice& cs, Record_addr_std& data) const;
   bool unpack_addr_std(vm::CellSlice& cs, Ref<CellSlice>& anycast, int& workchain_id, td::BitArray<256>& address) const;
   bool cell_unpack(Ref<vm::Cell> cell_ref, Record_addr_std& data) const;
@@ -1312,7 +1317,7 @@ struct MsgAddress final : TLB_Complex {
     Record_cons2(Ref<CellSlice> _x) : x(std::move(_x)) {}
   };
   bool skip(vm::CellSlice& cs) const override;
-  bool validate_skip(vm::CellSlice& cs, bool weak = false) const override;
+  bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override;
   bool unpack(vm::CellSlice& cs, Record_cons1& data) const;
   bool unpack_cons1(vm::CellSlice& cs, Ref<CellSlice>& x) const;
   bool cell_unpack(Ref<vm::Cell> cell_ref, Record_cons1& data) const;
@@ -1352,7 +1357,7 @@ struct VarUInteger final : TLB_Complex {
   VarUInteger(int m) : m_(m) {}
   struct Record;
   bool skip(vm::CellSlice& cs) const override;
-  bool validate_skip(vm::CellSlice& cs, bool weak = false) const override;
+  bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override;
   bool unpack(vm::CellSlice& cs, Record& data) const;
   bool unpack_var_uint(vm::CellSlice& cs, int& n, int& len, RefInt256& value) const;
   bool cell_unpack(Ref<vm::Cell> cell_ref, Record& data) const;
@@ -1391,7 +1396,7 @@ struct VarInteger final : TLB_Complex {
   VarInteger(int m) : m_(m) {}
   struct Record;
   bool skip(vm::CellSlice& cs) const override;
-  bool validate_skip(vm::CellSlice& cs, bool weak = false) const override;
+  bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override;
   bool unpack(vm::CellSlice& cs, Record& data) const;
   bool unpack_var_int(vm::CellSlice& cs, int& n, int& len, RefInt256& value) const;
   bool cell_unpack(Ref<vm::Cell> cell_ref, Record& data) const;
@@ -1433,7 +1438,7 @@ struct Grams final : TLB_Complex {
     Record(Ref<CellSlice> _amount) : amount(std::move(_amount)) {}
   };
   bool skip(vm::CellSlice& cs) const override;
-  bool validate_skip(vm::CellSlice& cs, bool weak = false) const override;
+  bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override;
   bool unpack(vm::CellSlice& cs, Record& data) const;
   bool unpack_nanograms(vm::CellSlice& cs, Ref<CellSlice>& amount) const;
   bool cell_unpack(Ref<vm::Cell> cell_ref, Record& data) const;
@@ -1468,7 +1473,7 @@ struct ExtraCurrencyCollection final : TLB_Complex {
     Record(Ref<CellSlice> _dict) : dict(std::move(_dict)) {}
   };
   bool skip(vm::CellSlice& cs) const override;
-  bool validate_skip(vm::CellSlice& cs, bool weak = false) const override;
+  bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override;
   bool unpack(vm::CellSlice& cs, Record& data) const;
   bool unpack_extra_currencies(vm::CellSlice& cs, Ref<CellSlice>& dict) const;
   bool cell_unpack(Ref<vm::Cell> cell_ref, Record& data) const;
@@ -1504,7 +1509,7 @@ struct CurrencyCollection final : TLB_Complex {
     Record(Ref<CellSlice> _grams, Ref<CellSlice> _other) : grams(std::move(_grams)), other(std::move(_other)) {}
   };
   bool skip(vm::CellSlice& cs) const override;
-  bool validate_skip(vm::CellSlice& cs, bool weak = false) const override;
+  bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override;
   bool unpack(vm::CellSlice& cs, Record& data) const;
   bool unpack_currencies(vm::CellSlice& cs, Ref<CellSlice>& grams, Ref<CellSlice>& other) const;
   bool cell_unpack(Ref<vm::Cell> cell_ref, Record& data) const;
@@ -1537,7 +1542,7 @@ struct CommonMsgInfo final : TLB_Complex {
   struct Record_ext_in_msg_info;
   struct Record_ext_out_msg_info;
   bool skip(vm::CellSlice& cs) const override;
-  bool validate_skip(vm::CellSlice& cs, bool weak = false) const override;
+  bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override;
   bool unpack(vm::CellSlice& cs, Record_int_msg_info& data) const;
   bool cell_unpack(Ref<vm::Cell> cell_ref, Record_int_msg_info& data) const;
   bool pack(vm::CellBuilder& cb, const Record_int_msg_info& data) const;
@@ -1612,7 +1617,7 @@ struct CommonMsgInfoRelaxed final : TLB_Complex {
   struct Record_int_msg_info;
   struct Record_ext_out_msg_info;
   bool skip(vm::CellSlice& cs) const override;
-  bool validate_skip(vm::CellSlice& cs, bool weak = false) const override;
+  bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override;
   bool unpack(vm::CellSlice& cs, Record_int_msg_info& data) const;
   bool cell_unpack(Ref<vm::Cell> cell_ref, Record_int_msg_info& data) const;
   bool pack(vm::CellBuilder& cb, const Record_int_msg_info& data) const;
@@ -1679,7 +1684,7 @@ struct TickTock final : TLB_Complex {
   bool skip(vm::CellSlice& cs) const override {
     return cs.advance(2);
   }
-  bool validate_skip(vm::CellSlice& cs, bool weak = false) const override {
+  bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override {
     return cs.advance(2);
   }
   bool unpack(vm::CellSlice& cs, Record& data) const;
@@ -1711,7 +1716,7 @@ struct StateInit final : TLB_Complex {
   static constexpr int cons_len_exact = 0;
   struct Record;
   bool skip(vm::CellSlice& cs) const override;
-  bool validate_skip(vm::CellSlice& cs, bool weak = false) const override;
+  bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override;
   bool unpack(vm::CellSlice& cs, Record& data) const;
   bool cell_unpack(Ref<vm::Cell> cell_ref, Record& data) const;
   bool pack(vm::CellBuilder& cb, const Record& data) const;
@@ -1759,7 +1764,7 @@ struct SimpleLib final : TLB_Complex {
   bool skip(vm::CellSlice& cs) const override {
     return cs.advance_ext(0x10001);
   }
-  bool validate_skip(vm::CellSlice& cs, bool weak = false) const override;
+  bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override;
   bool unpack(vm::CellSlice& cs, Record& data) const;
   bool unpack_simple_lib(vm::CellSlice& cs, bool& public1, Ref<Cell>& root) const;
   bool cell_unpack(Ref<vm::Cell> cell_ref, Record& data) const;
@@ -1791,7 +1796,7 @@ struct Message final : TLB_Complex {
   Message(const TLB& X) : X_(X) {}
   struct Record;
   bool skip(vm::CellSlice& cs) const override;
-  bool validate_skip(vm::CellSlice& cs, bool weak = false) const override;
+  bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override;
   bool unpack(vm::CellSlice& cs, Record& data) const;
   bool unpack_message(vm::CellSlice& cs, Ref<CellSlice>& info, Ref<CellSlice>& init, Ref<CellSlice>& body) const;
   bool cell_unpack(Ref<vm::Cell> cell_ref, Record& data) const;
@@ -1830,7 +1835,7 @@ struct MessageRelaxed final : TLB_Complex {
   MessageRelaxed(const TLB& X) : X_(X) {}
   struct Record;
   bool skip(vm::CellSlice& cs) const override;
-  bool validate_skip(vm::CellSlice& cs, bool weak = false) const override;
+  bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override;
   bool unpack(vm::CellSlice& cs, Record& data) const;
   bool unpack_message(vm::CellSlice& cs, Ref<CellSlice>& info, Ref<CellSlice>& init, Ref<CellSlice>& body) const;
   bool cell_unpack(Ref<vm::Cell> cell_ref, Record& data) const;
@@ -1887,7 +1892,7 @@ struct IntermediateAddress final : TLB_Complex {
     Record_interm_addr_ext(int _workchain_id, unsigned long long _addr_pfx) : workchain_id(_workchain_id), addr_pfx(_addr_pfx) {}
   };
   bool skip(vm::CellSlice& cs) const override;
-  bool validate_skip(vm::CellSlice& cs, bool weak = false) const override;
+  bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override;
   bool unpack(vm::CellSlice& cs, Record_interm_addr_regular& data) const;
   bool unpack_interm_addr_regular(vm::CellSlice& cs, int& use_dest_bits) const;
   bool cell_unpack(Ref<vm::Cell> cell_ref, Record_interm_addr_regular& data) const;
@@ -1934,7 +1939,7 @@ struct MsgEnvelope final : TLB_Complex {
   static constexpr unsigned char cons_tag[1] = { 4 };
   struct Record;
   bool skip(vm::CellSlice& cs) const override;
-  bool validate_skip(vm::CellSlice& cs, bool weak = false) const override;
+  bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override;
   bool unpack(vm::CellSlice& cs, Record& data) const;
   bool cell_unpack(Ref<vm::Cell> cell_ref, Record& data) const;
   bool pack(vm::CellBuilder& cb, const Record& data) const;
@@ -1983,7 +1988,7 @@ struct InMsg final : TLB_Complex {
   struct Record_msg_discard_fin;
   struct Record_msg_discard_tr;
   bool skip(vm::CellSlice& cs) const override;
-  bool validate_skip(vm::CellSlice& cs, bool weak = false) const override;
+  bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override;
   bool unpack(vm::CellSlice& cs, Record_msg_import_ext& data) const;
   bool unpack_msg_import_ext(vm::CellSlice& cs, Ref<Cell>& msg, Ref<Cell>& transaction) const;
   bool cell_unpack(Ref<vm::Cell> cell_ref, Record_msg_import_ext& data) const;
@@ -2115,7 +2120,7 @@ struct ImportFees final : TLB_Complex {
     Record(Ref<CellSlice> _fees_collected, Ref<CellSlice> _value_imported) : fees_collected(std::move(_fees_collected)), value_imported(std::move(_value_imported)) {}
   };
   bool skip(vm::CellSlice& cs) const override;
-  bool validate_skip(vm::CellSlice& cs, bool weak = false) const override;
+  bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override;
   bool unpack(vm::CellSlice& cs, Record& data) const;
   bool unpack_import_fees(vm::CellSlice& cs, Ref<CellSlice>& fees_collected, Ref<CellSlice>& value_imported) const;
   bool cell_unpack(Ref<vm::Cell> cell_ref, Record& data) const;
@@ -2150,7 +2155,7 @@ struct InMsgDescr final : TLB_Complex {
     Record(Ref<CellSlice> _x) : x(std::move(_x)) {}
   };
   bool skip(vm::CellSlice& cs) const override;
-  bool validate_skip(vm::CellSlice& cs, bool weak = false) const override;
+  bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override;
   bool unpack(vm::CellSlice& cs, Record& data) const;
   bool unpack_cons1(vm::CellSlice& cs, Ref<CellSlice>& x) const;
   bool cell_unpack(Ref<vm::Cell> cell_ref, Record& data) const;
@@ -2223,7 +2228,7 @@ struct OutMsg final : TLB_Complex {
     Record_msg_export_deq_imm(Ref<Cell> _out_msg, Ref<Cell> _reimport) : out_msg(std::move(_out_msg)), reimport(std::move(_reimport)) {}
   };
   bool skip(vm::CellSlice& cs) const override;
-  bool validate_skip(vm::CellSlice& cs, bool weak = false) const override;
+  bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override;
   bool unpack(vm::CellSlice& cs, Record_msg_export_ext& data) const;
   bool unpack_msg_export_ext(vm::CellSlice& cs, Ref<Cell>& msg, Ref<Cell>& transaction) const;
   bool cell_unpack(Ref<vm::Cell> cell_ref, Record_msg_export_ext& data) const;
@@ -2321,7 +2326,7 @@ struct EnqueuedMsg final : TLB_Complex {
   bool skip(vm::CellSlice& cs) const override {
     return cs.advance_ext(0x10040);
   }
-  bool validate_skip(vm::CellSlice& cs, bool weak = false) const override;
+  bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override;
   bool unpack(vm::CellSlice& cs, Record& data) const;
   bool unpack_cons1(vm::CellSlice& cs, unsigned long long& enqueued_lt, Ref<Cell>& out_msg) const;
   bool cell_unpack(Ref<vm::Cell> cell_ref, Record& data) const;
@@ -2356,7 +2361,7 @@ struct OutMsgDescr final : TLB_Complex {
     Record(Ref<CellSlice> _x) : x(std::move(_x)) {}
   };
   bool skip(vm::CellSlice& cs) const override;
-  bool validate_skip(vm::CellSlice& cs, bool weak = false) const override;
+  bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override;
   bool unpack(vm::CellSlice& cs, Record& data) const;
   bool unpack_cons1(vm::CellSlice& cs, Ref<CellSlice>& x) const;
   bool cell_unpack(Ref<vm::Cell> cell_ref, Record& data) const;
@@ -2391,7 +2396,7 @@ struct OutMsgQueue final : TLB_Complex {
     Record(Ref<CellSlice> _x) : x(std::move(_x)) {}
   };
   bool skip(vm::CellSlice& cs) const override;
-  bool validate_skip(vm::CellSlice& cs, bool weak = false) const override;
+  bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override;
   bool unpack(vm::CellSlice& cs, Record& data) const;
   bool unpack_cons1(vm::CellSlice& cs, Ref<CellSlice>& x) const;
   bool cell_unpack(Ref<vm::Cell> cell_ref, Record& data) const;
@@ -2432,7 +2437,7 @@ struct ProcessedUpto final : TLB_Complex {
   bool skip(vm::CellSlice& cs) const override {
     return cs.advance(320);
   }
-  bool validate_skip(vm::CellSlice& cs, bool weak = false) const override {
+  bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override {
     return cs.advance(320);
   }
   bool unpack(vm::CellSlice& cs, Record& data) const;
@@ -2469,7 +2474,7 @@ struct ProcessedInfo final : TLB_Complex {
     Record(Ref<CellSlice> _x) : x(std::move(_x)) {}
   };
   bool skip(vm::CellSlice& cs) const override;
-  bool validate_skip(vm::CellSlice& cs, bool weak = false) const override;
+  bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override;
   bool unpack(vm::CellSlice& cs, Record& data) const;
   bool unpack_cons1(vm::CellSlice& cs, Ref<CellSlice>& x) const;
   bool cell_unpack(Ref<vm::Cell> cell_ref, Record& data) const;
@@ -2509,7 +2514,7 @@ struct IhrPendingSince final : TLB_Complex {
   bool skip(vm::CellSlice& cs) const override {
     return cs.advance(64);
   }
-  bool validate_skip(vm::CellSlice& cs, bool weak = false) const override {
+  bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override {
     return cs.advance(64);
   }
   bool unpack(vm::CellSlice& cs, Record& data) const;
@@ -2546,7 +2551,7 @@ struct IhrPendingInfo final : TLB_Complex {
     Record(Ref<CellSlice> _x) : x(std::move(_x)) {}
   };
   bool skip(vm::CellSlice& cs) const override;
-  bool validate_skip(vm::CellSlice& cs, bool weak = false) const override;
+  bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override;
   bool unpack(vm::CellSlice& cs, Record& data) const;
   bool unpack_cons1(vm::CellSlice& cs, Ref<CellSlice>& x) const;
   bool cell_unpack(Ref<vm::Cell> cell_ref, Record& data) const;
@@ -2576,7 +2581,7 @@ struct OutMsgQueueInfo final : TLB_Complex {
   static constexpr int cons_len_exact = 0;
   struct Record;
   bool skip(vm::CellSlice& cs) const override;
-  bool validate_skip(vm::CellSlice& cs, bool weak = false) const override;
+  bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override;
   bool unpack(vm::CellSlice& cs, Record& data) const;
   bool unpack_cons1(vm::CellSlice& cs, Ref<CellSlice>& out_queue, Ref<CellSlice>& proc_info, Ref<CellSlice>& ihr_pending) const;
   bool cell_unpack(Ref<vm::Cell> cell_ref, Record& data) const;
@@ -2615,7 +2620,7 @@ struct StorageUsed final : TLB_Complex {
   static constexpr int cons_len_exact = 0;
   struct Record;
   bool skip(vm::CellSlice& cs) const override;
-  bool validate_skip(vm::CellSlice& cs, bool weak = false) const override;
+  bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override;
   bool unpack(vm::CellSlice& cs, Record& data) const;
   bool unpack_storage_used(vm::CellSlice& cs, Ref<CellSlice>& cells, Ref<CellSlice>& bits, Ref<CellSlice>& public_cells) const;
   bool cell_unpack(Ref<vm::Cell> cell_ref, Record& data) const;
@@ -2660,7 +2665,7 @@ struct StorageUsedShort final : TLB_Complex {
     Record(Ref<CellSlice> _cells, Ref<CellSlice> _bits) : cells(std::move(_cells)), bits(std::move(_bits)) {}
   };
   bool skip(vm::CellSlice& cs) const override;
-  bool validate_skip(vm::CellSlice& cs, bool weak = false) const override;
+  bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override;
   bool unpack(vm::CellSlice& cs, Record& data) const;
   bool unpack_storage_used_short(vm::CellSlice& cs, Ref<CellSlice>& cells, Ref<CellSlice>& bits) const;
   bool cell_unpack(Ref<vm::Cell> cell_ref, Record& data) const;
@@ -2690,7 +2695,7 @@ struct StorageInfo final : TLB_Complex {
   static constexpr int cons_len_exact = 0;
   struct Record;
   bool skip(vm::CellSlice& cs) const override;
-  bool validate_skip(vm::CellSlice& cs, bool weak = false) const override;
+  bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override;
   bool unpack(vm::CellSlice& cs, Record& data) const;
   bool unpack_storage_info(vm::CellSlice& cs, Ref<CellSlice>& used, unsigned& last_paid, Ref<CellSlice>& due_payment) const;
   bool cell_unpack(Ref<vm::Cell> cell_ref, Record& data) const;
@@ -2732,7 +2737,7 @@ struct Account final : TLB_Complex {
   };
   struct Record_account;
   bool skip(vm::CellSlice& cs) const override;
-  bool validate_skip(vm::CellSlice& cs, bool weak = false) const override;
+  bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override;
   bool unpack(vm::CellSlice& cs, Record_account_none& data) const;
   bool unpack_account_none(vm::CellSlice& cs) const;
   bool cell_unpack(Ref<vm::Cell> cell_ref, Record_account_none& data) const;
@@ -2779,7 +2784,7 @@ struct AccountStorage final : TLB_Complex {
   static constexpr int cons_len_exact = 0;
   struct Record;
   bool skip(vm::CellSlice& cs) const override;
-  bool validate_skip(vm::CellSlice& cs, bool weak = false) const override;
+  bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override;
   bool unpack(vm::CellSlice& cs, Record& data) const;
   bool unpack_account_storage(vm::CellSlice& cs, unsigned long long& last_trans_lt, Ref<CellSlice>& balance, Ref<CellSlice>& state) const;
   bool cell_unpack(Ref<vm::Cell> cell_ref, Record& data) const;
@@ -2833,7 +2838,7 @@ struct AccountState final : TLB_Complex {
     Record_account_frozen(const td::BitArray<256>& _state_hash) : state_hash(_state_hash) {}
   };
   bool skip(vm::CellSlice& cs) const override;
-  bool validate_skip(vm::CellSlice& cs, bool weak = false) const override;
+  bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override;
   bool unpack(vm::CellSlice& cs, Record_account_uninit& data) const;
   bool unpack_account_uninit(vm::CellSlice& cs) const;
   bool cell_unpack(Ref<vm::Cell> cell_ref, Record_account_uninit& data) const;
@@ -2895,7 +2900,7 @@ struct AccountStatus final : TLB_Complex {
   bool skip(vm::CellSlice& cs) const override {
     return cs.advance(2);
   }
-  bool validate_skip(vm::CellSlice& cs, bool weak = false) const override {
+  bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override {
     return cs.advance(2);
   }
   bool fetch_enum_to(vm::CellSlice& cs, char& value) const;
@@ -2958,7 +2963,7 @@ struct ShardAccount final : TLB_Complex {
   bool skip(vm::CellSlice& cs) const override {
     return cs.advance_ext(0x10140);
   }
-  bool validate_skip(vm::CellSlice& cs, bool weak = false) const override;
+  bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override;
   bool unpack(vm::CellSlice& cs, Record& data) const;
   bool unpack_account_descr(vm::CellSlice& cs, Ref<Cell>& account, td::BitArray<256>& last_trans_hash, unsigned long long& last_trans_lt) const;
   bool cell_unpack(Ref<vm::Cell> cell_ref, Record& data) const;
@@ -3003,7 +3008,7 @@ struct DepthBalanceInfo final : TLB_Complex {
     Record(int _split_depth, Ref<CellSlice> _balance) : split_depth(_split_depth), balance(std::move(_balance)) {}
   };
   bool skip(vm::CellSlice& cs) const override;
-  bool validate_skip(vm::CellSlice& cs, bool weak = false) const override;
+  bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override;
   bool unpack(vm::CellSlice& cs, Record& data) const;
   bool unpack_depth_balance(vm::CellSlice& cs, int& split_depth, Ref<CellSlice>& balance) const;
   bool cell_unpack(Ref<vm::Cell> cell_ref, Record& data) const;
@@ -3038,7 +3043,7 @@ struct ShardAccounts final : TLB_Complex {
     Record(Ref<CellSlice> _x) : x(std::move(_x)) {}
   };
   bool skip(vm::CellSlice& cs) const override;
-  bool validate_skip(vm::CellSlice& cs, bool weak = false) const override;
+  bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override;
   bool unpack(vm::CellSlice& cs, Record& data) const;
   bool unpack_cons1(vm::CellSlice& cs, Ref<CellSlice>& x) const;
   bool cell_unpack(Ref<vm::Cell> cell_ref, Record& data) const;
@@ -3074,7 +3079,7 @@ struct Transaction_aux final : TLB_Complex {
     Record(Ref<CellSlice> _in_msg, Ref<CellSlice> _out_msgs) : in_msg(std::move(_in_msg)), out_msgs(std::move(_out_msgs)) {}
   };
   bool skip(vm::CellSlice& cs) const override;
-  bool validate_skip(vm::CellSlice& cs, bool weak = false) const override;
+  bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override;
   bool unpack(vm::CellSlice& cs, Record& data) const;
   bool unpack_cons1(vm::CellSlice& cs, Ref<CellSlice>& in_msg, Ref<CellSlice>& out_msgs) const;
   bool cell_unpack(Ref<vm::Cell> cell_ref, Record& data) const;
@@ -3105,7 +3110,7 @@ struct Transaction final : TLB_Complex {
   static constexpr unsigned char cons_tag[1] = { 7 };
   struct Record;
   bool skip(vm::CellSlice& cs) const override;
-  bool validate_skip(vm::CellSlice& cs, bool weak = false) const override;
+  bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override;
   bool unpack(vm::CellSlice& cs, Record& data) const;
   bool cell_unpack(Ref<vm::Cell> cell_ref, Record& data) const;
   bool pack(vm::CellBuilder& cb, const Record& data) const;
@@ -3160,7 +3165,7 @@ struct MERKLE_UPDATE final : TLB_Complex {
   bool skip(vm::CellSlice& cs) const override {
     return cs.advance_ext(0x20208);
   }
-  bool validate_skip(vm::CellSlice& cs, bool weak = false) const override;
+  bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override;
   bool unpack(vm::CellSlice& cs, Record& data) const;
   bool cell_unpack(Ref<vm::Cell> cell_ref, Record& data) const;
   bool pack(vm::CellBuilder& cb, const Record& data) const;
@@ -3208,7 +3213,7 @@ struct HASH_UPDATE final : TLB_Complex {
   bool skip(vm::CellSlice& cs) const override {
     return cs.advance(520);
   }
-  bool validate_skip(vm::CellSlice& cs, bool weak = false) const override;
+  bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override;
   bool unpack(vm::CellSlice& cs, Record& data) const;
   bool unpack_update_hashes(vm::CellSlice& cs, td::BitArray<256>& old_hash, td::BitArray<256>& new_hash) const;
   bool cell_unpack(Ref<vm::Cell> cell_ref, Record& data) const;
@@ -3237,7 +3242,7 @@ struct AccountBlock final : TLB_Complex {
   static constexpr unsigned char cons_tag[1] = { 5 };
   struct Record;
   bool skip(vm::CellSlice& cs) const override;
-  bool validate_skip(vm::CellSlice& cs, bool weak = false) const override;
+  bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override;
   bool unpack(vm::CellSlice& cs, Record& data) const;
   bool unpack_acc_trans(vm::CellSlice& cs, td::BitArray<256>& account_addr, Ref<CellSlice>& transactions, Ref<Cell>& state_update) const;
   bool cell_unpack(Ref<vm::Cell> cell_ref, Record& data) const;
@@ -3281,7 +3286,7 @@ struct ShardAccountBlocks final : TLB_Complex {
     Record(Ref<CellSlice> _x) : x(std::move(_x)) {}
   };
   bool skip(vm::CellSlice& cs) const override;
-  bool validate_skip(vm::CellSlice& cs, bool weak = false) const override;
+  bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override;
   bool unpack(vm::CellSlice& cs, Record& data) const;
   bool unpack_cons1(vm::CellSlice& cs, Ref<CellSlice>& x) const;
   bool cell_unpack(Ref<vm::Cell> cell_ref, Record& data) const;
@@ -3311,7 +3316,7 @@ struct TrStoragePhase final : TLB_Complex {
   static constexpr int cons_len_exact = 0;
   struct Record;
   bool skip(vm::CellSlice& cs) const override;
-  bool validate_skip(vm::CellSlice& cs, bool weak = false) const override;
+  bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override;
   bool unpack(vm::CellSlice& cs, Record& data) const;
   bool unpack_tr_phase_storage(vm::CellSlice& cs, Ref<CellSlice>& storage_fees_collected, Ref<CellSlice>& storage_fees_due, char& status_change) const;
   bool cell_unpack(Ref<vm::Cell> cell_ref, Record& data) const;
@@ -3359,7 +3364,7 @@ struct AccStatusChange final : TLB_Complex {
     typedef AccStatusChange type_class;
   };
   bool skip(vm::CellSlice& cs) const override;
-  bool validate_skip(vm::CellSlice& cs, bool weak = false) const override;
+  bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override;
   bool fetch_enum_to(vm::CellSlice& cs, char& value) const;
   bool store_enum_from(vm::CellBuilder& cb, int value) const;
   bool unpack(vm::CellSlice& cs, Record_acst_unchanged& data) const;
@@ -3413,7 +3418,7 @@ struct TrCreditPhase final : TLB_Complex {
     Record(Ref<CellSlice> _due_fees_collected, Ref<CellSlice> _credit) : due_fees_collected(std::move(_due_fees_collected)), credit(std::move(_credit)) {}
   };
   bool skip(vm::CellSlice& cs) const override;
-  bool validate_skip(vm::CellSlice& cs, bool weak = false) const override;
+  bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override;
   bool unpack(vm::CellSlice& cs, Record& data) const;
   bool unpack_tr_phase_credit(vm::CellSlice& cs, Ref<CellSlice>& due_fees_collected, Ref<CellSlice>& credit) const;
   bool cell_unpack(Ref<vm::Cell> cell_ref, Record& data) const;
@@ -3443,7 +3448,7 @@ struct TrComputePhase_aux final : TLB_Complex {
   static constexpr int cons_len_exact = 0;
   struct Record;
   bool skip(vm::CellSlice& cs) const override;
-  bool validate_skip(vm::CellSlice& cs, bool weak = false) const override;
+  bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override;
   bool unpack(vm::CellSlice& cs, Record& data) const;
   bool cell_unpack(Ref<vm::Cell> cell_ref, Record& data) const;
   bool pack(vm::CellBuilder& cb, const Record& data) const;
@@ -3490,7 +3495,7 @@ struct TrComputePhase final : TLB_Complex {
   };
   struct Record_tr_phase_compute_vm;
   bool skip(vm::CellSlice& cs) const override;
-  bool validate_skip(vm::CellSlice& cs, bool weak = false) const override;
+  bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override;
   bool unpack(vm::CellSlice& cs, Record_tr_phase_compute_skipped& data) const;
   bool unpack_tr_phase_compute_skipped(vm::CellSlice& cs, char& reason) const;
   bool cell_unpack(Ref<vm::Cell> cell_ref, Record_tr_phase_compute_skipped& data) const;
@@ -3548,7 +3553,7 @@ struct ComputeSkipReason final : TLB_Complex {
   bool skip(vm::CellSlice& cs) const override {
     return cs.advance(2);
   }
-  bool validate_skip(vm::CellSlice& cs, bool weak = false) const override;
+  bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override;
   bool fetch_enum_to(vm::CellSlice& cs, char& value) const;
   bool store_enum_from(vm::CellBuilder& cb, int value) const;
   bool unpack(vm::CellSlice& cs, Record_cskip_no_state& data) const;
@@ -3596,7 +3601,7 @@ struct TrActionPhase final : TLB_Complex {
   static constexpr int cons_len_exact = 0;
   struct Record;
   bool skip(vm::CellSlice& cs) const override;
-  bool validate_skip(vm::CellSlice& cs, bool weak = false) const override;
+  bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override;
   bool unpack(vm::CellSlice& cs, Record& data) const;
   bool cell_unpack(Ref<vm::Cell> cell_ref, Record& data) const;
   bool pack(vm::CellBuilder& cb, const Record& data) const;
@@ -3653,7 +3658,7 @@ struct TrBouncePhase final : TLB_Complex {
   };
   struct Record_tr_phase_bounce_ok;
   bool skip(vm::CellSlice& cs) const override;
-  bool validate_skip(vm::CellSlice& cs, bool weak = false) const override;
+  bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override;
   bool unpack(vm::CellSlice& cs, Record_tr_phase_bounce_negfunds& data) const;
   bool unpack_tr_phase_bounce_negfunds(vm::CellSlice& cs) const;
   bool cell_unpack(Ref<vm::Cell> cell_ref, Record_tr_phase_bounce_negfunds& data) const;
@@ -3713,7 +3718,7 @@ struct SplitMergeInfo final : TLB_Complex {
   bool skip(vm::CellSlice& cs) const override {
     return cs.advance(524);
   }
-  bool validate_skip(vm::CellSlice& cs, bool weak = false) const override {
+  bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override {
     return cs.advance(524);
   }
   bool unpack(vm::CellSlice& cs, Record& data) const;
@@ -3763,7 +3768,7 @@ struct TransactionDescr final : TLB_Complex {
   struct Record_trans_merge_prepare;
   struct Record_trans_merge_install;
   bool skip(vm::CellSlice& cs) const override;
-  bool validate_skip(vm::CellSlice& cs, bool weak = false) const override;
+  bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override;
   bool unpack(vm::CellSlice& cs, Record_trans_ord& data) const;
   bool cell_unpack(Ref<vm::Cell> cell_ref, Record_trans_ord& data) const;
   bool pack(vm::CellBuilder& cb, const Record_trans_ord& data) const;
@@ -3896,7 +3901,7 @@ struct SmartContractInfo final : TLB_Complex {
   static constexpr unsigned cons_tag[1] = { 0x76ef1ea };
   struct Record;
   bool skip(vm::CellSlice& cs) const override;
-  bool validate_skip(vm::CellSlice& cs, bool weak = false) const override;
+  bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override;
   bool unpack(vm::CellSlice& cs, Record& data) const;
   bool cell_unpack(Ref<vm::Cell> cell_ref, Record& data) const;
   bool pack(vm::CellBuilder& cb, const Record& data) const;
@@ -3941,7 +3946,7 @@ struct OutList final : TLB_Complex {
   };
   struct Record_out_list;
   bool skip(vm::CellSlice& cs) const override;
-  bool validate_skip(vm::CellSlice& cs, bool weak = false) const override;
+  bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override;
   bool unpack(vm::CellSlice& cs, Record_out_list_empty& data) const;
   bool unpack_out_list_empty(vm::CellSlice& cs) const;
   bool cell_unpack(Ref<vm::Cell> cell_ref, Record_out_list_empty& data) const;
@@ -3975,14 +3980,63 @@ struct OutList::Record_out_list {
   Record_out_list(Ref<Cell> _prev, Ref<CellSlice> _action) : n(-1), prev(std::move(_prev)), action(std::move(_action)) {}
 };
 
+//
+// headers for type `LibRef`
+//
+
+struct LibRef final : TLB_Complex {
+  enum { libref_hash, libref_ref };
+  static constexpr int cons_len_exact = 1;
+  struct Record_libref_hash {
+    typedef LibRef type_class;
+    td::BitArray<256> lib_hash;  	// lib_hash : bits256
+    Record_libref_hash() = default;
+    Record_libref_hash(const td::BitArray<256>& _lib_hash) : lib_hash(_lib_hash) {}
+  };
+  struct Record_libref_ref {
+    typedef LibRef type_class;
+    Ref<Cell> library;  	// library : ^Cell
+    Record_libref_ref() = default;
+    Record_libref_ref(Ref<Cell> _library) : library(std::move(_library)) {}
+  };
+  bool skip(vm::CellSlice& cs) const override;
+  bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override;
+  bool unpack(vm::CellSlice& cs, Record_libref_hash& data) const;
+  bool unpack_libref_hash(vm::CellSlice& cs, td::BitArray<256>& lib_hash) const;
+  bool cell_unpack(Ref<vm::Cell> cell_ref, Record_libref_hash& data) const;
+  bool cell_unpack_libref_hash(Ref<vm::Cell> cell_ref, td::BitArray<256>& lib_hash) const;
+  bool pack(vm::CellBuilder& cb, const Record_libref_hash& data) const;
+  bool pack_libref_hash(vm::CellBuilder& cb, td::BitArray<256> lib_hash) const;
+  bool cell_pack(Ref<vm::Cell>& cell_ref, const Record_libref_hash& data) const;
+  bool cell_pack_libref_hash(Ref<vm::Cell>& cell_ref, td::BitArray<256> lib_hash) const;
+  bool unpack(vm::CellSlice& cs, Record_libref_ref& data) const;
+  bool unpack_libref_ref(vm::CellSlice& cs, Ref<Cell>& library) const;
+  bool cell_unpack(Ref<vm::Cell> cell_ref, Record_libref_ref& data) const;
+  bool cell_unpack_libref_ref(Ref<vm::Cell> cell_ref, Ref<Cell>& library) const;
+  bool pack(vm::CellBuilder& cb, const Record_libref_ref& data) const;
+  bool pack_libref_ref(vm::CellBuilder& cb, Ref<Cell> library) const;
+  bool cell_pack(Ref<vm::Cell>& cell_ref, const Record_libref_ref& data) const;
+  bool cell_pack_libref_ref(Ref<vm::Cell>& cell_ref, Ref<Cell> library) const;
+  bool print_skip(PrettyPrinter& pp, vm::CellSlice& cs) const override;
+  std::ostream& print_type(std::ostream& os) const override {
+    return os << "LibRef";
+  }
+  int check_tag(const vm::CellSlice& cs) const override;
+  int get_tag(const vm::CellSlice& cs) const override {
+    return (int)cs.prefetch_ulong(1);
+  }
+};
+
+extern const LibRef t_LibRef;
+
 //
 // headers for type `OutAction`
 //
 
 struct OutAction final : TLB_Complex {
-  enum { action_send_msg, action_reserve_currency, action_set_code };
+  enum { action_send_msg, action_change_library, action_reserve_currency, action_set_code };
   static constexpr int cons_len_exact = 32;
-  static constexpr unsigned cons_tag[3] = { 0xec3c86d, 0x36e6b809, 0xad4de08eU };
+  static constexpr unsigned cons_tag[4] = { 0xec3c86d, 0x26fa1dd4, 0x36e6b809, 0xad4de08eU };
   struct Record_action_send_msg {
     typedef OutAction type_class;
     int mode;  	// mode : ## 8
@@ -4003,8 +4057,15 @@ struct OutAction final : TLB_Complex {
     Record_action_reserve_currency() = default;
     Record_action_reserve_currency(int _mode, Ref<CellSlice> _currency) : mode(_mode), currency(std::move(_currency)) {}
   };
+  struct Record_action_change_library {
+    typedef OutAction type_class;
+    int mode;  	// mode : ## 7
+    Ref<CellSlice> libref;  	// libref : LibRef
+    Record_action_change_library() = default;
+    Record_action_change_library(int _mode, Ref<CellSlice> _libref) : mode(_mode), libref(std::move(_libref)) {}
+  };
   bool skip(vm::CellSlice& cs) const override;
-  bool validate_skip(vm::CellSlice& cs, bool weak = false) const override;
+  bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override;
   bool unpack(vm::CellSlice& cs, Record_action_send_msg& data) const;
   bool unpack_action_send_msg(vm::CellSlice& cs, int& mode, Ref<Cell>& out_msg) const;
   bool cell_unpack(Ref<vm::Cell> cell_ref, Record_action_send_msg& data) const;
@@ -4029,13 +4090,21 @@ struct OutAction final : TLB_Complex {
   bool pack_action_reserve_currency(vm::CellBuilder& cb, int mode, Ref<CellSlice> currency) const;
   bool cell_pack(Ref<vm::Cell>& cell_ref, const Record_action_reserve_currency& data) const;
   bool cell_pack_action_reserve_currency(Ref<vm::Cell>& cell_ref, int mode, Ref<CellSlice> currency) const;
+  bool unpack(vm::CellSlice& cs, Record_action_change_library& data) const;
+  bool unpack_action_change_library(vm::CellSlice& cs, int& mode, Ref<CellSlice>& libref) const;
+  bool cell_unpack(Ref<vm::Cell> cell_ref, Record_action_change_library& data) const;
+  bool cell_unpack_action_change_library(Ref<vm::Cell> cell_ref, int& mode, Ref<CellSlice>& libref) const;
+  bool pack(vm::CellBuilder& cb, const Record_action_change_library& data) const;
+  bool pack_action_change_library(vm::CellBuilder& cb, int mode, Ref<CellSlice> libref) const;
+  bool cell_pack(Ref<vm::Cell>& cell_ref, const Record_action_change_library& data) const;
+  bool cell_pack_action_change_library(Ref<vm::Cell>& cell_ref, int mode, Ref<CellSlice> libref) const;
   bool print_skip(PrettyPrinter& pp, vm::CellSlice& cs) const override;
   std::ostream& print_type(std::ostream& os) const override {
     return os << "OutAction";
   }
   int check_tag(const vm::CellSlice& cs) const override;
   int get_tag(const vm::CellSlice& cs) const override {
-    return cs.bselect(3, 0x23);
+    return cs.bselect(4, 0x40d);
   }
 };
 
@@ -4056,7 +4125,7 @@ struct OutListNode final : TLB_Complex {
     Record(Ref<Cell> _prev, Ref<CellSlice> _action) : prev(std::move(_prev)), action(std::move(_action)) {}
   };
   bool skip(vm::CellSlice& cs) const override;
-  bool validate_skip(vm::CellSlice& cs, bool weak = false) const override;
+  bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override;
   bool unpack(vm::CellSlice& cs, Record& data) const;
   bool unpack_out_list_node(vm::CellSlice& cs, Ref<Cell>& prev, Ref<CellSlice>& action) const;
   bool cell_unpack(Ref<vm::Cell> cell_ref, Record& data) const;
@@ -4091,7 +4160,7 @@ struct ShardIdent final : TLB_Complex {
   bool skip(vm::CellSlice& cs) const override {
     return cs.advance(104);
   }
-  bool validate_skip(vm::CellSlice& cs, bool weak = false) const override;
+  bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override;
   bool unpack(vm::CellSlice& cs, Record& data) const;
   bool unpack_shard_ident(vm::CellSlice& cs, int& shard_pfx_bits, int& workchain_id, unsigned long long& shard_prefix) const;
   bool cell_unpack(Ref<vm::Cell> cell_ref, Record& data) const;
@@ -4135,7 +4204,7 @@ struct ExtBlkRef final : TLB_Complex {
   bool skip(vm::CellSlice& cs) const override {
     return cs.advance(608);
   }
-  bool validate_skip(vm::CellSlice& cs, bool weak = false) const override {
+  bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override {
     return cs.advance(608);
   }
   bool unpack(vm::CellSlice& cs, Record& data) const;
@@ -4178,7 +4247,7 @@ struct BlockIdExt final : TLB_Complex {
   bool skip(vm::CellSlice& cs) const override {
     return cs.advance(648);
   }
-  bool validate_skip(vm::CellSlice& cs, bool weak = false) const override;
+  bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override;
   bool unpack(vm::CellSlice& cs, Record& data) const;
   bool cell_unpack(Ref<vm::Cell> cell_ref, Record& data) const;
   bool pack(vm::CellBuilder& cb, const Record& data) const;
@@ -4224,7 +4293,7 @@ struct BlkMasterInfo final : TLB_Complex {
   bool skip(vm::CellSlice& cs) const override {
     return cs.advance(608);
   }
-  bool validate_skip(vm::CellSlice& cs, bool weak = false) const override {
+  bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override {
     return cs.advance(608);
   }
   bool unpack(vm::CellSlice& cs, Record& data) const;
@@ -4256,7 +4325,7 @@ struct ShardStateUnsplit_aux final : TLB_Complex {
   static constexpr int cons_len_exact = 0;
   struct Record;
   bool skip(vm::CellSlice& cs) const override;
-  bool validate_skip(vm::CellSlice& cs, bool weak = false) const override;
+  bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override;
   bool unpack(vm::CellSlice& cs, Record& data) const;
   bool cell_unpack(Ref<vm::Cell> cell_ref, Record& data) const;
   bool pack(vm::CellBuilder& cb, const Record& data) const;
@@ -4295,7 +4364,7 @@ struct ShardStateUnsplit final : TLB_Complex {
   static constexpr unsigned cons_tag[1] = { 0x9023afe2U };
   struct Record;
   bool skip(vm::CellSlice& cs) const override;
-  bool validate_skip(vm::CellSlice& cs, bool weak = false) const override;
+  bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override;
   bool unpack(vm::CellSlice& cs, Record& data) const;
   bool cell_unpack(Ref<vm::Cell> cell_ref, Record& data) const;
   bool pack(vm::CellBuilder& cb, const Record& data) const;
@@ -4352,7 +4421,7 @@ struct ShardState final : TLB_Complex {
     Record_split_state(Ref<Cell> _left, Ref<Cell> _right) : left(std::move(_left)), right(std::move(_right)) {}
   };
   bool skip(vm::CellSlice& cs) const override;
-  bool validate_skip(vm::CellSlice& cs, bool weak = false) const override;
+  bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override;
   bool unpack(vm::CellSlice& cs, Record_cons1& data) const;
   bool unpack_cons1(vm::CellSlice& cs, Ref<CellSlice>& x) const;
   bool cell_unpack(Ref<vm::Cell> cell_ref, Record_cons1& data) const;
@@ -4396,7 +4465,7 @@ struct LibDescr final : TLB_Complex {
     Record(Ref<Cell> _lib, Ref<CellSlice> _publishers) : lib(std::move(_lib)), publishers(std::move(_publishers)) {}
   };
   bool skip(vm::CellSlice& cs) const override;
-  bool validate_skip(vm::CellSlice& cs, bool weak = false) const override;
+  bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override;
   bool unpack(vm::CellSlice& cs, Record& data) const;
   bool unpack_shared_lib_descr(vm::CellSlice& cs, Ref<Cell>& lib, Ref<CellSlice>& publishers) const;
   bool cell_unpack(Ref<vm::Cell> cell_ref, Record& data) const;
@@ -4427,7 +4496,7 @@ struct BlockInfo final : TLB_Complex {
   static constexpr unsigned cons_tag[1] = { 0x9bc7a987U };
   struct Record;
   bool skip(vm::CellSlice& cs) const override;
-  bool validate_skip(vm::CellSlice& cs, bool weak = false) const override;
+  bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override;
   bool unpack(vm::CellSlice& cs, Record& data) const;
   bool cell_unpack(Ref<vm::Cell> cell_ref, Record& data) const;
   bool pack(vm::CellBuilder& cb, const Record& data) const;
@@ -4496,7 +4565,7 @@ struct BlkPrevInfo final : TLB_Complex {
     Record_prev_blks_info(Ref<Cell> _prev1, Ref<Cell> _prev2) : prev1(std::move(_prev1)), prev2(std::move(_prev2)) {}
   };
   bool skip(vm::CellSlice& cs) const override;
-  bool validate_skip(vm::CellSlice& cs, bool weak = false) const override;
+  bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override;
   bool unpack(vm::CellSlice& cs, Record_prev_blk_info& data) const;
   bool unpack_prev_blk_info(vm::CellSlice& cs, Ref<CellSlice>& prev) const;
   bool cell_unpack(Ref<vm::Cell> cell_ref, Record_prev_blk_info& data) const;
@@ -4536,7 +4605,7 @@ struct Block final : TLB_Complex {
   bool skip(vm::CellSlice& cs) const override {
     return cs.advance_ext(0x40040);
   }
-  bool validate_skip(vm::CellSlice& cs, bool weak = false) const override;
+  bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override;
   bool unpack(vm::CellSlice& cs, Record& data) const;
   bool cell_unpack(Ref<vm::Cell> cell_ref, Record& data) const;
   bool pack(vm::CellBuilder& cb, const Record& data) const;
@@ -4574,7 +4643,7 @@ struct BlockExtra final : TLB_Complex {
   static constexpr unsigned cons_tag[1] = { 0x4a33f6fd };
   struct Record;
   bool skip(vm::CellSlice& cs) const override;
-  bool validate_skip(vm::CellSlice& cs, bool weak = false) const override;
+  bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override;
   bool unpack(vm::CellSlice& cs, Record& data) const;
   bool cell_unpack(Ref<vm::Cell> cell_ref, Record& data) const;
   bool pack(vm::CellBuilder& cb, const Record& data) const;
@@ -4612,7 +4681,7 @@ struct ValueFlow_aux final : TLB_Complex {
   static constexpr int cons_len_exact = 0;
   struct Record;
   bool skip(vm::CellSlice& cs) const override;
-  bool validate_skip(vm::CellSlice& cs, bool weak = false) const override;
+  bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override;
   bool unpack(vm::CellSlice& cs, Record& data) const;
   bool cell_unpack(Ref<vm::Cell> cell_ref, Record& data) const;
   bool pack(vm::CellBuilder& cb, const Record& data) const;
@@ -4648,7 +4717,7 @@ struct ValueFlow_aux1 final : TLB_Complex {
   static constexpr int cons_len_exact = 0;
   struct Record;
   bool skip(vm::CellSlice& cs) const override;
-  bool validate_skip(vm::CellSlice& cs, bool weak = false) const override;
+  bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override;
   bool unpack(vm::CellSlice& cs, Record& data) const;
   bool cell_unpack(Ref<vm::Cell> cell_ref, Record& data) const;
   bool pack(vm::CellBuilder& cb, const Record& data) const;
@@ -4685,7 +4754,7 @@ struct ValueFlow final : TLB_Complex {
   static constexpr unsigned cons_tag[1] = { 0xb8e48dfbU };
   struct Record;
   bool skip(vm::CellSlice& cs) const override;
-  bool validate_skip(vm::CellSlice& cs, bool weak = false) const override;
+  bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override;
   bool unpack(vm::CellSlice& cs, Record& data) const;
   bool cell_unpack(Ref<vm::Cell> cell_ref, Record& data) const;
   bool pack(vm::CellBuilder& cb, const Record& data) const;
@@ -4734,7 +4803,7 @@ struct BinTree final : TLB_Complex {
     Record_bt_fork(Ref<Cell> _left, Ref<Cell> _right) : left(std::move(_left)), right(std::move(_right)) {}
   };
   bool skip(vm::CellSlice& cs) const override;
-  bool validate_skip(vm::CellSlice& cs, bool weak = false) const override;
+  bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override;
   bool unpack(vm::CellSlice& cs, Record_bt_leaf& data) const;
   bool unpack_bt_leaf(vm::CellSlice& cs, Ref<CellSlice>& leaf) const;
   bool cell_unpack(Ref<vm::Cell> cell_ref, Record_bt_leaf& data) const;
@@ -4787,7 +4856,7 @@ struct FutureSplitMerge final : TLB_Complex {
     Record_fsm_merge(unsigned _merge_utime, unsigned _interval) : merge_utime(_merge_utime), interval(_interval) {}
   };
   bool skip(vm::CellSlice& cs) const override;
-  bool validate_skip(vm::CellSlice& cs, bool weak = false) const override;
+  bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override;
   bool unpack(vm::CellSlice& cs, Record_fsm_none& data) const;
   bool unpack_fsm_none(vm::CellSlice& cs) const;
   bool cell_unpack(Ref<vm::Cell> cell_ref, Record_fsm_none& data) const;
@@ -4834,7 +4903,7 @@ struct ShardDescr final : TLB_Complex {
   static constexpr unsigned char cons_tag[1] = { 11 };
   struct Record;
   bool skip(vm::CellSlice& cs) const override;
-  bool validate_skip(vm::CellSlice& cs, bool weak = false) const override;
+  bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override;
   bool unpack(vm::CellSlice& cs, Record& data) const;
   bool cell_unpack(Ref<vm::Cell> cell_ref, Record& data) const;
   bool pack(vm::CellBuilder& cb, const Record& data) const;
@@ -4890,7 +4959,7 @@ struct ShardHashes final : TLB_Complex {
     Record(Ref<CellSlice> _x) : x(std::move(_x)) {}
   };
   bool skip(vm::CellSlice& cs) const override;
-  bool validate_skip(vm::CellSlice& cs, bool weak = false) const override;
+  bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override;
   bool unpack(vm::CellSlice& cs, Record& data) const;
   bool unpack_cons1(vm::CellSlice& cs, Ref<CellSlice>& x) const;
   bool cell_unpack(Ref<vm::Cell> cell_ref, Record& data) const;
@@ -4929,7 +4998,7 @@ struct BinTreeAug final : TLB_Complex {
   };
   struct Record_bta_fork;
   bool skip(vm::CellSlice& cs) const override;
-  bool validate_skip(vm::CellSlice& cs, bool weak = false) const override;
+  bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override;
   bool unpack(vm::CellSlice& cs, Record_bta_leaf& data) const;
   bool unpack_bta_leaf(vm::CellSlice& cs, Ref<CellSlice>& extra, Ref<CellSlice>& leaf) const;
   bool cell_unpack(Ref<vm::Cell> cell_ref, Record_bta_leaf& data) const;
@@ -4980,7 +5049,7 @@ struct ShardFeeCreated final : TLB_Complex {
     Record(Ref<CellSlice> _fees, Ref<CellSlice> _create) : fees(std::move(_fees)), create(std::move(_create)) {}
   };
   bool skip(vm::CellSlice& cs) const override;
-  bool validate_skip(vm::CellSlice& cs, bool weak = false) const override;
+  bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override;
   bool unpack(vm::CellSlice& cs, Record& data) const;
   bool unpack_cons1(vm::CellSlice& cs, Ref<CellSlice>& fees, Ref<CellSlice>& create) const;
   bool cell_unpack(Ref<vm::Cell> cell_ref, Record& data) const;
@@ -5015,7 +5084,7 @@ struct ShardFees final : TLB_Complex {
     Record(Ref<CellSlice> _x) : x(std::move(_x)) {}
   };
   bool skip(vm::CellSlice& cs) const override;
-  bool validate_skip(vm::CellSlice& cs, bool weak = false) const override;
+  bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override;
   bool unpack(vm::CellSlice& cs, Record& data) const;
   bool unpack_cons1(vm::CellSlice& cs, Ref<CellSlice>& x) const;
   bool cell_unpack(Ref<vm::Cell> cell_ref, Record& data) const;
@@ -5056,7 +5125,7 @@ struct ConfigParams final : TLB_Complex {
   bool skip(vm::CellSlice& cs) const override {
     return cs.advance_ext(0x10100);
   }
-  bool validate_skip(vm::CellSlice& cs, bool weak = false) const override;
+  bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override;
   bool unpack(vm::CellSlice& cs, Record& data) const;
   bool unpack_cons1(vm::CellSlice& cs, td::BitArray<256>& config_addr, Ref<Cell>& config) const;
   bool cell_unpack(Ref<vm::Cell> cell_ref, Record& data) const;
@@ -5091,7 +5160,7 @@ struct ValidatorInfo final : TLB_Complex {
   bool skip(vm::CellSlice& cs) const override {
     return cs.advance(65);
   }
-  bool validate_skip(vm::CellSlice& cs, bool weak = false) const override {
+  bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override {
     return cs.advance(65);
   }
   bool unpack(vm::CellSlice& cs, Record& data) const;
@@ -5143,7 +5212,7 @@ struct ValidatorBaseInfo final : TLB_Complex {
   bool skip(vm::CellSlice& cs) const override {
     return cs.advance(64);
   }
-  bool validate_skip(vm::CellSlice& cs, bool weak = false) const override {
+  bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override {
     return cs.advance(64);
   }
   bool unpack(vm::CellSlice& cs, Record& data) const;
@@ -5186,7 +5255,7 @@ struct KeyMaxLt final : TLB_Complex {
   bool skip(vm::CellSlice& cs) const override {
     return cs.advance(65);
   }
-  bool validate_skip(vm::CellSlice& cs, bool weak = false) const override {
+  bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override {
     return cs.advance(65);
   }
   bool unpack(vm::CellSlice& cs, Record& data) const;
@@ -5229,7 +5298,7 @@ struct KeyExtBlkRef final : TLB_Complex {
   bool skip(vm::CellSlice& cs) const override {
     return cs.advance(609);
   }
-  bool validate_skip(vm::CellSlice& cs, bool weak = false) const override {
+  bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override {
     return cs.advance(609);
   }
   bool unpack(vm::CellSlice& cs, Record& data) const;
@@ -5266,7 +5335,7 @@ struct OldMcBlocksInfo final : TLB_Complex {
     Record(Ref<CellSlice> _x) : x(std::move(_x)) {}
   };
   bool skip(vm::CellSlice& cs) const override;
-  bool validate_skip(vm::CellSlice& cs, bool weak = false) const override;
+  bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override;
   bool unpack(vm::CellSlice& cs, Record& data) const;
   bool unpack_cons1(vm::CellSlice& cs, Ref<CellSlice>& x) const;
   bool cell_unpack(Ref<vm::Cell> cell_ref, Record& data) const;
@@ -5301,7 +5370,7 @@ struct Counters final : TLB_Complex {
   bool skip(vm::CellSlice& cs) const override {
     return cs.advance(224);
   }
-  bool validate_skip(vm::CellSlice& cs, bool weak = false) const override {
+  bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override {
     return cs.advance(224);
   }
   bool unpack(vm::CellSlice& cs, Record& data) const;
@@ -5351,7 +5420,7 @@ struct CreatorStats final : TLB_Complex {
   bool skip(vm::CellSlice& cs) const override {
     return cs.advance(452);
   }
-  bool validate_skip(vm::CellSlice& cs, bool weak = false) const override;
+  bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override;
   bool unpack(vm::CellSlice& cs, Record& data) const;
   bool unpack_creator_info(vm::CellSlice& cs, Ref<CellSlice>& mc_blocks, Ref<CellSlice>& shard_blocks) const;
   bool cell_unpack(Ref<vm::Cell> cell_ref, Record& data) const;
@@ -5377,32 +5446,46 @@ extern const CreatorStats t_CreatorStats;
 //
 
 struct BlockCreateStats final : TLB_Complex {
-  enum { block_create_stats };
+  enum { block_create_stats, block_create_stats_ext };
   static constexpr int cons_len_exact = 8;
-  static constexpr unsigned char cons_tag[1] = { 23 };
-  struct Record {
+  static constexpr unsigned char cons_tag[2] = { 23, 0x34 };
+  struct Record_block_create_stats {
     typedef BlockCreateStats type_class;
     Ref<CellSlice> counters;  	// counters : HashmapE 256 CreatorStats
-    Record() = default;
-    Record(Ref<CellSlice> _counters) : counters(std::move(_counters)) {}
+    Record_block_create_stats() = default;
+    Record_block_create_stats(Ref<CellSlice> _counters) : counters(std::move(_counters)) {}
+  };
+  struct Record_block_create_stats_ext {
+    typedef BlockCreateStats type_class;
+    Ref<CellSlice> counters;  	// counters : HashmapAugE 256 CreatorStats uint32
+    Record_block_create_stats_ext() = default;
+    Record_block_create_stats_ext(Ref<CellSlice> _counters) : counters(std::move(_counters)) {}
   };
   bool skip(vm::CellSlice& cs) const override;
-  bool validate_skip(vm::CellSlice& cs, bool weak = false) const override;
-  bool unpack(vm::CellSlice& cs, Record& data) const;
+  bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override;
+  bool unpack(vm::CellSlice& cs, Record_block_create_stats& data) const;
   bool unpack_block_create_stats(vm::CellSlice& cs, Ref<CellSlice>& counters) const;
-  bool cell_unpack(Ref<vm::Cell> cell_ref, Record& data) const;
+  bool cell_unpack(Ref<vm::Cell> cell_ref, Record_block_create_stats& data) const;
   bool cell_unpack_block_create_stats(Ref<vm::Cell> cell_ref, Ref<CellSlice>& counters) const;
-  bool pack(vm::CellBuilder& cb, const Record& data) const;
+  bool pack(vm::CellBuilder& cb, const Record_block_create_stats& data) const;
   bool pack_block_create_stats(vm::CellBuilder& cb, Ref<CellSlice> counters) const;
-  bool cell_pack(Ref<vm::Cell>& cell_ref, const Record& data) const;
+  bool cell_pack(Ref<vm::Cell>& cell_ref, const Record_block_create_stats& data) const;
   bool cell_pack_block_create_stats(Ref<vm::Cell>& cell_ref, Ref<CellSlice> counters) const;
+  bool unpack(vm::CellSlice& cs, Record_block_create_stats_ext& data) const;
+  bool unpack_block_create_stats_ext(vm::CellSlice& cs, Ref<CellSlice>& counters) const;
+  bool cell_unpack(Ref<vm::Cell> cell_ref, Record_block_create_stats_ext& data) const;
+  bool cell_unpack_block_create_stats_ext(Ref<vm::Cell> cell_ref, Ref<CellSlice>& counters) const;
+  bool pack(vm::CellBuilder& cb, const Record_block_create_stats_ext& data) const;
+  bool pack_block_create_stats_ext(vm::CellBuilder& cb, Ref<CellSlice> counters) const;
+  bool cell_pack(Ref<vm::Cell>& cell_ref, const Record_block_create_stats_ext& data) const;
+  bool cell_pack_block_create_stats_ext(Ref<vm::Cell>& cell_ref, Ref<CellSlice> counters) const;
   bool print_skip(PrettyPrinter& pp, vm::CellSlice& cs) const override;
   std::ostream& print_type(std::ostream& os) const override {
     return os << "BlockCreateStats";
   }
   int check_tag(const vm::CellSlice& cs) const override;
   int get_tag(const vm::CellSlice& cs) const override {
-    return 0;
+    return cs.bselect(3, 3);
   }
 };
 
@@ -5417,7 +5500,7 @@ struct McStateExtra_aux final : TLB_Complex {
   static constexpr int cons_len_exact = 0;
   struct Record;
   bool skip(vm::CellSlice& cs) const override;
-  bool validate_skip(vm::CellSlice& cs, bool weak = false) const override;
+  bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override;
   bool unpack(vm::CellSlice& cs, Record& data) const;
   bool cell_unpack(Ref<vm::Cell> cell_ref, Record& data) const;
   bool pack(vm::CellBuilder& cb, const Record& data) const;
@@ -5456,7 +5539,7 @@ struct McStateExtra final : TLB_Complex {
   static constexpr unsigned short cons_tag[1] = { 0xcc26 };
   struct Record;
   bool skip(vm::CellSlice& cs) const override;
-  bool validate_skip(vm::CellSlice& cs, bool weak = false) const override;
+  bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override;
   bool unpack(vm::CellSlice& cs, Record& data) const;
   bool cell_unpack(Ref<vm::Cell> cell_ref, Record& data) const;
   bool pack(vm::CellBuilder& cb, const Record& data) const;
@@ -5503,7 +5586,7 @@ struct SigPubKey final : TLB_Complex {
   bool skip(vm::CellSlice& cs) const override {
     return cs.advance(288);
   }
-  bool validate_skip(vm::CellSlice& cs, bool weak = false) const override;
+  bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override;
   bool unpack(vm::CellSlice& cs, Record& data) const;
   bool unpack_ed25519_pubkey(vm::CellSlice& cs, td::BitArray<256>& pubkey) const;
   bool cell_unpack(Ref<vm::Cell> cell_ref, Record& data) const;
@@ -5545,7 +5628,7 @@ struct CryptoSignatureSimple final : TLB_Complex {
   bool skip(vm::CellSlice& cs) const override {
     return cs.advance(516);
   }
-  bool validate_skip(vm::CellSlice& cs, bool weak = false) const override;
+  bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override;
   bool unpack(vm::CellSlice& cs, Record& data) const;
   bool unpack_ed25519_signature(vm::CellSlice& cs, td::BitArray<256>& R, td::BitArray<256>& s) const;
   bool cell_unpack(Ref<vm::Cell> cell_ref, Record& data) const;
@@ -5581,7 +5664,7 @@ struct CryptoSignaturePair final : TLB_Complex {
     Record(const td::BitArray<256>& _node_id_short, Ref<CellSlice> _sign) : node_id_short(_node_id_short), sign(std::move(_sign)) {}
   };
   bool skip(vm::CellSlice& cs) const override;
-  bool validate_skip(vm::CellSlice& cs, bool weak = false) const override;
+  bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override;
   bool unpack(vm::CellSlice& cs, Record& data) const;
   bool unpack_sig_pair(vm::CellSlice& cs, td::BitArray<256>& node_id_short, Ref<CellSlice>& sign) const;
   bool cell_unpack(Ref<vm::Cell> cell_ref, Record& data) const;
@@ -5617,7 +5700,7 @@ struct Certificate final : TLB_Complex {
   bool skip(vm::CellSlice& cs) const override {
     return cs.advance(356);
   }
-  bool validate_skip(vm::CellSlice& cs, bool weak = false) const override;
+  bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override;
   bool unpack(vm::CellSlice& cs, Record& data) const;
   bool unpack_certificate(vm::CellSlice& cs, Ref<CellSlice>& temp_key, unsigned& valid_since, unsigned& valid_until) const;
   bool cell_unpack(Ref<vm::Cell> cell_ref, Record& data) const;
@@ -5667,7 +5750,7 @@ struct CertificateEnv final : TLB_Complex {
   bool skip(vm::CellSlice& cs) const override {
     return cs.advance(384);
   }
-  bool validate_skip(vm::CellSlice& cs, bool weak = false) const override;
+  bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override;
   bool unpack(vm::CellSlice& cs, Record& data) const;
   bool unpack_certificate_env(vm::CellSlice& cs, Ref<CellSlice>& certificate) const;
   bool cell_unpack(Ref<vm::Cell> cell_ref, Record& data) const;
@@ -5703,7 +5786,7 @@ struct SignedCertificate final : TLB_Complex {
     Record(Ref<CellSlice> _certificate, Ref<CellSlice> _certificate_signature) : certificate(std::move(_certificate)), certificate_signature(std::move(_certificate_signature)) {}
   };
   bool skip(vm::CellSlice& cs) const override;
-  bool validate_skip(vm::CellSlice& cs, bool weak = false) const override;
+  bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override;
   bool unpack(vm::CellSlice& cs, Record& data) const;
   bool unpack_signed_certificate(vm::CellSlice& cs, Ref<CellSlice>& certificate, Ref<CellSlice>& certificate_signature) const;
   bool cell_unpack(Ref<vm::Cell> cell_ref, Record& data) const;
@@ -5746,7 +5829,7 @@ struct CryptoSignature final : TLB_Complex {
     Record_chained_signature(Ref<Cell> _signed_cert, Ref<CellSlice> _temp_key_signature) : signed_cert(std::move(_signed_cert)), temp_key_signature(std::move(_temp_key_signature)) {}
   };
   bool skip(vm::CellSlice& cs) const override;
-  bool validate_skip(vm::CellSlice& cs, bool weak = false) const override;
+  bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override;
   bool unpack(vm::CellSlice& cs, Record_cons1& data) const;
   bool unpack_cons1(vm::CellSlice& cs, Ref<CellSlice>& x) const;
   bool cell_unpack(Ref<vm::Cell> cell_ref, Record_cons1& data) const;
@@ -5784,7 +5867,7 @@ struct McBlockExtra_aux final : TLB_Complex {
   static constexpr int cons_len_exact = 0;
   struct Record;
   bool skip(vm::CellSlice& cs) const override;
-  bool validate_skip(vm::CellSlice& cs, bool weak = false) const override;
+  bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override;
   bool unpack(vm::CellSlice& cs, Record& data) const;
   bool unpack_cons1(vm::CellSlice& cs, Ref<CellSlice>& prev_blk_signatures, Ref<CellSlice>& recover_create_msg, Ref<CellSlice>& mint_msg) const;
   bool cell_unpack(Ref<vm::Cell> cell_ref, Record& data) const;
@@ -5824,7 +5907,7 @@ struct McBlockExtra final : TLB_Complex {
   static constexpr unsigned short cons_tag[1] = { 0xcca5 };
   struct Record;
   bool skip(vm::CellSlice& cs) const override;
-  bool validate_skip(vm::CellSlice& cs, bool weak = false) const override;
+  bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override;
   bool unpack(vm::CellSlice& cs, Record& data) const;
   bool cell_unpack(Ref<vm::Cell> cell_ref, Record& data) const;
   bool pack(vm::CellBuilder& cb, const Record& data) const;
@@ -5869,7 +5952,7 @@ struct ValidatorDescr final : TLB_Complex {
   };
   struct Record_validator_addr;
   bool skip(vm::CellSlice& cs) const override;
-  bool validate_skip(vm::CellSlice& cs, bool weak = false) const override;
+  bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override;
   bool unpack(vm::CellSlice& cs, Record_validator& data) const;
   bool unpack_validator(vm::CellSlice& cs, Ref<CellSlice>& public_key, unsigned long long& weight) const;
   bool cell_unpack(Ref<vm::Cell> cell_ref, Record_validator& data) const;
@@ -5918,7 +6001,7 @@ struct ValidatorSet final : TLB_Complex {
   struct Record_validators;
   struct Record_validators_ext;
   bool skip(vm::CellSlice& cs) const override;
-  bool validate_skip(vm::CellSlice& cs, bool weak = false) const override;
+  bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override;
   bool unpack(vm::CellSlice& cs, Record_validators& data) const;
   bool cell_unpack(Ref<vm::Cell> cell_ref, Record_validators& data) const;
   bool pack(vm::CellBuilder& cb, const Record_validators& data) const;
@@ -5981,7 +6064,7 @@ struct GlobalVersion final : TLB_Complex {
   bool skip(vm::CellSlice& cs) const override {
     return cs.advance(104);
   }
-  bool validate_skip(vm::CellSlice& cs, bool weak = false) const override;
+  bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override;
   bool unpack(vm::CellSlice& cs, Record& data) const;
   bool unpack_capabilities(vm::CellSlice& cs, unsigned& version, unsigned long long& capabilities) const;
   bool cell_unpack(Ref<vm::Cell> cell_ref, Record& data) const;
@@ -6020,7 +6103,7 @@ struct WorkchainFormat final : TLB_Complex {
   };
   struct Record_wfmt_ext;
   bool skip(vm::CellSlice& cs) const override;
-  bool validate_skip(vm::CellSlice& cs, bool weak = false) const override;
+  bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override;
   bool unpack(vm::CellSlice& cs, Record_wfmt_basic& data) const;
   bool unpack_wfmt_basic(vm::CellSlice& cs, int& vm_version, unsigned long long& vm_mode) const;
   bool cell_unpack(Ref<vm::Cell> cell_ref, Record_wfmt_basic& data) const;
@@ -6063,7 +6146,7 @@ struct WorkchainDescr final : TLB_Complex {
   static constexpr unsigned char cons_tag[1] = { 0xa6 };
   struct Record;
   bool skip(vm::CellSlice& cs) const override;
-  bool validate_skip(vm::CellSlice& cs, bool weak = false) const override;
+  bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override;
   bool unpack(vm::CellSlice& cs, Record& data) const;
   bool cell_unpack(Ref<vm::Cell> cell_ref, Record& data) const;
   bool pack(vm::CellBuilder& cb, const Record& data) const;
@@ -6114,7 +6197,7 @@ struct BlockCreateFees final : TLB_Complex {
     Record(Ref<CellSlice> _masterchain_block_fee, Ref<CellSlice> _basechain_block_fee) : masterchain_block_fee(std::move(_masterchain_block_fee)), basechain_block_fee(std::move(_basechain_block_fee)) {}
   };
   bool skip(vm::CellSlice& cs) const override;
-  bool validate_skip(vm::CellSlice& cs, bool weak = false) const override;
+  bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override;
   bool unpack(vm::CellSlice& cs, Record& data) const;
   bool unpack_block_grams_created(vm::CellSlice& cs, Ref<CellSlice>& masterchain_block_fee, Ref<CellSlice>& basechain_block_fee) const;
   bool cell_unpack(Ref<vm::Cell> cell_ref, Record& data) const;
@@ -6150,7 +6233,7 @@ struct StoragePrices final : TLB_Complex {
   bool skip(vm::CellSlice& cs) const override {
     return cs.advance(296);
   }
-  bool validate_skip(vm::CellSlice& cs, bool weak = false) const override;
+  bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override;
   bool unpack(vm::CellSlice& cs, Record& data) const;
   bool cell_unpack(Ref<vm::Cell> cell_ref, Record& data) const;
   bool pack(vm::CellBuilder& cb, const Record& data) const;
@@ -6190,7 +6273,7 @@ struct GasLimitsPrices final : TLB_Complex {
   struct Record_gas_prices_ext;
   struct Record_gas_flat_pfx;
   bool skip(vm::CellSlice& cs) const override;
-  bool validate_skip(vm::CellSlice& cs, bool weak = false) const override;
+  bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override;
   bool unpack(vm::CellSlice& cs, Record_gas_prices& data) const;
   bool cell_unpack(Ref<vm::Cell> cell_ref, Record_gas_prices& data) const;
   bool pack(vm::CellBuilder& cb, const Record_gas_prices& data) const;
@@ -6266,7 +6349,7 @@ struct ParamLimits final : TLB_Complex {
   bool skip(vm::CellSlice& cs) const override {
     return cs.advance(104);
   }
-  bool validate_skip(vm::CellSlice& cs, bool weak = false) const override;
+  bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override;
   bool unpack(vm::CellSlice& cs, Record& data) const;
   bool unpack_param_limits(vm::CellSlice& cs, int& underload, int& soft_limit, int& hard_limit) const;
   bool cell_unpack(Ref<vm::Cell> cell_ref, Record& data) const;
@@ -6311,7 +6394,7 @@ struct BlockLimits final : TLB_Complex {
   bool skip(vm::CellSlice& cs) const override {
     return cs.advance(320);
   }
-  bool validate_skip(vm::CellSlice& cs, bool weak = false) const override;
+  bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override;
   bool unpack(vm::CellSlice& cs, Record& data) const;
   bool unpack_block_limits(vm::CellSlice& cs, Ref<CellSlice>& bytes, Ref<CellSlice>& gas, Ref<CellSlice>& lt_delta) const;
   bool cell_unpack(Ref<vm::Cell> cell_ref, Record& data) const;
@@ -6356,7 +6439,7 @@ struct MsgForwardPrices final : TLB_Complex {
   bool skip(vm::CellSlice& cs) const override {
     return cs.advance(264);
   }
-  bool validate_skip(vm::CellSlice& cs, bool weak = false) const override;
+  bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override;
   bool unpack(vm::CellSlice& cs, Record& data) const;
   bool cell_unpack(Ref<vm::Cell> cell_ref, Record& data) const;
   bool pack(vm::CellBuilder& cb, const Record& data) const;
@@ -6400,7 +6483,7 @@ struct CatchainConfig final : TLB_Complex {
   bool skip(vm::CellSlice& cs) const override {
     return cs.advance(136);
   }
-  bool validate_skip(vm::CellSlice& cs, bool weak = false) const override;
+  bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override;
   bool unpack(vm::CellSlice& cs, Record& data) const;
   bool cell_unpack(Ref<vm::Cell> cell_ref, Record& data) const;
   bool pack(vm::CellBuilder& cb, const Record& data) const;
@@ -6442,7 +6525,7 @@ struct ConsensusConfig final : TLB_Complex {
   bool skip(vm::CellSlice& cs) const override {
     return cs.advance(264);
   }
-  bool validate_skip(vm::CellSlice& cs, bool weak = false) const override;
+  bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override;
   bool unpack(vm::CellSlice& cs, Record& data) const;
   bool cell_unpack(Ref<vm::Cell> cell_ref, Record& data) const;
   bool pack(vm::CellBuilder& cb, const Record& data) const;
@@ -6488,7 +6571,7 @@ struct ValidatorTempKey final : TLB_Complex {
   bool skip(vm::CellSlice& cs) const override {
     return cs.advance(612);
   }
-  bool validate_skip(vm::CellSlice& cs, bool weak = false) const override;
+  bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override;
   bool unpack(vm::CellSlice& cs, Record& data) const;
   bool cell_unpack(Ref<vm::Cell> cell_ref, Record& data) const;
   bool pack(vm::CellBuilder& cb, const Record& data) const;
@@ -6531,7 +6614,7 @@ struct ValidatorSignedTempKey final : TLB_Complex {
     Record(Ref<Cell> _key, Ref<CellSlice> _signature) : key(std::move(_key)), signature(std::move(_signature)) {}
   };
   bool skip(vm::CellSlice& cs) const override;
-  bool validate_skip(vm::CellSlice& cs, bool weak = false) const override;
+  bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override;
   bool unpack(vm::CellSlice& cs, Record& data) const;
   bool unpack_signed_temp_key(vm::CellSlice& cs, Ref<Cell>& key, Ref<CellSlice>& signature) const;
   bool cell_unpack(Ref<vm::Cell> cell_ref, Record& data) const;
@@ -6734,7 +6817,7 @@ struct ConfigParam final : TLB_Complex {
     Record_cons39(Ref<CellSlice> _x) : x(std::move(_x)) {}
   };
   bool skip(vm::CellSlice& cs) const override;
-  bool validate_skip(vm::CellSlice& cs, bool weak = false) const override;
+  bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override;
   bool unpack(vm::CellSlice& cs, Record_cons0& data) const;
   bool unpack_cons0(vm::CellSlice& cs, td::BitArray<256>& config_addr) const;
   bool cell_unpack(Ref<vm::Cell> cell_ref, Record_cons0& data) const;
@@ -7021,7 +7104,7 @@ struct BlockSignaturesPure final : TLB_Complex {
   static constexpr int cons_len_exact = 0;
   struct Record;
   bool skip(vm::CellSlice& cs) const override;
-  bool validate_skip(vm::CellSlice& cs, bool weak = false) const override;
+  bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override;
   bool unpack(vm::CellSlice& cs, Record& data) const;
   bool unpack_block_signatures_pure(vm::CellSlice& cs, unsigned& sig_count, unsigned long long& sig_weight, Ref<CellSlice>& signatures) const;
   bool cell_unpack(Ref<vm::Cell> cell_ref, Record& data) const;
@@ -7067,7 +7150,7 @@ struct BlockSignatures final : TLB_Complex {
     Record(Ref<CellSlice> _validator_info, Ref<CellSlice> _pure_signatures) : validator_info(std::move(_validator_info)), pure_signatures(std::move(_pure_signatures)) {}
   };
   bool skip(vm::CellSlice& cs) const override;
-  bool validate_skip(vm::CellSlice& cs, bool weak = false) const override;
+  bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override;
   bool unpack(vm::CellSlice& cs, Record& data) const;
   bool unpack_block_signatures(vm::CellSlice& cs, Ref<CellSlice>& validator_info, Ref<CellSlice>& pure_signatures) const;
   bool cell_unpack(Ref<vm::Cell> cell_ref, Record& data) const;
@@ -7098,7 +7181,7 @@ struct BlockProof final : TLB_Complex {
   static constexpr unsigned char cons_tag[1] = { 0xc3 };
   struct Record;
   bool skip(vm::CellSlice& cs) const override;
-  bool validate_skip(vm::CellSlice& cs, bool weak = false) const override;
+  bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override;
   bool unpack(vm::CellSlice& cs, Record& data) const;
   bool unpack_block_proof(vm::CellSlice& cs, Ref<CellSlice>& proof_for, Ref<Cell>& root, Ref<CellSlice>& signatures) const;
   bool cell_unpack(Ref<vm::Cell> cell_ref, Record& data) const;
@@ -7142,7 +7225,7 @@ struct ProofChain final : TLB_Complex {
   };
   struct Record_chain_link;
   bool skip(vm::CellSlice& cs) const override;
-  bool validate_skip(vm::CellSlice& cs, bool weak = false) const override;
+  bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override;
   bool unpack(vm::CellSlice& cs, Record_chain_empty& data) const;
   bool unpack_chain_empty(vm::CellSlice& cs) const;
   bool cell_unpack(Ref<vm::Cell> cell_ref, Record_chain_empty& data) const;
@@ -7186,7 +7269,7 @@ struct TopBlockDescr final : TLB_Complex {
   static constexpr unsigned char cons_tag[1] = { 0xd5 };
   struct Record;
   bool skip(vm::CellSlice& cs) const override;
-  bool validate_skip(vm::CellSlice& cs, bool weak = false) const override;
+  bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override;
   bool unpack(vm::CellSlice& cs, Record& data) const;
   bool cell_unpack(Ref<vm::Cell> cell_ref, Record& data) const;
   bool pack(vm::CellBuilder& cb, const Record& data) const;
@@ -7228,7 +7311,7 @@ struct TopBlockDescrSet final : TLB_Complex {
     Record(Ref<CellSlice> _collection) : collection(std::move(_collection)) {}
   };
   bool skip(vm::CellSlice& cs) const override;
-  bool validate_skip(vm::CellSlice& cs, bool weak = false) const override;
+  bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override;
   bool unpack(vm::CellSlice& cs, Record& data) const;
   bool unpack_top_block_descr_set(vm::CellSlice& cs, Ref<CellSlice>& collection) const;
   bool cell_unpack(Ref<vm::Cell> cell_ref, Record& data) const;
@@ -7249,6 +7332,1194 @@ struct TopBlockDescrSet final : TLB_Complex {
 
 extern const TopBlockDescrSet t_TopBlockDescrSet;
 
+//
+// headers for type `VmCellSlice`
+//
+
+struct VmCellSlice final : TLB_Complex {
+  enum { cons1 };
+  static constexpr int cons_len_exact = 0;
+  struct Record;
+  int get_size(const vm::CellSlice& cs) const override {
+    return 0x1001a;
+  }
+  bool skip(vm::CellSlice& cs) const override {
+    return cs.advance_ext(0x1001a);
+  }
+  bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override;
+  bool unpack(vm::CellSlice& cs, Record& data) const;
+  bool cell_unpack(Ref<vm::Cell> cell_ref, Record& data) const;
+  bool pack(vm::CellBuilder& cb, const Record& data) const;
+  bool cell_pack(Ref<vm::Cell>& cell_ref, const Record& data) const;
+  bool print_skip(PrettyPrinter& pp, vm::CellSlice& cs) const override;
+  std::ostream& print_type(std::ostream& os) const override {
+    return os << "VmCellSlice";
+  }
+  int check_tag(const vm::CellSlice& cs) const override;
+  int get_tag(const vm::CellSlice& cs) const override {
+    return 0;
+  }
+};
+
+struct VmCellSlice::Record {
+  typedef VmCellSlice type_class;
+  Ref<Cell> cell;  	// cell : ^Cell
+  int st_bits;  	// st_bits : ## 10
+  int end_bits;  	// end_bits : ## 10
+  int st_ref;  	// st_ref : #<= 4
+  int end_ref;  	// end_ref : #<= 4
+  Record() = default;
+  Record(Ref<Cell> _cell, int _st_bits, int _end_bits, int _st_ref, int _end_ref) : cell(std::move(_cell)), st_bits(_st_bits), end_bits(_end_bits), st_ref(_st_ref), end_ref(_end_ref) {}
+};
+
+extern const VmCellSlice t_VmCellSlice;
+
+//
+// headers for type `VmTupleRef`
+//
+
+struct VmTupleRef final : TLB_Complex {
+  enum { vm_tupref_nil, vm_tupref_single, vm_tupref_any };
+  static constexpr int cons_len_exact = 0;
+  int m_;
+  VmTupleRef(int m) : m_(m) {}
+  struct Record_vm_tupref_nil {
+    typedef VmTupleRef type_class;
+  };
+  struct Record_vm_tupref_single {
+    typedef VmTupleRef type_class;
+    Ref<Cell> entry;  	// entry : ^VmStackValue
+    Record_vm_tupref_single() = default;
+    Record_vm_tupref_single(Ref<Cell> _entry) : entry(std::move(_entry)) {}
+  };
+  struct Record_vm_tupref_any {
+    typedef VmTupleRef type_class;
+    int n;  	// n : #
+    Ref<Cell> ref;  	// ref : ^(VmTuple (n + 2))
+    Record_vm_tupref_any() = default;
+    Record_vm_tupref_any(Ref<Cell> _ref) : n(-1), ref(std::move(_ref)) {}
+  };
+  bool skip(vm::CellSlice& cs) const override;
+  bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override;
+  bool unpack(vm::CellSlice& cs, Record_vm_tupref_nil& data) const;
+  bool unpack_vm_tupref_nil(vm::CellSlice& cs) const;
+  bool cell_unpack(Ref<vm::Cell> cell_ref, Record_vm_tupref_nil& data) const;
+  bool cell_unpack_vm_tupref_nil(Ref<vm::Cell> cell_ref) const;
+  bool pack(vm::CellBuilder& cb, const Record_vm_tupref_nil& data) const;
+  bool pack_vm_tupref_nil(vm::CellBuilder& cb) const;
+  bool cell_pack(Ref<vm::Cell>& cell_ref, const Record_vm_tupref_nil& data) const;
+  bool cell_pack_vm_tupref_nil(Ref<vm::Cell>& cell_ref) const;
+  bool unpack(vm::CellSlice& cs, Record_vm_tupref_single& data) const;
+  bool unpack_vm_tupref_single(vm::CellSlice& cs, Ref<Cell>& entry) const;
+  bool cell_unpack(Ref<vm::Cell> cell_ref, Record_vm_tupref_single& data) const;
+  bool cell_unpack_vm_tupref_single(Ref<vm::Cell> cell_ref, Ref<Cell>& entry) const;
+  bool pack(vm::CellBuilder& cb, const Record_vm_tupref_single& data) const;
+  bool pack_vm_tupref_single(vm::CellBuilder& cb, Ref<Cell> entry) const;
+  bool cell_pack(Ref<vm::Cell>& cell_ref, const Record_vm_tupref_single& data) const;
+  bool cell_pack_vm_tupref_single(Ref<vm::Cell>& cell_ref, Ref<Cell> entry) const;
+  bool unpack(vm::CellSlice& cs, Record_vm_tupref_any& data) const;
+  bool unpack_vm_tupref_any(vm::CellSlice& cs, int& n, Ref<Cell>& ref) const;
+  bool cell_unpack(Ref<vm::Cell> cell_ref, Record_vm_tupref_any& data) const;
+  bool cell_unpack_vm_tupref_any(Ref<vm::Cell> cell_ref, int& n, Ref<Cell>& ref) const;
+  bool pack(vm::CellBuilder& cb, const Record_vm_tupref_any& data) const;
+  bool pack_vm_tupref_any(vm::CellBuilder& cb, Ref<Cell> ref) const;
+  bool cell_pack(Ref<vm::Cell>& cell_ref, const Record_vm_tupref_any& data) const;
+  bool cell_pack_vm_tupref_any(Ref<vm::Cell>& cell_ref, Ref<Cell> ref) const;
+  bool print_skip(PrettyPrinter& pp, vm::CellSlice& cs) const override;
+  std::ostream& print_type(std::ostream& os) const override {
+    return os << "(VmTupleRef " << m_ << ")";
+  }
+  int check_tag(const vm::CellSlice& cs) const override;
+  int get_tag(const vm::CellSlice& cs) const override;
+};
+
+//
+// headers for type `VmTuple`
+//
+
+struct VmTuple final : TLB_Complex {
+  enum { vm_tuple_nil, vm_tuple_tcons };
+  static constexpr int cons_len_exact = 0;
+  int m_;
+  VmTuple(int m) : m_(m) {}
+  struct Record_vm_tuple_nil {
+    typedef VmTuple type_class;
+  };
+  struct Record_vm_tuple_tcons;
+  bool skip(vm::CellSlice& cs) const override;
+  bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override;
+  bool unpack(vm::CellSlice& cs, Record_vm_tuple_nil& data) const;
+  bool unpack_vm_tuple_nil(vm::CellSlice& cs) const;
+  bool cell_unpack(Ref<vm::Cell> cell_ref, Record_vm_tuple_nil& data) const;
+  bool cell_unpack_vm_tuple_nil(Ref<vm::Cell> cell_ref) const;
+  bool pack(vm::CellBuilder& cb, const Record_vm_tuple_nil& data) const;
+  bool pack_vm_tuple_nil(vm::CellBuilder& cb) const;
+  bool cell_pack(Ref<vm::Cell>& cell_ref, const Record_vm_tuple_nil& data) const;
+  bool cell_pack_vm_tuple_nil(Ref<vm::Cell>& cell_ref) const;
+  bool unpack(vm::CellSlice& cs, Record_vm_tuple_tcons& data) const;
+  bool unpack_vm_tuple_tcons(vm::CellSlice& cs, int& n, Ref<CellSlice>& head, Ref<Cell>& tail) const;
+  bool cell_unpack(Ref<vm::Cell> cell_ref, Record_vm_tuple_tcons& data) const;
+  bool cell_unpack_vm_tuple_tcons(Ref<vm::Cell> cell_ref, int& n, Ref<CellSlice>& head, Ref<Cell>& tail) const;
+  bool pack(vm::CellBuilder& cb, const Record_vm_tuple_tcons& data) const;
+  bool pack_vm_tuple_tcons(vm::CellBuilder& cb, Ref<CellSlice> head, Ref<Cell> tail) const;
+  bool cell_pack(Ref<vm::Cell>& cell_ref, const Record_vm_tuple_tcons& data) const;
+  bool cell_pack_vm_tuple_tcons(Ref<vm::Cell>& cell_ref, Ref<CellSlice> head, Ref<Cell> tail) const;
+  bool print_skip(PrettyPrinter& pp, vm::CellSlice& cs) const override;
+  std::ostream& print_type(std::ostream& os) const override {
+    return os << "(VmTuple " << m_ << ")";
+  }
+  int check_tag(const vm::CellSlice& cs) const override;
+  int get_tag(const vm::CellSlice& cs) const override;
+};
+
+struct VmTuple::Record_vm_tuple_tcons {
+  typedef VmTuple type_class;
+  int n;  	// n : #
+  Ref<CellSlice> head;  	// head : VmTupleRef n
+  Ref<Cell> tail;  	// tail : ^VmStackValue
+  Record_vm_tuple_tcons() = default;
+  Record_vm_tuple_tcons(Ref<CellSlice> _head, Ref<Cell> _tail) : n(-1), head(std::move(_head)), tail(std::move(_tail)) {}
+};
+
+//
+// headers for type `VmStackValue`
+//
+
+struct VmStackValue final : TLB_Complex {
+  enum { vm_stk_null, vm_stk_tinyint, vm_stk_int, vm_stk_nan, vm_stk_cell, vm_stk_slice, vm_stk_builder, vm_stk_cont, vm_stk_tuple };
+  static constexpr char cons_len[9] = { 8, 8, 15, 16, 8, 8, 8, 8, 8 };
+  static constexpr unsigned short cons_tag[9] = { 0, 1, 0x100, 0x2ff, 3, 4, 5, 6, 7 };
+  struct Record_vm_stk_null {
+    typedef VmStackValue type_class;
+  };
+  struct Record_vm_stk_tinyint {
+    typedef VmStackValue type_class;
+    long long value;  	// value : int64
+    Record_vm_stk_tinyint() = default;
+    Record_vm_stk_tinyint(long long _value) : value(_value) {}
+  };
+  struct Record_vm_stk_int {
+    typedef VmStackValue type_class;
+    RefInt256 value;  	// value : int257
+    Record_vm_stk_int() = default;
+    Record_vm_stk_int(RefInt256 _value) : value(std::move(_value)) {}
+  };
+  struct Record_vm_stk_nan {
+    typedef VmStackValue type_class;
+  };
+  struct Record_vm_stk_cell {
+    typedef VmStackValue type_class;
+    Ref<Cell> cell;  	// cell : ^Cell
+    Record_vm_stk_cell() = default;
+    Record_vm_stk_cell(Ref<Cell> _cell) : cell(std::move(_cell)) {}
+  };
+  struct Record_vm_stk_slice {
+    typedef VmStackValue type_class;
+    Ref<CellSlice> x;  	// VmCellSlice
+    Record_vm_stk_slice() = default;
+    Record_vm_stk_slice(Ref<CellSlice> _x) : x(std::move(_x)) {}
+  };
+  struct Record_vm_stk_builder {
+    typedef VmStackValue type_class;
+    Ref<Cell> cell;  	// cell : ^Cell
+    Record_vm_stk_builder() = default;
+    Record_vm_stk_builder(Ref<Cell> _cell) : cell(std::move(_cell)) {}
+  };
+  struct Record_vm_stk_cont {
+    typedef VmStackValue type_class;
+    Ref<CellSlice> cont;  	// cont : VmCont
+    Record_vm_stk_cont() = default;
+    Record_vm_stk_cont(Ref<CellSlice> _cont) : cont(std::move(_cont)) {}
+  };
+  struct Record_vm_stk_tuple {
+    typedef VmStackValue type_class;
+    int len;  	// len : ## 16
+    Ref<CellSlice> data;  	// data : VmTuple len
+    Record_vm_stk_tuple() = default;
+    Record_vm_stk_tuple(int _len, Ref<CellSlice> _data) : len(_len), data(std::move(_data)) {}
+  };
+  bool skip(vm::CellSlice& cs) const override;
+  bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override;
+  bool unpack(vm::CellSlice& cs, Record_vm_stk_null& data) const;
+  bool unpack_vm_stk_null(vm::CellSlice& cs) const;
+  bool cell_unpack(Ref<vm::Cell> cell_ref, Record_vm_stk_null& data) const;
+  bool cell_unpack_vm_stk_null(Ref<vm::Cell> cell_ref) const;
+  bool pack(vm::CellBuilder& cb, const Record_vm_stk_null& data) const;
+  bool pack_vm_stk_null(vm::CellBuilder& cb) const;
+  bool cell_pack(Ref<vm::Cell>& cell_ref, const Record_vm_stk_null& data) const;
+  bool cell_pack_vm_stk_null(Ref<vm::Cell>& cell_ref) const;
+  bool unpack(vm::CellSlice& cs, Record_vm_stk_tinyint& data) const;
+  bool unpack_vm_stk_tinyint(vm::CellSlice& cs, long long& value) const;
+  bool cell_unpack(Ref<vm::Cell> cell_ref, Record_vm_stk_tinyint& data) const;
+  bool cell_unpack_vm_stk_tinyint(Ref<vm::Cell> cell_ref, long long& value) const;
+  bool pack(vm::CellBuilder& cb, const Record_vm_stk_tinyint& data) const;
+  bool pack_vm_stk_tinyint(vm::CellBuilder& cb, long long value) const;
+  bool cell_pack(Ref<vm::Cell>& cell_ref, const Record_vm_stk_tinyint& data) const;
+  bool cell_pack_vm_stk_tinyint(Ref<vm::Cell>& cell_ref, long long value) const;
+  bool unpack(vm::CellSlice& cs, Record_vm_stk_int& data) const;
+  bool unpack_vm_stk_int(vm::CellSlice& cs, RefInt256& value) const;
+  bool cell_unpack(Ref<vm::Cell> cell_ref, Record_vm_stk_int& data) const;
+  bool cell_unpack_vm_stk_int(Ref<vm::Cell> cell_ref, RefInt256& value) const;
+  bool pack(vm::CellBuilder& cb, const Record_vm_stk_int& data) const;
+  bool pack_vm_stk_int(vm::CellBuilder& cb, RefInt256 value) const;
+  bool cell_pack(Ref<vm::Cell>& cell_ref, const Record_vm_stk_int& data) const;
+  bool cell_pack_vm_stk_int(Ref<vm::Cell>& cell_ref, RefInt256 value) const;
+  bool unpack(vm::CellSlice& cs, Record_vm_stk_nan& data) const;
+  bool unpack_vm_stk_nan(vm::CellSlice& cs) const;
+  bool cell_unpack(Ref<vm::Cell> cell_ref, Record_vm_stk_nan& data) const;
+  bool cell_unpack_vm_stk_nan(Ref<vm::Cell> cell_ref) const;
+  bool pack(vm::CellBuilder& cb, const Record_vm_stk_nan& data) const;
+  bool pack_vm_stk_nan(vm::CellBuilder& cb) const;
+  bool cell_pack(Ref<vm::Cell>& cell_ref, const Record_vm_stk_nan& data) const;
+  bool cell_pack_vm_stk_nan(Ref<vm::Cell>& cell_ref) const;
+  bool unpack(vm::CellSlice& cs, Record_vm_stk_cell& data) const;
+  bool unpack_vm_stk_cell(vm::CellSlice& cs, Ref<Cell>& cell) const;
+  bool cell_unpack(Ref<vm::Cell> cell_ref, Record_vm_stk_cell& data) const;
+  bool cell_unpack_vm_stk_cell(Ref<vm::Cell> cell_ref, Ref<Cell>& cell) const;
+  bool pack(vm::CellBuilder& cb, const Record_vm_stk_cell& data) const;
+  bool pack_vm_stk_cell(vm::CellBuilder& cb, Ref<Cell> cell) const;
+  bool cell_pack(Ref<vm::Cell>& cell_ref, const Record_vm_stk_cell& data) const;
+  bool cell_pack_vm_stk_cell(Ref<vm::Cell>& cell_ref, Ref<Cell> cell) const;
+  bool unpack(vm::CellSlice& cs, Record_vm_stk_slice& data) const;
+  bool unpack_vm_stk_slice(vm::CellSlice& cs, Ref<CellSlice>& x) const;
+  bool cell_unpack(Ref<vm::Cell> cell_ref, Record_vm_stk_slice& data) const;
+  bool cell_unpack_vm_stk_slice(Ref<vm::Cell> cell_ref, Ref<CellSlice>& x) const;
+  bool pack(vm::CellBuilder& cb, const Record_vm_stk_slice& data) const;
+  bool pack_vm_stk_slice(vm::CellBuilder& cb, Ref<CellSlice> x) const;
+  bool cell_pack(Ref<vm::Cell>& cell_ref, const Record_vm_stk_slice& data) const;
+  bool cell_pack_vm_stk_slice(Ref<vm::Cell>& cell_ref, Ref<CellSlice> x) const;
+  bool unpack(vm::CellSlice& cs, Record_vm_stk_builder& data) const;
+  bool unpack_vm_stk_builder(vm::CellSlice& cs, Ref<Cell>& cell) const;
+  bool cell_unpack(Ref<vm::Cell> cell_ref, Record_vm_stk_builder& data) const;
+  bool cell_unpack_vm_stk_builder(Ref<vm::Cell> cell_ref, Ref<Cell>& cell) const;
+  bool pack(vm::CellBuilder& cb, const Record_vm_stk_builder& data) const;
+  bool pack_vm_stk_builder(vm::CellBuilder& cb, Ref<Cell> cell) const;
+  bool cell_pack(Ref<vm::Cell>& cell_ref, const Record_vm_stk_builder& data) const;
+  bool cell_pack_vm_stk_builder(Ref<vm::Cell>& cell_ref, Ref<Cell> cell) const;
+  bool unpack(vm::CellSlice& cs, Record_vm_stk_cont& data) const;
+  bool unpack_vm_stk_cont(vm::CellSlice& cs, Ref<CellSlice>& cont) const;
+  bool cell_unpack(Ref<vm::Cell> cell_ref, Record_vm_stk_cont& data) const;
+  bool cell_unpack_vm_stk_cont(Ref<vm::Cell> cell_ref, Ref<CellSlice>& cont) const;
+  bool pack(vm::CellBuilder& cb, const Record_vm_stk_cont& data) const;
+  bool pack_vm_stk_cont(vm::CellBuilder& cb, Ref<CellSlice> cont) const;
+  bool cell_pack(Ref<vm::Cell>& cell_ref, const Record_vm_stk_cont& data) const;
+  bool cell_pack_vm_stk_cont(Ref<vm::Cell>& cell_ref, Ref<CellSlice> cont) const;
+  bool unpack(vm::CellSlice& cs, Record_vm_stk_tuple& data) const;
+  bool unpack_vm_stk_tuple(vm::CellSlice& cs, int& len, Ref<CellSlice>& data) const;
+  bool cell_unpack(Ref<vm::Cell> cell_ref, Record_vm_stk_tuple& data) const;
+  bool cell_unpack_vm_stk_tuple(Ref<vm::Cell> cell_ref, int& len, Ref<CellSlice>& data) const;
+  bool pack(vm::CellBuilder& cb, const Record_vm_stk_tuple& data) const;
+  bool pack_vm_stk_tuple(vm::CellBuilder& cb, int len, Ref<CellSlice> data) const;
+  bool cell_pack(Ref<vm::Cell>& cell_ref, const Record_vm_stk_tuple& data) const;
+  bool cell_pack_vm_stk_tuple(Ref<vm::Cell>& cell_ref, int len, Ref<CellSlice> data) const;
+  bool print_skip(PrettyPrinter& pp, vm::CellSlice& cs) const override;
+  std::ostream& print_type(std::ostream& os) const override {
+    return os << "VmStackValue";
+  }
+  int check_tag(const vm::CellSlice& cs) const override;
+  int get_tag(const vm::CellSlice& cs) const override;
+};
+
+extern const VmStackValue t_VmStackValue;
+
+//
+// headers for type `VmStack`
+//
+
+struct VmStack final : TLB_Complex {
+  enum { vm_stack };
+  static constexpr int cons_len_exact = 0;
+  struct Record {
+    typedef VmStack type_class;
+    int depth;  	// depth : ## 24
+    Ref<CellSlice> stack;  	// stack : VmStackList depth
+    Record() = default;
+    Record(int _depth, Ref<CellSlice> _stack) : depth(_depth), stack(std::move(_stack)) {}
+  };
+  bool skip(vm::CellSlice& cs) const override;
+  bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override;
+  bool unpack(vm::CellSlice& cs, Record& data) const;
+  bool unpack_vm_stack(vm::CellSlice& cs, int& depth, Ref<CellSlice>& stack) const;
+  bool cell_unpack(Ref<vm::Cell> cell_ref, Record& data) const;
+  bool cell_unpack_vm_stack(Ref<vm::Cell> cell_ref, int& depth, Ref<CellSlice>& stack) const;
+  bool pack(vm::CellBuilder& cb, const Record& data) const;
+  bool pack_vm_stack(vm::CellBuilder& cb, int depth, Ref<CellSlice> stack) const;
+  bool cell_pack(Ref<vm::Cell>& cell_ref, const Record& data) const;
+  bool cell_pack_vm_stack(Ref<vm::Cell>& cell_ref, int depth, Ref<CellSlice> stack) const;
+  bool print_skip(PrettyPrinter& pp, vm::CellSlice& cs) const override;
+  std::ostream& print_type(std::ostream& os) const override {
+    return os << "VmStack";
+  }
+  int check_tag(const vm::CellSlice& cs) const override;
+  int get_tag(const vm::CellSlice& cs) const override {
+    return 0;
+  }
+};
+
+extern const VmStack t_VmStack;
+
+//
+// headers for type `VmStackList`
+//
+
+struct VmStackList final : TLB_Complex {
+  enum { vm_stk_cons, vm_stk_nil };
+  static constexpr int cons_len_exact = 0;
+  int m_;
+  VmStackList(int m) : m_(m) {}
+  struct Record_vm_stk_cons;
+  struct Record_vm_stk_nil {
+    typedef VmStackList type_class;
+  };
+  bool skip(vm::CellSlice& cs) const override;
+  bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override;
+  bool unpack(vm::CellSlice& cs, Record_vm_stk_cons& data) const;
+  bool unpack_vm_stk_cons(vm::CellSlice& cs, int& n, Ref<Cell>& rest, Ref<CellSlice>& tos) const;
+  bool cell_unpack(Ref<vm::Cell> cell_ref, Record_vm_stk_cons& data) const;
+  bool cell_unpack_vm_stk_cons(Ref<vm::Cell> cell_ref, int& n, Ref<Cell>& rest, Ref<CellSlice>& tos) const;
+  bool pack(vm::CellBuilder& cb, const Record_vm_stk_cons& data) const;
+  bool pack_vm_stk_cons(vm::CellBuilder& cb, Ref<Cell> rest, Ref<CellSlice> tos) const;
+  bool cell_pack(Ref<vm::Cell>& cell_ref, const Record_vm_stk_cons& data) const;
+  bool cell_pack_vm_stk_cons(Ref<vm::Cell>& cell_ref, Ref<Cell> rest, Ref<CellSlice> tos) const;
+  bool unpack(vm::CellSlice& cs, Record_vm_stk_nil& data) const;
+  bool unpack_vm_stk_nil(vm::CellSlice& cs) const;
+  bool cell_unpack(Ref<vm::Cell> cell_ref, Record_vm_stk_nil& data) const;
+  bool cell_unpack_vm_stk_nil(Ref<vm::Cell> cell_ref) const;
+  bool pack(vm::CellBuilder& cb, const Record_vm_stk_nil& data) const;
+  bool pack_vm_stk_nil(vm::CellBuilder& cb) const;
+  bool cell_pack(Ref<vm::Cell>& cell_ref, const Record_vm_stk_nil& data) const;
+  bool cell_pack_vm_stk_nil(Ref<vm::Cell>& cell_ref) const;
+  bool print_skip(PrettyPrinter& pp, vm::CellSlice& cs) const override;
+  std::ostream& print_type(std::ostream& os) const override {
+    return os << "(VmStackList " << m_ << ")";
+  }
+  int check_tag(const vm::CellSlice& cs) const override;
+  int get_tag(const vm::CellSlice& cs) const override;
+};
+
+struct VmStackList::Record_vm_stk_cons {
+  typedef VmStackList type_class;
+  int n;  	// n : #
+  Ref<Cell> rest;  	// rest : ^(VmStackList n)
+  Ref<CellSlice> tos;  	// tos : VmStackValue
+  Record_vm_stk_cons() = default;
+  Record_vm_stk_cons(Ref<Cell> _rest, Ref<CellSlice> _tos) : n(-1), rest(std::move(_rest)), tos(std::move(_tos)) {}
+};
+
+//
+// headers for type `VmSaveList`
+//
+
+struct VmSaveList final : TLB_Complex {
+  enum { cons1 };
+  static constexpr int cons_len_exact = 0;
+  struct Record {
+    typedef VmSaveList type_class;
+    Ref<CellSlice> cregs;  	// cregs : HashmapE 4 VmStackValue
+    Record() = default;
+    Record(Ref<CellSlice> _cregs) : cregs(std::move(_cregs)) {}
+  };
+  bool skip(vm::CellSlice& cs) const override;
+  bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override;
+  bool unpack(vm::CellSlice& cs, Record& data) const;
+  bool unpack_cons1(vm::CellSlice& cs, Ref<CellSlice>& cregs) const;
+  bool cell_unpack(Ref<vm::Cell> cell_ref, Record& data) const;
+  bool cell_unpack_cons1(Ref<vm::Cell> cell_ref, Ref<CellSlice>& cregs) const;
+  bool pack(vm::CellBuilder& cb, const Record& data) const;
+  bool pack_cons1(vm::CellBuilder& cb, Ref<CellSlice> cregs) const;
+  bool cell_pack(Ref<vm::Cell>& cell_ref, const Record& data) const;
+  bool cell_pack_cons1(Ref<vm::Cell>& cell_ref, Ref<CellSlice> cregs) const;
+  bool print_skip(PrettyPrinter& pp, vm::CellSlice& cs) const override;
+  std::ostream& print_type(std::ostream& os) const override {
+    return os << "VmSaveList";
+  }
+  int check_tag(const vm::CellSlice& cs) const override;
+  int get_tag(const vm::CellSlice& cs) const override {
+    return 0;
+  }
+};
+
+extern const VmSaveList t_VmSaveList;
+
+//
+// headers for auxiliary type `VmGasLimits_aux`
+//
+
+struct VmGasLimits_aux final : TLB_Complex {
+  enum { cons1 };
+  static constexpr int cons_len_exact = 0;
+  struct Record;
+  int get_size(const vm::CellSlice& cs) const override {
+    return 192;
+  }
+  bool skip(vm::CellSlice& cs) const override {
+    return cs.advance(192);
+  }
+  bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override {
+    return cs.advance(192);
+  }
+  bool unpack(vm::CellSlice& cs, Record& data) const;
+  bool unpack_cons1(vm::CellSlice& cs, long long& max_limit, long long& cur_limit, long long& credit) const;
+  bool cell_unpack(Ref<vm::Cell> cell_ref, Record& data) const;
+  bool cell_unpack_cons1(Ref<vm::Cell> cell_ref, long long& max_limit, long long& cur_limit, long long& credit) const;
+  bool pack(vm::CellBuilder& cb, const Record& data) const;
+  bool pack_cons1(vm::CellBuilder& cb, long long max_limit, long long cur_limit, long long credit) const;
+  bool cell_pack(Ref<vm::Cell>& cell_ref, const Record& data) const;
+  bool cell_pack_cons1(Ref<vm::Cell>& cell_ref, long long max_limit, long long cur_limit, long long credit) const;
+  bool print_skip(PrettyPrinter& pp, vm::CellSlice& cs) const override;
+  std::ostream& print_type(std::ostream& os) const override {
+    return os << "VmGasLimits_aux";
+  }
+  int check_tag(const vm::CellSlice& cs) const override;
+  int get_tag(const vm::CellSlice& cs) const override {
+    return 0;
+  }
+};
+
+struct VmGasLimits_aux::Record {
+  typedef VmGasLimits_aux type_class;
+  long long max_limit;  	// max_limit : int64
+  long long cur_limit;  	// cur_limit : int64
+  long long credit;  	// credit : int64
+  Record() = default;
+  Record(long long _max_limit, long long _cur_limit, long long _credit) : max_limit(_max_limit), cur_limit(_cur_limit), credit(_credit) {}
+};
+
+extern const VmGasLimits_aux t_VmGasLimits_aux;
+
+//
+// headers for type `VmGasLimits`
+//
+
+struct VmGasLimits final : TLB_Complex {
+  enum { gas_limits };
+  static constexpr int cons_len_exact = 0;
+  struct Record {
+    typedef VmGasLimits type_class;
+    long long remaining;  	// remaining : int64
+    VmGasLimits_aux::Record r1;  	// ^[$_ max_limit:int64 cur_limit:int64 credit:int64 ]
+    Record() = default;
+    Record(long long _remaining, const VmGasLimits_aux::Record& _r1) : remaining(_remaining), r1(_r1) {}
+  };
+  int get_size(const vm::CellSlice& cs) const override {
+    return 0x10040;
+  }
+  bool skip(vm::CellSlice& cs) const override {
+    return cs.advance_ext(0x10040);
+  }
+  bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override;
+  bool unpack(vm::CellSlice& cs, Record& data) const;
+  bool cell_unpack(Ref<vm::Cell> cell_ref, Record& data) const;
+  bool pack(vm::CellBuilder& cb, const Record& data) const;
+  bool cell_pack(Ref<vm::Cell>& cell_ref, const Record& data) const;
+  bool print_skip(PrettyPrinter& pp, vm::CellSlice& cs) const override;
+  std::ostream& print_type(std::ostream& os) const override {
+    return os << "VmGasLimits";
+  }
+  int check_tag(const vm::CellSlice& cs) const override;
+  int get_tag(const vm::CellSlice& cs) const override {
+    return 0;
+  }
+};
+
+extern const VmGasLimits t_VmGasLimits;
+
+//
+// headers for type `VmLibraries`
+//
+
+struct VmLibraries final : TLB_Complex {
+  enum { cons1 };
+  static constexpr int cons_len_exact = 0;
+  struct Record {
+    typedef VmLibraries type_class;
+    Ref<CellSlice> libraries;  	// libraries : HashmapE 256 ^Cell
+    Record() = default;
+    Record(Ref<CellSlice> _libraries) : libraries(std::move(_libraries)) {}
+  };
+  bool skip(vm::CellSlice& cs) const override;
+  bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override;
+  bool unpack(vm::CellSlice& cs, Record& data) const;
+  bool unpack_cons1(vm::CellSlice& cs, Ref<CellSlice>& libraries) const;
+  bool cell_unpack(Ref<vm::Cell> cell_ref, Record& data) const;
+  bool cell_unpack_cons1(Ref<vm::Cell> cell_ref, Ref<CellSlice>& libraries) const;
+  bool pack(vm::CellBuilder& cb, const Record& data) const;
+  bool pack_cons1(vm::CellBuilder& cb, Ref<CellSlice> libraries) const;
+  bool cell_pack(Ref<vm::Cell>& cell_ref, const Record& data) const;
+  bool cell_pack_cons1(Ref<vm::Cell>& cell_ref, Ref<CellSlice> libraries) const;
+  bool print_skip(PrettyPrinter& pp, vm::CellSlice& cs) const override;
+  std::ostream& print_type(std::ostream& os) const override {
+    return os << "VmLibraries";
+  }
+  int check_tag(const vm::CellSlice& cs) const override;
+  int get_tag(const vm::CellSlice& cs) const override {
+    return 0;
+  }
+};
+
+extern const VmLibraries t_VmLibraries;
+
+//
+// headers for type `VmControlData`
+//
+
+struct VmControlData final : TLB_Complex {
+  enum { vm_ctl_data };
+  static constexpr int cons_len_exact = 0;
+  struct Record;
+  bool skip(vm::CellSlice& cs) const override;
+  bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override;
+  bool unpack(vm::CellSlice& cs, Record& data) const;
+  bool cell_unpack(Ref<vm::Cell> cell_ref, Record& data) const;
+  bool pack(vm::CellBuilder& cb, const Record& data) const;
+  bool cell_pack(Ref<vm::Cell>& cell_ref, const Record& data) const;
+  bool print_skip(PrettyPrinter& pp, vm::CellSlice& cs) const override;
+  std::ostream& print_type(std::ostream& os) const override {
+    return os << "VmControlData";
+  }
+  int check_tag(const vm::CellSlice& cs) const override;
+  int get_tag(const vm::CellSlice& cs) const override {
+    return 0;
+  }
+};
+
+struct VmControlData::Record {
+  typedef VmControlData type_class;
+  Ref<CellSlice> nargs;  	// nargs : Maybe uint13
+  Ref<CellSlice> stack;  	// stack : Maybe VmStack
+  Ref<CellSlice> save;  	// save : VmSaveList
+  Ref<CellSlice> cp;  	// cp : Maybe int16
+  Record() = default;
+  Record(Ref<CellSlice> _nargs, Ref<CellSlice> _stack, Ref<CellSlice> _save, Ref<CellSlice> _cp) : nargs(std::move(_nargs)), stack(std::move(_stack)), save(std::move(_save)), cp(std::move(_cp)) {}
+};
+
+extern const VmControlData t_VmControlData;
+
+//
+// headers for type `VmCont`
+//
+
+struct VmCont final : TLB_Complex {
+  enum { vmc_std, vmc_envelope, vmc_quit, vmc_quit_exc, vmc_repeat, vmc_until, vmc_again, vmc_while_cond, vmc_while_body, vmc_pushint };
+  static constexpr char cons_len[10] = { 2, 2, 4, 4, 5, 6, 6, 6, 6, 4 };
+  static constexpr unsigned char cons_tag[10] = { 0, 1, 8, 9, 20, 0x30, 0x31, 0x32, 0x33, 15 };
+  struct Record_vmc_std {
+    typedef VmCont type_class;
+    Ref<CellSlice> cdata;  	// cdata : VmControlData
+    Ref<CellSlice> code;  	// code : VmCellSlice
+    Record_vmc_std() = default;
+    Record_vmc_std(Ref<CellSlice> _cdata, Ref<CellSlice> _code) : cdata(std::move(_cdata)), code(std::move(_code)) {}
+  };
+  struct Record_vmc_envelope {
+    typedef VmCont type_class;
+    Ref<CellSlice> cdata;  	// cdata : VmControlData
+    Ref<Cell> next;  	// next : ^VmCont
+    Record_vmc_envelope() = default;
+    Record_vmc_envelope(Ref<CellSlice> _cdata, Ref<Cell> _next) : cdata(std::move(_cdata)), next(std::move(_next)) {}
+  };
+  struct Record_vmc_quit {
+    typedef VmCont type_class;
+    int exit_code;  	// exit_code : int32
+    Record_vmc_quit() = default;
+    Record_vmc_quit(int _exit_code) : exit_code(_exit_code) {}
+  };
+  struct Record_vmc_quit_exc {
+    typedef VmCont type_class;
+  };
+  struct Record_vmc_repeat;
+  struct Record_vmc_until {
+    typedef VmCont type_class;
+    Ref<Cell> body;  	// body : ^VmCont
+    Ref<Cell> after;  	// after : ^VmCont
+    Record_vmc_until() = default;
+    Record_vmc_until(Ref<Cell> _body, Ref<Cell> _after) : body(std::move(_body)), after(std::move(_after)) {}
+  };
+  struct Record_vmc_again {
+    typedef VmCont type_class;
+    Ref<Cell> body;  	// body : ^VmCont
+    Record_vmc_again() = default;
+    Record_vmc_again(Ref<Cell> _body) : body(std::move(_body)) {}
+  };
+  struct Record_vmc_while_cond;
+  struct Record_vmc_while_body;
+  struct Record_vmc_pushint {
+    typedef VmCont type_class;
+    int value;  	// value : int32
+    Ref<Cell> next;  	// next : ^VmCont
+    Record_vmc_pushint() = default;
+    Record_vmc_pushint(int _value, Ref<Cell> _next) : value(_value), next(std::move(_next)) {}
+  };
+  bool skip(vm::CellSlice& cs) const override;
+  bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override;
+  bool unpack(vm::CellSlice& cs, Record_vmc_std& data) const;
+  bool unpack_vmc_std(vm::CellSlice& cs, Ref<CellSlice>& cdata, Ref<CellSlice>& code) const;
+  bool cell_unpack(Ref<vm::Cell> cell_ref, Record_vmc_std& data) const;
+  bool cell_unpack_vmc_std(Ref<vm::Cell> cell_ref, Ref<CellSlice>& cdata, Ref<CellSlice>& code) const;
+  bool pack(vm::CellBuilder& cb, const Record_vmc_std& data) const;
+  bool pack_vmc_std(vm::CellBuilder& cb, Ref<CellSlice> cdata, Ref<CellSlice> code) const;
+  bool cell_pack(Ref<vm::Cell>& cell_ref, const Record_vmc_std& data) const;
+  bool cell_pack_vmc_std(Ref<vm::Cell>& cell_ref, Ref<CellSlice> cdata, Ref<CellSlice> code) const;
+  bool unpack(vm::CellSlice& cs, Record_vmc_envelope& data) const;
+  bool unpack_vmc_envelope(vm::CellSlice& cs, Ref<CellSlice>& cdata, Ref<Cell>& next) const;
+  bool cell_unpack(Ref<vm::Cell> cell_ref, Record_vmc_envelope& data) const;
+  bool cell_unpack_vmc_envelope(Ref<vm::Cell> cell_ref, Ref<CellSlice>& cdata, Ref<Cell>& next) const;
+  bool pack(vm::CellBuilder& cb, const Record_vmc_envelope& data) const;
+  bool pack_vmc_envelope(vm::CellBuilder& cb, Ref<CellSlice> cdata, Ref<Cell> next) const;
+  bool cell_pack(Ref<vm::Cell>& cell_ref, const Record_vmc_envelope& data) const;
+  bool cell_pack_vmc_envelope(Ref<vm::Cell>& cell_ref, Ref<CellSlice> cdata, Ref<Cell> next) const;
+  bool unpack(vm::CellSlice& cs, Record_vmc_quit& data) const;
+  bool unpack_vmc_quit(vm::CellSlice& cs, int& exit_code) const;
+  bool cell_unpack(Ref<vm::Cell> cell_ref, Record_vmc_quit& data) const;
+  bool cell_unpack_vmc_quit(Ref<vm::Cell> cell_ref, int& exit_code) const;
+  bool pack(vm::CellBuilder& cb, const Record_vmc_quit& data) const;
+  bool pack_vmc_quit(vm::CellBuilder& cb, int exit_code) const;
+  bool cell_pack(Ref<vm::Cell>& cell_ref, const Record_vmc_quit& data) const;
+  bool cell_pack_vmc_quit(Ref<vm::Cell>& cell_ref, int exit_code) const;
+  bool unpack(vm::CellSlice& cs, Record_vmc_quit_exc& data) const;
+  bool unpack_vmc_quit_exc(vm::CellSlice& cs) const;
+  bool cell_unpack(Ref<vm::Cell> cell_ref, Record_vmc_quit_exc& data) const;
+  bool cell_unpack_vmc_quit_exc(Ref<vm::Cell> cell_ref) const;
+  bool pack(vm::CellBuilder& cb, const Record_vmc_quit_exc& data) const;
+  bool pack_vmc_quit_exc(vm::CellBuilder& cb) const;
+  bool cell_pack(Ref<vm::Cell>& cell_ref, const Record_vmc_quit_exc& data) const;
+  bool cell_pack_vmc_quit_exc(Ref<vm::Cell>& cell_ref) const;
+  bool unpack(vm::CellSlice& cs, Record_vmc_repeat& data) const;
+  bool unpack_vmc_repeat(vm::CellSlice& cs, long long& count, Ref<Cell>& body, Ref<Cell>& after) const;
+  bool cell_unpack(Ref<vm::Cell> cell_ref, Record_vmc_repeat& data) const;
+  bool cell_unpack_vmc_repeat(Ref<vm::Cell> cell_ref, long long& count, Ref<Cell>& body, Ref<Cell>& after) const;
+  bool pack(vm::CellBuilder& cb, const Record_vmc_repeat& data) const;
+  bool pack_vmc_repeat(vm::CellBuilder& cb, long long count, Ref<Cell> body, Ref<Cell> after) const;
+  bool cell_pack(Ref<vm::Cell>& cell_ref, const Record_vmc_repeat& data) const;
+  bool cell_pack_vmc_repeat(Ref<vm::Cell>& cell_ref, long long count, Ref<Cell> body, Ref<Cell> after) const;
+  bool unpack(vm::CellSlice& cs, Record_vmc_until& data) const;
+  bool unpack_vmc_until(vm::CellSlice& cs, Ref<Cell>& body, Ref<Cell>& after) const;
+  bool cell_unpack(Ref<vm::Cell> cell_ref, Record_vmc_until& data) const;
+  bool cell_unpack_vmc_until(Ref<vm::Cell> cell_ref, Ref<Cell>& body, Ref<Cell>& after) const;
+  bool pack(vm::CellBuilder& cb, const Record_vmc_until& data) const;
+  bool pack_vmc_until(vm::CellBuilder& cb, Ref<Cell> body, Ref<Cell> after) const;
+  bool cell_pack(Ref<vm::Cell>& cell_ref, const Record_vmc_until& data) const;
+  bool cell_pack_vmc_until(Ref<vm::Cell>& cell_ref, Ref<Cell> body, Ref<Cell> after) const;
+  bool unpack(vm::CellSlice& cs, Record_vmc_again& data) const;
+  bool unpack_vmc_again(vm::CellSlice& cs, Ref<Cell>& body) const;
+  bool cell_unpack(Ref<vm::Cell> cell_ref, Record_vmc_again& data) const;
+  bool cell_unpack_vmc_again(Ref<vm::Cell> cell_ref, Ref<Cell>& body) const;
+  bool pack(vm::CellBuilder& cb, const Record_vmc_again& data) const;
+  bool pack_vmc_again(vm::CellBuilder& cb, Ref<Cell> body) const;
+  bool cell_pack(Ref<vm::Cell>& cell_ref, const Record_vmc_again& data) const;
+  bool cell_pack_vmc_again(Ref<vm::Cell>& cell_ref, Ref<Cell> body) const;
+  bool unpack(vm::CellSlice& cs, Record_vmc_while_cond& data) const;
+  bool unpack_vmc_while_cond(vm::CellSlice& cs, Ref<Cell>& cond, Ref<Cell>& body, Ref<Cell>& after) const;
+  bool cell_unpack(Ref<vm::Cell> cell_ref, Record_vmc_while_cond& data) const;
+  bool cell_unpack_vmc_while_cond(Ref<vm::Cell> cell_ref, Ref<Cell>& cond, Ref<Cell>& body, Ref<Cell>& after) const;
+  bool pack(vm::CellBuilder& cb, const Record_vmc_while_cond& data) const;
+  bool pack_vmc_while_cond(vm::CellBuilder& cb, Ref<Cell> cond, Ref<Cell> body, Ref<Cell> after) const;
+  bool cell_pack(Ref<vm::Cell>& cell_ref, const Record_vmc_while_cond& data) const;
+  bool cell_pack_vmc_while_cond(Ref<vm::Cell>& cell_ref, Ref<Cell> cond, Ref<Cell> body, Ref<Cell> after) const;
+  bool unpack(vm::CellSlice& cs, Record_vmc_while_body& data) const;
+  bool unpack_vmc_while_body(vm::CellSlice& cs, Ref<Cell>& cond, Ref<Cell>& body, Ref<Cell>& after) const;
+  bool cell_unpack(Ref<vm::Cell> cell_ref, Record_vmc_while_body& data) const;
+  bool cell_unpack_vmc_while_body(Ref<vm::Cell> cell_ref, Ref<Cell>& cond, Ref<Cell>& body, Ref<Cell>& after) const;
+  bool pack(vm::CellBuilder& cb, const Record_vmc_while_body& data) const;
+  bool pack_vmc_while_body(vm::CellBuilder& cb, Ref<Cell> cond, Ref<Cell> body, Ref<Cell> after) const;
+  bool cell_pack(Ref<vm::Cell>& cell_ref, const Record_vmc_while_body& data) const;
+  bool cell_pack_vmc_while_body(Ref<vm::Cell>& cell_ref, Ref<Cell> cond, Ref<Cell> body, Ref<Cell> after) const;
+  bool unpack(vm::CellSlice& cs, Record_vmc_pushint& data) const;
+  bool unpack_vmc_pushint(vm::CellSlice& cs, int& value, Ref<Cell>& next) const;
+  bool cell_unpack(Ref<vm::Cell> cell_ref, Record_vmc_pushint& data) const;
+  bool cell_unpack_vmc_pushint(Ref<vm::Cell> cell_ref, int& value, Ref<Cell>& next) const;
+  bool pack(vm::CellBuilder& cb, const Record_vmc_pushint& data) const;
+  bool pack_vmc_pushint(vm::CellBuilder& cb, int value, Ref<Cell> next) const;
+  bool cell_pack(Ref<vm::Cell>& cell_ref, const Record_vmc_pushint& data) const;
+  bool cell_pack_vmc_pushint(Ref<vm::Cell>& cell_ref, int value, Ref<Cell> next) const;
+  bool print_skip(PrettyPrinter& pp, vm::CellSlice& cs) const override;
+  std::ostream& print_type(std::ostream& os) const override {
+    return os << "VmCont";
+  }
+  int check_tag(const vm::CellSlice& cs) const override;
+  int get_tag(const vm::CellSlice& cs) const override {
+    return cs.bselect_ext(6, 0x100f011100010001ULL);
+  }
+};
+
+struct VmCont::Record_vmc_repeat {
+  typedef VmCont type_class;
+  long long count;  	// count : uint63
+  Ref<Cell> body;  	// body : ^VmCont
+  Ref<Cell> after;  	// after : ^VmCont
+  Record_vmc_repeat() = default;
+  Record_vmc_repeat(long long _count, Ref<Cell> _body, Ref<Cell> _after) : count(_count), body(std::move(_body)), after(std::move(_after)) {}
+};
+
+struct VmCont::Record_vmc_while_cond {
+  typedef VmCont type_class;
+  Ref<Cell> cond;  	// cond : ^VmCont
+  Ref<Cell> body;  	// body : ^VmCont
+  Ref<Cell> after;  	// after : ^VmCont
+  Record_vmc_while_cond() = default;
+  Record_vmc_while_cond(Ref<Cell> _cond, Ref<Cell> _body, Ref<Cell> _after) : cond(std::move(_cond)), body(std::move(_body)), after(std::move(_after)) {}
+};
+
+struct VmCont::Record_vmc_while_body {
+  typedef VmCont type_class;
+  Ref<Cell> cond;  	// cond : ^VmCont
+  Ref<Cell> body;  	// body : ^VmCont
+  Ref<Cell> after;  	// after : ^VmCont
+  Record_vmc_while_body() = default;
+  Record_vmc_while_body(Ref<Cell> _cond, Ref<Cell> _body, Ref<Cell> _after) : cond(std::move(_cond)), body(std::move(_body)), after(std::move(_after)) {}
+};
+
+extern const VmCont t_VmCont;
+
+//
+// headers for type `DNS_RecordSet`
+//
+
+struct DNS_RecordSet final : TLB_Complex {
+  enum { cons1 };
+  static constexpr int cons_len_exact = 0;
+  struct Record {
+    typedef DNS_RecordSet type_class;
+    Ref<CellSlice> x;  	// HashmapE 16 ^DNSRecord
+    Record() = default;
+    Record(Ref<CellSlice> _x) : x(std::move(_x)) {}
+  };
+  bool skip(vm::CellSlice& cs) const override;
+  bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override;
+  bool unpack(vm::CellSlice& cs, Record& data) const;
+  bool unpack_cons1(vm::CellSlice& cs, Ref<CellSlice>& x) const;
+  bool cell_unpack(Ref<vm::Cell> cell_ref, Record& data) const;
+  bool cell_unpack_cons1(Ref<vm::Cell> cell_ref, Ref<CellSlice>& x) const;
+  bool pack(vm::CellBuilder& cb, const Record& data) const;
+  bool pack_cons1(vm::CellBuilder& cb, Ref<CellSlice> x) const;
+  bool cell_pack(Ref<vm::Cell>& cell_ref, const Record& data) const;
+  bool cell_pack_cons1(Ref<vm::Cell>& cell_ref, Ref<CellSlice> x) const;
+  bool print_skip(PrettyPrinter& pp, vm::CellSlice& cs) const override;
+  std::ostream& print_type(std::ostream& os) const override {
+    return os << "DNS_RecordSet";
+  }
+  int check_tag(const vm::CellSlice& cs) const override;
+  int get_tag(const vm::CellSlice& cs) const override {
+    return 0;
+  }
+};
+
+extern const DNS_RecordSet t_DNS_RecordSet;
+
+//
+// headers for type `TextChunkRef`
+//
+
+struct TextChunkRef final : TLB_Complex {
+  enum { chunk_ref, chunk_ref_empty };
+  static constexpr int cons_len_exact = 0;
+  int m_;
+  TextChunkRef(int m) : m_(m) {}
+  struct Record_chunk_ref {
+    typedef TextChunkRef type_class;
+    int n;  	// n : #
+    Ref<Cell> ref;  	// ref : ^(TextChunks (n + 1))
+    Record_chunk_ref() = default;
+    Record_chunk_ref(Ref<Cell> _ref) : n(-1), ref(std::move(_ref)) {}
+  };
+  struct Record_chunk_ref_empty {
+    typedef TextChunkRef type_class;
+  };
+  bool skip(vm::CellSlice& cs) const override;
+  bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override;
+  bool unpack(vm::CellSlice& cs, Record_chunk_ref& data) const;
+  bool unpack_chunk_ref(vm::CellSlice& cs, int& n, Ref<Cell>& ref) const;
+  bool cell_unpack(Ref<vm::Cell> cell_ref, Record_chunk_ref& data) const;
+  bool cell_unpack_chunk_ref(Ref<vm::Cell> cell_ref, int& n, Ref<Cell>& ref) const;
+  bool pack(vm::CellBuilder& cb, const Record_chunk_ref& data) const;
+  bool pack_chunk_ref(vm::CellBuilder& cb, Ref<Cell> ref) const;
+  bool cell_pack(Ref<vm::Cell>& cell_ref, const Record_chunk_ref& data) const;
+  bool cell_pack_chunk_ref(Ref<vm::Cell>& cell_ref, Ref<Cell> ref) const;
+  bool unpack(vm::CellSlice& cs, Record_chunk_ref_empty& data) const;
+  bool unpack_chunk_ref_empty(vm::CellSlice& cs) const;
+  bool cell_unpack(Ref<vm::Cell> cell_ref, Record_chunk_ref_empty& data) const;
+  bool cell_unpack_chunk_ref_empty(Ref<vm::Cell> cell_ref) const;
+  bool pack(vm::CellBuilder& cb, const Record_chunk_ref_empty& data) const;
+  bool pack_chunk_ref_empty(vm::CellBuilder& cb) const;
+  bool cell_pack(Ref<vm::Cell>& cell_ref, const Record_chunk_ref_empty& data) const;
+  bool cell_pack_chunk_ref_empty(Ref<vm::Cell>& cell_ref) const;
+  bool print_skip(PrettyPrinter& pp, vm::CellSlice& cs) const override;
+  std::ostream& print_type(std::ostream& os) const override {
+    return os << "(TextChunkRef " << m_ << ")";
+  }
+  int check_tag(const vm::CellSlice& cs) const override;
+  int get_tag(const vm::CellSlice& cs) const override;
+};
+
+//
+// headers for type `TextChunks`
+//
+
+struct TextChunks final : TLB_Complex {
+  enum { text_chunk, text_chunk_empty };
+  static constexpr int cons_len_exact = 0;
+  int m_;
+  TextChunks(int m) : m_(m) {}
+  struct Record_text_chunk;
+  struct Record_text_chunk_empty {
+    typedef TextChunks type_class;
+  };
+  bool skip(vm::CellSlice& cs) const override;
+  bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override;
+  bool unpack(vm::CellSlice& cs, Record_text_chunk& data) const;
+  bool cell_unpack(Ref<vm::Cell> cell_ref, Record_text_chunk& data) const;
+  bool pack(vm::CellBuilder& cb, const Record_text_chunk& data) const;
+  bool cell_pack(Ref<vm::Cell>& cell_ref, const Record_text_chunk& data) const;
+  bool unpack(vm::CellSlice& cs, Record_text_chunk_empty& data) const;
+  bool unpack_text_chunk_empty(vm::CellSlice& cs) const;
+  bool cell_unpack(Ref<vm::Cell> cell_ref, Record_text_chunk_empty& data) const;
+  bool cell_unpack_text_chunk_empty(Ref<vm::Cell> cell_ref) const;
+  bool pack(vm::CellBuilder& cb, const Record_text_chunk_empty& data) const;
+  bool pack_text_chunk_empty(vm::CellBuilder& cb) const;
+  bool cell_pack(Ref<vm::Cell>& cell_ref, const Record_text_chunk_empty& data) const;
+  bool cell_pack_text_chunk_empty(Ref<vm::Cell>& cell_ref) const;
+  bool print_skip(PrettyPrinter& pp, vm::CellSlice& cs) const override;
+  std::ostream& print_type(std::ostream& os) const override {
+    return os << "(TextChunks " << m_ << ")";
+  }
+  int check_tag(const vm::CellSlice& cs) const override;
+  int get_tag(const vm::CellSlice& cs) const override;
+};
+
+struct TextChunks::Record_text_chunk {
+  typedef TextChunks type_class;
+  int n;  	// n : #
+  int len;  	// len : ## 8
+  Ref<td::BitString> data;  	// data : bits (8 * len)
+  Ref<CellSlice> next;  	// next : TextChunkRef n
+  Record_text_chunk() = default;
+  Record_text_chunk(int _len, Ref<td::BitString> _data, Ref<CellSlice> _next) : n(-1), len(_len), data(std::move(_data)), next(std::move(_next)) {}
+};
+
+//
+// headers for type `Text`
+//
+
+struct Text final : TLB_Complex {
+  enum { text };
+  static constexpr int cons_len_exact = 0;
+  struct Record {
+    typedef Text type_class;
+    int chunks;  	// chunks : ## 8
+    Ref<CellSlice> rest;  	// rest : TextChunks chunks
+    Record() = default;
+    Record(int _chunks, Ref<CellSlice> _rest) : chunks(_chunks), rest(std::move(_rest)) {}
+  };
+  bool skip(vm::CellSlice& cs) const override;
+  bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override;
+  bool unpack(vm::CellSlice& cs, Record& data) const;
+  bool unpack_text(vm::CellSlice& cs, int& chunks, Ref<CellSlice>& rest) const;
+  bool cell_unpack(Ref<vm::Cell> cell_ref, Record& data) const;
+  bool cell_unpack_text(Ref<vm::Cell> cell_ref, int& chunks, Ref<CellSlice>& rest) const;
+  bool pack(vm::CellBuilder& cb, const Record& data) const;
+  bool pack_text(vm::CellBuilder& cb, int chunks, Ref<CellSlice> rest) const;
+  bool cell_pack(Ref<vm::Cell>& cell_ref, const Record& data) const;
+  bool cell_pack_text(Ref<vm::Cell>& cell_ref, int chunks, Ref<CellSlice> rest) const;
+  bool print_skip(PrettyPrinter& pp, vm::CellSlice& cs) const override;
+  std::ostream& print_type(std::ostream& os) const override {
+    return os << "Text";
+  }
+  int check_tag(const vm::CellSlice& cs) const override;
+  int get_tag(const vm::CellSlice& cs) const override {
+    return 0;
+  }
+};
+
+extern const Text t_Text;
+
+//
+// headers for type `ProtoList`
+//
+
+struct ProtoList final : TLB_Complex {
+  enum { proto_list_nil, proto_list_next };
+  static constexpr int cons_len_exact = 1;
+  struct Record_proto_list_nil {
+    typedef ProtoList type_class;
+  };
+  struct Record_proto_list_next {
+    typedef ProtoList type_class;
+    char head;  	// head : Protocol
+    Ref<CellSlice> tail;  	// tail : ProtoList
+    Record_proto_list_next() = default;
+    Record_proto_list_next(char _head, Ref<CellSlice> _tail) : head(_head), tail(std::move(_tail)) {}
+  };
+  bool skip(vm::CellSlice& cs) const override;
+  bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override;
+  bool unpack(vm::CellSlice& cs, Record_proto_list_nil& data) const;
+  bool unpack_proto_list_nil(vm::CellSlice& cs) const;
+  bool cell_unpack(Ref<vm::Cell> cell_ref, Record_proto_list_nil& data) const;
+  bool cell_unpack_proto_list_nil(Ref<vm::Cell> cell_ref) const;
+  bool pack(vm::CellBuilder& cb, const Record_proto_list_nil& data) const;
+  bool pack_proto_list_nil(vm::CellBuilder& cb) const;
+  bool cell_pack(Ref<vm::Cell>& cell_ref, const Record_proto_list_nil& data) const;
+  bool cell_pack_proto_list_nil(Ref<vm::Cell>& cell_ref) const;
+  bool unpack(vm::CellSlice& cs, Record_proto_list_next& data) const;
+  bool unpack_proto_list_next(vm::CellSlice& cs, char& head, Ref<CellSlice>& tail) const;
+  bool cell_unpack(Ref<vm::Cell> cell_ref, Record_proto_list_next& data) const;
+  bool cell_unpack_proto_list_next(Ref<vm::Cell> cell_ref, char& head, Ref<CellSlice>& tail) const;
+  bool pack(vm::CellBuilder& cb, const Record_proto_list_next& data) const;
+  bool pack_proto_list_next(vm::CellBuilder& cb, char head, Ref<CellSlice> tail) const;
+  bool cell_pack(Ref<vm::Cell>& cell_ref, const Record_proto_list_next& data) const;
+  bool cell_pack_proto_list_next(Ref<vm::Cell>& cell_ref, char head, Ref<CellSlice> tail) const;
+  bool print_skip(PrettyPrinter& pp, vm::CellSlice& cs) const override;
+  std::ostream& print_type(std::ostream& os) const override {
+    return os << "ProtoList";
+  }
+  int check_tag(const vm::CellSlice& cs) const override;
+  int get_tag(const vm::CellSlice& cs) const override {
+    return (int)cs.prefetch_ulong(1);
+  }
+};
+
+extern const ProtoList t_ProtoList;
+
+//
+// headers for type `Protocol`
+//
+
+struct Protocol final : TLB_Complex {
+  enum { proto_http };
+  static constexpr int cons_len_exact = 16;
+  static constexpr unsigned short cons_tag[1] = { 0x4854 };
+  struct Record {
+    typedef Protocol type_class;
+  };
+  int get_size(const vm::CellSlice& cs) const override {
+    return 16;
+  }
+  bool skip(vm::CellSlice& cs) const override {
+    return cs.advance(16);
+  }
+  bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override;
+  bool fetch_enum_to(vm::CellSlice& cs, char& value) const;
+  bool store_enum_from(vm::CellBuilder& cb, int value) const;
+  bool unpack(vm::CellSlice& cs, Record& data) const;
+  bool unpack_proto_http(vm::CellSlice& cs) const;
+  bool cell_unpack(Ref<vm::Cell> cell_ref, Record& data) const;
+  bool cell_unpack_proto_http(Ref<vm::Cell> cell_ref) const;
+  bool pack(vm::CellBuilder& cb, const Record& data) const;
+  bool pack_proto_http(vm::CellBuilder& cb) const;
+  bool cell_pack(Ref<vm::Cell>& cell_ref, const Record& data) const;
+  bool cell_pack_proto_http(Ref<vm::Cell>& cell_ref) const;
+  bool print_skip(PrettyPrinter& pp, vm::CellSlice& cs) const override;
+  std::ostream& print_type(std::ostream& os) const override {
+    return os << "Protocol";
+  }
+  int check_tag(const vm::CellSlice& cs) const override;
+  int get_tag(const vm::CellSlice& cs) const override {
+    return 0;
+  }
+};
+
+extern const Protocol t_Protocol;
+
+//
+// headers for type `DNSRecord`
+//
+
+struct DNSRecord final : TLB_Complex {
+  enum { dns_text, dns_smc_address, dns_adnl_address, dns_next_resolver };
+  static constexpr int cons_len_exact = 16;
+  static constexpr unsigned short cons_tag[4] = { 0x1eda, 0x9fd3, 0xad01, 0xba93 };
+  struct Record_dns_text {
+    typedef DNSRecord type_class;
+    Ref<CellSlice> x;  	// Text
+    Record_dns_text() = default;
+    Record_dns_text(Ref<CellSlice> _x) : x(std::move(_x)) {}
+  };
+  struct Record_dns_next_resolver {
+    typedef DNSRecord type_class;
+    Ref<CellSlice> resolver;  	// resolver : MsgAddressInt
+    Record_dns_next_resolver() = default;
+    Record_dns_next_resolver(Ref<CellSlice> _resolver) : resolver(std::move(_resolver)) {}
+  };
+  struct Record_dns_adnl_address;
+  struct Record_dns_smc_address;
+  bool skip(vm::CellSlice& cs) const override;
+  bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override;
+  bool unpack(vm::CellSlice& cs, Record_dns_text& data) const;
+  bool unpack_dns_text(vm::CellSlice& cs, Ref<CellSlice>& x) const;
+  bool cell_unpack(Ref<vm::Cell> cell_ref, Record_dns_text& data) const;
+  bool cell_unpack_dns_text(Ref<vm::Cell> cell_ref, Ref<CellSlice>& x) const;
+  bool pack(vm::CellBuilder& cb, const Record_dns_text& data) const;
+  bool pack_dns_text(vm::CellBuilder& cb, Ref<CellSlice> x) const;
+  bool cell_pack(Ref<vm::Cell>& cell_ref, const Record_dns_text& data) const;
+  bool cell_pack_dns_text(Ref<vm::Cell>& cell_ref, Ref<CellSlice> x) const;
+  bool unpack(vm::CellSlice& cs, Record_dns_next_resolver& data) const;
+  bool unpack_dns_next_resolver(vm::CellSlice& cs, Ref<CellSlice>& resolver) const;
+  bool cell_unpack(Ref<vm::Cell> cell_ref, Record_dns_next_resolver& data) const;
+  bool cell_unpack_dns_next_resolver(Ref<vm::Cell> cell_ref, Ref<CellSlice>& resolver) const;
+  bool pack(vm::CellBuilder& cb, const Record_dns_next_resolver& data) const;
+  bool pack_dns_next_resolver(vm::CellBuilder& cb, Ref<CellSlice> resolver) const;
+  bool cell_pack(Ref<vm::Cell>& cell_ref, const Record_dns_next_resolver& data) const;
+  bool cell_pack_dns_next_resolver(Ref<vm::Cell>& cell_ref, Ref<CellSlice> resolver) const;
+  bool unpack(vm::CellSlice& cs, Record_dns_adnl_address& data) const;
+  bool unpack_dns_adnl_address(vm::CellSlice& cs, td::BitArray<256>& adnl_addr, int& flags, Ref<CellSlice>& proto_list) const;
+  bool cell_unpack(Ref<vm::Cell> cell_ref, Record_dns_adnl_address& data) const;
+  bool cell_unpack_dns_adnl_address(Ref<vm::Cell> cell_ref, td::BitArray<256>& adnl_addr, int& flags, Ref<CellSlice>& proto_list) const;
+  bool pack(vm::CellBuilder& cb, const Record_dns_adnl_address& data) const;
+  bool pack_dns_adnl_address(vm::CellBuilder& cb, td::BitArray<256> adnl_addr, int flags, Ref<CellSlice> proto_list) const;
+  bool cell_pack(Ref<vm::Cell>& cell_ref, const Record_dns_adnl_address& data) const;
+  bool cell_pack_dns_adnl_address(Ref<vm::Cell>& cell_ref, td::BitArray<256> adnl_addr, int flags, Ref<CellSlice> proto_list) const;
+  bool unpack(vm::CellSlice& cs, Record_dns_smc_address& data) const;
+  bool unpack_dns_smc_address(vm::CellSlice& cs, Ref<CellSlice>& smc_addr, int& flags, Ref<CellSlice>& cap_list) const;
+  bool cell_unpack(Ref<vm::Cell> cell_ref, Record_dns_smc_address& data) const;
+  bool cell_unpack_dns_smc_address(Ref<vm::Cell> cell_ref, Ref<CellSlice>& smc_addr, int& flags, Ref<CellSlice>& cap_list) const;
+  bool pack(vm::CellBuilder& cb, const Record_dns_smc_address& data) const;
+  bool pack_dns_smc_address(vm::CellBuilder& cb, Ref<CellSlice> smc_addr, int flags, Ref<CellSlice> cap_list) const;
+  bool cell_pack(Ref<vm::Cell>& cell_ref, const Record_dns_smc_address& data) const;
+  bool cell_pack_dns_smc_address(Ref<vm::Cell>& cell_ref, Ref<CellSlice> smc_addr, int flags, Ref<CellSlice> cap_list) const;
+  bool print_skip(PrettyPrinter& pp, vm::CellSlice& cs) const override;
+  std::ostream& print_type(std::ostream& os) const override {
+    return os << "DNSRecord";
+  }
+  int check_tag(const vm::CellSlice& cs) const override;
+  int get_tag(const vm::CellSlice& cs) const override {
+    return cs.bselect(4, 0xe02);
+  }
+};
+
+struct DNSRecord::Record_dns_adnl_address {
+  typedef DNSRecord type_class;
+  td::BitArray<256> adnl_addr;  	// adnl_addr : bits256
+  int flags;  	// flags : ## 8
+  Ref<CellSlice> proto_list;  	// proto_list : flags.0?ProtoList
+  Record_dns_adnl_address() = default;
+  Record_dns_adnl_address(const td::BitArray<256>& _adnl_addr, int _flags, Ref<CellSlice> _proto_list) : adnl_addr(_adnl_addr), flags(_flags), proto_list(std::move(_proto_list)) {}
+};
+
+struct DNSRecord::Record_dns_smc_address {
+  typedef DNSRecord type_class;
+  Ref<CellSlice> smc_addr;  	// smc_addr : MsgAddressInt
+  int flags;  	// flags : ## 8
+  Ref<CellSlice> cap_list;  	// cap_list : flags.0?SmcCapList
+  Record_dns_smc_address() = default;
+  Record_dns_smc_address(Ref<CellSlice> _smc_addr, int _flags, Ref<CellSlice> _cap_list) : smc_addr(std::move(_smc_addr)), flags(_flags), cap_list(std::move(_cap_list)) {}
+};
+
+extern const DNSRecord t_DNSRecord;
+
+//
+// headers for type `SmcCapList`
+//
+
+struct SmcCapList final : TLB_Complex {
+  enum { cap_list_nil, cap_list_next };
+  static constexpr int cons_len_exact = 1;
+  struct Record_cap_list_nil {
+    typedef SmcCapList type_class;
+  };
+  struct Record_cap_list_next {
+    typedef SmcCapList type_class;
+    Ref<CellSlice> head;  	// head : SmcCapability
+    Ref<CellSlice> tail;  	// tail : SmcCapList
+    Record_cap_list_next() = default;
+    Record_cap_list_next(Ref<CellSlice> _head, Ref<CellSlice> _tail) : head(std::move(_head)), tail(std::move(_tail)) {}
+  };
+  bool skip(vm::CellSlice& cs) const override;
+  bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override;
+  bool unpack(vm::CellSlice& cs, Record_cap_list_nil& data) const;
+  bool unpack_cap_list_nil(vm::CellSlice& cs) const;
+  bool cell_unpack(Ref<vm::Cell> cell_ref, Record_cap_list_nil& data) const;
+  bool cell_unpack_cap_list_nil(Ref<vm::Cell> cell_ref) const;
+  bool pack(vm::CellBuilder& cb, const Record_cap_list_nil& data) const;
+  bool pack_cap_list_nil(vm::CellBuilder& cb) const;
+  bool cell_pack(Ref<vm::Cell>& cell_ref, const Record_cap_list_nil& data) const;
+  bool cell_pack_cap_list_nil(Ref<vm::Cell>& cell_ref) const;
+  bool unpack(vm::CellSlice& cs, Record_cap_list_next& data) const;
+  bool unpack_cap_list_next(vm::CellSlice& cs, Ref<CellSlice>& head, Ref<CellSlice>& tail) const;
+  bool cell_unpack(Ref<vm::Cell> cell_ref, Record_cap_list_next& data) const;
+  bool cell_unpack_cap_list_next(Ref<vm::Cell> cell_ref, Ref<CellSlice>& head, Ref<CellSlice>& tail) const;
+  bool pack(vm::CellBuilder& cb, const Record_cap_list_next& data) const;
+  bool pack_cap_list_next(vm::CellBuilder& cb, Ref<CellSlice> head, Ref<CellSlice> tail) const;
+  bool cell_pack(Ref<vm::Cell>& cell_ref, const Record_cap_list_next& data) const;
+  bool cell_pack_cap_list_next(Ref<vm::Cell>& cell_ref, Ref<CellSlice> head, Ref<CellSlice> tail) const;
+  bool print_skip(PrettyPrinter& pp, vm::CellSlice& cs) const override;
+  std::ostream& print_type(std::ostream& os) const override {
+    return os << "SmcCapList";
+  }
+  int check_tag(const vm::CellSlice& cs) const override;
+  int get_tag(const vm::CellSlice& cs) const override {
+    return (int)cs.prefetch_ulong(1);
+  }
+};
+
+extern const SmcCapList t_SmcCapList;
+
+//
+// headers for type `SmcCapability`
+//
+
+struct SmcCapability final : TLB_Complex {
+  enum { cap_is_wallet, cap_method_seqno, cap_method_pubkey, cap_name };
+  static constexpr char cons_len[4] = { 16, 16, 16, 8 };
+  static constexpr unsigned short cons_tag[4] = { 0x2177, 0x5371, 0x71f4, 0xff };
+  struct Record_cap_method_seqno {
+    typedef SmcCapability type_class;
+  };
+  struct Record_cap_method_pubkey {
+    typedef SmcCapability type_class;
+  };
+  struct Record_cap_is_wallet {
+    typedef SmcCapability type_class;
+  };
+  struct Record_cap_name {
+    typedef SmcCapability type_class;
+    Ref<CellSlice> name;  	// name : Text
+    Record_cap_name() = default;
+    Record_cap_name(Ref<CellSlice> _name) : name(std::move(_name)) {}
+  };
+  bool skip(vm::CellSlice& cs) const override;
+  bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override;
+  bool unpack(vm::CellSlice& cs, Record_cap_method_seqno& data) const;
+  bool unpack_cap_method_seqno(vm::CellSlice& cs) const;
+  bool cell_unpack(Ref<vm::Cell> cell_ref, Record_cap_method_seqno& data) const;
+  bool cell_unpack_cap_method_seqno(Ref<vm::Cell> cell_ref) const;
+  bool pack(vm::CellBuilder& cb, const Record_cap_method_seqno& data) const;
+  bool pack_cap_method_seqno(vm::CellBuilder& cb) const;
+  bool cell_pack(Ref<vm::Cell>& cell_ref, const Record_cap_method_seqno& data) const;
+  bool cell_pack_cap_method_seqno(Ref<vm::Cell>& cell_ref) const;
+  bool unpack(vm::CellSlice& cs, Record_cap_method_pubkey& data) const;
+  bool unpack_cap_method_pubkey(vm::CellSlice& cs) const;
+  bool cell_unpack(Ref<vm::Cell> cell_ref, Record_cap_method_pubkey& data) const;
+  bool cell_unpack_cap_method_pubkey(Ref<vm::Cell> cell_ref) const;
+  bool pack(vm::CellBuilder& cb, const Record_cap_method_pubkey& data) const;
+  bool pack_cap_method_pubkey(vm::CellBuilder& cb) const;
+  bool cell_pack(Ref<vm::Cell>& cell_ref, const Record_cap_method_pubkey& data) const;
+  bool cell_pack_cap_method_pubkey(Ref<vm::Cell>& cell_ref) const;
+  bool unpack(vm::CellSlice& cs, Record_cap_is_wallet& data) const;
+  bool unpack_cap_is_wallet(vm::CellSlice& cs) const;
+  bool cell_unpack(Ref<vm::Cell> cell_ref, Record_cap_is_wallet& data) const;
+  bool cell_unpack_cap_is_wallet(Ref<vm::Cell> cell_ref) const;
+  bool pack(vm::CellBuilder& cb, const Record_cap_is_wallet& data) const;
+  bool pack_cap_is_wallet(vm::CellBuilder& cb) const;
+  bool cell_pack(Ref<vm::Cell>& cell_ref, const Record_cap_is_wallet& data) const;
+  bool cell_pack_cap_is_wallet(Ref<vm::Cell>& cell_ref) const;
+  bool unpack(vm::CellSlice& cs, Record_cap_name& data) const;
+  bool unpack_cap_name(vm::CellSlice& cs, Ref<CellSlice>& name) const;
+  bool cell_unpack(Ref<vm::Cell> cell_ref, Record_cap_name& data) const;
+  bool cell_unpack_cap_name(Ref<vm::Cell> cell_ref, Ref<CellSlice>& name) const;
+  bool pack(vm::CellBuilder& cb, const Record_cap_name& data) const;
+  bool pack_cap_name(vm::CellBuilder& cb, Ref<CellSlice> name) const;
+  bool cell_pack(Ref<vm::Cell>& cell_ref, const Record_cap_name& data) const;
+  bool cell_pack_cap_name(Ref<vm::Cell>& cell_ref, Ref<CellSlice> name) const;
+  bool print_skip(PrettyPrinter& pp, vm::CellSlice& cs) const override;
+  std::ostream& print_type(std::ostream& os) const override {
+    return os << "SmcCapability";
+  }
+  int check_tag(const vm::CellSlice& cs) const override;
+  int get_tag(const vm::CellSlice& cs) const override {
+    return cs.bselect(3, 0x8e);
+  }
+};
+
+extern const SmcCapability t_SmcCapability;
+
 // declarations of constant types used
 
 // ## 1
@@ -7367,6 +8638,8 @@ extern const NatWidth t_natwidth_8;
 extern const MessageRelaxed t_MessageRelaxed_Any;
 // ^(MessageRelaxed Any)
 extern const RefT t_Ref_MessageRelaxed_Any;
+// ## 7
+extern const NatWidth t_natwidth_7;
 // #<= 60
 extern const NatLeq t_natleq_60;
 // ^OutMsgQueueInfo
@@ -7378,7 +8651,7 @@ extern const HashmapE t_HashmapE_256_LibDescr;
 // Maybe BlkMasterInfo
 extern const Maybe t_Maybe_BlkMasterInfo;
 // ^[$_ overload_history:uint64 underload_history:uint64 total_balance:CurrencyCollection total_validator_fees:CurrencyCollection libraries:(HashmapE 256 LibDescr) master_ref:(Maybe BlkMasterInfo) ]
-extern const RefT t_Ref_TYPE_1637;
+extern const RefT t_Ref_TYPE_1638;
 // ^McStateExtra
 extern const RefT t_Ref_McStateExtra;
 // Maybe ^McStateExtra
@@ -7416,9 +8689,9 @@ extern const RefT t_Ref_McBlockExtra;
 // Maybe ^McBlockExtra
 extern const Maybe t_Maybe_Ref_McBlockExtra;
 // ^[$_ from_prev_blk:CurrencyCollection to_next_blk:CurrencyCollection imported:CurrencyCollection exported:CurrencyCollection ]
-extern const RefT t_Ref_TYPE_1647;
-// ^[$_ fees_imported:CurrencyCollection recovered:CurrencyCollection created:CurrencyCollection minted:CurrencyCollection ]
 extern const RefT t_Ref_TYPE_1648;
+// ^[$_ fees_imported:CurrencyCollection recovered:CurrencyCollection created:CurrencyCollection minted:CurrencyCollection ]
+extern const RefT t_Ref_TYPE_1649;
 // ## 3
 extern const NatWidth t_natwidth_3;
 // BinTree ShardDescr
@@ -7437,12 +8710,14 @@ extern const RefT t_Ref_Hashmap_32_Ref_Cell;
 extern const HashmapAugE t_HashmapAugE_32_KeyExtBlkRef_KeyMaxLt;
 // HashmapE 256 CreatorStats
 extern const HashmapE t_HashmapE_256_CreatorStats;
+// HashmapAugE 256 CreatorStats uint32
+extern const HashmapAugE t_HashmapAugE_256_CreatorStats_uint32;
 // ## 16
 extern const NatWidth t_natwidth_16;
 // Maybe ExtBlkRef
 extern const Maybe t_Maybe_ExtBlkRef;
 // ^[$_ flags:(## 16) {<= flags 1} validator_info:ValidatorInfo prev_blocks:OldMcBlocksInfo after_key_block:Bool last_key_block:(Maybe ExtBlkRef) block_create_stats:flags.0?BlockCreateStats ]
-extern const RefT t_Ref_TYPE_1665;
+extern const RefT t_Ref_TYPE_1666;
 // ^SignedCertificate
 extern const RefT t_Ref_SignedCertificate;
 // HashmapE 16 CryptoSignaturePair
@@ -7450,7 +8725,7 @@ extern const HashmapE t_HashmapE_16_CryptoSignaturePair;
 // Maybe ^InMsg
 extern const Maybe t_Maybe_Ref_InMsg;
 // ^[$_ prev_blk_signatures:(HashmapE 16 CryptoSignaturePair) recover_create_msg:(Maybe ^InMsg) mint_msg:(Maybe ^InMsg) ]
-extern const RefT t_Ref_TYPE_1673;
+extern const RefT t_Ref_TYPE_1674;
 // Hashmap 16 ValidatorDescr
 extern const Hashmap t_Hashmap_16_ValidatorDescr;
 // HashmapE 16 ValidatorDescr
@@ -7481,6 +8756,45 @@ extern const Maybe t_Maybe_Ref_BlockSignatures;
 extern const RefT t_Ref_TopBlockDescr;
 // HashmapE 96 ^TopBlockDescr
 extern const HashmapE t_HashmapE_96_Ref_TopBlockDescr;
+// int64
+extern const Int t_int64;
+// int257
+extern const Int t_int257;
+// ## 10
+extern const NatWidth t_natwidth_10;
+// #<= 4
+extern const NatLeq t_natleq_4;
+// ^VmStackValue
+extern const RefT t_Ref_VmStackValue;
+// ## 24
+extern const NatWidth t_natwidth_24;
+// HashmapE 4 VmStackValue
+extern const HashmapE t_HashmapE_4_VmStackValue;
+// ^[$_ max_limit:int64 cur_limit:int64 credit:int64 ]
+extern const RefT t_Ref_TYPE_1705;
+// HashmapE 256 ^Cell
+extern const HashmapE t_HashmapE_256_Ref_Cell;
+// uint13
+extern const UInt t_uint13;
+// Maybe uint13
+extern const Maybe t_Maybe_uint13;
+// Maybe VmStack
+extern const Maybe t_Maybe_VmStack;
+// int16
+extern const Int t_int16;
+// Maybe int16
+extern const Maybe t_Maybe_int16;
+// ^VmCont
+extern const RefT t_Ref_VmCont;
+// uint63
+extern const UInt t_uint63;
+// ^DNSRecord
+extern const RefT t_Ref_DNSRecord;
+// HashmapE 16 ^DNSRecord
+extern const HashmapE t_HashmapE_16_Ref_DNSRecord;
+
+// declaration of type name registration function
+extern bool register_simple_types(std::function<bool(const char*, const TLB*)> func);
 
 } // namespace gen
 
diff --git a/submodules/ton/tonlib-src/crypto/block/block-parse.cpp b/submodules/ton/tonlib-src/crypto/block/block-parse.cpp
index c410e2cb53..a032236608 100644
--- a/submodules/ton/tonlib-src/crypto/block/block-parse.cpp
+++ b/submodules/ton/tonlib-src/crypto/block/block-parse.cpp
@@ -14,7 +14,7 @@
     You should have received a copy of the GNU Lesser General Public License
     along with TON Blockchain Library.  If not, see <http://www.gnu.org/licenses/>.
 
-    Copyright 2017-2019 Telegram Systems LLP
+    Copyright 2017-2020 Telegram Systems LLP
 */
 #include "td/utils/bits.h"
 #include "block/block-parse.h"
@@ -80,7 +80,7 @@ bool Maybe_Anycast::skip_get_depth(vm::CellSlice& cs, int& depth) const {
 
 const Maybe_Anycast t_Maybe_Anycast;
 
-bool MsgAddressInt::validate_skip(vm::CellSlice& cs, bool weak) const {
+bool MsgAddressInt::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const {
   if (!cs.have(3)) {
     return false;
   }
@@ -241,16 +241,38 @@ bool MsgAddressInt::extract_std_address(vm::CellSlice& cs, ton::WorkchainId& wor
   return false;
 }
 
+bool MsgAddressInt::store_std_address(vm::CellBuilder& cb, ton::WorkchainId workchain,
+                                      const ton::StdSmcAddress& addr) const {
+  if (workchain >= -128 && workchain < 128) {
+    return cb.store_long_bool(4, 3)             // addr_std$10 anycast:(Maybe Anycast)
+           && cb.store_long_bool(workchain, 8)  // workchain_id:int8
+           && cb.store_bits_bool(addr);         // address:bits256 = MsgAddressInt;
+  } else {
+    return cb.store_long_bool(0xd00, 12)         // addr_var$11 anycast:(Maybe Anycast) addr_len:(## 9)
+           && cb.store_long_bool(workchain, 32)  // workchain_id:int32
+           && cb.store_bits_bool(addr);          // address:(bits addr_len) = MsgAddressInt;
+  }
+}
+
+Ref<vm::CellSlice> MsgAddressInt::pack_std_address(ton::WorkchainId workchain, const ton::StdSmcAddress& addr) const {
+  vm::CellBuilder cb;
+  if (store_std_address(cb, workchain, addr)) {
+    return vm::load_cell_slice_ref(cb.finalize());
+  } else {
+    return {};
+  }
+}
+
 const MsgAddressInt t_MsgAddressInt;
 
-bool MsgAddress::validate_skip(vm::CellSlice& cs, bool weak) const {
+bool MsgAddress::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const {
   switch (get_tag(cs)) {
     case addr_none:
     case addr_ext:
-      return t_MsgAddressExt.validate_skip(cs, weak);
+      return t_MsgAddressExt.validate_skip(ops, cs, weak);
     case addr_std:
     case addr_var:
-      return t_MsgAddressInt.validate_skip(cs, weak);
+      return t_MsgAddressInt.validate_skip(ops, cs, weak);
   }
   return false;
 }
@@ -262,7 +284,7 @@ bool VarUInteger::skip(vm::CellSlice& cs) const {
   return len >= 0 && len < n && cs.advance(len * 8);
 }
 
-bool VarUInteger::validate_skip(vm::CellSlice& cs, bool weak) const {
+bool VarUInteger::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const {
   int len = (int)cs.fetch_ulong(ln);
   return len >= 0 && len < n && (!len || cs.prefetch_ulong(8)) && cs.advance(len * 8);
 }
@@ -303,7 +325,7 @@ bool VarUIntegerPos::skip(vm::CellSlice& cs) const {
   return len > 0 && len < n && cs.advance(len * 8);
 }
 
-bool VarUIntegerPos::validate_skip(vm::CellSlice& cs, bool weak) const {
+bool VarUIntegerPos::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const {
   int len = (int)cs.fetch_ulong(ln);
   return len > 0 && len < n && cs.prefetch_ulong(8) && cs.advance(len * 8);
 }
@@ -338,7 +360,7 @@ bool VarInteger::skip(vm::CellSlice& cs) const {
   return len >= 0 && len < n && cs.advance(len * 8);
 }
 
-bool VarInteger::validate_skip(vm::CellSlice& cs, bool weak) const {
+bool VarInteger::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const {
   int len = (int)cs.fetch_ulong(ln);
   return len >= 0 && len < n && (!len || !redundant_int(cs)) && cs.advance(len * 8);
 }
@@ -364,7 +386,7 @@ bool VarIntegerNz::skip(vm::CellSlice& cs) const {
   return len > 0 && len < n && cs.advance(len * 8);
 }
 
-bool VarIntegerNz::validate_skip(vm::CellSlice& cs, bool weak) const {
+bool VarIntegerNz::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const {
   int len = (int)cs.fetch_ulong(ln);
   return len > 0 && len < n && !redundant_int(cs) && cs.advance(len * 8);
 }
@@ -387,8 +409,8 @@ bool VarIntegerNz::store_integer_value(vm::CellBuilder& cb, const td::BigInt256&
          cb.store_int256_bool(value, (k + 7) & -8, true);
 }
 
-bool Grams::validate_skip(vm::CellSlice& cs, bool weak) const {
-  return t_VarUInteger_16.validate_skip(cs, weak);
+bool Grams::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const {
+  return t_VarUInteger_16.validate_skip(ops, cs, weak);
 }
 
 td::RefInt256 Grams::as_integer_skip(vm::CellSlice& cs) const {
@@ -442,15 +464,15 @@ bool HashmapNode::skip(vm::CellSlice& cs) const {
   return n ? cs.advance_refs(2) : value_type.skip(cs);
 }
 
-bool HashmapNode::validate_skip(vm::CellSlice& cs, bool weak) const {
+bool HashmapNode::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const {
   assert(n >= 0);
   if (!n) {
     // hmn_leaf
-    return value_type.validate_skip(cs, weak);
+    return value_type.validate_skip(ops, cs, weak);
   } else {
     // hmn_fork
     Hashmap branch_type{n - 1, value_type};
-    return branch_type.validate_ref(cs.fetch_ref(), weak) && branch_type.validate_ref(cs.fetch_ref(), weak);
+    return branch_type.validate_ref(ops, cs.fetch_ref(), weak) && branch_type.validate_ref(ops, cs.fetch_ref(), weak);
   }
 }
 
@@ -459,9 +481,9 @@ bool Hashmap::skip(vm::CellSlice& cs) const {
   return HmLabel{n}.skip(cs, l) && HashmapNode{n - l, value_type}.skip(cs);
 }
 
-bool Hashmap::validate_skip(vm::CellSlice& cs, bool weak) const {
+bool Hashmap::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const {
   int l;
-  return HmLabel{n}.validate_skip(cs, weak, l) && HashmapNode{n - l, value_type}.validate_skip(cs, weak);
+  return HmLabel{n}.validate_skip(cs, weak, l) && HashmapNode{n - l, value_type}.validate_skip(ops, cs, weak);
 }
 
 int HashmapE::get_size(const vm::CellSlice& cs) const {
@@ -469,9 +491,9 @@ int HashmapE::get_size(const vm::CellSlice& cs) const {
   return (tag >= 0 ? (tag > 0 ? 0x10001 : 1) : -1);
 }
 
-bool HashmapE::validate(const vm::CellSlice& cs, bool weak) const {
+bool HashmapE::validate(int* ops, const vm::CellSlice& cs, bool weak) const {
   int tag = get_tag(cs);
-  return tag <= 0 ? !tag : root_type.validate_ref(cs.prefetch_ref(), weak);
+  return tag <= 0 ? !tag : root_type.validate_ref(ops, cs.prefetch_ref(), weak);
 }
 
 bool HashmapE::add_values(vm::CellBuilder& cb, vm::CellSlice& cs1, vm::CellSlice& cs2) const {
@@ -561,8 +583,8 @@ bool HashmapE::store_ref(vm::CellBuilder& cb, Ref<vm::Cell> arg) const {
 
 const ExtraCurrencyCollection t_ExtraCurrencyCollection;
 
-bool CurrencyCollection::validate_skip(vm::CellSlice& cs, bool weak) const {
-  return t_Grams.validate_skip(cs, weak) && t_ExtraCurrencyCollection.validate_skip(cs, weak);
+bool CurrencyCollection::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const {
+  return t_Grams.validate_skip(ops, cs, weak) && t_ExtraCurrencyCollection.validate_skip(ops, cs, weak);
 }
 
 bool CurrencyCollection::skip(vm::CellSlice& cs) const {
@@ -619,25 +641,25 @@ bool CurrencyCollection::pack(vm::CellBuilder& cb, const block::CurrencyCollecti
 
 const CurrencyCollection t_CurrencyCollection;
 
-bool CommonMsgInfo::validate_skip(vm::CellSlice& cs, bool weak) const {
+bool CommonMsgInfo::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const {
   int tag = get_tag(cs);
   switch (tag) {
     case int_msg_info:
-      return cs.advance(4)                               // int_msg_info$0 ihr_disabled:Bool bounce:Bool bounced:Bool
-             && t_MsgAddressInt.validate_skip(cs, weak)  // src
-             && t_MsgAddressInt.validate_skip(cs, weak)  // dest
-             && t_CurrencyCollection.validate_skip(cs, weak)  // value
-             && t_Grams.validate_skip(cs, weak)               // ihr_fee
-             && t_Grams.validate_skip(cs, weak)               // fwd_fee
-             && cs.advance(64 + 32);                          // created_lt:uint64 created_at:uint32
+      return cs.advance(4)  // int_msg_info$0 ihr_disabled:Bool bounce:Bool bounced:Bool
+             && t_MsgAddressInt.validate_skip(ops, cs, weak)       // src
+             && t_MsgAddressInt.validate_skip(ops, cs, weak)       // dest
+             && t_CurrencyCollection.validate_skip(ops, cs, weak)  // value
+             && t_Grams.validate_skip(ops, cs, weak)               // ihr_fee
+             && t_Grams.validate_skip(ops, cs, weak)               // fwd_fee
+             && cs.advance(64 + 32);                               // created_lt:uint64 created_at:uint32
     case ext_in_msg_info:
-      return cs.advance(2) && t_MsgAddressExt.validate_skip(cs, weak)  // src
-             && t_MsgAddressInt.validate_skip(cs, weak)                // dest
-             && t_Grams.validate_skip(cs, weak);                       // import_fee
+      return cs.advance(2) && t_MsgAddressExt.validate_skip(ops, cs, weak)  // src
+             && t_MsgAddressInt.validate_skip(ops, cs, weak)                // dest
+             && t_Grams.validate_skip(ops, cs, weak);                       // import_fee
     case ext_out_msg_info:
-      return cs.advance(2) && t_MsgAddressInt.validate_skip(cs, weak)  // src
-             && t_MsgAddressExt.validate_skip(cs, weak)                // dest
-             && cs.advance(64 + 32);                                   // created_lt:uint64 created_at:uint32
+      return cs.advance(2) && t_MsgAddressInt.validate_skip(ops, cs, weak)  // src
+             && t_MsgAddressExt.validate_skip(ops, cs, weak)                // dest
+             && cs.advance(64 + 32);                                        // created_lt:uint64 created_at:uint32
   }
   return false;
 }
@@ -699,28 +721,29 @@ const CommonMsgInfo t_CommonMsgInfo;
 const TickTock t_TickTock;
 const RefAnything t_RefCell;
 
-bool StateInit::validate_skip(vm::CellSlice& cs, bool weak) const {
-  return Maybe<UInt>{5}.validate_skip(cs, weak)            // split_depth:(Maybe (## 5))
-         && Maybe<TickTock>{}.validate_skip(cs, weak)      // special:(Maybe TickTock)
-         && Maybe<RefAnything>{}.validate_skip(cs, weak)   // code:(Maybe ^Cell)
-         && Maybe<RefAnything>{}.validate_skip(cs, weak)   // data:(Maybe ^Cell)
-         && Maybe<RefAnything>{}.validate_skip(cs, weak);  // library:(Maybe ^Cell)
+bool StateInit::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const {
+  return Maybe<UInt>{5}.validate_skip(ops, cs, weak)            // split_depth:(Maybe (## 5))
+         && Maybe<TickTock>{}.validate_skip(ops, cs, weak)      // special:(Maybe TickTock)
+         && Maybe<RefAnything>{}.validate_skip(ops, cs, weak)   // code:(Maybe ^Cell)
+         && Maybe<RefAnything>{}.validate_skip(ops, cs, weak)   // data:(Maybe ^Cell)
+         && Maybe<RefAnything>{}.validate_skip(ops, cs, weak);  // library:(Maybe ^Cell)
 }
 
 bool StateInit::get_ticktock(vm::CellSlice& cs, int& ticktock) const {
   bool have_tt;
   ticktock = 0;
-  return Maybe<UInt>{5}.validate_skip(cs) && cs.fetch_bool_to(have_tt) && (!have_tt || cs.fetch_uint_to(2, ticktock));
+  return Maybe<UInt>{5}.validate_skip_upto(1, cs) && cs.fetch_bool_to(have_tt) &&
+         (!have_tt || cs.fetch_uint_to(2, ticktock));
 }
 
 const StateInit t_StateInit;
 
-bool Message::validate_skip(vm::CellSlice& cs, bool weak) const {
+bool Message::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const {
   static const Maybe<Either<StateInit, RefTo<StateInit>>> init_type;
   static const Either<Anything, RefAnything> body_type;
-  return t_CommonMsgInfo.validate_skip(cs, weak)  // info:CommonMsgInfo
-         && init_type.validate_skip(cs, weak)     // init:(Maybe (Either StateInit ^StateInit))
-         && body_type.validate_skip(cs, weak);    // body:(Either X ^X)
+  return t_CommonMsgInfo.validate_skip(ops, cs, weak)  // info:CommonMsgInfo
+         && init_type.validate_skip(ops, cs, weak)     // init:(Maybe (Either StateInit ^StateInit))
+         && body_type.validate_skip(ops, cs, weak);    // body:(Either X ^X)
 }
 
 bool Message::extract_info(vm::CellSlice& cs) const {
@@ -738,7 +761,7 @@ bool Message::is_internal(Ref<vm::Cell> ref) const {
 const Message t_Message;
 const RefTo<Message> t_Ref_Message;
 
-bool IntermediateAddress::validate_skip(vm::CellSlice& cs, bool weak) const {
+bool IntermediateAddress::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const {
   switch (get_tag(cs)) {
     case interm_addr_regular:
       return cs.advance(1) && cs.fetch_ulong(7) <= 96U;
@@ -773,12 +796,12 @@ int IntermediateAddress::get_size(const vm::CellSlice& cs) const {
 
 const IntermediateAddress t_IntermediateAddress;
 
-bool MsgEnvelope::validate_skip(vm::CellSlice& cs, bool weak) const {
-  return cs.fetch_ulong(4) == 4                            // msg_envelope#4
-         && t_IntermediateAddress.validate_skip(cs, weak)  // cur_addr:IntermediateAddress
-         && t_IntermediateAddress.validate_skip(cs, weak)  // next_addr:IntermediateAddress
-         && t_Grams.validate_skip(cs, weak)                // fwd_fee_remaining:Grams
-         && t_Ref_Message.validate_skip(cs, weak);         // msg:^Message
+bool MsgEnvelope::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const {
+  return cs.fetch_ulong(4) == 4                                 // msg_envelope#4
+         && t_IntermediateAddress.validate_skip(ops, cs, weak)  // cur_addr:IntermediateAddress
+         && t_IntermediateAddress.validate_skip(ops, cs, weak)  // next_addr:IntermediateAddress
+         && t_Grams.validate_skip(ops, cs, weak)                // fwd_fee_remaining:Grams
+         && t_Ref_Message.validate_skip(ops, cs, weak);         // msg:^Message
 }
 
 bool MsgEnvelope::skip(vm::CellSlice& cs) const {
@@ -827,10 +850,10 @@ bool MsgEnvelope::get_created_lt(const vm::CellSlice& cs, unsigned long long& cr
 const MsgEnvelope t_MsgEnvelope;
 const RefTo<MsgEnvelope> t_Ref_MsgEnvelope;
 
-bool StorageUsed::validate_skip(vm::CellSlice& cs, bool weak) const {
-  return t_VarUInteger_7.validate_skip(cs, weak)      // cells:(VarUInteger 7)
-         && t_VarUInteger_7.validate_skip(cs, weak)   // bits:(VarUInteger 7)
-         && t_VarUInteger_7.validate_skip(cs, weak);  // public_cells:(VarUInteger 7)
+bool StorageUsed::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const {
+  return t_VarUInteger_7.validate_skip(ops, cs, weak)      // cells:(VarUInteger 7)
+         && t_VarUInteger_7.validate_skip(ops, cs, weak)   // bits:(VarUInteger 7)
+         && t_VarUInteger_7.validate_skip(ops, cs, weak);  // public_cells:(VarUInteger 7)
 }
 
 bool StorageUsed::skip(vm::CellSlice& cs) const {
@@ -841,9 +864,9 @@ bool StorageUsed::skip(vm::CellSlice& cs) const {
 
 const StorageUsed t_StorageUsed;
 
-bool StorageUsedShort::validate_skip(vm::CellSlice& cs, bool weak) const {
-  return t_VarUInteger_7.validate_skip(cs, weak)      // cells:(VarUInteger 7)
-         && t_VarUInteger_7.validate_skip(cs, weak);  // bits:(VarUInteger 7)
+bool StorageUsedShort::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const {
+  return t_VarUInteger_7.validate_skip(ops, cs, weak)      // cells:(VarUInteger 7)
+         && t_VarUInteger_7.validate_skip(ops, cs, weak);  // bits:(VarUInteger 7)
 }
 
 bool StorageUsedShort::skip(vm::CellSlice& cs) const {
@@ -861,22 +884,22 @@ bool StorageInfo::skip(vm::CellSlice& cs) const {
          && t_Maybe_Grams.skip(cs);  // due_payment:(Maybe Grams)
 }
 
-bool StorageInfo::validate_skip(vm::CellSlice& cs, bool weak) const {
-  return t_StorageUsed.validate_skip(cs, weak)      // used:StorageUsed
-         && cs.advance(32)                          // last_paid:uint32
-         && t_Maybe_Grams.validate_skip(cs, weak);  // due_payment:(Maybe Grams)
+bool StorageInfo::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const {
+  return t_StorageUsed.validate_skip(ops, cs, weak)      // used:StorageUsed
+         && cs.advance(32)                               // last_paid:uint32
+         && t_Maybe_Grams.validate_skip(ops, cs, weak);  // due_payment:(Maybe Grams)
 }
 
 const StorageInfo t_StorageInfo;
 
-bool AccountState::validate_skip(vm::CellSlice& cs, bool weak) const {
+bool AccountState::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const {
   switch (get_tag(cs)) {
     case account_uninit:
       return cs.advance(2);
     case account_frozen:
       return cs.advance(2 + 256);
     case account_active:
-      return cs.advance(1) && t_StateInit.validate_skip(cs, weak);
+      return cs.advance(1) && t_StateInit.validate_skip(ops, cs, weak);
   }
   return false;
 }
@@ -899,8 +922,9 @@ bool AccountStorage::skip_copy_balance(vm::CellBuilder& cb, vm::CellSlice& cs) c
   return cs.advance(64) && t_CurrencyCollection.skip_copy(cb, cs) && t_AccountState.skip(cs);
 }
 
-bool AccountStorage::validate_skip(vm::CellSlice& cs, bool weak) const {
-  return cs.advance(64) && t_CurrencyCollection.validate_skip(cs, weak) && t_AccountState.validate_skip(cs, weak);
+bool AccountStorage::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const {
+  return cs.advance(64) && t_CurrencyCollection.validate_skip(ops, cs, weak) &&
+         t_AccountState.validate_skip(ops, cs, weak);
 }
 
 const AccountStorage t_AccountStorage;
@@ -918,15 +942,15 @@ bool Account::skip(vm::CellSlice& cs) const {
   return false;
 }
 
-bool Account::validate_skip(vm::CellSlice& cs, bool weak) const {
+bool Account::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const {
   switch (get_tag(cs)) {
     case account_none:
       return allow_empty && cs.advance(1);
     case account:
-      return cs.advance(1)                                 // account$1
-             && t_MsgAddressInt.validate_skip(cs, weak)    // addr:MsgAddressInt
-             && t_StorageInfo.validate_skip(cs, weak)      // storage_stat:StorageInfo
-             && t_AccountStorage.validate_skip(cs, weak);  // storage:AccountStorage
+      return cs.advance(1)                                      // account$1
+             && t_MsgAddressInt.validate_skip(ops, cs, weak)    // addr:MsgAddressInt
+             && t_StorageInfo.validate_skip(ops, cs, weak)      // storage_stat:StorageInfo
+             && t_AccountStorage.validate_skip(ops, cs, weak);  // storage:AccountStorage
   }
   return false;
 }
@@ -1010,19 +1034,19 @@ bool HashmapAugNode::skip(vm::CellSlice& cs) const {
   }
 }
 
-bool HashmapAugNode::validate_skip(vm::CellSlice& cs, bool weak) const {
+bool HashmapAugNode::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const {
   if (n < 0) {
     return false;
   }
   if (!n) {
     // ahmn_leaf
     vm::CellSlice cs_extra{cs};
-    if (!aug.extra_type.validate_skip(cs, weak)) {
+    if (!aug.extra_type.validate_skip(ops, cs, weak)) {
       return false;
     }
     cs_extra.cut_tail(cs);
     vm::CellSlice cs_value{cs};
-    if (!aug.value_type.validate_skip(cs, weak)) {
+    if (!aug.value_type.validate_skip(ops, cs, weak)) {
       return false;
     }
     cs_value.cut_tail(cs);
@@ -1033,13 +1057,14 @@ bool HashmapAugNode::validate_skip(vm::CellSlice& cs, bool weak) const {
     return false;
   }
   HashmapAug branch_type{n - 1, aug};
-  if (!branch_type.validate_ref(cs.prefetch_ref(0), weak) || !branch_type.validate_ref(cs.prefetch_ref(1), weak)) {
+  if (!branch_type.validate_ref(ops, cs.prefetch_ref(0), weak) ||
+      !branch_type.validate_ref(ops, cs.prefetch_ref(1), weak)) {
     return false;
   }
   auto cs_left = load_cell_slice(cs.fetch_ref());
   auto cs_right = load_cell_slice(cs.fetch_ref());
   vm::CellSlice cs_extra{cs};
-  if (!aug.extra_type.validate_skip(cs, weak)) {
+  if (!aug.extra_type.validate_skip(ops, cs, weak)) {
     return false;
   }
   cs_extra.cut_tail(cs);
@@ -1052,9 +1077,9 @@ bool HashmapAug::skip(vm::CellSlice& cs) const {
   return HmLabel{n}.skip(cs, l) && HashmapAugNode{n - l, aug}.skip(cs);
 }
 
-bool HashmapAug::validate_skip(vm::CellSlice& cs, bool weak) const {
+bool HashmapAug::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const {
   int l;
-  return HmLabel{n}.validate_skip(cs, weak, l) && HashmapAugNode{n - l, aug}.validate_skip(cs, weak);
+  return HmLabel{n}.validate_skip(cs, weak, l) && HashmapAugNode{n - l, aug}.validate_skip(ops, cs, weak);
 }
 
 bool HashmapAug::extract_extra(vm::CellSlice& cs) const {
@@ -1062,20 +1087,20 @@ bool HashmapAug::extract_extra(vm::CellSlice& cs) const {
   return HmLabel{n}.skip(cs, l) && (l == n || cs.advance_refs(2)) && aug.extra_type.extract(cs);
 }
 
-bool HashmapAugE::validate_skip(vm::CellSlice& cs, bool weak) const {
+bool HashmapAugE::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const {
   Ref<vm::CellSlice> extra;
   switch (get_tag(cs)) {
     case ahme_empty:
-      return cs.advance(1) && (extra = root_type.aug.extra_type.validate_fetch(cs, weak)).not_null() &&
+      return cs.advance(1) && (extra = root_type.aug.extra_type.validate_fetch(ops, cs, weak)).not_null() &&
              root_type.aug.check_empty(extra.unique_write());
     case ahme_root:
-      if (cs.advance(1) && root_type.validate_ref(cs.prefetch_ref(), weak)) {
+      if (cs.advance(1) && root_type.validate_ref(ops, cs.prefetch_ref(), weak)) {
         bool special;
         auto cs_root = load_cell_slice_special(cs.fetch_ref(), special);
         if (special) {
           return weak;
         }
-        return (extra = root_type.aug.extra_type.validate_fetch(cs, weak)).not_null() &&
+        return (extra = root_type.aug.extra_type.validate_fetch(ops, cs, weak)).not_null() &&
                root_type.extract_extra(cs_root) && extra->contents_equal(cs_root);
       }
       break;
@@ -1099,9 +1124,10 @@ bool DepthBalanceInfo::skip(vm::CellSlice& cs) const {
              cs);  // depth_balance$_ split_depth:(#<= 30) balance:CurrencyCollection = DepthBalanceInfo;
 }
 
-bool DepthBalanceInfo::validate_skip(vm::CellSlice& cs, bool weak) const {
-  return cs.fetch_ulong(5) <= 30 && t_CurrencyCollection.validate_skip(
-                                        cs, weak);  // depth_balance$_ split_depth:(#<= 30) balance:CurrencyCollection
+bool DepthBalanceInfo::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const {
+  return cs.fetch_ulong(5) <= 30 &&
+         t_CurrencyCollection.validate_skip(ops, cs,
+                                            weak);  // depth_balance$_ split_depth:(#<= 30) balance:CurrencyCollection
 }
 
 bool DepthBalanceInfo::null_value(vm::CellBuilder& cb) const {
@@ -1137,10 +1163,10 @@ bool TrStoragePhase::skip(vm::CellSlice& cs) const {
          && t_AccStatusChange.skip(cs);  // status_change:AccStatusChange
 }
 
-bool TrStoragePhase::validate_skip(vm::CellSlice& cs, bool weak) const {
-  return t_Grams.validate_skip(cs, weak)                // storage_fees_collected:Grams
-         && t_Maybe_Grams.validate_skip(cs, weak)       // storage_fees_due:Grams
-         && t_AccStatusChange.validate_skip(cs, weak);  // status_change:AccStatusChange
+bool TrStoragePhase::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const {
+  return t_Grams.validate_skip(ops, cs, weak)                // storage_fees_collected:Grams
+         && t_Maybe_Grams.validate_skip(ops, cs, weak)       // storage_fees_due:Grams
+         && t_AccStatusChange.validate_skip(ops, cs, weak);  // status_change:AccStatusChange
 }
 
 bool TrStoragePhase::get_storage_fees(vm::CellSlice& cs, td::RefInt256& storage_fees) const {
@@ -1164,9 +1190,9 @@ bool TrCreditPhase::skip(vm::CellSlice& cs) const {
          && t_CurrencyCollection.skip(cs);  // credit:CurrencyCollection
 }
 
-bool TrCreditPhase::validate_skip(vm::CellSlice& cs, bool weak) const {
-  return t_Maybe_Grams.validate_skip(cs, weak)             // due_fees_collected:(Maybe Grams)
-         && t_CurrencyCollection.validate_skip(cs, weak);  // credit:CurrencyCollection
+bool TrCreditPhase::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const {
+  return t_Maybe_Grams.validate_skip(ops, cs, weak)             // due_fees_collected:(Maybe Grams)
+         && t_CurrencyCollection.validate_skip(ops, cs, weak);  // credit:CurrencyCollection
 }
 
 const TrCreditPhase t_TrCreditPhase;
@@ -1182,15 +1208,15 @@ bool TrComputeInternal1::skip(vm::CellSlice& cs) const {
                                             // vm_final_state_hash:uint256
 }
 
-bool TrComputeInternal1::validate_skip(vm::CellSlice& cs, bool weak) const {
-  return t_VarUInteger_7.validate_skip(cs, weak)           // gas_used:(VarUInteger 7)
-         && t_VarUInteger_7.validate_skip(cs, weak)        // gas_limit:(VarUInteger 7)
-         && Maybe<VarUInteger>{3}.validate_skip(cs, weak)  // gas_credit:(Maybe (VarUInteger 3))
-         && cs.advance(8 + 32)                             // mode:int8 exit_code:int32
-         && Maybe<Int>{32}.validate_skip(cs, weak)         // exit_arg:(Maybe int32)
-         && cs.advance(32 + 256 + 256);                    // vm_steps:uint32
-                                                           // vm_init_state_hash:uint256
-                                                           // vm_final_state_hash:uint256
+bool TrComputeInternal1::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const {
+  return t_VarUInteger_7.validate_skip(ops, cs, weak)           // gas_used:(VarUInteger 7)
+         && t_VarUInteger_7.validate_skip(ops, cs, weak)        // gas_limit:(VarUInteger 7)
+         && Maybe<VarUInteger>{3}.validate_skip(ops, cs, weak)  // gas_credit:(Maybe (VarUInteger 3))
+         && cs.advance(8 + 32)                                  // mode:int8 exit_code:int32
+         && Maybe<Int>{32}.validate_skip(ops, cs, weak)         // exit_arg:(Maybe int32)
+         && cs.advance(32 + 256 + 256);                         // vm_steps:uint32
+                                                                // vm_init_state_hash:uint256
+                                                                // vm_final_state_hash:uint256
 }
 
 const TrComputeInternal1 t_TrComputeInternal1;
@@ -1209,14 +1235,14 @@ bool TrComputePhase::skip(vm::CellSlice& cs) const {
   return false;
 }
 
-bool TrComputePhase::validate_skip(vm::CellSlice& cs, bool weak) const {
+bool TrComputePhase::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const {
   switch (get_tag(cs)) {
     case tr_phase_compute_skipped:
-      return cs.advance(1) && t_ComputeSkipReason.validate_skip(cs, weak);
+      return cs.advance(1) && t_ComputeSkipReason.validate_skip(ops, cs, weak);
     case tr_phase_compute_vm:
       return cs.advance(1 + 3)  // tr_phase_compute_vm$1 success:Bool msg_state_used:Bool account_activated:Bool
-             && t_Grams.validate_skip(cs, weak)                    // gas_fees:Grams
-             && t_Ref_TrComputeInternal1.validate_skip(cs, weak);  // ^[ gas_used:(..) .. ]
+             && t_Grams.validate_skip(ops, cs, weak)                    // gas_fees:Grams
+             && t_Ref_TrComputeInternal1.validate_skip(ops, cs, weak);  // ^[ gas_used:(..) .. ]
   }
   return false;
 }
@@ -1236,17 +1262,17 @@ bool TrActionPhase::skip(vm::CellSlice& cs) const {
          && t_StorageUsedShort.skip(cs);  // tot_msg_size:StorageUsedShort
 }
 
-bool TrActionPhase::validate_skip(vm::CellSlice& cs, bool weak) const {
-  return cs.advance(3)                                   // success:Bool valid:Bool no_funds:Bool
-         && t_AccStatusChange.validate_skip(cs, weak)    // status_change:AccStatusChange
-         && t_Maybe_Grams.validate_skip(cs, weak)        // total_fwd_fees:(Maybe Grams)
-         && t_Maybe_Grams.validate_skip(cs, weak)        // total_action_fees:(Maybe Grams)
-         && cs.advance(32)                               // result_code:int32
-         && Maybe<Int>{32}.validate_skip(cs, weak)       // result_arg:(Maybe int32)
-         && cs.advance(16 * 4 + 256)                     // tot_actions:uint16 spec_actions:uint16
-                                                         // skipped_actions:uint16 msgs_created:uint16
-                                                         // action_list_hash:uint256
-         && t_StorageUsedShort.validate_skip(cs, weak);  // tot_msg_size:StorageUsed
+bool TrActionPhase::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const {
+  return cs.advance(3)                                        // success:Bool valid:Bool no_funds:Bool
+         && t_AccStatusChange.validate_skip(ops, cs, weak)    // status_change:AccStatusChange
+         && t_Maybe_Grams.validate_skip(ops, cs, weak)        // total_fwd_fees:(Maybe Grams)
+         && t_Maybe_Grams.validate_skip(ops, cs, weak)        // total_action_fees:(Maybe Grams)
+         && cs.advance(32)                                    // result_code:int32
+         && Maybe<Int>{32}.validate_skip(ops, cs, weak)       // result_arg:(Maybe int32)
+         && cs.advance(16 * 4 + 256)                          // tot_actions:uint16 spec_actions:uint16
+                                                              // skipped_actions:uint16 msgs_created:uint16
+                                                              // action_list_hash:uint256
+         && t_StorageUsedShort.validate_skip(ops, cs, weak);  // tot_msg_size:StorageUsed
 }
 
 const TrActionPhase t_TrActionPhase;
@@ -1268,19 +1294,19 @@ bool TrBouncePhase::skip(vm::CellSlice& cs) const {
   return false;
 }
 
-bool TrBouncePhase::validate_skip(vm::CellSlice& cs, bool weak) const {
+bool TrBouncePhase::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const {
   switch (get_tag(cs)) {
     case tr_phase_bounce_negfunds:
       return cs.advance(2);  // tr_phase_bounce_negfunds$00
     case tr_phase_bounce_nofunds:
-      return cs.advance(2)                                  // tr_phase_bounce_nofunds$01
-             && t_StorageUsedShort.validate_skip(cs, weak)  // msg_size:StorageUsedShort
-             && t_Grams.validate_skip(cs, weak);            // req_fwd_fees:Grams
+      return cs.advance(2)                                       // tr_phase_bounce_nofunds$01
+             && t_StorageUsedShort.validate_skip(ops, cs, weak)  // msg_size:StorageUsedShort
+             && t_Grams.validate_skip(ops, cs, weak);            // req_fwd_fees:Grams
     case tr_phase_bounce_ok:
-      return cs.advance(1)                                  // tr_phase_bounce_ok$1
-             && t_StorageUsedShort.validate_skip(cs, weak)  // msg_size:StorageUsedShort
-             && t_Grams.validate_skip(cs, weak)             // msg_fees:Grams
-             && t_Grams.validate_skip(cs, weak);            // fwd_fees:Grams
+      return cs.advance(1)                                       // tr_phase_bounce_ok$1
+             && t_StorageUsedShort.validate_skip(ops, cs, weak)  // msg_size:StorageUsedShort
+             && t_Grams.validate_skip(ops, cs, weak)             // msg_fees:Grams
+             && t_Grams.validate_skip(ops, cs, weak);            // fwd_fees:Grams
   }
   return false;
 }
@@ -1300,7 +1326,7 @@ bool SplitMergeInfo::skip(vm::CellSlice& cs) const {
   return cs.advance(6 + 6 + 256 + 256);
 }
 
-bool SplitMergeInfo::validate_skip(vm::CellSlice& cs, bool weak) const {
+bool SplitMergeInfo::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const {
   if (!cs.have(6 + 6 + 256 + 256)) {
     return false;
   }
@@ -1370,52 +1396,52 @@ bool TransactionDescr::skip(vm::CellSlice& cs) const {
   return false;
 }
 
-bool TransactionDescr::validate_skip(vm::CellSlice& cs, bool weak) const {
+bool TransactionDescr::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const {
   switch (get_tag(cs)) {
     case trans_ord:
-      return cs.advance(4 + 1)                                         // trans_ord$0000 credit_first:Bool
-             && Maybe<TrStoragePhase>{}.validate_skip(cs, weak)        // storage_ph:(Maybe TrStoragePhase)
-             && Maybe<TrCreditPhase>{}.validate_skip(cs, weak)         // credit_ph:(Maybe TrCreditPhase)
-             && t_TrComputePhase.validate_skip(cs, weak)               // compute_ph:TrComputePhase
-             && Maybe<RefTo<TrActionPhase>>{}.validate_skip(cs, weak)  // action:(Maybe ^TrActionPhase)
-             && cs.advance(1)                                          // aborted:Bool
-             && Maybe<TrBouncePhase>{}.validate_skip(cs, weak)         // bounce:(Maybe TrBouncePhase)
-             && cs.advance(1);                                         // destroyed:Bool
+      return cs.advance(4 + 1)                                              // trans_ord$0000 credit_first:Bool
+             && Maybe<TrStoragePhase>{}.validate_skip(ops, cs, weak)        // storage_ph:(Maybe TrStoragePhase)
+             && Maybe<TrCreditPhase>{}.validate_skip(ops, cs, weak)         // credit_ph:(Maybe TrCreditPhase)
+             && t_TrComputePhase.validate_skip(ops, cs, weak)               // compute_ph:TrComputePhase
+             && Maybe<RefTo<TrActionPhase>>{}.validate_skip(ops, cs, weak)  // action:(Maybe ^TrActionPhase)
+             && cs.advance(1)                                               // aborted:Bool
+             && Maybe<TrBouncePhase>{}.validate_skip(ops, cs, weak)         // bounce:(Maybe TrBouncePhase)
+             && cs.advance(1);                                              // destroyed:Bool
     case trans_storage:
-      return cs.advance(4)                                 // trans_storage$0001
-             && t_TrStoragePhase.validate_skip(cs, weak);  // storage_ph:TrStoragePhase
+      return cs.advance(4)                                      // trans_storage$0001
+             && t_TrStoragePhase.validate_skip(ops, cs, weak);  // storage_ph:TrStoragePhase
     case trans_tick_tock:
-      return cs.advance(4)                                             // trans_tick_tock$001 is_tock:Bool
-             && t_TrStoragePhase.validate_skip(cs, weak)               // storage_ph:TrStoragePhase
-             && t_TrComputePhase.validate_skip(cs, weak)               // compute_ph:TrComputePhase
-             && Maybe<RefTo<TrActionPhase>>{}.validate_skip(cs, weak)  // action:(Maybe ^TrActionPhase)
-             && cs.advance(2);                                         // aborted:Bool destroyed:Bool
+      return cs.advance(4)                                                  // trans_tick_tock$001 is_tock:Bool
+             && t_TrStoragePhase.validate_skip(ops, cs, weak)               // storage_ph:TrStoragePhase
+             && t_TrComputePhase.validate_skip(ops, cs, weak)               // compute_ph:TrComputePhase
+             && Maybe<RefTo<TrActionPhase>>{}.validate_skip(ops, cs, weak)  // action:(Maybe ^TrActionPhase)
+             && cs.advance(2);                                              // aborted:Bool destroyed:Bool
     case trans_split_prepare:
-      return cs.advance(4)                                             // trans_split_prepare$0100
-             && t_SplitMergeInfo.validate_skip(cs, weak)               // split_info:SplitMergeInfo
-             && Maybe<TrStoragePhase>{}.validate_skip(cs, weak)        // storage_ph:(Maybe TrStoragePhase)
-             && t_TrComputePhase.validate_skip(cs, weak)               // compute_ph:TrComputePhase
-             && Maybe<RefTo<TrActionPhase>>{}.validate_skip(cs, weak)  // action:(Maybe ^TrActionPhase)
-             && cs.advance(2);                                         // aborted:Bool destroyed:Bool
+      return cs.advance(4)                                                  // trans_split_prepare$0100
+             && t_SplitMergeInfo.validate_skip(ops, cs, weak)               // split_info:SplitMergeInfo
+             && Maybe<TrStoragePhase>{}.validate_skip(ops, cs, weak)        // storage_ph:(Maybe TrStoragePhase)
+             && t_TrComputePhase.validate_skip(ops, cs, weak)               // compute_ph:TrComputePhase
+             && Maybe<RefTo<TrActionPhase>>{}.validate_skip(ops, cs, weak)  // action:(Maybe ^TrActionPhase)
+             && cs.advance(2);                                              // aborted:Bool destroyed:Bool
     case trans_split_install:
-      return cs.advance(4)                                 // trans_split_install$0101
-             && t_SplitMergeInfo.validate_skip(cs, weak)   // split_info:SplitMergeInfo
-             && t_Ref_Transaction.validate_skip(cs, weak)  // prepare_transaction:^Transaction
-             && cs.advance(1);                             // installed:Bool
+      return cs.advance(4)                                      // trans_split_install$0101
+             && t_SplitMergeInfo.validate_skip(ops, cs, weak)   // split_info:SplitMergeInfo
+             && t_Ref_Transaction.validate_skip(ops, cs, weak)  // prepare_transaction:^Transaction
+             && cs.advance(1);                                  // installed:Bool
     case trans_merge_prepare:
-      return cs.advance(4)                                // trans_merge_prepare$0110
-             && t_SplitMergeInfo.validate_skip(cs, weak)  // split_info:SplitMergeInfo
-             && t_TrStoragePhase.validate_skip(cs, weak)  // storage_ph:TrStoragePhase
-             && cs.advance(1);                            // aborted:Bool
+      return cs.advance(4)                                     // trans_merge_prepare$0110
+             && t_SplitMergeInfo.validate_skip(ops, cs, weak)  // split_info:SplitMergeInfo
+             && t_TrStoragePhase.validate_skip(ops, cs, weak)  // storage_ph:TrStoragePhase
+             && cs.advance(1);                                 // aborted:Bool
     case trans_merge_install:
-      return cs.advance(4)                                             // trans_merge_install$0111
-             && t_SplitMergeInfo.validate_skip(cs, weak)               // split_info:SplitMergeInfo
-             && t_Ref_Transaction.validate_skip(cs, weak)              // prepare_transaction:^Transaction
-             && Maybe<TrStoragePhase>{}.validate_skip(cs, weak)        // storage_ph:(Maybe TrStoragePhase)
-             && Maybe<TrCreditPhase>{}.validate_skip(cs, weak)         // credit_ph:(Maybe TrCreditPhase)
-             && Maybe<TrComputePhase>{}.validate_skip(cs, weak)        // compute_ph:TrComputePhase
-             && Maybe<RefTo<TrActionPhase>>{}.validate_skip(cs, weak)  // action:(Maybe ^TrActionPhase)
-             && cs.advance(2);                                         // aborted:Bool destroyed:Bool
+      return cs.advance(4)                                                  // trans_merge_install$0111
+             && t_SplitMergeInfo.validate_skip(ops, cs, weak)               // split_info:SplitMergeInfo
+             && t_Ref_Transaction.validate_skip(ops, cs, weak)              // prepare_transaction:^Transaction
+             && Maybe<TrStoragePhase>{}.validate_skip(ops, cs, weak)        // storage_ph:(Maybe TrStoragePhase)
+             && Maybe<TrCreditPhase>{}.validate_skip(ops, cs, weak)         // credit_ph:(Maybe TrCreditPhase)
+             && Maybe<TrComputePhase>{}.validate_skip(ops, cs, weak)        // compute_ph:TrComputePhase
+             && Maybe<RefTo<TrActionPhase>>{}.validate_skip(ops, cs, weak)  // action:(Maybe ^TrActionPhase)
+             && cs.advance(2);                                              // aborted:Bool destroyed:Bool
   }
   return false;
 }
@@ -1479,9 +1505,9 @@ bool Transaction_aux::skip(vm::CellSlice& cs) const {
          && HashmapE{15, t_Ref_Message}.skip(cs);  // out_msgs:(HashmapE 15 ^Message)
 }
 
-bool Transaction_aux::validate_skip(vm::CellSlice& cs, bool weak) const {
-  return Maybe<RefTo<Message>>{}.validate_skip(cs, weak)          // in_msg:(Maybe ^Message)
-         && HashmapE{15, t_Ref_Message}.validate_skip(cs, weak);  // out_msgs:(HashmapE 15 ^Message)
+bool Transaction_aux::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const {
+  return Maybe<RefTo<Message>>{}.validate_skip(ops, cs, weak)          // in_msg:(Maybe ^Message)
+         && HashmapE{15, t_Ref_Message}.validate_skip(ops, cs, weak);  // out_msgs:(HashmapE 15 ^Message)
 }
 
 const Transaction_aux t_Transaction_aux;
@@ -1498,18 +1524,18 @@ bool Transaction::skip(vm::CellSlice& cs) const {
          && RefTo<TransactionDescr>{}.skip(cs);  // description:^TransactionDescr
 }
 
-bool Transaction::validate_skip(vm::CellSlice& cs, bool weak) const {
+bool Transaction::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const {
   return cs.fetch_ulong(4) == 7  // transaction$0111
          &&
          cs.advance(
              256 + 64 + 256 + 64 + 32 +
              15)  // account_addr:uint256 lt:uint64 prev_trans_hash:bits256 prev_trans_lt:uint64 now:uint32 outmsg_cnt:uint15
-         && t_AccountStatus.validate_skip(cs, weak)             // orig_status:AccountStatus
-         && t_AccountStatus.validate_skip(cs, weak)             // end_status:AccountStatus
-         && RefTo<Transaction_aux>{}.validate_skip(cs, weak)    // ^[ in_msg:... out_msgs:... ]
-         && t_CurrencyCollection.validate_skip(cs, weak)        // total_fees:CurrencyCollection
-         && t_Ref_HashUpdate.validate_skip(cs, weak)            // state_update:^(HASH_UPDATE Account)
-         && RefTo<TransactionDescr>{}.validate_skip(cs, weak);  // description:^TransactionDescr
+         && t_AccountStatus.validate_skip(ops, cs, weak)             // orig_status:AccountStatus
+         && t_AccountStatus.validate_skip(ops, cs, weak)             // end_status:AccountStatus
+         && RefTo<Transaction_aux>{}.validate_skip(ops, cs, weak)    // ^[ in_msg:... out_msgs:... ]
+         && t_CurrencyCollection.validate_skip(ops, cs, weak)        // total_fees:CurrencyCollection
+         && t_Ref_HashUpdate.validate_skip(ops, cs, weak)            // state_update:^(HASH_UPDATE Account)
+         && RefTo<TransactionDescr>{}.validate_skip(ops, cs, weak);  // description:^TransactionDescr
 }
 
 bool Transaction::get_storage_fees(Ref<vm::Cell> cell, td::RefInt256& storage_fees) const {
@@ -1573,12 +1599,12 @@ bool AccountBlock::skip(vm::CellSlice& cs) const {
          && cs.advance_refs(1);             // state_update:^(HASH_UPDATE Account)
 }
 
-bool AccountBlock::validate_skip(vm::CellSlice& cs, bool weak) const {
+bool AccountBlock::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const {
   return cs.fetch_ulong(4) == 5  // acc_trans#5
          && cs.advance(256)      // account_addr:bits256
-         &&
-         t_AccountTransactions.validate_skip(cs, weak)  // transactions:(HashmapAug 64 ^Transaction CurrencyCollection)
-         && t_Ref_HashUpdate.validate_skip(cs, weak);   // state_update:^(HASH_UPDATE Account)
+         && t_AccountTransactions.validate_skip(ops, cs,
+                                                weak)  // transactions:(HashmapAug 64 ^Transaction CurrencyCollection)
+         && t_Ref_HashUpdate.validate_skip(ops, cs, weak);  // state_update:^(HASH_UPDATE Account)
 }
 
 bool AccountBlock::get_total_fees(vm::CellSlice&& cs, block::CurrencyCollection& total_fees) const {
@@ -1598,8 +1624,8 @@ const Aug_ShardAccountBlocks aug_ShardAccountBlocks;
 const HashmapAugE t_ShardAccountBlocks{256,
                                        aug_ShardAccountBlocks};  // (HashmapAugE 256 AccountBlock CurrencyCollection)
 
-bool ImportFees::validate_skip(vm::CellSlice& cs, bool weak) const {
-  return t_Grams.validate_skip(cs, weak) && t_CurrencyCollection.validate_skip(cs, weak);
+bool ImportFees::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const {
+  return t_Grams.validate_skip(ops, cs, weak) && t_CurrencyCollection.validate_skip(ops, cs, weak);
 }
 
 bool ImportFees::skip(vm::CellSlice& cs) const {
@@ -1654,44 +1680,44 @@ bool InMsg::skip(vm::CellSlice& cs) const {
   return false;
 }
 
-bool InMsg::validate_skip(vm::CellSlice& cs, bool weak) const {
+bool InMsg::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const {
   switch (get_tag(cs)) {
     case msg_import_ext:
-      return cs.advance(3)                                  // msg_import_ext$000
-             && t_Ref_Message.validate_skip(cs, weak)       // msg:^Message
-             && t_Ref_Transaction.validate_skip(cs, weak);  // transaction:^Transaction
+      return cs.advance(3)                                       // msg_import_ext$000
+             && t_Ref_Message.validate_skip(ops, cs, weak)       // msg:^Message
+             && t_Ref_Transaction.validate_skip(ops, cs, weak);  // transaction:^Transaction
     case msg_import_ihr:
-      return cs.advance(3)                                 // msg_import_ihr$010
-             && t_Ref_Message.validate_skip(cs, weak)      // msg:^Message
-             && t_Ref_Transaction.validate_skip(cs, weak)  // transaction:^Transaction
-             && t_Grams.validate_skip(cs, weak)            // ihr_fee:Grams
-             && t_RefCell.validate_skip(cs, weak);         // proof_created:^Cell
+      return cs.advance(3)                                      // msg_import_ihr$010
+             && t_Ref_Message.validate_skip(ops, cs, weak)      // msg:^Message
+             && t_Ref_Transaction.validate_skip(ops, cs, weak)  // transaction:^Transaction
+             && t_Grams.validate_skip(ops, cs, weak)            // ihr_fee:Grams
+             && t_RefCell.validate_skip(ops, cs, weak);         // proof_created:^Cell
     case msg_import_imm:
-      return cs.advance(3)                                 // msg_import_imm$011
-             && t_Ref_MsgEnvelope.validate_skip(cs, weak)  // in_msg:^MsgEnvelope
-             && t_Ref_Transaction.validate_skip(cs, weak)  // transaction:^Transaction
-             && t_Grams.validate_skip(cs, weak);           // fwd_fee:Grams
+      return cs.advance(3)                                      // msg_import_imm$011
+             && t_Ref_MsgEnvelope.validate_skip(ops, cs, weak)  // in_msg:^MsgEnvelope
+             && t_Ref_Transaction.validate_skip(ops, cs, weak)  // transaction:^Transaction
+             && t_Grams.validate_skip(ops, cs, weak);           // fwd_fee:Grams
     case msg_import_fin:
-      return cs.advance(3)                                 // msg_import_fin$100
-             && t_Ref_MsgEnvelope.validate_skip(cs, weak)  // in_msg:^MsgEnvelope
-             && t_Ref_Transaction.validate_skip(cs, weak)  // transaction:^Transaction
-             && t_Grams.validate_skip(cs, weak);           // fwd_fee:Grams
+      return cs.advance(3)                                      // msg_import_fin$100
+             && t_Ref_MsgEnvelope.validate_skip(ops, cs, weak)  // in_msg:^MsgEnvelope
+             && t_Ref_Transaction.validate_skip(ops, cs, weak)  // transaction:^Transaction
+             && t_Grams.validate_skip(ops, cs, weak);           // fwd_fee:Grams
     case msg_import_tr:
-      return cs.advance(3)                                 // msg_import_tr$101
-             && t_Ref_MsgEnvelope.validate_skip(cs, weak)  // in_msg:^MsgEnvelope
-             && t_Ref_MsgEnvelope.validate_skip(cs, weak)  // out_msg:^MsgEnvelope
-             && t_Grams.validate_skip(cs, weak);           // transit_fee:Grams
+      return cs.advance(3)                                      // msg_import_tr$101
+             && t_Ref_MsgEnvelope.validate_skip(ops, cs, weak)  // in_msg:^MsgEnvelope
+             && t_Ref_MsgEnvelope.validate_skip(ops, cs, weak)  // out_msg:^MsgEnvelope
+             && t_Grams.validate_skip(ops, cs, weak);           // transit_fee:Grams
     case msg_discard_fin:
-      return cs.advance(3)                                 // msg_discard_fin$110
-             && t_Ref_MsgEnvelope.validate_skip(cs, weak)  // in_msg:^MsgEnvelope
-             && cs.advance(64)                             // transaction_id:uint64
-             && t_Grams.validate_skip(cs, weak);           // fwd_fee:Grams
+      return cs.advance(3)                                      // msg_discard_fin$110
+             && t_Ref_MsgEnvelope.validate_skip(ops, cs, weak)  // in_msg:^MsgEnvelope
+             && cs.advance(64)                                  // transaction_id:uint64
+             && t_Grams.validate_skip(ops, cs, weak);           // fwd_fee:Grams
     case msg_discard_tr:
-      return cs.advance(3)                                 // msg_discard_tr$111
-             && t_Ref_MsgEnvelope.validate_skip(cs, weak)  // in_msg:^MsgEnvelope
-             && cs.advance(64)                             // transaction_id:uint64
-             && t_Grams.validate_skip(cs, weak)            // fwd_fee:Grams
-             && t_RefCell.validate_skip(cs, weak);         // proof_delivered:^Cell
+      return cs.advance(3)                                      // msg_discard_tr$111
+             && t_Ref_MsgEnvelope.validate_skip(ops, cs, weak)  // in_msg:^MsgEnvelope
+             && cs.advance(64)                                  // transaction_id:uint64
+             && t_Grams.validate_skip(ops, cs, weak)            // fwd_fee:Grams
+             && t_RefCell.validate_skip(ops, cs, weak);         // proof_delivered:^Cell
   }
   return false;
 }
@@ -1829,37 +1855,37 @@ bool OutMsg::skip(vm::CellSlice& cs) const {
   return false;
 }
 
-bool OutMsg::validate_skip(vm::CellSlice& cs, bool weak) const {
+bool OutMsg::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const {
   switch (get_tag(cs)) {
     case msg_export_ext:
-      return cs.advance(3)                                  // msg_export_ext$000
-             && t_Ref_Message.validate_skip(cs, weak)       // msg:^Message
-             && t_Ref_Transaction.validate_skip(cs, weak);  // transaction:^Transaction
+      return cs.advance(3)                                       // msg_export_ext$000
+             && t_Ref_Message.validate_skip(ops, cs, weak)       // msg:^Message
+             && t_Ref_Transaction.validate_skip(ops, cs, weak);  // transaction:^Transaction
     case msg_export_imm:
-      return cs.advance(3)                                 // msg_export_imm$010
-             && t_Ref_MsgEnvelope.validate_skip(cs, weak)  // out_msg:^MsgEnvelope
-             && t_Ref_Transaction.validate_skip(cs, weak)  // transaction:^Transaction
-             && RefTo<InMsg>{}.validate_skip(cs, weak);    // reimport:^InMsg
+      return cs.advance(3)                                      // msg_export_imm$010
+             && t_Ref_MsgEnvelope.validate_skip(ops, cs, weak)  // out_msg:^MsgEnvelope
+             && t_Ref_Transaction.validate_skip(ops, cs, weak)  // transaction:^Transaction
+             && RefTo<InMsg>{}.validate_skip(ops, cs, weak);    // reimport:^InMsg
     case msg_export_new:
-      return cs.advance(3)                                  // msg_export_new$001
-             && t_Ref_MsgEnvelope.validate_skip(cs, weak)   // out_msg:^MsgEnvelope
-             && t_Ref_Transaction.validate_skip(cs, weak);  // transaction:^Transaction
+      return cs.advance(3)                                       // msg_export_new$001
+             && t_Ref_MsgEnvelope.validate_skip(ops, cs, weak)   // out_msg:^MsgEnvelope
+             && t_Ref_Transaction.validate_skip(ops, cs, weak);  // transaction:^Transaction
     case msg_export_tr:
-      return cs.advance(3)                                 // msg_export_tr$011
-             && t_Ref_MsgEnvelope.validate_skip(cs, weak)  // out_msg:^MsgEnvelope
-             && RefTo<InMsg>{}.validate_skip(cs, weak);    // imported:^InMsg
+      return cs.advance(3)                                      // msg_export_tr$011
+             && t_Ref_MsgEnvelope.validate_skip(ops, cs, weak)  // out_msg:^MsgEnvelope
+             && RefTo<InMsg>{}.validate_skip(ops, cs, weak);    // imported:^InMsg
     case msg_export_deq_imm:
-      return cs.advance(3)                                 // msg_export_deq_imm$100
-             && t_Ref_MsgEnvelope.validate_skip(cs, weak)  // out_msg:^MsgEnvelope
-             && RefTo<InMsg>{}.validate_skip(cs, weak);    // reimport:^InMsg
+      return cs.advance(3)                                      // msg_export_deq_imm$100
+             && t_Ref_MsgEnvelope.validate_skip(ops, cs, weak)  // out_msg:^MsgEnvelope
+             && RefTo<InMsg>{}.validate_skip(ops, cs, weak);    // reimport:^InMsg
     case msg_export_deq:
-      return cs.advance(3)                                 // msg_export_deq$110
-             && t_Ref_MsgEnvelope.validate_skip(cs, weak)  // out_msg:^MsgEnvelope
-             && cs.advance(64);                            // import_block_lt:uint64
+      return cs.advance(3)                                      // msg_export_deq$110
+             && t_Ref_MsgEnvelope.validate_skip(ops, cs, weak)  // out_msg:^MsgEnvelope
+             && cs.advance(64);                                 // import_block_lt:uint64
     case msg_export_tr_req:
-      return cs.advance(3)                                 // msg_export_tr_req$111
-             && t_Ref_MsgEnvelope.validate_skip(cs, weak)  // out_msg:^MsgEnvelope
-             && RefTo<InMsg>{}.validate_skip(cs, weak);    // imported:^InMsg
+      return cs.advance(3)                                      // msg_export_tr_req$111
+             && t_Ref_MsgEnvelope.validate_skip(ops, cs, weak)  // out_msg:^MsgEnvelope
+             && RefTo<InMsg>{}.validate_skip(ops, cs, weak);    // imported:^InMsg
   }
   return false;
 }
@@ -1932,8 +1958,8 @@ const OutMsg t_OutMsg;
 const Aug_OutMsgDescr aug_OutMsgDescr;
 const OutMsgDescr t_OutMsgDescr;
 
-bool EnqueuedMsg::validate_skip(vm::CellSlice& cs, bool weak) const {
-  return cs.advance(64) && t_Ref_MsgEnvelope.validate_skip(cs, weak);
+bool EnqueuedMsg::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const {
+  return cs.advance(64) && t_Ref_MsgEnvelope.validate_skip(ops, cs, weak);
 }
 
 const EnqueuedMsg t_EnqueuedMsg;
@@ -1967,9 +1993,9 @@ bool OutMsgQueueInfo::skip(vm::CellSlice& cs) const {
   return t_OutMsgQueue.skip(cs) && t_ProcessedInfo.skip(cs) && t_IhrPendingInfo.skip(cs);
 }
 
-bool OutMsgQueueInfo::validate_skip(vm::CellSlice& cs, bool weak) const {
-  return t_OutMsgQueue.validate_skip(cs, weak) && t_ProcessedInfo.validate_skip(cs, weak) &&
-         t_IhrPendingInfo.validate_skip(cs, weak);
+bool OutMsgQueueInfo::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const {
+  return t_OutMsgQueue.validate_skip(ops, cs, weak) && t_ProcessedInfo.validate_skip(ops, cs, weak) &&
+         t_IhrPendingInfo.validate_skip(ops, cs, weak);
 }
 
 const OutMsgQueueInfo t_OutMsgQueueInfo;
@@ -2005,10 +2031,27 @@ bool ExtBlkRef::unpack(Ref<vm::CellSlice> cs_ref, ton::BlockIdExt& blkid, ton::L
   return true;
 }
 
+bool ExtBlkRef::store(vm::CellBuilder& cb, const ton::BlockIdExt& blkid, ton::LogicalTime end_lt) const {
+  return cb.store_long_bool(end_lt, 64)            // ext_blk_ref$_ end_lt:uint64
+         && cb.store_long_bool(blkid.seqno(), 32)  // seq_no:uint32
+         && cb.store_bits_bool(blkid.root_hash)    // root_hash:bits256
+         && cb.store_bits_bool(blkid.file_hash);   // file_hash:bits256 = ExtBlkRef;
+}
+
+Ref<vm::Cell> ExtBlkRef::pack_cell(const ton::BlockIdExt& blkid, ton::LogicalTime end_lt) const {
+  vm::CellBuilder cb;
+  return store(cb, blkid, end_lt) ? cb.finalize() : Ref<vm::Cell>{};
+}
+
+bool ExtBlkRef::pack_to(Ref<vm::Cell>& cell, const ton::BlockIdExt& blkid, ton::LogicalTime end_lt) const {
+  vm::CellBuilder cb;
+  return store(cb, blkid, end_lt) && cb.finalize_to(cell);
+}
+
 const ExtBlkRef t_ExtBlkRef;
 const BlkMasterInfo t_BlkMasterInfo;
 
-bool ShardIdent::validate_skip(vm::CellSlice& cs, bool weak) const {
+bool ShardIdent::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const {
   int shard_pfx_len, workchain_id;
   unsigned long long shard_pfx;
   if (cs.fetch_ulong(2) == 0 && cs.fetch_uint_to(6, shard_pfx_len) && cs.fetch_int_to(32, workchain_id) &&
@@ -2073,8 +2116,8 @@ bool ShardIdent::pack(vm::CellBuilder& cb, ton::ShardIdFull data) const {
 
 const ShardIdent t_ShardIdent;
 
-bool BlockIdExt::validate_skip(vm::CellSlice& cs, bool weak) const {
-  return t_ShardIdent.validate_skip(cs, weak) && cs.advance(32 + 256 * 2);
+bool BlockIdExt::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const {
+  return t_ShardIdent.validate_skip(ops, cs, weak) && cs.advance(32 + 256 * 2);
 }
 
 bool BlockIdExt::unpack(vm::CellSlice& cs, ton::BlockIdExt& data) const {
@@ -2107,21 +2150,21 @@ bool ShardState::skip(vm::CellSlice& cs) const {
          && Maybe<RefTo<McStateExtra>>{}.skip(cs);  // custom:(Maybe ^McStateExtra)
 }
 
-bool ShardState::validate_skip(vm::CellSlice& cs, bool weak) const {
+bool ShardState::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const {
   int seq_no;
   return get_tag(cs) == shard_state && cs.advance(64)  // shard_state#9023afe2 blockchain_id:int32
-         && t_ShardIdent.validate_skip(cs, weak)       // shard_id:ShardIdent
+         && t_ShardIdent.validate_skip(ops, cs, weak)  // shard_id:ShardIdent
          && cs.fetch_int_to(32, seq_no)                // seq_no:int32
          && seq_no >= -1                               // { seq_no >= -1 }
          && cs.advance(32 + 32 + 64 + 32)  // vert_seq_no:# gen_utime:uint32 gen_lt:uint64 min_ref_mc_seqno:uint32
-         && t_Ref_OutMsgQueueInfo.validate_skip(cs, weak)  // out_msg_queue_info:^OutMsgQueueInfo
-         && cs.advance(1)                                  // before_split:Bool
-         && t_ShardAccounts.validate_skip_ref(cs, weak)    // accounts:^ShardAccounts
+         && t_Ref_OutMsgQueueInfo.validate_skip(ops, cs, weak)  // out_msg_queue_info:^OutMsgQueueInfo
+         && cs.advance(1)                                       // before_split:Bool
+         && t_ShardAccounts.validate_skip_ref(ops, cs, weak)    // accounts:^ShardAccounts
          &&
          t_ShardState_aux.validate_skip_ref(
-             cs,
+             ops, cs,
              weak)  // ^[ total_balance:CurrencyCollection total_validator_fees:CurrencyCollection libraries:(HashmapE 256 LibDescr) master_ref:(Maybe BlkMasterInfo) ]
-         && Maybe<RefTo<McStateExtra>>{}.validate_skip(cs, weak);  // custom:(Maybe ^McStateExtra)
+         && Maybe<RefTo<McStateExtra>>{}.validate_skip(ops, cs, weak);  // custom:(Maybe ^McStateExtra)
 }
 
 const ShardState t_ShardState;
@@ -2134,12 +2177,12 @@ bool ShardState_aux::skip(vm::CellSlice& cs) const {
          && Maybe<BlkMasterInfo>{}.skip(cs);    // master_ref:(Maybe BlkMasterInfo)
 }
 
-bool ShardState_aux::validate_skip(vm::CellSlice& cs, bool weak) const {
-  return cs.advance(128)                                       // overload_history:uint64 underload_history:uint64
-         && t_CurrencyCollection.validate_skip(cs, weak)       // total_balance:CurrencyCollection
-         && t_CurrencyCollection.validate_skip(cs, weak)       // total_validator_fees:CurrencyCollection
-         && HashmapE{256, t_LibDescr}.validate_skip(cs, weak)  // libraries:(HashmapE 256 LibDescr)
-         && Maybe<BlkMasterInfo>{}.validate_skip(cs, weak);    // master_ref:(Maybe BlkMasterInfo)
+bool ShardState_aux::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const {
+  return cs.advance(128)                                            // overload_history:uint64 underload_history:uint64
+         && t_CurrencyCollection.validate_skip(ops, cs, weak)       // total_balance:CurrencyCollection
+         && t_CurrencyCollection.validate_skip(ops, cs, weak)       // total_validator_fees:CurrencyCollection
+         && HashmapE{256, t_LibDescr}.validate_skip(ops, cs, weak)  // libraries:(HashmapE 256 LibDescr)
+         && Maybe<BlkMasterInfo>{}.validate_skip(ops, cs, weak);    // master_ref:(Maybe BlkMasterInfo)
 }
 
 const ShardState_aux t_ShardState_aux;
@@ -2150,10 +2193,10 @@ bool LibDescr::skip(vm::CellSlice& cs) const {
          && Hashmap{256, t_True}.skip(cs);  // publishers:(Hashmap 256 False)
 }
 
-bool LibDescr::validate_skip(vm::CellSlice& cs, bool weak) const {
-  return get_tag(cs) == shared_lib_descr && cs.advance(2)  // shared_lib_descr$00
-         && cs.fetch_ref().not_null()                      // lib:^Cell
-         && Hashmap{256, t_True}.validate_skip(cs, weak);  // publishers:(Hashmap 256 False)
+bool LibDescr::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const {
+  return get_tag(cs) == shared_lib_descr && cs.advance(2)       // shared_lib_descr$00
+         && cs.fetch_ref().not_null()                           // lib:^Cell
+         && Hashmap{256, t_True}.validate_skip(ops, cs, weak);  // publishers:(Hashmap 256 False)
 }
 
 const LibDescr t_LibDescr;
@@ -2163,9 +2206,9 @@ bool BlkPrevInfo::skip(vm::CellSlice& cs) const {
          && (!merged || t_ExtBlkRef.skip(cs));  // prev_alt:merged?ExtBlkRef
 }
 
-bool BlkPrevInfo::validate_skip(vm::CellSlice& cs, bool weak) const {
-  return t_ExtBlkRef.validate_skip(cs, weak)                   // prev_blk_info$_ {merged:#} prev:ExtBlkRef
-         && (!merged || t_ExtBlkRef.validate_skip(cs, weak));  // prev_alt:merged?ExtBlkRef
+bool BlkPrevInfo::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const {
+  return t_ExtBlkRef.validate_skip(ops, cs, weak)                   // prev_blk_info$_ {merged:#} prev:ExtBlkRef
+         && (!merged || t_ExtBlkRef.validate_skip(ops, cs, weak));  // prev_alt:merged?ExtBlkRef
 }
 
 const BlkPrevInfo t_BlkPrevInfo_0{0};
@@ -2174,8 +2217,8 @@ bool McStateExtra::skip(vm::CellSlice& cs) const {
   return block::gen::t_McStateExtra.skip(cs);
 }
 
-bool McStateExtra::validate_skip(vm::CellSlice& cs, bool weak) const {
-  return block::gen::t_McStateExtra.validate_skip(cs, weak);  // ??
+bool McStateExtra::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const {
+  return block::gen::t_McStateExtra.validate_skip(ops, cs, weak);  // ??
 }
 
 const McStateExtra t_McStateExtra;
@@ -2202,8 +2245,8 @@ bool ShardFeeCreated::skip(vm::CellSlice& cs) const {
   return t_CurrencyCollection.skip(cs) && t_CurrencyCollection.skip(cs);
 }
 
-bool ShardFeeCreated::validate_skip(vm::CellSlice& cs, bool weak) const {
-  return t_CurrencyCollection.validate_skip(cs, weak) && t_CurrencyCollection.validate_skip(cs, weak);
+bool ShardFeeCreated::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const {
+  return t_CurrencyCollection.validate_skip(ops, cs, weak) && t_CurrencyCollection.validate_skip(ops, cs, weak);
 }
 
 bool ShardFeeCreated::null_value(vm::CellBuilder& cb) const {
diff --git a/submodules/ton/tonlib-src/crypto/block/block-parse.h b/submodules/ton/tonlib-src/crypto/block/block-parse.h
index acbe9dd426..9590631132 100644
--- a/submodules/ton/tonlib-src/crypto/block/block-parse.h
+++ b/submodules/ton/tonlib-src/crypto/block/block-parse.h
@@ -14,7 +14,7 @@
     You should have received a copy of the GNU Lesser General Public License
     along with TON Blockchain Library.  If not, see <http://www.gnu.org/licenses/>.
 
-    Copyright 2017-2019 Telegram Systems LLP
+    Copyright 2017-2020 Telegram Systems LLP
 */
 #pragma once
 #include "common/refcnt.hpp"
@@ -59,7 +59,7 @@ struct VarUInteger final : TLB_Complex {
     ln = 32 - td::count_leading_zeroes32(n - 1);
   }
   bool skip(vm::CellSlice& cs) const override;
-  bool validate_skip(vm::CellSlice& cs, bool weak = false) const override;
+  bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override;
   td::RefInt256 as_integer_skip(vm::CellSlice& cs) const override;
   unsigned long long as_uint(const vm::CellSlice& cs) const override;
   bool null_value(vm::CellBuilder& cb) const override {
@@ -78,7 +78,7 @@ struct VarUIntegerPos final : TLB_Complex {
     ln = 32 - td::count_leading_zeroes32(n - 1);
   }
   bool skip(vm::CellSlice& cs) const override;
-  bool validate_skip(vm::CellSlice& cs, bool weak = false) const override;
+  bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override;
   td::RefInt256 as_integer_skip(vm::CellSlice& cs) const override;
   unsigned long long as_uint(const vm::CellSlice& cs) const override;
   bool store_integer_value(vm::CellBuilder& cb, const td::BigInt256& value) const override;
@@ -92,7 +92,7 @@ struct VarInteger final : TLB_Complex {
     ln = 32 - td::count_leading_zeroes32(n - 1);
   }
   bool skip(vm::CellSlice& cs) const override;
-  bool validate_skip(vm::CellSlice& cs, bool weak = false) const override;
+  bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override;
   td::RefInt256 as_integer_skip(vm::CellSlice& cs) const override;
   long long as_int(const vm::CellSlice& cs) const override;
   bool null_value(vm::CellBuilder& cb) const override {
@@ -107,7 +107,7 @@ struct VarIntegerNz final : TLB_Complex {
     ln = 32 - td::count_leading_zeroes32(n - 1);
   }
   bool skip(vm::CellSlice& cs) const override;
-  bool validate_skip(vm::CellSlice& cs, bool weak = false) const override;
+  bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override;
   td::RefInt256 as_integer_skip(vm::CellSlice& cs) const override;
   long long as_int(const vm::CellSlice& cs) const override;
   bool store_integer_value(vm::CellBuilder& cb, const td::BigInt256& value) const override;
@@ -123,13 +123,13 @@ struct Unary final : TLB {
   bool skip(vm::CellSlice& cs, int& n) const {
     return validate_skip(cs, false, n);
   }
-  bool validate_skip(vm::CellSlice& cs, bool weak = false) const override {
-    return cs.advance(get_size(cs));
+  bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override {
+    return skip(cs);
   }
   bool skip(vm::CellSlice& cs) const override {
-    return validate_skip(cs);
+    return cs.advance(get_size(cs));
   }
-  bool validate(const vm::CellSlice& cs, bool weak = false) const override {
+  bool validate(int* ops, const vm::CellSlice& cs, bool weak = false) const override {
     return cs.have(get_size(cs));
   }
 };
@@ -149,7 +149,7 @@ struct HmLabel final : TLB_Complex {
     int n;
     return skip(cs, n);
   }
-  bool validate_skip(vm::CellSlice& cs, bool weak = false) const override {
+  bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override {
     int n;
     return validate_skip(cs, weak, n);
   }
@@ -162,7 +162,7 @@ struct Hashmap final : TLB_Complex {
   Hashmap(int _n, const TLB& _val_type) : value_type(_val_type), n(_n) {
   }
   bool skip(vm::CellSlice& cs) const override;
-  bool validate_skip(vm::CellSlice& cs, bool weak = false) const override;
+  bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override;
 };
 
 struct HashmapNode final : TLB_Complex {
@@ -173,7 +173,7 @@ struct HashmapNode final : TLB_Complex {
   }
   int get_size(const vm::CellSlice& cs) const override;
   bool skip(vm::CellSlice& cs) const override;
-  bool validate_skip(vm::CellSlice& cs, bool weak = false) const override;
+  bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override;
   int get_tag(const vm::CellSlice& cs) const override {
     return n > 0 ? hmn_fork : n;
   }
@@ -185,7 +185,7 @@ struct HashmapE final : TLB {
   HashmapE(int _n, const TLB& _val_type) : root_type(_n, _val_type) {
   }
   int get_size(const vm::CellSlice& cs) const override;
-  bool validate(const vm::CellSlice& cs, bool weak = false) const override;
+  bool validate(int* ops, const vm::CellSlice& cs, bool weak = false) const override;
   int get_tag(const vm::CellSlice& cs) const override {
     return (int)cs.prefetch_ulong(1);
   }
@@ -221,7 +221,7 @@ struct HashmapAug final : TLB_Complex {
   HashmapAug(int _n, const AugmentationCheckData& _aug) : aug(_aug), n(_n) {
   }
   bool skip(vm::CellSlice& cs) const override;
-  bool validate_skip(vm::CellSlice& cs, bool weak = false) const override;
+  bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override;
   bool extract_extra(vm::CellSlice& cs) const;
 };
 
@@ -232,7 +232,7 @@ struct HashmapAugNode final : TLB_Complex {
   HashmapAugNode(int _n, const AugmentationCheckData& _aug) : aug(_aug), n(_n) {
   }
   bool skip(vm::CellSlice& cs) const override;
-  bool validate_skip(vm::CellSlice& cs, bool weak = false) const override;
+  bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override;
   int get_tag(const vm::CellSlice& cs) const override {
     return n > 0 ? ahmn_fork : n;
   }
@@ -244,7 +244,7 @@ struct HashmapAugE final : TLB_Complex {
   HashmapAugE(int _n, const AugmentationCheckData& _aug) : root_type(_n, std::move(_aug)) {
   }
   bool skip(vm::CellSlice& cs) const override;
-  bool validate_skip(vm::CellSlice& cs, bool weak = false) const override;
+  bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override;
   bool extract_extra(vm::CellSlice& cs) const;
   int get_tag(const vm::CellSlice& cs) const override {
     return (int)cs.prefetch_ulong(1);
@@ -252,7 +252,7 @@ struct HashmapAugE final : TLB_Complex {
 };
 
 struct Grams final : TLB_Complex {
-  bool validate_skip(vm::CellSlice& cs, bool weak = false) const override;
+  bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override;
   td::RefInt256 as_integer_skip(vm::CellSlice& cs) const override;
   bool null_value(vm::CellBuilder& cb) const override;
   bool store_integer_value(vm::CellBuilder& cb, const td::BigInt256& value) const override;
@@ -264,7 +264,7 @@ extern const Grams t_Grams;
 
 struct MsgAddressInt final : TLB_Complex {
   enum { addr_std = 2, addr_var = 3 };
-  bool validate_skip(vm::CellSlice& cs, bool weak = false) const override;
+  bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override;
   int get_tag(const vm::CellSlice& cs) const override {
     return (int)cs.prefetch_ulong(2);
   }
@@ -285,6 +285,8 @@ struct MsgAddressInt final : TLB_Complex {
                            bool rewrite = true) const;
   bool extract_std_address(vm::CellSlice& cs, ton::WorkchainId& workchain, ton::StdSmcAddress& addr,
                            bool rewrite = true) const;
+  bool store_std_address(vm::CellBuilder& cb, ton::WorkchainId workchain, const ton::StdSmcAddress& addr) const;
+  Ref<vm::CellSlice> pack_std_address(ton::WorkchainId workchain, const ton::StdSmcAddress& addr) const;
 };
 
 extern const MsgAddressInt t_MsgAddressInt;
@@ -301,7 +303,7 @@ extern const MsgAddressExt t_MsgAddressExt;
 
 struct MsgAddress final : TLB_Complex {
   enum { addr_none = 0, addr_ext = 1, addr_std = 2, addr_var = 3 };
-  bool validate_skip(vm::CellSlice& cs, bool weak = false) const override;
+  bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override;
   int get_tag(const vm::CellSlice& cs) const override {
     return (int)cs.prefetch_ulong(2);
   }
@@ -316,8 +318,8 @@ struct ExtraCurrencyCollection final : TLB {
   int get_size(const vm::CellSlice& cs) const override {
     return dict_type.get_size(cs);
   }
-  bool validate(const vm::CellSlice& cs, bool weak) const override {
-    return dict_type.validate(cs, weak);
+  bool validate(int* ops, const vm::CellSlice& cs, bool weak) const override {
+    return dict_type.validate(ops, cs, weak);
   }
   bool null_value(vm::CellBuilder& cb) const override {
     return cb.store_zeroes_bool(1);
@@ -346,7 +348,7 @@ extern const ExtraCurrencyCollection t_ExtraCurrencyCollection;
 
 struct CurrencyCollection final : TLB_Complex {
   bool skip(vm::CellSlice& cs) const override;
-  bool validate_skip(vm::CellSlice& cs, bool weak = false) const override;
+  bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override;
   td::RefInt256 as_integer_skip(vm::CellSlice& cs) const override;
   bool null_value(vm::CellBuilder& cb) const override {
     return cb.store_bits_same_bool(1 + 4, false);
@@ -369,7 +371,7 @@ extern const CurrencyCollection t_CurrencyCollection;
 struct CommonMsgInfo final : TLB_Complex {
   enum { int_msg_info = 0, ext_in_msg_info = 2, ext_out_msg_info = 3 };
   bool skip(vm::CellSlice& cs) const override;
-  bool validate_skip(vm::CellSlice& cs, bool weak = false) const override;
+  bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override;
   int get_tag(const vm::CellSlice& cs) const override {
     int v = (int)cs.prefetch_ulong(2);
     return v == 1 ? int_msg_info : v;
@@ -400,14 +402,14 @@ struct TickTock final : TLB {
 extern const TickTock t_TickTock;
 
 struct StateInit final : TLB_Complex {
-  bool validate_skip(vm::CellSlice& cs, bool weak = false) const override;
+  bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override;
   bool get_ticktock(vm::CellSlice& cs, int& ticktock) const;
 };
 
 extern const StateInit t_StateInit;
 
 struct Message final : TLB_Complex {
-  bool validate_skip(vm::CellSlice& cs, bool weak = false) const override;
+  bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override;
   bool extract_info(vm::CellSlice& cs) const;
   bool get_created_lt(vm::CellSlice& cs, unsigned long long& created_lt) const;
   bool is_internal(const vm::CellSlice& cs) const {
@@ -423,7 +425,7 @@ struct IntermediateAddress final : TLB_Complex {
   enum { interm_addr_regular = 0, interm_addr_simple = 2, interm_addr_ext = 3 };
   int get_size(const vm::CellSlice& cs) const override;
   bool skip(vm::CellSlice& cs) const override;
-  bool validate_skip(vm::CellSlice& cs, bool weak = false) const override;
+  bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override;
   bool fetch_regular(vm::CellSlice& cs, int& use_dst_bits) const {
     return cs.fetch_uint_to(8, use_dst_bits) && use_dst_bits <= 96;
   }
@@ -437,7 +439,7 @@ extern const IntermediateAddress t_IntermediateAddress;
 
 struct MsgEnvelope final : TLB_Complex {
   bool skip(vm::CellSlice& cs) const override;
-  bool validate_skip(vm::CellSlice& cs, bool weak = false) const override;
+  bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override;
   bool extract_fwd_fees_remaining(vm::CellSlice& cs) const;
   struct Record {
     typedef MsgEnvelope type_class;
@@ -461,28 +463,28 @@ extern const RefTo<MsgEnvelope> t_Ref_MsgEnvelope;
 
 struct StorageUsed final : TLB_Complex {
   bool skip(vm::CellSlice& cs) const override;
-  bool validate_skip(vm::CellSlice& cs, bool weak = false) const override;
+  bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override;
 };
 
 extern const StorageUsed t_StorageUsed;
 
 struct StorageUsedShort final : TLB_Complex {
   bool skip(vm::CellSlice& cs) const override;
-  bool validate_skip(vm::CellSlice& cs, bool weak = false) const override;
+  bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override;
 };
 
 extern const StorageUsedShort t_StorageUsedShort;
 
 struct StorageInfo final : TLB_Complex {
   bool skip(vm::CellSlice& cs) const override;
-  bool validate_skip(vm::CellSlice& cs, bool weak = false) const override;
+  bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override;
 };
 
 extern const StorageInfo t_StorageInfo;
 
 struct AccountState final : TLB_Complex {
   enum { account_uninit = 0, account_frozen = 1, account_active = 2 };
-  bool validate_skip(vm::CellSlice& cs, bool weak = false) const override;
+  bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override;
   int get_tag(const vm::CellSlice& cs) const override {
     int t = (int)cs.prefetch_ulong(2);
     return t == 3 ? account_active : t;
@@ -494,7 +496,7 @@ extern const AccountState t_AccountState;
 
 struct AccountStorage final : TLB_Complex {
   bool skip(vm::CellSlice& cs) const override;
-  bool validate_skip(vm::CellSlice& cs, bool weak = false) const override;
+  bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override;
   bool skip_copy_balance(vm::CellBuilder& cb, vm::CellSlice& cs) const;
 };
 
@@ -506,7 +508,7 @@ struct Account final : TLB_Complex {
   Account(bool _allow_empty = false) : allow_empty(_allow_empty) {
   }
   bool skip(vm::CellSlice& cs) const override;
-  bool validate_skip(vm::CellSlice& cs, bool weak = false) const override;
+  bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override;
   // Ref<vm::CellSlice> get_balance(const vm::CellSlice& cs) const;
   bool skip_copy_balance(vm::CellBuilder& cb, vm::CellSlice& cs) const;
   bool skip_copy_depth_balance(vm::CellBuilder& cb, vm::CellSlice& cs) const;
@@ -551,8 +553,8 @@ struct ShardAccount final : TLB_Complex {
   bool skip(vm::CellSlice& cs) const override {
     return cs.advance_ext(0x140, 1);
   }
-  bool validate_skip(vm::CellSlice& cs, bool weak = false) const override {
-    return cs.advance(0x140) && t_Ref_Account.validate_skip(cs, weak);
+  bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override {
+    return cs.advance(0x140) && t_Ref_Account.validate_skip(ops, cs, weak);
   }
   static bool unpack(vm::CellSlice& cs, Record& info) {
     return info.unpack(cs);
@@ -567,7 +569,7 @@ extern const ShardAccount t_ShardAccount;
 
 struct DepthBalanceInfo final : TLB_Complex {
   bool skip(vm::CellSlice& cs) const override;
-  bool validate_skip(vm::CellSlice& cs, bool weak = false) const override;
+  bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override;
   bool null_value(vm::CellBuilder& cb) const override;
   bool add_values(vm::CellBuilder& cb, vm::CellSlice& cs1, vm::CellSlice& cs2) const override;
 };
@@ -588,8 +590,8 @@ struct ShardAccounts final : TLB_Complex {
   bool skip(vm::CellSlice& cs) const override {
     return dict_type.skip(cs);
   }
-  bool validate_skip(vm::CellSlice& cs, bool weak = false) const override {
-    return dict_type.validate_skip(cs, weak);
+  bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override {
+    return dict_type.validate_skip(ops, cs, weak);
   }
 };
 
@@ -613,7 +615,7 @@ extern const AccStatusChange t_AccStatusChange;
 
 struct TrStoragePhase final : TLB_Complex {
   bool skip(vm::CellSlice& cs) const override;
-  bool validate_skip(vm::CellSlice& cs, bool weak = false) const override;
+  bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override;
   bool get_storage_fees(vm::CellSlice& cs, td::RefInt256& storage_fees) const;
   bool maybe_get_storage_fees(vm::CellSlice& cs, td::RefInt256& storage_fees) const;
 };
@@ -622,14 +624,14 @@ extern const TrStoragePhase t_TrStoragePhase;
 
 struct TrCreditPhase final : TLB_Complex {
   bool skip(vm::CellSlice& cs) const override;
-  bool validate_skip(vm::CellSlice& cs, bool weak = false) const override;
+  bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override;
 };
 
 extern const TrCreditPhase t_TrCreditPhase;
 
 struct TrComputeInternal1 final : TLB_Complex {
   bool skip(vm::CellSlice& cs) const override;
-  bool validate_skip(vm::CellSlice& cs, bool weak = false) const override;
+  bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override;
 };
 
 struct ComputeSkipReason final : TLB {
@@ -637,7 +639,7 @@ struct ComputeSkipReason final : TLB {
   int get_size(const vm::CellSlice& cs) const override {
     return 2;
   }
-  bool validate_skip(vm::CellSlice& cs, bool weak = false) const override {
+  bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override {
     return get_tag(cs) >= 0 && cs.advance(2);
   }
   int get_tag(const vm::CellSlice& cs) const override {
@@ -651,7 +653,7 @@ extern const ComputeSkipReason t_ComputeSkipReason;
 struct TrComputePhase final : TLB_Complex {
   enum { tr_phase_compute_skipped = 0, tr_phase_compute_vm = 1 };
   bool skip(vm::CellSlice& cs) const override;
-  bool validate_skip(vm::CellSlice& cs, bool weak = false) const override;
+  bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override;
   int get_tag(const vm::CellSlice& cs) const override {
     return (int)cs.prefetch_ulong(1);
   }
@@ -661,7 +663,7 @@ extern const TrComputePhase t_TrComputePhase;
 
 struct TrActionPhase final : TLB_Complex {
   bool skip(vm::CellSlice& cs) const override;
-  bool validate_skip(vm::CellSlice& cs, bool weak = false) const override;
+  bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override;
 };
 
 extern const TrActionPhase t_TrActionPhase;
@@ -669,7 +671,7 @@ extern const TrActionPhase t_TrActionPhase;
 struct TrBouncePhase final : TLB_Complex {
   enum { tr_phase_bounce_negfunds = 0, tr_phase_bounce_nofunds = 1, tr_phase_bounce_ok = 2 };
   bool skip(vm::CellSlice& cs) const override;
-  bool validate_skip(vm::CellSlice& cs, bool weak = false) const override;
+  bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override;
   int get_tag(const vm::CellSlice& cs) const override;
 };
 
@@ -677,7 +679,7 @@ extern const TrBouncePhase t_TrBouncePhase;
 
 struct SplitMergeInfo final : TLB_Complex {
   bool skip(vm::CellSlice& cs) const override;
-  bool validate_skip(vm::CellSlice& cs, bool weak = false) const override;
+  bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override;
 };
 
 extern const SplitMergeInfo t_SplitMergeInfo;
@@ -693,7 +695,7 @@ struct TransactionDescr final : TLB_Complex {
     trans_merge_install = 7
   };
   bool skip(vm::CellSlice& cs) const override;
-  bool validate_skip(vm::CellSlice& cs, bool weak = false) const override;
+  bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override;
   int get_tag(const vm::CellSlice& cs) const override;
   bool skip_to_storage_phase(vm::CellSlice& cs, bool& found) const;
   bool get_storage_fees(Ref<vm::Cell> cell, td::RefInt256& storage_fees) const;
@@ -703,14 +705,14 @@ extern const TransactionDescr t_TransactionDescr;
 
 struct Transaction_aux final : TLB_Complex {
   bool skip(vm::CellSlice& cs) const override;
-  bool validate_skip(vm::CellSlice& cs, bool weak = false) const override;
+  bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override;
 };
 
 extern const Transaction_aux t_Transaction_aux;
 
 struct Transaction final : TLB_Complex {
   bool skip(vm::CellSlice& cs) const override;
-  bool validate_skip(vm::CellSlice& cs, bool weak = false) const override;
+  bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override;
   bool get_total_fees(vm::CellSlice&& cs, block::CurrencyCollection& total_fees) const;
   bool get_descr(Ref<vm::Cell> cell, Ref<vm::Cell>& tdescr) const;
   bool get_descr(vm::CellSlice& cs, Ref<vm::Cell>& tdescr) const;
@@ -733,7 +735,7 @@ struct HashUpdate final : TLB_Complex {
   bool skip(vm::CellSlice& cs) const override {
     return cs.advance(8 + 256 * 2);
   }
-  bool validate_skip(vm::CellSlice& cs, bool weak = false) const override {
+  bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override {
     return cs.fetch_ulong(8) == 0x72 && cs.advance(256 * 2);
   }
 };
@@ -743,7 +745,7 @@ extern const RefTo<HashUpdate> t_Ref_HashUpdate;
 
 struct AccountBlock final : TLB_Complex {
   bool skip(vm::CellSlice& cs) const override;
-  bool validate_skip(vm::CellSlice& cs, bool weak = false) const override;
+  bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override;
   bool get_total_fees(vm::CellSlice&& cs, block::CurrencyCollection& total_fees) const;
 };
 
@@ -760,7 +762,7 @@ extern const HashmapAugE t_ShardAccountBlocks;  // (HashmapAugE 256 AccountBlock
 
 struct ImportFees final : TLB_Complex {
   bool skip(vm::CellSlice& cs) const override;
-  bool validate_skip(vm::CellSlice& cs, bool weak = false) const override;
+  bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override;
   bool null_value(vm::CellBuilder& cb) const override {
     return cb.store_bits_same_bool(4 + 4 + 1, false);
   }
@@ -780,7 +782,7 @@ struct InMsg final : TLB_Complex {
     msg_discard_tr = 7
   };
   bool skip(vm::CellSlice& cs) const override;
-  bool validate_skip(vm::CellSlice& cs, bool weak = false) const override;
+  bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override;
   int get_tag(const vm::CellSlice& cs) const override {
     return (int)cs.prefetch_ulong(3);
   }
@@ -800,7 +802,7 @@ struct OutMsg final : TLB_Complex {
     msg_export_tr_req = 7
   };
   bool skip(vm::CellSlice& cs) const override;
-  bool validate_skip(vm::CellSlice& cs, bool weak = false) const override;
+  bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override;
   int get_tag(const vm::CellSlice& cs) const override {
     return (int)cs.prefetch_ulong(3);
   }
@@ -828,8 +830,8 @@ struct InMsgDescr final : TLB_Complex {
   bool skip(vm::CellSlice& cs) const override {
     return dict_type.skip(cs);
   }
-  bool validate_skip(vm::CellSlice& cs, bool weak = false) const override {
-    return dict_type.validate_skip(cs, weak);
+  bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override {
+    return dict_type.validate_skip(ops, cs, weak);
   }
 };
 
@@ -851,8 +853,8 @@ struct OutMsgDescr final : TLB_Complex {
   bool skip(vm::CellSlice& cs) const override {
     return dict_type.skip(cs);
   }
-  bool validate_skip(vm::CellSlice& cs, bool weak = false) const override {
-    return dict_type.validate_skip(cs, weak);
+  bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override {
+    return dict_type.validate_skip(ops, cs, weak);
   }
 };
 
@@ -865,7 +867,7 @@ struct EnqueuedMsg final : TLB_Complex {
   bool skip(vm::CellSlice& cs) const override {
     return cs.advance_ext(0x10040);
   }
-  bool validate_skip(vm::CellSlice& cs, bool weak = false) const override;
+  bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override;
   bool unpack(vm::CellSlice& cs, EnqueuedMsgDescr& descr) const {
     return descr.unpack(cs);
   }
@@ -889,8 +891,8 @@ struct OutMsgQueue final : TLB_Complex {
   bool skip(vm::CellSlice& cs) const override {
     return dict_type.skip(cs);
   }
-  bool validate_skip(vm::CellSlice& cs, bool weak = false) const override {
-    return dict_type.validate_skip(cs, weak);
+  bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override {
+    return dict_type.validate_skip(ops, cs, weak);
   }
 };
 
@@ -908,7 +910,7 @@ extern const HashmapE t_IhrPendingInfo;
 
 struct OutMsgQueueInfo final : TLB_Complex {
   bool skip(vm::CellSlice& cs) const override;
-  bool validate_skip(vm::CellSlice& cs, bool weak = false) const override;
+  bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override;
 };
 
 extern const OutMsgQueueInfo t_OutMsgQueueInfo;
@@ -921,6 +923,9 @@ struct ExtBlkRef final : TLB {
   }
   bool unpack(vm::CellSlice& cs, ton::BlockIdExt& blkid, ton::LogicalTime* end_lt = nullptr) const;
   bool unpack(Ref<vm::CellSlice> cs_ref, ton::BlockIdExt& blkid, ton::LogicalTime* end_lt = nullptr) const;
+  bool store(vm::CellBuilder& cb, const ton::BlockIdExt& blkid, ton::LogicalTime end_lt) const;
+  Ref<vm::Cell> pack_cell(const ton::BlockIdExt& blkid, ton::LogicalTime end_lt) const;
+  bool pack_to(Ref<vm::Cell>& cell, const ton::BlockIdExt& blkid, ton::LogicalTime end_lt) const;
 };
 
 extern const ExtBlkRef t_ExtBlkRef;
@@ -941,7 +946,7 @@ struct ShardIdent final : TLB_Complex {
   bool skip(vm::CellSlice& cs) const override {
     return cs.advance(get_size(cs));
   }
-  bool validate_skip(vm::CellSlice& cs, bool weak = false) const override;
+  bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override;
   int get_tag(const vm::CellSlice& cs) const override {
     return 0;
   }
@@ -980,7 +985,7 @@ struct BlockIdExt final : TLB_Complex {
   bool skip(vm::CellSlice& cs) const override {
     return cs.advance(get_size(cs));
   }
-  bool validate_skip(vm::CellSlice& cs, bool weak = false) const override;
+  bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override;
   bool unpack(vm::CellSlice& cs, ton::BlockIdExt& data) const;
   bool pack(vm::CellBuilder& cb, const ton::BlockIdExt& data) const;
 };
@@ -990,7 +995,7 @@ extern const BlockIdExt t_BlockIdExt;
 struct ShardState final : TLB_Complex {
   enum { shard_state = (int)0x9023afe2, split_state = 0x5f327da5 };
   bool skip(vm::CellSlice& cs) const override;
-  bool validate_skip(vm::CellSlice& cs, bool weak = false) const override;
+  bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override;
   int get_tag(const vm::CellSlice& cs) const override {
     return (int)cs.prefetch_ulong(32) == shard_state ? shard_state : -1;
   }
@@ -1000,7 +1005,7 @@ extern const ShardState t_ShardState;
 
 struct ShardState_aux final : TLB_Complex {
   bool skip(vm::CellSlice& cs) const override;
-  bool validate_skip(vm::CellSlice& cs, bool weak = false) const override;
+  bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override;
   int get_tag(const vm::CellSlice& cs) const override {
     return 0;
   }
@@ -1011,7 +1016,7 @@ extern const ShardState_aux t_ShardState_aux;
 struct LibDescr final : TLB_Complex {
   enum { shared_lib_descr = 0 };
   bool skip(vm::CellSlice& cs) const override;
-  bool validate_skip(vm::CellSlice& cs, bool weak = false) const override;
+  bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override;
   int get_tag(const vm::CellSlice& cs) const override {
     return (int)cs.prefetch_ulong(2);
   }
@@ -1024,7 +1029,7 @@ struct BlkPrevInfo final : TLB_Complex {
   BlkPrevInfo(bool _merged) : merged(_merged) {
   }
   bool skip(vm::CellSlice& cs) const override;
-  bool validate_skip(vm::CellSlice& cs, bool weak = false) const override;
+  bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override;
 };
 
 extern const BlkPrevInfo t_BlkPrevInfo_0;
@@ -1032,7 +1037,7 @@ extern const BlkPrevInfo t_BlkPrevInfo_0;
 struct McStateExtra final : TLB_Complex {
   enum { masterchain_state_extra = 0xcc26 };
   bool skip(vm::CellSlice& cs) const override;
-  bool validate_skip(vm::CellSlice& cs, bool weak = false) const override;
+  bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override;
 };
 
 extern const McStateExtra t_McStateExtra;
@@ -1069,7 +1074,7 @@ extern const Aug_OldMcBlocksInfo aug_OldMcBlocksInfo;
 
 struct ShardFeeCreated final : TLB_Complex {
   bool skip(vm::CellSlice& cs) const override;
-  bool validate_skip(vm::CellSlice& cs, bool weak = false) const override;
+  bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override;
   bool null_value(vm::CellBuilder& cb) const override;
   bool add_values(vm::CellBuilder& cb, vm::CellSlice& cs1, vm::CellSlice& cs2) const override;
 };
diff --git a/submodules/ton/tonlib-src/crypto/block/block.cpp b/submodules/ton/tonlib-src/crypto/block/block.cpp
index 80723b5856..d9d3c26726 100644
--- a/submodules/ton/tonlib-src/crypto/block/block.cpp
+++ b/submodules/ton/tonlib-src/crypto/block/block.cpp
@@ -14,7 +14,7 @@
     You should have received a copy of the GNU Lesser General Public License
     along with TON Blockchain Library.  If not, see <http://www.gnu.org/licenses/>.
 
-    Copyright 2017-2019 Telegram Systems LLP
+    Copyright 2017-2020 Telegram Systems LLP
 */
 #include "td/utils/bits.h"
 #include "block/block.h"
@@ -789,10 +789,11 @@ td::Status ShardState::unpack_state(ton::BlockIdExt blkid, Ref<vm::Cell> prev_st
       return td::Status::Error(-666, "ShardState of "s + id_.to_str() + " does not contain a valid global_balance");
     }
     if (extra.r1.flags & 1) {
-      if (extra.r1.block_create_stats->prefetch_ulong(8) != 0x17) {
+      if (extra.r1.block_create_stats->prefetch_ulong(8) == 0x17) {
+        block_create_stats_ = std::make_unique<vm::Dictionary>(extra.r1.block_create_stats->prefetch_ref(), 256);
+      } else {
         return td::Status::Error(-666, "ShardState of "s + id_.to_str() + " does not contain a valid BlockCreateStats");
       }
-      block_create_stats_ = std::make_unique<vm::Dictionary>(extra.r1.block_create_stats->prefetch_ref(), 256);
     } else {
       block_create_stats_ = std::make_unique<vm::Dictionary>(256);
     }
@@ -812,11 +813,11 @@ td::Status ShardState::unpack_out_msg_queue_info(Ref<vm::Cell> out_msg_queue_inf
     LOG(DEBUG) << "unpacking ProcessedUpto of our previous block " << id_.to_str();
     block::gen::t_ProcessedInfo.print(std::cerr, qinfo.proc_info);
   }
-  if (!block::gen::t_ProcessedInfo.validate_csr(qinfo.proc_info)) {
+  if (!block::gen::t_ProcessedInfo.validate_csr(1024, qinfo.proc_info)) {
     return td::Status::Error(
         -666, "ProcessedInfo in the state of "s + id_.to_str() + " is invalid according to automated validity checks");
   }
-  if (!block::gen::t_IhrPendingInfo.validate_csr(qinfo.ihr_pending)) {
+  if (!block::gen::t_IhrPendingInfo.validate_csr(1024, qinfo.ihr_pending)) {
     return td::Status::Error(
         -666, "IhrPendingInfo in the state of "s + id_.to_str() + " is invalid according to automated validity checks");
   }
@@ -1035,7 +1036,7 @@ td::Status ShardState::split(ton::ShardIdFull subshard) {
   LOG(DEBUG) << "splitting total_balance";
   auto old_total_balance = total_balance_;
   auto accounts_extra = account_dict_->get_root_extra();
-  if (!(accounts_extra.write().advance(5) && total_balance_.validate_unpack(accounts_extra))) {
+  if (!(accounts_extra.write().advance(5) && total_balance_.validate_unpack(accounts_extra, 1024))) {
     LOG(ERROR) << "cannot unpack CurrencyCollection from the root of newly-split accounts dictionary";
     return td::Status::Error(
         -666, "error splitting total balance in account dictionary of shardchain state "s + id_.to_str());
@@ -1084,16 +1085,16 @@ int filter_out_msg_queue(vm::AugmentedDictionary& out_queue, ton::ShardIdFull ol
   });
 }
 
-bool CurrencyCollection::validate() const {
-  return is_valid() && td::sgn(grams) >= 0 && validate_extra();
+bool CurrencyCollection::validate(int max_cells) const {
+  return is_valid() && td::sgn(grams) >= 0 && validate_extra(max_cells);
 }
 
-bool CurrencyCollection::validate_extra() const {
+bool CurrencyCollection::validate_extra(int max_cells) const {
   if (extra.is_null()) {
     return true;
   }
   vm::CellBuilder cb;
-  return cb.store_maybe_ref(extra) && block::tlb::t_ExtraCurrencyCollection.validate_ref(cb.finalize());
+  return cb.store_maybe_ref(extra) && block::tlb::t_ExtraCurrencyCollection.validate_ref(max_cells, cb.finalize());
 }
 
 bool CurrencyCollection::add(const CurrencyCollection& a, const CurrencyCollection& b, CurrencyCollection& c) {
@@ -1264,8 +1265,8 @@ bool CurrencyCollection::unpack(Ref<vm::CellSlice> csr) {
   return unpack_CurrencyCollection(std::move(csr), grams, extra) || invalidate();
 }
 
-bool CurrencyCollection::validate_unpack(Ref<vm::CellSlice> csr) {
-  return (csr.not_null() && block::tlb::t_CurrencyCollection.validate(*csr) &&
+bool CurrencyCollection::validate_unpack(Ref<vm::CellSlice> csr, int max_cells) {
+  return (csr.not_null() && block::tlb::t_CurrencyCollection.validate_upto(max_cells, *csr) &&
           unpack_CurrencyCollection(std::move(csr), grams, extra)) ||
          invalidate();
 }
@@ -1592,7 +1593,7 @@ bool check_one_config_param(Ref<vm::CellSlice> cs_ref, td::ConstBitPtr key, td::
   } else if (idx < 0) {
     return true;
   }
-  bool ok = block::gen::ConfigParam{idx}.validate_ref(std::move(cell));
+  bool ok = block::gen::ConfigParam{idx}.validate_ref(1024, std::move(cell));
   if (!ok) {
     LOG(ERROR) << "configuration parameter #" << idx << " is invalid";
   }
@@ -1745,7 +1746,7 @@ td::Status unpack_block_prev_blk_ext(Ref<vm::Cell> block_root, const ton::BlockI
   block::gen::ExtBlkRef::Record mcref;  // _ ExtBlkRef = BlkMasterInfo;
   ton::ShardIdFull shard;
   if (!(tlb::unpack_cell(block_root, blk) && tlb::unpack_cell(blk.info, info) && !info.version &&
-        block::tlb::t_ShardIdent.unpack(info.shard.write(), shard) && !info.vert_seq_no &&
+        block::tlb::t_ShardIdent.unpack(info.shard.write(), shard) &&
         (!info.not_master || tlb::unpack_cell(info.master_ref, mcref)))) {
     return td::Status::Error("cannot unpack block header");
   }
@@ -1809,6 +1810,9 @@ td::Status unpack_block_prev_blk_ext(Ref<vm::Cell> block_root, const ton::BlockI
   } else {
     mc_blkid = ton::BlockIdExt{ton::masterchainId, ton::shardIdAll, mcref.seq_no, mcref.root_hash, mcref.file_hash};
   }
+  if (shard.is_masterchain() && info.vert_seqno_incr && !info.key_block) {
+    return td::Status::Error("non-key masterchain block cannot have vert_seqno_incr set");
+  }
   return td::Status::OK();
 }
 
@@ -1817,7 +1821,7 @@ td::Status check_block_header(Ref<vm::Cell> block_root, const ton::BlockIdExt& i
   block::gen::BlockInfo::Record info;
   ton::ShardIdFull shard;
   if (!(tlb::unpack_cell(block_root, blk) && tlb::unpack_cell(blk.info, info) && !info.version &&
-        block::tlb::t_ShardIdent.unpack(info.shard.write(), shard) && !info.vert_seq_no)) {
+        block::tlb::t_ShardIdent.unpack(info.shard.write(), shard))) {
     return td::Status::Error("cannot unpack block header");
   }
   ton::BlockId hdr_id{shard, (unsigned)info.seq_no};
@@ -1843,6 +1847,18 @@ td::Status check_block_header(Ref<vm::Cell> block_root, const ton::BlockIdExt& i
   return td::Status::OK();
 }
 
+std::unique_ptr<vm::Dictionary> get_block_create_stats_dict(Ref<vm::Cell> state_root) {
+  block::gen::ShardStateUnsplit::Record info;
+  block::gen::McStateExtra::Record extra;
+  block::gen::BlockCreateStats::Record_block_create_stats cstats;
+  if (!(::tlb::unpack_cell(std::move(state_root), info) && info.custom->size_refs() &&
+        ::tlb::unpack_cell(info.custom->prefetch_ref(), extra) && (extra.r1.flags & 1) &&
+        ::tlb::csr_unpack(std::move(extra.r1.block_create_stats), cstats))) {
+    return {};
+  }
+  return std::make_unique<vm::Dictionary>(std::move(cstats.counters), 256);
+}
+
 std::unique_ptr<vm::AugmentedDictionary> get_prev_blocks_dict(Ref<vm::Cell> state_root) {
   block::gen::ShardStateUnsplit::Record info;
   block::gen::McStateExtra::Record extra_info;
diff --git a/submodules/ton/tonlib-src/crypto/block/block.h b/submodules/ton/tonlib-src/crypto/block/block.h
index fd9a724f26..0d961320bd 100644
--- a/submodules/ton/tonlib-src/crypto/block/block.h
+++ b/submodules/ton/tonlib-src/crypto/block/block.h
@@ -14,7 +14,7 @@
     You should have received a copy of the GNU Lesser General Public License
     along with TON Blockchain Library.  If not, see <http://www.gnu.org/licenses/>.
 
-    Copyright 2017-2019 Telegram Systems LLP
+    Copyright 2017-2020 Telegram Systems LLP
 */
 #pragma once
 #include "common/refcnt.hpp"
@@ -163,12 +163,12 @@ struct MsgProcessedUpto {
   MsgProcessedUpto(ton::ShardId _shard, ton::BlockSeqno _mcseqno, ton::LogicalTime _lt, td::ConstBitPtr _hash)
       : shard(_shard), mc_seqno(_mcseqno), last_inmsg_lt(_lt), last_inmsg_hash(_hash) {
   }
-  bool operator<(const MsgProcessedUpto& other) const& {
+  bool operator<(const MsgProcessedUpto& other) const & {
     return shard < other.shard || (shard == other.shard && mc_seqno < other.mc_seqno);
   }
-  bool contains(const MsgProcessedUpto& other) const&;
+  bool contains(const MsgProcessedUpto& other) const &;
   bool contains(ton::ShardId other_shard, ton::LogicalTime other_lt, td::ConstBitPtr other_hash,
-                ton::BlockSeqno other_mc_seqno) const&;
+                ton::BlockSeqno other_mc_seqno) const &;
   // NB: this is for checking whether we have already imported an internal message
   bool already_processed(const EnqueuedMsgDescr& msg) const;
 };
@@ -323,8 +323,8 @@ struct CurrencyCollection {
     grams.clear();
     return false;
   }
-  bool validate() const;
-  bool validate_extra() const;
+  bool validate(int max_cells = 1024) const;
+  bool validate_extra(int max_cells = 1024) const;
   bool operator==(const CurrencyCollection& other) const;
   bool operator!=(const CurrencyCollection& other) const {
     return !operator==(other);
@@ -360,7 +360,7 @@ struct CurrencyCollection {
   bool fetch(vm::CellSlice& cs);
   bool fetch_exact(vm::CellSlice& cs);
   bool unpack(Ref<vm::CellSlice> csr);
-  bool validate_unpack(Ref<vm::CellSlice> csr);
+  bool validate_unpack(Ref<vm::CellSlice> csr, int max_cells = 1024);
   Ref<vm::CellSlice> pack() const;
   bool pack_to(Ref<vm::CellSlice>& csr) const {
     return (csr = pack()).not_null();
@@ -514,6 +514,9 @@ struct DiscountedCounter {
     return last_updated == other.last_updated && total == other.total && cnt2048 <= other.cnt2048 + 1 &&
            other.cnt2048 <= cnt2048 + 1 && cnt65536 <= other.cnt65536 + 1 && other.cnt65536 <= cnt65536 + 1;
   }
+  bool modified_since(ton::UnixTime utime) const {
+    return last_updated >= utime;
+  }
   bool validate();
   bool increase_by(unsigned count, ton::UnixTime now);
   bool fetch(vm::CellSlice& cs);
@@ -629,6 +632,8 @@ td::Status unpack_block_prev_blk_try(Ref<vm::Cell> block_root, const ton::BlockI
 td::Status check_block_header(Ref<vm::Cell> block_root, const ton::BlockIdExt& id,
                               ton::Bits256* store_shard_hash_to = nullptr);
 
+std::unique_ptr<vm::Dictionary> get_block_create_stats_dict(Ref<vm::Cell> state_root);
+
 std::unique_ptr<vm::AugmentedDictionary> get_prev_blocks_dict(Ref<vm::Cell> state_root);
 bool get_old_mc_block_id(vm::AugmentedDictionary* prev_blocks_dict, ton::BlockSeqno seqno, ton::BlockIdExt& blkid,
                          ton::LogicalTime* end_lt = nullptr);
diff --git a/submodules/ton/tonlib-src/crypto/block/block.tlb b/submodules/ton/tonlib-src/crypto/block/block.tlb
index ec91ef5755..a30cd89a87 100644
--- a/submodules/ton/tonlib-src/crypto/block/block.tlb
+++ b/submodules/ton/tonlib-src/crypto/block/block.tlb
@@ -366,6 +366,10 @@ action_send_msg#0ec3c86d mode:(## 8)
 action_set_code#ad4de08e new_code:^Cell = OutAction;
 action_reserve_currency#36e6b809 mode:(## 8)
   currency:CurrencyCollection = OutAction;
+libref_hash$0 lib_hash:bits256 = LibRef;
+libref_ref$1 library:^Cell = LibRef;
+action_change_library#26fa1dd4 mode:(## 7) { mode <= 2 }
+  libref:LibRef = OutAction;
 
 out_list_node$_ prev:^Cell action:OutAction = OutListNode;
 //
@@ -505,6 +509,7 @@ _ (HashmapAugE 32 KeyExtBlkRef KeyMaxLt) = OldMcBlocksInfo;
 counters#_ last_updated:uint32 total:uint64 cnt2048:uint64 cnt65536:uint64 = Counters; 
 creator_info#4 mc_blocks:Counters shard_blocks:Counters = CreatorStats; 
 block_create_stats#17 counters:(HashmapE 256 CreatorStats) = BlockCreateStats;
+block_create_stats_ext#34 counters:(HashmapAugE 256 CreatorStats uint32) = BlockCreateStats;
 
 masterchain_state_extra#cc26
   shard_hashes:ShardHashes
@@ -678,3 +683,77 @@ top_block_descr#d5 proof_for:BlockIdExt signatures:(Maybe ^BlockSignatures)
 //  COLLATED DATA
 //
 top_block_descr_set#4ac789f3 collection:(HashmapE 96 ^TopBlockDescr) = TopBlockDescrSet;
+
+//
+//  TVM REFLECTION
+//
+vm_stk_null#00 = VmStackValue;
+vm_stk_tinyint#01 value:int64 = VmStackValue;
+vm_stk_int#0201_ value:int257 = VmStackValue;
+vm_stk_nan#02ff = VmStackValue;
+vm_stk_cell#03 cell:^Cell = VmStackValue;
+_ cell:^Cell st_bits:(## 10) end_bits:(## 10) { st_bits <= end_bits }
+  st_ref:(#<= 4) end_ref:(#<= 4) { st_ref <= end_ref } = VmCellSlice;
+vm_stk_slice#04 _:VmCellSlice = VmStackValue;
+vm_stk_builder#05 cell:^Cell = VmStackValue;
+vm_stk_cont#06 cont:VmCont = VmStackValue;
+vm_tupref_nil$_ = VmTupleRef 0;
+vm_tupref_single$_ entry:^VmStackValue = VmTupleRef 1;
+vm_tupref_any$_ {n:#} ref:^(VmTuple (n + 2)) = VmTupleRef (n + 2);
+vm_tuple_nil$_ = VmTuple 0;
+vm_tuple_tcons$_ {n:#} head:(VmTupleRef n) tail:^VmStackValue = VmTuple (n + 1);
+vm_stk_tuple#07 len:(## 16) data:(VmTuple len) = VmStackValue;
+
+vm_stack#_ depth:(## 24) stack:(VmStackList depth) = VmStack;
+vm_stk_cons#_ {n:#} rest:^(VmStackList n) tos:VmStackValue = VmStackList (n + 1);
+vm_stk_nil#_ = VmStackList 0;
+
+_ cregs:(HashmapE 4 VmStackValue) = VmSaveList;
+gas_limits#_ remaining:int64 _:^[ max_limit:int64 cur_limit:int64 credit:int64 ]
+  = VmGasLimits;
+_ libraries:(HashmapE 256 ^Cell) = VmLibraries;
+
+vm_ctl_data$_ nargs:(Maybe uint13) stack:(Maybe VmStack) save:VmSaveList
+cp:(Maybe int16) = VmControlData;
+vmc_std$00 cdata:VmControlData code:VmCellSlice = VmCont;
+vmc_envelope$01 cdata:VmControlData next:^VmCont = VmCont;
+vmc_quit$1000 exit_code:int32 = VmCont;
+vmc_quit_exc$1001 = VmCont;
+vmc_repeat$10100 count:uint63 body:^VmCont after:^VmCont = VmCont; 
+vmc_until$110000 body:^VmCont after:^VmCont = VmCont;
+vmc_again$110001 body:^VmCont = VmCont;
+vmc_while_cond$110010 cond:^VmCont body:^VmCont
+after:^VmCont = VmCont;
+vmc_while_body$110011 cond:^VmCont body:^VmCont
+after:^VmCont = VmCont;
+vmc_pushint$1111 value:int32 next:^VmCont = VmCont;
+
+//
+//  DNS RECORDS
+//
+_ (HashmapE 16 ^DNSRecord) = DNS_RecordSet;
+
+chunk_ref$_ {n:#} ref:^(TextChunks (n + 1)) = TextChunkRef (n + 1);
+chunk_ref_empty$_ = TextChunkRef 0;
+text_chunk$_ {n:#} len:(## 8) data:(bits (len * 8)) next:(TextChunkRef n) = TextChunks (n + 1);
+text_chunk_empty$_ = TextChunks 0;
+text$_ chunks:(## 8) rest:(TextChunks chunks) = Text;
+dns_text#1eda _:Text = DNSRecord;
+
+dns_next_resolver#ba93 resolver:MsgAddressInt = DNSRecord;  // usually in record #-1
+
+dns_adnl_address#ad01 adnl_addr:bits256 flags:(## 8) { flags <= 1 }
+  proto_list:flags . 0?ProtoList = DNSRecord;  // often in record #2
+proto_list_nil$0 = ProtoList;
+proto_list_next$1 head:Protocol tail:ProtoList = ProtoList;
+proto_http#4854 = Protocol;
+
+dns_smc_address#9fd3 smc_addr:MsgAddressInt flags:(## 8) { flags <= 1 }
+  cap_list:flags . 0?SmcCapList = DNSRecord;   // often in record #1
+cap_list_nil$0 = SmcCapList;
+cap_list_next$1 head:SmcCapability tail:SmcCapList = SmcCapList;
+cap_method_seqno#5371 = SmcCapability;
+cap_method_pubkey#71f4 = SmcCapability;
+cap_is_wallet#2177 = SmcCapability;
+cap_name#ff name:Text = SmcCapability;
+
diff --git a/submodules/ton/tonlib-src/crypto/block/check-proof.cpp b/submodules/ton/tonlib-src/crypto/block/check-proof.cpp
index 7db7a97c6c..f8d38baac8 100644
--- a/submodules/ton/tonlib-src/crypto/block/check-proof.cpp
+++ b/submodules/ton/tonlib-src/crypto/block/check-proof.cpp
@@ -14,7 +14,7 @@
     You should have received a copy of the GNU Lesser General Public License
     along with TON Blockchain Library.  If not, see <http://www.gnu.org/licenses/>.
 
-    Copyright 2017-2019 Telegram Systems LLP
+    Copyright 2017-2020 Telegram Systems LLP
 */
 #include "check-proof.h"
 #include "block/block.h"
@@ -219,7 +219,17 @@ td::Status check_account_proof(td::Slice proof, ton::BlockIdExt shard_blk, const
 }
 
 td::Result<AccountState::Info> AccountState::validate(ton::BlockIdExt ref_blk, block::StdAddress addr) const {
-  TRY_RESULT_PREFIX(root, vm::std_boc_deserialize(state.as_slice(), true), "cannot deserialize account state");
+  TRY_RESULT_PREFIX(true_root, vm::std_boc_deserialize(state.as_slice(), true), "cannot deserialize account state");
+  Ref<vm::Cell> root;
+
+  if (is_virtualized && true_root.not_null()) {
+    root = vm::MerkleProof::virtualize(true_root, 1);
+    if (root.is_null()) {
+      return td::Status::Error("account state proof is invalid");
+    }
+  } else {
+    root = true_root;
+  }
 
   if (blk != ref_blk && ref_blk.id.seqno != ~0U) {
     return td::Status::Error(PSLICE() << "obtained getAccountState() for a different reference block " << blk.to_str()
@@ -241,6 +251,7 @@ td::Result<AccountState::Info> AccountState::validate(ton::BlockIdExt ref_blk, b
   TRY_STATUS(block::check_account_proof(proof.as_slice(), shard_blk, addr, root, &res.last_trans_lt,
                                         &res.last_trans_hash, &res.gen_utime, &res.gen_lt));
   res.root = std::move(root);
+  res.true_root = std::move(true_root);
 
   return res;
 }
diff --git a/submodules/ton/tonlib-src/crypto/block/check-proof.h b/submodules/ton/tonlib-src/crypto/block/check-proof.h
index 173ae9e475..cfd3a0d2c1 100644
--- a/submodules/ton/tonlib-src/crypto/block/check-proof.h
+++ b/submodules/ton/tonlib-src/crypto/block/check-proof.h
@@ -14,7 +14,7 @@
     You should have received a copy of the GNU Lesser General Public License
     along with TON Blockchain Library.  If not, see <http://www.gnu.org/licenses/>.
 
-    Copyright 2017-2019 Telegram Systems LLP
+    Copyright 2017-2020 Telegram Systems LLP
 */
 #pragma once
 
@@ -44,10 +44,11 @@ struct AccountState {
   td::BufferSlice shard_proof;
   td::BufferSlice proof;
   td::BufferSlice state;
+  bool is_virtualized{false};
 
   struct Info {
-    td::Ref<vm::Cell> root;
-    ton::LogicalTime last_trans_lt = 0;
+    td::Ref<vm::Cell> root, true_root;
+    ton::LogicalTime last_trans_lt{0};
     ton::Bits256 last_trans_hash;
     ton::LogicalTime gen_lt{0};
     td::uint32 gen_utime{0};
diff --git a/submodules/ton/tonlib-src/crypto/block/create-state.cpp b/submodules/ton/tonlib-src/crypto/block/create-state.cpp
index 8b92a24fa2..5eb14528c9 100644
--- a/submodules/ton/tonlib-src/crypto/block/create-state.cpp
+++ b/submodules/ton/tonlib-src/crypto/block/create-state.cpp
@@ -23,7 +23,7 @@
     exception statement from your version. If you delete this exception statement 
     from all source files in the program, then also delete it here.
 
-    Copyright 2017-2019 Telegram Systems LLP
+    Copyright 2017-2020 Telegram Systems LLP
 */
 #include <cassert>
 #include <algorithm>
@@ -633,6 +633,88 @@ void init_words_custom(fift::Dictionary& d) {
   d.def_stack_word("isWorkchainDescr? ", interpret_is_workchain_descr);
 }
 
+tlb::TypenameLookup tlb_dict;
+
+// ( S -- T -1 or 0 )  Looks up TLB type by name
+void interpret_tlb_type_lookup(vm::Stack& stack) {
+  auto ptr = tlb_dict.lookup(stack.pop_string());
+  if (ptr) {
+    stack.push_make_object<tlb::TlbTypeHolder>(ptr);
+  }
+  stack.push_bool(ptr);
+}
+
+td::Ref<tlb::TlbTypeHolder> pop_tlb_type(vm::Stack& stack) {
+  auto res = stack.pop_object<tlb::TlbTypeHolder>();
+  if (res.is_null()) {
+    throw vm::VmError{vm::Excno::type_chk, "not a TLB type"};
+  }
+  return res;
+}
+
+// ( T -- S )  Gets TLB type name
+void interpret_tlb_type_name(vm::Stack& stack) {
+  stack.push_string((*pop_tlb_type(stack))->get_type_name());
+}
+
+// ( T -- )  Prints TLB type name
+void interpret_print_tlb_type(vm::Stack& stack) {
+  std::cout << (*pop_tlb_type(stack))->get_type_name();
+}
+
+// ( s T -- )  Dumps (part of) slice s as a value of TLB type T
+void interpret_tlb_dump_as(vm::Stack& stack) {
+  auto tp = pop_tlb_type(stack);
+  (*tp)->print(std::cout, stack.pop_cellslice());
+}
+
+// ( s T -- s' S -1 or 0 )
+// Detects prefix of slice s that is a value of TLB type T, returns the remainder as s', and prints the value into String S.
+void interpret_tlb_dump_to_str(vm::Stack& stack) {
+  auto tp = pop_tlb_type(stack);
+  auto cs = stack.pop_cellslice();
+  std::ostringstream os;
+  bool ok = (*tp)->print_skip(os, cs.write());
+  if (ok) {
+    stack.push(std::move(cs));
+    stack.push_string(os.str());
+  }
+  stack.push_bool(ok);
+}
+
+// ( s T -- s' -1 or 0 )   Skips the only prefix of slice s that can be a value of TLB type T
+void interpret_tlb_skip(vm::Stack& stack) {
+  auto tp = pop_tlb_type(stack);
+  auto cs = stack.pop_cellslice();
+  bool ok = (*tp)->skip(cs.write());
+  if (ok) {
+    stack.push(std::move(cs));
+  }
+  stack.push_bool(ok);
+}
+
+// ( s T -- s' -1 or 0 )  Checks whether a prefix of slice s is a valid value of TLB type T, and skips it
+void interpret_tlb_validate_skip(vm::Stack& stack) {
+  auto tp = pop_tlb_type(stack);
+  auto cs = stack.pop_cellslice();
+  bool ok = (*tp)->validate_skip_upto(1048576, cs.write());
+  if (ok) {
+    stack.push(std::move(cs));
+  }
+  stack.push_bool(ok);
+}
+
+void init_words_tlb(fift::Dictionary& d) {
+  tlb_dict.register_types(block::gen::register_simple_types);
+  d.def_stack_word("tlb-type-lookup ", interpret_tlb_type_lookup);
+  d.def_stack_word("tlb-type-name ", interpret_tlb_type_name);
+  d.def_stack_word("tlb. ", interpret_print_tlb_type);
+  d.def_stack_word("tlb-dump-as ", interpret_tlb_dump_as);
+  d.def_stack_word("(tlb-dump-str?) ", interpret_tlb_dump_to_str);
+  d.def_stack_word("tlb-skip ", interpret_tlb_skip);
+  d.def_stack_word("tlb-validate-skip ", interpret_tlb_validate_skip);
+}
+
 void usage(const char* progname) {
   std::cerr
       << "Creates initial state for a TON blockchain, using configuration defined by Fift-language source files\n";
@@ -739,6 +821,7 @@ int main(int argc, char* const argv[]) {
   fift::init_words_vm(config.dictionary);
   fift::init_words_ton(config.dictionary);
   init_words_custom(config.dictionary);
+  init_words_tlb(config.dictionary);
 
   if (script_mode) {
     fift::import_cmdline_args(config.dictionary, source_list.empty() ? "" : source_list[0], argc - optind,
diff --git a/submodules/ton/tonlib-src/crypto/block/dump-block.cpp b/submodules/ton/tonlib-src/crypto/block/dump-block.cpp
index ef4e1d8411..716aa3bc51 100644
--- a/submodules/ton/tonlib-src/crypto/block/dump-block.cpp
+++ b/submodules/ton/tonlib-src/crypto/block/dump-block.cpp
@@ -23,7 +23,7 @@
     exception statement from your version. If you delete this exception statement 
     from all source files in the program, then also delete it here.
 
-    Copyright 2017-2019 Telegram Systems LLP
+    Copyright 2017-2020 Telegram Systems LLP
 */
 #include "block/block.h"
 #include "vm/boc.h"
@@ -98,7 +98,7 @@ void test1() {
 
   block::tlb::ShardIdent::Record shard_id;
   for (int i = 0; i < 3; i++) {
-    std::cout << "ShardIdent.validate() = " << block::tlb::t_ShardIdent.validate(csl) << std::endl;
+    std::cout << "ShardIdent.validate() = " << block::tlb::t_ShardIdent.validate_upto(1024, csl) << std::endl;
     csl.print_rec(std::cerr);
     csl.dump(std::cerr, 7);
     std::cout << "ShardIdent.unpack() = " << block::tlb::t_ShardIdent.unpack(csl, shard_id) << std::endl;
@@ -107,9 +107,9 @@ void test1() {
                 << " shard_prefix:" << shard_id.shard_prefix << std::endl;
     }
   }
-  std::cout << "ShardIdent.skip_validate() = " << block::tlb::t_ShardIdent.validate_skip(csl) << std::endl;
-  std::cout << "ShardIdent.skip_validate() = " << block::tlb::t_ShardIdent.validate_skip(csl) << std::endl;
-  std::cout << "ShardIdent.skip_validate() = " << block::tlb::t_ShardIdent.validate_skip(csl) << std::endl;
+  std::cout << "ShardIdent.skip_validate() = " << block::tlb::t_ShardIdent.validate_skip_upto(1024, csl) << std::endl;
+  std::cout << "ShardIdent.skip_validate() = " << block::tlb::t_ShardIdent.validate_skip_upto(1024, csl) << std::endl;
+  std::cout << "ShardIdent.skip_validate() = " << block::tlb::t_ShardIdent.validate_skip_upto(1024, csl) << std::endl;
   using namespace td::literals;
   std::cout << "Grams.store_intval(239) = " << block::tlb::t_Grams.store_integer_value(cb, "239"_i256) << std::endl;
   std::cout << "Grams.store_intval(17239) = " << block::tlb::t_Grams.store_integer_value(cb, "17239"_i256) << std::endl;
@@ -120,13 +120,13 @@ void test1() {
   std::cout << "Grams.store_intval(666) = " << block::tlb::t_Grams.store_integer_value(cb, "666"_i256) << std::endl;
   std::cout << cb << std::endl;
   cs2 = td::Ref<vm::CellSlice>{true, cb.finalize()};
-  std::cout << "Grams.validate(cs) = " << block::tlb::t_Grams.validate(*cs) << std::endl;
-  std::cout << "Grams.validate(cs2) = " << block::tlb::t_Grams.validate(*cs2) << std::endl;
+  std::cout << "Grams.validate(cs) = " << block::tlb::t_Grams.validate_upto(1024, *cs) << std::endl;
+  std::cout << "Grams.validate(cs2) = " << block::tlb::t_Grams.validate_upto(1024, *cs2) << std::endl;
   //
   block::gen::SplitMergeInfo::Record data;
   block::gen::Grams::Record data2;
-  std::cout << "block::gen::Grams.validate(cs) = " << block::gen::t_Grams.validate(*cs) << std::endl;
-  std::cout << "block::gen::Grams.validate(cs2) = " << block::gen::t_Grams.validate(*cs2) << std::endl;
+  std::cout << "block::gen::Grams.validate(cs) = " << block::gen::t_Grams.validate_upto(1024, *cs) << std::endl;
+  std::cout << "block::gen::Grams.validate(cs2) = " << block::gen::t_Grams.validate_upto(1024, *cs2) << std::endl;
   std::cout << "[cs = " << cs << "]" << std::endl;
   bool ok = tlb::csr_unpack_inexact(cs, data);
   std::cout << "block::gen::SplitMergeInfo.unpack(cs, data) = " << ok << std::endl;
@@ -182,29 +182,38 @@ void test1() {
 }
 
 void test2(vm::CellSlice& cs) {
-  std::cout << "Bool.validate() = " << block::tlb::t_Bool.validate(cs) << std::endl;
-  std::cout << "UInt16.validate() = " << block::tlb::t_uint16.validate(cs) << std::endl;
-  std::cout << "HashmapE(32,UInt16).validate() = " << block::tlb::HashmapE(32, block::tlb::t_uint16).validate(cs)
-            << std::endl;
+  std::cout << "Bool.validate() = " << block::tlb::t_Bool.validate_upto(1024, cs) << std::endl;
+  std::cout << "UInt16.validate() = " << block::tlb::t_uint16.validate_upto(1024, cs) << std::endl;
+  std::cout << "HashmapE(32,UInt16).validate() = "
+            << block::tlb::HashmapE(32, block::tlb::t_uint16).validate_upto(1024, cs) << std::endl;
   std::cout << "block::gen::HashmapE(32,UInt16).validate() = "
-            << block::gen::HashmapE{32, block::gen::t_uint16}.validate(cs) << std::endl;
+            << block::gen::HashmapE{32, block::gen::t_uint16}.validate_upto(1024, cs) << std::endl;
 }
 
 void usage() {
-  std::cout << "usage: test-block [-S][<boc-file>]\n\tor test-block -h\n\tDumps specified blockchain block or state "
-               "from <boc-file>, or runs some tests\n\t-S\tDump a blockchain state\n";
+  std::cout << "usage: dump-block [-t<typename>][-S][<boc-file>]\n\tor dump-block -h\n\tDumps specified blockchain "
+               "block or state "
+               "from <boc-file>, or runs some tests\n\t-S\tDump a blockchain state instead of a block\n";
   std::exit(2);
 }
 
 int main(int argc, char* const argv[]) {
   int i;
   int new_verbosity_level = VERBOSITY_NAME(INFO);
-  bool dump_state = false;
+  const char* tname = nullptr;
+  const tlb::TLB* type = &block::gen::t_Block;
   auto zerostate = std::make_unique<block::ZerostateInfo>();
-  while ((i = getopt(argc, argv, "Shv:")) != -1) {
+  while ((i = getopt(argc, argv, "CSt:hv:")) != -1) {
     switch (i) {
+      case 'C':
+        type = &block::gen::t_VmCont;
+        break;
       case 'S':
-        dump_state = true;
+        type = &block::gen::t_ShardStateUnsplit;
+        break;
+      case 't':
+        tname = optarg;
+        type = nullptr;
         break;
       case 'v':
         new_verbosity_level = VERBOSITY_NAME(FATAL) + (verbosity = td::to_integer<int>(td::Slice(optarg)));
@@ -230,12 +239,18 @@ int main(int argc, char* const argv[]) {
         vm::CellSlice cs{vm::NoVm(), boc};
         cs.print_rec(std::cout);
         std::cout << std::endl;
-        auto& type = dump_state ? (const tlb::TLB&)block::gen::t_ShardStateUnsplit : block::gen::t_Block;
-        std::string type_name = dump_state ? "ShardState" : "Block";
-        type.print_ref(std::cout, boc);
+        if (!type) {
+          tlb::TypenameLookup dict(block::gen::register_simple_types);
+          type = dict.lookup(tname);
+          if (!type) {
+            std::cerr << "unknown TL-B type " << tname << std::endl;
+            std::exit(3);
+          }
+        }
+        type->print_ref(std::cout, boc);
         std::cout << std::endl;
-        bool ok = type.validate_ref(boc);
-        std::cout << "(" << (ok ? "" : "in") << "valid " << type_name << ")" << std::endl;
+        bool ok = type->validate_ref(1048576, boc);
+        std::cout << "(" << (ok ? "" : "in") << "valid " << *type << ")" << std::endl;
       }
     }
     if (!done) {
diff --git a/submodules/ton/tonlib-src/crypto/block/mc-config.cpp b/submodules/ton/tonlib-src/crypto/block/mc-config.cpp
index b5959f7557..555b26033e 100644
--- a/submodules/ton/tonlib-src/crypto/block/mc-config.cpp
+++ b/submodules/ton/tonlib-src/crypto/block/mc-config.cpp
@@ -23,7 +23,7 @@
     exception statement from your version. If you delete this exception statement 
     from all source files in the program, then also delete it here.
 
-    Copyright 2017-2019 Telegram Systems LLP
+    Copyright 2017-2020 Telegram Systems LLP
 */
 #include "mc-config.h"
 #include "block/block.h"
@@ -567,6 +567,21 @@ td::Result<GasLimitsPrices> Config::do_get_gas_limits_prices(td::Ref<vm::Cell> c
   }
   return res;
 }
+
+td::Result<ton::StdSmcAddress> Config::get_dns_root_addr() const {
+  auto cell = get_config_param(4);
+  if (cell.is_null()) {
+    return td::Status::Error(PSLICE() << "configuration parameter " << 4 << " with dns root address is absent");
+  }
+  auto cs = vm::load_cell_slice(std::move(cell));
+  if (cs.size() != 0x100) {
+    return td::Status::Error(PSLICE() << "configuration parameter " << 4 << " with dns root address has wrong size");
+  }
+  ton::StdSmcAddress res;
+  CHECK(cs.fetch_bits_to(res));
+  return res;
+}
+
 td::Result<GasLimitsPrices> Config::get_gas_limits_prices(bool is_masterchain) const {
   auto id = is_masterchain ? 20 : 21;
   auto cell = get_config_param(id);
@@ -752,8 +767,8 @@ Ref<McShardDescr> McShardDescr::from_block(Ref<vm::Cell> block_root, Ref<vm::Cel
     return {};
   }
   // TODO: use a suitable vm::MerkleUpdate method here
-  vm::CellSlice cs(vm::NoVm(), rec.state_update);
-  if (cs.special_type() != vm::Cell::SpecialType::MerkleUpdate) {
+  vm::CellSlice cs(vm::NoVmSpec(), rec.state_update);
+  if (!cs.is_valid() || cs.special_type() != vm::Cell::SpecialType::MerkleUpdate) {
     LOG(ERROR) << "state update in a block is not a Merkle update";
     return {};
   }
@@ -870,7 +885,7 @@ bool ShardConfig::get_shard_hash_raw_from(vm::Dictionary& dict, vm::CellSlice& c
   unsigned long long z = id.shard, m = std::numeric_limits<unsigned long long>::max();
   int len = id.pfx_len();
   while (true) {
-    cs.load(vm::NoVmOrd{}, leaf ? root : std::move(root));
+    cs.load(vm::NoVmOrd(), leaf ? root : std::move(root));
     int t = (int)cs.fetch_ulong(1);
     if (t < 0) {
       return false;  // throw DictError ?
@@ -1108,7 +1123,7 @@ std::vector<ton::BlockId> ShardConfig::get_shard_hash_ids(
             std::stack<std::pair<Ref<vm::Cell>, unsigned long long>> stack;
             stack.emplace(cs_ref->prefetch_ref(), ton::shardIdAll);
             while (!stack.empty()) {
-              vm::CellSlice cs{vm::NoVm{}, std::move(stack.top().first)};
+              vm::CellSlice cs{vm::NoVmOrd(), std::move(stack.top().first)};
               unsigned long long shard = stack.top().second;
               stack.pop();
               int t = (int)cs.fetch_ulong(1);
@@ -1224,7 +1239,7 @@ bool ShardConfig::new_workchain(ton::WorkchainId workchain, ton::BlockSeqno reg_
          cb.store_zeroes_bool(
              1 + 5 +
              5)  // split_merge_at:FutureSplitMerge fees_collected:CurrencyCollection funds_created:CurrencyCollection
-         && cb.finalize_to(cell) && block::gen::t_BinTree_ShardDescr.validate_ref(cell) &&
+         && cb.finalize_to(cell) && block::gen::t_BinTree_ShardDescr.validate_ref(1024, cell) &&
          shard_hashes_dict_->set_ref(td::BitArray<32>{workchain}, std::move(cell), vm::Dictionary::SetMode::Add);
 }
 
@@ -1454,7 +1469,7 @@ static bool btree_set(Ref<vm::Cell>& root, ton::ShardId shard, Ref<vm::Cell> val
 }
 
 bool ShardConfig::set_shard_info(ton::ShardIdFull shard, Ref<vm::Cell> value) {
-  if (!gen::t_BinTree_ShardDescr.validate_ref(value)) {
+  if (!gen::t_BinTree_ShardDescr.validate_ref(1024, value)) {
     LOG(ERROR) << "attempting to store an invalid (BinTree ShardDescr) at shard configuration position "
                << shard.to_str();
     gen::t_BinTree_ShardDescr.print_ref(std::cerr, value);
@@ -1710,6 +1725,30 @@ std::vector<ton::ValidatorDescr> Config::compute_total_validator_set(int next) c
   return res.move_as_ok()->export_validator_set();
 }
 
+td::Result<std::pair<ton::UnixTime, ton::UnixTime>> Config::unpack_validator_set_start_stop(Ref<vm::Cell> vset_root) {
+  if (vset_root.is_null()) {
+    return td::Status::Error("validator set absent");
+  }
+  gen::ValidatorSet::Record_validators_ext rec;
+  if (tlb::unpack_cell(vset_root, rec)) {
+    return std::pair<ton::UnixTime, ton::UnixTime>(rec.utime_since, rec.utime_until);
+  }
+  gen::ValidatorSet::Record_validators rec0;
+  if (tlb::unpack_cell(std::move(vset_root), rec0)) {
+    return std::pair<ton::UnixTime, ton::UnixTime>(rec0.utime_since, rec0.utime_until);
+  }
+  return td::Status::Error("validator set is invalid");
+}
+
+std::pair<ton::UnixTime, ton::UnixTime> Config::get_validator_set_start_stop(int next) const {
+  auto res = unpack_validator_set_start_stop(get_config_param(next < 0 ? 32 : (next ? 36 : 34)));
+  if (res.is_error()) {
+    return {0, 0};
+  } else {
+    return res.move_as_ok();
+  }
+}
+
 bool WorkchainInfo::unpack(ton::WorkchainId wc, vm::CellSlice& cs) {
   workchain = ton::workchainInvalid;
   if (wc == ton::workchainInvalid) {
diff --git a/submodules/ton/tonlib-src/crypto/block/mc-config.h b/submodules/ton/tonlib-src/crypto/block/mc-config.h
index 241ae88c55..8541110ffe 100644
--- a/submodules/ton/tonlib-src/crypto/block/mc-config.h
+++ b/submodules/ton/tonlib-src/crypto/block/mc-config.h
@@ -14,7 +14,7 @@
     You should have received a copy of the GNU General Public License
     along with TON Blockchain.  If not, see <http://www.gnu.org/licenses/>.
 
-    Copyright 2017-2019 Telegram Systems LLP
+    Copyright 2017-2020 Telegram Systems LLP
 */
 #pragma once
 #include "common/refcnt.hpp"
@@ -50,7 +50,7 @@ struct ValidatorDescr {
       : pubkey(_pubkey), weight(_weight), cum_weight(_cum_weight) {
     adnl_addr.set_zero();
   }
-  bool operator<(td::uint64 wt_pos) const& {
+  bool operator<(td::uint64 wt_pos) const & {
     return cum_weight < wt_pos;
   }
 };
@@ -534,6 +534,7 @@ class Config {
   bool create_stats_enabled() const {
     return has_capability(ton::capCreateStatsEnabled);
   }
+  td::Result<ton::StdSmcAddress> get_dns_root_addr() const;
   bool set_block_id_ext(const ton::BlockIdExt& block_id_ext);
   td::Result<std::vector<ton::StdSmcAddress>> get_special_smartcontracts(bool without_config = false) const;
   bool is_special_smartcontract(const ton::StdSmcAddress& addr) const;
@@ -558,6 +559,7 @@ class Config {
   const ValidatorSet* get_cur_validator_set() const {
     return cur_validators_.get();
   }
+  std::pair<ton::UnixTime, ton::UnixTime> get_validator_set_start_stop(int next = 0) const;
   ton::ValidatorSessionConfig get_consensus_config() const;
   bool foreach_config_param(std::function<bool(int, Ref<vm::Cell>)> scan_func) const;
   Ref<WorkchainInfo> get_workchain_info(ton::WorkchainId workchain_id) const;
@@ -577,6 +579,7 @@ class Config {
   static td::Result<std::unique_ptr<Config>> unpack_config(Ref<vm::CellSlice> config_csr, int mode = 0);
   static td::Result<std::unique_ptr<Config>> extract_from_state(Ref<vm::Cell> mc_state_root, int mode = 0);
   static td::Result<std::unique_ptr<Config>> extract_from_key_block(Ref<vm::Cell> key_block_root, int mode = 0);
+  static td::Result<std::pair<ton::UnixTime, ton::UnixTime>> unpack_validator_set_start_stop(Ref<vm::Cell> root);
 
  protected:
   Config(int _mode) : mode(_mode) {
diff --git a/submodules/ton/tonlib-src/crypto/block/transaction.cpp b/submodules/ton/tonlib-src/crypto/block/transaction.cpp
index 6667cf8774..34abfff13d 100644
--- a/submodules/ton/tonlib-src/crypto/block/transaction.cpp
+++ b/submodules/ton/tonlib-src/crypto/block/transaction.cpp
@@ -14,7 +14,7 @@
     You should have received a copy of the GNU Lesser General Public License
     along with TON Blockchain Library.  If not, see <http://www.gnu.org/licenses/>.
 
-    Copyright 2017-2019 Telegram Systems LLP
+    Copyright 2017-2020 Telegram Systems LLP
 */
 #include "block/transaction.h"
 #include "block/block.h"
@@ -23,7 +23,7 @@
 #include "td/utils/bits.h"
 #include "td/utils/uint128.h"
 #include "ton/ton-shard.h"
-#include "vm/continuation.h"
+#include "vm/vm.h"
 
 namespace block {
 using td::Ref;
@@ -150,7 +150,7 @@ bool Account::unpack_storage_info(vm::CellSlice& cs) {
       return false;
     }
   } else {
-    due_payment = td::RefInt256{true, 0};
+    due_payment = td::zero_refint();
   }
   unsigned long long u = 0;
   u |= storage_stat.cells = block::tlb::t_VarUInteger_7.as_uint(*used.cells);
@@ -369,7 +369,7 @@ bool Account::init_new(ton::UnixTime now) {
   now_ = now;
   last_paid = 0;
   storage_stat.clear();
-  due_payment = td::RefInt256{true, 0};
+  due_payment = td::zero_refint();
   balance.set_zero();
   if (my_addr_exact.is_null()) {
     vm::CellBuilder cb;
@@ -463,6 +463,7 @@ Transaction::Transaction(const Account& _account, int ttype, ton::LogicalTime re
     , my_addr(_account.my_addr)
     , my_addr_exact(_account.my_addr_exact)
     , balance(_account.balance)
+    , original_balance(_account.balance)
     , due_payment(_account.due_payment)
     , last_paid(_account.last_paid)
     , new_code(_account.code)
@@ -472,6 +473,9 @@ Transaction::Transaction(const Account& _account, int ttype, ton::LogicalTime re
   start_lt = std::max(req_start_lt, account.last_trans_end_lt_);
   end_lt = start_lt + 1;
   acc_status = (account.status == Account::acc_nonexist ? Account::acc_uninit : account.status);
+  if (acc_status == Account::acc_frozen) {
+    frozen_hash = account.state_hash;
+  }
 }
 
 bool Transaction::unpack_input_msg(bool ihr_delivered, const ActionPhaseConfig* cfg) {
@@ -503,7 +507,7 @@ bool Transaction::unpack_input_msg(bool ihr_delivered, const ActionPhaseConfig*
       if (ihr_delivered) {
         in_fwd_fee = std::move(ihr_fee);
       } else {
-        in_fwd_fee = td::RefInt256{true, 0};
+        in_fwd_fee = td::zero_refint();
         msg_balance_remaining += std::move(ihr_fee);
       }
       if (info.created_lt >= start_lt) {
@@ -543,7 +547,7 @@ bool Transaction::unpack_input_msg(bool ihr_delivered, const ActionPhaseConfig*
         LOG(DEBUG) << "computed fwd fees set to zero for special account";
         fees_c.first = fees_c.second = 0;
       }
-      in_fwd_fee = td::RefInt256{true, fees_c.first};
+      in_fwd_fee = td::make_refint(fees_c.first);
       if (balance.grams < in_fwd_fee) {
         LOG(DEBUG) << "cannot pay for importing this external message";
         return false;
@@ -615,19 +619,19 @@ bool Transaction::prepare_storage_phase(const StoragePhaseConfig& cfg, bool forc
   res->is_special = account.is_special;
   last_paid = res->last_paid_updated = (res->is_special ? 0 : now);
   if (to_pay.is_null() || sgn(to_pay) == 0) {
-    res->fees_collected = res->fees_due = td::RefInt256{true, 0};
+    res->fees_collected = res->fees_due = td::zero_refint();
   } else if (to_pay <= balance.grams) {
     res->fees_collected = to_pay;
-    res->fees_due = td::RefInt256{true, 0};
+    res->fees_due = td::zero_refint();
     balance -= std::move(to_pay);
   } else if (acc_status == Account::acc_frozen && !force_collect && to_pay + due_payment < cfg.delete_due_limit) {
     // do not collect fee
     res->last_paid_updated = (res->is_special ? 0 : account.last_paid);
-    res->fees_collected = res->fees_due = td::RefInt256{true, 0};
+    res->fees_collected = res->fees_due = td::zero_refint();
   } else {
     res->fees_collected = balance.grams;
     res->fees_due = std::move(to_pay) - std::move(balance.grams);
-    balance.grams = td::RefInt256{true, 0};
+    balance.grams = td::zero_refint();
     if (!res->is_special) {
       auto total_due = res->fees_due + due_payment;
       switch (acc_status) {
@@ -691,19 +695,23 @@ bool ComputePhaseConfig::parse_GasLimitsPrices(Ref<vm::CellSlice> cs, td::RefInt
   }
   block::gen::GasLimitsPrices::Record_gas_flat_pfx flat;
   if (tlb::csr_unpack(cs, flat)) {
-    bool ok = parse_GasLimitsPrices(std::move(flat.other), freeze_due_limit, delete_due_limit);
-    flat_gas_limit = flat.flat_gas_limit;
-    flat_gas_price = flat.flat_gas_price;
-    return ok;
+    return parse_GasLimitsPrices_internal(std::move(flat.other), freeze_due_limit, delete_due_limit,
+                                          flat.flat_gas_limit, flat.flat_gas_price);
+  } else {
+    return parse_GasLimitsPrices_internal(std::move(cs), freeze_due_limit, delete_due_limit);
   }
-  flat_gas_limit = flat_gas_price = 0;
+}
+
+bool ComputePhaseConfig::parse_GasLimitsPrices_internal(Ref<vm::CellSlice> cs, td::RefInt256& freeze_due_limit,
+                                                        td::RefInt256& delete_due_limit, td::uint64 _flat_gas_limit,
+                                                        td::uint64 _flat_gas_price) {
   auto f = [&](const auto& r, td::uint64 spec_limit) {
     gas_limit = r.gas_limit;
     special_gas_limit = spec_limit;
     gas_credit = r.gas_credit;
     gas_price = r.gas_price;
-    freeze_due_limit = td::RefInt256{true, r.freeze_due_limit};
-    delete_due_limit = td::RefInt256{true, r.delete_due_limit};
+    freeze_due_limit = td::make_refint(r.freeze_due_limit);
+    delete_due_limit = td::make_refint(r.delete_due_limit);
   };
   block::gen::GasLimitsPrices::Record_gas_prices_ext rec;
   if (tlb::csr_unpack(cs, rec)) {
@@ -716,15 +724,17 @@ bool ComputePhaseConfig::parse_GasLimitsPrices(Ref<vm::CellSlice> cs, td::RefInt
       return false;
     }
   }
+  flat_gas_limit = _flat_gas_limit;
+  flat_gas_price = _flat_gas_price;
   compute_threshold();
   return true;
 }
 
 void ComputePhaseConfig::compute_threshold() {
-  gas_price256 = td::RefInt256{true, gas_price};
+  gas_price256 = td::make_refint(gas_price);
   if (gas_limit > flat_gas_limit) {
     max_gas_threshold =
-        td::rshift(gas_price256 * (gas_limit - flat_gas_limit), 16, 1) + td::make_refint(flat_gas_price);
+        td::rshift(gas_price256 * (gas_limit - flat_gas_limit), 16, 1) + td::make_bigint(flat_gas_price);
   } else {
     max_gas_threshold = td::make_refint(flat_gas_price);
   }
@@ -821,8 +831,8 @@ Ref<vm::Tuple> Transaction::prepare_vm_c7(const ComputePhaseConfig& cfg) const {
   }
   auto tuple = vm::make_tuple_ref(
       td::make_refint(0x076ef1ea),                // [ magic:0x076ef1ea
-      td::make_refint(0),                         //   actions:Integer
-      td::make_refint(0),                         //   msgs_sent:Integer
+      td::zero_refint(),                          //   actions:Integer
+      td::zero_refint(),                          //   msgs_sent:Integer
       td::make_refint(now),                       //   unixtime:Integer
       td::make_refint(account.block_lt),          //   block_lt:Integer
       td::make_refint(start_lt),                  //   trans_lt:Integer
@@ -906,6 +916,7 @@ bool Transaction::prepare_compute_phase(const ComputePhaseConfig& cfg) {
   // ...
   compute_phase = std::make_unique<ComputePhase>();
   ComputePhase& cp = *(compute_phase.get());
+  original_balance -= total_fees;
   if (td::sgn(balance.grams) <= 0) {
     // no gas
     cp.skip_reason = ComputePhase::sk_no_gas;
@@ -1004,16 +1015,15 @@ bool Transaction::prepare_compute_phase(const ComputePhaseConfig& cfg) {
   }
   if (cp.accepted) {
     if (account.is_special) {
-      cp.gas_fees = td::RefInt256{true, 0};
+      cp.gas_fees = td::zero_refint();
     } else {
       cp.gas_fees = cfg.compute_gas_price(cp.gas_used);
       total_fees += cp.gas_fees;
       balance -= cp.gas_fees;
     }
-    if (verbosity > 2) {
-      std::cerr << "gas fees: " << cp.gas_fees << " = " << cfg.gas_price256 << " * " << cp.gas_used
-                << " /2^16 ; price=" << cfg.gas_price << "; remaining balance=" << balance << std::endl;
-    }
+    LOG(DEBUG) << "gas fees: " << cp.gas_fees->to_dec_string() << " = " << cfg.gas_price256->to_dec_string() << " * "
+               << cp.gas_used << " /2^16 ; price=" << cfg.gas_price << "; flat rate=[" << cfg.flat_gas_price << " for "
+               << cfg.flat_gas_limit << "]; remaining balance=" << balance.to_str();
     CHECK(td::sgn(balance.grams) >= 0);
   }
   return true;
@@ -1033,8 +1043,8 @@ bool Transaction::prepare_action_phase(const ActionPhaseConfig& cfg) {
   ap.action_list_hash = list->get_hash().bits();
   ap.remaining_balance = balance;
   ap.end_lt = end_lt;
-  ap.total_fwd_fees = td::RefInt256{true, 0};
-  ap.total_action_fees = td::RefInt256{true, 0};
+  ap.total_fwd_fees = td::zero_refint();
+  ap.total_action_fees = td::zero_refint();
   ap.reserved_balance.set_zero();
 
   int n = 0;
@@ -1098,6 +1108,9 @@ bool Transaction::prepare_action_phase(const ActionPhaseConfig& cfg) {
       case block::gen::OutAction::action_reserve_currency:
         err_code = try_action_reserve_currency(cs, ap, cfg);
         break;
+      case block::gen::OutAction::action_change_library:
+        err_code = try_action_change_library(cs, ap, cfg);
+        break;
     }
     if (err_code) {
       ap.result_code = (err_code == -1 ? 34 : err_code);
@@ -1148,6 +1161,56 @@ int Transaction::try_action_set_code(vm::CellSlice& cs, ActionPhase& ap, const A
   return 0;
 }
 
+int Transaction::try_action_change_library(vm::CellSlice& cs, ActionPhase& ap, const ActionPhaseConfig& cfg) {
+  block::gen::OutAction::Record_action_change_library rec;
+  if (!tlb::unpack_exact(cs, rec)) {
+    return -1;
+  }
+  // mode: +0 = remove library, +1 = add private library, +2 = add public library
+  Ref<vm::Cell> lib_ref = rec.libref->prefetch_ref();
+  ton::Bits256 hash;
+  if (lib_ref.not_null()) {
+    hash = lib_ref->get_hash().bits();
+  } else {
+    CHECK(rec.libref.write().fetch_ulong(1) == 0 && rec.libref.write().fetch_bits_to(hash));
+  }
+  try {
+    vm::Dictionary dict{new_library, 256};
+    if (!rec.mode) {
+      // remove library
+      dict.lookup_delete(hash);
+      LOG(DEBUG) << "removed " << ((rec.mode >> 1) ? "public" : "private") << " library with hash " << hash.to_hex();
+    } else {
+      auto val = dict.lookup(hash);
+      if (val.not_null()) {
+        bool is_public = val->prefetch_ulong(1);
+        auto ref = val->prefetch_ref();
+        if (hash == ref->get_hash().bits()) {
+          lib_ref = ref;
+          if (is_public == (rec.mode >> 1)) {
+            // library already in required state
+            ap.spec_actions++;
+            return 0;
+          }
+        }
+      }
+      if (lib_ref.is_null()) {
+        // library code not found
+        return 41;
+      }
+      vm::CellBuilder cb;
+      CHECK(cb.store_bool_bool(rec.mode >> 1) && cb.store_ref_bool(std::move(lib_ref)));
+      CHECK(dict.set_builder(hash, cb));
+      LOG(DEBUG) << "added " << ((rec.mode >> 1) ? "public" : "private") << " library with hash " << hash.to_hex();
+    }
+    new_library = std::move(dict).extract_root_cell();
+  } catch (vm::VmError& vme) {
+    return 42;
+  }
+  ap.spec_actions++;
+  return 0;
+}
+
 // msg_fwd_fees = (lump_price + ceil((bit_price * msg.bits + cell_price * msg.cells)/2^16)) nanograms
 // ihr_fwd_fees = ceil((msg_fwd_fees * ihr_price_factor)/2^16) nanograms
 // bits in the root cell of a message are not included in msg.bits (lump_price pays for them)
@@ -1369,7 +1432,7 @@ int Transaction::try_action_send_msg(const vm::CellSlice& cs0, ActionPhase& ap,
     info.ihr_disabled = true;
     info.bounce = false;
     info.bounced = false;
-    fwd_fee = ihr_fee = td::RefInt256{true, 0};
+    fwd_fee = ihr_fee = td::zero_refint();
   } else {
     // int_msg_info$0 constructor
     if (!tlb::csr_unpack(msg.info, info) || !block::tlb::t_CurrencyCollection.validate_csr(info.value)) {
@@ -1422,10 +1485,10 @@ int Transaction::try_action_send_msg(const vm::CellSlice& cs0, ActionPhase& ap,
 
   // set fees to computed values
   if (fwd_fee->unsigned_fits_bits(63) && fwd_fee->to_long() < (long long)fees_c.first) {
-    fwd_fee = td::RefInt256{true, fees_c.first};
+    fwd_fee = td::make_refint(fees_c.first);
   }
   if (fees_c.second && ihr_fee->unsigned_fits_bits(63) && ihr_fee->to_long() < (long long)fees_c.second) {
-    ihr_fee = td::RefInt256{true, fees_c.second};
+    ihr_fee = td::make_refint(fees_c.second);
   }
 
   Ref<vm::Cell> new_msg;
@@ -1442,7 +1505,7 @@ int Transaction::try_action_send_msg(const vm::CellSlice& cs0, ActionPhase& ap,
     }
     if (info.ihr_disabled) {
       // if IHR is disabled, IHR fees will be always zero
-      ihr_fee = td::RefInt256{true, 0};
+      ihr_fee = td::zero_refint();
     }
     // extract value to be carried by the message
     block::CurrencyCollection req;
@@ -1592,7 +1655,7 @@ int Transaction::try_action_send_msg(const vm::CellSlice& cs0, ActionPhase& ap,
 
 int Transaction::try_action_reserve_currency(vm::CellSlice& cs, ActionPhase& ap, const ActionPhaseConfig& cfg) {
   block::gen::OutAction::Record_action_reserve_currency rec;
-  if (!tlb::unpack_exact(cs, rec) || (rec.mode & ~3)) {
+  if (!tlb::unpack_exact(cs, rec) || (rec.mode & ~15)) {
     return -1;
   }
   int mode = rec.mode;
@@ -1603,7 +1666,21 @@ int Transaction::try_action_reserve_currency(vm::CellSlice& cs, ActionPhase& ap,
     return -1;
   }
   LOG(DEBUG) << "action_reserve_currency: mode=" << mode << ", reserve=" << reserve.to_str()
-             << ", balance=" << ap.remaining_balance.to_str();
+             << ", balance=" << ap.remaining_balance.to_str() << ", original balance=" << original_balance.to_str();
+  if (mode & 4) {
+    if (mode & 8) {
+      reserve = original_balance - reserve;
+    } else {
+      reserve += original_balance;
+    }
+  } else if (mode & 8) {
+    LOG(DEBUG) << "invalid reserve mode " << mode;
+    return -1;
+  }
+  if (!reserve.is_valid() || td::sgn(reserve.grams) < 0) {
+    LOG(DEBUG) << "cannot reserve a negative amount: " << reserve.to_str();
+    return -1;
+  }
   if (reserve.grams > ap.remaining_balance.grams) {
     if (mode & 2) {
       reserve.grams = ap.remaining_balance.grams;
@@ -1683,10 +1760,10 @@ bool Transaction::prepare_bounce_phase(const ActionPhaseConfig& cfg) {
   balance -= msg_balance;
   CHECK(balance.is_valid());
   // debit total forwarding fees from the message's balance, then split forwarding fees into our part and remaining part
-  msg_balance -= td::RefInt256{true, bp.fwd_fees};
+  msg_balance -= td::make_refint(bp.fwd_fees);
   bp.fwd_fees_collected = msg_prices.get_first_part(bp.fwd_fees);
   bp.fwd_fees -= bp.fwd_fees_collected;
-  total_fees += td::RefInt256{true, bp.fwd_fees_collected};
+  total_fees += td::make_refint(bp.fwd_fees_collected);
   // serialize outbound message
   info.created_lt = end_lt++;
   info.created_at = now;
@@ -1771,7 +1848,7 @@ bool Transaction::compute_state() {
       // code:(Maybe ^Cell) data:(Maybe ^Cell) library:(HashmapE 256 SimpleLib)
       auto frozen_state = cb2.finalize();
       frozen_hash = frozen_state->get_hash().bits();
-      if (verbosity >= 3 * 0) {  // !!!DEBUG!!!
+      if (verbosity >= 3 * 1) {  // !!!DEBUG!!!
         std::cerr << "freezing state of smart contract: ";
         block::gen::t_StateInit.print_ref(std::cerr, frozen_state);
         CHECK(block::gen::t_StateInit.validate_ref(frozen_state));
diff --git a/submodules/ton/tonlib-src/crypto/block/transaction.h b/submodules/ton/tonlib-src/crypto/block/transaction.h
index 25f8059560..5ab34710d0 100644
--- a/submodules/ton/tonlib-src/crypto/block/transaction.h
+++ b/submodules/ton/tonlib-src/crypto/block/transaction.h
@@ -14,7 +14,7 @@
     You should have received a copy of the GNU Lesser General Public License
     along with TON Blockchain Library.  If not, see <http://www.gnu.org/licenses/>.
 
-    Copyright 2017-2019 Telegram Systems LLP
+    Copyright 2017-2020 Telegram Systems LLP
 */
 #pragma once
 #include "common/refcnt.hpp"
@@ -65,10 +65,10 @@ struct NewOutMsg {
   NewOutMsg(ton::LogicalTime _lt, Ref<vm::Cell> _msg, Ref<vm::Cell> _trans)
       : lt(_lt), msg(std::move(_msg)), trans(std::move(_trans)) {
   }
-  bool operator<(const NewOutMsg& other) const& {
+  bool operator<(const NewOutMsg& other) const & {
     return lt < other.lt || (lt == other.lt && msg->get_hash() < other.msg->get_hash());
   }
-  bool operator>(const NewOutMsg& other) const& {
+  bool operator>(const NewOutMsg& other) const & {
     return lt > other.lt || (lt == other.lt && other.msg->get_hash() < msg->get_hash());
   }
 };
@@ -130,6 +130,11 @@ struct ComputePhaseConfig {
   }
   bool parse_GasLimitsPrices(Ref<vm::CellSlice> cs, td::RefInt256& freeze_due_limit, td::RefInt256& delete_due_limit);
   bool parse_GasLimitsPrices(Ref<vm::Cell> cell, td::RefInt256& freeze_due_limit, td::RefInt256& delete_due_limit);
+
+ private:
+  bool parse_GasLimitsPrices_internal(Ref<vm::CellSlice> cs, td::RefInt256& freeze_due_limit,
+                                      td::RefInt256& delete_due_limit, td::uint64 flat_gas_limit = 0,
+                                      td::uint64 flat_gas_price = 0);
 };
 
 struct ActionPhaseConfig {
@@ -189,10 +194,6 @@ struct ActionPhase {
   Ref<vm::Cell> new_code;
   td::BitArray<256> action_list_hash;
   block::CurrencyCollection remaining_balance, reserved_balance;
-  // td::RefInt256 remaining_balance;
-  // Ref<vm::Cell> remaining_extra;
-  // td::RefInt256 reserved_balance;
-  // Ref<vm::Cell> reserved_extra;
   std::vector<Ref<vm::Cell>> action_list;  // processed in reverse order
   std::vector<Ref<vm::Cell>> out_msgs;
   ton::LogicalTime end_lt;
@@ -314,7 +315,7 @@ struct Transaction {
   const Account& account;                     // only `commit` method modifies the account
   Ref<vm::CellSlice> my_addr, my_addr_exact;  // almost the same as in account.*
   ton::LogicalTime start_lt, end_lt;
-  block::CurrencyCollection balance;
+  block::CurrencyCollection balance, original_balance;
   block::CurrencyCollection msg_balance_remaining;
   td::RefInt256 due_payment;
   td::RefInt256 in_fwd_fee, msg_fwd_fees;
@@ -371,6 +372,7 @@ struct Transaction {
   Ref<vm::Tuple> prepare_vm_c7(const ComputePhaseConfig& cfg) const;
   bool prepare_rand_seed(td::BitArray<256>& rand_seed, const ComputePhaseConfig& cfg) const;
   int try_action_set_code(vm::CellSlice& cs, ActionPhase& ap, const ActionPhaseConfig& cfg);
+  int try_action_change_library(vm::CellSlice& cs, ActionPhase& ap, const ActionPhaseConfig& cfg);
   int try_action_send_msg(const vm::CellSlice& cs, ActionPhase& ap, const ActionPhaseConfig& cfg, int redoing = 0);
   int try_action_reserve_currency(vm::CellSlice& cs, ActionPhase& ap, const ActionPhaseConfig& cfg);
   bool check_replace_src_addr(Ref<vm::CellSlice>& src_addr) const;
diff --git a/submodules/ton/tonlib-src/crypto/common/bigint.hpp b/submodules/ton/tonlib-src/crypto/common/bigint.hpp
index 6734f07e32..7f6cf971e3 100644
--- a/submodules/ton/tonlib-src/crypto/common/bigint.hpp
+++ b/submodules/ton/tonlib-src/crypto/common/bigint.hpp
@@ -14,7 +14,7 @@
     You should have received a copy of the GNU Lesser General Public License
     along with TON Blockchain Library.  If not, see <http://www.gnu.org/licenses/>.
 
-    Copyright 2017-2019 Telegram Systems LLP
+    Copyright 2017-2020 Telegram Systems LLP
 */
 #pragma once
 #include <vector>
@@ -169,6 +169,8 @@ class PropagateConstSpan {
   size_t size_{0};
 };
 
+struct Normalize {};
+
 template <class Tr = BigIntInfo>
 class AnyIntView {
  public:
@@ -308,6 +310,10 @@ class BigIntG {
   explicit BigIntG(word_t x) : n(1) {
     digits[0] = x;
   }
+  BigIntG(Normalize, word_t x) : n(1) {
+    digits[0] = x;
+    normalize_bool();
+  }
   BigIntG(const BigIntG& x) : n(x.n) {
     std::memcpy(digits, x.digits, n * sizeof(word_t));
     ///std::cout << "(BiCC " << (const void*)&x << "->" << (void*)this << ")";
@@ -2515,6 +2521,11 @@ extern template class AnyIntView<BigIntInfo>;
 extern template class BigIntG<257, BigIntInfo>;
 typedef BigIntG<257, BigIntInfo> BigInt256;
 
+template <int n = 257>
+BigIntG<n, BigIntInfo> make_bigint(long long x) {
+  return BigIntG<n, BigIntInfo>{Normalize(), x};
+}
+
 namespace literals {
 
 extern BigInt256 operator""_i256(const char* str, std::size_t str_len);
diff --git a/submodules/ton/tonlib-src/crypto/common/refint.cpp b/submodules/ton/tonlib-src/crypto/common/refint.cpp
index 662322c62b..3a031a5a38 100644
--- a/submodules/ton/tonlib-src/crypto/common/refint.cpp
+++ b/submodules/ton/tonlib-src/crypto/common/refint.cpp
@@ -14,7 +14,7 @@
     You should have received a copy of the GNU Lesser General Public License
     along with TON Blockchain Library.  If not, see <http://www.gnu.org/licenses/>.
 
-    Copyright 2017-2019 Telegram Systems LLP
+    Copyright 2017-2020 Telegram Systems LLP
 */
 #include "common/refint.h"
 #include <utility>
@@ -38,6 +38,11 @@ RefInt256 operator+(RefInt256 x, long long y) {
   return x;
 }
 
+RefInt256 operator+(RefInt256 x, const BigInt256& y) {
+  (x.write() += y).normalize();
+  return x;
+}
+
 RefInt256 operator-(RefInt256 x, RefInt256 y) {
   (x.write() -= *y).normalize();
   return x;
@@ -48,6 +53,11 @@ RefInt256 operator-(RefInt256 x, long long y) {
   return x;
 }
 
+RefInt256 operator-(RefInt256 x, const BigInt256& y) {
+  (x.write() -= y).normalize();
+  return x;
+}
+
 RefInt256 operator-(RefInt256 x) {
   x.write().negate().normalize();
   return x;
@@ -69,6 +79,12 @@ RefInt256 operator*(RefInt256 x, long long y) {
   return x;
 }
 
+RefInt256 operator*(RefInt256 x, const BigInt256& y) {
+  RefInt256 z{true, 0};
+  z.write().add_mul(*x, y).normalize();
+  return z;
+}
+
 RefInt256 operator/(RefInt256 x, RefInt256 y) {
   RefInt256 quot{true};
   x.write().mod_div(*y, quot.write());
@@ -142,6 +158,11 @@ RefInt256& operator+=(RefInt256& x, long long y) {
   return x;
 }
 
+RefInt256& operator+=(RefInt256& x, const BigInt256& y) {
+  (x.write() += y).normalize();
+  return x;
+}
+
 RefInt256& operator-=(RefInt256& x, RefInt256 y) {
   (x.write() -= *y).normalize();
   return x;
@@ -152,6 +173,11 @@ RefInt256& operator-=(RefInt256& x, long long y) {
   return x;
 }
 
+RefInt256& operator-=(RefInt256& x, const BigInt256& y) {
+  (x.write() -= y).normalize();
+  return x;
+}
+
 RefInt256& operator*=(RefInt256& x, RefInt256 y) {
   RefInt256 z{true, 0};
   z.write().add_mul(*x, *y).normalize();
@@ -163,6 +189,12 @@ RefInt256& operator*=(RefInt256& x, long long y) {
   return x;
 }
 
+RefInt256& operator*=(RefInt256& x, const BigInt256& y) {
+  RefInt256 z{true, 0};
+  z.write().add_mul(*x, y).normalize();
+  return x = z;
+}
+
 RefInt256& operator/=(RefInt256& x, RefInt256 y) {
   RefInt256 quot{true};
   x.write().mod_div(*y, quot.write());
@@ -213,10 +245,20 @@ int sgn(RefInt256 x) {
   return x->sgn();
 }
 
-extern RefInt256 make_refint(long long x) {
-  auto xx = td::RefInt256{true, x};
-  xx.unique_write().normalize();
-  return xx;
+RefInt256 make_refint(long long x) {
+  return td::RefInt256{true, td::Normalize(), x};
+}
+
+RefInt256 zero_refint() {
+  //  static RefInt256 Zero = td::RefInt256{true, 0};
+  //  return Zero;
+  return td::RefInt256{true, 0};
+}
+
+RefInt256 bits_to_refint(td::ConstBitPtr bits, int n, bool sgnd) {
+  td::RefInt256 x{true};
+  x.unique_write().import_bits(bits, n, sgnd);
+  return x;
 }
 
 std::string dec_string(RefInt256 x) {
diff --git a/submodules/ton/tonlib-src/crypto/common/refint.h b/submodules/ton/tonlib-src/crypto/common/refint.h
index a828caf162..ea1ae81b7f 100644
--- a/submodules/ton/tonlib-src/crypto/common/refint.h
+++ b/submodules/ton/tonlib-src/crypto/common/refint.h
@@ -14,7 +14,7 @@
     You should have received a copy of the GNU Lesser General Public License
     along with TON Blockchain Library.  If not, see <http://www.gnu.org/licenses/>.
 
-    Copyright 2017-2019 Telegram Systems LLP
+    Copyright 2017-2020 Telegram Systems LLP
 */
 #pragma once
 
@@ -33,10 +33,13 @@ typedef Ref<CntInt256> RefInt256;
 
 extern RefInt256 operator+(RefInt256 x, RefInt256 y);
 extern RefInt256 operator+(RefInt256 x, long long y);
+extern RefInt256 operator+(RefInt256 x, const BigInt256& y);
 extern RefInt256 operator-(RefInt256 x, RefInt256 y);
 extern RefInt256 operator-(RefInt256 x, long long y);
+extern RefInt256 operator-(RefInt256 x, const BigInt256& y);
 extern RefInt256 operator*(RefInt256 x, RefInt256 y);
 extern RefInt256 operator*(RefInt256 x, long long y);
+extern RefInt256 operator*(RefInt256 x, const BigInt256& y);
 extern RefInt256 operator/(RefInt256 x, RefInt256 y);
 extern RefInt256 operator%(RefInt256 x, RefInt256 y);
 extern RefInt256 div(RefInt256 x, RefInt256 y, int round_mode = -1);
@@ -53,10 +56,13 @@ extern RefInt256 rshift(RefInt256 x, int y, int round_mode = -1);
 
 extern RefInt256& operator+=(RefInt256& x, RefInt256 y);
 extern RefInt256& operator+=(RefInt256& x, long long y);
+extern RefInt256& operator+=(RefInt256& x, const BigInt256& y);
 extern RefInt256& operator-=(RefInt256& x, RefInt256 y);
 extern RefInt256& operator-=(RefInt256& x, long long y);
+extern RefInt256& operator-=(RefInt256& x, const BigInt256& y);
 extern RefInt256& operator*=(RefInt256& x, RefInt256 y);
 extern RefInt256& operator*=(RefInt256& x, long long y);
+extern RefInt256& operator*=(RefInt256& x, const BigInt256& y);
 extern RefInt256& operator/=(RefInt256& x, RefInt256 y);
 extern RefInt256& operator%=(RefInt256& x, RefInt256 y);
 
@@ -100,8 +106,16 @@ extern int cmp(RefInt256 x, RefInt256 y);
 extern int cmp(RefInt256 x, long long y);
 extern int sgn(RefInt256 x);
 
+template <typename... Args>
+RefInt256 make_refint(Args&&... args) {
+  return td::RefInt256{true, std::forward<Args>(args)...};
+}
+
 extern RefInt256 make_refint(long long x);
 
+extern RefInt256 zero_refint();
+extern RefInt256 bits_to_refint(td::ConstBitPtr bits, int n, bool sgnd = false);
+
 extern std::string dec_string(RefInt256 x);
 extern std::string dec_string2(RefInt256&& x);
 extern std::string hex_string(RefInt256 x, bool upcase = false);
diff --git a/submodules/ton/tonlib-src/crypto/common/util.cpp b/submodules/ton/tonlib-src/crypto/common/util.cpp
index 721181524d..d1b24a76bc 100644
--- a/submodules/ton/tonlib-src/crypto/common/util.cpp
+++ b/submodules/ton/tonlib-src/crypto/common/util.cpp
@@ -14,12 +14,15 @@
     You should have received a copy of the GNU Lesser General Public License
     along with TON Blockchain Library.  If not, see <http://www.gnu.org/licenses/>.
 
-    Copyright 2017-2019 Telegram Systems LLP
+    Copyright 2017-2020 Telegram Systems LLP
 */
 #include "util.h"
 
 #include <limits>
 
+#include "td/utils/crypto.h"
+#include "td/utils/base64.h"
+
 namespace td {
 
 std::size_t compute_base64_encoded_size(size_t bindata_size) {
@@ -73,10 +76,6 @@ std::size_t buff_base64_encode(td::MutableSlice buffer, td::Slice raw, bool base
   return res_size;
 }
 
-std::string str_base64_encode(std::string raw, bool base64_url) {
-  return str_base64_encode(td::Slice{raw}, base64_url);
-}
-
 std::string str_base64_encode(td::Slice raw, bool base64_url) {
   std::size_t res_size = compute_base64_encoded_size(raw.size());
   std::string s;
@@ -87,10 +86,6 @@ std::string str_base64_encode(td::Slice raw, bool base64_url) {
   return s;
 }
 
-bool is_valid_base64(std::string encoded, bool allow_base64_url) {
-  return is_valid_base64(td::Slice{encoded}, allow_base64_url);
-}
-
 bool is_valid_base64(td::Slice encoded, bool allow_base64_url) {
   const unsigned char *ptr = (const unsigned char *)encoded.data(), *end = ptr + encoded.size();
   if (encoded.size() & 3) {
@@ -110,10 +105,6 @@ bool is_valid_base64(td::Slice encoded, bool allow_base64_url) {
   return ptr == end;
 }
 
-td::int32 decoded_base64_size(std::string encoded, bool allow_base64_url) {
-  return decoded_base64_size(td::Slice{encoded}, allow_base64_url);
-}
-
 td::int32 decoded_base64_size(td::Slice encoded, bool allow_base64_url) {
   const unsigned char *ptr = (const unsigned char *)encoded.data(), *end = ptr + encoded.size();
   if (encoded.size() & 3) {
@@ -172,10 +163,6 @@ std::size_t buff_base64_decode(td::MutableSlice buffer, td::Slice encoded, bool
   return wptr - (unsigned char *)buffer.data();
 }
 
-td::BufferSlice base64_decode(std::string encoded, bool allow_base64_url) {
-  return base64_decode(td::Slice{encoded}, allow_base64_url);
-}
-
 td::BufferSlice base64_decode(td::Slice encoded, bool allow_base64_url) {
   auto s = decoded_base64_size(encoded, allow_base64_url);
   if (s <= 0) {
@@ -190,10 +177,6 @@ td::BufferSlice base64_decode(td::Slice encoded, bool allow_base64_url) {
   return res;
 }
 
-std::string str_base64_decode(std::string encoded, bool allow_base64_url) {
-  return str_base64_decode(td::Slice{encoded}, allow_base64_url);
-}
-
 std::string str_base64_decode(td::Slice encoded, bool allow_base64_url) {
   auto s = decoded_base64_size(encoded, allow_base64_url);
   if (s <= 0) {
@@ -209,4 +192,45 @@ std::string str_base64_decode(td::Slice encoded, bool allow_base64_url) {
   return res;
 }
 
+td::Result<std::string> adnl_id_encode(td::Slice id, bool upper_case) {
+  if (id.size() != 32) {
+    return td::Status::Error("Wrong andl id size");
+  }
+  td::uint8 buf[35];
+  td::MutableSlice buf_slice(buf, 35);
+  buf_slice[0] = 0x2d;
+  buf_slice.substr(1).copy_from(id);
+  auto hash = td::crc16(buf_slice.substr(0, 33));
+  buf[33] = static_cast<td::uint8>((hash >> 8) & 255);
+  buf[34] = static_cast<td::uint8>(hash & 255);
+  return td::base32_encode(buf_slice, upper_case).substr(1);
+}
+
+std::string adnl_id_encode(td::Bits256 adnl_addr, bool upper_case) {
+  return adnl_id_encode(adnl_addr.as_slice(), upper_case).move_as_ok();
+}
+
+td::Result<Bits256> adnl_id_decode(td::Slice id) {
+  if (id.size() != 55) {
+    return td::Status::Error("Wrong length of adnl id");
+  }
+  td::uint8 buf[56];
+  buf[0] = 'f';
+  td::MutableSlice buf_slice(buf, 56);
+  buf_slice.substr(1).copy_from(id);
+  TRY_RESULT(decoded_str, td::base32_decode(buf_slice));
+  auto decoded = td::Slice(decoded_str);
+  if (decoded[0] != 0x2d) {
+    return td::Status::Error("Invalid first byte");
+  }
+  auto got_hash = (decoded.ubegin()[33] << 8) | decoded.ubegin()[34];
+  auto hash = td::crc16(decoded.substr(0, 33));
+  if (hash != got_hash) {
+    return td::Status::Error("Hash mismatch");
+  }
+  Bits256 res;
+  res.as_slice().copy_from(decoded.substr(1, 32));
+  return res;
+}
+
 }  // namespace td
diff --git a/submodules/ton/tonlib-src/crypto/common/util.h b/submodules/ton/tonlib-src/crypto/common/util.h
index 2a594efc76..e6b8ec2ebb 100644
--- a/submodules/ton/tonlib-src/crypto/common/util.h
+++ b/submodules/ton/tonlib-src/crypto/common/util.h
@@ -14,29 +14,31 @@
     You should have received a copy of the GNU Lesser General Public License
     along with TON Blockchain Library.  If not, see <http://www.gnu.org/licenses/>.
 
-    Copyright 2017-2019 Telegram Systems LLP
+    Copyright 2017-2020 Telegram Systems LLP
 */
 #pragma once
 #include <string>
 #include "td/utils/Slice.h"
 #include "td/utils/buffer.h"
 
+#include "bitstring.h"
+
 namespace td {
 
 std::size_t compute_base64_encoded_size(size_t bindata_size);
 std::size_t buff_base64_encode(td::MutableSlice buffer, td::Slice raw, bool base64_url = false);
-std::string str_base64_encode(std::string raw, bool base64_url = false);
 std::string str_base64_encode(td::Slice raw, bool base64_url = false);
 
-bool is_valid_base64(std::string encoded, bool allow_base64_url = true);
 bool is_valid_base64(td::Slice encoded, bool allow_base64_url = true);
-td::int32 decoded_base64_size(std::string encoded, bool allow_base64_url = true);
 td::int32 decoded_base64_size(td::Slice encoded, bool allow_base64_url = true);
 
 std::size_t buff_base64_decode(td::MutableSlice buffer, td::Slice data, bool allow_base64_url = true);
-td::BufferSlice base64_decode(std::string encoded, bool allow_base64_url = true);
 td::BufferSlice base64_decode(td::Slice encoded, bool allow_base64_url = true);
-std::string str_base64_decode(std::string encoded, bool allow_base64_url = true);
 std::string str_base64_decode(td::Slice encoded, bool allow_base64_url = true);
 
+//TODO: move it somewhere else
+td::Result<std::string> adnl_id_encode(td::Slice id, bool upper_case = false);
+std::string adnl_id_encode(Bits256 adnl_addr, bool upper_case = false);
+td::Result<Bits256> adnl_id_decode(td::Slice id);
+
 }  // namespace td
diff --git a/submodules/ton/tonlib-src/crypto/fift/IntCtx.cpp b/submodules/ton/tonlib-src/crypto/fift/IntCtx.cpp
index f2da340973..a091c04955 100644
--- a/submodules/ton/tonlib-src/crypto/fift/IntCtx.cpp
+++ b/submodules/ton/tonlib-src/crypto/fift/IntCtx.cpp
@@ -71,6 +71,7 @@ IntCtx::Savepoint::Savepoint(IntCtx& _ctx, std::string new_filename, std::string
                              std::istream* new_input_stream)
     : ctx(_ctx)
     , old_line_no(_ctx.line_no)
+    , old_need_line(_ctx.need_line)
     , old_filename(_ctx.filename)
     , old_current_dir(_ctx.currentd_dir)
     , old_input_stream(_ctx.input_stream)
@@ -87,6 +88,7 @@ IntCtx::Savepoint::Savepoint(IntCtx& _ctx, std::string new_filename, std::string
 
 IntCtx::Savepoint::~Savepoint() {
   ctx.line_no = old_line_no;
+  ctx.need_line = old_need_line;
   ctx.filename = old_filename;
   ctx.currentd_dir = old_current_dir;
   ctx.input_stream = old_input_stream;
@@ -99,6 +101,7 @@ bool IntCtx::load_next_line() {
   if (!std::getline(*input_stream, str)) {
     return false;
   }
+  need_line = false;
   if (!str.empty() && str.back() == '\r') {
     str.pop_back();
   }
@@ -111,6 +114,7 @@ bool IntCtx::is_sb() const {
 }
 
 td::Slice IntCtx::scan_word_to(char delim, bool err_endl) {
+  load_next_line_ifreq();
   auto ptr = input_ptr;
   while (*ptr && *ptr != delim) {
     ptr++;
@@ -121,6 +125,7 @@ td::Slice IntCtx::scan_word_to(char delim, bool err_endl) {
   } else if (err_endl && delim) {
     throw IntError{std::string{"end delimiter `"} + delim + "` not found"};
   } else {
+    need_line = true;
     std::swap(ptr, input_ptr);
     return td::Slice{ptr, input_ptr};
   }
diff --git a/submodules/ton/tonlib-src/crypto/fift/IntCtx.h b/submodules/ton/tonlib-src/crypto/fift/IntCtx.h
index 1adb8f325a..b2725cdae8 100644
--- a/submodules/ton/tonlib-src/crypto/fift/IntCtx.h
+++ b/submodules/ton/tonlib-src/crypto/fift/IntCtx.h
@@ -68,6 +68,7 @@ struct IntCtx {
   int state{0};
   int include_depth{0};
   int line_no{0};
+  bool need_line{true};
   std::string filename;
   std::string currentd_dir;
   std::istream* input_stream{nullptr};
@@ -116,6 +117,9 @@ struct IntCtx {
   }
 
   bool load_next_line();
+  bool load_next_line_ifreq() {
+    return need_line && load_next_line();
+  }
 
   bool is_sb() const;
 
@@ -126,6 +130,7 @@ struct IntCtx {
   class Savepoint {
     IntCtx& ctx;
     int old_line_no;
+    bool old_need_line;
     std::string old_filename;
     std::string old_current_dir;
     std::istream* old_input_stream;
diff --git a/submodules/ton/tonlib-src/crypto/fift/fift-main.cpp b/submodules/ton/tonlib-src/crypto/fift/fift-main.cpp
index 8702f13dcb..077cdeccfc 100644
--- a/submodules/ton/tonlib-src/crypto/fift/fift-main.cpp
+++ b/submodules/ton/tonlib-src/crypto/fift/fift-main.cpp
@@ -23,7 +23,7 @@
     exception statement from your version. If you delete this exception statement 
     from all source files in the program, then also delete it here.
 
-    Copyright 2017-2019 Telegram Systems LLP
+    Copyright 2017-2020 Telegram Systems LLP
 */
 #include "vm/stack.hpp"
 #include <cassert>
@@ -156,7 +156,7 @@ int main(int argc, char* const argv[]) {
   }
 
   fift::init_words_common(config.dictionary);
-  fift::init_words_vm(config.dictionary);
+  fift::init_words_vm(config.dictionary, true);  // enable vm debug
   fift::init_words_ton(config.dictionary);
 
   if (script_mode) {
diff --git a/submodules/ton/tonlib-src/crypto/fift/lib/Asm.fif b/submodules/ton/tonlib-src/crypto/fift/lib/Asm.fif
index eb9034ec1e..ced35d6fd1 100644
--- a/submodules/ton/tonlib-src/crypto/fift/lib/Asm.fif
+++ b/submodules/ton/tonlib-src/crypto/fift/lib/Asm.fif
@@ -165,6 +165,8 @@ x{68} @Defop DEPTH
 x{69} @Defop CHKDEPTH
 x{6A} @Defop ONLYTOPX
 x{6B} @Defop ONLYX
+{ over 0= abort"first argument must be non-zero"
+  <b x{6C} s, rot 4 u, swap 4 u, @addopb } : BLKDROP2
 
 // null primitives
 x{6D} dup @Defop NULL @Defop PUSHNULL
@@ -216,6 +218,10 @@ x{6FA0} @Defop NULLSWAPIF
 x{6FA1} @Defop NULLSWAPIFNOT
 x{6FA2} @Defop NULLROTRIF
 x{6FA3} @Defop NULLROTRIFNOT
+x{6FA4} @Defop NULLSWAPIF2
+x{6FA5} @Defop NULLSWAPIFNOT2
+x{6FA6} @Defop NULLROTRIF2
+x{6FA7} @Defop NULLROTRIFNOT2
 { <b x{6FB} s, rot 2 u, swap 2 u, @addopb } : INDEX2
 x{6FB4} @Defop CADR
 x{6FB5} @Defop CDDR
@@ -305,19 +311,21 @@ x{A90C} @Defop DIVMOD
 x{A90D} @Defop DIVMODR
 x{A90E} @Defop DIVMODC
 x{A925} @Defop RSHIFTR
+x{A926} @Defop RSHIFTC
 x{A935} @Defop(8u+1) RSHIFTR#
+x{A936} @Defop(8u+1) RSHIFTC#
 x{A938} @Defop(8u+1) MODPOW2#
 x{A984} @Defop MULDIV
 x{A985} @Defop MULDIVR
 x{A98C} @Defop MULDIVMOD
+x{A9A4} @Defop MULRSHIFT
+x{A9A5} @Defop MULRSHIFTR
+x{A9B4} @Defop(8u+1) MULRSHIFT#
+x{A9B5} @Defop(8u+1) MULRSHIFTR#
 x{A9C4} @Defop LSHIFTDIV
 x{A9C5} @Defop LSHIFTDIVR
 x{A9D4} @Defop(8u+1) LSHIFT#DIV
 x{A9D5} @Defop(8u+1) LSHIFT#DIVR
-x{A9E4} @Defop MULRSHIFT
-x{A9E5} @Defop MULRSHIFTR
-x{A9F4} @Defop(8u+1) MULRSHIFT#
-x{A9F5} @Defop(8u+1) MULRSHIFTR#
 x{AA} @Defop(8u+1) LSHIFT#
 x{AB} @Defop(8u+1) RSHIFT#
 x{AC} @Defop LSHIFT
@@ -458,6 +466,7 @@ x{CF28} @Defop STILE4
 x{CF29} @Defop STULE4
 x{CF2A} @Defop STILE8
 x{CF2B} @Defop STULE8
+x{CF30} @Defop BDEPTH
 x{CF31} @Defop BBITS
 x{CF32} @Defop BREFS
 x{CF33} @Defop BBITREFS
@@ -485,6 +494,7 @@ x{CF42} @Defop STSAME
 } : STSLICECONST
 x{CF81} @Defop STZERO
 x{CF83} @Defop STONE
+
 // cell deserialization (CellSlice primitives)
 x{D0} @Defop CTOS
 x{D1} @Defop ENDS
@@ -585,6 +595,8 @@ x{D75F} @Defop PLDULE8Q
 x{D760} @Defop LDZEROES
 x{D761} @Defop LDONES
 x{D762} @Defop LDSAME
+x{D764} @Defop SDEPTH
+x{D765} @Defop CDEPTH
 //
 // continuation / flow control primitives
 x{D8} dup @Defop EXECUTE @Defop CALLX
@@ -965,6 +977,11 @@ x{F4B5} @Defop SUBDICTRPGET
 x{F4B6} @Defop SUBDICTIRPGET
 x{F4B7} @Defop SUBDICTURPGET
 
+x{F4BC} @Defop DICTIGETJMPZ
+x{F4BD} @Defop DICTUGETJMPZ
+x{F4BE} @Defop DICTIGETEXECZ
+x{F4BF} @Defop DICTUGETEXECZ
+
 //
 // blockchain-specific primitives
 
@@ -972,12 +989,17 @@ x{F800} @Defop ACCEPT
 x{F801} @Defop SETGASLIMIT
 x{F80F} @Defop COMMIT
 
+x{F810} @Defop RANDU256
+x{F811} @Defop RAND
+x{F814} @Defop SETRAND
+x{F815} dup @Defop ADDRAND @Defop RANDOMIZE
+
 x{F82} @Defop(4u) GETPARAM
 x{F823} @Defop NOW
 x{F824} @Defop BLOCKLT
 x{F825} @Defop LTIME
-x{F826} @Defop BALANCE
-x{F827} @Defop RANDSEED
+x{F826} @Defop RANDSEED
+x{F827} @Defop BALANCE
 x{F828} @Defop MYADDR
 x{F829} @Defop CONFIGROOT
 x{F830} @Defop CONFIGDICT
@@ -995,6 +1017,11 @@ x{F902} @Defop SHA256U
 x{F910} @Defop CHKSIGNU
 x{F911} @Defop CHKSIGNS
 
+x{F940} @Defop CDATASIZEQ
+x{F941} @Defop CDATASIZE
+x{F942} @Defop SDATASIZEQ
+x{F943} @Defop SDATASIZE
+
 x{FA00} dup @Defop LDGRAMS @Defop LDVARUINT16
 x{FA01} @Defop LDVARINT16
 x{FA02} dup @Defop STGRAMS @Defop STVARUINT16
@@ -1013,6 +1040,8 @@ x{FB00} @Defop SENDRAWMSG
 x{FB02} @Defop RAWRESERVE
 x{FB03} @Defop RAWRESERVEX
 x{FB04} @Defop SETCODE
+x{FB06} @Defop SETLIBCODE
+x{FB07} @Defop CHANGELIB
 
 //
 // debug primitives
@@ -1057,56 +1086,98 @@ x{FFF0} @Defop SETCPX
 variable @proccnt
 variable @proclist
 variable @procdict
+variable @procinfo
+variable @gvarcnt
+variable asm-mode  1 asm-mode !
 19 constant @procdictkeylen
-{ @proclist @ cons @proclist ! } : @proclistadd
-{ dup @procdictkeylen fits not abort"procedure index out of range"
-  1 'nop does swap dup @proclistadd 0 (create)
+32 constant @zcount
+{ pair @proclist @ cons @proclist ! } : @proclistadd
+{ @procinfo @ @procdictkeylen idict@ { 16 i@ } { 0 } cond } : @procinfo@
+{ <b rot 16 i, swap @procinfo @ @procdictkeylen b>idict!
+  not abort"cannot add key to procedure info dictionary"
+  @procinfo !
+} : @procinfo!
+// ( x v1 v2 -- )
+{ not 2 pick @procinfo@ and xor swap @procinfo! } : @procinfo~!
+// ( s i f -- )
+{ over @procdictkeylen fits not abort"procedure index out of range"
+  over swap dup @procinfo~!  2dup @proclistadd
+  1 'nop does swap 0 (create)
 } : @declproc
-{ @proccnt @ 1+ dup @proccnt ! @declproc } : @newproc
-{ 0 =: main  @proclist null!  @proccnt 0!
+{ 1 'nop does swap 0 (create) } : @declglobvar
+{ @proccnt @ 1+ dup @proccnt ! 1 @declproc } : @newproc
+{ @gvarcnt @ 1+ dup @gvarcnt ! @declglobvar } : @newglobvar
+{ 0 =: main  @proclist null!  @proccnt 0!  @gvarcnt 0!
   { bl word @newproc } : NEWPROC
   { bl word dup (def?) ' drop ' @newproc cond } : DECLPROC
   { bl word dup find
     { nip execute <> abort"method redefined with different id" }
-    { swap @declproc }
+    { swap 17 @declproc }
   cond } : DECLMETHOD
-  "main" @proclistadd
-  dictnew @procdict !
+  { bl word @newglobvar } : DECLGLOBVAR
+  "main" 0 @proclistadd
+  dictnew dup @procdict !
+  @procinfo !  16 0 @procinfo!
 } : PROGRAM{
 { over sbits < { s>c <b swap ref, b> <s } if } : @adj-long-proc
 { // i s l
-  @adj-long-proc swap @procdict @ @procdictkeylen
+  @adj-long-proc over @procdict @ @procdictkeylen
   idict!+ not abort"cannot define procedure, redefined?"
-  @procdict !
+  @procdict !  2 2 @procinfo~!
 } : @def-proc
+{ @procinfo @ null? not } : @have-procinfo?
+{ @have-procinfo? { 4 4 @procinfo~! } { drop } cond } : @proc-inlined
+{ @have-procinfo? { 8 8 @procinfo~! } { drop } cond } : @proc-called
 { 1000 @def-proc } : PROC
 { 0 @def-proc } : PROCREF
 { @procdict @ @procdictkeylen idict@ abort"procedure already defined"
 } : @fail-ifdef
+{ u@?+ { swap abort"first bits are not zeroes" } if } : @cut-zeroes
 { over @fail-ifdef
-  2 { rot @normal? rot b> <s swap @def-proc drop } does
-  null swap @doafter<{
+  2 { rot @normal? rot b> <s @zcount @cut-zeroes swap @def-proc drop } does
+  null swap @doafter<{ 0 @zcount u,
 } : @PROC:<{
 { 1000 @PROC:<{ } : PROC:<{
 { 0 @PROC:<{ } : PROCREF:<{
+{ dup @proc-called CALLDICT } dup : CALL : CALLDICT
+{ dup @proc-called JMPDICT } dup : JMP : JMPDICT
+{ dup @proc-called PREPAREDICT } dup : PREPARE : PREPAREDICT
 { dup @procdict @ @procdictkeylen idict@
-  { nip INLINE } { CALLDICT } cond
+  { swap @proc-inlined INLINE } { CALLDICT } cond
 } dup : INLINECALL : INLINECALLDICT
 { 0 @procdict @ @procdictkeylen idict@ not abort"`main` procedure not defined" drop
 } : @chkmaindef
+{ @procdict @ @procdictkeylen idict- drop @procdict ! } : @remove-proc
+{ ."Procedure `" over type ."` index=" 2 pick . ." flags=0x" dup x. cr } : @showprocinfo
+// ( proc_name proc_idx f -- )  f:+1=declared, +2=defined, +4=inlined, +8=called, +16=method
+{ // @showprocinfo
+  dup 0x1a and 2 = asm-mode @ 3 and and ?dup {
+    2 and {
+      over ."Warning: removing (inlined) procedure `" type ."` from call dictionary" cr
+    } if
+    2 pick @remove-proc
+  } if  // remove unused procs
+  dup 0xc and 0xc = asm-mode @ 4 and and {
+    over ."Warning: inline procedure `" type ."` is not always inlined" cr
+  } if
+  dup 0x1e and 2 = asm-mode @ 8 and and {
+    over ."Warning: procedure `" type ."` defined but not used" cr
+  } if
+  drop 2drop
+} : @chkprocdef
 { @chkmaindef
   @proclist @ { dup null? not } {
-    uncons swap dup find not
-    { +": undefined procedure name in list" abort } if
-    execute @procdict @ @procdictkeylen idict@ not
+    uncons swap unpair over find not
+    { drop +": undefined procedure name in list" abort } if
+    drop tuck @procdict @ @procdictkeylen idict@ not
     { +": procedure declared but left undefined" abort } if
-    drop (forget)
+    drop swap 2dup @procinfo@ @chkprocdef (forget)
   } while
-  drop @proclist null! @proccnt 0!
+  drop @proclist null! @procinfo null! @proccnt 0!
   @procdict dup @ swap null!
 } : }END
 forget @proclist  forget @proccnt
-{ }END <{ SETCP0 swap @procdictkeylen DICTPUSHCONST DICTIGETJMP 11 THROWARG }> } : }END>
+{ }END <{ SETCP0 swap @procdictkeylen DICTPUSHCONST DICTIGETJMPZ 11 THROWARG }> } : }END>
 { }END> b> } : }END>c
 { }END>c <s } : }END>s
 
@@ -1116,6 +1187,14 @@ forget @proclist  forget @proccnt
 -3 constant split_prepare
 -4 constant split_install
 
+{ asm-mode 0 3 ~! } : asm-no-remove-unused
+{ asm-mode 1 1 ~! } : asm-remove-unused   // enabled by default
+{ asm-mode 3 3 ~! } : asm-warn-remove-unused
+{ asm-mode 4 4 ~! } : asm-warn-inline-mix
+{ asm-mode 0 4 ~! } : asm-no-warn-inline-mix  // disabled by default
+{ asm-mode 8 8 ~! } : asm-warn-unused
+{ asm-mode 0 8 ~! } : asm-no-warn-unused  // disabled by default
+
 // ( c -- )   add vm library for later use with runvmcode
 { <b over ref, b> <s swap hash vmlibs @ 256 udict! not abort"cannot add library" vmlibs ! } : add-lib
 // ( x -- c ) make library reference cell
diff --git a/submodules/ton/tonlib-src/crypto/fift/lib/Color.fif b/submodules/ton/tonlib-src/crypto/fift/lib/Color.fif
new file mode 100644
index 0000000000..bd8ed7af6d
--- /dev/null
+++ b/submodules/ton/tonlib-src/crypto/fift/lib/Color.fif
@@ -0,0 +1,21 @@
+library Color
+{ 27 emit } : esc
+
{ char " word 27 chr swap $+ 1 ' type does create } :_ make-esc"
+
make-esc"[0m" ^reset
+
make-esc"[30m" ^black
+
make-esc"[31m" ^red
+
make-esc"[32m" ^green
+make-esc"[33m" ^yellow
+make-esc"[34m" ^blue
+make-esc"[35m" ^magenta
+make-esc"[36m" ^cyan
+make-esc"[37m" ^white
+
// bold
+make-esc"[30;1m" ^Black
+make-esc"[31;1m" ^Red
+make-esc"[32;1m" ^Green
+make-esc"[33;1m" ^Yellow
+make-esc"[34;1m" ^Blue
+make-esc"[35;1m" ^Magenta
+make-esc"[36;1m" ^Cyan
+make-esc"[37;1m" ^White
diff --git a/submodules/ton/tonlib-src/crypto/fift/lib/Fift.fif b/submodules/ton/tonlib-src/crypto/fift/lib/Fift.fif
index 5430c359e7..1b7af49f82 100644
--- a/submodules/ton/tonlib-src/crypto/fift/lib/Fift.fif
+++ b/submodules/ton/tonlib-src/crypto/fift/lib/Fift.fif
@@ -79,12 +79,15 @@ variable base
 { char ) word "$" swap $+ 1 { find 0= abort"undefined parameter" execute } } ::_ $(
 // b s -- ?
 { sbitrefs rot brembitrefs rot >= -rot <= and } : s-fits?
+// b s x -- ?
+{ swap sbitrefs -rot + rot brembitrefs -rot <= -rot <= and } : s-fits-with?
 { 0 swap ! } : 0!
 { tuck @ + swap ! } : +!
 { tuck @ swap - swap ! } : -!
 { 1 swap +! } : 1+!
 { -1 swap +! } : 1-!
 { null swap ! } : null!
+{ not 2 pick @ and xor swap ! } : ~!
 0 tuple constant nil
 { 1 tuple } : single
 { 2 tuple } : pair
@@ -111,3 +114,20 @@ variable base
 { true (atom) drop } : atom
 { bl word atom 1 'nop } ::_ `
 { hole dup 1 { @ execute } does create } : recursive
+{ 0 { 1+ dup 1 ' $() does over (.) "$" swap $+ 0 (create) } rot times drop } : :$1..n
+{ 10 hold } : +cr
+{ 9 hold } : +tab
+{ "" swap { 0 word 2dup $cmp } { rot swap $+ +cr swap } while 2drop } : scan-until-word
+{ 0 word -trailing scan-until-word 1 'nop } ::_ $<<
+{ 0x40 runvmx } : runvmcode
+{ 0x48 runvmx } : gasrunvmcode
+{ 0x43 runvmx } : runvmdict
+{ 0x4b runvmx } : gasrunvmdict
+{ 0x45 runvmx } : runvm
+{ 0x4d runvmx } : gasrunvm
+{ 0x55 runvmx } : runvmctx
+{ 0x5d runvmx } : gasrunvmctx
+{ 0x75 runvmx } : runvmctxact
+{ 0x7d runvmx } : gasrunvmctxact
+{ 0x35 runvmx } : runvmctxactq
+{ 0x3d runvmx } : gasrunvmctxactq
diff --git a/submodules/ton/tonlib-src/crypto/fift/lib/GetOpt.fif b/submodules/ton/tonlib-src/crypto/fift/lib/GetOpt.fif
new file mode 100644
index 0000000000..442552b636
--- /dev/null
+++ b/submodules/ton/tonlib-src/crypto/fift/lib/GetOpt.fif
@@ -0,0 +1,131 @@
+library GetOpt  // Simple command-line options parser
+"Lists.fif" include
+
+// May be used as follows:
+// begin-options
+//   "h" { ."Help Message" 0 halt } short-option
+//   "v" { parse-int =: verbosity } short-option-arg
+//   "i" "--interactive" { true =: interactive } short-long-option
+// parse-options
+
+// ( l -- l')  computes tail of list l if non-empty; else ()
+{ dup null? ' cdr ifnot } : safe-cdr
+// ( l c -- l')  deletes first c elements from list l
+{ ' safe-cdr swap times } : list-delete-first
+// ( l n c -- l' )  deletes c elements starting from n-th in list l
+recursive list-delete-range {
+  dup 0<= { 2drop } {
+  over 0<= { nip list-delete-first } {
+  swap 1- swap rot uncons 2swap list-delete-range cons
+  } cond } cond
+} swap !
+// ( n c -- )  deletes $n .. $(n+c-1) from the argument list $*
+{ swap 1- $* @ swap rot list-delete-range $* ! } : $*del.. 
+// ( s s' -- ? )  checks whether s' is a prefix of s
+{ tuck $len over $len over >= { $| drop $= } { 2drop drop false } cond
+} : $pfx?
+// ( s -- ? )  checks whether s is an option (a string beginning with '-')
+{ dup $len 1 > { "-" $pfx? } { drop false } cond } : is-opt?
+// ( s -- ? )  checks whether s is a digit option
+{ 2 $| drop 1 $| nip $>B 8 B>u@ dup 57 <= swap 48 >= and } : is-digit-opt?
+0 box constant disable-digit-opts
+// ( l -- s i or 0 )  finds first string in l beginning with '-'
+{ 0 { 1+ over null? { 2drop 0 true } {
+  swap uncons over is-opt?
+  { disable-digit-opts @ { over is-digit-opt? not } { true } cond } { false } cond
+  { drop swap true } { nip swap false } cond
+  } cond } until
+} : list-find-opt
+// ( -- s i or 0 )  finds first option in cmdline args
+{ $* @ list-find-opt } : first-opt
+' second : get-opt-flags
+' first : get-opt-exec
+// ( s t -- ? )  checks whether short/long option s matches description t
+{ third $= } : short-option-matches
+{ dup get-opt-flags 4 and 0= 3 + [] $=
+} : long-option-matches
+// ( t -- s -1 or 0 )  extracts help message from description
+{ dup get-opt-flags 4 and 0= 4 + over count over >
+  { [] true } { 2drop false } cond
+} : get-opt-help
+// ( s l -- t -1 or 0 )  finds short/long option s in list l
+{ swap 1 { swap short-option-matches } does assoc-gen
+} : lookup-short-option
+{ swap 1 { swap long-option-matches } does assoc-gen
+} : lookup-long-option
+// ( s -- s' null or s' s'' )  Splits long option --opt=arg at '='
+{ dup "=" $pos 1+ ?dup { tuck $| swap rot 1- $| drop swap } { null } cond
+} : split-longopt
+// ( l -- f or 0 )  Extracts global option flags from first entry of l
+{ dup null? { drop 0 } { car get-opt-flags -256 and } cond
+} : get-global-option-flags
+variable options-list
+// ( l -- i or 0 ) 
+// parses command line arguments according to option description list l
+// and returns index i of first incorrect option
+{ dup options-list ! get-global-option-flags
+  256 and disable-digit-opts !
+  { first-opt dup 0= { true } {
+    swap dup "--" $pfx? {  // i s
+      dup $len 2 = { drop dup 1 $*del.. 0 true } {
+      split-longopt swap options-list @
+      lookup-long-option not { drop true } { // i s' t f
+      dup get-opt-exec swap get-opt-flags 3 and // i s' e f'
+      2 pick null? { dup 1 = } { dup 0= negate } cond  // i s' e f' f''
+      dup 1 = { 2drop 2drop true } {
+      { drop nip over 1+ $() swap execute 2 $*del.. false } {
+      ' nip ifnot execute 1 $*del.. false
+    } cond } cond } cond } cond } { // i s
+      1 $| nip {
+        dup $len 0= { drop 1 $*del.. false true } {
+        1 $| swap options-list @  // i s' s l
+        lookup-short-option not { drop true true } { // i s' t
+        dup get-opt-exec swap get-opt-flags 3 and  // i s' e f'
+        ?dup 0= { execute false } {
+        2 pick $len { drop execute "" false } {
+        2 = { nip null swap execute "" false } {  // i e
+        nip over 1+ $() swap execute 2 $*del.. false true
+      } cond } cond } cond } cond } cond } until
+    } cond
+  } cond } until
+} : getopt
+// ( t -- )  Displays help message for one option
+{ dup get-opt-flags dup 4 and 2 pick third swap {
+    ."-" type ."/" over 3 [] type } {
+    dup $len { dup "--" $pfx? { ."-" } ifnot type } {
+    drop ."usage: " $0 type
+  } cond } cond
+  dup 3 and ?dup {
+    2 = { ."[=<optarg>]" } { ."=<optarg>" } cond
+  } if
+  8 and { 9 emit } ifnot
+  get-opt-help { type } { ."No help available" } cond cr
+} : show-opt-help
+// ( -- )  Displays options help message according to options-list
+{ options-list @ { dup null? not } {
+    uncons swap show-opt-help
+  } while drop
+} : show-options-help
+// ( l -- )  Parses options and throws an error on failure
+{ getopt ?dup {
+  $() "cannot parse command line options near `" swap $+ +"`"
+  show-options-help abort } if
+} : run-getopt
+anon constant opt-list-marker
+' opt-list-marker : begin-options
+{ opt-list-marker list-until-marker } : end-options
+{ end-options run-getopt } : parse-options
+// ( s e -- o )  Creates short/long option s with execution token e
+{ 0 rot triple } dup : short-option : long-option
+// ( s s' e -- o ) Creates a combined short option s and long option s' with execution token e
+{ 4 2swap 4 tuple } : short-long-option
+{ 1 rot triple } dup : short-option-arg : long-option-arg
+{ 2 rot triple } dup : short-option-?arg : long-option-?arg
+{ 5 2swap 4 tuple } : short-long-option-arg
+{ 6 2swap 4 tuple } : short-long-option-?arg
+// ( o s -- s' )  Adds help message to option
+' , : option-help
+// ( s f -- o )  Creates a generic help message
+{ swap 'nop rot "" 3 roll 4 tuple } : generic-help-setopt
+{ 0 generic-help-setopt } : generic-help
+256 constant disable-digit-options
diff --git a/submodules/ton/tonlib-src/crypto/fift/lib/TonUtil.fif b/submodules/ton/tonlib-src/crypto/fift/lib/TonUtil.fif
index 7f1a376bb5..0e2155e178 100644
--- a/submodules/ton/tonlib-src/crypto/fift/lib/TonUtil.fif
+++ b/submodules/ton/tonlib-src/crypto/fift/lib/TonUtil.fif
@@ -12,6 +12,8 @@ library TonUtil // TON Blockchain Fift Library
 
 { (number) 1- abort"integer expected" } : parse-int
 
+{ over null? ' swap if drop } : replace-if-null
+
 // Private key load/generate
 // ( fname -- pubkey privkey )
 { dup ."Loading private key from file " type cr 
@@ -32,8 +34,10 @@ library TonUtil // TON Blockchain Fift Library
   1 and 0= 
 } : parse-smc-addr
 
+// ( x -- ) Displays a 64-digit hex number
+{ 64 0x. } : 64x.
 // ( wc addr -- )  Show address in <workchain>:<account> form
-{ swap ._ .":" 64 0x. } : .addr
+{ swap ._ .":" 64x. } : .addr
 // ( wc addr flags -- )  Show address in base64url form
 { smca>$ type } : .Addr
 // ( wc addr fname -- )  Save address to file in 36-byte format
@@ -65,6 +69,9 @@ library TonUtil // TON Blockchain Fift Library
 
 // ( b wc addr -- b' )  Serializes address into Builder b
 { -rot 8 i, swap 256 u, } : addr, 
+{ over 8 fits { rot b{100} s, -rot addr, } {
+  rot b{110} s, 256 9 u, rot 32 i, swap 256 u, } cond
+} : Addr,
 
 // Gram utilities
 1000000000 constant Gram
@@ -148,3 +155,46 @@ recursive append-long-bytes {
 // ( x -- S )  serialize public key
 { 256 u>B B{3ee6} swap B+ dup crc16 16 u>B B+ B>base64 } : pubkey>$
 { pubkey>$ type } : .pubkey
+
+// adnl address parser
+{ 256 u>B B{2D} swap B+ dup crc16 16 u>B B+ } : adnl-preconv
+{ swap 32 /mod dup 26 < { 65 } { 24 } cond + rot swap hold } : Base32#
+{ <# ' Base32# 8 times #> } : Base32#*8
+{ "" over Blen 5 / { swap 40 B>u@+ Base32#*8 nip rot swap $+ } swap times nip } : B>Base32
+
+// ( x -- S )  Converts an adnl-address from a 256-bit integer to a string
+{ adnl-preconv B>Base32 1 $| nip } : adnl>$
+
+{ 65 - dup 0>= { -33 and dup 26 < } { 41 + dup 25 > over 32 < and } cond ?dup nip } : Base32-digit?
+{ Base32-digit? not abort"not a Base32 digit" } : Base32-digit
+{ 0 { over $len } { swap 1 $| -rot (char) Base32-digit swap 5 << + } while nip } : Base32-number
+{ B{} { over $len } { swap 8 $| -rot Base32-number 40 u>B B+ } while nip } : Base32>B
+
+// ( S -- x )  Converts an adnl address from a string to 256-bit integer
+{ dup $len 55 <> abort"not 55 alphanumeric characters" "F" swap $+ Base32>B
+  33 B| 16 B>u@ over crc16 <> abort"crc16 checksum mismatch"
+  8 B>u@+ 0x2D <> abort"not a valid adnl address" 256 B>u@ } : $>adnl
+
+{ 65 - dup 0>= { -33 and 10 + dup 16 < } { 17 + dup 0>= over 10 < and } cond ?dup nip } : hex-digit?
+// ( S -- x -1 or 0 )  Parses a hexadecimal integer
+{ dup $len {
+    0 {
+      4 << swap 1 $| -rot (char) hex-digit?  // S a d -1 or S a 0
+      { + over $len 0= } { drop -1 true } cond
+    } until
+    dup 0< { 2drop false } { nip true } cond
+  } { drop false } cond
+} : hex$>u?
+// ( S -- x )
+{ hex$>u? not abort"not a hexadecimal number" } : hex$>u
+
+{ dup $len 64 = { hex$>u } {
+  dup $len 55 = { $>adnl } {
+    true abort"invalid adnl address"
+  } cond } cond
+} : parse-adnl-addr
+{ adnl>$ type } : .adnl
+{ bl word parse-adnl-addr 1 'nop } ::_ adnl:
+
+// ( x a b -- a<=x<=b )
+{ 2 pick >= -rot >= and } : in-range?
diff --git a/submodules/ton/tonlib-src/crypto/fift/utils.cpp b/submodules/ton/tonlib-src/crypto/fift/utils.cpp
index fdbd0c7eef..3ed11c31b6 100644
--- a/submodules/ton/tonlib-src/crypto/fift/utils.cpp
+++ b/submodules/ton/tonlib-src/crypto/fift/utils.cpp
@@ -46,6 +46,9 @@ td::Result<std::string> load_Lists_fif(std::string dir = "") {
 td::Result<std::string> load_Lisp_fif(std::string dir = "") {
   return load_source("Lisp.fif", dir);
 }
+td::Result<std::string> load_GetOpt_fif(std::string dir = "") {
+  return load_source("GetOpt.fif", dir);
+}
 
 class MemoryFileLoader : public fift::FileLoader {
  public:
@@ -115,6 +118,10 @@ td::Result<fift::SourceLookup> create_source_lookup(std::string main, bool need_
       TRY_RESULT(f, load_TonUtil_fif(dir));
       loader->add_file("/TonUtil.fif", std::move(f));
     }
+    {
+      TRY_RESULT(f, load_GetOpt_fif(dir));
+      loader->add_file("/GetOpt.fif", std::move(f));
+    }
   }
   if (need_lisp) {
     TRY_RESULT(f, load_Lisp_fif(dir));
diff --git a/submodules/ton/tonlib-src/crypto/fift/words.cpp b/submodules/ton/tonlib-src/crypto/fift/words.cpp
index 2c1a3083d6..3afd687ec4 100644
--- a/submodules/ton/tonlib-src/crypto/fift/words.cpp
+++ b/submodules/ton/tonlib-src/crypto/fift/words.cpp
@@ -14,7 +14,7 @@
     You should have received a copy of the GNU Lesser General Public License
     along with TON Blockchain Library.  If not, see <http://www.gnu.org/licenses/>.
 
-    Copyright 2017-2019 Telegram Systems LLP
+    Copyright 2017-2020 Telegram Systems LLP
 */
 #include "words.h"
 
@@ -32,7 +32,7 @@
 
 #include "vm/cells.h"
 #include "vm/cellslice.h"
-#include "vm/continuation.h"
+#include "vm/vm.h"
 #include "vm/cp0.h"
 #include "vm/dict.h"
 #include "vm/boc.h"
@@ -96,6 +96,10 @@ void interpret_dotstack_list(IntCtx& ctx) {
   *ctx.output_stream << std::endl;
 }
 
+void interpret_dotstack_list_dump(IntCtx& ctx) {
+  ctx.stack.dump(*ctx.output_stream, 3);
+}
+
 void interpret_dump(IntCtx& ctx) {
   ctx.stack.pop_chk().dump(*ctx.output_stream);
   *ctx.output_stream << ' ';
@@ -105,6 +109,10 @@ void interpret_dump_internal(vm::Stack& stack) {
   stack.push_string(stack.pop_chk().to_string());
 }
 
+void interpret_list_dump_internal(vm::Stack& stack) {
+  stack.push_string(stack.pop_chk().to_lisp_string());
+}
+
 void interpret_print_list(IntCtx& ctx) {
   ctx.stack.pop_chk().print_list(*ctx.output_stream);
   *ctx.output_stream << ' ';
@@ -172,9 +180,9 @@ void interpret_times_div(vm::Stack& stack, int round_mode) {
   auto z = stack.pop_int();
   auto y = stack.pop_int();
   auto x = stack.pop_int();
-  td::BigIntG<257 * 2> tmp{0};
+  typename td::BigInt256::DoubleInt tmp{0};
   tmp.add_mul(*x, *y);
-  auto q = td::RefInt256{true};
+  auto q = td::make_refint();
   tmp.mod_div(*z, q.unique_write(), round_mode);
   q.unique_write().normalize();
   stack.push_int(std::move(q));
@@ -184,26 +192,23 @@ void interpret_times_divmod(vm::Stack& stack, int round_mode) {
   auto z = stack.pop_int();
   auto y = stack.pop_int();
   auto x = stack.pop_int();
-  td::BigIntG<257 * 2> tmp{0};
+  typename td::BigInt256::DoubleInt tmp{0};
   tmp.add_mul(*x, *y);
-  auto q = td::RefInt256{true};
+  auto q = td::make_refint();
   tmp.mod_div(*z, q.unique_write(), round_mode);
   q.unique_write().normalize();
-  auto r = td::RefInt256{true, tmp};
   stack.push_int(std::move(q));
-  stack.push_int(std::move(r));
+  stack.push_int(td::make_refint(tmp));
 }
 
 void interpret_times_mod(vm::Stack& stack, int round_mode) {
   auto z = stack.pop_int();
   auto y = stack.pop_int();
   auto x = stack.pop_int();
-  td::BigIntG<257 * 2> tmp{0};
+  typename td::BigInt256::DoubleInt tmp{0}, q;
   tmp.add_mul(*x, *y);
-  td::BigIntG<257 * 2> q;
   tmp.mod_div(*z, q, round_mode);
-  auto r = td::RefInt256{true, tmp};
-  stack.push_int(std::move(r));
+  stack.push_int(td::make_refint(tmp));
 }
 
 void interpret_negate(vm::Stack& stack) {
@@ -245,21 +250,21 @@ void interpret_fits(vm::Stack& stack, bool sgnd) {
 
 void interpret_pow2(vm::Stack& stack) {
   int x = stack.pop_smallint_range(255);
-  auto r = td::RefInt256{true};
+  auto r = td::make_refint();
   r.unique_write().set_pow2(x);
   stack.push_int(r);
 }
 
 void interpret_neg_pow2(vm::Stack& stack) {
   int x = stack.pop_smallint_range(256);
-  auto r = td::RefInt256{true};
+  auto r = td::make_refint();
   r.unique_write().set_pow2(x).negate().normalize();
   stack.push_int(r);
 }
 
 void interpret_pow2_minus1(vm::Stack& stack) {
   int x = stack.pop_smallint_range(256);
-  auto r = td::RefInt256{true};
+  auto r = td::make_refint();
   r.unique_write().set_pow2(x).add_tiny(-1).normalize();
   stack.push_int(r);
 }
@@ -293,19 +298,18 @@ void interpret_times_rshift(vm::Stack& stack, int round_mode) {
   int z = stack.pop_smallint_range(256);
   auto y = stack.pop_int();
   auto x = stack.pop_int();
-  td::BigIntG<257 * 2> tmp{0};
+  typename td::BigInt256::DoubleInt tmp{0};
   tmp.add_mul(*x, *y).rshift(z, round_mode).normalize();
-  auto q = td::RefInt256{true, tmp};
-  stack.push_int(std::move(q));
+  stack.push_int(td::make_refint(tmp));
 }
 
 void interpret_lshift_div(vm::Stack& stack, int round_mode) {
   int z = stack.pop_smallint_range(256);
   auto y = stack.pop_int();
   auto x = stack.pop_int();
-  td::BigIntG<257 * 2> tmp{*x};
+  typename td::BigInt256::DoubleInt tmp{*x};
   tmp <<= z;
-  auto q = td::RefInt256{true};
+  auto q = td::make_refint();
   tmp.mod_div(*y, q.unique_write(), round_mode);
   q.unique_write().normalize();
   stack.push_int(std::move(q));
@@ -596,6 +600,12 @@ void interpret_str_split(vm::Stack& stack) {
   stack.push_string(std::string{str, sz});
 }
 
+void interpret_str_pos(vm::Stack& stack) {
+  auto s2 = stack.pop_string(), s1 = stack.pop_string();
+  auto pos = s1.find(s2);
+  stack.push_smallint(pos == std::string::npos ? -1 : pos);
+}
+
 void interpret_str_reverse(vm::Stack& stack) {
   std::string s = stack.pop_string();
   auto it = s.begin();
@@ -651,6 +661,20 @@ void interpret_utf8_str_split(vm::Stack& stack) {
   }
 }
 
+void interpret_utf8_str_pos(vm::Stack& stack) {
+  auto s2 = stack.pop_string(), s1 = stack.pop_string();
+  auto pos = s1.find(s2);
+  if (pos == std::string::npos) {
+    stack.push_smallint(-1);
+    return;
+  }
+  int cnt = 0;
+  for (std::size_t i = 0; i < pos; i++) {
+    cnt += ((s1[i] & 0xc0) != 0x80);
+  }
+  stack.push_smallint(cnt);
+}
+
 void interpret_str_remove_trailing_int(vm::Stack& stack, int arg) {
   char x = (char)(arg ? arg : stack.pop_long_range(127));
   std::string s = stack.pop_string();
@@ -979,8 +1003,8 @@ void interpret_store_end(vm::Stack& stack, bool special) {
 
 void interpret_from_cell(vm::Stack& stack) {
   auto cell = stack.pop_cell();
-  Ref<vm::CellSlice> cs{true};
-  if (!cs.unique_write().load(vm::NoVmOrd(), std::move(cell))) {
+  Ref<vm::CellSlice> cs{true, vm::NoVmOrd(), std::move(cell)};
+  if (!cs->is_valid()) {
     throw IntError{"deserializing a special cell as ordinary"};
   }
   stack.push(cs);
@@ -1089,7 +1113,10 @@ void interpret_fetch_ref(vm::Stack& stack, int mode) {
       stack.push(std::move(cs));
     }
     if (mode & 1) {
-      Ref<vm::CellSlice> new_cs{true, vm::NoVm(), std::move(cell)};
+      Ref<vm::CellSlice> new_cs{true, vm::NoVmOrd(), std::move(cell)};
+      if (!new_cs->is_valid()) {
+        throw IntError{"cannot load ordinary cell"};
+      }
       stack.push(std::move(new_cs));
     } else {
       stack.push_cell(std::move(cell));
@@ -1484,11 +1511,12 @@ void interpret_store_dict(vm::Stack& stack) {
 }
 
 // val key dict keylen -- dict' ?
-void interpret_dict_add_u(vm::Stack& stack, vm::Dictionary::SetMode mode, bool add_builder, bool sgnd) {
+void interpret_dict_add(vm::Stack& stack, vm::Dictionary::SetMode mode, bool add_builder, int sgnd) {
   int n = stack.pop_smallint_range(vm::Dictionary::max_key_bits);
   vm::Dictionary dict{stack.pop_maybe_cell(), n};
   unsigned char buffer[vm::Dictionary::max_key_bytes];
-  vm::BitSlice key = dict.integer_key(stack.pop_int(), n, sgnd, buffer);
+  vm::BitSlice key =
+      (sgnd >= 0) ? dict.integer_key(stack.pop_int(), n, sgnd, buffer) : stack.pop_cellslice()->prefetch_bits(n);
   if (!key.is_valid()) {
     throw IntError{"not enough bits for a dictionary key"};
   }
@@ -1502,81 +1530,91 @@ void interpret_dict_add_u(vm::Stack& stack, vm::Dictionary::SetMode mode, bool a
   stack.push_bool(res);
 }
 
-void interpret_dict_get_u(vm::Stack& stack, bool sgnd) {
+void interpret_dict_get(vm::Stack& stack, int sgnd, int mode) {
   int n = stack.pop_smallint_range(vm::Dictionary::max_key_bits);
   vm::Dictionary dict{stack.pop_maybe_cell(), n};
   unsigned char buffer[vm::Dictionary::max_key_bytes];
-  vm::BitSlice key = dict.integer_key(stack.pop_int(), n, sgnd, buffer);
+  vm::BitSlice key =
+      (sgnd >= 0) ? dict.integer_key(stack.pop_int(), n, sgnd, buffer) : stack.pop_cellslice()->prefetch_bits(n);
   if (!key.is_valid()) {
     throw IntError{"not enough bits for a dictionary key"};
   }
-  auto res = dict.lookup(std::move(key));
-  if (res.not_null()) {
+  auto res = (mode & 4 ? dict.lookup_delete(std::move(key)) : dict.lookup(std::move(key)));
+  if (mode & 4) {
+    stack.push_maybe_cell(std::move(dict).extract_root_cell());
+  }
+  bool found = res.not_null();
+  if (found && (mode & 2)) {
     stack.push_cellslice(std::move(res));
-    stack.push_bool(true);
-  } else {
-    stack.push_bool(false);
+  }
+  if (mode & 1) {
+    stack.push_bool(found);
   }
 }
 
-void interpret_dict_map(IntCtx& ctx) {
+void interpret_dict_map(IntCtx& ctx, bool ext, bool sgnd) {
   auto func = pop_exec_token(ctx);
   int n = ctx.stack.pop_smallint_range(vm::Dictionary::max_key_bits);
-  vm::Dictionary dict{ctx.stack.pop_maybe_cell(), n};
-  vm::Dictionary::simple_map_func_t simple_map = [&ctx, func](vm::CellBuilder& cb, Ref<vm::CellSlice> cs_ref) -> bool {
-    ctx.stack.push_builder(Ref<vm::CellBuilder>(cb));
-    ctx.stack.push_cellslice(std::move(cs_ref));
-    func->run(ctx);
-    assert(cb.is_unique());
-    if (!ctx.stack.pop_bool()) {
-      return false;
+  vm::Dictionary dict{ctx.stack.pop_maybe_cell(), n}, dict2{n};
+  for (auto entry : dict.range(false, sgnd)) {
+    ctx.stack.push_builder(Ref<vm::CellBuilder>{true});
+    if (ext) {
+      ctx.stack.push_int(dict.key_as_integer(entry.first, sgnd));
+    }
+    ctx.stack.push_cellslice(std::move(entry.second));
+    func->run(ctx);
+    if (ctx.stack.pop_bool()) {
+      if (!dict2.set_builder(entry.first, n, ctx.stack.pop_builder())) {
+        throw IntError{"cannot insert value into dictionary"};
+      }
     }
-    Ref<vm::CellBuilder> cb_ref = ctx.stack.pop_builder();
-    cb = *cb_ref;
-    return true;
   };
-  dict.map(std::move(simple_map));
-  ctx.stack.push_maybe_cell(std::move(dict).extract_root_cell());
+  ctx.stack.push_maybe_cell(std::move(dict2).extract_root_cell());
 }
 
-void interpret_dict_map_ext(IntCtx& ctx) {
+void interpret_dict_foreach(IntCtx& ctx, bool reverse, bool sgnd) {
   auto func = pop_exec_token(ctx);
   int n = ctx.stack.pop_smallint_range(vm::Dictionary::max_key_bits);
   vm::Dictionary dict{ctx.stack.pop_maybe_cell(), n};
-  vm::Dictionary::map_func_t map_func = [&ctx, func](vm::CellBuilder& cb, Ref<vm::CellSlice> cs_ref,
-                                                     td::ConstBitPtr key, int key_len) -> bool {
-    ctx.stack.push_builder(Ref<vm::CellBuilder>(cb));
-    td::RefInt256 x{true};
-    x.unique_write().import_bits(key, key_len, false);
-    ctx.stack.push_int(std::move(x));
-    ctx.stack.push_cellslice(std::move(cs_ref));
+  for (auto entry : dict.range(reverse, sgnd)) {
+    ctx.stack.push_int(dict.key_as_integer(entry.first, sgnd));
+    ctx.stack.push_cellslice(std::move(entry.second));
     func->run(ctx);
-    assert(cb.is_unique());
     if (!ctx.stack.pop_bool()) {
-      return false;
+      ctx.stack.push_bool(false);
+      return;
     }
-    Ref<vm::CellBuilder> cb_ref = ctx.stack.pop_builder();
-    cb = *cb_ref;
-    return true;
   };
-  dict.map(std::move(map_func));
-  ctx.stack.push_maybe_cell(std::move(dict).extract_root_cell());
+  ctx.stack.push_bool(true);
 }
 
-void interpret_dict_foreach(IntCtx& ctx) {
+// mode: +1 = reverse, +2 = signed, +4 = strict, +8 = lookup backwards, +16 = with hint
+void interpret_dict_foreach_from(IntCtx& ctx, int mode) {
+  if (mode < 0) {
+    mode = ctx.stack.pop_smallint_range(31);
+  }
   auto func = pop_exec_token(ctx);
   int n = ctx.stack.pop_smallint_range(vm::Dictionary::max_key_bits);
   vm::Dictionary dict{ctx.stack.pop_maybe_cell(), n};
-  vm::Dictionary::foreach_func_t foreach_func = [&ctx, func](Ref<vm::CellSlice> cs_ref, td::ConstBitPtr key,
-                                                             int key_len) -> bool {
-    td::RefInt256 x{true};
-    x.unique_write().import_bits(key, key_len, false);
-    ctx.stack.push_int(std::move(x));
-    ctx.stack.push_cellslice(std::move(cs_ref));
+  vm::DictIterator it{dict, mode & 3};
+  unsigned char buffer[vm::Dictionary::max_key_bytes];
+  for (int s = (mode >> 4) & 1; s >= 0; --s) {
+    auto key = dict.integer_key(ctx.stack.pop_int(), n, mode & 2, buffer);
+    if (!key.is_valid()) {
+      throw IntError{"not enough bits for a dictionary key"};
+    }
+    it.lookup(key, mode & 4, mode & 8);
+  }
+  for (; !it.eof(); ++it) {
+    ctx.stack.push_int(dict.key_as_integer(it.cur_pos(), mode & 2));
+    ctx.stack.push_cellslice(it.cur_value());
     func->run(ctx);
-    return ctx.stack.pop_bool();
+    if (!ctx.stack.pop_bool()) {
+      ctx.stack.push_bool(false);
+      return;
+    }
   };
-  ctx.stack.push_bool(dict.check_for_each(std::move(foreach_func)));
+  ctx.stack.push_bool(true);
 }
 
 void interpret_dict_merge(IntCtx& ctx) {
@@ -1584,24 +1622,33 @@ void interpret_dict_merge(IntCtx& ctx) {
   int n = ctx.stack.pop_smallint_range(vm::Dictionary::max_key_bits);
   vm::Dictionary dict2{ctx.stack.pop_maybe_cell(), n};
   vm::Dictionary dict1{ctx.stack.pop_maybe_cell(), n};
-  vm::Dictionary::simple_combine_func_t simple_combine = [&ctx, func](vm::CellBuilder& cb, Ref<vm::CellSlice> cs1_ref,
-                                                                      Ref<vm::CellSlice> cs2_ref) -> bool {
-    ctx.stack.push_builder(Ref<vm::CellBuilder>(cb));
-    ctx.stack.push_cellslice(std::move(cs1_ref));
-    ctx.stack.push_cellslice(std::move(cs2_ref));
-    func->run(ctx);
-    assert(cb.is_unique());
-    if (!ctx.stack.pop_bool()) {
-      return false;
+  vm::Dictionary dict3{n};
+  auto it1 = dict1.begin(), it2 = dict2.begin();
+  while (!it1.eof() || !it2.eof()) {
+    int c = it1.eof() ? 1 : (it2.eof() ? -1 : it1.cur_pos().compare(it2.cur_pos(), n));
+    bool ok = true;
+    if (c < 0) {
+      ok = dict3.set(it1.cur_pos(), n, it1.cur_value());
+      ++it1;
+    } else if (c > 0) {
+      ok = dict3.set(it2.cur_pos(), n, it2.cur_value());
+      ++it2;
+    } else {
+      ctx.stack.push_builder(Ref<vm::CellBuilder>{true});
+      ctx.stack.push_cellslice(it1.cur_value());
+      ctx.stack.push_cellslice(it2.cur_value());
+      func->run(ctx);
+      if (ctx.stack.pop_bool()) {
+        ok = dict3.set_builder(it1.cur_pos(), n, ctx.stack.pop_builder());
+      }
+      ++it1;
+      ++it2;
+    }
+    if (!ok) {
+      throw IntError{"cannot insert value into dictionary"};
     }
-    Ref<vm::CellBuilder> cb_ref = ctx.stack.pop_builder();
-    cb = *cb_ref;
-    return true;
-  };
-  if (!dict1.combine_with(dict2, std::move(simple_combine))) {
-    throw IntError{"cannot combine dictionaries"};
   }
-  ctx.stack.push_maybe_cell(std::move(dict1).extract_root_cell());
+  ctx.stack.push_maybe_cell(std::move(dict3).extract_root_cell());
 }
 
 void interpret_dict_diff(IntCtx& ctx) {
@@ -1609,17 +1656,40 @@ void interpret_dict_diff(IntCtx& ctx) {
   int n = ctx.stack.pop_smallint_range(vm::Dictionary::max_key_bits);
   vm::Dictionary dict2{ctx.stack.pop_maybe_cell(), n};
   vm::Dictionary dict1{ctx.stack.pop_maybe_cell(), n};
-  vm::Dictionary::scan_diff_func_t scan_value_pair =
-      [&ctx, func](td::ConstBitPtr key, int key_len, Ref<vm::CellSlice> cs1_ref, Ref<vm::CellSlice> cs2_ref) -> bool {
-    td::RefInt256 x{true};
-    x.unique_write().import_bits(key, key_len, false);
-    ctx.stack.push_int(std::move(x));
-    ctx.stack.push_maybe_cellslice(std::move(cs1_ref));
-    ctx.stack.push_maybe_cellslice(std::move(cs2_ref));
-    func->run(ctx);
-    return ctx.stack.pop_bool();
-  };
-  ctx.stack.push_bool(dict1.scan_diff(dict2, std::move(scan_value_pair)));
+  auto it1 = dict1.begin(), it2 = dict2.begin();
+  while (!it1.eof() || !it2.eof()) {
+    int c = it1.eof() ? 1 : (it2.eof() ? -1 : it1.cur_pos().compare(it2.cur_pos(), n));
+    bool run = true;
+    if (c < 0) {
+      ctx.stack.push_int(dict1.key_as_integer(it1.cur_pos()));
+      ctx.stack.push_cellslice(it1.cur_value());
+      ctx.stack.push_null();
+      ++it1;
+    } else if (c > 0) {
+      ctx.stack.push_int(dict2.key_as_integer(it2.cur_pos()));
+      ctx.stack.push_null();
+      ctx.stack.push_cellslice(it2.cur_value());
+      ++it2;
+    } else {
+      if (!it1.cur_value()->contents_equal(*it2.cur_value())) {
+        ctx.stack.push_int(dict1.key_as_integer(it1.cur_pos()));
+        ctx.stack.push_cellslice(it1.cur_value());
+        ctx.stack.push_cellslice(it2.cur_value());
+      } else {
+        run = false;
+      }
+      ++it1;
+      ++it2;
+    }
+    if (run) {
+      func->run(ctx);
+      if (!ctx.stack.pop_bool()) {
+        ctx.stack.push_bool(false);
+        return;
+      }
+    }
+  }
+  ctx.stack.push_bool(true);
 }
 
 void interpret_pfx_dict_add(vm::Stack& stack, vm::Dictionary::SetMode mode, bool add_builder) {
@@ -1858,7 +1928,7 @@ int parse_number(std::string s, td::RefInt256& num, td::RefInt256& denom, bool a
   const char* str = s.c_str();
   int len = (int)s.size();
   int frac = -1, base, *frac_ptr = allow_frac ? &frac : nullptr;
-  num = td::RefInt256{true};
+  num = td::make_refint();
   auto& x = num.unique_write();
   if (len >= 4 && str[0] == '-' && str[1] == '0' && (str[2] == 'x' || str[2] == 'b')) {
     if (str[2] == 'x') {
@@ -1900,7 +1970,7 @@ int parse_number(std::string s, td::RefInt256& num, td::RefInt256& denom, bool a
   if (frac < 0) {
     return 1;
   } else {
-    denom = td::RefInt256{true, 1};
+    denom = td::make_refint(1);
     while (frac-- > 0) {
       if (!denom.unique_write().mul_tiny(base).normalize_bool()) {
         if (throw_error) {
@@ -2141,6 +2211,7 @@ class StringLogger : public td::LogInterface {
   }
   std::string res;
 };
+
 class OstreamLogger : public td::LogInterface {
  public:
   explicit OstreamLogger(std::ostream* stream) : stream_(stream) {
@@ -2163,59 +2234,42 @@ std::vector<Ref<vm::Cell>> get_vm_libraries() {
   }
 }
 
-void interpret_run_vm_code(IntCtx& ctx, bool with_gas) {
-  long long gas_limit = with_gas ? ctx.stack.pop_long_range(vm::GasLimits::infty) : vm::GasLimits::infty;
-  auto cs = ctx.stack.pop_cellslice();
-  OstreamLogger ostream_logger(ctx.error_stream);
-  auto log = create_vm_log(ctx.error_stream ? &ostream_logger : nullptr);
-  vm::GasLimits gas{gas_limit};
-  int res = vm::run_vm_code(cs, ctx.stack, 0, nullptr, log, nullptr, &gas, get_vm_libraries());
-  ctx.stack.push_smallint(res);
-  if (with_gas) {
-    ctx.stack.push_smallint(gas.gas_consumed());
+// mode: -1 = pop from stack
+// +1 = same_c3 (set c3 to code)
+// +2 = push_0 (push an implicit 0 before running the code)
+// +4 = load c4 (persistent data) from stack and return its final value
+// +8 = load gas limit from stack and return consumed gas
+// +16 = load c7 (smart-contract context)
+// +32 = return c5 (actions)
+// +64 = log vm ops to stderr
+void interpret_run_vm(IntCtx& ctx, int mode) {
+  if (mode < 0) {
+    mode = ctx.stack.pop_smallint_range(0xff);
   }
-}
-
-void interpret_run_vm_dict(IntCtx& ctx, bool with_gas) {
-  long long gas_limit = with_gas ? ctx.stack.pop_long_range(vm::GasLimits::infty) : vm::GasLimits::infty;
-  auto cs = ctx.stack.pop_cellslice();
-  OstreamLogger ostream_logger(ctx.error_stream);
-  auto log = create_vm_log(ctx.error_stream ? &ostream_logger : nullptr);
-  vm::GasLimits gas{gas_limit};
-  int res = vm::run_vm_code(cs, ctx.stack, 3, nullptr, log, nullptr, &gas, get_vm_libraries());
-  ctx.stack.push_smallint(res);
-  if (with_gas) {
-    ctx.stack.push_smallint(gas.gas_consumed());
+  bool with_data = mode & 4;
+  Ref<vm::Tuple> c7;
+  Ref<vm::Cell> data, actions;
+  long long gas_limit = (mode & 8) ? ctx.stack.pop_long_range(vm::GasLimits::infty) : vm::GasLimits::infty;
+  if (mode & 16) {
+    c7 = ctx.stack.pop_tuple();
   }
-}
-
-void interpret_run_vm(IntCtx& ctx, bool with_gas) {
-  long long gas_limit = with_gas ? ctx.stack.pop_long_range(vm::GasLimits::infty) : vm::GasLimits::infty;
-  auto data = ctx.stack.pop_cell();
-  auto cs = ctx.stack.pop_cellslice();
-  OstreamLogger ostream_logger(ctx.error_stream);
-  auto log = create_vm_log(ctx.error_stream ? &ostream_logger : nullptr);
-  vm::GasLimits gas{gas_limit};
-  int res = vm::run_vm_code(cs, ctx.stack, 1, &data, log, nullptr, &gas, get_vm_libraries());
-  ctx.stack.push_smallint(res);
-  ctx.stack.push_cell(std::move(data));
-  if (with_gas) {
-    ctx.stack.push_smallint(gas.gas_consumed());
+  if (with_data) {
+    data = ctx.stack.pop_cell();
   }
-}
-
-void interpret_run_vm_c7(IntCtx& ctx, bool with_gas) {
-  long long gas_limit = with_gas ? ctx.stack.pop_long_range(vm::GasLimits::infty) : vm::GasLimits::infty;
-  auto c7 = ctx.stack.pop_tuple();
-  auto data = ctx.stack.pop_cell();
   auto cs = ctx.stack.pop_cellslice();
   OstreamLogger ostream_logger(ctx.error_stream);
-  auto log = create_vm_log(ctx.error_stream ? &ostream_logger : nullptr);
+  auto log = create_vm_log((mode & 64) && ctx.error_stream ? &ostream_logger : nullptr);
   vm::GasLimits gas{gas_limit};
-  int res = vm::run_vm_code(cs, ctx.stack, 1, &data, log, nullptr, &gas, get_vm_libraries(), std::move(c7));
+  int res =
+      vm::run_vm_code(cs, ctx.stack, mode & 3, &data, log, nullptr, &gas, get_vm_libraries(), std::move(c7), &actions);
   ctx.stack.push_smallint(res);
-  ctx.stack.push_cell(std::move(data));
-  if (with_gas) {
+  if (with_data) {
+    ctx.stack.push_cell(std::move(data));
+  }
+  if (mode & 32) {
+    ctx.stack.push_cell(std::move(actions));
+  }
+  if (mode & 8) {
     ctx.stack.push_smallint(gas.gas_consumed());
   }
 }
@@ -2328,12 +2382,57 @@ void interpret_db_run_vm_parallel(IntCtx& ctx) {
   do_interpret_db_run_vm_parallel(ctx.error_stream, ctx.stack, ctx.ton_db, threads_n, tasks_n);
 }
 
+void interpret_store_vm_cont(vm::Stack& stack) {
+  auto vmcont = stack.pop_cont();
+  auto cb = stack.pop_builder();
+  if (!vmcont->serialize(cb.write())) {
+    throw IntError{"cannot serialize vm continuation"};
+  }
+  stack.push_builder(std::move(cb));
+}
+
+void interpret_fetch_vm_cont(vm::Stack& stack) {
+  auto cs = stack.pop_cellslice();
+  auto vmcont = vm::Continuation::deserialize(cs.write());
+  if (vmcont.is_null()) {
+    throw IntError{"cannot deserialize vm continuation"};
+  }
+  stack.push_cellslice(std::move(cs));
+  stack.push_cont(std::move(vmcont));
+}
+
+Ref<vm::Box> cmdline_args{true};
+
+void interpret_get_fixed_cmdline_arg(vm::Stack& stack, int n) {
+  if (!n) {
+    return;
+  }
+  auto v = cmdline_args->get();
+  while (true) {
+    if (v.empty()) {
+      stack.push(vm::StackEntry{});
+      return;
+    }
+    auto t = v.as_tuple_range(2, 2);
+    if (t.is_null()) {
+      throw IntError{"invalid cmdline arg list"};
+    }
+    if (!--n) {
+      stack.push(t->at(0));
+      return;
+    }
+    v = t->at(1);
+  }
+}
+
 // n -- executes $n
 void interpret_get_cmdline_arg(IntCtx& ctx) {
   int n = ctx.stack.pop_smallint_range(999999);
-  char buffer[14];
-  sprintf(buffer, "$%d ", n);
-  auto entry = ctx.dictionary->lookup(std::string{buffer});
+  if (n) {
+    interpret_get_fixed_cmdline_arg(ctx.stack, n);
+    return;
+  }
+  auto entry = ctx.dictionary->lookup("$0 ");
   if (!entry) {
     throw IntError{"-?"};
   } else {
@@ -2341,6 +2440,19 @@ void interpret_get_cmdline_arg(IntCtx& ctx) {
   }
 }
 
+void interpret_get_cmdline_arg_count(vm::Stack& stack) {
+  auto v = cmdline_args->get();
+  int cnt;
+  for (cnt = 0; !v.empty(); cnt++) {
+    auto t = v.as_tuple_range(2, 2);
+    if (t.is_null()) {
+      throw IntError{"invalid cmdline arg list"};
+    }
+    v = t->at(1);
+  }
+  stack.push_smallint(cnt);
+}
+
 void interpret_getenv(vm::Stack& stack) {
   auto str = stack.pop_string();
   auto value = str.size() < 1024 ? getenv(str.c_str()) : nullptr;
@@ -2434,10 +2546,12 @@ void init_words_common(Dictionary& d) {
   d.def_ctx_word("csr. ", interpret_dot_cellslice_rec);
   d.def_ctx_word(".s ", interpret_dotstack);
   d.def_ctx_word(".sl ", interpret_dotstack_list);
+  d.def_ctx_word(".sL ", interpret_dotstack_list_dump);  // TMP
   d.def_ctx_word(".dump ", interpret_dump);
   d.def_ctx_word(".l ", interpret_print_list);
   d.def_ctx_word(".tc ", interpret_dottc);
   d.def_stack_word("(dump) ", interpret_dump_internal);
+  d.def_stack_word("(ldump) ", interpret_list_dump_internal);
   d.def_stack_word("(.) ", interpret_dot_internal);
   d.def_stack_word("(x.) ", std::bind(interpret_dothex_internal, _1, false));
   d.def_stack_word("(X.) ", std::bind(interpret_dothex_internal, _1, true));
@@ -2558,6 +2672,7 @@ void init_words_common(Dictionary& d) {
   d.def_stack_word("$= ", interpret_str_equal);
   d.def_stack_word("$cmp ", interpret_str_cmp);
   d.def_stack_word("$reverse ", interpret_str_reverse);
+  d.def_stack_word("$pos ", interpret_str_pos);
   d.def_stack_word("(-trailing) ", std::bind(interpret_str_remove_trailing_int, _1, 0));
   d.def_stack_word("-trailing ", std::bind(interpret_str_remove_trailing_int, _1, ' '));
   d.def_stack_word("-trailing0 ", std::bind(interpret_str_remove_trailing_int, _1, '0'));
@@ -2565,6 +2680,7 @@ void init_words_common(Dictionary& d) {
   d.def_stack_word("Blen ", interpret_bytes_len);
   d.def_stack_word("$Len ", interpret_utf8_str_len);
   d.def_stack_word("$Split ", interpret_utf8_str_split);
+  d.def_stack_word("$Pos ", interpret_utf8_str_pos);
   d.def_ctx_word("Bx. ", std::bind(interpret_bytes_hex_print_raw, _1, true));
   d.def_stack_word("B>X ", std::bind(interpret_bytes_to_hex, _1, true));
   d.def_stack_word("B>x ", std::bind(interpret_bytes_to_hex, _1, false));
@@ -2669,22 +2785,38 @@ void init_words_common(Dictionary& d) {
   d.def_stack_word("dict, ", interpret_store_dict);
   d.def_stack_word("dict@ ", std::bind(interpret_load_dict, _1, false));
   d.def_stack_word("dict@+ ", std::bind(interpret_load_dict, _1, true));
-  d.def_stack_word("udict!+ ", std::bind(interpret_dict_add_u, _1, vm::Dictionary::SetMode::Add, false, false));
-  d.def_stack_word("udict! ", std::bind(interpret_dict_add_u, _1, vm::Dictionary::SetMode::Set, false, false));
-  d.def_stack_word("b>udict!+ ", std::bind(interpret_dict_add_u, _1, vm::Dictionary::SetMode::Add, true, false));
-  d.def_stack_word("b>udict! ", std::bind(interpret_dict_add_u, _1, vm::Dictionary::SetMode::Set, true, false));
-  d.def_stack_word("udict@ ", std::bind(interpret_dict_get_u, _1, false));
-  d.def_stack_word("idict!+ ", std::bind(interpret_dict_add_u, _1, vm::Dictionary::SetMode::Add, false, true));
-  d.def_stack_word("idict! ", std::bind(interpret_dict_add_u, _1, vm::Dictionary::SetMode::Set, false, true));
-  d.def_stack_word("b>idict!+ ", std::bind(interpret_dict_add_u, _1, vm::Dictionary::SetMode::Add, true, true));
-  d.def_stack_word("b>idict! ", std::bind(interpret_dict_add_u, _1, vm::Dictionary::SetMode::Set, true, true));
-  d.def_stack_word("idict@ ", std::bind(interpret_dict_get_u, _1, true));
+  d.def_stack_word("sdict!+ ", std::bind(interpret_dict_add, _1, vm::Dictionary::SetMode::Add, false, -1));
+  d.def_stack_word("sdict! ", std::bind(interpret_dict_add, _1, vm::Dictionary::SetMode::Set, false, -1));
+  d.def_stack_word("b>sdict!+ ", std::bind(interpret_dict_add, _1, vm::Dictionary::SetMode::Add, true, -1));
+  d.def_stack_word("b>sdict! ", std::bind(interpret_dict_add, _1, vm::Dictionary::SetMode::Set, true, -1));
+  d.def_stack_word("sdict@ ", std::bind(interpret_dict_get, _1, -1, 3));
+  d.def_stack_word("sdict@- ", std::bind(interpret_dict_get, _1, -1, 7));
+  d.def_stack_word("sdict- ", std::bind(interpret_dict_get, _1, -1, 5));
+  d.def_stack_word("udict!+ ", std::bind(interpret_dict_add, _1, vm::Dictionary::SetMode::Add, false, 0));
+  d.def_stack_word("udict! ", std::bind(interpret_dict_add, _1, vm::Dictionary::SetMode::Set, false, 0));
+  d.def_stack_word("b>udict!+ ", std::bind(interpret_dict_add, _1, vm::Dictionary::SetMode::Add, true, 0));
+  d.def_stack_word("b>udict! ", std::bind(interpret_dict_add, _1, vm::Dictionary::SetMode::Set, true, 0));
+  d.def_stack_word("udict@ ", std::bind(interpret_dict_get, _1, 0, 3));
+  d.def_stack_word("udict@- ", std::bind(interpret_dict_get, _1, 0, 7));
+  d.def_stack_word("udict- ", std::bind(interpret_dict_get, _1, 0, 5));
+  d.def_stack_word("idict!+ ", std::bind(interpret_dict_add, _1, vm::Dictionary::SetMode::Add, false, 1));
+  d.def_stack_word("idict! ", std::bind(interpret_dict_add, _1, vm::Dictionary::SetMode::Set, false, 1));
+  d.def_stack_word("b>idict!+ ", std::bind(interpret_dict_add, _1, vm::Dictionary::SetMode::Add, true, 1));
+  d.def_stack_word("b>idict! ", std::bind(interpret_dict_add, _1, vm::Dictionary::SetMode::Set, true, 1));
+  d.def_stack_word("idict@ ", std::bind(interpret_dict_get, _1, 1, 3));
+  d.def_stack_word("idict@- ", std::bind(interpret_dict_get, _1, 1, 7));
+  d.def_stack_word("idict- ", std::bind(interpret_dict_get, _1, 1, 5));
   d.def_stack_word("pfxdict!+ ", std::bind(interpret_pfx_dict_add, _1, vm::Dictionary::SetMode::Add, false));
   d.def_stack_word("pfxdict! ", std::bind(interpret_pfx_dict_add, _1, vm::Dictionary::SetMode::Set, false));
   d.def_stack_word("pfxdict@ ", interpret_pfx_dict_get);
-  d.def_ctx_word("dictmap ", interpret_dict_map);
-  d.def_ctx_word("dictmapext ", interpret_dict_map_ext);
-  d.def_ctx_word("dictforeach ", interpret_dict_foreach);
+  d.def_ctx_word("dictmap ", std::bind(interpret_dict_map, _1, false, false));
+  d.def_ctx_word("dictmapext ", std::bind(interpret_dict_map, _1, true, false));
+  d.def_ctx_word("idictmapext ", std::bind(interpret_dict_map, _1, true, true));
+  d.def_ctx_word("dictforeach ", std::bind(interpret_dict_foreach, _1, false, false));
+  d.def_ctx_word("idictforeach ", std::bind(interpret_dict_foreach, _1, false, true));
+  d.def_ctx_word("dictforeachrev ", std::bind(interpret_dict_foreach, _1, true, false));
+  d.def_ctx_word("idictforeachrev ", std::bind(interpret_dict_foreach, _1, true, true));
+  d.def_ctx_word("dictforeachfromx ", std::bind(interpret_dict_foreach_from, _1, -1));
   d.def_ctx_word("dictmerge ", interpret_dict_merge);
   d.def_ctx_word("dictdiff ", interpret_dict_diff);
   // slice/bitstring constants
@@ -2756,6 +2888,10 @@ void init_words_common(Dictionary& d) {
   d.def_ctx_word("quit ", interpret_quit);
   d.def_ctx_word("bye ", interpret_bye);
   d.def_stack_word("halt ", interpret_halt);
+  // cmdline args
+  d.def_stack_word("$* ", std::bind(interpret_literal, _1, vm::StackEntry{cmdline_args}));
+  d.def_stack_word("$# ", interpret_get_cmdline_arg_count);
+  d.def_ctx_word("$() ", interpret_get_cmdline_arg);
 }
 
 void init_words_ton(Dictionary& d) {
@@ -2768,34 +2904,34 @@ void init_words_ton(Dictionary& d) {
   d.def_stack_word("base64url>B ", std::bind(interpret_base64_to_bytes, _1, true, false));
 }
 
-void init_words_vm(Dictionary& d) {
+void init_words_vm(Dictionary& d, bool enable_debug) {
   using namespace std::placeholders;
-  vm::init_op_cp0();
+  vm::init_op_cp0(enable_debug);
   // vm run
   d.def_stack_word("vmlibs ", std::bind(interpret_literal, _1, vm::StackEntry{vm_libraries}));
-  d.def_ctx_word("runvmcode ", std::bind(interpret_run_vm_code, _1, false));
-  d.def_ctx_word("gasrunvmcode ", std::bind(interpret_run_vm_code, _1, true));
-  d.def_ctx_word("runvmdict ", std::bind(interpret_run_vm_dict, _1, false));
-  d.def_ctx_word("gasrunvmdict ", std::bind(interpret_run_vm_dict, _1, true));
-  d.def_ctx_word("runvm ", std::bind(interpret_run_vm, _1, false));
-  d.def_ctx_word("gasrunvm ", std::bind(interpret_run_vm, _1, true));
-  d.def_ctx_word("runvmctx ", std::bind(interpret_run_vm_c7, _1, false));
-  d.def_ctx_word("gasrunvmctx ", std::bind(interpret_run_vm_c7, _1, true));
+  // d.def_ctx_word("runvmcode ", std::bind(interpret_run_vm, _1, 0x40));
+  // d.def_ctx_word("runvm ", std::bind(interpret_run_vm, _1, 0x45));
+  d.def_ctx_word("runvmx ", std::bind(interpret_run_vm, _1, -1));
   d.def_ctx_word("dbrunvm ", interpret_db_run_vm);
   d.def_ctx_word("dbrunvm-parallel ", interpret_db_run_vm_parallel);
+  d.def_stack_word("vmcont, ", interpret_store_vm_cont);
+  d.def_stack_word("vmcont@ ", interpret_fetch_vm_cont);
 }
 
 void import_cmdline_args(Dictionary& d, std::string arg0, int n, const char* const argv[]) {
   using namespace std::placeholders;
   LOG(DEBUG) << "import_cmdlist_args(" << arg0 << "," << n << ")";
   d.def_stack_word("$0 ", std::bind(interpret_literal, _1, vm::StackEntry{arg0}));
-  for (int i = 0; i < n; i++) {
-    char buffer[14];
-    sprintf(buffer, "$%d ", i + 1);
-    d.def_stack_word(buffer, std::bind(interpret_literal, _1, vm::StackEntry{argv[i]}));
+  vm::StackEntry list;
+  for (int i = n - 1; i >= 0; i--) {
+    list = vm::StackEntry::cons(vm::StackEntry{argv[i]}, list);
+  }
+  cmdline_args->set(std::move(list));
+  for (int i = 1; i <= n; i++) {
+    char buffer[14];
+    sprintf(buffer, "$%d ", i);
+    d.def_stack_word(buffer, std::bind(interpret_get_fixed_cmdline_arg, _1, i));
   }
-  d.def_stack_word("$# ", std::bind(interpret_const, _1, n));
-  d.def_ctx_word("$() ", interpret_get_cmdline_arg);
 }
 
 std::pair<td::RefInt256, td::RefInt256> numeric_value_ext(std::string s, bool allow_frac = true) {
diff --git a/submodules/ton/tonlib-src/crypto/fift/words.h b/submodules/ton/tonlib-src/crypto/fift/words.h
index eac182e43b..de5b438930 100644
--- a/submodules/ton/tonlib-src/crypto/fift/words.h
+++ b/submodules/ton/tonlib-src/crypto/fift/words.h
@@ -14,7 +14,7 @@
     You should have received a copy of the GNU Lesser General Public License
     along with TON Blockchain Library.  If not, see <http://www.gnu.org/licenses/>.
 
-    Copyright 2017-2019 Telegram Systems LLP
+    Copyright 2017-2020 Telegram Systems LLP
 */
 #pragma once
 #include "Dictionary.h"
@@ -33,7 +33,7 @@ struct Quit {
 struct SkipToEof {};
 
 void init_words_common(Dictionary& dictionary);
-void init_words_vm(Dictionary& dictionary);
+void init_words_vm(Dictionary& dictionary, bool debug_enabled = false);
 void init_words_ton(Dictionary& dictionary);
 
 void import_cmdline_args(Dictionary& d, std::string arg0, int n, const char* const argv[]);
diff --git a/submodules/ton/tonlib-src/crypto/func/abscode.cpp b/submodules/ton/tonlib-src/crypto/func/abscode.cpp
index 8ff204f13c..8d73c80540 100644
--- a/submodules/ton/tonlib-src/crypto/func/abscode.cpp
+++ b/submodules/ton/tonlib-src/crypto/func/abscode.cpp
@@ -14,7 +14,7 @@
     You should have received a copy of the GNU Lesser General Public License
     along with TON Blockchain Library.  If not, see <http://www.gnu.org/licenses/>.
 
-    Copyright 2017-2019 Telegram Systems LLP
+    Copyright 2017-2020 Telegram Systems LLP
 */
 #include "func.h"
 
@@ -138,7 +138,7 @@ void VarDescr::show(std::ostream& os, const char* name) const {
 }
 
 void VarDescr::set_const(long long value) {
-  return set_const(td::RefInt256{true, value});
+  return set_const(td::make_refint(value));
 }
 
 void VarDescr::set_const(td::RefInt256 value) {
@@ -169,7 +169,7 @@ void VarDescr::set_const(td::RefInt256 value) {
 }
 
 void VarDescr::set_const_nan() {
-  set_const(td::RefInt256{true});
+  set_const(td::make_refint());
 }
 
 void VarDescr::operator|=(const VarDescr& y) {
@@ -323,6 +323,20 @@ void Op::show(std::ostream& os, const std::vector<TmpVar>& vars, std::string pfx
       show_var_list(os, right, vars);
       os << std::endl;
       break;
+    case _Tuple:
+      os << pfx << dis << "MKTUPLE ";
+      show_var_list(os, left, vars);
+      os << " := ";
+      show_var_list(os, right, vars);
+      os << std::endl;
+      break;
+    case _UnTuple:
+      os << pfx << dis << "UNTUPLE ";
+      show_var_list(os, left, vars);
+      os << " := ";
+      show_var_list(os, right, vars);
+      os << std::endl;
+      break;
     case _IntConst:
       os << pfx << dis << "CONST ";
       show_var_list(os, left, vars);
@@ -343,6 +357,12 @@ void Op::show(std::ostream& os, const std::vector<TmpVar>& vars, std::string pfx
       show_var_list(os, left, vars);
       os << " := " << (fun_ref ? fun_ref->name() : "(null)") << std::endl;
       break;
+    case _SetGlob:
+      os << pfx << dis << "SETGLOB ";
+      os << (fun_ref ? fun_ref->name() : "(null)") << " := ";
+      show_var_list(os, right, vars);
+      os << std::endl;
+      break;
     case _Repeat:
       os << pfx << dis << "REPEAT ";
       show_var_list(os, left, vars);
diff --git a/submodules/ton/tonlib-src/crypto/func/analyzer.cpp b/submodules/ton/tonlib-src/crypto/func/analyzer.cpp
index a80bc74e23..5af435bc8e 100644
--- a/submodules/ton/tonlib-src/crypto/func/analyzer.cpp
+++ b/submodules/ton/tonlib-src/crypto/func/analyzer.cpp
@@ -14,7 +14,7 @@
     You should have received a copy of the GNU Lesser General Public License
     along with TON Blockchain Library.  If not, see <http://www.gnu.org/licenses/>.
 
-    Copyright 2017-2019 Telegram Systems LLP
+    Copyright 2017-2020 Telegram Systems LLP
 */
 #include "func.h"
 
@@ -29,6 +29,7 @@ namespace funC {
 void CodeBlob::simplify_var_types() {
   for (TmpVar& var : vars) {
     TypeExpr::remove_indirect(var.v_type);
+    var.v_type->recompute_width();
   }
 }
 
@@ -354,7 +355,9 @@ bool Op::compute_used_vars(const CodeBlob& code, bool edit) {
     case _IntConst:
     case _GlobVar:
     case _Call:
-    case _CallInd: {
+    case _CallInd:
+    case _Tuple:
+    case _UnTuple: {
       // left = EXEC right;
       if (!next_var_info.count_used(left) && is_pure()) {
         // all variables in `left` are not needed
@@ -365,6 +368,13 @@ bool Op::compute_used_vars(const CodeBlob& code, bool edit) {
       }
       return std_compute_used_vars();
     }
+    case _SetGlob: {
+      // GLOB = right
+      if (right.empty() && edit) {
+        disable();
+      }
+      return std_compute_used_vars(right.empty());
+    }
     case _Let: {
       // left = right
       std::size_t cnt = next_var_info.count_used(left);
@@ -431,26 +441,25 @@ bool Op::compute_used_vars(const CodeBlob& code, bool edit) {
     }
     case _While: {
       // while (block0 || left) block1;
-      // ... { block0 left block1 } block0 left next
-      VarDescrList after_cond_first{next_var_info};
-      after_cond_first += left;
-      code.compute_used_code_vars(block0, after_cond_first, false);
-      VarDescrList new_var_info{block0->var_info};
+      // ... block0 left { block1 block0 left } next
+      VarDescrList new_var_info{next_var_info};
       bool changes = false;
       do {
-        code.compute_used_code_vars(block1, block0->var_info, changes);
-        VarDescrList after_cond{block1->var_info};
+        VarDescrList after_cond{new_var_info};
         after_cond += left;
         code.compute_used_code_vars(block0, after_cond, changes);
+        code.compute_used_code_vars(block1, block0->var_info, changes);
         std::size_t n = new_var_info.size();
-        new_var_info += block0->var_info;
+        new_var_info += block1->var_info;
         new_var_info.clear_last();
         if (changes) {
           break;
         }
         changes = (new_var_info.size() == n);
       } while (changes <= edit);
-      return set_var_info(std::move(new_var_info));
+      new_var_info += left;
+      code.compute_used_code_vars(block0, new_var_info, edit);
+      return set_var_info(block0->var_info);
     }
     case _Until: {
       // until (block0 || left);
@@ -532,8 +541,11 @@ bool prune_unreachable(std::unique_ptr<Op>& ops) {
   switch (op.cl) {
     case Op::_IntConst:
     case Op::_GlobVar:
+    case Op::_SetGlob:
     case Op::_Call:
     case Op::_CallInd:
+    case Op::_Tuple:
+    case Op::_UnTuple:
     case Op::_Import:
       reach = true;
       break;
@@ -695,7 +707,6 @@ VarDescrList Op::fwd_analyze(VarDescrList values) {
       values.add_newval(left[0]).set_const(int_const);
       break;
     }
-    case _GlobVar:
     case _Call: {
       prepare_args(values);
       auto func = dynamic_cast<const SymValAsmFunc*>(fun_ref->value);
@@ -718,12 +729,17 @@ VarDescrList Op::fwd_analyze(VarDescrList values) {
       }
       break;
     }
+    case _Tuple:
+    case _UnTuple:
+    case _GlobVar:
     case _CallInd: {
       for (var_idx_t i : left) {
         values.add_newval(i);
       }
       break;
     }
+    case _SetGlob:
+      break;
     case _Let: {
       std::vector<VarDescr> old_val;
       assert(left.size() == right.size());
@@ -833,6 +849,9 @@ bool Op::mark_noreturn() {
     case _Import:
     case _IntConst:
     case _Let:
+    case _Tuple:
+    case _UnTuple:
+    case _SetGlob:
     case _GlobVar:
     case _CallInd:
     case _Call:
diff --git a/submodules/ton/tonlib-src/crypto/func/asmops.cpp b/submodules/ton/tonlib-src/crypto/func/asmops.cpp
index df4443a4d2..cb0fff1be1 100644
--- a/submodules/ton/tonlib-src/crypto/func/asmops.cpp
+++ b/submodules/ton/tonlib-src/crypto/func/asmops.cpp
@@ -14,7 +14,7 @@
     You should have received a copy of the GNU Lesser General Public License
     along with TON Blockchain Library.  If not, see <http://www.gnu.org/licenses/>.
 
-    Copyright 2017-2019 Telegram Systems LLP
+    Copyright 2017-2020 Telegram Systems LLP
 */
 #include "parser/srcread.h"
 #include "func.h"
@@ -121,12 +121,49 @@ AsmOp AsmOp::BlkDrop(int a) {
   return AsmOp::Custom(os.str(), a, 0);
 }
 
+AsmOp AsmOp::BlkDrop2(int a, int b) {
+  if (!b) {
+    return BlkDrop(a);
+  }
+  std::ostringstream os;
+  os << a << " " << b << " BLKDROP2";
+  return AsmOp::Custom(os.str(), a + b, b);
+}
+
 AsmOp AsmOp::BlkReverse(int a, int b) {
   std::ostringstream os;
   os << a << " " << b << " REVERSE";
   return AsmOp::Custom(os.str(), a + b, a + b);
 }
 
+AsmOp AsmOp::Tuple(int a) {
+  switch (a) {
+    case 1:
+      return AsmOp::Custom("SINGLE", 1, 1);
+    case 2:
+      return AsmOp::Custom("PAIR", 2, 1);
+    case 3:
+      return AsmOp::Custom("TRIPLE", 3, 1);
+  }
+  std::ostringstream os;
+  os << a << " TUPLE";
+  return AsmOp::Custom(os.str(), a, 1);
+}
+
+AsmOp AsmOp::UnTuple(int a) {
+  switch (a) {
+    case 1:
+      return AsmOp::Custom("UNSINGLE", 1, 1);
+    case 2:
+      return AsmOp::Custom("UNPAIR", 1, 2);
+    case 3:
+      return AsmOp::Custom("UNTRIPLE", 1, 3);
+  }
+  std::ostringstream os;
+  os << a << " UNTUPLE";
+  return AsmOp::Custom(os.str(), 1, a);
+}
+
 AsmOp AsmOp::IntConst(td::RefInt256 x) {
   if (x->signed_fits_bits(8)) {
     return AsmOp::Const(dec_string(std::move(x)) + " PUSHINT");
@@ -325,6 +362,8 @@ bool apply_op(StackTransform& trans, const AsmOp& op) {
       return trans.apply_pop(op.a);
     case AsmOp::a_const:
       return !op.a && op.b == 1 && trans.apply_push_newconst();
+    case AsmOp::a_custom:
+      return op.is_gconst() && trans.apply_push_newconst();
     default:
       return false;
   }
diff --git a/submodules/ton/tonlib-src/crypto/func/builtins.cpp b/submodules/ton/tonlib-src/crypto/func/builtins.cpp
index dd156f24c6..066da4602f 100644
--- a/submodules/ton/tonlib-src/crypto/func/builtins.cpp
+++ b/submodules/ton/tonlib-src/crypto/func/builtins.cpp
@@ -14,7 +14,7 @@
     You should have received a copy of the GNU Lesser General Public License
     along with TON Blockchain Library.  If not, see <http://www.gnu.org/licenses/>.
 
-    Copyright 2017-2019 Telegram Systems LLP
+    Copyright 2017-2020 Telegram Systems LLP
 */
 #include "func.h"
 
@@ -27,8 +27,8 @@ using namespace std::literals::string_literals;
  * 
  */
 
-int glob_func_cnt, undef_func_cnt;
-std::vector<SymDef*> glob_func;
+int glob_func_cnt, undef_func_cnt, glob_var_cnt;
+std::vector<SymDef*> glob_func, glob_vars;
 
 SymDef* predefine_builtin_func(std::string name, TypeExpr* func_type) {
   sym_idx_t name_idx = sym::symbols.lookup(name, 1);
@@ -44,30 +44,49 @@ SymDef* predefine_builtin_func(std::string name, TypeExpr* func_type) {
 }
 
 template <typename T>
-void define_builtin_func(std::string name, TypeExpr* func_type, const T& func, bool impure = false) {
+SymDef* define_builtin_func(std::string name, TypeExpr* func_type, const T& func, bool impure = false) {
   SymDef* def = predefine_builtin_func(name, func_type);
   def->value = new SymValAsmFunc{func_type, func, impure};
+  return def;
 }
 
 template <typename T>
-void define_builtin_func(std::string name, TypeExpr* func_type, const T& func, std::initializer_list<int> arg_order,
-                         std::initializer_list<int> ret_order = {}, bool impure = false) {
+SymDef* define_builtin_func(std::string name, TypeExpr* func_type, const T& func, std::initializer_list<int> arg_order,
+                            std::initializer_list<int> ret_order = {}, bool impure = false) {
   SymDef* def = predefine_builtin_func(name, func_type);
   def->value = new SymValAsmFunc{func_type, func, arg_order, ret_order, impure};
+  return def;
 }
 
-void define_builtin_func(std::string name, TypeExpr* func_type, const AsmOp& macro,
-                         std::initializer_list<int> arg_order, std::initializer_list<int> ret_order = {},
-                         bool impure = false) {
+SymDef* define_builtin_func(std::string name, TypeExpr* func_type, const AsmOp& macro,
+                            std::initializer_list<int> arg_order, std::initializer_list<int> ret_order = {},
+                            bool impure = false) {
   SymDef* def = predefine_builtin_func(name, func_type);
   def->value = new SymValAsmFunc{func_type, make_simple_compile(macro), arg_order, ret_order, impure};
+  return def;
 }
 
-bool SymValAsmFunc::compile(AsmOpList& dest, std::vector<VarDescr>& in, std::vector<VarDescr>& out) const {
+SymDef* force_autoapply(SymDef* def) {
+  if (def) {
+    auto val = dynamic_cast<SymVal*>(def->value);
+    if (val) {
+      val->auto_apply = true;
+    }
+  }
+  return def;
+}
+
+template <typename... Args>
+SymDef* define_builtin_const(std::string name, TypeExpr* const_type, Args&&... args) {
+  return force_autoapply(
+      define_builtin_func(name, TypeExpr::new_map(TypeExpr::new_unit(), const_type), std::forward<Args>(args)...));
+}
+
+bool SymValAsmFunc::compile(AsmOpList& dest, std::vector<VarDescr>& out, std::vector<VarDescr>& in) const {
   if (simple_compile) {
-    return dest.append(simple_compile(in, out));
+    return dest.append(simple_compile(out, in));
   } else if (ext_compile) {
-    return ext_compile(dest, in, out);
+    return ext_compile(dest, out, in);
   } else {
     return false;
   }
@@ -317,6 +336,12 @@ AsmOp exec_arg_op(std::string op, td::RefInt256 arg, int args, int retv) {
   return AsmOp::Custom(os.str(), args, retv);
 }
 
+AsmOp exec_arg2_op(std::string op, long long imm1, long long imm2, int args, int retv) {
+  std::ostringstream os;
+  os << imm1 << ' ' << imm2 << ' ' << op;
+  return AsmOp::Custom(os.str(), args, retv);
+}
+
 AsmOp push_const(td::RefInt256 x) {
   return AsmOp::IntConst(std::move(x));
 }
@@ -603,7 +628,7 @@ AsmOp compile_mod(std::vector<VarDescr>& res, std::vector<VarDescr>& args, int r
     if ((*y.int_const == 1 || *y.int_const == -1) && x.always_finite()) {
       x.unused();
       y.unused();
-      r.set_const(td::RefInt256{true, 0});
+      r.set_const(td::zero_refint());
       return push_const(r.int_const);
     }
     int k = is_pos_pow2(y.int_const);
@@ -740,7 +765,7 @@ AsmOp compile_cond_throw(std::vector<VarDescr>& res, std::vector<VarDescr>& args
     x.unused();
     return skip_cond ? exec_arg_op("THROW", x.int_const, 0, 0) : exec_arg_op("THROW"s + suff, x.int_const, 1, 0);
   } else {
-    return skip_cond ? exec_op("THROWANY", 1, 0) : exec_arg_op("THROWANY"s + suff, 2, 0);
+    return skip_cond ? exec_op("THROWANY", 1, 0) : exec_op("THROWANY"s + suff, 2, 0);
   }
 }
 
@@ -918,11 +943,11 @@ void define_builtins() {
   define_builtin_func("_<=_", arith_bin_op, std::bind(compile_cmp_int, _1, _2, 6));
   define_builtin_func("_>=_", arith_bin_op, std::bind(compile_cmp_int, _1, _2, 3));
   define_builtin_func("_<=>_", arith_bin_op, std::bind(compile_cmp_int, _1, _2, 7));
-  define_builtin_func("true", Int, /* AsmOp::Const("TRUE") */ std::bind(compile_bool_const, _1, _2, true));
-  define_builtin_func("false", Int, /* AsmOp::Const("FALSE") */ std::bind(compile_bool_const, _1, _2, false));
+  define_builtin_const("true", Int, /* AsmOp::Const("TRUE") */ std::bind(compile_bool_const, _1, _2, true));
+  define_builtin_const("false", Int, /* AsmOp::Const("FALSE") */ std::bind(compile_bool_const, _1, _2, false));
   // define_builtin_func("null", Null, AsmOp::Const("PUSHNULL"));
-  define_builtin_func("nil", Tuple, AsmOp::Const("PUSHNULL"));
-  define_builtin_func("Nil", Tuple, AsmOp::Const("NIL"));
+  define_builtin_const("nil", Tuple, AsmOp::Const("PUSHNULL"));
+  define_builtin_const("Nil", Tuple, AsmOp::Const("NIL"));
   define_builtin_func("null?", TypeExpr::new_forall({X}, TypeExpr::new_map(X, Int)), compile_is_null);
   define_builtin_func("throw", impure_un_op, compile_throw, true);
   define_builtin_func("throw_if", impure_bin_op, std::bind(compile_cond_throw, _1, _2, true), true);
@@ -949,7 +974,7 @@ void define_builtins() {
   define_builtin_func("~touch2", TypeExpr::new_forall({X, Y}, TypeExpr::new_map(XY, TypeExpr::new_tensor({XY, Unit}))),
                       AsmOp::Nop());
   define_builtin_func("~dump", TypeExpr::new_forall({X}, TypeExpr::new_map(X, TypeExpr::new_tensor({X, Unit}))),
-                      AsmOp::Custom("s0 DUMP", 1, 1));
+                      AsmOp::Custom("s0 DUMP", 1, 1), true);
   define_builtin_func("run_method0", TypeExpr::new_map(Int, Unit),
                       [](auto a, auto b, auto c) { return compile_run_method(a, b, c, 0, false); }, true);
   define_builtin_func("run_method1", TypeExpr::new_forall({X}, TypeExpr::new_map(TypeExpr::new_tensor({Int, X}), Unit)),
diff --git a/submodules/ton/tonlib-src/crypto/func/codegen.cpp b/submodules/ton/tonlib-src/crypto/func/codegen.cpp
index 70ae929df3..26d8215ea3 100644
--- a/submodules/ton/tonlib-src/crypto/func/codegen.cpp
+++ b/submodules/ton/tonlib-src/crypto/func/codegen.cpp
@@ -14,7 +14,7 @@
     You should have received a copy of the GNU Lesser General Public License
     along with TON Blockchain Library.  If not, see <http://www.gnu.org/licenses/>.
 
-    Copyright 2017-2019 Telegram Systems LLP
+    Copyright 2017-2020 Telegram Systems LLP
 */
 #include "func.h"
 
@@ -84,7 +84,9 @@ void Stack::forget_const() {
 
 void Stack::issue_pop(int i) {
   validate(i);
-  o << AsmOp::Pop(i);
+  if (output_enabled()) {
+    o << AsmOp::Pop(i);
+  }
   at(i) = get(0);
   s.pop_back();
   modified();
@@ -92,7 +94,9 @@ void Stack::issue_pop(int i) {
 
 void Stack::issue_push(int i) {
   validate(i);
-  o << AsmOp::Push(i);
+  if (output_enabled()) {
+    o << AsmOp::Push(i);
+  }
   s.push_back(get(i));
   modified();
 }
@@ -101,7 +105,9 @@ void Stack::issue_xchg(int i, int j) {
   validate(i);
   validate(j);
   if (i != j && get(i) != get(j)) {
-    o << AsmOp::Xchg(i, j);
+    if (output_enabled()) {
+      o << AsmOp::Xchg(i, j);
+    }
     std::swap(at(i), at(j));
     modified();
   }
@@ -183,6 +189,10 @@ void Stack::enforce_state(const StackLayout& req_stack) {
     if (i < depth() && s[i].first == x) {
       continue;
     }
+    while (depth() > 0 && std::find(req_stack.cbegin(), req_stack.cend(), get(0).first) == req_stack.cend()) {
+      // current TOS entry is unused in req_stack, drop it
+      issue_pop(0);
+    }
     int j = find(x);
     if (j >= depth() - i) {
       issue_push(j);
@@ -292,27 +302,61 @@ bool Op::generate_code_step(Stack& stack) {
       }
       return true;
     }
-    case _GlobVar: {
-      assert(left.size() == 1);
-      auto p = next_var_info[left[0]];
-      if (!p || p->is_unused() || disabled()) {
+    case _GlobVar:
+      if (dynamic_cast<const SymValGlobVar*>(fun_ref->value)) {
+        bool used = false;
+        for (auto i : left) {
+          auto p = next_var_info[i];
+          if (p && !p->is_unused()) {
+            used = true;
+          }
+        }
+        if (!used || disabled()) {
+          return true;
+        }
+        std::string name = sym::symbols.get_name(fun_ref->sym_idx);
+        stack.o << AsmOp::Custom(name + " GETGLOB", 0, 1);
+        if (left.size() != 1) {
+          assert(left.size() <= 15);
+          stack.o << AsmOp::UnTuple((int)left.size());
+        }
+        for (auto i : left) {
+          stack.push_new_var(i);
+        }
+        return true;
+      } else {
+        assert(left.size() == 1);
+        auto p = next_var_info[left[0]];
+        if (!p || p->is_unused() || disabled()) {
+          return true;
+        }
+        stack.o << "CONT:<{";
+        stack.o.indent();
+        auto func = dynamic_cast<SymValAsmFunc*>(fun_ref->value);
+        if (func) {
+          // TODO: create and compile a true lambda instead of this (so that arg_order and ret_order would work correctly)
+          std::vector<VarDescr> args0, res;
+          TypeExpr::remove_indirect(func->sym_type);
+          assert(func->get_type()->is_map());
+          auto wr = func->get_type()->args.at(0)->get_width();
+          auto wl = func->get_type()->args.at(1)->get_width();
+          assert(wl >= 0 && wr >= 0);
+          for (int i = 0; i < wl; i++) {
+            res.emplace_back(0);
+          }
+          for (int i = 0; i < wr; i++) {
+            args0.emplace_back(0);
+          }
+          func->compile(stack.o, res, args0);  // compile res := f (args0)
+        } else {
+          std::string name = sym::symbols.get_name(fun_ref->sym_idx);
+          stack.o << AsmOp::Custom(name + " CALLDICT", (int)right.size(), (int)left.size());
+        }
+        stack.o.undent();
+        stack.o << "}>";
+        stack.push_new_var(left.at(0));
         return true;
       }
-      auto func = dynamic_cast<const SymValAsmFunc*>(fun_ref->value);
-      if (func) {
-        std::vector<VarDescr> res;
-        res.reserve(left.size());
-        for (var_idx_t i : left) {
-          res.emplace_back(i);
-        }
-        func->compile(stack.o, res, args);  // compile res := f (args)
-      } else {
-        std::string name = sym::symbols.get_name(fun_ref->sym_idx);
-        stack.o << AsmOp::Custom(name + " CALLDICT", (int)right.size(), (int)left.size());
-      }
-      stack.push_new_var(left[0]);
-      return true;
-    }
     case _Let: {
       assert(left.size() == right.size());
       int i = 0;
@@ -352,6 +396,32 @@ bool Op::generate_code_step(Stack& stack) {
       }
       return true;
     }
+    case _Tuple:
+    case _UnTuple: {
+      if (disabled()) {
+        return true;
+      }
+      std::vector<bool> last;
+      for (var_idx_t x : right) {
+        last.push_back(var_info[x] && var_info[x]->is_last());
+      }
+      stack.rearrange_top(right, std::move(last));
+      stack.opt_show();
+      int k = (int)stack.depth() - (int)right.size();
+      assert(k >= 0);
+      if (cl == _Tuple) {
+        stack.o << AsmOp::Tuple((int)right.size());
+        assert(left.size() == 1);
+      } else {
+        stack.o << AsmOp::UnTuple((int)left.size());
+        assert(right.size() == 1);
+      }
+      stack.s.resize(k);
+      for (int i = 0; i < (int)left.size(); i++) {
+        stack.push_new_var(left.at(i));
+      }
+      return true;
+    }
     case _Call:
     case _CallInd: {
       if (disabled()) {
@@ -395,7 +465,9 @@ bool Op::generate_code_step(Stack& stack) {
         assert(stack.s[k + i].first == right1[i]);
       }
       if (cl == _CallInd) {
-        stack.o << exec_arg_op("CALLARGS", (int)right.size() - 1, (int)right.size(), (int)left.size());
+        // TODO: replace with exec_arg2_op()
+        stack.o << exec_arg2_op("CALLXARGS", (int)right.size() - 1, (int)left.size(), (int)right.size(),
+                                (int)left.size());
       } else {
         auto func = dynamic_cast<const SymValAsmFunc*>(fun_ref->value);
         if (func) {
@@ -420,6 +492,32 @@ bool Op::generate_code_step(Stack& stack) {
       }
       return true;
     }
+    case _SetGlob: {
+      assert(fun_ref && dynamic_cast<const SymValGlobVar*>(fun_ref->value));
+      std::vector<bool> last;
+      for (var_idx_t x : right) {
+        last.push_back(var_info[x] && var_info[x]->is_last());
+      }
+      stack.rearrange_top(right, std::move(last));
+      stack.opt_show();
+      int k = (int)stack.depth() - (int)right.size();
+      assert(k >= 0);
+      for (int i = 0; i < (int)right.size(); i++) {
+        if (stack.s[k + i].first != right[i]) {
+          std::cerr << stack.o;
+        }
+        assert(stack.s[k + i].first == right[i]);
+      }
+      if (right.size() > 1) {
+        stack.o << AsmOp::Tuple((int)right.size());
+      }
+      if (!right.empty()) {
+        std::string name = sym::symbols.get_name(fun_ref->sym_idx);
+        stack.o << AsmOp::Custom(name + " SETGLOB", 1, 0);
+      }
+      stack.s.resize(k);
+      return true;
+    }
     case _If: {
       if (block0->is_empty() && block1->is_empty()) {
         return true;
@@ -448,7 +546,9 @@ bool Op::generate_code_step(Stack& stack) {
         }
         stack.o << "IF:<{";
         stack.o.indent();
-        Stack stack_copy{stack};
+        Stack stack_copy{stack}, stack_target{stack};
+        stack_target.disable_output();
+        stack_target.drop_vars_except(next->var_info);
         block0->generate_code_all(stack_copy);
         stack_copy.drop_vars_except(var_info);
         stack_copy.opt_show();
@@ -457,7 +557,8 @@ bool Op::generate_code_step(Stack& stack) {
           stack.o << "}>";
           return true;
         }
-        stack_copy.drop_vars_except(next->var_info);
+        // stack_copy.drop_vars_except(next->var_info);
+        stack_copy.enforce_state(stack_target.vars());
         stack_copy.opt_show();
         if (stack_copy.vars() == stack.vars()) {
           stack.o.undent();
@@ -487,7 +588,9 @@ bool Op::generate_code_step(Stack& stack) {
         }
         stack.o << "IFNOT:<{";
         stack.o.indent();
-        Stack stack_copy{stack};
+        Stack stack_copy{stack}, stack_target{stack};
+        stack_target.disable_output();
+        stack_target.drop_vars_except(next->var_info);
         block1->generate_code_all(stack_copy);
         stack_copy.drop_vars_except(var_info);
         stack_copy.opt_show();
@@ -497,7 +600,8 @@ bool Op::generate_code_step(Stack& stack) {
           stack.merge_const(stack_copy);
           return true;
         }
-        stack_copy.drop_vars_except(next->var_info);
+        // stack_copy.drop_vars_except(next->var_info);
+        stack_copy.enforce_state(stack_target.vars());
         stack_copy.opt_show();
         if (stack_copy.vars() == stack.vars()) {
           stack.o.undent();
diff --git a/submodules/ton/tonlib-src/crypto/func/func.cpp b/submodules/ton/tonlib-src/crypto/func/func.cpp
index 2b98c332bd..5b937c8331 100644
--- a/submodules/ton/tonlib-src/crypto/func/func.cpp
+++ b/submodules/ton/tonlib-src/crypto/func/func.cpp
@@ -130,6 +130,11 @@ int generate_output() {
       *outs << func_val->method_id << " DECLMETHOD " << name << "\n";
     }
   }
+  for (SymDef* gvar_sym : glob_vars) {
+    assert(dynamic_cast<SymValGlobVar*>(gvar_sym->value));
+    std::string name = sym::symbols.get_name(gvar_sym->sym_idx);
+    *outs << std::string(indent * 2, ' ') << "DECLGLOBVAR " << name << "\n";
+  }
   int errors = 0;
   for (SymDef* func_sym : glob_func) {
     try {
diff --git a/submodules/ton/tonlib-src/crypto/func/func.h b/submodules/ton/tonlib-src/crypto/func/func.h
index d1481299b8..fd2bffd63d 100644
--- a/submodules/ton/tonlib-src/crypto/func/func.h
+++ b/submodules/ton/tonlib-src/crypto/func/func.h
@@ -14,7 +14,7 @@
     You should have received a copy of the GNU Lesser General Public License
     along with TON Blockchain Library.  If not, see <http://www.gnu.org/licenses/>.
 
-    Copyright 2017-2019 Telegram Systems LLP
+    Copyright 2017-2020 Telegram Systems LLP
 */
 #pragma once
 #include <vector>
@@ -36,7 +36,7 @@ namespace funC {
 extern int verbosity;
 extern bool op_rewrite_comments;
 
-constexpr int optimize_depth = 12;
+constexpr int optimize_depth = 20;
 
 enum Keyword {
   _Eof = -1,
@@ -97,9 +97,11 @@ enum Keyword {
   _Forall,
   _Asm,
   _Impure,
+  _Global,
   _Extern,
   _Inline,
   _InlineRef,
+  _AutoApply,
   _MethodId,
   _Operator,
   _Infix,
@@ -133,7 +135,7 @@ class IdSc {
  */
 
 struct TypeExpr {
-  enum te_type { te_Unknown, te_Var, te_Indirect, te_Atomic, te_Tensor, te_Map, te_Type, te_ForAll } constr;
+  enum te_type { te_Unknown, te_Var, te_Indirect, te_Atomic, te_Tensor, te_Tuple, te_Map, te_Type, te_ForAll } constr;
   enum {
     _Int = Keyword::_Int,
     _Cell = Keyword::_Cell,
@@ -159,6 +161,9 @@ struct TypeExpr {
       : constr(_constr), value((int)list.size()), args(std::move(list)) {
     compute_width();
   }
+  TypeExpr(te_type _constr, TypeExpr* elem0) : constr(_constr), value(1), args{elem0} {
+    compute_width();
+  }
   TypeExpr(te_type _constr, TypeExpr* elem0, std::vector<TypeExpr*> list)
       : constr(_constr), value((int)list.size() + 1), args{elem0} {
     args.insert(args.end(), list.begin(), list.end());
@@ -181,6 +186,12 @@ struct TypeExpr {
   bool is_var() const {
     return constr == te_Var;
   }
+  bool is_map() const {
+    return constr == te_Map;
+  }
+  bool is_tuple() const {
+    return constr == te_Tuple;
+  }
   bool has_fixed_width() const {
     return minw == maxw;
   }
@@ -222,6 +233,15 @@ struct TypeExpr {
   static TypeExpr* new_tensor(TypeExpr* te1, TypeExpr* te2, TypeExpr* te3) {
     return new_tensor({te1, te2, te3});
   }
+  static TypeExpr* new_tuple(TypeExpr* arg0) {
+    return new TypeExpr{te_Tuple, arg0};
+  }
+  static TypeExpr* new_tuple(std::vector<TypeExpr*> list, bool red = false) {
+    return new_tuple(new_tensor(std::move(list), red));
+  }
+  static TypeExpr* new_tuple(std::initializer_list<TypeExpr*> list) {
+    return new_tuple(new_tensor(std::move(list)));
+  }
   static TypeExpr* new_var() {
     return new TypeExpr{te_Var, --type_vars, 1};
   }
@@ -498,8 +518,11 @@ struct Op {
     _Let,
     _IntConst,
     _GlobVar,
+    _SetGlob,
     _Import,
     _Return,
+    _Tuple,
+    _UnTuple,
     _If,
     _While,
     _Until,
@@ -694,6 +717,7 @@ struct SymVal : sym::SymValBase {
   TypeExpr* sym_type;
   td::RefInt256 method_id;
   bool impure;
+  bool auto_apply{false};
   short flags;  // +1 = inline, +2 = inline_ref
   SymVal(int _type, int _idx, TypeExpr* _stype = nullptr, bool _impure = false)
       : sym::SymValBase(_type, _idx), sym_type(_stype), impure(_impure), flags(0) {
@@ -745,8 +769,20 @@ struct SymValType : sym::SymValBase {
   }
 };
 
-extern int glob_func_cnt, undef_func_cnt;
-extern std::vector<SymDef*> glob_func;
+struct SymValGlobVar : sym::SymValBase {
+  TypeExpr* sym_type;
+  int out_idx{0};
+  SymValGlobVar(int val, TypeExpr* gvtype, int oidx = 0)
+      : sym::SymValBase(_GlobVar, val), sym_type(gvtype), out_idx(oidx) {
+  }
+  ~SymValGlobVar() override = default;
+  TypeExpr* get_type() const {
+    return sym_type;
+  }
+};
+
+extern int glob_func_cnt, undef_func_cnt, glob_var_cnt;
+extern std::vector<SymDef*> glob_func, glob_vars;
 
 /*
  * 
@@ -771,10 +807,12 @@ struct Expr {
     _Apply,
     _VarApply,
     _TypeApply,
-    _Tuple,
+    _MkTuple,
+    _Tensor,
     _Const,
     _Var,
     _Glob,
+    _GlobVar,
     _Letop,
     _LetFirst,
     _Hole,
@@ -824,6 +862,12 @@ struct Expr {
   bool is_type() const {
     return flags & _IsType;
   }
+  bool is_type_apply() const {
+    return cls == _TypeApply;
+  }
+  bool is_mktuple() const {
+    return cls == _MkTuple;
+  }
   void chk_rvalue(const Lexem& lem) const;
   void chk_lvalue(const Lexem& lem) const;
   void chk_type(const Lexem& lem) const;
@@ -836,7 +880,8 @@ struct Expr {
   }
   int define_new_vars(CodeBlob& code);
   int predefine_vars();
-  std::vector<var_idx_t> pre_compile(CodeBlob& code) const;
+  std::vector<var_idx_t> pre_compile(CodeBlob& code, bool lval = false) const;
+  static std::vector<var_idx_t> pre_compile_let(CodeBlob& code, Expr* lhs, Expr* rhs, const SrcLocation& here);
   var_idx_t new_tmp(CodeBlob& code) const;
   std::vector<var_idx_t> new_tmp_vect(CodeBlob& code) const {
     return {new_tmp(code)};
@@ -860,6 +905,7 @@ struct AsmOp {
   int t{a_none};
   int indent{0};
   int a, b, c;
+  bool gconst{false};
   std::string op;
   struct SReg {
     int idx;
@@ -878,6 +924,7 @@ struct AsmOp {
   AsmOp(int _t, int _a, int _b) : t(_t), a(_a), b(_b) {
   }
   AsmOp(int _t, int _a, int _b, std::string _op) : t(_t), a(_a), b(_b), op(std::move(_op)) {
+    compute_gconst();
   }
   AsmOp(int _t, int _a, int _b, int _c) : t(_t), a(_a), b(_b), c(_c) {
   }
@@ -886,6 +933,9 @@ struct AsmOp {
   void out(std::ostream& os) const;
   void out_indent_nl(std::ostream& os, bool no_nl = false) const;
   std::string to_string() const;
+  void compute_gconst() {
+    gconst = (is_custom() && (op == "PUSHNULL" || op == "NEWC" || op == "NEWB" || op == "TRUE" || op == "FALSE"));
+  }
   bool is_nop() const {
     return t == a_none && op.empty();
   }
@@ -925,6 +975,9 @@ struct AsmOp {
     *y = b;
     return is_xchg();
   }
+  bool is_xchg_short() const {
+    return is_xchg() && (a <= 1 || b <= 1);
+  }
   bool is_swap() const {
     return is_xchg(0, 1);
   }
@@ -932,7 +985,7 @@ struct AsmOp {
     return t == a_const && !a && b == 1;
   }
   bool is_gconst() const {
-    return (t == a_const || t == a_custom) && !a && b == 1;
+    return !a && b == 1 && (t == a_const || gconst);
   }
   static AsmOp Nop() {
     return AsmOp(a_none);
@@ -985,6 +1038,7 @@ struct AsmOp {
   static AsmOp BlkSwap(int a, int b);
   static AsmOp BlkPush(int a, int b);
   static AsmOp BlkDrop(int a);
+  static AsmOp BlkDrop2(int a, int b);
   static AsmOp BlkReverse(int a, int b);
   static AsmOp make_stk2(int a, int b, const char* str, int delta);
   static AsmOp make_stk3(int a, int b, int c, const char* str, int delta);
@@ -1005,6 +1059,8 @@ struct AsmOp {
     return AsmOp(a_custom, args, retv, custom_op);
   }
   static AsmOp Parse(std::string custom_op, int args, int retv = 1);
+  static AsmOp Tuple(int a);
+  static AsmOp UnTuple(int a);
 };
 
 inline std::ostream& operator<<(std::ostream& os, const AsmOp& op) {
@@ -1155,6 +1211,7 @@ struct StackTransform {
   bool apply_push(int i);
   bool apply_pop(int i = 0);
   bool apply_push_newconst();
+  bool apply_blkpop(int k);
   bool apply(const StackTransform& other);     // this = this * other
   bool preapply(const StackTransform& other);  // this = other * this
   // c := a * b
@@ -1211,12 +1268,22 @@ struct StackTransform {
   }
   bool is_xchg(int i, int j) const;
   bool is_xchg(int* i, int* j) const;
+  bool is_xchg_xchg(int i, int j, int k, int l) const;
+  bool is_xchg_xchg(int* i, int* j, int* k, int* l) const;
   bool is_push(int i) const;
   bool is_push(int* i) const;
   bool is_pop(int i) const;
   bool is_pop(int* i) const;
+  bool is_pop_pop(int i, int j) const;
+  bool is_pop_pop(int* i, int* j) const;
   bool is_rot() const;
   bool is_rotrev() const;
+  bool is_push_rot(int i) const;
+  bool is_push_rot(int* i) const;
+  bool is_push_rotrev(int i) const;
+  bool is_push_rotrev(int* i) const;
+  bool is_push_xchg(int i, int j, int k) const;
+  bool is_push_xchg(int* i, int* j, int* k) const;
   bool is_xchg2(int i, int j) const;
   bool is_xchg2(int* i, int* j) const;
   bool is_xcpu(int i, int j) const;
@@ -1241,11 +1308,23 @@ struct StackTransform {
   bool is_blkpush(int i, int j) const;
   bool is_blkpush(int* i, int* j) const;
   bool is_blkdrop(int* i) const;
+  bool is_blkdrop2(int i, int j) const;
+  bool is_blkdrop2(int* i, int* j) const;
   bool is_reverse(int i, int j) const;
   bool is_reverse(int* i, int* j) const;
   bool is_nip_seq(int i, int j = 0) const;
   bool is_nip_seq(int* i) const;
   bool is_nip_seq(int* i, int* j) const;
+  bool is_pop_blkdrop(int i, int k) const;
+  bool is_pop_blkdrop(int* i, int* k) const;
+  bool is_2pop_blkdrop(int i, int j, int k) const;
+  bool is_2pop_blkdrop(int* i, int* j, int* k) const;
+  bool is_const_rot(int c) const;
+  bool is_const_rot(int* c) const;
+  bool is_const_pop(int c, int i) const;
+  bool is_const_pop(int* c, int* i) const;
+  bool is_push_const(int i, int c) const;
+  bool is_push_const(int* i, int* c) const;
 
   void show(std::ostream& os, int mode = 0) const;
 
@@ -1282,11 +1361,12 @@ struct Optimizer {
   AsmOpCons* op_cons_[n];
   int offs_[n];
   StackTransform tr_[n];
+  int mode_{0};
   Optimizer() {
   }
-  Optimizer(bool debug) : debug_(debug) {
+  Optimizer(bool debug, int mode = 0) : debug_(debug), mode_(mode) {
   }
-  Optimizer(AsmOpConsList code, bool debug = false) : Optimizer(debug) {
+  Optimizer(AsmOpConsList code, bool debug = false, int mode = 0) : Optimizer(debug, mode) {
     set_code(std::move(code));
   }
   void set_code(AsmOpConsList code_);
@@ -1302,19 +1382,28 @@ struct Optimizer {
   void show_head() const;
   void show_left() const;
   void show_right() const;
-  bool is_const_push_swap() const;
-  bool rewrite_const_push_swap();
+  bool find_const_op(int* op_idx, int cst);
+  bool is_push_const(int* i, int* c) const;
+  bool rewrite_push_const(int i, int c);
   bool is_const_push_xchgs();
   bool rewrite_const_push_xchgs();
-  bool simple_rewrite(int p, AsmOp&& new_op);
-  bool simple_rewrite(int p, AsmOp&& new_op1, AsmOp&& new_op2);
-  bool simple_rewrite(AsmOp&& new_op) {
-    return simple_rewrite(p_, std::move(new_op));
+  bool is_const_rot(int* c) const;
+  bool rewrite_const_rot(int c);
+  bool is_const_pop(int* c, int* i) const;
+  bool rewrite_const_pop(int c, int i);
+  bool rewrite(int p, AsmOp&& new_op);
+  bool rewrite(int p, AsmOp&& new_op1, AsmOp&& new_op2);
+  bool rewrite(int p, AsmOp&& new_op1, AsmOp&& new_op2, AsmOp&& new_op3);
+  bool rewrite(AsmOp&& new_op) {
+    return rewrite(p_, std::move(new_op));
   }
-  bool simple_rewrite(AsmOp&& new_op1, AsmOp&& new_op2) {
-    return simple_rewrite(p_, std::move(new_op1), std::move(new_op2));
+  bool rewrite(AsmOp&& new_op1, AsmOp&& new_op2) {
+    return rewrite(p_, std::move(new_op1), std::move(new_op2));
   }
-  bool simple_rewrite_nop();
+  bool rewrite(AsmOp&& new_op1, AsmOp&& new_op2, AsmOp&& new_op3) {
+    return rewrite(p_, std::move(new_op1), std::move(new_op2), std::move(new_op3));
+  }
+  bool rewrite_nop();
   bool is_pred(const std::function<bool(const StackTransform&)>& pred, int min_p = 2);
   bool is_same_as(const StackTransform& trans, int min_p = 2);
   bool is_rot();
@@ -1325,9 +1414,14 @@ struct Optimizer {
   bool is_2swap();
   bool is_2over();
   bool is_xchg(int* i, int* j);
+  bool is_xchg_xchg(int* i, int* j, int* k, int* l);
   bool is_push(int* i);
   bool is_pop(int* i);
+  bool is_pop_pop(int* i, int* j);
   bool is_nop();
+  bool is_push_rot(int* i);
+  bool is_push_rotrev(int* i);
+  bool is_push_xchg(int* i, int* j, int* k);
   bool is_xchg2(int* i, int* j);
   bool is_xcpu(int* i, int* j);
   bool is_puxc(int* i, int* j);
@@ -1343,19 +1437,22 @@ struct Optimizer {
   bool is_blkswap(int* i, int* j);
   bool is_blkpush(int* i, int* j);
   bool is_blkdrop(int* i);
+  bool is_blkdrop2(int* i, int* j);
   bool is_reverse(int* i, int* j);
   bool is_nip_seq(int* i, int* j);
+  bool is_pop_blkdrop(int* i, int* k);
+  bool is_2pop_blkdrop(int* i, int* j, int* k);
   AsmOpConsList extract_code();
 };
 
-AsmOpConsList optimize_code_head(AsmOpConsList op_list);
-AsmOpConsList optimize_code(AsmOpConsList op_list);
+AsmOpConsList optimize_code_head(AsmOpConsList op_list, int mode = 0);
+AsmOpConsList optimize_code(AsmOpConsList op_list, int mode);
 void optimize_code(AsmOpList& ops);
 
 struct Stack {
   StackLayoutExt s;
   AsmOpList& o;
-  enum { _StkCmt = 1, _CptStkCmt = 2, _DisableOpt = 4, _Shown = 256, _Garbage = -0x10000 };
+  enum { _StkCmt = 1, _CptStkCmt = 2, _DisableOpt = 4, _DisableOut = 128, _Shown = 256, _Garbage = -0x10000 };
   int mode;
   Stack(AsmOpList& _o, int _mode = 0) : o(_o), mode(_mode) {
   }
@@ -1381,6 +1478,15 @@ struct Stack {
   var_const_idx_t get(int i) const {
     return at(i);
   }
+  bool output_disabled() const {
+    return mode & _DisableOut;
+  }
+  bool output_enabled() const {
+    return !output_disabled();
+  }
+  void disable_output() {
+    mode |= _DisableOut;
+  }
   StackLayout vars() const;
   int find(var_idx_t var, int from = 0) const;
   int find(var_idx_t var, int from, int to) const;
@@ -1470,7 +1576,7 @@ struct SymValAsmFunc : SymValFunc {
                 std::initializer_list<int> ret_order = {}, bool impure = false)
       : SymValFunc(-1, ft, arg_order, ret_order, impure), ext_compile(std::move(_compile)) {
   }
-  bool compile(AsmOpList& dest, std::vector<VarDescr>& in, std::vector<VarDescr>& out) const;
+  bool compile(AsmOpList& dest, std::vector<VarDescr>& out, std::vector<VarDescr>& in) const;
 };
 
 // defined in builtins.cpp
@@ -1478,6 +1584,7 @@ AsmOp exec_arg_op(std::string op, long long arg);
 AsmOp exec_arg_op(std::string op, long long arg, int args, int retv = 1);
 AsmOp exec_arg_op(std::string op, td::RefInt256 arg);
 AsmOp exec_arg_op(std::string op, td::RefInt256 arg, int args, int retv = 1);
+AsmOp exec_arg2_op(std::string op, long long imm1, long long imm2, int args, int retv = 1);
 AsmOp push_const(td::RefInt256 x);
 
 void define_builtins();
diff --git a/submodules/ton/tonlib-src/crypto/func/gen-abscode.cpp b/submodules/ton/tonlib-src/crypto/func/gen-abscode.cpp
index a3cc52042d..c0a8985a64 100644
--- a/submodules/ton/tonlib-src/crypto/func/gen-abscode.cpp
+++ b/submodules/ton/tonlib-src/crypto/func/gen-abscode.cpp
@@ -14,10 +14,12 @@
     You should have received a copy of the GNU Lesser General Public License
     along with TON Blockchain Library.  If not, see <http://www.gnu.org/licenses/>.
 
-    Copyright 2017-2019 Telegram Systems LLP
+    Copyright 2017-2020 Telegram Systems LLP
 */
 #include "func.h"
 
+using namespace std::literals::string_literals;
+
 namespace funC {
 
 /*
@@ -164,7 +166,8 @@ bool Expr::deduce_type(const Lexem& lem) {
 
 int Expr::define_new_vars(CodeBlob& code) {
   switch (cls) {
-    case _Tuple:
+    case _Tensor:
+    case _MkTuple:
     case _TypeApply: {
       int res = 0;
       for (const auto& x : args) {
@@ -189,7 +192,8 @@ int Expr::define_new_vars(CodeBlob& code) {
 
 int Expr::predefine_vars() {
   switch (cls) {
-    case _Tuple:
+    case _Tensor:
+    case _MkTuple:
     case _TypeApply: {
       int res = 0;
       for (const auto& x : args) {
@@ -201,6 +205,7 @@ int Expr::predefine_vars() {
       if (!sym) {
         assert(val < 0 && here.defined());
         sym = sym::define_symbol(~val, false, here);
+        // std::cerr << "predefining variable " << sym::symbols.get_name(~val) << std::endl;
         if (!sym) {
           throw src::ParseError{here, std::string{"redefined variable `"} + sym::symbols.get_name(~val) + "`"};
         }
@@ -216,12 +221,51 @@ var_idx_t Expr::new_tmp(CodeBlob& code) const {
   return code.create_tmp_var(e_type, &here);
 }
 
-std::vector<var_idx_t> Expr::pre_compile(CodeBlob& code) const {
+std::vector<var_idx_t> Expr::pre_compile_let(CodeBlob& code, Expr* lhs, Expr* rhs, const SrcLocation& here) {
+  while (lhs->is_type_apply()) {
+    lhs = lhs->args.at(0);
+  }
+  while (rhs->is_type_apply()) {
+    rhs = rhs->args.at(0);
+  }
+  if (lhs->is_mktuple()) {
+    if (rhs->is_mktuple()) {
+      return pre_compile_let(code, lhs->args.at(0), rhs->args.at(0), here);
+    }
+    auto right = rhs->pre_compile(code);
+    TypeExpr::remove_indirect(rhs->e_type);
+    auto unpacked_type = rhs->e_type->args.at(0);
+    std::vector<var_idx_t> tmp{code.create_tmp_var(unpacked_type, &rhs->here)};
+    code.emplace_back(lhs->here, Op::_UnTuple, tmp, std::move(right));
+    auto tvar = new Expr{_Var};
+    tvar->set_val(tmp[0]);
+    tvar->set_location(rhs->here);
+    tvar->e_type = unpacked_type;
+    pre_compile_let(code, lhs->args.at(0), tvar, here);
+    return tmp;
+  }
+  auto right = rhs->pre_compile(code);
+  if (lhs->cls == Expr::_GlobVar) {
+    assert(lhs->sym);
+    auto& op = code.emplace_back(here, Op::_SetGlob, std::vector<var_idx_t>{}, right, lhs->sym);
+    op.flags |= Op::_Impure;
+  } else {
+    auto left = lhs->pre_compile(code, true);
+    code.emplace_back(here, Op::_Let, std::move(left), right);
+  }
+  return right;
+}
+
+std::vector<var_idx_t> Expr::pre_compile(CodeBlob& code, bool lval) const {
+  if (lval && !(cls == _Tensor || cls == _Var || cls == _Hole || cls == _TypeApply)) {
+    std::cerr << "lvalue expression constructor is " << cls << std::endl;
+    throw src::Fatal{"cannot compile lvalue expression with unknown constructor"};
+  }
   switch (cls) {
-    case _Tuple: {
+    case _Tensor: {
       std::vector<var_idx_t> res;
       for (const auto& x : args) {
-        auto add = x->pre_compile(code);
+        auto add = x->pre_compile(code, lval);
         res.insert(res.end(), add.cbegin(), add.cend());
       }
       return res;
@@ -253,7 +297,7 @@ std::vector<var_idx_t> Expr::pre_compile(CodeBlob& code) const {
       return rvect;
     }
     case _TypeApply:
-      return args[0]->pre_compile(code);
+      return args[0]->pre_compile(code, lval);
     case _Var:
     case _Hole:
       return {val};
@@ -282,25 +326,29 @@ std::vector<var_idx_t> Expr::pre_compile(CodeBlob& code) const {
       code.emplace_back(here, Op::_IntConst, rvect, intval);
       return rvect;
     }
-    case _Glob: {
+    case _Glob:
+    case _GlobVar: {
       auto rvect = new_tmp_vect(code);
       code.emplace_back(here, Op::_GlobVar, rvect, std::vector<var_idx_t>{}, sym);
       return rvect;
     }
     case _Letop: {
-      auto right = args[1]->pre_compile(code);
-      auto left = args[0]->pre_compile(code);
-      code.emplace_back(here, Op::_Let, std::move(left), right);
-      return right;
+      return pre_compile_let(code, args.at(0), args.at(1), here);
     }
     case _LetFirst: {
       auto rvect = new_tmp_vect(code);
       auto right = args[1]->pre_compile(code);
-      auto left = args[0]->pre_compile(code);
+      auto left = args[0]->pre_compile(code, true);
       left.push_back(rvect[0]);
       code.emplace_back(here, Op::_Let, std::move(left), std::move(right));
       return rvect;
     }
+    case _MkTuple: {
+      auto left = new_tmp_vect(code);
+      auto right = args[0]->pre_compile(code);
+      code.emplace_back(here, Op::_Tuple, left, std::move(right));
+      return left;
+    }
     case _CondExpr: {
       auto cond = args[0]->pre_compile(code);
       assert(cond.size() == 1);
diff --git a/submodules/ton/tonlib-src/crypto/func/keywords.cpp b/submodules/ton/tonlib-src/crypto/func/keywords.cpp
index c640f4fe71..47975e7fec 100644
--- a/submodules/ton/tonlib-src/crypto/func/keywords.cpp
+++ b/submodules/ton/tonlib-src/crypto/func/keywords.cpp
@@ -14,7 +14,7 @@
     You should have received a copy of the GNU Lesser General Public License
     along with TON Blockchain Library.  If not, see <http://www.gnu.org/licenses/>.
 
-    Copyright 2017-2019 Telegram Systems LLP
+    Copyright 2017-2020 Telegram Systems LLP
 */
 #include "func.h"
 
@@ -46,6 +46,8 @@ void define_keywords() {
       .add_kw_char(';')
       .add_kw_char('(')
       .add_kw_char(')')
+      .add_kw_char('[')
+      .add_kw_char(']')
       .add_kw_char('{')
       .add_kw_char('}')
       .add_kw_char('=')
@@ -113,10 +115,12 @@ void define_keywords() {
       .add_keyword("forall", Kw::_Forall);
 
   sym::symbols.add_keyword("extern", Kw::_Extern)
+      .add_keyword("global", Kw::_Global)
       .add_keyword("asm", Kw::_Asm)
       .add_keyword("impure", Kw::_Impure)
       .add_keyword("inline", Kw::_Inline)
       .add_keyword("inline_ref", Kw::_InlineRef)
+      .add_keyword("auto_apply", Kw::_AutoApply)
       .add_keyword("method_id", Kw::_MethodId)
       .add_keyword("operator", Kw::_Operator)
       .add_keyword("infix", Kw::_Infix)
diff --git a/submodules/ton/tonlib-src/crypto/func/optimize.cpp b/submodules/ton/tonlib-src/crypto/func/optimize.cpp
index 95b4403c46..85c1fdd300 100644
--- a/submodules/ton/tonlib-src/crypto/func/optimize.cpp
+++ b/submodules/ton/tonlib-src/crypto/func/optimize.cpp
@@ -14,7 +14,7 @@
     You should have received a copy of the GNU Lesser General Public License
     along with TON Blockchain Library.  If not, see <http://www.gnu.org/licenses/>.
 
-    Copyright 2017-2019 Telegram Systems LLP
+    Copyright 2017-2020 Telegram Systems LLP
 */
 #include "func.h"
 
@@ -134,18 +134,70 @@ bool Optimizer::say(std::string str) const {
   return true;
 }
 
-bool Optimizer::is_const_push_swap() const {
-  return l_ >= 3 && op_[0]->is_gconst() && op_[1]->is_push() && op_[1]->a >= 1 && op_[2]->is_swap();
+bool Optimizer::find_const_op(int* op_idx, int cst) {
+  for (int i = 0; i < l2_; i++) {
+    if (op_[i]->is_gconst() && tr_[i].get(0) == cst) {
+      *op_idx = i;
+      return true;
+    }
+  }
+  return false;
+}
+
+bool Optimizer::is_push_const(int* i, int* c) const {
+  return pb_ >= 3 && pb_ <= l2_ && tr_[pb_ - 1].is_push_const(i, c);
 }
 
 // PUSHCONST c ; PUSH s(i+1) ; SWAP -> PUSH s(i) ; PUSHCONST c
-bool Optimizer::rewrite_const_push_swap() {
-  p_ = 3;
+bool Optimizer::rewrite_push_const(int i, int c) {
+  p_ = pb_;
   q_ = 2;
+  int idx = -1;
+  if (!(p_ >= 2 && find_const_op(&idx, c) && idx < p_)) {
+    return false;
+  }
   show_left();
-  oq_[1] = std::move(op_[0]);
-  oq_[0] = std::move(op_[1]);
-  (oq_[0]->a)--;
+  oq_[1] = std::move(op_[idx]);
+  oq_[0] = std::move(op_[!idx]);
+  *oq_[0] = AsmOp::Push(i);
+  show_right();
+  return true;
+}
+
+bool Optimizer::is_const_rot(int* c) const {
+  return pb_ >= 3 && pb_ <= l2_ && tr_[pb_ - 1].is_const_rot(c);
+}
+
+bool Optimizer::rewrite_const_rot(int c) {
+  p_ = pb_;
+  q_ = 2;
+  int idx = -1;
+  if (!(p_ >= 2 && find_const_op(&idx, c) && idx < p_)) {
+    return false;
+  }
+  show_left();
+  oq_[0] = std::move(op_[idx]);
+  oq_[1] = std::move(op_[!idx]);
+  *oq_[1] = AsmOp::Custom("ROT", 3, 3);
+  show_right();
+  return true;
+}
+
+bool Optimizer::is_const_pop(int* c, int* i) const {
+  return pb_ >= 3 && pb_ <= l2_ && tr_[pb_ - 1].is_const_pop(c, i);
+}
+
+bool Optimizer::rewrite_const_pop(int c, int i) {
+  p_ = pb_;
+  q_ = 2;
+  int idx = -1;
+  if (!(p_ >= 2 && find_const_op(&idx, c) && idx < p_)) {
+    return false;
+  }
+  show_left();
+  oq_[0] = std::move(op_[idx]);
+  oq_[1] = std::move(op_[!idx]);
+  *oq_[1] = AsmOp::Pop(i);
   show_right();
   return true;
 }
@@ -236,7 +288,7 @@ bool Optimizer::rewrite_const_push_xchgs() {
   return true;
 }
 
-bool Optimizer::simple_rewrite(int p, AsmOp&& new_op) {
+bool Optimizer::rewrite(int p, AsmOp&& new_op) {
   assert(p > 0 && p <= l_);
   p_ = p;
   q_ = 1;
@@ -247,7 +299,7 @@ bool Optimizer::simple_rewrite(int p, AsmOp&& new_op) {
   return true;
 }
 
-bool Optimizer::simple_rewrite(int p, AsmOp&& new_op1, AsmOp&& new_op2) {
+bool Optimizer::rewrite(int p, AsmOp&& new_op1, AsmOp&& new_op2) {
   assert(p > 1 && p <= l_);
   p_ = p;
   q_ = 2;
@@ -260,7 +312,22 @@ bool Optimizer::simple_rewrite(int p, AsmOp&& new_op1, AsmOp&& new_op2) {
   return true;
 }
 
-bool Optimizer::simple_rewrite_nop() {
+bool Optimizer::rewrite(int p, AsmOp&& new_op1, AsmOp&& new_op2, AsmOp&& new_op3) {
+  assert(p > 2 && p <= l_);
+  p_ = p;
+  q_ = 3;
+  show_left();
+  oq_[0] = std::move(op_[0]);
+  *oq_[0] = new_op1;
+  oq_[1] = std::move(op_[1]);
+  *oq_[1] = new_op2;
+  oq_[2] = std::move(op_[2]);
+  *oq_[2] = new_op3;
+  show_right();
+  return true;
+}
+
+bool Optimizer::rewrite_nop() {
   assert(p_ > 0 && p_ <= l_);
   q_ = 0;
   show_left();
@@ -326,6 +393,13 @@ bool Optimizer::is_xchg(int* i, int* j) {
   return is_pred([i, j](const auto& t) { return t.is_xchg(i, j) && ((*i < 16 && *j < 16) || (!*i && *j < 256)); });
 }
 
+bool Optimizer::is_xchg_xchg(int* i, int* j, int* k, int* l) {
+  return is_pred([i, j, k, l](const auto& t) {
+           return t.is_xchg_xchg(i, j, k, l) && (*i < 2 && *j < (*i ? 16 : 256) && *k < 2 && *l < (*k ? 16 : 256));
+         }) &&
+         (!(p_ == 2 && op_[0]->is_xchg(*i, *j) && op_[1]->is_xchg(*k, *l)));
+}
+
 bool Optimizer::is_push(int* i) {
   return is_pred([i](const auto& t) { return t.is_push(i) && *i < 256; });
 }
@@ -334,6 +408,23 @@ bool Optimizer::is_pop(int* i) {
   return is_pred([i](const auto& t) { return t.is_pop(i) && *i < 256; });
 }
 
+bool Optimizer::is_pop_pop(int* i, int* j) {
+  return is_pred([i, j](const auto& t) { return t.is_pop_pop(i, j) && *i < 256 && *j < 256; }, 3);
+}
+
+bool Optimizer::is_push_rot(int* i) {
+  return is_pred([i](const auto& t) { return t.is_push_rot(i) && *i < 16; }, 3);
+}
+
+bool Optimizer::is_push_rotrev(int* i) {
+  return is_pred([i](const auto& t) { return t.is_push_rotrev(i) && *i < 16; }, 3);
+}
+
+bool Optimizer::is_push_xchg(int* i, int* j, int* k) {
+  return is_pred([i, j, k](const auto& t) { return t.is_push_xchg(i, j, k) && *i < 16 && *j < 16 && *k < 16; }) &&
+         !(p_ == 2 && op_[0]->is_push() && op_[1]->is_xchg());
+}
+
 bool Optimizer::is_xchg2(int* i, int* j) {
   return is_pred([i, j](const auto& t) { return t.is_xchg2(i, j) && *i < 16 && *j < 16; });
 }
@@ -367,7 +458,8 @@ bool Optimizer::is_xcpu2(int* i, int* j, int* k) {
 }
 
 bool Optimizer::is_puxc2(int* i, int* j, int* k) {
-  return is_pred([i, j, k](const auto& t) { return t.is_puxc2(i, j, k) && *i < 16 && *j < 15 && *k < 15; });
+  return is_pred(
+      [i, j, k](const auto& t) { return t.is_puxc2(i, j, k) && *i < 16 && *j < 15 && *k < 15 && *j + *k != -1; });
 }
 
 bool Optimizer::is_puxcpu(int* i, int* j, int* k) {
@@ -394,6 +486,10 @@ bool Optimizer::is_blkdrop(int* i) {
   return is_pred([i](const auto& t) { return t.is_blkdrop(i) && *i > 0 && *i < 16; });
 }
 
+bool Optimizer::is_blkdrop2(int* i, int* j) {
+  return is_pred([i, j](const auto& t) { return t.is_blkdrop2(i, j) && *i > 0 && *i < 16 && *j > 0 && *j < 16; });
+}
+
 bool Optimizer::is_reverse(int* i, int* j) {
   return is_pred([i, j](const auto& t) { return t.is_reverse(i, j) && *i >= 2 && *i <= 17 && *j < 16; });
 }
@@ -402,6 +498,16 @@ bool Optimizer::is_nip_seq(int* i, int* j) {
   return is_pred([i, j](const auto& t) { return t.is_nip_seq(i, j) && *i >= 3 && *i <= 15; });
 }
 
+bool Optimizer::is_pop_blkdrop(int* i, int* k) {
+  return is_pred([i, k](const auto& t) { return t.is_pop_blkdrop(i, k) && *i >= *k && *k >= 2 && *k <= 15; }, 3);
+}
+
+bool Optimizer::is_2pop_blkdrop(int* i, int* j, int* k) {
+  return is_pred(
+      [i, j, k](const auto& t) { return t.is_2pop_blkdrop(i, j, k) && *i >= *k && *j >= *k && *k >= 2 && *k <= 15; },
+      3);
+}
+
 bool Optimizer::compute_stack_transforms() {
   StackTransform trans;
   for (int i = 0; i < l_; i++) {
@@ -448,34 +554,41 @@ bool Optimizer::find_at_least(int pb) {
   p_ = q_ = 0;
   pb_ = pb;
   // show_stack_transforms();
-  int i = -100, j = -100, k = -100;
-  return (is_const_push_swap() && 3 >= pb && rewrite_const_push_swap()) || (is_nop() && simple_rewrite_nop()) ||
-         (is_const_push_xchgs() && rewrite_const_push_xchgs()) ||
-         (is_xchg(&i, &j) && simple_rewrite(AsmOp::Xchg(i, j))) || (is_push(&i) && simple_rewrite(AsmOp::Push(i))) ||
-         (is_pop(&i) && simple_rewrite(AsmOp::Pop(i))) || (is_rot() && simple_rewrite(AsmOp::Custom("ROT", 3, 3))) ||
-         (is_rotrev() && simple_rewrite(AsmOp::Custom("-ROT", 3, 3))) ||
-         (is_2dup() && simple_rewrite(AsmOp::Custom("2DUP", 2, 4))) ||
-         (is_2swap() && simple_rewrite(AsmOp::Custom("2SWAP", 2, 4))) ||
-         (is_2over() && simple_rewrite(AsmOp::Custom("2OVER", 2, 4))) ||
-         (is_tuck() && simple_rewrite(AsmOp::Custom("TUCK", 2, 3))) ||
-         (is_2drop() && simple_rewrite(AsmOp::Custom("2DROP", 2, 0))) ||
-         (is_xchg2(&i, &j) && simple_rewrite(AsmOp::Xchg2(i, j))) ||
-         (is_xcpu(&i, &j) && simple_rewrite(AsmOp::XcPu(i, j))) ||
-         (is_puxc(&i, &j) && simple_rewrite(AsmOp::PuXc(i, j))) ||
-         (is_push2(&i, &j) && simple_rewrite(AsmOp::Push2(i, j))) ||
-         (is_blkswap(&i, &j) && simple_rewrite(AsmOp::BlkSwap(i, j))) ||
-         (is_blkpush(&i, &j) && simple_rewrite(AsmOp::BlkPush(i, j))) ||
-         (is_blkdrop(&i) && simple_rewrite(AsmOp::BlkDrop(i))) ||
-         (is_reverse(&i, &j) && simple_rewrite(AsmOp::BlkReverse(i, j))) ||
-         (is_nip_seq(&i, &j) && simple_rewrite(AsmOp::Xchg(i, j), AsmOp::BlkDrop(i))) ||
-         (is_xchg3(&i, &j, &k) && simple_rewrite(AsmOp::Xchg3(i, j, k))) ||
-         (is_xc2pu(&i, &j, &k) && simple_rewrite(AsmOp::Xc2Pu(i, j, k))) ||
-         (is_xcpuxc(&i, &j, &k) && simple_rewrite(AsmOp::XcPuXc(i, j, k))) ||
-         (is_xcpu2(&i, &j, &k) && simple_rewrite(AsmOp::XcPu2(i, j, k))) ||
-         (is_puxc2(&i, &j, &k) && simple_rewrite(AsmOp::PuXc2(i, j, k))) ||
-         (is_puxcpu(&i, &j, &k) && simple_rewrite(AsmOp::PuXcPu(i, j, k))) ||
-         (is_pu2xc(&i, &j, &k) && simple_rewrite(AsmOp::Pu2Xc(i, j, k))) ||
-         (is_push3(&i, &j, &k) && simple_rewrite(AsmOp::Push3(i, j, k)));
+  int i, j, k, l, c;
+  return (is_push_const(&i, &c) && rewrite_push_const(i, c)) || (is_nop() && rewrite_nop()) ||
+         (!(mode_ & 1) && is_const_rot(&c) && rewrite_const_rot(c)) ||
+         (is_const_push_xchgs() && rewrite_const_push_xchgs()) || (is_const_pop(&c, &i) && rewrite_const_pop(c, i)) ||
+         (is_xchg(&i, &j) && rewrite(AsmOp::Xchg(i, j))) || (is_push(&i) && rewrite(AsmOp::Push(i))) ||
+         (is_pop(&i) && rewrite(AsmOp::Pop(i))) || (is_pop_pop(&i, &j) && rewrite(AsmOp::Pop(i), AsmOp::Pop(j))) ||
+         (is_xchg_xchg(&i, &j, &k, &l) && rewrite(AsmOp::Xchg(i, j), AsmOp::Xchg(k, l))) ||
+         (!(mode_ & 1) &&
+          ((is_rot() && rewrite(AsmOp::Custom("ROT", 3, 3))) || (is_rotrev() && rewrite(AsmOp::Custom("-ROT", 3, 3))) ||
+           (is_2dup() && rewrite(AsmOp::Custom("2DUP", 2, 4))) ||
+           (is_2swap() && rewrite(AsmOp::Custom("2SWAP", 2, 4))) ||
+           (is_2over() && rewrite(AsmOp::Custom("2OVER", 2, 4))) ||
+           (is_tuck() && rewrite(AsmOp::Custom("TUCK", 2, 3))) ||
+           (is_2drop() && rewrite(AsmOp::Custom("2DROP", 2, 0))) || (is_xchg2(&i, &j) && rewrite(AsmOp::Xchg2(i, j))) ||
+           (is_xcpu(&i, &j) && rewrite(AsmOp::XcPu(i, j))) || (is_puxc(&i, &j) && rewrite(AsmOp::PuXc(i, j))) ||
+           (is_push2(&i, &j) && rewrite(AsmOp::Push2(i, j))) || (is_blkswap(&i, &j) && rewrite(AsmOp::BlkSwap(i, j))) ||
+           (is_blkpush(&i, &j) && rewrite(AsmOp::BlkPush(i, j))) || (is_blkdrop(&i) && rewrite(AsmOp::BlkDrop(i))) ||
+           (is_push_rot(&i) && rewrite(AsmOp::Push(i), AsmOp::Custom("ROT"))) ||
+           (is_push_rotrev(&i) && rewrite(AsmOp::Push(i), AsmOp::Custom("-ROT"))) ||
+           (is_push_xchg(&i, &j, &k) && rewrite(AsmOp::Push(i), AsmOp::Xchg(j, k))) ||
+           (is_reverse(&i, &j) && rewrite(AsmOp::BlkReverse(i, j))) ||
+           (is_nip_seq(&i, &j) && rewrite(AsmOp::Xchg(i, j), AsmOp::BlkDrop(i))) ||
+           (is_pop_blkdrop(&i, &k) && rewrite(AsmOp::Pop(i), AsmOp::BlkDrop(k))) ||
+           (is_blkdrop2(&i, &j) && rewrite(AsmOp::BlkDrop2(i, j))) ||
+           (is_2pop_blkdrop(&i, &j, &k) && (k >= 3 && k <= 13 && i != j + 1 && i <= 15 && j <= 14
+                                                ? rewrite(AsmOp::Xchg2(j + 1, i), AsmOp::BlkDrop(k + 2))
+                                                : rewrite(AsmOp::Pop(i), AsmOp::Pop(j), AsmOp::BlkDrop(k)))) ||
+           (is_xchg3(&i, &j, &k) && rewrite(AsmOp::Xchg3(i, j, k))) ||
+           (is_xc2pu(&i, &j, &k) && rewrite(AsmOp::Xc2Pu(i, j, k))) ||
+           (is_xcpuxc(&i, &j, &k) && rewrite(AsmOp::XcPuXc(i, j, k))) ||
+           (is_xcpu2(&i, &j, &k) && rewrite(AsmOp::XcPu2(i, j, k))) ||
+           (is_puxc2(&i, &j, &k) && rewrite(AsmOp::PuXc2(i, j, k))) ||
+           (is_puxcpu(&i, &j, &k) && rewrite(AsmOp::PuXcPu(i, j, k))) ||
+           (is_pu2xc(&i, &j, &k) && rewrite(AsmOp::Pu2Xc(i, j, k))) ||
+           (is_push3(&i, &j, &k) && rewrite(AsmOp::Push3(i, j, k)))));
 }
 
 bool Optimizer::find() {
@@ -500,17 +613,17 @@ bool Optimizer::optimize() {
   return f;
 }
 
-AsmOpConsList optimize_code_head(AsmOpConsList op_list) {
-  Optimizer opt(std::move(op_list), op_rewrite_comments);
+AsmOpConsList optimize_code_head(AsmOpConsList op_list, int mode) {
+  Optimizer opt(std::move(op_list), op_rewrite_comments, mode);
   opt.optimize();
   return opt.extract_code();
 }
 
-AsmOpConsList optimize_code(AsmOpConsList op_list) {
+AsmOpConsList optimize_code(AsmOpConsList op_list, int mode) {
   std::vector<std::unique_ptr<AsmOp>> v;
   while (op_list) {
     if (!op_list->car->is_comment()) {
-      op_list = optimize_code_head(std::move(op_list));
+      op_list = optimize_code_head(std::move(op_list), mode);
     }
     if (op_list) {
       v.push_back(std::move(op_list->car));
@@ -524,11 +637,13 @@ AsmOpConsList optimize_code(AsmOpConsList op_list) {
 }
 
 void optimize_code(AsmOpList& ops) {
-  std::unique_ptr<AsmOpCons> op_list;
+  AsmOpConsList op_list;
   for (auto it = ops.list_.rbegin(); it < ops.list_.rend(); ++it) {
     op_list = AsmOpCons::cons(std::make_unique<AsmOp>(std::move(*it)), std::move(op_list));
   }
-  op_list = optimize_code(std::move(op_list));
+  for (int mode : {1, 1, 1, 1, 0, 0, 0, 0}) {
+    op_list = optimize_code(std::move(op_list), mode);
+  }
   ops.list_.clear();
   while (op_list) {
     ops.list_.push_back(std::move(*(op_list->car)));
diff --git a/submodules/ton/tonlib-src/crypto/func/parse-func.cpp b/submodules/ton/tonlib-src/crypto/func/parse-func.cpp
index e04077918c..5c44444020 100644
--- a/submodules/ton/tonlib-src/crypto/func/parse-func.cpp
+++ b/submodules/ton/tonlib-src/crypto/func/parse-func.cpp
@@ -14,10 +14,11 @@
     You should have received a copy of the GNU Lesser General Public License
     along with TON Blockchain Library.  If not, see <http://www.gnu.org/licenses/>.
 
-    Copyright 2017-2019 Telegram Systems LLP
+    Copyright 2017-2020 Telegram Systems LLP
 */
 #include "func.h"
 #include "td/utils/crypto.h"
+#include "common/refint.h"
 #include <fstream>
 
 namespace sym {
@@ -99,14 +100,21 @@ TypeExpr* parse_type1(Lexer& lex) {
       lex.cur().error_at("`", "` is not a type identifier");
     }
   }
-  lex.expect('(');
-  if (lex.tp() == ')') {
+  int c;
+  if (lex.tp() == '[') {
     lex.next();
-    return TypeExpr::new_unit();
+    c = ']';
+  } else {
+    lex.expect('(');
+    c = ')';
+  }
+  if (lex.tp() == c) {
+    lex.next();
+    return c == ')' ? TypeExpr::new_unit() : TypeExpr::new_tuple({});
   }
   auto t1 = parse_type(lex);
   if (lex.tp() != ',') {
-    lex.expect(')');
+    lex.expect(c);
     return t1;
   }
   std::vector<TypeExpr*> tlist{1, t1};
@@ -114,8 +122,8 @@ TypeExpr* parse_type1(Lexer& lex) {
     lex.next();
     tlist.push_back(parse_type(lex));
   }
-  lex.expect(')');
-  return TypeExpr::new_tensor(std::move(tlist));
+  lex.expect(c);
+  return c == ')' ? TypeExpr::new_tensor(std::move(tlist)) : TypeExpr::new_tuple(std::move(tlist));
 }
 
 TypeExpr* parse_type(Lexer& lex) {
@@ -174,6 +182,53 @@ FormalArg parse_formal_arg(Lexer& lex, int fa_idx) {
   return std::make_tuple(arg_type, new_sym_def, loc);
 }
 
+void parse_global_var_decl(Lexer& lex) {
+  TypeExpr* var_type = 0;
+  SrcLocation loc = lex.cur().loc;
+  if (lex.tp() == '_') {
+    lex.next();
+    var_type = TypeExpr::new_hole();
+    loc = lex.cur().loc;
+  } else if (lex.tp() != _Ident) {
+    var_type = parse_type(lex);
+  } else {
+    auto sym = sym::lookup_symbol(lex.cur().val);
+    if (sym && dynamic_cast<SymValType*>(sym->value)) {
+      auto val = dynamic_cast<SymValType*>(sym->value);
+      lex.next();
+      var_type = val->get_type();
+    } else {
+      var_type = TypeExpr::new_hole();
+    }
+  }
+  if (lex.tp() != _Ident) {
+    lex.expect(_Ident, "global variable name");
+  }
+  loc = lex.cur().loc;
+  SymDef* sym_def = sym::define_global_symbol(lex.cur().val, false, loc);
+  if (!sym_def) {
+    lex.cur().error_at("cannot define global symbol `", "`");
+  }
+  if (sym_def->value) {
+    auto val = dynamic_cast<SymValGlobVar*>(sym_def->value);
+    if (!val) {
+      lex.cur().error_at("symbol `", "` cannot be redefined as a global variable");
+    }
+    try {
+      unify(var_type, val->sym_type);
+    } catch (UnifyError& ue) {
+      std::ostringstream os;
+      os << "cannot unify new type " << var_type << " of global variable `" << sym_def->name()
+         << "` with its previous type " << val->sym_type << ": " << ue;
+      lex.cur().error(os.str());
+    }
+  } else {
+    sym_def->value = new SymValGlobVar{glob_var_cnt++, var_type};
+    glob_vars.push_back(sym_def);
+  }
+  lex.next();
+}
+
 FormalArgList parse_formal_args(Lexer& lex) {
   FormalArgList args;
   lex.expect('(', "formal argument list");
@@ -205,6 +260,18 @@ TypeExpr* extract_total_arg_type(const FormalArgList& arg_list) {
   return TypeExpr::new_tensor(std::move(type_list));
 }
 
+void parse_global_var_decls(Lexer& lex) {
+  lex.expect(_Global);
+  while (true) {
+    parse_global_var_decl(lex);
+    if (lex.tp() != ',') {
+      break;
+    }
+    lex.expect(',');
+  }
+  lex.expect(';');
+}
+
 SymValCodeFunc* make_new_glob_func(SymDef* func_sym, TypeExpr* func_type, bool impure = false) {
   SymValCodeFunc* res = new SymValCodeFunc{glob_func_cnt, func_type, impure};
   func_sym->value = res;
@@ -239,30 +306,54 @@ bool check_global_func(const Lexem& cur, sym_idx_t func_name = 0) {
   }
 }
 
+Expr* make_func_apply(Expr* fun, Expr* x) {
+  Expr* res;
+  if (fun->cls == Expr::_Glob) {
+    if (x->cls == Expr::_Tensor) {
+      res = new Expr{Expr::_Apply, fun->sym, x->args};
+    } else {
+      res = new Expr{Expr::_Apply, fun->sym, {x}};
+    }
+    res->flags = Expr::_IsRvalue | (fun->flags & Expr::_IsImpure);
+  } else {
+    res = new Expr{Expr::_VarApply, {fun, x}};
+    res->flags = Expr::_IsRvalue;
+  }
+  return res;
+}
+
 Expr* parse_expr(Lexer& lex, CodeBlob& code, bool nv = false);
 
-// parse ( E { , E } ) | () | id | num | _
+// parse ( E { , E } ) | () | [ E { , E } ] | [] | id | num | _
 Expr* parse_expr100(Lexer& lex, CodeBlob& code, bool nv) {
-  if (lex.tp() == '(') {
+  if (lex.tp() == '(' || lex.tp() == '[') {
+    bool tf = (lex.tp() == '[');
+    int clbr = (tf ? ']' : ')');
     SrcLocation loc{lex.cur().loc};
     lex.next();
-    if (lex.tp() == ')') {
+    if (lex.tp() == clbr) {
       lex.next();
-      Expr* res = new Expr{Expr::_Tuple, {}};
+      Expr* res = new Expr{Expr::_Tensor, {}};
       res->flags = Expr::_IsRvalue;
       res->here = loc;
       res->e_type = TypeExpr::new_unit();
+      if (tf) {
+        res = new Expr{Expr::_MkTuple, {res}};
+        res->flags = Expr::_IsRvalue;
+        res->here = loc;
+        res->e_type = TypeExpr::new_tuple(res->args.at(0)->e_type);
+      }
       return res;
     }
     Expr* res = parse_expr(lex, code, nv);
     if (lex.tp() != ',') {
-      lex.expect(')');
+      lex.expect(clbr);
       return res;
     }
     std::vector<TypeExpr*> type_list;
     type_list.push_back(res->e_type);
     int f = res->flags;
-    res = new Expr{Expr::_Tuple, {res}};
+    res = new Expr{Expr::_Tensor, {res}};
     while (lex.tp() == ',') {
       lex.next();
       auto x = parse_expr(lex, code, nv);
@@ -275,8 +366,14 @@ Expr* parse_expr100(Lexer& lex, CodeBlob& code, bool nv) {
     }
     res->here = loc;
     res->flags = f;
-    res->e_type = TypeExpr::new_tensor(std::move(type_list));
-    lex.expect(')');
+    res->e_type = TypeExpr::new_tensor(std::move(type_list), !tf);
+    if (tf) {
+      res = new Expr{Expr::_MkTuple, {res}};
+      res->flags = f;
+      res->here = loc;
+      res->e_type = TypeExpr::new_tuple(res->args.at(0)->e_type);
+    }
+    lex.expect(clbr);
     return res;
   }
   int t = lex.tp();
@@ -306,7 +403,7 @@ Expr* parse_expr100(Lexer& lex, CodeBlob& code, bool nv) {
     lex.next();
     return res;
   }
-  if (t == _Int || t == _Cell || t == _Slice || t == _Builder || t == _Cont || t == _Type) {
+  if (t == _Int || t == _Cell || t == _Slice || t == _Builder || t == _Cont || t == _Type || t == _Tuple) {
     Expr* res = new Expr{Expr::_Type, lex.cur().loc};
     res->flags = Expr::_IsType;
     res->e_type = TypeExpr::new_atomic(t);
@@ -323,6 +420,16 @@ Expr* parse_expr100(Lexer& lex, CodeBlob& code, bool nv) {
       lex.next();
       return res;
     }
+    if (sym && dynamic_cast<SymValGlobVar*>(sym->value)) {
+      auto val = dynamic_cast<SymValGlobVar*>(sym->value);
+      Expr* res = new Expr{Expr::_GlobVar, lex.cur().loc};
+      res->e_type = val->get_type();
+      res->sym = sym;
+      res->flags = Expr::_IsLvalue | Expr::_IsRvalue | Expr::_IsImpure;
+      lex.next();
+      return res;
+    }
+    bool auto_apply = false;
     Expr* res = new Expr{Expr::_Var, lex.cur().loc};
     if (nv) {
       res->val = ~lex.cur().val;
@@ -344,6 +451,7 @@ Expr* parse_expr100(Lexer& lex, CodeBlob& code, bool nv) {
       } else if (val->type == SymVal::_Func) {
         res->e_type = val->get_type();
         res->cls = Expr::_Glob;
+        auto_apply = val->auto_apply;
       } else if (val->idx < 0) {
         lex.cur().error_at("accessing variable `", "` being defined");
       } else {
@@ -354,6 +462,12 @@ Expr* parse_expr100(Lexer& lex, CodeBlob& code, bool nv) {
       // std::cerr << "accessing symbol " << lex.cur().str << " : " << res->e_type << (val->impure ? " (impure)" : " (pure)") << std::endl;
       res->flags = Expr::_IsLvalue | Expr::_IsRvalue | (val->impure ? Expr::_IsImpure : 0);
     }
+    if (auto_apply) {
+      int impure = res->flags & Expr::_IsImpure;
+      delete res;
+      res = new Expr{Expr::_Apply, sym, {}};
+      res->flags = Expr::_IsRvalue | impure;
+    }
     res->deduce_type(lex.cur());
     lex.next();
     return res;
@@ -362,26 +476,10 @@ Expr* parse_expr100(Lexer& lex, CodeBlob& code, bool nv) {
   return nullptr;
 }
 
-Expr* make_func_apply(Expr* fun, Expr* x) {
-  Expr* res;
-  if (fun->cls == Expr::_Glob) {
-    if (x->cls == Expr::_Tuple) {
-      res = new Expr{Expr::_Apply, fun->sym, x->args};
-    } else {
-      res = new Expr{Expr::_Apply, fun->sym, {x}};
-    }
-    res->flags = Expr::_IsRvalue | (fun->flags & Expr::_IsImpure);
-  } else {
-    res = new Expr{Expr::_VarApply, {fun, x}};
-    res->flags = Expr::_IsRvalue;
-  }
-  return res;
-}
-
 // parse E { E }
 Expr* parse_expr90(Lexer& lex, CodeBlob& code, bool nv) {
   Expr* res = parse_expr100(lex, code, nv);
-  while (lex.tp() == '(' || (lex.tp() == _Ident && !is_special_ident(lex.cur().val))) {
+  while (lex.tp() == '(' || lex.tp() == '[' || (lex.tp() == _Ident && !is_special_ident(lex.cur().val))) {
     if (res->is_type()) {
       Expr* x = parse_expr100(lex, code, true);
       x->chk_lvalue(lex.cur());  // chk_lrvalue() ?
@@ -446,7 +544,7 @@ Expr* parse_expr80(Lexer& lex, CodeBlob& code, bool nv) {
     lex.next();
     auto x = parse_expr100(lex, code, false);
     x->chk_rvalue(lex.cur());
-    if (x->cls == Expr::_Tuple) {
+    if (x->cls == Expr::_Tensor) {
       res = new Expr{Expr::_Apply, name, {obj}};
       res->args.insert(res->args.end(), x->args.begin(), x->args.end());
     } else {
@@ -1168,8 +1266,9 @@ void parse_func_def(Lexer& lex) {
     }
     if (val->method_id.is_null()) {
       val->method_id = std::move(method_id);
-    } else if (val->method_id != method_id) {
-      lex.cur().error("integer method identifier for `"s + func_name.str + "` changed to a different value");
+    } else if (td::cmp(val->method_id, method_id) != 0) {
+      lex.cur().error("integer method identifier for `"s + func_name.str + "` changed from " +
+                      val->method_id->to_dec_string() + " to a different value " + method_id->to_dec_string());
     }
   }
   if (f) {
@@ -1191,9 +1290,13 @@ void parse_func_def(Lexer& lex) {
 
 bool parse_source(std::istream* is, const src::FileDescr* fdescr) {
   src::SourceReader reader{is, fdescr};
-  Lexer lex{reader, true};
+  Lexer lex{reader, true, ";,()[] ~."};
   while (lex.tp() != _Eof) {
-    parse_func_def(lex);
+    if (lex.tp() == _Global) {
+      parse_global_var_decls(lex);
+    } else {
+      parse_func_def(lex);
+    }
   }
   return true;
 }
diff --git a/submodules/ton/tonlib-src/crypto/func/stack-transform.cpp b/submodules/ton/tonlib-src/crypto/func/stack-transform.cpp
index f682b49075..4d9b6a5fc3 100644
--- a/submodules/ton/tonlib-src/crypto/func/stack-transform.cpp
+++ b/submodules/ton/tonlib-src/crypto/func/stack-transform.cpp
@@ -14,7 +14,7 @@
     You should have received a copy of the GNU Lesser General Public License
     along with TON Blockchain Library.  If not, see <http://www.gnu.org/licenses/>.
 
-    Copyright 2017-2019 Telegram Systems LLP
+    Copyright 2017-2020 Telegram Systems LLP
 */
 #include "func.h"
 
@@ -334,6 +334,13 @@ bool StackTransform::apply_pop(int i) {
   }
 }
 
+bool StackTransform::apply_blkpop(int k) {
+  if (!is_valid() || k < 0) {
+    return invalidate();
+  }
+  return !k || (touch(k - 1) && shift(k));
+}
+
 bool StackTransform::equal(const StackTransform &other, bool relaxed) const {
   if (!is_valid() || !other.is_valid()) {
     return false;
@@ -394,6 +401,57 @@ bool StackTransform::is_xchg(int *i, int *j) const {
   return true;
 }
 
+bool StackTransform::is_xchg_xchg(int i, int j, int k, int l) const {
+  if (is_valid() && !d && n <= 4 && (i | j | k | l) >= 0) {
+    StackTransform t;
+    return t.apply_xchg(i, j) && t.apply_xchg(k, l) && t <= *this;
+  } else {
+    return false;
+  }
+}
+
+bool StackTransform::is_xchg_xchg(int *i, int *j, int *k, int *l) const {
+  if (!is_valid() || d || n > 4 || !dp || !is_permutation()) {
+    return false;
+  }
+  if (!n) {
+    *i = *j = *k = *l = 0;
+    return true;
+  }
+  if (n <= 2) {
+    *k = *l = 0;
+    return is_xchg(i, j);
+  }
+  if (n == 3) {
+    // rotation: a -> b -> c -> a
+    int a = A[0].first;
+    int b = A[0].second;
+    int s = (b == A[2].first ? 2 : 1);
+    int c = A[s].second;
+    if (b != A[s].first || c != A[3 - s].first || a != A[3 - s].second) {
+      return false;
+    }
+    // implement as XCHG s(a),s(c) ; XCHG s(a),s(b)
+    *i = *k = a;
+    *j = c;
+    *l = b;
+    return is_xchg_xchg(*i, *j, *k, *l);
+  }
+  *i = A[0].first;
+  *j = A[0].second;
+  if (get(*j) != *i) {
+    return false;
+  }
+  for (int s = 1; s < 4; s++) {
+    if (A[s].first != *j) {
+      *k = A[s].first;
+      *l = A[s].second;
+      return get(*l) == *k && is_xchg_xchg(*i, *j, *k, *l);
+    }
+  }
+  return false;
+}
+
 bool StackTransform::is_push(int i) const {
   return is_valid() && d == -1 && n == 1 && A[0].first == -1 && A[0].second == i;
 }
@@ -411,6 +469,7 @@ bool StackTransform::is_push(int *i) const {
 // 0 2 3 4 .. = pop1
 // 1 0 3 4 .. = pop2
 // 1 2 0 4 .. = pop3
+// POP s(i) : 1 2 ... i-1 0 i+1 ... ; d=1, n=1, {(i,0)}
 bool StackTransform::is_pop(int i) const {
   if (!is_valid() || d != 1 || n > 1 || i < 0) {
     return false;
@@ -436,6 +495,38 @@ bool StackTransform::is_pop(int *i) const {
   return false;
 }
 
+// POP s(i) ; POP s(j) : 2 ... i-1 0 i+1 ... j 1 j+2 ... ; d=2, n=2, {(i,0),(j+1,1)} if i <> j+1
+bool StackTransform::is_pop_pop(int i, int j) const {
+  if (is_valid() && d == 2 && n <= 2 && i >= 0 && j >= 0) {
+    StackTransform t;
+    return t.apply_pop(i) && t.apply_pop(j) && t <= *this;
+  } else {
+    return false;
+  }
+}
+
+bool StackTransform::is_pop_pop(int *i, int *j) const {
+  if (!is_valid() || d != 2 || n > 2) {
+    return false;
+  }
+  if (!n) {
+    *i = *j = 0;  // 2DROP
+  } else if (n == 2) {
+    *i = A[0].first - A[0].second;
+    *j = A[1].first - A[1].second;
+    if (A[0].second > A[1].second) {
+      std::swap(*i, *j);
+    }
+  } else if (!A[0].second) {
+    *i = A[0].first;
+    *j = 0;
+  } else {
+    *i = 0;
+    *j = A[0].first - 1;
+  }
+  return is_pop_pop(*i, *j);
+}
+
 const StackTransform StackTransform::rot{2, 0, 1, 3};
 const StackTransform StackTransform::rot_rev{1, 2, 0, 3};
 
@@ -447,6 +538,53 @@ bool StackTransform::is_rotrev() const {
   return equal(rot_rev, true);
 }
 
+// PUSH i ; ROT == 1 i 0 2 3
+bool StackTransform::is_push_rot(int i) const {
+  return is_valid() && d == -1 && i >= 0 && is_trivial_after(3) && get(0) == 1 && get(1) == i && get(2) == 0;
+}
+
+bool StackTransform::is_push_rot(int *i) const {
+  return is_valid() && (*i = get(1)) >= 0 && is_push_rot(*i);
+}
+
+// PUSH i ; -ROT == 0 1 i 2 3
+bool StackTransform::is_push_rotrev(int i) const {
+  return is_valid() && d == -1 && i >= 0 && is_trivial_after(3) && get(0) == 0 && get(1) == 1 && get(2) == i;
+}
+
+bool StackTransform::is_push_rotrev(int *i) const {
+  return is_valid() && (*i = get(2)) >= 0 && is_push_rotrev(*i);
+}
+
+// PUSH s(i) ; XCHG s(j),s(k) --> i 0 1 .. i ..
+// PUSH s(i) ; XCHG s(0),s(k) --> k-1 0 1 .. k-2 i k ..
+bool StackTransform::is_push_xchg(int i, int j, int k) const {
+  StackTransform t;
+  return is_valid() && d == -1 && n <= 3 && t.apply_push(i) && t.apply_xchg(j, k) && t <= *this;
+}
+
+bool StackTransform::is_push_xchg(int *i, int *j, int *k) const {
+  if (!(is_valid() && d == -1 && n <= 3 && n > 0)) {
+    return false;
+  }
+  int s = get(0);
+  if (s < 0) {
+    return false;
+  }
+  *i = s;
+  *j = 0;
+  if (n == 1) {
+    *k = 0;
+  } else if (n == 2) {
+    *k = s + 1;
+    *i = get(s + 1);
+  } else {
+    *j = A[1].first + 1;
+    *k = A[2].first + 1;
+  }
+  return is_push_xchg(*i, *j, *k);
+}
+
 // XCHG s1,s(i) ; XCHG s0,s(j)
 bool StackTransform::is_xchg2(int i, int j) const {
   StackTransform t;
@@ -465,10 +603,9 @@ bool StackTransform::is_xchg2(int *i, int *j) const {
   if (*i < 0 || *j < 0) {
     return false;
   }
-  if (n != 3) {
-    return is_xchg2(*i, *j);
-  }
-  if (*i) {
+  if (n == 2 && !*i) {
+    *j = *i;  // XCHG s0,s1 = XCHG2 s0,s0
+  } else if (n == 3 && *i) {
     // XCHG2 s(i),s(i) = XCHG s1,s(i) ; XCHG s0,s(i) : 0->1, 1->i
     *j = *i;
   }  // XCHG2 s0,s(i) = XCHG s0,s1 ; XCHG s0,s(i) : 0->i, 1->0
@@ -735,6 +872,28 @@ bool StackTransform::is_blkdrop(int *i) const {
   return false;
 }
 
+// 0 1 .. j-1 j+i j+i+1 ...
+bool StackTransform::is_blkdrop2(int i, int j) const {
+  if (!is_valid() || d != i || i <= 0 || j < 0 || dp < i + j || n != j || !is_trivial_after(j)) {
+    return false;
+  }
+  for (int s = 0; s < j; s++) {
+    if (get(s) != s) {
+      return false;
+    }
+  }
+  return true;
+}
+
+bool StackTransform::is_blkdrop2(int *i, int *j) const {
+  if (is_valid() && is_blkdrop2(d, n)) {
+    *i = d;
+    *j = n;
+    return true;
+  }
+  return false;
+}
+
 // equivalent to i times PUSH s(j)
 bool StackTransform::is_blkpush(int *i, int *j) const {
   if (!is_valid() || d >= 0) {
@@ -800,6 +959,77 @@ bool StackTransform::is_nip_seq(int *i, int *j) const {
   }
 }
 
+// POP s(i); BLKDROP k  (usually for i >= k >= 0)
+bool StackTransform::is_pop_blkdrop(int i, int k) const {
+  StackTransform t;
+  return is_valid() && d == k + 1 && t.apply_pop(i) && t.apply_blkpop(k) && t <= *this;
+}
+
+// POP s(i); BLKDROP k == XCHG s0,s(i); BLKDROP k+1  for i >= k >= 0
+// k+1 k+2 .. i-1 0 i+1 ..
+bool StackTransform::is_pop_blkdrop(int *i, int *k) const {
+  if (is_valid() && n == 1 && d > 0 && !A[0].second) {
+    *k = d - 1;
+    *i = A[0].first;
+    return is_pop_blkdrop(*i, *k);
+  } else {
+    return false;
+  }
+}
+
+// POP s(i); POP s(j); BLKDROP k  (usually for i<>j >= k >= 0)
+bool StackTransform::is_2pop_blkdrop(int i, int j, int k) const {
+  StackTransform t;
+  return is_valid() && d == k + 2 && t.apply_pop(i) && t.apply_pop(j) && t.apply_blkpop(k) && t <= *this;
+}
+
+// POP s(i); POP s(j); BLKDROP k == XCHG s0,s(i); XCHG s1,s(j+1); BLKDROP k+2 (usually for i<>j >= k >= 2)
+// k+2 k+3 .. i-1 0 i+1 ... j 1 j+2 ...
+bool StackTransform::is_2pop_blkdrop(int *i, int *j, int *k) const {
+  if (is_valid() && n == 2 && d >= 2 && A[0].second + A[1].second == 1) {
+    *k = d - 2;
+    int t = (A[0].second > 0);
+    *i = A[t].first;
+    *j = A[1 - t].first - 1;
+    return is_2pop_blkdrop(*i, *j, *k);
+  } else {
+    return false;
+  }
+}
+
+// PUSHCONST c ; ROT == 1 -1000 0 2 3
+bool StackTransform::is_const_rot(int c) const {
+  return is_valid() && d == -1 && is_trivial_after(3) && get(0) == 1 && c <= c_start && get(1) == c && get(2) == 0;
+}
+
+bool StackTransform::is_const_rot(int *c) const {
+  return is_valid() && (*c = get(1)) <= c_start && is_const_rot(*c);
+}
+
+// PUSHCONST c ; POP s(i) == 0 1 .. i-1 -1000 i+1 ...
+bool StackTransform::is_const_pop(int c, int i) const {
+  return is_valid() && !d && n == 1 && i > 0 && c <= c_start && get(i - 1) == c;
+}
+
+bool StackTransform::is_const_pop(int *c, int *i) const {
+  if (is_valid() && !d && n == 1 && A[0].second <= c_start) {
+    *i = A[0].first + 1;
+    *c = A[0].second;
+    return is_const_pop(*c, *i);
+  } else {
+    return false;
+  }
+}
+
+// PUSH i ; PUSHCONST c == c i 0 1 2 ...
+bool StackTransform::is_push_const(int i, int c) const {
+  return is_valid() && d == -2 && c <= c_start && i >= 0 && is_trivial_after(2) && get(0) == c && get(1) == i;
+}
+
+bool StackTransform::is_push_const(int *i, int *c) const {
+  return is_valid() && d == -2 && n == 2 && is_push_const(*i = get(1), *c = get(0));
+}
+
 void StackTransform::show(std::ostream &os, int mode) const {
   if (!is_valid()) {
     os << "<invalid>";
diff --git a/submodules/ton/tonlib-src/crypto/func/test/a10.fc b/submodules/ton/tonlib-src/crypto/func/test/a10.fc
new file mode 100644
index 0000000000..70c7871d70
--- /dev/null
+++ b/submodules/ton/tonlib-src/crypto/func/test/a10.fc
@@ -0,0 +1,9 @@
+_ f(int a, int x) {
+  int y = 0;
+  int z = 0;
+  while ((y = x * x) > a) {
+    x -= 1;
+    z = 1;
+  }
+  return (y, z);
+}
diff --git a/submodules/ton/tonlib-src/crypto/func/test/a11.fc b/submodules/ton/tonlib-src/crypto/func/test/a11.fc
new file mode 100644
index 0000000000..45bdf1f368
--- /dev/null
+++ b/submodules/ton/tonlib-src/crypto/func/test/a11.fc
@@ -0,0 +1,28 @@
+_ f(slice ds, int total_weight, int elect_at, cell frozen, int total_stakes, int cnt, cell credits, cell vdict, int elect) {
+  return (ds, elect, credits);
+}
+
+_ g(slice ds, int total_weight, int elect_at, cell frozen, int total_stakes, int cnt, cell credits, int elect) {
+  return (ds, elect, credits);
+}
+
+_ h(slice ds, int total_weight, int elect_at, cell frozen, int total_stakes, cell credits, int elect) {
+  return (ds, elect, credits);
+}
+
+_ h2(slice ds, int total_weight, int elect_at, cell frozen, int total_stakes, cell credits, int elect) {
+  return (ds, credits, elect);
+}
+
+_ h3(int pubkey, int adnl_addr, int stake, int tot_weight, tuple vinfo) {
+  return (pubkey, tot_weight, stake, vinfo);
+}
+
+_ z(int a, int b) {
+  return (b, 0, a);
+}
+
+_ z2(int a, int b) {
+  return (0, a, b);
+}
+
diff --git a/submodules/ton/tonlib-src/crypto/func/test/a6_4.fc b/submodules/ton/tonlib-src/crypto/func/test/a6_4.fc
new file mode 100644
index 0000000000..d7e6596a09
--- /dev/null
+++ b/submodules/ton/tonlib-src/crypto/func/test/a6_4.fc
@@ -0,0 +1,20 @@
+var calc_root(m) {
+  int base = 1;
+  repeat(70) { base *= 10; }
+  var (a, b, c) = (1, 0, - m);
+  var (p1, q1, p2, q2) = (1, 0, 0, 1);
+  do {
+    int k = -1;
+    var (a1, b1, c1) = (0, 0, 0);
+    do {
+      k += 1;
+      (a1, b1, c1) = (a, b, c);
+      c += b;
+      c += b += a;
+    } until (c > 0);
+    (a, b, c) = (- c1, - b1, - a1);
+    (p1, q1) = (k * p1 + q1, p1);
+    (p2, q2) = (k * p2 + q2, p2);
+  } until (p1 > base);
+  return (p1, q1, p2, q2);
+}
diff --git a/submodules/ton/tonlib-src/crypto/func/test/a6_5.fc b/submodules/ton/tonlib-src/crypto/func/test/a6_5.fc
new file mode 100644
index 0000000000..ece7cd38d2
--- /dev/null
+++ b/submodules/ton/tonlib-src/crypto/func/test/a6_5.fc
@@ -0,0 +1,20 @@
+var twice(f, x) {
+  return f (f x);
+}
+
+_ sqr(x) {
+  return x * x;
+}
+
+var main(x) {
+  var f = sqr;
+  return twice(f, x) * f(x);
+}
+
+var pow6(x) {
+  return twice(sqr, x) * sqr(x);
+}
+
+_ q() {
+  return false;
+}
diff --git a/submodules/ton/tonlib-src/crypto/func/test/c1.fc b/submodules/ton/tonlib-src/crypto/func/test/c1.fc
new file mode 100644
index 0000000000..1a07baca10
--- /dev/null
+++ b/submodules/ton/tonlib-src/crypto/func/test/c1.fc
@@ -0,0 +1,37 @@
+global int x, y, z;
+global (cell, slice) y;
+global ((int, int) -> int) op;
+
+_ get() {
+  var t = z + 1;
+  return x;
+}
+
+_ pre_next() {
+  return x + 1;
+}
+
+() init() impure {
+  ;; global x;
+  x = 0;
+}
+
+int next() impure {
+  ;; global x;
+  return x += 1;
+}
+
+_ set_y(x, w) {
+  y = (w, x);
+}
+
+_ get_y() impure {
+  return y;
+}
+
+int main(int c) {
+  init();
+  c += next();
+  return c + pre_next();
+}
+
diff --git a/submodules/ton/tonlib-src/crypto/func/test/c2.fc b/submodules/ton/tonlib-src/crypto/func/test/c2.fc
new file mode 100644
index 0000000000..277c70530a
--- /dev/null
+++ b/submodules/ton/tonlib-src/crypto/func/test/c2.fc
@@ -0,0 +1,10 @@
+global ((int, int) -> int) op;
+
+int check_assoc(int a, int b, int c) {
+  return op(op(a, b), c) == op(a, op(b, c));
+}
+
+int main() {
+  op = _+_;
+  return check_assoc(2, 3, 9);
+}
diff --git a/submodules/ton/tonlib-src/crypto/func/test/c2_1.fc b/submodules/ton/tonlib-src/crypto/func/test/c2_1.fc
new file mode 100644
index 0000000000..3bf863a6d7
--- /dev/null
+++ b/submodules/ton/tonlib-src/crypto/func/test/c2_1.fc
@@ -0,0 +1,7 @@
+_ check_assoc(op, a, b, c) {
+  return op(op(a, b), c) == op(a, op(b, c));
+}
+
+int main() {
+  return check_assoc(_+_, 2, 3, 9);
+}
diff --git a/submodules/ton/tonlib-src/crypto/func/test/w8.fc b/submodules/ton/tonlib-src/crypto/func/test/w8.fc
new file mode 100644
index 0000000000..bd0696e736
--- /dev/null
+++ b/submodules/ton/tonlib-src/crypto/func/test/w8.fc
@@ -0,0 +1,22 @@
+int check_signatures(msg_hash, signatures, signers, bitmask_size) impure {
+  var bitmask = 0;
+  var id = -1;
+  do {
+    (id, var signature, var f) = signatures.udict_get_next?(32, id);
+    if (f){
+      var sig = signature.preload_bits(512);
+      var public_key = -1;
+      do {
+        (public_key, var cs, var _found) = signers.udict_get_next?(256, public_key);
+        if (_found){
+          if (check_signature(msg_hash, sig, public_key)){
+            var signer_index = cs~load_uint(bitmask_size);
+                    bitmask = bitmask | (1 << (signer_index - 1));  
+          } 
+        }
+      } until (~ _found);
+      ;; signature~touch(); 
+    }
+  } until (~ f);
+  return bitmask;
+}
diff --git a/submodules/ton/tonlib-src/crypto/func/test/w9.fc b/submodules/ton/tonlib-src/crypto/func/test/w9.fc
new file mode 100644
index 0000000000..d943554210
--- /dev/null
+++ b/submodules/ton/tonlib-src/crypto/func/test/w9.fc
@@ -0,0 +1,8 @@
+_ g(s) {
+  var (z, t) = (17, s);
+  while (z > 0) {
+    t = s;
+    z -= 1;
+  }
+  return ~ t;
+}
diff --git a/submodules/ton/tonlib-src/crypto/func/unify-types.cpp b/submodules/ton/tonlib-src/crypto/func/unify-types.cpp
index 698d21feba..0a10141624 100644
--- a/submodules/ton/tonlib-src/crypto/func/unify-types.cpp
+++ b/submodules/ton/tonlib-src/crypto/func/unify-types.cpp
@@ -14,7 +14,7 @@
     You should have received a copy of the GNU Lesser General Public License
     along with TON Blockchain Library.  If not, see <http://www.gnu.org/licenses/>.
 
-    Copyright 2017-2019 Telegram Systems LLP
+    Copyright 2017-2020 Telegram Systems LLP
 */
 #include "func.h"
 
@@ -47,6 +47,12 @@ void TypeExpr::compute_width() {
         maxw = w_inf;
       }
       break;
+    case te_Tuple:
+      minw = maxw = 1;
+      for (TypeExpr* arg : args) {
+        arg->compute_width();
+      }
+      break;
     case te_Indirect:
       minw = args[0]->minw;
       maxw = args[0]->maxw;
@@ -84,6 +90,14 @@ bool TypeExpr::recompute_width() {
       }
       return true;
     }
+    case te_Tuple: {
+      for (TypeExpr* arg : args) {
+        if (arg->minw > 1 || arg->maxw < 1 || arg->minw > arg->maxw) {
+          return false;
+        }
+      }
+      return true;
+    }
     default:
       return false;
   }
@@ -233,7 +247,9 @@ std::ostream& TypeExpr::print(std::ostream& os, int lex_level) {
       }
     }
     case te_Tensor: {
-      os << "(";
+      if (lex_level > -127) {
+        os << "(";
+      }
       auto c = args.size();
       if (c) {
         for (const auto& x : args) {
@@ -243,7 +259,25 @@ std::ostream& TypeExpr::print(std::ostream& os, int lex_level) {
           }
         }
       }
-      return os << ")";
+      if (lex_level > -127) {
+        os << ")";
+      }
+      return os;
+    }
+    case te_Tuple: {
+      os << "[";
+      auto c = args.size();
+      if (c == 1 && args[0]->constr == te_Tensor) {
+        args[0]->print(os, -127);
+      } else if (c) {
+        for (const auto& x : args) {
+          x->print(os);
+          if (--c) {
+            os << ", ";
+          }
+        }
+      }
+      return os << "]";
     }
     case te_Map: {
       assert(args.size() == 2);
@@ -312,7 +346,7 @@ void check_update_widths(TypeExpr* te1, TypeExpr* te2) {
   check_width_compat(te1, te2);
   te1->minw = te2->minw = std::max(te1->minw, te2->minw);
   te1->maxw = te2->maxw = std::min(te1->maxw, te2->maxw);
-  assert(te1->minw <= te2->minw);
+  assert(te1->minw <= te1->maxw);
 }
 
 void unify(TypeExpr*& te1, TypeExpr*& te2) {
diff --git a/submodules/ton/tonlib-src/crypto/parser/symtable.h b/submodules/ton/tonlib-src/crypto/parser/symtable.h
index 6c77ca7b03..88f683bd3e 100644
--- a/submodules/ton/tonlib-src/crypto/parser/symtable.h
+++ b/submodules/ton/tonlib-src/crypto/parser/symtable.h
@@ -32,7 +32,7 @@ namespace sym {
 typedef int var_idx_t;
 
 struct SymValBase {
-  enum { _Param, _Var, _Func, _Typename };
+  enum { _Param, _Var, _Func, _Typename, _GlobVar };
   int type;
   int idx;
   SymValBase(int _type, int _idx) : type(_type), idx(_idx) {
diff --git a/submodules/ton/tonlib-src/crypto/smartcont/CreateState.fif b/submodules/ton/tonlib-src/crypto/smartcont/CreateState.fif
index ed82499b5f..1330a446f1 100644
--- a/submodules/ton/tonlib-src/crypto/smartcont/CreateState.fif
+++ b/submodules/ton/tonlib-src/crypto/smartcont/CreateState.fif
@@ -242,3 +242,7 @@ dictnew constant special-dict
   register_smc
   Masterchain swap 6 .Addr cr
 } : create-wallet0
+
+{ dup tlb-type-lookup { nip } { "unknown TLB type " swap $+ abort } cond } : $>tlb
+{ bl word $>tlb 1 'nop } ::_ tlb:
+{ <b swap vmcont, b> <s tlb:VmCont tlb-dump-as } : vmcont.
diff --git a/submodules/ton/tonlib-src/crypto/smartcont/auto-dns.fif b/submodules/ton/tonlib-src/crypto/smartcont/auto-dns.fif
new file mode 100644
index 0000000000..6ef2ef0e54
--- /dev/null
+++ b/submodules/ton/tonlib-src/crypto/smartcont/auto-dns.fif
@@ -0,0 +1,115 @@
+#!/usr/bin/fift -s
+"TonUtil.fif" include
+"GetOpt.fif" include
+
+{ show-options-help 1 halt } : usage
+
+"dns-msg-body.boc" =: savefile
+
+begin-options
+     " <auto-dns-addr> [-o<savefile-boc>] (add|update|prolong) <subdomain> <expire-in-sec> ... " +cr +tab
+    +"Creates the internal message body containing a request to automatic DNS smart contract <auto-dns-addr> created by new-auto-dns.fif, "
+    +"to be sent later with a suitable payment from a wallet to <auto-dns-addr>, and saves it into <savefile-boc> ('" savefile $+ +"' by default). "
+    +"The operation to be performed is one of" +cr +tab
+    +"add <subdomain> <expire-in-sec> { owner <smc-addr> | cat <cat-id> (smc <smc-addr> | next <next-resolver-smc-addr> | adnl <adnl-addr> | text <string>) }" +cr +tab
+    +"update <subdomain> <expire-in-sec> { owner <smc-addr> | cat <cat-id> (smc <smc-addr> | next <next-resolver-smc-addr> | adnl <adnl-addr> | text <string>) }" +cr +tab
+    +"prolong <subdomain> <expire-in-sec>"
+    disable-digit-options generic-help-setopt
+  "o" "--output" { =: savefile } short-long-option-arg
+    "Sets output file for generated initialization message ('" savefile $+ +"' by default)" option-help
+  "h" "--help" { usage } short-long-option
+    "Shows a help message" option-help
+parse-options
+
+$# 4 < ' usage if
+4 :$1..n
+
+$1 true parse-load-address =: bounce 2=: dest-addr
+$2 dup =: main-op-name atom =: main-op
+$3 dup =: subdomain $len 127 > abort"subdomain name too long"
+$4 parse-int dup 30 1<< < { now + } if =: expire-at
+
+{ $* @ dup null? { second $@ ! } { drop } cond } : @skip
+{ $* @ null? } : @end?
+{ $* @ uncons $* ! } : @next
+{ @next drop } 4 times
+
+main-op dup `add eq? over `update eq? or swap `prolong eq? or
+{ "unknown main operation '" main-op-name $+ +"'; one of 'add', 'update' or 'prolong' expected" abort } ifnot
+main-op `prolong eq? not =: need-params
+
+$# 4 > need-params <> abort"extra parameters, or no parameters for chosen main operation"
+
+variable Values  dictnew Values !
+// ( i c -- )
+{ over 0= abort"category cannot be zero"
+  <b swap ref, swap Values @ 16 b>idict!+ not abort"duplicate category id"
+  Values !
+} : register-value  
+
+{ @end? abort"category number expected" @next (number) 1 <> abort"category must be integer"
+  dup 16 fits not abort"category does not fit into 16 bit integer"
+  dup 0= abort"category must be non-zero"
+} : parse-cat-num
+{ @end? abort"smart contract address expected" 
+  @next false parse-load-address drop
+} : cl-parse-smc-addr
+{ @end? abort"adnl address expected"
+  @next parse-adnl-addr
+} : cl-parse-adnl-addr
+{ <b x{9fd3} s, -rot Addr, 0 8 u, b> } : serialize-smc-addr
+{ <b x{ba93} s, -rot Addr, b> } : serialize-next-resolver
+{ <b x{ad01} s, swap 256 u, 0 8 u, b> } : serialize-adnl-addr
+{ <b x{1eda01} s, over $len 8 u, swap $, b> } : serialize-text
+{ @end? abort"subdomain record value expected" @next
+  dup "smc" $= { drop cl-parse-smc-addr serialize-smc-addr } {
+  dup "next" $= { drop cl-parse-smc-addr serialize-next-resolver } {
+  dup "adnl" $= { drop cl-parse-adnl-addr serialize-adnl-addr } {
+  dup "text" $= { drop @next serialize-text } {
+    "unknown record type "' swap $+ +"'" abort
+  } cond } cond } cond } cond
+} : parse-value
+{ @next dup "owner" $= { drop -2 cl-parse-smc-addr serialize-smc-addr } {
+  dup "cat" $= { drop parse-cat-num parse-value } {
+    "unknown action '" swap $+ +"'" abort
+  } cond } cond
+  register-value
+} : parse-action
+{ { @end? not } { parse-action } while } : parse-actions
+parse-actions
+
+// ( S -- S1 .. Sn n )
+{ 1 swap { dup "." $pos dup 0>= } { $| 1 $| nip rot 1+ swap } while drop swap
+} : split-by-dots
+// ( S -- s )
+{ dup $len dup 0= abort"subdomain cannot be empty" 126 > abort"subdomain too long"
+  dup 0 chr $pos 1+ abort"subdomain contains null characters"
+  split-by-dots <b {  // ... S b
+    swap dup $len 0= abort"empty subdomain component" $, 0 8 u,
+  } rot times b> <s
+} : subdomain>s
+
+main-op ( _( `add 0x72656764 ) _( `update 0x75706464 ) _( `prolong 0x70726f6c ) )
+assq-val not abort"unknown main operation"
+=: op-id 
+
+."Automatic DNS smart contract address = " dest-addr 2dup .addr cr 6 .Addr cr
+
+."Action: " main-op .l subdomain type space expire-at . cr
+."Operation code: 0x" op-id 8 0X. cr
+."Value: "
+Values @ dup null? { drop ."(none)" } { <s csr. } cond cr
+
+<b op-id 32 u, expire-at 32 u, Values @ dict, b> =: actions-builder
+
+// create an internal message
+now 32 << actions-builder hashu 32 1<<1- and + =: query_id
+<b op-id 32 i, query_id 64 u,
+   subdomain subdomain>s tuck sbits 8 / 7 i, swap s,
+   main-op `prolong eq? { Values @ ref, } ifnot
+   expire-at 32 u, b>
+dup ."Internal message body is: " <s csr. cr
+2 boc+>B dup Bx. cr
+."Query_id is " query_id dup . ."= 0x" X. cr
+savefile tuck B>file
+."(Saved to file " type .")" cr
diff --git a/submodules/ton/tonlib-src/crypto/smartcont/auto/config-code.cpp b/submodules/ton/tonlib-src/crypto/smartcont/auto/config-code.cpp
index 91b450367d..45f74a0656 100644
--- a/submodules/ton/tonlib-src/crypto/smartcont/auto/config-code.cpp
+++ b/submodules/ton/tonlib-src/crypto/smartcont/auto/config-code.cpp
@@ -1 +1 @@
-with_tvm_code("config", "te6ccgECJwEAA48AART/APSkE/Sg8sgLAQIBIAIDAgLHBAUCAvEjJAIBzQYHAAaqglsCASAICQIBIBUWAgEgCgsCASAQEQIBIAwNAgEgDg8A6QB0NMD+kAwIPpEAaQDcbATsSPHALGSXwPgAtMf0z8ighBOVlNUuo49MgHU0XH4MyBukjB/lNDXC//iA3AEupsyIfAEIfgjvAK8sJEC4p2AJFjwAYIQ7nZPS/AG4DGCEO52T2/wB+AQJF8EIMAAAYMesLHypYAAlO1E0NRQM4Ag9BXIzAHPFsntVIAApO1E0NTTH9P/IMcAkW2T9AQB4gHRgABsyBTMEssfy//0AMntVIAIBIBITAgEgFBQANzQ0wcBpu9+sPJJ0x/TH9MP0w8wIMIA8om+8omAAKxwgBjIywVQBc8WFMtuyx/LP8kB+wCAACSAQPAFgAgEgFxgCASAdHgIBIBkaAgEgGxwAWxx+DPQ1wv/+COCEE5Db2RwggDE/8jLEBTL/4Md+gITy2oSyx/LPwHPFslw+wCAAoQhghBDZlAhupwx0x/U0UATgCD0FQHgIYIQTkNvZLqOEDHUIfsE7UMC7VMB8QaC8gDgIYIQUGJLIbqVMTHT/9HgIYIQTkPvBbqTMfAI4DDyYIAEBICYAOTTB4AgsxKwwFPyqdMfAYIQjoEnirryqdP/0z8wgAgEgHyACASAhIgAfHAgcMjKAMs/y/8BzxbJ0IAANPQE0z/T/4AAZMgU9AASyz/L/wHPFoABFFsBcbCeIPkBMSGDB/QOb6ExkN+d1wv/IYMH9A5voTHyquKAArQw7UTQ1IAggCRTMfRqIG6TECNbjjgg0CDXScInjinTB9cLHwHAEfgjEr6wjhUBgCJUEET0blRTIfRuMIAkQBP0WjCTECNb4pQQNF8D4uLIzAHPFsntVIAHZIMI1xgg0x/TH9Mf+CMSufJj7UTQ1NMf0/8gxwCRbZP0BAHiAdFRUrryoSWCEFZvdGWhfrCK4Qb5AVQQdvkQ8qL4AAWkVHUEJcgUzBLLH8v/9ADJ7VT4DxA1RFXwCUMDyBTMEssfy//0AMntVICUBqgPTDyHbPNMHgCCzErDAU/Kp0x8BghCOgSeKuvKp0//TPzAJ+QFAqvkQ8qL4AAGkVHIDJ8gUzBLLH8v/9ADJ7VT4DxA1RxbwD8gUzBLLH8v/9ADJ7VQmADaAIvgzIG6SW23g0IBo1yHIAc8WyYAQ9A5voTA=");
+with_tvm_code("config", "te6ccgECHQEAA5oAART/APSkE/S88sgLAQIBIAIDAgFIBAUCAvEYGQICxQYHABGgmS/aiaGuFj8CAc0ICQAGqoJbAgEgCgsCASATFAIBSAwNAgEgDg8A6wB0NMD+kAwIPpEAaQDcbATsSPHALGSXwPgAtMf0z8ighBOVlNUuo4+bBLU0XH4MyBukjB/lNDXC//iA3AEup0yIfAE+CNSILwCvLAC3gKdgCRY8AGCEO52T0vwBuAxghDudk9v8AfgECRfBCDAAAGDHrCx8qWAAJTtRNDUUDOAIPQVyMwBzxbJ7VSACASAQEQIBIBISADM0NMHAcAS8onTH9Mf0w/TDzAgwgDyib7yiYAArHCAGMjLBVAFzxYUy27LH8s/yQH7AIAAJIBA8AWACAUgVFgHh8CuNhNkfyAqYNBg/oHN9DPkeuF/6mDQYP6BzfQkHlVcUwagnoCaZ/p/8wYNqoKgzggCfEojF7KmLaZOADvKalACHoHN9CYya+ENvBAEGR8EeeAoDHACHohgdAQU4GBVQAJXk0ttgkBQYP6LZgA8C0KQXAFscfgz0NcL//gjghBOQ29kcIIAxP/IyxAUy/+DHfoCE8tqEssfyz8BzxbJcPsAgAKcIYIQQ2ZQIbqcMdMf1NFAE4Ag9BUB4CGCEE5Db2S6jhMx1CH7BO1DAtDtHu1TAfEGgvIA4CGCEFBiSyG6lWwh0//R4CGCEE5D7wW6kzHwCOAw8mCAAJAPI9AASyz/L/wHPFgKDB/RDbQChDDtRNDUgCCAJFMx9GogbpFbjjMg0CDXScInjibTB9cLH/gjuwHAErCOFYAiWFFE9G5UUyH0bjCAJEAT9FowAZFb4pJfA+LiAcjMAc8Wye1UgAccgwjXGCDTH9Mf0x/4IxK58mPtRNDU0x/T//QE0VFSuvKhJYIQVm90ZaF+sIrhBvkBVBB2+RDyovgABaRUdQQlA8jMEssfy//0AMntVPgPEDVEVfAJQwMDyMwSyx/L//QAye1UgGgLWA9MPIds8AdMHgCCzErDAU/Kp0x8BghCOgSeKuvKp0//TPzAK+QFAu/kQ8qL4AAKkVHMEKAPIzBLLH8v/9ADJ7VT4D4Ai+DP5ABBXEDQQI0iQ8A9Uc0IkA8jMEssfy//0AMntVCBukl8FiuIbHABOgCL4MyBuk1ttcODQ0wcBwBLyqIBg1yHTP8gBzxbJEoAQ9A5voTABAC7THxA0ECTwCUMDA8jMEssfy//0AMntVA==");
diff --git a/submodules/ton/tonlib-src/crypto/smartcont/auto/config-code.fif b/submodules/ton/tonlib-src/crypto/smartcont/auto/config-code.fif
index 4899527fc1..585f03b666 100644
--- a/submodules/ton/tonlib-src/crypto/smartcont/auto/config-code.fif
+++ b/submodules/ton/tonlib-src/crypto/smartcont/auto/config-code.fif
@@ -13,12 +13,13 @@ PROGRAM{
   DECLPROC perform_action
   DECLPROC get_validator_descr
   DECLPROC unpack_validator_descr
-  DECLPROC create_new_entry
-  DECLPROC unpack_suggestion
-  DECLPROC pack_suggestion
+  DECLPROC new_proposal
+  DECLPROC unpack_proposal
+  DECLPROC pack_proposal
   DECLPROC register_vote
   DECLPROC recv_external
   DECLPROC run_ticktock
+  85143 DECLMETHOD seqno
   set_conf_param PROC:<{
     //  index value
     c4 PUSH	//  index value _3
@@ -38,24 +39,16 @@ PROGRAM{
     // 
     c4 PUSH	//  _1
     CTOS	//  cs
-    LDREF	//  _6 cs
-    32 LDU	//  _6 _8 cs
-    256 LDU	//  cfg_dict stored_seqno public_key cs
-    DUP	//  cfg_dict stored_seqno public_key cs cs
-    SEMPTY	//  cfg_dict stored_seqno public_key cs _15
-    IF:<{	//  cfg_dict stored_seqno public_key cs
-      NEWDICT	//  cfg_dict stored_seqno public_key cs _16
-    }>ELSE<{	//  cfg_dict stored_seqno public_key cs
-      LDDICT	//  cfg_dict stored_seqno public_key _16 cs
-      SWAP	//  cfg_dict stored_seqno public_key cs _16
-    }>	//  cfg_dict stored_seqno public_key cs vote_dict
-    SWAP	//  cfg_dict stored_seqno public_key vote_dict cs
+    LDREF	//  _4 cs
+    32 LDU	//  _4 _6 cs
+    256 LDU	//  _4 _6 _9 cs
+    LDDICT	//  res res res res cs
     ENDS
   }>
   store_data PROC:<{
     //  cfg_dict stored_seqno public_key vote_dict
-    NEWC	//  cfg_dict stored_seqno public_key vote_dict _4
-    s1 s4 XCHG	//  vote_dict stored_seqno public_key cfg_dict _4
+    s0 s3 XCHG
+    NEWC	//  vote_dict stored_seqno public_key cfg_dict _4
     STREF	//  vote_dict stored_seqno public_key _5
     s1 s2 XCHG	//  vote_dict public_key stored_seqno _5
     32 STU	//  vote_dict public_key _7
@@ -69,19 +62,17 @@ PROGRAM{
     CTOS	//  cs
     8 LDU	//  _4 cs
     SWAP	//  cs _4
-    -17 ADDCONST	//  cs _8
-    -2 PUSHINT	//  cs _8 _9=-2
-    AND	//  cs _10
-    9 THROWIF
+    18 EQINT	//  cs _8
+    9 THROWIFNOT
     32 LDU	//  utime_since cs
     32 LDU	//  utime_since utime_until cs
     16 LDU	//  utime_since utime_until total cs
-    16 LDU	//  utime_since utime_until total _44 _43
+    16 LDU	//  utime_since utime_until total _42 _41
     DROP	//  utime_since utime_until total main
     DUP	//  utime_since utime_until total main main
-    0 GTINT	//  utime_since utime_until total main _30
+    0 GTINT	//  utime_since utime_until total main _28
     9 THROWIFNOT
-    GEQ	//  utime_since utime_until _33
+    GEQ	//  utime_since utime_until _31
     9 THROWIFNOT
   }>
   send_answer PROC:<{
@@ -139,8 +130,7 @@ PROGRAM{
     1314280276 PUSHINT	//  s_addr src_addr tag query_id in_msg tag _29=1314280276
     EQUAL	//  s_addr src_addr tag query_id in_msg _30
     IFJMP:<{	//  s_addr src_addr tag query_id in_msg
-      s2 POP	//  s_addr src_addr in_msg query_id
-      SWAP	//  s_addr src_addr query_id in_msg
+      1 2 BLKDROP2	//  s_addr src_addr query_id in_msg
       LDREF	//  s_addr src_addr query_id vset in_msg
       ENDS
       1 PUSHINT	//  s_addr src_addr query_id vset _36=1
@@ -162,17 +152,17 @@ PROGRAM{
         s2 POP	//  s_addr vset query_id
         OVER	//  s_addr vset query_id vset
         check_validator_set CALLDICT	//  s_addr vset query_id t_since t_until
-        OVER
-        NOW	//  s_addr vset query_id t_since t_until t_since t
+        NOW	//  s_addr vset query_id t_since t_until t
+        s2 s(-1) PUXC	//  s_addr vset query_id t_since t_until t_since t
         GREATER	//  s_addr vset query_id t_since t_until _53
         s0 s2 XCHG	//  s_addr vset query_id _53 t_until t_since
         GREATER	//  s_addr vset query_id _53 _54
         AND	//  s_addr vset query_id ok
-      }>ELSE<{
-        s0 s2 XCHG	//  s_addr vset query_id ok
-      }>
+        s0 s2 XCHG	//  s_addr ok query_id vset
+      }>	//  s_addr ok query_id vset
+      s0 s2 XCHG	//  s_addr vset query_id ok
       IFJMP:<{	//  s_addr vset query_id
-        36 PUSHINT	//  s_addr vset query_id _56=36
+        36 PUSHINT
         ROT	//  s_addr query_id _56=36 vset
         set_conf_param CALLDICT
         4000730955 PUSHINT	//  s_addr query_id _58=4000730955
@@ -248,23 +238,24 @@ PROGRAM{
       SETCODE
       c3 PUSH	//  cfg_dict public_key new_code cs old_code
       s0 s2 XCHG	//  cfg_dict public_key old_code cs new_code
+      CTOS	//  cfg_dict public_key old_code cs _25
+      BLESS	//  cfg_dict public_key old_code cs _26
       c3 POP
       SWAP	//  cfg_dict public_key cs old_code
       after_code_upgrade CALLDICT
       0 THROW
     }>	//  cfg_dict public_key action cs
     OVER
-    1348619041 PUSHINT	//  cfg_dict public_key action cs action _29=1348619041
-    EQUAL	//  cfg_dict public_key action cs _30
+    1348619041 PUSHINT	//  cfg_dict public_key action cs action _31=1348619041
+    EQUAL	//  cfg_dict public_key action cs _32
     IFJMP:<{	//  cfg_dict public_key action cs
-      NIP
-      NIP	//  cfg_dict cs
+      2 1 BLKDROP2	//  cfg_dict cs
       256 LDU	//  cfg_dict public_key cs
       ENDS
     }>	//  cfg_dict public_key action cs
     OVER
-    1313074949 PUSHINT	//  cfg_dict public_key action cs action _35=1313074949
-    EQUAL	//  cfg_dict public_key action cs _36
+    1313074949 PUSHINT	//  cfg_dict public_key action cs action _37=1313074949
+    EQUAL	//  cfg_dict public_key action cs _38
     IFJMP:<{	//  cfg_dict public_key action cs
       NIP	//  cfg_dict public_key cs
       change_elector_code CALLDICT
@@ -281,18 +272,26 @@ PROGRAM{
     IFJMP:<{	//  idx vset
       2DROP	// 
       PUSHNULL	//  _5
+      0 PUSHINT	//  _5 _6=0
     }>	//  idx vset
     CTOS	//  idx cs
-    104 PUSHINT	//  idx cs _17
+    8 LDU	//  idx _10 cs
+    SWAP	//  idx cs _10
+    18 EQINT	//  idx cs _14
+    40 THROWIFNOT
+    96 PUSHINT	//  idx cs _23
     SDSKIPFIRST	//  idx cs
-    NEWC	//  idx cs _20
-    SWAP	//  idx _20 cs
-    STSLICER	//  idx _21
-    ENDC	//  idx dict
-    16 PUSHINT	//  idx dict _25=16
+    64 LDU	//  idx total_weight cs
+    NEWC	//  idx total_weight cs _30
+    SWAP	//  idx total_weight _30 cs
+    STSLICER	//  idx total_weight _31
+    ENDC	//  idx total_weight dict
+    s1 s2 XCHG
+    16 PUSHINT	//  total_weight idx dict _35=16
     DICTUGET
-    NULLSWAPIFNOT	//  _27 _28
-    DROP	//  value
+    NULLSWAPIFNOT	//  total_weight _41 _42
+    DROP	//  total_weight value
+    SWAP	//  value total_weight
   }>
   unpack_validator_descr PROC:<{
     //  cs
@@ -312,30 +311,22 @@ PROGRAM{
     64 LDU	//  _18 _31 _30
     DROP	//  _18 _21
   }>
-  create_new_entry PROC:<{
+  new_proposal PROC:<{
     //  cs
-    0 PUSHINT	//  cs _1=0
-    DUP	//  cs _1=0 _2=0
-    FALSE	//  cs _1=0 _2=0 _3
-    NEWC	//  cs _1=0 _2=0 _3 _4
-    1 STI	//  cs _1=0 _2=0 _6
-    64 STU	//  cs _1=0 _8
-    256 STU	//  cs _10
-    SWAP	//  _10 cs
-    STSLICER	//  _11
-    ENDC	//  _12
-    CTOS	//  _13
+    PUSHNULL	//  cs _1
+    0 PUSHINT	//  cs _1 _2=0
+    s0 s1 s2 XCPUXC	//  _1 _2=0 _3=0 cs
   }>
-  unpack_suggestion PROC:<{
+  unpack_proposal PROC:<{
     //  cs
     LDDICT	//  _1 cs
     64 LDU	//  _1 _3 cs
     256 LDU	//  _1 _3 _6 cs
   }>
-  pack_suggestion PROC:<{
+  pack_proposal PROC:<{
     //  voters sum_weight vset_id body
-    NEWC	//  voters sum_weight vset_id body _4
-    s1 s4 XCHG	//  body sum_weight vset_id voters _4
+    s0 s3 XCHG
+    NEWC	//  body sum_weight vset_id voters _4
     STDICT	//  body sum_weight vset_id _5
     s1 s2 XCHG	//  body vset_id sum_weight _5
     64 STU	//  body vset_id _7
@@ -344,31 +335,87 @@ PROGRAM{
     STSLICER	//  _10
   }>
   register_vote PROC:<{
-    //  vote_dict action cs idx weight
-    2DROP	//  vote_dict action cs
-    SWAP
-    1 PUSHINT	//  vote_dict cs action _9=1
-    AND	//  vote_dict cs _10
-    IF:<{	//  vote_dict cs
-      DUP	//  vote_dict cs cs
-      HASHSU	//  vote_dict cs _11
-      NIP	//  vote_dict hash
-      OVER
-      8 PUSHPOW2	//  vote_dict hash vote_dict _13=256
+    //  vote_dict action cs idx weight total_weight cur_vset_id
+    s0 s5 XCHG
+    1 PUSHINT	//  vote_dict cur_vset_id cs idx weight total_weight action _13=1
+    AND	//  vote_dict cur_vset_id cs idx weight total_weight _14
+    IF:<{	//  vote_dict cur_vset_id cs idx weight total_weight
+      s3 PUSH	//  vote_dict cur_vset_id cs idx weight total_weight cs
+      HASHSU	//  vote_dict cur_vset_id cs idx weight total_weight hash
+      s0 s6 PUSH2
+      8 PUSHPOW2	//  vote_dict cur_vset_id cs idx weight total_weight hash hash vote_dict _16=256
       DICTUGET
-      NULLSWAPIFNOT	//  vote_dict _23 _24
-      NIP	//  vote_dict found?
-      IFNOT:<{	//  vote_dict
-      }>	//  vote_dict
-    }>ELSE<{	//  vote_dict cs
-      256 PLDU	//  vote_dict hash
-      OVER
-      8 PUSHPOW2	//  vote_dict hash vote_dict _19=256
+      NULLSWAPIFNOT	//  vote_dict cur_vset_id cs idx weight total_weight hash entry found?
+    }>ELSE<{	//  vote_dict cur_vset_id cs idx weight total_weight
+      s3 PUSH	//  vote_dict cur_vset_id cs idx weight total_weight cs
+      256 PLDU	//  vote_dict cur_vset_id cs idx weight total_weight hash
+      s0 s6 PUSH2
+      8 PUSHPOW2	//  vote_dict cur_vset_id cs idx weight total_weight hash hash vote_dict _20=256
       DICTUGET
-      NULLSWAPIFNOT	//  vote_dict _25 _26
-      NIP	//  vote_dict found?
+      NULLSWAPIFNOT	//  vote_dict cur_vset_id cs idx weight total_weight hash entry found?
+      DUP	//  vote_dict cur_vset_id cs idx weight total_weight hash entry found? found?
       42 THROWIFNOT
     }>
+    IF:<{	//  vote_dict cur_vset_id cs idx weight total_weight hash entry
+      s5 POP	//  vote_dict cur_vset_id entry idx weight total_weight hash
+      s0 s4 XCHG	//  vote_dict cur_vset_id hash idx weight total_weight entry
+      unpack_proposal INLINECALLDICT	//  vote_dict cur_vset_id hash idx weight total_weight _65 _66 _67 _68
+    }>ELSE<{	//  vote_dict cur_vset_id cs idx weight total_weight hash entry
+      DROP	//  vote_dict cur_vset_id cs idx weight total_weight hash
+      PUSHNULL	//  vote_dict cur_vset_id cs idx weight total_weight hash _30
+      s5 s0 s6 XC2PU
+      0 PUSHINT
+      s0 s1 s3 XCHG3	//  vote_dict cur_vset_id hash idx weight total_weight _65 _66 _67 _68
+    }>	//  vote_dict cur_vset_id hash idx weight total_weight voters sum_weight vset_id body
+    s1 s8 XCPU	//  vote_dict cur_vset_id hash idx weight total_weight voters sum_weight body vset_id cur_vset_id
+    NEQ	//  vote_dict cur_vset_id hash idx weight total_weight voters sum_weight body _32
+    IF:<{	//  vote_dict cur_vset_id hash idx weight total_weight voters sum_weight body
+      NIP
+      PUSHNULL
+      s2 POP
+      0 PUSHINT
+      SWAP	//  vote_dict cur_vset_id hash idx weight total_weight voters sum_weight=0 body
+    }>	//  vote_dict cur_vset_id hash idx weight total_weight voters sum_weight body
+    s5 s2 PUSH2
+    16 PUSHINT	//  vote_dict cur_vset_id hash idx weight total_weight voters sum_weight body idx voters _37=16
+    DICTUGET
+    NULLSWAPIFNOT	//  vote_dict cur_vset_id hash idx weight total_weight voters sum_weight body _73 _74
+    NIP	//  vote_dict cur_vset_id hash idx weight total_weight voters sum_weight body found?
+    IFJMP:<{	//  vote_dict cur_vset_id hash idx weight total_weight voters sum_weight body
+      8 BLKDROP	//  vote_dict
+      PUSHNULL	//  vote_dict _60
+    }>	//  vote_dict cur_vset_id hash idx weight total_weight voters sum_weight body
+    32 PUSHINT	//  vote_dict cur_vset_id hash idx weight total_weight voters sum_weight body _40=32
+    NEWC	//  vote_dict cur_vset_id hash idx weight total_weight voters sum_weight body _40=32 _41
+    NOW	//  vote_dict cur_vset_id hash idx weight total_weight voters sum_weight body _40=32 _41 _42
+    STUX	//  vote_dict cur_vset_id hash idx weight total_weight voters sum_weight body _43
+    s0 s6 s3 XCHG3
+    16 PUSHINT	//  vote_dict cur_vset_id hash body weight total_weight sum_weight _43 idx voters _44=16
+    DICTUSETB	//  vote_dict cur_vset_id hash body weight total_weight sum_weight voters
+    s0 s3 XCHG	//  vote_dict cur_vset_id hash body voters total_weight sum_weight weight
+    ADD	//  vote_dict cur_vset_id hash body voters total_weight sum_weight
+    DUP	//  vote_dict cur_vset_id hash body voters total_weight sum_weight sum_weight
+    3 MULCONST	//  vote_dict cur_vset_id hash body voters total_weight sum_weight _48
+    s0 s2 XCHG	//  vote_dict cur_vset_id hash body voters _48 sum_weight total_weight
+    1 LSHIFT#	//  vote_dict cur_vset_id hash body voters _48 sum_weight _50
+    s1 s2 XCHG	//  vote_dict cur_vset_id hash body voters sum_weight _48 _50
+    GREATER	//  vote_dict cur_vset_id hash body voters sum_weight _51
+    IFJMP:<{	//  vote_dict cur_vset_id hash body voters sum_weight
+      2DROP
+      1 2 BLKDROP2
+      s0 s2 XCHG
+      8 PUSHPOW2	//  body hash vote_dict _53=256
+      DICTUDEL	//  body _75 _76
+      DROP	//  body vote_dict
+      SWAP	//  vote_dict body
+    }>	//  vote_dict cur_vset_id hash body voters sum_weight
+    2SWAP
+    s1 s4 XCHG	//  vote_dict hash voters sum_weight cur_vset_id body
+    pack_proposal INLINECALLDICT	//  vote_dict hash _56
+    s0 s2 XCHG
+    8 PUSHPOW2	//  _56 hash vote_dict _57=256
+    DICTUSETB	//  vote_dict
+    PUSHNULL	//  vote_dict _59
   }>
   recv_external PROC:<{
     //  in_msg
@@ -395,29 +442,49 @@ PROGRAM{
       s0 s3 XCHG	//  signature in_msg action vote_dict public_key cfg_dict stored_seqno cs
       16 LDU	//  signature in_msg action vote_dict public_key cfg_dict stored_seqno idx cs
       OVER	//  signature in_msg action vote_dict public_key cfg_dict stored_seqno idx cs idx
-      get_validator_descr INLINECALLDICT	//  signature in_msg action vote_dict public_key cfg_dict stored_seqno idx cs vdescr
-      unpack_validator_descr INLINECALLDICT	//  signature in_msg action vote_dict public_key cfg_dict stored_seqno idx cs val_pubkey weight
-      s0 s9 XCHG	//  signature weight action vote_dict public_key cfg_dict stored_seqno idx cs val_pubkey in_msg
-      HASHSU	//  signature weight action vote_dict public_key cfg_dict stored_seqno idx cs val_pubkey _44
-      s0 s10 s10 XCHG3	//  cs weight action vote_dict public_key cfg_dict stored_seqno idx _44 signature val_pubkey
-      CHKSIGNU	//  cs weight action vote_dict public_key cfg_dict stored_seqno idx _45
+      get_validator_descr INLINECALLDICT	//  signature in_msg action vote_dict public_key cfg_dict stored_seqno idx cs vdescr total_weight
+      SWAP	//  signature in_msg action vote_dict public_key cfg_dict stored_seqno idx cs total_weight vdescr
+      unpack_validator_descr INLINECALLDICT	//  signature in_msg action vote_dict public_key cfg_dict stored_seqno idx cs total_weight val_pubkey weight
+      s0 s10 XCHG	//  signature weight action vote_dict public_key cfg_dict stored_seqno idx cs total_weight val_pubkey in_msg
+      HASHSU	//  signature weight action vote_dict public_key cfg_dict stored_seqno idx cs total_weight val_pubkey _45
+      s0 s11 s11 XCHG3	//  total_weight weight action vote_dict public_key cfg_dict stored_seqno idx cs _45 signature val_pubkey
+      CHKSIGNU	//  total_weight weight action vote_dict public_key cfg_dict stored_seqno idx cs _46
       34 THROWIFNOT
       ACCEPT
-      SWAP	//  cs weight action vote_dict public_key cfg_dict idx stored_seqno
-      INC	//  cs weight action vote_dict public_key cfg_dict idx stored_seqno
-      s2 s0 s3 PUSH3
-      s7 PUSH	//  cs weight action vote_dict public_key cfg_dict idx stored_seqno cfg_dict stored_seqno public_key vote_dict
+      s0 s2 XCHG	//  total_weight weight action vote_dict public_key cfg_dict cs idx stored_seqno
+      INC	//  total_weight weight action vote_dict public_key cfg_dict cs idx stored_seqno
+      s3 s0 s4 PUSH3
+      s8 PUSH	//  total_weight weight action vote_dict public_key cfg_dict cs idx stored_seqno cfg_dict stored_seqno public_key vote_dict
       store_data INLINECALLDICT
       COMMIT
-      s3 s5 XCHG
-      s7 s1 s6 XCHG3	//  cfg_dict stored_seqno public_key vote_dict action cs idx weight
-      register_vote CALLDICT	//  cfg_dict stored_seqno public_key vote_dict
+      34 PUSHINT	//  total_weight weight action vote_dict public_key cfg_dict cs idx stored_seqno _54=34
+      CONFIGOPTPARAM	//  total_weight weight action vote_dict public_key cfg_dict cs idx stored_seqno _55
+      HASHCU	//  total_weight weight action vote_dict public_key cfg_dict cs idx stored_seqno _56
+      s5 s7 XCHG
+      s3 s4 XCHG
+      s2 s3 XCHG
+      s8 s9 s0 XCHG3	//  stored_seqno cfg_dict public_key vote_dict action cs idx weight total_weight _56
+      register_vote CALLDICT	//  stored_seqno cfg_dict public_key vote_dict accepted
+      s3 s4 s2 PUSH3
+      s4 PUSH	//  stored_seqno cfg_dict public_key vote_dict accepted cfg_dict stored_seqno public_key vote_dict
       store_data INLINECALLDICT
+      DUP	//  stored_seqno cfg_dict public_key vote_dict accepted accepted
+      ISNULL	//  stored_seqno cfg_dict public_key vote_dict accepted _59
+      IFNOT:<{	//  stored_seqno cfg_dict public_key vote_dict accepted
+        32 LDU	//  stored_seqno cfg_dict public_key vote_dict _60 accepted
+        s3 s4 XCHG
+        s2 s4 XCHG	//  stored_seqno vote_dict cfg_dict public_key _60 accepted
+        perform_action CALLDICT	//  stored_seqno vote_dict cfg_dict public_key
+        s3 s0 s3 XCHG3	//  cfg_dict stored_seqno public_key vote_dict
+        store_data INLINECALLDICT
+      }>ELSE<{
+        5 BLKDROP	// 
+      }>
     }>	//  signature in_msg action vote_dict cs cfg_dict stored_seqno public_key
     s0 s6 XCHG	//  signature public_key action vote_dict cs cfg_dict stored_seqno in_msg
-    HASHSU	//  signature public_key action vote_dict cs cfg_dict stored_seqno _55
-    s0 s7 s6 XC2PU	//  stored_seqno public_key action vote_dict cs cfg_dict _55 signature public_key
-    CHKSIGNU	//  stored_seqno public_key action vote_dict cs cfg_dict _56
+    HASHSU	//  signature public_key action vote_dict cs cfg_dict stored_seqno _66
+    s0 s7 s6 XC2PU	//  stored_seqno public_key action vote_dict cs cfg_dict _66 signature public_key
+    CHKSIGNU	//  stored_seqno public_key action vote_dict cs cfg_dict _67
     34 THROWIFNOT
     ACCEPT
     s0 s5 XCHG	//  cfg_dict public_key action vote_dict cs stored_seqno
@@ -453,16 +520,15 @@ PROGRAM{
       IF:<{	//  cfg_dict cs kl=32 next_vset ds
         8 LDU	//  cfg_dict cs kl=32 next_vset tag ds
         32 PLDU	//  cfg_dict cs kl=32 next_vset tag since
-        SWAP	//  cfg_dict cs kl=32 next_vset since tag
-        17 EQINT	//  cfg_dict cs kl=32 next_vset since _26
-        NOW	//  cfg_dict cs kl=32 next_vset since _26 _27
-        s1 s2 XCHG	//  cfg_dict cs kl=32 next_vset _26 since _27
-        GEQ	//  cfg_dict cs kl=32 next_vset _26 _28
+        NOW	//  cfg_dict cs kl=32 next_vset tag since _25
+        LEQ	//  cfg_dict cs kl=32 next_vset tag _26
+        SWAP	//  cfg_dict cs kl=32 next_vset _26 tag
+        18 EQINT	//  cfg_dict cs kl=32 next_vset _26 _28
         AND	//  cfg_dict cs kl=32 next_vset _29
         IF:<{	//  cfg_dict cs kl=32 next_vset
-          SWAP
           34 PUSHINT
-          s0 s4 s4 XC2PU	//  kl=32 cs next_vset _32=34 cfg_dict kl=32
+          ROT
+          s4 s4 XCPU	//  kl=32 cs next_vset _32=34 cfg_dict kl=32
           DICTISETGETOPTREF	//  kl=32 cs cfg_dict cur_vset
           s3 s1 s0 PUXCPU	//  kl=32 cs cur_vset _35=32 cfg_dict kl=32
           DICTISETGETOPTREF	//  kl=32 cs _51 _52
@@ -471,18 +537,17 @@ PROGRAM{
           s0 s1 s3 XCHG3	//  cs _38=36 cfg_dict kl=32
           DICTIDEL	//  cs _53 _54
           DROP	//  cs cfg_dict
+          SWAP	//  cfg_dict cs
         }>ELSE<{
-          s2 s3 XCHG
-          2DROP	//  cs cfg_dict
+          2DROP	//  cfg_dict cs
         }>
       }>ELSE<{
-        s3 s4 XCHG
-        3 BLKDROP	//  cs cfg_dict
+        3 BLKDROP	//  cfg_dict cs
       }>
     }>ELSE<{
-      s2 s3 XCHG
-      2DROP	//  cs cfg_dict
+      2DROP	//  cfg_dict cs
     }>
+    SWAP
     NEWC	//  cs cfg_dict _40
     STREF	//  cs _41
     SWAP	//  _41 cs
@@ -490,4 +555,10 @@ PROGRAM{
     ENDC	//  _43
     c4 POP
   }>
+  seqno PROC:<{
+    // 
+    c4 PUSH	//  _0
+    CTOS	//  _1
+    32 PLDU	//  _3
+  }>
 }END>c
diff --git a/submodules/ton/tonlib-src/crypto/smartcont/auto/dns-auto-code.cpp b/submodules/ton/tonlib-src/crypto/smartcont/auto/dns-auto-code.cpp
new file mode 100644
index 0000000000..77cfbf739e
--- /dev/null
+++ b/submodules/ton/tonlib-src/crypto/smartcont/auto/dns-auto-code.cpp
@@ -0,0 +1 @@
+with_tvm_code("dns-auto", "te6ccgECLgEABhoAART/APSkE/S88sgLAQIBIAIDAgFIBAUBIvIw2zwxmPgAhB/4I/AD4V8ELQICzQYHAgEgGRoCASAICQIBIBMUAvdCDXScEgkl8D4AHQ0wMBcbCSXwPg+kAwIPpEA9MfIZJfBuFwIddJwj+UMNM/Ad5UFAJvA/hhIIMesJJfBeAgqxfAQ46ENFnbPOAgghByZWdkuiGCEHByb2y6qgCgIYIQdXBkZLqqAaABghBnb2djuqoCoCCWXwWEH/AF4YCgsARVAm8kCMjMF/QAFfQAyx1QA/oCUAP6AlAD+gISyx/LH8ntVIA/bbPCXQ0gcKvQnT/zBQCL0YsZpfCIIQ7m93bvAF4CeCEENoUHK6jhcwNgLTH/oA+gD6ANFvBEBEBQPwA3DwBuA0NAWCEENEZWy6jq8kbpJfBZYEA3F/8Afi2zwQRV8FbpiCEO50ZW3wBeH4QW8jghDva2F5WXCBAKDwBOAtLQwD/qPbPCbACI4ZMDU1NjYD0h8wEDUQNHEB8AeCEO9rYXnwBeAI9AQhbpsx0wUhwAACqgLXGJ0B0CDXSwGm+ICHsLEC4iKZMiB41yLXCwcC3wKaXwyCEO5vXDDwBeD4I20gcFRwBCDXSak2AorkMAHCBJtfD1uCEO92XDDwBeAswwEtDQ4ADF8FhB/wBQCEbTbTBwHAAFEzoQOONDMi10lScNcj+QKrH1MMgQDg9A5voY4ZbBLTH1MXvp3U0X4BgBD0DZE1kTDikTDiAZEw4gPeBP4kBE8TEREB2zwglQ5fDvAF4DApwwKOPQPUMCBujjV+IYAQ9A2OFdAg10mBARu+8p/XCxKCCAT+nLryn5Ew4iCAEPSEb6VsISGAEPSMb6VsIbDyn9+SMyLiJW8kI5xfD18DghDTT0ZG8AXhJBA3Wds8K8MEFbAUoA6DHaEuuYrgDyoQEQCsBG5SQLCYXwSCEO5vdGbgIm6ZXwOCEO5vLTKw4DOCEOJhZDIC0CDXSYEBG7mUECNfA+DTEgGCCAT+nL2UECNfA+BsEtIH1wv/Ar0CvbGWghDub3du4HAAFF8OghDncjxw8AUB4CnAAo5FMzhRd6BSgLyaXwuCEPNlcm/wBeBTdqDIyx/MVCCVgQDg9EMGqt9QCKAEqt9SQKBQRIMH9FswyEBEgwf0QwNFVHHwB/AG4CnAAYrgA18DBsAEjhUGyMsfFcxQcoEA4PRDUFQTcfAH8AbgXwoSAHA5OQFuml8LghDhbHJl8AXhF6AgyMsfFsxUIISBAOD0QySq31AIscgCgwf0Q1BDtggVQwRx8AfwBgIBIBUWAgEgFxgARRwgBjIywVQB88WWPoCFctqE8sfyz8hwv+Syx+RMeLJAfsAgABc+EFvIxAjcIBA8ASAAJx0+wL4QW8jghDva2F5WXCDBvAEgAPE+CMipjxSQLYJUhC5k1vwA+AyJIMH9IZvpTKTURKwjlQzIqvfUwK5jj8wIqk431MGgQDg9A5voY4S1wsfI7uZUAaBAOD0WzAFkTDikVviUCSDB/RbMCCDB/SGb6UyIZMgq9+ShB/iBqWVRRUDcALiEDYQNFnoW/ADgAgEgGxwCASAfIAENuHWts8XwOCkCAUgdHgIZs7E2zwzEDREBNs8oICkqAQ2xZrbPF8DgKwIBWCEiAT26MM+CMS2zwDlF8EcG3hkn8z3wHXSSKVWYAQ9GrgMoKwIBWCMkAgFqJygCASAlJgEQq+74I9s8XwMrAQ2nhbZ4Jr4HKQEPp6W2eCBGvgcpAQ2nx7Z4Br4HKQIPpTG2eNhFtnkpKgAo7UTQ1DH0BDH0BDHTHfoA+gD6ADAAMAKAZPlBMgTXSaoAgQDAoBSgA6YCqAKooAH2IddLIXewsfJeIJZfA3BtIW3hInjXItcLB55wyFAEzxYTywfJ0AKmCN4gwAiWXwNwbSFt4O1E0NQx9AQwbX8lBKsCjjID0wcBwACOKCDXSVJg1yP5AqsfI4EA4PQOb6GOECDXCx8mvpYyMyLXSQORMOKRMOLeA+RsIjIgLAAsbpZfA3BtIW3g0x/UMCLAAFBD1yNDMAA07UTQ1PQE9ATTHfoA+gD6AFUwbwQB0x/THzA=");
diff --git a/submodules/ton/tonlib-src/crypto/smartcont/auto/dns-auto-code.fif b/submodules/ton/tonlib-src/crypto/smartcont/auto/dns-auto-code.fif
new file mode 100644
index 0000000000..ad75a7db5f
--- /dev/null
+++ b/submodules/ton/tonlib-src/crypto/smartcont/auto/dns-auto-code.fif
@@ -0,0 +1,949 @@
+// automatically generated from `smartcont/stdlib.fc` `smartcont/dns-auto-code.fc` 
+PROGRAM{
+  DECLPROC load_data
+  DECLPROC load_prices
+  DECLPROC store_data
+  DECLPROC send_message
+  DECLPROC send_error
+  DECLPROC send_ok
+  DECLPROC housekeeping
+  DECLPROC calcprice_internal
+  DECLPROC check_owner
+  DECLPROC perform_ctl_op
+  DECLPROC recv_internal
+  DECLPROC recv_external
+  DECLPROC dnsdictlookup
+  123660 DECLMETHOD dnsresolve
+  87450 DECLMETHOD getexpirationx
+  110574 DECLMETHOD getexpiration
+  67418 DECLMETHOD getstdperiod
+  109522 DECLMETHOD getppr
+  108994 DECLMETHOD getppc
+  113123 DECLMETHOD getppb
+  113304 DECLMETHOD calcprice
+  85700 DECLMETHOD calcregprice
+  DECLGLOBVAR query_info
+  load_data PROCREF:<{
+    // 
+    c4 PUSH	//  _1
+    CTOS	//  cs
+    LDREF	//  _3 cs
+    LDDICT	//  _3 _5 cs
+    LDDICT	//  _3 _5 _7 cs
+    30 LDU	//  _3 _5 _7 _10 cs
+    LDGRAMS	//  _3 _5 _7 _10 _13 cs
+    LDGRAMS	//  _3 _5 _7 _10 _13 _15 cs
+    LDGRAMS	//  _3 _5 _7 _10 _13 _15 _17 cs
+    4 -ROLL	//  _3 _5 _7 cs _10 _13 _15 _17
+    4 TUPLE	//  _3 _5 _7 cs _9
+    SWAP	//  _3 _5 _7 _9 cs
+    32 LDU	//  _3 _5 _7 _9 _19 cs
+    32 LDU	//  _3 _5 _7 _9 _19 _42 _41
+    DROP	//  _3 _5 _7 _9 _19 _22
+  }>
+  load_prices PROCREF:<{
+    // 
+    c4 PUSH	//  _1
+    CTOS	//  cs
+    LDREF	//  _19 _18
+    NIP	//  cs
+    LDDICT	//  _21 _20
+    NIP	//  cs
+    LDDICT	//  _23 _22
+    NIP	//  cs
+    30 LDU	//  _9 cs
+    LDGRAMS	//  _9 _12 cs
+    LDGRAMS	//  _9 _12 _14 cs
+    LDGRAMS	//  _9 _12 _14 _31 _30
+    DROP	//  _9 _12 _14 _16
+  }>
+  store_data PROC:<{
+    //  ctl dd gc prices nhk lhk
+    s0 s2 XCHG	//  ctl dd gc lhk nhk prices
+    4 UNTUPLE	//  ctl dd gc lhk nhk sp ppr ppc ppb
+    s0 s8 XCHG
+    NEWC	//  ppb dd gc lhk nhk sp ppr ppc ctl _11
+    STREF	//  ppb dd gc lhk nhk sp ppr ppc _12
+    s1 s7 XCHG	//  ppb ppc gc lhk nhk sp ppr dd _12
+    STDICT	//  ppb ppc gc lhk nhk sp ppr _13
+    s1 s5 XCHG	//  ppb ppc ppr lhk nhk sp gc _13
+    STDICT	//  ppb ppc ppr lhk nhk sp _14
+    30 STU	//  ppb ppc ppr lhk nhk _16
+    s0 s3 XCHG2	//  ppb ppc nhk lhk _16 ppr
+    STGRAMS	//  ppb ppc nhk lhk _17
+    s0 s3 XCHG2	//  ppb lhk nhk _17 ppc
+    STGRAMS	//  ppb lhk nhk _18
+    s0 s3 XCHG2	//  nhk lhk _18 ppb
+    STGRAMS	//  nhk lhk _19
+    s1 s2 XCHG	//  lhk nhk _19
+    32 STU	//  lhk _21
+    32 STU	//  _23
+    ENDC	//  _24
+    c4 POP
+  }>
+  send_message PROC:<{
+    //  addr tag query_id body grams mode
+    0 PUSHINT	//  addr tag query_id body grams mode _7=0
+    24 PUSHINT	//  addr tag query_id body grams mode _7=0 _8=24
+    NEWC	//  addr tag query_id body grams mode _7=0 _8=24 _9
+    6 STU	//  addr tag query_id body grams mode _7=0 _11
+    s0 s7 XCHG2	//  _7=0 tag query_id body grams mode _11 addr
+    STSLICER	//  _7=0 tag query_id body grams mode _12
+    ROT	//  _7=0 tag query_id body mode _12 grams
+    STGRAMS	//  _7=0 tag query_id body mode _13
+    s1 s5 XCHG	//  mode tag query_id body _7=0 _13
+    107 STU	//  mode tag query_id body _27
+    s1 s3 XCHG	//  mode body query_id tag _27
+    32 STU	//  mode body query_id _29
+    64 STU	//  mode body msg
+    OVER	//  mode body msg body
+    -1 GTINT	//  mode body msg _33
+    IF:<{	//  mode body msg
+      32 STU	//  mode msg
+    }>ELSE<{
+      NIP	//  mode msg
+    }>
+    ENDC	//  mode _37
+    SWAP	//  _37 mode
+    SENDRAWMSG
+  }>
+  send_error PROC:<{
+    //  error_code
+    query_info GETGLOB
+    UNTRIPLE	//  error_code addr query_id op
+    s2 s3 XCHG
+    0 PUSHINT
+    64 PUSHINT	//  addr error_code query_id op _5=0 _6=64
+    send_message CALLDICT
+  }>
+  send_ok PROC:<{
+    //  price
+    4 PUSHINT	//  price _1=4
+    RAWRESERVE
+    query_info GETGLOB
+    UNTRIPLE	//  addr query_id op
+    4016791929 PUSHINT	//  addr query_id op _7=4016791929
+    -ROT
+    0 PUSHINT
+    7 PUSHPOW2	//  addr _7=4016791929 query_id op _8=0 _9=128
+    send_message CALLDICT
+  }>
+  housekeeping PROC:<{
+    //  ctl dd gc prices nhk lhk max_steps
+    NOW	//  ctl dd gc prices nhk lhk max_steps n
+    s2 PUSH	//  ctl dd gc prices nhk lhk max_steps n lhk
+    60 ADDCONST	//  ctl dd gc prices nhk lhk max_steps n _10
+    s4 s(-1) PUXC	//  ctl dd gc prices nhk lhk max_steps n nhk _10
+    MAX	//  ctl dd gc prices nhk lhk max_steps n _11
+    s1 s(-1) PUXC	//  ctl dd gc prices nhk lhk max_steps n n _11
+    LESS	//  ctl dd gc prices nhk lhk max_steps n _12
+    IFJMP:<{	//  ctl dd gc prices nhk lhk max_steps n
+      2DROP	//  ctl dd gc prices nhk lhk
+      store_data CALLDICT
+    }>	//  ctl dd gc prices nhk lhk max_steps n
+    s2 POP	//  ctl dd gc prices nhk n max_steps
+    s4 PUSH
+    8 PUSHPOW2	//  ctl dd gc prices nhk n max_steps gc _17=256
+    DICTUMIN
+    NULLSWAPIFNOT2	//  ctl dd gc prices nhk n max_steps _63 _62 _64
+    s2 POP	//  ctl dd gc prices nhk n max_steps found? mkey
+    WHILE:<{
+      s1 s2 XCPU	//  ctl dd gc prices nhk n max_steps mkey found? max_steps
+      AND	//  ctl dd gc prices nhk n max_steps mkey _19
+    }>DO<{	//  ctl dd gc prices nhk n max_steps mkey
+      s3 POP	//  ctl dd gc prices mkey n max_steps
+      s2 PUSH	//  ctl dd gc prices mkey n max_steps mkey
+      224 RSHIFT#	//  ctl dd gc prices mkey n max_steps nhk
+      s0 s2 PUSH2	//  ctl dd gc prices mkey n max_steps nhk nhk n
+      LESS	//  ctl dd gc prices mkey n max_steps nhk _24
+      IF:<{	//  ctl dd gc prices mkey n max_steps nhk
+        DROP	//  ctl dd gc prices mkey n max_steps
+        s2 PUSH	//  ctl dd gc prices mkey n max_steps mkey
+        224 MODPOW2#	//  ctl dd gc prices mkey n max_steps key
+        s0 s6 PUSH2
+        224 PUSHINT	//  ctl dd gc prices mkey n max_steps key key dd _35
+        DICTUGET
+        NULLSWAPIFNOT	//  ctl dd gc prices mkey n max_steps key val found?
+        IF:<{	//  ctl dd gc prices mkey n max_steps key val
+          32 PLDU	//  ctl dd gc prices mkey n max_steps key exp
+          s3 PUSH	//  ctl dd gc prices mkey n max_steps key exp n
+          LEQ	//  ctl dd gc prices mkey n max_steps key _40
+          IF:<{	//  ctl dd gc prices mkey n max_steps key
+            s0 s6 XCHG2
+            224 PUSHINT	//  ctl max_steps gc prices mkey n key dd _44
+            DICTUDEL	//  ctl max_steps gc prices mkey n _67 _68
+            DROP	//  ctl max_steps gc prices mkey n dd
+            s0 s5 XCHG	//  ctl dd gc prices mkey n max_steps
+          }>ELSE<{
+            DROP	//  ctl dd gc prices mkey n max_steps
+          }>
+        }>ELSE<{
+          2DROP	//  ctl dd gc prices mkey n max_steps
+        }>
+        s2 s4 XCHG2
+        8 PUSHPOW2	//  ctl dd max_steps prices n mkey gc _47=256
+        DICTUDEL	//  ctl dd max_steps prices n _69 _70
+        DROP	//  ctl dd max_steps prices n gc
+        DUP
+        8 PUSHPOW2	//  ctl dd max_steps prices n gc gc _50=256
+        DICTUMIN
+        NULLSWAPIFNOT2	//  ctl dd max_steps prices n gc _72 _71 _73
+        s2 POP	//  ctl dd max_steps prices n gc found? mkey
+        OVER	//  ctl dd max_steps prices n gc found? mkey found?
+        IF:<{	//  ctl dd max_steps prices n gc found? mkey
+          DUP	//  ctl dd max_steps prices n gc found? mkey mkey
+          224 RSHIFT#	//  ctl dd max_steps prices n gc found? mkey _52
+        }>ELSE<{	//  ctl dd max_steps prices n gc found? mkey
+          32 PUSHPOW2DEC	//  ctl dd max_steps prices n gc found? mkey _52=4294967295
+        }>	//  ctl dd max_steps prices n gc found? mkey nhk
+        s0 s6 XCHG	//  ctl dd nhk prices n gc found? mkey max_steps
+        DEC	//  ctl dd nhk prices n gc found? mkey max_steps
+      }>ELSE<{	//  ctl dd gc prices mkey n max_steps nhk
+        s5 s1 s5 XCHG3
+        s0 s3 XCHG
+        FALSE
+        s0 s2 XCHG	//  ctl dd nhk prices n gc found? mkey max_steps
+      }>
+      s3 s6 XCHG
+      s3 s4 XCHG
+      -ROT	//  ctl dd gc prices nhk n max_steps found? mkey
+    }>	//  ctl dd gc prices nhk n max_steps mkey
+    2DROP	//  ctl dd gc prices nhk n
+    store_data CALLDICT
+  }>
+  calcprice_internal PROCREF:<{
+    //  domain data ppc ppb
+    s0 s2 XCHG
+    100 PUSHINT	//  domain ppb ppc data _7=100
+    CDATASIZE	//  domain ppb ppc _24 _25 _26
+    s2 POP	//  domain ppb ppc refs bits
+    s0 s4 XCHG	//  bits ppb ppc refs domain
+    SBITS	//  bits ppb ppc refs _9
+    1 LSHIFT#	//  bits ppb ppc refs _11
+    192 PUSHINT	//  bits ppb ppc refs _11 _16
+    ADD	//  bits ppb ppc refs _17
+    s1 s4 XCHG	//  refs ppb ppc bits _17
+    ADD	//  refs ppb ppc bits
+    s0 s3 XCHG	//  bits ppb ppc refs
+    2 ADDCONST	//  bits ppb ppc _20
+    MUL	//  bits ppb _21
+    s0 s2 XCHG	//  _21 ppb bits
+    MUL	//  _21 _22
+    ADD	//  _23
+  }>
+  check_owner PROCREF:<{
+    //  cat_table owner_info src_wc src_addr strict
+    s0 s4 XCHG	//  strict owner_info src_wc src_addr cat_table
+    ISNULL	//  strict owner_info src_wc src_addr _5
+    s4 s(-1) PUXC	//  strict owner_info src_wc src_addr strict _5
+    AND	//  strict owner_info src_wc src_addr _6
+    IFJMP:<{	//  strict owner_info src_wc src_addr
+      4 BLKDROP	// 
+      4000281702 PUSHINT	//  _7=4000281702
+    }>	//  strict owner_info src_wc src_addr
+    s2 PUSH	//  strict owner_info src_wc src_addr owner_info
+    ISNULL	//  strict owner_info src_wc src_addr _8
+    IFJMP:<{	//  strict owner_info src_wc src_addr
+      3 BLKDROP	//  strict
+      4000263474 PUSHINT	//  strict _9=4000263474
+      AND	//  _10
+    }>	//  strict owner_info src_wc src_addr
+    s3 POP	//  src_addr owner_info src_wc
+    3798033458 PUSHINT	//  src_addr owner_info src_wc ERR_BAD2=3798033458
+    s0 s2 XCHG	//  src_addr ERR_BAD2=3798033458 src_wc owner_info
+    CTOS	//  src_addr ERR_BAD2=3798033458 src_wc sown
+    DUP	//  src_addr ERR_BAD2=3798033458 src_wc sown sown
+    SBITS	//  src_addr ERR_BAD2=3798033458 src_wc sown _15
+    283 PUSHINT	//  src_addr ERR_BAD2=3798033458 src_wc sown _15 _22
+    LESS	//  src_addr ERR_BAD2=3798033458 src_wc sown _23
+    IFJMP:<{	//  src_addr ERR_BAD2=3798033458 src_wc sown
+      s2 s3 XCHG
+      3 BLKDROP	//  ERR_BAD2=3798033458
+    }>	//  src_addr ERR_BAD2=3798033458 src_wc sown
+    19 LDU	//  src_addr ERR_BAD2=3798033458 src_wc _24 sown
+    SWAP
+    327324 PUSHINT	//  src_addr ERR_BAD2=3798033458 src_wc sown _24 _33
+    NEQ	//  src_addr ERR_BAD2=3798033458 src_wc sown _34
+    IFJMP:<{	//  src_addr ERR_BAD2=3798033458 src_wc sown
+      s2 s3 XCHG
+      3 BLKDROP	//  ERR_BAD2=3798033458
+    }>	//  src_addr ERR_BAD2=3798033458 src_wc sown
+    1 2 BLKDROP2	//  src_addr src_wc sown
+    8 LDI	//  src_addr src_wc _37 sown
+    256 PLDU	//  src_addr src_wc owner_wc owner_addr
+    s0 s2 XCHG	//  src_addr owner_addr owner_wc src_wc
+    NEQ	//  src_addr owner_addr _42
+    s0 s2 XCHG	//  _42 owner_addr src_addr
+    NEQ	//  _42 _43
+    OR	//  _44
+    IFJMP:<{	// 
+      4000282478 PUSHINT	//  _45=4000282478
+    }>	// 
+    0 PUSHINT	//  _46=0
+  }>
+  perform_ctl_op PROCREF:<{
+    //  op src_wc src_addr in_msg
+    load_data INLINECALLDICT	//  op src_wc src_addr in_msg ctl domdata gc prices nhk lhk
+    s5 PUSH	//  op src_wc src_addr in_msg ctl domdata gc prices nhk lhk ctl
+    CTOS	//  op src_wc src_addr in_msg ctl domdata gc prices nhk lhk cs
+    8 LDI	//  op src_wc src_addr in_msg ctl domdata gc prices nhk lhk _13 cs
+    s0 s10 XCHG	//  op cs src_addr in_msg ctl domdata gc prices nhk lhk _13 src_wc
+    NEQ	//  op cs src_addr in_msg ctl domdata gc prices nhk lhk _16
+    s0 s9 XCHG	//  op _16 src_addr in_msg ctl domdata gc prices nhk lhk cs
+    256 LDU	//  op _16 src_addr in_msg ctl domdata gc prices nhk lhk _75 _74
+    DROP	//  op _16 src_addr in_msg ctl domdata gc prices nhk lhk _17
+    s0 s8 XCHG2	//  op _16 lhk in_msg ctl domdata gc prices nhk _17 src_addr
+    NEQ	//  op _16 lhk in_msg ctl domdata gc prices nhk _20
+    s1 s8 XCHG	//  op nhk lhk in_msg ctl domdata gc prices _16 _20
+    OR	//  op nhk lhk in_msg ctl domdata gc prices _21
+    IFJMP:<{	//  op nhk lhk in_msg ctl domdata gc prices
+      8 BLKDROP	// 
+      4000282478 PUSHINT	//  _22=4000282478
+      send_error CALLDICT
+    }>	//  op nhk lhk in_msg ctl domdata gc prices
+    s7 PUSH
+    1130909810 PUSHINT	//  op nhk lhk in_msg ctl domdata gc prices op _24=1130909810
+    EQUAL	//  op nhk lhk in_msg ctl domdata gc prices _25
+    IFJMP:<{	//  op nhk lhk in_msg ctl domdata gc prices
+      DROP
+      s6 POP	//  gc nhk lhk in_msg ctl domdata
+      s0 s2 XCHG	//  gc nhk lhk domdata ctl in_msg
+      32 LDU	//  gc nhk lhk domdata ctl _30 in_msg
+      LDGRAMS	//  gc nhk lhk domdata ctl _30 _33 in_msg
+      LDGRAMS	//  gc nhk lhk domdata ctl _30 _33 _35 in_msg
+      LDGRAMS	//  gc nhk lhk domdata ctl stdper ppr ppc ppb in_msg
+      ENDS
+      4 TUPLE	//  gc nhk lhk domdata ctl _40
+      s0 s4 s4 XCHG3
+      s0 s5 XCHG
+      s0 s3 XCHG	//  ctl domdata gc _40 nhk lhk
+      store_data CALLDICT
+      0 PUSHINT	//  _42=0
+      send_ok CALLDICT
+    }>	//  op nhk lhk in_msg ctl domdata gc prices
+    s4 POP
+    s4 POP	//  op nhk gc prices ctl domdata
+    s0 s5 XCHG
+    1128555884 PUSHINT	//  domdata nhk gc prices ctl op _44=1128555884
+    EQUAL	//  domdata nhk gc prices ctl _45
+    IFJMP:<{	//  domdata nhk gc prices ctl
+      s4 PUSH	//  domdata nhk gc prices ctl domdata
+      ISNULL	//  domdata nhk gc prices ctl _46
+      IFNOT:<{	//  domdata nhk gc prices ctl
+        s0 s4 XCHG
+        s0 s3 XCHG
+        1 PUSHINT
+        -1 PUSHINT	//  ctl domdata gc prices nhk _47=1 _48=-1
+        housekeeping CALLDICT
+      }>ELSE<{
+        5 BLKDROP	// 
+      }>
+      load_data INLINECALLDICT	//  _84 _85 _86 _87 _88 _89
+      s4 s5 XCHG
+      5 BLKDROP	//  domdata
+      ISNULL	//  _51
+      IFNOTJMP:<{	// 
+        4000605549 PUSHINT	//  _52=4000605549
+        send_error CALLDICT
+      }>	// 
+      query_info GETGLOB
+      UNTRIPLE	//  addr query_id op
+      4016791929 PUSHINT	//  addr query_id op _58=4016791929
+      -ROT
+      0 PUSHINT
+      160 PUSHINT	//  addr _58=4016791929 query_id op _59=0 _62
+      send_message CALLDICT
+    }>	//  domdata nhk gc prices ctl
+    5 BLKDROP	// 
+    32 PUSHPOW2DEC	//  _64=4294967295
+    send_error CALLDICT
+  }>
+  recv_internal PROC:<{
+    //  msg_value in_msg_cell in_msg
+    DUP	//  msg_value in_msg_cell in_msg in_msg
+    SBITS	//  msg_value in_msg_cell in_msg _3
+    32 LESSINT	//  msg_value in_msg_cell in_msg _5
+    IFJMP:<{	//  msg_value in_msg_cell in_msg
+      3 BLKDROP	// 
+    }>	//  msg_value in_msg_cell in_msg
+    SWAP	//  msg_value in_msg in_msg_cell
+    CTOS	//  msg_value in_msg cs
+    4 LDU	//  msg_value in_msg flags cs
+    SWAP
+    1 PUSHINT	//  msg_value in_msg cs flags _12=1
+    AND	//  msg_value in_msg cs _13
+    IFJMP:<{	//  msg_value in_msg cs
+      3 BLKDROP	// 
+    }>	//  msg_value in_msg cs
+    LDMSGADDR	//  msg_value in_msg _327 _326
+    DROP	//  msg_value in_msg s_addr
+    DUP	//  msg_value in_msg s_addr s_addr
+    REWRITESTDADDR	//  msg_value in_msg s_addr src_wc src_addr
+    s0 s3 XCHG	//  msg_value src_addr s_addr src_wc in_msg
+    32 LDU	//  msg_value src_addr s_addr src_wc op in_msg
+    OVER	//  msg_value src_addr s_addr src_wc op in_msg op
+    IFNOTJMP:<{	//  msg_value src_addr s_addr src_wc op in_msg
+      6 BLKDROP	// 
+    }>	//  msg_value src_addr s_addr src_wc op in_msg
+    0 PUSHINT	//  msg_value src_addr s_addr src_wc op in_msg query_id=0
+    OVER	//  msg_value src_addr s_addr src_wc op in_msg query_id=0 in_msg
+    SBITS	//  msg_value src_addr s_addr src_wc op in_msg query_id=0 _26
+    63 GTINT	//  msg_value src_addr s_addr src_wc op in_msg query_id=0 _28
+    IF:<{	//  msg_value src_addr s_addr src_wc op in_msg query_id=0
+      DROP	//  msg_value src_addr s_addr src_wc op in_msg
+      64 LDU	//  msg_value src_addr s_addr src_wc op query_id in_msg
+      SWAP	//  msg_value src_addr s_addr src_wc op in_msg query_id
+    }>	//  msg_value src_addr s_addr src_wc op in_msg query_id
+    s4 s0 s2 XC2PU	//  msg_value src_addr in_msg src_wc op s_addr query_id op
+    TRIPLE
+    query_info SETGLOB
+    DUP
+    31 PUSHPOW2	//  msg_value src_addr in_msg src_wc op op _34
+    AND	//  msg_value src_addr in_msg src_wc op _35
+    IFJMP:<{	//  msg_value src_addr in_msg src_wc op
+      5 BLKDROP	// 
+    }>	//  msg_value src_addr in_msg src_wc op
+    DUP	//  msg_value src_addr in_msg src_wc op op
+    24 RSHIFT#	//  msg_value src_addr in_msg src_wc op _37
+    67 EQINT	//  msg_value src_addr in_msg src_wc op _39
+    IFJMP:<{	//  msg_value src_addr in_msg src_wc op
+      s4 POP	//  op src_addr in_msg src_wc
+      -ROT	//  op src_wc src_addr in_msg
+      perform_ctl_op INLINECALLDICT
+    }>	//  msg_value src_addr in_msg src_wc op
+    DUP
+    1919248228 PUSHINT	//  msg_value src_addr in_msg src_wc op op _42=1919248228
+    EQUAL	//  msg_value src_addr in_msg src_wc op _45
+    OVER
+    1886547820 PUSHINT	//  msg_value src_addr in_msg src_wc op _45 op _46=1886547820
+    EQUAL	//  msg_value src_addr in_msg src_wc op _45 _47
+    1 LSHIFT#	//  msg_value src_addr in_msg src_wc op _45 _49
+    ADD	//  msg_value src_addr in_msg src_wc op _50
+    OVER
+    1970300004 PUSHINT	//  msg_value src_addr in_msg src_wc op _50 op _51=1970300004
+    EQUAL	//  msg_value src_addr in_msg src_wc op _50 _52
+    2 LSHIFT#	//  msg_value src_addr in_msg src_wc op _50 _54
+    ADD	//  msg_value src_addr in_msg src_wc op _55
+    SWAP
+    1735354211 PUSHINT	//  msg_value src_addr in_msg src_wc _55 op _56=1735354211
+    EQUAL	//  msg_value src_addr in_msg src_wc _55 _57
+    3 LSHIFT#	//  msg_value src_addr in_msg src_wc _55 _59
+    ADD	//  msg_value src_addr in_msg src_wc qt
+    DUP	//  msg_value src_addr in_msg src_wc qt qt
+    IFNOTJMP:<{	//  msg_value src_addr in_msg src_wc qt
+      5 BLKDROP	// 
+      32 PUSHPOW2DEC	//  _61=4294967295
+      send_error CALLDICT
+    }>	//  msg_value src_addr in_msg src_wc qt
+    NEGATE	//  msg_value src_addr in_msg src_wc qt
+    load_data INLINECALLDICT	//  msg_value src_addr in_msg src_wc qt ctl domdata gc prices nhk lhk
+    s6 PUSH	//  msg_value src_addr in_msg src_wc qt ctl domdata gc prices nhk lhk qt
+    8 EQINT	//  msg_value src_addr in_msg src_wc qt ctl domdata gc prices nhk lhk _72
+    IFJMP:<{	//  msg_value src_addr in_msg src_wc qt ctl domdata gc prices nhk lhk
+      DROP
+      s5 POP
+      s5 POP
+      s6 POP
+      s6 POP	//  domdata gc in_msg prices nhk ctl
+      s0 s3 XCHG	//  domdata gc ctl prices nhk in_msg
+      32 LDI	//  domdata gc ctl prices nhk _341 _340
+      DROP	//  domdata gc ctl prices nhk max_steps
+      s3 s5 XCHG
+      s3 s4 XCHG
+      1 PUSHINT
+      SWAP	//  ctl domdata gc prices nhk _77=1 max_steps
+      housekeeping CALLDICT
+      4016791929 PUSHINT	//  _79=4016791929
+      send_error CALLDICT
+    }>	//  msg_value src_addr in_msg src_wc qt ctl domdata gc prices nhk lhk
+    s0 s8 XCHG	//  msg_value src_addr lhk src_wc qt ctl domdata gc prices nhk in_msg
+    LDOPTREF	//  msg_value src_addr lhk src_wc qt ctl domdata gc prices nhk domain_cell in_msg
+    OVER	//  msg_value src_addr lhk src_wc qt ctl domdata gc prices nhk domain_cell in_msg domain_cell
+    ISNULL	//  msg_value src_addr lhk src_wc qt ctl domdata gc prices nhk domain_cell in_msg _88
+    IF:<{	//  msg_value src_addr lhk src_wc qt ctl domdata gc prices nhk domain_cell in_msg
+      NIP	//  msg_value src_addr lhk src_wc qt ctl domdata gc prices nhk in_msg
+      6 LDU	//  msg_value src_addr lhk src_wc qt ctl domdata gc prices nhk bytes in_msg
+      OVER	//  msg_value src_addr lhk src_wc qt ctl domdata gc prices nhk bytes in_msg bytes
+      0 EQINT	//  msg_value src_addr lhk src_wc qt ctl domdata gc prices nhk bytes in_msg fail
+      s0 s2 XCHG	//  msg_value src_addr lhk src_wc qt ctl domdata gc prices nhk fail in_msg bytes
+      3 LSHIFT#	//  msg_value src_addr lhk src_wc qt ctl domdata gc prices nhk fail in_msg _97
+      LDSLICEX	//  msg_value src_addr lhk src_wc qt ctl domdata gc prices nhk fail domain in_msg
+    }>ELSE<{	//  msg_value src_addr lhk src_wc qt ctl domdata gc prices nhk domain_cell in_msg
+      SWAP	//  msg_value src_addr lhk src_wc qt ctl domdata gc prices nhk in_msg domain_cell
+      CTOS	//  msg_value src_addr lhk src_wc qt ctl domdata gc prices nhk in_msg domain
+      DUP	//  msg_value src_addr lhk src_wc qt ctl domdata gc prices nhk in_msg domain domain
+      SBITREFS	//  msg_value src_addr lhk src_wc qt ctl domdata gc prices nhk in_msg domain bits refs
+      SWAP	//  msg_value src_addr lhk src_wc qt ctl domdata gc prices nhk in_msg domain refs bits
+      -8 ADDCONST	//  msg_value src_addr lhk src_wc qt ctl domdata gc prices nhk in_msg domain refs _104
+      -121 PUSHINT	//  msg_value src_addr lhk src_wc qt ctl domdata gc prices nhk in_msg domain refs _104 _107
+      AND	//  msg_value src_addr lhk src_wc qt ctl domdata gc prices nhk in_msg domain refs _108
+      OR	//  msg_value src_addr lhk src_wc qt ctl domdata gc prices nhk in_msg domain fail
+      s0 s2 XCHG	//  msg_value src_addr lhk src_wc qt ctl domdata gc prices nhk fail domain in_msg
+    }>
+    s2 PUSH	//  msg_value src_addr lhk src_wc qt ctl domdata gc prices nhk fail domain in_msg fail
+    IFNOT:<{	//  msg_value src_addr lhk src_wc qt ctl domdata gc prices nhk fail domain in_msg
+      s2 POP	//  msg_value src_addr lhk src_wc qt ctl domdata gc prices nhk in_msg domain
+      DUP
+      8 PUSHINT	//  msg_value src_addr lhk src_wc qt ctl domdata gc prices nhk in_msg domain domain _110=8
+      SDCUTLAST	//  msg_value src_addr lhk src_wc qt ctl domdata gc prices nhk in_msg domain _111
+      8 PLDU	//  msg_value src_addr lhk src_wc qt ctl domdata gc prices nhk in_msg domain fail
+      s0 s2 XCHG	//  msg_value src_addr lhk src_wc qt ctl domdata gc prices nhk fail domain in_msg
+    }>	//  msg_value src_addr lhk src_wc qt ctl domdata gc prices nhk fail domain in_msg
+    s0 s2 XCHG	//  msg_value src_addr lhk src_wc qt ctl domdata gc prices nhk in_msg domain fail
+    IFJMP:<{	//  msg_value src_addr lhk src_wc qt ctl domdata gc prices nhk in_msg domain
+      12 BLKDROP	// 
+      4000275504 PUSHINT	//  _114=4000275504
+      send_error CALLDICT
+    }>	//  msg_value src_addr lhk src_wc qt ctl domdata gc prices nhk in_msg domain
+    NOW	//  msg_value src_addr lhk src_wc qt ctl domdata gc prices nhk in_msg domain n
+    PUSHNULL	//  msg_value src_addr lhk src_wc qt ctl domdata gc prices nhk in_msg domain n _120
+    DUP	//  msg_value src_addr lhk src_wc qt ctl domdata gc prices nhk in_msg domain n cat_table owner_info
+    0 PUSHINT	//  msg_value src_addr lhk src_wc qt ctl domdata gc prices nhk in_msg domain n cat_table owner_info _124=0
+    s0 s0 s4 PUSH3	//  msg_value src_addr lhk src_wc qt ctl domdata gc prices nhk in_msg domain n cat_table owner_info key=0 zeros=0 exp=0 tail
+    DUP	//  msg_value src_addr lhk src_wc qt ctl domdata gc prices nhk in_msg domain n cat_table owner_info key=0 zeros=0 exp=0 tail tail
+    SBITS	//  msg_value src_addr lhk src_wc qt ctl domdata gc prices nhk in_msg domain n cat_table owner_info key=0 zeros=0 exp=0 tail _126
+    3 RSHIFTC#	//  msg_value src_addr lhk src_wc qt ctl domdata gc prices nhk in_msg domain n cat_table owner_info key=0 zeros=0 exp=0 tail _128
+    REPEAT:<{	//  msg_value src_addr lhk src_wc qt ctl domdata gc prices nhk in_msg domain n cat_table owner_info key zeros exp tail
+      PUSHNULL
+      s6 POP	//  msg_value src_addr lhk src_wc qt ctl domdata gc prices nhk in_msg domain n cat_table owner_info key zeros exp tail
+      8 LDU	//  msg_value src_addr lhk src_wc qt ctl domdata gc prices nhk in_msg domain n cat_table owner_info key zeros exp _131 tail
+      SWAP	//  msg_value src_addr lhk src_wc qt ctl domdata gc prices nhk in_msg domain n cat_table owner_info key zeros exp tail _131
+      0 EQINT	//  msg_value src_addr lhk src_wc qt ctl domdata gc prices nhk in_msg domain n cat_table owner_info key zeros exp tail z
+      s3 s3 XCPU	//  msg_value src_addr lhk src_wc qt ctl domdata gc prices nhk in_msg domain n cat_table owner_info key z exp tail zeros z
+      SUB	//  msg_value src_addr lhk src_wc qt ctl domdata gc prices nhk in_msg domain n cat_table owner_info key z exp tail zeros
+      s0 s3 XCHG	//  msg_value src_addr lhk src_wc qt ctl domdata gc prices nhk in_msg domain n cat_table owner_info key zeros exp tail z
+      IF:<{	//  msg_value src_addr lhk src_wc qt ctl domdata gc prices nhk in_msg domain n cat_table owner_info key zeros exp tail
+        s3 POP	//  msg_value src_addr lhk src_wc qt ctl domdata gc prices nhk in_msg domain n cat_table owner_info tail zeros exp
+        s2 PUSH	//  msg_value src_addr lhk src_wc qt ctl domdata gc prices nhk in_msg domain n cat_table owner_info tail zeros exp tail
+        SBITS	//  msg_value src_addr lhk src_wc qt ctl domdata gc prices nhk in_msg domain n cat_table owner_info tail zeros exp _137
+        s7 s(-1) PUXC	//  msg_value src_addr lhk src_wc qt ctl domdata gc prices nhk in_msg domain n cat_table owner_info tail zeros exp domain _137
+        SDSKIPLAST	//  msg_value src_addr lhk src_wc qt ctl domdata gc prices nhk in_msg domain n cat_table owner_info tail zeros exp _138
+        SHA256U	//  msg_value src_addr lhk src_wc qt ctl domdata gc prices nhk in_msg domain n cat_table owner_info tail zeros exp _139
+        32 RSHIFT#	//  msg_value src_addr lhk src_wc qt ctl domdata gc prices nhk in_msg domain n cat_table owner_info tail zeros exp key
+        s0 s12 PUSH2
+        224 PUSHINT	//  msg_value src_addr lhk src_wc qt ctl domdata gc prices nhk in_msg domain n cat_table owner_info tail zeros exp key key domdata _146
+        DICTUGET
+        NULLSWAPIFNOT	//  msg_value src_addr lhk src_wc qt ctl domdata gc prices nhk in_msg domain n cat_table owner_info tail zeros exp key val found?
+        IF:<{	//  msg_value src_addr lhk src_wc qt ctl domdata gc prices nhk in_msg domain n cat_table owner_info tail zeros exp key val
+          1 2 BLKDROP2	//  msg_value src_addr lhk src_wc qt ctl domdata gc prices nhk in_msg domain n cat_table owner_info tail zeros key val
+          32 LDU	//  msg_value src_addr lhk src_wc qt ctl domdata gc prices nhk in_msg domain n cat_table owner_info tail zeros key exp val
+          s1 s7 PUSH2	//  msg_value src_addr lhk src_wc qt ctl domdata gc prices nhk in_msg domain n cat_table owner_info tail zeros key exp val exp n
+          GEQ	//  msg_value src_addr lhk src_wc qt ctl domdata gc prices nhk in_msg domain n cat_table owner_info tail zeros key exp val _151
+          IF:<{	//  msg_value src_addr lhk src_wc qt ctl domdata gc prices nhk in_msg domain n cat_table owner_info tail zeros key exp val
+            LDREF	//  msg_value src_addr lhk src_wc qt ctl domdata gc prices nhk in_msg domain n cat_table owner_info tail zeros key exp cat_table val
+            ENDS
+            -2 PUSHINT	//  msg_value src_addr lhk src_wc qt ctl domdata gc prices nhk in_msg domain n cat_table owner_info tail zeros key exp cat_table _158=-2
+            SWAP
+            16 PUSHINT	//  msg_value src_addr lhk src_wc qt ctl domdata gc prices nhk in_msg domain n cat_table owner_info tail zeros key exp _158=-2 cat_table _159=16
+            DICTIGETREF	//  msg_value src_addr lhk src_wc qt ctl domdata gc prices nhk in_msg domain n cat_table owner_info tail zeros key exp cown ok
+            IF:<{	//  msg_value src_addr lhk src_wc qt ctl domdata gc prices nhk in_msg domain n cat_table owner_info tail zeros key exp cown
+              s5 POP	//  msg_value src_addr lhk src_wc qt ctl domdata gc prices nhk in_msg domain n cat_table owner_info tail zeros key exp
+            }>ELSE<{
+              DROP	//  msg_value src_addr lhk src_wc qt ctl domdata gc prices nhk in_msg domain n cat_table owner_info tail zeros key exp
+            }>
+          }>ELSE<{
+            DROP	//  msg_value src_addr lhk src_wc qt ctl domdata gc prices nhk in_msg domain n cat_table owner_info tail zeros key exp
+          }>
+          SWAP	//  msg_value src_addr lhk src_wc qt ctl domdata gc prices nhk in_msg domain n cat_table owner_info tail zeros exp key
+        }>ELSE<{
+          DROP	//  msg_value src_addr lhk src_wc qt ctl domdata gc prices nhk in_msg domain n cat_table owner_info tail zeros exp key
+        }>
+        s0 s3 XCHG	//  msg_value src_addr lhk src_wc qt ctl domdata gc prices nhk in_msg domain n cat_table owner_info key zeros exp tail
+      }>	//  msg_value src_addr lhk src_wc qt ctl domdata gc prices nhk in_msg domain n cat_table owner_info key zeros exp tail
+    }>
+    DROP	//  msg_value src_addr lhk src_wc qt ctl domdata gc prices nhk in_msg domain n cat_table owner_info key zeros exp
+    SWAP	//  msg_value src_addr lhk src_wc qt ctl domdata gc prices nhk in_msg domain n cat_table owner_info key exp zeros
+    4 GTINT	//  msg_value src_addr lhk src_wc qt ctl domdata gc prices nhk in_msg domain n cat_table owner_info key exp _162
+    IFJMP:<{	//  msg_value src_addr lhk src_wc qt ctl domdata gc prices nhk in_msg domain n cat_table owner_info key exp
+      15 BLKDROP
+      2DROP	// 
+      4017511472 PUSHINT	//  _163=4017511472
+      send_error CALLDICT
+    }>	//  msg_value src_addr lhk src_wc qt ctl domdata gc prices nhk in_msg domain n cat_table owner_info key exp
+    s12 PUSH	//  msg_value src_addr lhk src_wc qt ctl domdata gc prices nhk in_msg domain n cat_table owner_info key exp qt
+    1 NEQINT	//  msg_value src_addr lhk src_wc qt ctl domdata gc prices nhk in_msg domain n cat_table owner_info key exp _167
+    s4 PUSH
+    s0 s4 XCHG
+    s15 s1 s3 XCHG3
+    s0 17 s() XCHG
+    SWAP	//  msg_value key lhk exp qt ctl domdata gc prices nhk in_msg domain n cat_table cat_table owner_info src_wc src_addr _167
+    check_owner INLINECALLDICT	//  msg_value key lhk exp qt ctl domdata gc prices nhk in_msg domain n cat_table err
+    DUP	//  msg_value key lhk exp qt ctl domdata gc prices nhk in_msg domain n cat_table err err
+    IFJMP:<{	//  msg_value key lhk exp qt ctl domdata gc prices nhk in_msg domain n cat_table err
+      s0 s14 XCHG
+      14 BLKDROP	//  err
+      send_error CALLDICT
+    }>	//  msg_value key lhk exp qt ctl domdata gc prices nhk in_msg domain n cat_table err
+    DROP	//  msg_value key lhk exp qt ctl domdata gc prices nhk in_msg domain n cat_table
+    s9 PUSH	//  msg_value key lhk exp qt ctl domdata gc prices nhk in_msg domain n cat_table qt
+    2 NEQINT	//  msg_value key lhk exp qt ctl domdata gc prices nhk in_msg domain n cat_table _173
+    IF:<{	//  msg_value key lhk exp qt ctl domdata gc prices nhk in_msg domain n cat_table
+      s0 s3 XCHG	//  msg_value key lhk exp qt ctl domdata gc prices nhk cat_table domain n in_msg
+      LDREF	//  msg_value key lhk exp qt ctl domdata gc prices nhk cat_table domain n _361 _360
+      DROP	//  msg_value key lhk exp qt ctl domdata gc prices nhk cat_table domain n data
+      DUP	//  msg_value key lhk exp qt ctl domdata gc prices nhk cat_table domain n data data
+      DICTEMPTY	//  msg_value key lhk exp qt ctl domdata gc prices nhk cat_table domain n data _176
+      IFNOT:<{	//  msg_value key lhk exp qt ctl domdata gc prices nhk cat_table domain n data
+        -2 PUSHINT	//  msg_value key lhk exp qt ctl domdata gc prices nhk cat_table domain n data _179=-2
+        OVER
+        16 PUSHINT	//  msg_value key lhk exp qt ctl domdata gc prices nhk cat_table domain n data _179=-2 data _180=16
+        DICTIGETREF	//  msg_value key lhk exp qt ctl domdata gc prices nhk cat_table domain n data oinfo ok
+        IF:<{	//  msg_value key lhk exp qt ctl domdata gc prices nhk cat_table domain n data oinfo
+          CTOS	//  msg_value key lhk exp qt ctl domdata gc prices nhk cat_table domain n data cs
+          DUP	//  msg_value key lhk exp qt ctl domdata gc prices nhk cat_table domain n data cs cs
+          SBITS	//  msg_value key lhk exp qt ctl domdata gc prices nhk cat_table domain n data cs _185
+          283 PUSHINT	//  msg_value key lhk exp qt ctl domdata gc prices nhk cat_table domain n data cs _185 _192
+          GEQ	//  msg_value key lhk exp qt ctl domdata gc prices nhk cat_table domain n data cs _193
+          31 THROWIFNOT
+          19 PLDU	//  msg_value key lhk exp qt ctl domdata gc prices nhk cat_table domain n data _197
+          327324 PUSHINT	//  msg_value key lhk exp qt ctl domdata gc prices nhk cat_table domain n data _197 _202
+          EQUAL	//  msg_value key lhk exp qt ctl domdata gc prices nhk cat_table domain n data _203
+          31 THROWIFNOT
+        }>ELSE<{
+          DROP	//  msg_value key lhk exp qt ctl domdata gc prices nhk cat_table domain n data
+        }>
+        DUP
+        16 PUSHINT	//  msg_value key lhk exp qt ctl domdata gc prices nhk cat_table domain n data data _208=16
+        DICTIMIN
+        NULLSWAPIFNOT2	//  msg_value key lhk exp qt ctl domdata gc prices nhk cat_table domain n data _365 _364 _366
+        2 1 BLKDROP2	//  msg_value key lhk exp qt ctl domdata gc prices nhk cat_table domain n data minok
+        OVER
+        16 PUSHINT	//  msg_value key lhk exp qt ctl domdata gc prices nhk cat_table domain n data minok data _213=16
+        DICTIMAX
+        NULLSWAPIFNOT2	//  msg_value key lhk exp qt ctl domdata gc prices nhk cat_table domain n data minok _368 _367 _369
+        2 1 BLKDROP2	//  msg_value key lhk exp qt ctl domdata gc prices nhk cat_table domain n data minok maxok
+        AND	//  msg_value key lhk exp qt ctl domdata gc prices nhk cat_table domain n data _216
+        31 THROWIFNOT
+      }>	//  msg_value key lhk exp qt ctl domdata gc prices nhk cat_table domain n data
+    }>ELSE<{	//  msg_value key lhk exp qt ctl domdata gc prices nhk in_msg domain n cat_table
+      s3 POP	//  msg_value key lhk exp qt ctl domdata gc prices nhk cat_table domain n
+      s2 PUSH	//  msg_value key lhk exp qt ctl domdata gc prices nhk cat_table domain n data
+    }>
+    s5 PUSH	//  msg_value key lhk exp qt ctl domdata gc prices nhk cat_table domain n data prices
+    4 UNTUPLE	//  msg_value key lhk exp qt ctl domdata gc prices nhk cat_table domain n data stdper ppr ppc ppb
+    s3 PUSH	//  msg_value key lhk exp qt ctl domdata gc prices nhk cat_table domain n data stdper ppr ppc ppb stdper
+    IFNOTJMP:<{	//  msg_value key lhk exp qt ctl domdata gc prices nhk cat_table domain n data stdper ppr ppc ppb
+      15 BLKDROP
+      3 BLKDROP	// 
+      3545187910 PUSHINT	//  _223=3545187910
+      send_error CALLDICT
+    }>	//  msg_value key lhk exp qt ctl domdata gc prices nhk cat_table domain n data stdper ppr ppc ppb
+    s4 PUSH
+    s3 s7 XCHG
+    -ROT	//  msg_value key lhk exp qt ctl domdata gc prices nhk cat_table ppr n data stdper domain data ppc ppb
+    calcprice_internal INLINECALLDICT	//  msg_value key lhk exp qt ctl domdata gc prices nhk cat_table ppr n data stdper _226
+    s11 PUSH	//  msg_value key lhk exp qt ctl domdata gc prices nhk cat_table ppr n data stdper _226 qt
+    4 NEQINT	//  msg_value key lhk exp qt ctl domdata gc prices nhk cat_table ppr n data stdper _226 _228
+    s1 s5 XCHG	//  msg_value key lhk exp qt ctl domdata gc prices nhk cat_table _226 n data stdper ppr _228
+    AND	//  msg_value key lhk exp qt ctl domdata gc prices nhk cat_table _226 n data stdper _229
+    s1 s4 XCHG	//  msg_value key lhk exp qt ctl domdata gc prices nhk cat_table stdper n data _226 _229
+    ADD	//  msg_value key lhk exp qt ctl domdata gc prices nhk cat_table stdper n data price
+    s0 s14 XCHG
+    30 PUSHPOW2	//  price key lhk exp qt ctl domdata gc prices nhk cat_table stdper n data msg_value _233
+    SUB	//  price key lhk exp qt ctl domdata gc prices nhk cat_table stdper n data _234
+    s14 PUSH	//  price key lhk exp qt ctl domdata gc prices nhk cat_table stdper n data _234 price
+    LESS	//  price key lhk exp qt ctl domdata gc prices nhk cat_table stdper n data _235
+    IFJMP:<{	//  price key lhk exp qt ctl domdata gc prices nhk cat_table stdper n data
+      14 BLKDROP	// 
+      3883023472 PUSHINT	//  _236=3883023472
+      send_error CALLDICT
+    }>	//  price key lhk exp qt ctl domdata gc prices nhk cat_table stdper n data
+    s9 PUSH	//  price key lhk exp qt ctl domdata gc prices nhk cat_table stdper n data qt
+    2 EQINT	//  price key lhk exp qt ctl domdata gc prices nhk cat_table stdper n data _243
+    IFJMP:<{	//  price key lhk exp qt ctl domdata gc prices nhk cat_table stdper n data
+      s3 POP
+      s8 POP	//  price key lhk exp n ctl domdata gc prices nhk data stdper
+      s7 s7 XCPU	//  price key lhk exp stdper ctl domdata gc prices nhk data n stdper
+      ADD	//  price key lhk exp stdper ctl domdata gc prices nhk data _244
+      s8 s(-1) PUXC	//  price key lhk exp stdper ctl domdata gc prices nhk data exp _244
+      GREATER	//  price key lhk exp stdper ctl domdata gc prices nhk data _245
+      IFJMP:<{	//  price key lhk exp stdper ctl domdata gc prices nhk data
+        11 BLKDROP	// 
+        4083511919 PUSHINT	//  _246=4083511919
+        send_error CALLDICT
+      }>	//  price key lhk exp stdper ctl domdata gc prices nhk data
+      s7 s6 PUSH2	//  price key lhk exp stdper ctl domdata gc prices nhk data exp stdper
+      ADD	//  price key lhk exp stdper ctl domdata gc prices nhk data _249
+      NEWC	//  price key lhk exp stdper ctl domdata gc prices nhk data _249 _250
+      32 STU	//  price key lhk exp stdper ctl domdata gc prices nhk data _252
+      STREF	//  price key lhk exp stdper ctl domdata gc prices nhk _253
+      s0 s9 s4 XCPUXC
+      224 PUSHINT	//  price key lhk exp stdper ctl nhk gc prices _253 key domdata _256
+      DICTUSETB	//  price key lhk exp stdper ctl nhk gc prices domdata
+      s0 s6 XCHG	//  price key lhk domdata stdper ctl nhk gc prices exp
+      224 LSHIFT#	//  price key lhk domdata stdper ctl nhk gc prices _262
+      s0 s8 XCHG2	//  price prices lhk domdata stdper ctl nhk gc _262 key
+      ADD	//  price prices lhk domdata stdper ctl nhk gc gckeyO
+      s0 s4 XCHG	//  price prices lhk domdata gckeyO ctl nhk gc stdper
+      224 LSHIFT#	//  price prices lhk domdata gckeyO ctl nhk gc _268
+      s4 s(-1) PUXC	//  price prices lhk domdata gckeyO ctl nhk gc gckeyO _268
+      ADD	//  price prices lhk domdata gckeyO ctl nhk gc gckeyN
+      s4 s4 XCHG2
+      8 PUSHPOW2	//  price prices lhk domdata gckeyN ctl nhk gckeyO gc _271=256
+      DICTUDEL	//  price prices lhk domdata gckeyN ctl nhk _376 _377
+      DROP	//  price prices lhk domdata gckeyN ctl nhk gc
+      NEWC	//  price prices lhk domdata gckeyN ctl nhk gc _274
+      s0 s4 s4 XCHG3
+      8 PUSHPOW2	//  price prices lhk domdata nhk ctl _274 gckeyN gc _275=256
+      DICTUSETB	//  price prices lhk domdata nhk ctl gc
+      s0 s3 XCHG
+      s5 s5 s4 XCHG3
+      1 PUSHINT	//  price ctl domdata gc prices nhk lhk _277=1
+      housekeeping CALLDICT
+      send_ok CALLDICT
+    }>	//  price key lhk exp qt ctl domdata gc prices nhk cat_table stdper n data
+    s9 PUSH	//  price key lhk exp qt ctl domdata gc prices nhk cat_table stdper n data qt
+    1 EQINT	//  price key lhk exp qt ctl domdata gc prices nhk cat_table stdper n data _281
+    IFJMP:<{	//  price key lhk exp qt ctl domdata gc prices nhk cat_table stdper n data
+      s9 POP
+      s9 POP	//  price key lhk n data ctl domdata gc prices nhk cat_table stdper
+      SWAP	//  price key lhk n data ctl domdata gc prices nhk stdper cat_table
+      ISNULL	//  price key lhk n data ctl domdata gc prices nhk stdper _282
+      IFNOTJMP:<{	//  price key lhk n data ctl domdata gc prices nhk stdper
+        11 BLKDROP	// 
+        3781980773 PUSHINT	//  _283=3781980773
+        send_error CALLDICT
+      }>	//  price key lhk n data ctl domdata gc prices nhk stdper
+      s1 s7 XCHG	//  price key lhk nhk data ctl domdata gc prices n stdper
+      ADD	//  price key lhk nhk data ctl domdata gc prices expires_at
+      DUP
+      NEWC	//  price key lhk nhk data ctl domdata gc prices expires_at expires_at _288
+      32 STU	//  price key lhk nhk data ctl domdata gc prices expires_at _290
+      s1 s6 XCHG	//  price key lhk nhk expires_at ctl domdata gc prices data _290
+      STREF	//  price key lhk nhk expires_at ctl domdata gc prices _291
+      s0 s8 s3 XCPUXC
+      224 PUSHINT	//  price key lhk nhk expires_at ctl prices gc _291 key domdata _294
+      DICTUSETB	//  price key lhk nhk expires_at ctl prices gc domdata
+      s4 PUSH	//  price key lhk nhk expires_at ctl prices gc domdata expires_at
+      224 LSHIFT#	//  price key lhk nhk expires_at ctl prices gc domdata _300
+      s0 s8 XCHG2	//  price domdata lhk nhk expires_at ctl prices gc _300 key
+      OR	//  price domdata lhk nhk expires_at ctl prices gc gckey
+      NEWC	//  price domdata lhk nhk expires_at ctl prices gc gckey _303
+      s0 s2 XCHG
+      8 PUSHPOW2	//  price domdata lhk nhk expires_at ctl prices _303 gckey gc _304=256
+      DICTUSETB	//  price domdata lhk nhk expires_at ctl prices gc
+      s4 s3 XCHG2	//  price domdata lhk prices gc ctl nhk expires_at
+      MIN	//  price domdata lhk prices gc ctl _306
+      s1 s5 XCHG
+      s3 s0 s4 XCHG3
+      1 PUSHINT	//  price ctl domdata gc prices _306 lhk _307=1
+      housekeeping CALLDICT
+      send_ok CALLDICT
+    }>	//  price key lhk exp qt ctl domdata gc prices nhk cat_table stdper n data
+    s0 s3 XCHG
+    3 BLKDROP	//  price key lhk exp qt ctl domdata gc prices nhk data
+    s0 s6 XCHG	//  price key lhk exp data ctl domdata gc prices nhk qt
+    4 EQINT	//  price key lhk exp data ctl domdata gc prices nhk _311
+    IFJMP:<{	//  price key lhk exp data ctl domdata gc prices nhk
+      s0 s6 XCHG
+      NEWC	//  price key lhk nhk data ctl domdata gc prices exp _313
+      32 STU	//  price key lhk nhk data ctl domdata gc prices _315
+      s1 s5 XCHG	//  price key lhk nhk prices ctl domdata gc data _315
+      STREF	//  price key lhk nhk prices ctl domdata gc _316
+      s7 s2 XCHG2
+      224 PUSHINT	//  price gc lhk nhk prices ctl _316 key domdata _319
+      DICTUSETB	//  price gc lhk nhk prices ctl domdata
+      s5 s4 XCHG2
+      s1 s3 XCHG
+      1 PUSHINT	//  price ctl domdata gc prices nhk lhk _321=1
+      housekeeping CALLDICT
+      send_ok CALLDICT
+    }>	//  price key lhk exp data ctl domdata gc prices nhk
+    10 BLKDROP	// 
+  }>
+  recv_external PROC:<{
+    //  in_msg
+    DROP	// 
+    load_data INLINECALLDICT	//  _12 _13 _14 _15 _16 _17
+    NIP	//  ctl dd gc prices lhk
+    IFNOTJMP:<{	//  ctl dd gc prices
+      ACCEPT
+      32 PUSHPOW2DEC	//  ctl dd gc prices _9=4294967295
+      NOW	//  ctl dd gc prices _9=4294967295 _10
+      store_data CALLDICT
+    }>	//  ctl dd gc prices
+    4 BLKDROP	// 
+  }>
+  dnsdictlookup PROCREF:<{
+    //  domain nowtime
+    OVER	//  domain nowtime domain
+    SBITREFS	//  domain nowtime bits refs
+    OVER
+    7 PUSHINT	//  domain nowtime bits refs bits _6=7
+    AND	//  domain nowtime bits refs _7
+    OR	//  domain nowtime bits _8
+    30 THROWIF
+    DUP	//  domain nowtime bits bits
+    IFNOTJMP:<{	//  domain nowtime bits
+      3 BLKDROP	// 
+      0 PUSHINT	//  _10=0
+      PUSHNULL	//  _10=0 _11
+      OVER	//  _10=0 _11 _12=0
+      PUSHNULL	//  _10=0 _11 _12=0 _13
+    }>	//  domain nowtime bits
+    s2 PUSH
+    8 PUSHINT	//  domain nowtime bits domain _15=8
+    SDCUTLAST	//  domain nowtime bits _16
+    8 PLDU	//  domain nowtime bits domain_last_byte
+    IF:<{	//  domain nowtime bits
+      0 PUSHINT	//  domain nowtime bits _19=0
+      NEWC	//  domain nowtime bits _19=0 _20
+      s0 s4 XCHG2	//  _19=0 nowtime bits _20 domain
+      STSLICER	//  _19=0 nowtime bits _21
+      s1 s3 XCHG	//  bits nowtime _19=0 _21
+      8 STU	//  bits nowtime _23
+      ENDC	//  bits nowtime _24
+      CTOS	//  bits nowtime domain
+      s0 s2 XCHG	//  domain nowtime bits
+      8 ADDCONST	//  domain nowtime bits
+    }>	//  domain nowtime bits
+    DUP	//  domain nowtime bits bits
+    8 EQINT	//  domain nowtime bits _29
+    IFJMP:<{	//  domain nowtime bits
+      3 BLKDROP	// 
+      0 PUSHINT	//  _30=0
+      PUSHNULL	//  _30=0 _31
+      OVER	//  _30=0 _31 _32=0
+      PUSHNULL	//  _30=0 _31 _32=0 _33
+    }>	//  domain nowtime bits
+    c4 PUSH	//  domain nowtime bits _35
+    CTOS	//  domain nowtime bits ds
+    LDREF	//  domain nowtime bits _87 _86
+    NIP	//  domain nowtime bits ds
+    LDDICT	//  domain nowtime bits _89 _88
+    DROP	//  domain nowtime bits root
+    PUSHNULL	//  domain nowtime bits root val
+    -1 PUSHINT	//  domain nowtime bits root val tail_bits=-1
+    s5 PUSH	//  domain nowtime bits root val tail_bits=-1 tail
+    s0 s4 XCHG	//  domain nowtime tail root val tail_bits=-1 bits
+    3 RSHIFT#	//  domain nowtime tail root val tail_bits=-1 _49
+    REPEAT:<{	//  domain nowtime tail root val tail_bits
+      s0 s3 XCHG	//  domain nowtime tail_bits root val tail
+      8 LDU	//  domain nowtime tail_bits root val _50 tail
+      SWAP	//  domain nowtime tail_bits root val tail _50
+      0 EQINT	//  domain nowtime tail_bits root val tail _54
+      IF:<{	//  domain nowtime tail_bits root val tail
+        DUP	//  domain nowtime tail_bits root val tail tail
+        SBITS	//  domain nowtime tail_bits root val tail _56
+        s6 s(-1) PUXC	//  domain nowtime tail_bits root val tail domain _56
+        SDSKIPLAST	//  domain nowtime tail_bits root val tail _57
+        SHA256U	//  domain nowtime tail_bits root val tail _58
+        32 RSHIFT#	//  domain nowtime tail_bits root val tail key
+        s3 PUSH
+        224 PUSHINT	//  domain nowtime tail_bits root val tail key root _65
+        DICTUGET
+        NULLSWAPIFNOT	//  domain nowtime tail_bits root val tail v found?
+        IF:<{	//  domain nowtime tail_bits root val tail v
+          DUP	//  domain nowtime tail_bits root val tail v v
+          32 PLDU	//  domain nowtime tail_bits root val tail v _68
+          s6 PUSH	//  domain nowtime tail_bits root val tail v _68 nowtime
+          GEQ	//  domain nowtime tail_bits root val tail v _69
+          IF:<{	//  domain nowtime tail_bits root val tail v
+            s2 POP
+            s3 POP	//  domain nowtime tail root val
+            s2 PUSH	//  domain nowtime tail root val tail
+            SBITS	//  domain nowtime tail root val tail_bits
+            s0 s3 XCHG	//  domain nowtime tail_bits root val tail
+          }>ELSE<{
+            DROP	//  domain nowtime tail_bits root val tail
+          }>
+        }>ELSE<{
+          DROP	//  domain nowtime tail_bits root val tail
+        }>
+      }>	//  domain nowtime tail_bits root val tail
+      s0 s3 XCHG	//  domain nowtime tail root val tail_bits
+    }>
+    2 2 BLKDROP2
+    s2 POP	//  domain tail_bits val
+    DUP	//  domain tail_bits val val
+    ISNULL	//  domain tail_bits val _71
+    IFJMP:<{	//  domain tail_bits val
+      3 BLKDROP	// 
+      0 PUSHINT	//  _72=0
+      PUSHNULL	//  _72=0 _73
+      OVER	//  _72=0 _73 _74=0
+      PUSHNULL	//  _72=0 _73 _74=0 _75
+    }>	//  domain tail_bits val
+    32 LDU	//  domain tail_bits _76 val
+    LDREF	//  domain tail_bits _76 _97 _96
+    DROP	//  domain tail_bits _76 _79
+    s2 PUSH	//  domain tail_bits _76 _79 tail_bits
+    0 EQINT	//  domain tail_bits _76 _79 _82
+    s4 s3 XCHG2	//  _79 _82 _76 domain tail_bits
+    SDSKIPLAST	//  _79 _82 _76 _83
+    s3 s3 s0 XCHG3	//  _76 _79 _82 _83
+  }>
+  dnsresolve PROC:<{
+    //  domain category
+    NOW	//  domain category _6
+    s1 s2 XCHG	//  category domain _6
+    dnsdictlookup INLINECALLDICT	//  category exp cat_table exact? pfx
+    s0 s3 XCHG	//  category pfx cat_table exact? exp
+    IFNOTJMP:<{	//  category pfx cat_table exact?
+      4 BLKDROP	// 
+      0 PUSHINT	//  _8=0
+      PUSHNULL	//  _8=0 _9
+    }>	//  category pfx cat_table exact?
+    IFNOT:<{	//  category pfx cat_table
+      -1 PUSHINT
+      s3 POP	//  category=-1 pfx cat_table
+    }>	//  category pfx cat_table
+    SWAP	//  category cat_table pfx
+    SBITS	//  category cat_table pfx_bits
+    s2 PUSH	//  category cat_table pfx_bits category
+    IFJMP:<{	//  category cat_table pfx_bits
+      -ROT
+      16 PUSHINT	//  pfx_bits category cat_table _14=16
+      DICTIGETOPTREF	//  pfx_bits cat_found
+    }>	//  category cat_table pfx_bits
+    s2 POP	//  pfx_bits cat_table
+  }>
+  getexpirationx PROC:<{
+    //  domain nowtime
+    dnsdictlookup INLINECALLDICT	//  _7 _8 _9 _10
+    3 BLKDROP	//  exp
+  }>
+  getexpiration PROC:<{
+    //  domain
+    NOW	//  domain _1
+    getexpirationx INLINECALLDICT	//  _2
+  }>
+  getstdperiod PROC:<{
+    // 
+    load_prices INLINECALLDICT	//  _5 _6 _7 _8
+    3 BLKDROP	//  stdper
+  }>
+  getppr PROC:<{
+    // 
+    load_prices INLINECALLDICT	//  _5 _6 _7 _8
+    s2 s3 XCHG
+    3 BLKDROP	//  ppr
+  }>
+  getppc PROC:<{
+    // 
+    load_prices INLINECALLDICT	//  _5 _6 _7 _8
+    s1 s3 XCHG
+    3 BLKDROP	//  ppc
+  }>
+  getppb PROC:<{
+    // 
+    load_prices INLINECALLDICT	//  _5 _6 _7 _8
+    s0 s3 XCHG
+    3 BLKDROP	//  ppb
+  }>
+  calcprice PROC:<{
+    //  domain val
+    load_prices INLINECALLDICT	//  domain val _8 _9 _10 _11
+    2 2 BLKDROP2	//  domain val ppc ppb
+    calcprice_internal INLINECALLDICT	//  _7
+  }>
+  calcregprice PROC:<{
+    //  domain val
+    load_prices INLINECALLDICT	//  domain val _9 _10 _11 _12
+    s3 POP	//  domain val ppb ppr ppc
+    s3 s4 XCHG
+    s4 s0 s4 XCHG3	//  ppr domain val ppc ppb
+    calcprice_internal INLINECALLDICT	//  ppr _7
+    ADD	//  _8
+  }>
+}END>c
diff --git a/submodules/ton/tonlib-src/crypto/smartcont/auto/dns-manual-code.cpp b/submodules/ton/tonlib-src/crypto/smartcont/auto/dns-manual-code.cpp
new file mode 100644
index 0000000000..898666a25b
--- /dev/null
+++ b/submodules/ton/tonlib-src/crypto/smartcont/auto/dns-manual-code.cpp
@@ -0,0 +1 @@
+with_tvm_code("dns-manual", "te6ccgECGAEAAswAART/APSkE/S88sgLAQIBIAIDAgFIBAUC6vLbPAWDCNcYIPkBAdMf0z/4I6ofUyC58mNTKoBA9A5voTHyYFKUuvKiVBNG+RDyo/gAItcLBcAzmDQBdtch0/8wjoVa2zxAA+IDgyWhyEAHgED0Q44aIIBA9JZvpWwSIJQwUwe53iCTMzUBkmwh4rPmbBXwBBESAgLFBgcCASAMDQIBzwgJAAiqgl8DAgFICgsAIdAmRlj4nln+X/+gB6AGT2qkAAUXwOAAFzI9ADJ0EEz9HDyoYAAXvZznaiaGmvmOuF/8AgEgDg8AEbs3PtRNDXCx+AP5ujDCHXSSCUXwNwbeEgd7DyXiJ41yLXCweecMhQBM8WE8sHydACpgjeIMAIlF8DcG3g2zwUXwQjcAOrApjTBwHAABOhAuQgbY6bXwMhyMsGJM8WydCECSIC2zwFpRWyIMEBFUMw5jM1IpRfBXBt4WwSxwCSfzLfAtdJpvkhgRFRAAFsAAkjEB4AKAEPRqABztRNDTH9M/0//0BPQE0QE0cFmOk9s8IMcBmyDXSpPUMNCSfzPi3iLmMDETBPbTBSHBCo4sIZEx4SHAAZcx0wfUAvsA4AHACY4U1CH7BO1DAtDtHu1TVGID8QaC8gDg8i3gcCLBFJQw0g8B3m1tJMEeit4kwRSOkSWECSPbPDMClTLHAPKjkVvi3iTAC44TNAL0BFAkgBD0bjAQI4QJWfABAeAkwAyK4DAUFRYXAIQxAtMAAcABk9QB0JjTBQGqAtcYAeIg10nCD/KmIHjXItcLB/JocFMR10mpNgKY0wcBwAASoQHkMMjLBgHPFsnQUAMAIFn0qG+lIJQC9AQwkjJt4gIAKDQDgBD0WpkQI4QJQETwAQGSMDHiAGYxIsAVnDL0BBAjhAlQQvABAeAiwBaYMgKECfRzMAHgMDIgwB+TMPQE4MAgkm0B4PIsbQE=");
diff --git a/submodules/ton/tonlib-src/crypto/smartcont/auto/dns-manual-code.fif b/submodules/ton/tonlib-src/crypto/smartcont/auto/dns-manual-code.fif
new file mode 100644
index 0000000000..1f15c315e1
--- /dev/null
+++ b/submodules/ton/tonlib-src/crypto/smartcont/auto/dns-manual-code.fif
@@ -0,0 +1,477 @@
+// automatically generated from `smartcont/stdlib.fc` `smartcont/dns-manual-code.fc` 
+PROGRAM{
+  DECLPROC pfxdict_set_ref
+  DECLPROC pfxdict_get_ref
+  DECLPROC load_data
+  DECLPROC store_data
+  DECLPROC recv_internal
+  1666 DECLMETHOD after_code_upgrade
+  DECLPROC process_op
+  DECLPROC process_ops
+  DECLPROC recv_external
+  111475 DECLMETHOD get_contract_id
+  78748 DECLMETHOD get_public_key
+  123660 DECLMETHOD dnsresolve
+  pfxdict_set_ref PROC:<{
+    //  dict key_len key value
+    NEWC	//  dict key_len key value _6
+    STOPTREF	//  dict key_len key _7
+    ENDC	//  dict key_len key _8
+    CTOS	//  dict key_len key _9
+    s1 s3 s3 XCHG3	//  _9 key dict key_len
+    PFXDICTSET	//  dict _5
+    33 THROWIFNOT
+  }>
+  pfxdict_get_ref PROCREF:<{
+    //  dict key_len key
+    -ROT	//  key dict key_len
+    PFXDICTGETQ
+    NULLSWAPIFNOT2	//  pfx val tail succ
+    DUP	//  pfx val tail succ succ
+    IF:<{	//  pfx val tail succ
+      s0 s2 XCHG	//  pfx succ tail val
+      LDOPTREF	//  pfx succ tail _18 _17
+      DROP	//  pfx succ tail _9
+    }>ELSE<{	//  pfx val tail succ
+      s2 POP	//  pfx succ tail
+      PUSHNULL	//  pfx succ tail _9
+    }>	//  pfx succ tail res
+    s0 s2 XCHG	//  pfx res tail succ
+  }>
+  load_data PROCREF:<{
+    // 
+    c4 PUSH	//  _1
+    CTOS	//  cs
+    32 LDU	//  _4 cs
+    64 LDU	//  _4 _7 cs
+    256 LDU	//  _4 _7 _10 cs
+    LDDICT	//  _4 _7 _10 _13 cs
+    LDDICT	//  res res res res res cs
+    ENDS
+  }>
+  store_data PROC:<{
+    //  contract_id last_cleaned public_key root old_queries
+    s0 s4 XCHG
+    NEWC	//  old_queries last_cleaned public_key root contract_id _5
+    32 STU	//  old_queries last_cleaned public_key root _7
+    s1 s3 XCHG	//  old_queries root public_key last_cleaned _7
+    64 STU	//  old_queries root public_key _9
+    256 STU	//  old_queries root _11
+    STDICT	//  old_queries _12
+    STDICT	//  _13
+    ENDC	//  _14
+    c4 POP
+  }>
+  recv_internal PROC:<{
+    //  msg_value in_msg_cell in_msg
+    3 BLKDROP	// 
+  }>
+  after_code_upgrade PROC:<{
+    //  root ops old_code
+    3 BLKDROP	// 
+  }>
+  process_op PROCREF:<{
+    //  root ops
+    6 LDU	//  root op ops
+    OVER	//  root op ops op
+    10 LESSINT	//  root op ops _7
+    IFJMP:<{	//  root op ops
+      OVER	//  root op ops op
+      IFNOTJMP:<{	//  root op ops
+        NIP	//  root ops
+      }>	//  root op ops
+      OVER	//  root op ops op
+      1 EQINT	//  root op ops _9
+      IFJMP:<{	//  root op ops
+        NIP	//  root ops
+        8 LDU	//  root mode ops
+        LDREF	//  root mode _14 ops
+        s0 s2 XCHG	//  root ops _14 mode
+        SENDRAWMSG
+      }>	//  root op ops
+      SWAP	//  root ops op
+      9 EQINT	//  root ops _18
+      IFJMP:<{	//  root ops
+        LDREF	//  root new_code ops
+        OVER	//  root new_code ops new_code
+        SETCODE
+        c3 PUSH	//  root new_code ops old_code
+        s0 s2 XCHG	//  root old_code ops new_code
+        CTOS	//  root old_code ops _25
+        BLESS	//  root old_code ops _26
+        c3 POP
+        s2 s(-1) s1 PU2XC	//  root ops root ops old_code
+        after_code_upgrade CALLDICT
+        0 THROW
+      }>	//  root ops
+      45 THROW
+    }>	//  root op ops
+    0 PUSHINT	//  root op ops cat=0
+    s2 PUSH	//  root op ops cat=0 op
+    20 LESSINT	//  root op ops cat=0 _36
+    IF:<{	//  root op ops cat=0
+      DROP	//  root op ops
+      16 LDI	//  root op cat ops
+      SWAP	//  root op ops cat
+    }>	//  root op ops cat
+    PUSHNULL	//  root op ops cat name
+    PUSHNULL	//  root op ops cat name cat_table
+    s4 PUSH	//  root op ops cat name cat_table op
+    30 LESSINT	//  root op ops cat name cat_table _45
+    IF:<{	//  root op ops cat name cat_table
+      NIP	//  root op ops cat cat_table
+      s0 s2 XCHG	//  root op cat_table cat ops
+      1 LDU	//  root op cat_table cat _47 ops
+      SWAP	//  root op cat_table cat ops _47
+      1 EQINT	//  root op cat_table cat ops is_name_ref
+      IF:<{	//  root op cat_table cat ops
+        LDREF	//  root op cat_table cat _52 ops
+        SWAP	//  root op cat_table cat ops _52
+        CTOS	//  root op cat_table cat ops name
+      }>ELSE<{	//  root op cat_table cat ops
+        6 LDU	//  root op cat_table cat _56 ops
+        SWAP	//  root op cat_table cat ops _56
+        3 LSHIFT#	//  root op cat_table cat ops name_len
+        LDSLICEX	//  root op cat_table cat name ops
+        SWAP	//  root op cat_table cat ops name
+      }>
+      DUP	//  root op cat_table cat ops name name
+      SBITS	//  root op cat_table cat ops name _64
+      15 GTINT	//  root op cat_table cat ops name _66
+      38 THROWIFNOT
+      DUP
+      8 PUSHINT	//  root op cat_table cat ops name name _69=8
+      SDCUTLAST	//  root op cat_table cat ops name _70
+      8 PLDU	//  root op cat_table cat ops name name_last_byte
+      40 THROWIF
+      0 PUSHINT	//  root op cat_table cat ops name zeros=0
+      s1 s1 PUSH2	//  root op cat_table cat ops name zeros=0 cname cname
+      SBITS	//  root op cat_table cat ops name zeros=0 cname _78
+      3 RSHIFTC#	//  root op cat_table cat ops name zeros=0 cname _80
+      REPEAT:<{	//  root op cat_table cat ops name zeros cname
+        8 LDU	//  root op cat_table cat ops name zeros c cname
+        SWAP	//  root op cat_table cat ops name zeros cname c
+        0 EQINT	//  root op cat_table cat ops name zeros cname _86
+        s1 s2 XCHG	//  root op cat_table cat ops name cname zeros _86
+        SUB	//  root op cat_table cat ops name cname zeros
+        SWAP	//  root op cat_table cat ops name zeros cname
+      }>
+      DROP	//  root op cat_table cat ops name zeros
+      NEWC	//  root op cat_table cat ops name zeros _88
+      7 STU	//  root op cat_table cat ops name _90
+      SWAP	//  root op cat_table cat ops _90 name
+      STSLICER	//  root op cat_table cat ops _91
+      ENDC	//  root op cat_table cat ops _92
+      CTOS	//  root op cat_table cat ops name
+      s0 s3 XCHG2	//  root op ops cat name cat_table
+    }>	//  root op ops cat name cat_table
+    s4 PUSH	//  root op ops cat name cat_table op
+    20 LESSINT	//  root op ops cat name cat_table _95
+    IF:<{	//  root op ops cat name cat_table
+      s5 PUSH
+      10 PUSHPOW2DEC
+      s3 PUSH	//  root op ops cat name cat_table root _100=1023 name
+      pfxdict_get_ref INLINECALLDICT	//  root op ops cat name cat_table _168 _169 _170 _171
+      s3 POP	//  root op ops cat name cat_table succ val tail
+      s0 s2 XCHG	//  root op ops cat name cat_table tail val succ
+      IF:<{	//  root op ops cat name cat_table tail val
+        s2 POP	//  root op ops cat name val tail
+        SEMPTY	//  root op ops cat name val _103
+        35 THROWIFNOT	//  root op ops cat name cat_table
+      }>ELSE<{
+        2DROP	//  root op ops cat name cat_table
+      }>
+    }>	//  root op ops cat name cat_table
+    s4 PUSH	//  root op ops cat name cat_table op
+    11 EQINT	//  root op ops cat name cat_table _106
+    IFJMP:<{	//  root op ops cat name cat_table
+      s4 POP	//  root cat_table ops cat name
+      s0 s2 XCHG	//  root cat_table name cat ops
+      LDOPTREF	//  root cat_table name cat new_value ops
+      s2 s4 XCHG2
+      16 PUSHINT	//  root ops name new_value cat cat_table _111=16
+      DICTISETGETOPTREF	//  root ops name _174 _175
+      DROP	//  root ops name cat_table
+      s2 s3 XCHG
+      10 PUSHPOW2DEC
+      -ROT	//  ops root _114=1023 name cat_table
+      pfxdict_set_ref CALLDICT	//  ops root
+      SWAP	//  root ops
+    }>	//  root op ops cat name cat_table
+    s4 PUSH	//  root op ops cat name cat_table op
+    12 EQINT	//  root op ops cat name cat_table _117
+    IFJMP:<{	//  root op ops cat name cat_table
+      s4 POP	//  root cat_table ops cat name
+      s0 s3 XCHG
+      16 PUSHINT	//  root name ops cat cat_table _119=16
+      DICTIDEL	//  root name ops cat_table _118
+      IF:<{	//  root name ops cat_table
+        s2 s3 XCHG
+        10 PUSHPOW2DEC
+        s0 s4 s4 XCHG3	//  ops root _122=1023 name cat_table
+        pfxdict_set_ref CALLDICT	//  ops root
+        SWAP	//  root ops
+      }>ELSE<{
+        DROP
+        NIP	//  root ops
+      }>
+    }>	//  root op ops cat name cat_table
+    DROP
+    NIP	//  root op ops name
+    s2 PUSH	//  root op ops name op
+    21 EQINT	//  root op ops name _125
+    IFJMP:<{	//  root op ops name
+      s2 POP	//  root name ops
+      LDOPTREF	//  root name new_cat_table ops
+      s2 s3 XCHG
+      10 PUSHPOW2DEC
+      s4 s2 XCHG2	//  ops root _130=1023 name new_cat_table
+      pfxdict_set_ref CALLDICT	//  ops root
+      SWAP	//  root ops
+    }>	//  root op ops name
+    s2 PUSH	//  root op ops name op
+    22 EQINT	//  root op ops name _133
+    IFJMP:<{	//  root op ops name
+      s2 POP	//  root name ops
+      s0 s2 XCHG
+      10 PUSHPOW2DEC	//  ops name root _135=1023
+      PFXDICTDEL	//  ops _180 _181
+      DROP	//  ops root
+      SWAP	//  root ops
+    }>	//  root op ops name
+    DROP
+    s2 POP	//  ops op
+    DUP	//  ops op op
+    31 EQINT	//  ops op _138
+    IFJMP:<{	//  ops op
+      DROP	//  ops
+      LDOPTREF	//  new_tree_root ops
+    }>	//  ops op
+    32 EQINT	//  ops _143
+    IFJMP:<{	//  ops
+      PUSHNULL	//  ops _144
+      SWAP	//  _144 ops
+    }>	//  ops
+    44 THROW
+    PUSHNULL	//  ops _147
+    SWAP	//  _147 ops
+  }>
+  process_ops PROCREF:<{
+    //  root ops
+    FALSE	//  root ops stop
+    -ROT	//  stop root ops
+    UNTIL:<{
+      process_op INLINECALLDICT	//  stop root ops
+      DUP	//  stop root ops ops
+      SDEMPTY	//  stop root ops _9
+      IF:<{	//  stop root ops
+        DUP	//  stop root ops ops
+        SREFS	//  stop root ops _10
+        IF:<{	//  stop root ops
+          LDREF	//  stop root _18 _17
+          DROP	//  stop root _11
+          CTOS	//  stop root ops
+        }>ELSE<{	//  stop root ops
+          TRUE
+          s3 POP	//  stop root ops
+        }>
+      }>	//  stop root ops
+      s2 PUSH	//  stop root ops stop
+    }>	//  stop root ops
+    DROP
+    NIP	//  root
+  }>
+  recv_external PROC:<{
+    //  in_msg
+    load_data INLINECALLDICT	//  in_msg contract_id last_cleaned public_key root old_queries
+    s0 s5 XCHG
+    9 PUSHPOW2	//  old_queries contract_id last_cleaned public_key root in_msg _9=512
+    LDSLICEX	//  old_queries contract_id last_cleaned public_key root signature in_msg
+    DUP	//  old_queries contract_id last_cleaned public_key root signature in_msg in_msg
+    HASHSU	//  old_queries contract_id last_cleaned public_key root signature in_msg shash
+    SWAP	//  old_queries contract_id last_cleaned public_key root signature shash in_msg
+    32 LDU	//  old_queries contract_id last_cleaned public_key root signature shash _15 in_msg
+    64 LDU	//  old_queries contract_id last_cleaned public_key root signature shash query_contract query_id in_msg
+    NOW	//  old_queries contract_id last_cleaned public_key root signature shash query_contract query_id in_msg _22
+    32 LSHIFT#	//  old_queries contract_id last_cleaned public_key root signature shash query_contract query_id in_msg bound
+    s2 s0 PUSH2	//  old_queries contract_id last_cleaned public_key root signature shash query_contract query_id in_msg bound query_id bound
+    LESS	//  old_queries contract_id last_cleaned public_key root signature shash query_contract query_id in_msg bound _26
+    35 THROWIF
+    s2 s10 PUSH2
+    64 PUSHINT	//  old_queries contract_id last_cleaned public_key root signature shash query_contract query_id in_msg bound query_id old_queries _30=64
+    DICTUGET
+    NULLSWAPIFNOT	//  old_queries contract_id last_cleaned public_key root signature shash query_contract query_id in_msg bound _84 _85
+    NIP	//  old_queries contract_id last_cleaned public_key root signature shash query_contract query_id in_msg bound found?
+    32 THROWIF
+    s9 s3 PUXC	//  old_queries contract_id last_cleaned public_key root signature shash bound query_id in_msg contract_id query_contract
+    EQUAL	//  old_queries contract_id last_cleaned public_key root signature shash bound query_id in_msg _35
+    34 THROWIFNOT
+    s3 s4 s6 XC2PU	//  old_queries contract_id last_cleaned public_key root in_msg query_id bound shash signature public_key
+    CHKSIGNU	//  old_queries contract_id last_cleaned public_key root in_msg query_id bound _38
+    35 THROWIFNOT
+    ACCEPT
+    s2 PUSH	//  old_queries contract_id last_cleaned public_key root in_msg query_id bound in_msg
+    6 PLDU	//  old_queries contract_id last_cleaned public_key root in_msg query_id bound op
+    51 EQINT	//  old_queries contract_id last_cleaned public_key root in_msg query_id bound _45
+    IF:<{	//  old_queries contract_id last_cleaned public_key root in_msg query_id bound
+      s4 POP	//  old_queries contract_id last_cleaned bound root in_msg query_id
+      SWAP
+      6 PUSHINT	//  old_queries contract_id last_cleaned bound root query_id in_msg _47=6
+      SDSKIPFIRST	//  old_queries contract_id last_cleaned bound root query_id in_msg
+      256 LDU	//  old_queries contract_id last_cleaned bound root query_id _87 _86
+      DROP	//  old_queries contract_id last_cleaned bound root query_id public_key
+    }>ELSE<{	//  old_queries contract_id last_cleaned public_key root in_msg query_id bound
+      2SWAP	//  old_queries contract_id last_cleaned public_key query_id bound root in_msg
+      process_ops INLINECALLDICT	//  old_queries contract_id last_cleaned public_key query_id bound root
+      s0 s0 s3 XCHG3	//  old_queries contract_id last_cleaned bound root query_id public_key
+    }>
+    s0 s3 XCHG
+    38 PUSHPOW2	//  old_queries contract_id last_cleaned public_key root query_id bound _55
+    SUB	//  old_queries contract_id last_cleaned public_key root query_id bound
+    NEWC	//  old_queries contract_id last_cleaned public_key root query_id bound _58
+    s0 s0 s7 XCHG3
+    64 PUSHINT	//  bound contract_id last_cleaned public_key root _58 query_id old_queries _59=64
+    DICTUSETB	//  bound contract_id last_cleaned public_key root old_queries
+    UNTIL:<{
+      DUP
+      64 PUSHINT	//  bound contract_id last_cleaned public_key root old_queries old_queries _66=64
+      DICTUREMMIN
+      NULLSWAPIFNOT2	//  bound contract_id last_cleaned public_key root old_queries _88 _90 _89 _91
+      1 2 BLKDROP2	//  bound contract_id last_cleaned public_key root old_queries old_queries' i f
+      DUP	//  bound contract_id last_cleaned public_key root old_queries old_queries' i f f
+      IF:<{	//  bound contract_id last_cleaned public_key root old_queries old_queries' i f
+        DROP	//  bound contract_id last_cleaned public_key root old_queries old_queries' i
+        s0 s7 PUSH2	//  bound contract_id last_cleaned public_key root old_queries old_queries' i i bound
+        LESS	//  bound contract_id last_cleaned public_key root old_queries old_queries' i f
+      }>	//  bound contract_id last_cleaned public_key root old_queries old_queries' i f
+      DUP	//  bound contract_id last_cleaned public_key root old_queries old_queries' i f f
+      IF:<{	//  bound contract_id last_cleaned public_key root old_queries old_queries' i f
+        s3 POP
+        s5 POP	//  bound contract_id last_cleaned public_key root f old_queries
+        SWAP	//  bound contract_id last_cleaned public_key root old_queries f
+      }>ELSE<{
+        2 1 BLKDROP2	//  bound contract_id last_cleaned public_key root old_queries f
+      }>
+      NOT	//  bound contract_id last_cleaned public_key root old_queries _71
+    }>	//  bound contract_id last_cleaned public_key root old_queries
+    1 5 BLKDROP2	//  contract_id last_cleaned public_key root old_queries
+    store_data CALLDICT
+  }>
+  get_contract_id PROC:<{
+    // 
+    c4 PUSH	//  _0
+    CTOS	//  _1
+    32 PLDU	//  _3
+  }>
+  get_public_key PROC:<{
+    // 
+    c4 PUSH	//  _1
+    CTOS	//  cs
+    96 LDU	//  _11 _10
+    NIP	//  cs
+    256 PLDU	//  _9
+  }>
+  dnsresolve PROC:<{
+    //  subdomain category
+    OVER	//  subdomain category subdomain
+    SBITS	//  subdomain category bits
+    DUP	//  subdomain category bits bits
+    IFNOTJMP:<{	//  subdomain category bits
+      3 BLKDROP	// 
+      0 PUSHINT	//  _4=0
+      PUSHNULL	//  _4=0 _5
+    }>	//  subdomain category bits
+    DUP
+    7 PUSHINT	//  subdomain category bits bits _7=7
+    AND	//  subdomain category bits _8
+    30 THROWIF
+    s2 PUSH
+    8 PUSHINT	//  subdomain category bits subdomain _11=8
+    SDCUTLAST	//  subdomain category bits _12
+    8 PLDU	//  subdomain category bits name_last_byte
+    IF:<{	//  subdomain category bits
+      0 PUSHINT	//  subdomain category bits _15=0
+      NEWC	//  subdomain category bits _15=0 _16
+      s0 s4 XCHG2	//  _15=0 category bits _16 subdomain
+      STSLICER	//  _15=0 category bits _17
+      s1 s3 XCHG	//  bits category _15=0 _17
+      8 STU	//  bits category _19
+      ENDC	//  bits category _20
+      CTOS	//  bits category subdomain
+      s0 s2 XCHG	//  subdomain category bits
+      8 ADDCONST	//  subdomain category bits
+    }>	//  subdomain category bits
+    DUP	//  subdomain category bits bits
+    8 EQINT	//  subdomain category bits _25
+    IFJMP:<{	//  subdomain category bits
+      3 BLKDROP	// 
+      0 PUSHINT	//  _26=0
+      PUSHNULL	//  _26=0 _27
+    }>	//  subdomain category bits
+    load_data INLINECALLDICT	//  subdomain category bits _80 _81 _82 _83 _84
+    s1 s4 XCHG
+    4 BLKDROP	//  subdomain category bits root
+    s3 PUSH	//  subdomain category bits root cname
+    0 PUSHINT	//  subdomain category bits root cname zeros=0
+    s0 s3 XCHG	//  subdomain category zeros=0 root cname bits
+    3 RSHIFT#	//  subdomain category zeros=0 root cname _38
+    REPEAT:<{	//  subdomain category zeros root cname
+      8 LDU	//  subdomain category zeros root c cname
+      SWAP	//  subdomain category zeros root cname c
+      0 EQINT	//  subdomain category zeros root cname _44
+      s1 s3 XCHG	//  subdomain category cname root zeros _44
+      SUB	//  subdomain category cname root zeros
+      s0 s2 XCHG	//  subdomain category zeros root cname
+    }>
+    DUP	//  subdomain category zeros root cname pfx
+    PUSHNULL	//  subdomain category zeros root tail pfx val
+    UNTIL:<{
+      3 BLKDROP	//  subdomain category zeros root
+      OVER
+      NEWC	//  subdomain category zeros root zeros _51
+      7 STU	//  subdomain category zeros root _53
+      s4 PUSH	//  subdomain category zeros root _53 subdomain
+      STSLICER	//  subdomain category zeros root _54
+      ENDC	//  subdomain category zeros root _55
+      CTOS	//  subdomain category zeros root pfxname
+      10 PUSHPOW2DEC	//  subdomain category zeros root pfxname _58=1023
+      s2 PUSH
+      s0 s2 XCHG	//  subdomain category zeros root root _58=1023 pfxname
+      pfxdict_get_ref INLINECALLDICT	//  subdomain category zeros root pfx val tail succ
+      s0 s5 XCHG	//  subdomain category succ root pfx val tail zeros
+      DEC	//  subdomain category succ root pfx val tail _61
+      s1 s5 XCHG	//  subdomain category tail root pfx val succ _61
+      XOR	//  subdomain category tail root pfx val zeros
+      DUP	//  subdomain category tail root pfx val zeros zeros
+      1 LESSINT	//  subdomain category tail root pfx val zeros _64
+      s1 s5 XCHG
+      s3 s3 s0 XCHG3	//  subdomain category zeros root tail pfx val _64
+    }>	//  subdomain category zeros root tail pfx val
+    s3 POP
+    s5 POP	//  pfx category zeros val tail
+    s2 PUSH	//  pfx category zeros val tail zeros
+    IFNOTJMP:<{	//  pfx category zeros val tail
+      5 BLKDROP	// 
+      0 PUSHINT	//  _65=0
+      PUSHNULL	//  _65=0 _66
+    }>	//  pfx category zeros val tail
+    1 2 BLKDROP2	//  pfx category val tail
+    SEMPTY	//  pfx category val _68
+    IFNOT:<{	//  pfx category val
+      -1 PUSHINT
+      s2 POP	//  pfx category=-1 val
+    }>	//  pfx category val
+    s0 s2 XCHG	//  val category pfx
+    SBITS	//  val category _71
+    -7 ADDCONST	//  cat_table category pfx_bits
+    OVER	//  cat_table category pfx_bits category
+    0 EQINT	//  cat_table category pfx_bits _76
+    IFJMP:<{	//  cat_table category pfx_bits
+      NIP	//  cat_table pfx_bits
+      SWAP	//  pfx_bits cat_table
+    }>	//  cat_table category pfx_bits
+    s0 s2 XCHG
+    16 PUSHINT	//  pfx_bits category cat_table _78=16
+    DICTIGETOPTREF	//  pfx_bits cat_found
+  }>
+}END>c
diff --git a/submodules/ton/tonlib-src/crypto/smartcont/auto/elector-code.cpp b/submodules/ton/tonlib-src/crypto/smartcont/auto/elector-code.cpp
index 90cddeac51..fafe3fa48c 100644
--- a/submodules/ton/tonlib-src/crypto/smartcont/auto/elector-code.cpp
+++ b/submodules/ton/tonlib-src/crypto/smartcont/auto/elector-code.cpp
@@ -1 +1 @@
-with_tvm_code("elector-code", "te6ccgECVQEACskAART/APSkE/Sg8sgLAQIBIAIDAgFIBAUAUaX//xh2omh6AnoCETdKrPgN+SBOKjgQ+At5ICz4DPkgcXgL+SB4DRhAAgLFBgcCASAKCwIBywgJACyqgjGCEE5Db2SCEM5Db2RwQzCAQPAGAgEgEBECASAzNAIDeqAMDQIBbg4PACSqB+1E0PQFIG6SMHCU0NcLH+IAQqss7UTQ9AUgbpJbcODwAxAmXwaDB/QOb6GT+gAwkjBw4gBzsKV7UTQ9AUgbpIwbeDwAxAmXwZthP+OHiKDB/R+b6FvoSCcAvoAMFIQbwJQA28Cklow4gGzEuYwMYAAzs+A7UTQ9AQx9AQwgwf0Dm+hk/oAMJIwcOKACASASEwIBICMkAgEgFBUCASAdHgIBIBYXAgEgGxwBASAYACE7UTQ9AT0BPQE+gDTH9P/0YAL8AdDTAwFxsJJfA+D6QDAhxwCUMQHwEOAB0x8hwACUWwHwEODTPyKCEE5zdEu6lTIQI/AL4DQhghBHZXQkupMT8BHgIYIQTkNvZLqOGVRSRPASloIQzkNvZJKEH+JwEDRDMIBA8AbgIYIQ7nZPS7oighDudk9vulIQsYrgMDMgGRoADDIQIwHwDwAkgx6wm4QfcBA0QzCAQPAG4V8DACkyBb0ABT0ABL0AAH6Assfy//J7VSAAITQ0x/TH/oA+gD0BNIA0gDRgAgEgHyACASAhIgArMgXyx8Vyx9QA/oCAfoC9ADKAMoAyYAAdIAP+DPQ0h/SH9If1wofgAEUcIAYyMsFUAfPFlj6AhXLahPLH8s/IcL/kssfkTHiyQH7AIAAbIIQ7m9FTHBDMIBA8AaACASAlJgIBIC0uAgEgJygCASApKgAjIIQ83RITIIQO5rKAEMwcvAGgAEcghBOVlNUcIIAxP/IyxAVy/+DHfoCFMtqE8sfEss/zMlx+wCAAMxTEoMH9A5voZT6ADCgkTDiyAH6AgKDB/RDgAQEgKwH+I/pE7UTQ9AQhbgSkFLGXEDVfBXDwB+AE0//TH9Mf0//UAdCDCNcZAdGCEGVMUHTIyx9SQMsfUjDLH1Jgy/9SIMv/ydBRFfkRlxBoXwhx8AfhIYMPuZcQaF8IdvAH4AfwAzEF/iANghA7msoAoSCqCyO5mBC8XwwxcvAH4FEioCwA/lF9vZcQrF8Mc/AH4ASXEJtfC3DwB+BTY4MH9A5voSCfMPoAWaAB0z8x0/8wUoC9kTHilxCbXwt08AfgUwG5lxCbXwt18AfgIPKs+AD4I8hY+gLLHxTLHxbL/xjL/0A3gwf0Q3AQVxA0ECMQJnDwBMj0AAHPFsntVCCTcPAI4FsCASAvMAIBIDEyAHkcCB/jjAkgwf0fG+hb6EgjhwC0//TPzH6ANIA0ZQxUTOgl1QYiPAKBwPiUEOgk1BCMOIBsxPmMDMBuvK7gAKEcFMAf447JoMH9HxvoW+hII4nAtP/0z8x+gDSANGUMVEzoI4RVHcIqYRRZqBSF6BLsPAKCQPiUFOgk1BSMOIBsxTmMDUDulMhu7DyuxKgAaGAAVwBgCD0Zm+hkjBw4dM/MdP/MfQE+gD6APQEMdEgwgCUEDTwDZUwECPwDOISgAKMMgL6RHD4M9DXC//tRND0BASkWr2xIW6xkl8E4PADBV8FUhW9BLMUsZJfA+D4AAGRW44d9AT0BPoAQzTwDnDIygAT9AD0AFmg+gIBzxbJ7VTigAgEgNTYCAUhPUAIBIDc4AgEgPT4CASA5OgIBIDs8AKU8AEH+kQBpLEhwACxlwWgVRMB8ALgUwKAIPQOb6GOJ9M/0//0BPoA+gALoMgVyz8Ty//0AAH6AgH6AlAGzxYBgCBURkT0Q5QwBaAB4hA1QUPwAoADZDEh+kQBpJ8wghD////+cBA0E4BA8Abg7UTQ9AT0BFAzgwf0Zm+hjhBfBIIQ/////nAQNBOAQPAG4TYF+gDRyBL0ABX0AAHPFsntVIIQ+W9zJHCAGMjLBVAEzxZQBPoCEstqEssfyz/JgED7AIABpHD4MyBuk18EcODQ1wv/I/pEAaQCvbGTXwNw4PgAAdQh+wQgxwCSXwSZAe1TAfEGgvIA4n+AAAxwgAgEgP0ACASBKSwA1HACjhMCbyIhbxACbxEkqKsPErYIEqBY5DAxgAQEgQQP+gBD4M9DTD9MPMdMP0XG2CXBtf45GKYMH9HxvoW+hII4wAvoA0x/TH9P/0//RA6PIFct/FMofUkDL/8nQURq2CMjLHxPL/8v/QBSBAaD0QQOklBA0WjDiAbNDMOYwNFi2CFMBuZdfB21wbVMR4G2K5jM0pVySbxHkcCCK5jIyNEJDRABqA4EBoPSSb6FvoSCOIAHTf1EZtggB0x8x1wv/A9Mf0/8x1wv/QTAUbwRQBW8Ck0YWW+IEsxQASgJvIgFvEASkU0i+jhBUZQbwFFMCvJMyMiKSEzDik1A0MOJTNr4BZDQiwABSQ7kSsZdfBG1wbVMR4CD+ICKlkm8R5G8QbxBwUwBtbYrmNDQ0NlJVuvKxQzQBRQT+Bm8iAW8kUx2DB/QOb6HyvfoAMdM/MdcL/1OcuY5aUTqoqw9SQLYIUUShJKo7LqkEUZWgUYmgghCOgSeKI5KAc5KAU+LIywfLH1JAy/9SoMs/I5MTy/+TUAMw4gGAEFRLmfRDcCTIy/8ayz9QBfoCGMoAQBqDB/RDiuIjioriBEZHSEkAEAsQeBBGA18DAAhMg/AKAAZMg1sAFqQqbhBbEFcVEDQSAQEgTAGtPABgCL4M/kAUwG6k18HcOAiji9TJIAg9A5voY4f0x8xINMf0/8wUAS68rn4I1ADoMjLH1jPFkAEgCD0Q5QVE18D4pNEFFvif4rmIG6SMHCQ4lAD8AJ/gTgH8AfADNPgjJbmTXwhw4HD4M26UXwjwE+CAEfgz0PoA+gD6ANMf0VNhuZRfDPAT4ASUXwvwE+AGk18KcOAQOChRMlB38BUgwAAgsysGEFsQShA5Td3wBCOOFDEyMjIyMsgS9AD0AAHPFsntVPAT4fAFMvgjAaCmxCm2CYAQ+DPQTQDQgBDXIdcLD1JwtghTE6CAEsjLB1Iwyx/LHxjLDxfLDxrLPxP0AMlw+DPQ1wv/UxjwCQn0BHAL+QBQZKApoMjLHxnLHxLL/xX0AFAD+gJw+gIWygBANIAg9EPIE/QA9AD0AAHPFsntVH8ApCGAIPR8b6FvoSCOPwLTP9P/Uxe6ji00A/QE+gD6ACirAlGZoVApoMgVyz8Wy/8S9AAB+gIB+gJYzxYBgCBUQUT0Q3CWEDUQNF8D4pNDAzDisxICASBRUgIBIFNUABkIW6SW3CVAfkAAbrigAJUAfADBV8Fk18DcOEC9ARRMYAg9A5voZNfBHDhgEDXIdcL/4Ai+DMh8BiAJPgzWPAYsY4TcMjKABL0APQAAc8Wye1U8Bcwf+BfA3CAAkzwAX+OPiSAIPR8b6FvoSCOJALTHzD4I7tTFL2wjhExVBVE8A4UoFR2E1RzWPACcJRGFVBE4pYQNxZFBTDisxAmEEUU5gZfBm6zgAOEMYAk+DNukltw4XH4M9DXC//4KPpEAaQCvbGSW3DggCL4MyBuk18DcODwBTAyAtCAKNch1wsf+CNRE6FcuZNfBnDgXKHBPJExkTDigBH4M9D6ADADoP4gUgKhcG1wEEUQNHDwBMj0APQAAc8Wye1Uf4A==");
+with_tvm_code("elector-code", "te6ccgECUwEACr8AART/APSkE/S88sgLAQIBIAIDAgFIBAUAUaX//xh2omh6AnoCETdKrPgN+SBOKjgQ+At5ICz4DPkgcXgL+SB4DRhAAgLFBgcCASAKCwIBywgJACqqgjGCEE5Db2SCEM5Db2RZcIBA8AYCASASEwIBIDM0AgN6oAwNAgFuEBECAWoODwBCqyztRND0BSBukltw4PADECZfBoMH9A5voZP6ADCSMHDiACO4ftRND0BSBukjBwlNDXCx/igAh7qu1E0PQFIG6YMHBUcABtUxHg8ANthP+OJySDB/R+b6UgjhgC+gDTHzHTH9P/0//RbwRSEG8CUANvAgKRMuIBs+YwM4AG2wpXtRND0BSBukjBt4PADECZfBm2E/44bIoMH9H5vpSCdAvoAMFIQbwJQA28CApEy4gGz5jAxgADOz4DtRND0BDH0BDCDB/QOb6GT+gAwkjBw4oAIBIBQVAgEgJCUCASAWFwIBIB4fAgEgGBkCASAcHQL3AHQ0wMBcbCSXwPg+kAwIccAlDEB8BDgAdMfIcAAlFsB8BDg0z8ighBOc3RLupUyECPwC+A0IYIQR2V0JLqTE/AR4CGCEE5Db2S6jhdUUkTwEpaCEM5Db2SShB/iQDNwgEDwBuAhghDudk9LuiKCEO52T2+6UhCxiuAwM4BobACE7UTQ9AT0BPQE+gDTH9P/0YAAKMkMA8A8AIiCDHrCZhB9AM3CAQPAG4V8DACkBcj0ABT0ABL0AAH6Assfy//J7VSAAITQ0x/TH/oA+gD0BNIA0gDRgAgEgICECASAiIwArAbIyx8Vyx9QA/oCAfoC9ADKAMoAyYAAdIAP+DPQ0h/SH9If1wofgAEUcIAYyMsFUAfPFlj6AhXLahPLH8s/IcL/kssfkTHiyQH7AIAAZIIQ7m9FTFlwgEDwBoAIBICYnAgEgLS4CASAoKQIBICorACEghDzdEhMWYIQO5rKAHLwBoABHIIQTlZTVHCCAMT/yMsQFcv/gx36AhTLahPLHxLLP8zJcfsAgADMUxKDB/QOb6GU+gAwoJEw4sgB+gICgwf0Q4AH3CP6RO1E0PQEIW4EpBSxlxA1XwVw8AfgBNP/0x/TH9P/1AHQgwjXGQHRghBlTFB0yMsfUkDLH1Iwyx9SYMv/UiDL/8nQURX5EZcQaF8IcfAH4SGDD7mXEGhfCHbwB+AH8AMxDYIQO5rKAKEgqgsjuZcQvV8NcvAH4FEioICwA+FF1vZcQrF8Mc/AH4AyXEJtfC3DwB+BTa4MH9A5voSCfMPoAWaAB0z8x0/8wUoC9kTHilxCbXwt08AfgUwG5lxCbXwt18AfgIPKs+AD4I8hY+gLLHxTLHxbL/xjL/0A4gwf0QxBFQTAWcHDwBMj0AFjPFsntVCCTcPAI4FsCASAvMAIBIDEyAHEcCB/jiwkgwf0fG+lII4dAtP/0z8x+gDSANGUMVEzoJdUGIjwCgcD4lBDoAORMuIBs+YwMwG68ruAAmRwUwB/jjcmgwf0fG+lII4oAtP/0z8x+gDSANGUMVEzoI4RVHcIqYRRZqBSF6BLsPAKCQPiUFOgBJEy4gGz5jA1A7pTIbuw8rsSoAGhgAFcAYAg9GZvoZIwcOHTPzHT/zH0BPoA+gD0BDHRIMIAlBA08A2VMBAj8AziEoACjDIC+kRw+DPQ1wv/7UTQ9AQEpFq9sSFusZJfBODwAwVfBVIVvQSzFLGSXwPg+AABkVuOHfQE9AT6AEM08A5wyMoAE/QA9ABZoPoCAc8Wye1U4oAIBIDU2AgFITU4CASA3OAIBID0+AgEgOToCASA7PAClPABB/pEAaSxIcAAsZgFoBA1VRLwAuBTAoAg9A5voY4m0z/T//QE+gD6AAugBMjLPxPL//QAAfoCAfoCUAbPFlQgU4Ag9EOUMAWgAeIQNUFD8AKAA0wxIfpEAaSeMIIQ/////kATcIBA8Abg7UTQ9AT0BFAzgwf0Zm+hn18EghD////+QBNwgEDwBuE2BfoA0QHI9AAV9AABzxbJ7VSCEPlvcyRwgBjIywVQBM8WUAT6AhLLahLLH8s/yYBA+wCAAbxw+DMgbpNfBHDg0NcL/yP6RAGkAr2xk18DcOD4AAHUIfsEIMcAkl8EnAHQ7R7tUwHxBoLyAOJ/gAAMcIAIBID9AAgEgSUoANRwAo4TAm8iIW8QAm8RJKirDxK2CBKgWOQwMYAP3IAQ+DPQ0w/TDzHTD9FxtglwbX+OQSmDB/R8b6UgjjIC+gDTH9Mf0//T/9EDowTIy38Uyh9SQMv/ydBRGrYIyMsfE8v/y/9AFIEBoPRBA6RDE5Ey4gGz5jA0WLYIUwG5l18HbXBtUxHgbYrmMzSlXJJvEeRwIIrmNjZbIoEFCQwBkA4EBoPSSb6UgjiEB039RGbYIAdMfMdcL/wPTH9P/MdcL/0EwFG8EUAVvAgSSbCHisxQASAJvIgFvEASkU0i+jhBUZQbwFFMCvJRsIiICkTDikTTiUza+EwFewABSQ7kSsZdfBG1wbVMR4FMBpZJvEeRvEG8QcFMAbW2K5jQ0NDZSVbrysVBEQxNEA/4GbyIBbyRTHYMH9A5vofK9+gAx0z8x1wv/U5y5jl1ROqirD1JAtghRRKEkqjsuqQRRlaBRiaCCEI6BJ4ojkoBzkoBT4sjLB8sfUkDL/1Kgyz8jlBPL/wKRM+JUIqiAEPRDcCTIy/8ayz9QBfoCGMoAQBqDB/RDCBBFExSK4iGKRUZHAAYDXwMACkwA8AoKARCK4gSkJG4VF0gAAlsB9QB8AM0+CMluZNfCHDgcPgzbpRfCPAT4IAR+DPQ+gD6APoA0x/RU2G5lF8M8BPgBJRfC/AT4AaTXwpw4CMQSVEyUHfwFSDAACCzKwYQWxBKEDlN3fAEI44QMWxSyPQA9AABzxbJ7VTwE+HwBTL4IwGgpsQptgmAEPgz0IEsBqTwAYAi+DP5AFMBupNfB3DgIo4vUySAIPQOb6GOINMfMSDTH9P/MFAEuvK5+CNQA6DIyx9YzxZABIAg9EMCkxNfA+KSbCHif4rmIG6SMHCQ4gHwAn+BMANCAENch1wsPUnC2CFMToIASyMsHUjDLH8sfGMsPF8sPGss/E/QAyXD4M9DXC/9TGPAJCfQEcAv5AFBkoCmgyMsfGcsfEsv/FfQAUAP6AnD6AhbKAEA0gCD0QwLI9AD0APQAAc8Wye1UfwCWI4Ag9HxvpSCOPALTP9P/UxW6ji40A/QE+gD6ACirAlGZoVApoATIyz8Wy/8S9AAB+gIB+gJYzxZUIAWAIPRDA3ABkl8D4pEy4gGzAgEgT1ACASBRUgAZCFukltwlQH5AAG64oACVAHwAwVfBZNfA3DhAvQEUTGAIPQOb6GTXwRw4YBA1yHXC/+AIvgzIfAYgCT4M1jwGLGOE3DIygAS9AD0AAHPFsntVPAXMH/gXwNwgAHs8AF/jjIkgCD0fG+lII4jAtMfMPgju1MUvbCOFTFUFUTwDhSgVHYTVHNY8AIDUFRwAd6RMuIBs+YGXwZus4ADdDGAJPgzbpJbcOFx+DPQ1wv/+Cj6RAGkAr2xkltw4IAi+DMgbpNfA3Dg8AUwMgLQgCjXIdcLH/gjUROhXLmTXwZw4FyhwTyRMZEw4oAR+DPQ+gAwA6BSAqFwbRA0ECNwcPAEyPQA9AABzxbJ7VR/g");
diff --git a/submodules/ton/tonlib-src/crypto/smartcont/auto/elector-code.fif b/submodules/ton/tonlib-src/crypto/smartcont/auto/elector-code.fif
index e37ab8d892..7aa8ac2970 100644
--- a/submodules/ton/tonlib-src/crypto/smartcont/auto/elector-code.fif
+++ b/submodules/ton/tonlib-src/crypto/smartcont/auto/elector-code.fif
@@ -33,6 +33,7 @@ PROGRAM{
   86535 DECLMETHOD active_election_id
   87852 DECLMETHOD participates_in
   123541 DECLMETHOD participant_list
+  86698 DECLMETHOD participant_list_extended
   130944 DECLMETHOD compute_returned_stake
   load_data PROC:<{
     // 
@@ -48,8 +49,8 @@ PROGRAM{
   }>
   store_data PROC:<{
     //  elect credits past_elect grams active_id active_hash
-    NEWC	//  elect credits past_elect grams active_id active_hash _6
-    s1 s6 XCHG	//  active_hash credits past_elect grams active_id elect _6
+    s0 s5 XCHG
+    NEWC	//  active_hash credits past_elect grams active_id elect _6
     STDICT	//  active_hash credits past_elect grams active_id _7
     s1 s4 XCHG	//  active_hash active_id past_elect grams credits _7
     STDICT	//  active_hash active_id past_elect grams _8
@@ -76,8 +77,8 @@ PROGRAM{
   }>
   pack_elect PROC:<{
     //  elect_at elect_close min_stake total_stake members failed finished
-    NEWC	//  elect_at elect_close min_stake total_stake members failed finished _7
-    s1 s7 XCHG	//  finished elect_close min_stake total_stake members failed elect_at _7
+    s0 s6 XCHG
+    NEWC	//  finished elect_close min_stake total_stake members failed elect_at _7
     32 STU	//  finished elect_close min_stake total_stake members failed _9
     s1 s5 XCHG	//  finished failed min_stake total_stake members elect_close _9
     32 STU	//  finished failed min_stake total_stake members _11
@@ -129,16 +130,16 @@ PROGRAM{
   return_stake PROC:<{
     //  addr query_id reason
     4000269644 PUSHINT	//  addr query_id reason _3=4000269644
-    0 PUSHINT	//  addr query_id reason _3=4000269644 _4=0
-    s3 s3 s0 XCHG3
+    -ROT
+    0 PUSHINT
     64 PUSHINT	//  addr _3=4000269644 query_id reason _4=0 _5=64
     send_message_back CALLDICT
   }>
   send_confirmation PROC:<{
     //  addr query_id comment
     4084484172 PUSHINT	//  addr query_id comment _3=4084484172
-    1000000000 PUSHINT	//  addr query_id comment _3=4084484172 _4=1000000000
-    s3 s3 s0 XCHG3
+    -ROT
+    1000000000 PUSHINT
     2 PUSHINT	//  addr _3=4084484172 query_id comment _4=1000000000 _5=2
     send_message_back CALLDICT
   }>
@@ -246,108 +247,104 @@ PROGRAM{
       return_stake CALLDICT
     }>	//  s_addr msg_value elect query_id ds src_addr validator_pubkey stake_at max_factor adnl_addr
     s0 s7 XCHG	//  s_addr msg_value adnl_addr query_id ds src_addr validator_pubkey stake_at max_factor elect
-    unpack_elect CALLDICT	//  s_addr msg_value adnl_addr query_id ds src_addr validator_pubkey stake_at max_factor _146 _147 _148 _149 _150 _151 _152
+    unpack_elect CALLDICT	//  s_addr msg_value adnl_addr query_id ds src_addr validator_pubkey stake_at max_factor _144 _145 _146 _147 _148 _149 _150
     NIP	//  s_addr msg_value adnl_addr query_id ds src_addr validator_pubkey stake_at max_factor elect_at elect_close min_stake total_stake members finished
-    s0 s5 XCHG	//  s_addr msg_value adnl_addr query_id ds src_addr validator_pubkey stake_at max_factor finished elect_close min_stake total_stake members elect_at
-    s0 DUMP	//  s_addr msg_value adnl_addr query_id ds src_addr validator_pubkey stake_at max_factor finished elect_close min_stake total_stake members elect_at
     s0 s13 XCHG
-    1000000000 PUSHINT	//  s_addr elect_at adnl_addr query_id ds src_addr validator_pubkey stake_at max_factor finished elect_close min_stake total_stake members msg_value _73=1000000000
-    SUB	//  s_addr elect_at adnl_addr query_id ds src_addr validator_pubkey stake_at max_factor finished elect_close min_stake total_stake members msg_value
-    DUP	//  s_addr elect_at adnl_addr query_id ds src_addr validator_pubkey stake_at max_factor finished elect_close min_stake total_stake members msg_value msg_value
-    12 LSHIFT#	//  s_addr elect_at adnl_addr query_id ds src_addr validator_pubkey stake_at max_factor finished elect_close min_stake total_stake members msg_value _76
-    s3 PUSH	//  s_addr elect_at adnl_addr query_id ds src_addr validator_pubkey stake_at max_factor finished elect_close min_stake total_stake members msg_value _76 total_stake
-    LESS	//  s_addr elect_at adnl_addr query_id ds src_addr validator_pubkey stake_at max_factor finished elect_close min_stake total_stake members msg_value _77
-    IFJMP:<{	//  s_addr elect_at adnl_addr query_id ds src_addr validator_pubkey stake_at max_factor finished elect_close min_stake total_stake members msg_value
-      s11 s12 XCHG
-      12 BLKDROP
-      NIP	//  s_addr query_id
-      2 PUSHINT	//  s_addr query_id _78=2
+    1000000000 PUSHINT	//  s_addr finished adnl_addr query_id ds src_addr validator_pubkey stake_at max_factor elect_at elect_close min_stake total_stake members msg_value _71=1000000000
+    SUB	//  s_addr finished adnl_addr query_id ds src_addr validator_pubkey stake_at max_factor elect_at elect_close min_stake total_stake members msg_value
+    DUP	//  s_addr finished adnl_addr query_id ds src_addr validator_pubkey stake_at max_factor elect_at elect_close min_stake total_stake members msg_value msg_value
+    12 LSHIFT#	//  s_addr finished adnl_addr query_id ds src_addr validator_pubkey stake_at max_factor elect_at elect_close min_stake total_stake members msg_value _74
+    s3 PUSH	//  s_addr finished adnl_addr query_id ds src_addr validator_pubkey stake_at max_factor elect_at elect_close min_stake total_stake members msg_value _74 total_stake
+    LESS	//  s_addr finished adnl_addr query_id ds src_addr validator_pubkey stake_at max_factor elect_at elect_close min_stake total_stake members msg_value _75
+    IFJMP:<{	//  s_addr finished adnl_addr query_id ds src_addr validator_pubkey stake_at max_factor elect_at elect_close min_stake total_stake members msg_value
+      s11 s13 XCHG
+      13 BLKDROP	//  s_addr query_id
+      2 PUSHINT	//  s_addr query_id _76=2
       return_stake CALLDICT
-    }>	//  s_addr elect_at adnl_addr query_id ds src_addr validator_pubkey stake_at max_factor finished elect_close min_stake total_stake members msg_value
-    s2 s2 XCPU	//  s_addr elect_at adnl_addr query_id ds src_addr validator_pubkey stake_at max_factor finished elect_close min_stake msg_value members total_stake msg_value
-    ADD	//  s_addr elect_at adnl_addr query_id ds src_addr validator_pubkey stake_at max_factor finished elect_close min_stake msg_value members total_stake
-    s7 s13 XCPU	//  s_addr elect_at adnl_addr query_id ds src_addr validator_pubkey total_stake max_factor finished elect_close min_stake msg_value members stake_at elect_at
-    NEQ	//  s_addr elect_at adnl_addr query_id ds src_addr validator_pubkey total_stake max_factor finished elect_close min_stake msg_value members _81
-    IFJMP:<{	//  s_addr elect_at adnl_addr query_id ds src_addr validator_pubkey total_stake max_factor finished elect_close min_stake msg_value members
+    }>	//  s_addr finished adnl_addr query_id ds src_addr validator_pubkey stake_at max_factor elect_at elect_close min_stake total_stake members msg_value
+    s2 s2 XCPU	//  s_addr finished adnl_addr query_id ds src_addr validator_pubkey stake_at max_factor elect_at elect_close min_stake msg_value members total_stake msg_value
+    ADD	//  s_addr finished adnl_addr query_id ds src_addr validator_pubkey stake_at max_factor elect_at elect_close min_stake msg_value members total_stake
+    s7 s5 XCPU	//  s_addr finished adnl_addr query_id ds src_addr validator_pubkey total_stake max_factor elect_at elect_close min_stake msg_value members stake_at elect_at
+    NEQ	//  s_addr finished adnl_addr query_id ds src_addr validator_pubkey total_stake max_factor elect_at elect_close min_stake msg_value members _79
+    IFJMP:<{	//  s_addr finished adnl_addr query_id ds src_addr validator_pubkey total_stake max_factor elect_at elect_close min_stake msg_value members
       s10 s12 XCHG
       12 BLKDROP	//  s_addr query_id
-      3 PUSHINT	//  s_addr query_id _82=3
+      3 PUSHINT	//  s_addr query_id _80=3
       return_stake CALLDICT
-    }>	//  s_addr elect_at adnl_addr query_id ds src_addr validator_pubkey total_stake max_factor finished elect_close min_stake msg_value members
-    s0 s4 XCHG	//  s_addr elect_at adnl_addr query_id ds src_addr validator_pubkey total_stake max_factor members elect_close min_stake msg_value finished
-    IFJMP:<{	//  s_addr elect_at adnl_addr query_id ds src_addr validator_pubkey total_stake max_factor members elect_close min_stake msg_value
+    }>	//  s_addr finished adnl_addr query_id ds src_addr validator_pubkey total_stake max_factor elect_at elect_close min_stake msg_value members
+    s0 s12 XCHG	//  s_addr members adnl_addr query_id ds src_addr validator_pubkey total_stake max_factor elect_at elect_close min_stake msg_value finished
+    IFJMP:<{	//  s_addr members adnl_addr query_id ds src_addr validator_pubkey total_stake max_factor elect_at elect_close min_stake msg_value
       s9 s11 XCHG
       11 BLKDROP	//  s_addr query_id
-      0 PUSHINT	//  s_addr query_id _84=0
+      0 PUSHINT	//  s_addr query_id _82=0
       return_stake CALLDICT
-    }>	//  s_addr elect_at adnl_addr query_id ds src_addr validator_pubkey total_stake max_factor members elect_close min_stake msg_value
-    s6 s3 PUSH2
-    8 PUSHPOW2	//  s_addr elect_at adnl_addr query_id ds src_addr validator_pubkey total_stake max_factor members elect_close min_stake msg_value validator_pubkey members _88=256
+    }>	//  s_addr members adnl_addr query_id ds src_addr validator_pubkey total_stake max_factor elect_at elect_close min_stake msg_value
+    s6 s11 PUSH2
+    8 PUSHPOW2	//  s_addr members adnl_addr query_id ds src_addr validator_pubkey total_stake max_factor elect_at elect_close min_stake msg_value validator_pubkey members _86=256
     DICTUGET
-    NULLSWAPIFNOT	//  s_addr elect_at adnl_addr query_id ds src_addr validator_pubkey total_stake max_factor members elect_close min_stake msg_value mem found
-    DUP	//  s_addr elect_at adnl_addr query_id ds src_addr validator_pubkey total_stake max_factor members elect_close min_stake msg_value mem found found
-    IF:<{	//  s_addr elect_at adnl_addr query_id ds src_addr validator_pubkey total_stake max_factor members elect_close min_stake msg_value mem found
-      DROP	//  s_addr elect_at adnl_addr query_id ds src_addr validator_pubkey total_stake max_factor members elect_close min_stake msg_value mem
-      LDGRAMS	//  s_addr elect_at adnl_addr query_id ds src_addr validator_pubkey total_stake max_factor members elect_close min_stake msg_value _90 mem
-      -ROT	//  s_addr elect_at adnl_addr query_id ds src_addr validator_pubkey total_stake max_factor members elect_close min_stake mem msg_value _90
-      ADD	//  s_addr elect_at adnl_addr query_id ds src_addr validator_pubkey total_stake max_factor members elect_close min_stake mem msg_value
-      SWAP	//  s_addr elect_at adnl_addr query_id ds src_addr validator_pubkey total_stake max_factor members elect_close min_stake msg_value mem
-      64 LDU	//  s_addr elect_at adnl_addr query_id ds src_addr validator_pubkey total_stake max_factor members elect_close min_stake msg_value _158 _157
-      NIP	//  s_addr elect_at adnl_addr query_id ds src_addr validator_pubkey total_stake max_factor members elect_close min_stake msg_value mem
-      256 LDU	//  s_addr elect_at adnl_addr query_id ds src_addr validator_pubkey total_stake max_factor members elect_close min_stake msg_value _160 _159
-      DROP	//  s_addr elect_at adnl_addr query_id ds src_addr validator_pubkey total_stake max_factor members elect_close min_stake msg_value _96
-      s8 s(-1) PUXC	//  s_addr elect_at adnl_addr query_id ds src_addr validator_pubkey total_stake max_factor members elect_close min_stake msg_value src_addr _96
-      NEQ	//  s_addr elect_at adnl_addr query_id ds src_addr validator_pubkey total_stake max_factor members elect_close min_stake msg_value found
+    NULLSWAPIFNOT	//  s_addr members adnl_addr query_id ds src_addr validator_pubkey total_stake max_factor elect_at elect_close min_stake msg_value mem found
+    DUP	//  s_addr members adnl_addr query_id ds src_addr validator_pubkey total_stake max_factor elect_at elect_close min_stake msg_value mem found found
+    IF:<{	//  s_addr members adnl_addr query_id ds src_addr validator_pubkey total_stake max_factor elect_at elect_close min_stake msg_value mem found
+      DROP	//  s_addr members adnl_addr query_id ds src_addr validator_pubkey total_stake max_factor elect_at elect_close min_stake msg_value mem
+      LDGRAMS	//  s_addr members adnl_addr query_id ds src_addr validator_pubkey total_stake max_factor elect_at elect_close min_stake msg_value _88 mem
+      -ROT	//  s_addr members adnl_addr query_id ds src_addr validator_pubkey total_stake max_factor elect_at elect_close min_stake mem msg_value _88
+      ADD	//  s_addr members adnl_addr query_id ds src_addr validator_pubkey total_stake max_factor elect_at elect_close min_stake mem msg_value
+      SWAP	//  s_addr members adnl_addr query_id ds src_addr validator_pubkey total_stake max_factor elect_at elect_close min_stake msg_value mem
+      64 LDU	//  s_addr members adnl_addr query_id ds src_addr validator_pubkey total_stake max_factor elect_at elect_close min_stake msg_value _156 _155
+      NIP	//  s_addr members adnl_addr query_id ds src_addr validator_pubkey total_stake max_factor elect_at elect_close min_stake msg_value mem
+      256 LDU	//  s_addr members adnl_addr query_id ds src_addr validator_pubkey total_stake max_factor elect_at elect_close min_stake msg_value _158 _157
+      DROP	//  s_addr members adnl_addr query_id ds src_addr validator_pubkey total_stake max_factor elect_at elect_close min_stake msg_value _94
+      s8 s(-1) PUXC	//  s_addr members adnl_addr query_id ds src_addr validator_pubkey total_stake max_factor elect_at elect_close min_stake msg_value src_addr _94
+      NEQ	//  s_addr members adnl_addr query_id ds src_addr validator_pubkey total_stake max_factor elect_at elect_close min_stake msg_value found
     }>ELSE<{
-      NIP	//  s_addr elect_at adnl_addr query_id ds src_addr validator_pubkey total_stake max_factor members elect_close min_stake msg_value found
+      NIP	//  s_addr members adnl_addr query_id ds src_addr validator_pubkey total_stake max_factor elect_at elect_close min_stake msg_value found
     }>
-    IFJMP:<{	//  s_addr elect_at adnl_addr query_id ds src_addr validator_pubkey total_stake max_factor members elect_close min_stake msg_value
+    IFJMP:<{	//  s_addr members adnl_addr query_id ds src_addr validator_pubkey total_stake max_factor elect_at elect_close min_stake msg_value
       s9 s11 XCHG
       11 BLKDROP	//  s_addr query_id
-      4 PUSHINT	//  s_addr query_id _100=4
+      4 PUSHINT	//  s_addr query_id _98=4
       return_stake CALLDICT
-    }>	//  s_addr elect_at adnl_addr query_id ds src_addr validator_pubkey total_stake max_factor members elect_close min_stake msg_value
-    s0 s1 PUSH2	//  s_addr elect_at adnl_addr query_id ds src_addr validator_pubkey total_stake max_factor members elect_close min_stake msg_value msg_value min_stake
-    LESS	//  s_addr elect_at adnl_addr query_id ds src_addr validator_pubkey total_stake max_factor members elect_close min_stake msg_value _102
-    IFJMP:<{	//  s_addr elect_at adnl_addr query_id ds src_addr validator_pubkey total_stake max_factor members elect_close min_stake msg_value
+    }>	//  s_addr members adnl_addr query_id ds src_addr validator_pubkey total_stake max_factor elect_at elect_close min_stake msg_value
+    s0 s1 PUSH2	//  s_addr members adnl_addr query_id ds src_addr validator_pubkey total_stake max_factor elect_at elect_close min_stake msg_value msg_value min_stake
+    LESS	//  s_addr members adnl_addr query_id ds src_addr validator_pubkey total_stake max_factor elect_at elect_close min_stake msg_value _100
+    IFJMP:<{	//  s_addr members adnl_addr query_id ds src_addr validator_pubkey total_stake max_factor elect_at elect_close min_stake msg_value
       s9 s11 XCHG
       11 BLKDROP	//  s_addr query_id
-      5 PUSHINT	//  s_addr query_id _103=5
+      5 PUSHINT	//  s_addr query_id _101=5
       return_stake CALLDICT
-    }>	//  s_addr elect_at adnl_addr query_id ds src_addr validator_pubkey total_stake max_factor members elect_close min_stake msg_value
-    DUP	//  s_addr elect_at adnl_addr query_id ds src_addr validator_pubkey total_stake max_factor members elect_close min_stake msg_value msg_value
+    }>	//  s_addr members adnl_addr query_id ds src_addr validator_pubkey total_stake max_factor elect_at elect_close min_stake msg_value
+    DUP	//  s_addr members adnl_addr query_id ds src_addr validator_pubkey total_stake max_factor elect_at elect_close min_stake msg_value msg_value
     44 THROWIFNOT
     ACCEPT
-    NOW	//  s_addr elect_at adnl_addr query_id ds src_addr validator_pubkey total_stake max_factor members elect_close min_stake msg_value _109
-    NEWC	//  s_addr elect_at adnl_addr query_id ds src_addr validator_pubkey total_stake max_factor members elect_close min_stake msg_value _109 _110
-    ROT	//  s_addr elect_at adnl_addr query_id ds src_addr validator_pubkey total_stake max_factor members elect_close min_stake _109 _110 msg_value
-    STGRAMS	//  s_addr elect_at adnl_addr query_id ds src_addr validator_pubkey total_stake max_factor members elect_close min_stake _109 _111
-    32 STU	//  s_addr elect_at adnl_addr query_id ds src_addr validator_pubkey total_stake max_factor members elect_close min_stake _113
-    s1 s4 XCHG	//  s_addr elect_at adnl_addr query_id ds src_addr validator_pubkey total_stake min_stake members elect_close max_factor _113
-    32 STU	//  s_addr elect_at adnl_addr query_id ds src_addr validator_pubkey total_stake min_stake members elect_close _115
-    s1 s6 XCHG	//  s_addr elect_at adnl_addr query_id ds elect_close validator_pubkey total_stake min_stake members src_addr _115
-    256 STU	//  s_addr elect_at adnl_addr query_id ds elect_close validator_pubkey total_stake min_stake members _117
-    s1 s8 XCHG	//  s_addr elect_at members query_id ds elect_close validator_pubkey total_stake min_stake adnl_addr _117
-    256 STU	//  s_addr elect_at members query_id ds elect_close validator_pubkey total_stake min_stake _119
-    s0 s3 s7 XCHG3
-    8 PUSHPOW2	//  s_addr elect_at total_stake query_id ds elect_close min_stake _119 validator_pubkey members _120=256
-    DICTUSETB	//  s_addr elect_at total_stake query_id ds elect_close min_stake members
-    FALSE	//  s_addr elect_at total_stake query_id ds elect_close min_stake members _122
-    s5 s7 XCHG
-    s3 s4 XCHG
-    s2 s3 XCHG
-    s2 s6 XCHG
-    FALSE	//  s_addr query_id ds elect_at elect_close min_stake total_stake members _122 _123
-    pack_elect CALLDICT	//  s_addr query_id ds elect
-    NEWC	//  s_addr query_id ds elect _125
-    STDICT	//  s_addr query_id ds _126
-    SWAP	//  s_addr query_id _126 ds
-    STSLICER	//  s_addr query_id _127
-    ENDC	//  s_addr query_id _128
+    NOW	//  s_addr members adnl_addr query_id ds src_addr validator_pubkey total_stake max_factor elect_at elect_close min_stake msg_value _107
+    NEWC
+    ROT	//  s_addr members adnl_addr query_id ds src_addr validator_pubkey total_stake max_factor elect_at elect_close min_stake _107 _108 msg_value
+    STGRAMS	//  s_addr members adnl_addr query_id ds src_addr validator_pubkey total_stake max_factor elect_at elect_close min_stake _107 _109
+    32 STU	//  s_addr members adnl_addr query_id ds src_addr validator_pubkey total_stake max_factor elect_at elect_close min_stake _111
+    s1 s4 XCHG	//  s_addr members adnl_addr query_id ds src_addr validator_pubkey total_stake min_stake elect_at elect_close max_factor _111
+    32 STU	//  s_addr members adnl_addr query_id ds src_addr validator_pubkey total_stake min_stake elect_at elect_close _113
+    s1 s6 XCHG	//  s_addr members adnl_addr query_id ds elect_close validator_pubkey total_stake min_stake elect_at src_addr _113
+    256 STU	//  s_addr members adnl_addr query_id ds elect_close validator_pubkey total_stake min_stake elect_at _115
+    s1 s8 XCHG	//  s_addr members elect_at query_id ds elect_close validator_pubkey total_stake min_stake adnl_addr _115
+    256 STU	//  s_addr members elect_at query_id ds elect_close validator_pubkey total_stake min_stake _117
+    s0 s3 s8 XCHG3
+    8 PUSHPOW2	//  s_addr total_stake elect_at query_id ds elect_close min_stake _117 validator_pubkey members _118=256
+    DICTUSETB	//  s_addr total_stake elect_at query_id ds elect_close min_stake members
+    s4 s5 XCHG
+    s1 s3 s0 XCHG3
+    s1 s6 XCHG
+    FALSE
+    FALSE	//  s_addr ds query_id elect_at elect_close min_stake total_stake members _120 _121
+    pack_elect CALLDICT	//  s_addr ds query_id elect
+    NEWC	//  s_addr ds query_id elect _123
+    STDICT	//  s_addr ds query_id _124
+    ROT	//  s_addr query_id _124 ds
+    STSLICER	//  s_addr query_id _125
+    ENDC	//  s_addr query_id _126
     c4 POP
     DUP	//  s_addr query_id query_id
     IFJMP:<{	//  s_addr query_id
-      0 PUSHINT	//  s_addr query_id _130=0
+      0 PUSHINT	//  s_addr query_id _128=0
       send_confirmation CALLDICT
     }>	//  s_addr query_id
     2DROP	// 
@@ -361,8 +358,7 @@ PROGRAM{
       s4 PUSH
       8 PUSHPOW2	//  credits freeze_dict tot_stakes total recovered pubkey freeze_dict _10=256
       DICTUGETNEXT
-      NULLSWAPIFNOT
-      NULLSWAPIFNOT	//  credits freeze_dict tot_stakes total recovered cs pubkey f
+      NULLSWAPIFNOT2	//  credits freeze_dict tot_stakes total recovered cs pubkey f
       DUP	//  credits freeze_dict tot_stakes total recovered cs pubkey f f
       IF:<{	//  credits freeze_dict tot_stakes total recovered cs pubkey f
         s0 s2 XCHG	//  credits freeze_dict tot_stakes total recovered f pubkey cs
@@ -384,13 +380,12 @@ PROGRAM{
         }>
         s4 s3 XCHG2	//  credits freeze_dict tot_stakes pubkey recovered f total stake
         ADD	//  credits freeze_dict tot_stakes pubkey recovered f total
+        s0 s3 XCHG	//  credits freeze_dict tot_stakes total recovered f pubkey
       }>ELSE<{
-        s4 s2 XCHG2
-        DROP	//  credits freeze_dict tot_stakes pubkey recovered f total
+        s2 POP	//  credits freeze_dict tot_stakes total recovered f pubkey
       }>
-      SWAP	//  credits freeze_dict tot_stakes pubkey recovered total f
-      NOT	//  credits freeze_dict tot_stakes pubkey recovered total _32
-      s1 s3 XCHG	//  credits freeze_dict tot_stakes total recovered pubkey _32
+      SWAP	//  credits freeze_dict tot_stakes total recovered pubkey f
+      NOT	//  credits freeze_dict tot_stakes total recovered pubkey _32
     }>	//  credits freeze_dict tot_stakes total recovered pubkey
     DROP
     s3 POP	//  credits recovered tot_stakes total
@@ -407,8 +402,7 @@ PROGRAM{
       s6 PUSH
       8 PUSHPOW2	//  credits freeze_dict tot_stakes tot_bonuses total returned_bonuses recovered pubkey freeze_dict _12=256
       DICTUGETNEXT
-      NULLSWAPIFNOT
-      NULLSWAPIFNOT	//  credits freeze_dict tot_stakes tot_bonuses total returned_bonuses recovered cs pubkey f
+      NULLSWAPIFNOT2	//  credits freeze_dict tot_stakes tot_bonuses total returned_bonuses recovered cs pubkey f
       DUP	//  credits freeze_dict tot_stakes tot_bonuses total returned_bonuses recovered cs pubkey f f
       IF:<{	//  credits freeze_dict tot_stakes tot_bonuses total returned_bonuses recovered cs pubkey f
         s0 s2 XCHG	//  credits freeze_dict tot_stakes tot_bonuses total returned_bonuses recovered f pubkey cs
@@ -436,13 +430,12 @@ PROGRAM{
         }>
         s5 s3 XCHG2	//  credits freeze_dict tot_stakes tot_bonuses pubkey returned_bonuses recovered f total stake
         ADD	//  credits freeze_dict tot_stakes tot_bonuses pubkey returned_bonuses recovered f total
+        s0 s4 XCHG	//  credits freeze_dict tot_stakes tot_bonuses total returned_bonuses recovered f pubkey
       }>ELSE<{
-        s5 s2 XCHG2
-        DROP	//  credits freeze_dict tot_stakes tot_bonuses pubkey returned_bonuses recovered f total
+        s2 POP	//  credits freeze_dict tot_stakes tot_bonuses total returned_bonuses recovered f pubkey
       }>
-      SWAP	//  credits freeze_dict tot_stakes tot_bonuses pubkey returned_bonuses recovered total f
-      NOT	//  credits freeze_dict tot_stakes tot_bonuses pubkey returned_bonuses recovered total _38
-      s1 s4 XCHG	//  credits freeze_dict tot_stakes tot_bonuses total returned_bonuses recovered pubkey _38
+      SWAP	//  credits freeze_dict tot_stakes tot_bonuses total returned_bonuses recovered pubkey f
+      NOT	//  credits freeze_dict tot_stakes tot_bonuses total returned_bonuses recovered pubkey _38
     }>	//  credits freeze_dict tot_stakes tot_bonuses total returned_bonuses recovered pubkey
     DROP
     s5 POP	//  credits recovered tot_stakes tot_bonuses total returned_bonuses
@@ -563,8 +556,8 @@ PROGRAM{
     IFJMP:<{	//  active_hash msg_value elect credits past_elect grams active_id
       s0 s5 XCHG	//  active_hash active_id elect credits past_elect grams msg_value
       ADD	//  active_hash active_id elect credits past_elect grams
-      2 4 BLKSWAP
-      SWAP	//  elect credits past_elect grams active_id active_hash
+      s3 s5 XCHG
+      2 3 BLKSWAP	//  elect credits past_elect grams active_id active_hash
       store_data CALLDICT
     }>	//  active_hash msg_value elect credits past_elect grams active_id
     s0 s2 PUSH2
@@ -579,8 +572,8 @@ PROGRAM{
       LDGRAMS	//  active_hash msg_value elect credits past_elect grams active_id data hash dict total_stake bonuses fs
       s0 s11 XCHG	//  active_hash fs elect credits past_elect grams active_id data hash dict total_stake bonuses msg_value
       ADD	//  active_hash fs elect credits past_elect grams active_id data hash dict total_stake bonuses
-      NEWC	//  active_hash fs elect credits past_elect grams active_id data hash dict total_stake bonuses _44
-      s1 s5 XCHG	//  active_hash fs elect credits past_elect grams active_id bonuses hash dict total_stake data _44
+      s0 s4 XCHG
+      NEWC	//  active_hash fs elect credits past_elect grams active_id bonuses hash dict total_stake data _44
       64 STU	//  active_hash fs elect credits past_elect grams active_id bonuses hash dict total_stake _46
       s1 s3 XCHG	//  active_hash fs elect credits past_elect grams active_id bonuses total_stake dict hash _46
       256 STU	//  active_hash fs elect credits past_elect grams active_id bonuses total_stake dict _48
@@ -591,9 +584,8 @@ PROGRAM{
       STGRAMS	//  active_hash fs elect credits past_elect grams active_id _51
       s0 s6 XCHG2	//  active_hash active_id elect credits past_elect grams _51 fs
       STSLICER	//  active_hash active_id elect credits past_elect grams _52
-      SWAP
-      32 PUSHINT
-      s6 s3 s3 PUXC2	//  active_hash active_id elect credits grams _52 active_id past_elect _53=32
+      s0 s5 s2 XCPUXC
+      32 PUSHINT	//  active_hash active_id elect credits grams _52 active_id past_elect _53=32
       DICTUSETB	//  active_hash active_id elect credits grams past_elect
     }>ELSE<{	//  active_hash msg_value elect credits past_elect grams active_id fs
       DROP	//  active_hash msg_value elect credits past_elect grams active_id
@@ -615,9 +607,8 @@ PROGRAM{
     IFJMP:<{	//  op s_addr query_id src_addr
       DROP	//  op s_addr query_id
       4294967294 PUSHINT	//  op s_addr query_id _9=4294967294
-      0 PUSHINT	//  op s_addr query_id _9=4294967294 _10=0
-      s3 s4 XCHG
-      s1 s3 XCHG
+      s0 s1 s3 XCHG3
+      0 PUSHINT
       64 PUSHINT	//  s_addr _9=4294967294 query_id op _10=0 _11=64
       send_message_back CALLDICT
     }>	//  op s_addr query_id src_addr
@@ -632,9 +623,8 @@ PROGRAM{
     IFNOTJMP:<{	//  op s_addr query_id ds elect credits cs
       4 BLKDROP	//  op s_addr query_id
       4294967294 PUSHINT	//  op s_addr query_id _27=4294967294
-      0 PUSHINT	//  op s_addr query_id _27=4294967294 _28=0
-      s3 s4 XCHG
-      s1 s3 XCHG
+      s0 s1 s3 XCHG3
+      0 PUSHINT
       64 PUSHINT	//  s_addr _27=4294967294 query_id op _28=0 _29=64
       send_message_back CALLDICT
     }>	//  op s_addr query_id ds elect credits cs
@@ -642,8 +632,8 @@ PROGRAM{
     s0 s5 XCHG	//  credits s_addr query_id ds elect cs
     LDGRAMS	//  credits s_addr query_id ds elect amount cs
     ENDS
-    NEWC	//  credits s_addr query_id ds elect amount _35
-    s1 s2 XCHG	//  credits s_addr query_id ds amount elect _35
+    SWAP
+    NEWC	//  credits s_addr query_id ds amount elect _35
     STDICT	//  credits s_addr query_id ds amount _36
     s1 s5 XCHG	//  amount s_addr query_id ds credits _36
     STDICT	//  amount s_addr query_id ds _37
@@ -674,8 +664,8 @@ PROGRAM{
     NIP	//  s_addr query_id
     1313042276 PUSHINT	//  s_addr query_id op=1313042276
     3460525924 PUSHINT	//  s_addr query_id op=1313042276 _5=3460525924
-    0 PUSHINT	//  s_addr query_id op=1313042276 _5=3460525924 _6=0
-    s3 s3 s0 XCHG3
+    -ROT
+    0 PUSHINT
     64 PUSHINT	//  s_addr _5=3460525924 query_id op=1313042276 _6=0 _7=64
     send_message_back CALLDICT
   }>
@@ -711,6 +701,8 @@ PROGRAM{
     SEMPTY	//  s_addr query_id code cs _25
     IFNOT:<{	//  s_addr query_id code cs
       SWAP	//  s_addr query_id cs code
+      CTOS	//  s_addr query_id cs _26
+      BLESS	//  s_addr query_id cs _27
       c3 POP
       SWAP	//  s_addr cs query_id
       after_code_upgrade CALLDICT
@@ -718,7 +710,7 @@ PROGRAM{
     }>ELSE<{
       4 BLKDROP	// 
     }>
-    TRUE	//  _30
+    TRUE	//  _32
   }>
   recv_internal PROC:<{
     //  msg_value in_msg_cell in_msg
@@ -777,9 +769,8 @@ PROGRAM{
       }>ELSE<{	//  query_id s_addr op
         32 PUSHPOW2DEC	//  query_id s_addr op _37=4294967295
       }>
-      0 PUSHINT	//  query_id s_addr op _37 _40=0
-      s3 s4 XCHG
-      s3 s3 s0 XCHG3
+      s0 s3 s3 XCHG3
+      0 PUSHINT
       64 PUSHINT	//  s_addr _37 query_id op _40=0 _41=64
       send_message_back CALLDICT
     }>	//  in_msg s_addr op query_id
@@ -793,8 +784,7 @@ PROGRAM{
     OR	//  in_msg s_addr op query_id cfg_ok _48
     IFJMP:<{	//  in_msg s_addr op query_id cfg_ok
       s2 POP	//  in_msg s_addr cfg_ok query_id
-      s2 s3 XCHG
-      SWAP	//  s_addr in_msg query_id cfg_ok
+      s3 s0 s0 XCHG3	//  s_addr in_msg query_id cfg_ok
       config_set_confirmed CALLDICT
     }>	//  in_msg s_addr op query_id cfg_ok
     DROP
@@ -804,9 +794,8 @@ PROGRAM{
     AND	//  query_id s_addr op _53
     IFNOTJMP:<{	//  query_id s_addr op
       32 PUSHPOW2DEC	//  query_id s_addr op _54=4294967295
-      0 PUSHINT	//  query_id s_addr op _54=4294967295 _55=0
-      s3 s4 XCHG
-      s3 s3 s0 XCHG3
+      s0 s3 s3 XCHG3
+      0 PUSHINT
       64 PUSHINT	//  s_addr _54=4294967295 query_id op _55=0 _56=64
       send_message_back CALLDICT
     }>	//  query_id s_addr op
@@ -845,7 +834,7 @@ PROGRAM{
     CONFIGOPTPARAM	//  credits members min_stake max_stake min_total_stake max_stake_factor _8
     CTOS	//  credits members min_stake max_stake min_total_stake max_stake_factor cs
     16 LDU	//  credits members min_stake max_stake min_total_stake max_stake_factor _13 cs
-    16 LDU	//  credits members min_stake max_stake min_total_stake max_stake_factor _13 _258 _257
+    16 LDU	//  credits members min_stake max_stake min_total_stake max_stake_factor _13 _256 _255
     NIP	//  credits members min_stake max_stake min_total_stake max_stake_factor _13 cs
     16 LDU	//  credits members min_stake max_stake min_total_stake max_stake_factor max_validators min_validators cs
     ENDS
@@ -858,8 +847,7 @@ PROGRAM{
       s9 PUSH
       8 PUSHPOW2	//  credits members min_stake max_stake min_total_stake max_stake_factor max_validators min_validators n sdict pubkey members _33=256
       DICTUGETNEXT
-      NULLSWAPIFNOT
-      NULLSWAPIFNOT	//  credits members min_stake max_stake min_total_stake max_stake_factor max_validators min_validators n sdict cs pubkey f
+      NULLSWAPIFNOT2	//  credits members min_stake max_stake min_total_stake max_stake_factor max_validators min_validators n sdict cs pubkey f
       DUP	//  credits members min_stake max_stake min_total_stake max_stake_factor max_validators min_validators n sdict cs pubkey f f
       IF:<{	//  credits members min_stake max_stake min_total_stake max_stake_factor max_validators min_validators n sdict cs pubkey f
         s0 s2 XCHG	//  credits members min_stake max_stake min_total_stake max_stake_factor max_validators min_validators n sdict f pubkey cs
@@ -871,8 +859,8 @@ PROGRAM{
         ENDS
         s0 s3 XCHG	//  credits members min_stake max_stake min_total_stake max_stake_factor max_validators min_validators n sdict f pubkey stake adnl_addr max_factor addr time
         NEGATE	//  credits members min_stake max_stake min_total_stake max_stake_factor max_validators min_validators n sdict f pubkey stake adnl_addr max_factor addr _56
-        NEWC	//  credits members min_stake max_stake min_total_stake max_stake_factor max_validators min_validators n sdict f pubkey stake adnl_addr max_factor addr _56 _57
-        s1 s5 XCHG	//  credits members min_stake max_stake min_total_stake max_stake_factor max_validators min_validators n sdict f pubkey _56 adnl_addr max_factor addr stake _57
+        s0 s4 XCHG
+        NEWC	//  credits members min_stake max_stake min_total_stake max_stake_factor max_validators min_validators n sdict f pubkey _56 adnl_addr max_factor addr stake _57
         128 STU	//  credits members min_stake max_stake min_total_stake max_stake_factor max_validators min_validators n sdict f pubkey _56 adnl_addr max_factor addr _59
         s1 s4 XCHG	//  credits members min_stake max_stake min_total_stake max_stake_factor max_validators min_validators n sdict f pubkey addr adnl_addr max_factor _56 _59
         32 STI	//  credits members min_stake max_stake min_total_stake max_stake_factor max_validators min_validators n sdict f pubkey addr adnl_addr max_factor _61
@@ -892,14 +880,12 @@ PROGRAM{
         DICTSETB	//  credits members min_stake max_stake min_total_stake max_stake_factor max_validators min_validators n pubkey f sdict
         s0 s3 XCHG	//  credits members min_stake max_stake min_total_stake max_stake_factor max_validators min_validators sdict pubkey f n
         INC	//  credits members min_stake max_stake min_total_stake max_stake_factor max_validators min_validators sdict pubkey f n
+        s3 s1 s3 XCHG3	//  credits members min_stake max_stake min_total_stake max_stake_factor max_validators min_validators n sdict f pubkey
       }>ELSE<{
-        s3 s4 XCHG
-        2SWAP
-        DROP	//  credits members min_stake max_stake min_total_stake max_stake_factor max_validators min_validators sdict pubkey f n
+        s2 POP	//  credits members min_stake max_stake min_total_stake max_stake_factor max_validators min_validators n sdict f pubkey
       }>
-      SWAP	//  credits members min_stake max_stake min_total_stake max_stake_factor max_validators min_validators sdict pubkey n f
-      NOT	//  credits members min_stake max_stake min_total_stake max_stake_factor max_validators min_validators sdict pubkey n _83
-      s3 s3 s0 XCHG3	//  credits members min_stake max_stake min_total_stake max_stake_factor max_validators min_validators n sdict pubkey _83
+      SWAP	//  credits members min_stake max_stake min_total_stake max_stake_factor max_validators min_validators n sdict pubkey f
+      NOT	//  credits members min_stake max_stake min_total_stake max_stake_factor max_validators min_validators n sdict pubkey _83
     }>	//  credits members min_stake max_stake min_total_stake max_stake_factor max_validators min_validators n sdict pubkey
     DROP
     s4 POP	//  credits members min_stake max_stake min_total_stake sdict max_validators min_validators n
@@ -919,8 +905,7 @@ PROGRAM{
       s0 s3 XCHG
       416 PUSHINT	//  credits members min_stake max_stake min_total_stake l min_validators n sdict _101
       DICTREMMIN
-      NULLSWAPIFNOT
-      NULLSWAPIFNOT	//  credits members min_stake max_stake min_total_stake l min_validators n sdict cs key f
+      NULLSWAPIFNOT2	//  credits members min_stake max_stake min_total_stake l min_validators n sdict cs key f
       DUP	//  credits members min_stake max_stake min_total_stake l min_validators n sdict cs key f f
       IF:<{	//  credits members min_stake max_stake min_total_stake l min_validators n sdict cs key f
         SWAP	//  credits members min_stake max_stake min_total_stake l min_validators n sdict cs f key
@@ -928,12 +913,12 @@ PROGRAM{
         s1 s9 XCPU	//  credits members min_stake max_stake min_total_stake l min_validators n sdict cs f key _106 max_stake
         MIN	//  credits members min_stake max_stake min_total_stake l min_validators n sdict cs f key _109
         SWAP	//  credits members min_stake max_stake min_total_stake l min_validators n sdict cs f _109 key
-        32 LDU	//  credits members min_stake max_stake min_total_stake l min_validators n sdict cs f _109 _284 _283
+        32 LDU	//  credits members min_stake max_stake min_total_stake l min_validators n sdict cs f _109 _282 _281
         NIP	//  credits members min_stake max_stake min_total_stake l min_validators n sdict cs f _109 key
         256 PLDU	//  credits members min_stake max_stake min_total_stake l min_validators n sdict cs f stake pubkey
         s0 s3 XCHG	//  credits members min_stake max_stake min_total_stake l min_validators n sdict pubkey f stake cs
         32 LDU	//  credits members min_stake max_stake min_total_stake l min_validators n sdict pubkey f stake _118 cs
-        256 LDU	//  credits members min_stake max_stake min_total_stake l min_validators n sdict pubkey f stake _118 _288 _287
+        256 LDU	//  credits members min_stake max_stake min_total_stake l min_validators n sdict pubkey f stake _118 _286 _285
         NIP	//  credits members min_stake max_stake min_total_stake l min_validators n sdict pubkey f stake _118 cs
         256 PLDU	//  credits members min_stake max_stake min_total_stake l min_validators n sdict pubkey f stake max_f adnl_addr
         s1 s3 s0 XCHG3
@@ -941,11 +926,10 @@ PROGRAM{
         4 TUPLE	//  credits members min_stake max_stake min_total_stake l min_validators n sdict f _126
         s0 s5 XCHG2	//  credits members min_stake max_stake min_total_stake f min_validators n sdict _126 l
         CONS	//  credits members min_stake max_stake min_total_stake f min_validators n sdict l
+        s0 s4 XCHG	//  credits members min_stake max_stake min_total_stake l min_validators n sdict f
       }>ELSE<{
-        s6 s1 s6 XCHG3
-        2DROP	//  credits members min_stake max_stake min_total_stake f min_validators n sdict l
+        2 1 BLKDROP2	//  credits members min_stake max_stake min_total_stake l min_validators n sdict f
       }>
-      s0 s4 XCHG	//  credits members min_stake max_stake min_total_stake l min_validators n sdict f
       NOT	//  credits members min_stake max_stake min_total_stake l min_validators n sdict _128
       s1 s4 XCHG	//  credits members min_stake max_stake min_total_stake sdict min_validators n l _128
     }>	//  credits members min_stake max_stake min_total_stake sdict min_validators n l
@@ -973,24 +957,22 @@ PROGRAM{
         s0 s2 PUSH2	//  credits members min_stake n min_total_stake l i m best_stake l1 tot_stake tot_stake best_stake
         GREATER	//  credits members min_stake n min_total_stake l i m best_stake l1 tot_stake _148
         IF:<{	//  credits members min_stake n min_total_stake l i m best_stake l1 tot_stake
-          s2 POP
-          s2 POP	//  credits members min_stake n min_total_stake l i l1 tot_stake
+          2 2 BLKDROP2	//  credits members min_stake n min_total_stake l i l1 tot_stake
           s2 PUSH	//  credits members min_stake n min_total_stake l i l1 best_stake m
+          s0 s2 XCHG	//  credits members min_stake n min_total_stake l i m best_stake l1
         }>ELSE<{
-          s1 s3 XCHG
-          DROP	//  credits members min_stake n min_total_stake l i l1 best_stake m
+          DROP	//  credits members min_stake n min_total_stake l i m best_stake l1
         }>
       }>ELSE<{
-        s3 s4 XCHG2
-        DROP	//  credits members min_stake n min_total_stake l i l1 best_stake m
+        s4 POP	//  credits members min_stake n min_total_stake l i m best_stake l1
       }>
-      s3 s6 PUSH2	//  credits members min_stake n min_total_stake l i l1 best_stake m i n
-      GEQ	//  credits members min_stake n min_total_stake l i l1 best_stake m _149
+      s3 s6 PUSH2	//  credits members min_stake n min_total_stake l i m best_stake l1 i n
+      GEQ	//  credits members min_stake n min_total_stake l i m best_stake l1 _149
+      s1 s3 XCHG	//  credits members min_stake n min_total_stake l i l1 best_stake m _149
     }>	//  credits members min_stake n min_total_stake l i l1 best_stake m
-    s2 POP
-    s2 POP
-    s4 POP
-    s4 POP	//  credits members best_stake m min_total_stake l
+    s6 POP
+    s6 POP
+    2DROP	//  credits members best_stake m min_total_stake l
     s2 PUSH	//  credits members best_stake m min_total_stake l m
     0 EQINT	//  credits members best_stake m min_total_stake l _151
     s4 s2 PUXC	//  credits members best_stake m _151 l best_stake min_total_stake
@@ -1004,14 +986,12 @@ PROGRAM{
       NEWDICT	//  credits _154 _155=0 _156
       s1 s1 PUSH2	//  credits _154 _155=0 _156 _157=0 _158=0
     }>	//  credits members best_stake m l
-    DUP	//  credits members best_stake m l l1
-    s0 DUMP	//  credits members best_stake m l l1
-    s2 PUSH	//  credits members best_stake m l l1 m
-    DEC	//  credits members best_stake m l l1 _163
+    s0 s1 PUSH2	//  credits members best_stake m l l1 m
+    DEC	//  credits members best_stake m l l1 _161
     REPEAT:<{	//  credits members best_stake m l l1
       CDR	//  credits members best_stake m l l1
     }>
-    CAR	//  credits members best_stake m l _166
+    CAR	//  credits members best_stake m l _164
     0 INDEX	//  credits members best_stake m l m_stake
     0 PUSHINT	//  credits members best_stake m l m_stake i=0
     s0 s0 PUSH2	//  credits members best_stake m l m_stake i=0 tot_stake=0 tot_weight=0
@@ -1019,110 +999,107 @@ PROGRAM{
     NEWDICT	//  credits members best_stake m l m_stake i=0 tot_stake=0 tot_weight=0 vset frozen
     UNTIL:<{
       s0 s6 XCHG	//  credits members best_stake m frozen m_stake i tot_stake tot_weight vset l
-      UNCONS	//  credits members best_stake m frozen m_stake i tot_stake tot_weight vset _183 l
-      SWAP	//  credits members best_stake m frozen m_stake i tot_stake tot_weight vset l _183
+      UNCONS	//  credits members best_stake m frozen m_stake i tot_stake tot_weight vset _181 l
+      SWAP	//  credits members best_stake m frozen m_stake i tot_stake tot_weight vset l _181
       4 UNTUPLE	//  credits members best_stake m frozen m_stake i tot_stake tot_weight vset l stake max_f pubkey adnl_addr
       s1 s13 PUSH2
-      8 PUSHPOW2	//  credits members best_stake m frozen m_stake i tot_stake tot_weight vset l stake max_f pubkey adnl_addr pubkey members _188=256
+      8 PUSHPOW2	//  credits members best_stake m frozen m_stake i tot_stake tot_weight vset l stake max_f pubkey adnl_addr pubkey members _186=256
       DICTUGET
       NULLSWAPIFNOT	//  credits members best_stake m frozen m_stake i tot_stake tot_weight vset l stake max_f pubkey adnl_addr val f
       61 THROWIFNOT
-      LDGRAMS	//  credits members best_stake m frozen m_stake i tot_stake tot_weight vset l stake max_f pubkey adnl_addr _300 _299
+      LDGRAMS	//  credits members best_stake m frozen m_stake i tot_stake tot_weight vset l stake max_f pubkey adnl_addr _298 _297
       NIP	//  credits members best_stake m frozen m_stake i tot_stake tot_weight vset l stake max_f pubkey adnl_addr val
-      64 LDU	//  credits members best_stake m frozen m_stake i tot_stake tot_weight vset l stake max_f pubkey adnl_addr _302 _301
+      64 LDU	//  credits members best_stake m frozen m_stake i tot_stake tot_weight vset l stake max_f pubkey adnl_addr _300 _299
       NIP	//  credits members best_stake m frozen m_stake i tot_stake tot_weight vset l stake max_f pubkey adnl_addr val
       256 PLDU	//  credits members best_stake m frozen m_stake i tot_stake tot_weight vset l stake max_f pubkey adnl_addr src_addr
       s9 s12 PUSH2	//  credits members best_stake m frozen m_stake i tot_stake tot_weight vset l stake max_f pubkey adnl_addr src_addr i m
-      LESS	//  credits members best_stake m frozen m_stake i tot_stake tot_weight vset l stake max_f pubkey adnl_addr src_addr _202
+      LESS	//  credits members best_stake m frozen m_stake i tot_stake tot_weight vset l stake max_f pubkey adnl_addr src_addr _200
       IF:<{	//  credits members best_stake m frozen m_stake i tot_stake tot_weight vset l stake max_f pubkey adnl_addr src_addr
         s3 s10 XCPU	//  credits members best_stake m frozen m_stake i tot_stake tot_weight vset l stake src_addr pubkey adnl_addr max_f m_stake
-        MUL	//  credits members best_stake m frozen m_stake i tot_stake tot_weight vset l stake src_addr pubkey adnl_addr _204
-        16 RSHIFT#	//  credits members best_stake m frozen m_stake i tot_stake tot_weight vset l stake src_addr pubkey adnl_addr _206
-        s4 s(-1) PUXC	//  credits members best_stake m frozen m_stake i tot_stake tot_weight vset l stake src_addr pubkey adnl_addr stake _206
+        MUL	//  credits members best_stake m frozen m_stake i tot_stake tot_weight vset l stake src_addr pubkey adnl_addr _202
+        16 RSHIFT#	//  credits members best_stake m frozen m_stake i tot_stake tot_weight vset l stake src_addr pubkey adnl_addr _204
+        s4 s(-1) PUXC	//  credits members best_stake m frozen m_stake i tot_stake tot_weight vset l stake src_addr pubkey adnl_addr stake _204
         MIN	//  credits members best_stake m frozen m_stake i tot_stake tot_weight vset l stake src_addr pubkey adnl_addr true_stake
         s4 s4 XCPU	//  credits members best_stake m frozen m_stake i tot_stake tot_weight vset l true_stake src_addr pubkey adnl_addr stake true_stake
         SUB	//  credits members best_stake m frozen m_stake i tot_stake tot_weight vset l true_stake src_addr pubkey adnl_addr stake
         s4 PUSH	//  credits members best_stake m frozen m_stake i tot_stake tot_weight vset l true_stake src_addr pubkey adnl_addr stake true_stake
-        60 LSHIFT#	//  credits members best_stake m frozen m_stake i tot_stake tot_weight vset l true_stake src_addr pubkey adnl_addr stake _211
-        s14 PUSH	//  credits members best_stake m frozen m_stake i tot_stake tot_weight vset l true_stake src_addr pubkey adnl_addr stake _211 best_stake
+        60 LSHIFT#	//  credits members best_stake m frozen m_stake i tot_stake tot_weight vset l true_stake src_addr pubkey adnl_addr stake _209
+        s14 PUSH	//  credits members best_stake m frozen m_stake i tot_stake tot_weight vset l true_stake src_addr pubkey adnl_addr stake _209 best_stake
         DIV	//  credits members best_stake m frozen m_stake i tot_stake tot_weight vset l true_stake src_addr pubkey adnl_addr stake weight
         s9 s5 XCPU	//  credits members best_stake m frozen m_stake i weight tot_weight vset l true_stake src_addr pubkey adnl_addr stake tot_stake true_stake
         ADD	//  credits members best_stake m frozen m_stake i weight tot_weight vset l true_stake src_addr pubkey adnl_addr stake tot_stake
         s8 s9 XCPU	//  credits members best_stake m frozen m_stake i weight tot_stake vset l true_stake src_addr pubkey adnl_addr stake tot_weight weight
         ADD	//  credits members best_stake m frozen m_stake i weight tot_stake vset l true_stake src_addr pubkey adnl_addr stake tot_weight
-        2390828938 PUSHINT	//  credits members best_stake m frozen m_stake i weight tot_stake vset l true_stake src_addr pubkey adnl_addr stake tot_weight _216=2390828938
-        s3 PUSH	//  credits members best_stake m frozen m_stake i weight tot_stake vset l true_stake src_addr pubkey adnl_addr stake tot_weight _216=2390828938 adnl_addr
-        IF:<{	//  credits members best_stake m frozen m_stake i weight tot_stake vset l true_stake src_addr pubkey adnl_addr stake tot_weight _216=2390828938
-          115 PUSHINT	//  credits members best_stake m frozen m_stake i weight tot_stake vset l true_stake src_addr pubkey adnl_addr stake tot_weight _216=2390828938 _217=115
-        }>ELSE<{	//  credits members best_stake m frozen m_stake i weight tot_stake vset l true_stake src_addr pubkey adnl_addr stake tot_weight _216=2390828938
-          83 PUSHINT	//  credits members best_stake m frozen m_stake i weight tot_stake vset l true_stake src_addr pubkey adnl_addr stake tot_weight _216=2390828938 _217=83
+        2390828938 PUSHINT	//  credits members best_stake m frozen m_stake i weight tot_stake vset l true_stake src_addr pubkey adnl_addr stake tot_weight _214=2390828938
+        s3 PUSH	//  credits members best_stake m frozen m_stake i weight tot_stake vset l true_stake src_addr pubkey adnl_addr stake tot_weight _214=2390828938 adnl_addr
+        IF:<{	//  credits members best_stake m frozen m_stake i weight tot_stake vset l true_stake src_addr pubkey adnl_addr stake tot_weight _214=2390828938
+          115 PUSHINT	//  credits members best_stake m frozen m_stake i weight tot_stake vset l true_stake src_addr pubkey adnl_addr stake tot_weight _214=2390828938 _215=115
+        }>ELSE<{	//  credits members best_stake m frozen m_stake i weight tot_stake vset l true_stake src_addr pubkey adnl_addr stake tot_weight _214=2390828938
+          83 PUSHINT	//  credits members best_stake m frozen m_stake i weight tot_stake vset l true_stake src_addr pubkey adnl_addr stake tot_weight _214=2390828938 _215=83
         }>
-        NEWC	//  credits members best_stake m frozen m_stake i weight tot_stake vset l true_stake src_addr pubkey adnl_addr stake tot_weight _216=2390828938 _217 _220
-        8 STU	//  credits members best_stake m frozen m_stake i weight tot_stake vset l true_stake src_addr pubkey adnl_addr stake tot_weight _216=2390828938 _222
-        32 STU	//  credits members best_stake m frozen m_stake i weight tot_stake vset l true_stake src_addr pubkey adnl_addr stake tot_weight _224
-        s4 s(-1) PUXC	//  credits members best_stake m frozen m_stake i weight tot_stake vset l true_stake src_addr pubkey adnl_addr stake tot_weight pubkey _224
-        256 STU	//  credits members best_stake m frozen m_stake i weight tot_stake vset l true_stake src_addr pubkey adnl_addr stake tot_weight _226
-        s10 s(-1) PUXC	//  credits members best_stake m frozen m_stake i weight tot_stake vset l true_stake src_addr pubkey adnl_addr stake tot_weight weight _226
+        NEWC	//  credits members best_stake m frozen m_stake i weight tot_stake vset l true_stake src_addr pubkey adnl_addr stake tot_weight _214=2390828938 _215 _218
+        8 STU	//  credits members best_stake m frozen m_stake i weight tot_stake vset l true_stake src_addr pubkey adnl_addr stake tot_weight _214=2390828938 _220
+        32 STU	//  credits members best_stake m frozen m_stake i weight tot_stake vset l true_stake src_addr pubkey adnl_addr stake tot_weight _222
+        s4 s(-1) PUXC	//  credits members best_stake m frozen m_stake i weight tot_stake vset l true_stake src_addr pubkey adnl_addr stake tot_weight pubkey _222
+        256 STU	//  credits members best_stake m frozen m_stake i weight tot_stake vset l true_stake src_addr pubkey adnl_addr stake tot_weight _224
+        s10 s(-1) PUXC	//  credits members best_stake m frozen m_stake i weight tot_stake vset l true_stake src_addr pubkey adnl_addr stake tot_weight weight _224
         64 STU	//  credits members best_stake m frozen m_stake i weight tot_stake vset l true_stake src_addr pubkey adnl_addr stake tot_weight vinfo
         s3 PUSH	//  credits members best_stake m frozen m_stake i weight tot_stake vset l true_stake src_addr pubkey adnl_addr stake tot_weight vinfo adnl_addr
         IF:<{	//  credits members best_stake m frozen m_stake i weight tot_stake vset l true_stake src_addr pubkey adnl_addr stake tot_weight vinfo
           s1 s3 XCHG	//  credits members best_stake m frozen m_stake i weight tot_stake vset l true_stake src_addr pubkey tot_weight stake adnl_addr vinfo
           256 STU	//  credits members best_stake m frozen m_stake i weight tot_stake vset l true_stake src_addr pubkey tot_weight stake vinfo
+          s0 s2 XCHG	//  credits members best_stake m frozen m_stake i weight tot_stake vset l true_stake src_addr pubkey vinfo stake tot_weight
         }>ELSE<{
-          s0 s3 XCHG2
-          DROP	//  credits members best_stake m frozen m_stake i weight tot_stake vset l true_stake src_addr pubkey tot_weight stake vinfo
+          s3 POP	//  credits members best_stake m frozen m_stake i weight tot_stake vset l true_stake src_addr pubkey vinfo stake tot_weight
         }>
-        SWAP
-        16 PUSHINT
-        s11 s8 s8 PUXC2	//  credits members best_stake m frozen m_stake i weight tot_stake stake l true_stake src_addr pubkey tot_weight vinfo i vset _233=16
-        DICTUSETB	//  credits members best_stake m frozen m_stake i weight tot_stake stake l true_stake src_addr pubkey tot_weight vset
-        FALSE	//  credits members best_stake m frozen m_stake i weight tot_stake stake l true_stake src_addr pubkey tot_weight vset _236
+        s2 s10 s7 XCPUXC
+        16 PUSHINT	//  credits members best_stake m frozen m_stake i weight tot_stake tot_weight l true_stake src_addr pubkey stake vinfo i vset _231=16
+        DICTUSETB	//  credits members best_stake m frozen m_stake i weight tot_stake tot_weight l true_stake src_addr pubkey stake vset
+        FALSE	//  credits members best_stake m frozen m_stake i weight tot_stake tot_weight l true_stake src_addr pubkey stake vset _234
         s4 PUSH
-        NEWC	//  credits members best_stake m frozen m_stake i weight tot_stake stake l true_stake src_addr pubkey tot_weight vset _236 src_addr _237
-        256 STU	//  credits members best_stake m frozen m_stake i weight tot_stake stake l true_stake src_addr pubkey tot_weight vset _236 _239
-        s1 s10 XCHG	//  credits members best_stake m frozen m_stake i _236 tot_stake stake l true_stake src_addr pubkey tot_weight vset weight _239
-        64 STU	//  credits members best_stake m frozen m_stake i _236 tot_stake stake l true_stake src_addr pubkey tot_weight vset _241
-        s0 s5 XCHG2	//  credits members best_stake m frozen m_stake i _236 tot_stake stake l vset src_addr pubkey tot_weight _241 true_stake
-        STGRAMS	//  credits members best_stake m frozen m_stake i _236 tot_stake stake l vset src_addr pubkey tot_weight _242
-        s1 s8 XCHG	//  credits members best_stake m frozen m_stake i tot_weight tot_stake stake l vset src_addr pubkey _236 _242
-        1 STI	//  credits members best_stake m frozen m_stake i tot_weight tot_stake stake l vset src_addr pubkey _244
+        NEWC	//  credits members best_stake m frozen m_stake i weight tot_stake tot_weight l true_stake src_addr pubkey stake vset _234 src_addr _235
+        256 STU	//  credits members best_stake m frozen m_stake i weight tot_stake tot_weight l true_stake src_addr pubkey stake vset _234 _237
+        s1 s10 XCHG	//  credits members best_stake m frozen m_stake i _234 tot_stake tot_weight l true_stake src_addr pubkey stake vset weight _237
+        64 STU	//  credits members best_stake m frozen m_stake i _234 tot_stake tot_weight l true_stake src_addr pubkey stake vset _239
+        s0 s5 XCHG2	//  credits members best_stake m frozen m_stake i _234 tot_stake tot_weight l vset src_addr pubkey stake _239 true_stake
+        STGRAMS	//  credits members best_stake m frozen m_stake i _234 tot_stake tot_weight l vset src_addr pubkey stake _240
+        s1 s8 XCHG	//  credits members best_stake m frozen m_stake i stake tot_stake tot_weight l vset src_addr pubkey _234 _240
+        1 STI	//  credits members best_stake m frozen m_stake i stake tot_stake tot_weight l vset src_addr pubkey _242
         s0 s1 s10 XCHG3
-        8 PUSHPOW2	//  credits members best_stake m src_addr m_stake i tot_weight tot_stake stake l vset _244 pubkey frozen _245=256
-        DICTUSETB	//  credits members best_stake m src_addr m_stake i tot_weight tot_stake stake l vset frozen
+        8 PUSHPOW2	//  credits members best_stake m src_addr m_stake i stake tot_stake tot_weight l vset _242 pubkey frozen _243=256
+        DICTUSETB	//  credits members best_stake m src_addr m_stake i stake tot_stake tot_weight l vset frozen
+        s0 s8 XCHG
+        s4 s5 XCHG
+        s1 s3 XCHG
+        s1 s4 XCHG	//  credits members best_stake m frozen m_stake i tot_stake tot_weight vset l stake src_addr
       }>ELSE<{
-        s0 s11 XCHG
-        s7 s8 XCHG
-        s4 s6 XCHG
         s0 s3 XCHG
-        3 BLKDROP	//  credits members best_stake m src_addr m_stake i tot_weight tot_stake stake l vset frozen
+        3 BLKDROP	//  credits members best_stake m frozen m_stake i tot_stake tot_weight vset l stake src_addr
       }>
-      s3 PUSH	//  credits members best_stake m src_addr m_stake i tot_weight tot_stake stake l vset frozen stake
-      IF:<{	//  credits members best_stake m src_addr m_stake i tot_weight tot_stake stake l vset frozen
-        s12 s8 s3 XCHG3	//  l members best_stake m vset m_stake i tot_weight tot_stake frozen credits src_addr stake
-        ~credit_to CALLDICT	//  l members best_stake m vset m_stake i tot_weight tot_stake frozen credits
+      OVER	//  credits members best_stake m frozen m_stake i tot_stake tot_weight vset l stake src_addr stake
+      IF:<{	//  credits members best_stake m frozen m_stake i tot_stake tot_weight vset l stake src_addr
+        s12 s0 s0 XCHG3	//  l members best_stake m frozen m_stake i tot_stake tot_weight vset credits src_addr stake
+        ~credit_to CALLDICT	//  l members best_stake m frozen m_stake i tot_stake tot_weight vset credits
+        s0 s10 XCHG	//  credits members best_stake m frozen m_stake i tot_stake tot_weight vset l
       }>ELSE<{
-        s12 s8 s3 XCHG3
-        2DROP	//  l members best_stake m vset m_stake i tot_weight tot_stake frozen credits
+        2DROP	//  credits members best_stake m frozen m_stake i tot_stake tot_weight vset l
       }>
-      s0 s4 XCHG	//  l members best_stake m vset m_stake credits tot_weight tot_stake frozen i
-      INC	//  l members best_stake m vset m_stake credits tot_weight tot_stake frozen i
-      s10 PUSH	//  l members best_stake m vset m_stake credits tot_weight tot_stake frozen i l
-      ISNULL	//  l members best_stake m vset m_stake credits tot_weight tot_stake frozen i _251
-      s5 s11 XCHG
-      s5 s7 XCHG
+      s0 s4 XCHG	//  credits members best_stake m frozen m_stake l tot_stake tot_weight vset i
+      INC	//  credits members best_stake m frozen m_stake l tot_stake tot_weight vset i
+      s4 PUSH	//  credits members best_stake m frozen m_stake l tot_stake tot_weight vset i l
+      ISNULL	//  credits members best_stake m frozen m_stake l tot_stake tot_weight vset i _249
       s1 s5 XCHG
-      s3 s4 XCHG
-      s1 s2 XCHG	//  credits members best_stake m l m_stake i tot_stake tot_weight vset frozen _251
+      s1 s7 XCHG	//  credits members best_stake m l m_stake i tot_stake tot_weight vset frozen _249
     }>	//  credits members best_stake m l m_stake i tot_stake tot_weight vset frozen
     s4 POP
     s4 POP
     s4 POP
     s6 POP	//  credits tot_stake best_stake m tot_weight vset frozen
     s5 s4 PUXC	//  credits tot_stake frozen m tot_weight vset tot_stake best_stake
-    EQUAL	//  credits tot_stake frozen m tot_weight vset _253
+    EQUAL	//  credits tot_stake frozen m tot_weight vset _251
     49 THROWIFNOT
-    s3 s3 s4 XCHG3
-    SWAP	//  credits vset tot_weight frozen tot_stake m
+    s4 s4 XCHG2
+    s3 s1 s3 XCHG3	//  credits vset tot_weight frozen tot_stake m
   }>
   conduct_elections PROC:<{
     //  ds elect credits
@@ -1167,8 +1144,8 @@ PROGRAM{
       10 BLKDROP	// 
       FALSE	//  _38
     }>	//  ds credits elect_at elect_close min_total_stake total_stake members max_stake_factor min_stake max_stake
-    s3 s8 XCHG
-    s8 PUSH
+    s3 PUSH
+    s4 s9 XCHG
     s3 s2 XCPU
     s7 s7 XCHG2	//  ds members elect_at elect_close min_stake total_stake credits members min_stake max_stake min_total_stake max_stake_factor
     try_elect CALLDICT	//  ds members elect_at elect_close min_stake total_stake credits vdict total_weight frozen total_stakes cnt
@@ -1186,13 +1163,8 @@ PROGRAM{
     s3 PUSH	//  ds total_weight elect_at frozen total_stakes cnt credits vdict elect cnt
     IFNOTJMP:<{	//  ds total_weight elect_at frozen total_stakes cnt credits vdict elect
       NIP
-      s2 POP
-      s2 POP
-      s2 POP
-      s2 POP
-      s2 POP	//  ds elect credits
-      NEWC	//  ds elect credits _49
-      s1 s2 XCHG	//  ds credits elect _49
+      5 2 BLKDROP2
+      NEWC	//  ds credits elect _49
       STDICT	//  ds credits _50
       STDICT	//  ds _51
       SWAP	//  _51 ds
@@ -1266,8 +1238,8 @@ PROGRAM{
     s0 s3 s4 XCHG3
     32 PUSHINT	//  ds elect credits _121 elect_at past_elect _122=32
     DICTUSETB	//  ds elect credits past_elect
-    NEWC	//  ds elect credits past_elect _124
-    s1 s3 XCHG	//  ds past_elect credits elect _124
+    s0 s2 XCHG
+    NEWC	//  ds past_elect credits elect _124
     STDICT	//  ds past_elect credits _125
     STDICT	//  ds past_elect _126
     STDICT	//  ds _127
@@ -1315,79 +1287,75 @@ PROGRAM{
         s0 s0 s4 XCHG3
         32 PUSHINT	//  elect credits cur_hash grams _39 active_id past_elect _40=32
         DICTUSETB	//  elect credits cur_hash grams past_elect
+        s0 s2 XCHG	//  elect credits past_elect grams cur_hash
       }>ELSE<{
-        s1 s5 XCHG
         s1 s3 XCHG
-        3 BLKDROP	//  elect credits cur_hash grams past_elect
+        3 BLKDROP	//  elect credits past_elect grams cur_hash
       }>
     }>ELSE<{
-      s4 s1 s4 XCHG3
-      2DROP	//  elect credits cur_hash grams past_elect
+      2 1 BLKDROP2	//  elect credits past_elect grams cur_hash
     }>
-    -1 PUSHINT	//  elect credits cur_hash grams past_elect id=-1
+    -1 PUSHINT	//  elect credits past_elect grams cur_hash id=-1
     UNTIL:<{
-      OVER
-      32 PUSHINT	//  elect credits cur_hash grams past_elect id past_elect _46=32
+      s3 PUSH
+      32 PUSHINT	//  elect credits past_elect grams cur_hash id past_elect _46=32
       DICTUGETNEXT
-      NULLSWAPIFNOT
-      NULLSWAPIFNOT	//  elect credits cur_hash grams past_elect fs id f
-      DUP	//  elect credits cur_hash grams past_elect fs id f f
-      IF:<{	//  elect credits cur_hash grams past_elect fs id f
-        s0 s2 XCHG	//  elect credits cur_hash grams past_elect f id fs
-        64 LDU	//  elect credits cur_hash grams past_elect f id _50 fs
-        256 LDU	//  elect credits cur_hash grams past_elect f id tm hash fs
-        s1 s7 PUSH2	//  elect credits cur_hash grams past_elect f id tm hash fs hash cur_hash
-        EQUAL	//  elect credits cur_hash grams past_elect f id tm hash fs _56
-        IF:<{	//  elect credits cur_hash grams past_elect f id tm hash fs
-          s4 POP	//  elect credits cur_hash grams past_elect fs id tm hash
-          s0 s3 XCHG	//  elect credits cur_hash grams past_elect hash id tm fs
-          LDDICT	//  elect credits cur_hash grams past_elect hash id tm _60 fs
-          LDGRAMS	//  elect credits cur_hash grams past_elect hash id tm _60 _62 fs
-          LDGRAMS	//  elect credits cur_hash grams past_elect hash id tm dict total_stake bonuses fs
-          s8 PUSH	//  elect credits cur_hash grams past_elect hash id tm dict total_stake bonuses fs grams
-          3 RSHIFT#	//  elect credits cur_hash grams past_elect hash id tm dict total_stake bonuses fs amount
-          s9 s9 XCPU	//  elect credits cur_hash amount past_elect hash id tm dict total_stake bonuses fs grams amount
-          SUB	//  elect credits cur_hash amount past_elect hash id tm dict total_stake bonuses fs grams
-          s2 s9 XCHG2	//  elect credits cur_hash grams past_elect hash id tm dict total_stake fs bonuses amount
-          ADD	//  elect credits cur_hash grams past_elect hash id tm dict total_stake fs bonuses
-          NEWC	//  elect credits cur_hash grams past_elect hash id tm dict total_stake fs bonuses _72
-          s1 s5 XCHG	//  elect credits cur_hash grams past_elect hash id bonuses dict total_stake fs tm _72
-          64 STU	//  elect credits cur_hash grams past_elect hash id bonuses dict total_stake fs _74
-          s1 s6 XCHG	//  elect credits cur_hash grams past_elect fs id bonuses dict total_stake hash _74
-          256 STU	//  elect credits cur_hash grams past_elect fs id bonuses dict total_stake _76
-          s1 s2 XCHG	//  elect credits cur_hash grams past_elect fs id bonuses total_stake dict _76
-          STDICT	//  elect credits cur_hash grams past_elect fs id bonuses total_stake _77
-          SWAP	//  elect credits cur_hash grams past_elect fs id bonuses _77 total_stake
-          STGRAMS	//  elect credits cur_hash grams past_elect fs id bonuses _78
-          SWAP	//  elect credits cur_hash grams past_elect fs id _78 bonuses
-          STGRAMS	//  elect credits cur_hash grams past_elect fs id _79
-          ROT	//  elect credits cur_hash grams past_elect id _79 fs
-          STSLICER	//  elect credits cur_hash grams past_elect id _80
-          SWAP
-          32 PUSHINT
-          s1 s3 s3 PUXC2	//  elect credits cur_hash grams id _80 id past_elect _81=32
-          DICTUSETB	//  elect credits cur_hash grams id past_elect
-          FALSE	//  elect credits cur_hash grams id past_elect f
+      NULLSWAPIFNOT2	//  elect credits past_elect grams cur_hash fs id f
+      DUP	//  elect credits past_elect grams cur_hash fs id f f
+      IF:<{	//  elect credits past_elect grams cur_hash fs id f
+        s0 s2 XCHG	//  elect credits past_elect grams cur_hash f id fs
+        64 LDU	//  elect credits past_elect grams cur_hash f id _50 fs
+        256 LDU	//  elect credits past_elect grams cur_hash f id tm hash fs
+        s1 s5 PUSH2	//  elect credits past_elect grams cur_hash f id tm hash fs hash cur_hash
+        EQUAL	//  elect credits past_elect grams cur_hash f id tm hash fs _56
+        IF:<{	//  elect credits past_elect grams cur_hash f id tm hash fs
+          s4 POP	//  elect credits past_elect grams cur_hash fs id tm hash
+          s0 s3 XCHG	//  elect credits past_elect grams cur_hash hash id tm fs
+          LDDICT	//  elect credits past_elect grams cur_hash hash id tm _60 fs
+          LDGRAMS	//  elect credits past_elect grams cur_hash hash id tm _60 _62 fs
+          LDGRAMS	//  elect credits past_elect grams cur_hash hash id tm dict total_stake bonuses fs
+          s8 PUSH	//  elect credits past_elect grams cur_hash hash id tm dict total_stake bonuses fs grams
+          3 RSHIFT#	//  elect credits past_elect grams cur_hash hash id tm dict total_stake bonuses fs amount
+          s9 s9 XCPU	//  elect credits past_elect amount cur_hash hash id tm dict total_stake bonuses fs grams amount
+          SUB	//  elect credits past_elect amount cur_hash hash id tm dict total_stake bonuses fs grams
+          s2 s9 XCHG2	//  elect credits past_elect grams cur_hash hash id tm dict total_stake fs bonuses amount
+          ADD	//  elect credits past_elect grams cur_hash hash id tm dict total_stake fs bonuses
+          s0 s4 XCHG
+          NEWC	//  elect credits past_elect grams cur_hash hash id bonuses dict total_stake fs tm _72
+          64 STU	//  elect credits past_elect grams cur_hash hash id bonuses dict total_stake fs _74
+          s1 s6 XCHG	//  elect credits past_elect grams cur_hash fs id bonuses dict total_stake hash _74
+          256 STU	//  elect credits past_elect grams cur_hash fs id bonuses dict total_stake _76
+          s1 s2 XCHG	//  elect credits past_elect grams cur_hash fs id bonuses total_stake dict _76
+          STDICT	//  elect credits past_elect grams cur_hash fs id bonuses total_stake _77
+          SWAP	//  elect credits past_elect grams cur_hash fs id bonuses _77 total_stake
+          STGRAMS	//  elect credits past_elect grams cur_hash fs id bonuses _78
+          SWAP	//  elect credits past_elect grams cur_hash fs id _78 bonuses
+          STGRAMS	//  elect credits past_elect grams cur_hash fs id _79
+          ROT	//  elect credits past_elect grams cur_hash id _79 fs
+          STSLICER	//  elect credits past_elect grams cur_hash id _80
+          s0 s0 s4 XCPUXC
+          32 PUSHINT	//  elect credits id grams cur_hash _80 id past_elect _81=32
+          DICTUSETB	//  elect credits id grams cur_hash past_elect
+          s0 s3 XCHG
+          FALSE
+          SWAP	//  elect credits past_elect grams cur_hash f id
         }>ELSE<{
-          s3 s5 XCHG
-          s3 s4 XCHG
-          3 BLKDROP	//  elect credits cur_hash grams id past_elect f
+          3 BLKDROP	//  elect credits past_elect grams cur_hash f id
         }>
       }>ELSE<{
-        s3 s0 s3 XCHG3
-        DROP	//  elect credits cur_hash grams id past_elect f
+        s2 POP	//  elect credits past_elect grams cur_hash f id
       }>
-      NOT	//  elect credits cur_hash grams id past_elect _84
-      s1 s2 XCHG	//  elect credits cur_hash grams past_elect id _84
-    }>	//  elect credits cur_hash grams past_elect id
-    DUP	//  elect credits cur_hash grams past_elect id id
-    ISNULL	//  elect credits cur_hash grams past_elect id _85
-    IF:<{	//  elect credits cur_hash grams past_elect id
-      DROP	//  elect credits cur_hash grams past_elect
-      0 PUSHINT	//  elect credits cur_hash grams past_elect _86=0
-    }>ELSE<{	//  elect credits cur_hash grams past_elect _86
-    }>	//  elect credits active_hash grams past_elect active_id
-    s0 s3 XCHG2	//  elect credits past_elect grams active_id active_hash
+      SWAP	//  elect credits past_elect grams cur_hash id f
+      NOT	//  elect credits past_elect grams cur_hash id _84
+    }>	//  elect credits past_elect grams cur_hash id
+    DUP	//  elect credits past_elect grams cur_hash id id
+    ISNULL	//  elect credits past_elect grams cur_hash id _85
+    IF:<{	//  elect credits past_elect grams cur_hash id
+      DROP	//  elect credits past_elect grams cur_hash
+      0 PUSHINT	//  elect credits past_elect grams cur_hash _86=0
+    }>ELSE<{	//  elect credits past_elect grams cur_hash _86
+    }>	//  elect credits past_elect grams active_hash active_id
+    SWAP	//  elect credits past_elect grams active_id active_hash
     store_data CALLDICT
     TRUE	//  _89
   }>
@@ -1463,8 +1431,7 @@ PROGRAM{
       s4 PUSH
       32 PUSHINT	//  elect credits past_elect grams active_id active_hash id past_elect _11=32
       DICTUGETNEXT
-      NULLSWAPIFNOT
-      NULLSWAPIFNOT	//  elect credits past_elect grams active_id active_hash fs id f
+      NULLSWAPIFNOT2	//  elect credits past_elect grams active_id active_hash fs id f
       DUP	//  elect credits past_elect grams active_id active_hash fs id f f
       IF:<{	//  elect credits past_elect grams active_id active_hash fs id f
         s0 s2 XCHG	//  elect credits past_elect grams active_id active_hash f id fs
@@ -1484,21 +1451,16 @@ PROGRAM{
           s6 s1 s3 PUSH3
           s3 s5 s8 PUSH3	//  elect active_hash id past_elect active_id credits grams elect credits past_elect grams active_id active_hash
           store_data CALLDICT
-          FALSE	//  elect active_hash id past_elect active_id credits grams f
-        }>ELSE<{
-          s6 s1 s5 XCHG3
-          s4 s4 XCHG2	//  elect active_hash id past_elect active_id credits grams f
-        }>
+          s0 s3 XCHG
+          s5 s4 XCHG2
+          FALSE
+          SWAP	//  elect credits past_elect grams active_id active_hash f id
+        }>	//  elect credits past_elect grams active_id active_hash f id
       }>ELSE<{
-        s3 s7 XCHG
-        s1 s6 XCHG
-        s5 s0 s5 XCHG3
-        DROP	//  elect active_hash id past_elect active_id credits grams f
+        s2 POP	//  elect credits past_elect grams active_id active_hash f id
       }>
-      NOT	//  elect active_hash id past_elect active_id credits grams _26
-      s2 s6 XCHG
-      s4 s5 XCHG
-      s1 s4 XCHG	//  elect credits past_elect grams active_id active_hash id _26
+      SWAP	//  elect credits past_elect grams active_id active_hash id f
+      NOT	//  elect credits past_elect grams active_id active_hash id _26
     }>	//  elect credits past_elect grams active_id active_hash id
     s0 s6 XCHG
     6 BLKDROP	//  id
@@ -1538,7 +1500,7 @@ PROGRAM{
       3 BLKDROP	// 
       FALSE	//  _27
     }>	//  ds credits cur_vset
-    get_validator_conf CALLDICT	//  ds credits cur_vset _76 _77 _78 _79
+    get_validator_conf CALLDICT	//  ds credits cur_vset _74 _75 _76 _77
     DROP
     s2 POP	//  ds credits cur_vset elect_end_before elect_begin_before
     s0 s2 XCHG	//  ds credits elect_begin_before elect_end_before cur_vset
@@ -1566,28 +1528,27 @@ PROGRAM{
     17 PUSHINT	//  ds credits elect_begin_before elect_end_before t _52=17
     CONFIGOPTPARAM	//  ds credits elect_begin_before elect_end_before t _53
     CTOS	//  ds credits elect_begin_before elect_end_before t _54
-    LDGRAMS	//  ds credits elect_begin_before elect_end_before t _81 _80
+    LDGRAMS	//  ds credits elect_begin_before elect_end_before t _79 _78
     DROP	//  ds credits elect_begin_before elect_end_before t min_stake
     s0 s3 XCHG	//  ds credits min_stake elect_end_before t elect_begin_before
     ADD	//  ds credits min_stake elect_end_before elect_at
-    s0 DUMP	//  ds credits min_stake elect_end_before elect_at
     s0 s1 PUXC	//  ds credits min_stake elect_at elect_at elect_end_before
     SUB	//  ds credits min_stake elect_at elect_close
-    0 PUSHINT	//  ds credits min_stake elect_at elect_close _62=0
-    NEWDICT	//  ds credits min_stake elect_at elect_close _62=0 _63
-    FALSE	//  ds credits min_stake elect_at elect_close _62=0 _63 _64
-    s4 s5 XCHG
+    0 PUSHINT	//  ds credits min_stake elect_at elect_close _60=0
+    NEWDICT	//  ds credits min_stake elect_at elect_close _60=0 _61
     s3 s4 XCHG
-    FALSE	//  ds credits elect_at elect_close min_stake _62=0 _63 _64 _65
+    s2 s3 XCHG
+    FALSE
+    FALSE	//  ds credits elect_at elect_close min_stake _60=0 _61 _62 _63
     pack_elect CALLDICT	//  ds credits elect
-    NEWC	//  ds credits elect _67
-    STDICT	//  ds credits _68
-    STDICT	//  ds _69
-    SWAP	//  _69 ds
-    STSLICER	//  _70
-    ENDC	//  _71
+    NEWC	//  ds credits elect _65
+    STDICT	//  ds credits _66
+    STDICT	//  ds _67
+    SWAP	//  _67 ds
+    STSLICER	//  _68
+    ENDC	//  _69
     c4 POP
-    TRUE	//  _73
+    TRUE	//  _71
   }>
   run_ticktock PROC:<{
     //  is_tock
@@ -1675,28 +1636,73 @@ PROGRAM{
       s2 PUSH
       8 PUSHPOW2	//  members l id members _28=256
       DICTUGETPREV
-      NULLSWAPIFNOT
-      NULLSWAPIFNOT	//  members l fs id f
+      NULLSWAPIFNOT2	//  members l fs id f
       DUP	//  members l fs id f f
       IF:<{	//  members l fs id f
         s0 s2 XCHG	//  members l f id fs
         LDGRAMS	//  members l f id _46 _45
-        DROP	//  members l f id _30
-        s1 s(-1) PUXC	//  members l f id id _30
-        PAIR	//  members l f id _32
-        s0 s3 XCHG2	//  members id f _32 l
+        DROP	//  members l f id _31
+        s1 s(-1) PUXC	//  members l f id id _31
+        PAIR	//  members l f id _30
+        s0 s3 XCHG2	//  members id f _30 l
         CONS	//  members id f l
+        s0 s2 XCHG	//  members l f id
       }>ELSE<{
-        2SWAP
-        DROP	//  members id f l
+        s2 POP	//  members l f id
       }>
-      SWAP	//  members id l f
-      NOT	//  members id l _34
-      s1 s2 XCHG	//  members l id _34
+      SWAP	//  members l id f
+      NOT	//  members l id _34
     }>	//  members l id
     DROP
     NIP	//  l
   }>
+  participant_list_extended PROC:<{
+    // 
+    c4 PUSH	//  _1
+    CTOS	//  _2
+    PLDDICT	//  elect
+    DUP	//  elect elect
+    ISNULL	//  elect _4
+    IFJMP:<{	//  elect
+      DROP	// 
+      0 PUSHINT	//  _5=0
+      s0 s0 s0 PUSH3	//  _5=0 _6=0 _7=0 _8=0
+      PUSHNULL	//  _5=0 _6=0 _7=0 _8=0 _9
+      s1 s1 PUSH2	//  _5=0 _6=0 _7=0 _8=0 _9 _10=0 _11=0
+    }>	//  elect
+    unpack_elect CALLDICT	//  elect_at elect_close min_stake total_stake members failed finished
+    PUSHNULL	//  elect_at elect_close min_stake total_stake members failed finished l
+    256 PUSHPOW2DEC	//  elect_at elect_close min_stake total_stake members failed finished l id
+    UNTIL:<{
+      s4 PUSH
+      8 PUSHPOW2	//  elect_at elect_close min_stake total_stake members failed finished l id members _34=256
+      DICTUGETPREV
+      NULLSWAPIFNOT2	//  elect_at elect_close min_stake total_stake members failed finished l cs id f
+      DUP	//  elect_at elect_close min_stake total_stake members failed finished l cs id f f
+      IF:<{	//  elect_at elect_close min_stake total_stake members failed finished l cs id f
+        s0 s2 XCHG	//  elect_at elect_close min_stake total_stake members failed finished l f id cs
+        LDGRAMS	//  elect_at elect_close min_stake total_stake members failed finished l f id _41 cs
+        32 LDU	//  elect_at elect_close min_stake total_stake members failed finished l f id _41 _73 _72
+        NIP	//  elect_at elect_close min_stake total_stake members failed finished l f id _41 cs
+        32 LDU	//  elect_at elect_close min_stake total_stake members failed finished l f id _41 _46 cs
+        256 LDU	//  elect_at elect_close min_stake total_stake members failed finished l f id _41 _46 _49 cs
+        256 LDU	//  elect_at elect_close min_stake total_stake members failed finished l f id stake max_factor addr adnl_addr cs
+        ENDS
+        4 TUPLE	//  elect_at elect_close min_stake total_stake members failed finished l f id _57
+        s1 s(-1) PUXC	//  elect_at elect_close min_stake total_stake members failed finished l f id id _57
+        PAIR	//  elect_at elect_close min_stake total_stake members failed finished l f id _56
+        s0 s3 XCHG2	//  elect_at elect_close min_stake total_stake members failed finished id f _56 l
+        CONS	//  elect_at elect_close min_stake total_stake members failed finished id f l
+        s0 s2 XCHG	//  elect_at elect_close min_stake total_stake members failed finished l f id
+      }>ELSE<{
+        s2 POP	//  elect_at elect_close min_stake total_stake members failed finished l f id
+      }>
+      SWAP	//  elect_at elect_close min_stake total_stake members failed finished l id f
+      NOT	//  elect_at elect_close min_stake total_stake members failed finished l id _59
+    }>	//  elect_at elect_close min_stake total_stake members failed finished l id
+    DROP
+    s3 POP	//  elect_at elect_close min_stake total_stake l failed finished
+  }>
   compute_returned_stake PROC:<{
     //  wallet_addr
     c4 PUSH	//  wallet_addr _2
diff --git a/submodules/ton/tonlib-src/crypto/smartcont/auto/highload-wallet-code.cpp b/submodules/ton/tonlib-src/crypto/smartcont/auto/highload-wallet-code.cpp
index ecc0b71d8e..e3408b9db9 100644
--- a/submodules/ton/tonlib-src/crypto/smartcont/auto/highload-wallet-code.cpp
+++ b/submodules/ton/tonlib-src/crypto/smartcont/auto/highload-wallet-code.cpp
@@ -1 +1 @@
-with_tvm_code("highload-wallet", "te6ccgEBBgEAhgABFP8A9KQT9KDyyAsBAgEgAgMCAUgEBQC88oMI1xgg0x/TH9Mf+CMTu/Jj7UTQ0x/TH9P/0VEyuvKhUUS68qIE+QFUEFX5EPKj9ATR+AB/jhghgBD0eG+hb6EgmALTB9QwAfsAkTLiAbPmWwGkyMsfyx/L/8ntVAAE0DAAEaCZL9qJoa4WPw==");
+with_tvm_code("highload-wallet", "te6ccgEBCAEAlwABFP8A9KQT9LzyyAsBAgEgAgMCAUgEBQC48oMI1xgg0x/TH9Mf+CMTu/Jj7UTQ0x/TH9P/0VEyuvKhUUS68qIE+QFUEFX5EPKj9ATR+AB/jhYhgBD0eG+lIJgC0wfUMAH7AJEy4gGz5lsBpMjLH8sfy//J7VQABNAwAgFIBgcAF7s5ztRNDTPzHXC/+AARuMl+1E0NcLH4");
diff --git a/submodules/ton/tonlib-src/crypto/smartcont/auto/highload-wallet-code.fif b/submodules/ton/tonlib-src/crypto/smartcont/auto/highload-wallet-code.fif
index d2122a96fb..6dd5802739 100644
--- a/submodules/ton/tonlib-src/crypto/smartcont/auto/highload-wallet-code.fif
+++ b/submodules/ton/tonlib-src/crypto/smartcont/auto/highload-wallet-code.fif
@@ -3,6 +3,7 @@ PROGRAM{
   DECLPROC recv_internal
   DECLPROC recv_external
   85143 DECLMETHOD seqno
+  78748 DECLMETHOD get_public_key
   recv_internal PROC:<{
     //  in_msg
     DROP	// 
@@ -44,8 +45,7 @@ PROGRAM{
       OVER
       16 PUSHINT	//  public_key stored_seqno stored_subwallet dict i dict _57=16
       DICTIGETNEXT
-      NULLSWAPIFNOT
-      NULLSWAPIFNOT	//  public_key stored_seqno stored_subwallet dict cs i f
+      NULLSWAPIFNOT2	//  public_key stored_seqno stored_subwallet dict cs i f
       DUP	//  public_key stored_seqno stored_subwallet dict cs i f f
       IF:<{	//  public_key stored_seqno stored_subwallet dict cs i f
         s0 s2 XCHG	//  public_key stored_seqno stored_subwallet dict f i cs
@@ -76,4 +76,12 @@ PROGRAM{
     CTOS	//  _1
     32 PLDU	//  _3
   }>
+  get_public_key PROC:<{
+    // 
+    c4 PUSH	//  _1
+    CTOS	//  cs
+    64 LDU	//  _9 _8
+    NIP	//  cs
+    256 PLDU	//  _7
+  }>
 }END>c
diff --git a/submodules/ton/tonlib-src/crypto/smartcont/auto/highload-wallet-v2-code.cpp b/submodules/ton/tonlib-src/crypto/smartcont/auto/highload-wallet-v2-code.cpp
index ca5d2c70f7..ca5daab551 100644
--- a/submodules/ton/tonlib-src/crypto/smartcont/auto/highload-wallet-v2-code.cpp
+++ b/submodules/ton/tonlib-src/crypto/smartcont/auto/highload-wallet-v2-code.cpp
@@ -1 +1 @@
-with_tvm_code("highoad-wallet-v2", "te6ccgEBBwEA1wABFP8A9KQT9KDyyAsBAgEgAgMCAUgEBQHu8oMI1xgg0x/TP/gjqh9TILnyY+1E0NMf0z/T//QE0VNggED0Dm+hMfJgUXO68qIH+QFUEIf5EPKjAvQE0fgAf44YIYAQ9HhvoW+hIJgC0wfUMAH7AJEy4gGz5luDJaHIQDSAQPRDiuYxyBLLHxPLP8v/9ADJ7VQGAATQMABBoZfl2omhpj5jpn+n/mPoCaKkQQCB6BzfQmMktv8ld0fFADoggED0lm+hb6EyURCUMFMDud4gkjM2k0MTW+IBsw==");
+with_tvm_code("highload-wallet-v2", "te6ccgEBCQEA5QABFP8A9KQT9LzyyAsBAgEgAgMCAUgEBQHq8oMI1xgg0x/TP/gjqh9TILnyY+1E0NMf0z/T//QE0VNggED0Dm+hMfJgUXO68qIH+QFUEIf5EPKjAvQE0fgAf44WIYAQ9HhvpSCYAtMH1DAB+wCRMuIBs+ZbgyWhyEA0gED0Q4rmMQHIyx8Tyz/L//QAye1UCAAE0DACASAGBwAXvZznaiaGmvmOuF/8AEG+X5dqJoaY+Y6Z/p/5j6AmipEEAgegc30JjJLb/JXdHxQANCCAQPSWb6VsEiCUMFMDud4gkzM2AZJsIeKz");
diff --git a/submodules/ton/tonlib-src/crypto/smartcont/auto/highload-wallet-v2-code.fif b/submodules/ton/tonlib-src/crypto/smartcont/auto/highload-wallet-v2-code.fif
index 9d5e467de5..5b2c64e0e2 100644
--- a/submodules/ton/tonlib-src/crypto/smartcont/auto/highload-wallet-v2-code.fif
+++ b/submodules/ton/tonlib-src/crypto/smartcont/auto/highload-wallet-v2-code.fif
@@ -3,6 +3,7 @@ PROGRAM{
   DECLPROC recv_internal
   DECLPROC recv_external
   117746 DECLMETHOD processed?
+  78748 DECLMETHOD get_public_key
   recv_internal PROC:<{
     //  in_msg
     DROP	// 
@@ -49,8 +50,7 @@ PROGRAM{
       OVER
       16 PUSHINT	//  last_cleaned public_key old_queries query_id stored_subwallet bound dict i dict _62=16
       DICTIGETNEXT
-      NULLSWAPIFNOT
-      NULLSWAPIFNOT	//  last_cleaned public_key old_queries query_id stored_subwallet bound dict cs i f
+      NULLSWAPIFNOT2	//  last_cleaned public_key old_queries query_id stored_subwallet bound dict cs i f
       DUP	//  last_cleaned public_key old_queries query_id stored_subwallet bound dict cs i f f
       IF:<{	//  last_cleaned public_key old_queries query_id stored_subwallet bound dict cs i f
         s0 s2 XCHG	//  last_cleaned public_key old_queries query_id stored_subwallet bound dict f i cs
@@ -76,10 +76,9 @@ PROGRAM{
       DUP
       64 PUSHINT	//  last_cleaned public_key stored_subwallet bound old_queries old_queries _85=64
       DICTUREMMIN
-      NULLSWAPIFNOT
-      NULLSWAPIFNOT	//  last_cleaned public_key stored_subwallet bound old_queries _126 _128 _127 _129
-      s2 POP	//  last_cleaned public_key stored_subwallet bound old_queries old_queries' f i
-      s1 s0 XCPU	//  last_cleaned public_key stored_subwallet bound old_queries old_queries' i f f
+      NULLSWAPIFNOT2	//  last_cleaned public_key stored_subwallet bound old_queries _126 _128 _127 _129
+      1 2 BLKDROP2	//  last_cleaned public_key stored_subwallet bound old_queries old_queries' i f
+      DUP	//  last_cleaned public_key stored_subwallet bound old_queries old_queries' i f f
       IF:<{	//  last_cleaned public_key stored_subwallet bound old_queries old_queries' i f
         DROP	//  last_cleaned public_key stored_subwallet bound old_queries old_queries' i
         s0 s3 PUSH2	//  last_cleaned public_key stored_subwallet bound old_queries old_queries' i i bound
@@ -89,16 +88,15 @@ PROGRAM{
       IF:<{	//  last_cleaned public_key stored_subwallet bound old_queries old_queries' i f
         s3 POP
         s6 POP	//  last_cleaned public_key stored_subwallet bound f old_queries
+        SWAP	//  last_cleaned public_key stored_subwallet bound old_queries f
       }>ELSE<{
-        s3 s1 s3 XCHG3
-        2DROP	//  last_cleaned public_key stored_subwallet bound f old_queries
+        2 1 BLKDROP2	//  last_cleaned public_key stored_subwallet bound old_queries f
       }>
-      SWAP	//  last_cleaned public_key stored_subwallet bound old_queries f
       NOT	//  last_cleaned public_key stored_subwallet bound old_queries _90
     }>	//  last_cleaned public_key stored_subwallet bound old_queries
     NIP	//  last_cleaned public_key stored_subwallet old_queries
-    NEWC	//  last_cleaned public_key stored_subwallet old_queries _91
-    s1 s2 XCHG	//  last_cleaned public_key old_queries stored_subwallet _91
+    SWAP
+    NEWC	//  last_cleaned public_key old_queries stored_subwallet _91
     32 STU	//  last_cleaned public_key old_queries _93
     s1 s3 XCHG	//  old_queries public_key last_cleaned _93
     64 STU	//  old_queries public_key _95
@@ -131,4 +129,12 @@ PROGRAM{
       NEGATE	//  _24
     }>
   }>
+  get_public_key PROC:<{
+    // 
+    c4 PUSH	//  _1
+    CTOS	//  cs
+    96 LDU	//  _11 _10
+    NIP	//  cs
+    256 PLDU	//  _9
+  }>
 }END>c
diff --git a/submodules/ton/tonlib-src/crypto/smartcont/auto/multisig-code.cpp b/submodules/ton/tonlib-src/crypto/smartcont/auto/multisig-code.cpp
index 39ac8a7f6f..4c55e58f32 100644
--- a/submodules/ton/tonlib-src/crypto/smartcont/auto/multisig-code.cpp
+++ b/submodules/ton/tonlib-src/crypto/smartcont/auto/multisig-code.cpp
@@ -1 +1 @@
-with_tvm_code("multisig", "te6ccgECMAEAA2oAART/APSkE/Sg8sgLAQIBIAIDAgFICAkEwPIgxwCOgzDbPOCDCNcYIPkBAdMH2zwiwAAToVNhePQOb6Hyn9cL/0iQ+RDyoAP0BCD5AQHTP/gjqh9TILnyYVMngED0Dm+hECNUSADbPAquXLDyYrEBpPgAVDiTVHo5KxcvFgQEnts8VHCrU5rbPO1U+A9wJm5TqL6xmBA6EHlQdl8GiuIEgyWhjichgED0lm+hb6EyURCUMFMCud4glDQ2N3+XEEkQR0QUW+ICsxBXECXmMAMaHwUGAiowKkZTBts8UHegECQQN0EGU1bbPH8kGgEKipJfBeIHAQwQJNs87VQfAgLNCgsCASAbHAIBIAwNAgEgEhMCASAODwIBIBARAAMMIAEBIC8BASAfAQEgJAIBIBQVAgEgGBkBASAWAQEgFwA4jhXSAAHyo9MHWNcBIPkBBPkBFLrypFjgW3BSAgIc2zwC8mX4AFpxAts87VQvHwEBIBoATwhbpEx4CBukTDgAdAg10rDAJrUAvAHyFjPFszJ4HHXI8gBzxb0AMmAAaFIwvo4aXwOTIddKmAHTB9QC+wAB6DFwyMoAAoBA9EOOEnHIywATywdYzwFYzxYCgED0Q+ICASAdHgIBICUmARO77ZbVAjcFnbPIHwIBSCAhABjIywfLB8s/9AD0AMkCASAiIwF5sR10IMI1xgg+QEB0weCAdTE7UPYUyB49A5vofKf1wv/XjH5EPKgrgH0BCFulhAjXwNxAeD5AVjbPAGkAYCQAPa7agOgA6AD6AgF6AhH8gID8gN15T/gD5HoAAOeLZMAAFa4ZV0EA1WZ2oexAAGBwjikD0IMI1xjTB/QEMFMWePQOb6HypdcL/1RFRPkQ8qauUiCxUgO9FKEjbuYyMjICASAnKAIBSCkqAVW3JVtnhiZQCAqIhn6BzfQxwmYmQDpAADMaYOYuAFrgJhwLb+4cBgY3dG4QLwGNtVmbZ4Br4G/tscbqIlAIHo+N9C30JBHEgFpAADHDRA8a5CTa4GT2E5kAOeLAMAgKiCq+iHJCZhxSQmYcUktGHEA2fMCL4JAvAgEgKywCA5k4LS4BDawabZ4vgcAvABWt+UEAzJV2oewYQAENqTbPBRfBIC8AFa3cLOCAarM7UPYgABztRNDTB9MH0z/0BPQE0Q==");
+with_tvm_code("multisig", "te6ccgECKAEAA+YAART/APSkE/S88sgLAQIBIAIDAgFIBAUE3vIgxwCOgzDbPOCDCNcYIPkBAdMH2zwiwAAToVNxePQOb6EB2zwC8p9UGrv5EPKgBvQEIPkBAdMfURi68qrTP3BTAfAJAcIIAYMKvLHyaFMVgED0Dm+hIJgNpCDCCvJnDd/4I6ofU0C58mFUI6NTThweJB0CAswGBwIBIAoLAAPZhAIBSAgJAC1QKkItdJEqCTItdKlwLUAdAT8AnobBKABPQhbpEx4CBukTDgAdAg10rDAJrUAvAKyFjPFszJ4HHXI8gBzxb0AMmAIBIAwNAgEgEhMBFbvtltUDRwVSDbPIJwIBSA4PAgEgEBEBc7EddCDCNcYIPkBAdMHggHUxO1D2FMgePQOb6Hyn9cL/14x+RDyoK4B9AQhbpNbcTLg+QFY2zwBpAGAhAD2u2oDoAOgA+gIBegIR/ICA/IDdeU/4BWR6AADni2TAABWuGVdBANVmdqHsQAIBIBQVAgFIFhcBUbclW2eGJkZqRhAIHoHN9DHCTYRaQAAzGmHmLgBa4CYcC2/uHAt3dG4QHgGHtVmbZ4ar4G/tscaKInAIHo+N9KQRxGBaQAAxw0QQAhrkJLrgZPYTmQA54sqEAJAIHohgUiYcUiYcUiZcQDZiXMCL4JAeAgEgGBkCA5k4GhsBEawabZ4vgbYJQB4AFa35QQDMlXah7BhAAQ2pNs8FV8FgHgAVrdws4IBqsztQ9iACINs8AvJl+ABQQ3FDE9s87VQeJwSo2zwvrlMgsPJiErECpIIBhqD4AQWXAhEQAj4+MI6jAREQAQ/bPEDXePRDUxe5JoIgDhAAAAAAoCS8sPJpEL0QvAXiVBZbVHPnVhBT3Ns8VHEKVHq8HyUiIAAg7UTQ0x/TB9MH0z/0BPQE0QBIAY4aMNIAAfKj0wfTB1AD1wEg+QEF+QEVuvKkUAPgbCFwVCATBLjbPO1U+A9wJW5Tib6xmBBuEC1Qx18HjxswVCQDUE3bPFBVoEZQEEkQOksJU7nbPFBUFn/i+AAHgyWhjh0mgED0lm+lbBIglDBTArneIJY3OH85BwWSbCHis+YwBichIiMAYHCOKQPQgwjXGNMH9AQwUxZ49A5vofKl1wv/VEVE+RDypq5SILFSA70UoSNu5mwiMgKaUjC+jy5fA/gAkyLXSpgC0wfUAvsAAugycMjKAEAUgED0Q1MhePQOb6Ew2zyl2zxaePRDjhdxyMsAFMsHEssHWM8BWM8WQBOAQPRDAeIkJQEKipJfBuImAArT/9MHMAAMAcjL/8sHARQQRRA0QwDbPO1UJwAcyMsfywfLB8s/9AD0AMk=");
diff --git a/submodules/ton/tonlib-src/crypto/smartcont/auto/multisig-code.fif b/submodules/ton/tonlib-src/crypto/smartcont/auto/multisig-code.fif
index ce1c21bf08..14c6db1115 100644
--- a/submodules/ton/tonlib-src/crypto/smartcont/auto/multisig-code.fif
+++ b/submodules/ton/tonlib-src/crypto/smartcont/auto/multisig-code.fif
@@ -2,11 +2,14 @@
 PROGRAM{
   DECLPROC unpack_state
   DECLPROC pack_state
+  DECLPROC pack_owner_info
+  DECLPROC unpack_owner_info
   DECLPROC check_signatures
   DECLPROC recv_internal
   DECLPROC unpack_query_data
   DECLPROC try_init
   DECLPROC update_pending_queries
+  DECLPROC calc_boc_size
   DECLPROC recv_external
   104746 DECLMETHOD get_query_state
   117746 DECLMETHOD processed?
@@ -23,22 +26,37 @@ PROGRAM{
     // 
     c4 PUSH	//  _1
     CTOS	//  ds
-    8 LDU	//  _4 ds
+    32 LDU	//  _4 ds
     8 LDU	//  _4 _7 ds
-    64 LDU	//  _4 _7 _10 ds
-    LDDICT	//  _4 _7 _10 _13 ds
-    LDDICT	//  res res res res res ds
+    8 LDU	//  _4 _7 _10 ds
+    64 LDU	//  _4 _7 _10 _13 ds
+    LDDICT	//  _4 _7 _10 _13 _16 ds
+    LDDICT	//  res res res res res res ds
     ENDS
   }>
   pack_state PROCREF:<{
-    //  pending_queries public_keys last_cleaned k n
-    NEWC	//  pending_queries public_keys last_cleaned k n _5
-    8 STU	//  pending_queries public_keys last_cleaned k _7
-    8 STU	//  pending_queries public_keys last_cleaned _9
-    64 STU	//  pending_queries public_keys _11
-    STDICT	//  pending_queries _12
-    STDICT	//  _13
-    ENDC	//  _14
+    //  pending_queries owner_infos last_cleaned k n wallet_id
+    NEWC	//  pending_queries owner_infos last_cleaned k n wallet_id _6
+    32 STU	//  pending_queries owner_infos last_cleaned k n _8
+    8 STU	//  pending_queries owner_infos last_cleaned k _10
+    8 STU	//  pending_queries owner_infos last_cleaned _12
+    64 STU	//  pending_queries owner_infos _14
+    STDICT	//  pending_queries _15
+    STDICT	//  _16
+    ENDC	//  _17
+  }>
+  pack_owner_info PROCREF:<{
+    //  public_key flood
+    SWAP
+    NEWC	//  flood public_key _2
+    256 STU	//  flood _4
+    8 STU	//  _6
+  }>
+  unpack_owner_info PROCREF:<{
+    //  cs
+    256 LDU	//  _1 cs
+    8 LDU	//  _1 _10 _9
+    DROP	//  _1 _4
   }>
   check_signatures PROCREF:<{
     //  public_keys signatures hash cnt_bits
@@ -70,8 +88,7 @@ PROGRAM{
       s3 PUSH	//  public_keys signatures hash cnt_bits cnt signatures
       ISNULL	//  public_keys signatures hash cnt_bits cnt _37
     }>	//  public_keys signatures hash cnt_bits cnt
-    s2 POP
-    s2 POP
+    2 2 BLKDROP2
     s2 POP	//  cnt cnt_bits
   }>
   recv_internal PROC:<{
@@ -79,78 +96,117 @@ PROGRAM{
     DROP	// 
   }>
   unpack_query_data PROCREF:<{
-    //  in_msg n query found?
-    IFJMP:<{	//  in_msg n query
-      1 LDI	//  in_msg n _5 query
-      SWAP	//  in_msg n query _5
+    //  in_msg n query found? root_i
+    SWAP	//  in_msg n query root_i found?
+    IFJMP:<{	//  in_msg n query root_i
+      DROP	//  in_msg n query
+      1 LDI	//  in_msg n _6 query
+      SWAP	//  in_msg n query _6
       35 THROWIFNOT
-      8 LDU	//  in_msg n _12 query
-      ROT	//  in_msg _12 query n
-      LDUX	//  in_msg cnt cnt_bits msg
-      DUP	//  in_msg cnt cnt_bits msg msg
-      HASHSU	//  in_msg cnt cnt_bits msg _18
-      s0 s4 XCHG	//  _18 cnt cnt_bits msg in_msg
-      HASHSU	//  _18 cnt cnt_bits msg _19
-      s1 s4 XCHG	//  msg cnt cnt_bits _18 _19
-      EQUAL	//  msg cnt cnt_bits _20
+      8 LDU	//  in_msg n _14 query
+      8 LDU	//  in_msg n _14 _17 query
+      s0 s3 XCHG2	//  in_msg _17 _14 query n
+      LDUX	//  in_msg cnt creator_i cnt_bits msg
+      DUP	//  in_msg cnt creator_i cnt_bits msg msg
+      HASHSU	//  in_msg cnt creator_i cnt_bits msg _23
+      s0 s5 XCHG	//  _23 cnt creator_i cnt_bits msg in_msg
+      HASHSU	//  _23 cnt creator_i cnt_bits msg _24
+      s1 s5 XCHG	//  msg cnt creator_i cnt_bits _23 _24
+      EQUAL	//  msg cnt creator_i cnt_bits _25
       36 THROWIFNOT
-      ROT	//  cnt cnt_bits msg
-    }>	//  in_msg n query
-    2DROP	//  in_msg
-    0 PUSHINT	//  in_msg _22=0
-    s0 s1 PUXC	//  _22=0 _23=0 in_msg
+      s0 s3 XCHG2	//  creator_i cnt cnt_bits msg
+    }>	//  in_msg n query root_i
+    2 1 BLKDROP2	//  in_msg root_i
+    0 PUSHINT	//  in_msg root_i _27=0
+    s0 s1 s2 XCPUXC	//  root_i _27=0 _28=0 in_msg
   }>
   try_init PROCREF:<{
     // 
-    unpack_state INLINECALLDICT	//  n k last_cleaned public_keys pending_queries
-    s0 s2 XCHG	//  n k pending_queries public_keys last_cleaned
+    unpack_state INLINECALLDICT	//  wallet_id n k last_cleaned owner_infos pending_queries
+    s0 s2 XCHG	//  wallet_id n k pending_queries owner_infos last_cleaned
     37 THROWIF
     ACCEPT
-    2SWAP
+    s4 s3 XCHG2
     1 PUSHINT
-    s0 s2 XCHG	//  pending_queries public_keys _9=1 k n
-    pack_state INLINECALLDICT	//  _10
+    s3 s1 s3 XCHG3	//  pending_queries owner_infos _10=1 k n wallet_id
+    pack_state INLINECALLDICT	//  _11
     c4 POP
   }>
   update_pending_queries PROCREF:<{
-    //  pending_queries msg query_id cnt cnt_bits n k
-    s3 s(-1) PUXC	//  pending_queries msg query_id cnt cnt_bits n cnt k
-    GEQ	//  pending_queries msg query_id cnt cnt_bits n _7
-    IF:<{	//  pending_queries msg query_id cnt cnt_bits n
-      3 BLKDROP	//  pending_queries msg query_id
+    //  pending_queries owner_infos msg query_id creator_i cnt cnt_bits n k
+    s3 s(-1) PUXC	//  pending_queries owner_infos msg query_id creator_i cnt cnt_bits n cnt k
+    GEQ	//  pending_queries owner_infos msg query_id creator_i cnt cnt_bits n _9
+    IF:<{	//  pending_queries owner_infos msg query_id creator_i cnt cnt_bits n
+      3 BLKDROP	//  pending_queries owner_infos msg query_id creator_i
+      ACCEPT
       WHILE:<{
-        OVER	//  pending_queries msg query_id msg
-        SREFS	//  pending_queries msg query_id _8
-      }>DO<{	//  pending_queries msg query_id
-        SWAP	//  pending_queries query_id msg
-        8 LDU	//  pending_queries query_id mode msg
-        LDREF	//  pending_queries query_id mode _13 msg
-        s0 s2 XCHG	//  pending_queries query_id msg _13 mode
+        s2 PUSH	//  pending_queries owner_infos msg query_id creator_i msg
+        SREFS	//  pending_queries owner_infos msg query_id creator_i _11
+      }>DO<{	//  pending_queries owner_infos msg query_id creator_i
+        s0 s2 XCHG	//  pending_queries owner_infos creator_i query_id msg
+        8 LDU	//  pending_queries owner_infos creator_i query_id mode msg
+        LDREF	//  pending_queries owner_infos creator_i query_id mode _16 msg
+        s0 s2 XCHG	//  pending_queries owner_infos creator_i query_id msg _16 mode
         SENDRAWMSG
-        SWAP	//  pending_queries msg query_id
-      }>	//  pending_queries msg query_id
-      NIP	//  pending_queries query_id
-      0 PUSHINT	//  pending_queries query_id _17=0
-      NEWC	//  pending_queries query_id _17=0 _18
-      1 STI	//  pending_queries query_id _20
-      s0 s2 XCHG
-      64 PUSHINT	//  _20 query_id pending_queries _21=64
-      DICTUSETB	//  pending_queries
-    }>ELSE<{	//  pending_queries msg query_id cnt cnt_bits n
-      1 PUSHINT	//  pending_queries msg query_id cnt cnt_bits n _24=1
-      NEWC	//  pending_queries msg query_id cnt cnt_bits n _24=1 _25
-      1 STU	//  pending_queries msg query_id cnt cnt_bits n _27
-      s1 s3 XCHG	//  pending_queries msg query_id n cnt_bits cnt _27
-      8 STU	//  pending_queries msg query_id n cnt_bits _29
-      ROT	//  pending_queries msg query_id cnt_bits _29 n
-      STUX	//  pending_queries msg query_id _30
-      ROT	//  pending_queries query_id _30 msg
-      STSLICER	//  pending_queries query_id _31
-      s0 s2 XCHG
-      64 PUSHINT	//  _31 query_id pending_queries _32=64
-      DICTUSETB	//  pending_queries
+        s0 s2 XCHG	//  pending_queries owner_infos msg query_id creator_i
+      }>	//  pending_queries owner_infos msg query_id creator_i
+      s2 POP	//  pending_queries owner_infos creator_i query_id
+      0 PUSHINT	//  pending_queries owner_infos creator_i query_id _20=0
+      NEWC	//  pending_queries owner_infos creator_i query_id _20=0 _21
+      1 STI	//  pending_queries owner_infos creator_i query_id _23
+      s0 s1 s4 XCHG3
+      64 PUSHINT	//  creator_i owner_infos _23 query_id pending_queries _24=64
+      DICTUSETB	//  creator_i owner_infos pending_queries
+      s2 s1 PUSH2
+      8 PUSHINT	//  creator_i owner_infos pending_queries creator_i owner_infos _28=8
+      DICTUGET
+      NULLSWAPIFNOT	//  creator_i owner_infos pending_queries _56 _57
+      DROP	//  creator_i owner_infos pending_queries owner_info
+      unpack_owner_info INLINECALLDICT	//  creator_i owner_infos pending_queries public_key flood
+      DEC	//  creator_i owner_infos pending_queries public_key _35
+      pack_owner_info INLINECALLDICT	//  creator_i owner_infos pending_queries _36
+      2SWAP
+      8 PUSHINT	//  pending_queries _36 creator_i owner_infos _37=8
+      DICTUSETB	//  pending_queries owner_infos
+    }>ELSE<{	//  pending_queries owner_infos msg query_id creator_i cnt cnt_bits n
+      1 PUSHINT	//  pending_queries owner_infos msg query_id creator_i cnt cnt_bits n _40=1
+      NEWC	//  pending_queries owner_infos msg query_id creator_i cnt cnt_bits n _40=1 _41
+      1 STU	//  pending_queries owner_infos msg query_id creator_i cnt cnt_bits n _43
+      s1 s4 XCHG	//  pending_queries owner_infos msg query_id n cnt cnt_bits creator_i _43
+      8 STU	//  pending_queries owner_infos msg query_id n cnt cnt_bits _45
+      s1 s2 XCHG	//  pending_queries owner_infos msg query_id n cnt_bits cnt _45
+      8 STU	//  pending_queries owner_infos msg query_id n cnt_bits _47
+      ROT	//  pending_queries owner_infos msg query_id cnt_bits _47 n
+      STUX	//  pending_queries owner_infos msg query_id _48
+      ROT	//  pending_queries owner_infos query_id _48 msg
+      STSLICER	//  pending_queries owner_infos query_id _49
+      s0 s1 s3 XCHG3
+      64 PUSHINT	//  owner_infos _49 query_id pending_queries _50=64
+      DICTUSETB	//  owner_infos pending_queries
+      SWAP	//  pending_queries owner_infos
     }>
   }>
+  calc_boc_size PROC:<{
+    //  cells bits root
+    s0 s2 XCHG	//  root bits cells
+    INC	//  root bits cells
+    s2 PUSH	//  root bits cells root
+    SBITS	//  root bits cells _5
+    s1 s2 XCHG	//  root cells bits _5
+    ADD	//  root cells bits
+    WHILE:<{
+      s2 PUSH	//  root cells bits root
+      SREFS	//  root cells bits _7
+    }>DO<{	//  root cells bits
+      s0 s2 XCHG	//  bits cells root
+      LDREF	//  bits cells _8 root
+      SWAP	//  bits cells root _8
+      CTOS	//  bits cells root _10
+      s1 s3 XCHG	//  root cells bits _10
+      calc_boc_size CALLDICT	//  root cells bits
+    }>	//  root cells bits
+    1 2 BLKDROP2	//  cells bits
+  }>
   recv_external PROC:<{
     //  in_msg
     DUP	//  in_msg in_msg
@@ -165,157 +221,209 @@ PROGRAM{
     HASHSU	//  root_signature in_msg root_hash
     SWAP	//  root_signature root_hash in_msg
     8 LDU	//  root_signature root_hash root_i in_msg
-    unpack_state INLINECALLDICT	//  root_signature root_hash root_i in_msg n k last_cleaned public_keys pending_queries
-    s2 PUSH	//  root_signature root_hash root_i in_msg n k last_cleaned public_keys pending_queries last_cleaned
-    0 EQINT	//  root_signature root_hash root_i in_msg n k last_cleaned public_keys pending_queries _20
-    s1 s3 XCHG	//  root_signature root_hash root_i in_msg n k pending_queries public_keys last_cleaned _20
-    SUB	//  root_signature root_hash root_i in_msg n k pending_queries public_keys last_cleaned
-    s6 s1 PUSH2
-    8 PUSHINT	//  root_signature root_hash root_i in_msg n k pending_queries public_keys last_cleaned root_i public_keys _24=8
+    unpack_state INLINECALLDICT	//  root_signature root_hash root_i in_msg wallet_id n k last_cleaned owner_infos pending_queries
+    s2 PUSH	//  root_signature root_hash root_i in_msg wallet_id n k last_cleaned owner_infos pending_queries last_cleaned
+    0 EQINT	//  root_signature root_hash root_i in_msg wallet_id n k last_cleaned owner_infos pending_queries _21
+    s1 s3 XCHG	//  root_signature root_hash root_i in_msg wallet_id n k pending_queries owner_infos last_cleaned _21
+    SUB	//  root_signature root_hash root_i in_msg wallet_id n k pending_queries owner_infos last_cleaned
+    s7 s1 PUSH2
+    8 PUSHINT	//  root_signature root_hash root_i in_msg wallet_id n k pending_queries owner_infos last_cleaned root_i owner_infos _25=8
     DICTUGET
-    NULLSWAPIFNOT	//  root_signature root_hash root_i in_msg n k pending_queries public_keys last_cleaned public_key found?
+    NULLSWAPIFNOT	//  root_signature root_hash root_i in_msg wallet_id n k pending_queries owner_infos last_cleaned owner_info found?
+    SWAP	//  root_signature root_hash root_i in_msg wallet_id n k pending_queries owner_infos last_cleaned found? owner_info
+    unpack_owner_info INLINECALLDICT	//  root_signature root_hash root_i in_msg wallet_id n k pending_queries owner_infos last_cleaned found? public_key flood
+    s0 s2 XCHG	//  root_signature root_hash root_i in_msg wallet_id n k pending_queries owner_infos last_cleaned flood public_key found?
     31 THROWIFNOT
-    256 PLDU	//  root_signature root_hash root_i in_msg n k pending_queries public_keys last_cleaned _30
-    s8 s9 s0 XCHG3	//  last_cleaned public_keys root_i in_msg n k pending_queries root_hash root_signature _30
-    CHKSIGNU	//  last_cleaned public_keys root_i in_msg n k pending_queries _31
+    s10 s11 s11 XC2PU	//  public_key flood root_i in_msg wallet_id n k pending_queries owner_infos last_cleaned root_hash root_signature public_key
+    CHKSIGNU	//  public_key flood root_i in_msg wallet_id n k pending_queries owner_infos last_cleaned _33
     32 THROWIFNOT
-    s0 s3 XCHG	//  last_cleaned public_keys root_i pending_queries n k in_msg
-    LDDICT	//  last_cleaned public_keys root_i pending_queries n k signatures in_msg
-    DUP	//  last_cleaned public_keys root_i pending_queries n k signatures in_msg in_msg
-    HASHSU	//  last_cleaned public_keys root_i pending_queries n k signatures in_msg hash
-    SWAP	//  last_cleaned public_keys root_i pending_queries n k signatures hash in_msg
-    64 LDU	//  last_cleaned public_keys root_i pending_queries n k signatures hash query_id in_msg
-    NOW	//  last_cleaned public_keys root_i pending_queries n k signatures hash query_id in_msg _43
-    32 LSHIFT#	//  last_cleaned public_keys root_i pending_queries n k signatures hash query_id in_msg bound
-    s2 s0 PUSH2	//  last_cleaned public_keys root_i pending_queries n k signatures hash query_id in_msg bound query_id bound
-    LESS	//  last_cleaned public_keys root_i pending_queries n k signatures hash query_id in_msg bound _47
-    33 THROWIF
-    s2 s7 PUSH2
-    64 PUSHINT	//  last_cleaned public_keys root_i pending_queries n k signatures hash query_id in_msg bound query_id pending_queries _51=64
+    s0 s6 XCHG	//  public_key flood root_i last_cleaned wallet_id n k pending_queries owner_infos in_msg
+    LDDICT	//  public_key flood root_i last_cleaned wallet_id n k pending_queries owner_infos signatures in_msg
+    DUP	//  public_key flood root_i last_cleaned wallet_id n k pending_queries owner_infos signatures in_msg in_msg
+    HASHSU	//  public_key flood root_i last_cleaned wallet_id n k pending_queries owner_infos signatures in_msg hash
+    SWAP	//  public_key flood root_i last_cleaned wallet_id n k pending_queries owner_infos signatures hash in_msg
+    32 LDU	//  public_key flood root_i last_cleaned wallet_id n k pending_queries owner_infos signatures hash query_wallet_id in_msg
+    s1 s8 XCPU	//  public_key flood root_i last_cleaned wallet_id n k pending_queries owner_infos signatures hash in_msg query_wallet_id wallet_id
+    EQUAL	//  public_key flood root_i last_cleaned wallet_id n k pending_queries owner_infos signatures hash in_msg _45
+    42 THROWIFNOT
+    64 LDU	//  public_key flood root_i last_cleaned wallet_id n k pending_queries owner_infos signatures hash query_id in_msg
+    0 PUSHINT	//  public_key flood root_i last_cleaned wallet_id n k pending_queries owner_infos signatures hash query_id in_msg _53=0
+    s0 s1 PUSH2	//  public_key flood root_i last_cleaned wallet_id n k pending_queries owner_infos signatures hash query_id in_msg _53=0 _54=0 in_msg
+    calc_boc_size CALLDICT	//  public_key flood root_i last_cleaned wallet_id n k pending_queries owner_infos signatures hash query_id in_msg cnt bits
+    SWAP	//  public_key flood root_i last_cleaned wallet_id n k pending_queries owner_infos signatures hash query_id in_msg bits cnt
+    8 GTINT	//  public_key flood root_i last_cleaned wallet_id n k pending_queries owner_infos signatures hash query_id in_msg bits _58
+    SWAP
+    11 PUSHPOW2	//  public_key flood root_i last_cleaned wallet_id n k pending_queries owner_infos signatures hash query_id in_msg _58 bits _59=2048
+    GREATER	//  public_key flood root_i last_cleaned wallet_id n k pending_queries owner_infos signatures hash query_id in_msg _58 _60
+    OR	//  public_key flood root_i last_cleaned wallet_id n k pending_queries owner_infos signatures hash query_id in_msg _61
+    40 THROWIF
+    s1 s5 PUSH2
+    64 PUSHINT	//  public_key flood root_i last_cleaned wallet_id n k pending_queries owner_infos signatures hash query_id in_msg query_id pending_queries _65=64
     DICTUGET
-    NULLSWAPIFNOT	//  last_cleaned public_keys root_i pending_queries n k signatures hash query_id in_msg bound query found?
-    s2 s3 XCHG
-    s8 s(-1) s(-1) PUXC2	//  last_cleaned public_keys root_i pending_queries n k signatures hash query_id bound in_msg n query found?
-    unpack_query_data INLINECALLDICT	//  last_cleaned public_keys root_i pending_queries n k signatures hash query_id bound cnt cnt_bits msg
-    s0 s10 XCHG	//  last_cleaned public_keys msg pending_queries n k signatures hash query_id bound cnt cnt_bits root_i
-    POW2	//  last_cleaned public_keys msg pending_queries n k signatures hash query_id bound cnt cnt_bits mask
-    2DUP	//  last_cleaned public_keys msg pending_queries n k signatures hash query_id bound cnt cnt_bits mask cnt_bits mask
-    AND	//  last_cleaned public_keys msg pending_queries n k signatures hash query_id bound cnt cnt_bits mask _61
+    NULLSWAPIFNOT	//  public_key flood root_i last_cleaned wallet_id n k pending_queries owner_infos signatures hash query_id in_msg query found?
+    DUP	//  public_key flood root_i last_cleaned wallet_id n k pending_queries owner_infos signatures hash query_id in_msg query found? found?
+    IFNOT:<{	//  public_key flood root_i last_cleaned wallet_id n k pending_queries owner_infos signatures hash query_id in_msg query found?
+      s0 s13 XCHG	//  public_key found? root_i last_cleaned wallet_id n k pending_queries owner_infos signatures hash query_id in_msg query flood
+      INC	//  public_key found? root_i last_cleaned wallet_id n k pending_queries owner_infos signatures hash query_id in_msg query flood
+      DUP	//  public_key found? root_i last_cleaned wallet_id n k pending_queries owner_infos signatures hash query_id in_msg query flood flood
+      10 GTINT	//  public_key found? root_i last_cleaned wallet_id n k pending_queries owner_infos signatures hash query_id in_msg query flood _71
+      39 THROWIF
+      s0 s13 XCHG	//  public_key flood root_i last_cleaned wallet_id n k pending_queries owner_infos signatures hash query_id in_msg query found?
+    }>	//  public_key flood root_i last_cleaned wallet_id n k pending_queries owner_infos signatures hash query_id in_msg query found?
+    NOW	//  public_key flood root_i last_cleaned wallet_id n k pending_queries owner_infos signatures hash query_id in_msg query found? _74
+    32 LSHIFT#	//  public_key flood root_i last_cleaned wallet_id n k pending_queries owner_infos signatures hash query_id in_msg query found? bound
+    s4 s0 PUSH2	//  public_key flood root_i last_cleaned wallet_id n k pending_queries owner_infos signatures hash query_id in_msg query found? bound query_id bound
+    LESS	//  public_key flood root_i last_cleaned wallet_id n k pending_queries owner_infos signatures hash query_id in_msg query found? bound _78
+    33 THROWIF
+    s3 s10 s2 XCPUXC
+    s4 s14 PUSH2	//  public_key flood root_i last_cleaned wallet_id n k pending_queries owner_infos signatures hash query_id found? bound in_msg n query found? root_i
+    unpack_query_data INLINECALLDICT	//  public_key flood root_i last_cleaned wallet_id n k pending_queries owner_infos signatures hash query_id found? bound creator_i cnt cnt_bits msg
+    s15 PUSH	//  public_key flood root_i last_cleaned wallet_id n k pending_queries owner_infos signatures hash query_id found? bound creator_i cnt cnt_bits msg root_i
+    POW2	//  public_key flood root_i last_cleaned wallet_id n k pending_queries owner_infos signatures hash query_id found? bound creator_i cnt cnt_bits msg mask
+    s2 s0 PUSH2	//  public_key flood root_i last_cleaned wallet_id n k pending_queries owner_infos signatures hash query_id found? bound creator_i cnt cnt_bits msg mask cnt_bits mask
+    AND	//  public_key flood root_i last_cleaned wallet_id n k pending_queries owner_infos signatures hash query_id found? bound creator_i cnt cnt_bits msg mask _89
     34 THROWIF
-    OR	//  last_cleaned public_keys msg pending_queries n k signatures hash query_id bound cnt cnt_bits
-    SWAP	//  last_cleaned public_keys msg pending_queries n k signatures hash query_id bound cnt_bits cnt
-    INC	//  last_cleaned public_keys msg pending_queries n k signatures hash query_id bound cnt_bits cnt
-    ACCEPT
-    s8 s9 s3 XCPU2
-    s10 s3 s9 PUSH3
-    s11 PUSH	//  last_cleaned public_keys msg cnt n k signatures hash query_id bound cnt_bits pending_queries msg query_id cnt cnt_bits n k
-    update_pending_queries INLINECALLDICT	//  last_cleaned public_keys msg cnt n k signatures hash query_id bound cnt_bits pending_queries
-    s0 s10 s11 PUSH3
-    s9 s10 PUSH2	//  last_cleaned public_keys msg cnt n k signatures hash query_id bound cnt_bits pending_queries pending_queries public_keys last_cleaned k n
-    pack_state INLINECALLDICT	//  last_cleaned public_keys msg cnt n k signatures hash query_id bound cnt_bits pending_queries _68
+    s1 s2 XCHG	//  public_key flood root_i last_cleaned wallet_id n k pending_queries owner_infos signatures hash query_id found? bound creator_i cnt msg cnt_bits mask
+    OR	//  public_key flood root_i last_cleaned wallet_id n k pending_queries owner_infos signatures hash query_id found? bound creator_i cnt msg cnt_bits
+    s0 s2 XCHG	//  public_key flood root_i last_cleaned wallet_id n k pending_queries owner_infos signatures hash query_id found? bound creator_i cnt_bits msg cnt
+    INC	//  public_key flood root_i last_cleaned wallet_id n k pending_queries owner_infos signatures hash query_id found? bound creator_i cnt_bits msg cnt
+    100000 PUSHINT	//  public_key flood root_i last_cleaned wallet_id n k pending_queries owner_infos signatures hash query_id found? bound creator_i cnt_bits msg cnt _94=100000
+    SETGASLIMIT
+    s0 s5 XCHG	//  public_key flood root_i last_cleaned wallet_id n k pending_queries owner_infos signatures hash query_id cnt bound creator_i cnt_bits msg found?
+    IFNOT:<{	//  public_key flood root_i last_cleaned wallet_id n k pending_queries owner_infos signatures hash query_id cnt bound creator_i cnt_bits msg
+      s1 16 s() XCHG
+      s0 s15 XCHG	//  cnt_bits msg root_i last_cleaned wallet_id n k pending_queries owner_infos signatures hash query_id cnt bound creator_i public_key flood
+      pack_owner_info INLINECALLDICT	//  cnt_bits msg root_i last_cleaned wallet_id n k pending_queries owner_infos signatures hash query_id cnt bound creator_i _97
+      s0 s13 s7 XCHG3
+      8 PUSHINT	//  cnt_bits msg creator_i last_cleaned wallet_id n k pending_queries bound signatures hash query_id cnt _97 root_i owner_infos _98=8
+      DICTUSETB	//  cnt_bits msg creator_i last_cleaned wallet_id n k pending_queries bound signatures hash query_id cnt owner_infos
+      s1 s7 PUSH2	//  cnt_bits msg creator_i last_cleaned wallet_id n k pending_queries bound signatures hash query_id cnt owner_infos cnt k
+      LESS	//  cnt_bits msg creator_i last_cleaned wallet_id n k pending_queries bound signatures hash query_id cnt owner_infos _101
+      s6 PUSH
+      15461882265600 PUSHINT	//  cnt_bits msg creator_i last_cleaned wallet_id n k pending_queries bound signatures hash query_id cnt owner_infos _101 bound _106
+      ADD	//  cnt_bits msg creator_i last_cleaned wallet_id n k pending_queries bound signatures hash query_id cnt owner_infos _101 _107
+      s4 PUSH	//  cnt_bits msg creator_i last_cleaned wallet_id n k pending_queries bound signatures hash query_id cnt owner_infos _101 _107 query_id
+      GREATER	//  cnt_bits msg creator_i last_cleaned wallet_id n k pending_queries bound signatures hash query_id cnt owner_infos _101 _108
+      AND	//  cnt_bits msg creator_i last_cleaned wallet_id n k pending_queries bound signatures hash query_id cnt owner_infos _109
+      41 THROWIF
+      s11 s13 XCHG
+      s11 s12 XCHG
+      s0 s5 XCHG	//  creator_i cnt_bits msg last_cleaned wallet_id n k pending_queries owner_infos signatures hash query_id cnt bound
+    }>ELSE<{
+      s2 16 s() XCHG
+      s14 POP
+      s14 POP
+      DROP	//  creator_i cnt_bits msg last_cleaned wallet_id n k pending_queries owner_infos signatures hash query_id cnt bound
+    }>
+    s6 s5 s11 XC2PU
+    s3 s14 s7 PUSH3
+    16 s() PUSH
+    s13 s12 PUSH2	//  creator_i cnt_bits msg last_cleaned wallet_id n k cnt bound signatures hash query_id pending_queries owner_infos msg query_id creator_i cnt cnt_bits n k
+    update_pending_queries INLINECALLDICT	//  creator_i cnt_bits msg last_cleaned wallet_id n k cnt bound signatures hash query_id pending_queries owner_infos
+    s1 s0 s10 PUSH3
+    s10 s11 s12 PUSH3	//  creator_i cnt_bits msg last_cleaned wallet_id n k cnt bound signatures hash query_id pending_queries owner_infos pending_queries owner_infos last_cleaned k n wallet_id
+    pack_state INLINECALLDICT	//  creator_i cnt_bits msg last_cleaned wallet_id n k cnt bound signatures hash query_id pending_queries owner_infos _112
     c4 POP
     COMMIT
-    0 PUSHINT	//  last_cleaned public_keys msg cnt n k signatures hash query_id bound cnt_bits pending_queries need_save=0
-    s6 PUSH	//  last_cleaned public_keys msg cnt n k signatures hash query_id bound cnt_bits pending_queries need_save=0 signatures
-    ISNULL	//  last_cleaned public_keys msg cnt n k signatures hash query_id bound cnt_bits pending_queries need_save=0 _73
-    s10 s8 PUSH2	//  last_cleaned public_keys msg cnt n k signatures hash query_id bound cnt_bits pending_queries need_save=0 _73 cnt k
-    GEQ	//  last_cleaned public_keys msg cnt n k signatures hash query_id bound cnt_bits pending_queries need_save=0 _73 _74
-    OR	//  last_cleaned public_keys msg cnt n k signatures hash query_id bound cnt_bits pending_queries need_save=0 _75
-    IFNOT:<{	//  last_cleaned public_keys msg cnt n k signatures hash query_id bound cnt_bits pending_queries need_save=0
-      DROP	//  last_cleaned public_keys msg cnt n k signatures hash query_id bound cnt_bits pending_queries
-      s10 PUSH
-      s6 s5 s3 XCHG3
-      s0 s6 XCHG	//  last_cleaned public_keys msg cnt n k bound pending_queries query_id public_keys signatures hash cnt_bits
-      check_signatures INLINECALLDICT	//  last_cleaned public_keys msg cnt n k bound pending_queries query_id new_cnt cnt_bits
-      s7 s7 XCHG2	//  last_cleaned public_keys msg cnt_bits n k bound pending_queries query_id cnt new_cnt
-      ADD	//  last_cleaned public_keys msg cnt_bits n k bound pending_queries query_id cnt
-      s2 s4 XCHG
-      s3 s7 XCHG
-      s1 s0 s6 XCHG3
-      s5 s6 PUSH2	//  last_cleaned public_keys bound k n pending_queries msg query_id cnt cnt_bits n k
-      update_pending_queries INLINECALLDICT	//  last_cleaned public_keys bound k n pending_queries
-      -1 PUSHINT	//  last_cleaned public_keys bound k n pending_queries need_save=-1
-    }>ELSE<{
+    0 PUSHINT	//  creator_i cnt_bits msg last_cleaned wallet_id n k cnt bound signatures hash query_id pending_queries owner_infos need_save=0
+    s5 PUSH	//  creator_i cnt_bits msg last_cleaned wallet_id n k cnt bound signatures hash query_id pending_queries owner_infos need_save=0 signatures
+    ISNULL	//  creator_i cnt_bits msg last_cleaned wallet_id n k cnt bound signatures hash query_id pending_queries owner_infos need_save=0 _117
+    s8 s9 PUSH2	//  creator_i cnt_bits msg last_cleaned wallet_id n k cnt bound signatures hash query_id pending_queries owner_infos need_save=0 _117 cnt k
+    GEQ	//  creator_i cnt_bits msg last_cleaned wallet_id n k cnt bound signatures hash query_id pending_queries owner_infos need_save=0 _117 _118
+    OR	//  creator_i cnt_bits msg last_cleaned wallet_id n k cnt bound signatures hash query_id pending_queries owner_infos need_save=0 _119
+    IFNOT:<{	//  creator_i cnt_bits msg last_cleaned wallet_id n k cnt bound signatures hash query_id pending_queries owner_infos need_save=0
+      DROP	//  creator_i cnt_bits msg last_cleaned wallet_id n k cnt bound signatures hash query_id pending_queries owner_infos
+      s4 s0 s2 XCPUXC
+      s4 s13 XCHG2	//  creator_i query_id msg last_cleaned wallet_id n k cnt bound pending_queries owner_infos owner_infos signatures hash cnt_bits
+      check_signatures INLINECALLDICT	//  creator_i query_id msg last_cleaned wallet_id n k cnt bound pending_queries owner_infos new_cnt cnt_bits
+      s5 s5 XCHG2	//  creator_i query_id msg last_cleaned wallet_id n k cnt_bits bound pending_queries owner_infos cnt new_cnt
+      ADD	//  creator_i query_id msg last_cleaned wallet_id n k cnt_bits bound pending_queries owner_infos cnt
+      s6 s5 s0 XCHG3
+      s4 s9 XCHG
       s3 s10 XCHG
-      s7 s9 XCHG
-      s7 s6 XCHG2
-      6 BLKDROP	//  last_cleaned public_keys bound k n pending_queries need_save
+      s11 s0 s9 XCHG3
+      s11 s9 PUSH2	//  n bound k last_cleaned wallet_id pending_queries owner_infos msg query_id creator_i cnt cnt_bits n k
+      update_pending_queries INLINECALLDICT	//  n bound k last_cleaned wallet_id pending_queries owner_infos
+      s5 s4 XCHG2
+      s1 s6 XCHG
+      -1 PUSHINT	//  bound pending_queries owner_infos last_cleaned wallet_id n k need_save=-1
+    }>ELSE<{
+      s6 s14 XCHG
+      s2 s13 XCHG
+      s12 s7 XCHG2
+      7 BLKDROP	//  bound pending_queries owner_infos last_cleaned wallet_id n k need_save
     }>
-    s0 s4 XCHG
-    38 PUSHPOW2	//  last_cleaned public_keys need_save k n pending_queries bound _83
-    SUB	//  last_cleaned public_keys need_save k n pending_queries bound
+    ACCEPT
+    s0 s7 XCHG
+    38 PUSHPOW2	//  need_save pending_queries owner_infos last_cleaned wallet_id n k bound _128
+    SUB	//  need_save pending_queries owner_infos last_cleaned wallet_id n k bound
     UNTIL:<{
-      OVER
-      64 PUSHINT	//  last_cleaned public_keys need_save k n pending_queries bound pending_queries _90=64
+      s6 PUSH
+      64 PUSHINT	//  need_save pending_queries owner_infos last_cleaned wallet_id n k bound pending_queries _135=64
       DICTUREMMIN
-      NULLSWAPIFNOT
-      NULLSWAPIFNOT	//  last_cleaned public_keys need_save k n pending_queries bound _121 _123 _122 _124
-      s2 POP	//  last_cleaned public_keys need_save k n pending_queries bound pending_queries' f i
-      s1 s0 XCPU	//  last_cleaned public_keys need_save k n pending_queries bound pending_queries' i f f
-      IF:<{	//  last_cleaned public_keys need_save k n pending_queries bound pending_queries' i f
-        DROP	//  last_cleaned public_keys need_save k n pending_queries bound pending_queries' i
-        s0 s2 PUSH2	//  last_cleaned public_keys need_save k n pending_queries bound pending_queries' i i bound
-        LESS	//  last_cleaned public_keys need_save k n pending_queries bound pending_queries' i f
-      }>	//  last_cleaned public_keys need_save k n pending_queries bound pending_queries' i f
-      DUP	//  last_cleaned public_keys need_save k n pending_queries bound pending_queries' i f f
-      IF:<{	//  last_cleaned public_keys need_save k n pending_queries bound pending_queries' i f
-        s4 POP
-        s6 POP
-        s7 POP	//  pending_queries public_keys last_cleaned k n f bound
-        -1 PUSHINT	//  pending_queries public_keys last_cleaned k n f bound need_save=-1
+      NULLSWAPIFNOT2	//  need_save pending_queries owner_infos last_cleaned wallet_id n k bound _178 _180 _179 _181
+      1 2 BLKDROP2	//  need_save pending_queries owner_infos last_cleaned wallet_id n k bound pending_queries' i f
+      DUP	//  need_save pending_queries owner_infos last_cleaned wallet_id n k bound pending_queries' i f f
+      IF:<{	//  need_save pending_queries owner_infos last_cleaned wallet_id n k bound pending_queries' i f
+        DROP	//  need_save pending_queries owner_infos last_cleaned wallet_id n k bound pending_queries' i
+        s0 s2 PUSH2	//  need_save pending_queries owner_infos last_cleaned wallet_id n k bound pending_queries' i i bound
+        LESS	//  need_save pending_queries owner_infos last_cleaned wallet_id n k bound pending_queries' i f
+      }>	//  need_save pending_queries owner_infos last_cleaned wallet_id n k bound pending_queries' i f
+      DUP	//  need_save pending_queries owner_infos last_cleaned wallet_id n k bound pending_queries' i f f
+      IF:<{	//  need_save pending_queries owner_infos last_cleaned wallet_id n k bound pending_queries' i f
+        s7 POP
+        s8 POP
+        -1 PUSHINT
+        s9 POP
+        s0 s7 XCHG
+        s0 s5 XCHG	//  need_save=-1 pending_queries owner_infos last_cleaned wallet_id n k bound f
       }>ELSE<{
-        s4 s9 XCHG
-        s4 s7 XCHG
-        s4 s1 s4 XCHG3
-        2DROP	//  pending_queries public_keys last_cleaned k n f bound need_save
+        2 1 BLKDROP2	//  need_save pending_queries owner_infos last_cleaned wallet_id n k bound f
       }>
-      s0 s2 XCHG	//  pending_queries public_keys last_cleaned k n need_save bound f
-      NOT	//  pending_queries public_keys last_cleaned k n need_save bound _96
-      s5 s7 XCHG
-      s2 s5 XCHG	//  last_cleaned public_keys need_save k n pending_queries bound _96
-    }>	//  last_cleaned public_keys need_save k n pending_queries bound
-    DROP	//  last_cleaned public_keys need_save k n pending_queries
-    s0 s3 XCHG	//  last_cleaned public_keys pending_queries k n need_save
-    IF:<{	//  last_cleaned public_keys pending_queries k n
-      s2 s4 XCHG	//  pending_queries public_keys last_cleaned k n
-      pack_state INLINECALLDICT	//  _97
+      NOT	//  need_save pending_queries owner_infos last_cleaned wallet_id n k bound _141
+    }>	//  need_save pending_queries owner_infos last_cleaned wallet_id n k bound
+    DROP	//  need_save pending_queries owner_infos last_cleaned wallet_id n k
+    s0 s6 XCHG	//  k pending_queries owner_infos last_cleaned wallet_id n need_save
+    IF:<{	//  k pending_queries owner_infos last_cleaned wallet_id n
+      s4 s5 XCHG
+      s3 s4 XCHG
+      s3 s0 s0 XCHG3	//  pending_queries owner_infos last_cleaned k n wallet_id
+      pack_state INLINECALLDICT	//  _142
       c4 POP
     }>ELSE<{
-      5 BLKDROP	// 
+      6 BLKDROP	// 
     }>
   }>
   get_query_state PROC:<{
     //  query_id
-    unpack_state INLINECALLDICT	//  query_id _25 _26 _27 _28 _29
+    unpack_state INLINECALLDICT	//  query_id _28 _29 _30 _31 _32 _33
     NIP
-    s2 POP	//  query_id n pending_queries last_cleaned
-    64 PUSHINT	//  query_id n pending_queries last_cleaned _9=64
-    s4 s2 s2 PUXC2	//  query_id n last_cleaned query_id pending_queries _9=64
+    s2 POP
+    s3 POP	//  query_id last_cleaned n pending_queries
+    s3 s(-1) PUXC
+    64 PUSHINT	//  query_id last_cleaned n query_id pending_queries _10=64
     DICTUGET
-    NULLSWAPIFNOT	//  query_id n last_cleaned cs found
-    IFJMP:<{	//  query_id n last_cleaned cs
-      NIP
-      s2 POP	//  cs n
-      SWAP	//  n cs
-      1 LDI	//  n _11 cs
-      SWAP	//  n cs _11
+    NULLSWAPIFNOT	//  query_id last_cleaned n cs found
+    IFJMP:<{	//  query_id last_cleaned n cs
+      2 2 BLKDROP2	//  n cs
+      1 LDI	//  n _12 cs
+      SWAP	//  n cs _12
       IFJMP:<{	//  n cs
-        8 LDU	//  n _35 _34
+        16 LDU	//  n _39 _38
         NIP	//  n cs
-        0 PUSHINT	//  n cs _17=0
-        s0 s2 XCHG	//  _17=0 cs n
-        LDUX	//  _17=0 _37 _36
-        DROP	//  _17=0 _18
+        0 PUSHINT	//  n cs _20=0
+        s0 s2 XCHG	//  _20=0 cs n
+        LDUX	//  _20=0 _41 _40
+        DROP	//  _20=0 _21
       }>	//  n cs
       2DROP	// 
-      -1 PUSHINT	//  _20=-1
-      0 PUSHINT	//  _20=-1 _21=0
-    }>	//  query_id n last_cleaned cs
-    DROP
-    NIP	//  query_id last_cleaned
-    LEQ	//  _22
-    NEGATE	//  _23
-    0 PUSHINT	//  _23 _24=0
+      -1 PUSHINT	//  _23=-1
+      0 PUSHINT	//  _23=-1 _24=0
+    }>	//  query_id last_cleaned n cs
+    2DROP	//  query_id last_cleaned
+    LEQ	//  _25
+    NEGATE	//  _26
+    0 PUSHINT	//  _26 _27=0
   }>
   processed? PROC:<{
     //  query_id
@@ -323,12 +431,12 @@ PROGRAM{
     DROP	//  x
   }>
   create_init_state PROC:<{
-    //  n k public_keys
-    NEWDICT	//  n k public_keys _3
-    s2 s3 XCHG2
+    //  wallet_id n k owners_info
+    NEWDICT	//  wallet_id n k owners_info _4
+    s3 s4 XCHG2
     0 PUSHINT
-    -ROT	//  _3 public_keys _4=0 k n
-    pack_state INLINECALLDICT	//  _5
+    3 -ROLL	//  _4 owners_info _5=0 k n wallet_id
+    pack_state INLINECALLDICT	//  _6
   }>
   merge_list PROC:<{
     //  a b
@@ -351,7 +459,7 @@ PROGRAM{
       LDREF	//  b _10 as
       s0 s2 XCHG	//  as _10 b
       merge_list CALLDICT	//  as tail
-      NEWC	//  as tail _13
+      NEWC
       ROT	//  tail _13 as
       STSLICER	//  tail _14
       STREF	//  _15
@@ -367,9 +475,9 @@ PROGRAM{
   }>
   get_public_keys PROC:<{
     // 
-    unpack_state INLINECALLDICT	//  _6 _7 _8 _9 _10
-    s1 s4 XCHG
-    4 BLKDROP	//  public_keys
+    unpack_state INLINECALLDICT	//  _7 _8 _9 _10 _11 _12
+    s1 s5 XCHG
+    5 BLKDROP	//  public_keys
   }>
   check_query_signatures PROC:<{
     //  query
@@ -396,10 +504,9 @@ PROGRAM{
     OVER	//  public_keys mask signatures cs signatures
     ISNULL	//  public_keys mask signatures cs _32
     IFJMP:<{	//  public_keys mask signatures cs
-      s2 s3 XCHG
-      3 BLKDROP	//  mask
-      1 PUSHINT	//  mask _33=1
-      SWAP	//  _33=1 mask
+      2DROP
+      1 PUSHINT
+      s2 POP	//  _33=1 mask
     }>	//  public_keys mask signatures cs
     HASHSU	//  public_keys mask signatures _35
     ROT	//  public_keys signatures _35 mask
@@ -410,53 +517,50 @@ PROGRAM{
   }>
   messages_by_mask PROC:<{
     //  mask
-    unpack_state INLINECALLDICT	//  mask _29 _30 _31 _32 _33
-    s0 s3 XCHG
-    3 BLKDROP	//  mask n pending_queries
-    -1 PUSHINT	//  mask n pending_queries i=-1
-    NEWDICT	//  mask n pending_queries i=-1 a
+    unpack_state INLINECALLDICT	//  mask _32 _33 _34 _35 _36 _37
+    s5 POP
+    3 BLKDROP	//  mask pending_queries n
+    -1 PUSHINT	//  mask pending_queries n i=-1
+    NEWDICT	//  mask pending_queries n i=-1 a
     UNTIL:<{
-      s1 s2 XCPU
-      64 PUSHINT	//  mask n pending_queries a i pending_queries _13=64
+      s1 s3 XCPU
+      64 PUSHINT	//  mask pending_queries n a i pending_queries _14=64
       DICTUGETNEXT
-      NULLSWAPIFNOT
-      NULLSWAPIFNOT	//  mask n pending_queries a cs i f
-      DUP	//  mask n pending_queries a cs i f f
-      IF:<{	//  mask n pending_queries a cs i f
-        s0 s2 XCHG	//  mask n pending_queries a f i cs
-        1 LDI	//  mask n pending_queries a f i _15 cs
-        SWAP	//  mask n pending_queries a f i cs _15
-        IF:<{	//  mask n pending_queries a f i cs
+      NULLSWAPIFNOT2	//  mask pending_queries n a cs i f
+      DUP	//  mask pending_queries n a cs i f f
+      IF:<{	//  mask pending_queries n a cs i f
+        s0 s2 XCHG	//  mask pending_queries n a f i cs
+        1 LDI	//  mask pending_queries n a f i _16 cs
+        SWAP	//  mask pending_queries n a f i cs _16
+        IF:<{	//  mask pending_queries n a f i cs
           DUP
-          8 PUSHINT	//  mask n pending_queries a f i cs cs _19=8
-          SDSKIPFIRST	//  mask n pending_queries a f i cs _20
-          s6 PUSH	//  mask n pending_queries a f i cs _20 n
-          PLDUX	//  mask n pending_queries a f i cs cnt_bits
-          s7 PUSH	//  mask n pending_queries a f i cs cnt_bits mask
-          AND	//  mask n pending_queries a f i cs _22
-          IF:<{	//  mask n pending_queries a f i cs
-            NEWC	//  mask n pending_queries a f i cs _24
-            SWAP	//  mask n pending_queries a f i _24 cs
-            STSLICER	//  mask n pending_queries a f i _25
-            SWAP
-            64 PUSHINT
-            s1 s4 s4 PUXC2	//  mask n pending_queries i f _25 i a _26=64
-            DICTUSETB	//  mask n pending_queries i f a
+          16 PUSHINT	//  mask pending_queries n a f i cs cs _22
+          SDSKIPFIRST	//  mask pending_queries n a f i cs _23
+          s5 PUSH	//  mask pending_queries n a f i cs _23 n
+          PLDUX	//  mask pending_queries n a f i cs cnt_bits
+          s7 PUSH	//  mask pending_queries n a f i cs cnt_bits mask
+          AND	//  mask pending_queries n a f i cs _25
+          IF:<{	//  mask pending_queries n a f i cs
+            NEWC	//  mask pending_queries n a f i cs _27
+            SWAP	//  mask pending_queries n a f i _27 cs
+            STSLICER	//  mask pending_queries n a f i _28
+            s0 s0 s3 XCPUXC
+            64 PUSHINT	//  mask pending_queries n i f _28 i a _29=64
+            DICTUSETB	//  mask pending_queries n i f a
+            s0 s2 XCHG	//  mask pending_queries n a f i
           }>ELSE<{
-            s1 s3 XCHG
-            DROP	//  mask n pending_queries i f a
+            DROP	//  mask pending_queries n a f i
           }>
         }>ELSE<{
-          s1 s3 XCHG
-          DROP	//  mask n pending_queries i f a
+          DROP	//  mask pending_queries n a f i
         }>
       }>ELSE<{
-        2SWAP
-        DROP	//  mask n pending_queries i f a
+        s2 POP	//  mask pending_queries n a f i
       }>
-      SWAP	//  mask n pending_queries i a f
-      NOT	//  mask n pending_queries i a _28
-    }>	//  mask n pending_queries i a
+      SWAP	//  mask pending_queries n a i f
+      NOT	//  mask pending_queries n a i _31
+      s1 s2 XCHG	//  mask pending_queries n i a _31
+    }>	//  mask pending_queries n i a
     s0 s4 XCHG
     4 BLKDROP	//  a
   }>
@@ -473,8 +577,9 @@ PROGRAM{
   }>
   get_n_k PROC:<{
     // 
-    unpack_state INLINECALLDICT	//  _6 _7 _8 _9 _10
-    3 BLKDROP	//  n k
+    unpack_state INLINECALLDICT	//  _7 _8 _9 _10 _11 _12
+    3 BLKDROP
+    1 2 BLKDROP2	//  n k
   }>
   merge_inner_queries PROC:<{
     //  a b
diff --git a/submodules/ton/tonlib-src/crypto/smartcont/auto/restricted-wallet-code.cpp b/submodules/ton/tonlib-src/crypto/smartcont/auto/restricted-wallet-code.cpp
index 1391da27b8..327046a2b6 100644
--- a/submodules/ton/tonlib-src/crypto/smartcont/auto/restricted-wallet-code.cpp
+++ b/submodules/ton/tonlib-src/crypto/smartcont/auto/restricted-wallet-code.cpp
@@ -1 +1 @@
-with_tvm_code("restricted-wallet", "te6ccgECDQEAAQgAART/APSkE/Sg8sgLAQIBIAIDAgFIBAUB+vKDCNcYINMf0x/4IxK78mPtRNDTH9P/0VMxuvKhA54xMjL4AKTIyx/L/8ntVOED+QFUEEL5EPKi+ACA8/gzIG6SMH+X0NcLH/gjvOJx+DPQ1wv/BJMg10qOldMH1H8kjoUwUxbbPN6TAvsAkjIw4ugxMwLRpMjLH8v/ye1UDAICzgYHAgEgCgsCASAICQEBSAwAAwwgACUgPP4MyBukjB/l9DXCx/4I7zigABG+ZL9qJoa4WPwAOby2BAefwZkDdJGD/L6GuFj/wR3nFIuEp8EzeIcUADIB0NMDAXiwklt/4PpAMfpAMPpEAcD/Arqw");
+with_tvm_code("restricted-wallet", "te6ccgEBDAEA+wABFP8A9KQT9LzyyAsBAgEgAgMCAUgEBQL28oMI1xgg0x/TH/gjErvyY+1E0NMf0//RUzG68qEDnjFsIvgApMjLH8v/ye1U4QP5AVQQQvkQ8qL4AIDz+DMgbpIwf5fQ1wsf+CO84nH4M9DXC/8EkyDXSo6V0wfUfySOhTBTFts83pMC+wCSbCHi6DEzAtGkyMsfy//JCgsABNAwAgEgBgcCASAICQA5vLYEB5/BmQN0kYP8voa4WP/BHecUi4SnwTt4hxQAF7s5ztRNDTHzHXC/+AARuMl+1E0NcLH4ADIB0NMDAXiwklt/4PpAMfpAMPpEAcD/ArqwAATtVA==");
diff --git a/submodules/ton/tonlib-src/crypto/smartcont/auto/restricted-wallet-code.fif b/submodules/ton/tonlib-src/crypto/smartcont/auto/restricted-wallet-code.fif
index 6582706c2b..3381cf16b0 100644
--- a/submodules/ton/tonlib-src/crypto/smartcont/auto/restricted-wallet-code.fif
+++ b/submodules/ton/tonlib-src/crypto/smartcont/auto/restricted-wallet-code.fif
@@ -5,6 +5,7 @@ PROGRAM{
   DECLPROC check_destination
   DECLPROC recv_external
   85143 DECLMETHOD seqno
+  78748 DECLMETHOD get_public_key
   104128 DECLMETHOD balance
   recv_internal PROC:<{
     //  in_msg
@@ -71,8 +72,7 @@ PROGRAM{
     s0 s3 XCHG	//  signature in_msg public_key cs stored_seqno msg_seqno
     IFNOTJMP:<{	//  signature in_msg public_key cs stored_seqno
       NIP
-      s2 POP
-      s2 POP	//  public_key stored_seqno
+      2 2 BLKDROP2	//  public_key stored_seqno
       ACCEPT
       INC	//  public_key _35
       NEWC	//  public_key _35 _36
@@ -110,8 +110,7 @@ PROGRAM{
         s0 s2 XCHG	//  elector stored_seqno public_key restrict cs msg mode
         SENDRAWMSG
       }>ELSE<{
-        s2 POP
-        DROP	//  elector stored_seqno public_key restrict cs
+        2 1 BLKDROP2	//  elector stored_seqno public_key restrict cs
       }>
     }>	//  elector stored_seqno public_key restrict cs
     NIP
@@ -131,6 +130,14 @@ PROGRAM{
     CTOS	//  _1
     32 PLDU	//  _3
   }>
+  get_public_key PROC:<{
+    // 
+    c4 PUSH	//  _1
+    CTOS	//  cs
+    32 LDU	//  _9 _8
+    NIP	//  cs
+    256 PLDU	//  _7
+  }>
   balance PROC:<{
     // 
     restricted? INLINECALLDICT	//  _0
diff --git a/submodules/ton/tonlib-src/crypto/smartcont/auto/restricted-wallet2-code.cpp b/submodules/ton/tonlib-src/crypto/smartcont/auto/restricted-wallet2-code.cpp
index a95ad749d2..dea7e2c94d 100644
--- a/submodules/ton/tonlib-src/crypto/smartcont/auto/restricted-wallet2-code.cpp
+++ b/submodules/ton/tonlib-src/crypto/smartcont/auto/restricted-wallet2-code.cpp
@@ -1 +1 @@
-with_tvm_code("restricted-wallet2", "te6ccgECDAEAAR0AART/APSkE/Sg8sgLAQIBIAIDAgFIBAUBAvIKAgLPBgcCASAICQADDCAAMyA8/gzIG6SMH+e+CMB0NcLH6GCAVGAqQTigABG+ZL9qJoa4WPwAf7y2B2omhAgJBrkPoCaMB5/BmQN0kYP898EYDoa4WP0MEAqMBUgnF8EzeIAUAIej230LfQmMv9ABhQuFsEyJhxQB/oMI1xgg0x/TH/gjErvyY+1E0NMf0//0BNFTQrryoQSOEjIzM/gAAaTIyx8Sy//0AMntVOEE+QFUEFT5EPKi+ACA8/gzIG6SMH+e+CMB0NcLH6GCAVGAqQTiIoAQ9HtvoW+hMZb6ADBy+wKRMOKTINdKltMH1AL7AOjRAqTIyx8LAA7L//QAye1U");
+with_tvm_code("restricted-wallet2", "te6ccgECCwEAAQgAART/APSkE/S88sgLAQIBIAIDAgFIBAUB+PKDCNcYINMf0x/4IxK78mPtRNDTH9P/9ATRU0K68qEEjhIyMzP4AAGkyMsfEsv/9ADJ7VThBPkBVBBU+RDyovgAgPP4MyBukjB/nvgjAdDXCx+hggFRgKkE4iKAEPR7b6UxlvoAMHL7ApEw4pMg10qW0wfUAvsA6NECpMgKAATQMAIBIAYHAgEgCAkAe7y2B2omhAgJBrkPoCaMB5/BmQN0kYP898EYDoa4WP0MEAqMBUgnF8E7eIAUAIej230pjL/QAYULhbBMiYcUABe7Oc7UTQ0x8x1wv/gAEbjJftRNDXCx+AASyx/L//QAye1U");
diff --git a/submodules/ton/tonlib-src/crypto/smartcont/auto/restricted-wallet2-code.fif b/submodules/ton/tonlib-src/crypto/smartcont/auto/restricted-wallet2-code.fif
index 112e8c6228..18ffda9b63 100644
--- a/submodules/ton/tonlib-src/crypto/smartcont/auto/restricted-wallet2-code.fif
+++ b/submodules/ton/tonlib-src/crypto/smartcont/auto/restricted-wallet2-code.fif
@@ -4,6 +4,7 @@ PROGRAM{
   DECLPROC days_passed
   DECLPROC recv_external
   85143 DECLMETHOD seqno
+  78748 DECLMETHOD get_public_key
   104128 DECLMETHOD balance
   recv_internal PROC:<{
     //  in_msg
@@ -74,8 +75,7 @@ PROGRAM{
     s2 PUSH
     16 PUSHINT	//  stored_seqno public_key rdict cs ts rdict _57=16
     DICTIGETPREVEQ
-    NULLSWAPIFNOT
-    NULLSWAPIFNOT	//  stored_seqno public_key rdict cs _98 _97 _99
+    NULLSWAPIFNOT2	//  stored_seqno public_key rdict cs _98 _97 _99
     NIP	//  stored_seqno public_key rdict cs value found
     IF:<{	//  stored_seqno public_key rdict cs value
       LDGRAMS	//  stored_seqno public_key rdict cs _101 _100
@@ -110,6 +110,14 @@ PROGRAM{
     CTOS	//  _1
     32 PLDU	//  _3
   }>
+  get_public_key PROC:<{
+    // 
+    c4 PUSH	//  _1
+    CTOS	//  cs
+    32 LDU	//  _9 _8
+    NIP	//  cs
+    256 PLDU	//  _7
+  }>
   balance PROC:<{
     // 
     c4 PUSH	//  _1
@@ -124,8 +132,7 @@ PROGRAM{
     s0 s2 XCHG
     16 PUSHINT	//  balance ts rdict _19=16
     DICTIGETPREVEQ
-    NULLSWAPIFNOT
-    NULLSWAPIFNOT	//  balance _29 _28 _30
+    NULLSWAPIFNOT2	//  balance _29 _28 _30
     NIP	//  balance value found
     IF:<{	//  balance value
       LDGRAMS	//  balance _32 _31
diff --git a/submodules/ton/tonlib-src/crypto/smartcont/auto/simple-wallet-code.cpp b/submodules/ton/tonlib-src/crypto/smartcont/auto/simple-wallet-code.cpp
index ea4603f0ae..1bffadf5b5 100644
--- a/submodules/ton/tonlib-src/crypto/smartcont/auto/simple-wallet-code.cpp
+++ b/submodules/ton/tonlib-src/crypto/smartcont/auto/simple-wallet-code.cpp
@@ -1 +1 @@
-with_tvm_code("simple-wallet", "te6ccgEBBAEATwABFP8A9KQT9KDyyAsBAgEgAgMABNIwAG7ygwjXGCDTH+1E0NMf0//RUTG68qED+QFUEEL5EPKi+ABRINdKltMH1AL7AN7RpMjLH8v/ye1U");
+with_tvm_code("simple-wallet", "te6ccgEBBAEATwABFP8A9KQT9LzyyAsBAgEgAgMABNIwAG7ygwjXGCDTH+1E0NMf0//RUTG68qED+QFUEEL5EPKi+ABRINdKltMH1AL7AN7RpMjLH8v/ye1U");
diff --git a/submodules/ton/tonlib-src/crypto/smartcont/auto/simple-wallet-ext-code.cpp b/submodules/ton/tonlib-src/crypto/smartcont/auto/simple-wallet-ext-code.cpp
index ad546b2894..3370e53e39 100644
--- a/submodules/ton/tonlib-src/crypto/smartcont/auto/simple-wallet-ext-code.cpp
+++ b/submodules/ton/tonlib-src/crypto/smartcont/auto/simple-wallet-ext-code.cpp
@@ -1 +1 @@
-with_tvm_code("simple-wallet-ext", "te6ccgEBFgEAzwABFP8A9KQT9KDyyAsBAgEgAgMCAUgEBQA08vACVDIS8AT4ACDXSpbTB9QC+wDe0aQB8AMCAs0GBwIBIA4PAgEgCAkAKdAUGEa4wQaY+CXXlQ/ICgCfyIeVFAIBIAoLAgEgDA0AAwwgAA8yBLLH8v/yYAARO1E0NMf0/8wgAAk8AHtVIAIBIBARAgEgFBUADbvtlwAfABgCASASEwARtZL9qJoa4WPwAA22l54AXgCQACG40BggFMl+1D2IIByODtQ9iAAVuI4MjLHxLLB8zJg=");
+with_tvm_code("simple-wallet-ext", "te6ccgEBGAEA3AABFP8A9KQT9LzyyAsBAgEgAgMCAUgEBQA08vACVDIS8AT4ACDXSpbTB9QC+wDe0aQB8AMCAs0GBwIBIA4PAgEgCAkAKdAUGEa4wQaY+CXXlQ/ICgCfyIeVFAIBIAoLAgEgDA0AAwwgAA8AcjLH8v/yYAARO1E0NMf0/8wgAAk8AHtVIAIBIBARAgEgFhcCAW4SEwIBIBQVAAutzngBGMAADa9suAD4AMAAEbWS/aiaGuFj8AANtpeeAF4AkAAhuNAYIBTJftQ9iCAcjg7UPYgAFbiODIyx8SywfMyY");
diff --git a/submodules/ton/tonlib-src/crypto/smartcont/auto/simple-wallet-ext-code.fif b/submodules/ton/tonlib-src/crypto/smartcont/auto/simple-wallet-ext-code.fif
index b403131e07..b7975e9480 100644
--- a/submodules/ton/tonlib-src/crypto/smartcont/auto/simple-wallet-ext-code.fif
+++ b/submodules/ton/tonlib-src/crypto/smartcont/auto/simple-wallet-ext-code.fif
@@ -7,14 +7,15 @@ PROGRAM{
   DECLPROC do_verify_message
   DECLPROC recv_external
   85143 DECLMETHOD seqno
+  78748 DECLMETHOD get_public_key
   81625 DECLMETHOD create_init_state
   116960 DECLMETHOD prepare_send_message_with_seqno
   101633 DECLMETHOD prepare_send_message
   95420 DECLMETHOD verify_message
   create_state PROC:<{
     //  seqno public_key
-    NEWC	//  seqno public_key _2
-    s1 s2 XCHG	//  public_key seqno _2
+    SWAP
+    NEWC	//  public_key seqno _2
     32 STU	//  public_key _4
     256 STU	//  _6
     ENDC	//  _7
@@ -76,6 +77,11 @@ PROGRAM{
     CTOS	//  _1
     32 PLDU	//  _3
   }>
+  get_public_key PROC:<{
+    // 
+    load_state CALLDICT	//  _3 _4
+    NIP	//  public_key
+  }>
   create_init_state PROC:<{
     //  public_key
     0 PUSHINT	//  public_key _1=0
diff --git a/submodules/ton/tonlib-src/crypto/smartcont/auto/wallet-code.cpp b/submodules/ton/tonlib-src/crypto/smartcont/auto/wallet-code.cpp
index 52fefeeb07..b706359e4f 100644
--- a/submodules/ton/tonlib-src/crypto/smartcont/auto/wallet-code.cpp
+++ b/submodules/ton/tonlib-src/crypto/smartcont/auto/wallet-code.cpp
@@ -1 +1 @@
-with_tvm_code("wallet", "te6ccgEBBgEAaAABFP8A9KQT9KDyyAsBAgEgAgMCAUgEBQCA8oMI1xgg0x/TH/gjErvyY+1E0NMf0//RUTG68qED+QFUEEL5EPKi+AACkyDXSpbTB9QC+wDo0aTIyx/L/8ntVAAE0DAAEaCZL9qJoa4WPw==");
+with_tvm_code("wallet", "te6ccgEBCAEAewABFP8A9KQT9LzyyAsBAgEgAgMCAUgEBQCA8oMI1xgg0x/TH/gjErvyY+1E0NMf0//RUTG68qED+QFUEEL5EPKi+AACkyDXSpbTB9QC+wDo0aTIyx/L/8ntVAAE0DACAUgGBwAXuznO1E0NMfMdcL/4ABG4yX7UTQ1wsfg=");
diff --git a/submodules/ton/tonlib-src/crypto/smartcont/auto/wallet-code.fif b/submodules/ton/tonlib-src/crypto/smartcont/auto/wallet-code.fif
index cd9fa5d0f8..4aa0cc0877 100644
--- a/submodules/ton/tonlib-src/crypto/smartcont/auto/wallet-code.fif
+++ b/submodules/ton/tonlib-src/crypto/smartcont/auto/wallet-code.fif
@@ -3,6 +3,7 @@ PROGRAM{
   DECLPROC recv_internal
   DECLPROC recv_external
   85143 DECLMETHOD seqno
+  78748 DECLMETHOD get_public_key
   recv_internal PROC:<{
     //  in_msg
     DROP	// 
@@ -56,4 +57,12 @@ PROGRAM{
     CTOS	//  _1
     32 PLDU	//  _3
   }>
+  get_public_key PROC:<{
+    // 
+    c4 PUSH	//  _1
+    CTOS	//  cs
+    32 LDU	//  _9 _8
+    NIP	//  cs
+    256 PLDU	//  _7
+  }>
 }END>c
diff --git a/submodules/ton/tonlib-src/crypto/smartcont/auto/wallet3-code.cpp b/submodules/ton/tonlib-src/crypto/smartcont/auto/wallet3-code.cpp
index 90e47b54d1..e5f46f8820 100644
--- a/submodules/ton/tonlib-src/crypto/smartcont/auto/wallet3-code.cpp
+++ b/submodules/ton/tonlib-src/crypto/smartcont/auto/wallet3-code.cpp
@@ -1 +1 @@
-with_tvm_code("wallet3", "te6ccgEBBgEAcwABFP8A9KQT9KDyyAsBAgEgAgMCAUgEBQCW8oMI1xgg0x/TH9Mf+CMTu/Jj7UTQ0x/TH9P/0VEyuvKhUUS68qIE+QFUEFX5EPKj+ACTINdKltMH1AL7AOgwAaTIyx/LH8v/ye1UAATQMAARoJkv2omhrhY/");
+with_tvm_code("wallet3", "te6ccgEBCAEAhgABFP8A9KQT9LzyyAsBAgEgAgMCAUgEBQCW8oMI1xgg0x/TH9Mf+CMTu/Jj7UTQ0x/TH9P/0VEyuvKhUUS68qIE+QFUEFX5EPKj+ACTINdKltMH1AL7AOgwAaTIyx/LH8v/ye1UAATQMAIBSAYHABe7Oc7UTQ0z8x1wv/gAEbjJftRNDXCx+A==");
diff --git a/submodules/ton/tonlib-src/crypto/smartcont/auto/wallet3-code.fif b/submodules/ton/tonlib-src/crypto/smartcont/auto/wallet3-code.fif
index b0b45d7516..d539f3bad8 100644
--- a/submodules/ton/tonlib-src/crypto/smartcont/auto/wallet3-code.fif
+++ b/submodules/ton/tonlib-src/crypto/smartcont/auto/wallet3-code.fif
@@ -3,6 +3,7 @@ PROGRAM{
   DECLPROC recv_internal
   DECLPROC recv_external
   85143 DECLMETHOD seqno
+  78748 DECLMETHOD get_public_key
   recv_internal PROC:<{
     //  in_msg
     DROP	// 
@@ -62,4 +63,12 @@ PROGRAM{
     CTOS	//  _1
     32 PLDU	//  _3
   }>
+  get_public_key PROC:<{
+    // 
+    c4 PUSH	//  _1
+    CTOS	//  cs
+    64 LDU	//  _9 _8
+    NIP	//  cs
+    256 PLDU	//  _7
+  }>
 }END>c
diff --git a/submodules/ton/tonlib-src/crypto/smartcont/config-code.fc b/submodules/ton/tonlib-src/crypto/smartcont/config-code.fc
index 3a897d4cd0..15c87b3833 100644
--- a/submodules/ton/tonlib-src/crypto/smartcont/config-code.fc
+++ b/submodules/ton/tonlib-src/crypto/smartcont/config-code.fc
@@ -9,10 +9,9 @@
 
 (cell, int, int, cell) load_data() inline {
   var cs = get_data().begin_parse();
-  var (cfg_dict, stored_seqno, public_key) = (cs~load_ref(), cs~load_uint(32), cs~load_uint(256));
-  var vote_dict = cs.slice_empty?() ? new_dict() : cs~load_dict(); 
+  var res = (cs~load_ref(), cs~load_uint(32), cs~load_uint(256), cs~load_dict());
   cs.end_parse();
-  return (cfg_dict, stored_seqno, public_key, vote_dict);
+  return res;
 }
 
 () store_data(cfg_dict, stored_seqno, public_key, vote_dict) impure inline {
@@ -26,7 +25,7 @@
 
 (int, int) check_validator_set(cell vset) {
   var cs = vset.begin_parse();
-  throw_if(9, (cs~load_uint(8) - 0x11) & -2);  ;; validators#11 or validators_ext#12
+  throw_unless(9, cs~load_uint(8) == 0x12);  ;; validators_ext#12 only
   int utime_since = cs~load_uint(32);
   int utime_until = cs~load_uint(32);
   int total = cs~load_uint(16);
@@ -103,7 +102,7 @@
   .end_cell(), 0);
 }
 
-() after_code_upgrade(slice param, cell old_code) impure method_id(1666) {
+() after_code_upgrade(slice param, cont old_code) impure method_id(1666) {
 }
 
 _ perform_action(cfg_dict, public_key, action, cs) {
@@ -119,7 +118,7 @@ _ perform_action(cfg_dict, public_key, action, cs) {
     var new_code = cs~load_ref();
     set_code(new_code);
     var old_code = get_c3();
-    set_c3(new_code);
+    set_c3(new_code.begin_parse().bless());
     after_code_upgrade(cs, old_code);
     throw(0);
     return (cfg_dict, public_key);
@@ -138,16 +137,21 @@ _ perform_action(cfg_dict, public_key, action, cs) {
   }
 }
 
-slice get_validator_descr(int idx) inline_ref {
+(slice, int) get_validator_descr(int idx) inline_ref {
   var vset = config_param(34);
   if (vset.null?()) {
-    return null();
+    return (null(), 0);
   }
   var cs = begin_parse(vset);
-  cs~skip_bits(8 + 32 + 32 + 16 + 16);
+  ;; validators_ext#12 utime_since:uint32 utime_until:uint32 
+  ;; total:(## 16) main:(## 16) { main <= total } { main >= 1 } 
+  ;; total_weight:uint64
+  throw_unless(40, cs~load_uint(8) == 0x12);
+  cs~skip_bits(32 + 32 + 16 + 16);
+  int total_weight = cs~load_uint(64);
   var dict = begin_cell().store_slice(cs).end_cell();
   var (value, _) = dict.udict_get?(16, idx);
-  return value;
+  return (value, total_weight);
 }
 
 (int, int) unpack_validator_descr(slice cs) inline {
@@ -159,33 +163,51 @@ slice get_validator_descr(int idx) inline_ref {
   return (cs~load_uint(256), cs~load_uint(64));
 }
 
-slice create_new_entry(cs) inline {
-  return begin_cell().store_int(false, 1).store_uint(0, 64).store_uint(0, 256).store_slice(cs).end_cell().begin_parse();
+(cell, int, int, slice) new_proposal(cs) inline {
+  return (null(), 0, 0, cs);
 }
 
-(cell, int, int, slice) unpack_suggestion(slice cs) inline {
+(cell, int, int, slice) unpack_proposal(slice cs) inline {
   return (cs~load_dict(), cs~load_uint(64), cs~load_uint(256), cs);
 }
 
-builder pack_suggestion(cell voters, int sum_weight, int vset_id, slice body) inline {
+builder pack_proposal(cell voters, int sum_weight, int vset_id, slice body) inline {
   return begin_cell().store_dict(voters).store_uint(sum_weight, 64).store_uint(vset_id, 256).store_slice(body);
 }
 
-cell register_vote(vote_dict, action, cs, idx, weight) {
+(cell, slice) register_vote(vote_dict, action, cs, idx, weight, total_weight, cur_vset_id) {
   int hash = 0;
+  int found? = 0;
   var entry = null();
   if (action & 1) {
     hash = slice_hash(cs);
-    (entry, var found?) = vote_dict.udict_get?(256, hash);
-    ifnot (found?) {
-      entry = create_new_entry(cs);
-    }
+    (entry, found?) = vote_dict.udict_get?(256, hash);
   } else {
     hash = cs.preload_uint(256);
-    (entry, var found?) = vote_dict.udict_get?(256, hash);
+    (entry, found?) = vote_dict.udict_get?(256, hash);
     throw_unless(42, found?);
   }
-  return vote_dict;
+  var (voters, sum_weight, vset_id, body) = found? ? unpack_proposal(entry) : (null(), 0, cur_vset_id, cs);
+  if (vset_id != cur_vset_id) {
+    voters = null();
+    sum_weight = 0;
+    vset_id = cur_vset_id;
+  }
+  var (_, found?) = voters.udict_get?(16, idx);
+  ifnot (found?) {
+    voters~udict_set_builder(16, idx, begin_cell().store_uint(32, now()));
+    sum_weight += weight;
+    if (sum_weight * 3 > total_weight * 2) {
+      ;; proposal accepted
+      vote_dict~udict_delete?(256, hash);
+      return (vote_dict, body);
+    } else {
+      vote_dict~udict_set_builder(256, hash, pack_proposal(voters, sum_weight, cur_vset_id, body));
+      return (vote_dict, null());
+    }
+  } else {
+    return (vote_dict, null());
+  }
 }
 
 () recv_external(slice in_msg) impure {
@@ -199,15 +221,19 @@ cell register_vote(vote_dict, action, cs, idx, weight) {
   throw_unless(33, msg_seqno == stored_seqno);
   ifnot ((action - 0x566f7465) & -2) {
     var idx = cs~load_uint(16);
-    var vdescr = get_validator_descr(idx);
+    var (vdescr, total_weight) = get_validator_descr(idx);
     var (val_pubkey, weight) = unpack_validator_descr(vdescr);
     throw_unless(34, check_signature(slice_hash(in_msg), signature, val_pubkey));
     accept_message();
     stored_seqno += 1;
     store_data(cfg_dict, stored_seqno, public_key, vote_dict);
     commit();
-    vote_dict = register_vote(vote_dict, action, cs, idx, weight);
+    (vote_dict, var accepted) = register_vote(vote_dict, action, cs, idx, weight, total_weight, config_param(34).cell_hash());
     store_data(cfg_dict, stored_seqno, public_key, vote_dict);
+    ifnot (accepted.null?()) {
+      (cfg_dict, public_key) = perform_action(cfg_dict, public_key, accepted~load_uint(32), accepted);
+      store_data(cfg_dict, stored_seqno, public_key, vote_dict);
+    }
     return ();
   }
   throw_unless(34, check_signature(slice_hash(in_msg), signature, public_key));
@@ -231,7 +257,7 @@ cell register_vote(vote_dict, action, cs, idx, weight) {
     if (ds.slice_bits() >= 40) {
       var tag = ds~load_uint(8);
       var since = ds.preload_uint(32);
-      if ((tag == 0x11) & (since >= now())) {
+      if ((since <= now()) & (tag == 0x12)) {
         ;; next validator set becomes active!
         var cur_vset = cfg_dict~idict_set_get_ref(kl, 34, next_vset);  ;; next_vset -> cur_vset
         cfg_dict~idict_set_get_ref(kl, 32, cur_vset);   ;; cur_vset -> prev_vset
@@ -241,3 +267,7 @@ cell register_vote(vote_dict, action, cs, idx, weight) {
   }
   set_data(begin_cell().store_ref(cfg_dict).store_slice(cs).end_cell());
 }
+
+int seqno() impure method_id {
+  return get_data().begin_parse().preload_uint(32);
+}
diff --git a/submodules/ton/tonlib-src/crypto/smartcont/dns-auto-code.fc b/submodules/ton/tonlib-src/crypto/smartcont/dns-auto-code.fc
new file mode 100644
index 0000000000..e548a70a07
--- /dev/null
+++ b/submodules/ton/tonlib-src/crypto/smartcont/dns-auto-code.fc
@@ -0,0 +1,514 @@
+{-
+  Adapted from original version written by:
+  /------------------------------------------------------------------------\
+  | Created for: Telegram (Open Network) Blockchain Contest                |
+  |      Task 2: DNS Resolver (Automatically registering)                  |
+  >------------------------------------------------------------------------<
+  | Author: Oleksandr Murzin (tg: @skydev / em: alexhacker64@gmail.com)    |
+  |         October 2019                                                   |
+  \------------------------------------------------------------------------/
+-}
+
+;;===========================================================================;;
+;; Utility functions                                                         ;;
+;;===========================================================================;;
+
+{-
+  Data structure:
+  Root cell: [OptRef<1b+1r?>:Hashmap<PfxDict:Slice->UInt<32b>,CatTable>:domains]
+         [OptRef<1b+1r?>:Hashmap<UInt<160b>(Time|Hash128)->Slice(DomName)>:gc]
+         [UInt<32b>:stdperiod] [Gram:PPReg] [Gram:PPCell] [Gram:PPBit]
+         [UInt<32b>:lasthousekeeping] 
+  <CatTable> := HashmapE 16 ^DNSRecord
+  
+  STORED DOMAIN NAME SLICE FORMAT: (#ZeroChars<7b>) (Domain name value)
+  #Zeros allows to simultaneously store, for example, com\0 and com\0google\0
+  That will be stored as \1com\0 and \2com\0google\0 (pfx tree has restricitons)
+  This will allow to resolve more specific requests to subdomains, and resort
+      to parent domain next resolver lookup if subdomain is not found
+  com\0goo\0 lookup will, for example look up \2com\0goo\0 and then
+      \1com\0goo\0 which will return \1com\0 (as per pfx tree) with -1 cat
+-}
+
+(cell, cell, cell, [int, int, int, int], int, int) load_data() inline_ref {
+  slice cs = get_data().begin_parse();
+  return (
+    cs~load_ref(),        ;; control data
+    cs~load_dict(),       ;; pfx tree: domains data and exp
+    cs~load_dict(),       ;; gc auxillary with expiration and 128-bit hash slice
+    [ cs~load_uint(30),   ;; length of this period of time in seconds
+      cs~load_grams(),    ;; standard payment for registering a new subdomain
+      cs~load_grams(),    ;; price paid for each cell (PPC)
+      cs~load_grams() ],  ;;                 and bit  (PPB)
+    cs~load_uint(32),     ;; next housekeeping to be done at
+    cs~load_uint(32)      ;; last housekeeping done at
+  );
+}
+
+(int, int, int, int) load_prices() inline_ref {
+  slice cs = get_data().begin_parse();
+  (cs~load_ref(), cs~load_dict(), cs~load_dict());
+  return (cs~load_uint(30), cs~load_grams(), cs~load_grams(), cs~load_grams());
+}
+
+() store_data(cell ctl, cell dd, cell gc, prices, int nhk, int lhk) impure {
+  var [sp, ppr, ppc, ppb] = prices;
+  set_data(begin_cell()
+      .store_ref(ctl) ;; control data
+      .store_dict(dd) ;; domains data and exp
+      .store_dict(gc) ;; keyed expiration time and 128-bit hash slice
+      .store_uint(sp, 30) ;; standard period
+      .store_grams(ppr) ;; price per registration
+      .store_grams(ppc) ;; price per cell
+      .store_grams(ppb) ;; price per bit
+      .store_uint(nhk, 32) ;; next housekeeping
+      .store_uint(lhk, 32) ;; last housekeeping
+      .end_cell());
+}
+
+global var query_info;
+
+() send_message(slice addr, int tag,   int query_id, 
+                int   body, int grams, int mode) impure {
+  ;; int_msg_info$0 ihr_disabled:Bool bounce:Bool bounced:Bool 
+  ;;                src:MsgAddress -> 011000 0x18
+  var msg = begin_cell()
+    .store_uint (0x18, 6)
+    .store_slice(addr)
+    .store_grams(grams)
+    .store_uint (0, 1 + 4 + 4 + 64 + 32 + 1 + 1)
+    .store_uint (tag, 32)
+    .store_uint (query_id, 64);
+  if (body >= 0) {
+    msg~store_uint(body, 32);
+  }
+  send_raw_message(msg.end_cell(), mode);
+}
+
+() send_error(int error_code) impure {
+  var (addr, query_id, op) = query_info;
+  return send_message(addr, error_code, query_id, op, 0, 64);
+}
+
+() send_ok(int price) impure {
+  raw_reserve(price, 4);
+  var (addr, query_id, op) = query_info;
+  return send_message(addr, 0xef6b6179, query_id, op, 0, 128);
+}
+
+() housekeeping(cell ctl, cell dd, cell gc, prices, int nhk, int lhk, int max_steps) impure {
+  int n = now();
+  if (n < max(nhk, lhk + 60)) { ;; housekeeping cooldown: 1 minute
+    ;; if housekeeping was done recently, or if next housekeeping is in the future, just save
+    return store_data(ctl, dd, gc, prices, nhk, lhk);
+  }
+  ;; need to do some housekeeping - maybe remove entry with
+  ;;     least expiration but only if it is already expired
+  ;; no iterating and deleting all to not put too much gas gc
+  ;;     burden on any random specific user request
+  ;; over time it will do the garbage collection required
+  (int mkey, _, int found?) = gc.udict_get_min?(256);
+  while (found? & max_steps) { ;; no short circuit optimization, two nested ifs
+    nhk = (mkey >> (256 - 32));
+    if (nhk < n) {
+      int key = mkey % (1 << (256 - 32));
+      (slice val, found?) = dd.udict_get?(256 - 32, key);
+      if (found?) {
+        int exp = val.preload_uint(32);
+        if (exp <= n) {
+          dd~udict_delete?(256 - 32, key);
+        }
+      }
+      gc~udict_delete?(256, mkey);
+      (mkey, _, found?) = gc.udict_get_min?(256);
+      nhk = (found? ? mkey >> (256 - 32) : 0xffffffff);
+      max_steps -= 1;
+    } else {
+      found? = false;
+    }
+  }
+  store_data(ctl, dd, gc, prices, nhk, n);
+}
+
+int calcprice_internal(slice domain, cell data, ppc, ppb) inline_ref { ;; only for internal calcs
+  var (_, bits, refs) = compute_data_size(data, 100);  ;; 100 cells max
+  bits += slice_bits(domain) * 2 + (128 + 32 + 32);
+  return ppc * (refs + 2) + ppb * bits;
+}
+
+int check_owner(cell cat_table, cell owner_info, int src_wc, int src_addr, int strict) inline_ref {
+  if (strict & cat_table.null?()) { ;; domain not found: return notf | 2^31
+    return 0xee6f7466;
+  }
+  if (owner_info.null?()) { ;; no owner on this domain: no-2 (in strict mode), ok else
+    return strict & 0xee6f2d32;
+  }
+  var ERR_BAD2 = 0xe2616432;
+  slice sown = owner_info.begin_parse();
+  if (sown.slice_bits() < 16 + 3 + 8 + 256) { ;; bad owner record: bad2
+    return ERR_BAD2;
+  }
+  if (sown~load_uint(16 + 3) != 0x9fd3 * 8 + 4) {
+    return ERR_BAD2;
+  }
+  (int owner_wc, int owner_addr) = (sown~load_int(8), sown.preload_uint(256));
+  if ((owner_wc != src_wc) | (owner_addr != src_addr)) { ;; not owner: nown
+    return 0xee6f776e;
+  }
+  return 0;  ;; ok
+}
+
+;;===========================================================================;;
+;; Internal message handler (Code 0)                                         ;;
+;;===========================================================================;;
+
+{-
+  Internal message cell structure:
+                   8             4           2            1
+    int_msg_info$0 ihr_disabled:Bool bounce:Bool bounced:Bool
+    src:MsgAddressInt dest:MsgAddressInt
+    value:CurrencyCollection ihr_fee:Grams fwd_fee:Grams
+    created_lt:uint64 created_at:uint32  
+  Internal message data structure:
+    [UInt<32b>:op] [UInt<64b>:query_id] [Ref<1r>:domain] 
+    (if not prolong: [Ref<1r>:value->CatTable])
+    
+-}
+
+;; Control operations: permitted only to the owner of this smartcontract
+() perform_ctl_op(int op, int src_wc, int src_addr, slice in_msg) impure inline_ref {
+  var (ctl, domdata, gc, prices, nhk, lhk) = load_data();
+  var cs = ctl.begin_parse();
+  if ((cs~load_int(8) != src_wc) | (cs~load_uint(256) != src_addr)) {
+    return send_error(0xee6f776e);
+  }
+  if (op == 0x43685072) {  ;; ChPr = Change Prices
+    var (stdper, ppr, ppc, ppb) = (in_msg~load_uint(32), in_msg~load_grams(), in_msg~load_grams(), in_msg~load_grams());
+    in_msg.end_parse();
+    ;; NB: stdper == 0 -> disable new actions
+    store_data(ctl, domdata, gc, [stdper, ppr, ppc, ppb], nhk, lhk);
+    return send_ok(0);
+  }
+  if (op == 0x4344656c) {  ;; CDel = destroy smart contract
+    ifnot (domdata.null?()) {
+      ;; domain dictionary not empty, force gc
+      housekeeping(ctl, domdata, gc, prices, nhk, 1, -1);
+    }
+    (ctl, domdata, gc, prices, nhk, lhk) = load_data();
+    ifnot (domdata.null?()) {
+      ;; domain dictionary still not empty, error
+      return send_error(0xee74656d);
+    }
+    var (addr, query_id, op) = query_info;
+    return send_message(addr, 0xef6b6179, query_id, op, 0, 128 + 32);
+  }
+  return send_error(0xffffffff);
+}
+
+;; Must send at least GR$1 more for possible gas fees!
+() recv_internal(int msg_value, cell in_msg_cell, slice in_msg) impure {
+  ;; this time very interested in internal messages
+  if (in_msg.slice_bits() < 32) { 
+    return ();  ;; simple transfer or short
+  }
+  slice cs = in_msg_cell.begin_parse();
+  int flags = cs~load_uint(4);
+  if (flags & 1) { 
+    return ();  ;; bounced messages
+  }
+  slice s_addr = cs~load_msg_addr();
+  (int src_wc, int src_addr) = s_addr.parse_std_addr();
+  int op = in_msg~load_uint(32);
+  ifnot (op) { 
+    return ();   ;; simple transfer with comment
+  }
+  int query_id = 0;
+  if (in_msg.slice_bits() >= 64) { 
+    query_id = in_msg~load_uint(64);
+  }
+  
+  query_info = (s_addr, query_id, op);
+  
+  if (op & (1 << 31)) {
+    return ();   ;; an answer to our query
+  }
+  if ((op >> 24) == 0x43) {
+    ;; Control operations
+    return perform_ctl_op(op, src_wc, src_addr, in_msg);
+  }
+  
+  int qt = (op == 0x72656764) * 1 + (op == 0x70726f6c) * 2 + (op == 0x75706464) * 4 + (op == 0x676f6763) * 8;
+  ifnot (qt) { ;; unknown query, return error
+    return send_error(0xffffffff);
+  }
+  qt = - qt;
+  
+  (cell ctl, cell domdata, cell gc, [int, int, int, int] prices, int nhk, int lhk) = load_data();
+  
+  if (qt == 8) { ;; 0x676f6763 -> GO, GC! go!!!
+    ;; Manual garbage collection iteration
+    int max_steps = in_msg~load_int(32);   ;; -1 = infty
+    housekeeping(ctl, domdata, gc, prices, nhk, 1, max_steps); ;; forced
+    return send_error(0xef6b6179);
+  }
+
+  slice domain = null();
+  cell domain_cell = in_msg~load_maybe_ref();
+  int fail = 0;
+  if (domain_cell.null?()) {
+    int bytes = in_msg~load_uint(6);
+    fail = (bytes == 0);
+    domain = in_msg~load_bits(bytes * 8);
+  } else {
+    domain = domain_cell.begin_parse();
+    var (bits, refs) = slice_bits_refs(domain);
+    fail = (refs | ((bits - 8) & (7 - 128)));
+  }
+
+  ifnot (fail) {
+    ;; domain must end with \0! no\0 error
+    fail = domain.slice_last(8).preload_uint(8);
+  }
+  if (fail) {
+    return send_error(0xee6f5c30);
+  }
+    
+  int n = now();
+  cell cat_table = cell owner_info = null();
+  int key = int exp = int zeros = 0;
+  slice tail = domain;
+  repeat (tail.slice_bits() ^>> 3) {
+    cat_table = null();
+    int z = (tail~load_uint(8) == 0);
+    zeros -= z;
+    if (z) {
+      key = (string_hash(domain.skip_last_bits(tail.slice_bits())) >> 32);
+      var (val, found?) = domdata.udict_get?(256 - 32, key);
+      if (found?) {
+        exp = val~load_uint(32);
+        if (exp >= n) {  ;; entry not expired
+          cell cat_table = val~load_ref();
+          val.end_parse();
+          var (cown, ok) = cat_table.idict_get_ref?(16, -2);
+          if (ok) {
+            owner_info = cown;
+          }
+        }
+      }
+    }
+  }
+  
+  if (zeros > 4) { ;; too much zero chars (overflow): ov\0
+    return send_error(0xef765c30);
+  }
+
+  ;; ##########################################################################
+  
+  int err = check_owner(cat_table, owner_info, src_wc, src_addr, qt != 1);
+  if (err) {
+    return send_error(err);
+  }
+
+  ;; ##########################################################################
+  
+  ;; load desired data (reuse old for a "prolong" operation)
+  cell data = null();
+  
+  if (qt != 2) {  ;; not a "prolong", load data dictionary
+    data = in_msg~load_ref();
+    ;; basic integrity check of (client-provided) dictionary
+    ifnot (data.dict_empty?()) { ;; 1000 gas!
+      var (oinfo, ok) = data.idict_get_ref?(16, -2);
+      if (ok) {
+        var cs = oinfo.begin_parse();
+        throw_unless(31, cs.slice_bits() >= 16 + 3 + 8 + 256);
+        throw_unless(31, cs.preload_uint(19) == 0x9fd3 * 8 + 4);
+      }
+      (_, _, int minok) = data.idict_get_min?(16);
+      (_, _, int maxok) = data.idict_get_max?(16);
+      throw_unless(31, minok & maxok);
+    }
+  } else {
+    data = cat_table;
+  }
+
+  ;; load prices
+  var [stdper, ppr, ppc, ppb] = prices;
+  ifnot (stdper) {  ;; smart contract disabled by owner, no new actions
+    return send_error(0xd34f4646);
+  }
+
+  ;; compute action price
+  int price = calcprice_internal(domain, data, ppc, ppb) + (ppr & (qt != 4));
+  if (msg_value - (1 << 30) < price) { ;; gr<p: grams - GR$1 < price
+    return send_error(0xe7723c70);
+  }
+  
+  ;; load desired expiration unixtime
+  int req_expires_at = in_msg~load_uint(32);
+
+  ;; ##########################################################################
+  if (qt == 2) { ;; 0x70726f6c -> prol | prolong domain
+    if (exp > n + stdper) {  ;; does not expire soon, cannot prolong
+      return send_error(0xf365726f);
+    }
+    domdata~udict_set_builder(256 - 32, key, begin_cell().store_uint(exp + stdper, 32).store_ref(data));
+
+    int gckeyO = (exp << (256 - 32)) + key;
+    int gckeyN = gckeyO + (stdper << (256 - 32));
+    gc~udict_delete?(256, gckeyO); ;; delete old gc entry, add new
+    gc~udict_set_builder(256, gckeyN, begin_cell());
+    
+    housekeeping(ctl, domdata, gc, prices, nhk, lhk, 1);
+    return send_ok(price);
+  }
+  
+  ;; ##########################################################################
+  if (qt == 1) { ;; 0x72656764 -> regd | register domain
+    ifnot (cat_table.null?()) { ;; domain already exists: return alre | 2^31
+      return send_error(0xe16c7265);
+    }
+    int expires_at = n + stdper;
+    domdata~udict_set_builder(256 - 32, key, begin_cell().store_uint(expires_at, 32).store_ref(data));
+
+    int gckey = (expires_at << (256 - 32)) | key;
+    gc~udict_set_builder(256, gckey, begin_cell());
+
+    housekeeping(ctl, domdata, gc, prices, min(nhk, expires_at), lhk, 1);
+    return send_ok(price);
+  }
+
+  ;; ##########################################################################
+  if (qt == 4) { ;; 0x75706464 -> updd | update domain (data)
+    domdata~udict_set_builder(256 - 32, key, begin_cell().store_uint(exp, 32).store_ref(data));
+    housekeeping(ctl, domdata, gc, prices, nhk, lhk, 1);
+    return send_ok(price);
+  }
+  ;; ##########################################################################
+  
+  return (); ;; should NEVER reach this part of code!
+}
+
+;;===========================================================================;;
+;; External message handler (Code -1)                                        ;;
+;;===========================================================================;;
+
+() recv_external(slice in_msg) impure {
+  ;; only for initialization
+  (cell ctl, cell dd, cell gc, var prices, int nhk, int lhk) = load_data();
+  ifnot (lhk) {
+    accept_message();
+    return store_data(ctl, dd, gc, prices, 0xffffffff, now());
+  }
+}
+
+;;===========================================================================;;
+;; Getter methods                                                            ;;
+;;===========================================================================;;
+
+(int, cell, int, slice) dnsdictlookup(slice domain, int nowtime) inline_ref {
+  (int bits, int refs) = domain.slice_bits_refs();
+  throw_if(30, refs | (bits & 7)); ;; malformed input (~ 8n-bit)
+  ifnot (bits) {
+    return (0, null(), 0, null());  ;; zero-length input
+  }
+
+  int domain_last_byte = domain.slice_last(8).preload_uint(8);
+  if (domain_last_byte) {
+    domain = begin_cell().store_slice(domain) ;; append zero byte
+                         .store_uint(0, 8).end_cell().begin_parse();
+    bits += 8;
+  }
+  if (bits == 8) {
+    return (0, null(), 0, null()); ;; zero-length input, but with zero byte
+  }
+  var ds = get_data().begin_parse();
+  (_, cell root) = (ds~load_ref(), ds~load_dict());
+  
+  slice val = null();
+  int tail_bits = -1;
+  slice tail = domain;
+
+  repeat (bits >> 3) {
+    if (tail~load_uint(8) == 0) {
+      var key = (string_hash(domain.skip_last_bits(tail.slice_bits())) >> 32);
+      var (v, found?) = root.udict_get?(256 - 32, key);
+      if (found?) {
+        if (v.preload_uint(32) >= nowtime) {  ;; entry not expired
+          val = v;
+          tail_bits = tail.slice_bits();
+        }
+      }
+    }
+  }
+
+  if (val.null?()) {
+    return (0, null(), 0, null()); ;; failed to find entry in subdomain dictionary
+  }
+
+  return (val~load_uint(32), val~load_ref(), tail_bits == 0, domain.skip_last_bits(tail_bits));
+}
+
+;;8m  dns-record-value
+(int, cell) dnsresolve(slice domain, int category) method_id {
+  (int exp, cell cat_table, int exact?, slice pfx) = dnsdictlookup(domain, now());
+  ifnot (exp) {
+    return (0, null());
+  }
+  ifnot (exact?) { ;; incomplete subdomain found, must return next resolver (-1)
+    category = -1;
+  }
+  
+  int pfx_bits = pfx.slice_bits();
+  
+  ;; pfx.slice_bits() will contain 8m, where m is number of bytes in subdomain 
+  ;;   COUNTING the zero byte (if structurally correct: no multiple-ZB keys)
+  ;;   which corresponds to 8m, m=one plus the number of bytes in the subdomain found)
+  ifnot (category) {
+    return (pfx_bits, cat_table); ;; return cell with entire dictionary for 0
+  } else {
+    cell cat_found = cat_table.idict_get_ref(16, category);
+    return (pfx_bits, cat_found);
+  }
+}
+
+;; getexpiration needs to know the current time to skip any possible expired
+;;     subdomains in the chain. it will return 0 if not found or expired.
+int getexpirationx(slice domain, int nowtime) inline method_id {
+  (int exp, _, _, _) = dnsdictlookup(domain, nowtime);
+  return exp;
+}
+
+int getexpiration(slice domain) method_id {
+  return getexpirationx(domain, now());
+}
+
+int getstdperiod() method_id {
+  (int stdper, _, _, _) = load_prices();
+  return stdper;
+}
+
+int getppr() method_id {
+  (_, int ppr, _, _) = load_prices();
+  return ppr;
+}
+
+int getppc() method_id {
+  (_, _, int ppc, _) = load_prices();
+  return ppc;
+}
+
+int getppb() method_id {
+  ( _, _, _, int ppb) = load_prices();
+  return ppb;
+}
+
+int calcprice(slice domain, cell val) method_id { ;; only for external gets (not efficient)
+  (_, _, int ppc, int ppb) = load_prices();
+  return calcprice_internal(domain, val, ppc, ppb);
+}
+
+int calcregprice(slice domain, cell val) method_id { ;; only for external gets (not efficient)
+  (_, int ppr, int ppc, int ppb) = load_prices();
+  return ppr + calcprice_internal(domain, val, ppc, ppb);
+}
diff --git a/submodules/ton/tonlib-src/crypto/smartcont/dns-manual-code.fc b/submodules/ton/tonlib-src/crypto/smartcont/dns-manual-code.fc
new file mode 100644
index 0000000000..890d5d86fa
--- /dev/null
+++ b/submodules/ton/tonlib-src/crypto/smartcont/dns-manual-code.fc
@@ -0,0 +1,348 @@
+{-
+  Originally created by:
+  /------------------------------------------------------------------------\
+  | Created for: Telegram (Open Network) Blockchain Contest                |
+  |      Task 3: DNS Resolver (Manually controlled)                        |
+  >------------------------------------------------------------------------<
+  | Author: Oleksandr Murzin (tg: @skydev / em: alexhacker64@gmail.com)    |
+  |         October 2019                                                   |
+  \------------------------------------------------------------------------/
+-}
+
+;;===========================================================================;;
+;; Custom ASM instructions                                                   ;;
+;;===========================================================================;;
+
+(cell, ()) pfxdict_set_ref(cell dict, int key_len, slice key, cell value) {
+  throw_unless(33, dict~pfxdict_set?(key_len, key, begin_cell().store_maybe_ref(value).end_cell().begin_parse()));
+  return (dict, ());
+}
+
+(slice, cell, slice, int) pfxdict_get_ref(cell dict, int key_len, slice key) inline_ref {
+  (slice pfx, slice val, slice tail, int succ) = dict.pfxdict_get?(key_len, key);
+  cell res = succ ? val~load_maybe_ref() : null();
+  return (pfx, res, tail, succ);
+}
+
+;;===========================================================================;;
+;; Utility functions                                                         ;;
+;;===========================================================================;;
+
+(int, int, int, cell, cell) load_data() inline_ref {
+  slice cs = get_data().begin_parse();
+  var res = (cs~load_uint(32), cs~load_uint(64), cs~load_uint(256), cs~load_dict(), cs~load_dict());
+  cs.end_parse();
+  return res;
+}
+
+() store_data(int contract_id, int last_cleaned, int public_key, cell root, old_queries) impure {
+  set_data(begin_cell()
+      .store_uint(contract_id, 32)
+      .store_uint(last_cleaned, 64)
+      .store_uint(public_key, 256)
+      .store_dict(root)
+      .store_dict(old_queries)
+      .end_cell());
+}
+
+;;===========================================================================;;
+;; Internal message handler (Code 0)                                         ;;
+;;===========================================================================;;
+
+() recv_internal(int msg_value, cell in_msg_cell, slice in_msg) impure {
+  ;; not interested at all
+}
+
+;;===========================================================================;;
+;; External message handler (Code -1)                                        ;;
+;;===========================================================================;;
+
+{-
+  External message structure:
+    [Bytes<512b>:signature] [UInt<32b>:seqno] [UInt<6b>:operation]
+    [Either b0: inline name (<= 58-x Bytes) or b1: reference-stored name)
+                                   x depends on operation
+    Use of 6-bit op instead of 32-bit allows to save 4 bytes for inline name
+  Inline [Name] structure: [UInt<6b>:length] [Bytes<lengthB>:data]
+  Operations (continuation of message):
+  00 Contract initialization message (only if seqno = 0) (x=-)
+  11 VSet: set specified value to specified subdomain->category (x=2)
+    [Int<16b>:category] [Name<?>:subdomain] [Cell<1r>:value]
+  12 VDel: delete specified subdomain->category (x=2)
+    [Int<16b>:category] [Name<?>:subdomain]
+  21 DSet: replace entire category dictionary of domain with provided (x=0)
+    [Name<?>:subdomain] [Cell<1r>:new_cat_table]
+  22 DDel: delete entire category dictionary of specified domain (x=0)
+    [Name<?>:subdomain]
+  31 TSet: replace ENTIRE DOMAIN TABLE with the provided tree root cell (x=-)
+    [Cell<1r>:new_domains_table]
+  32 TDel: nullify ENTIRE DOMAIN TABLE (x=-)
+  51 OSet: replace owner public key with a new one (x=-)
+    [UInt<256b>:new_public_key]
+-}
+
+() after_code_upgrade(cell root, slice ops, cont old_code) impure method_id(1666);
+
+(cell, slice) process_op(cell root, slice ops) inline_ref {
+  int op = ops~load_uint(6);
+  if (op < 10) {
+    ifnot (op) {
+      ;; 00 Noop: No operation
+      return (root, ops);
+    }
+    if (op == 1) {
+      ;; 01 SMsg: Send Message
+      var mode = ops~load_uint(8);
+      send_raw_message(ops~load_ref(), mode);
+      return (root, ops);
+    }
+    if (op == 9) {
+      ;; 09 CodeUpgrade
+      var new_code = ops~load_ref();
+      set_code(new_code);
+      var old_code = get_c3();
+      set_c3(new_code.begin_parse().bless());
+      after_code_upgrade(root, ops, old_code);
+      throw(0);
+      return (root, ops);
+    }
+    throw(45);
+    return (root, ops);
+  }
+  int cat = 0;
+  if (op < 20) {
+    ;; for operations with codes 10..19 category is required
+    cat = ops~load_int(16);
+  }
+  slice name = null();   ;; any slice value
+  cell cat_table = null();
+  if (op < 30) {
+    ;; for operations with codes 10..29 name is required
+    int is_name_ref = (ops~load_uint(1) == 1);
+    if (is_name_ref) {
+      ;; name is stored in separate referenced cell
+      name = ops~load_ref().begin_parse();
+    } else {
+      ;; name is stored inline
+      int name_len = ops~load_uint(6) * 8;
+      name = ops~load_bits(name_len);
+    }
+    ;; at least one character not counting \0
+    throw_unless(38, name.slice_bits() >= 16);
+    ;; name shall end with \0
+    int name_last_byte = name.slice_last(8).preload_uint(8);
+    throw_if(40, name_last_byte);
+    ;; count zero separators
+    int zeros = 0;
+    slice cname = name;
+    repeat (cname.slice_bits() ^>> 3) {
+      int c = cname~load_uint(8);
+      zeros -= (c == 0);
+    }
+    ;; throw_unless(39, zeros == 1);
+    name = begin_cell().store_uint(zeros, 7).store_slice(name).end_cell().begin_parse();
+  }
+  ;; operation with codes 10..19 manipulate category dict
+  ;; lets try to find it and store into a variable
+  ;; operations with codes 20..29 replace / delete dict, no need
+  if (op < 20) {
+    ;; lets resolve the name here so as not to duplicate the code
+    (slice pfx, cell val, slice tail, int succ) = 
+      root.pfxdict_get_ref(1023, name);
+    if (succ) {
+      ;; must match EXACTLY to prevent accident changes
+      throw_unless(35, tail.slice_empty?()); 
+      cat_table = val;
+    }
+    ;; otherwise cat_table is null which is reasonable for actions
+  }
+  ;; 11 VSet: set specified value to specified subdomain->category
+  if (op == 11) {
+    cell new_value = ops~load_maybe_ref();
+    cat_table~idict_set_get_ref(16, cat, new_value);
+    root~pfxdict_set_ref(1023, name, cat_table);
+    return (root, ops);
+  }
+  ;; 12 VDel: delete specified subdomain->category value
+  if (op == 12) {
+    if (cat_table~idict_delete?(16, cat)) {
+       root~pfxdict_set_ref(1023, name, cat_table);      
+    }
+    return (root, ops);
+  }
+  ;; 21 DSet: replace entire category dictionary of domain with provided
+  if (op == 21) {
+    cell new_cat_table = ops~load_maybe_ref();
+    root~pfxdict_set_ref(1023, name, new_cat_table);
+    return (root, ops);
+  }
+  ;; 22 DDel: delete entire category dictionary of specified domain
+  if (op == 22) {
+    root~pfxdict_delete?(1023, name);
+    return (root, ops);
+  }
+  ;; 31 TSet: replace ENTIRE DOMAIN TABLE with the provided tree root cell
+  if (op == 31) {
+    cell new_tree_root = ops~load_maybe_ref();
+    ;; no sanity checks cause they would cost immense gas
+    return (new_tree_root, ops);
+  }
+  ;; 32 TDel: nullify ENTIRE DOMAIN TABLE
+  if (op == 32) {
+    return (null(), ops);
+  }
+  throw(44); ;; invalid operation
+  return (null(), ops);
+}
+
+cell process_ops(cell root, slice ops) inline_ref {
+  var stop = false;
+  root~touch();
+  ops~touch();
+  do {
+    (root, ops) = process_op(root, ops);
+    if (ops.slice_data_empty?()) {
+      if (ops.slice_refs()) {
+        ops = ops~load_ref().begin_parse();
+      } else {
+        stop = true;
+      }
+    }
+  } until (stop);
+  return root;
+}
+
+() recv_external(slice in_msg) impure {
+  ;; Load data
+  (int contract_id, int last_cleaned, int public_key, cell root, cell old_queries) = load_data();
+
+  ;; validate signature and seqno
+  slice signature = in_msg~load_bits(512);
+  int shash = slice_hash(in_msg);
+  var (query_contract, query_id) = (in_msg~load_uint(32), in_msg~load_uint(64));
+  var bound = (now() << 32);
+  throw_if(35, query_id < bound);
+  (_, var found?) = old_queries.udict_get?(64, query_id);
+  throw_if(32, found?);
+  throw_unless(34, contract_id == query_contract);
+  throw_unless(35, check_signature(shash, signature, public_key));
+  accept_message(); ;; message is signed by owner, sanity not guaranteed yet
+
+  int op = in_msg.preload_uint(6);
+  if (op == 51) {
+    in_msg~skip_bits(6);
+    public_key = in_msg~load_uint(256);
+  } else {
+    root = process_ops(root, in_msg);
+  }
+
+  bound -= (64 << 32);   ;; clean up records expired more than 64 seconds ago
+  old_queries~udict_set_builder(64, query_id, begin_cell());
+  var queries = old_queries;
+  do {
+    var (old_queries', i, _, f) = old_queries.udict_delete_get_min(64);
+    f~touch();
+    if (f) {
+      f = (i < bound);
+    }
+    if (f) {
+      old_queries = old_queries';
+      last_cleaned = i;
+    }
+  } until (~ f);
+
+  store_data(contract_id, last_cleaned, public_key, root, old_queries);
+}
+
+() after_code_upgrade(cell root, slice ops, cont old_code) impure method_id(1666) {
+}
+
+{-
+  Data structure:
+  Root cell: [UInt<32b>:seqno] [UInt<256b>:owner_public_key] 
+         [OptRef<1b+1r?>:Hashmap<PfxDict:Slice->CatTable>:domains]
+  <CatTable> := HashmapE 16 ^DNSRecord
+  
+  STORED DOMAIN NAME SLICE FORMAT: (#ZeroChars<7b>) (Domain name value)
+  #Zeros allows to simultaneously store, for example, com\0 and com\0google\0
+  That will be stored as \1com\0 and \2com\0google\0 (pfx tree has restricitons)
+  This will allow to resolve more specific requests to subdomains, and resort
+      to parent domain next resolver lookup if subdomain is not found
+  com\0goo\0 lookup will, for example look up \2com\0goo\0 and then
+      \1com\0goo\0 which will return \1com\0 (as per pfx tree) with -1 cat
+-}
+
+;;===========================================================================;;
+;; Getter methods                                                            ;;
+;;===========================================================================;;
+
+;; Retrieve contract id (in case several contracts are managed with the same private key)
+int get_contract_id() method_id {
+  return get_data().begin_parse().preload_uint(32);
+}
+
+int get_public_key() method_id {
+  var cs = get_data().begin_parse();
+  cs~load_uint(32 + 64);
+  return cs.preload_uint(256);
+}
+
+;;8m  dns-record-value
+(int, cell) dnsresolve(slice subdomain, int category) method_id {
+  int bits = subdomain.slice_bits();
+  ifnot (bits) {
+    return (0, null());  ;; zero-length input
+  }
+  throw_if(30, bits & 7); ;; malformed input (~ 8n-bit)
+
+  int name_last_byte = subdomain.slice_last(8).preload_uint(8);
+  if (name_last_byte) {
+    subdomain = begin_cell().store_slice(subdomain) ;; append zero byte
+                            .store_uint(0, 8).end_cell().begin_parse();
+    bits += 8;
+  }
+  if (bits == 8) {
+    return (0, null()); ;; zero-length input, but with zero byte
+  }
+  (_, _, _, cell root, _) = load_data();
+  
+  slice cname = subdomain;
+  int zeros = 0;
+  repeat (bits >> 3) {
+    int c = cname~load_uint(8);
+    zeros -= (c == 0);
+  }
+
+  ;; can't move these declarations lower, will cause errors!
+  slice pfx = cname;
+  cell val = null();
+  slice tail = cname;
+
+  do {
+    slice pfxname = begin_cell().store_uint(zeros, 7)
+      .store_slice(subdomain).end_cell().begin_parse();
+    (pfx, val, tail, int succ) = root.pfxdict_get_ref(1023, pfxname);
+    zeros = succ ^ (zeros - 1);   ;; break on success
+  } until (zeros <= 0);
+
+  ifnot (zeros) {
+    return (0, null()); ;; failed to find entry in prefix dictionary
+  }
+
+  zeros = - zeros;
+
+  ifnot (tail.slice_empty?()) { ;; if we have tail then len(pfx) < len(subdomain)
+    category = -1; ;; incomplete subdomain found, must return next resolver (-1)
+  }
+  int pfx_bits = pfx.slice_bits() - 7;
+  cell cat_table = val;
+  ;; pfx.slice_bits() will contain 8m, where m is number of bytes in subdomain 
+  ;;   COUNTING the zero byte (if structurally correct: no multiple-ZB keys)
+  ;;   which corresponds to 8m, m=one plus the number of bytes in the subdomain found)
+  if (category == 0) {
+    return (pfx_bits, cat_table); ;; return cell with entire dictionary for 0
+  } else {
+    cell cat_found = cat_table.idict_get_ref(16, category);
+    return (pfx_bits, cat_found);
+  }
+}
diff --git a/submodules/ton/tonlib-src/crypto/smartcont/elector-code.fc b/submodules/ton/tonlib-src/crypto/smartcont/elector-code.fc
index fe000c14d4..e3f394e09c 100644
--- a/submodules/ton/tonlib-src/crypto/smartcont/elector-code.fc
+++ b/submodules/ton/tonlib-src/crypto/smartcont/elector-code.fc
@@ -123,7 +123,7 @@ _ ~credit_to(credits, addr, amount) {
   }
   ;; parse current election data
   var (elect_at, elect_close, min_stake, total_stake, members, failed, finished) = elect.unpack_elect();
-  elect_at~dump();
+  ;; elect_at~dump();
   msg_value -= 1000000000;   ;; deduct GR$1 for sending confirmation
   if ((msg_value << 12) < total_stake) {
     ;; stake smaller than 1/4096 of the total accumulated stakes, return
@@ -338,7 +338,7 @@ int upgrade_code(s_addr, cs, query_id) {
   var code = cs~load_ref();
   set_code(code);
   ifnot(cs.slice_empty?()) {
-    set_c3(code);
+    set_c3(code.begin_parse().bless());
     ;; run_method3(1666, s_addr, cs, query_id);
     after_code_upgrade(s_addr, cs, query_id);
     throw(0);
@@ -443,7 +443,7 @@ _ compute_total_stake(l, n, m_stake) {
     if (f) {
       var (stake, _, pubkey) = (min(key~load_uint(128), max_stake), key~load_uint(32), key.preload_uint(256));
       var (max_f, _, adnl_addr) = (cs~load_uint(32), cs~load_uint(256), cs.preload_uint(256));
-      l = cons(tuple4(stake, max_f, pubkey, adnl_addr), l);
+      l = cons([stake, max_f, pubkey, adnl_addr], l);
     }
   } until (~ f);
   ;; l is the list of all stakes in decreasing order
@@ -468,7 +468,7 @@ _ compute_total_stake(l, n, m_stake) {
   }
   ;; we have to select first m validators from list l
   l1 = touch(l);
-  l1~dump();  ;; DEBUG
+  ;; l1~dump();  ;; DEBUG
   repeat (m - 1) {
     l1 = cdr(l1);
   }
@@ -480,7 +480,7 @@ _ compute_total_stake(l, n, m_stake) {
   var vset = new_dict();
   var frozen = new_dict();
   do {
-    var (stake, max_f, pubkey, adnl_addr) = l~list_next().untuple4();
+    var [stake, max_f, pubkey, adnl_addr] = l~list_next();
     ;; lookup source address first
     var (val, f) = members.udict_get?(256, pubkey);
     throw_unless(61, f);
@@ -733,7 +733,7 @@ int announce_new_elections(ds, elect, credits) {
   (_, var min_stake) = config_param(17).begin_parse().load_grams();
   ;; announce new elections
   var elect_at = t + elect_begin_before;
-  elect_at~dump();
+  ;; elect_at~dump();
   var elect_close = elect_at - elect_end_before;
   elect = pack_elect(elect_at, elect_close, min_stake, 0, new_dict(), false, false);
   set_data(begin_cell().store_dict(elect).store_dict(credits).store_slice(ds).end_cell());
@@ -786,12 +786,32 @@ _ participant_list() method_id {
   do {
     (id, var fs, var f) = members.udict_get_prev?(256, id);
     if (f) {
-      l = cons(pair(id, fs~load_grams()), l);
+      l = cons([id, fs~load_grams()], l);
     }
   } until (~ f);
   return l;
 }
 
+;; returns the list of all participants of current elections with their data
+_ participant_list_extended() method_id {
+  var elect = get_data().begin_parse().preload_dict();
+  if (elect.null?()) {
+    return (0, 0, 0, 0, nil, 0, 0);
+  }
+  var (elect_at, elect_close, min_stake, total_stake, members, failed, finished) = elect.unpack_elect();
+  var l = nil;
+  var id = (1 << 255) + ((1 << 255) - 1);
+  do {
+    (id, var cs, var f) = members.udict_get_prev?(256, id);
+    if (f) {
+      var (stake, time, max_factor, addr, adnl_addr) = (cs~load_grams(), cs~load_uint(32), cs~load_uint(32), cs~load_uint(256), cs~load_uint(256));
+      cs.end_parse();
+      l = cons([id, [stake, max_factor, addr, adnl_addr]], l);
+    }
+  } until (~ f);
+  return (elect_at, elect_close, min_stake, total_stake, l, failed, finished);
+}
+
 ;; computes the return stake
 int compute_returned_stake(int wallet_addr) method_id {
   var cs = get_data().begin_parse();
diff --git a/submodules/ton/tonlib-src/crypto/smartcont/gen-zerostate.fif b/submodules/ton/tonlib-src/crypto/smartcont/gen-zerostate.fif
index 66d686241e..fefc7e4625 100644
--- a/submodules/ton/tonlib-src/crypto/smartcont/gen-zerostate.fif
+++ b/submodules/ton/tonlib-src/crypto/smartcont/gen-zerostate.fif
@@ -3,9 +3,10 @@
 
 def? $1 { @' $1 } { "" } cond constant suffix 
 { suffix $+ } : +suffix
+256 1<<1- 15 / constant AllOnes
 
 wc_master setworkchain
--17 setglobalid   // negative value means a test instance of the blockchain
+-239 setglobalid   // negative value means a test instance of the blockchain
 
 // Initial state of Workchain 0 (Basic workchain)
 
@@ -16,10 +17,10 @@ dup dup 31 boc+>B dup Bx. cr
 dup "basestate0" +suffix +".boc" tuck B>file
 ."(Initial basechain state saved to file " type .")" cr
 Bhashu dup =: basestate0_fhash
-."file hash=" dup x. space 256 u>B dup B>base64url type cr
+."file hash=" dup 64x. space 256 u>B dup B>base64url type cr
 "basestate0" +suffix +".fhash" B>file
 hashu dup =: basestate0_rhash
-."root hash=" dup x. space 256 u>B dup B>base64url type cr
+."root hash=" dup 64x. space 256 u>B dup B>base64url type cr
 "basestate0" +suffix +".rhash" B>file
 
 basestate0_rhash basestate0_fhash now 0 2 32 0 add-std-workchain
@@ -54,10 +55,11 @@ Libs{
   x{ABACABADABACABA} s>c public_lib
   x{1234} x{5678} |_ s>c private_lib
 }Libs  // libraries
-GR$1700000000 // balance
+GR$4999990000 // balance
 0 // split_depth
 0 // ticktock
-2 // mode: create
+AllOnes 0 * // address
+6 // mode: create+setaddr
 register_smc
 dup make_special dup constant smc1_addr  
 Masterchain over 
@@ -82,8 +84,8 @@ Masterchain over
 // code
 <b 0 32 u, b> // data
 empty_cell    // libraries
-GR$1000000    // initial balance (1m test Grams)
-0 0 2 register_smc
+GR$1000       // initial balance (1k test Grams)
+0 0 AllOnes 6 * 6 register_smc
 dup make_special dup constant smc2_addr
 Masterchain over 
 2dup ."free test gram giver address = " .addr cr 2dup 6 .Addr cr
@@ -120,13 +122,13 @@ Libs{
   x{ABACABADABACABA} s>c public_lib
   x{1234} x{5678} |_ s>c public_lib
 }Libs  // libraries
-0x333333333 // balance
+GR$666 // balance
 0 // split_depth
 3 // ticktock: tick
 2 // mode: create
 register_smc
 dup make_special dup constant smc3_addr
-."address = " x. cr
+."address = " 64x. cr
 
 /*
  *
@@ -139,7 +141,8 @@ empty_cell  // libraries
 GR$10  // balance: 10 grams
 0 // split_depth
 2 // ticktock: tick
-2 // mode: create
+AllOnes 3 * // address: -1:333...333
+6 // mode: create + setaddr
 register_smc
 dup make_special dup constant smc4_addr dup constant elector_addr
 Masterchain swap
@@ -155,14 +158,15 @@ Masterchain swap
 0 capCreateStats config.version!
 // max-validators max-main-validators min-validators
 // 9 4 1 config.validator_num!
-1000 100 5 config.validator_num!
+1000 100 13 config.validator_num!
 // min-stake max-stake min-total-stake max-factor
-GR$10000 GR$10000000 GR$1000000 sg~10 config.validator_stake_limits!
+GR$10000 GR$10000000 GR$500000 sg~3 config.validator_stake_limits!
 // elected-for elect-start-before elect-end-before stakes-frozen-for
 // 400000 200000 4000 400000 config.election_params!
-4000 2000 500 1000 config.election_params!  // DEBUG
+// 4000 2000 500 1000 config.election_params!  // DEBUG
+65536 32768 8192 32768 config.election_params!  // TestNet DEBUG
 // config-addr = -1:5555...5555
-256 1<<1- 3 / constant config_addr
+AllOnes 5 * constant config_addr
 config_addr config.config_smc!
 // elector-addr
 elector_addr config.elector_smc!
@@ -172,8 +176,8 @@ elector_addr config.elector_smc!
 config.special!
 
 // gas_price gas_limit special_gas_limit gas_credit block_gas_limit freeze_due_limit delete_due_limit flat_gas_limit flat_gas_price -- 
-1000 sg* 1 *M dup 10000 10 *M GR$0.1 GR$1.0 100 100000 config.gas_prices!
-10000 sg* 1 *M 10 *M 10000 10 *M GR$0.1 GR$1.0 100 1000000 config.mc_gas_prices!
+1000 sg* 1 *M dup 10000 10 *M GR$0.1 GR$1.0 1000 1000000 config.gas_prices!
+10000 sg* 1 *M 10 *M 10000 10 *M GR$0.1 GR$1.0 1000 10000000 config.mc_gas_prices!
 // lump_price bit_price cell_price ihr_factor first_frac next_frac
 1000000 1000 sg* 100000 sg* 3/2 sg*/ 1/3 sg*/ 1/3 sg*/ config.fwd_prices!
 10000000 10000 sg* 1000000 sg* 3/2 sg*/ 1/3 sg*/ 1/3 sg*/ config.mc_fwd_prices!
@@ -211,10 +215,11 @@ now dup orig_vset_valid_for + 0 config.validators!
  *
  */
 "auto/config-code.fif" include   // code in separate source file
-<b 0 32 u, 
+<b configdict ref,  // initial configuration
+   0 32 u,          // seqno
    "config-master" +suffix +".pk" load-generate-keypair drop
    B,
-   configdict ref,
+   dictnew dict,   // vote dict
 b> // data
 empty_cell  // libraries
 GR$10  // balance
@@ -232,7 +237,7 @@ Masterchain swap
  */
  
 // pubkey amount `create-wallet1` or pubkey amount `create-wallet2`
-PK'PuZPPXK5Rff9SvtoS7Y9lUuEixvy-J6aishYFj3Qn6P0pJMb GR$100000000 create-wallet1
+PK'PuZPPXK5Rff9SvtoS7Y9lUuEixvy-J6aishYFj3Qn6P0pJMb GR$1000000000 create-wallet1
 PK'PuYiB1zAWzr4p8j6I681+sGUrRGcn6Ylf7vXl0xaUl/w6Xfg GR$1700000000 create-wallet0
 
 /*
diff --git a/submodules/ton/tonlib-src/crypto/smartcont/highload-wallet-code.fc b/submodules/ton/tonlib-src/crypto/smartcont/highload-wallet-code.fc
index 70abb48e23..8420c1d827 100644
--- a/submodules/ton/tonlib-src/crypto/smartcont/highload-wallet-code.fc
+++ b/submodules/ton/tonlib-src/crypto/smartcont/highload-wallet-code.fc
@@ -39,3 +39,9 @@
 int seqno() method_id {
   return get_data().begin_parse().preload_uint(32);
 }
+
+int get_public_key() method_id {
+  var cs = get_data().begin_parse();
+  cs~load_uint(64);
+  return cs.preload_uint(256);
+}
diff --git a/submodules/ton/tonlib-src/crypto/smartcont/highload-wallet-v2-code.fc b/submodules/ton/tonlib-src/crypto/smartcont/highload-wallet-v2-code.fc
index 88d7885563..7dd65f9e69 100644
--- a/submodules/ton/tonlib-src/crypto/smartcont/highload-wallet-v2-code.fc
+++ b/submodules/ton/tonlib-src/crypto/smartcont/highload-wallet-v2-code.fc
@@ -63,3 +63,9 @@ int processed?(int query_id) method_id {
   (_, var found) = old_queries.udict_get?(64, query_id);
   return found ? true : - (query_id <= last_cleaned);
 }
+
+int get_public_key() method_id {
+  var cs = get_data().begin_parse();
+  cs~load_uint(32 + 64);
+  return cs.preload_uint(256);
+}
diff --git a/submodules/ton/tonlib-src/crypto/smartcont/highload-wallet-v2.fif b/submodules/ton/tonlib-src/crypto/smartcont/highload-wallet-v2.fif
index b8f0be72e9..fd71f52aae 100755
--- a/submodules/ton/tonlib-src/crypto/smartcont/highload-wallet-v2.fif
+++ b/submodules/ton/tonlib-src/crypto/smartcont/highload-wallet-v2.fif
@@ -1,20 +1,41 @@
 #!/usr/bin/fift -s
 "TonUtil.fif" include
+"GetOpt.fif" include
+
+{ show-options-help 1 halt } : usage
+
+true =: allow-bounce
+false =: force-bounce
+3 =: send-mode  // mode for SENDRAWMSG: +1 - sender pays fees, +2 - ignore errors
+60 =: timeout   // external message expires in 60 seconds
+
+begin-options
+     " <filename-base> <subwallet-id> <order-file> [-n|-b] [-t<timeout>] [<savefile>]" +cr +tab
+    +"Creates a request with up to 254 orders loaded from <order-file> to high-load (sub)wallet created by new-highload-v2-wallet.fif, with private key loaded from file <filename-base>.pk "
+    +"and address from <filename-base><subwallet-id>.addr, and saves it into <savefile>.boc ('wallet-query.boc' by default)" +cr 
+    +"<order-file> is a text file with lines `SEND <dest-addr> <amount>`"
+    disable-digit-options generic-help-setopt
+  "n" "--no-bounce" { false =: allow-bounce } short-long-option
+    "Clears bounce flag" option-help
+  "b" "--force-bounce" { true =: force-bounce } short-long-option
+    "Forces bounce flag" option-help
+  "t" "--timeout" { parse-int =: timeout } short-long-option-arg
+    "Sets expiration timeout in seconds (" timeout (.) $+ +" by default)" option-help
+  "m" "--mode" { parse-int =: send-mode } short-long-option-arg
+    "Sets transfer mode (0..255) for SENDRAWMSG (" send-mode (.) $+ +" by default)"
+    option-help
+  "h" "--help" { usage } short-long-option
+    "Shows a help message" option-help
+parse-options
 
-{ ."usage: " @' $0 type ." <filename-base> <subwallet-id> <order-file> [<savefile>]" cr
-  ."Creates a request with up to 254 orders loaded from <order-file> to high-load v2 (sub)wallet created by new-highload-v2-wallet.fif, with private key loaded from file <filename-base>.pk "
-  ."and address from <filename-base><subwallet-id>.addr, and saves it into <savefile>.boc ('wallet-query.boc' by default)" cr 
-  ."<order-file> is a text file with lines `SEND <dest-addr> <amount>`" cr 1 halt
-} : usage
 $# dup 3 < swap 4 > or ' usage if
+4 :$1..n
 
 $1 =: file-base
 $2 parse-int dup 32 fits ' usage ifnot =: subwallet-id   // parse subwallet-id
 { subwallet-id (.) $+ } : +subwallet
 $3 =: order-file
-def? $4 { @' $4 } { "wallet-query" } cond constant savefile
-3 constant send-mode  // mode for SENDRAWMSG: +1 - sender pays fees, +2 - ignore errors
-60 constant timeout   // external message expires in 60 seconds
+$4 "wallet-query" replace-if-null =: savefile
 
 file-base +subwallet +".addr" load-address
 2dup 2constant wallet_addr
@@ -29,7 +50,7 @@ variable order#   order# 0!
   orders ! order# 1+!
 } : add-order
 // b body -- b'
-{ tuck <s 2dup s-fits? not rot over 1 i, -rot
+{ tuck <s 2dup 1 s-fits-with? not rot over 1 i, -rot
   { drop swap ref, } { s, nip } cond
 } : append-msg-body
 // ng wc addr bounce body -- c
@@ -41,7 +62,7 @@ variable order#   order# 0!
   -rot 2dup 4 pick 7 + .Addr ." = " .addr ." bounce=" . cr
 } : .transfer
 // addr$ ng -- c
-{ swap parse-smc-addr  // ng wc addr bnc 
+{ swap parse-smc-addr force-bounce or allow-bounce and  // ng wc addr bnc 
   2over 2over .transfer
   <b 0 32 u, b> create-int-msg
 } : create-simple-transfer
diff --git a/submodules/ton/tonlib-src/crypto/smartcont/highload-wallet.fif b/submodules/ton/tonlib-src/crypto/smartcont/highload-wallet.fif
index e851016cc9..36e321eff5 100755
--- a/submodules/ton/tonlib-src/crypto/smartcont/highload-wallet.fif
+++ b/submodules/ton/tonlib-src/crypto/smartcont/highload-wallet.fif
@@ -1,21 +1,42 @@
 #!/usr/bin/fift -s
 "TonUtil.fif" include
+"GetOpt.fif" include
+
+{ show-options-help 1 halt } : usage
+
+true =: allow-bounce
+false =: force-bounce
+3 =: send-mode  // mode for SENDRAWMSG: +1 - sender pays fees, +2 - ignore errors
+60 =: timeout   // external message expires in 60 seconds
+
+begin-options
+     " <filename-base> <subwallet-id> <seqno> <order-file> [-n|-b] [-t<timeout>] [<savefile>]" +cr +tab
+    +"Creates a request with up to 254 orders loaded from <order-file> to high-load (sub)wallet created by new-highload-wallet.fif, with private key loaded from file <filename-base>.pk "
+    +"and address from <filename-base><subwallet-id>.addr, and saves it into <savefile>.boc ('wallet-query.boc' by default)" +cr 
+    +"<order-file> is a text file with lines `SEND <dest-addr> <amount>`"
+    disable-digit-options generic-help-setopt
+  "n" "--no-bounce" { false =: allow-bounce } short-long-option
+    "Clears bounce flag" option-help
+  "b" "--force-bounce" { true =: force-bounce } short-long-option
+    "Forces bounce flag" option-help
+  "t" "--timeout" { parse-int =: timeout } short-long-option-arg
+    "Sets expiration timeout in seconds (" timeout (.) $+ +" by default)" option-help
+  "m" "--mode" { parse-int =: send-mode } short-long-option-arg
+    "Sets transfer mode (0..255) for SENDRAWMSG (" send-mode (.) $+ +" by default)"
+    option-help
+  "h" "--help" { usage } short-long-option
+    "Shows a help message" option-help
+parse-options
 
-{ ."usage: " @' $0 type ." <filename-base> <subwallet-id> <seqno> <order-file> [<savefile>]" cr
-  ."Creates a request with up to 254 orders loaded from <order-file> to high-load (sub)wallet created by new-highload-wallet.fif, with private key loaded from file <filename-base>.pk "
-  ."and address from <filename-base><subwallet-id>.addr, and saves it into <savefile>.boc ('wallet-query.boc' by default)" cr 
-  ."<order-file> is a text file with lines `SEND <dest-addr> <amount>`" cr 1 halt
-} : usage
 $# dup 4 < swap 5 > or ' usage if
+5 :$1..n
 
 $1 =: file-base
 $2 parse-int dup 32 fits ' usage ifnot =: subwallet-id   // parse subwallet-id
 { subwallet-id (.) $+ } : +subwallet
 $3 parse-int =: seqno
 $4 =: order-file
-def? $5 { @' $5 } { "wallet-query" } cond constant savefile
-3 constant send-mode  // mode for SENDRAWMSG: +1 - sender pays fees, +2 - ignore errors
-60 constant timeout   // external message expires in 60 seconds
+$5 "wallet-query" replace-if-null =: savefile
 
 file-base +subwallet +".addr" load-address
 2dup 2constant wallet_addr
@@ -30,7 +51,7 @@ variable order#   order# 0!
   orders ! order# 1+!
 } : add-order
 // b body -- b'
-{ tuck <s 2dup s-fits? not rot over 1 i, -rot
+{ tuck <s 2dup 1 s-fits-with? not rot over 1 i, -rot
   { drop swap ref, } { s, nip } cond
 } : append-msg-body
 // ng wc addr bounce body -- c
@@ -42,7 +63,7 @@ variable order#   order# 0!
   -rot 2dup 4 pick 7 + .Addr ." = " .addr ." bounce=" . cr
 } : .transfer
 // addr$ ng -- c
-{ swap parse-smc-addr  // ng wc addr bnc 
+{ swap parse-smc-addr force-bounce or allow-bounce and  // ng wc addr bnc 
   2over 2over .transfer
   <b 0 32 u, b> create-int-msg
 } : create-simple-transfer
diff --git a/submodules/ton/tonlib-src/crypto/smartcont/manual-dns-manage.fif b/submodules/ton/tonlib-src/crypto/smartcont/manual-dns-manage.fif
new file mode 100644
index 0000000000..ef18127c60
--- /dev/null
+++ b/submodules/ton/tonlib-src/crypto/smartcont/manual-dns-manage.fif
@@ -0,0 +1,146 @@
+#!/usr/bin/fift -s
+"TonUtil.fif" include
+"GetOpt.fif" include
+
+{ show-options-help 1 halt } : usage
+
+60 =: timeout   // external message expires in 60 seconds
+"dns-query.boc" =: savefile
+
+begin-options
+     " <filename-base> <contract-id> [-t<timeout>] [-o<savefile-boc>] <op> [<op2>...]" +cr +tab
+    +"Creates a request to managed DNS smart contract created by new-manual-dns.fif, with private key loaded from file <filename-base>.pk "
+    +"and address from <filename-base>-dns<contract-id>.addr, and saves it into <savefile-boc> ('" savefile $+ +"' by default)"
+    +cr +"<op> is an operation description, one of" +cr +tab
+    +"add <subdomain> cat <cat-id> (smc <smc-addr> | next <next-resolver-smc-addr> | adnl <adnl-addr> | text <string>)" +cr +tab
+    +"delete <subdomain> cat <cat-id>" +cr +tab
+    +"drop <subdomain>" 
+    disable-digit-options generic-help-setopt
+  "t" "--timeout" { parse-int =: timeout } short-long-option-arg
+    "Sets expiration timeout in seconds (" timeout (.) $+ +" by default)" option-help
+  "o" "--output" { =: savefile } short-long-option-arg
+    "Sets output file for generated initialization message ('" savefile $+ +"' by default)" option-help
+  "h" "--help" { usage } short-long-option
+    "Shows a help message" option-help
+parse-options
+
+$# 2 < ' usage if
+2 :$1..n
+
+$1 =: file-base
+$2 parse-int dup =: contract-id 32 fits ' usage ifnot
+{ contract-id (.) $+ } : +contractid
+
+{ $* @ dup null? { second $@ ! } { drop } cond } : @skip
+{ $* @ null? } : @end?
+{ $* @ uncons $* ! } : @next
+@next @next 2drop
+
+variable Actions
+{ Actions @ cons Actions ! } : register-action
+
+{ @end? abort"subdomain name expected" @next dup $len 127 > abort"subdomain name too long"
+} : parse-domain
+{ @end? abort"category number expected" @next (number) 1 <> abort"category must be integer"
+  dup 16 fits not abort"category does not fit into 16 bit integer"
+  dup 0= abort"category must be non-zero"
+} : parse-cat-num
+{ @end? abort"`cat` expected" @next "cat" $= not abort"`cat` expected" parse-cat-num
+} : parse-cat
+{ @end? abort"smart contract address expected" 
+  @next false parse-load-address drop triple
+} : cl-parse-smc-addr
+{ @end? abort"adnl address expected"
+  `adnl @next parse-adnl-addr pair
+} : cl-parse-adnl-addr
+{ @end? abort"subdomain record value expected" @next
+  dup "smc" $= { drop `smc cl-parse-smc-addr } {
+  dup "next" $= { drop `next cl-parse-smc-addr } {
+  dup "adnl" $= { drop cl-parse-adnl-addr } {
+  dup "text" $= { drop `text @next pair } {
+    "unknown record type "' swap $+ +"'" abort
+  } cond } cond } cond } cond
+} : parse-value
+{ ."Loading new code BoC from " dup type cr
+  file>B B>boc
+} : load-new-code-from
+{ @next dup "add" $= { drop `add parse-domain parse-cat parse-value 4 tuple register-action } {
+  dup "delete" $= { drop `delete parse-domain parse-cat triple register-action } {
+  dup "drop" $= { drop `drop parse-domain pair register-action } {
+  dup "upgrade" $= { drop `upgrade @next load-new-code-from pair register-action } {
+    "unknown action '" swap $+ +"'" abort
+  } cond } cond } cond } cond
+} : parse-action
+{ { @end? not } { parse-action } while } : parse-actions
+parse-actions
+
+file-base +".pk" load-keypair nip constant wallet_pk
+file-base +"-dns" +contractid +".addr" load-address
+2dup 2constant smc_addr
+."Managed manual DNS smart contract address = " 2dup .addr cr 6 .Addr cr
+
+."Actions: " Actions @ list-reverse .l cr
+
+// ( S -- S1 .. Sn n )
+{ 1 swap { dup "." $pos dup 0>= } { $| 1 $| nip rot 1+ swap } while drop swap
+} : split-by-dots
+// ( S -- s )
+{ dup $len dup 0= abort"subdomain cannot be empty" 126 > abort"subdomain too long"
+  dup 0 chr $pos 1+ abort"subdomain contains null characters"
+  split-by-dots <b {  // ... S b
+    swap dup $len 0= abort"empty subdomain component" $, 0 8 u,
+  } rot times b> <s
+} : subdomain>s
+// ( b V -- b' )
+{ dup first
+  dup `smc eq? { drop untriple 2swap drop x{9fd3} s, -rot Addr, 0 8 u, } {
+  dup `next eq? { drop untriple 2swap drop x{ba93} s, -rot Addr, } {
+  dup `adnl eq? { drop second swap x{ad01} s, swap 256 u, 0 8 u, } {
+  dup `text eq? { drop second swap x{1eda01} s, over $len 8 u, swap $, } { 
+    abort"unknown value type"
+  } cond } cond } cond } cond
+} : value,
+{ subdomain>s dup sbits 3 >> 
+  dup 63 > { drop s>c dict, } { rot swap 7 u, swap s, } cond
+} : subdomain,
+// ( A -- b )
+{ dup first
+  dup `add eq? {
+    drop 4 untuple <b swap value, b> -rot
+    <b 11 6 u, swap 16 i, swap subdomain,
+    swap dict, nip } {
+  dup `delete eq? {
+    drop untriple rot drop
+    <b 12 6 u, swap 16 i, swap subdomain, } {
+  dup `drop eq? {
+    drop second <b 22 6 u, swap subdomain, } {
+  dup `upgrade eq? {
+    drop second <b 9 6 u, swap ref, } {
+  abort"unknown action type"
+  } cond } cond } cond } cond
+} : action>b
+// ( -- b )
+{ Actions @ dup null? { drop <b 0 6 u, b> } {
+  uncons swap action>b { over null? not } {
+    b> swap uncons swap action>b rot ref,
+  } while nip } cond
+} : serialize-actions
+serialize-actions
+dup brembits 888 < { b> <b 0 6 u, swap ref, } if
+dup =: actions-builder b>
+."Serialized actions are " <s csr. cr
+
+// create a message
+// create external message
+now timeout + 32 << actions-builder b> hashu 32 1<<1- and + =: query_id
+<b contract-id 32 i, query_id 64 u, actions-builder b+ b>
+dup ."signing message: " <s csr. cr
+dup hashu wallet_pk ed25519_sign_uint
+<b b{1000100} s, smc_addr addr, 0 Gram, b{00} s,
+   swap B, swap <s s, b>
+dup ."resulting external message: " <s csr. cr
+2 boc+>B dup Bx. cr
+."Query_id is " query_id dup . ."= 0x" X. cr
+."Query expires in " timeout . ."seconds" cr
+savefile tuck B>file
+."(Saved to file " type .")" cr
diff --git a/submodules/ton/tonlib-src/crypto/smartcont/multisig-code.fc b/submodules/ton/tonlib-src/crypto/smartcont/multisig-code.fc
index cbe2d30feb..36e21a7b7f 100644
--- a/submodules/ton/tonlib-src/crypto/smartcont/multisig-code.fc
+++ b/submodules/ton/tonlib-src/crypto/smartcont/multisig-code.fc
@@ -2,21 +2,32 @@
 
 _ unpack_state() inline_ref {
   var ds = begin_parse(get_data());
-  var res = (ds~load_uint(8), ds~load_uint(8), ds~load_uint(64), ds~load_dict(), ds~load_dict());
+  var res = (ds~load_uint(32), ds~load_uint(8), ds~load_uint(8), ds~load_uint(64), ds~load_dict(), ds~load_dict());
   ds.end_parse();
   return res;
 }
 
-_ pack_state(cell pending_queries, cell public_keys, int last_cleaned, int k, int n) inline_ref {
+_ pack_state(cell pending_queries, cell owner_infos, int last_cleaned, int k, int n, int wallet_id) inline_ref {
   return begin_cell()
+    .store_uint(wallet_id, 32)
     .store_uint(n, 8)
     .store_uint(k, 8)
     .store_uint(last_cleaned, 64)
-    .store_dict(public_keys)
+    .store_dict(owner_infos)
     .store_dict(pending_queries)
   .end_cell();
 }
 
+_ pack_owner_info(int public_key, int flood) inline_ref {
+  return begin_cell()
+    .store_uint(public_key, 256)
+    .store_uint(flood, 8);
+}
+
+_ unpack_owner_info(slice cs) inline_ref {
+  return (cs~load_uint(256), cs~load_uint(8));
+}
+
 (int, int) check_signatures(cell public_keys, cell signatures, int hash, int cnt_bits) inline_ref {
   int cnt = 0;
   
@@ -41,44 +52,60 @@ _ pack_state(cell pending_queries, cell public_keys, int last_cleaned, int k, in
   return (cnt, cnt_bits);
 }
 
-
 () recv_internal(slice in_msg) impure {
   ;; do nothing for internal messages
 }
 
-(int, int, slice) unpack_query_data(slice in_msg, int n, slice query, var found?) inline_ref {
+(int, int, int, slice) unpack_query_data(slice in_msg, int n, slice query, var found?, int root_i) inline_ref {
   if (found?) {
     throw_unless(35, query~load_int(1));
-    (int cnt, int cnt_bits, slice msg) = (query~load_uint(8), query~load_uint(n), query);
+    (int creator_i, int cnt, int cnt_bits, slice msg) = (query~load_uint(8), query~load_uint(8), query~load_uint(n), query);
     throw_unless(36, slice_hash(msg) == slice_hash(in_msg));
-    return (cnt, cnt_bits, msg);
+    return (creator_i, cnt, cnt_bits, msg);
   }
-  return (0, 0, in_msg);
+  return (root_i, 0, 0, in_msg);
 }
 
 () try_init() impure inline_ref {
   ;; first query without signatures is always accepted
-  (int n, int k, int last_cleaned, cell public_keys, cell pending_queries) = unpack_state();
+  (int wallet_id, int n, int k, int last_cleaned, cell owner_infos, cell pending_queries) = unpack_state();
   throw_if(37, last_cleaned);
   accept_message();
-  set_data(pack_state(pending_queries, public_keys, 1, k, n));
+  set_data(pack_state(pending_queries, owner_infos, 1, k, n, wallet_id));
 }
 
-cell update_pending_queries(cell pending_queries, slice msg, int query_id, int cnt, int cnt_bits, int n, int k) impure inline_ref {
+(cell, cell) update_pending_queries(cell pending_queries, cell owner_infos, slice msg, int query_id, int creator_i, int cnt, int cnt_bits, int n, int k) impure inline_ref {
   if (cnt >= k) {
+    accept_message();
     while (msg.slice_refs()) {
       var mode = msg~load_uint(8);
       send_raw_message(msg~load_ref(), mode);
     }
     pending_queries~udict_set_builder(64, query_id, begin_cell().store_int(0, 1));
+
+    (slice owner_info, var found?) = owner_infos.udict_get?(8, creator_i);
+    (int public_key, int flood) = unpack_owner_info(owner_info);
+    owner_infos~udict_set_builder(8, creator_i, pack_owner_info(public_key, flood - 1));
   } else {
     pending_queries~udict_set_builder(64, query_id, begin_cell()
       .store_uint(1, 1)
+      .store_uint(creator_i, 8)
       .store_uint(cnt, 8)
       .store_uint(cnt_bits, n)
       .store_slice(msg));
   }
-  return pending_queries;
+  return (pending_queries, owner_infos);
+}
+
+(int, int) calc_boc_size(int cells, int bits, slice root) {
+  cells += 1;
+  bits += root.slice_bits();
+
+  while (root.slice_refs()) {
+    (cells, bits) = calc_boc_size(cells, bits, root~load_ref().begin_parse());
+  }
+
+  return (cells, bits);
 }
 
 () recv_external(slice in_msg) impure {
@@ -92,44 +119,62 @@ cell update_pending_queries(cell pending_queries, slice msg, int query_id, int c
   int root_hash = slice_hash(in_msg);
   int root_i = in_msg~load_uint(8);
 
-  (int n, int k, int last_cleaned, cell public_keys, cell pending_queries) = unpack_state();
+  (int wallet_id, int n, int k, int last_cleaned, cell owner_infos, cell pending_queries) = unpack_state();
   last_cleaned -= last_cleaned == 0;
 
-  (slice public_key, var found?) = public_keys.udict_get?(8, root_i);
+  (slice owner_info, var found?) = owner_infos.udict_get?(8, root_i);
+  (int public_key, int flood) = unpack_owner_info(owner_info);
   throw_unless(31, found?);
-  throw_unless(32, check_signature(root_hash, root_signature, public_key.preload_uint(256)));
+  throw_unless(32, check_signature(root_hash, root_signature, public_key));
 
   cell signatures = in_msg~load_dict();
 
   var hash = slice_hash(in_msg);
+  int query_wallet_id = in_msg~load_uint(32);
+  throw_unless(42, query_wallet_id == wallet_id);
+
   int query_id = in_msg~load_uint(64);
 
+  (int cnt, int bits) = calc_boc_size(0, 0, in_msg);
+  throw_if(40, (cnt > 8) | (bits > 2048));
+
+  (slice query, var found?) = pending_queries.udict_get?(64, query_id);
+
+  ifnot (found?) {
+    flood += 1;
+    throw_if(39, flood > 10);
+  }
+
   var bound = (now() << 32);
   throw_if(33, query_id < bound);
 
-  (slice query, var found?) = pending_queries.udict_get?(64, query_id);
-  (int cnt, int cnt_bits, slice msg) = unpack_query_data(in_msg, n, query, found?);
+  (int creator_i, int cnt, int cnt_bits, slice msg) = unpack_query_data(in_msg, n, query, found?, root_i);
   int mask = 1 << root_i;
   throw_if(34, cnt_bits & mask);
   cnt_bits |= mask;
   cnt += 1;
 
-  ;; TODO: reserve some gas or FAIL
-  accept_message();
+  set_gas_limit(100000);
 
-  pending_queries = update_pending_queries(pending_queries, msg, query_id, cnt, cnt_bits, n, k);
-  set_data(pack_state(pending_queries, public_keys, last_cleaned, k, n));
+  ifnot (found?) {
+    owner_infos~udict_set_builder(8, root_i, pack_owner_info(public_key, flood));
+    throw_if(41, (cnt < k) & (bound + ((60 * 60) << 32) > query_id));
+  }
+
+  (pending_queries, owner_infos) = update_pending_queries(pending_queries, owner_infos, msg, query_id, creator_i, cnt, cnt_bits, n, k);
+  set_data(pack_state(pending_queries, owner_infos, last_cleaned, k, n, wallet_id));
 
   commit();
   
   int need_save = 0;
   ifnot (cell_null?(signatures) | (cnt >= k)) {
-    (int new_cnt, cnt_bits) = check_signatures(public_keys, signatures, hash, cnt_bits);
+    (int new_cnt, cnt_bits) = check_signatures(owner_infos, signatures, hash, cnt_bits);
     cnt += new_cnt;
-    pending_queries = update_pending_queries(pending_queries, msg, query_id, cnt, cnt_bits, n, k);
+    (pending_queries, owner_infos) = update_pending_queries(pending_queries, owner_infos, msg, query_id, creator_i, cnt, cnt_bits, n, k);
     need_save = -1;
   }
 
+  accept_message();
   bound -= (64 << 32);   ;; clean up records expired more than 64 seconds ago
   int old_last_cleaned = last_cleaned;
   do {
@@ -146,18 +191,18 @@ cell update_pending_queries(cell pending_queries, slice msg, int query_id, int c
   } until (~ f);
 
   if (need_save) {
-    set_data(pack_state(pending_queries, public_keys, last_cleaned, k, n));
+    set_data(pack_state(pending_queries, owner_infos, last_cleaned, k, n, wallet_id));
   }
 }
 
 ;; Get methods
 ;; returns -1 for processed queries, 0 for unprocessed, 1 for unknown (forgotten)
 (int, int) get_query_state(int query_id) method_id {
-  (int n, _, int last_cleaned, _, cell pending_queries) = unpack_state();
+  (_, int n, _, int last_cleaned, _, cell pending_queries) = unpack_state();
   (slice cs, var found) = pending_queries.udict_get?(64, query_id);
   if (found) {
     if (cs~load_int(1)) {
-      cs~load_uint(8);
+      cs~load_uint(8 + 8);
       return (0, cs~load_uint(n));
     } else {
       return (-1, 0);
@@ -172,8 +217,8 @@ int processed?(int query_id) method_id {
   return x;
 }
 
-cell create_init_state(int n, int k, cell public_keys) method_id {
-  return pack_state(new_dict(), public_keys, 0, k, n);
+cell create_init_state(int wallet_id, int n, int k, cell owners_info) method_id {
+  return pack_state(new_dict(), owners_info, 0, k, n, wallet_id);
 }
 
 cell merge_list(cell a, cell b) {
@@ -196,7 +241,7 @@ cell merge_list(cell a, cell b) {
 }
 
 cell get_public_keys() method_id {
-  (_, _, _, cell public_keys, _) = unpack_state();
+  (_, _, _, _, cell public_keys, _) = unpack_state();
   return public_keys;
 }
 
@@ -222,14 +267,14 @@ cell get_public_keys() method_id {
 }
 
 cell messages_by_mask(int mask) method_id {
-  (int n, _, _, _, cell pending_queries) = unpack_state();
+  (_, int n, _, _, _, cell pending_queries) = unpack_state();
   int i = -1;
   cell a = new_dict();
   do {
     (i, var cs, var f) = pending_queries.udict_get_next?(64, i);
     if (f) {
       if (cs~load_int(1)) {
-        int cnt_bits = cs.skip_bits(8).preload_uint(n);
+        int cnt_bits = cs.skip_bits(8 + 8).preload_uint(n);
         if (cnt_bits & mask) {
           a~udict_set_builder(64, i, begin_cell().store_slice(cs));
         }
@@ -248,7 +293,7 @@ cell get_messages_unsigned() method_id {
 }
 
 (int, int) get_n_k() method_id {
-  (int n, int k, _, _, _) = unpack_state();
+  (_, int n, int k, _, _, _) = unpack_state();
   return (n, k);
 }
 
diff --git a/submodules/ton/tonlib-src/crypto/smartcont/new-auto-dns.fif b/submodules/ton/tonlib-src/crypto/smartcont/new-auto-dns.fif
new file mode 100644
index 0000000000..3d4848b4d7
--- /dev/null
+++ b/submodules/ton/tonlib-src/crypto/smartcont/new-auto-dns.fif
@@ -0,0 +1,66 @@
+#!/usr/bin/fift -s
+"TonUtil.fif" include
+"Asm.fif" include
+"GetOpt.fif" include
+
+{ show-options-help 1 halt } : usage
+
+Basechain =: wc   // create smart contract in basechain
+"new-dns-query.boc" =: savefile
+0 =: contract-id
+variable dns-dict  dictnew dns-dict !
+
+begin-options
+     "<filename-base> <address> <reg-period> <reg-price> <ng-per-bit> <ng-per-cell> [-w<workchain>] [-r<random-id>] [-o<savefile-boc>]" +cr +tab
+    +"Creates a new automatic dns smart contract with 32-bit identifier <random-id> controlled from wallet with address <address> "
+    +"and saves it into <savefile-boc> ('" savefile $+ +"' by default)"
+    disable-digit-options generic-help-setopt
+  "w" "--workchain" { parse-workchain-id =: wc } short-long-option-arg
+    "Selects workchain to create smart contract (" wc (.) $+ +" by default)" option-help
+  "r" "--random-id" { parse-int =: contract-id } short-long-option-arg
+    "Sets 'random' smart contract identifier (" contract-id (.) $+ +" by default)" option-help
+  "o" "--output" { =: savefile } short-long-option-arg
+    "Sets output file for generated initialization message ('" savefile $+ +"' by default)" option-help
+  "h" "--help" { usage } short-long-option
+    "Shows a help message" option-help
+parse-options
+
+$# 6 <> ' usage if
+6 :$1..n
+$1 =: file-base
+$2 false parse-load-address drop 2=: ctl-addr
+$3 parse-int dup 0 10000000 in-range? ' usage ifnot =: reg-period
+$4 $>GR =: reg-price
+$5 parse-int dup 0< ' usage if =: ng-pb
+$6 parse-int dup 0< ' usage if =: ng-pc
+contract-id 32 fits ' usage ifnot
+{ contract-id ?dup { (.) $+ } if } : +contractid
+
+."Creating new automatic DNS smart contract in workchain " wc .
+."with random id " contract-id . cr
+."Controlling wallet (smart contract) is " ctl-addr 6 .Addr cr
+."Subdomain registration period is " reg-period . ."seconds" cr
+."Subdomain registration price is " reg-price .GR
+."+ " ng-pc . ."per cell + " ng-pb . ."per bit" cr
+
+// Create new automatic DNS; source code included from `auto/dns-auto-code.fif`
+"auto/dns-auto-code.fif" include
+// code
+<b <b ctl-addr -rot 8 i, swap 256 u, contract-id 32 i, b> ref,  // ctl
+   dns-dict @ dict, dictnew dict,   // dom_dict gc
+   reg-period 30 u, reg-price Gram, ng-pc Gram, ng-pb Gram,  // stdper ppc ppb
+   0 64 u,  // nhk lhk
+b> // data
+null // no libraries
+<b b{0011} s, 3 roll ref, rot ref, swap dict, b>  // create StateInit
+dup ."StateInit: " <s csr. cr
+dup hashu wc swap 2dup 2constant wallet_addr
+."new automatic DNS smartcontract address = " 2dup .addr cr
+2dup file-base +"-dns" +contractid +".addr" save-address-verbose
+."Non-bounceable address (for init): " 2dup 7 .Addr cr
+."Bounceable address (for later access): " 6 .Addr cr
+<b b{1000100} s, wallet_addr addr, b{000010} s, swap <s s, b{0} s, b>
+dup ."External message for initialization is " <s csr. cr
+2 boc+>B dup Bx. cr
+savefile tuck B>file
+."(Saved dns smart-contract creating query to file " type .")" cr
diff --git a/submodules/ton/tonlib-src/crypto/smartcont/new-manual-dns.fif b/submodules/ton/tonlib-src/crypto/smartcont/new-manual-dns.fif
new file mode 100644
index 0000000000..47b57bbee3
--- /dev/null
+++ b/submodules/ton/tonlib-src/crypto/smartcont/new-manual-dns.fif
@@ -0,0 +1,63 @@
+#!/usr/bin/fift -s
+"TonUtil.fif" include
+"Asm.fif" include
+"GetOpt.fif" include
+
+{ show-options-help 1 halt } : usage
+
+Basechain =: wc   // create smart contract in basechain
+65536 =: timeout
+"new-dns-query.boc" =: savefile
+variable dns-dict  dictnew dns-dict !
+
+begin-options
+     " <filename-base> <contract-id> [-w<workchain>] [-t<timeout>] [-o<savefile-boc>]" +cr +tab
+    +"Creates a new manual dns smart contract with 32-bit identifier <contract-id> managed by private key <filename-base>.pk, "
+    +"and saves it into <savefile-boc> ('" savefile $+ +"' by default)"
+    disable-digit-options generic-help-setopt
+  "w" "--workchain" { parse-workchain-id =: wc } short-long-option-arg
+    "Selects workchain to create smart contract (" wc (.) $+ +" by default)" option-help
+  "t" "--timeout" { parse-int =: timeout } short-long-option-arg
+    "Sets expiration timeout for the initialization message in seconds (" timeout (.) $+ +" by default)" option-help
+  "o" "--output" { =: savefile } short-long-option-arg
+    "Sets output file for generated initialization message ('" savefile $+ +"' by default)" option-help
+  "h" "--help" { usage } short-long-option
+    "Shows a help message" option-help
+parse-options
+
+$# 2 <> ' usage if
+2 :$1..n
+$1 =: file-base
+$2 parse-int dup =: contract-id
+32 fits ' usage ifnot
+{ contract-id (.) $+ } : +contractid
+
+."Creating new manual DNS smart contract in workchain " wc .
+."with contract id " contract-id . cr
+
+// Create new manual DNS; source code included from `auto/dns-manual-code.fif`
+"auto/dns-manual-code.fif" include
+// code
+<b contract-id 32 i, 0 64 u,
+   file-base +".pk" load-generate-keypair
+   constant wallet_pk
+   B, dns-dict @ dict, false 1 i,
+b> // data
+null // no libraries
+<b b{0011} s, 3 roll ref, rot ref, swap dict, b>  // create StateInit
+dup ."StateInit: " <s csr. cr
+dup hashu wc swap 2dup 2constant wallet_addr
+."new manual DNS smartcontract address = " 2dup .addr cr
+2dup file-base +"-dns" +contractid +".addr" save-address-verbose
+."Non-bounceable address (for init): " 2dup 7 .Addr cr
+."Bounceable address (for later access): " 6 .Addr cr
+now timeout + 32 << 1- dup =: query_id
+."Init query_id is " dup . ."(0x" X._ .")" cr
+<b contract-id 32 i, query_id 64 u, 0 6 u, b>
+dup ."signing message: " <s csr. cr
+dup hashu wallet_pk ed25519_sign_uint rot
+<b b{1000100} s, wallet_addr addr, b{000010} s, swap <s s, b{0} s, swap B, swap <s s, b>
+dup ."External message for initialization is " <s csr. cr
+2 boc+>B dup Bx. cr
+savefile tuck B>file
+."(Saved dns smart-contract creating query to file " type .")" cr
diff --git a/submodules/ton/tonlib-src/crypto/smartcont/new-wallet-v2.fif b/submodules/ton/tonlib-src/crypto/smartcont/new-wallet-v2.fif
index d59c6c5201..0bb2bcd19c 100755
--- a/submodules/ton/tonlib-src/crypto/smartcont/new-wallet-v2.fif
+++ b/submodules/ton/tonlib-src/crypto/smartcont/new-wallet-v2.fif
@@ -15,8 +15,8 @@ def? $2 { @' $2 } { "new-wallet" } cond constant file-base
 
 // Create new advanced wallet; code adapted from `auto/wallet-code.fif`
 <{ SETCP0 DUP IFNOTRET // return if recv_internal
-   DUP 85143 INT EQUAL IFJMP:<{ // "seqno" get-method
-     DROP c4 PUSHCTR CTOS 32 PLDU  // cnt
+   DUP 85143 INT EQUAL OVER 78748 INT EQUAL OR IFJMP:<{ // "seqno" and "get_public_key" get-methods
+     1 INT AND c4 PUSHCTR CTOS 32 LDU 256 PLDU CONDSEL  // cnt or pubk
    }>
    INC 32 THROWIF	// fail unless recv_external
    9 PUSHPOW2 LDSLICEX DUP 32 LDU 32 LDU	//  signature in_msg msg_seqno valid_until cs
diff --git a/submodules/ton/tonlib-src/crypto/smartcont/new-wallet-v3.fif b/submodules/ton/tonlib-src/crypto/smartcont/new-wallet-v3.fif
index 187519c9cd..61e392a0e1 100644
--- a/submodules/ton/tonlib-src/crypto/smartcont/new-wallet-v3.fif
+++ b/submodules/ton/tonlib-src/crypto/smartcont/new-wallet-v3.fif
@@ -2,23 +2,24 @@
 "TonUtil.fif" include
 "Asm.fif" include
 
-{ ."usage: " @' $0 type ." <workchain-id> <wallet-id> [<filename-base>]" cr
+{ ."usage: " $0 type ." <workchain-id> <wallet-id> [<filename-base>]" cr
   ."Creates a new advanced wallet with unique 32-bit identifier <wallet-id> in specified workchain, with private key saved to or loaded from <filename-base>.pk" cr
   ."('new-wallet.pk' by default)" cr 1 halt
 } : usage
 $# 2- -2 and ' usage if
 
+3 :$1..n
 $1 parse-workchain-id =: wc    // set workchain id from command line argument
 $2 parse-int =: subwallet-id
-def? $3 { @' $3 } { "new-wallet" } cond constant file-base
+$3 "new-wallet" replace-if-null =: file-base
 
 ."Creating new advanced v3 wallet in workchain " wc . cr
 ."with unique wallet id " subwallet-id . cr
 
 // Create new advanced wallet; code adapted from `auto/wallet3-code.fif`
 <{ SETCP0 DUP IFNOTRET // return if recv_internal
-   DUP 85143 INT EQUAL IFJMP:<{ // "seqno" get-method
-     DROP c4 PUSHCTR CTOS 32 PLDU  // cnt
+   DUP 85143 INT EQUAL OVER 78748 INT EQUAL OR IFJMP:<{ // "seqno" and "get_public_key" get-methods
+     1 INT AND c4 PUSHCTR CTOS 32 LDU 32 LDU NIP 256 PLDU CONDSEL  // cnt or pubk
    }>
    INC 32 THROWIF	// fail unless recv_external
    9 PUSHPOW2 LDSLICEX DUP 32 LDU 32 LDU 32 LDU 	//  signature in_msg subwallet_id valid_until msg_seqno cs
diff --git a/submodules/ton/tonlib-src/crypto/smartcont/new-wallet.fif b/submodules/ton/tonlib-src/crypto/smartcont/new-wallet.fif
index ac8d4a0e3a..b1aead9000 100755
--- a/submodules/ton/tonlib-src/crypto/smartcont/new-wallet.fif
+++ b/submodules/ton/tonlib-src/crypto/smartcont/new-wallet.fif
@@ -15,8 +15,8 @@ def? $2 { @' $2 } { "new-wallet" } cond constant file-base
 
 // Create new simple wallet
 <{ SETCP0 DUP IFNOTRET // return if recv_internal
-   DUP 85143 INT EQUAL IFJMP:<{ // "seqno" get-method
-     DROP c4 PUSHCTR CTOS 32 PLDU  // cnt
+   DUP 85143 INT EQUAL OVER 78748 INT EQUAL OR IFJMP:<{ // "seqno" and "get_public_key" get-methods
+     1 INT AND c4 PUSHCTR CTOS 32 LDU 256 PLDU CONDSEL  // cnt or pubk
    }>
    INC 32 THROWIF  // fail unless recv_external
    512 INT LDSLICEX DUP 32 PLDU   // sign cs cnt
diff --git a/submodules/ton/tonlib-src/crypto/smartcont/restricted-wallet-code.fc b/submodules/ton/tonlib-src/crypto/smartcont/restricted-wallet-code.fc
index 83639dfdff..a31683406f 100644
--- a/submodules/ton/tonlib-src/crypto/smartcont/restricted-wallet-code.fc
+++ b/submodules/ton/tonlib-src/crypto/smartcont/restricted-wallet-code.fc
@@ -62,6 +62,12 @@ int seqno() method_id {
   return get_data().begin_parse().preload_uint(32);
 }
 
-int balance() method_id {
-  return restricted?() ? 0 : get_balance().first();
+int get_public_key() method_id {
+  var cs = get_data().begin_parse();
+  cs~load_uint(32);
+  return cs.preload_uint(256);
+}
+
+int balance() method_id {
+  return restricted?() ? 0 : get_balance().pair_first();
 }
diff --git a/submodules/ton/tonlib-src/crypto/smartcont/restricted-wallet2-code.fc b/submodules/ton/tonlib-src/crypto/smartcont/restricted-wallet2-code.fc
index fa57e77d24..8d509886e1 100644
--- a/submodules/ton/tonlib-src/crypto/smartcont/restricted-wallet2-code.fc
+++ b/submodules/ton/tonlib-src/crypto/smartcont/restricted-wallet2-code.fc
@@ -55,12 +55,18 @@ int seqno() method_id {
   return get_data().begin_parse().preload_uint(32);
 }
 
+int get_public_key() method_id {
+  var cs = get_data().begin_parse();
+  cs~load_uint(32);
+  return cs.preload_uint(256);
+}
+
 int balance() method_id {
   var ds = get_data().begin_parse().skip_bits(32 + 256);
   var rdict = ds~load_dict();
   ds.end_parse();
   var ts = days_passed();
-  var balance = get_balance().first();
+  var balance = get_balance().pair_first();
   var (_, value, found) = rdict.idict_get_preveq?(16, ts);
   if (found) {
     balance = max(balance - value~load_grams(), 0);
diff --git a/submodules/ton/tonlib-src/crypto/smartcont/show-addr.fif b/submodules/ton/tonlib-src/crypto/smartcont/show-addr.fif
index 5d3094644f..86b314630b 100755
--- a/submodules/ton/tonlib-src/crypto/smartcont/show-addr.fif
+++ b/submodules/ton/tonlib-src/crypto/smartcont/show-addr.fif
@@ -1,19 +1,20 @@
 #!/usr/bin/fift -s
 "TonUtil.fif" include
 
-{ ."usage: " @' $0 type ." <filename-base>" cr
+{ ."usage: " $0 type ." <filename-base>" cr
   ."Shows the address of a simple wallet created by new-wallet.fif, with address in <filename-base>.addr "
   ."and private key in file <filename-base>.pk" cr 1 halt
 } : usage
-def? $# { @' $# 1 > ' usage if } if
-def? $1 { @' $1 } { "new-wallet" } cond constant file-base
+$# 1 > ' usage if
+1 :$1..n
+$1 "new-wallet" replace-if-null =: file-base
 
 file-base +".addr" dup ."Loading wallet address from " type cr file>B 32 B| 
 dup Blen { 32 B>i@ } { drop Basechain } cond constant wallet_wc
 256 B>u@ dup constant wallet_addr
-."Source wallet address = " wallet_wc ._ .":" x. cr
-wallet_wc wallet_addr 2dup 7 smca>$ ."Non-bounceable address (for init only): " type cr
-6 smca>$ ."Bounceable address (for later access): " type cr
+."Source wallet address = " wallet_wc swap 2dup .addr cr
+."Non-bounceable address (for init only): " 2dup 7 .Addr cr
+."Bounceable address (for later access): " 6 .Addr cr
 
 file-base +".pk" dup file-exists? {
   dup file>B dup Blen 32 <> abort"Private key must be exactly 32 bytes long"
diff --git a/submodules/ton/tonlib-src/crypto/smartcont/simple-wallet-code.fc b/submodules/ton/tonlib-src/crypto/smartcont/simple-wallet-code.fc
index 266bc9ac1f..a43b8b9299 100644
--- a/submodules/ton/tonlib-src/crypto/smartcont/simple-wallet-code.fc
+++ b/submodules/ton/tonlib-src/crypto/smartcont/simple-wallet-code.fc
@@ -15,7 +15,7 @@
   throw_unless(33, msg_seqno == stored_seqno);
   throw_unless(34, check_signature(slice_hash(in_msg), signature, public_key));
   accept_message();
-  cs~touch_slice();
+  cs~touch();
   if (cs.slice_refs()) {
     var mode = cs~load_uint(8);
     send_raw_message(cs~load_ref(), mode);
diff --git a/submodules/ton/tonlib-src/crypto/smartcont/simple-wallet-ext-code.fc b/submodules/ton/tonlib-src/crypto/smartcont/simple-wallet-ext-code.fc
index a20b96a861..fb43e83325 100644
--- a/submodules/ton/tonlib-src/crypto/smartcont/simple-wallet-ext-code.fc
+++ b/submodules/ton/tonlib-src/crypto/smartcont/simple-wallet-ext-code.fc
@@ -30,7 +30,7 @@ slice do_verify_message(slice in_msg, int seqno, int public_key) {
   (int stored_seqno, int public_key) = load_state();
   var cs = do_verify_message(in_msg, stored_seqno, public_key);
   accept_message();
-  cs~touch_slice();
+  cs~touch();
   if (cs.slice_refs()) {
     var mode = cs~load_uint(8);
     send_raw_message(cs~load_ref(), mode);
@@ -45,6 +45,11 @@ int seqno() method_id {
   return get_data().begin_parse().preload_uint(32);
 }
 
+int get_public_key() method_id {
+  var (seqno, public_key) = load_state();
+  return public_key;
+}
+
 cell create_init_state(int public_key) method_id {
   return create_state(0, public_key);
 }
@@ -57,11 +62,7 @@ cell prepare_send_message(int mode, cell msg) method_id {
   return prepare_send_message_with_seqno(mode, msg, seqno());
 }
 
-
 slice verify_message(slice msg) method_id {
   var (stored_seqno, public_key) = load_state();
   return do_verify_message(msg, stored_seqno, public_key);
 }
-
-
-
diff --git a/submodules/ton/tonlib-src/crypto/smartcont/stdlib.fc b/submodules/ton/tonlib-src/crypto/smartcont/stdlib.fc
index 0798a0a1b5..ca8337e133 100644
--- a/submodules/ton/tonlib-src/crypto/smartcont/stdlib.fc
+++ b/submodules/ton/tonlib-src/crypto/smartcont/stdlib.fc
@@ -6,21 +6,34 @@ forall X -> (X, tuple) uncons(tuple list) asm "UNCONS";
 forall X -> (tuple, X) list_next(tuple list) asm( -> 1 0) "UNCONS";
 forall X -> X car(tuple list) asm "CAR";
 tuple cdr(tuple list) asm "CDR";
-forall X, Y -> tuple pair(X x, Y y) asm "PAIR";
-forall X, Y -> (X, Y) unpair(tuple t) asm "UNPAIR";
-forall X, Y, Z -> tuple triple(X x, Y y, Z z) asm "TRIPLE";
-forall X, Y, Z -> (X, Y, Z) untriple(tuple t) asm "UNTRIPLE";
-forall X, Y, Z, W -> tuple tuple4(X x, Y y, Z z, W w) asm "4 TUPLE";
-forall X, Y, Z, W -> (X, Y, Z, W) untuple4(tuple t) asm "4 UNTUPLE";
+tuple empty_tuple() asm "NIL";
+forall X -> tuple tpush(tuple t, X value) asm "TPUSH";
+forall X -> (tuple, ()) ~tpush(tuple t, X value) asm "TPUSH";
+forall X -> [X] single(X x) asm "SINGLE";
+forall X -> X unsingle([X] t) asm "UNSINGLE";
+forall X, Y -> [X, Y] pair(X x, Y y) asm "PAIR";
+forall X, Y -> (X, Y) unpair([X, Y] t) asm "UNPAIR";
+forall X, Y, Z -> [X, Y, Z] triple(X x, Y y, Z z) asm "TRIPLE";
+forall X, Y, Z -> (X, Y, Z) untriple([X, Y, Z] t) asm "UNTRIPLE";
+forall X, Y, Z, W -> [X, Y, Z, W] tuple4(X x, Y y, Z z, W w) asm "4 TUPLE";
+forall X, Y, Z, W -> (X, Y, Z, W) untuple4([X, Y, Z, W] t) asm "4 UNTUPLE";
 forall X -> X first(tuple t) asm "FIRST";
 forall X -> X second(tuple t) asm "SECOND";
 forall X -> X third(tuple t) asm "THIRD";
 forall X -> X fourth(tuple t) asm "3 INDEX";
+forall X, Y -> X pair_first([X, Y] p) asm "FIRST";
+forall X, Y -> Y pair_second([X, Y] p) asm "SECOND";
+forall X, Y, Z -> X triple_first([X, Y, Z] p) asm "FIRST";
+forall X, Y, Z -> Y triple_second([X, Y, Z] p) asm "SECOND";
+forall X, Y, Z -> Z triple_third([X, Y, Z] p) asm "THIRD";
 forall X -> X null() asm "PUSHNULL";
+forall X -> (X, ()) ~impure_touch(X x) impure asm "NOP";
 
 int now() asm "NOW";
 slice my_address() asm "MYADDR";
-tuple get_balance() asm "BALANCE";
+[int, cell] get_balance() asm "BALANCE";
+int cur_lt() asm "LTIME";
+int block_lt() asm "BLOCKLT";
 
 int cell_hash(cell c) asm "HASHCU";
 int slice_hash(slice s) asm "HASHSU";
@@ -29,16 +42,23 @@ int string_hash(slice s) asm "SHA256U";
 int check_signature(int hash, slice signature, int public_key) asm "CHKSIGNU";
 int check_data_signature(slice data, slice signature, int public_key) asm "CHKSIGNS";
 
+(int, int, int) compute_data_size(cell c, int max_cells) asm "CDATASIZE";
+(int, int, int) slice_compute_data_size(slice s, int max_cells) asm "SDATASIZE";
+
 ;; () throw_if(int excno, int cond) impure asm "THROWARGIF";
 
 () dump_stack() impure asm "DUMPSTK";
 
 cell get_data() asm "c4 PUSH";
 () set_data(cell c) impure asm "c4 POP";
-cell get_c3() impure asm "c3 PUSH";
-() set_c3(cell c) impure asm "c3 POP";
+cont get_c3() impure asm "c3 PUSH";
+() set_c3(cont c) impure asm "c3 POP";
+cont bless(slice s) impure asm "BLESS";
+
 () accept_message() impure asm "ACCEPT";
+() set_gas_limit(int limit) impure asm "SETGASLIMIT";
 () commit() impure asm "COMMIT";
+() buy_gas(int gram) impure asm "BUYGAS";
 
 int min(int x, int y) asm "MIN";
 int max(int x, int y) asm "MAX";
@@ -59,16 +79,28 @@ slice skip_bits(slice s, int len) asm "SDSKIPFIRST";
 slice first_bits(slice s, int len) asm "SDCUTFIRST";
 slice skip_last_bits(slice s, int len) asm "SDSKIPLAST";
 (slice, ()) ~skip_last_bits(slice s, int len) asm "SDSKIPLAST";
+slice slice_last(slice s, int len) asm "SDCUTLAST";
 (slice, cell) load_dict(slice s) asm( -> 1 0) "LDDICT";
 cell preload_dict(slice s) asm "PLDDICT";
 slice skip_dict(slice s) asm "SKIPDICT";
 
+(slice, cell) load_maybe_ref(slice s) asm( -> 1 0) "LDOPTREF";
+cell preload_maybe_ref(slice s) asm "PLDOPTREF";
+builder store_maybe_ref(builder b, cell c) asm(c b) "STOPTREF";
+
+int cell_depth(cell c) asm "CDEPTH";
+
 int slice_refs(slice s) asm "SREFS";
 int slice_bits(slice s) asm "SBITS";
 (int, int) slice_bits_refs(slice s) asm "SBITREFS";
 int slice_empty?(slice s) asm "SEMPTY";
 int slice_data_empty?(slice s) asm "SDEMPTY";
 int slice_refs_empty?(slice s) asm "SREMPTY";
+int slice_depth(slice s) asm "SDEPTH";
+
+int builder_refs(builder b) asm "BREFS";
+int builder_bits(builder b) asm "BBITS";
+int builder_depth(builder b) asm "BDEPTH";
 
 builder begin_cell() asm "NEWC";
 cell end_cell(builder b) asm "ENDC";
@@ -89,7 +121,8 @@ cell idict_set_ref(cell dict, int key_len, int index, cell value) asm(value inde
 cell udict_set_ref(cell dict, int key_len, int index, cell value) asm(value index dict key_len) "DICTUSETREF";
 (cell, ()) ~udict_set_ref(cell dict, int key_len, int index, cell value) asm(value index dict key_len) "DICTUSETREF";
 cell idict_get_ref(cell dict, int key_len, int index) asm(index dict key_len) "DICTIGETOPTREF";
-cell udict_get_ref(cell dict, int key_len, int index) asm(index dict key_len) "DICTUGETOPTREF";
+(cell, int) idict_get_ref?(cell dict, int key_len, int index) asm(index dict key_len) "DICTIGETREF";
+(cell, int) udict_get_ref?(cell dict, int key_len, int index) asm(index dict key_len) "DICTUGETREF";
 (cell, cell) idict_set_get_ref(cell dict, int key_len, int index, cell value) asm(value index dict key_len) "DICTISETGETOPTREF";
 (cell, cell) udict_set_get_ref(cell dict, int key_len, int index, cell value) asm(value index dict key_len) "DICTUSETGETOPTREF";
 (cell, int) idict_delete?(cell dict, int key_len, int index) asm(index dict key_len) "DICTIDEL";
@@ -120,36 +153,52 @@ cell dict_set_builder(cell dict, int key_len, slice index, builder value) asm(va
 (cell, int) udict_replace_builder?(cell dict, int key_len, int index, builder value) asm(value index dict key_len) "DICTUREPLACEB";
 (cell, int) idict_add_builder?(cell dict, int key_len, int index, builder value) asm(value index dict key_len) "DICTIADDB";
 (cell, int) idict_replace_builder?(cell dict, int key_len, int index, builder value) asm(value index dict key_len) "DICTIREPLACEB";
-(cell, int, slice, int) udict_delete_get_min(cell dict, int key_len) asm(-> 0 2 1 3) "DICTUREMMIN" "NULLSWAPIFNOT" "NULLSWAPIFNOT";
-(cell, (int, slice, int)) ~udict::delete_get_min(cell dict, int key_len) asm(-> 0 2 1 3) "DICTUREMMIN" "NULLSWAPIFNOT" "NULLSWAPIFNOT";
-(cell, int, slice, int) idict_delete_get_min(cell dict, int key_len) asm(-> 0 2 1 3) "DICTIREMMIN" "NULLSWAPIFNOT" "NULLSWAPIFNOT";
-(cell, (int, slice, int)) ~idict::delete_get_min(cell dict, int key_len) asm(-> 0 2 1 3) "DICTIREMMIN" "NULLSWAPIFNOT" "NULLSWAPIFNOT";
-(cell, slice, slice, int) dict_delete_get_min(cell dict, int key_len) asm(-> 0 2 1 3) "DICTREMMIN" "NULLSWAPIFNOT" "NULLSWAPIFNOT";
-(cell, (slice, slice, int)) ~dict::delete_get_min(cell dict, int key_len) asm(-> 0 2 1 3) "DICTREMMIN" "NULLSWAPIFNOT" "NULLSWAPIFNOT";
-(cell, int, slice, int) udict_delete_get_max(cell dict, int key_len) asm(-> 0 2 1 3) "DICTUREMMAX" "NULLSWAPIFNOT" "NULLSWAPIFNOT";
-(cell, (int, slice, int)) ~udict::delete_get_max(cell dict, int key_len) asm(-> 0 2 1 3) "DICTUREMMAX" "NULLSWAPIFNOT" "NULLSWAPIFNOT";
-(cell, int, slice, int) idict_delete_get_max(cell dict, int key_len) asm(-> 0 2 1 3) "DICTIREMMAX" "NULLSWAPIFNOT" "NULLSWAPIFNOT";
-(cell, (int, slice, int)) ~idict::delete_get_max(cell dict, int key_len) asm(-> 0 2 1 3) "DICTIREMMAX" "NULLSWAPIFNOT" "NULLSWAPIFNOT";
-(cell, slice, slice, int) dict_delete_get_max(cell dict, int key_len) asm(-> 0 2 1 3) "DICTREMMAX" "NULLSWAPIFNOT" "NULLSWAPIFNOT";
-(cell, (slice, slice, int)) ~dict::delete_get_max(cell dict, int key_len) asm(-> 0 2 1 3) "DICTREMMAX" "NULLSWAPIFNOT" "NULLSWAPIFNOT";
-(int, slice, int) udict_get_next?(cell dict, int key_len, int pivot) asm(pivot dict key_len -> 1 0 2) "DICTUGETNEXT" "NULLSWAPIFNOT" "NULLSWAPIFNOT";
-(int, slice, int) udict_get_nexteq?(cell dict, int key_len, int pivot) asm(pivot dict key_len -> 1 0 2) "DICTUGETNEXTEQ" "NULLSWAPIFNOT" "NULLSWAPIFNOT";
-(int, slice, int) udict_get_prev?(cell dict, int key_len, int pivot) asm(pivot dict key_len -> 1 0 2) "DICTUGETPREV" "NULLSWAPIFNOT" "NULLSWAPIFNOT";
-(int, slice, int) udict_get_preveq?(cell dict, int key_len, int pivot) asm(pivot dict key_len -> 1 0 2) "DICTUGETPREVEQ" "NULLSWAPIFNOT" "NULLSWAPIFNOT";
-(int, slice, int) idict_get_next?(cell dict, int key_len, int pivot) asm(pivot dict key_len -> 1 0 2) "DICTIGETNEXT" "NULLSWAPIFNOT" "NULLSWAPIFNOT";
-(int, slice, int) idict_get_nexteq?(cell dict, int key_len, int pivot) asm(pivot dict key_len -> 1 0 2) "DICTIGETNEXTEQ" "NULLSWAPIFNOT" "NULLSWAPIFNOT";
-(int, slice, int) idict_get_prev?(cell dict, int key_len, int pivot) asm(pivot dict key_len -> 1 0 2) "DICTIGETPREV" "NULLSWAPIFNOT" "NULLSWAPIFNOT";
-(int, slice, int) idict_get_preveq?(cell dict, int key_len, int pivot) asm(pivot dict key_len -> 1 0 2) "DICTIGETPREVEQ" "NULLSWAPIFNOT" "NULLSWAPIFNOT";
+(cell, int, slice, int) udict_delete_get_min(cell dict, int key_len) asm(-> 0 2 1 3) "DICTUREMMIN" "NULLSWAPIFNOT2";
+(cell, (int, slice, int)) ~udict::delete_get_min(cell dict, int key_len) asm(-> 0 2 1 3) "DICTUREMMIN" "NULLSWAPIFNOT2";
+(cell, int, slice, int) idict_delete_get_min(cell dict, int key_len) asm(-> 0 2 1 3) "DICTIREMMIN" "NULLSWAPIFNOT2";
+(cell, (int, slice, int)) ~idict::delete_get_min(cell dict, int key_len) asm(-> 0 2 1 3) "DICTIREMMIN" "NULLSWAPIFNOT2";
+(cell, slice, slice, int) dict_delete_get_min(cell dict, int key_len) asm(-> 0 2 1 3) "DICTREMMIN" "NULLSWAPIFNOT2";
+(cell, (slice, slice, int)) ~dict::delete_get_min(cell dict, int key_len) asm(-> 0 2 1 3) "DICTREMMIN" "NULLSWAPIFNOT2";
+(cell, int, slice, int) udict_delete_get_max(cell dict, int key_len) asm(-> 0 2 1 3) "DICTUREMMAX" "NULLSWAPIFNOT2";
+(cell, (int, slice, int)) ~udict::delete_get_max(cell dict, int key_len) asm(-> 0 2 1 3) "DICTUREMMAX" "NULLSWAPIFNOT2";
+(cell, int, slice, int) idict_delete_get_max(cell dict, int key_len) asm(-> 0 2 1 3) "DICTIREMMAX" "NULLSWAPIFNOT2";
+(cell, (int, slice, int)) ~idict::delete_get_max(cell dict, int key_len) asm(-> 0 2 1 3) "DICTIREMMAX" "NULLSWAPIFNOT2";
+(cell, slice, slice, int) dict_delete_get_max(cell dict, int key_len) asm(-> 0 2 1 3) "DICTREMMAX" "NULLSWAPIFNOT2";
+(cell, (slice, slice, int)) ~dict::delete_get_max(cell dict, int key_len) asm(-> 0 2 1 3) "DICTREMMAX" "NULLSWAPIFNOT2";
+(int, slice, int) udict_get_min?(cell dict, int key_len) asm (-> 1 0 2) "DICTUMIN" "NULLSWAPIFNOT2";
+(int, slice, int) udict_get_max?(cell dict, int key_len) asm (-> 1 0 2) "DICTUMAX" "NULLSWAPIFNOT2";
+(int, cell, int) udict_get_min_ref?(cell dict, int key_len) asm (-> 1 0 2) "DICTUMINREF" "NULLSWAPIFNOT2";
+(int, cell, int) udict_get_max_ref?(cell dict, int key_len) asm (-> 1 0 2) "DICTUMAXREF" "NULLSWAPIFNOT2";
+(int, slice, int) idict_get_min?(cell dict, int key_len) asm (-> 1 0 2) "DICTIMIN" "NULLSWAPIFNOT2";
+(int, slice, int) idict_get_max?(cell dict, int key_len) asm (-> 1 0 2) "DICTIMAX" "NULLSWAPIFNOT2";
+(int, cell, int) idict_get_min_ref?(cell dict, int key_len) asm (-> 1 0 2) "DICTIMINREF" "NULLSWAPIFNOT2";
+(int, cell, int) idict_get_max_ref?(cell dict, int key_len) asm (-> 1 0 2) "DICTIMAXREF" "NULLSWAPIFNOT2";
+(int, slice, int) udict_get_next?(cell dict, int key_len, int pivot) asm(pivot dict key_len -> 1 0 2) "DICTUGETNEXT" "NULLSWAPIFNOT2";
+(int, slice, int) udict_get_nexteq?(cell dict, int key_len, int pivot) asm(pivot dict key_len -> 1 0 2) "DICTUGETNEXTEQ" "NULLSWAPIFNOT2";
+(int, slice, int) udict_get_prev?(cell dict, int key_len, int pivot) asm(pivot dict key_len -> 1 0 2) "DICTUGETPREV" "NULLSWAPIFNOT2";
+(int, slice, int) udict_get_preveq?(cell dict, int key_len, int pivot) asm(pivot dict key_len -> 1 0 2) "DICTUGETPREVEQ" "NULLSWAPIFNOT2";
+(int, slice, int) idict_get_next?(cell dict, int key_len, int pivot) asm(pivot dict key_len -> 1 0 2) "DICTIGETNEXT" "NULLSWAPIFNOT2";
+(int, slice, int) idict_get_nexteq?(cell dict, int key_len, int pivot) asm(pivot dict key_len -> 1 0 2) "DICTIGETNEXTEQ" "NULLSWAPIFNOT2";
+(int, slice, int) idict_get_prev?(cell dict, int key_len, int pivot) asm(pivot dict key_len -> 1 0 2) "DICTIGETPREV" "NULLSWAPIFNOT2";
+(int, slice, int) idict_get_preveq?(cell dict, int key_len, int pivot) asm(pivot dict key_len -> 1 0 2) "DICTIGETPREVEQ" "NULLSWAPIFNOT2";
 cell new_dict() asm "NEWDICT";
 int dict_empty?(cell c) asm "DICTEMPTY";
 
+(slice, slice, slice, int) pfxdict_get?(cell dict, int key_len, slice key) asm(key dict key_len) "PFXDICTGETQ" "NULLSWAPIFNOT2";
+(cell, int) pfxdict_set?(cell dict, int key_len, slice key, slice value) asm(value key dict key_len) "PFXDICTSET";
+(cell, int) pfxdict_delete?(cell dict, int key_len, slice key) asm(key dict key_len) "PFXDICTDEL";
+
 cell config_param(int x) asm "CONFIGOPTPARAM";
 int cell_null?(cell c) asm "ISNULL";
 
 () raw_reserve(int amount, int mode) impure asm "RAWRESERVE";
-() raw_reserve_extra(slice currencies, int mode) impure asm "RAWRESERVEX";
+() raw_reserve_extra(int amount, cell extra_amount, int mode) impure asm "RAWRESERVEX";
 () send_raw_message(cell msg, int mode) impure asm "SENDRAWMSG";
 () set_code(cell new_code) impure asm "SETCODE";
 
-slice touch_slice(slice s) asm "NOP";
-(slice,()) ~touch_slice(slice s) asm "NOP";
+int random() impure asm "RANDU256";
+int rand(int range) impure asm "RAND";
+int get_seed() impure asm "RANDSEED";
+int set_seed() impure asm "SETRAND";
+() randomize(int x) impure asm "ADDRAND";
+() randomize_lt() impure asm "LTIME" "ADDRAND";
diff --git a/submodules/ton/tonlib-src/crypto/smartcont/update-config-smc.fif b/submodules/ton/tonlib-src/crypto/smartcont/update-config-smc.fif
index 33e5fbcebc..3924363223 100755
--- a/submodules/ton/tonlib-src/crypto/smartcont/update-config-smc.fif
+++ b/submodules/ton/tonlib-src/crypto/smartcont/update-config-smc.fif
@@ -1,7 +1,7 @@
 #!/usr/bin/fift -s
 "TonUtil.fif" include
 
-{ ."usage: " @' $0 type ." <filename-base> <seqno> [<savefile>]" cr
+{ ."usage: " $0 type ." <filename-base> <seqno> [<savefile>]" cr
   ."Creates a request to simple configuration smart contract requesting to change configuration smart contract code to the one currently stored in auto/config-code.fif, "
   ."with private key loaded from file <filename-base>.pk, "
   ."and saves it into <savefile>.boc ('config-query.boc' by default)" cr 1 halt
@@ -9,15 +9,16 @@
 $# dup 2 < swap 3 > or ' usage if
 
 "config-master" constant file-base
-0 constant seqno
+0 constant qseqno
 -1 constant idx
 true constant bounce
 "auto/config-code.fif" constant config-source
 100 constant interval  // valid for 100 seconds
 
+3 :$1..n
 $1 =: file-base
-$2 parse-int =: seqno
-def? $3 { @' $3 } { "config-query" } cond constant savefile
+$2 parse-int =: qseqno
+$3 "config-query" replace-if-null constant savefile
 
 file-base +".addr" load-address
 2dup 2constant config_addr
@@ -30,7 +31,7 @@ config-source include
 dup <s csr. cr
 
 // create a message
-<b x{4e436f64} s, seqno 32 u, now interval + 32 u, swap ref, b>
+<b x{4e436f64} s, qseqno 32 u, now interval + 32 u, swap ref, b>
 dup ."signing message: " <s csr. cr
 dup hashu config_pk ed25519_sign_uint
 <b b{1000100} s, config_addr addr, 0 Gram, b{00} s,
diff --git a/submodules/ton/tonlib-src/crypto/smartcont/validator-elect-req.fif b/submodules/ton/tonlib-src/crypto/smartcont/validator-elect-req.fif
index 215fe9c15c..a220b421d2 100755
--- a/submodules/ton/tonlib-src/crypto/smartcont/validator-elect-req.fif
+++ b/submodules/ton/tonlib-src/crypto/smartcont/validator-elect-req.fif
@@ -22,7 +22,7 @@ def? $5 { @' $5 } { "validator-to-sign.bin" } cond constant output_fname
 ."Creating a request to participate in validator elections at time " elect_time .
 ."from smart contract " -1 src_addr 2dup 1 .Addr ." = " .addr
 ." with maximal stake factor with respect to the minimal stake " max_factor ._
-."/65536 and validator ADNL address " adnl_addr x. cr
+."/65536 and validator ADNL address " adnl_addr 64x. cr
 
 B{654c5074} elect_time 32 u>B B+ max_factor 32 u>B B+ src_addr 256 u>B B+ adnl_addr 256 u>B B+
 dup Bx. cr
diff --git a/submodules/ton/tonlib-src/crypto/smartcont/validator-elect-signed.fif b/submodules/ton/tonlib-src/crypto/smartcont/validator-elect-signed.fif
index 55e3d9ddac..4e681f07dc 100755
--- a/submodules/ton/tonlib-src/crypto/smartcont/validator-elect-signed.fif
+++ b/submodules/ton/tonlib-src/crypto/smartcont/validator-elect-signed.fif
@@ -27,7 +27,7 @@ def? $7 { @' $7 } { "validator-query.boc" } cond constant output_fname
 ."Creating a request to participate in validator elections at time " elect_time .
 ."from smart contract " -1 src_addr 2dup 1 .Addr ." = " .addr
 ." with maximal stake factor with respect to the minimal stake " max_factor ._
-."/65536 and validator ADNL address " adnl_addr x. cr
+."/65536 and validator ADNL address " adnl_addr 64x. cr
 
 B{654c5074} elect_time 32 u>B B+ max_factor 32 u>B B+ src_addr 256 u>B B+ adnl_addr 256 u>B B+
 ."String to sign is: " dup Bx. cr constant to_sign
diff --git a/submodules/ton/tonlib-src/crypto/smartcont/wallet-code.fc b/submodules/ton/tonlib-src/crypto/smartcont/wallet-code.fc
index 3ce2fac154..9d4cddb71b 100644
--- a/submodules/ton/tonlib-src/crypto/smartcont/wallet-code.fc
+++ b/submodules/ton/tonlib-src/crypto/smartcont/wallet-code.fc
@@ -29,3 +29,9 @@
 int seqno() method_id {
   return get_data().begin_parse().preload_uint(32);
 }
+
+int get_public_key() method_id {
+  var cs = get_data().begin_parse();
+  cs~load_uint(32);
+  return cs.preload_uint(256);
+}
diff --git a/submodules/ton/tonlib-src/crypto/smartcont/wallet-v2.fif b/submodules/ton/tonlib-src/crypto/smartcont/wallet-v2.fif
index 3d36643b45..f01ca47e67 100755
--- a/submodules/ton/tonlib-src/crypto/smartcont/wallet-v2.fif
+++ b/submodules/ton/tonlib-src/crypto/smartcont/wallet-v2.fif
@@ -1,30 +1,52 @@
 #!/usr/bin/fift -s
 "TonUtil.fif" include
+"GetOpt.fif" include
+
+{ show-options-help 1 halt } : usage
+
+"" =: comment  // comment for simple transfers
+true =: allow-bounce
+false =: force-bounce
+3 =: send-mode  // mode for SENDRAWMSG: +1 - sender pays fees, +2 - ignore errors
+60 =: timeout   // external message expires in 60 seconds
+
+begin-options
+     " <filename-base> <dest-addr> <seqno> <amount> [-n|-b] [-t<timeout>] [-B <body-boc>] [-C <comment>] [<savefile>]" +cr +tab
+    +"Creates a request to advanced wallet created by new-wallet-v2.fif, with private key loaded from file <filename-base>.pk "
+    +"and address from <filename-base>.addr, and saves it into <savefile>.boc ('wallet-query.boc' by default)"
+    disable-digit-options generic-help-setopt
+  "n" "--no-bounce" { false =: allow-bounce } short-long-option
+    "Clears bounce flag" option-help
+  "b" "--force-bounce" { true =: force-bounce } short-long-option
+    "Forces bounce flag" option-help
+  "t" "--timeout" { parse-int =: timeout } short-long-option-arg
+    "Sets expiration timeout in seconds (" timeout (.) $+ +" by default)" option-help
+  "B" "--body" { =: body-boc-file } short-long-option-arg
+    "Sets the payload of the transfer message" option-help
+  "C" "--comment" { =: comment } short-long-option-arg
+    "Sets the comment to be sent in the transfer message" option-help
+  "m" "--mode" { parse-int =: send-mode } short-long-option-arg
+    "Sets transfer mode (0..255) for SENDRAWMSG (" send-mode (.) $+ +" by default)"
+    option-help
+  "h" "--help" { usage } short-long-option
+    "Shows a help message" option-help
+parse-options
 
-{ ."usage: " @' $0 type ." <filename-base> <dest-addr> <seqno> <amount> [-B <body-boc>] [<savefile>]" cr
-  ."Creates a request to advanced wallet created by new-wallet-v2.fif, with private key loaded from file <filename-base>.pk "
-  ."and address from <filename-base>.addr, and saves it into <savefile>.boc ('wallet-query.boc' by default)" cr 1 halt
-} : usage
-def? $6 { @' $5 "-B" $= { @' $6 =: body-boc-file [forget] $6 def? $7 { @' $7 =: $5 [forget] $7 } { [forget] $5 } cond
-  @' $# 2- =: $# } if } if
 $# dup 4 < swap 5 > or ' usage if
-
+5 :$1..n
 true constant bounce
-
 $1 =: file-base
-$2 bounce parse-load-address =: bounce 2=: dest_addr
+$2 bounce parse-load-address force-bounce or allow-bounce and =: bounce 2=: dest_addr
 $3 parse-int =: seqno
 $4 $>GR =: amount
-def? $5 { @' $5 } { "wallet-query" } cond constant savefile
-3 constant send-mode  // mode for SENDRAWMSG: +1 - sender pays fees, +2 - ignore errors
-60 constant timeout   // external message expires in 60 seconds
+$5 "wallet-query" replace-if-null =: savefile
 
 file-base +".addr" load-address
 2dup 2constant wallet_addr
 ."Source wallet address = " 2dup .addr cr 6 .Addr cr
 file-base +".pk" load-keypair nip constant wallet_pk
 
-def? body-boc-file { @' body-boc-file file>B B>boc } { <b 0 32 u, "TESTv2" $, b> } cond
+def? body-boc-file { @' body-boc-file file>B B>boc } { comment simple-transfer-body } cond
 constant body-cell
 
 ."Transferring " amount .GR ."to account "
@@ -33,8 +55,8 @@ dest_addr 2dup bounce 7 + .Addr ." = " .addr
 ."Body of transfer message is " body-cell <s csr. cr
   
 // create a message
-<b b{01} s, bounce 1 i, b{000100} s, dest_addr addr, amount Gram, 0 9 64 32 + + 1+ u, 
-  body-cell <s 2dup s-fits? not rot over 1 i, -rot { drop body-cell ref, } { s, } cond
+<b b{01} s, bounce 1 i, b{000} s, dest_addr Addr, amount Gram, 0 9 64 32 + + 1+ u,
+  body-cell <s 2dup 1 s-fits-with? not rot over 1 i, -rot { drop body-cell ref, } { s, } cond
 b>
 <b seqno 32 u, now timeout + 32 u, send-mode 8 u, swap ref, b>
 dup ."signing message: " <s csr. cr
diff --git a/submodules/ton/tonlib-src/crypto/smartcont/wallet-v3.fif b/submodules/ton/tonlib-src/crypto/smartcont/wallet-v3.fif
index b23f941adf..71618bb854 100644
--- a/submodules/ton/tonlib-src/crypto/smartcont/wallet-v3.fif
+++ b/submodules/ton/tonlib-src/crypto/smartcont/wallet-v3.fif
@@ -1,31 +1,54 @@
 #!/usr/bin/fift -s
 "TonUtil.fif" include
+"GetOpt.fif" include
+
+{ show-options-help 1 halt } : usage
+
+"" =: comment  // comment for simple transfers
+true =: allow-bounce
+false =: force-bounce
+3 =: send-mode  // mode for SENDRAWMSG: +1 - sender pays fees, +2 - ignore errors
+60 =: timeout   // external message expires in 60 seconds
+
+begin-options
+     " <filename-base> <dest-addr> <subwallet-id> <seqno> <amount> [-n|-b] [-t<timeout>] [-B <body-boc>] [-C <comment>] [<savefile>]" +cr +tab
+    +"Creates a request to advanced wallet created by new-wallet-v3.fif, with private key loaded from file <filename-base>.pk "
+    +"and address from <filename-base>.addr, and saves it into <savefile>.boc ('wallet-query.boc' by default)"
+    disable-digit-options generic-help-setopt
+  "n" "--no-bounce" { false =: allow-bounce } short-long-option
+    "Clears bounce flag" option-help
+  "b" "--force-bounce" { true =: force-bounce } short-long-option
+    "Forces bounce flag" option-help
+  "t" "--timeout" { parse-int =: timeout } short-long-option-arg
+    "Sets expiration timeout in seconds (" timeout (.) $+ +" by default)" option-help
+  "B" "--body" { =: body-boc-file } short-long-option-arg
+    "Sets the payload of the transfer message" option-help
+  "C" "--comment" { =: comment } short-long-option-arg
+    "Sets the comment to be sent in the transfer message" option-help
+  "m" "--mode" { parse-int =: send-mode } short-long-option-arg
+    "Sets transfer mode (0..255) for SENDRAWMSG (" send-mode (.) $+ +" by default)"
+    option-help
+  "h" "--help" { usage } short-long-option
+    "Shows a help message" option-help
+parse-options
 
-{ ."usage: " @' $0 type ." <filename-base> <dest-addr> <subwallet_id> <seqno> <amount> [-B <body-boc>] [<savefile>]" cr
-  ."Creates a request to advanced wallet created by new-wallet-v3.fif, with private key loaded from file <filename-base>.pk "
-  ."and address from <filename-base>.addr, and saves it into <savefile>.boc ('wallet-query.boc' by default)" cr 1 halt
-} : usage
-def? $7 { @' $6 "-B" $= { @' $7 =: body-boc-file [forget] $7 def? $8 { @' $8 =: $6 [forget] $8 } { [forget] $6 } cond
-  @' $# 2- =: $# } if } if
 $# dup 5 < swap 6 > or ' usage if
+6 :$1..n
 
 true constant bounce
-
 $1 =: file-base
-$2 bounce parse-load-address =: bounce 2=: dest_addr
+$2 bounce parse-load-address force-bounce or allow-bounce and =: bounce 2=: dest_addr
 $3 parse-int =: subwallet_id
 $4 parse-int =: seqno
 $5 $>GR =: amount
-def? $6 { @' $6 } { "wallet-query" } cond constant savefile
-3 constant send-mode  // mode for SENDRAWMSG: +1 - sender pays fees, +2 - ignore errors
-60 constant timeout   // external message expires in 60 seconds
+$6 "wallet-query" replace-if-null =: savefile
 
 file-base +".addr" load-address
 2dup 2constant wallet_addr
 ."Source wallet address = " 2dup .addr cr 6 .Addr cr
 file-base +".pk" load-keypair nip constant wallet_pk
 
-def? body-boc-file { @' body-boc-file file>B B>boc } { <b 0 32 u, "TESTv3" $, b> } cond
+def? body-boc-file { @' body-boc-file file>B B>boc } { comment simple-transfer-body } cond
 constant body-cell
 
 ."Transferring " amount .GR ."to account "
@@ -35,8 +58,8 @@ dest_addr 2dup bounce 7 + .Addr ." = " .addr
 ."Body of transfer message is " body-cell <s csr. cr
   
 // create a message
-<b b{01} s, bounce 1 i, b{000100} s, dest_addr addr, amount Gram, 0 9 64 32 + + 1+ u, 
-  body-cell <s 2dup s-fits? not rot over 1 i, -rot { drop body-cell ref, } { s, } cond
+<b b{01} s, bounce 1 i, b{000} s, dest_addr Addr, amount Gram, 0 9 64 32 + + 1+ u,
+  body-cell <s 2dup 1 s-fits-with? not rot over 1 i, -rot { drop body-cell ref, } { s, } cond
 b>
 <b subwallet_id 32 u, now timeout + 32 u, seqno 32 u, send-mode 8 u, swap ref, b>
 dup ."signing message: " <s csr. cr
diff --git a/submodules/ton/tonlib-src/crypto/smartcont/wallet.fif b/submodules/ton/tonlib-src/crypto/smartcont/wallet.fif
index f4eb280255..d752476d29 100755
--- a/submodules/ton/tonlib-src/crypto/smartcont/wallet.fif
+++ b/submodules/ton/tonlib-src/crypto/smartcont/wallet.fif
@@ -1,27 +1,43 @@
 #!/usr/bin/fift -s
 "TonUtil.fif" include
+"GetOpt.fif" include
+
+{ show-options-help 1 halt } : usage
 
-{ ."usage: " @' $0 type ." <filename-base> <dest-addr> <seqno> <amount> [-B <body-boc>] [-C <transfer-comment>] [<savefile>]" cr
-  ."Creates a request to simple wallet created by new-wallet.fif, with private key loaded from file <filename-base>.pk "
-  ."and address from <filename-base>.addr, and saves it into <savefile>.boc ('wallet-query.boc' by default)" cr 1 halt
-} : usage
 "" =: comment  // comment for simple transfers
-def? $6 { @' $5 dup "-B" $= swap "-C" $= tuck or
-  { @' $6 swap { =: comment } { =: body-boc-file } cond [forget] $6
-    def? $7 { @' $7 =: $5 [forget] $7 } { [forget] $5 } cond
-  @' $# 2- =: $#
-  } if
-} if
+true =: allow-bounce
+false =: force-bounce
+3 =: send-mode  // mode for SENDRAWMSG: +1 - sender pays fees, +2 - ignore errors
+
+begin-options
+     " <filename-base> <dest-addr> <seqno> <amount> [-n|-b] [-B <body-boc>] [-C <comment>] [<savefile>]" +cr +tab
+    +"Creates a request to simple wallet created by new-wallet.fif, with private key loaded from file <filename-base>.pk "
+    +"and address from <filename-base>.addr, and saves it into <savefile>.boc ('wallet-query.boc' by default)"
+    disable-digit-options generic-help-setopt
+  "n" "--no-bounce" { false =: allow-bounce } short-long-option
+    "Clears bounce flag" option-help
+  "b" "--force-bounce" { true =: force-bounce } short-long-option
+    "Forces bounce flag" option-help
+  "B" "--body" { =: body-boc-file } short-long-option-arg
+    "Sets the payload of the transfer message" option-help
+  "C" "--comment" { =: comment } short-long-option-arg
+    "Sets the comment to be sent in the transfer message" option-help
+  "m" "--mode" { parse-int =: send-mode } short-long-option-arg
+    "Sets transfer mode (0..255) for SENDRAWMSG (" send-mode (.) $+ +" by default)"
+    option-help
+  "h" "--help" { usage } short-long-option
+    "Shows a help message" option-help
+parse-options
+
 $# dup 4 < swap 5 > or ' usage if
-
-true constant bounce
-
+5 :$1..n
+true =: bounce
 $1 =: file-base
-$2 bounce parse-load-address =: bounce 2=: dest_addr
+$2 bounce parse-load-address allow-bounce and force-bounce or =: bounce 2=: dest_addr
 $3 parse-int =: seqno
 $4 $>GR =: amount
-def? $5 { @' $5 } { "wallet-query" } cond constant savefile
-3 constant send-mode  // mode for SENDRAWMSG: +1 - sender pays fees, +2 - ignore errors
+$5 "wallet-query" replace-if-null =: savefile
+allow-bounce not force-bounce and abort"cannot have bounce flag both set and cleared"
 // "" 1 { 69091 * 1+ 65535 and tuck 2521 / 65 + hold swap } 1000 times drop =: comment
 
 file-base +".addr" load-address
@@ -38,8 +54,8 @@ dest_addr 2dup bounce 7 + .Addr ." = " .addr
 ."Body of transfer message is " body-cell <s csr. cr
   
 // create a message
-<b b{01} s, bounce 1 i, b{000100} s, dest_addr addr, amount Gram, 0 9 64 32 + + 1+ u, 
-  body-cell <s 2dup s-fits? not rot over 1 i, -rot { drop body-cell ref, } { s, } cond
+<b b{01} s, bounce 1 i, b{000} s, dest_addr Addr, amount Gram, 0 9 64 32 + + 1+ u,
+  body-cell <s 2dup 1 s-fits-with? not rot over 1 i, -rot { drop body-cell ref, } { s, } cond
 b>
 <b seqno 32 u, send-mode 8 u, swap ref, b>
 dup ."signing message: " <s csr. cr
diff --git a/submodules/ton/tonlib-src/crypto/smartcont/wallet3-code.fc b/submodules/ton/tonlib-src/crypto/smartcont/wallet3-code.fc
index a52cb1ec04..964b35cda8 100644
--- a/submodules/ton/tonlib-src/crypto/smartcont/wallet3-code.fc
+++ b/submodules/ton/tonlib-src/crypto/smartcont/wallet3-code.fc
@@ -33,3 +33,9 @@
 int seqno() method_id {
   return get_data().begin_parse().preload_uint(32);
 }
+
+int get_public_key() method_id {
+  var cs = get_data().begin_parse();
+  cs~load_uint(64);
+  return cs.preload_uint(256);
+}
diff --git a/submodules/ton/tonlib-src/crypto/smc-envelope/HighloadWallet.cpp b/submodules/ton/tonlib-src/crypto/smc-envelope/HighloadWallet.cpp
new file mode 100644
index 0000000000..faf08950b2
--- /dev/null
+++ b/submodules/ton/tonlib-src/crypto/smc-envelope/HighloadWallet.cpp
@@ -0,0 +1,142 @@
+/*
+    This file is part of TON Blockchain Library.
+
+    TON Blockchain Library is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Lesser General Public License as published by
+    the Free Software Foundation, either version 2 of the License, or
+    (at your option) any later version.
+
+    TON Blockchain Library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public License
+    along with TON Blockchain Library.  If not, see <http://www.gnu.org/licenses/>.
+
+    Copyright 2017-2020 Telegram Systems LLP
+*/
+#include "HighloadWallet.h"
+#include "GenericAccount.h"
+#include "SmartContractCode.h"
+
+#include "vm/boc.h"
+#include "vm/cells/CellString.h"
+#include "td/utils/base64.h"
+
+#include <limits>
+
+namespace ton {
+td::Ref<vm::Cell> HighloadWallet::get_init_state(const td::Ed25519::PublicKey& public_key,
+                                                 td::uint32 wallet_id) noexcept {
+  auto code = get_init_code();
+  auto data = get_init_data(public_key, wallet_id);
+  return GenericAccount::get_init_state(std::move(code), std::move(data));
+}
+
+td::Ref<vm::Cell> HighloadWallet::get_init_message(const td::Ed25519::PrivateKey& private_key,
+                                                   td::uint32 wallet_id) noexcept {
+  td::uint32 seqno = 0;
+  td::uint32 valid_until = std::numeric_limits<td::uint32>::max();
+  auto append_message = [&](auto&& cb) -> vm::CellBuilder& {
+    cb.store_long(wallet_id, 32).store_long(valid_until, 32).store_long(seqno, 32);
+    CHECK(cb.store_maybe_ref({}));
+    return cb;
+  };
+  auto signature = private_key.sign(append_message(vm::CellBuilder()).finalize()->get_hash().as_slice()).move_as_ok();
+
+  return append_message(vm::CellBuilder().store_bytes(signature)).finalize();
+}
+
+td::Ref<vm::Cell> HighloadWallet::make_a_gift_message(const td::Ed25519::PrivateKey& private_key, td::uint32 wallet_id,
+                                                      td::uint32 seqno, td::uint32 valid_until,
+                                                      td::Span<Gift> gifts) noexcept {
+  CHECK(gifts.size() <= max_gifts_size);
+  vm::Dictionary messages(16);
+  for (size_t i = 0; i < gifts.size(); i++) {
+    auto& gift = gifts[i];
+    td::int32 send_mode = 3;
+    auto gramms = gift.gramms;
+    if (gramms == -1) {
+      gramms = 0;
+      send_mode += 128;
+    }
+    vm::CellBuilder cb;
+    GenericAccount::store_int_message(cb, gift.destination, gramms);
+    cb.store_bytes("\0\0\0\0", 4);
+    vm::CellString::store(cb, gift.message, 35 * 8).ensure();
+    auto message_inner = cb.finalize();
+    cb = {};
+    cb.store_long(send_mode, 8).store_ref(message_inner);
+    auto key = messages.integer_key(td::make_refint(i), 16, false);
+    messages.set_builder(key.bits(), 16, cb);
+  }
+
+  vm::CellBuilder cb;
+  cb.store_long(wallet_id, 32).store_long(valid_until, 32).store_long(seqno, 32);
+  CHECK(cb.store_maybe_ref(messages.get_root_cell()));
+  auto message_outer = cb.finalize();
+  auto signature = private_key.sign(message_outer->get_hash().as_slice()).move_as_ok();
+  return vm::CellBuilder().store_bytes(signature).append_cellslice(vm::load_cell_slice(message_outer)).finalize();
+}
+
+td::Ref<vm::Cell> HighloadWallet::get_init_code() noexcept {
+  return SmartContractCode::get_code(SmartContractCode::HighloadWalletV1);
+}
+
+vm::CellHash HighloadWallet::get_init_code_hash() noexcept {
+  return get_init_code()->get_hash();
+}
+
+td::Ref<vm::Cell> HighloadWallet::get_init_data(const td::Ed25519::PublicKey& public_key,
+                                                td::uint32 wallet_id) noexcept {
+  return vm::CellBuilder()
+      .store_long(0, 32)
+      .store_long(wallet_id, 32)
+      .store_bytes(public_key.as_octet_string())
+      .finalize();
+}
+
+td::Result<td::uint32> HighloadWallet::get_seqno() const {
+  return TRY_VM(get_seqno_or_throw());
+}
+
+td::Result<td::uint32> HighloadWallet::get_seqno_or_throw() const {
+  if (state_.data.is_null()) {
+    return 0;
+  }
+  //FIXME use get method
+  return static_cast<td::uint32>(vm::load_cell_slice(state_.data).fetch_ulong(32));
+}
+
+td::Result<td::uint32> HighloadWallet::get_wallet_id() const {
+  return TRY_VM(get_wallet_id_or_throw());
+}
+
+td::Result<td::uint32> HighloadWallet::get_wallet_id_or_throw() const {
+  if (state_.data.is_null()) {
+    return 0;
+  }
+  //FIXME use get method
+  auto cs = vm::load_cell_slice(state_.data);
+  cs.skip_first(32);
+  return static_cast<td::uint32>(cs.fetch_ulong(32));
+}
+
+td::Result<td::Ed25519::PublicKey> HighloadWallet::get_public_key() const {
+  return TRY_VM(get_public_key_or_throw());
+}
+
+td::Result<td::Ed25519::PublicKey> HighloadWallet::get_public_key_or_throw() const {
+  if (state_.data.is_null()) {
+    return td::Status::Error("data is null");
+  }
+  //FIXME use get method
+  auto cs = vm::load_cell_slice(state_.data);
+  cs.skip_first(64);
+  td::SecureString res(td::Ed25519::PublicKey::LENGTH);
+  cs.fetch_bytes(res.as_mutable_slice().ubegin(), td::narrow_cast<td::int32>(res.size()));
+  return td::Ed25519::PublicKey(std::move(res));
+}
+
+}  // namespace ton
diff --git a/submodules/ton/tonlib-src/crypto/smc-envelope/HighloadWallet.h b/submodules/ton/tonlib-src/crypto/smc-envelope/HighloadWallet.h
new file mode 100644
index 0000000000..e1db23efb0
--- /dev/null
+++ b/submodules/ton/tonlib-src/crypto/smc-envelope/HighloadWallet.h
@@ -0,0 +1,63 @@
+/*
+    This file is part of TON Blockchain Library.
+
+    TON Blockchain Library is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Lesser General Public License as published by
+    the Free Software Foundation, either version 2 of the License, or
+    (at your option) any later version.
+
+    TON Blockchain Library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public License
+    along with TON Blockchain Library.  If not, see <http://www.gnu.org/licenses/>.
+
+    Copyright 2017-2020 Telegram Systems LLP
+*/
+#pragma once
+
+#include "smc-envelope/SmartContract.h"
+#include "smc-envelope/WalletInterface.h"
+#include "vm/cells.h"
+#include "Ed25519.h"
+#include "block/block.h"
+#include "vm/cells/CellString.h"
+
+namespace ton {
+class HighloadWallet : ton::SmartContract, public WalletInterface {
+ public:
+  explicit HighloadWallet(State state) : ton::SmartContract(std::move(state)) {
+  }
+  static constexpr unsigned max_message_size = vm::CellString::max_bytes;
+  static constexpr unsigned max_gifts_size = 254;
+  static td::Ref<vm::Cell> get_init_state(const td::Ed25519::PublicKey& public_key, td::uint32 wallet_id) noexcept;
+  static td::Ref<vm::Cell> get_init_message(const td::Ed25519::PrivateKey& private_key, td::uint32 wallet_id) noexcept;
+  static td::Ref<vm::Cell> make_a_gift_message(const td::Ed25519::PrivateKey& private_key, td::uint32 wallet_id,
+                                               td::uint32 seqno, td::uint32 valid_until, td::Span<Gift> gifts) noexcept;
+
+  static td::Ref<vm::Cell> get_init_code() noexcept;
+  static vm::CellHash get_init_code_hash() noexcept;
+  static td::Ref<vm::Cell> get_init_data(const td::Ed25519::PublicKey& public_key, td::uint32 wallet_id) noexcept;
+
+  td::Result<td::uint32> get_seqno() const;
+  td::Result<td::uint32> get_wallet_id() const;
+
+  td::Result<td::Ref<vm::Cell>> make_a_gift_message(const td::Ed25519::PrivateKey& private_key, td::uint32 valid_until,
+                                                    td::Span<Gift> gifts) const override {
+    TRY_RESULT(seqno, get_seqno());
+    TRY_RESULT(wallet_id, get_wallet_id());
+    return make_a_gift_message(private_key, wallet_id, seqno, valid_until, gifts);
+  }
+  size_t get_max_gifts_size() const override {
+    return max_gifts_size;
+  }
+  td::Result<td::Ed25519::PublicKey> get_public_key() const override;
+
+ private:
+  td::Result<td::uint32> get_seqno_or_throw() const;
+  td::Result<td::uint32> get_wallet_id_or_throw() const;
+  td::Result<td::Ed25519::PublicKey> get_public_key_or_throw() const;
+};
+}  // namespace ton
diff --git a/submodules/ton/tonlib-src/crypto/smc-envelope/HighloadWalletV2.cpp b/submodules/ton/tonlib-src/crypto/smc-envelope/HighloadWalletV2.cpp
new file mode 100644
index 0000000000..dbdb52347a
--- /dev/null
+++ b/submodules/ton/tonlib-src/crypto/smc-envelope/HighloadWalletV2.cpp
@@ -0,0 +1,151 @@
+/*
+    This file is part of TON Blockchain Library.
+
+    TON Blockchain Library is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Lesser General Public License as published by
+    the Free Software Foundation, either version 2 of the License, or
+    (at your option) any later version.
+
+    TON Blockchain Library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public License
+    along with TON Blockchain Library.  If not, see <http://www.gnu.org/licenses/>.
+
+    Copyright 2017-2020 Telegram Systems LLP
+*/
+#include "HighloadWalletV2.h"
+#include "GenericAccount.h"
+#include "SmartContractCode.h"
+
+#include "vm/boc.h"
+#include "vm/cells/CellString.h"
+#include "td/utils/base64.h"
+
+#include <limits>
+
+namespace ton {
+td::optional<td::int32> HighloadWalletV2::guess_revision(const vm::Cell::Hash& code_hash) {
+  for (td::int32 i = 1; i <= 2; i++) {
+    if (get_init_code(i)->get_hash() == code_hash) {
+      return i;
+    }
+  }
+  return {};
+}
+td::optional<td::int32> HighloadWalletV2::guess_revision(const block::StdAddress& address,
+                                                         const td::Ed25519::PublicKey& public_key,
+                                                         td::uint32 wallet_id) {
+  for (td::int32 i = 1; i <= 2; i++) {
+    if (GenericAccount::get_address(address.workchain, get_init_state(public_key, wallet_id, i)) == address) {
+      return i;
+    }
+  }
+  return {};
+}
+td::Ref<vm::Cell> HighloadWalletV2::get_init_state(const td::Ed25519::PublicKey& public_key, td::uint32 wallet_id,
+                                                   td::int32 revision) noexcept {
+  auto code = get_init_code(revision);
+  auto data = get_init_data(public_key, wallet_id);
+  return GenericAccount::get_init_state(std::move(code), std::move(data));
+}
+
+td::Ref<vm::Cell> HighloadWalletV2::get_init_message(const td::Ed25519::PrivateKey& private_key, td::uint32 wallet_id,
+                                                     td::uint32 valid_until) noexcept {
+  td::uint32 id = -1;
+  auto append_message = [&](auto&& cb) -> vm::CellBuilder& {
+    cb.store_long(wallet_id, 32).store_long(valid_until, 32).store_long(id, 32);
+    CHECK(cb.store_maybe_ref({}));
+    return cb;
+  };
+  auto signature = private_key.sign(append_message(vm::CellBuilder()).finalize()->get_hash().as_slice()).move_as_ok();
+
+  return append_message(vm::CellBuilder().store_bytes(signature)).finalize();
+}
+
+td::Ref<vm::Cell> HighloadWalletV2::make_a_gift_message(const td::Ed25519::PrivateKey& private_key,
+                                                        td::uint32 wallet_id, td::uint32 valid_until,
+                                                        td::Span<Gift> gifts) noexcept {
+  CHECK(gifts.size() <= max_gifts_size);
+  vm::Dictionary messages(16);
+  for (size_t i = 0; i < gifts.size(); i++) {
+    auto& gift = gifts[i];
+    td::int32 send_mode = 3;
+    auto gramms = gift.gramms;
+    if (gramms == -1) {
+      gramms = 0;
+      send_mode += 128;
+    }
+    vm::CellBuilder cb;
+    GenericAccount::store_int_message(cb, gift.destination, gramms);
+    cb.store_bytes("\0\0\0\0", 4);
+    vm::CellString::store(cb, gift.message, 35 * 8).ensure();
+    auto message_inner = cb.finalize();
+    cb = {};
+    cb.store_long(send_mode, 8).store_ref(message_inner);
+    auto key = messages.integer_key(td::make_refint(i), 16, false);
+    messages.set_builder(key.bits(), 16, cb);
+  }
+  std::string hash;
+  {
+    vm::CellBuilder cb;
+    CHECK(cb.store_maybe_ref(messages.get_root_cell()));
+    hash = cb.finalize()->get_hash().as_slice().substr(28, 4).str();
+  }
+
+  vm::CellBuilder cb;
+  cb.store_long(wallet_id, 32).store_long(valid_until, 32).store_bytes(hash);
+  CHECK(cb.store_maybe_ref(messages.get_root_cell()));
+  auto message_outer = cb.finalize();
+  auto signature = private_key.sign(message_outer->get_hash().as_slice()).move_as_ok();
+  return vm::CellBuilder().store_bytes(signature).append_cellslice(vm::load_cell_slice(message_outer)).finalize();
+}
+
+td::Ref<vm::Cell> HighloadWalletV2::get_init_code(td::int32 revision) noexcept {
+  return SmartContractCode::get_code(SmartContractCode::HighloadWalletV2, revision);
+}
+
+vm::CellHash HighloadWalletV2::get_init_code_hash() noexcept {
+  return get_init_code(0)->get_hash();
+}
+
+td::Ref<vm::Cell> HighloadWalletV2::get_init_data(const td::Ed25519::PublicKey& public_key,
+                                                  td::uint32 wallet_id) noexcept {
+  vm::CellBuilder cb;
+  cb.store_long(wallet_id, 32).store_long(0, 64).store_bytes(public_key.as_octet_string());
+  CHECK(cb.store_maybe_ref({}));
+  return cb.finalize();
+}
+
+td::Result<td::uint32> HighloadWalletV2::get_wallet_id() const {
+  return TRY_VM(get_wallet_id_or_throw());
+}
+
+td::Result<td::uint32> HighloadWalletV2::get_wallet_id_or_throw() const {
+  if (state_.data.is_null()) {
+    return 0;
+  }
+  //FIXME use get method
+  auto cs = vm::load_cell_slice(state_.data);
+  return static_cast<td::uint32>(cs.fetch_ulong(32));
+}
+
+td::Result<td::Ed25519::PublicKey> HighloadWalletV2::get_public_key() const {
+  return TRY_VM(get_public_key_or_throw());
+}
+
+td::Result<td::Ed25519::PublicKey> HighloadWalletV2::get_public_key_or_throw() const {
+  if (state_.data.is_null()) {
+    return td::Status::Error("data is null");
+  }
+  //FIXME use get method
+  auto cs = vm::load_cell_slice(state_.data);
+  cs.skip_first(96);
+  td::SecureString res(td::Ed25519::PublicKey::LENGTH);
+  cs.fetch_bytes(res.as_mutable_slice().ubegin(), td::narrow_cast<td::int32>(res.size()));
+  return td::Ed25519::PublicKey(std::move(res));
+}
+
+}  // namespace ton
diff --git a/submodules/ton/tonlib-src/crypto/smc-envelope/HighloadWalletV2.h b/submodules/ton/tonlib-src/crypto/smc-envelope/HighloadWalletV2.h
new file mode 100644
index 0000000000..2b6f99e7b0
--- /dev/null
+++ b/submodules/ton/tonlib-src/crypto/smc-envelope/HighloadWalletV2.h
@@ -0,0 +1,66 @@
+/*
+    This file is part of TON Blockchain Library.
+
+    TON Blockchain Library is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Lesser General Public License as published by
+    the Free Software Foundation, either version 2 of the License, or
+    (at your option) any later version.
+
+    TON Blockchain Library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public License
+    along with TON Blockchain Library.  If not, see <http://www.gnu.org/licenses/>.
+
+    Copyright 2017-2020 Telegram Systems LLP
+*/
+#pragma once
+
+#include "smc-envelope/SmartContract.h"
+#include "smc-envelope/WalletInterface.h"
+#include "vm/cells.h"
+#include "Ed25519.h"
+#include "block/block.h"
+#include "vm/cells/CellString.h"
+
+namespace ton {
+class HighloadWalletV2 : ton::SmartContract, public WalletInterface {
+ public:
+  explicit HighloadWalletV2(State state) : ton::SmartContract(std::move(state)) {
+  }
+  static constexpr unsigned max_message_size = vm::CellString::max_bytes;
+  static constexpr unsigned max_gifts_size = 254;
+  static td::Ref<vm::Cell> get_init_state(const td::Ed25519::PublicKey& public_key, td::uint32 wallet_id,
+                                          td::int32 revision) noexcept;
+  static td::Ref<vm::Cell> get_init_message(const td::Ed25519::PrivateKey& private_key, td::uint32 wallet_id,
+                                            td::uint32 valid_until) noexcept;
+
+  static td::Ref<vm::Cell> make_a_gift_message(const td::Ed25519::PrivateKey& private_key, td::uint32 wallet_id,
+                                               td::uint32 valid_until, td::Span<Gift> gifts) noexcept;
+
+  static td::Ref<vm::Cell> get_init_code(td::int32 revision) noexcept;
+  static vm::CellHash get_init_code_hash() noexcept;
+  static td::Ref<vm::Cell> get_init_data(const td::Ed25519::PublicKey& public_key, td::uint32 wallet_id) noexcept;
+  static td::optional<td::int32> guess_revision(const vm::Cell::Hash& code_hash);
+  static td::optional<td::int32> guess_revision(const block::StdAddress& address,
+                                                const td::Ed25519::PublicKey& public_key, td::uint32 wallet_id);
+
+  td::Result<td::uint32> get_wallet_id() const;
+
+  td::Result<td::Ref<vm::Cell>> make_a_gift_message(const td::Ed25519::PrivateKey& private_key, td::uint32 valid_until,
+                                                    td::Span<Gift> gifts) const override {
+    TRY_RESULT(wallet_id, get_wallet_id());
+    return make_a_gift_message(private_key, wallet_id, valid_until, gifts);
+  }
+  size_t get_max_gifts_size() const override {
+    return max_gifts_size;
+  }
+  td::Result<td::Ed25519::PublicKey> get_public_key() const override;
+
+ private:
+  td::Result<td::uint32> get_wallet_id_or_throw() const;
+  td::Result<td::Ed25519::PublicKey> get_public_key_or_throw() const;
+};
+}  // namespace ton
diff --git a/submodules/ton/tonlib-src/crypto/smc-envelope/ManualDns.cpp b/submodules/ton/tonlib-src/crypto/smc-envelope/ManualDns.cpp
new file mode 100644
index 0000000000..00f1becb88
--- /dev/null
+++ b/submodules/ton/tonlib-src/crypto/smc-envelope/ManualDns.cpp
@@ -0,0 +1,604 @@
+/*
+    This file is part of TON Blockchain Library.
+
+    TON Blockchain Library is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Lesser General Public License as published by
+    the Free Software Foundation, either version 2 of the License, or
+    (at your option) any later version.
+
+    TON Blockchain Library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public License
+    along with TON Blockchain Library.  If not, see <http://www.gnu.org/licenses/>.
+
+    Copyright 2019-2020 Telegram Systems LLP
+*/
+#include "ManualDns.h"
+
+#include "smc-envelope/SmartContractCode.h"
+
+#include "vm/dict.h"
+
+#include "td/utils/format.h"
+#include "td/utils/overloaded.h"
+#include "td/utils/Parser.h"
+#include "td/utils/Random.h"
+
+#include "block/block-auto.h"
+#include "block/block-parse.h"
+
+#include "common/util.h"
+
+namespace ton {
+td::StringBuilder& operator<<(td::StringBuilder& sb, const ManualDns::EntryData& data) {
+  switch (data.type) {
+    case ManualDns::EntryData::Type::Empty:
+      return sb << "DELETED";
+    case ManualDns::EntryData::Type::Text:
+      return sb << "TEXT:" << data.data.get<ManualDns::EntryDataText>().text;
+    case ManualDns::EntryData::Type::NextResolver:
+      return sb << "NEXT:" << data.data.get<ManualDns::EntryDataNextResolver>().resolver.rserialize();
+    case ManualDns::EntryData::Type::AdnlAddress:
+      return sb << "ADNL:"
+                << td::adnl_id_encode(data.data.get<ManualDns::EntryDataAdnlAddress>().adnl_address.as_slice())
+                       .move_as_ok();
+    case ManualDns::EntryData::Type::SmcAddress:
+      return sb << "SMC:" << data.data.get<ManualDns::EntryDataSmcAddress>().smc_address.rserialize();
+  }
+  return sb << "<unknown>";
+}
+
+//proto_list_nil$0 = ProtoList;
+//proto_list_next$1 head:Protocol tail:ProtoList = ProtoList;
+//proto_http#4854 = Protocol;
+
+//cap_list_nil$0 = SmcCapList;
+//cap_list_next$1 head:SmcCapability tail:SmcCapList = SmcCapList;
+//cap_method_seqno#5371 = SmcCapability;
+//cap_method_pubkey#71f4 = SmcCapability;
+//cap_is_wallet#2177 = SmcCapability;
+//cap_name#ff name:Text = SmcCapability;
+//
+td::Result<td::Ref<vm::Cell>> DnsInterface::EntryData::as_cell() const {
+  td::Ref<vm::Cell> res;
+  td::Status error;
+  data.visit(td::overloaded(
+      [&](const EntryDataText& text) {
+        block::gen::DNSRecord::Record_dns_text dns;
+        vm::CellBuilder cb;
+        vm::CellText::store(cb, text.text);
+        dns.x = vm::load_cell_slice_ref(cb.finalize());
+        tlb::pack_cell(res, dns);
+      },
+      [&](const EntryDataNextResolver& resolver) {
+        block::gen::DNSRecord::Record_dns_next_resolver dns;
+        vm::CellBuilder cb;
+        block::tlb::t_MsgAddressInt.store_std_address(cb, resolver.resolver.workchain, resolver.resolver.addr);
+        dns.resolver = vm::load_cell_slice_ref(cb.finalize());
+        tlb::pack_cell(res, dns);
+      },
+      [&](const EntryDataAdnlAddress& adnl_address) {
+        block::gen::DNSRecord::Record_dns_adnl_address dns;
+        dns.adnl_addr = adnl_address.adnl_address;
+        dns.flags = 0;
+        tlb::pack_cell(res, dns);
+      },
+      [&](const EntryDataSmcAddress& smc_address) {
+        block::gen::DNSRecord::Record_dns_smc_address dns;
+        vm::CellBuilder cb;
+        block::tlb::t_MsgAddressInt.store_std_address(cb, smc_address.smc_address.workchain,
+                                                      smc_address.smc_address.addr);
+        dns.smc_addr = vm::load_cell_slice_ref(cb.finalize());
+        tlb::pack_cell(res, dns);
+      }));
+  if (error.is_error()) {
+    return error;
+  }
+  if (res.is_null()) {
+    return td::Status::Error("Entry data is emtpy");
+  }
+  return res;
+  //dns_text#1eda _:Text = DNSRecord;
+
+  //dns_next_resolver#ba93 resolver:MsgAddressInt = DNSRecord;  // usually in record #-1
+  //dns_adnl_address#ad01 adnl_addr:bits256 flags:(## 8) { flags <= 1 } proto_list:flags . 0?ProtoList = DNSRecord;  // often in record #2
+
+  //dns_smc_address#9fd3 smc_addr:MsgAddressInt flags:(## 8) { flags <= 1 } cap_list:flags . 0?SmcCapList = DNSRecord;   // often in record #1
+}
+
+td::Result<DnsInterface::EntryData> DnsInterface::EntryData::from_cellslice(vm::CellSlice& cs) {
+  switch (block::gen::t_DNSRecord.get_tag(cs)) {
+    case block::gen::DNSRecord::dns_text: {
+      block::gen::DNSRecord::Record_dns_text dns;
+      tlb::unpack(cs, dns);
+      TRY_RESULT(text, vm::CellText::load(dns.x.write()));
+      return EntryData::text(std::move(text));
+    }
+    case block::gen::DNSRecord::dns_next_resolver: {
+      block::gen::DNSRecord::Record_dns_next_resolver dns;
+      tlb::unpack(cs, dns);
+      ton::WorkchainId wc;
+      ton::StdSmcAddress addr;
+      if (!block::tlb::t_MsgAddressInt.extract_std_address(dns.resolver, wc, addr)) {
+        return td::Status::Error("Invalid address");
+      }
+      return EntryData::next_resolver(block::StdAddress(wc, addr));
+    }
+    case block::gen::DNSRecord::dns_adnl_address: {
+      block::gen::DNSRecord::Record_dns_adnl_address dns;
+      tlb::unpack(cs, dns);
+      return EntryData::adnl_address(dns.adnl_addr);
+    }
+    case block::gen::DNSRecord::dns_smc_address: {
+      block::gen::DNSRecord::Record_dns_smc_address dns;
+      tlb::unpack(cs, dns);
+      ton::WorkchainId wc;
+      ton::StdSmcAddress addr;
+      if (!block::tlb::t_MsgAddressInt.extract_std_address(dns.smc_addr, wc, addr)) {
+        return td::Status::Error("Invalid address");
+      }
+      return EntryData::smc_address(block::StdAddress(wc, addr));
+    }
+  }
+  return td::Status::Error("Unknown entry data");
+}
+
+SmartContract::Args DnsInterface::resolve_args_raw(td::Slice encoded_name, td::int16 category) {
+  SmartContract::Args res;
+  res.set_method_id("dnsresolve");
+  res.set_stack(
+      {vm::load_cell_slice_ref(vm::CellBuilder().store_bytes(encoded_name).finalize()), td::make_refint(category)});
+  return res;
+}
+
+td::Result<SmartContract::Args> DnsInterface::resolve_args(td::Slice name, td::int32 category_big) {
+  TRY_RESULT(category, td::narrow_cast_safe<td::int16>(category_big));
+  if (name.size() > get_default_max_name_size()) {
+    return td::Status::Error("Name is too long");
+  }
+  auto encoded_name = encode_name(name);
+  return resolve_args_raw(encoded_name, category);
+}
+
+td::Result<std::vector<DnsInterface::Entry>> DnsInterface::resolve(td::Slice name, td::int32 category) const {
+  TRY_RESULT(raw_entries, resolve_raw(name, category));
+  std::vector<Entry> entries;
+  entries.reserve(raw_entries.size());
+  for (auto& raw_entry : raw_entries) {
+    Entry entry;
+    entry.name = std::move(raw_entry.name);
+    entry.category = raw_entry.category;
+    auto cs = vm::load_cell_slice(raw_entry.data);
+    TRY_RESULT(data, EntryData::from_cellslice(cs));
+    entry.data = std::move(data);
+    entries.push_back(std::move(entry));
+  }
+  return entries;
+}
+
+/*
+    External message structure:
+      [Bytes<512b>:signature] [UInt<32b>:seqno] [UInt<6b>:operation]
+      [Either b0: inline name (<= 58-x Bytes) or b1: reference-stored name)
+                                     x depends on operation
+      Use of 6-bit op instead of 32-bit allows to save 4 bytes for inline name
+    Inline [Name] structure: [UInt<6b>:length] [Bytes<lengthB>:data]
+    Operations (continuation of message):
+    00 Contract initialization message (only if seqno = 0) (x=-)
+	31 TSet: replace ENTIRE DOMAIN TABLE with the provided tree root cell (x=-)
+		[Cell<1r>:new_domains_table]
+	51 OSet: replace owner public key with a new one (x=-)
+		[UInt<256b>:new_public_key]
+*/
+// creation
+td::Ref<ManualDns> ManualDns::create(td::Ref<vm::Cell> data, int revision) {
+  return td::Ref<ManualDns>(
+      true, State{ton::SmartContractCode::get_code(ton::SmartContractCode::ManualDns, revision), std::move(data)});
+}
+
+td::Ref<ManualDns> ManualDns::create(const td::Ed25519::PublicKey& public_key, td::uint32 wallet_id, int revision) {
+  return create(create_init_data_fast(public_key, wallet_id), revision);
+}
+
+td::optional<td::int32> ManualDns::guess_revision(const vm::Cell::Hash& code_hash) {
+  for (auto i : ton::SmartContractCode::get_revisions(ton::SmartContractCode::ManualDns)) {
+    if (ton::SmartContractCode::get_code(ton::SmartContractCode::ManualDns, i)->get_hash() == code_hash) {
+      return i;
+    }
+  }
+  return {};
+}
+td::optional<td::int32> ManualDns::guess_revision(const block::StdAddress& address,
+                                                  const td::Ed25519::PublicKey& public_key, td::uint32 wallet_id) {
+  for (auto i : {-1, 1}) {
+    auto dns = ton::ManualDns::create(public_key, wallet_id, i);
+    if (dns->get_address() == address) {
+      return i;
+    }
+  }
+  return {};
+}
+
+td::Result<td::uint32> ManualDns::get_wallet_id() const {
+  return TRY_VM(get_wallet_id_or_throw());
+}
+td::Result<td::uint32> ManualDns::get_wallet_id_or_throw() const {
+  if (state_.data.is_null()) {
+    return 0;
+  }
+  //FIXME use get method
+  return static_cast<td::uint32>(vm::load_cell_slice(state_.data).fetch_ulong(32));
+}
+
+td::Result<td::Ref<vm::Cell>> ManualDns::create_set_value_unsigned(td::int16 category, td::Slice name,
+                                                                   td::Ref<vm::Cell> data) const {
+  //11 VSet: set specified value to specified subdomain->category (x=2)
+  //[Int<16b>:category] [Name<?>:subdomain] [Cell<1r>:value]
+  vm::CellBuilder cb;
+  cb.store_long(11, 6);
+  if (name.size() <= 58 - 2) {
+    cb.store_long(category, 16);
+    cb.store_long(0, 1);
+    cb.store_long(name.size(), 6);
+    cb.store_bytes(name);
+  } else {
+    cb.store_long(category, 16);
+    cb.store_long(1, 1);
+    cb.store_ref(vm::CellBuilder().store_bytes(name).finalize());
+  }
+  cb.store_maybe_ref(std::move(data));
+  return cb.finalize();
+}
+td::Result<td::Ref<vm::Cell>> ManualDns::create_delete_value_unsigned(td::int16 category, td::Slice name) const {
+  //12 VDel: delete specified subdomain->category (x=2)
+  //[Int<16b>:category] [Name<?>:subdomain]
+  vm::CellBuilder cb;
+  cb.store_long(12, 6);
+  if (name.size() <= 58 - 2) {
+    cb.store_long(category, 16);
+    cb.store_long(0, 1);
+    cb.store_long(name.size(), 6);
+    cb.store_bytes(name);
+  } else {
+    cb.store_long(category, 16);
+    cb.store_long(1, 1);
+    cb.store_ref(vm::CellBuilder().store_bytes(name).finalize());
+  }
+  return cb.finalize();
+}
+
+td::Result<td::Ref<vm::Cell>> ManualDns::create_delete_all_unsigned() const {
+  // 32 TDel: nullify ENTIRE DOMAIN TABLE (x=-)
+  vm::CellBuilder cb;
+  cb.store_long(32, 6);
+  return cb.finalize();
+}
+
+td::Result<td::Ref<vm::Cell>> ManualDns::create_set_all_unsigned(td::Span<Action> entries) const {
+  vm::PrefixDictionary pdict(1023);
+  for (auto& action : entries) {
+    auto name_key = encode_name(action.name);
+    int zero_cnt = 0;
+    for (auto c : name_key) {
+      if (c == 0) {
+        zero_cnt++;
+      }
+    }
+    auto new_name_key = vm::load_cell_slice(vm::CellBuilder().store_long(zero_cnt, 7).store_bytes(name_key).finalize());
+    auto ptr = new_name_key.data_bits();
+    auto ptr_size = new_name_key.size();
+    auto o_dict = pdict.lookup(ptr, ptr_size);
+    td::Ref<vm::Cell> dict_root;
+    if (o_dict.not_null()) {
+      o_dict->prefetch_maybe_ref(dict_root);
+    }
+    vm::Dictionary dict(dict_root, 16);
+    if (!action.data.value().is_null()) {
+      auto key = dict.integer_key(td::make_refint(action.category), 16);
+      dict.set_ref(key.bits(), 16, action.data.value());
+    }
+    pdict.set(ptr, ptr_size, dict.get_root());
+  }
+
+  vm::CellBuilder cb;
+  cb.store_long(31, 6);
+
+  cb.store_maybe_ref(pdict.get_root_cell());
+
+  return cb.finalize();
+}
+
+//21 DSet: replace entire category dictionary of domain with provided (x=0)
+//[Name<?>:subdomain] [Cell<1r>:new_cat_table]
+//22 DDel: delete entire category dictionary of specified domain (x=0)
+//[Name<?>:subdomain]
+td::Result<td::Ref<vm::Cell>> ManualDns::create_delete_name_unsigned(td::Slice name) const {
+  vm::CellBuilder cb;
+  cb.store_long(22, 6);
+  if (name.size() <= 58) {
+    cb.store_long(0, 1);
+    cb.store_long(name.size(), 6);
+    cb.store_bytes(name);
+  } else {
+    cb.store_long(1, 1);
+    cb.store_ref(vm::CellBuilder().store_bytes(name).finalize());
+  }
+  return cb.finalize();
+}
+td::Result<td::Ref<vm::Cell>> ManualDns::create_set_name_unsigned(td::Slice name, td::Span<Action> entries) const {
+  vm::CellBuilder cb;
+  cb.store_long(21, 6);
+  if (name.size() <= 58) {
+    cb.store_long(0, 1);
+    cb.store_long(name.size(), 6);
+    cb.store_bytes(name);
+  } else {
+    cb.store_long(1, 1);
+    cb.store_ref(vm::CellBuilder().store_bytes(name).finalize());
+  }
+
+  vm::Dictionary dict(16);
+
+  for (auto& action : entries) {
+    if (action.data.value().is_null()) {
+      continue;
+    }
+    auto key = dict.integer_key(td::make_refint(action.category), 16);
+    dict.set_ref(key.bits(), 16, action.data.value());
+  }
+  cb.store_maybe_ref(dict.get_root_cell());
+
+  return cb.finalize();
+}
+
+td::Result<td::Ref<vm::Cell>> ManualDns::prepare(td::Ref<vm::Cell> data, td::uint32 valid_until) const {
+  TRY_RESULT(wallet_id, get_wallet_id());
+  auto hash = data->get_hash().as_slice().substr(28, 4).str();
+
+  vm::CellBuilder cb;
+  cb.store_long(wallet_id, 32).store_long(valid_until, 32);
+  //cb.store_bytes(hash);
+  cb.store_long(td::Random::secure_uint32(), 32);
+  cb.append_cellslice(vm::load_cell_slice(data));
+  return cb.finalize();
+}
+
+td::Result<td::Ref<vm::Cell>> ManualDns::sign(const td::Ed25519::PrivateKey& private_key, td::Ref<vm::Cell> data) {
+  auto signature = private_key.sign(data->get_hash().as_slice()).move_as_ok();
+  vm::CellBuilder cb;
+  cb.store_bytes(signature.as_slice());
+  cb.append_cellslice(vm::load_cell_slice(data));
+  return cb.finalize();
+}
+
+td::Result<td::Ref<vm::Cell>> ManualDns::create_init_query(const td::Ed25519::PrivateKey& private_key,
+                                                           td::uint32 valid_until) const {
+  vm::CellBuilder cb;
+  cb.store_long(0, 6);
+
+  TRY_RESULT(prepared, prepare(cb.finalize(), valid_until));
+  return sign(private_key, std::move(prepared));
+}
+
+td::Ref<vm::Cell> ManualDns::create_init_data_fast(const td::Ed25519::PublicKey& public_key, td::uint32 wallet_id) {
+  vm::CellBuilder cb;
+  cb.store_long(wallet_id, 32).store_long(0, 64).store_bytes(public_key.as_octet_string());
+  CHECK(cb.store_maybe_ref({}));
+  CHECK(cb.store_maybe_ref({}));
+  return cb.finalize();
+}
+
+size_t ManualDns::get_max_name_size() const {
+  return get_default_max_name_size();
+}
+
+td::Result<std::vector<ManualDns::RawEntry>> ManualDns::resolve_raw(td::Slice name, td::int32 category_big) const {
+  return TRY_VM(resolve_raw_or_throw(name, category_big));
+}
+td::Result<std::vector<ManualDns::RawEntry>> ManualDns::resolve_raw_or_throw(td::Slice name,
+                                                                             td::int32 category_big) const {
+  TRY_RESULT(category, td::narrow_cast_safe<td::int16>(category_big));
+  if (name.size() > get_max_name_size()) {
+    return td::Status::Error("Name is too long");
+  }
+  auto encoded_name = encode_name(name);
+  auto res = run_get_method(resolve_args_raw(encoded_name, category));
+  if (!res.success) {
+    return td::Status::Error("get method failed");
+  }
+  std::vector<RawEntry> vec;
+  auto data = res.stack.write().pop_maybe_cell();
+  if (data.is_null()) {
+    return vec;
+  }
+  size_t prefix_size = res.stack.write().pop_smallint_range((int)encoded_name.size() * 8);
+  if (prefix_size % 8 != 0) {
+    return td::Status::Error("Prefix size is not divisible by 8");
+  }
+  prefix_size /= 8;
+  if (prefix_size < encoded_name.size()) {
+    vec.push_back({decode_name(td::Slice(encoded_name).substr(0, prefix_size)), -1, data});
+  } else {
+    if (category == 0) {
+      vm::Dictionary dict(std::move(data), 16);
+      dict.check_for_each([&](auto cs, auto x, auto y) {
+        td::BigInt256 cat;
+        cat.import_bits(x, y, true);
+        vec.push_back({name.str(), td::narrow_cast<td::int16>(cat.to_long()), cs->prefetch_ref()});
+        return true;
+      });
+    } else {
+      vec.push_back({name.str(), category, data});
+    }
+  }
+
+  return vec;
+}
+
+td::Result<td::Ref<vm::Cell>> ManualDns::create_update_query(CombinedActions<Action>& combined) const {
+  if (combined.name.empty()) {
+    if (combined.actions.value().empty()) {
+      return create_delete_all_unsigned();
+    }
+    return create_set_all_unsigned(combined.actions.value());
+  }
+  if (combined.category == 0) {
+    if (!combined.actions) {
+      return create_delete_name_unsigned(encode_name(combined.name));
+    }
+    return create_set_name_unsigned(encode_name(combined.name), combined.actions.value());
+  }
+  CHECK(combined.actions.value().size() == 1);
+  auto& action = combined.actions.value()[0];
+  if (action.data) {
+    return create_set_value_unsigned(action.category, encode_name(action.name), action.data.value());
+  } else {
+    return create_delete_value_unsigned(action.category, encode_name(action.name));
+  }
+}
+
+td::Result<td::Ref<vm::Cell>> ManualDns::create_update_query(td::Ed25519::PrivateKey& pk, td::Span<Action> actions,
+                                                             td::uint32 valid_until) const {
+  auto combined = combine_actions(actions);
+  std::vector<td::Ref<vm::Cell>> queries;
+  for (auto& c : combined) {
+    TRY_RESULT(q, create_update_query(c));
+    queries.push_back(std::move(q));
+  }
+
+  td::Ref<vm::Cell> combined_query;
+  for (auto& query : td::reversed(queries)) {
+    if (combined_query.is_null()) {
+      combined_query = std::move(query);
+    } else {
+      auto next = vm::load_cell_slice(combined_query);
+      combined_query = vm::CellBuilder()
+                           .append_cellslice(vm::load_cell_slice(query))
+                           .store_ref(vm::CellBuilder().append_cellslice(next).finalize())
+                           .finalize();
+    }
+  }
+
+  TRY_RESULT(prepared, prepare(std::move(combined_query), valid_until));
+  return sign(pk, std::move(prepared));
+}
+
+std::string DnsInterface::encode_name(td::Slice name) {
+  std::string res;
+  while (!name.empty()) {
+    auto pos = name.rfind('.');
+    if (pos == name.npos) {
+      res += name.str();
+      name = td::Slice();
+    } else {
+      res += name.substr(pos + 1).str();
+      name.truncate(pos);
+    }
+    res += '\0';
+  }
+  return res;
+}
+
+std::string DnsInterface::decode_name(td::Slice name) {
+  std::string res;
+  if (!name.empty() && name.back() == 0) {
+    name.remove_suffix(1);
+  }
+  while (!name.empty()) {
+    auto pos = name.rfind('\0');
+    if (!res.empty()) {
+      res += '.';
+    }
+    if (pos == name.npos) {
+      res += name.str();
+      name = td::Slice();
+    } else {
+      res += name.substr(pos + 1).str();
+      name.truncate(pos);
+    }
+  }
+  return res;
+}
+
+std::string ManualDns::serialize_data(const EntryData& data) {
+  std::string res;
+  data.data.visit(td::overloaded([&](const ton::ManualDns::EntryDataText& text) { res = "UNSUPPORTED"; },
+                                 [&](const ton::ManualDns::EntryDataNextResolver& resolver) { res = "UNSUPPORTED"; },
+                                 [&](const ton::ManualDns::EntryDataAdnlAddress& adnl_address) { res = "UNSUPPORTED"; },
+                                 [&](const ton::ManualDns::EntryDataSmcAddress& text) { res = "UNSUPPORTED"; }));
+  return res;
+}
+
+td::Result<td::optional<ManualDns::EntryData>> ManualDns::parse_data(td::Slice cmd) {
+  td::ConstParser parser(cmd);
+  parser.skip_whitespaces();
+  auto type = parser.read_till(':');
+  parser.skip(':');
+  if (type == "TEXT") {
+    return ManualDns::EntryData::text(parser.read_all().str());
+  } else if (type == "ADNL") {
+    TRY_RESULT(address, td::adnl_id_decode(parser.read_all()));
+    return ManualDns::EntryData::adnl_address(address);
+  } else if (type == "SMC") {
+    TRY_RESULT(address, block::StdAddress::parse(parser.read_all()));
+    return ManualDns::EntryData::smc_address(address);
+  } else if (type == "NEXT") {
+    TRY_RESULT(address, block::StdAddress::parse(parser.read_all()));
+    return ManualDns::EntryData::next_resolver(address);
+  } else if (parser.data() == "DELETED") {
+    return {};
+  }
+  return td::Status::Error(PSLICE() << "Unknown entry type: " << type);
+}
+
+td::Result<ManualDns::ActionExt> ManualDns::parse_line(td::Slice cmd) {
+  // Cmd =
+  //   set name category data |
+  //   delete.name name |
+  //   delete.all
+  // data =
+  //   TEXT:<text> |
+  //   SMC:<smartcontract address> |
+  //   NEXT:<smartcontract address> |
+  //   ADNL:<adnl address>
+  //   DELETED
+  td::ConstParser parser(cmd);
+  auto type = parser.read_word();
+  if (type == "set") {
+    auto name = parser.read_word();
+    auto category_str = parser.read_word();
+    TRY_RESULT(category, td::to_integer_safe<td::int16>(category_str));
+    TRY_RESULT(data, parse_data(parser.read_all()));
+    return ManualDns::ActionExt{name.str(), category, std::move(data)};
+  } else if (type == "delete.name") {
+    auto name = parser.read_word();
+    if (name.empty()) {
+      return td::Status::Error("name is empty");
+    }
+    return ManualDns::ActionExt{name.str(), 0, {}};
+  } else if (type == "delete.all") {
+    return ManualDns::ActionExt{"", 0, {}};
+  }
+  return td::Status::Error(PSLICE() << "Unknown command: " << type);
+}
+
+td::Result<std::vector<ManualDns::ActionExt>> ManualDns::parse(td::Slice cmd) {
+  auto lines = td::full_split(cmd, '\n');
+  std::vector<ManualDns::ActionExt> res;
+  res.reserve(lines.size());
+  for (auto& line : lines) {
+    td::ConstParser parser(line);
+    parser.skip_whitespaces();
+    if (parser.empty()) {
+      continue;
+    }
+    TRY_RESULT(action, parse_line(parser.read_all()));
+    res.push_back(std::move(action));
+  }
+  return res;
+}
+
+}  // namespace ton
diff --git a/submodules/ton/tonlib-src/crypto/smc-envelope/ManualDns.h b/submodules/ton/tonlib-src/crypto/smc-envelope/ManualDns.h
new file mode 100644
index 0000000000..fbf12e74c7
--- /dev/null
+++ b/submodules/ton/tonlib-src/crypto/smc-envelope/ManualDns.h
@@ -0,0 +1,335 @@
+/*
+    This file is part of TON Blockchain Library.
+
+    TON Blockchain Library is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Lesser General Public License as published by
+    the Free Software Foundation, either version 2 of the License, or
+    (at your option) any later version.
+
+    TON Blockchain Library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public License
+    along with TON Blockchain Library.  If not, see <http://www.gnu.org/licenses/>.
+
+    Copyright 2019-2020 Telegram Systems LLP
+*/
+#pragma once
+#include "td/utils/Variant.h"
+#include "td/utils/Status.h"
+#include "vm/cells/Cell.h"
+#include "vm/cells/CellSlice.h"
+#include "vm/cells/CellString.h"
+
+#include "smc-envelope/SmartContract.h"
+
+#include "Ed25519.h"
+
+#include <map>
+
+namespace ton {
+class DnsInterface {
+ public:
+  struct EntryDataText {
+    std::string text;
+    bool operator==(const EntryDataText& other) const {
+      return text == other.text;
+    }
+  };
+
+  struct EntryDataNextResolver {
+    block::StdAddress resolver;
+    bool operator==(const EntryDataNextResolver& other) const {
+      return resolver == other.resolver;
+    }
+  };
+
+  struct EntryDataAdnlAddress {
+    ton::Bits256 adnl_address;
+    // TODO: proto
+    bool operator==(const EntryDataAdnlAddress& other) const {
+      return adnl_address == other.adnl_address;
+    }
+  };
+
+  struct EntryDataSmcAddress {
+    block::StdAddress smc_address;
+    bool operator==(const EntryDataSmcAddress& other) const {
+      return smc_address == other.smc_address;
+    }
+    // TODO: capability
+  };
+
+  struct EntryData {
+    enum Type { Empty, Text, NextResolver, AdnlAddress, SmcAddress } type{Empty};
+    td::Variant<EntryDataText, EntryDataNextResolver, EntryDataAdnlAddress, EntryDataSmcAddress> data;
+
+    static EntryData text(std::string text) {
+      return {Text, EntryDataText{text}};
+    }
+    static EntryData next_resolver(block::StdAddress resolver) {
+      return {NextResolver, EntryDataNextResolver{resolver}};
+    }
+    static EntryData adnl_address(ton::Bits256 adnl_address) {
+      return {AdnlAddress, EntryDataAdnlAddress{adnl_address}};
+    }
+    static EntryData smc_address(block::StdAddress smc_address) {
+      return {SmcAddress, EntryDataSmcAddress{smc_address}};
+    }
+
+    bool operator==(const EntryData& other) const {
+      return data == other.data;
+    }
+    friend td::StringBuilder& operator<<(td::StringBuilder& sb, const EntryData& data);
+
+    td::Result<td::Ref<vm::Cell>> as_cell() const;
+    static td::Result<EntryData> from_cellslice(vm::CellSlice& cs);
+  };
+
+  struct Entry {
+    std::string name;
+    td::int16 category;
+    EntryData data;
+    auto key() const {
+      return std::tie(name, category);
+    }
+    bool operator<(const Entry& other) const {
+      return key() < other.key();
+    }
+    bool operator==(const Entry& other) const {
+      return key() == other.key() && data == other.data;
+    }
+    friend td::StringBuilder& operator<<(td::StringBuilder& sb, const Entry& entry) {
+      sb << entry.name << ":" << entry.category << ":" << entry.data;
+      return sb;
+    }
+  };
+  struct RawEntry {
+    std::string name;
+    td::int16 category;
+    td::Ref<vm::Cell> data;
+  };
+
+  struct ActionExt {
+    std::string name;
+    td::int16 category;
+    td::optional<EntryData> data;
+    static td::Result<ActionExt> parse(td::Slice);
+  };
+
+  struct Action {
+    std::string name;
+    td::int16 category;
+    td::optional<td::Ref<vm::Cell>> data;
+
+    bool does_create_category() const {
+      CHECK(!name.empty());
+      CHECK(category != 0);
+      return static_cast<bool>(data);
+    }
+    bool does_change_empty() const {
+      CHECK(!name.empty());
+      CHECK(category != 0);
+      return static_cast<bool>(data) && data.value().not_null();
+    }
+    void make_non_empty() {
+      CHECK(!name.empty());
+      CHECK(category != 0);
+      if (!data) {
+        data = td::Ref<vm::Cell>();
+      }
+    }
+    friend td::StringBuilder& operator<<(td::StringBuilder& sb, const Action& action) {
+      sb << action.name << ":" << action.category << ":";
+      if (action.data) {
+        if (action.data.value().is_null()) {
+          sb << "<null>";
+        } else {
+          sb << "<data>";
+        }
+      } else {
+        sb << "<empty>";
+      }
+      return sb;
+    }
+  };
+
+  virtual ~DnsInterface() {
+  }
+  virtual size_t get_max_name_size() const = 0;
+  virtual td::Result<std::vector<RawEntry>> resolve_raw(td::Slice name, td::int32 category) const = 0;
+  virtual td::Result<td::Ref<vm::Cell>> create_update_query(
+      td::Ed25519::PrivateKey& pk, td::Span<Action> actions,
+      td::uint32 valid_until = std::numeric_limits<td::uint32>::max()) const = 0;
+
+  td::Result<std::vector<Entry>> resolve(td::Slice name, td::int32 category) const;
+
+  static std::string encode_name(td::Slice name);
+  static std::string decode_name(td::Slice name);
+
+  static size_t get_default_max_name_size() {
+    return 128;
+  }
+  static SmartContract::Args resolve_args_raw(td::Slice encoded_name, td::int16 category);
+  static td::Result<SmartContract::Args> resolve_args(td::Slice name, td::int32 category);
+};
+
+class ManualDns : public ton::SmartContract, public DnsInterface {
+ public:
+  ManualDns(State state) : SmartContract(std::move(state)) {
+  }
+
+  ManualDns* make_copy() const override {
+    return new ManualDns{state_};
+  }
+
+  // creation
+  static td::Ref<ManualDns> create(State state) {
+    return td::Ref<ManualDns>(true, std::move(state));
+  }
+  static td::Ref<ManualDns> create(td::Ref<vm::Cell> data = {}, int revision = 0);
+  static td::Ref<ManualDns> create(const td::Ed25519::PublicKey& public_key, td::uint32 wallet_id, int revision = 0);
+
+  static std::string serialize_data(const EntryData& data);
+  static td::Result<td::optional<ManualDns::EntryData>> parse_data(td::Slice cmd);
+  static td::Result<ManualDns::ActionExt> parse_line(td::Slice cmd);
+  static td::Result<std::vector<ManualDns::ActionExt>> parse(td::Slice cmd);
+
+  static td::optional<td::int32> guess_revision(const vm::Cell::Hash& code_hash);
+  static td::optional<td::int32> guess_revision(const block::StdAddress& address,
+                                                const td::Ed25519::PublicKey& public_key, td::uint32 wallet_id);
+
+  td::Ref<vm::Cell> create_init_data(const td::Ed25519::PublicKey& public_key, td::uint32 valid_until) const {
+    return create_init_data_fast(public_key, valid_until);
+  }
+
+  td::Result<td::uint32> get_wallet_id() const;
+  td::Result<td::uint32> get_wallet_id_or_throw() const;
+
+  td::Result<td::Ref<vm::Cell>> create_set_value_unsigned(td::int16 category, td::Slice name,
+                                                          td::Ref<vm::Cell> data) const;
+  td::Result<td::Ref<vm::Cell>> create_delete_value_unsigned(td::int16 category, td::Slice name) const;
+  td::Result<td::Ref<vm::Cell>> create_delete_all_unsigned() const;
+  td::Result<td::Ref<vm::Cell>> create_set_all_unsigned(td::Span<Action> entries) const;
+  td::Result<td::Ref<vm::Cell>> create_delete_name_unsigned(td::Slice name) const;
+  td::Result<td::Ref<vm::Cell>> create_set_name_unsigned(td::Slice name, td::Span<Action> entries) const;
+
+  td::Result<td::Ref<vm::Cell>> prepare(td::Ref<vm::Cell> data, td::uint32 valid_until) const;
+
+  static td::Result<td::Ref<vm::Cell>> sign(const td::Ed25519::PrivateKey& private_key, td::Ref<vm::Cell> data);
+  static td::Ref<vm::Cell> create_init_data_fast(const td::Ed25519::PublicKey& public_key, td::uint32 wallet_id);
+
+  size_t get_max_name_size() const override;
+  td::Result<std::vector<RawEntry>> resolve_raw(td::Slice name, td::int32 category_big) const override;
+  td::Result<std::vector<RawEntry>> resolve_raw_or_throw(td::Slice name, td::int32 category_big) const;
+
+  td::Result<td::Ref<vm::Cell>> create_init_query(
+      const td::Ed25519::PrivateKey& private_key,
+      td::uint32 valid_until = std::numeric_limits<td::uint32>::max()) const;
+  td::Result<td::Ref<vm::Cell>> create_update_query(
+      td::Ed25519::PrivateKey& pk, td::Span<Action> actions,
+      td::uint32 valid_until = std::numeric_limits<td::uint32>::max()) const override;
+
+  template <class ActionT>
+  struct CombinedActions {
+    std::string name;
+    td::int16 category{0};
+    td::optional<std::vector<ActionT>> actions;
+    friend td::StringBuilder& operator<<(td::StringBuilder& sb, const CombinedActions& action) {
+      sb << action.name << ":" << action.category << ":";
+      if (action.actions) {
+        sb << "<data>" << action.actions.value().size();
+      } else {
+        sb << "<empty>";
+      }
+      return sb;
+    }
+  };
+
+  template <class ActionT = Action>
+  static std::vector<CombinedActions<ActionT>> combine_actions(td::Span<ActionT> actions) {
+    struct Info {
+      std::set<td::int16> known_category;
+      std::vector<ActionT> actions;
+      bool closed{false};
+      bool non_empty{false};
+    };
+
+    std::map<std::string, Info> mp;
+    std::vector<CombinedActions<ActionT>> res;
+    for (auto& action : td::reversed(actions)) {
+      if (action.name.empty()) {
+        CombinedActions<ActionT> set_all;
+        set_all.actions = std::vector<ActionT>();
+        for (auto& it : mp) {
+          for (auto& e : it.second.actions) {
+            if (e.does_create_category()) {
+              set_all.actions.value().push_back(std::move(e));
+            }
+          }
+        }
+        res.push_back(std::move(set_all));
+        return res;
+      }
+
+      Info& info = mp[action.name];
+      if (info.closed) {
+        continue;
+      }
+      if (action.category != 0 && action.does_create_category()) {
+        info.non_empty = true;
+      }
+      if (!info.known_category.insert(action.category).second) {
+        continue;
+      }
+      if (action.category == 0) {
+        info.closed = true;
+        auto old_actions = std::move(info.actions);
+        bool is_empty = true;
+        for (auto& action : old_actions) {
+          if (is_empty && action.does_create_category()) {
+            info.actions.push_back(std::move(action));
+            is_empty = false;
+          } else if (!is_empty && action.does_change_empty()) {
+            info.actions.push_back(std::move(action));
+          }
+        }
+      } else {
+        info.actions.push_back(std::move(action));
+      }
+    }
+
+    for (auto& it : mp) {
+      auto& info = it.second;
+      if (info.closed) {
+        CombinedActions<ActionT> ca;
+        ca.name = it.first;
+        ca.category = 0;
+        if (!info.actions.empty() || info.non_empty) {
+          ca.actions = std::move(info.actions);
+        }
+        res.push_back(std::move(ca));
+      } else {
+        bool need_non_empty = info.non_empty;
+        for (auto& a : info.actions) {
+          if (need_non_empty) {
+            a.make_non_empty();
+            need_non_empty = false;
+          }
+          CombinedActions<ActionT> ca;
+          ca.name = a.name;
+          ca.category = a.category;
+          ca.actions = std::vector<ActionT>();
+          ca.actions.value().push_back(std::move(a));
+          res.push_back(ca);
+        }
+      }
+    }
+    return res;
+  }
+  td::Result<td::Ref<vm::Cell>> create_update_query(CombinedActions<Action>& combined) const;
+};
+
+}  // namespace ton
diff --git a/submodules/ton/tonlib-src/crypto/smc-envelope/MultisigWallet.cpp b/submodules/ton/tonlib-src/crypto/smc-envelope/MultisigWallet.cpp
index 36830179c5..5a9fab6a82 100644
--- a/submodules/ton/tonlib-src/crypto/smc-envelope/MultisigWallet.cpp
+++ b/submodules/ton/tonlib-src/crypto/smc-envelope/MultisigWallet.cpp
@@ -1,3 +1,21 @@
+/*
+    This file is part of TON Blockchain Library.
+
+    TON Blockchain Library is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Lesser General Public License as published by
+    the Free Software Foundation, either version 2 of the License, or
+    (at your option) any later version.
+
+    TON Blockchain Library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public License
+    along with TON Blockchain Library.  If not, see <http://www.gnu.org/licenses/>.
+
+    Copyright 2019-2020 Telegram Systems LLP
+*/
 #include "MultisigWallet.h"
 
 #include "SmartContractCode.h"
@@ -8,8 +26,13 @@
 
 namespace ton {
 
-MultisigWallet::QueryBuilder::QueryBuilder(td::int64 query_id, td::Ref<vm::Cell> msg, int mode) {
-  msg_ = vm::CellBuilder().store_long(query_id, 64).store_long(mode, 8).store_ref(std::move(msg)).finalize();
+MultisigWallet::QueryBuilder::QueryBuilder(td::uint32 wallet_id, td::int64 query_id, td::Ref<vm::Cell> msg, int mode) {
+  msg_ = vm::CellBuilder()
+             .store_long(wallet_id, 32)
+             .store_long(query_id, 64)
+             .store_long(mode, 8)
+             .store_ref(std::move(msg))
+             .finalize();
 }
 void MultisigWallet::QueryBuilder::sign(td::int32 id, td::Ed25519::PrivateKey& pk) {
   CHECK(id < td::narrow_cast<td::int32>(mask_.size()));
@@ -43,7 +66,8 @@ td::Ref<vm::Cell> MultisigWallet::QueryBuilder::create(td::int32 id, td::Ed25519
 }
 
 td::Ref<MultisigWallet> MultisigWallet::create(td::Ref<vm::Cell> data) {
-  return td::Ref<MultisigWallet>(true, State{ton::SmartContractCode::multisig(), std::move(data)});
+  return td::Ref<MultisigWallet>(
+      true, State{ton::SmartContractCode::get_code(ton::SmartContractCode::Multisig), std::move(data)});
 }
 
 int MultisigWallet::processed(td::uint64 query_id) const {
@@ -87,26 +111,29 @@ std::vector<td::SecureString> MultisigWallet::get_public_keys() const {
   return res;
 }
 
-td::Ref<vm::Cell> MultisigWallet::create_init_data(std::vector<td::SecureString> public_keys, int k) const {
+td::Ref<vm::Cell> MultisigWallet::create_init_data(td::uint32 wallet_id, std::vector<td::SecureString> public_keys,
+                                                   int k) const {
   vm::Dictionary pk(8);
   for (size_t i = 0; i < public_keys.size(); i++) {
     auto key = pk.integer_key(td::make_refint(i), 8, false);
-    pk.set_builder(key.bits(), 8, vm::CellBuilder().store_bytes(public_keys[i].as_slice()));
+    pk.set_builder(key.bits(), 8, vm::CellBuilder().store_bytes(public_keys[i].as_slice()).store_long(0, 8));
   }
-  auto res = run_get_method("create_init_state",
-                            {td::make_refint(public_keys.size()), td::make_refint(k), pk.get_root_cell()});
+  auto res = run_get_method("create_init_state", {td::make_refint(wallet_id), td::make_refint(public_keys.size()),
+                                                  td::make_refint(k), pk.get_root_cell()});
   CHECK(res.code == 0);
   return res.stack.write().pop_cell();
 }
 
-td::Ref<vm::Cell> MultisigWallet::create_init_data_fast(std::vector<td::SecureString> public_keys, int k) {
+td::Ref<vm::Cell> MultisigWallet::create_init_data_fast(td::uint32 wallet_id, std::vector<td::SecureString> public_keys,
+                                                        int k) {
   vm::Dictionary pk(8);
   for (size_t i = 0; i < public_keys.size(); i++) {
     auto key = pk.integer_key(td::make_refint(i), 8, false);
-    pk.set_builder(key.bits(), 8, vm::CellBuilder().store_bytes(public_keys[i].as_slice()));
+    pk.set_builder(key.bits(), 8, vm::CellBuilder().store_bytes(public_keys[i].as_slice()).store_long(0, 8));
   }
 
   vm::CellBuilder cb;
+  cb.store_long(wallet_id, 32);
   cb.store_long(public_keys.size(), 8).store_long(k, 8).store_long(0, 64);
   cb.ensure_throw(cb.store_maybe_ref(pk.get_root_cell()));
   cb.ensure_throw(cb.store_maybe_ref({}));
@@ -156,7 +183,7 @@ std::vector<MultisigWallet::Message> MultisigWallet::get_unsigned_messaged(int i
   vm::Dictionary dict(std::move(cell), 64);
   std::vector<Message> res;
   dict.check_for_each([&](auto cs, auto ptr, auto ptr_bits) {
-    cs.write().skip_first(8);
+    cs.write().skip_first(8 + 8);
     Message message;
     td::BigInt256 query_id;
     query_id.import_bits(ptr, ptr_bits, false);
diff --git a/submodules/ton/tonlib-src/crypto/smc-envelope/MultisigWallet.h b/submodules/ton/tonlib-src/crypto/smc-envelope/MultisigWallet.h
index 10c6d07604..96da297a4f 100644
--- a/submodules/ton/tonlib-src/crypto/smc-envelope/MultisigWallet.h
+++ b/submodules/ton/tonlib-src/crypto/smc-envelope/MultisigWallet.h
@@ -1,3 +1,21 @@
+/*
+    This file is part of TON Blockchain Library.
+
+    TON Blockchain Library is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Lesser General Public License as published by
+    the Free Software Foundation, either version 2 of the License, or
+    (at your option) any later version.
+
+    TON Blockchain Library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public License
+    along with TON Blockchain Library.  If not, see <http://www.gnu.org/licenses/>.
+
+    Copyright 2019-2020 Telegram Systems LLP
+*/
 #pragma once
 #include "vm/cells.h"
 
@@ -20,7 +38,7 @@ class MultisigWallet : public ton::SmartContract {
 
   class QueryBuilder {
    public:
-    QueryBuilder(td::int64 query_id, td::Ref<vm::Cell> msg, int mode = 3);
+    QueryBuilder(td::uint32 wallet_id, td::int64 query_id, td::Ref<vm::Cell> msg, int mode = 3);
     void sign(td::int32 id, td::Ed25519::PrivateKey& pk);
 
     td::Ref<vm::Cell> create_inner() const;
@@ -42,8 +60,9 @@ class MultisigWallet : public ton::SmartContract {
   // creation
   static td::Ref<MultisigWallet> create(td::Ref<vm::Cell> data = {});
 
-  td::Ref<vm::Cell> create_init_data(std::vector<td::SecureString> public_keys, int k) const;
-  static td::Ref<vm::Cell> create_init_data_fast(std::vector<td::SecureString> public_keys, int k);
+  td::Ref<vm::Cell> create_init_data(td::uint32 wallet_id, std::vector<td::SecureString> public_keys, int k) const;
+  static td::Ref<vm::Cell> create_init_data_fast(td::uint32 wallet_id, std::vector<td::SecureString> public_keys,
+                                                 int k);
 
   // get methods
   int processed(td::uint64 query_id) const;
diff --git a/submodules/ton/tonlib-src/crypto/smc-envelope/SmartContract.cpp b/submodules/ton/tonlib-src/crypto/smc-envelope/SmartContract.cpp
index ea76423763..36ba273043 100644
--- a/submodules/ton/tonlib-src/crypto/smc-envelope/SmartContract.cpp
+++ b/submodules/ton/tonlib-src/crypto/smc-envelope/SmartContract.cpp
@@ -14,7 +14,7 @@
     You should have received a copy of the GNU Lesser General Public License
     along with TON Blockchain Library.  If not, see <http://www.gnu.org/licenses/>.
 
-    Copyright 2017-2019 Telegram Systems LLP
+    Copyright 2017-2020 Telegram Systems LLP
 */
 #include "SmartContract.h"
 
@@ -24,23 +24,21 @@
 #include "block/block-auto.h"
 #include "vm/cellslice.h"
 #include "vm/cp0.h"
-#include "vm/continuation.h"
+#include "vm/memo.h"
+#include "vm/vm.h"
 
 #include "td/utils/crypto.h"
 
 namespace ton {
 namespace {
-td::int32 get_method_id(td::Slice method_name) {
-  unsigned crc = td::crc16(method_name);
-  return (crc & 0xffff) | 0x10000;
-}
+
 td::Ref<vm::Stack> prepare_vm_stack(td::Ref<vm::CellSlice> body) {
   td::Ref<vm::Stack> stack_ref{true};
   td::RefInt256 acc_addr{true};
   //CHECK(acc_addr.write().import_bits(account.addr.cbits(), 256));
   vm::Stack& stack = stack_ref.write();
-  stack.push_int(td::RefInt256{true, 10000000000});
-  stack.push_int(td::RefInt256{true, 10000000000});
+  stack.push_int(td::make_refint(10000000000));
+  stack.push_int(td::make_refint(10000000000));
   stack.push_cell(vm::CellBuilder().finalize());
   stack.push_cellslice(std::move(body));
   return stack_ref;
@@ -94,6 +92,11 @@ SmartContract::Answer run_smartcont(SmartContract::State state, td::Ref<vm::Stac
   }
 
   SmartContract::Answer res;
+  if (GET_VERBOSITY_LEVEL() >= VERBOSITY_NAME(DEBUG)) {
+    std::ostringstream os;
+    stack->dump(os, 2);
+    LOG(DEBUG) << "VM stack:\n" << os.str();
+  }
   vm::VmState vm{state.code, std::move(stack), gas, 1, state.data, log};
   vm.set_c7(std::move(c7));
   vm.set_chksig_always_succeed(ignore_chksig);
@@ -111,7 +114,7 @@ SmartContract::Answer run_smartcont(SmartContract::State state, td::Ref<vm::Stac
   if (GET_VERBOSITY_LEVEL() >= VERBOSITY_NAME(DEBUG)) {
     LOG(DEBUG) << "VM log\n" << logger.res;
     std::ostringstream os;
-    res.stack->dump(os);
+    res.stack->dump(os, 2);
     LOG(DEBUG) << "VM stack:\n" << os.str();
     LOG(DEBUG) << "VM exit code: " << res.code;
     LOG(DEBUG) << "VM accepted: " << res.accepted;
@@ -128,6 +131,21 @@ SmartContract::Answer run_smartcont(SmartContract::State state, td::Ref<vm::Stac
 }
 }  // namespace
 
+td::Result<td::BufferSlice> SmartContract::Args::get_serialized_stack() {
+  if (!stack) {
+    return td::Status::Error("Args has no stack");
+  }
+  vm::FakeVmStateLimits fstate(1000);  // limit recursive (de)serialization calls
+  vm::VmStateInterface::Guard guard(&fstate);
+  // serialize parameters
+  vm::CellBuilder cb;
+  td::Ref<vm::Cell> cell;
+  if (!(stack.value()->serialize(cb) && cb.finalize_to(cell))) {
+    return td::Status::Error("Cannot serialize stack in args");
+  }
+  return vm::std_boc_serialize(std::move(cell));
+}
+
 td::Ref<vm::CellSlice> SmartContract::empty_slice() {
   return vm::load_cell_slice_ref(vm::CellBuilder().finalize());
 }
diff --git a/submodules/ton/tonlib-src/crypto/smc-envelope/SmartContract.h b/submodules/ton/tonlib-src/crypto/smc-envelope/SmartContract.h
index d586436195..24c2d13232 100644
--- a/submodules/ton/tonlib-src/crypto/smc-envelope/SmartContract.h
+++ b/submodules/ton/tonlib-src/crypto/smc-envelope/SmartContract.h
@@ -14,13 +14,13 @@
     You should have received a copy of the GNU Lesser General Public License
     along with TON Blockchain Library.  If not, see <http://www.gnu.org/licenses/>.
 
-    Copyright 2017-2019 Telegram Systems LLP
+    Copyright 2017-2020 Telegram Systems LLP
 */
 #pragma once
 
 #include "vm/cells.h"
 #include "vm/stack.hpp"
-#include "vm/continuation.h"
+#include "vm/vm.h"
 
 #include "td/utils/optional.h"
 #include "td/utils/crypto.h"
@@ -90,6 +90,14 @@ class SmartContract : public td::CntObject {
       this->ignore_chksig = ignore_chksig;
       return std::move(*this);
     }
+
+    td::Result<td::int32> get_method_id() const {
+      if (!method_id) {
+        return td::Status::Error("Args has no method id");
+      }
+      return method_id.value();
+    }
+    td::Result<td::BufferSlice> get_serialized_stack();
   };
 
   Answer run_method(Args args = {});
diff --git a/submodules/ton/tonlib-src/crypto/smc-envelope/SmartContractCode.cpp b/submodules/ton/tonlib-src/crypto/smc-envelope/SmartContractCode.cpp
index c187131d71..6256dcc064 100644
--- a/submodules/ton/tonlib-src/crypto/smc-envelope/SmartContractCode.cpp
+++ b/submodules/ton/tonlib-src/crypto/smc-envelope/SmartContractCode.cpp
@@ -14,7 +14,7 @@
     You should have received a copy of the GNU Lesser General Public License
     along with TON Blockchain Library.  If not, see <http://www.gnu.org/licenses/>.
 
-    Copyright 2017-2019 Telegram Systems LLP
+    Copyright 2017-2020 Telegram Systems LLP
 */
 #include "SmartContractCode.h"
 
@@ -25,13 +25,15 @@
 
 namespace ton {
 namespace {
+// WALLET_REVISION = 2;
+// WALLET2_REVISION = 2;
+// WALLET3_REVISION = 2;
+// HIGHLOAD_WALLET_REVISION = 2;
+// HIGHLOAD_WALLET2_REVISION = 2;
+// DNS_REVISION = 1;
 const auto& get_map() {
   static auto map = [] {
-    class Cmp : public std::less<> {
-     public:
-      using is_transparent = void;
-    };
-    std::map<std::string, td::Ref<vm::Cell>, Cmp> map;
+    std::map<std::string, td::Ref<vm::Cell>, std::less<>> map;
     auto with_tvm_code = [&](auto name, td::Slice code_str) {
       map[name] = vm::std_boc_deserialize(td::base64_decode(code_str).move_as_ok()).move_as_ok();
     };
@@ -39,6 +41,61 @@ const auto& get_map() {
 #include "smartcont/auto/simple-wallet-ext-code.cpp"
 #include "smartcont/auto/simple-wallet-code.cpp"
 #include "smartcont/auto/wallet-code.cpp"
+#include "smartcont/auto/highload-wallet-code.cpp"
+#include "smartcont/auto/highload-wallet-v2-code.cpp"
+#include "smartcont/auto/dns-manual-code.cpp"
+
+    with_tvm_code("highload-wallet-r1",
+                  "te6ccgEBBgEAhgABFP8A9KQT9KDyyAsBAgEgAgMCAUgEBQC88oMI1xgg0x/TH9Mf+CMTu/Jj7UTQ0x/TH9P/"
+                  "0VEyuvKhUUS68qIE+QFUEFX5EPKj9ATR+AB/jhghgBD0eG+hb6EgmALTB9QwAfsAkTLiAbPmWwGkyMsfyx/L/"
+                  "8ntVAAE0DAAEaCZL9qJoa4WPw==");
+    with_tvm_code("highload-wallet-r2",
+                  "te6ccgEBCAEAlwABFP8A9KQT9LzyyAsBAgEgAgMCAUgEBQC48oMI1xgg0x/TH9Mf+CMTu/Jj7UTQ0x/TH9P/"
+                  "0VEyuvKhUUS68qIE+QFUEFX5EPKj9ATR+AB/jhYhgBD0eG+lIJgC0wfUMAH7AJEy4gGz5lsBpMjLH8sfy//"
+                  "J7VQABNAwAgFIBgcAF7s5ztRNDTPzHXC/+AARuMl+1E0NcLH4");
+    with_tvm_code("highload-wallet-v2-r1",
+                  "te6ccgEBBwEA1gABFP8A9KQT9KDyyAsBAgEgAgMCAUgEBQHu8oMI1xgg0x/TP/gjqh9TILnyY+1E0NMf0z/T//"
+                  "QE0VNggED0Dm+hMfJgUXO68qIH+QFUEIf5EPKjAvQE0fgAf44YIYAQ9HhvoW+"
+                  "hIJgC0wfUMAH7AJEy4gGz5luDJaHIQDSAQPRDiuYxyBLLHxPLP8v/9ADJ7VQGAATQMABBoZfl2omhpj5jpn+n/"
+                  "mPoCaKkQQCB6BzfQmMktv8ld0fFADgggED0lm+hb6EyURCUMFMDud4gkzM2AZIyMOKz");
+    with_tvm_code("highload-wallet-v2-r2",
+                  "te6ccgEBCQEA5QABFP8A9KQT9LzyyAsBAgEgAgMCAUgEBQHq8oMI1xgg0x/TP/gjqh9TILnyY+1E0NMf0z/T//"
+                  "QE0VNggED0Dm+hMfJgUXO68qIH+QFUEIf5EPKjAvQE0fgAf44WIYAQ9HhvpSCYAtMH1DAB+wCRMuIBs+"
+                  "ZbgyWhyEA0gED0Q4rmMcgSyx8Tyz/L//QAye1UCAAE0DACASAGBwAXvZznaiaGmvmOuF/8AEG+X5dqJoaY+Y6Z/p/"
+                  "5j6AmipEEAgegc30JjJLb/JXdHxQANCCAQPSWb6UyURCUMFMDud4gkzM2AZIyMOKz");
+    with_tvm_code("simple-wallet-r1",
+                  "te6ccgEEAQEAAAAAUwAAov8AIN0gggFMl7qXMO1E0NcLH+Ck8mCBAgDXGCDXCx/tRNDTH9P/"
+                  "0VESuvKhIvkBVBBE+RDyovgAAdMfMSDXSpbTB9QC+wDe0aTIyx/L/8ntVA==");
+    with_tvm_code("simple-wallet-r2",
+                  "te6ccgEBAQEAXwAAuv8AIN0gggFMl7ohggEznLqxnHGw7UTQ0x/XC//jBOCk8mCBAgDXGCDXCx/tRNDTH9P/"
+                  "0VESuvKhIvkBVBBE+RDyovgAAdMfMSDXSpbTB9QC+wDe0aTIyx/L/8ntVA==");
+    with_tvm_code("wallet-r1",
+                  "te6ccgEBAQEAVwAAqv8AIN0gggFMl7qXMO1E0NcLH+Ck8mCDCNcYINMf0x8B+CO78mPtRNDTH9P/0VExuvKhA/"
+                  "kBVBBC+RDyovgAApMg10qW0wfUAvsA6NGkyMsfy//J7VQ=");
+    with_tvm_code("wallet-r2",
+                  "te6ccgEBAQEAYwAAwv8AIN0gggFMl7ohggEznLqxnHGw7UTQ0x/XC//jBOCk8mCDCNcYINMf0x8B+CO78mPtRNDTH9P/"
+                  "0VExuvKhA/kBVBBC+RDyovgAApMg10qW0wfUAvsA6NGkyMsfy//J7VQ=");
+    with_tvm_code("wallet3-r1",
+                  "te6ccgEBAQEAYgAAwP8AIN0gggFMl7qXMO1E0NcLH+Ck8mCDCNcYINMf0x/TH/gjE7vyY+1E0NMf0x/T/"
+                  "9FRMrryoVFEuvKiBPkBVBBV+RDyo/gAkyDXSpbTB9QC+wDo0QGkyMsfyx/L/8ntVA==");
+    with_tvm_code("wallet3-r2",
+                  "te6ccgEBAQEAcQAA3v8AIN0gggFMl7ohggEznLqxn3Gw7UTQ0x/THzHXC//jBOCk8mCDCNcYINMf0x/TH/gjE7vyY+1E0NMf0x/"
+                  "T/9FRMrryoVFEuvKiBPkBVBBV+RDyo/gAkyDXSpbTB9QC+wDo0QGkyMsfyx/L/8ntVA==");
+    with_tvm_code(
+        "dns-manual-r1",
+        "te6ccgECGAEAAtAAART/APSkE/S88sgLAQIBIAIDAgFIBAUC7PLbPAWDCNcYIPkBAdMf0z/"
+        "4I6ofUyC58mNTKoBA9A5voTHyYFKUuvKiVBNG+RDyo/gAItcLBcAzmDQBdtch0/"
+        "8wjoVa2zxAA+"
+        "IDgyWhyEAHgED0Q44aIIBA9JZvpTJREJQwUwe53iCTMzUBkjIw4rPmNVUD8AQREgICxQYHAgEgDA0CAc8ICQAIqoJfAwIBSAoLACHWQK5Y+"
+        "J5Z/l//oAegBk9qpAAFF8DgABcyPQAydBBM/Rw8qGAAF72c52omhpr5jrhf/"
+        "AIBIA4PABG7Nz7UTQ1wsfgD+"
+        "7owwh10kglF8DcG3hIHew8l4ieNci1wsHnnDIUATPFhPLB8nQAqYI3iDACJRfA3Bt4Ns8FF8EI3ADqwKY0wcBwAAToQLkIG2OnF8DIcjLBiTPF"
+        "snQhAlUQgHbPAWlFbIgwQEVQzDmMzUilF8FcG3hMgHHAJMxfwHfAtdJpvmBEVEAAYIcAAkjEB4AKAEPRqABztRNDTH9M/0//"
+        "0BPQE0QE2cFmOlNs8IMcBnCDXSpPUMNCTMn8C4t4i5jAxEwT20wUhwQqOLCGRMeEhwAGXMdMH1AL7AOABwAmOFNQh+wTtQwLQ7R7tU1RiA/"
+        "EGgvIA4PIt4HAiwRSUMNIPAd5tbSTBHoreJMEUjpElhAkj2zwzApUyxwDyo5Fb4t4kwAuOEzQC9ARQJIAQ9G4wECOECVnwAQHgJMAMiuAwFBUW"
+        "FwCEMQLTAAHAAZPUAdCY0wUBqgLXGAHiINdJwg/"
+        "ypiB41yLXCwfyaHBTEddJqTYCmNMHAcAAEqEB5DDIywYBzxbJ0FADACBZ9KhvpSCUAvQEMJIybeICACg0A4AQ9FqZECOECUBE8AEBkjAx4gBmM"
+        "SLAFZwy9AQQI4QJUELwAQHgIsAWmDIChAn0czAB4DAyIMAfkzD0BODAIJJtAeDyLG0B");
     return map;
   }();
   return map;
@@ -49,24 +106,97 @@ td::Result<td::Ref<vm::Cell>> SmartContractCode::load(td::Slice name) {
   auto& map = get_map();
   auto it = map.find(name);
   if (it == map.end()) {
-    return td::Status::Error(PSLICE() << "Can't load td::ref<vm::cell " << name);
+    return td::Status::Error(PSLICE() << "Can't load td::Ref<vm::Cell> " << name);
   }
   return it->second;
 }
-td::Ref<vm::Cell> SmartContractCode::multisig() {
-  auto res = load("multisig").move_as_ok();
-  return res;
+
+td::Span<int> SmartContractCode::get_revisions(Type type) {
+  switch (type) {
+    case Type::WalletV1: {
+      static int res[] = {1, 2};
+      return res;
+    }
+    case Type::WalletV2: {
+      static int res[] = {1, 2};
+      return res;
+    }
+    case Type::WalletV3: {
+      static int res[] = {1, 2};
+      return res;
+    }
+    case Type::WalletV1Ext: {
+      static int res[] = {-1};
+      return res;
+    }
+    case Type::HighloadWalletV1: {
+      static int res[] = {-1, 1, 2};
+      return res;
+    }
+    case Type::HighloadWalletV2: {
+      static int res[] = {-1, 1, 2};
+      return res;
+    }
+    case Type::Multisig: {
+      static int res[] = {-1};
+      return res;
+    }
+    case Type::ManualDns: {
+      static int res[] = {-1, 1};
+      return res;
+    }
+  }
+  UNREACHABLE();
+  return {};
 }
-td::Ref<vm::Cell> SmartContractCode::wallet() {
-  auto res = load("wallet").move_as_ok();
-  return res;
+
+td::Result<int> SmartContractCode::validate_revision(Type type, int revision) {
+  auto revisions = get_revisions(type);
+  if (revision == -1) {
+    if (revisions[0] == -1) {
+      return -1;
+    }
+    return revisions[revisions.size() - 1];
+  }
+  if (revision == 0) {
+    return revisions[revisions.size() - 1];
+  }
+  for (auto x : revisions) {
+    if (x == revision) {
+      return revision;
+    }
+  }
+  return td::Status::Error("No such revision");
 }
-td::Ref<vm::Cell> SmartContractCode::simple_wallet() {
-  auto res = load("simple-wallet").move_as_ok();
-  return res;
-}
-td::Ref<vm::Cell> SmartContractCode::simple_wallet_ext() {
-  static auto res = load("simple-wallet-ext").move_as_ok();
-  return res;
+
+td::Ref<vm::Cell> SmartContractCode::get_code(Type type, int ext_revision) {
+  auto revision = validate_revision(type, ext_revision).move_as_ok();
+  auto basename = [](Type type) -> td::Slice {
+    switch (type) {
+      case Type::WalletV1:
+        return "simple-wallet";
+      case Type::WalletV2:
+        return "wallet";
+      case Type::WalletV3:
+        return "wallet3";
+      case Type::WalletV1Ext:
+        return "simple-wallet-ext";
+      case Type::HighloadWalletV1:
+        return "highload-wallet";
+      case Type::HighloadWalletV2:
+        return "highload-wallet-v2";
+      case Type::Multisig:
+        return "multisig";
+      case Type::ManualDns:
+        return "dns-manual";
+    }
+    UNREACHABLE();
+    return "";
+  }(type);
+  if (revision == -1) {
+    return load(basename).move_as_ok();
+  }
+  return load(PSLICE() << basename << "-r" << revision).move_as_ok();
 }
+
 }  // namespace ton
diff --git a/submodules/ton/tonlib-src/crypto/smc-envelope/SmartContractCode.h b/submodules/ton/tonlib-src/crypto/smc-envelope/SmartContractCode.h
index 059215e445..1ea2274c84 100644
--- a/submodules/ton/tonlib-src/crypto/smc-envelope/SmartContractCode.h
+++ b/submodules/ton/tonlib-src/crypto/smc-envelope/SmartContractCode.h
@@ -14,17 +14,20 @@
     You should have received a copy of the GNU Lesser General Public License
     along with TON Blockchain Library.  If not, see <http://www.gnu.org/licenses/>.
 
-    Copyright 2017-2019 Telegram Systems LLP
+    Copyright 2017-2020 Telegram Systems LLP
 */
 #include "vm/cells.h"
 
+#include "td/utils/Span.h"
+
 namespace ton {
 class SmartContractCode {
  public:
   static td::Result<td::Ref<vm::Cell>> load(td::Slice name);
-  static td::Ref<vm::Cell> multisig();
-  static td::Ref<vm::Cell> wallet();
-  static td::Ref<vm::Cell> simple_wallet();
-  static td::Ref<vm::Cell> simple_wallet_ext();
+
+  enum Type { WalletV1 = 1, WalletV1Ext, WalletV2, WalletV3, HighloadWalletV1, HighloadWalletV2, ManualDns, Multisig };
+  static td::Span<int> get_revisions(Type type);
+  static td::Result<int> validate_revision(Type type, int revision);
+  static td::Ref<vm::Cell> get_code(Type type, int revision = 0);
 };
 }  // namespace ton
diff --git a/submodules/ton/tonlib-src/crypto/smc-envelope/TestGiver.cpp b/submodules/ton/tonlib-src/crypto/smc-envelope/TestGiver.cpp
index 2d44d73073..f9ed60bfd7 100644
--- a/submodules/ton/tonlib-src/crypto/smc-envelope/TestGiver.cpp
+++ b/submodules/ton/tonlib-src/crypto/smc-envelope/TestGiver.cpp
@@ -14,7 +14,7 @@
     You should have received a copy of the GNU Lesser General Public License
     along with TON Blockchain Library.  If not, see <http://www.gnu.org/licenses/>.
 
-    Copyright 2017-2019 Telegram Systems LLP
+    Copyright 2017-2020 Telegram Systems LLP
 */
 #include "TestGiver.h"
 #include "GenericAccount.h"
@@ -35,14 +35,23 @@ vm::CellHash TestGiver::get_init_code_hash() noexcept {
   //return vm::CellHash::from_slice(td::base64_decode("YV/IANhoI22HVeatFh6S5LbCHp+5OilARfzW+VQPZgQ=").move_as_ok());
 }
 
-td::Ref<vm::Cell> TestGiver::make_a_gift_message(td::uint32 seqno, td::uint64 gramms, td::Slice message,
-                                                 const block::StdAddress& dest_address) noexcept {
+td::Ref<vm::Cell> TestGiver::make_a_gift_message_static(td::uint32 seqno, td::Span<Gift> gifts) noexcept {
+  CHECK(gifts.size() <= max_gifts_size);
+
   vm::CellBuilder cb;
-  GenericAccount::store_int_message(cb, dest_address, gramms);
-  cb.store_bytes("\0\0\0\0", 4);
-  vm::CellString::store(cb, message, 35 * 8).ensure();
-  auto message_inner = cb.finalize();
-  return vm::CellBuilder().store_long(seqno, 32).store_long(1, 8).store_ref(message_inner).finalize();
+  cb.store_long(seqno, 32);
+
+  for (auto& gift : gifts) {
+    td::int32 send_mode = 1;
+    auto gramms = gift.gramms;
+    vm::CellBuilder cbi;
+    GenericAccount::store_int_message(cbi, gift.destination, gramms);
+    store_gift_message(cbi, gift);
+    auto message_inner = cbi.finalize();
+    cb.store_long(send_mode, 8).store_ref(std::move(message_inner));
+  }
+
+  return cb.finalize();
 }
 
 td::Result<td::uint32> TestGiver::get_seqno() const {
diff --git a/submodules/ton/tonlib-src/crypto/smc-envelope/TestGiver.h b/submodules/ton/tonlib-src/crypto/smc-envelope/TestGiver.h
index 210b691240..b51ac7dbe0 100644
--- a/submodules/ton/tonlib-src/crypto/smc-envelope/TestGiver.h
+++ b/submodules/ton/tonlib-src/crypto/smc-envelope/TestGiver.h
@@ -14,25 +14,38 @@
     You should have received a copy of the GNU Lesser General Public License
     along with TON Blockchain Library.  If not, see <http://www.gnu.org/licenses/>.
 
-    Copyright 2017-2019 Telegram Systems LLP
+    Copyright 2017-2020 Telegram Systems LLP
 */
 #pragma once
 #include "SmartContract.h"
+#include "smc-envelope/WalletInterface.h"
 #include "block/block.h"
 #include "vm/cells/CellString.h"
 namespace ton {
-class TestGiver : public SmartContract {
+class TestGiver : public SmartContract, public WalletInterface {
  public:
   explicit TestGiver(State state) : ton::SmartContract(std::move(state)) {
   }
+  TestGiver() : ton::SmartContract({}) {
+  }
   static constexpr unsigned max_message_size = vm::CellString::max_bytes;
+  static constexpr unsigned max_gifts_size = 1;
   static const block::StdAddress& address() noexcept;
   static vm::CellHash get_init_code_hash() noexcept;
-  static td::Ref<vm::Cell> make_a_gift_message(td::uint32 seqno, td::uint64 gramms, td::Slice message,
-                                               const block::StdAddress& dest_address) noexcept;
+  static td::Ref<vm::Cell> make_a_gift_message_static(td::uint32 seqno, td::Span<Gift>) noexcept;
 
   td::Result<td::uint32> get_seqno() const;
 
+  using WalletInterface::get_init_message;
+  td::Result<td::Ref<vm::Cell>> make_a_gift_message(const td::Ed25519::PrivateKey& private_key, td::uint32 valid_until,
+                                                    td::Span<Gift> gifts) const override {
+    TRY_RESULT(seqno, get_seqno());
+    return make_a_gift_message_static(seqno, gifts);
+  }
+  size_t get_max_gifts_size() const override {
+    return max_gifts_size;
+  }
+
  private:
   td::Result<td::uint32> get_seqno_or_throw() const;
 };
diff --git a/submodules/ton/tonlib-src/crypto/smc-envelope/TestWallet.cpp b/submodules/ton/tonlib-src/crypto/smc-envelope/TestWallet.cpp
index 1edf59f911..4f4dcd8dc2 100644
--- a/submodules/ton/tonlib-src/crypto/smc-envelope/TestWallet.cpp
+++ b/submodules/ton/tonlib-src/crypto/smc-envelope/TestWallet.cpp
@@ -13,17 +13,19 @@
 
     You should have received a copy of the GNU Lesser General Public License
     along with TON Blockchain Library.  If not, see <http://www.gnu.org/licenses/>.
-Copyright 2017-2019 Telegram Systems LLP
+Copyright 2017-2020 Telegram Systems LLP
 */
 #include "TestWallet.h"
 #include "GenericAccount.h"
 
+#include "SmartContractCode.h"
+
 #include "vm/boc.h"
 #include "td/utils/base64.h"
 
 namespace ton {
-td::Ref<vm::Cell> TestWallet::get_init_state(const td::Ed25519::PublicKey& public_key) noexcept {
-  auto code = get_init_code();
+td::Ref<vm::Cell> TestWallet::get_init_state(const td::Ed25519::PublicKey& public_key, td::int32 revision) noexcept {
+  auto code = get_init_code(revision);
   auto data = get_init_data(public_key);
   return GenericAccount::get_init_state(std::move(code), std::move(data));
 }
@@ -35,42 +37,46 @@ td::Ref<vm::Cell> TestWallet::get_init_message(const td::Ed25519::PrivateKey& pr
   return vm::CellBuilder().store_bytes(signature).store_bytes(seq_no).finalize();
 }
 
-td::Ref<vm::Cell> TestWallet::make_a_gift_message(const td::Ed25519::PrivateKey& private_key, td::uint32 seqno,
-                                                  td::int64 gramms, td::Slice message,
-                                                  const block::StdAddress& dest_address) noexcept {
-  td::int32 send_mode = 3;
-  if (gramms == -1) {
-    gramms = 0;
-    send_mode += 128;
-  }
+td::Ref<vm::Cell> TestWallet::make_a_gift_message_static(const td::Ed25519::PrivateKey& private_key, td::uint32 seqno,
+                                                         td::Span<Gift> gifts) noexcept {
+  CHECK(gifts.size() <= max_gifts_size);
+
   vm::CellBuilder cb;
-  GenericAccount::store_int_message(cb, dest_address, gramms);
-  cb.store_bytes("\0\0\0\0", 4);
-  vm::CellString::store(cb, message, 35 * 8).ensure();
-  auto message_inner = cb.finalize();
-  auto message_outer =
-      vm::CellBuilder().store_long(seqno, 32).store_long(send_mode, 8).store_ref(message_inner).finalize();
+  cb.store_long(seqno, 32);
+
+  for (auto& gift : gifts) {
+    td::int32 send_mode = 3;
+    auto gramms = gift.gramms;
+    if (gramms == -1) {
+      gramms = 0;
+      send_mode += 128;
+    }
+    vm::CellBuilder cbi;
+    GenericAccount::store_int_message(cbi, gift.destination, gramms);
+    store_gift_message(cbi, gift);
+    auto message_inner = cbi.finalize();
+    cb.store_long(send_mode, 8).store_ref(std::move(message_inner));
+  }
+
+  auto message_outer = cb.finalize();
   auto signature = private_key.sign(message_outer->get_hash().as_slice()).move_as_ok();
   return vm::CellBuilder().store_bytes(signature).append_cellslice(vm::load_cell_slice(message_outer)).finalize();
 }
 
-td::Ref<vm::Cell> TestWallet::get_init_code() noexcept {
-  static auto res = [] {
-    auto serialized_code = td::base64_decode(
-                               "te6ccgEEAQEAAAAAUwAAov8AIN0gggFMl7qXMO1E0NcLH+Ck8mCBAgDXGCDXCx/tRNDTH9P/"
-                               "0VESuvKhIvkBVBBE+RDyovgAAdMfMSDXSpbTB9QC+wDe0aTIyx/L/8ntVA==")
-                               .move_as_ok();
-    return vm::std_boc_deserialize(serialized_code).move_as_ok();
-  }();
-  return res;
+td::Ref<vm::Cell> TestWallet::get_init_code(td::int32 revision) noexcept {
+  return ton::SmartContractCode::get_code(ton::SmartContractCode::WalletV1, revision);
 }
 
 vm::CellHash TestWallet::get_init_code_hash() noexcept {
   return get_init_code()->get_hash();
 }
 
+td::Ref<vm::Cell> TestWallet::get_data(const td::Ed25519::PublicKey& public_key, td::uint32 seqno) noexcept {
+  return vm::CellBuilder().store_long(seqno, 32).store_bytes(public_key.as_octet_string()).finalize();
+}
+
 td::Ref<vm::Cell> TestWallet::get_init_data(const td::Ed25519::PublicKey& public_key) noexcept {
-  return vm::CellBuilder().store_long(0, 32).store_bytes(public_key.as_octet_string()).finalize();
+  return get_data(public_key, 0);
 }
 
 td::Result<td::uint32> TestWallet::get_seqno() const {
@@ -88,4 +94,20 @@ td::Result<td::uint32> TestWallet::get_seqno_or_throw() const {
   return static_cast<td::uint32>(seqno);
 }
 
+td::Result<td::Ed25519::PublicKey> TestWallet::get_public_key() const {
+  return TRY_VM(get_public_key_or_throw());
+}
+
+td::Result<td::Ed25519::PublicKey> TestWallet::get_public_key_or_throw() const {
+  if (state_.data.is_null()) {
+    return td::Status::Error("data is null");
+  }
+  //FIXME use get method
+  auto cs = vm::load_cell_slice(state_.data);
+  cs.skip_first(32);
+  td::SecureString res(td::Ed25519::PublicKey::LENGTH);
+  cs.fetch_bytes(res.as_mutable_slice().ubegin(), td::narrow_cast<td::int32>(res.size()));
+  return td::Ed25519::PublicKey(std::move(res));
+}
+
 }  // namespace ton
diff --git a/submodules/ton/tonlib-src/crypto/smc-envelope/TestWallet.h b/submodules/ton/tonlib-src/crypto/smc-envelope/TestWallet.h
index 161aef58b5..46891aa961 100644
--- a/submodules/ton/tonlib-src/crypto/smc-envelope/TestWallet.h
+++ b/submodules/ton/tonlib-src/crypto/smc-envelope/TestWallet.h
@@ -14,35 +14,53 @@
     You should have received a copy of the GNU Lesser General Public License
     along with TON Blockchain Library.  If not, see <http://www.gnu.org/licenses/>.
 
-    Copyright 2017-2019 Telegram Systems LLP
+    Copyright 2017-2020 Telegram Systems LLP
 */
 #pragma once
 
 #include "smc-envelope/SmartContract.h"
+#include "smc-envelope/WalletInterface.h"
 #include "vm/cells.h"
 #include "Ed25519.h"
 #include "block/block.h"
 #include "vm/cells/CellString.h"
 
 namespace ton {
-class TestWallet : public ton::SmartContract {
+class TestWallet : public ton::SmartContract, public WalletInterface {
  public:
   explicit TestWallet(State state) : ton::SmartContract(std::move(state)) {
   }
+  explicit TestWallet(const td::Ed25519::PublicKey& public_key, td::uint32 seqno)
+      : TestWallet(State{get_init_code(), get_data(public_key, seqno)}) {
+  }
   static constexpr unsigned max_message_size = vm::CellString::max_bytes;
-  static td::Ref<vm::Cell> get_init_state(const td::Ed25519::PublicKey& public_key) noexcept;
+  static constexpr unsigned max_gifts_size = 1;
+  static td::Ref<vm::Cell> get_init_state(const td::Ed25519::PublicKey& public_key, td::int32 revision = 0) noexcept;
   static td::Ref<vm::Cell> get_init_message(const td::Ed25519::PrivateKey& private_key) noexcept;
-  static td::Ref<vm::Cell> make_a_gift_message(const td::Ed25519::PrivateKey& private_key, td::uint32 seqno,
-                                               td::int64 gramms, td::Slice message,
-                                               const block::StdAddress& dest_address) noexcept;
+  static td::Ref<vm::Cell> make_a_gift_message_static(const td::Ed25519::PrivateKey& private_key, td::uint32 seqno,
+                                                      td::Span<Gift> gifts) noexcept;
 
-  static td::Ref<vm::Cell> get_init_code() noexcept;
+  static td::Ref<vm::Cell> get_init_code(td::int32 revision = 0) noexcept;
   static vm::CellHash get_init_code_hash() noexcept;
+  static td::Ref<vm::Cell> get_data(const td::Ed25519::PublicKey& public_key, td::uint32 seqno) noexcept;
   static td::Ref<vm::Cell> get_init_data(const td::Ed25519::PublicKey& public_key) noexcept;
 
   td::Result<td::uint32> get_seqno() const;
 
+  using WalletInterface::get_init_message;
+  td::Result<td::Ref<vm::Cell>> make_a_gift_message(const td::Ed25519::PrivateKey& private_key, td::uint32 valid_until,
+                                                    td::Span<Gift> gifts) const override {
+    TRY_RESULT(seqno, get_seqno());
+    return make_a_gift_message_static(private_key, seqno, gifts);
+  }
+  size_t get_max_gifts_size() const override {
+    return max_gifts_size;
+  }
+
+  td::Result<td::Ed25519::PublicKey> get_public_key() const override;
+
  private:
   td::Result<td::uint32> get_seqno_or_throw() const;
+  td::Result<td::Ed25519::PublicKey> get_public_key_or_throw() const;
 };
 }  // namespace ton
diff --git a/submodules/ton/tonlib-src/crypto/smc-envelope/Wallet.cpp b/submodules/ton/tonlib-src/crypto/smc-envelope/Wallet.cpp
index 61958ed959..ef637fb96c 100644
--- a/submodules/ton/tonlib-src/crypto/smc-envelope/Wallet.cpp
+++ b/submodules/ton/tonlib-src/crypto/smc-envelope/Wallet.cpp
@@ -14,10 +14,11 @@
     You should have received a copy of the GNU Lesser General Public License
     along with TON Blockchain Library.  If not, see <http://www.gnu.org/licenses/>.
 
-    Copyright 2017-2019 Telegram Systems LLP
+    Copyright 2017-2020 Telegram Systems LLP
 */
 #include "Wallet.h"
 #include "GenericAccount.h"
+#include "SmartContractCode.h"
 
 #include "vm/boc.h"
 #include "vm/cells/CellString.h"
@@ -26,8 +27,8 @@
 #include <limits>
 
 namespace ton {
-td::Ref<vm::Cell> Wallet::get_init_state(const td::Ed25519::PublicKey& public_key) noexcept {
-  auto code = get_init_code();
+td::Ref<vm::Cell> Wallet::get_init_state(const td::Ed25519::PublicKey& public_key, td::int32 revision) noexcept {
+  auto code = get_init_code(revision);
   auto data = get_init_data(public_key);
   return GenericAccount::get_init_state(std::move(code), std::move(data));
 }
@@ -43,46 +44,45 @@ td::Ref<vm::Cell> Wallet::get_init_message(const td::Ed25519::PrivateKey& privat
 }
 
 td::Ref<vm::Cell> Wallet::make_a_gift_message(const td::Ed25519::PrivateKey& private_key, td::uint32 seqno,
-                                              td::uint32 valid_until, td::int64 gramms, td::Slice message,
-                                              const block::StdAddress& dest_address) noexcept {
-  td::int32 send_mode = 3;
-  if (gramms == -1) {
-    gramms = 0;
-    send_mode += 128;
-  }
-  vm::CellBuilder cb;
-  GenericAccount::store_int_message(cb, dest_address, gramms);
-  cb.store_bytes("\0\0\0\0", 4);
-  vm::CellString::store(cb, message, 35 * 8).ensure();
-  auto message_inner = cb.finalize();
+                                              td::uint32 valid_until, td::Span<Gift> gifts) noexcept {
+  CHECK(gifts.size() <= max_gifts_size);
 
-  auto message_outer = vm::CellBuilder()
-                           .store_long(seqno, 32)
-                           .store_long(valid_until, 32)
-                           .store_long(send_mode, 8)
-                           .store_ref(message_inner)
-                           .finalize();
+  vm::CellBuilder cb;
+  cb.store_long(seqno, 32).store_long(valid_until, 32);
+
+  for (auto& gift : gifts) {
+    td::int32 send_mode = 3;
+    auto gramms = gift.gramms;
+    if (gramms == -1) {
+      gramms = 0;
+      send_mode += 128;
+    }
+    vm::CellBuilder cbi;
+    GenericAccount::store_int_message(cbi, gift.destination, gramms);
+    store_gift_message(cbi, gift);
+    auto message_inner = cbi.finalize();
+    cb.store_long(send_mode, 8).store_ref(std::move(message_inner));
+  }
+
+  auto message_outer = cb.finalize();
   auto signature = private_key.sign(message_outer->get_hash().as_slice()).move_as_ok();
   return vm::CellBuilder().store_bytes(signature).append_cellslice(vm::load_cell_slice(message_outer)).finalize();
 }
 
-td::Ref<vm::Cell> Wallet::get_init_code() noexcept {
-  static auto res = [] {
-    auto serialized_code = td::base64_decode(
-                               "te6ccgEEAQEAAAAAVwAAqv8AIN0gggFMl7qXMO1E0NcLH+Ck8mCDCNcYINMf0x8B+CO78mPtRNDTH9P/"
-                               "0VExuvKhA/kBVBBC+RDyovgAApMg10qW0wfUAvsA6NGkyMsfy//J7VQ=")
-                               .move_as_ok();
-    return vm::std_boc_deserialize(serialized_code).move_as_ok();
-  }();
-  return res;
+td::Ref<vm::Cell> Wallet::get_init_code(td::int32 revision) noexcept {
+  return SmartContractCode::get_code(ton::SmartContractCode::WalletV2, revision);
 }
 
 vm::CellHash Wallet::get_init_code_hash() noexcept {
   return get_init_code()->get_hash();
 }
 
+td::Ref<vm::Cell> Wallet::get_data(const td::Ed25519::PublicKey& public_key, td::uint32 seqno) noexcept {
+  return vm::CellBuilder().store_long(seqno, 32).store_bytes(public_key.as_octet_string()).finalize();
+}
+
 td::Ref<vm::Cell> Wallet::get_init_data(const td::Ed25519::PublicKey& public_key) noexcept {
-  return vm::CellBuilder().store_long(0, 32).store_bytes(public_key.as_octet_string()).finalize();
+  return get_data(public_key, 0);
 }
 
 td::Result<td::uint32> Wallet::get_seqno() const {
@@ -97,4 +97,20 @@ td::Result<td::uint32> Wallet::get_seqno_or_throw() const {
   return static_cast<td::uint32>(vm::load_cell_slice(state_.data).fetch_ulong(32));
 }
 
+td::Result<td::Ed25519::PublicKey> Wallet::get_public_key() const {
+  return TRY_VM(get_public_key_or_throw());
+}
+
+td::Result<td::Ed25519::PublicKey> Wallet::get_public_key_or_throw() const {
+  if (state_.data.is_null()) {
+    return td::Status::Error("data is null");
+  }
+  //FIXME use get method
+  auto cs = vm::load_cell_slice(state_.data);
+  cs.skip_first(32);
+  td::SecureString res(td::Ed25519::PublicKey::LENGTH);
+  cs.fetch_bytes(res.as_mutable_slice().ubegin(), td::narrow_cast<td::int32>(res.size()));
+  return td::Ed25519::PublicKey(std::move(res));
+}
+
 }  // namespace ton
diff --git a/submodules/ton/tonlib-src/crypto/smc-envelope/Wallet.h b/submodules/ton/tonlib-src/crypto/smc-envelope/Wallet.h
index 7cd33c81d1..2299be7cca 100644
--- a/submodules/ton/tonlib-src/crypto/smc-envelope/Wallet.h
+++ b/submodules/ton/tonlib-src/crypto/smc-envelope/Wallet.h
@@ -14,35 +14,53 @@
     You should have received a copy of the GNU Lesser General Public License
     along with TON Blockchain Library.  If not, see <http://www.gnu.org/licenses/>.
 
-    Copyright 2017-2019 Telegram Systems LLP
+    Copyright 2017-2020 Telegram Systems LLP
 */
 #pragma once
 
 #include "smc-envelope/SmartContract.h"
+#include "smc-envelope/WalletInterface.h"
 #include "vm/cells.h"
 #include "Ed25519.h"
 #include "block/block.h"
 #include "vm/cells/CellString.h"
 
 namespace ton {
-class Wallet : ton::SmartContract {
+class Wallet : ton::SmartContract, public WalletInterface {
  public:
   explicit Wallet(State state) : ton::SmartContract(std::move(state)) {
   }
+  explicit Wallet(const td::Ed25519::PublicKey& public_key, td::uint32 seqno)
+      : Wallet(State{get_init_code(), get_data(public_key, seqno)}) {
+  }
   static constexpr unsigned max_message_size = vm::CellString::max_bytes;
-  static td::Ref<vm::Cell> get_init_state(const td::Ed25519::PublicKey& public_key) noexcept;
+  static constexpr unsigned max_gifts_size = 4;
+  static td::Ref<vm::Cell> get_init_state(const td::Ed25519::PublicKey& public_key, td::int32 revision = 0) noexcept;
   static td::Ref<vm::Cell> get_init_message(const td::Ed25519::PrivateKey& private_key) noexcept;
   static td::Ref<vm::Cell> make_a_gift_message(const td::Ed25519::PrivateKey& private_key, td::uint32 seqno,
-                                               td::uint32 valid_until, td::int64 gramms, td::Slice message,
-                                               const block::StdAddress& dest_address) noexcept;
+                                               td::uint32 valid_until, td::Span<Gift> gifts) noexcept;
 
-  static td::Ref<vm::Cell> get_init_code() noexcept;
+  static td::Ref<vm::Cell> get_init_code(td::int32 revision = 0) noexcept;
   static vm::CellHash get_init_code_hash() noexcept;
   static td::Ref<vm::Cell> get_init_data(const td::Ed25519::PublicKey& public_key) noexcept;
+  static td::Ref<vm::Cell> get_data(const td::Ed25519::PublicKey& public_key, td::uint32 seqno) noexcept;
 
   td::Result<td::uint32> get_seqno() const;
 
+  using WalletInterface::get_init_message;
+  td::Result<td::Ref<vm::Cell>> make_a_gift_message(const td::Ed25519::PrivateKey& private_key, td::uint32 valid_until,
+                                                    td::Span<Gift> gifts) const override {
+    TRY_RESULT(seqno, get_seqno());
+    return make_a_gift_message(private_key, seqno, valid_until, gifts);
+  }
+  size_t get_max_gifts_size() const override {
+    return max_gifts_size;
+  }
+
+  td::Result<td::Ed25519::PublicKey> get_public_key() const override;
+
  private:
   td::Result<td::uint32> get_seqno_or_throw() const;
+  td::Result<td::Ed25519::PublicKey> get_public_key_or_throw() const;
 };
 }  // namespace ton
diff --git a/submodules/ton/tonlib-src/crypto/smc-envelope/WalletInterface.h b/submodules/ton/tonlib-src/crypto/smc-envelope/WalletInterface.h
new file mode 100644
index 0000000000..2c7760a1af
--- /dev/null
+++ b/submodules/ton/tonlib-src/crypto/smc-envelope/WalletInterface.h
@@ -0,0 +1,72 @@
+/*
+    This file is part of TON Blockchain Library.
+
+    TON Blockchain Library is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Lesser General Public License as published by
+    the Free Software Foundation, either version 2 of the License, or
+    (at your option) any later version.
+
+    TON Blockchain Library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public License
+    along with TON Blockchain Library.  If not, see <http://www.gnu.org/licenses/>.
+
+    Copyright 2017-2020 Telegram Systems LLP
+*/
+#pragma once
+
+#include "td/utils/common.h"
+#include "Ed25519.h"
+#include "block/block.h"
+#include "vm/cells/CellString.h"
+
+#include "SmartContract.h"
+
+namespace ton {
+class WalletInterface {
+ public:
+  struct Gift {
+    block::StdAddress destination;
+    td::int64 gramms;
+
+    bool is_encrypted{false};
+    std::string message;
+
+    td::Ref<vm::Cell> body;
+  };
+
+  virtual ~WalletInterface() {
+  }
+
+  virtual size_t get_max_gifts_size() const = 0;
+  virtual td::Result<td::Ref<vm::Cell>> make_a_gift_message(const td::Ed25519::PrivateKey &private_key,
+                                                            td::uint32 valid_until, td::Span<Gift> gifts) const = 0;
+  virtual td::Result<td::Ed25519::PublicKey> get_public_key() const {
+    return td::Status::Error("TODO");
+  }
+
+  td::Result<td::Ref<vm::Cell>> get_init_message(const td::Ed25519::PrivateKey &private_key,
+                                                 td::uint32 valid_until = std::numeric_limits<td::uint32>::max()) {
+    return make_a_gift_message(private_key, valid_until, {});
+  }
+  static void store_gift_message(vm::CellBuilder &cb, const Gift &gift) {
+    if (gift.body.not_null()) {
+      auto body = vm::load_cell_slice(gift.body);
+      //TODO: handle error
+      cb.append_cellslice_bool(body);
+      return;
+    }
+
+    if (gift.is_encrypted) {
+      cb.store_long(1, 32);
+    } else {
+      cb.store_long(0, 32);
+    }
+    vm::CellString::store(cb, gift.message, 35 * 8).ensure();
+  }
+};
+
+}  // namespace ton
diff --git a/submodules/ton/tonlib-src/crypto/smc-envelope/WalletV3.cpp b/submodules/ton/tonlib-src/crypto/smc-envelope/WalletV3.cpp
index db39c725ef..39993c66e6 100644
--- a/submodules/ton/tonlib-src/crypto/smc-envelope/WalletV3.cpp
+++ b/submodules/ton/tonlib-src/crypto/smc-envelope/WalletV3.cpp
@@ -14,10 +14,11 @@
     You should have received a copy of the GNU Lesser General Public License
     along with TON Blockchain Library.  If not, see <http://www.gnu.org/licenses/>.
 
-    Copyright 2017-2019 Telegram Systems LLP
+    Copyright 2017-2020 Telegram Systems LLP
 */
 #include "WalletV3.h"
 #include "GenericAccount.h"
+#include "SmartContractCode.h"
 
 #include "vm/boc.h"
 #include "vm/cells/CellString.h"
@@ -26,76 +27,70 @@
 #include <limits>
 
 namespace ton {
-td::Ref<vm::Cell> WalletV3::get_init_state(const td::Ed25519::PublicKey& public_key, td::uint32 wallet_id) noexcept {
-  auto code = get_init_code();
+td::Ref<vm::Cell> WalletV3::get_init_state(const td::Ed25519::PublicKey& public_key, td::uint32 wallet_id,
+                                           td::int32 revision) noexcept {
+  auto code = get_init_code(revision);
   auto data = get_init_data(public_key, wallet_id);
   return GenericAccount::get_init_state(std::move(code), std::move(data));
 }
 
-td::Ref<vm::Cell> WalletV3::get_init_message(const td::Ed25519::PrivateKey& private_key,
-                                             td::uint32 wallet_id) noexcept {
-  td::uint32 seqno = 0;
-  td::uint32 valid_until = std::numeric_limits<td::uint32>::max();
-  auto signature = private_key
-                       .sign(vm::CellBuilder()
-                                 .store_long(wallet_id, 32)
-                                 .store_long(valid_until, 32)
-                                 .store_long(seqno, 32)
-                                 .finalize()
-                                 ->get_hash()
-                                 .as_slice())
-                       .move_as_ok();
-  return vm::CellBuilder()
-      .store_bytes(signature)
-      .store_long(wallet_id, 32)
-      .store_long(valid_until, 32)
-      .store_long(seqno, 32)
-      .finalize();
+td::optional<td::int32> WalletV3::guess_revision(const vm::Cell::Hash& code_hash) {
+  for (td::int32 i = 1; i <= 2; i++) {
+    if (get_init_code(i)->get_hash() == code_hash) {
+      return i;
+    }
+  }
+  return {};
+}
+td::optional<td::int32> WalletV3::guess_revision(const block::StdAddress& address,
+                                                 const td::Ed25519::PublicKey& public_key, td::uint32 wallet_id) {
+  for (td::int32 i = 1; i <= 2; i++) {
+    if (GenericAccount::get_address(address.workchain, get_init_state(public_key, wallet_id, i)) == address) {
+      return i;
+    }
+  }
+  return {};
 }
 
 td::Ref<vm::Cell> WalletV3::make_a_gift_message(const td::Ed25519::PrivateKey& private_key, td::uint32 wallet_id,
-                                                td::uint32 seqno, td::uint32 valid_until, td::int64 gramms,
-                                                td::Slice message, const block::StdAddress& dest_address) noexcept {
-  td::int32 send_mode = 3;
-  if (gramms == -1) {
-    gramms = 0;
-    send_mode += 128;
-  }
-  vm::CellBuilder cb;
-  GenericAccount::store_int_message(cb, dest_address, gramms);
-  cb.store_bytes("\0\0\0\0", 4);
-  vm::CellString::store(cb, message, 35 * 8).ensure();
-  auto message_inner = cb.finalize();
+                                                td::uint32 seqno, td::uint32 valid_until,
+                                                td::Span<Gift> gifts) noexcept {
+  CHECK(gifts.size() <= max_gifts_size);
 
-  auto message_outer = vm::CellBuilder()
-                           .store_long(wallet_id, 32)
-                           .store_long(valid_until, 32)
-                           .store_long(seqno, 32)
-                           .store_long(send_mode, 8)
-                           .store_ref(message_inner)
-                           .finalize();
+  vm::CellBuilder cb;
+  cb.store_long(wallet_id, 32).store_long(valid_until, 32).store_long(seqno, 32);
+
+  for (auto& gift : gifts) {
+    td::int32 send_mode = 3;
+    auto gramms = gift.gramms;
+    if (gramms == -1) {
+      gramms = 0;
+      send_mode += 128;
+    }
+    vm::CellBuilder cbi;
+    GenericAccount::store_int_message(cbi, gift.destination, gramms);
+    store_gift_message(cbi, gift);
+    auto message_inner = cbi.finalize();
+    cb.store_long(send_mode, 8).store_ref(std::move(message_inner));
+  }
+
+  auto message_outer = cb.finalize();
   auto signature = private_key.sign(message_outer->get_hash().as_slice()).move_as_ok();
   return vm::CellBuilder().store_bytes(signature).append_cellslice(vm::load_cell_slice(message_outer)).finalize();
 }
 
-td::Ref<vm::Cell> WalletV3::get_init_code() noexcept {
-  static auto res = [] {
-    auto serialized_code = td::base64_decode(
-                               "te6ccgEBAQEAYgAAwP8AIN0gggFMl7qXMO1E0NcLH+Ck8mCDCNcYINMf0x/TH/gjE7vyY+1E0NMf0x/T/"
-                               "9FRMrryoVFEuvKiBPkBVBBV+RDyo/gAkyDXSpbTB9QC+wDo0QGkyMsfyx/L/8ntVA==")
-                               .move_as_ok();
-    return vm::std_boc_deserialize(serialized_code).move_as_ok();
-  }();
-  return res;
+td::Ref<vm::Cell> WalletV3::get_init_code(td::int32 revision) noexcept {
+  return SmartContractCode::get_code(ton::SmartContractCode::WalletV3, revision);
 }
 
 vm::CellHash WalletV3::get_init_code_hash() noexcept {
   return get_init_code()->get_hash();
 }
 
-td::Ref<vm::Cell> WalletV3::get_init_data(const td::Ed25519::PublicKey& public_key, td::uint32 wallet_id) noexcept {
+td::Ref<vm::Cell> WalletV3::get_init_data(const td::Ed25519::PublicKey& public_key, td::uint32 wallet_id,
+                                          td::uint32 seqno) noexcept {
   return vm::CellBuilder()
-      .store_long(0, 32)
+      .store_long(seqno, 32)
       .store_long(wallet_id, 32)
       .store_bytes(public_key.as_octet_string())
       .finalize();
@@ -127,4 +122,20 @@ td::Result<td::uint32> WalletV3::get_wallet_id_or_throw() const {
   return static_cast<td::uint32>(cs.fetch_ulong(32));
 }
 
+td::Result<td::Ed25519::PublicKey> WalletV3::get_public_key() const {
+  return TRY_VM(get_public_key_or_throw());
+}
+
+td::Result<td::Ed25519::PublicKey> WalletV3::get_public_key_or_throw() const {
+  if (state_.data.is_null()) {
+    return td::Status::Error("data is null");
+  }
+  //FIXME use get method
+  auto cs = vm::load_cell_slice(state_.data);
+  cs.skip_first(64);
+  td::SecureString res(td::Ed25519::PublicKey::LENGTH);
+  cs.fetch_bytes(res.as_mutable_slice().ubegin(), td::narrow_cast<td::int32>(res.size()));
+  return td::Ed25519::PublicKey(std::move(res));
+}
+
 }  // namespace ton
diff --git a/submodules/ton/tonlib-src/crypto/smc-envelope/WalletV3.h b/submodules/ton/tonlib-src/crypto/smc-envelope/WalletV3.h
index a6e4162df2..b7c211ca54 100644
--- a/submodules/ton/tonlib-src/crypto/smc-envelope/WalletV3.h
+++ b/submodules/ton/tonlib-src/crypto/smc-envelope/WalletV3.h
@@ -14,37 +14,59 @@
     You should have received a copy of the GNU Lesser General Public License
     along with TON Blockchain Library.  If not, see <http://www.gnu.org/licenses/>.
 
-    Copyright 2017-2019 Telegram Systems LLP
+    Copyright 2017-2020 Telegram Systems LLP
 */
 #pragma once
 
 #include "smc-envelope/SmartContract.h"
+#include "smc-envelope/WalletInterface.h"
 #include "vm/cells.h"
 #include "Ed25519.h"
 #include "block/block.h"
 #include "vm/cells/CellString.h"
 
 namespace ton {
-class WalletV3 : ton::SmartContract {
+class WalletV3 : ton::SmartContract, public WalletInterface {
  public:
   explicit WalletV3(State state) : ton::SmartContract(std::move(state)) {
   }
+  explicit WalletV3(const td::Ed25519::PublicKey& public_key, td::uint32 wallet_id, td::uint32 seqno = 0)
+      : WalletV3(State{get_init_code(), get_init_data(public_key, wallet_id, seqno)}) {
+  }
   static constexpr unsigned max_message_size = vm::CellString::max_bytes;
-  static td::Ref<vm::Cell> get_init_state(const td::Ed25519::PublicKey& public_key, td::uint32 wallet_id) noexcept;
-  static td::Ref<vm::Cell> get_init_message(const td::Ed25519::PrivateKey& private_key, td::uint32 wallet_id) noexcept;
-  static td::Ref<vm::Cell> make_a_gift_message(const td::Ed25519::PrivateKey& private_key, td::uint32 wallet_id,
-                                               td::uint32 seqno, td::uint32 valid_until, td::int64 gramms,
-                                               td::Slice message, const block::StdAddress& dest_address) noexcept;
+  static constexpr unsigned max_gifts_size = 4;
 
-  static td::Ref<vm::Cell> get_init_code() noexcept;
+  static td::optional<td::int32> guess_revision(const vm::Cell::Hash& code_hash);
+  static td::optional<td::int32> guess_revision(const block::StdAddress& address,
+                                                const td::Ed25519::PublicKey& public_key, td::uint32 wallet_id);
+  static td::Ref<vm::Cell> get_init_state(const td::Ed25519::PublicKey& public_key, td::uint32 wallet_id,
+                                          td::int32 revision = 0) noexcept;
+  static td::Ref<vm::Cell> make_a_gift_message(const td::Ed25519::PrivateKey& private_key, td::uint32 wallet_id,
+                                               td::uint32 seqno, td::uint32 valid_until, td::Span<Gift> gifts) noexcept;
+
+  static td::Ref<vm::Cell> get_init_code(td::int32 revision = 0) noexcept;
   static vm::CellHash get_init_code_hash() noexcept;
-  static td::Ref<vm::Cell> get_init_data(const td::Ed25519::PublicKey& public_key, td::uint32 wallet_id) noexcept;
+  static td::Ref<vm::Cell> get_init_data(const td::Ed25519::PublicKey& public_key, td::uint32 wallet_id,
+                                         td::uint32 seqno = 0) noexcept;
 
   td::Result<td::uint32> get_seqno() const;
   td::Result<td::uint32> get_wallet_id() const;
 
+  using WalletInterface::get_init_message;
+  td::Result<td::Ref<vm::Cell>> make_a_gift_message(const td::Ed25519::PrivateKey& private_key, td::uint32 valid_until,
+                                                    td::Span<Gift> gifts) const override {
+    TRY_RESULT(seqno, get_seqno());
+    TRY_RESULT(wallet_id, get_wallet_id());
+    return make_a_gift_message(private_key, wallet_id, seqno, valid_until, gifts);
+  }
+  size_t get_max_gifts_size() const override {
+    return max_gifts_size;
+  }
+  td::Result<td::Ed25519::PublicKey> get_public_key() const override;
+
  private:
   td::Result<td::uint32> get_seqno_or_throw() const;
   td::Result<td::uint32> get_wallet_id_or_throw() const;
+  td::Result<td::Ed25519::PublicKey> get_public_key_or_throw() const;
 };
 }  // namespace ton
diff --git a/submodules/ton/tonlib-src/crypto/test/fift/testdict.fif b/submodules/ton/tonlib-src/crypto/test/fift/testdict.fif
index 307bd2e805..28d711ade7 100644
--- a/submodules/ton/tonlib-src/crypto/test/fift/testdict.fif
+++ b/submodules/ton/tonlib-src/crypto/test/fift/testdict.fif
@@ -1,4 +1,4 @@
-"Lisp.fif" include
+"Lists.fif" include
 16 constant key-bits
 16 constant val-bits
 { val-bits u, } : val,
@@ -7,8 +7,14 @@
 { dictnew { over null? not } { swap uncons swap rot +dictpair } while nip } : mkdict
 { dup null? { ."(null) " drop } { val@ . } cond } : .val
 { key-bits { swap . ."-> " .val ."; " true } dictforeach drop cr } : show-dict
+{ key-bits { swap . ."-> " .val ."; " true } idictforeach drop cr } : show-idict
+{ key-bits { swap . ."-> " .val ."; " true } dictforeachrev drop cr } : show-rev-dict
+{ key-bits { swap . ."-> " .val ."; " true } idictforeachrev drop cr } : show-rev-idict
 { key-bits { rot . ."-> " swap .val .val ."; " true } dictdiff drop cr } : show-dict-diff
 { key-bits { val@ swap val@ + val, true } dictmerge } : dict-sum
+{ key-bits { val@ 2* val, true } dictmap } : dict-twice
+{ key-bits { val@ 2 /mod { 2drop false } { val, true } cond } dictmap } : dict-half
+{ key-bits { val@ + val, true } dictmapext } : dict-add-x
 { null swap key-bits { val@ pair swap cons true } dictforeach drop  } : dict>list-rev
 { dict>list-rev list-reverse } : dict>list
 ( _( 13 169 ) _( 17 289 ) _( 10 100 ) ) mkdict =: Dict
@@ -22,3 +28,7 @@ Dict2 dict>list .l cr
 Dict2 <s csr. cr
 Dict1 Dict2 show-dict-diff
 Dict2 Dict1 show-dict-diff
+."Dict1 + Dict2 = " Dict1 Dict2 dict-sum show-dict
+."Dict2 * 2 = " Dict2 dict-twice show-dict
+."Dict2 / 2 = " Dict2 dict-half show-dict
+."Dict2 + x = " Dict2 dict-add-x show-dict
diff --git a/submodules/ton/tonlib-src/crypto/test/fift/testdict2.fif b/submodules/ton/tonlib-src/crypto/test/fift/testdict2.fif
new file mode 100644
index 0000000000..ba0a57e5a1
--- /dev/null
+++ b/submodules/ton/tonlib-src/crypto/test/fift/testdict2.fif
@@ -0,0 +1,52 @@
+"Lists.fif" include
+16 constant key-bits
+16 constant val-bits
+{ val-bits u, } : val,
+{ val-bits u@ } : val@
+{ swap unpair <b swap val, b> <s swap rot key-bits udict! not abort"cannot add key-value" } : +dictpair
+{ dictnew { over null? not } { swap uncons swap rot +dictpair } while nip } : mkdict
+{ dup null? { ."(null) " drop } { val@ . } cond } : .val
+{ key-bits { swap . ."-> " .val ."; " true } dictforeach drop cr } : show-dict
+{ key-bits { swap . ."-> " .val ."; " true } idictforeach drop cr } : show-idict
+{ key-bits { swap . ."-> " .val ."; " true } dictforeachrev drop cr } : show-rev-dict
+{ key-bits { swap . ."-> " .val ."; " true } idictforeachrev drop cr } : show-rev-idict
+{ key-bits { rot . ."-> " swap .val .val ."; " true } dictdiff drop cr } : show-dict-diff
+{ key-bits { swap . ."-> " .val ."; " true } rot dictforeachfromx drop cr } : show-dict-from
+{ key-bits { val@ swap val@ + val, true } dictmerge } : dict-sum
+{ key-bits { val@ 2* val, true } dictmap } : dict-twice
+{ key-bits { val@ 2 /mod { 2drop false } { val, true } cond } dictmap } : dict-half
+{ key-bits { val@ + val, true } dictmapext } : dict-add-x
+{ null swap key-bits { val@ pair swap cons true } dictforeach drop  } : dict>list-rev
+{ dict>list-rev list-reverse } : dict>list
+( _( 13 169 ) _( 17 289 ) _( 10 100 ) ) mkdict =: Dict
+_( 4 16 ) _( 9 81 ) Dict +dictpair +dictpair =: Dict1
+_( 4 20 ) _( 101 10201 ) Dict +dictpair +dictpair =: Dict2
+_( 65533 9 ) Dict2 +dictpair =: Dict3
+."Dict1 = " Dict1 show-idict
+."Dict2 = " Dict2 show-idict
+."Dict3 = " Dict3 show-idict
+variable D
+{ D ! } : D!
+{ ."D = " D @ show-idict } : show-D
+{ D @ 2 show-dict-from } : show-D-from
+{ D @ 6 show-dict-from } : show-D-from+
+{ D @ 18 show-dict-from } : show-D-from-hint
+{ D @ 22 show-dict-from } : show-D-from-hint+
+variable hint  hint 0!
+{ ."D[" dup ._ ."..] = " show-D-from } : test-from
+{ ."D[" dup ._ ."+..] = " show-D-from+ } : test-from+
+{ hint @ ."(hint=" dup ._ .") D[" over ._ ."..] = " show-D-from-hint } : test-from-hint
+{ hint @ ."(hint=" dup ._ .") D[" over ._ ."+..] = " show-D-from-hint+ } : test-from-hint+
+{ -16 { 2dup swap execute 1+ } 120 times 2drop } : range-run 
+{ hint ! ' test-from-hint range-run  ' test-from-hint+ range-run } : range-test-hint
+
+{ ."------- BIG TEST -------" cr show-D
+  ' test-from range-run ' test-from+ range-run
+  0 range-test-hint  13 range-test-hint 7 range-test-hint 100 range-test-hint
+} : big-test
+Dict1 D!
+big-test
+Dict2 D!
+big-test
+Dict3 D!
+big-test
diff --git a/submodules/ton/tonlib-src/crypto/test/test-db.cpp b/submodules/ton/tonlib-src/crypto/test/test-db.cpp
index 148a185494..1b7e19009d 100644
--- a/submodules/ton/tonlib-src/crypto/test/test-db.cpp
+++ b/submodules/ton/tonlib-src/crypto/test/test-db.cpp
@@ -39,6 +39,7 @@
 #include "td/utils/port/path.h"
 #include "td/utils/format.h"
 #include "td/utils/misc.h"
+#include "td/utils/optional.h"
 #include "td/utils/tests.h"
 #include "td/utils/tl_parsers.h"
 #include "td/utils/tl_helpers.h"
@@ -529,16 +530,20 @@ TEST(Cell, MerkleProofCombine) {
       ASSERT_EQ(exploration_b.log, exploration2.log);
     }
 
-    Ref<Cell> proof_union;
     {
-      proof_union = MerkleProof::combine(proof1, proof2);
+      auto check = [&](auto proof_union) {
+        auto virtualized_proof = MerkleProof::virtualize(proof_union, 1);
+        auto exploration_a = CellExplorer::explore(virtualized_proof, exploration1.ops);
+        auto exploration_b = CellExplorer::explore(virtualized_proof, exploration2.ops);
+        ASSERT_EQ(exploration_a.log, exploration1.log);
+        ASSERT_EQ(exploration_b.log, exploration2.log);
+      };
+      auto proof_union = MerkleProof::combine(proof1, proof2);
       ASSERT_EQ(proof_union->get_hash(), proof12->get_hash());
+      check(proof_union);
 
-      auto virtualized_proof = MerkleProof::virtualize(proof_union, 1);
-      auto exploration_a = CellExplorer::explore(virtualized_proof, exploration1.ops);
-      auto exploration_b = CellExplorer::explore(virtualized_proof, exploration2.ops);
-      ASSERT_EQ(exploration_a.log, exploration1.log);
-      ASSERT_EQ(exploration_b.log, exploration2.log);
+      auto proof_union_fast = MerkleProof::combine_fast(proof1, proof2);
+      check(proof_union_fast);
     }
     {
       auto cell = MerkleProof::virtualize(proof12, 1);
@@ -1194,6 +1199,88 @@ TEST(Cell, MerkleProofArrayHands) {
   test_boc_deserializer_full(proof).ensure();
   test_boc_deserializer_full(CellBuilder::create_merkle_proof(proof)).ensure();
 }
+
+TEST(Cell, MerkleProofCombineArray) {
+  size_t n = 1 << 15;
+  std::vector<td::uint64> data;
+  for (size_t i = 0; i < n; i++) {
+    data.push_back(i / 3);
+  }
+  CompactArray arr(data);
+
+  td::Ref<vm::Cell> root = vm::CellBuilder::create_merkle_proof(arr.merkle_proof({}));
+  td::Timer timer;
+  for (size_t i = 0; i < n; i++) {
+    auto new_root = vm::CellBuilder::create_merkle_proof(arr.merkle_proof({i}));
+    root = vm::MerkleProof::combine_fast(root, new_root);
+    if ((i - 1) % 100 == 0) {
+      LOG(ERROR) << timer;
+      timer = {};
+    }
+  }
+
+  CompactArray arr2(n, vm::MerkleProof::virtualize(root, 1));
+  for (size_t i = 0; i < n; i++) {
+    CHECK(arr.get(i) == arr2.get(i));
+  }
+}
+
+TEST(Cell, MerkleProofCombineArray2) {
+  auto a = vm::CellBuilder().store_long(1, 8).finalize();
+  auto b = vm::CellBuilder().store_long(2, 8).finalize();
+  auto c = vm::CellBuilder().store_long(3, 8).finalize();
+  auto d = vm::CellBuilder().store_long(4, 8).finalize();
+  auto left = vm::CellBuilder().store_ref(a).store_ref(b).finalize();
+  auto right = vm::CellBuilder().store_ref(c).store_ref(d).finalize();
+  auto x = vm::CellBuilder().store_ref(left).store_ref(right).finalize();
+  size_t n = 18;
+  //TODO: n = 100, currently TL
+  for (size_t i = 0; i < n; i++) {
+    x = vm::CellBuilder().store_ref(x).store_ref(x).finalize();
+  }
+
+  td::Ref<vm::Cell> root;
+  auto apply_op = [&](auto op) {
+    auto usage_tree = std::make_shared<CellUsageTree>();
+    auto usage_cell = UsageCell::create(x, usage_tree->root_ptr());
+    root = usage_cell;
+    op();
+    return MerkleProof::generate(root, usage_tree.get());
+  };
+
+  auto first = apply_op([&] {
+    auto x = root;
+    while (true) {
+      auto cs = vm::load_cell_slice(x);
+      if (cs.size_refs() == 0) {
+        break;
+      }
+      x = cs.prefetch_ref(0);
+    }
+  });
+  auto second = apply_op([&] {
+    auto x = root;
+    while (true) {
+      auto cs = vm::load_cell_slice(x);
+      if (cs.size_refs() == 0) {
+        break;
+      }
+      x = cs.prefetch_ref(1);
+    }
+  });
+
+  {
+    td::Timer t;
+    auto x = vm::MerkleProof::combine(first, second);
+    LOG(ERROR) << "slow " << t;
+  }
+  {
+    td::Timer t;
+    auto x = vm::MerkleProof::combine_fast(first, second);
+    LOG(ERROR) << "fast " << t;
+  }
+}
+
 TEST(Cell, MerkleUpdateHands) {
   auto data = CellBuilder{}.store_bytes("pruned data").store_ref(CellBuilder{}.finalize()).finalize();
   auto node = CellBuilder{}.store_bytes("protected data").store_ref(data).finalize();
@@ -1965,6 +2052,222 @@ TEST(Ref, AtomicRef) {
   LOG(ERROR) << String::total_strings.sum();
 }
 
+class FileMerkleTree {
+ public:
+  FileMerkleTree(size_t chunks_count, td::Ref<vm::Cell> root = {}) {
+    log_n_ = 0;
+    while ((size_t(1) << log_n_) < chunks_count) {
+      log_n_++;
+    }
+    n_ = size_t(1) << log_n_;
+    mark_.resize(n_ * 2);
+    proof_.resize(n_ * 2);
+
+    CHECK(n_ == chunks_count);  // TODO: support other chunks_count
+    //auto x = vm::CellBuilder().finalize();
+    root_ = std::move(root);
+  }
+
+  struct Chunk {
+    td::size_t index{0};
+    td::Slice hash;
+  };
+
+  void remove_chunk(td::size_t index) {
+    CHECK(index < n_);
+    index += n_;
+    while (proof_[index].not_null()) {
+      proof_[index] = {};
+      index /= 2;
+    }
+  }
+
+  bool has_chunk(td::size_t index) const {
+    CHECK(index < n_);
+    index += n_;
+    return proof_[index].not_null();
+  }
+
+  void add_chunk(td::size_t index, td::Slice hash) {
+    CHECK(hash.size() == 32);
+    CHECK(index < n_);
+    index += n_;
+    auto cell = vm::CellBuilder().store_bytes(hash).finalize();
+    CHECK(proof_[index].is_null());
+    proof_[index] = std::move(cell);
+    for (index /= 2; index != 0; index /= 2) {
+      CHECK(proof_[index].is_null());
+      auto &left = proof_[index * 2];
+      auto &right = proof_[index * 2 + 1];
+      if (left.not_null() && right.not_null()) {
+        proof_[index] = vm::CellBuilder().store_ref(left).store_ref(right).finalize();
+      } else {
+        mark_[index] = mark_id_;
+      }
+    }
+  }
+
+  td::Status validate_proof(td::Ref<vm::Cell> new_root) {
+    // TODO: check structure
+    return td::Status::OK();
+  }
+
+  td::Status add_proof(td::Ref<vm::Cell> new_root) {
+    TRY_STATUS(validate_proof(new_root));
+    auto combined = vm::MerkleProof::combine_fast_raw(root_, new_root);
+    if (combined.is_null()) {
+      return td::Status::Error("Can't combine proofs");
+    }
+    root_ = std::move(combined);
+    return td::Status::OK();
+  }
+
+  td::Status try_add_chunks(td::Span<Chunk> chunks) {
+    for (auto chunk : chunks) {
+      if (has_chunk(chunk.index)) {
+        return td::Status::Error("Already has chunk");
+      }
+    }
+    mark_id_++;
+    for (auto chunk : chunks) {
+      add_chunk(chunk.index, chunk.hash);
+    }
+    auto r_new_root = merge(root_, 1);
+    if (r_new_root.is_error()) {
+      for (auto chunk : chunks) {
+        remove_chunk(chunk.index);
+      }
+      return r_new_root.move_as_error();
+    }
+    root_ = r_new_root.move_as_ok();
+    return td::Status::OK();
+  }
+
+  td::Result<td::Ref<vm::Cell>> merge(td::Ref<vm::Cell> root, size_t index) {
+    const auto &down = proof_[index];
+    if (down.not_null()) {
+      if (down->get_hash() != root->get_hash(0)) {
+        return td::Status::Error("Hash mismatch");
+      }
+      return down;
+    }
+
+    if (mark_[index] != mark_id_) {
+      return root;
+    }
+
+    vm::CellSlice cs(vm::NoVm(), root);
+    if (cs.is_special()) {
+      return td::Status::Error("Proof is not enough to validate chunks");
+    }
+
+    CHECK(cs.size_refs() == 2);
+    vm::CellBuilder cb;
+    cb.store_bits(cs.fetch_bits(cs.size()));
+    TRY_RESULT(left, merge(cs.fetch_ref(), index * 2));
+    TRY_RESULT(right, merge(cs.fetch_ref(), index * 2 + 1));
+    cb.store_ref(std::move(left)).store_ref(std::move(right));
+    return cb.finalize();
+  }
+
+  void init_proof() {
+    CHECK(proof_[1].not_null());
+    root_ = proof_[1];
+  }
+
+  td::Result<td::Ref<vm::Cell>> gen_proof(size_t l, size_t r) {
+    auto usage_tree = std::make_shared<vm::CellUsageTree>();
+    auto usage_cell = vm::UsageCell::create(root_, usage_tree->root_ptr());
+    TRY_STATUS(do_gen_proof(std::move(usage_cell), 0, n_ - 1, l, r));
+    auto res = vm::MerkleProof::generate_raw(root_, usage_tree.get());
+    CHECK(res.not_null());
+    return res;
+  }
+
+ private:
+  td::size_t n_;  // n = 2^log_n
+  td::size_t log_n_;
+  td::size_t mark_id_{0};
+  std::vector<td::size_t> mark_;          // n_ * 2
+  std::vector<td::Ref<vm::Cell>> proof_;  // n_ * 2
+  td::Ref<vm::Cell> root_;
+
+  td::Status do_gen_proof(td::Ref<vm::Cell> node, size_t il, size_t ir, size_t l, size_t r) {
+    if (ir < l || il > r) {
+      return td::Status::OK();
+    }
+    if (l <= il && ir <= r) {
+      return td::Status::OK();
+    }
+    vm::CellSlice cs(vm::NoVm(), std::move(node));
+    if (cs.is_special()) {
+      return td::Status::Error("Can't generate a proof");
+    }
+    CHECK(cs.size_refs() == 2);
+    auto ic = (il + ir) / 2;
+    TRY_STATUS(do_gen_proof(cs.fetch_ref(), il, ic, l, r));
+    TRY_STATUS(do_gen_proof(cs.fetch_ref(), ic + 1, ir, l, r));
+    return td::Status::OK();
+  }
+};
+
+TEST(FileMerkleTree, Manual) {
+  // create big random file
+  size_t chunk_size = 768;
+  // for simplicity numer of chunks in a file is a power of two
+  size_t chunks_count = 1 << 16;
+  size_t file_size = chunk_size * chunks_count;
+  td::Timer timer;
+  LOG(INFO) << "Generate random string";
+  const auto file = td::rand_string('a', 'z', td::narrow_cast<int>(file_size));
+  LOG(INFO) << timer;
+
+  timer = {};
+  LOG(INFO) << "Calculate all hashes";
+  std::vector<td::UInt256> hashes(chunks_count);
+  for (size_t i = 0; i < chunks_count; i++) {
+    td::sha256(td::Slice(file).substr(i * chunk_size, chunk_size), hashes[i].as_slice());
+  }
+  LOG(INFO) << timer;
+
+  timer = {};
+  LOG(INFO) << "Init merkle tree";
+  FileMerkleTree tree(chunks_count);
+  for (size_t i = 0; i < chunks_count; i++) {
+    tree.add_chunk(i, hashes[i].as_slice());
+  }
+  tree.init_proof();
+  LOG(INFO) << timer;
+
+  auto root_proof = tree.gen_proof(0, chunks_count - 1).move_as_ok();
+
+  // first download each chunk one by one
+
+  for (size_t stride : {1 << 6, 1}) {
+    timer = {};
+    LOG(INFO) << "Gen all proofs, stride = " << stride;
+    for (size_t i = 0; i < chunks_count; i += stride) {
+      tree.gen_proof(i, i + stride - 1).move_as_ok();
+    }
+    LOG(INFO) << timer;
+    timer = {};
+    LOG(INFO) << "Proof size: " << vm::std_boc_serialize(tree.gen_proof(0, stride - 1).move_as_ok()).ok().size();
+    LOG(INFO) << "Download file, stride = " << stride;
+    {
+      FileMerkleTree new_tree(chunks_count, root_proof);
+      for (size_t i = 0; i < chunks_count; i += stride) {
+        new_tree.add_proof(tree.gen_proof(i, i + stride - 1).move_as_ok()).ensure();
+        std::vector<FileMerkleTree::Chunk> chunks;
+        for (size_t j = 0; j < stride; j++) {
+          chunks.push_back({i + j, hashes[i + j].as_slice()});
+        }
+        new_tree.try_add_chunks(chunks).ensure();
+      }
+    }
+    LOG(INFO) << timer;
+  }
+}
+
 //TEST(Tmp, Boc) {
 //LOG(ERROR) << "A";
 //auto data = td::read_file("boc");
diff --git a/submodules/ton/tonlib-src/crypto/test/test-smartcont.cpp b/submodules/ton/tonlib-src/crypto/test/test-smartcont.cpp
index c0b991b620..eb6e88802f 100644
--- a/submodules/ton/tonlib-src/crypto/test/test-smartcont.cpp
+++ b/submodules/ton/tonlib-src/crypto/test/test-smartcont.cpp
@@ -14,7 +14,7 @@
     You should have received a copy of the GNU Lesser General Public License
     along with TON Blockchain Library.  If not, see <http://www.gnu.org/licenses/>.
 
-    Copyright 2017-2019 Telegram Systems LLP
+    Copyright 2017-2020 Telegram Systems LLP
 */
 #include "vm/dict.h"
 #include "common/bigint.hpp"
@@ -28,6 +28,7 @@
 #include "fift/utils.h"
 
 #include "smc-envelope/GenericAccount.h"
+#include "smc-envelope/ManualDns.h"
 #include "smc-envelope/MultisigWallet.h"
 #include "smc-envelope/SmartContract.h"
 #include "smc-envelope/SmartContractCode.h"
@@ -35,6 +36,8 @@
 #include "smc-envelope/TestWallet.h"
 #include "smc-envelope/Wallet.h"
 #include "smc-envelope/WalletV3.h"
+#include "smc-envelope/HighloadWallet.h"
+#include "smc-envelope/HighloadWalletV2.h"
 
 #include "td/utils/base64.h"
 #include "td/utils/crypto.h"
@@ -46,6 +49,7 @@
 #include "td/utils/PathView.h"
 #include "td/utils/filesystem.h"
 #include "td/utils/port/path.h"
+#include "td/utils/Variant.h"
 
 #include <bitset>
 #include <set>
@@ -62,8 +66,8 @@ std::string load_source(std::string name) {
 td::Ref<vm::Cell> get_test_wallet_source() {
   std::string code = R"ABCD(
 SETCP0 DUP IFNOTRET // return if recv_internal
-DUP 85143 INT EQUAL IFJMP:<{ // "seqno" get-method
-  DROP c4 PUSHCTR CTOS 32 PLDU  // cnt
+DUP 85143 INT EQUAL OVER 78748 INT EQUAL OR IFJMP:<{ // "seqno" and "get_public_key" get-methods
+  1 INT AND c4 PUSHCTR CTOS 32 LDU 256 PLDU CONDSEL  // cnt or pubk
 }>
 INC 32 THROWIF  // fail unless recv_external
 512 INT LDSLICEX DUP 32 PLDU   // sign cs cnt
@@ -90,8 +94,8 @@ INC NEWC 32 STU 256 STU ENDC c4 POPCTR
 td::Ref<vm::Cell> get_wallet_source() {
   std::string code = R"ABCD(
 SETCP0 DUP IFNOTRET // return if recv_internal
-   DUP 85143 INT EQUAL IFJMP:<{ // "seqno" get-method
-     DROP c4 PUSHCTR CTOS 32 PLDU  // cnt
+   DUP 85143 INT EQUAL OVER 78748 INT EQUAL OR IFJMP:<{ // "seqno" and "get_public_key" get-methods
+     1 INT AND c4 PUSHCTR CTOS 32 LDU 256 PLDU CONDSEL  // cnt or pubk
    }>
    INC 32 THROWIF	// fail unless recv_external
    9 PUSHPOW2 LDSLICEX DUP 32 LDU 32 LDU	//  signature in_msg msg_seqno valid_until cs
@@ -118,8 +122,8 @@ SETCP0 DUP IFNOTRET // return if recv_internal
 td::Ref<vm::Cell> get_wallet_v3_source() {
   std::string code = R"ABCD(
 SETCP0 DUP IFNOTRET // return if recv_internal
-   DUP 85143 INT EQUAL IFJMP:<{ // "seqno" get-method
-     DROP c4 PUSHCTR CTOS 32 PLDU  // cnt
+   DUP 85143 INT EQUAL OVER 78748 INT EQUAL OR IFJMP:<{ // "seqno" and "get_public_key" get-methods
+     1 INT AND c4 PUSHCTR CTOS 32 LDU 32 LDU NIP 256 PLDU CONDSEL  // cnt or pubk
    }>
    INC 32 THROWIF	// fail unless recv_external
    9 PUSHPOW2 LDSLICEX DUP 32 LDU 32 LDU 32 LDU 	//  signature in_msg subwallet_id valid_until msg_seqno cs
@@ -175,8 +179,15 @@ TEST(Tonlib, TestWallet) {
                                     "321", "-C", "TEST"})
                     .move_as_ok();
   auto wallet_query = fift_output.source_lookup.read_file("wallet-query.boc").move_as_ok().data;
+  ton::TestWallet::Gift gift;
+  gift.destination = dest;
+  gift.message = "TEST";
+  gift.gramms = 321000000000ll;
+  ton::TestWallet wallet(priv_key.get_public_key().move_as_ok(), 123);
+  ASSERT_EQ(123u, wallet.get_seqno().ok());
+  CHECK(priv_key.get_public_key().ok().as_octet_string() == wallet.get_public_key().ok().as_octet_string());
   auto gift_message = ton::GenericAccount::create_ext_message(
-      address, {}, ton::TestWallet::make_a_gift_message(priv_key, 123, 321000000000ll, "TEST", dest));
+      address, {}, wallet.make_a_gift_message(priv_key, 0, {gift}).move_as_ok());
   LOG(ERROR) << "-------";
   vm::load_cell_slice(gift_message).print_rec(std::cerr);
   LOG(ERROR) << "-------";
@@ -223,13 +234,20 @@ TEST(Tonlib, Wallet) {
   };
   fift_output.source_lookup.set_os_time(std::make_unique<ZeroOsTime>());
   auto dest = block::StdAddress::parse("Ef9Tj6fMJP+OqhAdhKXxq36DL+HYSzCc3+9O6UNzqsgPfYFX").move_as_ok();
-  fift_output =
-      fift::mem_run_fift(std::move(fift_output.source_lookup),
-                         {"aba", "new-wallet", "Ef9Tj6fMJP+OqhAdhKXxq36DL+HYSzCc3+9O6UNzqsgPfYFX", "123", "321"})
-          .move_as_ok();
+  fift_output = fift::mem_run_fift(std::move(fift_output.source_lookup),
+                                   {"aba", "new-wallet", "-C", "TESTv2",
+                                    "Ef9Tj6fMJP+OqhAdhKXxq36DL+HYSzCc3+9O6UNzqsgPfYFX", "123", "321"})
+                    .move_as_ok();
   auto wallet_query = fift_output.source_lookup.read_file("wallet-query.boc").move_as_ok().data;
+  ton::TestWallet::Gift gift;
+  gift.destination = dest;
+  gift.message = "TESTv2";
+  gift.gramms = 321000000000ll;
+  ton::Wallet wallet(priv_key.get_public_key().move_as_ok(), 123);
+  ASSERT_EQ(123u, wallet.get_seqno().ok());
+  CHECK(priv_key.get_public_key().ok().as_octet_string() == wallet.get_public_key().ok().as_octet_string());
   auto gift_message = ton::GenericAccount::create_ext_message(
-      address, {}, ton::Wallet::make_a_gift_message(priv_key, 123, 60, 321000000000ll, "TESTv2", dest));
+      address, {}, wallet.make_a_gift_message(priv_key, 60, {gift}).move_as_ok());
   LOG(ERROR) << "-------";
   vm::load_cell_slice(gift_message).print_rec(std::cerr);
   LOG(ERROR) << "-------";
@@ -250,7 +268,8 @@ TEST(Tonlib, WalletV3) {
   td::Ed25519::PrivateKey priv_key{td::SecureString{new_wallet_pk}};
   auto pub_key = priv_key.get_public_key().move_as_ok();
   auto init_state = ton::WalletV3::get_init_state(pub_key, 239);
-  auto init_message = ton::WalletV3::get_init_message(priv_key, 239);
+  auto init_message =
+      ton::WalletV3(priv_key.get_public_key().move_as_ok(), 239).get_init_message(priv_key).move_as_ok();
   auto address = ton::GenericAccount::get_address(0, init_state);
 
   CHECK(address.addr.as_slice() == td::Slice(new_wallet_addr).substr(0, 32));
@@ -272,13 +291,24 @@ TEST(Tonlib, WalletV3) {
   };
   fift_output.source_lookup.set_os_time(std::make_unique<ZeroOsTime>());
   auto dest = block::StdAddress::parse("Ef9Tj6fMJP+OqhAdhKXxq36DL+HYSzCc3+9O6UNzqsgPfYFX").move_as_ok();
-  fift_output =
-      fift::mem_run_fift(std::move(fift_output.source_lookup),
-                         {"aba", "new-wallet", "Ef9Tj6fMJP+OqhAdhKXxq36DL+HYSzCc3+9O6UNzqsgPfYFX", "239", "123", "321"})
-          .move_as_ok();
+  fift_output = fift::mem_run_fift(std::move(fift_output.source_lookup),
+                                   {"aba", "new-wallet", "-C", "TESTv3",
+                                    "Ef9Tj6fMJP+OqhAdhKXxq36DL+HYSzCc3+9O6UNzqsgPfYFX", "239", "123", "321"})
+                    .move_as_ok();
   auto wallet_query = fift_output.source_lookup.read_file("wallet-query.boc").move_as_ok().data;
+
+  ton::WalletV3::Gift gift;
+  gift.destination = dest;
+  gift.message = "TESTv3";
+  gift.gramms = 321000000000ll;
+
+  ton::WalletV3 wallet(priv_key.get_public_key().move_as_ok(), 239, 123);
+  ASSERT_EQ(239u, wallet.get_wallet_id().ok());
+  ASSERT_EQ(123u, wallet.get_seqno().ok());
+  CHECK(priv_key.get_public_key().ok().as_octet_string() == wallet.get_public_key().ok().as_octet_string());
+
   auto gift_message = ton::GenericAccount::create_ext_message(
-      address, {}, ton::WalletV3::make_a_gift_message(priv_key, 239, 123, 60, 321000000000ll, "TESTv3", dest));
+      address, {}, wallet.make_a_gift_message(priv_key, 60, {gift}).move_as_ok());
   LOG(ERROR) << "-------";
   vm::load_cell_slice(gift_message).print_rec(std::cerr);
   LOG(ERROR) << "-------";
@@ -286,6 +316,152 @@ TEST(Tonlib, WalletV3) {
   CHECK(vm::std_boc_deserialize(wallet_query).move_as_ok()->get_hash() == gift_message->get_hash());
 }
 
+TEST(Tonlib, HighloadWallet) {
+  auto source_lookup = fift::create_mem_source_lookup(load_source("smartcont/new-highload-wallet.fif")).move_as_ok();
+  source_lookup.write_file("/auto/highload-wallet-code.fif", load_source("smartcont/auto/highload-wallet-code.fif"))
+      .ensure();
+  auto fift_output = fift::mem_run_fift(std::move(source_lookup), {"aba", "0", "239"}).move_as_ok();
+
+  LOG(ERROR) << fift_output.output;
+  auto new_wallet_pk = fift_output.source_lookup.read_file("new-wallet.pk").move_as_ok().data;
+  auto new_wallet_query = fift_output.source_lookup.read_file("new-wallet239-query.boc").move_as_ok().data;
+  auto new_wallet_addr = fift_output.source_lookup.read_file("new-wallet239.addr").move_as_ok().data;
+
+  td::Ed25519::PrivateKey priv_key{td::SecureString{new_wallet_pk}};
+  auto pub_key = priv_key.get_public_key().move_as_ok();
+  auto init_state = ton::HighloadWallet::get_init_state(pub_key, 239);
+  auto init_message = ton::HighloadWallet::get_init_message(priv_key, 239);
+  auto address = ton::GenericAccount::get_address(0, init_state);
+
+  ton::HighloadWallet wallet({ton::HighloadWallet::get_init_code(), ton::HighloadWallet::get_init_data(pub_key, 239)});
+  ASSERT_EQ(239u, wallet.get_wallet_id().ok());
+  ASSERT_EQ(0u, wallet.get_seqno().ok());
+  CHECK(pub_key.as_octet_string() == wallet.get_public_key().ok().as_octet_string());
+
+  CHECK(address.addr.as_slice() == td::Slice(new_wallet_addr).substr(0, 32));
+
+  td::Ref<vm::Cell> res = ton::GenericAccount::create_ext_message(address, init_state, init_message);
+
+  LOG(ERROR) << "---smc-envelope----";
+  vm::load_cell_slice(res).print_rec(std::cerr);
+  LOG(ERROR) << "---fift scripts----";
+  vm::load_cell_slice(vm::std_boc_deserialize(new_wallet_query).move_as_ok()).print_rec(std::cerr);
+  CHECK(vm::std_boc_deserialize(new_wallet_query).move_as_ok()->get_hash() == res->get_hash());
+
+  fift_output.source_lookup.write_file("/main.fif", load_source("smartcont/highload-wallet.fif")).ensure();
+  std::string order;
+  std::vector<ton::HighloadWallet::Gift> gifts;
+  auto add_order = [&](td::Slice dest_str, td::int64 gramms) {
+    auto g = td::to_string(gramms);
+    if (g.size() < 10) {
+      g = std::string(10 - g.size(), '0') + g;
+    }
+    order += PSTRING() << "SEND " << dest_str << " " << g.substr(0, g.size() - 9) << "." << g.substr(g.size() - 9)
+                       << "\n";
+
+    ton::HighloadWallet::Gift gift;
+    gift.destination = block::StdAddress::parse(dest_str).move_as_ok();
+    gift.gramms = gramms;
+    gifts.push_back(gift);
+  };
+  std::string dest_str = "Ef9Tj6fMJP+OqhAdhKXxq36DL+HYSzCc3+9O6UNzqsgPfYFX";
+  add_order(dest_str, 0);
+  add_order(dest_str, 321000000000ll);
+  add_order(dest_str, 321ll);
+  fift_output.source_lookup.write_file("/order", order).ensure();
+  class ZeroOsTime : public fift::OsTime {
+   public:
+    td::uint32 now() override {
+      return 0;
+    }
+  };
+  fift_output.source_lookup.set_os_time(std::make_unique<ZeroOsTime>());
+  fift_output = fift::mem_run_fift(std::move(fift_output.source_lookup), {"aba", "new-wallet", "239", "123", "order"})
+                    .move_as_ok();
+  auto wallet_query = fift_output.source_lookup.read_file("wallet-query.boc").move_as_ok().data;
+  auto gift_message = ton::GenericAccount::create_ext_message(
+      address, {}, ton::HighloadWallet::make_a_gift_message(priv_key, 239, 123, 60, gifts));
+  LOG(ERROR) << "---smc-envelope----";
+  vm::load_cell_slice(gift_message).print_rec(std::cerr);
+  LOG(ERROR) << "---fift scripts----";
+  vm::load_cell_slice(vm::std_boc_deserialize(wallet_query).move_as_ok()).print_rec(std::cerr);
+  CHECK(vm::std_boc_deserialize(wallet_query).move_as_ok()->get_hash() == gift_message->get_hash());
+}
+
+TEST(Tonlib, HighloadWalletV2) {
+  auto source_lookup = fift::create_mem_source_lookup(load_source("smartcont/new-highload-wallet-v2.fif")).move_as_ok();
+  source_lookup
+      .write_file("/auto/highload-wallet-v2-code.fif", load_source("smartcont/auto/highload-wallet-v2-code.fif"))
+      .ensure();
+  class ZeroOsTime : public fift::OsTime {
+   public:
+    td::uint32 now() override {
+      return 0;
+    }
+  };
+  source_lookup.set_os_time(std::make_unique<ZeroOsTime>());
+  auto fift_output = fift::mem_run_fift(std::move(source_lookup), {"aba", "0", "239"}).move_as_ok();
+
+  LOG(ERROR) << fift_output.output;
+  auto new_wallet_pk = fift_output.source_lookup.read_file("new-wallet.pk").move_as_ok().data;
+  auto new_wallet_query = fift_output.source_lookup.read_file("new-wallet239-query.boc").move_as_ok().data;
+  auto new_wallet_addr = fift_output.source_lookup.read_file("new-wallet239.addr").move_as_ok().data;
+
+  td::Ed25519::PrivateKey priv_key{td::SecureString{new_wallet_pk}};
+  auto pub_key = priv_key.get_public_key().move_as_ok();
+  auto init_state = ton::HighloadWalletV2::get_init_state(pub_key, 239, -1);
+  auto init_message = ton::HighloadWalletV2::get_init_message(priv_key, 239, 65535);
+  auto address = ton::GenericAccount::get_address(0, init_state);
+
+  ton::HighloadWalletV2 wallet(
+      {ton::HighloadWalletV2::get_init_code(-1), ton::HighloadWalletV2::get_init_data(pub_key, 239)});
+  ASSERT_EQ(239u, wallet.get_wallet_id().ok());
+  CHECK(pub_key.as_octet_string() == wallet.get_public_key().ok().as_octet_string());
+
+  CHECK(address.addr.as_slice() == td::Slice(new_wallet_addr).substr(0, 32));
+
+  td::Ref<vm::Cell> res = ton::GenericAccount::create_ext_message(address, init_state, init_message);
+
+  LOG(ERROR) << "---smc-envelope----";
+  vm::load_cell_slice(res).print_rec(std::cerr);
+  LOG(ERROR) << "---fift scripts----";
+  vm::load_cell_slice(vm::std_boc_deserialize(new_wallet_query).move_as_ok()).print_rec(std::cerr);
+  CHECK(vm::std_boc_deserialize(new_wallet_query).move_as_ok()->get_hash() == res->get_hash());
+
+  fift_output.source_lookup.write_file("/main.fif", load_source("smartcont/highload-wallet-v2.fif")).ensure();
+  std::string order;
+  std::vector<ton::HighloadWalletV2::Gift> gifts;
+  auto add_order = [&](td::Slice dest_str, td::int64 gramms) {
+    auto g = td::to_string(gramms);
+    if (g.size() < 10) {
+      g = std::string(10 - g.size(), '0') + g;
+    }
+    order += PSTRING() << "SEND " << dest_str << " " << g.substr(0, g.size() - 9) << "." << g.substr(g.size() - 9)
+                       << "\n";
+
+    ton::HighloadWalletV2::Gift gift;
+    gift.destination = block::StdAddress::parse(dest_str).move_as_ok();
+    gift.gramms = gramms;
+    gifts.push_back(gift);
+  };
+  std::string dest_str = "Ef9Tj6fMJP+OqhAdhKXxq36DL+HYSzCc3+9O6UNzqsgPfYFX";
+  add_order(dest_str, 0);
+  add_order(dest_str, 321000000000ll);
+  add_order(dest_str, 321ll);
+  fift_output.source_lookup.write_file("/order", order).ensure();
+  fift_output.source_lookup.set_os_time(std::make_unique<ZeroOsTime>());
+  fift_output =
+      fift::mem_run_fift(std::move(fift_output.source_lookup), {"aba", "new-wallet", "239", "order"}).move_as_ok();
+  auto wallet_query = fift_output.source_lookup.read_file("wallet-query.boc").move_as_ok().data;
+  auto gift_message = ton::GenericAccount::create_ext_message(
+      address, {}, ton::HighloadWalletV2::make_a_gift_message(priv_key, 239, 60, gifts));
+  LOG(ERROR) << "---smc-envelope----";
+  vm::load_cell_slice(gift_message).print_rec(std::cerr);
+  LOG(ERROR) << "---fift scripts----";
+  vm::load_cell_slice(vm::std_boc_deserialize(wallet_query).move_as_ok()).print_rec(std::cerr);
+  CHECK(vm::std_boc_deserialize(wallet_query).move_as_ok()->get_hash() == gift_message->get_hash());
+}
+
 TEST(Tonlib, TestGiver) {
   auto address =
       block::StdAddress::parse("-1:60c04141c6a7b96d68615e7a91d265ad0f3a9a922e9ae9c901d4fa83f5d3c0d0").move_as_ok();
@@ -297,9 +473,13 @@ TEST(Tonlib, TestGiver) {
 
   auto wallet_query = fift_output.source_lookup.read_file("wallet-query.boc").move_as_ok().data;
 
-  auto res = ton::GenericAccount::create_ext_message(
-      ton::TestGiver::address(), {},
-      ton::TestGiver::make_a_gift_message(0, 1000000000ll * 6666 / 1000, "GIFT", address));
+  ton::TestGiver::Gift gift;
+  gift.gramms = 1000000000ll * 6666 / 1000;
+  gift.message = "GIFT";
+  gift.destination = address;
+  td::Ed25519::PrivateKey key{td::SecureString()};
+  auto res = ton::GenericAccount::create_ext_message(ton::TestGiver::address(), {},
+                                                     ton::TestGiver().make_a_gift_message(key, 0, {gift}).move_as_ok());
   vm::CellSlice(vm::NoVm(), res).print_rec(std::cerr);
   CHECK(vm::std_boc_deserialize(wallet_query).move_as_ok()->get_hash() == res->get_hash());
 }
@@ -317,13 +497,16 @@ class SimpleWallet : public ton::SmartContract {
   }
 
   static td::Ref<SimpleWallet> create_empty() {
-    return td::Ref<SimpleWallet>(true, State{ton::SmartContractCode::simple_wallet_ext(), {}});
+    return td::Ref<SimpleWallet>(true,
+                                 State{ton::SmartContractCode::get_code(ton::SmartContractCode::WalletV1Ext), {}});
   }
   static td::Ref<SimpleWallet> create(td::Ref<vm::Cell> data) {
-    return td::Ref<SimpleWallet>(true, State{ton::SmartContractCode::simple_wallet_ext(), std::move(data)});
+    return td::Ref<SimpleWallet>(
+        true, State{ton::SmartContractCode::get_code(ton::SmartContractCode::WalletV1Ext), std::move(data)});
   }
   static td::Ref<SimpleWallet> create_fast(td::Ref<vm::Cell> data) {
-    return td::Ref<SimpleWallet>(true, State{ton::SmartContractCode::simple_wallet(), std::move(data)});
+    return td::Ref<SimpleWallet>(
+        true, State{ton::SmartContractCode::get_code(ton::SmartContractCode::WalletV1), std::move(data)});
   }
 
   td::int32 seqno() const {
@@ -387,16 +570,17 @@ TEST(Smartcon, Multisig) {
 
   int n = 100;
   int k = 99;
+  td::uint32 wallet_id = std::numeric_limits<td::uint32>::max() - 3;
   std::vector<td::Ed25519::PrivateKey> keys;
   for (int i = 0; i < n; i++) {
     keys.push_back(td::Ed25519::generate_private_key().move_as_ok());
   }
   auto init_state = ms_lib->create_init_data(
-      td::transform(keys, [](auto& key) { return key.get_public_key().ok().as_octet_string(); }), k);
+      wallet_id, td::transform(keys, [](auto& key) { return key.get_public_key().ok().as_octet_string(); }), k);
   auto ms = ton::MultisigWallet::create(init_state);
 
-  td::uint64 query_id = 123;
-  ton::MultisigWallet::QueryBuilder qb(query_id, vm::CellBuilder().finalize());
+  td::uint64 query_id = 123 | ((100 * 60ull) << 32);
+  ton::MultisigWallet::QueryBuilder qb(wallet_id, query_id, vm::CellBuilder().finalize());
   // first empty query (init)
   CHECK(ms.write().send_external_message(vm::CellBuilder().finalize()).code == 0);
   // first empty query
@@ -423,7 +607,7 @@ TEST(Smartcon, Multisig) {
   ASSERT_EQ(0, ms->processed(query_id));
 
   {
-    ton::MultisigWallet::QueryBuilder qb(query_id, vm::CellBuilder().finalize());
+    ton::MultisigWallet::QueryBuilder qb(wallet_id, query_id, vm::CellBuilder().finalize());
     for (int i = 50; i + 1 < 100; i++) {
       qb.sign(i, keys[i]);
     }
@@ -439,6 +623,7 @@ TEST(Smartcon, Multisig) {
 TEST(Smartcont, MultisigStress) {
   int n = 10;
   int k = 5;
+  td::uint32 wallet_id = std::numeric_limits<td::uint32>::max() - 3;
 
   std::vector<td::Ed25519::PrivateKey> keys;
   for (int i = 0; i < n; i++) {
@@ -447,13 +632,14 @@ TEST(Smartcont, MultisigStress) {
   auto public_keys = td::transform(keys, [](auto& key) { return key.get_public_key().ok().as_octet_string(); });
   auto ms_lib = ton::MultisigWallet::create();
   auto init_state_old =
-      ms_lib->create_init_data_fast(td::transform(public_keys, [](auto& key) { return key.copy(); }), k);
-  auto init_state = ms_lib->create_init_data(td::transform(public_keys, [](auto& key) { return key.copy(); }), k);
+      ms_lib->create_init_data_fast(wallet_id, td::transform(public_keys, [](auto& key) { return key.copy(); }), k);
+  auto init_state =
+      ms_lib->create_init_data(wallet_id, td::transform(public_keys, [](auto& key) { return key.copy(); }), k);
   CHECK(init_state_old->get_hash() == init_state->get_hash());
   auto ms = ton::MultisigWallet::create(init_state);
   CHECK(ms->get_public_keys() == public_keys);
 
-  td::int32 now = 0;
+  td::int32 now = 100 * 60;
   td::int32 qid = 1;
   using Mask = std::bitset<128>;
   struct Query {
@@ -498,7 +684,7 @@ TEST(Smartcont, MultisigStress) {
   };
 
   auto sign_query = [&](Query& query, Mask mask) {
-    auto qb = ton::MultisigWallet::QueryBuilder(query.id, query.message);
+    auto qb = ton::MultisigWallet::QueryBuilder(wallet_id, query.id, query.message);
     int first_i = -1;
     for (int i = 0; i < (int)mask.size(); i++) {
       if (mask.test(i)) {
@@ -599,3 +785,457 @@ TEST(Smartcont, MultisigStress) {
   LOG(INFO) << "Final code size: " << ms->code_size();
   LOG(INFO) << "Final data size: " << ms->data_size();
 }
+
+class MapDns {
+ public:
+  using ManualDns = ton::ManualDns;
+  struct Entry {
+    std::string name;
+    td::int16 category{0};
+    std::string text;
+
+    auto key() const {
+      return std::tie(name, category);
+    }
+    bool operator<(const Entry& other) const {
+      return key() < other.key();
+    }
+    bool operator==(const ton::DnsInterface::Entry& other) const {
+      return key() == other.key() && other.data.type == ManualDns::EntryData::Type::Text &&
+             other.data.data.get<ManualDns::EntryDataText>().text == text;
+    }
+    bool operator==(const Entry& other) const {
+      return key() == other.key() && text == other.text;
+    }
+    friend td::StringBuilder& operator<<(td::StringBuilder& sb, const Entry& entry) {
+      return sb << "[" << entry.name << ":" << entry.category << ":" << entry.text << "]";
+    }
+  };
+  struct Action {
+    std::string name;
+    td::int16 category{0};
+    td::optional<std::string> text;
+
+    bool does_create_category() const {
+      CHECK(!name.empty());
+      CHECK(category != 0);
+      return static_cast<bool>(text);
+    }
+    bool does_change_empty() const {
+      CHECK(!name.empty());
+      CHECK(category != 0);
+      return static_cast<bool>(text) && !text.value().empty();
+    }
+    void make_non_empty() {
+      CHECK(!name.empty());
+      CHECK(category != 0);
+      if (!text) {
+        text = "";
+      }
+    }
+    friend td::StringBuilder& operator<<(td::StringBuilder& sb, const Action& entry) {
+      return sb << "[" << entry.name << ":" << entry.category << ":" << (entry.text ? entry.text.value() : "<empty>")
+                << "]";
+    }
+  };
+  void update(td::Span<Action> actions) {
+    for (auto& action : actions) {
+      do_update(action);
+    }
+  }
+  using CombinedActions = ton::ManualDns::CombinedActions<Action>;
+  void update_combined(td::Span<Action> actions) {
+    LOG(ERROR) << "BEGIN";
+    LOG(ERROR) << td::format::as_array(actions);
+    auto combined_actions = ton::ManualDns::combine_actions(actions);
+    for (auto& c : combined_actions) {
+      LOG(ERROR) << c.name << ":" << c.category;
+      if (c.actions) {
+        LOG(ERROR) << td::format::as_array(c.actions.value());
+      }
+    }
+    LOG(ERROR) << "END";
+    for (auto& combined_action : combined_actions) {
+      do_update(combined_action);
+    }
+  }
+
+  std::vector<Entry> resolve(td::Slice name, td::int16 category) {
+    std::vector<Entry> res;
+    if (name.empty()) {
+      for (auto& a : entries_) {
+        for (auto& b : a.second) {
+          res.push_back({a.first, b.first, b.second});
+        }
+      }
+    } else {
+      auto it = entries_.find(name);
+      while (it == entries_.end()) {
+        auto sz = name.find('.');
+        category = -1;
+        if (sz != td::Slice::npos) {
+          name = name.substr(sz + 1);
+        } else {
+          break;
+        }
+        it = entries_.find(name);
+      }
+      if (it != entries_.end()) {
+        for (auto& b : it->second) {
+          if (category == 0 || category == b.first) {
+            res.push_back({name.str(), b.first, b.second});
+          }
+        }
+      }
+    }
+
+    std::sort(res.begin(), res.end());
+    return res;
+  }
+
+ private:
+  std::map<std::string, std::map<td::int16, std::string>, std::less<>> entries_;
+  void do_update(const Action& action) {
+    if (action.name.empty()) {
+      entries_.clear();
+      return;
+    }
+    if (action.category == 0) {
+      entries_.erase(action.name);
+      return;
+    }
+    if (action.text) {
+      if (action.text.value().empty()) {
+        entries_[action.name].erase(action.category);
+      } else {
+        entries_[action.name][action.category] = action.text.value();
+      }
+    } else {
+      auto it = entries_.find(action.name);
+      if (it != entries_.end()) {
+        it->second.erase(action.category);
+      }
+    }
+  }
+
+  void do_update(const CombinedActions& actions) {
+    if (actions.name.empty()) {
+      entries_.clear();
+      LOG(ERROR) << "CLEAR";
+      if (!actions.actions) {
+        return;
+      }
+      for (auto& action : actions.actions.value()) {
+        CHECK(!action.name.empty());
+        CHECK(action.category != 0);
+        CHECK(action.text);
+        if (action.text.value().empty()) {
+          entries_[action.name];
+        } else {
+          entries_[action.name][action.category] = action.text.value();
+        }
+      }
+      return;
+    }
+    if (actions.category == 0) {
+      entries_.erase(actions.name);
+      LOG(ERROR) << "CLEAR " << actions.name;
+      if (!actions.actions) {
+        return;
+      }
+      entries_[actions.name];
+      for (auto& action : actions.actions.value()) {
+        CHECK(action.name == actions.name);
+        CHECK(action.category != 0);
+        CHECK(action.text);
+        if (action.text.value().empty()) {
+          entries_[action.name];
+        } else {
+          entries_[action.name][action.category] = action.text.value();
+        }
+      }
+      return;
+    }
+    CHECK(actions.actions);
+    CHECK(actions.actions.value().size() == 1);
+    for (auto& action : actions.actions.value()) {
+      CHECK(action.name == actions.name);
+      CHECK(action.category != 0);
+      if (action.text) {
+        if (action.text.value().empty()) {
+          entries_[action.name].erase(action.category);
+        } else {
+          entries_[action.name][action.category] = action.text.value();
+        }
+      } else {
+        auto it = entries_.find(action.name);
+        if (it != entries_.end()) {
+          it->second.erase(action.category);
+        }
+      }
+    }
+  }
+};
+
+class CheckedDns {
+ public:
+  explicit CheckedDns(bool check_smc = true, bool check_combine = true) {
+    if (check_smc) {
+      key_ = td::Ed25519::generate_private_key().move_as_ok();
+      dns_ = ManualDns::create(ManualDns::create_init_data_fast(key_.value().get_public_key().move_as_ok(), 123));
+    }
+    if (check_combine) {
+      combined_map_dns_ = MapDns();
+    }
+  }
+  using Action = MapDns::Action;
+  using Entry = MapDns::Entry;
+  void update(td::Span<Action> entries) {
+    if (dns_.not_null()) {
+      auto smc_actions = td::transform(entries, [](auto& entry) {
+        ton::DnsInterface::Action action;
+        action.name = entry.name;
+        action.category = entry.category;
+        if (entry.text) {
+          if (entry.text.value().empty()) {
+            action.data = td::Ref<vm::Cell>();
+          } else {
+            action.data = ManualDns::EntryData::text(entry.text.value()).as_cell().move_as_ok();
+          }
+        }
+        return action;
+      });
+      auto query = dns_->create_update_query(key_.value(), smc_actions).move_as_ok();
+      CHECK(dns_.write().send_external_message(std::move(query)).code == 0);
+    }
+    map_dns_.update(entries);
+    if (combined_map_dns_) {
+      combined_map_dns_.value().update_combined(entries);
+    }
+  }
+  void update(const Action& action) {
+    return update(td::Span<Action>(&action, 1));
+  }
+
+  std::vector<Entry> resolve(td::Slice name, td::int16 category) {
+    LOG(ERROR) << "RESOLVE: " << name << " " << category;
+    auto res = map_dns_.resolve(name, category);
+    LOG(ERROR) << td::format::as_array(res);
+
+    if (dns_.not_null()) {
+      auto other_res = dns_->resolve(name, category).move_as_ok();
+
+      std::sort(other_res.begin(), other_res.end());
+      if (res.size() != other_res.size()) {
+        LOG(ERROR) << td::format::as_array(res);
+        LOG(FATAL) << td::format::as_array(other_res);
+      }
+      for (size_t i = 0; i < res.size(); i++) {
+        if (!(res[i] == other_res[i])) {
+          LOG(ERROR) << td::format::as_array(res);
+          LOG(FATAL) << td::format::as_array(other_res);
+        }
+      }
+    }
+    if (combined_map_dns_) {
+      auto other_res = combined_map_dns_.value().resolve(name, category);
+
+      std::sort(other_res.begin(), other_res.end());
+      if (res.size() != other_res.size()) {
+        LOG(ERROR) << td::format::as_array(res);
+        LOG(FATAL) << td::format::as_array(other_res);
+      }
+      for (size_t i = 0; i < res.size(); i++) {
+        if (!(res[i] == other_res[i])) {
+          LOG(ERROR) << td::format::as_array(res);
+          LOG(FATAL) << td::format::as_array(other_res);
+        }
+      }
+    }
+
+    return res;
+  }
+
+ private:
+  using ManualDns = ton::ManualDns;
+  td::optional<td::Ed25519::PrivateKey> key_;
+  td::Ref<ManualDns> dns_;
+
+  MapDns map_dns_;
+  td::optional<MapDns> combined_map_dns_;
+
+  void do_update_smc(const Action& entry) {
+    LOG(ERROR) << td::format::escaped(ManualDns::encode_name(entry.name));
+    ton::DnsInterface::Action action;
+    action.name = entry.name;
+    action.category = entry.category;
+    action.data = ManualDns::EntryData::text(entry.text.value()).as_cell().move_as_ok();
+  }
+};
+
+void do_dns_test(CheckedDns&& dns) {
+  using Action = CheckedDns::Action;
+  std::vector<Action> actions;
+
+  td::Random::Xorshift128plus rnd(123);
+
+  auto gen_name = [&] {
+    auto cnt = rnd.fast(1, 2);
+    std::string res;
+    for (int i = 0; i < cnt; i++) {
+      if (i != 0) {
+        res += '.';
+      }
+      auto len = rnd.fast(1, 1);
+      for (int j = 0; j < len; j++) {
+        res += static_cast<char>(rnd.fast('a', 'b'));
+      }
+    }
+    return res;
+  };
+  auto gen_text = [&] {
+    std::string res;
+    int len = 5;
+    for (int j = 0; j < len; j++) {
+      res += static_cast<char>(rnd.fast('a', 'b'));
+    }
+    return res;
+  };
+
+  auto gen_action = [&] {
+    Action action;
+    if (rnd.fast(0, 1000) == 0) {
+      return action;
+    }
+    action.name = gen_name();
+    if (rnd.fast(0, 20) == 0) {
+      return action;
+    }
+    action.category = td::narrow_cast<td::int16>(rnd.fast(1, 5));
+    if (rnd.fast(0, 4) == 0) {
+      return action;
+    }
+    if (rnd.fast(0, 4) == 0) {
+      action.text = "";
+      return action;
+    }
+    action.text = gen_text();
+    return action;
+  };
+
+  SET_VERBOSITY_LEVEL(VERBOSITY_NAME(ERROR));
+  for (int i = 0; i < 100000; i++) {
+    actions.push_back(gen_action());
+    if (rnd.fast(0, 10) == 0) {
+      dns.update(actions);
+      actions.clear();
+    }
+    dns.resolve(gen_name(), td::narrow_cast<td::int16>(rnd.fast(0, 5)));
+  }
+};
+
+TEST(Smartcont, DnsManual) {
+  using ManualDns = ton::ManualDns;
+  auto test_entry_data = [](auto&& entry_data) {
+    auto cell = entry_data.as_cell().move_as_ok();
+    auto cs = vm::load_cell_slice(cell);
+    auto new_entry_data = ManualDns::EntryData::from_cellslice(cs).move_as_ok();
+    ASSERT_EQ(entry_data, new_entry_data);
+  };
+  test_entry_data(ManualDns::EntryData::text("abcd"));
+  test_entry_data(ManualDns::EntryData::adnl_address(ton::Bits256{}));
+
+  CHECK(td::Slice("a\0b\0") == ManualDns::encode_name("b.a"));
+  CHECK(td::Slice("a\0b\0") == ManualDns::encode_name(".b.a"));
+  ASSERT_EQ("b.a", ManualDns::decode_name("a\0b\0"));
+  ASSERT_EQ("b.a", ManualDns::decode_name("a\0b"));
+  ASSERT_EQ("", ManualDns::decode_name(""));
+
+  auto key = td::Ed25519::generate_private_key().move_as_ok();
+
+  auto manual = ManualDns::create(ManualDns::create_init_data_fast(key.get_public_key().move_as_ok(), 123));
+  CHECK(manual->get_wallet_id().move_as_ok() == 123);
+  auto init_query = manual->create_init_query(key).move_as_ok();
+  LOG(ERROR) << "A";
+  CHECK(manual.write().send_external_message(init_query).code == 0);
+  LOG(ERROR) << "B";
+  CHECK(manual.write().send_external_message(init_query).code != 0);
+
+  auto value = vm::CellBuilder().store_bytes("hello world").finalize();
+  auto set_query =
+      manual
+          ->sign(key,
+                 manual->prepare(manual->create_set_value_unsigned(1, "a\0b\0", value).move_as_ok(), 1).move_as_ok())
+          .move_as_ok();
+  CHECK(manual.write().send_external_message(set_query).code == 0);
+
+  auto res = manual->run_get_method(
+      "dnsresolve", {vm::load_cell_slice_ref(vm::CellBuilder().store_bytes("a\0b\0").finalize()), td::make_refint(1)});
+  CHECK(res.code == 0);
+  CHECK(res.stack.write().pop_cell()->get_hash() == value->get_hash());
+
+  CheckedDns dns;
+  dns.update(CheckedDns::Action{"a.b.c", 1, "hello"});
+  CHECK(dns.resolve("a.b.c", 1).at(0).text == "hello");
+  dns.resolve("a", 1);
+  dns.resolve("a.b", 1);
+  CHECK(dns.resolve("a.b.c", 2).empty());
+  dns.update(CheckedDns::Action{"a.b.c", 2, "test"});
+  CHECK(dns.resolve("a.b.c", 2).at(0).text == "test");
+  dns.resolve("a.b.c", 1);
+  dns.resolve("a.b.c", 2);
+  LOG(ERROR) << "Test zero category";
+  dns.resolve("a.b.c", 0);
+  dns.update(CheckedDns::Action{"", 0, ""});
+  CHECK(dns.resolve("a.b.c", 2).empty());
+
+  LOG(ERROR) << "Test multipe update";
+  {
+    CheckedDns::Action e[4] = {CheckedDns::Action{"", 0, ""}, CheckedDns::Action{"a.b.c", 1, "hello"},
+                               CheckedDns::Action{"a.b.c", 2, "world"}, CheckedDns::Action{"x.y.z", 3, "abc"}};
+    dns.update(td::Span<CheckedDns::Action>(e, 4));
+  }
+  dns.resolve("a.b.c", 1);
+  dns.resolve("a.b.c", 2);
+  dns.resolve("x.y.z", 3);
+
+  {
+    CheckedDns::Action e[1] = {CheckedDns::Action{"x.y.z", 0, ""}};
+    dns.update(td::Span<CheckedDns::Action>(e, 1));
+  }
+
+  dns.resolve("a.b.c", 1);
+  dns.resolve("a.b.c", 2);
+  dns.resolve("x.y.z", 3);
+
+  {
+    CheckedDns::Action e[3] = {CheckedDns::Action{"x.y.z", 0, ""}, CheckedDns::Action{"x.y.z", 1, "xxx"},
+                               CheckedDns::Action{"x.y.z", 2, "yyy"}};
+    dns.update(td::Span<CheckedDns::Action>(e, 3));
+  }
+  dns.resolve("a.b.c", 1);
+  dns.resolve("a.b.c", 2);
+  dns.resolve("x.y.z", 1);
+  dns.resolve("x.y.z", 2);
+  dns.resolve("x.y.z", 3);
+
+  {
+    auto actions_ext =
+        ton::ManualDns::parse("delete.name one\nset one 1 TEXT:one\ndelete.name two\nset two 2 TEXT:two").move_as_ok();
+
+    auto actions = td::transform(actions_ext, [](auto& action) {
+      td::optional<std::string> data;
+      if (action.data) {
+        data = action.data.value().data.template get<ton::ManualDns::EntryDataText>().text;
+      }
+      return CheckedDns::Action{action.name, action.category, std::move(data)};
+    });
+
+    dns.update(actions);
+  }
+  dns.resolve("one", 1);
+  dns.resolve("two", 2);
+
+  // TODO: rethink semantic of creating an empty dictionary
+  do_dns_test(CheckedDns(true, true));
+}
diff --git a/submodules/ton/tonlib-src/crypto/test/vm.cpp b/submodules/ton/tonlib-src/crypto/test/vm.cpp
index 72e2f8c61b..77157f6d84 100644
--- a/submodules/ton/tonlib-src/crypto/test/vm.cpp
+++ b/submodules/ton/tonlib-src/crypto/test/vm.cpp
@@ -14,9 +14,9 @@
     You should have received a copy of the GNU Lesser General Public License
     along with TON Blockchain Library.  If not, see <http://www.gnu.org/licenses/>.
 
-    Copyright 2017-2019 Telegram Systems LLP
+    Copyright 2017-2020 Telegram Systems LLP
 */
-#include "vm/continuation.h"
+#include "vm/vm.h"
 #include "vm/cp0.h"
 #include "vm/dict.h"
 #include "fift/utils.h"
diff --git a/submodules/ton/tonlib-src/crypto/tl/tlbc-gen-cpp.cpp b/submodules/ton/tonlib-src/crypto/tl/tlbc-gen-cpp.cpp
index bbf3adf79c..dedec15d49 100644
--- a/submodules/ton/tonlib-src/crypto/tl/tlbc-gen-cpp.cpp
+++ b/submodules/ton/tonlib-src/crypto/tl/tlbc-gen-cpp.cpp
@@ -14,7 +14,7 @@
     You should have received a copy of the GNU Lesser General Public License
     along with TON Blockchain Library.  If not, see <http://www.gnu.org/licenses/>.
 
-    Copyright 2017-2019 Telegram Systems LLP
+    Copyright 2017-2020 Telegram Systems LLP
 */
 #include "tlbc-gen-cpp.h"
 #include "td/utils/bits.h"
@@ -94,6 +94,7 @@ void init_forbidden_cpp_idents() {
   l.insert("get_size");
   l.insert("pack");
   l.insert("unpack");
+  l.insert("ops");
   l.insert("cs");
   l.insert("cb");
   l.insert("cell_ref");
@@ -922,7 +923,7 @@ void CppTypeCode::generate_get_tag_param1(std::ostream& os, std::string nl, cons
       match_param_pattern(os, nl, A, 8, "# > 1 && (# & 1)", param_names[0])) {
     return;
   }
-  os << nl << "static inline size_t nat_abs(int x) { return (x > 1) * 2 + (x & 1); }";
+  os << nl << "// static inline size_t nat_abs(int x) { return (x > 1) * 2 + (x & 1); }";
   os << nl << "static signed char ctab[4] = { ";
   for (int i = 0; i < 4; i++) {
     if (i > 0) {
@@ -941,7 +942,7 @@ void CppTypeCode::generate_get_tag_param2(std::ostream& os, std::string nl, cons
       os << ' ' << (int)A[i][j];
     }
   }
-  os << nl << "static inline size_t nat_abs(int x) { return (x > 1) * 2 + (x & 1); }";
+  os << nl << "// static inline size_t nat_abs(int x) { return (x > 1) * 2 + (x & 1); }";
   os << nl << "static signed char ctab[4][4] = { ";
   for (int i = 0; i < 16; i++) {
     if (i > 0) {
@@ -964,7 +965,7 @@ void CppTypeCode::generate_get_tag_param3(std::ostream& os, std::string nl, cons
       }
     }
   }
-  os << nl << "static inline size_t nat_abs(int x) { return (x > 1) * 2 + (x & 1); }";
+  os << nl << "// static inline size_t nat_abs(int x) { return (x > 1) * 2 + (x & 1); }";
   os << nl << "static signed char ctab[4][4][4] = { ";
   for (int i = 0; i < 64; i++) {
     if (i > 0) {
@@ -2014,7 +2015,7 @@ void CppTypeCode::generate_skip_field(const Constructor& constr, const Field& fi
       output_cpp_expr(ss, expr, 100, true);
       ss << '.';
     }
-    ss << (validating ? "validate_skip(cs, weak" : "skip(cs");
+    ss << (validating ? "validate_skip(ops, cs, weak" : "skip(cs");
     output_negative_type_arguments(ss, expr);
     ss << ")";
     actions += Action{std::move(ss)};
@@ -2054,7 +2055,7 @@ void CppTypeCode::generate_skip_field(const Constructor& constr, const Field& fi
       output_cpp_expr(ss, expr, 100);
       ss << '.';
     }
-    ss << (validating ? "validate_skip(cs, weak)" : "skip(cs)") << tail;
+    ss << (validating ? "validate_skip(ops, cs, weak)" : "skip(cs)") << tail;
     actions += Action{std::move(ss)};
     return;
   }
@@ -2074,7 +2075,7 @@ void CppTypeCode::generate_skip_field(const Constructor& constr, const Field& fi
     output_cpp_expr(ss, expr, 100);
     ss << '.';
   }
-  ss << "validate_skip_ref(cs, weak)" << tail;
+  ss << "validate_skip_ref(ops, cs, weak)" << tail;
   actions += Action{ss.str()};
 }
 
@@ -2101,8 +2102,8 @@ void CppTypeCode::generate_skip_cons_method(std::ostream& os, std::string nl, in
 void CppTypeCode::generate_skip_method(std::ostream& os, int options) {
   bool validate = options & 1;
   bool ret_ext = options & 2;
-  os << "\nbool " << cpp_type_class_name << "::" << (validate ? "validate_" : "") << "skip(vm::CellSlice& cs"
-     << (validate ? ", bool weak" : "");
+  os << "\nbool " << cpp_type_class_name
+     << "::" << (validate ? "validate_skip(int* ops, vm::CellSlice& cs, bool weak" : "skip(vm::CellSlice& cs");
   if (ret_ext) {
     os << skip_extra_args;
   }
@@ -2470,7 +2471,7 @@ void CppTypeCode::generate_unpack_field(const CppTypeCode::ConsField& fi, const
       output_cpp_expr(ss, expr, 100, true);
       ss << '.';
     }
-    ss << (validating ? "validate_fetch_to(cs, weak, " : "fetch_to(cs, ") << field_vars.at(i);
+    ss << (validating ? "validate_fetch_to(ops, cs, weak, " : "fetch_to(cs, ") << field_vars.at(i);
     output_negative_type_arguments(ss, expr);
     ss << ")";
     actions += Action{std::move(ss)};
@@ -2514,8 +2515,8 @@ void CppTypeCode::generate_unpack_field(const CppTypeCode::ConsField& fi, const
       output_cpp_expr(ss, expr, 100);
       ss << '.';
     }
-    ss << (validating ? "validate_" : "") << "fetch_" << (cvt == ct_enum ? "enum_" : "") << "to(cs, "
-       << (validating ? "weak, " : "") << field_vars.at(i) << ")" << tail;
+    ss << (validating ? "validate_" : "") << "fetch_" << (cvt == ct_enum ? "enum_" : "")
+       << (validating ? "to(ops, cs, weak, " : "to(cs, ") << field_vars.at(i) << ")" << tail;
     field_var_set[i] = true;
     actions += Action{std::move(ss)};
     return;
@@ -2540,7 +2541,7 @@ void CppTypeCode::generate_unpack_field(const CppTypeCode::ConsField& fi, const
     output_cpp_expr(ss, expr, 100);
     ss << '.';
   }
-  ss << "validate_ref(" << field_vars.at(i) << "))" << tail;
+  ss << "validate_ref(ops, " << field_vars.at(i) << "))" << tail;
   actions += Action{ss.str()};
 }
 
@@ -2559,7 +2560,11 @@ void CppTypeCode::generate_unpack_method(std::ostream& os, CppTypeCode::ConsReco
        << "\n  auto cs = load_cell_slice(std::move(cell_ref));"
        << "\n  return " << (options & 1 ? "validate_" : "") << "unpack";
     if (!(options & 8)) {
-      os << "(cs, data";
+      os << "(";
+      if (options & 1) {
+        os << "ops, ";
+      }
+      os << "cs, data";
     } else {
       os << "_" << cons_enum_name.at(rec.cons_idx) << "(cs";
       for (const auto& f : rec.cpp_fields) {
@@ -2773,7 +2778,7 @@ void CppTypeCode::generate_pack_field(const CppTypeCode::ConsField& fi, const Co
     output_cpp_expr(ss, expr, 100);
     ss << '.';
   }
-  ss << "validate_ref(" << field_vars.at(i) << "))" << tail;
+  ss << "validate_ref(ops, " << field_vars.at(i) << "))" << tail;
   actions += Action{ss.str()};
 }
 
@@ -3093,7 +3098,7 @@ void CppTypeCode::generate_header(std::ostream& os, int options) {
   if (ret_params) {
     os << "  bool skip(vm::CellSlice& cs" << skip_extra_args << ") const;\n";
   }
-  os << "  bool validate_skip(vm::CellSlice& cs, bool weak = false) const override";
+  os << "  bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override";
   if (!inline_validate_skip) {
     os << ";\n";
   } else if (sz) {
@@ -3102,7 +3107,7 @@ void CppTypeCode::generate_header(std::ostream& os, int options) {
     os << " {\n    return true;\n  }\n";
   }
   if (ret_params) {
-    os << "  bool validate_skip(vm::CellSlice& cs, bool weak" << skip_extra_args << ") const;\n";
+    os << "  bool validate_skip(int *ops, vm::CellSlice& cs, bool weak" << skip_extra_args << ") const;\n";
     os << "  bool fetch_to(vm::CellSlice& cs, Ref<vm::CellSlice>& res" << skip_extra_args << ") const;\n";
   }
   if (type.is_simple_enum) {
@@ -3257,6 +3262,31 @@ void generate_type_constants(std::ostream& os, int mode) {
   }
 }
 
+void generate_register_function(std::ostream& os, int mode) {
+  os << "\n// " << (mode ? "definition" : "declaration") << " of type name registration function\n";
+  if (!mode) {
+    os << "extern bool register_simple_types(std::function<bool(const char*, const TLB*)> func);\n";
+    return;
+  }
+  os << "bool register_simple_types(std::function<bool(const char*, const TLB*)> func) {\n";
+  os << "  return ";
+  int k = 0;
+  for (int i = builtin_types_num; i < types_num; i++) {
+    Type& type = types[i];
+    CppTypeCode& cc = *cpp_type[i];
+    if (!cc.cpp_type_var_name.empty() && type.type_name) {
+      if (k++) {
+        os << "\n      && ";
+      }
+      os << "func(\"" << type.get_name() << "\", &" << cc.cpp_type_var_name << ")";
+    }
+  }
+  if (!k) {
+    os << "true";
+  }
+  os << ";\n}\n\n";
+}
+
 void assign_const_type_cpp_idents() {
   const_type_expr_cpp_idents.resize(const_type_expr_num + 1, "");
   const_type_expr_simple.resize(const_type_expr_num + 1, false);
@@ -3389,6 +3419,7 @@ void generate_cpp_output_to(std::ostream& os, int options = 0, std::vector<std::
         cc.generate(os, (options & -4) | pass);
       }
       generate_type_constants(os, pass - 1);
+      generate_register_function(os, pass - 1);
     }
   }
   for (auto it = cpp_namespace_list.rbegin(); it != cpp_namespace_list.rend(); ++it) {
diff --git a/submodules/ton/tonlib-src/crypto/tl/tlbc.cpp b/submodules/ton/tonlib-src/crypto/tl/tlbc.cpp
index ff2e19e60e..0364e5dbf2 100644
--- a/submodules/ton/tonlib-src/crypto/tl/tlbc.cpp
+++ b/submodules/ton/tonlib-src/crypto/tl/tlbc.cpp
@@ -102,13 +102,15 @@ unsigned long long get_special_value(std::string str) {
   unsigned long long val = 0;
   int bits = 0;
   if (str[0] == '#') {
-    while (i < n) {
-      int c = str[i++];
+    for (; i < n; i++) {
+      int c = str[i];
       if (c == '_') {
         break;
       }
       if (c >= '0' && c <= '9') {
         c -= '0';
+      } else if (c >= 'A' && c <= 'F') {
+        c -= 'A' - 10;
       } else if (c >= 'a' && c <= 'f') {
         c -= 'a' - 10;
       } else {
@@ -146,6 +148,9 @@ unsigned long long get_special_value(std::string str) {
     while (bits && !((val >> (64 - bits)) & 1)) {
       --bits;
     }
+    if (bits) {
+      --bits;
+    }
   }
   if (bits == 64) {
     return 0;
diff --git a/submodules/ton/tonlib-src/crypto/tl/tlblib.cpp b/submodules/ton/tonlib-src/crypto/tl/tlblib.cpp
index 40637c57b4..617c298bb0 100644
--- a/submodules/ton/tonlib-src/crypto/tl/tlblib.cpp
+++ b/submodules/ton/tonlib-src/crypto/tl/tlblib.cpp
@@ -14,7 +14,7 @@
     You should have received a copy of the GNU Lesser General Public License
     along with TON Blockchain Library.  If not, see <http://www.gnu.org/licenses/>.
 
-    Copyright 2017-2019 Telegram Systems LLP
+    Copyright 2017-2020 Telegram Systems LLP
 */
 #include <tl/tlblib.hpp>
 
@@ -33,6 +33,12 @@ const NatWidth t_Nat{32};
 const Anything t_Anything;
 const RefAnything t_RefCell;
 
+std::string TLB::get_type_name() const {
+  std::ostringstream os;
+  print_type(os);
+  return os.str();
+}
+
 bool Bool::print_skip(PrettyPrinter& pp, vm::CellSlice& cs) const {
   int t = get_tag(cs);
   return cs.advance(1) && pp.out(t ? "bool_true" : "bool_false");
@@ -108,46 +114,52 @@ bool TupleT::skip(vm::CellSlice& cs) const {
   return !i;
 }
 
-bool TupleT::validate_skip(vm::CellSlice& cs, bool weak) const {
+bool TupleT::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const {
   int i = n;
   for (; i > 0; --i) {
-    if (!X.validate_skip(cs, weak)) {
+    if (!X.validate_skip(ops, cs, weak)) {
       break;
     }
   }
   return !i;
 }
 
-bool TLB::validate_ref_internal(Ref<vm::Cell> cell_ref, bool weak) const {
+bool TLB::validate_ref_internal(int* ops, Ref<vm::Cell> cell_ref, bool weak) const {
+  if (ops && --*ops < 0) {
+    return false;
+  }
   bool is_special;
   auto cs = load_cell_slice_special(std::move(cell_ref), is_special);
-  return always_special() ? is_special : (is_special ? weak : (validate_skip(cs) && cs.empty_ext()));
+  return always_special() ? is_special : (is_special ? weak : (validate_skip(ops, cs) && cs.empty_ext()));
 }
 
 bool TLB::print_skip(PrettyPrinter& pp, vm::CellSlice& cs) const {
   pp.open("raw@");
   pp << *this << ' ';
   vm::CellSlice cs_copy{cs};
-  if (!validate_skip(cs) || !cs_copy.cut_tail(cs)) {
+  int size_limit = pp.limit;
+  if (!validate_skip(&size_limit, cs) || !cs_copy.cut_tail(cs)) {
     return pp.fail("invalid value");
   }
   pp.raw_nl();
-  cs_copy.print_rec(pp.os, pp.indent);
-  return pp.mkindent() && pp.close();
+  return (cs_copy.print_rec(pp.os, &pp.limit, pp.indent) && pp.mkindent() && pp.close()) ||
+         pp.fail("raw value too long");
 }
 
 bool TLB::print_special(PrettyPrinter& pp, vm::CellSlice& cs) const {
   pp.open("raw@");
   pp << *this << ' ';
   pp.raw_nl();
-  cs.print_rec(pp.os, pp.indent);
-  return pp.mkindent() && pp.close();
+  return (cs.print_rec(pp.os, &pp.limit, pp.indent) && pp.mkindent() && pp.close()) || pp.fail("raw value too long");
 }
 
 bool TLB::print_ref(PrettyPrinter& pp, Ref<vm::Cell> cell_ref) const {
   if (cell_ref.is_null()) {
     return pp.fail("null cell reference");
   }
+  if (!pp.register_recursive_call()) {
+    return pp.fail("too many recursive calls while printing a TL-B value");
+  }
   bool is_special;
   auto cs = load_cell_slice_special(std::move(cell_ref), is_special);
   if (is_special) {
@@ -157,18 +169,21 @@ bool TLB::print_ref(PrettyPrinter& pp, Ref<vm::Cell> cell_ref) const {
   }
 }
 
-bool TLB::print_skip(std::ostream& os, vm::CellSlice& cs, int indent) const {
+bool TLB::print_skip(std::ostream& os, vm::CellSlice& cs, int indent, int rec_limit) const {
   PrettyPrinter pp{os, indent};
+  pp.set_limit(rec_limit);
   return pp.fail_unless(print_skip(pp, cs));
 }
 
-bool TLB::print(std::ostream& os, const vm::CellSlice& cs, int indent) const {
+bool TLB::print(std::ostream& os, const vm::CellSlice& cs, int indent, int rec_limit) const {
   PrettyPrinter pp{os, indent};
+  pp.set_limit(rec_limit);
   return pp.fail_unless(print(pp, cs));
 }
 
-bool TLB::print_ref(std::ostream& os, Ref<vm::Cell> cell_ref, int indent) const {
+bool TLB::print_ref(std::ostream& os, Ref<vm::Cell> cell_ref, int indent, int rec_limit) const {
   PrettyPrinter pp{os, indent};
+  pp.set_limit(rec_limit);
   return pp.fail_unless(print_ref(pp, std::move(cell_ref)));
 }
 
@@ -207,7 +222,7 @@ PrettyPrinter::~PrettyPrinter() {
 }
 
 bool PrettyPrinter::fail(std::string msg) {
-  os << "<FATAL: " << msg << ">";
+  os << "<FATAL: " << msg << ">" << std::endl;
   failed = true;
   return false;
 }
@@ -340,3 +355,24 @@ bool PrettyPrinter::fetch_uint256_field(vm::CellSlice& cs, int n, std::string na
 }
 
 }  // namespace tlb
+
+namespace tlb {
+
+bool TypenameLookup::register_types(typename TypenameLookup::register_func_t func) {
+  return func([this](const char* name, const TLB* tp) { return register_type(name, tp); });
+}
+
+bool TypenameLookup::register_type(const char* name, const TLB* tp) {
+  if (!name || !tp) {
+    return false;
+  }
+  auto res = types.emplace(name, tp);
+  return res.second;
+}
+
+const TLB* TypenameLookup::lookup(std::string str) const {
+  auto it = types.find(str);
+  return it != types.end() ? it->second : nullptr;
+}
+
+}  // namespace tlb
diff --git a/submodules/ton/tonlib-src/crypto/tl/tlblib.hpp b/submodules/ton/tonlib-src/crypto/tl/tlblib.hpp
index b5d51c3154..7543d38f19 100644
--- a/submodules/ton/tonlib-src/crypto/tl/tlblib.hpp
+++ b/submodules/ton/tonlib-src/crypto/tl/tlblib.hpp
@@ -14,10 +14,11 @@
     You should have received a copy of the GNU Lesser General Public License
     along with TON Blockchain Library.  If not, see <http://www.gnu.org/licenses/>.
 
-    Copyright 2017-2019 Telegram Systems LLP
+    Copyright 2017-2020 Telegram Systems LLP
 */
 #pragma once
 #include <iostream>
+#include <map>
 #include "vm/cellslice.h"
 
 namespace tlb {
@@ -29,6 +30,7 @@ struct PrettyPrinter;
 
 class TLB {
  public:
+  enum { default_validate_max_cells = 1024 };
   virtual ~TLB() = default;
   virtual int get_size(const vm::CellSlice& cs) const {
     return -1;
@@ -36,14 +38,26 @@ class TLB {
   virtual bool skip(vm::CellSlice& cs) const {
     return cs.skip_ext(get_size(cs));
   }
-  virtual bool validate(const vm::CellSlice& cs, bool weak = false) const {
+  virtual bool validate(int* ops, const vm::CellSlice& cs, bool weak = false) const {
     return cs.have_ext(get_size(cs));
   }
-  virtual bool validate_exact(const vm::CellSlice& cs, bool weak = false) const {
+  virtual bool validate_exact(int* ops, const vm::CellSlice& cs, bool weak = false) const {
     return (int)cs.size_ext() == get_size(cs);
   }
+  bool validate_upto(int ops, const vm::CellSlice& cs, bool weak = false) const {
+    return validate(&ops, cs, weak);
+  }
+  bool validate_exact_upto(int ops, const vm::CellSlice& cs, bool weak = false) const {
+    return validate_exact(&ops, cs, weak);
+  }
+  bool validate_csr(int* ops, Ref<vm::CellSlice> cs_ref, bool weak = false) const {
+    return cs_ref.not_null() && validate_skip_exact(ops, cs_ref.write(), weak);
+  }
+  bool validate_csr(int ops, Ref<vm::CellSlice> cs_ref, bool weak = false) const {
+    return validate_csr(&ops, std::move(cs_ref), weak);
+  }
   bool validate_csr(Ref<vm::CellSlice> cs_ref, bool weak = false) const {
-    return cs_ref.not_null() && validate_skip_exact(cs_ref.write(), weak);
+    return validate_csr(default_validate_max_cells, std::move(cs_ref), weak);
   }
   Ref<vm::CellSlice> fetch(vm::CellSlice& cs) const {
     return cs.fetch_subslice_ext(get_size(cs));
@@ -51,67 +65,71 @@ class TLB {
   Ref<vm::CellSlice> prefetch(const vm::CellSlice& cs) const {
     return cs.prefetch_subslice_ext(get_size(cs));
   }
-  virtual Ref<vm::CellSlice> validate_fetch(vm::CellSlice& cs, bool weak = false) const {
-    return validate(cs, weak) ? cs.fetch_subslice_ext(get_size(cs)) : Ref<vm::CellSlice>{};
+  virtual Ref<vm::CellSlice> validate_fetch(int* ops, vm::CellSlice& cs, bool weak = false) const {
+    return validate(ops, cs, weak) ? cs.fetch_subslice_ext(get_size(cs)) : Ref<vm::CellSlice>{};
   }
-  virtual Ref<vm::CellSlice> validate_prefetch(const vm::CellSlice& cs, bool weak = false) const {
-    return validate(cs, weak) ? cs.prefetch_subslice_ext(get_size(cs)) : Ref<vm::CellSlice>{};
+  virtual Ref<vm::CellSlice> validate_prefetch(int* ops, const vm::CellSlice& cs, bool weak = false) const {
+    return validate(ops, cs, weak) ? cs.prefetch_subslice_ext(get_size(cs)) : Ref<vm::CellSlice>{};
   }
   bool fetch_to(vm::CellSlice& cs, Ref<vm::CellSlice>& res) const {
     return (res = fetch(cs)).not_null();
   }
-  bool validate_fetch_to(vm::CellSlice& cs, Ref<vm::CellSlice>& res, bool weak = false) const {
-    return (res = validate_fetch(cs, weak)).not_null();
+  bool validate_fetch_to(int* ops, vm::CellSlice& cs, Ref<vm::CellSlice>& res, bool weak = false) const {
+    return (res = validate_fetch(ops, cs, weak)).not_null();
   }
   bool store_from(vm::CellBuilder& cb, Ref<vm::CellSlice> field) const {
     return field.not_null() && get_size(*field) == (int)field->size_ext() && cb.append_cellslice_bool(std::move(field));
   }
-  bool validate_store_from(vm::CellBuilder& cb, Ref<vm::CellSlice> field, bool weak = false) const {
+  bool validate_store_from(int* ops, vm::CellBuilder& cb, Ref<vm::CellSlice> field, bool weak = false) const {
     if (field.is_null()) {
       return false;
     }
     vm::CellSlice cs{*field};
-    return validate_skip(cs, weak) && cs.empty_ext() && cb.append_cellslice_bool(std::move(field));
+    return validate_skip(ops, cs, weak) && cs.empty_ext() && cb.append_cellslice_bool(std::move(field));
   }
   virtual bool extract(vm::CellSlice& cs) const {
     return cs.only_ext(get_size(cs));
   }
-  virtual bool validate_extract(vm::CellSlice& cs, bool weak = false) const {
-    return validate(cs, weak) && extract(cs);
+  virtual bool validate_extract(int* ops, vm::CellSlice& cs, bool weak = false) const {
+    return validate(ops, cs, weak) && extract(cs);
   }
   int get_size_by_skip(const vm::CellSlice& cs) const {
     vm::CellSlice copy{cs};
     return skip(copy) ? copy.subtract_base_ext(cs) : -1;
   }
-  virtual bool validate_skip(vm::CellSlice& cs, bool weak = false) const {
-    return validate(cs, weak) && skip(cs);
+  virtual bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const {
+    return validate(ops, cs, weak) && skip(cs);
   }
-  bool validate_skip_exact(vm::CellSlice& cs, bool weak = false) const {
-    return validate_skip(cs, weak) && cs.empty_ext();
+  bool validate_skip_upto(int ops, vm::CellSlice& cs, bool weak = false) const {
+    return validate_skip(&ops, cs, weak);
   }
-  bool validate_by_skip(const vm::CellSlice& cs, bool weak = false) const {
+  bool validate_skip_exact(int* ops, vm::CellSlice& cs, bool weak = false) const {
+    return validate_skip(ops, cs, weak) && cs.empty_ext();
+  }
+  bool validate_by_skip(int* ops, const vm::CellSlice& cs, bool weak = false) const {
     vm::CellSlice copy{cs};
-    return validate_skip(copy, weak);
+    return validate_skip(ops, copy, weak);
   }
-  bool validate_by_skip_exact(const vm::CellSlice& cs, bool weak = false) const {
+  bool validate_by_skip_exact(int* ops, const vm::CellSlice& cs, bool weak = false) const {
     vm::CellSlice copy{cs};
-    return validate_skip_exact(copy, weak);
+    return validate_skip_exact(ops, copy, weak);
   }
   bool extract_by_skip(vm::CellSlice& cs) const {
     vm::CellSlice copy{cs};
     return skip(copy) && cs.cut_tail(copy);
   }
-  bool validate_extract_by_skip(vm::CellSlice& cs, bool weak = false) const {
+  bool validate_extract_by_skip(int* ops, vm::CellSlice& cs, bool weak = false) const {
     vm::CellSlice copy{cs};
-    return validate_skip(copy, weak) && cs.cut_tail(copy);
+    return validate_skip(ops, copy, weak) && cs.cut_tail(copy);
   }
-  Ref<vm::CellSlice> validate_fetch_by_skip(vm::CellSlice& cs, bool weak = false) const {
+  Ref<vm::CellSlice> validate_fetch_by_skip(int* ops, vm::CellSlice& cs, bool weak = false) const {
     Ref<vm::CellSlice> copy{true, cs};
-    return validate_skip(cs, weak) && copy.unique_write().cut_tail(cs) ? copy : Ref<vm::CellSlice>{};
+    return validate_skip(ops, cs, weak) && copy.unique_write().cut_tail(cs) ? copy : Ref<vm::CellSlice>{};
   }
-  Ref<vm::CellSlice> validate_prefetch_by_skip(const vm::CellSlice& cs, bool weak = false) const {
+  Ref<vm::CellSlice> validate_prefetch_by_skip(int* ops, const vm::CellSlice& cs, bool weak = false) const {
     vm::CellSlice copy{cs};
-    return validate_skip(copy, false) ? cs.prefetch_subslice_ext(copy.subtract_base_ext(cs)) : Ref<vm::CellSlice>{};
+    return validate_skip(ops, copy, false) ? cs.prefetch_subslice_ext(copy.subtract_base_ext(cs))
+                                           : Ref<vm::CellSlice>{};
   }
   virtual bool skip_copy(vm::CellBuilder& cb, vm::CellSlice& cs) const {
     return cb.append_cellslice_bool(fetch(cs));
@@ -155,14 +173,29 @@ class TLB {
   bool as_integer_to(Ref<vm::CellSlice> cs_ref, td::RefInt256& res) const {
     return (res = as_integer(std::move(cs_ref))).not_null();
   }
+  bool validate_ref(int* ops, Ref<vm::Cell> cell_ref, bool weak = false) const {
+    return cell_ref.not_null() && validate_ref_internal(ops, std::move(cell_ref), weak);
+  }
+  bool validate_ref(int ops, Ref<vm::Cell> cell_ref, bool weak = false) const {
+    return validate_ref(&ops, std::move(cell_ref), weak);
+  }
   bool validate_ref(Ref<vm::Cell> cell_ref, bool weak = false) const {
-    return cell_ref.not_null() && validate_ref_internal(std::move(cell_ref), weak);
+    return validate_ref(default_validate_max_cells, std::move(cell_ref), weak);
+  }
+  bool force_validate_ref(int* ops, Ref<vm::Cell> cell_ref) const {
+    return cell_ref.not_null() && validate_ref_internal(ops, std::move(cell_ref), false);
+  }
+  bool force_validate_ref(int ops, Ref<vm::Cell> cell_ref) const {
+    return force_validate_ref(&ops, std::move(cell_ref));
   }
   bool force_validate_ref(Ref<vm::Cell> cell_ref) const {
-    return cell_ref.not_null() && validate_ref_internal(std::move(cell_ref), false);
+    return force_validate_ref(default_validate_max_cells, std::move(cell_ref));
   }
-  bool validate_skip_ref(vm::CellSlice& cs, bool weak = false) const {
-    return validate_ref(cs.fetch_ref(), weak);
+  bool validate_skip_ref(int* ops, vm::CellSlice& cs, bool weak = false) const {
+    return validate_ref(ops, cs.fetch_ref(), weak);
+  }
+  bool validate_skip_ref(int ops, vm::CellSlice& cs, bool weak = false) const {
+    return validate_skip_ref(&ops, cs, weak);
   }
   virtual bool null_value(vm::CellBuilder& cb) const {
     return false;
@@ -196,6 +229,7 @@ class TLB {
   virtual std::ostream& print_type(std::ostream& os) const {
     return os << "<unknown-TLB-type>";
   }
+  std::string get_type_name() const;
   virtual bool print_skip(PrettyPrinter& pp, vm::CellSlice& cs) const;
   virtual bool print(PrettyPrinter& pp, const vm::CellSlice& cs) const {
     vm::CellSlice cs_copy{cs};
@@ -206,21 +240,27 @@ class TLB {
   bool print(PrettyPrinter& pp, Ref<vm::CellSlice> cs_ref) const {
     return print(pp, *cs_ref);
   }
-  bool print_skip(std::ostream& os, vm::CellSlice& cs, int indent = 0) const;
-  bool print(std::ostream& os, const vm::CellSlice& cs, int indent = 0) const;
-  bool print(std::ostream& os, Ref<vm::CellSlice> cs_ref, int indent = 0) const {
-    return print(os, *cs_ref, indent);
+  bool print_skip(std::ostream& os, vm::CellSlice& cs, int indent = 0, int rec_limit = 0) const;
+  bool print(std::ostream& os, const vm::CellSlice& cs, int indent = 0, int rec_limit = 0) const;
+  bool print(std::ostream& os, Ref<vm::CellSlice> cs_ref, int indent = 0, int rec_limit = 0) const {
+    return print(os, *cs_ref, indent, rec_limit);
+  }
+  bool print_ref(std::ostream& os, Ref<vm::Cell> cell_ref, int indent = 0, int rec_limit = 0) const;
+  bool print_ref(int rec_limit, std::ostream& os, Ref<vm::Cell> cell_ref, int indent = 0) const {
+    return print_ref(os, std::move(cell_ref), indent, rec_limit);
   }
-  bool print_ref(std::ostream& os, Ref<vm::Cell> cell_ref, int indent = 0) const;
   std::string as_string_skip(vm::CellSlice& cs, int indent = 0) const;
   std::string as_string(const vm::CellSlice& cs, int indent = 0) const;
   std::string as_string(Ref<vm::CellSlice> cs_ref, int indent = 0) const {
     return cs_ref.not_null() ? as_string(*cs_ref, indent) : "<null>";
   }
   std::string as_string_ref(Ref<vm::Cell> cell_ref, int indent = 0) const;
+  static inline size_t nat_abs(int x) {
+    return (x > 1) * 2 + (x & 1);
+  }
 
  protected:
-  bool validate_ref_internal(Ref<vm::Cell> cell_ref, bool weak = false) const;
+  bool validate_ref_internal(int* ops, Ref<vm::Cell> cell_ref, bool weak = false) const;
 };
 
 static inline std::ostream& operator<<(std::ostream& os, const TLB& type) {
@@ -229,29 +269,29 @@ static inline std::ostream& operator<<(std::ostream& os, const TLB& type) {
 
 struct TLB_Complex : TLB {
   bool skip(vm::CellSlice& cs) const override {
-    return validate_skip(cs);
+    return validate_skip(nullptr, cs);
   }
-  bool validate_skip(vm::CellSlice& cs, bool weak = false) const override = 0;
+  bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override = 0;
   int get_size(const vm::CellSlice& cs) const override {
     return get_size_by_skip(cs);
   }
-  bool validate(const vm::CellSlice& cs, bool weak = false) const override {
-    return validate_by_skip(cs, weak);
+  bool validate(int* ops, const vm::CellSlice& cs, bool weak = false) const override {
+    return validate_by_skip(ops, cs, weak);
   }
-  bool validate_exact(const vm::CellSlice& cs, bool weak = false) const override {
-    return validate_by_skip_exact(cs, weak);
+  bool validate_exact(int* ops, const vm::CellSlice& cs, bool weak = false) const override {
+    return validate_by_skip_exact(ops, cs, weak);
   }
   bool extract(vm::CellSlice& cs) const override {
     return extract_by_skip(cs);
   }
-  bool validate_extract(vm::CellSlice& cs, bool weak = false) const override {
-    return validate_extract_by_skip(cs, weak);
+  bool validate_extract(int* ops, vm::CellSlice& cs, bool weak = false) const override {
+    return validate_extract_by_skip(ops, cs, weak);
   }
-  Ref<vm::CellSlice> validate_fetch(vm::CellSlice& cs, bool weak = false) const override {
-    return validate_fetch_by_skip(cs, weak);
+  Ref<vm::CellSlice> validate_fetch(int* ops, vm::CellSlice& cs, bool weak = false) const override {
+    return validate_fetch_by_skip(ops, cs, weak);
   }
-  Ref<vm::CellSlice> validate_prefetch(const vm::CellSlice& cs, bool weak = false) const override {
-    return validate_prefetch_by_skip(cs, weak);
+  Ref<vm::CellSlice> validate_prefetch(int* ops, const vm::CellSlice& cs, bool weak = false) const override {
+    return validate_prefetch_by_skip(ops, cs, weak);
   }
   td::RefInt256 as_integer(const vm::CellSlice& cs) const override {
     vm::CellSlice copy{cs};
@@ -264,6 +304,30 @@ struct TLB_Complex : TLB {
   }
 };
 
+class TlbTypeHolder : public td::CntObject {
+  const TLB* type{nullptr};
+  char* data{nullptr};
+
+ public:
+  TlbTypeHolder() = default;
+  TlbTypeHolder(const TLB* _type) : type(_type), data(nullptr) {
+  }
+  TlbTypeHolder(const TLB* _type, char* _data) : type(_type), data(_data) {
+  }
+  ~TlbTypeHolder() override {
+    free(data);
+  }
+  const TLB* get() const {
+    return type;
+  }
+  const TLB& operator*() const {
+    return *type;
+  }
+  const TLB* operator->() const {
+    return type;
+  }
+};
+
 static inline bool add_chk(int x, int y, int z) {
   return x + y == z && z >= 0;
 }
@@ -427,15 +491,20 @@ bool store_from(vm::CellBuilder& cb, const T& tlb_type, Ref<vm::CellSlice> field
 namespace tlb {
 
 struct PrettyPrinter {
+  enum { default_print_limit = 4096 };
   std::ostream& os;
   int indent;
   int level;
   bool failed;
   bool nl_used;
   int mode;
+  int limit{default_print_limit};
   PrettyPrinter(std::ostream& _os, int _indent = 0, int _mode = 1)
       : os(_os), indent(_indent), level(0), failed(false), nl_used(false), mode(_mode) {
   }
+  PrettyPrinter(int _limit, std::ostream& _os, int _indent = 0, int _mode = 1)
+      : os(_os), indent(_indent), level(0), failed(false), nl_used(false), mode(_mode), limit(_limit) {
+  }
   ~PrettyPrinter();
   bool ok() const {
     return !failed && !level;
@@ -460,6 +529,14 @@ struct PrettyPrinter {
   bool field_int(long long value, std::string name);
   bool field_uint(unsigned long long value);
   bool field_uint(unsigned long long value, std::string name);
+  bool register_recursive_call() {
+    return limit--;
+  }
+  void set_limit(int new_limit) {
+    if (new_limit > 0) {
+      limit = new_limit;
+    }
+  }
   bool out(std::string str) {
     os << str;
     return true;
@@ -504,6 +581,25 @@ struct PrettyPrinter {
 
 namespace tlb {
 
+class TypenameLookup {
+  std::map<std::string, const TLB*> types;
+
+ public:
+  typedef std::function<bool(const char*, const TLB*)> simple_register_func_t;
+  typedef std::function<bool(simple_register_func_t)> register_func_t;
+  TypenameLookup() = default;
+  TypenameLookup(register_func_t func) {
+    register_types(func);
+  }
+  bool register_type(const char* name, const TLB* tp);
+  bool register_types(register_func_t func);
+  const TLB* lookup(std::string str) const;
+};
+
+}  // namespace tlb
+
+namespace tlb {
+
 struct False final : TLB {
   int get_size(const vm::CellSlice& cs) const override {
     return -1;
@@ -554,23 +650,23 @@ struct FwdT final : TLB {
   bool skip(vm::CellSlice& cs) const override {
     return X.skip(cs);
   }
-  bool validate(const vm::CellSlice& cs, bool weak = false) const override {
-    return X.validate(cs, weak);
+  bool validate(int* ops, const vm::CellSlice& cs, bool weak = false) const override {
+    return X.validate(ops, cs, weak);
   }
-  Ref<vm::CellSlice> validate_fetch(vm::CellSlice& cs, bool weak = false) const override {
-    return X.validate_fetch(cs, weak);
+  Ref<vm::CellSlice> validate_fetch(int* ops, vm::CellSlice& cs, bool weak = false) const override {
+    return X.validate_fetch(ops, cs, weak);
   }
-  Ref<vm::CellSlice> validate_prefetch(const vm::CellSlice& cs, bool weak = false) const override {
-    return X.validate_prefetch(cs, weak);
+  Ref<vm::CellSlice> validate_prefetch(int* ops, const vm::CellSlice& cs, bool weak = false) const override {
+    return X.validate_prefetch(ops, cs, weak);
   }
   bool extract(vm::CellSlice& cs) const override {
     return X.extract(cs);
   }
-  bool validate_extract(vm::CellSlice& cs, bool weak = false) const override {
-    return X.validate_extract(cs, weak);
+  bool validate_extract(int* ops, vm::CellSlice& cs, bool weak = false) const override {
+    return X.validate_extract(ops, cs, weak);
   }
-  bool validate_skip(vm::CellSlice& cs, bool weak = false) const override {
-    return X.validate_skip(cs, weak);
+  bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override {
+    return X.validate_skip(ops, cs, weak);
   }
   bool skip_copy(vm::CellBuilder& cb, vm::CellSlice& cs) const override {
     return X.skip_copy(cb, cs);
@@ -665,10 +761,10 @@ struct NatLess final : TLB {
   int get_size(const vm::CellSlice& cs) const override {
     return n >= 0 ? w : -1;
   }
-  bool validate(const vm::CellSlice& cs, bool weak = false) const override {
+  bool validate(int* ops, const vm::CellSlice& cs, bool weak = false) const override {
     return n >= 0 && (unsigned)cs.prefetch_ulong(w) <= (unsigned)n;
   }
-  bool validate_skip(vm::CellSlice& cs, bool weak = false) const override {
+  bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override {
     return n >= 0 && (unsigned)cs.fetch_ulong(w) <= (unsigned)n;
   }
   unsigned long long as_uint(const vm::CellSlice& cs) const override {
@@ -688,10 +784,10 @@ struct NatLeq final : TLB {
   int get_size(const vm::CellSlice& cs) const override {
     return n >= 0 ? w : -1;
   }
-  bool validate(const vm::CellSlice& cs, bool weak = false) const override {
+  bool validate(int* ops, const vm::CellSlice& cs, bool weak = false) const override {
     return n >= 0 && (unsigned)cs.prefetch_ulong(w) <= (unsigned)n;
   }
-  bool validate_skip(vm::CellSlice& cs, bool weak = false) const override {
+  bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override {
     return n >= 0 && (unsigned)cs.fetch_ulong(w) <= (unsigned)n;
   }
   unsigned long long as_uint(const vm::CellSlice& cs) const override {
@@ -710,7 +806,7 @@ struct TupleT final : TLB_Complex {
   TupleT(int _n, const TLB& _X) : n(_n), X(_X) {
   }
   bool skip(vm::CellSlice& cs) const override;
-  bool validate_skip(vm::CellSlice& cs, bool weak = false) const override;
+  bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override;
   int get_tag(const vm::CellSlice& cs) const override {
     return 0;
   }
@@ -725,8 +821,8 @@ struct CondT final : TLB_Complex {
   bool skip(vm::CellSlice& cs) const override {
     return !n || X.skip(cs);
   }
-  bool validate_skip(vm::CellSlice& cs, bool weak = false) const override {
-    return !n || (n > 0 && X.validate_skip(cs, weak));
+  bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override {
+    return !n || (n > 0 && X.validate_skip(ops, cs, weak));
   }
   int get_tag(const vm::CellSlice& cs) const override {
     return 0;
@@ -747,8 +843,8 @@ struct Cond final : TLB_Complex {
   bool skip(vm::CellSlice& cs) const override {
     return !n || field_type.skip(cs);
   }
-  bool validate_skip(vm::CellSlice& cs, bool weak = false) const override {
-    return !n || (n > 0 && field_type.validate_skip(cs, weak));
+  bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override {
+    return !n || (n > 0 && field_type.validate_skip(ops, cs, weak));
   }
   int get_tag(const vm::CellSlice& cs) const override {
     return 0;
@@ -844,7 +940,7 @@ struct Maybe : TLB_Complex {
   Maybe(Args... args) : field_type(args...) {
   }
   bool skip(vm::CellSlice& cs) const override;
-  bool validate_skip(vm::CellSlice& cs, bool weak = false) const override;
+  bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override;
   int get_tag(const vm::CellSlice& cs) const override {
     return cs.have(1) ? (int)cs.prefetch_ulong(1) : -1;
   }
@@ -867,10 +963,10 @@ bool Maybe<T>::skip(vm::CellSlice& cs) const {
 }
 
 template <class T>
-bool Maybe<T>::validate_skip(vm::CellSlice& cs, bool weak) const {
+bool Maybe<T>::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const {
   int t = get_tag(cs);
   if (t > 0) {
-    return cs.advance(1) && field_type.validate_skip(cs, weak);
+    return cs.advance(1) && field_type.validate_skip(ops, cs, weak);
   } else if (!t) {
     return cs.advance(1);
   } else {
@@ -918,11 +1014,11 @@ struct RefTo final : TLB {
   int get_size(const vm::CellSlice& cs) const override {
     return 0x10000;
   }
-  bool validate(const vm::CellSlice& cs, bool weak = false) const override {
-    return cs.size_refs() ? ref_type.validate_ref(cs.prefetch_ref(), weak) : false;
+  bool validate(int* ops, const vm::CellSlice& cs, bool weak = false) const override {
+    return cs.size_refs() ? ref_type.validate_ref(ops, cs.prefetch_ref(), weak) : false;
   }
-  bool validate_skip(vm::CellSlice& cs, bool weak = false) const override {
-    return ref_type.validate_skip_ref(cs, weak);
+  bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override {
+    return ref_type.validate_skip_ref(ops, cs, weak);
   }
   std::ostream& print_type(std::ostream& os) const override {
     return os << '^' << ref_type;
@@ -939,11 +1035,11 @@ struct RefT final : TLB {
   int get_size(const vm::CellSlice& cs) const override {
     return 0x10000;
   }
-  bool validate(const vm::CellSlice& cs, bool weak = false) const override {
-    return X.validate_ref(cs.prefetch_ref(), weak);
+  bool validate(int* ops, const vm::CellSlice& cs, bool weak = false) const override {
+    return X.validate_ref(ops, cs.prefetch_ref(), weak);
   }
-  bool validate_skip(vm::CellSlice& cs, bool weak = false) const override {
-    return X.validate_skip_ref(cs, weak);
+  bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override {
+    return X.validate_skip_ref(ops, cs, weak);
   }
   std::ostream& print_type(std::ostream& os) const override {
     return os << '^' << X;
@@ -960,9 +1056,10 @@ struct Either final : TLB_Complex {
   bool skip(vm::CellSlice& cs) const override {
     return cs.have(1) ? (cs.fetch_ulong(1) ? right_type.skip(cs) : left_type.skip(cs)) : false;
   }
-  bool validate_skip(vm::CellSlice& cs, bool weak = false) const override {
-    return cs.have(1) ? (cs.fetch_ulong(1) ? right_type.validate_skip(cs, weak) : left_type.validate_skip(cs, weak))
-                      : false;
+  bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override {
+    return cs.have(1)
+               ? (cs.fetch_ulong(1) ? right_type.validate_skip(ops, cs, weak) : left_type.validate_skip(ops, cs, weak))
+               : false;
   }
   int get_tag(const vm::CellSlice& cs) const override {
     return (int)cs.prefetch_ulong(1);
diff --git a/submodules/ton/tonlib-src/crypto/vm/arithops.cpp b/submodules/ton/tonlib-src/crypto/vm/arithops.cpp
index 19279cf167..25b6735386 100644
--- a/submodules/ton/tonlib-src/crypto/vm/arithops.cpp
+++ b/submodules/ton/tonlib-src/crypto/vm/arithops.cpp
@@ -14,15 +14,15 @@
     You should have received a copy of the GNU Lesser General Public License
     along with TON Blockchain Library.  If not, see <http://www.gnu.org/licenses/>.
 
-    Copyright 2017-2019 Telegram Systems LLP
+    Copyright 2017-2020 Telegram Systems LLP
 */
 #include <functional>
 #include "vm/arithops.h"
 #include "vm/log.h"
 #include "vm/opctable.h"
 #include "vm/stack.hpp"
-#include "vm/continuation.h"
 #include "vm/excno.hpp"
+#include "vm/vm.h"
 #include "common/bigint.hpp"
 #include "common/refint.h"
 
@@ -389,7 +389,7 @@ int exec_muldivmod(VmState* st, unsigned args, int quiet) {
   auto x = stack.pop_int();
   typename td::BigInt256::DoubleInt tmp{0};
   tmp.add_mul(*x, *y);
-  auto q = td::RefInt256{true};
+  auto q = td::make_refint();
   tmp.mod_div(*z, q.unique_write(), round_mode);
   switch ((args >> 2) & 3) {
     case 1:
@@ -401,7 +401,7 @@ int exec_muldivmod(VmState* st, unsigned args, int quiet) {
       stack.push_int_quiet(std::move(q), quiet);
       // fallthrough
     case 2:
-      stack.push_int_quiet(td::RefInt256{true, tmp}, quiet);
+      stack.push_int_quiet(td::make_refint(tmp), quiet);
       break;
   }
   return 0;
@@ -450,17 +450,17 @@ int exec_mulshrmod(VmState* st, unsigned args, int mode) {
   switch ((args >> 2) & 3) {
     case 1:
       tmp.rshift(z, round_mode).normalize();
-      stack.push_int_quiet(td::RefInt256{true, tmp}, mode & 1);
+      stack.push_int_quiet(td::make_refint(tmp), mode & 1);
       break;
     case 3: {
       typename td::BigInt256::DoubleInt tmp2{tmp};
       tmp2.rshift(z, round_mode).normalize();
-      stack.push_int_quiet(td::RefInt256{true, tmp2}, mode & 1);
+      stack.push_int_quiet(td::make_refint(tmp2), mode & 1);
     }
       // fallthrough
     case 2:
       tmp.mod_pow2(z, round_mode).normalize();
-      stack.push_int_quiet(td::RefInt256{true, tmp}, mode & 1);
+      stack.push_int_quiet(td::make_refint(tmp), mode & 1);
       break;
   }
   return 0;
@@ -524,24 +524,24 @@ int exec_shldivmod(VmState* st, unsigned args, int mode) {
   tmp <<= y;
   switch ((args >> 2) & 3) {
     case 1: {
-      auto q = td::RefInt256{true};
+      auto q = td::make_refint();
       tmp.mod_div(*z, q.unique_write(), round_mode);
       q.unique_write().normalize();
       stack.push_int_quiet(std::move(q), mode & 1);
       break;
     }
     case 3: {
-      auto q = td::RefInt256{true};
+      auto q = td::make_refint();
       tmp.mod_div(*z, q.unique_write(), round_mode);
       q.unique_write().normalize();
       stack.push_int_quiet(std::move(q), mode & 1);
-      stack.push_int_quiet(td::RefInt256{true, tmp}, mode & 1);
+      stack.push_int_quiet(td::make_refint(tmp), mode & 1);
       break;
     }
     case 2: {
       typename td::BigInt256::DoubleInt tmp2;
       tmp.mod_div(*z, tmp2, round_mode);
-      stack.push_int_quiet(td::RefInt256{true, tmp}, mode & 1);
+      stack.push_int_quiet(td::make_refint(tmp), mode & 1);
       break;
     }
   }
@@ -740,7 +740,7 @@ int exec_bitsize(VmState* st, bool sgnd, bool quiet) {
   } else if (!quiet) {
     throw VmError{Excno::range_chk, "CHKSIZE for negative integer"};
   } else {
-    stack.push_int_quiet(td::RefInt256{true}, quiet);
+    stack.push_int_quiet(td::make_refint(), quiet);
   }
   return 0;
 }
diff --git a/submodules/ton/tonlib-src/crypto/vm/cellops.cpp b/submodules/ton/tonlib-src/crypto/vm/cellops.cpp
index 5346e16851..cc1102846e 100644
--- a/submodules/ton/tonlib-src/crypto/vm/cellops.cpp
+++ b/submodules/ton/tonlib-src/crypto/vm/cellops.cpp
@@ -14,16 +14,16 @@
     You should have received a copy of the GNU Lesser General Public License
     along with TON Blockchain Library.  If not, see <http://www.gnu.org/licenses/>.
 
-    Copyright 2017-2019 Telegram Systems LLP
+    Copyright 2017-2020 Telegram Systems LLP
 */
 #include <functional>
 #include "vm/cellops.h"
 #include "vm/log.h"
 #include "vm/opctable.h"
 #include "vm/stack.hpp"
-#include "vm/continuation.h"
 #include "vm/excno.hpp"
 #include "vm/vmstate.h"
+#include "vm/vm.h"
 #include "common/bigint.hpp"
 #include "common/refint.h"
 
@@ -814,6 +814,9 @@ void register_cell_serialize_ops(OpcodeTable& cp0) {
                                       compute_len_store_const_ref))
       .insert(OpcodeInstr::mksimple(0xcf23, 16, "ENDXC", exec_builder_to_special_cell))
       .insert(OpcodeInstr::mkfixed(0xcf28 >> 2, 14, 2, dump_store_le_int, exec_store_le_int))
+      .insert(OpcodeInstr::mksimple(
+          0xcf30, 16, "BDEPTH",
+          std::bind(exec_int_builder_func, _1, "BDEPTH", [](Ref<CellBuilder> b) { return b->get_depth(); })))
       .insert(OpcodeInstr::mksimple(
           0xcf31, 16, "BBITS",
           std::bind(exec_int_builder_func, _1, "BBITS", [](Ref<CellBuilder> b) { return b->size(); })))
@@ -1321,6 +1324,22 @@ int exec_load_same(VmState* st, const char* name, int x) {
   return 0;
 }
 
+int exec_cell_depth(VmState* st) {
+  Stack& stack = st->get_stack();
+  VM_LOG(st) << "execute CDEPTH";
+  auto cell = stack.pop_maybe_cell();
+  stack.push_smallint(cell.not_null() ? cell->get_depth() : 0);
+  return 0;
+}
+
+int exec_slice_depth(VmState* st) {
+  Stack& stack = st->get_stack();
+  VM_LOG(st) << "execute SDEPTH";
+  auto cs = stack.pop_cellslice();
+  stack.push_smallint(cs->get_depth());
+  return 0;
+}
+
 void register_cell_deserialize_ops(OpcodeTable& cp0) {
   using namespace std::placeholders;
   cp0.insert(OpcodeInstr::mksimple(0xd0, 8, "CTOS", exec_cell_to_slice))
@@ -1407,7 +1426,9 @@ void register_cell_deserialize_ops(OpcodeTable& cp0) {
       .insert(OpcodeInstr::mkfixed(0xd75, 12, 4, dump_load_le_int, exec_load_le_int))
       .insert(OpcodeInstr::mksimple(0xd760, 16, "LDZEROES", std::bind(exec_load_same, _1, "LDZEROES", 0)))
       .insert(OpcodeInstr::mksimple(0xd761, 16, "LDONES", std::bind(exec_load_same, _1, "LDONES", 1)))
-      .insert(OpcodeInstr::mksimple(0xd762, 16, "LDSAME", std::bind(exec_load_same, _1, "LDSAME", -1)));
+      .insert(OpcodeInstr::mksimple(0xd762, 16, "LDSAME", std::bind(exec_load_same, _1, "LDSAME", -1)))
+      .insert(OpcodeInstr::mksimple(0xd764, 16, "SDEPTH", exec_slice_depth))
+      .insert(OpcodeInstr::mksimple(0xd765, 16, "CDEPTH", exec_cell_depth));
 }
 
 void register_cell_ops(OpcodeTable& cp0) {
diff --git a/submodules/ton/tonlib-src/crypto/vm/cells/CellBuilder.cpp b/submodules/ton/tonlib-src/crypto/vm/cells/CellBuilder.cpp
index 223959bdc4..1c3fcdef8a 100644
--- a/submodules/ton/tonlib-src/crypto/vm/cells/CellBuilder.cpp
+++ b/submodules/ton/tonlib-src/crypto/vm/cells/CellBuilder.cpp
@@ -14,7 +14,7 @@
     You should have received a copy of the GNU Lesser General Public License
     along with TON Blockchain Library.  If not, see <http://www.gnu.org/licenses/>.
 
-    Copyright 2017-2019 Telegram Systems LLP
+    Copyright 2017-2020 Telegram Systems LLP
 */
 #include "vm/cells/CellBuilder.h"
 
@@ -52,18 +52,26 @@ Ref<DataCell> CellBuilder::finalize_copy(bool special) const {
   }
   auto res = DataCell::create(data, size(), td::span(refs.data(), size_refs()), special);
   if (res.is_error()) {
-    LOG(ERROR) << res.error();
+    LOG(DEBUG) << res.error();
     throw CellWriteError{};
   }
-  CHECK(res.ok().not_null());
-  return res.move_as_ok();
+  auto cell = res.move_as_ok();
+  CHECK(cell.not_null());
+  if (vm_state_interface) {
+    vm_state_interface->register_new_cell(cell);
+    if (cell.is_null()) {
+      LOG(DEBUG) << "cannot register new data cell";
+      throw CellWriteError{};
+    }
+  }
+  return cell;
 }
 
 Ref<DataCell> CellBuilder::finalize_novm(bool special) {
   auto res = DataCell::create(data, size(), td::mutable_span(refs.data(), size_refs()), special);
   bits = refs_cnt = 0;
   if (res.is_error()) {
-    LOG(ERROR) << res.error();
+    LOG(DEBUG) << res.error();
     throw CellWriteError{};
   }
   CHECK(res.ok().not_null());
@@ -72,10 +80,17 @@ Ref<DataCell> CellBuilder::finalize_novm(bool special) {
 
 Ref<DataCell> CellBuilder::finalize(bool special) {
   auto* vm_state_interface = VmStateInterface::get();
-  if (vm_state_interface) {
-    vm_state_interface->register_cell_create();
+  if (!vm_state_interface) {
+    return finalize_novm(special);
   }
-  return finalize_novm(special);
+  vm_state_interface->register_cell_create();
+  auto cell = finalize_novm(special);
+  vm_state_interface->register_new_cell(cell);
+  if (cell.is_null()) {
+    LOG(DEBUG) << "cannot register new data cell";
+    throw CellWriteError{};
+  }
+  return cell;
 }
 
 Ref<Cell> CellBuilder::create_pruned_branch(Ref<Cell> cell, td::uint32 new_level, td::uint32 virt_level) {
@@ -87,6 +102,7 @@ Ref<Cell> CellBuilder::create_pruned_branch(Ref<Cell> cell, td::uint32 new_level
   }
   return do_create_pruned_branch(std::move(cell), new_level, virt_level);
 }
+
 Ref<DataCell> CellBuilder::do_create_pruned_branch(Ref<Cell> cell, td::uint32 new_level, td::uint32 virt_level) {
   auto level_mask = cell->get_level_mask().apply(virt_level);
   auto level = level_mask.get_level();
@@ -371,6 +387,14 @@ CellBuilder& CellBuilder::store_ref(Ref<Cell> ref) {
   return ensure_pass(store_ref_bool(std::move(ref)));
 }
 
+td::uint16 CellBuilder::get_depth() const {
+  int d = 0;
+  for (unsigned i = 0; i < refs_cnt; i++) {
+    d = std::max(d, 1 + refs[i]->get_depth());
+  }
+  return static_cast<td::uint16>(d);
+}
+
 bool CellBuilder::append_data_cell_bool(const DataCell& cell) {
   unsigned len = cell.size();
   if (can_extend_by(len, cell.size_refs())) {
@@ -460,6 +484,16 @@ bool CellBuilder::append_cellslice_chk(Ref<CellSlice> cs_ref, unsigned size_ext)
   return cs_ref.not_null() && append_cellslice_chk(*cs_ref, size_ext);
 }
 
+CellSlice CellSlice::clone() const {
+  CellBuilder cb;
+  Ref<Cell> cell;
+  if (cb.append_cellslice_bool(*this) && cb.finalize_to(cell)) {
+    return CellSlice{NoVmOrd(), std::move(cell)};
+  } else {
+    return {};
+  }
+}
+
 bool CellBuilder::append_bitstring(const td::BitString& bs) {
   return store_bits_bool(bs.cbits(), bs.size());
 }
@@ -536,11 +570,11 @@ CellBuilder* CellBuilder::make_copy() const {
   return c;
 }
 
-CellSlice CellBuilder::as_cellslice() const& {
+CellSlice CellBuilder::as_cellslice() const & {
   return CellSlice{finalize_copy()};
 }
 
-Ref<CellSlice> CellBuilder::as_cellslice_ref() const& {
+Ref<CellSlice> CellBuilder::as_cellslice_ref() const & {
   return Ref<CellSlice>{true, finalize_copy()};
 }
 
diff --git a/submodules/ton/tonlib-src/crypto/vm/cells/CellBuilder.h b/submodules/ton/tonlib-src/crypto/vm/cells/CellBuilder.h
index 0095018e44..bcd2434ecf 100644
--- a/submodules/ton/tonlib-src/crypto/vm/cells/CellBuilder.h
+++ b/submodules/ton/tonlib-src/crypto/vm/cells/CellBuilder.h
@@ -14,7 +14,7 @@
     You should have received a copy of the GNU Lesser General Public License
     along with TON Blockchain Library.  If not, see <http://www.gnu.org/licenses/>.
 
-    Copyright 2017-2019 Telegram Systems LLP
+    Copyright 2017-2020 Telegram Systems LLP
 */
 #pragma once
 #include "vm/cells/DataCell.h"
@@ -78,6 +78,7 @@ class CellBuilder : public td::CntObject {
   const unsigned char* get_data() const {
     return data;
   }
+  td::uint16 get_depth() const;
   td::ConstBitPtr data_bits() const {
     return data;
   }
@@ -85,6 +86,10 @@ class CellBuilder : public td::CntObject {
     return idx < refs_cnt ? refs[idx] : Ref<Cell>{};
   }
   void reset();
+  bool reset_bool() {
+    reset();
+    return true;
+  }
   CellBuilder& operator=(const CellBuilder&);
   CellBuilder& operator=(CellBuilder&&);
   CellBuilder& store_bytes(const char* str, std::size_t len);
diff --git a/submodules/ton/tonlib-src/crypto/vm/cells/CellSlice.cpp b/submodules/ton/tonlib-src/crypto/vm/cells/CellSlice.cpp
index bb550a6969..0d539c74e6 100644
--- a/submodules/ton/tonlib-src/crypto/vm/cells/CellSlice.cpp
+++ b/submodules/ton/tonlib-src/crypto/vm/cells/CellSlice.cpp
@@ -14,7 +14,7 @@
     You should have received a copy of the GNU Lesser General Public License
     along with TON Blockchain Library.  If not, see <http://www.gnu.org/licenses/>.
 
-    Copyright 2017-2019 Telegram Systems LLP
+    Copyright 2017-2020 Telegram Systems LLP
 */
 #include "vm/cells/CellSlice.h"
 #include "vm/excno.hpp"
@@ -218,6 +218,17 @@ unsigned CellSlice::get_level() const {
   return l;
 }
 
+Ref<Cell> CellSlice::get_base_cell() const {
+  if (cell.is_null()) {
+    return {};
+  }
+  auto res = cell->virtualize(virt);
+  if (!tree_node.empty()) {
+    res = UsageCell::create(std::move(res), tree_node);
+  }
+  return res;
+}
+
 bool CellSlice::advance(unsigned bits) {
   if (have(bits)) {
     bits_st += bits;
@@ -583,8 +594,7 @@ td::RefInt256 CellSlice::fetch_int256(unsigned bits, bool sgnd) {
   if (!have(bits)) {
     return {};
   } else if (bits < td::BigInt256::word_shift) {
-    long long val = sgnd ? fetch_long(bits) : fetch_ulong(bits);
-    return td::RefInt256{true, val};
+    return td::make_refint(sgnd ? fetch_long(bits) : fetch_ulong(bits));
   } else {
     td::RefInt256 res{true};
     res.unique_write().import_bits(data_bits(), bits, sgnd);
@@ -597,8 +607,7 @@ td::RefInt256 CellSlice::prefetch_int256(unsigned bits, bool sgnd) const {
   if (!have(bits)) {
     return {};
   } else if (bits < td::BigInt256::word_shift) {
-    long long val = sgnd ? prefetch_long(bits) : prefetch_ulong(bits);
-    return td::RefInt256{true, val};
+    return td::make_refint(sgnd ? prefetch_long(bits) : prefetch_ulong(bits));
   } else {
     td::RefInt256 res{true};
     res.unique_write().import_bits(data_bits(), bits, sgnd);
@@ -608,15 +617,15 @@ td::RefInt256 CellSlice::prefetch_int256(unsigned bits, bool sgnd) const {
 
 td::RefInt256 CellSlice::prefetch_int256_zeroext(unsigned bits, bool sgnd) const {
   if (bits > 256u + sgnd) {
-    return td::RefInt256{false};
+    return td::make_refint();
   } else {
     unsigned ld_bits = std::min(bits, size());
     if (bits < td::BigInt256::word_shift) {
       long long val = sgnd ? prefetch_long(ld_bits) : prefetch_ulong(ld_bits);
       val <<= bits - ld_bits;
-      return td::RefInt256{true, val};
+      return td::make_refint(val);
     } else {
-      td::RefInt256 res{true};
+      auto res = td::make_refint();
       res.unique_write().import_bits(data_bits(), ld_bits, sgnd);
       res <<= bits - ld_bits;
       return res;
@@ -765,6 +774,14 @@ bool CellSlice::fetch_maybe_ref(Ref<vm::Cell>& res) {
   }
 }
 
+td::uint16 CellSlice::get_depth() const {
+  int d = 0;
+  for (unsigned i = 0; i < size_refs(); ++i) {
+    d = std::max(d, prefetch_ref(i)->get_depth() + 1);
+  }
+  return static_cast<td::uint16>(d);
+}
+
 bool CellSlice::begins_with(unsigned bits, unsigned long long value) const {
   return have(bits) && !((prefetch_ulong(bits) ^ value) & ((1ULL << bits) - 1));
 }
@@ -969,13 +986,18 @@ void CellSlice::dump_hex(std::ostream& os, int mode, bool endl) const {
   }
 }
 
-void CellSlice::print_rec(std::ostream& os, int indent) const {
+bool CellSlice::print_rec(std::ostream& os, int* limit, int indent) const {
   for (int i = 0; i < indent; i++) {
     os << ' ';
   }
+  if (!limit || *limit <= 0) {
+    os << "<cell output limit reached>" << std::endl;
+    return false;
+  }
+  --*limit;
   if (cell.is_null()) {
     os << "NULL" << std::endl;
-    return;
+    return true;
   }
   if (is_special()) {
     os << "SPECIAL ";
@@ -983,8 +1005,20 @@ void CellSlice::print_rec(std::ostream& os, int indent) const {
   os << "x{" << as_bitslice().to_hex() << '}' << std::endl;
   for (unsigned i = 0; i < size_refs(); i++) {
     CellSlice cs{NoVm(), prefetch_ref(i)};
-    cs.print_rec(os, indent + 1);
+    if (!cs.print_rec(os, limit, indent + 1)) {
+      return false;
+    }
   }
+  return true;
+}
+
+bool CellSlice::print_rec(std::ostream& os, int indent) const {
+  int limit = default_recursive_print_limit;
+  return print_rec(os, &limit, indent);
+}
+
+bool CellSlice::print_rec(int limit, std::ostream& os, int indent) const {
+  return print_rec(os, &limit, indent);
 }
 
 td::StringBuilder& operator<<(td::StringBuilder& sb, const CellSlice& cs) {
@@ -1015,7 +1049,7 @@ std::ostream& operator<<(std::ostream& os, Ref<CellSlice> cs_ref) {
 VirtualCell::LoadedCell load_cell_slice_impl(const Ref<Cell>& cell, bool* can_be_special) {
   auto* vm_state_interface = VmStateInterface::get();
   if (vm_state_interface) {
-    vm_state_interface->register_cell_load();
+    vm_state_interface->register_cell_load(cell->get_hash());
   }
   auto r_loaded_cell = cell->load_cell();
   if (r_loaded_cell.is_error()) {
diff --git a/submodules/ton/tonlib-src/crypto/vm/cells/CellSlice.h b/submodules/ton/tonlib-src/crypto/vm/cells/CellSlice.h
index 433344f982..a2e528d685 100644
--- a/submodules/ton/tonlib-src/crypto/vm/cells/CellSlice.h
+++ b/submodules/ton/tonlib-src/crypto/vm/cells/CellSlice.h
@@ -14,7 +14,7 @@
     You should have received a copy of the GNU Lesser General Public License
     along with TON Blockchain Library.  If not, see <http://www.gnu.org/licenses/>.
 
-    Copyright 2017-2019 Telegram Systems LLP
+    Copyright 2017-2020 Telegram Systems LLP
 */
 #pragma once
 
@@ -44,6 +44,7 @@ class CellSlice : public td::CntObject {
  public:
   static constexpr long long fetch_long_eof = (static_cast<unsigned long long>(-1LL) << 63);
   static constexpr unsigned long long fetch_ulong_eof = (unsigned long long)-1LL;
+  enum { default_recursive_print_limit = 100 };
   struct CellReadError {};
 
   CellSlice(NoVm, Ref<Cell> cell_ref);
@@ -129,6 +130,7 @@ class CellSlice : public td::CntObject {
   const unsigned char* data() const {
     return cell->get_data();
   }
+  td::uint16 get_depth() const;
   td::ConstBitPtr data_bits() const {
     return td::ConstBitPtr{data(), (int)cur_pos()};
   }
@@ -137,6 +139,7 @@ class CellSlice : public td::CntObject {
   }
   unsigned get_cell_level() const;
   unsigned get_level() const;
+  Ref<Cell> get_base_cell() const;  // be careful with this one!
   int fetch_octet();
   int prefetch_octet() const;
   unsigned long long prefetch_ulong_top(unsigned& bits) const;
@@ -251,7 +254,9 @@ class CellSlice : public td::CntObject {
   bool contents_equal(const CellSlice& cs2) const;
   void dump(std::ostream& os, int level = 0, bool endl = true) const;
   void dump_hex(std::ostream& os, int mode = 0, bool endl = false) const;
-  void print_rec(std::ostream& os, int indent = 0) const;
+  bool print_rec(std::ostream& os, int indent = 0) const;
+  bool print_rec(std::ostream& os, int* limit, int indent = 0) const;
+  bool print_rec(int limit, std::ostream& os, int indent = 0) const;
   void error() const {
     throw CellReadError{};
   }
@@ -274,6 +279,7 @@ class CellSlice : public td::CntObject {
     offs = std::min(offs, size());
     return CellSlice{*this, size() - offs, size_refs(), offs, 0};
   }
+  CellSlice clone() const;
 
  private:
   void init_bits_refs();
diff --git a/submodules/ton/tonlib-src/crypto/vm/cells/CellString.cpp b/submodules/ton/tonlib-src/crypto/vm/cells/CellString.cpp
index ad2cbf5f8f..9889dc8e2b 100644
--- a/submodules/ton/tonlib-src/crypto/vm/cells/CellString.cpp
+++ b/submodules/ton/tonlib-src/crypto/vm/cells/CellString.cpp
@@ -1,3 +1,21 @@
+/*
+    This file is part of TON Blockchain Library.
+
+    TON Blockchain Library is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Lesser General Public License as published by
+    the Free Software Foundation, either version 2 of the License, or
+    (at your option) any later version.
+
+    TON Blockchain Library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public License
+    along with TON Blockchain Library.  If not, see <http://www.gnu.org/licenses/>.
+
+    Copyright 2019-2020 Telegram Systems LLP
+*/
 #include "CellString.h"
 #include "td/utils/misc.h"
 
@@ -61,4 +79,79 @@ td::Result<td::string> CellString::load(CellSlice &cs, unsigned int top_bits) {
   CHECK(to.offs == (int)size);
   return res;
 }
+
+td::Status CellText::store(CellBuilder &cb, td::Slice slice, unsigned int top_bits) {
+  td::uint32 size = td::narrow_cast<td::uint32>(slice.size() * 8);
+  return store(cb, td::BitSlice(slice.ubegin(), size), top_bits);
+}
+
+td::Status CellText::store(CellBuilder &cb, td::BitSlice slice, unsigned int top_bits) {
+  if (slice.size() > max_bytes * 8) {
+    return td::Status::Error("String is too long (1)");
+  }
+  if (cb.remaining_bits() < 16) {
+    return td::Status::Error("Not enough space in a builder");
+  }
+  if (top_bits < 16) {
+    return td::Status::Error("Need at least 16 top bits");
+  }
+  if (slice.size() == 0) {
+    cb.store_long(0, 8);
+    return td::Status::OK();
+  }
+  unsigned int head = td::min(slice.size(), td::min(cb.remaining_bits(), top_bits) - 16) / 8 * 8;
+  auto max_bits = vm::Cell::max_bits / 8 * 8;
+  auto depth = 1 + (slice.size() - head + max_bits - 8 - 1) / (max_bits - 8);
+  if (depth > max_chain_length) {
+    return td::Status::Error("String is too long (2)");
+  }
+  cb.store_long(depth, 8);
+  cb.store_long(head / 8, 8);
+  cb.append_bitslice(slice.subslice(0, head));
+  slice.advance(head);
+  if (slice.size() == 0) {
+    return td::Status::OK();
+  }
+  cb.store_ref(do_store(std::move(slice)));
+  return td::Status::OK();
+}
+
+td::Ref<vm::Cell> CellText::do_store(td::BitSlice slice) {
+  vm::CellBuilder cb;
+  unsigned int head = td::min(slice.size(), cb.remaining_bits() - 8) / 8 * 8;
+  cb.store_long(head / 8, 8);
+  cb.append_bitslice(slice.subslice(0, head));
+  slice.advance(head);
+  if (slice.size() != 0) {
+    cb.store_ref(do_store(std::move(slice)));
+  }
+  return cb.finalize();
+}
+
+template <class F>
+void CellText::for_each(F &&f, CellSlice cs) {
+  auto depth = cs.fetch_ulong(8);
+
+  for (td::uint32 i = 0; i < depth; i++) {
+    auto size = cs.fetch_ulong(8);
+    f(cs.fetch_bits(td::narrow_cast<int>(size) * 8));
+    if (i + 1 < depth) {
+      cs = vm::load_cell_slice(cs.prefetch_ref());
+    }
+  }
+}
+
+td::Result<td::string> CellText::load(CellSlice &cs) {
+  unsigned int size = 0;
+  for_each([&](auto slice) { size += slice.size(); }, cs);
+  if (size % 8 != 0) {
+    return td::Status::Error("Size is not divisible by 8");
+  }
+  std::string res(size / 8, 0);
+
+  td::BitPtr to(td::MutableSlice(res).ubegin());
+  for_each([&](auto slice) { to.concat(slice); }, cs);
+  CHECK(to.offs == (int)size);
+  return res;
+}
 }  // namespace vm
diff --git a/submodules/ton/tonlib-src/crypto/vm/cells/CellString.h b/submodules/ton/tonlib-src/crypto/vm/cells/CellString.h
index 89c933d876..ab93203f88 100644
--- a/submodules/ton/tonlib-src/crypto/vm/cells/CellString.h
+++ b/submodules/ton/tonlib-src/crypto/vm/cells/CellString.h
@@ -1,3 +1,21 @@
+/*
+    This file is part of TON Blockchain Library.
+
+    TON Blockchain Library is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Lesser General Public License as published by
+    the Free Software Foundation, either version 2 of the License, or
+    (at your option) any later version.
+
+    TON Blockchain Library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public License
+    along with TON Blockchain Library.  If not, see <http://www.gnu.org/licenses/>.
+
+    Copyright 2019-2020 Telegram Systems LLP
+*/
 #pragma once
 
 #include "td/utils/Status.h"
@@ -13,10 +31,35 @@ class CellString {
   static td::Status store(CellBuilder &cb, td::Slice slice, unsigned int top_bits = Cell::max_bits);
   static td::Status store(CellBuilder &cb, td::BitSlice slice, unsigned int top_bits = Cell::max_bits);
   static td::Result<td::string> load(CellSlice &cs, unsigned int top_bits = Cell::max_bits);
+  static td::Result<td::Ref<vm::Cell>> create(td::Slice slice, unsigned int top_bits = Cell::max_bits) {
+    vm::CellBuilder cb;
+    TRY_STATUS(store(cb, slice, top_bits));
+    return cb.finalize();
+  }
 
  private:
   template <class F>
   static void for_each(F &&f, CellSlice &cs, unsigned int top_bits = Cell::max_bits);
 };
 
+class CellText {
+ public:
+  static constexpr unsigned int max_bytes = 1024;
+  static constexpr unsigned int max_chain_length = 16;
+
+  static td::Status store(CellBuilder &cb, td::Slice slice, unsigned int top_bits = Cell::max_bits);
+  static td::Status store(CellBuilder &cb, td::BitSlice slice, unsigned int top_bits = Cell::max_bits);
+  static td::Result<td::string> load(CellSlice &cs);
+  static td::Result<td::Ref<vm::Cell>> create(td::Slice slice, unsigned int top_bits = Cell::max_bits) {
+    vm::CellBuilder cb;
+    TRY_STATUS(store(cb, slice, top_bits));
+    return cb.finalize();
+  }
+
+ private:
+  template <class F>
+  static void for_each(F &&f, CellSlice cs);
+  static td::Ref<vm::Cell> do_store(td::BitSlice slice);
+};
+
 }  // namespace vm
diff --git a/submodules/ton/tonlib-src/crypto/vm/cells/MerkleProof.cpp b/submodules/ton/tonlib-src/crypto/vm/cells/MerkleProof.cpp
index a373e80468..105c74c167 100644
--- a/submodules/ton/tonlib-src/crypto/vm/cells/MerkleProof.cpp
+++ b/submodules/ton/tonlib-src/crypto/vm/cells/MerkleProof.cpp
@@ -143,19 +143,80 @@ Ref<Cell> MerkleProof::virtualize(Ref<Cell> cell, int virtualization) {
   return virtualize_raw(r_raw.move_as_ok(), {0 /*level*/, static_cast<td::uint8>(virtualization)});
 }
 
+class MerkleProofCombineFast {
+ public:
+  MerkleProofCombineFast(Ref<Cell> a, Ref<Cell> b) : a_(std::move(a)), b_(std::move(b)) {
+  }
+  td::Result<Ref<Cell>> run() {
+    TRY_RESULT_ASSIGN(a_, unpack_proof(a_));
+    TRY_RESULT_ASSIGN(b_, unpack_proof(b_));
+    TRY_RESULT(res, run_raw());
+    return CellBuilder::create_merkle_proof(std::move(res));
+  }
+
+  td::Result<Ref<Cell>> run_raw() {
+    if (a_->get_hash(0) != b_->get_hash(0)) {
+      return td::Status::Error("Can't combine MerkleProofs with different roots");
+    }
+    return merge(a_, b_, 0);
+  }
+
+ private:
+  Ref<Cell> a_;
+  Ref<Cell> b_;
+
+  Ref<Cell> merge(Ref<Cell> a, Ref<Cell> b, td::uint32 merkle_depth) {
+    if (a->get_hash() == b->get_hash()) {
+      return a;
+    }
+    if (a->get_level() == merkle_depth) {
+      return a;
+    }
+    if (b->get_level() == merkle_depth) {
+      return b;
+    }
+
+    CellSlice csa(NoVm(), a);
+    CellSlice csb(NoVm(), b);
+
+    if (csa.is_special() && csa.special_type() == vm::Cell::SpecialType::PrunnedBranch) {
+      return b;
+    }
+    if (csb.is_special() && csb.special_type() == vm::Cell::SpecialType::PrunnedBranch) {
+      return a;
+    }
+
+    CHECK(csa.size_refs() != 0);
+
+    auto child_merkle_depth = csa.child_merkle_depth(merkle_depth);
+
+    CellBuilder cb;
+    cb.store_bits(csa.fetch_bits(csa.size()));
+    for (unsigned i = 0; i < csa.size_refs(); i++) {
+      cb.store_ref(merge(csa.prefetch_ref(i), csb.prefetch_ref(i), child_merkle_depth));
+    }
+    return cb.finalize(csa.is_special());
+  }
+};
+
 class MerkleProofCombine {
  public:
   MerkleProofCombine(Ref<Cell> a, Ref<Cell> b) : a_(std::move(a)), b_(std::move(b)) {
   }
   td::Result<Ref<Cell>> run() {
-    TRY_RESULT(a, unpack_proof(a_));
-    TRY_RESULT(b, unpack_proof(b_));
-    if (a->get_hash(0) != b->get_hash(0)) {
+    TRY_RESULT_ASSIGN(a_, unpack_proof(a_));
+    TRY_RESULT_ASSIGN(b_, unpack_proof(b_));
+    TRY_RESULT(res, run_raw());
+    return CellBuilder::create_merkle_proof(std::move(res));
+  }
+
+  td::Result<Ref<Cell>> run_raw() {
+    if (a_->get_hash(0) != b_->get_hash(0)) {
       return td::Status::Error("Can't combine MerkleProofs with different roots");
     }
-    dfs(a, 0);
-    dfs(b, 0);
-    return CellBuilder::create_merkle_proof(create_A(a, 0, 0));
+    dfs(a_, 0);
+    dfs(b_, 0);
+    return create_A(a_, 0, 0);
   }
 
  private:
@@ -262,6 +323,30 @@ Ref<Cell> MerkleProof::combine(Ref<Cell> a, Ref<Cell> b) {
   return res.move_as_ok();
 }
 
+Ref<Cell> MerkleProof::combine_fast(Ref<Cell> a, Ref<Cell> b) {
+  auto res = MerkleProofCombineFast(std::move(a), std::move(b)).run();
+  if (res.is_error()) {
+    return {};
+  }
+  return res.move_as_ok();
+}
+
+Ref<Cell> MerkleProof::combine_raw(Ref<Cell> a, Ref<Cell> b) {
+  auto res = MerkleProofCombine(std::move(a), std::move(b)).run_raw();
+  if (res.is_error()) {
+    return {};
+  }
+  return res.move_as_ok();
+}
+
+Ref<Cell> MerkleProof::combine_fast_raw(Ref<Cell> a, Ref<Cell> b) {
+  auto res = MerkleProofCombineFast(std::move(a), std::move(b)).run_raw();
+  if (res.is_error()) {
+    return {};
+  }
+  return res.move_as_ok();
+}
+
 MerkleProofBuilder::MerkleProofBuilder(Ref<Cell> root)
     : usage_tree(std::make_shared<CellUsageTree>()), orig_root(std::move(root)) {
   usage_root = UsageCell::create(orig_root, usage_tree->root_ptr());
diff --git a/submodules/ton/tonlib-src/crypto/vm/cells/MerkleProof.h b/submodules/ton/tonlib-src/crypto/vm/cells/MerkleProof.h
index 5b3b8ebcef..41788c5f7f 100644
--- a/submodules/ton/tonlib-src/crypto/vm/cells/MerkleProof.h
+++ b/submodules/ton/tonlib-src/crypto/vm/cells/MerkleProof.h
@@ -38,12 +38,15 @@ class MerkleProof {
   static Ref<Cell> virtualize(Ref<Cell> cell, int virtualization);
 
   static Ref<Cell> combine(Ref<Cell> a, Ref<Cell> b);
+  static Ref<Cell> combine_fast(Ref<Cell> a, Ref<Cell> b);
 
   // works with upwrapped proofs
   // works fine with cell of non-zero level, but this is not supported (yet?) in MerkeProof special cell
   static Ref<Cell> generate_raw(Ref<Cell> cell, IsPrunnedFunction is_prunned);
   static Ref<Cell> generate_raw(Ref<Cell> cell, CellUsageTree *usage_tree);
   static Ref<Cell> virtualize_raw(Ref<Cell> cell, Cell::VirtualizationParameters virt);
+  static Ref<Cell> combine_raw(Ref<Cell> a, Ref<Cell> b);
+  static Ref<Cell> combine_fast_raw(Ref<Cell> a, Ref<Cell> b);
 };
 
 class MerkleProofBuilder {
diff --git a/submodules/ton/tonlib-src/crypto/vm/cells/MerkleUpdate.cpp b/submodules/ton/tonlib-src/crypto/vm/cells/MerkleUpdate.cpp
index 30b5116ecf..d75f16675e 100644
--- a/submodules/ton/tonlib-src/crypto/vm/cells/MerkleUpdate.cpp
+++ b/submodules/ton/tonlib-src/crypto/vm/cells/MerkleUpdate.cpp
@@ -268,7 +268,7 @@ class MerkleCombine {
     // 1. Create maximum subtrees of X and Z with all cells in A, B, C and D
     // Max(V) - such maximum subtree
     //
-    // 2. Max(A) and Max(D) should be merkle update already. But win want to minimize it
+    // 2. Max(A) and Max(D) should be merkle update already. But we want to minimize it
     // So we cut all branches of Max(D) which are in maxA
     // When we cut branch q in Max(D) we mark some path to q in Max(A)
     // Then we cut all branches of Max(A) which are not marked.
diff --git a/submodules/ton/tonlib-src/crypto/vm/continuation.cpp b/submodules/ton/tonlib-src/crypto/vm/continuation.cpp
index d4952769a5..243dfd5ea0 100644
--- a/submodules/ton/tonlib-src/crypto/vm/continuation.cpp
+++ b/submodules/ton/tonlib-src/crypto/vm/continuation.cpp
@@ -14,12 +14,14 @@
     You should have received a copy of the GNU Lesser General Public License
     along with TON Blockchain Library.  If not, see <http://www.gnu.org/licenses/>.
 
-    Copyright 2017-2019 Telegram Systems LLP
+    Copyright 2017-2020 Telegram Systems LLP
 */
 #include "vm/dispatch.h"
 #include "vm/continuation.h"
 #include "vm/dict.h"
 #include "vm/log.h"
+#include "vm/vm.h"
+#include "vm/vmstate.h"
 
 namespace vm {
 
@@ -32,6 +34,17 @@ bool Continuation::has_c0() const {
   return cont_data && cont_data->save.c[0].not_null();
 }
 
+bool ControlRegs::clear() {
+  for (unsigned i = 0; i < creg_num; i++) {
+    c[i].clear();
+  }
+  for (unsigned i = 0; i < dreg_num; i++) {
+    d[i].clear();
+  }
+  c7.clear();
+  return true;
+}
+
 StackEntry ControlRegs::get(unsigned idx) const {
   if (idx < creg_num) {
     return get_c(idx);
@@ -107,6 +120,155 @@ ControlRegs& ControlRegs::operator&=(const ControlRegs& save) {
   return *this;
 }
 
+bool ControlRegs::serialize(CellBuilder& cb) const {
+  // _ cregs:(HashmapE 4 VmStackValue) = VmSaveList;
+  Dictionary dict{4};
+  CellBuilder cb2;
+  for (int i = 0; i < creg_num; i++) {
+    if (c[i].not_null() &&
+        !(StackEntry{c[i]}.serialize(cb2) && dict.set_builder(td::BitArray<4>(i), cb2) && cb2.reset_bool())) {
+      return false;
+    }
+  }
+  for (int i = 0; i < dreg_num; i++) {
+    if (d[i].not_null() && !(StackEntry{d[i]}.serialize(cb2) && dict.set_builder(td::BitArray<4>(dreg_idx + i), cb2) &&
+                             cb2.reset_bool())) {
+      return false;
+    }
+  }
+  return (c7.is_null() || (StackEntry{c7}.serialize(cb2) && dict.set_builder(td::BitArray<4>(7), cb2))) &&
+         std::move(dict).append_dict_to_bool(cb);
+}
+
+bool ControlRegs::deserialize(CellSlice& cs, int mode) {
+  // _ cregs:(HashmapE 4 VmStackValue) = VmSaveList;
+  Ref<Cell> root;
+  return cs.fetch_maybe_ref(root) && deserialize(std::move(root), mode);
+}
+
+bool ControlRegs::deserialize(Ref<Cell> root, int mode) {
+  try {
+    clear();
+    Dictionary dict{std::move(root), 4};
+    return dict.check_for_each([this, mode](Ref<CellSlice> val, td::ConstBitPtr key, int n) {
+      StackEntry value;
+      return value.deserialize(val.write(), mode) && val->empty_ext() && set((int)key.get_uint(4), std::move(value));
+    });
+  } catch (VmError&) {
+    return false;
+  }
+}
+
+bool ControlData::clear() {
+  stack.clear();
+  save.clear();
+  nargs = cp = -1;
+  return true;
+}
+
+bool ControlData::serialize(CellBuilder& cb) const {
+  // vm_ctl_data$_ nargs:(Maybe uint13) stack:(Maybe VmStack) save:VmSaveList
+  // cp:(Maybe int16) = VmControlData;
+  return cb.store_bool_bool(nargs >= 0)                   // vm_ctl_data$_ nargs:(Maybe ...
+         && (nargs < 0 || cb.store_long_bool(nargs, 13))  // ... int13)
+         && cb.store_bool_bool(stack.not_null())          // stack:(Maybe ...
+         && (stack.is_null() || stack->serialize(cb))     // ... VmStack)
+         && save.serialize(cb)                            // save:VmSaveList
+         && cb.store_bool_bool(cp != -1)                  // cp:(Maybe ...
+         && (cp == -1 || cb.store_long_bool(cp, 16));     // ... int16)
+}
+
+bool ControlData::deserialize(CellSlice& cs, int mode) {
+  // vm_ctl_data$_ nargs:(Maybe uint13) stack:(Maybe VmStack) save:VmSaveList
+  // cp:(Maybe int16) = VmControlData;
+  nargs = cp = -1;
+  stack.clear();
+  bool f;
+  return cs.fetch_bool_to(f) && (!f || cs.fetch_uint_to(13, nargs))                // nargs:(Maybe uint13)
+         && cs.fetch_bool_to(f) && (!f || Stack::deserialize_to(cs, stack, mode))  // stack:(Maybe VmStack)
+         && save.deserialize(cs, mode)                                             // save:VmSaveList
+         && cs.fetch_bool_to(f) && (!f || (cs.fetch_int_to(16, cp) && cp != -1));  // cp:(Maybe int16)
+}
+
+bool Continuation::serialize_ref(CellBuilder& cb) const {
+  auto* vsi = VmStateInterface::get();
+  if (vsi && !vsi->register_op()) {
+    return false;
+  }
+  vm::CellBuilder cb2;
+  return serialize(cb2) && cb.store_ref_bool(cb2.finalize());
+}
+
+Ref<Continuation> Continuation::deserialize(CellSlice& cs, int mode) {
+  if (mode & 0x1002) {
+    return {};
+  }
+  auto* vsi = VmStateInterface::get();
+  if (vsi && !vsi->register_op()) {
+    return {};
+  }
+
+  mode |= 0x1000;
+  switch (cs.bselect_ext(6, 0x100f011100010001ULL)) {
+    case 0:
+      // vmc_std$00 cdata:VmControlData code:VmCellSlice = VmCont;
+      return OrdCont::deserialize(cs, mode);
+    case 1:
+      // vmc_envelope$01 cdata:VmControlData next:^VmCont = VmCont;
+      return ArgContExt::deserialize(cs, mode);
+    case 2:
+      // vmc_quit$1000 exit_code:int32 = VmCont;
+      return QuitCont::deserialize(cs, mode);
+    case 3:
+      // vmc_quit_exc$1001 = VmCont;
+      return ExcQuitCont::deserialize(cs, mode);
+    case 4:
+      // vmc_repeat$10100 count:uint63 body:^VmCont after:^VmCont = VmCont;
+      return RepeatCont::deserialize(cs, mode);
+    case 5:
+      // vmc_until$110000 body:^VmCont after:^VmCont = VmCont;
+      return UntilCont::deserialize(cs, mode);
+    case 6:
+      // vmc_again$110001 body:^VmCont = VmCont;
+      return AgainCont::deserialize(cs, mode);
+    case 7:
+      // vmc_while_cond$110010 cond:^VmCont body:^VmCont after:^VmCont = VmCont;
+      return WhileCont::deserialize(cs, mode | 0x2000);
+    case 8:
+      // vmc_while_body$110011 cond:^VmCont body:^VmCont after:^VmCont = VmCont;
+      return WhileCont::deserialize(cs, mode & ~0x2000);
+    case 9:
+      // vmc_pushint$1111 value:int32 next:^VmCont = VmCont;
+      return PushIntCont::deserialize(cs, mode);
+    default:
+      return {};
+  }
+}
+
+bool Continuation::deserialize_to(Ref<Cell> cell, Ref<Continuation>& cont, int mode) {
+  if (cell.is_null()) {
+    cont.clear();
+    return false;
+  }
+  CellSlice cs = load_cell_slice(std::move(cell));
+  return deserialize_to(cs, cont, mode & ~0x1000) && cs.empty_ext();
+}
+
+bool QuitCont::serialize(CellBuilder& cb) const {
+  // vmc_quit$1000 exit_code:int32 = VmCont;
+  return cb.store_long_bool(8, 4) && cb.store_long_bool(exit_code, 32);
+}
+
+Ref<QuitCont> QuitCont::deserialize(CellSlice& cs, int mode) {
+  // vmc_quit$1000 exit_code:int32 = VmCont;
+  int exit_code;
+  if (cs.fetch_ulong(4) == 8 && cs.fetch_int_to(32, exit_code)) {
+    return Ref<QuitCont>{true, exit_code};
+  } else {
+    return {};
+  }
+}
+
 int ExcQuitCont::jump(VmState* st) const & {
   int n = 0;
   try {
@@ -118,6 +280,16 @@ int ExcQuitCont::jump(VmState* st) const & {
   return ~n;
 }
 
+bool ExcQuitCont::serialize(CellBuilder& cb) const {
+  // vmc_quit_exc$1001 = VmCont;
+  return cb.store_long_bool(9, 4);
+}
+
+Ref<ExcQuitCont> ExcQuitCont::deserialize(CellSlice& cs, int mode) {
+  // vmc_quit_exc$1001 = VmCont;
+  return cs.fetch_ulong(4) == 9 ? Ref<ExcQuitCont>{true} : Ref<ExcQuitCont>{};
+}
+
 int PushIntCont::jump(VmState* st) const & {
   VM_LOG(st) << "execute implicit PUSH " << push_val << " (slow)";
   st->get_stack().push_smallint(push_val);
@@ -130,6 +302,24 @@ int PushIntCont::jump_w(VmState* st) & {
   return st->jump(std::move(next));
 }
 
+bool PushIntCont::serialize(CellBuilder& cb) const {
+  // vmc_pushint$1111 value:int32 next:^VmCont = VmCont;
+  return cb.store_long_bool(15, 4) && cb.store_long_bool(push_val, 32) && next->serialize_ref(cb);
+}
+
+Ref<PushIntCont> PushIntCont::deserialize(CellSlice& cs, int mode) {
+  // vmc_pushint$1111 value:int32 next:^VmCont = VmCont;
+  int value;
+  Ref<Cell> ref;
+  Ref<Continuation> next;
+  if (cs.fetch_ulong(4) == 15 && cs.fetch_int_to(32, value) && cs.fetch_ref_to(ref) &&
+      deserialize_to(std::move(ref), next, mode)) {
+    return Ref<PushIntCont>{true, value, std::move(next)};
+  } else {
+    return {};
+  }
+}
+
 int ArgContExt::jump(VmState* st) const & {
   st->adjust_cr(data.save);
   if (data.cp != -1) {
@@ -146,6 +336,23 @@ int ArgContExt::jump_w(VmState* st) & {
   return st->jump_to(std::move(ext));
 }
 
+bool ArgContExt::serialize(CellBuilder& cb) const {
+  // vmc_envelope$01 cdata:VmControlData next:^VmCont = VmCont;
+  return cb.store_long_bool(1, 2) && data.serialize(cb) && ext->serialize_ref(cb);
+}
+
+Ref<ArgContExt> ArgContExt::deserialize(CellSlice& cs, int mode) {
+  // vmc_envelope$01 cdata:VmControlData next:^VmCont = VmCont;
+  ControlData cdata;
+  Ref<Cell> ref;
+  Ref<Continuation> next;
+  mode &= ~0x1000;
+  return cs.fetch_ulong(2) == 1 && cdata.deserialize(cs, mode) && cs.fetch_ref_to(ref) &&
+                 deserialize_to(std::move(ref), next, mode)
+             ? Ref<ArgContExt>{true, std::move(next), std::move(cdata)}
+             : Ref<ArgContExt>{};
+}
+
 int RepeatCont::jump(VmState* st) const & {
   VM_LOG(st) << "repeat " << count << " more times (slow)\n";
   if (count <= 0) {
@@ -174,6 +381,26 @@ int RepeatCont::jump_w(VmState* st) & {
   return st->jump(body);
 }
 
+bool RepeatCont::serialize(CellBuilder& cb) const {
+  // vmc_repeat$10100 count:uint63 body:^VmCont after:^VmCont = VmCont;
+  return cb.store_long_bool(0x14, 5) && cb.store_long_bool(count, 63) && body->serialize_ref(cb) &&
+         after->serialize_ref(cb);
+}
+
+Ref<RepeatCont> RepeatCont::deserialize(CellSlice& cs, int mode) {
+  // vmc_repeat$10100 count:uint63 body:^VmCont after:^VmCont = VmCont;
+  long long count;
+  Ref<Cell> ref;
+  Ref<Continuation> body, after;
+  if (cs.fetch_ulong(5) == 0x14 && cs.fetch_uint_to(63, count) && cs.fetch_ref_to(ref) &&
+      deserialize_to(std::move(ref), body, mode) && cs.fetch_ref_to(ref) &&
+      deserialize_to(std::move(ref), after, mode)) {
+    return Ref<RepeatCont>{true, std::move(body), std::move(after), count};
+  } else {
+    return {};
+  }
+}
+
 int VmState::repeat(Ref<Continuation> body, Ref<Continuation> after, long long count) {
   if (count <= 0) {
     body.clear();
@@ -201,6 +428,22 @@ int AgainCont::jump_w(VmState* st) & {
   }
 }
 
+bool AgainCont::serialize(CellBuilder& cb) const {
+  // vmc_again$110001 body:^VmCont = VmCont;
+  return cb.store_long_bool(0x31, 6) && body->serialize_ref(cb);
+}
+
+Ref<AgainCont> AgainCont::deserialize(CellSlice& cs, int mode) {
+  // vmc_again$110001 body:^VmCont = VmCont;
+  Ref<Cell> ref;
+  Ref<Continuation> body;
+  if (cs.fetch_ulong(6) == 0x31 && cs.fetch_ref_to(ref) && deserialize_to(std::move(ref), body, mode)) {
+    return Ref<AgainCont>{true, std::move(body)};
+  } else {
+    return {};
+  }
+}
+
 int VmState::again(Ref<Continuation> body) {
   return jump(Ref<AgainCont>{true, std::move(body)});
 }
@@ -233,6 +476,23 @@ int UntilCont::jump_w(VmState* st) & {
   }
 }
 
+bool UntilCont::serialize(CellBuilder& cb) const {
+  // vmc_until$110000 body:^VmCont after:^VmCont = VmCont;
+  return cb.store_long_bool(0x30, 6) && body->serialize_ref(cb) && after->serialize_ref(cb);
+}
+
+Ref<UntilCont> UntilCont::deserialize(CellSlice& cs, int mode) {
+  // vmc_until$110000 body:^VmCont after:^VmCont = VmCont;
+  Ref<Cell> ref;
+  Ref<Continuation> body, after;
+  if (cs.fetch_ulong(6) == 0x30 && cs.fetch_ref_to(ref) && deserialize_to(std::move(ref), body, mode) &&
+      cs.fetch_ref_to(ref) && deserialize_to(std::move(ref), after, mode)) {
+    return Ref<UntilCont>{true, std::move(body), std::move(after)};
+  } else {
+    return {};
+  }
+}
+
 int VmState::until(Ref<Continuation> body, Ref<Continuation> after) {
   if (!body->has_c0()) {
     set_c0(Ref<UntilCont>{true, body, std::move(after)});
@@ -292,6 +552,29 @@ int WhileCont::jump_w(VmState* st) & {
   }
 }
 
+bool WhileCont::serialize(CellBuilder& cb) const {
+  // vmc_while_cond$110010 cond:^VmCont body:^VmCont after:^VmCont = VmCont;
+  // vmc_while_body$110011 cond:^VmCont body:^VmCont after:^VmCont = VmCont;
+  return cb.store_long_bool(0x19, 5) && cb.store_bool_bool(!chkcond) && cond->serialize_ref(cb) &&
+         body->serialize_ref(cb) && after->serialize_ref(cb);
+}
+
+Ref<WhileCont> WhileCont::deserialize(CellSlice& cs, int mode) {
+  // vmc_while_cond$110010 cond:^VmCont body:^VmCont after:^VmCont = VmCont;
+  // vmc_while_body$110011 cond:^VmCont body:^VmCont after:^VmCont = VmCont;
+  bool at_body;
+  Ref<Cell> ref;
+  Ref<Continuation> cond, body, after;
+  if (cs.fetch_ulong(5) == 0x19 && cs.fetch_bool_to(at_body) && cs.fetch_ref_to(ref) &&
+      deserialize_to(std::move(ref), cond, mode) && cs.fetch_ref_to(ref) &&
+      deserialize_to(std::move(ref), body, mode) && cs.fetch_ref_to(ref) &&
+      deserialize_to(std::move(ref), after, mode)) {
+    return Ref<WhileCont>{true, std::move(cond), std::move(body), std::move(after), !at_body};
+  } else {
+    return {};
+  }
+}
+
 int VmState::loop_while(Ref<Continuation> cond, Ref<Continuation> body, Ref<Continuation> after) {
   if (!cond->has_c0()) {
     set_c0(Ref<WhileCont>{true, cond, std::move(body), std::move(after), true});
@@ -311,6 +594,22 @@ int OrdCont::jump_w(VmState* st) & {
   return 0;
 }
 
+bool OrdCont::serialize(CellBuilder& cb) const {
+  // vmc_std$00 cdata:VmControlData code:VmCellSlice = VmCont;
+  return cb.store_long_bool(0, 2) && data.serialize(cb) && StackEntry{code}.serialize(cb, 0x1000);
+}
+
+Ref<OrdCont> OrdCont::deserialize(CellSlice& cs, int mode) {
+  // vmc_std$00 cdata:VmControlData code:VmCellSlice = VmCont;
+  ControlData cdata;
+  StackEntry val;
+  mode &= ~0x1000;
+  return cs.fetch_ulong(2) == 0 && cdata.deserialize(cs, mode) && val.deserialize(cs, 0x4000) &&
+                 val.is(StackEntry::t_slice)
+             ? Ref<OrdCont>{true, std::move(val).as_slice(), std::move(cdata)}
+             : Ref<OrdCont>{};
+}
+
 void VmState::init_cregs(bool same_c3, bool push_0) {
   cr.set_c0(quit0);
   cr.set_c1(quit1);
@@ -337,555 +636,4 @@ void VmState::init_cregs(bool same_c3, bool push_0) {
   }
 }
 
-VmState::VmState() : cp(-1), dispatch(&dummy_dispatch_table), quit0(true, 0), quit1(true, 1) {
-  ensure_throw(init_cp(0));
-  init_cregs();
-}
-
-VmState::VmState(Ref<CellSlice> _code)
-    : code(std::move(_code)), cp(-1), dispatch(&dummy_dispatch_table), quit0(true, 0), quit1(true, 1) {
-  ensure_throw(init_cp(0));
-  init_cregs();
-}
-
-VmState::VmState(Ref<CellSlice> _code, Ref<Stack> _stack, int flags, Ref<Cell> _data, VmLog log,
-                 std::vector<Ref<Cell>> _libraries, Ref<Tuple> init_c7)
-    : code(std::move(_code))
-    , stack(std::move(_stack))
-    , cp(-1)
-    , dispatch(&dummy_dispatch_table)
-    , quit0(true, 0)
-    , quit1(true, 1)
-    , log(log)
-    , libraries(std::move(_libraries)) {
-  ensure_throw(init_cp(0));
-  set_c4(std::move(_data));
-  if (init_c7.not_null()) {
-    set_c7(std::move(init_c7));
-  }
-  init_cregs(flags & 1, flags & 2);
-}
-
-VmState::VmState(Ref<CellSlice> _code, Ref<Stack> _stack, const GasLimits& gas, int flags, Ref<Cell> _data, VmLog log,
-                 std::vector<Ref<Cell>> _libraries, Ref<Tuple> init_c7)
-    : code(std::move(_code))
-    , stack(std::move(_stack))
-    , cp(-1)
-    , dispatch(&dummy_dispatch_table)
-    , quit0(true, 0)
-    , quit1(true, 1)
-    , log(log)
-    , gas(gas)
-    , libraries(std::move(_libraries)) {
-  ensure_throw(init_cp(0));
-  set_c4(std::move(_data));
-  if (init_c7.not_null()) {
-    set_c7(std::move(init_c7));
-  }
-  init_cregs(flags & 1, flags & 2);
-}
-
-Ref<CellSlice> VmState::convert_code_cell(Ref<Cell> code_cell) {
-  if (code_cell.is_null()) {
-    return {};
-  }
-  Ref<CellSlice> csr{true, NoVmOrd(), code_cell};
-  if (csr->is_valid()) {
-    return csr;
-  }
-  return load_cell_slice_ref(CellBuilder{}.store_ref(std::move(code_cell)).finalize());
-}
-
-bool VmState::init_cp(int new_cp) {
-  const DispatchTable* dt = DispatchTable::get_table(new_cp);
-  if (dt) {
-    cp = new_cp;
-    dispatch = dt;
-    return true;
-  } else {
-    return false;
-  }
-}
-
-bool VmState::set_cp(int new_cp) {
-  return new_cp == cp || init_cp(new_cp);
-}
-
-void VmState::force_cp(int new_cp) {
-  if (!set_cp(new_cp)) {
-    throw VmError{Excno::inv_opcode, "unsupported codepage"};
-  }
-}
-
-// simple call to a continuation cont
-int VmState::call(Ref<Continuation> cont) {
-  const ControlData* cont_data = cont->get_cdata();
-  if (cont_data) {
-    if (cont_data->save.c[0].not_null()) {
-      // call reduces to a jump
-      return jump(std::move(cont));
-    }
-    if (cont_data->stack.not_null() || cont_data->nargs >= 0) {
-      // if cont has non-empty stack or expects fixed number of arguments, call is not simple
-      return call(std::move(cont), -1, -1);
-    }
-    // create return continuation, to be stored into new c0
-    Ref<OrdCont> ret = Ref<OrdCont>{true, std::move(code), cp};
-    ret.unique_write().get_cdata()->save.set_c0(std::move(cr.c[0]));
-    cr.set_c0(
-        std::move(ret));  // set c0 to its final value before switching to cont; notice that cont.save.c0 is not set
-    return jump_to(std::move(cont));
-  }
-  // create return continuation, to be stored into new c0
-  Ref<OrdCont> ret = Ref<OrdCont>{true, std::move(code), cp};
-  ret.unique_write().get_cdata()->save.set_c0(std::move(cr.c[0]));
-  // general implementation of a simple call
-  cr.set_c0(std::move(ret));  // set c0 to its final value before switching to cont; notice that cont.save.c0 is not set
-  return jump_to(std::move(cont));
-}
-
-// call with parameters to continuation cont
-int VmState::call(Ref<Continuation> cont, int pass_args, int ret_args) {
-  const ControlData* cont_data = cont->get_cdata();
-  if (cont_data) {
-    if (cont_data->save.c[0].not_null()) {
-      // call reduces to a jump
-      return jump(std::move(cont), pass_args);
-    }
-    int depth = stack->depth();
-    if (pass_args > depth || cont_data->nargs > depth) {
-      throw VmError{Excno::stk_und, "stack underflow while calling a continuation: not enough arguments on stack"};
-    }
-    if (cont_data->nargs > pass_args && pass_args >= 0) {
-      throw VmError{Excno::stk_und,
-                    "stack underflow while calling a closure continuation: not enough arguments passed"};
-    }
-    auto old_c0 = std::move(cr.c[0]);
-    // optimization(?): decrease refcnts of unused continuations in c[i] as early as possible
-    preclear_cr(cont_data->save);
-    // no exceptions should be thrown after this point
-    int copy = cont_data->nargs, skip = 0;
-    if (pass_args >= 0) {
-      if (copy >= 0) {
-        skip = pass_args - copy;
-      } else {
-        copy = pass_args;
-      }
-    }
-    // copy=-1 : pass whole stack, else pass top `copy` elements, drop next `skip` elements.
-    Ref<Stack> new_stk;
-    if (cont_data->stack.not_null() && !cont_data->stack->is_empty()) {
-      // `cont` already has a stack, create resulting stack from it
-      if (copy < 0) {
-        copy = stack->depth();
-      }
-      if (cont->is_unique()) {
-        // optimization: avoid copying stack if we hold the only copy of `cont`
-        new_stk = std::move(cont.unique_write().get_cdata()->stack);
-      } else {
-        new_stk = cont_data->stack;
-      }
-      new_stk.write().move_from_stack(get_stack(), copy);
-      if (skip > 0) {
-        get_stack().pop_many(skip);
-      }
-    } else if (copy >= 0) {
-      new_stk = get_stack().split_top(copy, skip);
-    } else {
-      new_stk = std::move(stack);
-      stack.clear();
-    }
-    // create return continuation using the remainder of current stack
-    Ref<OrdCont> ret = Ref<OrdCont>{true, std::move(code), cp, std::move(stack), ret_args};
-    ret.unique_write().get_cdata()->save.set_c0(std::move(old_c0));
-    Ref<OrdCont> ord_cont = static_cast<Ref<OrdCont>>(cont);
-    set_stack(std::move(new_stk));
-    cr.set_c0(std::move(ret));  // ??? if codepage of code in ord_cont is unknown, will end up with incorrect c0
-    return jump_to(std::move(cont));
-  } else {
-    // have no continuation data, situation is somewhat simpler
-    int depth = stack->depth();
-    if (pass_args > depth) {
-      throw VmError{Excno::stk_und, "stack underflow while calling a continuation: not enough arguments on stack"};
-    }
-    // create new stack from the top `pass_args` elements of the current stack
-    Ref<Stack> new_stk = (pass_args >= 0 ? get_stack().split_top(pass_args) : std::move(stack));
-    // create return continuation using the remainder of the current stack
-    Ref<OrdCont> ret = Ref<OrdCont>{true, std::move(code), cp, std::move(stack), ret_args};
-    ret.unique_write().get_cdata()->save.set_c0(std::move(cr.c[0]));
-    set_stack(std::move(new_stk));
-    cr.set_c0(std::move(ret));  // ??? if codepage of code in ord_cont is unknown, will end up with incorrect c0
-    return jump_to(std::move(cont));
-  }
-}
-
-// simple jump to continuation cont
-int VmState::jump(Ref<Continuation> cont) {
-  const ControlData* cont_data = cont->get_cdata();
-  if (cont_data && (cont_data->stack.not_null() || cont_data->nargs >= 0)) {
-    // if cont has non-empty stack or expects fixed number of arguments, jump is not simple
-    return jump(std::move(cont), -1);
-  } else {
-    return jump_to(std::move(cont));
-  }
-}
-
-// general jump to continuation cont
-int VmState::jump(Ref<Continuation> cont, int pass_args) {
-  const ControlData* cont_data = cont->get_cdata();
-  if (cont_data) {
-    // first do the checks
-    int depth = stack->depth();
-    if (pass_args > depth || cont_data->nargs > depth) {
-      throw VmError{Excno::stk_und, "stack underflow while jumping to a continuation: not enough arguments on stack"};
-    }
-    if (cont_data->nargs > pass_args && pass_args >= 0) {
-      throw VmError{Excno::stk_und,
-                    "stack underflow while jumping to closure continuation: not enough arguments passed"};
-    }
-    // optimization(?): decrease refcnts of unused continuations in c[i] as early as possible
-    preclear_cr(cont_data->save);
-    // no exceptions should be thrown after this point
-    int copy = cont_data->nargs;
-    if (pass_args >= 0 && copy < 0) {
-      copy = pass_args;
-    }
-    // copy=-1 : pass whole stack, else pass top `copy` elements, drop the remainder.
-    if (cont_data->stack.not_null() && !cont_data->stack->is_empty()) {
-      // `cont` already has a stack, create resulting stack from it
-      if (copy < 0) {
-        copy = get_stack().depth();
-      }
-      Ref<Stack> new_stk;
-      if (cont->is_unique()) {
-        // optimization: avoid copying the stack if we hold the only copy of `cont`
-        new_stk = std::move(cont.unique_write().get_cdata()->stack);
-      } else {
-        new_stk = cont_data->stack;
-      }
-      new_stk.write().move_from_stack(get_stack(), copy);
-      set_stack(std::move(new_stk));
-    } else {
-      if (copy >= 0) {
-        get_stack().drop_bottom(stack->depth() - copy);
-      }
-    }
-    return jump_to(std::move(cont));
-  } else {
-    // have no continuation data, situation is somewhat simpler
-    if (pass_args >= 0) {
-      int depth = get_stack().depth();
-      if (pass_args > depth) {
-        throw VmError{Excno::stk_und, "stack underflow while jumping to a continuation: not enough arguments on stack"};
-      }
-      get_stack().drop_bottom(depth - pass_args);
-    }
-    return jump_to(std::move(cont));
-  }
-}
-
-int VmState::ret() {
-  Ref<Continuation> cont = quit0;
-  cont.swap(cr.c[0]);
-  return jump(std::move(cont));
-}
-
-int VmState::ret(int ret_args) {
-  Ref<Continuation> cont = quit0;
-  cont.swap(cr.c[0]);
-  return jump(std::move(cont), ret_args);
-}
-
-int VmState::ret_alt() {
-  Ref<Continuation> cont = quit1;
-  cont.swap(cr.c[1]);
-  return jump(std::move(cont));
-}
-
-int VmState::ret_alt(int ret_args) {
-  Ref<Continuation> cont = quit1;
-  cont.swap(cr.c[1]);
-  return jump(std::move(cont), ret_args);
-}
-
-Ref<OrdCont> VmState::extract_cc(int save_cr, int stack_copy, int cc_args) {
-  Ref<Stack> new_stk;
-  if (stack_copy < 0 || stack_copy == stack->depth()) {
-    new_stk = std::move(stack);
-    stack.clear();
-  } else if (stack_copy > 0) {
-    stack->check_underflow(stack_copy);
-    new_stk = get_stack().split_top(stack_copy);
-  } else {
-    new_stk = Ref<Stack>{true};
-  }
-  Ref<OrdCont> cc = Ref<OrdCont>{true, std::move(code), cp, std::move(stack), cc_args};
-  stack = std::move(new_stk);
-  if (save_cr & 7) {
-    ControlData* cdata = cc.unique_write().get_cdata();
-    if (save_cr & 1) {
-      cdata->save.set_c0(std::move(cr.c[0]));
-      cr.set_c0(quit0);
-    }
-    if (save_cr & 2) {
-      cdata->save.set_c1(std::move(cr.c[1]));
-      cr.set_c1(quit1);
-    }
-    if (save_cr & 4) {
-      cdata->save.set_c2(std::move(cr.c[2]));
-      // cr.set_c2(Ref<ExcQuitCont>{true});
-    }
-  }
-  return cc;
-}
-
-int VmState::throw_exception(int excno) {
-  Stack& stack_ref = get_stack();
-  stack_ref.clear();
-  stack_ref.push_smallint(0);
-  stack_ref.push_smallint(excno);
-  code.clear();
-  consume_gas(exception_gas_price);
-  return jump(get_c2());
-}
-
-int VmState::throw_exception(int excno, StackEntry&& arg) {
-  Stack& stack_ref = get_stack();
-  stack_ref.clear();
-  stack_ref.push(std::move(arg));
-  stack_ref.push_smallint(excno);
-  code.clear();
-  consume_gas(exception_gas_price);
-  return jump(get_c2());
-}
-
-void GasLimits::gas_exception() const {
-  throw VmNoGas{};
-}
-
-void GasLimits::set_limits(long long _max, long long _limit, long long _credit) {
-  gas_max = _max;
-  gas_limit = _limit;
-  gas_credit = _credit;
-  change_base(_limit + _credit);
-}
-
-void GasLimits::change_limit(long long _limit) {
-  _limit = std::min(std::max(_limit, 0LL), gas_max);
-  gas_credit = 0;
-  gas_limit = _limit;
-  change_base(_limit);
-}
-
-bool VmState::set_gas_limits(long long _max, long long _limit, long long _credit) {
-  gas.set_limits(_max, _limit, _credit);
-  return true;
-}
-
-void VmState::change_gas_limit(long long new_limit) {
-  VM_LOG(this) << "changing gas limit to " << std::min(new_limit, gas.gas_max);
-  gas.change_limit(new_limit);
-}
-
-int VmState::step() {
-  assert(!code.is_null());
-  //VM_LOG(st) << "stack:";  stack->dump(VM_LOG(st));
-  //VM_LOG(st) << "; cr0.refcnt = " << get_c0()->get_refcnt() - 1 << std::endl;
-  if (stack_trace) {
-    stack->dump(std::cerr);
-  }
-  ++steps;
-  if (code->size()) {
-    return dispatch->dispatch(this, code.write());
-  } else if (code->size_refs()) {
-    VM_LOG(this) << "execute implicit JMPREF\n";
-    Ref<Continuation> cont = Ref<OrdCont>{true, load_cell_slice_ref(code->prefetch_ref()), get_cp()};
-    return jump(std::move(cont));
-  } else {
-    VM_LOG(this) << "execute implicit RET\n";
-    return ret();
-  }
-}
-
-int VmState::run() {
-  int res;
-  Guard guard(this);
-  do {
-    // LOG(INFO) << "[BS] data cells: " << DataCell::get_total_data_cells();
-    try {
-      try {
-        res = step();
-        gas.check();
-      } catch (vm::CellBuilder::CellWriteError) {
-        throw VmError{Excno::cell_ov};
-      } catch (vm::CellBuilder::CellCreateError) {
-        throw VmError{Excno::cell_ov};
-      } catch (vm::CellSlice::CellReadError) {
-        throw VmError{Excno::cell_und};
-      }
-    } catch (const VmError& vme) {
-      VM_LOG(this) << "handling exception code " << vme.get_errno() << ": " << vme.get_msg();
-      try {
-        // LOG(INFO) << "[EX] data cells: " << DataCell::get_total_data_cells();
-        ++steps;
-        res = throw_exception(vme.get_errno());
-      } catch (const VmError& vme2) {
-        VM_LOG(this) << "exception " << vme2.get_errno() << " while handling exception: " << vme.get_msg();
-        // LOG(INFO) << "[EXX] data cells: " << DataCell::get_total_data_cells();
-        return ~vme2.get_errno();
-      }
-    } catch (VmNoGas vmoog) {
-      ++steps;
-      VM_LOG(this) << "unhandled out-of-gas exception: gas consumed=" << gas.gas_consumed()
-                   << ", limit=" << gas.gas_limit;
-      get_stack().clear();
-      get_stack().push_smallint(gas.gas_consumed());
-      return vmoog.get_errno();  // no ~ for unhandled exceptions (to make their faking impossible)
-    }
-  } while (!res);
-  // LOG(INFO) << "[EN] data cells: " << DataCell::get_total_data_cells();
-  if ((res | 1) == -1) {
-    commit();
-  }
-  return res;
-}
-
-ControlData* force_cdata(Ref<Continuation>& cont) {
-  if (!cont->get_cdata()) {
-    cont = Ref<ArgContExt>{true, cont};
-    return cont.unique_write().get_cdata();
-  } else {
-    return cont.write().get_cdata();
-  }
-}
-
-ControlRegs* force_cregs(Ref<Continuation>& cont) {
-  return &force_cdata(cont)->save;
-}
-
-int run_vm_code(Ref<CellSlice> code, Ref<Stack>& stack, int flags, Ref<Cell>* data_ptr, VmLog log, long long* steps,
-                GasLimits* gas_limits, std::vector<Ref<Cell>> libraries, Ref<Tuple> init_c7) {
-  VmState vm{code,
-             std::move(stack),
-             gas_limits ? *gas_limits : GasLimits{},
-             flags,
-             data_ptr ? *data_ptr : Ref<Cell>{},
-             log,
-             std::move(libraries),
-             std::move(init_c7)};
-  int res = vm.run();
-  stack = vm.get_stack_ref();
-  if (res == -1 && data_ptr) {
-    *data_ptr = vm.get_c4();
-  }
-  if (steps) {
-    *steps = vm.get_steps_count();
-  }
-  if (gas_limits) {
-    *gas_limits = vm.get_gas_limits();
-    LOG(INFO) << "steps: " << vm.get_steps_count() << " gas: used=" << gas_limits->gas_consumed()
-              << ", max=" << gas_limits->gas_max << ", limit=" << gas_limits->gas_limit
-              << ", credit=" << gas_limits->gas_credit;
-  }
-  if ((vm.get_log().log_mask & vm::VmLog::DumpStack) != 0) {
-    VM_LOG(&vm) << "BEGIN_STACK_DUMP";
-    for (int i = stack->depth(); i > 0; i--) {
-      VM_LOG(&vm) << (*stack)[i - 1].to_string();
-    }
-    VM_LOG(&vm) << "END_STACK_DUMP";
-  }
-
-  return ~res;
-}
-
-int run_vm_code(Ref<CellSlice> code, Stack& stack, int flags, Ref<Cell>* data_ptr, VmLog log, long long* steps,
-                GasLimits* gas_limits, std::vector<Ref<Cell>> libraries, Ref<Tuple> init_c7) {
-  Ref<Stack> stk{true};
-  stk.unique_write().set_contents(std::move(stack));
-  stack.clear();
-  int res = run_vm_code(code, stk, flags, data_ptr, log, steps, gas_limits, std::move(libraries), std::move(init_c7));
-  CHECK(stack.is_unique());
-  if (stk.is_null()) {
-    stack.clear();
-  } else if (&(*stk) != &stack) {
-    VmState* st = nullptr;
-    if (stk->is_unique()) {
-      VM_LOG(st) << "move resulting stack (" << stk->depth() << " entries)";
-      stack.set_contents(std::move(stk.unique_write()));
-    } else {
-      VM_LOG(st) << "copying resulting stack (" << stk->depth() << " entries)";
-      stack.set_contents(*stk);
-    }
-  }
-  return res;
-}
-
-// may throw a dictionary exception; returns nullptr if library is not found in context
-Ref<Cell> VmState::load_library(td::ConstBitPtr hash) {
-  std::unique_ptr<VmStateInterface> tmp_ctx;
-  // install temporary dummy vm state interface to prevent charging for cell load operations during library lookup
-  VmStateInterface::Guard(tmp_ctx.get());
-  for (const auto& lib_collection : libraries) {
-    auto lib = lookup_library_in(hash, lib_collection);
-    if (lib.not_null()) {
-      return lib;
-    }
-  }
-  return {};
-}
-
-bool VmState::register_library_collection(Ref<Cell> lib) {
-  if (lib.is_null()) {
-    return true;
-  }
-  libraries.push_back(std::move(lib));
-  return true;
-}
-
-void VmState::register_cell_load() {
-  consume_gas(cell_load_gas_price);
-}
-
-void VmState::register_cell_create() {
-  consume_gas(cell_create_gas_price);
-}
-
-td::BitArray<256> VmState::get_state_hash() const {
-  // TODO: implement properly, by serializing the stack etc, and computing the Merkle hash
-  td::BitArray<256> res;
-  res.clear();
-  return res;
-}
-
-td::BitArray<256> VmState::get_final_state_hash(int exit_code) const {
-  // TODO: implement properly, by serializing the stack etc, and computing the Merkle hash
-  td::BitArray<256> res;
-  res.clear();
-  return res;
-}
-
-Ref<vm::Cell> lookup_library_in(td::ConstBitPtr key, vm::Dictionary& dict) {
-  try {
-    auto val = dict.lookup(key, 256);
-    if (val.is_null() || !val->have_refs()) {
-      return {};
-    }
-    auto root = val->prefetch_ref();
-    if (root.not_null() && !root->get_hash().bits().compare(key, 256)) {
-      return root;
-    }
-    return {};
-  } catch (vm::VmError) {
-    return {};
-  }
-}
-
-Ref<vm::Cell> lookup_library_in(td::ConstBitPtr key, Ref<vm::Cell> lib_root) {
-  if (lib_root.is_null()) {
-    return lib_root;
-  }
-  vm::Dictionary dict{std::move(lib_root), 256};
-  return lookup_library_in(key, dict);
-}
-
 }  // namespace vm
diff --git a/submodules/ton/tonlib-src/crypto/vm/continuation.h b/submodules/ton/tonlib-src/crypto/vm/continuation.h
index c6c9d320ed..37abe86996 100644
--- a/submodules/ton/tonlib-src/crypto/vm/continuation.h
+++ b/submodules/ton/tonlib-src/crypto/vm/continuation.h
@@ -14,7 +14,7 @@
     You should have received a copy of the GNU Lesser General Public License
     along with TON Blockchain Library.  If not, see <http://www.gnu.org/licenses/>.
 
-    Copyright 2017-2019 Telegram Systems LLP
+    Copyright 2017-2020 Telegram Systems LLP
 */
 #pragma once
 
@@ -37,6 +37,7 @@ struct ControlRegs {
   Ref<Continuation> c[creg_num];  // c0..c3
   Ref<Cell> d[dreg_num];          // c4..c5
   Ref<Tuple> c7;                  // c7
+  bool clear();
   Ref<Continuation> get_c(unsigned idx) const {
     return idx < creg_num ? c[idx] : Ref<Continuation>{};
   }
@@ -135,6 +136,9 @@ struct ControlRegs {
   ControlRegs& operator&=(const ControlRegs& save);  // clears all c[i]'s which are present in save
   ControlRegs& operator^=(const ControlRegs& save);  // sets c[i]=save.c[i] for all save.c[i] != 0
   ControlRegs& operator^=(ControlRegs&& save);
+  bool serialize(CellBuilder& cb) const;
+  bool deserialize(CellSlice& cs, int mode = 0);
+  bool deserialize(Ref<Cell> root, int mode = 0);
 };
 
 struct ControlData {
@@ -150,11 +154,14 @@ struct ControlData {
   }
   ControlData(int _cp, Ref<Stack> _stack, int _nargs = -1) : stack(std::move(_stack)), nargs(_nargs), cp(_cp) {
   }
+  bool clear();
+  bool serialize(CellBuilder& cb) const;
+  bool deserialize(CellSlice& cs, int mode = 0);
 };
 
 class Continuation : public td::CntObject {
  public:
-  virtual int jump(VmState* st) const& = 0;
+  virtual int jump(VmState* st) const & = 0;
   virtual int jump_w(VmState* st) &;
   virtual ControlData* get_cdata() {
     return 0;
@@ -175,6 +182,15 @@ class Continuation : public td::CntObject {
     return *this;
   }
   ~Continuation() override = default;
+  virtual bool serialize(CellBuilder& cb) const {
+    return false;
+  }
+  bool serialize_ref(CellBuilder& cb) const;
+  static Ref<Continuation> deserialize(CellSlice& cs, int mode = 0);
+  static bool deserialize_to(CellSlice& cs, Ref<Continuation>& cont, int mode = 0) {
+    return (cont = deserialize(cs, mode)).not_null();
+  }
+  static bool deserialize_to(Ref<Cell> cell, Ref<Continuation>& cont, int mode = 0);
 };
 
 class QuitCont : public Continuation {
@@ -184,16 +200,20 @@ class QuitCont : public Continuation {
   QuitCont(int _code = 0) : exit_code(_code) {
   }
   ~QuitCont() override = default;
-  int jump(VmState* st) const& override {
+  int jump(VmState* st) const & override {
     return ~exit_code;
   }
+  bool serialize(CellBuilder& cb) const override;
+  static Ref<QuitCont> deserialize(CellSlice& cs, int mode = 0);
 };
 
 class ExcQuitCont : public Continuation {
  public:
   ExcQuitCont() = default;
   ~ExcQuitCont() override = default;
-  int jump(VmState* st) const& override;
+  int jump(VmState* st) const & override;
+  bool serialize(CellBuilder& cb) const override;
+  static Ref<ExcQuitCont> deserialize(CellSlice& cs, int mode = 0);
 };
 
 class PushIntCont : public Continuation {
@@ -204,8 +224,10 @@ class PushIntCont : public Continuation {
   PushIntCont(int val, Ref<Continuation> _next) : push_val(val), next(_next) {
   }
   ~PushIntCont() override = default;
-  int jump(VmState* st) const& override;
+  int jump(VmState* st) const & override;
   int jump_w(VmState* st) & override;
+  bool serialize(CellBuilder& cb) const override;
+  static Ref<PushIntCont> deserialize(CellSlice& cs, int mode = 0);
 };
 
 class RepeatCont : public Continuation {
@@ -217,8 +239,10 @@ class RepeatCont : public Continuation {
       : body(std::move(_body)), after(std::move(_after)), count(_count) {
   }
   ~RepeatCont() override = default;
-  int jump(VmState* st) const& override;
+  int jump(VmState* st) const & override;
   int jump_w(VmState* st) & override;
+  bool serialize(CellBuilder& cb) const override;
+  static Ref<RepeatCont> deserialize(CellSlice& cs, int mode = 0);
 };
 
 class AgainCont : public Continuation {
@@ -228,8 +252,10 @@ class AgainCont : public Continuation {
   AgainCont(Ref<Continuation> _body) : body(std::move(_body)) {
   }
   ~AgainCont() override = default;
-  int jump(VmState* st) const& override;
+  int jump(VmState* st) const & override;
   int jump_w(VmState* st) & override;
+  bool serialize(CellBuilder& cb) const override;
+  static Ref<AgainCont> deserialize(CellSlice& cs, int mode = 0);
 };
 
 class UntilCont : public Continuation {
@@ -239,8 +265,10 @@ class UntilCont : public Continuation {
   UntilCont(Ref<Continuation> _body, Ref<Continuation> _after) : body(std::move(_body)), after(std::move(_after)) {
   }
   ~UntilCont() override = default;
-  int jump(VmState* st) const& override;
+  int jump(VmState* st) const & override;
   int jump_w(VmState* st) & override;
+  bool serialize(CellBuilder& cb) const override;
+  static Ref<UntilCont> deserialize(CellSlice& cs, int mode = 0);
 };
 
 class WhileCont : public Continuation {
@@ -252,8 +280,10 @@ class WhileCont : public Continuation {
       : cond(std::move(_cond)), body(std::move(_body)), after(std::move(_after)), chkcond(_chk) {
   }
   ~WhileCont() override = default;
-  int jump(VmState* st) const& override;
+  int jump(VmState* st) const & override;
   int jump_w(VmState* st) & override;
+  bool serialize(CellBuilder& cb) const override;
+  static Ref<WhileCont> deserialize(CellSlice& cs, int mode = 0);
 };
 
 class ArgContExt : public Continuation {
@@ -261,14 +291,18 @@ class ArgContExt : public Continuation {
   Ref<Continuation> ext;
 
  public:
-  ArgContExt(Ref<Continuation> _ext) : data(), ext(_ext) {
+  ArgContExt(Ref<Continuation> _ext) : data(), ext(std::move(_ext)) {
   }
-  ArgContExt(Ref<Continuation> _ext, Ref<Stack> _stack) : data(_stack), ext(_ext) {
+  ArgContExt(Ref<Continuation> _ext, Ref<Stack> _stack) : data(std::move(_stack)), ext(std::move(_ext)) {
+  }
+  ArgContExt(Ref<Continuation> _ext, const ControlData& _cdata) : data(_cdata), ext(std::move(_ext)) {
+  }
+  ArgContExt(Ref<Continuation> _ext, ControlData&& _cdata) : data(std::move(_cdata)), ext(std::move(_ext)) {
   }
   ArgContExt(const ArgContExt&) = default;
   ArgContExt(ArgContExt&&) = default;
   ~ArgContExt() override = default;
-  int jump(VmState* st) const& override;
+  int jump(VmState* st) const & override;
   int jump_w(VmState* st) & override;
   ControlData* get_cdata() override {
     return &data;
@@ -279,6 +313,8 @@ class ArgContExt : public Continuation {
   td::CntObject* make_copy() const override {
     return new ArgContExt{*this};
   }
+  bool serialize(CellBuilder& cb) const override;
+  static Ref<ArgContExt> deserialize(CellSlice& cs, int mode = 0);
 };
 
 class OrdCont : public Continuation {
@@ -296,6 +332,10 @@ class OrdCont : public Continuation {
   OrdCont(Ref<CellSlice> _code, int _cp, Ref<Stack> _stack, int nargs = -1)
       : data(_cp, std::move(_stack), nargs), code(std::move(_code)) {
   }
+  OrdCont(Ref<CellSlice> _code, const ControlData& _cdata) : data(_cdata), code(std::move(_code)) {
+  }
+  OrdCont(Ref<CellSlice> _code, ControlData&& _cdata) : data(std::move(_cdata)), code(std::move(_code)) {
+  }
   OrdCont(const OrdCont&) = default;
   OrdCont(OrdCont&&) = default;
   ~OrdCont() override = default;
@@ -303,7 +343,7 @@ class OrdCont : public Continuation {
   td::CntObject* make_copy() const override {
     return new OrdCont{*this};
   }
-  int jump(VmState* st) const& override;
+  int jump(VmState* st) const & override;
   int jump_w(VmState* st) & override;
 
   ControlData* get_cdata() override {
@@ -321,297 +361,17 @@ class OrdCont : public Continuation {
   Ref<Stack> get_stack_ref() const {
     return data.stack;
   }
-  Ref<OrdCont> copy_ord() const& {
+  Ref<OrdCont> copy_ord() const & {
     return Ref<OrdCont>{true, *this};
   }
   Ref<OrdCont> copy_ord() && {
     return Ref<OrdCont>{true, *this};
   }
+  bool serialize(CellBuilder& cb) const override;
+  static Ref<OrdCont> deserialize(CellSlice& cs, int mode = 0);
 };
 
-struct GasLimits {
-  static constexpr long long infty = (1ULL << 63) - 1;
-  long long gas_max, gas_limit, gas_credit, gas_remaining, gas_base;
-  GasLimits() : gas_max(infty), gas_limit(infty), gas_credit(0), gas_remaining(infty), gas_base(infty) {
-  }
-  GasLimits(long long _limit, long long _max = infty, long long _credit = 0)
-      : gas_max(_max)
-      , gas_limit(_limit)
-      , gas_credit(_credit)
-      , gas_remaining(_limit + _credit)
-      , gas_base(gas_remaining) {
-  }
-  long long gas_consumed() const {
-    return gas_base - gas_remaining;
-  }
-  void set_limits(long long _max, long long _limit, long long _credit = 0);
-  void change_base(long long _base) {
-    gas_remaining += _base - gas_base;
-    gas_base = _base;
-  }
-  void change_limit(long long _limit);
-  void consume(long long amount) {
-    // LOG(DEBUG) << "consume " << amount << " gas (" << gas_remaining << " remaining)";
-    gas_remaining -= amount;
-  }
-  bool try_consume(long long amount) {
-    // LOG(DEBUG) << "try consume " << amount << " gas (" << gas_remaining << " remaining)";
-    return (gas_remaining -= amount) >= 0;
-  }
-  void gas_exception() const;
-  void gas_exception(bool cond) const {
-    if (!cond) {
-      gas_exception();
-    }
-  }
-  void consume_chk(long long amount) {
-    gas_exception(try_consume(amount));
-  }
-  void check() const {
-    gas_exception(gas_remaining >= 0);
-  }
-  bool final_ok() const {
-    return gas_remaining >= gas_credit;
-  }
-};
-
-struct CommittedState {
-  Ref<vm::Cell> c4, c5;
-  bool committed{false};
-};
-
-class VmState final : public VmStateInterface {
-  Ref<CellSlice> code;
-  Ref<Stack> stack;
-  ControlRegs cr;
-  CommittedState cstate;
-  int cp;
-  long long steps{0};
-  const DispatchTable* dispatch;
-  Ref<QuitCont> quit0, quit1;
-  VmLog log;
-  GasLimits gas;
-  std::vector<Ref<Cell>> libraries;
-  int stack_trace{0}, debug_off{0};
-
-  bool chksig_always_succeed{false};
-
- public:
-  static constexpr unsigned cell_load_gas_price = 100, cell_create_gas_price = 500, exception_gas_price = 50,
-                            tuple_entry_gas_price = 1;
-  VmState();
-  VmState(Ref<CellSlice> _code);
-  VmState(Ref<CellSlice> _code, Ref<Stack> _stack, int flags = 0, Ref<Cell> _data = {}, VmLog log = {},
-          std::vector<Ref<Cell>> _libraries = {}, Ref<Tuple> init_c7 = {});
-  VmState(Ref<CellSlice> _code, Ref<Stack> _stack, const GasLimits& _gas, int flags = 0, Ref<Cell> _data = {},
-          VmLog log = {}, std::vector<Ref<Cell>> _libraries = {}, Ref<Tuple> init_c7 = {});
-  template <typename... Args>
-  VmState(Ref<Cell> code_cell, Args&&... args)
-      : VmState(convert_code_cell(std::move(code_cell)), std::forward<Args>(args)...) {
-  }
-  VmState(const VmState&) = delete;
-  VmState(VmState&&) = delete;
-  VmState& operator=(const VmState&) = delete;
-  VmState& operator=(VmState&&) = delete;
-  bool set_gas_limits(long long _max, long long _limit, long long _credit = 0);
-  bool final_gas_ok() const {
-    return gas.final_ok();
-  }
-  long long gas_consumed() const {
-    return gas.gas_consumed();
-  }
-  bool committed() const {
-    return cstate.committed;
-  }
-  const CommittedState& get_committed_state() const {
-    return cstate;
-  }
-  void consume_gas(long long amount) {
-    gas.consume(amount);
-  }
-  void consume_tuple_gas(unsigned tuple_len) {
-    consume_gas(tuple_len * tuple_entry_gas_price);
-  }
-  void consume_tuple_gas(const Ref<vm::Tuple>& tup) {
-    if (tup.not_null()) {
-      consume_tuple_gas((unsigned)tup->size());
-    }
-  }
-  GasLimits get_gas_limits() const {
-    return gas;
-  }
-  void change_gas_limit(long long new_limit);
-  template <typename... Args>
-  void check_underflow(Args... args) {
-    stack->check_underflow(args...);
-  }
-  bool register_library_collection(Ref<Cell> lib);
-  Ref<Cell> load_library(
-      td::ConstBitPtr hash) override;  // may throw a dictionary exception; returns nullptr if library is not found
-  void register_cell_load() override;
-  void register_cell_create() override;
-  bool init_cp(int new_cp);
-  bool set_cp(int new_cp);
-  void force_cp(int new_cp);
-  int get_cp() const {
-    return cp;
-  }
-  int incr_stack_trace(int v) {
-    return stack_trace += v;
-  }
-  long long get_steps_count() const {
-    return steps;
-  }
-  td::BitArray<256> get_state_hash() const;
-  td::BitArray<256> get_final_state_hash(int exit_code) const;
-  int step();
-  int run();
-  Stack& get_stack() {
-    return stack.write();
-  }
-  const Stack& get_stack_const() const {
-    return *stack;
-  }
-  Ref<Stack> get_stack_ref() const {
-    return stack;
-  }
-  Ref<Continuation> get_c0() const {
-    return cr.c[0];
-  }
-  Ref<Continuation> get_c1() const {
-    return cr.c[1];
-  }
-  Ref<Continuation> get_c2() const {
-    return cr.c[2];
-  }
-  Ref<Continuation> get_c3() const {
-    return cr.c[3];
-  }
-  Ref<Cell> get_c4() const {
-    return cr.d[0];
-  }
-  Ref<Tuple> get_c7() const {
-    return cr.c7;
-  }
-  Ref<Continuation> get_c(unsigned idx) const {
-    return cr.get_c(idx);
-  }
-  Ref<Cell> get_d(unsigned idx) const {
-    return cr.get_d(idx);
-  }
-  StackEntry get(unsigned idx) const {
-    return cr.get(idx);
-  }
-  const VmLog& get_log() const {
-    return log;
-  }
-  void define_c0(Ref<Continuation> cont) {
-    cr.define_c0(std::move(cont));
-  }
-  void set_c0(Ref<Continuation> cont) {
-    cr.set_c0(std::move(cont));
-  }
-  void set_c1(Ref<Continuation> cont) {
-    cr.set_c1(std::move(cont));
-  }
-  void set_c2(Ref<Continuation> cont) {
-    cr.set_c2(std::move(cont));
-  }
-  bool set_c(unsigned idx, Ref<Continuation> val) {
-    return cr.set_c(idx, std::move(val));
-  }
-  bool set_d(unsigned idx, Ref<Cell> val) {
-    return cr.set_d(idx, std::move(val));
-  }
-  void set_c4(Ref<Cell> val) {
-    cr.set_c4(std::move(val));
-  }
-  bool set_c7(Ref<Tuple> val) {
-    return cr.set_c7(std::move(val));
-  }
-  bool set(unsigned idx, StackEntry val) {
-    return cr.set(idx, std::move(val));
-  }
-  void set_stack(Ref<Stack> new_stk) {
-    stack = std::move(new_stk);
-  }
-  Ref<Stack> swap_stack(Ref<Stack> new_stk) {
-    stack.swap(new_stk);
-    return new_stk;
-  }
-  void ensure_throw(bool cond) const {
-    if (!cond) {
-      fatal();
-    }
-  }
-  void set_code(Ref<CellSlice> _code, int _cp) {
-    code = std::move(_code);
-    force_cp(_cp);
-  }
-  Ref<CellSlice> get_code() const {
-    return code;
-  }
-  void push_code() {
-    get_stack().push_cellslice(get_code());
-  }
-  void adjust_cr(const ControlRegs& save) {
-    cr ^= save;
-  }
-  void adjust_cr(ControlRegs&& save) {
-    cr ^= save;
-  }
-  void preclear_cr(const ControlRegs& save) {
-    cr &= save;
-  }
-  int call(Ref<Continuation> cont);
-  int call(Ref<Continuation> cont, int pass_args, int ret_args = -1);
-  int jump(Ref<Continuation> cont);
-  int jump(Ref<Continuation> cont, int pass_args);
-  int ret();
-  int ret(int ret_args);
-  int ret_alt();
-  int ret_alt(int ret_args);
-  int repeat(Ref<Continuation> body, Ref<Continuation> after, long long count);
-  int again(Ref<Continuation> body);
-  int until(Ref<Continuation> body, Ref<Continuation> after);
-  int loop_while(Ref<Continuation> cond, Ref<Continuation> body, Ref<Continuation> after);
-  int throw_exception(int excno, StackEntry&& arg);
-  int throw_exception(int excno);
-  Ref<OrdCont> extract_cc(int save_cr = 1, int stack_copy = -1, int cc_args = -1);
-  void fatal(void) const {
-    throw VmFatal{};
-  }
-  int jump_to(Ref<Continuation> cont) {
-    return cont->is_unique() ? cont.unique_write().jump_w(this) : cont->jump(this);
-  }
-  static Ref<CellSlice> convert_code_cell(Ref<Cell> code_cell);
-  void commit() {
-    cstate.c4 = cr.d[0];
-    cstate.c5 = cr.d[1];
-    cstate.committed = true;
-  }
-
-  void set_chksig_always_succeed(bool flag) {
-    chksig_always_succeed = flag;
-  }
-  bool get_chksig_always_succeed() const {
-    return chksig_always_succeed;
-  }
-
- private:
-  void init_cregs(bool same_c3 = false, bool push_0 = true);
-};
-
-int run_vm_code(Ref<CellSlice> _code, Ref<Stack>& _stack, int flags = 0, Ref<Cell>* data_ptr = 0, VmLog log = {},
-                long long* steps = nullptr, GasLimits* gas_limits = nullptr, std::vector<Ref<Cell>> libraries = {},
-                Ref<Tuple> init_c7 = {});
-int run_vm_code(Ref<CellSlice> _code, Stack& _stack, int flags = 0, Ref<Cell>* data_ptr = 0, VmLog log = {},
-                long long* steps = nullptr, GasLimits* gas_limits = nullptr, std::vector<Ref<Cell>> libraries = {},
-                Ref<Tuple> init_c7 = {});
-
 ControlData* force_cdata(Ref<Continuation>& cont);
 ControlRegs* force_cregs(Ref<Continuation>& cont);
 
-Ref<vm::Cell> lookup_library_in(td::ConstBitPtr key, Ref<vm::Cell> lib_root);
-
 }  // namespace vm
diff --git a/submodules/ton/tonlib-src/crypto/vm/contops.cpp b/submodules/ton/tonlib-src/crypto/vm/contops.cpp
index 0039439e6b..63d5570539 100644
--- a/submodules/ton/tonlib-src/crypto/vm/contops.cpp
+++ b/submodules/ton/tonlib-src/crypto/vm/contops.cpp
@@ -14,7 +14,7 @@
     You should have received a copy of the GNU Lesser General Public License
     along with TON Blockchain Library.  If not, see <http://www.gnu.org/licenses/>.
 
-    Copyright 2017-2019 Telegram Systems LLP
+    Copyright 2017-2020 Telegram Systems LLP
 */
 #include <functional>
 #include "vm/contops.h"
@@ -24,6 +24,7 @@
 #include "vm/continuation.h"
 #include "vm/cellops.h"
 #include "vm/excno.hpp"
+#include "vm/vm.h"
 
 namespace vm {
 
@@ -626,9 +627,23 @@ inline void throw_rangechk(bool ok) {
 }
 }  // namespace
 
+int exec_bless_pop_c3(VmState* st) {
+  Stack& stack = st->get_stack();
+  VM_LOG(st) << "execute CTOSBLESSPOPc3";
+  stack.check_underflow(1);
+  throw_typechk(st->set_c(3, Ref<OrdCont>{true, vm::load_cell_slice_ref(stack.pop_cell()), st->get_cp()}));
+  return 0;
+}
+
 int exec_pop_ctr(VmState* st, unsigned args) {
   unsigned idx = args & 15;
   VM_LOG(st) << "execute POP c" << idx;
+  /*
+  if (idx == 3 && st->get_stack().depth() > 0 && st->get_stack().tos().is(StackEntry::t_cell)) {
+    // temp hack: accept cell argument for POP c3 and do auto-BLESSing
+    return exec_bless_pop_c3(st);
+  }
+  */
   throw_typechk(st->set(idx, st->get_stack().pop_chk()));
   return 0;
 }
diff --git a/submodules/ton/tonlib-src/crypto/vm/cp0.cpp b/submodules/ton/tonlib-src/crypto/vm/cp0.cpp
index 3e062140f2..fe5dd8ef1f 100644
--- a/submodules/ton/tonlib-src/crypto/vm/cp0.cpp
+++ b/submodules/ton/tonlib-src/crypto/vm/cp0.cpp
@@ -14,7 +14,7 @@
     You should have received a copy of the GNU Lesser General Public License
     along with TON Blockchain Library.  If not, see <http://www.gnu.org/licenses/>.
 
-    Copyright 2017-2019 Telegram Systems LLP
+    Copyright 2017-2020 Telegram Systems LLP
 */
 #include "cp0.h"
 #include "opctable.h"
@@ -29,7 +29,8 @@
 
 namespace vm {
 
-const OpcodeTable* init_op_cp0() {
+const OpcodeTable* init_op_cp0(bool enable_debug) {
+  set_debug_enabled(enable_debug);
   static const OpcodeTable* static_op_cp0 = [] {
     auto op_cp0 = new OpcodeTable("TEST CODEPAGE", Codepage::test_cp);
     register_stack_ops(*op_cp0);         // stackops.cpp
diff --git a/submodules/ton/tonlib-src/crypto/vm/cp0.h b/submodules/ton/tonlib-src/crypto/vm/cp0.h
index 34fc971142..9a6579697d 100644
--- a/submodules/ton/tonlib-src/crypto/vm/cp0.h
+++ b/submodules/ton/tonlib-src/crypto/vm/cp0.h
@@ -14,7 +14,7 @@
     You should have received a copy of the GNU Lesser General Public License
     along with TON Blockchain Library.  If not, see <http://www.gnu.org/licenses/>.
 
-    Copyright 2017-2019 Telegram Systems LLP
+    Copyright 2017-2020 Telegram Systems LLP
 */
 #pragma once
 #include "vm/dispatch.h"
@@ -23,6 +23,6 @@ namespace vm {
 
 class OpcodeTable;
 
-const OpcodeTable* init_op_cp0();
+const OpcodeTable* init_op_cp0(bool debug_enabled = false);
 
 }  // namespace vm
diff --git a/submodules/ton/tonlib-src/crypto/vm/debugops.cpp b/submodules/ton/tonlib-src/crypto/vm/debugops.cpp
index 911d6313b8..0ec205a315 100644
--- a/submodules/ton/tonlib-src/crypto/vm/debugops.cpp
+++ b/submodules/ton/tonlib-src/crypto/vm/debugops.cpp
@@ -14,19 +14,23 @@
     You should have received a copy of the GNU Lesser General Public License
     along with TON Blockchain Library.  If not, see <http://www.gnu.org/licenses/>.
 
-    Copyright 2017-2019 Telegram Systems LLP
+    Copyright 2017-2020 Telegram Systems LLP
 */
 #include <functional>
 #include "vm/debugops.h"
 #include "vm/log.h"
 #include "vm/opctable.h"
 #include "vm/stack.hpp"
-#include "vm/continuation.h"
 #include "vm/excno.hpp"
+#include "vm/vm.h"
 
 namespace vm {
 
-bool vm_debug_enabled = true;
+bool vm_debug_enabled = false;
+
+void set_debug_enabled(bool enable_debug) {
+  vm_debug_enabled = enable_debug;
+}
 
 int exec_dummy_debug(VmState* st, int args) {
   VM_LOG(st) << "execute DEBUG " << (args & 0xff);
@@ -66,6 +70,9 @@ int compute_len_debug_str(const CellSlice& cs, unsigned args, int pfx_bits) {
 
 int exec_dump_stack(VmState* st) {
   VM_LOG(st) << "execute DUMPSTK";
+  if (!vm_debug_enabled) {
+    return 0;
+  }
   Stack& stack = st->get_stack();
   int d = stack.depth();
   std::cerr << "#DEBUG#: stack(" << d << " values) : ";
@@ -74,7 +81,8 @@ int exec_dump_stack(VmState* st) {
     d = 255;
   }
   for (int i = d; i > 0; i--) {
-    std::cerr << stack[i - 1].to_string() << " ";
+    stack[i - 1].print_list(std::cerr);
+    std::cerr << ' ';
   }
   std::cerr << std::endl;
   return 0;
@@ -83,9 +91,14 @@ int exec_dump_stack(VmState* st) {
 int exec_dump_value(VmState* st, unsigned arg) {
   arg &= 15;
   VM_LOG(st) << "execute DUMP s" << arg;
+  if (!vm_debug_enabled) {
+    return 0;
+  }
   Stack& stack = st->get_stack();
   if ((int)arg < stack.depth()) {
-    std::cerr << "#DEBUG#: s" << arg << " = " << stack[arg].to_string() << std::endl;
+    std::cerr << "#DEBUG#: s" << arg << " = ";
+    stack[arg].print_list(std::cerr);
+    std::cerr << std::endl;
   } else {
     std::cerr << "#DEBUG#: s" << arg << " is absent" << std::endl;
   }
diff --git a/submodules/ton/tonlib-src/crypto/vm/debugops.h b/submodules/ton/tonlib-src/crypto/vm/debugops.h
index 7c7b27d010..ba3d673ff4 100644
--- a/submodules/ton/tonlib-src/crypto/vm/debugops.h
+++ b/submodules/ton/tonlib-src/crypto/vm/debugops.h
@@ -14,7 +14,7 @@
     You should have received a copy of the GNU Lesser General Public License
     along with TON Blockchain Library.  If not, see <http://www.gnu.org/licenses/>.
 
-    Copyright 2017-2019 Telegram Systems LLP
+    Copyright 2017-2020 Telegram Systems LLP
 */
 #pragma once
 
@@ -25,5 +25,6 @@ class OpcodeTable;
 extern bool vm_debug_enabled;
 
 void register_debug_ops(OpcodeTable& cp0);
+void set_debug_enabled(bool enable_debug);
 
 }  // namespace vm
diff --git a/submodules/ton/tonlib-src/crypto/vm/dict.cpp b/submodules/ton/tonlib-src/crypto/vm/dict.cpp
index 7037e7e41c..fc94a2dc5a 100644
--- a/submodules/ton/tonlib-src/crypto/vm/dict.cpp
+++ b/submodules/ton/tonlib-src/crypto/vm/dict.cpp
@@ -14,7 +14,7 @@
     You should have received a copy of the GNU Lesser General Public License
     along with TON Blockchain Library.  If not, see <http://www.gnu.org/licenses/>.
 
-    Copyright 2017-2019 Telegram Systems LLP
+    Copyright 2017-2020 Telegram Systems LLP
 */
 #include "vm/dict.h"
 #include "vm/cells.h"
@@ -179,7 +179,7 @@ bool DictionaryBase::append_dict_to_bool(CellBuilder& cb) && {
   return cb.store_maybe_ref(std::move(root_cell));
 }
 
-bool DictionaryBase::append_dict_to_bool(CellBuilder& cb) const& {
+bool DictionaryBase::append_dict_to_bool(CellBuilder& cb) const & {
   return is_valid() && cb.store_maybe_ref(root_cell);
 }
 
@@ -793,8 +793,7 @@ std::tuple<Ref<CellSlice>, Ref<Cell>, bool> dict_lookup_set(Ref<Cell> dict, td::
 std::pair<Ref<Cell>, bool> pfx_dict_set(Ref<Cell> dict, td::ConstBitPtr key, int m, int n,
                                         const PrefixDictionary::store_value_func_t& store_val,
                                         Dictionary::SetMode mode) {
-  std::cerr << "up to " << n << "-bit prefix code dictionary modification for " << m << "-bit key = " << key.to_hex(m)
-            << std::endl;
+  // std::cerr << "up to " << n << "-bit prefix code dictionary modification for " << m << "-bit key = " << key.to_hex(m) << std::endl;
   if (m > n) {
     return std::make_pair(Ref<Cell>{}, false);
   }
@@ -1309,6 +1308,294 @@ Ref<Cell> Dictionary::extract_minmax_key_ref(td::BitPtr key_buffer, int key_len,
   return extract_value_ref(extract_minmax_key(key_buffer, key_len, fetch_max, invert_first));
 }
 
+/*
+ *
+ *   ITERATORS (to be moved into a separate file)
+ *
+ */
+
+bool DictIterator::prevalidate(int mode) {
+  if (key_bits_ <= 0 || key_bits_ > Dictionary::max_key_bits) {
+    reset();
+    flags_ &= ~f_valid;
+    key_bits_ = 0;
+    return false;
+  } else {
+    if (mode >= 0) {
+      order_ = -(mode & 1) ^ ((mode >> 1) & 1);
+    }
+    flags_ |= f_valid;
+    return true;
+  }
+}
+
+bool DictIterator::bind(const DictionaryFixed& dict, int do_rewind) {
+  if (!is_valid() || !is_bound_to(dict)) {
+    return false;
+  }
+  dict_ = &dict;
+  label_mode_ = dict.label_mode();
+  return !do_rewind || rewind(do_rewind < 0);
+}
+
+bool DictIterator::rebind_to(const DictionaryFixed& dict, int do_rewind) {
+  reset();
+  dict_ = &dict;
+  label_mode_ = dict.label_mode();
+  root_ = dict.get_root_cell();
+  key_bits_ = dict.get_key_bits();
+  flags_ &= 3;
+  return prevalidate() && (!do_rewind || rewind(do_rewind < 0));
+}
+
+int DictIterator::compare_keys(td::ConstBitPtr a, td::ConstBitPtr b) const {
+  if (!key_bits_) {
+    return 0;
+  }
+  int c = (int)*a - (int)*b;
+  if (c) {
+    return (order_ & 1) ? -c : c;
+  }
+  c = a.compare(b, key_bits_);
+  return order_ >= 0 ? c : -c;
+}
+
+bool DictIterator::dive(int mode) {
+  int n = key_bits_, m = 0;
+  Ref<Cell> node = path_.empty() ? root_ : path_.back().next;
+  if (!path_.empty()) {
+    m = path_.back().pos + 1;
+    n -= m;
+    mode >>= 1;
+  }
+  // similar to dict_lookup_minmax: create new path down until the leaf
+  while (1) {
+    LabelParser label{std::move(node), n, label_mode_};
+    int l = label.extract_label_to(key(m));
+    assert(l >= 0 && l <= n);
+    m += l;
+    n -= l;
+    if (!n) {
+      leaf_ = std::move(label.remainder);
+      return true;
+    }
+    if (l) {
+      mode >>= 1;
+    }
+    int bit = mode & 1;
+    node = label.remainder->prefetch_ref(bit);
+    auto alt = label.remainder->prefetch_ref(1 - bit);
+    path_.emplace_back(node, std::move(alt), m, bit);
+    *key(m++) = (bool)bit;
+    --n;
+    mode >>= 1;
+  }
+}
+
+bool DictIterator::rewind(bool to_end) {
+  if (!is_valid()) {
+    return false;
+  }
+  if (root_.is_null()) {
+    return true;
+  }
+  auto node = root_;
+  int k = 0, mode = order_ ^ -(int)to_end;
+  // NB: can optimize by reusing several first entries of current path_
+  while (k < (int)path_.size()) {
+    auto& pe = path_[k++];
+    assert(pe.pos >= 0 && pe.pos < key_bits_);
+    if (pe.pos) {
+      mode >>= 1;
+    }
+    if (pe.v != (bool)(mode & 1)) {
+      // went different way at this node before, rotate and stop going down
+      pe.rotate(key());
+      leaf_.clear();
+      path_.resize(k);  // drop the remainder of the original path after first incorrect branch
+      return dive(mode);
+    }
+    mode >>= 1;
+  }
+  return !eof() || dive(mode);
+}
+
+bool DictIterator::next(bool go_back) {
+  if (!is_valid() || root_.is_null() || eof()) {
+    return false;
+  }
+  leaf_.clear();
+  int mode = order_ ^ -(int)go_back;
+  while (!path_.empty()) {
+    auto& pe = path_.back();
+    int bit = (mode >> (pe.pos > 0)) & 1;
+    if (pe.v == bit) {
+      pe.rotate(key());
+      return dive(mode);
+    }
+    path_.pop_back();
+  }
+  return false;
+}
+
+bool DictIterator::lookup(td::ConstBitPtr pos, int pos_bits, bool strict_after, bool backw) {
+  if (!is_valid() || root_.is_null() || pos_bits < 0 || pos_bits > key_bits_) {
+    return false;
+  }
+  int fill_mode = -(strict_after ^ backw) ^ order_;
+  if (!eof()) {
+    // reuse part of current path
+    std::size_t bp0 = 0;
+    int bp;
+    if (!key().compare(pos, pos_bits, &bp0)) {
+      bp = pos_bits;
+      if (bp >= key_bits_) {
+        // already at the desired element
+        return !strict_after || next(backw);
+      }
+    } else {
+      bp = (int)bp0;
+    }
+    int k = 0;
+    while (k < (int)path_.size() && path_[k].pos <= bp) {
+      auto& pe = path_[k];
+      if (pe.pos == bp) {
+        if (bp < pos_bits || pe.v != ((fill_mode >> (bp > 0)) & 1)) {
+          // rotate the last path element if it branched in incorrect direction
+          path_[k++].rotate(key());
+        }
+        break;
+      }
+      ++k;
+    }
+    path_.resize(k);  // drop the remainder of the path
+  }
+  int m = 0, n = key_bits_;
+  auto node = path_.empty() ? root_ : path_.back().next;
+  if (!path_.empty()) {
+    m = path_.back().pos + 1;  // m <= pos_bits + 1
+    n -= m;
+  }
+  int mode = -backw ^ order_, action = 0;
+  while (m < pos_bits && !action) {
+    LabelParser label{std::move(node), n, label_mode_};
+    int pfx_len = label.common_prefix_len(pos + m, pos_bits - m);
+    int l = label.extract_label_to(key() + m);
+    assert(pfx_len >= 0 && pfx_len <= label.l_bits && label.l_bits <= n);
+    if (pfx_len == pos_bits - m) {
+      // end of given position prefix
+      if (strict_after) {
+        // have to backtrace
+        action = 2;
+        break;
+      } else {
+        // label has correct prefix, register and dive down
+        action = 1;
+      }
+    } else if (pfx_len < l) {
+      // all subtree is either smaller or larger than required
+      if (pos[m + pfx_len] != ((mode >> (int)(m + pfx_len > 0)) & 1)) {
+        // label smaller than required, have to backtrace
+        action = 2;
+        break;
+      } else {
+        // label larger than required, register node and dive down
+        action = 1;
+      }
+    }
+    // if we are here, then either action=1 (dive down activated)
+    // ... or l = pfx_len < pos_bits - m
+    // continue going down
+    m += l;
+    n -= l;
+    if (!n) {
+      // key found in a leaf
+      leaf_ = std::move(label.remainder);
+      return true;
+    }
+    bool bit = action ? ((mode >> (m > 0)) & 1) : pos[m];
+    node = label.remainder->prefetch_ref(bit);
+    auto alt = label.remainder->prefetch_ref(1 - bit);
+    path_.emplace_back(node, std::move(alt), m, bit);
+    *key(m++) = (bool)bit;
+    --n;
+  }
+  if (!action) {
+    action = (strict_after ? 2 : 1);
+  }
+  if (action == 2) {
+    // have to backtrace to the "next" larger branch
+    // similar to next()
+    leaf_.clear();
+    while (!path_.empty()) {
+      auto& pe = path_.back();
+      int bit = (mode >> (pe.pos > 0)) & 1;
+      if (pe.v == bit) {
+        pe.rotate(key());
+        return dive(mode);
+      }
+      path_.pop_back();
+    }
+    return false;  // eof: no suitable element
+  }
+  // action=1, dive down
+  return dive(mode);
+}
+
+DictIterator DictionaryFixed::null_iterator() {
+  force_validate();
+  return DictIterator{*this};
+}
+
+DictIterator DictionaryFixed::make_iterator(int mode) {
+  force_validate();
+  DictIterator it{*this, mode};
+  it.rewind();
+  return it;
+}
+
+DictIterator DictionaryFixed::init_iterator(bool backw, bool invert_first) {
+  return make_iterator((int)backw + 2 * (int)invert_first);
+}
+
+DictIterator DictionaryFixed::begin() {
+  return init_iterator();
+}
+
+DictIterator DictionaryFixed::end() {
+  return null_iterator();
+}
+
+DictIterator DictionaryFixed::cbegin() {
+  return begin();
+}
+
+DictIterator DictionaryFixed::cend() {
+  return end();
+}
+
+DictIterator DictionaryFixed::rbegin() {
+  return init_iterator(true);
+}
+
+DictIterator DictionaryFixed::rend() {
+  return null_iterator();
+}
+
+DictIterator DictionaryFixed::crbegin() {
+  return rbegin();
+}
+
+DictIterator DictionaryFixed::crend() {
+  return rend();
+}
+
+/*
+ *
+ *   END (ITERATORS)
+ *
+ */
+
 std::pair<Ref<Cell>, bool> DictionaryFixed::extract_prefix_subdict_internal(Ref<Cell> dict, td::ConstBitPtr prefix,
                                                                             int prefix_len, bool remove_prefix) const {
   if (is_empty() || prefix_len <= 0) {
@@ -2241,7 +2528,7 @@ Ref<CellSlice> AugmentedDictionary::extract_root() && {
   return std::move(root);
 }
 
-bool AugmentedDictionary::append_dict_to_bool(CellBuilder& cb) const& {
+bool AugmentedDictionary::append_dict_to_bool(CellBuilder& cb) const & {
   if (!is_valid()) {
     return false;
   }
@@ -2310,6 +2597,14 @@ Ref<CellSlice> AugmentedDictionary::get_node_extra(Ref<Cell> cell_ref, int n) co
   return {};
 }
 
+Ref<CellSlice> AugmentedDictionary::extract_leaf_value(Ref<CellSlice> leaf) const {
+  if (leaf.not_null() && aug.skip_extra(leaf.write())) {
+    return std::move(leaf);
+  } else {
+    return Ref<CellSlice>{};
+  }
+}
+
 Ref<CellSlice> AugmentedDictionary::get_root_extra() const {
   return get_node_extra(root_cell, key_bits);
 }
@@ -2536,7 +2831,7 @@ bool AugmentedDictionary::set(td::ConstBitPtr key, int key_len, const CellSlice&
   }
   auto res = dict_set(get_root_cell(), key, key_len, value, mode);
   if (res.second) {
-    //vm::CellSlice cs{vm::NoVm{}, res.first};
+    //vm::CellSlice cs{vm::NoVmOrd(), res.first};
     //std::cerr << "new augmented dictionary root is:\n";
     //cs.print_rec(std::cerr);
     set_root_cell(std::move(res.first));
diff --git a/submodules/ton/tonlib-src/crypto/vm/dict.h b/submodules/ton/tonlib-src/crypto/vm/dict.h
index 11234277dd..761c4073b7 100644
--- a/submodules/ton/tonlib-src/crypto/vm/dict.h
+++ b/submodules/ton/tonlib-src/crypto/vm/dict.h
@@ -14,7 +14,7 @@
     You should have received a copy of the GNU Lesser General Public License
     along with TON Blockchain Library.  If not, see <http://www.gnu.org/licenses/>.
 
-    Copyright 2017-2019 Telegram Systems LLP
+    Copyright 2017-2020 Telegram Systems LLP
 */
 #pragma once
 #include "common/bitstring.h"
@@ -171,6 +171,13 @@ class DictionaryBase {
   }
 };
 
+class DictIterator;
+
+template <typename T>
+std::pair<T, int> dict_range(T&& dict, bool rev = false, bool sgnd = false) {
+  return std::pair<T, int>{std::forward<T>(dict), (int)rev + 2 * (int)sgnd};
+}
+
 class DictionaryFixed : public DictionaryBase {
  public:
   typedef std::function<int(vm::CellSlice&, td::ConstBitPtr, int)> filter_func_t;
@@ -199,6 +206,9 @@ class DictionaryFixed : public DictionaryBase {
   static BitSlice integer_key(td::RefInt256 x, unsigned n, bool sgnd = true, unsigned char buffer[128] = 0,
                               bool quiet = false);
   static bool integer_key_simple(td::RefInt256 x, unsigned n, bool sgnd, td::BitPtr buffer, bool quiet = false);
+  td::RefInt256 key_as_integer(td::ConstBitPtr key, bool sgnd = false) const {
+    return td::bits_to_refint(key, key_bits, sgnd);
+  }
   bool key_exists(td::ConstBitPtr key, int key_len);
   bool int_key_exists(long long key);
   bool uint_key_exists(unsigned long long key);
@@ -221,6 +231,17 @@ class DictionaryFixed : public DictionaryBase {
   bool scan_diff(DictionaryFixed& dict2, const scan_diff_func_t& diff_func, int check_augm = 0);
   bool validate_check(const foreach_func_t& foreach_func, bool invert_first = false);
   bool validate_all();
+  DictIterator null_iterator();
+  DictIterator init_iterator(bool backw = false, bool invert_first = false);
+  DictIterator make_iterator(int mode);
+  DictIterator begin();
+  DictIterator end();
+  DictIterator cbegin();
+  DictIterator cend();
+  DictIterator rbegin();
+  DictIterator rend();
+  DictIterator crbegin();
+  DictIterator crend();
   template <typename T>
   bool key_exists(const T& key) {
     return key_exists(key.bits(), key.size());
@@ -237,11 +258,19 @@ class DictionaryFixed : public DictionaryBase {
   Ref<CellSlice> get_minmax_key(T& key_buffer, bool fetch_max = false, bool invert_first = false) {
     return get_minmax_key(key_buffer.bits(), key_buffer.size(), fetch_max, invert_first);
   }
+  template <typename T>
+  Ref<CellSlice> lookup_nearest_key(T& key_buffer, bool fetch_next = false, bool allow_eq = false,
+                                    bool invert_first = false) {
+    return lookup_nearest_key(key_buffer.bits(), key_buffer.size(), fetch_next, allow_eq, invert_first);
+  }
 
  protected:
   virtual int label_mode() const {
     return dict::LabelParser::chk_all;
   }
+  virtual Ref<CellSlice> extract_leaf_value(Ref<CellSlice> leaf) const {
+    return leaf;
+  }
   virtual Ref<Cell> finish_create_leaf(CellBuilder& cb, const CellSlice& value) const;
   virtual Ref<Cell> finish_create_fork(CellBuilder& cb, Ref<Cell> c1, Ref<Cell> c2, int n) const;
   virtual bool check_fork(CellSlice& cs, Ref<Cell> c1, Ref<Cell> c2, int n) const {
@@ -254,6 +283,7 @@ class DictionaryFixed : public DictionaryBase {
     return check_leaf(cs_ref.write(), key, key_len);
   }
   bool check_fork_raw(Ref<CellSlice> cs_ref, int n) const;
+  friend class DictIterator;
 
  private:
   std::pair<Ref<CellSlice>, Ref<Cell>> dict_lookup_delete(Ref<Cell> dict, td::ConstBitPtr key, int n) const;
@@ -272,6 +302,148 @@ class DictionaryFixed : public DictionaryBase {
                            const foreach_func_t& foreach_func, bool invert_first = false) const;
 };
 
+class DictIterator {
+  const DictionaryFixed* dict_{nullptr};
+  Ref<Cell> root_;
+  int label_mode_{dict::LabelParser::chk_size};
+  int key_bits_;
+  int flags_;
+  int order_;
+  unsigned char key_buffer[DictionaryBase::max_key_bytes];
+  bool prevalidate(int mode = -1);
+  enum { f_valid = 4 };
+
+ protected:
+  struct Fork {
+    Ref<Cell> next, alt;
+    int pos;
+    bool v;
+    Fork() : pos(-1) {
+    }
+    Fork(Ref<Cell> _next, Ref<Cell> _alt, int _pos, bool _v)
+        : next(std::move(_next)), alt(std::move(_alt)), pos(_pos), v(_v) {
+    }
+    void rotate(td::BitPtr key) {
+      std::swap(next, alt);
+      key[pos] = (v ^= true);
+    }
+  };
+  std::vector<Fork> path_;
+  Ref<CellSlice> leaf_;
+
+  td::BitPtr key(int offs = 0) {
+    return td::BitPtr{key_buffer, offs};
+  }
+  td::ConstBitPtr key(int offs = 0) const {
+    return td::ConstBitPtr{key_buffer, offs};
+  }
+  td::ConstBitPtr ckey(int offs = 0) const {
+    return td::ConstBitPtr{key_buffer, offs};
+  }
+
+ public:
+  DictIterator() : key_bits_(0), flags_(0), order_(0) {
+  }
+  // mode: 0 = bidir, +4 = fwd only, +8 = back only; +1 = reverse directions, +2 = signed int keys
+  enum { it_reverse = 1, it_signed = 2 };
+  DictIterator(Ref<Cell> root_cell, int key_bits, int mode = 0)
+      : root_(std::move(root_cell)), key_bits_(key_bits), flags_(mode >> 2) {
+    prevalidate(mode & 3);
+  }
+  DictIterator(const DictionaryFixed& dict, int mode = 0)
+      : DictIterator(dict.get_root_cell(), dict.get_key_bits(), mode) {
+    dict_ = &dict;
+    label_mode_ = dict.label_mode();
+  }
+  bool is_valid() const {
+    return flags_ & f_valid;
+  }
+  bool eof() const {
+    return leaf_.is_null();
+  }
+  bool reset() {
+    dict_ = nullptr;
+    root_.clear();
+    path_.clear();
+    leaf_.clear();
+    return true;
+  }
+  td::ConstBitPtr cur_pos() const {
+    return eof() ? td::ConstBitPtr{nullptr} : key();
+  }
+  Ref<Cell> get_root_cell() const {
+    return root_;
+  }
+  int get_key_bits() const {
+    return key_bits_;
+  }
+  bool is_bound() const {
+    return dict_;
+  }
+  bool is_bound_to(const DictionaryFixed& dict) const {
+    return root_.not_null() == dict.get_root_cell().not_null() &&
+           (root_.not_null() ? root_.get() == dict.get_root_cell().get() : key_bits_ == dict.get_key_bits());
+  }
+  bool bind(const DictionaryFixed& dict, int do_rewind = 0);
+  bool rebind_to(const DictionaryFixed& dict, int do_rewind = 0);
+  bool rewind(bool to_end = false);
+  bool next(bool backw = false);
+  bool prev() {
+    return next(true);
+  }
+  bool lookup(td::ConstBitPtr pos, int pos_bits, bool strict_after = false, bool backw = false);
+  template <typename T>
+  bool lookup(const T& key, bool strict_after = false, bool backw = false) {
+    return lookup(key.bits(), key.size(), strict_after, backw);
+  }
+  Ref<CellSlice> cur_value() const {
+    return dict_ ? dict_->extract_leaf_value(leaf_) : Ref<CellSlice>{};
+  }
+  Ref<CellSlice> cur_value_raw() const {
+    return leaf_;
+  }
+  std::pair<td::ConstBitPtr, Ref<CellSlice>> operator*() const {
+    return std::make_pair(cur_pos(), cur_value());
+  }
+  bool bound_to_same(const DictIterator& other) const {
+    return dict_ && dict_ == other.dict_;
+  }
+  bool operator==(const DictIterator& other) const {
+    return bound_to_same(other) && eof() == other.eof() && (eof() || key().equals(other.key(), key_bits_));
+  }
+  int compare_keys(td::ConstBitPtr a, td::ConstBitPtr b) const;
+  bool operator<(const DictIterator& other) const {
+    return bound_to_same(other) && !eof() && (other.eof() || compare_keys(key(), other.key()) < 0);
+  }
+  bool operator!=(const DictIterator& other) const {
+    return !(operator==(other));
+  }
+  bool operator>(const DictIterator& other) const {
+    return other < *this;
+  }
+  DictIterator& operator++() {
+    next();
+    return *this;
+  }
+  DictIterator& operator--() {
+    next(true);
+    return *this;
+  }
+
+ private:
+  bool dive(int mode);
+};
+
+template <typename T>
+DictIterator begin(std::pair<T, int> dictm) {
+  return dictm.first.make_iterator(dictm.second);
+}
+
+template <typename T>
+DictIterator end(std::pair<T, int> dictm) {
+  return dictm.first.null_iterator();
+}
+
 class Dictionary final : public DictionaryFixed {
  public:
   typedef std::function<bool(CellBuilder&, Ref<CellSlice>)> simple_map_func_t;
@@ -351,6 +523,9 @@ class Dictionary final : public DictionaryFixed {
   Ref<CellSlice> lookup_set_builder(const T& key, Ref<vm::CellBuilder> val_ref, SetMode mode = SetMode::Set) {
     return lookup_set_builder(key.bits(), key.size(), std::move(val_ref), mode);
   }
+  auto range(bool rev = false, bool sgnd = false) {
+    return dict_range(*this, rev, sgnd);
+  }
 
  private:
   bool check_fork(CellSlice& cs, Ref<Cell> c1, Ref<Cell> c2, int n) const override {
@@ -449,6 +624,9 @@ class AugmentedDictionary final : public DictionaryFixed {
   Ref<Cell> lookup_delete_ref(const T& key) {
     return lookup_delete_ref(key.bits(), key.size());
   }
+  auto range(bool rev = false, bool sgnd = false) {
+    return dict_range(*this, rev, sgnd);
+  }
 
   Ref<CellSlice> extract_value(Ref<CellSlice> value_extra) const;
   Ref<Cell> extract_value_ref(Ref<CellSlice> value_extra) const;
@@ -458,6 +636,7 @@ class AugmentedDictionary final : public DictionaryFixed {
  private:
   bool compute_root() const;
   Ref<CellSlice> get_node_extra(Ref<Cell> cell_ref, int n) const;
+  Ref<CellSlice> extract_leaf_value(Ref<CellSlice> leaf) const override;
   bool check_leaf(CellSlice& cs, td::ConstBitPtr key, int key_len) const override;
   bool check_fork(CellSlice& cs, Ref<Cell> c1, Ref<Cell> c2, int n) const override;
   Ref<Cell> finish_create_leaf(CellBuilder& cb, const CellSlice& value) const override;
diff --git a/submodules/ton/tonlib-src/crypto/vm/dictops.cpp b/submodules/ton/tonlib-src/crypto/vm/dictops.cpp
index 9f4faed9c6..c798b33397 100644
--- a/submodules/ton/tonlib-src/crypto/vm/dictops.cpp
+++ b/submodules/ton/tonlib-src/crypto/vm/dictops.cpp
@@ -14,14 +14,14 @@
     You should have received a copy of the GNU Lesser General Public License
     along with TON Blockchain Library.  If not, see <http://www.gnu.org/licenses/>.
 
-    Copyright 2017-2019 Telegram Systems LLP
+    Copyright 2017-2020 Telegram Systems LLP
 */
 #include <functional>
 #include "vm/log.h"
 #include "vm/opctable.h"
 #include "vm/stack.hpp"
-#include "vm/continuation.h"
 #include "vm/excno.hpp"
+#include "vm/vm.h"
 #include "common/bigint.hpp"
 #include "common/refint.h"
 #include "vm/dictops.h"
@@ -210,7 +210,7 @@ int exec_dict_get(VmState* st, unsigned args) {
   BitSlice key;
   unsigned char buffer[Dictionary::max_key_bytes];
   if (args & 4) {
-    key = dict.integer_key(stack.pop_int(), n, !(args & 2), buffer, true);
+    key = dict.integer_key(stack.pop_int_finite(), n, !(args & 2), buffer, true);
     if (!key.is_valid()) {
       stack.push_smallint(0);
       return 0;
@@ -250,7 +250,7 @@ int exec_dict_get_optref(VmState* st, unsigned args) {
   BitSlice key;
   unsigned char buffer[Dictionary::max_key_bytes];
   if (args & 2) {
-    key = dict.integer_key(stack.pop_int(), n, !(args & 1), buffer, true);
+    key = dict.integer_key(stack.pop_int_finite(), n, !(args & 1), buffer, true);
     if (!key.is_valid()) {
       stack.push_null();
       return 0;
@@ -377,7 +377,7 @@ int exec_dict_delete(VmState* st, unsigned args) {
   BitSlice key;
   unsigned char buffer[Dictionary::max_key_bytes];
   if (args & 2) {
-    key = dict.integer_key(stack.pop_int(), n, !(args & 1), buffer);
+    key = dict.integer_key(stack.pop_int_finite(), n, !(args & 1), buffer);
     if (!key.is_valid()) {
       push_dict(stack, std::move(dict));
       stack.push_smallint(0);
@@ -404,7 +404,7 @@ int exec_dict_deleteget(VmState* st, unsigned args) {
   BitSlice key;
   unsigned char buffer[Dictionary::max_key_bytes];
   if (args & 4) {
-    key = dict.integer_key(stack.pop_int(), n, !(args & 2), buffer);
+    key = dict.integer_key(stack.pop_int_finite(), n, !(args & 2), buffer);
     if (!key.is_valid()) {
       push_dict(stack, std::move(dict));
       stack.push_smallint(0);
@@ -588,23 +588,29 @@ int exec_pfx_dict_delete(VmState* st) {
 
 int exec_dict_get_exec(VmState* st, unsigned args) {
   Stack& stack = st->get_stack();
-  VM_LOG(st) << "execute DICT" << (args & 1 ? 'U' : 'I') << "GET" << (args & 2 ? "EXEC\n" : "JMP\n");
+  VM_LOG(st) << "execute DICT" << (args & 1 ? 'U' : 'I') << "GET" << (args & 2 ? "EXEC" : "JMP")
+             << (args & 4 ? "Z" : "");
   stack.check_underflow(3);
   int n = stack.pop_smallint_range(Dictionary::max_key_bits);
   Dictionary dict{stack.pop_maybe_cell(), n};
   unsigned char buffer[Dictionary::max_key_bytes];
-  dict.integer_key_simple(stack.pop_int(), n, !(args & 1), td::BitPtr{buffer});
-  auto value = dict.lookup(td::BitPtr{buffer}, n);
-  if (value.not_null()) {
-    Ref<OrdCont> cont{true, std::move(value), st->get_cp()};
-    return (args & 2) ? st->call(std::move(cont)) : st->jump(std::move(cont));
-  } else {
-    return 0;
+  auto idx = stack.pop_int_finite();
+  if (dict.integer_key_simple(idx, n, !(args & 1), td::BitPtr{buffer}, true)) {
+    auto value = dict.lookup(td::BitPtr{buffer}, n);
+    if (value.not_null()) {
+      Ref<OrdCont> cont{true, std::move(value), st->get_cp()};
+      return (args & 2) ? st->call(std::move(cont)) : st->jump(std::move(cont));
+    }
   }
+  // key not found or out of range
+  if (args & 4) {
+    stack.push_int(std::move(idx));
+  }
+  return 0;
 }
 
 std::string dump_dict_get_exec(CellSlice& cs, unsigned args) {
-  return std::string{"DICT"} + (args & 1 ? 'U' : 'I') + "GET" + (args & 2 ? "EXEC" : "JMP");
+  return std::string{"DICT"} + (args & 1 ? 'U' : 'I') + "GET" + (args & 2 ? "EXEC" : "JMP") + (args & 4 ? "Z" : "");
 }
 
 int exec_push_const_dict(VmState* st, CellSlice& cs, unsigned args, int pfx_bits) {
@@ -720,7 +726,7 @@ int exec_subdict_get(VmState* st, unsigned args) {
   BitSlice key;
   unsigned char buffer[Dictionary::max_key_bytes];
   if (args & 2) {
-    key = dict.integer_key(stack.pop_int(), k, !(args & 1), buffer, true);
+    key = dict.integer_key(stack.pop_int_finite(), k, !(args & 1), buffer, true);
   } else {
     key = stack.pop_cellslice()->prefetch_bits(k);
   }
@@ -805,7 +811,8 @@ void register_dictionary_ops(OpcodeTable& cp0) {
                                       exec_const_pfx_dict_switch, compute_len_push_const_dict))
       .insert(OpcodeInstr::mkfixedrange(0xf4b1, 0xf4b4, 16, 3, std::bind(dump_subdictop2, _2, "GET"), exec_subdict_get))
       .insert(
-          OpcodeInstr::mkfixedrange(0xf4b5, 0xf4b8, 16, 3, std::bind(dump_subdictop2, _2, "RPGET"), exec_subdict_get));
+          OpcodeInstr::mkfixedrange(0xf4b5, 0xf4b8, 16, 3, std::bind(dump_subdictop2, _2, "RPGET"), exec_subdict_get))
+      .insert(OpcodeInstr::mkfixed(0xf4bc >> 2, 14, 2, dump_dict_get_exec, exec_dict_get_exec));
 }
 
 }  // namespace vm
diff --git a/submodules/ton/tonlib-src/crypto/vm/log.h b/submodules/ton/tonlib-src/crypto/vm/log.h
index e063141135..30ace2c479 100644
--- a/submodules/ton/tonlib-src/crypto/vm/log.h
+++ b/submodules/ton/tonlib-src/crypto/vm/log.h
@@ -14,7 +14,7 @@
     You should have received a copy of the GNU Lesser General Public License
     along with TON Blockchain Library.  If not, see <http://www.gnu.org/licenses/>.
 
-    Copyright 2017-2019 Telegram Systems LLP
+    Copyright 2017-2020 Telegram Systems LLP
 */
 #pragma once
 
@@ -33,6 +33,12 @@ struct VmLog {
   td::LogOptions log_options{td::log_options};
   enum { DumpStack = 2 };
   int log_mask{1};
+  static VmLog Null() {
+    VmLog res;
+    res.log_options.level = 0;
+    res.log_mask = 0;
+    return res;
+  }
 };
 
 template <class State>
diff --git a/submodules/ton/tonlib-src/crypto/vm/memo.cpp b/submodules/ton/tonlib-src/crypto/vm/memo.cpp
new file mode 100644
index 0000000000..576f28f193
--- /dev/null
+++ b/submodules/ton/tonlib-src/crypto/vm/memo.cpp
@@ -0,0 +1,33 @@
+/*
+    This file is part of TON Blockchain Library.
+
+    TON Blockchain Library is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Lesser General Public License as published by
+    the Free Software Foundation, either version 2 of the License, or
+    (at your option) any later version.
+
+    TON Blockchain Library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public License
+    along with TON Blockchain Library.  If not, see <http://www.gnu.org/licenses/>.
+
+    Copyright 2020 Telegram Systems LLP
+*/
+#include "vm/memo.h"
+#include "vm/excno.hpp"
+
+namespace vm {
+using td::Ref;
+
+bool FakeVmStateLimits::register_op(int op_units) {
+  bool ok = (ops_remaining -= op_units) >= 0;
+  if (!ok && !quiet) {
+    throw VmError{Excno::out_of_gas, "too many operations"};
+  }
+  return ok;
+}
+
+}  // namespace vm
diff --git a/submodules/ton/tonlib-src/crypto/vm/memo.h b/submodules/ton/tonlib-src/crypto/vm/memo.h
new file mode 100644
index 0000000000..3aee39a6b6
--- /dev/null
+++ b/submodules/ton/tonlib-src/crypto/vm/memo.h
@@ -0,0 +1,37 @@
+/*
+    This file is part of TON Blockchain Library.
+
+    TON Blockchain Library is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Lesser General Public License as published by
+    the Free Software Foundation, either version 2 of the License, or
+    (at your option) any later version.
+
+    TON Blockchain Library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public License
+    along with TON Blockchain Library.  If not, see <http://www.gnu.org/licenses/>.
+
+    Copyright 2020 Telegram Systems LLP
+*/
+#pragma once
+#include "common/refcnt.hpp"
+#include "vm/cells.h"
+#include "vm/vmstate.h"
+
+namespace vm {
+using td::Ref;
+
+class FakeVmStateLimits : public VmStateInterface {
+  long long ops_remaining;
+  bool quiet;
+
+ public:
+  FakeVmStateLimits(long long max_ops = 1LL << 62, bool _quiet = true) : ops_remaining(max_ops), quiet(_quiet) {
+  }
+  bool register_op(int op_units = 1) override;
+};
+
+}  // namespace vm
diff --git a/submodules/ton/tonlib-src/crypto/vm/opctable.cpp b/submodules/ton/tonlib-src/crypto/vm/opctable.cpp
index fbdc2578c1..d4f0f3e977 100644
--- a/submodules/ton/tonlib-src/crypto/vm/opctable.cpp
+++ b/submodules/ton/tonlib-src/crypto/vm/opctable.cpp
@@ -14,14 +14,14 @@
     You should have received a copy of the GNU Lesser General Public License
     along with TON Blockchain Library.  If not, see <http://www.gnu.org/licenses/>.
 
-    Copyright 2017-2019 Telegram Systems LLP
+    Copyright 2017-2020 Telegram Systems LLP
 */
 #include <cassert>
 #include <iterator>
 #include "vm/opctable.h"
 #include "vm/cellslice.h"
 #include "vm/excno.hpp"
-#include "vm/continuation.h"
+#include "vm/vm.h"
 #include <iostream>
 #include <iomanip>
 #include <sstream>
diff --git a/submodules/ton/tonlib-src/crypto/vm/stack.cpp b/submodules/ton/tonlib-src/crypto/vm/stack.cpp
index 0b63aec9cc..43099927d5 100644
--- a/submodules/ton/tonlib-src/crypto/vm/stack.cpp
+++ b/submodules/ton/tonlib-src/crypto/vm/stack.cpp
@@ -14,12 +14,13 @@
     You should have received a copy of the GNU Lesser General Public License
     along with TON Blockchain Library.  If not, see <http://www.gnu.org/licenses/>.
 
-    Copyright 2017-2019 Telegram Systems LLP
+    Copyright 2017-2020 Telegram Systems LLP
 */
 #include "vm/stack.hpp"
 #include "vm/continuation.h"
 #include "vm/box.hpp"
 #include "vm/atom.h"
+#include "vm/vmstate.h"
 
 namespace td {
 template class td::Cnt<std::string>;
@@ -45,6 +46,18 @@ const char* get_exception_msg(Excno exc_no) {
   }
 }
 
+bool StackEntry::is_list(const StackEntry* se) {
+  Ref<Tuple> tuple;
+  while (!se->empty()) {
+    tuple = se->as_tuple_range(2, 2);
+    if (tuple.is_null()) {
+      return false;
+    }
+    se = &tuple->at(1);
+  }
+  return true;
+}
+
 static const char HEX_digits[] = "0123456789ABCDEF";
 
 std::string str_to_hex(std::string data, std::string prefix) {
@@ -62,6 +75,12 @@ std::string StackEntry::to_string() const {
   return std::move(os).str();
 }
 
+std::string StackEntry::to_lisp_string() const {
+  std::ostringstream os;
+  print_list(os);
+  return std::move(os).str();
+}
+
 void StackEntry::dump(std::ostream& os) const {
   switch (tp) {
     case t_null:
@@ -130,6 +149,12 @@ void StackEntry::print_list(std::ostream& os) const {
       break;
     case t_tuple: {
       const auto& tuple = *static_cast<Ref<Tuple>>(ref);
+      if (is_list()) {
+        os << '(';
+        tuple[0].print_list(os);
+        print_list_tail(os, &tuple[1]);
+        break;
+      }
       auto n = tuple.size();
       if (!n) {
         os << "[]";
@@ -137,7 +162,7 @@ void StackEntry::print_list(std::ostream& os) const {
         os << "[";
         tuple[0].print_list(os);
         os << "]";
-      } else if (n != 2) {
+      } else {
         os << "[";
         unsigned c = 0;
         for (const auto& entry : tuple) {
@@ -147,10 +172,6 @@ void StackEntry::print_list(std::ostream& os) const {
           entry.print_list(os);
         }
         os << ']';
-      } else {
-        os << '(';
-        tuple[0].print_list(os);
-        tuple[1].print_list_tail(os);
       }
       break;
     }
@@ -159,26 +180,40 @@ void StackEntry::print_list(std::ostream& os) const {
   }
 }
 
-void StackEntry::print_list_tail(std::ostream& os) const {
-  switch (tp) {
-    case t_null:
-      os << ')';
-      break;
-    case t_tuple: {
-      const auto& tuple = *static_cast<Ref<Tuple>>(ref);
-      if (tuple.size() == 2) {
-        os << ' ';
-        tuple[0].print_list(os);
-        tuple[1].print_list_tail(os);
-        break;
-      }
-    }
-    // fall through
-    default:
+void StackEntry::print_list_tail(std::ostream& os, const StackEntry* se) {
+  Ref<Tuple> tuple;
+  while (!se->empty()) {
+    tuple = se->as_tuple_range(2, 2);
+    if (tuple.is_null()) {
       os << " . ";
-      print_list(os);
-      os << ')';
+      se->print_list(os);
+      break;
+    }
+    os << ' ';
+    tuple->at(0).print_list(os);
+    se = &tuple->at(1);
   }
+  os << ')';
+}
+
+StackEntry StackEntry::make_list(std::vector<StackEntry>&& elems) {
+  StackEntry tail;
+  std::size_t n = elems.size();
+  while (n > 0) {
+    --n;
+    tail = StackEntry{vm::make_tuple_ref(std::move(elems[n]), tail)};
+  }
+  return tail;
+}
+
+StackEntry StackEntry::make_list(const std::vector<StackEntry>& elems) {
+  StackEntry tail;
+  std::size_t n = elems.size();
+  while (n > 0) {
+    --n;
+    tail = StackEntry{vm::make_tuple_ref(elems[n], tail)};
+  }
+  return tail;
 }
 
 StackEntry::StackEntry(Ref<Stack> stack_ref) : ref(std::move(stack_ref)), tp(t_stack) {
@@ -521,7 +556,7 @@ void Stack::push_int_quiet(td::RefInt256 val, bool quiet) {
     if (!quiet) {
       throw VmError{Excno::int_ov};
     } else if (val->is_valid()) {
-      push(td::RefInt256{true});
+      push(td::make_refint());
       return;
     }
   }
@@ -557,7 +592,7 @@ void Stack::push_builder(Ref<CellBuilder> cb) {
 }
 
 void Stack::push_smallint(long long val) {
-  push(td::RefInt256{true, val});
+  push(td::make_refint(val));
 }
 
 void Stack::push_bool(bool val) {
@@ -611,13 +646,21 @@ Ref<Stack> Stack::split_top(unsigned top_cnt, unsigned drop_cnt) {
   return new_stk;
 }
 
-void Stack::dump(std::ostream& os, bool cr) const {
+void Stack::dump(std::ostream& os, int mode) const {
   os << " [ ";
-  for (const auto& x : stack) {
-    os << x.to_string() << ' ';
+  if (mode & 2) {
+    for (const auto& x : stack) {
+      x.print_list(os);
+      os << ' ';
+    }
+  } else {
+    for (const auto& x : stack) {
+      x.dump(os);
+      os << ' ';
+    }
   }
   os << "] ";
-  if (cr) {
+  if (mode & 1) {
     os << std::endl;
   }
 }
@@ -629,4 +672,252 @@ void Stack::push_maybe_cellslice(Ref<CellSlice> cs) {
   push_maybe(std::move(cs));
 }
 
+/*
+ *
+ *   SERIALIZE/DESERIALIZE STACK VALUES
+ *
+ */
+
+bool StackEntry::serialize(vm::CellBuilder& cb, int mode) const {
+  auto* vsi = VmStateInterface::get();
+  if (vsi && !vsi->register_op()) {
+    return false;
+  }
+  switch (tp) {
+    case t_null:
+      return cb.store_long_bool(0, 8);  // vm_stk_null#00 = VmStackValue;
+    case t_int: {
+      auto val = as_int();
+      if (!val->is_valid()) {
+        // vm_stk_nan#02ff = VmStackValue;
+        return cb.store_long_bool(0x02ff, 16);
+      } else if (!(mode & 1) && val->signed_fits_bits(64)) {
+        // vm_stk_tinyint#01 value:int64 = VmStackValue;
+        return cb.store_long_bool(1, 8) && cb.store_int256_bool(std::move(val), 64);
+      } else {
+        // vm_stk_int#0201_ value:int257 = VmStackValue;
+        return cb.store_long_bool(0x0200 / 2, 15) && cb.store_int256_bool(std::move(val), 257);
+      }
+    }
+    case t_cell:
+      // vm_stk_cell#03 cell:^Cell = VmStackValue;
+      return cb.store_long_bool(3, 8) && cb.store_ref_bool(as_cell());
+    case t_slice: {
+      // _ cell:^Cell st_bits:(## 10) end_bits:(## 10) { st_bits <= end_bits }
+      // st_ref:(#<= 4) end_ref:(#<= 4) { st_ref <= end_ref } = VmCellSlice;
+      const auto& cs = *static_cast<Ref<CellSlice>>(ref);
+      return ((mode & 0x1000) || cb.store_long_bool(4, 8))             // vm_stk_slice#04 _:VmCellSlice = VmStackValue;
+             && cb.store_ref_bool(cs.get_base_cell())                  // _ cell:^Cell
+             && cb.store_long_bool(cs.cur_pos(), 10)                   // st_bits:(## 10)
+             && cb.store_long_bool(cs.cur_pos() + cs.size(), 10)       // end_bits:(## 10)
+             && cb.store_long_bool(cs.cur_ref(), 3)                    // st_ref:(#<= 4)
+             && cb.store_long_bool(cs.cur_ref() + cs.size_refs(), 3);  // end_ref:(#<= 4)
+    }
+    case t_builder:
+      // vm_stk_builder#05 cell:^Cell = VmStackValue;
+      return cb.store_long_bool(5, 8) && cb.store_ref_bool(as_builder()->finalize_copy());
+    case t_vmcont:
+      // vm_stk_cont#06 cont:VmCont = VmStackValue;
+      return !(mode & 2) && cb.store_long_bool(6, 8) && as_cont()->serialize(cb);
+    case t_tuple: {
+      const auto& tuple = *static_cast<Ref<Tuple>>(ref);
+      auto n = tuple.size();
+      // vm_stk_tuple#07 len:(## 16) data:(VmTuple len) = VmStackValue;
+      Ref<Cell> head, tail;
+      vm::CellBuilder cb2;
+      for (std::size_t i = 0; i < n; i++) {
+        std::swap(head, tail);
+        if (i > 1 &&
+            !(cb2.store_ref_bool(std::move(tail)) && cb2.store_ref_bool(std::move(head)) && cb2.finalize_to(head))) {
+          return false;
+        }
+        if (!(tuple[i].serialize(cb2, mode) && cb2.finalize_to(tail))) {
+          return false;
+        }
+      }
+      return cb.store_long_bool(7, 8) && cb.store_long_bool(n, 16) && (head.is_null() || cb.store_ref_bool(head)) &&
+             (tail.is_null() || cb.store_ref_bool(tail));
+    }
+    default:
+      return false;
+  }
+}
+
+bool StackEntry::deserialize(CellSlice& cs, int mode) {
+  auto* vsi = VmStateInterface::get();
+  if (vsi && !vsi->register_op()) {
+    return false;
+  }
+  clear();
+  int t = (mode & 0xf000) ? ((mode >> 12) & 15) : (int)cs.prefetch_ulong(8);
+  switch (t) {
+    case 0:
+      // vm_stk_null#00 = VmStackValue;
+      return cs.advance(8);
+    case 1: {
+      // vm_stk_tinyint#01 value:int64 = VmStackValue;
+      td::RefInt256 val;
+      return !(mode & 1) && cs.advance(8) && cs.fetch_int256_to(64, val) && set_int(std::move(val));
+    }
+    case 2: {
+      t = (int)cs.prefetch_ulong(16) & 0x1ff;
+      if (t == 0xff) {
+        // vm_stk_nan#02ff = VmStackValue;
+        return cs.advance(16) && set_int(td::make_refint());
+      } else {
+        // vm_stk_int#0201_ value:int257 = VmStackValue;
+        td::RefInt256 val;
+        return cs.fetch_ulong(15) == 0x0200 / 2 && cs.fetch_int256_to(257, val) && set_int(std::move(val));
+      }
+    }
+    case 3: {
+      // vm_stk_cell#03 cell:^Cell = VmStackValue;
+      return cs.have_refs() && cs.advance(8) && set(t_cell, cs.fetch_ref());
+    }
+    case 4: {
+      // _ cell:^Cell st_bits:(## 10) end_bits:(## 10) { st_bits <= end_bits }
+      //   st_ref:(#<= 4) end_ref:(#<= 4) { st_ref <= end_ref } = VmCellSlice;
+      // vm_stk_slice#04 _:VmCellSlice = VmStackValue;
+      unsigned st_bits, end_bits, st_ref, end_ref;
+      Ref<Cell> cell;
+      Ref<CellSlice> csr;
+      return ((mode & 0xf000) || cs.advance(8))                          // vm_stk_slice#04
+             && cs.fetch_ref_to(cell)                                    // cell:^Cell
+             && cs.fetch_uint_to(10, st_bits)                            // st_bits:(## 10)
+             && cs.fetch_uint_to(10, end_bits)                           // end_bits:(## 10)
+             && st_bits <= end_bits                                      // { st_bits <= end_bits }
+             && cs.fetch_uint_to(3, st_ref)                              // st_ref:(#<= 4)
+             && cs.fetch_uint_to(3, end_ref)                             // end_ref:(#<= 4)
+             && st_ref <= end_ref && end_ref <= 4                        // { st_ref <= end_ref }
+             && (csr = load_cell_slice_ref(std::move(cell))).not_null()  // load cell slice
+             && csr->have(end_bits, end_ref) &&
+             csr.write().skip_last(csr->size() - end_bits, csr->size_refs() - end_ref) &&
+             csr.write().skip_first(st_bits, st_ref) && set(t_slice, std::move(csr));
+    }
+    case 5: {
+      // vm_stk_builder#05 cell:^Cell = VmStackValue;
+      Ref<Cell> cell;
+      Ref<CellSlice> csr;
+      Ref<CellBuilder> cb{true};
+      return cs.advance(8) && cs.fetch_ref_to(cell) && (csr = load_cell_slice_ref(std::move(cell))).not_null() &&
+             cb.write().append_cellslice_bool(std::move(csr)) && set(t_builder, std::move(cb));
+    }
+    case 6: {
+      // vm_stk_cont#06 cont:VmCont = VmStackValue;
+      Ref<Continuation> cont;
+      return !(mode & 2) && cs.advance(8) && Continuation::deserialize_to(cs, cont, mode) &&
+             set(t_vmcont, std::move(cont));
+    }
+    case 7: {
+      // vm_stk_tuple#07 len:(## 16) data:(VmTuple len) = VmStackValue;
+      int n;
+      if (!(cs.advance(8) && cs.fetch_uint_to(16, n))) {
+        return false;
+      }
+      Ref<Tuple> tuple{true, n};
+      auto& t = tuple.write();
+      if (n > 1) {
+        Ref<Cell> head, tail;
+        n--;
+        if (!(cs.fetch_ref_to(head) && cs.fetch_ref_to(tail) && t[n].deserialize(std::move(tail), mode))) {
+          return false;
+        }
+        vm::CellSlice cs2;
+        while (--n > 0) {
+          if (!(cs2.load(std::move(head)) && cs2.fetch_ref_to(head) && cs2.fetch_ref_to(tail) && cs2.empty_ext() &&
+                t[n].deserialize(std::move(tail), mode))) {
+            return false;
+          }
+        }
+        if (!t[0].deserialize(std::move(head), mode)) {
+          return false;
+        }
+      } else if (n == 1) {
+        return cs.have_refs() && t[0].deserialize(cs.fetch_ref(), mode) && set(t_tuple, std::move(tuple));
+      }
+      return set(t_tuple, std::move(tuple));
+    }
+    default:
+      return false;
+  }
+}
+
+bool StackEntry::deserialize(Ref<Cell> cell, int mode) {
+  if (cell.is_null()) {
+    clear();
+    return false;
+  }
+  CellSlice cs = load_cell_slice(std::move(cell));
+  return deserialize(cs, mode) && cs.empty_ext();
+}
+
+bool Stack::serialize(vm::CellBuilder& cb, int mode) const {
+  auto* vsi = VmStateInterface::get();
+  if (vsi && !vsi->register_op()) {
+    return false;
+  }
+  // vm_stack#_ depth:(## 24) stack:(VmStackList depth) = VmStack;
+  unsigned n = depth();
+  if (!cb.store_ulong_rchk_bool(n, 24)) {  // vm_stack#_ depth:(## 24)
+    return false;
+  }
+  if (!n) {
+    return true;
+  }
+  vm::CellBuilder cb2;
+  Ref<vm::Cell> rest = cb2.finalize();  // vm_stk_nil#_ = VmStackList 0;
+  for (unsigned i = 0; i < n - 1; i++) {
+    // vm_stk_cons#_ {n:#} rest:^(VmStackList n) tos:VmStackValue = VmStackList (n + 1);
+    if (!(cb2.store_ref_bool(std::move(rest)) && stack[i].serialize(cb2, mode) && cb2.finalize_to(rest))) {
+      return false;
+    }
+  }
+  return cb.store_ref_bool(std::move(rest)) && stack[n - 1].serialize(cb, mode);
+}
+
+bool Stack::deserialize(vm::CellSlice& cs, int mode) {
+  auto* vsi = VmStateInterface::get();
+  if (vsi && !vsi->register_op()) {
+    return false;
+  }
+  clear();
+  // vm_stack#_ depth:(## 24) stack:(VmStackList depth) = VmStack;
+  int n;
+  if (!cs.fetch_uint_to(24, n)) {
+    return false;
+  }
+  if (!n) {
+    return true;
+  }
+  stack.resize(n);
+  Ref<Cell> rest;
+  if (!(cs.fetch_ref_to(rest) && stack[n - 1].deserialize(cs, mode))) {
+    clear();
+    return false;
+  }
+  for (int i = n - 2; i >= 0; --i) {
+    // vm_stk_cons#_ {n:#} rest:^(VmStackList n) tos:VmStackValue = VmStackList (n + 1);
+    vm::CellSlice cs2 = load_cell_slice(std::move(rest));
+    if (!(cs2.fetch_ref_to(rest) && stack[i].deserialize(cs2, mode) && cs2.empty_ext())) {
+      clear();
+      return false;
+    }
+  }
+  if (!load_cell_slice(std::move(rest)).empty_ext()) {
+    clear();
+    return false;
+  }
+  return true;
+}
+
+bool Stack::deserialize_to(vm::CellSlice& cs, Ref<Stack>& stack, int mode) {
+  stack = Ref<Stack>{true};
+  if (stack.unique_write().deserialize(cs, mode)) {
+    return true;
+  } else {
+    stack.clear();
+    return false;
+  }
+}
+
 }  // namespace vm
diff --git a/submodules/ton/tonlib-src/crypto/vm/stack.hpp b/submodules/ton/tonlib-src/crypto/vm/stack.hpp
index 0b16f59c39..3fadce6b27 100644
--- a/submodules/ton/tonlib-src/crypto/vm/stack.hpp
+++ b/submodules/ton/tonlib-src/crypto/vm/stack.hpp
@@ -14,7 +14,7 @@
     You should have received a copy of the GNU Lesser General Public License
     along with TON Blockchain Library.  If not, see <http://www.gnu.org/licenses/>.
 
-    Copyright 2017-2019 Telegram Systems LLP
+    Copyright 2017-2020 Telegram Systems LLP
 */
 #pragma once
 
@@ -57,6 +57,11 @@ class Atom;
 
 using Tuple = td::Cnt<std::vector<StackEntry>>;
 
+template <typename... Args>
+Ref<Tuple> make_tuple_ref(Args&&... args) {
+  return td::make_cnt_ref<std::vector<vm::StackEntry>>(std::vector<vm::StackEntry>{std::forward<Args>(args)...});
+}
+
 struct from_object_t {};
 constexpr from_object_t from_object{};
 
@@ -130,6 +135,9 @@ class StackEntry {
     tp = t_null;
     return *this;
   }
+  bool set_int(td::RefInt256 value) {
+    return set(t_int, std::move(value));
+  }
   bool empty() const {
     return tp == t_null;
   }
@@ -139,9 +147,24 @@ class StackEntry {
   bool is_atom() const {
     return tp == t_atom;
   }
+  bool is_int() const {
+    return tp == t_int;
+  }
+  bool is_cell() const {
+    return tp == t_cell;
+  }
+  bool is_null() const {
+    return tp == t_null;
+  }
   bool is(int wanted) const {
     return tp == wanted;
   }
+  bool is_list() const {
+    return is_list(this);
+  }
+  static bool is_list(const StackEntry& se) {
+    return is_list(&se);
+  }
   void swap(StackEntry& se) {
     ref.swap(se.ref);
     std::swap(tp, se.tp);
@@ -155,10 +178,15 @@ class StackEntry {
   Type type() const {
     return tp;
   }
+  // mode: +1 = disable short ints, +2 = disable continuations
+  bool serialize(vm::CellBuilder& cb, int mode = 0) const;
+  bool deserialize(vm::CellSlice& cs, int mode = 0);
+  bool deserialize(Ref<Cell> cell, int mode = 0);
 
  private:
+  static bool is_list(const StackEntry* se);
   template <typename T, Type tag>
-  Ref<T> dynamic_as() const& {
+  Ref<T> dynamic_as() const & {
     return tp == tag ? static_cast<Ref<T>>(ref) : td::Ref<T>{};
   }
   template <typename T, Type tag>
@@ -170,7 +198,7 @@ class StackEntry {
     return tp == tag ? static_cast<Ref<T>>(std::move(ref)) : td::Ref<T>{};
   }
   template <typename T, Type tag>
-  Ref<T> as() const& {
+  Ref<T> as() const & {
     return tp == tag ? Ref<T>{td::static_cast_ref(), ref} : td::Ref<T>{};
   }
   template <typename T, Type tag>
@@ -181,8 +209,19 @@ class StackEntry {
   Ref<T> move_as() & {
     return tp == tag ? Ref<T>{td::static_cast_ref(), std::move(ref)} : td::Ref<T>{};
   }
+  bool set(Type _tp, RefAny _ref) {
+    tp = _tp;
+    ref = std::move(_ref);
+    return ref.not_null() || tp == t_null;
+  }
 
  public:
+  static StackEntry make_list(std::vector<StackEntry>&& elems);
+  static StackEntry make_list(const std::vector<StackEntry>& elems);
+  template <typename T1, typename T2>
+  static StackEntry cons(T1&& x, T2&& y) {
+    return StackEntry{make_tuple_ref(std::forward<T1>(x), std::forward<T2>(y))};
+  }
   template <typename T>
   static StackEntry maybe(Ref<T> ref) {
     if (ref.is_null()) {
@@ -191,31 +230,31 @@ class StackEntry {
       return ref;
     }
   }
-  td::RefInt256 as_int() const& {
+  td::RefInt256 as_int() const & {
     return as<td::CntInt256, t_int>();
   }
   td::RefInt256 as_int() && {
     return move_as<td::CntInt256, t_int>();
   }
-  Ref<Cell> as_cell() const& {
+  Ref<Cell> as_cell() const & {
     return as<Cell, t_cell>();
   }
   Ref<Cell> as_cell() && {
     return move_as<Cell, t_cell>();
   }
-  Ref<CellBuilder> as_builder() const& {
+  Ref<CellBuilder> as_builder() const & {
     return as<CellBuilder, t_builder>();
   }
   Ref<CellBuilder> as_builder() && {
     return move_as<CellBuilder, t_builder>();
   }
-  Ref<CellSlice> as_slice() const& {
+  Ref<CellSlice> as_slice() const & {
     return as<CellSlice, t_slice>();
   }
   Ref<CellSlice> as_slice() && {
     return move_as<CellSlice, t_slice>();
   }
-  Ref<Continuation> as_cont() const&;
+  Ref<Continuation> as_cont() const &;
   Ref<Continuation> as_cont() &&;
   Ref<Cnt<std::string>> as_string_ref() const {
     return as<Cnt<std::string>, t_string>();
@@ -230,16 +269,16 @@ class StackEntry {
   std::string as_bytes() const {
     return tp == t_bytes ? *as_bytes_ref() : "";
   }
-  Ref<Box> as_box() const&;
+  Ref<Box> as_box() const &;
   Ref<Box> as_box() &&;
-  Ref<Tuple> as_tuple() const&;
+  Ref<Tuple> as_tuple() const &;
   Ref<Tuple> as_tuple() &&;
-  Ref<Tuple> as_tuple_range(unsigned max_len = 255, unsigned min_len = 0) const&;
+  Ref<Tuple> as_tuple_range(unsigned max_len = 255, unsigned min_len = 0) const &;
   Ref<Tuple> as_tuple_range(unsigned max_len = 255, unsigned min_len = 0) &&;
-  Ref<Atom> as_atom() const&;
+  Ref<Atom> as_atom() const &;
   Ref<Atom> as_atom() &&;
   template <class T>
-  Ref<T> as_object() const& {
+  Ref<T> as_object() const & {
     return dynamic_as<T, t_object>();
   }
   template <class T>
@@ -248,19 +287,17 @@ class StackEntry {
   }
   void dump(std::ostream& os) const;
   void print_list(std::ostream& os) const;
-  void print_list_tail(std::ostream& os) const;
   std::string to_string() const;
+  std::string to_lisp_string() const;
+
+ private:
+  static void print_list_tail(std::ostream& os, const StackEntry* se);
 };
 
 inline void swap(StackEntry& se1, StackEntry& se2) {
   se1.swap(se2);
 }
 
-template <typename... Args>
-Ref<Tuple> make_tuple_ref(Args&&... args) {
-  return td::make_cnt_ref<std::vector<vm::StackEntry>>(std::vector<vm::StackEntry>{std::forward<Args>(args)...});
-}
-
 const StackEntry& tuple_index(const Tuple& tup, unsigned idx);
 StackEntry tuple_extend_index(const Ref<Tuple>& tup, unsigned idx);
 unsigned tuple_extend_set_index(Ref<Tuple>& tup, unsigned idx, StackEntry&& value, bool force = false);
@@ -320,6 +357,10 @@ class Stack : public td::CntObject {
   void pop_many(int count) {
     stack.resize(stack.size() - count);
   }
+  void pop_many(int count, int offs) {
+    std::move(stack.cend() - offs, stack.cend(), stack.end() - (count + offs));
+    pop_many(count);
+  }
   void drop_bottom(int count) {
     std::move(stack.cbegin() + count, stack.cend(), stack.begin());
     pop_many(count);
@@ -401,6 +442,12 @@ class Stack : public td::CntObject {
     }
     return *this;
   }
+  std::vector<StackEntry> extract_contents() const & {
+    return stack;
+  }
+  std::vector<StackEntry> extract_contents() && {
+    return std::move(stack);
+  }
   template <typename... Args>
   const Stack& check_underflow(Args... args) const {
     if (!at_least(args...)) {
@@ -453,6 +500,18 @@ class Stack : public td::CntObject {
   Ref<Atom> pop_atom();
   std::string pop_string();
   std::string pop_bytes();
+  template <typename T>
+  Ref<T> pop_object() {
+    return pop_chk().as_object<T>();
+  }
+  template <typename T>
+  Ref<T> pop_object_type_chk() {
+    auto res = pop_object<T>();
+    if (!res) {
+      throw VmError{Excno::type_chk, "not an object of required type"};
+    }
+    return res;
+  }
   void push_null();
   void push_int(td::RefInt256 val);
   void push_int_quiet(td::RefInt256 val, bool quiet = true);
@@ -490,7 +549,11 @@ class Stack : public td::CntObject {
       push(std::move(val));
     }
   }
-  void dump(std::ostream& os, bool cr = true) const;
+  // mode: +1 = add eoln, +2 = Lisp-style lists
+  void dump(std::ostream& os, int mode = 1) const;
+  bool serialize(vm::CellBuilder& cb, int mode = 0) const;
+  bool deserialize(vm::CellSlice& cs, int mode = 0);
+  static bool deserialize_to(vm::CellSlice& cs, Ref<Stack>& stack, int mode = 0);
 };
 
 }  // namespace vm
diff --git a/submodules/ton/tonlib-src/crypto/vm/stackops.cpp b/submodules/ton/tonlib-src/crypto/vm/stackops.cpp
index 7fdbcba044..0f5be6d402 100644
--- a/submodules/ton/tonlib-src/crypto/vm/stackops.cpp
+++ b/submodules/ton/tonlib-src/crypto/vm/stackops.cpp
@@ -14,14 +14,14 @@
     You should have received a copy of the GNU Lesser General Public License
     along with TON Blockchain Library.  If not, see <http://www.gnu.org/licenses/>.
 
-    Copyright 2017-2019 Telegram Systems LLP
+    Copyright 2017-2020 Telegram Systems LLP
 */
 #include "vm/log.h"
 #include "vm/stackops.h"
 #include "vm/opctable.h"
 #include "vm/stack.hpp"
-#include "vm/continuation.h"
 #include "vm/excno.hpp"
+#include "vm/vm.h"
 
 namespace vm {
 
@@ -379,6 +379,15 @@ int exec_blkdrop(VmState* st, unsigned args) {
   return 0;
 }
 
+int exec_blkdrop2(VmState* st, unsigned args) {
+  int x = ((args >> 4) & 15), y = (args & 15);
+  Stack& stack = st->get_stack();
+  VM_LOG(st) << "execute BLKDROP2 " << x << ',' << y;
+  stack.check_underflow(x + y);
+  stack.pop_many(x, y);
+  return 0;
+}
+
 int exec_blkpush(VmState* st, unsigned args) {
   int x = ((args >> 4) & 15), y = (args & 15);
   Stack& stack = st->get_stack();
@@ -570,7 +579,8 @@ void register_stack_ops(OpcodeTable& cp0) {
       .insert(OpcodeInstr::mksimple(0x68, 8, "DEPTH", exec_depth))
       .insert(OpcodeInstr::mksimple(0x69, 8, "CHKDEPTH", exec_chkdepth))
       .insert(OpcodeInstr::mksimple(0x6a, 8, "ONLYTOPX", exec_onlytop_x))
-      .insert(OpcodeInstr::mksimple(0x6b, 8, "ONLYX", exec_only_x));
+      .insert(OpcodeInstr::mksimple(0x6b, 8, "ONLYX", exec_only_x))
+      .insert(OpcodeInstr::mkfixedrange(0x6c10, 0x6d00, 16, 8, instr::dump_2c("BLKDROP2 ", ","), exec_blkdrop2));
 }
 
 }  // namespace vm
diff --git a/submodules/ton/tonlib-src/crypto/vm/tonops.cpp b/submodules/ton/tonlib-src/crypto/vm/tonops.cpp
index e2142f072f..ca8e4b009f 100644
--- a/submodules/ton/tonlib-src/crypto/vm/tonops.cpp
+++ b/submodules/ton/tonlib-src/crypto/vm/tonops.cpp
@@ -14,15 +14,15 @@
     You should have received a copy of the GNU Lesser General Public License
     along with TON Blockchain Library.  If not, see <http://www.gnu.org/licenses/>.
 
-    Copyright 2017-2019 Telegram Systems LLP
+    Copyright 2017-2020 Telegram Systems LLP
 */
 #include <functional>
 #include "vm/tonops.h"
 #include "vm/log.h"
 #include "vm/opctable.h"
 #include "vm/stack.hpp"
-#include "vm/continuation.h"
 #include "vm/excno.hpp"
+#include "vm/vm.h"
 #include "vm/dict.h"
 #include "Ed25519.h"
 
@@ -77,7 +77,7 @@ int exec_set_gas_limit(VmState* st) {
 
 int exec_commit(VmState* st) {
   VM_LOG(st) << "execute COMMIT";
-  st->commit();
+  st->force_commit();
   return 0;
 }
 
@@ -165,6 +165,8 @@ int exec_set_global_common(VmState* st, unsigned idx) {
   if (idx >= 255) {
     throw VmError{Excno::range_chk, "tuple index out of range"};
   }
+  static auto empty_tuple = Ref<Tuple>{true};
+  st->set_c7(empty_tuple);  // optimization; use only if no exception can be thrown until true set_c7()
   auto tpay = tuple_extend_set_index(tuple, idx, std::move(x));
   if (tpay > 0) {
     st->consume_tuple_gas(tpay);
@@ -193,7 +195,8 @@ void register_ton_config_ops(OpcodeTable& cp0) {
       .insert(OpcodeInstr::mksimple(0xf823, 16, "NOW", std::bind(exec_get_param, _1, 3, "NOW")))
       .insert(OpcodeInstr::mksimple(0xf824, 16, "BLOCKLT", std::bind(exec_get_param, _1, 4, "BLOCKLT")))
       .insert(OpcodeInstr::mksimple(0xf825, 16, "LTIME", std::bind(exec_get_param, _1, 5, "LTIME")))
-      .insert(OpcodeInstr::mkfixedrange(0xf826, 0xf828, 16, 4, instr::dump_1c("GETPARAM "), exec_get_var_param))
+      .insert(OpcodeInstr::mksimple(0xf826, 16, "RANDSEED", std::bind(exec_get_param, _1, 6, "RANDSEED")))
+      .insert(OpcodeInstr::mksimple(0xf827, 16, "BALANCE", std::bind(exec_get_param, _1, 7, "BALANCE")))
       .insert(OpcodeInstr::mksimple(0xf828, 16, "MYADDR", std::bind(exec_get_param, _1, 8, "MYADDR")))
       .insert(OpcodeInstr::mksimple(0xf829, 16, "CONFIGROOT", std::bind(exec_get_param, _1, 9, "CONFIGROOT")))
       .insert(OpcodeInstr::mkfixedrange(0xf82a, 0xf830, 16, 4, instr::dump_1c("GETPARAM "), exec_get_var_param))
@@ -206,6 +209,112 @@ void register_ton_config_ops(OpcodeTable& cp0) {
       .insert(OpcodeInstr::mkfixedrange(0xf861, 0xf880, 16, 5, instr::dump_1c_and(31, "SETGLOB "), exec_set_global));
 }
 
+static constexpr int randseed_idx = 6;
+
+td::RefInt256 generate_randu256(VmState* st) {
+  auto tuple = st->get_c7();
+  auto t1 = tuple_index(*tuple, 0).as_tuple_range(255);
+  if (t1.is_null()) {
+    throw VmError{Excno::type_chk, "intermediate value is not a tuple"};
+  }
+  auto seedv = tuple_index(*t1, randseed_idx).as_int();
+  if (seedv.is_null()) {
+    throw VmError{Excno::type_chk, "random seed is not an integer"};
+  }
+  unsigned char seed[32];
+  if (!seedv->export_bytes(seed, 32, false)) {
+    throw VmError{Excno::range_chk, "random seed out of range"};
+  }
+  unsigned char hash[64];
+  digest::hash_str<digest::SHA512>(hash, seed, 32);
+  if (!seedv.write().import_bytes(hash, 32, false)) {
+    throw VmError{Excno::range_chk, "cannot store new random seed"};
+  }
+  td::RefInt256 res{true};
+  if (!res.write().import_bytes(hash + 32, 32, false)) {
+    throw VmError{Excno::range_chk, "cannot store new random number"};
+  }
+  static auto empty_tuple = Ref<Tuple>{true};
+  st->set_c7(empty_tuple);  // optimization; use only if no exception can be thrown until true set_c7()
+  tuple.write()[0].clear();
+  t1.write().at(randseed_idx) = std::move(seedv);
+  st->consume_tuple_gas(t1);
+  tuple.write().at(0) = std::move(t1);
+  st->consume_tuple_gas(tuple);
+  st->set_c7(std::move(tuple));
+  return res;
+}
+
+int exec_randu256(VmState* st) {
+  VM_LOG(st) << "execute RANDU256";
+  st->get_stack().push_int(generate_randu256(st));
+  return 0;
+}
+
+int exec_rand_int(VmState* st) {
+  VM_LOG(st) << "execute RAND";
+  auto& stack = st->get_stack();
+  stack.check_underflow(1);
+  auto x = stack.pop_int_finite();
+  auto y = generate_randu256(st);
+  typename td::BigInt256::DoubleInt tmp{0};
+  tmp.add_mul(*x, *y);
+  tmp.rshift(256, -1).normalize();
+  stack.push_int(td::make_refint(tmp));
+  return 0;
+}
+
+int exec_set_rand(VmState* st, bool mix) {
+  VM_LOG(st) << "execute " << (mix ? "ADDRAND" : "SETRAND");
+  auto& stack = st->get_stack();
+  stack.check_underflow(1);
+  auto x = stack.pop_int_finite();
+  if (!x->unsigned_fits_bits(256)) {
+    throw VmError{Excno::range_chk, "new random seed out of range"};
+  }
+  auto tuple = st->get_c7();
+  auto t1 = tuple_index(*tuple, 0).as_tuple_range(255);
+  if (t1.is_null()) {
+    throw VmError{Excno::type_chk, "intermediate value is not a tuple"};
+  }
+  if (mix) {
+    auto seedv = tuple_index(*t1, randseed_idx).as_int();
+    if (seedv.is_null()) {
+      throw VmError{Excno::type_chk, "random seed is not an integer"};
+    }
+    unsigned char buffer[64], hash[32];
+    if (!std::move(seedv)->export_bytes(buffer, 32, false)) {
+      throw VmError{Excno::range_chk, "random seed out of range"};
+    }
+    if (!x->export_bytes(buffer + 32, 32, false)) {
+      throw VmError{Excno::range_chk, "mixed seed value out of range"};
+    }
+    digest::hash_str<digest::SHA256>(hash, buffer, 64);
+    if (!x.write().import_bytes(hash, 32, false)) {
+      throw VmError{Excno::range_chk, "new random seed value out of range"};
+    }
+  }
+  static auto empty_tuple = Ref<Tuple>{true};
+  st->set_c7(empty_tuple);  // optimization; use only if no exception can be thrown until true set_c7()
+  tuple.write()[0].clear();
+  auto tpay = tuple_extend_set_index(t1, randseed_idx, std::move(x));
+  if (tpay > 0) {
+    st->consume_tuple_gas(tpay);
+  }
+  tuple.unique_write()[0] = std::move(t1);
+  st->consume_tuple_gas(tuple);
+  st->set_c7(std::move(tuple));
+  return 0;
+}
+
+void register_prng_ops(OpcodeTable& cp0) {
+  using namespace std::placeholders;
+  cp0.insert(OpcodeInstr::mksimple(0xf810, 16, "RANDU256", exec_randu256))
+      .insert(OpcodeInstr::mksimple(0xf811, 16, "RAND", exec_rand_int))
+      .insert(OpcodeInstr::mksimple(0xf814, 16, "SETRAND", std::bind(exec_set_rand, _1, false)))
+      .insert(OpcodeInstr::mksimple(0xf815, 16, "ADDRAND", std::bind(exec_set_rand, _1, true)));
+}
+
 int exec_compute_hash(VmState* st, int mode) {
   VM_LOG(st) << "execute HASH" << (mode & 1 ? 'S' : 'C') << 'U';
   Stack& stack = st->get_stack();
@@ -288,6 +397,83 @@ void register_ton_crypto_ops(OpcodeTable& cp0) {
       .insert(OpcodeInstr::mksimple(0xf911, 16, "CHKSIGNS", std::bind(exec_ed25519_check_signature, _1, true)));
 }
 
+struct VmStorageStat {
+  td::uint64 cells{0}, bits{0}, refs{0}, limit;
+  td::HashSet<CellHash> visited;
+  VmStorageStat(td::uint64 _limit) : limit(_limit) {
+  }
+  bool add_storage(Ref<Cell> cell);
+  bool add_storage(const CellSlice& cs);
+  bool check_visited(const CellHash& cell_hash) {
+    return visited.insert(cell_hash).second;
+  }
+  bool check_visited(const Ref<Cell>& cell) {
+    return check_visited(cell->get_hash());
+  }
+};
+
+bool VmStorageStat::add_storage(Ref<Cell> cell) {
+  if (cell.is_null() || !check_visited(cell)) {
+    return true;
+  }
+  if (cells >= limit) {
+    return false;
+  }
+  ++cells;
+  bool special;
+  auto cs = load_cell_slice_special(std::move(cell), special);
+  return cs.is_valid() && add_storage(std::move(cs));
+}
+
+bool VmStorageStat::add_storage(const CellSlice& cs) {
+  bits += cs.size();
+  refs += cs.size_refs();
+  for (unsigned i = 0; i < cs.size_refs(); i++) {
+    if (!add_storage(cs.prefetch_ref(i))) {
+      return false;
+    }
+  }
+  return true;
+}
+
+int exec_compute_data_size(VmState* st, int mode) {
+  VM_LOG(st) << (mode & 2 ? 'S' : 'C') << "DATASIZE" << (mode & 1 ? "Q" : "");
+  Stack& stack = st->get_stack();
+  stack.check_underflow(2);
+  auto bound = stack.pop_int();
+  Ref<Cell> cell;
+  Ref<CellSlice> cs;
+  if (mode & 2) {
+    cs = stack.pop_cellslice();
+  } else {
+    cell = stack.pop_maybe_cell();
+  }
+  if (!bound->is_valid() || bound->sgn() < 0) {
+    throw VmError{Excno::range_chk, "finite non-negative integer expected"};
+  }
+  VmStorageStat stat{bound->unsigned_fits_bits(63) ? bound->to_long() : (1ULL << 63) - 1};
+  bool ok = (mode & 2 ? stat.add_storage(cs.write()) : stat.add_storage(std::move(cell)));
+  if (ok) {
+    stack.push_smallint(stat.cells);
+    stack.push_smallint(stat.bits);
+    stack.push_smallint(stat.refs);
+  } else if (!(mode & 1)) {
+    throw VmError{Excno::cell_ov, "scanned too many cells"};
+  }
+  if (mode & 1) {
+    stack.push_bool(ok);
+  }
+  return 0;
+}
+
+void register_ton_misc_ops(OpcodeTable& cp0) {
+  using namespace std::placeholders;
+  cp0.insert(OpcodeInstr::mksimple(0xf940, 16, "CDATASIZEQ", std::bind(exec_compute_data_size, _1, 1)))
+      .insert(OpcodeInstr::mksimple(0xf941, 16, "CDATASIZE", std::bind(exec_compute_data_size, _1, 0)))
+      .insert(OpcodeInstr::mksimple(0xf942, 16, "SDATASIZEQ", std::bind(exec_compute_data_size, _1, 3)))
+      .insert(OpcodeInstr::mksimple(0xf943, 16, "SDATASIZE", std::bind(exec_compute_data_size, _1, 2)));
+}
+
 int exec_load_var_integer(VmState* st, int len_bits, bool sgnd, bool quiet) {
   if (len_bits == 4 && !sgnd) {
     VM_LOG(st) << "execute LDGRAMS" << (quiet ? "Q" : "");
@@ -421,15 +607,15 @@ bool parse_maybe_anycast(CellSlice& cs, StackEntry& res) {
 bool parse_message_addr(CellSlice& cs, std::vector<StackEntry>& res) {
   res.clear();
   switch ((unsigned)cs.fetch_ulong(2)) {
-    case 0:                                      // addr_none$00 = MsgAddressExt;
-      res.emplace_back(td::RefInt256{true, 0});  // -> (0)
+    case 0:                                 // addr_none$00 = MsgAddressExt;
+      res.emplace_back(td::zero_refint());  // -> (0)
       return true;
     case 1: {  // addr_extern$01
       unsigned len;
       Ref<CellSlice> addr;
       if (cs.fetch_uint_to(9, len)               // len:(## 9)
           && cs.fetch_subslice_to(len, addr)) {  // external_address:(bits len) = MsgAddressExt;
-        res.emplace_back(td::RefInt256{true, 1});
+        res.emplace_back(td::make_refint(1));
         res.emplace_back(std::move(addr));
         return true;
       }
@@ -442,9 +628,9 @@ bool parse_message_addr(CellSlice& cs, std::vector<StackEntry>& res) {
       if (parse_maybe_anycast(cs, v)             // anycast:(Maybe Anycast)
           && cs.fetch_int_to(8, workchain)       // workchain_id:int8
           && cs.fetch_subslice_to(256, addr)) {  // address:bits256  = MsgAddressInt;
-        res.emplace_back(td::RefInt256{true, 2});
+        res.emplace_back(td::make_refint(2));
         res.emplace_back(std::move(v));
-        res.emplace_back(td::RefInt256{true, workchain});
+        res.emplace_back(td::make_refint(workchain));
         res.emplace_back(std::move(addr));
         return true;
       }
@@ -458,9 +644,9 @@ bool parse_message_addr(CellSlice& cs, std::vector<StackEntry>& res) {
           && cs.fetch_uint_to(9, len)            // addr_len:(## 9)
           && cs.fetch_int_to(32, workchain)      // workchain_id:int32
           && cs.fetch_subslice_to(len, addr)) {  // address:(bits addr_len) = MsgAddressInt;
-        res.emplace_back(td::RefInt256{true, 3});
+        res.emplace_back(td::make_refint(3));
         res.emplace_back(std::move(v));
-        res.emplace_back(td::RefInt256{true, workchain});
+        res.emplace_back(td::make_refint(workchain));
         res.emplace_back(std::move(addr));
         return true;
       }
@@ -625,26 +811,24 @@ bool store_grams(CellBuilder& cb, td::RefInt256 value) {
 }
 
 int exec_reserve_raw(VmState* st, int mode) {
-  VM_LOG(st) << "execute RESERVERAW" << (mode & 1 ? "X" : "");
+  VM_LOG(st) << "execute RAWRESERVE" << (mode & 1 ? "X" : "");
   Stack& stack = st->get_stack();
-  stack.check_underflow(2);
-  int f = stack.pop_smallint_range(3);
-  td::RefInt256 x;
-  Ref<CellSlice> csr;
+  stack.check_underflow(2 + (mode & 1));
+  int f = stack.pop_smallint_range(15);
+  Ref<Cell> y;
   if (mode & 1) {
-    csr = stack.pop_cellslice();
-  } else {
-    x = stack.pop_int_finite();
-    if (td::sgn(x) < 0) {
-      throw VmError{Excno::range_chk, "amount of nanograms must be non-negative"};
-    }
+    y = stack.pop_maybe_cell();
+  }
+  auto x = stack.pop_int_finite();
+  if (td::sgn(x) < 0) {
+    throw VmError{Excno::range_chk, "amount of nanograms must be non-negative"};
   }
   CellBuilder cb;
   if (!(cb.store_ref_bool(get_actions(st))     // out_list$_ {n:#} prev:^(OutList n)
         && cb.store_long_bool(0x36e6b809, 32)  // action_reserve_currency#36e6b809
         && cb.store_long_bool(f, 8)            // mode:(## 8)
-        && (mode & 1 ? cb.append_cellslice_bool(std::move(csr))
-                     : (store_grams(cb, std::move(x)) && cb.store_bool_bool(false))))) {
+        && store_grams(cb, std::move(x))       //
+        && cb.store_maybe_ref(std::move(y)))) {
     throw VmError{Excno::cell_ov, "cannot serialize raw reserved currency amount into an output action cell"};
   }
   return install_output_action(st, cb.finalize());
@@ -662,19 +846,58 @@ int exec_set_code(VmState* st) {
   return install_output_action(st, cb.finalize());
 }
 
+int exec_set_lib_code(VmState* st) {
+  VM_LOG(st) << "execute SETLIBCODE";
+  Stack& stack = st->get_stack();
+  stack.check_underflow(2);
+  int mode = stack.pop_smallint_range(2);
+  auto code = stack.pop_cell();
+  CellBuilder cb;
+  if (!(cb.store_ref_bool(get_actions(st))         // out_list$_ {n:#} prev:^(OutList n)
+        && cb.store_long_bool(0x26fa1dd4, 32)      // action_change_library#26fa1dd4
+        && cb.store_long_bool(mode * 2 + 1, 8)     // mode:(## 7) { mode <= 2 }
+        && cb.store_ref_bool(std::move(code)))) {  // libref:LibRef = OutAction;
+    throw VmError{Excno::cell_ov, "cannot serialize new library code into an output action cell"};
+  }
+  return install_output_action(st, cb.finalize());
+}
+
+int exec_change_lib(VmState* st) {
+  VM_LOG(st) << "execute CHANGELIB";
+  Stack& stack = st->get_stack();
+  stack.check_underflow(2);
+  int mode = stack.pop_smallint_range(2);
+  auto hash = stack.pop_int_finite();
+  if (!hash->unsigned_fits_bits(256)) {
+    throw VmError{Excno::range_chk, "library hash must be non-negative"};
+  }
+  CellBuilder cb;
+  if (!(cb.store_ref_bool(get_actions(st))             // out_list$_ {n:#} prev:^(OutList n)
+        && cb.store_long_bool(0x26fa1dd4, 32)          // action_change_library#26fa1dd4
+        && cb.store_long_bool(mode * 2, 8)             // mode:(## 7) { mode <= 2 }
+        && cb.store_int256_bool(hash, 256, false))) {  // libref:LibRef = OutAction;
+    throw VmError{Excno::cell_ov, "cannot serialize library hash into an output action cell"};
+  }
+  return install_output_action(st, cb.finalize());
+}
+
 void register_ton_message_ops(OpcodeTable& cp0) {
   using namespace std::placeholders;
   cp0.insert(OpcodeInstr::mksimple(0xfb00, 16, "SENDRAWMSG", exec_send_raw_message))
-      .insert(OpcodeInstr::mksimple(0xfb02, 16, "RESERVERAW", std::bind(exec_reserve_raw, _1, 0)))
-      .insert(OpcodeInstr::mksimple(0xfb03, 16, "RESERVERAWX", std::bind(exec_reserve_raw, _1, 1)))
-      .insert(OpcodeInstr::mksimple(0xfb04, 16, "SETCODE", exec_set_code));
+      .insert(OpcodeInstr::mksimple(0xfb02, 16, "RAWRESERVE", std::bind(exec_reserve_raw, _1, 0)))
+      .insert(OpcodeInstr::mksimple(0xfb03, 16, "RAWRESERVEX", std::bind(exec_reserve_raw, _1, 1)))
+      .insert(OpcodeInstr::mksimple(0xfb04, 16, "SETCODE", exec_set_code))
+      .insert(OpcodeInstr::mksimple(0xfb06, 16, "SETLIBCODE", exec_set_lib_code))
+      .insert(OpcodeInstr::mksimple(0xfb07, 16, "CHANGELIB", exec_change_lib));
 }
 
 void register_ton_ops(OpcodeTable& cp0) {
   register_basic_gas_ops(cp0);
   register_ton_gas_ops(cp0);
+  register_prng_ops(cp0);
   register_ton_config_ops(cp0);
   register_ton_crypto_ops(cp0);
+  register_ton_misc_ops(cp0);
   register_ton_currency_address_ops(cp0);
   register_ton_message_ops(cp0);
 }
diff --git a/submodules/ton/tonlib-src/crypto/vm/tupleops.cpp b/submodules/ton/tonlib-src/crypto/vm/tupleops.cpp
index de4de83465..ef906f6acd 100644
--- a/submodules/ton/tonlib-src/crypto/vm/tupleops.cpp
+++ b/submodules/ton/tonlib-src/crypto/vm/tupleops.cpp
@@ -14,14 +14,14 @@
     You should have received a copy of the GNU Lesser General Public License
     along with TON Blockchain Library.  If not, see <http://www.gnu.org/licenses/>.
 
-    Copyright 2017-2019 Telegram Systems LLP
+    Copyright 2017-2020 Telegram Systems LLP
 */
 #include "vm/log.h"
 #include "vm/stackops.h"
 #include "vm/opctable.h"
 #include "vm/stack.hpp"
-#include "vm/continuation.h"
 #include "vm/excno.hpp"
+#include "vm/vm.h"
 
 namespace vm {
 
@@ -53,6 +53,23 @@ int exec_null_swap_if(VmState* st, bool cond, int depth) {
   return 0;
 }
 
+int exec_null_swap_if_many(VmState* st, bool cond, int depth, int count) {
+  Stack& stack = st->get_stack();
+  VM_LOG(st) << "execute NULL" << (depth ? "ROTR" : "SWAP") << (cond ? "IF" : "IFNOT") << count;
+  stack.check_underflow(depth + 1);
+  auto x = stack.pop_int_finite();
+  if (!x->sgn() != cond) {
+    for (int i = 0; i < count; i++) {
+      stack.push({});
+    }
+    for (int i = 0; i < depth; i++) {
+      swap(stack[i], stack[i + count]);
+    }
+  }
+  stack.push_int(std::move(x));
+  return 0;
+}
+
 int exec_mktuple_common(VmState* st, unsigned n) {
   Stack& stack = st->get_stack();
   stack.check_underflow(n);
@@ -374,6 +391,10 @@ void register_tuple_ops(OpcodeTable& cp0) {
       .insert(OpcodeInstr::mksimple(0x6fa1, 16, "NULLSWAPIFNOT", std::bind(exec_null_swap_if, _1, false, 0)))
       .insert(OpcodeInstr::mksimple(0x6fa2, 16, "NULLROTRIF", std::bind(exec_null_swap_if, _1, true, 1)))
       .insert(OpcodeInstr::mksimple(0x6fa3, 16, "NULLROTRIFNOT", std::bind(exec_null_swap_if, _1, false, 1)))
+      .insert(OpcodeInstr::mksimple(0x6fa4, 16, "NULLSWAPIF2", std::bind(exec_null_swap_if_many, _1, true, 0, 2)))
+      .insert(OpcodeInstr::mksimple(0x6fa5, 16, "NULLSWAPIFNOT2", std::bind(exec_null_swap_if_many, _1, false, 0, 2)))
+      .insert(OpcodeInstr::mksimple(0x6fa6, 16, "NULLROTRIF2", std::bind(exec_null_swap_if_many, _1, true, 1, 2)))
+      .insert(OpcodeInstr::mksimple(0x6fa7, 16, "NULLROTRIFNOT2", std::bind(exec_null_swap_if_many, _1, false, 1, 2)))
       .insert(OpcodeInstr::mkfixed(0x6fb, 12, 4, dump_tuple_index2, exec_tuple_index2))
       .insert(OpcodeInstr::mkfixed(0x6fc >> 2, 10, 6, dump_tuple_index3, exec_tuple_index3));
 }
diff --git a/submodules/ton/tonlib-src/crypto/vm/utils.cpp b/submodules/ton/tonlib-src/crypto/vm/utils.cpp
new file mode 100644
index 0000000000..783bf13276
--- /dev/null
+++ b/submodules/ton/tonlib-src/crypto/vm/utils.cpp
@@ -0,0 +1,152 @@
+/*
+    This file is part of TON Blockchain Library.
+
+    TON Blockchain Library is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Lesser General Public License as published by
+    the Free Software Foundation, either version 2 of the License, or
+    (at your option) any later version.
+
+    TON Blockchain Library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public License
+    along with TON Blockchain Library.  If not, see <http://www.gnu.org/licenses/>.
+
+    Copyright 2019-2020 Telegram Systems LLP
+*/
+#include "utils.h"
+
+namespace vm {
+
+td::Result<vm::StackEntry> convert_stack_entry(td::Slice word);
+td::Result<std::vector<vm::StackEntry>> parse_stack_entries_in(td::Slice& str, bool prefix_only = false);
+td::Result<vm::StackEntry> parse_stack_entry_in(td::Slice& str, bool prefix_only = false);
+
+namespace {
+
+td::Slice& skip_spaces(td::Slice& str, const char* delims) {
+  while (str.size() > 0 && strchr(delims, str[0])) {
+    str.remove_prefix(1);
+  }
+  return str;
+}
+
+td::Slice get_word(td::Slice& str, const char* delims, const char* specials) {
+  skip_spaces(str, delims);
+
+  size_t p = 0;
+  while (p < str.size() && !strchr(delims, str[p])) {
+    if (specials && strchr(specials, str[p])) {
+      if (!p) {
+        p++;
+      }
+      break;
+    }
+    p++;
+  }
+
+  td::Slice ret = str.copy().truncate(p);
+  str.remove_prefix(p);
+  return ret;
+}
+
+}  // namespace
+
+td::Result<vm::StackEntry> parse_stack_entry_in(td::Slice& str, bool prefix_only) {
+  auto word = get_word(str, " \t", "[()]");
+  if (word.empty()) {
+    return td::Status::Error("stack value expected instead of end-of-line");
+  }
+  if (word.size() == 1 && (word[0] == '[' || word[0] == '(')) {
+    int expected = (word[0] == '(' ? ')' : ']');
+    TRY_RESULT(values, parse_stack_entries_in(str, true));
+    word = get_word(str, " \t", "[()]");
+    if (word.size() != 1 || word[0] != expected) {
+      return td::Status::Error("closing bracket expected");
+    }
+    vm::StackEntry value;
+    if (expected == ']') {
+      value = vm::StackEntry{std::move(values)};
+    } else {
+      value = vm::StackEntry::make_list(std::move(values));
+    }
+    if (prefix_only || (skip_spaces(str, " \t").size() == 0)) {
+      return value;
+    } else {
+      return td::Status::Error("extra data at the end");
+    }
+  } else {
+    return convert_stack_entry(word);
+  }
+}
+
+td::Result<vm::StackEntry> convert_stack_entry(td::Slice str) {
+  if (str.empty() || str.size() > 65535) {
+    return td::Status::Error("too long string");
+  }
+  int l = (int)str.size();
+  if (str[0] == '"') {
+    vm::CellBuilder cb;
+    if (l == 1 || str.back() != '"' || l >= 127 + 2 || !cb.store_bytes_bool(str.data() + 1, l - 2)) {
+      return td::Status::Error("incomplete (or too long) string");
+    }
+    return vm::StackEntry{vm::load_cell_slice_ref(cb.finalize())};
+  }
+  if (l >= 3 && (str[0] == 'x' || str[0] == 'b') && str[1] == '{' && str.back() == '}') {
+    unsigned char buff[128];
+    int bits =
+        (str[0] == 'x')
+            ? (int)td::bitstring::parse_bitstring_hex_literal(buff, sizeof(buff), str.begin() + 2, str.end() - 1)
+            : (int)td::bitstring::parse_bitstring_binary_literal(buff, sizeof(buff), str.begin() + 2, str.end() - 1);
+    if (bits < 0) {
+      return td::Status::Error("failed to parse raw b{...}/x{...} number");
+    }
+    return vm::StackEntry{
+        Ref<vm::CellSlice>{true, vm::CellBuilder().store_bits(td::ConstBitPtr{buff}, bits).finalize()}};
+  }
+  auto num = td::make_refint();
+  auto& x = num.unique_write();
+  if (l >= 3 && str[0] == '0' && str[1] == 'x') {
+    if (x.parse_hex(str.data() + 2, l - 2) != l - 2) {
+      return td::Status::Error("failed to parse 0x... hex number");
+    }
+  } else if (l >= 4 && str[0] == '-' && str[1] == '0' && str[2] == 'x') {
+    if (x.parse_hex(str.data() + 3, l - 3) != l - 3) {
+      return td::Status::Error("failed to parse -0x... hex number");
+    }
+    x.negate().normalize();
+  } else if (!l || x.parse_dec(str.data(), l) != l) {
+    return td::Status::Error("failed to parse dec number");
+  }
+  return vm::StackEntry{std::move(num)};
+}
+
+td::Result<std::vector<vm::StackEntry>> parse_stack_entries_in(td::Slice& str, bool prefix_only) {
+  std::vector<vm::StackEntry> ret;
+  while (!skip_spaces(str, " \t").empty()) {
+    auto c = str.copy();
+    auto word = get_word(c, " \t", "[()]");
+    if (word == "]" || word == ")") {
+      if (prefix_only) {
+        return ret;
+      } else {
+        return td::Status::Error("not paired closing bracket");
+      }
+    }
+    TRY_RESULT(value, parse_stack_entry_in(str, true));
+    ret.push_back(std::move(value));
+  }
+  return ret;
+}
+
+td::Result<std::vector<vm::StackEntry>> parse_stack_entries(td::Slice str, bool prefix_only) {
+  return parse_stack_entries_in(str, prefix_only);
+}
+
+td::Result<vm::StackEntry> parse_stack_entry(td::Slice str, bool prefix_only) {
+  return parse_stack_entry_in(str, prefix_only);
+}
+
+}  // namespace vm
diff --git a/submodules/ton/tonlib-src/crypto/vm/utils.h b/submodules/ton/tonlib-src/crypto/vm/utils.h
new file mode 100644
index 0000000000..34d761b1d2
--- /dev/null
+++ b/submodules/ton/tonlib-src/crypto/vm/utils.h
@@ -0,0 +1,29 @@
+/*
+    This file is part of TON Blockchain Library.
+
+    TON Blockchain Library is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Lesser General Public License as published by
+    the Free Software Foundation, either version 2 of the License, or
+    (at your option) any later version.
+
+    TON Blockchain Library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public License
+    along with TON Blockchain Library.  If not, see <http://www.gnu.org/licenses/>.
+
+    Copyright 2019-2020 Telegram Systems LLP
+*/
+#pragma once
+#include "stack.hpp"
+
+#include <vector>
+
+namespace vm {
+
+td::Result<std::vector<vm::StackEntry>> parse_stack_entries(td::Slice str, bool prefix_only = false);
+td::Result<vm::StackEntry> parse_stack_entry(td::Slice str, bool prefix_only = false);
+
+}  // namespace vm
diff --git a/submodules/ton/tonlib-src/crypto/vm/vm.cpp b/submodules/ton/tonlib-src/crypto/vm/vm.cpp
new file mode 100644
index 0000000000..395e01d37d
--- /dev/null
+++ b/submodules/ton/tonlib-src/crypto/vm/vm.cpp
@@ -0,0 +1,618 @@
+/*
+    This file is part of TON Blockchain Library.
+
+    TON Blockchain Library is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Lesser General Public License as published by
+    the Free Software Foundation, either version 2 of the License, or
+    (at your option) any later version.
+
+    TON Blockchain Library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public License
+    along with TON Blockchain Library.  If not, see <http://www.gnu.org/licenses/>.
+
+    Copyright 2017-2020 Telegram Systems LLP
+*/
+#include "vm/dispatch.h"
+#include "vm/continuation.h"
+#include "vm/dict.h"
+#include "vm/log.h"
+#include "vm/vm.h"
+
+namespace vm {
+
+VmState::VmState() : cp(-1), dispatch(&dummy_dispatch_table), quit0(true, 0), quit1(true, 1) {
+  ensure_throw(init_cp(0));
+  init_cregs();
+}
+
+VmState::VmState(Ref<CellSlice> _code)
+    : code(std::move(_code)), cp(-1), dispatch(&dummy_dispatch_table), quit0(true, 0), quit1(true, 1) {
+  ensure_throw(init_cp(0));
+  init_cregs();
+}
+
+VmState::VmState(Ref<CellSlice> _code, Ref<Stack> _stack, int flags, Ref<Cell> _data, VmLog log,
+                 std::vector<Ref<Cell>> _libraries, Ref<Tuple> init_c7)
+    : code(std::move(_code))
+    , stack(std::move(_stack))
+    , cp(-1)
+    , dispatch(&dummy_dispatch_table)
+    , quit0(true, 0)
+    , quit1(true, 1)
+    , log(log)
+    , libraries(std::move(_libraries)) {
+  ensure_throw(init_cp(0));
+  set_c4(std::move(_data));
+  if (init_c7.not_null()) {
+    set_c7(std::move(init_c7));
+  }
+  init_cregs(flags & 1, flags & 2);
+}
+
+VmState::VmState(Ref<CellSlice> _code, Ref<Stack> _stack, const GasLimits& gas, int flags, Ref<Cell> _data, VmLog log,
+                 std::vector<Ref<Cell>> _libraries, Ref<Tuple> init_c7)
+    : code(std::move(_code))
+    , stack(std::move(_stack))
+    , cp(-1)
+    , dispatch(&dummy_dispatch_table)
+    , quit0(true, 0)
+    , quit1(true, 1)
+    , log(log)
+    , gas(gas)
+    , libraries(std::move(_libraries)) {
+  ensure_throw(init_cp(0));
+  set_c4(std::move(_data));
+  if (init_c7.not_null()) {
+    set_c7(std::move(init_c7));
+  }
+  init_cregs(flags & 1, flags & 2);
+}
+
+Ref<CellSlice> VmState::convert_code_cell(Ref<Cell> code_cell) {
+  if (code_cell.is_null()) {
+    return {};
+  }
+  Ref<CellSlice> csr{true, NoVmOrd(), code_cell};
+  if (csr->is_valid()) {
+    return csr;
+  }
+  return load_cell_slice_ref(CellBuilder{}.store_ref(std::move(code_cell)).finalize());
+}
+
+bool VmState::init_cp(int new_cp) {
+  const DispatchTable* dt = DispatchTable::get_table(new_cp);
+  if (dt) {
+    cp = new_cp;
+    dispatch = dt;
+    return true;
+  } else {
+    return false;
+  }
+}
+
+bool VmState::set_cp(int new_cp) {
+  return new_cp == cp || init_cp(new_cp);
+}
+
+void VmState::force_cp(int new_cp) {
+  if (!set_cp(new_cp)) {
+    throw VmError{Excno::inv_opcode, "unsupported codepage"};
+  }
+}
+
+// simple call to a continuation cont
+int VmState::call(Ref<Continuation> cont) {
+  const ControlData* cont_data = cont->get_cdata();
+  if (cont_data) {
+    if (cont_data->save.c[0].not_null()) {
+      // call reduces to a jump
+      return jump(std::move(cont));
+    }
+    if (cont_data->stack.not_null() || cont_data->nargs >= 0) {
+      // if cont has non-empty stack or expects fixed number of arguments, call is not simple
+      return call(std::move(cont), -1, -1);
+    }
+    // create return continuation, to be stored into new c0
+    Ref<OrdCont> ret = Ref<OrdCont>{true, std::move(code), cp};
+    ret.unique_write().get_cdata()->save.set_c0(std::move(cr.c[0]));
+    cr.set_c0(
+        std::move(ret));  // set c0 to its final value before switching to cont; notice that cont.save.c0 is not set
+    return jump_to(std::move(cont));
+  }
+  // create return continuation, to be stored into new c0
+  Ref<OrdCont> ret = Ref<OrdCont>{true, std::move(code), cp};
+  ret.unique_write().get_cdata()->save.set_c0(std::move(cr.c[0]));
+  // general implementation of a simple call
+  cr.set_c0(std::move(ret));  // set c0 to its final value before switching to cont; notice that cont.save.c0 is not set
+  return jump_to(std::move(cont));
+}
+
+// call with parameters to continuation cont
+int VmState::call(Ref<Continuation> cont, int pass_args, int ret_args) {
+  const ControlData* cont_data = cont->get_cdata();
+  if (cont_data) {
+    if (cont_data->save.c[0].not_null()) {
+      // call reduces to a jump
+      return jump(std::move(cont), pass_args);
+    }
+    int depth = stack->depth();
+    if (pass_args > depth || cont_data->nargs > depth) {
+      throw VmError{Excno::stk_und, "stack underflow while calling a continuation: not enough arguments on stack"};
+    }
+    if (cont_data->nargs > pass_args && pass_args >= 0) {
+      throw VmError{Excno::stk_und,
+                    "stack underflow while calling a closure continuation: not enough arguments passed"};
+    }
+    auto old_c0 = std::move(cr.c[0]);
+    // optimization(?): decrease refcnts of unused continuations in c[i] as early as possible
+    preclear_cr(cont_data->save);
+    // no exceptions should be thrown after this point
+    int copy = cont_data->nargs, skip = 0;
+    if (pass_args >= 0) {
+      if (copy >= 0) {
+        skip = pass_args - copy;
+      } else {
+        copy = pass_args;
+      }
+    }
+    // copy=-1 : pass whole stack, else pass top `copy` elements, drop next `skip` elements.
+    Ref<Stack> new_stk;
+    if (cont_data->stack.not_null() && !cont_data->stack->is_empty()) {
+      // `cont` already has a stack, create resulting stack from it
+      if (copy < 0) {
+        copy = stack->depth();
+      }
+      if (cont->is_unique()) {
+        // optimization: avoid copying stack if we hold the only copy of `cont`
+        new_stk = std::move(cont.unique_write().get_cdata()->stack);
+      } else {
+        new_stk = cont_data->stack;
+      }
+      new_stk.write().move_from_stack(get_stack(), copy);
+      if (skip > 0) {
+        get_stack().pop_many(skip);
+      }
+    } else if (copy >= 0) {
+      new_stk = get_stack().split_top(copy, skip);
+    } else {
+      new_stk = std::move(stack);
+      stack.clear();
+    }
+    // create return continuation using the remainder of current stack
+    Ref<OrdCont> ret = Ref<OrdCont>{true, std::move(code), cp, std::move(stack), ret_args};
+    ret.unique_write().get_cdata()->save.set_c0(std::move(old_c0));
+    Ref<OrdCont> ord_cont = static_cast<Ref<OrdCont>>(cont);
+    set_stack(std::move(new_stk));
+    cr.set_c0(std::move(ret));  // ??? if codepage of code in ord_cont is unknown, will end up with incorrect c0
+    return jump_to(std::move(cont));
+  } else {
+    // have no continuation data, situation is somewhat simpler
+    int depth = stack->depth();
+    if (pass_args > depth) {
+      throw VmError{Excno::stk_und, "stack underflow while calling a continuation: not enough arguments on stack"};
+    }
+    // create new stack from the top `pass_args` elements of the current stack
+    Ref<Stack> new_stk = (pass_args >= 0 ? get_stack().split_top(pass_args) : std::move(stack));
+    // create return continuation using the remainder of the current stack
+    Ref<OrdCont> ret = Ref<OrdCont>{true, std::move(code), cp, std::move(stack), ret_args};
+    ret.unique_write().get_cdata()->save.set_c0(std::move(cr.c[0]));
+    set_stack(std::move(new_stk));
+    cr.set_c0(std::move(ret));  // ??? if codepage of code in ord_cont is unknown, will end up with incorrect c0
+    return jump_to(std::move(cont));
+  }
+}
+
+// simple jump to continuation cont
+int VmState::jump(Ref<Continuation> cont) {
+  const ControlData* cont_data = cont->get_cdata();
+  if (cont_data && (cont_data->stack.not_null() || cont_data->nargs >= 0)) {
+    // if cont has non-empty stack or expects fixed number of arguments, jump is not simple
+    return jump(std::move(cont), -1);
+  } else {
+    return jump_to(std::move(cont));
+  }
+}
+
+// general jump to continuation cont
+int VmState::jump(Ref<Continuation> cont, int pass_args) {
+  const ControlData* cont_data = cont->get_cdata();
+  if (cont_data) {
+    // first do the checks
+    int depth = stack->depth();
+    if (pass_args > depth || cont_data->nargs > depth) {
+      throw VmError{Excno::stk_und, "stack underflow while jumping to a continuation: not enough arguments on stack"};
+    }
+    if (cont_data->nargs > pass_args && pass_args >= 0) {
+      throw VmError{Excno::stk_und,
+                    "stack underflow while jumping to closure continuation: not enough arguments passed"};
+    }
+    // optimization(?): decrease refcnts of unused continuations in c[i] as early as possible
+    preclear_cr(cont_data->save);
+    // no exceptions should be thrown after this point
+    int copy = cont_data->nargs;
+    if (pass_args >= 0 && copy < 0) {
+      copy = pass_args;
+    }
+    // copy=-1 : pass whole stack, else pass top `copy` elements, drop the remainder.
+    if (cont_data->stack.not_null() && !cont_data->stack->is_empty()) {
+      // `cont` already has a stack, create resulting stack from it
+      if (copy < 0) {
+        copy = get_stack().depth();
+      }
+      Ref<Stack> new_stk;
+      if (cont->is_unique()) {
+        // optimization: avoid copying the stack if we hold the only copy of `cont`
+        new_stk = std::move(cont.unique_write().get_cdata()->stack);
+      } else {
+        new_stk = cont_data->stack;
+      }
+      new_stk.write().move_from_stack(get_stack(), copy);
+      set_stack(std::move(new_stk));
+    } else {
+      if (copy >= 0) {
+        get_stack().drop_bottom(stack->depth() - copy);
+      }
+    }
+    return jump_to(std::move(cont));
+  } else {
+    // have no continuation data, situation is somewhat simpler
+    if (pass_args >= 0) {
+      int depth = get_stack().depth();
+      if (pass_args > depth) {
+        throw VmError{Excno::stk_und, "stack underflow while jumping to a continuation: not enough arguments on stack"};
+      }
+      get_stack().drop_bottom(depth - pass_args);
+    }
+    return jump_to(std::move(cont));
+  }
+}
+
+int VmState::ret() {
+  Ref<Continuation> cont = quit0;
+  cont.swap(cr.c[0]);
+  return jump(std::move(cont));
+}
+
+int VmState::ret(int ret_args) {
+  Ref<Continuation> cont = quit0;
+  cont.swap(cr.c[0]);
+  return jump(std::move(cont), ret_args);
+}
+
+int VmState::ret_alt() {
+  Ref<Continuation> cont = quit1;
+  cont.swap(cr.c[1]);
+  return jump(std::move(cont));
+}
+
+int VmState::ret_alt(int ret_args) {
+  Ref<Continuation> cont = quit1;
+  cont.swap(cr.c[1]);
+  return jump(std::move(cont), ret_args);
+}
+
+Ref<OrdCont> VmState::extract_cc(int save_cr, int stack_copy, int cc_args) {
+  Ref<Stack> new_stk;
+  if (stack_copy < 0 || stack_copy == stack->depth()) {
+    new_stk = std::move(stack);
+    stack.clear();
+  } else if (stack_copy > 0) {
+    stack->check_underflow(stack_copy);
+    new_stk = get_stack().split_top(stack_copy);
+  } else {
+    new_stk = Ref<Stack>{true};
+  }
+  Ref<OrdCont> cc = Ref<OrdCont>{true, std::move(code), cp, std::move(stack), cc_args};
+  stack = std::move(new_stk);
+  if (save_cr & 7) {
+    ControlData* cdata = cc.unique_write().get_cdata();
+    if (save_cr & 1) {
+      cdata->save.set_c0(std::move(cr.c[0]));
+      cr.set_c0(quit0);
+    }
+    if (save_cr & 2) {
+      cdata->save.set_c1(std::move(cr.c[1]));
+      cr.set_c1(quit1);
+    }
+    if (save_cr & 4) {
+      cdata->save.set_c2(std::move(cr.c[2]));
+      // cr.set_c2(Ref<ExcQuitCont>{true});
+    }
+  }
+  return cc;
+}
+
+int VmState::throw_exception(int excno) {
+  Stack& stack_ref = get_stack();
+  stack_ref.clear();
+  stack_ref.push_smallint(0);
+  stack_ref.push_smallint(excno);
+  code.clear();
+  consume_gas(exception_gas_price);
+  return jump(get_c2());
+}
+
+int VmState::throw_exception(int excno, StackEntry&& arg) {
+  Stack& stack_ref = get_stack();
+  stack_ref.clear();
+  stack_ref.push(std::move(arg));
+  stack_ref.push_smallint(excno);
+  code.clear();
+  consume_gas(exception_gas_price);
+  return jump(get_c2());
+}
+
+void GasLimits::gas_exception() const {
+  throw VmNoGas{};
+}
+
+void GasLimits::set_limits(long long _max, long long _limit, long long _credit) {
+  gas_max = _max;
+  gas_limit = _limit;
+  gas_credit = _credit;
+  change_base(_limit + _credit);
+}
+
+void GasLimits::change_limit(long long _limit) {
+  _limit = std::min(std::max(_limit, 0LL), gas_max);
+  gas_credit = 0;
+  gas_limit = _limit;
+  change_base(_limit);
+}
+
+bool VmState::set_gas_limits(long long _max, long long _limit, long long _credit) {
+  gas.set_limits(_max, _limit, _credit);
+  return true;
+}
+
+void VmState::change_gas_limit(long long new_limit) {
+  VM_LOG(this) << "changing gas limit to " << std::min(new_limit, gas.gas_max);
+  gas.change_limit(new_limit);
+}
+
+int VmState::step() {
+  assert(!code.is_null());
+  //VM_LOG(st) << "stack:";  stack->dump(VM_LOG(st));
+  //VM_LOG(st) << "; cr0.refcnt = " << get_c0()->get_refcnt() - 1 << std::endl;
+  if (stack_trace) {
+    stack->dump(std::cerr, 3);
+  }
+  ++steps;
+  if (code->size()) {
+    return dispatch->dispatch(this, code.write());
+  } else if (code->size_refs()) {
+    VM_LOG(this) << "execute implicit JMPREF";
+    gas.consume_chk(implicit_jmpref_gas_price);
+    Ref<Continuation> cont = Ref<OrdCont>{true, load_cell_slice_ref(code->prefetch_ref()), get_cp()};
+    return jump(std::move(cont));
+  } else {
+    VM_LOG(this) << "execute implicit RET";
+    gas.consume_chk(implicit_ret_gas_price);
+    return ret();
+  }
+}
+
+int VmState::run() {
+  if (code.is_null()) {
+    throw VmError{Excno::fatal, "cannot run an uninitialized VM"};
+  }
+  int res;
+  Guard guard(this);
+  do {
+    // LOG(INFO) << "[BS] data cells: " << DataCell::get_total_data_cells();
+    try {
+      try {
+        try {
+          res = step();
+          gas.check();
+        } catch (vm::CellBuilder::CellWriteError) {
+          throw VmError{Excno::cell_ov};
+        } catch (vm::CellBuilder::CellCreateError) {
+          throw VmError{Excno::cell_ov};
+        } catch (vm::CellSlice::CellReadError) {
+          throw VmError{Excno::cell_und};
+        }
+      } catch (const VmError& vme) {
+        VM_LOG(this) << "handling exception code " << vme.get_errno() << ": " << vme.get_msg();
+        try {
+          // LOG(INFO) << "[EX] data cells: " << DataCell::get_total_data_cells();
+          ++steps;
+          res = throw_exception(vme.get_errno());
+        } catch (const VmError& vme2) {
+          VM_LOG(this) << "exception " << vme2.get_errno() << " while handling exception: " << vme.get_msg();
+          // LOG(INFO) << "[EXX] data cells: " << DataCell::get_total_data_cells();
+          return ~vme2.get_errno();
+        }
+      }
+    } catch (VmNoGas vmoog) {
+      ++steps;
+      VM_LOG(this) << "unhandled out-of-gas exception: gas consumed=" << gas.gas_consumed()
+                   << ", limit=" << gas.gas_limit;
+      get_stack().clear();
+      get_stack().push_smallint(gas.gas_consumed());
+      return vmoog.get_errno();  // no ~ for unhandled exceptions (to make their faking impossible)
+    }
+  } while (!res);
+  // LOG(INFO) << "[EN] data cells: " << DataCell::get_total_data_cells();
+  if ((res | 1) == -1 && !try_commit()) {
+    VM_LOG(this) << "automatic commit failed (new data or action cells too deep)";
+    get_stack().clear();
+    get_stack().push_smallint(0);
+    return ~(int)Excno::cell_ov;
+  }
+  return res;
+}
+
+bool VmState::try_commit() {
+  if (cr.d[0].not_null() && cr.d[1].not_null() && cr.d[0]->get_depth() <= max_data_depth &&
+      cr.d[1]->get_depth() <= max_data_depth) {
+    cstate.c4 = cr.d[0];
+    cstate.c5 = cr.d[1];
+    cstate.committed = true;
+    return true;
+  } else {
+    return false;
+  }
+}
+
+void VmState::force_commit() {
+  if (!try_commit()) {
+    throw VmError{Excno::cell_ov, "cannot commit too deep cells as new data/actions"};
+  }
+}
+
+ControlData* force_cdata(Ref<Continuation>& cont) {
+  if (!cont->get_cdata()) {
+    cont = Ref<ArgContExt>{true, cont};
+    return cont.unique_write().get_cdata();
+  } else {
+    return cont.write().get_cdata();
+  }
+}
+
+ControlRegs* force_cregs(Ref<Continuation>& cont) {
+  return &force_cdata(cont)->save;
+}
+
+int run_vm_code(Ref<CellSlice> code, Ref<Stack>& stack, int flags, Ref<Cell>* data_ptr, VmLog log, long long* steps,
+                GasLimits* gas_limits, std::vector<Ref<Cell>> libraries, Ref<Tuple> init_c7, Ref<Cell>* actions_ptr) {
+  VmState vm{code,
+             std::move(stack),
+             gas_limits ? *gas_limits : GasLimits{},
+             flags,
+             data_ptr ? *data_ptr : Ref<Cell>{},
+             log,
+             std::move(libraries),
+             std::move(init_c7)};
+  int res = vm.run();
+  stack = vm.get_stack_ref();
+  if (vm.committed() && data_ptr) {
+    *data_ptr = vm.get_committed_state().c4;
+  }
+  if (vm.committed() && actions_ptr) {
+    *actions_ptr = vm.get_committed_state().c5;
+  }
+  if (steps) {
+    *steps = vm.get_steps_count();
+  }
+  if (gas_limits) {
+    *gas_limits = vm.get_gas_limits();
+    LOG(INFO) << "steps: " << vm.get_steps_count() << " gas: used=" << gas_limits->gas_consumed()
+              << ", max=" << gas_limits->gas_max << ", limit=" << gas_limits->gas_limit
+              << ", credit=" << gas_limits->gas_credit;
+  }
+  if ((vm.get_log().log_mask & vm::VmLog::DumpStack) != 0) {
+    VM_LOG(&vm) << "BEGIN_STACK_DUMP";
+    for (int i = stack->depth(); i > 0; i--) {
+      VM_LOG(&vm) << (*stack)[i - 1].to_string();
+    }
+    VM_LOG(&vm) << "END_STACK_DUMP";
+  }
+
+  return ~res;
+}
+
+int run_vm_code(Ref<CellSlice> code, Stack& stack, int flags, Ref<Cell>* data_ptr, VmLog log, long long* steps,
+                GasLimits* gas_limits, std::vector<Ref<Cell>> libraries, Ref<Tuple> init_c7, Ref<Cell>* actions_ptr) {
+  Ref<Stack> stk{true};
+  stk.unique_write().set_contents(std::move(stack));
+  stack.clear();
+  int res = run_vm_code(code, stk, flags, data_ptr, log, steps, gas_limits, std::move(libraries), std::move(init_c7),
+                        actions_ptr);
+  CHECK(stack.is_unique());
+  if (stk.is_null()) {
+    stack.clear();
+  } else if (&(*stk) != &stack) {
+    VmState* st = nullptr;
+    if (stk->is_unique()) {
+      VM_LOG(st) << "move resulting stack (" << stk->depth() << " entries)";
+      stack.set_contents(std::move(stk.unique_write()));
+    } else {
+      VM_LOG(st) << "copying resulting stack (" << stk->depth() << " entries)";
+      stack.set_contents(*stk);
+    }
+  }
+  return res;
+}
+
+// may throw a dictionary exception; returns nullptr if library is not found in context
+Ref<Cell> VmState::load_library(td::ConstBitPtr hash) {
+  std::unique_ptr<VmStateInterface> tmp_ctx;
+  // install temporary dummy vm state interface to prevent charging for cell load operations during library lookup
+  VmStateInterface::Guard(tmp_ctx.get());
+  for (const auto& lib_collection : libraries) {
+    auto lib = lookup_library_in(hash, lib_collection);
+    if (lib.not_null()) {
+      return lib;
+    }
+  }
+  return {};
+}
+
+bool VmState::register_library_collection(Ref<Cell> lib) {
+  if (lib.is_null()) {
+    return true;
+  }
+  libraries.push_back(std::move(lib));
+  return true;
+}
+
+void VmState::register_cell_load(const CellHash& cell_hash) {
+  if (cell_load_gas_price == cell_reload_gas_price) {
+    consume_gas(cell_load_gas_price);
+  } else {
+    auto ok = loaded_cells.insert(cell_hash);  // check whether this is the first time this cell is loaded
+    if (ok.second) {
+      loaded_cells_count++;
+    }
+    consume_gas(ok.second ? cell_load_gas_price : cell_reload_gas_price);
+  }
+}
+
+void VmState::register_cell_create() {
+  consume_gas(cell_create_gas_price);
+}
+
+td::BitArray<256> VmState::get_state_hash() const {
+  // TODO: implement properly, by serializing the stack etc, and computing the Merkle hash
+  td::BitArray<256> res;
+  res.clear();
+  return res;
+}
+
+td::BitArray<256> VmState::get_final_state_hash(int exit_code) const {
+  // TODO: implement properly, by serializing the stack etc, and computing the Merkle hash
+  td::BitArray<256> res;
+  res.clear();
+  return res;
+}
+
+Ref<vm::Cell> lookup_library_in(td::ConstBitPtr key, vm::Dictionary& dict) {
+  try {
+    auto val = dict.lookup(key, 256);
+    if (val.is_null() || !val->have_refs()) {
+      return {};
+    }
+    auto root = val->prefetch_ref();
+    if (root.not_null() && !root->get_hash().bits().compare(key, 256)) {
+      return root;
+    }
+    return {};
+  } catch (vm::VmError) {
+    return {};
+  }
+}
+
+Ref<vm::Cell> lookup_library_in(td::ConstBitPtr key, Ref<vm::Cell> lib_root) {
+  if (lib_root.is_null()) {
+    return lib_root;
+  }
+  vm::Dictionary dict{std::move(lib_root), 256};
+  return lookup_library_in(key, dict);
+}
+
+}  // namespace vm
diff --git a/submodules/ton/tonlib-src/crypto/vm/vm.h b/submodules/ton/tonlib-src/crypto/vm/vm.h
new file mode 100644
index 0000000000..19c3829f11
--- /dev/null
+++ b/submodules/ton/tonlib-src/crypto/vm/vm.h
@@ -0,0 +1,320 @@
+/*
+    This file is part of TON Blockchain Library.
+
+    TON Blockchain Library is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Lesser General Public License as published by
+    the Free Software Foundation, either version 2 of the License, or
+    (at your option) any later version.
+
+    TON Blockchain Library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public License
+    along with TON Blockchain Library.  If not, see <http://www.gnu.org/licenses/>.
+
+    Copyright 2017-2020 Telegram Systems LLP
+*/
+#pragma once
+
+#include "common/refcnt.hpp"
+#include "vm/cellslice.h"
+#include "vm/stack.hpp"
+#include "vm/vmstate.h"
+#include "vm/log.h"
+#include "vm/continuation.h"
+#include "td/utils/HashSet.h"
+
+namespace vm {
+
+using td::Ref;
+struct GasLimits {
+  static constexpr long long infty = (1ULL << 63) - 1;
+  long long gas_max, gas_limit, gas_credit, gas_remaining, gas_base;
+  GasLimits() : gas_max(infty), gas_limit(infty), gas_credit(0), gas_remaining(infty), gas_base(infty) {
+  }
+  GasLimits(long long _limit, long long _max = infty, long long _credit = 0)
+      : gas_max(_max)
+      , gas_limit(_limit)
+      , gas_credit(_credit)
+      , gas_remaining(_limit + _credit)
+      , gas_base(gas_remaining) {
+  }
+  long long gas_consumed() const {
+    return gas_base - gas_remaining;
+  }
+  void set_limits(long long _max, long long _limit, long long _credit = 0);
+  void change_base(long long _base) {
+    gas_remaining += _base - gas_base;
+    gas_base = _base;
+  }
+  void change_limit(long long _limit);
+  void consume(long long amount) {
+    // LOG(DEBUG) << "consume " << amount << " gas (" << gas_remaining << " remaining)";
+    gas_remaining -= amount;
+  }
+  bool try_consume(long long amount) {
+    // LOG(DEBUG) << "try consume " << amount << " gas (" << gas_remaining << " remaining)";
+    return (gas_remaining -= amount) >= 0;
+  }
+  void gas_exception() const;
+  void gas_exception(bool cond) const {
+    if (!cond) {
+      gas_exception();
+    }
+  }
+  void consume_chk(long long amount) {
+    gas_exception(try_consume(amount));
+  }
+  void check() const {
+    gas_exception(gas_remaining >= 0);
+  }
+  bool final_ok() const {
+    return gas_remaining >= gas_credit;
+  }
+};
+
+struct CommittedState {
+  Ref<vm::Cell> c4, c5;
+  bool committed{false};
+};
+
+class VmState final : public VmStateInterface {
+  Ref<CellSlice> code;
+  Ref<Stack> stack;
+  ControlRegs cr;
+  CommittedState cstate;
+  int cp;
+  long long steps{0};
+  const DispatchTable* dispatch;
+  Ref<QuitCont> quit0, quit1;
+  VmLog log;
+  GasLimits gas;
+  std::vector<Ref<Cell>> libraries;
+  td::HashSet<CellHash> loaded_cells;
+  td::int64 loaded_cells_count{0};
+  int stack_trace{0}, debug_off{0};
+  bool chksig_always_succeed{false};
+
+ public:
+  enum {
+    cell_load_gas_price = 100,
+    cell_reload_gas_price = 25,
+    cell_create_gas_price = 500,
+    exception_gas_price = 50,
+    tuple_entry_gas_price = 1,
+    implicit_jmpref_gas_price = 10,
+    implicit_ret_gas_price = 5,
+    max_data_depth = 512
+  };
+  VmState();
+  VmState(Ref<CellSlice> _code);
+  VmState(Ref<CellSlice> _code, Ref<Stack> _stack, int flags = 0, Ref<Cell> _data = {}, VmLog log = {},
+          std::vector<Ref<Cell>> _libraries = {}, Ref<Tuple> init_c7 = {});
+  VmState(Ref<CellSlice> _code, Ref<Stack> _stack, const GasLimits& _gas, int flags = 0, Ref<Cell> _data = {},
+          VmLog log = {}, std::vector<Ref<Cell>> _libraries = {}, Ref<Tuple> init_c7 = {});
+  template <typename... Args>
+  VmState(Ref<Cell> code_cell, Args&&... args)
+      : VmState(convert_code_cell(std::move(code_cell)), std::forward<Args>(args)...) {
+  }
+  VmState(const VmState&) = delete;
+  VmState(VmState&&) = delete;
+  VmState& operator=(const VmState&) = delete;
+  VmState& operator=(VmState&&) = delete;
+  bool set_gas_limits(long long _max, long long _limit, long long _credit = 0);
+  bool final_gas_ok() const {
+    return gas.final_ok();
+  }
+  long long gas_consumed() const {
+    return gas.gas_consumed();
+  }
+  bool committed() const {
+    return cstate.committed;
+  }
+  const CommittedState& get_committed_state() const {
+    return cstate;
+  }
+  void consume_gas(long long amount) {
+    gas.consume(amount);
+  }
+  void consume_tuple_gas(unsigned tuple_len) {
+    consume_gas(tuple_len * tuple_entry_gas_price);
+  }
+  void consume_tuple_gas(const Ref<vm::Tuple>& tup) {
+    if (tup.not_null()) {
+      consume_tuple_gas((unsigned)tup->size());
+    }
+  }
+  GasLimits get_gas_limits() const {
+    return gas;
+  }
+  void change_gas_limit(long long new_limit);
+  template <typename... Args>
+  void check_underflow(Args... args) {
+    stack->check_underflow(args...);
+  }
+  bool register_library_collection(Ref<Cell> lib);
+  Ref<Cell> load_library(
+      td::ConstBitPtr hash) override;  // may throw a dictionary exception; returns nullptr if library is not found
+  void register_cell_load(const CellHash& cell_hash) override;
+  void register_cell_create() override;
+  bool init_cp(int new_cp);
+  bool set_cp(int new_cp);
+  void force_cp(int new_cp);
+  int get_cp() const {
+    return cp;
+  }
+  int incr_stack_trace(int v) {
+    return stack_trace += v;
+  }
+  long long get_steps_count() const {
+    return steps;
+  }
+  td::BitArray<256> get_state_hash() const;
+  td::BitArray<256> get_final_state_hash(int exit_code) const;
+  int step();
+  int run();
+  Stack& get_stack() {
+    return stack.write();
+  }
+  const Stack& get_stack_const() const {
+    return *stack;
+  }
+  Ref<Stack> get_stack_ref() const {
+    return stack;
+  }
+  Ref<Continuation> get_c0() const {
+    return cr.c[0];
+  }
+  Ref<Continuation> get_c1() const {
+    return cr.c[1];
+  }
+  Ref<Continuation> get_c2() const {
+    return cr.c[2];
+  }
+  Ref<Continuation> get_c3() const {
+    return cr.c[3];
+  }
+  Ref<Cell> get_c4() const {
+    return cr.d[0];
+  }
+  Ref<Tuple> get_c7() const {
+    return cr.c7;
+  }
+  Ref<Continuation> get_c(unsigned idx) const {
+    return cr.get_c(idx);
+  }
+  Ref<Cell> get_d(unsigned idx) const {
+    return cr.get_d(idx);
+  }
+  StackEntry get(unsigned idx) const {
+    return cr.get(idx);
+  }
+  const VmLog& get_log() const {
+    return log;
+  }
+  void define_c0(Ref<Continuation> cont) {
+    cr.define_c0(std::move(cont));
+  }
+  void set_c0(Ref<Continuation> cont) {
+    cr.set_c0(std::move(cont));
+  }
+  void set_c1(Ref<Continuation> cont) {
+    cr.set_c1(std::move(cont));
+  }
+  void set_c2(Ref<Continuation> cont) {
+    cr.set_c2(std::move(cont));
+  }
+  bool set_c(unsigned idx, Ref<Continuation> val) {
+    return cr.set_c(idx, std::move(val));
+  }
+  bool set_d(unsigned idx, Ref<Cell> val) {
+    return cr.set_d(idx, std::move(val));
+  }
+  void set_c4(Ref<Cell> val) {
+    cr.set_c4(std::move(val));
+  }
+  bool set_c7(Ref<Tuple> val) {
+    return cr.set_c7(std::move(val));
+  }
+  bool set(unsigned idx, StackEntry val) {
+    return cr.set(idx, std::move(val));
+  }
+  void set_stack(Ref<Stack> new_stk) {
+    stack = std::move(new_stk);
+  }
+  Ref<Stack> swap_stack(Ref<Stack> new_stk) {
+    stack.swap(new_stk);
+    return new_stk;
+  }
+  void ensure_throw(bool cond) const {
+    if (!cond) {
+      fatal();
+    }
+  }
+  void set_code(Ref<CellSlice> _code, int _cp) {
+    code = std::move(_code);
+    force_cp(_cp);
+  }
+  Ref<CellSlice> get_code() const {
+    return code;
+  }
+  void push_code() {
+    get_stack().push_cellslice(get_code());
+  }
+  void adjust_cr(const ControlRegs& save) {
+    cr ^= save;
+  }
+  void adjust_cr(ControlRegs&& save) {
+    cr ^= save;
+  }
+  void preclear_cr(const ControlRegs& save) {
+    cr &= save;
+  }
+  int call(Ref<Continuation> cont);
+  int call(Ref<Continuation> cont, int pass_args, int ret_args = -1);
+  int jump(Ref<Continuation> cont);
+  int jump(Ref<Continuation> cont, int pass_args);
+  int ret();
+  int ret(int ret_args);
+  int ret_alt();
+  int ret_alt(int ret_args);
+  int repeat(Ref<Continuation> body, Ref<Continuation> after, long long count);
+  int again(Ref<Continuation> body);
+  int until(Ref<Continuation> body, Ref<Continuation> after);
+  int loop_while(Ref<Continuation> cond, Ref<Continuation> body, Ref<Continuation> after);
+  int throw_exception(int excno, StackEntry&& arg);
+  int throw_exception(int excno);
+  Ref<OrdCont> extract_cc(int save_cr = 1, int stack_copy = -1, int cc_args = -1);
+  void fatal(void) const {
+    throw VmFatal{};
+  }
+  int jump_to(Ref<Continuation> cont) {
+    return cont->is_unique() ? cont.unique_write().jump_w(this) : cont->jump(this);
+  }
+  static Ref<CellSlice> convert_code_cell(Ref<Cell> code_cell);
+  bool try_commit();
+  void force_commit();
+
+  void set_chksig_always_succeed(bool flag) {
+    chksig_always_succeed = flag;
+  }
+  bool get_chksig_always_succeed() const {
+    return chksig_always_succeed;
+  }
+
+ private:
+  void init_cregs(bool same_c3 = false, bool push_0 = true);
+};
+
+int run_vm_code(Ref<CellSlice> _code, Ref<Stack>& _stack, int flags = 0, Ref<Cell>* data_ptr = nullptr, VmLog log = {},
+                long long* steps = nullptr, GasLimits* gas_limits = nullptr, std::vector<Ref<Cell>> libraries = {},
+                Ref<Tuple> init_c7 = {}, Ref<Cell>* actions_ptr = nullptr);
+int run_vm_code(Ref<CellSlice> _code, Stack& _stack, int flags = 0, Ref<Cell>* data_ptr = nullptr, VmLog log = {},
+                long long* steps = nullptr, GasLimits* gas_limits = nullptr, std::vector<Ref<Cell>> libraries = {},
+                Ref<Tuple> init_c7 = {}, Ref<Cell>* actions_ptr = nullptr);
+
+Ref<vm::Cell> lookup_library_in(td::ConstBitPtr key, Ref<vm::Cell> lib_root);
+
+}  // namespace vm
diff --git a/submodules/ton/tonlib-src/crypto/vm/vmstate.h b/submodules/ton/tonlib-src/crypto/vm/vmstate.h
index 312b662688..a81a4e78d6 100644
--- a/submodules/ton/tonlib-src/crypto/vm/vmstate.h
+++ b/submodules/ton/tonlib-src/crypto/vm/vmstate.h
@@ -14,7 +14,7 @@
     You should have received a copy of the GNU Lesser General Public License
     along with TON Blockchain Library.  If not, see <http://www.gnu.org/licenses/>.
 
-    Copyright 2017-2019 Telegram Systems LLP
+    Copyright 2017-2020 Telegram Systems LLP
 */
 #pragma once
 #include "common/refcnt.hpp"
@@ -28,12 +28,16 @@ using td::Ref;
 class VmStateInterface : public td::Context<VmStateInterface> {
  public:
   virtual ~VmStateInterface() = default;
-  virtual Ref<vm::Cell> load_library(
+  virtual Ref<Cell> load_library(
       td::ConstBitPtr hash) {  // may throw a dictionary exception; returns nullptr if library is not found
     return {};
   }
-  virtual void register_cell_load(){};
+  virtual void register_cell_load(const CellHash& cell_hash){};
   virtual void register_cell_create(){};
+  virtual void register_new_cell(Ref<DataCell>& cell){};
+  virtual bool register_op(int op_units = 1) {
+    return true;
+  };
 };
 
 }  // namespace vm
diff --git a/submodules/ton/tonlib-src/lite-client/lite-client-common.cpp b/submodules/ton/tonlib-src/lite-client/lite-client-common.cpp
index 82503faf35..5bc8ca7380 100644
--- a/submodules/ton/tonlib-src/lite-client/lite-client-common.cpp
+++ b/submodules/ton/tonlib-src/lite-client/lite-client-common.cpp
@@ -1,3 +1,21 @@
+/*
+    This file is part of TON Blockchain Library.
+
+    TON Blockchain Library is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Lesser General Public License as published by
+    the Free Software Foundation, either version 2 of the License, or
+    (at your option) any later version.
+
+    TON Blockchain Library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public License
+    along with TON Blockchain Library.  If not, see <http://www.gnu.org/licenses/>.
+
+    Copyright 2017-2020 Telegram Systems LLP
+*/
 #include "lite-client-common.h"
 
 #include "auto/tl/lite_api.hpp"
@@ -9,6 +27,7 @@
 using namespace std::literals::string_literals;
 
 namespace liteclient {
+
 td::Result<std::unique_ptr<block::BlockProofChain>> deserialize_proof_chain(
     ton::lite_api::object_ptr<ton::lite_api::liteServer_partialBlockProof> f) {
   // deserialize proof chain
@@ -75,6 +94,7 @@ td::Result<std::unique_ptr<block::BlockProofChain>> deserialize_proof_chain(
   LOG(DEBUG) << "deserialized a BlkProofChain of " << chain->link_count() << " links";
   return std::move(chain);
 }
+
 td::Ref<vm::Tuple> prepare_vm_c7(ton::UnixTime now, ton::LogicalTime lt, td::Ref<vm::CellSlice> my_addr,
                                  const block::CurrencyCollection& balance) {
   td::BitArray<256> rand_seed;
@@ -96,4 +116,5 @@ td::Ref<vm::Tuple> prepare_vm_c7(ton::UnixTime now, ton::LogicalTime lt, td::Ref
   LOG(DEBUG) << "SmartContractInfo initialized with " << vm::StackEntry(tuple).to_string();
   return vm::make_tuple_ref(std::move(tuple));
 }
+
 }  // namespace liteclient
diff --git a/submodules/ton/tonlib-src/lite-client/lite-client-common.h b/submodules/ton/tonlib-src/lite-client/lite-client-common.h
index bca2c3079d..a73dab91d0 100644
--- a/submodules/ton/tonlib-src/lite-client/lite-client-common.h
+++ b/submodules/ton/tonlib-src/lite-client/lite-client-common.h
@@ -1,3 +1,21 @@
+/*
+    This file is part of TON Blockchain Library.
+
+    TON Blockchain Library is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Lesser General Public License as published by
+    the Free Software Foundation, either version 2 of the License, or
+    (at your option) any later version.
+
+    TON Blockchain Library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public License
+    along with TON Blockchain Library.  If not, see <http://www.gnu.org/licenses/>.
+
+    Copyright 2017-2020 Telegram Systems LLP
+*/
 #pragma once
 
 #include "crypto/block/block.h"
@@ -5,6 +23,7 @@
 #include "auto/tl/lite_api.hpp"
 
 namespace liteclient {
+
 td::Result<std::unique_ptr<block::BlockProofChain>> deserialize_proof_chain(
     ton::lite_api::object_ptr<ton::lite_api::liteServer_partialBlockProof> f);
 
diff --git a/submodules/ton/tonlib-src/lite-client/lite-client.cpp b/submodules/ton/tonlib-src/lite-client/lite-client.cpp
index 54eb61b6ac..3dedabe2e5 100644
--- a/submodules/ton/tonlib-src/lite-client/lite-client.cpp
+++ b/submodules/ton/tonlib-src/lite-client/lite-client.cpp
@@ -23,7 +23,7 @@
     exception statement from your version. If you delete this exception statement 
     from all source files in the program, then also delete it here.
 
-    Copyright 2017-2019 Telegram Systems LLP
+    Copyright 2017-2020 Telegram Systems LLP
 */
 #include "lite-client.h"
 
@@ -55,10 +55,13 @@
 #include "vm/boc.h"
 #include "vm/cellops.h"
 #include "vm/cells/MerkleProof.h"
-#include "vm/continuation.h"
+#include "vm/vm.h"
 #include "vm/cp0.h"
+#include "vm/memo.h"
 #include "ton/ton-shard.h"
 #include "openssl/rand.hpp"
+#include "crypto/vm/utils.h"
+#include "crypto/common/util.h"
 
 #if TD_DARWIN || TD_LINUX
 #include <unistd.h>
@@ -140,6 +143,8 @@ void TestNode::got_result() {
     parse_line(std::move(data));
   }
   if (ex_mode_ && !running_queries_ && ex_queries_.size() == 0) {
+    std::cout.flush();
+    std::cerr.flush();
     std::_Exit(0);
   }
 }
@@ -177,6 +182,14 @@ bool TestNode::envelope_send_query(td::BufferSlice query, td::Promise<td::Buffer
   return true;
 }
 
+td::Promise<td::Unit> TestNode::trivial_promise() {
+  return td::PromiseCreator::lambda([Self = actor_id(this)](td::Result<td::Unit> res) {
+    if (res.is_error()) {
+      LOG(ERROR) << "error: " << res.move_as_error();
+    }
+  });
+}
+
 bool TestNode::register_blkid(const ton::BlockIdExt& blkid) {
   for (const auto& id : known_blk_ids_) {
     if (id == blkid) {
@@ -497,7 +510,7 @@ void TestNode::run_init_queries() {
   get_server_version(0x100);
 }
 
-std::string TestNode::get_word(char delim) {
+td::Slice TestNode::get_word(char delim) {
   if (delim == ' ' || !delim) {
     skipspc();
   }
@@ -506,10 +519,33 @@ std::string TestNode::get_word(char delim) {
     ptr++;
   }
   std::swap(ptr, parse_ptr_);
-  return std::string{ptr, parse_ptr_};
+  return td::Slice{ptr, parse_ptr_};
+}
+
+td::Slice TestNode::get_word_ext(const char* delims, const char* specials) {
+  if (delims[0] == ' ') {
+    skipspc();
+  }
+  const char* ptr = parse_ptr_;
+  while (ptr < parse_end_ && !strchr(delims, *ptr)) {
+    if (specials && strchr(specials, *ptr)) {
+      if (ptr == parse_ptr_) {
+        ptr++;
+      }
+      break;
+    }
+    ptr++;
+  }
+  std::swap(ptr, parse_ptr_);
+  return td::Slice{ptr, parse_ptr_};
 }
 
 bool TestNode::get_word_to(std::string& str, char delim) {
+  str = get_word(delim).str();
+  return !str.empty();
+}
+
+bool TestNode::get_word_to(td::Slice& str, char delim) {
   str = get_word(delim);
   return !str.empty();
 }
@@ -545,16 +581,21 @@ bool TestNode::seekeoln() {
   return eoln();
 }
 
-bool TestNode::parse_account_addr(ton::WorkchainId& wc, ton::StdSmcAddress& addr) {
-  return block::parse_std_account_addr(get_word(), wc, addr) || set_error("cannot parse account address");
+bool TestNode::parse_account_addr(ton::WorkchainId& wc, ton::StdSmcAddress& addr, bool allow_none) {
+  auto word = get_word();
+  if (allow_none && (word == "none" || word == "root")) {
+    wc = ton::workchainInvalid;
+    return true;
+  }
+  return block::parse_std_account_addr(word, wc, addr) || set_error("cannot parse account address");
 }
 
-bool TestNode::convert_uint64(std::string word, td::uint64& val) {
+bool TestNode::convert_uint64(td::Slice word, td::uint64& val) {
   val = ~0ULL;
   if (word.empty()) {
     return false;
   }
-  const char* ptr = word.c_str();
+  const char* ptr = word.data();
   char* end = nullptr;
   val = std::strtoull(ptr, &end, 10);
   if (end == ptr + word.size()) {
@@ -565,12 +606,12 @@ bool TestNode::convert_uint64(std::string word, td::uint64& val) {
   }
 }
 
-bool TestNode::convert_int64(std::string word, td::int64& val) {
+bool TestNode::convert_int64(td::Slice word, td::int64& val) {
   val = (~0ULL << 63);
   if (word.empty()) {
     return false;
   }
-  const char* ptr = word.c_str();
+  const char* ptr = word.data();
   char* end = nullptr;
   val = std::strtoll(ptr, &end, 10);
   if (end == ptr + word.size()) {
@@ -581,7 +622,7 @@ bool TestNode::convert_int64(std::string word, td::int64& val) {
   }
 }
 
-bool TestNode::convert_uint32(std::string word, td::uint32& val) {
+bool TestNode::convert_uint32(td::Slice word, td::uint32& val) {
   td::uint64 tmp;
   if (convert_uint64(word, tmp) && (td::uint32)tmp == tmp) {
     val = (td::uint32)tmp;
@@ -591,7 +632,7 @@ bool TestNode::convert_uint32(std::string word, td::uint32& val) {
   }
 }
 
-bool TestNode::convert_int32(std::string word, td::int32& val) {
+bool TestNode::convert_int32(td::Slice word, td::int32& val) {
   td::int64 tmp;
   if (convert_int64(word, tmp) && (td::int32)tmp == tmp) {
     val = (td::int32)tmp;
@@ -609,6 +650,14 @@ bool TestNode::parse_uint32(td::uint32& val) {
   return convert_uint32(get_word(), val) || set_error("cannot parse 32-bit unsigned integer");
 }
 
+bool TestNode::parse_int32(td::int32& val) {
+  return convert_int32(get_word(), val) || set_error("cannot parse 32-bit integer");
+}
+
+bool TestNode::parse_int16(int& val) {
+  return (convert_int32(get_word(), val) && val == (td::int16)val) || set_error("cannot parse 16-bit integer");
+}
+
 bool TestNode::set_error(td::Status error) {
   if (error.is_ok()) {
     return true;
@@ -631,6 +680,10 @@ int TestNode::parse_hex_digit(int c) {
   return -1;
 }
 
+bool TestNode::parse_hash(td::Slice str, ton::Bits256& hash) {
+  return str.size() == 64 && parse_hash(str.data(), hash);
+}
+
 bool TestNode::parse_hash(const char* str, ton::Bits256& hash) {
   unsigned char* data = hash.data();
   for (int i = 0; i < 32; i++) {
@@ -690,15 +743,15 @@ bool TestNode::parse_block_id_ext(std::string blkid_str, ton::BlockIdExt& blkid,
 }
 
 bool TestNode::parse_block_id_ext(ton::BlockIdExt& blk, bool allow_incomplete) {
-  return parse_block_id_ext(get_word(), blk, allow_incomplete) || set_error("cannot parse BlockIdExt");
+  return parse_block_id_ext(get_word().str(), blk, allow_incomplete) || set_error("cannot parse BlockIdExt");
 }
 
 bool TestNode::parse_hash(ton::Bits256& hash) {
   auto word = get_word();
-  return (!word.empty() && parse_hash(word.c_str(), hash)) || set_error("cannot parse hash");
+  return parse_hash(word, hash) || set_error("cannot parse hash");
 }
 
-bool TestNode::convert_shard_id(std::string str, ton::ShardIdFull& shard) {
+bool TestNode::convert_shard_id(td::Slice str, ton::ShardIdFull& shard) {
   shard.workchain = ton::workchainInvalid;
   shard.shard = 0;
   auto pos = str.find(':');
@@ -729,54 +782,6 @@ bool TestNode::parse_shard_id(ton::ShardIdFull& shard) {
   return convert_shard_id(get_word(), shard) || set_error("cannot parse full shard identifier or prefix");
 }
 
-bool TestNode::parse_stack_value(td::Slice str, vm::StackEntry& value) {
-  if (str.empty() || str.size() > 65535) {
-    return false;
-  }
-  int l = (int)str.size();
-  if (str[0] == '"') {
-    vm::CellBuilder cb;
-    if (l == 1 || str.back() != '"' || l >= 127 + 2 || !cb.store_bytes_bool(str.data() + 1, l - 2)) {
-      return false;
-    }
-    value = vm::StackEntry{vm::load_cell_slice_ref(cb.finalize())};
-    return true;
-  }
-  if (l >= 3 && (str[0] == 'x' || str[0] == 'b') && str[1] == '{' && str.back() == '}') {
-    unsigned char buff[128];
-    int bits =
-        (str[0] == 'x')
-            ? (int)td::bitstring::parse_bitstring_hex_literal(buff, sizeof(buff), str.begin() + 2, str.end() - 1)
-            : (int)td::bitstring::parse_bitstring_binary_literal(buff, sizeof(buff), str.begin() + 2, str.end() - 1);
-    if (bits < 0) {
-      return false;
-    }
-    value =
-        vm::StackEntry{Ref<vm::CellSlice>{true, vm::CellBuilder().store_bits(td::ConstBitPtr{buff}, bits).finalize()}};
-    return true;
-  }
-  auto num = td::RefInt256{true};
-  auto& x = num.unique_write();
-  if (l >= 3 && str[0] == '0' && str[1] == 'x') {
-    if (x.parse_hex(str.data() + 2, l - 2) != l - 2) {
-      return false;
-    }
-  } else if (l >= 4 && str[0] == '-' && str[1] == '0' && str[2] == 'x') {
-    if (x.parse_hex(str.data() + 3, l - 3) != l - 3) {
-      return false;
-    }
-    x.negate().normalize();
-  } else if (!l || x.parse_dec(str.data(), l) != l) {
-    return false;
-  }
-  value = vm::StackEntry{std::move(num)};
-  return true;
-}
-
-bool TestNode::parse_stack_value(vm::StackEntry& value) {
-  return parse_stack_value(td::Slice{get_word()}, value) || set_error("invalid vm stack value");
-}
-
 bool TestNode::set_error(std::string err_msg) {
   return set_error(td::Status::Error(-1, err_msg));
 }
@@ -820,8 +825,12 @@ bool TestNode::show_help(std::string command) {
          "saveaccount[code|data] <filename> <addr> [<block-id-ext>]\tSaves into specified file the most recent state "
          "(StateInit) or just the code or data of specified account; <addr> is in "
          "[<workchain>:]<hex-or-base64-addr> format\n"
-         "runmethod <addr> [<block-id-ext>] <method-id> <params>...\tRuns GET method <method-id> of account <addr> "
+         "runmethod[full] <addr> [<block-id-ext>] <method-id> <params>...\tRuns GET method <method-id> of account "
+         "<addr> "
          "with specified parameters\n"
+         "dnsresolve [<block-id-ext>] <domain> [<category>]\tResolves a domain starting from root dns smart contract\n"
+         "dnsresolvestep <addr> [<block-id-ext>] <domain> [<category>]\tResolves a subdomain using dns smart contract "
+         "<addr>\n"
          "allshards [<block-id-ext>]\tShows shard configuration from the most recent masterchain "
          "state or from masterchain state corresponding to <block-id-ext>\n"
          "getconfig [<param>...]\tShows specified or all configuration parameters from the latest masterchain state\n"
@@ -848,6 +857,11 @@ bool TestNode::show_help(std::string command) {
          "header\n"
          "byutime <workchain> <shard-prefix> <utime>\tLooks up a block by workchain, shard and creation time, and "
          "shows its header\n"
+         "creatorstats <block-id-ext> [<count> [<start-pubkey>]]\tLists block creator statistics by validator public "
+         "key\n"
+         "recentcreatorstats <block-id-ext> <start-utime> [<count> [<start-pubkey>]]\tLists block creator statistics "
+         "updated after <start-utime> by validator public "
+         "key\n"
          "known\tShows the list of all known block ids\n"
          "privkey <filename>\tLoads a private key from file\n"
          "help [<command>]\tThis help\n"
@@ -865,7 +879,7 @@ bool TestNode::do_parse_line() {
   ton::BlockSeqno seqno{};
   ton::UnixTime utime{};
   unsigned count{};
-  std::string word = get_word();
+  std::string word = get_word().str();
   skipspc();
   if (word == "time") {
     return eoln() && get_server_time();
@@ -886,21 +900,30 @@ bool TestNode::do_parse_line() {
            (seekeoln()
                 ? get_account_state(workchain, addr, mc_last_id_, filename, mode)
                 : parse_block_id_ext(blkid) && seekeoln() && get_account_state(workchain, addr, blkid, filename, mode));
-  } else if (word == "runmethod") {
+  } else if (word == "runmethod" || word == "runmethodx" || word == "runmethodfull") {
     std::string method;
     return parse_account_addr(workchain, addr) && get_word_to(method) &&
            (parse_block_id_ext(method, blkid) ? get_word_to(method) : (blkid = mc_last_id_).is_valid()) &&
-           parse_run_method(workchain, addr, blkid, method);
+           parse_run_method(workchain, addr, blkid, method, word.size() <= 10);
+  } else if (word == "dnsresolve" || word == "dnsresolvestep") {
+    workchain = ton::workchainInvalid;
+    bool step = (word.size() > 10);
+    std::string domain;
+    int cat = 0;
+    return (!step || parse_account_addr(workchain, addr)) && get_word_to(domain) &&
+           (parse_block_id_ext(domain, blkid) ? get_word_to(domain) : (blkid = mc_last_id_).is_valid()) &&
+           (seekeoln() || parse_int16(cat)) && seekeoln() &&
+           dns_resolve_start(workchain, addr, blkid, domain, cat, step);
   } else if (word == "allshards") {
     return eoln() ? get_all_shards() : (parse_block_id_ext(blkid) && seekeoln() && get_all_shards(false, blkid));
   } else if (word == "saveconfig") {
     blkid = mc_last_id_;
     std::string filename;
     return get_word_to(filename) && (seekeoln() || parse_block_id_ext(blkid)) && seekeoln() &&
-           get_config_params(blkid, -1, filename);
+           get_config_params(blkid, trivial_promise(), -1, filename);
   } else if (word == "getconfig" || word == "getconfigfrom") {
     blkid = mc_last_id_;
-    return (word == "getconfig" || parse_block_id_ext(blkid)) && get_config_params(blkid, 0);
+    return (word == "getconfig" || parse_block_id_ext(blkid)) && get_config_params(blkid, trivial_promise(), 0);
   } else if (word == "getblock") {
     return parse_block_id_ext(blkid) && seekeoln() && get_block(blkid, false);
   } else if (word == "dumpblock") {
@@ -935,6 +958,12 @@ bool TestNode::do_parse_line() {
     return parse_shard_id(shard) && parse_uint32(utime) && seekeoln() && lookup_block(shard, 4, utime);
   } else if (word == "bylt") {
     return parse_shard_id(shard) && parse_lt(lt) && seekeoln() && lookup_block(shard, 2, lt);
+  } else if (word == "creatorstats" || word == "recentcreatorstats") {
+    count = 1000;
+    int mode = (word == "recentcreatorstats" ? 4 : 0);
+    return parse_block_id_ext(blkid) && (!mode || parse_uint32(utime)) && (seekeoln() || parse_uint32(count)) &&
+           (seekeoln() || (parse_hash(hash) && (mode |= 1))) && seekeoln() &&
+           get_creator_stats(blkid, mode, count, hash, utime);
   } else if (word == "known") {
     return eoln() && show_new_blkids(true);
   } else if (word == "quit" && eoln()) {
@@ -1024,16 +1053,32 @@ bool TestNode::get_account_state(ton::WorkchainId workchain, ton::StdSmcAddress
   });
 }
 
-bool TestNode::parse_run_method(ton::WorkchainId workchain, ton::StdSmcAddress addr, ton::BlockIdExt ref_blkid,
-                                std::string method_name) {
-  std::vector<vm::StackEntry> params;
-  while (!seekeoln()) {
-    vm::StackEntry param;
-    if (!parse_stack_value(param)) {
-      return false;
-    }
-    params.push_back(std::move(param));
+td::int64 TestNode::compute_method_id(std::string method) {
+  td::int64 method_id;
+  if (!convert_int64(method, method_id)) {
+    method_id = (td::crc16(td::Slice{method}) & 0xffff) | 0x10000;
   }
+  return method_id;
+}
+
+bool TestNode::parse_run_method(ton::WorkchainId workchain, ton::StdSmcAddress addr, ton::BlockIdExt ref_blkid,
+                                std::string method_name, bool ext_mode) {
+  auto R = vm::parse_stack_entries(td::Slice(parse_ptr_, parse_end_));
+  if (R.is_error()) {
+    return set_error(R.move_as_error().to_string());
+  }
+  parse_ptr_ = parse_end_;
+  auto P = td::PromiseCreator::lambda([](td::Result<std::vector<vm::StackEntry>> R) {
+    if (R.is_error()) {
+      LOG(ERROR) << R.move_as_error();
+    }
+  });
+  return start_run_method(workchain, addr, ref_blkid, method_name, R.move_as_ok(), ext_mode ? 0x1f : 0, std::move(P));
+}
+
+bool TestNode::start_run_method(ton::WorkchainId workchain, ton::StdSmcAddress addr, ton::BlockIdExt ref_blkid,
+                                std::string method_name, std::vector<vm::StackEntry> params, int mode,
+                                td::Promise<std::vector<vm::StackEntry>> promise) {
   if (!ref_blkid.is_valid()) {
     return set_error("must obtain last block information before making other queries");
   }
@@ -1041,28 +1086,308 @@ bool TestNode::parse_run_method(ton::WorkchainId workchain, ton::StdSmcAddress a
     return set_error("server connection not ready");
   }
   auto a = ton::create_tl_object<ton::lite_api::liteServer_accountId>(workchain, addr);
-  auto b = ton::serialize_tl_object(ton::create_tl_object<ton::lite_api::liteServer_getAccountState>(
-                                        ton::create_tl_lite_block_id(ref_blkid), std::move(a)),
-                                    true);
-  LOG(INFO) << "requesting account state for " << workchain << ":" << addr.to_hex() << " with respect to "
-            << ref_blkid.to_str() << " to run method " << method_name << " with " << params.size() << " parameters";
-  return envelope_send_query(
-      std::move(b), [ Self = actor_id(this), workchain, addr, ref_blkid, method_name,
-                      params = std::move(params) ](td::Result<td::BufferSlice> R) mutable {
+  if (!mode) {
+    auto b = ton::serialize_tl_object(ton::create_tl_object<ton::lite_api::liteServer_getAccountState>(
+                                          ton::create_tl_lite_block_id(ref_blkid), std::move(a)),
+                                      true);
+    LOG(INFO) << "requesting account state for " << workchain << ":" << addr.to_hex() << " with respect to "
+              << ref_blkid.to_str() << " to run method " << method_name << " with " << params.size() << " parameters";
+    return envelope_send_query(std::move(b), [
+      Self = actor_id(this), workchain, addr, ref_blkid, method_name, params = std::move(params),
+      promise = std::move(promise)
+    ](td::Result<td::BufferSlice> R) mutable {
+      if (R.is_error()) {
+        promise.set_error(R.move_as_error());
+        return;
+      }
+      auto F = ton::fetch_tl_object<ton::lite_api::liteServer_accountState>(R.move_as_ok(), true);
+      if (F.is_error()) {
+        LOG(ERROR) << "cannot parse answer to liteServer.getAccountState";
+        promise.set_error(td::Status::Error("cannot parse answer to liteServer.getAccountState"));
+      } else {
+        auto f = F.move_as_ok();
+        td::actor::send_closure_later(Self, &TestNode::run_smc_method, 0, ref_blkid, ton::create_block_id(f->id_),
+                                      ton::create_block_id(f->shardblk_), std::move(f->shard_proof_),
+                                      std::move(f->proof_), std::move(f->state_), workchain, addr, method_name,
+                                      std::move(params), td::BufferSlice(), td::BufferSlice(), td::BufferSlice(),
+                                      -0x10000, std::move(promise));
+      }
+    });
+  } else {
+    td::int64 method_id = compute_method_id(method_name);
+    // set serialization limits
+    vm::FakeVmStateLimits fstate(1000);  // limit recursive (de)serialization calls
+    vm::VmStateInterface::Guard guard(&fstate);
+    // serialize parameters
+    vm::CellBuilder cb;
+    Ref<vm::Cell> cell;
+    if (!(vm::Stack{params}.serialize(cb) && cb.finalize_to(cell))) {
+      return set_error("cannot serialize stack with get-method parameters");
+    }
+    auto stk = vm::std_boc_serialize(std::move(cell));
+    if (stk.is_error()) {
+      return set_error("cannot serialize stack with get-method parameters : "s + stk.move_as_error().to_string());
+    }
+    auto b = ton::serialize_tl_object(
+        ton::create_tl_object<ton::lite_api::liteServer_runSmcMethod>(mode, ton::create_tl_lite_block_id(ref_blkid),
+                                                                      std::move(a), method_id, stk.move_as_ok()),
+        true);
+    LOG(INFO) << "requesting remote get-method execution for " << workchain << ":" << addr.to_hex()
+              << " with respect to " << ref_blkid.to_str() << " to run method " << method_name << " with "
+              << params.size() << " parameters";
+    return envelope_send_query(std::move(b), [
+      Self = actor_id(this), workchain, addr, ref_blkid, method_name, mode, params = std::move(params),
+      promise = std::move(promise)
+    ](td::Result<td::BufferSlice> R) mutable {
+      if (R.is_error()) {
+        promise.set_error(R.move_as_error());
+        return;
+      }
+      auto F = ton::fetch_tl_object<ton::lite_api::liteServer_runMethodResult>(R.move_as_ok(), true);
+      if (F.is_error()) {
+        LOG(ERROR) << "cannot parse answer to liteServer.runSmcMethod";
+        promise.set_error(td::Status::Error("cannot parse answer to liteServer.runSmcMethod"));
+      } else {
+        auto f = F.move_as_ok();
+        td::actor::send_closure_later(Self, &TestNode::run_smc_method, mode, ref_blkid, ton::create_block_id(f->id_),
+                                      ton::create_block_id(f->shardblk_), std::move(f->shard_proof_),
+                                      std::move(f->proof_), std::move(f->state_proof_), workchain, addr, method_name,
+                                      std::move(params), std::move(f->init_c7_), std::move(f->lib_extras_),
+                                      std::move(f->result_), f->exit_code_, std::move(promise));
+      }
+    });
+  }
+}
+
+bool TestNode::dns_resolve_start(ton::WorkchainId workchain, ton::StdSmcAddress addr, ton::BlockIdExt blkid,
+                                 std::string domain, int cat, int mode) {
+  if (domain.size() > 1023) {
+    return set_error("domain name too long");
+  }
+  if (domain.size() >= 2 && domain[0] == '"' && domain.back() == '"') {
+    domain.erase(0, 1);
+    domain.pop_back();
+  }
+  std::vector<std::string> components;
+  std::size_t i, p = 0;
+  for (i = 0; i < domain.size(); i++) {
+    if (!domain[i] || (unsigned char)domain[i] >= 0xfe || (unsigned char)domain[i] <= ' ') {
+      return set_error("invalid characters in a domain name");
+    }
+    if (domain[i] == '.') {
+      if (i == p) {
+        return set_error("domain name cannot have an empty component");
+      }
+      components.emplace_back(domain, p, i - p);
+      p = i + 1;
+    }
+  }
+  if (i > p) {
+    components.emplace_back(domain, p, i - p);
+  }
+  std::string qdomain, qdomain0;
+  while (!components.empty()) {
+    qdomain += components.back();
+    qdomain += '\0';
+    components.pop_back();
+  }
+
+  if (!(ready_ && !client_.empty())) {
+    return set_error("server connection not ready");
+  }
+
+  if (workchain == ton::workchainInvalid) {
+    if (dns_root_queried_) {
+      workchain = ton::masterchainId;
+      addr = dns_root_;
+    } else {
+      auto P = td::PromiseCreator::lambda([this, blkid, domain, cat, mode](td::Result<td::Unit> R) {
         if (R.is_error()) {
-          return;
-        }
-        auto F = ton::fetch_tl_object<ton::lite_api::liteServer_accountState>(R.move_as_ok(), true);
-        if (F.is_error()) {
-          LOG(ERROR) << "cannot parse answer to liteServer.getAccountState";
+          LOG(ERROR) << "cannot obtain root dns address from configuration: " << R.move_as_error();
+        } else if (dns_root_queried_) {
+          dns_resolve_start(ton::masterchainId, dns_root_, blkid, domain, cat, mode);
         } else {
-          auto f = F.move_as_ok();
-          td::actor::send_closure_later(Self, &TestNode::run_smc_method, ref_blkid, ton::create_block_id(f->id_),
-                                        ton::create_block_id(f->shardblk_), std::move(f->shard_proof_),
-                                        std::move(f->proof_), std::move(f->state_), workchain, addr, method_name,
-                                        std::move(params));
+          LOG(ERROR) << "cannot obtain root dns address from configuration parameter #4";
         }
       });
+      return get_config_params(mc_last_id_, std::move(P), 0x5000, "", {4});
+    }
+  }
+  return dns_resolve_send(workchain, addr, blkid, domain, qdomain, cat, mode);
+}
+
+bool TestNode::dns_resolve_send(ton::WorkchainId workchain, ton::StdSmcAddress addr, ton::BlockIdExt blkid,
+                                std::string domain, std::string qdomain, int cat, int mode) {
+  LOG(INFO) << "dns_resolve for '" << domain << "' category=" << cat << " mode=" << mode
+            << " starting from smart contract " << workchain << ":" << addr.to_hex() << " with respect to block "
+            << blkid.to_str();
+  std::string qdomain0;
+  if (qdomain.size() <= 127) {
+    qdomain0 = qdomain;
+  } else {
+    qdomain0 = std::string{qdomain, 0, 127};
+    qdomain[125] = '\xff';
+    qdomain[126] = '\x0';
+  }
+  vm::CellBuilder cb;
+  Ref<vm::Cell> cell;
+  if (!(cb.store_bytes_bool(td::Slice(qdomain0)) && cb.finalize_to(cell))) {
+    return set_error("cannot store domain name into slice");
+  }
+  std::vector<vm::StackEntry> params;
+  params.emplace_back(vm::load_cell_slice_ref(std::move(cell)));
+  params.emplace_back(td::make_refint(cat));
+  auto P = td::PromiseCreator::lambda([this, workchain, addr, blkid, domain, qdomain, cat,
+                                       mode](td::Result<std::vector<vm::StackEntry>> R) {
+    if (R.is_error()) {
+      LOG(ERROR) << R.move_as_error();
+      return;
+    }
+    auto S = R.move_as_ok();
+    if (S.size() < 2 || !S[S.size() - 2].is_int() || !(S.back().is_cell() || S.back().is_null())) {
+      LOG(ERROR) << "dnsresolve did not return a value of type (int,cell)";
+      return;
+    }
+    auto cell = S.back().as_cell();
+    S.pop_back();
+    auto x = S.back().as_int();
+    S.clear();
+    if (!x->signed_fits_bits(32)) {
+      LOG(ERROR) << "invalid integer result of dnsresolve (" << x << ")";
+      return;
+    }
+    return dns_resolve_finish(workchain, addr, blkid, domain, qdomain, cat, mode, (int)x->to_long(), std::move(cell));
+  });
+  return start_run_method(workchain, addr, blkid, "dnsresolve", std::move(params), 0x1f, std::move(P));
+}
+
+bool TestNode::show_dns_record(std::ostream& os, int cat, Ref<vm::Cell> value, bool raw_dump) {
+  if (raw_dump) {
+    bool ok = show_dns_record(os, cat, value, false);
+    if (!ok) {
+      os << "cannot parse dns record; raw value: ";
+      vm::load_cell_slice(value).print_rec(print_limit_, os);
+    }
+    return ok;
+  }
+  if (value.is_null()) {
+    os << "(null)";
+    return true;
+  }
+  // block::gen::t_DNSRecord.print_ref(print_limit_, os, value);
+  if (!block::gen::t_DNSRecord.validate_ref(value)) {
+    return false;
+  }
+  block::gen::t_DNSRecord.print_ref(print_limit_, os, value);
+  auto cs = vm::load_cell_slice(value);
+  auto tag = block::gen::t_DNSRecord.get_tag(cs);
+  ton::WorkchainId wc;
+  ton::StdSmcAddress addr;
+  switch (tag) {
+    case block::gen::DNSRecord::dns_adnl_address: {
+      block::gen::DNSRecord::Record_dns_adnl_address rec;
+      if (tlb::unpack_exact(cs, rec)) {
+        os << "\n\tadnl address " << rec.adnl_addr.to_hex() << " = " << td::adnl_id_encode(rec.adnl_addr, true);
+      }
+      break;
+    }
+    case block::gen::DNSRecord::dns_smc_address: {
+      block::gen::DNSRecord::Record_dns_smc_address rec;
+      if (tlb::unpack_exact(cs, rec) && block::tlb::t_MsgAddressInt.extract_std_address(rec.smc_addr, wc, addr)) {
+        os << "\tsmart contract " << wc << ":" << addr.to_hex() << " = " << block::StdAddress{wc, addr}.rserialize(true);
+      }
+      break;
+    }
+    case block::gen::DNSRecord::dns_next_resolver: {
+      block::gen::DNSRecord::Record_dns_next_resolver rec;
+      if (tlb::unpack_exact(cs, rec) && block::tlb::t_MsgAddressInt.extract_std_address(rec.resolver, wc, addr)) {
+        os << "\tnext resolver " << wc << ":" << addr.to_hex() << " = " << block::StdAddress{wc, addr}.rserialize(true);
+      }
+      break;
+    }
+  }
+  return true;
+}
+
+void TestNode::dns_resolve_finish(ton::WorkchainId workchain, ton::StdSmcAddress addr, ton::BlockIdExt blkid,
+                                  std::string domain, std::string qdomain, int cat, int mode, int used_bits,
+                                  Ref<vm::Cell> value) {
+  if (used_bits <= 0) {
+    td::TerminalIO::out() << "domain '" << domain << "' not found" << std::endl;
+    return;
+  }
+  if ((used_bits & 7) || (unsigned)used_bits > 8 * std::min<std::size_t>(qdomain.size(), 126)) {
+    LOG(ERROR) << "too many bits used (" << used_bits << " out of " << qdomain.size() * 8 << ")";
+    return;
+  }
+  int pos = (used_bits >> 3);
+  if (qdomain[pos - 1]) {
+    LOG(ERROR) << "domain split not at a component boundary";
+    return;
+  }
+  bool end = ((std::size_t)pos == qdomain.size());
+  if (!end) {
+    LOG(INFO) << "partial information obtained";
+    if (value.is_null()) {
+      td::TerminalIO::out() << "domain '" << domain << "' not found: no next resolver" << std::endl;
+      return;
+    }
+    Ref<vm::CellSlice> nx_address;
+    ton::WorkchainId nx_wc;
+    ton::StdSmcAddress nx_addr;
+    if (!(block::gen::t_DNSRecord.cell_unpack_dns_next_resolver(value, nx_address) &&
+          block::tlb::t_MsgAddressInt.extract_std_address(std::move(nx_address), nx_wc, nx_addr))) {
+      LOG(ERROR) << "cannot parse next resolver info for " << domain.substr(qdomain.size() - pos);
+      std::ostringstream out;
+      vm::load_cell_slice(value).print_rec(print_limit_, out);
+      td::TerminalIO::err() << out.str() << std::endl;
+      return;
+    }
+    LOG(INFO) << "next resolver is " << nx_wc << ":" << nx_addr.to_hex();
+    if ((mode & 1)) {
+      return;  // no recursive resolving
+    }
+    if (!(dns_resolve_send(nx_wc, nx_addr, blkid, domain, qdomain.substr(pos), cat, mode))) {
+      LOG(ERROR) << "cannot send next dns query";
+      return;
+    }
+    LOG(INFO) << "recursive dns query to '" << domain.substr(qdomain.size() - pos) << "' sent";
+    return;
+  }
+  auto out = td::TerminalIO::out();
+  out << "Result for domain '" << domain << "' category " << cat << (cat ? "" : " (all categories)") << std::endl;
+  try {
+    if (value.not_null()) {
+      std::ostringstream os0;
+      vm::load_cell_slice(value).print_rec(print_limit_, os0);
+      out << "raw data: " << os0.str() << std::endl;
+    }
+    if (!cat) {
+      vm::Dictionary dict{value, 16};
+      if (!dict.check_for_each([this, &out](Ref<vm::CellSlice> cs, td::ConstBitPtr key, int n) {
+            CHECK(n == 16);
+            int x = (int)key.get_int(16);
+            if (cs.is_null() || cs->size_ext() != 0x10000) {
+              out << "category #" << x << " : value is not a reference" << std::endl;
+              return false;
+            }
+            std::ostringstream os;
+            (void)show_dns_record(os, x, cs->prefetch_ref(), true);
+            out << "category #" << x << " : " << os.str() << std::endl;
+            return true;
+          })) {
+        out << "invalid dns record dictionary" << std::endl;
+      }
+    } else {
+      std::ostringstream os;
+      (void)show_dns_record(os, cat, value, true);
+      out << "category #" << cat << " : " << os.str() << std::endl;
+    }
+  } catch (vm::VmError& err) {
+    LOG(ERROR) << "vm error while traversing dns resolve result: " << err.get_msg();
+  } catch (vm::VmVirtError& err) {
+    LOG(ERROR) << "vm virtualization error while traversing dns resolve result: " << err.get_msg();
+  }
 }
 
 bool TestNode::get_one_transaction(ton::BlockIdExt blkid, ton::WorkchainId workchain, ton::StdSmcAddress addr,
@@ -1150,8 +1475,8 @@ void TestNode::got_account_state(ton::BlockIdExt ref_blk, ton::BlockIdExt blk, t
     if (info.root.not_null()) {
       out << "account state is ";
       std::ostringstream outp;
-      block::gen::t_Account.print_ref(outp, info.root);
-      vm::load_cell_slice(info.root).print_rec(outp);
+      block::gen::t_Account.print_ref(print_limit_, outp, info.root);
+      vm::load_cell_slice(info.root).print_rec(print_limit_, outp);
       out << outp.str();
       out << "last transaction lt = " << info.last_trans_lt << " hash = " << info.last_trans_hash.to_hex() << std::endl;
       block::gen::Account::Record_account acc;
@@ -1223,87 +1548,152 @@ void TestNode::got_account_state(ton::BlockIdExt ref_blk, ton::BlockIdExt blk, t
   }
 }
 
-void TestNode::run_smc_method(ton::BlockIdExt ref_blk, ton::BlockIdExt blk, ton::BlockIdExt shard_blk,
+void TestNode::run_smc_method(int mode, ton::BlockIdExt ref_blk, ton::BlockIdExt blk, ton::BlockIdExt shard_blk,
                               td::BufferSlice shard_proof, td::BufferSlice proof, td::BufferSlice state,
                               ton::WorkchainId workchain, ton::StdSmcAddress addr, std::string method,
-                              std::vector<vm::StackEntry> params) {
-  LOG(INFO) << "got account state for " << workchain << ":" << addr.to_hex() << " with respect to blocks "
-            << blk.to_str() << (shard_blk == blk ? "" : std::string{" and "} + shard_blk.to_str());
-  block::AccountState account_state;
-  account_state.blk = blk;
-  account_state.shard_blk = shard_blk;
-  account_state.shard_proof = std::move(shard_proof);
-  account_state.proof = std::move(proof);
-  account_state.state = std::move(state);
-  auto r_info = account_state.validate(ref_blk, block::StdAddress(workchain, addr));
-  if (r_info.is_error()) {
-    LOG(ERROR) << r_info.error().message();
-    return;
-  }
+                              std::vector<vm::StackEntry> params, td::BufferSlice remote_c7,
+                              td::BufferSlice remote_libs, td::BufferSlice remote_result, int remote_exit_code,
+                              td::Promise<std::vector<vm::StackEntry>> promise) {
+  LOG(INFO) << "got (partial) account state with mode=" << mode << " for " << workchain << ":" << addr.to_hex()
+            << " with respect to blocks " << blk.to_str()
+            << (shard_blk == blk ? "" : std::string{" and "} + shard_blk.to_str());
   auto out = td::TerminalIO::out();
-  auto info = r_info.move_as_ok();
-  if (info.root.is_null()) {
-    LOG(ERROR) << "account state of " << workchain << ":" << addr.to_hex() << " is empty (cannot run method `" << method
-               << "`)";
-    return;
-  }
-  block::gen::Account::Record_account acc;
-  block::gen::AccountStorage::Record store;
-  block::CurrencyCollection balance;
-  if (!(tlb::unpack_cell(info.root, acc) && tlb::csr_unpack(acc.storage, store) &&
-        balance.validate_unpack(store.balance))) {
-    LOG(ERROR) << "error unpacking account state";
-    return;
-  }
-  int tag = block::gen::t_AccountState.get_tag(*store.state);
-  switch (tag) {
-    case block::gen::AccountState::account_uninit:
-      LOG(ERROR) << "account " << workchain << ":" << addr.to_hex() << " not initialized yet (cannot run any methods)";
+  try {
+    block::AccountState account_state;
+    account_state.blk = blk;
+    account_state.shard_blk = shard_blk;
+    account_state.shard_proof = std::move(shard_proof);
+    account_state.proof = std::move(proof);
+    LOG(DEBUG) << "serialized state is " << state.size() << " bytes";
+    LOG(DEBUG) << "serialized remote c7 is " << remote_c7.size() << " bytes";
+    account_state.state = std::move(state);
+    account_state.is_virtualized = (mode > 0);
+    auto r_info = account_state.validate(ref_blk, block::StdAddress(workchain, addr));
+    if (r_info.is_error()) {
+      LOG(ERROR) << r_info.error().message();
+      promise.set_error(r_info.move_as_error());
       return;
-    case block::gen::AccountState::account_frozen:
-      LOG(ERROR) << "account " << workchain << ":" << addr.to_hex() << " frozen (cannot run any methods)";
+    }
+    auto out = td::TerminalIO::out();
+    auto info = r_info.move_as_ok();
+    if (info.root.is_null()) {
+      LOG(ERROR) << "account state of " << workchain << ":" << addr.to_hex() << " is empty (cannot run method `"
+                 << method << "`)";
+      promise.set_error(td::Status::Error(PSLICE() << "account state of " << workchain << ":" << addr.to_hex()
+                                                   << " is empty (cannot run method `" << method << "`)"));
       return;
-  }
-  CHECK(store.state.write().fetch_ulong(1) == 1);  // account_init$1 _:StateInit = AccountState;
-  block::gen::StateInit::Record state_init;
-  CHECK(tlb::csr_unpack(store.state, state_init));
-  auto code = state_init.code->prefetch_ref();
-  auto data = state_init.data->prefetch_ref();
-  auto stack = td::make_ref<vm::Stack>(std::move(params));
-  td::int64 method_id;
-  if (!convert_int64(method, method_id)) {
-    method_id = (td::crc16(td::Slice{method}) & 0xffff) | 0x10000;
-  }
-  stack.write().push_smallint(method_id);
-  {
-    std::ostringstream os;
-    os << "arguments: ";
-    stack->dump(os);
-    out << os.str();
-  }
-  long long gas_limit = vm::GasLimits::infty;
-  // OstreamLogger ostream_logger(ctx.error_stream);
-  // auto log = create_vm_log(ctx.error_stream ? &ostream_logger : nullptr);
-  vm::GasLimits gas{gas_limit};
-  LOG(DEBUG) << "creating VM";
-  vm::VmState vm{code, std::move(stack), gas, 1, data, vm::VmLog()};
-  vm.set_c7(liteclient::prepare_vm_c7(info.gen_utime, info.gen_lt, acc.addr, balance));  // tuple with SmartContractInfo
-  // vm.incr_stack_trace(1);    // enable stack dump after each step
-  LOG(INFO) << "starting VM to run method `" << method << "` (" << method_id << ") of smart contract " << workchain
-            << ":" << addr.to_hex();
-  int exit_code = ~vm.run();
-  LOG(DEBUG) << "VM terminated with exit code " << exit_code;
-  if (exit_code != 0) {
-    LOG(ERROR) << "VM terminated with error code " << exit_code;
-    out << "result: error " << exit_code << std::endl;
-    return;
-  }
-  stack = vm.get_stack_ref();
-  {
-    std::ostringstream os;
-    os << "result: ";
-    stack->dump(os);
-    out << os.str();
+    }
+    if (false) {
+      // DEBUG (dump state)
+      std::ostringstream os;
+      vm::CellSlice{vm::NoVm(), info.true_root}.print_rec(print_limit_, os);
+      out << "dump of account state (proof): " << os.str() << std::endl;
+    }
+    // set deserialization limits
+    vm::FakeVmStateLimits fstate(1000);  // limit recursive (de)serialization calls
+    vm::VmStateInterface::Guard guard(&fstate);
+    if (false && remote_c7.size()) {
+      // DEBUG (dump remote_c7)
+      auto r_c7 = vm::std_boc_deserialize(remote_c7).move_as_ok();
+      std::ostringstream os;
+      vm::StackEntry val;
+      bool ok = val.deserialize(r_c7);
+      val.dump(os);
+      // os << std::endl;
+      // block::gen::t_VmStackValue.print_ref(print_limit_, os, r_c7);
+      // os << std::endl;
+      // vm::CellSlice{vm::NoVmOrd(), r_c7}.print_rec(print_limit_, os);
+      out << "remote_c7 (deserialized=" << ok << "): " << os.str() << std::endl;
+    }
+    block::gen::Account::Record_account acc;
+    block::gen::AccountStorage::Record store;
+    block::CurrencyCollection balance;
+    if (!(tlb::unpack_cell(info.root, acc) && tlb::csr_unpack(acc.storage, store) &&
+          balance.validate_unpack(store.balance))) {
+      LOG(ERROR) << "error unpacking account state";
+      promise.set_error(td::Status::Error("error unpacking account state"));
+      return;
+    }
+    int tag = block::gen::t_AccountState.get_tag(*store.state);
+    switch (tag) {
+      case block::gen::AccountState::account_uninit:
+        LOG(ERROR) << "account " << workchain << ":" << addr.to_hex()
+                   << " not initialized yet (cannot run any methods)";
+        return;
+      case block::gen::AccountState::account_frozen:
+        LOG(ERROR) << "account " << workchain << ":" << addr.to_hex() << " frozen (cannot run any methods)";
+        return;
+    }
+    CHECK(store.state.write().fetch_ulong(1) == 1);  // account_init$1 _:StateInit = AccountState;
+    block::gen::StateInit::Record state_init;
+    CHECK(tlb::csr_unpack(store.state, state_init));
+    auto code = state_init.code->prefetch_ref();
+    auto data = state_init.data->prefetch_ref();
+    auto stack = td::make_ref<vm::Stack>(std::move(params));
+    td::int64 method_id = compute_method_id(method);
+    stack.write().push_smallint(method_id);
+    {
+      std::ostringstream os;
+      os << "arguments: ";
+      stack->dump(os, 3);
+      out << os.str();
+    }
+    long long gas_limit = vm::GasLimits::infty;
+    // OstreamLogger ostream_logger(ctx.error_stream);
+    // auto log = create_vm_log(ctx.error_stream ? &ostream_logger : nullptr);
+    vm::GasLimits gas{gas_limit};
+    LOG(DEBUG) << "creating VM";
+    vm::VmState vm{code, std::move(stack), gas, 1, data, vm::VmLog()};
+    vm.set_c7(liteclient::prepare_vm_c7(info.gen_utime, info.gen_lt, td::make_ref<vm::CellSlice>(acc.addr->clone()),
+                                        balance));  // tuple with SmartContractInfo
+    // vm.incr_stack_trace(1);    // enable stack dump after each step
+    LOG(INFO) << "starting VM to run method `" << method << "` (" << method_id << ") of smart contract " << workchain
+              << ":" << addr.to_hex();
+    int exit_code = ~vm.run();
+    LOG(DEBUG) << "VM terminated with exit code " << exit_code;
+    if (mode > 0) {
+      LOG(DEBUG) << "remote VM exit code is " << remote_exit_code;
+    }
+    if (exit_code != 0) {
+      LOG(ERROR) << "VM terminated with error code " << exit_code;
+      out << "result: error " << exit_code << std::endl;
+      promise.set_error(td::Status::Error(PSLICE() << "VM terminated with non-zero exit code " << exit_code));
+      return;
+    }
+    stack = vm.get_stack_ref();
+    {
+      std::ostringstream os;
+      os << "result: ";
+      stack->dump(os, 3);
+      out << os.str();
+    }
+    if (mode & 4) {
+      if (remote_result.empty()) {
+        out << "remote result: <none>, exit code " << remote_exit_code;
+      } else {
+        auto res = vm::std_boc_deserialize(std::move(remote_result));
+        if (res.is_error()) {
+          LOG(ERROR) << "cannot deserialize remote VM result boc: " << res.move_as_error();
+          return;
+        }
+        auto cs = vm::load_cell_slice(res.move_as_ok());
+        Ref<vm::Stack> remote_stack;
+        if (!(vm::Stack::deserialize_to(cs, remote_stack, 0) && cs.empty_ext())) {
+          LOG(ERROR) << "remote VM result boc cannot be deserialized as a VmStack";
+          return;
+        }
+        std::ostringstream os;
+        os << "remote result (not to be trusted): ";
+        remote_stack->dump(os, 3);
+        out << os.str();
+      }
+    }
+    out.flush();
+    promise.set_result(stack->extract_contents());
+  } catch (vm::VmVirtError& err) {
+    out << "virtualization error while parsing runSmcMethod result: " << err.get_msg();
+  } catch (vm::VmError& err) {
+    out << "error while parsing runSmcMethod result: " << err.get_msg();
   }
 }
 
@@ -1386,8 +1776,8 @@ void TestNode::got_one_transaction(ton::BlockIdExt req_blkid, ton::BlockIdExt bl
   } else {
     out << "transaction is ";
     std::ostringstream outp;
-    block::gen::t_Transaction.print_ref(outp, root);
-    vm::load_cell_slice(root).print_rec(outp);
+    block::gen::t_Transaction.print_ref(print_limit_, outp, root, 0);
+    vm::load_cell_slice(root).print_rec(print_limit_, outp);
     out << outp.str();
   }
 }
@@ -1512,8 +1902,8 @@ void TestNode::got_last_transactions(std::vector<ton::BlockIdExt> blkids, td::Bu
     out << "transaction #" << c << " from block " << blkid.to_str() << (dump ? " is " : "\n");
     if (dump) {
       std::ostringstream outp;
-      block::gen::t_Transaction.print_ref(outp, info.transaction);
-      vm::load_cell_slice(info.transaction).print_rec(outp);
+      block::gen::t_Transaction.print_ref(print_limit_, outp, info.transaction);
+      vm::load_cell_slice(info.transaction).print_rec(print_limit_, outp);
       out << outp.str();
     }
     block::gen::Transaction::Record trans;
@@ -1641,8 +2031,8 @@ void TestNode::got_all_shards(ton::BlockIdExt blk, td::BufferSlice proof, td::Bu
     auto out = td::TerminalIO::out();
     out << "shard configuration is ";
     std::ostringstream outp;
-    block::gen::t_ShardHashes.print_ref(outp, root);
-    vm::load_cell_slice(root).print_rec(outp);
+    block::gen::t_ShardHashes.print_ref(print_limit_, outp, root);
+    vm::load_cell_slice(root).print_rec(print_limit_, outp);
     out << outp.str();
     block::ShardConfig sh_conf;
     if (!sh_conf.unpack(vm::load_cell_slice_ref(root))) {
@@ -1665,26 +2055,35 @@ void TestNode::got_all_shards(ton::BlockIdExt blk, td::BufferSlice proof, td::Bu
   show_new_blkids();
 }
 
-bool TestNode::get_config_params(ton::BlockIdExt blkid, int mode, std::string filename) {
-  std::vector<int> params;
-  if (mode >= 0 && !seekeoln()) {
+bool TestNode::get_config_params(ton::BlockIdExt blkid, td::Promise<td::Unit> do_after, int mode, std::string filename,
+                                 std::vector<int> params) {
+  if (mode < 0) {
+    mode = 0x8000;
+  }
+  if (!(mode & 0x9000) && !seekeoln()) {
     mode |= 0x1000;
     while (!seekeoln()) {
       int x;
       if (!convert_int32(get_word(), x)) {
+        do_after.set_error(td::Status::Error("integer configuration parameter id expected"));
         return set_error("integer configuration parameter id expected");
       }
       params.push_back(x);
     }
   }
   if (!(ready_ && !client_.empty())) {
+    do_after.set_error(td::Status::Error("integer configuration parameter id expected"));
     return set_error("server connection not ready");
   }
   if (!blkid.is_masterchain_ext()) {
+    do_after.set_error(td::Status::Error("integer configuration parameter id expected"));
     return set_error("only masterchain blocks contain configuration");
   }
+  if (blkid == mc_last_id_) {
+    mode |= 0x2000;
+  }
   auto params_copy = params;
-  auto b = (mode & 0x3000) == 0x1000
+  auto b = (mode & 0x1000)
                ? ton::serialize_tl_object(ton::create_tl_object<ton::lite_api::liteServer_getConfigParams>(
                                               0, ton::create_tl_lite_block_id(blkid), std::move(params_copy)),
                                           true)
@@ -1693,9 +2092,11 @@ bool TestNode::get_config_params(ton::BlockIdExt blkid, int mode, std::string fi
                                           true);
   LOG(INFO) << "requesting " << params.size() << " configuration parameters with respect to masterchain block "
             << blkid.to_str();
-  return envelope_send_query(std::move(b), [ Self = actor_id(this), mode, filename, blkid,
-                                             params = std::move(params) ](td::Result<td::BufferSlice> R) mutable {
+  return envelope_send_query(std::move(b), [
+    Self = actor_id(this), mode, filename, blkid, params = std::move(params), do_after = std::move(do_after)
+  ](td::Result<td::BufferSlice> R) mutable {
     if (R.is_error()) {
+      do_after.set_error(R.move_as_error());
       return;
     }
     auto F = ton::fetch_tl_object<ton::lite_api::liteServer_configInfo>(R.move_as_ok(), true);
@@ -1705,13 +2106,14 @@ bool TestNode::get_config_params(ton::BlockIdExt blkid, int mode, std::string fi
       auto f = F.move_as_ok();
       td::actor::send_closure_later(Self, &TestNode::got_config_params, blkid, ton::create_block_id(f->id_),
                                     std::move(f->state_proof_), std::move(f->config_proof_), mode, filename,
-                                    std::move(params));
+                                    std::move(params), std::move(do_after));
     }
   });
 }
 
 void TestNode::got_config_params(ton::BlockIdExt req_blkid, ton::BlockIdExt blkid, td::BufferSlice state_proof,
-                                 td::BufferSlice cfg_proof, int mode, std::string filename, std::vector<int> params) {
+                                 td::BufferSlice cfg_proof, int mode, std::string filename, std::vector<int> params,
+                                 td::Promise<td::Unit> do_after) {
   LOG(INFO) << "got configuration parameters";
   if (!blkid.is_masterchain_ext()) {
     LOG(ERROR) << "reference block " << blkid.to_str() << " for the configuration is not a valid masterchain block";
@@ -1734,7 +2136,7 @@ void TestNode::got_config_params(ton::BlockIdExt req_blkid, ton::BlockIdExt blki
       return;
     }
     auto config = res.move_as_ok();
-    if (mode < 0) {
+    if (mode & 0x8000) {
       auto F = vm::std_boc_serialize(config->get_root_cell(), 2);
       if (F.is_error()) {
         LOG(ERROR) << "cannot serialize configuration: " << F.move_as_error().to_string();
@@ -1760,26 +2162,32 @@ void TestNode::got_config_params(ton::BlockIdExt req_blkid, ton::BlockIdExt blki
         } else {
           std::ostringstream os;
           if (i >= 0) {
-            block::gen::ConfigParam{i}.print_ref(os, value);
+            block::gen::ConfigParam{i}.print_ref(print_limit_, os, value);
             os << std::endl;
           }
-          vm::load_cell_slice(value).print_rec(os);
+          vm::load_cell_slice(value).print_rec(print_limit_, os);
           out << os.str() << std::endl;
+          if (i == 4 && (mode & 0x2000)) {
+            register_config_param4(value);
+          }
         }
       }
     } else {
-      config->foreach_config_param([&out](int i, Ref<vm::Cell> value) {
+      config->foreach_config_param([this, &out, mode](int i, Ref<vm::Cell> value) {
         out << "ConfigParam(" << i << ") = ";
         if (value.is_null()) {
           out << "(null)\n";
         } else {
           std::ostringstream os;
           if (i >= 0) {
-            block::gen::ConfigParam{i}.print_ref(os, value);
+            block::gen::ConfigParam{i}.print_ref(print_limit_, os, value);
             os << std::endl;
           }
-          vm::load_cell_slice(value).print_rec(os);
+          vm::load_cell_slice(value).print_rec(print_limit_, os);
           out << os.str() << std::endl;
+          if (i == 4 && (mode & 0x2000)) {
+            register_config_param4(value);
+          }
         }
         return true;
       });
@@ -1789,6 +2197,25 @@ void TestNode::got_config_params(ton::BlockIdExt req_blkid, ton::BlockIdExt blki
   } catch (vm::VmVirtError& err) {
     LOG(ERROR) << "virtualization error while traversing configuration: " << err.get_msg();
   }
+  do_after.set_result(td::Unit());
+}
+
+bool TestNode::register_config_param4(Ref<vm::Cell> value) {
+  if (value.is_null()) {
+    return false;
+  }
+  vm::CellSlice cs{vm::NoVmOrd(), std::move(value)};
+  ton::StdSmcAddress addr;
+  if (cs.size_ext() == 256 && cs.fetch_bits_to(addr)) {
+    dns_root_queried_ = true;
+    if (dns_root_ != addr) {
+      dns_root_ = addr;
+      LOG(INFO) << "dns root set to -1:" << addr.to_hex();
+    }
+    return true;
+  } else {
+    return false;
+  }
 }
 
 bool TestNode::get_block(ton::BlockIdExt blkid, bool dump) {
@@ -1882,8 +2309,8 @@ void TestNode::got_block(ton::BlockIdExt blkid, td::BufferSlice data, bool dump)
     auto out = td::TerminalIO::out();
     out << "block contents is ";
     std::ostringstream outp;
-    block::gen::t_Block.print_ref(outp, root);
-    vm::load_cell_slice(root).print_rec(outp);
+    block::gen::t_Block.print_ref(print_limit_, outp, root);
+    vm::load_cell_slice(root).print_rec(print_limit_, outp);
     out << outp.str();
     show_block_header(blkid, std::move(root), 0xffff);
   } else {
@@ -1938,8 +2365,8 @@ void TestNode::got_state(ton::BlockIdExt blkid, ton::RootHash root_hash, ton::Fi
     auto out = td::TerminalIO::out();
     out << "shard state contents is ";
     std::ostringstream outp;
-    block::gen::t_ShardState.print_ref(outp, root);
-    vm::load_cell_slice(root).print_rec(outp);
+    block::gen::t_ShardState.print_ref(print_limit_, outp, root);
+    vm::load_cell_slice(root).print_rec(print_limit_, outp);
     out << outp.str();
     show_state_header(blkid, std::move(root), 0xffff);
   } else {
@@ -2073,8 +2500,8 @@ void TestNode::got_block_header(ton::BlockIdExt blkid, td::BufferSlice data, int
   }
   auto root = res.move_as_ok();
   std::ostringstream outp;
-  vm::CellSlice cs{vm::NoVm{}, root};
-  cs.print_rec(outp);
+  vm::CellSlice cs{vm::NoVm(), root};
+  cs.print_rec(print_limit_, outp);
   td::TerminalIO::out() << outp.str();
   try {
     auto virt_root = vm::MerkleProof::virtualize(root, 1);
@@ -2173,6 +2600,107 @@ void TestNode::got_block_proof(ton::BlockIdExt from, ton::BlockIdExt to, int mod
   show_new_blkids();
 }
 
+bool TestNode::get_creator_stats(ton::BlockIdExt blkid, int mode, unsigned req_count, ton::Bits256 start_after,
+                                 ton::UnixTime min_utime) {
+  if (!(ready_ && !client_.empty())) {
+    return set_error("server connection not ready");
+  }
+  if (!blkid.is_masterchain_ext()) {
+    return set_error("only masterchain blocks contain block creator statistics");
+  }
+  if (!(mode & 1)) {
+    start_after.set_zero();
+  }
+  auto b = ton::serialize_tl_object(ton::create_tl_object<ton::lite_api::liteServer_getValidatorStats>(
+                                        mode, ton::create_tl_lite_block_id(blkid), req_count, start_after, min_utime),
+                                    true);
+  LOG(INFO) << "requesting up to " << req_count << " block creator stats records with respect to masterchain block "
+            << blkid.to_str() << " starting from validator public key " << start_after.to_hex() << " created after "
+            << min_utime << " (mode=" << mode << ")";
+  return envelope_send_query(std::move(b), [ Self = actor_id(this), mode, blkid, req_count, start_after,
+                                             min_utime ](td::Result<td::BufferSlice> R) {
+    if (R.is_error()) {
+      return;
+    }
+    auto F = ton::fetch_tl_object<ton::lite_api::liteServer_validatorStats>(R.move_as_ok(), true);
+    if (F.is_error()) {
+      LOG(ERROR) << "cannot parse answer to liteServer.getValidatorStats";
+    } else {
+      auto f = F.move_as_ok();
+      td::actor::send_closure_later(Self, &TestNode::got_creator_stats, blkid, ton::create_block_id(f->id_), mode,
+                                    f->mode_, start_after, min_utime, std::move(f->state_proof_),
+                                    std::move(f->data_proof_), f->count_, req_count, f->complete_);
+    }
+  });
+}
+
+void TestNode::got_creator_stats(ton::BlockIdExt req_blkid, ton::BlockIdExt blkid, int req_mode, int mode,
+                                 td::Bits256 start_after, ton::UnixTime min_utime, td::BufferSlice state_proof,
+                                 td::BufferSlice data_proof, int count, int req_count, bool complete) {
+  LOG(INFO) << "got answer to getValidatorStats query: " << count << " records out of " << req_count << ", "
+            << (complete ? "complete" : "incomplete");
+  if (!blkid.is_masterchain_ext()) {
+    LOG(ERROR) << "reference block " << blkid.to_str()
+               << " for block creator statistics is not a valid masterchain block";
+    return;
+  }
+  if (count > req_count) {
+    LOG(ERROR) << "obtained " << count << " answers to getValidatorStats query, but only " << req_count
+               << " were requested";
+    return;
+  }
+  if (blkid != req_blkid) {
+    LOG(ERROR) << "answer to getValidatorStats refers to masterchain block " << blkid.to_str()
+               << " different from requested " << req_blkid.to_str();
+    return;
+  }
+  auto R = block::check_extract_state_proof(blkid, state_proof.as_slice(), data_proof.as_slice());
+  if (R.is_error()) {
+    LOG(ERROR) << "masterchain state proof for " << blkid.to_str() << " is invalid : " << R.move_as_error().to_string();
+    return;
+  }
+  bool allow_eq = (mode & 3) != 1;
+  ton::Bits256 key{start_after};
+  std::ostringstream os;
+  try {
+    auto dict = block::get_block_create_stats_dict(R.move_as_ok());
+    if (!dict) {
+      LOG(ERROR) << "cannot extract BlockCreateStats from mc state";
+      return;
+    }
+    for (int i = 0; i < count + (int)complete; i++) {
+      auto v = dict->lookup_nearest_key(key, true, allow_eq);
+      if (v.is_null()) {
+        if (i != count) {
+          LOG(ERROR) << "could fetch only " << i << " CreatorStats entries out of " << count
+                     << " declared in answer to getValidatorStats";
+          return;
+        }
+        break;
+      }
+      block::DiscountedCounter mc_cnt, shard_cnt;
+      if (!block::unpack_CreatorStats(std::move(v), mc_cnt, shard_cnt)) {
+        LOG(ERROR) << "invalid CreatorStats record with key " << key.to_hex();
+        return;
+      }
+      if (mc_cnt.modified_since(min_utime) || shard_cnt.modified_since(min_utime)) {
+        os << key.to_hex() << " mc_cnt:" << mc_cnt << " shard_cnt:" << shard_cnt << std::endl;
+      }
+      allow_eq = false;
+    }
+    if (complete) {
+      os << "(complete)" << std::endl;
+    } else {
+      os << "(incomplete, repeat query from " << key.to_hex() << " )" << std::endl;
+    }
+    td::TerminalIO::out() << os.str();
+  } catch (vm::VmError& err) {
+    LOG(ERROR) << "error while traversing block creator stats: " << err.get_msg();
+  } catch (vm::VmVirtError& err) {
+    LOG(ERROR) << "virtualization error while traversing block creator stats: " << err.get_msg();
+  }
+}
+
 int main(int argc, char* argv[]) {
   SET_VERBOSITY_LEVEL(verbosity_INFO);
   td::set_default_failure_signal_handler();
@@ -2205,6 +2733,11 @@ int main(int argc, char* argv[]) {
     td::actor::send_closure(x, &TestNode::set_db_root, fname.str());
     return td::Status::OK();
   });
+  p.add_option('L', "print-limit", "sets maximum count of recursively printed objects", [&](td::Slice arg) {
+    auto plimit = td::to_integer<int>(arg);
+    td::actor::send_closure(x, &TestNode::set_print_limit, plimit);
+    return plimit >= 0 ? td::Status::OK() : td::Status::Error("printing limit must be non-negative");
+  });
   p.add_option('v', "verbosity", "set verbosity level", [&](td::Slice arg) {
     verbosity = td::to_integer<int>(arg);
     SET_VERBOSITY_LEVEL(VERBOSITY_NAME(FATAL) + verbosity);
@@ -2257,7 +2790,7 @@ int main(int argc, char* argv[]) {
   });
 #endif
 
-  vm::init_op_cp0();
+  vm::init_op_cp0(true);  // enable vm debug
 
   td::actor::Scheduler scheduler({2});
 
diff --git a/submodules/ton/tonlib-src/lite-client/lite-client.h b/submodules/ton/tonlib-src/lite-client/lite-client.h
index 36830e8d5b..7ebaaf1781 100644
--- a/submodules/ton/tonlib-src/lite-client/lite-client.h
+++ b/submodules/ton/tonlib-src/lite-client/lite-client.h
@@ -23,7 +23,7 @@
     exception statement from your version. If you delete this exception statement 
     from all source files in the program, then also delete it here.
 
-    Copyright 2017-2019 Telegram Systems LLP
+    Copyright 2017-2020 Telegram Systems LLP
 */
 #pragma once
 #include "adnl/adnl-ext-client.h"
@@ -50,6 +50,7 @@ class TestNode : public td::actor::Actor {
   bool readline_enabled_ = true;
   bool server_ok_ = false;
   td::int32 liteserver_idx_ = -1;
+  int print_limit_ = 1024;
 
   bool ready_ = false;
   bool inited_ = false;
@@ -66,6 +67,9 @@ class TestNode : public td::actor::Actor {
   ton::BlockIdExt last_block_id_, last_state_id_;
   td::BufferSlice last_block_data_, last_state_data_;
 
+  ton::StdSmcAddress dns_root_;
+  bool dns_root_queried_{false};
+
   std::string line_;
   const char *parse_ptr_, *parse_end_;
   td::Status error_;
@@ -93,6 +97,9 @@ class TestNode : public td::actor::Actor {
   };
 
   void run_init_queries();
+  char cur() const {
+    return *parse_ptr_;
+  }
   bool get_server_time();
   bool get_server_version(int mode = 0);
   void got_server_version(td::Result<td::BufferSlice> res, int mode);
@@ -114,16 +121,32 @@ class TestNode : public td::actor::Actor {
                          td::BufferSlice shard_proof, td::BufferSlice proof, td::BufferSlice state,
                          ton::WorkchainId workchain, ton::StdSmcAddress addr, std::string filename, int mode);
   bool parse_run_method(ton::WorkchainId workchain, ton::StdSmcAddress addr, ton::BlockIdExt ref_blkid,
-                        std::string method_name);
-  void run_smc_method(ton::BlockIdExt ref_blk, ton::BlockIdExt blk, ton::BlockIdExt shard_blk,
+                        std::string method_name, bool ext_mode);
+  bool start_run_method(ton::WorkchainId workchain, ton::StdSmcAddress addr, ton::BlockIdExt ref_blkid,
+                        std::string method_name, std::vector<vm::StackEntry> params, int mode,
+                        td::Promise<std::vector<vm::StackEntry>> promise);
+  void run_smc_method(int mode, ton::BlockIdExt ref_blk, ton::BlockIdExt blk, ton::BlockIdExt shard_blk,
                       td::BufferSlice shard_proof, td::BufferSlice proof, td::BufferSlice state,
                       ton::WorkchainId workchain, ton::StdSmcAddress addr, std::string method,
-                      std::vector<vm::StackEntry> params);
+                      std::vector<vm::StackEntry> params, td::BufferSlice remote_c7, td::BufferSlice remote_libs,
+                      td::BufferSlice remote_result, int remote_exit_code,
+                      td::Promise<std::vector<vm::StackEntry>> promise);
+  bool register_config_param4(Ref<vm::Cell> value);
+  bool dns_resolve_start(ton::WorkchainId workchain, ton::StdSmcAddress addr, ton::BlockIdExt blkid, std::string domain,
+                         int cat, int mode);
+  bool dns_resolve_send(ton::WorkchainId workchain, ton::StdSmcAddress addr, ton::BlockIdExt blkid, std::string domain,
+                        std::string qdomain, int cat, int mode);
+  void dns_resolve_finish(ton::WorkchainId workchain, ton::StdSmcAddress addr, ton::BlockIdExt blkid,
+                          std::string domain, std::string qdomain, int cat, int mode, int used_bits,
+                          Ref<vm::Cell> value);
+  bool show_dns_record(std::ostream& os, int cat, Ref<vm::Cell> value, bool raw_dump);
   bool get_all_shards(bool use_last = true, ton::BlockIdExt blkid = {});
   void got_all_shards(ton::BlockIdExt blk, td::BufferSlice proof, td::BufferSlice data);
-  bool get_config_params(ton::BlockIdExt blkid, int mode = 0, std::string filename = "");
+  bool get_config_params(ton::BlockIdExt blkid, td::Promise<td::Unit> do_after, int mode = 0, std::string filename = "",
+                         std::vector<int> params = {});
   void got_config_params(ton::BlockIdExt req_blkid, ton::BlockIdExt blkid, td::BufferSlice state_proof,
-                         td::BufferSlice cfg_proof, int mode, std::string filename, std::vector<int> params);
+                         td::BufferSlice cfg_proof, int mode, std::string filename, std::vector<int> params,
+                         td::Promise<td::Unit> do_after);
   bool get_block(ton::BlockIdExt blk, bool dump = false);
   void got_block(ton::BlockIdExt blkid, td::BufferSlice data, bool dump);
   bool get_state(ton::BlockIdExt blk, bool dump = false);
@@ -150,10 +173,18 @@ class TestNode : public td::actor::Actor {
                               std::vector<TransId> trans, td::BufferSlice proof);
   bool get_block_proof(ton::BlockIdExt from, ton::BlockIdExt to, int mode);
   void got_block_proof(ton::BlockIdExt from, ton::BlockIdExt to, int mode, td::BufferSlice res);
+  bool get_creator_stats(ton::BlockIdExt blkid, int mode, unsigned req_count, ton::Bits256 start_after,
+                         ton::UnixTime min_utime);
+  void got_creator_stats(ton::BlockIdExt req_blkid, ton::BlockIdExt blkid, int req_mode, int mode,
+                         td::Bits256 start_after, ton::UnixTime min_utime, td::BufferSlice state_proof,
+                         td::BufferSlice data_proof, int count, int req_count, bool complete);
+  // parser
   bool do_parse_line();
   bool show_help(std::string command);
-  std::string get_word(char delim = ' ');
+  td::Slice get_word(char delim = ' ');
+  td::Slice get_word_ext(const char* delims, const char* specials = nullptr);
   bool get_word_to(std::string& str, char delim = ' ');
+  bool get_word_to(td::Slice& str, char delim = ' ');
   int skipspc();
   std::string get_line_tail(bool remove_spaces = true) const;
   bool eoln() const;
@@ -161,25 +192,31 @@ class TestNode : public td::actor::Actor {
   bool set_error(td::Status error);
   bool set_error(std::string err_msg);
   void show_context() const;
-  bool parse_account_addr(ton::WorkchainId& wc, ton::StdSmcAddress& addr);
+  bool parse_account_addr(ton::WorkchainId& wc, ton::StdSmcAddress& addr, bool allow_none = false);
   static int parse_hex_digit(int c);
   static bool parse_hash(const char* str, ton::Bits256& hash);
-  static bool convert_uint64(std::string word, td::uint64& val);
-  static bool convert_int64(std::string word, td::int64& val);
-  static bool convert_uint32(std::string word, td::uint32& val);
-  static bool convert_int32(std::string word, td::int32& val);
-  static bool convert_shard_id(std::string str, ton::ShardIdFull& shard);
+  static bool parse_hash(td::Slice str, ton::Bits256& hash);
+  static bool convert_uint64(td::Slice word, td::uint64& val);
+  static bool convert_int64(td::Slice word, td::int64& val);
+  static bool convert_uint32(td::Slice word, td::uint32& val);
+  static bool convert_int32(td::Slice word, td::int32& val);
+  static bool convert_shard_id(td::Slice str, ton::ShardIdFull& shard);
+  static td::int64 compute_method_id(std::string method);
   bool parse_hash(ton::Bits256& hash);
   bool parse_lt(ton::LogicalTime& lt);
   bool parse_uint32(td::uint32& val);
+  bool parse_int32(td::int32& val);
+  bool parse_int16(int& val);
   bool parse_shard_id(ton::ShardIdFull& shard);
   bool parse_block_id_ext(ton::BlockIdExt& blkid, bool allow_incomplete = false);
   bool parse_block_id_ext(std::string blk_id_string, ton::BlockIdExt& blkid, bool allow_incomplete = false) const;
   bool parse_stack_value(td::Slice str, vm::StackEntry& value);
   bool parse_stack_value(vm::StackEntry& value);
+  bool parse_stack_values(std::vector<vm::StackEntry>& values);
   bool register_blkid(const ton::BlockIdExt& blkid);
   bool show_new_blkids(bool all = false);
   bool complete_blkid(ton::BlockId partial_blkid, ton::BlockIdExt& complete_blkid) const;
+  td::Promise<td::Unit> trivial_promise();
 
  public:
   void conn_ready() {
@@ -222,6 +259,11 @@ class TestNode : public td::actor::Actor {
     fail_timeout_ = ts;
     alarm_timestamp().relax(fail_timeout_);
   }
+  void set_print_limit(int plimit) {
+    if (plimit >= 0) {
+      print_limit_ = plimit;
+    }
+  }
   void add_cmd(td::BufferSlice data) {
     ex_mode_ = true;
     ex_queries_.push_back(std::move(data));
diff --git a/submodules/ton/tonlib-src/tdactor/benchmark/benchmark.cpp b/submodules/ton/tonlib-src/tdactor/benchmark/benchmark.cpp
index 442bb84c61..deddcb22ce 100644
--- a/submodules/ton/tonlib-src/tdactor/benchmark/benchmark.cpp
+++ b/submodules/ton/tonlib-src/tdactor/benchmark/benchmark.cpp
@@ -23,7 +23,7 @@
     exception statement from your version. If you delete this exception statement 
     from all source files in the program, then also delete it here.
 
-    Copyright 2017-2019 Telegram Systems LLP
+    Copyright 2017-2020 Telegram Systems LLP
 */
 #include "third_party/FAAArrayQueue.h"
 #include "third_party/HazardPointers.h"
@@ -56,7 +56,10 @@ extern "C" {
 #include "td/utils/Random.h"
 #include "td/utils/Slice.h"
 #include "td/utils/Status.h"
+#include "td/utils/StealingQueue.h"
+#include "td/utils/ThreadSafeCounter.h"
 #include "td/utils/UInt.h"
+#include "td/utils/VectorQueue.h"
 
 #include <algorithm>
 #include <array>
@@ -796,10 +799,13 @@ class MpmcQueueBenchmark : public td::Benchmark {
     std::vector<td::thread> m_threads(m_);
     auto impl = std::make_unique<Impl>(n_ + m_ + 1);
     size_t thread_id = 0;
+    td::ThreadSafeCounter counter;
+    CHECK(counter.sum() == 0);
     for (auto &thread : m_threads) {
       thread = td::thread([&, thread_id] {
         while (true) {
           size_t value = impl->pop(thread_id);
+          counter.add(-static_cast<td::int64>(value));
           if (!value) {
             break;
           }
@@ -811,6 +817,7 @@ class MpmcQueueBenchmark : public td::Benchmark {
       thread = td::thread([&, thread_id] {
         for (int i = 0; i < n / n_; i++) {
           impl->push(static_cast<size_t>(i + 1), thread_id);
+          counter.add(i + 1);
         }
       });
       thread_id++;
@@ -818,7 +825,10 @@ class MpmcQueueBenchmark : public td::Benchmark {
     for (auto &thread : n_threads) {
       thread.join();
     }
-    for (int i = 0; i < m_; i++) {
+    while (counter.sum() != 0) {
+      td::this_thread::yield();
+    }
+    for (int i = 0; i < m_ + n_ + 1; i++) {
       impl->push(0, thread_id);
     }
     for (auto &thread : m_threads) {
@@ -832,6 +842,62 @@ class MpmcQueueBenchmark : public td::Benchmark {
   int m_;
 };
 
+template <class Impl>
+class MpmcQueueBenchmark2 : public td::Benchmark {
+ public:
+  MpmcQueueBenchmark2(int n, int k) : n_(n), k_(k) {
+  }
+  std::string get_description() const override {
+    return PSTRING() << "MpmcQueueBenchmark2 " << n_ << " " << k_ << " " << Impl::get_description();
+  }
+
+  void run(int n) override {
+    std::vector<td::thread> n_threads(n_);
+    auto impl = std::make_unique<Impl>(n_ + 1);
+    size_t thread_id = 0;
+    std::atomic<int> left{k_};
+
+    for (int i = 0; i < k_; i++) {
+      impl->push(n, thread_id);
+    }
+
+    for (auto &thread : n_threads) {
+      thread = td::thread([&, thread_id] {
+        while (true) {
+          size_t value = impl->pop(thread_id);
+          if (value > 1) {
+            impl->push(value - 1, thread_id);
+          }
+          if (value == 1) {
+            left--;
+          }
+          if (!value) {
+            break;
+          }
+        }
+      });
+      thread_id++;
+    }
+
+    while (left.load() != 0) {
+      td::this_thread::yield();
+    }
+
+    for (int i = 0; i < n_ + 1; i++) {
+      impl->push(0, thread_id);
+    }
+
+    for (auto &thread : n_threads) {
+      thread.join();
+    }
+    impl.reset();
+  }
+
+ private:
+  int n_;
+  int k_;
+};
+
 class Cheat {
  public:
   explicit Cheat(size_t thread_n) : impl_(static_cast<int>(thread_n)) {
@@ -959,26 +1025,95 @@ std::string CfQueueT<FAAArrayQueue<Cell>, Cell>::get_description() {
 template <class Value>
 class MoodyQueue {
  public:
-  explicit MoodyQueue(size_t) {
+  explicit MoodyQueue(size_t n) {
+    for (size_t i = 0; i < n; i++) {
+      p.push_back(moodycamel::ProducerToken(q));
+      c.push_back(moodycamel::ConsumerToken(q));
+    }
   }
   static std::string get_description() {
     return "moodycamel queue";
   }
-  void push(Value v, size_t) {
-    q.enqueue(v);
+  void push(Value v, size_t tid) {
+    q.enqueue(p[tid], v);
   }
-  Value pop(size_t) {
+  Value pop(size_t tid) {
     Value res;
-    while (!q.try_dequeue(res)) {
+    while (!q.try_dequeue(c[tid], res)) {
     }
+    //q.wait_dequeue(c[tid], res);
     return res;
   }
-  bool try_pop(Value &value, size_t) {
-    return q.try_dequeue(value);
+  bool try_pop(Value &value, size_t tid) {
+    return q.try_dequeue(c[tid], value);
   }
 
  private:
   moodycamel::ConcurrentQueue<Value> q;
+  std::vector<moodycamel::ProducerToken> p;
+  std::vector<moodycamel::ConsumerToken> c;
+};
+
+struct Sem {
+ public:
+  void post() {
+    if (++cnt_ == 0) {
+      {
+        std::unique_lock<std::mutex> lk(mutex_);
+      }
+      cnd_.notify_one();
+    }
+  }
+  void wait(int cnt = 1) {
+    auto was = cnt_.fetch_sub(cnt);
+    if (was >= cnt) {
+      return;
+    }
+    std::unique_lock<std::mutex> lk(mutex_);
+    cnd_.wait(lk, [&] { return cnt_ >= 0; });
+  }
+
+ private:
+  std::mutex mutex_;
+  std::condition_variable cnd_;
+  std::atomic<int> cnt_{0};
+};
+
+template <class Value>
+class MagicQueue {
+ public:
+  explicit MagicQueue(size_t n) : n_(n), qs_(n_ - 1), pos_{0} {
+  }
+  static std::string get_description() {
+    return "magic queue";
+  }
+  void push(Value v, size_t tid) {
+    if (v == 0) {
+      return;
+    }
+
+    if (tid + 1 == n_) {
+      qs_[pos_].push(v);
+      pos_ = (pos_ + 1) % (n_ - 1);
+    } else {
+      qs_[tid].push(v);
+    }
+  }
+  Value pop(size_t tid) {
+    CHECK(tid + 1 != n_);
+    if (qs_[tid].empty()) {
+      return 0;
+    }
+    return qs_[tid].pop();
+  }
+  bool try_pop(Value &value, size_t) {
+    UNREACHABLE();
+  }
+
+ private:
+  size_t n_;
+  std::vector<td::VectorQueue<Value>> qs_;
+  size_t pos_;
 };
 
 #if TG_LCR_QUEUE
@@ -1110,65 +1245,155 @@ class WaitQueue {
   static std::string get_description() {
     return "Wait + " + Q::get_description();
   }
-  explicit WaitQueue(size_t threads_n) : impl(threads_n) {
+
+  explicit WaitQueue(size_t threads_n) : impl(threads_n), slots(threads_n) {
+    for (size_t i = 0; i < threads_n; i++) {
+      waiter.init_slot(slots[i].slot, static_cast<int>(i));
+    }
   }
+
   T pop(size_t thread_id) {
     T res;
-    int yields = 0;
-    while (!impl.try_pop(res, thread_id)) {
-      yields = waiter.wait(yields, static_cast<uint32>(thread_id));
+    while (true) {
+      if (slots[thread_id].local_queue.try_pop(res)) {
+        break;
+      }
+      if (impl.try_pop(res, thread_id)) {
+        break;
+      }
+      waiter.wait(slots[thread_id].slot);
     }
-    waiter.stop_wait(yields, static_cast<uint32>(thread_id));
+    waiter.stop_wait(slots[thread_id].slot);
+    //LOG(ERROR) << "GOT";
     return res;
   }
+
+  void push_local(T value, size_t thread_id) {
+    auto o_value = slots[thread_id].local_queue.push(value);
+    if (o_value) {
+      push(o_value.unwrap, thread_id);
+    }
+  }
+
   void push(T value, size_t thread_id) {
-    impl.push(std::move(value), static_cast<uint32>(thread_id));
+    impl.push(value, static_cast<uint32>(thread_id));
     waiter.notify();
   }
 
  private:
   W waiter;
   Q impl;
+  struct Slot {
+    typename W::Slot slot;
+    td::actor::core::LocalQueue<T> local_queue;
+  };
+  std::vector<Slot> slots;
+};
+template <class Q, class W, class T>
+class StealingWaitQueue {
+ public:
+  static std::string get_description() {
+    return "StealWait + " + Q::get_description();
+  }
+
+  explicit StealingWaitQueue(size_t threads_n) : impl(threads_n), slots(threads_n) {
+    for (size_t i = 0; i < threads_n; i++) {
+      waiter.init_slot(slots[i].slot, static_cast<int>(i));
+    }
+  }
+
+  T pop(size_t thread_id) {
+    T res;
+    while (true) {
+      if (slots[thread_id].stealing_queue.local_pop(res)) {
+        break;
+      }
+      if (slots[thread_id].local_queue.try_pop(res)) {
+        break;
+      }
+      if (impl.try_pop(res, thread_id)) {
+        break;
+      }
+
+      bool ok = false;
+      for (size_t i = 1; i < slots.size(); i++) {
+        auto pos = (i + thread_id) % slots.size();
+        if (slots[thread_id].stealing_queue.steal(res, slots[pos].stealing_queue)) {
+          ok = true;
+          break;
+        }
+      }
+      if (ok) {
+        break;
+      }
+      waiter.wait(slots[thread_id].slot);
+    }
+    waiter.stop_wait(slots[thread_id].slot);
+    //LOG(ERROR) << "GOT";
+    return res;
+  }
+
+  void push_local(T value, size_t thread_id) {
+    auto o_value = slots[thread_id].local_queue.push(value);
+    if (o_value) {
+      push(o_value.unwrap, thread_id);
+    }
+  }
+
+  void push(T value, size_t thread_id) {
+    slots[thread_id].stealing_queue.local_push(value,
+                                               [&](auto value) { impl.push(value, static_cast<uint32>(thread_id)); });
+    waiter.notify();
+  }
+
+ private:
+  W waiter;
+  Q impl;
+  struct Slot {
+    typename W::Slot slot;
+    td::actor::core::LocalQueue<T> local_queue;
+    td::StealingQueue<T> stealing_queue;
+  };
+  std::vector<Slot> slots;
 };
 
 void run_queue_bench(int n, int m) {
-  bench(MpmcQueueBenchmark<WaitQueue<td::MpmcQueue<size_t>, td::MpmcWaiter, size_t>>(n, m), 2);
-  bench(MpmcQueueBenchmark<td::MpmcQueue<size_t>>(n, m), 2);
-  bench(MpmcQueueBenchmark<td::MpmcQueueOld<size_t>>(n, m), 2);
-  bench(MpmcQueueBenchmark<Cheat>(n, m), 2);
-  bench(MpmcQueueBenchmark<CfQueue<FAAArrayQueue<size_t>>>(n, m), 2);
-  bench(MpmcQueueBenchmark<CfQueue<LazyIndexArrayQueue<size_t>>>(n, m), 2);
-  bench(MpmcQueueBenchmark<StupidQueue<size_t>>(n, m), 2);
+  bench(MpmcQueueBenchmark<MoodyQueue<size_t>>(n, m), 2);
+  bench(MpmcQueueBenchmark<StealingWaitQueue<td::MpmcQueue<size_t>, td::MpmcEagerWaiter, size_t>>(n, m), 2);
+  bench(MpmcQueueBenchmark<StealingWaitQueue<td::MpmcQueue<size_t>, td::MpmcSleepyWaiter, size_t>>(n, m), 2);
+  bench(MpmcQueueBenchmark<WaitQueue<td::MpmcQueue<size_t>, td::MpmcEagerWaiter, size_t>>(n, m), 2);
+  bench(MpmcQueueBenchmark<WaitQueue<td::MpmcQueue<size_t>, td::MpmcSleepyWaiter, size_t>>(n, m), 2);
+  //bench(MpmcQueueBenchmark<td::MpmcQueue<size_t>>(n, m), 2);
+  //bench(MpmcQueueBenchmark<td::MpmcQueueOld<size_t>>(n, m), 2);
+  //bench(MpmcQueueBenchmark<Cheat>(n, m), 2);
+  //bench(MpmcQueueBenchmark<CfQueue<FAAArrayQueue<size_t>>>(n, m), 2);
+  //bench(MpmcQueueBenchmark<CfQueue<LazyIndexArrayQueue<size_t>>>(n, m), 2);
+  //bench(MpmcQueueBenchmark<StupidQueue<size_t>>(n, m), 2);
+
   //bench(MpmcQueueBenchmark<MpQueue>(n, m), 2);
 #if TG_LCR_QUEUE
   bench(MpmcQueueBenchmark<CfQueue<LCRQueue<size_t>>>(n, m), 2);
 #endif
 }
+void run_queue_bench2(int n, int k) {
+  bench(MpmcQueueBenchmark2<StealingWaitQueue<td::MpmcQueue<size_t>, td::MpmcSleepyWaiter, size_t>>(n, k), 2);
+  bench(MpmcQueueBenchmark2<StealingWaitQueue<td::MpmcQueue<size_t>, td::MpmcEagerWaiter, size_t>>(n, k), 2);
+  bench(MpmcQueueBenchmark2<MagicQueue<size_t>>(n, k), 2);
+  bench(MpmcQueueBenchmark2<MoodyQueue<size_t>>(n, k), 2);
+  bench(MpmcQueueBenchmark2<WaitQueue<td::MpmcQueue<size_t>, td::MpmcEagerWaiter, size_t>>(n, k), 2);
+  bench(MpmcQueueBenchmark2<WaitQueue<td::MpmcQueue<size_t>, td::MpmcSleepyWaiter, size_t>>(n, k), 2);
+  //bench(MpmcQueueBenchmark2<td::MpmcQueue<size_t>>(n, k), 2);
+  //bench(MpmcQueueBenchmark2<td::MpmcQueueOld<size_t>>(n, k), 2);
+  //bench(MpmcQueueBenchmark2<Cheat>(n, k), 2);
+  //bench(MpmcQueueBenchmark2<CfQueue<FAAArrayQueue<size_t>>>(n, k), 2);
+  //bench(MpmcQueueBenchmark2<CfQueue<LazyIndexArrayQueue<size_t>>>(n, k), 2);
+  //bench(MpmcQueueBenchmark2<StupidQueue<size_t>>(n, k), 2);
 
-struct Sem {
- public:
-  void post() {
-    if (++cnt_ == 0) {
-      {
-        std::unique_lock<std::mutex> lk(mutex_);
-      }
-      cnd_.notify_one();
-    }
-  }
-  void wait(int cnt = 1) {
-    auto was = cnt_.fetch_sub(cnt);
-    if (was >= cnt) {
-      return;
-    }
-    std::unique_lock<std::mutex> lk(mutex_);
-    cnd_.wait(lk, [&] { return cnt_ >= 0; });
-  }
-
- private:
-  std::mutex mutex_;
-  std::condition_variable cnd_;
-  std::atomic<int> cnt_{0};
-};
+  //bench(MpmcQueueBenchmark<MpQueue>(n, m), 2);
+#if TG_LCR_QUEUE
+  bench(MpmcQueueBenchmark2<CfQueue<LCRQueue<size_t>>>(n, k), 2);
+#endif
+}
 
 class ChainedSpawn : public td::Benchmark {
  public:
@@ -1415,17 +1640,18 @@ class YieldMany : public td::Benchmark {
 int main(int argc, char **argv) {
   if (argc > 1) {
     if (argv[1][0] == 'a') {
-      bench_n(MpmcQueueBenchmark<td::MpmcQueue<size_t>>(1, 1), 1 << 26);
+      bench_n(MpmcQueueBenchmark2<WaitQueue<td::MpmcQueue<size_t>, td::MpmcEagerWaiter, size_t>>(50, 1), 1 << 26);
+      //bench_n(MpmcQueueBenchmark<td::MpmcQueue<size_t>>(1, 1), 1 << 26);
       //bench_n(MpmcQueueBenchmark<MpQueue>(1, 40), 1 << 20);
       //bench_n(MpmcQueueBenchmark<CfQueue<LCRQueue<size_t>>>(1, 40), 1 << 20);
     } else {
-      bench_n(MpmcQueueBenchmark<td::MpmcQueueOld<size_t>>(1, 1), 1 << 26);
+      bench_n(MpmcQueueBenchmark2<WaitQueue<td::MpmcQueue<size_t>, td::MpmcSleepyWaiter, size_t>>(50, 1), 1 << 26);
+      //bench_n(MpmcQueueBenchmark<td::MpmcQueueOld<size_t>>(1, 1), 1 << 26);
       //bench_n(MpmcQueueBenchmark<CfQueue<LCRQueue<size_t>>>(1, 40), 1 << 20);
       //bench_n(MpmcQueueBenchmark<CfQueue<FAAArrayQueue<size_t>>>(1, 1), 1 << 26);
     }
     return 0;
   }
-
   bench(YieldMany(false));
   bench(YieldMany(true));
   bench(SpawnMany(false));
@@ -1436,6 +1662,22 @@ int main(int argc, char **argv) {
   bench(ChainedSpawnInplace(true));
   bench(ChainedSpawn(false));
   bench(ChainedSpawn(true));
+
+  run_queue_bench(10, 10);
+  run_queue_bench(10, 1);
+  run_queue_bench(1, 10);
+  run_queue_bench(1, 1);
+  run_queue_bench(2, 10);
+  run_queue_bench(2, 2);
+  run_queue_bench(10, 1);
+
+  run_queue_bench2(50, 1);
+  run_queue_bench2(50, 2);
+  run_queue_bench2(1, 100);
+  run_queue_bench2(1, 1000);
+  run_queue_bench2(10, 2);
+  run_queue_bench2(10, 1000);
+
   return 0;
 
   bench(ActorDummyQuery());
@@ -1466,16 +1708,5 @@ int main(int argc, char **argv) {
   bench(CalcHashSha256Benchmark<BlockSha256MpmcQueue<BoundedMpmcQueue<std::function<void()>>>>());
   bench(CalcHashSha256Benchmark<BlockSha256MpmcQueue<td::MpmcQueue<std::function<void()>>>>());
 
-  run_queue_bench(1, 10);
-  run_queue_bench(1, 1);
-  run_queue_bench(2, 10);
-  run_queue_bench(2, 2);
-  run_queue_bench(10, 10);
-
-  run_queue_bench(2, 2);
-  run_queue_bench(1, 10);
-  run_queue_bench(10, 1);
-  run_queue_bench(10, 10);
-
   return 0;
 }
diff --git a/submodules/ton/tonlib-src/tdactor/benchmark/third_party/MoodyCamelQueue.h b/submodules/ton/tonlib-src/tdactor/benchmark/third_party/MoodyCamelQueue.h
index 936a2f5fcd..1c7cf80143 100644
--- a/submodules/ton/tonlib-src/tdactor/benchmark/third_party/MoodyCamelQueue.h
+++ b/submodules/ton/tonlib-src/tdactor/benchmark/third_party/MoodyCamelQueue.h
@@ -269,17 +269,17 @@ static inline thread_id_t thread_id() {
 namespace moodycamel {
 namespace details {
 #if defined(__GNUC__)
-inline bool likely(bool x) {
+static inline bool(likely)(bool x) {
   return __builtin_expect((x), true);
 }
-inline bool unlikely(bool x) {
+static inline bool(unlikely)(bool x) {
   return __builtin_expect((x), false);
 }
 #else
-inline bool likely(bool x) {
+static inline bool(likely)(bool x) {
   return x;
 }
-inline bool unlikely(bool x) {
+static inline bool(unlikely)(bool x) {
   return x;
 }
 #endif
@@ -300,8 +300,8 @@ struct const_numeric_max {
                              : static_cast<T>(-1);
 };
 
-#if defined(__GNUC__) && !defined(__clang__)
-typedef ::max_align_t std_max_align_t;  // GCC forgot to add it to std:: for a while
+#if defined(__GLIBCXX__)
+typedef ::max_align_t std_max_align_t;  // libstdc++ forgot to add it to std:: for a while
 #else
 typedef std::max_align_t std_max_align_t;  // Others (e.g. MSVC) insist it can *only* be accessed via std::
 #endif
@@ -377,8 +377,8 @@ struct ConcurrentQueueDefaultTraits {
   static const size_t MAX_SUBQUEUE_SIZE = details::const_numeric_max<size_t>::value;
 
 #ifndef MCDBGQ_USE_RELACY
-// Memory allocation can be customized if needed.
-// malloc should return nullptr on failure, and handle alignment like std::malloc.
+  // Memory allocation can be customized if needed.
+  // malloc should return nullptr on failure, and handle alignment like std::malloc.
 #if defined(malloc) || defined(free)
   // Gah, this is 2015, stop defining macros that break standard code already!
   // Work around malloc/free being special macros:
@@ -1140,7 +1140,7 @@ class ConcurrentQueue {
     // If there was at least one non-empty queue but it appears empty at the time
     // we try to dequeue from it, we need to make sure every queue's been tried
     if (nonEmptyCount > 0) {
-      if (details::likely(best->dequeue(item))) {
+      if ((details::likely)(best->dequeue(item))) {
         return true;
       }
       for (auto ptr = producerListTail.load(std::memory_order_acquire); ptr != nullptr; ptr = ptr->next_prod()) {
@@ -1335,7 +1335,10 @@ class ConcurrentQueue {
  private:
   friend struct ProducerToken;
   friend struct ConsumerToken;
+  struct ExplicitProducer;
   friend struct ExplicitProducer;
+  struct ImplicitProducer;
+  friend struct ImplicitProducer;
   friend class ConcurrentQueueTests;
 
   enum AllocationMode { CanAlloc, CannotAlloc };
@@ -1380,7 +1383,7 @@ class ConcurrentQueue {
     }
     auto prodCount = producerCount.load(std::memory_order_relaxed);
     auto globalOffset = globalExplicitConsumerOffset.load(std::memory_order_relaxed);
-    if (details::unlikely(token.desiredProducer == nullptr)) {
+    if ((details::unlikely)(token.desiredProducer == nullptr)) {
       // Aha, first time we're dequeueing anything.
       // Figure out our local position
       // Note: offset is from start, not end, but we're traversing from end -- subtract from count first
@@ -1442,7 +1445,7 @@ class ConcurrentQueue {
     FreeList& operator=(FreeList const&) MOODYCAMEL_DELETE_FUNCTION;
 
     inline void add(N* node) {
-#if MCDBGQ_NOLOCKFREE_FREELIST
+#ifdef MCDBGQ_NOLOCKFREE_FREELIST
       debug::DebugLock lock(mutex);
 #endif
       // We know that the should-be-on-freelist bit is 0 at this point, so it's safe to
@@ -1455,7 +1458,7 @@ class ConcurrentQueue {
     }
 
     inline N* try_get() {
-#if MCDBGQ_NOLOCKFREE_FREELIST
+#ifdef MCDBGQ_NOLOCKFREE_FREELIST
       debug::DebugLock lock(mutex);
 #endif
       auto head = freeListHead.load(std::memory_order_acquire);
@@ -1529,7 +1532,7 @@ class ConcurrentQueue {
     static const std::uint32_t REFS_MASK = 0x7FFFFFFF;
     static const std::uint32_t SHOULD_BE_ON_FREELIST = 0x80000000;
 
-#if MCDBGQ_NOLOCKFREE_FREELIST
+#ifdef MCDBGQ_NOLOCKFREE_FREELIST
     debug::DebugMutex mutex;
 #endif
   };
@@ -1548,7 +1551,7 @@ class ConcurrentQueue {
         , freeListNext(nullptr)
         , shouldBeOnFreeList(false)
         , dynamicallyAllocated(true) {
-#if MCDBGQ_TRACKMEM
+#ifdef MCDBGQ_TRACKMEM
       owner = nullptr;
 #endif
     }
@@ -1679,14 +1682,14 @@ class ConcurrentQueue {
     std::atomic<bool> shouldBeOnFreeList;
     bool dynamicallyAllocated;  // Perhaps a better name for this would be 'isNotPartOfInitialBlockPool'
 
-#if MCDBGQ_TRACKMEM
+#ifdef MCDBGQ_TRACKMEM
     void* owner;
 #endif
   };
   static_assert(std::alignment_of<Block>::value >= std::alignment_of<details::max_align_t>::value,
                 "Internal error: Blocks must be at least as aligned as the type they are wrapping");
 
-#if MCDBGQ_TRACKMEM
+#ifdef MCDBGQ_TRACKMEM
  public:
   struct MemStats;
 
@@ -1756,7 +1759,7 @@ class ConcurrentQueue {
     ConcurrentQueue* parent;
 
    protected:
-#if MCDBGQ_TRACKMEM
+#ifdef MCDBGQ_TRACKMEM
     friend struct MemStats;
 #endif
   };
@@ -1902,7 +1905,7 @@ class ConcurrentQueue {
           if (newBlock == nullptr) {
             return false;
           }
-#if MCDBGQ_TRACKMEM
+#ifdef MCDBGQ_TRACKMEM
           newBlock->owner = this;
 #endif
           newBlock->ConcurrentQueue::Block::template reset_empty<explicit_context>();
@@ -1916,7 +1919,7 @@ class ConcurrentQueue {
           ++pr_blockIndexSlotsUsed;
         }
 
-        if (!MOODYCAMEL_NOEXCEPT_CTOR(T, U, new (nullptr) T(std::forward<U>(element)))) {
+        if (!MOODYCAMEL_NOEXCEPT_CTOR(T, U, new ((T*)nullptr) T(std::forward<U>(element)))) {
           // The constructor may throw. We want the element not to appear in the queue in
           // that case (without corrupting the queue):
           MOODYCAMEL_TRY {
@@ -1941,7 +1944,7 @@ class ConcurrentQueue {
         blockIndex.load(std::memory_order_relaxed)->front.store(pr_blockIndexFront, std::memory_order_release);
         pr_blockIndexFront = (pr_blockIndexFront + 1) & (pr_blockIndexSize - 1);
 
-        if (!MOODYCAMEL_NOEXCEPT_CTOR(T, U, new (nullptr) T(std::forward<U>(element)))) {
+        if (!MOODYCAMEL_NOEXCEPT_CTOR(T, U, new ((T*)nullptr) T(std::forward<U>(element)))) {
           this->tailIndex.store(newTailIndex, std::memory_order_release);
           return true;
         }
@@ -1985,13 +1988,14 @@ class ConcurrentQueue {
         // incremented after dequeueOptimisticCount -- this is enforced in the `else` block below), and since we now
         // have a version of dequeueOptimisticCount that is at least as recent as overcommit (due to the release upon
         // incrementing dequeueOvercommit and the acquire above that synchronizes with it), overcommit <= myDequeueCount.
-        assert(overcommit <= myDequeueCount);
+        // However, we can't assert this since both dequeueOptimisticCount and dequeueOvercommit may (independently)
+        // overflow; in such a case, though, the logic still holds since the difference between the two is maintained.
 
         // Note that we reload tail here in case it changed; it will be the same value as before or greater, since
         // this load is sequenced after (happens after) the earlier load above. This is supported by read-read
         // coherency (as defined in the standard), explained here: http://en.cppreference.com/w/cpp/atomic/memory_order
         tail = this->tailIndex.load(std::memory_order_acquire);
-        if (details::likely(details::circular_less_than<index_t>(myDequeueCount - overcommit, tail))) {
+        if ((details::likely)(details::circular_less_than<index_t>(myDequeueCount - overcommit, tail))) {
           // Guaranteed to be at least one element to dequeue!
 
           // Get the index. Note that since there's guaranteed to be at least one element, this
@@ -2033,10 +2037,10 @@ class ConcurrentQueue {
               }
             } guard = {block, index};
 
-            element = std::move(el);
+            element = std::move(el);  // NOLINT
           } else {
-            element = std::move(el);
-            el.~T();
+            element = std::move(el);  // NOLINT
+            el.~T();                  // NOLINT
             block->ConcurrentQueue::Block::template set_empty<explicit_context>(index);
           }
 
@@ -2119,7 +2123,7 @@ class ConcurrentQueue {
             return false;
           }
 
-#if MCDBGQ_TRACKMEM
+#ifdef MCDBGQ_TRACKMEM
           newBlock->owner = this;
 #endif
           newBlock->ConcurrentQueue::Block::template set_all_empty<explicit_context>();
@@ -2151,7 +2155,8 @@ class ConcurrentQueue {
           block = block->next;
         }
 
-        if (MOODYCAMEL_NOEXCEPT_CTOR(T, decltype(*itemFirst), new (nullptr) T(details::deref_noexcept(itemFirst)))) {
+        if (MOODYCAMEL_NOEXCEPT_CTOR(T, decltype(*itemFirst),
+                                     new ((T*)nullptr) T(details::deref_noexcept(itemFirst)))) {
           blockIndex.load(std::memory_order_relaxed)
               ->front.store((pr_blockIndexFront - 1) & (pr_blockIndexSize - 1), std::memory_order_release);
         }
@@ -2172,7 +2177,8 @@ class ConcurrentQueue {
         if (details::circular_less_than<index_t>(newTailIndex, stopIndex)) {
           stopIndex = newTailIndex;
         }
-        if (MOODYCAMEL_NOEXCEPT_CTOR(T, decltype(*itemFirst), new (nullptr) T(details::deref_noexcept(itemFirst)))) {
+        if (MOODYCAMEL_NOEXCEPT_CTOR(T, decltype(*itemFirst),
+                                     new ((T*)nullptr) T(details::deref_noexcept(itemFirst)))) {
           while (currentTailIndex != stopIndex) {
             new ((*this->tailBlock)[currentTailIndex++]) T(*itemFirst++);
           }
@@ -2186,9 +2192,10 @@ class ConcurrentQueue {
               // may only define a (noexcept) move constructor, and so calls to the
               // cctor will not compile, even if they are in an if branch that will never
               // be executed
-              new ((*this->tailBlock)[currentTailIndex]) T(
-                  details::nomove_if<(bool)!MOODYCAMEL_NOEXCEPT_CTOR(
-                      T, decltype(*itemFirst), new (nullptr) T(details::deref_noexcept(itemFirst)))>::eval(*itemFirst));
+              new ((*this->tailBlock)[currentTailIndex])
+                  T(details::nomove_if<(bool)!MOODYCAMEL_NOEXCEPT_CTOR(
+                        T, decltype(*itemFirst),
+                        new ((T*)nullptr) T(details::deref_noexcept(itemFirst)))>::eval(*itemFirst));
               ++currentTailIndex;
               ++itemFirst;
             }
@@ -2236,7 +2243,7 @@ class ConcurrentQueue {
         this->tailBlock = this->tailBlock->next;
       }
 
-      if (!MOODYCAMEL_NOEXCEPT_CTOR(T, decltype(*itemFirst), new (nullptr) T(details::deref_noexcept(itemFirst))) &&
+      if (!MOODYCAMEL_NOEXCEPT_CTOR(T, decltype(*itemFirst), new ((T*)nullptr) T(details::deref_noexcept(itemFirst))) &&
           firstAllocatedBlock != nullptr) {
         blockIndex.load(std::memory_order_relaxed)
             ->front.store((pr_blockIndexFront - 1) & (pr_blockIndexSize - 1), std::memory_order_release);
@@ -2257,7 +2264,7 @@ class ConcurrentQueue {
         std::atomic_thread_fence(std::memory_order_acquire);
 
         auto myDequeueCount = this->dequeueOptimisticCount.fetch_add(desiredCount, std::memory_order_relaxed);
-        assert(overcommit <= myDequeueCount);
+        ;
 
         tail = this->tailIndex.load(std::memory_order_acquire);
         auto actualCount = static_cast<size_t>(tail - (myDequeueCount - overcommit));
@@ -2418,7 +2425,7 @@ class ConcurrentQueue {
    private:
 #endif
 
-#if MCDBGQ_TRACKMEM
+#ifdef MCDBGQ_TRACKMEM
     friend struct MemStats;
 #endif
   };
@@ -2500,7 +2507,7 @@ class ConcurrentQueue {
              (MAX_SUBQUEUE_SIZE == 0 || MAX_SUBQUEUE_SIZE - BLOCK_SIZE < currentTailIndex - head))) {
           return false;
         }
-#if MCDBGQ_NOLOCKFREE_IMPLICITPRODBLOCKINDEX
+#ifdef MCDBGQ_NOLOCKFREE_IMPLICITPRODBLOCKINDEX
         debug::DebugLock lock(mutex);
 #endif
         // Find out where we'll be inserting this block in the block index
@@ -2516,12 +2523,12 @@ class ConcurrentQueue {
           idxEntry->value.store(nullptr, std::memory_order_relaxed);
           return false;
         }
-#if MCDBGQ_TRACKMEM
+#ifdef MCDBGQ_TRACKMEM
         newBlock->owner = this;
 #endif
         newBlock->ConcurrentQueue::Block::template reset_empty<implicit_context>();
 
-        if (!MOODYCAMEL_NOEXCEPT_CTOR(T, U, new (nullptr) T(std::forward<U>(element)))) {
+        if (!MOODYCAMEL_NOEXCEPT_CTOR(T, U, new ((T*)nullptr) T(std::forward<U>(element)))) {
           // May throw, try to insert now before we publish the fact that we have this new block
           MOODYCAMEL_TRY {
             new ((*newBlock)[currentTailIndex]) T(std::forward<U>(element));
@@ -2539,7 +2546,7 @@ class ConcurrentQueue {
 
         this->tailBlock = newBlock;
 
-        if (!MOODYCAMEL_NOEXCEPT_CTOR(T, U, new (nullptr) T(std::forward<U>(element)))) {
+        if (!MOODYCAMEL_NOEXCEPT_CTOR(T, U, new ((T*)nullptr) T(std::forward<U>(element)))) {
           this->tailIndex.store(newTailIndex, std::memory_order_release);
           return true;
         }
@@ -2562,9 +2569,8 @@ class ConcurrentQueue {
         std::atomic_thread_fence(std::memory_order_acquire);
 
         index_t myDequeueCount = this->dequeueOptimisticCount.fetch_add(1, std::memory_order_relaxed);
-        assert(overcommit <= myDequeueCount);
         tail = this->tailIndex.load(std::memory_order_acquire);
-        if (details::likely(details::circular_less_than<index_t>(myDequeueCount - overcommit, tail))) {
+        if ((details::likely)(details::circular_less_than<index_t>(myDequeueCount - overcommit, tail))) {
           index_t index = this->headIndex.fetch_add(1, std::memory_order_acq_rel);
 
           // Determine which block the element is in
@@ -2575,7 +2581,7 @@ class ConcurrentQueue {
           auto& el = *((*block)[index]);
 
           if (!MOODYCAMEL_NOEXCEPT_ASSIGN(T, T&&, element = std::move(el))) {
-#if MCDBGQ_NOLOCKFREE_IMPLICITPRODBLOCKINDEX
+#ifdef MCDBGQ_NOLOCKFREE_IMPLICITPRODBLOCKINDEX
             // Note: Acquiring the mutex with every dequeue instead of only when a block
             // is released is very sub-optimal, but it is, after all, purely debug code.
             debug::DebugLock lock(producer->mutex);
@@ -2595,14 +2601,14 @@ class ConcurrentQueue {
               }
             } guard = {block, index, entry, this->parent};
 
-            element = std::move(el);
+            element = std::move(el);  // NOLINT
           } else {
-            element = std::move(el);
-            el.~T();
+            element = std::move(el);  // NOLINT
+            el.~T();                  // NOLINT
 
             if (block->ConcurrentQueue::Block::template set_empty<implicit_context>(index)) {
               {
-#if MCDBGQ_NOLOCKFREE_IMPLICITPRODBLOCKINDEX
+#ifdef MCDBGQ_NOLOCKFREE_IMPLICITPRODBLOCKINDEX
                 debug::DebugLock lock(mutex);
 #endif
                 // Add the block back into the global free pool (and remove from block index)
@@ -2642,7 +2648,7 @@ class ConcurrentQueue {
                              ((startTailIndex - 1) & ~static_cast<index_t>(BLOCK_SIZE - 1));
       index_t currentTailIndex = (startTailIndex - 1) & ~static_cast<index_t>(BLOCK_SIZE - 1);
       if (blockBaseDiff > 0) {
-#if MCDBGQ_NOLOCKFREE_IMPLICITPRODBLOCKINDEX
+#ifdef MCDBGQ_NOLOCKFREE_IMPLICITPRODBLOCKINDEX
         debug::DebugLock lock(mutex);
 #endif
         do {
@@ -2679,7 +2685,7 @@ class ConcurrentQueue {
             return false;
           }
 
-#if MCDBGQ_TRACKMEM
+#ifdef MCDBGQ_TRACKMEM
           newBlock->owner = this;
 #endif
           newBlock->ConcurrentQueue::Block::template reset_empty<implicit_context>();
@@ -2714,16 +2720,18 @@ class ConcurrentQueue {
         if (details::circular_less_than<index_t>(newTailIndex, stopIndex)) {
           stopIndex = newTailIndex;
         }
-        if (MOODYCAMEL_NOEXCEPT_CTOR(T, decltype(*itemFirst), new (nullptr) T(details::deref_noexcept(itemFirst)))) {
+        if (MOODYCAMEL_NOEXCEPT_CTOR(T, decltype(*itemFirst),
+                                     new ((T*)nullptr) T(details::deref_noexcept(itemFirst)))) {
           while (currentTailIndex != stopIndex) {
             new ((*this->tailBlock)[currentTailIndex++]) T(*itemFirst++);
           }
         } else {
           MOODYCAMEL_TRY {
             while (currentTailIndex != stopIndex) {
-              new ((*this->tailBlock)[currentTailIndex]) T(
-                  details::nomove_if<(bool)!MOODYCAMEL_NOEXCEPT_CTOR(
-                      T, decltype(*itemFirst), new (nullptr) T(details::deref_noexcept(itemFirst)))>::eval(*itemFirst));
+              new ((*this->tailBlock)[currentTailIndex])
+                  T(details::nomove_if<(bool)!MOODYCAMEL_NOEXCEPT_CTOR(
+                        T, decltype(*itemFirst),
+                        new ((T*)nullptr) T(details::deref_noexcept(itemFirst)))>::eval(*itemFirst));
               ++currentTailIndex;
               ++itemFirst;
             }
@@ -2788,7 +2796,6 @@ class ConcurrentQueue {
         std::atomic_thread_fence(std::memory_order_acquire);
 
         auto myDequeueCount = this->dequeueOptimisticCount.fetch_add(desiredCount, std::memory_order_relaxed);
-        assert(overcommit <= myDequeueCount);
 
         tail = this->tailIndex.load(std::memory_order_acquire);
         auto actualCount = static_cast<size_t>(tail - (myDequeueCount - overcommit));
@@ -2843,7 +2850,7 @@ class ConcurrentQueue {
 
                   if (block->ConcurrentQueue::Block::template set_many_empty<implicit_context>(
                           blockStartIndex, static_cast<size_t>(endIndex - blockStartIndex))) {
-#if MCDBGQ_NOLOCKFREE_IMPLICITPRODBLOCKINDEX
+#ifdef MCDBGQ_NOLOCKFREE_IMPLICITPRODBLOCKINDEX
                     debug::DebugLock lock(mutex);
 #endif
                     entry->value.store(nullptr, std::memory_order_relaxed);
@@ -2865,7 +2872,7 @@ class ConcurrentQueue {
             if (block->ConcurrentQueue::Block::template set_many_empty<implicit_context>(
                     blockStartIndex, static_cast<size_t>(endIndex - blockStartIndex))) {
               {
-#if MCDBGQ_NOLOCKFREE_IMPLICITPRODBLOCKINDEX
+#ifdef MCDBGQ_NOLOCKFREE_IMPLICITPRODBLOCKINDEX
                 debug::DebugLock lock(mutex);
 #endif
                 // Note that the set_many_empty above did a release, meaning that anybody who acquires the block
@@ -2945,7 +2952,7 @@ class ConcurrentQueue {
     }
 
     inline size_t get_block_index_index_for_index(index_t index, BlockIndexHeader*& localBlockIndex) const {
-#if MCDBGQ_NOLOCKFREE_IMPLICITPRODBLOCKINDEX
+#ifdef MCDBGQ_NOLOCKFREE_IMPLICITPRODBLOCKINDEX
       debug::DebugLock lock(mutex);
 #endif
       index &= ~static_cast<index_t>(BLOCK_SIZE - 1);
@@ -3026,10 +3033,10 @@ class ConcurrentQueue {
    private:
 #endif
 
-#if MCDBGQ_NOLOCKFREE_IMPLICITPRODBLOCKINDEX
+#ifdef MCDBGQ_NOLOCKFREE_IMPLICITPRODBLOCKINDEX
     mutable debug::DebugMutex mutex;
 #endif
-#if MCDBGQ_TRACKMEM
+#ifdef MCDBGQ_TRACKMEM
     friend struct MemStats;
 #endif
   };
@@ -3065,7 +3072,7 @@ class ConcurrentQueue {
   }
 
   inline void add_block_to_free_list(Block* block) {
-#if MCDBGQ_TRACKMEM
+#ifdef MCDBGQ_TRACKMEM
     block->owner = nullptr;
 #endif
     freeList.add(block);
@@ -3103,7 +3110,7 @@ class ConcurrentQueue {
     return nullptr;
   }
 
-#if MCDBGQ_TRACKMEM
+#ifdef MCDBGQ_TRACKMEM
  public:
   struct MemStats {
     size_t allocatedBlocks;
@@ -3221,7 +3228,7 @@ class ConcurrentQueue {
   }
 
   ProducerBase* recycle_or_create_producer(bool isExplicit, bool& recycled) {
-#if MCDBGQ_NOLOCKFREE_IMPLICITPRODHASH
+#ifdef MCDBGQ_NOLOCKFREE_IMPLICITPRODHASH
     debug::DebugLock lock(implicitProdMutex);
 #endif
     // Try to re-use one first
@@ -3386,7 +3393,7 @@ class ConcurrentQueue {
 
     // Code and algorithm adapted from http://preshing.com/20130605/the-worlds-simplest-lock-free-hash-table
 
-#if MCDBGQ_NOLOCKFREE_IMPLICITPRODHASH
+#ifdef MCDBGQ_NOLOCKFREE_IMPLICITPRODHASH
     debug::DebugLock lock(implicitProdMutex);
 #endif
 
@@ -3443,6 +3450,7 @@ class ConcurrentQueue {
     // Insert!
     auto newCount = 1 + implicitProducerHashCount.fetch_add(1, std::memory_order_relaxed);
     while (true) {
+      // NOLINTNEXTLINE(clang-analyzer-core.NullDereference)
       if (newCount >= (mainHash->capacity >> 1) &&
           !implicitProducerHashResizeInProgress.test_and_set(std::memory_order_acquire)) {
         // We've acquired the resize lock, try to allocate a bigger hash table.
@@ -3538,8 +3546,8 @@ class ConcurrentQueue {
     // Remove from thread exit listeners
     details::ThreadExitNotifier::unsubscribe(&producer->threadExitListener);
 
-// Remove from hash
-#if MCDBGQ_NOLOCKFREE_IMPLICITPRODHASH
+    // Remove from hash
+#ifdef MCDBGQ_NOLOCKFREE_IMPLICITPRODHASH
     debug::DebugLock lock(implicitProdMutex);
 #endif
     auto hash = implicitProducerHash.load(std::memory_order_acquire);
@@ -3650,7 +3658,7 @@ class ConcurrentQueue {
   std::atomic<std::uint32_t> nextExplicitConsumerId;
   std::atomic<std::uint32_t> globalExplicitConsumerOffset;
 
-#if MCDBGQ_NOLOCKFREE_IMPLICITPRODHASH
+#ifdef MCDBGQ_NOLOCKFREE_IMPLICITPRODHASH
   debug::DebugMutex implicitProdMutex;
 #endif
 
diff --git a/submodules/ton/tonlib-src/tdactor/td/actor/core/ActorInfo.h b/submodules/ton/tonlib-src/tdactor/td/actor/core/ActorInfo.h
index e2574c0dbf..974192938a 100644
--- a/submodules/ton/tonlib-src/tdactor/td/actor/core/ActorInfo.h
+++ b/submodules/ton/tonlib-src/tdactor/td/actor/core/ActorInfo.h
@@ -14,7 +14,7 @@
     You should have received a copy of the GNU Lesser General Public License
     along with TON Blockchain Library.  If not, see <http://www.gnu.org/licenses/>.
 
-    Copyright 2017-2019 Telegram Systems LLP
+    Copyright 2017-2020 Telegram Systems LLP
 */
 #pragma once
 
@@ -41,6 +41,7 @@ class ActorInfo : private HeapNode, private ListNode {
   }
   ~ActorInfo() {
     VLOG(actor) << "Destroy actor [" << name_ << "]";
+    CHECK(!actor_);
   }
 
   bool is_alive() const {
diff --git a/submodules/ton/tonlib-src/tdactor/td/actor/core/CpuWorker.cpp b/submodules/ton/tonlib-src/tdactor/td/actor/core/CpuWorker.cpp
index e047eab12a..d752560ddc 100644
--- a/submodules/ton/tonlib-src/tdactor/td/actor/core/CpuWorker.cpp
+++ b/submodules/ton/tonlib-src/tdactor/td/actor/core/CpuWorker.cpp
@@ -14,13 +14,15 @@
     You should have received a copy of the GNU Lesser General Public License
     along with TON Blockchain Library.  If not, see <http://www.gnu.org/licenses/>.
 
-    Copyright 2017-2019 Telegram Systems LLP
+    Copyright 2017-2020 Telegram Systems LLP
 */
 #include "td/actor/core/CpuWorker.h"
 
 #include "td/actor/core/ActorExecutor.h"
 #include "td/actor/core/SchedulerContext.h"
 
+#include "td/actor/core/Scheduler.h"  // FIXME: afer LocalQueue is in a separate file
+
 namespace td {
 namespace actor {
 namespace core {
@@ -28,20 +30,64 @@ void CpuWorker::run() {
   auto thread_id = get_thread_id();
   auto &dispatcher = *SchedulerContext::get();
 
-  int yields = 0;
+  MpmcWaiter::Slot slot;
+  waiter_.init_slot(slot, thread_id);
   while (true) {
     SchedulerMessage message;
-    if (queue_.try_pop(message, thread_id)) {
+    if (try_pop(message, thread_id)) {
+      waiter_.stop_wait(slot);
       if (!message) {
         return;
       }
       ActorExecutor executor(*message, dispatcher, ActorExecutor::Options().with_from_queue());
-      yields = waiter_.stop_wait(yields, thread_id);
     } else {
-      yields = waiter_.wait(yields, thread_id);
+      waiter_.wait(slot);
     }
   }
 }
+
+bool CpuWorker::try_pop_local(SchedulerMessage &message) {
+  SchedulerMessage::Raw *raw_message;
+  if (local_queues_[id_].try_pop(raw_message)) {
+    message = SchedulerMessage(SchedulerMessage::acquire_t{}, raw_message);
+    return true;
+  }
+  return false;
+}
+
+bool CpuWorker::try_pop_global(SchedulerMessage &message, size_t thread_id) {
+  SchedulerMessage::Raw *raw_message;
+  if (queue_.try_pop(raw_message, thread_id)) {
+    message = SchedulerMessage(SchedulerMessage::acquire_t{}, raw_message);
+    return true;
+  }
+  return false;
+}
+
+bool CpuWorker::try_pop(SchedulerMessage &message, size_t thread_id) {
+  if (++cnt_ == 51) {
+    cnt_ = 0;
+    if (try_pop_global(message, thread_id) || try_pop_local(message)) {
+      return true;
+    }
+  } else {
+    if (try_pop_local(message) || try_pop_global(message, thread_id)) {
+      return true;
+    }
+  }
+
+  for (size_t i = 1; i < local_queues_.size(); i++) {
+    size_t pos = (i + id_) % local_queues_.size();
+    SchedulerMessage::Raw *raw_message;
+    if (local_queues_[id_].steal(raw_message, local_queues_[pos])) {
+      message = SchedulerMessage(SchedulerMessage::acquire_t{}, raw_message);
+      return true;
+    }
+  }
+
+  return false;
+}
+
 }  // namespace core
 }  // namespace actor
 }  // namespace td
diff --git a/submodules/ton/tonlib-src/tdactor/td/actor/core/CpuWorker.h b/submodules/ton/tonlib-src/tdactor/td/actor/core/CpuWorker.h
index 63cb337b4d..d9f32513b7 100644
--- a/submodules/ton/tonlib-src/tdactor/td/actor/core/CpuWorker.h
+++ b/submodules/ton/tonlib-src/tdactor/td/actor/core/CpuWorker.h
@@ -14,7 +14,7 @@
     You should have received a copy of the GNU Lesser General Public License
     along with TON Blockchain Library.  If not, see <http://www.gnu.org/licenses/>.
 
-    Copyright 2017-2019 Telegram Systems LLP
+    Copyright 2017-2020 Telegram Systems LLP
 */
 #pragma once
 
@@ -22,19 +22,32 @@
 
 #include "td/utils/MpmcQueue.h"
 #include "td/utils/MpmcWaiter.h"
+#include "td/utils/Span.h"
 
 namespace td {
 namespace actor {
 namespace core {
+template <class T>
+struct LocalQueue;
 class CpuWorker {
  public:
-  CpuWorker(MpmcQueue<SchedulerMessage> &queue, MpmcWaiter &waiter) : queue_(queue), waiter_(waiter) {
+  CpuWorker(MpmcQueue<SchedulerMessage::Raw *> &queue, MpmcWaiter &waiter, size_t id,
+            MutableSpan<LocalQueue<SchedulerMessage::Raw *>> local_queues)
+      : queue_(queue), waiter_(waiter), id_(id), local_queues_(local_queues) {
   }
   void run();
 
  private:
-  MpmcQueue<SchedulerMessage> &queue_;
+  MpmcQueue<SchedulerMessage::Raw *> &queue_;
   MpmcWaiter &waiter_;
+  size_t id_;
+  MutableSpan<LocalQueue<SchedulerMessage::Raw *>> local_queues_;
+  size_t cnt_{0};
+
+  bool try_pop(SchedulerMessage &message, size_t thread_id);
+
+  bool try_pop_local(SchedulerMessage &message);
+  bool try_pop_global(SchedulerMessage &message, size_t thread_id);
 };
 }  // namespace core
 }  // namespace actor
diff --git a/submodules/ton/tonlib-src/tdactor/td/actor/core/Scheduler.cpp b/submodules/ton/tonlib-src/tdactor/td/actor/core/Scheduler.cpp
index 9569fac360..0863bda0d1 100644
--- a/submodules/ton/tonlib-src/tdactor/td/actor/core/Scheduler.cpp
+++ b/submodules/ton/tonlib-src/tdactor/td/actor/core/Scheduler.cpp
@@ -14,7 +14,7 @@
     You should have received a copy of the GNU Lesser General Public License
     along with TON Blockchain Library.  If not, see <http://www.gnu.org/licenses/>.
 
-    Copyright 2017-2019 Telegram Systems LLP
+    Copyright 2017-2020 Telegram Systems LLP
 */
 #include "td/actor/core/Scheduler.h"
 
@@ -24,6 +24,7 @@
 namespace td {
 namespace actor {
 namespace core {
+
 Scheduler::Scheduler(std::shared_ptr<SchedulerGroupInfo> scheduler_group_info, SchedulerId id, size_t cpu_threads_count)
     : scheduler_group_info_(std::move(scheduler_group_info)), cpu_threads_(cpu_threads_count) {
   scheduler_group_info_->active_scheduler_count++;
@@ -31,17 +32,21 @@ Scheduler::Scheduler(std::shared_ptr<SchedulerGroupInfo> scheduler_group_info, S
   info_->id = id;
   if (cpu_threads_count != 0) {
     info_->cpu_threads_count = cpu_threads_count;
-    info_->cpu_queue = std::make_unique<MpmcQueue<SchedulerMessage>>(1024, max_thread_count());
+    info_->cpu_queue = std::make_unique<MpmcQueue<SchedulerMessage::Raw *>>(1024, max_thread_count());
     info_->cpu_queue_waiter = std::make_unique<MpmcWaiter>();
+
+    info_->cpu_local_queue = std::vector<LocalQueue<SchedulerMessage::Raw *>>(cpu_threads_count);
   }
   info_->io_queue = std::make_unique<MpscPollableQueue<SchedulerMessage>>();
   info_->io_queue->init();
 
   info_->cpu_workers.resize(cpu_threads_count);
+  td::uint8 cpu_worker_id = 0;
   for (auto &worker : info_->cpu_workers) {
-    worker = std::make_unique<WorkerInfo>(WorkerInfo::Type::Cpu, true);
+    worker = std::make_unique<WorkerInfo>(WorkerInfo::Type::Cpu, true, CpuWorkerId{cpu_worker_id});
+    cpu_worker_id++;
   }
-  info_->io_worker = std::make_unique<WorkerInfo>(WorkerInfo::Type::Io, !info_->cpu_workers.empty());
+  info_->io_worker = std::make_unique<WorkerInfo>(WorkerInfo::Type::Io, !info_->cpu_workers.empty(), CpuWorkerId{});
 
   poll_.init();
   io_worker_ = std::make_unique<IoWorker>(*info_->io_queue);
@@ -62,8 +67,9 @@ Scheduler::~Scheduler() {
 void Scheduler::start() {
   for (size_t i = 0; i < cpu_threads_.size(); i++) {
     cpu_threads_[i] = td::thread([this, i] {
-      this->run_in_context_impl(*this->info_->cpu_workers[i],
-                                [this] { CpuWorker(*info_->cpu_queue, *info_->cpu_queue_waiter).run(); });
+      this->run_in_context_impl(*this->info_->cpu_workers[i], [this, i] {
+        CpuWorker(*info_->cpu_queue, *info_->cpu_queue_waiter, i, info_->cpu_local_queue).run();
+      });
     });
     cpu_threads_[i].set_name(PSLICE() << "#" << info_->id.value() << ":cpu#" << i);
   }
@@ -121,9 +127,14 @@ void Scheduler::do_stop() {
   scheduler_group_info_->active_scheduler_count_condition_variable.notify_all();
 }
 
-Scheduler::ContextImpl::ContextImpl(ActorInfoCreator *creator, SchedulerId scheduler_id,
+Scheduler::ContextImpl::ContextImpl(ActorInfoCreator *creator, SchedulerId scheduler_id, CpuWorkerId cpu_worker_id,
                                     SchedulerGroupInfo *scheduler_group, Poll *poll, KHeap<double> *heap)
-    : creator_(creator), scheduler_id_(scheduler_id), scheduler_group_(scheduler_group), poll_(poll), heap_(heap) {
+    : creator_(creator)
+    , scheduler_id_(scheduler_id)
+    , cpu_worker_id_(cpu_worker_id)
+    , scheduler_group_(scheduler_group)
+    , poll_(poll)
+    , heap_(heap) {
 }
 
 SchedulerId Scheduler::ContextImpl::get_scheduler_id() const {
@@ -138,7 +149,18 @@ void Scheduler::ContextImpl::add_to_queue(ActorInfoPtr actor_info_ptr, Scheduler
   if (need_poll || !info.cpu_queue) {
     info.io_queue->writer_put(std::move(actor_info_ptr));
   } else {
-    info.cpu_queue->push(std::move(actor_info_ptr), get_thread_id());
+    if (scheduler_id == get_scheduler_id() && cpu_worker_id_.is_valid()) {
+      // may push local
+      CHECK(actor_info_ptr);
+      auto raw = actor_info_ptr.release();
+      auto should_notify = info.cpu_local_queue[cpu_worker_id_.value()].push(
+          raw, [&](auto value) { info.cpu_queue->push(value, get_thread_id()); });
+      if (should_notify) {
+        info.cpu_queue_waiter->notify();
+      }
+      return;
+    }
+    info.cpu_queue->push(actor_info_ptr.release(), get_thread_id());
     info.cpu_queue_waiter->notify();
   }
 }
@@ -254,13 +276,26 @@ void Scheduler::close_scheduler_group(SchedulerGroupInfo &group_info) {
       }
 
       // Drain cpu queue
+      for (auto &q : scheduler_info.cpu_local_queue) {
+        auto &cpu_queue = q;
+        while (true) {
+          SchedulerMessage::Raw *raw_message;
+          if (!cpu_queue.try_pop(raw_message)) {
+            break;
+          }
+          SchedulerMessage(SchedulerMessage::acquire_t{}, raw_message);
+          // message's destructor is called
+          queues_are_empty = false;
+        }
+      }
       if (scheduler_info.cpu_queue) {
         auto &cpu_queue = *scheduler_info.cpu_queue;
         while (true) {
-          SchedulerMessage message;
-          if (!cpu_queue.try_pop(message, get_thread_id())) {
+          SchedulerMessage::Raw *raw_message;
+          if (!cpu_queue.try_pop(raw_message, get_thread_id())) {
             break;
           }
+          SchedulerMessage(SchedulerMessage::acquire_t{}, raw_message);
           // message's destructor is called
           queues_are_empty = false;
         }
diff --git a/submodules/ton/tonlib-src/tdactor/td/actor/core/Scheduler.h b/submodules/ton/tonlib-src/tdactor/td/actor/core/Scheduler.h
index 4ebfc91245..3cc627ee45 100644
--- a/submodules/ton/tonlib-src/tdactor/td/actor/core/Scheduler.h
+++ b/submodules/ton/tonlib-src/tdactor/td/actor/core/Scheduler.h
@@ -14,7 +14,7 @@
     You should have received a copy of the GNU Lesser General Public License
     along with TON Blockchain Library.  If not, see <http://www.gnu.org/licenses/>.
 
-    Copyright 2017-2019 Telegram Systems LLP
+    Copyright 2017-2020 Telegram Systems LLP
 */
 #pragma once
 
@@ -38,9 +38,11 @@
 #include "td/utils/List.h"
 #include "td/utils/logging.h"
 #include "td/utils/MpmcQueue.h"
+#include "td/utils/StealingQueue.h"
 #include "td/utils/MpmcWaiter.h"
 #include "td/utils/MpscLinkQueue.h"
 #include "td/utils/MpscPollableQueue.h"
+#include "td/utils/optional.h"
 #include "td/utils/port/Poll.h"
 #include "td/utils/port/detail/Iocp.h"
 #include "td/utils/port/thread.h"
@@ -66,16 +68,52 @@ class IoWorker;
 struct WorkerInfo {
   enum class Type { Io, Cpu } type{Type::Io};
   WorkerInfo() = default;
-  explicit WorkerInfo(Type type, bool allow_shared) : type(type), actor_info_creator(allow_shared) {
+  explicit WorkerInfo(Type type, bool allow_shared, CpuWorkerId cpu_worker_id)
+      : type(type), actor_info_creator(allow_shared), cpu_worker_id(cpu_worker_id) {
   }
   ActorInfoCreator actor_info_creator;
+  CpuWorkerId cpu_worker_id;
+};
+
+template <class T>
+struct LocalQueue {
+ public:
+  template <class F>
+  bool push(T value, F &&overflow_f) {
+    auto res = std::move(next_);
+    next_ = std::move(value);
+    if (res) {
+      queue_.local_push(res.unwrap(), overflow_f);
+      return true;
+    }
+    return false;
+  }
+  bool try_pop(T &message) {
+    if (!next_) {
+      return queue_.local_pop(message);
+    }
+    message = next_.unwrap();
+    return true;
+  }
+  bool steal(T &message, LocalQueue<T> &other) {
+    return queue_.steal(message, other.queue_);
+  }
+
+ private:
+  td::optional<T> next_;
+  StealingQueue<T> queue_;
+  char pad[TD_CONCURRENCY_PAD - sizeof(optional<T>)];
 };
 
 struct SchedulerInfo {
   SchedulerId id;
   // will be read by all workers is any thread
-  std::unique_ptr<MpmcQueue<SchedulerMessage>> cpu_queue;
+  std::unique_ptr<MpmcQueue<SchedulerMessage::Raw *>> cpu_queue;
   std::unique_ptr<MpmcWaiter> cpu_queue_waiter;
+
+  std::vector<LocalQueue<SchedulerMessage::Raw *>> cpu_local_queue;
+  //std::vector<td::StealingQueue<SchedulerMessage>> cpu_stealing_queue;
+
   // only scheduler itself may read from io_queue_
   std::unique_ptr<MpscPollableQueue<SchedulerMessage>> io_queue;
   size_t cpu_threads_count{0};
@@ -156,11 +194,12 @@ class Scheduler {
 
   class ContextImpl : public SchedulerContext {
    public:
-    ContextImpl(ActorInfoCreator *creator, SchedulerId scheduler_id, SchedulerGroupInfo *scheduler_group, Poll *poll,
-                KHeap<double> *heap);
+    ContextImpl(ActorInfoCreator *creator, SchedulerId scheduler_id, CpuWorkerId cpu_worker_id,
+                SchedulerGroupInfo *scheduler_group, Poll *poll, KHeap<double> *heap);
 
     SchedulerId get_scheduler_id() const override;
     void add_to_queue(ActorInfoPtr actor_info_ptr, SchedulerId scheduler_id, bool need_poll) override;
+
     ActorInfoCreator &get_actor_info_creator() override;
 
     bool has_poll() override;
@@ -181,6 +220,7 @@ class Scheduler {
 
     ActorInfoCreator *creator_;
     SchedulerId scheduler_id_;
+    CpuWorkerId cpu_worker_id_;
     SchedulerGroupInfo *scheduler_group_;
     Poll *poll_;
 
@@ -193,8 +233,8 @@ class Scheduler {
     td::detail::Iocp::Guard iocp_guard(&scheduler_group_info_->iocp);
 #endif
     bool is_io_worker = worker_info.type == WorkerInfo::Type::Io;
-    ContextImpl context(&worker_info.actor_info_creator, info_->id, scheduler_group_info_.get(),
-                        is_io_worker ? &poll_ : nullptr, is_io_worker ? &heap_ : nullptr);
+    ContextImpl context(&worker_info.actor_info_creator, info_->id, worker_info.cpu_worker_id,
+                        scheduler_group_info_.get(), is_io_worker ? &poll_ : nullptr, is_io_worker ? &heap_ : nullptr);
     SchedulerContext::Guard guard(&context);
     f();
   }
diff --git a/submodules/ton/tonlib-src/tdactor/td/actor/core/SchedulerId.h b/submodules/ton/tonlib-src/tdactor/td/actor/core/SchedulerId.h
index 124e409276..289adbd475 100644
--- a/submodules/ton/tonlib-src/tdactor/td/actor/core/SchedulerId.h
+++ b/submodules/ton/tonlib-src/tdactor/td/actor/core/SchedulerId.h
@@ -14,7 +14,7 @@
     You should have received a copy of the GNU Lesser General Public License
     along with TON Blockchain Library.  If not, see <http://www.gnu.org/licenses/>.
 
-    Copyright 2017-2019 Telegram Systems LLP
+    Copyright 2017-2020 Telegram Systems LLP
 */
 #pragma once
 
@@ -26,8 +26,7 @@ namespace actor {
 namespace core {
 class SchedulerId {
  public:
-  SchedulerId() : id_(-1) {
-  }
+  SchedulerId() = default;
   explicit SchedulerId(uint8 id) : id_(id) {
   }
   bool is_valid() const {
@@ -42,7 +41,27 @@ class SchedulerId {
   }
 
  private:
-  int32 id_{0};
+  int32 id_{-1};
+};
+
+class CpuWorkerId {
+ public:
+  CpuWorkerId() = default;
+  explicit CpuWorkerId(uint8 id) : id_(id) {
+  }
+  bool is_valid() const {
+    return id_ >= 0;
+  }
+  uint8 value() const {
+    CHECK(is_valid());
+    return static_cast<uint8>(id_);
+  }
+  bool operator==(CpuWorkerId other) const {
+    return id_ == other.id_;
+  }
+
+ private:
+  int32 id_{-1};
 };
 }  // namespace core
 }  // namespace actor
diff --git a/submodules/ton/tonlib-src/tdactor/test/actors_core.cpp b/submodules/ton/tonlib-src/tdactor/test/actors_core.cpp
index d426f344b5..1ec9dda249 100644
--- a/submodules/ton/tonlib-src/tdactor/test/actors_core.cpp
+++ b/submodules/ton/tonlib-src/tdactor/test/actors_core.cpp
@@ -14,7 +14,7 @@
     You should have received a copy of the GNU Lesser General Public License
     along with TON Blockchain Library.  If not, see <http://www.gnu.org/licenses/>.
 
-    Copyright 2017-2019 Telegram Systems LLP
+    Copyright 2017-2020 Telegram Systems LLP
 */
 #include "td/actor/core/ActorLocker.h"
 #include "td/actor/actor.h"
@@ -101,10 +101,10 @@ TEST(Actor2, locker) {
   kill_signal.add_signal(ActorSignals::Kill);
 
   ActorSignals wakeup_signal;
-  kill_signal.add_signal(ActorSignals::Wakeup);
+  wakeup_signal.add_signal(ActorSignals::Wakeup);
 
   ActorSignals cpu_signal;
-  kill_signal.add_signal(ActorSignals::Cpu);
+  cpu_signal.add_signal(ActorSignals::Cpu);
 
   {
     ActorLocker lockerA(&state);
@@ -410,7 +410,7 @@ class Master : public Actor {
 
  private:
   uint32 l = 0;
-  uint32 r = 100000;
+  uint32 r = 1000;
   core::ActorInfoPtr worker;
   void start_up() override {
     worker = detail::create_actor<Worker>(ActorOptions().with_name("Master"));
@@ -444,8 +444,8 @@ TEST(Actor2, scheduler_simple) {
   core::Scheduler scheduler{group_info, SchedulerId{0}, 2};
   scheduler.start();
   scheduler.run_in_context([] {
-    global_cnt = 10;
-    for (int i = 0; i < 10; i++) {
+    global_cnt = 1000;
+    for (int i = 0; i < global_cnt; i++) {
       detail::create_actor<Master>(ActorOptions().with_name("Master"));
     }
   });
@@ -734,7 +734,7 @@ TEST(Actor2, actor_ping_pong) {
             return;
           }
           auto dest = td::Random::fast(0, (int)next_.size() - 1);
-          if (td::Random::fast(0, 1) == 0 && 0) {
+          if (td::Random::fast(0, 1) == 0) {
             send_closure(next_[dest], &PingPong::query, left - 1, std::move(data));
           } else {
             send_closure_later(next_[dest], &PingPong::query, left - 1, std::move(data));
@@ -755,7 +755,7 @@ TEST(Actor2, actor_ping_pong) {
         std::shared_ptr<td::Destructor> watcher_;
       };
 
-      int N = td::Random::fast(2, 10);
+      int N = td::Random::fast(2, 100);
       //N = 2;
       std::vector<ActorOwn<PingPong>> actors;
       for (int i = 0; i < N; i++) {
diff --git a/submodules/ton/tonlib-src/tddb/td/db/MemoryKeyValue.h b/submodules/ton/tonlib-src/tddb/td/db/MemoryKeyValue.h
index f2c261fe67..f2c047138d 100644
--- a/submodules/ton/tonlib-src/tddb/td/db/MemoryKeyValue.h
+++ b/submodules/ton/tonlib-src/tddb/td/db/MemoryKeyValue.h
@@ -38,11 +38,7 @@ class MemoryKeyValue : public KeyValue {
   std::string stats() const override;
 
  private:
-  class Cmp : public std::less<> {
-   public:
-    using is_transparent = void;
-  };
-  std::map<std::string, std::string, Cmp> map_;
+  std::map<std::string, std::string, std::less<>> map_;
   int64 get_count_{0};
 };
 }  // namespace td
diff --git a/submodules/ton/tonlib-src/tddb/td/db/RocksDb.cpp b/submodules/ton/tonlib-src/tddb/td/db/RocksDb.cpp
index 16f4b4eb80..47fdf4f5c2 100644
--- a/submodules/ton/tonlib-src/tddb/td/db/RocksDb.cpp
+++ b/submodules/ton/tonlib-src/tddb/td/db/RocksDb.cpp
@@ -19,6 +19,7 @@
 #include "td/db/RocksDb.h"
 
 #include "rocksdb/db.h"
+#include "rocksdb/table.h"
 #include "rocksdb/statistics.h"
 #include "rocksdb/write_batch.h"
 #include "rocksdb/utilities/optimistic_transaction_db.h"
@@ -63,6 +64,13 @@ Result<RocksDb> RocksDb::open(std::string path) {
   auto statistics = rocksdb::CreateDBStatistics();
   {
     rocksdb::Options options;
+
+    static auto cache = rocksdb::NewLRUCache(1 << 30);
+
+    rocksdb::BlockBasedTableOptions table_options;
+    table_options.block_cache = cache;
+    options.table_factory.reset(rocksdb::NewBlockBasedTableFactory(table_options));
+
     options.manual_wal_flush = true;
     options.create_if_missing = true;
     options.max_background_compactions = 4;
@@ -82,6 +90,10 @@ std::unique_ptr<KeyValueReader> RocksDb::snapshot() {
 }
 
 std::string RocksDb::stats() const {
+  std::string out;
+  db_->GetProperty("rocksdb.stats", &out);
+  //db_->GetProperty("rocksdb.cur-size-all-mem-tables", &out);
+  return out;
   return statistics_->ToString();
 }
 
diff --git a/submodules/ton/tonlib-src/tddb/td/db/RocksDb.h b/submodules/ton/tonlib-src/tddb/td/db/RocksDb.h
index 04abba778d..77ed46b34b 100644
--- a/submodules/ton/tonlib-src/tddb/td/db/RocksDb.h
+++ b/submodules/ton/tonlib-src/tddb/td/db/RocksDb.h
@@ -60,6 +60,10 @@ class RocksDb : public KeyValue {
   RocksDb &operator=(RocksDb &&);
   ~RocksDb();
 
+  std::shared_ptr<rocksdb::OptimisticTransactionDB> raw_db() const {
+    return db_;
+  };
+
  private:
   std::shared_ptr<rocksdb::OptimisticTransactionDB> db_;
   std::shared_ptr<rocksdb::Statistics> statistics_;
diff --git a/submodules/ton/tonlib-src/tddb/test/binlog.cpp b/submodules/ton/tonlib-src/tddb/test/binlog.cpp
index fc46157ca6..d2cd35225f 100644
--- a/submodules/ton/tonlib-src/tddb/test/binlog.cpp
+++ b/submodules/ton/tonlib-src/tddb/test/binlog.cpp
@@ -679,7 +679,7 @@ TEST(Buffers, CyclicBufferSimple) {
     auto data = td::rand_string('a', 'z', 100001);
     td::Slice write_slice = data;
     td::Slice read_slice = data;
-    for (size_t i = 1; (int)i < options.count; i++) {
+    for (size_t i = 1; i < options.count; i++) {
       ASSERT_EQ((i - 1) * options.chunk_size, reader.reader_size());
       ASSERT_EQ((i - 1) * options.chunk_size, writer.writer_size());
       auto slice = writer.prepare_write();
diff --git a/submodules/ton/tonlib-src/tddb/test/key_value.cpp b/submodules/ton/tonlib-src/tddb/test/key_value.cpp
index 550ccd2fad..cf147e5721 100644
--- a/submodules/ton/tonlib-src/tddb/test/key_value.cpp
+++ b/submodules/ton/tonlib-src/tddb/test/key_value.cpp
@@ -170,7 +170,11 @@ TEST(KeyValue, Bench) {
 TEST(KeyValue, Stress) {
   return;
   td::Slice db_name = "testdb";
-  td::RocksDb::destroy(db_name).ignore();
+  size_t N = 20;
+  auto db_name_i = [&](size_t i) { return PSTRING() << db_name << i; };
+  for (size_t i = 0; i < N; i++) {
+    td::RocksDb::destroy(db_name_i(i)).ignore();
+  }
 
   td::actor::Scheduler scheduler({6});
   auto watcher = td::create_shared_destructor([] { td::actor::SchedulerContext::get()->stop(); });
@@ -186,9 +190,13 @@ TEST(KeyValue, Stress) {
     void tear_down() override {
     }
     void loop() override {
+      if (stat_at_.is_in_past()) {
+        stat_at_ = td::Timestamp::in(10);
+        LOG(ERROR) << db_->stats();
+      }
       if (!kv_) {
-        kv_ = td::KeyValueAsync<td::UInt128, td::BufferSlice>(
-            std::make_unique<td::RocksDb>(td::RocksDb::open(db_name_).move_as_ok()));
+        db_ = std::make_shared<td::RocksDb>(td::RocksDb::open(db_name_).move_as_ok());
+        kv_ = td::KeyValueAsync<td::UInt128, td::BufferSlice>(db_);
         set_start_at_ = td::Timestamp::now();
       }
       if (next_set_ && next_set_.is_in_past()) {
@@ -207,6 +215,7 @@ TEST(KeyValue, Stress) {
 
    private:
     std::shared_ptr<td::Destructor> watcher_;
+    std::shared_ptr<td::RocksDb> db_;
     td::optional<td::KeyValueAsync<td::UInt128, td::BufferSlice>> kv_;
     std::string db_name_;
     int left_cnt_ = 1000000000;
@@ -214,6 +223,7 @@ TEST(KeyValue, Stress) {
     td::Timestamp next_set_ = td::Timestamp::now();
     td::Timestamp set_start_at_;
     td::Timestamp set_finish_at_;
+    td::Timestamp stat_at_ = td::Timestamp::in(10);
 
     void do_set() {
       td::UInt128 key = td::UInt128::zero();
@@ -236,8 +246,10 @@ TEST(KeyValue, Stress) {
       }
     }
   };
-  scheduler.run_in_context([watcher = std::move(watcher), &db_name]() mutable {
-    td::actor::create_actor<Worker>("Worker", watcher, db_name.str()).release();
+  scheduler.run_in_context([watcher = std::move(watcher), &db_name_i, &N]() mutable {
+    for (size_t i = 0; i < N; i++) {
+      td::actor::create_actor<Worker>("Worker", watcher, db_name_i(i)).release();
+    }
     watcher.reset();
   });
 
diff --git a/submodules/ton/tonlib-src/tdutils/CMakeLists.txt b/submodules/ton/tonlib-src/tdutils/CMakeLists.txt
index ed82dbb12f..721a32b7d1 100644
--- a/submodules/ton/tonlib-src/tdutils/CMakeLists.txt
+++ b/submodules/ton/tonlib-src/tdutils/CMakeLists.txt
@@ -56,6 +56,7 @@ set(TDUTILS_SOURCE
   td/utils/port/MemoryMapping.cpp
   td/utils/port/path.cpp
   td/utils/port/PollFlags.cpp
+  td/utils/port/rlimit.cpp
   td/utils/port/ServerSocketFd.cpp
   td/utils/port/signals.cpp
   td/utils/port/sleep.cpp
@@ -129,6 +130,7 @@ set(TDUTILS_SOURCE
   td/utils/port/Poll.h
   td/utils/port/PollBase.h
   td/utils/port/PollFlags.h
+  td/utils/port/rlimit.h
   td/utils/port/RwMutex.h
   td/utils/port/ServerSocketFd.h
   td/utils/port/signals.h
@@ -228,6 +230,7 @@ set(TDUTILS_SOURCE
   td/utils/SpinLock.h
   td/utils/StackAllocator.h
   td/utils/Status.h
+  td/utils/StealingQueue.h
   td/utils/Storer.h
   td/utils/StorerBase.h
   td/utils/StringBuilder.h
@@ -279,6 +282,7 @@ set(TDUTILS_TEST_SOURCE
   ${CMAKE_CURRENT_SOURCE_DIR}/test/pq.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/test/SharedObjectPool.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/test/SharedSlice.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/test/StealingQueue.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/test/variant.cpp
   PARENT_SCOPE
 )
diff --git a/submodules/ton/tonlib-src/tdutils/td/utils/BufferedFd.h b/submodules/ton/tonlib-src/tdutils/td/utils/BufferedFd.h
index 8dff309144..9940eb1e7b 100644
--- a/submodules/ton/tonlib-src/tdutils/td/utils/BufferedFd.h
+++ b/submodules/ton/tonlib-src/tdutils/td/utils/BufferedFd.h
@@ -14,7 +14,7 @@
     You should have received a copy of the GNU Lesser General Public License
     along with TON Blockchain Library.  If not, see <http://www.gnu.org/licenses/>.
 
-    Copyright 2017-2019 Telegram Systems LLP
+    Copyright 2017-2020 Telegram Systems LLP
 */
 #pragma once
 
@@ -84,6 +84,12 @@ class BufferedFd : public BufferedFdBase<FdT> {
   ~BufferedFd();
 
   void close();
+  size_t left_unread() {
+    return input_reader_.size();
+  }
+  size_t left_unwritten() {
+    return output_reader_.size();
+  }
 
   Result<size_t> flush_read(size_t max_read = std::numeric_limits<size_t>::max()) TD_WARN_UNUSED_RESULT;
   Result<size_t> flush_write() TD_WARN_UNUSED_RESULT;
diff --git a/submodules/ton/tonlib-src/tdutils/td/utils/FileLog.cpp b/submodules/ton/tonlib-src/tdutils/td/utils/FileLog.cpp
index 49a0a6276d..7f36deed83 100644
--- a/submodules/ton/tonlib-src/tdutils/td/utils/FileLog.cpp
+++ b/submodules/ton/tonlib-src/tdutils/td/utils/FileLog.cpp
@@ -14,7 +14,7 @@
     You should have received a copy of the GNU Lesser General Public License
     along with TON Blockchain Library.  If not, see <http://www.gnu.org/licenses/>.
 
-    Copyright 2017-2019 Telegram Systems LLP
+    Copyright 2017-2020 Telegram Systems LLP
 */
 #include "td/utils/FileLog.h"
 
@@ -128,4 +128,10 @@ void FileLog::do_rotate() {
   SET_VERBOSITY_LEVEL(current_verbosity_level);
 }
 
+Result<td::unique_ptr<LogInterface>> FileLog::create(string path, int64 rotate_threshold, bool redirect_stderr) {
+  auto l = make_unique<FileLog>();
+  TRY_STATUS(l->init(std::move(path), rotate_threshold, redirect_stderr));
+  return std::move(l);
+}
+
 }  // namespace td
diff --git a/submodules/ton/tonlib-src/tdutils/td/utils/FileLog.h b/submodules/ton/tonlib-src/tdutils/td/utils/FileLog.h
index 63708c16aa..2cead1be5a 100644
--- a/submodules/ton/tonlib-src/tdutils/td/utils/FileLog.h
+++ b/submodules/ton/tonlib-src/tdutils/td/utils/FileLog.h
@@ -14,7 +14,7 @@
     You should have received a copy of the GNU Lesser General Public License
     along with TON Blockchain Library.  If not, see <http://www.gnu.org/licenses/>.
 
-    Copyright 2017-2019 Telegram Systems LLP
+    Copyright 2017-2020 Telegram Systems LLP
 */
 #pragma once
 
@@ -30,6 +30,8 @@ class FileLog : public LogInterface {
   static constexpr int64 DEFAULT_ROTATE_THRESHOLD = 10 * (1 << 20);
 
  public:
+  static Result<td::unique_ptr<LogInterface>> create(string path, int64 rotate_threshold = DEFAULT_ROTATE_THRESHOLD,
+                                                     bool redirect_stderr = true);
   Status init(string path, int64 rotate_threshold = DEFAULT_ROTATE_THRESHOLD, bool redirect_stderr = true);
 
   Slice get_path() const;
diff --git a/submodules/ton/tonlib-src/tdutils/td/utils/MpmcQueue.h b/submodules/ton/tonlib-src/tdutils/td/utils/MpmcQueue.h
index 2daf61472b..e6504e358c 100644
--- a/submodules/ton/tonlib-src/tdutils/td/utils/MpmcQueue.h
+++ b/submodules/ton/tonlib-src/tdutils/td/utils/MpmcQueue.h
@@ -14,7 +14,7 @@
     You should have received a copy of the GNU Lesser General Public License
     along with TON Blockchain Library.  If not, see <http://www.gnu.org/licenses/>.
 
-    Copyright 2017-2019 Telegram Systems LLP
+    Copyright 2017-2020 Telegram Systems LLP
 */
 #pragma once
 
@@ -117,24 +117,28 @@ template <class T>
 class OneValue<T *> {
  public:
   bool set_value(T *value) {
-    T *was = nullptr;
+    T *was = Empty();
     return state_.compare_exchange_strong(was, value, std::memory_order_acq_rel);
   }
   bool get_value(T *&value) {
     value = state_.exchange(Taken(), std::memory_order_acq_rel);
-    return value != nullptr;
+    return value != Empty();
   }
   void reset() {
-    state_ = nullptr;
+    state_ = Empty();
   }
   OneValue() {
   }
 
  private:
-  std::atomic<T *> state_{nullptr};
-  T *Taken() {
-    static T xxx;
-    return &xxx;
+  std::atomic<T *> state_{Empty()};
+  static T *Empty() {
+    static int64 xxx;
+    return reinterpret_cast<T *>(&xxx);
+  }
+  static T *Taken() {
+    static int64 xxx;
+    return reinterpret_cast<T *>(&xxx);
   }
 };
 
diff --git a/submodules/ton/tonlib-src/tdutils/td/utils/MpmcWaiter.h b/submodules/ton/tonlib-src/tdutils/td/utils/MpmcWaiter.h
index 42864cae56..8fb1a5111e 100644
--- a/submodules/ton/tonlib-src/tdutils/td/utils/MpmcWaiter.h
+++ b/submodules/ton/tonlib-src/tdutils/td/utils/MpmcWaiter.h
@@ -14,63 +14,86 @@
     You should have received a copy of the GNU Lesser General Public License
     along with TON Blockchain Library.  If not, see <http://www.gnu.org/licenses/>.
 
-    Copyright 2017-2019 Telegram Systems LLP
+    Copyright 2017-2020 Telegram Systems LLP
 */
 #pragma once
 
 #include "td/utils/common.h"
+#include "td/utils/logging.h"
 #include "td/utils/port/thread.h"
 
 #include <atomic>
+#include <algorithm>
 #include <condition_variable>
 #include <mutex>
 
 namespace td {
 
-class MpmcWaiter {
+class MpmcEagerWaiter {
  public:
-  int wait(int yields, uint32 worker_id) {
-    if (yields < RoundsTillSleepy) {
+  struct Slot {
+   private:
+    friend class MpmcEagerWaiter;
+    int yields;
+    uint32 worker_id;
+  };
+  void init_slot(Slot &slot, uint32 worker_id) {
+    slot.yields = 0;
+    slot.worker_id = worker_id;
+  }
+  void wait(Slot &slot) {
+    if (slot.yields < RoundsTillSleepy) {
       td::this_thread::yield();
-      return yields + 1;
-    } else if (yields == RoundsTillSleepy) {
+      slot.yields++;
+      return;
+    } else if (slot.yields == RoundsTillSleepy) {
       auto state = state_.load(std::memory_order_relaxed);
       if (!State::has_worker(state)) {
-        auto new_state = State::with_worker(state, worker_id);
+        auto new_state = State::with_worker(state, slot.worker_id);
         if (state_.compare_exchange_strong(state, new_state, std::memory_order_acq_rel)) {
           td::this_thread::yield();
-          return yields + 1;
+          slot.yields++;
+          return;
         }
         if (state == State::awake()) {
-          return 0;
+          slot.yields = 0;
+          return;
         }
       }
       td::this_thread::yield();
-      return 0;
-    } else if (yields < RoundsTillAsleep) {
+      slot.yields = 0;
+      return;
+    } else if (slot.yields < RoundsTillAsleep) {
       auto state = state_.load(std::memory_order_acquire);
-      if (State::still_sleepy(state, worker_id)) {
+      if (State::still_sleepy(state, slot.worker_id)) {
         td::this_thread::yield();
-        return yields + 1;
+        slot.yields++;
+        return;
       }
-      return 0;
+      slot.yields = 0;
+      return;
     } else {
       auto state = state_.load(std::memory_order_acquire);
-      if (State::still_sleepy(state, worker_id)) {
+      if (State::still_sleepy(state, slot.worker_id)) {
         std::unique_lock<std::mutex> lock(mutex_);
         if (state_.compare_exchange_strong(state, State::asleep(), std::memory_order_acq_rel)) {
           condition_variable_.wait(lock);
         }
       }
-      return 0;
+      slot.yields = 0;
+      return;
     }
   }
 
-  int stop_wait(int yields, uint32 worker_id) {
-    if (yields > RoundsTillSleepy) {
+  void stop_wait(Slot &slot) {
+    if (slot.yields > RoundsTillSleepy) {
       notify_cold();
     }
-    return 0;
+    slot.yields = 0;
+    return;
+  }
+
+  void close() {
   }
 
   void notify() {
@@ -102,8 +125,8 @@ class MpmcWaiter {
       return (state >> 1) == (worker + 1);
     }
   };
-  //enum { RoundsTillSleepy = 32, RoundsTillAsleep = 64 };
-  enum { RoundsTillSleepy = 1, RoundsTillAsleep = 2 };
+  enum { RoundsTillSleepy = 32, RoundsTillAsleep = 64 };
+  // enum { RoundsTillSleepy = 1, RoundsTillAsleep = 2 };
   std::atomic<uint32> state_{State::awake()};
   std::mutex mutex_;
   std::condition_variable condition_variable_;
@@ -117,4 +140,208 @@ class MpmcWaiter {
   }
 };
 
+class MpmcSleepyWaiter {
+ public:
+  struct Slot {
+   private:
+    friend class MpmcSleepyWaiter;
+
+    enum State { Search, Work, Sleep } state_{Work};
+
+    void park() {
+      std::unique_lock<std::mutex> guard(mutex_);
+      condition_variable_.wait(guard, [&] { return unpark_flag_; });
+      unpark_flag_ = false;
+    }
+
+    bool cancel_park() {
+      auto res = unpark_flag_;
+      unpark_flag_ = false;
+      return res;
+    }
+
+    void unpark() {
+      //TODO: try unlock guard before notify_all
+      std::unique_lock<std::mutex> guard(mutex_);
+      unpark_flag_ = true;
+      condition_variable_.notify_all();
+    }
+
+    std::mutex mutex_;
+    std::condition_variable condition_variable_;
+    bool unpark_flag_{false};  // TODO: move out of lock
+    int yield_cnt{0};
+    int32 worker_id{0};
+    char padding[128];
+  };
+
+  // There are a lot of workers
+  // Each has a slot
+  //
+  // States of a worker:
+  //   - searching for work | Search
+  //   - processing work    | Work
+  //   - sleeping           | Sleep
+  //
+  // When somebody adds a work it calls notify
+  //
+  // notify
+  //   if there are workers in search phase do nothing.
+  //   if all workers are awake do nothing
+  //   otherwise wake some random worker
+  //
+  // Initially all workers are in Search mode.
+  //
+  // When worker found nothing it may try to call wait.
+  // This may put it in a Sleep for some time.
+  // After wait return worker will be in Search state again.
+  //
+  // Suppose worker found a work and ready to process it.
+  // Than it may call stop_wait. This will cause transition from
+  // Search to Work state.
+  //
+  // Main invariant:
+  // After notify is called there should be at least on worker in Search or Work state.
+  // If possible - in Search state
+  //
+
+  void init_slot(Slot &slot, int32 worker_id) {
+    slot.state_ = Slot::State::Work;
+    slot.unpark_flag_ = false;
+    slot.worker_id = worker_id;
+    VLOG(waiter) << "Init slot " << worker_id;
+  }
+
+  int VERBOSITY_NAME(waiter) = VERBOSITY_NAME(DEBUG) + 10;
+  void wait(Slot &slot) {
+    if (slot.state_ == Slot::State::Work) {
+      VLOG(waiter) << "Work -> Search";
+      state_++;
+      slot.state_ = Slot::State::Search;
+      slot.yield_cnt = 0;
+      return;
+    }
+    if (slot.state_ == Slot::Search) {
+      if (slot.yield_cnt++ < 10 && false) {
+        td::this_thread::yield();
+        return;
+      }
+
+      slot.state_ = Slot::State::Sleep;
+      std::unique_lock<std::mutex> guard(sleepers_mutex_);
+      auto state_view = StateView(state_.fetch_add((1 << PARKING_SHIFT) - 1));
+      CHECK(state_view.searching_count != 0);
+      bool should_search = state_view.searching_count == 1;
+      if (closed_) {
+        return;
+      }
+      sleepers_.push_back(&slot);
+      LOG_CHECK(slot.unpark_flag_ == false) << slot.worker_id;
+      VLOG(waiter) << "add to sleepers " << slot.worker_id;
+      //guard.unlock();
+      if (should_search) {
+        VLOG(waiter) << "Search -> Search once then Sleep ";
+        return;
+      }
+      VLOG(waiter) << "Search -> Sleep " << state_view.searching_count << " " << state_view.parked_count;
+    }
+
+    CHECK(slot.state_ == Slot::State::Sleep);
+    VLOG(waiter) << "Park " << slot.worker_id;
+    slot.park();
+    VLOG(waiter) << "Resume " << slot.worker_id;
+    slot.state_ = Slot::State::Search;
+    slot.yield_cnt = 0;
+  }
+
+  void stop_wait(Slot &slot) {
+    if (slot.state_ == Slot::State::Work) {
+      return;
+    }
+    if (slot.state_ == Slot::State::Sleep) {
+      VLOG(waiter) << "Search once then Sleep -> Work/Search " << slot.worker_id;
+      slot.state_ = Slot::State::Work;
+      std::unique_lock<std::mutex> guard(sleepers_mutex_);
+      auto it = std::find(sleepers_.begin(), sleepers_.end(), &slot);
+      if (it != sleepers_.end()) {
+        sleepers_.erase(it);
+        VLOG(waiter) << "remove from sleepers " << slot.worker_id;
+        state_.fetch_sub((1 << PARKING_SHIFT) - 1);
+        guard.unlock();
+      } else {
+        guard.unlock();
+        VLOG(waiter) << "not in sleepers" << slot.worker_id;
+        CHECK(slot.cancel_park());
+      }
+    }
+    VLOG(waiter) << "Search once then Sleep -> Work " << slot.worker_id;
+    slot.state_ = Slot::State::Search;
+    auto state_view = StateView(state_.fetch_sub(1));
+    CHECK(state_view.searching_count != 0);
+    CHECK(state_view.searching_count < 1000);
+    bool should_notify = state_view.searching_count == 1;
+    if (should_notify) {
+      VLOG(waiter) << "Notify others";
+      notify();
+    }
+    VLOG(waiter) << "Search -> Work ";
+    slot.state_ = Slot::State::Work;
+  }
+
+  void notify() {
+    auto view = StateView(state_.load());
+    //LOG(ERROR) << view.parked_count;
+    if (view.searching_count > 0 || view.parked_count == 0) {
+      VLOG(waiter) << "Ingore notify: " << view.searching_count << " " << view.parked_count;
+      return;
+    }
+
+    VLOG(waiter) << "Notify: " << view.searching_count << " " << view.parked_count;
+    std::unique_lock<std::mutex> guard(sleepers_mutex_);
+
+    view = StateView(state_.load());
+    if (view.searching_count > 0) {
+      VLOG(waiter) << "Skip notify: got searching";
+      return;
+    }
+
+    CHECK(view.parked_count == static_cast<int>(sleepers_.size()));
+    if (sleepers_.empty()) {
+      VLOG(waiter) << "Skip notify: no sleepers";
+      return;
+    }
+
+    auto sleeper = sleepers_.back();
+    sleepers_.pop_back();
+    state_.fetch_sub((1 << PARKING_SHIFT) - 1);
+    VLOG(waiter) << "Unpark " << sleeper->worker_id;
+    sleeper->unpark();
+  }
+
+  void close() {
+    StateView state(state_.load());
+    LOG_CHECK(state.parked_count == 0) << state.parked_count;
+    LOG_CHECK(state.searching_count == 0) << state.searching_count;
+  }
+
+ private:
+  static constexpr td::int32 PARKING_SHIFT = 16;
+  struct StateView {
+    td::int32 parked_count;
+    td::int32 searching_count;
+    explicit StateView(int32 x) {
+      parked_count = x >> PARKING_SHIFT;
+      searching_count = x & ((1 << PARKING_SHIFT) - 1);
+    }
+  };
+  std::atomic<td::int32> state_{0};
+
+  std::mutex sleepers_mutex_;
+  std::vector<Slot *> sleepers_;
+
+  bool closed_ = false;
+};
+
+using MpmcWaiter = MpmcSleepyWaiter;
+
 }  // namespace td
diff --git a/submodules/ton/tonlib-src/tdutils/td/utils/SharedObjectPool.h b/submodules/ton/tonlib-src/tdutils/td/utils/SharedObjectPool.h
index 5f60614246..0a9123d317 100644
--- a/submodules/ton/tonlib-src/tdutils/td/utils/SharedObjectPool.h
+++ b/submodules/ton/tonlib-src/tdutils/td/utils/SharedObjectPool.h
@@ -14,7 +14,7 @@
     You should have received a copy of the GNU Lesser General Public License
     along with TON Blockchain Library.  If not, see <http://www.gnu.org/licenses/>.
 
-    Copyright 2017-2019 Telegram Systems LLP
+    Copyright 2017-2020 Telegram Systems LLP
 */
 #pragma once
 
@@ -49,9 +49,7 @@ class AtomicRefCnt {
 };
 
 template <class DataT, class DeleterT>
-class SharedPtrRaw
-    : public DeleterT
-    , private MpscLinkQueueImpl::Node {
+class SharedPtrRaw : public DeleterT, private MpscLinkQueueImpl::Node {
  public:
   explicit SharedPtrRaw(DeleterT deleter) : DeleterT(std::move(deleter)), ref_cnt_{0}, option_magic_(Magic) {
   }
@@ -100,6 +98,7 @@ template <class T, class DeleterT = std::default_delete<T>>
 class SharedPtr {
  public:
   using Raw = detail::SharedPtrRaw<T, DeleterT>;
+  struct acquire_t {};
   SharedPtr() = default;
   ~SharedPtr() {
     if (!raw_) {
@@ -112,6 +111,8 @@ class SharedPtr {
       raw_->inc();
     }
   }
+  SharedPtr(acquire_t, Raw *raw) : raw_(raw) {
+  }
   SharedPtr(const SharedPtr &other) : SharedPtr(other.raw_) {
   }
   SharedPtr &operator=(const SharedPtr &other) {
diff --git a/submodules/ton/tonlib-src/tdutils/td/utils/Span.h b/submodules/ton/tonlib-src/tdutils/td/utils/Span.h
index 8c8ee110b5..a4a8edffa3 100644
--- a/submodules/ton/tonlib-src/tdutils/td/utils/Span.h
+++ b/submodules/ton/tonlib-src/tdutils/td/utils/Span.h
@@ -14,7 +14,7 @@
     You should have received a copy of the GNU Lesser General Public License
     along with TON Blockchain Library.  If not, see <http://www.gnu.org/licenses/>.
 
-    Copyright 2017-2019 Telegram Systems LLP
+    Copyright 2017-2020 Telegram Systems LLP
 */
 #pragma once
 
@@ -95,6 +95,12 @@ class SpanImpl {
   InnerT *end() const {
     return data_ + size_;
   }
+  auto rbegin() const {
+    return std::reverse_iterator<InnerT *>(end());
+  }
+  auto rend() const {
+    return std::reverse_iterator<InnerT *>(begin());
+  }
   size_t size() const {
     return size_;
   }
diff --git a/submodules/ton/tonlib-src/tdutils/td/utils/Status.h b/submodules/ton/tonlib-src/tdutils/td/utils/Status.h
index 6ac9210059..8016099fa7 100644
--- a/submodules/ton/tonlib-src/tdutils/td/utils/Status.h
+++ b/submodules/ton/tonlib-src/tdutils/td/utils/Status.h
@@ -14,7 +14,7 @@
     You should have received a copy of the GNU Lesser General Public License
     along with TON Blockchain Library.  If not, see <http://www.gnu.org/licenses/>.
 
-    Copyright 2017-2019 Telegram Systems LLP
+    Copyright 2017-2020 Telegram Systems LLP
 */
 #pragma once
 
@@ -64,6 +64,9 @@
 
 #define TRY_RESULT_ASSIGN(name, result) TRY_RESULT_IMPL(TD_CONCAT(TD_CONCAT(r_, name), __LINE__), name, result)
 
+#define TRY_RESULT_PROMISE_ASSIGN(promise_name, name, result) \
+  TRY_RESULT_PROMISE_IMPL(promise_name, TD_CONCAT(TD_CONCAT(r_, name), __LINE__), name, result)
+
 #define TRY_RESULT_PREFIX(name, result, prefix) \
   TRY_RESULT_PREFIX_IMPL(TD_CONCAT(TD_CONCAT(r_, name), __LINE__), auto name, result, prefix)
 
diff --git a/submodules/ton/tonlib-src/tdutils/td/utils/StealingQueue.h b/submodules/ton/tonlib-src/tdutils/td/utils/StealingQueue.h
new file mode 100644
index 0000000000..20a39dc060
--- /dev/null
+++ b/submodules/ton/tonlib-src/tdutils/td/utils/StealingQueue.h
@@ -0,0 +1,124 @@
+/*
+    This file is part of TON Blockchain Library.
+
+    TON Blockchain Library is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Lesser General Public License as published by
+    the Free Software Foundation, either version 2 of the License, or
+    (at your option) any later version.
+
+    TON Blockchain Library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public License
+    along with TON Blockchain Library.  If not, see <http://www.gnu.org/licenses/>.
+
+    Copyright 2019-2020 Telegram Systems LLP
+*/
+#pragma once
+
+#include "td/utils/Status.h"
+#include "td/utils/Span.h"
+namespace td {
+template <class T, size_t N = 256 /*must be a power of two*/>
+class StealingQueue {
+ public:
+  // tries to put a value
+  // returns if succeeded
+  // only owner is alowed to to do this
+  template <class F>
+  void local_push(T value, F&& overflow_f) {
+    while (true) {
+      auto tail = tail_.load(std::memory_order_relaxed);
+      auto head = head_.load();  //TODO: memory order
+
+      if (static_cast<size_t>(tail - head) < N) {
+        buf_[tail & MASK].store(value, std::memory_order_relaxed);
+        tail_.store(tail + 1, std::memory_order_release);
+        return;
+      }
+
+      // queue is full
+      // TODO: batch insert into global queue?
+      auto n = N / 2 + 1;
+      auto new_head = head + n;
+      if (!head_.compare_exchange_strong(head, new_head)) {
+        continue;
+      }
+
+      for (size_t i = 0; i < n; i++) {
+        overflow_f(buf_[(i + head) & MASK].load(std::memory_order_relaxed));
+      }
+      overflow_f(value);
+
+      return;
+    }
+  }
+
+  // tries to pop a value
+  // returns if succeeded
+  // only owner is alowed to to do this
+  bool local_pop(T& value) {
+    auto tail = tail_.load(std::memory_order_relaxed);
+    auto head = head_.load();
+
+    if (head == tail) {
+      return false;
+    }
+
+    value = buf_[head & MASK].load(std::memory_order_relaxed);
+    return head_.compare_exchange_strong(head, head + 1);
+  }
+
+  bool steal(T& value, StealingQueue<T, N>& other) {
+    while (true) {
+      auto tail = tail_.load(std::memory_order_relaxed);
+      auto head = head_.load();  //TODO: memory order
+
+      auto other_head = other.head_.load();
+      auto other_tail = other.tail_.load(std::memory_order_acquire);
+
+      if (other_tail < other_head) {
+        continue;
+      }
+      size_t n = other_tail - other_head;
+      if (n > N) {
+        continue;
+      }
+      n -= n / 2;
+      n = td::min(n, static_cast<size_t>(head + N - tail));
+      if (n == 0) {
+        return false;
+      }
+
+      for (size_t i = 0; i < n; i++) {
+        buf_[(i + tail) & MASK].store(other.buf_[(i + other_head) & MASK].load(std::memory_order_relaxed),
+                                      std::memory_order_relaxed);
+      }
+
+      if (!other.head_.compare_exchange_strong(other_head, other_head + n)) {
+        continue;
+      }
+
+      n--;
+      value = buf_[(tail + n) & MASK].load(std::memory_order_relaxed);
+      tail_.store(tail + n, std::memory_order_release);
+      return true;
+    }
+  }
+
+  StealingQueue() {
+    for (auto& x : buf_) {
+      x.store(T{}, std::memory_order_relaxed);
+    }
+    std::atomic_thread_fence(std::memory_order_seq_cst);
+  }
+
+ private:
+  std::atomic<td::int64> head_{0};
+  std::atomic<td::int64> tail_{0};
+  static constexpr size_t MASK{N - 1};
+  std::array<std::atomic<T>, N> buf_;
+};
+};  // namespace td
diff --git a/submodules/ton/tonlib-src/tdutils/td/utils/StringBuilder.h b/submodules/ton/tonlib-src/tdutils/td/utils/StringBuilder.h
index 229b967e80..5fe1e94219 100644
--- a/submodules/ton/tonlib-src/tdutils/td/utils/StringBuilder.h
+++ b/submodules/ton/tonlib-src/tdutils/td/utils/StringBuilder.h
@@ -14,7 +14,7 @@
     You should have received a copy of the GNU Lesser General Public License
     along with TON Blockchain Library.  If not, see <http://www.gnu.org/licenses/>.
 
-    Copyright 2017-2019 Telegram Systems LLP
+    Copyright 2017-2020 Telegram Systems LLP
 */
 #pragma once
 
diff --git a/submodules/ton/tonlib-src/tdutils/td/utils/TsFileLog.cpp b/submodules/ton/tonlib-src/tdutils/td/utils/TsFileLog.cpp
index e36b4fc50d..865faa4b46 100644
--- a/submodules/ton/tonlib-src/tdutils/td/utils/TsFileLog.cpp
+++ b/submodules/ton/tonlib-src/tdutils/td/utils/TsFileLog.cpp
@@ -14,7 +14,7 @@
     You should have received a copy of the GNU Lesser General Public License
     along with TON Blockchain Library.  If not, see <http://www.gnu.org/licenses/>.
 
-    Copyright 2017-2019 Telegram Systems LLP
+    Copyright 2017-2020 Telegram Systems LLP
 */
 #include "TsFileLog.h"
 
@@ -24,8 +24,10 @@ namespace td {
 namespace detail {
 class TsFileLog : public LogInterface {
  public:
-  Status init(string path) {
+  Status init(string path, td::int64 rotate_threshold, bool redirect_stderr) {
     path_ = std::move(path);
+    rotate_threshold_ = rotate_threshold;
+    redirect_stderr_ = redirect_stderr;
     for (int i = 0; i < (int)logs_.size(); i++) {
       logs_[i].id = i;
     }
@@ -54,6 +56,8 @@ class TsFileLog : public LogInterface {
     int id;
   };
   static constexpr int MAX_THREAD_ID = 128;
+  td::int64 rotate_threshold_;
+  bool redirect_stderr_;
   std::string path_;
   std::array<Info, MAX_THREAD_ID> logs_;
 
@@ -70,7 +74,7 @@ class TsFileLog : public LogInterface {
   }
 
   Status init_info(Info *info) {
-    TRY_STATUS(info->log.init(get_path(info), std::numeric_limits<int64>::max(), info->id == 0));
+    TRY_STATUS(info->log.init(get_path(info), std::numeric_limits<int64>::max(), info->id == 0 && redirect_stderr_));
     info->is_inited = true;
     return Status::OK();
   }
@@ -92,9 +96,9 @@ class TsFileLog : public LogInterface {
 };
 }  // namespace detail
 
-Result<td::unique_ptr<LogInterface>> TsFileLog::create(string path) {
+Result<td::unique_ptr<LogInterface>> TsFileLog::create(string path, td::int64 rotate_threshold, bool redirect_stderr) {
   auto res = td::make_unique<detail::TsFileLog>();
-  TRY_STATUS(res->init(path));
+  TRY_STATUS(res->init(path, rotate_threshold, redirect_stderr));
   return std::move(res);
 }
 }  // namespace td
diff --git a/submodules/ton/tonlib-src/tdutils/td/utils/TsFileLog.h b/submodules/ton/tonlib-src/tdutils/td/utils/TsFileLog.h
index a34572af51..0ebac8ebff 100644
--- a/submodules/ton/tonlib-src/tdutils/td/utils/TsFileLog.h
+++ b/submodules/ton/tonlib-src/tdutils/td/utils/TsFileLog.h
@@ -14,7 +14,7 @@
     You should have received a copy of the GNU Lesser General Public License
     along with TON Blockchain Library.  If not, see <http://www.gnu.org/licenses/>.
 
-    Copyright 2017-2019 Telegram Systems LLP
+    Copyright 2017-2020 Telegram Systems LLP
 */
 #pragma once
 
@@ -22,7 +22,10 @@
 
 namespace td {
 class TsFileLog {
+  static constexpr int64 DEFAULT_ROTATE_THRESHOLD = 10 * (1 << 20);
+
  public:
-  static Result<td::unique_ptr<LogInterface>> create(string path);
+  static Result<td::unique_ptr<LogInterface>> create(string path, int64 rotate_threshold = DEFAULT_ROTATE_THRESHOLD,
+                                                     bool redirect_stderr = true);
 };
 }  // namespace td
diff --git a/submodules/ton/tonlib-src/tdutils/td/utils/Variant.h b/submodules/ton/tonlib-src/tdutils/td/utils/Variant.h
index 30777a164a..708fc1cb66 100644
--- a/submodules/ton/tonlib-src/tdutils/td/utils/Variant.h
+++ b/submodules/ton/tonlib-src/tdutils/td/utils/Variant.h
@@ -14,7 +14,7 @@
     You should have received a copy of the GNU Lesser General Public License
     along with TON Blockchain Library.  If not, see <http://www.gnu.org/licenses/>.
 
-    Copyright 2017-2019 Telegram Systems LLP
+    Copyright 2017-2020 Telegram Systems LLP
 */
 #pragma once
 
@@ -253,6 +253,10 @@ class Variant {
     return offset_;
   }
 
+  bool empty() const {
+    return offset_ == npos;
+  }
+
  private:
   union {
     int64 align_;
diff --git a/submodules/ton/tonlib-src/tdutils/td/utils/base64.cpp b/submodules/ton/tonlib-src/tdutils/td/utils/base64.cpp
index 67874d2141..356b3af388 100644
--- a/submodules/ton/tonlib-src/tdutils/td/utils/base64.cpp
+++ b/submodules/ton/tonlib-src/tdutils/td/utils/base64.cpp
@@ -14,7 +14,7 @@
     You should have received a copy of the GNU Lesser General Public License
     along with TON Blockchain Library.  If not, see <http://www.gnu.org/licenses/>.
 
-    Copyright 2017-2019 Telegram Systems LLP
+    Copyright 2017-2020 Telegram Systems LLP
 */
 #include "td/utils/base64.h"
 
@@ -30,6 +30,68 @@
 namespace td {
 //TODO: fix copypaste
 
+static const char *const symbols32_lc = "abcdefghijklmnopqrstuvwxyz234567";
+static const char *const symbols32_uc = "ABCDEFGHIJKLMNOPQRSTUVWXYZ234567";
+
+string base32_encode(Slice input, bool upper_case) {
+  auto *symbols32 = (upper_case ? symbols32_uc : symbols32_lc);
+  string base32;
+  base32.reserve((input.size() * 8 + 4) / 5);
+  uint32 c = 0;
+  uint32 length = 0;
+  for (size_t i = 0; i < input.size(); i++) {
+    c = (c << 8) | input.ubegin()[i];
+    length += 8;
+    while (length >= 5) {
+      length -= 5;
+      base32.push_back(symbols32[(c >> length) & 31]);
+    }
+  }
+  if (length != 0) {
+    base32.push_back(symbols32[(c << (5 - length)) & 31]);
+  }
+  //TODO: optional padding
+  return base32;
+}
+
+static unsigned char b32_char_to_value[256];
+static void init_base32_table() {
+  static bool is_inited = [] {
+    std::fill(std::begin(b32_char_to_value), std::end(b32_char_to_value), static_cast<unsigned char>(32));
+    for (unsigned char i = 0; i < 32; i++) {
+      b32_char_to_value[static_cast<size_t>(symbols32_lc[i])] = i;
+      b32_char_to_value[static_cast<size_t>(symbols32_uc[i])] = i;
+    }
+    return true;
+  }();
+  CHECK(is_inited);
+}
+
+Result<string> base32_decode(Slice base32) {
+  init_base32_table();
+  string res;
+  res.reserve(base32.size() * 5 / 8);
+  uint32 c = 0;
+  uint32 length = 0;
+  for (size_t i = 0; i < base32.size(); i++) {
+    auto value = b32_char_to_value[base32.ubegin()[i]];
+    if (value == 32) {
+      return Status::Error("Wrong character in the string");
+    }
+    c = (c << 5) | value;
+    length += 5;
+    while (length >= 8) {
+      length -= 8;
+      res.push_back(td::uint8((c >> length) & 255));
+    }
+  }
+  if ((c & ((1 << length) - 1)) != 0) {
+    return Status::Error("Nonzero padding");
+  }
+  //TODO: check padding
+  return res;
+}
+
 static const char *const symbols64 = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
 
 string base64_encode(Slice input) {
diff --git a/submodules/ton/tonlib-src/tdutils/td/utils/base64.h b/submodules/ton/tonlib-src/tdutils/td/utils/base64.h
index f17cf3eb7c..bf46a83541 100644
--- a/submodules/ton/tonlib-src/tdutils/td/utils/base64.h
+++ b/submodules/ton/tonlib-src/tdutils/td/utils/base64.h
@@ -14,7 +14,7 @@
     You should have received a copy of the GNU Lesser General Public License
     along with TON Blockchain Library.  If not, see <http://www.gnu.org/licenses/>.
 
-    Copyright 2017-2019 Telegram Systems LLP
+    Copyright 2017-2020 Telegram Systems LLP
 */
 #pragma once
 
@@ -37,4 +37,7 @@ bool is_base64url(Slice input);
 
 string base64_filter(Slice input);
 
+string base32_encode(Slice input, bool upper_case = false);
+Result<string> base32_decode(Slice base32);
+
 }  // namespace td
diff --git a/submodules/ton/tonlib-src/tdutils/td/utils/bits.h b/submodules/ton/tonlib-src/tdutils/td/utils/bits.h
index d4ab932e31..1197b9db23 100644
--- a/submodules/ton/tonlib-src/tdutils/td/utils/bits.h
+++ b/submodules/ton/tonlib-src/tdutils/td/utils/bits.h
@@ -139,7 +139,13 @@ inline uint64 bswap64(uint64 x) {
 }
 
 inline int32 count_bits32(uint32 x) {
-  return __popcnt(x);
+  // Do not use __popcnt because it will fail on some platforms.
+  x -= (x >> 1) & 0x55555555;
+  x = (x & 0x33333333) + ((x >> 2) & 0x33333333);
+  x = (x + (x >> 4)) & 0x0F0F0F0F;
+  x += x >> 8;
+  return (x + (x >> 16)) & 0x3F;
+  //return __popcnt(x);
 }
 
 inline int32 count_bits64(uint64 x) {
diff --git a/submodules/ton/tonlib-src/tdutils/td/utils/misc.h b/submodules/ton/tonlib-src/tdutils/td/utils/misc.h
index d747313eb8..ceba11daae 100644
--- a/submodules/ton/tonlib-src/tdutils/td/utils/misc.h
+++ b/submodules/ton/tonlib-src/tdutils/td/utils/misc.h
@@ -14,7 +14,7 @@
     You should have received a copy of the GNU Lesser General Public License
     along with TON Blockchain Library.  If not, see <http://www.gnu.org/licenses/>.
 
-    Copyright 2017-2019 Telegram Systems LLP
+    Copyright 2017-2020 Telegram Systems LLP
 */
 #pragma once
 
@@ -44,12 +44,12 @@ std::pair<T, T> split(T s, char delimiter = ' ') {
 }
 
 template <class T>
-vector<T> full_split(T s, char delimiter = ' ') {
+vector<T> full_split(T s, char delimiter = ' ', size_t max_parts = std::numeric_limits<size_t>::max()) {
   vector<T> result;
   if (s.empty()) {
     return result;
   }
-  while (true) {
+  while (result.size() + 1 < max_parts) {
     auto delimiter_pos = s.find(delimiter);
     if (delimiter_pos == string::npos) {
       result.push_back(std::move(s));
@@ -59,6 +59,8 @@ vector<T> full_split(T s, char delimiter = ' ') {
       s = s.substr(delimiter_pos + 1);
     }
   }
+  result.push_back(std::move(s));
+  return result;
 }
 
 string implode(const vector<string> &v, char delimiter = ' ');
@@ -301,6 +303,20 @@ typename std::enable_if<std::is_unsigned<T>::value, T>::type hex_to_integer(Slic
   return integer_value;
 }
 
+template <class T>
+Result<typename std::enable_if<std::is_unsigned<T>::value, T>::type> hex_to_integer_safe(Slice str) {
+  T integer_value = 0;
+  auto begin = str.begin();
+  auto end = str.end();
+  while (begin != end) {
+    if (!is_hex_digit(*begin)) {
+      return Status::Error("not a hex digit");
+    }
+    integer_value = static_cast<T>(integer_value * 16 + hex_to_int(*begin++));
+  }
+  return integer_value;
+}
+
 double to_double(Slice str);
 
 template <class T>
diff --git a/submodules/ton/tonlib-src/tdutils/td/utils/optional.h b/submodules/ton/tonlib-src/tdutils/td/utils/optional.h
index 7da14b6294..3eb2d51822 100644
--- a/submodules/ton/tonlib-src/tdutils/td/utils/optional.h
+++ b/submodules/ton/tonlib-src/tdutils/td/utils/optional.h
@@ -14,7 +14,7 @@
     You should have received a copy of the GNU Lesser General Public License
     along with TON Blockchain Library.  If not, see <http://www.gnu.org/licenses/>.
 
-    Copyright 2017-2019 Telegram Systems LLP
+    Copyright 2017-2020 Telegram Systems LLP
 */
 #pragma once
 
@@ -74,6 +74,13 @@ class optional {
     return res;
   }
 
+  td::optional<T> copy() const {
+    if (*this) {
+      return value();
+    }
+    return {};
+  }
+
   template <class... ArgsT>
   void emplace(ArgsT &&... args) {
     impl_.emplace(std::forward<ArgsT>(args)...);
diff --git a/submodules/ton/tonlib-src/tdutils/td/utils/port/detail/Epoll.cpp b/submodules/ton/tonlib-src/tdutils/td/utils/port/detail/Epoll.cpp
index e72b39143d..ca89db4c8a 100644
--- a/submodules/ton/tonlib-src/tdutils/td/utils/port/detail/Epoll.cpp
+++ b/submodules/ton/tonlib-src/tdutils/td/utils/port/detail/Epoll.cpp
@@ -14,7 +14,7 @@
     You should have received a copy of the GNU Lesser General Public License
     along with TON Blockchain Library.  If not, see <http://www.gnu.org/licenses/>.
 
-    Copyright 2017-2019 Telegram Systems LLP
+    Copyright 2017-2020 Telegram Systems LLP
 */
 #include "td/utils/port/detail/Epoll.h"
 
@@ -109,6 +109,7 @@ void Epoll::run(int timeout_ms) {
 #ifdef EPOLLRDHUP
     if (event->events & EPOLLRDHUP) {
       event->events &= ~EPOLLRDHUP;
+      flags = flags | PollFlags::Close();
       //      flags |= Fd::Close;
       // TODO
     }
diff --git a/submodules/ton/tonlib-src/tdutils/td/utils/port/rlimit.cpp b/submodules/ton/tonlib-src/tdutils/td/utils/port/rlimit.cpp
new file mode 100644
index 0000000000..5833961c89
--- /dev/null
+++ b/submodules/ton/tonlib-src/tdutils/td/utils/port/rlimit.cpp
@@ -0,0 +1,102 @@
+/*
+    This file is part of TON Blockchain Library.
+
+    TON Blockchain Library is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Lesser General Public License as published by
+    the Free Software Foundation, either version 2 of the License, or
+    (at your option) any later version.
+
+    TON Blockchain Library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public License
+    along with TON Blockchain Library.  If not, see <http://www.gnu.org/licenses/>.
+
+    Copyright 2019-2020 Telegram Systems LLP
+*/
+#include "rlimit.h"
+#if TD_LINUX || TD_ANDROID
+#include <unistd.h>
+#include <sys/types.h>
+#include <sys/time.h>
+#include <sys/resource.h>
+#endif
+
+namespace td {
+
+#if TD_PORT_POSIX
+
+namespace {
+
+int get_rlimit_type(RlimitType rlim_type) {
+  switch (rlim_type) {
+    case RlimitType::nofile:
+      return RLIMIT_NOFILE;
+    case RlimitType::rss:
+      return RLIMIT_RSS;
+    default:
+      UNREACHABLE();
+  }
+}
+
+}  // namespace
+
+td::Status change_rlimit(RlimitType rlim_type, td::uint64 value, td::uint64 cap) {
+  if (cap && value > cap) {
+    return td::Status::Error("setrlimit(): bad argument");
+  }
+  int resource = get_rlimit_type(rlim_type);
+
+  struct rlimit r;
+  if (getrlimit(resource, &r) < 0) {
+    return td::Status::PosixError(errno, "failed getrlimit()");
+  }
+
+  if (cap) {
+    r.rlim_max = cap;
+  } else if (r.rlim_max < value) {
+    r.rlim_max = value;
+  }
+  r.rlim_cur = value;
+  if (setrlimit(resource, &r) < 0) {
+    return td::Status::PosixError(errno, "failed setrlimit()");
+  }
+  return td::Status::OK();
+}
+
+td::Status change_maximize_rlimit(RlimitType rlim_type, td::uint64 value) {
+  int resource = get_rlimit_type(rlim_type);
+
+  struct rlimit r;
+  if (getrlimit(resource, &r) < 0) {
+    return td::Status::PosixError(errno, "failed getrlimit()");
+  }
+
+  if (r.rlim_max < value) {
+    auto t = r;
+    t.rlim_cur = value;
+    t.rlim_max = value;
+    if (setrlimit(resource, &t) >= 0) {
+      return td::Status::OK();
+    }
+  }
+
+  r.rlim_cur = value < r.rlim_max ? value : r.rlim_max;
+  if (setrlimit(resource, &r) < 0) {
+    return td::Status::PosixError(errno, "failed setrlimit()");
+  }
+  return td::Status::OK();
+}
+#else
+td::Status change_rlimit(RlimitType rlim, td::uint64 value) {
+  return td::Status::Error("setrlimit not implemented on WINDOWS");
+}
+td::Status change_maximize_rlimit(RlimitType rlim, td::uint64 value) {
+  return td::Status::OK();
+}
+#endif
+
+}  // namespace td
+
diff --git a/submodules/ton/tonlib-src/tdutils/td/utils/port/rlimit.h b/submodules/ton/tonlib-src/tdutils/td/utils/port/rlimit.h
new file mode 100644
index 0000000000..9f6a652463
--- /dev/null
+++ b/submodules/ton/tonlib-src/tdutils/td/utils/port/rlimit.h
@@ -0,0 +1,32 @@
+/*
+    This file is part of TON Blockchain Library.
+
+    TON Blockchain Library is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Lesser General Public License as published by
+    the Free Software Foundation, either version 2 of the License, or
+    (at your option) any later version.
+
+    TON Blockchain Library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public License
+    along with TON Blockchain Library.  If not, see <http://www.gnu.org/licenses/>.
+
+    Copyright 2017-2020 Telegram Systems LLP
+*/
+#pragma once
+
+#include "td/utils/port/config.h"
+#include "td/utils/port/platform.h"
+#include "td/utils/Status.h"
+
+namespace td {
+
+enum class RlimitType { nofile, rss };
+
+td::Status change_rlimit(RlimitType rlim_type, td::uint64 value, td::uint64 cap = 0);
+td::Status change_maximize_rlimit(RlimitType rlim, td::uint64 value);
+
+}  // namespace td
diff --git a/submodules/ton/tonlib-src/tdutils/td/utils/port/user.cpp b/submodules/ton/tonlib-src/tdutils/td/utils/port/user.cpp
index 859bb70311..2e77eff87f 100644
--- a/submodules/ton/tonlib-src/tdutils/td/utils/port/user.cpp
+++ b/submodules/ton/tonlib-src/tdutils/td/utils/port/user.cpp
@@ -1,3 +1,21 @@
+/*
+    This file is part of TON Blockchain Library.
+
+    TON Blockchain Library is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Lesser General Public License as published by
+    the Free Software Foundation, either version 2 of the License, or
+    (at your option) any later version.
+
+    TON Blockchain Library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public License
+    along with TON Blockchain Library.  If not, see <http://www.gnu.org/licenses/>.
+
+    Copyright 2017-2020 Telegram Systems LLP
+*/
 #include "user.h"
 #if TD_LINUX
 #include <unistd.h>
diff --git a/submodules/ton/tonlib-src/tdutils/td/utils/port/user.h b/submodules/ton/tonlib-src/tdutils/td/utils/port/user.h
index 4c5d48a457..9c53c2fc2c 100644
--- a/submodules/ton/tonlib-src/tdutils/td/utils/port/user.h
+++ b/submodules/ton/tonlib-src/tdutils/td/utils/port/user.h
@@ -1,3 +1,21 @@
+/*
+    This file is part of TON Blockchain Library.
+
+    TON Blockchain Library is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Lesser General Public License as published by
+    the Free Software Foundation, either version 2 of the License, or
+    (at your option) any later version.
+
+    TON Blockchain Library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public License
+    along with TON Blockchain Library.  If not, see <http://www.gnu.org/licenses/>.
+
+    Copyright 2017-2020 Telegram Systems LLP
+*/
 #pragma once
 
 #include "td/utils/port/config.h"
diff --git a/submodules/ton/tonlib-src/tdutils/test/MpmcWaiter.cpp b/submodules/ton/tonlib-src/tdutils/test/MpmcWaiter.cpp
index cf75b5252d..9cb5b3635b 100644
--- a/submodules/ton/tonlib-src/tdutils/test/MpmcWaiter.cpp
+++ b/submodules/ton/tonlib-src/tdutils/test/MpmcWaiter.cpp
@@ -14,7 +14,7 @@
     You should have received a copy of the GNU Lesser General Public License
     along with TON Blockchain Library.  If not, see <http://www.gnu.org/licenses/>.
 
-    Copyright 2017-2019 Telegram Systems LLP
+    Copyright 2017-2020 Telegram Systems LLP
 */
 #include "td/utils/MpmcWaiter.h"
 #include "td/utils/port/sleep.h"
@@ -25,21 +25,22 @@
 #include <atomic>
 
 #if !TD_THREAD_UNSUPPORTED
-TEST(MpmcWaiter, stress_one_one) {
+template <class W>
+void test_waiter_stress_one_one() {
   td::Stage run;
   td::Stage check;
 
   std::vector<td::thread> threads;
   std::atomic<size_t> value{0};
   size_t write_cnt = 10;
-  td::unique_ptr<td::MpmcWaiter> waiter;
+  td::unique_ptr<W> waiter;
   size_t threads_n = 2;
   for (size_t i = 0; i < threads_n; i++) {
     threads.push_back(td::thread([&, id = static_cast<td::uint32>(i)] {
       for (td::uint64 round = 1; round < 100000; round++) {
         if (id == 0) {
           value = 0;
-          waiter = td::make_unique<td::MpmcWaiter>();
+          waiter = td::make_unique<W>();
           write_cnt = td::Random::fast(1, 10);
         }
         run.wait(round * threads_n);
@@ -49,17 +50,19 @@ TEST(MpmcWaiter, stress_one_one) {
             waiter->notify();
           }
         } else {
-          int yields = 0;
+          typename W::Slot slot;
+          waiter->init_slot(slot, id);
           for (size_t i = 1; i <= write_cnt; i++) {
             while (true) {
               auto x = value.load(std::memory_order_relaxed);
               if (x >= i) {
                 break;
               }
-              yields = waiter->wait(yields, id);
+              waiter->wait(slot);
             }
-            yields = waiter->stop_wait(yields, id);
+            waiter->stop_wait(slot);
           }
+          waiter->stop_wait(slot);
         }
         check.wait(round * threads_n);
       }
@@ -69,7 +72,15 @@ TEST(MpmcWaiter, stress_one_one) {
     thread.join();
   }
 }
-TEST(MpmcWaiter, stress) {
+TEST(MpmcEagerWaiter, stress_one_one) {
+  test_waiter_stress_one_one<td::MpmcEagerWaiter>();
+}
+TEST(MpmcSleepyWaiter, stress_one_one) {
+  test_waiter_stress_one_one<td::MpmcSleepyWaiter>();
+}
+
+template <class W>
+void test_waiter_stress() {
   td::Stage run;
   td::Stage check;
 
@@ -81,7 +92,7 @@ TEST(MpmcWaiter, stress) {
   size_t end_pos;
   size_t write_cnt;
   size_t threads_n = 20;
-  td::unique_ptr<td::MpmcWaiter> waiter;
+  td::unique_ptr<W> waiter;
   for (size_t i = 0; i < threads_n; i++) {
     threads.push_back(td::thread([&, id = static_cast<td::uint32>(i)] {
       for (td::uint64 round = 1; round < 1000; round++) {
@@ -92,7 +103,7 @@ TEST(MpmcWaiter, stress) {
           end_pos = write_n * write_cnt;
           write_pos = 0;
           read_pos = 0;
-          waiter = td::make_unique<td::MpmcWaiter>();
+          waiter = td::make_unique<W>();
         }
         run.wait(round * threads_n);
         if (id <= write_n) {
@@ -104,21 +115,26 @@ TEST(MpmcWaiter, stress) {
             waiter->notify();
           }
         } else if (id > 10 && id - 10 <= read_n) {
-          int yields = 0;
+          typename W::Slot slot;
+          waiter->init_slot(slot, id);
           while (true) {
             auto x = read_pos.load(std::memory_order_relaxed);
             if (x == end_pos) {
+              waiter->stop_wait(slot);
               break;
             }
             if (x == write_pos.load(std::memory_order_relaxed)) {
-              yields = waiter->wait(yields, id);
+              waiter->wait(slot);
               continue;
             }
-            yields = waiter->stop_wait(yields, id);
+            waiter->stop_wait(slot);
             read_pos.compare_exchange_strong(x, x + 1, std::memory_order_relaxed);
           }
         }
         check.wait(round * threads_n);
+        if (id == 0) {
+          waiter->close();
+        }
       }
     }));
   }
@@ -126,4 +142,10 @@ TEST(MpmcWaiter, stress) {
     thread.join();
   }
 }
+TEST(MpmcEagerWaiter, stress_multi) {
+  test_waiter_stress<td::MpmcEagerWaiter>();
+}
+TEST(MpmcSleepyWaiter, stress_multi) {
+  test_waiter_stress<td::MpmcSleepyWaiter>();
+}
 #endif  // !TD_THREAD_UNSUPPORTED
diff --git a/submodules/ton/tonlib-src/tdutils/test/StealingQueue.cpp b/submodules/ton/tonlib-src/tdutils/test/StealingQueue.cpp
new file mode 100644
index 0000000000..6aa2aae6ba
--- /dev/null
+++ b/submodules/ton/tonlib-src/tdutils/test/StealingQueue.cpp
@@ -0,0 +1,153 @@
+/*
+    This file is part of TON Blockchain source code.
+
+    TON Blockchain is free software; you can redistribute it and/or
+    modify it under the terms of the GNU General Public License
+    as published by the Free Software Foundation; either version 2
+    of the License, or (at your option) any later version.
+
+    TON Blockchain is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with TON Blockchain.  If not, see <http://www.gnu.org/licenses/>.
+
+    In addition, as a special exception, the copyright holders give permission
+    to link the code of portions of this program with the OpenSSL library.
+    You must obey the GNU General Public License in all respects for all
+    of the code used other than OpenSSL. If you modify file(s) with this
+    exception, you may extend this exception to your version of the file(s),
+    but you are not obligated to do so. If you do not wish to do so, delete this
+    exception statement from your version. If you delete this exception statement
+    from all source files in the program, then also delete it here.
+
+    Copyright 2019-2020 Telegram Systems LLP
+*/
+#include "td/utils/tests.h"
+#include "td/utils/benchmark.h"
+
+#include "td/utils/StealingQueue.h"
+#include "td/utils/MpmcQueue.h"
+
+namespace td {
+TEST(StealingQueue, very_simple) {
+  StealingQueue<int, 8> q;
+  q.local_push(1, [](auto x) { UNREACHABLE(); });
+  int x;
+  CHECK(q.local_pop(x));
+  ASSERT_EQ(1, x);
+}
+TEST(AtomicRead, simple) {
+  td::Stage run;
+  td::Stage check;
+
+  size_t threads_n = 10;
+  std::vector<td::thread> threads;
+
+  int x{0};
+  std::atomic<int> version{0};
+
+  int64 res = 0;
+  for (size_t i = 0; i < threads_n; i++) {
+    threads.push_back(td::thread([&, id = static_cast<uint32>(i)] {
+      for (uint64 round = 1; round < 10000; round++) {
+        if (id == 0) {
+        }
+        run.wait(round * threads_n);
+        if (id == 0) {
+          version++;
+          x++;
+          version++;
+        } else {
+          int y = 0;
+          auto v1 = version.load();
+          y = x;
+          auto v2 = version.load();
+          if (v1 == v2 && v1 % 2 == 0) {
+            res += y;
+          }
+        }
+
+        check.wait(round * threads_n);
+      }
+    }));
+  }
+  td::do_not_optimize_away(res);
+  for (auto &thread : threads) {
+    thread.join();
+  }
+}
+TEST(StealingQueue, simple) {
+  uint64 sum;
+  std::atomic<uint64> got_sum;
+
+  td::Stage run;
+  td::Stage check;
+
+  size_t threads_n = 10;
+  std::vector<td::thread> threads;
+  std::vector<StealingQueue<int, 8>> lq(threads_n);
+  MpmcQueue<int> gq(threads_n);
+
+  constexpr uint64 XN = 20;
+  uint64 x_sum[XN];
+  x_sum[0] = 0;
+  x_sum[1] = 1;
+  for (uint64 i = 2; i < XN; i++) {
+    x_sum[i] = i + x_sum[i - 1] + x_sum[i - 2];
+  }
+
+  td::Random::Xorshift128plus rnd(123);
+  for (size_t i = 0; i < threads_n; i++) {
+    threads.push_back(td::thread([&, id = static_cast<uint32>(i)] {
+      for (uint64 round = 1; round < 10000; round++) {
+        if (id == 0) {
+          sum = 0;
+          int n = rnd() % 5;
+          for (int j = 0; j < n; j++) {
+            int x = rand() % XN;
+            sum += x_sum[x];
+            gq.push(x, id);
+          }
+          got_sum = 0;
+        }
+        run.wait(round * threads_n);
+        while (got_sum.load() != sum) {
+          auto x = [&] {
+            int res;
+            if (lq[id].local_pop(res)) {
+              return res;
+            }
+            if (gq.try_pop(res, id)) {
+              return res;
+            }
+            if (lq[id].steal(res, lq[rand() % threads_n])) {
+              //LOG(ERROR) << "STEAL";
+              return res;
+            }
+            return 0;
+          }();
+          if (x == 0) {
+            continue;
+          }
+          //LOG(ERROR) << x << " " << got_sum.load() << " " << sum;
+          got_sum.fetch_add(x, std::memory_order_relaxed);
+          lq[id].local_push(x - 1, [&](auto y) {
+            //LOG(ERROR) << "OVERFLOW";
+            gq.push(y, id);
+          });
+          if (x > 1) {
+            lq[id].local_push(x - 2, [&](auto y) { gq.push(y, id); });
+          }
+        }
+        check.wait(round * threads_n);
+      }
+    }));
+  }
+  for (auto &thread : threads) {
+    thread.join();
+  }
+}
+}  // namespace td
diff --git a/submodules/ton/tonlib-src/tdutils/test/log.cpp b/submodules/ton/tonlib-src/tdutils/test/log.cpp
index 99be2d59b5..707bb07084 100644
--- a/submodules/ton/tonlib-src/tdutils/test/log.cpp
+++ b/submodules/ton/tonlib-src/tdutils/test/log.cpp
@@ -14,7 +14,7 @@
     You should have received a copy of the GNU Lesser General Public License
     along with TON Blockchain Library.  If not, see <http://www.gnu.org/licenses/>.
 
-    Copyright 2017-2019 Telegram Systems LLP
+    Copyright 2017-2020 Telegram Systems LLP
 */
 #include "td/utils/tests.h"
 #include "td/utils/FileLog.h"
@@ -80,7 +80,8 @@ void bench_log(std::string name, int threads_n, F &&f) {
 };
 
 TEST(Log, TsLogger) {
-  bench_log("NewTsFileLog", 4, [] { return td::TsFileLog::create("tmplog").move_as_ok(); });
+  bench_log("NewTsFileLog", 4,
+            [] { return td::TsFileLog::create("tmplog", std::numeric_limits<td::int64>::max(), false).move_as_ok(); });
   bench_log("TsFileLog", 8, [] {
     class FileLog : public td::LogInterface {
      public:
diff --git a/submodules/ton/tonlib-src/tdutils/test/misc.cpp b/submodules/ton/tonlib-src/tdutils/test/misc.cpp
index b3c472507f..f43fcdcc5e 100644
--- a/submodules/ton/tonlib-src/tdutils/test/misc.cpp
+++ b/submodules/ton/tonlib-src/tdutils/test/misc.cpp
@@ -14,7 +14,7 @@
     You should have received a copy of the GNU Lesser General Public License
     along with TON Blockchain Library.  If not, see <http://www.gnu.org/licenses/>.
 
-    Copyright 2017-2019 Telegram Systems LLP
+    Copyright 2017-2020 Telegram Systems LLP
 */
 #include "td/utils/as.h"
 #include "td/utils/base64.h"
@@ -220,6 +220,26 @@ TEST(Misc, base64) {
               "Ojo7ISUiOw==");
 }
 
+TEST(Misc, base32) {
+  ASSERT_EQ("", base32_encode(""));
+  ASSERT_EQ("me", base32_encode("a"));
+  base32_decode("me").ensure();
+  ASSERT_EQ("mfra", base32_encode("ab"));
+  ASSERT_EQ("mfrgg", base32_encode("abc"));
+  ASSERT_EQ("mfrggza", base32_encode("abcd"));
+  ASSERT_EQ("mfrggzdg", base32_encode("abcdf"));
+  ASSERT_EQ("mfrggzdgm4", base32_encode("abcdfg"));
+  for (int l = 0; l < 300000; l += l / 20 + l / 1000 * 500 + 1) {
+    for (int t = 0; t < 10; t++) {
+      string s = rand_string(std::numeric_limits<char>::min(), std::numeric_limits<char>::max(), l);
+      auto encoded = base32_encode(s);
+      auto decoded = base32_decode(encoded);
+      ASSERT_TRUE(decoded.is_ok());
+      ASSERT_TRUE(decoded.ok() == s);
+    }
+  }
+}
+
 TEST(Misc, to_integer) {
   ASSERT_EQ(to_integer<int32>("-1234567"), -1234567);
   ASSERT_EQ(to_integer<int64>("-1234567"), -1234567);
@@ -570,6 +590,10 @@ static void test_full_split(Slice str, vector<Slice> expected) {
   ASSERT_EQ(expected, td::full_split(str));
 }
 
+static void test_full_split(Slice str, char c, size_t max_parts, vector<Slice> expected) {
+  ASSERT_EQ(expected, td::full_split(str, c, max_parts));
+}
+
 TEST(Misc, full_split) {
   test_full_split("", {});
   test_full_split(" ", {"", ""});
@@ -585,6 +609,7 @@ TEST(Misc, full_split) {
   test_full_split(" abcdef ", {"", "abcdef", ""});
   test_full_split(" ab cd ef ", {"", "ab", "cd", "ef", ""});
   test_full_split("  ab  cd  ef  ", {"", "", "ab", "", "cd", "", "ef", "", ""});
+  test_full_split("ab cd ef gh", ' ', 3, {"ab", "cd", "ef gh"});
 }
 
 TEST(Misc, StringBuilder) {
diff --git a/submodules/ton/tonlib-src/terminal/terminal.cpp b/submodules/ton/tonlib-src/terminal/terminal.cpp
index c0b44e557e..9b4ae37418 100644
--- a/submodules/ton/tonlib-src/terminal/terminal.cpp
+++ b/submodules/ton/tonlib-src/terminal/terminal.cpp
@@ -14,7 +14,7 @@
     You should have received a copy of the GNU Lesser General Public License
     along with TON Blockchain Library.  If not, see <http://www.gnu.org/licenses/>.
 
-    Copyright 2017-2019 Telegram Systems LLP
+    Copyright 2017-2020 Telegram Systems LLP
 */
 #include "terminal.hpp"
 #include "td/utils/port/StdStreams.h"
@@ -29,11 +29,11 @@
 namespace td {
 
 void TerminalLogInterface::append(CSlice slice, int log_level) {
-  auto instance_ = TerminalIOImpl::instance();
-  if (!instance_) {
+  auto instance = TerminalIOImpl::instance();
+  if (!instance) {
     default_log_interface->append(slice, log_level);
   } else {
-    instance_->deactivate_readline();
+    instance->deactivate_readline();
     std::string color;
     if (log_level == 0 || log_level == 1) {
       color = TC_RED;
@@ -43,7 +43,7 @@ void TerminalLogInterface::append(CSlice slice, int log_level) {
       color = TC_GREEN;
     }
     td::TsCerr() << color << slice << TC_EMPTY;
-    instance_->reactivate_readline();
+    instance->reactivate_readline();
     if (log_level == VERBOSITY_NAME(FATAL)) {
       process_fatal_error(slice);
     }
@@ -82,6 +82,16 @@ void TerminalIOImpl::output_line(std::string line) {
   reactivate_readline();
 }
 
+void TerminalIOImpl::output_line_stderr(std::string line) {
+  deactivate_readline();
+  if (use_readline_) {
+    Stdout().write(line).ensure();
+  } else {
+    Stderr().write(line).ensure();
+  }
+  reactivate_readline();
+}
+
 void TerminalIOImpl::start_up() {
   instance_ = this;
   self_ = actor_id(this);
@@ -206,17 +216,17 @@ void TerminalIOImpl::s_line(char *line) {
     LOG(FATAL) << "Closed";
     return;
   }
-  CHECK(instance_);
+  CHECK(instance);
   if (*line) {
     add_history(line);
   }
-  instance_->line_cb(line);
+  instance()->line_cb(line);
   rl_free(line);
 #endif
 }
 
 int TerminalIOImpl::s_stdin_getc(FILE *) {
-  return instance_->stdin_getc();
+  return instance()->stdin_getc();
 }
 
 void TerminalIOImpl::set_log_interface() {
@@ -240,32 +250,81 @@ void TerminalIOImpl::line_cb(std::string cmd) {
   cmd_queue_.push(td::BufferSlice{std::move(cmd)});
 }
 
-void TerminalIO::output(std::string line) {
-  auto instance_ = TerminalIOImpl::instance();
-  if (!instance_) {
-    std::cout << line;
-  } else {
-    instance_->deactivate_readline();
-    td::TsCerr() << line;
-    instance_->reactivate_readline();
+void TerminalIO::output_stdout(td::Slice slice, double max_wait) {
+  auto &fd = td::Stdout();
+  if (fd.empty()) {
+    return;
+  }
+  double end_time = 0;
+  while (!slice.empty()) {
+    auto res = fd.write(slice);
+    if (res.is_error()) {
+      if (res.error().code() == EPIPE) {
+        break;
+      }
+      // Resource temporary unavailable
+      if (end_time == 0) {
+        end_time = Time::now() + max_wait;
+      } else if (Time::now() > end_time) {
+        break;
+      }
+      continue;
+    }
+    slice.remove_prefix(res.ok());
   }
 }
 
+void TerminalIO::output(std::string line) {
+  output(td::Slice(line));
+}
+
 void TerminalIO::output(td::Slice line) {
-  auto instance_ = TerminalIOImpl::instance();
-  if (!instance_) {
+  auto instance = TerminalIOImpl::instance();
+  if (!instance) {
+    output_stdout(line, 10.0);
+  } else {
+    instance->deactivate_readline();
+    output_stdout(line, 10.0);
+    instance->reactivate_readline();
+  }
+}
+
+void TerminalIO::output_stderr(std::string line) {
+  output_stderr(td::Slice(line));
+}
+
+void TerminalIO::output_stderr(td::Slice line) {
+  auto instance = TerminalIOImpl::instance();
+  if (!instance) {
     td::TsCerr() << line;
   } else {
-    instance_->deactivate_readline();
-    td::TsCerr() << line;
-    instance_->reactivate_readline();
+    if (instance->readline_used()) {
+      instance->deactivate_readline();
+      output_stdout(line, 0.01);
+      instance->reactivate_readline();
+    } else {
+      td::TsCerr() << line;
+    }
+  }
+}
+
+void TerminalIOOutputter::flush() {
+  if (buffer_) {
+    CHECK(sb_);
+    if (!sb_->as_cslice().empty()) {
+      if (is_err_) {
+        TerminalIO::output_stderr(sb_->as_cslice());
+      } else {
+        TerminalIO::output(sb_->as_cslice());
+      }
+    }
+    sb_->clear();
   }
 }
 
 TerminalIOOutputter::~TerminalIOOutputter() {
   if (buffer_) {
-    CHECK(sb_);
-    TerminalIO::output(sb_->as_cslice());
+    flush();
     delete[] buffer_;
   }
 }
diff --git a/submodules/ton/tonlib-src/terminal/terminal.h b/submodules/ton/tonlib-src/terminal/terminal.h
index 49a7d7b324..baa5df2e7e 100644
--- a/submodules/ton/tonlib-src/terminal/terminal.h
+++ b/submodules/ton/tonlib-src/terminal/terminal.h
@@ -14,7 +14,7 @@
     You should have received a copy of the GNU Lesser General Public License
     along with TON Blockchain Library.  If not, see <http://www.gnu.org/licenses/>.
 
-    Copyright 2017-2019 Telegram Systems LLP
+    Copyright 2017-2020 Telegram Systems LLP
 */
 #pragma once
 
@@ -29,8 +29,10 @@ namespace td {
 class TerminalIOOutputter {
  public:
   static const size_t BUFFER_SIZE = 128 * 1024;
-  TerminalIOOutputter()
-      : buffer_(new char[BUFFER_SIZE]), sb_(std::make_unique<StringBuilder>(td::MutableSlice{buffer_, BUFFER_SIZE})) {
+  TerminalIOOutputter(bool is_err)
+      : buffer_(new char[BUFFER_SIZE])
+      , is_err_(is_err)
+      , sb_(std::make_unique<StringBuilder>(td::MutableSlice{buffer_, BUFFER_SIZE}, true)) {
   }
   TerminalIOOutputter(TerminalIOOutputter &&X) = default;
 
@@ -54,10 +56,12 @@ class TerminalIOOutputter {
   bool is_error() const {
     return sb_->is_error();
   }
+  void flush();
   ~TerminalIOOutputter();
 
  private:
   char *buffer_;
+  bool is_err_;
   std::unique_ptr<StringBuilder> sb_;
 };
 
@@ -75,11 +79,19 @@ class TerminalIO : public actor::Actor {
   virtual void update_callback(std::unique_ptr<Callback> callback) = 0;
   static void output(std::string line);
   static void output(td::Slice slice);
+  static void output_stderr(std::string line);
+  static void output_stderr(td::Slice slice);
+  static void output_stdout(td::Slice line, double max_wait);
   static TerminalIOOutputter out() {
-    return TerminalIOOutputter{};
+    return TerminalIOOutputter{false};
+  }
+  static TerminalIOOutputter err() {
+    return TerminalIOOutputter{true};
   }
   virtual void output_line(std::string line) = 0;
+  virtual void output_line_stderr(std::string line) = 0;
   virtual void set_log_interface() = 0;
+  virtual bool readline_used() const = 0;
 
   static td::actor::ActorOwn<TerminalIO> create(std::string prompt, bool use_readline,
                                                 std::unique_ptr<Callback> callback);
diff --git a/submodules/ton/tonlib-src/terminal/terminal.hpp b/submodules/ton/tonlib-src/terminal/terminal.hpp
index 637d753b45..481b7a5088 100644
--- a/submodules/ton/tonlib-src/terminal/terminal.hpp
+++ b/submodules/ton/tonlib-src/terminal/terminal.hpp
@@ -14,7 +14,7 @@
     You should have received a copy of the GNU Lesser General Public License
     along with TON Blockchain Library.  If not, see <http://www.gnu.org/licenses/>.
 
-    Copyright 2017-2019 Telegram Systems LLP
+    Copyright 2017-2020 Telegram Systems LLP
 */
 #pragma once
 
@@ -45,6 +45,10 @@ class TerminalIOImpl : public TerminalIO, td::ObserverBase {
   void deactivate_readline();
   void reactivate_readline();
   void output_line(std::string line) override;
+  void output_line_stderr(std::string line) override;
+  bool readline_used() const override {
+    return use_readline_;
+  }
   void set_log_interface() override;
   //void read_line();
   void loop() override;
diff --git a/submodules/ton/tonlib-src/test/regression-tests.ans b/submodules/ton/tonlib-src/test/regression-tests.ans
index 29e26328dc..f58e3ee10d 100644
--- a/submodules/ton/tonlib-src/test/regression-tests.ans
+++ b/submodules/ton/tonlib-src/test/regression-tests.ans
@@ -7,7 +7,7 @@ Test_Fift_bug_newlize_default e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca4
 Test_Fift_bug_ufits_default 51bf5a9f1ed7633a193f6fdd17a7a3af8e032dfe72a9669c85e8639aa8a7c195
 Test_Fift_contfrac_default 09ebce5c91bcb70696c6fb6981d82dc3b9e3444dab608a7a1b044c0ddd778a96
 Test_Fift_test_default 4e44b3382963ec89f7b5c8f2ebd85da3bc8aebad5b49f5b11b14075061477b4d
-Test_Fift_test_dict_default 480d22a6ec25a232febf4eec8ff64747573f79721327e7ff3b1aa7ea4921bbb4
+Test_Fift_test_dict_default a9c8cbcfdece5573185022cea07f59f1bc404e5d879e5157a5745757f8ee0525
 Test_Fift_test_fixed_default 278a19d56b773102caf5c1fe2997ea6c8d0d9e720eff8503feede6398a197eec
 Test_Fift_test_sort2_default 9b57d47e6a10e7d1bbb565db35400debf2f963031f434742a702ec76555a5d3a
 Test_Fift_test_sort_default 9b57d47e6a10e7d1bbb565db35400debf2f963031f434742a702ec76555a5d3a
@@ -15,15 +15,15 @@ Test_Fift_testvm2_default 8a6e35fc0224398be9d2de39d31c86ea96965ef1eca2aa9e0af230
 Test_Fift_testvm3_default 3c1b77471c5fd914ed8b5f528b9faed618e278693f5030b953ff150e543864ae
 Test_Fift_testvm4_default 8a6e35fc0224398be9d2de39d31c86ea96965ef1eca2aa9e0af2303150ed4a7b
 Test_Fift_testvm4a_default 523b561d6bf2f5ebb26a755e687bfbda8e33462c98e9978119755f79a086cf5e
-Test_Fift_testvm4b_default daf8567bd58f05c10bb6596cea33b63e1061fa02dd5560db18ff22f96736f0d5
+Test_Fift_testvm4b_default e6d16e7217d0b2a3f0b38be0e3af0e28a70c925ccbc1c4d9890e25b8973e565a
 Test_Fift_testvm4c_default 2bbd67831d90bceaae29546ee3a58c4d376c2e8fb6a5b8ea2eae3ab8787e063e
-Test_Fift_testvm4d_default 32eee098378e64c938dea09990287a349d0d8f6aabb7360535c782a958cd5fea
+Test_Fift_testvm4d_default 9e8de54cfc3676ba4e817a4bd0367655d3514b898fecb3e71178e5aff8e35f83
 Test_Fift_testvm5_default bab109acfdf626a192171d74c69c3176d661a8dedf730aea616d4997b98830f1
 Test_Fift_testvm6_default dd6353c8f3f21cf62a4769ee1f3daaec46f43fd633ffb84c5d6535b120af9027
 Test_Fift_testvm7_default 77f54b6c8c9a728d262e912efcc347de7014a37d08793c3adeac8b96fe063342
 Test_Fift_testvm8_default 17c9e2205ccecfd8549328b4a501d07dde0336899a7a496e747e1032ad5efff9
 Test_Fift_testvm_default ee4cbfec76c050b6de7877cfc39817d594cd1e175b6265b76fb642e30b940437
-Test_Fift_testvmprog_default 3aeebf868c0492f2bafe339505751449e9d258bf25ea5d956efe70c6fce408ed
+Test_Fift_testvmprog_default e5d0b2c68ee568280877c8495be558bfd0054ca5d99a99eebb525bbeca8a65af
 Test_RefInt_main_default 768493e0aef8e09a401a6d369edd1ef503a9215fb09dc460f52b27a8bde767cb
 Test_VM_assert_code_not_null_default 05bc07e129181c972b976442f200de9487dee8bfb5ac53dd36ff61c5d4d4291d
 Test_VM_assert_extract_minmax_key_default c352309c61bdf62ba7a0ba7280d303c88b0696fe7efa550c05feb2c662275297
diff --git a/submodules/ton/tonlib-src/test/test-hello-world.cpp b/submodules/ton/tonlib-src/test/test-hello-world.cpp
index 427528f108..3a659f578d 100644
--- a/submodules/ton/tonlib-src/test/test-hello-world.cpp
+++ b/submodules/ton/tonlib-src/test/test-hello-world.cpp
@@ -31,6 +31,7 @@
 #include "auto/tl/ton_api_json.h"
 
 #include "tl/tl_json.h"
+#include "td/utils/Random.h"
 
 namespace {
 std::string config = R"json(
@@ -135,4 +136,25 @@ int main() {
     return res;
   };
   test_tl_json(ton::ton_api::make_object<ton::ton_api::testVectorBytes>(create_vector_bytes()));
+
+  td::Bits256 x;
+  td::Random::secure_bytes(x.as_slice());
+
+  auto s = x.to_hex();
+
+  auto v = td::hex_decode(s).move_as_ok();
+
+  auto w = td::buffer_to_hex(x.as_slice());
+
+  td::Bits256 y;
+  y.as_slice().copy_from(v);
+
+  CHECK(x == y);
+
+  auto w2 = td::hex_decode(w).move_as_ok();
+  td::Bits256 z;
+  z.as_slice().copy_from(w2);
+
+  LOG_CHECK(x == z) << s << " " << w;
+  return 0;
 }
diff --git a/submodules/ton/tonlib-src/tl/generate/auto/tl/lite_api.cpp b/submodules/ton/tonlib-src/tl/generate/auto/tl/lite_api.cpp
index 0b4ab90328..4e111c93b7 100644
--- a/submodules/ton/tonlib-src/tl/generate/auto/tl/lite_api.cpp
+++ b/submodules/ton/tonlib-src/tl/generate/auto/tl/lite_api.cpp
@@ -58,6 +58,8 @@ object_ptr<Object> Object::fetch(td::TlParser &p) {
       return liteServer_masterchainInfoExt::fetch(p);
     case liteServer_partialBlockProof::ID:
       return liteServer_partialBlockProof::fetch(p);
+    case liteServer_runMethodResult::ID:
+      return liteServer_runMethodResult::fetch(p);
     case liteServer_sendMsgStatus::ID:
       return liteServer_sendMsgStatus::fetch(p);
     case liteServer_shardInfo::ID:
@@ -74,6 +76,8 @@ object_ptr<Object> Object::fetch(td::TlParser &p) {
       return liteServer_transactionInfo::fetch(p);
     case liteServer_transactionList::ID:
       return liteServer_transactionList::fetch(p);
+    case liteServer_validatorStats::ID:
+      return liteServer_validatorStats::fetch(p);
     case liteServer_version::ID:
       return liteServer_version::fetch(p);
     case liteServer_debug_verbosity::ID:
@@ -122,6 +126,8 @@ object_ptr<Function> Function::fetch(td::TlParser &p) {
       return liteServer_getTime::fetch(p);
     case liteServer_getTransactions::ID:
       return liteServer_getTransactions::fetch(p);
+    case liteServer_getValidatorStats::ID:
+      return liteServer_getValidatorStats::fetch(p);
     case liteServer_getVersion::ID:
       return liteServer_getVersion::fetch(p);
     case liteServer_listBlockTransactions::ID:
@@ -132,6 +138,8 @@ object_ptr<Function> Function::fetch(td::TlParser &p) {
       return liteServer_query::fetch(p);
     case liteServer_queryPrefix::ID:
       return liteServer_queryPrefix::fetch(p);
+    case liteServer_runSmcMethod::ID:
+      return liteServer_runSmcMethod::fetch(p);
     case liteServer_sendMessage::ID:
       return liteServer_sendMessage::fetch(p);
     case liteServer_waitMasterchainSeqno::ID:
@@ -1098,6 +1106,101 @@ void liteServer_partialBlockProof::store(td::TlStorerToString &s, const char *fi
   }
 }
 
+liteServer_runMethodResult::liteServer_runMethodResult()
+  : mode_()
+  , id_()
+  , shardblk_()
+  , shard_proof_()
+  , proof_()
+  , state_proof_()
+  , init_c7_()
+  , lib_extras_()
+  , exit_code_()
+  , result_()
+{}
+
+liteServer_runMethodResult::liteServer_runMethodResult(std::int32_t mode_, object_ptr<tonNode_blockIdExt> &&id_, object_ptr<tonNode_blockIdExt> &&shardblk_, td::BufferSlice &&shard_proof_, td::BufferSlice &&proof_, td::BufferSlice &&state_proof_, td::BufferSlice &&init_c7_, td::BufferSlice &&lib_extras_, std::int32_t exit_code_, td::BufferSlice &&result_)
+  : mode_(mode_)
+  , id_(std::move(id_))
+  , shardblk_(std::move(shardblk_))
+  , shard_proof_(std::move(shard_proof_))
+  , proof_(std::move(proof_))
+  , state_proof_(std::move(state_proof_))
+  , init_c7_(std::move(init_c7_))
+  , lib_extras_(std::move(lib_extras_))
+  , exit_code_(exit_code_)
+  , result_(std::move(result_))
+{}
+
+const std::int32_t liteServer_runMethodResult::ID;
+
+object_ptr<liteServer_runMethodResult> liteServer_runMethodResult::fetch(td::TlParser &p) {
+#define FAIL(error) p.set_error(error); return nullptr;
+  object_ptr<liteServer_runMethodResult> res = make_object<liteServer_runMethodResult>();
+  std::int32_t var0;
+  if ((var0 = res->mode_ = TlFetchInt::parse(p)) < 0) { FAIL("Variable of type # can't be negative"); }
+  res->id_ = TlFetchObject<tonNode_blockIdExt>::parse(p);
+  res->shardblk_ = TlFetchObject<tonNode_blockIdExt>::parse(p);
+  if (var0 & 1) { res->shard_proof_ = TlFetchBytes<td::BufferSlice>::parse(p); }
+  if (var0 & 1) { res->proof_ = TlFetchBytes<td::BufferSlice>::parse(p); }
+  if (var0 & 2) { res->state_proof_ = TlFetchBytes<td::BufferSlice>::parse(p); }
+  if (var0 & 8) { res->init_c7_ = TlFetchBytes<td::BufferSlice>::parse(p); }
+  if (var0 & 16) { res->lib_extras_ = TlFetchBytes<td::BufferSlice>::parse(p); }
+  res->exit_code_ = TlFetchInt::parse(p);
+  if (var0 & 4) { res->result_ = TlFetchBytes<td::BufferSlice>::parse(p); }
+  if (p.get_error()) { FAIL(""); }
+  return res;
+#undef FAIL
+}
+
+void liteServer_runMethodResult::store(td::TlStorerCalcLength &s) const {
+  (void)sizeof(s);
+  std::int32_t var0;
+  TlStoreBinary::store((var0 = mode_), s);
+  TlStoreObject::store(id_, s);
+  TlStoreObject::store(shardblk_, s);
+  if (var0 & 1) { TlStoreString::store(shard_proof_, s); }
+  if (var0 & 1) { TlStoreString::store(proof_, s); }
+  if (var0 & 2) { TlStoreString::store(state_proof_, s); }
+  if (var0 & 8) { TlStoreString::store(init_c7_, s); }
+  if (var0 & 16) { TlStoreString::store(lib_extras_, s); }
+  TlStoreBinary::store(exit_code_, s);
+  if (var0 & 4) { TlStoreString::store(result_, s); }
+}
+
+void liteServer_runMethodResult::store(td::TlStorerUnsafe &s) const {
+  (void)sizeof(s);
+  std::int32_t var0;
+  TlStoreBinary::store((var0 = mode_), s);
+  TlStoreObject::store(id_, s);
+  TlStoreObject::store(shardblk_, s);
+  if (var0 & 1) { TlStoreString::store(shard_proof_, s); }
+  if (var0 & 1) { TlStoreString::store(proof_, s); }
+  if (var0 & 2) { TlStoreString::store(state_proof_, s); }
+  if (var0 & 8) { TlStoreString::store(init_c7_, s); }
+  if (var0 & 16) { TlStoreString::store(lib_extras_, s); }
+  TlStoreBinary::store(exit_code_, s);
+  if (var0 & 4) { TlStoreString::store(result_, s); }
+}
+
+void liteServer_runMethodResult::store(td::TlStorerToString &s, const char *field_name) const {
+  if (!LOG_IS_STRIPPED(ERROR)) {
+    s.store_class_begin(field_name, "liteServer_runMethodResult");
+  std::int32_t var0;
+    s.store_field("mode", (var0 = mode_));
+    if (id_ == nullptr) { s.store_field("id", "null"); } else { id_->store(s, "id"); }
+    if (shardblk_ == nullptr) { s.store_field("shardblk", "null"); } else { shardblk_->store(s, "shardblk"); }
+    if (var0 & 1) { s.store_bytes_field("shard_proof", shard_proof_); }
+    if (var0 & 1) { s.store_bytes_field("proof", proof_); }
+    if (var0 & 2) { s.store_bytes_field("state_proof", state_proof_); }
+    if (var0 & 8) { s.store_bytes_field("init_c7", init_c7_); }
+    if (var0 & 16) { s.store_bytes_field("lib_extras", lib_extras_); }
+    s.store_field("exit_code", exit_code_);
+    if (var0 & 4) { s.store_bytes_field("result", result_); }
+    s.store_class_end();
+  }
+}
+
 liteServer_sendMsgStatus::liteServer_sendMsgStatus()
   : status_()
 {}
@@ -1483,6 +1586,77 @@ void liteServer_transactionList::store(td::TlStorerToString &s, const char *fiel
   }
 }
 
+liteServer_validatorStats::liteServer_validatorStats()
+  : mode_()
+  , id_()
+  , count_()
+  , complete_()
+  , state_proof_()
+  , data_proof_()
+{}
+
+liteServer_validatorStats::liteServer_validatorStats(std::int32_t mode_, object_ptr<tonNode_blockIdExt> &&id_, std::int32_t count_, bool complete_, td::BufferSlice &&state_proof_, td::BufferSlice &&data_proof_)
+  : mode_(mode_)
+  , id_(std::move(id_))
+  , count_(count_)
+  , complete_(complete_)
+  , state_proof_(std::move(state_proof_))
+  , data_proof_(std::move(data_proof_))
+{}
+
+const std::int32_t liteServer_validatorStats::ID;
+
+object_ptr<liteServer_validatorStats> liteServer_validatorStats::fetch(td::TlParser &p) {
+#define FAIL(error) p.set_error(error); return nullptr;
+  object_ptr<liteServer_validatorStats> res = make_object<liteServer_validatorStats>();
+  std::int32_t var0;
+  if ((var0 = res->mode_ = TlFetchInt::parse(p)) < 0) { FAIL("Variable of type # can't be negative"); }
+  res->id_ = TlFetchObject<tonNode_blockIdExt>::parse(p);
+  res->count_ = TlFetchInt::parse(p);
+  res->complete_ = TlFetchBool::parse(p);
+  res->state_proof_ = TlFetchBytes<td::BufferSlice>::parse(p);
+  res->data_proof_ = TlFetchBytes<td::BufferSlice>::parse(p);
+  if (p.get_error()) { FAIL(""); }
+  return res;
+#undef FAIL
+}
+
+void liteServer_validatorStats::store(td::TlStorerCalcLength &s) const {
+  (void)sizeof(s);
+  std::int32_t var0;
+  TlStoreBinary::store((var0 = mode_), s);
+  TlStoreObject::store(id_, s);
+  TlStoreBinary::store(count_, s);
+  TlStoreBool::store(complete_, s);
+  TlStoreString::store(state_proof_, s);
+  TlStoreString::store(data_proof_, s);
+}
+
+void liteServer_validatorStats::store(td::TlStorerUnsafe &s) const {
+  (void)sizeof(s);
+  std::int32_t var0;
+  TlStoreBinary::store((var0 = mode_), s);
+  TlStoreObject::store(id_, s);
+  TlStoreBinary::store(count_, s);
+  TlStoreBool::store(complete_, s);
+  TlStoreString::store(state_proof_, s);
+  TlStoreString::store(data_proof_, s);
+}
+
+void liteServer_validatorStats::store(td::TlStorerToString &s, const char *field_name) const {
+  if (!LOG_IS_STRIPPED(ERROR)) {
+    s.store_class_begin(field_name, "liteServer_validatorStats");
+  std::int32_t var0;
+    s.store_field("mode", (var0 = mode_));
+    if (id_ == nullptr) { s.store_field("id", "null"); } else { id_->store(s, "id"); }
+    s.store_field("count", count_);
+    s.store_field("complete", complete_);
+    s.store_bytes_field("state_proof", state_proof_);
+    s.store_bytes_field("data_proof", data_proof_);
+    s.store_class_end();
+  }
+}
+
 liteServer_version::liteServer_version()
   : mode_()
   , version_()
@@ -2462,6 +2636,76 @@ liteServer_getTransactions::ReturnType liteServer_getTransactions::fetch_result(
 #undef FAIL
 }
 
+liteServer_getValidatorStats::liteServer_getValidatorStats()
+  : mode_()
+  , id_()
+  , limit_()
+  , start_after_()
+  , modified_after_()
+{}
+
+liteServer_getValidatorStats::liteServer_getValidatorStats(std::int32_t mode_, object_ptr<tonNode_blockIdExt> &&id_, std::int32_t limit_, td::Bits256 const &start_after_, std::int32_t modified_after_)
+  : mode_(mode_)
+  , id_(std::move(id_))
+  , limit_(limit_)
+  , start_after_(start_after_)
+  , modified_after_(modified_after_)
+{}
+
+const std::int32_t liteServer_getValidatorStats::ID;
+
+object_ptr<liteServer_getValidatorStats> liteServer_getValidatorStats::fetch(td::TlParser &p) {
+#define FAIL(error) p.set_error(error); return nullptr;
+  object_ptr<liteServer_getValidatorStats> res = make_object<liteServer_getValidatorStats>();
+  std::int32_t var0;
+  if ((var0 = res->mode_ = TlFetchInt::parse(p)) < 0) { FAIL("Variable of type # can't be negative"); }
+  res->id_ = TlFetchObject<tonNode_blockIdExt>::parse(p);
+  res->limit_ = TlFetchInt::parse(p);
+  if (var0 & 1) { res->start_after_ = TlFetchInt256::parse(p); }
+  if (var0 & 4) { res->modified_after_ = TlFetchInt::parse(p); }
+  if (p.get_error()) { FAIL(""); }
+  return res;
+#undef FAIL
+}
+
+void liteServer_getValidatorStats::store(td::TlStorerCalcLength &s) const {
+  (void)sizeof(s);
+  s.store_binary(152721596);
+  TlStoreBinary::store((var0 = mode_), s);
+  TlStoreObject::store(id_, s);
+  TlStoreBinary::store(limit_, s);
+  if (var0 & 1) { TlStoreBinary::store(start_after_, s); }
+  if (var0 & 4) { TlStoreBinary::store(modified_after_, s); }
+}
+
+void liteServer_getValidatorStats::store(td::TlStorerUnsafe &s) const {
+  (void)sizeof(s);
+  s.store_binary(152721596);
+  TlStoreBinary::store((var0 = mode_), s);
+  TlStoreObject::store(id_, s);
+  TlStoreBinary::store(limit_, s);
+  if (var0 & 1) { TlStoreBinary::store(start_after_, s); }
+  if (var0 & 4) { TlStoreBinary::store(modified_after_, s); }
+}
+
+void liteServer_getValidatorStats::store(td::TlStorerToString &s, const char *field_name) const {
+  if (!LOG_IS_STRIPPED(ERROR)) {
+    s.store_class_begin(field_name, "liteServer_getValidatorStats");
+    s.store_field("mode", (var0 = mode_));
+    if (id_ == nullptr) { s.store_field("id", "null"); } else { id_->store(s, "id"); }
+    s.store_field("limit", limit_);
+    if (var0 & 1) { s.store_field("start_after", start_after_); }
+    if (var0 & 4) { s.store_field("modified_after", modified_after_); }
+    s.store_class_end();
+  }
+}
+
+liteServer_getValidatorStats::ReturnType liteServer_getValidatorStats::fetch_result(td::TlParser &p) {
+#define FAIL(error) p.set_error(error); return ReturnType()
+  return TlFetchBoxed<TlFetchObject<liteServer_validatorStats>, -1174956328>::parse(p);
+#undef FAIL
+}
+
 liteServer_getVersion::liteServer_getVersion() {
 }
 
@@ -2727,6 +2971,76 @@ liteServer_queryPrefix::ReturnType liteServer_queryPrefix::fetch_result(td::TlPa
 #undef FAIL
 }
 
+liteServer_runSmcMethod::liteServer_runSmcMethod()
+  : mode_()
+  , id_()
+  , account_()
+  , method_id_()
+  , params_()
+{}
+
+liteServer_runSmcMethod::liteServer_runSmcMethod(std::int32_t mode_, object_ptr<tonNode_blockIdExt> &&id_, object_ptr<liteServer_accountId> &&account_, std::int64_t method_id_, td::BufferSlice &&params_)
+  : mode_(mode_)
+  , id_(std::move(id_))
+  , account_(std::move(account_))
+  , method_id_(method_id_)
+  , params_(std::move(params_))
+{}
+
+const std::int32_t liteServer_runSmcMethod::ID;
+
+object_ptr<liteServer_runSmcMethod> liteServer_runSmcMethod::fetch(td::TlParser &p) {
+#define FAIL(error) p.set_error(error); return nullptr;
+  object_ptr<liteServer_runSmcMethod> res = make_object<liteServer_runSmcMethod>();
+  std::int32_t var0;
+  if ((var0 = res->mode_ = TlFetchInt::parse(p)) < 0) { FAIL("Variable of type # can't be negative"); }
+  res->id_ = TlFetchObject<tonNode_blockIdExt>::parse(p);
+  res->account_ = TlFetchObject<liteServer_accountId>::parse(p);
+  res->method_id_ = TlFetchLong::parse(p);
+  res->params_ = TlFetchBytes<td::BufferSlice>::parse(p);
+  if (p.get_error()) { FAIL(""); }
+  return res;
+#undef FAIL
+}
+
+void liteServer_runSmcMethod::store(td::TlStorerCalcLength &s) const {
+  (void)sizeof(s);
+  s.store_binary(1556504018);
+  TlStoreBinary::store((var0 = mode_), s);
+  TlStoreObject::store(id_, s);
+  TlStoreObject::store(account_, s);
+  TlStoreBinary::store(method_id_, s);
+  TlStoreString::store(params_, s);
+}
+
+void liteServer_runSmcMethod::store(td::TlStorerUnsafe &s) const {
+  (void)sizeof(s);
+  s.store_binary(1556504018);
+  TlStoreBinary::store((var0 = mode_), s);
+  TlStoreObject::store(id_, s);
+  TlStoreObject::store(account_, s);
+  TlStoreBinary::store(method_id_, s);
+  TlStoreString::store(params_, s);
+}
+
+void liteServer_runSmcMethod::store(td::TlStorerToString &s, const char *field_name) const {
+  if (!LOG_IS_STRIPPED(ERROR)) {
+    s.store_class_begin(field_name, "liteServer_runSmcMethod");
+    s.store_field("mode", (var0 = mode_));
+    if (id_ == nullptr) { s.store_field("id", "null"); } else { id_->store(s, "id"); }
+    if (account_ == nullptr) { s.store_field("account", "null"); } else { account_->store(s, "account"); }
+    s.store_field("method_id", method_id_);
+    s.store_bytes_field("params", params_);
+    s.store_class_end();
+  }
+}
+
+liteServer_runSmcMethod::ReturnType liteServer_runSmcMethod::fetch_result(td::TlParser &p) {
+#define FAIL(error) p.set_error(error); return ReturnType()
+  return TlFetchBoxed<TlFetchObject<liteServer_runMethodResult>, -1550163605>::parse(p);
+#undef FAIL
+}
+
 liteServer_sendMessage::liteServer_sendMessage()
   : body_()
 {}
diff --git a/submodules/ton/tonlib-src/tl/generate/auto/tl/lite_api.h b/submodules/ton/tonlib-src/tl/generate/auto/tl/lite_api.h
index a4a67f3c22..65daf24c62 100644
--- a/submodules/ton/tonlib-src/tl/generate/auto/tl/lite_api.h
+++ b/submodules/ton/tonlib-src/tl/generate/auto/tl/lite_api.h
@@ -84,6 +84,8 @@ class liteServer_masterchainInfoExt;
 
 class liteServer_partialBlockProof;
 
+class liteServer_runMethodResult;
+
 class liteServer_sendMsgStatus;
 
 class liteServer_shardInfo;
@@ -100,6 +102,8 @@ class liteServer_transactionInfo;
 
 class liteServer_transactionList;
 
+class liteServer_validatorStats;
+
 class liteServer_version;
 
 class liteServer_debug_verbosity;
@@ -581,6 +585,38 @@ class liteServer_partialBlockProof final : public Object {
   void store(td::TlStorerToString &s, const char *field_name) const final;
 };
 
+class liteServer_runMethodResult final : public Object {
+ public:
+  std::int32_t mode_;
+  object_ptr<tonNode_blockIdExt> id_;
+  object_ptr<tonNode_blockIdExt> shardblk_;
+  td::BufferSlice shard_proof_;
+  td::BufferSlice proof_;
+  td::BufferSlice state_proof_;
+  td::BufferSlice init_c7_;
+  td::BufferSlice lib_extras_;
+  std::int32_t exit_code_;
+  td::BufferSlice result_;
+  enum Flags : std::int32_t {SHARD_PROOF_MASK = 1, PROOF_MASK = 1, STATE_PROOF_MASK = 2, INIT_C7_MASK = 8, LIB_EXTRAS_MASK = 16, RESULT_MASK = 4};
+
+  liteServer_runMethodResult();
+
+  liteServer_runMethodResult(std::int32_t mode_, object_ptr<tonNode_blockIdExt> &&id_, object_ptr<tonNode_blockIdExt> &&shardblk_, td::BufferSlice &&shard_proof_, td::BufferSlice &&proof_, td::BufferSlice &&state_proof_, td::BufferSlice &&init_c7_, td::BufferSlice &&lib_extras_, std::int32_t exit_code_, td::BufferSlice &&result_);
+
+  static const std::int32_t ID = -1550163605;
+  std::int32_t get_id() const final {
+    return ID;
+  }
+
+  static object_ptr<liteServer_runMethodResult> fetch(td::TlParser &p);
+
+  void store(td::TlStorerCalcLength &s) const final;
+
+  void store(td::TlStorerUnsafe &s) const final;
+
+  void store(td::TlStorerToString &s, const char *field_name) const final;
+};
+
 class liteServer_sendMsgStatus final : public Object {
  public:
   std::int32_t status_;
@@ -785,6 +821,33 @@ class liteServer_transactionList final : public Object {
   void store(td::TlStorerToString &s, const char *field_name) const final;
 };
 
+class liteServer_validatorStats final : public Object {
+ public:
+  std::int32_t mode_;
+  object_ptr<tonNode_blockIdExt> id_;
+  std::int32_t count_;
+  bool complete_;
+  td::BufferSlice state_proof_;
+  td::BufferSlice data_proof_;
+
+  liteServer_validatorStats();
+
+  liteServer_validatorStats(std::int32_t mode_, object_ptr<tonNode_blockIdExt> &&id_, std::int32_t count_, bool complete_, td::BufferSlice &&state_proof_, td::BufferSlice &&data_proof_);
+
+  static const std::int32_t ID = -1174956328;
+  std::int32_t get_id() const final {
+    return ID;
+  }
+
+  static object_ptr<liteServer_validatorStats> fetch(td::TlParser &p);
+
+  void store(td::TlStorerCalcLength &s) const final;
+
+  void store(td::TlStorerUnsafe &s) const final;
+
+  void store(td::TlStorerToString &s, const char *field_name) const final;
+};
+
 class liteServer_version final : public Object {
  public:
   std::int32_t mode_;
@@ -1310,6 +1373,38 @@ class liteServer_getTransactions final : public Function {
   static ReturnType fetch_result(td::TlParser &p);
 };
 
+class liteServer_getValidatorStats final : public Function {
+ public:
+  std::int32_t mode_;
+  object_ptr<tonNode_blockIdExt> id_;
+  std::int32_t limit_;
+  td::Bits256 start_after_;
+  std::int32_t modified_after_;
+  enum Flags : std::int32_t {START_AFTER_MASK = 1, MODIFIED_AFTER_MASK = 4};
+  mutable std::int32_t var0;
+
+  liteServer_getValidatorStats();
+
+  liteServer_getValidatorStats(std::int32_t mode_, object_ptr<tonNode_blockIdExt> &&id_, std::int32_t limit_, td::Bits256 const &start_after_, std::int32_t modified_after_);
+
+  static const std::int32_t ID = 152721596;
+  std::int32_t get_id() const final {
+    return ID;
+  }
+
+  using ReturnType = object_ptr<liteServer_validatorStats>;
+
+  static object_ptr<liteServer_getValidatorStats> fetch(td::TlParser &p);
+
+  void store(td::TlStorerCalcLength &s) const final;
+
+  void store(td::TlStorerUnsafe &s) const final;
+
+  void store(td::TlStorerToString &s, const char *field_name) const final;
+
+  static ReturnType fetch_result(td::TlParser &p);
+};
+
 class liteServer_getVersion final : public Function {
  public:
 
@@ -1453,6 +1548,37 @@ class liteServer_queryPrefix final : public Function {
   static ReturnType fetch_result(td::TlParser &p);
 };
 
+class liteServer_runSmcMethod final : public Function {
+ public:
+  std::int32_t mode_;
+  object_ptr<tonNode_blockIdExt> id_;
+  object_ptr<liteServer_accountId> account_;
+  std::int64_t method_id_;
+  td::BufferSlice params_;
+  mutable std::int32_t var0;
+
+  liteServer_runSmcMethod();
+
+  liteServer_runSmcMethod(std::int32_t mode_, object_ptr<tonNode_blockIdExt> &&id_, object_ptr<liteServer_accountId> &&account_, std::int64_t method_id_, td::BufferSlice &&params_);
+
+  static const std::int32_t ID = 1556504018;
+  std::int32_t get_id() const final {
+    return ID;
+  }
+
+  using ReturnType = object_ptr<liteServer_runMethodResult>;
+
+  static object_ptr<liteServer_runSmcMethod> fetch(td::TlParser &p);
+
+  void store(td::TlStorerCalcLength &s) const final;
+
+  void store(td::TlStorerUnsafe &s) const final;
+
+  void store(td::TlStorerToString &s, const char *field_name) const final;
+
+  static ReturnType fetch_result(td::TlParser &p);
+};
+
 class liteServer_sendMessage final : public Function {
  public:
   td::BufferSlice body_;
diff --git a/submodules/ton/tonlib-src/tl/generate/auto/tl/lite_api.hpp b/submodules/ton/tonlib-src/tl/generate/auto/tl/lite_api.hpp
index 9c9062b427..540dfb6d49 100644
--- a/submodules/ton/tonlib-src/tl/generate/auto/tl/lite_api.hpp
+++ b/submodules/ton/tonlib-src/tl/generate/auto/tl/lite_api.hpp
@@ -65,6 +65,9 @@ bool downcast_call(Object &obj, const T &func) {
     case liteServer_partialBlockProof::ID:
       func(static_cast<liteServer_partialBlockProof &>(obj));
       return true;
+    case liteServer_runMethodResult::ID:
+      func(static_cast<liteServer_runMethodResult &>(obj));
+      return true;
     case liteServer_sendMsgStatus::ID:
       func(static_cast<liteServer_sendMsgStatus &>(obj));
       return true;
@@ -89,6 +92,9 @@ bool downcast_call(Object &obj, const T &func) {
     case liteServer_transactionList::ID:
       func(static_cast<liteServer_transactionList &>(obj));
       return true;
+    case liteServer_validatorStats::ID:
+      func(static_cast<liteServer_validatorStats &>(obj));
+      return true;
     case liteServer_version::ID:
       func(static_cast<liteServer_version &>(obj));
       return true;
@@ -160,6 +166,9 @@ bool downcast_call(Function &obj, const T &func) {
     case liteServer_getTransactions::ID:
       func(static_cast<liteServer_getTransactions &>(obj));
       return true;
+    case liteServer_getValidatorStats::ID:
+      func(static_cast<liteServer_getValidatorStats &>(obj));
+      return true;
     case liteServer_getVersion::ID:
       func(static_cast<liteServer_getVersion &>(obj));
       return true;
@@ -175,6 +184,9 @@ bool downcast_call(Function &obj, const T &func) {
     case liteServer_queryPrefix::ID:
       func(static_cast<liteServer_queryPrefix &>(obj));
       return true;
+    case liteServer_runSmcMethod::ID:
+      func(static_cast<liteServer_runSmcMethod &>(obj));
+      return true;
     case liteServer_sendMessage::ID:
       func(static_cast<liteServer_sendMessage &>(obj));
       return true;
diff --git a/submodules/ton/tonlib-src/tl/generate/auto/tl/ton_api.cpp b/submodules/ton/tonlib-src/tl/generate/auto/tl/ton_api.cpp
index 5c8b605177..b23e07ced9 100644
--- a/submodules/ton/tonlib-src/tl/generate/auto/tl/ton_api.cpp
+++ b/submodules/ton/tonlib-src/tl/generate/auto/tl/ton_api.cpp
@@ -212,8 +212,20 @@ object_ptr<Object> Object::fetch(td::TlParser &p) {
       return db_filedb_key_signatures::fetch(p);
     case db_filedb_key_candidate::ID:
       return db_filedb_key_candidate::fetch(p);
+    case db_filedb_key_blockInfo::ID:
+      return db_filedb_key_blockInfo::fetch(p);
     case db_filedb_value::ID:
       return db_filedb_value::fetch(p);
+    case db_files_index_key::ID:
+      return db_files_index_key::fetch(p);
+    case db_files_package_key::ID:
+      return db_files_package_key::fetch(p);
+    case db_files_index_value::ID:
+      return db_files_index_value::fetch(p);
+    case db_files_package_firstBlock::ID:
+      return db_files_package_firstBlock::fetch(p);
+    case db_files_package_value::ID:
+      return db_files_package_value::fetch(p);
     case db_lt_el_key::ID:
       return db_lt_el_key::fetch(p);
     case db_lt_desc_key::ID:
@@ -242,6 +254,8 @@ object_ptr<Object> Object::fetch(td::TlParser &p) {
       return db_root_key_config::fetch(p);
     case db_state_asyncSerializer::ID:
       return db_state_asyncSerializer::fetch(p);
+    case db_state_dbVersion::ID:
+      return db_state_dbVersion::fetch(p);
     case db_state_destroyedSessions::ID:
       return db_state_destroyedSessions::fetch(p);
     case db_state_gcBlockId::ID:
@@ -262,6 +276,8 @@ object_ptr<Object> Object::fetch(td::TlParser &p) {
       return db_state_key_asyncSerializer::fetch(p);
     case db_state_key_hardforks::ID:
       return db_state_key_hardforks::fetch(p);
+    case db_state_key_dbVersion::ID:
+      return db_state_key_dbVersion::fetch(p);
     case db_state_shardClient::ID:
       return db_state_shardClient::fetch(p);
     case dht_key::ID:
@@ -366,6 +382,18 @@ object_ptr<Object> Object::fetch(td::TlParser &p) {
       return fec_roundRobin::fetch(p);
     case fec_online::ID:
       return fec_online::fetch(p);
+    case http_header::ID:
+      return http_header::fetch(p);
+    case http_payloadPart::ID:
+      return http_payloadPart::fetch(p);
+    case http_response::ID:
+      return http_response::fetch(p);
+    case http_server_config::ID:
+      return http_server_config::fetch(p);
+    case http_server_dnsEntry::ID:
+      return http_server_dnsEntry::fetch(p);
+    case http_server_host::ID:
+      return http_server_host::fetch(p);
     case id_config_local::ID:
       return id_config_local::fetch(p);
     case liteclient_config_global::ID:
@@ -442,6 +470,10 @@ object_ptr<Object> Object::fetch(td::TlParser &p) {
       return ton_blockId::fetch(p);
     case ton_blockIdApprove::ID:
       return ton_blockIdApprove::fetch(p);
+    case tonNode_archiveNotFound::ID:
+      return tonNode_archiveNotFound::fetch(p);
+    case tonNode_archiveInfo::ID:
+      return tonNode_archiveInfo::fetch(p);
     case tonNode_blockDescriptionEmpty::ID:
       return tonNode_blockDescriptionEmpty::fetch(p);
     case tonNode_blockDescription::ID:
@@ -640,6 +672,10 @@ object_ptr<Function> Function::fetch(td::TlParser &p) {
       return engine_validator_sign::fetch(p);
     case getTestObject::ID:
       return getTestObject::fetch(p);
+    case http_getNextPayloadPart::ID:
+      return http_getNextPayloadPart::fetch(p);
+    case http_request::ID:
+      return http_request::fetch(p);
     case overlay_getBroadcast::ID:
       return overlay_getBroadcast::fetch(p);
     case overlay_getBroadcastList::ID:
@@ -672,6 +708,10 @@ object_ptr<Function> Function::fetch(td::TlParser &p) {
       return tonNode_downloadPersistentStateSlice::fetch(p);
     case tonNode_downloadZeroState::ID:
       return tonNode_downloadZeroState::fetch(p);
+    case tonNode_getArchiveInfo::ID:
+      return tonNode_getArchiveInfo::fetch(p);
+    case tonNode_getArchiveSlice::ID:
+      return tonNode_getArchiveSlice::fetch(p);
     case tonNode_getCapabilities::ID:
       return tonNode_getCapabilities::fetch(p);
     case tonNode_getNextBlockDescription::ID:
@@ -4352,9 +4392,10 @@ db_block_info::db_block_info()
   , lt_()
   , ts_()
   , state_()
+  , masterchain_ref_seqno_()
 {}
 
-db_block_info::db_block_info(object_ptr<tonNode_blockIdExt> &&id_, std::int32_t flags_, object_ptr<tonNode_blockIdExt> &&prev_left_, object_ptr<tonNode_blockIdExt> &&prev_right_, object_ptr<tonNode_blockIdExt> &&next_left_, object_ptr<tonNode_blockIdExt> &&next_right_, std::int64_t lt_, std::int32_t ts_, td::Bits256 const &state_)
+db_block_info::db_block_info(object_ptr<tonNode_blockIdExt> &&id_, std::int32_t flags_, object_ptr<tonNode_blockIdExt> &&prev_left_, object_ptr<tonNode_blockIdExt> &&prev_right_, object_ptr<tonNode_blockIdExt> &&next_left_, object_ptr<tonNode_blockIdExt> &&next_right_, std::int64_t lt_, std::int32_t ts_, td::Bits256 const &state_, std::int32_t masterchain_ref_seqno_)
   : id_(std::move(id_))
   , flags_(flags_)
   , prev_left_(std::move(prev_left_))
@@ -4364,6 +4405,7 @@ db_block_info::db_block_info(object_ptr<tonNode_blockIdExt> &&id_, std::int32_t
   , lt_(lt_)
   , ts_(ts_)
   , state_(state_)
+  , masterchain_ref_seqno_(masterchain_ref_seqno_)
 {}
 
 const std::int32_t db_block_info::ID;
@@ -4381,6 +4423,7 @@ object_ptr<db_block_Info> db_block_info::fetch(td::TlParser &p) {
   if (var0 & 8192) { res->lt_ = TlFetchLong::parse(p); }
   if (var0 & 16384) { res->ts_ = TlFetchInt::parse(p); }
   if (var0 & 131072) { res->state_ = TlFetchInt256::parse(p); }
+  if (var0 & 8388608) { res->masterchain_ref_seqno_ = TlFetchInt::parse(p); }
   if (p.get_error()) { FAIL(""); }
   return std::move(res);
 #undef FAIL
@@ -4398,6 +4441,7 @@ void db_block_info::store(td::TlStorerCalcLength &s) const {
   if (var0 & 8192) { TlStoreBinary::store(lt_, s); }
   if (var0 & 16384) { TlStoreBinary::store(ts_, s); }
   if (var0 & 131072) { TlStoreBinary::store(state_, s); }
+  if (var0 & 8388608) { TlStoreBinary::store(masterchain_ref_seqno_, s); }
 }
 
 void db_block_info::store(td::TlStorerUnsafe &s) const {
@@ -4412,6 +4456,7 @@ void db_block_info::store(td::TlStorerUnsafe &s) const {
   if (var0 & 8192) { TlStoreBinary::store(lt_, s); }
   if (var0 & 16384) { TlStoreBinary::store(ts_, s); }
   if (var0 & 131072) { TlStoreBinary::store(state_, s); }
+  if (var0 & 8388608) { TlStoreBinary::store(masterchain_ref_seqno_, s); }
 }
 
 void db_block_info::store(td::TlStorerToString &s, const char *field_name) const {
@@ -4427,6 +4472,7 @@ void db_block_info::store(td::TlStorerToString &s, const char *field_name) const
     if (var0 & 8192) { s.store_field("lt", lt_); }
     if (var0 & 16384) { s.store_field("ts", ts_); }
     if (var0 & 131072) { s.store_field("state", state_); }
+    if (var0 & 8388608) { s.store_field("masterchain_ref_seqno", masterchain_ref_seqno_); }
     s.store_class_end();
   }
 }
@@ -4882,6 +4928,8 @@ object_ptr<db_filedb_Key> db_filedb_Key::fetch(td::TlParser &p) {
       return db_filedb_key_signatures::fetch(p);
     case db_filedb_key_candidate::ID:
       return db_filedb_key_candidate::fetch(p);
+    case db_filedb_key_blockInfo::ID:
+      return db_filedb_key_blockInfo::fetch(p);
     default:
       FAIL(PSTRING() << "Unknown constructor found " << td::format::as_hex(constructor));
   }
@@ -5191,6 +5239,44 @@ void db_filedb_key_candidate::store(td::TlStorerToString &s, const char *field_n
   }
 }
 
+db_filedb_key_blockInfo::db_filedb_key_blockInfo()
+  : block_id_()
+{}
+
+db_filedb_key_blockInfo::db_filedb_key_blockInfo(object_ptr<tonNode_blockIdExt> &&block_id_)
+  : block_id_(std::move(block_id_))
+{}
+
+const std::int32_t db_filedb_key_blockInfo::ID;
+
+object_ptr<db_filedb_Key> db_filedb_key_blockInfo::fetch(td::TlParser &p) {
+  return make_object<db_filedb_key_blockInfo>(p);
+}
+
+db_filedb_key_blockInfo::db_filedb_key_blockInfo(td::TlParser &p)
+#define FAIL(error) p.set_error(error)
+  : block_id_(TlFetchObject<tonNode_blockIdExt>::parse(p))
+#undef FAIL
+{}
+
+void db_filedb_key_blockInfo::store(td::TlStorerCalcLength &s) const {
+  (void)sizeof(s);
+  TlStoreObject::store(block_id_, s);
+}
+
+void db_filedb_key_blockInfo::store(td::TlStorerUnsafe &s) const {
+  (void)sizeof(s);
+  TlStoreObject::store(block_id_, s);
+}
+
+void db_filedb_key_blockInfo::store(td::TlStorerToString &s, const char *field_name) const {
+  if (!LOG_IS_STRIPPED(ERROR)) {
+    s.store_class_begin(field_name, "db_filedb_key_blockInfo");
+    if (block_id_ == nullptr) { s.store_field("block_id", "null"); } else { block_id_->store(s, "block_id"); }
+    s.store_class_end();
+  }
+}
+
 db_filedb_value::db_filedb_value()
   : key_()
   , prev_()
@@ -5247,6 +5333,275 @@ void db_filedb_value::store(td::TlStorerToString &s, const char *field_name) con
   }
 }
 
+object_ptr<db_files_Key> db_files_Key::fetch(td::TlParser &p) {
+#define FAIL(error) p.set_error(error); return nullptr;
+  int constructor = p.fetch_int();
+  switch (constructor) {
+    case db_files_index_key::ID:
+      return db_files_index_key::fetch(p);
+    case db_files_package_key::ID:
+      return db_files_package_key::fetch(p);
+    default:
+      FAIL(PSTRING() << "Unknown constructor found " << td::format::as_hex(constructor));
+  }
+#undef FAIL
+}
+
+db_files_index_key::db_files_index_key() {
+}
+
+const std::int32_t db_files_index_key::ID;
+
+object_ptr<db_files_Key> db_files_index_key::fetch(td::TlParser &p) {
+  return make_object<db_files_index_key>(p);
+}
+
+db_files_index_key::db_files_index_key(td::TlParser &p)
+#define FAIL(error) p.set_error(error)
+#undef FAIL
+{
+  (void)p;
+}
+
+void db_files_index_key::store(td::TlStorerCalcLength &s) const {
+  (void)sizeof(s);
+}
+
+void db_files_index_key::store(td::TlStorerUnsafe &s) const {
+  (void)sizeof(s);
+}
+
+void db_files_index_key::store(td::TlStorerToString &s, const char *field_name) const {
+  if (!LOG_IS_STRIPPED(ERROR)) {
+    s.store_class_begin(field_name, "db_files_index_key");
+    s.store_class_end();
+  }
+}
+
+db_files_package_key::db_files_package_key()
+  : package_id_()
+  , key_()
+  , temp_()
+{}
+
+db_files_package_key::db_files_package_key(std::int32_t package_id_, bool key_, bool temp_)
+  : package_id_(package_id_)
+  , key_(key_)
+  , temp_(temp_)
+{}
+
+const std::int32_t db_files_package_key::ID;
+
+object_ptr<db_files_Key> db_files_package_key::fetch(td::TlParser &p) {
+  return make_object<db_files_package_key>(p);
+}
+
+db_files_package_key::db_files_package_key(td::TlParser &p)
+#define FAIL(error) p.set_error(error)
+  : package_id_(TlFetchInt::parse(p))
+  , key_(TlFetchBool::parse(p))
+  , temp_(TlFetchBool::parse(p))
+#undef FAIL
+{}
+
+void db_files_package_key::store(td::TlStorerCalcLength &s) const {
+  (void)sizeof(s);
+  TlStoreBinary::store(package_id_, s);
+  TlStoreBool::store(key_, s);
+  TlStoreBool::store(temp_, s);
+}
+
+void db_files_package_key::store(td::TlStorerUnsafe &s) const {
+  (void)sizeof(s);
+  TlStoreBinary::store(package_id_, s);
+  TlStoreBool::store(key_, s);
+  TlStoreBool::store(temp_, s);
+}
+
+void db_files_package_key::store(td::TlStorerToString &s, const char *field_name) const {
+  if (!LOG_IS_STRIPPED(ERROR)) {
+    s.store_class_begin(field_name, "db_files_package_key");
+    s.store_field("package_id", package_id_);
+    s.store_field("key", key_);
+    s.store_field("temp", temp_);
+    s.store_class_end();
+  }
+}
+
+db_files_index_value::db_files_index_value()
+  : packages_()
+  , key_packages_()
+  , temp_packages_()
+{}
+
+db_files_index_value::db_files_index_value(std::vector<std::int32_t> &&packages_, std::vector<std::int32_t> &&key_packages_, std::vector<std::int32_t> &&temp_packages_)
+  : packages_(std::move(packages_))
+  , key_packages_(std::move(key_packages_))
+  , temp_packages_(std::move(temp_packages_))
+{}
+
+const std::int32_t db_files_index_value::ID;
+
+object_ptr<db_files_index_value> db_files_index_value::fetch(td::TlParser &p) {
+  return make_object<db_files_index_value>(p);
+}
+
+db_files_index_value::db_files_index_value(td::TlParser &p)
+#define FAIL(error) p.set_error(error)
+  : packages_(TlFetchVector<TlFetchInt>::parse(p))
+  , key_packages_(TlFetchVector<TlFetchInt>::parse(p))
+  , temp_packages_(TlFetchVector<TlFetchInt>::parse(p))
+#undef FAIL
+{}
+
+void db_files_index_value::store(td::TlStorerCalcLength &s) const {
+  (void)sizeof(s);
+  TlStoreVector<TlStoreBinary>::store(packages_, s);
+  TlStoreVector<TlStoreBinary>::store(key_packages_, s);
+  TlStoreVector<TlStoreBinary>::store(temp_packages_, s);
+}
+
+void db_files_index_value::store(td::TlStorerUnsafe &s) const {
+  (void)sizeof(s);
+  TlStoreVector<TlStoreBinary>::store(packages_, s);
+  TlStoreVector<TlStoreBinary>::store(key_packages_, s);
+  TlStoreVector<TlStoreBinary>::store(temp_packages_, s);
+}
+
+void db_files_index_value::store(td::TlStorerToString &s, const char *field_name) const {
+  if (!LOG_IS_STRIPPED(ERROR)) {
+    s.store_class_begin(field_name, "db_files_index_value");
+    { const std::vector<std::int32_t> &v = packages_; const std::uint32_t multiplicity = static_cast<std::uint32_t>(v.size()); const auto vector_name = "vector[" + td::to_string(multiplicity)+ "]"; s.store_class_begin("packages", vector_name.c_str()); for (std::uint32_t i = 0; i < multiplicity; i++) { s.store_field("", v[i]); } s.store_class_end(); }
+    { const std::vector<std::int32_t> &v = key_packages_; const std::uint32_t multiplicity = static_cast<std::uint32_t>(v.size()); const auto vector_name = "vector[" + td::to_string(multiplicity)+ "]"; s.store_class_begin("key_packages", vector_name.c_str()); for (std::uint32_t i = 0; i < multiplicity; i++) { s.store_field("", v[i]); } s.store_class_end(); }
+    { const std::vector<std::int32_t> &v = temp_packages_; const std::uint32_t multiplicity = static_cast<std::uint32_t>(v.size()); const auto vector_name = "vector[" + td::to_string(multiplicity)+ "]"; s.store_class_begin("temp_packages", vector_name.c_str()); for (std::uint32_t i = 0; i < multiplicity; i++) { s.store_field("", v[i]); } s.store_class_end(); }
+    s.store_class_end();
+  }
+}
+
+db_files_package_firstBlock::db_files_package_firstBlock()
+  : workchain_()
+  , shard_()
+  , seqno_()
+  , unixtime_()
+  , lt_()
+{}
+
+db_files_package_firstBlock::db_files_package_firstBlock(std::int32_t workchain_, std::int64_t shard_, std::int32_t seqno_, std::int32_t unixtime_, std::int64_t lt_)
+  : workchain_(workchain_)
+  , shard_(shard_)
+  , seqno_(seqno_)
+  , unixtime_(unixtime_)
+  , lt_(lt_)
+{}
+
+const std::int32_t db_files_package_firstBlock::ID;
+
+object_ptr<db_files_package_firstBlock> db_files_package_firstBlock::fetch(td::TlParser &p) {
+  return make_object<db_files_package_firstBlock>(p);
+}
+
+db_files_package_firstBlock::db_files_package_firstBlock(td::TlParser &p)
+#define FAIL(error) p.set_error(error)
+  : workchain_(TlFetchInt::parse(p))
+  , shard_(TlFetchLong::parse(p))
+  , seqno_(TlFetchInt::parse(p))
+  , unixtime_(TlFetchInt::parse(p))
+  , lt_(TlFetchLong::parse(p))
+#undef FAIL
+{}
+
+void db_files_package_firstBlock::store(td::TlStorerCalcLength &s) const {
+  (void)sizeof(s);
+  TlStoreBinary::store(workchain_, s);
+  TlStoreBinary::store(shard_, s);
+  TlStoreBinary::store(seqno_, s);
+  TlStoreBinary::store(unixtime_, s);
+  TlStoreBinary::store(lt_, s);
+}
+
+void db_files_package_firstBlock::store(td::TlStorerUnsafe &s) const {
+  (void)sizeof(s);
+  TlStoreBinary::store(workchain_, s);
+  TlStoreBinary::store(shard_, s);
+  TlStoreBinary::store(seqno_, s);
+  TlStoreBinary::store(unixtime_, s);
+  TlStoreBinary::store(lt_, s);
+}
+
+void db_files_package_firstBlock::store(td::TlStorerToString &s, const char *field_name) const {
+  if (!LOG_IS_STRIPPED(ERROR)) {
+    s.store_class_begin(field_name, "db_files_package_firstBlock");
+    s.store_field("workchain", workchain_);
+    s.store_field("shard", shard_);
+    s.store_field("seqno", seqno_);
+    s.store_field("unixtime", unixtime_);
+    s.store_field("lt", lt_);
+    s.store_class_end();
+  }
+}
+
+db_files_package_value::db_files_package_value()
+  : package_id_()
+  , key_()
+  , temp_()
+  , firstblocks_()
+  , deleted_()
+{}
+
+db_files_package_value::db_files_package_value(std::int32_t package_id_, bool key_, bool temp_, std::vector<object_ptr<db_files_package_firstBlock>> &&firstblocks_, bool deleted_)
+  : package_id_(package_id_)
+  , key_(key_)
+  , temp_(temp_)
+  , firstblocks_(std::move(firstblocks_))
+  , deleted_(deleted_)
+{}
+
+const std::int32_t db_files_package_value::ID;
+
+object_ptr<db_files_package_value> db_files_package_value::fetch(td::TlParser &p) {
+  return make_object<db_files_package_value>(p);
+}
+
+db_files_package_value::db_files_package_value(td::TlParser &p)
+#define FAIL(error) p.set_error(error)
+  : package_id_(TlFetchInt::parse(p))
+  , key_(TlFetchBool::parse(p))
+  , temp_(TlFetchBool::parse(p))
+  , firstblocks_(TlFetchVector<TlFetchObject<db_files_package_firstBlock>>::parse(p))
+  , deleted_(TlFetchBool::parse(p))
+#undef FAIL
+{}
+
+void db_files_package_value::store(td::TlStorerCalcLength &s) const {
+  (void)sizeof(s);
+  TlStoreBinary::store(package_id_, s);
+  TlStoreBool::store(key_, s);
+  TlStoreBool::store(temp_, s);
+  TlStoreVector<TlStoreObject>::store(firstblocks_, s);
+  TlStoreBool::store(deleted_, s);
+}
+
+void db_files_package_value::store(td::TlStorerUnsafe &s) const {
+  (void)sizeof(s);
+  TlStoreBinary::store(package_id_, s);
+  TlStoreBool::store(key_, s);
+  TlStoreBool::store(temp_, s);
+  TlStoreVector<TlStoreObject>::store(firstblocks_, s);
+  TlStoreBool::store(deleted_, s);
+}
+
+void db_files_package_value::store(td::TlStorerToString &s, const char *field_name) const {
+  if (!LOG_IS_STRIPPED(ERROR)) {
+    s.store_class_begin(field_name, "db_files_package_value");
+    s.store_field("package_id", package_id_);
+    s.store_field("key", key_);
+    s.store_field("temp", temp_);
+    { const std::vector<object_ptr<db_files_package_firstBlock>> &v = firstblocks_; const std::uint32_t multiplicity = static_cast<std::uint32_t>(v.size()); const auto vector_name = "vector[" + td::to_string(multiplicity)+ "]"; s.store_class_begin("firstblocks", vector_name.c_str()); for (std::uint32_t i = 0; i < multiplicity; i++) { if (v[i] == nullptr) { s.store_field("", "null"); } else { v[i]->store(s, ""); } } s.store_class_end(); }
+    s.store_field("deleted", deleted_);
+    s.store_class_end();
+  }
+}
+
 object_ptr<db_lt_Key> db_lt_Key::fetch(td::TlParser &p) {
 #define FAIL(error) p.set_error(error); return nullptr;
   int constructor = p.fetch_int();
@@ -5889,6 +6244,44 @@ void db_state_asyncSerializer::store(td::TlStorerToString &s, const char *field_
   }
 }
 
+db_state_dbVersion::db_state_dbVersion()
+  : version_()
+{}
+
+db_state_dbVersion::db_state_dbVersion(std::int32_t version_)
+  : version_(version_)
+{}
+
+const std::int32_t db_state_dbVersion::ID;
+
+object_ptr<db_state_dbVersion> db_state_dbVersion::fetch(td::TlParser &p) {
+  return make_object<db_state_dbVersion>(p);
+}
+
+db_state_dbVersion::db_state_dbVersion(td::TlParser &p)
+#define FAIL(error) p.set_error(error)
+  : version_(TlFetchInt::parse(p))
+#undef FAIL
+{}
+
+void db_state_dbVersion::store(td::TlStorerCalcLength &s) const {
+  (void)sizeof(s);
+  TlStoreBinary::store(version_, s);
+}
+
+void db_state_dbVersion::store(td::TlStorerUnsafe &s) const {
+  (void)sizeof(s);
+  TlStoreBinary::store(version_, s);
+}
+
+void db_state_dbVersion::store(td::TlStorerToString &s, const char *field_name) const {
+  if (!LOG_IS_STRIPPED(ERROR)) {
+    s.store_class_begin(field_name, "db_state_dbVersion");
+    s.store_field("version", version_);
+    s.store_class_end();
+  }
+}
+
 db_state_destroyedSessions::db_state_destroyedSessions()
   : sessions_()
 {}
@@ -6057,6 +6450,8 @@ object_ptr<db_state_Key> db_state_Key::fetch(td::TlParser &p) {
       return db_state_key_asyncSerializer::fetch(p);
     case db_state_key_hardforks::ID:
       return db_state_key_hardforks::fetch(p);
+    case db_state_key_dbVersion::ID:
+      return db_state_key_dbVersion::fetch(p);
     default:
       FAIL(PSTRING() << "Unknown constructor found " << td::format::as_hex(constructor));
   }
@@ -6249,6 +6644,37 @@ void db_state_key_hardforks::store(td::TlStorerToString &s, const char *field_na
   }
 }
 
+db_state_key_dbVersion::db_state_key_dbVersion() {
+}
+
+const std::int32_t db_state_key_dbVersion::ID;
+
+object_ptr<db_state_Key> db_state_key_dbVersion::fetch(td::TlParser &p) {
+  return make_object<db_state_key_dbVersion>(p);
+}
+
+db_state_key_dbVersion::db_state_key_dbVersion(td::TlParser &p)
+#define FAIL(error) p.set_error(error)
+#undef FAIL
+{
+  (void)p;
+}
+
+void db_state_key_dbVersion::store(td::TlStorerCalcLength &s) const {
+  (void)sizeof(s);
+}
+
+void db_state_key_dbVersion::store(td::TlStorerUnsafe &s) const {
+  (void)sizeof(s);
+}
+
+void db_state_key_dbVersion::store(td::TlStorerToString &s, const char *field_name) const {
+  if (!LOG_IS_STRIPPED(ERROR)) {
+    s.store_class_begin(field_name, "db_state_key_dbVersion");
+    s.store_class_end();
+  }
+}
+
 db_state_shardClient::db_state_shardClient()
   : block_()
 {}
@@ -8654,6 +9080,300 @@ void fec_online::store(td::TlStorerToString &s, const char *field_name) const {
   }
 }
 
+http_header::http_header()
+  : name_()
+  , value_()
+{}
+
+http_header::http_header(std::string const &name_, std::string const &value_)
+  : name_(std::move(name_))
+  , value_(std::move(value_))
+{}
+
+const std::int32_t http_header::ID;
+
+object_ptr<http_header> http_header::fetch(td::TlParser &p) {
+  return make_object<http_header>(p);
+}
+
+http_header::http_header(td::TlParser &p)
+#define FAIL(error) p.set_error(error)
+  : name_(TlFetchString<std::string>::parse(p))
+  , value_(TlFetchString<std::string>::parse(p))
+#undef FAIL
+{}
+
+void http_header::store(td::TlStorerCalcLength &s) const {
+  (void)sizeof(s);
+  TlStoreString::store(name_, s);
+  TlStoreString::store(value_, s);
+}
+
+void http_header::store(td::TlStorerUnsafe &s) const {
+  (void)sizeof(s);
+  TlStoreString::store(name_, s);
+  TlStoreString::store(value_, s);
+}
+
+void http_header::store(td::TlStorerToString &s, const char *field_name) const {
+  if (!LOG_IS_STRIPPED(ERROR)) {
+    s.store_class_begin(field_name, "http_header");
+    s.store_field("name", name_);
+    s.store_field("value", value_);
+    s.store_class_end();
+  }
+}
+
+http_payloadPart::http_payloadPart()
+  : data_()
+  , trailer_()
+  , last_()
+{}
+
+http_payloadPart::http_payloadPart(td::BufferSlice &&data_, std::vector<object_ptr<http_header>> &&trailer_, bool last_)
+  : data_(std::move(data_))
+  , trailer_(std::move(trailer_))
+  , last_(last_)
+{}
+
+const std::int32_t http_payloadPart::ID;
+
+object_ptr<http_payloadPart> http_payloadPart::fetch(td::TlParser &p) {
+  return make_object<http_payloadPart>(p);
+}
+
+http_payloadPart::http_payloadPart(td::TlParser &p)
+#define FAIL(error) p.set_error(error)
+  : data_(TlFetchBytes<td::BufferSlice>::parse(p))
+  , trailer_(TlFetchVector<TlFetchObject<http_header>>::parse(p))
+  , last_(TlFetchBool::parse(p))
+#undef FAIL
+{}
+
+void http_payloadPart::store(td::TlStorerCalcLength &s) const {
+  (void)sizeof(s);
+  TlStoreString::store(data_, s);
+  TlStoreVector<TlStoreObject>::store(trailer_, s);
+  TlStoreBool::store(last_, s);
+}
+
+void http_payloadPart::store(td::TlStorerUnsafe &s) const {
+  (void)sizeof(s);
+  TlStoreString::store(data_, s);
+  TlStoreVector<TlStoreObject>::store(trailer_, s);
+  TlStoreBool::store(last_, s);
+}
+
+void http_payloadPart::store(td::TlStorerToString &s, const char *field_name) const {
+  if (!LOG_IS_STRIPPED(ERROR)) {
+    s.store_class_begin(field_name, "http_payloadPart");
+    s.store_bytes_field("data", data_);
+    { const std::vector<object_ptr<http_header>> &v = trailer_; const std::uint32_t multiplicity = static_cast<std::uint32_t>(v.size()); const auto vector_name = "vector[" + td::to_string(multiplicity)+ "]"; s.store_class_begin("trailer", vector_name.c_str()); for (std::uint32_t i = 0; i < multiplicity; i++) { if (v[i] == nullptr) { s.store_field("", "null"); } else { v[i]->store(s, ""); } } s.store_class_end(); }
+    s.store_field("last", last_);
+    s.store_class_end();
+  }
+}
+
+http_response::http_response()
+  : http_version_()
+  , status_code_()
+  , reason_()
+  , headers_()
+{}
+
+http_response::http_response(std::string const &http_version_, std::int32_t status_code_, std::string const &reason_, std::vector<object_ptr<http_header>> &&headers_)
+  : http_version_(std::move(http_version_))
+  , status_code_(status_code_)
+  , reason_(std::move(reason_))
+  , headers_(std::move(headers_))
+{}
+
+const std::int32_t http_response::ID;
+
+object_ptr<http_response> http_response::fetch(td::TlParser &p) {
+  return make_object<http_response>(p);
+}
+
+http_response::http_response(td::TlParser &p)
+#define FAIL(error) p.set_error(error)
+  : http_version_(TlFetchString<std::string>::parse(p))
+  , status_code_(TlFetchInt::parse(p))
+  , reason_(TlFetchString<std::string>::parse(p))
+  , headers_(TlFetchVector<TlFetchObject<http_header>>::parse(p))
+#undef FAIL
+{}
+
+void http_response::store(td::TlStorerCalcLength &s) const {
+  (void)sizeof(s);
+  TlStoreString::store(http_version_, s);
+  TlStoreBinary::store(status_code_, s);
+  TlStoreString::store(reason_, s);
+  TlStoreVector<TlStoreObject>::store(headers_, s);
+}
+
+void http_response::store(td::TlStorerUnsafe &s) const {
+  (void)sizeof(s);
+  TlStoreString::store(http_version_, s);
+  TlStoreBinary::store(status_code_, s);
+  TlStoreString::store(reason_, s);
+  TlStoreVector<TlStoreObject>::store(headers_, s);
+}
+
+void http_response::store(td::TlStorerToString &s, const char *field_name) const {
+  if (!LOG_IS_STRIPPED(ERROR)) {
+    s.store_class_begin(field_name, "http_response");
+    s.store_field("http_version", http_version_);
+    s.store_field("status_code", status_code_);
+    s.store_field("reason", reason_);
+    { const std::vector<object_ptr<http_header>> &v = headers_; const std::uint32_t multiplicity = static_cast<std::uint32_t>(v.size()); const auto vector_name = "vector[" + td::to_string(multiplicity)+ "]"; s.store_class_begin("headers", vector_name.c_str()); for (std::uint32_t i = 0; i < multiplicity; i++) { if (v[i] == nullptr) { s.store_field("", "null"); } else { v[i]->store(s, ""); } } s.store_class_end(); }
+    s.store_class_end();
+  }
+}
+
+http_server_config::http_server_config()
+  : dhs_()
+  , local_hosts_()
+{}
+
+http_server_config::http_server_config(std::vector<object_ptr<http_server_dnsEntry>> &&dhs_, std::vector<object_ptr<http_server_host>> &&local_hosts_)
+  : dhs_(std::move(dhs_))
+  , local_hosts_(std::move(local_hosts_))
+{}
+
+const std::int32_t http_server_config::ID;
+
+object_ptr<http_server_config> http_server_config::fetch(td::TlParser &p) {
+  return make_object<http_server_config>(p);
+}
+
+http_server_config::http_server_config(td::TlParser &p)
+#define FAIL(error) p.set_error(error)
+  : dhs_(TlFetchVector<TlFetchObject<http_server_dnsEntry>>::parse(p))
+  , local_hosts_(TlFetchVector<TlFetchObject<http_server_host>>::parse(p))
+#undef FAIL
+{}
+
+void http_server_config::store(td::TlStorerCalcLength &s) const {
+  (void)sizeof(s);
+  TlStoreVector<TlStoreObject>::store(dhs_, s);
+  TlStoreVector<TlStoreObject>::store(local_hosts_, s);
+}
+
+void http_server_config::store(td::TlStorerUnsafe &s) const {
+  (void)sizeof(s);
+  TlStoreVector<TlStoreObject>::store(dhs_, s);
+  TlStoreVector<TlStoreObject>::store(local_hosts_, s);
+}
+
+void http_server_config::store(td::TlStorerToString &s, const char *field_name) const {
+  if (!LOG_IS_STRIPPED(ERROR)) {
+    s.store_class_begin(field_name, "http_server_config");
+    { const std::vector<object_ptr<http_server_dnsEntry>> &v = dhs_; const std::uint32_t multiplicity = static_cast<std::uint32_t>(v.size()); const auto vector_name = "vector[" + td::to_string(multiplicity)+ "]"; s.store_class_begin("dhs", vector_name.c_str()); for (std::uint32_t i = 0; i < multiplicity; i++) { if (v[i] == nullptr) { s.store_field("", "null"); } else { v[i]->store(s, ""); } } s.store_class_end(); }
+    { const std::vector<object_ptr<http_server_host>> &v = local_hosts_; const std::uint32_t multiplicity = static_cast<std::uint32_t>(v.size()); const auto vector_name = "vector[" + td::to_string(multiplicity)+ "]"; s.store_class_begin("local_hosts", vector_name.c_str()); for (std::uint32_t i = 0; i < multiplicity; i++) { if (v[i] == nullptr) { s.store_field("", "null"); } else { v[i]->store(s, ""); } } s.store_class_end(); }
+    s.store_class_end();
+  }
+}
+
+http_server_dnsEntry::http_server_dnsEntry()
+  : domain_()
+  , addr_()
+{}
+
+http_server_dnsEntry::http_server_dnsEntry(std::string const &domain_, object_ptr<adnl_id_short> &&addr_)
+  : domain_(std::move(domain_))
+  , addr_(std::move(addr_))
+{}
+
+const std::int32_t http_server_dnsEntry::ID;
+
+object_ptr<http_server_dnsEntry> http_server_dnsEntry::fetch(td::TlParser &p) {
+  return make_object<http_server_dnsEntry>(p);
+}
+
+http_server_dnsEntry::http_server_dnsEntry(td::TlParser &p)
+#define FAIL(error) p.set_error(error)
+  : domain_(TlFetchString<std::string>::parse(p))
+  , addr_(TlFetchObject<adnl_id_short>::parse(p))
+#undef FAIL
+{}
+
+void http_server_dnsEntry::store(td::TlStorerCalcLength &s) const {
+  (void)sizeof(s);
+  TlStoreString::store(domain_, s);
+  TlStoreObject::store(addr_, s);
+}
+
+void http_server_dnsEntry::store(td::TlStorerUnsafe &s) const {
+  (void)sizeof(s);
+  TlStoreString::store(domain_, s);
+  TlStoreObject::store(addr_, s);
+}
+
+void http_server_dnsEntry::store(td::TlStorerToString &s, const char *field_name) const {
+  if (!LOG_IS_STRIPPED(ERROR)) {
+    s.store_class_begin(field_name, "http_server_dnsEntry");
+    s.store_field("domain", domain_);
+    if (addr_ == nullptr) { s.store_field("addr", "null"); } else { addr_->store(s, "addr"); }
+    s.store_class_end();
+  }
+}
+
+http_server_host::http_server_host()
+  : domains_()
+  , ip_()
+  , port_()
+  , adnl_id_()
+{}
+
+http_server_host::http_server_host(std::vector<std::string> &&domains_, std::int32_t ip_, std::int32_t port_, object_ptr<adnl_id_short> &&adnl_id_)
+  : domains_(std::move(domains_))
+  , ip_(ip_)
+  , port_(port_)
+  , adnl_id_(std::move(adnl_id_))
+{}
+
+const std::int32_t http_server_host::ID;
+
+object_ptr<http_server_host> http_server_host::fetch(td::TlParser &p) {
+  return make_object<http_server_host>(p);
+}
+
+http_server_host::http_server_host(td::TlParser &p)
+#define FAIL(error) p.set_error(error)
+  : domains_(TlFetchVector<TlFetchString<std::string>>::parse(p))
+  , ip_(TlFetchInt::parse(p))
+  , port_(TlFetchInt::parse(p))
+  , adnl_id_(TlFetchObject<adnl_id_short>::parse(p))
+#undef FAIL
+{}
+
+void http_server_host::store(td::TlStorerCalcLength &s) const {
+  (void)sizeof(s);
+  TlStoreVector<TlStoreString>::store(domains_, s);
+  TlStoreBinary::store(ip_, s);
+  TlStoreBinary::store(port_, s);
+  TlStoreObject::store(adnl_id_, s);
+}
+
+void http_server_host::store(td::TlStorerUnsafe &s) const {
+  (void)sizeof(s);
+  TlStoreVector<TlStoreString>::store(domains_, s);
+  TlStoreBinary::store(ip_, s);
+  TlStoreBinary::store(port_, s);
+  TlStoreObject::store(adnl_id_, s);
+}
+
+void http_server_host::store(td::TlStorerToString &s, const char *field_name) const {
+  if (!LOG_IS_STRIPPED(ERROR)) {
+    s.store_class_begin(field_name, "http_server_host");
+    { const std::vector<std::string> &v = domains_; const std::uint32_t multiplicity = static_cast<std::uint32_t>(v.size()); const auto vector_name = "vector[" + td::to_string(multiplicity)+ "]"; s.store_class_begin("domains", vector_name.c_str()); for (std::uint32_t i = 0; i < multiplicity; i++) { s.store_field("", v[i]); } s.store_class_end(); }
+    s.store_field("ip", ip_);
+    s.store_field("port", port_);
+    if (adnl_id_ == nullptr) { s.store_field("adnl_id", "null"); } else { adnl_id_->store(s, "adnl_id"); }
+    s.store_class_end();
+  }
+}
+
 id_config_local::id_config_local()
   : id_()
 {}
@@ -10558,6 +11278,89 @@ void ton_blockIdApprove::store(td::TlStorerToString &s, const char *field_name)
   }
 }
 
+object_ptr<tonNode_ArchiveInfo> tonNode_ArchiveInfo::fetch(td::TlParser &p) {
+#define FAIL(error) p.set_error(error); return nullptr;
+  int constructor = p.fetch_int();
+  switch (constructor) {
+    case tonNode_archiveNotFound::ID:
+      return tonNode_archiveNotFound::fetch(p);
+    case tonNode_archiveInfo::ID:
+      return tonNode_archiveInfo::fetch(p);
+    default:
+      FAIL(PSTRING() << "Unknown constructor found " << td::format::as_hex(constructor));
+  }
+#undef FAIL
+}
+
+tonNode_archiveNotFound::tonNode_archiveNotFound() {
+}
+
+const std::int32_t tonNode_archiveNotFound::ID;
+
+object_ptr<tonNode_ArchiveInfo> tonNode_archiveNotFound::fetch(td::TlParser &p) {
+  return make_object<tonNode_archiveNotFound>(p);
+}
+
+tonNode_archiveNotFound::tonNode_archiveNotFound(td::TlParser &p)
+#define FAIL(error) p.set_error(error)
+#undef FAIL
+{
+  (void)p;
+}
+
+void tonNode_archiveNotFound::store(td::TlStorerCalcLength &s) const {
+  (void)sizeof(s);
+}
+
+void tonNode_archiveNotFound::store(td::TlStorerUnsafe &s) const {
+  (void)sizeof(s);
+}
+
+void tonNode_archiveNotFound::store(td::TlStorerToString &s, const char *field_name) const {
+  if (!LOG_IS_STRIPPED(ERROR)) {
+    s.store_class_begin(field_name, "tonNode_archiveNotFound");
+    s.store_class_end();
+  }
+}
+
+tonNode_archiveInfo::tonNode_archiveInfo()
+  : id_()
+{}
+
+tonNode_archiveInfo::tonNode_archiveInfo(std::int64_t id_)
+  : id_(id_)
+{}
+
+const std::int32_t tonNode_archiveInfo::ID;
+
+object_ptr<tonNode_ArchiveInfo> tonNode_archiveInfo::fetch(td::TlParser &p) {
+  return make_object<tonNode_archiveInfo>(p);
+}
+
+tonNode_archiveInfo::tonNode_archiveInfo(td::TlParser &p)
+#define FAIL(error) p.set_error(error)
+  : id_(TlFetchLong::parse(p))
+#undef FAIL
+{}
+
+void tonNode_archiveInfo::store(td::TlStorerCalcLength &s) const {
+  (void)sizeof(s);
+  TlStoreBinary::store(id_, s);
+}
+
+void tonNode_archiveInfo::store(td::TlStorerUnsafe &s) const {
+  (void)sizeof(s);
+  TlStoreBinary::store(id_, s);
+}
+
+void tonNode_archiveInfo::store(td::TlStorerToString &s, const char *field_name) const {
+  if (!LOG_IS_STRIPPED(ERROR)) {
+    s.store_class_begin(field_name, "tonNode_archiveInfo");
+    s.store_field("id", id_);
+    s.store_class_end();
+  }
+}
+
 object_ptr<tonNode_BlockDescription> tonNode_BlockDescription::fetch(td::TlParser &p) {
 #define FAIL(error) p.set_error(error); return nullptr;
   int constructor = p.fetch_int();
@@ -15164,6 +15967,134 @@ getTestObject::ReturnType getTestObject::fetch_result(td::TlParser &p) {
 #undef FAIL
 }
 
+http_getNextPayloadPart::http_getNextPayloadPart()
+  : id_()
+  , seqno_()
+  , max_chunk_size_()
+{}
+
+http_getNextPayloadPart::http_getNextPayloadPart(td::Bits256 const &id_, std::int32_t seqno_, std::int32_t max_chunk_size_)
+  : id_(id_)
+  , seqno_(seqno_)
+  , max_chunk_size_(max_chunk_size_)
+{}
+
+const std::int32_t http_getNextPayloadPart::ID;
+
+object_ptr<http_getNextPayloadPart> http_getNextPayloadPart::fetch(td::TlParser &p) {
+  return make_object<http_getNextPayloadPart>(p);
+}
+
+http_getNextPayloadPart::http_getNextPayloadPart(td::TlParser &p)
+#define FAIL(error) p.set_error(error)
+  : id_(TlFetchInt256::parse(p))
+  , seqno_(TlFetchInt::parse(p))
+  , max_chunk_size_(TlFetchInt::parse(p))
+#undef FAIL
+{}
+
+void http_getNextPayloadPart::store(td::TlStorerCalcLength &s) const {
+  (void)sizeof(s);
+  s.store_binary(-1871422196);
+  TlStoreBinary::store(id_, s);
+  TlStoreBinary::store(seqno_, s);
+  TlStoreBinary::store(max_chunk_size_, s);
+}
+
+void http_getNextPayloadPart::store(td::TlStorerUnsafe &s) const {
+  (void)sizeof(s);
+  s.store_binary(-1871422196);
+  TlStoreBinary::store(id_, s);
+  TlStoreBinary::store(seqno_, s);
+  TlStoreBinary::store(max_chunk_size_, s);
+}
+
+void http_getNextPayloadPart::store(td::TlStorerToString &s, const char *field_name) const {
+  if (!LOG_IS_STRIPPED(ERROR)) {
+    s.store_class_begin(field_name, "http_getNextPayloadPart");
+    s.store_field("id", id_);
+    s.store_field("seqno", seqno_);
+    s.store_field("max_chunk_size", max_chunk_size_);
+    s.store_class_end();
+  }
+}
+
+http_getNextPayloadPart::ReturnType http_getNextPayloadPart::fetch_result(td::TlParser &p) {
+#define FAIL(error) p.set_error(error); return ReturnType()
+  return TlFetchBoxed<TlFetchObject<http_payloadPart>, 693819236>::parse(p);
+#undef FAIL
+}
+
+http_request::http_request()
+  : id_()
+  , method_()
+  , url_()
+  , http_version_()
+  , headers_()
+{}
+
+http_request::http_request(td::Bits256 const &id_, std::string const &method_, std::string const &url_, std::string const &http_version_, std::vector<object_ptr<http_header>> &&headers_)
+  : id_(id_)
+  , method_(std::move(method_))
+  , url_(std::move(url_))
+  , http_version_(std::move(http_version_))
+  , headers_(std::move(headers_))
+{}
+
+const std::int32_t http_request::ID;
+
+object_ptr<http_request> http_request::fetch(td::TlParser &p) {
+  return make_object<http_request>(p);
+}
+
+http_request::http_request(td::TlParser &p)
+#define FAIL(error) p.set_error(error)
+  : id_(TlFetchInt256::parse(p))
+  , method_(TlFetchString<std::string>::parse(p))
+  , url_(TlFetchString<std::string>::parse(p))
+  , http_version_(TlFetchString<std::string>::parse(p))
+  , headers_(TlFetchVector<TlFetchObject<http_header>>::parse(p))
+#undef FAIL
+{}
+
+void http_request::store(td::TlStorerCalcLength &s) const {
+  (void)sizeof(s);
+  s.store_binary(1639027169);
+  TlStoreBinary::store(id_, s);
+  TlStoreString::store(method_, s);
+  TlStoreString::store(url_, s);
+  TlStoreString::store(http_version_, s);
+  TlStoreVector<TlStoreObject>::store(headers_, s);
+}
+
+void http_request::store(td::TlStorerUnsafe &s) const {
+  (void)sizeof(s);
+  s.store_binary(1639027169);
+  TlStoreBinary::store(id_, s);
+  TlStoreString::store(method_, s);
+  TlStoreString::store(url_, s);
+  TlStoreString::store(http_version_, s);
+  TlStoreVector<TlStoreObject>::store(headers_, s);
+}
+
+void http_request::store(td::TlStorerToString &s, const char *field_name) const {
+  if (!LOG_IS_STRIPPED(ERROR)) {
+    s.store_class_begin(field_name, "http_request");
+    s.store_field("id", id_);
+    s.store_field("method", method_);
+    s.store_field("url", url_);
+    s.store_field("http_version", http_version_);
+    { const std::vector<object_ptr<http_header>> &v = headers_; const std::uint32_t multiplicity = static_cast<std::uint32_t>(v.size()); const auto vector_name = "vector[" + td::to_string(multiplicity)+ "]"; s.store_class_begin("headers", vector_name.c_str()); for (std::uint32_t i = 0; i < multiplicity; i++) { if (v[i] == nullptr) { s.store_field("", "null"); } else { v[i]->store(s, ""); } } s.store_class_end(); }
+    s.store_class_end();
+  }
+}
+
+http_request::ReturnType http_request::fetch_result(td::TlParser &p) {
+#define FAIL(error) p.set_error(error); return ReturnType()
+  return TlFetchBoxed<TlFetchObject<http_response>, -273307789>::parse(p);
+#undef FAIL
+}
+
 overlay_getBroadcast::overlay_getBroadcast()
   : hash_()
 {}
@@ -15924,6 +16855,110 @@ tonNode_downloadZeroState::ReturnType tonNode_downloadZeroState::fetch_result(td
 #undef FAIL
 }
 
+tonNode_getArchiveInfo::tonNode_getArchiveInfo()
+  : masterchain_seqno_()
+{}
+
+tonNode_getArchiveInfo::tonNode_getArchiveInfo(std::int32_t masterchain_seqno_)
+  : masterchain_seqno_(masterchain_seqno_)
+{}
+
+const std::int32_t tonNode_getArchiveInfo::ID;
+
+object_ptr<tonNode_getArchiveInfo> tonNode_getArchiveInfo::fetch(td::TlParser &p) {
+  return make_object<tonNode_getArchiveInfo>(p);
+}
+
+tonNode_getArchiveInfo::tonNode_getArchiveInfo(td::TlParser &p)
+#define FAIL(error) p.set_error(error)
+  : masterchain_seqno_(TlFetchInt::parse(p))
+#undef FAIL
+{}
+
+void tonNode_getArchiveInfo::store(td::TlStorerCalcLength &s) const {
+  (void)sizeof(s);
+  s.store_binary(2066602305);
+  TlStoreBinary::store(masterchain_seqno_, s);
+}
+
+void tonNode_getArchiveInfo::store(td::TlStorerUnsafe &s) const {
+  (void)sizeof(s);
+  s.store_binary(2066602305);
+  TlStoreBinary::store(masterchain_seqno_, s);
+}
+
+void tonNode_getArchiveInfo::store(td::TlStorerToString &s, const char *field_name) const {
+  if (!LOG_IS_STRIPPED(ERROR)) {
+    s.store_class_begin(field_name, "tonNode_getArchiveInfo");
+    s.store_field("masterchain_seqno", masterchain_seqno_);
+    s.store_class_end();
+  }
+}
+
+tonNode_getArchiveInfo::ReturnType tonNode_getArchiveInfo::fetch_result(td::TlParser &p) {
+#define FAIL(error) p.set_error(error); return ReturnType()
+  return TlFetchObject<tonNode_ArchiveInfo>::parse(p);
+#undef FAIL
+}
+
+tonNode_getArchiveSlice::tonNode_getArchiveSlice()
+  : archive_id_()
+  , offset_()
+  , max_size_()
+{}
+
+tonNode_getArchiveSlice::tonNode_getArchiveSlice(std::int64_t archive_id_, std::int64_t offset_, std::int32_t max_size_)
+  : archive_id_(archive_id_)
+  , offset_(offset_)
+  , max_size_(max_size_)
+{}
+
+const std::int32_t tonNode_getArchiveSlice::ID;
+
+object_ptr<tonNode_getArchiveSlice> tonNode_getArchiveSlice::fetch(td::TlParser &p) {
+  return make_object<tonNode_getArchiveSlice>(p);
+}
+
+tonNode_getArchiveSlice::tonNode_getArchiveSlice(td::TlParser &p)
+#define FAIL(error) p.set_error(error)
+  : archive_id_(TlFetchLong::parse(p))
+  , offset_(TlFetchLong::parse(p))
+  , max_size_(TlFetchInt::parse(p))
+#undef FAIL
+{}
+
+void tonNode_getArchiveSlice::store(td::TlStorerCalcLength &s) const {
+  (void)sizeof(s);
+  s.store_binary(540758376);
+  TlStoreBinary::store(archive_id_, s);
+  TlStoreBinary::store(offset_, s);
+  TlStoreBinary::store(max_size_, s);
+}
+
+void tonNode_getArchiveSlice::store(td::TlStorerUnsafe &s) const {
+  (void)sizeof(s);
+  s.store_binary(540758376);
+  TlStoreBinary::store(archive_id_, s);
+  TlStoreBinary::store(offset_, s);
+  TlStoreBinary::store(max_size_, s);
+}
+
+void tonNode_getArchiveSlice::store(td::TlStorerToString &s, const char *field_name) const {
+  if (!LOG_IS_STRIPPED(ERROR)) {
+    s.store_class_begin(field_name, "tonNode_getArchiveSlice");
+    s.store_field("archive_id", archive_id_);
+    s.store_field("offset", offset_);
+    s.store_field("max_size", max_size_);
+    s.store_class_end();
+  }
+}
+
+tonNode_getArchiveSlice::ReturnType tonNode_getArchiveSlice::fetch_result(td::TlParser &p) {
+#define FAIL(error) p.set_error(error); return ReturnType()
+  return TlFetchBoxed<TlFetchObject<tonNode_data>, 1443505284>::parse(p);
+#undef FAIL
+}
+
 tonNode_getCapabilities::tonNode_getCapabilities() {
 }
 
diff --git a/submodules/ton/tonlib-src/tl/generate/auto/tl/ton_api.h b/submodules/ton/tonlib-src/tl/generate/auto/tl/ton_api.h
index 8bf7d8ff9b..6187d3f427 100644
--- a/submodules/ton/tonlib-src/tl/generate/auto/tl/ton_api.h
+++ b/submodules/ton/tonlib-src/tl/generate/auto/tl/ton_api.h
@@ -140,6 +140,14 @@ class db_filedb_Key;
 
 class db_filedb_value;
 
+class db_files_Key;
+
+class db_files_index_value;
+
+class db_files_package_firstBlock;
+
+class db_files_package_value;
+
 class db_lt_Key;
 
 class db_lt_desc_value;
@@ -158,6 +166,8 @@ class db_root_Key;
 
 class db_state_asyncSerializer;
 
+class db_state_dbVersion;
+
 class db_state_destroyedSessions;
 
 class db_state_gcBlockId;
@@ -258,6 +268,18 @@ class engine_validator_time;
 
 class fec_Type;
 
+class http_header;
+
+class http_payloadPart;
+
+class http_response;
+
+class http_server_config;
+
+class http_server_dnsEntry;
+
+class http_server_host;
+
 class id_config_local;
 
 class liteclient_config_global;
@@ -304,6 +326,8 @@ class tcp_pong;
 
 class ton_BlockId;
 
+class tonNode_ArchiveInfo;
+
 class tonNode_BlockDescription;
 
 class tonNode_blockId;
@@ -2362,11 +2386,12 @@ class db_block_info final : public db_block_Info {
   std::int64_t lt_;
   std::int32_t ts_;
   td::Bits256 state_;
-  enum Flags : std::int32_t {PREV_LEFT_MASK = 2, PREV_RIGHT_MASK = 4, NEXT_LEFT_MASK = 8, NEXT_RIGHT_MASK = 16, LT_MASK = 8192, TS_MASK = 16384, STATE_MASK = 131072};
+  std::int32_t masterchain_ref_seqno_;
+  enum Flags : std::int32_t {PREV_LEFT_MASK = 2, PREV_RIGHT_MASK = 4, NEXT_LEFT_MASK = 8, NEXT_RIGHT_MASK = 16, LT_MASK = 8192, TS_MASK = 16384, STATE_MASK = 131072, MASTERCHAIN_REF_SEQNO_MASK = 8388608};
 
   db_block_info();
 
-  db_block_info(object_ptr<tonNode_blockIdExt> &&id_, std::int32_t flags_, object_ptr<tonNode_blockIdExt> &&prev_left_, object_ptr<tonNode_blockIdExt> &&prev_right_, object_ptr<tonNode_blockIdExt> &&next_left_, object_ptr<tonNode_blockIdExt> &&next_right_, std::int64_t lt_, std::int32_t ts_, td::Bits256 const &state_);
+  db_block_info(object_ptr<tonNode_blockIdExt> &&id_, std::int32_t flags_, object_ptr<tonNode_blockIdExt> &&prev_left_, object_ptr<tonNode_blockIdExt> &&prev_right_, object_ptr<tonNode_blockIdExt> &&next_left_, object_ptr<tonNode_blockIdExt> &&next_right_, std::int64_t lt_, std::int32_t ts_, td::Bits256 const &state_, std::int32_t masterchain_ref_seqno_);
 
   static const std::int32_t ID = 1254549287;
   std::int32_t get_id() const final {
@@ -2811,6 +2836,30 @@ class db_filedb_key_candidate final : public db_filedb_Key {
   void store(td::TlStorerToString &s, const char *field_name) const final;
 };
 
+class db_filedb_key_blockInfo final : public db_filedb_Key {
+ public:
+  object_ptr<tonNode_blockIdExt> block_id_;
+
+  db_filedb_key_blockInfo();
+
+  explicit db_filedb_key_blockInfo(object_ptr<tonNode_blockIdExt> &&block_id_);
+
+  static const std::int32_t ID = -996551428;
+  std::int32_t get_id() const final {
+    return ID;
+  }
+
+  static object_ptr<db_filedb_Key> fetch(td::TlParser &p);
+
+  explicit db_filedb_key_blockInfo(td::TlParser &p);
+
+  void store(td::TlStorerCalcLength &s) const final;
+
+  void store(td::TlStorerUnsafe &s) const final;
+
+  void store(td::TlStorerToString &s, const char *field_name) const final;
+};
+
 class db_filedb_value final : public Object {
  public:
   object_ptr<db_filedb_Key> key_;
@@ -2838,6 +2887,141 @@ class db_filedb_value final : public Object {
   void store(td::TlStorerToString &s, const char *field_name) const final;
 };
 
+class db_files_Key: public Object {
+ public:
+
+  static object_ptr<db_files_Key> fetch(td::TlParser &p);
+};
+
+class db_files_index_key final : public db_files_Key {
+ public:
+
+  db_files_index_key();
+
+  static const std::int32_t ID = 2109998338;
+  std::int32_t get_id() const final {
+    return ID;
+  }
+
+  static object_ptr<db_files_Key> fetch(td::TlParser &p);
+
+  explicit db_files_index_key(td::TlParser &p);
+
+  void store(td::TlStorerCalcLength &s) const final;
+
+  void store(td::TlStorerUnsafe &s) const final;
+
+  void store(td::TlStorerToString &s, const char *field_name) const final;
+};
+
+class db_files_package_key final : public db_files_Key {
+ public:
+  std::int32_t package_id_;
+  bool key_;
+  bool temp_;
+
+  db_files_package_key();
+
+  db_files_package_key(std::int32_t package_id_, bool key_, bool temp_);
+
+  static const std::int32_t ID = -1526463682;
+  std::int32_t get_id() const final {
+    return ID;
+  }
+
+  static object_ptr<db_files_Key> fetch(td::TlParser &p);
+
+  explicit db_files_package_key(td::TlParser &p);
+
+  void store(td::TlStorerCalcLength &s) const final;
+
+  void store(td::TlStorerUnsafe &s) const final;
+
+  void store(td::TlStorerToString &s, const char *field_name) const final;
+};
+
+class db_files_index_value final : public Object {
+ public:
+  std::vector<std::int32_t> packages_;
+  std::vector<std::int32_t> key_packages_;
+  std::vector<std::int32_t> temp_packages_;
+
+  db_files_index_value();
+
+  db_files_index_value(std::vector<std::int32_t> &&packages_, std::vector<std::int32_t> &&key_packages_, std::vector<std::int32_t> &&temp_packages_);
+
+  static const std::int32_t ID = -1565402372;
+  std::int32_t get_id() const final {
+    return ID;
+  }
+
+  static object_ptr<db_files_index_value> fetch(td::TlParser &p);
+
+  explicit db_files_index_value(td::TlParser &p);
+
+  void store(td::TlStorerCalcLength &s) const final;
+
+  void store(td::TlStorerUnsafe &s) const final;
+
+  void store(td::TlStorerToString &s, const char *field_name) const final;
+};
+
+class db_files_package_firstBlock final : public Object {
+ public:
+  std::int32_t workchain_;
+  std::int64_t shard_;
+  std::int32_t seqno_;
+  std::int32_t unixtime_;
+  std::int64_t lt_;
+
+  db_files_package_firstBlock();
+
+  db_files_package_firstBlock(std::int32_t workchain_, std::int64_t shard_, std::int32_t seqno_, std::int32_t unixtime_, std::int64_t lt_);
+
+  static const std::int32_t ID = 1880254951;
+  std::int32_t get_id() const final {
+    return ID;
+  }
+
+  static object_ptr<db_files_package_firstBlock> fetch(td::TlParser &p);
+
+  explicit db_files_package_firstBlock(td::TlParser &p);
+
+  void store(td::TlStorerCalcLength &s) const final;
+
+  void store(td::TlStorerUnsafe &s) const final;
+
+  void store(td::TlStorerToString &s, const char *field_name) const final;
+};
+
+class db_files_package_value final : public Object {
+ public:
+  std::int32_t package_id_;
+  bool key_;
+  bool temp_;
+  std::vector<object_ptr<db_files_package_firstBlock>> firstblocks_;
+  bool deleted_;
+
+  db_files_package_value();
+
+  db_files_package_value(std::int32_t package_id_, bool key_, bool temp_, std::vector<object_ptr<db_files_package_firstBlock>> &&firstblocks_, bool deleted_);
+
+  static const std::int32_t ID = -464726741;
+  std::int32_t get_id() const final {
+    return ID;
+  }
+
+  static object_ptr<db_files_package_value> fetch(td::TlParser &p);
+
+  explicit db_files_package_value(td::TlParser &p);
+
+  void store(td::TlStorerCalcLength &s) const final;
+
+  void store(td::TlStorerUnsafe &s) const final;
+
+  void store(td::TlStorerToString &s, const char *field_name) const final;
+};
+
 class db_lt_Key: public Object {
  public:
 
@@ -3195,6 +3379,30 @@ class db_state_asyncSerializer final : public Object {
   void store(td::TlStorerToString &s, const char *field_name) const final;
 };
 
+class db_state_dbVersion final : public Object {
+ public:
+  std::int32_t version_;
+
+  db_state_dbVersion();
+
+  explicit db_state_dbVersion(std::int32_t version_);
+
+  static const std::int32_t ID = -650698505;
+  std::int32_t get_id() const final {
+    return ID;
+  }
+
+  static object_ptr<db_state_dbVersion> fetch(td::TlParser &p);
+
+  explicit db_state_dbVersion(td::TlParser &p);
+
+  void store(td::TlStorerCalcLength &s) const final;
+
+  void store(td::TlStorerUnsafe &s) const final;
+
+  void store(td::TlStorerToString &s, const char *field_name) const final;
+};
+
 class db_state_destroyedSessions final : public Object {
  public:
   std::vector<td::Bits256> sessions_;
@@ -3423,6 +3631,27 @@ class db_state_key_hardforks final : public db_state_Key {
   void store(td::TlStorerToString &s, const char *field_name) const final;
 };
 
+class db_state_key_dbVersion final : public db_state_Key {
+ public:
+
+  db_state_key_dbVersion();
+
+  static const std::int32_t ID = 1917788500;
+  std::int32_t get_id() const final {
+    return ID;
+  }
+
+  static object_ptr<db_state_Key> fetch(td::TlParser &p);
+
+  explicit db_state_key_dbVersion(td::TlParser &p);
+
+  void store(td::TlStorerCalcLength &s) const final;
+
+  void store(td::TlStorerUnsafe &s) const final;
+
+  void store(td::TlStorerToString &s, const char *field_name) const final;
+};
+
 class db_state_shardClient final : public Object {
  public:
   object_ptr<tonNode_blockIdExt> block_;
@@ -4751,6 +4980,161 @@ class fec_online final : public fec_Type {
   void store(td::TlStorerToString &s, const char *field_name) const final;
 };
 
+class http_header final : public Object {
+ public:
+  std::string name_;
+  std::string value_;
+
+  http_header();
+
+  http_header(std::string const &name_, std::string const &value_);
+
+  static const std::int32_t ID = -1902385903;
+  std::int32_t get_id() const final {
+    return ID;
+  }
+
+  static object_ptr<http_header> fetch(td::TlParser &p);
+
+  explicit http_header(td::TlParser &p);
+
+  void store(td::TlStorerCalcLength &s) const final;
+
+  void store(td::TlStorerUnsafe &s) const final;
+
+  void store(td::TlStorerToString &s, const char *field_name) const final;
+};
+
+class http_payloadPart final : public Object {
+ public:
+  td::BufferSlice data_;
+  std::vector<object_ptr<http_header>> trailer_;
+  bool last_;
+
+  http_payloadPart();
+
+  http_payloadPart(td::BufferSlice &&data_, std::vector<object_ptr<http_header>> &&trailer_, bool last_);
+
+  static const std::int32_t ID = 693819236;
+  std::int32_t get_id() const final {
+    return ID;
+  }
+
+  static object_ptr<http_payloadPart> fetch(td::TlParser &p);
+
+  explicit http_payloadPart(td::TlParser &p);
+
+  void store(td::TlStorerCalcLength &s) const final;
+
+  void store(td::TlStorerUnsafe &s) const final;
+
+  void store(td::TlStorerToString &s, const char *field_name) const final;
+};
+
+class http_response final : public Object {
+ public:
+  std::string http_version_;
+  std::int32_t status_code_;
+  std::string reason_;
+  std::vector<object_ptr<http_header>> headers_;
+
+  http_response();
+
+  http_response(std::string const &http_version_, std::int32_t status_code_, std::string const &reason_, std::vector<object_ptr<http_header>> &&headers_);
+
+  static const std::int32_t ID = -273307789;
+  std::int32_t get_id() const final {
+    return ID;
+  }
+
+  static object_ptr<http_response> fetch(td::TlParser &p);
+
+  explicit http_response(td::TlParser &p);
+
+  void store(td::TlStorerCalcLength &s) const final;
+
+  void store(td::TlStorerUnsafe &s) const final;
+
+  void store(td::TlStorerToString &s, const char *field_name) const final;
+};
+
+class http_server_config final : public Object {
+ public:
+  std::vector<object_ptr<http_server_dnsEntry>> dhs_;
+  std::vector<object_ptr<http_server_host>> local_hosts_;
+
+  http_server_config();
+
+  http_server_config(std::vector<object_ptr<http_server_dnsEntry>> &&dhs_, std::vector<object_ptr<http_server_host>> &&local_hosts_);
+
+  static const std::int32_t ID = 974419964;
+  std::int32_t get_id() const final {
+    return ID;
+  }
+
+  static object_ptr<http_server_config> fetch(td::TlParser &p);
+
+  explicit http_server_config(td::TlParser &p);
+
+  void store(td::TlStorerCalcLength &s) const final;
+
+  void store(td::TlStorerUnsafe &s) const final;
+
+  void store(td::TlStorerToString &s, const char *field_name) const final;
+};
+
+class http_server_dnsEntry final : public Object {
+ public:
+  std::string domain_;
+  object_ptr<adnl_id_short> addr_;
+
+  http_server_dnsEntry();
+
+  http_server_dnsEntry(std::string const &domain_, object_ptr<adnl_id_short> &&addr_);
+
+  static const std::int32_t ID = -663592810;
+  std::int32_t get_id() const final {
+    return ID;
+  }
+
+  static object_ptr<http_server_dnsEntry> fetch(td::TlParser &p);
+
+  explicit http_server_dnsEntry(td::TlParser &p);
+
+  void store(td::TlStorerCalcLength &s) const final;
+
+  void store(td::TlStorerUnsafe &s) const final;
+
+  void store(td::TlStorerToString &s, const char *field_name) const final;
+};
+
+class http_server_host final : public Object {
+ public:
+  std::vector<std::string> domains_;
+  std::int32_t ip_;
+  std::int32_t port_;
+  object_ptr<adnl_id_short> adnl_id_;
+
+  http_server_host();
+
+  http_server_host(std::vector<std::string> &&domains_, std::int32_t ip_, std::int32_t port_, object_ptr<adnl_id_short> &&adnl_id_);
+
+  static const std::int32_t ID = -981605721;
+  std::int32_t get_id() const final {
+    return ID;
+  }
+
+  static object_ptr<http_server_host> fetch(td::TlParser &p);
+
+  explicit http_server_host(td::TlParser &p);
+
+  void store(td::TlStorerCalcLength &s) const final;
+
+  void store(td::TlStorerUnsafe &s) const final;
+
+  void store(td::TlStorerToString &s, const char *field_name) const final;
+};
+
 class id_config_local final : public Object {
  public:
   object_ptr<PrivateKey> id_;
@@ -5759,6 +6143,57 @@ class ton_blockIdApprove final : public ton_BlockId {
   void store(td::TlStorerToString &s, const char *field_name) const final;
 };
 
+class tonNode_ArchiveInfo: public Object {
+ public:
+
+  static object_ptr<tonNode_ArchiveInfo> fetch(td::TlParser &p);
+};
+
+class tonNode_archiveNotFound final : public tonNode_ArchiveInfo {
+ public:
+
+  tonNode_archiveNotFound();
+
+  static const std::int32_t ID = -1725360509;
+  std::int32_t get_id() const final {
+    return ID;
+  }
+
+  static object_ptr<tonNode_ArchiveInfo> fetch(td::TlParser &p);
+
+  explicit tonNode_archiveNotFound(td::TlParser &p);
+
+  void store(td::TlStorerCalcLength &s) const final;
+
+  void store(td::TlStorerUnsafe &s) const final;
+
+  void store(td::TlStorerToString &s, const char *field_name) const final;
+};
+
+class tonNode_archiveInfo final : public tonNode_ArchiveInfo {
+ public:
+  std::int64_t id_;
+
+  tonNode_archiveInfo();
+
+  explicit tonNode_archiveInfo(std::int64_t id_);
+
+  static const std::int32_t ID = 435158924;
+  std::int32_t get_id() const final {
+    return ID;
+  }
+
+  static object_ptr<tonNode_ArchiveInfo> fetch(td::TlParser &p);
+
+  explicit tonNode_archiveInfo(td::TlParser &p);
+
+  void store(td::TlStorerCalcLength &s) const final;
+
+  void store(td::TlStorerUnsafe &s) const final;
+
+  void store(td::TlStorerToString &s, const char *field_name) const final;
+};
+
 class tonNode_BlockDescription: public Object {
  public:
 
@@ -8300,6 +8735,68 @@ class getTestObject final : public Function {
   static ReturnType fetch_result(td::TlParser &p);
 };
 
+class http_getNextPayloadPart final : public Function {
+ public:
+  td::Bits256 id_;
+  std::int32_t seqno_;
+  std::int32_t max_chunk_size_;
+
+  http_getNextPayloadPart();
+
+  http_getNextPayloadPart(td::Bits256 const &id_, std::int32_t seqno_, std::int32_t max_chunk_size_);
+
+  static const std::int32_t ID = -1871422196;
+  std::int32_t get_id() const final {
+    return ID;
+  }
+
+  using ReturnType = object_ptr<http_payloadPart>;
+
+  static object_ptr<http_getNextPayloadPart> fetch(td::TlParser &p);
+
+  explicit http_getNextPayloadPart(td::TlParser &p);
+
+  void store(td::TlStorerCalcLength &s) const final;
+
+  void store(td::TlStorerUnsafe &s) const final;
+
+  void store(td::TlStorerToString &s, const char *field_name) const final;
+
+  static ReturnType fetch_result(td::TlParser &p);
+};
+
+class http_request final : public Function {
+ public:
+  td::Bits256 id_;
+  std::string method_;
+  std::string url_;
+  std::string http_version_;
+  std::vector<object_ptr<http_header>> headers_;
+
+  http_request();
+
+  http_request(td::Bits256 const &id_, std::string const &method_, std::string const &url_, std::string const &http_version_, std::vector<object_ptr<http_header>> &&headers_);
+
+  static const std::int32_t ID = 1639027169;
+  std::int32_t get_id() const final {
+    return ID;
+  }
+
+  using ReturnType = object_ptr<http_response>;
+
+  static object_ptr<http_request> fetch(td::TlParser &p);
+
+  explicit http_request(td::TlParser &p);
+
+  void store(td::TlStorerCalcLength &s) const final;
+
+  void store(td::TlStorerUnsafe &s) const final;
+
+  void store(td::TlStorerToString &s, const char *field_name) const final;
+
+  static ReturnType fetch_result(td::TlParser &p);
+};
+
 class overlay_getBroadcast final : public Function {
  public:
   td::Bits256 hash_;
@@ -8752,6 +9249,64 @@ class tonNode_downloadZeroState final : public Function {
   static ReturnType fetch_result(td::TlParser &p);
 };
 
+class tonNode_getArchiveInfo final : public Function {
+ public:
+  std::int32_t masterchain_seqno_;
+
+  tonNode_getArchiveInfo();
+
+  explicit tonNode_getArchiveInfo(std::int32_t masterchain_seqno_);
+
+  static const std::int32_t ID = 2066602305;
+  std::int32_t get_id() const final {
+    return ID;
+  }
+
+  using ReturnType = object_ptr<tonNode_ArchiveInfo>;
+
+  static object_ptr<tonNode_getArchiveInfo> fetch(td::TlParser &p);
+
+  explicit tonNode_getArchiveInfo(td::TlParser &p);
+
+  void store(td::TlStorerCalcLength &s) const final;
+
+  void store(td::TlStorerUnsafe &s) const final;
+
+  void store(td::TlStorerToString &s, const char *field_name) const final;
+
+  static ReturnType fetch_result(td::TlParser &p);
+};
+
+class tonNode_getArchiveSlice final : public Function {
+ public:
+  std::int64_t archive_id_;
+  std::int64_t offset_;
+  std::int32_t max_size_;
+
+  tonNode_getArchiveSlice();
+
+  tonNode_getArchiveSlice(std::int64_t archive_id_, std::int64_t offset_, std::int32_t max_size_);
+
+  static const std::int32_t ID = 540758376;
+  std::int32_t get_id() const final {
+    return ID;
+  }
+
+  using ReturnType = object_ptr<tonNode_data>;
+
+  static object_ptr<tonNode_getArchiveSlice> fetch(td::TlParser &p);
+
+  explicit tonNode_getArchiveSlice(td::TlParser &p);
+
+  void store(td::TlStorerCalcLength &s) const final;
+
+  void store(td::TlStorerUnsafe &s) const final;
+
+  void store(td::TlStorerToString &s, const char *field_name) const final;
+
+  static ReturnType fetch_result(td::TlParser &p);
+};
+
 class tonNode_getCapabilities final : public Function {
  public:
 
diff --git a/submodules/ton/tonlib-src/tl/generate/auto/tl/ton_api.hpp b/submodules/ton/tonlib-src/tl/generate/auto/tl/ton_api.hpp
index 9216c063dc..e4df697cbd 100644
--- a/submodules/ton/tonlib-src/tl/generate/auto/tl/ton_api.hpp
+++ b/submodules/ton/tonlib-src/tl/generate/auto/tl/ton_api.hpp
@@ -296,9 +296,27 @@ bool downcast_call(Object &obj, const T &func) {
     case db_filedb_key_candidate::ID:
       func(static_cast<db_filedb_key_candidate &>(obj));
       return true;
+    case db_filedb_key_blockInfo::ID:
+      func(static_cast<db_filedb_key_blockInfo &>(obj));
+      return true;
     case db_filedb_value::ID:
       func(static_cast<db_filedb_value &>(obj));
       return true;
+    case db_files_index_key::ID:
+      func(static_cast<db_files_index_key &>(obj));
+      return true;
+    case db_files_package_key::ID:
+      func(static_cast<db_files_package_key &>(obj));
+      return true;
+    case db_files_index_value::ID:
+      func(static_cast<db_files_index_value &>(obj));
+      return true;
+    case db_files_package_firstBlock::ID:
+      func(static_cast<db_files_package_firstBlock &>(obj));
+      return true;
+    case db_files_package_value::ID:
+      func(static_cast<db_files_package_value &>(obj));
+      return true;
     case db_lt_el_key::ID:
       func(static_cast<db_lt_el_key &>(obj));
       return true;
@@ -341,6 +359,9 @@ bool downcast_call(Object &obj, const T &func) {
     case db_state_asyncSerializer::ID:
       func(static_cast<db_state_asyncSerializer &>(obj));
       return true;
+    case db_state_dbVersion::ID:
+      func(static_cast<db_state_dbVersion &>(obj));
+      return true;
     case db_state_destroyedSessions::ID:
       func(static_cast<db_state_destroyedSessions &>(obj));
       return true;
@@ -371,6 +392,9 @@ bool downcast_call(Object &obj, const T &func) {
     case db_state_key_hardforks::ID:
       func(static_cast<db_state_key_hardforks &>(obj));
       return true;
+    case db_state_key_dbVersion::ID:
+      func(static_cast<db_state_key_dbVersion &>(obj));
+      return true;
     case db_state_shardClient::ID:
       func(static_cast<db_state_shardClient &>(obj));
       return true;
@@ -527,6 +551,24 @@ bool downcast_call(Object &obj, const T &func) {
     case fec_online::ID:
       func(static_cast<fec_online &>(obj));
       return true;
+    case http_header::ID:
+      func(static_cast<http_header &>(obj));
+      return true;
+    case http_payloadPart::ID:
+      func(static_cast<http_payloadPart &>(obj));
+      return true;
+    case http_response::ID:
+      func(static_cast<http_response &>(obj));
+      return true;
+    case http_server_config::ID:
+      func(static_cast<http_server_config &>(obj));
+      return true;
+    case http_server_dnsEntry::ID:
+      func(static_cast<http_server_dnsEntry &>(obj));
+      return true;
+    case http_server_host::ID:
+      func(static_cast<http_server_host &>(obj));
+      return true;
     case id_config_local::ID:
       func(static_cast<id_config_local &>(obj));
       return true;
@@ -641,6 +683,12 @@ bool downcast_call(Object &obj, const T &func) {
     case ton_blockIdApprove::ID:
       func(static_cast<ton_blockIdApprove &>(obj));
       return true;
+    case tonNode_archiveNotFound::ID:
+      func(static_cast<tonNode_archiveNotFound &>(obj));
+      return true;
+    case tonNode_archiveInfo::ID:
+      func(static_cast<tonNode_archiveInfo &>(obj));
+      return true;
     case tonNode_blockDescriptionEmpty::ID:
       func(static_cast<tonNode_blockDescriptionEmpty &>(obj));
       return true;
@@ -937,6 +985,12 @@ bool downcast_call(Function &obj, const T &func) {
     case getTestObject::ID:
       func(static_cast<getTestObject &>(obj));
       return true;
+    case http_getNextPayloadPart::ID:
+      func(static_cast<http_getNextPayloadPart &>(obj));
+      return true;
+    case http_request::ID:
+      func(static_cast<http_request &>(obj));
+      return true;
     case overlay_getBroadcast::ID:
       func(static_cast<overlay_getBroadcast &>(obj));
       return true;
@@ -985,6 +1039,12 @@ bool downcast_call(Function &obj, const T &func) {
     case tonNode_downloadZeroState::ID:
       func(static_cast<tonNode_downloadZeroState &>(obj));
       return true;
+    case tonNode_getArchiveInfo::ID:
+      func(static_cast<tonNode_getArchiveInfo &>(obj));
+      return true;
+    case tonNode_getArchiveSlice::ID:
+      func(static_cast<tonNode_getArchiveSlice &>(obj));
+      return true;
     case tonNode_getCapabilities::ID:
       func(static_cast<tonNode_getCapabilities &>(obj));
       return true;
@@ -1407,6 +1467,29 @@ bool downcast_call(db_filedb_Key &obj, const T &func) {
     case db_filedb_key_candidate::ID:
       func(static_cast<db_filedb_key_candidate &>(obj));
       return true;
+    case db_filedb_key_blockInfo::ID:
+      func(static_cast<db_filedb_key_blockInfo &>(obj));
+      return true;
+    default:
+      return false;
+  }
+}
+
+/**
+ * Calls specified function object with the specified object downcasted to the most-derived type.
+ * \param[in] obj Object to pass as an argument to the function object.
+ * \param[in] func Function object to which the object will be passed.
+ * \returns whether function object call has happened. Should always return true for correct parameters.
+ */
+template <class T>
+bool downcast_call(db_files_Key &obj, const T &func) {
+  switch (obj.get_id()) {
+    case db_files_index_key::ID:
+      func(static_cast<db_files_index_key &>(obj));
+      return true;
+    case db_files_package_key::ID:
+      func(static_cast<db_files_package_key &>(obj));
+      return true;
     default:
       return false;
   }
@@ -1488,6 +1571,9 @@ bool downcast_call(db_state_Key &obj, const T &func) {
     case db_state_key_hardforks::ID:
       func(static_cast<db_state_key_hardforks &>(obj));
       return true;
+    case db_state_key_dbVersion::ID:
+      func(static_cast<db_state_key_dbVersion &>(obj));
+      return true;
     default:
       return false;
   }
@@ -1763,6 +1849,26 @@ bool downcast_call(ton_BlockId &obj, const T &func) {
   }
 }
 
+/**
+ * Calls specified function object with the specified object downcasted to the most-derived type.
+ * \param[in] obj Object to pass as an argument to the function object.
+ * \param[in] func Function object to which the object will be passed.
+ * \returns whether function object call has happened. Should always return true for correct parameters.
+ */
+template <class T>
+bool downcast_call(tonNode_ArchiveInfo &obj, const T &func) {
+  switch (obj.get_id()) {
+    case tonNode_archiveNotFound::ID:
+      func(static_cast<tonNode_archiveNotFound &>(obj));
+      return true;
+    case tonNode_archiveInfo::ID:
+      func(static_cast<tonNode_archiveInfo &>(obj));
+      return true;
+    default:
+      return false;
+  }
+}
+
 /**
  * Calls specified function object with the specified object downcasted to the most-derived type.
  * \param[in] obj Object to pass as an argument to the function object.
diff --git a/submodules/ton/tonlib-src/tl/generate/auto/tl/ton_api_json.cpp b/submodules/ton/tonlib-src/tl/generate/auto/tl/ton_api_json.cpp
index dde2c4fd45..9cf8386668 100644
--- a/submodules/ton/tonlib-src/tl/generate/auto/tl/ton_api_json.cpp
+++ b/submodules/ton/tonlib-src/tl/generate/auto/tl/ton_api_json.cpp
@@ -188,7 +188,19 @@ Result<int32> tl_constructor_from_string(ton_api::db_filedb_Key *object, const s
     {"db.filedb.key.proof", -627749396},
     {"db.filedb.key.proofLink", -1728330290},
     {"db.filedb.key.signatures", -685175541},
-    {"db.filedb.key.candidate", -494269767}
+    {"db.filedb.key.candidate", -494269767},
+    {"db.filedb.key.blockInfo", -996551428}
+  };
+  auto it = m.find(str);
+  if (it == m.end()) {
+    return Status::Error(str + "Unknown class");
+  }
+  return it->second;
+}
+Result<int32> tl_constructor_from_string(ton_api::db_files_Key *object, const std::string &str) {
+  static const std::unordered_map<Slice, int32, SliceHash> m = {
+    {"db.files.index.key", 2109998338},
+    {"db.files.package.key", -1526463682}
   };
   auto it = m.find(str);
   if (it == m.end()) {
@@ -228,7 +240,8 @@ Result<int32> tl_constructor_from_string(ton_api::db_state_Key *object, const st
     {"db.state.key.gcBlockId", -1015417890},
     {"db.state.key.shardClient", -912576121},
     {"db.state.key.asyncSerializer", 699304479},
-    {"db.state.key.hardforks", -420206662}
+    {"db.state.key.hardforks", -420206662},
+    {"db.state.key.dbVersion", 1917788500}
   };
   auto it = m.find(str);
   if (it == m.end()) {
@@ -378,6 +391,17 @@ Result<int32> tl_constructor_from_string(ton_api::ton_BlockId *object, const std
   }
   return it->second;
 }
+Result<int32> tl_constructor_from_string(ton_api::tonNode_ArchiveInfo *object, const std::string &str) {
+  static const std::unordered_map<Slice, int32, SliceHash> m = {
+    {"tonNode.archiveNotFound", -1725360509},
+    {"tonNode.archiveInfo", 435158924}
+  };
+  auto it = m.find(str);
+  if (it == m.end()) {
+    return Status::Error(str + "Unknown class");
+  }
+  return it->second;
+}
 Result<int32> tl_constructor_from_string(ton_api::tonNode_BlockDescription *object, const std::string &str) {
   static const std::unordered_map<Slice, int32, SliceHash> m = {
     {"tonNode.blockDescriptionEmpty", -2088456555},
@@ -593,7 +617,13 @@ Result<int32> tl_constructor_from_string(ton_api::Object *object, const std::str
     {"db.filedb.key.proofLink", -1728330290},
     {"db.filedb.key.signatures", -685175541},
     {"db.filedb.key.candidate", -494269767},
+    {"db.filedb.key.blockInfo", -996551428},
     {"db.filedb.value", -220390867},
+    {"db.files.index.key", 2109998338},
+    {"db.files.package.key", -1526463682},
+    {"db.files.index.value", -1565402372},
+    {"db.files.package.firstBlock", 1880254951},
+    {"db.files.package.value", -464726741},
     {"db.lt.el.key", -1523442974},
     {"db.lt.desc.key", -236722287},
     {"db.lt.shard.key", 1353120015},
@@ -608,6 +638,7 @@ Result<int32> tl_constructor_from_string(ton_api::Object *object, const std::str
     {"db.root.key.blockDb", 806534976},
     {"db.root.key.config", 331559556},
     {"db.state.asyncSerializer", -751883871},
+    {"db.state.dbVersion", -650698505},
     {"db.state.destroyedSessions", -1381443196},
     {"db.state.gcBlockId", -550453937},
     {"db.state.hardforks", -2047668988},
@@ -618,6 +649,7 @@ Result<int32> tl_constructor_from_string(ton_api::Object *object, const std::str
     {"db.state.key.shardClient", -912576121},
     {"db.state.key.asyncSerializer", 699304479},
     {"db.state.key.hardforks", -420206662},
+    {"db.state.key.dbVersion", 1917788500},
     {"db.state.shardClient", 186033821},
     {"dht.key", -160964977},
     {"dht.keyDescription", 673009157},
@@ -670,6 +702,12 @@ Result<int32> tl_constructor_from_string(ton_api::Object *object, const std::str
     {"fec.raptorQ", -1953257504},
     {"fec.roundRobin", 854927588},
     {"fec.online", 19359244},
+    {"http.header", -1902385903},
+    {"http.payloadPart", 693819236},
+    {"http.response", -273307789},
+    {"http.server.config", 974419964},
+    {"http.server.dnsEntry", -663592810},
+    {"http.server.host", -981605721},
     {"id.config.local", -1834367090},
     {"liteclient.config.global", 143507704},
     {"liteserver.desc", -1001806732},
@@ -708,6 +746,8 @@ Result<int32> tl_constructor_from_string(ton_api::Object *object, const std::str
     {"tcp.pong", -597034237},
     {"ton.blockId", -989106576},
     {"ton.blockIdApprove", 768887369},
+    {"tonNode.archiveNotFound", -1725360509},
+    {"tonNode.archiveInfo", 435158924},
     {"tonNode.blockDescriptionEmpty", -2088456555},
     {"tonNode.blockDescription", 1185009800},
     {"tonNode.blockId", -1211256473},
@@ -811,6 +851,8 @@ Result<int32> tl_constructor_from_string(ton_api::Function *object, const std::s
     {"engine.validator.setVerbosity", -1316856190},
     {"engine.validator.sign", 451549736},
     {"getTestObject", 197109379},
+    {"http.getNextPayloadPart", -1871422196},
+    {"http.request", 1639027169},
     {"overlay.getBroadcast", 758510240},
     {"overlay.getBroadcastList", 1109141562},
     {"overlay.getRandomPeers", 1223582891},
@@ -827,6 +869,8 @@ Result<int32> tl_constructor_from_string(ton_api::Function *object, const std::s
     {"tonNode.downloadPersistentState", 2140791736},
     {"tonNode.downloadPersistentStateSlice", -169220381},
     {"tonNode.downloadZeroState", -1379131814},
+    {"tonNode.getArchiveInfo", 2066602305},
+    {"tonNode.getArchiveSlice", 540758376},
     {"tonNode.getCapabilities", -555345672},
     {"tonNode.getNextBlockDescription", 341160179},
     {"tonNode.getNextBlocksDescription", 1059590852},
@@ -2116,6 +2160,12 @@ Status from_json(ton_api::db_block_info &to, JsonObject &from) {
       TRY_STATUS(from_json(to.state_, value));
     }
   }
+  {
+    TRY_RESULT(value, get_json_object_field(from, "masterchain_ref_seqno", JsonValue::Type::Null, true));
+    if (value.type() != JsonValue::Type::Null) {
+      TRY_STATUS(from_json(to.masterchain_ref_seqno_, value));
+    }
+  }
   return Status::OK();
 }
 Status from_json(ton_api::db_block_packedInfo &to, JsonObject &from) {
@@ -2343,6 +2393,15 @@ Status from_json(ton_api::db_filedb_key_candidate &to, JsonObject &from) {
   }
   return Status::OK();
 }
+Status from_json(ton_api::db_filedb_key_blockInfo &to, JsonObject &from) {
+  {
+    TRY_RESULT(value, get_json_object_field(from, "block_id", JsonValue::Type::Null, true));
+    if (value.type() != JsonValue::Type::Null) {
+      TRY_STATUS(from_json(to.block_id_, value));
+    }
+  }
+  return Status::OK();
+}
 Status from_json(ton_api::db_filedb_value &to, JsonObject &from) {
   {
     TRY_RESULT(value, get_json_object_field(from, "key", JsonValue::Type::Null, true));
@@ -2370,6 +2429,117 @@ Status from_json(ton_api::db_filedb_value &to, JsonObject &from) {
   }
   return Status::OK();
 }
+Status from_json(ton_api::db_files_index_key &to, JsonObject &from) {
+  return Status::OK();
+}
+Status from_json(ton_api::db_files_package_key &to, JsonObject &from) {
+  {
+    TRY_RESULT(value, get_json_object_field(from, "package_id", JsonValue::Type::Null, true));
+    if (value.type() != JsonValue::Type::Null) {
+      TRY_STATUS(from_json(to.package_id_, value));
+    }
+  }
+  {
+    TRY_RESULT(value, get_json_object_field(from, "key", JsonValue::Type::Null, true));
+    if (value.type() != JsonValue::Type::Null) {
+      TRY_STATUS(from_json(to.key_, value));
+    }
+  }
+  {
+    TRY_RESULT(value, get_json_object_field(from, "temp", JsonValue::Type::Null, true));
+    if (value.type() != JsonValue::Type::Null) {
+      TRY_STATUS(from_json(to.temp_, value));
+    }
+  }
+  return Status::OK();
+}
+Status from_json(ton_api::db_files_index_value &to, JsonObject &from) {
+  {
+    TRY_RESULT(value, get_json_object_field(from, "packages", JsonValue::Type::Null, true));
+    if (value.type() != JsonValue::Type::Null) {
+      TRY_STATUS(from_json(to.packages_, value));
+    }
+  }
+  {
+    TRY_RESULT(value, get_json_object_field(from, "key_packages", JsonValue::Type::Null, true));
+    if (value.type() != JsonValue::Type::Null) {
+      TRY_STATUS(from_json(to.key_packages_, value));
+    }
+  }
+  {
+    TRY_RESULT(value, get_json_object_field(from, "temp_packages", JsonValue::Type::Null, true));
+    if (value.type() != JsonValue::Type::Null) {
+      TRY_STATUS(from_json(to.temp_packages_, value));
+    }
+  }
+  return Status::OK();
+}
+Status from_json(ton_api::db_files_package_firstBlock &to, JsonObject &from) {
+  {
+    TRY_RESULT(value, get_json_object_field(from, "workchain", JsonValue::Type::Null, true));
+    if (value.type() != JsonValue::Type::Null) {
+      TRY_STATUS(from_json(to.workchain_, value));
+    }
+  }
+  {
+    TRY_RESULT(value, get_json_object_field(from, "shard", JsonValue::Type::Null, true));
+    if (value.type() != JsonValue::Type::Null) {
+      TRY_STATUS(from_json(to.shard_, value));
+    }
+  }
+  {
+    TRY_RESULT(value, get_json_object_field(from, "seqno", JsonValue::Type::Null, true));
+    if (value.type() != JsonValue::Type::Null) {
+      TRY_STATUS(from_json(to.seqno_, value));
+    }
+  }
+  {
+    TRY_RESULT(value, get_json_object_field(from, "unixtime", JsonValue::Type::Null, true));
+    if (value.type() != JsonValue::Type::Null) {
+      TRY_STATUS(from_json(to.unixtime_, value));
+    }
+  }
+  {
+    TRY_RESULT(value, get_json_object_field(from, "lt", JsonValue::Type::Null, true));
+    if (value.type() != JsonValue::Type::Null) {
+      TRY_STATUS(from_json(to.lt_, value));
+    }
+  }
+  return Status::OK();
+}
+Status from_json(ton_api::db_files_package_value &to, JsonObject &from) {
+  {
+    TRY_RESULT(value, get_json_object_field(from, "package_id", JsonValue::Type::Null, true));
+    if (value.type() != JsonValue::Type::Null) {
+      TRY_STATUS(from_json(to.package_id_, value));
+    }
+  }
+  {
+    TRY_RESULT(value, get_json_object_field(from, "key", JsonValue::Type::Null, true));
+    if (value.type() != JsonValue::Type::Null) {
+      TRY_STATUS(from_json(to.key_, value));
+    }
+  }
+  {
+    TRY_RESULT(value, get_json_object_field(from, "temp", JsonValue::Type::Null, true));
+    if (value.type() != JsonValue::Type::Null) {
+      TRY_STATUS(from_json(to.temp_, value));
+    }
+  }
+  {
+    TRY_RESULT(value, get_json_object_field(from, "firstblocks", JsonValue::Type::Null, true));
+    if (value.type() != JsonValue::Type::Null) {
+      TRY_STATUS(from_json(to.firstblocks_, value));
+    }
+  }
+  {
+    TRY_RESULT(value, get_json_object_field(from, "deleted", JsonValue::Type::Null, true));
+    if (value.type() != JsonValue::Type::Null) {
+      TRY_STATUS(from_json(to.deleted_, value));
+    }
+  }
+  return Status::OK();
+}
 Status from_json(ton_api::db_lt_el_key &to, JsonObject &from) {
   {
     TRY_RESULT(value, get_json_object_field(from, "workchain", JsonValue::Type::Null, true));
@@ -2574,6 +2744,15 @@ Status from_json(ton_api::db_state_asyncSerializer &to, JsonObject &from) {
   }
   return Status::OK();
 }
+Status from_json(ton_api::db_state_dbVersion &to, JsonObject &from) {
+  {
+    TRY_RESULT(value, get_json_object_field(from, "version", JsonValue::Type::Null, true));
+    if (value.type() != JsonValue::Type::Null) {
+      TRY_STATUS(from_json(to.version_, value));
+    }
+  }
+  return Status::OK();
+}
 Status from_json(ton_api::db_state_destroyedSessions &to, JsonObject &from) {
   {
     TRY_RESULT(value, get_json_object_field(from, "sessions", JsonValue::Type::Null, true));
@@ -2628,6 +2807,9 @@ Status from_json(ton_api::db_state_key_asyncSerializer &to, JsonObject &from) {
 Status from_json(ton_api::db_state_key_hardforks &to, JsonObject &from) {
   return Status::OK();
 }
+Status from_json(ton_api::db_state_key_dbVersion &to, JsonObject &from) {
+  return Status::OK();
+}
 Status from_json(ton_api::db_state_shardClient &to, JsonObject &from) {
   {
     TRY_RESULT(value, get_json_object_field(from, "block", JsonValue::Type::Null, true));
@@ -3456,6 +3638,126 @@ Status from_json(ton_api::fec_online &to, JsonObject &from) {
   }
   return Status::OK();
 }
+Status from_json(ton_api::http_header &to, JsonObject &from) {
+  {
+    TRY_RESULT(value, get_json_object_field(from, "name", JsonValue::Type::Null, true));
+    if (value.type() != JsonValue::Type::Null) {
+      TRY_STATUS(from_json(to.name_, value));
+    }
+  }
+  {
+    TRY_RESULT(value, get_json_object_field(from, "value", JsonValue::Type::Null, true));
+    if (value.type() != JsonValue::Type::Null) {
+      TRY_STATUS(from_json(to.value_, value));
+    }
+  }
+  return Status::OK();
+}
+Status from_json(ton_api::http_payloadPart &to, JsonObject &from) {
+  {
+    TRY_RESULT(value, get_json_object_field(from, "data", JsonValue::Type::Null, true));
+    if (value.type() != JsonValue::Type::Null) {
+      TRY_STATUS(from_json_bytes(to.data_, value));
+    }
+  }
+  {
+    TRY_RESULT(value, get_json_object_field(from, "trailer", JsonValue::Type::Null, true));
+    if (value.type() != JsonValue::Type::Null) {
+      TRY_STATUS(from_json(to.trailer_, value));
+    }
+  }
+  {
+    TRY_RESULT(value, get_json_object_field(from, "last", JsonValue::Type::Null, true));
+    if (value.type() != JsonValue::Type::Null) {
+      TRY_STATUS(from_json(to.last_, value));
+    }
+  }
+  return Status::OK();
+}
+Status from_json(ton_api::http_response &to, JsonObject &from) {
+  {
+    TRY_RESULT(value, get_json_object_field(from, "http_version", JsonValue::Type::Null, true));
+    if (value.type() != JsonValue::Type::Null) {
+      TRY_STATUS(from_json(to.http_version_, value));
+    }
+  }
+  {
+    TRY_RESULT(value, get_json_object_field(from, "status_code", JsonValue::Type::Null, true));
+    if (value.type() != JsonValue::Type::Null) {
+      TRY_STATUS(from_json(to.status_code_, value));
+    }
+  }
+  {
+    TRY_RESULT(value, get_json_object_field(from, "reason", JsonValue::Type::Null, true));
+    if (value.type() != JsonValue::Type::Null) {
+      TRY_STATUS(from_json(to.reason_, value));
+    }
+  }
+  {
+    TRY_RESULT(value, get_json_object_field(from, "headers", JsonValue::Type::Null, true));
+    if (value.type() != JsonValue::Type::Null) {
+      TRY_STATUS(from_json(to.headers_, value));
+    }
+  }
+  return Status::OK();
+}
+Status from_json(ton_api::http_server_config &to, JsonObject &from) {
+  {
+    TRY_RESULT(value, get_json_object_field(from, "dhs", JsonValue::Type::Null, true));
+    if (value.type() != JsonValue::Type::Null) {
+      TRY_STATUS(from_json(to.dhs_, value));
+    }
+  }
+  {
+    TRY_RESULT(value, get_json_object_field(from, "local_hosts", JsonValue::Type::Null, true));
+    if (value.type() != JsonValue::Type::Null) {
+      TRY_STATUS(from_json(to.local_hosts_, value));
+    }
+  }
+  return Status::OK();
+}
+Status from_json(ton_api::http_server_dnsEntry &to, JsonObject &from) {
+  {
+    TRY_RESULT(value, get_json_object_field(from, "domain", JsonValue::Type::Null, true));
+    if (value.type() != JsonValue::Type::Null) {
+      TRY_STATUS(from_json(to.domain_, value));
+    }
+  }
+  {
+    TRY_RESULT(value, get_json_object_field(from, "addr", JsonValue::Type::Null, true));
+    if (value.type() != JsonValue::Type::Null) {
+      TRY_STATUS(from_json(to.addr_, value));
+    }
+  }
+  return Status::OK();
+}
+Status from_json(ton_api::http_server_host &to, JsonObject &from) {
+  {
+    TRY_RESULT(value, get_json_object_field(from, "domains", JsonValue::Type::Null, true));
+    if (value.type() != JsonValue::Type::Null) {
+      TRY_STATUS(from_json(to.domains_, value));
+    }
+  }
+  {
+    TRY_RESULT(value, get_json_object_field(from, "ip", JsonValue::Type::Null, true));
+    if (value.type() != JsonValue::Type::Null) {
+      TRY_STATUS(from_json(to.ip_, value));
+    }
+  }
+  {
+    TRY_RESULT(value, get_json_object_field(from, "port", JsonValue::Type::Null, true));
+    if (value.type() != JsonValue::Type::Null) {
+      TRY_STATUS(from_json(to.port_, value));
+    }
+  }
+  {
+    TRY_RESULT(value, get_json_object_field(from, "adnl_id", JsonValue::Type::Null, true));
+    if (value.type() != JsonValue::Type::Null) {
+      TRY_STATUS(from_json(to.adnl_id_, value));
+    }
+  }
+  return Status::OK();
+}
 Status from_json(ton_api::id_config_local &to, JsonObject &from) {
   {
     TRY_RESULT(value, get_json_object_field(from, "id", JsonValue::Type::Null, true));
@@ -4146,6 +4448,18 @@ Status from_json(ton_api::ton_blockIdApprove &to, JsonObject &from) {
   }
   return Status::OK();
 }
+Status from_json(ton_api::tonNode_archiveNotFound &to, JsonObject &from) {
+  return Status::OK();
+}
+Status from_json(ton_api::tonNode_archiveInfo &to, JsonObject &from) {
+  {
+    TRY_RESULT(value, get_json_object_field(from, "id", JsonValue::Type::Null, true));
+    if (value.type() != JsonValue::Type::Null) {
+      TRY_STATUS(from_json(to.id_, value));
+    }
+  }
+  return Status::OK();
+}
 Status from_json(ton_api::tonNode_blockDescriptionEmpty &to, JsonObject &from) {
   return Status::OK();
 }
@@ -5550,6 +5864,60 @@ Status from_json(ton_api::engine_validator_sign &to, JsonObject &from) {
 Status from_json(ton_api::getTestObject &to, JsonObject &from) {
   return Status::OK();
 }
+Status from_json(ton_api::http_getNextPayloadPart &to, JsonObject &from) {
+  {
+    TRY_RESULT(value, get_json_object_field(from, "id", JsonValue::Type::Null, true));
+    if (value.type() != JsonValue::Type::Null) {
+      TRY_STATUS(from_json(to.id_, value));
+    }
+  }
+  {
+    TRY_RESULT(value, get_json_object_field(from, "seqno", JsonValue::Type::Null, true));
+    if (value.type() != JsonValue::Type::Null) {
+      TRY_STATUS(from_json(to.seqno_, value));
+    }
+  }
+  {
+    TRY_RESULT(value, get_json_object_field(from, "max_chunk_size", JsonValue::Type::Null, true));
+    if (value.type() != JsonValue::Type::Null) {
+      TRY_STATUS(from_json(to.max_chunk_size_, value));
+    }
+  }
+  return Status::OK();
+}
+Status from_json(ton_api::http_request &to, JsonObject &from) {
+  {
+    TRY_RESULT(value, get_json_object_field(from, "id", JsonValue::Type::Null, true));
+    if (value.type() != JsonValue::Type::Null) {
+      TRY_STATUS(from_json(to.id_, value));
+    }
+  }
+  {
+    TRY_RESULT(value, get_json_object_field(from, "method", JsonValue::Type::Null, true));
+    if (value.type() != JsonValue::Type::Null) {
+      TRY_STATUS(from_json(to.method_, value));
+    }
+  }
+  {
+    TRY_RESULT(value, get_json_object_field(from, "url", JsonValue::Type::Null, true));
+    if (value.type() != JsonValue::Type::Null) {
+      TRY_STATUS(from_json(to.url_, value));
+    }
+  }
+  {
+    TRY_RESULT(value, get_json_object_field(from, "http_version", JsonValue::Type::Null, true));
+    if (value.type() != JsonValue::Type::Null) {
+      TRY_STATUS(from_json(to.http_version_, value));
+    }
+  }
+  {
+    TRY_RESULT(value, get_json_object_field(from, "headers", JsonValue::Type::Null, true));
+    if (value.type() != JsonValue::Type::Null) {
+      TRY_STATUS(from_json(to.headers_, value));
+    }
+  }
+  return Status::OK();
+}
 Status from_json(ton_api::overlay_getBroadcast &to, JsonObject &from) {
   {
     TRY_RESULT(value, get_json_object_field(from, "hash", JsonValue::Type::Null, true));
@@ -5718,6 +6086,36 @@ Status from_json(ton_api::tonNode_downloadZeroState &to, JsonObject &from) {
   }
   return Status::OK();
 }
+Status from_json(ton_api::tonNode_getArchiveInfo &to, JsonObject &from) {
+  {
+    TRY_RESULT(value, get_json_object_field(from, "masterchain_seqno", JsonValue::Type::Null, true));
+    if (value.type() != JsonValue::Type::Null) {
+      TRY_STATUS(from_json(to.masterchain_seqno_, value));
+    }
+  }
+  return Status::OK();
+}
+Status from_json(ton_api::tonNode_getArchiveSlice &to, JsonObject &from) {
+  {
+    TRY_RESULT(value, get_json_object_field(from, "archive_id", JsonValue::Type::Null, true));
+    if (value.type() != JsonValue::Type::Null) {
+      TRY_STATUS(from_json(to.archive_id_, value));
+    }
+  }
+  {
+    TRY_RESULT(value, get_json_object_field(from, "offset", JsonValue::Type::Null, true));
+    if (value.type() != JsonValue::Type::Null) {
+      TRY_STATUS(from_json(to.offset_, value));
+    }
+  }
+  {
+    TRY_RESULT(value, get_json_object_field(from, "max_size", JsonValue::Type::Null, true));
+    if (value.type() != JsonValue::Type::Null) {
+      TRY_STATUS(from_json(to.max_size_, value));
+    }
+  }
+  return Status::OK();
+}
 Status from_json(ton_api::tonNode_getCapabilities &to, JsonObject &from) {
   return Status::OK();
 }
@@ -6468,6 +6866,7 @@ void to_json(JsonValueScope &jv, const ton_api::db_block_info &object) {
   jo << ctie("lt", ToJson(JsonInt64{object.lt_}));
   jo << ctie("ts", ToJson(object.ts_));
   jo << ctie("state", ToJson(object.state_));
+  jo << ctie("masterchain_ref_seqno", ToJson(object.masterchain_ref_seqno_));
 }
 void to_json(JsonValueScope &jv, const ton_api::db_block_packedInfo &object) {
   auto jo = jv.enter_object();
@@ -6610,6 +7009,13 @@ void to_json(JsonValueScope &jv, const ton_api::db_filedb_key_candidate &object)
     jo << ctie("id", ToJson(object.id_));
   }
 }
+void to_json(JsonValueScope &jv, const ton_api::db_filedb_key_blockInfo &object) {
+  auto jo = jv.enter_object();
+  jo << ctie("@type", "db.filedb.key.blockInfo");
+  if (object.block_id_) {
+    jo << ctie("block_id", ToJson(object.block_id_));
+  }
+}
 void to_json(JsonValueScope &jv, const ton_api::db_filedb_value &object) {
   auto jo = jv.enter_object();
   jo << ctie("@type", "db.filedb.value");
@@ -6620,6 +7026,45 @@ void to_json(JsonValueScope &jv, const ton_api::db_filedb_value &object) {
   jo << ctie("next", ToJson(object.next_));
   jo << ctie("file_hash", ToJson(object.file_hash_));
 }
+void to_json(JsonValueScope &jv, const ton_api::db_files_Key &object) {
+  ton_api::downcast_call(const_cast<ton_api::db_files_Key &>(object), [&jv](const auto &object) { to_json(jv, object); });
+}
+void to_json(JsonValueScope &jv, const ton_api::db_files_index_key &object) {
+  auto jo = jv.enter_object();
+  jo << ctie("@type", "db.files.index.key");
+}
+void to_json(JsonValueScope &jv, const ton_api::db_files_package_key &object) {
+  auto jo = jv.enter_object();
+  jo << ctie("@type", "db.files.package.key");
+  jo << ctie("package_id", ToJson(object.package_id_));
+  jo << ctie("key", ToJson(object.key_));
+  jo << ctie("temp", ToJson(object.temp_));
+}
+void to_json(JsonValueScope &jv, const ton_api::db_files_index_value &object) {
+  auto jo = jv.enter_object();
+  jo << ctie("@type", "db.files.index.value");
+  jo << ctie("packages", ToJson(object.packages_));
+  jo << ctie("key_packages", ToJson(object.key_packages_));
+  jo << ctie("temp_packages", ToJson(object.temp_packages_));
+}
+void to_json(JsonValueScope &jv, const ton_api::db_files_package_firstBlock &object) {
+  auto jo = jv.enter_object();
+  jo << ctie("@type", "db.files.package.firstBlock");
+  jo << ctie("workchain", ToJson(object.workchain_));
+  jo << ctie("shard", ToJson(JsonInt64{object.shard_}));
+  jo << ctie("seqno", ToJson(object.seqno_));
+  jo << ctie("unixtime", ToJson(object.unixtime_));
+  jo << ctie("lt", ToJson(JsonInt64{object.lt_}));
+}
+void to_json(JsonValueScope &jv, const ton_api::db_files_package_value &object) {
+  auto jo = jv.enter_object();
+  jo << ctie("@type", "db.files.package.value");
+  jo << ctie("package_id", ToJson(object.package_id_));
+  jo << ctie("key", ToJson(object.key_));
+  jo << ctie("temp", ToJson(object.temp_));
+  jo << ctie("firstblocks", ToJson(object.firstblocks_));
+  jo << ctie("deleted", ToJson(object.deleted_));
+}
 void to_json(JsonValueScope &jv, const ton_api::db_lt_Key &object) {
   ton_api::downcast_call(const_cast<ton_api::db_lt_Key &>(object), [&jv](const auto &object) { to_json(jv, object); });
 }
@@ -6717,6 +7162,11 @@ void to_json(JsonValueScope &jv, const ton_api::db_state_asyncSerializer &object
   }
   jo << ctie("last_ts", ToJson(object.last_ts_));
 }
+void to_json(JsonValueScope &jv, const ton_api::db_state_dbVersion &object) {
+  auto jo = jv.enter_object();
+  jo << ctie("@type", "db.state.dbVersion");
+  jo << ctie("version", ToJson(object.version_));
+}
 void to_json(JsonValueScope &jv, const ton_api::db_state_destroyedSessions &object) {
   auto jo = jv.enter_object();
   jo << ctie("@type", "db.state.destroyedSessions");
@@ -6768,6 +7218,10 @@ void to_json(JsonValueScope &jv, const ton_api::db_state_key_hardforks &object)
   auto jo = jv.enter_object();
   jo << ctie("@type", "db.state.key.hardforks");
 }
+void to_json(JsonValueScope &jv, const ton_api::db_state_key_dbVersion &object) {
+  auto jo = jv.enter_object();
+  jo << ctie("@type", "db.state.key.dbVersion");
+}
 void to_json(JsonValueScope &jv, const ton_api::db_state_shardClient &object) {
   auto jo = jv.enter_object();
   jo << ctie("@type", "db.state.shardClient");
@@ -7139,6 +7593,51 @@ void to_json(JsonValueScope &jv, const ton_api::fec_online &object) {
   jo << ctie("symbol_size", ToJson(object.symbol_size_));
   jo << ctie("symbols_count", ToJson(object.symbols_count_));
 }
+void to_json(JsonValueScope &jv, const ton_api::http_header &object) {
+  auto jo = jv.enter_object();
+  jo << ctie("@type", "http.header");
+  jo << ctie("name", ToJson(object.name_));
+  jo << ctie("value", ToJson(object.value_));
+}
+void to_json(JsonValueScope &jv, const ton_api::http_payloadPart &object) {
+  auto jo = jv.enter_object();
+  jo << ctie("@type", "http.payloadPart");
+  jo << ctie("data", ToJson(JsonBytes{object.data_}));
+  jo << ctie("trailer", ToJson(object.trailer_));
+  jo << ctie("last", ToJson(object.last_));
+}
+void to_json(JsonValueScope &jv, const ton_api::http_response &object) {
+  auto jo = jv.enter_object();
+  jo << ctie("@type", "http.response");
+  jo << ctie("http_version", ToJson(object.http_version_));
+  jo << ctie("status_code", ToJson(object.status_code_));
+  jo << ctie("reason", ToJson(object.reason_));
+  jo << ctie("headers", ToJson(object.headers_));
+}
+void to_json(JsonValueScope &jv, const ton_api::http_server_config &object) {
+  auto jo = jv.enter_object();
+  jo << ctie("@type", "http.server.config");
+  jo << ctie("dhs", ToJson(object.dhs_));
+  jo << ctie("local_hosts", ToJson(object.local_hosts_));
+}
+void to_json(JsonValueScope &jv, const ton_api::http_server_dnsEntry &object) {
+  auto jo = jv.enter_object();
+  jo << ctie("@type", "http.server.dnsEntry");
+  jo << ctie("domain", ToJson(object.domain_));
+  if (object.addr_) {
+    jo << ctie("addr", ToJson(object.addr_));
+  }
+}
+void to_json(JsonValueScope &jv, const ton_api::http_server_host &object) {
+  auto jo = jv.enter_object();
+  jo << ctie("@type", "http.server.host");
+  jo << ctie("domains", ToJson(object.domains_));
+  jo << ctie("ip", ToJson(object.ip_));
+  jo << ctie("port", ToJson(object.port_));
+  if (object.adnl_id_) {
+    jo << ctie("adnl_id", ToJson(object.adnl_id_));
+  }
+}
 void to_json(JsonValueScope &jv, const ton_api::id_config_local &object) {
   auto jo = jv.enter_object();
   jo << ctie("@type", "id.config.local");
@@ -7442,6 +7941,18 @@ void to_json(JsonValueScope &jv, const ton_api::ton_blockIdApprove &object) {
   jo << ctie("root_cell_hash", ToJson(object.root_cell_hash_));
   jo << ctie("file_hash", ToJson(object.file_hash_));
 }
+void to_json(JsonValueScope &jv, const ton_api::tonNode_ArchiveInfo &object) {
+  ton_api::downcast_call(const_cast<ton_api::tonNode_ArchiveInfo &>(object), [&jv](const auto &object) { to_json(jv, object); });
+}
+void to_json(JsonValueScope &jv, const ton_api::tonNode_archiveNotFound &object) {
+  auto jo = jv.enter_object();
+  jo << ctie("@type", "tonNode.archiveNotFound");
+}
+void to_json(JsonValueScope &jv, const ton_api::tonNode_archiveInfo &object) {
+  auto jo = jv.enter_object();
+  jo << ctie("@type", "tonNode.archiveInfo");
+  jo << ctie("id", ToJson(JsonInt64{object.id_}));
+}
 void to_json(JsonValueScope &jv, const ton_api::tonNode_BlockDescription &object) {
   ton_api::downcast_call(const_cast<ton_api::tonNode_BlockDescription &>(object), [&jv](const auto &object) { to_json(jv, object); });
 }
@@ -8065,6 +8576,22 @@ void to_json(JsonValueScope &jv, const ton_api::getTestObject &object) {
   auto jo = jv.enter_object();
   jo << ctie("@type", "getTestObject");
 }
+void to_json(JsonValueScope &jv, const ton_api::http_getNextPayloadPart &object) {
+  auto jo = jv.enter_object();
+  jo << ctie("@type", "http.getNextPayloadPart");
+  jo << ctie("id", ToJson(object.id_));
+  jo << ctie("seqno", ToJson(object.seqno_));
+  jo << ctie("max_chunk_size", ToJson(object.max_chunk_size_));
+}
+void to_json(JsonValueScope &jv, const ton_api::http_request &object) {
+  auto jo = jv.enter_object();
+  jo << ctie("@type", "http.request");
+  jo << ctie("id", ToJson(object.id_));
+  jo << ctie("method", ToJson(object.method_));
+  jo << ctie("url", ToJson(object.url_));
+  jo << ctie("http_version", ToJson(object.http_version_));
+  jo << ctie("headers", ToJson(object.headers_));
+}
 void to_json(JsonValueScope &jv, const ton_api::overlay_getBroadcast &object) {
   auto jo = jv.enter_object();
   jo << ctie("@type", "overlay.getBroadcast");
@@ -8173,6 +8700,18 @@ void to_json(JsonValueScope &jv, const ton_api::tonNode_downloadZeroState &objec
     jo << ctie("block", ToJson(object.block_));
   }
 }
+void to_json(JsonValueScope &jv, const ton_api::tonNode_getArchiveInfo &object) {
+  auto jo = jv.enter_object();
+  jo << ctie("@type", "tonNode.getArchiveInfo");
+  jo << ctie("masterchain_seqno", ToJson(object.masterchain_seqno_));
+}
+void to_json(JsonValueScope &jv, const ton_api::tonNode_getArchiveSlice &object) {
+  auto jo = jv.enter_object();
+  jo << ctie("@type", "tonNode.getArchiveSlice");
+  jo << ctie("archive_id", ToJson(JsonInt64{object.archive_id_}));
+  jo << ctie("offset", ToJson(JsonInt64{object.offset_}));
+  jo << ctie("max_size", ToJson(object.max_size_));
+}
 void to_json(JsonValueScope &jv, const ton_api::tonNode_getCapabilities &object) {
   auto jo = jv.enter_object();
   jo << ctie("@type", "tonNode.getCapabilities");
diff --git a/submodules/ton/tonlib-src/tl/generate/auto/tl/ton_api_json.h b/submodules/ton/tonlib-src/tl/generate/auto/tl/ton_api_json.h
index b7fbcebbc5..d7cc42728f 100644
--- a/submodules/ton/tonlib-src/tl/generate/auto/tl/ton_api_json.h
+++ b/submodules/ton/tonlib-src/tl/generate/auto/tl/ton_api_json.h
@@ -24,6 +24,7 @@ Result<int32> tl_constructor_from_string(ton_api::catchain_block_inner_Data *obj
 Result<int32> tl_constructor_from_string(ton_api::db_block_Info *object, const std::string &str);
 Result<int32> tl_constructor_from_string(ton_api::db_blockdb_Key *object, const std::string &str);
 Result<int32> tl_constructor_from_string(ton_api::db_filedb_Key *object, const std::string &str);
+Result<int32> tl_constructor_from_string(ton_api::db_files_Key *object, const std::string &str);
 Result<int32> tl_constructor_from_string(ton_api::db_lt_Key *object, const std::string &str);
 Result<int32> tl_constructor_from_string(ton_api::db_root_Key *object, const std::string &str);
 Result<int32> tl_constructor_from_string(ton_api::db_state_Key *object, const std::string &str);
@@ -39,6 +40,7 @@ Result<int32> tl_constructor_from_string(ton_api::rldp_Message *object, const st
 Result<int32> tl_constructor_from_string(ton_api::rldp_MessagePart *object, const std::string &str);
 Result<int32> tl_constructor_from_string(ton_api::tcp_Message *object, const std::string &str);
 Result<int32> tl_constructor_from_string(ton_api::ton_BlockId *object, const std::string &str);
+Result<int32> tl_constructor_from_string(ton_api::tonNode_ArchiveInfo *object, const std::string &str);
 Result<int32> tl_constructor_from_string(ton_api::tonNode_BlockDescription *object, const std::string &str);
 Result<int32> tl_constructor_from_string(ton_api::tonNode_Broadcast *object, const std::string &str);
 Result<int32> tl_constructor_from_string(ton_api::tonNode_DataFull *object, const std::string &str);
@@ -145,7 +147,13 @@ Status from_json(ton_api::db_filedb_key_proof &to, JsonObject &from);
 Status from_json(ton_api::db_filedb_key_proofLink &to, JsonObject &from);
 Status from_json(ton_api::db_filedb_key_signatures &to, JsonObject &from);
 Status from_json(ton_api::db_filedb_key_candidate &to, JsonObject &from);
+Status from_json(ton_api::db_filedb_key_blockInfo &to, JsonObject &from);
 Status from_json(ton_api::db_filedb_value &to, JsonObject &from);
+Status from_json(ton_api::db_files_index_key &to, JsonObject &from);
+Status from_json(ton_api::db_files_package_key &to, JsonObject &from);
+Status from_json(ton_api::db_files_index_value &to, JsonObject &from);
+Status from_json(ton_api::db_files_package_firstBlock &to, JsonObject &from);
+Status from_json(ton_api::db_files_package_value &to, JsonObject &from);
 Status from_json(ton_api::db_lt_el_key &to, JsonObject &from);
 Status from_json(ton_api::db_lt_desc_key &to, JsonObject &from);
 Status from_json(ton_api::db_lt_shard_key &to, JsonObject &from);
@@ -160,6 +168,7 @@ Status from_json(ton_api::db_root_key_cellDb &to, JsonObject &from);
 Status from_json(ton_api::db_root_key_blockDb &to, JsonObject &from);
 Status from_json(ton_api::db_root_key_config &to, JsonObject &from);
 Status from_json(ton_api::db_state_asyncSerializer &to, JsonObject &from);
+Status from_json(ton_api::db_state_dbVersion &to, JsonObject &from);
 Status from_json(ton_api::db_state_destroyedSessions &to, JsonObject &from);
 Status from_json(ton_api::db_state_gcBlockId &to, JsonObject &from);
 Status from_json(ton_api::db_state_hardforks &to, JsonObject &from);
@@ -170,6 +179,7 @@ Status from_json(ton_api::db_state_key_gcBlockId &to, JsonObject &from);
 Status from_json(ton_api::db_state_key_shardClient &to, JsonObject &from);
 Status from_json(ton_api::db_state_key_asyncSerializer &to, JsonObject &from);
 Status from_json(ton_api::db_state_key_hardforks &to, JsonObject &from);
+Status from_json(ton_api::db_state_key_dbVersion &to, JsonObject &from);
 Status from_json(ton_api::db_state_shardClient &to, JsonObject &from);
 Status from_json(ton_api::dht_key &to, JsonObject &from);
 Status from_json(ton_api::dht_keyDescription &to, JsonObject &from);
@@ -222,6 +232,12 @@ Status from_json(ton_api::engine_validator_time &to, JsonObject &from);
 Status from_json(ton_api::fec_raptorQ &to, JsonObject &from);
 Status from_json(ton_api::fec_roundRobin &to, JsonObject &from);
 Status from_json(ton_api::fec_online &to, JsonObject &from);
+Status from_json(ton_api::http_header &to, JsonObject &from);
+Status from_json(ton_api::http_payloadPart &to, JsonObject &from);
+Status from_json(ton_api::http_response &to, JsonObject &from);
+Status from_json(ton_api::http_server_config &to, JsonObject &from);
+Status from_json(ton_api::http_server_dnsEntry &to, JsonObject &from);
+Status from_json(ton_api::http_server_host &to, JsonObject &from);
 Status from_json(ton_api::id_config_local &to, JsonObject &from);
 Status from_json(ton_api::liteclient_config_global &to, JsonObject &from);
 Status from_json(ton_api::liteserver_desc &to, JsonObject &from);
@@ -260,6 +276,8 @@ Status from_json(ton_api::tcp_authentificationComplete &to, JsonObject &from);
 Status from_json(ton_api::tcp_pong &to, JsonObject &from);
 Status from_json(ton_api::ton_blockId &to, JsonObject &from);
 Status from_json(ton_api::ton_blockIdApprove &to, JsonObject &from);
+Status from_json(ton_api::tonNode_archiveNotFound &to, JsonObject &from);
+Status from_json(ton_api::tonNode_archiveInfo &to, JsonObject &from);
 Status from_json(ton_api::tonNode_blockDescriptionEmpty &to, JsonObject &from);
 Status from_json(ton_api::tonNode_blockDescription &to, JsonObject &from);
 Status from_json(ton_api::tonNode_blockId &to, JsonObject &from);
@@ -354,6 +372,8 @@ Status from_json(ton_api::engine_validator_importPrivateKey &to, JsonObject &fro
 Status from_json(ton_api::engine_validator_setVerbosity &to, JsonObject &from);
 Status from_json(ton_api::engine_validator_sign &to, JsonObject &from);
 Status from_json(ton_api::getTestObject &to, JsonObject &from);
+Status from_json(ton_api::http_getNextPayloadPart &to, JsonObject &from);
+Status from_json(ton_api::http_request &to, JsonObject &from);
 Status from_json(ton_api::overlay_getBroadcast &to, JsonObject &from);
 Status from_json(ton_api::overlay_getBroadcastList &to, JsonObject &from);
 Status from_json(ton_api::overlay_getRandomPeers &to, JsonObject &from);
@@ -370,6 +390,8 @@ Status from_json(ton_api::tonNode_downloadNextBlockFull &to, JsonObject &from);
 Status from_json(ton_api::tonNode_downloadPersistentState &to, JsonObject &from);
 Status from_json(ton_api::tonNode_downloadPersistentStateSlice &to, JsonObject &from);
 Status from_json(ton_api::tonNode_downloadZeroState &to, JsonObject &from);
+Status from_json(ton_api::tonNode_getArchiveInfo &to, JsonObject &from);
+Status from_json(ton_api::tonNode_getArchiveSlice &to, JsonObject &from);
 Status from_json(ton_api::tonNode_getCapabilities &to, JsonObject &from);
 Status from_json(ton_api::tonNode_getNextBlockDescription &to, JsonObject &from);
 Status from_json(ton_api::tonNode_getNextBlocksDescription &to, JsonObject &from);
@@ -492,7 +514,14 @@ void to_json(JsonValueScope &jv, const ton_api::db_filedb_key_proof &object);
 void to_json(JsonValueScope &jv, const ton_api::db_filedb_key_proofLink &object);
 void to_json(JsonValueScope &jv, const ton_api::db_filedb_key_signatures &object);
 void to_json(JsonValueScope &jv, const ton_api::db_filedb_key_candidate &object);
+void to_json(JsonValueScope &jv, const ton_api::db_filedb_key_blockInfo &object);
 void to_json(JsonValueScope &jv, const ton_api::db_filedb_value &object);
+void to_json(JsonValueScope &jv, const ton_api::db_files_Key &object);
+void to_json(JsonValueScope &jv, const ton_api::db_files_index_key &object);
+void to_json(JsonValueScope &jv, const ton_api::db_files_package_key &object);
+void to_json(JsonValueScope &jv, const ton_api::db_files_index_value &object);
+void to_json(JsonValueScope &jv, const ton_api::db_files_package_firstBlock &object);
+void to_json(JsonValueScope &jv, const ton_api::db_files_package_value &object);
 void to_json(JsonValueScope &jv, const ton_api::db_lt_Key &object);
 void to_json(JsonValueScope &jv, const ton_api::db_lt_el_key &object);
 void to_json(JsonValueScope &jv, const ton_api::db_lt_desc_key &object);
@@ -509,6 +538,7 @@ void to_json(JsonValueScope &jv, const ton_api::db_root_key_cellDb &object);
 void to_json(JsonValueScope &jv, const ton_api::db_root_key_blockDb &object);
 void to_json(JsonValueScope &jv, const ton_api::db_root_key_config &object);
 void to_json(JsonValueScope &jv, const ton_api::db_state_asyncSerializer &object);
+void to_json(JsonValueScope &jv, const ton_api::db_state_dbVersion &object);
 void to_json(JsonValueScope &jv, const ton_api::db_state_destroyedSessions &object);
 void to_json(JsonValueScope &jv, const ton_api::db_state_gcBlockId &object);
 void to_json(JsonValueScope &jv, const ton_api::db_state_hardforks &object);
@@ -520,6 +550,7 @@ void to_json(JsonValueScope &jv, const ton_api::db_state_key_gcBlockId &object);
 void to_json(JsonValueScope &jv, const ton_api::db_state_key_shardClient &object);
 void to_json(JsonValueScope &jv, const ton_api::db_state_key_asyncSerializer &object);
 void to_json(JsonValueScope &jv, const ton_api::db_state_key_hardforks &object);
+void to_json(JsonValueScope &jv, const ton_api::db_state_key_dbVersion &object);
 void to_json(JsonValueScope &jv, const ton_api::db_state_shardClient &object);
 void to_json(JsonValueScope &jv, const ton_api::dht_key &object);
 void to_json(JsonValueScope &jv, const ton_api::dht_keyDescription &object);
@@ -577,6 +608,12 @@ void to_json(JsonValueScope &jv, const ton_api::fec_Type &object);
 void to_json(JsonValueScope &jv, const ton_api::fec_raptorQ &object);
 void to_json(JsonValueScope &jv, const ton_api::fec_roundRobin &object);
 void to_json(JsonValueScope &jv, const ton_api::fec_online &object);
+void to_json(JsonValueScope &jv, const ton_api::http_header &object);
+void to_json(JsonValueScope &jv, const ton_api::http_payloadPart &object);
+void to_json(JsonValueScope &jv, const ton_api::http_response &object);
+void to_json(JsonValueScope &jv, const ton_api::http_server_config &object);
+void to_json(JsonValueScope &jv, const ton_api::http_server_dnsEntry &object);
+void to_json(JsonValueScope &jv, const ton_api::http_server_host &object);
 void to_json(JsonValueScope &jv, const ton_api::id_config_local &object);
 void to_json(JsonValueScope &jv, const ton_api::liteclient_config_global &object);
 void to_json(JsonValueScope &jv, const ton_api::liteserver_desc &object);
@@ -622,6 +659,9 @@ void to_json(JsonValueScope &jv, const ton_api::tcp_pong &object);
 void to_json(JsonValueScope &jv, const ton_api::ton_BlockId &object);
 void to_json(JsonValueScope &jv, const ton_api::ton_blockId &object);
 void to_json(JsonValueScope &jv, const ton_api::ton_blockIdApprove &object);
+void to_json(JsonValueScope &jv, const ton_api::tonNode_ArchiveInfo &object);
+void to_json(JsonValueScope &jv, const ton_api::tonNode_archiveNotFound &object);
+void to_json(JsonValueScope &jv, const ton_api::tonNode_archiveInfo &object);
 void to_json(JsonValueScope &jv, const ton_api::tonNode_BlockDescription &object);
 void to_json(JsonValueScope &jv, const ton_api::tonNode_blockDescriptionEmpty &object);
 void to_json(JsonValueScope &jv, const ton_api::tonNode_blockDescription &object);
@@ -726,6 +766,8 @@ void to_json(JsonValueScope &jv, const ton_api::engine_validator_importPrivateKe
 void to_json(JsonValueScope &jv, const ton_api::engine_validator_setVerbosity &object);
 void to_json(JsonValueScope &jv, const ton_api::engine_validator_sign &object);
 void to_json(JsonValueScope &jv, const ton_api::getTestObject &object);
+void to_json(JsonValueScope &jv, const ton_api::http_getNextPayloadPart &object);
+void to_json(JsonValueScope &jv, const ton_api::http_request &object);
 void to_json(JsonValueScope &jv, const ton_api::overlay_getBroadcast &object);
 void to_json(JsonValueScope &jv, const ton_api::overlay_getBroadcastList &object);
 void to_json(JsonValueScope &jv, const ton_api::overlay_getRandomPeers &object);
@@ -742,6 +784,8 @@ void to_json(JsonValueScope &jv, const ton_api::tonNode_downloadNextBlockFull &o
 void to_json(JsonValueScope &jv, const ton_api::tonNode_downloadPersistentState &object);
 void to_json(JsonValueScope &jv, const ton_api::tonNode_downloadPersistentStateSlice &object);
 void to_json(JsonValueScope &jv, const ton_api::tonNode_downloadZeroState &object);
+void to_json(JsonValueScope &jv, const ton_api::tonNode_getArchiveInfo &object);
+void to_json(JsonValueScope &jv, const ton_api::tonNode_getArchiveSlice &object);
 void to_json(JsonValueScope &jv, const ton_api::tonNode_getCapabilities &object);
 void to_json(JsonValueScope &jv, const ton_api::tonNode_getNextBlockDescription &object);
 void to_json(JsonValueScope &jv, const ton_api::tonNode_getNextBlocksDescription &object);
diff --git a/submodules/ton/tonlib-src/tl/generate/auto/tl/tonlib_api.cpp b/submodules/ton/tonlib-src/tl/generate/auto/tl/tonlib_api.cpp
index 1facb43fa7..1b6fb98d11 100644
--- a/submodules/ton/tonlib-src/tl/generate/auto/tl/tonlib_api.cpp
+++ b/submodules/ton/tonlib-src/tl/generate/auto/tl/tonlib_api.cpp
@@ -37,6 +37,267 @@ void accountAddress::store(td::TlStorerToString &s, const char *field_name) cons
   }
 }
 
+accountRevisionList::accountRevisionList()
+  : revisions_()
+{}
+
+accountRevisionList::accountRevisionList(std::vector<std::int32_t> &&revisions_)
+  : revisions_(std::move(revisions_))
+{}
+
+const std::int32_t accountRevisionList::ID;
+
+void accountRevisionList::store(td::TlStorerToString &s, const char *field_name) const {
+  if (!LOG_IS_STRIPPED(ERROR)) {
+    s.store_class_begin(field_name, "accountRevisionList");
+    { const std::vector<std::int32_t> &v = revisions_; const std::uint32_t multiplicity = static_cast<std::uint32_t>(v.size()); const auto vector_name = "vector[" + td::to_string(multiplicity)+ "]"; s.store_class_begin("revisions", vector_name.c_str()); for (std::uint32_t i = 0; i < multiplicity; i++) { s.store_field("", v[i]); } s.store_class_end(); }
+    s.store_class_end();
+  }
+}
+
+raw_accountState::raw_accountState()
+  : code_()
+  , data_()
+  , frozen_hash_()
+{}
+
+raw_accountState::raw_accountState(std::string const &code_, std::string const &data_, std::string const &frozen_hash_)
+  : code_(std::move(code_))
+  , data_(std::move(data_))
+  , frozen_hash_(std::move(frozen_hash_))
+{}
+
+const std::int32_t raw_accountState::ID;
+
+void raw_accountState::store(td::TlStorerToString &s, const char *field_name) const {
+  if (!LOG_IS_STRIPPED(ERROR)) {
+    s.store_class_begin(field_name, "raw_accountState");
+    s.store_bytes_field("code", code_);
+    s.store_bytes_field("data", data_);
+    s.store_bytes_field("frozen_hash", frozen_hash_);
+    s.store_class_end();
+  }
+}
+
+testWallet_accountState::testWallet_accountState()
+  : seqno_()
+{}
+
+testWallet_accountState::testWallet_accountState(std::int32_t seqno_)
+  : seqno_(seqno_)
+{}
+
+const std::int32_t testWallet_accountState::ID;
+
+void testWallet_accountState::store(td::TlStorerToString &s, const char *field_name) const {
+  if (!LOG_IS_STRIPPED(ERROR)) {
+    s.store_class_begin(field_name, "testWallet_accountState");
+    s.store_field("seqno", seqno_);
+    s.store_class_end();
+  }
+}
+
+wallet_accountState::wallet_accountState()
+  : seqno_()
+{}
+
+wallet_accountState::wallet_accountState(std::int32_t seqno_)
+  : seqno_(seqno_)
+{}
+
+const std::int32_t wallet_accountState::ID;
+
+void wallet_accountState::store(td::TlStorerToString &s, const char *field_name) const {
+  if (!LOG_IS_STRIPPED(ERROR)) {
+    s.store_class_begin(field_name, "wallet_accountState");
+    s.store_field("seqno", seqno_);
+    s.store_class_end();
+  }
+}
+
+wallet_v3_accountState::wallet_v3_accountState()
+  : wallet_id_()
+  , seqno_()
+{}
+
+wallet_v3_accountState::wallet_v3_accountState(std::int64_t wallet_id_, std::int32_t seqno_)
+  : wallet_id_(wallet_id_)
+  , seqno_(seqno_)
+{}
+
+const std::int32_t wallet_v3_accountState::ID;
+
+void wallet_v3_accountState::store(td::TlStorerToString &s, const char *field_name) const {
+  if (!LOG_IS_STRIPPED(ERROR)) {
+    s.store_class_begin(field_name, "wallet_v3_accountState");
+    s.store_field("wallet_id", wallet_id_);
+    s.store_field("seqno", seqno_);
+    s.store_class_end();
+  }
+}
+
+wallet_highload_v1_accountState::wallet_highload_v1_accountState()
+  : wallet_id_()
+  , seqno_()
+{}
+
+wallet_highload_v1_accountState::wallet_highload_v1_accountState(std::int64_t wallet_id_, std::int32_t seqno_)
+  : wallet_id_(wallet_id_)
+  , seqno_(seqno_)
+{}
+
+const std::int32_t wallet_highload_v1_accountState::ID;
+
+void wallet_highload_v1_accountState::store(td::TlStorerToString &s, const char *field_name) const {
+  if (!LOG_IS_STRIPPED(ERROR)) {
+    s.store_class_begin(field_name, "wallet_highload_v1_accountState");
+    s.store_field("wallet_id", wallet_id_);
+    s.store_field("seqno", seqno_);
+    s.store_class_end();
+  }
+}
+
+wallet_highload_v2_accountState::wallet_highload_v2_accountState()
+  : wallet_id_()
+{}
+
+wallet_highload_v2_accountState::wallet_highload_v2_accountState(std::int64_t wallet_id_)
+  : wallet_id_(wallet_id_)
+{}
+
+const std::int32_t wallet_highload_v2_accountState::ID;
+
+void wallet_highload_v2_accountState::store(td::TlStorerToString &s, const char *field_name) const {
+  if (!LOG_IS_STRIPPED(ERROR)) {
+    s.store_class_begin(field_name, "wallet_highload_v2_accountState");
+    s.store_field("wallet_id", wallet_id_);
+    s.store_class_end();
+  }
+}
+
+testGiver_accountState::testGiver_accountState()
+  : seqno_()
+{}
+
+testGiver_accountState::testGiver_accountState(std::int32_t seqno_)
+  : seqno_(seqno_)
+{}
+
+const std::int32_t testGiver_accountState::ID;
+
+void testGiver_accountState::store(td::TlStorerToString &s, const char *field_name) const {
+  if (!LOG_IS_STRIPPED(ERROR)) {
+    s.store_class_begin(field_name, "testGiver_accountState");
+    s.store_field("seqno", seqno_);
+    s.store_class_end();
+  }
+}
+
+dns_accountState::dns_accountState()
+  : wallet_id_()
+{}
+
+dns_accountState::dns_accountState(std::int64_t wallet_id_)
+  : wallet_id_(wallet_id_)
+{}
+
+const std::int32_t dns_accountState::ID;
+
+void dns_accountState::store(td::TlStorerToString &s, const char *field_name) const {
+  if (!LOG_IS_STRIPPED(ERROR)) {
+    s.store_class_begin(field_name, "dns_accountState");
+    s.store_field("wallet_id", wallet_id_);
+    s.store_class_end();
+  }
+}
+
+uninited_accountState::uninited_accountState()
+  : frozen_hash_()
+{}
+
+uninited_accountState::uninited_accountState(std::string const &frozen_hash_)
+  : frozen_hash_(std::move(frozen_hash_))
+{}
+
+const std::int32_t uninited_accountState::ID;
+
+void uninited_accountState::store(td::TlStorerToString &s, const char *field_name) const {
+  if (!LOG_IS_STRIPPED(ERROR)) {
+    s.store_class_begin(field_name, "uninited_accountState");
+    s.store_bytes_field("frozen_hash", frozen_hash_);
+    s.store_class_end();
+  }
+}
+
+actionNoop::actionNoop() {
+}
+
+const std::int32_t actionNoop::ID;
+
+void actionNoop::store(td::TlStorerToString &s, const char *field_name) const {
+  if (!LOG_IS_STRIPPED(ERROR)) {
+    s.store_class_begin(field_name, "actionNoop");
+    s.store_class_end();
+  }
+}
+
+actionMsg::actionMsg()
+  : messages_()
+  , allow_send_to_uninited_()
+{}
+
+actionMsg::actionMsg(std::vector<object_ptr<msg_message>> &&messages_, bool allow_send_to_uninited_)
+  : messages_(std::move(messages_))
+  , allow_send_to_uninited_(allow_send_to_uninited_)
+{}
+
+const std::int32_t actionMsg::ID;
+
+void actionMsg::store(td::TlStorerToString &s, const char *field_name) const {
+  if (!LOG_IS_STRIPPED(ERROR)) {
+    s.store_class_begin(field_name, "actionMsg");
+    { const std::vector<object_ptr<msg_message>> &v = messages_; const std::uint32_t multiplicity = static_cast<std::uint32_t>(v.size()); const auto vector_name = "vector[" + td::to_string(multiplicity)+ "]"; s.store_class_begin("messages", vector_name.c_str()); for (std::uint32_t i = 0; i < multiplicity; i++) { if (v[i] == nullptr) { s.store_field("", "null"); } else { v[i]->store(s, ""); } } s.store_class_end(); }
+    s.store_field("allow_send_to_uninited", allow_send_to_uninited_);
+    s.store_class_end();
+  }
+}
+
+actionDns::actionDns()
+  : actions_()
+{}
+
+actionDns::actionDns(std::vector<object_ptr<dns_Action>> &&actions_)
+  : actions_(std::move(actions_))
+{}
+
+const std::int32_t actionDns::ID;
+
+void actionDns::store(td::TlStorerToString &s, const char *field_name) const {
+  if (!LOG_IS_STRIPPED(ERROR)) {
+    s.store_class_begin(field_name, "actionDns");
+    { const std::vector<object_ptr<dns_Action>> &v = actions_; const std::uint32_t multiplicity = static_cast<std::uint32_t>(v.size()); const auto vector_name = "vector[" + td::to_string(multiplicity)+ "]"; s.store_class_begin("actions", vector_name.c_str()); for (std::uint32_t i = 0; i < multiplicity; i++) { if (v[i] == nullptr) { s.store_field("", "null"); } else { v[i]->store(s, ""); } } s.store_class_end(); }
+    s.store_class_end();
+  }
+}
+
+adnlAddress::adnlAddress()
+  : adnl_address_()
+{}
+
+adnlAddress::adnlAddress(std::string const &adnl_address_)
+  : adnl_address_(std::move(adnl_address_))
+{}
+
+const std::int32_t adnlAddress::ID;
+
+void adnlAddress::store(td::TlStorerToString &s, const char *field_name) const {
+  if (!LOG_IS_STRIPPED(ERROR)) {
+    s.store_class_begin(field_name, "adnlAddress");
+    s.store_field("adnl_address", adnl_address_);
+    s.store_class_end();
+  }
+}
+
 bip39Hints::bip39Hints()
   : words_()
 {}
@@ -175,6 +436,24 @@ void exportedPemKey::store(td::TlStorerToString &s, const char *field_name) cons
   }
 }
 
+exportedUnencryptedKey::exportedUnencryptedKey()
+  : data_()
+{}
+
+exportedUnencryptedKey::exportedUnencryptedKey(td::SecureString &&data_)
+  : data_(std::move(data_))
+{}
+
+const std::int32_t exportedUnencryptedKey::ID;
+
+void exportedUnencryptedKey::store(td::TlStorerToString &s, const char *field_name) const {
+  if (!LOG_IS_STRIPPED(ERROR)) {
+    s.store_class_begin(field_name, "exportedUnencryptedKey");
+    s.store_bytes_field("data", data_);
+    s.store_class_end();
+  }
+}
+
 fees::fees()
   : in_fwd_fee_()
   , storage_fee_()
@@ -202,6 +481,189 @@ void fees::store(td::TlStorerToString &s, const char *field_name) const {
   }
 }
 
+fullAccountState::fullAccountState()
+  : balance_()
+  , last_transaction_id_()
+  , block_id_()
+  , sync_utime_()
+  , account_state_()
+{}
+
+fullAccountState::fullAccountState(std::int64_t balance_, object_ptr<internal_transactionId> &&last_transaction_id_, object_ptr<ton_blockIdExt> &&block_id_, std::int64_t sync_utime_, object_ptr<AccountState> &&account_state_)
+  : balance_(balance_)
+  , last_transaction_id_(std::move(last_transaction_id_))
+  , block_id_(std::move(block_id_))
+  , sync_utime_(sync_utime_)
+  , account_state_(std::move(account_state_))
+{}
+
+const std::int32_t fullAccountState::ID;
+
+void fullAccountState::store(td::TlStorerToString &s, const char *field_name) const {
+  if (!LOG_IS_STRIPPED(ERROR)) {
+    s.store_class_begin(field_name, "fullAccountState");
+    s.store_field("balance", balance_);
+    if (last_transaction_id_ == nullptr) { s.store_field("last_transaction_id", "null"); } else { last_transaction_id_->store(s, "last_transaction_id"); }
+    if (block_id_ == nullptr) { s.store_field("block_id", "null"); } else { block_id_->store(s, "block_id"); }
+    s.store_field("sync_utime", sync_utime_);
+    if (account_state_ == nullptr) { s.store_field("account_state", "null"); } else { account_state_->store(s, "account_state"); }
+    s.store_class_end();
+  }
+}
+
+raw_initialAccountState::raw_initialAccountState()
+  : code_()
+  , data_()
+{}
+
+raw_initialAccountState::raw_initialAccountState(std::string const &code_, std::string const &data_)
+  : code_(std::move(code_))
+  , data_(std::move(data_))
+{}
+
+const std::int32_t raw_initialAccountState::ID;
+
+void raw_initialAccountState::store(td::TlStorerToString &s, const char *field_name) const {
+  if (!LOG_IS_STRIPPED(ERROR)) {
+    s.store_class_begin(field_name, "raw_initialAccountState");
+    s.store_bytes_field("code", code_);
+    s.store_bytes_field("data", data_);
+    s.store_class_end();
+  }
+}
+
+testGiver_initialAccountState::testGiver_initialAccountState() {
+}
+
+const std::int32_t testGiver_initialAccountState::ID;
+
+void testGiver_initialAccountState::store(td::TlStorerToString &s, const char *field_name) const {
+  if (!LOG_IS_STRIPPED(ERROR)) {
+    s.store_class_begin(field_name, "testGiver_initialAccountState");
+    s.store_class_end();
+  }
+}
+
+testWallet_initialAccountState::testWallet_initialAccountState()
+  : public_key_()
+{}
+
+testWallet_initialAccountState::testWallet_initialAccountState(std::string const &public_key_)
+  : public_key_(std::move(public_key_))
+{}
+
+const std::int32_t testWallet_initialAccountState::ID;
+
+void testWallet_initialAccountState::store(td::TlStorerToString &s, const char *field_name) const {
+  if (!LOG_IS_STRIPPED(ERROR)) {
+    s.store_class_begin(field_name, "testWallet_initialAccountState");
+    s.store_field("public_key", public_key_);
+    s.store_class_end();
+  }
+}
+
+wallet_initialAccountState::wallet_initialAccountState()
+  : public_key_()
+{}
+
+wallet_initialAccountState::wallet_initialAccountState(std::string const &public_key_)
+  : public_key_(std::move(public_key_))
+{}
+
+const std::int32_t wallet_initialAccountState::ID;
+
+void wallet_initialAccountState::store(td::TlStorerToString &s, const char *field_name) const {
+  if (!LOG_IS_STRIPPED(ERROR)) {
+    s.store_class_begin(field_name, "wallet_initialAccountState");
+    s.store_field("public_key", public_key_);
+    s.store_class_end();
+  }
+}
+
+wallet_v3_initialAccountState::wallet_v3_initialAccountState()
+  : public_key_()
+  , wallet_id_()
+{}
+
+wallet_v3_initialAccountState::wallet_v3_initialAccountState(std::string const &public_key_, std::int64_t wallet_id_)
+  : public_key_(std::move(public_key_))
+  , wallet_id_(wallet_id_)
+{}
+
+const std::int32_t wallet_v3_initialAccountState::ID;
+
+void wallet_v3_initialAccountState::store(td::TlStorerToString &s, const char *field_name) const {
+  if (!LOG_IS_STRIPPED(ERROR)) {
+    s.store_class_begin(field_name, "wallet_v3_initialAccountState");
+    s.store_field("public_key", public_key_);
+    s.store_field("wallet_id", wallet_id_);
+    s.store_class_end();
+  }
+}
+
+wallet_highload_v1_initialAccountState::wallet_highload_v1_initialAccountState()
+  : public_key_()
+  , wallet_id_()
+{}
+
+wallet_highload_v1_initialAccountState::wallet_highload_v1_initialAccountState(std::string const &public_key_, std::int64_t wallet_id_)
+  : public_key_(std::move(public_key_))
+  , wallet_id_(wallet_id_)
+{}
+
+const std::int32_t wallet_highload_v1_initialAccountState::ID;
+
+void wallet_highload_v1_initialAccountState::store(td::TlStorerToString &s, const char *field_name) const {
+  if (!LOG_IS_STRIPPED(ERROR)) {
+    s.store_class_begin(field_name, "wallet_highload_v1_initialAccountState");
+    s.store_field("public_key", public_key_);
+    s.store_field("wallet_id", wallet_id_);
+    s.store_class_end();
+  }
+}
+
+wallet_highload_v2_initialAccountState::wallet_highload_v2_initialAccountState()
+  : public_key_()
+  , wallet_id_()
+{}
+
+wallet_highload_v2_initialAccountState::wallet_highload_v2_initialAccountState(std::string const &public_key_, std::int64_t wallet_id_)
+  : public_key_(std::move(public_key_))
+  , wallet_id_(wallet_id_)
+{}
+
+const std::int32_t wallet_highload_v2_initialAccountState::ID;
+
+void wallet_highload_v2_initialAccountState::store(td::TlStorerToString &s, const char *field_name) const {
+  if (!LOG_IS_STRIPPED(ERROR)) {
+    s.store_class_begin(field_name, "wallet_highload_v2_initialAccountState");
+    s.store_field("public_key", public_key_);
+    s.store_field("wallet_id", wallet_id_);
+    s.store_class_end();
+  }
+}
+
+dns_initialAccountState::dns_initialAccountState()
+  : public_key_()
+  , wallet_id_()
+{}
+
+dns_initialAccountState::dns_initialAccountState(std::string const &public_key_, std::int64_t wallet_id_)
+  : public_key_(std::move(public_key_))
+  , wallet_id_(wallet_id_)
+{}
+
+const std::int32_t dns_initialAccountState::ID;
+
+void dns_initialAccountState::store(td::TlStorerToString &s, const char *field_name) const {
+  if (!LOG_IS_STRIPPED(ERROR)) {
+    s.store_class_begin(field_name, "dns_initialAccountState");
+    s.store_field("public_key", public_key_);
+    s.store_field("wallet_id", wallet_id_);
+    s.store_class_end();
+  }
+}
+
 inputKeyRegular::inputKeyRegular()
   : key_()
   , local_password_()
@@ -400,27 +862,6 @@ void options::store(td::TlStorerToString &s, const char *field_name) const {
   }
 }
 
-sendGramsResult::sendGramsResult()
-  : sent_until_()
-  , body_hash_()
-{}
-
-sendGramsResult::sendGramsResult(std::int64_t sent_until_, std::string const &body_hash_)
-  : sent_until_(sent_until_)
-  , body_hash_(std::move(body_hash_))
-{}
-
-const std::int32_t sendGramsResult::ID;
-
-void sendGramsResult::store(td::TlStorerToString &s, const char *field_name) const {
-  if (!LOG_IS_STRIPPED(ERROR)) {
-    s.store_class_begin(field_name, "sendGramsResult");
-    s.store_field("sent_until", sent_until_);
-    s.store_bytes_field("body_hash", body_hash_);
-    s.store_class_end();
-  }
-}
-
 syncStateDone::syncStateDone() {
 }
 
@@ -523,110 +964,209 @@ void updateSyncState::store(td::TlStorerToString &s, const char *field_name) con
   }
 }
 
-generic_accountStateRaw::generic_accountStateRaw()
-  : account_state_()
-{}
+dns_actionDeleteAll::dns_actionDeleteAll() {
+}
 
-generic_accountStateRaw::generic_accountStateRaw(object_ptr<raw_accountState> &&account_state_)
-  : account_state_(std::move(account_state_))
-{}
+const std::int32_t dns_actionDeleteAll::ID;
 
-const std::int32_t generic_accountStateRaw::ID;
-
-void generic_accountStateRaw::store(td::TlStorerToString &s, const char *field_name) const {
+void dns_actionDeleteAll::store(td::TlStorerToString &s, const char *field_name) const {
   if (!LOG_IS_STRIPPED(ERROR)) {
-    s.store_class_begin(field_name, "generic_accountStateRaw");
-    if (account_state_ == nullptr) { s.store_field("account_state", "null"); } else { account_state_->store(s, "account_state"); }
+    s.store_class_begin(field_name, "dns_actionDeleteAll");
     s.store_class_end();
   }
 }
 
-generic_accountStateTestWallet::generic_accountStateTestWallet()
-  : account_state_()
+dns_actionDelete::dns_actionDelete()
+  : name_()
+  , category_()
 {}
 
-generic_accountStateTestWallet::generic_accountStateTestWallet(object_ptr<testWallet_accountState> &&account_state_)
-  : account_state_(std::move(account_state_))
+dns_actionDelete::dns_actionDelete(std::string const &name_, std::int32_t category_)
+  : name_(std::move(name_))
+  , category_(category_)
 {}
 
-const std::int32_t generic_accountStateTestWallet::ID;
+const std::int32_t dns_actionDelete::ID;
 
-void generic_accountStateTestWallet::store(td::TlStorerToString &s, const char *field_name) const {
+void dns_actionDelete::store(td::TlStorerToString &s, const char *field_name) const {
   if (!LOG_IS_STRIPPED(ERROR)) {
-    s.store_class_begin(field_name, "generic_accountStateTestWallet");
-    if (account_state_ == nullptr) { s.store_field("account_state", "null"); } else { account_state_->store(s, "account_state"); }
+    s.store_class_begin(field_name, "dns_actionDelete");
+    s.store_field("name", name_);
+    s.store_field("category", category_);
     s.store_class_end();
   }
 }
 
-generic_accountStateWallet::generic_accountStateWallet()
-  : account_state_()
+dns_actionSet::dns_actionSet()
+  : entry_()
 {}
 
-generic_accountStateWallet::generic_accountStateWallet(object_ptr<wallet_accountState> &&account_state_)
-  : account_state_(std::move(account_state_))
+dns_actionSet::dns_actionSet(object_ptr<dns_entry> &&entry_)
+  : entry_(std::move(entry_))
 {}
 
-const std::int32_t generic_accountStateWallet::ID;
+const std::int32_t dns_actionSet::ID;
 
-void generic_accountStateWallet::store(td::TlStorerToString &s, const char *field_name) const {
+void dns_actionSet::store(td::TlStorerToString &s, const char *field_name) const {
   if (!LOG_IS_STRIPPED(ERROR)) {
-    s.store_class_begin(field_name, "generic_accountStateWallet");
-    if (account_state_ == nullptr) { s.store_field("account_state", "null"); } else { account_state_->store(s, "account_state"); }
+    s.store_class_begin(field_name, "dns_actionSet");
+    if (entry_ == nullptr) { s.store_field("entry", "null"); } else { entry_->store(s, "entry"); }
     s.store_class_end();
   }
 }
 
-generic_accountStateWalletV3::generic_accountStateWalletV3()
-  : account_state_()
+dns_entry::dns_entry()
+  : name_()
+  , category_()
+  , entry_()
 {}
 
-generic_accountStateWalletV3::generic_accountStateWalletV3(object_ptr<wallet_v3_accountState> &&account_state_)
-  : account_state_(std::move(account_state_))
+dns_entry::dns_entry(std::string const &name_, std::int32_t category_, object_ptr<dns_EntryData> &&entry_)
+  : name_(std::move(name_))
+  , category_(category_)
+  , entry_(std::move(entry_))
 {}
 
-const std::int32_t generic_accountStateWalletV3::ID;
+const std::int32_t dns_entry::ID;
 
-void generic_accountStateWalletV3::store(td::TlStorerToString &s, const char *field_name) const {
+void dns_entry::store(td::TlStorerToString &s, const char *field_name) const {
   if (!LOG_IS_STRIPPED(ERROR)) {
-    s.store_class_begin(field_name, "generic_accountStateWalletV3");
-    if (account_state_ == nullptr) { s.store_field("account_state", "null"); } else { account_state_->store(s, "account_state"); }
+    s.store_class_begin(field_name, "dns_entry");
+    s.store_field("name", name_);
+    s.store_field("category", category_);
+    if (entry_ == nullptr) { s.store_field("entry", "null"); } else { entry_->store(s, "entry"); }
     s.store_class_end();
   }
 }
 
-generic_accountStateTestGiver::generic_accountStateTestGiver()
-  : account_state_()
+dns_entryDataUnknown::dns_entryDataUnknown()
+  : bytes_()
 {}
 
-generic_accountStateTestGiver::generic_accountStateTestGiver(object_ptr<testGiver_accountState> &&account_state_)
-  : account_state_(std::move(account_state_))
+dns_entryDataUnknown::dns_entryDataUnknown(std::string const &bytes_)
+  : bytes_(std::move(bytes_))
 {}
 
-const std::int32_t generic_accountStateTestGiver::ID;
+const std::int32_t dns_entryDataUnknown::ID;
 
-void generic_accountStateTestGiver::store(td::TlStorerToString &s, const char *field_name) const {
+void dns_entryDataUnknown::store(td::TlStorerToString &s, const char *field_name) const {
   if (!LOG_IS_STRIPPED(ERROR)) {
-    s.store_class_begin(field_name, "generic_accountStateTestGiver");
-    if (account_state_ == nullptr) { s.store_field("account_state", "null"); } else { account_state_->store(s, "account_state"); }
+    s.store_class_begin(field_name, "dns_entryDataUnknown");
+    s.store_bytes_field("bytes", bytes_);
     s.store_class_end();
   }
 }
 
-generic_accountStateUninited::generic_accountStateUninited()
-  : account_state_()
+dns_entryDataText::dns_entryDataText()
+  : text_()
 {}
 
-generic_accountStateUninited::generic_accountStateUninited(object_ptr<uninited_accountState> &&account_state_)
-  : account_state_(std::move(account_state_))
+dns_entryDataText::dns_entryDataText(std::string const &text_)
+  : text_(std::move(text_))
 {}
 
-const std::int32_t generic_accountStateUninited::ID;
+const std::int32_t dns_entryDataText::ID;
 
-void generic_accountStateUninited::store(td::TlStorerToString &s, const char *field_name) const {
+void dns_entryDataText::store(td::TlStorerToString &s, const char *field_name) const {
   if (!LOG_IS_STRIPPED(ERROR)) {
-    s.store_class_begin(field_name, "generic_accountStateUninited");
-    if (account_state_ == nullptr) { s.store_field("account_state", "null"); } else { account_state_->store(s, "account_state"); }
+    s.store_class_begin(field_name, "dns_entryDataText");
+    s.store_field("text", text_);
+    s.store_class_end();
+  }
+}
+
+dns_entryDataNextResolver::dns_entryDataNextResolver()
+  : resolver_()
+{}
+
+dns_entryDataNextResolver::dns_entryDataNextResolver(object_ptr<accountAddress> &&resolver_)
+  : resolver_(std::move(resolver_))
+{}
+
+const std::int32_t dns_entryDataNextResolver::ID;
+
+void dns_entryDataNextResolver::store(td::TlStorerToString &s, const char *field_name) const {
+  if (!LOG_IS_STRIPPED(ERROR)) {
+    s.store_class_begin(field_name, "dns_entryDataNextResolver");
+    if (resolver_ == nullptr) { s.store_field("resolver", "null"); } else { resolver_->store(s, "resolver"); }
+    s.store_class_end();
+  }
+}
+
+dns_entryDataSmcAddress::dns_entryDataSmcAddress()
+  : smc_address_()
+{}
+
+dns_entryDataSmcAddress::dns_entryDataSmcAddress(object_ptr<accountAddress> &&smc_address_)
+  : smc_address_(std::move(smc_address_))
+{}
+
+const std::int32_t dns_entryDataSmcAddress::ID;
+
+void dns_entryDataSmcAddress::store(td::TlStorerToString &s, const char *field_name) const {
+  if (!LOG_IS_STRIPPED(ERROR)) {
+    s.store_class_begin(field_name, "dns_entryDataSmcAddress");
+    if (smc_address_ == nullptr) { s.store_field("smc_address", "null"); } else { smc_address_->store(s, "smc_address"); }
+    s.store_class_end();
+  }
+}
+
+dns_entryDataAdnlAddress::dns_entryDataAdnlAddress()
+  : adnl_address_()
+{}
+
+dns_entryDataAdnlAddress::dns_entryDataAdnlAddress(object_ptr<adnlAddress> &&adnl_address_)
+  : adnl_address_(std::move(adnl_address_))
+{}
+
+const std::int32_t dns_entryDataAdnlAddress::ID;
+
+void dns_entryDataAdnlAddress::store(td::TlStorerToString &s, const char *field_name) const {
+  if (!LOG_IS_STRIPPED(ERROR)) {
+    s.store_class_begin(field_name, "dns_entryDataAdnlAddress");
+    if (adnl_address_ == nullptr) { s.store_field("adnl_address", "null"); } else { adnl_address_->store(s, "adnl_address"); }
+    s.store_class_end();
+  }
+}
+
+dns_resolved::dns_resolved()
+  : entries_()
+{}
+
+dns_resolved::dns_resolved(std::vector<object_ptr<dns_entry>> &&entries_)
+  : entries_(std::move(entries_))
+{}
+
+const std::int32_t dns_resolved::ID;
+
+void dns_resolved::store(td::TlStorerToString &s, const char *field_name) const {
+  if (!LOG_IS_STRIPPED(ERROR)) {
+    s.store_class_begin(field_name, "dns_resolved");
+    { const std::vector<object_ptr<dns_entry>> &v = entries_; const std::uint32_t multiplicity = static_cast<std::uint32_t>(v.size()); const auto vector_name = "vector[" + td::to_string(multiplicity)+ "]"; s.store_class_begin("entries", vector_name.c_str()); for (std::uint32_t i = 0; i < multiplicity; i++) { if (v[i] == nullptr) { s.store_field("", "null"); } else { v[i]->store(s, ""); } } s.store_class_end(); }
+    s.store_class_end();
+  }
+}
+
+ton_blockId::ton_blockId()
+  : workchain_()
+  , shard_()
+  , seqno_()
+{}
+
+ton_blockId::ton_blockId(std::int32_t workchain_, std::int64_t shard_, std::int32_t seqno_)
+  : workchain_(workchain_)
+  , shard_(shard_)
+  , seqno_(seqno_)
+{}
+
+const std::int32_t ton_blockId::ID;
+
+void ton_blockId::store(td::TlStorerToString &s, const char *field_name) const {
+  if (!LOG_IS_STRIPPED(ERROR)) {
+    s.store_class_begin(field_name, "ton_blockId");
+    s.store_field("workchain", workchain_);
+    s.store_field("shard", shard_);
+    s.store_field("seqno", seqno_);
     s.store_class_end();
   }
 }
@@ -676,6 +1216,120 @@ void liteServer_info::store(td::TlStorerToString &s, const char *field_name) con
   }
 }
 
+msg_dataRaw::msg_dataRaw()
+  : body_()
+{}
+
+msg_dataRaw::msg_dataRaw(std::string const &body_)
+  : body_(std::move(body_))
+{}
+
+const std::int32_t msg_dataRaw::ID;
+
+void msg_dataRaw::store(td::TlStorerToString &s, const char *field_name) const {
+  if (!LOG_IS_STRIPPED(ERROR)) {
+    s.store_class_begin(field_name, "msg_dataRaw");
+    s.store_bytes_field("body", body_);
+    s.store_class_end();
+  }
+}
+
+msg_dataText::msg_dataText()
+  : text_()
+{}
+
+msg_dataText::msg_dataText(std::string const &text_)
+  : text_(std::move(text_))
+{}
+
+const std::int32_t msg_dataText::ID;
+
+void msg_dataText::store(td::TlStorerToString &s, const char *field_name) const {
+  if (!LOG_IS_STRIPPED(ERROR)) {
+    s.store_class_begin(field_name, "msg_dataText");
+    s.store_bytes_field("text", text_);
+    s.store_class_end();
+  }
+}
+
+msg_dataDecryptedText::msg_dataDecryptedText()
+  : text_()
+{}
+
+msg_dataDecryptedText::msg_dataDecryptedText(std::string const &text_)
+  : text_(std::move(text_))
+{}
+
+const std::int32_t msg_dataDecryptedText::ID;
+
+void msg_dataDecryptedText::store(td::TlStorerToString &s, const char *field_name) const {
+  if (!LOG_IS_STRIPPED(ERROR)) {
+    s.store_class_begin(field_name, "msg_dataDecryptedText");
+    s.store_bytes_field("text", text_);
+    s.store_class_end();
+  }
+}
+
+msg_dataEncryptedText::msg_dataEncryptedText()
+  : text_()
+{}
+
+msg_dataEncryptedText::msg_dataEncryptedText(std::string const &text_)
+  : text_(std::move(text_))
+{}
+
+const std::int32_t msg_dataEncryptedText::ID;
+
+void msg_dataEncryptedText::store(td::TlStorerToString &s, const char *field_name) const {
+  if (!LOG_IS_STRIPPED(ERROR)) {
+    s.store_class_begin(field_name, "msg_dataEncryptedText");
+    s.store_bytes_field("text", text_);
+    s.store_class_end();
+  }
+}
+
+msg_dataArray::msg_dataArray()
+  : elements_()
+{}
+
+msg_dataArray::msg_dataArray(std::vector<object_ptr<msg_Data>> &&elements_)
+  : elements_(std::move(elements_))
+{}
+
+const std::int32_t msg_dataArray::ID;
+
+void msg_dataArray::store(td::TlStorerToString &s, const char *field_name) const {
+  if (!LOG_IS_STRIPPED(ERROR)) {
+    s.store_class_begin(field_name, "msg_dataArray");
+    { const std::vector<object_ptr<msg_Data>> &v = elements_; const std::uint32_t multiplicity = static_cast<std::uint32_t>(v.size()); const auto vector_name = "vector[" + td::to_string(multiplicity)+ "]"; s.store_class_begin("elements", vector_name.c_str()); for (std::uint32_t i = 0; i < multiplicity; i++) { if (v[i] == nullptr) { s.store_field("", "null"); } else { v[i]->store(s, ""); } } s.store_class_end(); }
+    s.store_class_end();
+  }
+}
+
+msg_message::msg_message()
+  : destination_()
+  , amount_()
+  , data_()
+{}
+
+msg_message::msg_message(object_ptr<accountAddress> &&destination_, std::int64_t amount_, object_ptr<msg_Data> &&data_)
+  : destination_(std::move(destination_))
+  , amount_(amount_)
+  , data_(std::move(data_))
+{}
+
+const std::int32_t msg_message::ID;
+
+void msg_message::store(td::TlStorerToString &s, const char *field_name) const {
+  if (!LOG_IS_STRIPPED(ERROR)) {
+    s.store_class_begin(field_name, "msg_message");
+    if (destination_ == nullptr) { s.store_field("destination", "null"); } else { destination_->store(s, "destination"); }
+    s.store_field("amount", amount_);
+    if (data_ == nullptr) { s.store_field("data", "null"); } else { data_->store(s, "data"); }
+    s.store_class_end();
+  }
+}
+
 options_configInfo::options_configInfo()
   : default_wallet_id_()
 {}
@@ -694,12 +1348,30 @@ void options_configInfo::store(td::TlStorerToString &s, const char *field_name)
   }
 }
 
+options_info::options_info()
+  : config_info_()
+{}
+
+options_info::options_info(object_ptr<options_configInfo> &&config_info_)
+  : config_info_(std::move(config_info_))
+{}
+
+const std::int32_t options_info::ID;
+
+void options_info::store(td::TlStorerToString &s, const char *field_name) const {
+  if (!LOG_IS_STRIPPED(ERROR)) {
+    s.store_class_begin(field_name, "options_info");
+    if (config_info_ == nullptr) { s.store_field("config_info", "null"); } else { config_info_->store(s, "config_info"); }
+    s.store_class_end();
+  }
+}
+
 query_fees::query_fees()
   : source_fees_()
   , destination_fees_()
 {}
 
-query_fees::query_fees(object_ptr<fees> &&source_fees_, object_ptr<fees> &&destination_fees_)
+query_fees::query_fees(object_ptr<fees> &&source_fees_, std::vector<object_ptr<fees>> &&destination_fees_)
   : source_fees_(std::move(source_fees_))
   , destination_fees_(std::move(destination_fees_))
 {}
@@ -710,7 +1382,7 @@ void query_fees::store(td::TlStorerToString &s, const char *field_name) const {
   if (!LOG_IS_STRIPPED(ERROR)) {
     s.store_class_begin(field_name, "query_fees");
     if (source_fees_ == nullptr) { s.store_field("source_fees", "null"); } else { source_fees_->store(s, "source_fees"); }
-    if (destination_fees_ == nullptr) { s.store_field("destination_fees", "null"); } else { destination_fees_->store(s, "destination_fees"); }
+    { const std::vector<object_ptr<fees>> &v = destination_fees_; const std::uint32_t multiplicity = static_cast<std::uint32_t>(v.size()); const auto vector_name = "vector[" + td::to_string(multiplicity)+ "]"; s.store_class_begin("destination_fees", vector_name.c_str()); for (std::uint32_t i = 0; i < multiplicity; i++) { if (v[i] == nullptr) { s.store_field("", "null"); } else { v[i]->store(s, ""); } } s.store_class_end(); }
     s.store_class_end();
   }
 }
@@ -739,60 +1411,42 @@ void query_info::store(td::TlStorerToString &s, const char *field_name) const {
   }
 }
 
-raw_accountState::raw_accountState()
+raw_fullAccountState::raw_fullAccountState()
   : balance_()
   , code_()
   , data_()
   , last_transaction_id_()
+  , block_id_()
   , frozen_hash_()
   , sync_utime_()
 {}
 
-raw_accountState::raw_accountState(std::int64_t balance_, std::string const &code_, std::string const &data_, object_ptr<internal_transactionId> &&last_transaction_id_, std::string const &frozen_hash_, std::int64_t sync_utime_)
+raw_fullAccountState::raw_fullAccountState(std::int64_t balance_, std::string const &code_, std::string const &data_, object_ptr<internal_transactionId> &&last_transaction_id_, object_ptr<ton_blockIdExt> &&block_id_, std::string const &frozen_hash_, std::int64_t sync_utime_)
   : balance_(balance_)
   , code_(std::move(code_))
   , data_(std::move(data_))
   , last_transaction_id_(std::move(last_transaction_id_))
+  , block_id_(std::move(block_id_))
   , frozen_hash_(std::move(frozen_hash_))
   , sync_utime_(sync_utime_)
 {}
 
-const std::int32_t raw_accountState::ID;
+const std::int32_t raw_fullAccountState::ID;
 
-void raw_accountState::store(td::TlStorerToString &s, const char *field_name) const {
+void raw_fullAccountState::store(td::TlStorerToString &s, const char *field_name) const {
   if (!LOG_IS_STRIPPED(ERROR)) {
-    s.store_class_begin(field_name, "raw_accountState");
+    s.store_class_begin(field_name, "raw_fullAccountState");
     s.store_field("balance", balance_);
     s.store_bytes_field("code", code_);
     s.store_bytes_field("data", data_);
     if (last_transaction_id_ == nullptr) { s.store_field("last_transaction_id", "null"); } else { last_transaction_id_->store(s, "last_transaction_id"); }
+    if (block_id_ == nullptr) { s.store_field("block_id", "null"); } else { block_id_->store(s, "block_id"); }
     s.store_bytes_field("frozen_hash", frozen_hash_);
     s.store_field("sync_utime", sync_utime_);
     s.store_class_end();
   }
 }
 
-raw_initialAccountState::raw_initialAccountState()
-  : code_()
-  , data_()
-{}
-
-raw_initialAccountState::raw_initialAccountState(std::string const &code_, std::string const &data_)
-  : code_(std::move(code_))
-  , data_(std::move(data_))
-{}
-
-const std::int32_t raw_initialAccountState::ID;
-
-void raw_initialAccountState::store(td::TlStorerToString &s, const char *field_name) const {
-  if (!LOG_IS_STRIPPED(ERROR)) {
-    s.store_class_begin(field_name, "raw_initialAccountState");
-    s.store_bytes_field("code", code_);
-    s.store_bytes_field("data", data_);
-    s.store_class_end();
-  }
-}
-
 raw_message::raw_message()
   : source_()
   , destination_()
@@ -801,10 +1455,10 @@ raw_message::raw_message()
   , ihr_fee_()
   , created_lt_()
   , body_hash_()
-  , message_()
+  , msg_data_()
 {}
 
-raw_message::raw_message(std::string const &source_, std::string const &destination_, std::int64_t value_, std::int64_t fwd_fee_, std::int64_t ihr_fee_, std::int64_t created_lt_, std::string const &body_hash_, std::string const &message_)
+raw_message::raw_message(std::string const &source_, std::string const &destination_, std::int64_t value_, std::int64_t fwd_fee_, std::int64_t ihr_fee_, std::int64_t created_lt_, std::string const &body_hash_, object_ptr<msg_Data> &&msg_data_)
   : source_(std::move(source_))
   , destination_(std::move(destination_))
   , value_(value_)
@@ -812,7 +1466,7 @@ raw_message::raw_message(std::string const &source_, std::string const &destinat
   , ihr_fee_(ihr_fee_)
   , created_lt_(created_lt_)
   , body_hash_(std::move(body_hash_))
-  , message_(std::move(message_))
+  , msg_data_(std::move(msg_data_))
 {}
 
 const std::int32_t raw_message::ID;
@@ -827,7 +1481,7 @@ void raw_message::store(td::TlStorerToString &s, const char *field_name) const {
     s.store_field("ihr_fee", ihr_fee_);
     s.store_field("created_lt", created_lt_);
     s.store_bytes_field("body_hash", body_hash_);
-    s.store_bytes_field("message", message_);
+    if (msg_data_ == nullptr) { s.store_field("msg_data", "null"); } else { msg_data_->store(s, "msg_data"); }
     s.store_class_end();
   }
 }
@@ -970,74 +1624,32 @@ void smc_runResult::store(td::TlStorerToString &s, const char *field_name) const
   }
 }
 
-testGiver_accountState::testGiver_accountState()
-  : balance_()
+ton_blockIdExt::ton_blockIdExt()
+  : workchain_()
+  , shard_()
   , seqno_()
-  , last_transaction_id_()
-  , sync_utime_()
+  , root_hash_()
+  , file_hash_()
 {}
 
-testGiver_accountState::testGiver_accountState(std::int64_t balance_, std::int32_t seqno_, object_ptr<internal_transactionId> &&last_transaction_id_, std::int64_t sync_utime_)
-  : balance_(balance_)
+ton_blockIdExt::ton_blockIdExt(std::int32_t workchain_, std::int64_t shard_, std::int32_t seqno_, std::string const &root_hash_, std::string const &file_hash_)
+  : workchain_(workchain_)
+  , shard_(shard_)
   , seqno_(seqno_)
-  , last_transaction_id_(std::move(last_transaction_id_))
-  , sync_utime_(sync_utime_)
+  , root_hash_(std::move(root_hash_))
+  , file_hash_(std::move(file_hash_))
 {}
 
-const std::int32_t testGiver_accountState::ID;
+const std::int32_t ton_blockIdExt::ID;
 
-void testGiver_accountState::store(td::TlStorerToString &s, const char *field_name) const {
+void ton_blockIdExt::store(td::TlStorerToString &s, const char *field_name) const {
   if (!LOG_IS_STRIPPED(ERROR)) {
-    s.store_class_begin(field_name, "testGiver_accountState");
-    s.store_field("balance", balance_);
+    s.store_class_begin(field_name, "ton_blockIdExt");
+    s.store_field("workchain", workchain_);
+    s.store_field("shard", shard_);
     s.store_field("seqno", seqno_);
-    if (last_transaction_id_ == nullptr) { s.store_field("last_transaction_id", "null"); } else { last_transaction_id_->store(s, "last_transaction_id"); }
-    s.store_field("sync_utime", sync_utime_);
-    s.store_class_end();
-  }
-}
-
-testWallet_accountState::testWallet_accountState()
-  : balance_()
-  , seqno_()
-  , last_transaction_id_()
-  , sync_utime_()
-{}
-
-testWallet_accountState::testWallet_accountState(std::int64_t balance_, std::int32_t seqno_, object_ptr<internal_transactionId> &&last_transaction_id_, std::int64_t sync_utime_)
-  : balance_(balance_)
-  , seqno_(seqno_)
-  , last_transaction_id_(std::move(last_transaction_id_))
-  , sync_utime_(sync_utime_)
-{}
-
-const std::int32_t testWallet_accountState::ID;
-
-void testWallet_accountState::store(td::TlStorerToString &s, const char *field_name) const {
-  if (!LOG_IS_STRIPPED(ERROR)) {
-    s.store_class_begin(field_name, "testWallet_accountState");
-    s.store_field("balance", balance_);
-    s.store_field("seqno", seqno_);
-    if (last_transaction_id_ == nullptr) { s.store_field("last_transaction_id", "null"); } else { last_transaction_id_->store(s, "last_transaction_id"); }
-    s.store_field("sync_utime", sync_utime_);
-    s.store_class_end();
-  }
-}
-
-testWallet_initialAccountState::testWallet_initialAccountState()
-  : public_key_()
-{}
-
-testWallet_initialAccountState::testWallet_initialAccountState(std::string const &public_key_)
-  : public_key_(std::move(public_key_))
-{}
-
-const std::int32_t testWallet_initialAccountState::ID;
-
-void testWallet_initialAccountState::store(td::TlStorerToString &s, const char *field_name) const {
-  if (!LOG_IS_STRIPPED(ERROR)) {
-    s.store_class_begin(field_name, "testWallet_initialAccountState");
-    s.store_field("public_key", public_key_);
+    s.store_bytes_field("root_hash", root_hash_);
+    s.store_bytes_field("file_hash", file_hash_);
     s.store_class_end();
   }
 }
@@ -1055,7 +1667,25 @@ const std::int32_t tvm_cell::ID;
 void tvm_cell::store(td::TlStorerToString &s, const char *field_name) const {
   if (!LOG_IS_STRIPPED(ERROR)) {
     s.store_class_begin(field_name, "tvm_cell");
-    s.store_field("bytes", bytes_);
+    s.store_bytes_field("bytes", bytes_);
+    s.store_class_end();
+  }
+}
+
+tvm_list::tvm_list()
+  : elements_()
+{}
+
+tvm_list::tvm_list(std::vector<object_ptr<tvm_StackEntry>> &&elements_)
+  : elements_(std::move(elements_))
+{}
+
+const std::int32_t tvm_list::ID;
+
+void tvm_list::store(td::TlStorerToString &s, const char *field_name) const {
+  if (!LOG_IS_STRIPPED(ERROR)) {
+    s.store_class_begin(field_name, "tvm_list");
+    { const std::vector<object_ptr<tvm_StackEntry>> &v = elements_; const std::uint32_t multiplicity = static_cast<std::uint32_t>(v.size()); const auto vector_name = "vector[" + td::to_string(multiplicity)+ "]"; s.store_class_begin("elements", vector_name.c_str()); for (std::uint32_t i = 0; i < multiplicity; i++) { if (v[i] == nullptr) { s.store_field("", "null"); } else { v[i]->store(s, ""); } } s.store_class_end(); }
     s.store_class_end();
   }
 }
@@ -1091,7 +1721,7 @@ const std::int32_t tvm_slice::ID;
 void tvm_slice::store(td::TlStorerToString &s, const char *field_name) const {
   if (!LOG_IS_STRIPPED(ERROR)) {
     s.store_class_begin(field_name, "tvm_slice");
-    s.store_field("bytes", bytes_);
+    s.store_bytes_field("bytes", bytes_);
     s.store_class_end();
   }
 }
@@ -1150,6 +1780,42 @@ void tvm_stackEntryNumber::store(td::TlStorerToString &s, const char *field_name
   }
 }
 
+tvm_stackEntryTuple::tvm_stackEntryTuple()
+  : tuple_()
+{}
+
+tvm_stackEntryTuple::tvm_stackEntryTuple(object_ptr<tvm_tuple> &&tuple_)
+  : tuple_(std::move(tuple_))
+{}
+
+const std::int32_t tvm_stackEntryTuple::ID;
+
+void tvm_stackEntryTuple::store(td::TlStorerToString &s, const char *field_name) const {
+  if (!LOG_IS_STRIPPED(ERROR)) {
+    s.store_class_begin(field_name, "tvm_stackEntryTuple");
+    if (tuple_ == nullptr) { s.store_field("tuple", "null"); } else { tuple_->store(s, "tuple"); }
+    s.store_class_end();
+  }
+}
+
+tvm_stackEntryList::tvm_stackEntryList()
+  : list_()
+{}
+
+tvm_stackEntryList::tvm_stackEntryList(object_ptr<tvm_list> &&list_)
+  : list_(std::move(list_))
+{}
+
+const std::int32_t tvm_stackEntryList::ID;
+
+void tvm_stackEntryList::store(td::TlStorerToString &s, const char *field_name) const {
+  if (!LOG_IS_STRIPPED(ERROR)) {
+    s.store_class_begin(field_name, "tvm_stackEntryList");
+    if (list_ == nullptr) { s.store_field("list", "null"); } else { list_->store(s, "list"); }
+    s.store_class_end();
+  }
+}
+
 tvm_stackEntryUnsupported::tvm_stackEntryUnsupported() {
 }
 
@@ -1162,125 +1828,20 @@ void tvm_stackEntryUnsupported::store(td::TlStorerToString &s, const char *field
   }
 }
 
-uninited_accountState::uninited_accountState()
-  : balance_()
-  , last_transaction_id_()
-  , frozen_hash_()
-  , sync_utime_()
+tvm_tuple::tvm_tuple()
+  : elements_()
 {}
 
-uninited_accountState::uninited_accountState(std::int64_t balance_, object_ptr<internal_transactionId> &&last_transaction_id_, std::string const &frozen_hash_, std::int64_t sync_utime_)
-  : balance_(balance_)
-  , last_transaction_id_(std::move(last_transaction_id_))
-  , frozen_hash_(std::move(frozen_hash_))
-  , sync_utime_(sync_utime_)
+tvm_tuple::tvm_tuple(std::vector<object_ptr<tvm_StackEntry>> &&elements_)
+  : elements_(std::move(elements_))
 {}
 
-const std::int32_t uninited_accountState::ID;
+const std::int32_t tvm_tuple::ID;
 
-void uninited_accountState::store(td::TlStorerToString &s, const char *field_name) const {
+void tvm_tuple::store(td::TlStorerToString &s, const char *field_name) const {
   if (!LOG_IS_STRIPPED(ERROR)) {
-    s.store_class_begin(field_name, "uninited_accountState");
-    s.store_field("balance", balance_);
-    if (last_transaction_id_ == nullptr) { s.store_field("last_transaction_id", "null"); } else { last_transaction_id_->store(s, "last_transaction_id"); }
-    s.store_bytes_field("frozen_hash", frozen_hash_);
-    s.store_field("sync_utime", sync_utime_);
-    s.store_class_end();
-  }
-}
-
-wallet_accountState::wallet_accountState()
-  : balance_()
-  , seqno_()
-  , last_transaction_id_()
-  , sync_utime_()
-{}
-
-wallet_accountState::wallet_accountState(std::int64_t balance_, std::int32_t seqno_, object_ptr<internal_transactionId> &&last_transaction_id_, std::int64_t sync_utime_)
-  : balance_(balance_)
-  , seqno_(seqno_)
-  , last_transaction_id_(std::move(last_transaction_id_))
-  , sync_utime_(sync_utime_)
-{}
-
-const std::int32_t wallet_accountState::ID;
-
-void wallet_accountState::store(td::TlStorerToString &s, const char *field_name) const {
-  if (!LOG_IS_STRIPPED(ERROR)) {
-    s.store_class_begin(field_name, "wallet_accountState");
-    s.store_field("balance", balance_);
-    s.store_field("seqno", seqno_);
-    if (last_transaction_id_ == nullptr) { s.store_field("last_transaction_id", "null"); } else { last_transaction_id_->store(s, "last_transaction_id"); }
-    s.store_field("sync_utime", sync_utime_);
-    s.store_class_end();
-  }
-}
-
-wallet_initialAccountState::wallet_initialAccountState()
-  : public_key_()
-{}
-
-wallet_initialAccountState::wallet_initialAccountState(std::string const &public_key_)
-  : public_key_(std::move(public_key_))
-{}
-
-const std::int32_t wallet_initialAccountState::ID;
-
-void wallet_initialAccountState::store(td::TlStorerToString &s, const char *field_name) const {
-  if (!LOG_IS_STRIPPED(ERROR)) {
-    s.store_class_begin(field_name, "wallet_initialAccountState");
-    s.store_field("public_key", public_key_);
-    s.store_class_end();
-  }
-}
-
-wallet_v3_accountState::wallet_v3_accountState()
-  : balance_()
-  , wallet_id_()
-  , seqno_()
-  , last_transaction_id_()
-  , sync_utime_()
-{}
-
-wallet_v3_accountState::wallet_v3_accountState(std::int64_t balance_, std::int64_t wallet_id_, std::int32_t seqno_, object_ptr<internal_transactionId> &&last_transaction_id_, std::int64_t sync_utime_)
-  : balance_(balance_)
-  , wallet_id_(wallet_id_)
-  , seqno_(seqno_)
-  , last_transaction_id_(std::move(last_transaction_id_))
-  , sync_utime_(sync_utime_)
-{}
-
-const std::int32_t wallet_v3_accountState::ID;
-
-void wallet_v3_accountState::store(td::TlStorerToString &s, const char *field_name) const {
-  if (!LOG_IS_STRIPPED(ERROR)) {
-    s.store_class_begin(field_name, "wallet_v3_accountState");
-    s.store_field("balance", balance_);
-    s.store_field("wallet_id", wallet_id_);
-    s.store_field("seqno", seqno_);
-    if (last_transaction_id_ == nullptr) { s.store_field("last_transaction_id", "null"); } else { last_transaction_id_->store(s, "last_transaction_id"); }
-    s.store_field("sync_utime", sync_utime_);
-    s.store_class_end();
-  }
-}
-
-wallet_v3_initialAccountState::wallet_v3_initialAccountState()
-  : public_key_()
-  , wallet_id_()
-{}
-
-wallet_v3_initialAccountState::wallet_v3_initialAccountState(std::string const &public_key_, std::int64_t wallet_id_)
-  : public_key_(std::move(public_key_))
-  , wallet_id_(wallet_id_)
-{}
-
-const std::int32_t wallet_v3_initialAccountState::ID;
-
-void wallet_v3_initialAccountState::store(td::TlStorerToString &s, const char *field_name) const {
-  if (!LOG_IS_STRIPPED(ERROR)) {
-    s.store_class_begin(field_name, "wallet_v3_initialAccountState");
-    s.store_field("public_key", public_key_);
-    s.store_field("wallet_id", wallet_id_);
+    s.store_class_begin(field_name, "tvm_tuple");
+    { const std::vector<object_ptr<tvm_StackEntry>> &v = elements_; const std::uint32_t multiplicity = static_cast<std::uint32_t>(v.size()); const auto vector_name = "vector[" + td::to_string(multiplicity)+ "]"; s.store_class_begin("elements", vector_name.c_str()); for (std::uint32_t i = 0; i < multiplicity; i++) { if (v[i] == nullptr) { s.store_field("", "null"); } else { v[i]->store(s, ""); } } s.store_class_end(); }
     s.store_class_end();
   }
 }
@@ -1363,6 +1924,33 @@ void createNewKey::store(td::TlStorerToString &s, const char *field_name) const
   }
 }
 
+createQuery::createQuery()
+  : private_key_()
+  , address_()
+  , timeout_()
+  , action_()
+{}
+
+createQuery::createQuery(object_ptr<InputKey> &&private_key_, object_ptr<accountAddress> &&address_, std::int32_t timeout_, object_ptr<Action> &&action_)
+  : private_key_(std::move(private_key_))
+  , address_(std::move(address_))
+  , timeout_(timeout_)
+  , action_(std::move(action_))
+{}
+
+const std::int32_t createQuery::ID;
+
+void createQuery::store(td::TlStorerToString &s, const char *field_name) const {
+  if (!LOG_IS_STRIPPED(ERROR)) {
+    s.store_class_begin(field_name, "createQuery");
+    if (private_key_ == nullptr) { s.store_field("private_key", "null"); } else { private_key_->store(s, "private_key"); }
+    if (address_ == nullptr) { s.store_field("address", "null"); } else { address_->store(s, "address"); }
+    s.store_field("timeout", timeout_);
+    if (action_ == nullptr) { s.store_field("action", "null"); } else { action_->store(s, "action"); }
+    s.store_class_end();
+  }
+}
+
 decrypt::decrypt()
   : encrypted_data_()
   , secret_()
@@ -1414,6 +2002,33 @@ void deleteKey::store(td::TlStorerToString &s, const char *field_name) const {
   }
 }
 
+dns_resolve::dns_resolve()
+  : account_address_()
+  , name_()
+  , category_()
+  , ttl_()
+{}
+
+dns_resolve::dns_resolve(object_ptr<accountAddress> &&account_address_, std::string const &name_, std::int32_t category_, std::int32_t ttl_)
+  : account_address_(std::move(account_address_))
+  , name_(std::move(name_))
+  , category_(category_)
+  , ttl_(ttl_)
+{}
+
+const std::int32_t dns_resolve::ID;
+
+void dns_resolve::store(td::TlStorerToString &s, const char *field_name) const {
+  if (!LOG_IS_STRIPPED(ERROR)) {
+    s.store_class_begin(field_name, "dns_resolve");
+    if (account_address_ == nullptr) { s.store_field("account_address", "null"); } else { account_address_->store(s, "account_address"); }
+    s.store_field("name", name_);
+    s.store_field("category", category_);
+    s.store_field("ttl", ttl_);
+    s.store_class_end();
+  }
+}
+
 encrypt::encrypt()
   : decrypted_data_()
   , secret_()
@@ -1495,96 +2110,63 @@ void exportPemKey::store(td::TlStorerToString &s, const char *field_name) const
   }
 }
 
-generic_createSendGramsQuery::generic_createSendGramsQuery()
-  : private_key_()
-  , source_()
-  , destination_()
-  , amount_()
-  , timeout_()
-  , allow_send_to_uninited_()
-  , message_()
+exportUnencryptedKey::exportUnencryptedKey()
+  : input_key_()
 {}
 
-generic_createSendGramsQuery::generic_createSendGramsQuery(object_ptr<InputKey> &&private_key_, object_ptr<accountAddress> &&source_, object_ptr<accountAddress> &&destination_, std::int64_t amount_, std::int32_t timeout_, bool allow_send_to_uninited_, std::string const &message_)
-  : private_key_(std::move(private_key_))
-  , source_(std::move(source_))
-  , destination_(std::move(destination_))
-  , amount_(amount_)
-  , timeout_(timeout_)
-  , allow_send_to_uninited_(allow_send_to_uninited_)
-  , message_(std::move(message_))
+exportUnencryptedKey::exportUnencryptedKey(object_ptr<InputKey> &&input_key_)
+  : input_key_(std::move(input_key_))
 {}
 
-const std::int32_t generic_createSendGramsQuery::ID;
+const std::int32_t exportUnencryptedKey::ID;
 
-void generic_createSendGramsQuery::store(td::TlStorerToString &s, const char *field_name) const {
+void exportUnencryptedKey::store(td::TlStorerToString &s, const char *field_name) const {
   if (!LOG_IS_STRIPPED(ERROR)) {
-    s.store_class_begin(field_name, "generic_createSendGramsQuery");
-    if (private_key_ == nullptr) { s.store_field("private_key", "null"); } else { private_key_->store(s, "private_key"); }
-    if (source_ == nullptr) { s.store_field("source", "null"); } else { source_->store(s, "source"); }
-    if (destination_ == nullptr) { s.store_field("destination", "null"); } else { destination_->store(s, "destination"); }
-    s.store_field("amount", amount_);
-    s.store_field("timeout", timeout_);
-    s.store_field("allow_send_to_uninited", allow_send_to_uninited_);
-    s.store_bytes_field("message", message_);
+    s.store_class_begin(field_name, "exportUnencryptedKey");
+    if (input_key_ == nullptr) { s.store_field("input_key", "null"); } else { input_key_->store(s, "input_key"); }
     s.store_class_end();
   }
 }
 
-generic_getAccountState::generic_getAccountState()
+getAccountAddress::getAccountAddress()
+  : initial_account_state_()
+  , revision_()
+{}
+
+getAccountAddress::getAccountAddress(object_ptr<InitialAccountState> &&initial_account_state_, std::int32_t revision_)
+  : initial_account_state_(std::move(initial_account_state_))
+  , revision_(revision_)
+{}
+
+const std::int32_t getAccountAddress::ID;
+
+void getAccountAddress::store(td::TlStorerToString &s, const char *field_name) const {
+  if (!LOG_IS_STRIPPED(ERROR)) {
+    s.store_class_begin(field_name, "getAccountAddress");
+    if (initial_account_state_ == nullptr) { s.store_field("initial_account_state", "null"); } else { initial_account_state_->store(s, "initial_account_state"); }
+    s.store_field("revision", revision_);
+    s.store_class_end();
+  }
+}
+
+getAccountState::getAccountState()
   : account_address_()
 {}
 
-generic_getAccountState::generic_getAccountState(object_ptr<accountAddress> &&account_address_)
+getAccountState::getAccountState(object_ptr<accountAddress> &&account_address_)
   : account_address_(std::move(account_address_))
 {}
 
-const std::int32_t generic_getAccountState::ID;
+const std::int32_t getAccountState::ID;
 
-void generic_getAccountState::store(td::TlStorerToString &s, const char *field_name) const {
+void getAccountState::store(td::TlStorerToString &s, const char *field_name) const {
   if (!LOG_IS_STRIPPED(ERROR)) {
-    s.store_class_begin(field_name, "generic_getAccountState");
+    s.store_class_begin(field_name, "getAccountState");
     if (account_address_ == nullptr) { s.store_field("account_address", "null"); } else { account_address_->store(s, "account_address"); }
     s.store_class_end();
   }
 }
 
-generic_sendGrams::generic_sendGrams()
-  : private_key_()
-  , source_()
-  , destination_()
-  , amount_()
-  , timeout_()
-  , allow_send_to_uninited_()
-  , message_()
-{}
-
-generic_sendGrams::generic_sendGrams(object_ptr<InputKey> &&private_key_, object_ptr<accountAddress> &&source_, object_ptr<accountAddress> &&destination_, std::int64_t amount_, std::int32_t timeout_, bool allow_send_to_uninited_, std::string const &message_)
-  : private_key_(std::move(private_key_))
-  , source_(std::move(source_))
-  , destination_(std::move(destination_))
-  , amount_(amount_)
-  , timeout_(timeout_)
-  , allow_send_to_uninited_(allow_send_to_uninited_)
-  , message_(std::move(message_))
-{}
-
-const std::int32_t generic_sendGrams::ID;
-
-void generic_sendGrams::store(td::TlStorerToString &s, const char *field_name) const {
-  if (!LOG_IS_STRIPPED(ERROR)) {
-    s.store_class_begin(field_name, "generic_sendGrams");
-    if (private_key_ == nullptr) { s.store_field("private_key", "null"); } else { private_key_->store(s, "private_key"); }
-    if (source_ == nullptr) { s.store_field("source", "null"); } else { source_->store(s, "source"); }
-    if (destination_ == nullptr) { s.store_field("destination", "null"); } else { destination_->store(s, "destination"); }
-    s.store_field("amount", amount_);
-    s.store_field("timeout", timeout_);
-    s.store_field("allow_send_to_uninited", allow_send_to_uninited_);
-    s.store_bytes_field("message", message_);
-    s.store_class_end();
-  }
-}
-
 getBip39Hints::getBip39Hints()
   : prefix_()
 {}
@@ -1657,6 +2239,24 @@ void getLogVerbosityLevel::store(td::TlStorerToString &s, const char *field_name
   }
 }
 
+guessAccountRevision::guessAccountRevision()
+  : initial_account_state_()
+{}
+
+guessAccountRevision::guessAccountRevision(object_ptr<InitialAccountState> &&initial_account_state_)
+  : initial_account_state_(std::move(initial_account_state_))
+{}
+
+const std::int32_t guessAccountRevision::ID;
+
+void guessAccountRevision::store(td::TlStorerToString &s, const char *field_name) const {
+  if (!LOG_IS_STRIPPED(ERROR)) {
+    s.store_class_begin(field_name, "guessAccountRevision");
+    if (initial_account_state_ == nullptr) { s.store_field("initial_account_state", "null"); } else { initial_account_state_->store(s, "initial_account_state"); }
+    s.store_class_end();
+  }
+}
+
 importEncryptedKey::importEncryptedKey()
   : local_password_()
   , key_password_()
@@ -1729,6 +2329,27 @@ void importPemKey::store(td::TlStorerToString &s, const char *field_name) const
   }
 }
 
+importUnencryptedKey::importUnencryptedKey()
+  : local_password_()
+  , exported_unencrypted_key_()
+{}
+
+importUnencryptedKey::importUnencryptedKey(td::SecureString &&local_password_, object_ptr<exportedUnencryptedKey> &&exported_unencrypted_key_)
+  : local_password_(std::move(local_password_))
+  , exported_unencrypted_key_(std::move(exported_unencrypted_key_))
+{}
+
+const std::int32_t importUnencryptedKey::ID;
+
+void importUnencryptedKey::store(td::TlStorerToString &s, const char *field_name) const {
+  if (!LOG_IS_STRIPPED(ERROR)) {
+    s.store_class_begin(field_name, "importUnencryptedKey");
+    s.store_bytes_field("local_password", local_password_);
+    if (exported_unencrypted_key_ == nullptr) { s.store_field("exported_unencrypted_key", "null"); } else { exported_unencrypted_key_->store(s, "exported_unencrypted_key"); }
+    s.store_class_end();
+  }
+}
+
 init::init()
   : options_()
 {}
@@ -1783,6 +2404,27 @@ void liteServer_getInfo::store(td::TlStorerToString &s, const char *field_name)
   }
 }
 
+msg_decrypt::msg_decrypt()
+  : input_key_()
+  , data_()
+{}
+
+msg_decrypt::msg_decrypt(object_ptr<InputKey> &&input_key_, object_ptr<msg_dataArray> &&data_)
+  : input_key_(std::move(input_key_))
+  , data_(std::move(data_))
+{}
+
+const std::int32_t msg_decrypt::ID;
+
+void msg_decrypt::store(td::TlStorerToString &s, const char *field_name) const {
+  if (!LOG_IS_STRIPPED(ERROR)) {
+    s.store_class_begin(field_name, "msg_decrypt");
+    if (input_key_ == nullptr) { s.store_field("input_key", "null"); } else { input_key_->store(s, "input_key"); }
+    if (data_ == nullptr) { s.store_field("data", "null"); } else { data_->store(s, "data"); }
+    s.store_class_end();
+  }
+}
+
 onLiteServerQueryError::onLiteServerQueryError()
   : id_()
   , error_()
@@ -2005,24 +2647,6 @@ void raw_createQuery::store(td::TlStorerToString &s, const char *field_name) con
   }
 }
 
-raw_getAccountAddress::raw_getAccountAddress()
-  : initital_account_state_()
-{}
-
-raw_getAccountAddress::raw_getAccountAddress(object_ptr<raw_initialAccountState> &&initital_account_state_)
-  : initital_account_state_(std::move(initital_account_state_))
-{}
-
-const std::int32_t raw_getAccountAddress::ID;
-
-void raw_getAccountAddress::store(td::TlStorerToString &s, const char *field_name) const {
-  if (!LOG_IS_STRIPPED(ERROR)) {
-    s.store_class_begin(field_name, "raw_getAccountAddress");
-    if (initital_account_state_ == nullptr) { s.store_field("initital_account_state", "null"); } else { initital_account_state_->store(s, "initital_account_state"); }
-    s.store_class_end();
-  }
-}
-
 raw_getAccountState::raw_getAccountState()
   : account_address_()
 {}
@@ -2042,12 +2666,14 @@ void raw_getAccountState::store(td::TlStorerToString &s, const char *field_name)
 }
 
 raw_getTransactions::raw_getTransactions()
-  : account_address_()
+  : private_key_()
+  , account_address_()
   , from_transaction_id_()
 {}
 
-raw_getTransactions::raw_getTransactions(object_ptr<accountAddress> &&account_address_, object_ptr<internal_transactionId> &&from_transaction_id_)
-  : account_address_(std::move(account_address_))
+raw_getTransactions::raw_getTransactions(object_ptr<InputKey> &&private_key_, object_ptr<accountAddress> &&account_address_, object_ptr<internal_transactionId> &&from_transaction_id_)
+  : private_key_(std::move(private_key_))
+  , account_address_(std::move(account_address_))
   , from_transaction_id_(std::move(from_transaction_id_))
 {}
 
@@ -2056,6 +2682,7 @@ const std::int32_t raw_getTransactions::ID;
 void raw_getTransactions::store(td::TlStorerToString &s, const char *field_name) const {
   if (!LOG_IS_STRIPPED(ERROR)) {
     s.store_class_begin(field_name, "raw_getTransactions");
+    if (private_key_ == nullptr) { s.store_field("private_key", "null"); } else { private_key_->store(s, "private_key"); }
     if (account_address_ == nullptr) { s.store_field("account_address", "null"); } else { account_address_->store(s, "account_address"); }
     if (from_transaction_id_ == nullptr) { s.store_field("from_transaction_id", "null"); } else { from_transaction_id_->store(s, "from_transaction_id"); }
     s.store_class_end();
@@ -2263,141 +2890,6 @@ void sync::store(td::TlStorerToString &s, const char *field_name) const {
   }
 }
 
-testGiver_getAccountAddress::testGiver_getAccountAddress() {
-}
-
-const std::int32_t testGiver_getAccountAddress::ID;
-
-void testGiver_getAccountAddress::store(td::TlStorerToString &s, const char *field_name) const {
-  if (!LOG_IS_STRIPPED(ERROR)) {
-    s.store_class_begin(field_name, "testGiver_getAccountAddress");
-    s.store_class_end();
-  }
-}
-
-testGiver_getAccountState::testGiver_getAccountState() {
-}
-
-const std::int32_t testGiver_getAccountState::ID;
-
-void testGiver_getAccountState::store(td::TlStorerToString &s, const char *field_name) const {
-  if (!LOG_IS_STRIPPED(ERROR)) {
-    s.store_class_begin(field_name, "testGiver_getAccountState");
-    s.store_class_end();
-  }
-}
-
-testGiver_sendGrams::testGiver_sendGrams()
-  : destination_()
-  , seqno_()
-  , amount_()
-  , message_()
-{}
-
-testGiver_sendGrams::testGiver_sendGrams(object_ptr<accountAddress> &&destination_, std::int32_t seqno_, std::int64_t amount_, std::string const &message_)
-  : destination_(std::move(destination_))
-  , seqno_(seqno_)
-  , amount_(amount_)
-  , message_(std::move(message_))
-{}
-
-const std::int32_t testGiver_sendGrams::ID;
-
-void testGiver_sendGrams::store(td::TlStorerToString &s, const char *field_name) const {
-  if (!LOG_IS_STRIPPED(ERROR)) {
-    s.store_class_begin(field_name, "testGiver_sendGrams");
-    if (destination_ == nullptr) { s.store_field("destination", "null"); } else { destination_->store(s, "destination"); }
-    s.store_field("seqno", seqno_);
-    s.store_field("amount", amount_);
-    s.store_bytes_field("message", message_);
-    s.store_class_end();
-  }
-}
-
-testWallet_getAccountAddress::testWallet_getAccountAddress()
-  : initital_account_state_()
-{}
-
-testWallet_getAccountAddress::testWallet_getAccountAddress(object_ptr<testWallet_initialAccountState> &&initital_account_state_)
-  : initital_account_state_(std::move(initital_account_state_))
-{}
-
-const std::int32_t testWallet_getAccountAddress::ID;
-
-void testWallet_getAccountAddress::store(td::TlStorerToString &s, const char *field_name) const {
-  if (!LOG_IS_STRIPPED(ERROR)) {
-    s.store_class_begin(field_name, "testWallet_getAccountAddress");
-    if (initital_account_state_ == nullptr) { s.store_field("initital_account_state", "null"); } else { initital_account_state_->store(s, "initital_account_state"); }
-    s.store_class_end();
-  }
-}
-
-testWallet_getAccountState::testWallet_getAccountState()
-  : account_address_()
-{}
-
-testWallet_getAccountState::testWallet_getAccountState(object_ptr<accountAddress> &&account_address_)
-  : account_address_(std::move(account_address_))
-{}
-
-const std::int32_t testWallet_getAccountState::ID;
-
-void testWallet_getAccountState::store(td::TlStorerToString &s, const char *field_name) const {
-  if (!LOG_IS_STRIPPED(ERROR)) {
-    s.store_class_begin(field_name, "testWallet_getAccountState");
-    if (account_address_ == nullptr) { s.store_field("account_address", "null"); } else { account_address_->store(s, "account_address"); }
-    s.store_class_end();
-  }
-}
-
-testWallet_init::testWallet_init()
-  : private_key_()
-{}
-
-testWallet_init::testWallet_init(object_ptr<InputKey> &&private_key_)
-  : private_key_(std::move(private_key_))
-{}
-
-const std::int32_t testWallet_init::ID;
-
-void testWallet_init::store(td::TlStorerToString &s, const char *field_name) const {
-  if (!LOG_IS_STRIPPED(ERROR)) {
-    s.store_class_begin(field_name, "testWallet_init");
-    if (private_key_ == nullptr) { s.store_field("private_key", "null"); } else { private_key_->store(s, "private_key"); }
-    s.store_class_end();
-  }
-}
-
-testWallet_sendGrams::testWallet_sendGrams()
-  : private_key_()
-  , destination_()
-  , seqno_()
-  , amount_()
-  , message_()
-{}
-
-testWallet_sendGrams::testWallet_sendGrams(object_ptr<InputKey> &&private_key_, object_ptr<accountAddress> &&destination_, std::int32_t seqno_, std::int64_t amount_, std::string const &message_)
-  : private_key_(std::move(private_key_))
-  , destination_(std::move(destination_))
-  , seqno_(seqno_)
-  , amount_(amount_)
-  , message_(std::move(message_))
-{}
-
-const std::int32_t testWallet_sendGrams::ID;
-
-void testWallet_sendGrams::store(td::TlStorerToString &s, const char *field_name) const {
-  if (!LOG_IS_STRIPPED(ERROR)) {
-    s.store_class_begin(field_name, "testWallet_sendGrams");
-    if (private_key_ == nullptr) { s.store_field("private_key", "null"); } else { private_key_->store(s, "private_key"); }
-    if (destination_ == nullptr) { s.store_field("destination", "null"); } else { destination_->store(s, "destination"); }
-    s.store_field("seqno", seqno_);
-    s.store_field("amount", amount_);
-    s.store_bytes_field("message", message_);
-    s.store_class_end();
-  }
-}
-
 unpackAccountAddress::unpackAccountAddress()
   : account_address_()
 {}
@@ -2416,107 +2908,23 @@ void unpackAccountAddress::store(td::TlStorerToString &s, const char *field_name
   }
 }
 
-wallet_getAccountAddress::wallet_getAccountAddress()
-  : initital_account_state_()
+withBlock::withBlock()
+  : id_()
+  , function_()
 {}
 
-wallet_getAccountAddress::wallet_getAccountAddress(object_ptr<wallet_initialAccountState> &&initital_account_state_)
-  : initital_account_state_(std::move(initital_account_state_))
+withBlock::withBlock(object_ptr<ton_blockIdExt> &&id_, object_ptr<Function> &&function_)
+  : id_(std::move(id_))
+  , function_(std::move(function_))
 {}
 
-const std::int32_t wallet_getAccountAddress::ID;
+const std::int32_t withBlock::ID;
 
-void wallet_getAccountAddress::store(td::TlStorerToString &s, const char *field_name) const {
+void withBlock::store(td::TlStorerToString &s, const char *field_name) const {
   if (!LOG_IS_STRIPPED(ERROR)) {
-    s.store_class_begin(field_name, "wallet_getAccountAddress");
-    if (initital_account_state_ == nullptr) { s.store_field("initital_account_state", "null"); } else { initital_account_state_->store(s, "initital_account_state"); }
-    s.store_class_end();
-  }
-}
-
-wallet_getAccountState::wallet_getAccountState()
-  : account_address_()
-{}
-
-wallet_getAccountState::wallet_getAccountState(object_ptr<accountAddress> &&account_address_)
-  : account_address_(std::move(account_address_))
-{}
-
-const std::int32_t wallet_getAccountState::ID;
-
-void wallet_getAccountState::store(td::TlStorerToString &s, const char *field_name) const {
-  if (!LOG_IS_STRIPPED(ERROR)) {
-    s.store_class_begin(field_name, "wallet_getAccountState");
-    if (account_address_ == nullptr) { s.store_field("account_address", "null"); } else { account_address_->store(s, "account_address"); }
-    s.store_class_end();
-  }
-}
-
-wallet_init::wallet_init()
-  : private_key_()
-{}
-
-wallet_init::wallet_init(object_ptr<InputKey> &&private_key_)
-  : private_key_(std::move(private_key_))
-{}
-
-const std::int32_t wallet_init::ID;
-
-void wallet_init::store(td::TlStorerToString &s, const char *field_name) const {
-  if (!LOG_IS_STRIPPED(ERROR)) {
-    s.store_class_begin(field_name, "wallet_init");
-    if (private_key_ == nullptr) { s.store_field("private_key", "null"); } else { private_key_->store(s, "private_key"); }
-    s.store_class_end();
-  }
-}
-
-wallet_sendGrams::wallet_sendGrams()
-  : private_key_()
-  , destination_()
-  , seqno_()
-  , valid_until_()
-  , amount_()
-  , message_()
-{}
-
-wallet_sendGrams::wallet_sendGrams(object_ptr<InputKey> &&private_key_, object_ptr<accountAddress> &&destination_, std::int32_t seqno_, std::int64_t valid_until_, std::int64_t amount_, std::string const &message_)
-  : private_key_(std::move(private_key_))
-  , destination_(std::move(destination_))
-  , seqno_(seqno_)
-  , valid_until_(valid_until_)
-  , amount_(amount_)
-  , message_(std::move(message_))
-{}
-
-const std::int32_t wallet_sendGrams::ID;
-
-void wallet_sendGrams::store(td::TlStorerToString &s, const char *field_name) const {
-  if (!LOG_IS_STRIPPED(ERROR)) {
-    s.store_class_begin(field_name, "wallet_sendGrams");
-    if (private_key_ == nullptr) { s.store_field("private_key", "null"); } else { private_key_->store(s, "private_key"); }
-    if (destination_ == nullptr) { s.store_field("destination", "null"); } else { destination_->store(s, "destination"); }
-    s.store_field("seqno", seqno_);
-    s.store_field("valid_until", valid_until_);
-    s.store_field("amount", amount_);
-    s.store_bytes_field("message", message_);
-    s.store_class_end();
-  }
-}
-
-wallet_v3_getAccountAddress::wallet_v3_getAccountAddress()
-  : initital_account_state_()
-{}
-
-wallet_v3_getAccountAddress::wallet_v3_getAccountAddress(object_ptr<wallet_v3_initialAccountState> &&initital_account_state_)
-  : initital_account_state_(std::move(initital_account_state_))
-{}
-
-const std::int32_t wallet_v3_getAccountAddress::ID;
-
-void wallet_v3_getAccountAddress::store(td::TlStorerToString &s, const char *field_name) const {
-  if (!LOG_IS_STRIPPED(ERROR)) {
-    s.store_class_begin(field_name, "wallet_v3_getAccountAddress");
-    if (initital_account_state_ == nullptr) { s.store_field("initital_account_state", "null"); } else { initital_account_state_->store(s, "initital_account_state"); }
+    s.store_class_begin(field_name, "withBlock");
+    if (id_ == nullptr) { s.store_field("id", "null"); } else { id_->store(s, "id"); }
+    if (function_ == nullptr) { s.store_field("function", "null"); } else { function_->store(s, "function"); }
     s.store_class_end();
   }
 }
diff --git a/submodules/ton/tonlib-src/tl/generate/auto/tl/tonlib_api.h b/submodules/ton/tonlib-src/tl/generate/auto/tl/tonlib_api.h
index ae90186fea..5247ecddfa 100644
--- a/submodules/ton/tonlib-src/tl/generate/auto/tl/tonlib_api.h
+++ b/submodules/ton/tonlib-src/tl/generate/auto/tl/tonlib_api.h
@@ -46,6 +46,14 @@ std::string to_string(const object_ptr<T> &value) {
 
 class accountAddress;
 
+class accountRevisionList;
+
+class AccountState;
+
+class Action;
+
+class adnlAddress;
+
 class bip39Hints;
 
 class config;
@@ -60,8 +68,14 @@ class exportedKey;
 
 class exportedPemKey;
 
+class exportedUnencryptedKey;
+
 class fees;
 
+class fullAccountState;
+
+class InitialAccountState;
+
 class InputKey;
 
 class key;
@@ -78,29 +92,41 @@ class ok;
 
 class options;
 
-class sendGramsResult;
-
 class SyncState;
 
 class unpackedAccountAddress;
 
 class Update;
 
-class generic_AccountState;
+class dns_Action;
+
+class dns_entry;
+
+class dns_EntryData;
+
+class dns_resolved;
+
+class ton_blockId;
 
 class internal_transactionId;
 
 class liteServer_info;
 
+class msg_Data;
+
+class msg_dataArray;
+
+class msg_message;
+
 class options_configInfo;
 
+class options_info;
+
 class query_fees;
 
 class query_info;
 
-class raw_accountState;
-
-class raw_initialAccountState;
+class raw_fullAccountState;
 
 class raw_message;
 
@@ -114,29 +140,19 @@ class smc_MethodId;
 
 class smc_runResult;
 
-class testGiver_accountState;
-
-class testWallet_accountState;
-
-class testWallet_initialAccountState;
+class ton_blockIdExt;
 
 class tvm_cell;
 
+class tvm_list;
+
 class tvm_numberDecimal;
 
 class tvm_slice;
 
 class tvm_StackEntry;
 
-class uninited_accountState;
-
-class wallet_accountState;
-
-class wallet_initialAccountState;
-
-class wallet_v3_accountState;
-
-class wallet_v3_initialAccountState;
+class tvm_tuple;
 
 class Object;
 
@@ -164,6 +180,240 @@ class accountAddress final : public Object {
   void store(td::TlStorerToString &s, const char *field_name) const final;
 };
 
+class accountRevisionList final : public Object {
+ public:
+  std::vector<std::int32_t> revisions_;
+
+  accountRevisionList();
+
+  explicit accountRevisionList(std::vector<std::int32_t> &&revisions_);
+
+  static const std::int32_t ID = 120583012;
+  std::int32_t get_id() const final {
+    return ID;
+  }
+
+  void store(td::TlStorerToString &s, const char *field_name) const final;
+};
+
+class AccountState: public Object {
+ public:
+};
+
+class raw_accountState final : public AccountState {
+ public:
+  std::string code_;
+  std::string data_;
+  std::string frozen_hash_;
+
+  raw_accountState();
+
+  raw_accountState(std::string const &code_, std::string const &data_, std::string const &frozen_hash_);
+
+  static const std::int32_t ID = -531917254;
+  std::int32_t get_id() const final {
+    return ID;
+  }
+
+  void store(td::TlStorerToString &s, const char *field_name) const final;
+};
+
+class testWallet_accountState final : public AccountState {
+ public:
+  std::int32_t seqno_;
+
+  testWallet_accountState();
+
+  explicit testWallet_accountState(std::int32_t seqno_);
+
+  static const std::int32_t ID = -2053909931;
+  std::int32_t get_id() const final {
+    return ID;
+  }
+
+  void store(td::TlStorerToString &s, const char *field_name) const final;
+};
+
+class wallet_accountState final : public AccountState {
+ public:
+  std::int32_t seqno_;
+
+  wallet_accountState();
+
+  explicit wallet_accountState(std::int32_t seqno_);
+
+  static const std::int32_t ID = -390017192;
+  std::int32_t get_id() const final {
+    return ID;
+  }
+
+  void store(td::TlStorerToString &s, const char *field_name) const final;
+};
+
+class wallet_v3_accountState final : public AccountState {
+ public:
+  std::int64_t wallet_id_;
+  std::int32_t seqno_;
+
+  wallet_v3_accountState();
+
+  wallet_v3_accountState(std::int64_t wallet_id_, std::int32_t seqno_);
+
+  static const std::int32_t ID = -1619351478;
+  std::int32_t get_id() const final {
+    return ID;
+  }
+
+  void store(td::TlStorerToString &s, const char *field_name) const final;
+};
+
+class wallet_highload_v1_accountState final : public AccountState {
+ public:
+  std::int64_t wallet_id_;
+  std::int32_t seqno_;
+
+  wallet_highload_v1_accountState();
+
+  wallet_highload_v1_accountState(std::int64_t wallet_id_, std::int32_t seqno_);
+
+  static const std::int32_t ID = 1616372956;
+  std::int32_t get_id() const final {
+    return ID;
+  }
+
+  void store(td::TlStorerToString &s, const char *field_name) const final;
+};
+
+class wallet_highload_v2_accountState final : public AccountState {
+ public:
+  std::int64_t wallet_id_;
+
+  wallet_highload_v2_accountState();
+
+  explicit wallet_highload_v2_accountState(std::int64_t wallet_id_);
+
+  static const std::int32_t ID = -1803723441;
+  std::int32_t get_id() const final {
+    return ID;
+  }
+
+  void store(td::TlStorerToString &s, const char *field_name) const final;
+};
+
+class testGiver_accountState final : public AccountState {
+ public:
+  std::int32_t seqno_;
+
+  testGiver_accountState();
+
+  explicit testGiver_accountState(std::int32_t seqno_);
+
+  static const std::int32_t ID = -696813142;
+  std::int32_t get_id() const final {
+    return ID;
+  }
+
+  void store(td::TlStorerToString &s, const char *field_name) const final;
+};
+
+class dns_accountState final : public AccountState {
+ public:
+  std::int64_t wallet_id_;
+
+  dns_accountState();
+
+  explicit dns_accountState(std::int64_t wallet_id_);
+
+  static const std::int32_t ID = 1727715434;
+  std::int32_t get_id() const final {
+    return ID;
+  }
+
+  void store(td::TlStorerToString &s, const char *field_name) const final;
+};
+
+class uninited_accountState final : public AccountState {
+ public:
+  std::string frozen_hash_;
+
+  uninited_accountState();
+
+  explicit uninited_accountState(std::string const &frozen_hash_);
+
+  static const std::int32_t ID = 1522374408;
+  std::int32_t get_id() const final {
+    return ID;
+  }
+
+  void store(td::TlStorerToString &s, const char *field_name) const final;
+};
+
+class Action: public Object {
+ public:
+};
+
+class actionNoop final : public Action {
+ public:
+
+  actionNoop();
+
+  static const std::int32_t ID = 1135848603;
+  std::int32_t get_id() const final {
+    return ID;
+  }
+
+  void store(td::TlStorerToString &s, const char *field_name) const final;
+};
+
+class actionMsg final : public Action {
+ public:
+  std::vector<object_ptr<msg_message>> messages_;
+  bool allow_send_to_uninited_;
+
+  actionMsg();
+
+  actionMsg(std::vector<object_ptr<msg_message>> &&messages_, bool allow_send_to_uninited_);
+
+  static const std::int32_t ID = 246839120;
+  std::int32_t get_id() const final {
+    return ID;
+  }
+
+  void store(td::TlStorerToString &s, const char *field_name) const final;
+};
+
+class actionDns final : public Action {
+ public:
+  std::vector<object_ptr<dns_Action>> actions_;
+
+  actionDns();
+
+  explicit actionDns(std::vector<object_ptr<dns_Action>> &&actions_);
+
+  static const std::int32_t ID = 1193750561;
+  std::int32_t get_id() const final {
+    return ID;
+  }
+
+  void store(td::TlStorerToString &s, const char *field_name) const final;
+};
+
+class adnlAddress final : public Object {
+ public:
+  std::string adnl_address_;
+
+  adnlAddress();
+
+  explicit adnlAddress(std::string const &adnl_address_);
+
+  static const std::int32_t ID = 70358284;
+  std::int32_t get_id() const final {
+    return ID;
+  }
+
+  void store(td::TlStorerToString &s, const char *field_name) const final;
+};
+
 class bip39Hints final : public Object {
  public:
   std::vector<std::string> words_;
@@ -280,6 +530,22 @@ class exportedPemKey final : public Object {
   void store(td::TlStorerToString &s, const char *field_name) const final;
 };
 
+class exportedUnencryptedKey final : public Object {
+ public:
+  td::SecureString data_;
+
+  exportedUnencryptedKey();
+
+  explicit exportedUnencryptedKey(td::SecureString &&data_);
+
+  static const std::int32_t ID = 730045160;
+  std::int32_t get_id() const final {
+    return ID;
+  }
+
+  void store(td::TlStorerToString &s, const char *field_name) const final;
+};
+
 class fees final : public Object {
  public:
   std::int64_t in_fwd_fee_;
@@ -299,6 +565,160 @@ class fees final : public Object {
   void store(td::TlStorerToString &s, const char *field_name) const final;
 };
 
+class fullAccountState final : public Object {
+ public:
+  std::int64_t balance_;
+  object_ptr<internal_transactionId> last_transaction_id_;
+  object_ptr<ton_blockIdExt> block_id_;
+  std::int64_t sync_utime_;
+  object_ptr<AccountState> account_state_;
+
+  fullAccountState();
+
+  fullAccountState(std::int64_t balance_, object_ptr<internal_transactionId> &&last_transaction_id_, object_ptr<ton_blockIdExt> &&block_id_, std::int64_t sync_utime_, object_ptr<AccountState> &&account_state_);
+
+  static const std::int32_t ID = -686286006;
+  std::int32_t get_id() const final {
+    return ID;
+  }
+
+  void store(td::TlStorerToString &s, const char *field_name) const final;
+};
+
+class InitialAccountState: public Object {
+ public:
+};
+
+class raw_initialAccountState final : public InitialAccountState {
+ public:
+  std::string code_;
+  std::string data_;
+
+  raw_initialAccountState();
+
+  raw_initialAccountState(std::string const &code_, std::string const &data_);
+
+  static const std::int32_t ID = -337945529;
+  std::int32_t get_id() const final {
+    return ID;
+  }
+
+  void store(td::TlStorerToString &s, const char *field_name) const final;
+};
+
+class testGiver_initialAccountState final : public InitialAccountState {
+ public:
+
+  testGiver_initialAccountState();
+
+  static const std::int32_t ID = -1448412176;
+  std::int32_t get_id() const final {
+    return ID;
+  }
+
+  void store(td::TlStorerToString &s, const char *field_name) const final;
+};
+
+class testWallet_initialAccountState final : public InitialAccountState {
+ public:
+  std::string public_key_;
+
+  testWallet_initialAccountState();
+
+  explicit testWallet_initialAccountState(std::string const &public_key_);
+
+  static const std::int32_t ID = 819380068;
+  std::int32_t get_id() const final {
+    return ID;
+  }
+
+  void store(td::TlStorerToString &s, const char *field_name) const final;
+};
+
+class wallet_initialAccountState final : public InitialAccountState {
+ public:
+  std::string public_key_;
+
+  wallet_initialAccountState();
+
+  explicit wallet_initialAccountState(std::string const &public_key_);
+
+  static const std::int32_t ID = -1122166790;
+  std::int32_t get_id() const final {
+    return ID;
+  }
+
+  void store(td::TlStorerToString &s, const char *field_name) const final;
+};
+
+class wallet_v3_initialAccountState final : public InitialAccountState {
+ public:
+  std::string public_key_;
+  std::int64_t wallet_id_;
+
+  wallet_v3_initialAccountState();
+
+  wallet_v3_initialAccountState(std::string const &public_key_, std::int64_t wallet_id_);
+
+  static const std::int32_t ID = -118074048;
+  std::int32_t get_id() const final {
+    return ID;
+  }
+
+  void store(td::TlStorerToString &s, const char *field_name) const final;
+};
+
+class wallet_highload_v1_initialAccountState final : public InitialAccountState {
+ public:
+  std::string public_key_;
+  std::int64_t wallet_id_;
+
+  wallet_highload_v1_initialAccountState();
+
+  wallet_highload_v1_initialAccountState(std::string const &public_key_, std::int64_t wallet_id_);
+
+  static const std::int32_t ID = -327901626;
+  std::int32_t get_id() const final {
+    return ID;
+  }
+
+  void store(td::TlStorerToString &s, const char *field_name) const final;
+};
+
+class wallet_highload_v2_initialAccountState final : public InitialAccountState {
+ public:
+  std::string public_key_;
+  std::int64_t wallet_id_;
+
+  wallet_highload_v2_initialAccountState();
+
+  wallet_highload_v2_initialAccountState(std::string const &public_key_, std::int64_t wallet_id_);
+
+  static const std::int32_t ID = 1966373161;
+  std::int32_t get_id() const final {
+    return ID;
+  }
+
+  void store(td::TlStorerToString &s, const char *field_name) const final;
+};
+
+class dns_initialAccountState final : public InitialAccountState {
+ public:
+  std::string public_key_;
+  std::int64_t wallet_id_;
+
+  dns_initialAccountState();
+
+  dns_initialAccountState(std::string const &public_key_, std::int64_t wallet_id_);
+
+  static const std::int32_t ID = 1842062527;
+  std::int32_t get_id() const final {
+    return ID;
+  }
+
+  void store(td::TlStorerToString &s, const char *field_name) const final;
+};
+
 class InputKey: public Object {
  public:
 };
@@ -492,23 +912,6 @@ class options final : public Object {
   void store(td::TlStorerToString &s, const char *field_name) const final;
 };
 
-class sendGramsResult final : public Object {
- public:
-  std::int64_t sent_until_;
-  std::string body_hash_;
-
-  sendGramsResult();
-
-  sendGramsResult(std::int64_t sent_until_, std::string const &body_hash_);
-
-  static const std::int32_t ID = 426872238;
-  std::int32_t get_id() const final {
-    return ID;
-  }
-
-  void store(td::TlStorerToString &s, const char *field_name) const final;
-};
-
 class SyncState: public Object {
  public:
 };
@@ -600,19 +1003,16 @@ class updateSyncState final : public Update {
   void store(td::TlStorerToString &s, const char *field_name) const final;
 };
 
-class generic_AccountState: public Object {
+class dns_Action: public Object {
  public:
 };
 
-class generic_accountStateRaw final : public generic_AccountState {
+class dns_actionDeleteAll final : public dns_Action {
  public:
-  object_ptr<raw_accountState> account_state_;
 
-  generic_accountStateRaw();
+  dns_actionDeleteAll();
 
-  explicit generic_accountStateRaw(object_ptr<raw_accountState> &&account_state_);
-
-  static const std::int32_t ID = -1387096685;
+  static const std::int32_t ID = 1067356318;
   std::int32_t get_id() const final {
     return ID;
   }
@@ -620,15 +1020,16 @@ class generic_accountStateRaw final : public generic_AccountState {
   void store(td::TlStorerToString &s, const char *field_name) const final;
 };
 
-class generic_accountStateTestWallet final : public generic_AccountState {
+class dns_actionDelete final : public dns_Action {
  public:
-  object_ptr<testWallet_accountState> account_state_;
+  std::string name_;
+  std::int32_t category_;
 
-  generic_accountStateTestWallet();
+  dns_actionDelete();
 
-  explicit generic_accountStateTestWallet(object_ptr<testWallet_accountState> &&account_state_);
+  dns_actionDelete(std::string const &name_, std::int32_t category_);
 
-  static const std::int32_t ID = -1041955397;
+  static const std::int32_t ID = 775206882;
   std::int32_t get_id() const final {
     return ID;
   }
@@ -636,15 +1037,15 @@ class generic_accountStateTestWallet final : public generic_AccountState {
   void store(td::TlStorerToString &s, const char *field_name) const final;
 };
 
-class generic_accountStateWallet final : public generic_AccountState {
+class dns_actionSet final : public dns_Action {
  public:
-  object_ptr<wallet_accountState> account_state_;
+  object_ptr<dns_entry> entry_;
 
-  generic_accountStateWallet();
+  dns_actionSet();
 
-  explicit generic_accountStateWallet(object_ptr<wallet_accountState> &&account_state_);
+  explicit dns_actionSet(object_ptr<dns_entry> &&entry_);
 
-  static const std::int32_t ID = 942582925;
+  static const std::int32_t ID = -1374965309;
   std::int32_t get_id() const final {
     return ID;
   }
@@ -652,15 +1053,17 @@ class generic_accountStateWallet final : public generic_AccountState {
   void store(td::TlStorerToString &s, const char *field_name) const final;
 };
 
-class generic_accountStateWalletV3 final : public generic_AccountState {
+class dns_entry final : public Object {
  public:
-  object_ptr<wallet_v3_accountState> account_state_;
+  std::string name_;
+  std::int32_t category_;
+  object_ptr<dns_EntryData> entry_;
 
-  generic_accountStateWalletV3();
+  dns_entry();
 
-  explicit generic_accountStateWalletV3(object_ptr<wallet_v3_accountState> &&account_state_);
+  dns_entry(std::string const &name_, std::int32_t category_, object_ptr<dns_EntryData> &&entry_);
 
-  static const std::int32_t ID = -281349583;
+  static const std::int32_t ID = -1842435400;
   std::int32_t get_id() const final {
     return ID;
   }
@@ -668,15 +1071,19 @@ class generic_accountStateWalletV3 final : public generic_AccountState {
   void store(td::TlStorerToString &s, const char *field_name) const final;
 };
 
-class generic_accountStateTestGiver final : public generic_AccountState {
+class dns_EntryData: public Object {
  public:
-  object_ptr<testGiver_accountState> account_state_;
+};
 
-  generic_accountStateTestGiver();
+class dns_entryDataUnknown final : public dns_EntryData {
+ public:
+  std::string bytes_;
 
-  explicit generic_accountStateTestGiver(object_ptr<testGiver_accountState> &&account_state_);
+  dns_entryDataUnknown();
 
-  static const std::int32_t ID = 1134654598;
+  explicit dns_entryDataUnknown(std::string const &bytes_);
+
+  static const std::int32_t ID = -1285893248;
   std::int32_t get_id() const final {
     return ID;
   }
@@ -684,15 +1091,97 @@ class generic_accountStateTestGiver final : public generic_AccountState {
   void store(td::TlStorerToString &s, const char *field_name) const final;
 };
 
-class generic_accountStateUninited final : public generic_AccountState {
+class dns_entryDataText final : public dns_EntryData {
  public:
-  object_ptr<uninited_accountState> account_state_;
+  std::string text_;
 
-  generic_accountStateUninited();
+  dns_entryDataText();
 
-  explicit generic_accountStateUninited(object_ptr<uninited_accountState> &&account_state_);
+  explicit dns_entryDataText(std::string const &text_);
 
-  static const std::int32_t ID = -908702008;
+  static const std::int32_t ID = -792485614;
+  std::int32_t get_id() const final {
+    return ID;
+  }
+
+  void store(td::TlStorerToString &s, const char *field_name) const final;
+};
+
+class dns_entryDataNextResolver final : public dns_EntryData {
+ public:
+  object_ptr<accountAddress> resolver_;
+
+  dns_entryDataNextResolver();
+
+  explicit dns_entryDataNextResolver(object_ptr<accountAddress> &&resolver_);
+
+  static const std::int32_t ID = 330382792;
+  std::int32_t get_id() const final {
+    return ID;
+  }
+
+  void store(td::TlStorerToString &s, const char *field_name) const final;
+};
+
+class dns_entryDataSmcAddress final : public dns_EntryData {
+ public:
+  object_ptr<accountAddress> smc_address_;
+
+  dns_entryDataSmcAddress();
+
+  explicit dns_entryDataSmcAddress(object_ptr<accountAddress> &&smc_address_);
+
+  static const std::int32_t ID = -1759937982;
+  std::int32_t get_id() const final {
+    return ID;
+  }
+
+  void store(td::TlStorerToString &s, const char *field_name) const final;
+};
+
+class dns_entryDataAdnlAddress final : public dns_EntryData {
+ public:
+  object_ptr<adnlAddress> adnl_address_;
+
+  dns_entryDataAdnlAddress();
+
+  explicit dns_entryDataAdnlAddress(object_ptr<adnlAddress> &&adnl_address_);
+
+  static const std::int32_t ID = -1114064368;
+  std::int32_t get_id() const final {
+    return ID;
+  }
+
+  void store(td::TlStorerToString &s, const char *field_name) const final;
+};
+
+class dns_resolved final : public Object {
+ public:
+  std::vector<object_ptr<dns_entry>> entries_;
+
+  dns_resolved();
+
+  explicit dns_resolved(std::vector<object_ptr<dns_entry>> &&entries_);
+
+  static const std::int32_t ID = 2090272150;
+  std::int32_t get_id() const final {
+    return ID;
+  }
+
+  void store(td::TlStorerToString &s, const char *field_name) const final;
+};
+
+class ton_blockId final : public Object {
+ public:
+  std::int32_t workchain_;
+  std::int64_t shard_;
+  std::int32_t seqno_;
+
+  ton_blockId();
+
+  ton_blockId(std::int32_t workchain_, std::int64_t shard_, std::int32_t seqno_);
+
+  static const std::int32_t ID = -1185382494;
   std::int32_t get_id() const final {
     return ID;
   }
@@ -735,6 +1224,108 @@ class liteServer_info final : public Object {
   void store(td::TlStorerToString &s, const char *field_name) const final;
 };
 
+class msg_Data: public Object {
+ public:
+};
+
+class msg_dataRaw final : public msg_Data {
+ public:
+  std::string body_;
+
+  msg_dataRaw();
+
+  explicit msg_dataRaw(std::string const &body_);
+
+  static const std::int32_t ID = 38878511;
+  std::int32_t get_id() const final {
+    return ID;
+  }
+
+  void store(td::TlStorerToString &s, const char *field_name) const final;
+};
+
+class msg_dataText final : public msg_Data {
+ public:
+  std::string text_;
+
+  msg_dataText();
+
+  explicit msg_dataText(std::string const &text_);
+
+  static const std::int32_t ID = -341560688;
+  std::int32_t get_id() const final {
+    return ID;
+  }
+
+  void store(td::TlStorerToString &s, const char *field_name) const final;
+};
+
+class msg_dataDecryptedText final : public msg_Data {
+ public:
+  std::string text_;
+
+  msg_dataDecryptedText();
+
+  explicit msg_dataDecryptedText(std::string const &text_);
+
+  static const std::int32_t ID = -1289133895;
+  std::int32_t get_id() const final {
+    return ID;
+  }
+
+  void store(td::TlStorerToString &s, const char *field_name) const final;
+};
+
+class msg_dataEncryptedText final : public msg_Data {
+ public:
+  std::string text_;
+
+  msg_dataEncryptedText();
+
+  explicit msg_dataEncryptedText(std::string const &text_);
+
+  static const std::int32_t ID = -296612902;
+  std::int32_t get_id() const final {
+    return ID;
+  }
+
+  void store(td::TlStorerToString &s, const char *field_name) const final;
+};
+
+class msg_dataArray final : public Object {
+ public:
+  std::vector<object_ptr<msg_Data>> elements_;
+
+  msg_dataArray();
+
+  explicit msg_dataArray(std::vector<object_ptr<msg_Data>> &&elements_);
+
+  static const std::int32_t ID = 1248461374;
+  std::int32_t get_id() const final {
+    return ID;
+  }
+
+  void store(td::TlStorerToString &s, const char *field_name) const final;
+};
+
+class msg_message final : public Object {
+ public:
+  object_ptr<accountAddress> destination_;
+  std::int64_t amount_;
+  object_ptr<msg_Data> data_;
+
+  msg_message();
+
+  msg_message(object_ptr<accountAddress> &&destination_, std::int64_t amount_, object_ptr<msg_Data> &&data_);
+
+  static const std::int32_t ID = 1349943761;
+  std::int32_t get_id() const final {
+    return ID;
+  }
+
+  void store(td::TlStorerToString &s, const char *field_name) const final;
+};
+
 class options_configInfo final : public Object {
  public:
   std::int64_t default_wallet_id_;
@@ -743,7 +1334,23 @@ class options_configInfo final : public Object {
 
   explicit options_configInfo(std::int64_t default_wallet_id_);
 
-  static const std::int32_t ID = 165216422;
+  static const std::int32_t ID = 451217371;
+  std::int32_t get_id() const final {
+    return ID;
+  }
+
+  void store(td::TlStorerToString &s, const char *field_name) const final;
+};
+
+class options_info final : public Object {
+ public:
+  object_ptr<options_configInfo> config_info_;
+
+  options_info();
+
+  explicit options_info(object_ptr<options_configInfo> &&config_info_);
+
+  static const std::int32_t ID = -64676736;
   std::int32_t get_id() const final {
     return ID;
   }
@@ -754,13 +1361,13 @@ class options_configInfo final : public Object {
 class query_fees final : public Object {
  public:
   object_ptr<fees> source_fees_;
-  object_ptr<fees> destination_fees_;
+  std::vector<object_ptr<fees>> destination_fees_;
 
   query_fees();
 
-  query_fees(object_ptr<fees> &&source_fees_, object_ptr<fees> &&destination_fees_);
+  query_fees(object_ptr<fees> &&source_fees_, std::vector<object_ptr<fees>> &&destination_fees_);
 
-  static const std::int32_t ID = 725267759;
+  static const std::int32_t ID = 1614616510;
   std::int32_t get_id() const final {
     return ID;
   }
@@ -786,37 +1393,21 @@ class query_info final : public Object {
   void store(td::TlStorerToString &s, const char *field_name) const final;
 };
 
-class raw_accountState final : public Object {
+class raw_fullAccountState final : public Object {
  public:
   std::int64_t balance_;
   std::string code_;
   std::string data_;
   object_ptr<internal_transactionId> last_transaction_id_;
+  object_ptr<ton_blockIdExt> block_id_;
   std::string frozen_hash_;
   std::int64_t sync_utime_;
 
-  raw_accountState();
+  raw_fullAccountState();
 
-  raw_accountState(std::int64_t balance_, std::string const &code_, std::string const &data_, object_ptr<internal_transactionId> &&last_transaction_id_, std::string const &frozen_hash_, std::int64_t sync_utime_);
+  raw_fullAccountState(std::int64_t balance_, std::string const &code_, std::string const &data_, object_ptr<internal_transactionId> &&last_transaction_id_, object_ptr<ton_blockIdExt> &&block_id_, std::string const &frozen_hash_, std::int64_t sync_utime_);
 
-  static const std::int32_t ID = 1205935434;
-  std::int32_t get_id() const final {
-    return ID;
-  }
-
-  void store(td::TlStorerToString &s, const char *field_name) const final;
-};
-
-class raw_initialAccountState final : public Object {
- public:
-  std::string code_;
-  std::string data_;
-
-  raw_initialAccountState();
-
-  raw_initialAccountState(std::string const &code_, std::string const &data_);
-
-  static const std::int32_t ID = 777456197;
+  static const std::int32_t ID = -1465398385;
   std::int32_t get_id() const final {
     return ID;
   }
@@ -833,13 +1424,13 @@ class raw_message final : public Object {
   std::int64_t ihr_fee_;
   std::int64_t created_lt_;
   std::string body_hash_;
-  std::string message_;
+  object_ptr<msg_Data> msg_data_;
 
   raw_message();
 
-  raw_message(std::string const &source_, std::string const &destination_, std::int64_t value_, std::int64_t fwd_fee_, std::int64_t ihr_fee_, std::int64_t created_lt_, std::string const &body_hash_, std::string const &message_);
+  raw_message(std::string const &source_, std::string const &destination_, std::int64_t value_, std::int64_t fwd_fee_, std::int64_t ihr_fee_, std::int64_t created_lt_, std::string const &body_hash_, object_ptr<msg_Data> &&msg_data_);
 
-  static const std::int32_t ID = -906281442;
+  static const std::int32_t ID = -32842388;
   std::int32_t get_id() const final {
     return ID;
   }
@@ -957,53 +1548,19 @@ class smc_runResult final : public Object {
   void store(td::TlStorerToString &s, const char *field_name) const final;
 };
 
-class testGiver_accountState final : public Object {
+class ton_blockIdExt final : public Object {
  public:
-  std::int64_t balance_;
+  std::int32_t workchain_;
+  std::int64_t shard_;
   std::int32_t seqno_;
-  object_ptr<internal_transactionId> last_transaction_id_;
-  std::int64_t sync_utime_;
+  std::string root_hash_;
+  std::string file_hash_;
 
-  testGiver_accountState();
+  ton_blockIdExt();
 
-  testGiver_accountState(std::int64_t balance_, std::int32_t seqno_, object_ptr<internal_transactionId> &&last_transaction_id_, std::int64_t sync_utime_);
+  ton_blockIdExt(std::int32_t workchain_, std::int64_t shard_, std::int32_t seqno_, std::string const &root_hash_, std::string const &file_hash_);
 
-  static const std::int32_t ID = 860930426;
-  std::int32_t get_id() const final {
-    return ID;
-  }
-
-  void store(td::TlStorerToString &s, const char *field_name) const final;
-};
-
-class testWallet_accountState final : public Object {
- public:
-  std::int64_t balance_;
-  std::int32_t seqno_;
-  object_ptr<internal_transactionId> last_transaction_id_;
-  std::int64_t sync_utime_;
-
-  testWallet_accountState();
-
-  testWallet_accountState(std::int64_t balance_, std::int32_t seqno_, object_ptr<internal_transactionId> &&last_transaction_id_, std::int64_t sync_utime_);
-
-  static const std::int32_t ID = 305698744;
-  std::int32_t get_id() const final {
-    return ID;
-  }
-
-  void store(td::TlStorerToString &s, const char *field_name) const final;
-};
-
-class testWallet_initialAccountState final : public Object {
- public:
-  std::string public_key_;
-
-  testWallet_initialAccountState();
-
-  explicit testWallet_initialAccountState(std::string const &public_key_);
-
-  static const std::int32_t ID = -1231516227;
+  static const std::int32_t ID = 2031156378;
   std::int32_t get_id() const final {
     return ID;
   }
@@ -1019,7 +1576,23 @@ class tvm_cell final : public Object {
 
   explicit tvm_cell(std::string const &bytes_);
 
-  static const std::int32_t ID = -859530316;
+  static const std::int32_t ID = -413424735;
+  std::int32_t get_id() const final {
+    return ID;
+  }
+
+  void store(td::TlStorerToString &s, const char *field_name) const final;
+};
+
+class tvm_list final : public Object {
+ public:
+  std::vector<object_ptr<tvm_StackEntry>> elements_;
+
+  tvm_list();
+
+  explicit tvm_list(std::vector<object_ptr<tvm_StackEntry>> &&elements_);
+
+  static const std::int32_t ID = 1270320392;
   std::int32_t get_id() const final {
     return ID;
   }
@@ -1051,7 +1624,7 @@ class tvm_slice final : public Object {
 
   explicit tvm_slice(std::string const &bytes_);
 
-  static const std::int32_t ID = -1069968387;
+  static const std::int32_t ID = 537299687;
   std::int32_t get_id() const final {
     return ID;
   }
@@ -1111,6 +1684,38 @@ class tvm_stackEntryNumber final : public tvm_StackEntry {
   void store(td::TlStorerToString &s, const char *field_name) const final;
 };
 
+class tvm_stackEntryTuple final : public tvm_StackEntry {
+ public:
+  object_ptr<tvm_tuple> tuple_;
+
+  tvm_stackEntryTuple();
+
+  explicit tvm_stackEntryTuple(object_ptr<tvm_tuple> &&tuple_);
+
+  static const std::int32_t ID = -157391908;
+  std::int32_t get_id() const final {
+    return ID;
+  }
+
+  void store(td::TlStorerToString &s, const char *field_name) const final;
+};
+
+class tvm_stackEntryList final : public tvm_StackEntry {
+ public:
+  object_ptr<tvm_list> list_;
+
+  tvm_stackEntryList();
+
+  explicit tvm_stackEntryList(object_ptr<tvm_list> &&list_);
+
+  static const std::int32_t ID = -1186714229;
+  std::int32_t get_id() const final {
+    return ID;
+  }
+
+  void store(td::TlStorerToString &s, const char *field_name) const final;
+};
+
 class tvm_stackEntryUnsupported final : public tvm_StackEntry {
  public:
 
@@ -1124,90 +1729,15 @@ class tvm_stackEntryUnsupported final : public tvm_StackEntry {
   void store(td::TlStorerToString &s, const char *field_name) const final;
 };
 
-class uninited_accountState final : public Object {
+class tvm_tuple final : public Object {
  public:
-  std::int64_t balance_;
-  object_ptr<internal_transactionId> last_transaction_id_;
-  std::string frozen_hash_;
-  std::int64_t sync_utime_;
+  std::vector<object_ptr<tvm_StackEntry>> elements_;
 
-  uninited_accountState();
+  tvm_tuple();
 
-  uninited_accountState(std::int64_t balance_, object_ptr<internal_transactionId> &&last_transaction_id_, std::string const &frozen_hash_, std::int64_t sync_utime_);
+  explicit tvm_tuple(std::vector<object_ptr<tvm_StackEntry>> &&elements_);
 
-  static const std::int32_t ID = -918880075;
-  std::int32_t get_id() const final {
-    return ID;
-  }
-
-  void store(td::TlStorerToString &s, const char *field_name) const final;
-};
-
-class wallet_accountState final : public Object {
- public:
-  std::int64_t balance_;
-  std::int32_t seqno_;
-  object_ptr<internal_transactionId> last_transaction_id_;
-  std::int64_t sync_utime_;
-
-  wallet_accountState();
-
-  wallet_accountState(std::int64_t balance_, std::int32_t seqno_, object_ptr<internal_transactionId> &&last_transaction_id_, std::int64_t sync_utime_);
-
-  static const std::int32_t ID = -1919815977;
-  std::int32_t get_id() const final {
-    return ID;
-  }
-
-  void store(td::TlStorerToString &s, const char *field_name) const final;
-};
-
-class wallet_initialAccountState final : public Object {
- public:
-  std::string public_key_;
-
-  wallet_initialAccountState();
-
-  explicit wallet_initialAccountState(std::string const &public_key_);
-
-  static const std::int32_t ID = -1079249978;
-  std::int32_t get_id() const final {
-    return ID;
-  }
-
-  void store(td::TlStorerToString &s, const char *field_name) const final;
-};
-
-class wallet_v3_accountState final : public Object {
- public:
-  std::int64_t balance_;
-  std::int64_t wallet_id_;
-  std::int32_t seqno_;
-  object_ptr<internal_transactionId> last_transaction_id_;
-  std::int64_t sync_utime_;
-
-  wallet_v3_accountState();
-
-  wallet_v3_accountState(std::int64_t balance_, std::int64_t wallet_id_, std::int32_t seqno_, object_ptr<internal_transactionId> &&last_transaction_id_, std::int64_t sync_utime_);
-
-  static const std::int32_t ID = 1977698154;
-  std::int32_t get_id() const final {
-    return ID;
-  }
-
-  void store(td::TlStorerToString &s, const char *field_name) const final;
-};
-
-class wallet_v3_initialAccountState final : public Object {
- public:
-  std::string public_key_;
-  std::int64_t wallet_id_;
-
-  wallet_v3_initialAccountState();
-
-  wallet_v3_initialAccountState(std::string const &public_key_, std::int64_t wallet_id_);
-
-  static const std::int32_t ID = 283460879;
+  static const std::int32_t ID = -1363953053;
   std::int32_t get_id() const final {
     return ID;
   }
@@ -1288,6 +1818,27 @@ class createNewKey final : public Function {
   void store(td::TlStorerToString &s, const char *field_name) const final;
 };
 
+class createQuery final : public Function {
+ public:
+  object_ptr<InputKey> private_key_;
+  object_ptr<accountAddress> address_;
+  std::int32_t timeout_;
+  object_ptr<Action> action_;
+
+  createQuery();
+
+  createQuery(object_ptr<InputKey> &&private_key_, object_ptr<accountAddress> &&address_, std::int32_t timeout_, object_ptr<Action> &&action_);
+
+  static const std::int32_t ID = -1316835098;
+  std::int32_t get_id() const final {
+    return ID;
+  }
+
+  using ReturnType = object_ptr<query_info>;
+
+  void store(td::TlStorerToString &s, const char *field_name) const final;
+};
+
 class decrypt final : public Function {
  public:
   td::SecureString encrypted_data_;
@@ -1340,6 +1891,27 @@ class deleteKey final : public Function {
   void store(td::TlStorerToString &s, const char *field_name) const final;
 };
 
+class dns_resolve final : public Function {
+ public:
+  object_ptr<accountAddress> account_address_;
+  std::string name_;
+  std::int32_t category_;
+  std::int32_t ttl_;
+
+  dns_resolve();
+
+  dns_resolve(object_ptr<accountAddress> &&account_address_, std::string const &name_, std::int32_t category_, std::int32_t ttl_);
+
+  static const std::int32_t ID = -149238065;
+  std::int32_t get_id() const final {
+    return ID;
+  }
+
+  using ReturnType = object_ptr<dns_resolved>;
+
+  void store(td::TlStorerToString &s, const char *field_name) const final;
+};
+
 class encrypt final : public Function {
  public:
   td::SecureString decrypted_data_;
@@ -1415,68 +1987,57 @@ class exportPemKey final : public Function {
   void store(td::TlStorerToString &s, const char *field_name) const final;
 };
 
-class generic_createSendGramsQuery final : public Function {
+class exportUnencryptedKey final : public Function {
  public:
-  object_ptr<InputKey> private_key_;
-  object_ptr<accountAddress> source_;
-  object_ptr<accountAddress> destination_;
-  std::int64_t amount_;
-  std::int32_t timeout_;
-  bool allow_send_to_uninited_;
-  std::string message_;
+  object_ptr<InputKey> input_key_;
 
-  generic_createSendGramsQuery();
+  exportUnencryptedKey();
 
-  generic_createSendGramsQuery(object_ptr<InputKey> &&private_key_, object_ptr<accountAddress> &&source_, object_ptr<accountAddress> &&destination_, std::int64_t amount_, std::int32_t timeout_, bool allow_send_to_uninited_, std::string const &message_);
+  explicit exportUnencryptedKey(object_ptr<InputKey> &&input_key_);
 
-  static const std::int32_t ID = 208206338;
+  static const std::int32_t ID = -634665152;
   std::int32_t get_id() const final {
     return ID;
   }
 
-  using ReturnType = object_ptr<query_info>;
+  using ReturnType = object_ptr<exportedUnencryptedKey>;
 
   void store(td::TlStorerToString &s, const char *field_name) const final;
 };
 
-class generic_getAccountState final : public Function {
+class getAccountAddress final : public Function {
+ public:
+  object_ptr<InitialAccountState> initial_account_state_;
+  std::int32_t revision_;
+
+  getAccountAddress();
+
+  getAccountAddress(object_ptr<InitialAccountState> &&initial_account_state_, std::int32_t revision_);
+
+  static const std::int32_t ID = -1159101819;
+  std::int32_t get_id() const final {
+    return ID;
+  }
+
+  using ReturnType = object_ptr<accountAddress>;
+
+  void store(td::TlStorerToString &s, const char *field_name) const final;
+};
+
+class getAccountState final : public Function {
  public:
   object_ptr<accountAddress> account_address_;
 
-  generic_getAccountState();
+  getAccountState();
 
-  explicit generic_getAccountState(object_ptr<accountAddress> &&account_address_);
+  explicit getAccountState(object_ptr<accountAddress> &&account_address_);
 
-  static const std::int32_t ID = -657000446;
+  static const std::int32_t ID = -2116357050;
   std::int32_t get_id() const final {
     return ID;
   }
 
-  using ReturnType = object_ptr<generic_AccountState>;
-
-  void store(td::TlStorerToString &s, const char *field_name) const final;
-};
-
-class generic_sendGrams final : public Function {
- public:
-  object_ptr<InputKey> private_key_;
-  object_ptr<accountAddress> source_;
-  object_ptr<accountAddress> destination_;
-  std::int64_t amount_;
-  std::int32_t timeout_;
-  bool allow_send_to_uninited_;
-  std::string message_;
-
-  generic_sendGrams();
-
-  generic_sendGrams(object_ptr<InputKey> &&private_key_, object_ptr<accountAddress> &&source_, object_ptr<accountAddress> &&destination_, std::int64_t amount_, std::int32_t timeout_, bool allow_send_to_uninited_, std::string const &message_);
-
-  static const std::int32_t ID = -553513162;
-  std::int32_t get_id() const final {
-    return ID;
-  }
-
-  using ReturnType = object_ptr<sendGramsResult>;
+  using ReturnType = object_ptr<fullAccountState>;
 
   void store(td::TlStorerToString &s, const char *field_name) const final;
 };
@@ -1562,6 +2123,24 @@ class getLogVerbosityLevel final : public Function {
   void store(td::TlStorerToString &s, const char *field_name) const final;
 };
 
+class guessAccountRevision final : public Function {
+ public:
+  object_ptr<InitialAccountState> initial_account_state_;
+
+  guessAccountRevision();
+
+  explicit guessAccountRevision(object_ptr<InitialAccountState> &&initial_account_state_);
+
+  static const std::int32_t ID = 1463344293;
+  std::int32_t get_id() const final {
+    return ID;
+  }
+
+  using ReturnType = object_ptr<accountRevisionList>;
+
+  void store(td::TlStorerToString &s, const char *field_name) const final;
+};
+
 class importEncryptedKey final : public Function {
  public:
   td::SecureString local_password_;
@@ -1622,6 +2201,25 @@ class importPemKey final : public Function {
   void store(td::TlStorerToString &s, const char *field_name) const final;
 };
 
+class importUnencryptedKey final : public Function {
+ public:
+  td::SecureString local_password_;
+  object_ptr<exportedUnencryptedKey> exported_unencrypted_key_;
+
+  importUnencryptedKey();
+
+  importUnencryptedKey(td::SecureString &&local_password_, object_ptr<exportedUnencryptedKey> &&exported_unencrypted_key_);
+
+  static const std::int32_t ID = -1184671467;
+  std::int32_t get_id() const final {
+    return ID;
+  }
+
+  using ReturnType = object_ptr<key>;
+
+  void store(td::TlStorerToString &s, const char *field_name) const final;
+};
+
 class init final : public Function {
  public:
   object_ptr<options> options_;
@@ -1630,12 +2228,12 @@ class init final : public Function {
 
   explicit init(object_ptr<options> &&options_);
 
-  static const std::int32_t ID = -2014661877;
+  static const std::int32_t ID = -1000594762;
   std::int32_t get_id() const final {
     return ID;
   }
 
-  using ReturnType = object_ptr<ok>;
+  using ReturnType = object_ptr<options_info>;
 
   void store(td::TlStorerToString &s, const char *field_name) const final;
 };
@@ -1675,6 +2273,25 @@ class liteServer_getInfo final : public Function {
   void store(td::TlStorerToString &s, const char *field_name) const final;
 };
 
+class msg_decrypt final : public Function {
+ public:
+  object_ptr<InputKey> input_key_;
+  object_ptr<msg_dataArray> data_;
+
+  msg_decrypt();
+
+  msg_decrypt(object_ptr<InputKey> &&input_key_, object_ptr<msg_dataArray> &&data_);
+
+  static const std::int32_t ID = 1131086633;
+  std::int32_t get_id() const final {
+    return ID;
+  }
+
+  using ReturnType = object_ptr<msg_dataArray>;
+
+  void store(td::TlStorerToString &s, const char *field_name) const final;
+};
+
 class onLiteServerQueryError final : public Function {
  public:
   std::int64_t id_;
@@ -1721,12 +2338,12 @@ class options_setConfig final : public Function {
 
   explicit options_setConfig(object_ptr<config> &&config_);
 
-  static const std::int32_t ID = 646497241;
+  static const std::int32_t ID = 1870064579;
   std::int32_t get_id() const final {
     return ID;
   }
 
-  using ReturnType = object_ptr<ok>;
+  using ReturnType = object_ptr<options_configInfo>;
 
   void store(td::TlStorerToString &s, const char *field_name) const final;
 };
@@ -1881,24 +2498,6 @@ class raw_createQuery final : public Function {
   void store(td::TlStorerToString &s, const char *field_name) const final;
 };
 
-class raw_getAccountAddress final : public Function {
- public:
-  object_ptr<raw_initialAccountState> initital_account_state_;
-
-  raw_getAccountAddress();
-
-  explicit raw_getAccountAddress(object_ptr<raw_initialAccountState> &&initital_account_state_);
-
-  static const std::int32_t ID = -521283849;
-  std::int32_t get_id() const final {
-    return ID;
-  }
-
-  using ReturnType = object_ptr<accountAddress>;
-
-  void store(td::TlStorerToString &s, const char *field_name) const final;
-};
-
 class raw_getAccountState final : public Function {
  public:
   object_ptr<accountAddress> account_address_;
@@ -1907,26 +2506,27 @@ class raw_getAccountState final : public Function {
 
   explicit raw_getAccountState(object_ptr<accountAddress> &&account_address_);
 
-  static const std::int32_t ID = 663706721;
+  static const std::int32_t ID = -1327847118;
   std::int32_t get_id() const final {
     return ID;
   }
 
-  using ReturnType = object_ptr<raw_accountState>;
+  using ReturnType = object_ptr<raw_fullAccountState>;
 
   void store(td::TlStorerToString &s, const char *field_name) const final;
 };
 
 class raw_getTransactions final : public Function {
  public:
+  object_ptr<InputKey> private_key_;
   object_ptr<accountAddress> account_address_;
   object_ptr<internal_transactionId> from_transaction_id_;
 
   raw_getTransactions();
 
-  raw_getTransactions(object_ptr<accountAddress> &&account_address_, object_ptr<internal_transactionId> &&from_transaction_id_);
+  raw_getTransactions(object_ptr<InputKey> &&private_key_, object_ptr<accountAddress> &&account_address_, object_ptr<internal_transactionId> &&from_transaction_id_);
 
-  static const std::int32_t ID = 935377269;
+  static const std::int32_t ID = 1029612317;
   std::int32_t get_id() const final {
     return ID;
   }
@@ -2124,139 +2724,12 @@ class sync final : public Function {
 
   sync();
 
-  static const std::int32_t ID = -1617065525;
+  static const std::int32_t ID = -1875977070;
   std::int32_t get_id() const final {
     return ID;
   }
 
-  using ReturnType = object_ptr<ok>;
-
-  void store(td::TlStorerToString &s, const char *field_name) const final;
-};
-
-class testGiver_getAccountAddress final : public Function {
- public:
-
-  testGiver_getAccountAddress();
-
-  static const std::int32_t ID = -540100768;
-  std::int32_t get_id() const final {
-    return ID;
-  }
-
-  using ReturnType = object_ptr<accountAddress>;
-
-  void store(td::TlStorerToString &s, const char *field_name) const final;
-};
-
-class testGiver_getAccountState final : public Function {
- public:
-
-  testGiver_getAccountState();
-
-  static const std::int32_t ID = 267738275;
-  std::int32_t get_id() const final {
-    return ID;
-  }
-
-  using ReturnType = object_ptr<testGiver_accountState>;
-
-  void store(td::TlStorerToString &s, const char *field_name) const final;
-};
-
-class testGiver_sendGrams final : public Function {
- public:
-  object_ptr<accountAddress> destination_;
-  std::int32_t seqno_;
-  std::int64_t amount_;
-  std::string message_;
-
-  testGiver_sendGrams();
-
-  testGiver_sendGrams(object_ptr<accountAddress> &&destination_, std::int32_t seqno_, std::int64_t amount_, std::string const &message_);
-
-  static const std::int32_t ID = -1785750375;
-  std::int32_t get_id() const final {
-    return ID;
-  }
-
-  using ReturnType = object_ptr<sendGramsResult>;
-
-  void store(td::TlStorerToString &s, const char *field_name) const final;
-};
-
-class testWallet_getAccountAddress final : public Function {
- public:
-  object_ptr<testWallet_initialAccountState> initital_account_state_;
-
-  testWallet_getAccountAddress();
-
-  explicit testWallet_getAccountAddress(object_ptr<testWallet_initialAccountState> &&initital_account_state_);
-
-  static const std::int32_t ID = -1557748223;
-  std::int32_t get_id() const final {
-    return ID;
-  }
-
-  using ReturnType = object_ptr<accountAddress>;
-
-  void store(td::TlStorerToString &s, const char *field_name) const final;
-};
-
-class testWallet_getAccountState final : public Function {
- public:
-  object_ptr<accountAddress> account_address_;
-
-  testWallet_getAccountState();
-
-  explicit testWallet_getAccountState(object_ptr<accountAddress> &&account_address_);
-
-  static const std::int32_t ID = 654082364;
-  std::int32_t get_id() const final {
-    return ID;
-  }
-
-  using ReturnType = object_ptr<testWallet_accountState>;
-
-  void store(td::TlStorerToString &s, const char *field_name) const final;
-};
-
-class testWallet_init final : public Function {
- public:
-  object_ptr<InputKey> private_key_;
-
-  testWallet_init();
-
-  explicit testWallet_init(object_ptr<InputKey> &&private_key_);
-
-  static const std::int32_t ID = -1417409140;
-  std::int32_t get_id() const final {
-    return ID;
-  }
-
-  using ReturnType = object_ptr<ok>;
-
-  void store(td::TlStorerToString &s, const char *field_name) const final;
-};
-
-class testWallet_sendGrams final : public Function {
- public:
-  object_ptr<InputKey> private_key_;
-  object_ptr<accountAddress> destination_;
-  std::int32_t seqno_;
-  std::int64_t amount_;
-  std::string message_;
-
-  testWallet_sendGrams();
-
-  testWallet_sendGrams(object_ptr<InputKey> &&private_key_, object_ptr<accountAddress> &&destination_, std::int32_t seqno_, std::int64_t amount_, std::string const &message_);
-
-  static const std::int32_t ID = 573748322;
-  std::int32_t get_id() const final {
-    return ID;
-  }
-
-  using ReturnType = object_ptr<sendGramsResult>;
+  using ReturnType = object_ptr<ton_blockIdExt>;
 
   void store(td::TlStorerToString &s, const char *field_name) const final;
 };
@@ -2279,97 +2752,21 @@ class unpackAccountAddress final : public Function {
   void store(td::TlStorerToString &s, const char *field_name) const final;
 };
 
-class wallet_getAccountAddress final : public Function {
+class withBlock final : public Function {
  public:
-  object_ptr<wallet_initialAccountState> initital_account_state_;
+  object_ptr<ton_blockIdExt> id_;
+  object_ptr<Function> function_;
 
-  wallet_getAccountAddress();
+  withBlock();
 
-  explicit wallet_getAccountAddress(object_ptr<wallet_initialAccountState> &&initital_account_state_);
+  withBlock(object_ptr<ton_blockIdExt> &&id_, object_ptr<Function> &&function_);
 
-  static const std::int32_t ID = -1004103180;
+  static const std::int32_t ID = -789093723;
   std::int32_t get_id() const final {
     return ID;
   }
 
-  using ReturnType = object_ptr<accountAddress>;
-
-  void store(td::TlStorerToString &s, const char *field_name) const final;
-};
-
-class wallet_getAccountState final : public Function {
- public:
-  object_ptr<accountAddress> account_address_;
-
-  wallet_getAccountState();
-
-  explicit wallet_getAccountState(object_ptr<accountAddress> &&account_address_);
-
-  static const std::int32_t ID = 462294850;
-  std::int32_t get_id() const final {
-    return ID;
-  }
-
-  using ReturnType = object_ptr<wallet_accountState>;
-
-  void store(td::TlStorerToString &s, const char *field_name) const final;
-};
-
-class wallet_init final : public Function {
- public:
-  object_ptr<InputKey> private_key_;
-
-  wallet_init();
-
-  explicit wallet_init(object_ptr<InputKey> &&private_key_);
-
-  static const std::int32_t ID = -395706309;
-  std::int32_t get_id() const final {
-    return ID;
-  }
-
-  using ReturnType = object_ptr<ok>;
-
-  void store(td::TlStorerToString &s, const char *field_name) const final;
-};
-
-class wallet_sendGrams final : public Function {
- public:
-  object_ptr<InputKey> private_key_;
-  object_ptr<accountAddress> destination_;
-  std::int32_t seqno_;
-  std::int64_t valid_until_;
-  std::int64_t amount_;
-  std::string message_;
-
-  wallet_sendGrams();
-
-  wallet_sendGrams(object_ptr<InputKey> &&private_key_, object_ptr<accountAddress> &&destination_, std::int32_t seqno_, std::int64_t valid_until_, std::int64_t amount_, std::string const &message_);
-
-  static const std::int32_t ID = 297317621;
-  std::int32_t get_id() const final {
-    return ID;
-  }
-
-  using ReturnType = object_ptr<sendGramsResult>;
-
-  void store(td::TlStorerToString &s, const char *field_name) const final;
-};
-
-class wallet_v3_getAccountAddress final : public Function {
- public:
-  object_ptr<wallet_v3_initialAccountState> initital_account_state_;
-
-  wallet_v3_getAccountAddress();
-
-  explicit wallet_v3_getAccountAddress(object_ptr<wallet_v3_initialAccountState> &&initital_account_state_);
-
-  static const std::int32_t ID = 1011655671;
-  std::int32_t get_id() const final {
-    return ID;
-  }
-
-  using ReturnType = object_ptr<accountAddress>;
+  using ReturnType = object_ptr<Object>;
 
   void store(td::TlStorerToString &s, const char *field_name) const final;
 };
diff --git a/submodules/ton/tonlib-src/tl/generate/auto/tl/tonlib_api.hpp b/submodules/ton/tonlib-src/tl/generate/auto/tl/tonlib_api.hpp
index f82b020a0d..ad2ac76a43 100644
--- a/submodules/ton/tonlib-src/tl/generate/auto/tl/tonlib_api.hpp
+++ b/submodules/ton/tonlib-src/tl/generate/auto/tl/tonlib_api.hpp
@@ -17,6 +17,48 @@ bool downcast_call(Object &obj, const T &func) {
     case accountAddress::ID:
       func(static_cast<accountAddress &>(obj));
       return true;
+    case accountRevisionList::ID:
+      func(static_cast<accountRevisionList &>(obj));
+      return true;
+    case raw_accountState::ID:
+      func(static_cast<raw_accountState &>(obj));
+      return true;
+    case testWallet_accountState::ID:
+      func(static_cast<testWallet_accountState &>(obj));
+      return true;
+    case wallet_accountState::ID:
+      func(static_cast<wallet_accountState &>(obj));
+      return true;
+    case wallet_v3_accountState::ID:
+      func(static_cast<wallet_v3_accountState &>(obj));
+      return true;
+    case wallet_highload_v1_accountState::ID:
+      func(static_cast<wallet_highload_v1_accountState &>(obj));
+      return true;
+    case wallet_highload_v2_accountState::ID:
+      func(static_cast<wallet_highload_v2_accountState &>(obj));
+      return true;
+    case testGiver_accountState::ID:
+      func(static_cast<testGiver_accountState &>(obj));
+      return true;
+    case dns_accountState::ID:
+      func(static_cast<dns_accountState &>(obj));
+      return true;
+    case uninited_accountState::ID:
+      func(static_cast<uninited_accountState &>(obj));
+      return true;
+    case actionNoop::ID:
+      func(static_cast<actionNoop &>(obj));
+      return true;
+    case actionMsg::ID:
+      func(static_cast<actionMsg &>(obj));
+      return true;
+    case actionDns::ID:
+      func(static_cast<actionDns &>(obj));
+      return true;
+    case adnlAddress::ID:
+      func(static_cast<adnlAddress &>(obj));
+      return true;
     case bip39Hints::ID:
       func(static_cast<bip39Hints &>(obj));
       return true;
@@ -38,9 +80,39 @@ bool downcast_call(Object &obj, const T &func) {
     case exportedPemKey::ID:
       func(static_cast<exportedPemKey &>(obj));
       return true;
+    case exportedUnencryptedKey::ID:
+      func(static_cast<exportedUnencryptedKey &>(obj));
+      return true;
     case fees::ID:
       func(static_cast<fees &>(obj));
       return true;
+    case fullAccountState::ID:
+      func(static_cast<fullAccountState &>(obj));
+      return true;
+    case raw_initialAccountState::ID:
+      func(static_cast<raw_initialAccountState &>(obj));
+      return true;
+    case testGiver_initialAccountState::ID:
+      func(static_cast<testGiver_initialAccountState &>(obj));
+      return true;
+    case testWallet_initialAccountState::ID:
+      func(static_cast<testWallet_initialAccountState &>(obj));
+      return true;
+    case wallet_initialAccountState::ID:
+      func(static_cast<wallet_initialAccountState &>(obj));
+      return true;
+    case wallet_v3_initialAccountState::ID:
+      func(static_cast<wallet_v3_initialAccountState &>(obj));
+      return true;
+    case wallet_highload_v1_initialAccountState::ID:
+      func(static_cast<wallet_highload_v1_initialAccountState &>(obj));
+      return true;
+    case wallet_highload_v2_initialAccountState::ID:
+      func(static_cast<wallet_highload_v2_initialAccountState &>(obj));
+      return true;
+    case dns_initialAccountState::ID:
+      func(static_cast<dns_initialAccountState &>(obj));
+      return true;
     case inputKeyRegular::ID:
       func(static_cast<inputKeyRegular &>(obj));
       return true;
@@ -77,9 +149,6 @@ bool downcast_call(Object &obj, const T &func) {
     case options::ID:
       func(static_cast<options &>(obj));
       return true;
-    case sendGramsResult::ID:
-      func(static_cast<sendGramsResult &>(obj));
-      return true;
     case syncStateDone::ID:
       func(static_cast<syncStateDone &>(obj));
       return true;
@@ -95,23 +164,38 @@ bool downcast_call(Object &obj, const T &func) {
     case updateSyncState::ID:
       func(static_cast<updateSyncState &>(obj));
       return true;
-    case generic_accountStateRaw::ID:
-      func(static_cast<generic_accountStateRaw &>(obj));
+    case dns_actionDeleteAll::ID:
+      func(static_cast<dns_actionDeleteAll &>(obj));
       return true;
-    case generic_accountStateTestWallet::ID:
-      func(static_cast<generic_accountStateTestWallet &>(obj));
+    case dns_actionDelete::ID:
+      func(static_cast<dns_actionDelete &>(obj));
       return true;
-    case generic_accountStateWallet::ID:
-      func(static_cast<generic_accountStateWallet &>(obj));
+    case dns_actionSet::ID:
+      func(static_cast<dns_actionSet &>(obj));
       return true;
-    case generic_accountStateWalletV3::ID:
-      func(static_cast<generic_accountStateWalletV3 &>(obj));
+    case dns_entry::ID:
+      func(static_cast<dns_entry &>(obj));
       return true;
-    case generic_accountStateTestGiver::ID:
-      func(static_cast<generic_accountStateTestGiver &>(obj));
+    case dns_entryDataUnknown::ID:
+      func(static_cast<dns_entryDataUnknown &>(obj));
       return true;
-    case generic_accountStateUninited::ID:
-      func(static_cast<generic_accountStateUninited &>(obj));
+    case dns_entryDataText::ID:
+      func(static_cast<dns_entryDataText &>(obj));
+      return true;
+    case dns_entryDataNextResolver::ID:
+      func(static_cast<dns_entryDataNextResolver &>(obj));
+      return true;
+    case dns_entryDataSmcAddress::ID:
+      func(static_cast<dns_entryDataSmcAddress &>(obj));
+      return true;
+    case dns_entryDataAdnlAddress::ID:
+      func(static_cast<dns_entryDataAdnlAddress &>(obj));
+      return true;
+    case dns_resolved::ID:
+      func(static_cast<dns_resolved &>(obj));
+      return true;
+    case ton_blockId::ID:
+      func(static_cast<ton_blockId &>(obj));
       return true;
     case internal_transactionId::ID:
       func(static_cast<internal_transactionId &>(obj));
@@ -119,20 +203,38 @@ bool downcast_call(Object &obj, const T &func) {
     case liteServer_info::ID:
       func(static_cast<liteServer_info &>(obj));
       return true;
+    case msg_dataRaw::ID:
+      func(static_cast<msg_dataRaw &>(obj));
+      return true;
+    case msg_dataText::ID:
+      func(static_cast<msg_dataText &>(obj));
+      return true;
+    case msg_dataDecryptedText::ID:
+      func(static_cast<msg_dataDecryptedText &>(obj));
+      return true;
+    case msg_dataEncryptedText::ID:
+      func(static_cast<msg_dataEncryptedText &>(obj));
+      return true;
+    case msg_dataArray::ID:
+      func(static_cast<msg_dataArray &>(obj));
+      return true;
+    case msg_message::ID:
+      func(static_cast<msg_message &>(obj));
+      return true;
     case options_configInfo::ID:
       func(static_cast<options_configInfo &>(obj));
       return true;
+    case options_info::ID:
+      func(static_cast<options_info &>(obj));
+      return true;
     case query_fees::ID:
       func(static_cast<query_fees &>(obj));
       return true;
     case query_info::ID:
       func(static_cast<query_info &>(obj));
       return true;
-    case raw_accountState::ID:
-      func(static_cast<raw_accountState &>(obj));
-      return true;
-    case raw_initialAccountState::ID:
-      func(static_cast<raw_initialAccountState &>(obj));
+    case raw_fullAccountState::ID:
+      func(static_cast<raw_fullAccountState &>(obj));
       return true;
     case raw_message::ID:
       func(static_cast<raw_message &>(obj));
@@ -155,18 +257,15 @@ bool downcast_call(Object &obj, const T &func) {
     case smc_runResult::ID:
       func(static_cast<smc_runResult &>(obj));
       return true;
-    case testGiver_accountState::ID:
-      func(static_cast<testGiver_accountState &>(obj));
-      return true;
-    case testWallet_accountState::ID:
-      func(static_cast<testWallet_accountState &>(obj));
-      return true;
-    case testWallet_initialAccountState::ID:
-      func(static_cast<testWallet_initialAccountState &>(obj));
+    case ton_blockIdExt::ID:
+      func(static_cast<ton_blockIdExt &>(obj));
       return true;
     case tvm_cell::ID:
       func(static_cast<tvm_cell &>(obj));
       return true;
+    case tvm_list::ID:
+      func(static_cast<tvm_list &>(obj));
+      return true;
     case tvm_numberDecimal::ID:
       func(static_cast<tvm_numberDecimal &>(obj));
       return true;
@@ -182,23 +281,17 @@ bool downcast_call(Object &obj, const T &func) {
     case tvm_stackEntryNumber::ID:
       func(static_cast<tvm_stackEntryNumber &>(obj));
       return true;
+    case tvm_stackEntryTuple::ID:
+      func(static_cast<tvm_stackEntryTuple &>(obj));
+      return true;
+    case tvm_stackEntryList::ID:
+      func(static_cast<tvm_stackEntryList &>(obj));
+      return true;
     case tvm_stackEntryUnsupported::ID:
       func(static_cast<tvm_stackEntryUnsupported &>(obj));
       return true;
-    case uninited_accountState::ID:
-      func(static_cast<uninited_accountState &>(obj));
-      return true;
-    case wallet_accountState::ID:
-      func(static_cast<wallet_accountState &>(obj));
-      return true;
-    case wallet_initialAccountState::ID:
-      func(static_cast<wallet_initialAccountState &>(obj));
-      return true;
-    case wallet_v3_accountState::ID:
-      func(static_cast<wallet_v3_accountState &>(obj));
-      return true;
-    case wallet_v3_initialAccountState::ID:
-      func(static_cast<wallet_v3_initialAccountState &>(obj));
+    case tvm_tuple::ID:
+      func(static_cast<tvm_tuple &>(obj));
       return true;
     default:
       return false;
@@ -226,6 +319,9 @@ bool downcast_call(Function &obj, const T &func) {
     case createNewKey::ID:
       func(static_cast<createNewKey &>(obj));
       return true;
+    case createQuery::ID:
+      func(static_cast<createQuery &>(obj));
+      return true;
     case decrypt::ID:
       func(static_cast<decrypt &>(obj));
       return true;
@@ -235,6 +331,9 @@ bool downcast_call(Function &obj, const T &func) {
     case deleteKey::ID:
       func(static_cast<deleteKey &>(obj));
       return true;
+    case dns_resolve::ID:
+      func(static_cast<dns_resolve &>(obj));
+      return true;
     case encrypt::ID:
       func(static_cast<encrypt &>(obj));
       return true;
@@ -247,14 +346,14 @@ bool downcast_call(Function &obj, const T &func) {
     case exportPemKey::ID:
       func(static_cast<exportPemKey &>(obj));
       return true;
-    case generic_createSendGramsQuery::ID:
-      func(static_cast<generic_createSendGramsQuery &>(obj));
+    case exportUnencryptedKey::ID:
+      func(static_cast<exportUnencryptedKey &>(obj));
       return true;
-    case generic_getAccountState::ID:
-      func(static_cast<generic_getAccountState &>(obj));
+    case getAccountAddress::ID:
+      func(static_cast<getAccountAddress &>(obj));
       return true;
-    case generic_sendGrams::ID:
-      func(static_cast<generic_sendGrams &>(obj));
+    case getAccountState::ID:
+      func(static_cast<getAccountState &>(obj));
       return true;
     case getBip39Hints::ID:
       func(static_cast<getBip39Hints &>(obj));
@@ -271,6 +370,9 @@ bool downcast_call(Function &obj, const T &func) {
     case getLogVerbosityLevel::ID:
       func(static_cast<getLogVerbosityLevel &>(obj));
       return true;
+    case guessAccountRevision::ID:
+      func(static_cast<guessAccountRevision &>(obj));
+      return true;
     case importEncryptedKey::ID:
       func(static_cast<importEncryptedKey &>(obj));
       return true;
@@ -280,6 +382,9 @@ bool downcast_call(Function &obj, const T &func) {
     case importPemKey::ID:
       func(static_cast<importPemKey &>(obj));
       return true;
+    case importUnencryptedKey::ID:
+      func(static_cast<importUnencryptedKey &>(obj));
+      return true;
     case init::ID:
       func(static_cast<init &>(obj));
       return true;
@@ -289,6 +394,9 @@ bool downcast_call(Function &obj, const T &func) {
     case liteServer_getInfo::ID:
       func(static_cast<liteServer_getInfo &>(obj));
       return true;
+    case msg_decrypt::ID:
+      func(static_cast<msg_decrypt &>(obj));
+      return true;
     case onLiteServerQueryError::ID:
       func(static_cast<onLiteServerQueryError &>(obj));
       return true;
@@ -322,9 +430,6 @@ bool downcast_call(Function &obj, const T &func) {
     case raw_createQuery::ID:
       func(static_cast<raw_createQuery &>(obj));
       return true;
-    case raw_getAccountAddress::ID:
-      func(static_cast<raw_getAccountAddress &>(obj));
-      return true;
     case raw_getAccountState::ID:
       func(static_cast<raw_getAccountState &>(obj));
       return true;
@@ -364,44 +469,113 @@ bool downcast_call(Function &obj, const T &func) {
     case sync::ID:
       func(static_cast<sync &>(obj));
       return true;
-    case testGiver_getAccountAddress::ID:
-      func(static_cast<testGiver_getAccountAddress &>(obj));
-      return true;
-    case testGiver_getAccountState::ID:
-      func(static_cast<testGiver_getAccountState &>(obj));
-      return true;
-    case testGiver_sendGrams::ID:
-      func(static_cast<testGiver_sendGrams &>(obj));
-      return true;
-    case testWallet_getAccountAddress::ID:
-      func(static_cast<testWallet_getAccountAddress &>(obj));
-      return true;
-    case testWallet_getAccountState::ID:
-      func(static_cast<testWallet_getAccountState &>(obj));
-      return true;
-    case testWallet_init::ID:
-      func(static_cast<testWallet_init &>(obj));
-      return true;
-    case testWallet_sendGrams::ID:
-      func(static_cast<testWallet_sendGrams &>(obj));
-      return true;
     case unpackAccountAddress::ID:
       func(static_cast<unpackAccountAddress &>(obj));
       return true;
-    case wallet_getAccountAddress::ID:
-      func(static_cast<wallet_getAccountAddress &>(obj));
+    case withBlock::ID:
+      func(static_cast<withBlock &>(obj));
       return true;
-    case wallet_getAccountState::ID:
-      func(static_cast<wallet_getAccountState &>(obj));
+    default:
+      return false;
+  }
+}
+
+/**
+ * Calls specified function object with the specified object downcasted to the most-derived type.
+ * \param[in] obj Object to pass as an argument to the function object.
+ * \param[in] func Function object to which the object will be passed.
+ * \returns whether function object call has happened. Should always return true for correct parameters.
+ */
+template <class T>
+bool downcast_call(AccountState &obj, const T &func) {
+  switch (obj.get_id()) {
+    case raw_accountState::ID:
+      func(static_cast<raw_accountState &>(obj));
       return true;
-    case wallet_init::ID:
-      func(static_cast<wallet_init &>(obj));
+    case testWallet_accountState::ID:
+      func(static_cast<testWallet_accountState &>(obj));
       return true;
-    case wallet_sendGrams::ID:
-      func(static_cast<wallet_sendGrams &>(obj));
+    case wallet_accountState::ID:
+      func(static_cast<wallet_accountState &>(obj));
       return true;
-    case wallet_v3_getAccountAddress::ID:
-      func(static_cast<wallet_v3_getAccountAddress &>(obj));
+    case wallet_v3_accountState::ID:
+      func(static_cast<wallet_v3_accountState &>(obj));
+      return true;
+    case wallet_highload_v1_accountState::ID:
+      func(static_cast<wallet_highload_v1_accountState &>(obj));
+      return true;
+    case wallet_highload_v2_accountState::ID:
+      func(static_cast<wallet_highload_v2_accountState &>(obj));
+      return true;
+    case testGiver_accountState::ID:
+      func(static_cast<testGiver_accountState &>(obj));
+      return true;
+    case dns_accountState::ID:
+      func(static_cast<dns_accountState &>(obj));
+      return true;
+    case uninited_accountState::ID:
+      func(static_cast<uninited_accountState &>(obj));
+      return true;
+    default:
+      return false;
+  }
+}
+
+/**
+ * Calls specified function object with the specified object downcasted to the most-derived type.
+ * \param[in] obj Object to pass as an argument to the function object.
+ * \param[in] func Function object to which the object will be passed.
+ * \returns whether function object call has happened. Should always return true for correct parameters.
+ */
+template <class T>
+bool downcast_call(Action &obj, const T &func) {
+  switch (obj.get_id()) {
+    case actionNoop::ID:
+      func(static_cast<actionNoop &>(obj));
+      return true;
+    case actionMsg::ID:
+      func(static_cast<actionMsg &>(obj));
+      return true;
+    case actionDns::ID:
+      func(static_cast<actionDns &>(obj));
+      return true;
+    default:
+      return false;
+  }
+}
+
+/**
+ * Calls specified function object with the specified object downcasted to the most-derived type.
+ * \param[in] obj Object to pass as an argument to the function object.
+ * \param[in] func Function object to which the object will be passed.
+ * \returns whether function object call has happened. Should always return true for correct parameters.
+ */
+template <class T>
+bool downcast_call(InitialAccountState &obj, const T &func) {
+  switch (obj.get_id()) {
+    case raw_initialAccountState::ID:
+      func(static_cast<raw_initialAccountState &>(obj));
+      return true;
+    case testGiver_initialAccountState::ID:
+      func(static_cast<testGiver_initialAccountState &>(obj));
+      return true;
+    case testWallet_initialAccountState::ID:
+      func(static_cast<testWallet_initialAccountState &>(obj));
+      return true;
+    case wallet_initialAccountState::ID:
+      func(static_cast<wallet_initialAccountState &>(obj));
+      return true;
+    case wallet_v3_initialAccountState::ID:
+      func(static_cast<wallet_v3_initialAccountState &>(obj));
+      return true;
+    case wallet_highload_v1_initialAccountState::ID:
+      func(static_cast<wallet_highload_v1_initialAccountState &>(obj));
+      return true;
+    case wallet_highload_v2_initialAccountState::ID:
+      func(static_cast<wallet_highload_v2_initialAccountState &>(obj));
+      return true;
+    case dns_initialAccountState::ID:
+      func(static_cast<dns_initialAccountState &>(obj));
       return true;
     default:
       return false;
@@ -518,25 +692,71 @@ bool downcast_call(Update &obj, const T &func) {
  * \returns whether function object call has happened. Should always return true for correct parameters.
  */
 template <class T>
-bool downcast_call(generic_AccountState &obj, const T &func) {
+bool downcast_call(dns_Action &obj, const T &func) {
   switch (obj.get_id()) {
-    case generic_accountStateRaw::ID:
-      func(static_cast<generic_accountStateRaw &>(obj));
+    case dns_actionDeleteAll::ID:
+      func(static_cast<dns_actionDeleteAll &>(obj));
       return true;
-    case generic_accountStateTestWallet::ID:
-      func(static_cast<generic_accountStateTestWallet &>(obj));
+    case dns_actionDelete::ID:
+      func(static_cast<dns_actionDelete &>(obj));
       return true;
-    case generic_accountStateWallet::ID:
-      func(static_cast<generic_accountStateWallet &>(obj));
+    case dns_actionSet::ID:
+      func(static_cast<dns_actionSet &>(obj));
       return true;
-    case generic_accountStateWalletV3::ID:
-      func(static_cast<generic_accountStateWalletV3 &>(obj));
+    default:
+      return false;
+  }
+}
+
+/**
+ * Calls specified function object with the specified object downcasted to the most-derived type.
+ * \param[in] obj Object to pass as an argument to the function object.
+ * \param[in] func Function object to which the object will be passed.
+ * \returns whether function object call has happened. Should always return true for correct parameters.
+ */
+template <class T>
+bool downcast_call(dns_EntryData &obj, const T &func) {
+  switch (obj.get_id()) {
+    case dns_entryDataUnknown::ID:
+      func(static_cast<dns_entryDataUnknown &>(obj));
       return true;
-    case generic_accountStateTestGiver::ID:
-      func(static_cast<generic_accountStateTestGiver &>(obj));
+    case dns_entryDataText::ID:
+      func(static_cast<dns_entryDataText &>(obj));
       return true;
-    case generic_accountStateUninited::ID:
-      func(static_cast<generic_accountStateUninited &>(obj));
+    case dns_entryDataNextResolver::ID:
+      func(static_cast<dns_entryDataNextResolver &>(obj));
+      return true;
+    case dns_entryDataSmcAddress::ID:
+      func(static_cast<dns_entryDataSmcAddress &>(obj));
+      return true;
+    case dns_entryDataAdnlAddress::ID:
+      func(static_cast<dns_entryDataAdnlAddress &>(obj));
+      return true;
+    default:
+      return false;
+  }
+}
+
+/**
+ * Calls specified function object with the specified object downcasted to the most-derived type.
+ * \param[in] obj Object to pass as an argument to the function object.
+ * \param[in] func Function object to which the object will be passed.
+ * \returns whether function object call has happened. Should always return true for correct parameters.
+ */
+template <class T>
+bool downcast_call(msg_Data &obj, const T &func) {
+  switch (obj.get_id()) {
+    case msg_dataRaw::ID:
+      func(static_cast<msg_dataRaw &>(obj));
+      return true;
+    case msg_dataText::ID:
+      func(static_cast<msg_dataText &>(obj));
+      return true;
+    case msg_dataDecryptedText::ID:
+      func(static_cast<msg_dataDecryptedText &>(obj));
+      return true;
+    case msg_dataEncryptedText::ID:
+      func(static_cast<msg_dataEncryptedText &>(obj));
       return true;
     default:
       return false;
@@ -581,6 +801,12 @@ bool downcast_call(tvm_StackEntry &obj, const T &func) {
     case tvm_stackEntryNumber::ID:
       func(static_cast<tvm_stackEntryNumber &>(obj));
       return true;
+    case tvm_stackEntryTuple::ID:
+      func(static_cast<tvm_stackEntryTuple &>(obj));
+      return true;
+    case tvm_stackEntryList::ID:
+      func(static_cast<tvm_stackEntryList &>(obj));
+      return true;
     case tvm_stackEntryUnsupported::ID:
       func(static_cast<tvm_stackEntryUnsupported &>(obj));
       return true;
diff --git a/submodules/ton/tonlib-src/tl/generate/auto/tl/tonlib_api_json.cpp b/submodules/ton/tonlib-src/tl/generate/auto/tl/tonlib_api_json.cpp
index bb29637762..335cbbc3d5 100644
--- a/submodules/ton/tonlib-src/tl/generate/auto/tl/tonlib_api_json.cpp
+++ b/submodules/ton/tonlib-src/tl/generate/auto/tl/tonlib_api_json.cpp
@@ -14,6 +14,53 @@
 namespace ton {
 namespace tonlib_api{
   using namespace td;
+Result<int32> tl_constructor_from_string(tonlib_api::AccountState *object, const std::string &str) {
+  static const std::unordered_map<Slice, int32, SliceHash> m = {
+    {"raw.accountState", -531917254},
+    {"testWallet.accountState", -2053909931},
+    {"wallet.accountState", -390017192},
+    {"wallet.v3.accountState", -1619351478},
+    {"wallet.highload.v1.accountState", 1616372956},
+    {"wallet.highload.v2.accountState", -1803723441},
+    {"testGiver.accountState", -696813142},
+    {"dns.accountState", 1727715434},
+    {"uninited.accountState", 1522374408}
+  };
+  auto it = m.find(str);
+  if (it == m.end()) {
+    return Status::Error(str + "Unknown class");
+  }
+  return it->second;
+}
+Result<int32> tl_constructor_from_string(tonlib_api::Action *object, const std::string &str) {
+  static const std::unordered_map<Slice, int32, SliceHash> m = {
+    {"actionNoop", 1135848603},
+    {"actionMsg", 246839120},
+    {"actionDns", 1193750561}
+  };
+  auto it = m.find(str);
+  if (it == m.end()) {
+    return Status::Error(str + "Unknown class");
+  }
+  return it->second;
+}
+Result<int32> tl_constructor_from_string(tonlib_api::InitialAccountState *object, const std::string &str) {
+  static const std::unordered_map<Slice, int32, SliceHash> m = {
+    {"raw.initialAccountState", -337945529},
+    {"testGiver.initialAccountState", -1448412176},
+    {"testWallet.initialAccountState", 819380068},
+    {"wallet.initialAccountState", -1122166790},
+    {"wallet.v3.initialAccountState", -118074048},
+    {"wallet.highload.v1.initialAccountState", -327901626},
+    {"wallet.highload.v2.initialAccountState", 1966373161},
+    {"dns.initialAccountState", 1842062527}
+  };
+  auto it = m.find(str);
+  if (it == m.end()) {
+    return Status::Error(str + "Unknown class");
+  }
+  return it->second;
+}
 Result<int32> tl_constructor_from_string(tonlib_api::InputKey *object, const std::string &str) {
   static const std::unordered_map<Slice, int32, SliceHash> m = {
     {"inputKeyRegular", -555399522},
@@ -70,14 +117,38 @@ Result<int32> tl_constructor_from_string(tonlib_api::Update *object, const std::
   }
   return it->second;
 }
-Result<int32> tl_constructor_from_string(tonlib_api::generic_AccountState *object, const std::string &str) {
+Result<int32> tl_constructor_from_string(tonlib_api::dns_Action *object, const std::string &str) {
   static const std::unordered_map<Slice, int32, SliceHash> m = {
-    {"generic.accountStateRaw", -1387096685},
-    {"generic.accountStateTestWallet", -1041955397},
-    {"generic.accountStateWallet", 942582925},
-    {"generic.accountStateWalletV3", -281349583},
-    {"generic.accountStateTestGiver", 1134654598},
-    {"generic.accountStateUninited", -908702008}
+    {"dns.actionDeleteAll", 1067356318},
+    {"dns.actionDelete", 775206882},
+    {"dns.actionSet", -1374965309}
+  };
+  auto it = m.find(str);
+  if (it == m.end()) {
+    return Status::Error(str + "Unknown class");
+  }
+  return it->second;
+}
+Result<int32> tl_constructor_from_string(tonlib_api::dns_EntryData *object, const std::string &str) {
+  static const std::unordered_map<Slice, int32, SliceHash> m = {
+    {"dns.entryDataUnknown", -1285893248},
+    {"dns.entryDataText", -792485614},
+    {"dns.entryDataNextResolver", 330382792},
+    {"dns.entryDataSmcAddress", -1759937982},
+    {"dns.entryDataAdnlAddress", -1114064368}
+  };
+  auto it = m.find(str);
+  if (it == m.end()) {
+    return Status::Error(str + "Unknown class");
+  }
+  return it->second;
+}
+Result<int32> tl_constructor_from_string(tonlib_api::msg_Data *object, const std::string &str) {
+  static const std::unordered_map<Slice, int32, SliceHash> m = {
+    {"msg.dataRaw", 38878511},
+    {"msg.dataText", -341560688},
+    {"msg.dataDecryptedText", -1289133895},
+    {"msg.dataEncryptedText", -296612902}
   };
   auto it = m.find(str);
   if (it == m.end()) {
@@ -101,6 +172,8 @@ Result<int32> tl_constructor_from_string(tonlib_api::tvm_StackEntry *object, con
     {"tvm.stackEntrySlice", 1395485477},
     {"tvm.stackEntryCell", 1303473952},
     {"tvm.stackEntryNumber", 1358642622},
+    {"tvm.stackEntryTuple", -157391908},
+    {"tvm.stackEntryList", -1186714229},
     {"tvm.stackEntryUnsupported", 378880498}
   };
   auto it = m.find(str);
@@ -112,6 +185,20 @@ Result<int32> tl_constructor_from_string(tonlib_api::tvm_StackEntry *object, con
 Result<int32> tl_constructor_from_string(tonlib_api::Object *object, const std::string &str) {
   static const std::unordered_map<Slice, int32, SliceHash> m = {
     {"accountAddress", 755613099},
+    {"accountRevisionList", 120583012},
+    {"raw.accountState", -531917254},
+    {"testWallet.accountState", -2053909931},
+    {"wallet.accountState", -390017192},
+    {"wallet.v3.accountState", -1619351478},
+    {"wallet.highload.v1.accountState", 1616372956},
+    {"wallet.highload.v2.accountState", -1803723441},
+    {"testGiver.accountState", -696813142},
+    {"dns.accountState", 1727715434},
+    {"uninited.accountState", 1522374408},
+    {"actionNoop", 1135848603},
+    {"actionMsg", 246839120},
+    {"actionDns", 1193750561},
+    {"adnlAddress", 70358284},
     {"bip39Hints", 1012243456},
     {"config", -1538391496},
     {"data", -414733967},
@@ -119,7 +206,17 @@ Result<int32> tl_constructor_from_string(tonlib_api::Object *object, const std::
     {"exportedEncryptedKey", 2024406612},
     {"exportedKey", -1449248297},
     {"exportedPemKey", 1425473725},
+    {"exportedUnencryptedKey", 730045160},
     {"fees", 1676273340},
+    {"fullAccountState", -686286006},
+    {"raw.initialAccountState", -337945529},
+    {"testGiver.initialAccountState", -1448412176},
+    {"testWallet.initialAccountState", 819380068},
+    {"wallet.initialAccountState", -1122166790},
+    {"wallet.v3.initialAccountState", -118074048},
+    {"wallet.highload.v1.initialAccountState", -327901626},
+    {"wallet.highload.v2.initialAccountState", 1966373161},
+    {"dns.initialAccountState", 1842062527},
     {"inputKeyRegular", -555399522},
     {"inputKeyFake", -1074054722},
     {"key", -1978362923},
@@ -132,47 +229,54 @@ Result<int32> tl_constructor_from_string(tonlib_api::Object *object, const std::
     {"logVerbosityLevel", 1734624234},
     {"ok", -722616727},
     {"options", -1924388359},
-    {"sendGramsResult", 426872238},
     {"syncStateDone", 1408448777},
     {"syncStateInProgress", 107726023},
     {"unpackedAccountAddress", 1892946998},
     {"updateSendLiteServerQuery", -1555130916},
     {"updateSyncState", 1204298718},
-    {"generic.accountStateRaw", -1387096685},
-    {"generic.accountStateTestWallet", -1041955397},
-    {"generic.accountStateWallet", 942582925},
-    {"generic.accountStateWalletV3", -281349583},
-    {"generic.accountStateTestGiver", 1134654598},
-    {"generic.accountStateUninited", -908702008},
+    {"dns.actionDeleteAll", 1067356318},
+    {"dns.actionDelete", 775206882},
+    {"dns.actionSet", -1374965309},
+    {"dns.entry", -1842435400},
+    {"dns.entryDataUnknown", -1285893248},
+    {"dns.entryDataText", -792485614},
+    {"dns.entryDataNextResolver", 330382792},
+    {"dns.entryDataSmcAddress", -1759937982},
+    {"dns.entryDataAdnlAddress", -1114064368},
+    {"dns.resolved", 2090272150},
+    {"ton.blockId", -1185382494},
     {"internal.transactionId", -989527262},
     {"liteServer.info", -1250165133},
-    {"options.configInfo", 165216422},
-    {"query.fees", 725267759},
+    {"msg.dataRaw", 38878511},
+    {"msg.dataText", -341560688},
+    {"msg.dataDecryptedText", -1289133895},
+    {"msg.dataEncryptedText", -296612902},
+    {"msg.dataArray", 1248461374},
+    {"msg.message", 1349943761},
+    {"options.configInfo", 451217371},
+    {"options.info", -64676736},
+    {"query.fees", 1614616510},
     {"query.info", 1588635915},
-    {"raw.accountState", 1205935434},
-    {"raw.initialAccountState", 777456197},
-    {"raw.message", -906281442},
+    {"raw.fullAccountState", -1465398385},
+    {"raw.message", -32842388},
     {"raw.transaction", 1887601793},
     {"raw.transactions", -2063931155},
     {"smc.info", 1134270012},
     {"smc.methodIdNumber", -1541162500},
     {"smc.methodIdName", -249036908},
     {"smc.runResult", 1413805043},
-    {"testGiver.accountState", 860930426},
-    {"testWallet.accountState", 305698744},
-    {"testWallet.initialAccountState", -1231516227},
-    {"tvm.cell", -859530316},
+    {"ton.blockIdExt", 2031156378},
+    {"tvm.cell", -413424735},
+    {"tvm.list", 1270320392},
     {"tvm.numberDecimal", 1172477619},
-    {"tvm.slice", -1069968387},
+    {"tvm.slice", 537299687},
     {"tvm.stackEntrySlice", 1395485477},
     {"tvm.stackEntryCell", 1303473952},
     {"tvm.stackEntryNumber", 1358642622},
+    {"tvm.stackEntryTuple", -157391908},
+    {"tvm.stackEntryList", -1186714229},
     {"tvm.stackEntryUnsupported", 378880498},
-    {"uninited.accountState", -918880075},
-    {"wallet.accountState", -1919815977},
-    {"wallet.initialAccountState", -1079249978},
-    {"wallet.v3.accountState", 1977698154},
-    {"wallet.v3.initialAccountState", 283460879}
+    {"tvm.tuple", -1363953053}
   };
   auto it = m.find(str);
   if (it == m.end()) {
@@ -186,30 +290,35 @@ Result<int32> tl_constructor_from_string(tonlib_api::Function *object, const std
     {"changeLocalPassword", -401590337},
     {"close", -1187782273},
     {"createNewKey", -1861385712},
+    {"createQuery", -1316835098},
     {"decrypt", 357991854},
     {"deleteAllKeys", 1608776483},
     {"deleteKey", -1579595571},
+    {"dns.resolve", -149238065},
     {"encrypt", -1821422820},
     {"exportEncryptedKey", 218237311},
     {"exportKey", -1622353549},
     {"exportPemKey", -643259462},
-    {"generic.createSendGramsQuery", 208206338},
-    {"generic.getAccountState", -657000446},
-    {"generic.sendGrams", -553513162},
+    {"exportUnencryptedKey", -634665152},
+    {"getAccountAddress", -1159101819},
+    {"getAccountState", -2116357050},
     {"getBip39Hints", -1889640982},
     {"getLogStream", 1167608667},
     {"getLogTagVerbosityLevel", 951004547},
     {"getLogTags", -254449190},
     {"getLogVerbosityLevel", 594057956},
+    {"guessAccountRevision", 1463344293},
     {"importEncryptedKey", 656724958},
     {"importKey", -1607900903},
     {"importPemKey", 76385617},
-    {"init", -2014661877},
+    {"importUnencryptedKey", -1184671467},
+    {"init", -1000594762},
     {"kdf", -1667861635},
     {"liteServer.getInfo", 1435327470},
+    {"msg.decrypt", 1131086633},
     {"onLiteServerQueryError", -677427533},
     {"onLiteServerQueryResult", 2056444510},
-    {"options.setConfig", 646497241},
+    {"options.setConfig", 1870064579},
     {"options.validateConfig", -346965447},
     {"packAccountAddress", -1388561940},
     {"query.estimateFees", -957002175},
@@ -218,9 +327,8 @@ Result<int32> tl_constructor_from_string(tonlib_api::Function *object, const std
     {"query.send", 925242739},
     {"raw.createAndSendMessage", -772224603},
     {"raw.createQuery", -1928557909},
-    {"raw.getAccountAddress", -521283849},
-    {"raw.getAccountState", 663706721},
-    {"raw.getTransactions", 935377269},
+    {"raw.getAccountState", -1327847118},
+    {"raw.getTransactions", 1029612317},
     {"raw.sendMessage", -1789427488},
     {"runTests", -2039925427},
     {"setLogStream", -1364199535},
@@ -231,20 +339,9 @@ Result<int32> tl_constructor_from_string(tonlib_api::Function *object, const std
     {"smc.getState", -214390293},
     {"smc.load", -903491521},
     {"smc.runGetMethod", -255261270},
-    {"sync", -1617065525},
-    {"testGiver.getAccountAddress", -540100768},
-    {"testGiver.getAccountState", 267738275},
-    {"testGiver.sendGrams", -1785750375},
-    {"testWallet.getAccountAddress", -1557748223},
-    {"testWallet.getAccountState", 654082364},
-    {"testWallet.init", -1417409140},
-    {"testWallet.sendGrams", 573748322},
+    {"sync", -1875977070},
     {"unpackAccountAddress", -682459063},
-    {"wallet.getAccountAddress", -1004103180},
-    {"wallet.getAccountState", 462294850},
-    {"wallet.init", -395706309},
-    {"wallet.sendGrams", 297317621},
-    {"wallet.v3.getAccountAddress", 1011655671}
+    {"withBlock", -789093723}
   };
   auto it = m.find(str);
   if (it == m.end()) {
@@ -261,6 +358,156 @@ Status from_json(tonlib_api::accountAddress &to, JsonObject &from) {
   }
   return Status::OK();
 }
+Status from_json(tonlib_api::accountRevisionList &to, JsonObject &from) {
+  {
+    TRY_RESULT(value, get_json_object_field(from, "revisions", JsonValue::Type::Null, true));
+    if (value.type() != JsonValue::Type::Null) {
+      TRY_STATUS(from_json(to.revisions_, value));
+    }
+  }
+  return Status::OK();
+}
+Status from_json(tonlib_api::raw_accountState &to, JsonObject &from) {
+  {
+    TRY_RESULT(value, get_json_object_field(from, "code", JsonValue::Type::Null, true));
+    if (value.type() != JsonValue::Type::Null) {
+      TRY_STATUS(from_json_bytes(to.code_, value));
+    }
+  }
+  {
+    TRY_RESULT(value, get_json_object_field(from, "data", JsonValue::Type::Null, true));
+    if (value.type() != JsonValue::Type::Null) {
+      TRY_STATUS(from_json_bytes(to.data_, value));
+    }
+  }
+  {
+    TRY_RESULT(value, get_json_object_field(from, "frozen_hash", JsonValue::Type::Null, true));
+    if (value.type() != JsonValue::Type::Null) {
+      TRY_STATUS(from_json_bytes(to.frozen_hash_, value));
+    }
+  }
+  return Status::OK();
+}
+Status from_json(tonlib_api::testWallet_accountState &to, JsonObject &from) {
+  {
+    TRY_RESULT(value, get_json_object_field(from, "seqno", JsonValue::Type::Null, true));
+    if (value.type() != JsonValue::Type::Null) {
+      TRY_STATUS(from_json(to.seqno_, value));
+    }
+  }
+  return Status::OK();
+}
+Status from_json(tonlib_api::wallet_accountState &to, JsonObject &from) {
+  {
+    TRY_RESULT(value, get_json_object_field(from, "seqno", JsonValue::Type::Null, true));
+    if (value.type() != JsonValue::Type::Null) {
+      TRY_STATUS(from_json(to.seqno_, value));
+    }
+  }
+  return Status::OK();
+}
+Status from_json(tonlib_api::wallet_v3_accountState &to, JsonObject &from) {
+  {
+    TRY_RESULT(value, get_json_object_field(from, "wallet_id", JsonValue::Type::Null, true));
+    if (value.type() != JsonValue::Type::Null) {
+      TRY_STATUS(from_json(to.wallet_id_, value));
+    }
+  }
+  {
+    TRY_RESULT(value, get_json_object_field(from, "seqno", JsonValue::Type::Null, true));
+    if (value.type() != JsonValue::Type::Null) {
+      TRY_STATUS(from_json(to.seqno_, value));
+    }
+  }
+  return Status::OK();
+}
+Status from_json(tonlib_api::wallet_highload_v1_accountState &to, JsonObject &from) {
+  {
+    TRY_RESULT(value, get_json_object_field(from, "wallet_id", JsonValue::Type::Null, true));
+    if (value.type() != JsonValue::Type::Null) {
+      TRY_STATUS(from_json(to.wallet_id_, value));
+    }
+  }
+  {
+    TRY_RESULT(value, get_json_object_field(from, "seqno", JsonValue::Type::Null, true));
+    if (value.type() != JsonValue::Type::Null) {
+      TRY_STATUS(from_json(to.seqno_, value));
+    }
+  }
+  return Status::OK();
+}
+Status from_json(tonlib_api::wallet_highload_v2_accountState &to, JsonObject &from) {
+  {
+    TRY_RESULT(value, get_json_object_field(from, "wallet_id", JsonValue::Type::Null, true));
+    if (value.type() != JsonValue::Type::Null) {
+      TRY_STATUS(from_json(to.wallet_id_, value));
+    }
+  }
+  return Status::OK();
+}
+Status from_json(tonlib_api::testGiver_accountState &to, JsonObject &from) {
+  {
+    TRY_RESULT(value, get_json_object_field(from, "seqno", JsonValue::Type::Null, true));
+    if (value.type() != JsonValue::Type::Null) {
+      TRY_STATUS(from_json(to.seqno_, value));
+    }
+  }
+  return Status::OK();
+}
+Status from_json(tonlib_api::dns_accountState &to, JsonObject &from) {
+  {
+    TRY_RESULT(value, get_json_object_field(from, "wallet_id", JsonValue::Type::Null, true));
+    if (value.type() != JsonValue::Type::Null) {
+      TRY_STATUS(from_json(to.wallet_id_, value));
+    }
+  }
+  return Status::OK();
+}
+Status from_json(tonlib_api::uninited_accountState &to, JsonObject &from) {
+  {
+    TRY_RESULT(value, get_json_object_field(from, "frozen_hash", JsonValue::Type::Null, true));
+    if (value.type() != JsonValue::Type::Null) {
+      TRY_STATUS(from_json_bytes(to.frozen_hash_, value));
+    }
+  }
+  return Status::OK();
+}
+Status from_json(tonlib_api::actionNoop &to, JsonObject &from) {
+  return Status::OK();
+}
+Status from_json(tonlib_api::actionMsg &to, JsonObject &from) {
+  {
+    TRY_RESULT(value, get_json_object_field(from, "messages", JsonValue::Type::Null, true));
+    if (value.type() != JsonValue::Type::Null) {
+      TRY_STATUS(from_json(to.messages_, value));
+    }
+  }
+  {
+    TRY_RESULT(value, get_json_object_field(from, "allow_send_to_uninited", JsonValue::Type::Null, true));
+    if (value.type() != JsonValue::Type::Null) {
+      TRY_STATUS(from_json(to.allow_send_to_uninited_, value));
+    }
+  }
+  return Status::OK();
+}
+Status from_json(tonlib_api::actionDns &to, JsonObject &from) {
+  {
+    TRY_RESULT(value, get_json_object_field(from, "actions", JsonValue::Type::Null, true));
+    if (value.type() != JsonValue::Type::Null) {
+      TRY_STATUS(from_json(to.actions_, value));
+    }
+  }
+  return Status::OK();
+}
+Status from_json(tonlib_api::adnlAddress &to, JsonObject &from) {
+  {
+    TRY_RESULT(value, get_json_object_field(from, "adnl_address", JsonValue::Type::Null, true));
+    if (value.type() != JsonValue::Type::Null) {
+      TRY_STATUS(from_json(to.adnl_address_, value));
+    }
+  }
+  return Status::OK();
+}
 Status from_json(tonlib_api::bip39Hints &to, JsonObject &from) {
   {
     TRY_RESULT(value, get_json_object_field(from, "words", JsonValue::Type::Null, true));
@@ -348,6 +595,15 @@ Status from_json(tonlib_api::exportedPemKey &to, JsonObject &from) {
   }
   return Status::OK();
 }
+Status from_json(tonlib_api::exportedUnencryptedKey &to, JsonObject &from) {
+  {
+    TRY_RESULT(value, get_json_object_field(from, "data", JsonValue::Type::Null, true));
+    if (value.type() != JsonValue::Type::Null) {
+      TRY_STATUS(from_json_bytes(to.data_, value));
+    }
+  }
+  return Status::OK();
+}
 Status from_json(tonlib_api::fees &to, JsonObject &from) {
   {
     TRY_RESULT(value, get_json_object_field(from, "in_fwd_fee", JsonValue::Type::Null, true));
@@ -375,6 +631,135 @@ Status from_json(tonlib_api::fees &to, JsonObject &from) {
   }
   return Status::OK();
 }
+Status from_json(tonlib_api::fullAccountState &to, JsonObject &from) {
+  {
+    TRY_RESULT(value, get_json_object_field(from, "balance", JsonValue::Type::Null, true));
+    if (value.type() != JsonValue::Type::Null) {
+      TRY_STATUS(from_json(to.balance_, value));
+    }
+  }
+  {
+    TRY_RESULT(value, get_json_object_field(from, "last_transaction_id", JsonValue::Type::Null, true));
+    if (value.type() != JsonValue::Type::Null) {
+      TRY_STATUS(from_json(to.last_transaction_id_, value));
+    }
+  }
+  {
+    TRY_RESULT(value, get_json_object_field(from, "block_id", JsonValue::Type::Null, true));
+    if (value.type() != JsonValue::Type::Null) {
+      TRY_STATUS(from_json(to.block_id_, value));
+    }
+  }
+  {
+    TRY_RESULT(value, get_json_object_field(from, "sync_utime", JsonValue::Type::Null, true));
+    if (value.type() != JsonValue::Type::Null) {
+      TRY_STATUS(from_json(to.sync_utime_, value));
+    }
+  }
+  {
+    TRY_RESULT(value, get_json_object_field(from, "account_state", JsonValue::Type::Null, true));
+    if (value.type() != JsonValue::Type::Null) {
+      TRY_STATUS(from_json(to.account_state_, value));
+    }
+  }
+  return Status::OK();
+}
+Status from_json(tonlib_api::raw_initialAccountState &to, JsonObject &from) {
+  {
+    TRY_RESULT(value, get_json_object_field(from, "code", JsonValue::Type::Null, true));
+    if (value.type() != JsonValue::Type::Null) {
+      TRY_STATUS(from_json_bytes(to.code_, value));
+    }
+  }
+  {
+    TRY_RESULT(value, get_json_object_field(from, "data", JsonValue::Type::Null, true));
+    if (value.type() != JsonValue::Type::Null) {
+      TRY_STATUS(from_json_bytes(to.data_, value));
+    }
+  }
+  return Status::OK();
+}
+Status from_json(tonlib_api::testGiver_initialAccountState &to, JsonObject &from) {
+  return Status::OK();
+}
+Status from_json(tonlib_api::testWallet_initialAccountState &to, JsonObject &from) {
+  {
+    TRY_RESULT(value, get_json_object_field(from, "public_key", JsonValue::Type::Null, true));
+    if (value.type() != JsonValue::Type::Null) {
+      TRY_STATUS(from_json(to.public_key_, value));
+    }
+  }
+  return Status::OK();
+}
+Status from_json(tonlib_api::wallet_initialAccountState &to, JsonObject &from) {
+  {
+    TRY_RESULT(value, get_json_object_field(from, "public_key", JsonValue::Type::Null, true));
+    if (value.type() != JsonValue::Type::Null) {
+      TRY_STATUS(from_json(to.public_key_, value));
+    }
+  }
+  return Status::OK();
+}
+Status from_json(tonlib_api::wallet_v3_initialAccountState &to, JsonObject &from) {
+  {
+    TRY_RESULT(value, get_json_object_field(from, "public_key", JsonValue::Type::Null, true));
+    if (value.type() != JsonValue::Type::Null) {
+      TRY_STATUS(from_json(to.public_key_, value));
+    }
+  }
+  {
+    TRY_RESULT(value, get_json_object_field(from, "wallet_id", JsonValue::Type::Null, true));
+    if (value.type() != JsonValue::Type::Null) {
+      TRY_STATUS(from_json(to.wallet_id_, value));
+    }
+  }
+  return Status::OK();
+}
+Status from_json(tonlib_api::wallet_highload_v1_initialAccountState &to, JsonObject &from) {
+  {
+    TRY_RESULT(value, get_json_object_field(from, "public_key", JsonValue::Type::Null, true));
+    if (value.type() != JsonValue::Type::Null) {
+      TRY_STATUS(from_json(to.public_key_, value));
+    }
+  }
+  {
+    TRY_RESULT(value, get_json_object_field(from, "wallet_id", JsonValue::Type::Null, true));
+    if (value.type() != JsonValue::Type::Null) {
+      TRY_STATUS(from_json(to.wallet_id_, value));
+    }
+  }
+  return Status::OK();
+}
+Status from_json(tonlib_api::wallet_highload_v2_initialAccountState &to, JsonObject &from) {
+  {
+    TRY_RESULT(value, get_json_object_field(from, "public_key", JsonValue::Type::Null, true));
+    if (value.type() != JsonValue::Type::Null) {
+      TRY_STATUS(from_json(to.public_key_, value));
+    }
+  }
+  {
+    TRY_RESULT(value, get_json_object_field(from, "wallet_id", JsonValue::Type::Null, true));
+    if (value.type() != JsonValue::Type::Null) {
+      TRY_STATUS(from_json(to.wallet_id_, value));
+    }
+  }
+  return Status::OK();
+}
+Status from_json(tonlib_api::dns_initialAccountState &to, JsonObject &from) {
+  {
+    TRY_RESULT(value, get_json_object_field(from, "public_key", JsonValue::Type::Null, true));
+    if (value.type() != JsonValue::Type::Null) {
+      TRY_STATUS(from_json(to.public_key_, value));
+    }
+  }
+  {
+    TRY_RESULT(value, get_json_object_field(from, "wallet_id", JsonValue::Type::Null, true));
+    if (value.type() != JsonValue::Type::Null) {
+      TRY_STATUS(from_json(to.wallet_id_, value));
+    }
+  }
+  return Status::OK();
+}
 Status from_json(tonlib_api::inputKeyRegular &to, JsonObject &from) {
   {
     TRY_RESULT(value, get_json_object_field(from, "key", JsonValue::Type::Null, true));
@@ -477,21 +862,6 @@ Status from_json(tonlib_api::options &to, JsonObject &from) {
   }
   return Status::OK();
 }
-Status from_json(tonlib_api::sendGramsResult &to, JsonObject &from) {
-  {
-    TRY_RESULT(value, get_json_object_field(from, "sent_until", JsonValue::Type::Null, true));
-    if (value.type() != JsonValue::Type::Null) {
-      TRY_STATUS(from_json(to.sent_until_, value));
-    }
-  }
-  {
-    TRY_RESULT(value, get_json_object_field(from, "body_hash", JsonValue::Type::Null, true));
-    if (value.type() != JsonValue::Type::Null) {
-      TRY_STATUS(from_json_bytes(to.body_hash_, value));
-    }
-  }
-  return Status::OK();
-}
 Status from_json(tonlib_api::syncStateDone &to, JsonObject &from) {
   return Status::OK();
 }
@@ -567,56 +937,125 @@ Status from_json(tonlib_api::updateSyncState &to, JsonObject &from) {
   }
   return Status::OK();
 }
-Status from_json(tonlib_api::generic_accountStateRaw &to, JsonObject &from) {
+Status from_json(tonlib_api::dns_actionDeleteAll &to, JsonObject &from) {
+  return Status::OK();
+}
+Status from_json(tonlib_api::dns_actionDelete &to, JsonObject &from) {
   {
-    TRY_RESULT(value, get_json_object_field(from, "account_state", JsonValue::Type::Null, true));
+    TRY_RESULT(value, get_json_object_field(from, "name", JsonValue::Type::Null, true));
     if (value.type() != JsonValue::Type::Null) {
-      TRY_STATUS(from_json(to.account_state_, value));
+      TRY_STATUS(from_json(to.name_, value));
+    }
+  }
+  {
+    TRY_RESULT(value, get_json_object_field(from, "category", JsonValue::Type::Null, true));
+    if (value.type() != JsonValue::Type::Null) {
+      TRY_STATUS(from_json(to.category_, value));
     }
   }
   return Status::OK();
 }
-Status from_json(tonlib_api::generic_accountStateTestWallet &to, JsonObject &from) {
+Status from_json(tonlib_api::dns_actionSet &to, JsonObject &from) {
   {
-    TRY_RESULT(value, get_json_object_field(from, "account_state", JsonValue::Type::Null, true));
+    TRY_RESULT(value, get_json_object_field(from, "entry", JsonValue::Type::Null, true));
     if (value.type() != JsonValue::Type::Null) {
-      TRY_STATUS(from_json(to.account_state_, value));
+      TRY_STATUS(from_json(to.entry_, value));
     }
   }
   return Status::OK();
 }
-Status from_json(tonlib_api::generic_accountStateWallet &to, JsonObject &from) {
+Status from_json(tonlib_api::dns_entry &to, JsonObject &from) {
   {
-    TRY_RESULT(value, get_json_object_field(from, "account_state", JsonValue::Type::Null, true));
+    TRY_RESULT(value, get_json_object_field(from, "name", JsonValue::Type::Null, true));
     if (value.type() != JsonValue::Type::Null) {
-      TRY_STATUS(from_json(to.account_state_, value));
+      TRY_STATUS(from_json(to.name_, value));
+    }
+  }
+  {
+    TRY_RESULT(value, get_json_object_field(from, "category", JsonValue::Type::Null, true));
+    if (value.type() != JsonValue::Type::Null) {
+      TRY_STATUS(from_json(to.category_, value));
+    }
+  }
+  {
+    TRY_RESULT(value, get_json_object_field(from, "entry", JsonValue::Type::Null, true));
+    if (value.type() != JsonValue::Type::Null) {
+      TRY_STATUS(from_json(to.entry_, value));
     }
   }
   return Status::OK();
 }
-Status from_json(tonlib_api::generic_accountStateWalletV3 &to, JsonObject &from) {
+Status from_json(tonlib_api::dns_entryDataUnknown &to, JsonObject &from) {
   {
-    TRY_RESULT(value, get_json_object_field(from, "account_state", JsonValue::Type::Null, true));
+    TRY_RESULT(value, get_json_object_field(from, "bytes", JsonValue::Type::Null, true));
     if (value.type() != JsonValue::Type::Null) {
-      TRY_STATUS(from_json(to.account_state_, value));
+      TRY_STATUS(from_json_bytes(to.bytes_, value));
     }
   }
   return Status::OK();
 }
-Status from_json(tonlib_api::generic_accountStateTestGiver &to, JsonObject &from) {
+Status from_json(tonlib_api::dns_entryDataText &to, JsonObject &from) {
   {
-    TRY_RESULT(value, get_json_object_field(from, "account_state", JsonValue::Type::Null, true));
+    TRY_RESULT(value, get_json_object_field(from, "text", JsonValue::Type::Null, true));
     if (value.type() != JsonValue::Type::Null) {
-      TRY_STATUS(from_json(to.account_state_, value));
+      TRY_STATUS(from_json(to.text_, value));
     }
   }
   return Status::OK();
 }
-Status from_json(tonlib_api::generic_accountStateUninited &to, JsonObject &from) {
+Status from_json(tonlib_api::dns_entryDataNextResolver &to, JsonObject &from) {
   {
-    TRY_RESULT(value, get_json_object_field(from, "account_state", JsonValue::Type::Null, true));
+    TRY_RESULT(value, get_json_object_field(from, "resolver", JsonValue::Type::Null, true));
     if (value.type() != JsonValue::Type::Null) {
-      TRY_STATUS(from_json(to.account_state_, value));
+      TRY_STATUS(from_json(to.resolver_, value));
+    }
+  }
+  return Status::OK();
+}
+Status from_json(tonlib_api::dns_entryDataSmcAddress &to, JsonObject &from) {
+  {
+    TRY_RESULT(value, get_json_object_field(from, "smc_address", JsonValue::Type::Null, true));
+    if (value.type() != JsonValue::Type::Null) {
+      TRY_STATUS(from_json(to.smc_address_, value));
+    }
+  }
+  return Status::OK();
+}
+Status from_json(tonlib_api::dns_entryDataAdnlAddress &to, JsonObject &from) {
+  {
+    TRY_RESULT(value, get_json_object_field(from, "adnl_address", JsonValue::Type::Null, true));
+    if (value.type() != JsonValue::Type::Null) {
+      TRY_STATUS(from_json(to.adnl_address_, value));
+    }
+  }
+  return Status::OK();
+}
+Status from_json(tonlib_api::dns_resolved &to, JsonObject &from) {
+  {
+    TRY_RESULT(value, get_json_object_field(from, "entries", JsonValue::Type::Null, true));
+    if (value.type() != JsonValue::Type::Null) {
+      TRY_STATUS(from_json(to.entries_, value));
+    }
+  }
+  return Status::OK();
+}
+Status from_json(tonlib_api::ton_blockId &to, JsonObject &from) {
+  {
+    TRY_RESULT(value, get_json_object_field(from, "workchain", JsonValue::Type::Null, true));
+    if (value.type() != JsonValue::Type::Null) {
+      TRY_STATUS(from_json(to.workchain_, value));
+    }
+  }
+  {
+    TRY_RESULT(value, get_json_object_field(from, "shard", JsonValue::Type::Null, true));
+    if (value.type() != JsonValue::Type::Null) {
+      TRY_STATUS(from_json(to.shard_, value));
+    }
+  }
+  {
+    TRY_RESULT(value, get_json_object_field(from, "seqno", JsonValue::Type::Null, true));
+    if (value.type() != JsonValue::Type::Null) {
+      TRY_STATUS(from_json(to.seqno_, value));
     }
   }
   return Status::OK();
@@ -657,6 +1096,72 @@ Status from_json(tonlib_api::liteServer_info &to, JsonObject &from) {
   }
   return Status::OK();
 }
+Status from_json(tonlib_api::msg_dataRaw &to, JsonObject &from) {
+  {
+    TRY_RESULT(value, get_json_object_field(from, "body", JsonValue::Type::Null, true));
+    if (value.type() != JsonValue::Type::Null) {
+      TRY_STATUS(from_json_bytes(to.body_, value));
+    }
+  }
+  return Status::OK();
+}
+Status from_json(tonlib_api::msg_dataText &to, JsonObject &from) {
+  {
+    TRY_RESULT(value, get_json_object_field(from, "text", JsonValue::Type::Null, true));
+    if (value.type() != JsonValue::Type::Null) {
+      TRY_STATUS(from_json_bytes(to.text_, value));
+    }
+  }
+  return Status::OK();
+}
+Status from_json(tonlib_api::msg_dataDecryptedText &to, JsonObject &from) {
+  {
+    TRY_RESULT(value, get_json_object_field(from, "text", JsonValue::Type::Null, true));
+    if (value.type() != JsonValue::Type::Null) {
+      TRY_STATUS(from_json_bytes(to.text_, value));
+    }
+  }
+  return Status::OK();
+}
+Status from_json(tonlib_api::msg_dataEncryptedText &to, JsonObject &from) {
+  {
+    TRY_RESULT(value, get_json_object_field(from, "text", JsonValue::Type::Null, true));
+    if (value.type() != JsonValue::Type::Null) {
+      TRY_STATUS(from_json_bytes(to.text_, value));
+    }
+  }
+  return Status::OK();
+}
+Status from_json(tonlib_api::msg_dataArray &to, JsonObject &from) {
+  {
+    TRY_RESULT(value, get_json_object_field(from, "elements", JsonValue::Type::Null, true));
+    if (value.type() != JsonValue::Type::Null) {
+      TRY_STATUS(from_json(to.elements_, value));
+    }
+  }
+  return Status::OK();
+}
+Status from_json(tonlib_api::msg_message &to, JsonObject &from) {
+  {
+    TRY_RESULT(value, get_json_object_field(from, "destination", JsonValue::Type::Null, true));
+    if (value.type() != JsonValue::Type::Null) {
+      TRY_STATUS(from_json(to.destination_, value));
+    }
+  }
+  {
+    TRY_RESULT(value, get_json_object_field(from, "amount", JsonValue::Type::Null, true));
+    if (value.type() != JsonValue::Type::Null) {
+      TRY_STATUS(from_json(to.amount_, value));
+    }
+  }
+  {
+    TRY_RESULT(value, get_json_object_field(from, "data", JsonValue::Type::Null, true));
+    if (value.type() != JsonValue::Type::Null) {
+      TRY_STATUS(from_json(to.data_, value));
+    }
+  }
+  return Status::OK();
+}
 Status from_json(tonlib_api::options_configInfo &to, JsonObject &from) {
   {
     TRY_RESULT(value, get_json_object_field(from, "default_wallet_id", JsonValue::Type::Null, true));
@@ -666,6 +1171,15 @@ Status from_json(tonlib_api::options_configInfo &to, JsonObject &from) {
   }
   return Status::OK();
 }
+Status from_json(tonlib_api::options_info &to, JsonObject &from) {
+  {
+    TRY_RESULT(value, get_json_object_field(from, "config_info", JsonValue::Type::Null, true));
+    if (value.type() != JsonValue::Type::Null) {
+      TRY_STATUS(from_json(to.config_info_, value));
+    }
+  }
+  return Status::OK();
+}
 Status from_json(tonlib_api::query_fees &to, JsonObject &from) {
   {
     TRY_RESULT(value, get_json_object_field(from, "source_fees", JsonValue::Type::Null, true));
@@ -702,7 +1216,7 @@ Status from_json(tonlib_api::query_info &to, JsonObject &from) {
   }
   return Status::OK();
 }
-Status from_json(tonlib_api::raw_accountState &to, JsonObject &from) {
+Status from_json(tonlib_api::raw_fullAccountState &to, JsonObject &from) {
   {
     TRY_RESULT(value, get_json_object_field(from, "balance", JsonValue::Type::Null, true));
     if (value.type() != JsonValue::Type::Null) {
@@ -727,6 +1241,12 @@ Status from_json(tonlib_api::raw_accountState &to, JsonObject &from) {
       TRY_STATUS(from_json(to.last_transaction_id_, value));
     }
   }
+  {
+    TRY_RESULT(value, get_json_object_field(from, "block_id", JsonValue::Type::Null, true));
+    if (value.type() != JsonValue::Type::Null) {
+      TRY_STATUS(from_json(to.block_id_, value));
+    }
+  }
   {
     TRY_RESULT(value, get_json_object_field(from, "frozen_hash", JsonValue::Type::Null, true));
     if (value.type() != JsonValue::Type::Null) {
@@ -741,21 +1261,6 @@ Status from_json(tonlib_api::raw_accountState &to, JsonObject &from) {
   }
   return Status::OK();
 }
-Status from_json(tonlib_api::raw_initialAccountState &to, JsonObject &from) {
-  {
-    TRY_RESULT(value, get_json_object_field(from, "code", JsonValue::Type::Null, true));
-    if (value.type() != JsonValue::Type::Null) {
-      TRY_STATUS(from_json_bytes(to.code_, value));
-    }
-  }
-  {
-    TRY_RESULT(value, get_json_object_field(from, "data", JsonValue::Type::Null, true));
-    if (value.type() != JsonValue::Type::Null) {
-      TRY_STATUS(from_json_bytes(to.data_, value));
-    }
-  }
-  return Status::OK();
-}
 Status from_json(tonlib_api::raw_message &to, JsonObject &from) {
   {
     TRY_RESULT(value, get_json_object_field(from, "source", JsonValue::Type::Null, true));
@@ -800,9 +1305,9 @@ Status from_json(tonlib_api::raw_message &to, JsonObject &from) {
     }
   }
   {
-    TRY_RESULT(value, get_json_object_field(from, "message", JsonValue::Type::Null, true));
+    TRY_RESULT(value, get_json_object_field(from, "msg_data", JsonValue::Type::Null, true));
     if (value.type() != JsonValue::Type::Null) {
-      TRY_STATUS(from_json_bytes(to.message_, value));
+      TRY_STATUS(from_json(to.msg_data_, value));
     }
   }
   return Status::OK();
@@ -921,11 +1426,17 @@ Status from_json(tonlib_api::smc_runResult &to, JsonObject &from) {
   }
   return Status::OK();
 }
-Status from_json(tonlib_api::testGiver_accountState &to, JsonObject &from) {
+Status from_json(tonlib_api::ton_blockIdExt &to, JsonObject &from) {
   {
-    TRY_RESULT(value, get_json_object_field(from, "balance", JsonValue::Type::Null, true));
+    TRY_RESULT(value, get_json_object_field(from, "workchain", JsonValue::Type::Null, true));
     if (value.type() != JsonValue::Type::Null) {
-      TRY_STATUS(from_json(to.balance_, value));
+      TRY_STATUS(from_json(to.workchain_, value));
+    }
+  }
+  {
+    TRY_RESULT(value, get_json_object_field(from, "shard", JsonValue::Type::Null, true));
+    if (value.type() != JsonValue::Type::Null) {
+      TRY_STATUS(from_json(to.shard_, value));
     }
   }
   {
@@ -935,51 +1446,15 @@ Status from_json(tonlib_api::testGiver_accountState &to, JsonObject &from) {
     }
   }
   {
-    TRY_RESULT(value, get_json_object_field(from, "last_transaction_id", JsonValue::Type::Null, true));
+    TRY_RESULT(value, get_json_object_field(from, "root_hash", JsonValue::Type::Null, true));
     if (value.type() != JsonValue::Type::Null) {
-      TRY_STATUS(from_json(to.last_transaction_id_, value));
+      TRY_STATUS(from_json_bytes(to.root_hash_, value));
     }
   }
   {
-    TRY_RESULT(value, get_json_object_field(from, "sync_utime", JsonValue::Type::Null, true));
+    TRY_RESULT(value, get_json_object_field(from, "file_hash", JsonValue::Type::Null, true));
     if (value.type() != JsonValue::Type::Null) {
-      TRY_STATUS(from_json(to.sync_utime_, value));
-    }
-  }
-  return Status::OK();
-}
-Status from_json(tonlib_api::testWallet_accountState &to, JsonObject &from) {
-  {
-    TRY_RESULT(value, get_json_object_field(from, "balance", JsonValue::Type::Null, true));
-    if (value.type() != JsonValue::Type::Null) {
-      TRY_STATUS(from_json(to.balance_, value));
-    }
-  }
-  {
-    TRY_RESULT(value, get_json_object_field(from, "seqno", JsonValue::Type::Null, true));
-    if (value.type() != JsonValue::Type::Null) {
-      TRY_STATUS(from_json(to.seqno_, value));
-    }
-  }
-  {
-    TRY_RESULT(value, get_json_object_field(from, "last_transaction_id", JsonValue::Type::Null, true));
-    if (value.type() != JsonValue::Type::Null) {
-      TRY_STATUS(from_json(to.last_transaction_id_, value));
-    }
-  }
-  {
-    TRY_RESULT(value, get_json_object_field(from, "sync_utime", JsonValue::Type::Null, true));
-    if (value.type() != JsonValue::Type::Null) {
-      TRY_STATUS(from_json(to.sync_utime_, value));
-    }
-  }
-  return Status::OK();
-}
-Status from_json(tonlib_api::testWallet_initialAccountState &to, JsonObject &from) {
-  {
-    TRY_RESULT(value, get_json_object_field(from, "public_key", JsonValue::Type::Null, true));
-    if (value.type() != JsonValue::Type::Null) {
-      TRY_STATUS(from_json(to.public_key_, value));
+      TRY_STATUS(from_json_bytes(to.file_hash_, value));
     }
   }
   return Status::OK();
@@ -988,7 +1463,16 @@ Status from_json(tonlib_api::tvm_cell &to, JsonObject &from) {
   {
     TRY_RESULT(value, get_json_object_field(from, "bytes", JsonValue::Type::Null, true));
     if (value.type() != JsonValue::Type::Null) {
-      TRY_STATUS(from_json(to.bytes_, value));
+      TRY_STATUS(from_json_bytes(to.bytes_, value));
+    }
+  }
+  return Status::OK();
+}
+Status from_json(tonlib_api::tvm_list &to, JsonObject &from) {
+  {
+    TRY_RESULT(value, get_json_object_field(from, "elements", JsonValue::Type::Null, true));
+    if (value.type() != JsonValue::Type::Null) {
+      TRY_STATUS(from_json(to.elements_, value));
     }
   }
   return Status::OK();
@@ -1006,7 +1490,7 @@ Status from_json(tonlib_api::tvm_slice &to, JsonObject &from) {
   {
     TRY_RESULT(value, get_json_object_field(from, "bytes", JsonValue::Type::Null, true));
     if (value.type() != JsonValue::Type::Null) {
-      TRY_STATUS(from_json(to.bytes_, value));
+      TRY_STATUS(from_json_bytes(to.bytes_, value));
     }
   }
   return Status::OK();
@@ -1038,116 +1522,32 @@ Status from_json(tonlib_api::tvm_stackEntryNumber &to, JsonObject &from) {
   }
   return Status::OK();
 }
+Status from_json(tonlib_api::tvm_stackEntryTuple &to, JsonObject &from) {
+  {
+    TRY_RESULT(value, get_json_object_field(from, "tuple", JsonValue::Type::Null, true));
+    if (value.type() != JsonValue::Type::Null) {
+      TRY_STATUS(from_json(to.tuple_, value));
+    }
+  }
+  return Status::OK();
+}
+Status from_json(tonlib_api::tvm_stackEntryList &to, JsonObject &from) {
+  {
+    TRY_RESULT(value, get_json_object_field(from, "list", JsonValue::Type::Null, true));
+    if (value.type() != JsonValue::Type::Null) {
+      TRY_STATUS(from_json(to.list_, value));
+    }
+  }
+  return Status::OK();
+}
 Status from_json(tonlib_api::tvm_stackEntryUnsupported &to, JsonObject &from) {
   return Status::OK();
 }
-Status from_json(tonlib_api::uninited_accountState &to, JsonObject &from) {
+Status from_json(tonlib_api::tvm_tuple &to, JsonObject &from) {
   {
-    TRY_RESULT(value, get_json_object_field(from, "balance", JsonValue::Type::Null, true));
+    TRY_RESULT(value, get_json_object_field(from, "elements", JsonValue::Type::Null, true));
     if (value.type() != JsonValue::Type::Null) {
-      TRY_STATUS(from_json(to.balance_, value));
-    }
-  }
-  {
-    TRY_RESULT(value, get_json_object_field(from, "last_transaction_id", JsonValue::Type::Null, true));
-    if (value.type() != JsonValue::Type::Null) {
-      TRY_STATUS(from_json(to.last_transaction_id_, value));
-    }
-  }
-  {
-    TRY_RESULT(value, get_json_object_field(from, "frozen_hash", JsonValue::Type::Null, true));
-    if (value.type() != JsonValue::Type::Null) {
-      TRY_STATUS(from_json_bytes(to.frozen_hash_, value));
-    }
-  }
-  {
-    TRY_RESULT(value, get_json_object_field(from, "sync_utime", JsonValue::Type::Null, true));
-    if (value.type() != JsonValue::Type::Null) {
-      TRY_STATUS(from_json(to.sync_utime_, value));
-    }
-  }
-  return Status::OK();
-}
-Status from_json(tonlib_api::wallet_accountState &to, JsonObject &from) {
-  {
-    TRY_RESULT(value, get_json_object_field(from, "balance", JsonValue::Type::Null, true));
-    if (value.type() != JsonValue::Type::Null) {
-      TRY_STATUS(from_json(to.balance_, value));
-    }
-  }
-  {
-    TRY_RESULT(value, get_json_object_field(from, "seqno", JsonValue::Type::Null, true));
-    if (value.type() != JsonValue::Type::Null) {
-      TRY_STATUS(from_json(to.seqno_, value));
-    }
-  }
-  {
-    TRY_RESULT(value, get_json_object_field(from, "last_transaction_id", JsonValue::Type::Null, true));
-    if (value.type() != JsonValue::Type::Null) {
-      TRY_STATUS(from_json(to.last_transaction_id_, value));
-    }
-  }
-  {
-    TRY_RESULT(value, get_json_object_field(from, "sync_utime", JsonValue::Type::Null, true));
-    if (value.type() != JsonValue::Type::Null) {
-      TRY_STATUS(from_json(to.sync_utime_, value));
-    }
-  }
-  return Status::OK();
-}
-Status from_json(tonlib_api::wallet_initialAccountState &to, JsonObject &from) {
-  {
-    TRY_RESULT(value, get_json_object_field(from, "public_key", JsonValue::Type::Null, true));
-    if (value.type() != JsonValue::Type::Null) {
-      TRY_STATUS(from_json(to.public_key_, value));
-    }
-  }
-  return Status::OK();
-}
-Status from_json(tonlib_api::wallet_v3_accountState &to, JsonObject &from) {
-  {
-    TRY_RESULT(value, get_json_object_field(from, "balance", JsonValue::Type::Null, true));
-    if (value.type() != JsonValue::Type::Null) {
-      TRY_STATUS(from_json(to.balance_, value));
-    }
-  }
-  {
-    TRY_RESULT(value, get_json_object_field(from, "wallet_id", JsonValue::Type::Null, true));
-    if (value.type() != JsonValue::Type::Null) {
-      TRY_STATUS(from_json(to.wallet_id_, value));
-    }
-  }
-  {
-    TRY_RESULT(value, get_json_object_field(from, "seqno", JsonValue::Type::Null, true));
-    if (value.type() != JsonValue::Type::Null) {
-      TRY_STATUS(from_json(to.seqno_, value));
-    }
-  }
-  {
-    TRY_RESULT(value, get_json_object_field(from, "last_transaction_id", JsonValue::Type::Null, true));
-    if (value.type() != JsonValue::Type::Null) {
-      TRY_STATUS(from_json(to.last_transaction_id_, value));
-    }
-  }
-  {
-    TRY_RESULT(value, get_json_object_field(from, "sync_utime", JsonValue::Type::Null, true));
-    if (value.type() != JsonValue::Type::Null) {
-      TRY_STATUS(from_json(to.sync_utime_, value));
-    }
-  }
-  return Status::OK();
-}
-Status from_json(tonlib_api::wallet_v3_initialAccountState &to, JsonObject &from) {
-  {
-    TRY_RESULT(value, get_json_object_field(from, "public_key", JsonValue::Type::Null, true));
-    if (value.type() != JsonValue::Type::Null) {
-      TRY_STATUS(from_json(to.public_key_, value));
-    }
-  }
-  {
-    TRY_RESULT(value, get_json_object_field(from, "wallet_id", JsonValue::Type::Null, true));
-    if (value.type() != JsonValue::Type::Null) {
-      TRY_STATUS(from_json(to.wallet_id_, value));
+      TRY_STATUS(from_json(to.elements_, value));
     }
   }
   return Status::OK();
@@ -1206,6 +1606,33 @@ Status from_json(tonlib_api::createNewKey &to, JsonObject &from) {
   }
   return Status::OK();
 }
+Status from_json(tonlib_api::createQuery &to, JsonObject &from) {
+  {
+    TRY_RESULT(value, get_json_object_field(from, "private_key", JsonValue::Type::Null, true));
+    if (value.type() != JsonValue::Type::Null) {
+      TRY_STATUS(from_json(to.private_key_, value));
+    }
+  }
+  {
+    TRY_RESULT(value, get_json_object_field(from, "address", JsonValue::Type::Null, true));
+    if (value.type() != JsonValue::Type::Null) {
+      TRY_STATUS(from_json(to.address_, value));
+    }
+  }
+  {
+    TRY_RESULT(value, get_json_object_field(from, "timeout", JsonValue::Type::Null, true));
+    if (value.type() != JsonValue::Type::Null) {
+      TRY_STATUS(from_json(to.timeout_, value));
+    }
+  }
+  {
+    TRY_RESULT(value, get_json_object_field(from, "action", JsonValue::Type::Null, true));
+    if (value.type() != JsonValue::Type::Null) {
+      TRY_STATUS(from_json(to.action_, value));
+    }
+  }
+  return Status::OK();
+}
 Status from_json(tonlib_api::decrypt &to, JsonObject &from) {
   {
     TRY_RESULT(value, get_json_object_field(from, "encrypted_data", JsonValue::Type::Null, true));
@@ -1233,6 +1660,33 @@ Status from_json(tonlib_api::deleteKey &to, JsonObject &from) {
   }
   return Status::OK();
 }
+Status from_json(tonlib_api::dns_resolve &to, JsonObject &from) {
+  {
+    TRY_RESULT(value, get_json_object_field(from, "account_address", JsonValue::Type::Null, true));
+    if (value.type() != JsonValue::Type::Null) {
+      TRY_STATUS(from_json(to.account_address_, value));
+    }
+  }
+  {
+    TRY_RESULT(value, get_json_object_field(from, "name", JsonValue::Type::Null, true));
+    if (value.type() != JsonValue::Type::Null) {
+      TRY_STATUS(from_json(to.name_, value));
+    }
+  }
+  {
+    TRY_RESULT(value, get_json_object_field(from, "category", JsonValue::Type::Null, true));
+    if (value.type() != JsonValue::Type::Null) {
+      TRY_STATUS(from_json(to.category_, value));
+    }
+  }
+  {
+    TRY_RESULT(value, get_json_object_field(from, "ttl", JsonValue::Type::Null, true));
+    if (value.type() != JsonValue::Type::Null) {
+      TRY_STATUS(from_json(to.ttl_, value));
+    }
+  }
+  return Status::OK();
+}
 Status from_json(tonlib_api::encrypt &to, JsonObject &from) {
   {
     TRY_RESULT(value, get_json_object_field(from, "decrypted_data", JsonValue::Type::Null, true));
@@ -1287,52 +1741,31 @@ Status from_json(tonlib_api::exportPemKey &to, JsonObject &from) {
   }
   return Status::OK();
 }
-Status from_json(tonlib_api::generic_createSendGramsQuery &to, JsonObject &from) {
+Status from_json(tonlib_api::exportUnencryptedKey &to, JsonObject &from) {
   {
-    TRY_RESULT(value, get_json_object_field(from, "private_key", JsonValue::Type::Null, true));
+    TRY_RESULT(value, get_json_object_field(from, "input_key", JsonValue::Type::Null, true));
     if (value.type() != JsonValue::Type::Null) {
-      TRY_STATUS(from_json(to.private_key_, value));
-    }
-  }
-  {
-    TRY_RESULT(value, get_json_object_field(from, "source", JsonValue::Type::Null, true));
-    if (value.type() != JsonValue::Type::Null) {
-      TRY_STATUS(from_json(to.source_, value));
-    }
-  }
-  {
-    TRY_RESULT(value, get_json_object_field(from, "destination", JsonValue::Type::Null, true));
-    if (value.type() != JsonValue::Type::Null) {
-      TRY_STATUS(from_json(to.destination_, value));
-    }
-  }
-  {
-    TRY_RESULT(value, get_json_object_field(from, "amount", JsonValue::Type::Null, true));
-    if (value.type() != JsonValue::Type::Null) {
-      TRY_STATUS(from_json(to.amount_, value));
-    }
-  }
-  {
-    TRY_RESULT(value, get_json_object_field(from, "timeout", JsonValue::Type::Null, true));
-    if (value.type() != JsonValue::Type::Null) {
-      TRY_STATUS(from_json(to.timeout_, value));
-    }
-  }
-  {
-    TRY_RESULT(value, get_json_object_field(from, "allow_send_to_uninited", JsonValue::Type::Null, true));
-    if (value.type() != JsonValue::Type::Null) {
-      TRY_STATUS(from_json(to.allow_send_to_uninited_, value));
-    }
-  }
-  {
-    TRY_RESULT(value, get_json_object_field(from, "message", JsonValue::Type::Null, true));
-    if (value.type() != JsonValue::Type::Null) {
-      TRY_STATUS(from_json_bytes(to.message_, value));
+      TRY_STATUS(from_json(to.input_key_, value));
     }
   }
   return Status::OK();
 }
-Status from_json(tonlib_api::generic_getAccountState &to, JsonObject &from) {
+Status from_json(tonlib_api::getAccountAddress &to, JsonObject &from) {
+  {
+    TRY_RESULT(value, get_json_object_field(from, "initial_account_state", JsonValue::Type::Null, true));
+    if (value.type() != JsonValue::Type::Null) {
+      TRY_STATUS(from_json(to.initial_account_state_, value));
+    }
+  }
+  {
+    TRY_RESULT(value, get_json_object_field(from, "revision", JsonValue::Type::Null, true));
+    if (value.type() != JsonValue::Type::Null) {
+      TRY_STATUS(from_json(to.revision_, value));
+    }
+  }
+  return Status::OK();
+}
+Status from_json(tonlib_api::getAccountState &to, JsonObject &from) {
   {
     TRY_RESULT(value, get_json_object_field(from, "account_address", JsonValue::Type::Null, true));
     if (value.type() != JsonValue::Type::Null) {
@@ -1341,51 +1774,6 @@ Status from_json(tonlib_api::generic_getAccountState &to, JsonObject &from) {
   }
   return Status::OK();
 }
-Status from_json(tonlib_api::generic_sendGrams &to, JsonObject &from) {
-  {
-    TRY_RESULT(value, get_json_object_field(from, "private_key", JsonValue::Type::Null, true));
-    if (value.type() != JsonValue::Type::Null) {
-      TRY_STATUS(from_json(to.private_key_, value));
-    }
-  }
-  {
-    TRY_RESULT(value, get_json_object_field(from, "source", JsonValue::Type::Null, true));
-    if (value.type() != JsonValue::Type::Null) {
-      TRY_STATUS(from_json(to.source_, value));
-    }
-  }
-  {
-    TRY_RESULT(value, get_json_object_field(from, "destination", JsonValue::Type::Null, true));
-    if (value.type() != JsonValue::Type::Null) {
-      TRY_STATUS(from_json(to.destination_, value));
-    }
-  }
-  {
-    TRY_RESULT(value, get_json_object_field(from, "amount", JsonValue::Type::Null, true));
-    if (value.type() != JsonValue::Type::Null) {
-      TRY_STATUS(from_json(to.amount_, value));
-    }
-  }
-  {
-    TRY_RESULT(value, get_json_object_field(from, "timeout", JsonValue::Type::Null, true));
-    if (value.type() != JsonValue::Type::Null) {
-      TRY_STATUS(from_json(to.timeout_, value));
-    }
-  }
-  {
-    TRY_RESULT(value, get_json_object_field(from, "allow_send_to_uninited", JsonValue::Type::Null, true));
-    if (value.type() != JsonValue::Type::Null) {
-      TRY_STATUS(from_json(to.allow_send_to_uninited_, value));
-    }
-  }
-  {
-    TRY_RESULT(value, get_json_object_field(from, "message", JsonValue::Type::Null, true));
-    if (value.type() != JsonValue::Type::Null) {
-      TRY_STATUS(from_json_bytes(to.message_, value));
-    }
-  }
-  return Status::OK();
-}
 Status from_json(tonlib_api::getBip39Hints &to, JsonObject &from) {
   {
     TRY_RESULT(value, get_json_object_field(from, "prefix", JsonValue::Type::Null, true));
@@ -1413,6 +1801,15 @@ Status from_json(tonlib_api::getLogTags &to, JsonObject &from) {
 Status from_json(tonlib_api::getLogVerbosityLevel &to, JsonObject &from) {
   return Status::OK();
 }
+Status from_json(tonlib_api::guessAccountRevision &to, JsonObject &from) {
+  {
+    TRY_RESULT(value, get_json_object_field(from, "initial_account_state", JsonValue::Type::Null, true));
+    if (value.type() != JsonValue::Type::Null) {
+      TRY_STATUS(from_json(to.initial_account_state_, value));
+    }
+  }
+  return Status::OK();
+}
 Status from_json(tonlib_api::importEncryptedKey &to, JsonObject &from) {
   {
     TRY_RESULT(value, get_json_object_field(from, "local_password", JsonValue::Type::Null, true));
@@ -1476,6 +1873,21 @@ Status from_json(tonlib_api::importPemKey &to, JsonObject &from) {
   }
   return Status::OK();
 }
+Status from_json(tonlib_api::importUnencryptedKey &to, JsonObject &from) {
+  {
+    TRY_RESULT(value, get_json_object_field(from, "local_password", JsonValue::Type::Null, true));
+    if (value.type() != JsonValue::Type::Null) {
+      TRY_STATUS(from_json_bytes(to.local_password_, value));
+    }
+  }
+  {
+    TRY_RESULT(value, get_json_object_field(from, "exported_unencrypted_key", JsonValue::Type::Null, true));
+    if (value.type() != JsonValue::Type::Null) {
+      TRY_STATUS(from_json(to.exported_unencrypted_key_, value));
+    }
+  }
+  return Status::OK();
+}
 Status from_json(tonlib_api::init &to, JsonObject &from) {
   {
     TRY_RESULT(value, get_json_object_field(from, "options", JsonValue::Type::Null, true));
@@ -1509,6 +1921,21 @@ Status from_json(tonlib_api::kdf &to, JsonObject &from) {
 Status from_json(tonlib_api::liteServer_getInfo &to, JsonObject &from) {
   return Status::OK();
 }
+Status from_json(tonlib_api::msg_decrypt &to, JsonObject &from) {
+  {
+    TRY_RESULT(value, get_json_object_field(from, "input_key", JsonValue::Type::Null, true));
+    if (value.type() != JsonValue::Type::Null) {
+      TRY_STATUS(from_json(to.input_key_, value));
+    }
+  }
+  {
+    TRY_RESULT(value, get_json_object_field(from, "data", JsonValue::Type::Null, true));
+    if (value.type() != JsonValue::Type::Null) {
+      TRY_STATUS(from_json(to.data_, value));
+    }
+  }
+  return Status::OK();
+}
 Status from_json(tonlib_api::onLiteServerQueryError &to, JsonObject &from) {
   {
     TRY_RESULT(value, get_json_object_field(from, "id", JsonValue::Type::Null, true));
@@ -1656,15 +2083,6 @@ Status from_json(tonlib_api::raw_createQuery &to, JsonObject &from) {
   }
   return Status::OK();
 }
-Status from_json(tonlib_api::raw_getAccountAddress &to, JsonObject &from) {
-  {
-    TRY_RESULT(value, get_json_object_field(from, "initital_account_state", JsonValue::Type::Null, true));
-    if (value.type() != JsonValue::Type::Null) {
-      TRY_STATUS(from_json(to.initital_account_state_, value));
-    }
-  }
-  return Status::OK();
-}
 Status from_json(tonlib_api::raw_getAccountState &to, JsonObject &from) {
   {
     TRY_RESULT(value, get_json_object_field(from, "account_address", JsonValue::Type::Null, true));
@@ -1675,6 +2093,12 @@ Status from_json(tonlib_api::raw_getAccountState &to, JsonObject &from) {
   return Status::OK();
 }
 Status from_json(tonlib_api::raw_getTransactions &to, JsonObject &from) {
+  {
+    TRY_RESULT(value, get_json_object_field(from, "private_key", JsonValue::Type::Null, true));
+    if (value.type() != JsonValue::Type::Null) {
+      TRY_STATUS(from_json(to.private_key_, value));
+    }
+  }
   {
     TRY_RESULT(value, get_json_object_field(from, "account_address", JsonValue::Type::Null, true));
     if (value.type() != JsonValue::Type::Null) {
@@ -1800,99 +2224,6 @@ Status from_json(tonlib_api::smc_runGetMethod &to, JsonObject &from) {
 Status from_json(tonlib_api::sync &to, JsonObject &from) {
   return Status::OK();
 }
-Status from_json(tonlib_api::testGiver_getAccountAddress &to, JsonObject &from) {
-  return Status::OK();
-}
-Status from_json(tonlib_api::testGiver_getAccountState &to, JsonObject &from) {
-  return Status::OK();
-}
-Status from_json(tonlib_api::testGiver_sendGrams &to, JsonObject &from) {
-  {
-    TRY_RESULT(value, get_json_object_field(from, "destination", JsonValue::Type::Null, true));
-    if (value.type() != JsonValue::Type::Null) {
-      TRY_STATUS(from_json(to.destination_, value));
-    }
-  }
-  {
-    TRY_RESULT(value, get_json_object_field(from, "seqno", JsonValue::Type::Null, true));
-    if (value.type() != JsonValue::Type::Null) {
-      TRY_STATUS(from_json(to.seqno_, value));
-    }
-  }
-  {
-    TRY_RESULT(value, get_json_object_field(from, "amount", JsonValue::Type::Null, true));
-    if (value.type() != JsonValue::Type::Null) {
-      TRY_STATUS(from_json(to.amount_, value));
-    }
-  }
-  {
-    TRY_RESULT(value, get_json_object_field(from, "message", JsonValue::Type::Null, true));
-    if (value.type() != JsonValue::Type::Null) {
-      TRY_STATUS(from_json_bytes(to.message_, value));
-    }
-  }
-  return Status::OK();
-}
-Status from_json(tonlib_api::testWallet_getAccountAddress &to, JsonObject &from) {
-  {
-    TRY_RESULT(value, get_json_object_field(from, "initital_account_state", JsonValue::Type::Null, true));
-    if (value.type() != JsonValue::Type::Null) {
-      TRY_STATUS(from_json(to.initital_account_state_, value));
-    }
-  }
-  return Status::OK();
-}
-Status from_json(tonlib_api::testWallet_getAccountState &to, JsonObject &from) {
-  {
-    TRY_RESULT(value, get_json_object_field(from, "account_address", JsonValue::Type::Null, true));
-    if (value.type() != JsonValue::Type::Null) {
-      TRY_STATUS(from_json(to.account_address_, value));
-    }
-  }
-  return Status::OK();
-}
-Status from_json(tonlib_api::testWallet_init &to, JsonObject &from) {
-  {
-    TRY_RESULT(value, get_json_object_field(from, "private_key", JsonValue::Type::Null, true));
-    if (value.type() != JsonValue::Type::Null) {
-      TRY_STATUS(from_json(to.private_key_, value));
-    }
-  }
-  return Status::OK();
-}
-Status from_json(tonlib_api::testWallet_sendGrams &to, JsonObject &from) {
-  {
-    TRY_RESULT(value, get_json_object_field(from, "private_key", JsonValue::Type::Null, true));
-    if (value.type() != JsonValue::Type::Null) {
-      TRY_STATUS(from_json(to.private_key_, value));
-    }
-  }
-  {
-    TRY_RESULT(value, get_json_object_field(from, "destination", JsonValue::Type::Null, true));
-    if (value.type() != JsonValue::Type::Null) {
-      TRY_STATUS(from_json(to.destination_, value));
-    }
-  }
-  {
-    TRY_RESULT(value, get_json_object_field(from, "seqno", JsonValue::Type::Null, true));
-    if (value.type() != JsonValue::Type::Null) {
-      TRY_STATUS(from_json(to.seqno_, value));
-    }
-  }
-  {
-    TRY_RESULT(value, get_json_object_field(from, "amount", JsonValue::Type::Null, true));
-    if (value.type() != JsonValue::Type::Null) {
-      TRY_STATUS(from_json(to.amount_, value));
-    }
-  }
-  {
-    TRY_RESULT(value, get_json_object_field(from, "message", JsonValue::Type::Null, true));
-    if (value.type() != JsonValue::Type::Null) {
-      TRY_STATUS(from_json_bytes(to.message_, value));
-    }
-  }
-  return Status::OK();
-}
 Status from_json(tonlib_api::unpackAccountAddress &to, JsonObject &from) {
   {
     TRY_RESULT(value, get_json_object_field(from, "account_address", JsonValue::Type::Null, true));
@@ -1902,77 +2233,17 @@ Status from_json(tonlib_api::unpackAccountAddress &to, JsonObject &from) {
   }
   return Status::OK();
 }
-Status from_json(tonlib_api::wallet_getAccountAddress &to, JsonObject &from) {
+Status from_json(tonlib_api::withBlock &to, JsonObject &from) {
   {
-    TRY_RESULT(value, get_json_object_field(from, "initital_account_state", JsonValue::Type::Null, true));
+    TRY_RESULT(value, get_json_object_field(from, "id", JsonValue::Type::Null, true));
     if (value.type() != JsonValue::Type::Null) {
-      TRY_STATUS(from_json(to.initital_account_state_, value));
-    }
-  }
-  return Status::OK();
-}
-Status from_json(tonlib_api::wallet_getAccountState &to, JsonObject &from) {
-  {
-    TRY_RESULT(value, get_json_object_field(from, "account_address", JsonValue::Type::Null, true));
-    if (value.type() != JsonValue::Type::Null) {
-      TRY_STATUS(from_json(to.account_address_, value));
-    }
-  }
-  return Status::OK();
-}
-Status from_json(tonlib_api::wallet_init &to, JsonObject &from) {
-  {
-    TRY_RESULT(value, get_json_object_field(from, "private_key", JsonValue::Type::Null, true));
-    if (value.type() != JsonValue::Type::Null) {
-      TRY_STATUS(from_json(to.private_key_, value));
-    }
-  }
-  return Status::OK();
-}
-Status from_json(tonlib_api::wallet_sendGrams &to, JsonObject &from) {
-  {
-    TRY_RESULT(value, get_json_object_field(from, "private_key", JsonValue::Type::Null, true));
-    if (value.type() != JsonValue::Type::Null) {
-      TRY_STATUS(from_json(to.private_key_, value));
+      TRY_STATUS(from_json(to.id_, value));
     }
   }
   {
-    TRY_RESULT(value, get_json_object_field(from, "destination", JsonValue::Type::Null, true));
+    TRY_RESULT(value, get_json_object_field(from, "function", JsonValue::Type::Null, true));
     if (value.type() != JsonValue::Type::Null) {
-      TRY_STATUS(from_json(to.destination_, value));
-    }
-  }
-  {
-    TRY_RESULT(value, get_json_object_field(from, "seqno", JsonValue::Type::Null, true));
-    if (value.type() != JsonValue::Type::Null) {
-      TRY_STATUS(from_json(to.seqno_, value));
-    }
-  }
-  {
-    TRY_RESULT(value, get_json_object_field(from, "valid_until", JsonValue::Type::Null, true));
-    if (value.type() != JsonValue::Type::Null) {
-      TRY_STATUS(from_json(to.valid_until_, value));
-    }
-  }
-  {
-    TRY_RESULT(value, get_json_object_field(from, "amount", JsonValue::Type::Null, true));
-    if (value.type() != JsonValue::Type::Null) {
-      TRY_STATUS(from_json(to.amount_, value));
-    }
-  }
-  {
-    TRY_RESULT(value, get_json_object_field(from, "message", JsonValue::Type::Null, true));
-    if (value.type() != JsonValue::Type::Null) {
-      TRY_STATUS(from_json_bytes(to.message_, value));
-    }
-  }
-  return Status::OK();
-}
-Status from_json(tonlib_api::wallet_v3_getAccountAddress &to, JsonObject &from) {
-  {
-    TRY_RESULT(value, get_json_object_field(from, "initital_account_state", JsonValue::Type::Null, true));
-    if (value.type() != JsonValue::Type::Null) {
-      TRY_STATUS(from_json(to.initital_account_state_, value));
+      TRY_STATUS(from_json(to.function_, value));
     }
   }
   return Status::OK();
@@ -1982,6 +2253,86 @@ void to_json(JsonValueScope &jv, const tonlib_api::accountAddress &object) {
   jo << ctie("@type", "accountAddress");
   jo << ctie("account_address", ToJson(object.account_address_));
 }
+void to_json(JsonValueScope &jv, const tonlib_api::accountRevisionList &object) {
+  auto jo = jv.enter_object();
+  jo << ctie("@type", "accountRevisionList");
+  jo << ctie("revisions", ToJson(object.revisions_));
+}
+void to_json(JsonValueScope &jv, const tonlib_api::AccountState &object) {
+  tonlib_api::downcast_call(const_cast<tonlib_api::AccountState &>(object), [&jv](const auto &object) { to_json(jv, object); });
+}
+void to_json(JsonValueScope &jv, const tonlib_api::raw_accountState &object) {
+  auto jo = jv.enter_object();
+  jo << ctie("@type", "raw.accountState");
+  jo << ctie("code", ToJson(JsonBytes{object.code_}));
+  jo << ctie("data", ToJson(JsonBytes{object.data_}));
+  jo << ctie("frozen_hash", ToJson(JsonBytes{object.frozen_hash_}));
+}
+void to_json(JsonValueScope &jv, const tonlib_api::testWallet_accountState &object) {
+  auto jo = jv.enter_object();
+  jo << ctie("@type", "testWallet.accountState");
+  jo << ctie("seqno", ToJson(object.seqno_));
+}
+void to_json(JsonValueScope &jv, const tonlib_api::wallet_accountState &object) {
+  auto jo = jv.enter_object();
+  jo << ctie("@type", "wallet.accountState");
+  jo << ctie("seqno", ToJson(object.seqno_));
+}
+void to_json(JsonValueScope &jv, const tonlib_api::wallet_v3_accountState &object) {
+  auto jo = jv.enter_object();
+  jo << ctie("@type", "wallet.v3.accountState");
+  jo << ctie("wallet_id", ToJson(JsonInt64{object.wallet_id_}));
+  jo << ctie("seqno", ToJson(object.seqno_));
+}
+void to_json(JsonValueScope &jv, const tonlib_api::wallet_highload_v1_accountState &object) {
+  auto jo = jv.enter_object();
+  jo << ctie("@type", "wallet.highload.v1.accountState");
+  jo << ctie("wallet_id", ToJson(JsonInt64{object.wallet_id_}));
+  jo << ctie("seqno", ToJson(object.seqno_));
+}
+void to_json(JsonValueScope &jv, const tonlib_api::wallet_highload_v2_accountState &object) {
+  auto jo = jv.enter_object();
+  jo << ctie("@type", "wallet.highload.v2.accountState");
+  jo << ctie("wallet_id", ToJson(JsonInt64{object.wallet_id_}));
+}
+void to_json(JsonValueScope &jv, const tonlib_api::testGiver_accountState &object) {
+  auto jo = jv.enter_object();
+  jo << ctie("@type", "testGiver.accountState");
+  jo << ctie("seqno", ToJson(object.seqno_));
+}
+void to_json(JsonValueScope &jv, const tonlib_api::dns_accountState &object) {
+  auto jo = jv.enter_object();
+  jo << ctie("@type", "dns.accountState");
+  jo << ctie("wallet_id", ToJson(JsonInt64{object.wallet_id_}));
+}
+void to_json(JsonValueScope &jv, const tonlib_api::uninited_accountState &object) {
+  auto jo = jv.enter_object();
+  jo << ctie("@type", "uninited.accountState");
+  jo << ctie("frozen_hash", ToJson(JsonBytes{object.frozen_hash_}));
+}
+void to_json(JsonValueScope &jv, const tonlib_api::Action &object) {
+  tonlib_api::downcast_call(const_cast<tonlib_api::Action &>(object), [&jv](const auto &object) { to_json(jv, object); });
+}
+void to_json(JsonValueScope &jv, const tonlib_api::actionNoop &object) {
+  auto jo = jv.enter_object();
+  jo << ctie("@type", "actionNoop");
+}
+void to_json(JsonValueScope &jv, const tonlib_api::actionMsg &object) {
+  auto jo = jv.enter_object();
+  jo << ctie("@type", "actionMsg");
+  jo << ctie("messages", ToJson(object.messages_));
+  jo << ctie("allow_send_to_uninited", ToJson(object.allow_send_to_uninited_));
+}
+void to_json(JsonValueScope &jv, const tonlib_api::actionDns &object) {
+  auto jo = jv.enter_object();
+  jo << ctie("@type", "actionDns");
+  jo << ctie("actions", ToJson(object.actions_));
+}
+void to_json(JsonValueScope &jv, const tonlib_api::adnlAddress &object) {
+  auto jo = jv.enter_object();
+  jo << ctie("@type", "adnlAddress");
+  jo << ctie("adnl_address", ToJson(object.adnl_address_));
+}
 void to_json(JsonValueScope &jv, const tonlib_api::bip39Hints &object) {
   auto jo = jv.enter_object();
   jo << ctie("@type", "bip39Hints");
@@ -2021,6 +2372,11 @@ void to_json(JsonValueScope &jv, const tonlib_api::exportedPemKey &object) {
   jo << ctie("@type", "exportedPemKey");
   jo << ctie("pem", ToJson(object.pem_));
 }
+void to_json(JsonValueScope &jv, const tonlib_api::exportedUnencryptedKey &object) {
+  auto jo = jv.enter_object();
+  jo << ctie("@type", "exportedUnencryptedKey");
+  jo << ctie("data", ToJson(JsonBytes{object.data_}));
+}
 void to_json(JsonValueScope &jv, const tonlib_api::fees &object) {
   auto jo = jv.enter_object();
   jo << ctie("@type", "fees");
@@ -2029,6 +2385,68 @@ void to_json(JsonValueScope &jv, const tonlib_api::fees &object) {
   jo << ctie("gas_fee", ToJson(object.gas_fee_));
   jo << ctie("fwd_fee", ToJson(object.fwd_fee_));
 }
+void to_json(JsonValueScope &jv, const tonlib_api::fullAccountState &object) {
+  auto jo = jv.enter_object();
+  jo << ctie("@type", "fullAccountState");
+  jo << ctie("balance", ToJson(JsonInt64{object.balance_}));
+  if (object.last_transaction_id_) {
+    jo << ctie("last_transaction_id", ToJson(object.last_transaction_id_));
+  }
+  if (object.block_id_) {
+    jo << ctie("block_id", ToJson(object.block_id_));
+  }
+  jo << ctie("sync_utime", ToJson(object.sync_utime_));
+  if (object.account_state_) {
+    jo << ctie("account_state", ToJson(object.account_state_));
+  }
+}
+void to_json(JsonValueScope &jv, const tonlib_api::InitialAccountState &object) {
+  tonlib_api::downcast_call(const_cast<tonlib_api::InitialAccountState &>(object), [&jv](const auto &object) { to_json(jv, object); });
+}
+void to_json(JsonValueScope &jv, const tonlib_api::raw_initialAccountState &object) {
+  auto jo = jv.enter_object();
+  jo << ctie("@type", "raw.initialAccountState");
+  jo << ctie("code", ToJson(JsonBytes{object.code_}));
+  jo << ctie("data", ToJson(JsonBytes{object.data_}));
+}
+void to_json(JsonValueScope &jv, const tonlib_api::testGiver_initialAccountState &object) {
+  auto jo = jv.enter_object();
+  jo << ctie("@type", "testGiver.initialAccountState");
+}
+void to_json(JsonValueScope &jv, const tonlib_api::testWallet_initialAccountState &object) {
+  auto jo = jv.enter_object();
+  jo << ctie("@type", "testWallet.initialAccountState");
+  jo << ctie("public_key", ToJson(object.public_key_));
+}
+void to_json(JsonValueScope &jv, const tonlib_api::wallet_initialAccountState &object) {
+  auto jo = jv.enter_object();
+  jo << ctie("@type", "wallet.initialAccountState");
+  jo << ctie("public_key", ToJson(object.public_key_));
+}
+void to_json(JsonValueScope &jv, const tonlib_api::wallet_v3_initialAccountState &object) {
+  auto jo = jv.enter_object();
+  jo << ctie("@type", "wallet.v3.initialAccountState");
+  jo << ctie("public_key", ToJson(object.public_key_));
+  jo << ctie("wallet_id", ToJson(JsonInt64{object.wallet_id_}));
+}
+void to_json(JsonValueScope &jv, const tonlib_api::wallet_highload_v1_initialAccountState &object) {
+  auto jo = jv.enter_object();
+  jo << ctie("@type", "wallet.highload.v1.initialAccountState");
+  jo << ctie("public_key", ToJson(object.public_key_));
+  jo << ctie("wallet_id", ToJson(JsonInt64{object.wallet_id_}));
+}
+void to_json(JsonValueScope &jv, const tonlib_api::wallet_highload_v2_initialAccountState &object) {
+  auto jo = jv.enter_object();
+  jo << ctie("@type", "wallet.highload.v2.initialAccountState");
+  jo << ctie("public_key", ToJson(object.public_key_));
+  jo << ctie("wallet_id", ToJson(JsonInt64{object.wallet_id_}));
+}
+void to_json(JsonValueScope &jv, const tonlib_api::dns_initialAccountState &object) {
+  auto jo = jv.enter_object();
+  jo << ctie("@type", "dns.initialAccountState");
+  jo << ctie("public_key", ToJson(object.public_key_));
+  jo << ctie("wallet_id", ToJson(JsonInt64{object.wallet_id_}));
+}
 void to_json(JsonValueScope &jv, const tonlib_api::InputKey &object) {
   tonlib_api::downcast_call(const_cast<tonlib_api::InputKey &>(object), [&jv](const auto &object) { to_json(jv, object); });
 }
@@ -2103,12 +2521,6 @@ void to_json(JsonValueScope &jv, const tonlib_api::options &object) {
     jo << ctie("keystore_type", ToJson(object.keystore_type_));
   }
 }
-void to_json(JsonValueScope &jv, const tonlib_api::sendGramsResult &object) {
-  auto jo = jv.enter_object();
-  jo << ctie("@type", "sendGramsResult");
-  jo << ctie("sent_until", ToJson(object.sent_until_));
-  jo << ctie("body_hash", ToJson(JsonBytes{object.body_hash_}));
-}
 void to_json(JsonValueScope &jv, const tonlib_api::SyncState &object) {
   tonlib_api::downcast_call(const_cast<tonlib_api::SyncState &>(object), [&jv](const auto &object) { to_json(jv, object); });
 }
@@ -2147,50 +2559,80 @@ void to_json(JsonValueScope &jv, const tonlib_api::updateSyncState &object) {
     jo << ctie("sync_state", ToJson(object.sync_state_));
   }
 }
-void to_json(JsonValueScope &jv, const tonlib_api::generic_AccountState &object) {
-  tonlib_api::downcast_call(const_cast<tonlib_api::generic_AccountState &>(object), [&jv](const auto &object) { to_json(jv, object); });
+void to_json(JsonValueScope &jv, const tonlib_api::dns_Action &object) {
+  tonlib_api::downcast_call(const_cast<tonlib_api::dns_Action &>(object), [&jv](const auto &object) { to_json(jv, object); });
 }
-void to_json(JsonValueScope &jv, const tonlib_api::generic_accountStateRaw &object) {
+void to_json(JsonValueScope &jv, const tonlib_api::dns_actionDeleteAll &object) {
   auto jo = jv.enter_object();
-  jo << ctie("@type", "generic.accountStateRaw");
-  if (object.account_state_) {
-    jo << ctie("account_state", ToJson(object.account_state_));
+  jo << ctie("@type", "dns.actionDeleteAll");
+}
+void to_json(JsonValueScope &jv, const tonlib_api::dns_actionDelete &object) {
+  auto jo = jv.enter_object();
+  jo << ctie("@type", "dns.actionDelete");
+  jo << ctie("name", ToJson(object.name_));
+  jo << ctie("category", ToJson(object.category_));
+}
+void to_json(JsonValueScope &jv, const tonlib_api::dns_actionSet &object) {
+  auto jo = jv.enter_object();
+  jo << ctie("@type", "dns.actionSet");
+  if (object.entry_) {
+    jo << ctie("entry", ToJson(object.entry_));
   }
 }
-void to_json(JsonValueScope &jv, const tonlib_api::generic_accountStateTestWallet &object) {
+void to_json(JsonValueScope &jv, const tonlib_api::dns_entry &object) {
   auto jo = jv.enter_object();
-  jo << ctie("@type", "generic.accountStateTestWallet");
-  if (object.account_state_) {
-    jo << ctie("account_state", ToJson(object.account_state_));
+  jo << ctie("@type", "dns.entry");
+  jo << ctie("name", ToJson(object.name_));
+  jo << ctie("category", ToJson(object.category_));
+  if (object.entry_) {
+    jo << ctie("entry", ToJson(object.entry_));
   }
 }
-void to_json(JsonValueScope &jv, const tonlib_api::generic_accountStateWallet &object) {
+void to_json(JsonValueScope &jv, const tonlib_api::dns_EntryData &object) {
+  tonlib_api::downcast_call(const_cast<tonlib_api::dns_EntryData &>(object), [&jv](const auto &object) { to_json(jv, object); });
+}
+void to_json(JsonValueScope &jv, const tonlib_api::dns_entryDataUnknown &object) {
   auto jo = jv.enter_object();
-  jo << ctie("@type", "generic.accountStateWallet");
-  if (object.account_state_) {
-    jo << ctie("account_state", ToJson(object.account_state_));
+  jo << ctie("@type", "dns.entryDataUnknown");
+  jo << ctie("bytes", ToJson(JsonBytes{object.bytes_}));
+}
+void to_json(JsonValueScope &jv, const tonlib_api::dns_entryDataText &object) {
+  auto jo = jv.enter_object();
+  jo << ctie("@type", "dns.entryDataText");
+  jo << ctie("text", ToJson(object.text_));
+}
+void to_json(JsonValueScope &jv, const tonlib_api::dns_entryDataNextResolver &object) {
+  auto jo = jv.enter_object();
+  jo << ctie("@type", "dns.entryDataNextResolver");
+  if (object.resolver_) {
+    jo << ctie("resolver", ToJson(object.resolver_));
   }
 }
-void to_json(JsonValueScope &jv, const tonlib_api::generic_accountStateWalletV3 &object) {
+void to_json(JsonValueScope &jv, const tonlib_api::dns_entryDataSmcAddress &object) {
   auto jo = jv.enter_object();
-  jo << ctie("@type", "generic.accountStateWalletV3");
-  if (object.account_state_) {
-    jo << ctie("account_state", ToJson(object.account_state_));
+  jo << ctie("@type", "dns.entryDataSmcAddress");
+  if (object.smc_address_) {
+    jo << ctie("smc_address", ToJson(object.smc_address_));
   }
 }
-void to_json(JsonValueScope &jv, const tonlib_api::generic_accountStateTestGiver &object) {
+void to_json(JsonValueScope &jv, const tonlib_api::dns_entryDataAdnlAddress &object) {
   auto jo = jv.enter_object();
-  jo << ctie("@type", "generic.accountStateTestGiver");
-  if (object.account_state_) {
-    jo << ctie("account_state", ToJson(object.account_state_));
+  jo << ctie("@type", "dns.entryDataAdnlAddress");
+  if (object.adnl_address_) {
+    jo << ctie("adnl_address", ToJson(object.adnl_address_));
   }
 }
-void to_json(JsonValueScope &jv, const tonlib_api::generic_accountStateUninited &object) {
+void to_json(JsonValueScope &jv, const tonlib_api::dns_resolved &object) {
   auto jo = jv.enter_object();
-  jo << ctie("@type", "generic.accountStateUninited");
-  if (object.account_state_) {
-    jo << ctie("account_state", ToJson(object.account_state_));
-  }
+  jo << ctie("@type", "dns.resolved");
+  jo << ctie("entries", ToJson(object.entries_));
+}
+void to_json(JsonValueScope &jv, const tonlib_api::ton_blockId &object) {
+  auto jo = jv.enter_object();
+  jo << ctie("@type", "ton.blockId");
+  jo << ctie("workchain", ToJson(object.workchain_));
+  jo << ctie("shard", ToJson(JsonInt64{object.shard_}));
+  jo << ctie("seqno", ToJson(object.seqno_));
 }
 void to_json(JsonValueScope &jv, const tonlib_api::internal_transactionId &object) {
   auto jo = jv.enter_object();
@@ -2205,10 +2647,56 @@ void to_json(JsonValueScope &jv, const tonlib_api::liteServer_info &object) {
   jo << ctie("version", ToJson(object.version_));
   jo << ctie("capabilities", ToJson(JsonInt64{object.capabilities_}));
 }
+void to_json(JsonValueScope &jv, const tonlib_api::msg_Data &object) {
+  tonlib_api::downcast_call(const_cast<tonlib_api::msg_Data &>(object), [&jv](const auto &object) { to_json(jv, object); });
+}
+void to_json(JsonValueScope &jv, const tonlib_api::msg_dataRaw &object) {
+  auto jo = jv.enter_object();
+  jo << ctie("@type", "msg.dataRaw");
+  jo << ctie("body", ToJson(JsonBytes{object.body_}));
+}
+void to_json(JsonValueScope &jv, const tonlib_api::msg_dataText &object) {
+  auto jo = jv.enter_object();
+  jo << ctie("@type", "msg.dataText");
+  jo << ctie("text", ToJson(JsonBytes{object.text_}));
+}
+void to_json(JsonValueScope &jv, const tonlib_api::msg_dataDecryptedText &object) {
+  auto jo = jv.enter_object();
+  jo << ctie("@type", "msg.dataDecryptedText");
+  jo << ctie("text", ToJson(JsonBytes{object.text_}));
+}
+void to_json(JsonValueScope &jv, const tonlib_api::msg_dataEncryptedText &object) {
+  auto jo = jv.enter_object();
+  jo << ctie("@type", "msg.dataEncryptedText");
+  jo << ctie("text", ToJson(JsonBytes{object.text_}));
+}
+void to_json(JsonValueScope &jv, const tonlib_api::msg_dataArray &object) {
+  auto jo = jv.enter_object();
+  jo << ctie("@type", "msg.dataArray");
+  jo << ctie("elements", ToJson(object.elements_));
+}
+void to_json(JsonValueScope &jv, const tonlib_api::msg_message &object) {
+  auto jo = jv.enter_object();
+  jo << ctie("@type", "msg.message");
+  if (object.destination_) {
+    jo << ctie("destination", ToJson(object.destination_));
+  }
+  jo << ctie("amount", ToJson(JsonInt64{object.amount_}));
+  if (object.data_) {
+    jo << ctie("data", ToJson(object.data_));
+  }
+}
 void to_json(JsonValueScope &jv, const tonlib_api::options_configInfo &object) {
   auto jo = jv.enter_object();
   jo << ctie("@type", "options.configInfo");
-  jo << ctie("default_wallet_id", ToJson(object.default_wallet_id_));
+  jo << ctie("default_wallet_id", ToJson(JsonInt64{object.default_wallet_id_}));
+}
+void to_json(JsonValueScope &jv, const tonlib_api::options_info &object) {
+  auto jo = jv.enter_object();
+  jo << ctie("@type", "options.info");
+  if (object.config_info_) {
+    jo << ctie("config_info", ToJson(object.config_info_));
+  }
 }
 void to_json(JsonValueScope &jv, const tonlib_api::query_fees &object) {
   auto jo = jv.enter_object();
@@ -2216,9 +2704,7 @@ void to_json(JsonValueScope &jv, const tonlib_api::query_fees &object) {
   if (object.source_fees_) {
     jo << ctie("source_fees", ToJson(object.source_fees_));
   }
-  if (object.destination_fees_) {
-    jo << ctie("destination_fees", ToJson(object.destination_fees_));
-  }
+  jo << ctie("destination_fees", ToJson(object.destination_fees_));
 }
 void to_json(JsonValueScope &jv, const tonlib_api::query_info &object) {
   auto jo = jv.enter_object();
@@ -2227,24 +2713,21 @@ void to_json(JsonValueScope &jv, const tonlib_api::query_info &object) {
   jo << ctie("valid_until", ToJson(object.valid_until_));
   jo << ctie("body_hash", ToJson(JsonBytes{object.body_hash_}));
 }
-void to_json(JsonValueScope &jv, const tonlib_api::raw_accountState &object) {
+void to_json(JsonValueScope &jv, const tonlib_api::raw_fullAccountState &object) {
   auto jo = jv.enter_object();
-  jo << ctie("@type", "raw.accountState");
+  jo << ctie("@type", "raw.fullAccountState");
   jo << ctie("balance", ToJson(JsonInt64{object.balance_}));
   jo << ctie("code", ToJson(JsonBytes{object.code_}));
   jo << ctie("data", ToJson(JsonBytes{object.data_}));
   if (object.last_transaction_id_) {
     jo << ctie("last_transaction_id", ToJson(object.last_transaction_id_));
   }
+  if (object.block_id_) {
+    jo << ctie("block_id", ToJson(object.block_id_));
+  }
   jo << ctie("frozen_hash", ToJson(JsonBytes{object.frozen_hash_}));
   jo << ctie("sync_utime", ToJson(object.sync_utime_));
 }
-void to_json(JsonValueScope &jv, const tonlib_api::raw_initialAccountState &object) {
-  auto jo = jv.enter_object();
-  jo << ctie("@type", "raw.initialAccountState");
-  jo << ctie("code", ToJson(JsonBytes{object.code_}));
-  jo << ctie("data", ToJson(JsonBytes{object.data_}));
-}
 void to_json(JsonValueScope &jv, const tonlib_api::raw_message &object) {
   auto jo = jv.enter_object();
   jo << ctie("@type", "raw.message");
@@ -2255,7 +2738,9 @@ void to_json(JsonValueScope &jv, const tonlib_api::raw_message &object) {
   jo << ctie("ihr_fee", ToJson(JsonInt64{object.ihr_fee_}));
   jo << ctie("created_lt", ToJson(JsonInt64{object.created_lt_}));
   jo << ctie("body_hash", ToJson(JsonBytes{object.body_hash_}));
-  jo << ctie("message", ToJson(JsonBytes{object.message_}));
+  if (object.msg_data_) {
+    jo << ctie("msg_data", ToJson(object.msg_data_));
+  }
 }
 void to_json(JsonValueScope &jv, const tonlib_api::raw_transaction &object) {
   auto jo = jv.enter_object();
@@ -2306,35 +2791,24 @@ void to_json(JsonValueScope &jv, const tonlib_api::smc_runResult &object) {
   jo << ctie("stack", ToJson(object.stack_));
   jo << ctie("exit_code", ToJson(object.exit_code_));
 }
-void to_json(JsonValueScope &jv, const tonlib_api::testGiver_accountState &object) {
+void to_json(JsonValueScope &jv, const tonlib_api::ton_blockIdExt &object) {
   auto jo = jv.enter_object();
-  jo << ctie("@type", "testGiver.accountState");
-  jo << ctie("balance", ToJson(JsonInt64{object.balance_}));
+  jo << ctie("@type", "ton.blockIdExt");
+  jo << ctie("workchain", ToJson(object.workchain_));
+  jo << ctie("shard", ToJson(JsonInt64{object.shard_}));
   jo << ctie("seqno", ToJson(object.seqno_));
-  if (object.last_transaction_id_) {
-    jo << ctie("last_transaction_id", ToJson(object.last_transaction_id_));
-  }
-  jo << ctie("sync_utime", ToJson(object.sync_utime_));
-}
-void to_json(JsonValueScope &jv, const tonlib_api::testWallet_accountState &object) {
-  auto jo = jv.enter_object();
-  jo << ctie("@type", "testWallet.accountState");
-  jo << ctie("balance", ToJson(JsonInt64{object.balance_}));
-  jo << ctie("seqno", ToJson(object.seqno_));
-  if (object.last_transaction_id_) {
-    jo << ctie("last_transaction_id", ToJson(object.last_transaction_id_));
-  }
-  jo << ctie("sync_utime", ToJson(object.sync_utime_));
-}
-void to_json(JsonValueScope &jv, const tonlib_api::testWallet_initialAccountState &object) {
-  auto jo = jv.enter_object();
-  jo << ctie("@type", "testWallet.initialAccountState");
-  jo << ctie("public_key", ToJson(object.public_key_));
+  jo << ctie("root_hash", ToJson(JsonBytes{object.root_hash_}));
+  jo << ctie("file_hash", ToJson(JsonBytes{object.file_hash_}));
 }
 void to_json(JsonValueScope &jv, const tonlib_api::tvm_cell &object) {
   auto jo = jv.enter_object();
   jo << ctie("@type", "tvm.cell");
-  jo << ctie("bytes", ToJson(object.bytes_));
+  jo << ctie("bytes", ToJson(JsonBytes{object.bytes_}));
+}
+void to_json(JsonValueScope &jv, const tonlib_api::tvm_list &object) {
+  auto jo = jv.enter_object();
+  jo << ctie("@type", "tvm.list");
+  jo << ctie("elements", ToJson(object.elements_));
 }
 void to_json(JsonValueScope &jv, const tonlib_api::tvm_numberDecimal &object) {
   auto jo = jv.enter_object();
@@ -2344,7 +2818,7 @@ void to_json(JsonValueScope &jv, const tonlib_api::tvm_numberDecimal &object) {
 void to_json(JsonValueScope &jv, const tonlib_api::tvm_slice &object) {
   auto jo = jv.enter_object();
   jo << ctie("@type", "tvm.slice");
-  jo << ctie("bytes", ToJson(object.bytes_));
+  jo << ctie("bytes", ToJson(JsonBytes{object.bytes_}));
 }
 void to_json(JsonValueScope &jv, const tonlib_api::tvm_StackEntry &object) {
   tonlib_api::downcast_call(const_cast<tonlib_api::tvm_StackEntry &>(object), [&jv](const auto &object) { to_json(jv, object); });
@@ -2370,51 +2844,28 @@ void to_json(JsonValueScope &jv, const tonlib_api::tvm_stackEntryNumber &object)
     jo << ctie("number", ToJson(object.number_));
   }
 }
+void to_json(JsonValueScope &jv, const tonlib_api::tvm_stackEntryTuple &object) {
+  auto jo = jv.enter_object();
+  jo << ctie("@type", "tvm.stackEntryTuple");
+  if (object.tuple_) {
+    jo << ctie("tuple", ToJson(object.tuple_));
+  }
+}
+void to_json(JsonValueScope &jv, const tonlib_api::tvm_stackEntryList &object) {
+  auto jo = jv.enter_object();
+  jo << ctie("@type", "tvm.stackEntryList");
+  if (object.list_) {
+    jo << ctie("list", ToJson(object.list_));
+  }
+}
 void to_json(JsonValueScope &jv, const tonlib_api::tvm_stackEntryUnsupported &object) {
   auto jo = jv.enter_object();
   jo << ctie("@type", "tvm.stackEntryUnsupported");
 }
-void to_json(JsonValueScope &jv, const tonlib_api::uninited_accountState &object) {
+void to_json(JsonValueScope &jv, const tonlib_api::tvm_tuple &object) {
   auto jo = jv.enter_object();
-  jo << ctie("@type", "uninited.accountState");
-  jo << ctie("balance", ToJson(JsonInt64{object.balance_}));
-  if (object.last_transaction_id_) {
-    jo << ctie("last_transaction_id", ToJson(object.last_transaction_id_));
-  }
-  jo << ctie("frozen_hash", ToJson(JsonBytes{object.frozen_hash_}));
-  jo << ctie("sync_utime", ToJson(object.sync_utime_));
-}
-void to_json(JsonValueScope &jv, const tonlib_api::wallet_accountState &object) {
-  auto jo = jv.enter_object();
-  jo << ctie("@type", "wallet.accountState");
-  jo << ctie("balance", ToJson(JsonInt64{object.balance_}));
-  jo << ctie("seqno", ToJson(object.seqno_));
-  if (object.last_transaction_id_) {
-    jo << ctie("last_transaction_id", ToJson(object.last_transaction_id_));
-  }
-  jo << ctie("sync_utime", ToJson(object.sync_utime_));
-}
-void to_json(JsonValueScope &jv, const tonlib_api::wallet_initialAccountState &object) {
-  auto jo = jv.enter_object();
-  jo << ctie("@type", "wallet.initialAccountState");
-  jo << ctie("public_key", ToJson(object.public_key_));
-}
-void to_json(JsonValueScope &jv, const tonlib_api::wallet_v3_accountState &object) {
-  auto jo = jv.enter_object();
-  jo << ctie("@type", "wallet.v3.accountState");
-  jo << ctie("balance", ToJson(JsonInt64{object.balance_}));
-  jo << ctie("wallet_id", ToJson(object.wallet_id_));
-  jo << ctie("seqno", ToJson(object.seqno_));
-  if (object.last_transaction_id_) {
-    jo << ctie("last_transaction_id", ToJson(object.last_transaction_id_));
-  }
-  jo << ctie("sync_utime", ToJson(object.sync_utime_));
-}
-void to_json(JsonValueScope &jv, const tonlib_api::wallet_v3_initialAccountState &object) {
-  auto jo = jv.enter_object();
-  jo << ctie("@type", "wallet.v3.initialAccountState");
-  jo << ctie("public_key", ToJson(object.public_key_));
-  jo << ctie("wallet_id", ToJson(object.wallet_id_));
+  jo << ctie("@type", "tvm.tuple");
+  jo << ctie("elements", ToJson(object.elements_));
 }
 void to_json(JsonValueScope &jv, const tonlib_api::addLogMessage &object) {
   auto jo = jv.enter_object();
@@ -2441,6 +2892,20 @@ void to_json(JsonValueScope &jv, const tonlib_api::createNewKey &object) {
   jo << ctie("mnemonic_password", ToJson(JsonBytes{object.mnemonic_password_}));
   jo << ctie("random_extra_seed", ToJson(JsonBytes{object.random_extra_seed_}));
 }
+void to_json(JsonValueScope &jv, const tonlib_api::createQuery &object) {
+  auto jo = jv.enter_object();
+  jo << ctie("@type", "createQuery");
+  if (object.private_key_) {
+    jo << ctie("private_key", ToJson(object.private_key_));
+  }
+  if (object.address_) {
+    jo << ctie("address", ToJson(object.address_));
+  }
+  jo << ctie("timeout", ToJson(object.timeout_));
+  if (object.action_) {
+    jo << ctie("action", ToJson(object.action_));
+  }
+}
 void to_json(JsonValueScope &jv, const tonlib_api::decrypt &object) {
   auto jo = jv.enter_object();
   jo << ctie("@type", "decrypt");
@@ -2458,6 +2923,16 @@ void to_json(JsonValueScope &jv, const tonlib_api::deleteKey &object) {
     jo << ctie("key", ToJson(object.key_));
   }
 }
+void to_json(JsonValueScope &jv, const tonlib_api::dns_resolve &object) {
+  auto jo = jv.enter_object();
+  jo << ctie("@type", "dns.resolve");
+  if (object.account_address_) {
+    jo << ctie("account_address", ToJson(object.account_address_));
+  }
+  jo << ctie("name", ToJson(object.name_));
+  jo << ctie("category", ToJson(object.category_));
+  jo << ctie("ttl", ToJson(object.ttl_));
+}
 void to_json(JsonValueScope &jv, const tonlib_api::encrypt &object) {
   auto jo = jv.enter_object();
   jo << ctie("@type", "encrypt");
@@ -2487,47 +2962,28 @@ void to_json(JsonValueScope &jv, const tonlib_api::exportPemKey &object) {
   }
   jo << ctie("key_password", ToJson(JsonBytes{object.key_password_}));
 }
-void to_json(JsonValueScope &jv, const tonlib_api::generic_createSendGramsQuery &object) {
+void to_json(JsonValueScope &jv, const tonlib_api::exportUnencryptedKey &object) {
   auto jo = jv.enter_object();
-  jo << ctie("@type", "generic.createSendGramsQuery");
-  if (object.private_key_) {
-    jo << ctie("private_key", ToJson(object.private_key_));
+  jo << ctie("@type", "exportUnencryptedKey");
+  if (object.input_key_) {
+    jo << ctie("input_key", ToJson(object.input_key_));
   }
-  if (object.source_) {
-    jo << ctie("source", ToJson(object.source_));
-  }
-  if (object.destination_) {
-    jo << ctie("destination", ToJson(object.destination_));
-  }
-  jo << ctie("amount", ToJson(JsonInt64{object.amount_}));
-  jo << ctie("timeout", ToJson(object.timeout_));
-  jo << ctie("allow_send_to_uninited", ToJson(object.allow_send_to_uninited_));
-  jo << ctie("message", ToJson(JsonBytes{object.message_}));
 }
-void to_json(JsonValueScope &jv, const tonlib_api::generic_getAccountState &object) {
+void to_json(JsonValueScope &jv, const tonlib_api::getAccountAddress &object) {
   auto jo = jv.enter_object();
-  jo << ctie("@type", "generic.getAccountState");
+  jo << ctie("@type", "getAccountAddress");
+  if (object.initial_account_state_) {
+    jo << ctie("initial_account_state", ToJson(object.initial_account_state_));
+  }
+  jo << ctie("revision", ToJson(object.revision_));
+}
+void to_json(JsonValueScope &jv, const tonlib_api::getAccountState &object) {
+  auto jo = jv.enter_object();
+  jo << ctie("@type", "getAccountState");
   if (object.account_address_) {
     jo << ctie("account_address", ToJson(object.account_address_));
   }
 }
-void to_json(JsonValueScope &jv, const tonlib_api::generic_sendGrams &object) {
-  auto jo = jv.enter_object();
-  jo << ctie("@type", "generic.sendGrams");
-  if (object.private_key_) {
-    jo << ctie("private_key", ToJson(object.private_key_));
-  }
-  if (object.source_) {
-    jo << ctie("source", ToJson(object.source_));
-  }
-  if (object.destination_) {
-    jo << ctie("destination", ToJson(object.destination_));
-  }
-  jo << ctie("amount", ToJson(JsonInt64{object.amount_}));
-  jo << ctie("timeout", ToJson(object.timeout_));
-  jo << ctie("allow_send_to_uninited", ToJson(object.allow_send_to_uninited_));
-  jo << ctie("message", ToJson(JsonBytes{object.message_}));
-}
 void to_json(JsonValueScope &jv, const tonlib_api::getBip39Hints &object) {
   auto jo = jv.enter_object();
   jo << ctie("@type", "getBip39Hints");
@@ -2550,6 +3006,13 @@ void to_json(JsonValueScope &jv, const tonlib_api::getLogVerbosityLevel &object)
   auto jo = jv.enter_object();
   jo << ctie("@type", "getLogVerbosityLevel");
 }
+void to_json(JsonValueScope &jv, const tonlib_api::guessAccountRevision &object) {
+  auto jo = jv.enter_object();
+  jo << ctie("@type", "guessAccountRevision");
+  if (object.initial_account_state_) {
+    jo << ctie("initial_account_state", ToJson(object.initial_account_state_));
+  }
+}
 void to_json(JsonValueScope &jv, const tonlib_api::importEncryptedKey &object) {
   auto jo = jv.enter_object();
   jo << ctie("@type", "importEncryptedKey");
@@ -2577,6 +3040,14 @@ void to_json(JsonValueScope &jv, const tonlib_api::importPemKey &object) {
     jo << ctie("exported_key", ToJson(object.exported_key_));
   }
 }
+void to_json(JsonValueScope &jv, const tonlib_api::importUnencryptedKey &object) {
+  auto jo = jv.enter_object();
+  jo << ctie("@type", "importUnencryptedKey");
+  jo << ctie("local_password", ToJson(JsonBytes{object.local_password_}));
+  if (object.exported_unencrypted_key_) {
+    jo << ctie("exported_unencrypted_key", ToJson(object.exported_unencrypted_key_));
+  }
+}
 void to_json(JsonValueScope &jv, const tonlib_api::init &object) {
   auto jo = jv.enter_object();
   jo << ctie("@type", "init");
@@ -2595,6 +3066,16 @@ void to_json(JsonValueScope &jv, const tonlib_api::liteServer_getInfo &object) {
   auto jo = jv.enter_object();
   jo << ctie("@type", "liteServer.getInfo");
 }
+void to_json(JsonValueScope &jv, const tonlib_api::msg_decrypt &object) {
+  auto jo = jv.enter_object();
+  jo << ctie("@type", "msg.decrypt");
+  if (object.input_key_) {
+    jo << ctie("input_key", ToJson(object.input_key_));
+  }
+  if (object.data_) {
+    jo << ctie("data", ToJson(object.data_));
+  }
+}
 void to_json(JsonValueScope &jv, const tonlib_api::onLiteServerQueryError &object) {
   auto jo = jv.enter_object();
   jo << ctie("@type", "onLiteServerQueryError");
@@ -2670,13 +3151,6 @@ void to_json(JsonValueScope &jv, const tonlib_api::raw_createQuery &object) {
   jo << ctie("init_data", ToJson(JsonBytes{object.init_data_}));
   jo << ctie("body", ToJson(JsonBytes{object.body_}));
 }
-void to_json(JsonValueScope &jv, const tonlib_api::raw_getAccountAddress &object) {
-  auto jo = jv.enter_object();
-  jo << ctie("@type", "raw.getAccountAddress");
-  if (object.initital_account_state_) {
-    jo << ctie("initital_account_state", ToJson(object.initital_account_state_));
-  }
-}
 void to_json(JsonValueScope &jv, const tonlib_api::raw_getAccountState &object) {
   auto jo = jv.enter_object();
   jo << ctie("@type", "raw.getAccountState");
@@ -2687,6 +3161,9 @@ void to_json(JsonValueScope &jv, const tonlib_api::raw_getAccountState &object)
 void to_json(JsonValueScope &jv, const tonlib_api::raw_getTransactions &object) {
   auto jo = jv.enter_object();
   jo << ctie("@type", "raw.getTransactions");
+  if (object.private_key_) {
+    jo << ctie("private_key", ToJson(object.private_key_));
+  }
   if (object.account_address_) {
     jo << ctie("account_address", ToJson(object.account_address_));
   }
@@ -2757,104 +3234,18 @@ void to_json(JsonValueScope &jv, const tonlib_api::sync &object) {
   auto jo = jv.enter_object();
   jo << ctie("@type", "sync");
 }
-void to_json(JsonValueScope &jv, const tonlib_api::testGiver_getAccountAddress &object) {
-  auto jo = jv.enter_object();
-  jo << ctie("@type", "testGiver.getAccountAddress");
-}
-void to_json(JsonValueScope &jv, const tonlib_api::testGiver_getAccountState &object) {
-  auto jo = jv.enter_object();
-  jo << ctie("@type", "testGiver.getAccountState");
-}
-void to_json(JsonValueScope &jv, const tonlib_api::testGiver_sendGrams &object) {
-  auto jo = jv.enter_object();
-  jo << ctie("@type", "testGiver.sendGrams");
-  if (object.destination_) {
-    jo << ctie("destination", ToJson(object.destination_));
-  }
-  jo << ctie("seqno", ToJson(object.seqno_));
-  jo << ctie("amount", ToJson(JsonInt64{object.amount_}));
-  jo << ctie("message", ToJson(JsonBytes{object.message_}));
-}
-void to_json(JsonValueScope &jv, const tonlib_api::testWallet_getAccountAddress &object) {
-  auto jo = jv.enter_object();
-  jo << ctie("@type", "testWallet.getAccountAddress");
-  if (object.initital_account_state_) {
-    jo << ctie("initital_account_state", ToJson(object.initital_account_state_));
-  }
-}
-void to_json(JsonValueScope &jv, const tonlib_api::testWallet_getAccountState &object) {
-  auto jo = jv.enter_object();
-  jo << ctie("@type", "testWallet.getAccountState");
-  if (object.account_address_) {
-    jo << ctie("account_address", ToJson(object.account_address_));
-  }
-}
-void to_json(JsonValueScope &jv, const tonlib_api::testWallet_init &object) {
-  auto jo = jv.enter_object();
-  jo << ctie("@type", "testWallet.init");
-  if (object.private_key_) {
-    jo << ctie("private_key", ToJson(object.private_key_));
-  }
-}
-void to_json(JsonValueScope &jv, const tonlib_api::testWallet_sendGrams &object) {
-  auto jo = jv.enter_object();
-  jo << ctie("@type", "testWallet.sendGrams");
-  if (object.private_key_) {
-    jo << ctie("private_key", ToJson(object.private_key_));
-  }
-  if (object.destination_) {
-    jo << ctie("destination", ToJson(object.destination_));
-  }
-  jo << ctie("seqno", ToJson(object.seqno_));
-  jo << ctie("amount", ToJson(JsonInt64{object.amount_}));
-  jo << ctie("message", ToJson(JsonBytes{object.message_}));
-}
 void to_json(JsonValueScope &jv, const tonlib_api::unpackAccountAddress &object) {
   auto jo = jv.enter_object();
   jo << ctie("@type", "unpackAccountAddress");
   jo << ctie("account_address", ToJson(object.account_address_));
 }
-void to_json(JsonValueScope &jv, const tonlib_api::wallet_getAccountAddress &object) {
+void to_json(JsonValueScope &jv, const tonlib_api::withBlock &object) {
   auto jo = jv.enter_object();
-  jo << ctie("@type", "wallet.getAccountAddress");
-  if (object.initital_account_state_) {
-    jo << ctie("initital_account_state", ToJson(object.initital_account_state_));
-  }
-}
-void to_json(JsonValueScope &jv, const tonlib_api::wallet_getAccountState &object) {
-  auto jo = jv.enter_object();
-  jo << ctie("@type", "wallet.getAccountState");
-  if (object.account_address_) {
-    jo << ctie("account_address", ToJson(object.account_address_));
-  }
-}
-void to_json(JsonValueScope &jv, const tonlib_api::wallet_init &object) {
-  auto jo = jv.enter_object();
-  jo << ctie("@type", "wallet.init");
-  if (object.private_key_) {
-    jo << ctie("private_key", ToJson(object.private_key_));
-  }
-}
-void to_json(JsonValueScope &jv, const tonlib_api::wallet_sendGrams &object) {
-  auto jo = jv.enter_object();
-  jo << ctie("@type", "wallet.sendGrams");
-  if (object.private_key_) {
-    jo << ctie("private_key", ToJson(object.private_key_));
-  }
-  if (object.destination_) {
-    jo << ctie("destination", ToJson(object.destination_));
-  }
-  jo << ctie("seqno", ToJson(object.seqno_));
-  jo << ctie("valid_until", ToJson(object.valid_until_));
-  jo << ctie("amount", ToJson(JsonInt64{object.amount_}));
-  jo << ctie("message", ToJson(JsonBytes{object.message_}));
-}
-void to_json(JsonValueScope &jv, const tonlib_api::wallet_v3_getAccountAddress &object) {
-  auto jo = jv.enter_object();
-  jo << ctie("@type", "wallet.v3.getAccountAddress");
-  if (object.initital_account_state_) {
-    jo << ctie("initital_account_state", ToJson(object.initital_account_state_));
+  jo << ctie("@type", "withBlock");
+  if (object.id_) {
+    jo << ctie("id", ToJson(object.id_));
   }
+  jo << ctie("function", ToJson(object.function_));
 }
 }  // namespace tonlib_api
 }  // namespace ton
diff --git a/submodules/ton/tonlib-src/tl/generate/auto/tl/tonlib_api_json.h b/submodules/ton/tonlib-src/tl/generate/auto/tl/tonlib_api_json.h
index d57816d82e..4c1c430fc7 100644
--- a/submodules/ton/tonlib-src/tl/generate/auto/tl/tonlib_api_json.h
+++ b/submodules/ton/tonlib-src/tl/generate/auto/tl/tonlib_api_json.h
@@ -11,17 +11,36 @@
 namespace ton {
 namespace tonlib_api{
   using namespace td;
+Result<int32> tl_constructor_from_string(tonlib_api::AccountState *object, const std::string &str);
+Result<int32> tl_constructor_from_string(tonlib_api::Action *object, const std::string &str);
+Result<int32> tl_constructor_from_string(tonlib_api::InitialAccountState *object, const std::string &str);
 Result<int32> tl_constructor_from_string(tonlib_api::InputKey *object, const std::string &str);
 Result<int32> tl_constructor_from_string(tonlib_api::KeyStoreType *object, const std::string &str);
 Result<int32> tl_constructor_from_string(tonlib_api::LogStream *object, const std::string &str);
 Result<int32> tl_constructor_from_string(tonlib_api::SyncState *object, const std::string &str);
 Result<int32> tl_constructor_from_string(tonlib_api::Update *object, const std::string &str);
-Result<int32> tl_constructor_from_string(tonlib_api::generic_AccountState *object, const std::string &str);
+Result<int32> tl_constructor_from_string(tonlib_api::dns_Action *object, const std::string &str);
+Result<int32> tl_constructor_from_string(tonlib_api::dns_EntryData *object, const std::string &str);
+Result<int32> tl_constructor_from_string(tonlib_api::msg_Data *object, const std::string &str);
 Result<int32> tl_constructor_from_string(tonlib_api::smc_MethodId *object, const std::string &str);
 Result<int32> tl_constructor_from_string(tonlib_api::tvm_StackEntry *object, const std::string &str);
 Result<int32> tl_constructor_from_string(tonlib_api::Object *object, const std::string &str);
 Result<int32> tl_constructor_from_string(tonlib_api::Function *object, const std::string &str);
 Status from_json(tonlib_api::accountAddress &to, JsonObject &from);
+Status from_json(tonlib_api::accountRevisionList &to, JsonObject &from);
+Status from_json(tonlib_api::raw_accountState &to, JsonObject &from);
+Status from_json(tonlib_api::testWallet_accountState &to, JsonObject &from);
+Status from_json(tonlib_api::wallet_accountState &to, JsonObject &from);
+Status from_json(tonlib_api::wallet_v3_accountState &to, JsonObject &from);
+Status from_json(tonlib_api::wallet_highload_v1_accountState &to, JsonObject &from);
+Status from_json(tonlib_api::wallet_highload_v2_accountState &to, JsonObject &from);
+Status from_json(tonlib_api::testGiver_accountState &to, JsonObject &from);
+Status from_json(tonlib_api::dns_accountState &to, JsonObject &from);
+Status from_json(tonlib_api::uninited_accountState &to, JsonObject &from);
+Status from_json(tonlib_api::actionNoop &to, JsonObject &from);
+Status from_json(tonlib_api::actionMsg &to, JsonObject &from);
+Status from_json(tonlib_api::actionDns &to, JsonObject &from);
+Status from_json(tonlib_api::adnlAddress &to, JsonObject &from);
 Status from_json(tonlib_api::bip39Hints &to, JsonObject &from);
 Status from_json(tonlib_api::config &to, JsonObject &from);
 Status from_json(tonlib_api::data &to, JsonObject &from);
@@ -29,7 +48,17 @@ Status from_json(tonlib_api::error &to, JsonObject &from);
 Status from_json(tonlib_api::exportedEncryptedKey &to, JsonObject &from);
 Status from_json(tonlib_api::exportedKey &to, JsonObject &from);
 Status from_json(tonlib_api::exportedPemKey &to, JsonObject &from);
+Status from_json(tonlib_api::exportedUnencryptedKey &to, JsonObject &from);
 Status from_json(tonlib_api::fees &to, JsonObject &from);
+Status from_json(tonlib_api::fullAccountState &to, JsonObject &from);
+Status from_json(tonlib_api::raw_initialAccountState &to, JsonObject &from);
+Status from_json(tonlib_api::testGiver_initialAccountState &to, JsonObject &from);
+Status from_json(tonlib_api::testWallet_initialAccountState &to, JsonObject &from);
+Status from_json(tonlib_api::wallet_initialAccountState &to, JsonObject &from);
+Status from_json(tonlib_api::wallet_v3_initialAccountState &to, JsonObject &from);
+Status from_json(tonlib_api::wallet_highload_v1_initialAccountState &to, JsonObject &from);
+Status from_json(tonlib_api::wallet_highload_v2_initialAccountState &to, JsonObject &from);
+Status from_json(tonlib_api::dns_initialAccountState &to, JsonObject &from);
 Status from_json(tonlib_api::inputKeyRegular &to, JsonObject &from);
 Status from_json(tonlib_api::inputKeyFake &to, JsonObject &from);
 Status from_json(tonlib_api::key &to, JsonObject &from);
@@ -42,25 +71,35 @@ Status from_json(tonlib_api::logTags &to, JsonObject &from);
 Status from_json(tonlib_api::logVerbosityLevel &to, JsonObject &from);
 Status from_json(tonlib_api::ok &to, JsonObject &from);
 Status from_json(tonlib_api::options &to, JsonObject &from);
-Status from_json(tonlib_api::sendGramsResult &to, JsonObject &from);
 Status from_json(tonlib_api::syncStateDone &to, JsonObject &from);
 Status from_json(tonlib_api::syncStateInProgress &to, JsonObject &from);
 Status from_json(tonlib_api::unpackedAccountAddress &to, JsonObject &from);
 Status from_json(tonlib_api::updateSendLiteServerQuery &to, JsonObject &from);
 Status from_json(tonlib_api::updateSyncState &to, JsonObject &from);
-Status from_json(tonlib_api::generic_accountStateRaw &to, JsonObject &from);
-Status from_json(tonlib_api::generic_accountStateTestWallet &to, JsonObject &from);
-Status from_json(tonlib_api::generic_accountStateWallet &to, JsonObject &from);
-Status from_json(tonlib_api::generic_accountStateWalletV3 &to, JsonObject &from);
-Status from_json(tonlib_api::generic_accountStateTestGiver &to, JsonObject &from);
-Status from_json(tonlib_api::generic_accountStateUninited &to, JsonObject &from);
+Status from_json(tonlib_api::dns_actionDeleteAll &to, JsonObject &from);
+Status from_json(tonlib_api::dns_actionDelete &to, JsonObject &from);
+Status from_json(tonlib_api::dns_actionSet &to, JsonObject &from);
+Status from_json(tonlib_api::dns_entry &to, JsonObject &from);
+Status from_json(tonlib_api::dns_entryDataUnknown &to, JsonObject &from);
+Status from_json(tonlib_api::dns_entryDataText &to, JsonObject &from);
+Status from_json(tonlib_api::dns_entryDataNextResolver &to, JsonObject &from);
+Status from_json(tonlib_api::dns_entryDataSmcAddress &to, JsonObject &from);
+Status from_json(tonlib_api::dns_entryDataAdnlAddress &to, JsonObject &from);
+Status from_json(tonlib_api::dns_resolved &to, JsonObject &from);
+Status from_json(tonlib_api::ton_blockId &to, JsonObject &from);
 Status from_json(tonlib_api::internal_transactionId &to, JsonObject &from);
 Status from_json(tonlib_api::liteServer_info &to, JsonObject &from);
+Status from_json(tonlib_api::msg_dataRaw &to, JsonObject &from);
+Status from_json(tonlib_api::msg_dataText &to, JsonObject &from);
+Status from_json(tonlib_api::msg_dataDecryptedText &to, JsonObject &from);
+Status from_json(tonlib_api::msg_dataEncryptedText &to, JsonObject &from);
+Status from_json(tonlib_api::msg_dataArray &to, JsonObject &from);
+Status from_json(tonlib_api::msg_message &to, JsonObject &from);
 Status from_json(tonlib_api::options_configInfo &to, JsonObject &from);
+Status from_json(tonlib_api::options_info &to, JsonObject &from);
 Status from_json(tonlib_api::query_fees &to, JsonObject &from);
 Status from_json(tonlib_api::query_info &to, JsonObject &from);
-Status from_json(tonlib_api::raw_accountState &to, JsonObject &from);
-Status from_json(tonlib_api::raw_initialAccountState &to, JsonObject &from);
+Status from_json(tonlib_api::raw_fullAccountState &to, JsonObject &from);
 Status from_json(tonlib_api::raw_message &to, JsonObject &from);
 Status from_json(tonlib_api::raw_transaction &to, JsonObject &from);
 Status from_json(tonlib_api::raw_transactions &to, JsonObject &from);
@@ -68,46 +107,48 @@ Status from_json(tonlib_api::smc_info &to, JsonObject &from);
 Status from_json(tonlib_api::smc_methodIdNumber &to, JsonObject &from);
 Status from_json(tonlib_api::smc_methodIdName &to, JsonObject &from);
 Status from_json(tonlib_api::smc_runResult &to, JsonObject &from);
-Status from_json(tonlib_api::testGiver_accountState &to, JsonObject &from);
-Status from_json(tonlib_api::testWallet_accountState &to, JsonObject &from);
-Status from_json(tonlib_api::testWallet_initialAccountState &to, JsonObject &from);
+Status from_json(tonlib_api::ton_blockIdExt &to, JsonObject &from);
 Status from_json(tonlib_api::tvm_cell &to, JsonObject &from);
+Status from_json(tonlib_api::tvm_list &to, JsonObject &from);
 Status from_json(tonlib_api::tvm_numberDecimal &to, JsonObject &from);
 Status from_json(tonlib_api::tvm_slice &to, JsonObject &from);
 Status from_json(tonlib_api::tvm_stackEntrySlice &to, JsonObject &from);
 Status from_json(tonlib_api::tvm_stackEntryCell &to, JsonObject &from);
 Status from_json(tonlib_api::tvm_stackEntryNumber &to, JsonObject &from);
+Status from_json(tonlib_api::tvm_stackEntryTuple &to, JsonObject &from);
+Status from_json(tonlib_api::tvm_stackEntryList &to, JsonObject &from);
 Status from_json(tonlib_api::tvm_stackEntryUnsupported &to, JsonObject &from);
-Status from_json(tonlib_api::uninited_accountState &to, JsonObject &from);
-Status from_json(tonlib_api::wallet_accountState &to, JsonObject &from);
-Status from_json(tonlib_api::wallet_initialAccountState &to, JsonObject &from);
-Status from_json(tonlib_api::wallet_v3_accountState &to, JsonObject &from);
-Status from_json(tonlib_api::wallet_v3_initialAccountState &to, JsonObject &from);
+Status from_json(tonlib_api::tvm_tuple &to, JsonObject &from);
 Status from_json(tonlib_api::addLogMessage &to, JsonObject &from);
 Status from_json(tonlib_api::changeLocalPassword &to, JsonObject &from);
 Status from_json(tonlib_api::close &to, JsonObject &from);
 Status from_json(tonlib_api::createNewKey &to, JsonObject &from);
+Status from_json(tonlib_api::createQuery &to, JsonObject &from);
 Status from_json(tonlib_api::decrypt &to, JsonObject &from);
 Status from_json(tonlib_api::deleteAllKeys &to, JsonObject &from);
 Status from_json(tonlib_api::deleteKey &to, JsonObject &from);
+Status from_json(tonlib_api::dns_resolve &to, JsonObject &from);
 Status from_json(tonlib_api::encrypt &to, JsonObject &from);
 Status from_json(tonlib_api::exportEncryptedKey &to, JsonObject &from);
 Status from_json(tonlib_api::exportKey &to, JsonObject &from);
 Status from_json(tonlib_api::exportPemKey &to, JsonObject &from);
-Status from_json(tonlib_api::generic_createSendGramsQuery &to, JsonObject &from);
-Status from_json(tonlib_api::generic_getAccountState &to, JsonObject &from);
-Status from_json(tonlib_api::generic_sendGrams &to, JsonObject &from);
+Status from_json(tonlib_api::exportUnencryptedKey &to, JsonObject &from);
+Status from_json(tonlib_api::getAccountAddress &to, JsonObject &from);
+Status from_json(tonlib_api::getAccountState &to, JsonObject &from);
 Status from_json(tonlib_api::getBip39Hints &to, JsonObject &from);
 Status from_json(tonlib_api::getLogStream &to, JsonObject &from);
 Status from_json(tonlib_api::getLogTagVerbosityLevel &to, JsonObject &from);
 Status from_json(tonlib_api::getLogTags &to, JsonObject &from);
 Status from_json(tonlib_api::getLogVerbosityLevel &to, JsonObject &from);
+Status from_json(tonlib_api::guessAccountRevision &to, JsonObject &from);
 Status from_json(tonlib_api::importEncryptedKey &to, JsonObject &from);
 Status from_json(tonlib_api::importKey &to, JsonObject &from);
 Status from_json(tonlib_api::importPemKey &to, JsonObject &from);
+Status from_json(tonlib_api::importUnencryptedKey &to, JsonObject &from);
 Status from_json(tonlib_api::init &to, JsonObject &from);
 Status from_json(tonlib_api::kdf &to, JsonObject &from);
 Status from_json(tonlib_api::liteServer_getInfo &to, JsonObject &from);
+Status from_json(tonlib_api::msg_decrypt &to, JsonObject &from);
 Status from_json(tonlib_api::onLiteServerQueryError &to, JsonObject &from);
 Status from_json(tonlib_api::onLiteServerQueryResult &to, JsonObject &from);
 Status from_json(tonlib_api::options_setConfig &to, JsonObject &from);
@@ -119,7 +160,6 @@ Status from_json(tonlib_api::query_getInfo &to, JsonObject &from);
 Status from_json(tonlib_api::query_send &to, JsonObject &from);
 Status from_json(tonlib_api::raw_createAndSendMessage &to, JsonObject &from);
 Status from_json(tonlib_api::raw_createQuery &to, JsonObject &from);
-Status from_json(tonlib_api::raw_getAccountAddress &to, JsonObject &from);
 Status from_json(tonlib_api::raw_getAccountState &to, JsonObject &from);
 Status from_json(tonlib_api::raw_getTransactions &to, JsonObject &from);
 Status from_json(tonlib_api::raw_sendMessage &to, JsonObject &from);
@@ -133,20 +173,25 @@ Status from_json(tonlib_api::smc_getState &to, JsonObject &from);
 Status from_json(tonlib_api::smc_load &to, JsonObject &from);
 Status from_json(tonlib_api::smc_runGetMethod &to, JsonObject &from);
 Status from_json(tonlib_api::sync &to, JsonObject &from);
-Status from_json(tonlib_api::testGiver_getAccountAddress &to, JsonObject &from);
-Status from_json(tonlib_api::testGiver_getAccountState &to, JsonObject &from);
-Status from_json(tonlib_api::testGiver_sendGrams &to, JsonObject &from);
-Status from_json(tonlib_api::testWallet_getAccountAddress &to, JsonObject &from);
-Status from_json(tonlib_api::testWallet_getAccountState &to, JsonObject &from);
-Status from_json(tonlib_api::testWallet_init &to, JsonObject &from);
-Status from_json(tonlib_api::testWallet_sendGrams &to, JsonObject &from);
 Status from_json(tonlib_api::unpackAccountAddress &to, JsonObject &from);
-Status from_json(tonlib_api::wallet_getAccountAddress &to, JsonObject &from);
-Status from_json(tonlib_api::wallet_getAccountState &to, JsonObject &from);
-Status from_json(tonlib_api::wallet_init &to, JsonObject &from);
-Status from_json(tonlib_api::wallet_sendGrams &to, JsonObject &from);
-Status from_json(tonlib_api::wallet_v3_getAccountAddress &to, JsonObject &from);
+Status from_json(tonlib_api::withBlock &to, JsonObject &from);
 void to_json(JsonValueScope &jv, const tonlib_api::accountAddress &object);
+void to_json(JsonValueScope &jv, const tonlib_api::accountRevisionList &object);
+void to_json(JsonValueScope &jv, const tonlib_api::AccountState &object);
+void to_json(JsonValueScope &jv, const tonlib_api::raw_accountState &object);
+void to_json(JsonValueScope &jv, const tonlib_api::testWallet_accountState &object);
+void to_json(JsonValueScope &jv, const tonlib_api::wallet_accountState &object);
+void to_json(JsonValueScope &jv, const tonlib_api::wallet_v3_accountState &object);
+void to_json(JsonValueScope &jv, const tonlib_api::wallet_highload_v1_accountState &object);
+void to_json(JsonValueScope &jv, const tonlib_api::wallet_highload_v2_accountState &object);
+void to_json(JsonValueScope &jv, const tonlib_api::testGiver_accountState &object);
+void to_json(JsonValueScope &jv, const tonlib_api::dns_accountState &object);
+void to_json(JsonValueScope &jv, const tonlib_api::uninited_accountState &object);
+void to_json(JsonValueScope &jv, const tonlib_api::Action &object);
+void to_json(JsonValueScope &jv, const tonlib_api::actionNoop &object);
+void to_json(JsonValueScope &jv, const tonlib_api::actionMsg &object);
+void to_json(JsonValueScope &jv, const tonlib_api::actionDns &object);
+void to_json(JsonValueScope &jv, const tonlib_api::adnlAddress &object);
 void to_json(JsonValueScope &jv, const tonlib_api::bip39Hints &object);
 void to_json(JsonValueScope &jv, const tonlib_api::config &object);
 void to_json(JsonValueScope &jv, const tonlib_api::data &object);
@@ -154,7 +199,18 @@ void to_json(JsonValueScope &jv, const tonlib_api::error &object);
 void to_json(JsonValueScope &jv, const tonlib_api::exportedEncryptedKey &object);
 void to_json(JsonValueScope &jv, const tonlib_api::exportedKey &object);
 void to_json(JsonValueScope &jv, const tonlib_api::exportedPemKey &object);
+void to_json(JsonValueScope &jv, const tonlib_api::exportedUnencryptedKey &object);
 void to_json(JsonValueScope &jv, const tonlib_api::fees &object);
+void to_json(JsonValueScope &jv, const tonlib_api::fullAccountState &object);
+void to_json(JsonValueScope &jv, const tonlib_api::InitialAccountState &object);
+void to_json(JsonValueScope &jv, const tonlib_api::raw_initialAccountState &object);
+void to_json(JsonValueScope &jv, const tonlib_api::testGiver_initialAccountState &object);
+void to_json(JsonValueScope &jv, const tonlib_api::testWallet_initialAccountState &object);
+void to_json(JsonValueScope &jv, const tonlib_api::wallet_initialAccountState &object);
+void to_json(JsonValueScope &jv, const tonlib_api::wallet_v3_initialAccountState &object);
+void to_json(JsonValueScope &jv, const tonlib_api::wallet_highload_v1_initialAccountState &object);
+void to_json(JsonValueScope &jv, const tonlib_api::wallet_highload_v2_initialAccountState &object);
+void to_json(JsonValueScope &jv, const tonlib_api::dns_initialAccountState &object);
 void to_json(JsonValueScope &jv, const tonlib_api::InputKey &object);
 void to_json(JsonValueScope &jv, const tonlib_api::inputKeyRegular &object);
 void to_json(JsonValueScope &jv, const tonlib_api::inputKeyFake &object);
@@ -170,7 +226,6 @@ void to_json(JsonValueScope &jv, const tonlib_api::logTags &object);
 void to_json(JsonValueScope &jv, const tonlib_api::logVerbosityLevel &object);
 void to_json(JsonValueScope &jv, const tonlib_api::ok &object);
 void to_json(JsonValueScope &jv, const tonlib_api::options &object);
-void to_json(JsonValueScope &jv, const tonlib_api::sendGramsResult &object);
 void to_json(JsonValueScope &jv, const tonlib_api::SyncState &object);
 void to_json(JsonValueScope &jv, const tonlib_api::syncStateDone &object);
 void to_json(JsonValueScope &jv, const tonlib_api::syncStateInProgress &object);
@@ -178,20 +233,33 @@ void to_json(JsonValueScope &jv, const tonlib_api::unpackedAccountAddress &objec
 void to_json(JsonValueScope &jv, const tonlib_api::Update &object);
 void to_json(JsonValueScope &jv, const tonlib_api::updateSendLiteServerQuery &object);
 void to_json(JsonValueScope &jv, const tonlib_api::updateSyncState &object);
-void to_json(JsonValueScope &jv, const tonlib_api::generic_AccountState &object);
-void to_json(JsonValueScope &jv, const tonlib_api::generic_accountStateRaw &object);
-void to_json(JsonValueScope &jv, const tonlib_api::generic_accountStateTestWallet &object);
-void to_json(JsonValueScope &jv, const tonlib_api::generic_accountStateWallet &object);
-void to_json(JsonValueScope &jv, const tonlib_api::generic_accountStateWalletV3 &object);
-void to_json(JsonValueScope &jv, const tonlib_api::generic_accountStateTestGiver &object);
-void to_json(JsonValueScope &jv, const tonlib_api::generic_accountStateUninited &object);
+void to_json(JsonValueScope &jv, const tonlib_api::dns_Action &object);
+void to_json(JsonValueScope &jv, const tonlib_api::dns_actionDeleteAll &object);
+void to_json(JsonValueScope &jv, const tonlib_api::dns_actionDelete &object);
+void to_json(JsonValueScope &jv, const tonlib_api::dns_actionSet &object);
+void to_json(JsonValueScope &jv, const tonlib_api::dns_entry &object);
+void to_json(JsonValueScope &jv, const tonlib_api::dns_EntryData &object);
+void to_json(JsonValueScope &jv, const tonlib_api::dns_entryDataUnknown &object);
+void to_json(JsonValueScope &jv, const tonlib_api::dns_entryDataText &object);
+void to_json(JsonValueScope &jv, const tonlib_api::dns_entryDataNextResolver &object);
+void to_json(JsonValueScope &jv, const tonlib_api::dns_entryDataSmcAddress &object);
+void to_json(JsonValueScope &jv, const tonlib_api::dns_entryDataAdnlAddress &object);
+void to_json(JsonValueScope &jv, const tonlib_api::dns_resolved &object);
+void to_json(JsonValueScope &jv, const tonlib_api::ton_blockId &object);
 void to_json(JsonValueScope &jv, const tonlib_api::internal_transactionId &object);
 void to_json(JsonValueScope &jv, const tonlib_api::liteServer_info &object);
+void to_json(JsonValueScope &jv, const tonlib_api::msg_Data &object);
+void to_json(JsonValueScope &jv, const tonlib_api::msg_dataRaw &object);
+void to_json(JsonValueScope &jv, const tonlib_api::msg_dataText &object);
+void to_json(JsonValueScope &jv, const tonlib_api::msg_dataDecryptedText &object);
+void to_json(JsonValueScope &jv, const tonlib_api::msg_dataEncryptedText &object);
+void to_json(JsonValueScope &jv, const tonlib_api::msg_dataArray &object);
+void to_json(JsonValueScope &jv, const tonlib_api::msg_message &object);
 void to_json(JsonValueScope &jv, const tonlib_api::options_configInfo &object);
+void to_json(JsonValueScope &jv, const tonlib_api::options_info &object);
 void to_json(JsonValueScope &jv, const tonlib_api::query_fees &object);
 void to_json(JsonValueScope &jv, const tonlib_api::query_info &object);
-void to_json(JsonValueScope &jv, const tonlib_api::raw_accountState &object);
-void to_json(JsonValueScope &jv, const tonlib_api::raw_initialAccountState &object);
+void to_json(JsonValueScope &jv, const tonlib_api::raw_fullAccountState &object);
 void to_json(JsonValueScope &jv, const tonlib_api::raw_message &object);
 void to_json(JsonValueScope &jv, const tonlib_api::raw_transaction &object);
 void to_json(JsonValueScope &jv, const tonlib_api::raw_transactions &object);
@@ -200,47 +268,49 @@ void to_json(JsonValueScope &jv, const tonlib_api::smc_MethodId &object);
 void to_json(JsonValueScope &jv, const tonlib_api::smc_methodIdNumber &object);
 void to_json(JsonValueScope &jv, const tonlib_api::smc_methodIdName &object);
 void to_json(JsonValueScope &jv, const tonlib_api::smc_runResult &object);
-void to_json(JsonValueScope &jv, const tonlib_api::testGiver_accountState &object);
-void to_json(JsonValueScope &jv, const tonlib_api::testWallet_accountState &object);
-void to_json(JsonValueScope &jv, const tonlib_api::testWallet_initialAccountState &object);
+void to_json(JsonValueScope &jv, const tonlib_api::ton_blockIdExt &object);
 void to_json(JsonValueScope &jv, const tonlib_api::tvm_cell &object);
+void to_json(JsonValueScope &jv, const tonlib_api::tvm_list &object);
 void to_json(JsonValueScope &jv, const tonlib_api::tvm_numberDecimal &object);
 void to_json(JsonValueScope &jv, const tonlib_api::tvm_slice &object);
 void to_json(JsonValueScope &jv, const tonlib_api::tvm_StackEntry &object);
 void to_json(JsonValueScope &jv, const tonlib_api::tvm_stackEntrySlice &object);
 void to_json(JsonValueScope &jv, const tonlib_api::tvm_stackEntryCell &object);
 void to_json(JsonValueScope &jv, const tonlib_api::tvm_stackEntryNumber &object);
+void to_json(JsonValueScope &jv, const tonlib_api::tvm_stackEntryTuple &object);
+void to_json(JsonValueScope &jv, const tonlib_api::tvm_stackEntryList &object);
 void to_json(JsonValueScope &jv, const tonlib_api::tvm_stackEntryUnsupported &object);
-void to_json(JsonValueScope &jv, const tonlib_api::uninited_accountState &object);
-void to_json(JsonValueScope &jv, const tonlib_api::wallet_accountState &object);
-void to_json(JsonValueScope &jv, const tonlib_api::wallet_initialAccountState &object);
-void to_json(JsonValueScope &jv, const tonlib_api::wallet_v3_accountState &object);
-void to_json(JsonValueScope &jv, const tonlib_api::wallet_v3_initialAccountState &object);
+void to_json(JsonValueScope &jv, const tonlib_api::tvm_tuple &object);
 void to_json(JsonValueScope &jv, const tonlib_api::addLogMessage &object);
 void to_json(JsonValueScope &jv, const tonlib_api::changeLocalPassword &object);
 void to_json(JsonValueScope &jv, const tonlib_api::close &object);
 void to_json(JsonValueScope &jv, const tonlib_api::createNewKey &object);
+void to_json(JsonValueScope &jv, const tonlib_api::createQuery &object);
 void to_json(JsonValueScope &jv, const tonlib_api::decrypt &object);
 void to_json(JsonValueScope &jv, const tonlib_api::deleteAllKeys &object);
 void to_json(JsonValueScope &jv, const tonlib_api::deleteKey &object);
+void to_json(JsonValueScope &jv, const tonlib_api::dns_resolve &object);
 void to_json(JsonValueScope &jv, const tonlib_api::encrypt &object);
 void to_json(JsonValueScope &jv, const tonlib_api::exportEncryptedKey &object);
 void to_json(JsonValueScope &jv, const tonlib_api::exportKey &object);
 void to_json(JsonValueScope &jv, const tonlib_api::exportPemKey &object);
-void to_json(JsonValueScope &jv, const tonlib_api::generic_createSendGramsQuery &object);
-void to_json(JsonValueScope &jv, const tonlib_api::generic_getAccountState &object);
-void to_json(JsonValueScope &jv, const tonlib_api::generic_sendGrams &object);
+void to_json(JsonValueScope &jv, const tonlib_api::exportUnencryptedKey &object);
+void to_json(JsonValueScope &jv, const tonlib_api::getAccountAddress &object);
+void to_json(JsonValueScope &jv, const tonlib_api::getAccountState &object);
 void to_json(JsonValueScope &jv, const tonlib_api::getBip39Hints &object);
 void to_json(JsonValueScope &jv, const tonlib_api::getLogStream &object);
 void to_json(JsonValueScope &jv, const tonlib_api::getLogTagVerbosityLevel &object);
 void to_json(JsonValueScope &jv, const tonlib_api::getLogTags &object);
 void to_json(JsonValueScope &jv, const tonlib_api::getLogVerbosityLevel &object);
+void to_json(JsonValueScope &jv, const tonlib_api::guessAccountRevision &object);
 void to_json(JsonValueScope &jv, const tonlib_api::importEncryptedKey &object);
 void to_json(JsonValueScope &jv, const tonlib_api::importKey &object);
 void to_json(JsonValueScope &jv, const tonlib_api::importPemKey &object);
+void to_json(JsonValueScope &jv, const tonlib_api::importUnencryptedKey &object);
 void to_json(JsonValueScope &jv, const tonlib_api::init &object);
 void to_json(JsonValueScope &jv, const tonlib_api::kdf &object);
 void to_json(JsonValueScope &jv, const tonlib_api::liteServer_getInfo &object);
+void to_json(JsonValueScope &jv, const tonlib_api::msg_decrypt &object);
 void to_json(JsonValueScope &jv, const tonlib_api::onLiteServerQueryError &object);
 void to_json(JsonValueScope &jv, const tonlib_api::onLiteServerQueryResult &object);
 void to_json(JsonValueScope &jv, const tonlib_api::options_setConfig &object);
@@ -252,7 +322,6 @@ void to_json(JsonValueScope &jv, const tonlib_api::query_getInfo &object);
 void to_json(JsonValueScope &jv, const tonlib_api::query_send &object);
 void to_json(JsonValueScope &jv, const tonlib_api::raw_createAndSendMessage &object);
 void to_json(JsonValueScope &jv, const tonlib_api::raw_createQuery &object);
-void to_json(JsonValueScope &jv, const tonlib_api::raw_getAccountAddress &object);
 void to_json(JsonValueScope &jv, const tonlib_api::raw_getAccountState &object);
 void to_json(JsonValueScope &jv, const tonlib_api::raw_getTransactions &object);
 void to_json(JsonValueScope &jv, const tonlib_api::raw_sendMessage &object);
@@ -266,19 +335,8 @@ void to_json(JsonValueScope &jv, const tonlib_api::smc_getState &object);
 void to_json(JsonValueScope &jv, const tonlib_api::smc_load &object);
 void to_json(JsonValueScope &jv, const tonlib_api::smc_runGetMethod &object);
 void to_json(JsonValueScope &jv, const tonlib_api::sync &object);
-void to_json(JsonValueScope &jv, const tonlib_api::testGiver_getAccountAddress &object);
-void to_json(JsonValueScope &jv, const tonlib_api::testGiver_getAccountState &object);
-void to_json(JsonValueScope &jv, const tonlib_api::testGiver_sendGrams &object);
-void to_json(JsonValueScope &jv, const tonlib_api::testWallet_getAccountAddress &object);
-void to_json(JsonValueScope &jv, const tonlib_api::testWallet_getAccountState &object);
-void to_json(JsonValueScope &jv, const tonlib_api::testWallet_init &object);
-void to_json(JsonValueScope &jv, const tonlib_api::testWallet_sendGrams &object);
 void to_json(JsonValueScope &jv, const tonlib_api::unpackAccountAddress &object);
-void to_json(JsonValueScope &jv, const tonlib_api::wallet_getAccountAddress &object);
-void to_json(JsonValueScope &jv, const tonlib_api::wallet_getAccountState &object);
-void to_json(JsonValueScope &jv, const tonlib_api::wallet_init &object);
-void to_json(JsonValueScope &jv, const tonlib_api::wallet_sendGrams &object);
-void to_json(JsonValueScope &jv, const tonlib_api::wallet_v3_getAccountAddress &object);
+void to_json(JsonValueScope &jv, const tonlib_api::withBlock &object);
 inline void to_json(JsonValueScope &jv, const ton::tonlib_api::Object &object) {
   ton::tonlib_api::downcast_call(const_cast<ton::tonlib_api::Object &>(object),[&jv](const auto &object) { to_json(jv, object); });
 }
diff --git a/submodules/ton/tonlib-src/tl/generate/scheme/.tonlib_api.tl.swp b/submodules/ton/tonlib-src/tl/generate/scheme/.tonlib_api.tl.swp
deleted file mode 100644
index 47e8571856..0000000000
Binary files a/submodules/ton/tonlib-src/tl/generate/scheme/.tonlib_api.tl.swp and /dev/null differ
diff --git a/submodules/ton/tonlib-src/tl/generate/scheme/lite_api.tl b/submodules/ton/tonlib-src/tl/generate/scheme/lite_api.tl
index 9604624a74..7d4495e72c 100644
--- a/submodules/ton/tonlib-src/tl/generate/scheme/lite_api.tl
+++ b/submodules/ton/tonlib-src/tl/generate/scheme/lite_api.tl
@@ -35,6 +35,7 @@ liteServer.blockState id:tonNode.blockIdExt root_hash:int256 file_hash:int256 da
 liteServer.blockHeader id:tonNode.blockIdExt mode:# header_proof:bytes = liteServer.BlockHeader;
 liteServer.sendMsgStatus status:int = liteServer.SendMsgStatus;
 liteServer.accountState id:tonNode.blockIdExt shardblk:tonNode.blockIdExt shard_proof:bytes proof:bytes state:bytes = liteServer.AccountState;
+liteServer.runMethodResult mode:# id:tonNode.blockIdExt shardblk:tonNode.blockIdExt shard_proof:mode.0?bytes proof:mode.0?bytes state_proof:mode.1?bytes init_c7:mode.3?bytes lib_extras:mode.4?bytes exit_code:int result:mode.2?bytes = liteServer.RunMethodResult;
 liteServer.shardInfo id:tonNode.blockIdExt shardblk:tonNode.blockIdExt shard_proof:bytes shard_descr:bytes = liteServer.ShardInfo;
 liteServer.allShardsInfo id:tonNode.blockIdExt proof:bytes data:bytes = liteServer.AllShardsInfo;
 liteServer.transactionInfo id:tonNode.blockIdExt proof:bytes transaction:bytes = liteServer.TransactionInfo;
@@ -48,6 +49,7 @@ liteServer.blockLinkBack to_key_block:Bool from:tonNode.blockIdExt to:tonNode.bl
 liteServer.blockLinkForward to_key_block:Bool from:tonNode.blockIdExt to:tonNode.blockIdExt dest_proof:bytes config_proof:bytes signatures:liteServer.SignatureSet = liteServer.BlockLink;
 liteServer.partialBlockProof complete:Bool from:tonNode.blockIdExt to:tonNode.blockIdExt steps:(vector liteServer.BlockLink) = liteServer.PartialBlockProof;
 liteServer.configInfo mode:# id:tonNode.blockIdExt state_proof:bytes config_proof:bytes = liteServer.ConfigInfo;
+liteServer.validatorStats mode:# id:tonNode.blockIdExt count:int complete:Bool state_proof:bytes data_proof:bytes = liteServer.ValidatorStats;
 
 liteServer.debug.verbosity value:int = liteServer.debug.Verbosity;
 
@@ -62,6 +64,7 @@ liteServer.getState id:tonNode.blockIdExt = liteServer.BlockState;
 liteServer.getBlockHeader id:tonNode.blockIdExt mode:# = liteServer.BlockHeader;
 liteServer.sendMessage body:bytes = liteServer.SendMsgStatus;
 liteServer.getAccountState id:tonNode.blockIdExt account:liteServer.accountId = liteServer.AccountState;
+liteServer.runSmcMethod mode:# id:tonNode.blockIdExt account:liteServer.accountId method_id:long params:bytes = liteServer.RunMethodResult;
 liteServer.getShardInfo id:tonNode.blockIdExt workchain:int shard:long exact:Bool = liteServer.ShardInfo;
 liteServer.getAllShardsInfo id:tonNode.blockIdExt = liteServer.AllShardsInfo;
 liteServer.getOneTransaction id:tonNode.blockIdExt account:liteServer.accountId lt:long = liteServer.TransactionInfo;
@@ -71,6 +74,7 @@ liteServer.listBlockTransactions id:tonNode.blockIdExt mode:# count:# after:mode
 liteServer.getBlockProof mode:# known_block:tonNode.blockIdExt target_block:mode.0?tonNode.blockIdExt = liteServer.PartialBlockProof;
 liteServer.getConfigAll mode:# id:tonNode.blockIdExt = liteServer.ConfigInfo;
 liteServer.getConfigParams mode:# id:tonNode.blockIdExt param_list:(vector int) = liteServer.ConfigInfo;
+liteServer.getValidatorStats#091a58bc mode:# id:tonNode.blockIdExt limit:int start_after:mode.0?int256 modified_after:mode.2?int = liteServer.ValidatorStats;
 
 liteServer.queryPrefix = Object; 
 liteServer.query data:bytes = Object;
diff --git a/submodules/ton/tonlib-src/tl/generate/scheme/lite_api.tlo b/submodules/ton/tonlib-src/tl/generate/scheme/lite_api.tlo
index 9b01c0d881..d524f54b71 100644
Binary files a/submodules/ton/tonlib-src/tl/generate/scheme/lite_api.tlo and b/submodules/ton/tonlib-src/tl/generate/scheme/lite_api.tlo differ
diff --git a/submodules/ton/tonlib-src/tl/generate/scheme/storage_api.tl b/submodules/ton/tonlib-src/tl/generate/scheme/storage_api.tl
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/submodules/ton/tonlib-src/tl/generate/scheme/tmp.tl b/submodules/ton/tonlib-src/tl/generate/scheme/tmp.tl
new file mode 100644
index 0000000000..bc7a831cc3
--- /dev/null
+++ b/submodules/ton/tonlib-src/tl/generate/scheme/tmp.tl
@@ -0,0 +1,16 @@
+
+//
+// Multisig wallet
+//
+
+// multisig.unsignedOrder wallet_id:int64 valid_until:int53 order_id:int53 message:msg.message = multisig.UnsignedOrder;
+// multisig.signature owner_id:int32 signature:bytes = multisig.Signature;
+// multisig.order order:multisig.unsignedOrder signatures:vector<multisig.signature> = multisig.Order;
+// multisig.orders = orders:vector<multisig.order> = multisig.Orders;
+// 
+// multisig.initialAccountState public_keys:vector<bytes> wallet_id:int64 k:int32 = InitialAccountState;
+// multisig.accountState public_keys:vector<bytes> wallet_id:int64 k:int32 = AccountState;
+// 
+// multisig.sign private_key:InputKey order:multisig.unsignedOrder = multisig.Signature;
+// multisig.getPendingOrders account_address:accountAddress unsigned_by:int32  = multisig.Orders;
+
diff --git a/submodules/ton/tonlib-src/tl/generate/scheme/ton_api.tl b/submodules/ton/tonlib-src/tl/generate/scheme/ton_api.tl
index 7617f1fe09..1f819d5dd3 100644
--- a/submodules/ton/tonlib-src/tl/generate/scheme/ton_api.tl
+++ b/submodules/ton/tonlib-src/tl/generate/scheme/ton_api.tl
@@ -362,6 +362,9 @@ tonNode.capabilities version:int capabilities:long = tonNode.Capabilities;
 
 tonNode.success = tonNode.Success;
 
+tonNode.archiveNotFound = tonNode.ArchiveInfo;
+tonNode.archiveInfo id:long = tonNode.ArchiveInfo;
+
 ---functions---
 
 tonNode.getNextBlockDescription prev_block:tonNode.blockIdExt = tonNode.BlockDescription;
@@ -385,6 +388,8 @@ tonNode.downloadBlockProof block:tonNode.blockIdExt = tonNode.Data;
 tonNode.downloadBlockProofs blocks:(vector tonNode.blockIdExt) = tonNode.DataList;
 tonNode.downloadBlockProofLink block:tonNode.blockIdExt = tonNode.Data;
 tonNode.downloadBlockProofLinks blocks:(vector tonNode.blockIdExt) = tonNode.DataList;
+tonNode.getArchiveInfo masterchain_seqno:int = tonNode.ArchiveInfo;
+tonNode.getArchiveSlice archive_id:long offset:long max_size:int = tonNode.Data;
 
 tonNode.getCapabilities = tonNode.Capabilities;
 
@@ -417,7 +422,8 @@ db.block.info#4ac6e727 id:tonNode.blockIdExt flags:# prev_left:flags.1?tonNode.b
                                             next_right:flags.4?tonNode.blockIdExt
                                             lt:flags.13?long 
                                             ts:flags.14?int
-                                            state:flags.17?int256 = db.block.Info;
+                                            state:flags.17?int256 
+                                            masterchain_ref_seqno:flags.23?int = db.block.Info;
 db.block.packedInfo id:tonNode.blockIdExt unixtime:int offset:long = db.block.Info;
 db.block.archivedInfo id:tonNode.blockIdExt flags:# next:flags.0?tonNode.blockIdExt = db.block.Info;
 
@@ -437,6 +443,7 @@ db.filedb.key.proof block_id:tonNode.blockIdExt = db.filedb.Key;
 db.filedb.key.proofLink block_id:tonNode.blockIdExt = db.filedb.Key;
 db.filedb.key.signatures block_id:tonNode.blockIdExt = db.filedb.Key;
 db.filedb.key.candidate id:db.candidate.id = db.filedb.Key;
+db.filedb.key.blockInfo block_id:tonNode.blockIdExt = db.filedb.Key;
 
 db.filedb.value key:db.filedb.Key prev:int256 next:int256 file_hash:int256 = db.filedb.Value;
 
@@ -446,6 +453,7 @@ db.state.gcBlockId block:tonNode.blockIdExt = db.state.GcBlockId;
 db.state.shardClient block:tonNode.blockIdExt = db.state.ShardClient;
 db.state.asyncSerializer block:tonNode.blockIdExt last:tonNode.blockIdExt last_ts:int = db.state.AsyncSerializer;
 db.state.hardforks blocks:(vector tonNode.blockIdExt) = db.state.Hardforks;
+db.state.dbVersion version:int = db.state.DbVersion;
 
 db.state.key.destroyedSessions = db.state.Key;
 db.state.key.initBlockId = db.state.Key;
@@ -453,6 +461,7 @@ db.state.key.gcBlockId = db.state.Key;
 db.state.key.shardClient = db.state.Key;
 db.state.key.asyncSerializer = db.state.Key;
 db.state.key.hardforks = db.state.Key;
+db.state.key.dbVersion = db.state.Key;
 
 db.lt.el.key workchain:int shard:long idx:int = db.lt.Key;
 db.lt.desc.key workchain:int shard:long = db.lt.Key;
@@ -463,6 +472,14 @@ db.lt.desc.value first_idx:int last_idx:int last_seqno:int last_lt:long last_ts:
 db.lt.shard.value workchain:int shard:long = db.lt.shard.Value; 
 db.lt.status.value total_shards:int = db.lt.status.Value;
 
+db.files.index.key = db.files.Key;
+db.files.package.key package_id:int key:Bool temp:Bool = db.files.Key;
+
+db.files.index.value packages:(vector int) key_packages:(vector int) temp_packages:(vector int) = db.files.index.Value;
+db.files.package.firstBlock workchain:int shard:long seqno:int unixtime:int lt:long = db.files.package.FirstBlock;
+db.files.package.value package_id:int key:Bool temp:Bool firstblocks:(vector db.files.package.firstBlock) deleted:Bool 
+                   = db.files.package.Value; 
+
 ---functions---
 
 ---types---
@@ -597,3 +614,25 @@ engine.validator.createElectionBid election_date:int election_addr:string wallet
 engine.validator.checkDhtServers id:int256 = engine.validator.DhtServersStatus;
 
 engine.validator.controlQuery data:bytes = Object;
+
+
+---types---
+
+http.header name:string value:string = http.Header;
+http.payloadPart data:bytes trailer:(vector http.header) last:Bool = http.PayloadPart;
+http.response http_version:string status_code:int reason:string headers:(vector http.header) = http.Response;
+
+---functions---
+
+http.request id:int256 method:string url:string http_version:string headers:(vector http.header) = http.Response;
+http.getNextPayloadPart id:int256 seqno:int max_chunk_size:int = http.PayloadPart;
+
+---types---
+
+
+http.server.dnsEntry domain:string addr:adnl.id.short = http.server.DnsEntry;
+http.server.host domains:(vector string) ip:int port:int adnl_id:adnl.id.short = http.server.Host;
+
+http.server.config dhs:(vector http.server.dnsEntry) local_hosts:(vector http.server.host) = http.server.Config;
+
+---functions---
diff --git a/submodules/ton/tonlib-src/tl/generate/scheme/ton_api.tlo b/submodules/ton/tonlib-src/tl/generate/scheme/ton_api.tlo
index 28e5cfa571..5507d156b0 100644
Binary files a/submodules/ton/tonlib-src/tl/generate/scheme/ton_api.tlo and b/submodules/ton/tonlib-src/tl/generate/scheme/ton_api.tlo differ
diff --git a/submodules/ton/tonlib-src/tl/generate/scheme/tonlib_api.tl b/submodules/ton/tonlib-src/tl/generate/scheme/tonlib_api.tl
index e6778df578..beb5d64a0c 100644
--- a/submodules/ton/tonlib-src/tl/generate/scheme/tonlib_api.tl
+++ b/submodules/ton/tonlib-src/tl/generate/scheme/tonlib_api.tl
@@ -8,6 +8,9 @@ bytes = Bytes;
 secureString = SecureString;
 secureBytes = SecureBytes;
 
+object ? = Object;
+function ? = Function;
+
 boolFalse = Bool;
 boolTrue = Bool;
 
@@ -22,7 +25,8 @@ keyStoreTypeInMemory = KeyStoreType;
 config config:string blockchain_name:string use_callbacks_for_network:Bool ignore_cache:Bool = Config;
 
 options config:config keystore_type:KeyStoreType = Options;
-options.configInfo default_wallet_id:int53 = options.ConfigInfo;
+options.configInfo default_wallet_id:int64 = options.ConfigInfo;
+options.info config_info:options.configInfo = options.Info;
 
 key public_key:string secret:secureBytes = Key;
 inputKeyRegular key:key local_password:secureBytes = InputKey;
@@ -30,61 +34,108 @@ inputKeyFake = InputKey;
 exportedKey word_list:vector<secureString> = ExportedKey;
 exportedPemKey pem:secureString = ExportedPemKey;
 exportedEncryptedKey data:secureBytes = ExportedEncryptedKey;
+exportedUnencryptedKey data:secureBytes = ExportedUnencryptedKey;
 
 bip39Hints words:vector<string> = Bip39Hints;
 
+adnlAddress adnl_address:string = AdnlAddress;
+
 accountAddress account_address:string = AccountAddress;
+accountRevisionList revisions:vector<int32> = AccountRevisionList;
 
 unpackedAccountAddress workchain_id:int32 bounceable:Bool testnet:Bool addr:bytes = UnpackedAccountAddress;
 
 internal.transactionId lt:int64 hash:bytes = internal.TransactionId;
 
-raw.initialAccountState code:bytes data:bytes = raw.InitialAccountState;
-raw.accountState balance:int64 code:bytes data:bytes last_transaction_id:internal.transactionId frozen_hash:bytes sync_utime:int53 = raw.AccountState;
-raw.message source:string destination:string value:int64 fwd_fee:int64 ihr_fee:int64 created_lt:int64 body_hash:bytes message:bytes = raw.Message;
+ton.blockId workchain:int32 shard:int64 seqno:int32 = internal.BlockId;
+ton.blockIdExt workchain:int32 shard:int64 seqno:int32 root_hash:bytes file_hash:bytes = ton.BlockIdExt;
+
+raw.fullAccountState balance:int64 code:bytes data:bytes last_transaction_id:internal.transactionId block_id:ton.blockIdExt frozen_hash:bytes sync_utime:int53 = raw.FullAccountState;
+raw.message source:string destination:string value:int64 fwd_fee:int64 ihr_fee:int64 created_lt:int64 body_hash:bytes msg_data:msg.Data = raw.Message;
 raw.transaction utime:int53 data:bytes transaction_id:internal.transactionId fee:int64 storage_fee:int64 other_fee:int64 in_msg:raw.message out_msgs:vector<raw.message> = raw.Transaction;
 raw.transactions transactions:vector<raw.transaction> previous_transaction_id:internal.transactionId = raw.Transactions;
 
-testWallet.initialAccountState public_key:string = testWallet.InitialAccountState;
-testWallet.accountState balance:int64 seqno:int32 last_transaction_id:internal.transactionId sync_utime:int53 = testWallet.AccountState;
+raw.initialAccountState code:bytes data:bytes = InitialAccountState;
+testGiver.initialAccountState = InitialAccountState;
+testWallet.initialAccountState public_key:string = InitialAccountState;
+wallet.initialAccountState public_key:string = InitialAccountState;
+wallet.v3.initialAccountState public_key:string wallet_id:int64 = InitialAccountState;
+wallet.highload.v1.initialAccountState public_key:string wallet_id:int64 = InitialAccountState;
+wallet.highload.v2.initialAccountState public_key:string wallet_id:int64 = InitialAccountState;
+dns.initialAccountState public_key:string wallet_id:int64 = InitialAccountState;
 
-wallet.initialAccountState public_key:string = wallet.InitialAccountState;
-wallet.accountState balance:int64 seqno:int32 last_transaction_id:internal.transactionId sync_utime:int53 = wallet.AccountState;
+raw.accountState code:bytes data:bytes frozen_hash:bytes = AccountState;
+testWallet.accountState seqno:int32 = AccountState;
+wallet.accountState seqno:int32 = AccountState;
+wallet.v3.accountState wallet_id:int64 seqno:int32 = AccountState;
+wallet.highload.v1.accountState wallet_id:int64 seqno:int32 = AccountState;
+wallet.highload.v2.accountState wallet_id:int64 = AccountState;
+testGiver.accountState seqno:int32 = AccountState;
+dns.accountState wallet_id:int64 = AccountState;
+uninited.accountState frozen_hash:bytes = AccountState;
 
-wallet.v3.initialAccountState public_key:string wallet_id:int53 = wallet.v3.InitialAccountState;
-wallet.v3.accountState balance:int64 wallet_id:int53 seqno:int32 last_transaction_id:internal.transactionId sync_utime:int53 = wallet.v3.AccountState;
-
-testGiver.accountState balance:int64 seqno:int32 last_transaction_id:internal.transactionId sync_utime:int53= testGiver.AccountState;
-
-uninited.accountState balance:int64 last_transaction_id:internal.transactionId frozen_hash:bytes sync_utime:int53 = uninited.AccountState;
-
-//generic.initialAccountStateRaw initital_account_state:raw.initialAccountState = generic.InitialAccountState;
-//generic.initialAccountStateTestWallet initital_account_state:testWallet.initialAccountState = generic.InitialAccountState;
-//generic.initialAccountStateWallet initital_account_state:wallet.initialAccountState = generic.InitialAccountState;
-
-generic.accountStateRaw account_state:raw.accountState = generic.AccountState;
-generic.accountStateTestWallet account_state:testWallet.accountState = generic.AccountState;
-generic.accountStateWallet account_state:wallet.accountState = generic.AccountState;
-generic.accountStateWalletV3 account_state:wallet.v3.accountState = generic.AccountState;
-generic.accountStateTestGiver account_state:testGiver.accountState = generic.AccountState;
-generic.accountStateUninited account_state:uninited.accountState = generic.AccountState;
-
-sendGramsResult sent_until:int53 body_hash:bytes = SendGramsResult;
+fullAccountState balance:int64 last_transaction_id:internal.transactionId block_id:ton.blockIdExt sync_utime:int53 account_state:AccountState = FullAccountState;
 
 syncStateDone = SyncState;
 syncStateInProgress from_seqno:int32 to_seqno:int32 current_seqno:int32 = SyncState;
 
-fees in_fwd_fee:int53 storage_fee:int53 gas_fee:int53 fwd_fee:int53= Fees;
-query.fees source_fees:fees destination_fees:fees = query.Fees;
+//
+// MSG
+//
+
+msg.dataRaw body:bytes = msg.Data;
+msg.dataText text:bytes = msg.Data;
+msg.dataDecryptedText text:bytes = msg.Data;
+msg.dataEncryptedText text:bytes = msg.Data;
+
+msg.dataArray elements:vector<msg.Data> = msg.DataArray;
+
+msg.message destination:accountAddress amount:int64 data:msg.Data = msg.Message;
+
+//
+// DNS
+//
+
+dns.entryDataUnknown bytes:bytes = dns.EntryData;
+dns.entryDataText text:string = dns.EntryData;
+dns.entryDataNextResolver resolver:AccountAddress = dns.EntryData;
+dns.entryDataSmcAddress smc_address:AccountAddress = dns.EntryData;
+dns.entryDataAdnlAddress adnl_address:AdnlAddress = dns.EntryData;
+
+dns.entry name:string category:int32 entry:dns.EntryData = dns.Entry;
+
+dns.actionDeleteAll = dns.Action;
+// use category = 0 to delete all entries
+dns.actionDelete name:string category:int32 = dns.Action;
+dns.actionSet entry:dns.entry = dns.Action;
+
+dns.resolved entries:vector<dns.entry> = dns.Resolved;
+
+//
+// Actions
+//
+
+actionNoop  = Action;
+actionMsg messages:vector<msg.message> allow_send_to_uninited:Bool = Action;
+actionDns actions:vector<dns.Action> = Action;
+//actionMultisig actions:vector<multisig.order> = Action;
+
+fees in_fwd_fee:int53 storage_fee:int53 gas_fee:int53 fwd_fee:int53 = Fees;
+query.fees source_fees:fees destination_fees:vector<fees> = query.Fees;
+// query.emulationResult exit_code:int32 fees:fees = query.EmulationResult;
 query.info id:int53 valid_until:int53 body_hash:bytes  = query.Info;
 
-tvm.slice bytes:string = tvm.Slice;
-tvm.cell bytes:string = tvm.Cell;
+tvm.slice bytes:bytes = tvm.Slice;
+tvm.cell bytes:bytes = tvm.Cell;
 tvm.numberDecimal number:string = tvm.Number;
+tvm.tuple elements:vector<tvm.StackEntry> = tvm.Tuple;
+tvm.list elements:vector<tvm.StackEntry> = tvm.List;
 
 tvm.stackEntrySlice slice:tvm.slice = tvm.StackEntry;
 tvm.stackEntryCell cell:tvm.cell = tvm.StackEntry;
 tvm.stackEntryNumber number:tvm.Number = tvm.StackEntry;
+tvm.stackEntryTuple tuple:tvm.Tuple = tvm.StackEntry;
+tvm.stackEntryList list:tvm.List = tvm.StackEntry;
 tvm.stackEntryUnsupported = tvm.StackEntry;
 
 smc.info id:int53 = smc.Info;
@@ -121,10 +172,10 @@ liteServer.info now:int53 version:int32 capabilities:int64 = liteServer.Info;
 
 ---functions---
 
-init options:options = Ok;
+init options:options = options.Info;
 close = Ok;
 
-options.setConfig config:config = Ok;
+options.setConfig config:config = options.ConfigInfo;
 options.validateConfig config:config = options.ConfigInfo;
 
 createNewKey local_password:secureBytes mnemonic_password:secureBytes random_extra_seed:secureBytes = Key;
@@ -133,9 +184,11 @@ deleteAllKeys = Ok;
 exportKey input_key:InputKey = ExportedKey;
 exportPemKey input_key:InputKey key_password:secureBytes = ExportedPemKey;
 exportEncryptedKey input_key:InputKey key_password:secureBytes = ExportedEncryptedKey;
+exportUnencryptedKey input_key:InputKey = ExportedUnencryptedKey;
 importKey local_password:secureBytes mnemonic_password:secureBytes exported_key:exportedKey = Key;
 importPemKey local_password:secureBytes key_password:secureBytes exported_key:exportedPemKey = Key;
 importEncryptedKey local_password:secureBytes key_password:secureBytes exported_encrypted_key:exportedEncryptedKey = Key;
+importUnencryptedKey local_password:secureBytes  exported_unencrypted_key:exportedUnencryptedKey = Key;
 changeLocalPassword input_key:InputKey new_local_password:secureBytes = Key;
 
 encrypt decrypted_data:secureBytes secret:secureBytes = Data;
@@ -147,51 +200,44 @@ packAccountAddress account_address:unpackedAccountAddress = AccountAddress;
 getBip39Hints prefix:string = Bip39Hints;
 
 //raw.init initial_account_state:raw.initialAccountState = Ok;
-raw.getAccountAddress initital_account_state:raw.initialAccountState = AccountAddress;
-raw.getAccountState account_address:accountAddress = raw.AccountState;
-raw.getTransactions account_address:accountAddress from_transaction_id:internal.transactionId = raw.Transactions;
+raw.getAccountState account_address:accountAddress = raw.FullAccountState;
+raw.getTransactions private_key:InputKey account_address:accountAddress from_transaction_id:internal.transactionId = raw.Transactions;
 raw.sendMessage body:bytes  = Ok;
 raw.createAndSendMessage destination:accountAddress initial_account_state:bytes data:bytes = Ok;
 raw.createQuery destination:accountAddress init_code:bytes init_data:bytes body:bytes = query.Info;
 
-testWallet.init private_key:InputKey = Ok;
-testWallet.getAccountAddress initital_account_state:testWallet.initialAccountState = AccountAddress;
-testWallet.getAccountState account_address:accountAddress = testWallet.AccountState;
-testWallet.sendGrams private_key:InputKey destination:accountAddress seqno:int32 amount:int64 message:bytes = SendGramsResult;
+sync = ton.BlockIdExt;
 
-wallet.init private_key:InputKey = Ok;
-wallet.getAccountAddress initital_account_state:wallet.initialAccountState = AccountAddress;
-wallet.getAccountState account_address:accountAddress = wallet.AccountState;
-wallet.sendGrams private_key:InputKey destination:accountAddress seqno:int32 valid_until:int53 amount:int64 message:bytes = SendGramsResult;
+// revision = 0 -- use default revision
+// revision = x (x > 0) -- use revision x
+// revision = -1 -- use experimental (newest) revision. Only for debug purpose
+getAccountAddress initial_account_state:InitialAccountState revision:int32 = AccountAddress;
+guessAccountRevision initial_account_state:InitialAccountState = AccountRevisionList;
+getAccountState account_address:accountAddress = FullAccountState;
+createQuery private_key:InputKey address:accountAddress timeout:int32 action:Action = query.Info;
 
-wallet.v3.getAccountAddress initital_account_state:wallet.v3.initialAccountState = AccountAddress;
-
-testGiver.getAccountState = testGiver.AccountState;
-testGiver.getAccountAddress = AccountAddress;
-testGiver.sendGrams destination:accountAddress seqno:int32 amount:int64 message:bytes = SendGramsResult;
-
-sync = Ok;
-
-//generic.getAccountAddress initital_account_state:generic.InitialAccountState = AccountAddress;
-generic.getAccountState account_address:accountAddress = generic.AccountState;
-generic.sendGrams private_key:InputKey source:accountAddress destination:accountAddress amount:int64 timeout:int32 allow_send_to_uninited:Bool message:bytes = SendGramsResult;
-
-generic.createSendGramsQuery private_key:InputKey source:accountAddress destination:accountAddress amount:int64 timeout:int32 allow_send_to_uninited:Bool message:bytes = query.Info;
+msg.decrypt input_key:InputKey data:msg.dataArray = msg.DataArray;
 
 query.send id:int53 = Ok;
 query.forget id:int53 = Ok;
 query.estimateFees id:int53 ignore_chksig:Bool = query.Fees;
+// query.emulate id:int53 ignore_chksig:Bool = query.EmulationResult;
 query.getInfo id:int53 = query.Info;
 
 smc.load account_address:accountAddress = smc.Info;
+//smc.forget id:int53 = Ok;
 smc.getCode id:int53 = tvm.Cell;
 smc.getData id:int53 = tvm.Cell;
 smc.getState id:int53 = tvm.Cell;
 smc.runGetMethod id:int53 method:smc.MethodId stack:vector<tvm.StackEntry> = smc.RunResult;
 
+dns.resolve account_address:accountAddress name:string category:int32 ttl:int32 = dns.Resolved;
+
 onLiteServerQueryResult id:int64 bytes:bytes = Ok;
 onLiteServerQueryError id:int64 error:error = Ok;
 
+withBlock id:ton.blockIdExt function:Function = Object;
+
 runTests dir:string = Ok;
 
 liteServer.getInfo = liteServer.Info;
diff --git a/submodules/ton/tonlib-src/tl/generate/scheme/tonlib_api.tlo b/submodules/ton/tonlib-src/tl/generate/scheme/tonlib_api.tlo
index a670da5a67..6a730d89e1 100644
Binary files a/submodules/ton/tonlib-src/tl/generate/scheme/tonlib_api.tlo and b/submodules/ton/tonlib-src/tl/generate/scheme/tonlib_api.tlo differ
diff --git a/submodules/ton/tonlib-src/tl/generate/tl_writer_java.cpp b/submodules/ton/tonlib-src/tl/generate/tl_writer_java.cpp
index 2c7649cc02..690d843dcd 100644
--- a/submodules/ton/tonlib-src/tl/generate/tl_writer_java.cpp
+++ b/submodules/ton/tonlib-src/tl/generate/tl_writer_java.cpp
@@ -14,7 +14,7 @@
     You should have received a copy of the GNU Lesser General Public License
     along with TON Blockchain Library.  If not, see <http://www.gnu.org/licenses/>.
 
-    Copyright 2017-2019 Telegram Systems LLP
+    Copyright 2017-2020 Telegram Systems LLP
 */
 #include "tl_writer_java.h"
 
@@ -34,7 +34,8 @@ int TD_TL_writer_java::get_max_arity() const {
 
 bool TD_TL_writer_java::is_built_in_simple_type(const std::string &name) const {
   return name == "Bool" || name == "Int32" || name == "Int53" || name == "Int64" || name == "Double" ||
-         name == "String" || name == "Bytes" || name == "SecureString" || name == "SecureBytes";
+         name == "String" || name == "Bytes" || name == "SecureString" || name == "SecureBytes" || name == "Object" ||
+         name == "Function";
 }
 
 bool TD_TL_writer_java::is_built_in_complex_type(const std::string &name) const {
@@ -168,6 +169,12 @@ std::string TD_TL_writer_java::gen_type_name(const tl::tl_tree_type *tree_type)
   if (name == "Bytes" || name == "SecureBytes") {
     return "byte[]";
   }
+  if (name == "Object") {
+    return gen_base_type_class_name(0);
+  }
+  if (name == "Function") {
+    return gen_base_function_class_name();
+  }
 
   if (name == "Vector") {
     assert(t->arity == 1);
diff --git a/submodules/ton/tonlib-src/tl/generate/tl_writer_jni_cpp.cpp b/submodules/ton/tonlib-src/tl/generate/tl_writer_jni_cpp.cpp
index 328ea0b463..3eacfe77f4 100644
--- a/submodules/ton/tonlib-src/tl/generate/tl_writer_jni_cpp.cpp
+++ b/submodules/ton/tonlib-src/tl/generate/tl_writer_jni_cpp.cpp
@@ -14,7 +14,7 @@
     You should have received a copy of the GNU Lesser General Public License
     along with TON Blockchain Library.  If not, see <http://www.gnu.org/licenses/>.
 
-    Copyright 2017-2019 Telegram Systems LLP
+    Copyright 2017-2020 Telegram Systems LLP
 */
 #include "tl_writer_jni_cpp.h"
 
@@ -24,8 +24,10 @@
 namespace td {
 
 bool TD_TL_writer_jni_cpp::is_built_in_simple_type(const std::string &name) const {
+  assert(name != "function");
   return name == "Bool" || name == "Int32" || name == "Int53" || name == "Int64" || name == "Double" ||
-         name == "String" || name == "Bytes" || name == "SecureString" || name == "SecureBytes";
+         name == "String" || name == "Bytes" || name == "SecureString" || name == "SecureBytes" || name == "Function" ||
+         name == "Object";
 }
 
 bool TD_TL_writer_jni_cpp::is_built_in_complex_type(const std::string &name) const {
@@ -197,6 +199,7 @@ std::string TD_TL_writer_jni_cpp::gen_type_fetch(const std::string &field_name,
     const tl::tl_tree_type *child = static_cast<const tl::tl_tree_type *>(tree_type->children[0]);
     res = gen_vector_fetch(field_name, child, vars, parser_type);
   } else {
+    assert(gen_main_class_name(tree_type->type) != "function");
     if (field_name == "") {
       return gen_main_class_name(tree_type->type) + "::fetch(env, p)";
     }
diff --git a/submodules/ton/tonlib-src/tl/generate/tl_writer_jni_h.cpp b/submodules/ton/tonlib-src/tl/generate/tl_writer_jni_h.cpp
index 7e12246367..5c9896bd3b 100644
--- a/submodules/ton/tonlib-src/tl/generate/tl_writer_jni_h.cpp
+++ b/submodules/ton/tonlib-src/tl/generate/tl_writer_jni_h.cpp
@@ -14,7 +14,7 @@
     You should have received a copy of the GNU Lesser General Public License
     along with TON Blockchain Library.  If not, see <http://www.gnu.org/licenses/>.
 
-    Copyright 2017-2019 Telegram Systems LLP
+    Copyright 2017-2020 Telegram Systems LLP
 */
 #include "tl_writer_jni_h.h"
 
@@ -24,7 +24,8 @@ namespace td {
 
 bool TD_TL_writer_jni_h::is_built_in_simple_type(const std::string &name) const {
   return name == "Bool" || name == "Int32" || name == "Int53" || name == "Int64" || name == "Double" ||
-         name == "String" || name == "Bytes" || name == "SecureString" || name == "SecureBytes";
+         name == "String" || name == "Bytes" || name == "SecureString" || name == "SecureBytes" || name == "Function" ||
+         name == "Object";
 }
 
 bool TD_TL_writer_jni_h::is_built_in_complex_type(const std::string &name) const {
diff --git a/submodules/ton/tonlib-src/tl/generate/tl_writer_td.cpp b/submodules/ton/tonlib-src/tl/generate/tl_writer_td.cpp
index dc4a98f787..dbcc025d50 100644
--- a/submodules/ton/tonlib-src/tl/generate/tl_writer_td.cpp
+++ b/submodules/ton/tonlib-src/tl/generate/tl_writer_td.cpp
@@ -14,7 +14,7 @@
     You should have received a copy of the GNU Lesser General Public License
     along with TON Blockchain Library.  If not, see <http://www.gnu.org/licenses/>.
 
-    Copyright 2017-2019 Telegram Systems LLP
+    Copyright 2017-2020 Telegram Systems LLP
 */
 #include "tl_writer_td.h"
 
@@ -124,6 +124,12 @@ std::string TD_TL_writer::gen_class_name(std::string name) const {
   if (name == "Object") {
     //assert(false);
   }
+  if (name == "function") {
+    return "Function";
+  }
+  if (name == "object") {
+    return "Object";
+  }
   if (name == "#") {
     return "std::int32_t";
   }
diff --git a/submodules/ton/tonlib-src/ton/ton-types.h b/submodules/ton/tonlib-src/ton/ton-types.h
index fac94dc769..a259c505d5 100644
--- a/submodules/ton/tonlib-src/ton/ton-types.h
+++ b/submodules/ton/tonlib-src/ton/ton-types.h
@@ -23,6 +23,9 @@
 #include "td/utils/bits.h"
 #include "td/utils/Slice.h"
 #include "td/utils/UInt.h"
+#include "td/utils/misc.h"
+
+#include <cinttypes>
 
 namespace ton {
 
@@ -140,7 +143,7 @@ struct AccountIdPrefixFull {
   std::string to_str() const {
     char buffer[64];
     return std::string{
-        buffer, (unsigned)snprintf(buffer, 63, "(%d,%016llx)", workchain, (unsigned long long)account_id_prefix)};
+        buffer, (unsigned)snprintf(buffer, 63, "(%d,%016llx)", workchain, static_cast<long long>(account_id_prefix))};
   }
 };
 
@@ -158,6 +161,9 @@ struct BlockId {
   explicit operator ShardIdFull() const {
     return ShardIdFull{workchain, shard};
   }
+  ShardIdFull shard_full() const {
+    return ShardIdFull{workchain, shard};
+  }
   bool is_valid() const {
     return workchain != workchainInvalid;
   }
@@ -200,8 +206,8 @@ struct BlockId {
   }
   std::string to_str() const {
     char buffer[64];
-    return std::string{buffer,
-                       (unsigned)snprintf(buffer, 63, "(%d,%016llx,%u)", workchain, (unsigned long long)shard, seqno)};
+    return std::string{buffer, (unsigned)snprintf(buffer, 63, "(%d,%016llx,%u)", workchain,
+                                                  static_cast<unsigned long long>(shard), seqno)};
   }
 };
 
@@ -274,6 +280,23 @@ struct BlockIdExt {
   std::string to_str() const {
     return id.to_str() + ':' + root_hash.to_hex() + ':' + file_hash.to_hex();
   }
+  static td::Result<BlockIdExt> from_str(td::CSlice s) {
+    BlockIdExt v;
+    char rh[65];
+    char fh[65];
+    auto r = sscanf(s.begin(), "(%d,%" SCNx64 ",%u):%64s:%64s", &v.id.workchain, &v.id.shard, &v.id.seqno, rh, fh);
+    if (r < 5) {
+      return td::Status::Error("failed to parse block id");
+    }
+    if (strlen(rh) != 64 || strlen(fh) != 64) {
+      return td::Status::Error("failed to parse block id: bad roothash/filehash");
+    }
+    TRY_RESULT(re, td::hex_decode(td::Slice(rh, 64)));
+    v.root_hash.as_slice().copy_from(td::Slice(re));
+    TRY_RESULT(fe, td::hex_decode(td::Slice(fh, 64)));
+    v.file_hash.as_slice().copy_from(td::Slice(fe));
+    return v;
+  }
 };
 
 struct ZeroStateIdExt {
diff --git a/submodules/ton/tonlib-src/tonlib/test/offline.cpp b/submodules/ton/tonlib-src/tonlib/test/offline.cpp
index c615397e3c..223c8edad2 100644
--- a/submodules/ton/tonlib-src/tonlib/test/offline.cpp
+++ b/submodules/ton/tonlib-src/tonlib/test/offline.cpp
@@ -14,7 +14,7 @@
     You should have received a copy of the GNU Lesser General Public License
     along with TON Blockchain Library.  If not, see <http://www.gnu.org/licenses/>.
 
-    Copyright 2017-2019 Telegram Systems LLP
+    Copyright 2017-2020 Telegram Systems LLP
 */
 
 #include "block/block.h"
@@ -35,6 +35,7 @@
 #include "td/utils/benchmark.h"
 #include "td/utils/filesystem.h"
 #include "td/utils/optional.h"
+#include "td/utils/overloaded.h"
 #include "td/utils/port/path.h"
 #include "td/utils/PathView.h"
 #include "td/utils/tests.h"
@@ -60,6 +61,23 @@ TEST(Tonlib, CellString) {
   }
 };
 
+TEST(Tonlib, Text) {
+  for (unsigned size :
+       {0, 1, 7, 8, 35, 127, 128, 255, 256, (int)vm::CellText::max_bytes - 1, (int)vm::CellText::max_bytes}) {
+    auto str = td::rand_string('a', 'z', size);
+    for (unsigned head : {16, 17, 127, 35 * 8, 127 * 8, 1023, 1024}) {
+      vm::CellBuilder cb;
+      vm::CellText::store(cb, str, head).ensure();
+      auto cs = vm::load_cell_slice(cb.finalize());
+      auto cs2 = cs;
+      cs.print_rec(std::cerr);
+      CHECK(block::gen::t_Text.validate_exact_upto(1024, cs2));
+      auto got_str = vm::CellText::load(cs).move_as_ok();
+      ASSERT_EQ(str, got_str);
+    }
+  }
+};
+
 using namespace tonlib;
 
 TEST(Tonlib, PublicKey) {
@@ -126,7 +144,10 @@ TEST(Tonlib, InitClose) {
 )abc";
 
     sync_send(client, make_object<tonlib_api::options_setConfig>(cfg(bad_config.str()))).ensure_error();
-    sync_send(client, make_object<tonlib_api::testGiver_getAccountState>()).ensure_error();
+    auto address = sync_send(client, make_object<tonlib_api::getAccountAddress>(
+                                         make_object<tonlib_api::testGiver_initialAccountState>(), 0))
+                       .move_as_ok();
+    sync_send(client, make_object<tonlib_api::getAccountState>(std::move(address))).ensure_error();
     sync_send(client, make_object<tonlib_api::close>()).ensure();
     sync_send(client, make_object<tonlib_api::close>()).ensure_error();
     sync_send(client, make_object<tonlib_api::init>(make_object<tonlib_api::options>(nullptr, dir("."))))
@@ -134,30 +155,70 @@ TEST(Tonlib, InitClose) {
   }
 }
 
-TEST(Tonlib, SimpleEncryption) {
+template <class Encryption>
+void test_encryption() {
   std::string secret = "secret";
   {
     std::string data = "some private data";
     std::string wrong_secret = "wrong secret";
-    auto encrypted_data = SimpleEncryption::encrypt_data(data, secret);
+    auto encrypted_data = Encryption::encrypt_data(data, secret);
     LOG(ERROR) << encrypted_data.size();
-    auto decrypted_data = SimpleEncryption::decrypt_data(encrypted_data, secret).move_as_ok();
+    auto decrypted_data = Encryption::decrypt_data(encrypted_data, secret).move_as_ok();
     CHECK(data == decrypted_data);
-    SimpleEncryption::decrypt_data(encrypted_data, wrong_secret).ensure_error();
-    SimpleEncryption::decrypt_data("", secret).ensure_error();
-    SimpleEncryption::decrypt_data(std::string(32, 'a'), secret).ensure_error();
-    SimpleEncryption::decrypt_data(std::string(33, 'a'), secret).ensure_error();
-    SimpleEncryption::decrypt_data(std::string(64, 'a'), secret).ensure_error();
-    SimpleEncryption::decrypt_data(std::string(128, 'a'), secret).ensure_error();
+    Encryption::decrypt_data(encrypted_data, wrong_secret).ensure_error();
+    Encryption::decrypt_data("", secret).ensure_error();
+    Encryption::decrypt_data(std::string(32, 'a'), secret).ensure_error();
+    Encryption::decrypt_data(std::string(33, 'a'), secret).ensure_error();
+    Encryption::decrypt_data(std::string(64, 'a'), secret).ensure_error();
+    Encryption::decrypt_data(std::string(128, 'a'), secret).ensure_error();
   }
 
   for (size_t i = 0; i < 255; i++) {
     auto data = td::rand_string('a', 'z', static_cast<int>(i));
-    auto encrypted_data = SimpleEncryption::encrypt_data(data, secret);
-    auto decrypted_data = SimpleEncryption::decrypt_data(encrypted_data, secret).move_as_ok();
+    auto encrypted_data = Encryption::encrypt_data(data, secret);
+    auto decrypted_data = Encryption::decrypt_data(encrypted_data, secret).move_as_ok();
     CHECK(data == decrypted_data);
   }
 }
+TEST(Tonlib, SimpleEncryption) {
+  test_encryption<SimpleEncryption>();
+}
+
+TEST(Tonlib, SimpleEncryptionV2) {
+  test_encryption<SimpleEncryptionV2>();
+}
+
+TEST(Tonlib, SimpleEncryptionAsym) {
+  auto private_key = td::Ed25519::generate_private_key().move_as_ok();
+  auto public_key = private_key.get_public_key().move_as_ok();
+  auto other_private_key = td::Ed25519::generate_private_key().move_as_ok();
+  auto other_public_key = private_key.get_public_key().move_as_ok();
+  auto wrong_private_key = td::Ed25519::generate_private_key().move_as_ok();
+  {
+    std::string data = "some private data";
+    auto encrypted_data = SimpleEncryptionV2::encrypt_data(data, public_key, other_private_key).move_as_ok();
+    LOG(ERROR) << encrypted_data.size();
+    auto decrypted_data = SimpleEncryptionV2::decrypt_data(encrypted_data, private_key).move_as_ok();
+    CHECK(data == decrypted_data);
+    auto decrypted_data2 = SimpleEncryptionV2::decrypt_data(encrypted_data, other_private_key).move_as_ok();
+    CHECK(data == decrypted_data2);
+    SimpleEncryptionV2::decrypt_data(encrypted_data, wrong_private_key).ensure_error();
+    SimpleEncryptionV2::decrypt_data("", private_key).ensure_error();
+    SimpleEncryptionV2::decrypt_data(std::string(32, 'a'), private_key).ensure_error();
+    SimpleEncryptionV2::decrypt_data(std::string(33, 'a'), private_key).ensure_error();
+    SimpleEncryptionV2::decrypt_data(std::string(64, 'a'), private_key).ensure_error();
+    SimpleEncryptionV2::decrypt_data(std::string(128, 'a'), private_key).ensure_error();
+  }
+
+  for (size_t i = 0; i < 255; i++) {
+    auto data = td::rand_string('a', 'z', static_cast<int>(i));
+    auto encrypted_data = SimpleEncryptionV2::encrypt_data(data, public_key, other_private_key).move_as_ok();
+    auto decrypted_data = SimpleEncryptionV2::decrypt_data(encrypted_data, private_key).move_as_ok();
+    CHECK(data == decrypted_data);
+    auto decrypted_data2 = SimpleEncryptionV2::decrypt_data(encrypted_data, other_private_key).move_as_ok();
+    CHECK(data == decrypted_data2);
+  }
+}
 
 class MnemonicBench : public td::Benchmark {
  public:
@@ -437,4 +498,130 @@ TEST(Tonlib, KeysApi) {
                               .move_as_ok();
   CHECK(new_imported_key->public_key_ == key->public_key_);
   CHECK(new_imported_key->secret_ != key->secret_);
+
+  auto exported_raw_key =
+      sync_send(client, make_object<tonlib_api::exportUnencryptedKey>(make_object<tonlib_api::inputKeyRegular>(
+                            make_object<tonlib_api::key>(key->public_key_, new_imported_key->secret_.copy()),
+                            new_local_password.copy())))
+          .move_as_ok();
+  sync_send(client, make_object<tonlib_api::deleteKey>(
+                        make_object<tonlib_api::key>(new_imported_key->public_key_, new_imported_key->secret_.copy())))
+      .move_as_ok();
+  td::Ed25519::PrivateKey pkey(exported_raw_key->data_.copy());
+  auto raw_imported_key = sync_send(client, make_object<tonlib_api::importUnencryptedKey>(new_local_password.copy(),
+                                                                                          std::move(exported_raw_key)))
+                              .move_as_ok();
+
+  CHECK(raw_imported_key->public_key_ == key->public_key_);
+  CHECK(raw_imported_key->secret_ != key->secret_);
+
+  auto other_public_key = td::Ed25519::generate_private_key().move_as_ok().get_public_key().move_as_ok();
+  std::string text = "hello world";
+
+  std::vector<tonlib_api::object_ptr<tonlib_api::msg_Data>> elements;
+  elements.push_back(make_object<tonlib_api::msg_dataEncryptedText>(
+      SimpleEncryptionV2::encrypt_data(text, other_public_key, pkey).move_as_ok().as_slice().str()));
+
+  auto decrypted =
+      sync_send(client, make_object<tonlib_api::msg_decrypt>(
+                            make_object<tonlib_api::inputKeyRegular>(
+                                make_object<tonlib_api::key>(key->public_key_, raw_imported_key->secret_.copy()),
+                                new_local_password.copy()),
+                            make_object<tonlib_api::msg_dataArray>(std::move(elements))))
+          .move_as_ok();
+
+  downcast_call(*decrypted->elements_[0],
+                td::overloaded([](auto &) { UNREACHABLE(); },
+                               [&](tonlib_api::msg_dataDecryptedText &decrypted) { CHECK(decrypted.text_ == text); }));
+}
+
+TEST(Tonlib, ConfigCache) {
+  using tonlib_api::make_object;
+  Client client;
+
+  td::mkdir("testdir").ignore();
+  // init
+  sync_send(client, make_object<tonlib_api::init>(make_object<tonlib_api::options>(
+                        nullptr, make_object<tonlib_api::keyStoreTypeDirectory>("testdir"))))
+      .ensure();
+
+  auto testnet = R"abc({
+  "liteservers": [
+  ],
+  "validator": {
+    "@type": "validator.config.global",
+    "zero_state": {
+      "workchain": -1,
+      "shard": -9223372036854775808,
+      "seqno": 0,
+      "root_hash": "VCSXxDHhTALFxReyTZRd8E4Ya3ySOmpOWAS4rBX9XBY=",
+      "file_hash": "eh9yveSz1qMdJ7mOsO+I+H77jkLr9NpAuEkoJuseXBo="
+    }
+  }
+})abc";
+  auto testnet2 = R"abc({
+  "liteservers": [
+  ],
+  "validator": {
+    "@type": "validator.config.global",
+    "zero_state": {
+      "workchain": -1,
+      "shard": -9223372036854775808,
+      "seqno": 0,
+      "root_hash": "VXSXxDHhTALFxReyTZRd8E4Ya3ySOmpOWAS4rBX9XBY=",
+      "file_hash": "eh9yveSz1qMdJ7mOsO+I+H77jkLr9NpAuEkoJuseXBo="
+    }
+  }
+})abc";
+  auto testnet3 = R"abc({
+  "liteservers": [
+  ],
+  "validator": {
+    "@type": "validator.config.global",
+    "zero_state": {
+      "workchain": -1,
+      "shard": -9223372036854775808,
+      "seqno": 0,
+      "root_hash": "ZXSXxDHhTALFxReyTZRd8E4Ya3ySOmpOWAS4rBX9XBY=",
+      "file_hash": "eh9yveSz1qMdJ7mOsO+I+H77jkLr9NpAuEkoJuseXBo="
+    }
+  }
+})abc";
+  auto bad = R"abc({
+  "liteservers": [
+  ],
+  "validator": {
+    "@type": "validator.config.global",
+    "zero_state": {
+      "workchain": -1,
+      "shard": -9223372036854775808,
+      "seqno": 0,
+      "file_hash": "eh9yveSz1qMdJ7mOsO+I+H77jkLr9NpAuEkoJuseXBo="
+    }
+  }
+})abc";
+  sync_send(client,
+            make_object<tonlib_api::options_validateConfig>(make_object<tonlib_api::config>(bad, "", true, false)))
+      .ensure_error();
+
+  sync_send(client,
+            make_object<tonlib_api::options_validateConfig>(make_object<tonlib_api::config>(testnet, "", true, false)))
+      .ensure();
+  sync_send(client,
+            make_object<tonlib_api::options_validateConfig>(make_object<tonlib_api::config>(testnet2, "", true, false)))
+      .ensure();
+  sync_send(client,
+            make_object<tonlib_api::options_validateConfig>(make_object<tonlib_api::config>(testnet3, "", true, false)))
+      .ensure();
+
+  sync_send(client, make_object<tonlib_api::options_validateConfig>(
+                        make_object<tonlib_api::config>(testnet2, "testnet", true, false)))
+      .ensure_error();
+
+  sync_send(client, make_object<tonlib_api::options_setConfig>(
+                        make_object<tonlib_api::config>(testnet2, "testnet2", true, false)))
+      .ensure();
+  sync_send(client, make_object<tonlib_api::options_setConfig>(
+                        make_object<tonlib_api::config>(testnet3, "testnet2", true, false)))
+      .ensure_error();
 }
diff --git a/submodules/ton/tonlib-src/tonlib/test/online.cpp b/submodules/ton/tonlib-src/tonlib/test/online.cpp
index 8eabc452e2..d6d4a8944a 100644
--- a/submodules/ton/tonlib-src/tonlib/test/online.cpp
+++ b/submodules/ton/tonlib-src/tonlib/test/online.cpp
@@ -23,7 +23,7 @@
     exception statement from your version. If you delete this exception statement 
     from all source files in the program, then also delete it here.
 
-    Copyright 2017-2019 Telegram Systems LLP
+    Copyright 2017-2020 Telegram Systems LLP
 */
 #include "adnl/adnl-ext-client.h"
 #include "tl-utils/tl-utils.hpp"
@@ -37,6 +37,7 @@
 #include "Ed25519.h"
 
 #include "smc-envelope/GenericAccount.h"
+#include "smc-envelope/ManualDns.h"
 #include "smc-envelope/MultisigWallet.h"
 #include "smc-envelope/TestGiver.h"
 #include "smc-envelope/TestWallet.h"
@@ -108,6 +109,10 @@ struct Key {
 struct Wallet {
   std::string address;
   Key key;
+
+  auto get_address() const {
+    return tonlib_api::make_object<tonlib_api::accountAddress>(address);
+  }
 };
 
 struct TransactionId {
@@ -116,7 +121,7 @@ struct TransactionId {
 };
 
 struct AccountState {
-  enum Type { Empty, Wallet, Unknown } type{Empty};
+  enum Type { Empty, Wallet, Dns, Unknown } type{Empty};
   td::int64 sync_utime{-1};
   td::int64 balance{-1};
   TransactionId last_transaction_id;
@@ -136,8 +141,17 @@ void sync(Client& client) {
 static td::uint32 default_wallet_id{0};
 std::string wallet_address(Client& client, const Key& key) {
   return sync_send(client,
-                   make_object<tonlib_api::wallet_v3_getAccountAddress>(
-                       make_object<tonlib_api::wallet_v3_initialAccountState>(key.public_key, default_wallet_id)))
+                   make_object<tonlib_api::getAccountAddress>(
+                       make_object<tonlib_api::wallet_v3_initialAccountState>(key.public_key, default_wallet_id), 0))
+      .move_as_ok()
+      ->account_address_;
+}
+
+std::string highload_wallet_address(Client& client, const Key& key) {
+  return sync_send(client, make_object<tonlib_api::getAccountAddress>(
+                               make_object<tonlib_api::wallet_highload_v2_initialAccountState>(key.public_key,
+                                                                                               default_wallet_id),
+                               1 /*TODO: guess revision!*/))
       .move_as_ok()
       ->account_address_;
 }
@@ -148,35 +162,31 @@ Wallet import_wallet_from_pkey(Client& client, std::string pkey, std::string pas
                                    make_object<tonlib_api::exportedPemKey>(td::SecureString(pkey))))
                  .move_as_ok();
   Wallet wallet{"", {key->public_key_, std::move(key->secret_)}};
-  wallet.address = wallet_address(client, wallet.key);
+  wallet.address = highload_wallet_address(client, wallet.key);
   return wallet;
 }
 
-std::string test_giver_address(Client& client) {
-  using tonlib_api::make_object;
-  return sync_send(client, make_object<tonlib_api::testGiver_getAccountAddress>()).move_as_ok()->account_address_;
-}
-
 AccountState get_account_state(Client& client, std::string address) {
-  auto generic_state = sync_send(client, tonlib_api::make_object<tonlib_api::generic_getAccountState>(
-                                             tonlib_api::make_object<tonlib_api::accountAddress>(address)))
-                           .move_as_ok();
+  auto state = sync_send(client, tonlib_api::make_object<tonlib_api::getAccountState>(
+                                     tonlib_api::make_object<tonlib_api::accountAddress>(address)))
+                   .move_as_ok();
   AccountState res;
-  tonlib_api::downcast_call(*generic_state, [&](auto& state) {
-    res.balance = state.account_state_->balance_;
-    res.sync_utime = state.account_state_->sync_utime_;
-    res.last_transaction_id.lt = state.account_state_->last_transaction_id_->lt_;
-    res.last_transaction_id.hash = state.account_state_->last_transaction_id_->hash_;
-  });
+  res.balance = state->balance_;
+  res.sync_utime = state->sync_utime_;
+  res.last_transaction_id.lt = state->last_transaction_id_->lt_;
+  res.last_transaction_id.hash = state->last_transaction_id_->hash_;
   res.address = address;
-  switch (generic_state->get_id()) {
-    case tonlib_api::generic_accountStateUninited::ID:
+  switch (state->account_state_->get_id()) {
+    case tonlib_api::uninited_accountState::ID:
       res.type = AccountState::Empty;
       break;
-    case tonlib_api::generic_accountStateWalletV3::ID:
-    case tonlib_api::generic_accountStateWallet::ID:
+    case tonlib_api::wallet_v3_accountState::ID:
+    case tonlib_api::wallet_accountState::ID:
       res.type = AccountState::Wallet;
       break;
+    case tonlib_api::dns_accountState::ID:
+      res.type = AccountState::Dns;
+      break;
     default:
       res.type = AccountState::Unknown;
       break;
@@ -219,13 +229,31 @@ struct QueryInfo {
 };
 
 td::Result<QueryId> create_send_grams_query(Client& client, const Wallet& source, std::string destination,
-                                            td::int64 amount, std::string message, bool force = false, int timeout = 0,
-                                            bool fake = false) {
-  auto r_id = sync_send(client, tonlib_api::make_object<tonlib_api::generic_createSendGramsQuery>(
-                                    fake ? source.key.get_fake_input_key() : source.key.get_input_key(),
-                                    tonlib_api::make_object<tonlib_api::accountAddress>(source.address),
-                                    tonlib_api::make_object<tonlib_api::accountAddress>(destination), amount, timeout,
-                                    force, std::move(message)));
+                                            td::int64 amount, bool encrypted, std::string message, bool force = false,
+                                            int timeout = 0, bool fake = false) {
+  std::vector<tonlib_api::object_ptr<tonlib_api::msg_message>> msgs;
+  tonlib_api::object_ptr<tonlib_api::msg_Data> data;
+  if (encrypted) {
+    data = tonlib_api::make_object<tonlib_api::msg_dataDecryptedText>(std::move(message));
+  } else {
+    data = tonlib_api::make_object<tonlib_api::msg_dataText>(std::move(message));
+  }
+  msgs.push_back(tonlib_api::make_object<tonlib_api::msg_message>(
+      tonlib_api::make_object<tonlib_api::accountAddress>(destination), amount, std::move(data)));
+
+  auto r_id =
+      sync_send(client, tonlib_api::make_object<tonlib_api::createQuery>(
+                            fake ? source.key.get_fake_input_key() : source.key.get_input_key(), source.get_address(),
+                            timeout, tonlib_api::make_object<tonlib_api::actionMsg>(std::move(msgs), force)));
+  TRY_RESULT(id, std::move(r_id));
+  return QueryId{id->id_};
+}
+
+td::Result<QueryId> create_update_dns_query(Client& client, const Wallet& dns,
+                                            std::vector<tonlib_api::object_ptr<tonlib_api::dns_Action>> entries) {
+  using namespace ton::tonlib_api;
+  auto r_id = sync_send(client, make_object<createQuery>(dns.key.get_input_key(), dns.get_address(), 60,
+                                                         make_object<actionDns>(std::move(entries))));
   TRY_RESULT(id, std::move(r_id));
   return QueryId{id->id_};
 }
@@ -242,7 +270,11 @@ td::Result<QueryId> create_raw_query(Client& client, std::string source, std::st
 std::pair<Fee, Fee> query_estimate_fees(Client& client, QueryId query_id, bool ignore_chksig = false) {
   auto fees = sync_send(client, tonlib_api::make_object<tonlib_api::query_estimateFees>(query_id.id, ignore_chksig))
                   .move_as_ok();
-  return std::make_pair(to_fee(fees->source_fees_), to_fee(fees->destination_fees_));
+  Fee second;
+  if (!fees->destination_fees_.empty()) {
+    second = to_fee(fees->destination_fees_[0]);
+  }
+  return std::make_pair(to_fee(fees->source_fees_), second);
 }
 
 void query_send(Client& client, QueryId query_id) {
@@ -266,26 +298,45 @@ td::Result<AccountState> wait_state_change(Client& client, const AccountState& o
   }
 };
 
-td::Result<tonlib_api::object_ptr<tonlib_api::raw_transactions>> get_transactions(Client& client, std::string address,
+td::Result<tonlib_api::object_ptr<tonlib_api::raw_transactions>> get_transactions(Client& client,
+                                                                                  td::optional<const Wallet*> wallet,
+                                                                                  std::string address,
                                                                                   const TransactionId& from) {
   auto got_transactions = sync_send(client, make_object<tonlib_api::raw_getTransactions>(
+                                                wallet ? wallet.value()->key.get_input_key() : nullptr,
                                                 make_object<tonlib_api::accountAddress>(address),
                                                 make_object<tonlib_api::internal_transactionId>(from.lt, from.hash)))
                               .move_as_ok();
   return std::move(got_transactions);
 }
 
-td::Status transfer_grams(Client& client, const Wallet& wallet, std::string address, td::int64 amount) {
+std::string read_text(tonlib_api::msg_Data& data) {
+  std::string text;
+  downcast_call(data, td::overloaded([](auto& other) {}, [&](tonlib_api::msg_dataText& data) { text = data.text_; },
+                                     [&](tonlib_api::msg_dataDecryptedText& data) { text = data.text_; }));
+  return text;
+}
+
+td::Status transfer_grams(Client& client, const Wallet& wallet, std::string address, td::int64 amount,
+                          bool fast = false) {
   auto src_state = get_account_state(client, wallet.address);
   auto dst_state = get_account_state(client, address);
   auto message = td::rand_string('a', 'z', 500);
 
   LOG(INFO) << "Transfer: create query " << (double)amount / Gramm << " from " << wallet.address << " to " << address;
-  auto r_query_id = create_send_grams_query(client, wallet, address, amount, message);
+  bool encrypt = true;
+  auto r_query_id = create_send_grams_query(client, wallet, address, amount, encrypt, message, fast);
+  if (r_query_id.is_error()) {
+    LOG(INFO) << "Send query WITHOUT message encryption " << r_query_id.error();
+    encrypt = false;
+    r_query_id = create_send_grams_query(client, wallet, address, amount, encrypt, message, fast);
+  } else {
+    LOG(INFO) << "Send query WITH message encryption";
+  }
   if (r_query_id.is_error() && td::begins_with(r_query_id.error().message(), "DANGEROUS_TRANSACTION")) {
     ASSERT_TRUE(dst_state.type == AccountState::Empty);
     LOG(INFO) << "Transfer: recreate query due to DANGEROUS_TRANSACTION error";
-    r_query_id = create_send_grams_query(client, wallet, address, amount, message, true);
+    r_query_id = create_send_grams_query(client, wallet, address, amount, false, message, true);
   }
 
   r_query_id.ensure();
@@ -304,6 +355,9 @@ td::Status transfer_grams(Client& client, const Wallet& wallet, std::string addr
   LOG(INFO) << "Transfer: send query";
 
   query_send(client, query_id);
+  if (fast) {
+    return td::Status::OK();
+  }
   td::Timer timer;
   TRY_RESULT(new_src_state, wait_state_change(client, src_state, query_info.valid_until));
   LOG(INFO) << "Transfer: reached source in " << timer;
@@ -311,12 +365,12 @@ td::Status transfer_grams(Client& client, const Wallet& wallet, std::string addr
   td::int64 lt;
   td::int64 first_fee;
   {
-    auto tr = get_transactions(client, src_state.address, new_src_state.last_transaction_id).move_as_ok();
+    auto tr = get_transactions(client, &wallet, src_state.address, new_src_state.last_transaction_id).move_as_ok();
     CHECK(tr->transactions_.size() > 0);
     const auto& txn = tr->transactions_[0];
     CHECK(txn->in_msg_->body_hash_ == query_info.body_hash);
     ASSERT_EQ(1u, txn->out_msgs_.size());
-    ASSERT_EQ(message, txn->out_msgs_[0]->message_);
+    ASSERT_EQ(message, read_text(*txn->out_msgs_[0]->msg_data_));
     lt = txn->out_msgs_[0]->created_lt_;
     auto fee_difference = fees.first.sum() - txn->fee_;
     first_fee = txn->fee_;
@@ -331,7 +385,7 @@ td::Status transfer_grams(Client& client, const Wallet& wallet, std::string addr
   LOG(INFO) << "Transfer: reached destination in " << timer;
 
   {
-    auto tr = get_transactions(client, dst_state.address, new_dst_state.last_transaction_id).move_as_ok();
+    auto tr = get_transactions(client, {}, dst_state.address, new_dst_state.last_transaction_id).move_as_ok();
     CHECK(tr->transactions_.size() > 0);
     const auto& txn = tr->transactions_[0];
     ASSERT_EQ(lt, txn->in_msg_->created_lt_);
@@ -341,7 +395,9 @@ td::Status transfer_grams(Client& client, const Wallet& wallet, std::string addr
       ASSERT_EQ(new_src_state.address, txn->in_msg_->source_);
     }
     ASSERT_EQ(new_src_state.address, txn->in_msg_->source_);
-    ASSERT_EQ(message, txn->in_msg_->message_);
+    if (!encrypt) {
+      ASSERT_EQ(message, read_text(*txn->in_msg_->msg_data_));
+    }
     auto fee_difference = fees.second.sum() - txn->fee_;
     auto desc = PSTRING() << fee_difference << " storage:[" << fees.second.storage_fee << " vs " << txn->storage_fee_
                           << "] other:[" << fees.second.sum() - fees.second.storage_fee << " vs " << txn->other_fee_
@@ -361,9 +417,10 @@ Wallet create_empty_wallet(Client& client) {
   Wallet wallet{"", {key->public_key_, std::move(key->secret_)}};
 
   auto account_address =
-      sync_send(client,
-                make_object<tonlib_api::wallet_v3_getAccountAddress>(
-                    make_object<tonlib_api::wallet_v3_initialAccountState>(wallet.key.public_key, default_wallet_id)))
+      sync_send(
+          client,
+          make_object<tonlib_api::getAccountAddress>(
+              make_object<tonlib_api::wallet_v3_initialAccountState>(wallet.key.public_key, default_wallet_id), 0))
           .move_as_ok();
 
   wallet.address = account_address->account_address_;
@@ -376,31 +433,33 @@ Wallet create_empty_wallet(Client& client) {
   return wallet;
 }
 
-void dump_transaction_history(Client& client, std::string address) {
+Wallet create_empty_dns(Client& client) {
   using tonlib_api::make_object;
-  auto state = sync_send(client, make_object<tonlib_api::testGiver_getAccountState>()).move_as_ok();
-  auto tid = std::move(state->last_transaction_id_);
-  int cnt = 0;
-  while (tid->lt_ != 0) {
-    auto lt = tid->lt_;
-    auto got_transactions = sync_send(client, make_object<tonlib_api::raw_getTransactions>(
-                                                  make_object<tonlib_api::accountAddress>(address), std::move(tid)))
-                                .move_as_ok();
-    CHECK(got_transactions->transactions_.size() > 0);
-    CHECK(got_transactions->previous_transaction_id_->lt_ < lt);
-    for (auto& txn : got_transactions->transactions_) {
-      LOG(ERROR) << to_string(txn);
-      cnt++;
-    }
-    tid = std::move(got_transactions->previous_transaction_id_);
-  }
-  LOG(ERROR) << cnt;
+  auto key = sync_send(client, make_object<tonlib_api::createNewKey>(td::SecureString("local"), td::SecureString(),
+                                                                     td::SecureString()))
+                 .move_as_ok();
+  Wallet dns{"", {key->public_key_, std::move(key->secret_)}};
+
+  auto account_address =
+      sync_send(client, make_object<tonlib_api::getAccountAddress>(
+                            make_object<tonlib_api::dns_initialAccountState>(dns.key.public_key, default_wallet_id), 0))
+          .move_as_ok();
+
+  dns.address = account_address->account_address_;
+
+  // get state of empty account
+  auto state = get_account_state(client, dns.address);
+  ASSERT_EQ(-1, state.balance);
+  ASSERT_EQ(AccountState::Empty, state.type);
+
+  return dns;
 }
 
 void test_estimate_fees_without_key(Client& client, const Wallet& wallet_a, const Wallet& wallet_b) {
   LOG(ERROR) << " SUBTEST: estimate fees without key";
   {
-    auto query_id = create_send_grams_query(client, wallet_a, wallet_b.address, 0, "???", true, 0, true).move_as_ok();
+    auto query_id =
+        create_send_grams_query(client, wallet_a, wallet_b.address, 0, false, "???", true, 0, true).move_as_ok();
     auto fees1 = query_estimate_fees(client, query_id, false);
     auto fees2 = query_estimate_fees(client, query_id, true);
     LOG(INFO) << "Fee without ignore_chksig\t" << fees1;
@@ -451,6 +510,7 @@ void test_multisig(Client& client, const Wallet& giver_wallet) {
 
   int n = 16;
   int k = 10;
+  td::uint32 wallet_id = 7;
   std::vector<td::Ed25519::PrivateKey> private_keys;
   for (int i = 0; i < n; i++) {
     private_keys.push_back(td::Ed25519::generate_private_key().move_as_ok());
@@ -458,6 +518,7 @@ void test_multisig(Client& client, const Wallet& giver_wallet) {
 
   auto ms = ton::MultisigWallet::create();
   auto init_data = ms->create_init_data(
+      wallet_id,
       td::transform(private_keys, [](const auto& pk) { return pk.get_public_key().move_as_ok().as_octet_string(); }),
       k);
   ms = ton::MultisigWallet::create(init_data);
@@ -472,7 +533,7 @@ void test_multisig(Client& client, const Wallet& giver_wallet) {
     ton::GenericAccount::store_int_message(icb, block::StdAddress::parse(giver_wallet.address).move_as_ok(), 1);
     icb.store_bytes("\0\0\0\0", 4);
     vm::CellString::store(icb, "Greatings from multisig", 35 * 8).ensure();
-    ton::MultisigWallet::QueryBuilder qb(-1 - i, icb.finalize());
+    ton::MultisigWallet::QueryBuilder qb(wallet_id, -1 - i, icb.finalize());
     for (int i = 0; i < k - 1; i++) {
       qb.sign(i, private_keys[i]);
     }
@@ -493,6 +554,66 @@ void test_multisig(Client& client, const Wallet& giver_wallet) {
   }
 }
 
+void dns_resolve(Client& client, const Wallet& dns, std::string name) {
+  using namespace ton::tonlib_api;
+  auto address = dns.get_address();
+  auto resolved =
+      sync_send(client, make_object<::ton::tonlib_api::dns_resolve>(std::move(address), name, 1, 4)).move_as_ok();
+  CHECK(resolved->entries_.size() == 1);
+  LOG(INFO) << to_string(resolved);
+  LOG(INFO) << "OK";
+}
+
+void test_dns(Client& client, const Wallet& giver_wallet) {
+  auto A = create_empty_dns(client);
+  auto A_B = create_empty_dns(client);
+  auto A_B_C = create_empty_dns(client);
+  transfer_grams(client, giver_wallet, A.address, 1 * Gramm, true).ensure();
+  transfer_grams(client, giver_wallet, A_B.address, 1 * Gramm, true).ensure();
+  transfer_grams(client, giver_wallet, A_B_C.address, 1 * Gramm, true).ensure();
+
+  using namespace ton::tonlib_api;
+  std::vector<object_ptr<dns_Action>> actions;
+
+  actions.push_back(make_object<dns_actionSet>(
+      make_object<dns_entry>("A", -1, make_object<dns_entryDataNextResolver>(A_B.get_address()))));
+  auto init_A = create_update_dns_query(client, A, std::move(actions)).move_as_ok();
+  actions.push_back(make_object<dns_actionSet>(
+      make_object<dns_entry>("B", -1, make_object<dns_entryDataNextResolver>(A_B_C.get_address()))));
+  auto init_A_B = create_update_dns_query(client, A_B, std::move(actions)).move_as_ok();
+  actions.push_back(
+      make_object<dns_actionSet>(make_object<dns_entry>("C", 1, make_object<dns_entryDataText>("Hello dns"))));
+  auto init_A_B_C = create_update_dns_query(client, A_B_C, std::move(actions)).move_as_ok();
+
+  LOG(INFO) << "Send dns init queries";
+  ::query_send(client, init_A);
+  ::query_send(client, init_A_B);
+  ::query_send(client, init_A_B_C);
+
+  auto wait = [&](auto& query, auto& dns) {
+    auto info = query_get_info(client, query);
+    LOG(INFO) << "Wait till dns " << dns.address << " is inited " << info.valid_until;
+    while (true) {
+      auto state = get_account_state(client, dns.address);
+      LOG(INFO) << "Account type: " << state.type << "  " << state.sync_utime;
+      if (state.type == ::AccountState::Dns) {
+        break;
+      }
+      if (state.sync_utime >= info.valid_until) {
+        LOG(FATAL) << "Query expired";
+      }
+      LOG(INFO) << "time left to wait: " << td::format::as_time(info.valid_until - state.sync_utime);
+      client.receive(1);
+    }
+  };
+  wait(init_A, A);
+  wait(init_A_B, A_B);
+  wait(init_A_B_C, A_B_C);
+
+  // search "C.B.A"
+  ::dns_resolve(client, A, "C.B.A");
+}
+
 int main(int argc, char* argv[]) {
   td::set_default_failure_signal_handler();
   using tonlib_api::make_object;
@@ -533,14 +654,12 @@ int main(int argc, char* argv[]) {
 
   Client client;
   {
-    auto info = sync_send(client, make_object<tonlib_api::options_validateConfig>(
-                                      make_object<tonlib_api::config>(global_config_str, "", false, false)))
+    auto info = sync_send(client, make_object<tonlib_api::init>(make_object<tonlib_api::options>(
+                                      make_object<tonlib_api::config>(global_config_str, "", false, false),
+                                      make_object<tonlib_api::keyStoreTypeDirectory>(keystore_dir))))
                     .move_as_ok();
-    default_wallet_id = static_cast<td::uint32>(info->default_wallet_id_);
-    sync_send(client, make_object<tonlib_api::init>(make_object<tonlib_api::options>(
-                          make_object<tonlib_api::config>(global_config_str, "", false, false),
-                          make_object<tonlib_api::keyStoreTypeDirectory>(keystore_dir))))
-        .ensure();
+    default_wallet_id = static_cast<td::uint32>(info->config_info_->default_wallet_id_);
+    LOG(ERROR) << default_wallet_id;
   }
 
   // wait till client is synchronized with blockchain.
@@ -550,6 +669,7 @@ int main(int argc, char* argv[]) {
   // give wallet with some test grams to run test
   auto giver_wallet = import_wallet_from_pkey(client, giver_key_str, giver_key_pwd);
 
+  test_dns(client, giver_wallet);
   test_back_and_forth_transfer(client, giver_wallet, false);
   test_back_and_forth_transfer(client, giver_wallet, true);
   test_multisig(client, giver_wallet);
diff --git a/submodules/ton/tonlib-src/tonlib/tonlib/KeyStorage.cpp b/submodules/ton/tonlib-src/tonlib/tonlib/KeyStorage.cpp
index f1ac827156..cd2a73bc01 100644
--- a/submodules/ton/tonlib-src/tonlib/tonlib/KeyStorage.cpp
+++ b/submodules/ton/tonlib-src/tonlib/tonlib/KeyStorage.cpp
@@ -14,7 +14,7 @@
     You should have received a copy of the GNU Lesser General Public License
     along with TON Blockchain Library.  If not, see <http://www.gnu.org/licenses/>.
 
-    Copyright 2017-2019 Telegram Systems LLP
+    Copyright 2017-2020 Telegram Systems LLP
 */
 #include "KeyStorage.h"
 
@@ -179,6 +179,11 @@ td::Result<KeyStorage::ExportedEncryptedKey> KeyStorage::export_encrypted_key(In
   return ExportedEncryptedKey{std::move(res.encrypted_data)};
 }
 
+td::Result<KeyStorage::ExportedUnencryptedKey> KeyStorage::export_unencrypted_key(InputKey input_key) {
+  TRY_RESULT(decrypted_key, export_decrypted_key(std::move(input_key)));
+  return ExportedUnencryptedKey{decrypted_key.private_key.as_octet_string()};
+}
+
 td::Result<KeyStorage::Key> KeyStorage::import_encrypted_key(td::Slice local_password, td::Slice key_password,
                                                              ExportedEncryptedKey exported_key) {
   EncryptedKey encrypted_key{std::move(exported_key.data), td::Ed25519::PublicKey(td::SecureString()),
@@ -187,6 +192,14 @@ td::Result<KeyStorage::Key> KeyStorage::import_encrypted_key(td::Slice local_pas
   return save_key(std::move(decrypted_key), local_password);
 }
 
+td::Result<KeyStorage::Key> KeyStorage::import_unencrypted_key(td::Slice local_password,
+                                                               ExportedUnencryptedKey exported_key) {
+  RawDecryptedKey raw_key;
+  raw_key.private_key = std::move(exported_key.data);
+  DecryptedKey key(std::move(raw_key));
+  return save_key(std::move(key), local_password);
+}
+
 KeyStorage::PrivateKey KeyStorage::fake_private_key() {
   return PrivateKey{td::SecureString(32, 0)};
 }
diff --git a/submodules/ton/tonlib-src/tonlib/tonlib/KeyStorage.h b/submodules/ton/tonlib-src/tonlib/tonlib/KeyStorage.h
index 38478bf1f3..9d012ccdd5 100644
--- a/submodules/ton/tonlib-src/tonlib/tonlib/KeyStorage.h
+++ b/submodules/ton/tonlib-src/tonlib/tonlib/KeyStorage.h
@@ -14,7 +14,7 @@
     You should have received a copy of the GNU Lesser General Public License
     along with TON Blockchain Library.  If not, see <http://www.gnu.org/licenses/>.
 
-    Copyright 2017-2019 Telegram Systems LLP
+    Copyright 2017-2020 Telegram Systems LLP
 */
 #pragma once
 
@@ -46,6 +46,9 @@ class KeyStorage {
   struct ExportedEncryptedKey {
     td::SecureString data;
   };
+  struct ExportedUnencryptedKey {
+    td::SecureString data;
+  };
   struct PrivateKey {
     td::SecureString private_key;
   };
@@ -57,6 +60,7 @@ class KeyStorage {
   td::Result<ExportedKey> export_key(InputKey input_key);
   td::Result<ExportedPemKey> export_pem_key(InputKey input_key, td::Slice key_password);
   td::Result<ExportedEncryptedKey> export_encrypted_key(InputKey input_key, td::Slice key_password);
+  td::Result<ExportedUnencryptedKey> export_unencrypted_key(InputKey input_key);
   td::Result<Key> change_local_password(InputKey input_key, td::Slice new_local_password);
 
   td::Status delete_key(const Key& key);
@@ -66,6 +70,7 @@ class KeyStorage {
   td::Result<Key> import_pem_key(td::Slice local_password, td::Slice key_password, ExportedPemKey exported_key);
   td::Result<Key> import_encrypted_key(td::Slice local_password, td::Slice key_password,
                                        ExportedEncryptedKey exported_key);
+  td::Result<Key> import_unencrypted_key(td::Slice local_password, ExportedUnencryptedKey exported_key);
 
   td::Result<PrivateKey> load_private_key(InputKey input_key);
 
diff --git a/submodules/ton/tonlib-src/tonlib/tonlib/KeyValue.cpp b/submodules/ton/tonlib-src/tonlib/tonlib/KeyValue.cpp
index ccf9a38372..cdb0f5eeee 100644
--- a/submodules/ton/tonlib-src/tonlib/tonlib/KeyValue.cpp
+++ b/submodules/ton/tonlib-src/tonlib/tonlib/KeyValue.cpp
@@ -1,3 +1,21 @@
+/*
+    This file is part of TON Blockchain Library.
+
+    TON Blockchain Library is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Lesser General Public License as published by
+    the Free Software Foundation, either version 2 of the License, or
+    (at your option) any later version.
+
+    TON Blockchain Library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public License
+    along with TON Blockchain Library.  If not, see <http://www.gnu.org/licenses/>.
+
+    Copyright 2017-2020 Telegram Systems LLP
+*/
 #include "KeyValue.h"
 
 #include "td/utils/filesystem.h"
@@ -106,11 +124,7 @@ class KeyValueInmemory : public KeyValue {
   }
 
  private:
-  class Cmp : public std::less<> {
-   public:
-    using is_transparent = void;
-  };
-  std::map<std::string, td::SecureString, Cmp> map_;
+  std::map<std::string, td::SecureString, std::less<>> map_;
 };
 }  // namespace detail
 
diff --git a/submodules/ton/tonlib-src/tonlib/tonlib/KeyValue.h b/submodules/ton/tonlib-src/tonlib/tonlib/KeyValue.h
index 7d2020acc9..33aef44e7f 100644
--- a/submodules/ton/tonlib-src/tonlib/tonlib/KeyValue.h
+++ b/submodules/ton/tonlib-src/tonlib/tonlib/KeyValue.h
@@ -1,3 +1,21 @@
+/*
+    This file is part of TON Blockchain Library.
+
+    TON Blockchain Library is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Lesser General Public License as published by
+    the Free Software Foundation, either version 2 of the License, or
+    (at your option) any later version.
+
+    TON Blockchain Library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public License
+    along with TON Blockchain Library.  If not, see <http://www.gnu.org/licenses/>.
+
+    Copyright 2017-2020 Telegram Systems LLP
+*/
 #pragma once
 #include "td/utils/SharedSlice.h"
 #include "td/utils/Slice.h"
diff --git a/submodules/ton/tonlib-src/tonlib/tonlib/LastConfig.h b/submodules/ton/tonlib-src/tonlib/tonlib/LastConfig.h
index 2e0cf2a399..514b4a5953 100644
--- a/submodules/ton/tonlib-src/tonlib/tonlib/LastConfig.h
+++ b/submodules/ton/tonlib-src/tonlib/tonlib/LastConfig.h
@@ -14,7 +14,7 @@
     You should have received a copy of the GNU Lesser General Public License
     along with TON Blockchain Library.  If not, see <http://www.gnu.org/licenses/>.
 
-    Copyright 2017-2019 Telegram Systems LLP
+    Copyright 2017-2020 Telegram Systems LLP
 */
 #pragma once
 #include "td/actor/actor.h"
@@ -54,7 +54,7 @@ class LastConfig : public td::actor::Actor {
   QueryState get_config_state_{QueryState::Empty};
 
   std::vector<td::Promise<LastConfigState>> promises_;
-  std::vector<td::int32> params_{18, 20, 21, 24, 25};
+  std::vector<td::int32> params_{4, 18, 20, 21, 24, 25};
 
   void with_last_block(td::Result<LastBlockState> r_last_block);
   void on_config(td::Result<ton::ton_api::object_ptr<ton::lite_api::liteServer_configInfo>> r_config);
diff --git a/submodules/ton/tonlib-src/tonlib/tonlib/TonlibClient.cpp b/submodules/ton/tonlib-src/tonlib/tonlib/TonlibClient.cpp
index 95a089d720..f031596167 100644
--- a/submodules/ton/tonlib-src/tonlib/tonlib/TonlibClient.cpp
+++ b/submodules/ton/tonlib-src/tonlib/tonlib/TonlibClient.cpp
@@ -14,7 +14,7 @@
     You should have received a copy of the GNU Lesser General Public License
     along with TON Blockchain Library.  If not, see <http://www.gnu.org/licenses/>.
 
-    Copyright 2017-2019 Telegram Systems LLP
+    Copyright 2017-2020 Telegram Systems LLP
 */
 #include "TonlibClient.h"
 
@@ -29,10 +29,14 @@
 #include "tonlib/TonlibError.h"
 
 #include "smc-envelope/GenericAccount.h"
+#include "smc-envelope/ManualDns.h"
 #include "smc-envelope/TestWallet.h"
 #include "smc-envelope/Wallet.h"
 #include "smc-envelope/WalletV3.h"
+#include "smc-envelope/HighloadWallet.h"
+#include "smc-envelope/HighloadWalletV2.h"
 #include "smc-envelope/TestGiver.h"
+#include "smc-envelope/SmartContractCode.h"
 
 #include "auto/tl/tonlib_api.hpp"
 #include "block/block-auto.h"
@@ -50,22 +54,61 @@
 #include "td/utils/tests.h"
 #include "td/utils/port/path.h"
 
+#include "common/util.h"
+
 namespace tonlib {
 namespace int_api {
 struct GetAccountState {
   block::StdAddress address;
+  td::optional<ton::BlockIdExt> block_id;
   using ReturnType = td::unique_ptr<AccountState>;
 };
+
+struct RemoteRunSmcMethod {
+  block::StdAddress address;
+  td::optional<ton::BlockIdExt> block_id;
+  ton::SmartContract::Args args;
+  bool need_result{false};
+
+  using ReturnType = RemoteRunSmcMethodReturnType;
+};
+
+struct RemoteRunSmcMethodReturnType {
+  ton::SmartContract::State smc_state;
+  ton::BlockIdExt block_id;
+  // result
+  // c7
+  // libs
+};
+
 struct GetPrivateKey {
   KeyStorage::InputKey input_key;
   using ReturnType = KeyStorage::PrivateKey;
 };
+struct GetDnsResolver {
+  using ReturnType = block::StdAddress;
+};
 struct SendMessage {
   td::Ref<vm::Cell> message;
   using ReturnType = td::Unit;
 };
 }  // namespace int_api
 
+template <class R, class O, class F>
+R downcast_call2(O&& o, F&& f, R res = {}) {
+  downcast_call(o, [&](auto& x) { res = f(x); });
+  return res;
+}
+
+auto to_tonlib_api(const ton::BlockIdExt& blk) {
+  return tonlib_api::make_object<tonlib_api::ton_blockIdExt>(
+      blk.id.workchain, blk.id.shard, blk.id.seqno, blk.root_hash.as_slice().str(), blk.file_hash.as_slice().str());
+}
+
+tonlib_api::object_ptr<tonlib_api::options_configInfo> to_tonlib_api(const TonlibClient::FullConfig& full_config) {
+  return tonlib_api::make_object<tonlib_api::options_configInfo>(full_config.wallet_id);
+}
+
 class TonlibQueryActor : public td::actor::Actor {
  public:
   TonlibQueryActor(td::actor::ActorShared<TonlibClient> client) : client_(std::move(client)) {
@@ -95,6 +138,16 @@ static block::AccountState create_account_state(ton::tl_object_ptr<ton::lite_api
   res.state = std::move(from->state_);
   return res;
 }
+static block::AccountState create_account_state(ton::tl_object_ptr<ton::lite_api::liteServer_runMethodResult>& from) {
+  block::AccountState res;
+  res.blk = ton::create_block_id(from->id_);
+  res.shard_blk = ton::create_block_id(from->shardblk_);
+  res.shard_proof = std::move(from->shard_proof_);
+  res.proof = std::move(from->proof_);
+  res.state = std::move(from->state_proof_);
+  res.is_virtualized = from->mode_ > 0;
+  return res;
+}
 struct RawAccountState {
   td::int64 balance = -1;
 
@@ -106,6 +159,7 @@ struct RawAccountState {
   td::Ref<vm::Cell> state;
   std::string frozen_hash;
   block::AccountState::Info info;
+  ton::BlockIdExt block_id;
 };
 
 tonlib_api::object_ptr<tonlib_api::internal_transactionId> empty_transaction_id() {
@@ -125,12 +179,11 @@ class AccountState {
  public:
   AccountState(block::StdAddress address, RawAccountState&& raw, td::uint32 wallet_id)
       : address_(std::move(address)), raw_(std::move(raw)), wallet_id_(wallet_id) {
-    wallet_type_ = guess_type();
+    guess_type();
   }
 
   auto to_uninited_accountState() const {
-    return tonlib_api::make_object<tonlib_api::uninited_accountState>(get_balance(), to_transaction_id(raw().info),
-                                                                      raw().frozen_hash, get_sync_time());
+    return tonlib_api::make_object<tonlib_api::uninited_accountState>(raw().frozen_hash);
   }
 
   td::Result<tonlib_api::object_ptr<tonlib_api::raw_accountState>> to_raw_accountState() const {
@@ -143,9 +196,22 @@ class AccountState {
     if (state.data.not_null()) {
       data = to_bytes(state.data);
     }
-    return tonlib_api::make_object<tonlib_api::raw_accountState>(get_balance(), std::move(code), std::move(data),
-                                                                 to_transaction_id(raw().info), raw().frozen_hash,
-                                                                 get_sync_time());
+    return tonlib_api::make_object<tonlib_api::raw_accountState>(std::move(code), std::move(data), raw().frozen_hash);
+  }
+
+  td::Result<tonlib_api::object_ptr<tonlib_api::raw_fullAccountState>> to_raw_fullAccountState() const {
+    auto state = get_smc_state();
+    std::string code;
+    if (state.code.not_null()) {
+      code = to_bytes(state.code);
+    }
+    std::string data;
+    if (state.data.not_null()) {
+      data = to_bytes(state.data);
+    }
+    return tonlib_api::make_object<tonlib_api::raw_fullAccountState>(
+        get_balance(), std::move(code), std::move(data), to_transaction_id(raw().info), to_tonlib_api(raw().block_id),
+        raw().frozen_hash, get_sync_time());
   }
 
   td::Result<tonlib_api::object_ptr<tonlib_api::testWallet_accountState>> to_testWallet_accountState() const {
@@ -153,8 +219,7 @@ class AccountState {
       return TonlibError::AccountTypeUnexpected("TestWallet");
     }
     TRY_RESULT(seqno, ton::TestWallet(get_smc_state()).get_seqno());
-    return tonlib_api::make_object<tonlib_api::testWallet_accountState>(get_balance(), static_cast<td::uint32>(seqno),
-                                                                        to_transaction_id(raw().info), get_sync_time());
+    return tonlib_api::make_object<tonlib_api::testWallet_accountState>(static_cast<td::uint32>(seqno));
   }
 
   td::Result<tonlib_api::object_ptr<tonlib_api::wallet_accountState>> to_wallet_accountState() const {
@@ -162,8 +227,7 @@ class AccountState {
       return TonlibError::AccountTypeUnexpected("Wallet");
     }
     TRY_RESULT(seqno, ton::Wallet(get_smc_state()).get_seqno());
-    return tonlib_api::make_object<tonlib_api::wallet_accountState>(get_balance(), static_cast<td::uint32>(seqno),
-                                                                    to_transaction_id(raw().info), get_sync_time());
+    return tonlib_api::make_object<tonlib_api::wallet_accountState>(static_cast<td::uint32>(seqno));
   }
   td::Result<tonlib_api::object_ptr<tonlib_api::wallet_v3_accountState>> to_wallet_v3_accountState() const {
     if (wallet_type_ != WalletV3) {
@@ -172,9 +236,28 @@ class AccountState {
     auto wallet = ton::WalletV3(get_smc_state());
     TRY_RESULT(seqno, wallet.get_seqno());
     TRY_RESULT(wallet_id, wallet.get_wallet_id());
-    return tonlib_api::make_object<tonlib_api::wallet_v3_accountState>(
-        get_balance(), static_cast<td::uint32>(wallet_id), static_cast<td::uint32>(seqno),
-        to_transaction_id(raw().info), get_sync_time());
+    return tonlib_api::make_object<tonlib_api::wallet_v3_accountState>(static_cast<td::uint32>(wallet_id),
+                                                                       static_cast<td::uint32>(seqno));
+  }
+  td::Result<tonlib_api::object_ptr<tonlib_api::wallet_highload_v1_accountState>> to_wallet_highload_v1_accountState()
+      const {
+    if (wallet_type_ != HighloadWalletV1) {
+      return TonlibError::AccountTypeUnexpected("HighloadWalletV1");
+    }
+    auto wallet = ton::HighloadWallet(get_smc_state());
+    TRY_RESULT(seqno, wallet.get_seqno());
+    TRY_RESULT(wallet_id, wallet.get_wallet_id());
+    return tonlib_api::make_object<tonlib_api::wallet_highload_v1_accountState>(static_cast<td::uint32>(wallet_id),
+                                                                                static_cast<td::uint32>(seqno));
+  }
+  td::Result<tonlib_api::object_ptr<tonlib_api::wallet_highload_v2_accountState>> to_wallet_highload_v2_accountState()
+      const {
+    if (wallet_type_ != HighloadWalletV2) {
+      return TonlibError::AccountTypeUnexpected("HighloadWalletV2");
+    }
+    auto wallet = ton::HighloadWalletV2(get_smc_state());
+    TRY_RESULT(wallet_id, wallet.get_wallet_id());
+    return tonlib_api::make_object<tonlib_api::wallet_highload_v2_accountState>(static_cast<td::uint32>(wallet_id));
   }
 
   td::Result<tonlib_api::object_ptr<tonlib_api::testGiver_accountState>> to_testGiver_accountState() const {
@@ -182,41 +265,106 @@ class AccountState {
       return TonlibError::AccountTypeUnexpected("TestGiver");
     }
     TRY_RESULT(seqno, ton::TestGiver(get_smc_state()).get_seqno());
-    return tonlib_api::make_object<tonlib_api::testGiver_accountState>(get_balance(), static_cast<td::uint32>(seqno),
-                                                                       to_transaction_id(raw().info), get_sync_time());
+    return tonlib_api::make_object<tonlib_api::testGiver_accountState>(static_cast<td::uint32>(seqno));
   }
-  td::Result<tonlib_api::object_ptr<tonlib_api::generic_AccountState>> to_generic_accountState() const {
-    switch (wallet_type_) {
-      case Empty:
-        return tonlib_api::make_object<tonlib_api::generic_accountStateUninited>(to_uninited_accountState());
-      case Unknown: {
-        TRY_RESULT(res, to_raw_accountState());
-        return tonlib_api::make_object<tonlib_api::generic_accountStateRaw>(std::move(res));
-      }
-      case Giver: {
-        TRY_RESULT(res, to_testGiver_accountState());
-        return tonlib_api::make_object<tonlib_api::generic_accountStateTestGiver>(std::move(res));
-      }
-      case SimpleWallet: {
-        TRY_RESULT(res, to_testWallet_accountState());
-        return tonlib_api::make_object<tonlib_api::generic_accountStateTestWallet>(std::move(res));
-      }
-      case Wallet: {
-        TRY_RESULT(res, to_wallet_accountState());
-        return tonlib_api::make_object<tonlib_api::generic_accountStateWallet>(std::move(res));
-      }
-      case WalletV3: {
-        TRY_RESULT(res, to_wallet_v3_accountState());
-        return tonlib_api::make_object<tonlib_api::generic_accountStateWalletV3>(std::move(res));
-      }
+  td::Result<tonlib_api::object_ptr<tonlib_api::dns_accountState>> to_dns_accountState() const {
+    if (wallet_type_ != ManualDns) {
+      return TonlibError::AccountTypeUnexpected("ManualDns");
     }
-    UNREACHABLE();
+    TRY_RESULT(wallet_id, ton::ManualDns(get_smc_state()).get_wallet_id());
+    return tonlib_api::make_object<tonlib_api::dns_accountState>(static_cast<td::uint32>(wallet_id));
   }
 
-  enum WalletType { Empty, Unknown, Giver, SimpleWallet, Wallet, WalletV3 };
+  td::Result<tonlib_api::object_ptr<tonlib_api::AccountState>> to_accountState() const {
+    auto f = [](auto&& r_x) -> td::Result<tonlib_api::object_ptr<tonlib_api::AccountState>> {
+      TRY_RESULT(x, std::move(r_x));
+      return std::move(x);
+    };
+
+    switch (wallet_type_) {
+      case Empty:
+        return to_uninited_accountState();
+      case Unknown:
+        return f(to_raw_accountState());
+      case Giver:
+        return f(to_testGiver_accountState());
+      case SimpleWallet:
+        return f(to_testWallet_accountState());
+      case Wallet:
+        return f(to_wallet_accountState());
+      case WalletV3:
+        return f(to_wallet_v3_accountState());
+      case HighloadWalletV1:
+        return f(to_wallet_highload_v1_accountState());
+      case HighloadWalletV2:
+        return f(to_wallet_highload_v2_accountState());
+      case ManualDns:
+        return f(to_dns_accountState());
+      default:
+        UNREACHABLE();
+    }
+  }
+
+  td::Result<tonlib_api::object_ptr<tonlib_api::fullAccountState>> to_fullAccountState() const {
+    TRY_RESULT(account_state, to_accountState());
+    return tonlib_api::make_object<tonlib_api::fullAccountState>(get_balance(), to_transaction_id(raw().info),
+                                                                 to_tonlib_api(raw().block_id), get_sync_time(),
+                                                                 std::move(account_state));
+  }
+
+  enum WalletType {
+    Empty,
+    Unknown,
+    Giver,
+    SimpleWallet,
+    Wallet,
+    WalletV3,
+    HighloadWalletV1,
+    HighloadWalletV2,
+    ManualDns
+  };
   WalletType get_wallet_type() const {
     return wallet_type_;
   }
+  bool is_wallet() const {
+    switch (get_wallet_type()) {
+      case AccountState::Empty:
+      case AccountState::Unknown:
+      case AccountState::ManualDns:
+        return false;
+      case AccountState::Giver:
+      case AccountState::SimpleWallet:
+      case AccountState::Wallet:
+      case AccountState::WalletV3:
+      case AccountState::HighloadWalletV1:
+      case AccountState::HighloadWalletV2:
+        return true;
+    }
+    UNREACHABLE();
+    return false;
+  }
+  td::unique_ptr<ton::WalletInterface> get_wallet() const {
+    switch (get_wallet_type()) {
+      case AccountState::Empty:
+      case AccountState::Unknown:
+      case AccountState::ManualDns:
+        return {};
+      case AccountState::Giver:
+        return td::make_unique<ton::TestGiver>(get_smc_state());
+      case AccountState::SimpleWallet:
+        return td::make_unique<ton::TestWallet>(get_smc_state());
+      case AccountState::Wallet:
+        return td::make_unique<ton::Wallet>(get_smc_state());
+      case AccountState::WalletV3:
+        return td::make_unique<ton::WalletV3>(get_smc_state());
+      case AccountState::HighloadWalletV1:
+        return td::make_unique<ton::HighloadWallet>(get_smc_state());
+      case AccountState::HighloadWalletV2:
+        return td::make_unique<ton::HighloadWalletV2>(get_smc_state());
+    }
+    UNREACHABLE();
+    return {};
+  }
   bool is_frozen() const {
     return !raw_.frozen_hash.empty();
   }
@@ -233,6 +381,10 @@ class AccountState {
     return raw_.info.gen_utime;
   }
 
+  ton::BlockIdExt get_block_id() const {
+    return raw_.block_id;
+  }
+
   td::int64 get_balance() const {
     return raw_.balance;
   }
@@ -245,6 +397,29 @@ class AccountState {
     if (wallet_type_ != WalletType::Empty) {
       return wallet_type_;
     }
+    auto o_revision = ton::WalletV3::guess_revision(address_, key, wallet_id_);
+    if (o_revision) {
+      wallet_type_ = WalletType::WalletV3;
+      wallet_revision_ = o_revision.value();
+      set_new_state({ton::WalletV3::get_init_code(wallet_revision_), ton::WalletV3::get_init_data(key, wallet_id_)});
+      return wallet_type_;
+    }
+    o_revision = ton::HighloadWalletV2::guess_revision(address_, key, wallet_id_);
+    if (o_revision) {
+      wallet_type_ = WalletType::HighloadWalletV2;
+      wallet_revision_ = o_revision.value();
+      set_new_state(
+          {ton::HighloadWalletV2::get_init_code(wallet_revision_), ton::WalletV3::get_init_data(key, wallet_id_)});
+      return wallet_type_;
+    }
+    o_revision = ton::ManualDns::guess_revision(address_, key, wallet_id_);
+    if (o_revision) {
+      wallet_type_ = WalletType::ManualDns;
+      wallet_revision_ = o_revision.value();
+      auto dns = ton::ManualDns::create(key, wallet_id_, wallet_revision_);
+      set_new_state(dns->get_state());
+      return wallet_type_;
+    }
     if (ton::GenericAccount::get_address(address_.workchain, ton::TestWallet::get_init_state(key)).addr ==
         address_.addr) {
       set_new_state({ton::TestWallet::get_init_code(), ton::TestWallet::get_init_data(key)});
@@ -253,10 +428,11 @@ class AccountState {
                address_.addr) {
       set_new_state({ton::Wallet::get_init_code(), ton::Wallet::get_init_data(key)});
       wallet_type_ = WalletType::Wallet;
-    } else if (ton::GenericAccount::get_address(address_.workchain, ton::WalletV3::get_init_state(key, wallet_id_))
+    } else if (ton::GenericAccount::get_address(address_.workchain,
+                                                ton::HighloadWallet::get_init_state(key, wallet_id_))
                    .addr == address_.addr) {
-      set_new_state({ton::WalletV3::get_init_code(), ton::WalletV3::get_init_data(key, wallet_id_)});
-      wallet_type_ = WalletType::WalletV3;
+      set_new_state({ton::HighloadWallet::get_init_code(), ton::HighloadWallet::get_init_data(key, wallet_id_)});
+      wallet_type_ = WalletType::HighloadWalletV1;
     }
     return wallet_type_;
   }
@@ -296,28 +472,48 @@ class AccountState {
   block::StdAddress address_;
   RawAccountState raw_;
   WalletType wallet_type_{Unknown};
+  td::int32 wallet_revision_{0};
   td::uint32 wallet_id_{0};
   bool has_new_state_{false};
 
-  WalletType guess_type() const {
+  WalletType guess_type() {
     if (raw_.code.is_null()) {
-      return WalletType::Empty;
+      wallet_type_ = WalletType::Empty;
+      return wallet_type_;
     }
     auto code_hash = raw_.code->get_hash();
+    auto o_revision = ton::WalletV3::guess_revision(code_hash);
+    if (o_revision) {
+      wallet_type_ = WalletType::WalletV3;
+      wallet_revision_ = o_revision.value();
+      return wallet_type_;
+    }
+    o_revision = ton::HighloadWalletV2::guess_revision(code_hash);
+    if (o_revision) {
+      wallet_type_ = WalletType::HighloadWalletV2;
+      wallet_revision_ = o_revision.value();
+      return wallet_type_;
+    }
+    o_revision = ton::ManualDns::guess_revision(code_hash);
+    if (o_revision) {
+      wallet_type_ = WalletType::ManualDns;
+      wallet_revision_ = o_revision.value();
+      return wallet_type_;
+    }
+
     if (code_hash == ton::TestGiver::get_init_code_hash()) {
-      return WalletType::Giver;
+      wallet_type_ = WalletType::Giver;
+    } else if (code_hash == ton::TestWallet::get_init_code_hash()) {
+      wallet_type_ = WalletType::SimpleWallet;
+    } else if (code_hash == ton::Wallet::get_init_code_hash()) {
+      wallet_type_ = WalletType::Wallet;
+    } else if (code_hash == ton::HighloadWallet::get_init_code_hash()) {
+      wallet_type_ = WalletType::HighloadWalletV1;
+    } else {
+      LOG(WARNING) << "Unknown code hash: " << td::base64_encode(code_hash.as_slice());
+      wallet_type_ = WalletType::Unknown;
     }
-    if (code_hash == ton::TestWallet::get_init_code_hash()) {
-      return WalletType::SimpleWallet;
-    }
-    if (code_hash == ton::Wallet::get_init_code_hash()) {
-      return WalletType::Wallet;
-    }
-    if (code_hash == ton::WalletV3::get_init_code_hash()) {
-      return WalletType::WalletV3;
-    }
-    LOG(WARNING) << "Unknown code hash: " << td::base64_encode(code_hash.as_slice());
-    return WalletType::Unknown;
+    return wallet_type_;
   }
 };
 
@@ -325,7 +521,7 @@ class Query {
  public:
   struct Raw {
     td::unique_ptr<AccountState> source;
-    td::unique_ptr<AccountState> destination;
+    std::vector<td::unique_ptr<AccountState>> destinations;
 
     td::uint32 valid_until{std::numeric_limits<td::uint32>::max()};
 
@@ -419,7 +615,7 @@ class Query {
     }
   };
 
-  td::Result<td::int64> calc_fwd_fees(td::Ref<vm::Cell> list, const block::MsgPrices& msg_prices) {
+  td::Result<td::int64> calc_fwd_fees(td::Ref<vm::Cell> list, block::MsgPrices** msg_prices, bool is_masterchain) {
     td::int64 res = 0;
     std::vector<td::Ref<vm::Cell>> actions;
     int n{0};
@@ -457,10 +653,31 @@ class Query {
           if (!tlb::type_unpack_cell(act_rec.out_msg, block::gen::t_MessageRelaxed_Any, msg)) {
             return td::Status::Error("estimate_fee: can't parse send_msg");
           }
+
+          bool dest_is_masterchain = false;
+          if (block::gen::t_CommonMsgInfoRelaxed.get_tag(*msg.info) == block::gen::CommonMsgInfoRelaxed::int_msg_info) {
+            block::gen::CommonMsgInfoRelaxed::Record_int_msg_info info;
+            if (!tlb::csr_unpack(msg.info, info)) {
+              return td::Status::Error("estimate_fee: can't parse send_msg");
+            }
+            auto dest_addr = info.dest;
+            if (!dest_addr->prefetch_ulong(1)) {
+              return td::Status::Error("estimate_fee: messages with external addresses are unsupported");
+            }
+            int tag = block::gen::t_MsgAddressInt.get_tag(*dest_addr);
+
+            if (tag == block::gen::MsgAddressInt::addr_std) {
+              block::gen::MsgAddressInt::Record_addr_std recs;
+              if (!tlb::csr_unpack(dest_addr, recs)) {
+                return td::Status::Error("estimate_fee: can't parse send_msg");
+              }
+              dest_is_masterchain = recs.workchain_id == ton::masterchainId;
+            }
+          }
           vm::CellStorageStat sstat;                  // for message size
           sstat.add_used_storage(msg.init, true, 3);  // message init
           sstat.add_used_storage(msg.body, true, 3);  // message body (the root cell itself is not counted)
-          res += msg_prices.compute_fwd_fees(sstat.cells, sstat.bits);
+          res += msg_prices[is_masterchain || dest_is_masterchain]->compute_fwd_fees(sstat.cells, sstat.bits);
           break;
         }
         case block::gen::OutAction::action_reserve_currency:
@@ -469,34 +686,26 @@ class Query {
     }
     return res;
   }
-  td::Result<std::pair<Fee, Fee>> estimate_fees(bool ignore_chksig, const block::Config& cfg) {
+  td::Result<std::pair<Fee, std::vector<Fee>>> estimate_fees(bool ignore_chksig, const block::Config& cfg) {
     // gas fees
     bool is_masterchain = raw_.source->get_address().workchain == ton::masterchainId;
-    bool dest_is_masterchain = raw_.destination && raw_.destination->get_address().workchain == ton::masterchainId;
     TRY_RESULT(gas_limits_prices, cfg.get_gas_limits_prices(is_masterchain));
-    TRY_RESULT(dest_gas_limits_prices, cfg.get_gas_limits_prices(dest_is_masterchain));
-    TRY_RESULT(msg_prices, cfg.get_msg_prices(is_masterchain || dest_is_masterchain));
     TRY_RESULT(storage_prices, cfg.get_storage_prices());
-
+    TRY_RESULT(masterchain_msg_prices, cfg.get_msg_prices(true));
+    TRY_RESULT(basechain_msg_prices, cfg.get_msg_prices(false));
+    block::MsgPrices* msg_prices[2] = {&basechain_msg_prices, &masterchain_msg_prices};
     auto storage_fee_256 = block::StoragePrices::compute_storage_fees(
         raw_.source->get_sync_time(), storage_prices, raw_.source->raw().storage_stat,
         raw_.source->raw().storage_last_paid, false, is_masterchain);
     auto storage_fee = storage_fee_256.is_null() ? 0 : storage_fee_256->to_long();
 
-    auto dest_storage_fee_256 =
-        raw_.destination ? block::StoragePrices::compute_storage_fees(
-                               raw_.destination->get_sync_time(), storage_prices, raw_.destination->raw().storage_stat,
-                               raw_.destination->raw().storage_last_paid, false, is_masterchain)
-                         : td::make_refint(0);
-    auto dest_storage_fee = dest_storage_fee_256.is_null() ? 0 : dest_storage_fee_256->to_long();
-
     auto smc = ton::SmartContract::create(raw_.source->get_smc_state());
 
     td::int64 in_fwd_fee = 0;
     {
       vm::CellStorageStat sstat;                      // for message size
       sstat.add_used_storage(raw_.message, true, 3);  // message init
-      in_fwd_fee += msg_prices.compute_fwd_fees(sstat.cells, sstat.bits);
+      in_fwd_fee += msg_prices[is_masterchain]->compute_fwd_fees(sstat.cells, sstat.bits);
     }
 
     vm::GasLimits gas_limits = compute_gas_limits(td::make_refint(raw_.source->get_balance()), gas_limits_prices);
@@ -510,7 +719,7 @@ class Query {
       //int out_act_num = output_actions_count(res.actions);
       //block::gen::OutList{out_act_num}.print_ref(std::cerr, res.actions);
 
-      TRY_RESULT_ASSIGN(fwd_fee, calc_fwd_fees(res.actions, msg_prices));
+      TRY_RESULT_ASSIGN(fwd_fee, calc_fwd_fees(res.actions, msg_prices, is_masterchain));
     }
 
     auto gas_fee = res.accepted ? compute_gas_price(res.gas_used, gas_limits_prices)->to_long() : 0;
@@ -522,12 +731,25 @@ class Query {
     fee.gas_fee = gas_fee;
     fee.fwd_fee = fwd_fee;
 
-    Fee dst_fee;
-    if (raw_.destination && raw_.destination->get_wallet_type() != AccountState::WalletType::Empty) {
-      dst_fee.gas_fee = dest_gas_limits_prices.flat_gas_price;
-      dst_fee.storage_fee = dest_storage_fee;
+    std::vector<Fee> dst_fees;
+
+    for (auto& destination : raw_.destinations) {
+      bool dest_is_masterchain = destination && destination->get_address().workchain == ton::masterchainId;
+      TRY_RESULT(dest_gas_limits_prices, cfg.get_gas_limits_prices(dest_is_masterchain));
+      auto dest_storage_fee_256 =
+          destination ? block::StoragePrices::compute_storage_fees(
+                            destination->get_sync_time(), storage_prices, destination->raw().storage_stat,
+                            destination->raw().storage_last_paid, false, is_masterchain)
+                      : td::make_refint(0);
+      Fee dst_fee;
+      auto dest_storage_fee = dest_storage_fee_256.is_null() ? 0 : dest_storage_fee_256->to_long();
+      if (destination && destination->get_wallet_type() != AccountState::WalletType::Empty) {
+        dst_fee.gas_fee = dest_gas_limits_prices.flat_gas_price;
+        dst_fee.storage_fee = dest_storage_fee;
+      }
+      dst_fees.push_back(dst_fee);
     }
-    return std::make_pair(fee, dst_fee);
+    return std::make_pair(fee, dst_fees);
   }
 
  private:
@@ -644,20 +866,136 @@ class GetTransactionHistory : public td::actor::Actor {
   }
 };
 
+class RemoteRunSmcMethod : public td::actor::Actor {
+ public:
+  RemoteRunSmcMethod(ExtClientRef ext_client_ref, int_api::RemoteRunSmcMethod query, td::actor::ActorShared<> parent,
+                     td::Promise<int_api::RemoteRunSmcMethod::ReturnType>&& promise)
+      : query_(std::move(query)), promise_(std::move(promise)), parent_(std::move(parent)) {
+    client_.set_client(ext_client_ref);
+  }
+
+ private:
+  int_api::RemoteRunSmcMethod query_;
+  td::Promise<int_api::RemoteRunSmcMethod::ReturnType> promise_;
+  td::actor::ActorShared<> parent_;
+  ExtClient client_;
+
+  void with_run_method_result(
+      td::Result<ton::tl_object_ptr<ton::lite_api::liteServer_runMethodResult>> r_run_method_result) {
+    check(do_with_run_method_result(std::move(r_run_method_result)));
+  }
+
+  td::Status do_with_run_method_result(
+      td::Result<ton::tl_object_ptr<ton::lite_api::liteServer_runMethodResult>> r_run_method_result) {
+    TRY_RESULT(run_method_result, std::move(r_run_method_result));
+    TRY_RESULT_PREFIX(state, TRY_VM(do_with_run_method_result(std::move(run_method_result))),
+                      TonlibError::ValidateAccountState());
+    promise_.set_value(std::move(state));
+    stop();
+    return td::Status::OK();
+  }
+  td::Result<int_api::RemoteRunSmcMethod::ReturnType> do_with_run_method_result(
+      ton::tl_object_ptr<ton::lite_api::liteServer_runMethodResult> run_method_result) {
+    auto account_state = create_account_state(run_method_result);
+    TRY_RESULT(info, account_state.validate(query_.block_id.value(), query_.address));
+    auto serialized_state = account_state.state.clone();
+    int_api::RemoteRunSmcMethod::ReturnType res;
+    res.block_id = query_.block_id.value();
+    auto cell = info.root;
+    if (cell.is_null()) {
+      return res;
+    }
+    block::gen::Account::Record_account account;
+    if (!tlb::unpack_cell(cell, account)) {
+      return td::Status::Error("Failed to unpack Account");
+    }
+
+    block::gen::AccountStorage::Record storage;
+    if (!tlb::csr_unpack(account.storage, storage)) {
+      return td::Status::Error("Failed to unpack AccountStorage");
+    }
+    auto state_tag = block::gen::t_AccountState.get_tag(*storage.state);
+    if (state_tag < 0) {
+      return td::Status::Error("Failed to parse AccountState tag");
+    }
+    if (state_tag != block::gen::AccountState::account_active) {
+      return td::Status::Error("Account is not active");
+    }
+    block::gen::AccountState::Record_account_active state;
+    if (!tlb::csr_unpack(storage.state, state)) {
+      return td::Status::Error("Failed to parse AccountState");
+    }
+    block::gen::StateInit::Record state_init;
+    if (!tlb::csr_unpack(state.x, state_init)) {
+      return td::Status::Error("Failed to parse StateInit");
+    }
+    state_init.code->prefetch_maybe_ref(res.smc_state.code);
+    state_init.data->prefetch_maybe_ref(res.smc_state.data);
+    return res;
+  }
+
+  void with_last_block(td::Result<LastBlockState> r_last_block) {
+    check(do_with_last_block(std::move(r_last_block)));
+  }
+
+  td::Status with_block_id() {
+    TRY_RESULT(method_id, query_.args.get_method_id());
+    TRY_RESULT(serialized_stack, query_.args.get_serialized_stack());
+    client_.send_query(
+        //liteServer.runSmcMethod mode:# id:tonNode.blockIdExt account:liteServer.accountId method_id:long params:bytes = liteServer.RunMethodResult;
+        ton::lite_api::liteServer_runSmcMethod(
+            0x1f, ton::create_tl_lite_block_id(query_.block_id.value()),
+            ton::create_tl_object<ton::lite_api::liteServer_accountId>(query_.address.workchain, query_.address.addr),
+            method_id, std::move(serialized_stack)),
+        [self = this](auto r_state) { self->with_run_method_result(std::move(r_state)); },
+        query_.block_id.value().id.seqno);
+    return td::Status::OK();
+  }
+
+  td::Status do_with_last_block(td::Result<LastBlockState> r_last_block) {
+    TRY_RESULT(last_block, std::move(r_last_block));
+    query_.block_id = std::move(last_block.last_block_id);
+    with_block_id();
+    return td::Status::OK();
+  }
+
+  void start_up() override {
+    if (query_.block_id) {
+      check(with_block_id());
+    } else {
+      client_.with_last_block(
+          [self = this](td::Result<LastBlockState> r_last_block) { self->with_last_block(std::move(r_last_block)); });
+    }
+  }
+
+  void check(td::Status status) {
+    if (status.is_error()) {
+      promise_.set_error(std::move(status));
+      stop();
+    }
+  }
+  void hangup() override {
+    check(TonlibError::Cancelled());
+  }
+};
+
 class GetRawAccountState : public td::actor::Actor {
  public:
-  GetRawAccountState(ExtClientRef ext_client_ref, block::StdAddress address, td::actor::ActorShared<> parent,
-                     td::Promise<RawAccountState>&& promise)
-      : address_(std::move(address)), promise_(std::move(promise)), parent_(std::move(parent)) {
+  GetRawAccountState(ExtClientRef ext_client_ref, block::StdAddress address, td::optional<ton::BlockIdExt> block_id,
+                     td::actor::ActorShared<> parent, td::Promise<RawAccountState>&& promise)
+      : address_(std::move(address))
+      , block_id_(std::move(block_id))
+      , promise_(std::move(promise))
+      , parent_(std::move(parent)) {
     client_.set_client(ext_client_ref);
   }
 
  private:
   block::StdAddress address_;
+  td::optional<ton::BlockIdExt> block_id_;
   td::Promise<RawAccountState> promise_;
   td::actor::ActorShared<> parent_;
   ExtClient client_;
-  LastBlockState last_block_;
 
   void with_account_state(td::Result<ton::tl_object_ptr<ton::lite_api::liteServer_accountState>> r_account_state) {
     check(do_with_account_state(std::move(r_account_state)));
@@ -676,14 +1014,14 @@ class GetRawAccountState : public td::actor::Actor {
   td::Result<RawAccountState> do_with_account_state(
       ton::tl_object_ptr<ton::lite_api::liteServer_accountState> raw_account_state) {
     auto account_state = create_account_state(std::move(raw_account_state));
-    TRY_RESULT(info, account_state.validate(last_block_.last_block_id, address_));
+    TRY_RESULT(info, account_state.validate(block_id_.value(), address_));
     auto serialized_state = account_state.state.clone();
     RawAccountState res;
+    res.block_id = block_id_.value();
     res.info = std::move(info);
-    LOG_IF(ERROR, res.info.gen_utime > last_block_.utime) << res.info.gen_utime << " " << last_block_.utime;
     auto cell = res.info.root;
-    std::ostringstream outp;
-    block::gen::t_Account.print_ref(outp, cell);
+    //std::ostringstream outp;
+    //block::gen::t_Account.print_ref(outp, cell);
     //LOG(INFO) << outp.str();
     if (cell.is_null()) {
       return res;
@@ -766,20 +1104,28 @@ class GetRawAccountState : public td::actor::Actor {
     check(do_with_last_block(std::move(r_last_block)));
   }
 
-  td::Status do_with_last_block(td::Result<LastBlockState> r_last_block) {
-    TRY_RESULT_ASSIGN(last_block_, std::move(r_last_block));
+  void with_block_id() {
     client_.send_query(
         ton::lite_api::liteServer_getAccountState(
-            ton::create_tl_lite_block_id(last_block_.last_block_id),
+            ton::create_tl_lite_block_id(block_id_.value()),
             ton::create_tl_object<ton::lite_api::liteServer_accountId>(address_.workchain, address_.addr)),
-        [self = this](auto r_state) { self->with_account_state(std::move(r_state)); },
-        last_block_.last_block_id.id.seqno);
+        [self = this](auto r_state) { self->with_account_state(std::move(r_state)); }, block_id_.value().id.seqno);
+  }
+
+  td::Status do_with_last_block(td::Result<LastBlockState> r_last_block) {
+    TRY_RESULT(last_block, std::move(r_last_block));
+    block_id_ = std::move(last_block.last_block_id);
+    with_block_id();
     return td::Status::OK();
   }
 
   void start_up() override {
-    client_.with_last_block(
-        [self = this](td::Result<LastBlockState> r_last_block) { self->with_last_block(std::move(r_last_block)); });
+    if (block_id_) {
+      with_block_id();
+    } else {
+      client_.with_last_block(
+          [self = this](td::Result<LastBlockState> r_last_block) { self->with_last_block(std::move(r_last_block)); });
+    }
   }
 
   void check(td::Status status) {
@@ -867,7 +1213,7 @@ void TonlibClient::update_last_block_state(LastBlockState state, td::uint32 conf
     return;
   }
 
-  last_block_storage_.save_state(blockchain_name_, state);
+  last_block_storage_.save_state(last_state_key_, state);
 }
 
 void TonlibClient::update_sync_state(LastBlockSyncState state, td::uint32 config_generation) {
@@ -889,7 +1235,7 @@ void TonlibClient::update_sync_state(LastBlockSyncState state, td::uint32 config
   }
 }
 
-void TonlibClient::init_last_block(td::optional<Config> o_master_config) {
+void TonlibClient::init_last_block(LastBlockState state) {
   ref_cnt_++;
   class Callback : public LastBlock::Callback {
    public:
@@ -907,31 +1253,8 @@ void TonlibClient::init_last_block(td::optional<Config> o_master_config) {
     td::actor::ActorShared<TonlibClient> client_;
     td::uint32 config_generation_;
   };
-  LastBlockState state;
 
-  td::Result<LastBlockState> r_state;
-  if (!ignore_cache_) {
-    r_state = last_block_storage_.get_state(blockchain_name_);
-  }
-  if (ignore_cache_ || r_state.is_error()) {
-    LOG_IF(WARNING, !ignore_cache_) << "Unknown LastBlockState: " << r_state.error();
-    state.zero_state_id = ton::ZeroStateIdExt(config_.zero_state_id.id.workchain, config_.zero_state_id.root_hash,
-                                              config_.zero_state_id.file_hash),
-    state.last_block_id = config_.zero_state_id;
-    state.last_key_block_id = config_.zero_state_id;
-    last_block_storage_.save_state(blockchain_name_, state);
-  } else {
-    state = r_state.move_as_ok();
-  }
-
-  if (o_master_config) {
-    auto master_config = o_master_config.unwrap();
-    if (master_config.init_block_id.is_valid() &&
-        state.last_key_block_id.id.seqno < master_config.init_block_id.id.seqno) {
-      state.last_key_block_id = master_config.init_block_id;
-      LOG(INFO) << "Use init block from MASTER config: " << master_config.init_block_id.to_str();
-    }
-  }
+  last_block_storage_.save_state(last_state_key_, state);
 
   raw_last_block_ = td::actor::create_actor<LastBlock>(
       td::actor::ActorOptions().with_name("LastBlock").with_poll(false), get_client_ref(), std::move(state), config_,
@@ -965,6 +1288,16 @@ void TonlibClient::on_update(object_ptr<tonlib_api::Object> response) {
   on_result(0, std::move(response));
 }
 
+void TonlibClient::make_any_request(tonlib_api::Function& function, QueryContext query_context,
+                                    td::Promise<tonlib_api::object_ptr<tonlib_api::Object>>&& promise) {
+  auto old_context = std::move(query_context_);
+  SCOPE_EXIT {
+    query_context_ = std::move(old_context);
+  };
+  query_context_ = std::move(query_context);
+  downcast_call(function, [&](auto& request) { this->make_request(request, promise.wrap([](auto x) { return x; })); });
+}
+
 void TonlibClient::request(td::uint64 id, tonlib_api::object_ptr<tonlib_api::Function> function) {
   VLOG(tonlib_query) << "Tonlib got query " << td::tag("id", id) << " " << to_string(function);
   if (function == nullptr) {
@@ -985,22 +1318,20 @@ void TonlibClient::request(td::uint64 id, tonlib_api::object_ptr<tonlib_api::Fun
     }
   }
 
-  downcast_call(*function, [this, self = this, id](auto& request) {
-    using ReturnType = typename std::decay_t<decltype(request)>::ReturnType;
-    ref_cnt_++;
-    td::Promise<ReturnType> promise = [actor_id = actor_id(self), id,
-                                       tmp = actor_shared(self)](td::Result<ReturnType> r_result) {
-      tonlib_api::object_ptr<tonlib_api::Object> result;
-      if (r_result.is_error()) {
-        result = status_to_tonlib_api(r_result.error());
-      } else {
-        result = r_result.move_as_ok();
-      }
+  ref_cnt_++;
+  using Object = tonlib_api::object_ptr<tonlib_api::Object>;
+  td::Promise<Object> promise = [actor_id = actor_id(this), id, tmp = actor_shared(this)](td::Result<Object> r_result) {
+    tonlib_api::object_ptr<tonlib_api::Object> result;
+    if (r_result.is_error()) {
+      result = status_to_tonlib_api(r_result.error());
+    } else {
+      result = r_result.move_as_ok();
+    }
 
-      send_closure(actor_id, &TonlibClient::on_result, id, std::move(result));
-    };
-    this->make_request(request, std::move(promise));
-  });
+    send_closure(actor_id, &TonlibClient::on_result, id, std::move(result));
+  };
+
+  make_any_request(*function, {}, std::move(promise));
 }
 void TonlibClient::close() {
   stop();
@@ -1013,8 +1344,8 @@ tonlib_api::object_ptr<tonlib_api::Object> TonlibClient::static_request(
     return tonlib_api::make_object<tonlib_api::error>(400, "Request is empty");
   }
 
-  tonlib_api::object_ptr<tonlib_api::Object> response;
-  downcast_call(*function, [&response](auto& request) { response = TonlibClient::do_static_request(request); });
+  auto response = downcast_call2<tonlib_api::object_ptr<tonlib_api::Object>>(
+      *function, [](auto& request) { return TonlibClient::do_static_request(request); });
   VLOG(tonlib_query) << "  answer static query " << to_string(response);
   return response;
 }
@@ -1022,14 +1353,9 @@ tonlib_api::object_ptr<tonlib_api::Object> TonlibClient::static_request(
 bool TonlibClient::is_static_request(td::int32 id) {
   switch (id) {
     case tonlib_api::runTests::ID:
-    case tonlib_api::raw_getAccountAddress::ID:
-    case tonlib_api::testWallet_getAccountAddress::ID:
-    case tonlib_api::wallet_getAccountAddress::ID:
-    case tonlib_api::wallet_v3_getAccountAddress::ID:
-    case tonlib_api::testGiver_getAccountAddress::ID:
+    case tonlib_api::getAccountAddress::ID:
     case tonlib_api::packAccountAddress::ID:
     case tonlib_api::unpackAccountAddress::ID:
-    case tonlib_api::options_validateConfig::ID:
     case tonlib_api::getBip39Hints::ID:
     case tonlib_api::setLogStream::ID:
     case tonlib_api::getLogStream::ID:
@@ -1071,29 +1397,63 @@ td::Result<block::PublicKey> get_public_key(td::Slice public_key) {
   return address;
 }
 
-td::Result<block::StdAddress> get_account_address(const tonlib_api::raw_initialAccountState& raw_state) {
+td::Result<block::StdAddress> get_account_address(const tonlib_api::raw_initialAccountState& raw_state,
+                                                  td::int32 revision) {
   TRY_RESULT_PREFIX(code, vm::std_boc_deserialize(raw_state.code_), TonlibError::InvalidBagOfCells("raw_state.code"));
   TRY_RESULT_PREFIX(data, vm::std_boc_deserialize(raw_state.data_), TonlibError::InvalidBagOfCells("raw_state.data"));
   return ton::GenericAccount::get_address(0 /*zerochain*/,
                                           ton::GenericAccount::get_init_state(std::move(code), std::move(data)));
 }
 
-td::Result<block::StdAddress> get_account_address(const tonlib_api::testWallet_initialAccountState& test_wallet_state) {
-  TRY_RESULT(key_bytes, get_public_key(test_wallet_state.public_key_));
-  auto key = td::Ed25519::PublicKey(td::SecureString(key_bytes.key));
-  return ton::GenericAccount::get_address(0 /*zerochain*/, ton::TestWallet::get_init_state(key));
+td::Result<block::StdAddress> get_account_address(const tonlib_api::testGiver_initialAccountState& test_wallet_state,
+                                                  td::int32 revision) {
+  return ton::TestGiver::address();
 }
 
-td::Result<block::StdAddress> get_account_address(const tonlib_api::wallet_initialAccountState& test_wallet_state) {
+td::Result<block::StdAddress> get_account_address(const tonlib_api::testWallet_initialAccountState& test_wallet_state,
+                                                  td::int32 revision) {
   TRY_RESULT(key_bytes, get_public_key(test_wallet_state.public_key_));
   auto key = td::Ed25519::PublicKey(td::SecureString(key_bytes.key));
-  return ton::GenericAccount::get_address(0 /*zerochain*/, ton::Wallet::get_init_state(key));
+  return ton::GenericAccount::get_address(0 /*zerochain*/, ton::TestWallet::get_init_state(key, revision));
 }
-td::Result<block::StdAddress> get_account_address(const tonlib_api::wallet_v3_initialAccountState& test_wallet_state) {
+
+td::Result<block::StdAddress> get_account_address(const tonlib_api::wallet_initialAccountState& wallet_state,
+                                                  td::int32 revision) {
+  TRY_RESULT(key_bytes, get_public_key(wallet_state.public_key_));
+  auto key = td::Ed25519::PublicKey(td::SecureString(key_bytes.key));
+  return ton::GenericAccount::get_address(0 /*zerochain*/, ton::Wallet::get_init_state(key, revision));
+}
+td::Result<block::StdAddress> get_account_address(const tonlib_api::wallet_v3_initialAccountState& test_wallet_state,
+                                                  td::int32 revision) {
   TRY_RESULT(key_bytes, get_public_key(test_wallet_state.public_key_));
   auto key = td::Ed25519::PublicKey(td::SecureString(key_bytes.key));
   return ton::GenericAccount::get_address(
-      0 /*zerochain*/, ton::WalletV3::get_init_state(key, static_cast<td::uint32>(test_wallet_state.wallet_id_)));
+      0 /*zerochain*/,
+      ton::WalletV3::get_init_state(key, static_cast<td::uint32>(test_wallet_state.wallet_id_), revision));
+}
+
+td::Result<block::StdAddress> get_account_address(
+    const tonlib_api::wallet_highload_v1_initialAccountState& test_wallet_state, td::int32 revision) {
+  TRY_RESULT(key_bytes, get_public_key(test_wallet_state.public_key_));
+  auto key = td::Ed25519::PublicKey(td::SecureString(key_bytes.key));
+  return ton::GenericAccount::get_address(
+      0 /*zerochain*/, ton::HighloadWallet::get_init_state(key, static_cast<td::uint32>(test_wallet_state.wallet_id_)));
+}
+
+td::Result<block::StdAddress> get_account_address(
+    const tonlib_api::wallet_highload_v2_initialAccountState& test_wallet_state, td::int32 revision) {
+  TRY_RESULT(key_bytes, get_public_key(test_wallet_state.public_key_));
+  auto key = td::Ed25519::PublicKey(td::SecureString(key_bytes.key));
+  return ton::GenericAccount::get_address(
+      0 /*zerochain*/,
+      ton::HighloadWalletV2::get_init_state(key, static_cast<td::uint32>(test_wallet_state.wallet_id_), revision));
+}
+
+td::Result<block::StdAddress> get_account_address(const tonlib_api::dns_initialAccountState& dns_state,
+                                                  td::int32 revision) {
+  TRY_RESULT(key_bytes, get_public_key(dns_state.public_key_));
+  auto key = td::Ed25519::PublicKey(td::SecureString(key_bytes.key));
+  return ton::ManualDns::create(key, static_cast<td::uint32>(dns_state.wallet_id_), revision)->get_address();
 }
 
 td::Result<block::StdAddress> get_account_address(td::Slice account_address) {
@@ -1101,59 +1461,115 @@ td::Result<block::StdAddress> get_account_address(td::Slice account_address) {
   return address;
 }
 
+td::Result<td::Bits256> get_adnl_address(td::Slice adnl_address) {
+  TRY_RESULT_PREFIX(address, td::adnl_id_decode(adnl_address),
+                    TonlibError::InvalidField("adnl_address", "can't decode"));
+  return address;
+}
+
+static td::optional<ton::SmartContractCode::Type> get_wallet_type(tonlib_api::InitialAccountState& state) {
+  return downcast_call2<td::optional<ton::SmartContractCode::Type>>(
+      state,
+      td::overloaded(
+          [](const tonlib_api::raw_initialAccountState&) { return td::optional<ton::SmartContractCode::Type>(); },
+          [](const tonlib_api::testGiver_initialAccountState&) { return td::optional<ton::SmartContractCode::Type>(); },
+          [](const tonlib_api::testWallet_initialAccountState&) { return ton::SmartContractCode::WalletV1; },
+          [](const tonlib_api::wallet_initialAccountState&) { return ton::SmartContractCode::WalletV2; },
+          [](const tonlib_api::wallet_v3_initialAccountState&) { return ton::SmartContractCode::WalletV3; },
+          [](const tonlib_api::wallet_highload_v1_initialAccountState&) {
+            return ton::SmartContractCode::HighloadWalletV1;
+          },
+          [](const tonlib_api::wallet_highload_v2_initialAccountState&) {
+            return ton::SmartContractCode::HighloadWalletV2;
+          },
+          [](const tonlib_api::dns_initialAccountState&) { return ton::SmartContractCode::ManualDns; }));
+}
+
 tonlib_api::object_ptr<tonlib_api::Object> TonlibClient::do_static_request(
-    const tonlib_api::raw_getAccountAddress& request) {
-  if (!request.initital_account_state_) {
+    const tonlib_api::getAccountAddress& request) {
+  if (!request.initial_account_state_) {
     return status_to_tonlib_api(TonlibError::EmptyField("initial_account_state"));
   }
-  auto r_account_address = get_account_address(*request.initital_account_state_);
+  auto o_type = get_wallet_type(*request.initial_account_state_);
+  if (o_type) {
+    auto status = ton::SmartContractCode::validate_revision(o_type.value(), request.revision_);
+    if (status.is_error()) {
+      return status_to_tonlib_api(TonlibError::InvalidRevision());
+    }
+  }
+  auto r_account_address = downcast_call2<td::Result<block::StdAddress>>(
+      *request.initial_account_state_,
+      [&request](auto&& state) { return get_account_address(state, request.revision_); });
   if (r_account_address.is_error()) {
     return status_to_tonlib_api(r_account_address.error());
   }
   return tonlib_api::make_object<tonlib_api::accountAddress>(r_account_address.ok().rserialize(true));
 }
 
-tonlib_api::object_ptr<tonlib_api::Object> TonlibClient::do_static_request(
-    const tonlib_api::testWallet_getAccountAddress& request) {
-  if (!request.initital_account_state_) {
-    return status_to_tonlib_api(TonlibError::EmptyField("initial_account_state"));
+td::Status TonlibClient::do_request(const tonlib_api::guessAccountRevision& request,
+                                    td::Promise<object_ptr<tonlib_api::accountRevisionList>>&& promise) {
+  if (!request.initial_account_state_) {
+    return TonlibError::EmptyField("initial_account_state");
   }
-  if (!request.initital_account_state_) {
-    return status_to_tonlib_api(TonlibError::EmptyField("initial_account_state"));
+  auto o_type = get_wallet_type(*request.initial_account_state_);
+  if (!o_type) {
+    promise.set_value(tonlib_api::make_object<tonlib_api::accountRevisionList>(std::vector<td::int32>{0}));
+    return td::Status::OK();
   }
-  auto r_account_address = get_account_address(*request.initital_account_state_);
-  if (r_account_address.is_error()) {
-    return status_to_tonlib_api(r_account_address.error());
-  }
-  return tonlib_api::make_object<tonlib_api::accountAddress>(r_account_address.ok().rserialize(true));
-}
+  auto revisions = ton::SmartContractCode::get_revisions(o_type.value());
 
-tonlib_api::object_ptr<tonlib_api::Object> TonlibClient::do_static_request(
-    const tonlib_api::wallet_getAccountAddress& request) {
-  if (!request.initital_account_state_) {
-    return status_to_tonlib_api(TonlibError::EmptyField("initial_account_state"));
-  }
-  auto r_account_address = get_account_address(*request.initital_account_state_);
-  if (r_account_address.is_error()) {
-    return status_to_tonlib_api(r_account_address.error());
-  }
-  return tonlib_api::make_object<tonlib_api::accountAddress>(r_account_address.ok().rserialize(true));
-}
-tonlib_api::object_ptr<tonlib_api::Object> TonlibClient::do_static_request(
-    const tonlib_api::wallet_v3_getAccountAddress& request) {
-  if (!request.initital_account_state_) {
-    return status_to_tonlib_api(TonlibError::EmptyField("initial_account_state"));
-  }
-  auto r_account_address = get_account_address(*request.initital_account_state_);
-  if (r_account_address.is_error()) {
-    return status_to_tonlib_api(r_account_address.error());
-  }
-  return tonlib_api::make_object<tonlib_api::accountAddress>(r_account_address.ok().rserialize(true));
-}
+  std::vector<std::pair<int, block::StdAddress>> addresses;
+  TRY_STATUS(downcast_call2<td::Status>(*request.initial_account_state_, [&revisions, &addresses](const auto& state) {
+    for (auto revision : revisions) {
+      TRY_RESULT(address, get_account_address(state, revision));
+      addresses.push_back(std::make_pair(revision, address));
+    }
+    return td::Status::OK();
+  }));
 
-tonlib_api::object_ptr<tonlib_api::Object> TonlibClient::do_static_request(
-    const tonlib_api::testGiver_getAccountAddress& request) {
-  return tonlib_api::make_object<tonlib_api::accountAddress>(ton::TestGiver::address().rserialize(true));
+  auto actor_id = actor_id_++;
+  class GuessRevisions : public TonlibQueryActor {
+   public:
+    GuessRevisions(td::actor::ActorShared<TonlibClient> client, td::optional<ton::BlockIdExt> block_id,
+                   std::vector<std::pair<int, block::StdAddress>> addresses, td::Promise<std::vector<int>> promise)
+        : TonlibQueryActor(std::move(client))
+        , block_id_(std::move(block_id))
+        , addresses_(std::move(addresses))
+        , promise_(std::move(promise)) {
+    }
+
+   private:
+    td::optional<ton::BlockIdExt> block_id_;
+    std::vector<std::pair<int, block::StdAddress>> addresses_;
+    td::Promise<std::vector<int>> promise_;
+
+    size_t left_{0};
+    std::vector<int> res;
+
+    void start_up() {
+      left_ += addresses_.size();
+      for (auto& p : addresses_) {
+        send_query(int_api::GetAccountState{p.second, block_id_.copy()},
+                   promise_send_closure(td::actor::actor_id(this), &GuessRevisions::on_account_state, p.first));
+      }
+    }
+    void on_account_state(int revision, td::Result<td::unique_ptr<AccountState>> r_state) {
+      if (r_state.is_ok() && r_state.ok()->get_wallet_type() != AccountState::WalletType::Empty) {
+        res.push_back(revision);
+      }
+      left_--;
+      if (left_ == 0) {
+        promise_.set_value(std::move(res));
+        stop();
+      }
+    }
+  };
+
+  actors_[actor_id] = td::actor::create_actor<GuessRevisions>(
+      "GuessRevisions", actor_shared(this, actor_id), query_context_.block_id.copy(), std::move(addresses),
+      promise.wrap(
+          [](auto&& x) mutable { return tonlib_api::make_object<tonlib_api::accountRevisionList>(std::move(x)); }));
+  return td::Status::OK();
 }
 
 tonlib_api::object_ptr<tonlib_api::Object> TonlibClient::do_static_request(
@@ -1190,7 +1606,7 @@ tonlib_api::object_ptr<tonlib_api::Object> TonlibClient::do_static_request(tonli
 }
 
 td::Status TonlibClient::do_request(const tonlib_api::init& request,
-                                    td::Promise<object_ptr<tonlib_api::ok>>&& promise) {
+                                    td::Promise<object_ptr<tonlib_api::options_info>>&& promise) {
   if (state_ != State::Uninited) {
     return td::Status::Error(400, "Tonlib is already inited");
   }
@@ -1201,23 +1617,24 @@ td::Status TonlibClient::do_request(const tonlib_api::init& request,
     return TonlibError::EmptyField("options.keystore_type");
   }
 
-  td::Result<td::unique_ptr<KeyValue>> r_kv;
-  downcast_call(
+  auto r_kv = downcast_call2<td::Result<td::unique_ptr<KeyValue>>>(
       *request.options_->keystore_type_,
       td::overloaded(
-          [&](tonlib_api::keyStoreTypeDirectory& directory) { r_kv = KeyValue::create_dir(directory.directory_); },
-          [&](tonlib_api::keyStoreTypeInMemory& inmemory) { r_kv = KeyValue::create_inmemory(); }));
+          [](tonlib_api::keyStoreTypeDirectory& directory) { return KeyValue::create_dir(directory.directory_); },
+          [](tonlib_api::keyStoreTypeInMemory& inmemory) { return KeyValue::create_inmemory(); }));
   TRY_RESULT(kv, std::move(r_kv));
   kv_ = std::shared_ptr<KeyValue>(kv.release());
 
   key_storage_.set_key_value(kv_);
   last_block_storage_.set_key_value(kv_);
+  auto res = tonlib_api::make_object<tonlib_api::options_info>();
   if (request.options_->config_) {
     TRY_RESULT(full_config, validate_config(std::move(request.options_->config_)));
+    res->config_info_ = to_tonlib_api(full_config);
     set_config(std::move(full_config));
   }
   state_ = State::Running;
-  promise.set_value(tonlib_api::make_object<tonlib_api::ok>());
+  promise.set_value(std::move(res));
   return td::Status::OK();
 }
 
@@ -1291,21 +1708,55 @@ td::Result<TonlibClient::FullConfig> TonlibClient::validate_config(tonlib_api::o
   }
 
   td::optional<Config> o_master_config;
+  std::string last_state_key;
   if (config->blockchain_name_.empty()) {
+    last_state_key = new_config.zero_state_id.root_hash.as_slice().str();
     o_master_config = get_default_master_config().by_root_hash(new_config.zero_state_id.root_hash);
   } else {
+    last_state_key = config->blockchain_name_;
     o_master_config = get_default_master_config().by_name(config->blockchain_name_);
   }
 
   if (o_master_config && o_master_config.value().zero_state_id != new_config.zero_state_id) {
     return TonlibError::InvalidConfig("zero_state differs from embedded zero_state");
   }
+
+  LastBlockState state;
+  td::Result<LastBlockState> r_state;
+  if (!config->ignore_cache_) {
+    r_state = last_block_storage_.get_state(last_state_key);
+  }
+  auto zero_state = ton::ZeroStateIdExt(new_config.zero_state_id.id.workchain, new_config.zero_state_id.root_hash,
+                                        new_config.zero_state_id.file_hash);
+  if (config->ignore_cache_ || r_state.is_error()) {
+    LOG_IF(WARNING, !config->ignore_cache_) << "Unknown LastBlockState: " << r_state.error();
+    state.zero_state_id = zero_state;
+    state.last_block_id = new_config.zero_state_id;
+    state.last_key_block_id = new_config.zero_state_id;
+  } else {
+    state = r_state.move_as_ok();
+    if (state.zero_state_id != zero_state) {
+      LOG(ERROR) << state.zero_state_id.to_str() << " " << zero_state.to_str();
+      return TonlibError::InvalidConfig("zero_state differs from cached zero_state");
+    }
+  }
+
+  if (o_master_config) {
+    auto master_config = o_master_config.unwrap();
+    if (master_config.init_block_id.is_valid() &&
+        state.last_key_block_id.id.seqno < master_config.init_block_id.id.seqno) {
+      state.last_key_block_id = master_config.init_block_id;
+      LOG(INFO) << "Use init block from MASTER config: " << master_config.init_block_id.to_str();
+    }
+  }
+
   FullConfig res;
   res.config = std::move(new_config);
-  res.o_master_config = std::move(o_master_config);
-  res.ignore_cache = config->ignore_cache_;
   res.use_callbacks_for_network = config->use_callbacks_for_network_;
   res.wallet_id = td::as<td::uint32>(res.config.zero_state_id.root_hash.as_slice().data());
+  res.last_state_key = std::move(last_state_key);
+  res.last_state = std::move(state);
+
   return std::move(res);
 }
 
@@ -1313,12 +1764,11 @@ void TonlibClient::set_config(FullConfig full_config) {
   config_ = std::move(full_config.config);
   config_generation_++;
   wallet_id_ = full_config.wallet_id;
-  blockchain_name_ = config_.zero_state_id.root_hash.as_slice().str();
+  last_state_key_ = full_config.last_state_key;
 
   use_callbacks_for_network_ = full_config.use_callbacks_for_network;
-  ignore_cache_ = full_config.ignore_cache;
   init_ext_client();
-  init_last_block(std::move(full_config.o_master_config));
+  init_last_block(std::move(full_config.last_state));
   init_last_config();
   client_.set_client(get_client_ref());
 }
@@ -1332,23 +1782,23 @@ td::Status TonlibClient::do_request(const tonlib_api::close& request,
   return td::Status::OK();
 }
 
-tonlib_api::object_ptr<tonlib_api::Object> TonlibClient::do_static_request(
-    tonlib_api::options_validateConfig& request) {
-  auto r_config = validate_config(std::move(request.config_));
-  if (r_config.is_error()) {
-    return status_to_tonlib_api(r_config.move_as_error());
-  }
-  return tonlib_api::make_object<tonlib_api::options_configInfo>(r_config.ok().wallet_id);
+td::Status TonlibClient::do_request(tonlib_api::options_validateConfig& request,
+                                    td::Promise<object_ptr<tonlib_api::options_configInfo>>&& promise) {
+  TRY_RESULT(config, validate_config(std::move(request.config_)));
+  auto res = to_tonlib_api(config);
+  promise.set_value(std::move(res));
+  return td::Status::OK();
 }
 
 td::Status TonlibClient::do_request(tonlib_api::options_setConfig& request,
-                                    td::Promise<object_ptr<tonlib_api::ok>>&& promise) {
+                                    td::Promise<object_ptr<tonlib_api::options_configInfo>>&& promise) {
   if (!request.config_) {
     return TonlibError::EmptyField("config");
   }
   TRY_RESULT(config, validate_config(std::move(request.config_)));
+  auto res = to_tonlib_api(config);
   set_config(std::move(config));
-  promise.set_value(tonlib_api::make_object<tonlib_api::ok>());
+  promise.set_value(std::move(res));
   return td::Status::OK();
 }
 
@@ -1370,158 +1820,185 @@ td::Result<std::string> to_std_address_or_throw(td::Ref<vm::CellSlice> cs) {
 td::Result<std::string> to_std_address(td::Ref<vm::CellSlice> cs) {
   return TRY_VM(to_std_address_or_throw(std::move(cs)));
 }
-
-td::Result<tonlib_api::object_ptr<tonlib_api::raw_message>> to_raw_message_or_throw(td::Ref<vm::Cell> cell) {
-  block::gen::Message::Record message;
-  if (!tlb::type_unpack_cell(cell, block::gen::t_Message_Any, message)) {
-    return td::Status::Error("Failed to unpack Message");
+struct ToRawTransactions {
+  explicit ToRawTransactions(td::optional<td::Ed25519::PrivateKey> private_key) : private_key_(std::move(private_key)) {
   }
 
-  auto tag = block::gen::CommonMsgInfo().get_tag(*message.info);
-  if (tag < 0) {
-    return td::Status::Error("Failed to read CommonMsgInfo tag");
-  }
-  switch (tag) {
-    case block::gen::CommonMsgInfo::int_msg_info: {
-      block::gen::CommonMsgInfo::Record_int_msg_info msg_info;
-      if (!tlb::csr_unpack(message.info, msg_info)) {
-        return td::Status::Error("Failed to unpack CommonMsgInfo::int_msg_info");
-      }
+  td::optional<td::Ed25519::PrivateKey> private_key_;
+  td::Result<tonlib_api::object_ptr<tonlib_api::raw_message>> to_raw_message_or_throw(td::Ref<vm::Cell> cell) {
+    block::gen::Message::Record message;
+    if (!tlb::type_unpack_cell(cell, block::gen::t_Message_Any, message)) {
+      return td::Status::Error("Failed to unpack Message");
+    }
 
-      TRY_RESULT(balance, to_balance(msg_info.value));
-      TRY_RESULT(src, to_std_address(msg_info.src));
-      TRY_RESULT(dest, to_std_address(msg_info.dest));
-      TRY_RESULT(fwd_fee, to_balance(msg_info.fwd_fee));
-      TRY_RESULT(ihr_fee, to_balance(msg_info.ihr_fee));
-      auto created_lt = static_cast<td::int64>(msg_info.created_lt);
-      td::Ref<vm::CellSlice> body;
-      if (message.body->prefetch_long(1) == 0) {
-        body = std::move(message.body);
-        body.write().advance(1);
-      } else {
-        body = vm::load_cell_slice_ref(message.body->prefetch_ref());
-      }
-      auto body_hash = vm::CellBuilder().append_cellslice(*body).finalize()->get_hash().as_slice().str();
-      std::string body_message;
-      if (body->size() >= 32 && body->prefetch_long(32) == 0) {
-        body.write().fetch_long(32);
-        auto r_body_message = vm::CellString::load(body.write());
-        if (r_body_message.is_ok()) {
-          body_message = r_body_message.move_as_ok();
+    td::Ref<vm::CellSlice> body;
+    if (message.body->prefetch_long(1) == 0) {
+      body = std::move(message.body);
+      body.write().advance(1);
+    } else {
+      body = vm::load_cell_slice_ref(message.body->prefetch_ref());
+    }
+    auto body_cell = vm::CellBuilder().append_cellslice(*body).finalize();
+    auto body_hash = body_cell->get_hash().as_slice().str();
+
+    tonlib_api::object_ptr<tonlib_api::msg_Data> data;
+    if (body->size() >= 32 && static_cast<td::uint32>(body->prefetch_long(32)) <= 1) {
+      auto type = body.write().fetch_long(32);
+      td::Status status;
+
+      auto r_body_message = vm::CellString::load(body.write());
+      LOG_IF(WARNING, r_body_message.is_error()) << "Failed to parse a message: " << r_body_message.error();
+
+      if (r_body_message.is_ok()) {
+        if (type == 0) {
+          LOG(ERROR) << "OK " << r_body_message.ok();
+          data = tonlib_api::make_object<tonlib_api::msg_dataText>(r_body_message.move_as_ok());
+        } else {
+          LOG(ERROR) << "TRY DECRYPT";
+          auto encrypted_message = r_body_message.move_as_ok();
+          auto r_decrypted_message = [&]() -> td::Result<std::string> {
+            if (!private_key_) {
+              return TonlibError::EmptyField("private_key");
+            }
+            TRY_RESULT(decrypted, SimpleEncryptionV2::decrypt_data(encrypted_message, private_key_.value()));
+            return decrypted.as_slice().str();
+          }();
+          if (r_decrypted_message.is_ok()) {
+            data = tonlib_api::make_object<tonlib_api::msg_dataDecryptedText>(r_decrypted_message.move_as_ok());
+          } else {
+            data = tonlib_api::make_object<tonlib_api::msg_dataEncryptedText>(encrypted_message);
+          }
         }
       }
-
-      return tonlib_api::make_object<tonlib_api::raw_message>(std::move(src), std::move(dest), balance, fwd_fee,
-                                                              ihr_fee, created_lt, std::move(body_hash),
-                                                              std::move(body_message));
     }
-    case block::gen::CommonMsgInfo::ext_in_msg_info: {
-      block::gen::CommonMsgInfo::Record_ext_in_msg_info msg_info;
-      if (!tlb::csr_unpack(message.info, msg_info)) {
-        return td::Status::Error("Failed to unpack CommonMsgInfo::ext_in_msg_info");
+    if (!data) {
+      data = tonlib_api::make_object<tonlib_api::msg_dataRaw>(to_bytes(std::move(body_cell)));
+    }
+
+    auto tag = block::gen::CommonMsgInfo().get_tag(*message.info);
+    if (tag < 0) {
+      return td::Status::Error("Failed to read CommonMsgInfo tag");
+    }
+    switch (tag) {
+      case block::gen::CommonMsgInfo::int_msg_info: {
+        block::gen::CommonMsgInfo::Record_int_msg_info msg_info;
+        if (!tlb::csr_unpack(message.info, msg_info)) {
+          return td::Status::Error("Failed to unpack CommonMsgInfo::int_msg_info");
+        }
+
+        TRY_RESULT(balance, to_balance(msg_info.value));
+        TRY_RESULT(src, to_std_address(msg_info.src));
+        TRY_RESULT(dest, to_std_address(msg_info.dest));
+        TRY_RESULT(fwd_fee, to_balance(msg_info.fwd_fee));
+        TRY_RESULT(ihr_fee, to_balance(msg_info.ihr_fee));
+        auto created_lt = static_cast<td::int64>(msg_info.created_lt);
+
+        return tonlib_api::make_object<tonlib_api::raw_message>(std::move(src), std::move(dest), balance, fwd_fee,
+                                                                ihr_fee, created_lt, std::move(body_hash),
+                                                                std::move(data));
       }
-      TRY_RESULT(dest, to_std_address(msg_info.dest));
-      td::Ref<vm::CellSlice> body;
-      if (message.body->prefetch_long(1) == 0) {
-        body = std::move(message.body);
-        body.write().advance(1);
-      } else {
-        body = vm::load_cell_slice_ref(message.body->prefetch_ref());
+      case block::gen::CommonMsgInfo::ext_in_msg_info: {
+        block::gen::CommonMsgInfo::Record_ext_in_msg_info msg_info;
+        if (!tlb::csr_unpack(message.info, msg_info)) {
+          return td::Status::Error("Failed to unpack CommonMsgInfo::ext_in_msg_info");
+        }
+        TRY_RESULT(dest, to_std_address(msg_info.dest));
+        return tonlib_api::make_object<tonlib_api::raw_message>("", std::move(dest), 0, 0, 0, 0, std::move(body_hash),
+                                                                std::move(data));
       }
-      auto body_hash = vm::CellBuilder().append_cellslice(*body).finalize()->get_hash().as_slice().str();
-      return tonlib_api::make_object<tonlib_api::raw_message>("", std::move(dest), 0, 0, 0, 0, std::move(body_hash),
-                                                              "");
-    }
-    case block::gen::CommonMsgInfo::ext_out_msg_info: {
-      block::gen::CommonMsgInfo::Record_ext_out_msg_info msg_info;
-      if (!tlb::csr_unpack(message.info, msg_info)) {
-        return td::Status::Error("Failed to unpack CommonMsgInfo::ext_out_msg_info");
-      }
-      TRY_RESULT(src, to_std_address(msg_info.src));
-      return tonlib_api::make_object<tonlib_api::raw_message>(std::move(src), "", 0, 0, 0, 0, "", "");
-    }
-  }
-
-  return td::Status::Error("Unknown CommonMsgInfo tag");
-}
-
-td::Result<tonlib_api::object_ptr<tonlib_api::raw_message>> to_raw_message(td::Ref<vm::Cell> cell) {
-  return TRY_VM(to_raw_message_or_throw(std::move(cell)));
-}
-
-td::Result<tonlib_api::object_ptr<tonlib_api::raw_transaction>> to_raw_transaction_or_throw(
-    block::Transaction::Info&& info) {
-  std::string data;
-
-  tonlib_api::object_ptr<tonlib_api::raw_message> in_msg;
-  std::vector<tonlib_api::object_ptr<tonlib_api::raw_message>> out_msgs;
-  td::int64 fees = 0;
-  td::int64 storage_fee = 0;
-  if (info.transaction.not_null()) {
-    data = to_bytes(info.transaction);
-    block::gen::Transaction::Record trans;
-    if (!tlb::unpack_cell(info.transaction, trans)) {
-      return td::Status::Error("Failed to unpack Transaction");
-    }
-
-    TRY_RESULT_ASSIGN(fees, to_balance(trans.total_fees));
-
-    //std::ostringstream outp;
-    //block::gen::t_Transaction.print_ref(outp, info.transaction);
-    //LOG(INFO) << outp.str();
-
-    auto is_just = trans.r1.in_msg->prefetch_long(1);
-    if (is_just == trans.r1.in_msg->fetch_long_eof) {
-      return td::Status::Error("Failed to parse long");
-    }
-    if (is_just == -1) {
-      auto msg = trans.r1.in_msg->prefetch_ref();
-      TRY_RESULT(in_msg_copy, to_raw_message(trans.r1.in_msg->prefetch_ref()));
-      in_msg = std::move(in_msg_copy);
-    }
-
-    if (trans.outmsg_cnt != 0) {
-      vm::Dictionary dict{trans.r1.out_msgs, 15};
-      for (int x = 0; x < trans.outmsg_cnt && x < 100; x++) {
-        TRY_RESULT(out_msg, to_raw_message(dict.lookup_ref(td::BitArray<15>{x})));
-        fees += out_msg->fwd_fee_;
-        fees += out_msg->ihr_fee_;
-        out_msgs.push_back(std::move(out_msg));
+      case block::gen::CommonMsgInfo::ext_out_msg_info: {
+        block::gen::CommonMsgInfo::Record_ext_out_msg_info msg_info;
+        if (!tlb::csr_unpack(message.info, msg_info)) {
+          return td::Status::Error("Failed to unpack CommonMsgInfo::ext_out_msg_info");
+        }
+        TRY_RESULT(src, to_std_address(msg_info.src));
+        return tonlib_api::make_object<tonlib_api::raw_message>(std::move(src), "", 0, 0, 0, 0, std::move(body_hash),
+                                                                std::move(data));
       }
     }
-    td::RefInt256 storage_fees;
-    if (!block::tlb::t_TransactionDescr.get_storage_fees(trans.description, storage_fees)) {
-      return td::Status::Error("Failed to fetch storage fee from transaction");
+
+    return td::Status::Error("Unknown CommonMsgInfo tag");
+  }
+
+  td::Result<tonlib_api::object_ptr<tonlib_api::raw_message>> to_raw_message(td::Ref<vm::Cell> cell) {
+    return TRY_VM(to_raw_message_or_throw(std::move(cell)));
+  }
+
+  td::Result<tonlib_api::object_ptr<tonlib_api::raw_transaction>> to_raw_transaction_or_throw(
+      block::Transaction::Info&& info) {
+    std::string data;
+
+    tonlib_api::object_ptr<tonlib_api::raw_message> in_msg;
+    std::vector<tonlib_api::object_ptr<tonlib_api::raw_message>> out_msgs;
+    td::int64 fees = 0;
+    td::int64 storage_fee = 0;
+    if (info.transaction.not_null()) {
+      data = to_bytes(info.transaction);
+      block::gen::Transaction::Record trans;
+      if (!tlb::unpack_cell(info.transaction, trans)) {
+        return td::Status::Error("Failed to unpack Transaction");
+      }
+
+      TRY_RESULT_ASSIGN(fees, to_balance(trans.total_fees));
+      //LOG(ERROR) << fees;
+
+      //std::ostringstream outp;
+      //block::gen::t_Transaction.print_ref(outp, info.transaction);
+      //LOG(INFO) << outp.str();
+
+      auto is_just = trans.r1.in_msg->prefetch_long(1);
+      if (is_just == trans.r1.in_msg->fetch_long_eof) {
+        return td::Status::Error("Failed to parse long");
+      }
+      if (is_just == -1) {
+        auto msg = trans.r1.in_msg->prefetch_ref();
+        TRY_RESULT(in_msg_copy, to_raw_message(trans.r1.in_msg->prefetch_ref()));
+        in_msg = std::move(in_msg_copy);
+      }
+
+      if (trans.outmsg_cnt != 0) {
+        vm::Dictionary dict{trans.r1.out_msgs, 15};
+        for (int x = 0; x < trans.outmsg_cnt && x < 100; x++) {
+          TRY_RESULT(out_msg, to_raw_message(dict.lookup_ref(td::BitArray<15>{x})));
+          fees += out_msg->fwd_fee_;
+          fees += out_msg->ihr_fee_;
+          out_msgs.push_back(std::move(out_msg));
+        }
+      }
+      td::RefInt256 storage_fees;
+      if (!block::tlb::t_TransactionDescr.get_storage_fees(trans.description, storage_fees)) {
+        return td::Status::Error("Failed to fetch storage fee from transaction");
+      }
+      storage_fee = storage_fees->to_long();
     }
-    storage_fee = storage_fees->to_long();
-  }
-  return tonlib_api::make_object<tonlib_api::raw_transaction>(
-      info.now, data,
-      tonlib_api::make_object<tonlib_api::internal_transactionId>(info.prev_trans_lt,
-                                                                  info.prev_trans_hash.as_slice().str()),
-      fees, storage_fee, fees - storage_fee, std::move(in_msg), std::move(out_msgs));
-}
-
-td::Result<tonlib_api::object_ptr<tonlib_api::raw_transaction>> to_raw_transaction(block::Transaction::Info&& info) {
-  return TRY_VM(to_raw_transaction_or_throw(std::move(info)));
-}
-
-td::Result<tonlib_api::object_ptr<tonlib_api::raw_transactions>> to_raw_transactions(
-    block::TransactionList::Info&& info) {
-  std::vector<tonlib_api::object_ptr<tonlib_api::raw_transaction>> transactions;
-  for (auto& transaction : info.transactions) {
-    TRY_RESULT(raw_transaction, to_raw_transaction(std::move(transaction)));
-    transactions.push_back(std::move(raw_transaction));
+    return tonlib_api::make_object<tonlib_api::raw_transaction>(
+        info.now, data,
+        tonlib_api::make_object<tonlib_api::internal_transactionId>(info.prev_trans_lt,
+                                                                    info.prev_trans_hash.as_slice().str()),
+        fees, storage_fee, fees - storage_fee, std::move(in_msg), std::move(out_msgs));
   }
 
-  auto transaction_id =
-      tonlib_api::make_object<tonlib_api::internal_transactionId>(info.lt, info.hash.as_slice().str());
-  for (auto& transaction : transactions) {
-    std::swap(transaction->transaction_id_, transaction_id);
+  td::Result<tonlib_api::object_ptr<tonlib_api::raw_transaction>> to_raw_transaction(block::Transaction::Info&& info) {
+    return TRY_VM(to_raw_transaction_or_throw(std::move(info)));
   }
 
-  return tonlib_api::make_object<tonlib_api::raw_transactions>(std::move(transactions), std::move(transaction_id));
-}
+  td::Result<tonlib_api::object_ptr<tonlib_api::raw_transactions>> to_raw_transactions(
+      block::TransactionList::Info&& info) {
+    std::vector<tonlib_api::object_ptr<tonlib_api::raw_transaction>> transactions;
+    for (auto& transaction : info.transactions) {
+      TRY_RESULT(raw_transaction, to_raw_transaction(std::move(transaction)));
+      transactions.push_back(std::move(raw_transaction));
+    }
+
+    auto transaction_id =
+        tonlib_api::make_object<tonlib_api::internal_transactionId>(info.lt, info.hash.as_slice().str());
+    for (auto& transaction : transactions) {
+      std::swap(transaction->transaction_id_, transaction_id);
+    }
+
+    return tonlib_api::make_object<tonlib_api::raw_transactions>(std::move(transactions), std::move(transaction_id));
+  }
+};
 
 // Raw
 
@@ -1559,39 +2036,16 @@ td::Status TonlibClient::do_request(const tonlib_api::raw_createAndSendMessage&
 }
 
 td::Status TonlibClient::do_request(tonlib_api::raw_getAccountState& request,
-                                    td::Promise<object_ptr<tonlib_api::raw_accountState>>&& promise) {
+                                    td::Promise<object_ptr<tonlib_api::raw_fullAccountState>>&& promise) {
   if (!request.account_address_) {
     return TonlibError::EmptyField("account_address");
   }
   TRY_RESULT(account_address, get_account_address(request.account_address_->account_address_));
-  make_request(int_api::GetAccountState{std::move(account_address)},
-               promise.wrap([](auto&& res) { return res->to_raw_accountState(); }));
+  make_request(int_api::GetAccountState{std::move(account_address), query_context_.block_id.copy()},
+               promise.wrap([](auto&& res) { return res->to_raw_fullAccountState(); }));
   return td::Status::OK();
 }
 
-td::Status TonlibClient::do_request(tonlib_api::raw_getTransactions& request,
-                                    td::Promise<object_ptr<tonlib_api::raw_transactions>>&& promise) {
-  if (!request.account_address_) {
-    return TonlibError::EmptyField("account_address");
-  }
-  if (!request.from_transaction_id_) {
-    return TonlibError::EmptyField("from_transaction_id");
-  }
-  TRY_RESULT(account_address, get_account_address(request.account_address_->account_address_));
-  auto lt = request.from_transaction_id_->lt_;
-  auto hash_str = request.from_transaction_id_->hash_;
-  if (hash_str.size() != 32) {
-    return td::Status::Error(400, "Invalid transaction id hash size");
-  }
-  td::Bits256 hash;
-  hash.as_slice().copy_from(hash_str);
-
-  auto actor_id = actor_id_++;
-  actors_[actor_id] = td::actor::create_actor<GetTransactionHistory>(
-      "GetTransactionHistory", client_.get_client(), account_address, lt, hash, actor_shared(this, actor_id),
-      promise.wrap(to_raw_transactions));
-  return td::Status::OK();
-}
 td::Result<KeyStorage::InputKey> from_tonlib(tonlib_api::inputKeyRegular& input_key) {
   if (!input_key.key_) {
     return TonlibError::EmptyField("key");
@@ -1603,196 +2057,133 @@ td::Result<KeyStorage::InputKey> from_tonlib(tonlib_api::inputKeyRegular& input_
 }
 
 td::Result<KeyStorage::InputKey> from_tonlib(tonlib_api::InputKey& input_key) {
-  td::Result<KeyStorage::InputKey> r_key;
-  tonlib_api::downcast_call(
-      input_key, td::overloaded([&](tonlib_api::inputKeyRegular& input_key) { r_key = from_tonlib(input_key); },
-                                [&](tonlib_api::inputKeyFake&) { r_key = KeyStorage::fake_input_key(); }));
-  return r_key;
+  return downcast_call2<td::Result<KeyStorage::InputKey>>(
+      input_key, td::overloaded([&](tonlib_api::inputKeyRegular& input_key) { return from_tonlib(input_key); },
+                                [&](tonlib_api::inputKeyFake&) { return KeyStorage::fake_input_key(); }));
 }
 
-// ton::TestWallet
-td::Status TonlibClient::do_request(const tonlib_api::testWallet_init& request,
-                                    td::Promise<object_ptr<tonlib_api::ok>>&& promise) {
-  if (!request.private_key_) {
-    return td::Status::Error(400, "Field private_key must not be empty");
+td::Status TonlibClient::do_request(tonlib_api::raw_getTransactions& request,
+                                    td::Promise<object_ptr<tonlib_api::raw_transactions>>&& promise) {
+  if (!request.account_address_) {
+    return TonlibError::EmptyField("account_address");
   }
-  TRY_RESULT(input_key, from_tonlib(*request.private_key_));
-  auto init_state = ton::TestWallet::get_init_state(td::Ed25519::PublicKey(input_key.key.public_key.copy()));
-  auto address = ton::GenericAccount::get_address(0 /*zerochain*/, init_state);
-  TRY_RESULT(private_key, key_storage_.load_private_key(std::move(input_key)));
-  auto init_message = ton::TestWallet::get_init_message(td::Ed25519::PrivateKey(std::move(private_key.private_key)));
-  auto message = ton::GenericAccount::create_ext_message(address, std::move(init_state), std::move(init_message));
-  make_request(int_api::SendMessage{std::move(message)}, to_any_promise(std::move(promise)));
+  if (!request.from_transaction_id_) {
+    return TonlibError::EmptyField("from_transaction_id");
+  }
+  TRY_RESULT(account_address, get_account_address(request.account_address_->account_address_));
+  td::optional<td::Ed25519::PrivateKey> private_key;
+  if (request.private_key_) {
+    TRY_RESULT(input_key, from_tonlib(*request.private_key_));
+    //NB: options<Status> has lot of problems. We use emplace to migitate them
+    td::optional<td::Status> o_status;
+    //NB: rely on (and assert) that GetPrivateKey is a synchonous request
+    make_request(int_api::GetPrivateKey{std::move(input_key)}, [&](auto&& r_key) {
+      if (r_key.is_error()) {
+        o_status.emplace(r_key.move_as_error());
+        return;
+      }
+      o_status.emplace(td::Status::OK());
+      private_key = td::Ed25519::PrivateKey(std::move(r_key.move_as_ok().private_key));
+    });
+    TRY_STATUS(o_status.unwrap());
+  }
+  auto lt = request.from_transaction_id_->lt_;
+  auto hash_str = request.from_transaction_id_->hash_;
+  if (hash_str.size() != 32) {
+    return td::Status::Error(400, "Invalid transaction id hash size");
+  }
+  td::Bits256 hash;
+  hash.as_slice().copy_from(hash_str);
+
+  auto actor_id = actor_id_++;
+  actors_[actor_id] = td::actor::create_actor<GetTransactionHistory>(
+      "GetTransactionHistory", client_.get_client(), account_address, lt, hash, actor_shared(this, actor_id),
+      promise.wrap([private_key = std::move(private_key)](auto&& x) mutable {
+        return ToRawTransactions(std::move(private_key)).to_raw_transactions(std::move(x));
+      }));
   return td::Status::OK();
 }
 
-td::Status TonlibClient::do_request(const tonlib_api::testWallet_sendGrams& request,
-                                    td::Promise<object_ptr<tonlib_api::sendGramsResult>>&& promise) {
-  if (!request.destination_) {
-    return TonlibError::EmptyField("destination");
-  }
-  if (!request.private_key_) {
-    return TonlibError::EmptyField("private_key");
-  }
-  if (request.message_.size() > ton::TestWallet::max_message_size) {
-    return TonlibError::MessageTooLong();
-  }
-  TRY_RESULT(account_address, get_account_address(request.destination_->account_address_));
-  TRY_RESULT(input_key, from_tonlib(*request.private_key_));
-  auto address = ton::GenericAccount::get_address(
-      0 /*zerochain*/, ton::TestWallet::get_init_state(td::Ed25519::PublicKey(input_key.key.public_key.copy())));
-  TRY_RESULT(private_key_str, key_storage_.load_private_key(std::move(input_key)));
-  auto private_key = td::Ed25519::PrivateKey(std::move(private_key_str.private_key));
-  td::Ref<vm::Cell> init_state;
-  if (request.seqno_ == 0) {
-    TRY_RESULT_PREFIX(public_key, private_key.get_public_key(), TonlibError::Internal());
-    init_state = ton::TestWallet::get_init_state(public_key);
-  }
-  auto message = ton::TestWallet::make_a_gift_message(private_key, request.seqno_, request.amount_, request.message_,
-                                                      account_address);
-  auto message_hash = message->get_hash().as_slice().str();
-  auto new_promise = promise.wrap([message_hash = std::move(message_hash)](auto&&) {
-    return tonlib_api::make_object<tonlib_api::sendGramsResult>(0, std::move(message_hash));
-  });
-
-  auto ext_message = ton::GenericAccount::create_ext_message(address, std::move(init_state), std::move(message));
-  make_request(int_api::SendMessage{std::move(message)}, std::move(new_promise));
-  return td::Status::OK();
-}
-
-td::Status TonlibClient::do_request(tonlib_api::testWallet_getAccountState& request,
-                                    td::Promise<object_ptr<tonlib_api::testWallet_accountState>>&& promise) {
+td::Status TonlibClient::do_request(const tonlib_api::getAccountState& request,
+                                    td::Promise<object_ptr<tonlib_api::fullAccountState>>&& promise) {
   if (!request.account_address_) {
     return TonlibError::EmptyField("account_address");
   }
   TRY_RESULT(account_address, get_account_address(request.account_address_->account_address_));
-  make_request(int_api::GetAccountState{std::move(account_address)},
-               promise.wrap([](auto&& res) { return res->to_testWallet_accountState(); }));
+  make_request(int_api::GetAccountState{std::move(account_address), query_context_.block_id.copy()},
+               promise.wrap([](auto&& res) { return res->to_fullAccountState(); }));
   return td::Status::OK();
 }
 
-// ton::Wallet
-td::Status TonlibClient::do_request(const tonlib_api::wallet_init& request,
-                                    td::Promise<object_ptr<tonlib_api::ok>>&& promise) {
-  if (!request.private_key_) {
-    return TonlibError::EmptyField("private_key");
-  }
-  TRY_RESULT(input_key, from_tonlib(*request.private_key_));
-  auto init_state = ton::Wallet::get_init_state(td::Ed25519::PublicKey(input_key.key.public_key.copy()));
-  auto address = ton::GenericAccount::get_address(0 /*zerochain*/, init_state);
-  TRY_RESULT(private_key, key_storage_.load_private_key(std::move(input_key)));
-  auto init_message = ton::Wallet::get_init_message(td::Ed25519::PrivateKey(std::move(private_key.private_key)));
-  auto message =
-      ton::GenericAccount::create_ext_message(std::move(address), std::move(init_state), std::move(init_message));
-
-  make_request(int_api::SendMessage{std::move(message)}, to_any_promise(std::move(promise)));
-  return td::Status::OK();
-}
-
-td::Status TonlibClient::do_request(const tonlib_api::wallet_sendGrams& request,
-                                    td::Promise<object_ptr<tonlib_api::sendGramsResult>>&& promise) {
-  if (!request.destination_) {
-    return TonlibError::EmptyField("destination");
-  }
-  if (!request.private_key_) {
-    return TonlibError::EmptyField("private_key");
-  }
-  if (request.message_.size() > ton::Wallet::max_message_size) {
-    return TonlibError::MessageTooLong();
-  }
-  TRY_RESULT_PREFIX(valid_until, td::narrow_cast_safe<td::uint32>(request.valid_until_),
-                    TonlibError::InvalidField("valid_until", "overflow"));
-  TRY_RESULT(account_address, get_account_address(request.destination_->account_address_));
-  TRY_RESULT(input_key, from_tonlib(*request.private_key_));
-  auto address = ton::GenericAccount::get_address(
-      0 /*zerochain*/, ton::Wallet::get_init_state(td::Ed25519::PublicKey(input_key.key.public_key.copy())));
-  TRY_RESULT(private_key_str, key_storage_.load_private_key(std::move(input_key)));
-  auto private_key = td::Ed25519::PrivateKey(std::move(private_key_str.private_key));
-  td::Ref<vm::Cell> init_state;
-  if (request.seqno_ == 0) {
-    TRY_RESULT_PREFIX(public_key, private_key.get_public_key(), TonlibError::Internal());
-    init_state = ton::Wallet::get_init_state(public_key);
-  }
-  auto message = ton::Wallet::make_a_gift_message(private_key, request.seqno_, valid_until, request.amount_,
-                                                  request.message_, account_address);
-  auto message_hash = message->get_hash().as_slice().str();
-  auto new_promise = promise.wrap([valid_until, message_hash = std::move(message_hash)](auto&&) {
-    return tonlib_api::make_object<tonlib_api::sendGramsResult>(valid_until, std::move(message_hash));
-  });
-  auto ext_message = ton::GenericAccount::create_ext_message(address, std::move(init_state), std::move(message));
-  make_request(int_api::SendMessage{std::move(message)}, std::move(new_promise));
-  return td::Status::OK();
-}
-
-td::Status TonlibClient::do_request(tonlib_api::wallet_getAccountState& request,
-                                    td::Promise<object_ptr<tonlib_api::wallet_accountState>>&& promise) {
-  if (!request.account_address_) {
-    return TonlibError::EmptyField("account_address");
-  }
-  TRY_RESULT(account_address, get_account_address(request.account_address_->account_address_));
-  make_request(int_api::GetAccountState{std::move(account_address)},
-               promise.wrap([](auto&& res) { return res->to_wallet_accountState(); }));
-  return td::Status::OK();
-}
-
-// ton::TestGiver
-td::Status TonlibClient::do_request(const tonlib_api::testGiver_sendGrams& request,
-                                    td::Promise<object_ptr<tonlib_api::sendGramsResult>>&& promise) {
-  if (!request.destination_) {
-    return TonlibError::EmptyField("destination");
-  }
-  if (request.message_.size() > ton::TestGiver::max_message_size) {
-    return TonlibError::MessageTooLong();
-  }
-  TRY_RESULT(account_address, get_account_address(request.destination_->account_address_));
-  auto message =
-      ton::TestGiver::make_a_gift_message(request.seqno_, request.amount_, request.message_, account_address);
-  auto message_hash = message->get_hash().as_slice().str();
-  auto new_promise = promise.wrap([message_hash = std::move(message_hash)](auto&&) {
-    return tonlib_api::make_object<tonlib_api::sendGramsResult>(0, std::move(message_hash));
-  });
-
-  auto ext_message = ton::GenericAccount::create_ext_message(ton::TestGiver::address(), {}, std::move(message));
-  make_request(int_api::SendMessage{std::move(message)}, std::move(new_promise));
-  return td::Status::OK();
-}
-
-td::Status TonlibClient::do_request(const tonlib_api::testGiver_getAccountState& request,
-                                    td::Promise<object_ptr<tonlib_api::testGiver_accountState>>&& promise) {
-  make_request(int_api::GetAccountState{ton::TestGiver::address()},
-               promise.wrap([](auto&& res) { return res->to_testGiver_accountState(); }));
-  return td::Status::OK();
-}
-
-td::Status TonlibClient::do_request(const tonlib_api::generic_getAccountState& request,
-                                    td::Promise<object_ptr<tonlib_api::generic_AccountState>>&& promise) {
-  if (!request.account_address_) {
-    return TonlibError::EmptyField("account_address");
-  }
-  TRY_RESULT(account_address, get_account_address(request.account_address_->account_address_));
-  make_request(int_api::GetAccountState{std::move(account_address)},
-               promise.wrap([](auto&& res) { return res->to_generic_accountState(); }));
-  return td::Status::OK();
+td::Result<ton::ManualDns::EntryData> to_dns_entry_data(tonlib_api::dns_EntryData& entry_data) {
+  using R = td::Result<ton::ManualDns::EntryData>;
+  return downcast_call2<R>(
+      entry_data,
+      td::overloaded(
+          [&](tonlib_api::dns_entryDataUnknown& unknown) -> R { return ton::ManualDns::EntryData(); },
+          [&](tonlib_api::dns_entryDataNextResolver& next_resolver) -> R {
+            if (!next_resolver.resolver_) {
+              return TonlibError::EmptyField("resolver");
+            }
+            TRY_RESULT(resolver, get_account_address(next_resolver.resolver_->account_address_));
+            return ton::ManualDns::EntryData::next_resolver(std::move(resolver));
+          },
+          [&](tonlib_api::dns_entryDataSmcAddress& smc_address) -> R {
+            if (!smc_address.smc_address_) {
+              return TonlibError::EmptyField("smc_address");
+            }
+            TRY_RESULT(address, get_account_address(smc_address.smc_address_->account_address_));
+            return ton::ManualDns::EntryData::smc_address(std::move(address));
+          },
+          [&](tonlib_api::dns_entryDataAdnlAddress& adnl_address) -> R {
+            if (!adnl_address.adnl_address_) {
+              return TonlibError::EmptyField("adnl_address");
+            }
+            TRY_RESULT(address, get_adnl_address(adnl_address.adnl_address_->adnl_address_));
+            return ton::ManualDns::EntryData::adnl_address(std::move(address));
+          },
+          [&](tonlib_api::dns_entryDataText& text) -> R { return ton::ManualDns::EntryData::text(text.text_); }));
 }
 
 class GenericCreateSendGrams : public TonlibQueryActor {
  public:
-  GenericCreateSendGrams(td::actor::ActorShared<TonlibClient> client,
-                         tonlib_api::generic_createSendGramsQuery send_grams,
-                         td::Promise<td::unique_ptr<Query>>&& promise)
-      : TonlibQueryActor(std::move(client)), send_grams_(std::move(send_grams)), promise_(std::move(promise)) {
+  GenericCreateSendGrams(td::actor::ActorShared<TonlibClient> client, tonlib_api::createQuery query,
+                         td::optional<ton::BlockIdExt> block_id, td::Promise<td::unique_ptr<Query>>&& promise)
+      : TonlibQueryActor(std::move(client))
+      , query_(std::move(query))
+      , promise_(std::move(promise))
+      , block_id_(std::move(block_id)) {
   }
 
  private:
-  tonlib_api::generic_createSendGramsQuery send_grams_;
+  tonlib_api::createQuery query_;
   td::Promise<td::unique_ptr<Query>> promise_;
 
   td::unique_ptr<AccountState> source_;
-  td::unique_ptr<AccountState> destination_;
+  std::vector<td::unique_ptr<AccountState>> destinations_;
+  size_t destinations_left_ = 0;
   bool has_private_key_{false};
   bool is_fake_key_{false};
   td::optional<td::Ed25519::PrivateKey> private_key_;
   td::optional<td::Ed25519::PublicKey> public_key_;
+  td::optional<ton::BlockIdExt> block_id_;
+
+  struct Action {
+    block::StdAddress destination;
+    td::int64 amount;
+
+    bool is_encrypted{false};
+    bool should_encrypt;
+    std::string message;
+
+    td::Ref<vm::Cell> body;
+  };
+  bool allow_send_to_uninited_{false};
+  std::vector<Action> actions_;
+
+  // We combine compelty different actions in one actor
+  // Should be splitted eventually
+  std::vector<ton::ManualDns::Action> dns_actions_;
 
   void check(td::Status status) {
     if (status.is_error()) {
@@ -1808,40 +2199,136 @@ class GenericCreateSendGrams : public TonlibQueryActor {
     check(TonlibError::Cancelled());
   }
 
-  td::Status do_start_up() {
-    if (send_grams_.timeout_ < 0 || send_grams_.timeout_ > 300) {
-      return TonlibError::InvalidField("timeout", "must be between 0 and 300");
+  td::Result<Action> to_action(const tonlib_api::msg_message& message) {
+    if (!message.destination_) {
+      return TonlibError::EmptyField("message.destination");
     }
-    if (!send_grams_.destination_) {
-      return TonlibError::EmptyField("destination");
-    }
-    if (!send_grams_.source_) {
-      return TonlibError::EmptyField("source");
-    }
-    if (send_grams_.amount_ < 0) {
+    Action res;
+    TRY_RESULT(destination, get_account_address(message.destination_->account_address_));
+    res.destination = destination;
+    if (message.amount_ < 0) {
       return TonlibError::InvalidField("amount", "can't be negative");
     }
+    res.amount = message.amount_;
+    auto status =
+        downcast_call2<td::Status>(*message.data_, td::overloaded(
+                                                       [&](tonlib_api::msg_dataRaw& text) {
+                                                         TRY_RESULT(body, vm::std_boc_deserialize(text.body_));
+                                                         res.body = std::move(body);
+                                                         return td::Status::OK();
+                                                       },
+                                                       [&](tonlib_api::msg_dataText& text) {
+                                                         res.message = text.text_;
+                                                         res.should_encrypt = false;
+                                                         res.is_encrypted = false;
+                                                         return td::Status::OK();
+                                                       },
+                                                       [&](tonlib_api::msg_dataDecryptedText& text) {
+                                                         res.message = text.text_;
+                                                         if (!has_private_key_) {
+                                                           return TonlibError::EmptyField("input_key");
+                                                         }
+                                                         res.should_encrypt = true;
+                                                         res.is_encrypted = true;
+                                                         return td::Status::OK();
+                                                       },
+                                                       [&](tonlib_api::msg_dataEncryptedText& text) {
+                                                         res.message = text.text_;
+                                                         res.should_encrypt = false;
+                                                         res.is_encrypted = true;
+                                                         return td::Status::OK();
+                                                       }));
     // Use this limit as a preventive check
-    if (send_grams_.message_.size() > ton::Wallet::max_message_size) {
+    if (res.message.size() > ton::Wallet::max_message_size) {
       return TonlibError::MessageTooLong();
     }
-    TRY_RESULT(destination_address, get_account_address(send_grams_.destination_->account_address_));
-    TRY_RESULT(source_address, get_account_address(send_grams_.source_->account_address_));
+    TRY_STATUS(std::move(status));
+    return res;
+  }
 
-    has_private_key_ = bool(send_grams_.private_key_);
+  td::Result<ton::ManualDns::Action> to_dns_action(tonlib_api::dns_Action& action) {
+    using R = td::Result<ton::ManualDns::Action>;
+    return downcast_call2<R>(action,
+                             td::overloaded(
+                                 [&](tonlib_api::dns_actionDeleteAll& del_all) -> R {
+                                   return ton::ManualDns::Action{"", 0, {}};
+                                 },
+                                 [&](tonlib_api::dns_actionDelete& del) -> R {
+                                   TRY_RESULT(category, td::narrow_cast_safe<td::int16>(del.category_));
+                                   return ton::ManualDns::Action{del.name_, category, {}};
+                                 },
+                                 [&](tonlib_api::dns_actionSet& set) -> R {
+                                   if (!set.entry_) {
+                                     return TonlibError::EmptyField("entry");
+                                   }
+                                   if (!set.entry_->entry_) {
+                                     return TonlibError::EmptyField("entry.entry");
+                                   }
+                                   TRY_RESULT(category, td::narrow_cast_safe<td::int16>(set.entry_->category_));
+                                   TRY_RESULT(entry_data, to_dns_entry_data(*set.entry_->entry_));
+                                   TRY_RESULT(data_cell, entry_data.as_cell());
+                                   return ton::ManualDns::Action{set.entry_->name_, category, std::move(data_cell)};
+                                 }));
+  }
+
+  td::Status parse_action(tonlib_api::Action& action) {
+    return downcast_call2<td::Status>(action,
+                                      td::overloaded([&](tonlib_api::actionNoop& cell) { return td::Status::OK(); },
+                                                     [&](tonlib_api::actionMsg& cell) {
+                                                       allow_send_to_uninited_ = cell.allow_send_to_uninited_;
+                                                       for (auto& from_action : cell.messages_) {
+                                                         if (!from_action) {
+                                                           return TonlibError::EmptyField("message");
+                                                         }
+                                                         TRY_RESULT(action, to_action(*from_action));
+                                                         actions_.push_back(std::move(action));
+                                                       }
+                                                       return td::Status::OK();
+                                                     },
+                                                     [&](tonlib_api::actionDns& cell) {
+                                                       for (auto& from_action : cell.actions_) {
+                                                         if (!from_action) {
+                                                           return TonlibError::EmptyField("action");
+                                                         }
+                                                         TRY_RESULT(action, to_dns_action(*from_action));
+                                                         dns_actions_.push_back(std::move(action));
+                                                       }
+                                                       return td::Status::OK();
+                                                     }));
+  }
+
+  td::Status do_start_up() {
+    if (query_.timeout_ < 0 || query_.timeout_ > 300) {
+      return TonlibError::InvalidField("timeout", "must be between 0 and 300");
+    }
+    if (!query_.address_) {
+      return TonlibError::EmptyField("address");
+    }
+    if (!query_.action_) {
+      return TonlibError::EmptyField("action");
+    }
+
+    TRY_RESULT(source_address, get_account_address(query_.address_->account_address_));
+
+    has_private_key_ = bool(query_.private_key_);
     if (has_private_key_) {
-      TRY_RESULT(input_key, from_tonlib(*send_grams_.private_key_));
-      is_fake_key_ = send_grams_.private_key_->get_id() == tonlib_api::inputKeyFake::ID;
+      TRY_RESULT(input_key, from_tonlib(*query_.private_key_));
+      is_fake_key_ = query_.private_key_->get_id() == tonlib_api::inputKeyFake::ID;
       public_key_ = td::Ed25519::PublicKey(input_key.key.public_key.copy());
       send_query(int_api::GetPrivateKey{std::move(input_key)},
                  promise_send_closure(actor_id(this), &GenericCreateSendGrams::on_private_key));
     }
+    TRY_STATUS(parse_action(*query_.action_));
 
-    send_query(int_api::GetAccountState{source_address},
+    send_query(int_api::GetAccountState{source_address, block_id_.copy()},
                promise_send_closure(actor_id(this), &GenericCreateSendGrams::on_source_state));
 
-    send_query(int_api::GetAccountState{destination_address},
-               promise_send_closure(actor_id(this), &GenericCreateSendGrams::on_destination_state));
+    destinations_.resize(actions_.size());
+    destinations_left_ = destinations_.size();
+    for (size_t i = 0; i < actions_.size(); i++) {
+      send_query(int_api::GetAccountState{actions_[i].destination, block_id_.copy()},
+                 promise_send_closure(actor_id(this), &GenericCreateSendGrams::on_destination_state, i));
+    }
 
     return do_loop();
   }
@@ -1875,109 +2362,157 @@ class GenericCreateSendGrams : public TonlibQueryActor {
     return do_loop();
   }
 
-  void on_destination_state(td::Result<td::unique_ptr<AccountState>> r_state) {
-    check(do_on_destination_state(std::move(r_state)));
+  void on_destination_state(size_t i, td::Result<td::unique_ptr<AccountState>> state) {
+    check(do_on_destination_state(i, std::move(state)));
   }
 
-  td::Status do_on_destination_state(td::Result<td::unique_ptr<AccountState>> r_state) {
+  td::Status do_on_destination_state(size_t i, td::Result<td::unique_ptr<AccountState>> r_state) {
     TRY_RESULT(state, std::move(r_state));
-    destination_ = std::move(state);
-    if (destination_->is_frozen()) {
+    CHECK(destinations_left_ > 0);
+    destinations_left_--;
+    destinations_[i] = std::move(state);
+    auto& destination = *destinations_[i];
+    if (destination.is_frozen()) {
       //FIXME: after restoration of frozen accounts will be supported
       return TonlibError::TransferToFrozen();
     }
-    if (destination_->get_wallet_type() == AccountState::Empty && destination_->get_address().bounceable) {
-      if (!send_grams_.allow_send_to_uninited_) {
+    if (destination.get_wallet_type() == AccountState::Empty && destination.get_address().bounceable) {
+      if (!allow_send_to_uninited_) {
         return TonlibError::DangerousTransaction("Transfer to uninited wallet");
       }
-      destination_->make_non_bounceable();
+      destination.make_non_bounceable();
       LOG(INFO) << "Change destination address from bounceable to non-bounceable ";
     }
     return do_loop();
   }
 
+  td::Status do_dns_loop() {
+    if (!private_key_) {
+      return TonlibError::EmptyField("private_key");
+    }
+
+    Query::Raw raw;
+    auto valid_until = source_->get_sync_time();
+    valid_until += query_.timeout_ == 0 ? 60 : query_.timeout_;
+    raw.valid_until = valid_until;
+    auto dns = ton::ManualDns::create(source_->get_smc_state());
+    if (dns_actions_.empty()) {
+      TRY_RESULT(message_body, dns->create_init_query(private_key_.value(), valid_until));
+      raw.message_body = std::move(message_body);
+    } else {
+      TRY_RESULT(message_body, dns->create_update_query(private_key_.value(), dns_actions_, valid_until));
+      raw.message_body = std::move(message_body);
+    }
+    raw.new_state = source_->get_new_state();
+    raw.message = ton::GenericAccount::create_ext_message(source_->get_address(), raw.new_state, raw.message_body);
+    raw.source = std::move(source_);
+    raw.destinations = std::move(destinations_);
+    promise_.set_value(td::make_unique<Query>(std::move(raw)));
+    stop();
+    return td::Status::OK();
+  }
+
   td::Status do_loop() {
-    if (!source_ || !destination_) {
+    if (!source_ || destinations_left_ != 0) {
       return td::Status::OK();
     }
     if (has_private_key_ && !private_key_) {
       return td::Status::OK();
     }
 
-    Query::Raw raw;
+    if (source_->get_wallet_type() == AccountState::ManualDns) {
+      return do_dns_loop();
+    }
 
-    auto amount = send_grams_.amount_;
-    if (amount > source_->get_balance()) {
-      return TonlibError::NotEnoughFunds();
-    }
-    if (amount == source_->get_balance()) {
-      amount = -1;
-    }
-    auto message = send_grams_.message_;
     switch (source_->get_wallet_type()) {
       case AccountState::Empty:
         return TonlibError::AccountNotInited();
       case AccountState::Unknown:
         return TonlibError::AccountTypeUnknown();
-      case AccountState::Giver: {
-        raw.message_body = ton::TestGiver::make_a_gift_message(0, amount, message, destination_->get_address());
+      default:
         break;
-      }
-
-      case AccountState::SimpleWallet: {
-        if (!private_key_) {
-          return TonlibError::EmptyField("private_key");
-        }
-        if (message.size() > ton::TestWallet::max_message_size) {
-          return TonlibError::MessageTooLong();
-        }
-        TRY_RESULT(seqno, ton::TestWallet(source_->get_smc_state()).get_seqno());
-        raw.message_body = ton::TestWallet::make_a_gift_message(private_key_.unwrap(), seqno, amount, message,
-                                                                destination_->get_address());
-        break;
-      }
-      case AccountState::Wallet: {
-        if (!private_key_) {
-          return TonlibError::EmptyField("private_key");
-        }
-        if (message.size() > ton::Wallet::max_message_size) {
-          return TonlibError::MessageTooLong();
-        }
-        TRY_RESULT(seqno, ton::Wallet(source_->get_smc_state()).get_seqno());
-        auto valid_until = source_->get_sync_time();
-        valid_until += send_grams_.timeout_ == 0 ? 60 : send_grams_.timeout_;
-        raw.valid_until = valid_until;
-        raw.message_body = ton::Wallet::make_a_gift_message(private_key_.unwrap(), seqno, valid_until, amount, message,
-                                                            destination_->get_address());
-        break;
-      }
-      case AccountState::WalletV3: {
-        if (!private_key_) {
-          return TonlibError::EmptyField("private_key");
-        }
-        if (message.size() > ton::WalletV3::max_message_size) {
-          return TonlibError::MessageTooLong();
-        }
-        auto wallet = ton::WalletV3(source_->get_smc_state());
-        TRY_RESULT(seqno, wallet.get_seqno());
-        TRY_RESULT(wallet_id, wallet.get_wallet_id());
-        auto valid_until = source_->get_sync_time();
-        valid_until += send_grams_.timeout_ == 0 ? 60 : send_grams_.timeout_;
-        raw.valid_until = valid_until;
-        raw.message_body = ton::WalletV3::make_a_gift_message(private_key_.unwrap(), wallet_id, seqno, valid_until,
-                                                              amount, message, destination_->get_address());
-        break;
-      }
     }
 
-    raw.new_state = source_->get_new_state();
-    raw.message = ton::GenericAccount::create_ext_message(source_->get_address(), raw.new_state, raw.message_body);
-    raw.source = std::move(source_);
-    raw.destination = std::move(destination_);
+    if (!source_->is_wallet()) {
+      return TonlibError::AccountActionUnsupported("wallet action");
+    }
 
-    promise_.set_value(td::make_unique<Query>(std::move(raw)));
-    stop();
-    return td::Status::OK();
+    td::int64 amount = 0;
+    for (auto& action : actions_) {
+      amount += action.amount;
+    }
+
+    if (amount > source_->get_balance()) {
+      return TonlibError::NotEnoughFunds();
+    }
+
+    auto valid_until = source_->get_sync_time();
+    valid_until += query_.timeout_ == 0 ? 60 : query_.timeout_;
+    std::vector<ton::WalletInterface::Gift> gifts;
+    size_t i = 0;
+    for (auto& action : actions_) {
+      ton::HighloadWalletV2::Gift gift;
+      auto& destination = destinations_[i];
+      gift.destination = destinations_[i]->get_address();
+      gift.gramms = action.amount;
+      if (action.amount == source_->get_balance()) {
+        gift.gramms = -1;
+      }
+      if (action.body.not_null()) {
+        gift.body = action.body;
+      } else if (action.should_encrypt) {
+        LOG(ERROR) << "TRY ENCRYPT";
+        if (!private_key_) {
+          return TonlibError::EmptyField("private_key");
+        }
+        if (!destination->is_wallet()) {
+          return TonlibError::MessageEncryption("Get public key (in destination)");
+        }
+        auto wallet = destination->get_wallet();
+        TRY_RESULT_PREFIX(public_key, wallet->get_public_key(),
+                          TonlibError::AccountActionUnsupported(PSLICE() << "Get public key (in destination) : "
+                                                                         << destination->get_wallet_type()));
+        TRY_RESULT_PREFIX(encrypted_message,
+                          SimpleEncryptionV2::encrypt_data(action.message, public_key, private_key_.value()),
+                          TonlibError::Internal());
+        gift.message = encrypted_message.as_slice().str();
+        gift.is_encrypted = true;
+      } else {
+        gift.message = action.message;
+        gift.is_encrypted = action.is_encrypted;
+      }
+      i++;
+      gifts.push_back(gift);
+    }
+
+    Query::Raw raw;
+    auto with_wallet = [&](auto&& wallet) {
+      if (!private_key_) {
+        return TonlibError::EmptyField("private_key");
+      }
+      if (wallet.get_max_gifts_size() < gifts.size()) {
+        return TonlibError::MessageTooLong();  // TODO: other error
+      }
+
+      raw.valid_until = valid_until;
+      TRY_RESULT(message_body, wallet.make_a_gift_message(private_key_.unwrap(), valid_until, gifts));
+      raw.message_body = std::move(message_body);
+      raw.new_state = source_->get_new_state();
+      raw.message = ton::GenericAccount::create_ext_message(source_->get_address(), raw.new_state, raw.message_body);
+      raw.source = std::move(source_);
+      raw.destinations = std::move(destinations_);
+
+      promise_.set_value(td::make_unique<Query>(std::move(raw)));
+      stop();
+      return td::Status::OK();
+    };
+
+    if (source_->get_wallet_type() == AccountState::Giver) {
+      valid_until = 0;
+      private_key_ = td::Ed25519::PrivateKey(td::SecureString(std::string(32, '\0')));
+    }
+
+    return with_wallet(*source_->get_wallet());
   }
 };
 
@@ -2002,24 +2537,50 @@ void TonlibClient::finish_create_query(td::Result<td::unique_ptr<Query>> r_query
   auto id = register_query(std::move(query));
   promise.set_result(get_query_info(id));
 }
-void TonlibClient::finish_send_query(td::Result<td::unique_ptr<Query>> r_query,
-                                     td::Promise<object_ptr<tonlib_api::sendGramsResult>>&& promise) {
-  TRY_RESULT_PROMISE(promise, query, std::move(r_query));
-  auto result = tonlib_api::make_object<tonlib_api::sendGramsResult>(query->get_valid_until(),
-                                                                     query->get_body_hash().as_slice().str());
-  auto id = register_query(std::move(query));
-  make_request(tonlib_api::query_send(id),
-               promise.wrap([result = std::move(result)](auto&&) mutable { return std::move(result); }));
-}
-td::Status TonlibClient::do_request(tonlib_api::generic_createSendGramsQuery& request,
+
+td::Status TonlibClient::do_request(tonlib_api::createQuery& request,
                                     td::Promise<object_ptr<tonlib_api::query_info>>&& promise) {
   auto id = actor_id_++;
   actors_[id] = td::actor::create_actor<GenericCreateSendGrams>(
-      "GenericSendGrams", actor_shared(this, id), std::move(request),
+      "GenericSendGrams", actor_shared(this, id), std::move(request), query_context_.block_id.copy(),
       promise.send_closure(actor_id(this), &TonlibClient::finish_create_query));
   return td::Status::OK();
 }
 
+td::Status TonlibClient::do_request(tonlib_api::msg_decrypt& request,
+                                    td::Promise<object_ptr<tonlib_api::msg_dataArray>>&& promise) {
+  if (!request.input_key_) {
+    return TonlibError::EmptyField("input_key");
+  }
+  if (!request.data_) {
+    return TonlibError::EmptyField("data");
+  }
+  TRY_RESULT(input_key, from_tonlib(*request.input_key_));
+  make_request(
+      int_api::GetPrivateKey{std::move(input_key)},
+      promise.wrap([elements = std::move(request.data_)](auto key) mutable {
+        auto private_key = td::Ed25519::PrivateKey(std::move(key.private_key));
+        elements->elements_ = td::transform(std::move(elements->elements_), [&private_key](auto msg) {
+          if (!msg) {
+            return std::move(msg);
+          }
+          using ReturnType = tonlib_api::object_ptr<tonlib_api::msg_Data>;
+          return downcast_call2<ReturnType>(
+              *msg, td::overloaded([&msg](auto&) { return std::move(msg); },
+                                   [&msg, &private_key](tonlib_api::msg_dataEncryptedText& encrypted) -> ReturnType {
+                                     auto r_decrypted = SimpleEncryptionV2::decrypt_data(encrypted.text_, private_key);
+                                     if (r_decrypted.is_error()) {
+                                       return std::move(msg);
+                                     }
+                                     return tonlib_api::make_object<tonlib_api::msg_dataDecryptedText>(
+                                         r_decrypted.move_as_ok().as_slice().str());
+                                   }));
+        });
+        return std::move(elements);
+      }));
+  return td::Status::OK();
+}
+
 td::Status TonlibClient::do_request(const tonlib_api::raw_createQuery& request,
                                     td::Promise<object_ptr<tonlib_api::query_info>>&& promise) {
   if (!request.destination_) {
@@ -2038,7 +2599,7 @@ td::Status TonlibClient::do_request(const tonlib_api::raw_createQuery& request,
   td::Promise<td::unique_ptr<Query>> new_promise =
       promise.send_closure(actor_id(this), &TonlibClient::finish_create_query);
 
-  make_request(int_api::GetAccountState{account_address},
+  make_request(int_api::GetAccountState{account_address, query_context_.block_id.copy()},
                new_promise.wrap([smc_state = std::move(smc_state), body = std::move(body)](auto&& source) mutable {
                  Query::Raw raw;
                  if (smc_state) {
@@ -2049,24 +2610,11 @@ td::Status TonlibClient::do_request(const tonlib_api::raw_createQuery& request,
                  raw.message =
                      ton::GenericAccount::create_ext_message(source->get_address(), raw.new_state, raw.message_body);
                  raw.source = std::move(source);
-                 raw.destination = nullptr;
                  return td::make_unique<Query>(std::move(raw));
                }));
   return td::Status::OK();
 }
 
-td::Status TonlibClient::do_request(tonlib_api::generic_sendGrams& request,
-                                    td::Promise<object_ptr<tonlib_api::sendGramsResult>>&& promise) {
-  auto id = actor_id_++;
-  actors_[id] = td::actor::create_actor<GenericCreateSendGrams>(
-      "GenericSendGrams", actor_shared(this, id),
-      tonlib_api::generic_createSendGramsQuery(std::move(request.private_key_), std::move(request.source_),
-                                               std::move(request.destination_), request.amount_, request.timeout_,
-                                               request.allow_send_to_uninited_, std::move(request.message_)),
-      promise.send_closure(actor_id(this), &TonlibClient::finish_send_query));
-  return td::Status::OK();
-}
-
 td::Status TonlibClient::do_request(const tonlib_api::query_getInfo& request,
                                     td::Promise<object_ptr<tonlib_api::query_info>>&& promise) {
   promise.set_result(get_query_info(request.id_));
@@ -2083,8 +2631,8 @@ void TonlibClient::query_estimate_fees(td::int64 id, bool ignore_chksig, td::Res
   TRY_RESULT_PROMISE(promise, state, std::move(r_state));
   TRY_RESULT_PROMISE_PREFIX(promise, fees, TRY_VM(it->second->estimate_fees(ignore_chksig, *state.config)),
                             TonlibError::Internal());
-  promise.set_value(
-      tonlib_api::make_object<tonlib_api::query_fees>(fees.first.to_tonlib_api(), fees.second.to_tonlib_api()));
+  promise.set_value(tonlib_api::make_object<tonlib_api::query_fees>(
+      fees.first.to_tonlib_api(), td::transform(fees.second, [](auto& x) { return x.to_tonlib_api(); })));
 }
 
 td::Status TonlibClient::do_request(const tonlib_api::query_estimateFees& request,
@@ -2154,7 +2702,7 @@ td::Status TonlibClient::do_request(const tonlib_api::smc_load& request,
     return TonlibError::EmptyField("account_address");
   }
   TRY_RESULT(account_address, get_account_address(request.account_address_->account_address_));
-  make_request(int_api::GetAccountState{std::move(account_address)},
+  make_request(int_api::GetAccountState{std::move(account_address), query_context_.block_id.copy()},
                promise.send_closure(actor_id(this), &TonlibClient::finish_load_smc));
   return td::Status::OK();
 }
@@ -2195,6 +2743,98 @@ td::Status TonlibClient::do_request(const tonlib_api::smc_getState& request,
   return td::Status::OK();
 }
 
+bool is_list(vm::StackEntry entry) {
+  while (true) {
+    if (entry.type() == vm::StackEntry::Type::t_null) {
+      return true;
+    }
+    if (entry.type() != vm::StackEntry::Type::t_tuple) {
+      return false;
+    }
+    if (entry.as_tuple()->size() != 2) {
+      return false;
+    }
+    entry = entry.as_tuple()->at(1);
+  }
+};
+auto to_tonlib_api(const vm::StackEntry& entry) -> tonlib_api::object_ptr<tonlib_api::tvm_StackEntry> {
+  switch (entry.type()) {
+    case vm::StackEntry::Type::t_int:
+      return tonlib_api::make_object<tonlib_api::tvm_stackEntryNumber>(
+          tonlib_api::make_object<tonlib_api::tvm_numberDecimal>(dec_string(entry.as_int())));
+    case vm::StackEntry::Type::t_slice:
+      return tonlib_api::make_object<tonlib_api::tvm_stackEntryCell>(tonlib_api::make_object<tonlib_api::tvm_cell>(
+          to_bytes(vm::CellBuilder().append_cellslice(entry.as_slice()).finalize())));
+    case vm::StackEntry::Type::t_cell:
+      return tonlib_api::make_object<tonlib_api::tvm_stackEntryCell>(
+          tonlib_api::make_object<tonlib_api::tvm_cell>(to_bytes(entry.as_cell())));
+    case vm::StackEntry::Type::t_null:
+    case vm::StackEntry::Type::t_tuple: {
+      std::vector<tonlib_api::object_ptr<tonlib_api::tvm_StackEntry>> elements;
+      if (is_list(entry)) {
+        auto node = entry;
+        while (node.type() == vm::StackEntry::Type::t_tuple) {
+          elements.push_back(to_tonlib_api(node.as_tuple()->at(0)));
+          node = node.as_tuple()->at(1);
+        }
+        return tonlib_api::make_object<tonlib_api::tvm_stackEntryList>(
+            tonlib_api::make_object<tonlib_api::tvm_list>(std::move(elements)));
+
+      } else {
+        for (auto& element : *entry.as_tuple()) {
+          elements.push_back(to_tonlib_api(element));
+        }
+        return tonlib_api::make_object<tonlib_api::tvm_stackEntryTuple>(
+            tonlib_api::make_object<tonlib_api::tvm_tuple>(std::move(elements)));
+      }
+    }
+
+    default:
+      return tonlib_api::make_object<tonlib_api::tvm_stackEntryUnsupported>();
+  }
+};
+
+td::Result<vm::StackEntry> from_tonlib_api(tonlib_api::tvm_StackEntry& entry) {
+  // TODO: error codes
+  // downcast_call
+  return downcast_call2<td::Result<vm::StackEntry>>(
+      entry,
+      td::overloaded(
+          [&](tonlib_api::tvm_stackEntryUnsupported& cell) { return td::Status::Error("Unsuppored stack entry"); },
+          [&](tonlib_api::tvm_stackEntrySlice& cell) -> td::Result<vm::StackEntry> {
+            TRY_RESULT(res, vm::std_boc_deserialize(cell.slice_->bytes_));
+            return vm::StackEntry{std::move(res)};
+          },
+          [&](tonlib_api::tvm_stackEntryCell& cell) -> td::Result<vm::StackEntry> {
+            TRY_RESULT(res, vm::std_boc_deserialize(cell.cell_->bytes_));
+            return vm::StackEntry{std::move(res)};
+          },
+          [&](tonlib_api::tvm_stackEntryTuple& tuple) -> td::Result<vm::StackEntry> {
+            std::vector<vm::StackEntry> elements;
+            for (auto& element : tuple.tuple_->elements_) {
+              TRY_RESULT(new_element, from_tonlib_api(*element));
+              elements.push_back(std::move(new_element));
+            }
+            return td::Ref<vm::Tuple>(true, std::move(elements));
+          },
+          [&](tonlib_api::tvm_stackEntryList& tuple) -> td::Result<vm::StackEntry> {
+            vm::StackEntry tail;
+            for (auto& element : td::reversed(tuple.list_->elements_)) {
+              TRY_RESULT(new_element, from_tonlib_api(*element));
+              tail = vm::make_tuple_ref(std::move(new_element), std::move(tail));
+            }
+            return tail;
+          },
+          [&](tonlib_api::tvm_stackEntryNumber& number) -> td::Result<vm::StackEntry> {
+            auto& dec = *number.number_;
+            auto num = td::dec_string_to_int256(dec.number_);
+            if (num.is_null()) {
+              return td::Status::Error("Failed to parse dec string to int256");
+            }
+            return num;
+          }));
+}
+
 td::Status TonlibClient::do_request(const tonlib_api::smc_runGetMethod& request,
                                     td::Promise<object_ptr<tonlib_api::smc_runResult>>&& promise) {
   auto it = smcs_.find(request.id_);
@@ -2209,72 +2849,137 @@ td::Status TonlibClient::do_request(const tonlib_api::smc_runGetMethod& request,
                                [&](tonlib_api::smc_methodIdName& name) { args.set_method_id(name.name_); }));
   td::Ref<vm::Stack> stack(true);
   td::Status status;
-  // TODO: error codes
-  // downcast_call
   for (auto& entry : request.stack_) {
-    downcast_call(*entry, td::overloaded(
-                              [&](tonlib_api::tvm_stackEntryUnsupported& cell) {
-                                status = td::Status::Error("Unsuppored stack entry");
-                              },
-                              [&](tonlib_api::tvm_stackEntrySlice& cell) {
-                                auto r_cell = vm::std_boc_deserialize(cell.slice_->bytes_);
-                                if (r_cell.is_error()) {
-                                  status = r_cell.move_as_error();
-                                  return;
-                                }
-                                stack.write().push_cell(r_cell.move_as_ok());
-                              },
-                              [&](tonlib_api::tvm_stackEntryCell& cell) {
-                                auto r_cell = vm::std_boc_deserialize(cell.cell_->bytes_);
-                                if (r_cell.is_error()) {
-                                  status = r_cell.move_as_error();
-                                  return;
-                                }
-                                stack.write().push_cell(r_cell.move_as_ok());
-                              },
-                              [&](tonlib_api::tvm_stackEntryNumber& number) {
-                                [&](tonlib_api::tvm_numberDecimal& dec) {
-                                  auto num = td::dec_string_to_int256(dec.number_);
-                                  if (num.is_null()) {
-                                    status = td::Status::Error("Failed to parse dec string to int256");
-                                    return;
-                                  }
-                                  stack.write().push_int(std::move(num));
-                                }(*number.number_);
-                              }));
+    TRY_RESULT(e, from_tonlib_api(*entry));
+    stack.write().push(std::move(e));
   }
-  TRY_STATUS(std::move(status));
   args.set_stack(std::move(stack));
   auto res = smc->run_get_method(std::move(args));
 
   // smc.runResult gas_used:int53 stack:vector<tvm.StackEntry> exit_code:int32 = smc.RunResult;
   std::vector<object_ptr<tonlib_api::tvm_StackEntry>> res_stack;
   for (auto& entry : res.stack->as_span()) {
-    switch (entry.type()) {
-      case vm::StackEntry::Type::t_int:
-        res_stack.push_back(tonlib_api::make_object<tonlib_api::tvm_stackEntryNumber>(
-            tonlib_api::make_object<tonlib_api::tvm_numberDecimal>(dec_string(entry.as_int()))));
-        break;
-      case vm::StackEntry::Type::t_slice:
-        res_stack.push_back(
-            tonlib_api::make_object<tonlib_api::tvm_stackEntryCell>(tonlib_api::make_object<tonlib_api::tvm_cell>(
-                to_bytes(vm::CellBuilder().append_cellslice(entry.as_slice()).finalize()))));
-        break;
-      case vm::StackEntry::Type::t_cell:
-        res_stack.push_back(tonlib_api::make_object<tonlib_api::tvm_stackEntryCell>(
-            tonlib_api::make_object<tonlib_api::tvm_cell>(to_bytes(entry.as_cell()))));
-        break;
-      default:
-        res_stack.push_back(tonlib_api::make_object<tonlib_api::tvm_stackEntryUnsupported>());
-        break;
-    }
+    res_stack.push_back(to_tonlib_api(entry));
   }
   promise.set_value(tonlib_api::make_object<tonlib_api::smc_runResult>(res.gas_used, std::move(res_stack), res.code));
   return td::Status::OK();
 }
 
-td::Status TonlibClient::do_request(tonlib_api::sync& request, td::Promise<object_ptr<tonlib_api::ok>>&& promise) {
-  client_.with_last_block(to_any_promise(std::move(promise)));
+td::Result<tonlib_api::object_ptr<tonlib_api::dns_EntryData>> to_tonlib_api(
+    const ton::ManualDns::EntryData& entry_data) {
+  td::Result<tonlib_api::object_ptr<tonlib_api::dns_EntryData>> res;
+  if (entry_data.data.empty()) {
+    return TonlibError::Internal("Unexpected empty EntryData");
+  }
+  entry_data.data.visit(td::overloaded(
+      [&](const ton::ManualDns::EntryDataText& text) {
+        res = tonlib_api::make_object<tonlib_api::dns_entryDataText>(text.text);
+      },
+      [&](const ton::ManualDns::EntryDataNextResolver& resolver) {
+        res = tonlib_api::make_object<tonlib_api::dns_entryDataNextResolver>(
+            tonlib_api::make_object<tonlib_api::accountAddress>(resolver.resolver.rserialize(true)));
+      },
+      [&](const ton::ManualDns::EntryDataAdnlAddress& adnl_address) {
+        res = tonlib_api::make_object<tonlib_api::dns_entryDataAdnlAddress>(
+            tonlib_api::make_object<tonlib_api::adnlAddress>(
+                td::adnl_id_encode(adnl_address.adnl_address.as_slice()).move_as_ok()));
+      },
+      [&](const ton::ManualDns::EntryDataSmcAddress& smc_address) {
+        res = tonlib_api::make_object<tonlib_api::dns_entryDataSmcAddress>(
+            tonlib_api::make_object<tonlib_api::accountAddress>(smc_address.smc_address.rserialize(true)));
+      }));
+  return res;
+}
+
+void TonlibClient::finish_dns_resolve(std::string name, td::int32 category, td::int32 ttl,
+                                      td::optional<ton::BlockIdExt> block_id, DnsFinishData dns_finish_data,
+                                      td::Promise<object_ptr<tonlib_api::dns_resolved>>&& promise) {
+  block_id = dns_finish_data.block_id;
+  // TODO: check if the smartcontract supports Dns interface
+  // TODO: should we use some DnsInterface instead of ManualDns?
+  auto dns = ton::ManualDns::create(dns_finish_data.smc_state);
+  TRY_RESULT_PROMISE(promise, entries, dns->resolve(name, category));
+
+  if (entries.size() == 1 && entries[0].category == -1 && entries[0].name != name && ttl > 0 &&
+      entries[0].data.type == ton::ManualDns::EntryData::Type::NextResolver) {
+    td::Slice got_name = entries[0].name;
+    if (got_name.size() >= name.size()) {
+      TRY_STATUS_PROMISE(promise, TonlibError::Internal("domain is too long"));
+    }
+    auto dot_position = name.size() - got_name.size() - 1;
+    auto suffix = name.substr(dot_position + 1);
+    auto prefix = name.substr(0, dot_position);
+    if (name[dot_position] != '.') {
+      TRY_STATUS_PROMISE(promise, td::Status::Error("next resolver error: domain split not at a component boundary "));
+    }
+    if (suffix != got_name) {
+      TRY_STATUS_PROMISE(promise, TonlibError::Internal("domain is not a suffix of the query"));
+    }
+
+    auto address = entries[0].data.data.get<ton::ManualDns::EntryDataNextResolver>().resolver;
+    return do_dns_request(prefix, category, ttl - 1, std::move(block_id), address, std::move(promise));
+  }
+
+  std::vector<tonlib_api::object_ptr<tonlib_api::dns_entry>> api_entries;
+  for (auto& entry : entries) {
+    TRY_RESULT_PROMISE(promise, entry_data, to_tonlib_api(entry.data));
+    api_entries.push_back(
+        tonlib_api::make_object<tonlib_api::dns_entry>(entry.name, entry.category, std::move(entry_data)));
+  }
+  promise.set_value(tonlib_api::make_object<tonlib_api::dns_resolved>(std::move(api_entries)));
+}
+
+void TonlibClient::do_dns_request(std::string name, td::int32 category, td::int32 ttl,
+                                  td::optional<ton::BlockIdExt> block_id, block::StdAddress address,
+                                  td::Promise<object_ptr<tonlib_api::dns_resolved>>&& promise) {
+  auto block_id_copy = block_id.copy();
+  td::Promise<DnsFinishData> new_promise =
+      promise.send_closure(actor_id(this), &TonlibClient::finish_dns_resolve, name, category, ttl, std::move(block_id));
+
+  if (0) {
+    make_request(int_api::GetAccountState{address, std::move(block_id_copy)},
+                 new_promise.wrap([](auto&& account_state) {
+                   return DnsFinishData{account_state->get_block_id(), account_state->get_smc_state()};
+                 }));
+
+    return;
+  }
+
+  TRY_RESULT_PROMISE(promise, args, ton::DnsInterface::resolve_args(name, category));
+  int_api::RemoteRunSmcMethod query;
+  query.address = std::move(address);
+  query.args = std::move(args);
+  query.block_id = std::move(block_id_copy);
+  query.need_result = false;
+
+  make_request(std::move(query), new_promise.wrap([](auto&& run_method) {
+    return DnsFinishData{run_method.block_id, run_method.smc_state};
+  }));
+  ;
+}
+
+td::Status TonlibClient::do_request(const tonlib_api::dns_resolve& request,
+                                    td::Promise<object_ptr<tonlib_api::dns_resolved>>&& promise) {
+  auto block_id = query_context_.block_id.copy();
+  if (!request.account_address_) {
+    make_request(int_api::GetDnsResolver{},
+                 promise.send_closure(actor_id(this), &TonlibClient::do_dns_request, request.name_, request.category_,
+                                      request.ttl_, std::move(block_id)));
+    return td::Status::OK();
+  }
+  TRY_RESULT(account_address, get_account_address(request.account_address_->account_address_));
+  do_dns_request(request.name_, request.category_, request.ttl_, std::move(block_id), account_address,
+                 std::move(promise));
+  return td::Status::OK();
+}
+
+td::Status TonlibClient::do_request(tonlib_api::sync& request,
+                                    td::Promise<object_ptr<tonlib_api::ton_blockIdExt>>&& promise) {
+  // ton.blockIdExt workchain:int32 shard:int64 seqno:int32 root_hash:bytes file_hash:bytes = ton.BlockIdExt;
+  client_.with_last_block(
+      std::move(promise).wrap([](auto last_block) -> td::Result<tonlib_api::object_ptr<tonlib_api::ton_blockIdExt>> {
+        return to_tonlib_api(last_block.last_block_id);
+      }));
   return td::Status::OK();
 }
 
@@ -2385,6 +3090,28 @@ td::Status TonlibClient::do_request(const tonlib_api::importEncryptedKey& reques
   promise.set_value(tonlib_api::make_object<tonlib_api::key>(key_bytes.serialize(true), std::move(key.secret)));
   return td::Status::OK();
 }
+td::Status TonlibClient::do_request(const tonlib_api::exportUnencryptedKey& request,
+                                    td::Promise<object_ptr<tonlib_api::exportedUnencryptedKey>>&& promise) {
+  if (!request.input_key_) {
+    return TonlibError::EmptyField("input_key");
+  }
+  TRY_RESULT(input_key, from_tonlib(*request.input_key_));
+  TRY_RESULT(exported_key, key_storage_.export_unencrypted_key(std::move(input_key)));
+  promise.set_value(tonlib_api::make_object<tonlib_api::exportedUnencryptedKey>(std::move(exported_key.data)));
+  return td::Status::OK();
+}
+td::Status TonlibClient::do_request(const tonlib_api::importUnencryptedKey& request,
+                                    td::Promise<object_ptr<tonlib_api::key>>&& promise) {
+  if (!request.exported_unencrypted_key_) {
+    return TonlibError::EmptyField("exported_encrypted_key");
+  }
+  TRY_RESULT(key, key_storage_.import_unencrypted_key(
+                      std::move(request.local_password_),
+                      KeyStorage::ExportedUnencryptedKey{std::move(request.exported_unencrypted_key_->data_)}));
+  TRY_RESULT(key_bytes, public_key_from_bytes(key.public_key.as_slice()));
+  promise.set_value(tonlib_api::make_object<tonlib_api::key>(key_bytes.serialize(true), std::move(key.secret)));
+  return td::Status::OK();
+}
 
 td::Status TonlibClient::do_request(const tonlib_api::changeLocalPassword& request,
                                     td::Promise<object_ptr<tonlib_api::key>>&& promise) {
@@ -2507,19 +3234,37 @@ td::Status TonlibClient::do_request(int_api::GetAccountState request,
                                     td::Promise<td::unique_ptr<AccountState>>&& promise) {
   auto actor_id = actor_id_++;
   actors_[actor_id] = td::actor::create_actor<GetRawAccountState>(
-      "GetAccountState", client_.get_client(), request.address, actor_shared(this, actor_id),
+      "GetAccountState", client_.get_client(), request.address, std::move(request.block_id),
+      actor_shared(this, actor_id),
       promise.wrap([address = request.address, wallet_id = wallet_id_](auto&& state) mutable {
         return td::make_unique<AccountState>(std::move(address), std::move(state), wallet_id);
       }));
   return td::Status::OK();
 }
 
+td::Status TonlibClient::do_request(int_api::RemoteRunSmcMethod request,
+                                    td::Promise<int_api::RemoteRunSmcMethod::ReturnType>&& promise) {
+  auto actor_id = actor_id_++;
+  actors_[actor_id] = td::actor::create_actor<RemoteRunSmcMethod>(
+      "RemoteRunSmcMethod", client_.get_client(), std::move(request), actor_shared(this, actor_id), std::move(promise));
+  return td::Status::OK();
+}
+
 td::Status TonlibClient::do_request(int_api::GetPrivateKey request, td::Promise<KeyStorage::PrivateKey>&& promise) {
   TRY_RESULT(pk, key_storage_.load_private_key(std::move(request.input_key)));
   promise.set_value(std::move(pk));
   return td::Status::OK();
 }
 
+td::Status TonlibClient::do_request(int_api::GetDnsResolver request, td::Promise<block::StdAddress>&& promise) {
+  client_.with_last_config(promise.wrap([](auto&& state) mutable -> td::Result<block::StdAddress> {
+    TRY_RESULT_PREFIX(addr, TRY_VM(state.config->get_dns_root_addr()),
+                      TonlibError::Internal("get dns root addr from config: "));
+    return block::StdAddress(ton::masterchainId, addr);
+  }));
+  return td::Status::OK();
+}
+
 td::Status TonlibClient::do_request(int_api::SendMessage request, td::Promise<td::Unit>&& promise) {
   client_.send_query(ton::lite_api::liteServer_sendMessage(vm::std_boc_serialize(request.message).move_as_ok()),
                      to_any_promise(std::move(promise)));
@@ -2535,33 +3280,31 @@ td::Status TonlibClient::do_request(const tonlib_api::liteServer_getInfo& reques
   return td::Status::OK();
 }
 
+td::Status TonlibClient::do_request(tonlib_api::withBlock& request,
+                                    td::Promise<object_ptr<tonlib_api::Object>>&& promise) {
+  if (!request.id_) {
+    return TonlibError::EmptyField("id");
+  }
+  auto to_bits256 = [](td::Slice data, td::Slice name) -> td::Result<td::Bits256> {
+    if (data.size() != 32) {
+      return TonlibError::InvalidField(name, "wrong length (not 32 bytes)");
+    }
+    return td::Bits256(data.ubegin());
+  };
+  TRY_RESULT(root_hash, to_bits256(request.id_->root_hash_, "root_hash"));
+  TRY_RESULT(file_hash, to_bits256(request.id_->file_hash_, "file_hash"));
+  ton::BlockIdExt block_id(request.id_->workchain_, request.id_->shard_, request.id_->seqno_, root_hash, file_hash);
+  make_any_request(*request.function_, {std::move(block_id)}, std::move(promise));
+  return td::Status::OK();
+}
+
 template <class P>
 td::Status TonlibClient::do_request(const tonlib_api::runTests& request, P&&) {
   UNREACHABLE();
   return TonlibError::Internal();
 }
 template <class P>
-td::Status TonlibClient::do_request(const tonlib_api::raw_getAccountAddress& request, P&&) {
-  UNREACHABLE();
-  return TonlibError::Internal();
-}
-template <class P>
-td::Status TonlibClient::do_request(const tonlib_api::testWallet_getAccountAddress& request, P&&) {
-  UNREACHABLE();
-  return TonlibError::Internal();
-}
-template <class P>
-td::Status TonlibClient::do_request(const tonlib_api::wallet_getAccountAddress& request, P&&) {
-  UNREACHABLE();
-  return TonlibError::Internal();
-}
-template <class P>
-td::Status TonlibClient::do_request(const tonlib_api::wallet_v3_getAccountAddress& request, P&&) {
-  UNREACHABLE();
-  return TonlibError::Internal();
-}
-template <class P>
-td::Status TonlibClient::do_request(const tonlib_api::testGiver_getAccountAddress& request, P&&) {
+td::Status TonlibClient::do_request(const tonlib_api::getAccountAddress& request, P&&) {
   UNREACHABLE();
   return TonlibError::Internal();
 }
@@ -2576,11 +3319,6 @@ td::Status TonlibClient::do_request(const tonlib_api::unpackAccountAddress& requ
   return TonlibError::Internal();
 }
 template <class P>
-td::Status TonlibClient::do_request(const tonlib_api::options_validateConfig& request, P&&) {
-  UNREACHABLE();
-  return TonlibError::Internal();
-}
-template <class P>
 td::Status TonlibClient::do_request(tonlib_api::getBip39Hints& request, P&&) {
   UNREACHABLE();
   return TonlibError::Internal();
diff --git a/submodules/ton/tonlib-src/tonlib/tonlib/TonlibClient.h b/submodules/ton/tonlib-src/tonlib/tonlib/TonlibClient.h
index 68936a4373..786e4e7760 100644
--- a/submodules/ton/tonlib-src/tonlib/tonlib/TonlibClient.h
+++ b/submodules/ton/tonlib-src/tonlib/tonlib/TonlibClient.h
@@ -14,7 +14,7 @@
     You should have received a copy of the GNU Lesser General Public License
     along with TON Blockchain Library.  If not, see <http://www.gnu.org/licenses/>.
 
-    Copyright 2017-2019 Telegram Systems LLP
+    Copyright 2017-2020 Telegram Systems LLP
 */
 #pragma once
 
@@ -32,13 +32,19 @@
 #include "td/utils/CancellationToken.h"
 #include "td/utils/optional.h"
 
+#include "smc-envelope/ManualDns.h"
+
 #include <map>
 
 namespace tonlib {
 namespace int_api {
 struct GetAccountState;
 struct GetPrivateKey;
+struct GetDnsResolver;
 struct SendMessage;
+struct RemoteRunSmcMethod;
+struct RemoteRunSmcMethodReturnType;
+
 inline std::string to_string(const int_api::SendMessage&) {
   return "Send message";
 }
@@ -46,6 +52,10 @@ inline std::string to_string(const int_api::SendMessage&) {
 class AccountState;
 class Query;
 
+td::Result<tonlib_api::object_ptr<tonlib_api::dns_EntryData>> to_tonlib_api(
+    const ton::ManualDns::EntryData& entry_data);
+td::Result<ton::ManualDns::EntryData> to_dns_entry_data(tonlib_api::dns_EntryData& entry_data);
+
 class TonlibClient : public td::actor::Actor {
  public:
   template <class T>
@@ -58,6 +68,14 @@ class TonlibClient : public td::actor::Actor {
 
   ~TonlibClient();
 
+  struct FullConfig {
+    Config config;
+    bool use_callbacks_for_network;
+    LastBlockState last_state;
+    std::string last_state_key;
+    td::uint32 wallet_id;
+  };
+
  private:
   enum class State { Uninited, Running, Closed } state_ = State::Uninited;
   td::unique_ptr<TonlibCallback> callback_;
@@ -66,14 +84,17 @@ class TonlibClient : public td::actor::Actor {
   Config config_;
   td::uint32 config_generation_{0};
   td::uint32 wallet_id_;
-  std::string blockchain_name_;
-  bool ignore_cache_{false};
+  std::string last_state_key_;
   bool use_callbacks_for_network_{false};
 
   // KeyStorage
   std::shared_ptr<KeyValue> kv_;
   KeyStorage key_storage_;
   LastBlockStorage last_block_storage_;
+  struct QueryContext {
+    td::optional<ton::BlockIdExt> block_id;
+  };
+  QueryContext query_context_;
 
   // network
   td::actor::ActorOwn<ton::adnl::AdnlExtClient> raw_client_;
@@ -89,7 +110,7 @@ class TonlibClient : public td::actor::Actor {
 
   ExtClientRef get_client_ref();
   void init_ext_client();
-  void init_last_block(td::optional<Config> o_master_config);
+  void init_last_block(LastBlockState state);
   void init_last_config();
 
   bool is_closing_{false};
@@ -121,14 +142,9 @@ class TonlibClient : public td::actor::Actor {
     return tonlib_api::make_object<tonlib_api::error>(400, "Function can't be executed synchronously");
   }
   static object_ptr<tonlib_api::Object> do_static_request(const tonlib_api::runTests& request);
-  static object_ptr<tonlib_api::Object> do_static_request(const tonlib_api::raw_getAccountAddress& request);
-  static object_ptr<tonlib_api::Object> do_static_request(const tonlib_api::testWallet_getAccountAddress& request);
-  static object_ptr<tonlib_api::Object> do_static_request(const tonlib_api::wallet_getAccountAddress& request);
-  static object_ptr<tonlib_api::Object> do_static_request(const tonlib_api::wallet_v3_getAccountAddress& request);
-  static object_ptr<tonlib_api::Object> do_static_request(const tonlib_api::testGiver_getAccountAddress& request);
+  static object_ptr<tonlib_api::Object> do_static_request(const tonlib_api::getAccountAddress& request);
   static object_ptr<tonlib_api::Object> do_static_request(const tonlib_api::packAccountAddress& request);
   static object_ptr<tonlib_api::Object> do_static_request(const tonlib_api::unpackAccountAddress& request);
-  static object_ptr<tonlib_api::Object> do_static_request(tonlib_api::options_validateConfig& request);
   static object_ptr<tonlib_api::Object> do_static_request(tonlib_api::getBip39Hints& request);
 
   static object_ptr<tonlib_api::Object> do_static_request(tonlib_api::setLogStream& request);
@@ -147,22 +163,12 @@ class TonlibClient : public td::actor::Actor {
   template <class P>
   td::Status do_request(const tonlib_api::runTests& request, P&&);
   template <class P>
-  td::Status do_request(const tonlib_api::raw_getAccountAddress& request, P&&);
-  template <class P>
-  td::Status do_request(const tonlib_api::testWallet_getAccountAddress& request, P&&);
-  template <class P>
-  td::Status do_request(const tonlib_api::wallet_getAccountAddress& request, P&&);
-  template <class P>
-  td::Status do_request(const tonlib_api::wallet_v3_getAccountAddress& request, P&&);
-  template <class P>
-  td::Status do_request(const tonlib_api::testGiver_getAccountAddress& request, P&&);
+  td::Status do_request(const tonlib_api::getAccountAddress& request, P&&);
   template <class P>
   td::Status do_request(const tonlib_api::packAccountAddress& request, P&&);
   template <class P>
   td::Status do_request(const tonlib_api::unpackAccountAddress& request, P&&);
   template <class P>
-  td::Status do_request(const tonlib_api::options_validateConfig& request, P&&);
-  template <class P>
   td::Status do_request(tonlib_api::getBip39Hints& request, P&&);
 
   template <class P>
@@ -189,26 +195,26 @@ class TonlibClient : public td::actor::Actor {
   template <class P>
   td::Status do_request(const tonlib_api::kdf& request, P&&);
 
+  void make_any_request(tonlib_api::Function& function, QueryContext query_context,
+                        td::Promise<tonlib_api::object_ptr<tonlib_api::Object>>&& promise);
   template <class T, class P>
   void make_request(T&& request, P&& promise) {
-    auto status = do_request(std::forward<T>(request), std::move(promise));
+    td::Promise<typename std::decay_t<T>::ReturnType> new_promise = std::move(promise);
+
+    auto status = do_request(std::forward<T>(request), std::move(new_promise));
     if (status.is_error()) {
-      promise.operator()(std::move(status));
+      new_promise.operator()(std::move(status));
     }
   }
 
-  struct FullConfig {
-    Config config;
-    td::optional<Config> o_master_config;
-    bool use_callbacks_for_network;
-    bool ignore_cache;
-    td::uint32 wallet_id;
-  };
-  static td::Result<FullConfig> validate_config(tonlib_api::object_ptr<tonlib_api::config> config);
+  td::Result<FullConfig> validate_config(tonlib_api::object_ptr<tonlib_api::config> config);
   void set_config(FullConfig config);
-  td::Status do_request(const tonlib_api::init& request, td::Promise<object_ptr<tonlib_api::ok>>&& promise);
+  td::Status do_request(const tonlib_api::init& request, td::Promise<object_ptr<tonlib_api::options_info>>&& promise);
   td::Status do_request(const tonlib_api::close& request, td::Promise<object_ptr<tonlib_api::ok>>&& promise);
-  td::Status do_request(tonlib_api::options_setConfig& request, td::Promise<object_ptr<tonlib_api::ok>>&& promise);
+  td::Status do_request(tonlib_api::options_validateConfig& request,
+                        td::Promise<object_ptr<tonlib_api::options_configInfo>>&& promise);
+  td::Status do_request(tonlib_api::options_setConfig& request,
+                        td::Promise<object_ptr<tonlib_api::options_configInfo>>&& promise);
 
   td::Status do_request(const tonlib_api::raw_sendMessage& request, td::Promise<object_ptr<tonlib_api::ok>>&& promise);
   td::Status do_request(const tonlib_api::raw_createAndSendMessage& request,
@@ -217,33 +223,16 @@ class TonlibClient : public td::actor::Actor {
                         td::Promise<object_ptr<tonlib_api::query_info>>&& promise);
 
   td::Status do_request(tonlib_api::raw_getAccountState& request,
-                        td::Promise<object_ptr<tonlib_api::raw_accountState>>&& promise);
+                        td::Promise<object_ptr<tonlib_api::raw_fullAccountState>>&& promise);
   td::Status do_request(tonlib_api::raw_getTransactions& request,
                         td::Promise<object_ptr<tonlib_api::raw_transactions>>&& promise);
 
-  td::Status do_request(const tonlib_api::testWallet_init& request, td::Promise<object_ptr<tonlib_api::ok>>&& promise);
-  td::Status do_request(const tonlib_api::testWallet_sendGrams& request,
-                        td::Promise<object_ptr<tonlib_api::sendGramsResult>>&& promise);
-  td::Status do_request(tonlib_api::testWallet_getAccountState& request,
-                        td::Promise<object_ptr<tonlib_api::testWallet_accountState>>&& promise);
+  td::Status do_request(const tonlib_api::getAccountState& request,
+                        td::Promise<object_ptr<tonlib_api::fullAccountState>>&& promise);
+  td::Status do_request(const tonlib_api::guessAccountRevision& request,
+                        td::Promise<object_ptr<tonlib_api::accountRevisionList>>&& promise);
 
-  td::Status do_request(const tonlib_api::wallet_init& request, td::Promise<object_ptr<tonlib_api::ok>>&& promise);
-  td::Status do_request(const tonlib_api::wallet_sendGrams& request,
-                        td::Promise<object_ptr<tonlib_api::sendGramsResult>>&& promise);
-  td::Status do_request(tonlib_api::wallet_getAccountState& request,
-                        td::Promise<object_ptr<tonlib_api::wallet_accountState>>&& promise);
-
-  td::Status do_request(const tonlib_api::testGiver_getAccountState& request,
-                        td::Promise<object_ptr<tonlib_api::testGiver_accountState>>&& promise);
-  td::Status do_request(const tonlib_api::testGiver_sendGrams& request,
-                        td::Promise<object_ptr<tonlib_api::sendGramsResult>>&& promise);
-
-  td::Status do_request(const tonlib_api::generic_getAccountState& request,
-                        td::Promise<object_ptr<tonlib_api::generic_AccountState>>&& promise);
-  td::Status do_request(tonlib_api::generic_sendGrams& request,
-                        td::Promise<object_ptr<tonlib_api::sendGramsResult>>&& promise);
-
-  td::Status do_request(tonlib_api::sync& request, td::Promise<object_ptr<tonlib_api::ok>>&& promise);
+  td::Status do_request(tonlib_api::sync& request, td::Promise<object_ptr<tonlib_api::ton_blockIdExt>>&& promise);
 
   td::Status do_request(const tonlib_api::createNewKey& request, td::Promise<object_ptr<tonlib_api::key>>&& promise);
   td::Status do_request(const tonlib_api::exportKey& request,
@@ -261,6 +250,11 @@ class TonlibClient : public td::actor::Actor {
   td::Status do_request(const tonlib_api::importEncryptedKey& request,
                         td::Promise<object_ptr<tonlib_api::key>>&& promise);
 
+  td::Status do_request(const tonlib_api::exportUnencryptedKey& request,
+                        td::Promise<object_ptr<tonlib_api::exportedUnencryptedKey>>&& promise);
+  td::Status do_request(const tonlib_api::importUnencryptedKey& request,
+                        td::Promise<object_ptr<tonlib_api::key>>&& promise);
+
   td::Status do_request(const tonlib_api::changeLocalPassword& request,
                         td::Promise<object_ptr<tonlib_api::key>>&& promise);
 
@@ -275,8 +269,6 @@ class TonlibClient : public td::actor::Actor {
   td::Result<tonlib_api::object_ptr<tonlib_api::query_info>> get_query_info(td::int64 id);
   void finish_create_query(td::Result<td::unique_ptr<Query>> r_query,
                            td::Promise<object_ptr<tonlib_api::query_info>>&& promise);
-  void finish_send_query(td::Result<td::unique_ptr<Query>> r_query,
-                         td::Promise<object_ptr<tonlib_api::sendGramsResult>>&& promise);
   void query_estimate_fees(td::int64 id, bool ignore_chksig, td::Result<LastConfigState> r_state,
                            td::Promise<object_ptr<tonlib_api::query_fees>>&& promise);
 
@@ -287,8 +279,9 @@ class TonlibClient : public td::actor::Actor {
   td::Status do_request(const tonlib_api::query_send& request, td::Promise<object_ptr<tonlib_api::ok>>&& promise);
   td::Status do_request(tonlib_api::query_forget& request, td::Promise<object_ptr<tonlib_api::ok>>&& promise);
 
-  td::Status do_request(tonlib_api::generic_createSendGramsQuery& request,
-                        td::Promise<object_ptr<tonlib_api::query_info>>&& promise);
+  td::Status do_request(tonlib_api::createQuery& request, td::Promise<object_ptr<tonlib_api::query_info>>&& promise);
+
+  td::Status do_request(tonlib_api::msg_decrypt& request, td::Promise<object_ptr<tonlib_api::msg_dataArray>>&& promise);
 
   td::int64 next_smc_id_{0};
   std::map<td::int64, td::unique_ptr<AccountState>> smcs_;
@@ -307,13 +300,29 @@ class TonlibClient : public td::actor::Actor {
   td::Status do_request(const tonlib_api::smc_runGetMethod& request,
                         td::Promise<object_ptr<tonlib_api::smc_runResult>>&& promise);
 
+  td::Status do_request(const tonlib_api::dns_resolve& request,
+                        td::Promise<object_ptr<tonlib_api::dns_resolved>>&& promise);
+  void do_dns_request(std::string name, td::int32 category, td::int32 ttl, td::optional<ton::BlockIdExt> block_id,
+                      block::StdAddress address, td::Promise<object_ptr<tonlib_api::dns_resolved>>&& promise);
+  struct DnsFinishData {
+    ton::BlockIdExt block_id;
+    ton::SmartContract::State smc_state;
+  };
+  void finish_dns_resolve(std::string name, td::int32 category, td::int32 ttl, td::optional<ton::BlockIdExt> block_id,
+                          DnsFinishData dns_finish_data, td::Promise<object_ptr<tonlib_api::dns_resolved>>&& promise);
+
   td::Status do_request(int_api::GetAccountState request, td::Promise<td::unique_ptr<AccountState>>&&);
   td::Status do_request(int_api::GetPrivateKey request, td::Promise<KeyStorage::PrivateKey>&&);
+  td::Status do_request(int_api::GetDnsResolver request, td::Promise<block::StdAddress>&&);
+  td::Status do_request(int_api::RemoteRunSmcMethod request,
+                        td::Promise<int_api::RemoteRunSmcMethodReturnType>&& promise);
   td::Status do_request(int_api::SendMessage request, td::Promise<td::Unit>&& promise);
 
   td::Status do_request(const tonlib_api::liteServer_getInfo& request,
                         td::Promise<object_ptr<tonlib_api::liteServer_info>>&& promise);
 
+  td::Status do_request(tonlib_api::withBlock& request, td::Promise<object_ptr<tonlib_api::Object>>&& promise);
+
   void proxy_request(td::int64 query_id, std::string data);
 
   friend class TonlibQueryActor;
diff --git a/submodules/ton/tonlib-src/tonlib/tonlib/TonlibError.h b/submodules/ton/tonlib-src/tonlib/tonlib/TonlibError.h
index dca5eecfcb..a1d98fb3bb 100644
--- a/submodules/ton/tonlib-src/tonlib/tonlib/TonlibError.h
+++ b/submodules/ton/tonlib-src/tonlib/tonlib/TonlibError.h
@@ -14,7 +14,7 @@
     You should have received a copy of the GNU Lesser General Public License
     along with TON Blockchain Library.  If not, see <http://www.gnu.org/licenses/>.
 
-    Copyright 2017-2019 Telegram Systems LLP
+    Copyright 2017-2020 Telegram Systems LLP
 */
 
 #pragma once
@@ -32,6 +32,7 @@
 // INVALID_ACCOUNT_ADDRESS
 // INVALID_CONFIG
 // INVALID_PEM_KEY
+// INVALID_REVISION
 // MESSAGE_TOO_LONG
 // EMPTY_FIELD
 // INVALID_FIELD
@@ -39,6 +40,7 @@
 // ACCOUNT_NOT_INITED
 // ACCOUNT_TYPE_UNKNOWN
 // ACCOUNT_TYPE_UNEXPECTED
+// ACCOUNT_ACTION_UNSUPPORTED
 // VALIDATE_ACCOUNT_STATE
 // VALIDATE_TRANSACTION
 // VALIDATE_ZERO_STATE
@@ -79,6 +81,9 @@ struct TonlibError {
   static td::Status InvalidPemKey() {
     return td::Status::Error(400, "INVALID_PEM_KEY");
   }
+  static td::Status InvalidRevision() {
+    return td::Status::Error(400, "INVALID_REVISION");
+  }
   static td::Status NeedConfig() {
     return td::Status::Error(400, "NeedConfig");
   }
@@ -86,7 +91,7 @@ struct TonlibError {
     return td::Status::Error(400, "MESSAGE_TOO_LONG");
   }
   static td::Status EmptyField(td::Slice field_name) {
-    return td::Status::Error(400, PSLICE() << "EMPTY_FIELD: Field " << field_name << " must not be emtpy");
+    return td::Status::Error(400, PSLICE() << "EMPTY_FIELD: Field " << field_name << " must not be empty");
   }
   static td::Status InvalidField(td::Slice field_name, td::Slice reason) {
     return td::Status::Error(400, PSLICE() << "INVALID_FIELD: Field " << field_name << " has invalid value " << reason);
@@ -94,6 +99,9 @@ struct TonlibError {
   static td::Status DangerousTransaction(td::Slice reason) {
     return td::Status::Error(400, PSLICE() << "DANGEROUS_TRANSACTION: " << reason);
   }
+  static td::Status MessageEncryption(td::Slice reason) {
+    return td::Status::Error(400, PSLICE() << "MESSAGE_ENCRYPTION: " << reason);
+  }
   static td::Status AccountNotInited() {
     return td::Status::Error(400, "ACCOUNT_NOT_INITED");
   }
@@ -103,6 +111,9 @@ struct TonlibError {
   static td::Status AccountTypeUnexpected(td::Slice expected) {
     return td::Status::Error(400, PSLICE() << "ACCOUNT_TYPE_UNEXPECTED: not a " << expected);
   }
+  static td::Status AccountActionUnsupported(td::Slice action) {
+    return td::Status::Error(400, PSLICE() << "ACCOUNT_ACTION_UNSUPPORTED: " << action);
+  }
   static td::Status Internal() {
     return td::Status::Error(500, "INTERNAL");
   }
diff --git a/submodules/ton/tonlib-src/tonlib/tonlib/keys/SimpleEncryption.cpp b/submodules/ton/tonlib-src/tonlib/tonlib/keys/SimpleEncryption.cpp
index 586070b090..456abf9968 100644
--- a/submodules/ton/tonlib-src/tonlib/tonlib/keys/SimpleEncryption.cpp
+++ b/submodules/ton/tonlib-src/tonlib/tonlib/keys/SimpleEncryption.cpp
@@ -14,7 +14,7 @@
     You should have received a copy of the GNU Lesser General Public License
     along with TON Blockchain Library.  If not, see <http://www.gnu.org/licenses/>.
 
-    Copyright 2017-2019 Telegram Systems LLP
+    Copyright 2017-2020 Telegram Systems LLP
 */
 #include "SimpleEncryption.h"
 
@@ -36,8 +36,9 @@ td::AesCbcState SimpleEncryption::calc_aes_cbc_state_sha512(td::Slice seed) {
   sha512(seed, hash.as_mutable_slice());
   return calc_aes_cbc_state_hash(hash.as_slice());
 }
-td::SecureString SimpleEncryption::gen_random_prefix(td::int64 data_size) {
-  td::SecureString buff(td::narrow_cast<size_t>(((32 + 15 + data_size) & -16) - data_size), 0);
+
+td::SecureString SimpleEncryption::gen_random_prefix(td::int64 data_size, td::int64 min_padding) {
+  td::SecureString buff(td::narrow_cast<size_t>(((min_padding + 15 + data_size) & -16) - data_size), 0);
   td::Random::secure_bytes(buff.as_mutable_slice());
   buff.as_mutable_slice()[0] = td::narrow_cast<td::uint8>(buff.size());
   CHECK((buff.size() + data_size) % 16 == 0);
@@ -71,7 +72,7 @@ td::SecureString SimpleEncryption::encrypt_data_with_prefix(td::Slice data, td::
 }
 
 td::SecureString SimpleEncryption::encrypt_data(td::Slice data, td::Slice secret) {
-  auto prefix = gen_random_prefix(data.size());
+  auto prefix = gen_random_prefix(data.size(), 32);
   td::SecureString combined(prefix.size() + data.size());
   combined.as_mutable_slice().copy_from(prefix);
   combined.as_mutable_slice().substr(prefix.size()).copy_from(data);
@@ -104,4 +105,96 @@ td::Result<td::SecureString> SimpleEncryption::decrypt_data(td::Slice encrypted_
 
   return td::SecureString(decrypted_data.as_slice().substr(prefix_size));
 }
+
+td::Result<td::SecureString> SimpleEncryptionV2::encrypt_data(td::Slice data,
+                                                              const td::Ed25519::PublicKey &public_key) {
+  TRY_RESULT(tmp_private_key, td::Ed25519::generate_private_key());
+  return encrypt_data(data, public_key, tmp_private_key);
+}
+
+namespace {
+td::SecureString secure_xor(td::Slice a, td::Slice b) {
+  CHECK(a.size() == b.size());
+  td::SecureString res(a.size());
+  for (size_t i = 0; i < res.size(); i++) {
+    res.as_mutable_slice()[i] = a[i] ^ b[i];
+  }
+  return res;
+}
+}  // namespace
+
+td::Result<td::SecureString> SimpleEncryptionV2::encrypt_data(td::Slice data, const td::Ed25519::PublicKey &public_key,
+                                                              const td::Ed25519::PrivateKey &private_key) {
+  TRY_RESULT(shared_secret, td::Ed25519::compute_shared_secret(public_key, private_key));
+  auto encrypted = encrypt_data(data, shared_secret.as_slice());
+  TRY_RESULT(tmp_public_key, private_key.get_public_key());
+  td::SecureString prefixed_encrypted(tmp_public_key.LENGTH + encrypted.size());
+  prefixed_encrypted.as_mutable_slice().copy_from(tmp_public_key.as_octet_string());
+  auto xored_keys = secure_xor(public_key.as_octet_string().as_slice(), tmp_public_key.as_octet_string().as_slice());
+  prefixed_encrypted.as_mutable_slice().copy_from(xored_keys.as_slice());
+  prefixed_encrypted.as_mutable_slice().substr(xored_keys.size()).copy_from(encrypted);
+  return std::move(prefixed_encrypted);
+}
+
+td::Result<td::SecureString> SimpleEncryptionV2::decrypt_data(td::Slice data,
+                                                              const td::Ed25519::PrivateKey &private_key) {
+  if (data.size() < td::Ed25519::PublicKey::LENGTH) {
+    return td::Status::Error("Failed to decrypte: data is too small");
+  }
+  TRY_RESULT(public_key, private_key.get_public_key());
+  auto tmp_public_key =
+      td::Ed25519::PublicKey(secure_xor(data.substr(0, td::Ed25519::PublicKey::LENGTH), public_key.as_octet_string()));
+  TRY_RESULT(shared_secret, td::Ed25519::compute_shared_secret(tmp_public_key, private_key));
+  TRY_RESULT(decrypted, decrypt_data(data.substr(td::Ed25519::PublicKey::LENGTH), shared_secret.as_slice()));
+  return std::move(decrypted);
+}
+td::SecureString SimpleEncryptionV2::encrypt_data(td::Slice data, td::Slice secret) {
+  auto prefix = SimpleEncryption::gen_random_prefix(data.size(), 16);
+  td::SecureString combined(prefix.size() + data.size());
+  combined.as_mutable_slice().copy_from(prefix);
+  combined.as_mutable_slice().substr(prefix.size()).copy_from(data);
+  return encrypt_data_with_prefix(combined.as_slice(), secret);
+}
+td::Result<td::SecureString> SimpleEncryptionV2::decrypt_data(td::Slice encrypted_data, td::Slice secret) {
+  if (encrypted_data.size() < 17) {
+    return td::Status::Error("Failed to decrypt: data is too small");
+  }
+  if (encrypted_data.size() % 16 != 0) {
+    return td::Status::Error("Failed to decrypt: data size is not divisible by 16");
+  }
+  auto msg_key = encrypted_data.substr(0, 16);
+  encrypted_data = encrypted_data.substr(16);
+
+  auto cbc_state = SimpleEncryption::calc_aes_cbc_state_hash(SimpleEncryption::combine_secrets(secret, msg_key));
+  td::SecureString decrypted_data(encrypted_data.size(), 0);
+  cbc_state.decrypt(encrypted_data, decrypted_data.as_mutable_slice());
+
+  auto data_hash = SimpleEncryption::combine_secrets(decrypted_data, secret);
+  auto got_msg_key = data_hash.as_slice().substr(0, 16);
+  // check hash
+  if (msg_key != got_msg_key) {
+    return td::Status::Error("Failed to decrypt: hash mismatch");
+  }
+
+  td::uint8 prefix_size = static_cast<td::uint8>(decrypted_data[0]);
+  if (prefix_size > decrypted_data.size() || prefix_size < 16) {
+    return td::Status::Error("Failed to decrypt: invalid prefix size");
+  }
+
+  return td::SecureString(decrypted_data.as_slice().substr(prefix_size));
+}
+td::SecureString SimpleEncryptionV2::encrypt_data_with_prefix(td::Slice data, td::Slice secret) {
+  CHECK(data.size() % 16 == 0);
+  auto data_hash = SimpleEncryption::combine_secrets(data, secret);
+  auto msg_key = data_hash.as_slice().substr(0, 16);
+
+  td::SecureString res_buf(data.size() + 16, 0);
+  auto res = res_buf.as_mutable_slice();
+  res.copy_from(msg_key);
+
+  auto cbc_state = SimpleEncryption::calc_aes_cbc_state_hash(SimpleEncryption::combine_secrets(secret, msg_key));
+  cbc_state.encrypt(data, res.substr(16));
+
+  return res_buf;
+}
 }  // namespace tonlib
diff --git a/submodules/ton/tonlib-src/tonlib/tonlib/keys/SimpleEncryption.h b/submodules/ton/tonlib-src/tonlib/tonlib/keys/SimpleEncryption.h
index 69d5629a72..d170c26bce 100644
--- a/submodules/ton/tonlib-src/tonlib/tonlib/keys/SimpleEncryption.h
+++ b/submodules/ton/tonlib-src/tonlib/tonlib/keys/SimpleEncryption.h
@@ -14,13 +14,14 @@
     You should have received a copy of the GNU Lesser General Public License
     along with TON Blockchain Library.  If not, see <http://www.gnu.org/licenses/>.
 
-    Copyright 2017-2019 Telegram Systems LLP
+    Copyright 2017-2020 Telegram Systems LLP
 */
 #pragma once
 
 #include "td/utils/crypto.h"
 #include "td/utils/Slice.h"
 #include "td/utils/SharedSlice.h"
+#include "crypto/Ed25519.h"
 
 namespace tonlib {
 class SimpleEncryption {
@@ -33,8 +34,23 @@ class SimpleEncryption {
  private:
   static td::AesCbcState calc_aes_cbc_state_hash(td::Slice hash);
   static td::AesCbcState calc_aes_cbc_state_sha512(td::Slice seed);
-  static td::SecureString gen_random_prefix(td::int64 data_size);
+  static td::SecureString gen_random_prefix(td::int64 data_size, td::int64 min_padding);
 
   static td::SecureString encrypt_data_with_prefix(td::Slice data, td::Slice secret);
+
+  friend class SimpleEncryptionV2;
+};
+
+class SimpleEncryptionV2 {
+ public:
+  static td::Result<td::SecureString> encrypt_data(td::Slice data, const td::Ed25519::PublicKey &public_key);
+  static td::Result<td::SecureString> decrypt_data(td::Slice data, const td::Ed25519::PrivateKey &private_key);
+  static td::Result<td::SecureString> encrypt_data(td::Slice data, const td::Ed25519::PublicKey &public_key,
+                                                   const td::Ed25519::PrivateKey &private_key);
+  static td::SecureString encrypt_data(td::Slice data, td::Slice secret);
+  static td::Result<td::SecureString> decrypt_data(td::Slice encrypted_data, td::Slice secret);
+
+ private:
+  static td::SecureString encrypt_data_with_prefix(td::Slice data, td::Slice secret);
 };
 }  // namespace tonlib
diff --git a/submodules/ton/tonlib-src/tonlib/tonlib/tonlib-cli.cpp b/submodules/ton/tonlib-src/tonlib/tonlib/tonlib-cli.cpp
index 716fae3070..2f37df6851 100644
--- a/submodules/ton/tonlib-src/tonlib/tonlib/tonlib-cli.cpp
+++ b/submodules/ton/tonlib-src/tonlib/tonlib/tonlib-cli.cpp
@@ -1,7 +1,35 @@
+/*
+    This file is part of TON Blockchain source code.
+
+    TON Blockchain is free software; you can redistribute it and/or
+    modify it under the terms of the GNU General Public License
+    as published by the Free Software Foundation; either version 2
+    of the License, or (at your option) any later version.
+
+    TON Blockchain is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with TON Blockchain.  If not, see <http://www.gnu.org/licenses/>.
+
+    In addition, as a special exception, the copyright holders give permission
+    to link the code of portions of this program with the OpenSSL library.
+    You must obey the GNU General Public License in all respects for all
+    of the code used other than OpenSSL. If you modify file(s) with this
+    exception, you may extend this exception to your version of the file(s),
+    but you are not obligated to do so. If you do not wish to do so, delete this
+    exception statement from your version. If you delete this exception statement
+    from all source files in the program, then also delete it here.
+
+    Copyright 2019-2020 Telegram Systems LLP
+*/
 #include "td/actor/actor.h"
 
 #include "td/utils/filesystem.h"
 #include "td/utils/OptionsParser.h"
+#include "td/utils/overloaded.h"
 #include "td/utils/Parser.h"
 #include "td/utils/port/signals.h"
 #include "td/utils/port/path.h"
@@ -15,62 +43,65 @@
 
 #include "tonlib/ExtClientLazy.h"
 
+#include "smc-envelope/ManualDns.h"
+
 #include "auto/tl/tonlib_api.hpp"
 
+#include <cinttypes>
 #include <iostream>
 #include <map>
 
-// Consider this as a TODO list:
-//
-// (from lite-client)
-// SUPPORTED
-// "time\tGet server time\n"
-// "remote-version\tShows server time, version and capabilities\n"
-// "help [<command>]\tThis help\n" // TODO: support [<command>]
-// "quit\tExit\n";
-// "sendfile <filename>\tLoad a serialized message from <filename> and send it to server\n"
-// "saveaccount[code|data] <filename> <addr> [<block-id-ext>]\tSaves into specified file the most recent state "
-// "(StateInit) or just the code or data of specified account; <addr> is in "
-// "[<workchain>:]<hex-or-base64-addr> format\n"
-//
-// "runmethod <addr> <method-id> <params>...\tRuns GET method <method-id> of account <addr> "
-// "with specified parameters\n"
-//
-// "getaccount <addr> [<block-id-ext>]\tLoads the most recent state of specified account; <addr> is in "
-// "[<workchain>:]<hex-or-base64-addr> format\n"
-//
-// WONTSUPPORT
-//
-// UNSUPPORTED
-//"last\tGet last block and state info from server\n"
-//"status\tShow connection and local database status\n"
-//"allshards [<block-id-ext>]\tShows shard configuration from the most recent masterchain "
-//"state or from masterchain state corresponding to <block-id-ext>\n"
-//"getconfig [<param>...]\tShows specified or all configuration parameters from the latest masterchain state\n"
-//"getconfigfrom <block-id-ext> [<param>...]\tShows specified or all configuration parameters from the "
-//"masterchain state of <block-id-ext>\n"
-//"saveconfig <filename> [<block-id-ext>]\tSaves all configuration parameters into specified file\n"
-//"gethead <block-id-ext>\tShows block header for <block-id-ext>\n"
-//"getblock <block-id-ext>\tDownloads block\n"
-//"dumpblock <block-id-ext>\tDownloads and dumps specified block\n"
-//"getstate <block-id-ext>\tDownloads state corresponding to specified block\n"
-//"dumpstate <block-id-ext>\tDownloads and dumps state corresponding to specified block\n"
-//"dumptrans <block-id-ext> <account-id> <trans-lt>\tDumps one transaction of specified account\n"
-//"lasttrans[dump] <account-id> <trans-lt> <trans-hash> [<count>]\tShows or dumps specified transaction and "
-//"several preceding "
-//"ones\n"
-//"listblocktrans[rev] <block-id-ext> <count> [<start-account-id> <start-trans-lt>]\tLists block transactions, "
-//"starting immediately after or before the specified one\n"
-//"blkproofchain[step] <from-block-id-ext> [<to-block-id-ext>]\tDownloads and checks proof of validity of the /"second "
-//"indicated block (or the last known masterchain block) starting from given block\n"
-//"byseqno <workchain> <shard-prefix> <seqno>\tLooks up a block by workchain, shard and seqno, and shows its "
-//"header\n"
-//"bylt <workchain> <shard-prefix> <lt>\tLooks up a block by workchain, shard and logical time, and shows its "
-//"header\n"
-//"byutime <workchain> <shard-prefix> <utime>\tLooks up a block by workchain, shard and creation time, and "
-//"shows its header\n"
-//"known\tShows the list of all known block ids\n"
-//"privkey <filename>\tLoads a private key from file\n"
+// GR$<amount>
+struct Grams {
+  td::uint64 nano;
+};
+
+td::StringBuilder& operator<<(td::StringBuilder& sb, const Grams& grams) {
+  auto b = grams.nano % 1000000000;
+  auto a = grams.nano / 1000000000;
+  sb << "GR$" << a;
+  if (b != 0) {
+    size_t sz = 9;
+    while (b % 10 == 0) {
+      sz--;
+      b /= 10;
+    }
+    sb << '.';
+    [&](auto b_str) {
+      for (size_t i = b_str.size(); i < sz; i++) {
+        sb << '0';
+      }
+      sb << b_str;
+    }(PSLICE() << b);
+  }
+  return sb;
+}
+
+td::Result<Grams> parse_grams(td::Slice grams) {
+  td::ConstParser parser(grams);
+  if (parser.skip_start_with("GR$")) {
+    TRY_RESULT(a, td::to_integer_safe<td::uint32>(parser.read_till_nofail('.')));
+    td::uint64 res = a;
+    if (parser.try_skip('.')) {
+      for (int i = 0; i < 9; i++) {
+        res *= 10;
+        if (parser.peek_char() >= '0' && parser.peek_char() <= '9') {
+          res += parser.peek_char() - '0';
+          parser.advance(1);
+        }
+      }
+    } else {
+      res *= 1000000000;
+    }
+    if (!parser.empty()) {
+      return td::Status::Error(PSLICE() << "Failed to parse grams \"" << grams << "\", left \"" << parser.read_all()
+                                        << "\"");
+    }
+    return Grams{res};
+  }
+  TRY_RESULT(value, td::to_integer_safe<td::uint64>(grams));
+  return Grams{value};
+}
 
 class TonlibCli : public td::actor::Actor {
  public:
@@ -82,6 +113,8 @@ class TonlibCli : public td::actor::Actor {
     bool in_memory{false};
     bool use_callbacks_for_network{false};
     td::int32 wallet_version = 2;
+    td::int32 wallet_revision = 0;
+    td::optional<td::uint32> wallet_id;
     bool ignore_cache{false};
 
     bool one_shot{false};
@@ -97,6 +130,8 @@ class TonlibCli : public td::actor::Actor {
   std::uint64_t next_query_id_{1};
   td::Promise<td::Slice> cont_;
   td::uint32 wallet_id_;
+  ton::tonlib_api::object_ptr<tonlib_api::ton_blockIdExt> current_block_;
+  enum class BlockMode { Auto, Manual } block_mode_ = BlockMode::Auto;
 
   struct KeyInfo {
     std::string public_key;
@@ -177,10 +212,6 @@ class TonlibCli : public td::actor::Actor {
                       ? make_object<tonlib_api::config>(options_.config, options_.name,
                                                         options_.use_callbacks_for_network, options_.ignore_cache)
                       : nullptr;
-    auto config2 = !options_.config.empty()
-                       ? make_object<tonlib_api::config>(options_.config, options_.name,
-                                                         options_.use_callbacks_for_network, options_.ignore_cache)
-                       : nullptr;
 
     tonlib_api::object_ptr<tonlib_api::KeyStoreType> ks_type;
     if (options_.in_memory) {
@@ -188,22 +219,23 @@ class TonlibCli : public td::actor::Actor {
     } else {
       ks_type = make_object<tonlib_api::keyStoreTypeDirectory>(options_.key_dir);
     }
-    auto obj =
-        tonlib::TonlibClient::static_request(make_object<tonlib_api::options_validateConfig>(std::move(config2)));
-    if (obj->get_id() != tonlib_api::error::ID) {
-      auto info = ton::move_tl_object_as<tonlib_api::options_configInfo>(obj);
-      wallet_id_ = static_cast<td::uint32>(info->default_wallet_id_);
-    } else {
-      LOG(ERROR) << "Invalid config";
-    }
     send_query(make_object<tonlib_api::init>(make_object<tonlib_api::options>(std::move(config), std::move(ks_type))),
-               [](auto r_ok) {
+               [&](auto r_ok) {
                  LOG_IF(ERROR, r_ok.is_error()) << r_ok.error();
-                 td::TerminalIO::out() << "Tonlib is inited\n";
+                 if (r_ok.is_ok()) {
+                   if (r_ok.ok()->config_info_) {
+                     if (options_.wallet_id) {
+                       wallet_id_ = options_.wallet_id.value();
+                     } else {
+                       wallet_id_ = static_cast<td::uint32>(r_ok.ok()->config_info_->default_wallet_id_);
+                     }
+                   }
+                   td::TerminalIO::out() << "Tonlib is inited\n";
+                   if (options_.one_shot) {
+                     td::actor::send_closure(actor_id(this), &TonlibCli::parse_line, td::BufferSlice(options_.cmd));
+                   }
+                 }
                });
-    if (options_.one_shot) {
-      td::actor::send_closure(actor_id(this), &TonlibCli::parse_line, td::BufferSlice(options_.cmd));
-    }
   }
 
   void hangup_shared() override {
@@ -230,19 +262,6 @@ class TonlibCli : public td::actor::Actor {
     }
   }
 
-  void on_error() {
-    if (options_.one_shot) {
-      LOG(ERROR) << "FAILED";
-      std::_Exit(1);
-    }
-  }
-  void on_ok() {
-    if (options_.one_shot) {
-      LOG(INFO) << "OK";
-      std::_Exit(0);
-    }
-  }
-
   void parse_line(td::BufferSlice line) {
     if (is_closing_) {
       return;
@@ -267,11 +286,18 @@ class TonlibCli : public td::actor::Actor {
       return true;
     };
 
-    td::Promise<td::Unit> cmd_promise = [line = line.clone()](td::Result<td::Unit> res) {
+    td::Promise<td::Unit> cmd_promise = [line = line.clone(), one_shot = options_.one_shot](td::Result<td::Unit> res) {
       if (res.is_ok()) {
-        // on_ok
+        if (one_shot) {
+          LOG(DEBUG) << "OK";
+          std::_Exit(0);
+        }
       } else {
         td::TerminalIO::out() << "Query {" << line.as_slice() << "} FAILED: \n\t" << res.error() << "\n";
+        if (one_shot) {
+          LOG(ERROR) << "FAILED";
+          std::_Exit(1);
+        }
       }
     };
 
@@ -282,6 +308,25 @@ class TonlibCli : public td::actor::Actor {
       td::TerminalIO::out() << "sendfile <filename>\tLoad a serialized message from <filename> and send it to server\n";
       td::TerminalIO::out() << "setconfig|validateconfig <path> [<name>] [<use_callback>] [<force>] - set or validate "
                                "lite server config\n";
+      td::TerminalIO::out() << "runmethod <addr> <method-id> <params>...\tRuns GET method <method-id> of account "
+                               "<addr> with specified parameters\n";
+      td::TerminalIO::out() << "getstate <key_id>\tget state of wallet with requested key\n";
+      td::TerminalIO::out() << "guessrevision <key_id>\tsearch of existing accounts corresponding to the given key\n";
+      td::TerminalIO::out() << "getaddress <key_id>\tget address of wallet with requested key\n";
+      td::TerminalIO::out() << "dns resolve (<addr> | root) <name> <category>\n";
+      td::TerminalIO::out() << "dns cmd <key_id> <dns_cmd>\n";
+      //td::TerminalIO::out() << "dns cmdlist <key_id> {<dns_cmd>\\n} end\n";
+      td::TerminalIO::out() << "dns cmdfile <key_id> <file>\n";
+      td::TerminalIO::out() << "\t<dns_cmd> = set <name> <category> <data> | delete.name <name> | delete.all\n";
+      td::TerminalIO::out() << "\t<data> = DELETED | EMPTY | TEXT:<text> | NEXT:<smc-address> | SMC:<smc-address> | "
+                               "ADNL:<adnl-address>\n";
+
+      td::TerminalIO::out()
+          << "blockmode auto|manual\tWith auto mode, all queries will be executed with respect to the latest block. "
+             "With manual mode, user must update current block explicitly: with last or setblock\n";
+      td::TerminalIO::out() << "last\tUpdate current block to the most recent one\n";
+      td::TerminalIO::out() << "setblock <block>\tSet current block\n";
+
       td::TerminalIO::out() << "exit\tExit\n";
       td::TerminalIO::out() << "quit\tExit\n";
       td::TerminalIO::out()
@@ -292,17 +337,22 @@ class TonlibCli : public td::actor::Actor {
       td::TerminalIO::out() << "unpackaddress <address> - validate and parse address\n";
       td::TerminalIO::out() << "setbounceble <address> [<bounceble>] - change bounceble flag in address\n";
       td::TerminalIO::out() << "importkey - import key\n";
+      td::TerminalIO::out() << "importkeypem <filename> - import key\n";
+      td::TerminalIO::out() << "importkeyraw <filename> - import key\n";
       td::TerminalIO::out() << "deletekeys - delete ALL PRIVATE KEYS\n";
       td::TerminalIO::out() << "exportkey [<key_id>] - export key\n";
       td::TerminalIO::out() << "exportkeypem [<key_id>] - export key\n";
-      td::TerminalIO::out() << "getstate <key_id> - get state of simple wallet with requested key\n";
       td::TerminalIO::out()
           << "gethistory <key_id> - get history fo simple wallet with requested key (last 10 transactions)\n";
       td::TerminalIO::out() << "init <key_id> - init simple wallet with requested key\n";
-      td::TerminalIO::out() << "transfer[f] <from_key_id> <to_key_id> <amount> - transfer <amount> of grams from "
-                               "<from_key_id> to <to_key_id>.\n"
-                            << "\t<from_key_id> could also be 'giver'\n"
-                            << "\t<to_key_id> could also be 'giver' or smartcontract address\n";
+      td::TerminalIO::out() << "transfer[f][F][e][k][c] <from_key_id> (<to_key_id> <value> <message>|<file_name>) - "
+                               "make transfer from <from_key_id>\n"
+                            << "\t 'f' modifier - allow send to uninited account\n"
+                            << "\t 'F' modifier - read list of messages from <file_name> (in same format <to_key_id> "
+                               "<value> <message>, one per line)\n"
+                            << "\t 'e' modifier - encrypt all messages\n"
+                            << "\t 'k' modifier - use fake key\n"
+                            << "\t 'c' modifier - just esmitate fees\n";
     } else if (cmd == "genkey") {
       generate_key();
     } else if (cmd == "exit" || cmd == "quit") {
@@ -320,18 +370,6 @@ class TonlibCli : public td::actor::Actor {
       export_key(cmd.str(), parser.read_word());
     } else if (cmd == "importkey") {
       import_key(parser.read_all());
-    } else if (cmd == "getstate") {
-      get_state(parser.read_word());
-    } else if (cmd == "gethistory") {
-      get_history(parser.read_word());
-    } else if (cmd == "init") {
-      init_simple_wallet(parser.read_word());
-    } else if (cmd == "transfer" || cmd == "transferf") {
-      auto from = parser.read_word();
-      auto to = parser.read_word();
-      auto grams = parser.read_word();
-      auto message = parser.read_word();
-      transfer(from, to, grams, message, cmd == "transferf");
     } else if (cmd == "hint") {
       get_hints(parser.read_word());
     } else if (cmd == "unpackaddress") {
@@ -343,8 +381,10 @@ class TonlibCli : public td::actor::Actor {
     } else if (cmd == "netstats") {
       dump_netstats();
       // reviewed from here
-    } else if (cmd == "sync") {
-      sync(std::move(cmd_promise));
+    } else if (cmd == "blockmode") {
+      set_block_mode(parser.read_word(), std::move(cmd_promise));
+    } else if (cmd == "sync" || cmd == "last") {
+      sync(std::move(cmd_promise), cmd == "last");
     } else if (cmd == "time") {
       remote_time(std::move(cmd_promise));
     } else if (cmd == "remote-version") {
@@ -363,6 +403,26 @@ class TonlibCli : public td::actor::Actor {
       auto use_callback = parser.read_word();
       auto force = parser.read_word();
       set_validate_config(cmd, config, name, to_bool(use_callback), to_bool(force), std::move(cmd_promise));
+    } else if (td::begins_with(cmd, "transfer") || cmd == "init") {
+      // transfer[f][F]
+      // f - force
+      // F from file - SEND <address> <amount> <message>
+      // use @empty for empty message
+      transfer(parser, cmd, std::move(cmd_promise));
+    } else if (cmd == "getstate") {
+      get_state(parser.read_word(), std::move(cmd_promise));
+    } else if (cmd == "getaddress") {
+      get_address(parser.read_word(), std::move(cmd_promise));
+    } else if (cmd == "importkeypem") {
+      import_key_pem(parser.read_word(), std::move(cmd_promise));
+    } else if (cmd == "importkeyraw") {
+      import_key_raw(parser.read_word(), std::move(cmd_promise));
+    } else if (cmd == "dns") {
+      run_dns_cmd(parser, std::move(cmd_promise));
+    } else if (cmd == "gethistory") {
+      get_history(parser.read_word(), std::move(cmd_promise));
+    } else if (cmd == "guessrevision") {
+      guess_revision(parser.read_word(), std::move(cmd_promise));
     } else {
       cmd_promise.set_error(td::Status::Error(PSLICE() << "Unkwnown query `" << cmd << "`"));
     }
@@ -371,6 +431,109 @@ class TonlibCli : public td::actor::Actor {
     }
   }
 
+  void run_dns_cmd(td::ConstParser& parser, td::Promise<td::Unit> promise) {
+    auto cmd = parser.read_word();
+    if (cmd == "cmd" || cmd == "cmdlist" || cmd == "cmdfile") {
+      return dns_cmd(cmd, parser, std::move(promise));
+    }
+    if (cmd == "resolve") {
+      return dns_resolve(parser, std::move(promise));
+    }
+    promise.set_error(td::Status::Error("Unknown cmd"));
+  }
+
+  void do_dns_resolve(std::string name, td::int16 category, td::int32 ttl,
+                      tonlib_api::object_ptr<tonlib_api::dns_resolved> resolved, td::Promise<td::Unit> promise) {
+    if (resolved->entries_.empty()) {
+      td::TerminalIO::out() << "No dns entries found\n";
+      promise.set_value(td::Unit());
+      return;
+    }
+    if (resolved->entries_[0]->entry_->get_id() == tonlib_api::dns_entryDataNextResolver::ID && ttl != 0) {
+      td::TerminalIO::out() << "Redirect resolver\n";
+      auto entry = tonlib_api::move_object_as<tonlib_api::dns_entryDataNextResolver>(resolved->entries_[0]->entry_);
+      send_query(tonlib_api::make_object<tonlib_api::dns_resolve>(std::move(entry->resolver_), name, category, ttl),
+                 promise.send_closure(actor_id(this), &TonlibCli::do_dns_resolve, name, category, 0));
+      return;
+    }
+    td::TerminalIO::out() << "Done\n";
+    for (auto& entry : resolved->entries_) {
+      td::TerminalIO::out() << "  " << entry->name_ << " " << entry->category_ << " "
+                            << tonlib::to_dns_entry_data(*entry->entry_).move_as_ok() << "\n";
+    }
+    promise.set_value(td::Unit());
+  }
+
+  void dns_resolve(td::ConstParser& parser, td::Promise<td::Unit> promise) {
+    auto key_id = parser.read_word();
+    if (key_id == "root") {
+      key_id = "none";
+    }
+    TRY_RESULT_PROMISE(promise, address, to_account_address(key_id, false));
+    auto name = parser.read_word();
+    auto category_str = parser.read_word();
+    TRY_RESULT_PROMISE(promise, category, td::to_integer_safe<td::int16>(category_str));
+
+    std::vector<tonlib_api::object_ptr<tonlib_api::dns_entry>> entries;
+    entries.push_back(tonlib_api::make_object<tonlib_api::dns_entry>(
+        "", -1, tonlib_api::make_object<tonlib_api::dns_entryDataNextResolver>(std::move(address.address))));
+    do_dns_resolve(name.str(), category, 10, tonlib_api::make_object<tonlib_api::dns_resolved>(std::move(entries)),
+                   std::move(promise));
+  }
+  void dns_cmd(td::Slice cmd, td::ConstParser& parser, td::Promise<td::Unit> promise) {
+    auto key_id = parser.read_word();
+    TRY_RESULT_PROMISE(promise, address, to_account_address(key_id, true));
+
+    std::vector<ton::ManualDns::ActionExt> actions_ext;
+    if (cmd == "cmd") {
+      TRY_RESULT_PROMISE_ASSIGN(promise, actions_ext, ton::ManualDns::parse(parser.read_all()));
+    } else if (cmd == "cmdfile") {
+      TRY_RESULT_PROMISE(promise, file_data, td::read_file(parser.read_word().str()));
+      TRY_RESULT_PROMISE_ASSIGN(promise, actions_ext, ton::ManualDns::parse(file_data));
+    }
+
+    std::vector<tonlib_api::object_ptr<tonlib_api::dns_Action>> actions;
+    for (auto& action : actions_ext) {
+      if (action.name.empty()) {
+        actions.push_back(tonlib_api::make_object<tonlib_api::dns_actionDeleteAll>());
+        td::TerminalIO::out() << "Delete all dns entries\n";
+      } else if (action.category == 0) {
+        actions.push_back(tonlib_api::make_object<tonlib_api::dns_actionDelete>(action.name, 0));
+        td::TerminalIO::out() << "Delete all dns enties with name: " << action.name << "\n";
+      } else if (!action.data) {
+        actions.push_back(tonlib_api::make_object<tonlib_api::dns_actionDelete>(action.name, action.category));
+        td::TerminalIO::out() << "Delete all dns enties with name and category: " << action.name << ":"
+                              << action.category << "\n";
+      } else {
+        td::StringBuilder sb;
+
+        td::Status error;
+        if (action.data.value().data.empty()) {
+          TRY_STATUS_PROMISE(promise, td::Status::Error("Empty entry data is not supported"));
+        }
+        TRY_RESULT_PROMISE(promise, data, tonlib::to_tonlib_api(action.data.value()));
+        sb << action.data.value();
+        TRY_STATUS_PROMISE(promise, std::move(error));
+        td::TerminalIO::out() << "Set dns entry: " << action.name << ":" << action.category << " " << sb.as_cslice()
+                              << "\n";
+        actions.push_back(tonlib_api::make_object<tonlib_api::dns_actionSet>(
+            tonlib_api::make_object<tonlib_api::dns_entry>(action.name, action.category, std::move(data))));
+      }
+    }
+
+    auto action = tonlib_api::make_object<tonlib_api::actionDns>(std::move(actions));
+
+    td::Slice password;  // empty by default
+    using tonlib_api::make_object;
+    auto key = !address.secret.empty() ? make_object<tonlib_api::inputKeyRegular>(
+                                             make_object<tonlib_api::key>(address.public_key, address.secret.copy()),
+                                             td::SecureString(password))
+                                       : nullptr;
+    send_query(tonlib_api::make_object<tonlib_api::createQuery>(std::move(key), std::move(address.address), 60,
+                                                                std::move(action)),
+               promise.send_closure(actor_id(this), &TonlibCli::transfer2, false));
+  }
+
   void remote_time(td::Promise<td::Unit> promise) {
     send_query(tonlib_api::make_object<tonlib_api::liteServer_getInfo>(), promise.wrap([](auto&& info) {
       td::TerminalIO::out() << "Lite server time is: " << info->now_ << "\n";
@@ -429,13 +592,29 @@ class TonlibCli : public td::actor::Actor {
     promise.set_value(td::Unit());
   }
 
-  void sync(td::Promise<td::Unit> promise) {
+  void sync(td::Promise<td::Unit> promise, bool update_last) {
     using tonlib_api::make_object;
-    send_query(make_object<tonlib_api::sync>(), promise.wrap([](auto&&) {
+    send_query(make_object<tonlib_api::sync>(), promise.wrap([&, update_last](auto&& block) {
       td::TerminalIO::out() << "synchronized\n";
+      td::TerminalIO::out() << to_string(block) << "\n";
+      if (update_last) {
+        current_block_ = std::move(block);
+        td::TerminalIO::out() << "Update current block\n";
+      }
       return td::Unit();
     }));
   }
+  void set_block_mode(td::Slice mode, td::Promise<td::Unit> promise) {
+    if (mode == "auto") {
+      block_mode_ = BlockMode::Auto;
+      promise.set_value(td::Unit());
+    } else if (mode == "manual") {
+      block_mode_ = BlockMode::Manual;
+      promise.set_value(td::Unit());
+    } else {
+      promise.set_error(td::Status::Error("Invalid block mode"));
+    }
+  }
   td::Result<tonlib_api::object_ptr<tonlib_api::tvm_StackEntry>> parse_stack_entry(td::Slice str) {
     if (str.empty() || str.size() > 65535) {
       return td::Status::Error("String is or empty or too big");
@@ -482,6 +661,73 @@ class TonlibCli : public td::actor::Actor {
         tonlib_api::make_object<tonlib_api::tvm_numberDecimal>(dec_string(num)));
   }
 
+  td::Result<std::vector<tonlib_api::object_ptr<tonlib_api::tvm_StackEntry>>> parse_stack(td::ConstParser& parser,
+                                                                                          td::Slice end_token) {
+    std::vector<tonlib_api::object_ptr<tonlib_api::tvm_StackEntry>> stack;
+    while (true) {
+      auto word = parser.read_word();
+      LOG(ERROR) << word << " vs " << end_token;
+      if (word == end_token) {
+        break;
+      }
+      if (word == "[") {
+        TRY_RESULT(elements, parse_stack(parser, "]"));
+        stack.push_back(tonlib_api::make_object<tonlib_api::tvm_stackEntryTuple>(
+            tonlib_api::make_object<tonlib_api::tvm_tuple>(std::move(elements))));
+      } else if (word == "(") {
+        TRY_RESULT(elements, parse_stack(parser, ")"));
+        stack.push_back(tonlib_api::make_object<tonlib_api::tvm_stackEntryList>(
+            tonlib_api::make_object<tonlib_api::tvm_list>(std::move(elements))));
+      } else {
+        TRY_RESULT(stack_entry, parse_stack_entry(word));
+        stack.push_back(std::move(stack_entry));
+      }
+    }
+    return std::move(stack);
+  }
+
+  static void store_entry(td::StringBuilder& sb, tonlib_api::tvm_StackEntry& entry) {
+    downcast_call(entry, td::overloaded(
+                             [&](tonlib_api::tvm_stackEntryCell& cell) {
+                               auto r_cell = vm::std_boc_deserialize(cell.cell_->bytes_);
+                               if (r_cell.is_error()) {
+                                 sb << "<INVALID_CELL>";
+                               }
+                               auto cs = vm::load_cell_slice(r_cell.move_as_ok());
+                               std::stringstream ss;
+                               cs.print_rec(ss);
+                               sb << ss.str();
+                             },
+                             [&](tonlib_api::tvm_stackEntrySlice& cell) {
+                               auto r_cell = vm::std_boc_deserialize(cell.slice_->bytes_);
+                               if (r_cell.is_error()) {
+                                 sb << "<INVALID_CELL>";
+                               }
+                               auto cs = vm::load_cell_slice(r_cell.move_as_ok());
+                               std::stringstream ss;
+                               cs.print_rec(ss);
+                               sb << ss.str();
+                             },
+                             [&](tonlib_api::tvm_stackEntryNumber& cell) { sb << cell.number_->number_; },
+                             [&](tonlib_api::tvm_stackEntryTuple& cell) {
+                               sb << "(";
+                               for (auto& element : cell.tuple_->elements_) {
+                                 sb << " ";
+                                 store_entry(sb, *element);
+                               }
+                               sb << " )";
+                             },
+                             [&](tonlib_api::tvm_stackEntryList& cell) {
+                               sb << "[";
+                               for (auto& element : cell.list_->elements_) {
+                                 sb << " ";
+                                 store_entry(sb, *element);
+                               }
+                               sb << " ]";
+                             },
+                             [&](tonlib_api::tvm_stackEntryUnsupported& cell) { sb << "<UNSUPPORTED>"; }));
+  }
+
   void run_method(td::ConstParser& parser, td::Promise<td::Unit> promise) {
     TRY_RESULT_PROMISE(promise, addr, to_account_address(parser.read_word(), false));
 
@@ -492,15 +738,15 @@ class TonlibCli : public td::actor::Actor {
     } else {
       method = tonlib_api::make_object<tonlib_api::smc_methodIdName>(method_str.str());
     }
-    std::vector<tonlib_api::object_ptr<tonlib_api::tvm_StackEntry>> stack;
-    while (true) {
-      auto word = parser.read_word();
-      if (word.empty()) {
-        break;
-      }
-      TRY_RESULT_PROMISE(promise, stack_entry, parse_stack_entry(word));
-      stack.push_back(std::move(stack_entry));
+    TRY_RESULT_PROMISE(promise, stack, parse_stack(parser, ""));
+    td::StringBuilder sb;
+    for (auto& entry : stack) {
+      store_entry(sb, *entry);
+      sb << "\n";
     }
+
+    td::TerminalIO::out() << "Run " << to_string(method) << "With stack:\n" << sb.as_cslice();
+
     auto to_run =
         tonlib_api::make_object<tonlib_api::smc_runGetMethod>(0 /*fixme*/, std::move(method), std::move(stack));
 
@@ -513,9 +759,16 @@ class TonlibCli : public td::actor::Actor {
     to_run->id_ = info->id_;
     send_query(std::move(to_run), promise.send_closure(actor_id(this), &TonlibCli::run_method_3));
   }
-
   void run_method_3(tonlib_api::object_ptr<tonlib_api::smc_runResult> info, td::Promise<td::Unit> promise) {
-    td::TerminalIO::out() << "Got smc result " << to_string(info);
+    td::StringBuilder sb;
+    for (auto& entry : info->stack_) {
+      store_entry(sb, *entry);
+      sb << "\n";
+    }
+
+    td::TerminalIO::out() << "Got smc result. exit code: " << info->exit_code_ << ", gas_used: " << info->gas_used_
+                          << "\n"
+                          << sb.as_cslice();
     promise.set_value({});
   }
 
@@ -625,8 +878,20 @@ class TonlibCli : public td::actor::Actor {
     if (is_closing_) {
       return;
     }
+    tonlib_api::object_ptr<tonlib_api::Function> func = std::move(query);
+    if (block_mode_ == BlockMode::Manual && func->get_id() != tonlib_api::sync::ID) {
+      if (!current_block_) {
+        promise.set_error(td::Status::Error("empty current block"));
+        return;
+      }
+      func = tonlib_api::make_object<tonlib_api::withBlock>(
+          tonlib_api::make_object<tonlib_api::ton_blockIdExt>(current_block_->workchain_, current_block_->shard_,
+                                                              current_block_->seqno_, current_block_->root_hash_,
+                                                              current_block_->file_hash_),
+          std::move(func));
+    }
     auto query_id = next_query_id_++;
-    td::actor::send_closure(client_, &tonlib::TonlibClient::request, query_id, std::move(query));
+    td::actor::send_closure(client_, &tonlib::TonlibClient::request, query_id, std::move(func));
     query_handlers_[query_id] =
         [promise = std::move(promise)](td::Result<tonlib_api::object_ptr<tonlib_api::Object>> r_obj) mutable {
           if (r_obj.is_error()) {
@@ -742,7 +1007,6 @@ class TonlibCli : public td::actor::Actor {
       KeyInfo info;
       info.public_key = public_key;
       info.secret = r_secret.move_as_ok();
-      LOG(INFO) << info.public_key;
 
       keys_.push_back(std::move(info));
     }
@@ -830,26 +1094,44 @@ class TonlibCli : public td::actor::Actor {
     td::SecureString secret;
   };
 
+  template <class F>
+  auto with_account_state(int version, std::string public_key, td::uint32 wallet_id, F&& f) {
+    using tonlib_api::make_object;
+    if (version == 1) {
+      return f(make_object<tonlib_api::testWallet_initialAccountState>(public_key));
+    }
+    if (version == 2) {
+      return f(make_object<tonlib_api::wallet_initialAccountState>(public_key));
+    }
+    if (version == 4) {
+      return f(make_object<tonlib_api::wallet_highload_v1_initialAccountState>(public_key, wallet_id));
+    }
+    if (version == 5) {
+      return f(make_object<tonlib_api::wallet_highload_v2_initialAccountState>(public_key, wallet_id));
+    }
+    if (version == 6) {
+      return f(make_object<tonlib_api::dns_initialAccountState>(public_key, wallet_id));
+    }
+    return f(make_object<tonlib_api::wallet_v3_initialAccountState>(public_key, wallet_id));
+  }
+
   td::Result<Address> to_account_address(td::Slice key, bool need_private_key) {
     if (key.empty()) {
       return td::Status::Error("account address is empty");
     }
+    if (key == "none" && !need_private_key) {
+      return Address{};
+    }
     auto r_key_i = to_key_i(key);
     using tonlib_api::make_object;
     if (r_key_i.is_ok()) {
-      auto obj = [&](td::int32 version) {
-        if (version == 1) {
-          return tonlib::TonlibClient::static_request(make_object<tonlib_api::testWallet_getAccountAddress>(
-              make_object<tonlib_api::testWallet_initialAccountState>(keys_[r_key_i.ok()].public_key)));
-        }
-        if (version == 2) {
-          return tonlib::TonlibClient::static_request(make_object<tonlib_api::wallet_getAccountAddress>(
-              make_object<tonlib_api::wallet_initialAccountState>(keys_[r_key_i.ok()].public_key)));
-        }
-        return tonlib::TonlibClient::static_request(make_object<tonlib_api::wallet_v3_getAccountAddress>(
-            make_object<tonlib_api::wallet_v3_initialAccountState>(keys_[r_key_i.ok()].public_key, wallet_id_)));
-        UNREACHABLE();
-      }(options_.wallet_version);
+      auto obj = [&](td::int32 version, td::int32 revision) {
+        auto do_request = [revision](auto x) {
+          return tonlib::TonlibClient::static_request(
+              make_object<tonlib_api::getAccountAddress>(std::move(x), revision));
+        };
+        return with_account_state(version, keys_[r_key_i.ok()].public_key, wallet_id_, do_request);
+      }(options_.wallet_version, options_.wallet_revision);
       if (obj->get_id() != tonlib_api::error::ID) {
         Address res;
         res.address = ton::move_tl_object_as<tonlib_api::accountAddress>(obj);
@@ -859,7 +1141,8 @@ class TonlibCli : public td::actor::Actor {
       }
     }
     if (key == "giver") {
-      auto obj = tonlib::TonlibClient::static_request(make_object<tonlib_api::testGiver_getAccountAddress>());
+      auto obj = tonlib::TonlibClient::static_request(
+          make_object<tonlib_api::getAccountAddress>(make_object<tonlib_api::testGiver_initialAccountState>(), 0));
       if (obj->get_id() != tonlib_api::error::ID) {
         Address res;
         res.address = ton::move_tl_object_as<tonlib_api::accountAddress>(obj);
@@ -917,6 +1200,39 @@ class TonlibCli : public td::actor::Actor {
     cont_ = [this, cmd, key = key.str(), key_i](td::Slice password) { this->export_key(cmd, key, key_i, password); };
   }
 
+  void import_key_pem(td::Slice filename, td::Promise<td::Unit> promise) {
+    TRY_RESULT_PROMISE(promise, data, td::read_file_secure(filename.str()));
+    using tonlib_api::make_object;
+    send_query(make_object<tonlib_api::importPemKey>(td::SecureString(), td::SecureString("cucumber"),
+                                                     make_object<tonlib_api::exportedPemKey>(std::move(data))),
+               promise.wrap([&](auto&& key) {
+                 LOG(ERROR) << to_string(key);
+                 KeyInfo info;
+                 info.public_key = key->public_key_;
+                 info.secret = std::move(key->secret_);
+                 keys_.push_back(std::move(info));
+                 export_key("exportkey", key->public_key_, keys_.size() - 1, td::SecureString());
+                 store_keys();
+                 return td::Unit();
+               }));
+  }
+  void import_key_raw(td::Slice filename, td::Promise<td::Unit> promise) {
+    TRY_RESULT_PROMISE(promise, data, td::read_file_secure(filename.str()));
+    using tonlib_api::make_object;
+    send_query(make_object<tonlib_api::importUnencryptedKey>(
+                   td::SecureString(), make_object<tonlib_api::exportedUnencryptedKey>(std::move(data))),
+               promise.wrap([&](auto&& key) {
+                 LOG(ERROR) << to_string(key);
+                 KeyInfo info;
+                 info.public_key = key->public_key_;
+                 info.secret = std::move(key->secret_);
+                 keys_.push_back(std::move(info));
+                 export_key("exportkey", key->public_key_, keys_.size() - 1, td::SecureString());
+                 store_keys();
+                 return td::Unit();
+               }));
+  }
+
   void export_key(std::string cmd, std::string key, size_t key_i, td::Slice password) {
     using tonlib_api::make_object;
     if (cmd == "exportkey") {
@@ -972,7 +1288,7 @@ class TonlibCli : public td::actor::Actor {
 
   void import_key(std::vector<td::SecureString> words, td::Slice password) {
     using tonlib_api::make_object;
-    send_query(make_object<tonlib_api::importKey>(td::SecureString(password), td::SecureString(),
+    send_query(make_object<tonlib_api::importKey>(td::SecureString(password), td::SecureString(""),
                                                   make_object<tonlib_api::exportedKey>(std::move(words))),
                [this, password = td::SecureString(password)](auto r_res) {
                  if (r_res.is_error()) {
@@ -990,225 +1306,234 @@ class TonlibCli : public td::actor::Actor {
                });
   }
 
-  void get_state(td::Slice key) {
-    if (key.empty()) {
-      dump_keys();
-      td::TerminalIO::out() << "Choose public key (hex prefix or #N)";
-      cont_ = [this](td::Slice key) { this->get_state(key); };
-      on_wait();
-      return;
-    }
-    auto r_address = to_account_address(key, false);
-    if (r_address.is_error()) {
-      td::TerminalIO::out() << "Unknown key id: [" << key << "]\n";
-      on_error();
-      return;
-    }
-    auto address = r_address.move_as_ok();
+  void get_state(td::Slice key, td::Promise<td::Unit> promise) {
+    TRY_RESULT_PROMISE(promise, address, to_account_address(key, false));
     using tonlib_api::make_object;
-    send_query(make_object<tonlib_api::generic_getAccountState>(
+    auto address_str = address.address->account_address_;
+    send_query(make_object<tonlib_api::getAccountState>(
                    ton::move_tl_object_as<tonlib_api::accountAddress>(std::move(address.address))),
-               [this](auto r_res) {
-                 if (r_res.is_error()) {
-                   td::TerminalIO::out() << "Can't get state: " << r_res.error() << "\n";
-                   on_error();
-                   return;
-                 }
-                 td::TerminalIO::out() << to_string(r_res.ok());
-                 on_ok();
-               });
+               promise.wrap([address_str](auto&& state) {
+                 td::TerminalIO::out() << "Address: " << address_str << "\n";
+                 td::TerminalIO::out() << "Balance: "
+                                       << Grams{td::narrow_cast<td::uint64>(state->balance_ * (state->balance_ > 0))}
+                                       << "\n";
+                 td::TerminalIO::out() << "Sync utime: " << state->sync_utime_ << "\n";
+                 td::TerminalIO::out() << "transaction.LT: " << state->last_transaction_id_->lt_ << "\n";
+                 td::TerminalIO::out() << "transaction.Hash: " << td::base64_encode(state->last_transaction_id_->hash_)
+                                       << "\n";
+                 td::TerminalIO::out() << to_string(state->account_state_);
+                 return td::Unit();
+               }));
   }
-  void get_history(td::Slice key) {
-    if (key.empty()) {
-      dump_keys();
-      td::TerminalIO::out() << "Choose public key (hex prefix or #N)";
-      cont_ = [this](td::Slice key) { this->get_state(key); };
-      return;
-    }
-    auto r_address = to_account_address(key, false);
-    if (r_address.is_error()) {
-      td::TerminalIO::out() << "Unknown key id: [" << key << "]\n";
-      return;
-    }
-    auto address = r_address.move_as_ok();
+
+  void get_address(td::Slice key, td::Promise<td::Unit> promise) {
+    TRY_RESULT_PROMISE(promise, address, to_account_address(key, false));
+    promise.set_value(td::Unit());
+    td::TerminalIO::out() << address.address->account_address_ << "\n";
+  }
+
+  void get_history(td::Slice key, td::Promise<td::Unit> promise) {
+    TRY_RESULT_PROMISE(promise, address, to_account_address(key, false));
     using tonlib_api::make_object;
-    send_query(make_object<tonlib_api::generic_getAccountState>(
+    send_query(make_object<tonlib_api::getAccountState>(
                    ton::move_tl_object_as<tonlib_api::accountAddress>(std::move(address.address))),
-               [this, key = key.str()](auto r_res) {
-                 if (r_res.is_error()) {
-                   td::TerminalIO::out() << "Can't get state: " << r_res.error() << "\n";
-                   return;
-                 }
-                 this->get_history(key, *r_res.move_as_ok());
-               });
+               promise.send_closure(td::actor::actor_id(this), &TonlibCli::get_history2, key.str()));
   }
 
-  void get_history(td::Slice key, tonlib_api::generic_AccountState& state) {
-    auto r_address = to_account_address(key, false);
+  void guess_revision(td::Slice key, td::Promise<td::Unit> promise) {
+    TRY_RESULT_PROMISE(promise, key_i, to_key_i(key));
+    with_account_state(options_.wallet_version, keys_[key_i].public_key, wallet_id_, [&](auto state) {
+      using tonlib_api::make_object;
+      send_query(make_object<tonlib_api::guessAccountRevision>(std::move(state)), promise.wrap([](auto revisions) {
+        td::TerminalIO::out() << to_string(revisions);
+        return td::Unit();
+      }));
+    });
+  }
+
+  void get_history2(td::Slice key, td::Result<tonlib_api::object_ptr<tonlib_api::fullAccountState>> r_state,
+                    td::Promise<td::Unit> promise) {
+    TRY_RESULT_PROMISE(promise, state, std::move(r_state));
+    auto r_address = to_account_address(key, true);
     if (r_address.is_error()) {
-      td::TerminalIO::out() << "Unknown key id: [" << key << "]\n";
-      return;
+      r_address = to_account_address(key, false);
     }
-    auto address = r_address.move_as_ok();
+    TRY_RESULT_PROMISE(promise, address, std::move(r_address));
+    td::Slice password;
+    using tonlib_api::make_object;
+    auto input_key =
+        !address.secret.empty()
+            ? make_object<tonlib_api::inputKeyRegular>(
+                  make_object<tonlib_api::key>(address.public_key, address.secret.copy()), td::SecureString(password))
+            : nullptr;
 
-    tonlib_api::object_ptr<tonlib_api::internal_transactionId> transaction_id;
-    downcast_call(state, [&](auto& state) { transaction_id = std::move(state.account_state_->last_transaction_id_); });
-
-    send_query(
-        tonlib_api::make_object<tonlib_api::raw_getTransactions>(
-            ton::move_tl_object_as<tonlib_api::accountAddress>(std::move(address.address)), std::move(transaction_id)),
-        [](auto r_res) {
-          if (r_res.is_error()) {
-            td::TerminalIO::out() << "Can't get transactions: " << r_res.error() << "\n";
-            return;
-          }
-          td::TerminalIO::out() << to_string(r_res.move_as_ok()) << "\n";
-        });
+    send_query(tonlib_api::make_object<tonlib_api::raw_getTransactions>(
+                   std::move(input_key), ton::move_tl_object_as<tonlib_api::accountAddress>(std::move(address.address)),
+                   std::move(state->last_transaction_id_)),
+               promise.wrap([](auto res) {
+                 td::StringBuilder sb;
+                 for (tonlib_api::object_ptr<tonlib_api::raw_transaction>& t : res->transactions_) {
+                   td::int64 balance = 0;
+                   balance += t->in_msg_->value_;
+                   for (auto& ot : t->out_msgs_) {
+                     balance -= ot->value_;
+                   }
+                   if (balance >= 0) {
+                     sb << Grams{td::uint64(balance)};
+                   } else {
+                     sb << "-" << Grams{td::uint64(-balance)};
+                   }
+                   sb << " Fee: " << Grams{td::uint64(t->fee_)};
+                   if (t->in_msg_->source_.empty()) {
+                     sb << " External ";
+                   } else {
+                     sb << " From " << t->in_msg_->source_;
+                   }
+                   auto print_msg_data = [](td::StringBuilder& sb,
+                                            tonlib_api::object_ptr<tonlib_api::msg_Data>& msg_data) {
+                     if (!msg_data) {
+                       return;
+                     }
+                     sb << " ";
+                     downcast_call(*msg_data,
+                                   td::overloaded([&](tonlib_api::msg_dataRaw& raw) { sb << "<unknown message>"; },
+                                                  [&](tonlib_api::msg_dataText& raw) { sb << "{" << raw.text_ << "}"; },
+                                                  [&](tonlib_api::msg_dataEncryptedText& raw) { sb << "<encrypted>"; },
+                                                  [&](tonlib_api::msg_dataDecryptedText& raw) {
+                                                    sb << "decrypted{" << raw.text_ << "}";
+                                                  }));
+                   };
+                   print_msg_data(sb, t->in_msg_->msg_data_);
+                   for (auto& ot : t->out_msgs_) {
+                     sb << "\n\t";
+                     if (ot->destination_.empty()) {
+                       sb << " External ";
+                     } else {
+                       sb << " To " << ot->destination_;
+                     }
+                     sb << " " << Grams{td::uint64(ot->value_)};
+                     print_msg_data(sb, ot->msg_data_);
+                   }
+                   sb << "\n";
+                 }
+                 td::TerminalIO::out() << sb.as_cslice() << "\n";
+                 return td::Unit();
+               }));
   }
 
-  void transfer(td::Slice from, td::Slice to, td::Slice grams, td::Slice message, bool allow_send_to_uninited) {
-    auto r_from_address = to_account_address(from, true);
-    if (r_from_address.is_error()) {
-      td::TerminalIO::out() << "Unknown key id: [" << from << "] : " << r_from_address.error() << "\n";
-      on_error();
-      return;
+  void transfer(td::ConstParser& parser, td::Slice cmd, td::Promise<td::Unit> cmd_promise) {
+    bool from_file = false;
+    bool force = false;
+    bool use_encryption = false;
+    bool use_fake_key = false;
+    bool estimate_fees = false;
+    if (cmd != "init") {
+      td::ConstParser cmd_parser(cmd);
+      cmd_parser.advance(td::Slice("transfer").size());
+      while (!cmd_parser.empty()) {
+        auto c = cmd_parser.peek_char();
+        cmd_parser.advance(1);
+        if (c == 'F') {
+          from_file = true;
+        } else if (c == 'f') {
+          force = true;
+        } else if (c == 'e') {
+          use_encryption = true;
+        } else if (c == 'k') {
+          use_fake_key = true;
+        } else if (c == 'c') {
+          estimate_fees = true;
+        } else {
+          cmd_promise.set_error(td::Status::Error(PSLICE() << "Unknown suffix '" << c << "'"));
+          return;
+        }
+      }
     }
-    auto r_to_address = to_account_address(to, false);
-    if (r_to_address.is_error()) {
-      td::TerminalIO::out() << "Unknown key id: [" << to << "] : " << r_to_address.error() << "\n";
-      on_error();
-      return;
-    }
-    auto r_grams = td::to_integer_safe<td::uint64>(grams);
-    if (r_grams.is_error()) {
-      td::TerminalIO::out() << "Invalid grams amount: [" << grams << "]\n";
-      on_error();
-      return;
-    }
-    if (options_.one_shot) {
-      transfer(r_from_address.move_as_ok(), r_to_address.move_as_ok(), r_grams.move_as_ok(), "", "",
-               allow_send_to_uninited);
-      return;
-    }
-    if (from != "giver" && message.empty()) {
-      td::TerminalIO::out() << "Enter password (could be empty)";
-      cont_ = [this, from = r_from_address.move_as_ok(), to = r_to_address.move_as_ok(), grams = r_grams.move_as_ok(),
-               allow_send_to_uninited](td::Slice password) mutable {
-        this->transfer(std::move(from), std::move(to), grams, password, allow_send_to_uninited);
-      };
-      on_wait();
-      return;
-    }
-    if (message.empty()) {
-      transfer(r_from_address.move_as_ok(), r_to_address.move_as_ok(), r_grams.move_as_ok(), "",
-               allow_send_to_uninited);
-    } else {
-      transfer(r_from_address.move_as_ok(), r_to_address.move_as_ok(), r_grams.move_as_ok(), "", message,
-               allow_send_to_uninited);
-    }
-  }
 
-  void transfer(Address from, Address to, td::uint64 grams, td::Slice password, bool allow_send_to_uninited) {
-    td::TerminalIO::out() << "Enter message (could be empty)";
-    cont_ = [this, from = std::move(from), to = std::move(to), grams, password = password.str(),
-             allow_send_to_uninited](td::Slice message) mutable {
-      this->transfer(std::move(from), std::move(to), grams, password, message, allow_send_to_uninited);
+    auto from = parser.read_word();
+    TRY_RESULT_PROMISE(cmd_promise, from_address, to_account_address(from, true));
+
+    struct Message {
+      Address to;
+      td::int64 amount;
+      std::string message;
     };
-    on_wait();
-    return;
-  }
-  void transfer(Address from, Address to, td::uint64 grams, td::Slice password, td::Slice message,
-                bool allow_send_to_uninited) {
-    auto r_sz = td::to_integer_safe<size_t>(message);
-    auto msg = message.str();
-    if (r_sz.is_ok()) {
-      msg = std::string(r_sz.ok(), 'Z');
-    }
-    using tonlib_api::make_object;
-    auto key = !from.secret.empty()
-                   ? make_object<tonlib_api::inputKeyRegular>(
-                         make_object<tonlib_api::key>(from.public_key, from.secret.copy()), td::SecureString(password))
-                   : nullptr;
-    send_query(make_object<tonlib_api::generic_createSendGramsQuery>(std::move(key), std::move(from.address),
-                                                                     std::move(to.address), grams, 60,
-                                                                     allow_send_to_uninited, std::move(msg)),
-               [self = this](auto r_res) {
-                 if (r_res.is_error()) {
-                   td::TerminalIO::out() << "Can't transfer: " << r_res.error() << "\n";
-                   self->on_error();
-                   return;
-                 }
-                 td::TerminalIO::out() << to_string(r_res.ok());
-                 self->send_query(make_object<tonlib_api::query_estimateFees>(r_res.ok()->id_, false),
-                                  [self](auto r_res) {
-                                    if (r_res.is_error()) {
-                                      td::TerminalIO::out() << "Can't transfer: " << r_res.error() << "\n";
-                                      self->on_error();
-                                      return;
-                                    }
-                                    td::TerminalIO::out() << to_string(r_res.ok());
-                                    self->on_ok();
-                                  });
 
-                 self->send_query(make_object<tonlib_api::query_send>(r_res.ok()->id_), [self](auto r_res) {
-                   if (r_res.is_error()) {
-                     td::TerminalIO::out() << "Can't transfer: " << r_res.error() << "\n";
-                     self->on_error();
-                     return;
-                   }
-                   td::TerminalIO::out() << to_string(r_res.ok());
-                   self->on_ok();
-                 });
+    std::vector<tonlib_api::object_ptr<tonlib_api::msg_message>> messages;
+    auto add_message = [&](td::ConstParser& parser) {
+      auto to = parser.read_word();
+      auto grams = parser.read_word();
+      parser.skip_whitespaces();
+      auto message = parser.read_all();
 
-                 self->on_ok();
-               });
-  }
+      Message res;
+      TRY_RESULT(address, to_account_address(to, false));
+      TRY_RESULT(amount, parse_grams(grams));
+      tonlib_api::object_ptr<tonlib_api::msg_Data> data;
 
-  void init_simple_wallet(td::Slice key) {
-    if (key.empty()) {
-      dump_keys();
-      td::TerminalIO::out() << "Choose public key (hex prefix or #N)";
-      cont_ = [this](td::Slice key) { this->init_simple_wallet(key); };
-      return;
-    }
-    auto r_key_i = to_key_i(key);
-    if (r_key_i.is_error()) {
-      td::TerminalIO::out() << "Unknown key id: [" << key << "]\n";
-      return;
-    }
-    auto key_i = r_key_i.move_as_ok();
+      if (use_encryption) {
+        data = tonlib_api::make_object<tonlib_api::msg_dataDecryptedText>(message.str());
+      } else {
+        data = tonlib_api::make_object<tonlib_api::msg_dataText>(message.str());
+      }
+      messages.push_back(
+          tonlib_api::make_object<tonlib_api::msg_message>(std::move(address.address), amount.nano, std::move(data)));
+      return td::Status::OK();
+    };
 
-    td::TerminalIO::out() << "Key #" << key_i << "\n"
-                          << "public key: " << td::buffer_to_hex(keys_[key_i].public_key) << "\n";
-
-    td::TerminalIO::out() << "Enter password (could be empty)";
-    cont_ = [this, key = key.str(), key_i](td::Slice password) { this->init_simple_wallet(key, key_i, password); };
-  }
-
-  void init_simple_wallet(std::string key, size_t key_i, td::Slice password) {
-    using tonlib_api::make_object;
-    if (options_.wallet_version == 1) {
-      send_query(make_object<tonlib_api::testWallet_init>(make_object<tonlib_api::inputKeyRegular>(
-                     make_object<tonlib_api::key>(keys_[key_i].public_key, keys_[key_i].secret.copy()),
-                     td::SecureString(password))),
-                 [key = std::move(key)](auto r_res) {
-                   if (r_res.is_error()) {
-                     td::TerminalIO::out() << "Can't init wallet with key: [" << key << "] " << r_res.error() << "\n";
-                     return;
-                   }
-                   td::TerminalIO::out() << to_string(r_res.ok());
-                 });
+    if (from_file) {
+      TRY_RESULT_PROMISE(cmd_promise, data, td::read_file(parser.read_word().str()));
+      auto lines = td::full_split(data.as_slice(), '\n');
+      for (auto& line : lines) {
+        td::ConstParser parser(line);
+        parser.skip_whitespaces();
+        if (parser.empty()) {
+          continue;
+        }
+        if (parser.read_word() != "SEND") {
+          TRY_STATUS_PROMISE(cmd_promise, td::Status::Error("Expected `SEND` in file"));
+        }
+        TRY_STATUS_PROMISE(cmd_promise, add_message(parser));
+      }
     } else {
-      send_query(make_object<tonlib_api::wallet_init>(make_object<tonlib_api::inputKeyRegular>(
-                     make_object<tonlib_api::key>(keys_[key_i].public_key, keys_[key_i].secret.copy()),
-                     td::SecureString(password))),
-                 [key = std::move(key)](auto r_res) {
-                   if (r_res.is_error()) {
-                     td::TerminalIO::out() << "Can't init wallet with key: [" << key << "] " << r_res.error() << "\n";
-                     return;
-                   }
-                   td::TerminalIO::out() << to_string(r_res.ok());
-                 });
+      while (parser.skip_whitespaces(), !parser.empty()) {
+        TRY_STATUS_PROMISE(cmd_promise, add_message(parser));
+      }
+    }
+
+    td::Slice password;  // empty by default
+    using tonlib_api::make_object;
+    tonlib_api::object_ptr<tonlib_api::InputKey> key =
+        !from_address.secret.empty()
+            ? make_object<tonlib_api::inputKeyRegular>(
+                  make_object<tonlib_api::key>(from_address.public_key, from_address.secret.copy()),
+                  td::SecureString(password))
+            : nullptr;
+    if (use_fake_key) {
+      key = make_object<tonlib_api::inputKeyFake>();
+    }
+
+    bool allow_send_to_uninited = force;
+
+    send_query(make_object<tonlib_api::createQuery>(
+                   std::move(key), std::move(from_address.address), 60,
+                   make_object<tonlib_api::actionMsg>(std::move(messages), allow_send_to_uninited)),
+               cmd_promise.send_closure(actor_id(this), &TonlibCli::transfer2, estimate_fees));
+  }
+
+  void transfer2(bool estimate_fees, td::Result<tonlib_api::object_ptr<tonlib_api::query_info>> r_info,
+                 td::Promise<td::Unit> cmd_promise) {
+    if (estimate_fees) {
+      send_query(tonlib_api::make_object<tonlib_api::query_estimateFees>(r_info.ok()->id_, true),
+                 cmd_promise.wrap([](auto&& info) {
+                   td::TerminalIO::out() << "Extimated fees: " << to_string(info);
+                   return td::Unit();
+                 }));
+    } else {
+      send_query(tonlib_api::make_object<tonlib_api::query_send>(r_info.ok()->id_), cmd_promise.wrap([](auto&& info) {
+        td::TerminalIO::out() << "Transfer sent: " << to_string(info);
+        return td::Unit();
+      }));
     }
   }
 
@@ -1280,8 +1605,22 @@ int main(int argc, char* argv[]) {
     options.use_callbacks_for_network = true;
     return td::Status::OK();
   });
-  p.add_option('W', "wallet-version", "do not use this", [&](td::Slice arg) {
-    options.wallet_version = td::to_integer<td::int32>(arg);
+  p.add_option('w', "wallet-id", "do not use this", [&](td::Slice arg) {
+    TRY_RESULT(wallet_id, td::to_integer_safe<td::uint32>((arg)));
+    options.wallet_id = wallet_id;
+    return td::Status::OK();
+  });
+  p.add_option('W', "wallet-version", "do not use this (version[.revision])", [&](td::Slice arg) {
+    td::ConstParser parser(arg);
+    TRY_RESULT(version, td::to_integer_safe<td::int32>((parser.read_till_nofail('.'))));
+    options.wallet_version = version;
+    LOG(INFO) << "Use wallet version = " << version;
+    if (parser.peek_char() == '.') {
+      parser.skip('.');
+      TRY_RESULT(revision, td::to_integer_safe<td::int32>((parser.read_all())));
+      options.wallet_revision = revision;
+      LOG(INFO) << "Use wallet revision = " << revision;
+    }
     return td::Status::OK();
   });
 
diff --git a/submodules/webp/BUCK b/submodules/webp/BUCK
index c8f7bc56c0..afd63155da 100644
--- a/submodules/webp/BUCK
+++ b/submodules/webp/BUCK
@@ -11,10 +11,7 @@ genrule(
 )
 
 apple_library(
-    name = "WebP_lib",
-    visibility = [
-        "//submodules/WebP:..."
-    ],
+    name = "webp",
     header_namespace = "webp",
     exported_headers = {
         "webp/encode.h": "include/webp/encode.h",
@@ -25,24 +22,5 @@ apple_library(
         "-lwebp",
         "-L$(location :WebP_lib_file)",
     ],
-)
-
-static_library(
-    name = "WebPImage",
-    srcs = glob([
-        "WebP/*.m",
-    ]),
-    headers = [
-    	"WebP/UIImage+WebP.h",
-    ],
-	exported_headers = [
-        "WebP/UIImage+WebP.h",
-    ],
-    deps = [
-        ":WebP_lib",
-    ],
-    frameworks = [
-        "$SDKROOT/System/Library/Frameworks/Foundation.framework",
-        "$SDKROOT/System/Library/Frameworks/UIKit.framework",
-    ],
+    visibility = ["PUBLIC"],
 )
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/Info.plist b/submodules/webp/WebP/Info.plist
deleted file mode 100644
index e1fe4cfb7b..0000000000
--- a/submodules/webp/WebP/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/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>
diff --git a/third-party/BUILD b/third-party/BUILD
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/third-party/cmake/BUILD b/third-party/cmake/BUILD
new file mode 100644
index 0000000000..2bebb90f22
--- /dev/null
+++ b/third-party/cmake/BUILD
@@ -0,0 +1,32 @@
+
+genrule(
+    name = "cmake",
+    srcs = [
+        "cmake-3.16.0.tar.gz",
+    ],
+    cmd_bash =
+"""
+    BUILD_DIR="$(RULEDIR)/build"
+    rm -rf "$$BUILD_DIR"
+    mkdir -p "$$BUILD_DIR"
+    tar -xzf "$(location cmake-3.16.0.tar.gz)" --directory "$$BUILD_DIR"
+    
+    pushd "$$BUILD_DIR/cmake-3.16.0"
+
+    export PATH=/usr/bin:/bin:/usr/sbin:/sbin
+
+    core_count="`sysctl -n hw.logicalcpu`"
+    ./bootstrap --parallel=$$core_count -- -DCMAKE_BUILD_TYPE:STRING=Release
+    make -j $$core_count
+
+    popd
+
+    tar -cf "$(location cmake.tar)" -C "$$BUILD_DIR/cmake-3.16.0" .
+""",
+    outs = [
+        "cmake.tar",
+    ],
+    visibility = [
+        "//visibility:public",
+    ]
+)
diff --git a/third-party/yasm/BUILD b/third-party/yasm/BUILD
new file mode 100644
index 0000000000..79abf15e3a
--- /dev/null
+++ b/third-party/yasm/BUILD
@@ -0,0 +1,39 @@
+
+genrule(
+    name = "yasm",
+    srcs = [
+        "yasm-1.3.0.tar.gz",
+    ],
+    cmd_bash =
+"""
+set -x
+    core_count="`sysctl -n hw.logicalcpu`"
+    BUILD_DIR="$(RULEDIR)/build"
+    rm -rf "$$BUILD_DIR"
+    mkdir -p "$$BUILD_DIR"
+
+    CMAKE_DIR="$$(pwd)/$$BUILD_DIR/cmake"
+    rm -rf "$$CMAKE_DIR"
+    mkdir -p "$$CMAKE_DIR"
+    tar -xf "$(location //third-party/cmake:cmake.tar)" -C "$$CMAKE_DIR"
+    
+    tar -xzf "$(location yasm-1.3.0.tar.gz)" --directory "$$BUILD_DIR"
+    pushd "$$BUILD_DIR/yasm-1.3.0"
+    mkdir build
+    cd build
+    PATH="$$PATH:$$CMAKE_DIR/bin" cmake .. -DYASM_BUILD_TESTS=OFF -DCMAKE_BUILD_TYPE=Release -DBUILD_SHARED_LIBS=OFF
+    make -j $$core_count
+    popd
+
+    tar -cf "$(location yasm.tar)" -C "$$BUILD_DIR/yasm-1.3.0/build" .
+""",
+    tools = [
+        "//third-party/cmake:cmake.tar",
+    ],
+    outs = [
+        "yasm.tar",
+    ],
+    visibility = [
+        "//visibility:public",
+    ]
+)
diff --git a/tools/GenerateLocalization.sh b/tools/GenerateLocalization.sh
index 203a1ed412..2e6cdc4e21 100644
--- a/tools/GenerateLocalization.sh
+++ b/tools/GenerateLocalization.sh
@@ -1,17 +1,17 @@
 #!/bin/sh
 
-swift -swift-version 4 tools/GenerateLocalization.swift Telegram-iOS/en.lproj/Localizable.strings submodules/TelegramPresentationData/Sources/PresentationStrings.swift submodules/TelegramUI/TelegramUI/Resources/PresentationStrings.mapping
+swift -swift-version 4 tools/GenerateLocalization.swift Telegram/Telegram-iOS/en.lproj/Localizable.strings submodules/TelegramPresentationData/Sources/PresentationStrings.swift submodules/TelegramUI/Resources/PresentationStrings.mapping
 
 mkdir -p submodules/WalletUI/Resources
-swift -swift-version 4 tools/GenerateLocalization.swift Telegram-iOS/en.lproj/Localizable.strings submodules/WalletUI/Sources/WalletStrings.swift submodules/WalletUI/Resources/WalletStrings.mapping "Wallet."
+swift -swift-version 4 tools/GenerateLocalization.swift Telegram/Telegram-iOS/en.lproj/Localizable.strings submodules/WalletUI/Sources/WalletStrings.swift submodules/WalletUI/Resources/WalletStrings.mapping "Wallet."
 
 wallet_strings_path="Wallet/Strings"
 strings_name="Localizable.strings"
 rm -rf "$wallet_strings_path"
 
-for f in $(basename $(find "Telegram-iOS" -name "*.lproj")); do
+for f in $(basename $(find "Telegram/Telegram-iOS" -name "*.lproj")); do
 	mkdir -p "$wallet_strings_path/$f"
-	if [ -f "Telegram-iOS/$f/$strings_name" ]; then
-		cat "Telegram-iOS/$f/$strings_name" | grep -E '^"Wallet\..*?$' > "$wallet_strings_path/$f/$strings_name"
+	if [ -f "Telegram/Telegram-iOS/$f/$strings_name" ]; then
+		cat "Telegram/Telegram-iOS/$f/$strings_name" | grep -E '^"Wallet\..*?$' > "$wallet_strings_path/$f/$strings_name"
 	fi
 done